diff --git a/.eslintrc.js b/.eslintrc.js
index 122ec45369c224..dfe779b4683523 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -46,11 +46,6 @@ const restrictedImports = [
 		name: 'lodash',
 		message: 'Please use native functionality instead.',
 	},
-	{
-		name: 'reakit',
-		message:
-			'Please use Reakit API through `@wordpress/components` instead.',
-	},
 	{
 		name: '@ariakit/react',
 		message:
@@ -61,10 +56,6 @@ const restrictedImports = [
 		importNames: [ 'combineReducers' ],
 		message: 'Please use `combineReducers` from `@wordpress/data` instead.',
 	},
-	{
-		name: 'puppeteer-testing-library',
-		message: '`puppeteer-testing-library` is still experimental.',
-	},
 	{
 		name: '@emotion/css',
 		message:
@@ -85,6 +76,77 @@ const restrictedImports = [
 		message:
 			"edit-widgets is a WordPress top level package that shouldn't be imported into other packages",
 	},
+	{
+		name: 'classnames',
+		message:
+			"Please use `clsx` instead. It's a lighter and faster drop-in replacement for `classnames`.",
+	},
+];
+
+const restrictedSyntax = [
+	// NOTE: We can't include the forward slash in our regex or
+	// we'll get a `SyntaxError` (Invalid regular expression: \ at end of pattern)
+	// here. That's why we use \\u002F in the regexes below.
+	{
+		selector:
+			'ImportDeclaration[source.value=/^@wordpress\\u002F.+\\u002F/]',
+		message: 'Path access on WordPress dependencies is not allowed.',
+	},
+	{
+		selector:
+			'CallExpression[callee.name="deprecated"] Property[key.name="version"][value.value=/' +
+			majorMinorRegExp +
+			'/]',
+		message:
+			'Deprecated functions must be removed before releasing this version.',
+	},
+	{
+		selector:
+			'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',
+		message:
+			'This method is deprecated. You should use the more explicit API methods available.',
+	},
+	{
+		selector:
+			'CallExpression[callee.object.name="page"][callee.property.name="waitForTimeout"]',
+		message: 'Prefer page.waitForSelector instead.',
+	},
+	{
+		selector: 'JSXAttribute[name.name="id"][value.type="Literal"]',
+		message:
+			'Do not use string literals for IDs; use withInstanceId instead.',
+	},
+	{
+		// Discourage the usage of `Math.random()` as it's a code smell
+		// for UUID generation, for which we already have a higher-order
+		// component: `withInstanceId`.
+		selector:
+			'CallExpression[callee.object.name="Math"][callee.property.name="random"]',
+		message:
+			'Do not use Math.random() to generate unique IDs; use withInstanceId instead. (If you’re not generating unique IDs: ignore this message.)',
+	},
+	{
+		selector:
+			'CallExpression[callee.name="withDispatch"] > :function > BlockStatement > :not(VariableDeclaration,ReturnStatement)',
+		message:
+			'withDispatch must return an object with consistent keys. Avoid performing logic in `mapDispatchToProps`.',
+	},
+	{
+		selector:
+			'LogicalExpression[operator="&&"][left.property.name="length"][right.type="JSXElement"]',
+		message:
+			'Avoid truthy checks on length property rendering, as zero length is rendered verbatim.',
+	},
+];
+
+/** `no-restricted-syntax` rules for components. */
+const restrictedSyntaxComponents = [
+	{
+		selector:
+			'JSXOpeningElement[name.name="Button"]:not(:has(JSXAttribute[name.name="accessibleWhenDisabled"])) JSXAttribute[name.name="disabled"]',
+		message:
+			'`disabled` used without the `accessibleWhenDisabled` prop. Disabling a control without maintaining focusability can cause accessibility issues, by hiding their presence from screen reader users, or preventing focus from returning to a trigger element. (Ignore this error if you truly mean to disable.)',
+	},
 ];
 
 module.exports = {
@@ -96,6 +158,7 @@ module.exports = {
 	],
 	globals: {
 		wp: 'off',
+		globalThis: 'readonly',
 	},
 	settings: {
 		jsdoc: {
@@ -106,9 +169,16 @@ module.exports = {
 	},
 	rules: {
 		'jest/expect-expect': 'off',
+		'react/jsx-boolean-value': 'error',
+		'react/jsx-curly-brace-presence': [
+			'error',
+			{ props: 'never', children: 'never' },
+		],
 		'@wordpress/dependency-group': 'error',
-		'@wordpress/is-gutenberg-plugin': 'error',
+		'@wordpress/wp-global-usage': 'error',
 		'@wordpress/react-no-unsafe-timeout': 'error',
+		'@wordpress/i18n-hyphenated-range': 'error',
+		'@wordpress/i18n-no-flanking-whitespace': 'error',
 		'@wordpress/i18n-text-domain': [
 			'error',
 			{
@@ -145,61 +215,11 @@ module.exports = {
 				disallowTypeAnnotations: false,
 			},
 		],
-		'no-restricted-syntax': [
+		'no-restricted-syntax': [ 'error', ...restrictedSyntax ],
+		'jsdoc/check-tag-names': [
 			'error',
-			// NOTE: We can't include the forward slash in our regex or
-			// we'll get a `SyntaxError` (Invalid regular expression: \ at end of pattern)
-			// here. That's why we use \\u002F in the regexes below.
-			{
-				selector:
-					'ImportDeclaration[source.value=/^@wordpress\\u002F.+\\u002F/]',
-				message:
-					'Path access on WordPress dependencies is not allowed.',
-			},
-			{
-				selector:
-					'CallExpression[callee.name="deprecated"] Property[key.name="version"][value.value=/' +
-					majorMinorRegExp +
-					'/]',
-				message:
-					'Deprecated functions must be removed before releasing this version.',
-			},
-			{
-				selector:
-					'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',
-				message:
-					'This method is deprecated. You should use the more explicit API methods available.',
-			},
 			{
-				selector:
-					'CallExpression[callee.object.name="page"][callee.property.name="waitForTimeout"]',
-				message: 'Prefer page.waitForSelector instead.',
-			},
-			{
-				selector: 'JSXAttribute[name.name="id"][value.type="Literal"]',
-				message:
-					'Do not use string literals for IDs; use withInstanceId instead.',
-			},
-			{
-				// Discourage the usage of `Math.random()` as it's a code smell
-				// for UUID generation, for which we already have a higher-order
-				// component: `withInstanceId`.
-				selector:
-					'CallExpression[callee.object.name="Math"][callee.property.name="random"]',
-				message:
-					'Do not use Math.random() to generate unique IDs; use withInstanceId instead. (If you’re not generating unique IDs: ignore this message.)',
-			},
-			{
-				selector:
-					'CallExpression[callee.name="withDispatch"] > :function > BlockStatement > :not(VariableDeclaration,ReturnStatement)',
-				message:
-					'withDispatch must return an object with consistent keys. Avoid performing logic in `mapDispatchToProps`.',
-			},
-			{
-				selector:
-					'LogicalExpression[operator="&&"][left.property.name="length"][right.type="JSXElement"]',
-				message:
-					'Avoid truthy checks on length property rendering, as zero length is rendered verbatim.',
+				definedTags: [ 'jest-environment' ],
 			},
 		],
 	},
@@ -253,14 +273,87 @@ module.exports = {
 		},
 		{
 			files: [
-				// Components package.
-				'packages/components/src/**/*.[tj]s?(x)',
-				// Navigation block.
-				'packages/block-library/src/navigation/**/*.[tj]s?(x)',
+				'packages/*/src/**/*.[tj]s?(x)',
+				'storybook/stories/**/*.[tj]s?(x)',
+			],
+			excludedFiles: [ '**/*.native.js' ],
+			rules: {
+				'no-restricted-syntax': [
+					'error',
+					...restrictedSyntax,
+					...restrictedSyntaxComponents,
+				],
+			},
+		},
+		{
+			files: [ 'packages/*/src/**/*.[tj]s?(x)' ],
+			excludedFiles: [
+				'packages/*/src/**/@(test|stories)/**',
+				'**/*.@(native|ios|android).js',
 			],
-			excludedFiles: [ ...developmentFiles ],
 			rules: {
-				'react-hooks/exhaustive-deps': 'error',
+				'no-restricted-syntax': [
+					'error',
+					...restrictedSyntax,
+					...restrictedSyntaxComponents,
+					// Temporary rules until we're ready to officially deprecate the bottom margins.
+					...[
+						'BaseControl',
+						'CheckboxControl',
+						'ComboboxControl',
+						'DimensionControl',
+						'FocalPointPicker',
+						'RangeControl',
+						'SearchControl',
+						'SelectControl',
+						'TextControl',
+						'TextareaControl',
+						'ToggleControl',
+						'ToggleGroupControl',
+						'TreeSelect',
+					].map( ( componentName ) => ( {
+						selector: `JSXOpeningElement[name.name="${ componentName }"]:not(:has(JSXAttribute[name.name="__nextHasNoMarginBottom"]))`,
+						message:
+							componentName +
+							' should have the `__nextHasNoMarginBottom` prop to opt-in to the new margin-free styles.',
+					} ) ),
+					// Temporary rules until we're ready to officially default to the new size.
+					...[
+						'BorderBoxControl',
+						'BorderControl',
+						'BoxControl',
+						'Button',
+						'ComboboxControl',
+						'CustomSelectControl',
+						'DimensionControl',
+						'FontAppearanceControl',
+						'FontFamilyControl',
+						'FontSizePicker',
+						'FormTokenField',
+						'InputControl',
+						'LetterSpacingControl',
+						'LineHeightControl',
+						'NumberControl',
+						'RangeControl',
+						'SelectControl',
+						'TextControl',
+						'ToggleGroupControl',
+						'UnitControl',
+					].map( ( componentName ) => ( {
+						// Falsy `__next40pxDefaultSize` without a non-default `size` prop.
+						selector: `JSXOpeningElement[name.name="${ componentName }"]:not(:has(JSXAttribute[name.name="__next40pxDefaultSize"][value.expression.value!=false])):not(:has(JSXAttribute[name.name="size"][value.value!="default"]))`,
+						message:
+							componentName +
+							' should have the `__next40pxDefaultSize` prop when using the default size.',
+					} ) ),
+					{
+						// Falsy `__next40pxDefaultSize` without a `render` prop.
+						selector:
+							'JSXOpeningElement[name.name="FormFileUpload"]:not(:has(JSXAttribute[name.name="__next40pxDefaultSize"][value.expression.value!=false])):not(:has(JSXAttribute[name.name="render"]))',
+						message:
+							'FormFileUpload should have the `__next40pxDefaultSize` prop to opt-in to the new default size.',
+					},
+				],
 			},
 		},
 		{
@@ -361,12 +454,59 @@ module.exports = {
 				'jsdoc/require-param': 'off',
 			},
 		},
+		{
+			files: [ 'packages/components/src/**' ],
+			excludedFiles: [
+				'packages/components/src/utils/colors-values.js',
+				'packages/components/src/theme/**',
+			],
+			rules: {
+				'no-restricted-syntax': [
+					'error',
+					...restrictedSyntax,
+					...restrictedSyntaxComponents,
+					{
+						selector:
+							':matches(Literal[value=/--wp-admin-theme-/],TemplateElement[value.cooked=/--wp-admin-theme-/])',
+						message:
+							'--wp-admin-theme-* variables do not support component theming. Use variables from the COLORS object in packages/components/src/utils/colors-values.js instead.',
+					},
+					{
+						selector:
+							// Allow overriding definitions, but not access with var()
+							':matches(Literal[value=/var\\(\\s*--wp-components-color-/],TemplateElement[value.cooked=/var\\(\\s*--wp-components-color-/])',
+						message:
+							'To ensure proper fallbacks, --wp-components-color-* variables should not be used directly. Use variables from the COLORS object in packages/components/src/utils/colors-values.js instead.',
+					},
+				],
+			},
+		},
 		{
 			files: [ 'packages/components/src/**' ],
 			excludedFiles: [ 'packages/components/src/**/@(test|stories)/**' ],
 			plugins: [ 'ssr-friendly' ],
 			extends: [ 'plugin:ssr-friendly/recommended' ],
 		},
+		{
+			files: [ 'packages/components/src/**' ],
+			rules: {
+				'no-restricted-imports': [
+					'error',
+					// The `ariakit` and `framer-motion` APIs are meant to be consumed via
+					// the `@wordpress/components` package, hence why importing those
+					// dependencies should be allowed in the components package.
+					{
+						paths: restrictedImports.filter(
+							( { name } ) =>
+								! [
+									'@ariakit/react',
+									'framer-motion',
+								].includes( name )
+						),
+					},
+				],
+			},
+		},
 		{
 			files: [ 'packages/block-editor/**' ],
 			rules: {
@@ -390,5 +530,29 @@ module.exports = {
 				],
 			},
 		},
+		{
+			files: [ 'packages/edit-post/**', 'packages/edit-site/**' ],
+			rules: {
+				'no-restricted-imports': [
+					'error',
+					{
+						paths: [
+							...restrictedImports,
+							{
+								name: '@wordpress/interface',
+								message:
+									'The edit-post and edit-site package should not directly import the interface package. They should import them from the private APIs of the editor package instead.',
+							},
+						],
+					},
+				],
+			},
+		},
+		{
+			files: [ 'packages/interactivity*/src/**' ],
+			rules: {
+				'react/react-in-jsx-scope': 'error',
+			},
+		},
 	],
 };
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f6a641a5af9bbe..477cd4fbacb400 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -12,3 +12,12 @@ c56e8a1910ed74f405b74bbb12fe81dea974e5c3
 
 # Prettier upgrade to 3.0.3.
 0bee15148fe4330c20cf372cb46a33693e45cb5f
+
+# ESLint: Enable react/jsx-boolean-value
+9a34927870df80ac3b2da14d71f81d20ec23e2b6
+
+# Autofix eslint curly rule.
+0221522f253e094b277a1485b7a2d186cb172632
+
+# ESLint: Enable react/jsx-curly-brace-presence
+5d4baa9ab5f57d207cc3a048003216a8574574d9
diff --git a/.gitattributes b/.gitattributes
index aaaedda10d2dc0..1dc48620d8b67c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,3 +11,15 @@
 *.jpg binary
 *.png binary
 *.ttf binary
+
+# Directories with vendored code.
+packages/edit-site/lib/** linguist-vendored
+
+# The changelog.txt file is authored as markdown.
+changelog.txt linguist-language=Markdown
+
+# Flag docs directory as documentation for GitHub stats.
+docs/** linguist-documentation
+
+# TSConfig files use jsonc.
+tsconfig*.json linguist-language=jsonc
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1f944fa38b4840..2ec03cba722c6b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,9 +1,9 @@
 # Documentation
-/docs                                           @ajitbohra @ryanwelcher @juanmaguitar @fabiankaegy @ndiego
+/docs                                           @ajitbohra @juanmaguitar @fabiankaegy @ndiego
 /packages/interactivity/docs                    @juanmaguitar
 
 # Schemas
-/schemas/json                                   @ajlende
+/schemas/json
 
 # Data
 /packages/api-fetch                             @nerrad @mmtr
@@ -15,25 +15,23 @@
 # Blocks
 /packages/block-library                         @ajitbohra
 /packages/block-library/src/gallery             @geriux
-/packages/block-library/src/navigation          @tellthemachines
-/packages/block-library/src/navigation-link     @tellthemachines
-/packages/block-library/src/navigation-submenu  @tellthemachines
-/packages/block-library/src/page-list           @tellthemachines
 /packages/block-library/src/comment-template    @michalczaplinski
 /packages/block-library/src/comments            @michalczaplinski
 /packages/block-library/src/table-of-contents   @ZebulanStanphill
-/packages/block-library/src/image								@artemiomorales @michalczaplinski
+/packages/block-library/src/image               @artemiomorales
 
 # Duotone
-/lib/block-supports/duotone.php                       @ajlende
-/packages/block-editor/src/components/duotone-control @ajlende
-/packages/block-editor/src/hooks/duotone.js           @ajlende
-/packages/components/src/duotone-picker               @ajlende
+/lib/block-supports/duotone.php
+/packages/block-editor/src/components/duotone-control
+/packages/block-editor/src/hooks/duotone.js
+/packages/components/src/duotone-picker
 
 # Editor
 /packages/annotations                           @atimmer
 /packages/autop
 /packages/block-editor                          @ellatrix
+/packages/block-editor/src/hooks                @tellthemachines
+/packages/block-editor/src/layouts              @tellthemachines
 /packages/block-serialization-spec-parser       @dmsnell
 /packages/block-serialization-default-parser    @dmsnell
 /packages/blocks
@@ -49,9 +47,9 @@
 /packages/block-editor/src/components/link-control  @getdave
 
 # Widgets
-/packages/edit-widgets                          @draganescu @talldan @noisysocks @tellthemachines @adamziel @kevin940726
-/packages/customize-widgets                     @noisysocks
-/packages/widgets                               @noisysocks
+/packages/edit-widgets                          @draganescu @adamziel @kevin940726
+/packages/customize-widgets
+/packages/widgets
 
 # Full Site Editing
 /packages/edit-site
@@ -83,8 +81,7 @@
 /packages/prettier-config                       @ntwb @gziolo
 /packages/scripts                               @gziolo @ntwb @nerrad @ajitbohra @ryanwelcher
 /packages/stylelint-config                      @ntwb
-/test/e2e                                       @kevin940726 @Mamaduka
-/test/php/gutenberg-coding-standards			@anton-vlasenko
+/test/php/gutenberg-coding-standards            @anton-vlasenko
 
 # UI Components
 /packages/components                            @ajitbohra
@@ -122,20 +119,22 @@
 /packages/plugins                               @gziolo @adamsilverstein
 
 # Rich Text
-/packages/format-library                        @ellatrix @fluiddot @dcalhoun
-/packages/rich-text                             @ellatrix @fluiddot @dcalhoun
-/packages/block-editor/src/components/rich-text @ellatrix @fluiddot @dcalhoun
+/packages/format-library                        @ellatrix
+/packages/rich-text                             @ellatrix
+/packages/block-editor/src/components/rich-text @ellatrix
 
 # Project Management
-/.github
+/.github                                        @desrosj
 /packages/project-management-automation
 /packages/report-flaky-tests                    @kevin940726
 
 # wp-env
-/packages/env                                   @noahtallen @ObliviousHarmony @t-hamano
+/packages/env                                   @ObliviousHarmony @t-hamano
 
 # PHP
 /lib                                            @spacedmonkey
+/lib/block-supports/layout.php                  @tellthemachines
+/lib/class-wp-theme-json-gutenberg.php          @tellthemachines
 /lib/compat/*/html-api                          @dmsnell
 /lib/experimental/rest-api.php                  @timothybjacobs
 /lib/experimental/class-wp-rest-*               @timothybjacobs
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.yml b/.github/ISSUE_TEMPLATE/Bug_report.yml
index 1109056e7e5d56..41bb6f1c9ba108 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/Bug_report.yml
@@ -49,25 +49,29 @@ body:
       validations:
           required: false
 
-    - type: dropdown
+    - type: checkboxes
       id: existing
       attributes:
           label: Please confirm that you have searched existing issues in the repo.
           description: You can do this by searching https://github.com/WordPress/gutenberg/issues and making sure the bug is not related to another plugin.
-          multiple: true
           options:
-              - 'Yes'
-              - 'No'
-      validations:
-          required: true
+              - label: 'Yes'
+                required: true
 
-    - type: dropdown
+    - type: checkboxes
       id: plugins
       attributes:
           label: Please confirm that you have tested with all plugins deactivated except Gutenberg.
-          multiple: true
           options:
-              - 'Yes'
-              - 'No'
-      validations:
-          required: true
+              - label: 'Yes'
+                required: true
+
+    - type: checkboxes
+      id: themes
+      attributes:
+          label: Please confirm which theme type you used for testing.
+          options:
+              - label: 'Block'
+              - label: 'Classic'
+              - label: 'Hybrid (e.g. classic with theme.json)'
+              - label: 'Not sure'
diff --git a/.github/ISSUE_TEMPLATE/New_release.md b/.github/ISSUE_TEMPLATE/New_release.md
index 629a4dafa5ba56..c07dcfa3c466c6 100644
--- a/.github/ISSUE_TEMPLATE/New_release.md
+++ b/.github/ISSUE_TEMPLATE/New_release.md
@@ -23,7 +23,6 @@ This issue is to provide visibility on the progress of the release process of Gu
 
 ### RC Day - {Weekday, Month, Date}
 
--   [ ] _Optional:_ Attend `#core-editor` meeting (14:00UTC)
 -   [ ] Post a message in `#core-editor` channel to let folks know you are starting the RC release process
 -   [ ] Organize and Label PRs on the relevant milestone
 -   [ ] Start the release process by triggering the `rc` [workflow](https://developer.wordpress.org/block-editor/contributors/code/release/#running-workflow)
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index cc6b8e4d613513..ce1a0a1acffa54 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -5,7 +5,7 @@ Welcome to Gutenberg, a WordPress project. We hope you join us in creating the f
 
 * Please see the [Contributing Guidelines](https://github.com/WordPress/gutenberg/blob/HEAD/CONTRIBUTING.md) for additional information on how to contribute.
 
-* As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://github.com/WordPress/gutenberg/blob/HEAD/CODE_OF_CONDUCT.md).
+* As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://make.wordpress.org/handbook/community-code-of-conduct/).
 
 * Join us on Slack for real-time communication, it is where maintainers coordinate around the project. To get started using Slack, see: https://make.wordpress.org/chat/
 
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index cdeffc9b14c88a..76d1e45e3c6ce8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,3 +11,16 @@ updates:
       labels:
           - 'GitHub Actions'
           - '[Type] Build Tooling'
+      groups:
+          github-actions:
+              patterns:
+                  - '*'
+              exclude-patterns:
+                  - 'actions/setup-java'
+                  - 'gradle/*'
+                  - 'reactivecircus/*'
+          react-native:
+              patterns:
+                  - 'actions/setup-java'
+                  - 'gradle/*'
+                  - 'reactivecircus/*'
diff --git a/.github/setup-node/action.yml b/.github/setup-node/action.yml
index 22cb81618a1efb..a17adfe5f50071 100644
--- a/.github/setup-node/action.yml
+++ b/.github/setup-node/action.yml
@@ -10,10 +10,11 @@ runs:
     using: 'composite'
     steps:
         - name: Use desired version of Node.js
-          uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+          uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
           with:
               node-version-file: '.nvmrc'
               node-version: ${{ inputs.node-version }}
+              check-latest: true
               cache: npm
 
         - name: Get Node.js and npm version
@@ -24,15 +25,22 @@ runs:
 
         - name: Cache node_modules
           id: cache-node_modules
-          uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+          uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
           with:
               path: '**/node_modules'
-              key: node_modules-${{ runner.os }}-${{ steps.node-version.outputs.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
+              key: node_modules-${{ runner.os }}-${{ runner.arch }}-${{ steps.node-version.outputs.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
 
         - name: Install npm dependencies
           if: ${{ steps.cache-node_modules.outputs.cache-hit != 'true' }}
-          run: npm ci
+          run: |
+              npm ci
           shell: bash
+        - name: Upload npm logs as an artifact on failure
+          uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+          if: failure()
+          with:
+              name: npm-logs
+              path: C:\npm\cache\_logs
 
         # On cache hit, we run the post-install script to match the native `npm ci` behavior.
         # An example of this is to patch `node_modules` using patch-package.
diff --git a/.github/workflows/build-plugin-zip.yml b/.github/workflows/build-plugin-zip.yml
index f0c704e10456c7..9a3a9abb84963d 100644
--- a/.github/workflows/build-plugin-zip.yml
+++ b/.github/workflows/build-plugin-zip.yml
@@ -3,7 +3,10 @@ name: Build Gutenberg Plugin Zip
 on:
     pull_request:
     push:
-        branches: [trunk]
+        branches:
+            - trunk
+            - 'release/**'
+            - 'wp/**'
     workflow_dispatch:
         inputs:
             version:
@@ -69,7 +72,7 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   token: ${{ secrets.GUTENBERG_TOKEN }}
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
@@ -165,15 +168,16 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   ref: ${{ needs.bump-version.outputs.release_branch || github.ref }}
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
             - name: Use desired version of Node.js
-              uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+              uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
               with:
                   node-version-file: '.nvmrc'
+                  check-latest: true
                   cache: npm
 
             - name: Build Gutenberg plugin ZIP file
@@ -182,7 +186,7 @@ jobs:
                   NO_CHECKS: 'true'
 
             - name: Upload artifact
-              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+              uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
               with:
                   name: gutenberg-plugin
                   path: ./gutenberg.zip
@@ -205,7 +209,7 @@ jobs:
 
             - name: Upload release notes artifact
               if: ${{ needs.bump-version.outputs.new_version }}
-              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+              uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
               with:
                   name: release-notes
                   path: ./release-notes.txt
@@ -221,7 +225,7 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   fetch-depth: 2
                   ref: ${{ needs.bump-version.outputs.release_branch }}
@@ -269,12 +273,12 @@ jobs:
               run: echo "version=$(echo $VERSION | cut -d / -f 3 | sed 's/-rc./ RC/' )" >> $GITHUB_OUTPUT
 
             - name: Download Plugin Zip Artifact
-              uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
+              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
               with:
                   name: gutenberg-plugin
 
             - name: Download Release Notes Artifact
-              uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
+              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
               with:
                   name: release-notes
 
@@ -310,14 +314,14 @@ jobs:
         if: ${{ endsWith( needs.bump-version.outputs.new_version, '-rc.1' ) }}
         steps:
             - name: Checkout (for CLI)
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   path: main
                   ref: trunk
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
             - name: Checkout (for publishing)
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   path: publish
                   # Later, we switch this branch in the script that publishes packages.
@@ -332,10 +336,11 @@ jobs:
                   git config user.email gutenberg@wordpress.org
 
             - name: Setup Node.js
-              uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+              uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
               with:
                   node-version-file: 'main/.nvmrc'
                   registry-url: 'https://registry.npmjs.org'
+                  check-latest: true
 
             - name: Publish packages to npm ("latest" dist-tag)
               run: |
diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml
index 3b4d51bddbda0b..4b0b93ac959ed8 100644
--- a/.github/workflows/bundle-size.yml
+++ b/.github/workflows/bundle-size.yml
@@ -37,19 +37,20 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   fetch-depth: 1
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
             - name: Use desired version of Node.js
-              uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+              uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
               with:
                   node-version-file: '.nvmrc'
+                  check-latest: true
                   cache: npm
 
-            - uses: preactjs/compressed-size-action@8119d3d31b6e57b167e09c81dfa877eada3bcb35 # v2.5.0
+            - uses: preactjs/compressed-size-action@6fa0e7ca017120c754863b31123c5ee2860fd434 # v2.7.0
               with:
                   repo-token: '${{ secrets.GITHUB_TOKEN }}'
-                  pattern: '{build/**/*.min.js,build/**/*.css}'
+                  pattern: '{build/**/*.min.js,build/**/*.css,build-module/**/*.min.js}'
                   clean-script: 'distclean'
diff --git a/.github/workflows/check-backport-changelog.yml b/.github/workflows/check-backport-changelog.yml
new file mode 100644
index 00000000000000..889e1cfb477256
--- /dev/null
+++ b/.github/workflows/check-backport-changelog.yml
@@ -0,0 +1,54 @@
+name: Verify Core Backport Changelog
+
+on:
+    pull_request:
+        types: [opened, synchronize, labeled, unlabeled]
+        branches:
+            - trunk
+        paths:
+            - 'lib/**'
+            - '!lib/load.php'
+            - '!lib/experiments-page.php'
+            - '!lib/experimental/**'
+            - 'phpunit/**'
+            - '!phpunit/experimental/**'
+            - '!phpunit/blocks/**'
+            - 'packages/**/*.php'
+            - '!packages/block-library/**'
+            - '!packages/e2e-tests/**'
+jobs:
+    check:
+        name: Check for a Core backport changelog entry
+        runs-on: ubuntu-latest
+        if: ${{ !contains(github.event.pull_request.labels.*.name, 'No Core Sync Required') && !contains(github.event.pull_request.labels.*.name, 'Backport from WordPress Core') }}
+        steps:
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+              with:
+                  ref: ${{ github.event.pull_request.head.ref }}
+                  repository: ${{ github.event.pull_request.head.repo.full_name }}
+            - name: Check the changelog folder
+              env:
+                  PR_NUMBER: ${{ github.event.number }}
+              run: |
+                  changelog_folder="backport-changelog"
+
+                  # Find any changelog file that contains the Gutenberg PR link
+                  gutenberg_pr_url="https://github\.com/WordPress/gutenberg/pull/${PR_NUMBER}"
+                  changelog_file=$(grep -rl "[-*] ${gutenberg_pr_url}" "${changelog_folder}" | head -n 1)
+
+                  # Confirm that there is an entry containing the Gutenberg PR link
+                  if [[ -z "${changelog_file}" ]]; then
+                    echo "Please create a core backport PR and add a file with the path <wp-release-number>/<core-pr-number>.md in the $changelog_folder folder with the core backport PR URL and a list item with this PR URL."
+                    echo "If changes are related to an existing, open core PR, you may add this PR URL to the core PR's file."
+                    echo "See $changelog_folder/readme.md for more information."
+                    exit 1
+                  fi
+
+                  core_pr_number=$(basename "${changelog_file}" .md)
+                  core_pr_url="https://github\.com/WordPress/wordpress-develop/pull/${core_pr_number}"
+
+                  # Confirm that the entry has the correct core backport PR URL.
+                  if ! grep -q -e "${core_pr_url}" "${changelog_file}"; then
+                    echo "Please update the content of ${changelog_file} to include the core backport PR URL, or update the file name to match the core backport PR number."
+                    exit 1
+                  fi
diff --git a/.github/workflows/check-components-changelog.yml b/.github/workflows/check-components-changelog.yml
index fece5aa3a9d9ad..2c0d52c77ea4e2 100644
--- a/.github/workflows/check-components-changelog.yml
+++ b/.github/workflows/check-components-changelog.yml
@@ -3,6 +3,8 @@ name: OPTIONAL - Verify @wordpress/components CHANGELOG update
 on:
     pull_request:
         types: [opened, synchronize]
+        branches:
+            - trunk
         paths:
             - 'packages/components/**'
             - '!packages/components/src/**/stories/**'
@@ -20,7 +22,7 @@ jobs:
             - name: 'Get PR commit count'
               run: echo "PR_COMMIT_COUNT=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"
             - name: Checkout code
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   ref: ${{ github.event.pull_request.head.ref }}
                   repository: ${{ github.event.pull_request.head.repo.full_name }}
diff --git a/.github/workflows/cherry-pick-wp-release.yml b/.github/workflows/cherry-pick-wp-release.yml
new file mode 100644
index 00000000000000..5771a21d5b068b
--- /dev/null
+++ b/.github/workflows/cherry-pick-wp-release.yml
@@ -0,0 +1,184 @@
+name: Auto Cherry-Pick
+
+on:
+    push:
+        branches:
+            - trunk
+    # We also want to attempt cherry-picking when a PR is labeled after the PR
+    # is merged.
+    pull_request:
+        types: [labeled]
+        branches:
+            - trunk
+
+# Ensure that new jobs wait for the previous job to finish.
+concurrency:
+    group: ${{ github.workflow }}
+    cancel-in-progress: false
+
+jobs:
+    cherry-pick:
+        runs-on: ubuntu-latest
+        # When in the context of a PR, ensure the PR is merged.
+        if: github.event.pull_request == null || github.event.pull_request.merged == true
+        steps:
+            - name: Determine if label should trigger cherry-pick
+              id: label-check
+              uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+              with:
+                  script: |
+                      const commit_sha = context.payload.pull_request ? context.payload.pull_request.merge_commit_sha : context.sha;
+                      console.log(`Commit SHA: ${commit_sha}`);
+                      core.exportVariable('commit_sha', commit_sha);
+                      const prs = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        commit_sha,
+                      });
+                      if (prs.data.length === 0) {
+                        console.log(`No PR found for commit ${context.sha}.`);
+                        return;
+                      }
+                      const pr_number = prs.data[0].number;
+                      console.log(`PR: ${pr_number}`);
+                      core.exportVariable('pr_number', pr_number);
+
+                      const pr = await github.rest.pulls.get({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        pull_number: pr_number,
+                      });
+                      const labels = pr.data.labels.map(label => label.name);
+                      console.log(`Labels: ${labels}`);
+                      const regex = /^Backport to WP ([0-9]+\.[0-9]+) Beta\/RC$/;
+                      let matched = false;
+                      for (const label of labels) {
+                        const match = label.match(regex);
+                        if (match) {
+                          const version = match[1];
+                          console.log(`Matched label: ${label}`);
+                          console.log(`Extracted version: ${version}`);
+                          core.exportVariable('cherry_pick', 'true');
+                          core.exportVariable('version', version);
+                          matched = true;
+                          break;
+                        }
+                      }
+                      if (!matched) {
+                        core.exportVariable('cherry_pick', 'false');
+                      }
+
+            - name: Checkout repository
+              if: env.cherry_pick == 'true'
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+              with:
+                  token: ${{ secrets.GUTENBERG_TOKEN }}
+                  fetch-depth: 0
+
+            - name: Set up Git
+              if: env.cherry_pick == 'true'
+              run: |
+                  git config --global user.name "Gutenberg Repository Automation"
+                  git config --global user.email "gutenberg@wordpress.org"
+
+            - name: Cherry-pick the commit
+              id: cherry-pick
+              if: env.cherry_pick == 'true'
+              run: |
+                  TARGET_BRANCH="wp/${{ env.version }}"
+                  COMMIT_SHA="${{ env.commit_sha }}"
+                  echo "Target branch: $TARGET_BRANCH"
+                  echo "Commit SHA: $COMMIT_SHA"
+                  git checkout $TARGET_BRANCH
+                  git cherry-pick $COMMIT_SHA || echo "cherry-pick-failed" > result
+                  if [ -f result ] && grep -q "cherry-pick-failed" result; then
+                    echo "conflict=true" >> $GITHUB_ENV
+                    git cherry-pick --abort
+                  else
+                    CHERRY_PICK_SHA=$(git rev-parse HEAD)
+                    echo "conflict=false" >> $GITHUB_ENV
+                    echo "cherry_pick_sha=$CHERRY_PICK_SHA" >> $GITHUB_ENV
+                    git push origin $TARGET_BRANCH
+                  fi
+
+            - name: Remove cherry-pick label
+              if: env.cherry_pick == 'true' && env.conflict == 'false'
+              uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+              with:
+                  script: |
+                      const prNumber = process.env.pr_number;
+                      const version = process.env.version;
+                      console.log(`prNumber: ${prNumber}`);
+                      console.log(`version: ${version}`);
+                      const oldLabel = `Backport to WP ${version} Beta/RC`;
+                      const newLabel = `Backported to WP Core`;
+                      await github.rest.issues.removeLabel({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        issue_number: prNumber,
+                        name: oldLabel
+                      });
+                      await github.rest.issues.addLabels({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        issue_number: prNumber,
+                        labels: [newLabel]
+                      });
+
+            - name: Comment on the PR
+              if: env.cherry_pick == 'true' && env.conflict == 'false'
+              uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+              with:
+                  script: |
+                      const prNumber = process.env.pr_number;
+                      const cherryPickSha = process.env.cherry_pick_sha;
+                      const targetBranch = `wp/${process.env.version}`;
+                      console.log(`prNumber: ${prNumber}`);
+                      console.log(`cherryPickSha: ${cherryPickSha}`);
+                      console.log(`targetBranch: ${targetBranch}`);
+                      await github.rest.issues.createComment({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        issue_number: prNumber,
+                        body: `I just cherry-picked this PR to the ${targetBranch} branch to get it included in the next release: ${cherryPickSha}`
+                      });
+
+            - name: Comment on the PR about conflict
+              if: env.cherry_pick == 'true' && env.conflict == 'true'
+              uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+              with:
+                  script: |
+                      const prNumber = process.env.pr_number;
+                      const commitSha = process.env.commit_sha;
+                      const targetBranch = `wp/${process.env.version}`;
+                      console.log(`prNumber: ${prNumber}`);
+                      console.log(`targetBranch: ${targetBranch}`);
+                      await github.rest.issues.createComment({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        issue_number: prNumber,
+                        body: `There was a conflict while trying to cherry-pick the commit to the ${targetBranch} branch. Please resolve the conflict manually and create a PR to the ${targetBranch} branch.
+
+                        PRs to ${targetBranch} are similar to PRs to trunk, but you should base your PR on the ${targetBranch} branch instead of trunk.
+
+                        \`\`\`
+                        # Checkout the ${targetBranch} branch instead of trunk.
+                        git checkout ${targetBranch}
+                        # Create a new branch for your PR.
+                        git checkout -b my-branch
+                        # Cherry-pick the commit.
+                        git cherry-pick ${commitSha}
+                        # Check which files have conflicts.
+                        git status
+                        # Resolve the conflict...
+                        # Add the resolved files to the staging area.
+                        git status
+                        git add .
+                        git cherry-pick --continue
+                        # Push the branch to the repository
+                        git push origin my-branch
+                        # Create a PR and set the base to the ${targetBranch} branch.
+                        # See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request.
+                        \`\`\`
+                        `
+                      });
diff --git a/.github/workflows/create-block.yml b/.github/workflows/create-block.yml
index 0e4325b53f69da..4d99d396996c59 100644
--- a/.github/workflows/create-block.yml
+++ b/.github/workflows/create-block.yml
@@ -14,17 +14,17 @@ concurrency:
 
 jobs:
     checks:
-        name: Checks
+        name: Checks w/Node.js ${{ matrix.node }} on ${{ matrix.os }}
         runs-on: ${{ matrix.os }}
         if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
         strategy:
             fail-fast: false
             matrix:
-                node: ['16']
-                os: [macos-latest, ubuntu-latest, windows-latest]
+                node: ['20', '22']
+                os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
 
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
diff --git a/.github/workflows/end2end-test.yml b/.github/workflows/end2end-test.yml
index 5a9750c6bb0456..2ea5949d20946c 100644
--- a/.github/workflows/end2end-test.yml
+++ b/.github/workflows/end2end-test.yml
@@ -16,48 +16,6 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-    e2e-puppeteer:
-        name: Puppeteer
-        runs-on: ubuntu-latest
-        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
-        strategy:
-            fail-fast: false
-
-        steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-              with:
-                  show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-            - name: Setup Node.js and install dependencies
-              uses: ./.github/setup-node
-
-            - name: Npm build
-              run: npm run build
-
-            - name: Install WordPress
-              run: |
-                  npm run wp-env start
-
-            - name: Running the tests
-              run: |
-                  npx wp-scripts test-e2e --config=./packages/e2e-tests/jest.config.js --cacheDirectory="$HOME/.jest-cache"
-
-            - name: Archive debug artifacts (screenshots, HTML snapshots)
-              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
-              if: always()
-              with:
-                  name: failures-artifacts
-                  path: artifacts
-                  if-no-files-found: ignore
-
-            - name: Archive flaky tests report
-              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
-              if: always()
-              with:
-                  name: flaky-tests-report
-                  path: flaky-tests
-                  if-no-files-found: ignore
-
     e2e-playwright:
         name: Playwright - ${{ matrix.part }}
         runs-on: ubuntu-latest
@@ -69,7 +27,7 @@ jobs:
                 totalParts: [8]
 
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
@@ -91,39 +49,65 @@ jobs:
               env:
                   PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
               run: |
-                  xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:e2e:playwright -- --shard=${{ matrix.part }}/${{ matrix.totalParts }}
+                  xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:e2e -- --shard=${{ matrix.part }}/${{ matrix.totalParts }}
 
             - name: Archive debug artifacts (screenshots, traces)
-              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
-              if: always()
+              uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+              if: ${{ !cancelled() }}
               with:
-                  name: failures-artifacts
+                  name: failures-artifacts--${{ matrix.part }}
                   path: artifacts/test-results
                   if-no-files-found: ignore
 
             - name: Archive flaky tests report
-              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
-              if: always()
+              uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+              if: ${{ !cancelled() }}
               with:
-                  name: flaky-tests-report
+                  name: flaky-tests-report--${{ matrix.part }}
                   path: flaky-tests
                   if-no-files-found: ignore
 
+    merge-artifacts:
+        name: Merge Artifacts
+        if: ${{ !cancelled() }}
+        needs: [e2e-playwright]
+        runs-on: ubuntu-latest
+        outputs:
+            has-flaky-test-report: ${{ !!steps.merge-flaky-tests-reports.outputs.artifact-id }}
+        steps:
+            - name: Merge failures artifacts
+              uses: actions/upload-artifact/merge@v4
+              # Don't fail the job if there aren't any artifacts to merge.
+              continue-on-error: true
+              with:
+                  name: failures-artifacts
+                  # Retain the merged artifacts in case of a rerun.
+                  pattern: failures-artifacts*
+                  delete-merged: true
+
+            - name: Merge flaky tests reports
+              id: merge-flaky-tests-reports
+              uses: actions/upload-artifact/merge@v4
+              continue-on-error: true
+              with:
+                  name: flaky-tests-report
+                  pattern: flaky-tests-report*
+                  delete-merged: true
+
     report-to-issues:
         name: Report to GitHub
-        needs: [e2e-puppeteer, e2e-playwright]
-        if: ${{ always() }}
+        needs: [merge-artifacts]
+        if: ${{ needs.merge-artifacts.outputs.has-flaky-test-report == 'true' }}
         runs-on: ubuntu-latest
         steps:
             # Checkout defaults to using the branch which triggered the event, which
             # isn't necessarily `trunk` (e.g. in the case of a merge).
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   ref: trunk
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
-            - uses: actions/download-artifact@v3
-              id: download_artifact
+            - uses: actions/download-artifact@v4.1.8
               # Don't fail the job if there isn't any flaky tests report.
               continue-on-error: true
               with:
@@ -131,16 +115,13 @@ jobs:
                   path: flaky-tests
 
             - name: Setup Node.js and install dependencies
-              if: ${{ steps.download_artifact.outcome == 'success' }}
               uses: ./.github/setup-node
 
             - name: Npm build
-              if: ${{ steps.download_artifact.outcome == 'success' }}
               # TODO: We don't have to build the entire project, just the action itself.
               run: npm run build:packages
 
             - name: Report flaky tests
-              if: ${{ steps.download_artifact.outcome == 'success' }}
               uses: ./packages/report-flaky-tests
               with:
                   repo-token: '${{ secrets.GITHUB_TOKEN }}'
diff --git a/.github/workflows/enforce-pr-labels.yml b/.github/workflows/enforce-pr-labels.yml
index 4ef163694b947a..7493459a6ff35c 100644
--- a/.github/workflows/enforce-pr-labels.yml
+++ b/.github/workflows/enforce-pr-labels.yml
@@ -12,7 +12,7 @@ jobs:
               with:
                   mode: exactly
                   count: 1
-                  labels: '[Type] Automated Testing, [Type] Breaking Change, [Type] Bug, [Type] Build Tooling, [Type] Code Quality, [Type] Copy, [Type] Developer Documentation, [Type] Enhancement, [Type] Experimental, [Type] Feature, [Type] New API, [Type] Task, [Type] Performance, [Type] Project Management, [Type] Regression, [Type] Security, [Type] WP Core Ticket, Backport from WordPress Core'
+                  labels: '[Type] Automated Testing, [Type] Breaking Change, [Type] Bug, [Type] Build Tooling, [Type] Code Quality, [Type] Copy, [Type] Developer Documentation, [Type] Enhancement, [Type] Experimental, [Type] Feature, [Type] New API, [Type] Task, [Type] Technical Prototype, [Type] Performance, [Type] Project Management, [Type] Regression, [Type] Security, [Type] WP Core Ticket, Backport from WordPress Core, Gutenberg Plugin'
                   add_comment: true
                   message: "**Warning: Type of PR label mismatch**\n\n To merge this PR, it requires {{ errorString }} {{ count }} label indicating the type of PR. Other labels are optional and not being checked here. \n- **Type-related labels to choose from**: {{ provided }}.\n- **Labels found**: {{ applied }}.\n\nRead more about [Type labels in Gutenberg](https://github.com/WordPress/gutenberg/labels?q=type). Don't worry if you don't have the required permissions to add labels; the PR reviewer should be able to help with the task."
                   exit_type: failure
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index bc457758b8385b..f268ac7183ee21 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,7 +6,7 @@ jobs:
         name: 'Validation'
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-            - uses: gradle/wrapper-validation-action@v1
+            - uses: gradle/wrapper-validation-action@v3
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 517febe9774a99..b947f4ff08c602 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -25,6 +25,7 @@ concurrency:
 
 jobs:
     performance:
+        timeout-minutes: 60
         name: Run performance tests
         runs-on: ubuntu-latest
         if: ${{ github.repository == 'WordPress/gutenberg' }}
@@ -32,7 +33,7 @@ jobs:
             WP_ARTIFACTS_PATH: ${{ github.workspace }}/artifacts
 
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
@@ -46,9 +47,9 @@ jobs:
                   [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
                   nvm -v
 
-            - name: Compare performance with trunk
+            - name: Compare performance with base branch
               if: github.event_name == 'pull_request'
-              run: ./bin/plugin/cli.js perf $GITHUB_SHA trunk --tests-branch $GITHUB_SHA
+              run: ./bin/plugin/cli.js perf $GITHUB_SHA ${{ github.base_ref }} --tests-branch $GITHUB_SHA
 
             - name: Compare performance with current WordPress Core and previous Gutenberg versions
               if: github.event_name == 'release'
@@ -68,13 +69,13 @@ jobs:
             - name: Compare performance with base branch
               if: github.event_name == 'push'
               # The base hash used here need to be a commit that is compatible with the current WP version
-              # The current one is b61dde2e5ec29d98801e623de968bfb286c5be3f and it needs to be updated every WP major release.
+              # The current one is 5f4c9c853b15092ed885d5280edefb973c37d9e9 and it needs to be updated every WP major release.
               # It is used as a base comparison point to avoid fluctuation in the performance metrics.
               run: |
                   WP_VERSION=$(awk -F ': ' '/^Tested up to/{print $2}' readme.txt)
                   IFS=. read -ra WP_VERSION_ARRAY <<< "$WP_VERSION"
                   WP_MAJOR="${WP_VERSION_ARRAY[0]}.${WP_VERSION_ARRAY[1]}"
-                  ./bin/plugin/cli.js perf $GITHUB_SHA b61dde2e5ec29d98801e623de968bfb286c5be3f --tests-branch $GITHUB_SHA --wp-version "$WP_MAJOR"
+                  ./bin/plugin/cli.js perf $GITHUB_SHA 5f4c9c853b15092ed885d5280edefb973c37d9e9 --tests-branch $GITHUB_SHA --wp-version "$WP_MAJOR"
 
             - name: Compare performance with custom branches
               if: github.event_name == 'workflow_dispatch'
@@ -84,9 +85,12 @@ jobs:
               run: |
                   ./bin/plugin/cli.js perf $(echo $BRANCHES | tr ',' ' ') --tests-branch $GITHUB_SHA --wp-version "$WP_VERSION"
 
+            - name: Add workflow summary
+              run: cat ${{ env.WP_ARTIFACTS_PATH }}/summary.md >> $GITHUB_STEP_SUMMARY
+
             - name: Archive performance results
               if: success()
-              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+              uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
               with:
                   name: performance-results
                   path: ${{ env.WP_ARTIFACTS_PATH }}/*.performance-results*.json
@@ -97,10 +101,10 @@ jobs:
                   CODEHEALTH_PROJECT_TOKEN: ${{ secrets.CODEHEALTH_PROJECT_TOKEN }}
               run: |
                   COMMITTED_AT=$(git show -s $GITHUB_SHA --format="%cI")
-                  ./bin/log-performance-results.js $CODEHEALTH_PROJECT_TOKEN trunk $GITHUB_SHA b61dde2e5ec29d98801e623de968bfb286c5be3f $COMMITTED_AT
+                  ./bin/log-performance-results.js $CODEHEALTH_PROJECT_TOKEN trunk $GITHUB_SHA 5f4c9c853b15092ed885d5280edefb973c37d9e9 $COMMITTED_AT
 
             - name: Archive debug artifacts (screenshots, HTML snapshots)
-              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+              uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
               if: failure()
               with:
                   name: failures-artifacts
diff --git a/.github/workflows/php-changes-detection.yml b/.github/workflows/php-changes-detection.yml
deleted file mode 100644
index 7e80157d0caf7c..00000000000000
--- a/.github/workflows/php-changes-detection.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: OPTIONAL - Confirm if PHP changes require backporting to WordPress Core
-
-on:
-    pull_request:
-        types: [opened, synchronize]
-jobs:
-    detect_php_changes:
-        name: Detect PHP changes
-        runs-on: ubuntu-latest
-        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
-        steps:
-            - name: Check out code
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-              with:
-                  fetch-depth: 0
-                  show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
-
-            - name: Get changed PHP files
-              id: changed-files-php
-              uses: tj-actions/changed-files@25ef3926d147cd02fc7e931c1ef50772bbb0d25d # v40.1.1
-              with:
-                  files: |
-                      *.{php}
-                      lib/**
-                      phpunit/**
-
-            - name: List all changed files
-              if: steps.changed-files-php.outputs.any_changed == 'true'
-              id: list-changed-php-files
-              run: |
-                  echo "Changed files:"
-                  formatted_change_list=""
-                  for file in ${{ steps.changed-files-php.outputs.all_changed_files }}; do
-                    echo "$file was changed"
-                    formatted_change_list+="<br>:grey_question: $file"
-                  done
-                  formatted_change_list+="<br>"
-                  echo "formatted_change_list=$formatted_change_list" >> $GITHUB_OUTPUT
-
-            - name: Find Comment
-              uses: peter-evans/find-comment@v2
-              id: find-comment
-              with:
-                  issue-number: ${{ github.event.pull_request.number }}
-                  comment-author: 'github-actions[bot]'
-                  body-includes: '<!-- pr-contains-php-changes -->'
-
-            - name: Create comment
-              if: steps.find-comment.outputs.comment-id == '' && steps.changed-files-php.outputs.any_changed == 'true'
-              uses: peter-evans/create-or-update-comment@v3
-              with:
-                  issue-number: ${{ github.event.pull_request.number }}
-                  body: |
-                      <!-- pr-contains-php-changes -->
-                      This pull request has changed or added PHP files. Please confirm whether these changes need to be synced to WordPress Core, and therefore featured in the next release of WordPress.
-
-                      If so, it is recommended to create a [new Trac ticket](https://core.trac.wordpress.org/newticket) and submit a pull request to the [WordPress Core Github repository](https://github.com/WordPress/wordpress-develop) soon after this pull request is merged.
-
-                      If you're unsure, you can always ask for help in the #core-editor channel in  [WordPress Slack](https://make.wordpress.org/chat/).
-
-                      Thank you! :heart:
-
-                      <details>
-                        <summary>View changed files</summary>
-                        ${{ steps.list-changed-php-files.outputs.formatted_change_list }}
-                      </details>
-
-            - name: Update comment
-              if: steps.find-comment.outputs.comment-id != '' && steps.changed-files-php.outputs.any_changed == 'true'
-              uses: peter-evans/create-or-update-comment@v3
-              with:
-                  comment-id: ${{ steps.find-comment.outputs.comment-id }}
-                  issue-number: ${{ github.event.pull_request.number }}
-                  edit-mode: replace
-                  body: |
-                      <!-- pr-contains-php-changes -->
-                      This pull request has changed or added PHP files. Please confirm whether these changes need to be synced to WordPress Core, and therefore featured in the next release of WordPress.
-
-                      If so, it is recommended to create a [new Trac ticket](https://core.trac.wordpress.org/newticket) and submit a pull request to the [WordPress Core Github repository](https://github.com/WordPress/wordpress-develop) soon after this pull request is merged.
-
-                      If you're unsure, you can always ask for help in the #core-editor channel in  [WordPress Slack](https://make.wordpress.org/chat/).
-
-                      Thank you! :heart:
-
-                      <details>
-                        <summary>View changed files</summary>
-                        ${{ steps.list-changed-php-files.outputs.formatted_change_list }}
-                      </details>
-
-            - name: Update comment
-              if: steps.find-comment.outputs.comment-id != '' && steps.changed-files-php.outputs.any_changed != 'true'
-              uses: peter-evans/create-or-update-comment@v3
-              with:
-                  comment-id: ${{ steps.find-comment.outputs.comment-id }}
-                  issue-number: ${{ github.event.pull_request.number }}
-                  edit-mode: replace
-                  body: |
-                      <!-- pr-contains-php-changes -->
-                      This pull request changed or added PHP files in previous commits, but none have been detected in the latest commit.
-
-                      Thank you! :heart:
diff --git a/.github/workflows/props-bot.yml b/.github/workflows/props-bot.yml
new file mode 100644
index 00000000000000..b2332aabb816c7
--- /dev/null
+++ b/.github/workflows/props-bot.yml
@@ -0,0 +1,88 @@
+name: Props Bot
+
+on:
+    # This event runs anytime a PR is (re)opened, updated, marked ready for review, or labeled.
+    # GitHub does not allow filtering the `labeled` event by a specific label.
+    # However, the logic below will short-circuit the workflow when the `props-bot` label is not the one being added.
+    # Note: The pull_request_target event is used instead of pull_request because this workflow needs permission to comment
+    # on the pull request. Because this event grants extra permissions to `GITHUB_TOKEN`, any code changes within the PR
+    # should be considered untrusted. See https://securitylab.github.com/research/github-actions-preventing-pwn-requests/.
+    pull_request_target:
+        types:
+            - opened
+            - synchronize
+            - reopened
+            - labeled
+            - ready_for_review
+    # This event runs anytime a comment is added or deleted.
+    # You cannot filter this event for PR comments only.
+    # However, the logic below does short-circuit the workflow for issues.
+    issue_comment:
+        types:
+            - created
+    # This event will run everytime a new PR review is initially submitted.
+    pull_request_review:
+        types:
+            - submitted
+    # This event runs anytime a PR review comment is created or deleted.
+    pull_request_review_comment:
+        types:
+            - created
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ contains( fromJSON( '["pull_request_target", "pull_request_review", "pull_request_review_comment"]' ), github.event_name ) && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
+jobs:
+    # Compiles a list of props for a pull request.
+    #
+    # Performs the following steps:
+    # - Collects a list of contributor props and leaves a comment.
+    # - Removes the props-bot label, if necessary.
+    props-bot:
+        name: Generate a list of props
+        runs-on: ubuntu-latest
+        permissions:
+            # The action needs permission `write` permission for PRs in order to add a comment.
+            pull-requests: write
+            contents: read
+        timeout-minutes: 20
+        # The job will run when pull requests are open, ready for review and:
+        #
+        # - A comment is added to the pull request.
+        # - A review is created or commented on.
+        # - The pull request is opened, synchronized, marked ready for review, or reopened.
+        # - The `props-bot` label is added to the pull request.
+        if: |
+            (
+              github.event_name == 'issue_comment' && github.event.issue.pull_request ||
+              contains( fromJSON( '["pull_request_review", "pull_request_review_comment"]' ), github.event_name ) ||
+              github.event_name == 'pull_request_target' && github.event.action != 'labeled' ||
+              'props-bot' == github.event.label.name
+            ) &&
+            ( ! github.event.pull_request.draft && github.event.pull_request.state == 'open' || ! github.event.issue.draft && github.event.issue.state == 'open' )
+
+        steps:
+            - name: Gather a list of contributors
+              uses: WordPress/props-bot-action@trunk
+
+            - name: Remove the props-bot label
+              uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+              if: ${{ github.event.action == 'labeled' && 'props-bot' == github.event.label.name }}
+              with:
+                  retries: 2
+                  retry-exempt-status-codes: 418
+                  script: |
+                      github.rest.issues.removeLabel({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        issue_number: '${{ github.event.number }}',
+                        name: 'props-bot'
+                      });
diff --git a/.github/workflows/publish-npm-packages.yml b/.github/workflows/publish-npm-packages.yml
index 18bdb63a6c3770..b95a4baaf5075a 100644
--- a/.github/workflows/publish-npm-packages.yml
+++ b/.github/workflows/publish-npm-packages.yml
@@ -31,7 +31,7 @@ jobs:
         steps:
             - name: Checkout (for CLI)
               if: ${{ github.event.inputs.release_type != 'wp' }}
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   path: cli
                   ref: trunk
@@ -39,7 +39,7 @@ jobs:
 
             - name: Checkout (for publishing)
               if: ${{ github.event.inputs.release_type != 'wp' }}
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   path: publish
                   # Later, we switch this branch in the script that publishes packages.
@@ -49,7 +49,7 @@ jobs:
 
             - name: Checkout (for publishing WP major version)
               if: ${{ github.event.inputs.release_type == 'wp' && github.event.inputs.wp_version }}
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   path: publish
                   ref: wp/${{ github.event.inputs.wp_version }}
@@ -67,17 +67,19 @@ jobs:
 
             - name: Setup Node.js
               if: ${{ github.event.inputs.release_type != 'wp' }}
-              uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+              uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
               with:
                   node-version-file: 'cli/.nvmrc'
                   registry-url: 'https://registry.npmjs.org'
+                  check-latest: true
 
             - name: Setup Node.js (for WP major version)
               if: ${{ github.event.inputs.release_type == 'wp' && github.event.inputs.wp_version }}
-              uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+              uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
               with:
                   node-version-file: 'publish/.nvmrc'
                   registry-url: 'https://registry.npmjs.org'
+                  check-latest: true
 
             - name: Publish development packages to npm ("next" dist-tag)
               if: ${{ github.event.inputs.release_type == 'development' }}
diff --git a/.github/workflows/pull-request-automation.yml b/.github/workflows/pull-request-automation.yml
index b8154e335776a2..cf37fa00c060bf 100644
--- a/.github/workflows/pull-request-automation.yml
+++ b/.github/workflows/pull-request-automation.yml
@@ -8,35 +8,17 @@ jobs:
     pull-request-automation:
         runs-on: ubuntu-latest
         if: ${{ github.repository == 'WordPress/gutenberg' }}
-        strategy:
-            matrix:
-                node: ['16']
 
         steps:
             # Checkout defaults to using the branch which triggered the event, which
             # isn't necessarily `trunk` (e.g. in the case of a merge).
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   ref: trunk
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
-            - name: Use desired version of Node.js
-              uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
-              with:
-                  node-version: ${{ matrix.node }}
-
-            - name: Cache NPM packages
-              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
-              with:
-                  # npm cache files are stored in `~/.npm` on Linux/macOS
-                  path: ~/.npm
-                  key: ${{ runner.os }}-node-${{ matrix.node }}-npm-pr-automation-cache-${{ hashFiles('**/package-lock.json') }}
-
-            # Changing into the action's directory and running `npm install` is much
-            # faster than a full project-wide `npm ci`.
-            - name: Install NPM dependencies
-              run: npm install
-              working-directory: packages/project-management-automation
+            - name: Setup Node.js and install dependencies
+              uses: ./.github/setup-node
 
             - uses: ./packages/project-management-automation
               with:
diff --git a/.github/workflows/rnmobile-android-runner.yml b/.github/workflows/rnmobile-android-runner.yml
index 5620e0f66abe5e..df302926f20cef 100644
--- a/.github/workflows/rnmobile-android-runner.yml
+++ b/.github/workflows/rnmobile-android-runner.yml
@@ -23,12 +23,12 @@ jobs:
 
         steps:
             - name: checkout
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
             - name: Use desired version of Java
-              uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+              uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
               with:
                   distribution: 'corretto'
                   java-version: '17'
@@ -37,7 +37,7 @@ jobs:
               uses: ./.github/setup-node
 
             - name: Restore tests setup cache
-              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+              uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
               with:
                   path: |
                       ~/.appium
@@ -47,10 +47,10 @@ jobs:
               run: npm run native test:e2e:setup
 
             - name: Gradle cache
-              uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
+              uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
 
             - name: AVD cache
-              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+              uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
               id: avd-cache
               with:
                   path: |
@@ -60,7 +60,7 @@ jobs:
 
             - name: Create AVD and generate snapshot for caching
               if: steps.avd-cache.outputs.cache-hit != 'true'
-              uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b # v2.28.0
+              uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # v2.33.0
               with:
                   api-level: ${{ matrix.api-level }}
                   force-avd-creation: false
@@ -71,7 +71,7 @@ jobs:
                   script: echo "Generated AVD snapshot for caching."
 
             - name: Run tests
-              uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b # v2.28.0
+              uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # v2.33.0
               with:
                   api-level: ${{ matrix.api-level }}
                   force-avd-creation: false
@@ -81,13 +81,13 @@ jobs:
                   profile: Nexus 6
                   script: npm run native test:e2e:android:local ${{ matrix.native-test-name }}
 
-            - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+            - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
               if: always()
               with:
                   name: android-screen-recordings
                   path: packages/react-native-editor/android-screen-recordings
 
-            - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+            - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
               if: always()
               with:
                   name: appium-logs
diff --git a/.github/workflows/rnmobile-ios-runner.yml b/.github/workflows/rnmobile-ios-runner.yml
index fe3b9b3a3c3a55..90fb7e15fe4d1f 100644
--- a/.github/workflows/rnmobile-ios-runner.yml
+++ b/.github/workflows/rnmobile-ios-runner.yml
@@ -23,10 +23,15 @@ jobs:
                 native-test-name: [gutenberg-editor-rendering]
 
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
+            - uses: ruby/setup-ruby@7bae1d00b5db9166f4f0fc47985a3a5702cb58f0 # v1.197.0
+              with:
+                  # `.ruby-version` file location
+                  working-directory: packages/react-native-editor/ios
+
             - name: Switch Xcode version to ${{ matrix.xcode }}
               run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app
 
@@ -37,7 +42,7 @@ jobs:
               uses: ./.github/setup-node
 
             - name: Restore tests setup cache
-              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+              uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
               with:
                   path: |
                       ~/.appium
@@ -50,7 +55,7 @@ jobs:
               run: find package-lock.json packages/react-native-editor/ios packages/react-native-aztec/ios packages/react-native-bridge/ios -type f -print0 | sort -z | xargs -0 shasum | tee ios-checksums.txt
 
             - name: Restore build cache
-              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+              uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
               with:
                   path: |
                       packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app
@@ -58,7 +63,7 @@ jobs:
                   key: ${{ runner.os }}-ios-build-${{ matrix.xcode }}-${{ matrix.device }}-${{ hashFiles('ios-checksums.txt') }}
 
             - name: Restore pods cache
-              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+              uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
               with:
                   path: |
                       packages/react-native-editor/ios/Pods
@@ -84,13 +89,13 @@ jobs:
                   rm packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app/main.jsbundle
                   rm -rf packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app/assets
 
-            - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+            - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
               if: always()
               with:
                   name: ios-screen-recordings
                   path: packages/react-native-editor/ios-screen-recordings
 
-            - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+            - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
               if: always()
               with:
                   name: appium-logs
diff --git a/.github/workflows/stale-issue-gardening.yml b/.github/workflows/stale-issue-gardening.yml
index cbeb04ead53214..c73fe7a19b24b3 100644
--- a/.github/workflows/stale-issue-gardening.yml
+++ b/.github/workflows/stale-issue-gardening.yml
@@ -36,7 +36,7 @@ jobs:
 
         steps:
             - name: Update issues
-              uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
+              uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
               with:
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   stale-issue-message: ${{ matrix.message }}
diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
index ff8c27b14e39e8..bf1a70d3adefc2 100644
--- a/.github/workflows/static-checks.yml
+++ b/.github/workflows/static-checks.yml
@@ -22,14 +22,15 @@ jobs:
         if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
 
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
             - name: Use desired version of Node.js
-              uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+              uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
               with:
                   node-version-file: '.nvmrc'
+                  check-latest: true
                   cache: npm
 
             - name: Npm install
diff --git a/.github/workflows/storybook-pages.yml b/.github/workflows/storybook-pages.yml
index 5117e2fc9fe6ec..a0a7d0f12db1e5 100644
--- a/.github/workflows/storybook-pages.yml
+++ b/.github/workflows/storybook-pages.yml
@@ -12,7 +12,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   ref: trunk
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
@@ -24,7 +24,7 @@ jobs:
               run: npm run storybook:build
 
             - name: Deploy
-              uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
+              uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
               with:
                   github_token: ${{ secrets.GITHUB_TOKEN }}
                   publish_dir: ./storybook/build
diff --git a/.github/workflows/sync-backport-changelog.yml b/.github/workflows/sync-backport-changelog.yml
new file mode 100644
index 00000000000000..31b00459c24c6c
--- /dev/null
+++ b/.github/workflows/sync-backport-changelog.yml
@@ -0,0 +1,91 @@
+name: Sync Core Backport Issue
+
+on:
+    push:
+        branches:
+            - trunk
+    issues:
+        types: [labeled]
+
+jobs:
+    sync-backport-changelog:
+        name: Sync Core Backport Issue
+        runs-on: ubuntu-latest
+        if: >
+            github.event_name == 'push' ||
+            (
+                github.event_name == 'issues' &&
+                github.event.action == 'labeled' &&
+                github.event.label.name == '🤖 Sync Backport Changelog'
+            )
+        steps:
+            - name: Checkout
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+              with:
+                  fetch-depth: 2 # Fetch the last two commits to compare changes
+            - name: Check for changes in backport-changelog
+              if: github.event_name == 'push'
+              run: |
+                  if git diff --quiet HEAD^ HEAD -- backport-changelog; then
+                      echo "skip_sync=true" >> "$GITHUB_ENV"
+                  fi
+            - name: Sync Issue
+              if: ${{ ! env.skip_sync }}
+              uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+              with:
+                  script: |
+                      const labelName = '🤖 Sync Backport Changelog';
+                      const issues = await github.paginate(github.rest.issues.listForRepo, {
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        labels: [labelName],
+                        state: 'open',
+                        per_page: 1,
+                      });
+
+                      if (issues.length === 0) {
+                        console.log(`No issues found with the "${labelName}" label.`);
+                        return;
+                      }
+
+                      const [latestIssue] = issues;
+                      const versionMatch = latestIssue.title.match(/(\d+\.\d+)/);
+                      if (!versionMatch) {
+                        console.log('Could not find a version number in the latest issue title.');
+                        return;
+                      }
+
+                      const version = versionMatch[1];
+                      console.log(`Latest version: ${version}`);
+
+                      const { execSync } = require('child_process');
+                      const processedChangelog = execSync(`awk '/./ {print ($0 ~ /^[-*]/ ? "  " : "- ") $0}' backport-changelog/${version}/*.md`).toString().trim();
+
+                      const startDelimiter = '<!-- START TRUNK BACKPORT CHANGELOG -->';
+                      const endDelimiter = '<!-- END TRUNK BACKPORT CHANGELOG -->';
+                      const autoGeneratedContent = `${startDelimiter}\n${processedChangelog}\n${endDelimiter}`;
+
+                      const existingBody = latestIssue.body ?? '';
+
+                      let newBody;
+
+                      const regex = new RegExp(`${startDelimiter}[\\s\\S]*${endDelimiter}`);
+                      if (regex.test(existingBody)) {
+                        // If delimiters exist, replace the content between them
+                        newBody = existingBody.replace(regex, autoGeneratedContent);
+                      } else {
+                        // If delimiters don't exist, append the new content at the end
+                        newBody = `${existingBody}\n\n${autoGeneratedContent}`;
+                      }
+
+                      if (newBody.trim() !== existingBody.trim()) {
+                        await github.rest.issues.update({
+                          owner: context.repo.owner,
+                          repo: context.repo.repo,
+                          issue_number: latestIssue.number,
+                          body: newBody
+                        });
+                        console.log('Issue description updated successfully.');
+                      } else {
+                        console.log('Issue description is already up to date.');
+                      }
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 78f70cc4ed9f74..cb3ac1cc1b154f 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -21,17 +21,18 @@ concurrency:
 
 jobs:
     unit-js:
-        name: JavaScript
+        name: JavaScript (Node.js ${{ matrix.node }}) ${{ matrix.shard }}
         runs-on: ubuntu-latest
         if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
-
         strategy:
             fail-fast: false
             matrix:
-                node: ['16']
+                node: ['20', '22']
+                shard: ['1/4', '2/4', '3/4', '4/4']
 
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - name: Checkout repository
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
@@ -40,17 +41,56 @@ jobs:
               with:
                   node-version: ${{ matrix.node }}
 
-            - name: Npm build
+            - name: Determine the number of CPU cores
+              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2.0.0
+              id: cpu-cores
+
+            - name: Run build scripts
               # It's not necessary to run the full build, since Jest can interpret
               # source files with `babel-jest`. Some packages have their own custom
               # build tasks, however. These must be run.
               run: npx lerna run build
 
             - name: Running the tests
-              run: npm run test:unit -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"
+              run: |
+                  npm run test:unit -- \
+                    --ci \
+                    --maxWorkers="${{ steps.cpu-cores.outputs.count }}" \
+                    --shard="${{ matrix.shard }}" \
+                    --cacheDirectory="$HOME/.jest-cache"
+
+    unit-js-date:
+        name: JavaScript Date Tests (Node.js ${{ matrix.node }})
+        runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
+        strategy:
+            fail-fast: false
+            matrix:
+                node: ['20', '22']
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+              with:
+                  show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
-            - name: Running the date tests
-              run: npm run test:unit:date -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"
+            - name: Setup Node.js and install dependencies
+              uses: ./.github/setup-node
+              with:
+                  node-version: ${{ matrix.node }}
+
+            - name: Determine the number of CPU cores
+              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2.0.0
+              id: cpu-cores
+
+            - name: Run build scripts
+              # It's not necessary to run the full build, since Jest can interpret
+              # source files with `babel-jest`. Some packages have their own custom
+              # build tasks, however. These must be run.
+              run: npx lerna run build
+
+            - name: Run the date tests
+              run: npm run test:unit:date -- --ci --maxWorkers=${{ steps.cpu-cores.outputs.count }} --cacheDirectory="$HOME/.jest-cache"
 
     compute-previous-wordpress-version:
         name: Compute previous WordPress version
@@ -77,9 +117,31 @@ jobs:
                   echo "previous-wordpress-version=${PREVIOUS_WP_VERSION}" >> $GITHUB_OUTPUT
                   rm versions.json
 
+    build-assets:
+        name: Build JavaScript assets for PHP unit tests
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+              with:
+                  show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
+
+            - name: Setup Node.js and install dependencies
+              uses: ./.github/setup-node
+
+            - name: Run build scripts
+              run: npm run build
+
+            - name: Upload built JavaScript assets
+              uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+              with:
+                  name: build-assets
+                  path: |
+                      ./build/
+                      ./build-module/
+
     test-php:
         name: PHP ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.wordpress != '' && format( ' (WP {0}) ', matrix.wordpress ) || '' }} on ubuntu-latest
-        needs: compute-previous-wordpress-version
+        needs: [compute-previous-wordpress-version, build-assets]
         runs-on: ubuntu-latest
         timeout-minutes: 20
         if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
@@ -87,31 +149,31 @@ jobs:
             fail-fast: true
             matrix:
                 php:
-                    - '7.0'
-                    - '7.1'
                     - '7.2'
                     - '7.3'
                     - '7.4'
                     - '8.0'
                     - '8.1'
                     - '8.2'
+                    - '8.3'
                 multisite: [false, true]
                 wordpress: [''] # Latest WordPress version.
                 include:
                     # Test with the previous WP version.
-                    - php: '7.0'
-                      wordpress: ${{ needs.compute-previous-wordpress-version.outputs.previous-wordpress-version }}
+                    - php: '7.2'
+                      wordpress: 'previous major version'
                     - php: '7.4'
-                      wordpress: ${{ needs.compute-previous-wordpress-version.outputs.previous-wordpress-version }}
-                    - php: '8.2'
-                      wordpress: ${{ needs.compute-previous-wordpress-version.outputs.previous-wordpress-version }}
+                      wordpress: 'previous major version'
+                    - php: '8.3'
+                      wordpress: 'previous major version'
 
         env:
             WP_ENV_PHP_VERSION: ${{ matrix.php }}
-            WP_ENV_CORE: ${{ matrix.wordpress == '' && 'WordPress/WordPress' || format( 'https://wordpress.org/wordpress-{0}.zip', matrix.wordpress ) }}
+            WP_ENV_CORE: ${{ matrix.wordpress == '' && 'WordPress/WordPress' || format( 'https://wordpress.org/wordpress-{0}.zip', needs.compute-previous-wordpress-version.outputs.previous-wordpress-version ) }}
 
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - name: Checkout repository
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
@@ -126,7 +188,7 @@ jobs:
             # dependency versions are installed and cached.
             ##
             - name: Set up PHP
-              uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
+              uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
               with:
                   php-version: '${{ matrix.php }}'
                   ini-file: development
@@ -136,26 +198,21 @@ jobs:
             - name: Override PHP version in composer.json
               run: composer config platform.php ${{ matrix.php }}
 
-            # The spatie/phpunit-watcher package is not compatible with PHP < 7.2.
-            # It must be removed before running the tests.
-            - name: Remove incompatible Composer packages
-              if: ${{ matrix.php < '7.2' }}
-              run: composer remove spatie/phpunit-watcher --dev --no-update
-
             # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
             # passing a custom cache suffix ensures that the cache is flushed at least once per week.
             - name: Install Composer dependencies
-              uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
+              uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a # v3.0.0
               with:
                   custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F")
 
-            - name: Npm build
-              run: npm run build
+            - name: Download built JavaScript assets
+              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+              with:
+                  name: build-assets
 
             - name: Docker debug information
               run: |
                   docker -v
-                  docker-compose -v
 
             - name: General debug information
               run: |
@@ -163,7 +220,6 @@ jobs:
                   node --version
                   curl --version
                   git --version
-                  svn --version
                   locale -a
 
             - name: Start Docker environment
@@ -180,6 +236,7 @@ jobs:
                   npm run wp-env run tests-wordpress php -i
                   npm run wp-env run tests-wordpress /var/www/html/wp-content/plugins/gutenberg/vendor/bin/phpunit -- --version
                   npm run wp-env run tests-wordpress locale -a
+                  npm run wp-env run tests-cli wp core version
 
             - name: Running single site unit tests
               if: ${{ ! matrix.multisite }}
@@ -221,12 +278,12 @@ jobs:
 
         steps:
             - name: Checkout repository
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
             - name: Set up PHP
-              uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
+              uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
               with:
                   php-version: '7.4'
                   coverage: none
@@ -239,7 +296,7 @@ jobs:
               run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
 
             - name: Cache PHPCS scan cache
-              uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+              uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
               with:
                   path: .cache/phpcs.json
                   key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcs-cache-${{ hashFiles('**/composer.json', 'phpcs.xml.dist') }}
@@ -247,7 +304,7 @@ jobs:
             # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
             # passing a custom cache suffix ensures that the cache is flushed at least once per week.
             - name: Install Composer dependencies
-              uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
+              uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a # v3.0.0
               with:
                   custom-cache-suffix: ${{ steps.get-date.outputs.date }}
 
@@ -290,18 +347,23 @@ jobs:
         if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
 
         steps:
-            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+            - name: Checkout repository
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
+            - name: Determine the number of CPU cores
+              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2.0.0
+              id: cpu-cores
+
             - name: Setup Node.js and install dependencies
               uses: ./.github/setup-node
 
-            - name: Npm build
+            - name: Run build scripts
               # It's not necessary to run the full build, since Jest can interpret
               # source files with `babel-jest`. Some packages have their own custom
               # build tasks, however. These must be run.
               run: npx lerna run build
 
             - name: Running the tests
-              run: npm run test:native -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"
+              run: npm run test:native -- --ci --maxWorkers=${{ steps.cpu-cores.outputs.count }} --cacheDirectory="$HOME/.jest-cache"
diff --git a/.github/workflows/upload-release-to-plugin-repo.yml b/.github/workflows/upload-release-to-plugin-repo.yml
index c10020be057bcb..e8d3e3e245abd0 100644
--- a/.github/workflows/upload-release-to-plugin-repo.yml
+++ b/.github/workflows/upload-release-to-plugin-repo.yml
@@ -51,7 +51,7 @@ jobs:
                     return $?
                   }
 
-                  # Only update trunk *if* the published release's version in Github is GREATER
+                  # Only update trunk *if* the published release's version in GitHub is GREATER
                   # than the version currently published in the WP plugins repo. If not, then it
                   # will upload it as a new tag.
                   shouldUpdateTrunk=false
@@ -96,7 +96,7 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+              uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
               with:
                   ref: ${{ matrix.branch }}
                   token: ${{ secrets.GUTENBERG_TOKEN }}
@@ -147,7 +147,7 @@ jobs:
                   fi
 
             - name: Upload Changelog artifact
-              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+              uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
               with:
                   name: changelog ${{ matrix.label }}
                   path: ./changelog.txt
@@ -189,7 +189,7 @@ jobs:
                   sed -i "s/$STABLE_TAG_PLACEHOLDER/Stable tag: $VERSION/g" ./trunk/readme.txt
 
             - name: Download Changelog Artifact
-              uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
+              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
               with:
                   name: changelog trunk
                   path: trunk
@@ -247,7 +247,7 @@ jobs:
                   sed -i "s/$STABLE_TAG_PLACEHOLDER/Stable tag: $VERSION/g" "$VERSION/readme.txt"
 
             - name: Download Changelog Artifact
-              uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
+              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
               with:
                   name: changelog trunk
                   path: ${{ github.event.release.name }}
diff --git a/.gitignore b/.gitignore
index 48cd7580beed14..f699ecfcd4b9ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,5 @@ test/storybook-playwright/specs/__snapshots__
 test/storybook-playwright/specs/*-snapshots/**
 test/gutenberg-test-themes/twentytwentyone
 test/gutenberg-test-themes/twentytwentythree
+test/gutenberg-test-themes/twentytwentyfour
 packages/react-native-editor/src/setup-local.js
diff --git a/.npmrc b/.npmrc
index cd7566c8202337..84662ee5b78b78 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,3 +1,5 @@
 save-exact = true
 engine-strict = true
 legacy-peer-deps = true
+prefer-dedupe = true
+lockfile-version = 3
diff --git a/.nvmrc b/.nvmrc
index b6a7d89c68e0ca..209e3ef4b6247c 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-16
+20
diff --git a/.prettierignore b/.prettierignore
index 0b73d70681dbb0..d50079e4ef71ef 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,7 +3,7 @@ build
 build-module
 build-types
 packages/block-serialization-spec-parser/parser.js
-packages/e2e-tests/plugins
+packages/edit-site/lib
 packages/react-native-editor/bundle
 packages/url/src/test/fixtures
 vendor
diff --git a/.prettierrc.js b/.prettierrc.js
index 51b8aeb41505a6..0a95f2da679606 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,3 +1,11 @@
 // Import the default config file and expose it in the project root.
 // Useful for editor integrations.
-module.exports = require( '@wordpress/prettier-config' );
+module.exports = {
+	...require( '@wordpress/prettier-config' ),
+	overrides: [
+		{
+			files: [ 'changelog.txt' ],
+			options: { parser: 'markdown' },
+		},
+	],
+};
diff --git a/.stylelintrc.json b/.stylelintrc.json
index c7a2d1db18a460..557376e02c4062 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,18 +1,40 @@
 {
-	"extends": "@wordpress/stylelint-config/scss",
+	"extends": "@wordpress/stylelint-config/scss-stylistic",
 	"rules": {
 		"at-rule-empty-line-before": null,
 		"at-rule-no-unknown": null,
 		"comment-empty-line-before": null,
+		"declaration-property-value-allowed-list": [
+			{
+				"flex-direction": "/^(?!(row|column)-reverse).*$/"
+			},
+			{
+				"message": "Avoid the flex-direction reverse values. For accessibility reasons, visual, reading, and DOM order must match. Only use the reverse values when they do not affect reading order, meaning, and interaction."
+			}
+		],
+		"declaration-property-value-disallowed-list": [
+			{
+				"/.*/": [ "/--wp-components-color-/" ]
+			},
+			{
+				"message": "--wp-components-color-* variables are not ready to be used outside of the components package."
+			}
+		],
 		"font-weight-notation": null,
-		"max-line-length": null,
+		"@stylistic/max-line-length": null,
 		"no-descending-specificity": null,
+		"property-disallowed-list": [
+			[ "order" ],
+			{
+				"message": "Avoid the order property. For accessibility reasons, visual, reading, and DOM order must match. Only use the order property when it does not affect reading order, meaning, and interaction."
+			}
+		],
 		"rule-empty-line-before": null,
 		"selector-class-pattern": null,
 		"value-keyword-case": null,
 		"scss/operator-no-unspaced": null,
 		"scss/selector-no-redundant-nesting-selector": null,
-		"scss/at-import-partial-extension": null,
+		"scss/load-partial-extension": null,
 		"scss/no-global-function-names": null,
 		"scss/comment-no-empty": null,
 		"scss/at-extend-no-missing-placeholder": null,
@@ -21,5 +43,6 @@
 		"scss/at-else-empty-line-before": null,
 		"scss/at-if-closing-brace-space-after": null,
 		"no-invalid-position-at-import-rule": null
-	}
+	},
+	"reportDescriptionlessDisables": true
 }
diff --git a/.wp-env.json b/.wp-env.json
index 79810b194b667c..05ea05b2809f9c 100644
--- a/.wp-env.json
+++ b/.wp-env.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "./schemas/json/wp-env.json",
 	"core": "WordPress/WordPress",
 	"plugins": [ "." ],
 	"themes": [ "./test/emptytheme" ],
@@ -9,8 +10,9 @@
 				"wp-content/mu-plugins": "./packages/e2e-tests/mu-plugins",
 				"wp-content/plugins/gutenberg-test-plugins": "./packages/e2e-tests/plugins",
 				"wp-content/themes/gutenberg-test-themes": "./test/gutenberg-test-themes",
-				"wp-content/themes/gutenberg-test-themes/twentytwentyone": "https://downloads.wordpress.org/theme/twentytwentyone.1.7.zip",
-				"wp-content/themes/gutenberg-test-themes/twentytwentythree": "https://downloads.wordpress.org/theme/twentytwentythree.1.0.zip"
+				"wp-content/themes/gutenberg-test-themes/twentytwentyone": "https://downloads.wordpress.org/theme/twentytwentyone.2.1.zip",
+				"wp-content/themes/gutenberg-test-themes/twentytwentythree": "https://downloads.wordpress.org/theme/twentytwentythree.1.3.zip",
+				"wp-content/themes/gutenberg-test-themes/twentytwentyfour": "https://downloads.wordpress.org/theme/twentytwentyfour.1.0.zip"
 			}
 		}
 	}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index f9afa872a60842..00000000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,11 +0,0 @@
-This project comes under the WordPress [Etiquette](https://wordpress.org/about/etiquette/):
-
-In the WordPress open source project, we realize that our biggest asset is the community that we foster. The project, as a whole, follows these basic philosophical principles from The Cathedral and The Bazaar.
-
--   Contributions to the WordPress open source project are for the benefit of the WordPress community as a whole, not specific businesses or individuals. All actions taken as a contributor should be made with the best interests of the community in mind.
--   Participation in the WordPress open source project is open to all who wish to join, regardless of ability, skill, financial status, or any other criteria.
--   The WordPress open source project is a volunteer-run community. Even in cases where contributors are sponsored by companies, that time is donated for the benefit of the entire open source community.
--   Any member of the community can donate their time and contribute to the project in any form including design, code, documentation, community building, etc. For more information, go to make.wordpress.org.
--   The WordPress open source community cares about diversity. We strive to maintain a welcoming environment where everyone can feel included, by keeping communication free of discrimination, incitement to violence, promotion of hate, and unwelcoming behavior.
-
-The team involved will block any user who causes any breach in this.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cd137ea37201c9..8eb4b77dbfcca9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ To learn all about contributing to the Gutenberg project, see the [Contributor G
 
 ## Guidelines
 
--   As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](/CODE_OF_CONDUCT.md).
+-   As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://make.wordpress.org/handbook/community-code-of-conduct/).
 
 -   Contributors should review the [overall process and best practices for pull requests](https://github.com/WordPress/gutenberg/blob/trunk/docs/contributors/repository-management.md#pull-requests), adhering to WordPress' [JavaScript coding standards](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/javascript/) and [accessibility coding standards](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/accessibility/).
 
diff --git a/LICENSE.md b/LICENSE.md
index 1dcb4d22cba5e6..983294723c4806 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 ## Gutenberg
 
-    Copyright 2016-2023 by the contributors
+    Copyright 2016-2024 by the contributors
 
 **License for Contributions (on and after April 15, 2021)**
 
diff --git a/README.md b/README.md
index 5ba112319b405c..9c920337ef5941 100644
--- a/README.md
+++ b/README.md
@@ -13,13 +13,13 @@
 
 Welcome to the development hub for the WordPress Gutenberg project!
 
-"Gutenberg" is a codename for a whole new paradigm in WordPress site building and publishing, that aims to revolutionize the entire publishing experience as much as Gutenberg did the printed word. Right now, the project is in the second phase of a four-phase process that will touch every piece of WordPress -- Editing, **Customization** (which includes Full Site Editing, Block Patterns, Block Directory and Block based themes), Collaboration, and Multilingual -- and is focused on a new editing experience, the block editor.
+"Gutenberg" is a codename for a whole new paradigm in WordPress site building and publishing, that aims to revolutionize the entire publishing experience as much as Gutenberg did the printed word. Right now, the project is in the second phase of a four-phase process that will touch every piece of WordPress -- Editing, Customization, **Collaboration** (which includes [Real-time collaboration](https://make.wordpress.org/core/2023/07/03/real-time-collaboration/), [Asynchronous collaboration](https://make.wordpress.org/core/2023/07/04/workflows/), [Publishing flows](https://make.wordpress.org/core/2023/07/04/workflows/), [Post revisions interface](https://make.wordpress.org/core/2023/07/05/revisions/), [Admin design](https://make.wordpress.org/core/2023/07/12/admin-design/), [Library](https://make.wordpress.org/core/2023/07/10/block-library/)), and Multilingual -- and is focused on a new editing experience, the block editor.
 
 The block editor introduces a modular approach to pages and posts: each piece of content in the editor, from a paragraph to an image gallery to a headline, is its own block. And just like physical blocks, WordPress blocks can be added, arranged, and rearranged, allowing WordPress users to create media-rich pages in a visually intuitive way -- and without work-arounds like shortcodes or custom HTML.
 
 The block editor first became available in December 2018, and we're still hard at work refining the experience, creating more and better blocks, and laying the groundwork for the next three phases of work. The Gutenberg plugin gives you the latest version of the block editor, so you can join us in testing bleeding-edge features, start playing with blocks, and maybe get inspired to build your own.
 
-Check out the [Ways to keep up with Gutenberg & Full Site Editing (FSE)](https://make.wordpress.org/core/2020/05/20/ways-to-keep-up-with-full-site-editing-fse/)
+Check out the [Keeping up with Gutenberg Index](https://make.wordpress.org/core/handbook/references/keeping-up-with-gutenberg-index/)
 
 ## Getting Started
 
@@ -37,7 +37,7 @@ Get hands on: check out the [block editor live demo](https://wordpress.org/guten
 
 Extending and customizing is at the heart of the WordPress platform, this is no different for the Gutenberg project. The editor and future products can be extended by third-party developers using plugins.
 
-Review the [Create a Block tutorial](/docs/getting-started/create-block/README.md) for the fastest way to get started extending the block editor. See the [Developer Documentation](https://developer.wordpress.org/block-editor/#develop-for-the-block-editor) for extensive tutorials, documentation, and API references.
+Review the [Quick Start Guide](https://developer.wordpress.org/block-editor/getting-started/quick-start-guide/) for the fastest way to get started extending the block editor. See the [Block Editor Handbook](https://developer.wordpress.org/block-editor/) for extensive tutorials, documentation, and API references. Also, check the [WordPress Developer Blog](https://developer.wordpress.org/blog/) for great articles about block development, among other topics.
 
 ### Contribute to Gutenberg
 
@@ -49,14 +49,12 @@ To get up and running quickly with **code contribution** see [Getting Started Wi
 
 In whichever way you wish to contribute please be sure to read the [Contributing Guidelines](https://github.com/WordPress/gutenberg/blob/HEAD/CONTRIBUTING.md) first.
 
-As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://github.com/WordPress/gutenberg/blob/HEAD/CODE_OF_CONDUCT.md).
+As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://make.wordpress.org/handbook/community-code-of-conduct/).
 
 ## Get Involved
 
 You can join us in the `#core-editor` channel in Slack, see the [WordPress Slack page](https://make.wordpress.org/chat/) for signup information; it is free to join.
 
-**Weekly meetings** The Editor Team meets weekly on Wednesdays at 14:00 UTC in Slack. If you can not join the meeting, [agenda](https://make.wordpress.org/core/tag/core-editor-agenda/) and [notes](https://make.wordpress.org/core/tag/core-editor-summary/) are posted to the [Make WordPress Blog](https://make.wordpress.org/core/).
-
 ## License
 
 WordPress is free software, and is released under the terms of the GNU General Public License version 2 or (at your option) any later version. See [LICENSE.md](LICENSE.md) for complete license.
diff --git a/backport-changelog/6.6/6279.md b/backport-changelog/6.6/6279.md
new file mode 100644
index 00000000000000..f372c33d339b8a
--- /dev/null
+++ b/backport-changelog/6.6/6279.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6279
+
+* https://github.com/WordPress/gutenberg/pull/60063
diff --git a/backport-changelog/6.6/6522.md b/backport-changelog/6.6/6522.md
new file mode 100644
index 00000000000000..172464cf664de9
--- /dev/null
+++ b/backport-changelog/6.6/6522.md
@@ -0,0 +1,5 @@
+https://github.com/WordPress/wordpress-develop/pull/6522
+
+* https://github.com/WordPress/gutenberg/pull/60106
+* https://github.com/WordPress/gutenberg/pull/60228
+* https://github.com/WordPress/gutenberg/pull/61638
diff --git a/backport-changelog/6.6/6559.md b/backport-changelog/6.6/6559.md
new file mode 100644
index 00000000000000..176a2e04f02574
--- /dev/null
+++ b/backport-changelog/6.6/6559.md
@@ -0,0 +1,6 @@
+https://github.com/WordPress/wordpress-develop/pull/6559
+
+* https://github.com/WordPress/gutenberg/pull/60349
+* https://github.com/WordPress/gutenberg/pull/60464
+* https://github.com/WordPress/gutenberg/pull/60491
+* https://github.com/WordPress/gutenberg/pull/61757
diff --git a/backport-changelog/6.6/6567.md b/backport-changelog/6.6/6567.md
new file mode 100644
index 00000000000000..8f200bed3b5c09
--- /dev/null
+++ b/backport-changelog/6.6/6567.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/6567
+
+* https://github.com/WordPress/gutenberg/pull/47271
+* https://github.com/WordPress/gutenberg/pull/61774
diff --git a/backport-changelog/6.6/6590.md b/backport-changelog/6.6/6590.md
new file mode 100644
index 00000000000000..47ef89e0db40cb
--- /dev/null
+++ b/backport-changelog/6.6/6590.md
@@ -0,0 +1,5 @@
+https://github.com/WordPress/wordpress-develop/pull/6590
+
+* https://github.com/WordPress/gutenberg/pull/59531
+* https://github.com/WordPress/gutenberg/pull/61182
+* https://github.com/WordPress/gutenberg/pull/61717
diff --git a/backport-changelog/6.6/6605.md b/backport-changelog/6.6/6605.md
new file mode 100644
index 00000000000000..c45a37d77e660b
--- /dev/null
+++ b/backport-changelog/6.6/6605.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6605
+
+* https://github.com/WordPress/gutenberg/pull/61851
diff --git a/backport-changelog/6.6/6616.md b/backport-changelog/6.6/6616.md
new file mode 100644
index 00000000000000..bb35d6c74493cf
--- /dev/null
+++ b/backport-changelog/6.6/6616.md
@@ -0,0 +1,7 @@
+https://github.com/WordPress/wordpress-develop/pull/6616
+
+* https://github.com/WordPress/gutenberg/pull/58409
+* https://github.com/WordPress/gutenberg/pull/61328
+* https://github.com/WordPress/gutenberg/pull/61842
+* https://github.com/WordPress/gutenberg/pull/62199
+* https://github.com/WordPress/gutenberg/pull/62252
diff --git a/backport-changelog/6.6/6656.md b/backport-changelog/6.6/6656.md
new file mode 100644
index 00000000000000..f0bf8900335f49
--- /dev/null
+++ b/backport-changelog/6.6/6656.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6656
+
+* https://github.com/WordPress/gutenberg/pull/60715
\ No newline at end of file
diff --git a/backport-changelog/6.6/6662.md b/backport-changelog/6.6/6662.md
new file mode 100644
index 00000000000000..5b25fc99304919
--- /dev/null
+++ b/backport-changelog/6.6/6662.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/6662
+
+* https://github.com/WordPress/gutenberg/pull/57908
+* https://github.com/WordPress/gutenberg/pull/62125
diff --git a/backport-changelog/6.6/6694.md b/backport-changelog/6.6/6694.md
new file mode 100644
index 00000000000000..a9eb5a7f37ef5b
--- /dev/null
+++ b/backport-changelog/6.6/6694.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6694
+
+* https://github.com/WordPress/gutenberg/pull/60694
diff --git a/backport-changelog/6.6/6731.md b/backport-changelog/6.6/6731.md
new file mode 100644
index 00000000000000..b8671873251659
--- /dev/null
+++ b/backport-changelog/6.6/6731.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6731
+
+* https://github.com/WordPress/gutenberg/pull/62299
diff --git a/backport-changelog/6.6/6737.md b/backport-changelog/6.6/6737.md
new file mode 100644
index 00000000000000..84e2234ca4e79a
--- /dev/null
+++ b/backport-changelog/6.6/6737.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6737
+
+* https://github.com/WordPress/gutenberg/pull/62305
diff --git a/backport-changelog/6.6/6744.md b/backport-changelog/6.6/6744.md
new file mode 100644
index 00000000000000..032f5420cb7184
--- /dev/null
+++ b/backport-changelog/6.6/6744.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6744
+
+* https://github.com/WordPress/gutenberg/pull/62355
\ No newline at end of file
diff --git a/backport-changelog/6.6/6756.md b/backport-changelog/6.6/6756.md
new file mode 100644
index 00000000000000..688b258c095faa
--- /dev/null
+++ b/backport-changelog/6.6/6756.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/6756
+
+* https://github.com/WordPress/gutenberg/pull/62461
+* https://github.com/WordPress/gutenberg/pull/62495
diff --git a/backport-changelog/6.6/6785.md b/backport-changelog/6.6/6785.md
new file mode 100644
index 00000000000000..ad26227bf12565
--- /dev/null
+++ b/backport-changelog/6.6/6785.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6785
+
+* https://github.com/WordPress/gutenberg/pull/62459
diff --git a/backport-changelog/6.6/6797.md b/backport-changelog/6.6/6797.md
new file mode 100644
index 00000000000000..630b677655ddce
--- /dev/null
+++ b/backport-changelog/6.6/6797.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6797
+
+* https://github.com/WordPress/gutenberg/pull/62526
\ No newline at end of file
diff --git a/backport-changelog/6.6/6824.md b/backport-changelog/6.6/6824.md
new file mode 100644
index 00000000000000..7dc6e090f01498
--- /dev/null
+++ b/backport-changelog/6.6/6824.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6824
+
+* https://github.com/WordPress/gutenberg/pull/62550
diff --git a/backport-changelog/6.6/6825.md b/backport-changelog/6.6/6825.md
new file mode 100644
index 00000000000000..73e5f46600d892
--- /dev/null
+++ b/backport-changelog/6.6/6825.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6825
+
+* https://github.com/WordPress/gutenberg/pull/62552
diff --git a/backport-changelog/6.6/6827.md b/backport-changelog/6.6/6827.md
new file mode 100644
index 00000000000000..bfe177c4cac0e5
--- /dev/null
+++ b/backport-changelog/6.6/6827.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6827
+
+* https://github.com/WordPress/gutenberg/pull/62465
diff --git a/backport-changelog/6.6/6837.md b/backport-changelog/6.6/6837.md
new file mode 100644
index 00000000000000..2fffba68b53a10
--- /dev/null
+++ b/backport-changelog/6.6/6837.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/6837
+
+* https://github.com/WordPress/gutenberg/pull/62529
+* https://github.com/WordPress/gutenberg/pull/62610
diff --git a/backport-changelog/6.6/6841.md b/backport-changelog/6.6/6841.md
new file mode 100644
index 00000000000000..36e715c48f52e0
--- /dev/null
+++ b/backport-changelog/6.6/6841.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6841
+
+* https://github.com/WordPress/gutenberg/pull/62598
diff --git a/backport-changelog/6.6/6844.md b/backport-changelog/6.6/6844.md
new file mode 100644
index 00000000000000..f735d96b9a051c
--- /dev/null
+++ b/backport-changelog/6.6/6844.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6844
+
+* https://github.com/WordPress/gutenberg/pull/62640
diff --git a/backport-changelog/6.6/6854.md b/backport-changelog/6.6/6854.md
new file mode 100644
index 00000000000000..78003f24ca9e41
--- /dev/null
+++ b/backport-changelog/6.6/6854.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6854
+
+* https://github.com/WordPress/gutenberg/pull/62670
\ No newline at end of file
diff --git a/backport-changelog/6.6/6864.md b/backport-changelog/6.6/6864.md
new file mode 100644
index 00000000000000..10bf9cce4d6576
--- /dev/null
+++ b/backport-changelog/6.6/6864.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/6864
+
+* https://github.com/WordPress/gutenberg/pull/62488
+* https://github.com/WordPress/gutenberg/pull/62696
\ No newline at end of file
diff --git a/backport-changelog/6.6/6873.md b/backport-changelog/6.6/6873.md
new file mode 100644
index 00000000000000..745966d0dc0407
--- /dev/null
+++ b/backport-changelog/6.6/6873.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6873
+
+* https://github.com/WordPress/gutenberg/pull/62712
diff --git a/backport-changelog/6.6/6959.md b/backport-changelog/6.6/6959.md
new file mode 100644
index 00000000000000..3232414bc22b11
--- /dev/null
+++ b/backport-changelog/6.6/6959.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/6959
+
+* https://github.com/WordPress/gutenberg/pull/63071
+
diff --git a/backport-changelog/6.6/6987.md b/backport-changelog/6.6/6987.md
new file mode 100644
index 00000000000000..c3bf36f8f9933d
--- /dev/null
+++ b/backport-changelog/6.6/6987.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6987
+
+* https://github.com/WordPress/gutenberg/pull/63207
\ No newline at end of file
diff --git a/backport-changelog/6.6/6989.md b/backport-changelog/6.6/6989.md
new file mode 100644
index 00000000000000..3d236938ff74a5
--- /dev/null
+++ b/backport-changelog/6.6/6989.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6989
+
+* https://github.com/WordPress/gutenberg/pull/63172
diff --git a/backport-changelog/6.6/7012.md b/backport-changelog/6.6/7012.md
new file mode 100644
index 00000000000000..265f3dad981e44
--- /dev/null
+++ b/backport-changelog/6.6/7012.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7012
+
+* https://github.com/WordPress/gutenberg/pull/63403
diff --git a/backport-changelog/6.6/7036.md b/backport-changelog/6.6/7036.md
new file mode 100644
index 00000000000000..afc4d16bf011b7
--- /dev/null
+++ b/backport-changelog/6.6/7036.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7036
+
+* https://github.com/WordPress/gutenberg/pull/63436
diff --git a/backport-changelog/6.6/7061.md b/backport-changelog/6.6/7061.md
new file mode 100644
index 00000000000000..307e6575cf38d8
--- /dev/null
+++ b/backport-changelog/6.6/7061.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7061
+
+* https://github.com/WordPress/gutenberg/pull/63726
diff --git a/backport-changelog/6.6/7088.md b/backport-changelog/6.6/7088.md
new file mode 100644
index 00000000000000..46bd1147464846
--- /dev/null
+++ b/backport-changelog/6.6/7088.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/7088
+
+* https://github.com/WordPress/gutenberg/pull/63918
+
diff --git a/backport-changelog/6.6/7097.md b/backport-changelog/6.6/7097.md
new file mode 100644
index 00000000000000..e674d5ea76ba6f
--- /dev/null
+++ b/backport-changelog/6.6/7097.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7097
+
+* https://github.com/WordPress/gutenberg/pull/63980
diff --git a/backport-changelog/6.6/7145.md b/backport-changelog/6.6/7145.md
new file mode 100644
index 00000000000000..386f765cb22fa8
--- /dev/null
+++ b/backport-changelog/6.6/7145.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7145
+
+* https://github.com/WordPress/gutenberg/pull/64076
diff --git a/backport-changelog/6.7/6668.md b/backport-changelog/6.7/6668.md
new file mode 100644
index 00000000000000..7653dd8d8294ee
--- /dev/null
+++ b/backport-changelog/6.7/6668.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6668
+
+* https://github.com/WordPress/gutenberg/pull/62092
diff --git a/backport-changelog/6.7/6750.md b/backport-changelog/6.7/6750.md
new file mode 100644
index 00000000000000..257ebe3a5aa698
--- /dev/null
+++ b/backport-changelog/6.7/6750.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6750
+
+* https://github.com/WordPress/gutenberg/pull/62357
\ No newline at end of file
diff --git a/backport-changelog/6.7/6836.md b/backport-changelog/6.7/6836.md
new file mode 100644
index 00000000000000..feaa0f909f1f6f
--- /dev/null
+++ b/backport-changelog/6.7/6836.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6836
+
+* https://github.com/WordPress/gutenberg/pull/60100
diff --git a/backport-changelog/6.7/6991.md b/backport-changelog/6.7/6991.md
new file mode 100644
index 00000000000000..4d5f1f85ec7686
--- /dev/null
+++ b/backport-changelog/6.7/6991.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6991
+
+* https://github.com/WordPress/gutenberg/pull/61382
diff --git a/backport-changelog/6.7/7020.md b/backport-changelog/6.7/7020.md
new file mode 100644
index 00000000000000..8eacb220d340e5
--- /dev/null
+++ b/backport-changelog/6.7/7020.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7020
+
+* https://github.com/WordPress/gutenberg/pull/63470
diff --git a/backport-changelog/6.7/7125.md b/backport-changelog/6.7/7125.md
new file mode 100644
index 00000000000000..341e0415cc61a2
--- /dev/null
+++ b/backport-changelog/6.7/7125.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/7125
+
+* https://github.com/WordPress/gutenberg/pull/61577
+* https://github.com/WordPress/gutenberg/pull/64610
diff --git a/backport-changelog/6.7/7137.md b/backport-changelog/6.7/7137.md
new file mode 100644
index 00000000000000..00771b8bc6c21d
--- /dev/null
+++ b/backport-changelog/6.7/7137.md
@@ -0,0 +1,5 @@
+https://github.com/WordPress/wordpress-develop/pull/7137
+
+* https://github.com/WordPress/gutenberg/pull/64128
+* https://github.com/WordPress/gutenberg/pull/64192
+* https://github.com/WordPress/gutenberg/pull/64328
diff --git a/backport-changelog/6.7/7139.md b/backport-changelog/6.7/7139.md
new file mode 100644
index 00000000000000..b5b0090fbaa563
--- /dev/null
+++ b/backport-changelog/6.7/7139.md
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/7139
+
+* https://github.com/WordPress/gutenberg/pull/64504
+* https://github.com/WordPress/gutenberg/pull/65280
diff --git a/backport-changelog/6.7/7179.md b/backport-changelog/6.7/7179.md
new file mode 100644
index 00000000000000..d777eace2cb05e
--- /dev/null
+++ b/backport-changelog/6.7/7179.md
@@ -0,0 +1,5 @@
+https://github.com/WordPress/wordpress-develop/pull/7179
+
+* https://github.com/WordPress/gutenberg/pull/64401
+* https://github.com/WordPress/gutenberg/pull/64459
+* https://github.com/WordPress/gutenberg/pull/64477
diff --git a/backport-changelog/6.7/7200.md b/backport-changelog/6.7/7200.md
new file mode 100644
index 00000000000000..520b3d6054cc18
--- /dev/null
+++ b/backport-changelog/6.7/7200.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7200
+
+* https://github.com/WordPress/gutenberg/pull/64511
diff --git a/backport-changelog/6.7/7247.md b/backport-changelog/6.7/7247.md
new file mode 100644
index 00000000000000..d0b1de25872344
--- /dev/null
+++ b/backport-changelog/6.7/7247.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7247
+
+* https://github.com/WordPress/gutenberg/pull/64790
diff --git a/backport-changelog/6.7/7258.md b/backport-changelog/6.7/7258.md
new file mode 100644
index 00000000000000..6714b13b70b8d2
--- /dev/null
+++ b/backport-changelog/6.7/7258.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7258
+
+* https://github.com/WordPress/gutenberg/pull/64570
\ No newline at end of file
diff --git a/backport-changelog/6.7/7270.md b/backport-changelog/6.7/7270.md
new file mode 100644
index 00000000000000..358b0d7c9a9674
--- /dev/null
+++ b/backport-changelog/6.7/7270.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7270
+
+* https://github.com/WordPress/gutenberg/pull/64890
diff --git a/backport-changelog/6.7/7298.md b/backport-changelog/6.7/7298.md
new file mode 100644
index 00000000000000..4c01ef5d4f46e6
--- /dev/null
+++ b/backport-changelog/6.7/7298.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7298
+
+* https://github.com/WordPress/gutenberg/pull/65099
\ No newline at end of file
diff --git a/backport-changelog/6.7/7314.md b/backport-changelog/6.7/7314.md
new file mode 100644
index 00000000000000..7d75cdff0f9075
--- /dev/null
+++ b/backport-changelog/6.7/7314.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7314
+
+* https://github.com/WordPress/gutenberg/pull/64167
diff --git a/backport-changelog/6.7/7336.md b/backport-changelog/6.7/7336.md
new file mode 100644
index 00000000000000..7cb2e26d7eeb95
--- /dev/null
+++ b/backport-changelog/6.7/7336.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7336
+
+* https://github.com/WordPress/gutenberg/pull/65071
diff --git a/backport-changelog/6.7/7360.md b/backport-changelog/6.7/7360.md
new file mode 100644
index 00000000000000..b2fb8efd624b93
--- /dev/null
+++ b/backport-changelog/6.7/7360.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7360
+
+* https://github.com/WordPress/gutenberg/pull/65460
diff --git a/backport-changelog/6.7/7543.md b/backport-changelog/6.7/7543.md
new file mode 100644
index 00000000000000..7dcb74354ac813
--- /dev/null
+++ b/backport-changelog/6.7/7543.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7543
+
+* https://github.com/WordPress/gutenberg/pull/65958
diff --git a/backport-changelog/6.7/7552.md b/backport-changelog/6.7/7552.md
new file mode 100644
index 00000000000000..d304162b3cae67
--- /dev/null
+++ b/backport-changelog/6.7/7552.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7552
+
+* https://github.com/WordPress/gutenberg/pull/66058
diff --git a/backport-changelog/6.7/7561.md b/backport-changelog/6.7/7561.md
new file mode 100644
index 00000000000000..43fcffa41c02a5
--- /dev/null
+++ b/backport-changelog/6.7/7561.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7561
+
+* https://github.com/WordPress/gutenberg/pull/66084
diff --git a/backport-changelog/6.8/6910.md b/backport-changelog/6.8/6910.md
new file mode 100644
index 00000000000000..24b59bce87ee60
--- /dev/null
+++ b/backport-changelog/6.8/6910.md
@@ -0,0 +1,7 @@
+https://github.com/WordPress/wordpress-develop/pull/6910
+
+* https://github.com/WordPress/gutenberg/pull/59483
+* https://github.com/WordPress/gutenberg/pull/60652
+* https://github.com/WordPress/gutenberg/pull/62777
+* https://github.com/WordPress/gutenberg/pull/63108
+* https://github.com/WordPress/gutenberg/pull/63464
\ No newline at end of file
diff --git a/backport-changelog/6.8/7488.md b/backport-changelog/6.8/7488.md
new file mode 100644
index 00000000000000..a588bef0e01796
--- /dev/null
+++ b/backport-changelog/6.8/7488.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7488
+
+* https://github.com/WordPress/gutenberg/pull/60622
\ No newline at end of file
diff --git a/backport-changelog/6.8/7498.md b/backport-changelog/6.8/7498.md
new file mode 100644
index 00000000000000..6c903246166b64
--- /dev/null
+++ b/backport-changelog/6.8/7498.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7498
+
+* https://github.com/WordPress/gutenberg/pull/60622
\ No newline at end of file
diff --git a/backport-changelog/6.8/7575.md b/backport-changelog/6.8/7575.md
new file mode 100644
index 00000000000000..f1c6a84da1368e
--- /dev/null
+++ b/backport-changelog/6.8/7575.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7575
+
+* https://github.com/WordPress/gutenberg/pull/66154
diff --git a/backport-changelog/6.8/7604.md b/backport-changelog/6.8/7604.md
new file mode 100644
index 00000000000000..0ab47698103409
--- /dev/null
+++ b/backport-changelog/6.8/7604.md
@@ -0,0 +1,5 @@
+https://github.com/WordPress/wordpress-develop/pull/7604
+
+* https://github.com/WordPress/gutenberg/pull/66285
+* https://github.com/WordPress/gutenberg/pull/66302
+* https://github.com/WordPress/gutenberg/pull/66306
diff --git a/backport-changelog/6.8/7642.md b/backport-changelog/6.8/7642.md
new file mode 100644
index 00000000000000..f00d4a5473aac8
--- /dev/null
+++ b/backport-changelog/6.8/7642.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7642
+
+* https://github.com/WordPress/gutenberg/pull/66431
\ No newline at end of file
diff --git a/backport-changelog/6.8/7643.md b/backport-changelog/6.8/7643.md
new file mode 100644
index 00000000000000..e3c923a487be06
--- /dev/null
+++ b/backport-changelog/6.8/7643.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7643
+
+* https://github.com/WordPress/gutenberg/pull/66432
diff --git a/backport-changelog/readme.md b/backport-changelog/readme.md
new file mode 100644
index 00000000000000..8066cc6a6fca24
--- /dev/null
+++ b/backport-changelog/readme.md
@@ -0,0 +1,63 @@
+# Core Backport Changelog
+
+If you've changed or added files to the Gutenberg plugin, you'll need to confirm whether the changes are to be backported to [WordPress Core](https://github.com/WordPress/wordpress-develop), and therefore featured in the next release of WordPress.
+
+On open Gutenberg PRs, changes to certain files are flagged as requiring backporting to WordPress Core, for example, PHP files in `/lib` and PHP unit tests. 
+
+These changes must have a corresponding Core PR before they can be merged to Gutenberg trunk.
+
+To create a Core PR, first create a [new Trac ticket](https://core.trac.wordpress.org/newticket) and submit a pull request to the [WordPress Core GitHub repository](https://github.com/WordPress/wordpress-develop).
+
+The Core PR can remain open as long as is required.
+
+For more information on how to create a Core PR, see the [WordPress Core Handbook](https://make.wordpress.org/core/handbook/contribute/git/github-pull-requests-for-code-review/).
+
+## How to add a Core Backport PR to the changelog
+
+After you create Core PR, you'll need to create a corresponding markdown file, and place it within the appropriate release subdirectory.
+
+The filename is the Core PR number.
+
+For example, if your Core PR number is `1234` and is slated to be part of the WordPress 6.9 release, the filename will be `1234.md`, and will be placed in the `/backport-changelog/6.9` directory.
+
+The content of the markdown file should be the Github URL of the Core PR, followed by a list of Gutenberg PR Github URLs whose changes are backported in the Core PR.
+
+A single Core PR may contain changes from one or multiple Gutenberg PRs.
+
+### Examples
+
+Let's say the next WordPress release is 6.9. You have two Gutenberg PRs — `1111` and `2222` — whose changes are backported in a single Core PR, number `1234`.
+
+First you would create a file named `1234.md` in the `/6.9` folder. 
+
+If the `/6.9` folder doesn't exist, create it. 
+
+Then you would add the following content to your new file:
+
+```md
+https://github.com/WordPress/wordpress-develop/pull/1234
+
+* https://github.com/WordPress/gutenberg/pull/1111
+* https://github.com/WordPress/gutenberg/pull/2222
+```
+
+If `1234.md` already exists, you would add the Gutenberg PRs to the list in the existing file.
+
+## Why use individual files?
+
+For the backport changelog, Gutenberg uses individual files as opposed to a single changelog file to avoid rebase conflicts.
+
+## Exceptions
+
+Some Gutenberg PRs may be flagged as needing a core backport PR when they don't, for example when the PR contains minor comment changes, or the changes already exist in Core.
+
+For individual PRs, there are two Github labels that can be used to exclude a PR from the backport changelog CI check:
+
+- `Backport from WordPress Core` - Indicates that the PR is a backport from WordPress Core and doesn't need a Core PR.
+- `No Core Sync Required` - Indicates that any changes do not need to be synced to WordPress Core.
+
+If there are specific file or directory changes that should **never** be flagged as requiring a Core backport PR, you can add it to the list of exceptions in [.github/workflows/check-backport-changelog.yml](https://github.com/WordPress/gutenberg/tree/trunk/.github/workflows/check-backport-changelog.yml).
+
+## Where to get help
+
+If you're unsure, you can always ask the Gutenberg Core team for help on the Gutenberg PR `@WordPress/gutenberg-core` or via the #core-editor channel in [WordPress Slack](https://make.wordpress.org/chat/).
diff --git a/bin/api-docs/gen-block-lib-list.js b/bin/api-docs/gen-block-lib-list.js
index 90b6b808941896..0c79def1989992 100644
--- a/bin/api-docs/gen-block-lib-list.js
+++ b/bin/api-docs/gen-block-lib-list.js
@@ -148,29 +148,58 @@ function getSourceFromFile( filename ) {
  */
 function readBlockJSON( filename ) {
 	const blockjson = require( filename );
-
+	const {
+		name,
+		category,
+		supports,
+		attributes,
+		parent,
+		ancestor,
+		__experimental,
+		allowedBlocks,
+	} = blockjson;
 	const sourcefile = getSourceFromFile( filename );
-	const supportsList =
-		blockjson.supports !== undefined
-			? processObjWithInnerKeys( augmentSupports( blockjson.supports ) )
-			: [];
-	const attributes = getTruthyKeys( blockjson.attributes );
-	const parent = blockjson.parent
-		? '\n' + `-	**Parent:** ${ blockjson.parent.join( ', ' ) }`
-		: '';
-	const experimental = blockjson.__experimental
-		? '\n' + `-	**Experimental:** ${ blockjson.__experimental }`
-		: '';
+	const blockInfoList = [ `-	**Name:** ${ name }` ];
+
+	if ( __experimental ) {
+		blockInfoList.push( `-	**Experimental:** ${ __experimental }` );
+	}
+	if ( category?.length > 0 ) {
+		blockInfoList.push( `-	**Category:** ${ category }` );
+	}
+	if ( parent?.length > 0 ) {
+		blockInfoList.push( `-	**Parent:** ${ parent.join( ', ' ) }` );
+	}
+	if ( ancestor?.length > 0 ) {
+		blockInfoList.push( `-	**Ancestor:** ${ ancestor.join( ', ' ) }` );
+	}
+	if ( allowedBlocks?.length > 0 ) {
+		blockInfoList.push(
+			`-	**Allowed Blocks:** ${ allowedBlocks.join( ', ' ) }`
+		);
+	}
+	if ( supports ) {
+		blockInfoList.push(
+			`-	**Supports:** ${ processObjWithInnerKeys(
+				augmentSupports( supports )
+			)
+				.sort()
+				.join( ', ' ) }`
+		);
+	}
+	const truthyAttributes = getTruthyKeys( attributes );
+	if ( truthyAttributes.length ) {
+		blockInfoList.push(
+			`-	**Attributes:** ${ truthyAttributes.sort().join( ', ' ) }`
+		);
+	}
 
 	return `
 ## ${ blockjson.title }
 
 ${ blockjson.description } ([Source](${ sourcefile }))
 
--	**Name:** ${ blockjson.name }${ experimental }
--	**Category:** ${ blockjson.category }${ parent }
--	**Supports:** ${ supportsList.sort().join( ', ' ) }
--	**Attributes:** ${ attributes.sort().join( ', ' ) }
+${ blockInfoList.join( '\n' ) }
 `;
 }
 
diff --git a/bin/api-docs/gen-components-docs/index.mjs b/bin/api-docs/gen-components-docs/index.mjs
new file mode 100644
index 00000000000000..e036995b4c4f74
--- /dev/null
+++ b/bin/api-docs/gen-components-docs/index.mjs
@@ -0,0 +1,112 @@
+/**
+ * External dependencies
+ */
+import docgen from 'react-docgen-typescript';
+import glob from 'glob';
+import fs from 'node:fs/promises';
+import path from 'path';
+
+/**
+ * Internal dependencies
+ */
+import { generateMarkdownDocs } from './markdown/index.mjs';
+
+const MANIFEST_GLOB = 'packages/components/src/**/docs-manifest.json';
+
+// For consistency, options should generally match the options used in Storybook.
+const OPTIONS = {
+	shouldExtractLiteralValuesFromEnum: true,
+	shouldRemoveUndefinedFromOptional: true,
+	propFilter: ( prop ) =>
+		prop.parent ? ! /node_modules/.test( prop.parent.fileName ) : true,
+	savePropValueAsString: true,
+};
+
+function getTypeDocsForComponent( {
+	manifestPath,
+	componentFilePath,
+	displayName,
+} ) {
+	const resolvedPath = path.resolve(
+		path.dirname( manifestPath ),
+		componentFilePath
+	);
+
+	const typeDocs = docgen.parse( resolvedPath, OPTIONS );
+
+	if ( typeDocs.length === 0 ) {
+		throw new Error(
+			`react-docgen-typescript could not generate any type docs from ${ resolvedPath }`
+		);
+	}
+
+	const matchingTypeDoc = typeDocs.find(
+		( obj ) => obj.displayName === displayName
+	);
+
+	if ( typeof matchingTypeDoc === 'undefined' ) {
+		const unmatchedTypeDocs = typeDocs
+			.map( ( obj ) => `\`${ obj.displayName }\`` )
+			.join( ', ' );
+
+		throw new Error(
+			`react-docgen-typescript could not find type docs for ${ displayName } in ${ resolvedPath }. (Found ${ unmatchedTypeDocs })`
+		);
+	}
+
+	return matchingTypeDoc;
+}
+
+async function parseManifest( manifestPath ) {
+	try {
+		return JSON.parse( await fs.readFile( manifestPath, 'utf8' ) );
+	} catch ( e ) {
+		throw new Error(
+			`Error parsing docs manifest at ${ manifestPath }: ${ e.message }`
+		);
+	}
+}
+
+const manifests = glob.sync( MANIFEST_GLOB );
+
+await Promise.all(
+	manifests.map( async ( manifestPath ) => {
+		const manifest = await parseManifest( manifestPath );
+
+		const typeDocs = getTypeDocsForComponent( {
+			manifestPath,
+			componentFilePath: manifest.filePath,
+			displayName: manifest.displayName,
+		} );
+
+		const subcomponentTypeDocs = manifest.subcomponents?.map(
+			( subcomponent ) => {
+				const docs = getTypeDocsForComponent( {
+					manifestPath,
+					componentFilePath: subcomponent.filePath,
+					displayName: subcomponent.displayName,
+				} );
+
+				if ( subcomponent.preferredDisplayName ) {
+					docs.displayName = subcomponent.preferredDisplayName;
+				}
+
+				return docs;
+			}
+		);
+		const docs = generateMarkdownDocs( { typeDocs, subcomponentTypeDocs } );
+		const outputFile = path.resolve(
+			path.dirname( manifestPath ),
+			'./README.md'
+		);
+
+		try {
+			console.log( `Writing docs to ${ outputFile }` );
+			return fs.writeFile( outputFile, docs );
+		} catch ( e ) {
+			throw new Error(
+				`Error writing docs to ${ outputFile }: ${ e.message }`
+			);
+		}
+	} )
+);
diff --git a/bin/api-docs/gen-components-docs/markdown/index.mjs b/bin/api-docs/gen-components-docs/markdown/index.mjs
new file mode 100644
index 00000000000000..126fdf0057b6e5
--- /dev/null
+++ b/bin/api-docs/gen-components-docs/markdown/index.mjs
@@ -0,0 +1,40 @@
+/**
+ * External dependencies
+ */
+import json2md from 'json2md';
+
+/**
+ * Internal dependencies
+ */
+import { generateMarkdownPropsJson } from './props.mjs';
+
+export function generateMarkdownDocs( { typeDocs, subcomponentTypeDocs } ) {
+	const mainDocsJson = [
+		{ h1: typeDocs.displayName },
+		'<!-- This file is generated automatically and cannot be edited directly. Make edits via TypeScript types and TSDocs. -->',
+		{
+			p: `<p class="callout callout-info">See the <a href="https://wordpress.github.io/gutenberg/?path=/docs/components-${ typeDocs.displayName.toLowerCase() }--docs">WordPress Storybook</a> for more detailed, interactive documentation.</p>`,
+		},
+		typeDocs.description,
+		...generateMarkdownPropsJson( typeDocs.props ),
+	];
+
+	const subcomponentDocsJson = subcomponentTypeDocs?.length
+		? [
+				{ h2: 'Subcomponents' },
+				...subcomponentTypeDocs.flatMap( ( subcomponentTypeDoc ) => [
+					{
+						h3: subcomponentTypeDoc.displayName,
+					},
+					subcomponentTypeDoc.description,
+					...generateMarkdownPropsJson( subcomponentTypeDoc.props, {
+						headingLevel: 4,
+					} ),
+				] ),
+		  ]
+		: [];
+
+	return json2md(
+		[ ...mainDocsJson, ...subcomponentDocsJson ].filter( Boolean )
+	);
+}
diff --git a/bin/api-docs/gen-components-docs/markdown/props.mjs b/bin/api-docs/gen-components-docs/markdown/props.mjs
new file mode 100644
index 00000000000000..9d019c4240f008
--- /dev/null
+++ b/bin/api-docs/gen-components-docs/markdown/props.mjs
@@ -0,0 +1,51 @@
+function renderPropType( type ) {
+	const MAX_ENUM_VALUES = 10;
+
+	switch ( type.name ) {
+		case 'enum': {
+			const string = type.value
+				.slice( 0, MAX_ENUM_VALUES )
+				.map( ( { value } ) => value )
+				.join( ' | ' );
+
+			if ( type.value.length > MAX_ENUM_VALUES ) {
+				return `${ string } | ...`;
+			}
+			return string;
+		}
+		default:
+			return type.name;
+	}
+}
+
+export function generateMarkdownPropsJson( props, { headingLevel = 2 } = {} ) {
+	const sortedKeys = Object.keys( props ).sort( ( [ a ], [ b ] ) =>
+		a.localeCompare( b )
+	);
+
+	const propsJson = sortedKeys
+		.flatMap( ( key ) => {
+			const prop = props[ key ];
+
+			if ( prop.description?.includes( '@ignore' ) ) {
+				return null;
+			}
+
+			return [
+				{ [ `h${ headingLevel + 1 }` ]: `\`${ key }\`` },
+				prop.description,
+				{
+					ul: [
+						`Type: \`${ renderPropType( prop.type ) }\``,
+						`Required: ${ prop.required ? 'Yes' : 'No' }`,
+						prop.defaultValue &&
+							`Default: \`${ prop.defaultValue.value }\``,
+					].filter( Boolean ),
+				},
+			];
+		} )
+		.filter( Boolean );
+
+	return [ { [ `h${ headingLevel }` ]: 'Props' }, ...propsJson ];
+}
+
diff --git a/bin/api-docs/gen-theme-reference.js b/bin/api-docs/gen-theme-reference.js
deleted file mode 100644
index f638bb708890a8..00000000000000
--- a/bin/api-docs/gen-theme-reference.js
+++ /dev/null
@@ -1,254 +0,0 @@
-/**
- * Generates theme.json documentation using theme.json schema.
- * Reads from  : schemas/json/theme.json
- * Publishes to: docs/reference-guides/theme-json-reference/theme-json-living.md
- */
-
-/**
- * External dependencies
- */
-const path = require( 'path' );
-const fs = require( 'fs' );
-/**
- * Path to root project directory.
- *
- * @type {string}
- */
-const ROOT_DIR = path.resolve( __dirname, '../..' );
-
-/**
- * Path to theme json schema file.
- *
- * @type {string}
- */
-const THEME_JSON_SCHEMA_FILE = path.resolve(
-	ROOT_DIR,
-	path.join( 'schemas', 'json', 'theme.json' )
-);
-
-/**
- * Path to docs file.
- *
- * @type {string}
- */
-const THEME_JSON_REF_DOC = path.resolve(
-	ROOT_DIR,
-	'docs/reference-guides/theme-json-reference/theme-json-living.md'
-);
-
-/**
- * Start token for matching string in doc file.
- *
- * @type {string}
- */
-const START_TOKEN = '<!-- START TOKEN Autogenerated - DO NOT EDIT -->';
-
-/**
- * Start token for matching string in doc file.
- *
- * @type {string}
- */
-const END_TOKEN = '<!-- END TOKEN Autogenerated - DO NOT EDIT -->';
-
-/**
- * Regular expression using tokens for matching in doc file.
- * Note: `.` does not match new lines, so [^] is used.
- *
- * @type {RegExp}
- */
-const TOKEN_PATTERN = new RegExp( START_TOKEN + '[^]*' + END_TOKEN );
-
-const themejson = require( THEME_JSON_SCHEMA_FILE );
-
-/**
- * Convert object keys to an array.
- * Gracefully handles non-object values.
- *
- * @param {*} maybeObject
- * @return {Array} Object keys
- */
-const keys = ( maybeObject ) => {
-	if ( typeof maybeObject !== 'object' ) {
-		return [];
-	}
-	return Object.keys( maybeObject );
-};
-
-/**
- * Convert settings properties to markup.
- *
- * @param {Object} struct
- * @return {string} markup
- */
-const getSettingsPropertiesMarkup = ( struct ) => {
-	if ( ! ( 'properties' in struct ) ) {
-		return '';
-	}
-	const props = struct.properties;
-	const ks = keys( props );
-	if ( ks.length < 1 ) {
-		return '';
-	}
-
-	let markup = '| Property  | Type   | Default | Props  |\n';
-	markup += '| ---       | ---    | ---    |---   |\n';
-	ks.forEach( ( key ) => {
-		const def = 'default' in props[ key ] ? props[ key ].default : '';
-		const ps =
-			props[ key ].type === 'array'
-				? keys( props[ key ].items.properties ).sort().join( ', ' )
-				: '';
-		markup += `| ${ key } | ${ props[ key ].type } | ${ def } | ${ ps } |\n`;
-	} );
-
-	return markup;
-};
-
-/**
- * Convert style properties to markup.
- *
- * @param {Object} struct
- * @return {string} markup
- */
-const getStylePropertiesMarkup = ( struct ) => {
-	if ( ! ( 'properties' in struct ) ) {
-		return '';
-	}
-	const props = struct.properties;
-	const ks = keys( props );
-	if ( ks.length < 1 ) {
-		return '';
-	}
-
-	let markup = '| Property  | Type   |  Props  |\n';
-	markup += '| ---       | ---    |---   |\n';
-	ks.forEach( ( key ) => {
-		const ps =
-			props[ key ].type === 'object'
-				? keys( props[ key ].properties ).sort().join( ', ' )
-				: '';
-		const type = formatType( props[ key ] );
-		markup += `| ${ key } | ${ type } | ${ ps } |\n`;
-	} );
-
-	return markup;
-};
-
-/**
- * Parses a section for description and properties and
- * returns a marked up version.
- *
- * @param {string} title
- * @param {Object} data
- * @param {string} type  settings|style
- * @return {string} markup
- */
-const getSectionMarkup = ( title, data, type ) => {
-	const markupFn =
-		type === 'settings'
-			? getSettingsPropertiesMarkup
-			: getStylePropertiesMarkup;
-
-	return `
-### ${ title }
-
-${ data.description }
-
-${ markupFn( data ) }
----
-`;
-};
-
-let autogen = '';
-
-/**
- * Format list of types.
- *
- * @param {Object} prop
- * @return {string} type
- */
-const formatType = ( prop ) => {
-	let type = prop.type || '';
-
-	if ( prop.hasOwnProperty( 'anyOf' ) || prop.hasOwnProperty( 'oneOf' ) ) {
-		const propTypes = prop.anyOf || prop.oneOf;
-		const types = [];
-
-		propTypes.forEach( ( item ) => {
-			if ( item.type ) types.push( item.type );
-			// refComplete is always an object
-			if ( item.$ref && item.$ref === '#/definitions/refComplete' )
-				types.push( 'object' );
-		} );
-
-		type = [ ...new Set( types ) ].join( ', ' );
-	}
-
-	return type;
-};
-
-// Settings
-const settings = Object.entries( themejson.definitions )
-	.filter( ( [ settingsKey ] ) =>
-		/^settingsProperties(?!Complete)\w+$/.test( settingsKey )
-	)
-	.reduce(
-		( settingsObj, [ , { properties } ] ) =>
-			Object.assign( settingsObj, properties ),
-		{}
-	);
-const settingSections = keys( settings );
-autogen += '## Settings' + '\n\n';
-settingSections.forEach( ( section ) => {
-	autogen += getSectionMarkup( section, settings[ section ], 'settings' );
-} );
-
-// Styles
-const styles = themejson.definitions.stylesProperties.properties;
-const styleSections = keys( styles );
-autogen += '## Styles' + '\n\n';
-styleSections.forEach( ( section ) => {
-	autogen += getSectionMarkup( section, styles[ section ], 'styles' );
-} );
-
-const templateTableGeneration = ( themeJson, context ) => {
-	let content = '';
-	content += '## ' + context + '\n\n';
-	content += themeJson.properties[ context ].description + '\n\n';
-	content +=
-		'Type: `' + themeJson.properties[ context ].items.type + '`.\n\n';
-	content += '| Property | Description | Type |\n';
-	content += '| ---      | ---         | ---  |\n';
-	keys( themeJson.properties[ context ].items.properties ).forEach(
-		( key ) => {
-			content += `| ${ key } | ${ themeJson.properties[ context ].items.properties[ key ].description } | ${ themeJson.properties[ context ].items.properties[ key ].type } |\n`;
-		}
-	);
-	content += '\n\n';
-
-	return content;
-};
-
-// customTemplates
-autogen += templateTableGeneration( themejson, 'customTemplates' );
-
-// templateParts
-autogen += templateTableGeneration( themejson, 'templateParts' );
-
-// Patterns
-autogen += '## Patterns' + '\n\n';
-autogen += themejson.properties.patterns.description + '\n';
-autogen += 'Type: `' + themejson.properties.patterns.type + '`.\n\n';
-
-// Read existing file to wrap auto generated content.
-let docsContent = fs.readFileSync( THEME_JSON_REF_DOC, {
-	encoding: 'utf8',
-	flag: 'r',
-} );
-
-// Replace auto generated part with new generated docs.
-autogen = START_TOKEN + '\n' + autogen + '\n' + END_TOKEN;
-docsContent = docsContent.replace( TOKEN_PATTERN, autogen );
-
-// Write back out.
-fs.writeFileSync( THEME_JSON_REF_DOC, docsContent, { encoding: 'utf8' } );
diff --git a/bin/api-docs/gen-theme-reference.mjs b/bin/api-docs/gen-theme-reference.mjs
new file mode 100644
index 00000000000000..f50d194c17ee79
--- /dev/null
+++ b/bin/api-docs/gen-theme-reference.mjs
@@ -0,0 +1,295 @@
+/**
+ * Generates theme.json documentation using theme.json schema.
+ * Reads from  : schemas/json/theme.json
+ * Publishes to: docs/reference-guides/theme-json-reference/theme-json-living.md
+ */
+
+/**
+ * External dependencies
+ */
+import fs from 'node:fs/promises';
+import $RefParser from '@apidevtools/json-schema-ref-parser';
+import { fileURLToPath } from 'node:url';
+
+/**
+ * @typedef {import('@apidevtools/json-schema-ref-parser').JSONSchema} JSONSchema
+ */
+
+/**
+ * Path to theme json schema file.
+ *
+ * @type {URL}
+ */
+const THEME_JSON_SCHEMA_PATH = fileURLToPath(
+	new URL( '../../schemas/json/theme.json', import.meta.url )
+);
+
+/**
+ * Path to docs file.
+ *
+ * @type {URL}
+ */
+const REFERENCE_DOC_PATH = fileURLToPath(
+	new URL(
+		'../../docs/reference-guides/theme-json-reference/theme-json-living.md',
+		import.meta.url
+	)
+);
+
+/**
+ * Start token for matching string in doc file.
+ *
+ * @type {string}
+ */
+const START_TOKEN = '<!-- START TOKEN Autogenerated - DO NOT EDIT -->';
+
+/**
+ * Start token for matching string in doc file.
+ *
+ * @type {string}
+ */
+const END_TOKEN = '<!-- END TOKEN Autogenerated - DO NOT EDIT -->';
+
+/**
+ * @typedef {(schema: JSONSchema) => boolean} PredicateFunction
+ */
+
+/**
+ * @typedef {(schema: JSONSchema) => string} SerializerFunction
+ */
+
+/**
+ * Create a serializer function for a type. Supports merging one level of anyOf and oneOf subschemas.
+ *
+ * @see {@link https://json-schema.org/understanding-json-schema/reference/combining.html}
+ *
+ * @param {PredicateFunction}  predicate  Type predicate function to match a type.
+ * @param {SerializerFunction} serializer Serializer function to format a type.
+ * @return {SerializerFunction} Serializer function for the give type.
+ */
+function createSerializer( predicate, serializer ) {
+	return ( schema ) => {
+		const schemas = predicate( schema )
+			? [ schema ]
+			: schema.anyOf || schema.oneOf || [];
+		const formatted = schemas.filter( predicate ).map( serializer );
+		return [ ...new Set( formatted ) ].join( ', ' );
+	};
+}
+
+/**
+ * Serialize primitive types.
+ *
+ * @type {SerializerFunction}
+ */
+const serializePrimitiveTypes = createSerializer(
+	( schema ) =>
+		schema.type && ! [ 'object', 'array' ].includes( schema.type ),
+	( schema ) => `\`${ schema.type }\``
+);
+
+/**
+ * Serialize object types.
+ *
+ * @type {SerializerFunction}
+ */
+const serializeObjectTypes = createSerializer(
+	( schema ) => schema.properties,
+	( schema ) => `\`{ ${ Object.keys( schema.properties ).join( ', ' ) } }\``
+);
+
+/**
+ * Serialize object array types.
+ *
+ * @type {SerializerFunction}
+ */
+const serializeObjectArrayTypes = createSerializer(
+	( schema ) => schema.items && schema.items.properties,
+	( schema ) =>
+		`\`[ { ${ Object.keys( schema.items.properties ).join( ', ' ) } } ]\``
+);
+
+/**
+ * Serialize primitive array types.
+ *
+ * @type {SerializerFunction}
+ */
+const serializePrimitiveArrayTypes = createSerializer(
+	( schema ) =>
+		schema.items &&
+		schema.items.type &&
+		! [ 'object', 'array' ].includes( schema.items.type ),
+	( schema ) => `\`[ ${ schema.items.type } ]\``
+);
+
+/**
+ * Generate types from schema.
+ *
+ * @param {JSONSchema} schema JSON schema
+ * @return {string} serialized types
+ */
+function generateTypes( schema ) {
+	return [
+		serializePrimitiveTypes( schema ),
+		serializeObjectTypes( schema ),
+		serializePrimitiveArrayTypes( schema ),
+		serializeObjectArrayTypes( schema ),
+	]
+		.filter( Boolean )
+		.join( ', ' );
+}
+
+/**
+ * Generate documentation from theme.json schema.
+ *
+ * @param {JSONSchema} themeJson theme.json JSON schema
+ * @return {string} generated documentation
+ */
+function generateDocs( themeJson ) {
+	/** Markdown content. */
+	let md = '';
+
+	/* --------------- *
+	 * Settings        *
+	 * --------------- */
+	md += '## settings\n\n';
+	md += `${ themeJson.properties.settings.description }\n\n`;
+	const settings = [
+		// Top-level only properties.
+		...Object.entries( themeJson.properties.settings.allOf[ 1 ].properties )
+			.filter( ( [ property ] ) => property !== 'blocks' )
+			.map( ( [ property, subschema ] ) => [
+				property,
+				{
+					...subschema,
+					description: `${ subschema.description }\n\n**Note:** Top-level only property. Not available in blocks.`,
+				},
+			] ),
+		// Top-level and blocks properties.
+		...themeJson.properties.settings.allOf[ 0 ].allOf.flatMap(
+			( subschema ) => Object.entries( subschema.properties )
+		),
+	];
+	for ( const [ section, schema ] of settings ) {
+		md += `### ${ section }\n\n`;
+		md += `${ schema.description }\n\n`;
+		if ( schema.properties ) {
+			md += '| Property | Description | Type | Default |\n';
+			md += '| -------- | ----------- | ---- | ------- |\n';
+			const properties = Object.entries( schema.properties );
+			for ( const [ property, subschema ] of properties ) {
+				const description =
+					subschema.description?.split( '\n', 1 )[ 0 ] ?? '';
+				const types = generateTypes( subschema );
+				const defaultValue =
+					'default' in subschema
+						? `\`${ JSON.stringify( subschema.default ) }\``
+						: '';
+				md += `| ${ property } | ${ description } | ${ types } | ${ defaultValue } |\n`;
+			}
+			md += '\n';
+		}
+		md += `---\n\n`;
+	}
+
+	/* --------------- *
+	 * Styles          *
+	 * --------------- */
+	md += '## styles\n\n';
+	md += `${ themeJson.properties.styles.description }\n\n`;
+	const styles = Object.entries(
+		themeJson.properties.styles.allOf[ 0 ].properties
+	);
+	for ( const [ section, schema ] of styles ) {
+		md += `### ${ section }\n\n`;
+		md += `${ schema.description }\n\n`;
+		if ( schema.properties ) {
+			md += '| Property | Description | Type |\n';
+			md += '| -------- | ----------- | ---- |\n';
+			const properties = Object.entries( schema.properties );
+			for ( const [ property, subschema ] of properties ) {
+				// Assuming that the first line of a description is a summary.
+				const description =
+					subschema.description?.split( '\n', 1 )[ 0 ] ?? '';
+				const types = generateTypes( subschema );
+				md += `| ${ property } | ${ description } | ${ types } |\n`;
+			}
+			md += '\n';
+		}
+		md += `---\n\n`;
+	}
+
+	/* --------------- *
+	 * customTemplates *
+	 * --------------- */
+	md += '## customTemplates\n\n';
+	md += `${ themeJson.properties.customTemplates.description }\n\n`;
+	md += '| Property | Description | Type |\n';
+	md += '| -------- | ----------- | ---- |\n';
+	const customTemplatesProperties = Object.entries(
+		themeJson.properties.customTemplates.items.properties
+	);
+	for ( const [ property, subschema ] of customTemplatesProperties ) {
+		const { description } = subschema;
+		const types = generateTypes( subschema );
+		md += `| ${ property } | ${ description } | ${ types } |\n`;
+	}
+	md += '\n';
+
+	/* --------------- *
+	 * templateParts   *
+	 * --------------- */
+	md += '## templateParts\n\n';
+	md += `${ themeJson.properties.templateParts.description }\n\n`;
+	md += '| Property | Description | Type |\n';
+	md += '| -------- | ----------- | ---- |\n';
+	const templatePartsProperties = Object.entries(
+		themeJson.properties.templateParts.items.properties
+	);
+	for ( const [ property, subschema ] of templatePartsProperties ) {
+		const { description } = subschema;
+		const types = generateTypes( subschema );
+		md += `| ${ property } | ${ description } | ${ types } |\n`;
+	}
+	md += '\n';
+
+	/* --------------- *
+	 * patterns        *
+	 * --------------- */
+	md += '## patterns\n\n';
+	md += themeJson.properties.patterns.description + '\n\n';
+	md += `Type: ${ generateTypes( themeJson.properties.patterns ) }.\n`;
+
+	return md;
+}
+
+/**
+ * Main function.
+ */
+async function main() {
+	const themeJson = await $RefParser.dereference( THEME_JSON_SCHEMA_PATH, {
+		parse: { binary: false, text: false, yaml: false },
+		resolve: { external: false },
+	} );
+
+	const themeJsonReference = await fs.readFile( REFERENCE_DOC_PATH, {
+		encoding: 'utf8',
+		flag: 'r',
+	} );
+
+	const generatedDocs = generateDocs( themeJson );
+	const updatedThemeJsonReference = themeJsonReference.replace(
+		// `.` does not match new lines, but `[^]` will.
+		new RegExp( `${ START_TOKEN }[^]*${ END_TOKEN }` ),
+		`${ START_TOKEN }\n${ generatedDocs }\n${ END_TOKEN }`
+	);
+
+	await fs.writeFile( REFERENCE_DOC_PATH, updatedThemeJsonReference, {
+		encoding: 'utf8',
+	} );
+}
+
+main().catch( ( error ) => {
+	console.error( error );
+	process.exit( 1 );
+} );
diff --git a/bin/build-plugin-zip.sh b/bin/build-plugin-zip.sh
index 4ba931c4a4aeb6..c823ca6a8017f1 100755
--- a/bin/build-plugin-zip.sh
+++ b/bin/build-plugin-zip.sh
@@ -78,26 +78,16 @@ npm run build
 php bin/generate-gutenberg-php.php > gutenberg.tmp.php
 mv gutenberg.tmp.php gutenberg.php
 
-build_files=$(
-	ls build/*/*.{js,js.map,css,asset.php} \
-	build/block-library/blocks/*.php \
-	build/block-library/blocks/*/block.json \
-	build/block-library/blocks/*/*.{js,js.map,css,asset.php} \
-	build/edit-widgets/blocks/*/block.json \
-	build/widgets/blocks/*.php \
-	build/widgets/blocks/*/block.json \
-	build/style-engine/*.php \
-)
-
-
 # Generate the plugin zip file.
 status "Creating archive... 🎁"
-zip -r gutenberg.zip \
+zip --recurse-paths --no-dir-entries \
+	gutenberg.zip \
 	gutenberg.php \
 	lib \
 	packages/block-serialization-default-parser/*.php \
 	post-content.php \
-	$build_files \
+	build \
+	build-module \
 	readme.txt \
 	changelog.txt \
 	README.md
diff --git a/bin/check-latest-npm.js b/bin/check-latest-npm.js
deleted file mode 100644
index 8b9f86e95dd567..00000000000000
--- a/bin/check-latest-npm.js
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * External dependencies
- */
-const { green, red, yellow } = require( 'chalk' );
-const { get } = require( 'https' );
-const { spawn } = require( 'child_process' );
-const semver = require( 'semver' );
-
-/**
- * Internal dependencies
- */
-const {
-	engines: { npm: npmRange },
-	// Ignore reason: `package.json` exists outside `bin` `rootDir`.
-	// @ts-ignore
-} = require( '../package.json' );
-
-/**
- * Returns a promise resolving with the version number of the latest available
- * version of npm.
- *
- * @return {Promise<string>} Promise resolving with latest npm version.
- */
-async function getLatestNPMVersion() {
-	return new Promise( ( resolve, reject ) => {
-		get(
-			'https://registry.npmjs.org/npm',
-			{
-				headers: {
-					// By passing a specialized `Accept` header, the registry
-					// will return an abbreviated form of the package data which
-					// includes enough detail to determine the latest version.
-					//
-					// See: https://github.com/npm/registry/blob/HEAD/docs/responses/package-metadata.md
-					Accept: 'application/vnd.npm.install-v1+json',
-				},
-			},
-			async ( response ) => {
-				if ( response.statusCode !== 200 ) {
-					return reject(
-						new Error( 'Package data for npm not found' )
-					);
-				}
-
-				let body = '';
-				for await ( const chunk of response ) {
-					body += chunk.toString();
-				}
-
-				let data;
-				try {
-					data = JSON.parse( body );
-				} catch {
-					return reject(
-						new Error(
-							'Package data for npm returned invalid response body'
-						)
-					);
-				}
-
-				const versions = Object.values( data[ 'dist-tags' ] );
-
-				resolve( semver.maxSatisfying( versions, npmRange ) );
-			}
-		).on( 'error', ( error ) => {
-			if (
-				/** @type {NodeJS.ErrnoException} */ ( error ).code ===
-				'ENOTFOUND'
-			) {
-				error =
-					new Error( `Could not contact the npm registry to determine latest version.
-
-This could be due to an intermittent outage of the service, or because you are not connected to the internet.
-
-Because it is important that \`package-lock.json\` files only be committed while running the latest version of npm, this commit has been blocked.
-
-If you are certain of your changes and desire to commit anyways, you should either connect to the internet or bypass commit verification using ${ yellow(
-						'git commit --no-verify'
-					) } .` );
-			}
-
-			reject( error );
-		} );
-	} );
-}
-
-/**
- * Returns a promise resolving with the version number of the local installed
- * version of npm.
- *
- * @return {Promise<string>} Promise resolving with local installed npm version.
- */
-async function getLocalNPMVersion() {
-	return new Promise( async ( resolve ) => {
-		// 'npm' doesn't work correctly on Windows.
-		// https://github.com/WordPress/gutenberg/issues/22484
-		const command = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-		const childProcess = spawn( command, [ '-v' ] );
-
-		let output = '';
-		for await ( const chunk of childProcess.stdout ) {
-			output += chunk.toString();
-		}
-
-		resolve( output.trim() );
-	} );
-}
-
-Promise.all( [ getLatestNPMVersion(), getLocalNPMVersion() ] )
-	.then( ( [ latest, local ] ) => {
-		if ( latest !== local ) {
-			throw new Error(
-				`The local npm version does not match the expected latest version. Expected ${ green(
-					latest
-				) }, found ${ red( local ) }.
-
-It is required that you have the expected latest version of npm installed in order to commit a change to the package-lock.json file.
-
-Run ${ yellow(
-					`npm install --global npm@${ latest }`
-				) } to install the expected latest version of npm. Before retrying your commit, run ${ yellow(
-					'npm install'
-				) } once more to ensure the package-lock.json contents are correct. If there are any changes to the file, they should be included in your commit.`
-			);
-		}
-	} )
-	.catch( ( error ) => {
-		console.error(
-			'Latest npm check failed!\n\n' + error.toString() + '\n'
-		);
-		process.exitCode = 1;
-	} );
diff --git a/bin/check-licenses.mjs b/bin/check-licenses.mjs
new file mode 100755
index 00000000000000..458590e696a9fd
--- /dev/null
+++ b/bin/check-licenses.mjs
@@ -0,0 +1,69 @@
+#!/usr/bin/env node
+
+/**
+ * External dependencies
+ */
+import { spawnSync } from 'node:child_process';
+
+/**
+ * Internal dependencies
+ */
+import { checkDepsInTree } from '../packages/scripts/utils/license.js';
+
+const ignored = [ '@ampproject/remapping' ];
+
+/*
+ * `wp-scripts check-licenses` uses prod and dev dependencies of the package to scan for dependencies. With npm workspaces, workspace packages (the @wordpress/* packages) are not listed in the main package json and this approach does not work.
+ *
+ * Instead, work from an npm query that uses some custom information in package.json files to declare packages that are shipped with WordPress (and must be GPLv2 compatible) or other files that may use more permissive licenses.
+ */
+
+/**
+ * @typedef PackageInfo
+ * @property {string} name Package name.
+ */
+
+/** @type {ReadonlyArray<PackageInfo>} */
+const workspacePackages = JSON.parse(
+	spawnSync(
+		'npm',
+		[
+			'query',
+			'.workspace:attr([wpScript]), .workspace:attr([wpScriptModuleExports])',
+		],
+		/*
+		 * Set the max buffer to ~157MB, since the output size for
+		 * prod is ~21 MB and dev is ~110 MB
+		 */
+		{ maxBuffer: 1024 * 1024 * 150 }
+	).stdout
+);
+
+const packageNames = workspacePackages.map( ( { name } ) => name );
+
+const dependenciesToProcess = JSON.parse(
+	spawnSync(
+		'npm',
+		[
+			'ls',
+			'--json',
+			'--long',
+			'--all',
+			'--lockfile-only',
+			'--omit=dev',
+			...packageNames.map(
+				( packageName ) => `--workspace=${ packageName }`
+			),
+		],
+		/*
+		 * Set the max buffer to ~157MB, since the output size for
+		 * prod is ~21 MB and dev is ~110 MB
+		 */
+		{ maxBuffer: 1024 * 1024 * 150 }
+	).stdout
+).dependencies;
+
+checkDepsInTree( dependenciesToProcess, {
+	ignored,
+	gpl2: true,
+} );
diff --git a/bin/cherry-pick.mjs b/bin/cherry-pick.mjs
index 0c6a6c613638ba..b8661e696d7bd3 100644
--- a/bin/cherry-pick.mjs
+++ b/bin/cherry-pick.mjs
@@ -6,11 +6,13 @@ import readline from 'readline';
 
 import { spawnSync } from 'node:child_process';
 
+const REPO = 'WordPress/gutenberg';
 const LABEL = process.argv[ 2 ] || 'Backport to WP Beta/RC';
+const BACKPORT_COMPLETED_LABEL = 'Backported to WP Core';
 const BRANCH = getCurrentBranch();
 const GITHUB_CLI_AVAILABLE = spawnSync( 'gh', [ 'auth', 'status' ] )
 	?.stdout?.toString()
-	.includes( '✓ Logged in to github.com as' );
+	.includes( '✓ Logged in to github.com' );
 
 const AUTO_PROPAGATE_RESULTS_TO_GITHUB = GITHUB_CLI_AVAILABLE;
 
@@ -112,18 +114,28 @@ function cli( command, args, pipe = false ) {
  */
 async function fetchPRs() {
 	const { items } = await GitHubFetch(
-		`/search/issues?q=is:pr state:closed sort:updated label:"${ LABEL }" repo:WordPress/gutenberg`
+		`/search/issues?per_page=100&q=is:pr state:closed sort:updated label:"${ LABEL }" repo:${ REPO }`
 	);
-	const PRs = items.map( ( { id, number, title, pull_request, closed_at } ) => ( {
-		id,
-		number,
-		title,
-		pull_request,
-	} ) )
+	const PRs = items
+		// eslint-disable-next-line camelcase
+		.map( ( { id, number, title, pull_request } ) => ( {
+			id,
+			number,
+			title,
+			// eslint-disable-next-line camelcase
+			pull_request,
+		} ) )
+		// eslint-disable-next-line camelcase
 		.filter( ( { pull_request } ) => !! pull_request?.merged_at )
-		.sort( ( a, b ) => new Date(  a?.pull_request?.merged_at ) - new Date( b?.pull_request?.merged_at ) );
+		.sort(
+			( a, b ) =>
+				new Date( a?.pull_request?.merged_at ) -
+				new Date( b?.pull_request?.merged_at )
+		);
 
-	console.log( 'Found the following PRs to cherry-pick (sorted by closed date in ascending order): ' );
+	console.log(
+		'Found the following PRs to cherry-pick (sorted by closed date in ascending order): '
+	);
 	PRs.forEach( ( { number, title } ) =>
 		console.log( indent( `#${ number } – ${ title }` ) )
 	);
@@ -132,7 +144,7 @@ async function fetchPRs() {
 	const PRsWithMergeCommit = [];
 	for ( const PR of PRs ) {
 		const { merge_commit_sha: mergeCommitHash } = await GitHubFetch(
-			'/repos/WordPress/Gutenberg/pulls/' + PR.number
+			`/repos/${ REPO }/pulls/` + PR.number
 		);
 		PRsWithMergeCommit.push( {
 			...PR,
@@ -159,14 +171,25 @@ async function fetchPRs() {
  * @return {Promise<Object>} Parsed response JSON.
  */
 async function GitHubFetch( path ) {
+	const token = getGitHubAuthToken();
 	const response = await fetch( 'https://api.github.com' + path, {
 		headers: {
 			Accept: 'application/vnd.github.v3+json',
+			Authorization: `Bearer ${ token }`,
 		},
 	} );
 	return await response.json();
 }
 
+/**
+ * Retrieves the GitHub authentication token using `gh auth token`.
+ *
+ * @return {string} The GitHub authentication token.
+ */
+function getGitHubAuthToken() {
+	return cli( 'gh', [ 'auth', 'token' ] );
+}
+
 /**
  * Attempts to cherry-pick given PRs using `git` CLI command.
  *
@@ -327,6 +350,11 @@ function reportSummaryNextSteps( successes, failures ) {
 		nextSteps.push( 'Push this branch' );
 		nextSteps.push( 'Go to each of the cherry-picked Pull Requests' );
 		nextSteps.push( `Remove the ${ LABEL } label` );
+
+		if ( LABEL === 'Backport to WP Beta/RC' ) {
+			nextSteps.push( `Add the "${ BACKPORT_COMPLETED_LABEL }" label` );
+		}
+
 		nextSteps.push( 'Request a backport to wordpress-develop if required' );
 		nextSteps.push( 'Comment, say that PR just got cherry-picked' );
 	}
@@ -353,9 +381,22 @@ function reportSummaryNextSteps( successes, failures ) {
 function GHcommentAndRemoveLabel( pr ) {
 	const { number, cherryPickHash } = pr;
 	const comment = prComment( cherryPickHash );
+	const repo = [ '--repo', REPO ];
 	try {
-		cli( 'gh', [ 'pr', 'comment', number, '--body', comment ] );
-		cli( 'gh', [ 'pr', 'edit', number, '--remove-label', LABEL ] );
+		cli( 'gh', [ 'pr', 'comment', number, ...repo, '--body', comment ] );
+		cli( 'gh', [ 'pr', 'edit', number, ...repo, '--remove-label', LABEL ] );
+
+		if ( LABEL === 'Backport to WP Beta/RC' ) {
+			cli( 'gh', [
+				'pr',
+				'edit',
+				number,
+				...repo,
+				'--add-label',
+				BACKPORT_COMPLETED_LABEL,
+			] );
+		}
+
 		console.log( `✅ ${ number }: ${ comment }` );
 	} catch ( e ) {
 		console.log( `❌ ${ number }. ${ comment } ` );
@@ -406,7 +447,7 @@ function reportFailure( { number, title, error, mergeCommitHash } ) {
  * @return {string} PR URL.
  */
 function prUrl( number ) {
-	return `https://github.com/WordPress/gutenberg/pull/${ number } `;
+	return `https://github.com/${ REPO }/pull/${ number } `;
 }
 
 /**
@@ -439,7 +480,7 @@ function getCurrentBranch() {
  */
 async function reportGhUnavailable() {
 	console.log(
-		'Github CLI is not setup. This script will not be able to automatically'
+		'GitHub CLI is not setup. This script will not be able to automatically'
 	);
 	console.log(
 		'comment on the processed PRs and remove the backport label from them.'
diff --git a/bin/docker-compose.override.yml.template b/bin/docker-compose.override.yml.template
deleted file mode 100644
index 465211fe7a4a63..00000000000000
--- a/bin/docker-compose.override.yml.template
+++ /dev/null
@@ -1,17 +0,0 @@
-services:
-  wordpress-develop:
-    volumes:
-      - %PLUGIN_MOUNT_DIR%:/var/www/${LOCAL_DIR-src}/wp-content/plugins/%PLUGIN_INSTALL_DIR%
-      - %PLUGIN_MOUNT_DIR%/packages/e2e-tests/plugins:/var/www/${LOCAL_DIR-src}/wp-content/plugins/gutenberg-test-plugins
-      - %PLUGIN_MOUNT_DIR%/packages/e2e-tests/mu-plugins:/var/www/${LOCAL_DIR-src}/wp-content/mu-plugins
-  php:
-    volumes:
-      - %PLUGIN_MOUNT_DIR%:/var/www/${LOCAL_DIR-src}/wp-content/plugins/%PLUGIN_INSTALL_DIR%
-      - %PLUGIN_MOUNT_DIR%/packages/e2e-tests/plugins:/var/www/${LOCAL_DIR-src}/wp-content/plugins/gutenberg-test-plugins
-      - %PLUGIN_MOUNT_DIR%/packages/e2e-tests/mu-plugins:/var/www/${LOCAL_DIR-src}/wp-content/mu-plugins
-  cli:
-    volumes:
-      - %PLUGIN_MOUNT_DIR%:/var/www/${LOCAL_DIR-src}/wp-content/plugins/%PLUGIN_INSTALL_DIR%
-  phpunit:
-    volumes:
-      - %PLUGIN_MOUNT_DIR%:/var/www/${LOCAL_DIR-src}/wp-content/plugins/%PLUGIN_INSTALL_DIR%
diff --git a/bin/generate-php-sync-issue.mjs b/bin/generate-php-sync-issue.mjs
new file mode 100644
index 00000000000000..bd627aeb65107c
--- /dev/null
+++ b/bin/generate-php-sync-issue.mjs
@@ -0,0 +1,467 @@
+/**
+ * External dependencies
+ */
+
+import Octokit from '@octokit/rest';
+import fs from 'fs';
+
+import { fileURLToPath } from 'url';
+import nodePath, { dirname } from 'path';
+
+function getArg( argName ) {
+	const arg = process.argv.find( ( _arg ) =>
+		_arg.startsWith( `--${ argName }=` )
+	);
+	return arg ? arg.split( '=' )[ 1 ] : null;
+}
+
+const OWNER = 'wordpress';
+const REPO = 'gutenberg';
+const MAX_MONTHS_TO_QUERY = 4;
+
+// The following paths will be ignored when generating the issue content.
+const IGNORED_PATHS = [
+	'init.php', // plugin specific code.
+	'lib/load.php', // plugin specific code.
+	'lib/experiments-page.php', // experiments are plugin specific.
+	'packages/e2e-tests/plugins', // PHP files related to e2e tests only.
+	'packages/block-library', // packages are synced to WP Core via npm packages.
+];
+
+// PRs containing the following labels will be ignored when generating the issue content.
+const LABELS_TO_IGNORE = [
+	'Backport from WordPress Core', // PRs made "upstream" in Core that were synced back into Gutenberg.
+	'Backported to WP Core', // PRs that were synced into Core during a previous release.
+];
+
+const MAX_NESTING_LEVEL = 3;
+
+const __filename = fileURLToPath( import.meta.url );
+const __dirname = dirname( __filename );
+
+const authToken = getArg( 'token' );
+const stableWPRelease = getArg( 'wpstable' );
+
+async function main() {
+	if ( ! authToken ) {
+		console.error(
+			'Error. The --token argument is required. See: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-fine-grained-personal-access-token'
+		);
+		process.exit( 1 );
+	}
+
+	if ( ! stableWPRelease ) {
+		console.error(
+			'Error. The --wpstable argument is required. It should be the current stable WordPress release (e.g. 6.4).'
+		);
+		process.exit( 1 );
+	}
+
+	const sinceArg = getArg( 'since' );
+	let since;
+
+	if ( sinceArg ) {
+		if ( validateDate( sinceArg ) ) {
+			since = sinceArg;
+		} else {
+			console.error(
+				`Error: The --since argument cannot be more than ${ MAX_MONTHS_TO_QUERY } months from the current date.`
+			);
+			process.exit( 1 );
+		}
+	} else {
+		console.error(
+			`Error. The --since argument is required (e.g. YYYY-MM-DD). This should be the date of the final Gutenberg release that was included in the last stable WP Core release (see https://developer.wordpress.org/block-editor/contributors/versions-in-wordpress/).`
+		);
+		process.exit( 1 );
+	}
+
+	console.log( 'Welcome to the PHP Sync Issue Generator!' );
+
+	console.log( '--------------------------------' );
+	console.log( '• Running script...' );
+
+	// These should be paths where we expect to find PHP files that
+	// will require syncing to WordPress Core. This list should be
+	// extremely selective.
+	const paths = [ '/lib', '/phpunit' ];
+
+	console.log( `• Fetching all commits made to ${ REPO } since: ${ since }` );
+	let commits = await fetchAllCommitsFromPaths( since, paths );
+
+	// Remove identical commits based on sha
+	commits = commits.reduce( ( acc, current ) => {
+		const x = acc.find( ( item ) => item.sha === current.sha );
+		if ( ! x ) {
+			return acc.concat( [ current ] );
+		}
+		return acc;
+	}, [] );
+
+	// Fetch the full commit data for each of the commits.
+	// This is because the /commits endpoint does not include the
+	// information about the `files` modified in the commit.
+	console.log(
+		`• Fetching full commit data for ${ commits.length } commits`
+	);
+	const commitsWithCommitData = await Promise.all(
+		commits.map( async ( commit ) => {
+			const commitData = await fetchCommit( commit.sha );
+
+			const fullPRData = await getPullRequestDataForCommit( commit.sha );
+
+			// Our Issue links to the PRs associated with the commits so we must
+			// provide this data. We could also get the PR data from the commit data,
+			// using getPullRequestDataForCommit, but that requires yet another
+			// network request. Therefore we optimise for trying to build
+			// the PR URL from the commit data we have available.
+			commitData.pullRequest = {
+				url: fullPRData?.html_url || buildPRURL( commit ),
+				creator:
+					fullPRData?.user?.login ||
+					commit?.author?.login ||
+					'unknown',
+				labels: fullPRData?.labels || [],
+			};
+
+			// if the PR labels contain any of the labels to ignore, skip this commit
+			// by returning null.
+			if (
+				commitData.pullRequest.labels.some( ( label ) =>
+					LABELS_TO_IGNORE.includes( label.name )
+				)
+			) {
+				return null;
+			}
+
+			return commitData;
+		} )
+	);
+
+	const processResult = pipe(
+		processCommits,
+		reduceNesting,
+		dedupePRsPerLevel,
+		removeEmptyLevels,
+		sortLevels
+	);
+
+	console.log( `• Processing ${ commitsWithCommitData.length } commits` );
+	const result = processResult( commitsWithCommitData );
+
+	console.log( `• Generating Issue content` );
+	const content = generateIssueContent( result );
+
+	// Write the Markdown content to a file
+	fs.writeFileSync( nodePath.join( __dirname, 'issueContent.md' ), content );
+}
+
+/**
+ * Checks if the first date is after the second date.
+ *
+ * @param {string} date1 - The first date.
+ * @param {string} date2 - The second date.
+ * @return {boolean} - Returns true if the first date is after the second date, false otherwise.
+ */
+function isAfter( date1, date2 ) {
+	return new Date( date1 ) > new Date( date2 );
+}
+
+function validateDate( sinceArg ) {
+	const sinceDate = new Date( sinceArg );
+	const maxPreviousDate = new Date();
+	maxPreviousDate.setMonth(
+		maxPreviousDate.getMonth() - MAX_MONTHS_TO_QUERY
+	);
+
+	return sinceDate >= maxPreviousDate;
+}
+
+async function octokitPaginate( method, params ) {
+	return octokitRequest( method, params, { paginate: true } );
+}
+
+async function octokitRequest( method = '', params = {}, settings = {} ) {
+	const octokit = new Octokit( { auth: authToken } );
+	params.owner = OWNER;
+	params.repo = REPO;
+
+	const requestType = settings?.paginate ? 'paginate' : 'request';
+
+	try {
+		const result = await octokit[ requestType ]( method, params );
+
+		if ( requestType === 'paginate' ) {
+			return result;
+		}
+		return result.data;
+	} catch ( error ) {
+		console.error(
+			`Error making request to ${ method }: ${ error.message }`
+		);
+		process.exit( 1 );
+	}
+}
+
+async function fetchAllCommitsFromPaths( since, paths ) {
+	let commits = [];
+
+	for ( const path of paths ) {
+		const pathCommits = await fetchAllCommits( since, path );
+		commits = [ ...commits, ...pathCommits ];
+	}
+
+	return commits;
+}
+
+function buildPRURL( commit ) {
+	const prIdMatch = commit.commit.message.match( /\(#(\d+)\)/ );
+	const prId = prIdMatch ? prIdMatch[ 1 ] : null;
+	return prId
+		? `https://github.com/WordPress/gutenberg/pull/${ prId }`
+		: `[Commit](${ commit.html_url })`;
+}
+
+function sortLevels( data ) {
+	function processLevel( levelData ) {
+		const processedData = {};
+
+		// Separate directories and files
+		const directories = {};
+		const files = {};
+
+		for ( const [ key, value ] of Object.entries( levelData ) ) {
+			if ( key.endsWith( '.php' ) ) {
+				files[ key ] = Array.isArray( value )
+					? value
+					: processLevel( value );
+			} else {
+				directories[ key ] = Array.isArray( value )
+					? value
+					: processLevel( value );
+			}
+		}
+
+		// Combine directories and files
+		Object.assign( processedData, directories, files );
+
+		return processedData;
+	}
+
+	return processLevel( data );
+}
+
+function removeEmptyLevels( data ) {
+	function processLevel( levelData ) {
+		const processedData = {};
+
+		for ( const [ key, value ] of Object.entries( levelData ) ) {
+			if ( Array.isArray( value ) ) {
+				if ( value.length > 0 ) {
+					processedData[ key ] = value;
+				}
+			} else {
+				const processedLevel = processLevel( value );
+				if ( Object.keys( processedLevel ).length > 0 ) {
+					processedData[ key ] = processedLevel;
+				}
+			}
+		}
+
+		return processedData;
+	}
+
+	return processLevel( data );
+}
+
+function dedupePRsPerLevel( data ) {
+	function processLevel( levelData ) {
+		const processedData = {};
+		const prSet = new Set();
+
+		for ( const [ key, value ] of Object.entries( levelData ) ) {
+			if ( Array.isArray( value ) ) {
+				processedData[ key ] = value.filter( ( commit ) => {
+					if ( ! prSet.has( commit.pullRequest.url ) ) {
+						prSet.add( commit.pullRequest.url );
+						return true;
+					}
+					return false;
+				} );
+			} else {
+				processedData[ key ] = processLevel( value );
+			}
+		}
+
+		return processedData;
+	}
+
+	return processLevel( data );
+}
+
+function reduceNesting( data ) {
+	function processLevel( levelData, level = 1 ) {
+		const processedData = {};
+
+		for ( const [ key, value ] of Object.entries( levelData ) ) {
+			if ( Array.isArray( value ) ) {
+				processedData[ key ] = value;
+			} else if ( level < MAX_NESTING_LEVEL ) {
+				processedData[ key ] = processLevel( value, level + 1 );
+			} else {
+				processedData[ key ] = flattenData( value );
+			}
+		}
+
+		return processedData;
+	}
+
+	function flattenData( nestedData ) {
+		let flatData = [];
+
+		for ( const value of Object.values( nestedData ) ) {
+			if ( Array.isArray( value ) ) {
+				flatData = [ ...flatData, ...value ];
+			} else {
+				flatData = [ ...flatData, ...flattenData( value ) ];
+			}
+		}
+
+		return flatData;
+	}
+
+	return processLevel( data );
+}
+
+function processCommits( commits ) {
+	const result = {};
+
+	// This dir sholud be ignored, since whatever is in there is already in core.
+	// It exists to provide compatibility for older releases, because we have to
+	// support the current and the previous WP versions.
+	// See: https://github.com/WordPress/gutenberg/pull/57890#pullrequestreview-1828994247.
+	const prevReleaseCompatDirToIgnore = `lib/compat/wordpress-${ stableWPRelease }`;
+
+	commits.forEach( ( commit ) => {
+		// Skip commits without an associated pull request
+		if ( ! commit?.pullRequest ) {
+			return;
+		}
+		commit.files.forEach( ( file ) => {
+			// Skip files that are not PHP files.
+			if ( ! file.filename.endsWith( '.php' ) ) {
+				return;
+			}
+
+			if (
+				[ ...IGNORED_PATHS, prevReleaseCompatDirToIgnore ].some(
+					( path ) =>
+						file.filename.startsWith( path ) ||
+						file.filename === path
+				)
+			) {
+				// Skip files within specific packages.
+				return;
+			}
+
+			const parts = file.filename.split( '/' );
+
+			let current = result;
+
+			// If the file is under 'phpunit', always add it to the 'phpunit' key
+			// as it's helpful to have a full list of commits that modify tests.
+			if ( parts.includes( 'phpunit' ) ) {
+				current.phpunit = current.phpunit || [];
+				current.phpunit = [ ...current.phpunit, commit ];
+			}
+
+			for ( let i = 0; i < parts.length; i++ ) {
+				const part = parts[ i ];
+
+				if ( i === parts.length - 1 ) {
+					current[ part ] = current[ part ] || [];
+					current[ part ] = [ ...current[ part ], commit ];
+				} else {
+					current[ part ] = current[ part ] || {};
+					current = current[ part ];
+				}
+			}
+		} );
+	} );
+
+	return result;
+}
+
+function formatPRLine( { pullRequest: pr } ) {
+	return `- [ ] ${ pr.url } - @${ pr.creator } | Trac ticket | Core backport PR \n`;
+}
+
+function formatHeading( level, key ) {
+	const emoji = key.endsWith( '.php' ) ? '📄' : '📁';
+	return `${ '#'.repeat( level ) } ${ emoji } ${ key }\n\n`;
+}
+
+function generateIssueContent( result, level = 1 ) {
+	let issueContent = '';
+	let isFirstSection = true;
+
+	for ( const [ key, value ] of Object.entries( result ) ) {
+		// Add horizontal rule divider between sections, but not before the first section
+		if ( level <= 2 && ! isFirstSection ) {
+			issueContent += '\n---\n';
+		}
+
+		issueContent += formatHeading( level, key );
+
+		if ( Array.isArray( value ) ) {
+			value.forEach( ( commit ) => {
+				issueContent += formatPRLine( commit );
+			} );
+		} else {
+			issueContent += generateIssueContent( value, level + 1 );
+		}
+
+		isFirstSection = false;
+	}
+
+	return issueContent;
+}
+
+async function fetchAllCommits( since, path ) {
+	return octokitPaginate( 'GET /repos/{owner}/{repo}/commits', {
+		since,
+		per_page: 30,
+		path,
+	} );
+}
+
+async function fetchCommit( sha ) {
+	return octokitRequest( 'GET /repos/{owner}/{repo}/commits/{sha}', {
+		sha,
+	} );
+}
+
+// eslint-disable-next-line no-unused-vars
+async function getPullRequestDataForCommit( commitSha ) {
+	const pullRequests = await octokitRequest(
+		'GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls',
+		{
+			commit_sha: commitSha,
+		}
+	);
+
+	// If a related Pull Request is found, return its URL and creator
+	if ( pullRequests.length > 0 ) {
+		const pullRequest = pullRequests[ 0 ];
+		return pullRequest;
+	}
+
+	return null;
+}
+
+const pipe =
+	( ...fns ) =>
+	( x ) =>
+		fns.reduce( ( v, f ) => f( v ), x );
+
+main();
diff --git a/bin/list-experimental-api-matches.sh b/bin/list-experimental-api-matches.sh
index 156464c4e7375e..d9399e63e5cf64 100755
--- a/bin/list-experimental-api-matches.sh
+++ b/bin/list-experimental-api-matches.sh
@@ -31,7 +31,7 @@ namespace() {
 	awk -F: '
 		{ print module($1), $2 }
 		function module(path) {
-			n = split(path, parts, "/")
+			split(path, parts, "/")
 			if (parts[1] == "lib") return "lib"
 			return parts[1] "/" parts[2]
 		}'
diff --git a/bin/log-performance-results.js b/bin/log-performance-results.js
index f18e40fea3d2f4..da22253546eb61 100755
--- a/bin/log-performance-results.js
+++ b/bin/log-performance-results.js
@@ -50,7 +50,7 @@ const data = new TextEncoder().encode(
 						performanceResults[ index ][ hash ] ?? {}
 					).map( ( [ key, value ] ) => [
 						metricsPrefix + key,
-						value,
+						typeof value === 'object' ? value.q50 : value,
 					] )
 				),
 			};
@@ -64,7 +64,7 @@ const data = new TextEncoder().encode(
 							performanceResults[ index ][ baseHash ] ?? {}
 						).map( ( [ key, value ] ) => [
 							metricsPrefix + key,
-							value,
+							typeof value === 'object' ? value.q50 : value,
 						] )
 					),
 				};
diff --git a/bin/packages/build-worker.js b/bin/packages/build-worker.js
index 3f1512ef0feb78..06e30efc6c6dc9 100644
--- a/bin/packages/build-worker.js
+++ b/bin/packages/build-worker.js
@@ -13,6 +13,8 @@ const postcss = require( 'postcss' );
  */
 const getBabelConfig = require( './get-babel-config' );
 
+const isDev = process.env.NODE_ENV === 'development';
+
 /**
  * Path to packages directory.
  *
@@ -27,10 +29,12 @@ const PACKAGES_DIR = path
  *
  * @type {Object}
  */
-const JS_ENVIRONMENTS = {
-	main: 'build',
-	module: 'build-module',
-};
+const JS_ENVIRONMENTS = isDev
+	? { module: 'build-module' }
+	: {
+			main: 'build',
+			module: 'build-module',
+	  };
 
 /**
  * Promisified fs.readFile.
@@ -122,9 +126,10 @@ async function buildCSS( file ) {
 		data: ''.concat( '@use "sass:math";', importLists, contents ),
 	} );
 
-	const result = await postcss(
-		require( '@wordpress/postcss-plugins-preset' )
-	).process( builtSass.css, {
+	const result = await postcss( [
+		require( 'postcss-local-keyframes' ),
+		...require( '@wordpress/postcss-plugins-preset' ),
+	] ).process( builtSass.css, {
 		from: 'src/app.css',
 		to: 'dest/app.css',
 	} );
diff --git a/bin/packages/build.js b/bin/packages/build.js
index f4597d4f1425fa..61914bab5700a7 100755
--- a/bin/packages/build.js
+++ b/bin/packages/build.js
@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 /**
  * External dependencies
  */
diff --git a/bin/packages/check-build-type-declaration-files.js b/bin/packages/check-build-type-declaration-files.js
index fff0b51e32fc24..ffc68c83b8da8e 100644
--- a/bin/packages/check-build-type-declaration-files.js
+++ b/bin/packages/check-build-type-declaration-files.js
@@ -69,13 +69,16 @@ async function getDecFile( packagePath ) {
 
 async function typecheckDeclarations( file ) {
 	return new Promise( ( resolve, reject ) => {
-		exec( `npx tsc --noEmit ${ file }`, ( error, stdout, stderr ) => {
-			if ( error ) {
-				reject( { file, error, stderr, stdout } );
-			} else {
-				resolve( { file, stdout } );
+		exec(
+			`npx tsc --target esnext --moduleResolution node --noEmit --skipLibCheck "${ file }"`,
+			( error, stdout, stderr ) => {
+				if ( error ) {
+					reject( { file, error, stderr, stdout } );
+				} else {
+					resolve( { file, stdout } );
+				}
 			}
-		} );
+		);
 	} );
 }
 
diff --git a/bin/packages/get-babel-config.js b/bin/packages/get-babel-config.js
index 91fe4b07d325e6..9427549cafaba6 100644
--- a/bin/packages/get-babel-config.js
+++ b/bin/packages/get-babel-config.js
@@ -11,6 +11,8 @@ module.exports = ( environment = '', file ) => {
 			name: `WP_BUILD_${ environment.toUpperCase() }`,
 		},
 	};
+	// Add `/* wp:polyfill */` magic comment where needed.
+	callerOpts.caller.addPolyfillComments = true;
 	switch ( environment ) {
 		case 'main':
 			// To be merged as a presetEnv option.
diff --git a/bin/packages/lint-staged-typecheck.js b/bin/packages/lint-staged-typecheck.js
index 7b7eb7b846bfb0..8e656755134f18 100644
--- a/bin/packages/lint-staged-typecheck.js
+++ b/bin/packages/lint-staged-typecheck.js
@@ -28,9 +28,11 @@ const changedPackages = [
 	fs.existsSync( path.join( packageRoot, 'tsconfig.json' ) )
 );
 
-try {
-	execa.sync( tscPath, [ '--build', ...changedPackages ] );
-} catch ( err ) {
-	console.error( err.stdout );
-	process.exitCode = 1;
+if ( changedPackages.length > 0 ) {
+	try {
+		execa.sync( tscPath, [ '--build', ...changedPackages ] );
+	} catch ( err ) {
+		console.error( err.stdout );
+		process.exitCode = 1;
+	}
 }
diff --git a/bin/plugin/commands/changelog.js b/bin/plugin/commands/changelog.js
index 0b2bb4c2b2c0cc..eac0f7b268d5bf 100644
--- a/bin/plugin/commands/changelog.js
+++ b/bin/plugin/commands/changelog.js
@@ -108,6 +108,7 @@ const LABEL_FEATURE_MAPPING = {
 	'[Feature] Patterns': 'Patterns',
 	'[Feature] Blocks': 'Block Library',
 	'[Feature] Inserter': 'Block Editor',
+	'[Feature] Interactivity API': 'Interactivity API',
 	'[Feature] Drag and Drop': 'Block Editor',
 	'[Feature] Block Multi Selection': 'Block Editor',
 	'[Feature] Link Editing': 'Block Editor',
@@ -605,11 +606,11 @@ function getEntry( issue ) {
 
 /**
  * Builds a formatted string of the Issue/PR title with a link
- * to the Github URL for that item.
+ * to the GitHub URL for that item.
  *
  * @param {string} title  the title of the Issue/PR.
  * @param {number} number the ID/number of the Issue/PR.
- * @param {string} url    the URL of the Github Issue/PR.
+ * @param {string} url    the URL of the GitHub Issue/PR.
  * @return {string} the formatted item
  */
 function getFormattedItemDescription( title, number, url ) {
@@ -855,7 +856,7 @@ function sortFeatureGroups( featureGroups ) {
 }
 
 /**
- * Returns a list of PRs created by first time contributors based on the Github
+ * Returns a list of PRs created by first time contributors based on the GitHub
  * label associated with the PR. Also filters out any "bots".
  *
  * @param {IssuesListForRepoResponseItem[]} pullRequests List of pull requests.
@@ -960,9 +961,9 @@ function getContributorProps( pullRequests ) {
 	}
 
 	return (
-		'## First time contributors' +
+		'## First-time contributors' +
 		'\n\n' +
-		'The following PRs were merged by first time contributors:' +
+		'The following PRs were merged by first-time contributors:' +
 		'\n\n' +
 		contributorsList
 	);
diff --git a/bin/plugin/commands/common.js b/bin/plugin/commands/common.js
index 59abfa93447ef3..067e50bb6440a2 100644
--- a/bin/plugin/commands/common.js
+++ b/bin/plugin/commands/common.js
@@ -46,7 +46,7 @@ function calculateVersionBumpFromChangelog(
 	let changesDetected = false;
 	let versionBump = null;
 	for ( const line of lines ) {
-		const lineNormalized = line.toLowerCase().trimLeft();
+		const lineNormalized = line.toLowerCase().trimStart();
 		// Detect unpublished changes first.
 		if ( lineNormalized.startsWith( '## unreleased' ) ) {
 			changesDetected = true;
diff --git a/bin/plugin/commands/packages.js b/bin/plugin/commands/packages.js
index c2f673d51dcc33..d70baf4f91bfa7 100644
--- a/bin/plugin/commands/packages.js
+++ b/bin/plugin/commands/packages.js
@@ -135,7 +135,7 @@ async function runNpmReleaseBranchSyncStep( pluginReleaseBranch, config ) {
 		/*
 		 * Replace content from remote branch.
 		 *
-		 * @TODO: What is our goal here? Could `git reset --hard origin/${pluginReleaseBranch}` work?
+		 * @todo What is our goal here? Could `git reset --hard origin/${pluginReleaseBranch}` work?
 		 *        Why are we manually removing and then adding files back in?
 		 */
 		await repo
diff --git a/bin/plugin/commands/performance.js b/bin/plugin/commands/performance.js
index bdc38347e40c86..a945319a5491b1 100644
--- a/bin/plugin/commands/performance.js
+++ b/bin/plugin/commands/performance.js
@@ -20,6 +20,7 @@ const config = require( '../config' );
 
 const ARTIFACTS_PATH =
 	process.env.WP_ARTIFACTS_PATH || path.join( process.cwd(), 'artifacts' );
+const RAW_RESULTS_FILE_SUFFIX = '.performance-results.raw.json';
 const RESULTS_FILE_SUFFIX = '.performance-results.json';
 
 /**
@@ -56,22 +57,97 @@ function sanitizeBranchName( branch ) {
 }
 
 /**
- * Computes the median number from an array numbers.
- *
+ * @param {number} number
+ */
+function fixed( number ) {
+	return Math.round( number * 100 ) / 100;
+}
+
+/**
  * @param {number[]} array
- *
- * @return {number|undefined} Median value or undefined if array empty.
  */
-function median( array ) {
-	if ( ! array || ! array.length ) return undefined;
+function quartiles( array ) {
+	const numbers = array.slice().sort( ( a, b ) => a - b );
+
+	/**
+	 * @param {number} offset
+	 * @param {number} length
+	 */
+	function med( offset, length ) {
+		if ( length % 2 === 0 ) {
+			// even length, average of two middle numbers
+			return (
+				( numbers[ offset + length / 2 - 1 ] +
+					numbers[ offset + length / 2 ] ) /
+				2
+			);
+		}
+
+		// odd length, exact middle point
+		return numbers[ offset + ( length - 1 ) / 2 ];
+	}
 
-	const numbers = [ ...array ].sort( ( a, b ) => a - b );
-	const middleIndex = Math.floor( numbers.length / 2 );
+	const q50 = med( 0, numbers.length );
 
+	let q25, q75;
 	if ( numbers.length % 2 === 0 ) {
-		return ( numbers[ middleIndex - 1 ] + numbers[ middleIndex ] ) / 2;
+		// medians of two exact halves
+		const mid = numbers.length / 2;
+		q25 = med( 0, mid );
+		q75 = med( mid, mid );
+	} else {
+		// quartiles are average of medians of the smaller and bigger slice
+		const midl = ( numbers.length - 1 ) / 2;
+		const midh = ( numbers.length + 1 ) / 2;
+		q25 = ( med( 0, midl ) + med( 0, midh ) ) / 2;
+		q75 = ( med( midl, midh ) + med( midh, midl ) ) / 2;
 	}
-	return numbers[ middleIndex ];
+	return { q25, q50, q75 };
+}
+
+/**
+ * @param {number[]|undefined} values
+ */
+function stats( values ) {
+	if ( ! values || values.length === 0 ) {
+		return undefined;
+	}
+	const { q25, q50, q75 } = quartiles( values );
+	const cnt = values.length;
+	return {
+		q25: fixed( q25 ),
+		q50: fixed( q50 ),
+		q75: fixed( q75 ),
+		cnt,
+	};
+}
+
+/**
+ * Nicely formats a given value.
+ *
+ * @param {string} metric Metric.
+ * @param {number} value
+ */
+function formatValue( metric, value ) {
+	if ( 'wpMemoryUsage' === metric ) {
+		return `${ ( value / Math.pow( 10, 6 ) ).toFixed( 2 ) } MB`;
+	}
+
+	if ( 'wpDbQueries' === metric ) {
+		return value.toString();
+	}
+
+	return `${ value } ms`;
+}
+
+/**
+ * @param {string}                 m
+ * @param {Record<string, number>} s
+ */
+function printStats( m, s ) {
+	const pp = fixed( ( 100 * ( s.q75 - s.q50 ) ) / s.q50 );
+	const mp = fixed( ( 100 * ( s.q50 - s.q25 ) ) / s.q50 );
+	return `${ formatValue( m, s.q50 ) } +${ pp }% -${ mp }%`;
 }
 
 /**
@@ -94,6 +170,61 @@ async function runTestSuite( testSuite, testRunnerDir, runKey ) {
 	);
 }
 
+/**
+ * Formats an array of objects as a Markdown table.
+ *
+ * For example, this array:
+ *
+ * [
+ * 	{
+ * 	    foo: 123,
+ * 	    bar: 456,
+ * 	    baz: 'Yes',
+ * 	},
+ * 	{
+ * 	    foo: 777,
+ * 	    bar: 999,
+ * 	    baz: 'No',
+ * 	}
+ * ]
+ *
+ * Will result in the following table:
+ *
+ * | foo | bar | baz |
+ * |-----|-----|-----|
+ * | 123 | 456 | Yes |
+ * | 777 | 999 | No  |
+ *
+ * @param {Array<Object>} rows Table rows.
+ * @return {string} Markdown table content.
+ */
+function formatAsMarkdownTable( rows ) {
+	let result = '';
+
+	if ( ! rows.length ) {
+		return result;
+	}
+
+	const headers = Object.keys( rows[ 0 ] );
+	for ( const header of headers ) {
+		result += `| ${ header } `;
+	}
+	result += '|\n';
+	for ( let i = 0; i < headers.length; i++ ) {
+		result += '| ------ ';
+	}
+	result += '|\n';
+
+	for ( const row of rows ) {
+		for ( const value of Object.values( row ) ) {
+			result += `| ${ value } `;
+		}
+		result += '|\n';
+	}
+
+	return result;
+}
+
 /**
  * Runs the performances tests on an array of branches and output the result.
  *
@@ -362,9 +493,9 @@ async function runPerformanceTests( branches, options ) {
 	logAtIndent( 0, 'Calculating results' );
 
 	const resultFiles = getFilesFromDir( ARTIFACTS_PATH ).filter( ( file ) =>
-		file.endsWith( RESULTS_FILE_SUFFIX )
+		file.endsWith( RAW_RESULTS_FILE_SUFFIX )
 	);
-	/** @type {Record<string,Record<string, Record<string, number>>>} */
+	/** @type {Record<string,Record<string, Record<string, Record<string, number>>>>} */
 	const results = {};
 
 	// Calculate medians from all rounds.
@@ -385,20 +516,21 @@ async function runPerformanceTests( branches, options ) {
 					return readJSONFile( file );
 				} );
 
-			const metrics = Object.keys( resultsRounds[ 0 ] );
+			const metrics = Object.keys( resultsRounds[ 0 ] ?? {} );
 			results[ testSuite ][ branch ] = {};
 
 			for ( const metric of metrics ) {
-				const values = resultsRounds
-					.map( ( round ) => round[ metric ] )
-					.filter( ( value ) => typeof value === 'number' );
+				const values = resultsRounds.flatMap(
+					( round ) => round[ metric ] ?? []
+				);
 
-				const value = median( values );
+				const value = stats( values );
 				if ( value !== undefined ) {
 					results[ testSuite ][ branch ][ metric ] = value;
 				}
 			}
 		}
+
 		const calculatedResultsPath = path.join(
 			ARTIFACTS_PATH,
 			testSuite + RESULTS_FILE_SUFFIX
@@ -422,24 +554,82 @@ async function runPerformanceTests( branches, options ) {
 		)
 	);
 
+	let summaryMarkdown = `## Performance Test Results\n\n`;
+
+	summaryMarkdown += `Please note that client side metrics **exclude** the server response time.\n\n`;
+
 	for ( const testSuite of testSuites ) {
 		logAtIndent( 0, formats.success( testSuite ) );
 
 		// Invert the results so we can display them in a table.
-		/** @type {Record<string, Record<string, string>>} */
+		/** @type {Record<string, Record<string, Record<string, number>>>} */
 		const invertedResult = {};
 		for ( const [ branch, metrics ] of Object.entries(
 			results[ testSuite ]
 		) ) {
 			for ( const [ metric, value ] of Object.entries( metrics ) ) {
 				invertedResult[ metric ] = invertedResult[ metric ] || {};
-				invertedResult[ metric ][ branch ] = `${ value } ms`;
+				invertedResult[ metric ][ branch ] = value;
+			}
+		}
+
+		/** @type {Record<string, Record<string, string>>} */
+		const printedResult = {};
+		for ( const [ metric, branch ] of Object.entries( invertedResult ) ) {
+			printedResult[ metric ] = {};
+			for ( const [ branchName, data ] of Object.entries( branch ) ) {
+				printedResult[ metric ][ branchName ] = printStats(
+					metric,
+					data
+				);
+			}
+
+			if ( branches.length === 2 ) {
+				const [ branch1, branch2 ] = branches;
+				const value1 = branch[ branch1 ].q50;
+				const value2 = branch[ branch2 ].q50;
+				const percentageChange = fixed(
+					( ( value1 - value2 ) / value2 ) * 100
+				);
+				printedResult[ metric ][
+					'% Change'
+				] = `${ percentageChange }%`;
 			}
 		}
 
 		// Print the results.
-		console.table( invertedResult );
+		console.table( printedResult );
+
+		// Use yet another structure to generate a Markdown table.
+
+		const rows = [];
+
+		for ( const [ metric, resultBranches ] of Object.entries(
+			printedResult
+		) ) {
+			/**
+			 * @type {Record< string, string >}
+			 */
+			const row = {
+				Metric: metric,
+			};
+
+			for ( const [ branch, value ] of Object.entries(
+				resultBranches
+			) ) {
+				row[ branch ] = value;
+			}
+			rows.push( row );
+		}
+
+		summaryMarkdown += `**${ testSuite }**\n\n`;
+		summaryMarkdown += `${ formatAsMarkdownTable( rows ) }\n`;
 	}
+
+	fs.writeFileSync(
+		path.join( ARTIFACTS_PATH, 'summary.md' ),
+		summaryMarkdown
+	);
 }
 
 module.exports = {
diff --git a/bin/plugin/commands/test/__snapshots__/changelog.js.snap b/bin/plugin/commands/test/__snapshots__/changelog.js.snap
index e79d9d8706c4f3..dc33f052a0b9d8 100644
--- a/bin/plugin/commands/test/__snapshots__/changelog.js.snap
+++ b/bin/plugin/commands/test/__snapshots__/changelog.js.snap
@@ -284,9 +284,9 @@ The following contributors merged PRs in this release:
 `;
 
 exports[`getContributorProps verify that the contributors props are properly formatted 1`] = `
-"## First time contributors
+"## First-time contributors
 
-The following PRs were merged by first time contributors:
+The following PRs were merged by first-time contributors:
 
 - @leemyongpakvn: Fix a broken MD link in callout. ([54772](https://github.com/WordPress/gutenberg/pull/54772))
 "
diff --git a/bin/plugin/commands/test/changelog.js b/bin/plugin/commands/test/changelog.js
index 12420fd1e4b6f9..9c9d423d18d1cb 100644
--- a/bin/plugin/commands/test/changelog.js
+++ b/bin/plugin/commands/test/changelog.js
@@ -25,7 +25,7 @@ import _pullRequests from './fixtures/pull-requests.json';
 import botPullRequestFixture from './fixtures/bot-pull-requests.json';
 
 /**
- * pull-requests.json is a static snapshot of real data from the Github API.
+ * pull-requests.json is a static snapshot of real data from the GitHub API.
  * We merge this with dummy fixture data for a "bot" pull request so as to
  * ensure future updates to the pull-requests.json doesn't reduce test coverage
  * of filtering out of bot PRs.
diff --git a/bin/test-create-block.sh b/bin/test-create-block.sh
index 7959334a8e30ec..99b7e8e6082604 100755
--- a/bin/test-create-block.sh
+++ b/bin/test-create-block.sh
@@ -69,7 +69,7 @@ status "Building block..."
 ../node_modules/.bin/wp-scripts build
 
 status "Verifying build..."
-expected=7
+expected=9
 actual=$( find build -maxdepth 1 -type f | wc -l )
 if [ "$expected" -ne "$actual" ]; then
 	error "Expected $expected files in the \`build\` directory, but found $actual."
diff --git a/bin/tsconfig.json b/bin/tsconfig.json
index f3d576c178d0c0..3ec5d5826a045d 100644
--- a/bin/tsconfig.json
+++ b/bin/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
 		"module": "commonjs",
@@ -17,7 +18,6 @@
 	},
 	"files": [
 		"./api-docs/update-api-docs.js",
-		"./check-latest-npm.js",
 		"./plugin/config.js",
 		"./plugin/commands/changelog.js",
 		"./plugin/commands/performance.js",
diff --git a/changelog.txt b/changelog.txt
index b8946492403702..2b10884ae10885 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,10507 @@
 == Changelog ==
 
+= 19.5.0 =
+
+## Changelog
+
+### Enhancements
+
+- Remove the verb Toggle from the Block Inserter button. ([65983](https://github.com/WordPress/gutenberg/pull/65983))
+- Update jsdom to 25.0.1. ([65879](https://github.com/WordPress/gutenberg/pull/65879))
+- Write/Design tool: Persist as a user preference. ([65945](https://github.com/WordPress/gutenberg/pull/65945))
+
+#### Zoom Out
+- Make zoom transition smoother. ([66017](https://github.com/WordPress/gutenberg/pull/66017))
+- Try zooming out when selecting the patterns tab in the inserter. ([65785](https://github.com/WordPress/gutenberg/pull/65785))
+- Update/replace edit button with enter on selection. ([65760](https://github.com/WordPress/gutenberg/pull/65760))
+
+#### Block Editor
+- Cleanup `AutoBlockPreview` render memoization of `BlockList`. ([66060](https://github.com/WordPress/gutenberg/pull/66060))
+- Use shallow memo for prioritized inserter blocks. ([65737](https://github.com/WordPress/gutenberg/pull/65737))
+
+#### Components
+- Add type tokens to storybook. ([65993](https://github.com/WordPress/gutenberg/pull/65993))
+- Storybook: Add stub doc on existing colors. ([65982](https://github.com/WordPress/gutenberg/pull/65982))
+
+#### Icons
+- Update "hidden" icon to be clearer, and invert logic as used in Data Views. ([65914](https://github.com/WordPress/gutenberg/pull/65914))
+- Update cloud upload and add cloud download icon. ([65906](https://github.com/WordPress/gutenberg/pull/65906))
+
+#### Global Styles
+- Improve navigation logic for revisions screen. ([65946](https://github.com/WordPress/gutenberg/pull/65946))
+
+#### Block bindings
+- Register bindings sources in widgets screens. ([65937](https://github.com/WordPress/gutenberg/pull/65937))
+
+#### Block Library
+- Cover Block: Refactor setting panel. ([65432](https://github.com/WordPress/gutenberg/pull/65432))
+
+
+### Bug Fixes
+
+- Add argument with post ID to the editor.savePost hook. ([66165](https://github.com/WordPress/gutenberg/pull/66165))
+- Backport from WordPress Core: improve performance of WP_Theme_JSON::Merge when merging background styles. ([66002](https://github.com/WordPress/gutenberg/pull/66002))
+- BlockCanvas: Fix the height prop and width of the block editor. ([65977](https://github.com/WordPress/gutenberg/pull/65977))
+- Correct capability for the Experiments page. ([66118](https://github.com/WordPress/gutenberg/pull/66118))
+- Fix rich text toolbar corners. ([66163](https://github.com/WordPress/gutenberg/pull/66163))
+- Fix: Add missing `post.slug` dependency to `useMemo`. ([66125](https://github.com/WordPress/gutenberg/pull/66125))
+- Fix: Return result from wp_register_block_template function. ([66102](https://github.com/WordPress/gutenberg/pull/66102))
+- List all active fonts in the typography section. ([65806](https://github.com/WordPress/gutenberg/pull/65806))
+
+#### Zoom Out
+- Exit zoom out when mode is changed. ([65975](https://github.com/WordPress/gutenberg/pull/65975))
+- Fix scaling issues. ([65998](https://github.com/WordPress/gutenberg/pull/65998))
+- Fix zoom reflow by replacing border with padding. ([66012](https://github.com/WordPress/gutenberg/pull/66012))
+- Focus first section root block if no selected block and tabbing to zoom out canvas. ([65843](https://github.com/WordPress/gutenberg/pull/65843))
+- Make zoom out vertical toolbar consistent. ([65627](https://github.com/WordPress/gutenberg/pull/65627))
+- Polish zoom out inserter. ([66110](https://github.com/WordPress/gutenberg/pull/66110))
+- Position scaled html within available container space. ([66034](https://github.com/WordPress/gutenberg/pull/66034))
+- Restores setting zoom out mode to useZoomOut hook. ([65999](https://github.com/WordPress/gutenberg/pull/65999))
+- Use consistent canvas frame spacing on device preview and zoom out. ([66018](https://github.com/WordPress/gutenberg/pull/66018))
+- Zoom layout shift: Second alternate fix. ([66041](https://github.com/WordPress/gutenberg/pull/66041))
+
+#### Block Library
+- Code block: Set LTR direction for RTL languages. ([65891](https://github.com/WordPress/gutenberg/pull/65891))
+- Fix duotone on parallax/repeated featured image cover blocks. ([65929](https://github.com/WordPress/gutenberg/pull/65929))
+- Fix: Embed Block: Match HTML in the editor and frontend. ([65478](https://github.com/WordPress/gutenberg/pull/65478))
+- Hide grid visualizer when grid is template locked or block editing mode is not default. ([66065](https://github.com/WordPress/gutenberg/pull/66065))
+- Post Content Block: Fix conflict between clearFix and focus ring in the editor. ([65364](https://github.com/WordPress/gutenberg/pull/65364))
+- Post Content: Fix display of block support styles. ([66003](https://github.com/WordPress/gutenberg/pull/66003))
+- Post Terms: Fix fatal error when 'get_the_term_list' returns 'WP_Error'. ([65848](https://github.com/WordPress/gutenberg/pull/65848))
+- Query Loop: Fix isControlAllowed and isTemplate combined logic. ([65984](https://github.com/WordPress/gutenberg/pull/65984))
+- Query Loop: Fix query type indicator. ([65877](https://github.com/WordPress/gutenberg/pull/65877))
+- Revert "Update z-index hierarchy". ([66074](https://github.com/WordPress/gutenberg/pull/66074))
+
+#### Block bindings
+- Accept client ID as parameter for `useBlockBindingsUtils`. ([65818](https://github.com/WordPress/gutenberg/pull/65818))
+- Allow label override when it is defined in client registration. ([66160](https://github.com/WordPress/gutenberg/pull/66160))
+- Bootstrap server sources earlier. ([66058](https://github.com/WordPress/gutenberg/pull/66058))
+- Fix: Don't render image when `src` attribute is empty. ([66004](https://github.com/WordPress/gutenberg/pull/66004))
+- Allow the field types matching attribute types in bindings. ([66174](https://github.com/WordPress/gutenberg/pull/66174))
+
+#### Global Styles
+- Always preview style variations using desktop device type. ([66023](https://github.com/WordPress/gutenberg/pull/66023))
+- Improve Navigator usage in typography panel. ([65942](https://github.com/WordPress/gutenberg/pull/65942))
+- Leave screen if current shadow entry gets deleted. ([65935](https://github.com/WordPress/gutenberg/pull/65935))
+- `PaletteEdit`: Dedupe palette element slugs. ([65772](https://github.com/WordPress/gutenberg/pull/65772))
+
+#### Block Editor
+- Fix DropZone class names on drop. ([65798](https://github.com/WordPress/gutenberg/pull/65798))
+- Fix padding appender hook. ([66143](https://github.com/WordPress/gutenberg/pull/66143))
+- Memoize pattern objects returned from getAllowedPatterns. ([66159](https://github.com/WordPress/gutenberg/pull/66159))
+
+#### Components
+- Fix : Secondary Button Transition. ([66045](https://github.com/WordPress/gutenberg/pull/66045))
+- Global Styles: Fix overflow caused by RangeControl tooltip. ([65875](https://github.com/WordPress/gutenberg/pull/65875))
+- ToggleGroupControl: Don't set value on focus after a reset. ([66151](https://github.com/WordPress/gutenberg/pull/66151))
+
+#### Interactivity API
+- Allow "default" suffix values. ([65815](https://github.com/WordPress/gutenberg/pull/65815))
+- Correctly handle lazily added, deeply nested properties with `deepMerge()`. ([65465](https://github.com/WordPress/gutenberg/pull/65465))
+- Improvements to the experimental full-page navigation. ([64067](https://github.com/WordPress/gutenberg/pull/64067))
+
+#### Site Editor
+- Fix site editor back button visual regressions. ([66166](https://github.com/WordPress/gutenberg/pull/66166))
+- Zoom Out: When double clicking a template while zoomed out , reset zoom level instead of showing dialog. ([65963](https://github.com/WordPress/gutenberg/pull/65963))
+
+#### CSS & Styling
+- Editor: Prevent wrapping text when showing icon labels in header. ([66038](https://github.com/WordPress/gutenberg/pull/66038))
+- Update z-index hierarchy. ([65626](https://github.com/WordPress/gutenberg/pull/65626))
+
+#### Data Views
+- Data Views list layout: Revise for improved text truncation. ([65376](https://github.com/WordPress/gutenberg/pull/65376))
+- Fix: Pattern rendering issue. ([66022](https://github.com/WordPress/gutenberg/pull/66022))
+
+#### Extensibility
+- Rename wp_register_block_template() to register_block_template(). ([65958](https://github.com/WordPress/gutenberg/pull/65958))
+
+#### Post Editor
+- Fix "typewriter" spacing style application. ([65885](https://github.com/WordPress/gutenberg/pull/65885))
+
+#### Synced Patterns
+- Pattern block: Ensure consistent editing of overrides in Write Mode. ([65408](https://github.com/WordPress/gutenberg/pull/65408))
+
+
+### Accessibility
+
+#### Post Editor
+- Fix meta boxes accessibility. ([65466](https://github.com/WordPress/gutenberg/pull/65466))
+- Fix navigate regions shortcuts on the back button WP logo slot. ([63611](https://github.com/WordPress/gutenberg/pull/63611))
+- Improve PostURL terminology and accessibility. ([63669](https://github.com/WordPress/gutenberg/pull/63669))
+- Match visible label of search inputs with their actual label. ([65458](https://github.com/WordPress/gutenberg/pull/65458))
+
+#### Components
+- Fixed : Modal dialog: Small improvement for elementShouldBeHidden. ([65941](https://github.com/WordPress/gutenberg/pull/65941))
+- ToggleGroupControl: Don't autoselect option on first group focus. ([65892](https://github.com/WordPress/gutenberg/pull/65892))
+- Tooltip: Add aria-describedby to anchor only if not redundant. ([65989](https://github.com/WordPress/gutenberg/pull/65989))
+
+#### Typography
+- Revert the "Manage fonts" button in Global Styles. ([66107](https://github.com/WordPress/gutenberg/pull/66107))
+
+
+### Performance
+
+#### Interactivity API
+- Leverage scheduler.yield in splitTask when available. ([66001](https://github.com/WordPress/gutenberg/pull/66001))
+
+
+### Documentation
+
+- Add heading level curation documentation. ([66076](https://github.com/WordPress/gutenberg/pull/66076))
+- Components: Set up README auto-generator. ([66035](https://github.com/WordPress/gutenberg/pull/66035))
+- Contrast notes: Update 4.6:1 note with further context. ([66168](https://github.com/WordPress/gutenberg/pull/66168))
+- Data-basics/4-building-a-create-page-form is ready now. ([66100](https://github.com/WordPress/gutenberg/pull/66100))
+- Docs: env: Expand examples of path syntax. ([65972](https://github.com/WordPress/gutenberg/pull/65972))
+- Updated several typos in client-assets.php file. ([66084](https://github.com/WordPress/gutenberg/pull/66084))
+- Use correct label in PHP Backport documentation. ([65908](https://github.com/WordPress/gutenberg/pull/65908))
+- add: Usage examples in core editor documentation. ([63768](https://github.com/WordPress/gutenberg/pull/63768))
+
+
+### Code Quality
+
+- .screen-reader-text CSS update for responsive-block-control style.scss. ([66145](https://github.com/WordPress/gutenberg/pull/66145))
+- Add missing CHANGELOG entries for #64067. ([66120](https://github.com/WordPress/gutenberg/pull/66120))
+- Button: Move to stricter lint rule for 40px size adherence. ([65840](https://github.com/WordPress/gutenberg/pull/65840))
+- Private APIs: Remove obsolete try/catch block. ([65898](https://github.com/WordPress/gutenberg/pull/65898))
+- Remove clip and -webkit-clip for block-library common.scss. ([66144](https://github.com/WordPress/gutenberg/pull/66144))
+- Remove unused select toolbar code. ([65834](https://github.com/WordPress/gutenberg/pull/65834))
+- Simplify logical expression in `InitPatternModal`. ([65922](https://github.com/WordPress/gutenberg/pull/65922))
+- Theme JSON: Remove redundant check and relocate $selectors assignment. ([66154](https://github.com/WordPress/gutenberg/pull/66154))
+- Type the router package. ([65854](https://github.com/WordPress/gutenberg/pull/65854))
+
+#### Global Styles
+- Edit Site: Avoid recomputing variations when no theme variations. ([66137](https://github.com/WordPress/gutenberg/pull/66137))
+- Edit Site: Remove redundant state in `StyleVariationsContainer`. ([66130](https://github.com/WordPress/gutenberg/pull/66130))
+
+#### Block Library
+- Post Terms: Remove unnecessary 'get_the_terms' call. ([65867](https://github.com/WordPress/gutenberg/pull/65867))
+- Query Loop Block: Remove redundant sticky state. ([66126](https://github.com/WordPress/gutenberg/pull/66126))
+
+#### Components
+- Clean up Tabs animation logic. ([65878](https://github.com/WordPress/gutenberg/pull/65878))
+- SearchControl: Deprecate onClose prop. ([65988](https://github.com/WordPress/gutenberg/pull/65988))
+
+#### Post Editor
+- Block Visibility: Add end-to-end test. ([65880](https://github.com/WordPress/gutenberg/pull/65880))
+
+#### Zoom Out
+- Fix components coding standards in Zoom Out Toolbar. ([65858](https://github.com/WordPress/gutenberg/pull/65858))
+
+
+### Tools
+
+#### Testing
+- Add an end-to-end test to check the interactions in write mode. ([65819](https://github.com/WordPress/gutenberg/pull/65819))
+- Composite: Add legacy unit tests to stable version. ([65952](https://github.com/WordPress/gutenberg/pull/65952))
+- Fix end-to-end Storybook configuration. ([66089](https://github.com/WordPress/gutenberg/pull/66089))
+- Tests: Add unit tests for image rendering. ([66010](https://github.com/WordPress/gutenberg/pull/66010))
+- Zoom out: End-to-end test - zoomed out mode zooms the canvas. ([65943](https://github.com/WordPress/gutenberg/pull/65943))
+- e2e: Fix Block Visibility test. ([65939](https://github.com/WordPress/gutenberg/pull/65939))
+
+#### Build Tooling
+- Dedupe npm packages. ([65913](https://github.com/WordPress/gutenberg/pull/65913))
+- Update and align babel dependencies version. ([65949](https://github.com/WordPress/gutenberg/pull/65949))
+- Update node-fetch to 2.7.0. ([65957](https://github.com/WordPress/gutenberg/pull/65957))
+- Update npm lockfile to version 3. ([65923](https://github.com/WordPress/gutenberg/pull/65923))
+- Upgrade browserslist and webcompat data packages. ([65926](https://github.com/WordPress/gutenberg/pull/65926))
+
+
+### Various
+
+- Consistent with block-development-examples data-basics-59c8f8. ([65995](https://github.com/WordPress/gutenberg/pull/65995))
+- Interactivity: Update preact packages. ([66008](https://github.com/WordPress/gutenberg/pull/66008))
+
+#### Patterns
+- Revert "Pattern block: Ensure consistent editing of overrides in Write Mode (#65408)". ([65953](https://github.com/WordPress/gutenberg/pull/65953))
+
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+- @AnmolVerma404: Fix: Return result from wp_register_block_template function. ([66102](https://github.com/WordPress/gutenberg/pull/66102))
+- @leemyongpakva: Consistent with block-development-examples data-basics-59c8f8. ([65995](https://github.com/WordPress/gutenberg/pull/65995))
+- @matt-west: Icons: Update cloud upload and add cloud download icon. ([65906](https://github.com/WordPress/gutenberg/pull/65906))
+- @mediaformat: .screen-reader-text CSS update for responsive-block-control style.scss. ([66145](https://github.com/WordPress/gutenberg/pull/66145))
+- @vk17-starlord: Fixed : Modal dialog: Small improvement for elementShouldBeHidden. ([65941](https://github.com/WordPress/gutenberg/pull/65941))
+- @Vrishabhsk: SearchControl: Deprecate onClose prop. ([65988](https://github.com/WordPress/gutenberg/pull/65988))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @ajlende @akasunil @Aljullu @andrewserong @AnmolVerma404 @ciampo @DaniGuardiola @dhruvang21 @draganescu @getdave @hbhalodia @jameskoster @jasmussen @jeryj @jsnajdr @leemyongpakva @MaggieCabrera @Mamaduka @matiasbenedetto @matt-west @mcsf @mediaformat @michalczaplinski @mikachan @mirka @ndiego @ntsekouras @ramonjd @renatho @richtabor @rmccue @sabernhardt @SantosGuillamot @shail-mehta @sirreal @stokesman @t-hamano @talldan @troychaplin @tyxla @up1512001 @vk17-starlord @Vrishabhsk @westonruter @youknowriad
+
+
+
+
+= 19.4.0 =
+
+## Changelog
+
+### Enhancements
+
+#### Block Library
+- Added keywords to query loop block. ([65515](https://github.com/WordPress/gutenberg/pull/65515))
+- Added: DropZone when sitelogo is present. ([65596](https://github.com/WordPress/gutenberg/pull/65596))
+- Avatar: Add block example. ([65509](https://github.com/WordPress/gutenberg/pull/65509))
+- Buttons: add box-sizing:Border-box rule. ([65716](https://github.com/WordPress/gutenberg/pull/65716))
+- Comment Author Name: Add block example. ([65558](https://github.com/WordPress/gutenberg/pull/65558))
+- Comment Content: Add block example. ([65559](https://github.com/WordPress/gutenberg/pull/65559))
+- Comment Date: Add block example. ([65632](https://github.com/WordPress/gutenberg/pull/65632))
+- Comment Edit/Reply Links: Add block examples. ([65601](https://github.com/WordPress/gutenberg/pull/65601))
+- Comment Pagination: Add previous and next link block examples. ([65633](https://github.com/WordPress/gutenberg/pull/65633))
+- Comments Pagination Numbers: Add block example. ([65635](https://github.com/WordPress/gutenberg/pull/65635))
+- Comments Title: Add block example. ([65557](https://github.com/WordPress/gutenberg/pull/65557))
+- File block: Allow content only editing. ([65787](https://github.com/WordPress/gutenberg/pull/65787))
+- Navigation block: Use `apply_block_hooks_to_content()`. ([65703](https://github.com/WordPress/gutenberg/pull/65703))
+- Post Navigation Link: Add block examples. ([65552](https://github.com/WordPress/gutenberg/pull/65552))
+- Query No Results: Add block example. ([65555](https://github.com/WordPress/gutenberg/pull/65555))
+- Query Pagination Numbers: Add block example. ([65636](https://github.com/WordPress/gutenberg/pull/65636))
+- Query Pagination: Add block example. ([65556](https://github.com/WordPress/gutenberg/pull/65556))
+- Query Title: Add block example. ([65554](https://github.com/WordPress/gutenberg/pull/65554))
+- Revert: Time To Read: Add block example. ([65510](https://github.com/WordPress/gutenberg/pull/65510))
+- Table of Contents: Try maintaining block example attributes. ([65549](https://github.com/WordPress/gutenberg/pull/65549))
+- Term Description: Add block example. ([65553](https://github.com/WordPress/gutenberg/pull/65553))
+- Time To Read: Add block example. ([65512](https://github.com/WordPress/gutenberg/pull/65512))
+
+#### Components
+-  Light branding for the reference site. ([65764](https://github.com/WordPress/gutenberg/pull/65764))
+- BorderControl: Use `__next40pxDefaultSize` prop for Reset button. ([65682](https://github.com/WordPress/gutenberg/pull/65682))
+- Composite: Always await initial render setup in unit tests. ([65823](https://github.com/WordPress/gutenberg/pull/65823))
+- DatePicker: Use compact button size. ([65653](https://github.com/WordPress/gutenberg/pull/65653))
+- Guide: Update finish button to use the new default size. ([65680](https://github.com/WordPress/gutenberg/pull/65680))
+- Navigator: Add support for exit animation. ([64777](https://github.com/WordPress/gutenberg/pull/64777))
+- Remove `useEvent` from components package. ([65388](https://github.com/WordPress/gutenberg/pull/65388))
+- Simplify MenuGroup component styles. ([65561](https://github.com/WordPress/gutenberg/pull/65561))
+- Storybook: Allow for case-agnostic filtering of icons. ([65780](https://github.com/WordPress/gutenberg/pull/65780))
+- ToggleGroupControl: Improve animation. ([65175](https://github.com/WordPress/gutenberg/pull/65175))
+- Tabs: Tweak sizing and overflow behavior of TabList. ([64371](https://github.com/WordPress/gutenberg/pull/64371))
+- Tabs: Unify vertical tabs styles. ([65387](https://github.com/WordPress/gutenberg/pull/65387))
+
+#### Zoom Out
+- Add prompt to zoom out separator. ([65392](https://github.com/WordPress/gutenberg/pull/65392))
+- Make sections `contentOnly` in Zoom Out. ([65396](https://github.com/WordPress/gutenberg/pull/65396))
+- Move the toggle button to before the device preview dropdown. ([65446](https://github.com/WordPress/gutenberg/pull/65446))
+- Only show zoom out inserters on block selection. ([65759](https://github.com/WordPress/gutenberg/pull/65759))
+
+#### Block Editor
+- Hide block transforms in contentOnly mode for non-content blocks. ([65394](https://github.com/WordPress/gutenberg/pull/65394))
+- Inserter: Always show the list of all patterns in the inserter. ([65611](https://github.com/WordPress/gutenberg/pull/65611))
+- MediaPlaceholder: Use InputControl in URL popover. ([65656](https://github.com/WordPress/gutenberg/pull/65656))
+- Use proper named `File` when uploading external images. ([65693](https://github.com/WordPress/gutenberg/pull/65693))
+
+#### Data Views
+- DataForm - Add combined fields support. ([65399](https://github.com/WordPress/gutenberg/pull/65399))
+- Filter UI: Remove popover max height. ([65835](https://github.com/WordPress/gutenberg/pull/65835))
+- Dataviews configuration dropdown: Remove style overrides. ([65373](https://github.com/WordPress/gutenberg/pull/65373))
+
+#### Post Editor
+- Edit Post: Remove unnecessary effect in `InitPatternModal`. ([65734](https://github.com/WordPress/gutenberg/pull/65734))
+- Editor: Consistent external media pre-publish image/button sizes. ([65668](https://github.com/WordPress/gutenberg/pull/65668))
+
+#### Global Styles
+- Editor Canvas: Tweak close button. ([65694](https://github.com/WordPress/gutenberg/pull/65694))
+- Style book: Create static categories. ([65430](https://github.com/WordPress/gutenberg/pull/65430))
+
+#### Edit Mode
+- Update tools menus with Write / Design order. ([65721](https://github.com/WordPress/gutenberg/pull/65721))
+
+#### Select Mode
+- Select Mode: Updates to the block toolbar. ([65485](https://github.com/WordPress/gutenberg/pull/65485))
+- Select Mode: Use the content-only behavior in select mode. ([65204](https://github.com/WordPress/gutenberg/pull/65204))
+
+#### Icons
+- Adds envelope icon. ([65638](https://github.com/WordPress/gutenberg/pull/65638))
+
+#### Site Editor
+- Global Styles: Remove navigator screen overrides. ([65522](https://github.com/WordPress/gutenberg/pull/65522))
+- Command Palette: "Add new page" within the site editor creates new page in site editor. ([65476](https://github.com/WordPress/gutenberg/pull/65476))
+- Update elevation in the site editor. ([65410](https://github.com/WordPress/gutenberg/pull/65410))
+
+#### Block bindings
+- Connected blocks, add backdrop-color. ([65233](https://github.com/WordPress/gutenberg/pull/65233))
+
+#### Extensibility
+- Stabilize the PreSavePost and SavePost filters. ([64198](https://github.com/WordPress/gutenberg/pull/64198))
+
+#### Base Styles
+- Base styles: Add type tokens. ([65418](https://github.com/WordPress/gutenberg/pull/65418))
+
+#### Tools
+- Composer: Allow composer/installers 2.x. ([65356](https://github.com/WordPress/gutenberg/pull/65356))
+
+#### Block hooks
+- Hooks: Add support for async filters and actions. ([64204](https://github.com/WordPress/gutenberg/pull/64204))
+
+### New APIs
+
+- Revert "Make `wordpress/fields` a private package". ([65477](https://github.com/WordPress/gutenberg/pull/65477))
+- Stabilise role attribute property. ([65484](https://github.com/WordPress/gutenberg/pull/65484))
+
+#### Block bindings
+- Open the stable editor APIs. ([65713](https://github.com/WordPress/gutenberg/pull/65713))
+
+#### Components
+- Navigator: Stabilize and export APIs. ([64613](https://github.com/WordPress/gutenberg/pull/64613))
+
+### Bug Fixes
+
+#### Components
+- Block Editor: Validate options for the 'HeadingLevelDropdown' component. ([65425](https://github.com/WordPress/gutenberg/pull/65425))
+- Composite: Fix legacy implementation passing store prop. ([65821](https://github.com/WordPress/gutenberg/pull/65821))
+- Composite: Make items tabbable if active element gets removed. ([65720](https://github.com/WordPress/gutenberg/pull/65720))
+- Navigator: Fix isInitial logic. ([65527](https://github.com/WordPress/gutenberg/pull/65527))
+- Restore accidentally removed entries in changelog (components package). ([65804](https://github.com/WordPress/gutenberg/pull/65804))
+- useToolsPanel: Calculate derived state in reducer to prevent too many renders. ([65564](https://github.com/WordPress/gutenberg/pull/65564))
+- useToolsPanel: Calculate menuItems in layout effect to avoid painting intermediate state. ([65494](https://github.com/WordPress/gutenberg/pull/65494))
+
+#### Zoom Out
+- Fix focus loss when deleting selected block in zoom out mode. ([65761](https://github.com/WordPress/gutenberg/pull/65761))
+- Handle zoom out when changing device preview. ([65444](https://github.com/WordPress/gutenberg/pull/65444))
+- Hide Zoom Out Inserters when dragging into canvas. ([65789](https://github.com/WordPress/gutenberg/pull/65789))
+- Makes spacing consistent in zoom out vertical toolbar. ([63994](https://github.com/WordPress/gutenberg/pull/63994))
+- Remove one occurrence of the verb Toggle from Zoom out control. ([65609](https://github.com/WordPress/gutenberg/pull/65609))
+- Reset zoom out level when device type is changed. ([65652](https://github.com/WordPress/gutenberg/pull/65652))
+- Resize cover block only in normal mode. ([65731](https://github.com/WordPress/gutenberg/pull/65731))
+
+#### Block Editor
+- Fix unable to remove empty blocks on merge. ([65262](https://github.com/WordPress/gutenberg/pull/65262))
+- Inserter: Fix Block visibility manager. ([65700](https://github.com/WordPress/gutenberg/pull/65700))
+- Link autocompleter: Decode post title HTML entities. ([65589](https://github.com/WordPress/gutenberg/pull/65589))
+- Openverse: Prevent multiple insertions during upload. ([65719](https://github.com/WordPress/gutenberg/pull/65719))
+- Paste Handler: Try to fix pasting text with formatting. ([63779](https://github.com/WordPress/gutenberg/pull/63779))
+- Remove user-select:Text. ([65662](https://github.com/WordPress/gutenberg/pull/65662))
+- Editor: Remove edit template menu item from block settings menu in blocks outside template. ([65560](https://github.com/WordPress/gutenberg/pull/65560))
+- Top Toolbar: Show document bar when no block is selected even if block tools are expanded. ([65839](https://github.com/WordPress/gutenberg/pull/65839))
+- Revert "Allow multi-select on iOS Safari/touch devices". ([65414](https://github.com/WordPress/gutenberg/pull/65414))
+
+#### Global Styles
+- Avoid errors when a fontSize preset is not available. ([65791](https://github.com/WordPress/gutenberg/pull/65791))
+- Fix: Shadow/Font size preset panel crashes the editor. ([65765](https://github.com/WordPress/gutenberg/pull/65765))
+- Revert "Font Library: Group fonts by source (#63211)". ([65590](https://github.com/WordPress/gutenberg/pull/65590))
+- Tweak entity save panel button. ([65695](https://github.com/WordPress/gutenberg/pull/65695))
+
+#### Block bindings
+- Fix editing protected custom fields in block bindings. ([65658](https://github.com/WordPress/gutenberg/pull/65658))
+- Fix showing bindings field values in theme templates. ([65639](https://github.com/WordPress/gutenberg/pull/65639))
+- Only pass context included in `usesContext` from rich text component. ([65618](https://github.com/WordPress/gutenberg/pull/65618))
+- Use `registry` instead of `select` in `canUserEditValue`. ([65659](https://github.com/WordPress/gutenberg/pull/65659))
+
+#### Block Library
+- Categories block: Escape label. ([65540](https://github.com/WordPress/gutenberg/pull/65540))
+- Search block: Reset size correctly when clearing unit control. ([65468](https://github.com/WordPress/gutenberg/pull/65468))
+- Social Links: Fix block appender size. ([65769](https://github.com/WordPress/gutenberg/pull/65769))
+
+#### Site Editor
+- Fix: Makes edit mode selector persistent in top toolbar mode. ([65511](https://github.com/WordPress/gutenberg/pull/65511))
+- Global styles: Do not navigate twice to home screen when opening the sidebar. ([65523](https://github.com/WordPress/gutenberg/pull/65523))
+- Make resizable frame compatible with RTL languages. ([65545](https://github.com/WordPress/gutenberg/pull/65545))
+- Command Palette: Fix "Add new page" command for hybrid theme. ([65534](https://github.com/WordPress/gutenberg/pull/65534))
+- Export `useResizeObserver` React Native version directly. ([65588](https://github.com/WordPress/gutenberg/pull/65588))
+- Fix `useResizeObserver` bugs. ([65389](https://github.com/WordPress/gutenberg/pull/65389))
+- Fix aria-checked attribute not set for plugin settings buttons in Options dropdown. ([65667](https://github.com/WordPress/gutenberg/pull/65667))
+- Revert "useToolsPanel: Calculate menuItems in layout effect to avoid painting intermediate state". ([65533](https://github.com/WordPress/gutenberg/pull/65533))
+
+#### Focus Mode
+- Limit zoom out toggle to specific post types. ([65732](https://github.com/WordPress/gutenberg/pull/65732))
+
+#### List View
+- Fix miscolored icons. ([65707](https://github.com/WordPress/gutenberg/pull/65707))
+
+#### Media
+- Fix output buffering for cross-origin isolation. ([65701](https://github.com/WordPress/gutenberg/pull/65701))
+
+#### Block Directory
+- Fix downloadable block item alignment. ([65677](https://github.com/WordPress/gutenberg/pull/65677))
+
+#### Typography
+- Remove additional Typeset screen and surface typesets in the typography panel. ([65579](https://github.com/WordPress/gutenberg/pull/65579))
+
+#### Widgets Editor
+- Fixed the focus cutoff of the editor buttons in the widgets editor. ([65395](https://github.com/WordPress/gutenberg/pull/65395))
+
+#### Post Editor
+- Omit meta boxes on “design” type posts. ([64990](https://github.com/WordPress/gutenberg/pull/64990))
+
+#### Data Views
+- Fix grid layout padding on small screens. ([64878](https://github.com/WordPress/gutenberg/pull/64878))
+
+#### Build Tools
+- Babel preset: Add missing pkg files. ([65481](https://github.com/WordPress/gutenberg/pull/65481))
+- Temp disable test for Classic Block Media issue. ([65793](https://github.com/WordPress/gutenberg/pull/65793))
+
+#### Select Mode
+- Select Mode: Blocks outside the main sections root should be disabled. ([65518](https://github.com/WordPress/gutenberg/pull/65518))
+- Select Mode: Prevent the inbetween inserter from triggering within sections. ([65529](https://github.com/WordPress/gutenberg/pull/65529))
+
+### Accessibility
+
+#### Post Editor
+- Make the Settings panel toggle button show its keyboard shortcut in its tooltip. ([65322](https://github.com/WordPress/gutenberg/pull/65322))
+- Resizable Editor: Make the editor resizable with arrow keys. ([65546](https://github.com/WordPress/gutenberg/pull/65546))
+
+#### Components
+- ToggleGroupControl: Fix arrow key navigation in RTL. ([65735](https://github.com/WordPress/gutenberg/pull/65735))
+
+#### Zoom Out
+- Don't show tooltip in zoom out toggle button when showIconLabels is true. ([65573](https://github.com/WordPress/gutenberg/pull/65573))
+
+#### Block Library
+- Improve the Query Loop block display settings labels. ([65524](https://github.com/WordPress/gutenberg/pull/65524))
+
+#### Block Editor
+- Updates LayoutTypeSwitcher to use ToggleGroupControl. ([65498](https://github.com/WordPress/gutenberg/pull/65498))
+
+#### Code Quality
+- A11y: Move script module HTML printing to 6.7 compat. ([65620](https://github.com/WordPress/gutenberg/pull/65620))
+- Update to use a11y script module package in Core. ([65539](https://github.com/WordPress/gutenberg/pull/65539))
+
+#### Site Editor
+- Update icon in home button. ([65497](https://github.com/WordPress/gutenberg/pull/65497))
+
+### Performance
+
+#### Block Library
+- Script Modules: Centralize (re)registration. ([65460](https://github.com/WordPress/gutenberg/pull/65460))
+
+#### Block Editor
+- Remove editorMode from blockProps. ([65326](https://github.com/WordPress/gutenberg/pull/65326))
+- Move insertionPoint state to block-editor store/rename existing insertionPoint to insertionCue. ([65098](https://github.com/WordPress/gutenberg/pull/65098))
+
+
+### Documentation
+
+- Block Bindings: Add `@since` tag in bindings apis JSDocs. ([65796](https://github.com/WordPress/gutenberg/pull/65796))
+- Block Editor: Fix README for FontFamilyControl component. ([65660](https://github.com/WordPress/gutenberg/pull/65660))
+- Composite: Add "With Tooltip" storybook example. ([65817](https://github.com/WordPress/gutenberg/pull/65817))
+- DataViews documentation: Add high-level graph explaining DataViews and data sources interaction. ([65457](https://github.com/WordPress/gutenberg/pull/65457))
+- Docs/interactivity api router package readme. ([62062](https://github.com/WordPress/gutenberg/pull/62062))
+- Docs: Remove PHPDoc for non-existing parameter. ([65640](https://github.com/WordPress/gutenberg/pull/65640))
+- Navigator: Fix README heading hierarchy. ([65763](https://github.com/WordPress/gutenberg/pull/65763))
+- Packages documentation: Minor typo corrections. ([65664](https://github.com/WordPress/gutenberg/pull/65664))
+- Plugin: Fix small typo in readme.txt file. ([65634](https://github.com/WordPress/gutenberg/pull/65634))
+- RichText: Fix JSDoc block typos. ([65607](https://github.com/WordPress/gutenberg/pull/65607))
+- SelectControl: Add story for `prefix` slot. ([65730](https://github.com/WordPress/gutenberg/pull/65730))
+- Update JSDoc block for RichText package to-html-string. ([65688](https://github.com/WordPress/gutenberg/pull/65688))
+- Update block-filters.md. ([64959](https://github.com/WordPress/gutenberg/pull/64959))
+- iAPI: Refactor types and add a "Core Concepts - Using TypeScript" guide. ([64577](https://github.com/WordPress/gutenberg/pull/64577))
+
+### Code Quality
+
+#### Components
+- BorderBoxControl: Promote to stable. ([65586](https://github.com/WordPress/gutenberg/pull/65586))
+- BorderControl: Promote to stable. ([65475](https://github.com/WordPress/gutenberg/pull/65475))
+- BoxControl: Promote to stable. ([65469](https://github.com/WordPress/gutenberg/pull/65469))
+- Cleanup unused `ToggleGroupControl` configuration values. ([65456](https://github.com/WordPress/gutenberg/pull/65456))
+- Fix `useInstanceId` hook references. ([65733](https://github.com/WordPress/gutenberg/pull/65733))
+- Navigator: Internal refactor in preparation for stabilization. ([65671](https://github.com/WordPress/gutenberg/pull/65671))
+- Navigator: Mark experimental exports as deprecated. ([65802](https://github.com/WordPress/gutenberg/pull/65802))
+- SearchControl: Fix rest props mutation. ([65740](https://github.com/WordPress/gutenberg/pull/65740))
+- `ToggleGroupControl`: Clean up animation logic. ([65808](https://github.com/WordPress/gutenberg/pull/65808))
+
+#### Block Editor
+- Button: Add `__next40pxDefaultSize` in block-editor 6. ([65742](https://github.com/WordPress/gutenberg/pull/65742))
+- Decouple "zoom/scaling the canvas" from zoom out mode (without mode rename). ([65482](https://github.com/WordPress/gutenberg/pull/65482))
+- Don't memoize 'getContentLockingParent' and 'getParentSectionBlock' selectors. ([65649](https://github.com/WordPress/gutenberg/pull/65649))
+- Inserter: Update how we compute the actual insertion point for blocks. ([65490](https://github.com/WordPress/gutenberg/pull/65490))
+- LinkControl: Fix unneeded `props` prop. ([65650](https://github.com/WordPress/gutenberg/pull/65650))
+- Navigator: Use stable export instead of experimental export. ([65753](https://github.com/WordPress/gutenberg/pull/65753))
+- Button: Add `__next40pxDefaultSize` in dataviews, reusable-blocks, etc. ([65715](https://github.com/WordPress/gutenberg/pull/65715))
+- Fix: Button Replace remaining 40px default size violations [Block Directory]. ([65467](https://github.com/WordPress/gutenberg/pull/65467))
+- Fix: Button Replace remaining 40px default size violations [Block Editor 2]. ([65308](https://github.com/WordPress/gutenberg/pull/65308))
+- Fix: Button Replace remaining 40px default size violations [Block Editor 3]. ([65225](https://github.com/WordPress/gutenberg/pull/65225))
+- Fix: Button Replace remaining 40px default size violations [Block Editor 5]. ([65361](https://github.com/WordPress/gutenberg/pull/65361))
+- Fix: Button: Replace remaining 40px default size violation [Edit Site 1]. ([65226](https://github.com/WordPress/gutenberg/pull/65226))
+- Fix: Button: Replace remaining 40px default size violation [Edit Site 3]. ([65309](https://github.com/WordPress/gutenberg/pull/65309))
+
+#### Block bindings
+- Only pass `usesContext` properties to editor APIs. ([65661](https://github.com/WordPress/gutenberg/pull/65661))
+- Refactor passing select and dispatch instead of full Registry. ([65710](https://github.com/WordPress/gutenberg/pull/65710))
+- Unify logic in `getPostMetaFields` function. ([65462](https://github.com/WordPress/gutenberg/pull/65462))
+
+#### Post Editor
+- Customize widgets, edit post: Refactor Button to new sizes. ([65807](https://github.com/WordPress/gutenberg/pull/65807))
+- Header: Remove unused property `isZoomedOutView` in `useSelect()`. ([65628](https://github.com/WordPress/gutenberg/pull/65628))
+
+#### Block Library
+- Blocks: Don't memoize 'hasContentRoleAttribute' selector. ([65617](https://github.com/WordPress/gutenberg/pull/65617))
+- Blocks: Update '__experimentalHasContentRoleAttribute' deprecation. ([65616](https://github.com/WordPress/gutenberg/pull/65616))
+
+#### Global Styles
+- Global style revisions: Remove unnecessary `goTo` navigation call. ([65810](https://github.com/WordPress/gutenberg/pull/65810))
+
+#### Site Editor
+- Edit Site: Fix `useLink` prop mutation. ([65739](https://github.com/WordPress/gutenberg/pull/65739))
+
+#### Data Views
+- Migrate store/actions from editor package to fields package. ([65289](https://github.com/WordPress/gutenberg/pull/65289))
+
+
+### Tools
+
+#### Testing
+- Block Bindings: Refactor end-to-end tests. ([65526](https://github.com/WordPress/gutenberg/pull/65526))
+- GH Actions: Run the tests against PHP 8.3. ([65357](https://github.com/WordPress/gutenberg/pull/65357))
+- Revert "Temp disable test for Classic Block Media issue.". ([65809](https://github.com/WordPress/gutenberg/pull/65809))
+
+#### Build Tooling
+- Composer: Prevent a lock file from being created. ([65359](https://github.com/WordPress/gutenberg/pull/65359))
+- Composer: Update minimum required PHPUnit Polyfills. ([65355](https://github.com/WordPress/gutenberg/pull/65355))
+- PHP unit tests: Remove WP_RUN_CORE_TESTS const. ([65631](https://github.com/WordPress/gutenberg/pull/65631))
+- DEWP: Check for magic comments before minification. ([65582](https://github.com/WordPress/gutenberg/pull/65582))
+- DEWP: Handle cyclical module dependencies. ([65291](https://github.com/WordPress/gutenberg/pull/65291))
+- Label enforcer: Add `Gutenberg plugin` to the list of single required labels. ([65253](https://github.com/WordPress/gutenberg/pull/65253))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+- @auareyou:  Light branding for the reference site. ([65764](https://github.com/WordPress/gutenberg/pull/65764))
+- @crisbusquets: Adds envelope icon. ([65638](https://github.com/WordPress/gutenberg/pull/65638))
+- @davy440: Update block-filters.md. ([64959](https://github.com/WordPress/gutenberg/pull/64959))
+- @dhruvang21: Fix: Button Replace remaining 40px default size violations [Block Editor 2]. ([65308](https://github.com/WordPress/gutenberg/pull/65308))
+- @PARTHVATALIYA: Fix: Button Replace remaining 40px default size violations [Block Editor 5]. ([65361](https://github.com/WordPress/gutenberg/pull/65361))
+- @spadeshoe: Updates LayoutTypeSwitcher to use ToggleGroupControl. ([65498](https://github.com/WordPress/gutenberg/pull/65498))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @amitraj2203 @anomiex @auareyou @carolinan @cbravobernal @ciampo @crisbusquets @DaniGuardiola @davy440 @dhruvang21 @djcowan @draganescu @ellatrix @getdave @gigitux @hbhalodia @jameskoster @jasmussen @jeryj @jffng @jrfnl @jsnajdr @juanmaguitar @keoshi @kevin940726 @louwie17 @luisherranz @Mamaduka @manzoorwanijk @matiasbenedetto @michalczaplinski @mirka @mtias @noisysocks @oandregal @ockham @PARTHVATALIYA @peterwilsoncc @philwp @priethor @ramonjd @SantosGuillamot @shail-mehta @sirreal @Soean @spadeshoe @stokesman @swissspidy @t-hamano @talldan @tyxla @vcanales @vipul0425 @youknowriad
+
+
+= 19.3.0 =
+
+## Changelog
+
+### Features
+
+#### Zoom Out
+- Remove experimental flag. ([65404](https://github.com/WordPress/gutenberg/pull/65404))
+
+### Enhancements
+
+- Create Block: Update the minimum required PHP version to 7.2. ([65166](https://github.com/WordPress/gutenberg/pull/65166))
+- DataViews: remove unused `.dataviews-view-table__cell-content-wrapper:Empty` style rule. ([65084](https://github.com/WordPress/gutenberg/pull/65084))
+- Media Utils: Add TypeScript support and export more utils. ([64784](https://github.com/WordPress/gutenberg/pull/64784))
+- Media placeholders: Add "drag" to the text. ([65149](https://github.com/WordPress/gutenberg/pull/65149))
+- Restore: Move to trash button in Document settings. ([65087](https://github.com/WordPress/gutenberg/pull/65087))
+- Inspector Controls: Use custom block name in inspector controls when available. ([65398](https://github.com/WordPress/gutenberg/pull/65398))
+- Icons: Adds bell and bell-unread icons. ([65324](https://github.com/WordPress/gutenberg/pull/65324))
+- Editor topbar: Reorder the actions on the right. ([65163](https://github.com/WordPress/gutenberg/pull/65163))
+- Patterns: Add opt out preference to the 'Choose a Pattern' modal when adding a page. ([65026](https://github.com/WordPress/gutenberg/pull/65026))
+- Locked Templates: Blocks with contentOnly locking should not be transformable. ([64917](https://github.com/WordPress/gutenberg/pull/64917))
+- Block Locking: Add border to Replace item in content only image toolbar. ([64849](https://github.com/WordPress/gutenberg/pull/64849))
+- DataViews: Improve UX of bundled views for Pages. ([65295](https://github.com/WordPress/gutenberg/pull/65295))
+
+#### Components
+- Styling: Apply elevation scale in components package. ([65159](https://github.com/WordPress/gutenberg/pull/65159))
+- Tabs: Improve Tabs indicator animation and related utils. ([64926](https://github.com/WordPress/gutenberg/pull/64926))
+- Modal
+  - Add exit animation. ([65203](https://github.com/WordPress/gutenberg/pull/65203))
+  - Decrease close button size. ([65131](https://github.com/WordPress/gutenberg/pull/65131))
+- Navigator Screen: Warn if path doesn't follow a URL-like scheme. ([65231](https://github.com/WordPress/gutenberg/pull/65231))
+- Card: Update Card radius. ([65053](https://github.com/WordPress/gutenberg/pull/65053))
+- Combobox Control: Add placeholder attribute. ([65254](https://github.com/WordPress/gutenberg/pull/65254))
+
+#### Block Library
+- Allow dropping multiple images to the image block. ([65030](https://github.com/WordPress/gutenberg/pull/65030))
+- Categories List block: Add dropdown for taxonomies. ([65272](https://github.com/WordPress/gutenberg/pull/65272))
+- Image: Adds the block controls for uploading image. ([64320](https://github.com/WordPress/gutenberg/pull/64320))
+- Remove colons from control labels. ([65205](https://github.com/WordPress/gutenberg/pull/65205))
+- Terms List block: Add Categories-specific variation. ([65434](https://github.com/WordPress/gutenberg/pull/65434))
+
+#### Zoom Out
+- Add Zoom Out toggle to editor header when experiment enabled. ([65183](https://github.com/WordPress/gutenberg/pull/65183))
+- Add prompt for drag and drop in Patterns tab in Zoom Out mode. ([65115](https://github.com/WordPress/gutenberg/pull/65115))
+- Close inserter on exiting Zoom Out to edit. ([65194](https://github.com/WordPress/gutenberg/pull/65194))
+- Show top level sections in List View. ([65202](https://github.com/WordPress/gutenberg/pull/65202))
+- Try vertical displacement when dragging a pattern between existing patterns/sections. ([63896](https://github.com/WordPress/gutenberg/pull/63896))
+
+#### Block Editor
+- Link Editing: Automatically add tel to phone number when linking URL. ([64865](https://github.com/WordPress/gutenberg/pull/64865))
+- Drag and Drop: When dragging a mix of video, audio, and image blocks, create individual blocks as appropriate. ([65144](https://github.com/WordPress/gutenberg/pull/65144))
+- URLInput: Replace input with InputControl. ([65158](https://github.com/WordPress/gutenberg/pull/65158))
+- Normalize block inspector controls spacing. ([64526](https://github.com/WordPress/gutenberg/pull/64526))
+
+#### Post Editor
+- Add new Media section to preferences modal. ([64846](https://github.com/WordPress/gutenberg/pull/64846))
+- DocumentBar: Replace icon with post type label. ([65170](https://github.com/WordPress/gutenberg/pull/65170))
+- Page editor: Double-click to edit template part. ([65024](https://github.com/WordPress/gutenberg/pull/65024))
+- Post publish upload media dialog: Handle more block types. ([65122](https://github.com/WordPress/gutenberg/pull/65122))
+
+#### Block bindings
+- Populate block context with inherited post type from template slug. ([65062](https://github.com/WordPress/gutenberg/pull/65062))
+- Try gap 0 on attribute items. ([65277](https://github.com/WordPress/gutenberg/pull/65277))
+- Use post meta label from `register_meta` in block bindings workflows. ([65099](https://github.com/WordPress/gutenberg/pull/65099))
+
+#### Global Styles
+- Refactor site background controls and move site global styles into Background group. ([65304](https://github.com/WordPress/gutenberg/pull/65304))
+- Spacing control: Replace sides dropdwon with link button. ([65193](https://github.com/WordPress/gutenberg/pull/65193))
+
+#### Interactivity API
+- Refactor context proxies. ([64713](https://github.com/WordPress/gutenberg/pull/64713))
+- Update: Rephrase "Force page reload" and move to Advanced. ([65081](https://github.com/WordPress/gutenberg/pull/65081))
+
+#### REST API
+- Global Styles: Allow read access to users with `edit_posts` capabilities. ([65071](https://github.com/WordPress/gutenberg/pull/65071))
+- Query loop / Post template: Enable post format filter. ([64167](https://github.com/WordPress/gutenberg/pull/64167))
+
+### New APIs
+- Add @wordpress/fields package.
+  - Introduce the package. ([65230](https://github.com/WordPress/gutenberg/pull/65230))
+  - Make the package private. ([65269](https://github.com/WordPress/gutenberg/pull/65269))
+- Interactivity API: Add `getServerState()` and `getServerContext()`. ([65151](https://github.com/WordPress/gutenberg/pull/65151))
+
+### Bug Fixes
+
+- Align popover alt variant styling with block toolbar. ([65263](https://github.com/WordPress/gutenberg/pull/65263))
+- Compose: Correctly call timer cleanup in 'useFocusOnMount'. ([65184](https://github.com/WordPress/gutenberg/pull/65184))
+- Fix some docblock types related to the Template Registration API. ([65187](https://github.com/WordPress/gutenberg/pull/65187))
+- Fix the issue where block spacing control not shown. ([65371](https://github.com/WordPress/gutenberg/pull/65371))
+- Fix unintentional block toolbar shadow. ([65182](https://github.com/WordPress/gutenberg/pull/65182))
+- Fix: Moving a page to the trash on the site editor does not goes back to the pages list. ([65119](https://github.com/WordPress/gutenberg/pull/65119))
+- Fix: Moving the last page item to the the trash causes a crash. ([65236](https://github.com/WordPress/gutenberg/pull/65236))
+- Preferences: Fix back button on mobile. ([65141](https://github.com/WordPress/gutenberg/pull/65141))
+- Post Summary Panel: Restore `height:Auto` for toggle buttons. ([65362](https://github.com/WordPress/gutenberg/pull/65362))
+- Fix Tabs styling in Font Library modal. ([65330](https://github.com/WordPress/gutenberg/pull/65330))
+- E2E: Change deprecated social icons for standard in end-to-end. ([65312](https://github.com/WordPress/gutenberg/pull/65312))
+- Typography: Make title blocks apply typographic styles consistently. ([65307](https://github.com/WordPress/gutenberg/pull/65307))
+- Target Hints REST API: Add missing param sanitization. ([65280](https://github.com/WordPress/gutenberg/pull/65280))
+- Interactivity API: Update iterable signals when `deepMerge()` adds new properties. ([65135](https://github.com/WordPress/gutenberg/pull/65135))
+- Navigation Menus: Typography styling support to the navigation submenu block. ([65060](https://github.com/WordPress/gutenberg/pull/65060))
+- Grid: In RTL languages, the resize handles point in the opposite direction. ([64995](https://github.com/WordPress/gutenberg/pull/64995))
+- Block Locking: Fix Content Only Toolbar icon focus style. ([64940](https://github.com/WordPress/gutenberg/pull/64940))
+- Image: Fix resizing to max width in classic themes. ([64819](https://github.com/WordPress/gutenberg/pull/64819))
+- Meta Boxes: Try split content view. ([64351](https://github.com/WordPress/gutenberg/pull/64351))
+- Distraction Free: Fix blurry edge along editor header. ([64277](https://github.com/WordPress/gutenberg/pull/64277))
+
+#### Block Library
+- Comments Pagination: Fix warning returned by comments pagination blocks. ([65435](https://github.com/WordPress/gutenberg/pull/65435))
+- Cover: Explicitly set isUserOverlayColor to false when media is updated. ([65105](https://github.com/WordPress/gutenberg/pull/65105))
+- Disallow setting grid block rows/columns to zero. ([65217](https://github.com/WordPress/gutenberg/pull/65217))
+- Fix image block crash. ([65222](https://github.com/WordPress/gutenberg/pull/65222))
+- Fix: Buttons block: Block spacing value does not apply to both vertical and horizontal alignment. ([64971](https://github.com/WordPress/gutenberg/pull/64971))
+- Fix: Embed blocks: Figcaption inserted via toolbar not nested within figure element - #64960. ([64970](https://github.com/WordPress/gutenberg/pull/64970))
+- Image cropping: Skip making an API request if there are no changes to apply. ([65384](https://github.com/WordPress/gutenberg/pull/65384))
+- Comments Pagination: Pass the comments query `paged` arg to functions  `get_next_comments_link` and `get_previous_comments_link`. ([63698](https://github.com/WordPress/gutenberg/pull/63698))
+- Query Loop
+  - Default to querying posts when on singular content. ([65067](https://github.com/WordPress/gutenberg/pull/65067))
+  - Remove is_singular() check and fix test. ([65483](https://github.com/WordPress/gutenberg/pull/65483))
+  - Format controls: Fix JavaScript error. ([65551](https://github.com/WordPress/gutenberg/pull/65551))
+
+#### Block Editor
+- Inserter: Fix loading indicator for reusable blocks. ([64839](https://github.com/WordPress/gutenberg/pull/64839))
+- Normalize spacing in Layout hook controls. ([65132](https://github.com/WordPress/gutenberg/pull/65132))
+- Pattern Inserter: Fix pattern list overflow. ([65192](https://github.com/WordPress/gutenberg/pull/65192))
+- Remove reset styles RTL from the iframe. ([65150](https://github.com/WordPress/gutenberg/pull/65150))
+- Revert "Block Insertion: Clear the insertion point when selecting a different block or clearing block selection (https://github.com/WordPress/gutenberg/pull/64048)" ([65208](https://github.com/WordPress/gutenberg/pull/65208))
+
+#### Components
+- BoxControl: Unify input filed width whether linked or not. ([65348](https://github.com/WordPress/gutenberg/pull/65348))
+- ComboboxControl: Add more unit tests. ([65255](https://github.com/WordPress/gutenberg/pull/65255))
+- Fix: Button Replace remaining 40px default size violations [Edit widgets]. ([65367](https://github.com/WordPress/gutenberg/pull/65367))
+- Tabs: Fix vertical indicator. ([65385](https://github.com/WordPress/gutenberg/pull/65385))
+
+#### Block bindings
+- Fix empty strings placeholders in post meta bindings. ([65089](https://github.com/WordPress/gutenberg/pull/65089))
+- Remove key fallback in bindings get values and rely on source label. ([65517](https://github.com/WordPress/gutenberg/pull/65517))
+- Fix passing bindings context to `canUserEditValue`. ([65599](https://github.com/WordPress/gutenberg/pull/65599))
+- Prioritize existing placeholder over bindingsPlaceholder. ([65220](https://github.com/WordPress/gutenberg/pull/65220))
+- Only use `canUserEditValue` when `setValues` is defined. ([65565](https://github.com/WordPress/gutenberg/pull/65566))
+
+#### Zoom Out
+- Force device type to Desktop whenever zoom out is invoked. ([64476](https://github.com/WordPress/gutenberg/pull/64476))
+- Hide toolbar icon on smaller viewports. ([65437](https://github.com/WordPress/gutenberg/pull/65437))
+- Remove zoom out toggle when editor is not iframed. ([65452](https://github.com/WordPress/gutenberg/pull/65452))
+
+### Accessibility
+
+- A11y: Add script-module. ([65101](https://github.com/WordPress/gutenberg/pull/65101))
+- Interactivity API: Use a11y Script Module in Gutenberg. ([65123](https://github.com/WordPress/gutenberg/pull/65123))
+- Script Modules API: Print script module live regions HTML in page HTML. ([65380](https://github.com/WordPress/gutenberg/pull/65380))
+- DatePicker: Better hover/focus styles. ([65117](https://github.com/WordPress/gutenberg/pull/65117))
+- Form Input: Don't use `flex-direction: Row-reverse` for checkbox field. ([64232](https://github.com/WordPress/gutenberg/pull/64232))
+- Navigation Menus: Remove Warning and add notice for Navigation. ([63921](https://github.com/WordPress/gutenberg/pull/63921))
+- Global Styles: Fix the shadows Range control accessibility and usability. ([63908](https://github.com/WordPress/gutenberg/pull/63908))
+- Block Editor: Fix accessibility of the hooked blocks toggles. ([63133](https://github.com/WordPress/gutenberg/pull/63133))
+
+
+#### Post Editor
+- Support keyboard resizing of meta boxes pane. ([65325](https://github.com/WordPress/gutenberg/pull/65325))
+- Swap position of the Pre-publish checks buttons. ([65317](https://github.com/WordPress/gutenberg/pull/65317))
+
+
+### Performance
+
+- Core Data: Batch remaining actions in resolvers. ([65176](https://github.com/WordPress/gutenberg/pull/65176))
+- Block Editor: Use static access for selector in 'useZoomOutModeExit'. ([65337](https://github.com/WordPress/gutenberg/pull/65337))
+- Editor: Optimize global styles permission check. ([65177](https://github.com/WordPress/gutenberg/pull/65177))
+
+
+### Experiments
+
+- Block bindings REST API: Bring bindings UI in Site Editor. ([64072](https://github.com/WordPress/gutenberg/pull/64072))
+
+
+### Documentation
+
+- Add JSDoc block for getSectionRootClientId in block editor package. ([65219](https://github.com/WordPress/gutenberg/pull/65219))
+- ButtonGroup: Fix story to show what the component does. ([65336](https://github.com/WordPress/gutenberg/pull/65336))
+- DataViews storybook
+  - Better styles for combined fields story. ([65078](https://github.com/WordPress/gutenberg/pull/65078))
+  - Enable all layouts for combined fields storybook. ([65082](https://github.com/WordPress/gutenberg/pull/65082))
+- Docs: Fix minor typos in Build your first block tutorial. ([64961](https://github.com/WordPress/gutenberg/pull/64961))
+- Docs: Update the content of the API version 3 section in the Block API Reference. ([65375](https://github.com/WordPress/gutenberg/pull/65375))
+- Fix typo in Slot Fills documentation. ([65275](https://github.com/WordPress/gutenberg/pull/65275))
+
+
+### Code Quality
+
+- Components: Transition to the new 40px default size.
+  - Button:
+    - Add __next40pxDefaultSize for files in editor 3. ([65139](https://github.com/WordPress/gutenberg/pull/65139))
+    - Add __next40pxDefaultSize for files in editor 4. ([65140](https://github.com/WordPress/gutenberg/pull/65140))
+    - Add props for buttons in editor 1. ([65068](https://github.com/WordPress/gutenberg/pull/65068))
+    - Add props for buttons in editor 2. ([65083](https://github.com/WordPress/gutenberg/pull/65083))
+    - Fix: Replace remaining 40px default size violations [Block Editor 4]. ([65257](https://github.com/WordPress/gutenberg/pull/65257))
+    - Fix: Replace remaining 40px default size violation [Block library 3]. ([65110](https://github.com/WordPress/gutenberg/pull/65110))
+    - Fix: Replace remaining 40px default size violation [Block library 4]. ([65143](https://github.com/WordPress/gutenberg/pull/65143))
+    - Fix: Replace remaining 40px default size violation [Block library]. ([65075](https://github.com/WordPress/gutenberg/pull/65075))
+    - Fix: Replace remaining 40px default size violation [Edit Site 2]. ([65258](https://github.com/WordPress/gutenberg/pull/65258))
+    - Fix: Replace remaining 40px default size violations [Block library 1]. ([65033](https://github.com/WordPress/gutenberg/pull/65033))
+    - Fix: Replace remaining 40px default size violations [Block Editor 1]. ([65034](https://github.com/WordPress/gutenberg/pull/65034))
+  - BoxControl
+    - Add lint rule for 40px size prop usage. ([65341](https://github.com/WordPress/gutenberg/pull/65341))
+   - DimensionsPanel: Apply 40px default size to UI when no spacing preset is available. ([65300](https://github.com/WordPress/gutenberg/pull/65300))
+- Add `useEvent` and revamped `useResizeObserver` to `@wordpress/compose`. ([64943](https://github.com/WordPress/gutenberg/pull/64943))
+- DataViews: Use Dropdown for views configuration dialog. ([65314](https://github.com/WordPress/gutenberg/pull/65314))
+- Platform docs: Upgrade dependencies. ([65445](https://github.com/WordPress/gutenberg/pull/65445))
+- Rename edit-post__fade-in-animation and unify keyframe definitions. ([65377](https://github.com/WordPress/gutenberg/pull/65377))
+- Update minimum required version in PHP. ([65301](https://github.com/WordPress/gutenberg/pull/65301))
+- Editor: Use hooks instead of HoC in `BlockManager`. ([65349](https://github.com/WordPress/gutenberg/pull/65349))
+- Data Views Fields: Migrate store and actions from editor package to fields package. ([65261](https://github.com/WordPress/gutenberg/pull/65261))
+- Plugin: Remove 'function_exists' checks for methods with 'gutenberg' prefix. ([65260](https://github.com/WordPress/gutenberg/pull/65260))
+- Global Styles: Update REST controller override method and backport changes from Core. ([65259](https://github.com/WordPress/gutenberg/pull/65259))
+- Patterns: Remove unused method returned from 'mapSelect'. ([65073](https://github.com/WordPress/gutenberg/pull/65073))
+- Embed: Convert EmbedPreview component to functional component. ([51325](https://github.com/WordPress/gutenberg/pull/51325))
+
+#### Components
+- BoxControl: Fix critical error when null value is passed. ([65287](https://github.com/WordPress/gutenberg/pull/65287))
+- Composite:
+  - Deprecate legacy, unstable version. ([63572](https://github.com/WordPress/gutenberg/pull/63572))
+  - Remove store prop and useCompositeStore hook. ([64723](https://github.com/WordPress/gutenberg/pull/64723))
+  - Stabilize APIs. ([63569](https://github.com/WordPress/gutenberg/pull/63569))
+- `@wordpress/components`: Add local copy of `use-lilius`. ([65097](https://github.com/WordPress/gutenberg/pull/65097))
+
+#### Block bindings
+- Always prioritize using context in post meta source logic. ([65449](https://github.com/WordPress/gutenberg/pull/65449))
+- Improve getRegisteredPostMeta resolver. ([65450](https://github.com/WordPress/gutenberg/pull/65450))
+- Remove extra filtering of empty sources. ([65447](https://github.com/WordPress/gutenberg/pull/65447))
+
+#### Block Editor
+- Remove the 'PrivateInserter' component. ([65111](https://github.com/WordPress/gutenberg/pull/65111))
+- Use the tooltip from a button in 'ButtonBlockAppender'. ([65113](https://github.com/WordPress/gutenberg/pull/65113))
+- Remove unused css selectors. ([65276](https://github.com/WordPress/gutenberg/pull/65276))
+
+### Tools
+
+- Scripts: Update stylelint dependency and the default configuration. ([64828](https://github.com/WordPress/gutenberg/pull/64828))
+- Styleling config: Fix stylelint configuration missing files for npm. ([65313](https://github.com/WordPress/gutenberg/pull/65313))
+
+#### Build Tooling
+- Build Plugin: Simplify and improve zip contents. ([65232](https://github.com/WordPress/gutenberg/pull/65232))
+- Build zip artifact on release and wp production branches. ([65471](https://github.com/WordPress/gutenberg/pull/65471))
+- Build: Include Core blocks' `render` and `variations` files. ([63311](https://github.com/WordPress/gutenberg/pull/63311))
+- Script Modules
+  - Prepare build for more script modules. ([65064](https://github.com/WordPress/gutenberg/pull/65064))
+  - Remove babel from script-modules build. ([65279](https://github.com/WordPress/gutenberg/pull/65279))
+  - Remove es-module shims and importmap-polyfill. ([65210](https://github.com/WordPress/gutenberg/pull/65210))
+- Correctly generate PHP files for server-side rendering of blocks on Windows OS. ([65248](https://github.com/WordPress/gutenberg/pull/65248))
+- Packages: Only add polyfills where needed. ([65292](https://github.com/WordPress/gutenberg/pull/65292))
+- Switch from UglifyJS to Terser to build the polyfill script. ([65278](https://github.com/WordPress/gutenberg/pull/65278))
+
+#### Testing
+- Unit tests: Mock matchMedia to enforce prefers-reduce-motion. ([65438](https://github.com/WordPress/gutenberg/pull/65438))
+- Upgrade Playwright to v1.47. ([65156](https://github.com/WordPress/gutenberg/pull/65156))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+- @AKSHAT2802: Add __next40pxDefaultSize for files in editor 4. ([65140](https://github.com/WordPress/gutenberg/pull/65140))
+- @devansh016: Automatically add tel to phone number when linking URL. ([64865](https://github.com/WordPress/gutenberg/pull/64865))
+- @dhruvang21: Fix: Button Replace remaining 40px default size violations [Edit widgets]. ([65367](https://github.com/WordPress/gutenberg/pull/65367))
+- @farid-hadi: Docs: Fix minor typos in Build your first block tutorial. ([64961](https://github.com/WordPress/gutenberg/pull/64961))
+- @greenworld: Fix typo in Slot Fills documentation. ([65275](https://github.com/WordPress/gutenberg/pull/65275))
+- @louwie17: Convert EmbedPreview component to functional component. ([51325](https://github.com/WordPress/gutenberg/pull/51325))
+- @rahulharpal1603: URLInput: Replace input with InputControl. ([65158](https://github.com/WordPress/gutenberg/pull/65158))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @AKSHAT2802 @Aljullu @andrewserong @carolinan @cbravobernal @ciampo @colorful-tones @creativecoder @DaniGuardiola @DAreRodz @devansh016 @dhruvang21 @ellatrix @farid-hadi @getdave @gigitux @greenworld @gziolo @hbhalodia @jameskoster @jasmussen @javierarce @jeryj @jorgefilipecosta @jsnajdr @kevin940726 @louwie17 @madhusudhand @MaggieCabrera @Mamaduka @mikeybinns @mirka @ntsekouras @oandregal @ockham @peterwilsoncc @rahulharpal1603 @ramonjd @richtabor @rohitmathur-7 @SantosGuillamot @scruffian @sgomes @sirreal @stokesman @swissspidy @t-hamano @talldan @vipul0425 @zaguiini
+
+
+= 19.2.0 =
+
+## Changelog
+
+### Enhancements
+
+- Add: Reorder control at the field level on the new view configuration UI. ([64381](https://github.com/WordPress/gutenberg/pull/64381))
+- Core Data Types: `recordId` can be a number. ([64796](https://github.com/WordPress/gutenberg/pull/64796))
+- Core Data: Derive collection totals for unbound queries. ([64772](https://github.com/WordPress/gutenberg/pull/64772))
+- Create Block: Set minimum supported WordPress version to 6.6. ([64920](https://github.com/WordPress/gutenberg/pull/64920))
+- Dataviews Filter search widget: Do not use Composite store. ([64985](https://github.com/WordPress/gutenberg/pull/64985))
+- Dataviews list view: Do not use Composite store. ([64987](https://github.com/WordPress/gutenberg/pull/64987))
+- Move bulk actions menu to the Footer, consolidate with floating toolbar and total items display. ([64268](https://github.com/WordPress/gutenberg/pull/64268))
+- Try: Update block warnings. ([64997](https://github.com/WordPress/gutenberg/pull/64997))
+
+#### Components
+- Add variants to InputControl prefix/suffix wrappers. ([64824](https://github.com/WordPress/gutenberg/pull/64824))
+- AlignmentMatrixControl: Do not use Composite store. ([64850](https://github.com/WordPress/gutenberg/pull/64850))
+- CircularOptionPicker: Stop using composite store. ([64833](https://github.com/WordPress/gutenberg/pull/64833))
+- Composite: Accept store props on top level component. ([64832](https://github.com/WordPress/gutenberg/pull/64832))
+- DataViews: Adds two new stories for edge cases. ([64975](https://github.com/WordPress/gutenberg/pull/64975))
+- Decrease standard padding to 12px. ([64708](https://github.com/WordPress/gutenberg/pull/64708))
+- DropdownMenuV2: Add GroupLabel subcomponent. ([64854](https://github.com/WordPress/gutenberg/pull/64854))
+- DropdownMenuV2: Update animation. ([64868](https://github.com/WordPress/gutenberg/pull/64868))
+- DropdownMenuV2: Use overloaded naming conventions. ([64654](https://github.com/WordPress/gutenberg/pull/64654))
+- InputControl: Tighten gap between input and prefix/suffix. ([64908](https://github.com/WordPress/gutenberg/pull/64908))
+- Navigator: Polish Storybook examples. ([64798](https://github.com/WordPress/gutenberg/pull/64798))
+- Navigator: Remove location history, simplify internal logic. ([64675](https://github.com/WordPress/gutenberg/pull/64675))
+- UnitControl: Update unit select styles. ([64712](https://github.com/WordPress/gutenberg/pull/64712))
+- Update hard-coded border-radius instances. ([64693](https://github.com/WordPress/gutenberg/pull/64693))
+- Update modal animation. ([64580](https://github.com/WordPress/gutenberg/pull/64580))
+
+#### Block bindings
+- Add warning in attributes connected to invalid sources. ([65002](https://github.com/WordPress/gutenberg/pull/65002))
+- Allow only admin users to create and modify bindings by default. ([64570](https://github.com/WordPress/gutenberg/pull/64570))
+- Lock editing in fields in editor if meta fields panel is opened. ([64738](https://github.com/WordPress/gutenberg/pull/64738))
+- Rely on `Text` component instead of `Truncate` in bindings panel. ([65007](https://github.com/WordPress/gutenberg/pull/65007))
+- Remove `getPlaceholder` API and rely on `key` argument or source label. ([64910](https://github.com/WordPress/gutenberg/pull/64910))
+
+#### Data Views
+- Add: Reorder control at the field level on the new view configuration UI. ([64381](https://github.com/WordPress/gutenberg/pull/64381))
+- Dataviews Filter search widget: Do not use Composite store. ([64985](https://github.com/WordPress/gutenberg/pull/64985))
+- Dataviews list view: Do not use Composite store. ([64987](https://github.com/WordPress/gutenberg/pull/64987))
+- Move bulk actions menu to the Footer, consolidate with floating toolbar and total items display. ([64268](https://github.com/WordPress/gutenberg/pull/64268))
+
+#### Block Editor
+- Add 'Reset' option to MediaReplaceFlow component. ([64826](https://github.com/WordPress/gutenberg/pull/64826))
+- Block Patterns List: Do not use Composite store. ([64983](https://github.com/WordPress/gutenberg/pull/64983))
+- Remove the Shuffle block toolbar button. ([64954](https://github.com/WordPress/gutenberg/pull/64954))
+- Show block icon in contentOnly toolbar. ([64694](https://github.com/WordPress/gutenberg/pull/64694))
+
+#### Block Library
+- Cover Block: Move Clear Media button from Inspector Controls to Block Controls. ([64630](https://github.com/WordPress/gutenberg/pull/64630))
+- Improve Social Icons setup and appending. ([64877](https://github.com/WordPress/gutenberg/pull/64877))
+- Pagination Block: Fix inconsistent margins between editor and frontend. ([64874](https://github.com/WordPress/gutenberg/pull/64874))
+- Tag Cloud: Improve state of block with no tags. ([63774](https://github.com/WordPress/gutenberg/pull/63774))
+
+#### Block Locking
+- ContentOnly: Add support for block styles on top-level contentOnly locked blocks. ([64872](https://github.com/WordPress/gutenberg/pull/64872))
+- Only show title in content only toolbar if has title value. ([64840](https://github.com/WordPress/gutenberg/pull/64840))
+- Remove ability to crop image if content only mode. ([64838](https://github.com/WordPress/gutenberg/pull/64838))
+- Rename Alt to Alternative Text in content only image toolbar. ([64841](https://github.com/WordPress/gutenberg/pull/64841))
+
+#### Interactivity API
+- Categories Block: Add iAPI directive for client-side routing. ([64907](https://github.com/WordPress/gutenberg/pull/64907))
+- Improve internal `deepMerge` function. ([64879](https://github.com/WordPress/gutenberg/pull/64879))
+
+#### Global Styles
+- Hide typeset button when there are no typesets available. ([64515](https://github.com/WordPress/gutenberg/pull/64515))
+- Use four color palette colors instead of five for useStylesPreviewColors. ([64700](https://github.com/WordPress/gutenberg/pull/64700))
+
+#### Zoom Out
+- Add "Edit" button to Zoom Out mode toolbar. ([64571](https://github.com/WordPress/gutenberg/pull/64571))
+- Double click block to exit zoom out mode. ([64573](https://github.com/WordPress/gutenberg/pull/64573))
+
+#### Design Tools
+- Comment Edit Link: Add Border Block Support. ([64239](https://github.com/WordPress/gutenberg/pull/64239))
+- Comment Reply Link: Add border support. ([64271](https://github.com/WordPress/gutenberg/pull/64271))
+
+#### Icons
+- Add thumbs up and down icons. ([65004](https://github.com/WordPress/gutenberg/pull/65004))
+
+#### Site Editor
+- Apply radius scale in the editor. ([64930](https://github.com/WordPress/gutenberg/pull/64930))
+
+#### Post Editor
+- Post publish upload media dialog: Handle upload errors. ([64823](https://github.com/WordPress/gutenberg/pull/64823))
+
+#### Typography
+- Fluid typography: Allow individual preset overrides. ([64790](https://github.com/WordPress/gutenberg/pull/64790))
+
+#### Media
+- Add experiment for client-side media processing. ([64650](https://github.com/WordPress/gutenberg/pull/64650))
+
+#### REST API
+- Core Data: Resolve entity collection user permissions. ([64504](https://github.com/WordPress/gutenberg/pull/64504))
+
+#### Block Transforms
+- Details block: Add transform from any block type. ([63422](https://github.com/WordPress/gutenberg/pull/63422))
+
+
+### New APIs
+
+#### Extensibility
+- Editor: Add extensibility to PreviewOptions v2. ([64644](https://github.com/WordPress/gutenberg/pull/64644))
+
+
+### Bug Fixes
+
+- Add safeguard to `mediaUploadMiddleware`. ([64843](https://github.com/WordPress/gutenberg/pull/64843))
+- Allow multi-select on iOS Safari/touch devices. ([63671](https://github.com/WordPress/gutenberg/pull/63671))
+- Core Data: Fix the 'query._fields' property check inside 'getEntityRecord' resolver. ([65079](https://github.com/WordPress/gutenberg/pull/65079))
+- Fix Modify content-locked menu item not showing if the block is not selected. ([61605](https://github.com/WordPress/gutenberg/pull/61605))
+- Fix editor error in Safari due to availability of checkVisibility method. ([65069](https://github.com/WordPress/gutenberg/pull/65069))
+- Fix: Pagination arrows are pointing in the wrong direction in RTL languages. ([64962](https://github.com/WordPress/gutenberg/pull/64962))
+- Footnotes: Only replace attribute if footnotes were detected. ([63935](https://github.com/WordPress/gutenberg/pull/63935))
+- Paste: Fix image paste from Google Forms. ([64502](https://github.com/WordPress/gutenberg/pull/64502))
+- Revert Focus pattern inserter search when activating zoom out inserter. ([64748](https://github.com/WordPress/gutenberg/pull/64748))
+- Try: Update block warnings. ([64997](https://github.com/WordPress/gutenberg/pull/64997))
+
+#### Block Library
+- De-duplicate block toolbar icons for patterns. ([65054](https://github.com/WordPress/gutenberg/pull/65054))
+- Fix: Page list: Pages without a title has no link text. ([64297](https://github.com/WordPress/gutenberg/pull/64297))
+- Position BlockToolbar below all of the selected block's descendants. ([62711](https://github.com/WordPress/gutenberg/pull/62711))
+- Site Logo Block: Fix non-admin users seeing zero character. ([65010](https://github.com/WordPress/gutenberg/pull/65010))
+- Site Logo: Fix loader alignment issue. ([64919](https://github.com/WordPress/gutenberg/pull/64919))
+- Template Part: Hide Advanced panel for non-admin users. ([64721](https://github.com/WordPress/gutenberg/pull/64721))
+- Video Block: Fix layout issue. ([64834](https://github.com/WordPress/gutenberg/pull/64834))
+
+#### Components
+- ColorPalette utils: Do not normalize undefined color values. ([64969](https://github.com/WordPress/gutenberg/pull/64969))
+- DatePicker: Restore round radius for event dot. ([65031](https://github.com/WordPress/gutenberg/pull/65031))
+- DropdownMenuV2: Fix active and focus-visible item glitches. ([64942](https://github.com/WordPress/gutenberg/pull/64942))
+- DropdownMenuV2: Remove flashing styles when moving focus with keyboard. ([64873](https://github.com/WordPress/gutenberg/pull/64873))
+- Fixes "delete" action in DataViews' storybook. ([64901](https://github.com/WordPress/gutenberg/pull/64901))
+- Navigator: Fix isInitial, refine focusSelector logic. ([64786](https://github.com/WordPress/gutenberg/pull/64786))
+- Range control: Restore bottom margin rule. ([65035](https://github.com/WordPress/gutenberg/pull/65035))
+
+#### Post Editor
+- Add back editor-post-locked-modal to post lock component. ([64257](https://github.com/WordPress/gutenberg/pull/64257))
+- Add context to `View` string in post actions. ([65046](https://github.com/WordPress/gutenberg/pull/65046))
+- Apply space below content using a pseudo-element instead of padding-bottom. ([64639](https://github.com/WordPress/gutenberg/pull/64639))
+- Post Title: Fix pasting in Safari. ([64671](https://github.com/WordPress/gutenberg/pull/64671))
+- Post Title: Move selection at the end after pasting over the text. ([64665](https://github.com/WordPress/gutenberg/pull/64665))
+- Post publish upload media dialog: Fix silent failure. ([64741](https://github.com/WordPress/gutenberg/pull/64741))
+
+#### Data Views
+- DataViews: Fix field reordering and visibility logic. ([64999](https://github.com/WordPress/gutenberg/pull/64999))
+- Fix actions scrim in list layout. ([64696](https://github.com/WordPress/gutenberg/pull/64696))
+- Fix data views style inheritance. ([64933](https://github.com/WordPress/gutenberg/pull/64933))
+- Fix: Impossible to see pagination on viewports between small and medium. ([64844](https://github.com/WordPress/gutenberg/pull/64844))
+- List layout: Update broken styles. ([64837](https://github.com/WordPress/gutenberg/pull/64837))
+
+#### Block Editor
+- Add conditions when the Shuffle button can be displayed. ([64888](https://github.com/WordPress/gutenberg/pull/64888))
+- Inserter: Fix subtle media insertion error. ([65057](https://github.com/WordPress/gutenberg/pull/65057))
+- Post Editor: Fix click space after post content to append. ([64992](https://github.com/WordPress/gutenberg/pull/64992))
+- Writing flow: Fix triple click inside text blocks. ([64928](https://github.com/WordPress/gutenberg/pull/64928))
+
+#### Global Styles
+- Adjust spacing of background panel. ([64880](https://github.com/WordPress/gutenberg/pull/64880))
+- Cast globalFluid value to boolean. ([64882](https://github.com/WordPress/gutenberg/pull/64882))
+- Fix site editor broken when fontWeight is not defined or is an integer in theme.json or theme styles. ([64953](https://github.com/WordPress/gutenberg/pull/64953))
+- Fixes the default fluid value on the UI based on the global typography fluid value. ([64803](https://github.com/WordPress/gutenberg/pull/64803))
+
+#### Block bindings
+- Change placeholder when attribute is bound. ([64903](https://github.com/WordPress/gutenberg/pull/64903))
+- Fix empty custom fields not being editable in bindings. ([64881](https://github.com/WordPress/gutenberg/pull/64881))
+
+#### CSS & Styling
+- Featured Image Block: Reduce CSS specificity. ([64463](https://github.com/WordPress/gutenberg/pull/64463))
+- Retain the same specificity for non iframed selectors. ([64534](https://github.com/WordPress/gutenberg/pull/64534))
+
+#### Patterns
+- Pass 'blocks' as inner blocks value. ([65029](https://github.com/WordPress/gutenberg/pull/65029))
+
+#### Synced Patterns
+- Pattern: Don't render block controls when an entity is missing. ([65028](https://github.com/WordPress/gutenberg/pull/65028))
+
+#### Site Editor
+- DataViews: Fix pattern title direction in RTL languages. ([64967](https://github.com/WordPress/gutenberg/pull/64967))
+
+#### Typography
+- Site Title, Post Title: Fix typography for blocks with `a` children. ([64911](https://github.com/WordPress/gutenberg/pull/64911))
+
+#### NUX
+- Fix visibility of the template Welcome Guide in the Site Editor. ([64789](https://github.com/WordPress/gutenberg/pull/64789))
+
+#### Document Settings
+- Fix: Adjust Site URL Styles to Prevent Overflow in Pre-Publish Component. ([64745](https://github.com/WordPress/gutenberg/pull/64745))
+
+#### Zoom Out
+- Focus selected block in editor canvas when clicking edit button on zoom out mode toolbar. ([64725](https://github.com/WordPress/gutenberg/pull/64725))
+
+#### Templates API
+- Make plugin-registered templates overriden by themes to fall back to plugin-registered title and description. ([64610](https://github.com/WordPress/gutenberg/pull/64610))
+
+#### Block Style Variations
+- Block Styles: Ensure unique classname generation for variations. ([64511](https://github.com/WordPress/gutenberg/pull/64511))
+
+#### Distraction Free
+- Make Distraction Free not conditional on viewport width. ([63949](https://github.com/WordPress/gutenberg/pull/63949))
+
+#### Media
+- Limit the max width of image to its container size. ([63341](https://github.com/WordPress/gutenberg/pull/63341))
+
+
+### Accessibility
+
+#### Components
+- AlignmentMatrixControl: Simplify styles and markup. ([64827](https://github.com/WordPress/gutenberg/pull/64827))
+- TimePicker: Use ToggleGroupControl for AM/PM toggle. ([64800](https://github.com/WordPress/gutenberg/pull/64800))
+
+#### Block Editor
+- Layout content and wide width controls: Remove confusing icon and clarify labels. ([64891](https://github.com/WordPress/gutenberg/pull/64891))
+
+#### Font Library
+- Font Library Modal: Group font variations as a list. ([64029](https://github.com/WordPress/gutenberg/pull/64029))
+
+#### Post Editor
+- Fix the post summary Status toggle button accessibility. ([63988](https://github.com/WordPress/gutenberg/pull/63988))
+
+
+### Performance
+
+- Core Data: Avoid loops in 'registry.batch' calls. ([64955](https://github.com/WordPress/gutenberg/pull/64955))
+- Core data: Performance: Fix receive user permissions. ([64894](https://github.com/WordPress/gutenberg/pull/64894))
+- Reusable blocks: Fix performance of __experimentalGetAllowedPatterns. ([64871](https://github.com/WordPress/gutenberg/pull/64871))
+
+#### Site Editor
+- Add 'OPTIONS /page' to preloaded paths. ([64890](https://github.com/WordPress/gutenberg/pull/64890))
+- Editor: Don't use selector shortcuts for the Site data. ([64884](https://github.com/WordPress/gutenberg/pull/64884))
+
+#### Interactivity API
+- Prevent calling `proxifyContext` with context proxies inside `wp-context`. ([65090](https://github.com/WordPress/gutenberg/pull/65090))
+
+#### Block Library
+- Media & Text: Don't use background-image. ([64981](https://github.com/WordPress/gutenberg/pull/64981))
+
+#### Post Editor
+- Editor: Remove create template permission check in 'VisualEditor'. ([64905](https://github.com/WordPress/gutenberg/pull/64905))
+
+#### Block Editor
+- Inserter: Use lighter grammar parse to check allowed status. ([64902](https://github.com/WordPress/gutenberg/pull/64902))
+
+#### Patterns
+- Shuffle: Don't call '__experimentalGetAllowedPatterns' for every block. ([64736](https://github.com/WordPress/gutenberg/pull/64736))
+
+
+### Experiments
+
+#### Zoom Out
+- Add new zoom out experiment. ([65048](https://github.com/WordPress/gutenberg/pull/65048))
+- Remove the experiment that connects zoom out to the pattern inserter. ([65045](https://github.com/WordPress/gutenberg/pull/65045))
+
+
+### Documentation
+
+- Add a new section to the SlotFill reference to show how to conditionally render Fills. ([64807](https://github.com/WordPress/gutenberg/pull/64807))
+- Added Global Documentation in several php file. ([64956](https://github.com/WordPress/gutenberg/pull/64956))
+- Components: Move displayName assignment to top-level files. ([64793](https://github.com/WordPress/gutenberg/pull/64793))
+- Composite: Add context-forwarding with SlotFill example. ([65051](https://github.com/WordPress/gutenberg/pull/65051))
+- Composite: Fix Storybook docgen. ([64682](https://github.com/WordPress/gutenberg/pull/64682))
+- Corrected HTML Syntax for Closing Tags in api-reference.md file. ([64778](https://github.com/WordPress/gutenberg/pull/64778))
+- DataViews docs: Fix typo in `direction` values. ([64973](https://github.com/WordPress/gutenberg/pull/64973))
+- DataViews: Add story about combining fields. ([64984](https://github.com/WordPress/gutenberg/pull/64984))
+- DataViews: Document combined fields. ([64904](https://github.com/WordPress/gutenberg/pull/64904))
+- Dataviews docs: Layout properties checks and link. ([64918](https://github.com/WordPress/gutenberg/pull/64918))
+- Docs/iAPI: Fix wrong code snippets in API reference. ([64416](https://github.com/WordPress/gutenberg/pull/64416))
+- Docs: Update design resources to indicate edit isn't free. ([64792](https://github.com/WordPress/gutenberg/pull/64792))
+- PluginSidebarMoreMenuItem: Update example, screenshot and description. ([64761](https://github.com/WordPress/gutenberg/pull/64761))
+- Provide better examples and remove outdating site edit references for the MainDashboardButton SlotFill. ([64753](https://github.com/WordPress/gutenberg/pull/64753))
+- Removing ryanwelcher as a documentation codeowner because my inbox is dead. ([64762](https://github.com/WordPress/gutenberg/pull/64762))
+- Storybook: Hide deprecated `__next36pxDefaultSize` prop. ([64806](https://github.com/WordPress/gutenberg/pull/64806))
+- Update screenshot and description for PluginSidebar slot. ([64759](https://github.com/WordPress/gutenberg/pull/64759))
+- Update text to match code examples. ([64751](https://github.com/WordPress/gutenberg/pull/64751))
+- Update the import for PluginBlockSettingsMenuItem. ([64758](https://github.com/WordPress/gutenberg/pull/64758))
+- Updated Several Typos in Doc files. ([64787](https://github.com/WordPress/gutenberg/pull/64787))
+- [Docs]: Update Usage Example for block variation picker: Fix Import from Wrong Package. ([55555](https://github.com/WordPress/gutenberg/pull/55555))
+
+
+### Code Quality
+
+- Button: Add lint rule for 40px size prop usage. ([64835](https://github.com/WordPress/gutenberg/pull/64835))
+- Dataviews filter: Move resetValueOnSelect prop to combobox item. ([64852](https://github.com/WordPress/gutenberg/pull/64852))
+- Rename refs to fix tons of 'Mutating a value' errors in react-compiler. ([64718](https://github.com/WordPress/gutenberg/pull/64718))
+- Rich text: Add comment on placeholder approach. ([64945](https://github.com/WordPress/gutenberg/pull/64945))
+- SelectControl: Fix remaining 40px size violations. ([64831](https://github.com/WordPress/gutenberg/pull/64831))
+- Simplify useResizeObserver. ([64820](https://github.com/WordPress/gutenberg/pull/64820))
+- Typography: Backport comment changes only. ([64859](https://github.com/WordPress/gutenberg/pull/64859))
+- UnitControl: Add lint rule for 40px size prop usage. ([64520](https://github.com/WordPress/gutenberg/pull/64520))
+- UnitControl: Move to stricter lint rule for 40px size adherence. ([65017](https://github.com/WordPress/gutenberg/pull/65017))
+- Use rectIntersect instead of a custom argument to rectUnion. ([64855](https://github.com/WordPress/gutenberg/pull/64855))
+
+#### Site Editor
+- Add Custom Template modal: Do not use Composite store. ([65044](https://github.com/WordPress/gutenberg/pull/65044))
+- Add units to avoid console warning. ([64810](https://github.com/WordPress/gutenberg/pull/64810))
+- Edit Site Layout: Remove redundant fullResizer. ([64821](https://github.com/WordPress/gutenberg/pull/64821))
+- Remove unused 'useSiteEditorSettings' hook. ([64892](https://github.com/WordPress/gutenberg/pull/64892))
+- Style Book: Do not use Composite store. ([65047](https://github.com/WordPress/gutenberg/pull/65047))
+
+#### Block Editor
+- Block Inserter Listbox: Do not use Composite store. ([65042](https://github.com/WordPress/gutenberg/pull/65042))
+- Block Inserter Media List: Do not use Composite store. ([65043](https://github.com/WordPress/gutenberg/pull/65043))
+- Block Pattern Setup: Do not use Composite store. ([65039](https://github.com/WordPress/gutenberg/pull/65039))
+- Global Styles Shadow Panel: Do not use Composite store. ([65041](https://github.com/WordPress/gutenberg/pull/65041))
+- Pattern Transformations Menu: Do not use Composite store. ([65040](https://github.com/WordPress/gutenberg/pull/65040))
+
+#### Zoom Out
+- Add selector for getting section root clientId. ([65001](https://github.com/WordPress/gutenberg/pull/65001))
+- Don't pass 'rootClientId' to block lock selectors. ([64887](https://github.com/WordPress/gutenberg/pull/64887))
+- Fix error and improve privacy of sectionRootClientId setting. ([65000](https://github.com/WordPress/gutenberg/pull/65000))
+
+#### Components
+- AlignmentMatrixControl: Promote to stable. ([60913](https://github.com/WordPress/gutenberg/pull/60913))
+- Deprecate `DimensionControl`. ([64951](https://github.com/WordPress/gutenberg/pull/64951))
+
+#### Block Library
+- Block Bindings: Fix ESLint warnings. ([64684](https://github.com/WordPress/gutenberg/pull/64684))
+- Video Block: Remove custom CSS code for placeholder style. ([64861](https://github.com/WordPress/gutenberg/pull/64861))
+
+#### Global Styles
+- Allow referenced zero value and simplify getValueFromObjectPath calls. ([64836](https://github.com/WordPress/gutenberg/pull/64836))
+- Navigator: Replace deprecated NavigatorToParentButton with NavigatorBackButton. ([64775](https://github.com/WordPress/gutenberg/pull/64775))
+
+#### Block Directory
+- Downloadable Block List: Do not use composite store. ([65038](https://github.com/WordPress/gutenberg/pull/65038))
+
+#### Design Tools
+- Color panel hook: Rename to remove ambiguity. ([64993](https://github.com/WordPress/gutenberg/pull/64993))
+
+
+### Tools
+
+- Add remaining i18n rules to recommended ESLint ruleset. ([64710](https://github.com/WordPress/gutenberg/pull/64710))
+- Scripts: Added chunk filename in webpack configuration to avoid reading stale files. ([58176](https://github.com/WordPress/gutenberg/pull/58176))
+- Scripts: Import CSS files before optimization. ([61121](https://github.com/WordPress/gutenberg/pull/61121))
+- Scripts: Update `puppeteer-core` dependency. ([64597](https://github.com/WordPress/gutenberg/pull/64597))
+
+#### Testing
+- Flaky Test: Fix "Sorting" test in new-templates-list.spec.js. ([64776](https://github.com/WordPress/gutenberg/pull/64776))
+- Revert "Downgrade node 22(.5) unit tests to 22.4 (#63728)". ([63758](https://github.com/WordPress/gutenberg/pull/63758))
+
+
+### Various
+
+- Dataviews docs: Fixed property name for defaultLayouts settings. ([64897](https://github.com/WordPress/gutenberg/pull/64897))
+- task: Remove dcalhoun code owner. ([64886](https://github.com/WordPress/gutenberg/pull/64886))
+
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+- @Imran92: Fix site editor broken when fontWeight is not defined or is an integer in theme.json or theme styles. ([64953](https://github.com/WordPress/gutenberg/pull/64953))
+- @jacobcassidy: Scripts: Update `puppeteer-core` dependency. ([64597](https://github.com/WordPress/gutenberg/pull/64597))
+- @jawadmalikdev: [Docs]: Update Usage Example for block variation picker: Fix Import from Wrong Package. ([55555](https://github.com/WordPress/gutenberg/pull/55555))
+- @lezama: Editor: Add extensibility to PreviewOptions v2. ([64644](https://github.com/WordPress/gutenberg/pull/64644))
+- @rithik56: Scripts: Added chunk filename in webpack configuration to avoid reading stale files. ([58176](https://github.com/WordPress/gutenberg/pull/58176))
+- @rohitmathur-7: Cover Block: Move Clear Media button from Inspector Controls to Block Controls. ([64630](https://github.com/WordPress/gutenberg/pull/64630))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @akasunil @Aljullu @andrewserong @atachibana @benoitchantre @carolinan @cbravobernal @ciampo @DAreRodz @dcalhoun @desrosj @dsas @ellatrix @fullofcaffeine @getdave @gziolo @Imran92 @imrraaj @jacobcassidy @jameskoster @jasmussen @jawadmalikdev @jeryj @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @lezama @Mamaduka @matiasbenedetto @mirka @noisysocks @ntsekouras @oandregal @ockham @rafaelgallani @ramonjd @richtabor @rithik56 @rohitmathur-7 @ryanwelcher @SantosGuillamot @scruffian @sgomes @shail-mehta @spacedmonkey @stokesman @swissspidy @t-hamano @talldan @tjcafferkey @tyxla
+
+
+= 19.1.0 =
+
+## Changelog
+
+### Enhancements
+
+#### Components
+- Allow `style` prop on `Popover`. ([64489](https://github.com/WordPress/gutenberg/pull/64489))
+- Add elevation scale. ([64108](https://github.com/WordPress/gutenberg/pull/64108))
+- Apply elevation scale to: Modal, Popover, and Snackbar components. ([64655](https://github.com/WordPress/gutenberg/pull/64655))
+- Ariakit: Update to v0.4.10. ([64637](https://github.com/WordPress/gutenberg/pull/64637))
+- DimensionControl: Add flag to remove bottom margin. ([64346](https://github.com/WordPress/gutenberg/pull/64346))
+- DropdownMenu V2: Use themed color variables. ([64647](https://github.com/WordPress/gutenberg/pull/64647))
+- Placeholders: Update radius temporarily. ([64672](https://github.com/WordPress/gutenberg/pull/64672))
+- Reduce gap between steps in SpacingSizesControl, add animation, remove first/last marks. ([63803](https://github.com/WordPress/gutenberg/pull/63803))
+- Textarea Control: Update styles. ([64586](https://github.com/WordPress/gutenberg/pull/64586))
+- Tools Panel: Sets column-gap to 16px for grid. ([64497](https://github.com/WordPress/gutenberg/pull/64497))
+- Update DropdownMenuV2 elevation, remove unused configuration value. ([64432](https://github.com/WordPress/gutenberg/pull/64432))
+- Update components radius. ([64368](https://github.com/WordPress/gutenberg/pull/64368))
+- Use `useStoreState()` instead of `store.useState()`. ([64648](https://github.com/WordPress/gutenberg/pull/64648))
+- Composite: Use internal context to consume composite store. ([64493](https://github.com/WordPress/gutenberg/pull/64493))
+- Default to new 40px size in the following:
+  - FocalPointPicker: ([64456](https://github.com/WordPress/gutenberg/pull/64456))
+  - QueryControls: ([64457](https://github.com/WordPress/gutenberg/pull/64457))
+
+#### Data Views
+- Do not display element descriptions in filters. ([64674](https://github.com/WordPress/gutenberg/pull/64674))
+- Apply minimal variant to pagination dropdown. ([63815](https://github.com/WordPress/gutenberg/pull/63815))
+- Update the style of the datetime fields to match the other types. ([64438](https://github.com/WordPress/gutenberg/pull/64438))
+- Use the fields array to define the order of the fields. ([64335](https://github.com/WordPress/gutenberg/pull/64335))
+- Make the move left/right controls in table header always available. ([64646](https://github.com/WordPress/gutenberg/pull/64646))
+- Support defining field headers/names as React elements. ([64642](https://github.com/WordPress/gutenberg/pull/64642))
+- Add marks to preview size control. ([64546](https://github.com/WordPress/gutenberg/pull/64546))
+- Move item size control to the new view configuration UI. ([64380](https://github.com/WordPress/gutenberg/pull/64380))
+- Update search appearance in narrow containers. ([64681](https://github.com/WordPress/gutenberg/pull/64681))
+- Quick edit additions:
+  - `comment_status` field. ([64370](https://github.com/WordPress/gutenberg/pull/64370))
+  - `status` field. ([64398](https://github.com/WordPress/gutenberg/pull/64398))
+  - 'Date' as field and `datetime` as field type. ([64267](https://github.com/WordPress/gutenberg/pull/64267))
+- Extensibility - allow unregistering of the following:
+  - Duplicate post action ([64441](https://github.com/WordPress/gutenberg/pull/64441))
+  - Duplicate pattern action ([64373](https://github.com/WordPress/gutenberg/pull/64373))
+  - Duplicate template part action ([64388](https://github.com/WordPress/gutenberg/pull/64388))
+  - Rename post action ([64366](https://github.com/WordPress/gutenberg/pull/64366))
+  - Reorder-page action ([64199](https://github.com/WordPress/gutenberg/pull/64199))
+  - View post action ([64467](https://github.com/WordPress/gutenberg/pull/64467))
+  - View post revisions action ([64464](https://github.com/WordPress/gutenberg/pull/64464))
+- Add missing styles and remove opinionated ones for generic usage. ([64711](https://github.com/WordPress/gutenberg/pull/64711))
+
+#### Block Library
+- Embed Block: Replace native input element with InputControl component. ([64668](https://github.com/WordPress/gutenberg/pull/64668))
+- Grid: Prevent highlight of cells when dragging a block if block type can't be dropped into grid. ([64290](https://github.com/WordPress/gutenberg/pull/64290))
+- Image block: Add reset button. ([64669](https://github.com/WordPress/gutenberg/pull/64669))
+- Overlay caption w. text-shadow. ([63471](https://github.com/WordPress/gutenberg/pull/63471))
+
+#### Design Tools
+- Background image: Add uploading state and restrict drag to one image. ([64565](https://github.com/WordPress/gutenberg/pull/64565))
+- Quote Block: Add align support. ([64188](https://github.com/WordPress/gutenberg/pull/64188))
+- Add border support to the following:
+  - Comment Author Name ([64550](https://github.com/WordPress/gutenberg/pull/64550))
+  - Comment Content ([64230](https://github.com/WordPress/gutenberg/pull/64230))
+  - Comment Date ([64210](https://github.com/WordPress/gutenberg/pull/64210))
+  - Post Author Biography ([64615](https://github.com/WordPress/gutenberg/pull/64615))
+  - Post Author Name ([64530](https://github.com/WordPress/gutenberg/pull/64530))
+  - Post Author ([64599](https://github.com/WordPress/gutenberg/pull/64599))
+  - Query Title ([64581](https://github.com/WordPress/gutenberg/pull/64581))
+  - File: ([64509](https://github.com/WordPress/gutenberg/pull/64509))
+  - List Item: ([63541](https://github.com/WordPress/gutenberg/pull/63541))
+  - List: ([63540](https://github.com/WordPress/gutenberg/pull/63540))
+  - Preformatted: ([64302](https://github.com/WordPress/gutenberg/pull/64302))
+  - Tag Cloud: ([63579](https://github.com/WordPress/gutenberg/pull/63579))
+
+#### Zoom Out
+- Add private `isZoomOutMode` selector. ([64503](https://github.com/WordPress/gutenberg/pull/64503))
+- Block Insertion: Clear the insertion point when selecting a different block or clearing block selection. ([64048](https://github.com/WordPress/gutenberg/pull/64048))
+- Default the inserter to the patterns tab when in zoom out. ([64193](https://github.com/WordPress/gutenberg/pull/64193))
+- Focus pattern inserter search when activating zoom out inserter. ([64396](https://github.com/WordPress/gutenberg/pull/64396))
+- Stop unwanted drag and drop operations within section Patterns in Zoom Out mode. ([64331](https://github.com/WordPress/gutenberg/pull/64331))
+
+#### Block Editor
+- Button groups in Typography tools should use ToggleGroupControl. ([64529](https://github.com/WordPress/gutenberg/pull/64529))
+- Hyphenate long block names in the inserter. ([64667](https://github.com/WordPress/gutenberg/pull/64667))
+
+#### Global Styles
+- Additional CSS: Localize the link if it exists. ([64603](https://github.com/WordPress/gutenberg/pull/64603))
+- Background images: Add support for theme.json ref value resolution. ([64128](https://github.com/WordPress/gutenberg/pull/64128))
+
+
+### New APIs
+
+#### Components
+- Composite
+  - Add Hover and Typeahead subcomponents. ([64399](https://github.com/WordPress/gutenberg/pull/64399))
+  - Stabilize new ariakit implementation. ([63564](https://github.com/WordPress/gutenberg/pull/63564))
+  - Export `useCompositeStore`, add more focus-related props. ([64450](https://github.com/WordPress/gutenberg/pull/64450))
+
+#### Synced Patterns
+- Block Bindings: Create utils to update or remove bindings. ([64102](https://github.com/WordPress/gutenberg/pull/64102))
+
+#### Extensibility
+- Add plugin template registration API. ([61577](https://github.com/WordPress/gutenberg/pull/61577))
+
+
+### Bug Fixes
+
+#### Components
+- CustomSelectControl: Improve props type inferring. ([64412](https://github.com/WordPress/gutenberg/pull/64412))
+- ColorPalette: Partial support of `color-mix()` CSS colors. ([64224](https://github.com/WordPress/gutenberg/pull/64224))
+- RangeControl: Disable reset button consistently. ([64579](https://github.com/WordPress/gutenberg/pull/64579))
+- RangeControl: Tweak mark and label absolute positioning. ([64487](https://github.com/WordPress/gutenberg/pull/64487))
+
+#### Data Views
+- Load the filter toggle as open if there are primary filters. ([64651](https://github.com/WordPress/gutenberg/pull/64651))
+- Sort descending button may be wrongly pressed. ([64547](https://github.com/WordPress/gutenberg/pull/64547))
+- Filter icon is displayed even when no filter capabilities are given to any field. ([64640](https://github.com/WordPress/gutenberg/pull/64640))
+- Hide sort direction control if there are no sortable fields. ([64817](https://github.com/WordPress/gutenberg/pull/64817))
+
+#### Zoom Out
+- Disallow dropping outside section root in Zoom Out mode. ([64500](https://github.com/WordPress/gutenberg/pull/64500))
+- Don't hide the insertion point when hovering patterns. ([64392](https://github.com/WordPress/gutenberg/pull/64392))
+- Use previous device width for scale calculations. ([64478](https://github.com/WordPress/gutenberg/pull/64478))
+
+#### Block Library
+- Embed blocks: Adding captions via toolbar - #64385. ([64394](https://github.com/WordPress/gutenberg/pull/64394))
+- Paste: Fix blob uploading. ([64479](https://github.com/WordPress/gutenberg/pull/64479))
+- Table Block: Hide caption toolbar button on multiple selection. ([64462](https://github.com/WordPress/gutenberg/pull/64462))
+
+#### Post Editor
+- Fix user pattern preloading filter. ([64477](https://github.com/WordPress/gutenberg/pull/64477))
+- Fix preloaded REST API paths. ([64459](https://github.com/WordPress/gutenberg/pull/64459))
+- Force iframe editor when zoom-out mode. ([64316](https://github.com/WordPress/gutenberg/pull/64316))
+
+#### Block Editor
+- Don't hide the toolbar for an empty default block in HTML mode. ([64374](https://github.com/WordPress/gutenberg/pull/64374))
+- In-between Inserter: Show inserter when it doesn't conflict with block toolbar. ([64229](https://github.com/WordPress/gutenberg/pull/64229))
+- Slash Inserter: Restrict block list to allowed blocks only. ([64413](https://github.com/WordPress/gutenberg/pull/64413))
+
+#### Site Editor
+- Don't allow duplicating template parts in non-block-based themes. ([64379](https://github.com/WordPress/gutenberg/pull/64379))
+- Fix Template Parts post type preload path. ([64401](https://github.com/WordPress/gutenberg/pull/64401))
+- Cancel button in duplicate template part modal doesn't work. ([64377](https://github.com/WordPress/gutenberg/pull/64377))
+- Fix empty content sidebar panel. ([64569](https://github.com/WordPress/gutenberg/pull/64569))
+
+#### Block bindings
+- Fix long keys overflow in bindings panel. ([64465](https://github.com/WordPress/gutenberg/pull/64465))
+- Hide keys starting with underscore. ([64618](https://github.com/WordPress/gutenberg/pull/64618))
+- Refactor utils file. ([64740](https://github.com/WordPress/gutenberg/pull/64740))
+
+#### CSS & Styling
+- Remove inconsistent dark theme focus style on block selection. ([64549](https://github.com/WordPress/gutenberg/pull/64549))
+- Update postcss-prefixwrap dependency to 1.51.0 to fix prefixing in `:Where` selectors. ([64458](https://github.com/WordPress/gutenberg/pull/64458))
+
+#### Interactivity API
+- Fix context inheritance from namespaces different than the current one. ([64677](https://github.com/WordPress/gutenberg/pull/64677))
+- Fix computeds without scope in Firefox. ([64825](https://github.com/WordPress/gutenberg/pull/64825))
+
+#### Document Settings
+- Post Featured Image: Disable the media modal while uploading an image. ([64566](https://github.com/WordPress/gutenberg/pull/64566))
+
+#### Patterns
+- Changing sorting direction on patterns does nothing. ([64508](https://github.com/WordPress/gutenberg/pull/64508))
+
+#### Design Tools
+- Background image: Ensure consistency with defaults and fix reset/remove functionality. ([64328](https://github.com/WordPress/gutenberg/pull/64328))
+
+#### Global Styles
+- Fix bumped specificity for layout styles in non-iframed editor. ([64076](https://github.com/WordPress/gutenberg/pull/64076))
+
+
+### Accessibility
+
+- Site Editor: Always use auto-cursor style for editable text. ([64627](https://github.com/WordPress/gutenberg/pull/64627))
+- Post Editor: Update textControl to searchControl in taxonomy search. ([64605](https://github.com/WordPress/gutenberg/pull/64605))
+- RadioControl: Label radio group using fieldset and legend. ([64582](https://github.com/WordPress/gutenberg/pull/64582))
+- Fix labeling in Typography font size presets panel. ([64428](https://github.com/WordPress/gutenberg/pull/64428))
+- Latests Posts: Used ToggleGroupControl instead for Image alignment. ([64352](https://github.com/WordPress/gutenberg/pull/64352))
+
+
+### Performance
+
+- Fetch permissions for visible patterns only. ([64606](https://github.com/WordPress/gutenberg/pull/64606))
+- Background Image: Remove unnecessary 'block-editor' store subscription. ([64568](https://github.com/WordPress/gutenberg/pull/64568))
+- Edit Post: Avoid unnecessary post-template ID lookup. ([64431](https://github.com/WordPress/gutenberg/pull/64431))
+- GridVisualizer: Avoid over-selecting by using a new getBlockStyles private selector. ([64386](https://github.com/WordPress/gutenberg/pull/64386))
+
+
+### Experiments
+
+#### Data Views
+- DataViews Quick Edit
+  - Add Post Card to the quick edit panel. ([64365](https://github.com/WordPress/gutenberg/pull/64365))
+  - Add the PostActions dropdown menu. ([64393](https://github.com/WordPress/gutenberg/pull/64393))
+  - Rely on the global save flow instead of a custom save button. ([64389](https://github.com/WordPress/gutenberg/pull/64389))
+- Update the copy of quick edit tooltip. ([64475](https://github.com/WordPress/gutenberg/pull/64475))
+
+#### Components
+- Composite v2: Undo stabilizing new version. ([64510](https://github.com/WordPress/gutenberg/pull/64510))
+
+
+### Documentation
+
+- Add clarification about importing css/scss files. ([61252](https://github.com/WordPress/gutenberg/pull/61252))
+- Components
+  - Add "Naming conventions" section. ([63714](https://github.com/WordPress/gutenberg/pull/63714))
+  - Add 40px size prop to readmes. ([64592](https://github.com/WordPress/gutenberg/pull/64592))
+- Composite: Improve Storybook examples and clean up prop documentation. ([64397](https://github.com/WordPress/gutenberg/pull/64397))
+- Dataviews
+  - Added missing properties for actions object and link to storybook example. ([64442](https://github.com/WordPress/gutenberg/pull/64442))
+  - Fixed tip link for block editor view. ([64469](https://github.com/WordPress/gutenberg/pull/64469))
+  - Update README with missing properties and recent changes. ([64435](https://github.com/WordPress/gutenberg/pull/64435))
+  - Better explanation of the "elements" property and its connection to the "filterBy" property. ([64633](https://github.com/WordPress/gutenberg/pull/64633))
+- Interactivity API
+  - The first three Core Concepts guides. ([63759](https://github.com/WordPress/gutenberg/pull/63759))
+  - Fix internal links core-concepts. ([64609](https://github.com/WordPress/gutenberg/pull/64609))
+  - Remove typed function from API reference. ([64429](https://github.com/WordPress/gutenberg/pull/64429))
+  - Add code concepts to Navigating the Interactivity API documentation. ([64608](https://github.com/WordPress/gutenberg/pull/64608))
+  - Interactivity API: Add wp_interactivity_state() clarification. ([64356](https://github.com/WordPress/gutenberg/pull/64356))
+- Fix typos in the Block Filters documentation.. ([64426](https://github.com/WordPress/gutenberg/pull/64426))
+- Fix example of useBlockProps hook. ([64363](https://github.com/WordPress/gutenberg/pull/64363))
+- Fix typo and link in static-dynamic-rendering.md. ([64449](https://github.com/WordPress/gutenberg/pull/64449))
+- Fix typo in block-filters.md. ([64452](https://github.com/WordPress/gutenberg/pull/64452))
+- Fix typo in block-wrapper.md. ([64447](https://github.com/WordPress/gutenberg/pull/64447))
+- Note about image sizes in MediaUpload::OnSelect. ([64616](https://github.com/WordPress/gutenberg/pull/64616))
+- Small typo correction in doc file. ([64596](https://github.com/WordPress/gutenberg/pull/64596))
+- TextDecorationControl, TextTransformControl: Remove size prop in Storybook. ([64583](https://github.com/WordPress/gutenberg/pull/64583))
+- Updated `@since` order in Inline document in client-assets.php file. ([64653](https://github.com/WordPress/gutenberg/pull/64653))
+- Updated small typo in compat.php file. ([64535](https://github.com/WordPress/gutenberg/pull/64535))
+- Updated small typo in modularity.md. ([64518](https://github.com/WordPress/gutenberg/pull/64518))
+
+
+### Code Quality
+
+- Add lint rule for 40px size prop usage in the following:
+  - BorderBoxControl, BorderControl, DimensionControl, FontSizePicker: ([64410](https://github.com/WordPress/gutenberg/pull/64410))
+  - Block Editor typography components ([64591](https://github.com/WordPress/gutenberg/pull/64591))
+  - FormFileUpload: ([64585](https://github.com/WordPress/gutenberg/pull/64585))
+  - FormTokenField: ([64590](https://github.com/WordPress/gutenberg/pull/64590))
+  - InputControl: ([64589](https://github.com/WordPress/gutenberg/pull/64589))
+  - NumberControl: ([64561](https://github.com/WordPress/gutenberg/pull/64561))
+  - RangeControl: ([64558](https://github.com/WordPress/gutenberg/pull/64558))
+  - SelectControl: ([64486](https://github.com/WordPress/gutenberg/pull/64486))
+  - TextControl: ([64455](https://github.com/WordPress/gutenberg/pull/64455))
+  - ToggleGroupControl: ([64524](https://github.com/WordPress/gutenberg/pull/64524))
+  - ComboboxControl: ([64560](https://github.com/WordPress/gutenberg/pull/64560))
+  - CustomSelectControl: ([64559](https://github.com/WordPress/gutenberg/pull/64559))
+- Add margin-bottom lint rules for BaseControl. ([64355](https://github.com/WordPress/gutenberg/pull/64355))
+- Add missing changes to the changelog for the PR #62734. ([64507](https://github.com/WordPress/gutenberg/pull/64507))
+- Base Styles: Restore deprecated `$dark-theme-focus` variable. ([64563](https://github.com/WordPress/gutenberg/pull/64563))
+- ESLint: Enable and enforce remaining i18n rules for the plugin (e.g. no trailing spaces). ([60196](https://github.com/WordPress/gutenberg/pull/60196))
+- Remove unnecessary className. ([64403](https://github.com/WordPress/gutenberg/pull/64403))
+- Replace instances of deprecated elevation variables. ([64656](https://github.com/WordPress/gutenberg/pull/64656))
+- Style engine: Export util to compile CSS custom var from preset string. ([64490](https://github.com/WordPress/gutenberg/pull/64490))
+- Style engine: Update type for getCSSValueFromRawStyle. ([64528](https://github.com/WordPress/gutenberg/pull/64528))
+- TextControl: Fix remaining 40px size violations. ([64594](https://github.com/WordPress/gutenberg/pull/64594))
+- Border: 1px → $border-width. ([64680](https://github.com/WordPress/gutenberg/pull/64680))
+
+#### Block Library
+- Gallery: Remove 'withNotices' HoC. ([64384](https://github.com/WordPress/gutenberg/pull/64384))
+- Missing Block: Use hooks instead of HoC. ([64657](https://github.com/WordPress/gutenberg/pull/64657))
+
+#### Block Editor
+- Use hooks instead of HoC in:
+  - 'BlockModeToggle'. ([64460](https://github.com/WordPress/gutenberg/pull/64460))
+  - 'MultiSelectionInspector'. ([64634](https://github.com/WordPress/gutenberg/pull/64634))
+
+#### Components
+- Deprecate bottom margin on BaseControl-based components. ([64408](https://github.com/WordPress/gutenberg/pull/64408))
+- Navigator: Simplify backwards navigation APIs. ([63317](https://github.com/WordPress/gutenberg/pull/63317))
+
+#### Data Views
+- Refactor the edit function to be based on discrete controls. ([64404](https://github.com/WordPress/gutenberg/pull/64404))
+- Update `renderFormElements` to make sure the value respects the type. ([64391](https://github.com/WordPress/gutenberg/pull/64391))
+- Abandon the ItemRecord type. ([64367](https://github.com/WordPress/gutenberg/pull/64367))
+
+#### Block hooks
+- Navigation Block: Remove now-obsolete function_exists guards. ([64673](https://github.com/WordPress/gutenberg/pull/64673))
+
+#### Nested / Inner Blocks
+- Block Editor: Refactor inner blocks appender components. ([64470](https://github.com/WordPress/gutenberg/pull/64470))
+
+#### Plugin
+- Script Modules: Move data passing to 6.7 compat file. ([64006](https://github.com/WordPress/gutenberg/pull/64006))
+
+
+### Tools
+
+- Make wp-env compatible with WordPress versions older than 5.4 by fixing wp-config anchors. ([55864](https://github.com/WordPress/gutenberg/pull/55864))
+
+#### Testing
+- Background block supports: Remove unused properties in unit tests. ([64564](https://github.com/WordPress/gutenberg/pull/64564))
+- Fix flaky block template registration end-to-end test. ([64541](https://github.com/WordPress/gutenberg/pull/64541))
+- Improve Image block end-to-end tests. ([64537](https://github.com/WordPress/gutenberg/pull/64537))
+- Upgrade Playwright to v1.46. ([64372](https://github.com/WordPress/gutenberg/pull/64372))
+
+#### Build Tooling
+- Fix gutenberg/gutenberg-coding-standards licensing issues. ([61913](https://github.com/WordPress/gutenberg/pull/61913))
+- Props Bot: Update to correct event type. ([64557](https://github.com/WordPress/gutenberg/pull/64557))
+
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+- @cweiske: Note about image sizes in MediaUpload::OnSelect. ([64616](https://github.com/WordPress/gutenberg/pull/64616))
+- @imrraaj: Dataviews: Filter icon is displayed even when no filter capabilities are given to any field. ([64640](https://github.com/WordPress/gutenberg/pull/64640))
+- @janpfeil: Fix typo in block-filters.md. ([64452](https://github.com/WordPress/gutenberg/pull/64452))
+- @Rishit30G: `ColorPalette`: Partial support of `color-mix()` CSS colors. ([64224](https://github.com/WordPress/gutenberg/pull/64224))
+- @ssang: Slash Inserter: Restrict block list to allowed blocks only. ([64413](https://github.com/WordPress/gutenberg/pull/64413))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @akasunil @Aljullu @amitraj2203 @anton-vlasenko @arthur791004 @cbravobernal @ciampo @colorful-tones @cweiske @DAreRodz @ellatrix @felixarntz @getdave @hbhalodia @imrraaj @jameskoster @janpfeil @jasmussen @jeherve @jorgefilipecosta @jsnajdr @juanmaguitar @luisherranz @Mamaduka @meteorlxy @mirka @ndiego @noisysocks @ntsekouras @oandregal @ockham @ramonjd @richtabor @Rishit30G @SantosGuillamot @scruffian @shail-mehta @shreya0204 @sirreal @ssang @swissspidy @t-hamano @talldan @tyxla @vipul0425 @youknowriad
+
+
+= 19.0.0 =
+
+## Changelog
+
+### Enhancements
+
+- Add alt edit field to the inline image in the format library ([64124](https://github.com/WordPress/gutenberg/pull/64124))
+- Update copy from "No Title" to "No title" across multiple places on the editor. ([64184](https://github.com/WordPress/gutenberg/pull/64184))
+- Update column input to be 40px by default. ([64190](https://github.com/WordPress/gutenberg/pull/64190))
+
+#### Block Library
+- Add anchor block support to List Items. ([48758](https://github.com/WordPress/gutenberg/pull/48758))
+- Unset the rowStart and columnStart attributes when a block inside the Grid is removed from a manual layout. ([64186](https://github.com/WordPress/gutenberg/pull/64186))
+- Update Group block example. ([63114](https://github.com/WordPress/gutenberg/pull/63114))
+- Make SiteLogoReplaceFlow always available in the Site Logo block toolbar. ([63499](https://github.com/WordPress/gutenberg/pull/63499))
+- Make Query Loop settings more intuitive with a ToggleGroup and simplified help text. ([63739](https://github.com/WordPress/gutenberg/pull/63739))
+- Move gallery link controls to the block toolbar. ([62762](https://github.com/WordPress/gutenberg/pull/62762))
+- Hide loading when the overlay menu is selected. ([64262](https://github.com/WordPress/gutenberg/pull/64262))
+- Move the Site Logo tooltip to the middle right. ([64296](https://github.com/WordPress/gutenberg/pull/64296))
+- Prevent duplicate spacing on Tag Cloud block. ([63832](https://github.com/WordPress/gutenberg/pull/63832))
+- Fix 'can user edit' Template Part check. ([64137](https://github.com/WordPress/gutenberg/pull/64137))
+- Add clearfix in Post content. ([63690](https://github.com/WordPress/gutenberg/pull/63690))
+- Tweak Tag Cloud controls and description. ([64151](https://github.com/WordPress/gutenberg/pull/64151))
+- Tweak list block. ([64025](https://github.com/WordPress/gutenberg/pull/64025))
+- Update MediaUpload button for the site logo from "Add media" to "Choose logo". ([63498](https://github.com/WordPress/gutenberg/pull/63498))
+- Update help text for sticky control in Query loop. ([63999](https://github.com/WordPress/gutenberg/pull/63999))
+- Add border support to the following blocks:
+    - [Time To Read](https://github.com/WordPress/gutenberg/pull/63776)
+    - [Categories List](https://github.com/WordPress/gutenberg/pull/63950)
+    - [Post Date](https://github.com/WordPress/gutenberg/pull/64023)
+    - [Post Excerpt](https://github.com/WordPress/gutenberg/pull/64022)
+    - [Post Terms](https://github.com/WordPress/gutenberg/pull/64246)
+    - [Post Title](https://github.com/WordPress/gutenberg/pull/64024)
+    - [Site Tagline](https://github.com/WordPress/gutenberg/pull/63778)
+    - [Site Title](https://github.com/WordPress/gutenberg/pull/63631)
+    - [Table of contents](https://github.com/WordPress/gutenberg/pull/63578)
+
+#### Extensibility
+- Add an async `__unstablePreSavePost` hook; resolving with false prevents saving. ([58022](https://github.com/WordPress/gutenberg/pull/58022))
+- Enable heading level curation. ([63535](https://github.com/WordPress/gutenberg/pull/63535))
+- Addition of `levelOptions` attribute to control available heading levels in [Post Title](https://github.com/WordPress/gutenberg/pull/64106), [Query Title](https://github.com/WordPress/gutenberg/pull/64107), [Site Tagline](https://github.com/WordPress/gutenberg/pull/64113), [Site Title](https://github.com/WordPress/gutenberg/pull/64111), and [Comments Title](https://github.com/WordPress/gutenberg/pull/64103).
+
+#### Data Views
+- Be more clear with the copy of the "hide" action. ([63047](https://github.com/WordPress/gutenberg/pull/63047))
+- Graduate data view options out of a menu to allow more design expression. ([64175](https://github.com/WordPress/gutenberg/pull/64175))
+- Move filter UI into a toggle-able panel to improve experience on narrow viewports/containers. ([63203](https://github.com/WordPress/gutenberg/pull/63203))
+- Update field line-height across grid/list layouts. ([63945](https://github.com/WordPress/gutenberg/pull/63945))
+- Update template description in table layout. ([63942](https://github.com/WordPress/gutenberg/pull/63942))
+- De-emphasise bulk actions on Grid layout. ([64209](https://github.com/WordPress/gutenberg/pull/64209))
+- Update the copy of some of the strings on dataviews actions. ([64099](https://github.com/WordPress/gutenberg/pull/64099))
+
+##### Dataviews Extensibility
+
+- Allow unregistering of the following post actions: [permanently delete](https://github.com/WordPress/gutenberg/pull/64088), [restore post](https://github.com/WordPress/gutenberg/pull/64134), and [trash post](https://github.com/WordPress/gutenberg/pull/64087).
+
+#### Dataform
+
+- Add author to quick edit page/post list. ([63983](https://github.com/WordPress/gutenberg/pull/63983))
+- If a field of type `text` declare `elements`, render it as a `SelectControl` in `edit`. ([64251](https://github.com/WordPress/gutenberg/pull/64251))
+- Migrate order action modal and introduce form validation. ([63895](https://github.com/WordPress/gutenberg/pull/63895))
+
+
+
+#### Components
+- Add radius scale. ([64007](https://github.com/WordPress/gutenberg/pull/64007))
+- Support generic props type on CustomSelectControl. ([63985](https://github.com/WordPress/gutenberg/pull/63985))
+- Guide: Add __next40pxDefaultSize to buttons. ([64181](https://github.com/WordPress/gutenberg/pull/64181))
+- Image: Make Placeholder white when there is a <Spinner /> on top. ([63885](https://github.com/WordPress/gutenberg/pull/63885))
+- SelectControl: Infer `value` type from `options`. ([64069](https://github.com/WordPress/gutenberg/pull/64069))
+- SelectControl: Pass through `options` props. ([64211](https://github.com/WordPress/gutenberg/pull/64211))
+- TimeInput: Expose as subcomponent of TimePicker. ([63145](https://github.com/WordPress/gutenberg/pull/63145))
+- Update radius variables in components configuration. ([64133](https://github.com/WordPress/gutenberg/pull/64133))
+- `RadioControl`: Add support for option help text. ([63751](https://github.com/WordPress/gutenberg/pull/63751))
+
+#### Block Editor
+- Block Autocompleter: Force icon color to text color when item is selected. ([61376](https://github.com/WordPress/gutenberg/pull/61376))
+- Don't overlap canvas with inserter panel at large screens. ([64110](https://github.com/WordPress/gutenberg/pull/64110))
+- Format Library: Polish inline image format popover. ([64016](https://github.com/WordPress/gutenberg/pull/64016))
+- LineHeightControl: Hard deprecate bottom margin. ([64281](https://github.com/WordPress/gutenberg/pull/64281))
+- New useBlockElementRef hook for storing block element into a ref. ([63799](https://github.com/WordPress/gutenberg/pull/63799))
+- Improved tabbed sidebar styles. ([61974](https://github.com/WordPress/gutenberg/pull/61974))
+- URLInput: Hard deprecate bottom margin. ([64282](https://github.com/WordPress/gutenberg/pull/64282))
+
+#### Global Styles
+- Add a typesets section to Typography. ([62539](https://github.com/WordPress/gutenberg/pull/62539))
+- Add tooltips to the heading level selectors. ([64039](https://github.com/WordPress/gutenberg/pull/64039))
+- Background images: Ensure appropriate default values. ([64192](https://github.com/WordPress/gutenberg/pull/64192))
+- Create new public function to make it easier to expose style variations from other themes. ([63318](https://github.com/WordPress/gutenberg/pull/63318))
+- Style Book: Clearly denote heading levels. ([64038](https://github.com/WordPress/gutenberg/pull/64038))
+
+#### Design Tools
+- Column: Enable border radius support. ([63924](https://github.com/WordPress/gutenberg/pull/63924))
+- Comment Template: Add Border Block Support. ([64238](https://github.com/WordPress/gutenberg/pull/64238))
+- Post Comments Form: Add Border Block Support. ([64233](https://github.com/WordPress/gutenberg/pull/64233))
+
+#### Zoom Out
+- Add a control to enter and leave zoom out mode. ([63870](https://github.com/WordPress/gutenberg/pull/63870))
+- Improve zoom transition. ([64179](https://github.com/WordPress/gutenberg/pull/64179))
+
+#### Site Editor
+- Clarify that the site icon is a back button using an animation. ([63986](https://github.com/WordPress/gutenberg/pull/63986))
+- Site Icon: Add back filter effect to make it work for all kind of site icons. ([64172](https://github.com/WordPress/gutenberg/pull/64172))
+
+#### Post Editor
+- Tweak Create custom template modal. ([64255](https://github.com/WordPress/gutenberg/pull/64255))
+
+#### Icons
+- Add new "send" icon. ([64130](https://github.com/WordPress/gutenberg/pull/64130))
+
+#### Plugin
+- Bump minimum required WordPress version to 6.5. ([64126](https://github.com/WordPress/gutenberg/pull/64126))
+
+#### Font Library
+- Include a "Select All" options for google fonts. ([63893](https://github.com/WordPress/gutenberg/pull/63893))
+
+#### Block bindings
+- Allow bindings bootstrap after registration. ([63797](https://github.com/WordPress/gutenberg/pull/63797))
+
+#### Interactivity API
+- Refactor internal proxy and signals system. ([62734](https://github.com/WordPress/gutenberg/pull/62734))
+
+
+### New APIs
+
+- Make useStyleOverride public. ([63656](https://github.com/WordPress/gutenberg/pull/63656))
+
+
+### Bug Fixes
+
+- Core Data: Fix 'getEntityRecordPermissions' memoization. ([64091](https://github.com/WordPress/gutenberg/pull/64091))
+- Document bar: Fix long title with no spaces causing layout issue. ([64092](https://github.com/WordPress/gutenberg/pull/64092))
+- Fix density slider minus to be correct. ([64185](https://github.com/WordPress/gutenberg/pull/64185))
+- Fix: Deleting a pattern throws a notice saying undefined deleted. ([64301](https://github.com/WordPress/gutenberg/pull/64301))
+- Primitives: Add missing peer dependency. ([64218](https://github.com/WordPress/gutenberg/pull/64218))
+- Site Icon: Fix position in distraction free mode. ([64261](https://github.com/WordPress/gutenberg/pull/64261))
+
+#### Data Views
+- Add context to trash string. ([64249](https://github.com/WordPress/gutenberg/pull/64249))
+- Conditionally shows the description field in Template Grid layout. ([64043](https://github.com/WordPress/gutenberg/pull/64043))
+- Consider layout URL parameter when loading a default/custom view. ([64306](https://github.com/WordPress/gutenberg/pull/64306))
+- Display published date for pages/posts with published status. ([64049](https://github.com/WordPress/gutenberg/pull/64049))
+- Sort author by name + allow custom sort function. ([64064](https://github.com/WordPress/gutenberg/pull/64064))
+- Don't render action modal when there are no eligible items. ([64250](https://github.com/WordPress/gutenberg/pull/64250))
+- Pages: Update `useView` logic. ([63889](https://github.com/WordPress/gutenberg/pull/63889))
+- Update template preview dimensions in table layout. ([63938](https://github.com/WordPress/gutenberg/pull/63938))
+- Update template preview dimensions in table layout. ([63938](https://github.com/WordPress/gutenberg/pull/63938))
+
+#### Dataform
+
+- Fix SelectControl size and spacing. ([64324](https://github.com/WordPress/gutenberg/pull/64324))
+- Provide a better default for render when field has elements. ([64338](https://github.com/WordPress/gutenberg/pull/64338))
+
+#### Components
+- Autocompleter UI: Fix text color when hovering selected item. ([64294](https://github.com/WordPress/gutenberg/pull/64294))
+- BaseControl: change label's display: Block. ([63911](https://github.com/WordPress/gutenberg/pull/63911))
+- Button: Fix tertiary destructive hover style. ([64152](https://github.com/WordPress/gutenberg/pull/64152))
+- ColorPalette: Remove extra bottom margin when `CircularOptionPicker` is unneeded. ([63961](https://github.com/WordPress/gutenberg/pull/63961))
+- DropdownMenuV2: Break menu item help text on multiple lines for better truncation. ([63916](https://github.com/WordPress/gutenberg/pull/63916))
+- Fix modal dismissers in development mode. ([64132](https://github.com/WordPress/gutenberg/pull/64132))
+- Fix toggle help indentation. ([63903](https://github.com/WordPress/gutenberg/pull/63903))
+- Update the TextControl padding to match the rest of the controls. ([64326](https://github.com/WordPress/gutenberg/pull/64326))
+
+#### Global Styles
+- Fix block custom CSS pseudo element selectors. ([63980](https://github.com/WordPress/gutenberg/pull/63980))
+- Fix block library and global styles stylesheet ordering when a block style variation is active. ([63918](https://github.com/WordPress/gutenberg/pull/63918))
+- Style Book: Fix critical error when heading block is not registered. ([64047](https://github.com/WordPress/gutenberg/pull/64047))
+- TypesetButton: Check if variations exist before running logic. ([64139](https://github.com/WordPress/gutenberg/pull/64139))
+
+#### Site Editor
+- Centrally align entity in focused edit mode. ([64143](https://github.com/WordPress/gutenberg/pull/64143))
+- Don't trigger template ID resolution for multi-selected posts. ([64254](https://github.com/WordPress/gutenberg/pull/64254))
+- Long slugs breaking summary panel UI. ([64053](https://github.com/WordPress/gutenberg/pull/64053))
+
+#### Zoom Out
+- Keep top-level block selection if entering zoom out mode. ([64178](https://github.com/WordPress/gutenberg/pull/64178))
+- Use the block editor for insertion point data. ([63934](https://github.com/WordPress/gutenberg/pull/63934))
+
+#### Block Library
+- Fix a typo in use-image-sizes.js. ([64100](https://github.com/WordPress/gutenberg/pull/64100))
+- Template Part: Fix capability checks for inner blocks. ([64159](https://github.com/WordPress/gutenberg/pull/64159))
+- Update useTaxonomies hook to check for taxonomies for passed post type. ([64145](https://github.com/WordPress/gutenberg/pull/64145))
+
+#### Design Tools
+- Quote: Prevent block theme styles overriding global border and padding. ([64045](https://github.com/WordPress/gutenberg/pull/64045))
+- Spacing controls: Using CustomSelectControlV2 for >= 8 spacing sizes. ([64284](https://github.com/WordPress/gutenberg/pull/64284))
+
+#### Post Editor
+- Avoid errors for post types without a 'menu_icon'. ([64015](https://github.com/WordPress/gutenberg/pull/64015))
+- Post: Add a max length to the post password protected field. ([64156](https://github.com/WordPress/gutenberg/pull/64156))
+
+#### Grid layout
+- Fix grid resizer drag over embed. ([64098](https://github.com/WordPress/gutenberg/pull/64098))
+- Move resizer popover slot to fix display on mobile. ([63920](https://github.com/WordPress/gutenberg/pull/63920))
+
+#### Block Editor
+- Fix unexpected drag & rrop row/gallery creation logic. ([64241](https://github.com/WordPress/gutenberg/pull/64241))
+
+#### Icons
+- Remove hardcoded color from sidesAxial and sidesBottom icons. ([64174](https://github.com/WordPress/gutenberg/pull/64174))
+
+#### Document Settings
+- Display empty option when post author is missing. ([64165](https://github.com/WordPress/gutenberg/pull/64165))
+
+#### Patterns
+- Enable cross-browser support for pattern uploading. ([64123](https://github.com/WordPress/gutenberg/pull/64123))
+
+#### Commands
+- Fix 'Preferences' and 'Shortcuts' commands in StrictMode. ([64019](https://github.com/WordPress/gutenberg/pull/64019))
+
+#### Meta Boxes
+- Prevent popover from being hidden by metaboxes. ([63939](https://github.com/WordPress/gutenberg/pull/63939))
+
+#### Page Content Focus
+- TemplateContentPanel: Don't show content blocks that are in a Query Loop. ([63732](https://github.com/WordPress/gutenberg/pull/63732))
+
+#### Font Library
+- Fix item font family item height in the sidebar. ([63125](https://github.com/WordPress/gutenberg/pull/63125))
+
+#### Block API
+- Block categories - ensure that categories are unique by slug. ([62954](https://github.com/WordPress/gutenberg/pull/62954))
+
+
+### Accessibility
+
+- Restore focus style in dataviews grid view. ([64298](https://github.com/WordPress/gutenberg/pull/64298))
+- A11y text for site editor. ([62648](https://github.com/WordPress/gutenberg/pull/62648))
+- Accessibility issue of device preview options. ([63958](https://github.com/WordPress/gutenberg/pull/63958))
+
+#### Components
+- Improve the aria-disabled focus style of the Button. ([62480](https://github.com/WordPress/gutenberg/pull/62480))
+- Restore `describedBy` functionality on CustomSelectControl. ([63957](https://github.com/WordPress/gutenberg/pull/63957))
+
+#### Block Library
+- Fix unlabeled Spacer block controls. ([63806](https://github.com/WordPress/gutenberg/pull/63806))
+- Move Posts Per Page, Offset, and Pages controls from the block toolbar into Inspector Controls. ([58207](https://github.com/WordPress/gutenberg/pull/58207))
+
+#### Font Library
+-  Remove notice context and add message when fonts are updated. ([64030](https://github.com/WordPress/gutenberg/pull/64030))
+
+
+### Performance
+
+- Add User Timings for the Interactivity API. ([60522](https://github.com/WordPress/gutenberg/pull/60522))
+
+#### Data Views
+- Optimize the patterns dataviews by extracting the fields definition. ([63927](https://github.com/WordPress/gutenberg/pull/63927))
+
+#### Layout
+- Avoid iterating auto grid inner blocks unless mode specifically changed. ([64194](https://github.com/WordPress/gutenberg/pull/64194))
+
+#### Block bindings
+- Move logic to merge `usesContext` outside the reducer. ([63941](https://github.com/WordPress/gutenberg/pull/63941))
+
+
+### Experiments
+
+- Adds experimental blocks flag. ([64121](https://github.com/WordPress/gutenberg/pull/64121))
+
+#### DataForm
+- Support multiple layouts and introduce the panel layout. ([64299](https://github.com/WordPress/gutenberg/pull/64299))
+
+#### DataViews Extensibility
+- Add a hook to allow third-party scripts to register/unregister post type actions. ([64138](https://github.com/WordPress/gutenberg/pull/64138))
+
+#### Grid Interactivity
+- Fix block mover layout and styles. ([64021](https://github.com/WordPress/gutenberg/pull/64021))
+
+#### Block bindings
+- UI for connecting bindings. ([62880](https://github.com/WordPress/gutenberg/pull/62880))
+
+
+### Documentation
+
+- .wp-env.json schema: Fix schema and add unit tests. ([63281](https://github.com/WordPress/gutenberg/pull/63281))
+- Add WP Studio to list of tools in documentation. ([64327](https://github.com/WordPress/gutenberg/pull/64327))
+- Add documentation for some dynamically generated selectors in the core-data store. ([64269](https://github.com/WordPress/gutenberg/pull/64269))
+- Block Editor: Update 'getBlocksByName' JSDoc. ([63919](https://github.com/WordPress/gutenberg/pull/63919))
+- Components: Add missing `__nextHasNoMarginBottom` documentation. ([64313](https://github.com/WordPress/gutenberg/pull/64313))
+- Corrected @deprecated doc Order in Inline Documentation. ([64013](https://github.com/WordPress/gutenberg/pull/64013))
+- Add documentation for `render_block` and `register_block_type_args` to Block Filters. ([64118](https://github.com/WordPress/gutenberg/pull/64118))
+- Fix interactivity API documentation link. ([64060](https://github.com/WordPress/gutenberg/pull/64060))
+- Fix non working link to an interactivity API example block. ([64061](https://github.com/WordPress/gutenberg/pull/64061))
+- Fix WampServer links. ([64062](https://github.com/WordPress/gutenberg/pull/64062))
+- FormToggle, ToggleControl: Fix docgen in Storybook. ([64065](https://github.com/WordPress/gutenberg/pull/64065))
+- Provide a better example for the PluginSidebar slotfill. ([64206](https://github.com/WordPress/gutenberg/pull/64206))
+- Update data-core.md to use correct headings. ([64309](https://github.com/WordPress/gutenberg/pull/64309))
+
+
+### Code Quality
+
+- Add margin-bottom lint rules ([64212](https://github.com/WordPress/gutenberg/pull/64212)),([64213](https://github.com/WordPress/gutenberg/pull/64213)) and ([63960](https://github.com/WordPress/gutenberg/pull/63960))
+- Add new useEntityRecordsWithPermissions hook. ([63857](https://github.com/WordPress/gutenberg/pull/63857))
+- Fix deprecated sass usage. ([63990](https://github.com/WordPress/gutenberg/pull/63990))
+- Remove an unnecessary wrapper component. ([63989](https://github.com/WordPress/gutenberg/pull/63989))
+- Theme JSON: Update core theme json resolver class use to Gutenberg version. ([63981](https://github.com/WordPress/gutenberg/pull/63981))
+- Zoom out: Get store action outside the loop. ([63936](https://github.com/WordPress/gutenberg/pull/63936))
+- Remove Speak from device menu selection. ([64115](https://github.com/WordPress/gutenberg/pull/64115))
+
+#### Block Editor
+- BlockDraggable: Remove invalid aria-hidden attribute from button. ([64228](https://github.com/WordPress/gutenberg/pull/64228))
+- FontFamilyControl: Deprecate bottom margin. ([64280](https://github.com/WordPress/gutenberg/pull/64280))
+- Remove unnecessary/incorrect `unlock` call in `setEditorMode` action. ([64073](https://github.com/WordPress/gutenberg/pull/64073))
+
+#### Data Views
+- Formalize text field type definition. ([64168](https://github.com/WordPress/gutenberg/pull/64168))
+- Use items with permissions and avoid hooks to register actions. ([63923](https://github.com/WordPress/gutenberg/pull/63923))
+
+#### DataForm
+- Centralize edit logic in field type definitions. ([64171](https://github.com/WordPress/gutenberg/pull/64171))
+- Move validation logic to the field type definition. ([64164](https://github.com/WordPress/gutenberg/pull/64164))
+
+#### Global Styles
+- Background image: Remove toolspanel placeholder component. ([64242](https://github.com/WordPress/gutenberg/pull/64242))
+- Consolidate theme.json ref and URI resolution. ([64182](https://github.com/WordPress/gutenberg/pull/64182))
+
+#### Plugin
+- Remove compat layers for WP 6.4 and 6.5. ([64096](https://github.com/WordPress/gutenberg/pull/64096))
+- Remove leftover 'WP_Rest_Customizer_Nonces' controller. ([64221](https://github.com/WordPress/gutenberg/pull/64221))
+
+#### Site Editor
+- Use `structuredClone` for deep cloning. ([64203](https://github.com/WordPress/gutenberg/pull/64203))
+
+#### Block Library
+- Add stylelint rule to prevent usage of flex-direction reverse values. ([63081](https://github.com/WordPress/gutenberg/pull/63081))
+- Image Block Lightbox: Fix warning error when resizing. ([63995](https://github.com/WordPress/gutenberg/pull/63995))
+
+#### Icons
+- Fix invalid prop for `homeButton` icon. ([64191](https://github.com/WordPress/gutenberg/pull/64191))
+
+#### Post Editor
+- Remove resolvers hack for post actions. ([64094](https://github.com/WordPress/gutenberg/pull/64094))
+
+#### Components
+- Upgrade Ariakit. ([64066](https://github.com/WordPress/gutenberg/pull/64066))
+
+#### Page Content Focus
+- Fix the 'getBlocksByName' selector call. ([63922](https://github.com/WordPress/gutenberg/pull/63922))
+
+
+### Tools
+
+#### Testing
+- Components: Cleanup flaky unit test `sleep()` hacks. ([64205](https://github.com/WordPress/gutenberg/pull/64205))
+- Fix flaky DataViews list layout end-to-end tests. ([64244](https://github.com/WordPress/gutenberg/pull/64244))
+- Fix typo in 'Verify Core Backport Changelog' job title. ([64058](https://github.com/WordPress/gutenberg/pull/64058))
+- Improve `Button` matrix in visual regression test. ([64120](https://github.com/WordPress/gutenberg/pull/64120))
+- Improve theme.json test failure messages by pretty printing css for a more accurate diff. ([64077](https://github.com/WordPress/gutenberg/pull/64077))
+
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+- @Chrico: Block categories - ensure that categories are unique by slug. ([62954](https://github.com/WordPress/gutenberg/pull/62954))
+- @djcowan: Update api-reference.md. ([64325](https://github.com/WordPress/gutenberg/pull/64325))
+- @meteorlxy: CustomSelectControl: Support generic props type. ([63985](https://github.com/WordPress/gutenberg/pull/63985))
+- @Rishit30G: Add WP Studio to list of tools in documentation. ([64327](https://github.com/WordPress/gutenberg/pull/64327))
+- @wzieba:  ([64044](https://github.com/WordPress/gutenberg/pull/64044))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @adamsilverstein @afercia @akasunil @Aljullu @amitraj2203 @andrewserong @carolinan @cbravobernal @Chrico @ciampo @creativecoder @DaniGuardiola @DAreRodz @djcowan @ellatrix @jameskoster @jasmussen @jeryj @jorgefilipecosta @jsnajdr @kebbet @kmanijak @Mamaduka @matiasbenedetto @meteorlxy @mikachan @mirka @mtias @ndiego @noisysocks @oandregal @ramonjd @richtabor @Rishit30G @ryanwelcher @SantosGuillamot @scruffian @shail-mehta @simison @stokesman @t-hamano @talldan @tomdevisser @tomjn @tyxla @up1512001 @wzieba @youknowriad
+
+
+
+
+= 18.9.0 =
+
+## Changelog
+
+### Enhancements
+
+#### Block Library
+- Add Clear button for Overlay color option in Cover Block. ([63580](https://github.com/WordPress/gutenberg/pull/63580))
+- Embeds: Add 'Embed' to title for clarity. ([63371](https://github.com/WordPress/gutenberg/pull/63371))
+- Columns block: Fix block preview. ([63609](https://github.com/WordPress/gutenberg/pull/63609))
+- Gallery: Add border block support. ([63428](https://github.com/WordPress/gutenberg/pull/63428))
+- Image block: Show placeholder when uploading HEIC files. ([63643](https://github.com/WordPress/gutenberg/pull/63643))
+- Latest comments: Add color block support. ([63419](https://github.com/WordPress/gutenberg/pull/63419))
+- Media Text: Add border support. ([63542](https://github.com/WordPress/gutenberg/pull/63542))
+- Polish create template part modal. ([63617](https://github.com/WordPress/gutenberg/pull/63617))
+- Post Author blocks: Add example and preview. ([62978](https://github.com/WordPress/gutenberg/pull/62978))
+- Post date block: Add a block example. ([63368](https://github.com/WordPress/gutenberg/pull/63368))
+- Post featured image: Add example of the block. ([63011](https://github.com/WordPress/gutenberg/pull/63011))
+- Post terms block: Add an example. ([63369](https://github.com/WordPress/gutenberg/pull/63369))
+- Query Loop Block: Remove Posts List variation. ([63404](https://github.com/WordPress/gutenberg/pull/63404))
+- Query Loop block: Convert the post content type setting to a ToggleGroupControl if there are few items. ([63375](https://github.com/WordPress/gutenberg/pull/63375))
+- Query Loop: Change default query loop variations. ([63353](https://github.com/WordPress/gutenberg/pull/63353))
+- Set query loop to have the inherit value by default. ([63362](https://github.com/WordPress/gutenberg/pull/63362))
+- Social Links: Add border block support. ([63629](https://github.com/WordPress/gutenberg/pull/63629))
+- Social Links: Updated soundcloud icon for social link block. ([63504](https://github.com/WordPress/gutenberg/pull/63504))
+- Social Links: Update Facebook's color to match brand guidelines. ([60424](https://github.com/WordPress/gutenberg/pull/60424))
+- Term Description: Add border block support. ([63630](https://github.com/WordPress/gutenberg/pull/63630))
+
+#### Design Tools
+- Background Image: Make panel appear in a consistent location. ([63551](https://github.com/WordPress/gutenberg/pull/63551))
+- Buttons: Add border, color, and padding block supports. ([63538](https://github.com/WordPress/gutenberg/pull/63538))
+- Heading: Add border support. ([63539](https://github.com/WordPress/gutenberg/pull/63539))
+- Image: Adopt margin block support. ([63546](https://github.com/WordPress/gutenberg/pull/63546))
+- Paragraph: Add border support. ([63543](https://github.com/WordPress/gutenberg/pull/63543))
+- Quote: Add border support. ([63544](https://github.com/WordPress/gutenberg/pull/63544))
+- Quote: Add spacing supports. ([63545](https://github.com/WordPress/gutenberg/pull/63545))
+- Search: Add margin support. ([63547](https://github.com/WordPress/gutenberg/pull/63547))
+
+#### Data Views
+- DataViews: Allow column re-ordering. ([63416](https://github.com/WordPress/gutenberg/pull/63416))
+- DataViews: Update pagination icons. ([63594](https://github.com/WordPress/gutenberg/pull/63594))
+- DataViews: Rename the header property of fields to label. ([63843](https://github.com/WordPress/gutenberg/pull/63843))
+- DataViews: Support combined fields. ([63236](https://github.com/WordPress/gutenberg/pull/63236))
+- Dataviews List: Update item layout. ([63299](https://github.com/WordPress/gutenberg/pull/63299))
+- Increase column-gap between fields in List layout. ([63603](https://github.com/WordPress/gutenberg/pull/63603))
+- Update 'Front page' badge. ([63752](https://github.com/WordPress/gutenberg/pull/63752))
+- Update: Pages: Trash view should default to table layout try 2. ([63652](https://github.com/WordPress/gutenberg/pull/63652))
+- Update: Grid layout: Allow users to adjust grid density. ([63367](https://github.com/WordPress/gutenberg/pull/63367))
+- Update: Include avatars on list view. ([63309](https://github.com/WordPress/gutenberg/pull/63309))
+- Update: List / Table layout – selected item stroke should be tinted blue. ([63312](https://github.com/WordPress/gutenberg/pull/63312))
+- Update: Make changing order an action on the ellipsis menu. ([62189](https://github.com/WordPress/gutenberg/pull/62189))
+
+#### Global Styles
+- Add colors and typograpghy to the browse styles section. ([63173](https://github.com/WordPress/gutenberg/pull/63173))
+- Adding Font size presets UI. ([63057](https://github.com/WordPress/gutenberg/pull/63057))
+- Apply same styles to block previews on inserter and Global Styles. ([63177](https://github.com/WordPress/gutenberg/pull/63177))
+- Background: Add background attachment to top level styles. ([61382](https://github.com/WordPress/gutenberg/pull/61382))
+- Move background panel under color panel. ([63888](https://github.com/WordPress/gutenberg/pull/63888))
+
+#### Block Editor
+- Hide source filter in my patterns. ([63831](https://github.com/WordPress/gutenberg/pull/63831))
+- List View: Remove the sticky position icon tooltip. ([63850](https://github.com/WordPress/gutenberg/pull/63850))
+- Patterns: Render draggable only when enabled. ([63715](https://github.com/WordPress/gutenberg/pull/63715))
+
+#### Post Editor
+- Add post status icon in post summary. ([63658](https://github.com/WordPress/gutenberg/pull/63658))
+- Editor: Improve Header layout. ([62636](https://github.com/WordPress/gutenberg/pull/62636))
+- Post Actions: Use entity details for capability checks. ([63423](https://github.com/WordPress/gutenberg/pull/63423))
+
+#### Font Library
+- Group fonts by source. ([63211](https://github.com/WordPress/gutenberg/pull/63211))
+- Include a "Select All" options to activate/deactivate all fonts. ([63531](https://github.com/WordPress/gutenberg/pull/63531))
+- Reduce duplication of font library group headings. ([63532](https://github.com/WordPress/gutenberg/pull/63532))
+
+#### Zoom Out
+- Hide vertical toolbar when block is not full width. ([63650](https://github.com/WordPress/gutenberg/pull/63650))
+- Only show the inserters when a block is selected or hovered. ([63668](https://github.com/WordPress/gutenberg/pull/63668))
+
+#### Block Locking
+- Tweak Block Locking UI. ([63881](https://github.com/WordPress/gutenberg/pull/63881))
+
+#### General UI
+- Polish "Delete" modal. ([63392](https://github.com/WordPress/gutenberg/pull/63392))
+- Update close icon. ([63597](https://github.com/WordPress/gutenberg/pull/63597))
+- Site Editor: Reduce navigation sidebar width. ([63431](https://github.com/WordPress/gutenberg/pull/63431))
+
+#### Block bindings
+- Bootstrap sources defined in the server. ([63470](https://github.com/WordPress/gutenberg/pull/63470))
+
+#### Patterns
+- Limit pattern shuffling to theme and user patterns only. ([62677](https://github.com/WordPress/gutenberg/pull/62677))
+
+#### Components
+- CustomSelectControl V2 legacy adapter: Stabilize experimental props. ([63248](https://github.com/WordPress/gutenberg/pull/63248))
+- CustomSelectControl: Switch to ariakit-based implementation. ([63258](https://github.com/WordPress/gutenberg/pull/63258))
+- CustomSelectControlV2: Animate select popover appearance. ([63343](https://github.com/WordPress/gutenberg/pull/63343))
+- CustomSelectControlV2: Do not flip popover if legacy adapter. ([63357](https://github.com/WordPress/gutenberg/pull/63357))
+- DropdownMenuV2: Invert animation direction. ([63443](https://github.com/WordPress/gutenberg/pull/63443))
+- FontSizePicker: Tidy up internal logic. ([63553](https://github.com/WordPress/gutenberg/pull/63553))
+- FormTokenField: Deprecate bottom margin. ([63491](https://github.com/WordPress/gutenberg/pull/63491))
+- SelectControl: Add "minimal" variant. ([63265](https://github.com/WordPress/gutenberg/pull/63265))
+- Tabs: Hyphenate tab labels. ([63337](https://github.com/WordPress/gutenberg/pull/63337))
+- Tabs: Keep full opacity of focus ring on disabled tabs. ([63754](https://github.com/WordPress/gutenberg/pull/63754))
+- Update HeightControl component to label inputs. ([63761](https://github.com/WordPress/gutenberg/pull/63761))
+
+#### Core Data
+- Core Data: Mark 'canUser' related actions resolvers as resolved. ([63435](https://github.com/WordPress/gutenberg/pull/63435))
+- Core Data: Resolve user capabilities when fetching an entity. ([63430](https://github.com/WordPress/gutenberg/pull/63430))
+- Core Data: Support entities in the 'canUser' selector. ([63322](https://github.com/WordPress/gutenberg/pull/63322))
+- Core Data: Support entity queries in the 'useResourcePermissions' hook. ([63653](https://github.com/WordPress/gutenberg/pull/63653))
+
+#### JSON Schemas
+- Update JSON Schemas to Draft 7. ([63583](https://github.com/WordPress/gutenberg/pull/63583))
+
+### New APIs
+
+#### Block bindings
+- Unify `getValue`/`getValues` and `setValue`/`setValues` APIs. ([63185](https://github.com/WordPress/gutenberg/pull/63185))
+
+### Bug Fixes
+
+#### Data Views
+- DataViews: Do not render bulk actions Dropdown if no actions are available. ([63575](https://github.com/WordPress/gutenberg/pull/63575))
+- DataViews: Fix default layouts in the pages data views. ([63427](https://github.com/WordPress/gutenberg/pull/63427))
+- DataViews: Fix featured image height regression. ([63424](https://github.com/WordPress/gutenberg/pull/63424))
+- DataViews: Fix field rendering. ([63452](https://github.com/WordPress/gutenberg/pull/63452))
+- DataViews: Fix pattens list selection. ([63733](https://github.com/WordPress/gutenberg/pull/63733))
+- DataViews: Fix uncontrolled selection. ([63741](https://github.com/WordPress/gutenberg/pull/63741))
+- DataViews: Only show elligible actions in the bulk editing menu. ([63473](https://github.com/WordPress/gutenberg/pull/63473))
+- Fix patterns sorting by `title`. ([63710](https://github.com/WordPress/gutenberg/pull/63710))
+- Fix selected row styles in table layout. ([63811](https://github.com/WordPress/gutenberg/pull/63811))
+- Fix: DataViews: Layout resets for patterns each time a new pattern category is selected. ([63711](https://github.com/WordPress/gutenberg/pull/63711))
+- Fix: Inconsistent field spacing in Grid layout. ([63363](https://github.com/WordPress/gutenberg/pull/63363))
+- Templates DataViews: Set the right context for the preview field. ([63488](https://github.com/WordPress/gutenberg/pull/63488))
+- 
+#### Block Editor
+- Fix user patterns disabling sync filter. ([63828](https://github.com/WordPress/gutenberg/pull/63828))
+- ImageURLInputUI: Make onSetLightbox and resetLightbox optional. ([63573](https://github.com/WordPress/gutenberg/pull/63573))
+- Pattern Inserter: Fix pagination layout when "Show button text labels" enabled. ([63466](https://github.com/WordPress/gutenberg/pull/63466))
+- Patterns inserter tabs: Temporary disable animated indicator. ([63352](https://github.com/WordPress/gutenberg/pull/63352))
+- Prevent empty void at the bottom of editor when block directory results are present. ([63397](https://github.com/WordPress/gutenberg/pull/63397))
+- Remove double shadow on Inserter category panel when zoomed out. ([63516](https://github.com/WordPress/gutenberg/pull/63516))
+- Tabs: Vertical Tabs should be 40px min height. ([63446](https://github.com/WordPress/gutenberg/pull/63446))
+- Fix mobile styles for inserter pattern and media tab navigation. ([63451](https://github.com/WordPress/gutenberg/pull/63451))
+- useBlockElement: Return null until ref callback has time to clean up the old element. ([63565](https://github.com/WordPress/gutenberg/pull/63565))
+- Remove hint in the Settings tab. ([63515](https://github.com/WordPress/gutenberg/pull/63515))
+
+#### Block Library
+- Avoid stripping attributes via group block migration when no layout is specified. ([63837](https://github.com/WordPress/gutenberg/pull/63837))
+- Fix default unit issue for tag cloud block. ([59122](https://github.com/WordPress/gutenberg/pull/59122))
+- Footnotes: Register format within the init function. ([63554](https://github.com/WordPress/gutenberg/pull/63554))
+- Image lightbox: Remove duplicate image when lightbox is opened. ([63381](https://github.com/WordPress/gutenberg/pull/63381))
+- Query Loop: Fix 'block' scoped variations to get the `query` defaults. ([63477](https://github.com/WordPress/gutenberg/pull/63477))
+- Query Loop: Fix passing of `namespace` when selecting from suggested patterns. ([63402](https://github.com/WordPress/gutenberg/pull/63402))
+- Template Part: Add check if create action should be allowed. ([63623](https://github.com/WordPress/gutenberg/pull/63623))
+- Update Inherited Query Loop value from Template Settings changes. ([63358](https://github.com/WordPress/gutenberg/pull/63358))
+
+#### Site Editor
+- Fix: Error while Calling edit-site getCurrentTemplateTemplateParts selector. ([63818](https://github.com/WordPress/gutenberg/pull/63818))
+- Fix error when duplicating a template part. ([63663](https://github.com/WordPress/gutenberg/pull/63663))
+- Fix: Add Template Modal layout in mobile view. ([63627](https://github.com/WordPress/gutenberg/pull/63627))
+- Make hover block outlines not present in Distraction Free. ([63819](https://github.com/WordPress/gutenberg/pull/63819))
+- Site Editor Navigation Commands: Add permission check. ([63798](https://github.com/WordPress/gutenberg/pull/63798))
+- fix: Wp icon focus issue. ([62675](https://github.com/WordPress/gutenberg/pull/62675))
+
+#### Zoom Out
+- Don't automatically show inserter when zoom out mode initiates. ([63859](https://github.com/WordPress/gutenberg/pull/63859))
+- Ensure that we only enter zoom out mode if the experiment is enabled. ([63417](https://github.com/WordPress/gutenberg/pull/63417))
+- Fix crash due to absence of selected block. ([63642](https://github.com/WordPress/gutenberg/pull/63642))
+- Fix vertical toolbar position. ([63745](https://github.com/WordPress/gutenberg/pull/63745))
+- Translate toolbar delete button. ([63476](https://github.com/WordPress/gutenberg/pull/63476))
+
+#### Components
+- Button: Never apply `aria-disabled` to anchor. ([63376](https://github.com/WordPress/gutenberg/pull/63376))
+- Revert "Update HeightControl component to label inputs". ([63839](https://github.com/WordPress/gutenberg/pull/63839))
+- SelectControl: Fix hover/focus color in wp-admin. ([63855](https://github.com/WordPress/gutenberg/pull/63855))
+- ToggleGroupControl: Support `disabled` options. ([63450](https://github.com/WordPress/gutenberg/pull/63450))
+
+#### Global Styles
+- Disable "Reset styles" button when there are no changes. ([63562](https://github.com/WordPress/gutenberg/pull/63562))
+- Disallow scrolling the block preview. ([63558](https://github.com/WordPress/gutenberg/pull/63558))
+- Ensure root selector (body) is not wrapped in :root :Where(). ([63726](https://github.com/WordPress/gutenberg/pull/63726))
+- Global styles block previews: Fix scaling. ([63596](https://github.com/WordPress/gutenberg/pull/63596))
+- Style variations: Don't display the default if its the only variation. ([63555](https://github.com/WordPress/gutenberg/pull/63555))
+
+#### CSS & Styling
+- Comments: Allow button element shadows from theme.json. ([63790](https://github.com/WordPress/gutenberg/pull/63790))
+- List: Prevent style bleed into non-List block lists. ([63537](https://github.com/WordPress/gutenberg/pull/63537))
+- Search: Prevent override of global button radii in editor. ([63789](https://github.com/WordPress/gutenberg/pull/63789))
+
+#### Font Library
+- Add 'No fonts installed' message on library tab when fonts aren't available. ([63740](https://github.com/WordPress/gutenberg/pull/63740))
+- Improve 'No fonts installed' state when fonts are installed but not activated. ([63533](https://github.com/WordPress/gutenberg/pull/63533))
+
+#### Post Editor
+- Allow editing of description only for custom templates. ([63664](https://github.com/WordPress/gutenberg/pull/63664))
+
+#### Design Tools
+- Background image block support: Fix dropzone size. ([63588](https://github.com/WordPress/gutenberg/pull/63588))
+- Background tool: Fix double border. ([63559](https://github.com/WordPress/gutenberg/pull/63559))
+
+#### General interface
+- Discussions panel: Distinguish between verb and adjective form of open for internationalization. ([63791](https://github.com/WordPress/gutenberg/pull/63791))
+- Fix canvas issues by removing VisualEditor’s height. ([63724](https://github.com/WordPress/gutenberg/pull/63724))
+
+#### Block Transforms
+- Block Switcher Preview: Adjust the position and enable pattern list preview in mobile viewport. ([63512](https://github.com/WordPress/gutenberg/pull/63512))
+
+#### Block bindings
+- Revert triggering multi-entity save panel in post with meta changes. ([63412](https://github.com/WordPress/gutenberg/pull/63412))
+
+#### Block Directory
+- Memoize store selectors. ([63346](https://github.com/WordPress/gutenberg/pull/63346))
+
+#### Inner blocks
+- InnerBlocks: Make sure blockType is set before trying to use it. ([63351](https://github.com/WordPress/gutenberg/pull/63351))
+
+#### Widgets Editor
+- Widgets: Memoize 'getWidgets' store selector. ([63338](https://github.com/WordPress/gutenberg/pull/63338))
+
+#### Synced Patterns
+- Pattern overrides: Ensure "Reset" button always shows as last item and with border. ([63291](https://github.com/WordPress/gutenberg/pull/63291))
+
+#### Patterns
+- Fix: Removed shuffle button when only 1 pattern is present. ([63093](https://github.com/WordPress/gutenberg/pull/63093))
+
+#### Media
+- Lock post saving during image uploads. ([41120](https://github.com/WordPress/gutenberg/pull/41120))
+
+#### JSON Schemas
+- Prepare JSON schemas for Draft 7 update. ([63582](https://github.com/WordPress/gutenberg/pull/63582))
+
+#### Security
+- Add: Permission checks to avoid 403 errors on non admin roles. ([63296](https://github.com/WordPress/gutenberg/pull/63296))
+
+### Accessibility
+
+#### Components
+- Align checkbox, radio, and toggle input design. ([63490](https://github.com/WordPress/gutenberg/pull/63490))
+- Fix ComboboxControl reset button when using the keyboard. ([63410](https://github.com/WordPress/gutenberg/pull/63410))
+
+#### Post Editor
+- Add missing aria-haspopup attribute to the buttons to set and replace the featured image. ([63360](https://github.com/WordPress/gutenberg/pull/63360))
+
+#### Block Library
+- Show visual label for Categories block in dropdown mode. ([56364](https://github.com/WordPress/gutenberg/pull/56364))
+
+
+### Performance
+
+#### Components
+- Storybook: Improve TypeScript performance for slow stories. ([63388](https://github.com/WordPress/gutenberg/pull/63388))
+
+
+### Experiments
+
+#### Grid layout
+- Disable in-between inserter in Manual grids. ([63391](https://github.com/WordPress/gutenberg/pull/63391))
+- Don't display default appender inside Manual grid. ([63395](https://github.com/WordPress/gutenberg/pull/63395))
+- Fix responsive behaviour so both column start and column span are taken into account. ([63464](https://github.com/WordPress/gutenberg/pull/63464))
+- Better looking block movers. ([63394](https://github.com/WordPress/gutenberg/pull/63394))
+- Place new block after currently selected block when using slash inserter and splitting text. ([63333](https://github.com/WordPress/gutenberg/pull/63333))
+- Move visualizer popover to slot under the canvas. ([63389](https://github.com/WordPress/gutenberg/pull/63389))
+- Don't remount the block when rendering grid tools. ([63557](https://github.com/WordPress/gutenberg/pull/63557))
+
+#### Data Views
+- Quick Edit: Support bulk selection. ([63841](https://github.com/WordPress/gutenberg/pull/63841))
+- DataViews: Bootstrap Quick Edit. ([63600](https://github.com/WordPress/gutenberg/pull/63600))
+
+
+### Documentation
+
+- Add to code requirements install and import Interactivity API. ([63439](https://github.com/WordPress/gutenberg/pull/63439))
+- Alpine vs Preact extra explanations. ([63593](https://github.com/WordPress/gutenberg/pull/63593))
+- Backport docs: Update and format. ([63830](https://github.com/WordPress/gutenberg/pull/63830))
+- Create-block - fix - update default folder name to proper default. ([63530](https://github.com/WordPress/gutenberg/pull/63530))
+- DataForm: Add a simple story for the DataForm component. ([63840](https://github.com/WordPress/gutenberg/pull/63840))
+- Fix Typo in Interactivity Api Reference. ([63775](https://github.com/WordPress/gutenberg/pull/63775))
+- Fix typo in Autocomplete component README.md. ([63496](https://github.com/WordPress/gutenberg/pull/63496))
+- FontSizePicker: Fix documentation for default `units`. ([63577](https://github.com/WordPress/gutenberg/pull/63577))
+- Improve the base control help prop documentation. ([63693](https://github.com/WordPress/gutenberg/pull/63693))
+- JSON Schema Docgen Rework. ([63868](https://github.com/WordPress/gutenberg/pull/63868))
+- Mark unstable__bootstrapServerSideBlockDefinitions with @ignore. ([63673](https://github.com/WordPress/gutenberg/pull/63673))
+- Move entity-provider.js exports into hooks/index.ts so they are added to the documentation. ([63528](https://github.com/WordPress/gutenberg/pull/63528))
+- Small Typo in Experiment Page. ([63773](https://github.com/WordPress/gutenberg/pull/63773))
+- Storybook: Remove popover-related height buffers. ([63480](https://github.com/WordPress/gutenberg/pull/63480))
+- Update "Versions in WordPress" page. ([63869](https://github.com/WordPress/gutenberg/pull/63869))
+- Update dataviews documentation. ([63860](https://github.com/WordPress/gutenberg/pull/63860))
+- Update getContext() usage examples with namespace argument. ([63411](https://github.com/WordPress/gutenberg/pull/63411))
+- Update react reference links in developer documentation. ([62818](https://github.com/WordPress/gutenberg/pull/62818))
+- Update react reference links in package's readme and doc blocks. ([62704](https://github.com/WordPress/gutenberg/pull/62704))
+- Updated Useeffect URL. ([63494](https://github.com/WordPress/gutenberg/pull/63494))
+
+
+### Code Quality
+
+- Add margin-bottom lint rules for CheckboxControl, ComboboxControl, SearchControl. ([63679](https://github.com/WordPress/gutenberg/pull/63679))
+- Add margin-bottom lint rules for FocalPointPicker, TextareaControl, TreeSelect. ([63633](https://github.com/WordPress/gutenberg/pull/63633))
+- Add margin-bottom lint rules for RangeControl. ([63821](https://github.com/WordPress/gutenberg/pull/63821))
+- Block editor settings: Add missing global styles links dependencies. ([63823](https://github.com/WordPress/gutenberg/pull/63823))
+- Core Data: Remove leftover 'todo' comment. ([63842](https://github.com/WordPress/gutenberg/pull/63842))
+- Core Data: Use meta-store actions for resolution status. ([63469](https://github.com/WordPress/gutenberg/pull/63469))
+- core-data: Fix `canUser` allowed methods handling. ([63615](https://github.com/WordPress/gutenberg/pull/63615))
+- DataViews: Move PostList component to its own folder. ([63334](https://github.com/WordPress/gutenberg/pull/63334))
+- JSON Schema Reorganization and Fixes. ([63591](https://github.com/WordPress/gutenberg/pull/63591))
+- Update: Simplify and do not pass renderingMode on editor SidebarContent. ([63814](https://github.com/WordPress/gutenberg/pull/63814))
+- Use Base Focus Styles for Region Focus. ([62881](https://github.com/WordPress/gutenberg/pull/62881))
+- Use static 'key' when filtering BlockEdit components. ([63590](https://github.com/WordPress/gutenberg/pull/63590))
+- Update: Simplify some permission checks. ([63812](https://github.com/WordPress/gutenberg/pull/63812))
+- Use entity details when calling 'canUser' selectors. ([63415](https://github.com/WordPress/gutenberg/pull/63415))
+- HTML API: Backport updates from Core. ([63723](https://github.com/WordPress/gutenberg/pull/63723))
+
+#### Block Library
+- Image block: Remove unnecessary variables on expand on click implementation. ([63290](https://github.com/WordPress/gutenberg/pull/63290))
+- Image lightbox: Move image data from context to state. ([63348](https://github.com/WordPress/gutenberg/pull/63348))
+- Navigation Submenu: Remove user permission checks. ([63720](https://github.com/WordPress/gutenberg/pull/63720))
+- Query Title block: Rely on the editor store to apply the right archive title placeholder. ([63478](https://github.com/WordPress/gutenberg/pull/63478))
+- Remove unused useSplit after #54543. ([63826](https://github.com/WordPress/gutenberg/pull/63826))
+
+#### Data Views
+- DataViews: Cleanup preview styles. ([63365](https://github.com/WordPress/gutenberg/pull/63365))
+- DataViews: Move the layouts into a dedicated folder. ([63409](https://github.com/WordPress/gutenberg/pull/63409))
+- DataViews: Refactor to prepare exposing the underlying UI pieces. ([63694](https://github.com/WordPress/gutenberg/pull/63694))
+- DataViews: Remove redundant setSelection prop. ([63648](https://github.com/WordPress/gutenberg/pull/63648))
+- DataViews: Rename `onSelectionChange` to `onChangeSelection`. ([63087](https://github.com/WordPress/gutenberg/pull/63087))
+
+#### Components
+- ColorPicker: Use `minimal` variant for SelectControl. ([63676](https://github.com/WordPress/gutenberg/pull/63676))
+- Rename Button describedBy prop to description and deprecate old name. ([63486](https://github.com/WordPress/gutenberg/pull/63486))
+- Tabs: Move animation-related utilities into separate utils file. ([62946](https://github.com/WordPress/gutenberg/pull/62946))
+
+#### Block bindings
+- Don't provide default `canUserEditValue` in reducer. ([63628](https://github.com/WordPress/gutenberg/pull/63628))
+- Improve how the context needed by sources is extended in the editor. ([63513](https://github.com/WordPress/gutenberg/pull/63513))
+- Improve the way block bindings sources are registered. ([63117](https://github.com/WordPress/gutenberg/pull/63117))
+
+#### Post Editor
+- Editor: Remove unused `setNestedValue` util. ([63620](https://github.com/WordPress/gutenberg/pull/63620))
+- Move useSelectNearestEditableBlock out of src/hooks. ([63730](https://github.com/WordPress/gutenberg/pull/63730))
+
+#### Font Library
+- Remove unused font library experiment. ([63890](https://github.com/WordPress/gutenberg/pull/63890))
+
+#### Global Styles
+- Remove unused global styles background screen. ([63887](https://github.com/WordPress/gutenberg/pull/63887))
+
+#### Widgets Editor
+- Widget Editor: Remove unused values returned from 'mapSelect'. ([63738](https://github.com/WordPress/gutenberg/pull/63738))
+
+#### Block API
+- Use `@wordpress/warning` during block registration instead of `console.error` and `console.warn`. ([63610](https://github.com/WordPress/gutenberg/pull/63610))
+
+#### Synced Patterns
+- Quality: Remove "reusable block name hint" code. ([63514](https://github.com/WordPress/gutenberg/pull/63514))
+
+#### Commands
+- Update cmdk. ([63465](https://github.com/WordPress/gutenberg/pull/63465))
+
+#### Document Settings
+- FlatTermSelector: Be more defensive about termIds. ([63461](https://github.com/WordPress/gutenberg/pull/63461))
+
+#### Site Editor
+- Deprecate 'getCanUserCreateMedia' selector. ([63413](https://github.com/WordPress/gutenberg/pull/63413))
+
+#### Block Directory
+- Remove 'edit-post' package dependency. ([63349](https://github.com/WordPress/gutenberg/pull/63349))
+
+### Tools
+
+#### Project Management
+- Issue template: Use checkboxes instead of dropdown. ([63523](https://github.com/WordPress/gutenberg/pull/63523))
+- Sync backport changelog action: Use outputs instead of env. ([63792](https://github.com/WordPress/gutenberg/pull/63792))
+- Run sync when issue is labeled with Sync Backport Changelog. ([63793](https://github.com/WordPress/gutenberg/pull/63793))
+
+#### Testing
+- Downgrade node 22(.5) unit tests to 22.4. ([63728](https://github.com/WordPress/gutenberg/pull/63728))
+- Font Library: Fix flaky end-to-end tests. ([63904](https://github.com/WordPress/gutenberg/pull/63904))
+- Upgrade Playwright to v1.45. ([61443](https://github.com/WordPress/gutenberg/pull/61443))
+- Bug: Eslint `recommended-with-formatting` allows for unnecessary spaces. ([63549](https://github.com/WordPress/gutenberg/pull/63549))
+
+#### Build Tooling & Plugin
+- Fix broken license check script. ([61868](https://github.com/WordPress/gutenberg/pull/61868))
+- React: Restore umd builds. ([63602](https://github.com/WordPress/gutenberg/pull/63602))
+- Upgrade TypeScript to 5.5. ([63012](https://github.com/WordPress/gutenberg/pull/63012))
+- Scripts: Remove now-obsolete `getRenderPropPaths()`. ([63661](https://github.com/WordPress/gutenberg/pull/63661))
+- Scripts: Include variations paths in build. ([63098](https://github.com/WordPress/gutenberg/pull/63098))
+
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+- @hectorjarquin: Add to code requirements install and import Interactivity API. ([63439](https://github.com/WordPress/gutenberg/pull/63439))
+- @Sourav61: Fix: Removed shuffle button when only 1 pattern is present. ([63093](https://github.com/WordPress/gutenberg/pull/63093))
+- @tomllobet: Create-block - fix - update default folder name to proper default. ([63530](https://github.com/WordPress/gutenberg/pull/63530))
+- @troychaplin: change: Updated soundcloud icon for social link block. ([63504](https://github.com/WordPress/gutenberg/pull/63504))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @adamsilverstein @afercia @ajlende @akasunil @amitraj2203 @andrewserong @artemiomorales @barryceelen @carolinan @ciampo @DaniGuardiola @dhananjaykuber @dmsnell @dsas @ellatrix @geriux @hectorjarquin @jameskoster @jasmussen @jeherve @jeryj @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @luisherranz @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @mattsherman @mirka @noisysocks @ntsekouras @oandregal @ockham @priethor @ramonjd @richtabor @ryanwelcher @SantosGuillamot @scruffian @shail-mehta @sirreal @Sourav61 @stokesman @StyleShit @swissspidy @t-hamano @talldan @tellthemachines @tomllobet @troychaplin @tyxla @up1512001 @widoz @youknowriad
+
+
+= 18.8.0 =
+
+## Changelog
+
+### Features
+
+- DataForm: Implement first prototype using duplicate page action. ([63032](https://github.com/WordPress/gutenberg/pull/63032))
+
+
+### Enhancements
+
+#### Components
+- BaseControl: Forward ref on VisualLabel. ([63169](https://github.com/WordPress/gutenberg/pull/63169))
+- CustomSelectControlV2: Allow wrapping item hint to new line. ([62848](https://github.com/WordPress/gutenberg/pull/62848))
+- CustomSelectControlV2: Expose legacy wrapper through private APIs. ([62936](https://github.com/WordPress/gutenberg/pull/62936))
+- CustomSelectControl V2: Keep legacy arrow down behavior only for legacy wrapper. ([62919](https://github.com/WordPress/gutenberg/pull/62919))
+- CustomSelectControlV2: Collapse checkmark space when unchecked. ([63229](https://github.com/WordPress/gutenberg/pull/63229))
+- CustomSelectControlV2: Keep item checkmark top aligned. ([63230](https://github.com/WordPress/gutenberg/pull/63230))
+- DateTime: Create TimeInput component and integrate into TimePicker. ([60613](https://github.com/WordPress/gutenberg/pull/60613))
+- FontSizePicker: Use CustomSelectControl V2 legacy adapter. ([63134](https://github.com/WordPress/gutenberg/pull/63134))
+- Tabs: Add vertical indicator animation. ([62879](https://github.com/WordPress/gutenberg/pull/62879))
+- TimeInput: Add `label` prop. ([63106](https://github.com/WordPress/gutenberg/pull/63106))
+- TimePicker: Add `dateOrder` prop to sort day, month, and year. ([62481](https://github.com/WordPress/gutenberg/pull/62481))
+- ToolbarButton: Deprecate `isDisabled` prop and merge with `disabled`. ([63101](https://github.com/WordPress/gutenberg/pull/63101))
+- Tooltip Component: Add custom class name support. ([63157](https://github.com/WordPress/gutenberg/pull/63157))
+
+#### Data Views
+- Add padding around selected values in author filter. ([63212](https://github.com/WordPress/gutenberg/pull/63212))
+- DataViews filterSortAndPaginate utility: Support sorting by number. ([63187](https://github.com/WordPress/gutenberg/pull/63187))
+- DataViews: Make `view.hiddenFields` optional. ([62876](https://github.com/WordPress/gutenberg/pull/62876))
+- DataViews: Remove Table Cells animation. ([63079](https://github.com/WordPress/gutenberg/pull/63079))
+- DataViews: Replace supportedLayouts prop with defaultLayouts prop instead. ([63287](https://github.com/WordPress/gutenberg/pull/63287))
+- Duplicate modal: Move to 40px components. ([63246](https://github.com/WordPress/gutenberg/pull/63246))
+- Pages: Include avatar in Author field. ([63142](https://github.com/WordPress/gutenberg/pull/63142))
+- Patterns Page: Hide preview column by default. ([63213](https://github.com/WordPress/gutenberg/pull/63213))
+- Posts list powered by DataViews. ([62705](https://github.com/WordPress/gutenberg/pull/62705))
+- Split layout / view options. Use active layout icon for the layout button. ([63205](https://github.com/WordPress/gutenberg/pull/63205))
+- Use status icons in field display. ([63289](https://github.com/WordPress/gutenberg/pull/63289))
+
+#### Block Library
+- Add example for query block and posts list. ([63286](https://github.com/WordPress/gutenberg/pull/63286))
+- Excerpt block: Add example of the block. ([63010](https://github.com/WordPress/gutenberg/pull/63010))
+- Group: Add block support for shadow. ([63295](https://github.com/WordPress/gutenberg/pull/63295))
+- Login/out block: Add example of the block. ([62937](https://github.com/WordPress/gutenberg/pull/62937))
+- Post content block: Add example of the block. ([62968](https://github.com/WordPress/gutenberg/pull/62968))
+- Post title: Add example of the block. ([62955](https://github.com/WordPress/gutenberg/pull/62955))
+- Table Block: Add toolbar button to add a caption. ([47984](https://github.com/WordPress/gutenberg/pull/47984))
+
+#### Block Editor
+- Block position controls: Use V2 legacy adapter instead of V1 `CustomSelectControl`. ([63139](https://github.com/WordPress/gutenberg/pull/63139))
+- DateFormatPicker: Use CustomSelectControl V2 legacy adapter. ([63171](https://github.com/WordPress/gutenberg/pull/63171))
+- Fix inspector inner shadow border. ([63245](https://github.com/WordPress/gutenberg/pull/63245))
+- FontAppearanceControl: Use CustomSelectControl V2 legacy adapter. ([63179](https://github.com/WordPress/gutenberg/pull/63179))
+- Inserter: Remove the dialog behaviour. ([63059](https://github.com/WordPress/gutenberg/pull/63059))
+- SpacingInputControl: Use CustomSelectControl V2 legacy adapter. ([63190](https://github.com/WordPress/gutenberg/pull/63190))
+
+#### Global Styles
+- Background image: Move controls into a popover. ([60151](https://github.com/WordPress/gutenberg/pull/60151))
+- Block background UI controls. ([60100](https://github.com/WordPress/gutenberg/pull/60100))
+- Tweak block background position preview height. ([63225](https://github.com/WordPress/gutenberg/pull/63225))
+
+#### Extensibility
+- DataViews: Register the deletePost action like any third-party action. ([62913](https://github.com/WordPress/gutenberg/pull/62913))
+- DataViews: Register the export pattern action like any third-party action. ([63046](https://github.com/WordPress/gutenberg/pull/63046))
+- DataViews: Register the reset template and template part action like any third-party action. ([63017](https://github.com/WordPress/gutenberg/pull/63017))
+
+#### Design Tools
+- Flex dimensions: Rename "Fill" to "Grow". ([62779](https://github.com/WordPress/gutenberg/pull/62779))
+- List Item: Add color support. ([59892](https://github.com/WordPress/gutenberg/pull/59892))
+- Uniform Focal point labels. ([62438](https://github.com/WordPress/gutenberg/pull/62438))
+
+#### Font Library
+- Font Library Modal: Enhance pagination appearance. ([63210](https://github.com/WordPress/gutenberg/pull/63210))
+- Font Library: Store font subdirectory in post meta. ([63000](https://github.com/WordPress/gutenberg/pull/63000))
+- Move font directory into uploads to match WP 6.5. ([60354](https://github.com/WordPress/gutenberg/pull/60354))
+
+#### Layout
+- Add justification to block toolbar in addition to sidebar. ([62924](https://github.com/WordPress/gutenberg/pull/62924))
+
+#### Site Editor
+- Align rename modals. ([62874](https://github.com/WordPress/gutenberg/pull/62874))
+
+#### Block API
+- block.json: Allow passing filename as `variations` field. ([62092](https://github.com/WordPress/gutenberg/pull/62092))
+
+#### Template Editor
+- Update: Move template areas into a panel. ([62033](https://github.com/WordPress/gutenberg/pull/62033))
+
+#### Block Variations
+- Automatically select group variation if there is only one available. ([61871](https://github.com/WordPress/gutenberg/pull/61871))
+
+#### Zoom Out
+- Add a vertical toolbar for zoom out mode. ([60123](https://github.com/WordPress/gutenberg/pull/60123))
+
+
+### New APIs
+
+#### Block API
+- Introduce "local" attributes and use it for the image block. ([63076](https://github.com/WordPress/gutenberg/pull/63076))
+
+
+### Bug Fixes
+
+- Core Commands: Fix Pages command link. ([63235](https://github.com/WordPress/gutenberg/pull/63235))
+- Docgen: Fix function param for const function expression. ([63034](https://github.com/WordPress/gutenberg/pull/63034))
+- Enable `save draft` button for posts with custom post status. ([63293](https://github.com/WordPress/gutenberg/pull/63293))
+- Ensure device previews extra scrollbar only appears when needed. ([62952](https://github.com/WordPress/gutenberg/pull/62952))
+- Styles specificity: Allow comment form input overrides. ([62960](https://github.com/WordPress/gutenberg/pull/62960))
+
+#### Components
+- CustomSelectControl V2 legacy adapter: Fix trigger button font size. ([63131](https://github.com/WordPress/gutenberg/pull/63131))
+- CustomSelectControl V2: Fix labelling with a visually hidden label. ([63137](https://github.com/WordPress/gutenberg/pull/63137))
+- CustomSelectControl V2: Fix trigger text alignment in RTL languages. ([62869](https://github.com/WordPress/gutenberg/pull/62869))
+- CustomSelectControl V2: Prevent keyboard event propagation in legacy wrapper. ([62907](https://github.com/WordPress/gutenberg/pull/62907))
+- CustomSelectControlV2: Add root element wrapper. ([62803](https://github.com/WordPress/gutenberg/pull/62803))
+- CustomSelectControlV2: Fix item styles. ([62825](https://github.com/WordPress/gutenberg/pull/62825))
+- CustomSelectControlV2: Fix popover styles. ([62821](https://github.com/WordPress/gutenberg/pull/62821))
+- CustomSelectControlV2: Fix select popover content overflow. ([62844](https://github.com/WordPress/gutenberg/pull/62844))
+- CustomSelectControlV2: Tweak item inline padding based on size. ([62850](https://github.com/WordPress/gutenberg/pull/62850))
+- Editor: Fix duplicate save panels. ([62863](https://github.com/WordPress/gutenberg/pull/62863))
+- Fix UnitControl select disabled state colors. ([62970](https://github.com/WordPress/gutenberg/pull/62970))
+- Fix extra scrollbar when a popover extends past the viewport. ([62894](https://github.com/WordPress/gutenberg/pull/62894))
+- Fix the 'useUpdateEffect' hook in strict mode. ([62974](https://github.com/WordPress/gutenberg/pull/62974))
+- ProgressBar: Fix indeterminate RTL support. ([63129](https://github.com/WordPress/gutenberg/pull/63129))
+- RangeControl: Fix RTL support for custom marks. ([63198](https://github.com/WordPress/gutenberg/pull/63198))
+- SelectControl: Fix disabled styles. ([63266](https://github.com/WordPress/gutenberg/pull/63266))
+- Tabs: Fix "With tab icons" Storybook example. ([63297](https://github.com/WordPress/gutenberg/pull/63297))
+- Tabs: Fix text-align when text wraps in vertical mode. ([63272](https://github.com/WordPress/gutenberg/pull/63272))
+- TimePicker: Fix time zone overflow. ([63209](https://github.com/WordPress/gutenberg/pull/63209))
+- UnitControl: Fix an issue where keyboard shortcuts unintentionally shift focus on Windows OS. ([62988](https://github.com/WordPress/gutenberg/pull/62988))
+
+#### Block Library
+- Add Aspect ratio control on Image blocks in Grids. ([62891](https://github.com/WordPress/gutenberg/pull/62891))
+- Audio Block: Do not persist blob urls and fix undo. ([63257](https://github.com/WordPress/gutenberg/pull/63257))
+- File block: Do not persist blob urls and fix undo. ([63282](https://github.com/WordPress/gutenberg/pull/63282))
+- Fix Incorrect URL basename logic in EmbedPreview. ([63052](https://github.com/WordPress/gutenberg/pull/63052))
+- Fix: Update "Link Text" label to "Text" on Social Icons block #60966. ([61715](https://github.com/WordPress/gutenberg/pull/61715))
+- List: Maintain nested list on parent item removal. ([62949](https://github.com/WordPress/gutenberg/pull/62949))
+- Navigation: Allow themes to override block library text-decoration rule. ([63406](https://github.com/WordPress/gutenberg/pull/63406))
+- Patterns: Check for edited entity content property when exporting. ([63227](https://github.com/WordPress/gutenberg/pull/63227))
+- Reduce specificity of social link icon specific colors. ([63049](https://github.com/WordPress/gutenberg/pull/63049))
+- Refactor Post Date Relative Time Rendering for Future Dates. ([62979](https://github.com/WordPress/gutenberg/pull/62979))
+- Site Editor: Fix template parts 'Reset' action. ([62951](https://github.com/WordPress/gutenberg/pull/62951))
+- Video Block: Do not persist blob urls and fix undo. ([63238](https://github.com/WordPress/gutenberg/pull/63238))
+
+#### Post Editor
+- Editor: Do not truncate post excerpt if not editable. ([63314](https://github.com/WordPress/gutenberg/pull/63314))
+- Fix: Background height and padding in non-iframe editor canvas. ([63222](https://github.com/WordPress/gutenberg/pull/63222))
+- Fix: Crash when onActionPerformed is used with callback actions. ([63120](https://github.com/WordPress/gutenberg/pull/63120))
+- Fix: Permanently delete post action does not calls onActionPerformed. ([63121](https://github.com/WordPress/gutenberg/pull/63121))
+- Fix: Triple scrollbars in device previews. ([62940](https://github.com/WordPress/gutenberg/pull/62940))
+- Post editor: Increase specificity of bottom padding. ([63288](https://github.com/WordPress/gutenberg/pull/63288))
+- Actions: Translation should depend on number of items. ([62857](https://github.com/WordPress/gutenberg/pull/62857))
+
+#### Data Views
+- DataViews list layout: Fix action alignment. ([62971](https://github.com/WordPress/gutenberg/pull/62971))
+- DataViews: Restore preview focus outline in grid layout. ([62991](https://github.com/WordPress/gutenberg/pull/62991))
+- Fix buttonless table header alignment. ([62877](https://github.com/WordPress/gutenberg/pull/62877))
+- Fix typo in string for trashing posts. ([63119](https://github.com/WordPress/gutenberg/pull/63119))
+- Patterns: Avoid mapping template parts objects to patterns. ([62927](https://github.com/WordPress/gutenberg/pull/62927))
+
+#### Block Style Variations
+- Block supports: Ensure tools panel dropdown are visible on mobile. ([62896](https://github.com/WordPress/gutenberg/pull/62896))
+- Section Styles: Fix error when blocks are deregistered. ([63252](https://github.com/WordPress/gutenberg/pull/63252))
+- Section Styles: Prevent flash of variation styles in post editor. ([63071](https://github.com/WordPress/gutenberg/pull/63071))
+- Section Styles: Resolve ref values in variations data. ([63172](https://github.com/WordPress/gutenberg/pull/63172))
+
+#### Layout
+- Only hide drop indicator when grid has `isManualPlacement` set. ([63226](https://github.com/WordPress/gutenberg/pull/63226))
+- Remove dotted border from grid dropzone. ([63162](https://github.com/WordPress/gutenberg/pull/63162))
+- Resizing in Auto mode shouldn't add `columnStart` and `rowStart` values. ([63160](https://github.com/WordPress/gutenberg/pull/63160))
+- Fix invalid css for nested fullwidth layouts with zero padding applied. ([63436](https://github.com/WordPress/gutenberg/pull/63436))
+
+#### Global Styles
+- Elements: Avoid specificity bump for top-level element-only selectors. ([63403](https://github.com/WordPress/gutenberg/pull/63403))
+- Global styles revisions: Ensure that user-defined variation styles CSS is generated. ([62768](https://github.com/WordPress/gutenberg/pull/62768))
+- Root padding styles: Include alignwide in nested has-outer-padding logic. ([63207](https://github.com/WordPress/gutenberg/pull/63207))
+- Remove letter-spacing from typography element preview. ([60322](https://github.com/WordPress/gutenberg/pull/60322))
+- Only add customizer additional CSS to global styles in block themes. ([63331](https://github.com/WordPress/gutenberg/pull/63331))
+
+#### Site Editor
+- Make SiteHub available for Pages, Patterns, and Templates in mobile viewports. ([63118](https://github.com/WordPress/gutenberg/pull/63118))
+- Patterns and templates cannot be edited from sidebar mobile view. ([63002](https://github.com/WordPress/gutenberg/pull/63002))
+- Site Editor Sidebar: Hide horizontal scrollbar when navigating. ([63194](https://github.com/WordPress/gutenberg/pull/63194))
+
+#### Synced Patterns
+- Ensure disable overrides button is active for image blocks with captions or links. ([62948](https://github.com/WordPress/gutenberg/pull/62948))
+- Fix second scrollbar when editing patterns in the post editor. ([62909](https://github.com/WordPress/gutenberg/pull/62909))
+- Pattern overrides: Fix aspect ratio not working in image with overrides. ([62828](https://github.com/WordPress/gutenberg/pull/62828))
+
+#### Block Editor
+- Featured Image Panel: Align text and icons horizontally to avoid clipping. ([62842](https://github.com/WordPress/gutenberg/pull/62842))
+- Zoom Out: Move the hook to the inserter component. ([63315](https://github.com/WordPress/gutenberg/pull/63315))
+- Fix error when calling the PostActions `view-post` callback. ([63460](https://github.com/WordPress/gutenberg/pull/63460))
+
+#### Block bindings
+- Disable post meta editing in blocks inside a Query Loop. ([63237](https://github.com/WordPress/gutenberg/pull/63237))
+- Image block: Ensure extenders that rely on media ids in block html are supported by block bindings. ([63013](https://github.com/WordPress/gutenberg/pull/63013))
+
+#### Patterns
+- Fix: Restrict export pattern action to user patterns. ([63228](https://github.com/WordPress/gutenberg/pull/63228))
+
+#### Posts/Tags/Categories Screen
+- Constrain `is-fullscreen-mode` admin body class to posts list. ([63166](https://github.com/WordPress/gutenberg/pull/63166))
+
+#### Inspector Controls
+- Fix button wrapping in the document Inspector. ([63062](https://github.com/WordPress/gutenberg/pull/63062))
+
+#### Design Tools
+- Duotone: Fix code typo, to ensure Duotone updates correctly in Safari. ([62953](https://github.com/WordPress/gutenberg/pull/62953))
+
+#### Commands
+- Fix issue of HTML entities rendering in command menu. ([62606](https://github.com/WordPress/gutenberg/pull/62606))
+
+#### Typography
+- Use available font weights and styles in FontAppearanceControl. ([61915](https://github.com/WordPress/gutenberg/pull/61915))
+- Font Appearance Control: Refactor font appearance fallbacks. ([63215](https://github.com/WordPress/gutenberg/pull/63215))
+
+
+### Accessibility
+
+- Allow Escape key to move focus to editor region when in select mode. ([62196](https://github.com/WordPress/gutenberg/pull/62196))
+- Focus Editor Region from Template Footer Click. ([62595](https://github.com/WordPress/gutenberg/pull/62595))
+
+#### Components
+- Button: Stabilize `__experimentalIsFocusable` prop. ([62282](https://github.com/WordPress/gutenberg/pull/62282))
+- Fix inaccessible disabled `Button`s. ([62306](https://github.com/WordPress/gutenberg/pull/62306))
+- Make Tabs have a fluid height. ([62027](https://github.com/WordPress/gutenberg/pull/62027))
+- ToolbarButton: Always keep focusable when disabled. ([63102](https://github.com/WordPress/gutenberg/pull/63102))
+
+#### Global Styles
+- Fix unlabeled Remove shadow buttons. ([63197](https://github.com/WordPress/gutenberg/pull/63197))
+
+#### Block Library
+- Make usage of the settings icon more consistent. ([63020](https://github.com/WordPress/gutenberg/pull/63020))
+
+#### Data Views
+- Add translation context for 'view options' label. ([63031](https://github.com/WordPress/gutenberg/pull/63031))
+- Fix filter chip contrast. ([62865](https://github.com/WordPress/gutenberg/pull/62865))
+
+#### Media
+- Update URLPopover role and focus return. ([61313](https://github.com/WordPress/gutenberg/pull/61313))
+
+
+### Performance
+
+- Core data: Batch receiveUserPermission. ([63201](https://github.com/WordPress/gutenberg/pull/63201))
+- Perf tests: Make pages test compatible with base branch. ([63204](https://github.com/WordPress/gutenberg/pull/63204))
+
+#### Block hooks
+- Optimize selectors in the control component. ([63141](https://github.com/WordPress/gutenberg/pull/63141))
+
+
+### Experiments
+
+#### Layout
+- Allow inserting blocks directly in empty grid cells. ([63108](https://github.com/WordPress/gutenberg/pull/63108))
+- Use `manualPlacement` attribute to set manual grid mode and allow responsive behaviour in both modes. ([62777](https://github.com/WordPress/gutenberg/pull/62777))
+
+
+### Documentation
+
+- Add note about postcss-urlrebase package patch. ([63015](https://github.com/WordPress/gutenberg/pull/63015))
+- Add RichText formatting example to the Editor curation documentation. ([63065](https://github.com/WordPress/gutenberg/pull/63065))
+- Block supports: Add documentation for 'splitting'. ([63016](https://github.com/WordPress/gutenberg/pull/63016))
+- Fix typo to be preposition, not verb, in some package comments and documentations. ([62945](https://github.com/WordPress/gutenberg/pull/62945))
+- Fix urls to developer documentation. ([63104](https://github.com/WordPress/gutenberg/pull/63104))
+- Interactivity API: Fix minor typos in code snippets. ([62890](https://github.com/WordPress/gutenberg/pull/62890)), ([63234](https://github.com/WordPress/gutenberg/pull/63234))
+- Interactivity API: Fix variable name in color directive example. ([62912](https://github.com/WordPress/gutenberg/pull/62912))
+- Interactivity API: Include references to more examples from the documentation. ([63025](https://github.com/WordPress/gutenberg/pull/63025))
+- Interactivity API: Recommend kebab-case in data-wp-class. ([62817](https://github.com/WordPress/gutenberg/pull/62817))
+- Remove link to polyfill.io. ([62883](https://github.com/WordPress/gutenberg/pull/62883))
+- Storybook: Fix links for block editor examples. ([63132](https://github.com/WordPress/gutenberg/pull/63132))
+- ToolbarButton: Fix documentation for `accessibleWhenDisabled`. ([63140](https://github.com/WordPress/gutenberg/pull/63140))
+- Update React dev docs rule hook URL. ([62995](https://github.com/WordPress/gutenberg/pull/62995))
+
+
+### Code Quality
+
+- Add linguist-documentation attribute to docs/ directory. ([62651](https://github.com/WordPress/gutenberg/pull/62651))
+- Conditionally call focus with getEditorRegion. ([62980](https://github.com/WordPress/gutenberg/pull/62980))
+- Core Data: Remove entity configuration '__experimentalNoFetch' flag checks. ([63303](https://github.com/WordPress/gutenberg/pull/63303))
+- Dependencies: Upgrades and deduplication. ([62657](https://github.com/WordPress/gutenberg/pull/62657))
+- Format Library: Clean up 'Highlight' format components. ([62965](https://github.com/WordPress/gutenberg/pull/62965))
+- Remove postcss-local-keyframes from dependencies. ([63224](https://github.com/WordPress/gutenberg/pull/63224))
+- Upgrade postcss-urlrebase package. ([63075](https://github.com/WordPress/gutenberg/pull/63075))
+
+#### Data Views
+- DataViews: Fix double check in `isTemplateRemovable`. ([63021](https://github.com/WordPress/gutenberg/pull/63021))
+- DataViews: Remove the AnyItem type. ([62856](https://github.com/WordPress/gutenberg/pull/62856))
+- DataViews: Removing mapping of user patterns to temporary object. ([63042](https://github.com/WordPress/gutenberg/pull/63042))
+- DataViews: Replace hiddenFields configuration with fields property instead. ([63127](https://github.com/WordPress/gutenberg/pull/63127))
+- DataViews: Simplify selection setting. ([62846](https://github.com/WordPress/gutenberg/pull/62846))
+
+#### Block Editor
+- Remove CSS hack for Internet Explorer 11. ([63220](https://github.com/WordPress/gutenberg/pull/63220))
+- Remove duplicate translator comment. ([62860](https://github.com/WordPress/gutenberg/pull/62860))
+
+#### Components
+- Allow ariakit and framer motion imports in the components package. ([63123](https://github.com/WordPress/gutenberg/pull/63123))
+- Normalize focusable disabled ToolbarButton usage. ([63130](https://github.com/WordPress/gutenberg/pull/63130))
+- Sidebar: Add a shared component for the inserter and list view. ([62343](https://github.com/WordPress/gutenberg/pull/62343))
+- Tabs: Split animation logic into multiple separate composable utilities. ([62942](https://github.com/WordPress/gutenberg/pull/62942))
+
+#### Global Styles
+- Global Styles: Allow variations to be filtered by multiple properties. ([62847](https://github.com/WordPress/gutenberg/pull/62847))
+- Global Styles: Simplify code to fetch color and typography variation. ([62827](https://github.com/WordPress/gutenberg/pull/62827))
+- Make a shared component for typography and color preview. ([62829](https://github.com/WordPress/gutenberg/pull/62829))
+- Section Styles: Clean up block style variation filters. ([62858](https://github.com/WordPress/gutenberg/pull/62858))
+
+#### Block Library
+- Gallery Block: Clean up v1 code. ([63285](https://github.com/WordPress/gutenberg/pull/63285))
+
+#### Site Editor
+- Clean up unused Table component. ([63283](https://github.com/WordPress/gutenberg/pull/63283))
+
+#### Rich Text
+- Raw handling: Remove IE11 fallback code. ([63219](https://github.com/WordPress/gutenberg/pull/63219))
+
+#### Zoom Out
+- Replace deprecated selector. ([63144](https://github.com/WordPress/gutenberg/pull/63144))
+
+#### Block bindings
+- Add comment about `useSelect` usage in withBlockBindingSupport. ([63005](https://github.com/WordPress/gutenberg/pull/63005))
+
+#### HTML API
+- Compat: Update HTML API with changes from 6.6. ([63089](https://github.com/WordPress/gutenberg/pull/63089))
+
+
+### Tools
+
+- Dependency extraction: Map to `regenerator-runtime` instead of `wp-polyfill`. ([63091](https://github.com/WordPress/gutenberg/pull/63091))
+- Env: Remove version field from docker-compose configuration. ([63099](https://github.com/WordPress/gutenberg/pull/63099))
+- Eslint-plugin: Add method-signature-style TypeScript lint rule. ([62718](https://github.com/WordPress/gutenberg/pull/62718))
+- Scripts: Ensure that typescript-eslint checks for unused vars. ([62925](https://github.com/WordPress/gutenberg/pull/62925))
+- Update new release issue template to remove core editor chat item. ([62864](https://github.com/WordPress/gutenberg/pull/62864))
+
+#### Testing
+- Automatically sync backport changelog to issue. ([62973](https://github.com/WordPress/gutenberg/pull/62973))
+- Block styles variations E2E: Wait for Save button before editing global styles. ([62915](https://github.com/WordPress/gutenberg/pull/62915))
+- Cherry pick automation: Fix for forks. ([62900](https://github.com/WordPress/gutenberg/pull/62900))
+- Cherry pick workflow: Improve message after conflict. ([62826](https://github.com/WordPress/gutenberg/pull/62826))
+- DataViews: Add performance test for pages. ([63170](https://github.com/WordPress/gutenberg/pull/63170))
+- Fix typo in column block fixture file. ([63007](https://github.com/WordPress/gutenberg/pull/63007))
+- Performance tests: Fix for 6.5. ([62871](https://github.com/WordPress/gutenberg/pull/62871))
+- Performance tests: Restore 6.5-compatible locator. ([63041](https://github.com/WordPress/gutenberg/pull/63041))
+- Re-enable image block cropping test (#62781). ([62854](https://github.com/WordPress/gutenberg/pull/62854))
+- Update method for changing the content in 'editor-modes' end-to-end test. ([62957](https://github.com/WordPress/gutenberg/pull/62957))
+- Update the `project-management-automation`action to use Node.js 20. ([62851](https://github.com/WordPress/gutenberg/pull/62851))
+- Upgrade web-vitals package. ([63019](https://github.com/WordPress/gutenberg/pull/63019))
+
+#### Plugin
+- Add local version of wp-env schema to .wp-env.json. ([63253](https://github.com/WordPress/gutenberg/pull/63253))
+
+#### Build Tooling
+- Build: Enable TypeScript skipDefaultLibCheck. ([63056](https://github.com/WordPress/gutenberg/pull/63056))
+
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+- @airman5573: Fix variable name in color directive example for Interactivity API. ([62912](https://github.com/WordPress/gutenberg/pull/62912))
+- @aliaghdam: Tooltip Component: Add custom class name support. ([63157](https://github.com/WordPress/gutenberg/pull/63157))
+- @bogiii: DateTime: Create TimeInput component and integrate into TimePicker. ([60613](https://github.com/WordPress/gutenberg/pull/60613))
+- @Chrico: Scripts: Ensure that typescript-eslint checks for unused vars. ([62925](https://github.com/WordPress/gutenberg/pull/62925))
+- @dhananjaykuber: Fix Incorrect URL basename logic in EmbedPreview. ([63052](https://github.com/WordPress/gutenberg/pull/63052))
+- @iamibrahimriaz: Update iapi-about.md. ([63234](https://github.com/WordPress/gutenberg/pull/63234))
+- @iworks: Translation should depend on number of items. ([62857](https://github.com/WordPress/gutenberg/pull/62857))
+- @roygbyte: Fix typo to be preposition, not verb, in some package comments and documentations. ([62945](https://github.com/WordPress/gutenberg/pull/62945))
+- @shreya0204: Add justification to block toolbar in addition to sidebar. ([62924](https://github.com/WordPress/gutenberg/pull/62924))
+- @sejas: Fix: Error when calling the PostActions `view-post` callback. ([63460](https://github.com/WordPress/gutenberg/pull/63460))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @airman5573 @akasunil @aliaghdam @amitraj2203 @bogiii @carolinan @Chrico @ciampo @costasovo @creativecoder @DaniGuardiola @desrosj @dhananjaykuber @dmsnell @ellatrix @fluiddot @geriux @hbhalodia @iamibrahimriaz @iworks @jameskoster @jasmussen @jeryj @jffng @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @luisherranz @MaggieCabrera @Mamaduka @matiasbenedetto @michalczaplinski @mikachan @mirka @ndiego @ntsekouras @oandregal @ockham @peterwilsoncc @ramonjd @richtabor @roygbyte @SantosGuillamot @scruffian @shail-mehta @shreya0204 @sirreal @stokesman @swissspidy @t-hamano @talldan @tellthemachines @tyxla @vipul0425 @westonruter @youknowriad
+
+
+
+
+= 18.7.1 =
+
+
+## Changelog
+
+### Bug Fixes
+
+#### Block Library
+- Button Block: Add back compat for WP6.4 regarding HTML Tag Processor. ([63082](https://github.com/WordPress/gutenberg/pull/63082))
+
+
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@t-hamano
+
+
+= 18.7.0 =
+
+## Changelog
+
+### Enhancements
+
+- Add: Content panel for template parts. ([62034](https://github.com/WordPress/gutenberg/pull/62034))
+- Move Sticky toggle to status popover. ([62782](https://github.com/WordPress/gutenberg/pull/62782))
+- Rename yieldToMain to splitTask and export from @wordpress/interactivity. ([62665](https://github.com/WordPress/gutenberg/pull/62665))
+- Update: Check assignable properties on the duplicate action. ([62590](https://github.com/WordPress/gutenberg/pull/62590))
+- Update: Followups to the template and template_lock rest api addition. ([62696](https://github.com/WordPress/gutenberg/pull/62696))
+- Update: Reverse backport changes on post type REST API changes. ([62751](https://github.com/WordPress/gutenberg/pull/62751))
+- Align naming modals. ([62788](https://github.com/WordPress/gutenberg/pull/62788))y
+- Add writing mode support to other blocks. ([62727](https://github.com/WordPress/gutenberg/pull/62727))
+- Display the DocumentBar for Style Book and Style Revisions. ([62669](https://github.com/WordPress/gutenberg/pull/62669))
+- fetchLinkSuggestions: Allow for partial matching. ([62570](https://github.com/WordPress/gutenberg/pull/62570))
+- DataViews: Support passing the registry to actions callbacks. ([62505](https://github.com/WordPress/gutenberg/pull/62505))
+- Add tooltip on hover of color and typography presets. ([62201](https://github.com/WordPress/gutenberg/pull/62201))
+- Revert change that removes the social link block when pressing backspace in the URL Popover. ([61344](https://github.com/WordPress/gutenberg/pull/61344))
+
+
+### Bug Fixes
+
+- Add `context` in post actions API. ([62443](https://github.com/WordPress/gutenberg/pull/62443))
+- Add `html` to reset styles for the `.editor-styles-wrapper` container. ([62350](https://github.com/WordPress/gutenberg/pull/62350))
+- Cherry pick script: Make authenticated requests. ([62473](https://github.com/WordPress/gutenberg/pull/62473))
+- Editor: Fix blocked Post Publish Panel buttons on mobile. ([62736](https://github.com/WordPress/gutenberg/pull/62736))
+- Fix cherry-pick script, add missing --repo arg. ([62643](https://github.com/WordPress/gutenberg/pull/62643))
+- Fix rawHandling, pasteHandling for mixed content with blocks and classic. ([62545](https://github.com/WordPress/gutenberg/pull/62545))
+- Fix: Active template is not highlighted properly in list view. ([62811](https://github.com/WordPress/gutenberg/pull/62811))
+- Fix: Check Capability to create pages on DataViews add new page button. ([62592](https://github.com/WordPress/gutenberg/pull/62592))
+- Fix: Check ability to create patterns on the add new pattern modal. ([62633](https://github.com/WordPress/gutenberg/pull/62633))
+- Fix: Check create capability on duplicate post action. ([62620](https://github.com/WordPress/gutenberg/pull/62620))
+- Fix: Check permissions on duplicate pattern and template part actions. ([62757](https://github.com/WordPress/gutenberg/pull/62757))
+- Fix: Comments and Pingbacks get cleared out when a pattern is edited. ([62507](https://github.com/WordPress/gutenberg/pull/62507))
+- Fix: DataViews: Active page is not highlighted properly in list view. ([62378](https://github.com/WordPress/gutenberg/pull/62378))
+- Fix: Include permission management on permanently delete, rename, and restore. ([62754](https://github.com/WordPress/gutenberg/pull/62754))
+- Fix: List view renders an empty menu when no actions are eligible. ([62786](https://github.com/WordPress/gutenberg/pull/62786))
+- Fix: Post_type template is not used when creating a page in site editor. ([62488](https://github.com/WordPress/gutenberg/pull/62488))
+- Fix: Resetting template part causes notification saying it's been delete. ([62521](https://github.com/WordPress/gutenberg/pull/62521))
+- Fix: The trash post action doesn't take into account user capabilities. ([62589](https://github.com/WordPress/gutenberg/pull/62589))
+- Inspector: Improve handling of long words in post titles. ([62691](https://github.com/WordPress/gutenberg/pull/62691))
+- Revert "Revert test data for `WithSlug` variation (#62579)". ([62587](https://github.com/WordPress/gutenberg/pull/62587))
+- Show publish panel only in edit mode. ([62813](https://github.com/WordPress/gutenberg/pull/62813))
+- Site Editor: Improve the frame animation. ([62676](https://github.com/WordPress/gutenberg/pull/62676))
+- DataViews: Remove selection correcting, set initial state. ([62796](https://github.com/WordPress/gutenberg/pull/62796))
+- Pattern overrides: Disallow override for image with caption/href. ([62747](https://github.com/WordPress/gutenberg/pull/62747))
+- Editor: Make VisualEditor a stacking context. ([62681](https://github.com/WordPress/gutenberg/pull/62681))
+- Fix toggle active font logic. ([62614](https://github.com/WordPress/gutenberg/pull/62614))
+- Save Panel: Remove connections icon and fix padding. ([62542](https://github.com/WordPress/gutenberg/pull/62542))
+- Editor: Render editPost slots only in the post editor (same for site editor). ([62531](https://github.com/WordPress/gutenberg/pull/62531))
+- Fix: Don't allow synced patterns to be inserted on shuffling. ([62422](https://github.com/WordPress/gutenberg/pull/62422))
+- Fix ExcerptPanel decode issue. ([62336](https://github.com/WordPress/gutenberg/pull/62336))
+
+#### Block Library
+- Add letter spacing inheritance for the navigation block. ([62745](https://github.com/WordPress/gutenberg/pull/62745))
+- Caption utility component: Allow the main CSS Class Name to be excluded from the markup. ([62485](https://github.com/WordPress/gutenberg/pull/62485))
+- Fix: Empty style attribute issue in navigation block. ([62600](https://github.com/WordPress/gutenberg/pull/62600))
+- Image Block: Fix Aspect Ratio button position. ([62776](https://github.com/WordPress/gutenberg/pull/62776))
+- Media & text: Update the image replacement logic. ([62030](https://github.com/WordPress/gutenberg/pull/62030))
+- Post Date Block: Fix PHP warning error. ([62783](https://github.com/WordPress/gutenberg/pull/62783))
+- Template Part: Improve how the tag name attribute is handled. ([62785](https://github.com/WordPress/gutenberg/pull/62785))
+- fix: Update block category to design and build documentation. ([61905](https://github.com/WordPress/gutenberg/pull/61905))
+
+#### Global Styles
+- Allow children of alignfull flow layouts to have root padding. ([62670](https://github.com/WordPress/gutenberg/pull/62670))
+- Prevent duplicate block style variations CSS. ([62465](https://github.com/WordPress/gutenberg/pull/62465))
+- Remove obsolete hook resolving shared block style variations. ([62808](https://github.com/WordPress/gutenberg/pull/62808))
+- Section Styles: Switch away from using init for variation registration. ([62640](https://github.com/WordPress/gutenberg/pull/62640))
+- Skip registration of variation styles when unsupported. ([62529](https://github.com/WordPress/gutenberg/pull/62529))
+- Styles: Lower specificity of figcaption style to allow theme.json override. ([62689](https://github.com/WordPress/gutenberg/pull/62689))
+
+#### Components
+- CustomSelectControl V2: Fix setting initial value and reacting to external controlled updates. ([62733](https://github.com/WordPress/gutenberg/pull/62733))
+- CustomSelectControlV2: Handle long strings in selected value. ([62198](https://github.com/WordPress/gutenberg/pull/62198))
+
+#### Block Editor
+- Raw handling: Fix too aggressive indented list removal. ([62622](https://github.com/WordPress/gutenberg/pull/62622))
+- Writing flow: Split heading into default block. ([61891](https://github.com/WordPress/gutenberg/pull/61891))
+
+
+### Accessibility
+
+- Fix custom color palette. ([62753](https://github.com/WordPress/gutenberg/pull/62753))
+- Fix lock modal dialog accessibility and semantics. ([62795](https://github.com/WordPress/gutenberg/pull/62795))
+- Image block: Fix focus style not around whole image when linked. ([62556](https://github.com/WordPress/gutenberg/pull/62556))
+- Pages data view: Update view icons. ([62136](https://github.com/WordPress/gutenberg/pull/62136))
+- Make the fonts management modal dialog more discoverable. ([62129](https://github.com/WordPress/gutenberg/pull/62129))
+
+
+### Performance
+
+- Improve performance of `compute_style_properties` method. ([62522](https://github.com/WordPress/gutenberg/pull/62522))
+- Run block variation hook only for matches. ([62617](https://github.com/WordPress/gutenberg/pull/62617))
+- Section Styles: Improve performance and conceptual consistency. ([62712](https://github.com/WordPress/gutenberg/pull/62712))
+
+
+### Experiments
+
+- Grid interactivity: Allow blocks to be positioned in manual mode using drag and drop. ([61025](https://github.com/WordPress/gutenberg/pull/61025))
+
+
+### Documentation
+
+- Add `VisualEditorGlobalKeyboardShortcuts` documentation. ([62710](https://github.com/WordPress/gutenberg/pull/62710))
+- Add changelog entry for splitTask export from @wordpress/interactivity. ([62805](https://github.com/WordPress/gutenberg/pull/62805))
+- Add documentation for PostSlug and PostSlugCheck component. ([62102](https://github.com/WordPress/gutenberg/pull/62102))
+- Adds comment on blocks resource referencing wp_block post type. ([62722](https://github.com/WordPress/gutenberg/pull/62722))
+- Changelogs: Standardize sections. ([58268](https://github.com/WordPress/gutenberg/pull/58268))
+- Correct documentation for WP_Block_Parser_Frame class. ([62598](https://github.com/WordPress/gutenberg/pull/62598))
+- Create Block: Add missing changelog entries. ([62791](https://github.com/WordPress/gutenberg/pull/62791))
+- Docs/iAPI: Fix wrong code snippet in data-wp-run example. ([62835](https://github.com/WordPress/gutenberg/pull/62835))
+- Docs/iapi warnings new directives wp 6 6. ([62789](https://github.com/WordPress/gutenberg/pull/62789))
+- Fix async directives API documentation. ([62759](https://github.com/WordPress/gutenberg/pull/62759))
+- Fix: Remove inexistent link from the documentation. ([62624](https://github.com/WordPress/gutenberg/pull/62624))
+- Interactivity API docs: Add wp-async directives doc. ([62663](https://github.com/WordPress/gutenberg/pull/62663))
+- Query Loop block: Clarify explanation around query loop variation example. ([62605](https://github.com/WordPress/gutenberg/pull/62605))
+- Small Typo correction in block-library.md file. ([62765](https://github.com/WordPress/gutenberg/pull/62765))
+- Update link to API section in block-editor README.md. ([62671](https://github.com/WordPress/gutenberg/pull/62671))
+- Update old links in @wordpress/babel-preset-default. ([62616](https://github.com/WordPress/gutenberg/pull/62616))
+- Updates the reference links in @wordpress/compose documentation. ([62593](https://github.com/WordPress/gutenberg/pull/62593))
+- [Developer Documentation] fix link URL. ([62725](https://github.com/WordPress/gutenberg/pull/62725))
+
+
+### Code Quality
+
+- Autoformat changelogs. ([62650](https://github.com/WordPress/gutenberg/pull/62650))
+- Autoformat e2e-tests package JavaScript. ([62572](https://github.com/WordPress/gutenberg/pull/62572))
+- Edit site: Do not autoformat edit-site/lib. ([62573](https://github.com/WordPress/gutenberg/pull/62573))
+- Move dep to dev deps. ([62673](https://github.com/WordPress/gutenberg/pull/62673))
+- Rename readme file with uppercase extension. ([62697](https://github.com/WordPress/gutenberg/pull/62697))
+- Site Editor: Don't render empty body tag. ([62769](https://github.com/WordPress/gutenberg/pull/62769))
+- Change `grid-visualizer` folder name to `grid`. ([62810](https://github.com/WordPress/gutenberg/pull/62810))
+- Add lib-font credits and license in source code. ([60973](https://github.com/WordPress/gutenberg/pull/60973))
+
+#### Components
+- Remove Framer Motion from `DropZone`. ([62044](https://github.com/WordPress/gutenberg/pull/62044))
+- `CustomSelectControlV2`: Fix handling of extra attributes passed to `options` in the legacy adapter. ([62255](https://github.com/WordPress/gutenberg/pull/62255))
+
+
+### Tools
+
+- Dependencies: Upgrade @octokit/webhooks. ([62666](https://github.com/WordPress/gutenberg/pull/62666))
+- Rename the wp-env schema to not be a dotfile. ([62634](https://github.com/WordPress/gutenberg/pull/62634))
+- env: Ignore `\$schema` key in environment configuration parsing. ([62626](https://github.com/WordPress/gutenberg/pull/62626))
+
+#### Testing
+- Add end-to-end test to ensure block bindings work well with symbols and numbers. ([62410](https://github.com/WordPress/gutenberg/pull/62410))
+- CustomSelectControl: Align v1 and legacy v2 unit tests. ([62706](https://github.com/WordPress/gutenberg/pull/62706))
+- Fix end-to-end tests in dev mode. ([62642](https://github.com/WordPress/gutenberg/pull/62642))
+- Improve maintainability of theme json class tests. ([62463](https://github.com/WordPress/gutenberg/pull/62463))
+- Release automation: Try cherry-picking automation. ([62716](https://github.com/WordPress/gutenberg/pull/62716))
+- Remove changelog checks for branches other than trunk. ([62645](https://github.com/WordPress/gutenberg/pull/62645))
+- Skip failing image block test. ([62781](https://github.com/WordPress/gutenberg/pull/62781))
+- Skip test: Create a new page, edit template and toggle page template preview. ([62799](https://github.com/WordPress/gutenberg/pull/62799))
+- Tests: Simplify test set up in `WP_Block_Supports_Block_Style_Variations_Test`. ([62637](https://github.com/WordPress/gutenberg/pull/62637))
+- Theme JSON resolver: Read theme.json files from the styles/ folder only once. ([62638](https://github.com/WordPress/gutenberg/pull/62638))
+
+#### Build Tooling
+- Generic name for previous version of WP tests. ([62853](https://github.com/WordPress/gutenberg/pull/62853))
+- Github PHP changes workflow: Remove it. ([62609](https://github.com/WordPress/gutenberg/pull/62609))
+
+
+### Various
+
+- Update Private API opt-in string for WP 6.6. ([62635](https://github.com/WordPress/gutenberg/pull/62635))
+- Update caniuse-lite dependency to latest version. ([62611](https://github.com/WordPress/gutenberg/pull/62611))
+
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+- @aatanasovdev: Caption utility component: Allow the main CSS Class Name to be excluded from the markup. ([62485](https://github.com/WordPress/gutenberg/pull/62485))
+- @dilipbheda: Correct documentation for WP_Block_Parser_Frame class. ([62598](https://github.com/WordPress/gutenberg/pull/62598))
+- @graylaurenm: Add letter spacing inheritance for the navigation block. ([62745](https://github.com/WordPress/gutenberg/pull/62745))
+- @ivan-ottinger: Editor: Fix blocked Post Publish Panel buttons on mobile. ([62736](https://github.com/WordPress/gutenberg/pull/62736))
+- @michakrapp: [Developer Documentation] fix link URL. ([62725](https://github.com/WordPress/gutenberg/pull/62725))
+- @saulyz: Fix rawHandling, pasteHandling for mixed content with blocks and classic. ([62545](https://github.com/WordPress/gutenberg/pull/62545))
+- @snehapatil2001: fix: Update block category to design and build documentation. ([61905](https://github.com/WordPress/gutenberg/pull/61905))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @aatanasovdev @afercia @ajlende @akasunil @amitraj2203 @artemiomorales @carolinan @cbravobernal @ciampo @creativecoder @DaniGuardiola @dilipbheda @ellatrix @fullofcaffeine @geriux @graylaurenm @gziolo @itzmekhokan @ivan-ottinger @jameskoster @jorgefilipecosta @juanmaguitar @kevin940726 @luisherranz @MaggieCabrera @matiasbenedetto @michakrapp @mirka @noisysocks @ntsekouras @oandregal @peterwilsoncc @ramonjd @sabernhardt @SantosGuillamot @saulyz @shail-mehta @sirreal @snehapatil2001 @spacedmonkey @stokesman @t-hamano @talldan @tellthemachines @up1512001 @vcanales @vipul0425 @westonruter @youknowriad
+
+
+
+
+= 18.6.1 =
+
+
+## Changelog
+
+### Bug Fixes
+
+#### Block Library
+- Navigation block: Fix submenu not opening on macOS Safari. ([62800](https://github.com/WordPress/gutenberg/pull/62800))
+
+### Code Quality
+- Template Part: Improve how the tag name attribute is handled (#62785)(https://github.com/WordPress/gutenberg/pull/62785)
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@luisherranz @aaronjorbin @gziolo @westonruter @cbravobernal 
+
+
+= 18.6.0 =
+
+## Changelog
+
+### Enhancements
+
+#### Design Tools
+
+-   Post content block: Add background image and padding support. ([62499](https://github.com/WordPress/gutenberg/pull/62499))
+-   Quote blocks: Add background image and minimum height support. ([62497](https://github.com/WordPress/gutenberg/pull/62497))
+-   Verse block: Add background image and minimum height support. ([62498](https://github.com/WordPress/gutenberg/pull/62498))
+
+#### Block Library
+
+-   Post Date & Comment Date: Add relative date format. ([62298](https://github.com/WordPress/gutenberg/pull/62298))
+-   Replace "Add new post" link text with more meaningful Label (v2). ([62277](https://github.com/WordPress/gutenberg/pull/62277))
+
+#### Block Editor
+
+-   LinkControl: Refined the display of the link preview title and URL when both are same. ([61819](https://github.com/WordPress/gutenberg/pull/61819))
+-   Update URL to uppercase. ([62231](https://github.com/WordPress/gutenberg/pull/62231))
+
+#### Block bindings
+
+-   Change bindings panel title, add description. ([62489](https://github.com/WordPress/gutenberg/pull/62489))
+
+#### Site Editor
+
+-   Template inspector: Small visual adjustments. ([62537](https://github.com/WordPress/gutenberg/pull/62537))
+-   Unify DataViews Header Title & Subtitle. ([62429](https://github.com/WordPress/gutenberg/pull/62429))
+
+#### Document Settings
+
+-   FlatTermSelector: Update the term suggestion limit. ([62359](https://github.com/WordPress/gutenberg/pull/62359))
+
+#### Global Styles
+
+-   Update custom CSS handling to be consistent with block global styles. ([62357](https://github.com/WordPress/gutenberg/pull/62357))
+
+#### Post Editor
+
+-   Try: Re-enable React StrictMode. ([61943](https://github.com/WordPress/gutenberg/pull/61943))
+
+### New APIs
+
+#### Extensibility
+
+-   DataViews: Bootstrap Actions Extensibility API. ([62052](https://github.com/WordPress/gutenberg/pull/62052))
+
+### Bug Fixes
+
+-   Core Data: Fix errors when the entities list doesn't contain configuration key. ([62346](https://github.com/WordPress/gutenberg/pull/62346))
+-   Data Views: Bulk toolbar covering other clickable elements. ([62333](https://github.com/WordPress/gutenberg/pull/62333))
+-   Fix: Omit default parameters from pages, template parts, and patterns. ([62372](https://github.com/WordPress/gutenberg/pull/62372))
+-   Fix: Show homepage link on frontpage instead of the slug. ([62279](https://github.com/WordPress/gutenberg/pull/62279))
+-   Fix: Unquoted file argument in declaration check script. ([62482](https://github.com/WordPress/gutenberg/pull/62482))
+-   List: Fix pasting. ([62428](https://github.com/WordPress/gutenberg/pull/62428))
+-   MediaUpload: Remove dialog markup on close. ([62168](https://github.com/WordPress/gutenberg/pull/62168))
+-   Revert CSS removal for interface footer breadcrumbs. ([62309](https://github.com/WordPress/gutenberg/pull/62309))
+-   Revert test data for `WithSlug` variation. ([62579](https://github.com/WordPress/gutenberg/pull/62579))
+-   Scripts: Pin the @wordpress/scripts version to a version supported by 6.5. ([62234](https://github.com/WordPress/gutenberg/pull/62234))
+-   Site Editor Hub: Simplify. ([61579](https://github.com/WordPress/gutenberg/pull/61579))
+-   Style Book: Allow activation when the canvas mode is "view". ([62212](https://github.com/WordPress/gutenberg/pull/62212))
+-   Top toolbar: Fix half a pixel artifacting of the bottom border. ([62225](https://github.com/WordPress/gutenberg/pull/62225))
+-   Try: Contextual frame bg color to avoid artifacting. ([62223](https://github.com/WordPress/gutenberg/pull/62223))
+-   Try: Fix mover positioning. ([62226](https://github.com/WordPress/gutenberg/pull/62226))
+-   Update instances of text-wrap: Pretty to fall back to balance. ([62233](https://github.com/WordPress/gutenberg/pull/62233))
+
+#### Global Styles
+
+-   Add `default-spacing-sizes` and `default-font-sizes` options for classic themes. ([62252](https://github.com/WordPress/gutenberg/pull/62252))
+-   Add custom CSS for block style variations. ([62526](https://github.com/WordPress/gutenberg/pull/62526))
+-   Color Variations: Use Grid rather than VStack. ([62445](https://github.com/WordPress/gutenberg/pull/62445))
+-   Don't apply the background and text colors to typography previews. ([62578](https://github.com/WordPress/gutenberg/pull/62578))
+-   Fix UI appearing on blocks that don't support text alignment. ([62376](https://github.com/WordPress/gutenberg/pull/62376))
+-   Fix UI order for theme.json spacing sizes. ([62199](https://github.com/WordPress/gutenberg/pull/62199))
+-   Fix registration of theme style variation defined block styles. ([62495](https://github.com/WordPress/gutenberg/pull/62495))
+-   Only use single property variations as color/type presets. ([62469](https://github.com/WordPress/gutenberg/pull/62469))
+-   Section Styles: Register block style variations on `init`. ([62461](https://github.com/WordPress/gutenberg/pull/62461))
+-   Section styles: Consolidate variation name. ([62550](https://github.com/WordPress/gutenberg/pull/62550))
+-   Section styles: Support i18n for variations declared in `theme.json` or theme style variations. ([62552](https://github.com/WordPress/gutenberg/pull/62552))
+-   Sort spacing sizes when all slugs begin numerically. ([62567](https://github.com/WordPress/gutenberg/pull/62567))
+
+#### Site Editor
+
+-   Change `Site Editor` to `Edit site`. ([62501](https://github.com/WordPress/gutenberg/pull/62501))
+-   Fix "insert before/after" not showing for blocks in site editor. ([62530](https://github.com/WordPress/gutenberg/pull/62530))
+-   Site Export: Ensure that the export endpoint uses Gutenberg theme classes. ([61561](https://github.com/WordPress/gutenberg/pull/61561))
+-   Update old document URLs to new ones. ([62206](https://github.com/WordPress/gutenberg/pull/62206))
+-   Update sidebar title + icon + site title alignment. ([62191](https://github.com/WordPress/gutenberg/pull/62191))
+
+#### Block Editor
+
+-   Inserter: Allow focus to move to the toggle when opening the inserter. ([62513](https://github.com/WordPress/gutenberg/pull/62513))
+-   Inserter: Return the same items when the state and parameters don't change. ([62263](https://github.com/WordPress/gutenberg/pull/62263))
+-   Remove 'rootClientId' argument for block lock selectors. ([62547](https://github.com/WordPress/gutenberg/pull/62547))
+-   Update fetchLinkSuggestions to sort results by relevancy. ([62397](https://github.com/WordPress/gutenberg/pull/62397))
+
+#### Block Library
+
+-   Fixed Media Text Block Issue : When crop image to fill is enabled, the image in nested media & text blocks does not show. ([62182](https://github.com/WordPress/gutenberg/pull/62182))
+-   Media & Text block: Fix nested Media & Text block media position issue with increased CSS specificity. ([62184](https://github.com/WordPress/gutenberg/pull/62184))
+-   Query: Adjust the position of sticky search field in Patterns modal. ([62370](https://github.com/WordPress/gutenberg/pull/62370))
+
+#### Post Editor
+
+-   Editor: Avoid remounts of `DocumentBar`. ([62214](https://github.com/WordPress/gutenberg/pull/62214))
+-   Editor: Make revisions more prominent. ([62323](https://github.com/WordPress/gutenberg/pull/62323))
+-   Editor: Refine availability of rename post action. ([62248](https://github.com/WordPress/gutenberg/pull/62248))
+-   Fix move `CONTENT_ONLY_BLOCKS` into component body to ensure the `editor.postContentBlockTypes` filter gets called whenever the values are used. ([62292](https://github.com/WordPress/gutenberg/pull/62292))
+
+#### Components
+
+-   Ensure that openref is defined before accessing to .current. ([62508](https://github.com/WordPress/gutenberg/pull/62508))
+-   Fix: Update styles for checkbox and radio controls. ([61696](https://github.com/WordPress/gutenberg/pull/61696))
+-   Tabs: Prevent accidental overflow in indicator. ([61979](https://github.com/WordPress/gutenberg/pull/61979))
+
+#### List View
+
+-   Fix home and end key behaviour in very long lists. ([62312](https://github.com/WordPress/gutenberg/pull/62312))
+-   Respect default shortcuts in modals. ([62479](https://github.com/WordPress/gutenberg/pull/62479))
+-   Show context menu for content-only blocks in posts. ([62354](https://github.com/WordPress/gutenberg/pull/62354))
+
+#### Block bindings
+
+-   Fix applying bindings or pattern overrides to button blocks with empty text. ([62220](https://github.com/WordPress/gutenberg/pull/62220))
+-   Fix site editor breaking when user selects bound and non-bound blocks at the same time. ([62268](https://github.com/WordPress/gutenberg/pull/62268))
+-   Revert changes to bindings replacement logic to not use regex. ([62355](https://github.com/WordPress/gutenberg/pull/62355))
+
+#### Synced Patterns
+
+-   Block Bindings / Pattern Overrides: Prevent normal attribute updates when a \_\_default binding exists. ([62471](https://github.com/WordPress/gutenberg/pull/62471))
+-   Fix showing double icons for connected blocks in pattern editor. ([62317](https://github.com/WordPress/gutenberg/pull/62317))
+
+#### Data Views
+
+-   DataViews: Fix unnecessary horizontal scrollbar in list layout. ([62448](https://github.com/WordPress/gutenberg/pull/62448))
+-   Page creation and duplication: Decode HTML entities in success notices. ([62313](https://github.com/WordPress/gutenberg/pull/62313))
+
+#### Patterns
+
+-   Fix increasingly big canvas in the post editor when editing patterns. ([62360](https://github.com/WordPress/gutenberg/pull/62360))
+-   i18n: Patterns: Disambiguate singular & plural uses of 'Synced' & 'Unsynced'. ([62375](https://github.com/WordPress/gutenberg/pull/62375))
+
+#### Data Layer
+
+-   Data: Add error handle to the 'registry.batch' method. ([62322](https://github.com/WordPress/gutenberg/pull/62322))
+
+#### Block Variations
+
+-   Compare objects based on given properties. ([62272](https://github.com/WordPress/gutenberg/pull/62272))
+
+#### Block Styles
+
+-   Remove core block style variations filters and action. ([62090](https://github.com/WordPress/gutenberg/pull/62090))
+
+### Accessibility
+
+-   Add lint rule for inaccessible disabled `Button`. ([62080](https://github.com/WordPress/gutenberg/pull/62080))
+-   Placeholders: Fix contrast. ([62416](https://github.com/WordPress/gutenberg/pull/62416))
+
+#### Global Styles
+
+-   Display tooltips for pagination buttons on styles revision. ([62395](https://github.com/WordPress/gutenberg/pull/62395))
+
+#### Site Editor
+
+-   Make edit site pagination buttons accessibly disabled. ([62267](https://github.com/WordPress/gutenberg/pull/62267))
+
+### Performance
+
+-   reporter: Print the stdout/stderr from the worker. ([62316](https://github.com/WordPress/gutenberg/pull/62316))
+
+#### Block bindings
+
+-   Only run block bindings Gutenberg logic for sites using WordPress versions below 6.5. ([62363](https://github.com/WordPress/gutenberg/pull/62363))
+
+#### Interactivity API
+
+-   Use data-wp-on-async directives in core blocks when handler does not need synchronous access to event. ([62160](https://github.com/WordPress/gutenberg/pull/62160))
+
+### Experiments
+
+#### Posts/Tags/Categories Screen
+
+-   Bootstrap the dashboard layout. ([62409](https://github.com/WordPress/gutenberg/pull/62409))
+-   Posts Dashboard: Add a new experimental empty page. ([62406](https://github.com/WordPress/gutenberg/pull/62406))
+
+### Documentation
+
+-   Add @global PHP documentation. ([60539](https://github.com/WordPress/gutenberg/pull/60539))
+-   Add documentation for PostSticky and PostStickyCheck component. ([62100](https://github.com/WordPress/gutenberg/pull/62100))
+-   Add documentation for WordCount component. ([62217](https://github.com/WordPress/gutenberg/pull/62217))
+-   Added documentation for `PostTrash` & `PostTrashCheck` `TimeToRead` `TextEditorGlobalKeyboardShortcuts` `PostPublishButtonLabel `Component. ([62116](https://github.com/WordPress/gutenberg/pull/62116))
+-   Better changelogs for the JSX transform upgrade. ([62265](https://github.com/WordPress/gutenberg/pull/62265))
+-   Corrected @since Order in Php documentation. ([61992](https://github.com/WordPress/gutenberg/pull/61992))
+-   Docs: Explicitly mention new behavior coming in WP 6.6 for block variations. ([62399](https://github.com/WordPress/gutenberg/pull/62399))
+-   EntitiesSavedStates editor component. ([62377](https://github.com/WordPress/gutenberg/pull/62377))
+-   Fix `@since` tag in docblock in `WP_Theme_JSON_Data_Gutenberg`. ([62425](https://github.com/WordPress/gutenberg/pull/62425))
+-   Fix: Invalid link on explanations documentation. ([62487](https://github.com/WordPress/gutenberg/pull/62487))
+-   Fixing minor syntax in DataView example code. ([62560](https://github.com/WordPress/gutenberg/pull/62560))
+-   Interactivity API template create block: Removed warning for generated README from template. ([62324](https://github.com/WordPress/gutenberg/pull/62324))
+-   PostPublishButton, PostPublishButtonLabel editor components. ([62379](https://github.com/WordPress/gutenberg/pull/62379))
+-   PostPublishPanel editor component. ([62380](https://github.com/WordPress/gutenberg/pull/62380))
+-   PostSwitchToDraftButton editor component. ([62381](https://github.com/WordPress/gutenberg/pull/62381))
+-   PostSyncStatus editor component. ([62382](https://github.com/WordPress/gutenberg/pull/62382))
+-   PostTaxonomies, PostTaxonomiesCheck, PostTaxonomiesFlatTermSelector, PostTaxonomiesPanel related editor components. ([62384](https://github.com/WordPress/gutenberg/pull/62384))
+-   Several typo correction in documentations. ([62433](https://github.com/WordPress/gutenberg/pull/62433))
+-   TableOfContents editor component. ([62385](https://github.com/WordPress/gutenberg/pull/62385))
+-   ThemeSupportCheck editor component. ([62387](https://github.com/WordPress/gutenberg/pull/62387))
+-   Update React API reference links in @wordpress/element reference-guides. ([62475](https://github.com/WordPress/gutenberg/pull/62475))
+-   Update: Slotfill documentation samples (links, code, and rephrase). ([62271](https://github.com/WordPress/gutenberg/pull/62271))
+-   UseEntitiesSavedStatesIsDirty editor component. ([62388](https://github.com/WordPress/gutenberg/pull/62388))
+-   block.json schema: Add supports.splitting field. ([62209](https://github.com/WordPress/gutenberg/pull/62209))
+
+### Code Quality
+
+-   Add support for local keyframes through a PostCSS plugin. ([62476](https://github.com/WordPress/gutenberg/pull/62476))
+-   Block style variation: Rename hook. ([62464](https://github.com/WordPress/gutenberg/pull/62464))
+-   Chore: Simplify a padding style on global styles. ([62291](https://github.com/WordPress/gutenberg/pull/62291))
+-   Convert autop package to TS. ([62583](https://github.com/WordPress/gutenberg/pull/62583))
+-   Convert blob package to TS. ([62569](https://github.com/WordPress/gutenberg/pull/62569))
+-   Convert escape-html package to TS. ([62586](https://github.com/WordPress/gutenberg/pull/62586))
+-   Convert token-list package to TypeScript. ([62584](https://github.com/WordPress/gutenberg/pull/62584))
+-   Convert warning package to TS. ([62557](https://github.com/WordPress/gutenberg/pull/62557))
+-   Editor: Cleanup styles and classnames. ([62237](https://github.com/WordPress/gutenberg/pull/62237))
+-   Editor: Deprecate PostSwitchToDraftButton. ([62402](https://github.com/WordPress/gutenberg/pull/62402))
+-   Editor: Introduce the Editor component and use it in the site editor. ([62274](https://github.com/WordPress/gutenberg/pull/62274))
+-   Fix unintended overwrite of eslint `no-restricted-syntax`. ([62301](https://github.com/WordPress/gutenberg/pull/62301))
+-   Fix: Add `network-active` to valid options in `PluginStatus` Type definition. ([62450](https://github.com/WordPress/gutenberg/pull/62450))
+-   Fix: Flakey deferred store test. ([62571](https://github.com/WordPress/gutenberg/pull/62571))
+-   Fix: Remove unused code from dataviews styles. ([62275](https://github.com/WordPress/gutenberg/pull/62275))
+-   Fix: Remove unused typography panel styles. ([62295](https://github.com/WordPress/gutenberg/pull/62295))
+-   Fixed : Disambiguate "Cover" translatable string in the context of background-panel.js. ([62440](https://github.com/WordPress/gutenberg/pull/62440))
+-   Move the template part menu items to the editor package. ([62366](https://github.com/WordPress/gutenberg/pull/62366))
+-   Shortcut Help modal: Remove CSS hack for Internet Explorer 11. ([62564](https://github.com/WordPress/gutenberg/pull/62564))
+-   Use stable reference for `getEntityActions` action. ([62536](https://github.com/WordPress/gutenberg/pull/62536))
+
+#### Global Styles
+
+-   Global styles code quality refactoring. ([62299](https://github.com/WordPress/gutenberg/pull/62299))
+-   Migrate theme.json based on origin. ([62305](https://github.com/WordPress/gutenberg/pull/62305))
+-   Send theme object to setUserConfig. ([61805](https://github.com/WordPress/gutenberg/pull/61805))
+
+#### Synced Patterns
+
+-   Extract the pattern overrides toolbar indicator from the `block-editor` package. ([62514](https://github.com/WordPress/gutenberg/pull/62514))
+-   Remove unused `syncDerivedUpdates` action. ([62229](https://github.com/WordPress/gutenberg/pull/62229))
+
+#### Post Editor
+
+-   Editor: Combine selector in provider component. ([62407](https://github.com/WordPress/gutenberg/pull/62407))
+-   Editor: Use the Editor component in the post editor. ([62339](https://github.com/WordPress/gutenberg/pull/62339))
+
+#### Site Editor
+
+-   Remove editor specific classes from shell wrapper. ([62389](https://github.com/WordPress/gutenberg/pull/62389))
+-   Remove unused code. ([62286](https://github.com/WordPress/gutenberg/pull/62286))
+
+#### Icons
+
+-   Fix React warning error for offline icon. ([62353](https://github.com/WordPress/gutenberg/pull/62353))
+
+#### Data Views
+
+-   Chore: Simplify a padding style on dataviews. ([62276](https://github.com/WordPress/gutenberg/pull/62276))
+
+#### Block Editor
+
+-   Use border instead of hr for filtered block list separator. ([62249](https://github.com/WordPress/gutenberg/pull/62249))
+
+#### Block bindings
+
+-   Use preview instead of publishing post in block bindings tests. ([62235](https://github.com/WordPress/gutenberg/pull/62235))
+
+#### Block API
+
+-   Parser: Update validateBlock to use fixedBlock. ([62178](https://github.com/WordPress/gutenberg/pull/62178))
+
+### Tools
+
+#### Testing
+
+-   Fix flaky Site Editor command center end-to-end test. ([62454](https://github.com/WordPress/gutenberg/pull/62454))
+-   Perf Tests: Use backward-compatible locators. ([62362](https://github.com/WordPress/gutenberg/pull/62362))
+-   Test using Node.js 22.x. ([62341](https://github.com/WordPress/gutenberg/pull/62341))
+-   Try: Fix flaky DataViews end-to-end test. ([62413](https://github.com/WordPress/gutenberg/pull/62413))
+-   Update Node version for flaky test reporter. ([62401](https://github.com/WordPress/gutenberg/pull/62401))
+-   end-to-end Utils: Add retry mechanism to the REST API discovery. ([62331](https://github.com/WordPress/gutenberg/pull/62331))
+
+#### Build Tooling
+
+-   Build JS module only in development mode. ([62398](https://github.com/WordPress/gutenberg/pull/62398))
+-   Speed up check-build-type-declaration-files. ([62538](https://github.com/WordPress/gutenberg/pull/62538))
+
+#### wp-env
+
+-   Add JSON Schema for `.wp-env.json` files. ([36276](https://github.com/WordPress/gutenberg/pull/36276))
+-   Add `WP_ENV_TESTS_MYSQL_PORT` / `.wp-env.json` `.env.tests.mysqlPort` option etc. ([61057](https://github.com/WordPress/gutenberg/pull/61057))
+
+### Various
+
+-   Update all `ConfirmDialog`s in the codebase to be size=medium. ([62532](https://github.com/WordPress/gutenberg/pull/62532))
+
+#### REST API
+
+-   Themes REST API endpoint: Add stylesheet_uri and template_uri fields to the response (WP 6.6). ([62211](https://github.com/WordPress/gutenberg/pull/62211))
+
+## First time contributors
+
+The following PRs were merged by first time contributors:
+
+-   @aaronware: Fixing minor syntax in DataView example code. ([62560](https://github.com/WordPress/gutenberg/pull/62560))
+-   @BrianHenryIE: Add `WP_ENV_TESTS_MYSQL_PORT` / `.wp-env.json` `.env.tests.mysqlPort` option etc. ([61057](https://github.com/WordPress/gutenberg/pull/61057))
+-   @carstingaxion: Replace "Add new post" link text with more meaningful Label (v2). ([62277](https://github.com/WordPress/gutenberg/pull/62277))
+-   @up1512001: Change `Site Editor` to `Edit site`. ([62501](https://github.com/WordPress/gutenberg/pull/62501))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @aaronware @afercia @ajlende @akasunil @amitraj2203 @andrewserong @BrianHenryIE @carolinan @carstingaxion @cbravobernal @colorful-tones @DaniGuardiola @desrosj @ellatrix @fabiankaegy @geriux @gigitux @gziolo @jameskoster @jasmussen @jeryj @joemcgill @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @Mamaduka @mcsf @mirka @narenin @noisysocks @ntsekouras @oandregal @ockham @ramonjd @richtabor @SantosGuillamot @scruffian @shail-mehta @sirreal @stokesman @t-hamano @talldan @tellthemachines @tjcafferkey @up1512001 @vipul0425 @westonruter @WunderBart @youknowriad
+
+= 18.5.0 =
+
+## Changelog
+
+### Features
+
+#### Global Styles
+
+-   Add defaultSpacingSizes option (theme.json v3). ([61842](https://github.com/WordPress/gutenberg/pull/61842))
+-   Edit/create shadows in global styles. ([60706](https://github.com/WordPress/gutenberg/pull/60706))
+-   Relocate Background Image controls to sit under Layout. ([61886](https://github.com/WordPress/gutenberg/pull/61886))
+
+#### Block Library
+
+-   Enable shadow support for cover block. ([61883](https://github.com/WordPress/gutenberg/pull/61883))
+
+#### Block bindings
+
+-   Allow editing in post meta source. ([61753](https://github.com/WordPress/gutenberg/pull/61753))
+
+#### Script Modules API
+
+-   Add script module data implementation. ([61658](https://github.com/WordPress/gutenberg/pull/61658))
+
+#### Synced Patterns
+
+-   Add `__default` binding for pattern overrides. ([60694](https://github.com/WordPress/gutenberg/pull/60694))
+
+#### Block Styles
+
+-   Extend block style variations as mechanism for achieving section styling. ([57908](https://github.com/WordPress/gutenberg/pull/57908))
+
+### Enhancements
+
+-   Block card: Fix typographic widow. ([61438](https://github.com/WordPress/gutenberg/pull/61438))
+-   Block settings: Update variant of "Apply globally" Button component to secondary. ([61850](https://github.com/WordPress/gutenberg/pull/61850))
+-   Editor: Align the Post Format control design with the rest of the post sidebar controls. ([62066](https://github.com/WordPress/gutenberg/pull/62066))
+-   Editor: Polish the style of some of the post summary rows. ([61645](https://github.com/WordPress/gutenberg/pull/61645))
+-   Format Library: Refactor 'Inline Image' edit component. ([62135](https://github.com/WordPress/gutenberg/pull/62135))
+-   Playwright end-to-end Utils: Add fullscreenMode option to createNewPost. ([61766](https://github.com/WordPress/gutenberg/pull/61766))
+-   Post Sticky Toggle: Improve the design. ([62012](https://github.com/WordPress/gutenberg/pull/62012))
+-   Post Summary: Move PostTemplatePanel below URL and Author. ([62137](https://github.com/WordPress/gutenberg/pull/62137))
+-   Remove trash button in post/page inspector. ([61792](https://github.com/WordPress/gutenberg/pull/61792))
+-   Shadows instead of borders on interface skeleton. ([61835](https://github.com/WordPress/gutenberg/pull/61835))
+-   Tweak contextual block toolbar position. ([61836](https://github.com/WordPress/gutenberg/pull/61836))
+-   Update: For synced entities the icon should be purple. ([62024](https://github.com/WordPress/gutenberg/pull/62024))
+-   Update: Implement new author panel design. ([61362](https://github.com/WordPress/gutenberg/pull/61362))
+-   Update: Implement new parent and order design. ([61918](https://github.com/WordPress/gutenberg/pull/61918))
+-   Update: Move duplicate pattern and template part actions to the editor package. ([61879](https://github.com/WordPress/gutenberg/pull/61879))
+
+#### Site Editor
+
+-   Block Editor: Check for multiple block usage in the block-editor package. ([62086](https://github.com/WordPress/gutenberg/pull/62086))
+-   Copy custom CSS between variations when switching. ([61752](https://github.com/WordPress/gutenberg/pull/61752))
+-   Data views: Align page headers. ([62115](https://github.com/WordPress/gutenberg/pull/62115))
+-   Inspector summary rows: Make tooltips appear middle-left. ([61815](https://github.com/WordPress/gutenberg/pull/61815))
+-   Inspector: Add '/' prefix to Link button. ([62073](https://github.com/WordPress/gutenberg/pull/62073))
+-   Inspector: Display home / posts page badge. ([62071](https://github.com/WordPress/gutenberg/pull/62071))
+-   Inspector: Remove revisions panel. ([61867](https://github.com/WordPress/gutenberg/pull/61867))
+-   Make post meta row button treatment consistent. ([61954](https://github.com/WordPress/gutenberg/pull/61954))
+-   Remove 'Manage...' prefix in Pages / Templates data views. ([62107](https://github.com/WordPress/gutenberg/pull/62107))
+-   Remove the details pages. ([61741](https://github.com/WordPress/gutenberg/pull/61741))
+-   Update actions order in site editor for template and template parts. ([61803](https://github.com/WordPress/gutenberg/pull/61803))
+-   Use site title as a link. ([61258](https://github.com/WordPress/gutenberg/pull/61258))
+-   [Site Editor]: Add create pattern button in patterns page. ([60302](https://github.com/WordPress/gutenberg/pull/60302))
+-   withRegistryProvider: Prevent intermediate state with no children. ([61859](https://github.com/WordPress/gutenberg/pull/61859))
+
+#### Data Views
+
+-   Add badge to title for posts & front pages. ([61718](https://github.com/WordPress/gutenberg/pull/61718))
+-   Clarify `date` value in Pages. ([61709](https://github.com/WordPress/gutenberg/pull/61709))
+-   DataViews: `label` prop in Actions API can be either a `string` or a `function`. ([61942](https://github.com/WordPress/gutenberg/pull/61942))
+-   Fix pagination position on pages with short lists. ([61712](https://github.com/WordPress/gutenberg/pull/61712))
+-   Pages data view: Add Pending and Private views. ([62138](https://github.com/WordPress/gutenberg/pull/62138))
+-   Pages sidebar: Adds published & scheduled items. ([62021](https://github.com/WordPress/gutenberg/pull/62021))
+-   Stop Patterns data view header shrinking. ([61801](https://github.com/WordPress/gutenberg/pull/61801))
+-   Update grid layout on small screens. ([61820](https://github.com/WordPress/gutenberg/pull/61820))
+-   Update list layout action styling. ([61797](https://github.com/WordPress/gutenberg/pull/61797))
+-   Update page component (and some data view elements) spacing metrics. ([61333](https://github.com/WordPress/gutenberg/pull/61333))
+-   Visually hide 'Actions' column header. ([61710](https://github.com/WordPress/gutenberg/pull/61710))
+
+#### Global Styles
+
+-   Add block-level Text Alignment UI. ([61717](https://github.com/WordPress/gutenberg/pull/61717))
+-   Add option to remove site-wide theme background image. ([61998](https://github.com/WordPress/gutenberg/pull/61998))
+-   Background image: Add support for relative theme path URLs in top-level theme.json styles. ([61271](https://github.com/WordPress/gutenberg/pull/61271))
+-   Background image: Update controls defaults and layout. ([62000](https://github.com/WordPress/gutenberg/pull/62000))
+-   Background images: Add defaults for background size. ([62046](https://github.com/WordPress/gutenberg/pull/62046))
+-   Don't filter out typography variations where the heading and body fonts are the same. ([61327](https://github.com/WordPress/gutenberg/pull/61327))
+-   Make color variations fit in a bit better visually. ([61617](https://github.com/WordPress/gutenberg/pull/61617))
+-   Make it clearer how to edit a site's palette. ([61364](https://github.com/WordPress/gutenberg/pull/61364))
+-   Move type presets below elements. ([61863](https://github.com/WordPress/gutenberg/pull/61863))
+-   Restore the default variation to the color and typography style tiles. ([61901](https://github.com/WordPress/gutenberg/pull/61901))
+-   Show shadow tool by default under global styles. ([61981](https://github.com/WordPress/gutenberg/pull/61981))
+
+#### Components
+
+-   Add vw and vh units to the custom font size picker. ([60607](https://github.com/WordPress/gutenberg/pull/60607))
+-   CustomSelectControlV2: Use `InputBase` for styling. ([60261](https://github.com/WordPress/gutenberg/pull/60261))
+-   Tabs: Indicator animation. ([60560](https://github.com/WordPress/gutenberg/pull/60560))
+-   Try: Add CSS Custom Properties to CSS types. ([61872](https://github.com/WordPress/gutenberg/pull/61872))
+
+#### Zoom Out
+
+-   Hide inserters behind the experiment flag. ([61866](https://github.com/WordPress/gutenberg/pull/61866))
+-   Inserter: Auto-close the inserter unless the zoom out experiment is on. ([61856](https://github.com/WordPress/gutenberg/pull/61856))
+-   Show the inserters only when a section is selected. ([61559](https://github.com/WordPress/gutenberg/pull/61559))
+-   The patterns tab behind a new experiment. ([61601](https://github.com/WordPress/gutenberg/pull/61601))
+
+#### Block Editor
+
+-   Adjust pattern list items resting, hover, focus styles. ([61831](https://github.com/WordPress/gutenberg/pull/61831))
+-   Tweak pattern categories sidebar. ([62113](https://github.com/WordPress/gutenberg/pull/62113))
+-   Writing flow: Remove first empty paragraph on Backspace. ([61889](https://github.com/WordPress/gutenberg/pull/61889))
+
+#### Block bindings
+
+-   Add Block Bindings Panel to Block Inspector. ([61527](https://github.com/WordPress/gutenberg/pull/61527))
+-   Add indicator for metadata changes to Save Panel when reviewing modified entities. ([61811](https://github.com/WordPress/gutenberg/pull/61811))
+-   Lock binding editing with functions. ([61734](https://github.com/WordPress/gutenberg/pull/61734))
+
+#### Block Variations
+
+-   Detect active variation correctly based on RichText attribute. ([62325](https://github.com/WordPress/gutenberg/pull/62325))
+-   Have `getActiveBlockVariation` return variation with highest specificity. ([62031](https://github.com/WordPress/gutenberg/pull/62031))
+-   Support dot notation in `isActive` string array. ([62088](https://github.com/WordPress/gutenberg/pull/62088))
+
+#### Layout
+
+-   More consistent root padding. ([60715](https://github.com/WordPress/gutenberg/pull/60715))
+-   Try using coloured overlay instead of border for grid visualiser. ([61390](https://github.com/WordPress/gutenberg/pull/61390))
+
+#### Block Library
+
+-   Added Bluesky icon to the Social Icon Block. ([61372](https://github.com/WordPress/gutenberg/pull/61372))
+-   Media & Text: Replace the deprecated \_\_experimentalImageSizeControl with ResolutionTool. ([57540](https://github.com/WordPress/gutenberg/pull/57540))
+
+#### Inspector Controls
+
+-   Align both "Design" pattern list panels. ([62161](https://github.com/WordPress/gutenberg/pull/62161))
+
+#### Post Editor
+
+-   Add home template details to inspector controls. ([61762](https://github.com/WordPress/gutenberg/pull/61762))
+
+#### Interactivity API
+
+-   Clarify some warning messages. ([61720](https://github.com/WordPress/gutenberg/pull/61720))
+
+#### Patterns
+
+-   Adjust the icons and text of the binding connected blocks. ([61560](https://github.com/WordPress/gutenberg/pull/61560))
+
+### Bug Fixes
+
+-   Editor: Only render the site logo once if there's a fill. ([62320](https://github.com/WordPress/gutenberg/pull/62320))
+-   Interactivity API: Increase directive `wp-each-child` priority. ([62293](https://github.com/WordPress/gutenberg/pull/62293))w
+-   Compose: Fix 'useFocusOnMount' cleanup callback. ([62053](https://github.com/WordPress/gutenberg/pull/62053))
+-   Do not auto save post status changes. ([62171](https://github.com/WordPress/gutenberg/pull/62171))
+-   Editor: Fix canvas padding in post editor. ([61893](https://github.com/WordPress/gutenberg/pull/61893))
+-   EntityProvider: Avoid remounts and simplify. ([61882](https://github.com/WordPress/gutenberg/pull/61882))
+-   Fix shadow and border for pattern categories panel. ([62158](https://github.com/WordPress/gutenberg/pull/62158))
+-   Image Block: Conditionally Render Block Control Based on Component Presence. ([62132](https://github.com/WordPress/gutenberg/pull/62132))
+-   Interactivity API: Fix null and number strings as namespaces runtime error. ([61960](https://github.com/WordPress/gutenberg/pull/61960))
+-   PostCardPanel: Fix ESLint error. ([62109](https://github.com/WordPress/gutenberg/pull/62109))
+-   Remove build-types/ clean from clean:Packages. ([62008](https://github.com/WordPress/gutenberg/pull/62008))
+-   Script Modules: Fix private method reflection access. ([62154](https://github.com/WordPress/gutenberg/pull/62154))
+-   ServerSideRender: Fix data loading in development mode. ([62140](https://github.com/WordPress/gutenberg/pull/62140))
+-   Shadow Panel: Make subtitle translatable. ([62022](https://github.com/WordPress/gutenberg/pull/62022))
+-   Site Editor: Fix the Root Padding styles. ([61906](https://github.com/WordPress/gutenberg/pull/61906))
+-   Writing flow: Fix heading crash on split (via paste). ([61900](https://github.com/WordPress/gutenberg/pull/61900))
+-   e2e: Fix Site Editor Styles test. ([62111](https://github.com/WordPress/gutenberg/pull/62111))
+
+#### Post Editor
+
+-   Consolidate and fix `delete` and `edit` post actions. ([61912](https://github.com/WordPress/gutenberg/pull/61912))
+-   Consolidate and fix `rename` post action. ([61857](https://github.com/WordPress/gutenberg/pull/61857))
+-   Document Bar: Decode HTML entities and take into account cases where there is no title. ([62087](https://github.com/WordPress/gutenberg/pull/62087))
+-   Editor: Don't apply purple accent to the unsynced pattern title. ([61704](https://github.com/WordPress/gutenberg/pull/61704))
+-   Editor: Ensure Copy button in sidebar copies whole permalink, _with_ URL protocol. ([61876](https://github.com/WordPress/gutenberg/pull/61876))
+-   Editor: Fix the 'DocumentBar' position for long titles. ([61691](https://github.com/WordPress/gutenberg/pull/61691))
+-   Editor: Render publish date control when the status is `future`(scheduled). ([62070](https://github.com/WordPress/gutenberg/pull/62070))
+-   Editor: Unify button size in pre-publish panel. ([62123](https://github.com/WordPress/gutenberg/pull/62123))
+-   Editor: Use edited entity for post actions. ([61892](https://github.com/WordPress/gutenberg/pull/61892))
+-   Fix read only post status styles. ([61722](https://github.com/WordPress/gutenberg/pull/61722))
+-   Post Actions: Hide the trash action for auto-drafts. ([61865](https://github.com/WordPress/gutenberg/pull/61865))
+
+#### Block Editor
+
+-   Inserter: Update Openverse API URLs. ([62241](https://github.com/WordPress/gutenberg/pull/62241))
+-   Fix being unable to switch modes while inserter is open. ([61563](https://github.com/WordPress/gutenberg/pull/61563))
+-   Fix editor inserter tabs indicator. ([61973](https://github.com/WordPress/gutenberg/pull/61973))
+-   Fix positioning of close icons in panels to be consistent. ([61832](https://github.com/WordPress/gutenberg/pull/61832))
+-   Fix syncing of publish date between publish and post status panel. ([62165](https://github.com/WordPress/gutenberg/pull/62165))
+-   Improve link conrol preview when show button text label is enabled. ([61726](https://github.com/WordPress/gutenberg/pull/61726))
+-   Inserter: Show all blocks (alternative). ([62169](https://github.com/WordPress/gutenberg/pull/62169))
+-   InspectorControls: Text not displayed when "Show button text labels" is enabled. ([61949](https://github.com/WordPress/gutenberg/pull/61949))
+-   Link Control: Fix focus handlers in development mode. ([62141](https://github.com/WordPress/gutenberg/pull/62141))
+-   Media & Text block: Remove the link option when the featured image is used. ([60510](https://github.com/WordPress/gutenberg/pull/60510))
+-   Writing flow: Fix paste for input fields. ([61389](https://github.com/WordPress/gutenberg/pull/61389))
+
+#### Block Library
+
+-   Classic block: Fix content syncing effect for React StrictMode. ([62051](https://github.com/WordPress/gutenberg/pull/62051))
+-   Don't steal focus when opening browse all blocks. ([61975](https://github.com/WordPress/gutenberg/pull/61975))
+-   Fix: The latest post block - post titles overlapping. ([61356](https://github.com/WordPress/gutenberg/pull/61356))
+-   Fixed : Update `alt text decision tree` links to be translatable. ([62076](https://github.com/WordPress/gutenberg/pull/62076))
+-   Fixed: Custom HTML Block should display content in LTR layout for all languages. ([62083](https://github.com/WordPress/gutenberg/pull/62083))
+-   More block: Fix React warning when adding custom text. ([61936](https://github.com/WordPress/gutenberg/pull/61936))
+-   useUploadMediaFromBlobURL: Prevent duplicate uploads in StrictMode. ([62059](https://github.com/WordPress/gutenberg/pull/62059))
+
+#### Global Styles
+
+-   Fix make dimensions.aspectRatios key of theme.json files translatable. ([61774](https://github.com/WordPress/gutenberg/pull/61774))
+-   Hide the presets panel for when there are less or exactly one presets available. ([62074](https://github.com/WordPress/gutenberg/pull/62074))
+-   Prevent Typography panel title from wrapping. ([62124](https://github.com/WordPress/gutenberg/pull/62124))
+-   Shadow Panel: Generates unique shadow slugs by finding max suffix and incrementing it. ([61997](https://github.com/WordPress/gutenberg/pull/61997))
+-   Styles: try wrapping with :Root to fix reset styles. ([61638](https://github.com/WordPress/gutenberg/pull/61638))
+-   Transform Styles: Update selector so that styles work when custom fields panel is active. ([62121](https://github.com/WordPress/gutenberg/pull/62121))
+
+#### Site Editor
+
+-   Align the template title to the center in the 'Add template' screen. ([62175](https://github.com/WordPress/gutenberg/pull/62175))
+-   Close publish sidebar if not in `edit` mode. ([61707](https://github.com/WordPress/gutenberg/pull/61707))
+-   Fix the site editor Admin Bar menu item. ([61851](https://github.com/WordPress/gutenberg/pull/61851))
+-   Use a consistent snackbar position. ([61756](https://github.com/WordPress/gutenberg/pull/61756))
+
+#### Components
+
+-   Fix: The focus styles for tabPanel. ([61317](https://github.com/WordPress/gutenberg/pull/61317))
+-   InputControl: Fix z-index issue causing slider dots to appear in front of the Appearance dropdown. ([61937](https://github.com/WordPress/gutenberg/pull/61937))
+-   getAutocompleterUI: Don't redefine ListBox component on every render. ([61877](https://github.com/WordPress/gutenberg/pull/61877))
+
+#### Synced Patterns
+
+-   Block Bindings: Filter pattern overrides source in bindings panel. ([62015](https://github.com/WordPress/gutenberg/pull/62015))
+-   Fix detaching patterns when a pattern has overrides, but there are no override values. ([62014](https://github.com/WordPress/gutenberg/pull/62014))
+
+#### Block bindings
+
+-   Don't show non-existing and not supported attributes in block bindings panel. ([62183](https://github.com/WordPress/gutenberg/pull/62183))
+
+#### Layout
+
+-   Remove extra bracket in the site editor root padding styles. ([62159](https://github.com/WordPress/gutenberg/pull/62159))
+
+#### Block Styles
+
+-   Fix block style variation styles for blocks with complex selectors. ([62125](https://github.com/WordPress/gutenberg/pull/62125))
+
+#### Code Editor
+
+-   Editor: Unify text/code editor between post and site editors. ([61934](https://github.com/WordPress/gutenberg/pull/61934))
+
+#### Page Content Focus
+
+-   Remove lock icons from Content blocks inner blocks when editing a page in the site editor. ([61922](https://github.com/WordPress/gutenberg/pull/61922))
+
+#### Patterns
+
+-   Templates: Only resolve patterns for REST API endpoints. ([61757](https://github.com/WordPress/gutenberg/pull/61757))
+
+#### Interactivity API
+
+-   Turn named capturing groups back into numbered ones inside `toVdom`. ([61728](https://github.com/WordPress/gutenberg/pull/61728))
+
+#### Block API
+
+-   Fix: Enable Text Align UI to be controlled correctly with theme.json. ([61182](https://github.com/WordPress/gutenberg/pull/61182))
+
+#### REST API
+
+-   Return an empty object when no fallback templates are found (wp/v2/templates/lookup). ([60925](https://github.com/WordPress/gutenberg/pull/60925))
+
+### Accessibility
+
+#### Global Styles
+
+-   Shadow Panel: Improve a11y and fix browser console error. ([61980](https://github.com/WordPress/gutenberg/pull/61980))
+
+#### Data Views
+
+-   Always show Actions table header. ([61847](https://github.com/WordPress/gutenberg/pull/61847))
+
+#### Block Library
+
+-   Fix: Adds help props for description of Play Inline toggle. ([61310](https://github.com/WordPress/gutenberg/pull/61310))
+
+### Performance
+
+-   Perf: Batch block list settings in single action. ([61329](https://github.com/WordPress/gutenberg/pull/61329))
+-   Remove additional call to `WP_Theme_JSON_Gutenberg::__construct`. ([61262](https://github.com/WordPress/gutenberg/pull/61262))
+
+#### Interactivity API
+
+-   Introduce `wp-on-async` directive as performant alternative over synchronous `wp-on` directive. ([61885](https://github.com/WordPress/gutenberg/pull/61885))
+
+#### Post Editor
+
+-   DocumentBar: Only selected data needed for rendering. ([61706](https://github.com/WordPress/gutenberg/pull/61706))
+
+### Experiments
+
+#### Interactivity API
+
+-   Use output buffer and HTML tag processor to inject directives on BODY tag for full-page client-side navigation. ([61212](https://github.com/WordPress/gutenberg/pull/61212))
+
+### Documentation
+
+-   Add JSDoc to PostVisibility, PostVisibilityCheck, and PostVisibilityLabel. ([61735](https://github.com/WordPress/gutenberg/pull/61735))
+-   Add PostURL component documentation. ([61737](https://github.com/WordPress/gutenberg/pull/61737))
+-   Add a section about block filters to the Filters and Hooks doc. ([61771](https://github.com/WordPress/gutenberg/pull/61771))
+-   Add an example and improve readability of the Block Filters doc. ([61770](https://github.com/WordPress/gutenberg/pull/61770))
+-   Add docblock to PostTitle and PostTitleRaw component. ([61740](https://github.com/WordPress/gutenberg/pull/61740))
+-   Add documentation for DocumentBar. ([61733](https://github.com/WordPress/gutenberg/pull/61733))
+-   Add documentation for PostFeaturedImage, PostFeaturedImageCheck, PostFeaturedImagePanel. ([61165](https://github.com/WordPress/gutenberg/pull/61165))
+-   Add documentation for PostLastRevision, PostLastRevisionCheck, PostLastRevisionPanel components. ([61166](https://github.com/WordPress/gutenberg/pull/61166))
+-   Add documentation for PostSchedule, PostScheduleCheck, PostSchedulePanel, PostScheduleLabel, usePostScheduleLabel components. ([61345](https://github.com/WordPress/gutenberg/pull/61345))
+-   Add documentation for the EditorNotices component. ([61736](https://github.com/WordPress/gutenberg/pull/61736))
+-   Add documentation for the EditorProvider and ExperimentalEditorProvider components. ([61739](https://github.com/WordPress/gutenberg/pull/61739))
+-   Added missing @global documentation. ([61537](https://github.com/WordPress/gutenberg/pull/61537))
+-   Changelog: Add note about removing legacy operators. ([62013](https://github.com/WordPress/gutenberg/pull/62013))
+-   Docs: Fix spacing in PHP doc block in comments block. ([61911](https://github.com/WordPress/gutenberg/pull/61911))
+-   EditorBoundary editor component. ([61950](https://github.com/WordPress/gutenberg/pull/61950))
+-   Fix typo. ([61830](https://github.com/WordPress/gutenberg/pull/61830))
+-   Fix: Block library README.md link. ([62081](https://github.com/WordPress/gutenberg/pull/62081))
+-   Fix: Custom block editor link. ([61962](https://github.com/WordPress/gutenberg/pull/61962))
+-   For `PostTextEditor` component. ([62099](https://github.com/WordPress/gutenberg/pull/62099))
+-   LocalAutosaveMonitor editor component. ([61951](https://github.com/WordPress/gutenberg/pull/61951))
+-   PageTemplate + PostTemplatePanel editor components. ([61961](https://github.com/WordPress/gutenberg/pull/61961))
+-   PostComments editor component. ([61964](https://github.com/WordPress/gutenberg/pull/61964))
+-   PostDiscussionPanel editor component. ([61966](https://github.com/WordPress/gutenberg/pull/61966))
+-   PostExcerptPanel editor component. ([61967](https://github.com/WordPress/gutenberg/pull/61967))
+-   PostLockedModal editor component. ([61968](https://github.com/WordPress/gutenberg/pull/61968))
+-   PostPendingStatus + PostPendingStatusCheck editor components. ([61970](https://github.com/WordPress/gutenberg/pull/61970))
+-   PostPingbacks editor component. ([62035](https://github.com/WordPress/gutenberg/pull/62035))
+-   PostPreviewButton editor component. ([62036](https://github.com/WordPress/gutenberg/pull/62036))
+-   Storybook: Add badges based on `tags`. ([61111](https://github.com/WordPress/gutenberg/pull/61111))
+-   Update PostFormat, PostFormatCheck editor component documentation. ([61732](https://github.com/WordPress/gutenberg/pull/61732))
+-   Update block.json file with correct links. ([61880](https://github.com/WordPress/gutenberg/pull/61880))
+-   Update link to architecture key concepts. ([61965](https://github.com/WordPress/gutenberg/pull/61965))
+-   Update links to correct lodash website. ([62188](https://github.com/WordPress/gutenberg/pull/62188))
+-   Update plugin-document-setting-panel.md. ([61782](https://github.com/WordPress/gutenberg/pull/61782))
+-   Update tutorial.md. ([62054](https://github.com/WordPress/gutenberg/pull/62054))
+
+### Code Quality
+
+-   Add curly brace autofix commit to `.git-blame-ignore-revs`. ([62144](https://github.com/WordPress/gutenberg/pull/62144))
+-   Add eslint rule for curly brace presence in JSX. ([62026](https://github.com/WordPress/gutenberg/pull/62026))
+-   Blocks: Remove pipe usage and dependency on compose. ([62127](https://github.com/WordPress/gutenberg/pull/62127))
+-   Clean up packages build-types when cleaning types. ([61939](https://github.com/WordPress/gutenberg/pull/61939))
+-   Command Palette: Remove unused URL parameter. ([61783](https://github.com/WordPress/gutenberg/pull/61783))
+-   Commands: Unify the editor context between post and site editors. ([61862](https://github.com/WordPress/gutenberg/pull/61862))
+-   Dataviews: Remove unused dependencies. ([62010](https://github.com/WordPress/gutenberg/pull/62010))
+-   Distraction Free: Unify the header animation. ([62167](https://github.com/WordPress/gutenberg/pull/62167))
+-   Editor: Move editor toggle commands to the editor package. ([62093](https://github.com/WordPress/gutenberg/pull/62093))
+-   Editor: Move the InterfaceSkeleton to the editor package. ([62118](https://github.com/WordPress/gutenberg/pull/62118))
+-   Editor: Move the resizing of the editor to the EditorCanvas component. ([61896](https://github.com/WordPress/gutenberg/pull/61896))
+-   Editor: Remove extra div container and unify the container between post and site editors. ([62016](https://github.com/WordPress/gutenberg/pull/62016))
+-   Editor: Remove obsolete `listViewLabel` prop from DocumentTools. ([62032](https://github.com/WordPress/gutenberg/pull/62032))
+-   Editor: Remove useless props from InserterSidebar component. ([62103](https://github.com/WordPress/gutenberg/pull/62103))
+-   Editor: Unify the MediaUpload hook between post and site editors. ([62085](https://github.com/WordPress/gutenberg/pull/62085))
+-   Editor: Unify the content area of the post and site editors. ([61860](https://github.com/WordPress/gutenberg/pull/61860))
+-   Fix: React compiler error on button. ([61958](https://github.com/WordPress/gutenberg/pull/61958))
+-   Fix: Remove unused css block on patterns page. ([62058](https://github.com/WordPress/gutenberg/pull/62058))
+-   Fix: Remove unused css code from the navigation screen. ([62060](https://github.com/WordPress/gutenberg/pull/62060))
+-   Fix: Some jsdoc return types on edit site selector. ([62061](https://github.com/WordPress/gutenberg/pull/62061))
+-   Improve distclean script. ([62019](https://github.com/WordPress/gutenberg/pull/62019))
+-   Interactivity API: Move all utils inside `utils.ts`. ([61721](https://github.com/WordPress/gutenberg/pull/61721))
+-   Interactivity API: Move init.js to TypeScript. ([61723](https://github.com/WordPress/gutenberg/pull/61723))
+-   Make onPatternCategorySelection private. ([62130](https://github.com/WordPress/gutenberg/pull/62130))
+-   Remove useless clsx calls. ([61969](https://github.com/WordPress/gutenberg/pull/61969))
+-   Rename backport-changelog/6279.md to backport-changelog/6.6/6279.md. ([61894](https://github.com/WordPress/gutenberg/pull/61894))
+-   Update: Remove unused components. ([61955](https://github.com/WordPress/gutenberg/pull/61955))
+-   end-to-end Tests: Fix React warnings triggered by test plugins. ([61935](https://github.com/WordPress/gutenberg/pull/61935))
+
+#### Components
+
+-   CustomSelectControl: Fix `menuProps` mutation. ([62149](https://github.com/WordPress/gutenberg/pull/62149))
+-   Fix remaining warning in ColorPanelDropdown. ([61933](https://github.com/WordPress/gutenberg/pull/61933))
+-   Make the `ProgressBar` public. ([61062](https://github.com/WordPress/gutenberg/pull/61062))
+-   Remove reduceMotion utility. ([61963](https://github.com/WordPress/gutenberg/pull/61963))
+-   SlotFills: Use state for registry initialization. ([61802](https://github.com/WordPress/gutenberg/pull/61802))
+-   Style Book: Use state to initialize examples. ([61848](https://github.com/WordPress/gutenberg/pull/61848))
+-   Tooltip: Fix Ariakit tooltip store usage. ([61858](https://github.com/WordPress/gutenberg/pull/61858))
+-   `ProgressBar`: Simplify default `width` implementation and make it more easily overridable. ([61976](https://github.com/WordPress/gutenberg/pull/61976))
+
+#### Block Editor
+
+-   Fix `ZoomOutModeInserters` dependencies. ([61908](https://github.com/WordPress/gutenberg/pull/61908))
+-   Fix wrapper props mutation in BlockListBlock. ([61789](https://github.com/WordPress/gutenberg/pull/61789))
+-   Remove some utility functions. ([61784](https://github.com/WordPress/gutenberg/pull/61784))
+-   Shadows: Unlock private components and hooks at the file level. ([61790](https://github.com/WordPress/gutenberg/pull/61790))
+-   Unlock private setting keys at the file level. ([61813](https://github.com/WordPress/gutenberg/pull/61813))
+-   Unlock the private 'kebabCase' function at a file level. ([60755](https://github.com/WordPress/gutenberg/pull/60755))
+-   useBlockInspectorAnimationSettings: Remove unnecessary deps. ([61822](https://github.com/WordPress/gutenberg/pull/61822))
+
+#### Data Views
+
+-   DataViews: Full type the dataviews package. ([61854](https://github.com/WordPress/gutenberg/pull/61854))
+-   DataViews: Remove non-used file. ([61853](https://github.com/WordPress/gutenberg/pull/61853))
+-   DataViews: Remove unnecessary dependency for pattern fields memo. ([61870](https://github.com/WordPress/gutenberg/pull/61870))
+-   DataViews: Type all the filters components. ([61795](https://github.com/WordPress/gutenberg/pull/61795))
+-   DataViews: Type the BulkActionsToolbar component. ([61673](https://github.com/WordPress/gutenberg/pull/61673))
+-   DataViews: Type the ViewActions component. ([61729](https://github.com/WordPress/gutenberg/pull/61729))
+-   DataViews: Type the ViewTable component. ([61682](https://github.com/WordPress/gutenberg/pull/61682))
+
+#### Block Library
+
+-   Added unit test for post excerpt block render function. ([43451](https://github.com/WordPress/gutenberg/pull/43451))
+-   Avoid using component naming conventions for non-component code. ([61793](https://github.com/WordPress/gutenberg/pull/61793))
+-   Button: Fix ESLint warning. ([62126](https://github.com/WordPress/gutenberg/pull/62126))
+-   Remove CSS hack for Internet Explorer 11. ([62043](https://github.com/WordPress/gutenberg/pull/62043))
+-   Remove useless styles. ([62017](https://github.com/WordPress/gutenberg/pull/62017))
+-   Search Block: Fix `borderRadius` mutation. ([61794](https://github.com/WordPress/gutenberg/pull/61794))
+
+#### Site Editor
+
+-   History: Add getLocationWithParams method. ([61823](https://github.com/WordPress/gutenberg/pull/61823))
+-   Navigation Focus Mode: Remove leftover code. ([61897](https://github.com/WordPress/gutenberg/pull/61897))
+-   Remove useless onClick handler. ([61902](https://github.com/WordPress/gutenberg/pull/61902))
+-   Update to use the EditorInterface component from the editor package. ([62146](https://github.com/WordPress/gutenberg/pull/62146))
+
+#### Block hooks
+
+-   Navigation block: Check for insert_hooked_blocks_into_rest_response i…. ([62134](https://github.com/WordPress/gutenberg/pull/62134))
+-   Navigation block: Check for update_ignored_hooked_blocks_postmeta in core. ([61903](https://github.com/WordPress/gutenberg/pull/61903))
+
+#### Font Library
+
+-   Font Library Modal: Remove some contexts. ([62042](https://github.com/WordPress/gutenberg/pull/62042))
+
+#### Post Editor
+
+-   Template Actions: Fix console error when resetting template. ([61921](https://github.com/WordPress/gutenberg/pull/61921))
+
+#### Global Styles
+
+-   Components: Fix React Warning triggers by the new JSX transform. ([61917](https://github.com/WordPress/gutenberg/pull/61917))
+
+#### Interactivity API
+
+-   Interactivity API : Refactor interactivity-router to TS. ([61730](https://github.com/WordPress/gutenberg/pull/61730))
+
+#### CSS & Styling
+
+-   Fix editor view mode canvas shadow. ([61688](https://github.com/WordPress/gutenberg/pull/61688))
+
+### Tools
+
+-   Build: Use globalThis over process.env and enable TS lib checking. ([61486](https://github.com/WordPress/gutenberg/pull/61486))
+
+#### Testing
+
+-   E2E: Fix canvas waiter in visitSiteEditor. ([61816](https://github.com/WordPress/gutenberg/pull/61816))
+-   PaletteEdit: Fix another flaky test. ([61818](https://github.com/WordPress/gutenberg/pull/61818))
+-   PaletteEdit: Fix flaky test. ([61791](https://github.com/WordPress/gutenberg/pull/61791))
+-   Shadow: Add unit tests for shadow support. ([60063](https://github.com/WordPress/gutenberg/pull/60063))
+-   Skip flaky 'Zoom out' end-to-end test. ([61925](https://github.com/WordPress/gutenberg/pull/61925))
+-   Synced Pattern: Wait for pattern creation in end-to-end tests. ([62174](https://github.com/WordPress/gutenberg/pull/62174))
+-   Tests: Change how directives processing gets disabled. ([62095](https://github.com/WordPress/gutenberg/pull/62095))
+-   Workflows: Try a backport changelog. ([61785](https://github.com/WordPress/gutenberg/pull/61785))
+
+#### Build Tooling
+
+-   Add 60 minute timeout to performance job. ([61957](https://github.com/WordPress/gutenberg/pull/61957))
+-   Enable parallel processing for PHPCS sniffs. ([61700](https://github.com/WordPress/gutenberg/pull/61700))
+-   Fix an issue causing wp-scripts commands to fail if the file path contained a space character. ([61748](https://github.com/WordPress/gutenberg/pull/61748))
+-   React: Upgrade to the new JSX transform. ([61692](https://github.com/WordPress/gutenberg/pull/61692))
+-   Workflows: Test to check for label and skip backport changelog. ([61808](https://github.com/WordPress/gutenberg/pull/61808))
+
+### Various
+
+-   Inserter: Encapsulate styles for tablist and close button. ([61760](https://github.com/WordPress/gutenberg/pull/61760))
+-   Update 'Add template' screen to prefer template_name label instead of singular_name. ([60367](https://github.com/WordPress/gutenberg/pull/60367))
+-   Update: Move pattern actions to the editor package. [take 2]. ([61612](https://github.com/WordPress/gutenberg/pull/61612))
+
+#### Global Styles
+
+-   Update copy for color variations from "Presets" to "Palettes". ([62147](https://github.com/WordPress/gutenberg/pull/62147))
+
+#### Synced Patterns
+
+-   Remove `IS_GUTENBERG_PLUGIN` check to ensure pattern overrides ship in 6.6. ([62011](https://github.com/WordPress/gutenberg/pull/62011))
+
+#### npm Packages
+
+-   Packages: Increase the minimum required Node.js version to v18.12.0. ([61930](https://github.com/WordPress/gutenberg/pull/61930))
+
+#### Layout
+
+-   Update child layout selector to match core. ([61777](https://github.com/WordPress/gutenberg/pull/61777))
+
+#### Components
+
+-   Introduce Combobox `expandOnFocus` property. ([61705](https://github.com/WordPress/gutenberg/pull/61705))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @akashdhawade2005: Fix: Block library README.md link. ([62081](https://github.com/WordPress/gutenberg/pull/62081))
+-   @amitraj2203: Added Bluesky icon to the Social Icon Block. ([61372](https://github.com/WordPress/gutenberg/pull/61372))
+-   @dbrian: Add JSDoc to PostVisibility, PostVisibilityCheck, and PostVisibilityLabel. ([61735](https://github.com/WordPress/gutenberg/pull/61735))
+-   @gemkev: Update tutorial.md. ([62054](https://github.com/WordPress/gutenberg/pull/62054))
+-   @kellenmace: Fix an issue causing wp-scripts commands to fail if the file path contained a space character. ([61748](https://github.com/WordPress/gutenberg/pull/61748))
+-   @narenin: Fixed: Custom HTML Block should display content in LTR layout for all languages. ([62083](https://github.com/WordPress/gutenberg/pull/62083))
+-   @nateinaction: Add documentation for the EditorProvider and ExperimentalEditorProvider components. ([61739](https://github.com/WordPress/gutenberg/pull/61739))
+-   @paolopiaggio: Playwright end-to-end Utils: Add fullscreenMode option to createNewPost. ([61766](https://github.com/WordPress/gutenberg/pull/61766))
+-   @sanjucta: Add docblock to PostTitle and PostTitleRaw component. ([61740](https://github.com/WordPress/gutenberg/pull/61740))
+-   @vipul0425: Fix: The latest post block - post titles overlapping. ([61356](https://github.com/WordPress/gutenberg/pull/61356))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @abhi3315 @afercia @ajlende @akashdhawade2005 @akasunil @Aljullu @amitraj2203 @andrewserong @anton-vlasenko @anver @artemiomorales @carolinan @cbravobernal @colorful-tones @creativecoder @DaniGuardiola @DAreRodz @dbrian @draganescu @ellatrix @fabiankaegy @fullofcaffeine @gemkev @geriux @glendaviesnz @gziolo @jameskoster @jasmussen @jeryj @jorgefilipecosta @jsnajdr @kellenmace @kevin940726 @kt-12 @madhusudhand @Mamaduka @mattsherman @mcsf @michalczaplinski @mirka @narenin @nateinaction @ndiego @ntsekouras @oandregal @ockham @paolopiaggio @ramonjd @retrofox @richtabor @sanjucta @SantosGuillamot @scruffian @senadir @shail-mehta @sirreal @stokesman @t-hamano @talldan @taylorgorman @tellthemachines @tjcafferkey @twstokes @tyxla @vcanales @vipul0425 @westonruter @WunderBart @youknowriad
+
+= 18.4.1 =
+
+## Changelog
+
+### Bug fixes
+
+-   Writing flow: fix paste for input fields ([61389](https://github.com/WordPress/gutenberg/pull/61389))
+
+= 18.4.0 =
+
+## Changelog
+
+### Enhancements
+
+#### Layout
+
+-   Check child layout exists before generating classname. ([61392](https://github.com/WordPress/gutenberg/pull/61392))
+-   Hide Image block resizer when inside a grid layout. ([61603](https://github.com/WordPress/gutenberg/pull/61603))
+
+#### Grid interactivity
+
+-   Improve `max` attribute logic. ([61420](https://github.com/WordPress/gutenberg/pull/61420))
+-   Improve how grid resizer handles 0-width and 0-height cells. ([61423](https://github.com/WordPress/gutenberg/pull/61423))
+-   Show grid visualizer when block inspector is closed. ([61429](https://github.com/WordPress/gutenberg/pull/61429))
+-   Stabilise grid layout visualiser and resizer. ([61640](https://github.com/WordPress/gutenberg/pull/61640))
+
+#### Global Styles
+
+-   Add aspect ratio presets support via theme.json. ([47271](https://github.com/WordPress/gutenberg/pull/47271), [61774](https://github.com/WordPress/gutenberg/pull/61774))
+-   Background images: Remove required "file" prop. ([61387](https://github.com/WordPress/gutenberg/pull/61387), [61469](https://github.com/WordPress/gutenberg/pull/61469))
+-   Change "Solid" tab to "Color". ([61366](https://github.com/WordPress/gutenberg/pull/61366))
+-   Improve panel title and description for palette. ([61365](https://github.com/WordPress/gutenberg/pull/61365))
+-   Tweak palette panel spacing and empty message. ([61368](https://github.com/WordPress/gutenberg/pull/61368))
+-   Update color variations. ([61334](https://github.com/WordPress/gutenberg/pull/61334))
+
+#### Block Styles
+
+-   Add extended version of register block style functions. ([61029](https://github.com/WordPress/gutenberg/pull/61029))
+
+### Post actions
+
+-   Improve success messages of some post actions. ([61539](https://github.com/WordPress/gutenberg/pull/61539))
+-   Unify the list of available post type actions. ([61520](https://github.com/WordPress/gutenberg/pull/61520))
+-   Don't export duplicatePostAction for now. ([61407](https://github.com/WordPress/gutenberg/pull/61407))
+
+#### Zoom Out
+
+-   Editor: Enable Zoom-out mode in the post editor. ([61293](https://github.com/WordPress/gutenberg/pull/61293))
+-   Keep original viewport width (single scale). ([61424](https://github.com/WordPress/gutenberg/pull/61424))
+-   Open inserter sidebar when clicking on inserter buttons on zoom-out mode. ([61434](https://github.com/WordPress/gutenberg/pull/61434))
+-   Remove experimental zoom out control. ([61509](https://github.com/WordPress/gutenberg/pull/61509))
+-   Zoomed Out View: Don't close the inserter. ([61004](https://github.com/WordPress/gutenberg/pull/61004))
+
+#### Components
+
+-   Do not render FormTokenField label when not defined. ([61336](https://github.com/WordPress/gutenberg/pull/61336))
+-   Placeholder: Tweak placeholder style. ([61590](https://github.com/WordPress/gutenberg/pull/61590))
+-   Add content only descriptions in dropdown menus for patterns and templates. ([61127](https://github.com/WordPress/gutenberg/pull/61127))
+
+#### Block Library
+
+-   List Block: Add block class name to the list block. ([56469](https://github.com/WordPress/gutenberg/pull/56469))
+-   Embeds Block: Add Bluesky variation. ([61352](https://github.com/WordPress/gutenberg/pull/61352))
+-   Site Logo Block: Add setting labels via the 'register_setting' method. ([61351](https://github.com/WordPress/gutenberg/pull/61351))
+
+#### Block Editor
+
+-   Make `BlockPopover` component public. ([61529](https://github.com/WordPress/gutenberg/pull/61529))
+-   Only add the selected pattern category in metadata during insertion. ([61557](https://github.com/WordPress/gutenberg/pull/61557))
+-   Add a keyboard shortcut to create group from the selected blocks. ([46972](https://github.com/WordPress/gutenberg/pull/46972))
+-   Enhance block outlines and selection interactions. ([60757](https://github.com/WordPress/gutenberg/pull/60757))
+-   Tiny tweak to position close button properly in the inserter. ([61461](https://github.com/WordPress/gutenberg/pull/61461))
+
+#### Editor
+
+-   Editor: Unify Header component. ([61273](https://github.com/WordPress/gutenberg/pull/61273))
+-   Editor: Unify the sidebar between the post and site editors. ([61507](https://github.com/WordPress/gutenberg/pull/61507))
+-   Editor: Update and simplify the Post Summary and Post Card section in the document sidebar. ([61624](https://github.com/WordPress/gutenberg/pull/61624))
+-   Try: Improve date-wrapping in prepublish flow. ([61490](https://github.com/WordPress/gutenberg/pull/61490))
+-   Update: Implement the new discussion panel design. ([61357](https://github.com/WordPress/gutenberg/pull/61357))
+
+#### Post Editor
+
+-   Add global styles to settings using existing context code. ([61556](https://github.com/WordPress/gutenberg/pull/61556))
+-   Display a notice after moving a post into the trash. ([61670](https://github.com/WordPress/gutenberg/pull/61670))
+-   Simplify Post Publish Flow status term. ([61386](https://github.com/WordPress/gutenberg/pull/61386))
+
+#### Site Editor
+
+-   Redirect `/wp_template_part/all` to `/patterns`. ([61446](https://github.com/WordPress/gutenberg/pull/61446))
+-   Moves "Patterns" command to site editor main navigation. ([61416](https://github.com/WordPress/gutenberg/pull/61416))
+-   Adds "Template Parts" command to site editor. ([61287](https://github.com/WordPress/gutenberg/pull/61287))
+-   Show pin/unpin button on the site editor plugin sidebar. ([61448](https://github.com/WordPress/gutenberg/pull/61448))
+-   Remove default entry into Navigation Menu focus mode but retain ability to access via "Edit". ([61275](https://github.com/WordPress/gutenberg/pull/61275))
+
+#### Data Views
+
+-   Add bulk actions toolbar. ([59714](https://github.com/WordPress/gutenberg/pull/59714))
+-   Align list and table layout visuals. ([61157](https://github.com/WordPress/gutenberg/pull/61157))
+-   Add actions to list layout. ([60805](https://github.com/WordPress/gutenberg/pull/60805))
+-   Make pattern preview click area larger. ([61250](https://github.com/WordPress/gutenberg/pull/61250))
+
+### Bug Fixes
+
+#### Layout
+
+-   Fix grid item resizing in non-iframed editor. ([61636](https://github.com/WordPress/gutenberg/pull/61636))
+-   Fix resizing items to top and left with GridItemResizer. ([60986](https://github.com/WordPress/gutenberg/pull/60986))
+-   Grid Visualizer: Fix grid item resizing in site editor. ([61641](https://github.com/WordPress/gutenberg/pull/61641))
+-   Grid Visualizer: Fix resize not ending when mouse is released outside grid's bounds. ([61668](https://github.com/WordPress/gutenberg/pull/61668))
+-   GridItemResizer: Fix resizing when List View is open. ([61643](https://github.com/WordPress/gutenberg/pull/61643))
+-   Only show grid resizer if grid block allows resizing on children. ([61552](https://github.com/WordPress/gutenberg/pull/61552))
+
+#### Global Styles
+
+-   Background image: Explicitly set background repeat value in user styles. ([61526](https://github.com/WordPress/gutenberg/pull/61526))
+-   Background image: Size controls should show when an image is set. ([61388](https://github.com/WordPress/gutenberg/pull/61388))
+-   Make sure to replace all instances of `:Where(body)` instead of just …. ([61602](https://github.com/WordPress/gutenberg/pull/61602))
+-   Reduce specificity of global styles body margin reset rule. ([61340](https://github.com/WordPress/gutenberg/pull/61340))
+-   Remove Post Template background override. ([61545](https://github.com/WordPress/gutenberg/pull/61545))
+
+#### Patterns
+
+-   Fix blocks in unsynced patterns can enable overrides. ([61639](https://github.com/WordPress/gutenberg/pull/61639))
+-   Revert "Use contentOnly locking for pattern block, remove hard-coded block check in block inspector". ([61517](https://github.com/WordPress/gutenberg/pull/61517))
+
+#### List View
+
+-   Account for text fields in shortcut handler. ([61583](https://github.com/WordPress/gutenberg/pull/61583))
+-   Add a special case for shortcuts coming from modals. ([61606](https://github.com/WordPress/gutenberg/pull/61606))
+-   Standardize List View feature name to use title case capitalization. ([61535](https://github.com/WordPress/gutenberg/pull/61535))
+
+#### Zoom Out
+
+-   Block editor: Scroll block into view on insert. ([61418](https://github.com/WordPress/gutenberg/pull/61418))
+-   Fix double scrollbars in site editor with zoom out view enabled. ([61548](https://github.com/WordPress/gutenberg/pull/61548))
+-   Fix zoom out UI scale. ([61265](https://github.com/WordPress/gutenberg/pull/61265))
+-   Add bottom and top inserters. ([61473](https://github.com/WordPress/gutenberg/pull/61473))
+-   Add patterns loading state. ([61513](https://github.com/WordPress/gutenberg/pull/61513))
+-   Don't allow dropping outside section root. ([61512](https://github.com/WordPress/gutenberg/pull/61512))
+-   Don't select last block. ([61484](https://github.com/WordPress/gutenberg/pull/61484))
+-   Pass the section root ID to the inserter. ([61464](https://github.com/WordPress/gutenberg/pull/61464))
+-   Zoom-out: Fix iframe ref error. ([61200](https://github.com/WordPress/gutenberg/pull/61200))
+
+#### Components
+
+-   Fix inconsistent complementary header styles. ([61331](https://github.com/WordPress/gutenberg/pull/61331))
+-   Fix sticking “Reset” option in `ToolsPanel`. ([60621](https://github.com/WordPress/gutenberg/pull/60621))
+-   RadioControl: Fix shrinking radio controls. ([61476](https://github.com/WordPress/gutenberg/pull/61476))
+
+#### Block Library
+
+-   Navigation Block: Add list item wrapper to social links when used in navigation block. ([61396](https://github.com/WordPress/gutenberg/pull/61396))
+-   HTML Block: Remove font weight on toolbar tab button - #61254. ([61308](https://github.com/WordPress/gutenberg/pull/61308))
+-   Time to Read Block: Fix "this block has encountered an error" - #61459. ([61614](https://github.com/WordPress/gutenberg/pull/61614))
+-   Image Block: Enable crop action when image has a link. ([61470](https://github.com/WordPress/gutenberg/pull/61470))
+-   Shortcode Block: Fix layout margin override. ([55028](https://github.com/WordPress/gutenberg/pull/55028))
+
+#### Block Editor
+
+-   Editor styles: Fix cache (by wrapper selector). ([61397](https://github.com/WordPress/gutenberg/pull/61397))
+-   Fix Truncate component for long unbreakable text. ([61137](https://github.com/WordPress/gutenberg/pull/61137))
+-   Fix focus loss due to filtering blocks. ([61558](https://github.com/WordPress/gutenberg/pull/61558))
+-   Fix: The issue of appender button not clickable in row/stack group. ([61585](https://github.com/WordPress/gutenberg/pull/61585))
+-   Writing Flow/Rich Text: Unify split logic. ([54543](https://github.com/WordPress/gutenberg/pull/54543))
+
+#### Post Editor
+
+-   Fix the 'usePaddingAppender' error. ([61500](https://github.com/WordPress/gutenberg/pull/61500))
+-   Return an empty object when no fallback templates are found (wp/v2/templates/lookup). ([60925](https://github.com/WordPress/gutenberg/pull/60925))
+
+#### Site Editor
+
+-   Fix user capabilities check for the Site Editor. ([61444](https://github.com/WordPress/gutenberg/pull/61444))
+-   Preserve the wp_theme_preview query arg when navigating in Site Editor. ([61394](https://github.com/WordPress/gutenberg/pull/61394))
+-   Trigger sidebar animations only on cross-route navigations. ([61402](https://github.com/WordPress/gutenberg/pull/61402))
+-   Site Editor: Restore the hover zoom effect when hovering the editor frame. ([61647](https://github.com/WordPress/gutenberg/pull/61647))
+
+#### Widgets Editor
+
+-   Hide the close button on the inserter for widgets editor. ([61510](https://github.com/WordPress/gutenberg/pull/61510))
+
+#### Data Views
+
+-   Fix regression on keyboard navigation. ([61478](https://github.com/WordPress/gutenberg/pull/61478))
+-   Improve dataview types. ([61586](https://github.com/WordPress/gutenberg/pull/61586))
+
+#### Interactivity API
+
+-   Interactivity API: Allow multiple event handlers for the same type with `data-wp-on-document` and `data-wp-on-window`. ([61009](https://github.com/WordPress/gutenberg/pull/61009))
+-   Interactivity API: Prevent empty namespace or different namespaces from killing the runtime. ([61409](https://github.com/WordPress/gutenberg/pull/61409))
+-   Interactivity API: Prevent wrong written directives from killing the runtime. ([61249](https://github.com/WordPress/gutenberg/pull/61249))
+
+### Accessibility
+
+#### Components
+
+-   ComboboxControl supports disabled items. ([61294](https://github.com/WordPress/gutenberg/pull/61294))
+-   Remove usage of aria-details from InputControl and BaseControl. ([61203](https://github.com/WordPress/gutenberg/pull/61203))
+
+#### Block Library
+
+-   Fix the RRS block placeholder labeling and improve spacing. ([61576](https://github.com/WordPress/gutenberg/pull/61576))
+
+#### Block Editor
+
+-   Focus currently selected block when entering canvas. ([61472](https://github.com/WordPress/gutenberg/pull/61472))
+-   Focus inserter toggle when closing the inserter sidebar. ([61467](https://github.com/WordPress/gutenberg/pull/61467))
+-   Inserter: Add close button. ([61421](https://github.com/WordPress/gutenberg/pull/61421))
+
+#### Post Editor
+
+-   Post Actions: Correctly disable dropdown trigger. ([61625](https://github.com/WordPress/gutenberg/pull/61625))
+
+### Performance
+
+-   Calculate and report quartiles in performance results. ([60950](https://github.com/WordPress/gutenberg/pull/60950))
+-   Refactor InserterTabs to use children and remove re-memoizing. ([61295](https://github.com/WordPress/gutenberg/pull/61295))
+-   Tests: Improve collection and reporting. ([61450](https://github.com/WordPress/gutenberg/pull/61450))
+-   Performance tests: Fix results file path. ([61686](https://github.com/WordPress/gutenberg/pull/61686))
+-   Revert "useBlockSync: Remove isControlled effect". ([61480](https://github.com/WordPress/gutenberg/pull/61480))
+
+### Documentation
+
+-   Update old document URLs to new ones. ([61595](https://github.com/WordPress/gutenberg/pull/61595))
+-   Add a section about `block_editor_settings_all` to the Filters and Hooks doc. ([61597](https://github.com/WordPress/gutenberg/pull/61597))
+-   Add link to VS Code Playwright Extension. ([61505](https://github.com/WordPress/gutenberg/pull/61505))
+-   Added check for duplicated slugs during manifest.json generation. ([61332](https://github.com/WordPress/gutenberg/pull/61332))
+-   Block Editor: Remove `multiline` prop from `Richtext` doc. ([61592](https://github.com/WordPress/gutenberg/pull/61592))
+-   Docs: How-to Guides > Meta Boxes - Update metabox.md. ([61314](https://github.com/WordPress/gutenberg/pull/61314))
+-   Docs: Interactivity API - Add viewScriptModule as a requirement to work with the Interactivity API. ([61355](https://github.com/WordPress/gutenberg/pull/61355))
+-   Docs: Interactivity API : New pages - About and FAQ. ([61323](https://github.com/WordPress/gutenberg/pull/61323))
+-   Docs: Interactivity Api - Small fixes. ([61403](https://github.com/WordPress/gutenberg/pull/61403))
+-   Docs: Remove list of keyboard shortcuts from FAQ page. ([61591](https://github.com/WordPress/gutenberg/pull/61591))
+-   Docs: Update theme-json-living.md to fix little issue. ([61354](https://github.com/WordPress/gutenberg/pull/61354))
+-   Fix WP versions for theme.json v3 migration in inline documentation. ([61328](https://github.com/WordPress/gutenberg/pull/61328))
+-   Several Typo Correction in Inline doc. ([61379](https://github.com/WordPress/gutenberg/pull/61379))
+-   Small fixes as per feedback received. ([61445](https://github.com/WordPress/gutenberg/pull/61445))
+-   Theme.json: Update schema with working create theme link. ([61306](https://github.com/WordPress/gutenberg/pull/61306))
+-   Update @wordpress/a11y README.md. ([61635](https://github.com/WordPress/gutenberg/pull/61635))
+-   Update Node.js requirement in create-block docs. ([60962](https://github.com/WordPress/gutenberg/pull/60962))
+-   Update and restructure the Editor Hooks doc. ([61596](https://github.com/WordPress/gutenberg/pull/61596))
+-   Updated links to developer resources on README.md. ([61525](https://github.com/WordPress/gutenberg/pull/61525))
+-   theme.json schema: Remove duplicate key. ([61523](https://github.com/WordPress/gutenberg/pull/61523))
+-   Several Typo Corrections in Inline Documentations. ([61662](https://github.com/WordPress/gutenberg/pull/61662))
+
+### Code Quality
+
+-   PHP load: move rest template controller 6.6 import to "REST" area. ([61564](https://github.com/WordPress/gutenberg/pull/61564))
+-   Replace classnames with clsx. ([61138](https://github.com/WordPress/gutenberg/pull/61138), [61380](https://github.com/WordPress/gutenberg/pull/61380))
+
+#### Block Bindings
+
+-   Remove not needed breaks in `gutenberg_block_bindings_replace_html`. ([61660](https://github.com/WordPress/gutenberg/pull/61660))
+-   Simplify the HTML replacement logic until the HTML API is ready. ([61236](https://github.com/WordPress/gutenberg/pull/61236))
+
+#### Patterns
+
+-   Pattern overrides: Use block binding editing API. ([60721](https://github.com/WordPress/gutenberg/pull/60721))
+
+#### Components
+
+-   Assess stabilization of `Theme`. ([61077](https://github.com/WordPress/gutenberg/pull/61077))
+-   Upgrade @types/react package and @types/react-dom. ([60796](https://github.com/WordPress/gutenberg/pull/60796))
+-   Fix problem with gradient-parser types. ([61679](https://github.com/WordPress/gutenberg/pull/61679))
+
+#### Block Editor
+
+-   Improve `LineHeightControl` unit tests. ([61337](https://github.com/WordPress/gutenberg/pull/61337))
+
+#### Editor
+
+-   Move the starter template options to the editor package. ([61665](https://github.com/WordPress/gutenberg/pull/61665))
+
+#### Post Editor
+
+-   Edit post: Do not consider sidebars mutually exclusive. ([61468](https://github.com/WordPress/gutenberg/pull/61468))
+-   Editor: Move the sidebar component to the editor package. ([61497](https://github.com/WordPress/gutenberg/pull/61497))
+
+#### Site Editor
+
+-   Site Editor sidebar: Provide explicit backPaths, remove the getBackPath helper. ([61286](https://github.com/WordPress/gutenberg/pull/61286))
+
+#### Data Views
+
+-   Expand typing more components. ([61654](https://github.com/WordPress/gutenberg/pull/61654))
+-   Add end-to-end tests for keyboard interactions in DataViews ListView. ([61648](https://github.com/WordPress/gutenberg/pull/61648))
+-   Add types to the ViewGrid component. ([61667](https://github.com/WordPress/gutenberg/pull/61667))
+-   Type the BulkActions component. ([61666](https://github.com/WordPress/gutenberg/pull/61666))
+-   Type the ItemActions component. ([61400](https://github.com/WordPress/gutenberg/pull/61400))
+-   Type the ViewList component. ([61246](https://github.com/WordPress/gutenberg/pull/61246))
+-   Remove `onActionPerformed` & `onActionStart` from the ActionModal API. ([61659](https://github.com/WordPress/gutenberg/pull/61659))
+
+#### Interactivity API
+
+-   Add types for warn helper. ([61687](https://github.com/WordPress/gutenberg/pull/61687))
+-   Enable strict type checking. ([59865](https://github.com/WordPress/gutenberg/pull/59865))
+
+### Tools
+
+#### Testing
+
+-   Convert FocalPointPicker tests to TypeScript. ([61373](https://github.com/WordPress/gutenberg/pull/61373))
+-   E2E: Fix artifacts handling in CI. ([61338](https://github.com/WordPress/gutenberg/pull/61338))
+-   Interactivity API: Fix flaky tests for attribute hydration. ([61615](https://github.com/WordPress/gutenberg/pull/61615))
+-   Lightbox UI block override tests. ([61414](https://github.com/WordPress/gutenberg/pull/61414))
+-   Playwright Utils: Silence some of the warnings coming from Firefox. ([61451](https://github.com/WordPress/gutenberg/pull/61451))
+-   Test: Fix failing style linting error. ([61649](https://github.com/WordPress/gutenberg/pull/61649))
+-   Tests: Fix flaky interactivity deferred test. ([61359](https://github.com/WordPress/gutenberg/pull/61359))
+
+#### Build Tooling
+
+-   Add stylelint rule to disallow the `order` CSS property. ([61243](https://github.com/WordPress/gutenberg/pull/61243))
+-   Enforce `@since` tags in /packages/block-serialization-default-parser/ and other files. ([60007](https://github.com/WordPress/gutenberg/pull/60007))
+-   Bug: False positives for `react-hooks/exhaustive-deps`. ([61599](https://github.com/WordPress/gutenberg/pull/61599))
+-   Scripts: Add RTLCSS to wp-scripts. ([61540](https://github.com/WordPress/gutenberg/pull/61540))
+-   WP-ENV: Fix return type and tests. ([61631](https://github.com/WordPress/gutenberg/pull/61631))
+-   Create Block: Match specified engines with Gutenberg and Core. ([61430](https://github.com/WordPress/gutenberg/pull/61430))
+-   Set `prefer-dedupe` as the default. ([61630](https://github.com/WordPress/gutenberg/pull/61630))
+-   build: Suggest workaround if `tsc --build` fails. ([61501](https://github.com/WordPress/gutenberg/pull/61501))
+-   build:package-types: Run silently to reduce user confusion. ([61530](https://github.com/WordPress/gutenberg/pull/61530))
+-   GitHub Actions: Fix PHP file change detection filter pattern. ([61183](https://github.com/WordPress/gutenberg/pull/61183))
+-   Dedupe packages. ([61532](https://github.com/WordPress/gutenberg/pull/61532))
+-   Patch `react-autosize-textarea` for updated types. ([61570](https://github.com/WordPress/gutenberg/pull/61570))
+-   Upgrade @use-gesture/react. ([61503](https://github.com/WordPress/gutenberg/pull/61503))
+-   Upgrade framer-motion. ([61572](https://github.com/WordPress/gutenberg/pull/61572))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @amitraj2203: Embeds: Add Bluesky variation. ([61352](https://github.com/WordPress/gutenberg/pull/61352))
+-   @jpstevens: Convert FocalPointPicker tests to TypeScript. ([61373](https://github.com/WordPress/gutenberg/pull/61373))
+-   @kovshenin: Update Node.js requirement in create-block docs. ([60962](https://github.com/WordPress/gutenberg/pull/60962))
+-   @mrmurphy: Upgrade @types/react package and @types/react-dom. ([60796](https://github.com/WordPress/gutenberg/pull/60796))
+-   @scheinercc: Update @wordpress/a11y README.md. ([61635](https://github.com/WordPress/gutenberg/pull/61635))
+-   @StyleShit: Bug: False positives for `react-hooks/exhaustive-deps`. ([61599](https://github.com/WordPress/gutenberg/pull/61599))
+-   @vipul0425: Fix: The issue of appender button not clickable in row/stack group. ([61585](https://github.com/WordPress/gutenberg/pull/61585))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @ajlende @amitraj2203 @anton-vlasenko @artemiomorales @bacoords @carolinan @cbravobernal @colinduwe @DaniGuardiola @DAreRodz @desrosj @draganescu @ellatrix @fullofcaffeine @geriux @getdave @gigitux @hbhalodia @jameskoster @jasmussen @jeryj @jffng @johnhooks @jorgefilipecosta @jpstevens @jsnajdr @juanmaguitar @kevin940726 @kovshenin @MaggieCabrera @Mamaduka @mcsf @mrmurphy @ndiego @noisysocks @ntsekouras @oandregal @ramonjd @retrofox @richtabor @ryelle @SantosGuillamot @scheinercc @scruffian @shail-mehta @sirreal @stokesman @StyleShit @swissspidy @t-hamano @talldan @tellthemachines @tyxla @vipul0425 @WunderBart @youknowriad
+
+= 18.3.0 =
+
+## Changelog
+
+### Enhancements
+
+-   Output post classes in the editor. ([60642](https://github.com/WordPress/gutenberg/pull/60642))
+-   Abstract keyboard shortcuts for heading to paragraph transform and vice-versa. ([60606](https://github.com/WordPress/gutenberg/pull/60606))
+-   Capitalize more occurrences of Navigation Menu. ([60747](https://github.com/WordPress/gutenberg/pull/60747))
+-   Clean up top toolbar to use same metrics as block toolbar. ([61126](https://github.com/WordPress/gutenberg/pull/61126))
+-   Update template and template parts labels. ([61146](https://github.com/WordPress/gutenberg/pull/61146))
+-   Update the template preview menu item text in the Template option. ([57802](https://github.com/WordPress/gutenberg/pull/57802))
+-   Upgrade React to v18.3. ([61202](https://github.com/WordPress/gutenberg/pull/61202))
+
+#### Site Editor
+
+-   Add PluginDocumentSettingPanel in template inspector controls. ([60961](https://github.com/WordPress/gutenberg/pull/60961))
+-   Add publish flow in site editor. ([61136](https://github.com/WordPress/gutenberg/pull/61136))
+-   Classic Theme: Expose new Patterns page and remove Template Parts submenu. ([61080](https://github.com/WordPress/gutenberg/pull/61080))
+-   Consolidate editor/canvas resize handles. ([60712](https://github.com/WordPress/gutenberg/pull/60712))
+-   Patterns data view: Remove icons in favor of dedicated sync status field. ([60833](https://github.com/WordPress/gutenberg/pull/60833))
+-   Patterns: Remove "Manage all parts" page & link. ([60689](https://github.com/WordPress/gutenberg/pull/60689))
+-   Tweak Template/Template Parts/Page creation modal. ([61005](https://github.com/WordPress/gutenberg/pull/61005))
+-   Drop patterns and blocks between sections only in zoom out mode. ([60828](https://github.com/WordPress/gutenberg/pull/60828))
+-   Insert patterns at the end of the root section. ([60855](https://github.com/WordPress/gutenberg/pull/60855))
+-   Typography Panel: Use simple labels. ([60886](https://github.com/WordPress/gutenberg/pull/60886))
+-   Font Library: Convert heading text to heading elements and group fonts as a list. ([58834](https://github.com/WordPress/gutenberg/pull/58834))
+
+#### Block Editor
+
+-   Add new `TextAlignmentControl` component. ([60841](https://github.com/WordPress/gutenberg/pull/60841))
+-   Editor: Sort style overrides by block client ids. ([61039](https://github.com/WordPress/gutenberg/pull/61039))
+-   Inserter: Bail early when a user has no permission to upload media. ([60983](https://github.com/WordPress/gutenberg/pull/60983))
+-   List View: Use 'isMatch' for unselect the shortcut. ([61223](https://github.com/WordPress/gutenberg/pull/61223))
+-   Move search into inserter tabs. ([61108](https://github.com/WordPress/gutenberg/pull/61108))
+-   Polish Autocomplete popover. ([60131](https://github.com/WordPress/gutenberg/pull/60131))
+
+#### Global Styles
+
+-   Add scoping of feature level selectors for custom block style variations. ([61033](https://github.com/WordPress/gutenberg/pull/61033))
+-   Allow negative values for margin controls. ([60347](https://github.com/WordPress/gutenberg/pull/60347))
+-   Allow opt out of certain sets of styles in the editor. ([61035](https://github.com/WordPress/gutenberg/pull/61035))
+-   Filter out color and typography variations. ([60220](https://github.com/WordPress/gutenberg/pull/60220))
+-   Update utils for scoping CSS selectors. ([61026](https://github.com/WordPress/gutenberg/pull/61026))
+-   Add defaultFontSizes theme.json (theme.json v3). ([58409](https://github.com/WordPress/gutenberg/pull/58409))
+
+#### Block Library
+
+-   Group: Remove hardcoded Group block example styles. ([61027](https://github.com/WordPress/gutenberg/pull/61027))
+-   Remove `Button` component from social link block, replace with `button` element. ([61270](https://github.com/WordPress/gutenberg/pull/61270))
+-   List View: Unify shortcut handlers. ([61130](https://github.com/WordPress/gutenberg/pull/61130))
+-   Update list view spacing. ([60713](https://github.com/WordPress/gutenberg/pull/60713))
+
+#### Post Editor
+
+-   Editor: Move around word count, post status and last edited info in page summary. ([61235](https://github.com/WordPress/gutenberg/pull/61235))
+-   Editor: Update post excerpt panel with new designs. ([60894](https://github.com/WordPress/gutenberg/pull/60894))
+-   Add duplicate post action. ([60637](https://github.com/WordPress/gutenberg/pull/60637))
+-   Make duplicate post action available only on the plugin for now. ([61192](https://github.com/WordPress/gutenberg/pull/61192))
+
+#### Data Views
+
+-   Unbox items in grid layout. ([61159](https://github.com/WordPress/gutenberg/pull/61159))
+-   Update alignment of preview contents in Patterns and Templates data views. ([61190](https://github.com/WordPress/gutenberg/pull/61190))
+
+#### Components
+
+-   ComboboxControl: Simplify string normalization. ([60893](https://github.com/WordPress/gutenberg/pull/60893))
+-   Update help text alignment in CheckboxControl. ([60787](https://github.com/WordPress/gutenberg/pull/60787))
+-   RangeControl: Remove deprecated `reducedMotion` util. ([61119](https://github.com/WordPress/gutenberg/pull/61119))
+-   components - inputStyleNeutral: Remove deprecated `reducedMotion` util. ([61122](https://github.com/WordPress/gutenberg/pull/61122))
+
+### Bug Fixes
+
+-   Editor: Do not show scrollbars when closing sidebars. ([60889](https://github.com/WordPress/gutenberg/pull/60889))
+-   Fix block tab spacing when few available blocks. ([61296](https://github.com/WordPress/gutenberg/pull/61296))
+-   Fix pattern preview focus styles. ([60881](https://github.com/WordPress/gutenberg/pull/60881))
+-   Fix styles panel header. ([61319](https://github.com/WordPress/gutenberg/pull/61319))
+-   Fix typo in clear customizations text. ([61089](https://github.com/WordPress/gutenberg/pull/61089))
+-   Fix: Missing format, categories, and tags on the duplicate post action. ([61194](https://github.com/WordPress/gutenberg/pull/61194))
+-   Fix: Post actions in post card panel is not checking for eligibility. ([60994](https://github.com/WordPress/gutenberg/pull/60994))
+-   Notices: Fix snackbar placement. ([60912](https://github.com/WordPress/gutenberg/pull/60912))
+-   Setup Node action - Set arch for key value. ([61010](https://github.com/WordPress/gutenberg/pull/61010))
+-   docgen: Fix qualified types with type parameters. ([61097](https://github.com/WordPress/gutenberg/pull/61097))
+-   Background image: Tools panel shouldn't show reset button for inherited values. ([61304](https://github.com/WordPress/gutenberg/pull/61304))
+-   Fix template files query by post-type. ([61244](https://github.com/WordPress/gutenberg/pull/61244))
+-   Remove unnecessary period in template block selection notice. ([61087](https://github.com/WordPress/gutenberg/pull/61087))
+-   Fix issue where pattern override values reset when saving. ([61023](https://github.com/WordPress/gutenberg/pull/61023))
+-   Blocks: Merge variations bootstrapped from a server with the client definitions. ([60832](https://github.com/WordPress/gutenberg/pull/60832))
+-   Bump minimum required WordPress version to 6.4. ([60780](https://github.com/WordPress/gutenberg/pull/60780))
+
+#### Site Editor
+
+-   DocumentBar: Account for when top toolbar is open. ([61118](https://github.com/WordPress/gutenberg/pull/61118))
+-   Don't show appender at all inside sections on zoom-out mode. ([60948](https://github.com/WordPress/gutenberg/pull/60948))
+-   Editor: Avoid triggering the start page modal on unsaved pages. ([61082](https://github.com/WordPress/gutenberg/pull/61082))
+-   Fix zoom out mode background color on Safari. ([60873](https://github.com/WordPress/gutenberg/pull/60873))
+-   Fix: Pattern details page backpath. ([61174](https://github.com/WordPress/gutenberg/pull/61174))
+-   Make the zoom out inserters work for sections inside the section root. ([60909](https://github.com/WordPress/gutenberg/pull/60909))
+-   Select last section if parent section doesn't exist. ([61002](https://github.com/WordPress/gutenberg/pull/61002))
+
+#### Components
+
+-   Box Control: Fix issue with negative values. ([60984](https://github.com/WordPress/gutenberg/pull/60984))
+-   Fix usages of uSES with missing getServerSnapshot. ([60943](https://github.com/WordPress/gutenberg/pull/60943))
+
+#### Block Library
+
+-   Avoid unnecessary heading level and paragraph transform via keyboard shortcuts. ([60955](https://github.com/WordPress/gutenberg/pull/60955))
+-   Navigation: Remove unnecessary `__experimentalStyle`. ([60965](https://github.com/WordPress/gutenberg/pull/60965))
+
+### Accessibility
+
+-   Add aria-haspopup="dialog" to Enable/Disable overrides button. ([61309](https://github.com/WordPress/gutenberg/pull/61309))
+-   Fix unlabeled PostURL Copy button. ([61195](https://github.com/WordPress/gutenberg/pull/61195))
+-   [Data Views] User patterns: Use excerpt as description. ([60549](https://github.com/WordPress/gutenberg/pull/60549))
+
+### Performance
+
+-   Block lib: columns: Remove store subs on mount. ([61123](https://github.com/WordPress/gutenberg/pull/61123))
+-   Block: Remove outline related store selecting. ([61139](https://github.com/WordPress/gutenberg/pull/61139))
+-   Rich text: Combine all ref effects. ([60936](https://github.com/WordPress/gutenberg/pull/60936))
+-   Template lock: Batch block disabling. ([60934](https://github.com/WordPress/gutenberg/pull/60934))
+-   useBlockSync: Avoid replacing blocks twice on mount. ([60967](https://github.com/WordPress/gutenberg/pull/60967))
+-   useMatchMedia: Cache queries. ([61000](https://github.com/WordPress/gutenberg/pull/61000))
+-   ListViewBlock: Combine 'useSelect' hooks, part two. ([61054](https://github.com/WordPress/gutenberg/pull/61054))
+-   Remove `showFixedToolbar` from `useShowBlockTools`. ([60717](https://github.com/WordPress/gutenberg/pull/60717))
+-   Editor: Optimize some of the post-support panels. ([61003](https://github.com/WordPress/gutenberg/pull/61003))
+-   Core data: getEditedEntityRecord: Do not return empty object. ([60988](https://github.com/WordPress/gutenberg/pull/60988))
+-   Drop zone: Avoid media query on mount. ([60546](https://github.com/WordPress/gutenberg/pull/60546))
+-   Nav link: Use rich text value. ([60503](https://github.com/WordPress/gutenberg/pull/60503))
+
+### Experiments
+
+#### Interactivity API
+
+-   Add full page client-side navigation experiment setting. ([59707](https://github.com/WordPress/gutenberg/pull/59707))
+
+### Documentation
+
+-   Add AutosaveMonitor component JSDoc enhancements. ([60905](https://github.com/WordPress/gutenberg/pull/60905))
+-   Add Documentation for CharacterCount component. ([60906](https://github.com/WordPress/gutenberg/pull/60906))
+-   Add EditorSnackbars component documentation. ([61110](https://github.com/WordPress/gutenberg/pull/61110))
+-   Add documentation for DocumentOutline and DocumentOutlineCheck components. ([61129](https://github.com/WordPress/gutenberg/pull/61129))
+-   Add documentation for EditorHistoryRedo and EditorHistoryUndo. ([60932](https://github.com/WordPress/gutenberg/pull/60932))
+-   Add documentation for EditorKeyboardShortcuts and EditorKeyboardShortcutsRegister. ([60933](https://github.com/WordPress/gutenberg/pull/60933))
+-   Add documentation for PostAuthor, PostAuthorCheck, PostAuthorPanel components. ([61090](https://github.com/WordPress/gutenberg/pull/61090))
+-   Added doc for components PageAttributesCheck, PageAttributesPanel, PageAttributesOrder, PageAttributesParent. ([60977](https://github.com/WordPress/gutenberg/pull/60977))
+-   Change the name of the Interactivity API quick start guide markdown file. ([61198](https://github.com/WordPress/gutenberg/pull/61198))
+-   Docs: Fix import statement of PluginMoreMenuItem. ([60931](https://github.com/WordPress/gutenberg/pull/60931))
+-   Docs: Handle "oneOf" in theme.json schema doc generation. ([61024](https://github.com/WordPress/gutenberg/pull/61024))
+-   Fix import in block editor’s readme example. ([61218](https://github.com/WordPress/gutenberg/pull/61218))
+-   Fix use local version of theme.json schema in bundled files. ([61312](https://github.com/WordPress/gutenberg/pull/61312))
+-   FontSizerPicker: Improve documentation for default units. ([60996](https://github.com/WordPress/gutenberg/pull/60996))
+-   InputControl: Added password visibility story. ([60898](https://github.com/WordPress/gutenberg/pull/60898))
+-   Move iAPI documentation from package to reference guides. ([61143](https://github.com/WordPress/gutenberg/pull/61143))
+-   Refresh the folder structure documentation page. ([60953](https://github.com/WordPress/gutenberg/pull/60953))
+-   Small-typo-change. ([61178](https://github.com/WordPress/gutenberg/pull/61178))
+-   Theme JSON: Backport PHP annotations from Core. ([61301](https://github.com/WordPress/gutenberg/pull/61301))
+-   Update an anchor link in block-in-the-editor.md. ([59527](https://github.com/WordPress/gutenberg/pull/59527))
+-   Update block-deprecation.md. ([60768](https://github.com/WordPress/gutenberg/pull/60768))
+-   Update documentation for theme.json version 3. ([61221](https://github.com/WordPress/gutenberg/pull/61221))
+-   Update main readme file with relevant current information. ([60942](https://github.com/WordPress/gutenberg/pull/60942))
+
+### Code Quality
+
+-   DataViews: Enable types. ([61185](https://github.com/WordPress/gutenberg/pull/61185))
+-   Editor: Cleanup edit-post classnames and documentation. ([61240](https://github.com/WordPress/gutenberg/pull/61240))
+-   Editor: Consistently deprecate edit-post and edit-site slots. ([61134](https://github.com/WordPress/gutenberg/pull/61134))
+-   Editor: Unify the BlockContextualToolbar component between post and site editors. ([61104](https://github.com/WordPress/gutenberg/pull/61104))
+-   Editor: Unify the more menu. ([60910](https://github.com/WordPress/gutenberg/pull/60910))
+-   Editor: Unify the region navigation keyboard shortcuts. ([60907](https://github.com/WordPress/gutenberg/pull/60907))
+-   Fix: Actions moved to the editor package still reference edit-site on their ids. ([60899](https://github.com/WordPress/gutenberg/pull/60899))
+-   Remove unnecessary `usesContext` from paragraph block. ([61008](https://github.com/WordPress/gutenberg/pull/61008))
+-   Removed Extra Space Before Since. ([60918](https://github.com/WordPress/gutenberg/pull/60918))
+-   ToolsMoreMenuGroup: Remove form post editor. ([61132](https://github.com/WordPress/gutenberg/pull/61132))
+-   Unify placeholders. ([59275](https://github.com/WordPress/gutenberg/pull/59275))
+-   Use `math.div` for scss division. ([61285](https://github.com/WordPress/gutenberg/pull/61285))
+-   useBlockProps: Remove dead code. ([61133](https://github.com/WordPress/gutenberg/pull/61133))
+-   useBlockSync: Just testing without isControlled effect. ([61114](https://github.com/WordPress/gutenberg/pull/61114))
+-   Add eslint autofix commit to ignored git commits. ([61253](https://github.com/WordPress/gutenberg/pull/61253))
+-   Rephrasing for accuracy and link to Core Trac ticket. ([61284](https://github.com/WordPress/gutenberg/pull/61284))
+-   Blocks: Add a warning when registering variation without a name. ([61037](https://github.com/WordPress/gutenberg/pull/61037))
+-   DataViews: Cleanup unused type property. ([61197](https://github.com/WordPress/gutenberg/pull/61197))
+-   DataViews: More dataviews types. ([61193](https://github.com/WordPress/gutenberg/pull/61193))
+-   Quality: Fix php warning error. ([61321](https://github.com/WordPress/gutenberg/pull/61321))
+-   UseLocation instead of window.location.href. ([61230](https://github.com/WordPress/gutenberg/pull/61230))
+-   Use contentOnly locking for pattern block. ([61227](https://github.com/WordPress/gutenberg/pull/61227))
+-   Editor: No need to memorize callback in 'SwapTemplateButton'. ([61049](https://github.com/WordPress/gutenberg/pull/61049))
+-   Improve data-wp-context debugging by validating it as a stringified JSON Object. ([61045](https://github.com/WordPress/gutenberg/pull/61045))
+-   Theme JSON: Extract util to get valid block style variations. ([61030](https://github.com/WordPress/gutenberg/pull/61030))
+-   Elements: Deprecate old block support filter callbacks. ([59538](https://github.com/WordPress/gutenberg/pull/59538))
+
+#### Components
+
+-   AlignmentMatrixControl: Remove deprecated `reducedMotion` util. ([61113](https://github.com/WordPress/gutenberg/pull/61113))
+-   FocalPointPicker: Remove deprecated `reducedMotion` util. ([61116](https://github.com/WordPress/gutenberg/pull/61116))
+-   Navigation: Remove deprecated `reducedMotion` util. ([61117](https://github.com/WordPress/gutenberg/pull/61117))
+-   Remove "experimental" designation for `CustomSelectControlV2`. ([61078](https://github.com/WordPress/gutenberg/pull/61078))
+-   ToggleGroupControl: Remove deprecated `reducedMotion` util. ([61120](https://github.com/WordPress/gutenberg/pull/61120))
+-   View: Fix TypeScript types. ([60919](https://github.com/WordPress/gutenberg/pull/60919))
+-   components/elevation: Remove deprecated reducedMotion util. ([61115](https://github.com/WordPress/gutenberg/pull/61115))
+
+#### Block Editor
+
+-   Convert Media Inserter to Tabs Pattern. ([60970](https://github.com/WordPress/gutenberg/pull/60970))
+-   Obviate mousetrap around Navigation Link popover. ([61050](https://github.com/WordPress/gutenberg/pull/61050))
+-   editPost: Deprecate \_\_experimentalPluginPostExcerpt. ([61188](https://github.com/WordPress/gutenberg/pull/61188))
+-   editPost: \_\_experimentalPluginPostExcerpt return `<PluginPostExcerpt />`. ([61238](https://github.com/WordPress/gutenberg/pull/61238))
+-   useBlockRefs: Use more efficient lookup map, use uSES. ([60945](https://github.com/WordPress/gutenberg/pull/60945))
+-   withBlockTree: Simplify code that replaces/removes controlled blocks. ([61234](https://github.com/WordPress/gutenberg/pull/61234))
+
+### Tools
+
+-   ESLint Plugin: Handle multi-line translator comments. ([61096](https://github.com/WordPress/gutenberg/pull/61096))
+
+#### Testing
+
+-   Components: Fix snapshot tests of ToggleGroupControl. ([61228](https://github.com/WordPress/gutenberg/pull/61228))
+-   Fix ESLint warning in Performance test files. ([61311](https://github.com/WordPress/gutenberg/pull/61311))
+-   Hotfix: Fixed failing snapshot test. ([61274](https://github.com/WordPress/gutenberg/pull/61274))
+-   Update 3rd party actions within composite action. ([61211](https://github.com/WordPress/gutenberg/pull/61211))
+
+#### Build Tooling
+
+-   Remove block-editor package usage from components. ([60999](https://github.com/WordPress/gutenberg/pull/60999))
+-   lint-staged-typecheck: Don't run TSC when no TS project is affected. ([60998](https://github.com/WordPress/gutenberg/pull/60998))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @huubl: Output post classes in the editor. ([60642](https://github.com/WordPress/gutenberg/pull/60642))
+-   @itzmekhokan: Fix typo in clear customizations text. ([61089](https://github.com/WordPress/gutenberg/pull/61089))
+-   @lanresmith: Update an anchor link in block-in-the-editor.md. ([59527](https://github.com/WordPress/gutenberg/pull/59527))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @ajlende @carolinan @cbravobernal @colorful-tones @DaniGuardiola @desrosj @draganescu @ellatrix @fabiankaegy @fullofcaffeine @geriux @huubl @itzmekhokan @jameskoster @jasmussen @jeryj @jorgefilipecosta @jsnajdr @juanfra @juanmaguitar @lanresmith @MaggieCabrera @Mamaduka @mirka @ntsekouras @oandregal @ockham @ramonjd @retrofox @richtabor @SantosGuillamot @scruffian @shail-mehta @sirreal @stokesman @sunil25393 @swissspidy @t-hamano @talldan @twstokes @tyxla @youknowriad
+
+= 18.2.0 =
+
+## Changelog
+
+-   Bump minimum required PHP version to 7.2 ([60714](https://github.com/WordPress/gutenberg/pull/60714))
+
+### Enhancements
+
+#### Site Editor
+
+-   Add rename and trash actions to page panel. ([60232](https://github.com/WordPress/gutenberg/pull/60232))
+-   Adjust frame animation profile. ([60589](https://github.com/WordPress/gutenberg/pull/60589))
+-   Animate the radius of the frame. ([60415](https://github.com/WordPress/gutenberg/pull/60415))
+-   Create router adapter for sidebar. ([60466](https://github.com/WordPress/gutenberg/pull/60466))
+-   Improve the header animation. ([60408](https://github.com/WordPress/gutenberg/pull/60408))
+-   Index view for Templates & Parts: Use `grid` layout as default. ([60069](https://github.com/WordPress/gutenberg/pull/60069))
+-   Pages: Display content frame in mobile when canvas is not edit. ([60409](https://github.com/WordPress/gutenberg/pull/60409))
+-   Simplify template reset language. ([60256](https://github.com/WordPress/gutenberg/pull/60256))
+-   Template parts in patterns page: Add author field. ([60372](https://github.com/WordPress/gutenberg/pull/60372))
+-   Template parts: Set backpath to patterns page. ([60667](https://github.com/WordPress/gutenberg/pull/60667))
+-   Update hub markup and animation. ([60410](https://github.com/WordPress/gutenberg/pull/60410))
+-   Update site hub action positioning. ([60511](https://github.com/WordPress/gutenberg/pull/60511))
+
+#### Components
+
+-   CustomSelectControlV2: Support disabled in item types. ([60896](https://github.com/WordPress/gutenberg/pull/60896))
+-   ExternalLink: Replace icon with unicode arrow. ([60255](https://github.com/WordPress/gutenberg/pull/60255))
+-   InputBase: Simplify focus styles. ([60226](https://github.com/WordPress/gutenberg/pull/60226))
+-   ProgressBar: Moved width to css var for perf. ([60388](https://github.com/WordPress/gutenberg/pull/60388))
+-   SlotFill: Replace valtio with custom ObservableMap. ([60879](https://github.com/WordPress/gutenberg/pull/60879))
+-   Tabs: Fallback to first enabled tab if no active tab Id. ([60681](https://github.com/WordPress/gutenberg/pull/60681))
+-   Text: Add text-wrap: Pretty. ([60164](https://github.com/WordPress/gutenberg/pull/60164))
+-   Try: Reduce checkbox size in data views. ([60475](https://github.com/WordPress/gutenberg/pull/60475))
+
+#### Post Editor
+
+-   Confirm dialog: Use more descriptive text for the confirm button. ([60364](https://github.com/WordPress/gutenberg/pull/60364))
+-   Editor: Add wordcount and reading time info in post card. ([60672](https://github.com/WordPress/gutenberg/pull/60672))
+-   Editor: Animate opening and closing editor right sidebar. ([60561](https://github.com/WordPress/gutenberg/pull/60561))
+-   Editor: Animate the inserter and list view panels. ([60665](https://github.com/WordPress/gutenberg/pull/60665))
+-   Editor: Update post URL component. ([60632](https://github.com/WordPress/gutenberg/pull/60632))
+-   Editor: Use the 'ConfirmDialog' component in template validation notice. ([60385](https://github.com/WordPress/gutenberg/pull/60385))
+-   Enable template preview in post editor for non administrators. ([60447](https://github.com/WordPress/gutenberg/pull/60447))
+-   Support insert before/after keyboard shortcuts when focus is within the list view. ([60651](https://github.com/WordPress/gutenberg/pull/60651))
+-   Update publish flow. ([60456](https://github.com/WordPress/gutenberg/pull/60456))
+
+#### Patterns
+
+-   Add a "All Template Parts" section. ([60775](https://github.com/WordPress/gutenberg/pull/60775))
+-   Back Compat: Add Patterns submenu for WordPress 6.4. ([60804](https://github.com/WordPress/gutenberg/pull/60804))
+-   Patterns page: Add edit & view revision actions to parts. ([60659](https://github.com/WordPress/gutenberg/pull/60659))
+-   Remove "Template parts" sidebar group. ([60359](https://github.com/WordPress/gutenberg/pull/60359))
+-   Site Editor: Support starter patterns. ([60745](https://github.com/WordPress/gutenberg/pull/60745))
+
+#### Synced Patterns
+
+-   Adjust allow pattern overrides UX flow. ([60769](https://github.com/WordPress/gutenberg/pull/60769))
+-   Consolidate "bound block" color and "synced" colors. ([60617](https://github.com/WordPress/gutenberg/pull/60617))
+-   Improve override indication for editable blocks in synced patterns. ([60599](https://github.com/WordPress/gutenberg/pull/60599))
+-   Refine rename flow for blocks with overrides. ([60234](https://github.com/WordPress/gutenberg/pull/60234))
+
+#### Zoom Out
+
+-   Adjust block selection button. ([60348](https://github.com/WordPress/gutenberg/pull/60348))
+-   Animation: Avoid fixed width when animating the secondary sidebar. ([60693](https://github.com/WordPress/gutenberg/pull/60693))
+-   Introduce section container selection when assembling patterns (zoom out mode). ([59249](https://github.com/WordPress/gutenberg/pull/59249))
+-   Update zoom out scale. ([60618](https://github.com/WordPress/gutenberg/pull/60618))
+
+#### Block Library
+
+-   Add loading state on image upload in featured image, Site logo and Cover blocks. ([59519](https://github.com/WordPress/gutenberg/pull/59519))
+-   File: Use HTML API to update the PDF preview label. ([60494](https://github.com/WordPress/gutenberg/pull/60494))
+-   Navigation block: Add current-menu-item class for post type archive. ([57808](https://github.com/WordPress/gutenberg/pull/57808))
+-   Remove block renaming control from advanced inspector controls group. ([60453](https://github.com/WordPress/gutenberg/pull/60453))
+
+#### Data Views
+
+-   Add ability to display fields as a badge in grid layout. ([60284](https://github.com/WordPress/gutenberg/pull/60284))
+-   Data views table row: Make checkboxes and actions visible on touch devices. ([60829](https://github.com/WordPress/gutenberg/pull/60829))
+-   DataViews: Make the experiment about custom views. ([60813](https://github.com/WordPress/gutenberg/pull/60813))
+
+#### Layout
+
+-   Add a Row control to grid layout in manual mode. ([60652](https://github.com/WordPress/gutenberg/pull/60652))
+-   Apply negative margins for alignfull children of blocks with custom padding set. ([60716](https://github.com/WordPress/gutenberg/pull/60716))
+-   Try reducing specificity of layout style selectors. ([60228](https://github.com/WordPress/gutenberg/pull/60228))
+
+#### Block Editor
+
+-   Remove animation from InlineLinkUI. ([60575](https://github.com/WordPress/gutenberg/pull/60575))
+-   Remove root appender. ([60697](https://github.com/WordPress/gutenberg/pull/60697))
+-   Try: Add new `textAlign` block support. ([59531](https://github.com/WordPress/gutenberg/pull/59531))
+
+#### Global Styles
+
+-   Background image: Display default background size value in global styles. ([60490](https://github.com/WordPress/gutenberg/pull/60490))
+-   Background UI control labels. ([60264](https://github.com/WordPress/gutenberg/pull/60264))
+-   Use text and button background color for color indicators. ([59514](https://github.com/WordPress/gutenberg/pull/59514))
+
+#### Font Library
+
+-   Change Spinner to ProgressBar component. ([60570](https://github.com/WordPress/gutenberg/pull/60570))
+
+#### Interactivity API
+
+-   Include `preact/debug` when `SCRIPT_DEBUG` is enabled. ([60514](https://github.com/WordPress/gutenberg/pull/60514))
+
+### New APIs
+
+#### Extensibility
+
+-   Editor: Support PluginPostStatusInfo Slot in the site editor. ([60814](https://github.com/WordPress/gutenberg/pull/60814))
+-   Editor: Unify PluginMoreMenuItem API between post and site editors. ([60778](https://github.com/WordPress/gutenberg/pull/60778))
+    -   Fix: Use core instead of core/editor on normalizeComplementaryAreaScope. ([60821](https://github.com/WordPress/gutenberg/pull/60821))
+-   Editor: Unify PluginSidebarMoreMenuItem. ([60853](https://github.com/WordPress/gutenberg/pull/60853))
+-   Editor: Unify the PluginSidebar slot between post and site editors. ([60815](https://github.com/WordPress/gutenberg/pull/60815))
+
+### Bug Fixes
+
+-   Fix: Add types to useSuspenseSelect. ([60733](https://github.com/WordPress/gutenberg/pull/60733))
+-   Fix experimental useHasRecursion deprecation. ([60451](https://github.com/WordPress/gutenberg/pull/60451))
+-   Fix translatable string in pagination modal. ([60742](https://github.com/WordPress/gutenberg/pull/60742))
+-   Interactivity: Return useMemo and useCallback hooks. ([60474](https://github.com/WordPress/gutenberg/pull/60474))
+-   Only show block icon in toolbar for contentOnly blocks when block is a synced block. ([60647](https://github.com/WordPress/gutenberg/pull/60647))
+-   Patterns: Guard for unknown pattern in server-side resolver. ([60464](https://github.com/WordPress/gutenberg/pull/60464))
+-   Snackbar: Make the `explicitDismiss` string translatable. ([60368](https://github.com/WordPress/gutenberg/pull/60368))
+-   Update standardisation of 'Navigation Menu' to have both words capitalised in user-facing menus. ([60262](https://github.com/WordPress/gutenberg/pull/60262))
+    -   Standardise capitalisation of Navigation Menu in sidebar. ([60527](https://github.com/WordPress/gutenberg/pull/60527))
+
+#### Block Library
+
+-   Embed: Avoid retrying valid URLs. ([60655](https://github.com/WordPress/gutenberg/pull/60655))
+-   File: Mark update for setting default label as non-persistent. ([60492](https://github.com/WordPress/gutenberg/pull/60492))
+-   Fix don't close overlay menu when focus leaves submenu. ([60406](https://github.com/WordPress/gutenberg/pull/60406))
+-   Fix pattern block recursion handling. ([60452](https://github.com/WordPress/gutenberg/pull/60452))
+-   Image: Fix cropper resize on align change (react-easy-crop upgrade). ([60581](https://github.com/WordPress/gutenberg/pull/60581))
+-   Latest Posts: Remove wrapper div and apply consistent class. ([60728](https://github.com/WordPress/gutenberg/pull/60728))
+-   List: Disable edit as HTML support. ([55656](https://github.com/WordPress/gutenberg/pull/55656))
+-   Media & Text: Hide the alt text option for featured images. ([60496](https://github.com/WordPress/gutenberg/pull/60496))
+-   Post title: Re-add the paragraph level (without UI). ([60548](https://github.com/WordPress/gutenberg/pull/60548))
+-   Pullquote: Reduce specificity of padding rule to avoid conflicts with global styles. ([60649](https://github.com/WordPress/gutenberg/pull/60649))
+-   Separator block: Reduce default border styles to avoid conflicts with global styles. ([60740](https://github.com/WordPress/gutenberg/pull/60740))
+
+#### Site Editor
+
+-   Chore: Fix missing comma on welcome guide styles. ([60596](https://github.com/WordPress/gutenberg/pull/60596))
+-   Fallback to URL when site title is empty. ([60885](https://github.com/WordPress/gutenberg/pull/60885))
+-   Fix activating a theme in site editor when previewing. ([60699](https://github.com/WordPress/gutenberg/pull/60699))
+-   Fix site icon animation. ([60419](https://github.com/WordPress/gutenberg/pull/60419))
+-   Fix small regression on the resize handle. ([60427](https://github.com/WordPress/gutenberg/pull/60427))
+-   Fix the removePropertyFromObject function throws an error if the object is null. ([60831](https://github.com/WordPress/gutenberg/pull/60831))
+-   Fix: Style issue on page actions button. ([60592](https://github.com/WordPress/gutenberg/pull/60592))
+-   Pattern page: Fix deps for `onActionPerformed` useCallback. ([60784](https://github.com/WordPress/gutenberg/pull/60784))
+-   Remove outdated border radius animation. ([60454](https://github.com/WordPress/gutenberg/pull/60454))
+-   Router: Load proper sidebar for `/wp_template`. ([60850](https://github.com/WordPress/gutenberg/pull/60850))
+-   [Site Editor]: Fix ability to edit trashed pages. ([60236](https://github.com/WordPress/gutenberg/pull/60236))
+
+#### Post Editor
+
+-   Editor: Do not render publish time and post status panels in design post types. ([60857](https://github.com/WordPress/gutenberg/pull/60857))
+-   Editor: Fix post status label styles for low-capability users. ([60854](https://github.com/WordPress/gutenberg/pull/60854))
+-   Fix display of shortcut to add non breaking space in the post editor. ([60625](https://github.com/WordPress/gutenberg/pull/60625))
+-   Fix: Action button alignment on details panel. ([60773](https://github.com/WordPress/gutenberg/pull/60773))
+-   Fix: Action order is different from inspector and dataviews. ([60877](https://github.com/WordPress/gutenberg/pull/60877))
+-   Fix: Do not show pattern and template actions on the post editor. ([60568](https://github.com/WordPress/gutenberg/pull/60568))
+-   Fix: Missing items parameter and or missing onActionPerformed calls. ([60753](https://github.com/WordPress/gutenberg/pull/60753))
+-   Fix: Trash Post action and permanently delete post action do not show errors on single item. ([60597](https://github.com/WordPress/gutenberg/pull/60597))
+-   Post Editor Header: Make block toolbar toggle button focus visible. ([59781](https://github.com/WordPress/gutenberg/pull/59781))
+
+#### Block Editor
+
+-   Avoid errors when a block variation icon is an object. ([60766](https://github.com/WordPress/gutenberg/pull/60766))
+-   Fix external link indicator in Link Control. ([60439](https://github.com/WordPress/gutenberg/pull/60439))
+-   Fix for isPossibleTransformForSource handling selecting inexistent block. ([59410](https://github.com/WordPress/gutenberg/pull/59410))
+-   Fix stuck dragging mode in UI in Firefox when dealing with deeply nested lists. ([60845](https://github.com/WordPress/gutenberg/pull/60845))
+-   Prevents delete key from undoing automatic changes. ([60858](https://github.com/WordPress/gutenberg/pull/60858))
+-   Raw Handling - msListIgnore - Check attributes are valid. ([60375](https://github.com/WordPress/gutenberg/pull/60375))
+
+#### Data Views
+
+-   DataViews: Fix typing in combobox filter. ([60819](https://github.com/WordPress/gutenberg/pull/60819))
+-   Fix default layout configuration in pages list. ([60407](https://github.com/WordPress/gutenberg/pull/60407))
+-   Fix pattern titles. ([60640](https://github.com/WordPress/gutenberg/pull/60640))
+
+#### Zoom Out
+
+-   Don't allow shuffle for locked patterns. ([60381](https://github.com/WordPress/gutenberg/pull/60381))
+-   Prevent exiting Zoom Out mode from stealing focus. ([60441](https://github.com/WordPress/gutenberg/pull/60441))
+-   Respect reduced motion when engaging zoom out mode. ([60808](https://github.com/WordPress/gutenberg/pull/60808))
+
+#### Font Library
+
+-   Avoid overriding custom settings on font library save. ([60438](https://github.com/WordPress/gutenberg/pull/60438))
+-   Fix modal scrollbar. ([60641](https://github.com/WordPress/gutenberg/pull/60641))
+-   I18N: Add context to 'Library' string. ([60520](https://github.com/WordPress/gutenberg/pull/60520))
+
+#### Components
+
+-   Fix link control link preview when it displays long URLs. ([60890](https://github.com/WordPress/gutenberg/pull/60890))
+-   ProgressBar: Fix CSS variable with invalid value. ([60576](https://github.com/WordPress/gutenberg/pull/60576))
+
+#### Layout
+
+-   Always add semantic classes. ([60668](https://github.com/WordPress/gutenberg/pull/60668))
+-   Don't output base flow and constrained layout rules on themes without theme.json. ([60764](https://github.com/WordPress/gutenberg/pull/60764))
+-   Fix responsive column span logic on the front end. ([60976](https://github.com/WordPress/gutenberg/pull/60976))
+-   Restore classic auto margin rule to its previous specificity. ([60802](https://github.com/WordPress/gutenberg/pull/60802))
+
+#### Interactivity API
+
+-   Allow multiple event handlers for the same type with `data-wp-on`. ([60661](https://github.com/WordPress/gutenberg/pull/60661))
+-   Update the query block to permit non-core interactive blocks. ([60006](https://github.com/WordPress/gutenberg/pull/60006))
+
+#### Templates API
+
+-   Fix static posts page setting resolved template. ([60608](https://github.com/WordPress/gutenberg/pull/60608))
+-   Fix: Honor 'template_hierarchy' filters on template fallbacks. ([60377](https://github.com/WordPress/gutenberg/pull/60377))
+
+#### Distraction Free
+
+-   Only show inserter in document tools if DFM is off. ([60426](https://github.com/WordPress/gutenberg/pull/60426))
+-   Remove alpha from edit post header. ([60431](https://github.com/WordPress/gutenberg/pull/60431))
+
+#### REST API
+
+-   Fix PHP notice triggered by 'gutenberg_update_initial_settings'. ([60862](https://github.com/WordPress/gutenberg/pull/60862))
+
+#### Global Styles
+
+-   Editor styles: Delete duplicate backwards compat CSS custom properties. ([60400](https://github.com/WordPress/gutenberg/pull/60400))
+-   Fix browser warning regarding highlight colors. ([60555](https://github.com/WordPress/gutenberg/pull/60555))
+
+### Accessibility
+
+-   Details Block: remove `overflow:Hidden` style. ([60270](https://github.com/WordPress/gutenberg/pull/60270))
+-   Do not render pattern aria description if not button is rendered. ([60653](https://github.com/WordPress/gutenberg/pull/60653))
+-   Fix inserter pattern pagination focus loss. ([60620](https://github.com/WordPress/gutenberg/pull/60620))
+-   Make sure Social icons links aren't empty and improve UI clarity. ([60047](https://github.com/WordPress/gutenberg/pull/60047))
+
+### Performance
+
+-   Add null check to prevent errors in `get_block_template` filter. ([60491](https://github.com/WordPress/gutenberg/pull/60491))
+-   Block preview: Build in async rendering. ([60425](https://github.com/WordPress/gutenberg/pull/60425))
+-   Editor canvas: Reduces resize listeners. ([60682](https://github.com/WordPress/gutenberg/pull/60682))
+-   Layout support: Avoid two block editor store subs. ([60612](https://github.com/WordPress/gutenberg/pull/60612))
+-   Optimize the rendering of the EditorStyles component. ([60493](https://github.com/WordPress/gutenberg/pull/60493))
+-   Post Title: Avoid accidental types requests. ([60531](https://github.com/WordPress/gutenberg/pull/60531))
+-   Preview: Skip rendering rich text. ([60544](https://github.com/WordPress/gutenberg/pull/60544))
+-   Previews: Avoid unneeded block selectors. ([60543](https://github.com/WordPress/gutenberg/pull/60543))
+-   Site Editor: Close the editor sidebar by default. ([60820](https://github.com/WordPress/gutenberg/pull/60820))
+-   Zoom-out: Scale should be stable function. ([60580](https://github.com/WordPress/gutenberg/pull/60580))
+-   getEntityRecords: Batch actions. ([60591](https://github.com/WordPress/gutenberg/pull/60591))
+
+#### Block Library
+
+-   Avoid calling getBlocks selector for navigation link blocks. ([60458](https://github.com/WordPress/gutenberg/pull/60458))
+-   Image cropper: Remove clientWidth prop with useResizeObserver. ([60674](https://github.com/WordPress/gutenberg/pull/60674))
+-   Navigation block: Avoid selector + style recalc on mount. ([60572](https://github.com/WordPress/gutenberg/pull/60572))
+-   Pattern block: Avoid fetching all reusable blocks on mount. ([60310](https://github.com/WordPress/gutenberg/pull/60310))
+-   Post Featured Image: Optimize store subscriptions. ([60770](https://github.com/WordPress/gutenberg/pull/60770))
+
+#### Site Editor
+
+-   Optimize the AddTemplate component used in data views pages. ([60586](https://github.com/WordPress/gutenberg/pull/60586))
+-   Sidebar slide animation: Replace motion.div with CSS animation. ([60849](https://github.com/WordPress/gutenberg/pull/60849))
+
+### Documentation
+
+-   Add `AutosaveMonitor` component JSDoc and populate `README` with auto-gen documentation. ([60882](https://github.com/WordPress/gutenberg/pull/60882))
+-   Add documentation for `disableLineBreaks` property of `RichText`. ([56284](https://github.com/WordPress/gutenberg/pull/56284))
+-   Added Documentation for PostExcerptCheck. ([60864](https://github.com/WordPress/gutenberg/pull/60864))
+-   Added links to related components. ([60726](https://github.com/WordPress/gutenberg/pull/60726))
+-   Correct link to the theme json reference. ([60517](https://github.com/WordPress/gutenberg/pull/60517))
+-   DimensionControl: Fix story configuration. ([60703](https://github.com/WordPress/gutenberg/pull/60703))
+-   Docs: Fix typos in interactivity API reference. ([60870](https://github.com/WordPress/gutenberg/pull/60870))
+-   Docs: Update wording in Block Editor Handbook to reflect that all examples now use JSX. ([56315](https://github.com/WordPress/gutenberg/pull/56315))
+-   Fix: Grammar typo on packages/dataviews/src/search-widget.js. ([60588](https://github.com/WordPress/gutenberg/pull/60588))
+-   Fix: Link to the block building tutorial. ([60518](https://github.com/WordPress/gutenberg/pull/60518))
+-   Fixes a link to the getEntityRecord documentation. ([60823](https://github.com/WordPress/gutenberg/pull/60823))
+-   Improve documentation for block variation `isActive` property. ([60801](https://github.com/WordPress/gutenberg/pull/60801))
+-   Update: Hardcoded documentation link to a branch that does not exist. ([60671](https://github.com/WordPress/gutenberg/pull/60671))
+-   Update: Reference editor scope instead of edit-site, edit-post on interface package documentation. ([60818](https://github.com/WordPress/gutenberg/pull/60818))
+-   [Create Block] Adding documentation for the transformer property. ([60445](https://github.com/WordPress/gutenberg/pull/60445))
+
+### Code Quality
+
+-   Added @return after @global in php doc. ([60611](https://github.com/WordPress/gutenberg/pull/60611))
+-   Blocks: Remove client-side polyfill for 'selectors'. ([60846](https://github.com/WordPress/gutenberg/pull/60846))
+-   [Block Bindings] Don't use hooks. ([60724](https://github.com/WordPress/gutenberg/pull/60724))
+-   Chore: Fix: Wrong JSDOC for an action return. ([60786](https://github.com/WordPress/gutenberg/pull/60786))
+-   Chore: Simplify some CSS margin rules. ([60816](https://github.com/WordPress/gutenberg/pull/60816))
+-   Editor: Serve as a proxy for the interface package. ([60748](https://github.com/WordPress/gutenberg/pull/60748))
+-   Editor: Unify the auto-switch sidebars behavior. ([60869](https://github.com/WordPress/gutenberg/pull/60869))
+-   Editor: Unify the keyboard shortcuts modal. ([60866](https://github.com/WordPress/gutenberg/pull/60866))
+-   Editor: Unify the names of the sidebars between edit post and edit site. ([60856](https://github.com/WordPress/gutenberg/pull/60856))
+-   Editor: Unify the preferences modal name. ([60871](https://github.com/WordPress/gutenberg/pull/60871))
+-   Fix: Remove unused CSS for TemplatePartHint. ([60852](https://github.com/WordPress/gutenberg/pull/60852))
+-   Fix: Remove unused css from page panels styles. ([60774](https://github.com/WordPress/gutenberg/pull/60774))
+-   Fix: Font Library typo. ([60751](https://github.com/WordPress/gutenberg/pull/60751))
+-   Fix: Remove unused CSS code from the site editor. ([60662](https://github.com/WordPress/gutenberg/pull/60662))
+-   Interactivity API refactor to TypeScript (utils & kebabToCamelCase). ([60149](https://github.com/WordPress/gutenberg/pull/60149))
+-   Reexport createSelector from data package. ([60370](https://github.com/WordPress/gutenberg/pull/60370))
+-   Refactor: UseBlockTools cleanup. ([59450](https://github.com/WordPress/gutenberg/pull/59450))
+-   Remove comment that no longer applies about appearance-tools support. ([60844](https://github.com/WordPress/gutenberg/pull/60844))
+-   Reuse and unify post and page actions, accross the different use cases. ([60486](https://github.com/WordPress/gutenberg/pull/60486))
+-   Test: Validate block & theme json. ([57374](https://github.com/WordPress/gutenberg/pull/57374))
+-   Tests: Shard JS unit tests. ([60045](https://github.com/WordPress/gutenberg/pull/60045))
+-   Tests: Share JavaScript build assets across PHP workflows. ([60428](https://github.com/WordPress/gutenberg/pull/60428))
+-   Update: Avoid two useSelect calls on PostActions. ([60752](https://github.com/WordPress/gutenberg/pull/60752))
+-   Update: Make content locking related selectors private. ([60827](https://github.com/WordPress/gutenberg/pull/60827))
+-   Update: Move template actions to the editor store. ([60395](https://github.com/WordPress/gutenberg/pull/60395))
+-   Update: Remove keyCode usage from dataviews package. ([60585](https://github.com/WordPress/gutenberg/pull/60585))
+-   Update: Use util getVariationClassName instead of computing the variation inline. ([60664](https://github.com/WordPress/gutenberg/pull/60664))
+
+#### Components
+
+-   Deprecate `reduceMotion` util. ([60839](https://github.com/WordPress/gutenberg/pull/60839))
+-   Navigation: Soft deprecate component. ([59182](https://github.com/WordPress/gutenberg/pull/59182))
+-   NavigatorProvider: Move the same-location check to the goTo function. ([60767](https://github.com/WordPress/gutenberg/pull/60767))
+-   ObservableMap: Optimize unsubscribe and add unit tests. ([60892](https://github.com/WordPress/gutenberg/pull/60892))
+-   Remove CSS hack for Internet Explorer 11. ([60727](https://github.com/WordPress/gutenberg/pull/60727))
+
+#### Post Editor
+
+-   Editor: Optimize the 'PostSlug' component. ([60422](https://github.com/WordPress/gutenberg/pull/60422))
+-   Editor: Use hook instead of HoC in 'ThemeSupportCheck'. ([60807](https://github.com/WordPress/gutenberg/pull/60807))
+-   Editor: Use hooks instead of HoCs in 'PostTrashCheck'. ([60380](https://github.com/WordPress/gutenberg/pull/60380))
+-   [Editor]:Get post content in PostContentInfo component. ([60743](https://github.com/WordPress/gutenberg/pull/60743))
+
+#### Data Views
+
+-   DataViews: Remove `onDetailsChange` event. ([60387](https://github.com/WordPress/gutenberg/pull/60387))
+-   Rename displayAsColumnFields to columnFields API. ([60504](https://github.com/WordPress/gutenberg/pull/60504))
+-   Simplify visually hidden label. ([60835](https://github.com/WordPress/gutenberg/pull/60835))
+
+#### Block Editor
+
+-   Refactor Link UI States. ([59762](https://github.com/WordPress/gutenberg/pull/59762))
+-   Switching pattern categories inserter to Tabs component with arrow key navigation. ([60257](https://github.com/WordPress/gutenberg/pull/60257))
+
+### Tools
+
+-   Update @talldan in codeowners file, remove from edit-widgets package. ([60800](https://github.com/WordPress/gutenberg/pull/60800))
+
+#### Testing
+
+-   Add end-to-end test for activating themes in site editor. ([60707](https://github.com/WordPress/gutenberg/pull/60707))
+-   Automated Testing: Update end-to-end test npm commands. ([60376](https://github.com/WordPress/gutenberg/pull/60376))
+-   Fix flaky Site Editor URL navigation end-to-end test. ([60675](https://github.com/WordPress/gutenberg/pull/60675))
+-   PHP unit test workflow: Try removing 7.0 and 7.1. ([60686](https://github.com/WordPress/gutenberg/pull/60686))
+-   Perf: Improve way we measure template loading by adding posts. ([60516](https://github.com/WordPress/gutenberg/pull/60516))
+-   Performance Tests: I'm tired of doing head math 😊. ([60509](https://github.com/WordPress/gutenberg/pull/60509))
+-   Upgrade Playwright to v1.43. ([60635](https://github.com/WordPress/gutenberg/pull/60635))
+-   tip: Remove unecessary delay in tests except where needed. ([60897](https://github.com/WordPress/gutenberg/pull/60897))
+
+#### Build Tooling
+
+-   Dependencies: Upgrade babel. ([57311](https://github.com/WordPress/gutenberg/pull/57311))
+-   Upgrade simple-git dependency. ([59915](https://github.com/WordPress/gutenberg/pull/59915))
+-   Update Typescript to 5.4.5. ([60793](https://github.com/WordPress/gutenberg/pull/60793))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @asheshmagar: Font library: Fix typo. ([60751](https://github.com/WordPress/gutenberg/pull/60751))
+-   @DaniGuardiola: ProgressBar: Moved width to CSS var for performance. ([60388](https://github.com/WordPress/gutenberg/pull/60388))
+-   @garridinsi: Interactivity API refactor to TypeScript (utils & kebabToCamelCase). ([60149](https://github.com/WordPress/gutenberg/pull/60149))
+-   @xhemals: Update standardization of the 'Navigation Menu' to have both words capitalized in user-facing menus. ([60262](https://github.com/WordPress/gutenberg/pull/60262)), Standardise capitalization of the Navigation Menu in the sidebar. ([60527](https://github.com/WordPress/gutenberg/pull/60527))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @andrewserong @arthur791004 @artpi @asheshmagar @atachibana @carolinan @colinduwe @colorful-tones @DaniGuardiola @DAreRodz @draganescu @ellatrix @fabiankaegy @flexseth @garridinsi @geriux @getdave @ixkaito @jameskoster @jasmussen @jeryj @johnhooks @jorgefilipecosta @jsnajdr @kevin940726 @Mamaduka @matiasbenedetto @mhkuu @mikachan @mirka @noisysocks @ntsekouras @oandregal @ocean90 @okmttdhr @prajapatisagar @ramonjd @richtabor @ryanwelcher @scruffian @shail-mehta @shimotmk @simonhammes @sirreal @Soean @sunil25393 @t-hamano @talldan @tellthemachines @tyxla @xhemals @youknowriad
+
+= 18.1.2 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Restore classic auto margin rule to its previous specificity ([60802](https://github.com/WordPress/gutenberg/pull/60802))
+-   Fix the removePropertyFromObject function throws an error if the object is null ([60831](https://github.com/WordPress/gutenberg/pull/60831))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@tellthemachines @arthur791004
+
+= 18.1.1 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Add null check to prevent errors in `get_block_template` filter ([60491](https://github.com/WordPress/gutenberg/pull/60491))
+-   Fix activating a theme in site editor when previewing ([60699](https://github.com/WordPress/gutenberg/pull/60699))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@okmttdhr @ntsekouras
+
+= 18.1.0 =
+
+## Changelog
+
+### Enhancements
+
+#### Block Editor
+
+-   Zoom out: Invoke zoom out mode when opening the patterns tab, and move the code to do so to a shared hook. ([59775](https://github.com/WordPress/gutenberg/pull/59775))
+-   Block Previews: Update shadows in different contexts. ([60161](https://github.com/WordPress/gutenberg/pull/60161))
+-   Update: Move post actions to the editor package. ([60092](https://github.com/WordPress/gutenberg/pull/60092))
+-   Try: Show copy shortcut in block options. ([60339](https://github.com/WordPress/gutenberg/pull/60339))
+-   Update image role description text to fix spacing. ([60338](https://github.com/WordPress/gutenberg/pull/60338))
+
+#### Site Editor
+
+-   Add rename page action. ([60230](https://github.com/WordPress/gutenberg/pull/60230))
+-   Center the document title. ([59134](https://github.com/WordPress/gutenberg/pull/59134))
+-   Consolidate when showing revisions link or action. ([60194](https://github.com/WordPress/gutenberg/pull/60194))
+-   Editor: Update hover color of editor document title. ([60113](https://github.com/WordPress/gutenberg/pull/60113))
+-   Improve the frame animation. ([60363](https://github.com/WordPress/gutenberg/pull/60363))
+-   Try selecting closest editable block when clicking on a disabled block. ([60016](https://github.com/WordPress/gutenberg/pull/60016))
+-   Update index view for pages. ([59950](https://github.com/WordPress/gutenberg/pull/59950))
+
+#### Patterns
+
+-   Add content schema to pattern editing view. ([59977](https://github.com/WordPress/gutenberg/pull/59977))
+-   Close inspector on pattern category select. ([60004](https://github.com/WordPress/gutenberg/pull/60004))
+-   Focus block selection button only in navigation mode. ([60207](https://github.com/WordPress/gutenberg/pull/60207))
+-   Pattern Shuffling: Make the results deterministic. ([60074](https://github.com/WordPress/gutenberg/pull/60074))
+-   Patterns page: Enable table layout. ([60337](https://github.com/WordPress/gutenberg/pull/60337))
+-   Prevent reordering of header and footer template parts when zoomed out. ([60054](https://github.com/WordPress/gutenberg/pull/60054))
+-   Remove manage all of my patterns link. ([60345](https://github.com/WordPress/gutenberg/pull/60345))
+
+#### Block Library
+
+-   Add `__next40pxDefaultSize` to Image block Title Attribute. ([60117](https://github.com/WordPress/gutenberg/pull/60117))
+-   Add support "HTML Element" to Site Tagline. ([59654](https://github.com/WordPress/gutenberg/pull/59654))
+-   Image: Remove temporary image check for rendering controls. ([60212](https://github.com/WordPress/gutenberg/pull/60212))
+-   Quote block: Button for cite add/remove. ([59073](https://github.com/WordPress/gutenberg/pull/59073))
+-   Quote block: Remove appender. ([60307](https://github.com/WordPress/gutenberg/pull/60307))
+-   Reduce specificity of block library styles conflicting with block supports. ([59457](https://github.com/WordPress/gutenberg/pull/59457))
+-   Update navigation blocks to use consistent link UI labels and field sizes. ([60116](https://github.com/WordPress/gutenberg/pull/60116))
+-   Summary: Polish featured image. ([60110](https://github.com/WordPress/gutenberg/pull/60110))
+
+#### Post Editor
+
+-   Block Editor: Deprecate `__experimentalGetReusableBlockTitle` selector. ([60278](https://github.com/WordPress/gutenberg/pull/60278))
+-   Editor: Move PluginPostPublishPanel and PluginPrePublishPanel to editor package. ([60344](https://github.com/WordPress/gutenberg/pull/60344))
+-   Editor: Move publish panel handling to `editor` store. ([60340](https://github.com/WordPress/gutenberg/pull/60340))
+-   Editor: Unify publish sidebar preference. ([60334](https://github.com/WordPress/gutenberg/pull/60334))
+
+#### Global Styles
+
+-   Add background to global styles changes output. ([60229](https://github.com/WordPress/gutenberg/pull/60229))
+-   Background UI controls. ([59454](https://github.com/WordPress/gutenberg/pull/59454))
+-   Follow up design tweaks for global styles presets. ([60031](https://github.com/WordPress/gutenberg/pull/60031))
+-   Try reducing specificity of global styles selectors only. ([60106](https://github.com/WordPress/gutenberg/pull/60106))
+
+#### Data Views
+
+-   DataViews: Add a utility to share filtering, sorting and pagination logic. ([59897](https://github.com/WordPress/gutenberg/pull/59897))
+-   Data views: Remove the `enumeration` type as redundant. ([60084](https://github.com/WordPress/gutenberg/pull/60084))
+-   Data views: Update template actions. ([60075](https://github.com/WordPress/gutenberg/pull/60075))
+-   Data views: Add confirmation modal for clearing customizations in templates. ([60119](https://github.com/WordPress/gutenberg/pull/60119))
+-   Data views: Make trash a quick action again. ([60165](https://github.com/WordPress/gutenberg/pull/60165))
+
+#### List View
+
+-   Add keyboard shortcut to collapse list view items other than the focused item. ([59978](https://github.com/WordPress/gutenberg/pull/59978))
+-   Adjust the List View close icon to resemble the Inspector close icon. ([59999](https://github.com/WordPress/gutenberg/pull/59999))
+-   Update "Actions" string to "Options" in List View. ([60136](https://github.com/WordPress/gutenberg/pull/60136))
+
+#### Templates
+
+-   Add filter to allow extending the list of post content blocks. ([60068](https://github.com/WordPress/gutenberg/pull/60068))
+-   Render non-editable preview of template part when user does not have capability to edit template part. ([60326](https://github.com/WordPress/gutenberg/pull/60326))
+-   Template Parts: Remove pattern title from sidebar. ([60160](https://github.com/WordPress/gutenberg/pull/60160))
+-   Template Parts: Update replace flow to separate template parts from patterns. ([60203](https://github.com/WordPress/gutenberg/pull/60203))
+-   Template Parts: Update the 'Replace' label to 'Design'. ([60156](https://github.com/WordPress/gutenberg/pull/60156))
+
+#### Zoom Out
+
+-   Add a delete control to toolbar on zoomed out mode. ([60214](https://github.com/WordPress/gutenberg/pull/60214))
+-   Media dialog push content in zoomed out mode. ([60170](https://github.com/WordPress/gutenberg/pull/60170))
+
+#### Components
+
+-   Popover / ToggleGroupControl: Use `useReducedMotion()` from `@wordpress/compose`. ([60168](https://github.com/WordPress/gutenberg/pull/60168))
+-   date-fns: Bump to v3.6. ([60163](https://github.com/WordPress/gutenberg/pull/60163))
+
+#### REST API
+
+-   Allow view access of template rest endpoint to anyone with the `edit_post` capability. ([60317](https://github.com/WordPress/gutenberg/pull/60317))
+
+#### Commands
+
+-   Polish Command Palette. ([60134](https://github.com/WordPress/gutenberg/pull/60134))
+
+#### Page Content Focus
+
+-   Allow selecting template parts in page content focus mode. ([60010](https://github.com/WordPress/gutenberg/pull/60010))
+
+#### Inspector Controls
+
+-   Add: PostCardPanel component. ([59870](https://github.com/WordPress/gutenberg/pull/59870))
+
+#### Package and utility updates
+
+-   Router: Update history package to 5.3.0, fix query string generation. ([60271](https://github.com/WordPress/gutenberg/pull/60271))
+-   Create block: Add new namespacePascalCase template variable. ([60223](https://github.com/WordPress/gutenberg/pull/60223))
+
+### New APIs
+
+#### Extensibility
+
+-   Extensibility: Support PluginBlockSettingsMenuItem in the site editor. ([60033](https://github.com/WordPress/gutenberg/pull/60033))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Fix enqueuing block theme styles when separate asset loading is enabled. ([60098](https://github.com/WordPress/gutenberg/pull/60098))
+-   Fix lightbox UI disallow editing. ([59890](https://github.com/WordPress/gutenberg/pull/59890))
+-   Fix navigation link ui close focus management. ([59925](https://github.com/WordPress/gutenberg/pull/59925))
+-   Removed pointer-events none inline style due it blocking crop action. ([60305](https://github.com/WordPress/gutenberg/pull/60305))
+-   Search Block: Apply font-related style inheritance to input field. ([60321](https://github.com/WordPress/gutenberg/pull/60321))
+-   Columns block: Fix arrow up into it. ([55197](https://github.com/WordPress/gutenberg/pull/55197))
+
+#### Site Editor
+
+-   Fix rendering PluginTemplateSettingPanel when we're editing a template. ([60215](https://github.com/WordPress/gutenberg/pull/60215))
+-   Fix: Use `viewportWidth` in pattern preview data view. ([60315](https://github.com/WordPress/gutenberg/pull/60315))
+-   Templates: Fix deferred rendering. ([60361](https://github.com/WordPress/gutenberg/pull/60361))
+-   Site Editor: Consolidate save button functionality. ([60077](https://github.com/WordPress/gutenberg/pull/60077))
+-   Revert #60300: Make sure the CSS class id-dark-theme is added to the editor iframe body. ([60616](https://github.com/WordPress/gutenberg/pull/60616))
+
+#### Block Editor
+
+-   Make sure the CSS class is-dark-theme is added to the editor iframe body. ([60300](https://github.com/WordPress/gutenberg/pull/60300))
+-   Raw handling: Preserve class. ([60331](https://github.com/WordPress/gutenberg/pull/60331))
+-   Raw handling: Preserve empty paragraphs. ([59476](https://github.com/WordPress/gutenberg/pull/59476))
+-   Wiriting flow: Backspace at beginning of first paragraph block prevents block from being deleted. ([56329](https://github.com/WordPress/gutenberg/pull/56329))
+-   DOM: Fix return types of focus.tabbable methods. ([60274](https://github.com/WordPress/gutenberg/pull/60274))
+
+#### Components
+
+-   CustomSelectControlV2: Fix hint behavior in legacy. ([60183](https://github.com/WordPress/gutenberg/pull/60183))
+-   InputControl: Ignore IME events when `isPressEnterToChange`. ([60090](https://github.com/WordPress/gutenberg/pull/60090))
+-   TextControl: Apply zero margin to input element. ([60282](https://github.com/WordPress/gutenberg/pull/60282))
+
+#### Global Styles
+
+-   Fix missing class for Global Styles > Colors. ([60094](https://github.com/WordPress/gutenberg/pull/60094))
+-   Reset specificity of body selector when processing with postcss. ([60266](https://github.com/WordPress/gutenberg/pull/60266))
+-   Shadow: Revert shadow default presets opt-in to opt-out. ([60204](https://github.com/WordPress/gutenberg/pull/60204))
+-   Global Styles: Make strings translatable. ([60127](https://github.com/WordPress/gutenberg/pull/60127))
+-   Skip outputting base layout rules that reference content or wide sizes if no layout sizes exist. ([60489](https://github.com/WordPress/gutenberg/pull/60489))
+
+#### Zoom Out
+
+-   Fix zoom out mode toggling between pattern category selection. ([60225](https://github.com/WordPress/gutenberg/pull/60225))
+
+#### Data Views
+
+-   Fix focus outline visibility and truncation in data view record titles. ([60191](https://github.com/WordPress/gutenberg/pull/60191))
+
+#### Layout
+
+-   Fix horizontal flex layout in classic themes. ([60154](https://github.com/WordPress/gutenberg/pull/60154))
+
+#### Post Editor
+
+-   Editor: Memoize 'getInsertionPoint' selector. ([60015](https://github.com/WordPress/gutenberg/pull/60015))
+-   Fix block toolbar dropdown separator color. ([60336](https://github.com/WordPress/gutenberg/pull/60336))
+-   Backport r57868 (Editor: Prevent font folder naive filtering causing infinite loops) from WordPress-Develop. ([60141](https://github.com/WordPress/gutenberg/pull/60141))
+
+#### Block templates
+
+-   Add null check to prevent errors in `get_block_template` filter. ([60491](https://github.com/WordPress/gutenberg/pull/60491))
+
+#### Utilities
+
+-   URL: Return early in getFilename where URL argument is falsy. ([60265](https://github.com/WordPress/gutenberg/pull/60265))
+
+### Accessibility
+
+#### Data Views
+
+-   Add click-to-select behavior on table rows. ([59803](https://github.com/WordPress/gutenberg/pull/59803))
+-   Data views list layout: Apply focus styles to items on `focus-visible` rather than `focus`. ([60253](https://github.com/WordPress/gutenberg/pull/60253))
+-   Update field display in grid layout. ([60083](https://github.com/WordPress/gutenberg/pull/60083))
+-   Data Views: Updating keyboard navigation in list layouts. ([59637](https://github.com/WordPress/gutenberg/pull/59637))
+
+#### Site Editor
+
+-   Restore Style book close button tooltip. ([60177](https://github.com/WordPress/gutenberg/pull/60177))
+
+#### Block Library
+
+-   Remove CSS order property from social icons placeholder UI. ([60032](https://github.com/WordPress/gutenberg/pull/60032))
+
+### Performance
+
+### Block Editor
+
+-   Avoid fetching all reusable blocks (user patterns) on post/site editor load. ([58239](https://github.com/WordPress/gutenberg/pull/58239))
+-   Block editor: Optimize hasSelectedInnerBlock selector. ([60330](https://github.com/WordPress/gutenberg/pull/60330))
+-   Templates performance: Resolve patterns server side. ([60349](https://github.com/WordPress/gutenberg/pull/60349))
+
+#### Block Library
+
+-   Template part: Avoid pattern fetch on mount. ([60297](https://github.com/WordPress/gutenberg/pull/60297))
+
+#### Block Editor
+
+-   Inserter: Cache search normalization results. ([60080](https://github.com/WordPress/gutenberg/pull/60080))
+-   Format library: Improve unknown format performance. ([48761](https://github.com/WordPress/gutenberg/pull/48761))
+
+### Experiments
+
+#### Site Editor
+
+-   Zoom-out view: Disable canvas resizing. ([60104](https://github.com/WordPress/gutenberg/pull/60104))
+
+### Documentation
+
+-   Add auto generated API documentation for `editor` package. ([60356](https://github.com/WordPress/gutenberg/pull/60356))
+-   Add component props documentation. ([60350](https://github.com/WordPress/gutenberg/pull/60350))
+-   Add php `@global` documentation. ([59931](https://github.com/WordPress/gutenberg/pull/59931))
+-   Change heading level on troubleshooting section. ([60233](https://github.com/WordPress/gutenberg/pull/60233))
+-   CustomSelectControlV2: Match v1 stories to test legacy component. ([60182](https://github.com/WordPress/gutenberg/pull/60182))
+-   Docs (general): Fix some typos. ([60260](https://github.com/WordPress/gutenberg/pull/60260))
+-   Fix `@todo` tags to follow standards in WordPress comments. ([60148](https://github.com/WordPress/gutenberg/pull/60148))
+-   Fix Font Collection JSON schema definition. ([60285](https://github.com/WordPress/gutenberg/pull/60285))
+-   Fix: Invalid documentation link to load JavaScript. ([60181](https://github.com/WordPress/gutenberg/pull/60181))
+-   Fix: Invalid links to the block supports api. ([60199](https://github.com/WordPress/gutenberg/pull/60199))
+-   Fix: Non existent link to submitting to the block directory. ([60389](https://github.com/WordPress/gutenberg/pull/60389))
+-   Interactivity API: Variable name correction in the documentation. ([60056](https://github.com/WordPress/gutenberg/pull/60056))
+-   Create Block: Update external template documentation to include variants. ([60095](https://github.com/WordPress/gutenberg/pull/60095))
+
+### Code Quality
+
+#### Block Editor
+
+-   Add comment for unmemoized context. ([60272](https://github.com/WordPress/gutenberg/pull/60272))
+-   Fix ESLint warning in BlockListBlock component. ([60064](https://github.com/WordPress/gutenberg/pull/60064))
+-   RichText: Switch from disableEditing to standard html readonly attribute. ([60327](https://github.com/WordPress/gutenberg/pull/60327))
+-   Site Editor: Reuse inserter search term normalization. ([60218](https://github.com/WordPress/gutenberg/pull/60218))
+-   `canInsertBlockType`: Extract helper for selector dependants. ([60235](https://github.com/WordPress/gutenberg/pull/60235))
+-   Fix editor canvas overflow on search results with position: Relative. ([60287](https://github.com/WordPress/gutenberg/pull/60287))
+-   Editor: Move template areas to editor package. ([60179](https://github.com/WordPress/gutenberg/pull/60179))
+
+#### Components
+
+-   `CustomSelectControlV2`: Rename for consistency. ([60178](https://github.com/WordPress/gutenberg/pull/60178))
+-   Navigator: Fix two nits. ([60273](https://github.com/WordPress/gutenberg/pull/60273))
+-   NavigatorProvider: Move all state management to one reducer. ([60190](https://github.com/WordPress/gutenberg/pull/60190))
+-   Components: Try obviating Popover pointer event trap. ([59449](https://github.com/WordPress/gutenberg/pull/59449))
+
+#### Post Editor
+
+-   Memoize the getTemplateInfo selector. ([60200](https://github.com/WordPress/gutenberg/pull/60200))
+-   Update: Remove template summary component. ([60351](https://github.com/WordPress/gutenberg/pull/60351))
+-   Update: Use getPostIcon selector on document bar. ([60128](https://github.com/WordPress/gutenberg/pull/60128))
+-   Distraction free: Remove unwanted space from string. ([60108](https://github.com/WordPress/gutenberg/pull/60108))
+
+#### Global Styles
+
+-   Additional CSS: Add code comments contextualising tranformStyles for clarity. ([60267](https://github.com/WordPress/gutenberg/pull/60267))
+-   Global styles: output `:root` selector for CSS custom properties. ([42084](https://github.com/WordPress/gutenberg/pull/42084))
+-   Style Engine: Continue get_classnames loop after adding the default classname. ([60153](https://github.com/WordPress/gutenberg/pull/60153))
+
+#### Font Library
+
+-   Add test for Font Library and Theme Style Variations. ([60250](https://github.com/WordPress/gutenberg/pull/60250))
+-   Update google fonts font collection data URL to the latest version available. ([60079](https://github.com/WordPress/gutenberg/pull/60079))
+
+#### Block Library
+
+-   Image: Use the new 'useUploadMediaFromBlobURL' hook. ([60208](https://github.com/WordPress/gutenberg/pull/60208))
+-   Navigation Block: Add test coverage to check that post content is not removed. ([60189](https://github.com/WordPress/gutenberg/pull/60189))
+
+#### Site Editor
+
+-   DataViews: Don't memoize every callback 'PagePages' component. ([60103](https://github.com/WordPress/gutenberg/pull/60103))
+-   History: Simplify the push and replace methods. ([60112](https://github.com/WordPress/gutenberg/pull/60112))
+
+#### Rich Text
+
+-   RichText: Separate fallback instance ID for selection retrieval. ([60277](https://github.com/WordPress/gutenberg/pull/60277))
+
+#### Block Locking
+
+-   E2E: Test BlockSwitcher availability in l-post-ul-group CPT. ([60254](https://github.com/WordPress/gutenberg/pull/60254))
+
+#### Data Views
+
+-   DataViews: Fix react warning error in list layout. ([60101](https://github.com/WordPress/gutenberg/pull/60101))
+
+### Tools
+
+#### Testing
+
+-   Automated Testing: Remove Puppeteer CI Job. ([59311](https://github.com/WordPress/gutenberg/pull/59311))
+-   CustomSelectControlV2: Stabilize tests. ([60133](https://github.com/WordPress/gutenberg/pull/60133))
+-   E2E: Fix flaky Site Editor pages end-to-end test. ([60109](https://github.com/WordPress/gutenberg/pull/60109))
+-   Font Library: Add upload font test. ([60221](https://github.com/WordPress/gutenberg/pull/60221))
+
+#### Build Tooling
+
+-   Blocks: Fix double `gutenberg_` prefix in built dynamic blocks PHP. ([60288](https://github.com/WordPress/gutenberg/pull/60288))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @interdevel: Fix `@todo` tags to follow standards in WordPress comments. ([60148](https://github.com/WordPress/gutenberg/pull/60148))
+-   @mikeybinns: Add component props documentation. ([60350](https://github.com/WordPress/gutenberg/pull/60350))
+-   @nirav7707: Editor: Update hover color of editor document title. ([60113](https://github.com/WordPress/gutenberg/pull/60113))
+-   @steveariss: Interactivity API: Variable name correction in the documentation. ([60056](https://github.com/WordPress/gutenberg/pull/60056))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @andrewhayward @andrewserong @artemiomorales @bph @draganescu @ellatrix @fabiankaegy @geriux @getdave @glendaviesnz @interdevel @jameskoster @jasmussen @jeryj @jorgefilipecosta @jsnajdr @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @mcsf @mikachan @mikeybinns @mirka @mujuonly @n2erjo00 @nirav7707 @noisysocks @ntsekouras @oandregal @ockham @okmttdhr @pedro-mendonca @peterwilsoncc @ramonjd @richtabor @ryanwelcher @scruffian @shail-mehta @Soean @steveariss @stokesman @t-hamano @talldan @tellthemachines @torounit @tyxla @youknowriad
+
+= 18.0.1 =
+
+## Changelog
+
+### Bug fixes
+
+Make sure display name is correctly formatted in comments. (#60579)
+
+= 18.1.0-rc.2 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Add null check to prevent errors in `get_block_template` filter. ([60491](https://github.com/WordPress/gutenberg/pull/60491))
+
+#### Layout
+
+-   Skip outputting base layout rules that reference content or wide sizes if no layout sizes exist. ([60489](https://github.com/WordPress/gutenberg/pull/60489))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@andrewserong @okmttdhr
+
+= 18.1.0-rc.1 =
+
+## Changelog
+
+### Enhancements
+
+-   Block Previews: Update shadows in different contexts. ([60161](https://github.com/WordPress/gutenberg/pull/60161))
+-   Data views: Make trash a quick action again. ([60165](https://github.com/WordPress/gutenberg/pull/60165))
+-   Router: Update history package to 5.3.0, fix query string generation. ([60271](https://github.com/WordPress/gutenberg/pull/60271))
+-   Summary: Polish featured image. ([60110](https://github.com/WordPress/gutenberg/pull/60110))
+-   Template Parts: Remove pattern title from sidebar. ([60160](https://github.com/WordPress/gutenberg/pull/60160))
+-   Template Parts: Update replace flow to separate template parts from patterns. ([60203](https://github.com/WordPress/gutenberg/pull/60203))
+-   Template Parts: Update the 'Replace' label to 'Design'. ([60156](https://github.com/WordPress/gutenberg/pull/60156))
+-   Try: Show copy shortcut in block options. ([60339](https://github.com/WordPress/gutenberg/pull/60339))
+-   Update image role description text to fix spacing. ([60338](https://github.com/WordPress/gutenberg/pull/60338))
+-   Update: Move post actions to the editor package. ([60092](https://github.com/WordPress/gutenberg/pull/60092))
+-   Zoom out: Invoke zoom out mode when opening the patterns tab, and move the code to do so to a shared hook. ([59775](https://github.com/WordPress/gutenberg/pull/59775))
+-   Create block: Add new namespacePascalCase template variable. ([60223](https://github.com/WordPress/gutenberg/pull/60223))
+
+#### Site Editor
+
+-   Add rename page action. ([60230](https://github.com/WordPress/gutenberg/pull/60230))
+-   Center the document title. ([59134](https://github.com/WordPress/gutenberg/pull/59134))
+-   Consolidate when showing revisions link or action. ([60194](https://github.com/WordPress/gutenberg/pull/60194))
+-   Editor: Update hover color of editor document title. ([60113](https://github.com/WordPress/gutenberg/pull/60113))
+-   Improve the frame animation. ([60363](https://github.com/WordPress/gutenberg/pull/60363))
+-   Try selecting closest editable block when clicking on a disabled block. ([60016](https://github.com/WordPress/gutenberg/pull/60016))
+-   Update index view for pages. ([59950](https://github.com/WordPress/gutenberg/pull/59950))
+
+#### Patterns
+
+-   Add content schema to pattern editing view. ([59977](https://github.com/WordPress/gutenberg/pull/59977))
+-   Close inspector on pattern category select. ([60004](https://github.com/WordPress/gutenberg/pull/60004))
+-   Focus block selection button only in navigation mode. ([60207](https://github.com/WordPress/gutenberg/pull/60207))
+-   Pattern Shuffling: Make the results deterministic. ([60074](https://github.com/WordPress/gutenberg/pull/60074))
+-   Patterns page: Enable table layout. ([60337](https://github.com/WordPress/gutenberg/pull/60337))
+-   Prevent reordering of header and footer template parts when zoomed out. ([60054](https://github.com/WordPress/gutenberg/pull/60054))
+-   Remove manage all of my patterns link. ([60345](https://github.com/WordPress/gutenberg/pull/60345))
+
+#### Block Library
+
+-   Add \_\_next40pxDefaultSize to Image block Title Attribute. ([60117](https://github.com/WordPress/gutenberg/pull/60117))
+-   Add support "HTML Element" to Site Tagline. ([59654](https://github.com/WordPress/gutenberg/pull/59654))
+-   Image: Remove temporary image check for rendering controls. ([60212](https://github.com/WordPress/gutenberg/pull/60212))
+-   Quote block: Button for cite add/remove. ([59073](https://github.com/WordPress/gutenberg/pull/59073))
+-   Quote block: Remove appender. ([60307](https://github.com/WordPress/gutenberg/pull/60307))
+-   Reduce specificity of block library styles conflicting with block supports. ([59457](https://github.com/WordPress/gutenberg/pull/59457))
+-   Update navigation blocks to use consistent link UI labels and field sizes. ([60116](https://github.com/WordPress/gutenberg/pull/60116))
+
+#### Post Editor
+
+-   Block Editor: Deprecate '\_\_experimentalGetReusableBlockTitle' selector. ([60278](https://github.com/WordPress/gutenberg/pull/60278))
+-   Editor: Move PluginPostPublishPanel and PluginPrePublishPanel to editor package. ([60344](https://github.com/WordPress/gutenberg/pull/60344))
+-   Editor: Move publish panel handling to `editor` store. ([60340](https://github.com/WordPress/gutenberg/pull/60340))
+-   [Editor]: Unify publish sidebar preference. ([60334](https://github.com/WordPress/gutenberg/pull/60334))
+
+#### Global Styles
+
+-   Add background to global styles changes output. ([60229](https://github.com/WordPress/gutenberg/pull/60229))
+-   Background UI controls. ([59454](https://github.com/WordPress/gutenberg/pull/59454))
+-   Follow up design tweaks for global styles presets. ([60031](https://github.com/WordPress/gutenberg/pull/60031))
+-   Try reducing specificity of global styles selectors only. ([60106](https://github.com/WordPress/gutenberg/pull/60106))
+
+#### Data Views
+
+-   DataViews: Add a utility to share filtering, sorting and pagination logic. ([59897](https://github.com/WordPress/gutenberg/pull/59897))
+-   DataViews: Remove the `enumeration` type as redundant. ([60084](https://github.com/WordPress/gutenberg/pull/60084))
+-   Update template actions. ([60075](https://github.com/WordPress/gutenberg/pull/60075))
+-   [Data Views]: Add confirmation modal for clearing customizations in templates. ([60119](https://github.com/WordPress/gutenberg/pull/60119))
+
+#### List View
+
+-   Add keyboard shortcut to collapse list view items other than the focused item. ([59978](https://github.com/WordPress/gutenberg/pull/59978))
+-   Adjust the List View close icon to resemble the Inspector close icon. ([59999](https://github.com/WordPress/gutenberg/pull/59999))
+-   Update "Actions" string to "Options" in List View. ([60136](https://github.com/WordPress/gutenberg/pull/60136))
+
+#### Template Editor
+
+-   Add filter to allow extending the list of post content blocks. ([60068](https://github.com/WordPress/gutenberg/pull/60068))
+-   Render non-editable preview of template part when user does not have capability to edit template part. ([60326](https://github.com/WordPress/gutenberg/pull/60326))
+
+#### Zoom Out
+
+-   Add a delete control to toolbar on zoom-out mode. ([60214](https://github.com/WordPress/gutenberg/pull/60214))
+-   Media dialog push content in zoomed out mode. ([60170](https://github.com/WordPress/gutenberg/pull/60170))
+
+#### Components
+
+-   Popover / ToggleGroupControl: Use `useReducedMotion()` from `@wordpress/compose`. ([60168](https://github.com/WordPress/gutenberg/pull/60168))
+-   date-fns: Bump to v3.6. ([60163](https://github.com/WordPress/gutenberg/pull/60163))
+
+#### REST API
+
+-   Allow view access of template rest endpoint to anyone with the `edit_post` capability. ([60317](https://github.com/WordPress/gutenberg/pull/60317))
+
+#### Commands
+
+-   Polish Command Palette. ([60134](https://github.com/WordPress/gutenberg/pull/60134))
+
+#### Page Content Focus
+
+-   Allow selecting template parts in page content focus mode. ([60010](https://github.com/WordPress/gutenberg/pull/60010))
+
+#### Inspector Controls
+
+-   Add: PostCardPanel component. ([59870](https://github.com/WordPress/gutenberg/pull/59870))
+
+### New APIs
+
+#### Extensibility
+
+-   Extensibiltiy: Support PluginBlockSettingsMenuItem in the site editor. ([60033](https://github.com/WordPress/gutenberg/pull/60033))
+
+### Bug Fixes
+
+-   Columns block: Fix arrow up into it. ([55197](https://github.com/WordPress/gutenberg/pull/55197))
+-   DOM: Fix return types of focus.tabbable methods. ([60274](https://github.com/WordPress/gutenberg/pull/60274))
+-   Fix block toolbar dropdown separator color. ([60336](https://github.com/WordPress/gutenberg/pull/60336))
+-   Global Styles: Make strings translatable. ([60127](https://github.com/WordPress/gutenberg/pull/60127))
+-   Shadow: Revert shadow default presets opt-in to opt-out. ([60204](https://github.com/WordPress/gutenberg/pull/60204))
+-   URL: Return early in getFilename where URL argument is falsy. ([60265](https://github.com/WordPress/gutenberg/pull/60265))
+
+#### Block Library
+
+-   Fix enqueuing block theme styles when separate asset loading is enabled. ([60098](https://github.com/WordPress/gutenberg/pull/60098))
+-   Fix lightbox UI disallow editing. ([59890](https://github.com/WordPress/gutenberg/pull/59890))
+-   Fix navigation link ui close focus management. ([59925](https://github.com/WordPress/gutenberg/pull/59925))
+-   Removed pointer-events none inline style due it blocking crop action. ([60305](https://github.com/WordPress/gutenberg/pull/60305))
+-   Search Block: Apply font-related style inheritance to input field. ([60321](https://github.com/WordPress/gutenberg/pull/60321))
+
+#### Site Editor
+
+-   Fix rendering PluginTemplateSettingPanel when we're editing a template. ([60215](https://github.com/WordPress/gutenberg/pull/60215))
+-   Fix: Use `viewportWidth` in pattern preview data view. ([60315](https://github.com/WordPress/gutenberg/pull/60315))
+-   Templates: Fix deferred rendering. ([60361](https://github.com/WordPress/gutenberg/pull/60361))
+-   [Site Editor]: Consolidate save button functionality. ([60077](https://github.com/WordPress/gutenberg/pull/60077))
+
+#### Block Editor
+
+-   Make sure the CSS class is-dark-theme is added to the editor iframe body. ([60300](https://github.com/WordPress/gutenberg/pull/60300))
+-   Raw handling: Preserve class. ([60331](https://github.com/WordPress/gutenberg/pull/60331))
+-   Raw handling: Preserve empty paragraphs. ([59476](https://github.com/WordPress/gutenberg/pull/59476))
+-   Wiriting flow: Backspace at beginning of first paragraph block prevents block from being deleted. ([56329](https://github.com/WordPress/gutenberg/pull/56329))
+
+#### Components
+
+-   CustomSelectControlV2: Fix hint behavior in legacy. ([60183](https://github.com/WordPress/gutenberg/pull/60183))
+-   InputControl: Ignore IME events when `isPressEnterToChange`. ([60090](https://github.com/WordPress/gutenberg/pull/60090))
+-   TextControl: Apply zero margin to input element. ([60282](https://github.com/WordPress/gutenberg/pull/60282))
+
+#### Global Styles
+
+-   Fix missing class for Global Styles > Colors. ([60094](https://github.com/WordPress/gutenberg/pull/60094))
+-   Reset specificity of body selector when processing with postcss. ([60266](https://github.com/WordPress/gutenberg/pull/60266))
+
+#### Zoom Out
+
+-   Fix zoom out mode toggling between pattern category selection. ([60225](https://github.com/WordPress/gutenberg/pull/60225))
+
+#### Data Views
+
+-   Fix focus outline visibility and truncation in data view record titles. ([60191](https://github.com/WordPress/gutenberg/pull/60191))
+
+#### Layout
+
+-   Fix horizontal flex layout in classic themes. ([60154](https://github.com/WordPress/gutenberg/pull/60154))
+
+#### Post Editor
+
+-   Editor: Memoize 'getInsertionPoint' selector. ([60015](https://github.com/WordPress/gutenberg/pull/60015))
+
+### Accessibility
+
+#### Data Views
+
+-   Add click-to-select behavior on table rows. ([59803](https://github.com/WordPress/gutenberg/pull/59803))
+-   Data views list layout: Apply focus styles to items on `focus-visible` rather than `focus`. ([60253](https://github.com/WordPress/gutenberg/pull/60253))
+-   Update field display in grid layout. ([60083](https://github.com/WordPress/gutenberg/pull/60083))
+-   [Data Views] Updating keyboard navigation in list layouts. ([59637](https://github.com/WordPress/gutenberg/pull/59637))
+
+#### Site Editor
+
+-   Restore Style book close button tooltip. ([60177](https://github.com/WordPress/gutenberg/pull/60177))
+
+#### Block Library
+
+-   Remove CSS order property from social icons placeholder UI. ([60032](https://github.com/WordPress/gutenberg/pull/60032))
+
+### Performance
+
+-   Avoid fetching ALL reusable blocks (user patterns) on post/site editor load. ([58239](https://github.com/WordPress/gutenberg/pull/58239))
+-   Block editor: Optimize hasSelectedInnerBlock selector. ([60330](https://github.com/WordPress/gutenberg/pull/60330))
+-   Templates perf: Resolve patterns server side. ([60349](https://github.com/WordPress/gutenberg/pull/60349))
+
+#### Block Library
+
+-   Template part: Avoid pattern fetch on mount. ([60297](https://github.com/WordPress/gutenberg/pull/60297))
+
+#### Block Editor
+
+-   Inserter: Cache search normalization results. ([60080](https://github.com/WordPress/gutenberg/pull/60080))
+
+### Experiments
+
+#### Site Editor
+
+-   Zoom-out view: Disable canvas resizing. ([60104](https://github.com/WordPress/gutenberg/pull/60104))
+
+### Documentation
+
+-   Add auto generated API documentation for `editor` package. ([60356](https://github.com/WordPress/gutenberg/pull/60356))
+-   Add component props documentation. ([60350](https://github.com/WordPress/gutenberg/pull/60350))
+-   Add php @global documentation. ([59931](https://github.com/WordPress/gutenberg/pull/59931))
+-   Change heading level on troubleshooting section. ([60233](https://github.com/WordPress/gutenberg/pull/60233))
+-   CustomSelectControlV2: Match v1 stories to test legacy component. ([60182](https://github.com/WordPress/gutenberg/pull/60182))
+-   Docs: Fix some typos. ([60260](https://github.com/WordPress/gutenberg/pull/60260))
+-   Fix @todo tags to follow standards in WordPress comments. ([60148](https://github.com/WordPress/gutenberg/pull/60148))
+-   Fix Font Collection JSON schema definition. ([60285](https://github.com/WordPress/gutenberg/pull/60285))
+-   Fix: Invalid documentation link to load JavaScript. ([60181](https://github.com/WordPress/gutenberg/pull/60181))
+-   Fix: Invalid links to the block supports api. ([60199](https://github.com/WordPress/gutenberg/pull/60199))
+-   Fix: Non existent link to submitting to the block directory. ([60389](https://github.com/WordPress/gutenberg/pull/60389))
+-   Interactivity API: Variable name correction in the documentation. ([60056](https://github.com/WordPress/gutenberg/pull/60056))
+-   [Create Block] Update external template documentation to include variants. ([60095](https://github.com/WordPress/gutenberg/pull/60095))
+
+### Code Quality
+
+-   Fix editor canvas overflow on search results with position: Relative. ([60287](https://github.com/WordPress/gutenberg/pull/60287))
+-   Editor: Move template areas to editor package. ([60179](https://github.com/WordPress/gutenberg/pull/60179))
+-   Style Engine: Continue get_classnames loop after adding the default classname. ([60153](https://github.com/WordPress/gutenberg/pull/60153))
+-   Update: Use getPostIcon selector on document bar. ([60128](https://github.com/WordPress/gutenberg/pull/60128))
+
+#### Block Editor
+
+-   Add comment for unmemoized context. ([60272](https://github.com/WordPress/gutenberg/pull/60272))
+-   Fix ESLint warning in BlockListBlock component. ([60064](https://github.com/WordPress/gutenberg/pull/60064))
+-   RichText: Switch from disableEditing to standard html readonly attribute. ([60327](https://github.com/WordPress/gutenberg/pull/60327))
+-   Site Editor: Reuse inserter search term normalization. ([60218](https://github.com/WordPress/gutenberg/pull/60218))
+-   canInsertBlockType: Extract helper for selector dependants. ([60235](https://github.com/WordPress/gutenberg/pull/60235))
+
+#### Components
+
+-   CustomSelectControlV2: Rename for consistency. ([60178](https://github.com/WordPress/gutenberg/pull/60178))
+-   Navigator: Fix two nits. ([60273](https://github.com/WordPress/gutenberg/pull/60273))
+-   NavigatorProvider: Move all state management to one reducer. ([60190](https://github.com/WordPress/gutenberg/pull/60190))
+-   Components: Try obviating Popover pointer event trap. ([59449](https://github.com/WordPress/gutenberg/pull/59449))
+
+#### Post Editor
+
+-   Memoize the getTemplateInfo selector. ([60200](https://github.com/WordPress/gutenberg/pull/60200))
+-   Update: Remove template summary component. ([60351](https://github.com/WordPress/gutenberg/pull/60351))
+
+#### Global Styles
+
+-   Additional CSS: Add code comments contextualising tranformStyles for clarity. ([60267](https://github.com/WordPress/gutenberg/pull/60267))
+-   Global styles: output `:root` selector for CSS custom properties. ([42084](https://github.com/WordPress/gutenberg/pull/42084))
+
+#### Font Library
+
+-   Add test for Font Library and Theme Style Variations. ([60250](https://github.com/WordPress/gutenberg/pull/60250))
+-   Update google fonts font collection data URL to the latest version available. ([60079](https://github.com/WordPress/gutenberg/pull/60079))
+
+#### Block Library
+
+-   Image: Use the new 'useUploadMediaFromBlobURL' hook. ([60208](https://github.com/WordPress/gutenberg/pull/60208))
+-   Navigation Block: Add test coverage to check that post content is not removed. ([60189](https://github.com/WordPress/gutenberg/pull/60189))
+
+#### Site Editor
+
+-   DataViews: Don't memoize every callback 'PagePages' component. ([60103](https://github.com/WordPress/gutenberg/pull/60103))
+-   History: Simplify the push and replace methods. ([60112](https://github.com/WordPress/gutenberg/pull/60112))
+
+#### Rich Text
+
+-   RichText: Separate fallback instance ID for selection retrieval. ([60277](https://github.com/WordPress/gutenberg/pull/60277))
+
+#### Block Locking
+
+-   E2E: Test BlockSwitcher availability in l-post-ul-group CPT. ([60254](https://github.com/WordPress/gutenberg/pull/60254))
+
+#### Data Views
+
+-   DataViews: Fix react warning error in list layout. ([60101](https://github.com/WordPress/gutenberg/pull/60101))
+
+### Tools
+
+#### Testing
+
+-   Automated Testing: Remove Puppeteer CI Job. ([59311](https://github.com/WordPress/gutenberg/pull/59311))
+-   CustomSelectControlV2: Stabilize tests. ([60133](https://github.com/WordPress/gutenberg/pull/60133))
+-   E2E: Fix flaky Site Editor pages end-to-end test. ([60109](https://github.com/WordPress/gutenberg/pull/60109))
+-   Font Library: Add upload font test. ([60221](https://github.com/WordPress/gutenberg/pull/60221))
+
+#### Build Tooling
+
+-   Blocks: Fix double `gutenberg_` prefix in built dynamic blocks PHP. ([60288](https://github.com/WordPress/gutenberg/pull/60288))
+
+### Various
+
+-   Backport r57868 (Editor: Prevent font folder naive filtering causing infinite loops) from WordPress-Develop. ([60141](https://github.com/WordPress/gutenberg/pull/60141))
+-   Format library: Improve unknown format performance. ([48761](https://github.com/WordPress/gutenberg/pull/48761))
+
+#### Post Editor
+
+-   Distraction free: Remove unwanted space from string. ([60108](https://github.com/WordPress/gutenberg/pull/60108))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors 🎉 :
+
+-   @interdevel: Fix `@todo` tags to follow standards in WordPress comments. ([60148](https://github.com/WordPress/gutenberg/pull/60148))
+-   @mikeybinns: Add component props documentation. ([60350](https://github.com/WordPress/gutenberg/pull/60350))
+-   @nirav7707: Editor: Update hover color of editor document title. ([60113](https://github.com/WordPress/gutenberg/pull/60113))
+-   @steveariss: Interactivity API: Variable name correction in the documentation. ([60056](https://github.com/WordPress/gutenberg/pull/60056))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @andrewhayward @andrewserong @artemiomorales @bph @draganescu @ellatrix @fabiankaegy @geriux @getdave @glendaviesnz @interdevel @jameskoster @jasmussen @jeryj @jorgefilipecosta @jsnajdr @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @mcsf @mikachan @mikeybinns @mirka @mujuonly @n2erjo00 @nirav7707 @noisysocks @ntsekouras @oandregal @ockham @pedro-mendonca @peterwilsoncc @ramonjd @richtabor @ryanwelcher @scruffian @shail-mehta @Soean @steveariss @stokesman @t-hamano @talldan @tellthemachines @torounit @tyxla @youknowriad
+
+= 18.0.0 =
+
+## Changelog
+
+### Enhancements
+
+-   Core Data: Update method generating plural names. ([59881](https://github.com/WordPress/gutenberg/pull/59881))
+-   Expand main content area to viewport when zoomed out. ([59512](https://github.com/WordPress/gutenberg/pull/59512))
+-   Update 'sidebar card' appearance. ([59997](https://github.com/WordPress/gutenberg/pull/59997))
+
+#### Data Views
+
+-   Add: Command click to select item on table view. ([59563](https://github.com/WordPress/gutenberg/pull/59563))
+-   DataViews: Add AND logic operators to filters. ([59953](https://github.com/WordPress/gutenberg/pull/59953))
+-   DataViews: Add default getValue for fields. ([59810](https://github.com/WordPress/gutenberg/pull/59810))
+-   DataViews: Implement multiple selection for filters. ([59610](https://github.com/WordPress/gutenberg/pull/59610))
+-   DataViews: Make list layout stable. ([59858](https://github.com/WordPress/gutenberg/pull/59858))
+-   Pages data view: Update quick-actions. ([59551](https://github.com/WordPress/gutenberg/pull/59551))
+-   Reduce visual prominence of primary actions in table data views, and consolidate primary + secondary actions in ellipsis menu. ([59128](https://github.com/WordPress/gutenberg/pull/59128))
+
+#### Site Editor
+
+-   Patterns: Add a title to the category delete flow and increase line height. ([59645](https://github.com/WordPress/gutenberg/pull/59645))
+-   Standardize block tools toggle button size to 32px. ([59625](https://github.com/WordPress/gutenberg/pull/59625))
+-   Update index page for templates. ([59792](https://github.com/WordPress/gutenberg/pull/59792))
+-   [Site Editor]: Move featured image at the top of the inspector controls. ([59783](https://github.com/WordPress/gutenberg/pull/59783))
+
+#### Block Library
+
+-   Add featured image to Media & Text block. ([51491](https://github.com/WordPress/gutenberg/pull/51491))
+-   Social Icons: Update Medium icon. ([57073](https://github.com/WordPress/gutenberg/pull/57073))
+-   Table Block: Fixed width table cells on by default. ([49672](https://github.com/WordPress/gutenberg/pull/49672))
+-   Update Reddit social icon to latest brand guidelines. ([59438](https://github.com/WordPress/gutenberg/pull/59438))
+
+#### Components
+
+-   Add typing for date and time typing for TextControl. ([59666](https://github.com/WordPress/gutenberg/pull/59666))
+-   Add: Support for menu group to the Dropdown. ([59723](https://github.com/WordPress/gutenberg/pull/59723))
+-   Update the line height for components. ([60028](https://github.com/WordPress/gutenberg/pull/60028))
+
+#### Design Tools
+
+-   Add Box Shadow support for featured image. ([59616](https://github.com/WordPress/gutenberg/pull/59616))
+-   Background block supports: Move block support defaults to gutenberg_render_background_support and revert gutenberg_get_background_support_styles. ([59889](https://github.com/WordPress/gutenberg/pull/59889))
+
+#### Layout
+
+-   Add Column Start and Row Start controls to Grid children. ([59483](https://github.com/WordPress/gutenberg/pull/59483))
+-   Allow blocks to be grouped as a Grid. ([59853](https://github.com/WordPress/gutenberg/pull/59853))
+
+#### Global Styles
+
+-   Remove preset headers. ([59504](https://github.com/WordPress/gutenberg/pull/59504))
+-   Try color and typography presets in Site View. ([59594](https://github.com/WordPress/gutenberg/pull/59594))
+
+#### Block API
+
+-   Display settings 'label' defined by the 'register_setting' method. ([59243](https://github.com/WordPress/gutenberg/pull/59243))
+
+#### Rich Text
+
+-   RichText: Add non breaking space shortcut on Windows. ([43150](https://github.com/WordPress/gutenberg/pull/43150))
+
+### New APIs
+
+-   Support the PluginDocumentSettingPanel slot in the site editor. ([59985](https://github.com/WordPress/gutenberg/pull/59985))
+-   Add pre 6.5 compat for viewStyles. ([59322](https://github.com/WordPress/gutenberg/pull/59322))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Add filter for duotone to account for gutenberg_restore_image_outer_container in classic themes. ([59764](https://github.com/WordPress/gutenberg/pull/59764))
+-   Add richText identifier to blocks. ([59056](https://github.com/WordPress/gutenberg/pull/59056))
+-   Close navigation link ui on escape. ([59838](https://github.com/WordPress/gutenberg/pull/59838))
+-   Code block: Preserve newlines. ([59627](https://github.com/WordPress/gutenberg/pull/59627))
+-   Do not focus new navigation block menu until loading is finished. ([59801](https://github.com/WordPress/gutenberg/pull/59801))
+-   File: Add center alignment editor class for classic themes. ([59975](https://github.com/WordPress/gutenberg/pull/59975))
+-   Fix create menu after menu switch. ([59630](https://github.com/WordPress/gutenberg/pull/59630))
+-   Fix image layout shift from placeholder to selected placeholder. ([59857](https://github.com/WordPress/gutenberg/pull/59857))
+-   Fix overlay issue when empty featured image is used in Cover Block. ([59855](https://github.com/WordPress/gutenberg/pull/59855))
+-   Media & Text: Remove the duplicate Media width control. ([59776](https://github.com/WordPress/gutenberg/pull/59776))
+-   Prevent default on primary+k to prevent command center from opening on navigation link. ([59845](https://github.com/WordPress/gutenberg/pull/59845))
+-   Quote: Show as active when deeply nested child block is selected. ([59662](https://github.com/WordPress/gutenberg/pull/59662))
+-   RichText: Document the identifier prop. ([60036](https://github.com/WordPress/gutenberg/pull/60036))
+-   Social icons: Only render label container when there's a label. ([60060](https://github.com/WordPress/gutenberg/pull/60060))
+-   Template Parts: Fix typo in translatable string. ([59816](https://github.com/WordPress/gutenberg/pull/59816))
+-   Ensure consistent return type in `WP_Navigation_Block_Renderer::Get_markup_for_inner_block()`. ([59820](https://github.com/WordPress/gutenberg/pull/59820))
+-   Return early from saving meta data for the navigation without a $post->ID. ([59875](https://github.com/WordPress/gutenberg/pull/59875))
+-   Fix root ID calculation when check if block can be transformed. ([60167](https://github.com/WordPress/gutenberg/pull/60167))
+-   Featured Image: Fix overlay rendering in the editor. ([60187](https://github.com/WordPress/gutenberg/pull/60187))
+-   Fix self closing navigation overlay. ([60130](https://github.com/WordPress/gutenberg/pull/60130))
+-   Navigation: Avoid content loss when only specific entity fields are edited. ([60071](https://github.com/WordPress/gutenberg/pull/60071))
+
+#### Font Library
+
+-   Avoid auto-removing font families without font faces. ([59910](https://github.com/WordPress/gutenberg/pull/59910))
+-   Ensure that errors reported from uploading font files are not duplicated. ([59564](https://github.com/WordPress/gutenberg/pull/59564))
+-   Fix JS errors when activating or deactivating system fonts. ([59935](https://github.com/WordPress/gutenberg/pull/59935))
+-   Fix typo in upload text. ([59655](https://github.com/WordPress/gutenberg/pull/59655))
+-   Polish Google Fonts consent box. ([59631](https://github.com/WordPress/gutenberg/pull/59631))
+-   Refactors the upload handler in order to check if files being uploaded are valid font files. ([59648](https://github.com/WordPress/gutenberg/pull/59648))
+-   Reset notices when navigating away from the collection. ([59981](https://github.com/WordPress/gutenberg/pull/59981))
+-   Activate the fonts coming from the backend and not the data from the frontend. ([60093](https://github.com/WordPress/gutenberg/pull/60093))
+-   Install fonts in sequence to work around race condition. ([60180](https://github.com/WordPress/gutenberg/pull/60180))
+
+#### Interactivity API
+
+-   Backport fixes from Core. ([59903](https://github.com/WordPress/gutenberg/pull/59903))
+-   Fix interactivity api end-to-end tests. ([59836](https://github.com/WordPress/gutenberg/pull/59836))
+-   Interactivity: Ensure stores are initialized on client. ([59842](https://github.com/WordPress/gutenberg/pull/59842))
+-   Interactivity: Restore scope when yielded promise rejects. ([59708](https://github.com/WordPress/gutenberg/pull/59708))
+-   Prevent non-object state from being added. ([59886](https://github.com/WordPress/gutenberg/pull/59886))
+-   Re-introduce `data_wp_context()` with `_deprecated_function()` call. ([59834](https://github.com/WordPress/gutenberg/pull/59834))
+
+#### Site Editor
+
+-   Don't display welcome guide in hybrid theme. ([55865](https://github.com/WordPress/gutenberg/pull/55865))
+-   Editor: Fix loading templates using a top level pattern block that includes a template part. ([59900](https://github.com/WordPress/gutenberg/pull/59900))
+-   Fix opening of save panel when using the `save` shortcut. ([59647](https://github.com/WordPress/gutenberg/pull/59647))
+-   Fix selected featured image when opening media library. ([59769](https://github.com/WordPress/gutenberg/pull/59769))
+-   Make the delete navigation menu confirm dialogs consistent. ([59825](https://github.com/WordPress/gutenberg/pull/59825))
+-   Restore the back button when navigating to the template from the home page. ([59639](https://github.com/WordPress/gutenberg/pull/59639))
+
+#### Block Editor
+
+-   Fix allow mouse users to edit link text when Link UI is active. ([59635](https://github.com/WordPress/gutenberg/pull/59635))
+-   Fix crash when unmounting an editor iframe. ([59992](https://github.com/WordPress/gutenberg/pull/59992))
+-   Handle when attributes param passed into hasStickyOrFixedPositionValue is nullish. ([59800](https://github.com/WordPress/gutenberg/pull/59800))
+-   List view: Fix stuck moving animation on Enter. ([59644](https://github.com/WordPress/gutenberg/pull/59644))
+-   Shadow support enable skip serialization for dynamic blocks. ([59887](https://github.com/WordPress/gutenberg/pull/59887))
+-   FlatTermSelector: Invalidate optimistic update if term creation fails. ([59945](https://github.com/WordPress/gutenberg/pull/59945))
+
+#### Global Styles
+
+-   Fix retrieval of referenced preset values in editor. ([59811](https://github.com/WordPress/gutenberg/pull/59811))
+-   Global Syles: Apply fallback background color to typography elements. ([59347](https://github.com/WordPress/gutenberg/pull/59347))
+-   Presets: Show the default empty variation as well as the other presets. ([59717](https://github.com/WordPress/gutenberg/pull/59717))
+-   Remove filter for same number of settings. ([59590](https://github.com/WordPress/gutenberg/pull/59590))
+-   Site editor: Find font families for typography presets crashes editor. ([59806](https://github.com/WordPress/gutenberg/pull/59806))
+-   Force root min-height of 100% for backgrounds. ([59809](https://github.com/WordPress/gutenberg/pull/59809))
+-   Featured Image: Fix block support selectors after shadow support addition. ([60184](https://github.com/WordPress/gutenberg/pull/60184))
+-   Fix list of base theme fonts when a theme variation is applied.. ([59959](https://github.com/WordPress/gutenberg/pull/59959))
+
+#### Patterns
+
+-   Add pattern title in create modal in post editor. ([59550](https://github.com/WordPress/gutenberg/pull/59550))
+-   Implement pattern overrides behind `IS_GUTENBERG_PLUGIN` flag. ([59702](https://github.com/WordPress/gutenberg/pull/59702))
+-   Pattern Explorer: Pass 'rootClientId' to the pattern list. ([60014](https://github.com/WordPress/gutenberg/pull/60014))
+-   Pattern Shuffling: Don't assume that patterns have categories. ([60070](https://github.com/WordPress/gutenberg/pull/60070))
+
+#### Data Views
+
+-   Ensure the 'select all' checkbox appears on hover. ([59799](https://github.com/WordPress/gutenberg/pull/59799))
+-   Fix: Regression: Default templates and template parts views do not work. ([59794](https://github.com/WordPress/gutenberg/pull/59794))
+-   Ignore cmd-click when row not selectable. ([59697](https://github.com/WordPress/gutenberg/pull/59697))
+-   [DataViews]: Fix item actions. ([59748](https://github.com/WordPress/gutenberg/pull/59748))
+
+#### Components
+
+-   DateTimePicker: Change day button size back from 32px to 28px. ([59990](https://github.com/WordPress/gutenberg/pull/59990))
+-   Fix unwanted ToggleGroupControl backdrop vertical animation. ([59642](https://github.com/WordPress/gutenberg/pull/59642))
+-   PaletteEdit: Fix order numbers. ([52212](https://github.com/WordPress/gutenberg/pull/52212))
+
+#### Layout
+
+-   Experiments: Fix label typo: "Grid interactivity". ([59796](https://github.com/WordPress/gutenberg/pull/59796))
+-   Show inherit toggle in the absence of `settings.layout` object. ([59580](https://github.com/WordPress/gutenberg/pull/59580))
+-   Use correct layout type to display controls. ([59979](https://github.com/WordPress/gutenberg/pull/59979))
+
+#### List View
+
+-   Block Bindings: Remove Block Bindings icon from List View, fixes and CSS updates. ([59477](https://github.com/WordPress/gutenberg/pull/59477))
+-   Heading Block: Show default block name in list view when content is empty. ([59827](https://github.com/WordPress/gutenberg/pull/59827))
+-   Blocks: getBlockLabel: Use RichTextData.toPlainText if available. ([58524](https://github.com/WordPress/gutenberg/pull/58524))
+
+#### Data Layer
+
+-   Fix `getEntityRecordsTotalPages` when `per_page` is not provided. ([59983](https://github.com/WordPress/gutenberg/pull/59983))
+
+#### Icons
+
+-   Fix return icon viewbox. ([59669](https://github.com/WordPress/gutenberg/pull/59669))
+
+### Accessibility
+
+-   Add tooltip to several Back buttons. ([59760](https://github.com/WordPress/gutenberg/pull/59760))
+-   Make save panel a dialog with proper labels, fix site editor focus loss after save. ([59622](https://github.com/WordPress/gutenberg/pull/59622))
+-   Fix labeling of the navigation links in the list view. ([59370](https://github.com/WordPress/gutenberg/pull/59370))
+
+### Documentation
+
+-   Block JSON schema: Add `layout.allowCustomContentAndWideSize` field. ([59736](https://github.com/WordPress/gutenberg/pull/59736))
+-   Components: Fix headline hierarchy in README. ([59726](https://github.com/WordPress/gutenberg/pull/59726))
+-   Components: Hide private READMEs from handbook. ([60003](https://github.com/WordPress/gutenberg/pull/60003))
+-   Dataviews: Improve story. ([59773](https://github.com/WordPress/gutenberg/pull/59773))
+-   Docs/fix typo in metadata reference guide. ([59577](https://github.com/WordPress/gutenberg/pull/59577))
+-   Docs/fix typos and clarify wording in blocks supports guide. ([59721](https://github.com/WordPress/gutenberg/pull/59721))
+-   Docs/fix typos in block context. ([59575](https://github.com/WordPress/gutenberg/pull/59575))
+-   Docs/fix typos in block registration guide. ([59720](https://github.com/WordPress/gutenberg/pull/59720))
+-   Docs/fix typos in block supports. ([59919](https://github.com/WordPress/gutenberg/pull/59919))
+-   Docs/fix typos in edit and save reference guide. ([59576](https://github.com/WordPress/gutenberg/pull/59576))
+-   Docs: Flex - Fix headline hierarchy. ([59686](https://github.com/WordPress/gutenberg/pull/59686))
+-   Docs: List all minor versions on Versions in WordPress page. ([58003](https://github.com/WordPress/gutenberg/pull/58003))
+-   Docs: Remove alert callout on block selectors page. ([60020](https://github.com/WordPress/gutenberg/pull/60020))
+-   Docs: Update Interactivity API package readme. ([59763](https://github.com/WordPress/gutenberg/pull/59763))
+-   Fix broken links in Interactivity API documentation. ([59715](https://github.com/WordPress/gutenberg/pull/59715))
+-   Fix sample code on InputControl documentation. ([59517](https://github.com/WordPress/gutenberg/pull/59517))
+-   Fix typo in platform-docs. ([60042](https://github.com/WordPress/gutenberg/pull/60042))
+-   Fix: Invalid links to getting started with JavaScript. ([59927](https://github.com/WordPress/gutenberg/pull/59927))
+-   Fixes pseudo code doc block to use real PHP. ([60012](https://github.com/WordPress/gutenberg/pull/60012))
+-   HeadingLevelDropdown: Fix JSDoc and documentation. ([59727](https://github.com/WordPress/gutenberg/pull/59727))
+-   Improve Gutenberg platform documentation homepage. ([59749](https://github.com/WordPress/gutenberg/pull/59749))
+-   InputControl: Make `onChange` observable in Storybook. ([60055](https://github.com/WordPress/gutenberg/pull/60055))
+-   Interactivity API Docs: Clarify that `getElement()`'s `ref` can be `null`. ([59868](https://github.com/WordPress/gutenberg/pull/59868))
+-   Platform Docs: Fix JSX error. ([59967](https://github.com/WordPress/gutenberg/pull/59967))
+-   Plugin short description less than 150 characters. ([59661](https://github.com/WordPress/gutenberg/pull/59661))
+-   RadioControl: Update deprecated suggestion in readme. ([60002](https://github.com/WordPress/gutenberg/pull/60002))
+-   Replace screenshots of Radio Control. ([60024](https://github.com/WordPress/gutenberg/pull/60024))
+-   Replace “sidebar” with “panel” in README.md. ([59664](https://github.com/WordPress/gutenberg/pull/59664))
+-   Update GitHub edit URL in docusaurus.config.js. ([59969](https://github.com/WordPress/gutenberg/pull/59969))
+-   Update React documentation links for forms. ([59657](https://github.com/WordPress/gutenberg/pull/59657))
+-   Update api-reference - data-bind--hidden is an incorrrect attribute - should be data-wp-bind--hidden. ([59955](https://github.com/WordPress/gutenberg/pull/59955))
+-   Update block supports documentation for WordPress 6.5. ([59862](https://github.com/WordPress/gutenberg/pull/59862))
+-   Update dependency-extraction-webpack-plugin documentation. ([59973](https://github.com/WordPress/gutenberg/pull/59973))
+-   docs: Fix syntax in block filters example. ([59636](https://github.com/WordPress/gutenberg/pull/59636))
+-   theme.json schema: Add settings.color.caption definition. ([60017](https://github.com/WordPress/gutenberg/pull/60017))
+
+### Code Quality
+
+-   Add $schema to tsconfig files. ([59861](https://github.com/WordPress/gutenberg/pull/59861))
+-   Added @global to PHP documentation Comments. ([59725](https://github.com/WordPress/gutenberg/pull/59725))
+-   Consolidate template actions components. ([59586](https://github.com/WordPress/gutenberg/pull/59586))
+-   Core Data: Clarify comments for entities' plural methods. ([59946](https://github.com/WordPress/gutenberg/pull/59946))
+-   Fix Code Standards for RC 2 release. ([59774](https://github.com/WordPress/gutenberg/pull/59774))
+-   Fix typo in Dataviews and Font Collection packages. ([59656](https://github.com/WordPress/gutenberg/pull/59656))
+-   Fix: Typo correction tff to ttf. ([59665](https://github.com/WordPress/gutenberg/pull/59665))
+-   Global styles utils: Remove unused vars. ([59805](https://github.com/WordPress/gutenberg/pull/59805))
+-   Refactor zoom-out iframe scale. ([59618](https://github.com/WordPress/gutenberg/pull/59618))
+-   Refine include/exclude patterns in phpcs.xml.dist. ([59712](https://github.com/WordPress/gutenberg/pull/59712))
+-   Typography Presets: Use && rather to avoid a messy nested conditional. ([59920](https://github.com/WordPress/gutenberg/pull/59920))
+-   synchronizeBlocksWithTemplate: Extract common functions. ([59682](https://github.com/WordPress/gutenberg/pull/59682))
+
+#### Block Editor
+
+-   Block tree reducer: Avoid nested update for insertUsage. ([59681](https://github.com/WordPress/gutenberg/pull/59681))
+-   Block tree reducer: Avoid repetitive Map.get. ([59672](https://github.com/WordPress/gutenberg/pull/59672))
+-   BlockSettingsDropdown: No need to cast 'clientIds' to an array. ([59940](https://github.com/WordPress/gutenberg/pull/59940))
+-   BlockSettingsMenuControls: Remove '\_\_unstableDisplayLocation' prop. ([59942](https://github.com/WordPress/gutenberg/pull/59942))
+-   Don't memoize callbacks in 'BlockSettingsDropdown'. ([59397](https://github.com/WordPress/gutenberg/pull/59397))
+-   Link dialog: Remove CSS hack. ([59746](https://github.com/WordPress/gutenberg/pull/59746))
+-   Pattern Explorer: Remove leftover source filter state handlers. ([60019](https://github.com/WordPress/gutenberg/pull/60019))
+-   Fix code formatting in Nav block view file. ([60162](https://github.com/WordPress/gutenberg/pull/60162))
+
+#### Components
+
+-   Button : Deprecate `isSmall` prop. ([59734](https://github.com/WordPress/gutenberg/pull/59734))
+-   Button: Keep deprecated props in type definitions. ([59913](https://github.com/WordPress/gutenberg/pull/59913))
+-   Replace `isSmall` prop with `size` in `NavigationMenuSelector`. ([59667](https://github.com/WordPress/gutenberg/pull/59667))
+-   Replace isSmall prop WordPress/Gutenberg#53560. ([59302](https://github.com/WordPress/gutenberg/pull/59302))
+-   TextareaControl: Remove extra closing curly brace in `inputStyleNeutral`. ([59744](https://github.com/WordPress/gutenberg/pull/59744))
+-   Update Snapshots for line height. ([60041](https://github.com/WordPress/gutenberg/pull/60041))
+
+#### Block Library
+
+-   Add explanatory comment to Nav Link block fix for Command Center. ([59864](https://github.com/WordPress/gutenberg/pull/59864))
+-   Enforce @since tags in block-library/src/_/_.php files. ([59700](https://github.com/WordPress/gutenberg/pull/59700))
+-   Refactor Enter keypress on Nav Link. ([59848](https://github.com/WordPress/gutenberg/pull/59848))
+-   Update Nav block permissions variable naming accuracy. ([59882](https://github.com/WordPress/gutenberg/pull/59882))
+
+#### Global Styles
+
+-   Fetch the variations inside the component. ([59588](https://github.com/WordPress/gutenberg/pull/59588))
+-   Theme JSON: Remove unused vars in layout class. ([59938](https://github.com/WordPress/gutenberg/pull/59938))
+-   Use the preivew iframe to preview typography for consistency. ([59587](https://github.com/WordPress/gutenberg/pull/59587))
+-   Background block supports: Move size defaults to hooks and block.json. ([60008](https://github.com/WordPress/gutenberg/pull/60008))
+
+#### Plugin
+
+-   Remove unnecessary 'IS_GUTENBERG_PLUGIN' check in 'load.php'. ([59873](https://github.com/WordPress/gutenberg/pull/59873))
+-   Update PHP Sync Issue generation script to ignore PRs with given labels. ([59549](https://github.com/WordPress/gutenberg/pull/59549))
+
+#### Data Views
+
+-   Update: Dataviews do not use strings on isCustom props passed down. ([59609](https://github.com/WordPress/gutenberg/pull/59609))
+-   [Data Views]: Remove separator in item actions. ([59822](https://github.com/WordPress/gutenberg/pull/59822))
+
+#### Data Layer
+
+-   Data: Deprecate the getIsResolving selector. ([59679](https://github.com/WordPress/gutenberg/pull/59679))
+
+### Tools
+
+#### Build Tooling
+
+-   Add inline comment denoting version for Ruby setup. ([59640](https://github.com/WordPress/gutenberg/pull/59640))
+-   Build: Dedupe packages. ([57800](https://github.com/WordPress/gutenberg/pull/57800))
+-   GitHub Actions: Fix PHP file change detection logic. ([59653](https://github.com/WordPress/gutenberg/pull/59653))
+-   Improve likelihood of Cherry Picking script including all PRs. ([59871](https://github.com/WordPress/gutenberg/pull/59871))
+-   Interactive template: Use wp_interactivity_data_wp_context function. ([59995](https://github.com/WordPress/gutenberg/pull/59995))
+-   Test: Dynamically detect and set max-workers. ([59904](https://github.com/WordPress/gutenberg/pull/59904))
+-   Update docusaurus to the latest version. ([59866](https://github.com/WordPress/gutenberg/pull/59866))
+
+#### Testing
+
+-   Remove @kevin940726 and @Mamaduka from end-to-end test codeowners. ([60067](https://github.com/WordPress/gutenberg/pull/60067))
+-   Upgrade Playwright to v1.42. ([59339](https://github.com/WordPress/gutenberg/pull/59339))
+-   Use viewScriptModule block.json field for interactivity end-to-end tests. ([59705](https://github.com/WordPress/gutenberg/pull/59705))
+-   end-to-end theme switch: Match incoming theme slug, then optional folder. ([59851](https://github.com/WordPress/gutenberg/pull/59851))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @andrewfleming: Plugin short description less than 150 characters. ([59661](https://github.com/WordPress/gutenberg/pull/59661))
+-   @chrisbellboy: docs: Fix syntax in block filters example. ([59636](https://github.com/WordPress/gutenberg/pull/59636))
+-   @colinduwe: Shadow support enable skip serialization for dynamic blocks. ([59887](https://github.com/WordPress/gutenberg/pull/59887))
+-   @enodekciw: Update dependency-extraction-webpack-plugin documentation. ([59973](https://github.com/WordPress/gutenberg/pull/59973))
+-   @georgestephanis: Re-introduce `data_wp_context()` with `_deprecated_function()` call. ([59834](https://github.com/WordPress/gutenberg/pull/59834))
+-   @J0n-92: Add typing for date and time typing for TextControl. ([59666](https://github.com/WordPress/gutenberg/pull/59666))
+-   @jaclync: Replace `isSmall` prop with `size` in `NavigationMenuSelector`. ([59667](https://github.com/WordPress/gutenberg/pull/59667))
+-   @Jayanth-Parthsarathy: Add inline comment denoting version for Ruby setup. ([59640](https://github.com/WordPress/gutenberg/pull/59640))
+-   @luislard: Fix broken links in Interactivity API documentation. ([59715](https://github.com/WordPress/gutenberg/pull/59715))
+-   @mattsherman: Handle when attributes param passed into hasStickyOrFixedPositionValue is nullish. ([59800](https://github.com/WordPress/gutenberg/pull/59800))
+-   @mzahir: Update React documentation links for forms. ([59657](https://github.com/WordPress/gutenberg/pull/59657))
+-   @rcoll: Fix typo in Dataviews and Font Collection packages. ([59656](https://github.com/WordPress/gutenberg/pull/59656))
+-   @SahilThakur02: TextareaControl: Remove extra closing curly brace in `inputStyleNeutral`. ([59744](https://github.com/WordPress/gutenberg/pull/59744))
+-   @Sam-Xronn: Update Reddit social icon to latest brand guidelines. ([59438](https://github.com/WordPress/gutenberg/pull/59438))
+-   @Strangehill: Replace “sidebar” with “panel” in README.md. ([59664](https://github.com/WordPress/gutenberg/pull/59664))
+-   @TeresaGobble: Docs/fix typos in edit and save reference guide. ([59576](https://github.com/WordPress/gutenberg/pull/59576))
+-   @tomepajk: Update api-reference - data-bind--hidden is an incorrrect attribute - should be data-wp-bind--hidden. ([59955](https://github.com/WordPress/gutenberg/pull/59955))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @afragen @ajlende @alexstine @andrewfleming @anton-vlasenko @artemiomorales @bacoords @c4rl0sbr4v0 @carolinan @chrisbellboy @colinduwe @creativecoder @DAreRodz @dcalhoun @draganescu @ellatrix @enejb @enodekciw @flexseth @fluiddot @gaambo @georgestephanis @geriux @getdave @huzaifaalmesbah @inc2734 @J0n-92 @jaclync @jameskoster @jasmussen @Jayanth-Parthsarathy @jeryj @jorgefilipecosta @jsnajdr @kevin940726 @krokodok @luislard @Mamaduka @matiasbenedetto @mattsherman @mcsf @megane9988 @michalczaplinski @mirka @mujuonly @mzahir @ndiego @noisysocks @ntsekouras @oandregal @pbking @ramonjd @rcoll @SahilThakur02 @Sam-Xronn @scruffian @shail-mehta @SiobhyB @sirreal @Soean @Strangehill @sunil25393 @swissspidy @t-hamano @talldan @tellthemachines @TeresaGobble @tjcafferkey @tomepajk @tyxla @vcanales @youknowriad
+
+= 17.9.0 =
+
+## Changelog
+
+### Enhancements
+
+#### Data Views
+
+-   Apply hover styles to filter chip while being configured. ([59236](https://github.com/WordPress/gutenberg/pull/59236))
+-   Display all checkboxes when a single item is selected. ([59233](https://github.com/WordPress/gutenberg/pull/59233))
+-   Pages data view: Make 'View' button open a new tab. ([59554](https://github.com/WordPress/gutenberg/pull/59554))
+-   Reposition pattern detail icon. ([59363](https://github.com/WordPress/gutenberg/pull/59363))
+-   Update 'Add filter' button in data views. ([59433](https://github.com/WordPress/gutenberg/pull/59433))
+-   Update empty/loading states. ([59437](https://github.com/WordPress/gutenberg/pull/59437))
+-   Update filter control position. ([59231](https://github.com/WordPress/gutenberg/pull/59231))
+-   Update page selector appearance. ([59284](https://github.com/WordPress/gutenberg/pull/59284))
+-   Update pages dataview icons, add 'drafts' icon. ([59285](https://github.com/WordPress/gutenberg/pull/59285))
+-   Update sidebar titles for Template and Page management data views. ([59011](https://github.com/WordPress/gutenberg/pull/59011))
+
+#### Global Styles
+
+-   Add background image to top-level theme.json styles. ([59354](https://github.com/WordPress/gutenberg/pull/59354))
+-   Add color and typography presets to Global Styles. ([56622](https://github.com/WordPress/gutenberg/pull/56622))
+-   Create a shared component for typography previews. ([59503](https://github.com/WordPress/gutenberg/pull/59503))
+-   Enqueue block custom CSS only when block renders on the page. ([58991](https://github.com/WordPress/gutenberg/pull/58991))
+-   Style Book: Should persist when browsing global styles panels. ([59261](https://github.com/WordPress/gutenberg/pull/59261))
+
+#### Block Library
+
+-   Introduce the 'useUploadMediaFromBlobURL' utility hook. ([59350](https://github.com/WordPress/gutenberg/pull/59350))
+-   Remove redundant copy from PanelBody titles. ([59278](https://github.com/WordPress/gutenberg/pull/59278))
+-   Template Parts: Add a replace flow to the inspector controls. ([55128](https://github.com/WordPress/gutenberg/pull/55128))
+
+#### Site Editor
+
+-   Block Theme Previews: Remove "Looking for Template Parts?" hint. ([59092](https://github.com/WordPress/gutenberg/pull/59092))
+-   Remove the site editor sidebar navigation edit button. ([59335](https://github.com/WordPress/gutenberg/pull/59335))
+-   Scale the zoomed out mode to fit available space. ([59342](https://github.com/WordPress/gutenberg/pull/59342))
+-   View full zoomed out mode canvas while inserting patterns. ([59337](https://github.com/WordPress/gutenberg/pull/59337))
+-   Add: Shuffle button in zoom out mode. ([59573](https://github.com/WordPress/gutenberg/pull/59573))
+
+#### Font Library
+
+-   Add option to revoke access to Google Fonts. ([59205](https://github.com/WordPress/gutenberg/pull/59205))
+-   Make font collection fields translatable. ([59256](https://github.com/WordPress/gutenberg/pull/59256))
+-   Update the spacing in the font collection panel. ([59357](https://github.com/WordPress/gutenberg/pull/59357))
+
+#### Post Editor
+
+-   Editor: Standardize header button size to 32px. ([58532](https://github.com/WordPress/gutenberg/pull/58532))
+-   Tweak: Sidebar categories panel. ([59495](https://github.com/WordPress/gutenberg/pull/59495))
+
+#### Patterns
+
+-   Add Shuffle option to sections via pattern category. ([59251](https://github.com/WordPress/gutenberg/pull/59251))
+-   Use block naming for marking blocks as overridable in patterns. ([59268](https://github.com/WordPress/gutenberg/pull/59268))
+
+#### Components
+
+-   Storybook: Add mechanism to redirect moved stories. ([59181](https://github.com/WordPress/gutenberg/pull/59181))
+
+#### Nested / Inner Blocks
+
+-   InnerBlocks: Support insert before/after block actions when using allowedBlocks. ([59162](https://github.com/WordPress/gutenberg/pull/59162))
+
+#### Plugin
+
+-   Update cherry pick script to add `Backported to WP Core` label for backports. ([58970](https://github.com/WordPress/gutenberg/pull/58970))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Columns: Correctly recalculate column widths when the column count is increased by more than 2 at once. ([59301](https://github.com/WordPress/gutenberg/pull/59301))
+-   Group: Fix alignment of Group block placeholder text. ([59271](https://github.com/WordPress/gutenberg/pull/59271))
+-   Query Loop: Don't show publicly non-queryable taxonomies. ([59458](https://github.com/WordPress/gutenberg/pull/59458))
+-   Image: Remove scrolling of empty image blocks. ([59305](https://github.com/WordPress/gutenberg/pull/59305))
+-   Search: Use font size for search icon. ([59159](https://github.com/WordPress/gutenberg/pull/59159))
+-   Site Logo: Update URL for site icon settings with fallback for WP core versions earlier than 6.5. ([59485](https://github.com/WordPress/gutenberg/pull/59485))
+-   Site Logo: Update capitalization of Use as Site Icon toggle. ([59383](https://github.com/WordPress/gutenberg/pull/59383))
+-   Title & Featured Image: Hide non content controls when block editing mode is 'contentOnly'. ([59295](https://github.com/WordPress/gutenberg/pull/59295))
+
+#### Font Library
+
+-   Avoid creating font families without font faces. ([59436](https://github.com/WordPress/gutenberg/pull/59436))
+-   Avoid loading theme fonts twice and assume they were already resolved by the font face resolver. ([59421](https://github.com/WordPress/gutenberg/pull/59421))
+-   Changed installFont to installFonts so that multiple font families can be installed at once. ([59451](https://github.com/WordPress/gutenberg/pull/59451))
+-   Fixed the font family modal to open in state when a font is already selected. ([59379](https://github.com/WordPress/gutenberg/pull/59379))
+-   Font collection pagination: Add min height to avoid infinite number. ([59241](https://github.com/WordPress/gutenberg/pull/59241))
+-   Hide UI elements when user lacks permissions. ([59332](https://github.com/WordPress/gutenberg/pull/59332))
+-   Load/Unload the font face in browser when toggling the variants. ([59066](https://github.com/WordPress/gutenberg/pull/59066))
+-   Use SearchControl component for search input. ([59589](https://github.com/WordPress/gutenberg/pull/59589))
+-   REST API: Backport r57804 from wp-dev. ([59767](https://github.com/WordPress/gutenberg/pull/59767))
+
+#### Interactivity API
+
+-   Fix `navigate()` issues related to initial state merges. ([57134](https://github.com/WordPress/gutenberg/pull/57134))
+-   Fix context object proxy references. ([59553](https://github.com/WordPress/gutenberg/pull/59553))
+-   Improve context merges using proxies. ([59187](https://github.com/WordPress/gutenberg/pull/59187))
+-   Navigation: Add missing empty space to print out valid HTML. ([59255](https://github.com/WordPress/gutenberg/pull/59255))
+-   Prevent unwanted subscriptions to inherited context props. ([59273](https://github.com/WordPress/gutenberg/pull/59273))
+-   Rename `data_wp_context` function. ([59465](https://github.com/WordPress/gutenberg/pull/59465))
+
+#### Components
+
+-   Button: Fix focus outline in disabled primary variant. ([59391](https://github.com/WordPress/gutenberg/pull/59391))
+-   Button: Place children before the icon when `iconPosition` is "right". ([59489](https://github.com/WordPress/gutenberg/pull/59489))
+-   Fix tooltip font. ([59307](https://github.com/WordPress/gutenberg/pull/59307))
+-   HStack, VStack: Stop passing invalid props. ([59416](https://github.com/WordPress/gutenberg/pull/59416))
+-   URLPopover: Restore min-width style. ([59274](https://github.com/WordPress/gutenberg/pull/59274))
+
+#### Block Editor
+
+-   Fix Navigation link control overlapping issue. ([59065](https://github.com/WordPress/gutenberg/pull/59065))
+-   Fix: Re-render toolbar when parent block changes. ([59234](https://github.com/WordPress/gutenberg/pull/59234))
+-   List: Copy wrapper when multi selecting items. ([59460](https://github.com/WordPress/gutenberg/pull/59460))
+-   Refactor: UseBlockTools hook. ([58979](https://github.com/WordPress/gutenberg/pull/58979))
+-   Rich text: Fix typing into empty flex element. ([59473](https://github.com/WordPress/gutenberg/pull/59473))
+-   URLPopover: Fix a problem with the layout of link settings. ([58906](https://github.com/WordPress/gutenberg/pull/58906))
+-   Fix issue with appender jumping when creating a new pattern. ([59582](https://github.com/WordPress/gutenberg/pull/59582))
+-   Allow event bubbling even if keydown is passed. ([59474](https://github.com/WordPress/gutenberg/pull/59474))
+
+#### Custom Fields
+
+-   Block Bindings: Fix console error when selecting a bound block. ([59598](https://github.com/WordPress/gutenberg/pull/59598))
+-   Change default "Connected to a custom field" message in bindings. ([59434](https://github.com/WordPress/gutenberg/pull/59434))
+-   Fix inserting button block when pressing enter in a block with bound `text` attribute. ([59361](https://github.com/WordPress/gutenberg/pull/59361))
+-   Fix query loop with block bindings not working in the editor as expected. ([59283](https://github.com/WordPress/gutenberg/pull/59283))
+
+#### Data Views
+
+-   DataViews: Don't use combobox when there are few available options. ([59341](https://github.com/WordPress/gutenberg/pull/59341))
+-   DataViews: Set color for primary field/`a` element when focused. ([58814](https://github.com/WordPress/gutenberg/pull/58814))
+-   Dataviews: Fix sticky table headers. ([59467](https://github.com/WordPress/gutenberg/pull/59467))
+
+#### Site Editor
+
+-   Ensure ResizableFrame does not force Cover blocks within the editor to show drag handles. ([59262](https://github.com/WordPress/gutenberg/pull/59262))
+-   Iframe: Scale html instead of iframe element for zoomed out mode. ([59334](https://github.com/WordPress/gutenberg/pull/59334))
+-   Zoom out mode: Only apply grey background for mode. ([59377](https://github.com/WordPress/gutenberg/pull/59377))
+-   Fix Global Styles outdated output. ([59628](https://github.com/WordPress/gutenberg/pull/59628))
+-   Fix site editor crashing when not fully loaded. ([59658](https://github.com/WordPress/gutenberg/pull/59658))
+
+#### Global Styles
+
+-   Dynamically set border panel label based on the controls available. ([59358](https://github.com/WordPress/gutenberg/pull/59358))
+-   Shadow: Fix layout collapse when indicator is selected. ([59309](https://github.com/WordPress/gutenberg/pull/59309))
+-   Theme JSON: Check for null values to cater for blockGap. ([59258](https://github.com/WordPress/gutenberg/pull/59258))
+-   Remove the extra unneeded color variations panel. ([59718](https://github.com/WordPress/gutenberg/pull/59718))
+
+#### Post Editor
+
+-   Command Palette: Prevent mode switching if only one editor mode is available. ([59299](https://github.com/WordPress/gutenberg/pull/59299))
+-   Editor: Fix post type check in isEditingTemplate selector. ([59105](https://github.com/WordPress/gutenberg/pull/59105))
+-   Top Toolbar: Fix 'collapsed' state synchronization. ([59267](https://github.com/WordPress/gutenberg/pull/59267))
+
+#### Block hooks
+
+-   Display toggle for hooked blocks added via filter. ([59396](https://github.com/WordPress/gutenberg/pull/59396))
+-   Navigation Block: Fix erroneous escaping of ampersands. ([59561](https://github.com/WordPress/gutenberg/pull/59561))
+
+#### Patterns
+
+-   Disable image caption if part of synced pattern. ([58916](https://github.com/WordPress/gutenberg/pull/58916))
+-   Disable selection checkbox if no bulk actions are eligible. ([58950](https://github.com/WordPress/gutenberg/pull/58950))
+
+#### Block bindings
+
+-   Fix Enter on disabled rich text. ([59320](https://github.com/WordPress/gutenberg/pull/59320))
+
+#### Page Content Focus
+
+-   Fix `DisableNonPageContentBlocks` behavior. ([59297](https://github.com/WordPress/gutenberg/pull/59297))
+
+#### Design Tools
+
+-   Cover block: Clear aspect ratio value when toggling full height. ([59296](https://github.com/WordPress/gutenberg/pull/59296))
+-   Disable core shadow presets by default, let themes opt-in. ([58766](https://github.com/WordPress/gutenberg/pull/58766))
+
+#### Layout
+
+-   Fix MarginVisualizer and PaddingVisualizer. ([59227](https://github.com/WordPress/gutenberg/pull/59227))
+
+#### Block Conversion
+
+-   Preserve bindings metadata in block transforms. ([59179](https://github.com/WordPress/gutenberg/pull/59179))
+
+#### Typography
+
+-   Fluid typography: Pass theme.json settings to override merged theme data. ([58362](https://github.com/WordPress/gutenberg/pull/58362))
+
+#### Data Layer
+
+-   Ignore HTML Elements in ReduxDevTools. ([57497](https://github.com/WordPress/gutenberg/pull/57497))
+
+### Accessibility
+
+#### Data Views
+
+-   Conditionally display filter reset button. ([59432](https://github.com/WordPress/gutenberg/pull/59432))
+-   Use aria-disabled on disabled checkboxes and add tooltips. ([59364](https://github.com/WordPress/gutenberg/pull/59364))
+
+#### Design Tools
+
+-   Shadows: Improve accessibility of shadows dropdown. ([58828](https://github.com/WordPress/gutenberg/pull/58828))
+
+#### Block Editor
+
+-   Fix canvas iframe button accessibility and silent tab stops. ([59317](https://github.com/WordPress/gutenberg/pull/59317))
+-   Fix: Disable 'Open save panel' when there are no changes to save, while navigating with keyboard. ([59543](https://github.com/WordPress/gutenberg/pull/59543))
+
+#### Block Library
+
+-   List block: Allow tab to indent/outdent at selection start. ([59199](https://github.com/WordPress/gutenberg/pull/59199))
+
+#### Custom Fields
+
+-   Add visual indicator if a block is connected to block binding source. ([59185](https://github.com/WordPress/gutenberg/pull/59185))
+
+### Performance
+
+#### Block Editor
+
+-   Block Bindings: Do not use useSource hook conditionally. ([59403](https://github.com/WordPress/gutenberg/pull/59403))
+-   Block Preview: Optimize default additional styles. ([59556](https://github.com/WordPress/gutenberg/pull/59556))
+
+### Experiments
+
+#### Layout
+
+-   Add Grid interactivity experiment to allow canvas interaction with grid layout. ([59052](https://github.com/WordPress/gutenberg/pull/59052))
+
+#### Components
+
+-   Tabs: Rename `initialTabId` prop to `defaultTabId`. ([59035](https://github.com/WordPress/gutenberg/pull/59035))
+
+#### Font Library
+
+-   Fix infinite loop when calling wp_get_upload_dir in a function that's used to filter font_dir. ([58839](https://github.com/WordPress/gutenberg/pull/58839))
+
+### Documentation
+
+-   Add hyperlink to media-upload documentation. ([57170](https://github.com/WordPress/gutenberg/pull/57170))
+-   Add title and link for data-wp-each-child. ([59505](https://github.com/WordPress/gutenberg/pull/59505))
+-   Adds import statement to code usage example. ([59327](https://github.com/WordPress/gutenberg/pull/59327))
+-   Core Block Reference: Add allowedBlocks field. ([59424](https://github.com/WordPress/gutenberg/pull/59424))
+-   Core Block Reference: Add ancestor status and refactor generation logic. ([59390](https://github.com/WordPress/gutenberg/pull/59390))
+-   Create block interactivity: Fix minimum versions. ([59375](https://github.com/WordPress/gutenberg/pull/59375))
+-   Docs: Fix typo in Tutorial. ([59581](https://github.com/WordPress/gutenberg/pull/59581))
+-   Docs: Fix typo in blocks attributes guide. ([59571](https://github.com/WordPress/gutenberg/pull/59571))
+-   Docs: Remove TOC, update formatting, and fix grammar in Interactivity API reference. ([59406](https://github.com/WordPress/gutenberg/pull/59406))
+-   Fix `@wordpress/interactivity` module ID in documentation. ([59419](https://github.com/WordPress/gutenberg/pull/59419))
+-   Fix: Multi line comment format on footnotes block. ([59312](https://github.com/WordPress/gutenberg/pull/59312))
+-   Format PHP inline comments correctly. ([59452](https://github.com/WordPress/gutenberg/pull/59452))
+-   Interactivity API Docs: Add async actions documentation. ([59401](https://github.com/WordPress/gutenberg/pull/59401))
+-   Interactivity API Docs: Add initial version of getContext and getElement. ([59293](https://github.com/WordPress/gutenberg/pull/59293))
+-   Interactivity API Docs: Add server functions documentation. ([59373](https://github.com/WordPress/gutenberg/pull/59373))
+-   Interactivity API Docs: Add withScope description. ([59542](https://github.com/WordPress/gutenberg/pull/59542))
+-   Interactivity API Docs: Fix code not closing. ([59395](https://github.com/WordPress/gutenberg/pull/59395))
+-   Interactivity API Docs: Update image with WordPress Make Core source. ([59281](https://github.com/WordPress/gutenberg/pull/59281))
+-   Interactivity API Docs: Merge Interactivity documentation to keep consistency with other packages. ([59270](https://github.com/WordPress/gutenberg/pull/59270))
+-   Fix comma in `block-registration.md`. ([57248](https://github.com/WordPress/gutenberg/pull/57248))
+-   Update Gutenberg versions in WP for 6.5. ([59446](https://github.com/WordPress/gutenberg/pull/59446))
+-   `theme.json` schema: Fix `styles.background` definition. ([59595](https://github.com/WordPress/gutenberg/pull/59595))
+-   `theme.json` schema: Update `appearanceTools` description. ([59499](https://github.com/WordPress/gutenberg/pull/59499))
+
+### Code Quality
+
+-   Add `@global` to PHP doc comments. ([59522](https://github.com/WordPress/gutenberg/pull/59522) and [59287](https://github.com/WordPress/gutenberg/pull/59287))
+-   ESLint: Enable `react/jsx-boolean-value` for the Gutenberg codebase and fix. ([59557](https://github.com/WordPress/gutenberg/pull/59557))
+-   Editor: Remove MoreDropdownMenuComponent. ([59096](https://github.com/WordPress/gutenberg/pull/59096))
+-   Interface: Remove unused MoreMenuFeatureToggle component. ([59095](https://github.com/WordPress/gutenberg/pull/59095))
+-   Remove old templates list code. ([59558](https://github.com/WordPress/gutenberg/pull/59558))
+-   Replace Navigator isSmall prop. ([59304](https://github.com/WordPress/gutenberg/pull/59304))
+-   Theme JSON Tests: Refactor base styles to a static variable. ([58975](https://github.com/WordPress/gutenberg/pull/58975))
+-   Update: Simplify code and use capture events instead of pointer-events hack. ([59565](https://github.com/WordPress/gutenberg/pull/59565))
+-   l10n: Unify terminology to `screen size`. ([59456](https://github.com/WordPress/gutenberg/pull/59456))
+
+#### Block Library
+
+-   BlockPopover: Remove **unstableCoverTarget and **unstableRefreshSize in favour of BlockPopoverCover. ([59228](https://github.com/WordPress/gutenberg/pull/59228))
+-   Blocks: Refactor deletion warnings dialog. ([58952](https://github.com/WordPress/gutenberg/pull/58952))
+-   Navigation Block: Remove unnecessary `@param` annotation. ([59559](https://github.com/WordPress/gutenberg/pull/59559))
+-   Site Title Block: Rename and move `edit` file. ([56357](https://github.com/WordPress/gutenberg/pull/56357))
+
+#### Font Library
+
+-   Replace deprecated `isSmall` prop with `size="small"` prop. ([59530](https://github.com/WordPress/gutenberg/pull/59530))
+-   Update font collection JSON schema to accommodate the changes made in `wp_register_font_collection`. ([59314](https://github.com/WordPress/gutenberg/pull/59314))
+-   Use NavigatorProvider in Font Library Modal. ([59036](https://github.com/WordPress/gutenberg/pull/59036))
+
+#### Components
+
+-   CustomSelectControlV2: Remove legacy adapter layer. ([59420](https://github.com/WordPress/gutenberg/pull/59420))
+-   Remove unused `useLatestRef()` hook. ([59471](https://github.com/WordPress/gutenberg/pull/59471))
+-   SnackbarList, Snackbar: Add unit test. ([59157](https://github.com/WordPress/gutenberg/pull/59157))
+
+#### Global Styles
+
+-   Create a style preview component. ([59498](https://github.com/WordPress/gutenberg/pull/59498))
+-   Global styles variations: Refactor directory structure. ([59491](https://github.com/WordPress/gutenberg/pull/59491))
+
+#### Post Editor
+
+-   Editor: Use hooks instead of HoCs in `DocumentOutline`. ([59209](https://github.com/WordPress/gutenberg/pull/59209))
+-   EditorInitialization: Fix ESLint warnings for internal hooks. ([59118](https://github.com/WordPress/gutenberg/pull/59118))
+
+#### Block Editor
+
+-   getDirectInsertBlock: Remove 'directInsert' as a callback handler. ([59172](https://github.com/WordPress/gutenberg/pull/59172))
+-   mergeBlocks: Remove unused MERGE_BLOCKS action. ([59125](https://github.com/WordPress/gutenberg/pull/59125))
+
+#### Typography
+
+-   Remove Gutenberg font face tests. ([59402](https://github.com/WordPress/gutenberg/pull/59402))
+
+#### Site Editor
+
+-   Global styles: Rename typography elements file. ([59355](https://github.com/WordPress/gutenberg/pull/59355))
+
+#### Synced Patterns
+
+-   Remove unneeded pattern overrides translation strings. ([59269](https://github.com/WordPress/gutenberg/pull/59269))
+
+#### Navigation Menus
+
+-   Revert removal of Nav fallback auto embed. ([59220](https://github.com/WordPress/gutenberg/pull/59220))
+
+### Tools
+
+#### Testing
+
+-   Add a fixture for the `wp/block` pattern block current version with overrides. ([59492](https://github.com/WordPress/gutenberg/pull/59492))
+-   E2E: Refactor `setup` method to support class inheritance in `RequestUtils`. ([59362](https://github.com/WordPress/gutenberg/pull/59362))
+-   Migrate 'autosave' end-to-end tests to Playwright. ([58171](https://github.com/WordPress/gutenberg/pull/58171))
+-   Playwright: Pass the payload to createPost in data instead of query params to avoid URI too long errors. ([59463](https://github.com/WordPress/gutenberg/pull/59463))
+-   Restore patterns end-to-end tests. ([59024](https://github.com/WordPress/gutenberg/pull/59024))
+-   Rich text: Run end-to-end tests in Firefox and Webkit. ([56030](https://github.com/WordPress/gutenberg/pull/56030))
+-   Writing flow: Add multi select end-to-end test for firefox and webkit. ([53513](https://github.com/WordPress/gutenberg/pull/53513))
+
+#### Build Tooling
+
+-   Project: Update the '.git-blame-ignore-revs' list. ([59615](https://github.com/WordPress/gutenberg/pull/59615))
+
+### Security
+
+#### Custom Fields
+
+-   Block Bindings: Don't show protected fields that are bound to blocks. ([59326](https://github.com/WordPress/gutenberg/pull/59326))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @huzaifaalmesbah: Docs: Fix typo in Tutorial. ([59581](https://github.com/WordPress/gutenberg/pull/59581))
+-   @mattgrshaw: Editor: Fix post type check in isEditingTemplate selector. ([59105](https://github.com/WordPress/gutenberg/pull/59105))
+-   @shail-mehta: Add `@global` to PHP doc comments. ([59287](https://github.com/WordPress/gutenberg/pull/59287))
+-   @TeresaGobble: Docs: Fix typo in blocks attributes guide. ([59571](https://github.com/WordPress/gutenberg/pull/59571))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@afercia @ajlende @alanjacobmathew @andrewserong @annezazu @arthur791004 @bacoords @c4rl0sbr4v0 @carolinan @chad1008 @creativecoder @DAreRodz @dcalhoun @desrosj @draganescu @ellatrix @fluiddot @getdave @glendaviesnz @huzaifaalmesbah @inc2734 @jameskoster @jasmussen @jeryj @jorgefilipecosta @jsnajdr @juanfra @kevin940726 @madhusudhand @Mamaduka @matiasbenedetto @mattgrshaw @michalczaplinski @mikachan @mirka @ndiego @noisysocks @ntsekouras @oandregal @ockham @pbking @peterwilsoncc @ramonjd @retrofox @samueljseay @SantosGuillamot @scruffian @shail-mehta @SiobhyB @sirreal @sunil25393 @t-hamano @talldan @tellthemachines @TeresaGobble @torounit @tyxla @WunderBart @youknowriad
+
+= 17.8.2 =
+
+## Changelog
+
+### Bug Fixes
+
+#### Colors
+
+-   Elements: Merge element style and classname generation to single filter. ([59535](https://github.com/WordPress/gutenberg/pull/59535))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw
+
+= 17.8.1 =
+
+## Changelog
+
+### Bug Fixes
+
+#### Colors
+
+-   Generate element classnames from element-specific data. ([59533](https://github.com/WordPress/gutenberg/pull/59533))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@tellthemachines
+
+= 17.8.0 =
+
+## Changelog
+
+### Features
+
+-   Patterns: add bulk export patterns action. ([58897](https://github.com/WordPress/gutenberg/pull/58897))
+-   Template editor/inspector: show and select related patterns. ([55091](https://github.com/WordPress/gutenberg/pull/55091))
+
+#### Layout
+
+-   Add toggle for grid types and stabilise Grid block variation. ([59051](https://github.com/WordPress/gutenberg/pull/59051) and [59116](https://github.com/WordPress/gutenberg/pull/59116))
+-   Add support for column and row span in grid children. ([58539](https://github.com/WordPress/gutenberg/pull/58539))
+
+### Enhancements
+
+-   Patterns Page: Make category action button compact. ([59203](https://github.com/WordPress/gutenberg/pull/59203))
+-   Block Editor: Use hooks instead of HoC in 'SkipToSelectedBlock'. ([59202](https://github.com/WordPress/gutenberg/pull/59202))
+-   Font Library: Adds the ability to use generic() in font family names. ([59103](https://github.com/WordPress/gutenberg/pull/59103) and [59037](https://github.com/WordPress/gutenberg/pull/59037))
+-   REST API Global Styles Revisions Controller: Return single revision only when it matches the parent id. ([59049](https://github.com/WordPress/gutenberg/pull/59049))
+-   CSS & Styling: Tweak link focus outline styles in HTML anchor and custom CSS. ([59048](https://github.com/WordPress/gutenberg/pull/59048))
+-   Data Views: Make 'All pages' view label consistent with template and patterns. ([59009](https://github.com/WordPress/gutenberg/pull/59009))
+-   Script Modules API: Script Modules add deregister option. ([58830](https://github.com/WordPress/gutenberg/pull/58830))
+-   Block Hooks: Add help text to Plugins panel. ([59371](https://github.com/WordPress/gutenberg/pull/59371))
+
+#### Custom Fields
+
+-   Block Bindings: Lock editing of blocks by default. ([58787](https://github.com/WordPress/gutenberg/pull/58787))
+-   Style engine: Rename at_rule to rules_groups and update test/docs. ([58922](https://github.com/WordPress/gutenberg/pull/58922))
+
+#### Block Library
+
+-   Gallery: Set the 'defaultBlock' setting for inner blocks. ([59168](https://github.com/WordPress/gutenberg/pull/59168))
+-   Remove the navigation edit button because it leads to a useless screen. ([59211](https://github.com/WordPress/gutenberg/pull/59211))
+-   Set the 'defaultBlock' setting for Columns & List blocks. ([59196](https://github.com/WordPress/gutenberg/pull/59196))
+-   Update: Increase footnotes meta priority and separate footnotes meta registration. ([58882](https://github.com/WordPress/gutenberg/pull/58882))
+
+#### Site Editor
+
+-   Editor: Hide template part and post content blocks in some site editor contexts. ([58928](https://github.com/WordPress/gutenberg/pull/58928))
+-   Tweak save hub button. ([58917](https://github.com/WordPress/gutenberg/pull/58917) and [59200](https://github.com/WordPress/gutenberg/pull/59200))
+
+#### Components
+
+-   CustomSelect: Adapt component for legacy props. ([57902](https://github.com/WordPress/gutenberg/pull/57902))
+-   Use `Element.scrollIntoView()` instead of `dom-scroll-into-view`. ([59085](https://github.com/WordPress/gutenberg/pull/59085))
+
+#### Global Styles
+
+-   Global style changes: Refactor output for a more flexible UI and grouping. ([59055](https://github.com/WordPress/gutenberg/pull/59055))
+-   Style theme variations: Add property extraction and merge utils. ([58803](https://github.com/WordPress/gutenberg/pull/58803))
+
+### Bug Fixes
+
+-   Distraction Free Mode: fix ui toggling bugs. ([59061](https://github.com/WordPress/gutenberg/pull/59061))
+-   Layout: Refactor responsive logic for grid column spans. ([59057](https://github.com/WordPress/gutenberg/pull/59057))
+-   Interactivity API: Only add proxies to plain objects inside the store. ([59039](https://github.com/WordPress/gutenberg/pull/59039))
+-   Cover Block: Restore overflow: Clip rule to allow border radius again. ([59388](https://github.com/WordPress/gutenberg/pull/59388))
+
+#### List View
+
+-   Editor: Do not open list view by default on mobile. ([59016](https://github.com/WordPress/gutenberg/pull/59016))
+-   Create Block: Add missing `viewScriptModule` field. ([59140](https://github.com/WordPress/gutenberg/pull/59140))
+-   Ignore the 'twentytwentyfour' test theme dir created by wp-env. ([59072](https://github.com/WordPress/gutenberg/pull/59072))
+-   useEntityBlockEditor: Update 'content' type check. ([59058](https://github.com/WordPress/gutenberg/pull/59058))
+
+#### Block Library
+
+-   Author, Author Bio, Author Name: Add a fallback for Author Archive Template. ([55451](https://github.com/WordPress/gutenberg/pull/55451))
+-   Fix Spacer orientation when inside a block with default flex layout. ([58921](https://github.com/WordPress/gutenberg/pull/58921))
+-   Fix WP 6.4/6.3 compat for navigation link variations. ([59126](https://github.com/WordPress/gutenberg/pull/59126))
+-   Interactivity API: Fix server side rendering for Search block. ([59029](https://github.com/WordPress/gutenberg/pull/59029))
+-   Navigation: Avoid using embedded record from fallback API. ([59076](https://github.com/WordPress/gutenberg/pull/59076))
+-   Pagination Numbers: Add `data-wp-key` to pagination numbers if enhanced pagination is enabled. ([58189](https://github.com/WordPress/gutenberg/pull/58189))
+-   Revert "Navigation: Refactor mobile overlay breakpoints to JS (#57520)". ([59149](https://github.com/WordPress/gutenberg/pull/59149))
+-   Spacer block: Fix `null` label in tooltip when horizontal layout. ([58909](https://github.com/WordPress/gutenberg/pull/58909))
+
+#### Data Views
+
+-   DataViews: Add loading/no results message in grid view. ([59002](https://github.com/WordPress/gutenberg/pull/59002))
+-   DataViews: Correctly display featured image that don't have image sizes. ([59111](https://github.com/WordPress/gutenberg/pull/59111))
+-   DataViews: Fix pages list back path. ([59201](https://github.com/WordPress/gutenberg/pull/59201))
+-   DataViews: Fix patterns, templates and template parts pagination `z-index`. ([58965](https://github.com/WordPress/gutenberg/pull/58965))
+-   DataViews: Fix storybook. ([58842](https://github.com/WordPress/gutenberg/pull/58842))
+-   DataViews: Remove second `reset filter` button in filter dialog. ([58960](https://github.com/WordPress/gutenberg/pull/58960))
+-   Revert footer in pages list with DataViews. ([59151](https://github.com/WordPress/gutenberg/pull/59151))
+
+#### Block Hooks
+
+-   Fix in Navigation block. ([59021](https://github.com/WordPress/gutenberg/pull/59021))
+-   Take controlled blocks into account for toggle state. ([59367](https://github.com/WordPress/gutenberg/pull/59367))
+
+#### Block Editor
+
+-   After Enter transform, skip other onEnter actions like splitting. ([59064](https://github.com/WordPress/gutenberg/pull/59064))
+-   Close link preview if collapsed selection when creating link. ([58896](https://github.com/WordPress/gutenberg/pull/58896))
+-   Editor: Limit spotlight mode to the editor. ([58817](https://github.com/WordPress/gutenberg/pull/58817))
+-   Fix incorrect useAnchor positioning when switching from virtual to rich text elements. ([58900](https://github.com/WordPress/gutenberg/pull/58900))
+-   Inserter: Don't select the closest block with 'disabled' editing mode. ([58971](https://github.com/WordPress/gutenberg/pull/58971))
+-   Inserter: Fix title condition for media tab previews. ([58993](https://github.com/WordPress/gutenberg/pull/58993))
+
+#### Site Editor
+
+-   Fix navigation on mobile web. ([59014](https://github.com/WordPress/gutenberg/pull/59014))
+-   Fix: Don't render the Transform Into panel if there are no patterns. ([59217](https://github.com/WordPress/gutenberg/pull/59217))
+-   Fix: Logical error in filterPatterns on template-panel/hooks.js. ([59218](https://github.com/WordPress/gutenberg/pull/59218))
+-   Make command palette string transatables. ([59133](https://github.com/WordPress/gutenberg/pull/59133))
+-   Remove left margin on Status help text. ([58775](https://github.com/WordPress/gutenberg/pull/58775))
+
+#### Patterns
+
+-   Allow editing of image block alt and title attributes in content only mode. ([58998](https://github.com/WordPress/gutenberg/pull/58998))
+-   Avoid showing block removal warning when deleting a pattern instance that has overrides. ([59044](https://github.com/WordPress/gutenberg/pull/59044))
+-   Block editor: Pass patterns selector as setting. ([58661](https://github.com/WordPress/gutenberg/pull/58661))
+-   Fix pattern categories on import. ([58926](https://github.com/WordPress/gutenberg/pull/58926))
+-   Site editor: Fix start patterns store selector. ([58813](https://github.com/WordPress/gutenberg/pull/58813))
+
+#### Global Styles
+
+-   Fix console error in block preview. ([59112](https://github.com/WordPress/gutenberg/pull/59112))
+-   Revert "Use all the settings origins for a block that consumes paths with merge #55219" ([58951](https://github.com/WordPress/gutenberg/pull/58951) and [59101](https://github.com/WordPress/gutenberg/pull/59101))
+-   Shadows: Don't assume that core provides default shadows. ([58973](https://github.com/WordPress/gutenberg/pull/58973))
+
+#### Font Library
+
+-   Fixes installed font families not rendering in the editor or frontend. ([59019](https://github.com/WordPress/gutenberg/pull/59019))
+-   Font Library: Add missing translation functions. ([58104](https://github.com/WordPress/gutenberg/pull/58104))
+-   Show error message when no fonts found to install. ([58914](https://github.com/WordPress/gutenberg/pull/58914))
+-   Font Library: Create post types on init hook. ([59333](https://github.com/WordPress/gutenberg/pull/59333))
+
+#### Synced Patterns
+
+-   Fix missing source for binding attributes. ([59194](https://github.com/WordPress/gutenberg/pull/59194))
+-   Fix resetting individual blocks to empty optional values for Pattern Overrides. ([59170](https://github.com/WordPress/gutenberg/pull/59170))
+-   Fix upload button on overridden empty image block in patterns. ([59169](https://github.com/WordPress/gutenberg/pull/59169))
+
+#### Design Tools
+
+-   Background image support: Fix issue with background position keyboard entry. ([59050](https://github.com/WordPress/gutenberg/pull/59050))
+-   Cover block: Clear the min height field when aspect ratio is set. ([59191](https://github.com/WordPress/gutenberg/pull/59191))
+-   Elements: Fix block instance element styles for links applying to buttons. ([59114](https://github.com/WordPress/gutenberg/pull/59114))
+
+#### Components
+
+-   Modal: Add `box-sizing` reset style. ([58905](https://github.com/WordPress/gutenberg/pull/58905))
+-   ToolbarButton: Fix text centering for short labels. ([59117](https://github.com/WordPress/gutenberg/pull/59117))
+-   Upgrade Floating UI packages, fix nested iframe positioning bug. ([58932](https://github.com/WordPress/gutenberg/pull/58932))
+
+#### Post Editor
+
+-   Editor: Fix 'useHideBlocksFromInserter' hook filename. ([59150](https://github.com/WordPress/gutenberg/pull/59150))
+-   Fix layout for non viewable post types. ([58962](https://github.com/WordPress/gutenberg/pull/58962))
+
+#### Rich Text
+
+-   Fix link paste for internal paste. ([59063](https://github.com/WordPress/gutenberg/pull/59063))
+-   Revert "Rich text: Pad multiple spaces through en/em replacement". ([58792](https://github.com/WordPress/gutenberg/pull/58792))
+
+#### Custom Fields
+
+-   Block Bindings: Add block context needed for bindings in PHP. ([58554](https://github.com/WordPress/gutenberg/pull/58554))
+-   Block Bindings: Fix disable bindings editing when source is undefined. ([58961](https://github.com/WordPress/gutenberg/pull/58961))
+
+### Accessibility
+
+-   Enter editing mode via Enter or Spacebar. ([58795](https://github.com/WordPress/gutenberg/pull/58795))
+-   Block Bindings > Image Block:Mark connected controls as 'readonly'. ([59059](https://github.com/WordPress/gutenberg/pull/59059))
+-   Details Block: Try double enter to escape inner blocks. ([58903](https://github.com/WordPress/gutenberg/pull/58903))
+-   Font Library: Replace infinite scroll by pagination. ([58794](https://github.com/WordPress/gutenberg/pull/58794))
+-   Global Styles: Remove menubar role and improve complementary area header semantics. ([58740](https://github.com/WordPress/gutenberg/pull/58740))
+
+#### Block Editor
+
+-   Block Mover: Unify visual separator when show button label is on. ([59158](https://github.com/WordPress/gutenberg/pull/59158))
+-   Make the custom CSS validation error message accessible. ([56690](https://github.com/WordPress/gutenberg/pull/56690))
+-   Restore default border and focus style on image URL input field. ([58505](https://github.com/WordPress/gutenberg/pull/58505))
+
+### Performance
+
+-   Pattern Block: Batch replacing actions. ([59075](https://github.com/WordPress/gutenberg/pull/59075))
+-   Block Editor: Move StopEditingAsBlocksOnOutsideSelect to Root. ([58412](https://github.com/WordPress/gutenberg/pull/58412))
+
+### Documentation
+
+-   Add contributing guidlines around Component versioning. ([58789](https://github.com/WordPress/gutenberg/pull/58789))
+-   Clarify the performance reference commit and how to pick it. ([58927](https://github.com/WordPress/gutenberg/pull/58927))
+-   DataViews: Update documentation. ([58847](https://github.com/WordPress/gutenberg/pull/58847))
+-   Docs: Clarify the status of the wp-block-styles theme support, and its intent. ([58915](https://github.com/WordPress/gutenberg/pull/58915))
+-   Fix move interactivity schema to supports property instead of selectors property. ([59166](https://github.com/WordPress/gutenberg/pull/59166))
+-   Storybook: Show badges in sidebar. ([58518](https://github.com/WordPress/gutenberg/pull/58518))
+-   Theme docs: Update appearance-tools documentation to reflect opt-in for backgroundSize and aspectRatio. ([59165](https://github.com/WordPress/gutenberg/pull/59165))
+-   Update richtext.md. ([59089](https://github.com/WordPress/gutenberg/pull/59089))
+
+#### Interactivity API
+
+-   Interactivity API: Fix WP version, update new store documentation. ([59107](https://github.com/WordPress/gutenberg/pull/59107))
+-   Interactivity API: Update documentation guide with new `wp-interactivity` directive implementation. ([59018](https://github.com/WordPress/gutenberg/pull/59018))
+-   Add interactivity property to block supports reference documentation. ([59152](https://github.com/WordPress/gutenberg/pull/59152))
+
+#### Schemas
+
+-   Block JSON schema: Add `viewScriptModule` field. ([59060](https://github.com/WordPress/gutenberg/pull/59060))
+-   Block JSON schema: Update `shadow` definition. ([58910](https://github.com/WordPress/gutenberg/pull/58910))
+-   JSON schema: Update schema for background support. ([59127](https://github.com/WordPress/gutenberg/pull/59127))
+
+### Code Quality
+
+-   Create Block: Remove deprecated viewModule field. ([59198](https://github.com/WordPress/gutenberg/pull/59198))
+-   Editor: Remove the 'all' rendering mode. ([58935](https://github.com/WordPress/gutenberg/pull/58935))
+-   Editor: Unify the editor commands between post and site editors. ([59005](https://github.com/WordPress/gutenberg/pull/59005))
+-   Relocate 'ErrorBoundary' component unit test folders. ([59031](https://github.com/WordPress/gutenberg/pull/59031))
+-   Remove obsolete wp-env configuration from package.json (#58877). ([58899](https://github.com/WordPress/gutenberg/pull/58899))
+-   Design Tools > Elements: Make editor selector match theme.json and frontend. ([59167](https://github.com/WordPress/gutenberg/pull/59167))
+-   Global Styles: Update sprintf calls using `_n`. ([59160](https://github.com/WordPress/gutenberg/pull/59160))
+-   Block API: Revert "Block Hooks: Set ignoredHookedBlocks metada attr upon insertion". ([58969](https://github.com/WordPress/gutenberg/pull/58969))
+-   Editor > Rich Text: Remove inline toolbar preference. ([58945](https://github.com/WordPress/gutenberg/pull/58945))
+-   Style Variations: Remove preferred style variations legacy support. ([58930](https://github.com/WordPress/gutenberg/pull/58930))
+-   REST API > Template Revisions: Move from experimental to compat/6.4. ([58920](https://github.com/WordPress/gutenberg/pull/58920))
+
+#### Block Editor
+
+-   Block-editor: Auto-register block commands. ([59079](https://github.com/WordPress/gutenberg/pull/59079))
+-   BlockSettingsMenu: Combine 'block-editor' store selectors. ([59153](https://github.com/WordPress/gutenberg/pull/59153))
+-   Clean up link control CSS. ([58934](https://github.com/WordPress/gutenberg/pull/58934))
+-   HeadingLevelDropdown: Remove unnecessary isPressed prop. ([56636](https://github.com/WordPress/gutenberg/pull/56636))
+-   Move 'ParentSelectorMenuItem' into a separate file. ([59146](https://github.com/WordPress/gutenberg/pull/59146))
+-   Remove 'BlockSettingsMenu' styles. ([59147](https://github.com/WordPress/gutenberg/pull/59147))
+
+#### Components
+
+-   Add Higher Order Function to ignore Input Method Editor (IME) keydowns. ([59081](https://github.com/WordPress/gutenberg/pull/59081))
+-   Add lint rules for theme color CSS var usage. ([59022](https://github.com/WordPress/gutenberg/pull/59022))
+-   ColorPicker: Style without accessing InputControl internals. ([59069](https://github.com/WordPress/gutenberg/pull/59069))
+-   CustomSelectControl (v1 & v2): Fix errors in unit test setup. ([59038](https://github.com/WordPress/gutenberg/pull/59038))
+-   CustomSelectControl: Hard deprecate constrained width. ([58974](https://github.com/WordPress/gutenberg/pull/58974))
+
+#### Post Editor
+
+-   DocumentBar: Fix browser warning error. ([59193](https://github.com/WordPress/gutenberg/pull/59193))
+-   DocumentBar: Simplify component, use framer for animation. ([58656](https://github.com/WordPress/gutenberg/pull/58656))
+-   Editor: Remove unused selector value from 'PostTitle'. ([59204](https://github.com/WordPress/gutenberg/pull/59204))
+-   Editor: Unify Mode Switcher component between post and site editor. ([59100](https://github.com/WordPress/gutenberg/pull/59100))
+
+#### Interactivity API
+
+-   Refactor to use string instead of an object on `wp-data-interactive`. ([59034](https://github.com/WordPress/gutenberg/pull/59034))
+-   Remove `data-wp-interactive` object for core/router. ([59030](https://github.com/WordPress/gutenberg/pull/59030))
+-   Use `data_wp_context` helper in core blocks and remove `data-wp-interactive` object. ([58943](https://github.com/WordPress/gutenberg/pull/58943))
+
+#### Site Editor
+
+-   Add stylelint rule to prevent theme CSS vars outside of wp-components. ([59020](https://github.com/WordPress/gutenberg/pull/59020))
+-   Don't memoize the canvas container title. ([59000](https://github.com/WordPress/gutenberg/pull/59000))
+-   Remove old patterns list code and styles. ([58966](https://github.com/WordPress/gutenberg/pull/58966))
+
+### Tools
+
+-   Remove reference to CODE_OF_CONDUCT.md in documentation. ([59206](https://github.com/WordPress/gutenberg/pull/59206))
+-   Remove repository specific Code of Conduct. ([59027](https://github.com/WordPress/gutenberg/pull/59027))
+-   env: Fix mariadb version to LTS. ([59237](https://github.com/WordPress/gutenberg/pull/59237))
+
+#### Testing
+
+-   Components: Add sleep() before all Tab() to fix flaky tests. ([59012](https://github.com/WordPress/gutenberg/pull/59012))
+-   Components: Try fixing some flaky `Composite` and `Tabs` tests. ([58968](https://github.com/WordPress/gutenberg/pull/58968))
+-   Migrate `change-detection` to Playwright. ([58767](https://github.com/WordPress/gutenberg/pull/58767))
+-   Tabs: Fix flaky unit tests. ([58629](https://github.com/WordPress/gutenberg/pull/58629))
+-   Update test environment default theme versions to latest. ([58955](https://github.com/WordPress/gutenberg/pull/58955))
+-   Performance tests: Make site editor performance test backwards compatible. ([59266](https://github.com/WordPress/gutenberg/pull/59266))
+-   Performance tests: Update selectors in site editor pattern loading tests. ([59259](https://github.com/WordPress/gutenberg/pull/59259))
+-   Fix failing Dropdown Menu e2e tests. ([59356](https://github.com/WordPress/gutenberg/pull/59356))
+
+#### Build Tooling
+
+-   Add test:e2e:playwright:debug command to debug Playwright tests. ([58808](https://github.com/WordPress/gutenberg/pull/58808))
+-   Updating Storybook to v7.6.15 (latest). ([59074](https://github.com/WordPress/gutenberg/pull/59074))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @ajlende @alexstine @andrewhayward @andrewserong @brookewp @c4rl0sbr4v0 @chad1008 @ciampo @creativecoder @DAreRodz @derekblank @desrosj @draganescu @ellatrix @fabiankaegy @gaambo @glendaviesnz @jameskoster @janboddez @jasmussen @jeryj @jorgefilipecosta @jsnajdr @juanfra @kevin940726 @Mamaduka @MarieComet @matiasbenedetto @mirka @noisysocks @ntsekouras @oandregal @ockham @pbking @ramonjd @SantosGuillamot @scruffian @shreyash3087 @t-hamano @talldan @tellthemachines @tyxla @youknowriad
+
+= 17.7.0 =
+
+## Changelog
+
+### Enhancements
+
+-   Improve translators comments for wp.date.setSettings in compat file. ([58488](https://github.com/WordPress/gutenberg/pull/58488))
+-   Interactive Template: Use viewScriptModule. ([58211](https://github.com/WordPress/gutenberg/pull/58211))
+
+#### Components
+
+-   Adding `constrainTabbing` prop to `useDialog` hook. ([57962](https://github.com/WordPress/gutenberg/pull/57962))
+-   Allow limiting the number of maximum visible Snackbars. ([58559](https://github.com/WordPress/gutenberg/pull/58559))
+-   ConfirmDialog: Add `__next40pxDefaultSize` to buttons. ([58421](https://github.com/WordPress/gutenberg/pull/58421))
+-   Expand theming support in COLORS. ([58097](https://github.com/WordPress/gutenberg/pull/58097))
+-   FocalPointPicker: Apply modern styling. ([58459](https://github.com/WordPress/gutenberg/pull/58459))
+-   Implement Tabs in widget editor settings. ([57886](https://github.com/WordPress/gutenberg/pull/57886))
+-   Implement `Tabs` in site-editor settings. ([56959](https://github.com/WordPress/gutenberg/pull/56959))
+-   Implementing `useCompositeState` with Ariakit. ([57304](https://github.com/WordPress/gutenberg/pull/57304))
+-   InputBase: Add `isBorderless` prop. ([58750](https://github.com/WordPress/gutenberg/pull/58750))
+-   Replace `TabPanel` with `Tabs` in the editor Document Overview sidebar. ([57082](https://github.com/WordPress/gutenberg/pull/57082))
+-   SearchControl: Refactor to use InputControl internally. ([56524](https://github.com/WordPress/gutenberg/pull/56524))
+-   Show borders for disabled secondary buttons. ([58606](https://github.com/WordPress/gutenberg/pull/58606))
+
+#### Data Views
+
+-   Add outline to template preview in table layout. ([58738](https://github.com/WordPress/gutenberg/pull/58738))
+-   Add: Delete bulk action to patterns. ([58747](https://github.com/WordPress/gutenberg/pull/58747))
+-   Add: Selection and bulk actions to grid view. ([58144](https://github.com/WordPress/gutenberg/pull/58144))
+-   DataViews: Add primary filter API. ([58427](https://github.com/WordPress/gutenberg/pull/58427))
+-   DataViews: In patterns page, show sync status filter by default. ([58367](https://github.com/WordPress/gutenberg/pull/58367))
+-   DataViews: Redesign of filters. ([58569](https://github.com/WordPress/gutenberg/pull/58569))
+-   Remove min-width style on table cells. ([58204](https://github.com/WordPress/gutenberg/pull/58204))
+-   Update 'Rows per page' view option label to account for Grid layout. ([58457](https://github.com/WordPress/gutenberg/pull/58457))
+-   Update dataviews search input placeholder. ([58742](https://github.com/WordPress/gutenberg/pull/58742))
+-   Update spacing around title in grid layout. ([58739](https://github.com/WordPress/gutenberg/pull/58739))
+
+#### Interactivity API
+
+-   Add `block supports` for `clientNavigation` and `interactive` properties on `block.json` schema. ([58132](https://github.com/WordPress/gutenberg/pull/58132))
+-   Image block: Refactor and remove `data-wp-body`. ([58835](https://github.com/WordPress/gutenberg/pull/58835))
+-   Interactivity Router: Fix initial page cache. ([58496](https://github.com/WordPress/gutenberg/pull/58496))
+-   Interactivity Router: Move ARIA live region and loading bar to the Interactivity Router. ([58377](https://github.com/WordPress/gutenberg/pull/58377))
+-   Limit the exported APIs. ([58864](https://github.com/WordPress/gutenberg/pull/58864))
+-   Mark all core block stores as private. ([58722](https://github.com/WordPress/gutenberg/pull/58722))
+-   Server Directive Processor for `data-wp-each`. ([58498](https://github.com/WordPress/gutenberg/pull/58498))
+-   Support setting a namespace using a string in `data-wp-interactive`. ([58743](https://github.com/WordPress/gutenberg/pull/58743))
+-   Allow global configs for namespaces. ([58749](https://github.com/WordPress/gutenberg/pull/58749))
+
+#### Block Library
+
+-   Follow up on the Post navigation link taxonomy filters. ([57949](https://github.com/WordPress/gutenberg/pull/57949))
+-   Home Link: Render Home text if there is no attribute label present. ([58387](https://github.com/WordPress/gutenberg/pull/58387))
+-   Organize gallery controls. ([58407](https://github.com/WordPress/gutenberg/pull/58407))
+-   Pattern: Use the '\_\_experimentalLabel' method to get a title. ([58646](https://github.com/WordPress/gutenberg/pull/58646))
+-   Social Icons: Update Patreon icon. ([56951](https://github.com/WordPress/gutenberg/pull/56951))
+-   Try: Disable text selection for post content placeholder block. ([58169](https://github.com/WordPress/gutenberg/pull/58169))
+-   Update pattern block copy in light of pattern overrides. ([58231](https://github.com/WordPress/gutenberg/pull/58231))
+-   Add shadow support for column, columns and image. ([57982](https://github.com/WordPress/gutenberg/pull/57982))
+
+#### Global Styles
+
+-   Add style engine support for nested at-rules. ([58867](https://github.com/WordPress/gutenberg/pull/58867))
+-   Move Shadow controls to Border panel. ([58466](https://github.com/WordPress/gutenberg/pull/58466))
+-   Shadow: Update shadow support to allow explicit skipping of serialization. ([58306](https://github.com/WordPress/gutenberg/pull/58306))
+-   Try: Remove shadow preset overflow. ([58663](https://github.com/WordPress/gutenberg/pull/58663))
+-   Update return values from getGlobalStylesChanges(). ([58707](https://github.com/WordPress/gutenberg/pull/58707))
+-   Add support for transform and letter spacing controls in Global Styles > Typography > Elements. ([58142](https://github.com/WordPress/gutenberg/pull/58142))
+
+#### Block Editor
+
+-   Drag and drop: Allow dragging from inserter or desktop to template parts. ([58589](https://github.com/WordPress/gutenberg/pull/58589))
+-   Drag and drop: Allow dropping within template parts. ([58423](https://github.com/WordPress/gutenberg/pull/58423))
+-   Implement "Add block" UI for Nav block Link UI. ([57756](https://github.com/WordPress/gutenberg/pull/57756))
+-   Implementing new UX for invoking rich text Link UI. ([57986](https://github.com/WordPress/gutenberg/pull/57986))
+-   Remove open in new tab from link preview. ([58744](https://github.com/WordPress/gutenberg/pull/58744))
+-   Use consistent labels, remove additional settings, and copySmall icon LinkControl. ([58183](https://github.com/WordPress/gutenberg/pull/58183))
+
+#### Site Editor
+
+-   Apply 40px across summary panel. ([58730](https://github.com/WordPress/gutenberg/pull/58730))
+-   Apply custom scroll style to fixed header block toolbar. ([57444](https://github.com/WordPress/gutenberg/pull/57444))
+-   Improve SiteIcon display and transition. ([58472](https://github.com/WordPress/gutenberg/pull/58472))
+-   Only show 'Back' button when user came from an editor canvas. ([58710](https://github.com/WordPress/gutenberg/pull/58710))
+-   Update "focus mode" to consistently use the Document Bar's Back button. ([58528](https://github.com/WordPress/gutenberg/pull/58528))
+
+#### Patterns
+
+-   Add a confirmation dialog when a user tries to delete a synced pattern with overrides. ([58796](https://github.com/WordPress/gutenberg/pull/58796))
+-   Add the block name to the pattern content data. ([58715](https://github.com/WordPress/gutenberg/pull/58715))
+-   Flash editable block outlines instead of always showing them. ([58159](https://github.com/WordPress/gutenberg/pull/58159))
+
+#### Design Tools
+
+-   Background image support: Add background position controls. ([58592](https://github.com/WordPress/gutenberg/pull/58592))
+-   Tweak metrics and labels for background size controls. ([58854](https://github.com/WordPress/gutenberg/pull/58854))
+
+#### Post Editor
+
+-   Editor: Limit visible Snackbars from the consumers. ([58598](https://github.com/WordPress/gutenberg/pull/58598))
+-   Save entities panel: Update styles. ([58706](https://github.com/WordPress/gutenberg/pull/58706))
+
+#### Font Library
+
+-   Add sanitize from schema util. ([58571](https://github.com/WordPress/gutenberg/pull/58571))
+-   Font Collections: Update registration function signature and add caching. ([58363](https://github.com/WordPress/gutenberg/pull/58363))
+-   Font Library: Show 'Add fonts' button when there are no fonts installed. ([58580](https://github.com/WordPress/gutenberg/pull/58580))
+
+#### Inspector Controls
+
+-   Tweak FocalPointPicker inspector controls. ([58448](https://github.com/WordPress/gutenberg/pull/58448))
+-   Tweak Media & Text inspector controls. ([58447](https://github.com/WordPress/gutenberg/pull/58447))
+
+#### Custom Fields
+
+-   Block Bindings: Ensure to pass bound attributes. ([58844](https://github.com/WordPress/gutenberg/pull/58844))
+
+#### Commands
+
+-   Try debouncing search for post-type navigation. ([58810](https://github.com/WordPress/gutenberg/pull/58810))
+
+#### Document Settings
+
+-   Tweak revisions panel for improved scanning. ([58751](https://github.com/WordPress/gutenberg/pull/58751))
+
+#### Synced Patterns
+
+-   Support button's link settings for Pattern Overrides. ([58587](https://github.com/WordPress/gutenberg/pull/58587))
+
+#### Block API
+
+-   Block Hooks: Set ignoredHookedBlocks metada attr upon insertion. ([58553](https://github.com/WordPress/gutenberg/pull/58553))
+
+#### List View
+
+-   Add keyboard clipboard events for cut, copy, paste. ([57838](https://github.com/WordPress/gutenberg/pull/57838))
+
+### New APIs
+
+#### Block API
+
+-   Blocks: Add handling for block.json viewScriptModule. ([58731](https://github.com/WordPress/gutenberg/pull/58731))
+
+### Bug Fixes
+
+-   Core data: useEntityBlockEditor: Fix parsed blocks cache. ([58841](https://github.com/WordPress/gutenberg/pull/58841))
+-   Footnotes: Fix anchor order replacing. ([58791](https://github.com/WordPress/gutenberg/pull/58791))
+
+#### Block Editor
+
+-   Block Switcher: Use consistent labels. ([58240](https://github.com/WordPress/gutenberg/pull/58240))
+-   Don't move focus within the toolbar if it is already focused. ([58570](https://github.com/WordPress/gutenberg/pull/58570))
+-   Don't show Link preview when no selection. ([58771](https://github.com/WordPress/gutenberg/pull/58771))
+-   Fix Link UI popover anchor in rich text. ([58282](https://github.com/WordPress/gutenberg/pull/58282))
+-   Fix empty link preview after creating link from empty selection. ([58863](https://github.com/WordPress/gutenberg/pull/58863))
+-   Hide the 'Content' panel for locked blocks when there's no content. ([58259](https://github.com/WordPress/gutenberg/pull/58259))
+-   ImageURLInputUI: Fix focus loss when settings are changed. ([58647](https://github.com/WordPress/gutenberg/pull/58647))
+-   Link UI: Polish lightbox pieces. ([58666](https://github.com/WordPress/gutenberg/pull/58666))
+-   Media Replace Flow: Vertically align the URL. ([58621](https://github.com/WordPress/gutenberg/pull/58621))
+-   MediaReplaceFlow: Restore popover width. ([58597](https://github.com/WordPress/gutenberg/pull/58597))
+-   Rich Text: Only apply focus to elements, not selection. ([58745](https://github.com/WordPress/gutenberg/pull/58745))
+-   Rich text: Preserve white space should strip \r. ([58805](https://github.com/WordPress/gutenberg/pull/58805))
+-   Settings may be undefined. ([58658](https://github.com/WordPress/gutenberg/pull/58658))
+-   useOnBlockDrop: Fix the Gallery block check. ([58711](https://github.com/WordPress/gutenberg/pull/58711))
+
+#### Components
+
+-   Add a timezone offset value for display purposes. ([56682](https://github.com/WordPress/gutenberg/pull/56682))
+-   Fix Placeholder component padding when body text font size is changed. ([58323](https://github.com/WordPress/gutenberg/pull/58323))
+-   Fix URLPopover preview overflow. ([58741](https://github.com/WordPress/gutenberg/pull/58741))
+-   Fix the Snackbar auto-dismissal timers. ([58604](https://github.com/WordPress/gutenberg/pull/58604))
+-   Popover: Add `box-sizing` reset style. ([58871](https://github.com/WordPress/gutenberg/pull/58871))
+-   Set post editor sidebar tabs to manual activation. ([58041](https://github.com/WordPress/gutenberg/pull/58041))
+-   Tabs: Delay `activeId` updates until focus can be properly detected. ([58625](https://github.com/WordPress/gutenberg/pull/58625))
+-   Tabs: Fix infinite loop in useEffect. ([58861](https://github.com/WordPress/gutenberg/pull/58861))
+-   Tabs: Improve Controlled Mode Focus Handling. ([57696](https://github.com/WordPress/gutenberg/pull/57696))
+-   Try: Fix lightbox URL popover position. ([58600](https://github.com/WordPress/gutenberg/pull/58600))
+
+#### Block Library
+
+-   Fix [#54352](https://github.com/WordPress/gutenberg/issues/54352) prevents php 8.1 fatal when template parts are not found in non-debug environments. ([54354](https://github.com/WordPress/gutenberg/pull/54354))
+-   Fix Query pagination not working in template parts and patterns. ([58602](https://github.com/WordPress/gutenberg/pull/58602))
+-   Fix URL escaping for array parameters in Navigation links. ([58068](https://github.com/WordPress/gutenberg/pull/58068))
+-   Fix missing data in email submissions. ([55691](https://github.com/WordPress/gutenberg/pull/55691))
+-   Fix: Removing footnotes from the allowed blocks does not remove footnotes. ([58855](https://github.com/WordPress/gutenberg/pull/58855))
+-   Navigation Link: Use get_block_type_variations to register variations. ([58389](https://github.com/WordPress/gutenberg/pull/58389))
+-   Prevent usage of `gutenberg_url` in block-library. ([58242](https://github.com/WordPress/gutenberg/pull/58242))
+-   Template Part: Reflect name updates without saving changes. ([58644](https://github.com/WordPress/gutenberg/pull/58644))
+-   Try: Make gallery randomization work when nested. ([58733](https://github.com/WordPress/gutenberg/pull/58733))
+
+#### Data Views
+
+-   DataViews: Fix applied default layout props. ([58400](https://github.com/WordPress/gutenberg/pull/58400))
+-   DataViews: Fix nested buttons and placeholder text in list layout. ([58304](https://github.com/WordPress/gutenberg/pull/58304))
+-   DataViews: Fix some small issues with featured image. ([58371](https://github.com/WordPress/gutenberg/pull/58371))
+-   DataViews: Make it possible to toggle Author field in templates and template parts. ([58609](https://github.com/WordPress/gutenberg/pull/58609))
+-   DataViews: Remove test artifact (status filter was set as primary). ([58682](https://github.com/WordPress/gutenberg/pull/58682))
+-   DataViews: Use chips for filter summary. ([58816](https://github.com/WordPress/gutenberg/pull/58816))
+-   Fix double scrollbar in grid layout. ([58536](https://github.com/WordPress/gutenberg/pull/58536))
+-   Fix: Dataviews selection on patterns grid view. ([58726](https://github.com/WordPress/gutenberg/pull/58726))
+
+#### Site Editor
+
+-   Add context for the All translatable string and enforce l10n best practices. ([58196](https://github.com/WordPress/gutenberg/pull/58196))
+-   Break long URL in page sidebar. ([58763](https://github.com/WordPress/gutenberg/pull/58763))
+-   Editor: Fix block context defined for template parts. ([58807](https://github.com/WordPress/gutenberg/pull/58807))
+-   Fix line-height in block card. ([58246](https://github.com/WordPress/gutenberg/pull/58246))
+-   Hide export button if non-block-based theme. ([58346](https://github.com/WordPress/gutenberg/pull/58346))
+-   Mobile site editor header toolbar button bugfix. ([58852](https://github.com/WordPress/gutenberg/pull/58852))
+
+#### Post Editor
+
+-   Editor: Don't hide authors' Combobox if the current author is missing. ([58719](https://github.com/WordPress/gutenberg/pull/58719))
+-   Fix permalink input field text overflow ellipsis for Firefox. ([57310](https://github.com/WordPress/gutenberg/pull/57310))
+-   Fix the position and size of the Options menu,. ([57515](https://github.com/WordPress/gutenberg/pull/57515))
+-   Fix: Use old template panel if user doesn’t have access to view templates. ([58485](https://github.com/WordPress/gutenberg/pull/58485))
+-   Template editing: Update fullscreen WP back functionality. ([58534](https://github.com/WordPress/gutenberg/pull/58534))
+
+#### Interactivity API
+
+-   Add `supports.interactivity` to the Query block. ([58316](https://github.com/WordPress/gutenberg/pull/58316))
+-   Fix state intialization for asynchronous private stores. ([58754](https://github.com/WordPress/gutenberg/pull/58754))
+-   Remove non-default suffix data wp context processing. ([58664](https://github.com/WordPress/gutenberg/pull/58664))
+-   Use compat versions of HTML APIs. ([58846](https://github.com/WordPress/gutenberg/pull/58846))
+
+#### Global Styles
+
+-   Block Styles: Fix block style variation selector generation. ([58051](https://github.com/WordPress/gutenberg/pull/58051))
+-   Fix Global styles text settings bleeding into placeholder component. ([58303](https://github.com/WordPress/gutenberg/pull/58303))
+-   Global styles revisions: Fix is-selected rules from affecting other areas of the editor. ([58228](https://github.com/WordPress/gutenberg/pull/58228))
+-   Site Editor: Prevent classic theme from accessing global style menu. ([58345](https://github.com/WordPress/gutenberg/pull/58345))
+
+#### List View
+
+-   Fix error when switching between template preview modes. ([58533](https://github.com/WordPress/gutenberg/pull/58533))
+-   Navigation Submenu Block: Make block name affect list view. ([58296](https://github.com/WordPress/gutenberg/pull/58296))
+-   Template Part: Fix site editor error when loading with list view set to always display. ([58868](https://github.com/WordPress/gutenberg/pull/58868))
+
+#### Font Library
+
+-   Avoid mutating fontface data. ([58473](https://github.com/WordPress/gutenberg/pull/58473))
+-   Avoid running init functions when font library is available in core. ([58793](https://github.com/WordPress/gutenberg/pull/58793))
+-   Fix size of demo text. ([58849](https://github.com/WordPress/gutenberg/pull/58849))
+
+#### Typography
+
+-   Fix font library modal dialog translatable strings. ([58256](https://github.com/WordPress/gutenberg/pull/58256))
+-   Font Library: Change referenced tab name on Google Fonts confirmation dialog. ([58584](https://github.com/WordPress/gutenberg/pull/58584))
+-   Font size: Allow for custom font size handling. ([58422](https://github.com/WordPress/gutenberg/pull/58422))
+
+#### Script Modules API
+
+-   Add import map polyfill. ([58263](https://github.com/WordPress/gutenberg/pull/58263))
+-   Import Maps: Only emit CDATA wrappers for inline scripts for JavaScript. ([58818](https://github.com/WordPress/gutenberg/pull/58818))
+
+#### Extensibility
+
+-   Fix broken list markup in navigation block when 3rd party blocks are used as decendants of navigation block. ([55551](https://github.com/WordPress/gutenberg/pull/55551))
+-   Navigation block: Check Block Hooks API callback hasn't already been added. ([58772](https://github.com/WordPress/gutenberg/pull/58772))
+
+#### Synced Patterns
+
+-   Disable overriding links of images inside pattern instances. ([58660](https://github.com/WordPress/gutenberg/pull/58660))
+-   Fix nested pattern overrides and disable editing inner pattern. ([58541](https://github.com/WordPress/gutenberg/pull/58541))
+
+#### Inspector Controls
+
+-   Add missing PanelBody title for the columns block inspector. ([58452](https://github.com/WordPress/gutenberg/pull/58452))
+-   Add spacing between input controls with custom values. ([58410](https://github.com/WordPress/gutenberg/pull/58410))
+
+#### Custom Fields
+
+-   Block Bindings: Update bindings registry with latest changes. ([58843](https://github.com/WordPress/gutenberg/pull/58843))
+
+#### History
+
+-   Columns: Batch vertical alignment updates. ([58801](https://github.com/WordPress/gutenberg/pull/58801))
+
+#### Document Settings
+
+-   Editor: Ensure the current author is included in the dropdown. ([58716](https://github.com/WordPress/gutenberg/pull/58716))
+
+#### Rich Text
+
+-   Add aria-readonly attribute to Rich Text component. ([58687](https://github.com/WordPress/gutenberg/pull/58687))
+
+#### Navigation Menus
+
+-   Navigation: Update the fallback block list to avoid a PHP Warning. ([58588](https://github.com/WordPress/gutenberg/pull/58588))
+
+#### Patterns
+
+-   Update the bindings attribs of blocks added during experimental phase. ([58483](https://github.com/WordPress/gutenberg/pull/58483))
+
+#### Distraction Free
+
+-   Add default restoration of UI when exiting distraction free mode. ([58455](https://github.com/WordPress/gutenberg/pull/58455))
+
+### Accessibility
+
+-   Escape as Select/Edit mode Toggle. ([58637](https://github.com/WordPress/gutenberg/pull/58637))
+-   Global styles revisions: Update text color contrast. ([58340](https://github.com/WordPress/gutenberg/pull/58340))
+
+#### Components
+
+-   CustomSelect: Disable `virtualFocus` to fix issue for screenreaders. ([58585](https://github.com/WordPress/gutenberg/pull/58585))
+-   Font Library modal: Try to improve checkbox labelling. ([58339](https://github.com/WordPress/gutenberg/pull/58339))
+-   PaletteEdit: Fix palette item accessibility. ([58214](https://github.com/WordPress/gutenberg/pull/58214))
+
+#### Font Library
+
+-   Buttons position and accessibility. ([58212](https://github.com/WordPress/gutenberg/pull/58212))
+-   Fix focus loss when update/install button is pressed. ([58364](https://github.com/WordPress/gutenberg/pull/58364))
+-   Removed and elements from Font Library Modal. ([58221](https://github.com/WordPress/gutenberg/pull/58221))
+
+#### Block Library
+
+-   Fix image link preset suggestions arrow key navigation. ([58615](https://github.com/WordPress/gutenberg/pull/58615))
+
+#### CSS & Styling
+
+-   Font Library: Fix font preview vertical alignment and respect reduce motion preference. ([58451](https://github.com/WordPress/gutenberg/pull/58451))
+
+#### Widgets Editor
+
+-   Widget Editor: Don't disable the Save button. ([58365](https://github.com/WordPress/gutenberg/pull/58365))
+
+#### Typography
+
+-   Fix fonts modal dialog buttons accessibility. ([58309](https://github.com/WordPress/gutenberg/pull/58309))
+
+#### Commands
+
+-   Fix labeling of the command palette. ([56718](https://github.com/WordPress/gutenberg/pull/56718))
+
+### Performance
+
+-   Block editor: Optimise getGlobalBlockCount/getClientIdsWithDescendants. ([58356](https://github.com/WordPress/gutenberg/pull/58356))
+-   Block editor: Prevent isSubtreeDisabled call if not needed. ([58349](https://github.com/WordPress/gutenberg/pull/58349))
+-   Block editor: Reduce appender sync! subscriptions. ([58556](https://github.com/WordPress/gutenberg/pull/58556))
+-   Block editor: selectors: Avoid has() or double get() on Maps. ([58372](https://github.com/WordPress/gutenberg/pull/58372))
+-   Block preview: Prevent recalculating editor styles if additional styles is empty. ([58244](https://github.com/WordPress/gutenberg/pull/58244))
+-   Image block: Remove a block editor store sub. ([57232](https://github.com/WordPress/gutenberg/pull/57232))
+-   Inner blocks: Don't re-render list when controlled blocks change. ([58575](https://github.com/WordPress/gutenberg/pull/58575))
+-   InnerBlocks: Fix continuous re-rendering on inner blocks change. ([58348](https://github.com/WordPress/gutenberg/pull/58348))
+-   Navigation: Fix performance regression. ([58513](https://github.com/WordPress/gutenberg/pull/58513))
+-   Post template: Don't fetch taxonomies if not needed. ([58245](https://github.com/WordPress/gutenberg/pull/58245))
+-   Site editor: Add pattern/template load performance test with TT4. ([58734](https://github.com/WordPress/gutenberg/pull/58734))
+-   Site editor: Avoid double post content parse (alternative). ([58146](https://github.com/WordPress/gutenberg/pull/58146))
+-   Unmemoize Block component selectors. ([58355](https://github.com/WordPress/gutenberg/pull/58355))
+-   core-data: Memoize `getEntitiesConfig` selector. ([58393](https://github.com/WordPress/gutenberg/pull/58393))
+-   getBlockSettings: Avoid memoized selector with clientId. ([58405](https://github.com/WordPress/gutenberg/pull/58405))
+-   useSettings: Extract selector. ([58354](https://github.com/WordPress/gutenberg/pull/58354))
+
+#### Font Library
+
+-   Font Collections: Lazy load json configuration for better performance. ([58530](https://github.com/WordPress/gutenberg/pull/58530))
+
+#### List View
+
+-   Unmemo recursive getEnabledClientIdsTree. ([58525](https://github.com/WordPress/gutenberg/pull/58525))
+
+#### Block Editor
+
+-   Optimize the 'useBlockDisplayTitle' hook. ([58250](https://github.com/WordPress/gutenberg/pull/58250))
+
+#### Interactivity API
+
+-   Break up long hydration task in interactivity init. ([58227](https://github.com/WordPress/gutenberg/pull/58227))
+
+### Experiments
+
+#### Data Views
+
+-   Update styling details in list item layout. ([58397](https://github.com/WordPress/gutenberg/pull/58397))
+
+#### Synced Patterns
+
+-   Add a control per block to reset pattern overrides. ([57907](https://github.com/WordPress/gutenberg/pull/57907))
+
+### Documentation
+
+-   Add video embed documentation and grammar fixes in the Block Editor Handbook. ([58029](https://github.com/WordPress/gutenberg/pull/58029))
+-   Block API: Add `viewStyle` property support to `block.json`. ([55492](https://github.com/WordPress/gutenberg/pull/55492))
+-   CheckboxControl: Add custom label example to Storybook. ([58438](https://github.com/WordPress/gutenberg/pull/58438))
+-   Docs: Copy and formatting edits for the "Markup representation of a block" guide. ([58688](https://github.com/WordPress/gutenberg/pull/58688))
+-   Docs: Copy and formatting edits for the "Registration of a block" guide. ([58709](https://github.com/WordPress/gutenberg/pull/58709))
+-   Docs: Copy and formatting edits for the "Static or Dynamic rendering" guide. ([58681](https://github.com/WordPress/gutenberg/pull/58681))
+-   Docs: Copy and formatting edits for the "The block in the Editor" guide. ([58697](https://github.com/WordPress/gutenberg/pull/58697))
+-   Docs: Copy and formatting edits for the "The block wrapper" guide. ([58704](https://github.com/WordPress/gutenberg/pull/58704))
+-   Docs: Copy and formatting edits for the "Working with JavaScript for the Block Editor" guide. ([58651](https://github.com/WordPress/gutenberg/pull/58651))
+-   Docs: Copy and formatting edits for the "block.json" guide. ([58732](https://github.com/WordPress/gutenberg/pull/58732))
+-   Docs: Copy edits and list formatting for main Block Editor Handbook readme. ([58652](https://github.com/WordPress/gutenberg/pull/58652))
+-   Docs: Fix list formatting and some grammar in the Entities explanation doc. ([58655](https://github.com/WordPress/gutenberg/pull/58655))
+-   Docs: Fix list markup in the Fundamentals of Block Development section. ([58226](https://github.com/WordPress/gutenberg/pull/58226))
+-   Docs: Fix mistake in viewScriptModule documentation. ([58815](https://github.com/WordPress/gutenberg/pull/58815))
+-   Docs: Formatting and copy edits for the File structure of a block guide. ([58635](https://github.com/WordPress/gutenberg/pull/58635))
+-   Docs: Minor copy edits for the Block Development Environment page. ([58614](https://github.com/WordPress/gutenberg/pull/58614))
+-   Docs: Remove duplicate content and update links. ([58358](https://github.com/WordPress/gutenberg/pull/58358))
+-   Docs: Update link to the correct Fundamentals doc. ([58352](https://github.com/WordPress/gutenberg/pull/58352))
+-   Docs: Update list formatting and descriptions in the Fundamentals of Block Development doc. ([58630](https://github.com/WordPress/gutenberg/pull/58630))
+-   Docs: Update the Getting Started readme in the Block Editor Handbook. ([58624](https://github.com/WordPress/gutenberg/pull/58624))
+-   Reference Gutenberg in PHP documentation from main documentation. ([58453](https://github.com/WordPress/gutenberg/pull/58453))
+-   Removed extra parenthesis from document. ([58662](https://github.com/WordPress/gutenberg/pull/58662))
+-   Restructure the FAQs to work with the new TOC design in the Block Editor Handbook. ([58351](https://github.com/WordPress/gutenberg/pull/58351))
+-   Storybook: Add badges to private components. ([58123](https://github.com/WordPress/gutenberg/pull/58123))
+-   Update documentation to avoid recommending early return PHP "anti-pattern". ([58454](https://github.com/WordPress/gutenberg/pull/58454))
+-   Update to rename reusable blocks. ([58633](https://github.com/WordPress/gutenberg/pull/58633))
+-   Update versions-in-wordpress.md. ([58545](https://github.com/WordPress/gutenberg/pull/58545))
+-   fix: InnerBlocks schema description in block.json. ([58649](https://github.com/WordPress/gutenberg/pull/58649))
+
+### Code Quality
+
+-   Avoid running pattern overrides migration in WordPress core. ([58487](https://github.com/WordPress/gutenberg/pull/58487))
+-   Build: Add package build shebang and sync comments. ([58264](https://github.com/WordPress/gutenberg/pull/58264))
+-   Date: Merge 6.4 and 6.5 compat files. ([58479](https://github.com/WordPress/gutenberg/pull/58479))
+-   DefaultBlockAppender: Refactor to hooks. ([58809](https://github.com/WordPress/gutenberg/pull/58809))
+-   Docs: Clarify the non-contextual post types. ([58836](https://github.com/WordPress/gutenberg/pull/58836))
+-   Layout block supports use `str_contains`. ([58251](https://github.com/WordPress/gutenberg/pull/58251))
+-   Move Nav Link PHPUnit tests to blocks directory. ([58460](https://github.com/WordPress/gutenberg/pull/58460))
+
+#### Font Library
+
+-   Address feedback from wordpress-develop#6027. ([58691](https://github.com/WordPress/gutenberg/pull/58691))
+-   Fix font library unit tests nit-picks [round 2]. ([58612](https://github.com/WordPress/gutenberg/pull/58612))
+-   Font Collections: Standardizes docblock comments. ([58654](https://github.com/WordPress/gutenberg/pull/58654))
+-   Font Library Address Outstanding Feedback from WP 6.4 review. ([58675](https://github.com/WordPress/gutenberg/pull/58675))
+-   Move Fonts Library to compat dir for 6.5. ([58608](https://github.com/WordPress/gutenberg/pull/58608))
+-   Remove font family and font face preview keys from theme.json schema. ([58395](https://github.com/WordPress/gutenberg/pull/58395))
+-   Remove old and unused component and css. ([58449](https://github.com/WordPress/gutenberg/pull/58449))
+-   Remove slug from collection schema to accommodate the changes on the wp_register_font_collection function signature. ([58623](https://github.com/WordPress/gutenberg/pull/58623))
+-   Remove tests from classes that were already merged in core. ([58752](https://github.com/WordPress/gutenberg/pull/58752))
+-   Remove tests from font library rest controllers already merged into core. ([58778](https://github.com/WordPress/gutenberg/pull/58778))
+-   Return null if a font collection is not registered. ([58735](https://github.com/WordPress/gutenberg/pull/58735))
+-   Simplify font collection schema. ([58574](https://github.com/WordPress/gutenberg/pull/58574))
+-   Update Font Library REST API code to align with Core standards. ([58619](https://github.com/WordPress/gutenberg/pull/58619))
+-   Update Font Library non-REST API code to align with Core standards. ([58607](https://github.com/WordPress/gutenberg/pull/58607))
+-   Update font collection json schema. ([58413](https://github.com/WordPress/gutenberg/pull/58413))
+-   Update fonts collection data URL for Gutenberg 17.7. ([58746](https://github.com/WordPress/gutenberg/pull/58746))
+-   Use Button's API to disable footer buttons. ([58529](https://github.com/WordPress/gutenberg/pull/58529))
+-   [Font Library] Update PHPUnit tests per Core coding standards and practices. ([58502](https://github.com/WordPress/gutenberg/pull/58502))
+
+#### Components
+
+-   Add eslint rule for theme var regressions. ([58130](https://github.com/WordPress/gutenberg/pull/58130))
+-   Add stylelint rule for theme var regressions. ([58098](https://github.com/WordPress/gutenberg/pull/58098))
+-   AnglePickerControl: Hard deprecate bottom margin. ([58700](https://github.com/WordPress/gutenberg/pull/58700))
+-   CustomGradientPicker: Hard deprecate outer margins. ([58699](https://github.com/WordPress/gutenberg/pull/58699))
+-   FontSizePicker: Hard deprecate bottom margin. ([58702](https://github.com/WordPress/gutenberg/pull/58702))
+-   GradientPicker: Hard deprecate outer margins. ([58701](https://github.com/WordPress/gutenberg/pull/58701))
+-   Remove deprecation warnings for `__next36pxDefaultSize`. ([58703](https://github.com/WordPress/gutenberg/pull/58703))
+
+#### Block Library
+
+-   Interactivity API - Blocks: Move interactivity registration to render. ([58678](https://github.com/WordPress/gutenberg/pull/58678))
+-   Navigation: Move the Navigation block rendering tests to the blocks directory. ([58247](https://github.com/WordPress/gutenberg/pull/58247))
+-   Navigation: Remove use of Gutenberg_Navigation_Fallback class. ([58369](https://github.com/WordPress/gutenberg/pull/58369))
+-   Paragraph: Update comment block. ([58419](https://github.com/WordPress/gutenberg/pull/58419))
+-   Rename variation build methods. ([58538](https://github.com/WordPress/gutenberg/pull/58538))
+-   Template Part: Derive 'hasInnerBlocks' inside selector. ([58680](https://github.com/WordPress/gutenberg/pull/58680))
+
+#### Block Editor
+
+-   Block Switcher: Don't use the 'useBlockDisplayInformation' hook. ([58562](https://github.com/WordPress/gutenberg/pull/58562))
+-   BlockSelectionButton: Don't use the 'useBlockDisplayInformation' hook. ([58640](https://github.com/WordPress/gutenberg/pull/58640))
+-   Link Control: Simplify the sprintf. ([58831](https://github.com/WordPress/gutenberg/pull/58831))
+-   RichTextData: Use a private property. ([58557](https://github.com/WordPress/gutenberg/pull/58557))
+
+#### Post Editor
+
+-   Editor Settings: Rename the getPostLinkProps setting. ([58416](https://github.com/WordPress/gutenberg/pull/58416))
+-   Editor: Reuse data query in the post author components. ([58760](https://github.com/WordPress/gutenberg/pull/58760))
+-   Editor: Use hooks instead of HoCs in the post-taxonomies components. ([58446](https://github.com/WordPress/gutenberg/pull/58446))
+-   Fix: Refactor pre publish panel to use function component instead of class. ([58441](https://github.com/WordPress/gutenberg/pull/58441))
+
+#### Custom Fields
+
+-   Block Bindings: Remove unneeded 'setAttributes' override. ([58806](https://github.com/WordPress/gutenberg/pull/58806))
+
+#### Patterns
+
+-   Pattern overrides: Update overrides attribute data structure and rename it to `content`. ([58596](https://github.com/WordPress/gutenberg/pull/58596))
+
+### Tools
+
+-   Add BlockJsonDependenciesPlugin to modules build. ([57927](https://github.com/WordPress/gutenberg/pull/57927))
+-   DEWP: Fix script module import field. ([58770](https://github.com/WordPress/gutenberg/pull/58770))
+-   Introduce a Props Bot workflow. ([58576](https://github.com/WordPress/gutenberg/pull/58576))
+-   More refinements to Props Bot run conditions. ([58617](https://github.com/WordPress/gutenberg/pull/58617))
+-   Refine when Props Bot runs. ([58616](https://github.com/WordPress/gutenberg/pull/58616))
+-   Remove noahtallen from .wp-env codeowners. ([58283](https://github.com/WordPress/gutenberg/pull/58283))
+-   Scripts: Add viewScriptModule block.json support. ([58203](https://github.com/WordPress/gutenberg/pull/58203))
+
+#### Testing
+
+-   "Multiple use" block validation logic improvement [with Playwright]. ([57576](https://github.com/WordPress/gutenberg/pull/57576))
+-   Block Bindings: Add block bindings end-to-end tests. ([58550](https://github.com/WordPress/gutenberg/pull/58550))
+-   Block Bindings: Add tests for the frontend and polish the existing ones. ([58676](https://github.com/WordPress/gutenberg/pull/58676))
+-   Block Bindings: Improve the code of the block bindings tests. ([58785](https://github.com/WordPress/gutenberg/pull/58785))
+-   Button: Add focusable disabled variant to vizreg Storybook. ([58634](https://github.com/WordPress/gutenberg/pull/58634))
+-   CustomSelect: Add tests for new features. ([58583](https://github.com/WordPress/gutenberg/pull/58583))
+-   Fix flaky test of data-wp-on-window directive. ([58642](https://github.com/WordPress/gutenberg/pull/58642))
+-   Flaky Test: Fix "directives inside islands should not be hydrated twice". ([58516](https://github.com/WordPress/gutenberg/pull/58516))
+-   Interactivity API: Fix flaky test in `data-wp-on-document`. ([58668](https://github.com/WordPress/gutenberg/pull/58668))
+-   Migrate remaining 'inserting blocks' end-to-end tests to Playwright. ([58108](https://github.com/WordPress/gutenberg/pull/58108))
+-   Migrate remaining 'pattern block' end-to-end tests to Playwright. ([58486](https://github.com/WordPress/gutenberg/pull/58486))
+-   SearchControl: Add unit tests. ([58693](https://github.com/WordPress/gutenberg/pull/58693))
+-   Try fixing flaky 'inserting blocks' end-to-end tests. ([58848](https://github.com/WordPress/gutenberg/pull/58848))
+-   Try fixing flaky Paragraph block end-to-end test. ([58208](https://github.com/WordPress/gutenberg/pull/58208))
+-   Use toBeDisabled instead of aria-disabled check. ([58694](https://github.com/WordPress/gutenberg/pull/58694))
+-   e2e: Add a test to confirm that the focus moves from the post title to the paragraph using the enter key. ([58872](https://github.com/WordPress/gutenberg/pull/58872))
+-   end-to-end Utils: Ensure deleteAllUsers does not delete current user. ([58320](https://github.com/WordPress/gutenberg/pull/58320))
+
+#### Build Tooling
+
+-   Add missing Interactivity API label to changelog script. ([58879](https://github.com/WordPress/gutenberg/pull/58879))
+-   Enable dynamic import transform for React Native tests. ([58546](https://github.com/WordPress/gutenberg/pull/58546))
+-   Fix: Remove mention of weekly meeting from first-time contributor PR label. ([58547](https://github.com/WordPress/gutenberg/pull/58547))
+-   Interactivity API: Move Core implementation to compat 6.5 folder. ([58829](https://github.com/WordPress/gutenberg/pull/58829))
+-   Remove phpunit tests for features backported to Core. ([58776](https://github.com/WordPress/gutenberg/pull/58776))
+-   Update Performance tests base branch. ([58890](https://github.com/WordPress/gutenberg/pull/58890))
+-   Workflows: Add 'Technical Prototype' to the type-related labels list. ([58163](https://github.com/WordPress/gutenberg/pull/58163))
+
+### Security
+
+#### Font Library
+
+-   Sanitize font collection data. ([58636](https://github.com/WordPress/gutenberg/pull/58636))
+
+#### REST API
+
+-   Font Library REST API: Sanitize font family and font face settings. ([58590](https://github.com/WordPress/gutenberg/pull/58590))
+
+### Various
+
+-   Script loader 6.4 compat: Check for init hook completion. ([58406](https://github.com/WordPress/gutenberg/pull/58406))
+
+#### Font Library
+
+-   Code style and code quality feedback from core 6.5 review. ([58736](https://github.com/WordPress/gutenberg/pull/58736))
+-   Move getAllowedMimeTypes to FontUtils. ([58667](https://github.com/WordPress/gutenberg/pull/58667))
+-   Refactor as a singleton. ([58669](https://github.com/WordPress/gutenberg/pull/58669))
+
+#### Components
+
+-   Removing Reakit `Composite` implementation. ([58620](https://github.com/WordPress/gutenberg/pull/58620))
+-   Removing Reakit as a dependency. ([58631](https://github.com/WordPress/gutenberg/pull/58631))
+-   Update the Snackbar warning message. ([58591](https://github.com/WordPress/gutenberg/pull/58591))
+
+#### Global Styles
+
+-   Always output core block global styles after base global styles. ([58761](https://github.com/WordPress/gutenberg/pull/58761))
+-   Backport theme.json tests from Core. ([58476](https://github.com/WordPress/gutenberg/pull/58476))
+
+#### Block Library
+
+-   Reduce label and fix capitalization for image block upload label. ([58677](https://github.com/WordPress/gutenberg/pull/58677))
+-   Separator: Remove border-bottom property. ([55725](https://github.com/WordPress/gutenberg/pull/55725))
+
+#### Patterns
+
+-   Update pattern copy to Synced instead of Fully Synced. ([58876](https://github.com/WordPress/gutenberg/pull/58876))
+
+#### Block API
+
+-   ViewScriptModule: 6.5 compatibility changes. ([58832](https://github.com/WordPress/gutenberg/pull/58832))
+
+#### Custom Fields
+
+-   Block Bindings: Backport block bindings refactor from WordPress core. ([58683](https://github.com/WordPress/gutenberg/pull/58683))
+
+#### Inspector Controls
+
+-   Change cover block's "Media settings" label to "Settings". ([58463](https://github.com/WordPress/gutenberg/pull/58463))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @at-benni: Update versions-in-wordpress.md. ([58545](https://github.com/WordPress/gutenberg/pull/58545))
+-   @krupal-panchal: Removed extra parenthesis from document. ([58662](https://github.com/WordPress/gutenberg/pull/58662))
+-   @shreyash3087: fix: InnerBlocks schema description in block.json. ([58649](https://github.com/WordPress/gutenberg/pull/58649))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @ajlende @andrewhayward @andrewserong @annezazu @anton-vlasenko @antonis @aristath @artemiomorales @at-benni @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @creativecoder @DAreRodz @dcalhoun @dd32 @derekblank @desrosj @draganescu @ellatrix @fabiankaegy @fai-sal @fluiddot @gaambo @getdave @glendaviesnz @hellofromtonya @ironprogrammer @jameskoster @jasmussen @jeherve @jeryj @jorgefilipecosta @jsnajdr @kevin940726 @krupal-panchal @luisherranz @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @mikachan @mirka @ndiego @noahtallen @noisysocks @ntsekouras @oandregal @ockham @pbking @ramonjd @retrofox @richtabor @SantosGuillamot @scruffian @shreyash3087 @sirreal @t-hamano @talldan @tellthemachines @tjcafferkey @tomjn @tyxla @vcanales @westonruter @WunderBart @youknowriad
+
+= 17.6.6 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Script loader 6.4 compat: check for init hook completion ([58406](https://github.com/WordPress/gutenberg/pull/58406))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@ramonjd
+
+= 17.7.0-rc.1 =
+
+## Changelog
+
+### Features
+
+#### Interactivity API
+
+-   Allow global configs for namespaces. ([58749](https://github.com/WordPress/gutenberg/pull/58749))
+
+#### Global Styles
+
+-   Add support for transform and letter spacing controls in Global Styles > Typography > Elements. ([58142](https://github.com/WordPress/gutenberg/pull/58142))
+
+#### Block Library
+
+-   Add shadow support for column, columns and image. ([57982](https://github.com/WordPress/gutenberg/pull/57982))
+
+### Enhancements
+
+-   Improve translators comments for wp.date.setSettings in compat file. ([58488](https://github.com/WordPress/gutenberg/pull/58488))
+-   Interactive Template: Use viewScriptModule. ([58211](https://github.com/WordPress/gutenberg/pull/58211))
+
+#### Components
+
+-   Adding `constrainTabbing` prop to `useDialog` hook. ([57962](https://github.com/WordPress/gutenberg/pull/57962))
+-   Allow limiting the number of maximum visible Snackbars. ([58559](https://github.com/WordPress/gutenberg/pull/58559))
+-   ConfirmDialog: Add `__next40pxDefaultSize` to buttons. ([58421](https://github.com/WordPress/gutenberg/pull/58421))
+-   Expand theming support in COLORS. ([58097](https://github.com/WordPress/gutenberg/pull/58097))
+-   FocalPointPicker: Apply modern styling. ([58459](https://github.com/WordPress/gutenberg/pull/58459))
+-   Implement Tabs in widget editor settings. ([57886](https://github.com/WordPress/gutenberg/pull/57886))
+-   Implement `Tabs` in site-editor settings. ([56959](https://github.com/WordPress/gutenberg/pull/56959))
+-   Implementing `useCompositeState` with Ariakit. ([57304](https://github.com/WordPress/gutenberg/pull/57304))
+-   InputBase: Add `isBorderless` prop. ([58750](https://github.com/WordPress/gutenberg/pull/58750))
+-   Replace `TabPanel` with `Tabs` in the editor Document Overview sidebar. ([57082](https://github.com/WordPress/gutenberg/pull/57082))
+-   SearchControl: Refactor to use InputControl internally. ([56524](https://github.com/WordPress/gutenberg/pull/56524))
+-   Show borders for disabled secondary buttons. ([58606](https://github.com/WordPress/gutenberg/pull/58606))
+
+#### Data Views
+
+-   Add outline to template preview in table layout. ([58738](https://github.com/WordPress/gutenberg/pull/58738))
+-   Add: Delete bulk action to patterns. ([58747](https://github.com/WordPress/gutenberg/pull/58747))
+-   Add: Selection and bulk actions to grid view. ([58144](https://github.com/WordPress/gutenberg/pull/58144))
+-   DataViews: Add primary filter API. ([58427](https://github.com/WordPress/gutenberg/pull/58427))
+-   DataViews: In patterns page, show sync status filter by default. ([58367](https://github.com/WordPress/gutenberg/pull/58367))
+-   DataViews: Redesign of filters. ([58569](https://github.com/WordPress/gutenberg/pull/58569))
+-   Remove min-width style on table cells. ([58204](https://github.com/WordPress/gutenberg/pull/58204))
+-   Update 'Rows per page' view option label to account for Grid layout. ([58457](https://github.com/WordPress/gutenberg/pull/58457))
+-   Update dataviews search input placeholder. ([58742](https://github.com/WordPress/gutenberg/pull/58742))
+-   Update spacing around title in grid layout. ([58739](https://github.com/WordPress/gutenberg/pull/58739))
+
+#### Interactivity API
+
+-   Add `block supports` for `clientNavigation` and `interactive` properties on `block.json` schema. ([58132](https://github.com/WordPress/gutenberg/pull/58132))
+-   Image block: Refactor and remove `data-wp-body`. ([58835](https://github.com/WordPress/gutenberg/pull/58835))
+-   Interactivity Router: Fix initial page cache. ([58496](https://github.com/WordPress/gutenberg/pull/58496))
+-   Interactivity Router: Move ARIA live region and loading bar to the Interactivity Router. ([58377](https://github.com/WordPress/gutenberg/pull/58377))
+-   Limit the exported APIs. ([58864](https://github.com/WordPress/gutenberg/pull/58864))
+-   Mark all core block stores as private. ([58722](https://github.com/WordPress/gutenberg/pull/58722))
+-   Server Directive Processor for `data-wp-each`. ([58498](https://github.com/WordPress/gutenberg/pull/58498))
+-   Support setting a namespace using a string in `data-wp-interactive`. ([58743](https://github.com/WordPress/gutenberg/pull/58743))
+
+#### Block Library
+
+-   Follow up on the Post navigation link taxonomy filters. ([57949](https://github.com/WordPress/gutenberg/pull/57949))
+-   Home Link: Render Home text if there is no attribute label present. ([58387](https://github.com/WordPress/gutenberg/pull/58387))
+-   Organize gallery controls. ([58407](https://github.com/WordPress/gutenberg/pull/58407))
+-   Pattern: Use the '\_\_experimentalLabel' method to get a title. ([58646](https://github.com/WordPress/gutenberg/pull/58646))
+-   Social Icons: Update Patreon icon. ([56951](https://github.com/WordPress/gutenberg/pull/56951))
+-   Try: Disable text selection for post content placeholder block. ([58169](https://github.com/WordPress/gutenberg/pull/58169))
+-   Update pattern block copy in light of pattern overrides. ([58231](https://github.com/WordPress/gutenberg/pull/58231))
+
+#### Global Styles
+
+-   Add style engine support for nested at-rules. ([58867](https://github.com/WordPress/gutenberg/pull/58867))
+-   Font Library: Show 'Add fonts' button when there are no fonts installed. ([58580](https://github.com/WordPress/gutenberg/pull/58580))
+-   Move Shadow controls to Border panel. ([58466](https://github.com/WordPress/gutenberg/pull/58466))
+-   Shadow: Update shadow support to allow explicit skipping of serialization. ([58306](https://github.com/WordPress/gutenberg/pull/58306))
+-   Try: Remove shadow preset overflow. ([58663](https://github.com/WordPress/gutenberg/pull/58663))
+-   Update return values from getGlobalStylesChanges(). ([58707](https://github.com/WordPress/gutenberg/pull/58707))
+
+#### Block Editor
+
+-   Drag and drop: Allow dragging from inserter or desktop to template parts. ([58589](https://github.com/WordPress/gutenberg/pull/58589))
+-   Drag and drop: Allow dropping within template parts. ([58423](https://github.com/WordPress/gutenberg/pull/58423))
+-   Implement "Add block" UI for Nav block Link UI. ([57756](https://github.com/WordPress/gutenberg/pull/57756))
+-   Implementing new UX for invoking rich text Link UI. ([57986](https://github.com/WordPress/gutenberg/pull/57986))
+-   Remove open in new tab from link preview. ([58744](https://github.com/WordPress/gutenberg/pull/58744))
+-   Use consistent labels, remove additional settings, and copySmall icon LinkControl. ([58183](https://github.com/WordPress/gutenberg/pull/58183))
+
+#### Site Editor
+
+-   Apply 40px across summary panel. ([58730](https://github.com/WordPress/gutenberg/pull/58730))
+-   Apply custom scroll style to fixed header block toolbar. ([57444](https://github.com/WordPress/gutenberg/pull/57444))
+-   Improve SiteIcon display and transition. ([58472](https://github.com/WordPress/gutenberg/pull/58472))
+-   Only show 'Back' button when user came from an editor canvas. ([58710](https://github.com/WordPress/gutenberg/pull/58710))
+-   Update "focus mode" to consistently use the Document Bar's Back button. ([58528](https://github.com/WordPress/gutenberg/pull/58528))
+
+#### Patterns
+
+-   Add a confirmation dialog when a user tries to delete a synced pattern with overrides. ([58796](https://github.com/WordPress/gutenberg/pull/58796))
+-   Add the block name to the pattern content data. ([58715](https://github.com/WordPress/gutenberg/pull/58715))
+-   Flash editable block outlines instead of always showing them. ([58159](https://github.com/WordPress/gutenberg/pull/58159))
+
+#### Design Tools
+
+-   Background image support: Add background position controls. ([58592](https://github.com/WordPress/gutenberg/pull/58592))
+-   Tweak metrics and labels for background size controls. ([58854](https://github.com/WordPress/gutenberg/pull/58854))
+
+#### Post Editor
+
+-   Editor: Limit visible Snackbars from the consumers. ([58598](https://github.com/WordPress/gutenberg/pull/58598))
+-   Save entities panel: Update styles. ([58706](https://github.com/WordPress/gutenberg/pull/58706))
+
+#### Font Library
+
+-   Add sanitize from schema util. ([58571](https://github.com/WordPress/gutenberg/pull/58571))
+-   Font Collections: Update registration function signature and add caching. ([58363](https://github.com/WordPress/gutenberg/pull/58363))
+
+#### Inspector Controls
+
+-   Tweak FocalPointPicker inspector controls. ([58448](https://github.com/WordPress/gutenberg/pull/58448))
+-   Tweak Media & Text inspector controls. ([58447](https://github.com/WordPress/gutenberg/pull/58447))
+
+#### Custom Fields
+
+-   Block Bindings: Ensure to pass bound attributes. ([58844](https://github.com/WordPress/gutenberg/pull/58844))
+
+#### Commands
+
+-   Try debouncing search for post-type navigation. ([58810](https://github.com/WordPress/gutenberg/pull/58810))
+
+#### Document Settings
+
+-   Tweak revisions panel for improved scanning. ([58751](https://github.com/WordPress/gutenberg/pull/58751))
+
+#### Synced Patterns
+
+-   Support button's link settings for Pattern Overrides. ([58587](https://github.com/WordPress/gutenberg/pull/58587))
+
+#### Block API
+
+-   Block Hooks: Set ignoredHookedBlocks metada attr upon insertion. ([58553](https://github.com/WordPress/gutenberg/pull/58553))
+
+#### List View
+
+-   Add keyboard clipboard events for cut, copy, paste. ([57838](https://github.com/WordPress/gutenberg/pull/57838))
+
+### New APIs
+
+#### Block API
+
+-   Blocks: Add handling for block.json viewScriptModule. ([58731](https://github.com/WordPress/gutenberg/pull/58731))
+
+### Bug Fixes
+
+-   Core data: useEntityBlockEditor: Fix parsed blocks cache. ([58841](https://github.com/WordPress/gutenberg/pull/58841))
+-   Footnotes: Fix anchor order replacing. ([58791](https://github.com/WordPress/gutenberg/pull/58791))
+
+#### Block Editor
+
+-   Block Switcher: Use consistent labels. ([58240](https://github.com/WordPress/gutenberg/pull/58240))
+-   Don't move focus within the toolbar if it is already focused. ([58570](https://github.com/WordPress/gutenberg/pull/58570))
+-   Don't show Link preview when no selection. ([58771](https://github.com/WordPress/gutenberg/pull/58771))
+-   Fix Link UI popover anchor in rich text. ([58282](https://github.com/WordPress/gutenberg/pull/58282))
+-   Fix empty link preview after creating link from empty selection. ([58863](https://github.com/WordPress/gutenberg/pull/58863))
+-   Hide the 'Content' panel for locked blocks when there's no content. ([58259](https://github.com/WordPress/gutenberg/pull/58259))
+-   ImageURLInputUI: Fix focus loss when settings are changed. ([58647](https://github.com/WordPress/gutenberg/pull/58647))
+-   Link UI: Polish lightbox pieces. ([58666](https://github.com/WordPress/gutenberg/pull/58666))
+-   Media Replace Flow: Vertically align the URL. ([58621](https://github.com/WordPress/gutenberg/pull/58621))
+-   MediaReplaceFlow: Restore popover width. ([58597](https://github.com/WordPress/gutenberg/pull/58597))
+-   Rich Text: Only apply focus to elements not selection. ([58745](https://github.com/WordPress/gutenberg/pull/58745))
+-   Rich text: Preserve white space should strip \r. ([58805](https://github.com/WordPress/gutenberg/pull/58805))
+-   Settings may be undefined. ([58658](https://github.com/WordPress/gutenberg/pull/58658))
+-   useOnBlockDrop: Fix the Gallery block check. ([58711](https://github.com/WordPress/gutenberg/pull/58711))
+
+#### Components
+
+-   Add a timezone offset value for display purposes. ([56682](https://github.com/WordPress/gutenberg/pull/56682))
+-   Fix Placeholder component padding when body text font size is changed. ([58323](https://github.com/WordPress/gutenberg/pull/58323))
+-   Fix URLPopover preview overflow. ([58741](https://github.com/WordPress/gutenberg/pull/58741))
+-   Fix the Snackbar auto-dismissal timers. ([58604](https://github.com/WordPress/gutenberg/pull/58604))
+-   Popover: Add `box-sizing` reset style. ([58871](https://github.com/WordPress/gutenberg/pull/58871))
+-   Set post editor sidebar tabs to manual activation. ([58041](https://github.com/WordPress/gutenberg/pull/58041))
+-   Tabs: Delay `activeId` updates until focus can be properly detected. ([58625](https://github.com/WordPress/gutenberg/pull/58625))
+-   Tabs: Fix infinite loop in useEffect. ([58861](https://github.com/WordPress/gutenberg/pull/58861))
+-   Tabs: Improve Controlled Mode Focus Handling. ([57696](https://github.com/WordPress/gutenberg/pull/57696))
+-   Try: Fix lightbox URL popover position. ([58600](https://github.com/WordPress/gutenberg/pull/58600))
+
+#### Block Library
+
+-   Fix #54352 prevent php 8.1 fatal when template parts are not found in non-debug environments. ([54354](https://github.com/WordPress/gutenberg/pull/54354))
+-   Fix Query pagination not working in template parts and patterns. ([58602](https://github.com/WordPress/gutenberg/pull/58602))
+-   Fix URL escaping for array parameters in Navigation links. ([58068](https://github.com/WordPress/gutenberg/pull/58068))
+-   Fix missing data in email submissions. ([55691](https://github.com/WordPress/gutenberg/pull/55691))
+-   Fix: Removing footnotes from the allowed blocks does not remove footnotes. ([58855](https://github.com/WordPress/gutenberg/pull/58855))
+-   Navigation Link: Use get_block_type_variations to register variations. ([58389](https://github.com/WordPress/gutenberg/pull/58389))
+-   Prevent usage of `gutenberg_url` in block-library. ([58242](https://github.com/WordPress/gutenberg/pull/58242))
+-   Template Part: Reflect name updates without saving changes. ([58644](https://github.com/WordPress/gutenberg/pull/58644))
+-   Try: Make gallery randomization work when nested. ([58733](https://github.com/WordPress/gutenberg/pull/58733))
+
+#### Data Views
+
+-   DataViews: Fix applied default layout props. ([58400](https://github.com/WordPress/gutenberg/pull/58400))
+-   DataViews: Fix nested buttons and placeholder text in list layout. ([58304](https://github.com/WordPress/gutenberg/pull/58304))
+-   DataViews: Fix some small issues with featured image. ([58371](https://github.com/WordPress/gutenberg/pull/58371))
+-   DataViews: Make it possible to toggle Author field in templates and template parts. ([58609](https://github.com/WordPress/gutenberg/pull/58609))
+-   DataViews: Remove test artifact (status filter was set as primary). ([58682](https://github.com/WordPress/gutenberg/pull/58682))
+-   DataViews: Use chips for filter summary. ([58816](https://github.com/WordPress/gutenberg/pull/58816))
+-   Fix double scrollbar in grid layout. ([58536](https://github.com/WordPress/gutenberg/pull/58536))
+-   Fix: Dataviews selection on patterns grid view. ([58726](https://github.com/WordPress/gutenberg/pull/58726))
+
+#### Site Editor
+
+-   Add context for the All translatable string and enforce l10n best practices. ([58196](https://github.com/WordPress/gutenberg/pull/58196))
+-   Break long URL in page sidebar. ([58763](https://github.com/WordPress/gutenberg/pull/58763))
+-   Editor: Fix block context defined for template parts. ([58807](https://github.com/WordPress/gutenberg/pull/58807))
+-   Fix line-height in block card. ([58246](https://github.com/WordPress/gutenberg/pull/58246))
+-   Hide export button if non-block-based theme. ([58346](https://github.com/WordPress/gutenberg/pull/58346))
+-   Mobile site editor header toolbar button bugfix. ([58852](https://github.com/WordPress/gutenberg/pull/58852))
+
+#### Post Editor
+
+-   Editor: Don't hide authors' Combobox if the current author is missing. ([58719](https://github.com/WordPress/gutenberg/pull/58719))
+-   Fix permalink input field text overflow ellipsis for Firefox. ([57310](https://github.com/WordPress/gutenberg/pull/57310))
+-   Fix the position and size of the Options menu,. ([57515](https://github.com/WordPress/gutenberg/pull/57515))
+-   Fix: Use old template panel if user doesn’t have access to view templates. ([58485](https://github.com/WordPress/gutenberg/pull/58485))
+-   Template editing: Update fullscreen WP back functionality. ([58534](https://github.com/WordPress/gutenberg/pull/58534))
+
+#### Interactivity API
+
+-   Add `supports.interactivity` to the Query block. ([58316](https://github.com/WordPress/gutenberg/pull/58316))
+-   Fix state intialization for asynchronous private stores. ([58754](https://github.com/WordPress/gutenberg/pull/58754))
+-   Remove non default suffix data wp context processing. ([58664](https://github.com/WordPress/gutenberg/pull/58664))
+-   Use compat versions of HTML APIs. ([58846](https://github.com/WordPress/gutenberg/pull/58846))
+
+#### Global Styles
+
+-   Block Styles: Fix block style variation selector generation. ([58051](https://github.com/WordPress/gutenberg/pull/58051))
+-   Fix Global styles text settings bleeding into placeholder component. ([58303](https://github.com/WordPress/gutenberg/pull/58303))
+-   Global styles revisions: Fix is-selected rules from affecting other areas of the editor. ([58228](https://github.com/WordPress/gutenberg/pull/58228))
+-   Site Editor: Prevent classic theme from accessing global style menu. ([58345](https://github.com/WordPress/gutenberg/pull/58345))
+
+#### List View
+
+-   Fix error when switching between template preview modes. ([58533](https://github.com/WordPress/gutenberg/pull/58533))
+-   Navigation Submenu Block: Make block name affect list view. ([58296](https://github.com/WordPress/gutenberg/pull/58296))
+-   Template Part: Fix site editor error when loading with list view set to always display. ([58868](https://github.com/WordPress/gutenberg/pull/58868))
+
+#### Font Library
+
+-   Avoid mutating fontface data. ([58473](https://github.com/WordPress/gutenberg/pull/58473))
+-   Avoid running init functions when font library is available in core. ([58793](https://github.com/WordPress/gutenberg/pull/58793))
+-   Fix size of demo text. ([58849](https://github.com/WordPress/gutenberg/pull/58849))
+
+#### Typography
+
+-   Fix font library modal dialog translatable strings. ([58256](https://github.com/WordPress/gutenberg/pull/58256))
+-   Font Library: Change referenced tab name on Google Fonts confirmation dialog. ([58584](https://github.com/WordPress/gutenberg/pull/58584))
+-   Font size: Allow for custom font size handling. ([58422](https://github.com/WordPress/gutenberg/pull/58422))
+
+#### Script Modules API
+
+-   Add import map polyfill. ([58263](https://github.com/WordPress/gutenberg/pull/58263))
+-   Import Maps: Only emit CDATA wrappers for inline scripts for JavaScript. ([58818](https://github.com/WordPress/gutenberg/pull/58818))
+
+#### Extensibility
+
+-   Fix broken list markup in navigation block when 3rd party blocks are used as decendants of navigation block. ([55551](https://github.com/WordPress/gutenberg/pull/55551))
+-   Navigation block: Check Block Hooks API callback hasn't already been added. ([58772](https://github.com/WordPress/gutenberg/pull/58772))
+
+#### Synced Patterns
+
+-   Disable overriding links of images inside pattern instances. ([58660](https://github.com/WordPress/gutenberg/pull/58660))
+-   Fix nested pattern overrides and disable editing inner pattern. ([58541](https://github.com/WordPress/gutenberg/pull/58541))
+
+#### Inspector Controls
+
+-   Add missing PanelBody title for the columns block inspector. ([58452](https://github.com/WordPress/gutenberg/pull/58452))
+-   Add spacing between input controls with custom values. ([58410](https://github.com/WordPress/gutenberg/pull/58410))
+
+#### Custom Fields
+
+-   Block Bindings: Update bindings registry with latest changes. ([58843](https://github.com/WordPress/gutenberg/pull/58843))
+
+#### History
+
+-   Columns: Batch vertical alignment updates. ([58801](https://github.com/WordPress/gutenberg/pull/58801))
+
+#### Document Settings
+
+-   Editor: Ensure the current author is included in the dropdown. ([58716](https://github.com/WordPress/gutenberg/pull/58716))
+
+#### Rich Text
+
+-   Add aria-readonly attribute to Rich Text component. ([58687](https://github.com/WordPress/gutenberg/pull/58687))
+
+#### Navigation Menus
+
+-   Navigation: Update the fallback block list to avoid a PHP Warning. ([58588](https://github.com/WordPress/gutenberg/pull/58588))
+
+#### Patterns
+
+-   Update the bindings attribs of blocks added during experimental phase. ([58483](https://github.com/WordPress/gutenberg/pull/58483))
+
+#### Distraction Free
+
+-   Add default restoration of UI when exiting distraction free mode. ([58455](https://github.com/WordPress/gutenberg/pull/58455))
+
+### Accessibility
+
+-   Escape as Select/Edit mode Toggle. ([58637](https://github.com/WordPress/gutenberg/pull/58637))
+-   Global styles revisions: Update text color contrast. ([58340](https://github.com/WordPress/gutenberg/pull/58340))
+
+#### Components
+
+-   CustomSelect: Disable `virtualFocus` to fix issue for screenreaders. ([58585](https://github.com/WordPress/gutenberg/pull/58585))
+-   Font Library modal: Try to improve checkbox labelling. ([58339](https://github.com/WordPress/gutenberg/pull/58339))
+-   PaletteEdit: Fix palette item accessibility. ([58214](https://github.com/WordPress/gutenberg/pull/58214))
+
+#### Font Library
+
+-   Buttons position and accessibility. ([58212](https://github.com/WordPress/gutenberg/pull/58212))
+-   Fix focus loss when update/install button is pressed. ([58364](https://github.com/WordPress/gutenberg/pull/58364))
+-   Removed <header> <main> and <footer> elements from Font Library Modal. ([58221](https://github.com/WordPress/gutenberg/pull/58221))
+
+#### Block Library
+
+-   Fix image link preset suggestions arrow key navigation. ([58615](https://github.com/WordPress/gutenberg/pull/58615))
+
+#### CSS & Styling
+
+-   Font Library: Fix font preview vertical alignment and respect reduce motion preference. ([58451](https://github.com/WordPress/gutenberg/pull/58451))
+
+#### Widgets Editor
+
+-   Widget Editor: Don't disable the Save button. ([58365](https://github.com/WordPress/gutenberg/pull/58365))
+
+#### Typography
+
+-   Fix fonts modal dialog buttons accessibility. ([58309](https://github.com/WordPress/gutenberg/pull/58309))
+
+#### Commands
+
+-   Fix labeling of the command palette. ([56718](https://github.com/WordPress/gutenberg/pull/56718))
+
+### Performance
+
+-   Block editor: Optimise getGlobalBlockCount/getClientIdsWithDescendants. ([58356](https://github.com/WordPress/gutenberg/pull/58356))
+-   Block editor: Prevent isSubtreeDisabled call if not needed. ([58349](https://github.com/WordPress/gutenberg/pull/58349))
+-   Block editor: Reduce appender sync! subscriptions. ([58556](https://github.com/WordPress/gutenberg/pull/58556))
+-   Block editor: selectors: Avoid has() or double get() on Maps. ([58372](https://github.com/WordPress/gutenberg/pull/58372))
+-   Block preview: Prevent recalculating editor styles if additional styles is empty. ([58244](https://github.com/WordPress/gutenberg/pull/58244))
+-   Image block: Remove a block editor store sub. ([57232](https://github.com/WordPress/gutenberg/pull/57232))
+-   Inner blocks: Don't re-render list when controlled blocks change. ([58575](https://github.com/WordPress/gutenberg/pull/58575))
+-   InnerBlocks: Fix continuous re-rendering on inner blocks change. ([58348](https://github.com/WordPress/gutenberg/pull/58348))
+-   Navigation: Fix performance regression. ([58513](https://github.com/WordPress/gutenberg/pull/58513))
+-   Post template: Don't fetch taxonomies if not needed. ([58245](https://github.com/WordPress/gutenberg/pull/58245))
+-   Site editor: Add pattern/template load performance test with TT4. ([58734](https://github.com/WordPress/gutenberg/pull/58734))
+-   Site editor: Avoid double post content parse (alternative). ([58146](https://github.com/WordPress/gutenberg/pull/58146))
+-   Unmemoize Block component selectors. ([58355](https://github.com/WordPress/gutenberg/pull/58355))
+-   core-data: Memoize `getEntitiesConfig` selector. ([58393](https://github.com/WordPress/gutenberg/pull/58393))
+-   getBlockSettings: Avoid memoized selector with clientId. ([58405](https://github.com/WordPress/gutenberg/pull/58405))
+-   useSettings: Extract selector. ([58354](https://github.com/WordPress/gutenberg/pull/58354))
+
+#### Font Library
+
+-   Font Collections: Lazy load json configuration for better performance. ([58530](https://github.com/WordPress/gutenberg/pull/58530))
+
+#### List View
+
+-   Unmemo recursive getEnabledClientIdsTree. ([58525](https://github.com/WordPress/gutenberg/pull/58525))
+
+#### Block Editor
+
+-   Optimize the 'useBlockDisplayTitle' hook. ([58250](https://github.com/WordPress/gutenberg/pull/58250))
+
+#### Interactivity API
+
+-   Break up long hydration task in interactivity init. ([58227](https://github.com/WordPress/gutenberg/pull/58227))
+
+### Experiments
+
+#### Data Views
+
+-   Update styling details in list item layout. ([58397](https://github.com/WordPress/gutenberg/pull/58397))
+
+#### Synced Patterns
+
+-   Add a control per block to reset pattern overrides. ([57907](https://github.com/WordPress/gutenberg/pull/57907))
+
+### Documentation
+
+-   Add video embed documentation and grammar fixes in the Block Editor Handbook. ([58029](https://github.com/WordPress/gutenberg/pull/58029))
+-   Block API: Add `viewStyle` property support to `block.json`. ([55492](https://github.com/WordPress/gutenberg/pull/55492))
+-   CheckboxControl: Add custom label example to Storybook. ([58438](https://github.com/WordPress/gutenberg/pull/58438))
+-   Docs: Copy and formatting edits for the "Markup representation of a block" guide. ([58688](https://github.com/WordPress/gutenberg/pull/58688))
+-   Docs: Copy and formatting edits for the "Registration of a block" guide. ([58709](https://github.com/WordPress/gutenberg/pull/58709))
+-   Docs: Copy and formatting edits for the "Static or Dynamic rendering" guide. ([58681](https://github.com/WordPress/gutenberg/pull/58681))
+-   Docs: Copy and formatting edits for the "The block in the Editor" guide. ([58697](https://github.com/WordPress/gutenberg/pull/58697))
+-   Docs: Copy and formatting edits for the "The block wrapper" guide. ([58704](https://github.com/WordPress/gutenberg/pull/58704))
+-   Docs: Copy and formatting edits for the "Working with JavaScript for the Block Editor" guide. ([58651](https://github.com/WordPress/gutenberg/pull/58651))
+-   Docs: Copy and formatting edits for the "block.json" guide. ([58732](https://github.com/WordPress/gutenberg/pull/58732))
+-   Docs: Copy edits and list formatting for main Block Editor Handbook readme. ([58652](https://github.com/WordPress/gutenberg/pull/58652))
+-   Docs: Fix list formatting and some grammar in the Entities explanation doc. ([58655](https://github.com/WordPress/gutenberg/pull/58655))
+-   Docs: Fix list markup in the Fundamentals of Block Development section. ([58226](https://github.com/WordPress/gutenberg/pull/58226))
+-   Docs: Fix mistake in viewScriptModule documentation. ([58815](https://github.com/WordPress/gutenberg/pull/58815))
+-   Docs: Formatting and copy edits for the File structure of a block guide. ([58635](https://github.com/WordPress/gutenberg/pull/58635))
+-   Docs: Minor copy edits for the Block Development Environment page. ([58614](https://github.com/WordPress/gutenberg/pull/58614))
+-   Docs: Remove duplicate content and update links. ([58358](https://github.com/WordPress/gutenberg/pull/58358))
+-   Docs: Update link to the correct Fundamentals doc. ([58352](https://github.com/WordPress/gutenberg/pull/58352))
+-   Docs: Update list formatting and descriptions in the Fundamentals of Block Development doc. ([58630](https://github.com/WordPress/gutenberg/pull/58630))
+-   Docs: Update the Getting Started readme in the Block Editor Handbook. ([58624](https://github.com/WordPress/gutenberg/pull/58624))
+-   Reference Gutenberg in PHP documentation from main documentation. ([58453](https://github.com/WordPress/gutenberg/pull/58453))
+-   Removed extra parenthesis from document. ([58662](https://github.com/WordPress/gutenberg/pull/58662))
+-   Restructure the FAQs to work with the new TOC design in the Block Editor Handbook. ([58351](https://github.com/WordPress/gutenberg/pull/58351))
+-   Storybook: Add badges to private components. ([58123](https://github.com/WordPress/gutenberg/pull/58123))
+-   Update documentation to avoid recommending early return PHP "anti-pattern". ([58454](https://github.com/WordPress/gutenberg/pull/58454))
+-   Update to rename reusable blocks. ([58633](https://github.com/WordPress/gutenberg/pull/58633))
+-   Update versions-in-wordpress.md. ([58545](https://github.com/WordPress/gutenberg/pull/58545))
+-   fix: InnerBlocks schema description in block.json. ([58649](https://github.com/WordPress/gutenberg/pull/58649))
+
+### Code Quality
+
+-   Avoid running pattern overrides migration in WordPress core. ([58487](https://github.com/WordPress/gutenberg/pull/58487))
+-   Build: Add package build shebang and sync comments. ([58264](https://github.com/WordPress/gutenberg/pull/58264))
+-   Date: Merge 6.4 and 6.5 compat files. ([58479](https://github.com/WordPress/gutenberg/pull/58479))
+-   DefaultBlockAppender: Refactor to hooks. ([58809](https://github.com/WordPress/gutenberg/pull/58809))
+-   Docs: Clarify the non contextual post types. ([58836](https://github.com/WordPress/gutenberg/pull/58836))
+-   Layout block supports use `str_contains`. ([58251](https://github.com/WordPress/gutenberg/pull/58251))
+-   Move Nav Link PHPUnit tests to blocks directory. ([58460](https://github.com/WordPress/gutenberg/pull/58460))
+
+#### Font Library
+
+-   Address feedback from wordpress-develop#6027. ([58691](https://github.com/WordPress/gutenberg/pull/58691))
+-   Fix font library unit tests nit-picks [round 2]. ([58612](https://github.com/WordPress/gutenberg/pull/58612))
+-   Font Collections: Standardizes docblock comments. ([58654](https://github.com/WordPress/gutenberg/pull/58654))
+-   Font Library Address Outstanding Feedback from WP 6.4 review. ([58675](https://github.com/WordPress/gutenberg/pull/58675))
+-   Move Fonts Library to compat dir for 6.5. ([58608](https://github.com/WordPress/gutenberg/pull/58608))
+-   Remove font family and font face preview keys from theme.json schema. ([58395](https://github.com/WordPress/gutenberg/pull/58395))
+-   Remove old and unused component and css. ([58449](https://github.com/WordPress/gutenberg/pull/58449))
+-   Remove slug from collection schema to accommodate the changes on the wp_register_font_collection function signature. ([58623](https://github.com/WordPress/gutenberg/pull/58623))
+-   Remove tests from classes that were already merged in core. ([58752](https://github.com/WordPress/gutenberg/pull/58752))
+-   Remove tests from font library rest controllers already merged into core. ([58778](https://github.com/WordPress/gutenberg/pull/58778))
+-   Return null if a font collection is not registered. ([58735](https://github.com/WordPress/gutenberg/pull/58735))
+-   Simplify font collection schema. ([58574](https://github.com/WordPress/gutenberg/pull/58574))
+-   Update Font Library REST API code to align with Core standards. ([58619](https://github.com/WordPress/gutenberg/pull/58619))
+-   Update Font Library non-REST API code to align with Core standards. ([58607](https://github.com/WordPress/gutenberg/pull/58607))
+-   Update font collection json schema. ([58413](https://github.com/WordPress/gutenberg/pull/58413))
+-   Update fonts collection data URL for Gutenberg 17.7. ([58746](https://github.com/WordPress/gutenberg/pull/58746))
+-   Use Button's API to disable footer buttons. ([58529](https://github.com/WordPress/gutenberg/pull/58529))
+-   [Font Library] Update PHPUnit tests per Core coding standards and practices. ([58502](https://github.com/WordPress/gutenberg/pull/58502))
+
+#### Components
+
+-   Add eslint rule for theme var regressions. ([58130](https://github.com/WordPress/gutenberg/pull/58130))
+-   Add stylelint rule for theme var regressions. ([58098](https://github.com/WordPress/gutenberg/pull/58098))
+-   AnglePickerControl: Hard deprecate bottom margin. ([58700](https://github.com/WordPress/gutenberg/pull/58700))
+-   CustomGradientPicker: Hard deprecate outer margins. ([58699](https://github.com/WordPress/gutenberg/pull/58699))
+-   FontSizePicker: Hard deprecate bottom margin. ([58702](https://github.com/WordPress/gutenberg/pull/58702))
+-   GradientPicker: Hard deprecate outer margins. ([58701](https://github.com/WordPress/gutenberg/pull/58701))
+-   Remove deprecation warnings for `__next36pxDefaultSize`. ([58703](https://github.com/WordPress/gutenberg/pull/58703))
+
+#### Block Library
+
+-   Interactivity API - Blocks: Move interactivity registration to render. ([58678](https://github.com/WordPress/gutenberg/pull/58678))
+-   Navigation: Move the Navigation block rendering tests to the blocks directory. ([58247](https://github.com/WordPress/gutenberg/pull/58247))
+-   Navigation: Remove use of Gutenberg_Navigation_Fallback class. ([58369](https://github.com/WordPress/gutenberg/pull/58369))
+-   Paragraph: Update comment block. ([58419](https://github.com/WordPress/gutenberg/pull/58419))
+-   Rename variation build methods. ([58538](https://github.com/WordPress/gutenberg/pull/58538))
+-   Template Part: Derive 'hasInnerBlocks' inside selector. ([58680](https://github.com/WordPress/gutenberg/pull/58680))
+
+#### Block Editor
+
+-   Block Switcher: Don't use the 'useBlockDisplayInformation' hook. ([58562](https://github.com/WordPress/gutenberg/pull/58562))
+-   BlockSelectionButton: Don't use the 'useBlockDisplayInformation' hook. ([58640](https://github.com/WordPress/gutenberg/pull/58640))
+-   Link Control: Simplify the sprintf. ([58831](https://github.com/WordPress/gutenberg/pull/58831))
+-   RichTextData: Use a private property. ([58557](https://github.com/WordPress/gutenberg/pull/58557))
+
+#### Post Editor
+
+-   Editor Settings: Rename the getPostLinkProps setting. ([58416](https://github.com/WordPress/gutenberg/pull/58416))
+-   Editor: Reuse data query in the post author components. ([58760](https://github.com/WordPress/gutenberg/pull/58760))
+-   Editor: Use hooks instead of HoCs in the post-taxonomies components. ([58446](https://github.com/WordPress/gutenberg/pull/58446))
+-   Fix: Refactor pre publish panel to use function component instead of class. ([58441](https://github.com/WordPress/gutenberg/pull/58441))
+
+#### Custom Fields
+
+-   Block Bindings: Remove unneeded 'setAttributes' override. ([58806](https://github.com/WordPress/gutenberg/pull/58806))
+
+#### Patterns
+
+-   Pattern overrides: Update overrides attribute data structure and rename it to `content`. ([58596](https://github.com/WordPress/gutenberg/pull/58596))
+
+### Tools
+
+-   Add BlockJsonDependenciesPlugin to modules build. ([57927](https://github.com/WordPress/gutenberg/pull/57927))
+-   DEWP: Fix script module import field. ([58770](https://github.com/WordPress/gutenberg/pull/58770))
+-   Introduce a Props Bot workflow. ([58576](https://github.com/WordPress/gutenberg/pull/58576))
+-   More refinements to Props Bot run conditions. ([58617](https://github.com/WordPress/gutenberg/pull/58617))
+-   Refine when Props Bot runs. ([58616](https://github.com/WordPress/gutenberg/pull/58616))
+-   Remove noahtallen from .wp-env codeowners. ([58283](https://github.com/WordPress/gutenberg/pull/58283))
+-   Scripts: Add viewScriptModule block.json support. ([58203](https://github.com/WordPress/gutenberg/pull/58203))
+
+#### Testing
+
+-   "Multiple use" block validation logic improvement [with Playwright]. ([57576](https://github.com/WordPress/gutenberg/pull/57576))
+-   Block Bindings: Add block bindings end-to-end tests. ([58550](https://github.com/WordPress/gutenberg/pull/58550))
+-   Block Bindings: Add tests for the frontend and polish the existing ones. ([58676](https://github.com/WordPress/gutenberg/pull/58676))
+-   Block Bindings: Improve the code of the block bindings tests. ([58785](https://github.com/WordPress/gutenberg/pull/58785))
+-   Button: Add focusable disabled variant to vizreg Storybook. ([58634](https://github.com/WordPress/gutenberg/pull/58634))
+-   CustomSelect: Add tests for new features. ([58583](https://github.com/WordPress/gutenberg/pull/58583))
+-   Fix flaky test of data-wp-on-window directive. ([58642](https://github.com/WordPress/gutenberg/pull/58642))
+-   Flaky Test: Fix "directives inside islands should not be hydrated twice". ([58516](https://github.com/WordPress/gutenberg/pull/58516))
+-   Interactivity API: Fix flaky test in `data-wp-on-document`. ([58668](https://github.com/WordPress/gutenberg/pull/58668))
+-   Migrate remaining 'inserting blocks' end-to-end tests to Playwright. ([58108](https://github.com/WordPress/gutenberg/pull/58108))
+-   Migrate remaining 'pattern block' end-to-end tests to Playwright. ([58486](https://github.com/WordPress/gutenberg/pull/58486))
+-   SearchControl: Add unit tests. ([58693](https://github.com/WordPress/gutenberg/pull/58693))
+-   Try fixing flaky 'inserting blocks' end-to-end tests. ([58848](https://github.com/WordPress/gutenberg/pull/58848))
+-   Try fixing flaky Paragraph block end-to-end test. ([58208](https://github.com/WordPress/gutenberg/pull/58208))
+-   Use toBeDisabled instead of aria-disabled check. ([58694](https://github.com/WordPress/gutenberg/pull/58694))
+-   e2e: Add a test to confirm that the focus moves from the post title to the paragraph using the enter key. ([58872](https://github.com/WordPress/gutenberg/pull/58872))
+-   end-to-end Utils: Ensure deleteAllUsers does not delete current user. ([58320](https://github.com/WordPress/gutenberg/pull/58320))
+
+#### Build Tooling
+
+-   Add missing Interactivity API label to changelog script. ([58879](https://github.com/WordPress/gutenberg/pull/58879))
+-   Enable dynamic import transform for React Native tests. ([58546](https://github.com/WordPress/gutenberg/pull/58546))
+-   Fix: Remove mention of weekly meeting from first-time contributor PR label. ([58547](https://github.com/WordPress/gutenberg/pull/58547))
+-   Interactivity API: Move Core implementation to compat 6.5 folder. ([58829](https://github.com/WordPress/gutenberg/pull/58829))
+-   Remove phpunit tests for features backported to Core. ([58776](https://github.com/WordPress/gutenberg/pull/58776))
+-   Update Performance tests base branch. ([58890](https://github.com/WordPress/gutenberg/pull/58890))
+-   Workflows: Add 'Technical Prototype' to the type-related labels list. ([58163](https://github.com/WordPress/gutenberg/pull/58163))
+
+### Security
+
+#### Font Library
+
+-   Sanitize font collection data. ([58636](https://github.com/WordPress/gutenberg/pull/58636))
+
+#### REST API
+
+-   Font Library REST API: Sanitize font family and font face settings. ([58590](https://github.com/WordPress/gutenberg/pull/58590))
+
+### Various
+
+-   Script loader 6.4 compat: Check for init hook completion. ([58406](https://github.com/WordPress/gutenberg/pull/58406))
+
+#### Font Library
+
+-   Code style and code quality feedback from core 6.5 review. ([58736](https://github.com/WordPress/gutenberg/pull/58736))
+-   Move getAllowedMimeTypes to FontUtils. ([58667](https://github.com/WordPress/gutenberg/pull/58667))
+-   Refactor as a singleton. ([58669](https://github.com/WordPress/gutenberg/pull/58669))
+
+#### Components
+
+-   Removing Reakit `Composite` implementation. ([58620](https://github.com/WordPress/gutenberg/pull/58620))
+-   Removing Reakit as a dependency. ([58631](https://github.com/WordPress/gutenberg/pull/58631))
+-   Update the Snackbar warning message. ([58591](https://github.com/WordPress/gutenberg/pull/58591))
+
+#### Global Styles
+
+-   Always output core block global styles after base global styles. ([58761](https://github.com/WordPress/gutenberg/pull/58761))
+-   Backport theme.json tests from Core. ([58476](https://github.com/WordPress/gutenberg/pull/58476))
+
+#### Block Library
+
+-   Reduce label and fix capitalization for image block upload label. ([58677](https://github.com/WordPress/gutenberg/pull/58677))
+-   Separator: Remove border-bottom property. ([55725](https://github.com/WordPress/gutenberg/pull/55725))
+
+#### Patterns
+
+-   Update pattern copy to Synced instead of Fully Synced. ([58876](https://github.com/WordPress/gutenberg/pull/58876))
+
+#### Block API
+
+-   ViewScriptModule: 6.5 compatibility changes. ([58832](https://github.com/WordPress/gutenberg/pull/58832))
+
+#### Custom Fields
+
+-   Block Bindings: Backport block bindings refactor from WordPress core. ([58683](https://github.com/WordPress/gutenberg/pull/58683))
+
+#### Inspector Controls
+
+-   Change cover block's "Media settings" label to "Settings". ([58463](https://github.com/WordPress/gutenberg/pull/58463))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @at-benni: Update versions-in-wordpress.md. ([58545](https://github.com/WordPress/gutenberg/pull/58545))
+-   @krupal-panchal: Removed extra parenthesis from document. ([58662](https://github.com/WordPress/gutenberg/pull/58662))
+-   @shreyash3087: fix: InnerBlocks schema description in block.json. ([58649](https://github.com/WordPress/gutenberg/pull/58649))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @ajlende @andrewhayward @andrewserong @annezazu @anton-vlasenko @antonis @aristath @artemiomorales @at-benni @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @creativecoder @DAreRodz @dcalhoun @dd32 @derekblank @desrosj @draganescu @ellatrix @fabiankaegy @fai-sal @fluiddot @gaambo @getdave @glendaviesnz @hellofromtonya @ironprogrammer @jameskoster @jasmussen @jeherve @jeryj @jorgefilipecosta @jsnajdr @kevin940726 @krupal-panchal @luisherranz @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @mikachan @mirka @ndiego @noahtallen @noisysocks @ntsekouras @oandregal @ockham @pbking @ramonjd @retrofox @richtabor @SantosGuillamot @scruffian @shreyash3087 @sirreal @t-hamano @talldan @tellthemachines @tjcafferkey @tomjn @tyxla @vcanales @westonruter @WunderBart @youknowriad
+
+= 17.6.5 =
+
+## Changelog
+
+### Bug Fixes
+
+#### Script Modules API
+
+-   Import Maps: Only emit CDATA wrappers for inline scripts for JavaScript. ([58859](https://github.com/WordPress/gutenberg/pull/58859))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@c4rl0sbr4v0
+
+= 17.6.4 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Compatibility with WordPress trunk: Do not register font collections if already registered by Core.
+
+= 17.6.3 =
+
+## Changelog
+
+### Bug Fixes
+
+#### Block Editor
+
+-   Navigation: Update the fallback block list to avoid a PHP Warning ([58588](https://github.com/WordPress/gutenberg/pull/58588))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@dd32
+
+= 17.6.2 =
+
+## Changelog
+
+### Bug Fixes
+
+#### Block Editor
+
+-   Writing flow: Maintain correct selection after drag-selecting outside block. ([58684](https://github.com/WordPress/gutenberg/pull/58684))
+-   useOnBlockDrop: Fix TypeError via array coercion. ([58686](https://github.com/WordPress/gutenberg/pull/58686))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@ellatrix @mcsf
+
+= 17.6.1 =
+
+## Changelog
+
+### Font Library
+
+-   Make the API compatible with the upcoming Core patch. ([58671](https://github.com/WordPress/gutenberg/pull/58671))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@youknowriad
+
+= 17.6.0 =
+
+## Changelog
+
+### Features
+
+#### Interactivity API
+
+-   Add `wp-data-on-window` and `wp-data-on-document` directives. ([57931](https://github.com/WordPress/gutenberg/pull/57931))
+-   Add `wp-each` directive. ([57859](https://github.com/WordPress/gutenberg/pull/57859))
+-   Add `wp-run` directive and `useInit` & `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
+-   Create `@wordpress/interactivity-router` module. ([57924](https://github.com/WordPress/gutenberg/pull/57924))
+
+#### Typography
+
+-   Add defaultFontSizes option to theme.json. ([56661](https://github.com/WordPress/gutenberg/pull/56661))
+
+#### Font Library
+
+-   Font Library: Add wp_get_font_dir() function. ([57730](https://github.com/WordPress/gutenberg/pull/57730))
+
+#### Custom Fields
+
+-   Block Bindings: Disable editing of bound block attributes in editor UI. ([58085](https://github.com/WordPress/gutenberg/pull/58085))
+
+#### Block Editor
+
+-   Add effects/box shadow tools to block inspector. ([57654](https://github.com/WordPress/gutenberg/pull/57654))
+
+### Enhancements
+
+#### Components
+
+-   Add opt-in prop for 40px default size for `BoxControl`, `BorderControl`, and `BorderBoxControl`. ([56185](https://github.com/WordPress/gutenberg/pull/56185))
+-   BorderControl: Replace style picker with ToggleGroupControl. ([57562](https://github.com/WordPress/gutenberg/pull/57562))
+-   ColorPicker: Store internal HSLA state for better slider UX. ([57555](https://github.com/WordPress/gutenberg/pull/57555))
+-   Migrate PaletteEdit and CircularOptionPicker tests from user-event to ariakit/test. ([57809](https://github.com/WordPress/gutenberg/pull/57809))
+-   Replace `TabPanel` with `Tabs` in the Editor Preferences Modal. ([57293](https://github.com/WordPress/gutenberg/pull/57293))
+-   Theme: Set `color` on wrapper. ([58095](https://github.com/WordPress/gutenberg/pull/58095))
+-   Tooltip: No-op when nested inside another Tooltip component. ([57202](https://github.com/WordPress/gutenberg/pull/57202))
+-   `BoxControl`: Update design. ([56665](https://github.com/WordPress/gutenberg/pull/56665))
+-   Element: Start reexporting PureComponent. ([58076](https://github.com/WordPress/gutenberg/pull/58076))
+
+#### Interactivity API
+
+-   Render the root interactive blocks. ([57729](https://github.com/WordPress/gutenberg/pull/57729))
+-   Interactivity Router: Replace `data-wp-navigation-id` with `data-wp-router-region`. ([58191](https://github.com/WordPress/gutenberg/pull/58191))
+-   Interactivity: Export `withScope()` and allow to use it with asynchronous operations. ([58013](https://github.com/WordPress/gutenberg/pull/58013))
+-   Prevent the use of components in `wp-text`. ([57879](https://github.com/WordPress/gutenberg/pull/57879))
+-   Remove wp-data-navigation-link directive. ([57853](https://github.com/WordPress/gutenberg/pull/57853))
+-   Server Directive Processing Refactor. ([58066](https://github.com/WordPress/gutenberg/pull/58066))
+-   Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([57891](https://github.com/WordPress/gutenberg/pull/57891))
+
+#### Block Editor
+
+-   Add copy link button to Link UI. ([58170](https://github.com/WordPress/gutenberg/pull/58170))
+-   Improve LinkControl preview. ([57775](https://github.com/WordPress/gutenberg/pull/57775))
+-   Keep Link UI open upon initial link creation when used in RichText. ([57726](https://github.com/WordPress/gutenberg/pull/57726))
+-   List View: Displace list view items when dragging (a bit more WYSIWYG). ([56625](https://github.com/WordPress/gutenberg/pull/56625))
+-   Show initial suggestions in rich text Link UI. ([57743](https://github.com/WordPress/gutenberg/pull/57743))
+-   Disable lock button if user cannot control lock state. ([57274](https://github.com/WordPress/gutenberg/pull/57274))
+-   Use ClipboardJS latest version and clean up focus loss workaround. ([57156](https://github.com/WordPress/gutenberg/pull/57156))
+-   Dimensions: Add Aspect Ratio block support. ([56897](https://github.com/WordPress/gutenberg/pull/56897))
+
+#### Block Library
+
+-   Add more taxonomy options to the post navigation link. ([48912](https://github.com/WordPress/gutenberg/pull/48912))
+-   Add: Footnotes support for other CPT's. ([57353](https://github.com/WordPress/gutenberg/pull/57353))
+-   Better navigation link variations for post types / taxonomies. ([56100](https://github.com/WordPress/gutenberg/pull/56100))
+-   Remove "blocks" from copy and delete labels. ([57769](https://github.com/WordPress/gutenberg/pull/57769))
+-   Pullquote Block: Add padding and margin support. ([45731](https://github.com/WordPress/gutenberg/pull/45731))
+-   Video Block: Add raw transformation from `video` html. ([47159](https://github.com/WordPress/gutenberg/pull/47159))
+-   Aspect ratio: Remove support on the Group block for now. ([58414](https://github.com/WordPress/gutenberg/pull/58414))
+-   Image block: Move UI for lightbox from sidebar to the content toolbar alongside link settings. ([57608](https://github.com/WordPress/gutenberg/pull/57608))
+
+#### Data Views
+
+-   DataViews: Enable grid layout for templates & parts by default. ([58137](https://github.com/WordPress/gutenberg/pull/58137))
+-   DataViews: Make dataviews powered page patterns stable. ([58139](https://github.com/WordPress/gutenberg/pull/58139))
+-   DataViews: Make the "Manage Pages" stable. ([58166](https://github.com/WordPress/gutenberg/pull/58166))
+-   Dataviews: Add Bulk actions to page. ([57826](https://github.com/WordPress/gutenberg/pull/57826))
+
+#### Site Editor
+
+-   Group templates in sidebar list. ([57711](https://github.com/WordPress/gutenberg/pull/57711))
+-   Initial routing refactoring to separate preview from list view. ([57938](https://github.com/WordPress/gutenberg/pull/57938))
+-   Iterate on warning text for block removal for query/post template/post content. ([58138](https://github.com/WordPress/gutenberg/pull/58138))
+-   Site editor: Add global styles changes to save flow. ([57470](https://github.com/WordPress/gutenberg/pull/57470))
+-   Editor: Unify the Editor Mode preference. ([57642](https://github.com/WordPress/gutenberg/pull/57642))
+-   Live Preview: Show the current theme name on the theme activation modal. ([57588](https://github.com/WordPress/gutenberg/pull/57588))
+-   Unify the preferences modal UI between post and site editor. ([57639](https://github.com/WordPress/gutenberg/pull/57639))
+-   Remove right negative margin from pinned items. ([57666](https://github.com/WordPress/gutenberg/pull/57666))
+-   Update style revision top toolbar text. ([58057](https://github.com/WordPress/gutenberg/pull/58057))
+
+#### Block API
+
+-   Block Bindings: Update source registration syntax and remove APIs that should be private. ([58205](https://github.com/WordPress/gutenberg/pull/58205))
+-   Block Hooks: Do not remove toggle if hooked block is present elsewhere. ([57928](https://github.com/WordPress/gutenberg/pull/57928))
+
+#### Synced Patterns
+
+-   Add basic pattern overrides end-to-end tests. ([57792](https://github.com/WordPress/gutenberg/pull/57792))
+-   Use a patch format and support `linkTarget` of `core/button` for Pattern Overrides. ([58165](https://github.com/WordPress/gutenberg/pull/58165))
+
+#### Patterns
+
+-   Add image block support for pattern overrides. ([57909](https://github.com/WordPress/gutenberg/pull/57909))
+-   Outline editable blocks that are within a content-locked container. ([57901](https://github.com/WordPress/gutenberg/pull/57901))
+-   Change text on pattern reset button. ([58286](https://github.com/WordPress/gutenberg/pull/58286))
+
+#### Post Editor
+
+-   Post Lock: Use the new modal size preset. ([58197](https://github.com/WordPress/gutenberg/pull/58197))
+-   Add description to the save panel header when nothing is checked. ([57716](https://github.com/WordPress/gutenberg/pull/57716))
+
+#### Font Library
+
+-   Update the default collection data URL to the wordpress.org cdn. ([58186](https://github.com/WordPress/gutenberg/pull/58186))
+-   Font Library: Refactor stylesheet using CSS variables ([58237](https://github.com/WordPress/gutenberg/pull/58237))
+-   Font Library Modal: Reset the selected font when installing a new font. ([57817](https://github.com/WordPress/gutenberg/pull/57817))
+-   Font Library: Disable font library UI using a PHP filter. ([57818](https://github.com/WordPress/gutenberg/pull/57818))
+-   Font Library: Filter fonts upload directory. ([57697](https://github.com/WordPress/gutenberg/pull/57697))
+-   Font Library: Use data or src file to define font collection data. ([57734](https://github.com/WordPress/gutenberg/pull/57734))
+-   Improve font collection rest controller. ([58222](https://github.com/WordPress/gutenberg/pull/58222))
+-   Make notices more consistent. ([58180](https://github.com/WordPress/gutenberg/pull/58180))
+-   Updates Font Families and Font Faces endpoints context param. ([58287](https://github.com/WordPress/gutenberg/pull/58287))
+
+#### Commands
+
+-   Minor command tweaks. ([58148](https://github.com/WordPress/gutenberg/pull/58148))
+
+#### Extensibility
+
+-   Update Navigation block to render hooked inner blocks. ([57754](https://github.com/WordPress/gutenberg/pull/57754))
+-   Add gettext content when translating 'Header'. ([51066](https://github.com/WordPress/gutenberg/pull/51066))
+
+#### Template Editor
+
+-   Remove `template-only` mode from editor and edit-post packages. ([57700](https://github.com/WordPress/gutenberg/pull/57700))
+
+### New APIs
+
+#### Block API
+
+-   Block Bindings API: Add block bindings PHP registration mechanisms and "Post meta" source under the experimental flag. ([57249](https://github.com/WordPress/gutenberg/pull/57249))
+-   Block Bindings API: Refactor logic into Block Bindings class and singleton pattern. ([57742](https://github.com/WordPress/gutenberg/pull/57742))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Avatar block: Fix broken aligments in the editor. ([58114](https://github.com/WordPress/gutenberg/pull/58114))
+-   Embed Block: Fix retry processing when embedding with trailing slash fails. ([58007](https://github.com/WordPress/gutenberg/pull/58007))
+-   Lightbox: Fix "Expand on click" control being disabled unintentionally. ([56053](https://github.com/WordPress/gutenberg/pull/56053))
+-   Modified Date Block: Don't render change date tool. ([57914](https://github.com/WordPress/gutenberg/pull/57914))
+-   Only prioritise Quote transform where relevant. ([57749](https://github.com/WordPress/gutenberg/pull/57749))
+-   Query Loop: Fix posts list variation detection. ([58194](https://github.com/WordPress/gutenberg/pull/58194))
+-   Block Hooks API: Update Navigation block feature gate. ([58388](https://github.com/WordPress/gutenberg/pull/58388))
+
+#### Components
+
+-   Button: Always render the Tooltip component even when a tooltip should not be shown. ([56490](https://github.com/WordPress/gutenberg/pull/56490))
+-   CustomSelect: Adjust `renderSelectedValue` to fix sizing. ([57865](https://github.com/WordPress/gutenberg/pull/57865))
+-   ToggleGroupControl: Improve controlled value detection. ([57770](https://github.com/WordPress/gutenberg/pull/57770))
+-   Tooltip: Accept specific tooltip props. ([58125](https://github.com/WordPress/gutenberg/pull/58125))
+-   Tooltip: Forward and merge inner tooltip props correctly. ([57878](https://github.com/WordPress/gutenberg/pull/57878))
+-   Bring back the chevron. ([57807](https://github.com/WordPress/gutenberg/pull/57807))
+-   Preferences: Add a proxy to retrieve the deprecated preferences with a deprecation message. ([58016](https://github.com/WordPress/gutenberg/pull/58016))
+
+#### Data Views
+
+-   DataViews: Default sort order in templates by title. ([58175](https://github.com/WordPress/gutenberg/pull/58175))
+-   DataViews: Don't always display horizontal scrollbar. ([58101](https://github.com/WordPress/gutenberg/pull/58101))
+-   DataViews: Fix author sorting in templates and template parts. ([58167](https://github.com/WordPress/gutenberg/pull/58167))
+-   Remove unused argument from sprintf in pagination.js. ([57823](https://github.com/WordPress/gutenberg/pull/57823))
+-   DataViews: Fix safari grid row height issue. ([58302](https://github.com/WordPress/gutenberg/pull/58302))
+-   DataViews: Fix table view cell wrapper and BlockPreviews. ([58062](https://github.com/WordPress/gutenberg/pull/58062))
+
+#### Patterns
+
+-   Add black border back when editing synced pattern in the post editor. ([57631](https://github.com/WordPress/gutenberg/pull/57631))
+-   Outline editable blocks when in a pattern that has locked children. ([57991](https://github.com/WordPress/gutenberg/pull/57991))
+-   Remove text align control for paragraph, heading, and button in contentOnly editing mode. ([57906](https://github.com/WordPress/gutenberg/pull/57906))
+-   Pattern Categories: Fix capitalization. ([58112](https://github.com/WordPress/gutenberg/pull/58112))
+-   Fix flaky "create a new pattern" test. ([57747](https://github.com/WordPress/gutenberg/pull/57747))
+-   Block Bindings: Fix bindings image placeholder showing in patterns overrides. ([58252](https://github.com/WordPress/gutenberg/pull/58252))
+
+#### List View
+
+-   Image Block: Make block name affect list view. ([57955](https://github.com/WordPress/gutenberg/pull/57955))
+-   More Block: Make block name affect list view. ([58160](https://github.com/WordPress/gutenberg/pull/58160))
+
+#### Block API
+
+-   Block Hooks: Fix toggle. ([57956](https://github.com/WordPress/gutenberg/pull/57956))
+-   Fix formats not working in block bindings content. ([58055](https://github.com/WordPress/gutenberg/pull/58055))
+
+#### Global Styles
+
+-   Correctly decode border color values. ([57876](https://github.com/WordPress/gutenberg/pull/57876))
+-   Fix: Theme.json application of custom root selector for styles. ([58050](https://github.com/WordPress/gutenberg/pull/58050))
+
+#### Data Layer
+
+-   Data: Allow binding registry selector to multiple registries. ([57943](https://github.com/WordPress/gutenberg/pull/57943))
+-   Data: Fix memoized createRegistrySelector. ([57888](https://github.com/WordPress/gutenberg/pull/57888))
+
+#### Typography
+
+-   #56734 When there is no font, the border should not appear. Display further guidance text. ([56825](https://github.com/WordPress/gutenberg/pull/56825))
+-   Fluid typography: Do not calculate fluid font size when min and max viewport widths are equal. ([57866](https://github.com/WordPress/gutenberg/pull/57866))
+
+#### Block Editor
+
+-   Fix regression: Content locking does not stops when an outside block is selected. ([57737](https://github.com/WordPress/gutenberg/pull/57737))
+-   LinkControl: Remove unnecessary right padding of input fields. ([57784](https://github.com/WordPress/gutenberg/pull/57784))
+
+#### Custom Fields
+
+-   Block Bindings: Fix button popover not showing in patterns. ([58219](https://github.com/WordPress/gutenberg/pull/58219))
+
+#### Font Library
+
+-   Fix typo. ([58193](https://github.com/WordPress/gutenberg/pull/58193))
+-   Removed <header> <main> and <footer> elements from Font Library Modal ([58221](https://github.com/WordPress/gutenberg/pull/58221))
+
+#### Synced Patterns
+
+-   Fix losing overrides after detaching patterns. ([58164](https://github.com/WordPress/gutenberg/pull/58164))
+
+#### Interactivity API
+
+-   Prevent `wp-data-on=""` from creating `onDefault` handlers. ([57925](https://github.com/WordPress/gutenberg/pull/57925))
+-   Prevent usage of `gutenberg_url` in block-library ([58242](https://github.com/WordPress/gutenberg/pull/58242))
+-   Interactivity API: Fix data-wp-on-document flaky test. ([58008](https://github.com/WordPress/gutenberg/pull/58008))
+-   Interactivity API: Fix flaky test on-window. ([58134](https://github.com/WordPress/gutenberg/pull/58134))
+-   Fix flaky test on-window, remove duplicate expect on-document. ([58181](https://github.com/WordPress/gutenberg/pull/58181))
+-   Interactivity: Fix broken react usage in published package. ([58258](https://github.com/WordPress/gutenberg/pull/58258))
+
+#### CSS & Styling
+
+-   Styles revisions: Remove body padding. ([57748](https://github.com/WordPress/gutenberg/pull/57748))
+
+#### Templates API
+
+-   Fix visual indication of switch to default template in the post editor. ([57718](https://github.com/WordPress/gutenberg/pull/57718))
+
+#### Site Editor
+
+-   (editor)(fix) Append the `edit-post-header-toolbar` class in NavigableToolbar for backward compatibility with plugin GUI injections. ([58154](https://github.com/WordPress/gutenberg/pull/58154))
+-   Fix site editor layout regressions. ([58077](https://github.com/WordPress/gutenberg/pull/58077))
+
+### Accessibility
+
+#### Site Editor
+
+-   Fix font variants count color contrast ratio and l10n. ([58117](https://github.com/WordPress/gutenberg/pull/58117))
+-   Make the site hub View Site link always visible. ([57423](https://github.com/WordPress/gutenberg/pull/57423))
+
+#### Block Editor
+
+-   Fix parent selector button focus style and metrics. ([57728](https://github.com/WordPress/gutenberg/pull/57728))
+-   Restore visual separator between mover buttons when show button label is on. ([57640](https://github.com/WordPress/gutenberg/pull/57640))
+
+#### Widgets Editor
+
+-   Fix Widgets page Undo and Redo accessibility and keyboard interaction. ([57677](https://github.com/WordPress/gutenberg/pull/57677))
+
+### Performance
+
+-   Add patterns load test. ([57828](https://github.com/WordPress/gutenberg/pull/57828))
+-   Block editor: Avoid list re-rendering on select. ([57188](https://github.com/WordPress/gutenberg/pull/57188))
+-   Block editor: Don't register shortcuts for preview editors. ([57984](https://github.com/WordPress/gutenberg/pull/57984))
+-   Block editor: Fix performance regression after #57950. ([57971](https://github.com/WordPress/gutenberg/pull/57971))
+-   Block editor: Use context for useBlockEditingMode. ([57950](https://github.com/WordPress/gutenberg/pull/57950))
+-   BlockSwitcher: Defer transform calculations until the Dropdown is open. ([57892](https://github.com/WordPress/gutenberg/pull/57892))
+-   Call variation through callback so it's only loaded when needed - in support of trac 59969. ([56952](https://github.com/WordPress/gutenberg/pull/56952))
+-   Editor styles: Cache transform. ([57810](https://github.com/WordPress/gutenberg/pull/57810))
+-   Footnotes: Combine format store subscription. ([58129](https://github.com/WordPress/gutenberg/pull/58129))
+-   Iframe: Calc compat styles once per page load. ([57798](https://github.com/WordPress/gutenberg/pull/57798))
+-   Measure typing with the top toolbar enabled. ([57709](https://github.com/WordPress/gutenberg/pull/57709))
+-   Meta boxes: Don't initialise if there are none. ([57182](https://github.com/WordPress/gutenberg/pull/57182))
+-   Patterns: Avoid fetching on load. ([57999](https://github.com/WordPress/gutenberg/pull/57999))
+-   Site editor: Avoid fetching themes on load. ([57985](https://github.com/WordPress/gutenberg/pull/57985))
+-   Site editor: Reduce artificial loading delay from 1s to 100ms. ([57953](https://github.com/WordPress/gutenberg/pull/57953))
+-   Site editor: Remove store subscription per block. ([57995](https://github.com/WordPress/gutenberg/pull/57995))
+-   Template Part & Query: Avoid server requests on mount. ([57987](https://github.com/WordPress/gutenberg/pull/57987))
+-   Template part block: Avoid parsing ALL patterns on mount. ([57856](https://github.com/WordPress/gutenberg/pull/57856))
+
+#### Block Editor
+
+-   Revert "Block editor: Avoid list re-rendering on select". ([58147](https://github.com/WordPress/gutenberg/pull/58147))
+
+#### Post Editor
+
+-   Editor: Use hooks instead of HoCs for `EditorNotices`. ([57772](https://github.com/WordPress/gutenberg/pull/57772))
+
+### Experiments
+
+#### Data Views
+
+-   Add: Bulk actions to dataviews with the new design. ([57255](https://github.com/WordPress/gutenberg/pull/57255))
+-   Data view list layout: Fix thumbnail dimensions. ([57774](https://github.com/WordPress/gutenberg/pull/57774))
+-   Data views table layout: Update cell vertical alignment. ([57804](https://github.com/WordPress/gutenberg/pull/57804))
+-   DataViews: Add description to pages. ([57793](https://github.com/WordPress/gutenberg/pull/57793))
+-   DataViews: Add front page to pages page sidebar. ([57759](https://github.com/WordPress/gutenberg/pull/57759))
+-   DataViews: Better management of `layout` param in templates. ([58116](https://github.com/WordPress/gutenberg/pull/58116))
+-   DataViews: Make list layout the default for templates with the experiment enabled. ([57933](https://github.com/WordPress/gutenberg/pull/57933))
+-   DataViews: Revert list view as default for pages. ([58081](https://github.com/WordPress/gutenberg/pull/58081))
+-   DataViews: Revert list view as default for templates. ([58079](https://github.com/WordPress/gutenberg/pull/58079))
+-   DataViews: Set primary field styles. ([57846](https://github.com/WordPress/gutenberg/pull/57846))
+-   DataViews: Show loading / no result message for the list layout. ([57764](https://github.com/WordPress/gutenberg/pull/57764))
+-   DataViews: Update template parts view. ([57952](https://github.com/WordPress/gutenberg/pull/57952))
+-   DataViews: Use button for patterns, pages and templates preview field. ([58071](https://github.com/WordPress/gutenberg/pull/58071))
+-   DataViews: Use table layout for templates when experiment disabled. ([57960](https://github.com/WordPress/gutenberg/pull/57960))
+-   Stabilise view options button icon. ([57964](https://github.com/WordPress/gutenberg/pull/57964))
+-   Update Grid layout design. ([57880](https://github.com/WordPress/gutenberg/pull/57880))
+-   Update Pages preview field display. ([57919](https://github.com/WordPress/gutenberg/pull/57919))
+-   Update Templates table layout. ([57930](https://github.com/WordPress/gutenberg/pull/57930))
+-   Update: Show template sources on templates Dataviews sidebar. ([58124](https://github.com/WordPress/gutenberg/pull/58124))
+
+#### Synced Patterns
+
+-   Add a control to reset pattern overrides. ([57845](https://github.com/WordPress/gutenberg/pull/57845))
+-   Allow heading and button in Pattern Overrides. ([57789](https://github.com/WordPress/gutenberg/pull/57789))
+
+#### Typography
+
+-   Download then upload font face assets when installing from a collection. ([57694](https://github.com/WordPress/gutenberg/pull/57694))
+-   Use `slug` instead of `id` for Font Collection. ([57735](https://github.com/WordPress/gutenberg/pull/57735))
+
+#### REST API
+
+-   Font Library Refactor. ([57688](https://github.com/WordPress/gutenberg/pull/57688))
+
+#### Block Editor
+
+-   Allow drag and drop to create Rows and Galleries. ([56186](https://github.com/WordPress/gutenberg/pull/56186))
+
+### Documentation
+
+-   Add a video demonstration to the Quick Start Guide. ([57834](https://github.com/WordPress/gutenberg/pull/57834))
+-   Button: Improve `disabled`-related prop descriptions. ([57864](https://github.com/WordPress/gutenberg/pull/57864))
+-   Components: Move CHANGELOG entries under the correct release. ([57885](https://github.com/WordPress/gutenberg/pull/57885))
+-   Docs: Fix typo in "The block wrapper" document. ([58106](https://github.com/WordPress/gutenberg/pull/58106))
+-   Docs: Use 'key' in 'editor.BlockEdit' filter code examples. ([58119](https://github.com/WordPress/gutenberg/pull/58119))
+-   Document files/directories requiring backmerging to WP Core for major release. ([58064](https://github.com/WordPress/gutenberg/pull/58064))
+-   Fix the iframe markup of the embed video in the Quick Start Guide. ([57857](https://github.com/WordPress/gutenberg/pull/57857))
+-   Fix: Link to the nodejs release page. ([57816](https://github.com/WordPress/gutenberg/pull/57816))
+-   Fix: Typo on BlockListBlock comments. ([57814](https://github.com/WordPress/gutenberg/pull/57814))
+-   Fix: Typos on \_\_unstableSetTemporarilyEditingAsBlocks documentation. ([57768](https://github.com/WordPress/gutenberg/pull/57768))
+-   Font Library: Add font collection JSON schema. ([57736](https://github.com/WordPress/gutenberg/pull/57736))
+-   Prefixes all php filters with wpdocs\_. ([53914](https://github.com/WordPress/gutenberg/pull/53914))
+-   Remove the unnecessary TOC and fix grammar/formatting in the Patterns doc. ([57825](https://github.com/WordPress/gutenberg/pull/57825))
+-   Remove the 👋 emoji from the Block Editor Handbook. ([58023](https://github.com/WordPress/gutenberg/pull/58023))
+-   Update versions-in-wordpress.md. ([57916](https://github.com/WordPress/gutenberg/pull/57916))
+-   [Type] Developer Documentation - Fix removeAllNotices dispatch on the removeAllNotices doc section of @wordpress/notices. ([57436](https://github.com/WordPress/gutenberg/pull/57436))
+
+### Code Quality
+
+#### Components
+
+-   PaletteEdit: Improve unit tests. ([57645](https://github.com/WordPress/gutenberg/pull/57645))
+-   Tooltip and Button: Tidy up unit tests. ([57975](https://github.com/WordPress/gutenberg/pull/57975))
+-   Tooltip: Add test for classname leakage. ([58182](https://github.com/WordPress/gutenberg/pull/58182))
+-   Remove unneeded `margin: 0` override for `Notice` component consumer. ([57794](https://github.com/WordPress/gutenberg/pull/57794))
+-   Shadows: Prevent empty style object when removing shadow. ([58155](https://github.com/WordPress/gutenberg/pull/58155))
+
+#### Block Editor
+
+-   Soft deprecate custom 'pure' HoC in favor of 'React.memo'. ([57173](https://github.com/WordPress/gutenberg/pull/57173))
+-   Stabilise RecursionProvider and useHasRecursion APIs. ([58120](https://github.com/WordPress/gutenberg/pull/58120))
+-   Tidy up block patterns selectors. ([57913](https://github.com/WordPress/gutenberg/pull/57913))
+-   Shadow: Remove additional wrapper around getShadowClassesAndStyles. ([58297](https://github.com/WordPress/gutenberg/pull/58297))
+
+#### Block Library
+
+-   Gallery Block: Remove duplicate return statement. ([57746](https://github.com/WordPress/gutenberg/pull/57746))
+-   Navigation: Move the renderer class to the main navigation file. ([57979](https://github.com/WordPress/gutenberg/pull/57979))
+-   Fix comments block. ([57820](https://github.com/WordPress/gutenberg/pull/57820))
+-   Rename \_\_experimentalGetGlobalBlocksByName to getBlocksByName. ([58156](https://github.com/WordPress/gutenberg/pull/58156))
+-   Block Hooks API: Remove $post check from Navigation hooked blocks meta fn. ([58379](https://github.com/WordPress/gutenberg/pull/58379))
+-   Post navigation link: Coding standard fixes. ([58380](https://github.com/WordPress/gutenberg/pull/58380))
+-   Update docblock for render_block_core_pattern. ([58382](https://github.com/WordPress/gutenberg/pull/58382))
+-   Block Hooks API: Update doc block for block_core_navigation_insert_hooked_blocks. ([58378](https://github.com/WordPress/gutenberg/pull/58378))
+
+#### Font Library
+
+-   Remove WP_Font_Family class that is no longer used. ([58184](https://github.com/WordPress/gutenberg/pull/58184))
+-   Font Library: Remove 'version' property from font collection schema. ([58025](https://github.com/WordPress/gutenberg/pull/58025))
+-   [Fonts API] removing files and files loading no longer needed. ([57972](https://github.com/WordPress/gutenberg/pull/57972))
+-   Remove unused utilities and rename class. ([58342](https://github.com/WordPress/gutenberg/pull/58342))
+-   Rename the slug of the google fonts collection from 'default-font-collection' to 'google-fonts'. ([58331](https://github.com/WordPress/gutenberg/pull/58331))
+-   Refactored download/upload logic to support font faces with multiple src assets. ([58216](https://github.com/WordPress/gutenberg/pull/58216))
+-   Font Library: Addresses additional REST API feedback. ([58333](https://github.com/WordPress/gutenberg/pull/58333))
+
+#### Block Directory
+
+-   DownloadableBlocksPanel: Remove withSelect in favor of useSelect. ([58109](https://github.com/WordPress/gutenberg/pull/58109))
+
+#### Patterns
+
+-   Stabilize the pattern overrides block context. ([58102](https://github.com/WordPress/gutenberg/pull/58102))
+-   Remove pattern override experiment completely. ([58105](https://github.com/WordPress/gutenberg/pull/58105))
+-   Update pattern overrides to use a hard coded support array. ([57912](https://github.com/WordPress/gutenberg/pull/57912))
+-   Block Bindings: Change `core/pattern-attributes` source for `core/pattern-overrides`. ([58434](https://github.com/WordPress/gutenberg/pull/58434))
+
+#### Block API
+
+-   Block Bindings: Remove the experimental flag. ([58089](https://github.com/WordPress/gutenberg/pull/58089))
+-   Block Renaming - move backported WP 6.5 code to 6.5 compat dir. ([58126](https://github.com/WordPress/gutenberg/pull/58126))
+
+#### Post Editor
+
+-   Editor: Use hooks instead of HoCs in 'PostScheduleCheck'. ([57833](https://github.com/WordPress/gutenberg/pull/57833))
+
+#### Script Modules API
+
+-   Update the code and move it to the compat/wordpress-6.5 folder. ([57778](https://github.com/WordPress/gutenberg/pull/57778))
+
+#### Data Views
+
+-   Remove obsolete check from dataviews modal actions title. ([57753](https://github.com/WordPress/gutenberg/pull/57753))
+
+#### Interactivity API
+
+-   Remove `data-wp-slot` and `data-wp-fill`. ([57854](https://github.com/WordPress/gutenberg/pull/57854))
+-   Remove unused `state` and rename `props` to `attributes` in `getElement()`. ([57974](https://github.com/WordPress/gutenberg/pull/57974))
+
+#### HTML API
+
+-   Backport updates from Core. ([57022](https://github.com/WordPress/gutenberg/pull/57022))
+
+#### Custom Fields
+
+-   Block Bindings: Simplify block bindings object. ([58337](https://github.com/WordPress/gutenberg/pull/58337))
+-   Block Bindings: Adapt block bindings to wordpress code latest changes. ([58383](https://github.com/WordPress/gutenberg/pull/58383))
+
+### Tools
+
+#### Testing
+
+-   Add `setGutenbergExperiments` to `requestUtils`. ([56663](https://github.com/WordPress/gutenberg/pull/56663))
+-   Add: End to end test to content locking stop editing as blocks behavior. ([57812](https://github.com/WordPress/gutenberg/pull/57812))
+-   Attempt to fix php unit tests (variations api change). ([58090](https://github.com/WordPress/gutenberg/pull/58090))
+-   Migrate 'block grouping' end-to-end tests to Playwright. ([57684](https://github.com/WordPress/gutenberg/pull/57684))
+-   Migrate 'embedding' end-to-end tests to Playwright. ([57969](https://github.com/WordPress/gutenberg/pull/57969))
+-   Migrate 'typewriter' end-to-end tests to Playwright. ([57673](https://github.com/WordPress/gutenberg/pull/57673))
+-   Remove unused Navigation block end-to-end test fixtures. ([57848](https://github.com/WordPress/gutenberg/pull/57848))
+
+#### Build Tooling
+
+-   Update caniuse-lite package. ([58087](https://github.com/WordPress/gutenberg/pull/58087))
+-   Update the cherry pick script to work with the new version of gh. ([57917](https://github.com/WordPress/gutenberg/pull/57917))
+-   Scripts: Remove unused variable in bin/list-experimental-api-matches.sh. ([57771](https://github.com/WordPress/gutenberg/pull/57771))
+-   (chore) Revert bump to the v17.5.1 (draft) due to bug in the release found by manual testing. ([58027](https://github.com/WordPress/gutenberg/pull/58027))
+-   Fix misplaced ReactRefreshWebpackPlugin. ([57777](https://github.com/WordPress/gutenberg/pull/57777))
+-   Automate creation of Issue for major release PHP synchronisation. ([57890](https://github.com/WordPress/gutenberg/pull/57890))
+-   Remove check-latest-npm validation. ([57797](https://github.com/WordPress/gutenberg/pull/57797))
+-   core-js: Only polyfill stable features. ([57674](https://github.com/WordPress/gutenberg/pull/57674))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @kt-12: Call variation through callback so it's only loaded when needed - in support of trac 59969. ([56952](https://github.com/WordPress/gutenberg/pull/56952))
+-   @leomuniz: [Type] Developer Documentation - Fix removeAllNotices dispatch on the removeAllNotices doc section of @wordpress/notices. ([57436](https://github.com/WordPress/gutenberg/pull/57436))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @ajlende @andrewserong @annezazu @artemiomorales @arthur791004 @atachibana @bacoords @bph @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @creativecoder @DAreRodz @dcalhoun @derekblank @dmsnell @draganescu @dsas @ecgan @ellatrix @fluiddot @fullofcaffeine @gaambo @geriux @getdave @glendaviesnz @gonzomir @inc2734 @jameskoster @jeryj @jffng @jorgefilipecosta @jsnajdr @kevin940726 @kt-12 @leomuniz @luisherranz @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @mcsf @michalczaplinski @mikachan @mirka @ndiego @noisysocks @ntsekouras @oandregal @ockham @oguzkocer @pbking @ramonjd @richtabor @SantosGuillamot @scruffian @SiobhyB @sirreal @swissspidy @t-hamano @talldan @tellthemachines @tjcafferkey @tyxla @vcanales @youknowriad
+
+= 17.5.3 =
+
+## Changelog
+
+### Bug Fixes
+
+#### Block Library
+
+-   Navigation: Update the navigaiton renderer class name so that it doesn't clash with the one backported to core. ([58429](https://github.com/WordPress/gutenberg/pull/58429))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@scruffian
+
+= 17.6.0-rc.2 =
+
+## Changelog
+
+### Enhancements
+
+#### Font Library
+
+-   Font Library: Refactor stylesheet using CSS variables ([#58237]https://github.com/WordPress/gutenberg/pull/58237)
+
+### Bug Fixes
+
+#### Interactivity API
+
+-   Prevent usage of `gutenberg_url` in block-library([#58242]https://github.com/WordPress/gutenberg/pull/58242)
+
+#### Font Library
+
+-   Removed <header> <main> and <footer> elements from Font Library Modal ([#58221]https://github.com/WordPress/gutenberg/pull/58221)
+
+### Experiments
+
+#### Design Tools
+
+-   Dimensions: Add Aspect Ratio block support. ([#56897](https://github.com/WordPress/gutenberg/pull/56897))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@andrewserong @t-hamano @luisherranz @pbking
+
+= 17.6.0-rc.1 =
+
+## Changelog
+
+### Features
+
+#### Interactivity API
+
+-   Add `wp-data-on-window` and `wp-data-on-document` directives. ([57931](https://github.com/WordPress/gutenberg/pull/57931))
+-   Add `wp-each` directive. ([57859](https://github.com/WordPress/gutenberg/pull/57859))
+-   Add `wp-run` directive and `useInit` & `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
+
+#### Typography
+
+-   Add defaultFontSizes option to theme.json. ([56661](https://github.com/WordPress/gutenberg/pull/56661))
+-   Font Library: Add wp_get_font_dir() function. ([57730](https://github.com/WordPress/gutenberg/pull/57730))
+
+#### Custom Fields
+
+-   Block Bindings: Disable editing of bound block attributes in editor UI. ([58085](https://github.com/WordPress/gutenberg/pull/58085))
+
+#### Block Editor
+
+-   Add effects/box shadow tools to block inspector. ([57654](https://github.com/WordPress/gutenberg/pull/57654))
+
+### Enhancements
+
+-   Add gettext content when translating 'Header'. ([51066](https://github.com/WordPress/gutenberg/pull/51066))
+-   Disable lock button if user cannot control lock state. ([57274](https://github.com/WordPress/gutenberg/pull/57274))
+-   Editor: Unify the Editor Mode preference. ([57642](https://github.com/WordPress/gutenberg/pull/57642))
+-   Element: Start reexporting PureComponent. ([58076](https://github.com/WordPress/gutenberg/pull/58076))
+-   Live Preview: Show the current theme name on the theme activation modal. ([57588](https://github.com/WordPress/gutenberg/pull/57588))
+-   Remove right negative margin from pinned items. ([57666](https://github.com/WordPress/gutenberg/pull/57666))
+-   Unify the preferences modal UI between post and site editor. ([57639](https://github.com/WordPress/gutenberg/pull/57639))
+-   Update style revision top toolbar text. ([58057](https://github.com/WordPress/gutenberg/pull/58057))
+-   Use ClipboardJS latest version and clean up focus loss workaround. ([57156](https://github.com/WordPress/gutenberg/pull/57156))
+
+#### Components
+
+-   Add opt-in prop for 40px default size for `BoxControl`, `BorderControl`, and `BorderBoxControl`. ([56185](https://github.com/WordPress/gutenberg/pull/56185))
+-   BorderControl: Replace style picker with ToggleGroupControl. ([57562](https://github.com/WordPress/gutenberg/pull/57562))
+-   ColorPicker: Store internal HSLA state for better slider UX. ([57555](https://github.com/WordPress/gutenberg/pull/57555))
+-   Migrate PaletteEdit and CircularOptionPicker tests from user-event to ariakit/test. ([57809](https://github.com/WordPress/gutenberg/pull/57809))
+-   Replace `TabPanel` with `Tabs` in the Editor Preferences Modal. ([57293](https://github.com/WordPress/gutenberg/pull/57293))
+-   Theme: Set `color` on wrapper. ([58095](https://github.com/WordPress/gutenberg/pull/58095))
+-   Tooltip: No-op when nested inside another Tooltip component. ([57202](https://github.com/WordPress/gutenberg/pull/57202))
+-   `BoxControl`: Update design. ([56665](https://github.com/WordPress/gutenberg/pull/56665))
+
+#### Interactivity API
+
+-   Render the root interactive blocks. ([57729](https://github.com/WordPress/gutenberg/pull/57729))
+-   Interactivity Router: Replace `data-wp-navigation-id` with `data-wp-router-region`. ([58191](https://github.com/WordPress/gutenberg/pull/58191))
+-   Interactivity: Export `withScope()` and allow to use it with asynchronous operations. ([58013](https://github.com/WordPress/gutenberg/pull/58013))
+-   Prevent the use of components in `wp-text`. ([57879](https://github.com/WordPress/gutenberg/pull/57879))
+-   Remove wp-data-navigation-link directive. ([57853](https://github.com/WordPress/gutenberg/pull/57853))
+-   Server Directive Processing Refactor. ([58066](https://github.com/WordPress/gutenberg/pull/58066))
+-   Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([57891](https://github.com/WordPress/gutenberg/pull/57891))
+
+#### Block Editor
+
+-   Add copy link button to Link UI. ([58170](https://github.com/WordPress/gutenberg/pull/58170))
+-   Improve LinkControl preview. ([57775](https://github.com/WordPress/gutenberg/pull/57775))
+-   Keep Link UI open upon initial link creation when used in RichText. ([57726](https://github.com/WordPress/gutenberg/pull/57726))
+-   List View: Displace list view items when dragging (a bit more WYSIWYG). ([56625](https://github.com/WordPress/gutenberg/pull/56625))
+-   Show initial suggestions in rich text Link UI. ([57743](https://github.com/WordPress/gutenberg/pull/57743))
+
+#### Typography
+
+-   Font Library Modal: Reset the selected font when installing a new font. ([57817](https://github.com/WordPress/gutenberg/pull/57817))
+-   Font Library: Disable font library UI using a PHP filter. ([57818](https://github.com/WordPress/gutenberg/pull/57818))
+-   Font Library: Filter fonts upload directory. ([57697](https://github.com/WordPress/gutenberg/pull/57697))
+-   Font Library: Use data or src file to define font collection data. ([57734](https://github.com/WordPress/gutenberg/pull/57734))
+
+#### Block Library
+
+-   Add more taxonomy options to the post navigation link. ([48912](https://github.com/WordPress/gutenberg/pull/48912))
+-   Add: Footnotes support for other CPT's. ([57353](https://github.com/WordPress/gutenberg/pull/57353))
+-   Better navigation link variations for post types / taxonomies. ([56100](https://github.com/WordPress/gutenberg/pull/56100))
+-   Remove "blocks" from copy and delete labels. ([57769](https://github.com/WordPress/gutenberg/pull/57769))
+
+#### Data Views
+
+-   DataViews: Enable grid layout for templates & parts by default. ([58137](https://github.com/WordPress/gutenberg/pull/58137))
+-   DataViews: Make dataviews powered page patterns stable. ([58139](https://github.com/WordPress/gutenberg/pull/58139))
+-   DataViews: Make the "Manage Pages" stable. ([58166](https://github.com/WordPress/gutenberg/pull/58166))
+
+#### Site Editor
+
+-   Group templates in sidebar list. ([57711](https://github.com/WordPress/gutenberg/pull/57711))
+-   Initial routing refactoring to separate preview from list view. ([57938](https://github.com/WordPress/gutenberg/pull/57938))
+-   Iterate on warning text for block removal for query/post template/post content. ([58138](https://github.com/WordPress/gutenberg/pull/58138))
+
+#### Block API
+
+-   Block Bindings: Update source registration syntax and remove APIs that should be private. ([58205](https://github.com/WordPress/gutenberg/pull/58205))
+-   Block Hooks: Do not remove toggle if hooked block is present elsewhere. ([57928](https://github.com/WordPress/gutenberg/pull/57928))
+
+#### Synced Patterns
+
+-   Add basic pattern overrides end-to-end tests. ([57792](https://github.com/WordPress/gutenberg/pull/57792))
+-   Use a patch format and support `linkTarget` of `core/button` for Pattern Overrides. ([58165](https://github.com/WordPress/gutenberg/pull/58165))
+
+#### Patterns
+
+-   Add image block support for pattern overrides. ([57909](https://github.com/WordPress/gutenberg/pull/57909))
+-   Outline editable blocks that are within a content-locked container. ([57901](https://github.com/WordPress/gutenberg/pull/57901))
+
+#### Post Editor
+
+-   Post Lock: Use the new modal size preset. ([58197](https://github.com/WordPress/gutenberg/pull/58197))
+
+#### Font Library
+
+-   Update the default collection data URL to the wordpress.org cdn. ([58186](https://github.com/WordPress/gutenberg/pull/58186))
+
+#### Commands
+
+-   Minor command tweaks. ([58148](https://github.com/WordPress/gutenberg/pull/58148))
+
+#### Extensibility
+
+-   Update Navigation block to render hooked inner blocks. ([57754](https://github.com/WordPress/gutenberg/pull/57754))
+
+#### Global Styles
+
+-   Site editor: Add global styles changes to save flow. ([57470](https://github.com/WordPress/gutenberg/pull/57470))
+
+#### Design Tools
+
+-   Pullquote Block: Add padding and margin support. ([45731](https://github.com/WordPress/gutenberg/pull/45731))
+
+### New APIs
+
+#### Block API
+
+-   Block Bindings API: Add block bindings PHP registration mechanisms and "Post meta" source under the experimental flag. ([57249](https://github.com/WordPress/gutenberg/pull/57249))
+-   Block Bindings API: Refactor logic into Block Bindings class and singleton pattern. ([57742](https://github.com/WordPress/gutenberg/pull/57742))
+
+### Bug Fixes
+
+-   (editor)(fix) Append the `edit-post-header-toolbar` class in NavigableToolbar for backward compatibility with plugin GUI injections. ([58154](https://github.com/WordPress/gutenberg/pull/58154))
+-   Bring back the chevron. ([57807](https://github.com/WordPress/gutenberg/pull/57807))
+-   Fix flaky "create a new pattern" test. ([57747](https://github.com/WordPress/gutenberg/pull/57747))
+-   Fix site editor layout regressions. ([58077](https://github.com/WordPress/gutenberg/pull/58077))
+-   Preferences: Add a proxy to retrieve the deprecated preferences with a deprecation message. ([58016](https://github.com/WordPress/gutenberg/pull/58016))
+-   Remove unused argument from sprintf in pagination.js. ([57823](https://github.com/WordPress/gutenberg/pull/57823))
+-   core-js: Only polyfill stable features. ([57674](https://github.com/WordPress/gutenberg/pull/57674))
+
+#### Block Library
+
+-   Avatar block: Fix broken aligments in the editor. ([58114](https://github.com/WordPress/gutenberg/pull/58114))
+-   Embed Block: Fix retry processing when embedding with trailing slash fails. ([58007](https://github.com/WordPress/gutenberg/pull/58007))
+-   Lightbox: Fix "Expand on click" control being disabled unintentionally. ([56053](https://github.com/WordPress/gutenberg/pull/56053))
+-   Modified Date Block: Don't render change date tool. ([57914](https://github.com/WordPress/gutenberg/pull/57914))
+-   Only prioritise Quote transform where relevant. ([57749](https://github.com/WordPress/gutenberg/pull/57749))
+-   Query Loop: Fix posts list variation detection. ([58194](https://github.com/WordPress/gutenberg/pull/58194))
+
+#### Components
+
+-   Button: Always render the Tooltip component even when a tooltip should not be shown. ([56490](https://github.com/WordPress/gutenberg/pull/56490))
+-   CustomSelect: Adjust `renderSelectedValue` to fix sizing. ([57865](https://github.com/WordPress/gutenberg/pull/57865))
+-   ToggleGroupControl: Improve controlled value detection. ([57770](https://github.com/WordPress/gutenberg/pull/57770))
+-   Tooltip: Accept specific tooltip props. ([58125](https://github.com/WordPress/gutenberg/pull/58125))
+-   Tooltip: Forward and merge inner tooltip props correctly. ([57878](https://github.com/WordPress/gutenberg/pull/57878))
+
+#### Data Views
+
+-   DataViews: Default sort order in templates by title. ([58175](https://github.com/WordPress/gutenberg/pull/58175))
+-   DataViews: Don't always display horizontal scrollbar. ([58101](https://github.com/WordPress/gutenberg/pull/58101))
+-   DataViews: Fix author sorting in templates and template parts. ([58167](https://github.com/WordPress/gutenberg/pull/58167))
+
+#### Patterns
+
+-   Add black border back when editing synced pattern in the post editor. ([57631](https://github.com/WordPress/gutenberg/pull/57631))
+-   Outline editable blocks when in a pattern that has locked children. ([57991](https://github.com/WordPress/gutenberg/pull/57991))
+-   Remove text align control for paragraph, heading, and button in contentOnly editing mode. ([57906](https://github.com/WordPress/gutenberg/pull/57906))
+
+#### List View
+
+-   Image Block: Make block name affect list view. ([57955](https://github.com/WordPress/gutenberg/pull/57955))
+-   More Block: Make block name affect list view. ([58160](https://github.com/WordPress/gutenberg/pull/58160))
+
+#### Block API
+
+-   Block Hooks: Fix toggle. ([57956](https://github.com/WordPress/gutenberg/pull/57956))
+-   Fix formats not working in block bindings content. ([58055](https://github.com/WordPress/gutenberg/pull/58055))
+
+#### Global Styles
+
+-   Correctly decode border color values. ([57876](https://github.com/WordPress/gutenberg/pull/57876))
+-   Fix: Theme.json application of custom root selector for styles. ([58050](https://github.com/WordPress/gutenberg/pull/58050))
+
+#### Data Layer
+
+-   Data: Allow binding registry selector to multiple registries. ([57943](https://github.com/WordPress/gutenberg/pull/57943))
+-   Data: Fix memoized createRegistrySelector. ([57888](https://github.com/WordPress/gutenberg/pull/57888))
+
+#### Typography
+
+-   #56734 When there is no font, the border should not appear. Display further guidance text. ([56825](https://github.com/WordPress/gutenberg/pull/56825))
+-   Fluid typography: Do not calculate fluid font size when min and max viewport widths are equal. ([57866](https://github.com/WordPress/gutenberg/pull/57866))
+
+#### Block Editor
+
+-   Fix regression: Content locking does not stops when an outside block is selected. ([57737](https://github.com/WordPress/gutenberg/pull/57737))
+-   LinkControl: Remove unnecessary right padding of input fields. ([57784](https://github.com/WordPress/gutenberg/pull/57784))
+
+#### Custom Fields
+
+-   Block Bindings: Fix button popover not showing in patterns. ([58219](https://github.com/WordPress/gutenberg/pull/58219))
+
+#### Font Library
+
+-   Fix typo. ([58193](https://github.com/WordPress/gutenberg/pull/58193))
+
+#### Synced Patterns
+
+-   Fix losing overrides after detaching patterns. ([58164](https://github.com/WordPress/gutenberg/pull/58164))
+
+#### Interactivity API
+
+-   Prevent `wp-data-on=""` from creating `onDefault` handlers. ([57925](https://github.com/WordPress/gutenberg/pull/57925))
+
+#### CSS & Styling
+
+-   Styles revisions: Remove body padding. ([57748](https://github.com/WordPress/gutenberg/pull/57748))
+
+#### Templates API
+
+-   Fix visual indication of switch to default template in the post editor. ([57718](https://github.com/WordPress/gutenberg/pull/57718))
+
+### Accessibility
+
+#### Site Editor
+
+-   Fix font variants count color contrast ratio and l10n. ([58117](https://github.com/WordPress/gutenberg/pull/58117))
+-   Make the site hub View Site link always visible. ([57423](https://github.com/WordPress/gutenberg/pull/57423))
+
+#### Block Editor
+
+-   Fix parent selector button focus style and metrics. ([57728](https://github.com/WordPress/gutenberg/pull/57728))
+-   Restore visual separator between mover buttons when show button label is on. ([57640](https://github.com/WordPress/gutenberg/pull/57640))
+
+#### Widgets Editor
+
+-   Fix Widgets page Undo and Redo accessibility and keyboard interaction. ([57677](https://github.com/WordPress/gutenberg/pull/57677))
+
+### Performance
+
+-   Add patterns load test. ([57828](https://github.com/WordPress/gutenberg/pull/57828))
+-   Block editor: Avoid list re-rendering on select. ([57188](https://github.com/WordPress/gutenberg/pull/57188))
+-   Block editor: Don't register shortcuts for preview editors. ([57984](https://github.com/WordPress/gutenberg/pull/57984))
+-   Block editor: Fix performance regression after #57950. ([57971](https://github.com/WordPress/gutenberg/pull/57971))
+-   Block editor: Use context for useBlockEditingMode. ([57950](https://github.com/WordPress/gutenberg/pull/57950))
+-   BlockSwitcher: Defer transform calculations until the Dropdown is open. ([57892](https://github.com/WordPress/gutenberg/pull/57892))
+-   Call variation through callback so it's only loaded when needed - in support of trac 59969. ([56952](https://github.com/WordPress/gutenberg/pull/56952))
+-   Editor styles: Cache transform. ([57810](https://github.com/WordPress/gutenberg/pull/57810))
+-   Footnotes: Combine format store subscription. ([58129](https://github.com/WordPress/gutenberg/pull/58129))
+-   Iframe: Calc compat styles once per page load. ([57798](https://github.com/WordPress/gutenberg/pull/57798))
+-   Measure typing with the top toolbar enabled. ([57709](https://github.com/WordPress/gutenberg/pull/57709))
+-   Meta boxes: Don't initialise if there are none. ([57182](https://github.com/WordPress/gutenberg/pull/57182))
+-   Patterns: Avoid fetching on load. ([57999](https://github.com/WordPress/gutenberg/pull/57999))
+-   Site editor: Avoid fetching themes on load. ([57985](https://github.com/WordPress/gutenberg/pull/57985))
+-   Site editor: Reduce artificial loading delay from 1s to 100ms. ([57953](https://github.com/WordPress/gutenberg/pull/57953))
+-   Site editor: Remove store subscription per block. ([57995](https://github.com/WordPress/gutenberg/pull/57995))
+-   Template Part & Query: Avoid server requests on mount. ([57987](https://github.com/WordPress/gutenberg/pull/57987))
+-   Template part block: Avoid parsing ALL patterns on mount. ([57856](https://github.com/WordPress/gutenberg/pull/57856))
+
+#### Block Editor
+
+-   Revert "Block editor: Avoid list re-rendering on select". ([58147](https://github.com/WordPress/gutenberg/pull/58147))
+
+#### Post Editor
+
+-   Editor: Use hooks instead of HoCs for `EditorNotices`. ([57772](https://github.com/WordPress/gutenberg/pull/57772))
+
+### Experiments
+
+#### Data Views
+
+-   Add: Bulk actions to dataviews with the new design. ([57255](https://github.com/WordPress/gutenberg/pull/57255))
+-   Data view list layout: Fix thumbnail dimensions. ([57774](https://github.com/WordPress/gutenberg/pull/57774))
+-   Data views table layout: Update cell vertical alignment. ([57804](https://github.com/WordPress/gutenberg/pull/57804))
+-   DataViews: Add description to pages. ([57793](https://github.com/WordPress/gutenberg/pull/57793))
+-   DataViews: Add front page to pages page sidebar. ([57759](https://github.com/WordPress/gutenberg/pull/57759))
+-   DataViews: Better management of `layout` param in templates. ([58116](https://github.com/WordPress/gutenberg/pull/58116))
+-   DataViews: Make list layout the default for templates with the experiment enabled. ([57933](https://github.com/WordPress/gutenberg/pull/57933))
+-   DataViews: Revert list view as default for pages. ([58081](https://github.com/WordPress/gutenberg/pull/58081))
+-   DataViews: Revert list view as default for templates. ([58079](https://github.com/WordPress/gutenberg/pull/58079))
+-   DataViews: Set primary field styles. ([57846](https://github.com/WordPress/gutenberg/pull/57846))
+-   DataViews: Show loading / no result message for the list layout. ([57764](https://github.com/WordPress/gutenberg/pull/57764))
+-   DataViews: Update template parts view. ([57952](https://github.com/WordPress/gutenberg/pull/57952))
+-   DataViews: Use button for patterns, pages and templates preview field. ([58071](https://github.com/WordPress/gutenberg/pull/58071))
+-   DataViews: Use table layout for templates when experiment disabled. ([57960](https://github.com/WordPress/gutenberg/pull/57960))
+-   Stabilise view options button icon. ([57964](https://github.com/WordPress/gutenberg/pull/57964))
+-   Update Grid layout design. ([57880](https://github.com/WordPress/gutenberg/pull/57880))
+-   Update Pages preview field display. ([57919](https://github.com/WordPress/gutenberg/pull/57919))
+-   Update Templates table layout. ([57930](https://github.com/WordPress/gutenberg/pull/57930))
+-   Update: Show template sources on templates Dataviews sidebar. ([58124](https://github.com/WordPress/gutenberg/pull/58124))
+
+#### Synced Patterns
+
+-   Add a control to reset pattern overrides. ([57845](https://github.com/WordPress/gutenberg/pull/57845))
+-   Allow heading and button in Pattern Overrides. ([57789](https://github.com/WordPress/gutenberg/pull/57789))
+
+#### Typography
+
+-   Download then upload font face assets when installing from a collection. ([57694](https://github.com/WordPress/gutenberg/pull/57694))
+-   Use `slug` instead of `id` for Font Collection. ([57735](https://github.com/WordPress/gutenberg/pull/57735))
+
+#### REST API
+
+-   Font Library Refactor. ([57688](https://github.com/WordPress/gutenberg/pull/57688))
+
+#### Block Editor
+
+-   Allow drag and drop to create Rows and Galleries. ([56186](https://github.com/WordPress/gutenberg/pull/56186))
+
+### Documentation
+
+-   Add a video demonstration to the Quick Start Guide. ([57834](https://github.com/WordPress/gutenberg/pull/57834))
+-   Button: Improve `disabled`-related prop descriptions. ([57864](https://github.com/WordPress/gutenberg/pull/57864))
+-   Components: Move CHANGELOG entries under the correct release. ([57885](https://github.com/WordPress/gutenberg/pull/57885))
+-   Docs: Fix typo in "The block wrapper" document. ([58106](https://github.com/WordPress/gutenberg/pull/58106))
+-   Docs: Use 'key' in 'editor.BlockEdit' filter code examples. ([58119](https://github.com/WordPress/gutenberg/pull/58119))
+-   Document files/directories requiring backmerging to WP Core for major release. ([58064](https://github.com/WordPress/gutenberg/pull/58064))
+-   Fix the iframe markup of the embed video in the Quick Start Guide. ([57857](https://github.com/WordPress/gutenberg/pull/57857))
+-   Fix: Link to the nodejs release page. ([57816](https://github.com/WordPress/gutenberg/pull/57816))
+-   Fix: Typo on BlockListBlock comments. ([57814](https://github.com/WordPress/gutenberg/pull/57814))
+-   Fix: Typos on \_\_unstableSetTemporarilyEditingAsBlocks documentation. ([57768](https://github.com/WordPress/gutenberg/pull/57768))
+-   Font Library: Add font collection JSON schema. ([57736](https://github.com/WordPress/gutenberg/pull/57736))
+-   Prefixes all php filters with wpdocs\_. ([53914](https://github.com/WordPress/gutenberg/pull/53914))
+-   Remove the unnecessary TOC and fix grammar/formatting in the Patterns doc. ([57825](https://github.com/WordPress/gutenberg/pull/57825))
+-   Remove the 👋 emoji from the Block Editor Handbook. ([58023](https://github.com/WordPress/gutenberg/pull/58023))
+-   Update versions-in-wordpress.md. ([57916](https://github.com/WordPress/gutenberg/pull/57916))
+-   [Type] Developer Documentation - Fix removeAllNotices dispatch on the removeAllNotices doc section of @wordpress/notices. ([57436](https://github.com/WordPress/gutenberg/pull/57436))
+
+### Code Quality
+
+-   Block Renaming - move backported WP 6.5 code to 6.5 compat dir. ([58126](https://github.com/WordPress/gutenberg/pull/58126))
+-   Fix comments block. ([57820](https://github.com/WordPress/gutenberg/pull/57820))
+-   Fon Library: Remove 'version' property from font collection schema. ([58025](https://github.com/WordPress/gutenberg/pull/58025))
+-   Remove unneeded `margin: 0` override for `Notice` component consumer. ([57794](https://github.com/WordPress/gutenberg/pull/57794))
+-   Rename \_\_experimentalGetGlobalBlocksByName to getBlocksByName. ([58156](https://github.com/WordPress/gutenberg/pull/58156))
+-   Scripts: Remove unused variable in bin/list-experimental-api-matches.sh. ([57771](https://github.com/WordPress/gutenberg/pull/57771))
+-   Shadows: Prevent empty style object when removing shadow. ([58155](https://github.com/WordPress/gutenberg/pull/58155))
+-   [Fonts API] removing files and files loading no longer needed. ([57972](https://github.com/WordPress/gutenberg/pull/57972))
+
+#### Components
+
+-   PaletteEdit: Improve unit tests. ([57645](https://github.com/WordPress/gutenberg/pull/57645))
+-   Tooltip and Button: Tidy up unit tests. ([57975](https://github.com/WordPress/gutenberg/pull/57975))
+-   Tooltip: Add test for classname leakage. ([58182](https://github.com/WordPress/gutenberg/pull/58182))
+
+#### Block Editor
+
+-   Soft deprecate custom 'pure' HoC in favor of 'React.memo'. ([57173](https://github.com/WordPress/gutenberg/pull/57173))
+-   Stabilise RecursionProvider and useHasRecursion APIs. ([58120](https://github.com/WordPress/gutenberg/pull/58120))
+-   Tidy up block patterns selectors. ([57913](https://github.com/WordPress/gutenberg/pull/57913))
+
+#### Block Library
+
+-   Gallery Block: Remove duplicate return statement. ([57746](https://github.com/WordPress/gutenberg/pull/57746))
+-   Navigation: Move the renderer class to the main navigation file. ([57979](https://github.com/WordPress/gutenberg/pull/57979))
+
+#### Font Library
+
+-   Remove WP_Font_Family class that is no longer used. ([58184](https://github.com/WordPress/gutenberg/pull/58184))
+
+#### Block Directory
+
+-   DownloadableBlocksPanel: Remove withSelect in favor of useSelect. ([58109](https://github.com/WordPress/gutenberg/pull/58109))
+
+#### Patterns
+
+-   Stabilize the pattern overrides block context. ([58102](https://github.com/WordPress/gutenberg/pull/58102))
+
+#### Block API
+
+-   Block Bindings: Remove the experimental flag. ([58089](https://github.com/WordPress/gutenberg/pull/58089))
+
+#### Post Editor
+
+-   Editor: Use hooks instead of HoCs in 'PostScheduleCheck'. ([57833](https://github.com/WordPress/gutenberg/pull/57833))
+
+#### Script Modules API
+
+-   Update the code and move it to the compat/wordpress-6.5 folder. ([57778](https://github.com/WordPress/gutenberg/pull/57778))
+
+#### Data Views
+
+-   Remove obsolete check from dataviews modal actions title. ([57753](https://github.com/WordPress/gutenberg/pull/57753))
+
+### Tools
+
+-   (chore) Revert bump to the v17.5.1 (draft) due to bug in the release found by manual testing. ([58027](https://github.com/WordPress/gutenberg/pull/58027))
+-   Automate creation of Issue for major release PHP synchronisation. ([57890](https://github.com/WordPress/gutenberg/pull/57890))
+-   Fix misplaced ReactRefreshWebpackPlugin. ([57777](https://github.com/WordPress/gutenberg/pull/57777))
+
+#### Testing
+
+-   Add `setGutenbergExperiments` to `requestUtils`. ([56663](https://github.com/WordPress/gutenberg/pull/56663))
+-   Add: End to end test to content locking stop editing as blocks behavior. ([57812](https://github.com/WordPress/gutenberg/pull/57812))
+-   Attempt to fix php unit tests (variations api change). ([58090](https://github.com/WordPress/gutenberg/pull/58090))
+-   Migrate 'block grouping' end-to-end tests to Playwright. ([57684](https://github.com/WordPress/gutenberg/pull/57684))
+-   Migrate 'embedding' end-to-end tests to Playwright. ([57969](https://github.com/WordPress/gutenberg/pull/57969))
+-   Migrate 'typewriter' end-to-end tests to Playwright. ([57673](https://github.com/WordPress/gutenberg/pull/57673))
+-   Remove unused Navigation block end-to-end test fixtures. ([57848](https://github.com/WordPress/gutenberg/pull/57848))
+
+#### Build Tooling
+
+-   Update caniuse-lite package. ([58087](https://github.com/WordPress/gutenberg/pull/58087))
+-   Update the cherry pick script to work with the new version of gh. ([57917](https://github.com/WordPress/gutenberg/pull/57917))
+
+### Various
+
+-   Interactivity API: Fix data-wp-on-document flaky test. ([58008](https://github.com/WordPress/gutenberg/pull/58008))
+-   Interactivity API: Fix flaky test on-window. ([58134](https://github.com/WordPress/gutenberg/pull/58134))
+-   Pattern Categories: Fix capitalization. ([58112](https://github.com/WordPress/gutenberg/pull/58112))
+-   Remove check-latest-npm validation. ([57797](https://github.com/WordPress/gutenberg/pull/57797))
+
+#### Interactivity API
+
+-   Create `@wordpress/interactivity-router` module. ([57924](https://github.com/WordPress/gutenberg/pull/57924))
+-   Fix flaky test on-window, remove duplicate expect on-document. ([58181](https://github.com/WordPress/gutenberg/pull/58181))
+-   Remove `data-wp-slot` and `data-wp-fill`. ([57854](https://github.com/WordPress/gutenberg/pull/57854))
+-   Remove unused `state` and rename `props` to `attributes` in `getElement()`. ([57974](https://github.com/WordPress/gutenberg/pull/57974))
+
+#### Patterns
+
+-   Remove pattern override experiment completely. ([58105](https://github.com/WordPress/gutenberg/pull/58105))
+-   Update pattern overrides to use a hard coded support array. ([57912](https://github.com/WordPress/gutenberg/pull/57912))
+
+#### Data Views
+
+-   Dataviews: Add Bulk actions to page. ([57826](https://github.com/WordPress/gutenberg/pull/57826))
+
+#### Post Editor
+
+-   Add description to the save panel header when nothing is checked. ([57716](https://github.com/WordPress/gutenberg/pull/57716))
+
+#### HTML API
+
+-   Backport updates from Core. ([57022](https://github.com/WordPress/gutenberg/pull/57022))
+
+#### Block Editor
+
+-   Video Block: Add raw transformation from `video` html. ([47159](https://github.com/WordPress/gutenberg/pull/47159))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @kt-12: Call variation through callback so it's only loaded when needed - in support of trac 59969. ([56952](https://github.com/WordPress/gutenberg/pull/56952))
+-   @leomuniz: [Type] Developer Documentation - Fix removeAllNotices dispatch on the removeAllNotices doc section of @wordpress/notices. ([57436](https://github.com/WordPress/gutenberg/pull/57436))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @ajlende @andrewserong @annezazu @artemiomorales @arthur791004 @atachibana @bacoords @bph @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @creativecoder @DAreRodz @dcalhoun @derekblank @dmsnell @draganescu @ecgan @ellatrix @fluiddot @fullofcaffeine @gaambo @geriux @getdave @glendaviesnz @gonzomir @inc2734 @jameskoster @jeryj @jffng @jorgefilipecosta @jsnajdr @kevin940726 @kt-12 @leomuniz @luisherranz @MaggieCabrera @Mamaduka @matiasbenedetto @mcsf @michalczaplinski @mikachan @mirka @ndiego @noisysocks @ntsekouras @oandregal @ockham @oguzkocer @pbking @ramonjd @richtabor @SantosGuillamot @scruffian @SiobhyB @sirreal @swissspidy @t-hamano @talldan @tellthemachines @tjcafferkey @tyxla @vcanales @youknowriad
+
+= 17.5.2 =
+
+## Changelog
+
+### Bug Fixes
+
+-   (Preferences)(17.5.1)(fix) Remove non-core-migrated preferences from the deprecation proxy for `get` ([58153](https://github.com/WordPress/gutenberg/pull/58153))
+-   (editor)(fix) Append the `edit-post-header-toolbar` class in NavigableToolbar for backward compatibility with plugin GUI injections ([58154](https://github.com/WordPress/gutenberg/pull/58154))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@fullofcaffeine
+
+= 17.5.1 =
+
+## Changelog
+
+### Bug Fixes
+
+-   (Preferences)(hotfix)(17.5) Hotfix for missing preferences in the `core` scope([58031](https://github.com/WordPress/gutenberg/pull/58031))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@youknowriad @fullofcaffeine
+
+= 17.5.0 =
+
+## Changelog
+
+### Enhancements
+
+#### Editor Unification
+
+-   Editor: Add the show most used blocks preference to the site editor. ([57637](https://github.com/WordPress/gutenberg/pull/57637))
+-   Editor: Migrate and unify the panel preferences. ([57529](https://github.com/WordPress/gutenberg/pull/57529))
+-   Editor: Unify context text cursor preference. ([57479](https://github.com/WordPress/gutenberg/pull/57479))
+-   Editor: Unify list view open preference. ([57504](https://github.com/WordPress/gutenberg/pull/57504))
+-   Editor: Unify right click override preference. ([57468](https://github.com/WordPress/gutenberg/pull/57468))
+-   Editor: Unify show icon labels preference. ([57480](https://github.com/WordPress/gutenberg/pull/57480))
+-   Editor: Unify spotlight mode preference. ([57533](https://github.com/WordPress/gutenberg/pull/57533))
+-   Editor: Unify the distraction free preference. ([57590](https://github.com/WordPress/gutenberg/pull/57590))
+-   Editor: Unify the show block breadcrumbs preference. ([57506](https://github.com/WordPress/gutenberg/pull/57506))
+-   Editor: Unify the top toolbar preference. ([57531](https://github.com/WordPress/gutenberg/pull/57531))
+
+#### Components
+
+-   Components: Replace `TabPanel` with `Tabs` in inline color picker. ([57292](https://github.com/WordPress/gutenberg/pull/57292)
+-   Add `compact` size variant to InputControl-based components. ([57398](https://github.com/WordPress/gutenberg/pull/57398))
+-   BaseControl: Connect to context system. ([57408](https://github.com/WordPress/gutenberg/pull/57408))
+-   Replace `TabPanel` with `Tabs` in the Style Book. ([57287](https://github.com/WordPress/gutenberg/pull/57287))
+-   Tooltip: Improve tests. ([57345](https://github.com/WordPress/gutenberg/pull/57345))
+-   Update @ariakit/react to v0.3.12 and @ariakit/test to v0.3.7. ([57547](https://github.com/WordPress/gutenberg/pull/57547))
+
+#### Font Library
+
+-   Font Library: Remove "has_font_mime_type" function. ([57364](https://github.com/WordPress/gutenberg/pull/57364))
+-   Font Library: Update font uninstall modal text. ([57368](https://github.com/WordPress/gutenberg/pull/57368))
+-   Font Library: Add progress-bar while uploading font assets. ([57463](https://github.com/WordPress/gutenberg/pull/57463))
+-   Font Library: Singularize install font families endpoint. ([57569](https://github.com/WordPress/gutenberg/pull/57569))
+-   Font Library: Unregister font collection. ([54701](https://github.com/WordPress/gutenberg/pull/54701))
+
+#### Site Editor
+
+-   Add Template Modal: Update scroll related layout. ([57617](https://github.com/WordPress/gutenberg/pull/57617))
+-   Components: Replace `TabPanel` with `Tabs` in the Font Library `Modal`. ([57181](https://github.com/WordPress/gutenberg/pull/57181))
+
+#### Interactivity API
+
+-   Implement `wp_initial_state()`. ([57556](https://github.com/WordPress/gutenberg/pull/57556))
+-   Server directive processing: Stop processing non-interactive blocks. ([56302](https://github.com/WordPress/gutenberg/pull/56302))
+-   Interactive template: Use viewModule. ([57712](https://github.com/WordPress/gutenberg/pull/57712))
+-   Navigation Block: Use dom.focus for focus control. ([57362](https://github.com/WordPress/gutenberg/pull/57362))
+
+#### Site Editor
+
+-   Site editor: Add padding to entity save panel header. ([57471](https://github.com/WordPress/gutenberg/pull/57471))
+-   Site editor: Add margin to entity save panel header via a classname. ([57473](https://github.com/WordPress/gutenberg/pull/57473))
+
+#### Block Library
+
+-   Post Featured Image: Add a useFirstImageFromPost attribute. ([56573](https://github.com/WordPress/gutenberg/pull/56573))
+-   Gallery Block: Add random order setting. ([57477](https://github.com/WordPress/gutenberg/pull/57477))
+-   Image Block: Change upload icon label. ([57704](https://github.com/WordPress/gutenberg/pull/57704))
+
+### Bug Fixes
+
+-   Avoid using a memoized selector without dependencies. ([57257](https://github.com/WordPress/gutenberg/pull/57257))
+-   Core Data: Pass the 'options' argument to data action shortcuts. ([57383](https://github.com/WordPress/gutenberg/pull/57383))
+-   Preferences: Update accessibility scope to "core". ([57563](https://github.com/WordPress/gutenberg/pull/57563))
+
+#### Block Editor
+
+-   Fix Link UI displaying out of sync results. ([57522](https://github.com/WordPress/gutenberg/pull/57522))
+-   Give iframe fallback background color. ([57330](https://github.com/WordPress/gutenberg/pull/57330))
+-   Rich text: Add HTML string methods to RichTextData. ([57322](https://github.com/WordPress/gutenberg/pull/57322))
+
+#### Block Library
+
+-   Footnotes: Fix wrong link when adding more than 9 footnotes. ([57599](https://github.com/WordPress/gutenberg/pull/57599))
+-   Table: Remove unnecessary margin override in editor styles. ([57699](https://github.com/WordPress/gutenberg/pull/57699))
+-   Template Part block: Fix template part path arg missing from actions. ([56790](https://github.com/WordPress/gutenberg/pull/56790))
+
+#### Components
+
+-   DuotonePicker: Fix top margin when no duotone options. ([57489](https://github.com/WordPress/gutenberg/pull/57489))
+-   NavigatorProvider: Exclude size value from contain CSS rule. ([57498](https://github.com/WordPress/gutenberg/pull/57498))
+-   Snackbar: Fix icon positioning. ([57377](https://github.com/WordPress/gutenberg/pull/57377))
+
+#### Patterns
+
+-   Pattern Overrides: Add `template-lock: All` to pattern inner blocks to prevent deletion/insertion. ([57661](https://github.com/WordPress/gutenberg/pull/57661))
+-   Refactor the findOrCreate term method. ([57655](https://github.com/WordPress/gutenberg/pull/57655))
+-   Edit source pattern in focus mode in post and site editors. ([57036](https://github.com/WordPress/gutenberg/pull/57036))
+
+#### Site Editor
+
+-   Make sure comamnd palette toggle does not disappear while being clicked. ([57420](https://github.com/WordPress/gutenberg/pull/57420))
+-   Reinstate iframe CSS for editor canvas container. ([57503](https://github.com/WordPress/gutenberg/pull/57503))
+
+#### Global Styles
+
+-   Use `is-layout` pattern on layout generated classname. ([57564](https://github.com/WordPress/gutenberg/pull/57564))
+-   Global styles revisions: Add individual headings translations, update tests. ([57472](https://github.com/WordPress/gutenberg/pull/57472))
+-   Global style revisions: Move change summary code and tests to block editor package. ([57411](https://github.com/WordPress/gutenberg/pull/57411))
+-   Reduce specificity of block style variation selectors. ([57659](https://github.com/WordPress/gutenberg/pull/57659))
+-   Background image block support: Add tests for size and repeat output. ([57474](https://github.com/WordPress/gutenberg/pull/57474))
+
+#### Post Editor
+
+-   Fix Template preview menu item accessibility. ([57456](https://github.com/WordPress/gutenberg/pull/57456))
+-   Fullscreen mode description: Use full text instead of abbreviation. ([57518](https://github.com/WordPress/gutenberg/pull/57518))
+-   Improve pre-publish checks naming consistency. ([57019](https://github.com/WordPress/gutenberg/pull/57019))
+-   Make the Replace featured image button perceivable by assistive technologies. ([57453](https://github.com/WordPress/gutenberg/pull/57453))
+
+#### Components
+
+-   Label the HeightControl. ([57683](https://github.com/WordPress/gutenberg/pull/57683))
+-   NumberControl: Make increment and decrement buttons keyboard accessible. ([57402](https://github.com/WordPress/gutenberg/pull/57402))
+
+#### Block Tools
+
+-   Update the position of the patterns tab in the inserter menu. ([55688](https://github.com/WordPress/gutenberg/pull/55688))
+-   Use full text instead of abbreviation for min height setting. ([57680](https://github.com/WordPress/gutenberg/pull/57680))
+-   ResizableEditor: Fix tab order for resize handles. ([57475](https://github.com/WordPress/gutenberg/pull/57475))
+-   Keep Lock button it in the toolbar until unmounted. ([57229](https://github.com/WordPress/gutenberg/pull/57229))
+-   Custom field connections: Better description on Experiments page. ([57501](https://github.com/WordPress/gutenberg/pull/57501))
+
+### Performance
+
+#### Block Library
+
+-   File: Remove 'block-editor' store subscription. ([57511](https://github.com/WordPress/gutenberg/pull/57511))
+-   Remove store subscriptions from Audio and Video blocks. ([57449](https://github.com/WordPress/gutenberg/pull/57449))
+-   Site Logo: Remove unnecessary 'block-editor' store subscription. ([57513](https://github.com/WordPress/gutenberg/pull/57513))
+-   Send numerical post id when uploading image. ([57388](https://github.com/WordPress/gutenberg/pull/57388))
+-   PostFeaturedImage: Remove unnecessary 'block-editor' store subscription. ([57554](https://github.com/WordPress/gutenberg/pull/57554))
+
+### Experiments
+
+#### Data Views
+
+-   DataViews: Use DropdownMenuRadioItem component when possible. ([57505](https://github.com/WordPress/gutenberg/pull/57505))
+-   Align icon size + placement in Patterns data view. ([57548](https://github.com/WordPress/gutenberg/pull/57548))
+-   DataViews: Add `duplicate pattern` action in patterns page. ([57592](https://github.com/WordPress/gutenberg/pull/57592))
+-   DataViews: Add duplicate template pattern action. ([57638](https://github.com/WordPress/gutenberg/pull/57638))
+-   DataViews: Add footer to Pages sidebar. ([57690](https://github.com/WordPress/gutenberg/pull/57690))
+-   DataViews: Add new page button in `Pages`. ([57685](https://github.com/WordPress/gutenberg/pull/57685))
+-   DataViews: Add sync filter in patterns page. ([57532](https://github.com/WordPress/gutenberg/pull/57532))
+-   DataViews: Consolidate CSS selectors naming schema. ([57651](https://github.com/WordPress/gutenberg/pull/57651))
+-   DataViews: Fallback to `(no title)` is there's no rendered title. ([57434](https://github.com/WordPress/gutenberg/pull/57434))
+-   DataViews: Hide actions menu upon selecting a layout. ([57418](https://github.com/WordPress/gutenberg/pull/57418))
+-   DataViews: Make `fields` dependant on `view.type`. ([57450](https://github.com/WordPress/gutenberg/pull/57450))
+-   DataViews: Memoize `onSetSelection`. ([57458](https://github.com/WordPress/gutenberg/pull/57458))
+-   DataViews: Prevent unnecessary re-renders of Pagination. ([57454](https://github.com/WordPress/gutenberg/pull/57454))
+-   DataViews: Prevent unnecessary re-renders. ([57452](https://github.com/WordPress/gutenberg/pull/57452))
+-   DataViews: Update names for `DropdownMenuRadioItemCustom`. ([57416](https://github.com/WordPress/gutenberg/pull/57416))
+-   DataViews: Use i18n.\_x to clarify term "Duplicate". ([57686](https://github.com/WordPress/gutenberg/pull/57686))
+-   DataViews: Use in patterns page. ([57333](https://github.com/WordPress/gutenberg/pull/57333))
+-   Dataview: Change the stacking order of table header. ([57565](https://github.com/WordPress/gutenberg/pull/57565))
+-   Dataviews: Add some client side data handling utils. ([57488](https://github.com/WordPress/gutenberg/pull/57488))
+-   Make title display in grid views consistent. ([57553](https://github.com/WordPress/gutenberg/pull/57553))
+-   Update Table layout design details. ([57644](https://github.com/WordPress/gutenberg/pull/57644))
+-   Update pagination spacing in List layout. ([57670](https://github.com/WordPress/gutenberg/pull/57670))
+-   Update table header gap. ([57671](https://github.com/WordPress/gutenberg/pull/57671))
+-   [Dataviews] Table layout: Ensure focus is not lost on interaction. ([57340](https://github.com/WordPress/gutenberg/pull/57340))
+
+#### Patterns
+
+-   [Pattern Overrides] Fix duplication of inner blocks. ([57538](https://github.com/WordPress/gutenberg/pull/57538))
+-   [Pattern overrides] Allow multiple attributes overrides. ([57573](https://github.com/WordPress/gutenberg/pull/57573))
+
+### Documentation
+
+-   Add links to additional local dev tools in Block Developement Environment readme. ([57682](https://github.com/WordPress/gutenberg/pull/57682))
+-   Add new section to the Quick Start Guide about wp-env. ([57559](https://github.com/WordPress/gutenberg/pull/57559))
+-   Block JSON schema: Add renaming key to supports definition. ([57373](https://github.com/WordPress/gutenberg/pull/57373))
+-   Break out the Curating the Editor Experience doc into its own How-to Guides section. ([57289](https://github.com/WordPress/gutenberg/pull/57289))
+-   Change the slug for the theme.json doc to avoid conflicts. ([57410](https://github.com/WordPress/gutenberg/pull/57410))
+-   Docs/tutorial: Fix opposite condition for content generation in render.php. ([57445](https://github.com/WordPress/gutenberg/pull/57445))
+-   Docs: Fundamentals of Block Development - Static or Dynamic rendering of a block. ([57250](https://github.com/WordPress/gutenberg/pull/57250))
+-   Docs: Update sample code to fix React warning error on Tutorial page. ([57412](https://github.com/WordPress/gutenberg/pull/57412))
+-   Fix formatting issue due to incorrect link parsing in the Quick Start Guide. ([57693](https://github.com/WordPress/gutenberg/pull/57693))
+-   Fix incorrect heading level in Editor curation documentation. ([57409](https://github.com/WordPress/gutenberg/pull/57409))
+-   Fix two typos in tutorial.md. ([57627](https://github.com/WordPress/gutenberg/pull/57627))
+-   Fix: Create block getting started links. ([57551](https://github.com/WordPress/gutenberg/pull/57551))
+-   Improve the static vs dynamic rendering comment in the block tutorial. ([57284](https://github.com/WordPress/gutenberg/pull/57284))
+-   Update copyright year to 2024 in `license.md`. ([57481](https://github.com/WordPress/gutenberg/pull/57481))
+-   Update the "Build your first block" tutorial based on user feedback. ([57403](https://github.com/WordPress/gutenberg/pull/57403))
+-   Update: Material design icons link. ([57550](https://github.com/WordPress/gutenberg/pull/57550))
+
+### Code Quality
+
+-   Editor: Unify the DocumentTools component. ([57214](https://github.com/WordPress/gutenberg/pull/57214))
+-   Make getLastFocus and setLastFocus private. ([57612](https://github.com/WordPress/gutenberg/pull/57612))
+-   Remove deprecated `behaviors` syntax. ([57165](https://github.com/WordPress/gutenberg/pull/57165))
+-   Avoid extra `useMarkPersistent` dispatch calls. ([57435](https://github.com/WordPress/gutenberg/pull/57435))
+-   Clean up code editor CSS. ([57519](https://github.com/WordPress/gutenberg/pull/57519))
+-   Combine selectors in 'useTransformCommands'. ([57424](https://github.com/WordPress/gutenberg/pull/57424))
+
+#### Block Library
+
+-   Background image: Add has-background classname when background image is applied. ([57495](https://github.com/WordPress/gutenberg/pull/57495))
+-   File: Remove unnecessary synchronization effect. ([57585](https://github.com/WordPress/gutenberg/pull/57585))
+-   Navigation: Refactor mobile overlay breakpoints to JS. ([57520](https://github.com/WordPress/gutenberg/pull/57520))
+-   Search Block: Remove unused `buttonBehavior` attribute. ([53467](https://github.com/WordPress/gutenberg/pull/53467))
+
+#### Patterns
+
+-   Improve inserter pattern constants. ([57570](https://github.com/WordPress/gutenberg/pull/57570))
+-   Remove duplicate setting for `getPostLinkProps` and prefer stable naming. ([57535](https://github.com/WordPress/gutenberg/pull/57535))
+-   Rename `patternBlock` to `patternPost`. ([57568](https://github.com/WordPress/gutenberg/pull/57568))
+
+#### Post Editor
+
+-   Editor: Use hooks instead of HoCs in 'PostVisibilityCheck'. ([57705](https://github.com/WordPress/gutenberg/pull/57705))
+-   Quality: Avoid React warning when changing rendering mode. ([57413](https://github.com/WordPress/gutenberg/pull/57413))
+
+#### Block Editor
+
+-   Editor: Unify the inserter sidebar. ([57466](https://github.com/WordPress/gutenberg/pull/57466))
+-   Remove unused parameters from useOnBlockDrop. ([57527](https://github.com/WordPress/gutenberg/pull/57527))
+
+#### List View
+
+-   Editor: Unify the list view sidebar between the post and site editors. ([57467](https://github.com/WordPress/gutenberg/pull/57467))
+-   Add drag cursor to draggable list items. ([57493](https://github.com/WordPress/gutenberg/pull/57493))
+
+### Tools
+
+-   DependencyExtractionWebpackPlugin: Throw when using scripts from modules. ([57795]
+-   Dependency Extraction Webpack Plugin: Use `import` for module externals. ([57577](https://github.com/WordPress/gutenberg/pull/57577))
+-   DependencyExtractionWebpackPlugin: Add true shorthand for requestToExternalModule. ([57593](https://github.com/WordPress/gutenberg/pull/57593))
+-   DependencyExtractionWebpackPlugin: Use module for @wordpress/interactivity. ([57602](https://github.com/WordPress/gutenberg/pull/57602))
+-   Fix webpack not setting environment.module true. ([57714](https://github.com/WordPress/gutenberg/pull/57714))
+-   Modules: Load the import map polyfill when needed. ([57256](https://github.com/WordPress/gutenberg/pull/57256))
+-   Blocks: Add handling for block.json viewModule. ([57437](https://github.com/WordPress/gutenberg/pull/57437))
+
+#### Testing
+
+-   Allowed Patterns end-to-end test - move tests that run with a subset of allowed blocks into a group. ([57496](https://github.com/WordPress/gutenberg/pull/57496))
+-   Clean up end-to-end tests package. ([57575](https://github.com/WordPress/gutenberg/pull/57575))
+-   Fix flaky 'Post publish button' end-to-end test. ([57407](https://github.com/WordPress/gutenberg/pull/57407))
+-   Migrate 'allowed patterns' end-to-end tests to Playwright. ([57399](https://github.com/WordPress/gutenberg/pull/57399))
+-   Migrate 'block editor keyboard shortcuts' end-to-end tests to Playwright. ([57422](https://github.com/WordPress/gutenberg/pull/57422))
+-   Migrate 'core settings' end-to-end tests to Playwright. ([57581](https://github.com/WordPress/gutenberg/pull/57581))
+-   Migrate 'datepicker' end-to-end tests to Playwright. ([57545](https://github.com/WordPress/gutenberg/pull/57545))
+-   Migrate 'dropdown menu' end-to-end tests to Playwright. ([57663](https://github.com/WordPress/gutenberg/pull/57663))
+-   Migrate 'editor modes' end-to-end tests to Playwright. ([57574](https://github.com/WordPress/gutenberg/pull/57574))
+-   Migrate 'invalid blocks' end-to-end tests to Playwright. ([57508](https://github.com/WordPress/gutenberg/pull/57508))
+-   Migrate 'nux' end-to-end tests to Playwright. ([57542](https://github.com/WordPress/gutenberg/pull/57542))
+-   Migrate 'preferences' end-to-end tests to Playwright. ([57446](https://github.com/WordPress/gutenberg/pull/57446))
+-   Migrate 'publishing' end-to-end tests to Playwright. ([57521](https://github.com/WordPress/gutenberg/pull/57521))
+-   Migrate 'scheduling' end-to-end tests to Playwright. ([57539](https://github.com/WordPress/gutenberg/pull/57539))
+-   Migrate 'sidebar' end-to-end tests to Playwright. ([57448](https://github.com/WordPress/gutenberg/pull/57448))
+-   Migrate 'taxonomies' end-to-end tests to Playwright. ([57662](https://github.com/WordPress/gutenberg/pull/57662))
+-   Migrate `editing-widgets` to Playwright. ([57483](https://github.com/WordPress/gutenberg/pull/57483))
+-   Migrate remaining 'publish panel' end-to-end tests to Playwright. ([57432](https://github.com/WordPress/gutenberg/pull/57432))
+-   Update 'missing block' end-to-end tests to use the 'setContent' helper. ([57509](https://github.com/WordPress/gutenberg/pull/57509))
+
+#### Build Tooling
+
+-   Group GitHub Action Dependabot updates. ([57591](https://github.com/WordPress/gutenberg/pull/57591))
+-   WP Scripts: Build block.json viewModule. ([57461](https://github.com/WordPress/gutenberg/pull/57461))
+-   Dependency Extraction Webpack Plugin: Add Module support. ([57199](https://github.com/WordPress/gutenberg/pull/57199))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @HrithikDalal: Font Library: Update font uninstall modal text. ([57368](https://github.com/WordPress/gutenberg/pull/57368))
+-   @muhme: Fix two typos in tutorial.md. ([57627](https://github.com/WordPress/gutenberg/pull/57627))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@afercia @andrewhayward @andrewserong @atachibana @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @DAreRodz @dcalhoun @derekblank @desrosj @ellatrix @fai-sal @fluiddot @geriux @getdave @glendaviesnz @gziolo @hbhalodia @HrithikDalal @jameskoster @jeryj @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @Mamaduka @matiasbenedetto @mcsf @michalczaplinski @mirka @muhme @ndiego @ntsekouras @oandregal @ockham @ramonjd @scruffian @sirreal @Soean @t-hamano @talldan @tellthemachines @youknowriad
+
+= 17.3.2 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Site editor: fix image upload bug ([57040](https://github.com/WordPress/gutenberg/pull/57040))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@glendaviesnz
+
+= 17.4.1 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Rich text: add HTML string methods to RichTextData ([57322](https://github.com/WordPress/gutenberg/pull/57322))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@ellatrix
+
+= 17.3.1 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Rich text: add HTML string methods to RichTextData ([57322](https://github.com/WordPress/gutenberg/pull/57322))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@ellatrix
+
+= 17.4.0 =
+
+## Changelog
+
+### Enhancements
+
+#### Components
+
+-   Refactor experimental dropdown menu usages to latest version. ([55625](https://github.com/WordPress/gutenberg/pull/55625))
+-   Replace `TabPanel` with `Tabs` in the Block Inspector. ([56995](https://github.com/WordPress/gutenberg/pull/56995))
+-   Replace `TabPanel` with `Tabs` in the editor Global Styles color palette. ([57126](https://github.com/WordPress/gutenberg/pull/57126))
+-   ToggleGroupControl: Update large button size to 32px. ([57338](https://github.com/WordPress/gutenberg/pull/57338))
+-   Update ariakit version. ([57325](https://github.com/WordPress/gutenberg/pull/57325))
+-   `CustomSelect`: Add `WordPressComponentsProps`. ([56998](https://github.com/WordPress/gutenberg/pull/56998))
+-   `Modal`: Improve application of body class names. ([55430](https://github.com/WordPress/gutenberg/pull/55430))
+-   -   Components: Replace `TabPanel` with `Tabs` in the Block Inserter. ([56918](https://github.com/WordPress/gutenberg/pull/56918))
+
+#### Site Editor
+
+-   Add Page Attributes panel. ([57151](https://github.com/WordPress/gutenberg/pull/57151))
+-   Add Post Taxonomies panel. ([57049](https://github.com/WordPress/gutenberg/pull/57049))
+-   Add View Link. ([57153](https://github.com/WordPress/gutenberg/pull/57153))
+-   Add the Discussion panel. ([57150](https://github.com/WordPress/gutenberg/pull/57150))
+-   Add the featured image panel. ([57053](https://github.com/WordPress/gutenberg/pull/57053))
+-   Editor: Unify revision panel between post and site editors. ([57010](https://github.com/WordPress/gutenberg/pull/57010))
+-   Social Link block: Obfuscate email address. ([57384](https://github.com/WordPress/gutenberg/pull/57384))
+-   DataViews: Mark the new Templates pages as stable. ([57109](https://github.com/WordPress/gutenberg/pull/57109))
+
+#### Design Tools
+
+-   Background image: Add backgroundSize and repeat features. ([57005](https://github.com/WordPress/gutenberg/pull/57005))
+-   Make sure theme color palette presets are output when appearance tools are enabled. ([57190](https://github.com/WordPress/gutenberg/pull/57190))
+-   Move tools panel to the left of the inspector. ([55785](https://github.com/WordPress/gutenberg/pull/55785))
+
+#### Global Styles
+
+-   Global styles revisions: Add pagination. ([56799](https://github.com/WordPress/gutenberg/pull/56799))
+-   Global styles revisions: Integrate style book. ([56800](https://github.com/WordPress/gutenberg/pull/56800))
+
+### Bug Fixes
+
+#### Components
+
+-   DropdownMenu V2: Add fallback styles for when subgrid is not supported. ([57327](https://github.com/WordPress/gutenberg/pull/57327))
+-   DropdownMenuV2: Do not collapse suffix width. ([57238](https://github.com/WordPress/gutenberg/pull/57238))
+-   Fix DayButton dot position and expand Button area. ([55502](https://github.com/WordPress/gutenberg/pull/55502))
+-   Fix logic of `has-text` class addition in Button. ([56949](https://github.com/WordPress/gutenberg/pull/56949))
+-   Palette Edit: Don't discards colors with default name and slug. ([54332](https://github.com/WordPress/gutenberg/pull/54332))
+-   PaletteEdit: Consider digits when generating kebab-cased slug. ([56713](https://github.com/WordPress/gutenberg/pull/56713))
+-   RadioControl: Fully encapsulate styles. ([57347](https://github.com/WordPress/gutenberg/pull/57347))
+-   Tabs: Make sure individual `Tab`s are linked to the correct `TabPanel`s. ([57033](https://github.com/WordPress/gutenberg/pull/57033))
+-   Text selection: Show CSS hack to Safari only. ([57300](https://github.com/WordPress/gutenberg/pull/57300))
+-   Truncate: Improve handling of non-string children. ([57261](https://github.com/WordPress/gutenberg/pull/57261))
+-   `FormTokenField`: Handle `disabled` prop on internal `Button`. ([57187](https://github.com/WordPress/gutenberg/pull/57187))
+-   tab panel: Don't render hidden content by default. ([57046](https://github.com/WordPress/gutenberg/pull/57046))
+
+#### Block Editor
+
+-   Exclude disabled buttons when setting initialIndex of NavigableToolbar. ([57280](https://github.com/WordPress/gutenberg/pull/57280))
+-   Fix BlockSwitcher checks for showing a Dropdown menu or not. ([57047](https://github.com/WordPress/gutenberg/pull/57047))
+-   Fix block lock toolbar item stealing focus when mounted with StrictMode. ([57185](https://github.com/WordPress/gutenberg/pull/57185))
+-   Fix content lock UI regression. ([56974](https://github.com/WordPress/gutenberg/pull/56974))
+-   Fix vertical overflow when inserter is open in post and site editor. ([57127](https://github.com/WordPress/gutenberg/pull/57127))
+-   Hide drop indicator where block isn't allowed to drop. ([56843](https://github.com/WordPress/gutenberg/pull/56843))
+-   InserterListItem: Use item.isDisabled to detect disabled item. ([57161](https://github.com/WordPress/gutenberg/pull/57161))
+-   More settings tip: Add explicit font size. ([55835](https://github.com/WordPress/gutenberg/pull/55835))
+-   Writing flow: Absorb partial multi selection dispatching. ([47525](https://github.com/WordPress/gutenberg/pull/47525))
+-   Fix the block 'edit' property validation. ([57193](https://github.com/WordPress/gutenberg/pull/57193))
+
+#### Block Library
+
+-   Audio: Hide some controls when multi-editing blocks. ([57376](https://github.com/WordPress/gutenberg/pull/57376))
+-   Disable resizing when viewport is small and wide-aligned. ([57041](https://github.com/WordPress/gutenberg/pull/57041))
+-   Gallery: Hide some controls when multi-editing blocks. ([57378](https://github.com/WordPress/gutenberg/pull/57378))
+-   Image Block: Get lightbox trigger button ref via data-wp-init. ([57089](https://github.com/WordPress/gutenberg/pull/57089))
+-   Image: Hide caption control when multi-editing images. ([57357](https://github.com/WordPress/gutenberg/pull/57357))
+-   Video: Hide some controls when multi-editing blocks. ([57375](https://github.com/WordPress/gutenberg/pull/57375))
+-   Image Block: Fix deprecation when width/height attribute is number. ([57063](https://github.com/WordPress/gutenberg/pull/57063))
+
+#### Patterns
+
+-   Fix: Viewport width not accounted for in the Site Editor > Patterns view. ([55803](https://github.com/WordPress/gutenberg/pull/55803))
+-   Override all the labels of the pattern categories taxonomy. ([57094](https://github.com/WordPress/gutenberg/pull/57094))
+-   Pattern Category: Change show_tagcloud to false. ([57212](https://github.com/WordPress/gutenberg/pull/57212))
+-   Patterns (unsynced): Prevent infinite loops due to recursive patterns. ([56511](https://github.com/WordPress/gutenberg/pull/56511))
+
+#### Site Editor
+
+-   Fix image upload bug. ([57040](https://github.com/WordPress/gutenberg/pull/57040))
+-   Reduce clearance around the Frame in the site editor. ([57023](https://github.com/WordPress/gutenberg/pull/57023))
+-   Swap Template: Show the right templates for the right post type. ([57149](https://github.com/WordPress/gutenberg/pull/57149))
+-   Save Button: Fix the translation of the Activate button. ([57147](https://github.com/WordPress/gutenberg/pull/57147))
+-   SlotFill: Allow contextual SlotFillProviders. ([56779](https://github.com/WordPress/gutenberg/pull/56779))
+
+#### Post Editor
+
+-   Editor: Use visibility selector for PostTemplatePanel. ([57224](https://github.com/WordPress/gutenberg/pull/57224))
+-   Fix: Code editor title width in classic theme. ([56922](https://github.com/WordPress/gutenberg/pull/56922))
+
+#### Design Tools
+
+-   Allow default duotone styles in classic themes. ([57191](https://github.com/WordPress/gutenberg/pull/57191))
+-   StylesPreview: Fix endless loop of ratio calculations when on the threshold of a scrollbar. ([57090](https://github.com/WordPress/gutenberg/pull/57090))
+
+#### Interactivity API
+
+-   Fix namespaces in nested interactive regions. ([57029](https://github.com/WordPress/gutenberg/pull/57029))
+-   Fix Interactivity not working on Classic Themes. ([57396](https://github.com/WordPress/gutenberg/pull/57396))
+
+#### Collaborative Editing
+
+-   Collab editing: Ensure block attributes are serialisable. ([57025](https://github.com/WordPress/gutenberg/pull/57025))
+
+### Accessibility
+
+-   Font size picker: Fix Reset button focus loss. ([57196](https://github.com/WordPress/gutenberg/pull/57196))
+-   a11y: Apply focus style to revision items. ([57039](https://github.com/WordPress/gutenberg/pull/57039))
+-   [a11y] Fix: Use spans instead of headings on dataviews table view page title. ([56956](https://github.com/WordPress/gutenberg/pull/56956))
+
+### Performance
+
+#### Block Editor
+
+-   Block: Combine store subscriptions. ([56994](https://github.com/WordPress/gutenberg/pull/56994))
+-   Combine selectors in the 'BackgroundImagePanelItem' component. ([57159](https://github.com/WordPress/gutenberg/pull/57159))
+-   InnerBlocks: overlay: Remove viewport size condition. ([57135](https://github.com/WordPress/gutenberg/pull/57135))
+-   Prevent layout re-rendering when changing selected block. ([57136](https://github.com/WordPress/gutenberg/pull/57136))
+-   Prevent re-rendering the editor header when the selected block changes. ([57140](https://github.com/WordPress/gutenberg/pull/57140))
+-   Rewrite moving animation for better load performance. ([57133](https://github.com/WordPress/gutenberg/pull/57133))
+-   Rich text: Avoid block editor subscription if not selected. ([57226](https://github.com/WordPress/gutenberg/pull/57226))
+-   Try removing extra memoization for individual style panels. ([57160](https://github.com/WordPress/gutenberg/pull/57160))
+-   hooks: Manage save props in one place. ([57043](https://github.com/WordPress/gutenberg/pull/57043))
+
+#### Block Library
+
+-   Gallery: Combine useSelect calls. ([57240](https://github.com/WordPress/gutenberg/pull/57240))
+-   Image: Reduce 'block-editor' store subscriptions. ([57358](https://github.com/WordPress/gutenberg/pull/57358))
+-   List: Avoid useSelect in block render. ([57077](https://github.com/WordPress/gutenberg/pull/57077))
+-   Blocks: Simplify/optimise isUnmodifiedBlock. ([56919](https://github.com/WordPress/gutenberg/pull/56919))
+-   InnerBlocks: Combine store subscriptions. ([57032](https://github.com/WordPress/gutenberg/pull/57032))
+
+#### Components
+
+-   Navigator: Use CSS animations instead of framer-motion. ([56909](https://github.com/WordPress/gutenberg/pull/56909))
+-   useSelect: Only invalidate on subscribe if store changed. ([57108](https://github.com/WordPress/gutenberg/pull/57108))
+
+### Experiments
+
+#### Data Views
+
+-   Add hover style to table rows. ([57058](https://github.com/WordPress/gutenberg/pull/57058))
+-   Add: See revisions template action. ([57175](https://github.com/WordPress/gutenberg/pull/57175))
+-   Code Quality: Update: Reuse view revisions action on templates and pages. ([57208](https://github.com/WordPress/gutenberg/pull/57208))
+-   DataViews: Add list layout to templates. ([57014](https://github.com/WordPress/gutenberg/pull/57014))
+-   DataViews: Align filter implementations. ([57059](https://github.com/WordPress/gutenberg/pull/57059))
+-   DataViews: Centralize control of filter visibility in the `Filters` component. ([57056](https://github.com/WordPress/gutenberg/pull/57056))
+-   DataViews: Close actions menu upon switching layouts. ([57015](https://github.com/WordPress/gutenberg/pull/57015))
+-   DataViews: Display column header when the field is only filterable. ([57051](https://github.com/WordPress/gutenberg/pull/57051))
+-   DataViews: Fix bug on operators count for table layout. ([57048](https://github.com/WordPress/gutenberg/pull/57048))
+-   DataViews: Improve naming for easy identification in React devtools. ([57385](https://github.com/WordPress/gutenberg/pull/57385))
+-   DataViews: Improve preview. ([57116](https://github.com/WordPress/gutenberg/pull/57116))
+-   DataViews: Make `deferredRendering` prop optional. ([57334](https://github.com/WordPress/gutenberg/pull/57334))
+-   DataViews: Make `getItemId` optional. ([57308](https://github.com/WordPress/gutenberg/pull/57308))
+-   DataViews: Make filters footprint more condensed. ([56983](https://github.com/WordPress/gutenberg/pull/56983))
+-   DataViews: Memoize `onSelectionChange` callback. ([57390](https://github.com/WordPress/gutenberg/pull/57390))
+-   DataViews: Remove `paginationInfo` prop from ViewComponent. ([57306](https://github.com/WordPress/gutenberg/pull/57306))
+-   DataViews: Remove reference to edit site class. ([57075](https://github.com/WordPress/gutenberg/pull/57075))
+-   DataViews: Rename `operatorsFromField` to `sanitizeOperators`. ([57050](https://github.com/WordPress/gutenberg/pull/57050))
+-   DataViews: Update `onChangeView` memoization. ([57393](https://github.com/WordPress/gutenberg/pull/57393))
+-   DataViews: Update documentation. ([57305](https://github.com/WordPress/gutenberg/pull/57305))
+-   DataViews: Use SelectControl for selecting a page. ([57215](https://github.com/WordPress/gutenberg/pull/57215))
+-   Dataviews: Simplify pagination. ([57071](https://github.com/WordPress/gutenberg/pull/57071))
+-   Fix: Empty dropdown(s) on the grid view. ([57316](https://github.com/WordPress/gutenberg/pull/57316))
+-   Fix: Template list title font styles. ([57027](https://github.com/WordPress/gutenberg/pull/57027))
+-   Sort order: Use unicode characters instead of svg icons. ([56833](https://github.com/WordPress/gutenberg/pull/56833))
+-   Update: Make secondary actions trigger always visible. ([57174](https://github.com/WordPress/gutenberg/pull/57174))
+-   Use default variants for Filter and View buttons. ([57057](https://github.com/WordPress/gutenberg/pull/57057))
+
+#### Patterns
+
+-   Fix broken undo history stack for Pattern Overrides. ([57088](https://github.com/WordPress/gutenberg/pull/57088))
+-   Fix unsaved pattern not reflecting on pattern overrides. ([57148](https://github.com/WordPress/gutenberg/pull/57148))
+-   [Pattern Overrides] Use a single checkbox to turn on pattern overrides for all allowed attributes. ([57009](https://github.com/WordPress/gutenberg/pull/57009))
+
+#### List View
+
+-   Allow right-click to open block settings dropdown, add editor setting. ([50273](https://github.com/WordPress/gutenberg/pull/50273))
+
+### Documentation
+
+-   Add new section on markup representation of a block. ([57230](https://github.com/WordPress/gutenberg/pull/57230))
+-   Added additional explanations to attributes and supports sections. ([57120](https://github.com/WordPress/gutenberg/pull/57120))
+-   Added documentation for the text-decoration-control component. ([57184](https://github.com/WordPress/gutenberg/pull/57184))
+-   CardHeader used instead of CardFooter. ([45585](https://github.com/WordPress/gutenberg/pull/45585))
+-   Components: Update TypeScript-related tips in Contributing Guide. ([57267](https://github.com/WordPress/gutenberg/pull/57267))
+-   Doc: Block Wrapper - enclose html tag, use correct keyword `supports` not `support`. ([56906](https://github.com/WordPress/gutenberg/pull/56906))
+-   Docs/getting started readme. ([57223](https://github.com/WordPress/gutenberg/pull/57223))
+-   Docs: Add new "Build your first block" tutorial to the Getting Started section of the BEH. ([56931](https://github.com/WordPress/gutenberg/pull/56931))
+-   Docs: Fundamentals block development/block in the editor -- add page to manifest (toc). ([57179](https://github.com/WordPress/gutenberg/pull/57179))
+-   Docs: Fundamentals of Block Development - block in the editor. ([56488](https://github.com/WordPress/gutenberg/pull/56488))
+-   Enforce heading sentence case throughout the BEH. ([57143](https://github.com/WordPress/gutenberg/pull/57143))
+-   Fix grammar and typos in the Block Development Environment doc. ([57123](https://github.com/WordPress/gutenberg/pull/57123))
+-   Fix incorrect links in ToggleGroupControl docs. ([57236](https://github.com/WordPress/gutenberg/pull/57236))
+-   Fix: Typo on footnotes docs. ([57348](https://github.com/WordPress/gutenberg/pull/57348))
+-   Fixes heading hierarchy in block filters. ([57239](https://github.com/WordPress/gutenberg/pull/57239))
+-   Minor heading to improve readability and reference. ([57102](https://github.com/WordPress/gutenberg/pull/57102))
+-   Platform Docs: Fix missing link. ([57145](https://github.com/WordPress/gutenberg/pull/57145))
+-   Remove Radix UI-related documentation. ([57336](https://github.com/WordPress/gutenberg/pull/57336))
+-   Remove links to excalidraw diagrams from images. ([56980](https://github.com/WordPress/gutenberg/pull/56980))
+-   Remove the "How to use JavaScript in the Block Editor" documentation. ([57166](https://github.com/WordPress/gutenberg/pull/57166))
+-   Remove unnecessary TOCs from documentation. ([57087](https://github.com/WordPress/gutenberg/pull/57087))
+-   Restore descriptions for deprecated button props. ([37690](https://github.com/WordPress/gutenberg/pull/37690))
+-   Small heading fix. ([57098](https://github.com/WordPress/gutenberg/pull/57098))
+-   Snackbar: Remove `__unstableHTML` prop from TS. ([57218](https://github.com/WordPress/gutenberg/pull/57218))
+-   Update block toolbar and settings sidebar image. ([57203](https://github.com/WordPress/gutenberg/pull/57203))
+-   fix: Updated the link for "Building a custom block editor". ([57319](https://github.com/WordPress/gutenberg/pull/57319))
+
+### Code Quality
+
+-   Add missing block/theme json $schema property. ([57201](https://github.com/WordPress/gutenberg/pull/57201))
+-   Add missing period in block descriptions. ([57131](https://github.com/WordPress/gutenberg/pull/57131))
+-   Fix code style in Gutenberg_HTML_Tag_Processor_6_5. ([57030](https://github.com/WordPress/gutenberg/pull/57030))
+-   Font size picker: Use Button API for keeping focus on reset. ([57221](https://github.com/WordPress/gutenberg/pull/57221))
+-   Mobile: Fix getPxFromCssUnit circular dependency. ([57045](https://github.com/WordPress/gutenberg/pull/57045))
+
+#### Block Editor
+
+-   Editor: Move the Excerpt panel to the editor package. ([57096](https://github.com/WordPress/gutenberg/pull/57096))
+-   Refactor useCanContextualToolbarShow for simplicity and clarity. ([56914](https://github.com/WordPress/gutenberg/pull/56914))
+-   Remove unnecessary isDisabled option on useShortcut for BlockToolbarPopover. ([56907](https://github.com/WordPress/gutenberg/pull/56907))
+-   Replace block variation buttons with ToggleGroupControl. ([45654](https://github.com/WordPress/gutenberg/pull/45654))
+-   Replace isSmall prop #53560. ([53599](https://github.com/WordPress/gutenberg/pull/53599))
+-   Several little refactors. ([57107](https://github.com/WordPress/gutenberg/pull/57107))
+-   useBlockTypesState: Divide useSelect call into two. ([57163](https://github.com/WordPress/gutenberg/pull/57163))
+-   useInputRules: Remove unneeded check for inputRule. ([57164](https://github.com/WordPress/gutenberg/pull/57164))
+
+#### Components
+
+-   Adding unit tests for `useCompositeState` to `Composite` component. ([56645](https://github.com/WordPress/gutenberg/pull/56645))
+-   Delete experimental radix-ui based DropdownMenu component. ([55626](https://github.com/WordPress/gutenberg/pull/55626))
+-   GradientPicker: Use index while iterating over gradient entries to avoid React "duplicated key" warning. ([57361](https://github.com/WordPress/gutenberg/pull/57361))
+-   TabPanel: Refactor unit tests to @ariakit/test. ([57302](https://github.com/WordPress/gutenberg/pull/57302))
+-   Tabs: Update styling to more closely match previous implementation. ([57275](https://github.com/WordPress/gutenberg/pull/57275))
+-   ToggleGroupControl: Fix snapshots. ([57367](https://github.com/WordPress/gutenberg/pull/57367))
+-   Move kebabCase() function from block-editor package and mark it as private API. ([56758](https://github.com/WordPress/gutenberg/pull/56758))
+
+#### Block Library
+
+-   Gallery Block: Remove unused attributes property in shortcode transformation. ([57356](https://github.com/WordPress/gutenberg/pull/57356))
+-   Remove cruft in Button block editor styles. ([30950](https://github.com/WordPress/gutenberg/pull/30950))
+-   Tag Cloud: Replace 'withSelect' HoC with 'useSelect'. ([57194](https://github.com/WordPress/gutenberg/pull/57194))
+
+#### Global Styles
+
+-   Global styles revisions: Refactor sticky pagination footer to use CSS. ([57294](https://github.com/WordPress/gutenberg/pull/57294))
+-   Relocate revisions from fill to sidebar component. ([57034](https://github.com/WordPress/gutenberg/pull/57034))
+-   Simplify the conditions in GlobalStylesEditorCanvasContainerLink. ([57144](https://github.com/WordPress/gutenberg/pull/57144))
+
+#### List View
+
+-   Editor: Move and unify the inserter and list view states. ([57158](https://github.com/WordPress/gutenberg/pull/57158))
+-   Editor: Unify the list view shortcut registration and definition. ([57200](https://github.com/WordPress/gutenberg/pull/57200))
+-   ListView: Replace prop drilldown by a stable ref in store. ([57198](https://github.com/WordPress/gutenberg/pull/57198))
+
+#### Typography
+
+-   Font Library: Consolidate existing API rest endpoints. ([57282](https://github.com/WordPress/gutenberg/pull/57282))
+-   Quality: Replace wpKebabCase function with kebabCase function from components package. ([57038](https://github.com/WordPress/gutenberg/pull/57038))
+
+#### Site Editor
+
+-   Editor: Move the panel visibility state from the edit-post to the editor package. ([57012](https://github.com/WordPress/gutenberg/pull/57012))
+-   Remove `isResizing` variable from layout component as it is always false. ([57119](https://github.com/WordPress/gutenberg/pull/57119))
+-   Allow disabling and enabling comments. ([57205](https://github.com/WordPress/gutenberg/pull/57205))
+
+#### Navigation Menus
+
+-   Add basic test coverage for Navigation Menu editing mode. ([56871](https://github.com/WordPress/gutenberg/pull/56871))
+-   Fix flaky Navigation focus mode test. ([57016](https://github.com/WordPress/gutenberg/pull/57016))
+
+#### Plugin
+
+-   Implement proposal to remove the WordPress-Docs ruleset. ([56982](https://github.com/WordPress/gutenberg/pull/56982))
+-   i18n: Make menu and title labels in Gutenberg plugin translatable. ([43500](https://github.com/WordPress/gutenberg/pull/43500))
+
+#### Modules API
+
+-   Refactor, tests, and final dependencies array structure. ([57231](https://github.com/WordPress/gutenberg/pull/57231))
+
+### Tools
+
+-   Dependency Extraction Webpack Plugin: Fix test issues. ([57332](https://github.com/WordPress/gutenberg/pull/57332))
+
+#### Testing
+
+-   Add an end-to-end test to check image upload working in site editor. ([57086](https://github.com/WordPress/gutenberg/pull/57086))
+-   Components: Add unit test `__experimentalExpandOnFocus` unit tests for `FormTokenField`. ([57122](https://github.com/WordPress/gutenberg/pull/57122))
+-   Global styles revisions e2e: Tidy up selectors to open revisions panel. ([57146](https://github.com/WordPress/gutenberg/pull/57146))
+-   Migrate 'Comments Form' end-to-end tests to Playwright. ([57337](https://github.com/WordPress/gutenberg/pull/57337))
+-   Migrate Site Editor 'settings sidebar' end-to-end tests to Playwright. ([57392](https://github.com/WordPress/gutenberg/pull/57392))
+-   Migrate remaining 'block switcher' end-to-end tests to Playwright. ([57381](https://github.com/WordPress/gutenberg/pull/57381))
+-   e2e: Try to fix flaky font-library test. ([57092](https://github.com/WordPress/gutenberg/pull/57092))
+
+#### Build Tooling
+
+-   DependencyExtractionWebpackPlugin: Drop webpack4 and node<18. ([57303](https://github.com/WordPress/gutenberg/pull/57303))
+-   Disable webpack perf hints when compiling packages. ([57155](https://github.com/WordPress/gutenberg/pull/57155))
+-   Update to Node.js 20.x. ([56331](https://github.com/WordPress/gutenberg/pull/56331))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @dotslashbit: fix: Updated the link for "Building a custom block editor". ([57319](https://github.com/WordPress/gutenberg/pull/57319))
+-   @koen12344: Restore descriptions for deprecated button props. ([37690](https://github.com/WordPress/gutenberg/pull/37690))
+-   @kurudrive: Fix DayButton dot position and expand Button area. ([55502](https://github.com/WordPress/gutenberg/pull/55502))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@andrewhayward @andrewserong @anton-vlasenko @arthur791004 @atachibana @bacoords @BenjaminZekavica @brookewp @c4rl0sbr4v0 @chad1008 @ciampo @colorful-tones @DAreRodz @dcalhoun @ddryo @derekblank @desrosj @dotslashbit @ellatrix @fluiddot @geriux @getdave @glendaviesnz @gvgvgvijayan @jameskoster @jasmussen @jeryj @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @koen12344 @kurudrive @luisherranz @Mamaduka @matiasbenedetto @mcsf @mhimon @mirka @ndiego @ntsekouras @oandregal @ockham @ramonjd @richtabor @SiobhyB @sirreal @stokesman @t-hamano @tellthemachines @TimBroddin @youknowriad @yuliyan
+
+= 17.2.4 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Site editor: fix image upload bug ([57040](https://github.com/WordPress/gutenberg/pull/57040))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@glendaviesnz
+
+= 17.3.0 =
+
+## Changelog
+
+### Bug Fixes
+
+-   (edit-site)(use-init-edited-entity-from-url) Safely access `toString()` on `siteData`'s `page_on_front`. ([57035](https://github.com/WordPress/gutenberg/pull/57035))
+
+#### Components
+
+-   Fix form token field suggestion list reopening after blurring the input. ([57002](https://github.com/WordPress/gutenberg/pull/57002))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@fullofcaffeine @talldan
+
+= 17.3.0-rc.1 =
+
+## Changelog
+
+### Enhancements
+
+-   Components: Replace `TabPanel` with `Tabs` in the editor's `ColorPanel`. ([56878](https://github.com/WordPress/gutenberg/pull/56878))
+-   Editor: Move the edit template blocks notification to editor package. ([56901](https://github.com/WordPress/gutenberg/pull/56901))
+-   Editor: Unify the preview dropdown between post and site editors. ([56921](https://github.com/WordPress/gutenberg/pull/56921))
+-   Editor: Use the same PostTemplatePanel between post and site editors. ([56817](https://github.com/WordPress/gutenberg/pull/56817))
+-   Tabs: Replace `id` with new `tabId` prop. ([56883](https://github.com/WordPress/gutenberg/pull/56883))
+-   Update main toolbar buttons to all be compact. ([56635](https://github.com/WordPress/gutenberg/pull/56635), [56729](https://github.com/WordPress/gutenberg/pull/56729))
+-   Update preferences organization. ([56481](https://github.com/WordPress/gutenberg/pull/56481))
+
+#### Components
+
+-   FocalPointPicker with \_\_next40pxDefaultSize. ([56021](https://github.com/WordPress/gutenberg/pull/56021))
+-   Font Library: Improve usability of font variant selection. ([56158](https://github.com/WordPress/gutenberg/pull/56158))
+-   Tabs: Sync browser focus to selected tab in controlled mode. ([56658](https://github.com/WordPress/gutenberg/pull/56658))
+-   Use consistent styling for duotone panels. ([56801](https://github.com/WordPress/gutenberg/pull/56801))
+-   `BorderControl`: Fix button styles. ([56730](https://github.com/WordPress/gutenberg/pull/56730))
+-   `DimensionControl`: Add \_\_next40pxDefaultSize prop. ([56805](https://github.com/WordPress/gutenberg/pull/56805))
+-   `FontSizePicker`: Add opt-in prop for 40px default size. ([56804](https://github.com/WordPress/gutenberg/pull/56804))
+-   `QueryControls`: Add opt-in prop for 40px default size. ([56576](https://github.com/WordPress/gutenberg/pull/56576))
+
+#### Block Library
+
+-   Control dimensions (margin and padding) of the list-item block. ([55874](https://github.com/WordPress/gutenberg/pull/55874))
+-   Consistent default typography controls across blocks. ([55208](https://github.com/WordPress/gutenberg/pull/55208))
+-   Social Icons: Add Gravatar service. ([56544](https://github.com/WordPress/gutenberg/pull/56544))
+-   Tweak table block placeholder with \_\_next40pxDefaultSize props. ([56935](https://github.com/WordPress/gutenberg/pull/56935))
+
+#### Site Editor
+
+-   Merge the post only mode and the post editor. ([56671](https://github.com/WordPress/gutenberg/pull/56671))
+-   Site Editor Sidebar: Add "Areas" details panel to all templates and update icon. ([55677](https://github.com/WordPress/gutenberg/pull/55677))
+
+#### Block Editor
+
+-   Allow dragging between adjacent container blocks based on a threshold. ([56466](https://github.com/WordPress/gutenberg/pull/56466))
+-   Components: Replace `TabPanel` with `Tabs` in the editor's `ColorGradientControl`. ([56351](https://github.com/WordPress/gutenberg/pull/56351))
+
+#### Data Views
+
+-   Update data view layout. ([56786](https://github.com/WordPress/gutenberg/pull/56786))
+
+#### Layout
+
+-   Match the front end layout classname in the editor. ([56774](https://github.com/WordPress/gutenberg/pull/56774))
+
+#### Global Styles
+
+-   Global style revisions: Show change summary on selected item. ([56577](https://github.com/WordPress/gutenberg/pull/56577))
+
+#### Icons
+
+-   Another round of HiDPI icon tweaks. ([56532](https://github.com/WordPress/gutenberg/pull/56532))
+
+#### Media
+
+-   Update external images panel in post publish sidebar. ([55524](https://github.com/WordPress/gutenberg/pull/55524))
+
+#### Post Editor
+
+-   Implement `Tabs` in editor settings. ([55360](https://github.com/WordPress/gutenberg/pull/55360))
+
+### Bug Fixes
+
+-   Create-block-interactive-template: Add all files to the generated plugin zip. ([56943](https://github.com/WordPress/gutenberg/pull/56943))
+-   Create-block-interactive-template: Prevent crash when Gutenberg plugin is not installed. ([56941](https://github.com/WordPress/gutenberg/pull/56941))
+-   Fix end-to-end test: Update how we find the template title to match markup changes. ([56992](https://github.com/WordPress/gutenberg/pull/56992))
+-   Fix: Fatal php error if a template was created by an author that was deleted. ([56990](https://github.com/WordPress/gutenberg/pull/56990))
+-   Fix: PHP 8.1 deprecated warning strpos(). ([56171](https://github.com/WordPress/gutenberg/pull/56171))
+-   Fix: Use span on template list titles. ([56955](https://github.com/WordPress/gutenberg/pull/56955))
+-   Font Library: Add font family and font face preview keys to schema. ([56793](https://github.com/WordPress/gutenberg/pull/56793))
+-   Remove unnecessary CSS for shrinking central header area. ([56220](https://github.com/WordPress/gutenberg/pull/56220))
+-   Revert format types hook refactor. ([56859](https://github.com/WordPress/gutenberg/pull/56859))
+-   Show template center UI when no block is selected. ([56217](https://github.com/WordPress/gutenberg/pull/56217))
+-   setImmutably: Don't clone all objects. ([56612](https://github.com/WordPress/gutenberg/pull/56612))
+
+#### Block Library
+
+-   Fix error when using a navigation block that returns an empty fallback result. ([56629](https://github.com/WordPress/gutenberg/pull/56629))
+-   Fixture Tests: Correctly generate fixture files for form-related blocks. ([56719](https://github.com/WordPress/gutenberg/pull/56719))
+-   Image: Fix resetting behaviour for alt image text. ([56809](https://github.com/WordPress/gutenberg/pull/56809))
+-   Social Links Block: Prevent Theme Styles Distorting Size. ([56301](https://github.com/WordPress/gutenberg/pull/56301))
+-   Update image block save to only save align none class. ([56449](https://github.com/WordPress/gutenberg/pull/56449))
+
+#### Components
+
+-   DropdownMenuV2Ariakit: Prevent prefix collapsing if all radios or checkboxes are unselected. ([56720](https://github.com/WordPress/gutenberg/pull/56720))
+-   FormToggle: Do not use "/" math operator. ([56672](https://github.com/WordPress/gutenberg/pull/56672))
+-   PaletteEdit: Temporary custom gradient not saving. ([56896](https://github.com/WordPress/gutenberg/pull/56896))
+-   `ToggleGroupControl`: React correctly to external controlled updates. ([56678](https://github.com/WordPress/gutenberg/pull/56678))
+
+#### Block Editor
+
+-   Apply \_\_next40pxDefaultSize to TextControl and Button component in renaming UIs. ([56933](https://github.com/WordPress/gutenberg/pull/56933))
+-   Pattern inserter: Fix Broken preview layout. ([56814](https://github.com/WordPress/gutenberg/pull/56814))
+-   Patterns: Keep synced pattern when added via drag and drop. ([56924](https://github.com/WordPress/gutenberg/pull/56924))
+
+#### Design Tools
+
+-   Background image support: Fix duplicate output of styling rules. ([56997](https://github.com/WordPress/gutenberg/pull/56997))
+-   Fix sticky position in classic themes with appearance tools support. ([56743](https://github.com/WordPress/gutenberg/pull/56743))
+
+#### Post Editor
+
+-   Editor Canvas: Fix animation when device type changes. ([56970](https://github.com/WordPress/gutenberg/pull/56970))
+-   Editor: Fix display of edit template blocks notification. ([56978](https://github.com/WordPress/gutenberg/pull/56978))
+
+#### Site Editor
+
+-   Fix active edited post. ([56863](https://github.com/WordPress/gutenberg/pull/56863))
+-   Show back button when editing navigation and template area in-place with no URL params. ([56741](https://github.com/WordPress/gutenberg/pull/56741))
+
+#### Typography
+
+-   Fix order of typography sizes and families. ([56659](https://github.com/WordPress/gutenberg/pull/56659))
+-   Font Library: Fix font uninstallation. ([56762](https://github.com/WordPress/gutenberg/pull/56762))
+
+#### Navigation in Site View
+
+-   Navigation editor: Fix content mode. ([56856](https://github.com/WordPress/gutenberg/pull/56856))
+
+#### Patterns
+
+-   Fix top position and height of Pattern Modal Sidebar. ([56787](https://github.com/WordPress/gutenberg/pull/56787))
+
+#### Interactivity API
+
+-   Start using modules in the interactive create-block template. ([56694](https://github.com/WordPress/gutenberg/pull/56694))
+
+#### Layout
+
+-   Fix input not showing when switching to "Fixed" width. ([56660](https://github.com/WordPress/gutenberg/pull/56660))
+
+#### Data Views
+
+-   Align data view icon usage. ([56602](https://github.com/WordPress/gutenberg/pull/56602))
+
+#### Block Styles
+
+-   Consolidate and resolve display issues between InserterPreviewPanel and BlockStylesPreviewPanel. ([56011](https://github.com/WordPress/gutenberg/pull/56011))
+
+#### Inspector Controls
+
+-   Decode some characters if used in taxonomy name so it's displayed correctly in Query Loop filters. ([50376](https://github.com/WordPress/gutenberg/pull/50376))
+
+### Accessibility
+
+#### Data Views
+
+-   Add scroll padding to dataviews container. ([56946](https://github.com/WordPress/gutenberg/pull/56946))
+-   Adding `aria-sort` to table view headers. ([56860](https://github.com/WordPress/gutenberg/pull/56860))
+-   Fix: Use span instead of heading for the template titles. ([56785](https://github.com/WordPress/gutenberg/pull/56785))
+
+#### Post Editor
+
+-   Avoid to show unnecessary Tooltip for the Post Schedule button. ([56759](https://github.com/WordPress/gutenberg/pull/56759))
+
+#### Block Editor
+
+-   Increase right padding of URL field to take the Submit button into account. ([56685](https://github.com/WordPress/gutenberg/pull/56685))
+
+#### Site Editor
+
+-   Shorter screen reader announcement after changing pages. ([56339](https://github.com/WordPress/gutenberg/pull/56339))
+
+#### Components
+
+-   Use tooltip for the Timezone only when necessary. ([56214](https://github.com/WordPress/gutenberg/pull/56214))
+
+### Performance
+
+-   Block editor: Make all BlockEdit hooks pure. ([56813](https://github.com/WordPress/gutenberg/pull/56813))
+-   Block editor: Remove 4 useSelect in favour of context. ([56915](https://github.com/WordPress/gutenberg/pull/56915))
+-   Block editor: hooks: Avoid BlockEdit filter for content locking UI. ([56957](https://github.com/WordPress/gutenberg/pull/56957))
+-   Block editor: hooks: Share block settings. ([56852](https://github.com/WordPress/gutenberg/pull/56852))
+-   Keycodes: Avoid regex for capital case. ([56822](https://github.com/WordPress/gutenberg/pull/56822))
+-   Measure typing without inspector. ([56753](https://github.com/WordPress/gutenberg/pull/56753))
+-   Media upload component: Lazy mount. ([56958](https://github.com/WordPress/gutenberg/pull/56958))
+-   Paragraph: Store subscription for selected block only. ([56967](https://github.com/WordPress/gutenberg/pull/56967))
+-   Perf: Reopen inspector for remaining tests. ([56780](https://github.com/WordPress/gutenberg/pull/56780))
+-   useBlockProps: Combine store subscriptions. ([56847](https://github.com/WordPress/gutenberg/pull/56847))
+
+#### Block Editor
+
+-   Improve opening inserter in post editor. ([57006](https://github.com/WordPress/gutenberg/pull/57006))
+-   hooks: Subscribe only to relevant attributes. ([56783](https://github.com/WordPress/gutenberg/pull/56783))
+
+#### Site Editor
+
+-   Fix typing performance by not rendering sidebar. ([56927](https://github.com/WordPress/gutenberg/pull/56927))
+
+#### Components
+
+-   ToolsPanel: Fix deregister/register on type. ([56770](https://github.com/WordPress/gutenberg/pull/56770))
+
+#### Modules API
+
+-   Load the import map polyfill only when there is an import map. ([56699](https://github.com/WordPress/gutenberg/pull/56699))
+
+#### Post Editor
+
+-   Editor: Avoid double parsing content in 'getSuggestedPostFormat' selelector. ([56679](https://github.com/WordPress/gutenberg/pull/56679))
+
+### Experiments
+
+#### Data Views
+
+-   DataViews: Add story. ([56761](https://github.com/WordPress/gutenberg/pull/56761))
+-   DataViews: Add support for `NOT IN` operator in filter. ([56479](https://github.com/WordPress/gutenberg/pull/56479))
+-   DataViews: Centralize the view definition and rename `list` to `table`. ([56693](https://github.com/WordPress/gutenberg/pull/56693))
+-   DataViews: Do not export strings constants. ([56754](https://github.com/WordPress/gutenberg/pull/56754))
+-   DataViews: Export the view components as defaults. ([56677](https://github.com/WordPress/gutenberg/pull/56677))
+-   DataViews: Fix dropdown menu actions with modal. ([56760](https://github.com/WordPress/gutenberg/pull/56760))
+-   DataViews: Hide pagination if we have only one page. ([56948](https://github.com/WordPress/gutenberg/pull/56948))
+-   DataViews: Implement `NOT IN` operator for author filter in templates. ([56777](https://github.com/WordPress/gutenberg/pull/56777))
+-   DataViews: Iterate on list view. ([56746](https://github.com/WordPress/gutenberg/pull/56746))
+-   DataViews: Make `Actions` styles the same as any other column header. ([56654](https://github.com/WordPress/gutenberg/pull/56654))
+-   DataViews: Make `mediaField` not hidable. ([56643](https://github.com/WordPress/gutenberg/pull/56643))
+-   DataViews: Rename view components. ([56709](https://github.com/WordPress/gutenberg/pull/56709))
+-   DataViews: Render data async conditionally. ([56851](https://github.com/WordPress/gutenberg/pull/56851))
+-   DataViews: Set proper role for AddFilter's items. ([56714](https://github.com/WordPress/gutenberg/pull/56714))
+-   DataViews: Set proper semantics for dropdown items. ([56676](https://github.com/WordPress/gutenberg/pull/56676))
+-   DataViews: Update sorting semantics. ([56717](https://github.com/WordPress/gutenberg/pull/56717))
+-   Dataviews: Extract to dedicated bundled package. ([56721](https://github.com/WordPress/gutenberg/pull/56721))
+
+#### Block Validation/Deprecation
+
+-   Input Field Block: Use `useblockProps` hook in save function. ([56507](https://github.com/WordPress/gutenberg/pull/56507))
+
+#### Patterns
+
+-   Implement partially synced patterns behind an experimental flag. ([56235](https://github.com/WordPress/gutenberg/pull/56235))
+
+### Documentation
+
+-   Add the nested blocks chapter to the platform documentation. ([56689](https://github.com/WordPress/gutenberg/pull/56689))
+-   Components: Update CHANGELOG.md. ([56960](https://github.com/WordPress/gutenberg/pull/56960))
+-   Doc: Search Control - add Storybook link. ([56815](https://github.com/WordPress/gutenberg/pull/56815))
+-   Doc: Spinner - add Storybook link. ([56818](https://github.com/WordPress/gutenberg/pull/56818))
+-   Docs: Add storybook link for spinner component. ([56953](https://github.com/WordPress/gutenberg/pull/56953))
+-   Docs: Fix {% end %} tab position to show the text. ([56735](https://github.com/WordPress/gutenberg/pull/56735))
+-   Docs: Fundamentals of Block Development - Minor fixes - registration-of-a-block. ([56731](https://github.com/WordPress/gutenberg/pull/56731))
+-   Docs: Fundamentals of Block Development - add links. ([56700](https://github.com/WordPress/gutenberg/pull/56700))
+-   Docs: Fundamentals of Block Development ---- Small fixes for "Block wrapper". ([56651](https://github.com/WordPress/gutenberg/pull/56651))
+-   Link to Dashicons. ([56872](https://github.com/WordPress/gutenberg/pull/56872))
+-   Platform Docs: Add trusted by section. ([56749](https://github.com/WordPress/gutenberg/pull/56749))
+-   Revert "Doc: Spinner - add Storybook link". ([56913](https://github.com/WordPress/gutenberg/pull/56913))
+-   Update Getting Started Guide for Gutenberg 17.2. ([56674](https://github.com/WordPress/gutenberg/pull/56674))
+-   Update InnerBlocks defaultblock doc usage. ([56728](https://github.com/WordPress/gutenberg/pull/56728))
+-   Update formatting and fix grammar in the Block Editor Handbook readme. ([56798](https://github.com/WordPress/gutenberg/pull/56798))
+
+### Code Quality
+
+-   Block editor: hooks: Avoid getEditWrapperProps. ([56912](https://github.com/WordPress/gutenberg/pull/56912))
+-   Block lib: Use RichText.isEmpty where forgotten. ([56726](https://github.com/WordPress/gutenberg/pull/56726))
+-   Block library: Reusable caption component util. ([56606](https://github.com/WordPress/gutenberg/pull/56606))
+-   Core data revisions: Remove hardcoded supports constant. ([56701](https://github.com/WordPress/gutenberg/pull/56701))
+-   Editor: Cleanup default editor mode handling. ([56819](https://github.com/WordPress/gutenberg/pull/56819))
+-   Editor: Move the BlockCanvas component within the EditorCanvas component. ([56850](https://github.com/WordPress/gutenberg/pull/56850))
+-   Editor: Move the device type state to the editor package. ([56866](https://github.com/WordPress/gutenberg/pull/56866))
+-   Editor: Unify device preview styles. ([56904](https://github.com/WordPress/gutenberg/pull/56904))
+-   Fix PHP linter failing. ([56905](https://github.com/WordPress/gutenberg/pull/56905))
+-   Framework: Bundle the BlockTools component within BlockCanvas. ([56996](https://github.com/WordPress/gutenberg/pull/56996))
+-   Move `useDebouncedInput` hook to @wordpress/compose package. ([56744](https://github.com/WordPress/gutenberg/pull/56744))
+-   Post Editor: Rely on the editor store for the template mode state. ([56716](https://github.com/WordPress/gutenberg/pull/56716))
+-   Refactor <BlockToolbar />. ([56335](https://github.com/WordPress/gutenberg/pull/56335))
+-   Remove Block Tools BackCompat. ([56874](https://github.com/WordPress/gutenberg/pull/56874))
+-   Site and Post Editor: Unify the DocumentBar component. ([56778](https://github.com/WordPress/gutenberg/pull/56778))
+-   getValueFromObjectPath: Remove memize. ([56711](https://github.com/WordPress/gutenberg/pull/56711))
+
+#### Block Editor
+
+-   Don't render undefined classname in useBlockProps hook. ([56923](https://github.com/WordPress/gutenberg/pull/56923))
+-   One hook to rule them all: Preparation for a block supports API. ([56862](https://github.com/WordPress/gutenberg/pull/56862))
+-   RichText: Pass value to store. ([43204](https://github.com/WordPress/gutenberg/pull/43204))
+-   hooks: Manage BlockListBlock filters in one place. ([56875](https://github.com/WordPress/gutenberg/pull/56875))
+
+#### Global Styles
+
+-   Command Palette: Use getRevisions instead of deprecated selector. ([56738](https://github.com/WordPress/gutenberg/pull/56738))
+-   Global styles revisions: Remove PHP unit tests that are running in Core. ([56492](https://github.com/WordPress/gutenberg/pull/56492))
+
+#### Components
+
+-   Site editor: Do not use navigator's internal classname. ([56911](https://github.com/WordPress/gutenberg/pull/56911))
+
+#### Data Views
+
+-   DataViews: Remove TanStack. ([56873](https://github.com/WordPress/gutenberg/pull/56873))
+
+### Tools
+
+-   Env: Migrate to Compose V2. ([51339](https://github.com/WordPress/gutenberg/pull/51339))
+-   Scripts: Fix CSS imports not minified. ([56516](https://github.com/WordPress/gutenberg/pull/56516))
+-   wp-env: Make env-cwd option work on Windows. ([56265](https://github.com/WordPress/gutenberg/pull/56265))
+
+#### Testing
+
+-   Migrate 'editor multi entity saving' end-to-end tests to Playwright. ([56670](https://github.com/WordPress/gutenberg/pull/56670))
+-   Migrate 'inner-blocks-locking-all-embed' end-to-end tests to Playwright. ([56673](https://github.com/WordPress/gutenberg/pull/56673))
+-   Migrate 'site editor export' end-to-end tests to Playwright. ([56675](https://github.com/WordPress/gutenberg/pull/56675))
+-   RN: Add watch mode for native tests. ([56788](https://github.com/WordPress/gutenberg/pull/56788))
+-   Scripts: Enable skipping Playwright browser installation. ([56594](https://github.com/WordPress/gutenberg/pull/56594))
+-   Tabs: Implement `ariakit/test` in unit tests. ([56835](https://github.com/WordPress/gutenberg/pull/56835))
+-   `CustomSelectControl`: Add additional unit tests. ([56575](https://github.com/WordPress/gutenberg/pull/56575))
+
+### Copy
+
+-   Copy/fix capitalization of WordPress. ([56834](https://github.com/WordPress/gutenberg/pull/56834))
+
+#### Site Editor
+
+-   Improve text and design of the block removal warnings. ([56869](https://github.com/WordPress/gutenberg/pull/56869))
+
+#### Global Styles
+
+-   Global styles welcome guide: Add a space between translated strings. ([56839](https://github.com/WordPress/gutenberg/pull/56839))
+
+#### Block Library
+
+-   Simplify page list edit warning. ([56829](https://github.com/WordPress/gutenberg/pull/56829))
+
+#### Patterns
+
+-   End pattern page descriptions with a period. ([56828](https://github.com/WordPress/gutenberg/pull/56828))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @benoitchantre: Scripts: Fix CSS imports not minified. ([56516](https://github.com/WordPress/gutenberg/pull/56516))
+-   @kmanijak: Decode some characters if used in taxonomy name so it's displayed correctly in Query Loop filters. ([50376](https://github.com/WordPress/gutenberg/pull/50376))
+-   @lithrel: Env: Migrate to Compose V2. ([51339](https://github.com/WordPress/gutenberg/pull/51339))
+-   @nk-o: Fix: PHP 8.1 deprecated warning strpos(). ([56171](https://github.com/WordPress/gutenberg/pull/56171))
+-   @taylorgorman: Link to Dashicons. ([56872](https://github.com/WordPress/gutenberg/pull/56872))
+-   @valerogarte: #55702 - Control dimensions (margin and padding) of the list-item block. ([55874](https://github.com/WordPress/gutenberg/pull/55874))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@afercia @ajlende @alexstine @andrewhayward @andrewserong @apeatling @atachibana @Aurorum @benoitchantre @bph @brookewp @chad1008 @ciampo @colorful-tones @dcalhoun @derekblank @draganescu @ellatrix @fluiddot @geriux @getdave @jameskoster @jasmussen @jeherve @jeryj @jffng @jonathanbossenger @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @kmanijak @lithrel @luisherranz @Mamaduka @matiasbenedetto @mikachan @miminari @mtias @ndiego @nk-o @ntsekouras @oandregal @ramonjd @richtabor @scruffian @SiobhyB @t-hamano @talldan @taylorgorman @tellthemachines @tyxla @valerogarte @WunderBart @youknowriad
+
+= 17.2.3 =
+
+## Changelog
+
+### Bug Fixes
+
+#### Components
+
+-   `FormTokenField`: Fix a regression where the suggestion list would re-open after clicking away from the input ([#57002](https://github.com/WordPress/gutenberg/pull/57002)).
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@talldan
+
+= 17.2.2 =
+
+This patch release fixes a WSOD which could occur in the site editor. See https://github.com/WordPress/gutenberg/pull/57035.
+
+= 17.3.0-rc.1 =
+
+## Changelog
+
+### Enhancements
+
+-   Components: Replace `TabPanel` with `Tabs` in the editor's `ColorPanel`. ([56878](https://github.com/WordPress/gutenberg/pull/56878))
+-   Editor: Move the edit template blocks notification to editor package. ([56901](https://github.com/WordPress/gutenberg/pull/56901))
+-   Editor: Unify the preview dropdown between post and site editors. ([56921](https://github.com/WordPress/gutenberg/pull/56921))
+-   Editor: Use the same PostTemplatePanel between post and site editors. ([56817](https://github.com/WordPress/gutenberg/pull/56817))
+-   Tabs: Replace `id` with new `tabId` prop. ([56883](https://github.com/WordPress/gutenberg/pull/56883))
+-   Update main toolbar buttons to all be compact. ([56635](https://github.com/WordPress/gutenberg/pull/56635), [56729](https://github.com/WordPress/gutenberg/pull/56729))
+-   Update preferences organization. ([56481](https://github.com/WordPress/gutenberg/pull/56481))
+
+#### Components
+
+-   FocalPointPicker with \_\_next40pxDefaultSize. ([56021](https://github.com/WordPress/gutenberg/pull/56021))
+-   Font Library: Improve usability of font variant selection. ([56158](https://github.com/WordPress/gutenberg/pull/56158))
+-   Tabs: Sync browser focus to selected tab in controlled mode. ([56658](https://github.com/WordPress/gutenberg/pull/56658))
+-   Use consistent styling for duotone panels. ([56801](https://github.com/WordPress/gutenberg/pull/56801))
+-   `BorderControl`: Fix button styles. ([56730](https://github.com/WordPress/gutenberg/pull/56730))
+-   `DimensionControl`: Add \_\_next40pxDefaultSize prop. ([56805](https://github.com/WordPress/gutenberg/pull/56805))
+-   `FontSizePicker`: Add opt-in prop for 40px default size. ([56804](https://github.com/WordPress/gutenberg/pull/56804))
+-   `QueryControls`: Add opt-in prop for 40px default size. ([56576](https://github.com/WordPress/gutenberg/pull/56576))
+
+#### Block Library
+
+-   Control dimensions (margin and padding) of the list-item block. ([55874](https://github.com/WordPress/gutenberg/pull/55874))
+-   Consistent default typography controls across blocks. ([55208](https://github.com/WordPress/gutenberg/pull/55208))
+-   Social Icons: Add Gravatar service. ([56544](https://github.com/WordPress/gutenberg/pull/56544))
+-   Tweak table block placeholder with \_\_next40pxDefaultSize props. ([56935](https://github.com/WordPress/gutenberg/pull/56935))
+
+#### Site Editor
+
+-   Merge the post only mode and the post editor. ([56671](https://github.com/WordPress/gutenberg/pull/56671))
+-   Site Editor Sidebar: Add "Areas" details panel to all templates and update icon. ([55677](https://github.com/WordPress/gutenberg/pull/55677))
+
+#### Block Editor
+
+-   Allow dragging between adjacent container blocks based on a threshold. ([56466](https://github.com/WordPress/gutenberg/pull/56466))
+-   Components: Replace `TabPanel` with `Tabs` in the editor's `ColorGradientControl`. ([56351](https://github.com/WordPress/gutenberg/pull/56351))
+
+#### Data Views
+
+-   Update data view layout. ([56786](https://github.com/WordPress/gutenberg/pull/56786))
+
+#### Layout
+
+-   Match the front end layout classname in the editor. ([56774](https://github.com/WordPress/gutenberg/pull/56774))
+
+#### Global Styles
+
+-   Global style revisions: Show change summary on selected item. ([56577](https://github.com/WordPress/gutenberg/pull/56577))
+
+#### Icons
+
+-   Another round of HiDPI icon tweaks. ([56532](https://github.com/WordPress/gutenberg/pull/56532))
+
+#### Media
+
+-   Update external images panel in post publish sidebar. ([55524](https://github.com/WordPress/gutenberg/pull/55524))
+
+#### Post Editor
+
+-   Implement `Tabs` in editor settings. ([55360](https://github.com/WordPress/gutenberg/pull/55360))
+
+### Bug Fixes
+
+-   Create-block-interactive-template: Add all files to the generated plugin zip. ([56943](https://github.com/WordPress/gutenberg/pull/56943))
+-   Create-block-interactive-template: Prevent crash when Gutenberg plugin is not installed. ([56941](https://github.com/WordPress/gutenberg/pull/56941))
+-   Fix end-to-end test: Update how we find the template title to match markup changes. ([56992](https://github.com/WordPress/gutenberg/pull/56992))
+-   Fix: Fatal php error if a template was created by an author that was deleted. ([56990](https://github.com/WordPress/gutenberg/pull/56990))
+-   Fix: PHP 8.1 deprecated warning strpos(). ([56171](https://github.com/WordPress/gutenberg/pull/56171))
+-   Fix: Use span on template list titles. ([56955](https://github.com/WordPress/gutenberg/pull/56955))
+-   Font Library: Add font family and font face preview keys to schema. ([56793](https://github.com/WordPress/gutenberg/pull/56793))
+-   Remove unnecessary CSS for shrinking central header area. ([56220](https://github.com/WordPress/gutenberg/pull/56220))
+-   Revert format types hook refactor. ([56859](https://github.com/WordPress/gutenberg/pull/56859))
+-   Show template center UI when no block is selected. ([56217](https://github.com/WordPress/gutenberg/pull/56217))
+-   setImmutably: Don't clone all objects. ([56612](https://github.com/WordPress/gutenberg/pull/56612))
+
+#### Block Library
+
+-   Fix error when using a navigation block that returns an empty fallback result. ([56629](https://github.com/WordPress/gutenberg/pull/56629))
+-   Fixture Tests: Correctly generate fixture files for form-related blocks. ([56719](https://github.com/WordPress/gutenberg/pull/56719))
+-   Image: Fix resetting behaviour for alt image text. ([56809](https://github.com/WordPress/gutenberg/pull/56809))
+-   Social Links Block: Prevent Theme Styles Distorting Size. ([56301](https://github.com/WordPress/gutenberg/pull/56301))
+-   Update image block save to only save align none class. ([56449](https://github.com/WordPress/gutenberg/pull/56449))
+
+#### Components
+
+-   DropdownMenuV2Ariakit: Prevent prefix collapsing if all radios or checkboxes are unselected. ([56720](https://github.com/WordPress/gutenberg/pull/56720))
+-   FormToggle: Do not use "/" math operator. ([56672](https://github.com/WordPress/gutenberg/pull/56672))
+-   PaletteEdit: Temporary custom gradient not saving. ([56896](https://github.com/WordPress/gutenberg/pull/56896))
+-   `ToggleGroupControl`: React correctly to external controlled updates. ([56678](https://github.com/WordPress/gutenberg/pull/56678))
+
+#### Block Editor
+
+-   Apply \_\_next40pxDefaultSize to TextControl and Button component in renaming UIs. ([56933](https://github.com/WordPress/gutenberg/pull/56933))
+-   Pattern inserter: Fix Broken preview layout. ([56814](https://github.com/WordPress/gutenberg/pull/56814))
+-   Patterns: Keep synced pattern when added via drag and drop. ([56924](https://github.com/WordPress/gutenberg/pull/56924))
+
+#### Design Tools
+
+-   Background image support: Fix duplicate output of styling rules. ([56997](https://github.com/WordPress/gutenberg/pull/56997))
+-   Fix sticky position in classic themes with appearance tools support. ([56743](https://github.com/WordPress/gutenberg/pull/56743))
+
+#### Post Editor
+
+-   Editor Canvas: Fix animation when device type changes. ([56970](https://github.com/WordPress/gutenberg/pull/56970))
+-   Editor: Fix display of edit template blocks notification. ([56978](https://github.com/WordPress/gutenberg/pull/56978))
+
+#### Site Editor
+
+-   Fix active edited post. ([56863](https://github.com/WordPress/gutenberg/pull/56863))
+-   Show back button when editing navigation and template area in-place with no URL params. ([56741](https://github.com/WordPress/gutenberg/pull/56741))
+
+#### Typography
+
+-   Fix order of typography sizes and families. ([56659](https://github.com/WordPress/gutenberg/pull/56659))
+-   Font Library: Fix font uninstallation. ([56762](https://github.com/WordPress/gutenberg/pull/56762))
+
+#### Navigation in Site View
+
+-   Navigation editor: Fix content mode. ([56856](https://github.com/WordPress/gutenberg/pull/56856))
+
+#### Patterns
+
+-   Fix top position and height of Pattern Modal Sidebar. ([56787](https://github.com/WordPress/gutenberg/pull/56787))
+
+#### Interactivity API
+
+-   Start using modules in the interactive create-block template. ([56694](https://github.com/WordPress/gutenberg/pull/56694))
+
+#### Layout
+
+-   Fix input not showing when switching to "Fixed" width. ([56660](https://github.com/WordPress/gutenberg/pull/56660))
+
+#### Data Views
+
+-   Align data view icon usage. ([56602](https://github.com/WordPress/gutenberg/pull/56602))
+
+#### Block Styles
+
+-   Consolidate and resolve display issues between InserterPreviewPanel and BlockStylesPreviewPanel. ([56011](https://github.com/WordPress/gutenberg/pull/56011))
+
+#### Inspector Controls
+
+-   Decode some characters if used in taxonomy name so it's displayed correctly in Query Loop filters. ([50376](https://github.com/WordPress/gutenberg/pull/50376))
+
+### Accessibility
+
+#### Data Views
+
+-   Add scroll padding to dataviews container. ([56946](https://github.com/WordPress/gutenberg/pull/56946))
+-   Adding `aria-sort` to table view headers. ([56860](https://github.com/WordPress/gutenberg/pull/56860))
+-   Fix: Use span instead of heading for the template titles. ([56785](https://github.com/WordPress/gutenberg/pull/56785))
+
+#### Post Editor
+
+-   Avoid to show unnecessary Tooltip for the Post Schedule button. ([56759](https://github.com/WordPress/gutenberg/pull/56759))
+
+#### Block Editor
+
+-   Increase right padding of URL field to take the Submit button into account. ([56685](https://github.com/WordPress/gutenberg/pull/56685))
+
+#### Site Editor
+
+-   Shorter screen reader announcement after changing pages. ([56339](https://github.com/WordPress/gutenberg/pull/56339))
+
+#### Components
+
+-   Use tooltip for the Timezone only when necessary. ([56214](https://github.com/WordPress/gutenberg/pull/56214))
+
+### Performance
+
+-   Block editor: Make all BlockEdit hooks pure. ([56813](https://github.com/WordPress/gutenberg/pull/56813))
+-   Block editor: Remove 4 useSelect in favour of context. ([56915](https://github.com/WordPress/gutenberg/pull/56915))
+-   Block editor: hooks: Avoid BlockEdit filter for content locking UI. ([56957](https://github.com/WordPress/gutenberg/pull/56957))
+-   Block editor: hooks: Share block settings. ([56852](https://github.com/WordPress/gutenberg/pull/56852))
+-   Keycodes: Avoid regex for capital case. ([56822](https://github.com/WordPress/gutenberg/pull/56822))
+-   Measure typing without inspector. ([56753](https://github.com/WordPress/gutenberg/pull/56753))
+-   Media upload component: Lazy mount. ([56958](https://github.com/WordPress/gutenberg/pull/56958))
+-   Paragraph: Store subscription for selected block only. ([56967](https://github.com/WordPress/gutenberg/pull/56967))
+-   Perf: Reopen inspector for remaining tests. ([56780](https://github.com/WordPress/gutenberg/pull/56780))
+-   useBlockProps: Combine store subscriptions. ([56847](https://github.com/WordPress/gutenberg/pull/56847))
+
+#### Block Editor
+
+-   Improve opening inserter in post editor. ([57006](https://github.com/WordPress/gutenberg/pull/57006))
+-   hooks: Subscribe only to relevant attributes. ([56783](https://github.com/WordPress/gutenberg/pull/56783))
+
+#### Site Editor
+
+-   Fix typing performance by not rendering sidebar. ([56927](https://github.com/WordPress/gutenberg/pull/56927))
+
+#### Components
+
+-   ToolsPanel: Fix deregister/register on type. ([56770](https://github.com/WordPress/gutenberg/pull/56770))
+
+#### Modules API
+
+-   Load the import map polyfill only when there is an import map. ([56699](https://github.com/WordPress/gutenberg/pull/56699))
+
+#### Post Editor
+
+-   Editor: Avoid double parsing content in 'getSuggestedPostFormat' selelector. ([56679](https://github.com/WordPress/gutenberg/pull/56679))
+
+### Experiments
+
+#### Data Views
+
+-   DataViews: Add story. ([56761](https://github.com/WordPress/gutenberg/pull/56761))
+-   DataViews: Add support for `NOT IN` operator in filter. ([56479](https://github.com/WordPress/gutenberg/pull/56479))
+-   DataViews: Centralize the view definition and rename `list` to `table`. ([56693](https://github.com/WordPress/gutenberg/pull/56693))
+-   DataViews: Do not export strings constants. ([56754](https://github.com/WordPress/gutenberg/pull/56754))
+-   DataViews: Export the view components as defaults. ([56677](https://github.com/WordPress/gutenberg/pull/56677))
+-   DataViews: Fix dropdown menu actions with modal. ([56760](https://github.com/WordPress/gutenberg/pull/56760))
+-   DataViews: Hide pagination if we have only one page. ([56948](https://github.com/WordPress/gutenberg/pull/56948))
+-   DataViews: Implement `NOT IN` operator for author filter in templates. ([56777](https://github.com/WordPress/gutenberg/pull/56777))
+-   DataViews: Iterate on list view. ([56746](https://github.com/WordPress/gutenberg/pull/56746))
+-   DataViews: Make `Actions` styles the same as any other column header. ([56654](https://github.com/WordPress/gutenberg/pull/56654))
+-   DataViews: Make `mediaField` not hidable. ([56643](https://github.com/WordPress/gutenberg/pull/56643))
+-   DataViews: Rename view components. ([56709](https://github.com/WordPress/gutenberg/pull/56709))
+-   DataViews: Render data async conditionally. ([56851](https://github.com/WordPress/gutenberg/pull/56851))
+-   DataViews: Set proper role for AddFilter's items. ([56714](https://github.com/WordPress/gutenberg/pull/56714))
+-   DataViews: Set proper semantics for dropdown items. ([56676](https://github.com/WordPress/gutenberg/pull/56676))
+-   DataViews: Update sorting semantics. ([56717](https://github.com/WordPress/gutenberg/pull/56717))
+-   Dataviews: Extract to dedicated bundled package. ([56721](https://github.com/WordPress/gutenberg/pull/56721))
+
+#### Block Validation/Deprecation
+
+-   Input Field Block: Use `useblockProps` hook in save function. ([56507](https://github.com/WordPress/gutenberg/pull/56507))
+
+#### Patterns
+
+-   Implement partially synced patterns behind an experimental flag. ([56235](https://github.com/WordPress/gutenberg/pull/56235))
+
+### Documentation
+
+-   Add the nested blocks chapter to the platform documentation. ([56689](https://github.com/WordPress/gutenberg/pull/56689))
+-   Components: Update CHANGELOG.md. ([56960](https://github.com/WordPress/gutenberg/pull/56960))
+-   Doc: Search Control - add Storybook link. ([56815](https://github.com/WordPress/gutenberg/pull/56815))
+-   Doc: Spinner - add Storybook link. ([56818](https://github.com/WordPress/gutenberg/pull/56818))
+-   Docs: Add storybook link for spinner component. ([56953](https://github.com/WordPress/gutenberg/pull/56953))
+-   Docs: Fix {% end %} tab position to show the text. ([56735](https://github.com/WordPress/gutenberg/pull/56735))
+-   Docs: Fundamentals of Block Development - Minor fixes - registration-of-a-block. ([56731](https://github.com/WordPress/gutenberg/pull/56731))
+-   Docs: Fundamentals of Block Development - add links. ([56700](https://github.com/WordPress/gutenberg/pull/56700))
+-   Docs: Fundamentals of Block Development ---- Small fixes for "Block wrapper". ([56651](https://github.com/WordPress/gutenberg/pull/56651))
+-   Link to Dashicons. ([56872](https://github.com/WordPress/gutenberg/pull/56872))
+-   Platform Docs: Add trusted by section. ([56749](https://github.com/WordPress/gutenberg/pull/56749))
+-   Revert "Doc: Spinner - add Storybook link". ([56913](https://github.com/WordPress/gutenberg/pull/56913))
+-   Update Getting Started Guide for Gutenberg 17.2. ([56674](https://github.com/WordPress/gutenberg/pull/56674))
+-   Update InnerBlocks defaultblock doc usage. ([56728](https://github.com/WordPress/gutenberg/pull/56728))
+-   Update formatting and fix grammar in the Block Editor Handbook readme. ([56798](https://github.com/WordPress/gutenberg/pull/56798))
+
+### Code Quality
+
+-   Block editor: hooks: Avoid getEditWrapperProps. ([56912](https://github.com/WordPress/gutenberg/pull/56912))
+-   Block lib: Use RichText.isEmpty where forgotten. ([56726](https://github.com/WordPress/gutenberg/pull/56726))
+-   Block library: Reusable caption component util. ([56606](https://github.com/WordPress/gutenberg/pull/56606))
+-   Core data revisions: Remove hardcoded supports constant. ([56701](https://github.com/WordPress/gutenberg/pull/56701))
+-   Editor: Cleanup default editor mode handling. ([56819](https://github.com/WordPress/gutenberg/pull/56819))
+-   Editor: Move the BlockCanvas component within the EditorCanvas component. ([56850](https://github.com/WordPress/gutenberg/pull/56850))
+-   Editor: Move the device type state to the editor package. ([56866](https://github.com/WordPress/gutenberg/pull/56866))
+-   Editor: Unify device preview styles. ([56904](https://github.com/WordPress/gutenberg/pull/56904))
+-   Fix PHP linter failing. ([56905](https://github.com/WordPress/gutenberg/pull/56905))
+-   Framework: Bundle the BlockTools component within BlockCanvas. ([56996](https://github.com/WordPress/gutenberg/pull/56996))
+-   Move `useDebouncedInput` hook to @wordpress/compose package. ([56744](https://github.com/WordPress/gutenberg/pull/56744))
+-   Post Editor: Rely on the editor store for the template mode state. ([56716](https://github.com/WordPress/gutenberg/pull/56716))
+-   Refactor <BlockToolbar />. ([56335](https://github.com/WordPress/gutenberg/pull/56335))
+-   Remove Block Tools BackCompat. ([56874](https://github.com/WordPress/gutenberg/pull/56874))
+-   Site and Post Editor: Unify the DocumentBar component. ([56778](https://github.com/WordPress/gutenberg/pull/56778))
+-   getValueFromObjectPath: Remove memize. ([56711](https://github.com/WordPress/gutenberg/pull/56711))
+
+#### Block Editor
+
+-   Don't render undefined classname in useBlockProps hook. ([56923](https://github.com/WordPress/gutenberg/pull/56923))
+-   One hook to rule them all: Preparation for a block supports API. ([56862](https://github.com/WordPress/gutenberg/pull/56862))
+-   RichText: Pass value to store. ([43204](https://github.com/WordPress/gutenberg/pull/43204))
+-   hooks: Manage BlockListBlock filters in one place. ([56875](https://github.com/WordPress/gutenberg/pull/56875))
+
+#### Global Styles
+
+-   Command Palette: Use getRevisions instead of deprecated selector. ([56738](https://github.com/WordPress/gutenberg/pull/56738))
+-   Global styles revisions: Remove PHP unit tests that are running in Core. ([56492](https://github.com/WordPress/gutenberg/pull/56492))
+
+#### Components
+
+-   Site editor: Do not use navigator's internal classname. ([56911](https://github.com/WordPress/gutenberg/pull/56911))
+
+#### Data Views
+
+-   DataViews: Remove TanStack. ([56873](https://github.com/WordPress/gutenberg/pull/56873))
+
+### Tools
+
+-   Env: Migrate to Compose V2. ([51339](https://github.com/WordPress/gutenberg/pull/51339))
+-   Scripts: Fix CSS imports not minified. ([56516](https://github.com/WordPress/gutenberg/pull/56516))
+-   wp-env: Make env-cwd option work on Windows. ([56265](https://github.com/WordPress/gutenberg/pull/56265))
+
+#### Testing
+
+-   Migrate 'editor multi entity saving' end-to-end tests to Playwright. ([56670](https://github.com/WordPress/gutenberg/pull/56670))
+-   Migrate 'inner-blocks-locking-all-embed' end-to-end tests to Playwright. ([56673](https://github.com/WordPress/gutenberg/pull/56673))
+-   Migrate 'site editor export' end-to-end tests to Playwright. ([56675](https://github.com/WordPress/gutenberg/pull/56675))
+-   RN: Add watch mode for native tests. ([56788](https://github.com/WordPress/gutenberg/pull/56788))
+-   Scripts: Enable skipping Playwright browser installation. ([56594](https://github.com/WordPress/gutenberg/pull/56594))
+-   Tabs: Implement `ariakit/test` in unit tests. ([56835](https://github.com/WordPress/gutenberg/pull/56835))
+-   `CustomSelectControl`: Add additional unit tests. ([56575](https://github.com/WordPress/gutenberg/pull/56575))
+
+### Various
+
+-   Copy/fix capitalization of WordPress. ([56834](https://github.com/WordPress/gutenberg/pull/56834))
+
+#### Site Editor
+
+-   Improve text and design of the block removal warnings. ([56869](https://github.com/WordPress/gutenberg/pull/56869))
+
+#### Global Styles
+
+-   Global styles welcome guide: Add a space between translated strings. ([56839](https://github.com/WordPress/gutenberg/pull/56839))
+
+#### Block Library
+
+-   Simplify page list edit warning. ([56829](https://github.com/WordPress/gutenberg/pull/56829))
+
+#### Patterns
+
+-   End pattern page descriptions with a period. ([56828](https://github.com/WordPress/gutenberg/pull/56828))
+
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
+
+-   @benoitchantre: Scripts: Fix CSS imports not minified. ([56516](https://github.com/WordPress/gutenberg/pull/56516))
+-   @kmanijak: Decode some characters if used in taxonomy name so it's displayed correctly in Query Loop filters. ([50376](https://github.com/WordPress/gutenberg/pull/50376))
+-   @lithrel: Env: Migrate to Compose V2. ([51339](https://github.com/WordPress/gutenberg/pull/51339))
+-   @nk-o: Fix: PHP 8.1 deprecated warning strpos(). ([56171](https://github.com/WordPress/gutenberg/pull/56171))
+-   @taylorgorman: Link to Dashicons. ([56872](https://github.com/WordPress/gutenberg/pull/56872))
+-   @valerogarte: #55702 - Control dimensions (margin and padding) of the list-item block. ([55874](https://github.com/WordPress/gutenberg/pull/55874))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@afercia @ajlende @alexstine @andrewhayward @andrewserong @apeatling @atachibana @Aurorum @benoitchantre @bph @brookewp @chad1008 @ciampo @colorful-tones @dcalhoun @derekblank @draganescu @ellatrix @fluiddot @geriux @getdave @jameskoster @jasmussen @jeherve @jeryj @jffng @jonathanbossenger @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @kmanijak @lithrel @luisherranz @Mamaduka @matiasbenedetto @mikachan @miminari @mtias @ndiego @nk-o @ntsekouras @oandregal @ramonjd @richtabor @scruffian @SiobhyB @t-hamano @talldan @taylorgorman @tellthemachines @tyxla @valerogarte @WunderBart @youknowriad
+
+= 17.2.1 =
+
+## Changelog
+
+### Bug Fixes
+
+-   Fix: Fatal php error if a template was created by an author that was deleted ([56990](https://github.com/WordPress/gutenberg/pull/56990))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@jorgefilipecosta
+
+= 17.2.0 =
+
+## Changelog
+
+### Bug Fixes
+
+#### Post Editor
+
+-   Editor: Fix issue where createBlock in block template caused list view collapse. ([56666](https://github.com/WordPress/gutenberg/pull/56666))
+
+#### Modules API
+
+-   Modules: Fix import map polyfill not being copied on the generated plugin ZIP. ([56655](https://github.com/WordPress/gutenberg/pull/56655))
+
+### Documentation
+
+-   Interactivity API: New store() API documentation. ([56764](https://github.com/WordPress/gutenberg/pull/56764))
+-   Interactivity API: Update TS/JSDocs after migrating to the new `store()` API. ([56748](https://github.com/WordPress/gutenberg/pull/56748))
+
+### Tools
+
+#### Build Tooling
+
+-   Add missing labels to changelog script, and enhance mapping function. ([55066](https://github.com/WordPress/gutenberg/pull/55066))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@andrewserong @DAreRodz @luisherranz @vcanales
+= 17.2.0-rc.1 =
+
+## Changelog
+
+### Features
+
+#### Modules API
+
+-   Interactivity API: Use modules instead of scripts in the frontend. ([56143](https://github.com/WordPress/gutenberg/pull/56143))
+
+### Enhancements
+
+-   Add translator comments for strings containing date formats. ([56531](https://github.com/WordPress/gutenberg/pull/56531))
+-   Block Settings: Only display parent block selector on small screens. ([56431](https://github.com/WordPress/gutenberg/pull/56431))
+-   Block Theme Preview: Display the theme name on the activate button. ([55752](https://github.com/WordPress/gutenberg/pull/55752))
+-   Core data revisions: Extend support to other post types. ([56353](https://github.com/WordPress/gutenberg/pull/56353))
+-   Improve tooltip for parent blocks on the block toolbar. ([56146](https://github.com/WordPress/gutenberg/pull/56146))
+-   Simplify template author token. ([56566](https://github.com/WordPress/gutenberg/pull/56566))
+-   Style engine: Allow CSS var output for fontSize and fontFamily and update documentation. ([56528](https://github.com/WordPress/gutenberg/pull/56528))
+-   Try: Change "Detach pattern" to "Detach". ([56323](https://github.com/WordPress/gutenberg/pull/56323))
+-   useEntityRecord: Improve unit tests. ([56415](https://github.com/WordPress/gutenberg/pull/56415))
+
+#### Components
+
+-   Add focus rings to focusable disabled buttons. ([56383](https://github.com/WordPress/gutenberg/pull/56383))
+-   DropdownMenu V2 tweaks. ([56041](https://github.com/WordPress/gutenberg/pull/56041))
+-   DropdownMenu V2: Add support for rendering in legacy popover slot. ([56342](https://github.com/WordPress/gutenberg/pull/56342))
+-   FormToggle: Refine animation. ([56515](https://github.com/WordPress/gutenberg/pull/56515))
+-   Slot: Add styles prop to bubblesVirtually version. ([56428](https://github.com/WordPress/gutenberg/pull/56428))
+-   Tabs: Cleanup and improvements. ([56224](https://github.com/WordPress/gutenberg/pull/56224))
+-   Try Ariakit Select for new CustomSelectControl component. ([55790](https://github.com/WordPress/gutenberg/pull/55790))
+
+#### Data Views
+
+-   Data list view: Make filter row, table header, and pagination sticky. ([56157](https://github.com/WordPress/gutenberg/pull/56157))
+-   Simplify dataviews view button. ([56485](https://github.com/WordPress/gutenberg/pull/56485))
+-   Update data view menu item actions. ([56398](https://github.com/WordPress/gutenberg/pull/56398))
+
+#### Global Styles
+
+-   Global style revisions: Redesign style revision items. ([55913](https://github.com/WordPress/gutenberg/pull/55913))
+-   Global styles revisions: Migrate API call to getRevisions(). ([56349](https://github.com/WordPress/gutenberg/pull/56349))
+-   Style Revisions: Remove style revisions dropdown menu. ([56454](https://github.com/WordPress/gutenberg/pull/56454))
+
+#### Site Editor
+
+-   Add 'View site' action to 'Site updated' snackbar. ([52693](https://github.com/WordPress/gutenberg/pull/52693))
+-   Add the Post Author component to the Page sidebar. ([56368](https://github.com/WordPress/gutenberg/pull/56368))
+-   Redirect to main page menu if page record not found. ([56177](https://github.com/WordPress/gutenberg/pull/56177))
+
+#### Block Editor
+
+-   Drag and drop: Allow dragging to the beginning and end of a document. ([56070](https://github.com/WordPress/gutenberg/pull/56070))
+-   List View: Expand state if a block is dragged to within a collapsed block in the editor canvas. ([56493](https://github.com/WordPress/gutenberg/pull/56493))
+
+#### Layout
+
+-   Add layout classes to legacy Group inner container. ([56130](https://github.com/WordPress/gutenberg/pull/56130))
+-   Add setting to disable custom content size controls. ([56236](https://github.com/WordPress/gutenberg/pull/56236))
+
+#### Patterns
+
+-   Small tweaks to CreatePatternModal. ([56016](https://github.com/WordPress/gutenberg/pull/56016))
+-   Update Labels in Block Inserter (block patterns tab). ([55986](https://github.com/WordPress/gutenberg/pull/55986))
+
+#### Icons
+
+-   Update trash icon. ([56569](https://github.com/WordPress/gutenberg/pull/56569))
+
+#### Block Library
+
+-   Disable block renaming support for Nav Link block. ([56425](https://github.com/WordPress/gutenberg/pull/56425))
+
+#### Distraction Free
+
+-   Add top toolbar to distraction free mode. ([56295](https://github.com/WordPress/gutenberg/pull/56295))
+
+#### CSS & Styling
+
+-   Gallery Block: Use styled scrollbars for image captions. ([56252](https://github.com/WordPress/gutenberg/pull/56252))
+
+#### Typography
+
+-   Font Library: Remove insecure properties. ([56230](https://github.com/WordPress/gutenberg/pull/56230))
+
+### New APIs
+
+-   Revisions: Add new selectors to fetch entity revisions. ([54046](https://github.com/WordPress/gutenberg/pull/54046))
+
+#### Interactivity API
+
+-   Migration to the new `store()` API. ([55459](https://github.com/WordPress/gutenberg/pull/55459))
+
+### Bug Fixes
+
+-   Block Editor: Undeprecate the '\_\_experimentalImageSizeControl' component. ([56414](https://github.com/WordPress/gutenberg/pull/56414))
+-   Core data: Harmonize getRevision selector and resolver function signatures. ([56416](https://github.com/WordPress/gutenberg/pull/56416))
+-   Editor styles: Scope without adding specificity. ([56564](https://github.com/WordPress/gutenberg/pull/56564))
+-   Fix Restore Post title placeholder. ([56580](https://github.com/WordPress/gutenberg/pull/56580))
+-   Post Schedule Panel: Remove text overflow ellipsis. ([56319](https://github.com/WordPress/gutenberg/pull/56319))
+-   PostCSS style transformation: Fail gracefully instead of throwing an error. ([56093](https://github.com/WordPress/gutenberg/pull/56093))
+-   Rich text: Pad multiple spaces through en/em replacement. ([56341](https://github.com/WordPress/gutenberg/pull/56341))
+-   Site Editor Sidebar: Fix actions vertical alignment. ([56218](https://github.com/WordPress/gutenberg/pull/56218))
+-   Site Editor: Add a fallback template showing the title and content for the post only mode. ([56509](https://github.com/WordPress/gutenberg/pull/56509))
+-   useEntityRecord: Do not trigger REST API requests when disabled. ([56108](https://github.com/WordPress/gutenberg/pull/56108))
+
+#### Block Library
+
+-   File block: Remove anchor tag when copy pasting to file name. ([56508](https://github.com/WordPress/gutenberg/pull/56508))
+-   Fix label of columns inspector panel. ([56647](https://github.com/WordPress/gutenberg/pull/56647))
+-   Post Template: Fix incorrect offset query. ([56440](https://github.com/WordPress/gutenberg/pull/56440))
+
+#### Block Editor
+
+-   (RichText)(Workaround)(17.1.x) Fallback to a string arg in `collapseWhiteSpace()` if `value` is not a string. ([56570](https://github.com/WordPress/gutenberg/pull/56570))
+-   Cover block: Pass dropZoneElement reference to fix dragging within cover block area. ([56312](https://github.com/WordPress/gutenberg/pull/56312))
+-   useMovingAnimation: Clear translate3d rule when animation is finished. ([56410](https://github.com/WordPress/gutenberg/pull/56410))
+
+#### Components
+
+-   Design Tools: Fix last ToolsPanelItem styling. ([56536](https://github.com/WordPress/gutenberg/pull/56536))
+-   Fix FormTokenField suggestions broken scrollbar when `__experimentalExpandOnFocus` is defined. ([56426](https://github.com/WordPress/gutenberg/pull/56426))
+-   Tabs: Fix flaky unit tests. ([55950](https://github.com/WordPress/gutenberg/pull/55950))
+
+#### Global Styles
+
+-   Additional CSS: Fix on change validation. ([56434](https://github.com/WordPress/gutenberg/pull/56434))
+-   Global styles revisions: Update isResolving flag. ([56491](https://github.com/WordPress/gutenberg/pull/56491))
+-   Spacing: Fix block error if spacing unit array empty in theme.json. ([56306](https://github.com/WordPress/gutenberg/pull/56306))
+
+#### CSS & Styling
+
+-   Reduce specificity of default Cover text color styles. ([56411](https://github.com/WordPress/gutenberg/pull/56411))
+-   Restore Post Title visual styles in Code View mode. ([56582](https://github.com/WordPress/gutenberg/pull/56582))
+
+#### Saving
+
+-   Editor: Reinstate anonymous callback for saved post state. ([56529](https://github.com/WordPress/gutenberg/pull/56529))
+
+#### Post Editor
+
+-   Save post button: Avoid extra re-renders when enablng/disabling tooltip. ([56502](https://github.com/WordPress/gutenberg/pull/56502))
+
+#### Plugin
+
+-   Update Readme.txt tested up to 6.4. ([56427](https://github.com/WordPress/gutenberg/pull/56427))
+
+#### Site Editor
+
+-   Fix template resolution for templates assigned as home page. ([56418](https://github.com/WordPress/gutenberg/pull/56418))
+
+#### Patterns
+
+-   Fix issue with template in replace template screen. ([56407](https://github.com/WordPress/gutenberg/pull/56407))
+
+#### Layout
+
+-   Fix issue where layout classnames are injected for blocks without layout support. ([56187](https://github.com/WordPress/gutenberg/pull/56187))
+
+#### Typography
+
+-   Font Library: Fix fonts not displaying correctly. ([55393](https://github.com/WordPress/gutenberg/pull/55393))
+
+#### Colors
+
+-   Duotone: Backport from Core to fix filters in classic themes. ([54778](https://github.com/WordPress/gutenberg/pull/54778))
+
+### Accessibility
+
+-   Migrating `StyleBook` to use updated `Composite` implementation. ([55344](https://github.com/WordPress/gutenberg/pull/55344))
+
+#### Data Views
+
+-   DataViews: Make disabled pagination buttons focusable. ([56422](https://github.com/WordPress/gutenberg/pull/56422))
+
+#### Block Library
+
+-   Image Block: Enable image block to be selected correctly when clicked. ([56043](https://github.com/WordPress/gutenberg/pull/56043))
+
+#### Post Editor
+
+-   Tooltip: Don't render buttons tooltip when show button text labels is enabled. ([55842](https://github.com/WordPress/gutenberg/pull/55842))
+
+#### Components
+
+-   Improve `Button` saving state accessibility. ([55547](https://github.com/WordPress/gutenberg/pull/55547))
+
+#### Patterns
+
+-   Fix focus loss after converting to a synced pattern. ([55473](https://github.com/WordPress/gutenberg/pull/55473))
+
+### Performance
+
+-   Avoid calling postcss when not needed. ([56601](https://github.com/WordPress/gutenberg/pull/56601))
+-   Block Editor: Optimize 'Connections' inspector controls. ([56443](https://github.com/WordPress/gutenberg/pull/56443))
+
+#### Global Styles
+
+-   Make search more responsive for block type list. ([56139](https://github.com/WordPress/gutenberg/pull/56139))
+
+### Experiments
+
+#### Data Views
+
+-   DataViews: Document `view.layout`. ([56637](https://github.com/WordPress/gutenberg/pull/56637))
+-   DataViews: Extract common constants to file. ([56251](https://github.com/WordPress/gutenberg/pull/56251))
+-   DataViews: Rename `InFilter` component to `FilterSummary`. ([56506](https://github.com/WordPress/gutenberg/pull/56506))
+-   DataViews: Scope names of V2 UI components. ([56503](https://github.com/WordPress/gutenberg/pull/56503))
+-   DataViews: Update field API to generate filters based on type. ([55996](https://github.com/WordPress/gutenberg/pull/55996))
+-   DataViews: Update filter component. ([56110](https://github.com/WordPress/gutenberg/pull/56110))
+-   Dataviews: Add confirmation step before deleting a page. ([56504](https://github.com/WordPress/gutenberg/pull/56504))
+-   Dataviews: Add preview and grid view in templates list. ([56382](https://github.com/WordPress/gutenberg/pull/56382))
+-   Dataviews: Grid layout refinements. ([56441](https://github.com/WordPress/gutenberg/pull/56441))
+-   Dataviews: Remove link from author. ([56467](https://github.com/WordPress/gutenberg/pull/56467))
+-   Dataviews: Update item actions in grid view. ([56501](https://github.com/WordPress/gutenberg/pull/56501))
+-   Fix data view menu item radius. ([56395](https://github.com/WordPress/gutenberg/pull/56395))
+
+#### Post Editor
+
+-   Render html in post titles in visual mode and edit HTML in post title in code view. ([54718](https://github.com/WordPress/gutenberg/pull/54718))
+
+### Documentation
+
+-   Add the attributes definition page to the create block tutorial of the platform documentation. ([56429](https://github.com/WordPress/gutenberg/pull/56429))
+-   Add the transforms page to the create block tutorial of the platform documentation. ([56559](https://github.com/WordPress/gutenberg/pull/56559))
+-   Add thee block supports page to the create block tutorial of the framework docs. ([56483](https://github.com/WordPress/gutenberg/pull/56483))
+-   Added clarifications and examples to "Get started with wp-scripts". ([56298](https://github.com/WordPress/gutenberg/pull/56298))
+-   Block Editor: Fix typo in `URLInput`'s `onKeyDown` prop documentation. ([56322](https://github.com/WordPress/gutenberg/pull/56322))
+-   Bring back non-JS tabs in block editor handbook. ([56561](https://github.com/WordPress/gutenberg/pull/56561))
+-   Docs: Fix incorrect build script description in script package. ([56332](https://github.com/WordPress/gutenberg/pull/56332))
+-   Docs: Fundamentals of Block Development - File structure of a block. ([56551](https://github.com/WordPress/gutenberg/pull/56551))
+-   Docs: Fundamentals of Block Development - Registration of a block. ([56334](https://github.com/WordPress/gutenberg/pull/56334))
+-   Docs: Fundamentals of Block Development - The block wrapper. ([56596](https://github.com/WordPress/gutenberg/pull/56596))
+-   Docs: Fundamentals of Block Development - Working with JavaScript in the Block Editor. ([56553](https://github.com/WordPress/gutenberg/pull/56553))
+-   Docs: Fundamentals of Block Development - block.json. ([56435](https://github.com/WordPress/gutenberg/pull/56435))
+-   Docs: Improve downloadBlob example. ([56225](https://github.com/WordPress/gutenberg/pull/56225))
+-   Documentation - Block Editor Handbook - Add end user documentation about Block Editor as a resource on the Landing Page of the Block Editor Handbook. ([49854](https://github.com/WordPress/gutenberg/pull/49854))
+-   Fix overly complex code example in ComboboxControl readme. ([56365](https://github.com/WordPress/gutenberg/pull/56365))
+-   Fix version in useSetting deprecation notice. ([56377](https://github.com/WordPress/gutenberg/pull/56377))
+-   Fundamentals block development - landing and first pages. ([56584](https://github.com/WordPress/gutenberg/pull/56584))
+-   Fundamentals of Block Development - fix save definition. ([56605](https://github.com/WordPress/gutenberg/pull/56605))
+-   Link preview image to live example using WordPress Playground. ([56292](https://github.com/WordPress/gutenberg/pull/56292))
+-   NavigableContainers: Fix doc typo in onKeyDown prop. ([56352](https://github.com/WordPress/gutenberg/pull/56352))
+-   Release docs: Add new section about troubleshooting the release. ([56436](https://github.com/WordPress/gutenberg/pull/56436))
+-   Remove all {% codetabs %} instances and any vanilla JS references. ([56121](https://github.com/WordPress/gutenberg/pull/56121))
+-   Simplify code example in ToggleControl component readme. ([56389](https://github.com/WordPress/gutenberg/pull/56389))
+-   Text and Heading: Improve documentation around default values and truncation logic. ([56518](https://github.com/WordPress/gutenberg/pull/56518))
+-   Theme JSON schema: Add heading/button key to color definition. ([55674](https://github.com/WordPress/gutenberg/pull/55674))
+-   Update for 6.4.1 for versions in WP. ([56216](https://github.com/WordPress/gutenberg/pull/56216))
+-   Update references to the gutenberg-examples repo to the new block-development-examples. ([56119](https://github.com/WordPress/gutenberg/pull/56119))
+-   Update template name in `create-block` command. ([56281](https://github.com/WordPress/gutenberg/pull/56281))
+-   Update webpack options for wp-scripts in README.md. ([56314](https://github.com/WordPress/gutenberg/pull/56314))
+-   `BoxControl`: Update story and refactor to Typescript. ([56462](https://github.com/WordPress/gutenberg/pull/56462))
+
+### Code Quality
+
+-   Blocks pkg: Remove 'browser' dependencies. ([56433](https://github.com/WordPress/gutenberg/pull/56433))
+-   DataViews: Code Quality remove some unused props from action. ([56477](https://github.com/WordPress/gutenberg/pull/56477))
+-   Editor: Move the template focus modes to the editor store. ([56472](https://github.com/WordPress/gutenberg/pull/56472))
+-   Extract a PostPanelRow component from the different sidebar panels. ([56238](https://github.com/WordPress/gutenberg/pull/56238))
+-   Interactivity API: Add missing changelog entry for the new `store()` API. ([56611](https://github.com/WordPress/gutenberg/pull/56611))
+-   Migrating block editor `BlockPatternsList` component. ([56210](https://github.com/WordPress/gutenberg/pull/56210))
+-   Move the DisableNonContentBlocks component to the editor package. ([56423](https://github.com/WordPress/gutenberg/pull/56423))
+-   Post Schedule Panel: Fix Sass deprecation warning for division. ([56412](https://github.com/WordPress/gutenberg/pull/56412))
+-   Remove compatibility layer for WP 6.2. ([56464](https://github.com/WordPress/gutenberg/pull/56464))
+-   Unify the PostSchedule component between site and post editors. ([56196](https://github.com/WordPress/gutenberg/pull/56196))
+-   Update: Refactor useAddedBy to use authorText and originalSource fields. ([56568](https://github.com/WordPress/gutenberg/pull/56568))
+
+#### Block Library
+
+-   Add align support to the image block - alternative. ([55954](https://github.com/WordPress/gutenberg/pull/55954))
+-   Backmerge block renaming fixes/refactors from 6.4 branch into Gutenberg trunk. ([56386](https://github.com/WordPress/gutenberg/pull/56386))
+-   Pattern placeholder: Remove duplicate 'useDispatch' hook. ([56397](https://github.com/WordPress/gutenberg/pull/56397))
+
+#### Components
+
+-   Remove incorrect version from deprecated `__nextHasNoMarginBottom` prop of `AnglePickerControl` Component. ([56336](https://github.com/WordPress/gutenberg/pull/56336))
+-   Revert "DropdownMenu V2: Add support for rendering in legacy popover slot". ([56484](https://github.com/WordPress/gutenberg/pull/56484))
+
+#### Data Views
+
+-   Dataviews: Ensure items and fields are using a unique id. ([56366](https://github.com/WordPress/gutenberg/pull/56366))
+
+#### Block Editor
+
+-   useInnerBlocksProps: Stabilise dropZoneElement prop. ([56313](https://github.com/WordPress/gutenberg/pull/56313))
+
+#### Design Tools
+
+-   Fix: Theme.json font settings in unit test. ([56309](https://github.com/WordPress/gutenberg/pull/56309))
+
+### Tools
+
+-   Workflows: Update 'days-before-stale' for flaky test report issues. ([56585](https://github.com/WordPress/gutenberg/pull/56585))
+-   scripts: Update `jest-dev-server` to v9. ([56552](https://github.com/WordPress/gutenberg/pull/56552))
+
+#### Testing
+
+-   Dataviews: Add first end-to-end tests. ([56634](https://github.com/WordPress/gutenberg/pull/56634))
+-   Migrate 'align hook' end-to-end tests to Playwright. ([56480](https://github.com/WordPress/gutenberg/pull/56480))
+-   Migrate 'block directory' end-to-end tests to Playwright. ([56593](https://github.com/WordPress/gutenberg/pull/56593))
+-   Migrate 'block icons' end-to-end tests to Playwright. ([56610](https://github.com/WordPress/gutenberg/pull/56610))
+-   Migrate 'custom taxonomies' end-to-end test to Playwright. ([56486](https://github.com/WordPress/gutenberg/pull/56486))
+-   Migrate 'sidebar permalink' end-to-end tests to Playwright. ([56253](https://github.com/WordPress/gutenberg/pull/56253))
+-   Migrate Is Typing Test to Playwright. ([56616](https://github.com/WordPress/gutenberg/pull/56616))
+-   Page spec: Merging create page and toggle preview tests. ([56129](https://github.com/WordPress/gutenberg/pull/56129))
+-   Playwright Utils: Fix the method of getting post ID in 'publishPost'. ([56421](https://github.com/WordPress/gutenberg/pull/56421))
+-   end-to-end tests: Merge Puppeteer into single job, split Playwright further. ([56363](https://github.com/WordPress/gutenberg/pull/56363))
+
+#### Build Tooling
+
+-   Create block: Update `interactive-template` to the new `store()` API. ([56613](https://github.com/WordPress/gutenberg/pull/56613))
+
+### Security
+
+-   WP_Theme_JSON_Gutenberg: Add nested indexed array schema sanitization. ([56447](https://github.com/WordPress/gutenberg/pull/56447))
+
+### Various
+
+-   Add: Author text and original source to wp_template_part. ([56567](https://github.com/WordPress/gutenberg/pull/56567))
+-   Migrating `BlockPatternSetup` to use updated `Composite` implementation. ([55425](https://github.com/WordPress/gutenberg/pull/55425))
+-   Migrating `InserterListbox` to use updated Composite implementation. ([56246](https://github.com/WordPress/gutenberg/pull/56246))
+
+#### Data Views
+
+-   Dataviews: All Templates: Add filters to template author. ([56338](https://github.com/WordPress/gutenberg/pull/56338))
+-   Dataviews: All templates: Add: Sorting to template author and add author_text to the rest API. ([56333](https://github.com/WordPress/gutenberg/pull/56333))
+
+#### HTML API
+
+-   Backport updates from Core. ([56578](https://github.com/WordPress/gutenberg/pull/56578))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @andrewhayward @andrewserong @annezazu @apeatling @arthur791004 @bph @brookewp @chad1008 @chiilog @ciampo @DAreRodz @dmsnell @draganescu @ellatrix @fabiankaegy @flootr @fluiddot @fullofcaffeine @geriux @getdave @glendaviesnz @jameskoster @jasmussen @jeryj @jffng @jorgefilipecosta @juanmaguitar @kevin940726 @luisherranz @MaggieCabrera @Mamaduka @matiasbenedetto @megane9988 @NekoJonez @ntsekouras @oandregal @ramonjd @richtabor @ryanwelcher @SavPhill @Soean @t-hamano @talldan @tellthemachines @youknowriad @zaguiini
+
 = 17.1.4 =
 
 ## Changelog
@@ -7,7 +10509,8 @@
 ### Bug Fixes
 
 #### Block Library
-- Post Template: Fix incorrect offset query. ([56440](https://github.com/WordPress/gutenberg/pull/56440))
+
+-   Post Template: Fix incorrect offset query. ([56440](https://github.com/WordPress/gutenberg/pull/56440))
 
 ## Contributors
 
@@ -15,310 +10518,337 @@ The following contributors merged PRs in this release:
 
 @t-hamano
 
-
 = 17.2.0-rc.1 =
 
-
-
 ## Changelog
 
 ### Features
 
 #### Modules API
-- Interactivity API: Use modules instead of scripts in the frontend. ([56143](https://github.com/WordPress/gutenberg/pull/56143))
 
+-   Interactivity API: Use modules instead of scripts in the frontend. ([56143](https://github.com/WordPress/gutenberg/pull/56143))
 
 ### Enhancements
 
-- Add translator comments for strings containing date formats. ([56531](https://github.com/WordPress/gutenberg/pull/56531))
-- Block Settings: Only display parent block selector on small screens. ([56431](https://github.com/WordPress/gutenberg/pull/56431))
-- Block Theme Preview: Display the theme name on the activate button. ([55752](https://github.com/WordPress/gutenberg/pull/55752))
-- Core data revisions: Extend support to other post types. ([56353](https://github.com/WordPress/gutenberg/pull/56353))
-- Improve tooltip for parent blocks on the block toolbar. ([56146](https://github.com/WordPress/gutenberg/pull/56146))
-- Simplify template author token. ([56566](https://github.com/WordPress/gutenberg/pull/56566))
-- Style engine: Allow CSS var output for fontSize and fontFamily and update documentation. ([56528](https://github.com/WordPress/gutenberg/pull/56528))
-- Try: Change "Detach pattern" to "Detach". ([56323](https://github.com/WordPress/gutenberg/pull/56323))
-- useEntityRecord: Improve unit tests. ([56415](https://github.com/WordPress/gutenberg/pull/56415))
-
-#### Components
-- Add focus rings to focusable disabled buttons. ([56383](https://github.com/WordPress/gutenberg/pull/56383))
-- DropdownMenu V2 tweaks. ([56041](https://github.com/WordPress/gutenberg/pull/56041))
-- DropdownMenu V2: Add support for rendering in legacy popover slot. ([56342](https://github.com/WordPress/gutenberg/pull/56342))
-- FormToggle: Refine animation. ([56515](https://github.com/WordPress/gutenberg/pull/56515))
-- Slot: Add styles prop to bubblesVirtually version. ([56428](https://github.com/WordPress/gutenberg/pull/56428))
-- Tabs: Cleanup and improvements. ([56224](https://github.com/WordPress/gutenberg/pull/56224))
-- Try Ariakit Select for new CustomSelectControl component. ([55790](https://github.com/WordPress/gutenberg/pull/55790))
+-   Add translator comments for strings containing date formats. ([56531](https://github.com/WordPress/gutenberg/pull/56531))
+-   Block Settings: Only display parent block selector on small screens. ([56431](https://github.com/WordPress/gutenberg/pull/56431))
+-   Block Theme Preview: Display the theme name on the activate button. ([55752](https://github.com/WordPress/gutenberg/pull/55752))
+-   Core data revisions: Extend support to other post types. ([56353](https://github.com/WordPress/gutenberg/pull/56353))
+-   Improve tooltip for parent blocks on the block toolbar. ([56146](https://github.com/WordPress/gutenberg/pull/56146))
+-   Simplify template author token. ([56566](https://github.com/WordPress/gutenberg/pull/56566))
+-   Style engine: Allow CSS var output for fontSize and fontFamily and update documentation. ([56528](https://github.com/WordPress/gutenberg/pull/56528))
+-   Try: Change "Detach pattern" to "Detach". ([56323](https://github.com/WordPress/gutenberg/pull/56323))
+-   useEntityRecord: Improve unit tests. ([56415](https://github.com/WordPress/gutenberg/pull/56415))
+
+#### Components
+
+-   Add focus rings to focusable disabled buttons. ([56383](https://github.com/WordPress/gutenberg/pull/56383))
+-   DropdownMenu V2 tweaks. ([56041](https://github.com/WordPress/gutenberg/pull/56041))
+-   DropdownMenu V2: Add support for rendering in legacy popover slot. ([56342](https://github.com/WordPress/gutenberg/pull/56342))
+-   FormToggle: Refine animation. ([56515](https://github.com/WordPress/gutenberg/pull/56515))
+-   Slot: Add styles prop to bubblesVirtually version. ([56428](https://github.com/WordPress/gutenberg/pull/56428))
+-   Tabs: Cleanup and improvements. ([56224](https://github.com/WordPress/gutenberg/pull/56224))
+-   Try Ariakit Select for new CustomSelectControl component. ([55790](https://github.com/WordPress/gutenberg/pull/55790))
 
 #### Data Views
-- Data list view: Make filter row, table header, and pagination sticky. ([56157](https://github.com/WordPress/gutenberg/pull/56157))
-- Simplify dataviews view button. ([56485](https://github.com/WordPress/gutenberg/pull/56485))
-- Update data view menu item actions. ([56398](https://github.com/WordPress/gutenberg/pull/56398))
+
+-   Data list view: Make filter row, table header, and pagination sticky. ([56157](https://github.com/WordPress/gutenberg/pull/56157))
+-   Simplify dataviews view button. ([56485](https://github.com/WordPress/gutenberg/pull/56485))
+-   Update data view menu item actions. ([56398](https://github.com/WordPress/gutenberg/pull/56398))
 
 #### Global Styles
-- Global style revisions: Redesign style revision items. ([55913](https://github.com/WordPress/gutenberg/pull/55913))
-- Global styles revisions: Migrate API call to getRevisions(). ([56349](https://github.com/WordPress/gutenberg/pull/56349))
-- Style Revisions: Remove style revisions dropdown menu. ([56454](https://github.com/WordPress/gutenberg/pull/56454))
+
+-   Global style revisions: Redesign style revision items. ([55913](https://github.com/WordPress/gutenberg/pull/55913))
+-   Global styles revisions: Migrate API call to getRevisions(). ([56349](https://github.com/WordPress/gutenberg/pull/56349))
+-   Style Revisions: Remove style revisions dropdown menu. ([56454](https://github.com/WordPress/gutenberg/pull/56454))
 
 #### Site Editor
-- Add 'View site' action to 'Site updated' snackbar. ([52693](https://github.com/WordPress/gutenberg/pull/52693))
-- Add the Post Author component to the Page sidebar. ([56368](https://github.com/WordPress/gutenberg/pull/56368))
-- Redirect to main page menu if page record not found. ([56177](https://github.com/WordPress/gutenberg/pull/56177))
+
+-   Add 'View site' action to 'Site updated' snackbar. ([52693](https://github.com/WordPress/gutenberg/pull/52693))
+-   Add the Post Author component to the Page sidebar. ([56368](https://github.com/WordPress/gutenberg/pull/56368))
+-   Redirect to main page menu if page record not found. ([56177](https://github.com/WordPress/gutenberg/pull/56177))
 
 #### Block Editor
-- Drag and drop: Allow dragging to the beginning and end of a document. ([56070](https://github.com/WordPress/gutenberg/pull/56070))
-- List View: Expand state if a block is dragged to within a collapsed block in the editor canvas. ([56493](https://github.com/WordPress/gutenberg/pull/56493))
+
+-   Drag and drop: Allow dragging to the beginning and end of a document. ([56070](https://github.com/WordPress/gutenberg/pull/56070))
+-   List View: Expand state if a block is dragged to within a collapsed block in the editor canvas. ([56493](https://github.com/WordPress/gutenberg/pull/56493))
 
 #### Layout
-- Add layout classes to legacy Group inner container. ([56130](https://github.com/WordPress/gutenberg/pull/56130))
-- Add setting to disable custom content size controls. ([56236](https://github.com/WordPress/gutenberg/pull/56236))
+
+-   Add layout classes to legacy Group inner container. ([56130](https://github.com/WordPress/gutenberg/pull/56130))
+-   Add setting to disable custom content size controls. ([56236](https://github.com/WordPress/gutenberg/pull/56236))
 
 #### Patterns
-- Small tweaks to CreatePatternModal. ([56016](https://github.com/WordPress/gutenberg/pull/56016))
-- Update Labels in Block Inserter (block patterns tab). ([55986](https://github.com/WordPress/gutenberg/pull/55986))
+
+-   Small tweaks to CreatePatternModal. ([56016](https://github.com/WordPress/gutenberg/pull/56016))
+-   Update Labels in Block Inserter (block patterns tab). ([55986](https://github.com/WordPress/gutenberg/pull/55986))
 
 #### Icons
-- Update trash icon. ([56569](https://github.com/WordPress/gutenberg/pull/56569))
+
+-   Update trash icon. ([56569](https://github.com/WordPress/gutenberg/pull/56569))
 
 #### Block Library
-- Disable block renaming support for Nav Link block. ([56425](https://github.com/WordPress/gutenberg/pull/56425))
+
+-   Disable block renaming support for Nav Link block. ([56425](https://github.com/WordPress/gutenberg/pull/56425))
 
 #### Distraction Free
-- Add top toolbar to distraction free mode. ([56295](https://github.com/WordPress/gutenberg/pull/56295))
+
+-   Add top toolbar to distraction free mode. ([56295](https://github.com/WordPress/gutenberg/pull/56295))
 
 #### CSS & Styling
-- Gallery Block: Use styled scrollbars for image captions. ([56252](https://github.com/WordPress/gutenberg/pull/56252))
+
+-   Gallery Block: Use styled scrollbars for image captions. ([56252](https://github.com/WordPress/gutenberg/pull/56252))
 
 #### Typography
-- Font Library: Remove insecure properties. ([56230](https://github.com/WordPress/gutenberg/pull/56230))
 
+-   Font Library: Remove insecure properties. ([56230](https://github.com/WordPress/gutenberg/pull/56230))
 
 ### New APIs
 
-- Revisions: Add new selectors to fetch entity revisions. ([54046](https://github.com/WordPress/gutenberg/pull/54046))
+-   Revisions: Add new selectors to fetch entity revisions. ([54046](https://github.com/WordPress/gutenberg/pull/54046))
 
 #### Interactivity API
-- Migration to the new `store()` API. ([55459](https://github.com/WordPress/gutenberg/pull/55459))
 
+-   Migration to the new `store()` API. ([55459](https://github.com/WordPress/gutenberg/pull/55459))
 
 ### Bug Fixes
 
-- Block Editor: Undeprecate the '__experimentalImageSizeControl' component. ([56414](https://github.com/WordPress/gutenberg/pull/56414))
-- Core data: Harmonize getRevision selector and resolver function signatures. ([56416](https://github.com/WordPress/gutenberg/pull/56416))
-- Editor styles: Scope without adding specificity. ([56564](https://github.com/WordPress/gutenberg/pull/56564))
-- Fix Restore Post title placeholder. ([56580](https://github.com/WordPress/gutenberg/pull/56580))
-- Post Schedule Panel: Remove text overflow ellipsis. ([56319](https://github.com/WordPress/gutenberg/pull/56319))
-- PostCSS style transformation: Fail gracefully instead of throwing an error. ([56093](https://github.com/WordPress/gutenberg/pull/56093))
-- Rich text: Pad multiple spaces through en/em replacement. ([56341](https://github.com/WordPress/gutenberg/pull/56341))
-- Site Editor Sidebar: Fix actions vertical alignment. ([56218](https://github.com/WordPress/gutenberg/pull/56218))
-- Site Editor: Add a fallback template showing the title and content for the post only mode. ([56509](https://github.com/WordPress/gutenberg/pull/56509))
-- useEntityRecord: Do not trigger REST API requests when disabled. ([56108](https://github.com/WordPress/gutenberg/pull/56108))
+-   Block Editor: Undeprecate the '\_\_experimentalImageSizeControl' component. ([56414](https://github.com/WordPress/gutenberg/pull/56414))
+-   Core data: Harmonize getRevision selector and resolver function signatures. ([56416](https://github.com/WordPress/gutenberg/pull/56416))
+-   Editor styles: Scope without adding specificity. ([56564](https://github.com/WordPress/gutenberg/pull/56564))
+-   Fix Restore Post title placeholder. ([56580](https://github.com/WordPress/gutenberg/pull/56580))
+-   Post Schedule Panel: Remove text overflow ellipsis. ([56319](https://github.com/WordPress/gutenberg/pull/56319))
+-   PostCSS style transformation: Fail gracefully instead of throwing an error. ([56093](https://github.com/WordPress/gutenberg/pull/56093))
+-   Rich text: Pad multiple spaces through en/em replacement. ([56341](https://github.com/WordPress/gutenberg/pull/56341))
+-   Site Editor Sidebar: Fix actions vertical alignment. ([56218](https://github.com/WordPress/gutenberg/pull/56218))
+-   Site Editor: Add a fallback template showing the title and content for the post only mode. ([56509](https://github.com/WordPress/gutenberg/pull/56509))
+-   useEntityRecord: Do not trigger REST API requests when disabled. ([56108](https://github.com/WordPress/gutenberg/pull/56108))
 
 #### Block Library
-- File block: Remove anchor tag when copy pasting to file name. ([56508](https://github.com/WordPress/gutenberg/pull/56508))
-- Fix label of columns inspector panel. ([56647](https://github.com/WordPress/gutenberg/pull/56647))
-- Post Template: Fix incorrect offset query. ([56440](https://github.com/WordPress/gutenberg/pull/56440))
+
+-   File block: Remove anchor tag when copy pasting to file name. ([56508](https://github.com/WordPress/gutenberg/pull/56508))
+-   Fix label of columns inspector panel. ([56647](https://github.com/WordPress/gutenberg/pull/56647))
+-   Post Template: Fix incorrect offset query. ([56440](https://github.com/WordPress/gutenberg/pull/56440))
 
 #### Block Editor
-- (RichText)(Workaround)(17.1.x) Fallback to a string arg in `collapseWhiteSpace()` if `value` is not a string. ([56570](https://github.com/WordPress/gutenberg/pull/56570))
-- Cover block: Pass dropZoneElement reference to fix dragging within cover block area. ([56312](https://github.com/WordPress/gutenberg/pull/56312))
-- useMovingAnimation: Clear translate3d rule when animation is finished. ([56410](https://github.com/WordPress/gutenberg/pull/56410))
+
+-   (RichText)(Workaround)(17.1.x) Fallback to a string arg in `collapseWhiteSpace()` if `value` is not a string. ([56570](https://github.com/WordPress/gutenberg/pull/56570))
+-   Cover block: Pass dropZoneElement reference to fix dragging within cover block area. ([56312](https://github.com/WordPress/gutenberg/pull/56312))
+-   useMovingAnimation: Clear translate3d rule when animation is finished. ([56410](https://github.com/WordPress/gutenberg/pull/56410))
 
 #### Components
-- Design Tools: Fix last ToolsPanelItem styling. ([56536](https://github.com/WordPress/gutenberg/pull/56536))
-- Fix FormTokenField suggestions broken scrollbar when `__experimentalExpandOnFocus` is defined. ([56426](https://github.com/WordPress/gutenberg/pull/56426))
-- Tabs: Fix flaky unit tests. ([55950](https://github.com/WordPress/gutenberg/pull/55950))
+
+-   Design Tools: Fix last ToolsPanelItem styling. ([56536](https://github.com/WordPress/gutenberg/pull/56536))
+-   Fix FormTokenField suggestions broken scrollbar when `__experimentalExpandOnFocus` is defined. ([56426](https://github.com/WordPress/gutenberg/pull/56426))
+-   Tabs: Fix flaky unit tests. ([55950](https://github.com/WordPress/gutenberg/pull/55950))
 
 #### Global Styles
-- Additional CSS: Fix on change validation. ([56434](https://github.com/WordPress/gutenberg/pull/56434))
-- Global styles revisions: Update isResolving flag. ([56491](https://github.com/WordPress/gutenberg/pull/56491))
-- Spacing: Fix block error if spacing unit array empty in theme.json. ([56306](https://github.com/WordPress/gutenberg/pull/56306))
+
+-   Additional CSS: Fix on change validation. ([56434](https://github.com/WordPress/gutenberg/pull/56434))
+-   Global styles revisions: Update isResolving flag. ([56491](https://github.com/WordPress/gutenberg/pull/56491))
+-   Spacing: Fix block error if spacing unit array empty in theme.json. ([56306](https://github.com/WordPress/gutenberg/pull/56306))
 
 #### CSS & Styling
-- Reduce specificity of default Cover text color styles. ([56411](https://github.com/WordPress/gutenberg/pull/56411))
-- Restore Post Title visual styles in Code View mode. ([56582](https://github.com/WordPress/gutenberg/pull/56582))
+
+-   Reduce specificity of default Cover text color styles. ([56411](https://github.com/WordPress/gutenberg/pull/56411))
+-   Restore Post Title visual styles in Code View mode. ([56582](https://github.com/WordPress/gutenberg/pull/56582))
 
 #### Saving
-- Editor: Reinstate anonymous callback for saved post state. ([56529](https://github.com/WordPress/gutenberg/pull/56529))
+
+-   Editor: Reinstate anonymous callback for saved post state. ([56529](https://github.com/WordPress/gutenberg/pull/56529))
 
 #### Post Editor
-- Save post button: Avoid extra re-renders when enablng/disabling tooltip. ([56502](https://github.com/WordPress/gutenberg/pull/56502))
+
+-   Save post button: Avoid extra re-renders when enablng/disabling tooltip. ([56502](https://github.com/WordPress/gutenberg/pull/56502))
 
 #### Plugin
-- Update Readme.txt tested up to 6.4. ([56427](https://github.com/WordPress/gutenberg/pull/56427))
+
+-   Update Readme.txt tested up to 6.4. ([56427](https://github.com/WordPress/gutenberg/pull/56427))
 
 #### Site Editor
-- Fix template resolution for templates assigned as home page. ([56418](https://github.com/WordPress/gutenberg/pull/56418))
+
+-   Fix template resolution for templates assigned as home page. ([56418](https://github.com/WordPress/gutenberg/pull/56418))
 
 #### Patterns
-- Fix issue with template in replace template screen. ([56407](https://github.com/WordPress/gutenberg/pull/56407))
+
+-   Fix issue with template in replace template screen. ([56407](https://github.com/WordPress/gutenberg/pull/56407))
 
 #### Layout
-- Fix issue where layout classnames are injected for blocks without layout support. ([56187](https://github.com/WordPress/gutenberg/pull/56187))
+
+-   Fix issue where layout classnames are injected for blocks without layout support. ([56187](https://github.com/WordPress/gutenberg/pull/56187))
 
 #### Typography
-- Font Library: Fix fonts not displaying correctly. ([55393](https://github.com/WordPress/gutenberg/pull/55393))
+
+-   Font Library: Fix fonts not displaying correctly. ([55393](https://github.com/WordPress/gutenberg/pull/55393))
 
 #### Colors
-- Duotone: Backport from Core to fix filters in classic themes. ([54778](https://github.com/WordPress/gutenberg/pull/54778))
 
+-   Duotone: Backport from Core to fix filters in classic themes. ([54778](https://github.com/WordPress/gutenberg/pull/54778))
 
 ### Accessibility
 
-- Migrating `StyleBook` to use updated `Composite` implementation. ([55344](https://github.com/WordPress/gutenberg/pull/55344))
+-   Migrating `StyleBook` to use updated `Composite` implementation. ([55344](https://github.com/WordPress/gutenberg/pull/55344))
 
 #### Data Views
-- DataViews: Make disabled pagination buttons focusable. ([56422](https://github.com/WordPress/gutenberg/pull/56422))
+
+-   DataViews: Make disabled pagination buttons focusable. ([56422](https://github.com/WordPress/gutenberg/pull/56422))
 
 #### Block Library
-- Image Block: Enable image block to be selected correctly when clicked. ([56043](https://github.com/WordPress/gutenberg/pull/56043))
+
+-   Image Block: Enable image block to be selected correctly when clicked. ([56043](https://github.com/WordPress/gutenberg/pull/56043))
 
 #### Post Editor
-- Tooltip: Don't render buttons tooltip when show button text labels is enabled. ([55842](https://github.com/WordPress/gutenberg/pull/55842))
+
+-   Tooltip: Don't render buttons tooltip when show button text labels is enabled. ([55842](https://github.com/WordPress/gutenberg/pull/55842))
 
 #### Components
-- Improve `Button` saving state accessibility. ([55547](https://github.com/WordPress/gutenberg/pull/55547))
+
+-   Improve `Button` saving state accessibility. ([55547](https://github.com/WordPress/gutenberg/pull/55547))
 
 #### Patterns
-- Fix focus loss after converting to a synced pattern. ([55473](https://github.com/WordPress/gutenberg/pull/55473))
 
+-   Fix focus loss after converting to a synced pattern. ([55473](https://github.com/WordPress/gutenberg/pull/55473))
 
 ### Performance
 
-- Avoid calling postcss when not needed. ([56601](https://github.com/WordPress/gutenberg/pull/56601))
-- Block Editor: Optimize 'Connections' inspector controls. ([56443](https://github.com/WordPress/gutenberg/pull/56443))
+-   Avoid calling postcss when not needed. ([56601](https://github.com/WordPress/gutenberg/pull/56601))
+-   Block Editor: Optimize 'Connections' inspector controls. ([56443](https://github.com/WordPress/gutenberg/pull/56443))
 
 #### Global Styles
-- Make search more responsive for block type list. ([56139](https://github.com/WordPress/gutenberg/pull/56139))
 
+-   Make search more responsive for block type list. ([56139](https://github.com/WordPress/gutenberg/pull/56139))
 
 ### Experiments
 
 #### Data Views
-- DataViews: Document `view.layout`. ([56637](https://github.com/WordPress/gutenberg/pull/56637))
-- DataViews: Extract common constants to file. ([56251](https://github.com/WordPress/gutenberg/pull/56251))
-- DataViews: Rename `InFilter` component to `FilterSummary`. ([56506](https://github.com/WordPress/gutenberg/pull/56506))
-- DataViews: Scope names of V2 UI components. ([56503](https://github.com/WordPress/gutenberg/pull/56503))
-- DataViews: Update field API to generate filters based on type. ([55996](https://github.com/WordPress/gutenberg/pull/55996))
-- DataViews: Update filter component. ([56110](https://github.com/WordPress/gutenberg/pull/56110))
-- Dataviews: Add confirmation step before deleting a page. ([56504](https://github.com/WordPress/gutenberg/pull/56504))
-- Dataviews: Add preview and grid view in templates list. ([56382](https://github.com/WordPress/gutenberg/pull/56382))
-- Dataviews: Grid layout refinements. ([56441](https://github.com/WordPress/gutenberg/pull/56441))
-- Dataviews: Remove link from author. ([56467](https://github.com/WordPress/gutenberg/pull/56467))
-- Dataviews: Update item actions in grid view. ([56501](https://github.com/WordPress/gutenberg/pull/56501))
-- Fix data view menu item radius. ([56395](https://github.com/WordPress/gutenberg/pull/56395))
+
+-   DataViews: Document `view.layout`. ([56637](https://github.com/WordPress/gutenberg/pull/56637))
+-   DataViews: Extract common constants to file. ([56251](https://github.com/WordPress/gutenberg/pull/56251))
+-   DataViews: Rename `InFilter` component to `FilterSummary`. ([56506](https://github.com/WordPress/gutenberg/pull/56506))
+-   DataViews: Scope names of V2 UI components. ([56503](https://github.com/WordPress/gutenberg/pull/56503))
+-   DataViews: Update field API to generate filters based on type. ([55996](https://github.com/WordPress/gutenberg/pull/55996))
+-   DataViews: Update filter component. ([56110](https://github.com/WordPress/gutenberg/pull/56110))
+-   Dataviews: Add confirmation step before deleting a page. ([56504](https://github.com/WordPress/gutenberg/pull/56504))
+-   Dataviews: Add preview and grid view in templates list. ([56382](https://github.com/WordPress/gutenberg/pull/56382))
+-   Dataviews: Grid layout refinements. ([56441](https://github.com/WordPress/gutenberg/pull/56441))
+-   Dataviews: Remove link from author. ([56467](https://github.com/WordPress/gutenberg/pull/56467))
+-   Dataviews: Update item actions in grid view. ([56501](https://github.com/WordPress/gutenberg/pull/56501))
+-   Fix data view menu item radius. ([56395](https://github.com/WordPress/gutenberg/pull/56395))
 
 #### Post Editor
-- Render html in post titles in visual mode and edit HTML in post title in code view. ([54718](https://github.com/WordPress/gutenberg/pull/54718))
 
+-   Render html in post titles in visual mode and edit HTML in post title in code view. ([54718](https://github.com/WordPress/gutenberg/pull/54718))
 
 ### Documentation
 
-- Add the attributes definition page to the create block tutorial of the platform documentation. ([56429](https://github.com/WordPress/gutenberg/pull/56429))
-- Add the transforms page to the create block tutorial of the platform documentation. ([56559](https://github.com/WordPress/gutenberg/pull/56559))
-- Add thee block supports page to the create block tutorial of the framework docs. ([56483](https://github.com/WordPress/gutenberg/pull/56483))
-- Added clarifications and examples to "Get started with wp-scripts". ([56298](https://github.com/WordPress/gutenberg/pull/56298))
-- Block Editor: Fix typo in `URLInput`'s `onKeyDown` prop documentation. ([56322](https://github.com/WordPress/gutenberg/pull/56322))
-- Bring back non-JS tabs in block editor handbook. ([56561](https://github.com/WordPress/gutenberg/pull/56561))
-- Docs: Fix incorrect build script description in script package. ([56332](https://github.com/WordPress/gutenberg/pull/56332))
-- Docs: Fundamentals of Block Development - File structure of a block. ([56551](https://github.com/WordPress/gutenberg/pull/56551))
-- Docs: Fundamentals of Block Development - Registration of a block. ([56334](https://github.com/WordPress/gutenberg/pull/56334))
-- Docs: Fundamentals of Block Development - The block wrapper. ([56596](https://github.com/WordPress/gutenberg/pull/56596))
-- Docs: Fundamentals of Block Development - Working with Javascript in the Block Editor. ([56553](https://github.com/WordPress/gutenberg/pull/56553))
-- Docs: Fundamentals of Block Development - block.json. ([56435](https://github.com/WordPress/gutenberg/pull/56435))
-- Docs: Improve downloadBlob example. ([56225](https://github.com/WordPress/gutenberg/pull/56225))
-- Documentation - Block Editor Handbook - Add end user documentation about Block Editor as a resource on the Landing Page of the Block Editor Handbook. ([49854](https://github.com/WordPress/gutenberg/pull/49854))
-- Fix overly complex code example in ComboboxControl readme. ([56365](https://github.com/WordPress/gutenberg/pull/56365))
-- Fix version in useSetting deprecation notice. ([56377](https://github.com/WordPress/gutenberg/pull/56377))
-- Fundamentals block development - landing and first pages. ([56584](https://github.com/WordPress/gutenberg/pull/56584))
-- Fundamentals of Block Development - fix save definition. ([56605](https://github.com/WordPress/gutenberg/pull/56605))
-- Link preview image to live example using WordPress Playground. ([56292](https://github.com/WordPress/gutenberg/pull/56292))
-- NavigableContainers: Fix doc typo in onKeyDown prop. ([56352](https://github.com/WordPress/gutenberg/pull/56352))
-- Release docs: Add new section about troubleshooting the release. ([56436](https://github.com/WordPress/gutenberg/pull/56436))
-- Remove all {% codetabs %} instances and any vanilla JS references. ([56121](https://github.com/WordPress/gutenberg/pull/56121))
-- Simplify code example in ToggleControl component readme. ([56389](https://github.com/WordPress/gutenberg/pull/56389))
-- Text and Heading: Improve documentation around default values and truncation logic. ([56518](https://github.com/WordPress/gutenberg/pull/56518))
-- Theme JSON schema: Add heading/button key to color definition. ([55674](https://github.com/WordPress/gutenberg/pull/55674))
-- Update for 6.4.1 for versions in WP. ([56216](https://github.com/WordPress/gutenberg/pull/56216))
-- Update references to the gutenberg-examples repo to the new block-development-examples. ([56119](https://github.com/WordPress/gutenberg/pull/56119))
-- Update template name in `create-block` command. ([56281](https://github.com/WordPress/gutenberg/pull/56281))
-- Update webpack options for wp-scripts in README.md. ([56314](https://github.com/WordPress/gutenberg/pull/56314))
-- `BoxControl`: Update story and refactor to Typescript. ([56462](https://github.com/WordPress/gutenberg/pull/56462))
-
+-   Add the attributes definition page to the create block tutorial of the platform documentation. ([56429](https://github.com/WordPress/gutenberg/pull/56429))
+-   Add the transforms page to the create block tutorial of the platform documentation. ([56559](https://github.com/WordPress/gutenberg/pull/56559))
+-   Add thee block supports page to the create block tutorial of the framework docs. ([56483](https://github.com/WordPress/gutenberg/pull/56483))
+-   Added clarifications and examples to "Get started with wp-scripts". ([56298](https://github.com/WordPress/gutenberg/pull/56298))
+-   Block Editor: Fix typo in `URLInput`'s `onKeyDown` prop documentation. ([56322](https://github.com/WordPress/gutenberg/pull/56322))
+-   Bring back non-JS tabs in block editor handbook. ([56561](https://github.com/WordPress/gutenberg/pull/56561))
+-   Docs: Fix incorrect build script description in script package. ([56332](https://github.com/WordPress/gutenberg/pull/56332))
+-   Docs: Fundamentals of Block Development - File structure of a block. ([56551](https://github.com/WordPress/gutenberg/pull/56551))
+-   Docs: Fundamentals of Block Development - Registration of a block. ([56334](https://github.com/WordPress/gutenberg/pull/56334))
+-   Docs: Fundamentals of Block Development - The block wrapper. ([56596](https://github.com/WordPress/gutenberg/pull/56596))
+-   Docs: Fundamentals of Block Development - Working with JavaScript in the Block Editor. ([56553](https://github.com/WordPress/gutenberg/pull/56553))
+-   Docs: Fundamentals of Block Development - block.json. ([56435](https://github.com/WordPress/gutenberg/pull/56435))
+-   Docs: Improve downloadBlob example. ([56225](https://github.com/WordPress/gutenberg/pull/56225))
+-   Documentation - Block Editor Handbook - Add end user documentation about Block Editor as a resource on the Landing Page of the Block Editor Handbook. ([49854](https://github.com/WordPress/gutenberg/pull/49854))
+-   Fix overly complex code example in ComboboxControl readme. ([56365](https://github.com/WordPress/gutenberg/pull/56365))
+-   Fix version in useSetting deprecation notice. ([56377](https://github.com/WordPress/gutenberg/pull/56377))
+-   Fundamentals block development - landing and first pages. ([56584](https://github.com/WordPress/gutenberg/pull/56584))
+-   Fundamentals of Block Development - fix save definition. ([56605](https://github.com/WordPress/gutenberg/pull/56605))
+-   Link preview image to live example using WordPress Playground. ([56292](https://github.com/WordPress/gutenberg/pull/56292))
+-   NavigableContainers: Fix doc typo in onKeyDown prop. ([56352](https://github.com/WordPress/gutenberg/pull/56352))
+-   Release docs: Add new section about troubleshooting the release. ([56436](https://github.com/WordPress/gutenberg/pull/56436))
+-   Remove all {% codetabs %} instances and any vanilla JS references. ([56121](https://github.com/WordPress/gutenberg/pull/56121))
+-   Simplify code example in ToggleControl component readme. ([56389](https://github.com/WordPress/gutenberg/pull/56389))
+-   Text and Heading: Improve documentation around default values and truncation logic. ([56518](https://github.com/WordPress/gutenberg/pull/56518))
+-   Theme JSON schema: Add heading/button key to color definition. ([55674](https://github.com/WordPress/gutenberg/pull/55674))
+-   Update for 6.4.1 for versions in WP. ([56216](https://github.com/WordPress/gutenberg/pull/56216))
+-   Update references to the gutenberg-examples repo to the new block-development-examples. ([56119](https://github.com/WordPress/gutenberg/pull/56119))
+-   Update template name in `create-block` command. ([56281](https://github.com/WordPress/gutenberg/pull/56281))
+-   Update webpack options for wp-scripts in README.md. ([56314](https://github.com/WordPress/gutenberg/pull/56314))
+-   `BoxControl`: Update story and refactor to Typescript. ([56462](https://github.com/WordPress/gutenberg/pull/56462))
 
 ### Code Quality
 
-- Blocks pkg: Remove 'browser' dependencies. ([56433](https://github.com/WordPress/gutenberg/pull/56433))
-- DataViews: Code Quality remove some unused props from action. ([56477](https://github.com/WordPress/gutenberg/pull/56477))
-- Editor: Move the template focus modes to the editor store. ([56472](https://github.com/WordPress/gutenberg/pull/56472))
-- Extract a PostPanelRow component from the different sidebar panels. ([56238](https://github.com/WordPress/gutenberg/pull/56238))
-- Interactivity API: Add missing changelog entry for the new `store()` API. ([56611](https://github.com/WordPress/gutenberg/pull/56611))
-- Migrating block editor `BlockPatternsList` component. ([56210](https://github.com/WordPress/gutenberg/pull/56210))
-- Move the DisableNonContentBlocks component to the editor package. ([56423](https://github.com/WordPress/gutenberg/pull/56423))
-- Post Schedule Panel: Fix Sass deprecation warning for division. ([56412](https://github.com/WordPress/gutenberg/pull/56412))
-- Remove compatibility layer for WP 6.2. ([56464](https://github.com/WordPress/gutenberg/pull/56464))
-- Unify the PostSchedule component between site and post editors. ([56196](https://github.com/WordPress/gutenberg/pull/56196))
-- Update: Refactor useAddedBy to use authorText and originalSource fields. ([56568](https://github.com/WordPress/gutenberg/pull/56568))
+-   Blocks pkg: Remove 'browser' dependencies. ([56433](https://github.com/WordPress/gutenberg/pull/56433))
+-   DataViews: Code Quality remove some unused props from action. ([56477](https://github.com/WordPress/gutenberg/pull/56477))
+-   Editor: Move the template focus modes to the editor store. ([56472](https://github.com/WordPress/gutenberg/pull/56472))
+-   Extract a PostPanelRow component from the different sidebar panels. ([56238](https://github.com/WordPress/gutenberg/pull/56238))
+-   Interactivity API: Add missing changelog entry for the new `store()` API. ([56611](https://github.com/WordPress/gutenberg/pull/56611))
+-   Migrating block editor `BlockPatternsList` component. ([56210](https://github.com/WordPress/gutenberg/pull/56210))
+-   Move the DisableNonContentBlocks component to the editor package. ([56423](https://github.com/WordPress/gutenberg/pull/56423))
+-   Post Schedule Panel: Fix Sass deprecation warning for division. ([56412](https://github.com/WordPress/gutenberg/pull/56412))
+-   Remove compatibility layer for WP 6.2. ([56464](https://github.com/WordPress/gutenberg/pull/56464))
+-   Unify the PostSchedule component between site and post editors. ([56196](https://github.com/WordPress/gutenberg/pull/56196))
+-   Update: Refactor useAddedBy to use authorText and originalSource fields. ([56568](https://github.com/WordPress/gutenberg/pull/56568))
 
 #### Block Library
--  Add align support to the image block - alternative. ([55954](https://github.com/WordPress/gutenberg/pull/55954))
-- Backmerge block renaming fixes/refactors from 6.4 branch into Gutenberg trunk. ([56386](https://github.com/WordPress/gutenberg/pull/56386))
-- Pattern placeholder: Remove duplicate 'useDispatch' hook. ([56397](https://github.com/WordPress/gutenberg/pull/56397))
+
+-   Add align support to the image block - alternative. ([55954](https://github.com/WordPress/gutenberg/pull/55954))
+-   Backmerge block renaming fixes/refactors from 6.4 branch into Gutenberg trunk. ([56386](https://github.com/WordPress/gutenberg/pull/56386))
+-   Pattern placeholder: Remove duplicate 'useDispatch' hook. ([56397](https://github.com/WordPress/gutenberg/pull/56397))
 
 #### Components
-- Remove incorrect version from deprecated `__nextHasNoMarginBottom` prop of `AnglePickerControl` Component. ([56336](https://github.com/WordPress/gutenberg/pull/56336))
-- Revert "DropdownMenu V2: Add support for rendering in legacy popover slot". ([56484](https://github.com/WordPress/gutenberg/pull/56484))
+
+-   Remove incorrect version from deprecated `__nextHasNoMarginBottom` prop of `AnglePickerControl` Component. ([56336](https://github.com/WordPress/gutenberg/pull/56336))
+-   Revert "DropdownMenu V2: Add support for rendering in legacy popover slot". ([56484](https://github.com/WordPress/gutenberg/pull/56484))
 
 #### Data Views
-- Dataviews: Ensure items and fields are using a unique id. ([56366](https://github.com/WordPress/gutenberg/pull/56366))
+
+-   Dataviews: Ensure items and fields are using a unique id. ([56366](https://github.com/WordPress/gutenberg/pull/56366))
 
 #### Block Editor
-- useInnerBlocksProps: Stabilise dropZoneElement prop. ([56313](https://github.com/WordPress/gutenberg/pull/56313))
+
+-   useInnerBlocksProps: Stabilise dropZoneElement prop. ([56313](https://github.com/WordPress/gutenberg/pull/56313))
 
 #### Design Tools
-- Fix: Theme.json font settings in unit test. ([56309](https://github.com/WordPress/gutenberg/pull/56309))
 
+-   Fix: Theme.json font settings in unit test. ([56309](https://github.com/WordPress/gutenberg/pull/56309))
 
 ### Tools
 
-- Workflows: Update 'days-before-stale' for flaky test report issues. ([56585](https://github.com/WordPress/gutenberg/pull/56585))
-- scripts: Update `jest-dev-server` to v9. ([56552](https://github.com/WordPress/gutenberg/pull/56552))
+-   Workflows: Update 'days-before-stale' for flaky test report issues. ([56585](https://github.com/WordPress/gutenberg/pull/56585))
+-   scripts: Update `jest-dev-server` to v9. ([56552](https://github.com/WordPress/gutenberg/pull/56552))
 
 #### Testing
-- Dataviews: Add first end-to-end tests. ([56634](https://github.com/WordPress/gutenberg/pull/56634))
-- Migrate 'align hook' end-to-end tests to Playwright. ([56480](https://github.com/WordPress/gutenberg/pull/56480))
-- Migrate 'block directory' end-to-end tests to Playwright. ([56593](https://github.com/WordPress/gutenberg/pull/56593))
-- Migrate 'block icons' end-to-end tests to Playwright. ([56610](https://github.com/WordPress/gutenberg/pull/56610))
-- Migrate 'custom taxonomies' end-to-end test to Playwright. ([56486](https://github.com/WordPress/gutenberg/pull/56486))
-- Migrate 'sidebar permalink' end-to-end tests to Playwright. ([56253](https://github.com/WordPress/gutenberg/pull/56253))
-- Migrate Is Typing Test to Playwright. ([56616](https://github.com/WordPress/gutenberg/pull/56616))
-- Page spec: Merging create page and toggle preview tests. ([56129](https://github.com/WordPress/gutenberg/pull/56129))
-- Playwright Utils: Fix the method of getting post ID in 'publishPost'. ([56421](https://github.com/WordPress/gutenberg/pull/56421))
-- end-to-end tests: Merge Puppeteer into single job, split Playwright further. ([56363](https://github.com/WordPress/gutenberg/pull/56363))
+
+-   Dataviews: Add first end-to-end tests. ([56634](https://github.com/WordPress/gutenberg/pull/56634))
+-   Migrate 'align hook' end-to-end tests to Playwright. ([56480](https://github.com/WordPress/gutenberg/pull/56480))
+-   Migrate 'block directory' end-to-end tests to Playwright. ([56593](https://github.com/WordPress/gutenberg/pull/56593))
+-   Migrate 'block icons' end-to-end tests to Playwright. ([56610](https://github.com/WordPress/gutenberg/pull/56610))
+-   Migrate 'custom taxonomies' end-to-end test to Playwright. ([56486](https://github.com/WordPress/gutenberg/pull/56486))
+-   Migrate 'sidebar permalink' end-to-end tests to Playwright. ([56253](https://github.com/WordPress/gutenberg/pull/56253))
+-   Migrate Is Typing Test to Playwright. ([56616](https://github.com/WordPress/gutenberg/pull/56616))
+-   Page spec: Merging create page and toggle preview tests. ([56129](https://github.com/WordPress/gutenberg/pull/56129))
+-   Playwright Utils: Fix the method of getting post ID in 'publishPost'. ([56421](https://github.com/WordPress/gutenberg/pull/56421))
+-   end-to-end tests: Merge Puppeteer into single job, split Playwright further. ([56363](https://github.com/WordPress/gutenberg/pull/56363))
 
 #### Build Tooling
-- Create block: Update `interactive-template` to the new `store()` API. ([56613](https://github.com/WordPress/gutenberg/pull/56613))
 
+-   Create block: Update `interactive-template` to the new `store()` API. ([56613](https://github.com/WordPress/gutenberg/pull/56613))
 
 ### Security
 
-- WP_Theme_JSON_Gutenberg: Add nested indexed array schema sanitization. ([56447](https://github.com/WordPress/gutenberg/pull/56447))
-
+-   WP_Theme_JSON_Gutenberg: Add nested indexed array schema sanitization. ([56447](https://github.com/WordPress/gutenberg/pull/56447))
 
 ### Various
 
-- Add: Author text and original source to wp_template_part. ([56567](https://github.com/WordPress/gutenberg/pull/56567))
-- Migrating `BlockPatternSetup` to use updated `Composite` implementation. ([55425](https://github.com/WordPress/gutenberg/pull/55425))
-- Migrating `InserterListbox` to use updated Composite implementation. ([56246](https://github.com/WordPress/gutenberg/pull/56246))
+-   Add: Author text and original source to wp_template_part. ([56567](https://github.com/WordPress/gutenberg/pull/56567))
+-   Migrating `BlockPatternSetup` to use updated `Composite` implementation. ([55425](https://github.com/WordPress/gutenberg/pull/55425))
+-   Migrating `InserterListbox` to use updated Composite implementation. ([56246](https://github.com/WordPress/gutenberg/pull/56246))
 
 #### Data Views
-- Dataviews: All Templates: Add filters to template author. ([56338](https://github.com/WordPress/gutenberg/pull/56338))
-- Dataviews: All templates: Add: Sorting to template author and add author_text to the rest API. ([56333](https://github.com/WordPress/gutenberg/pull/56333))
-
-#### HTML API
-- Backport updates from Core. ([56578](https://github.com/WordPress/gutenberg/pull/56578))
 
+-   Dataviews: All Templates: Add filters to template author. ([56338](https://github.com/WordPress/gutenberg/pull/56338))
+-   Dataviews: All templates: Add: Sorting to template author and add author_text to the rest API. ([56333](https://github.com/WordPress/gutenberg/pull/56333))
 
+#### HTML API
 
+-   Backport updates from Core. ([56578](https://github.com/WordPress/gutenberg/pull/56578))
 
 ## Contributors
 
@@ -326,18 +10856,15 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @andrewhayward @andrewserong @annezazu @apeatling @arthur791004 @bph @brookewp @chad1008 @chiilog @ciampo @DAreRodz @dmsnell @draganescu @ellatrix @fabiankaegy @flootr @fluiddot @fullofcaffeine @geriux @getdave @glendaviesnz @jameskoster @jasmussen @jeryj @jffng @jorgefilipecosta @juanmaguitar @kevin940726 @luisherranz @MaggieCabrera @Mamaduka @matiasbenedetto @megane9988 @NekoJonez @ntsekouras @oandregal @ramonjd @richtabor @ryanwelcher @SavPhill @Soean @t-hamano @talldan @tellthemachines @youknowriad @zaguiini
 
-
 = 17.1.3 =
 
-
 ## Changelog
 
 ### Bug fixes
 
 #### Components
-- https://github.com/WordPress/gutenberg/pull/56570
-
 
+-   https://github.com/WordPress/gutenberg/pull/56570
 
 = 17.1.2 =
 
@@ -347,7 +10874,7 @@ The following contributors merged PRs in this release:
 
 #### Block Editor
 
-- PostCSS style transformation: fail gracefully instead of throwing an error (https://github.com/WordPress/gutenberg/pull/56093)
+-   PostCSS style transformation: fail gracefully instead of throwing an error (https://github.com/WordPress/gutenberg/pull/56093)
 
 ## Contributors
 
@@ -355,18 +10882,16 @@ The following contributors merged PRs in this release:
 
 @zaguiini
 
-
 = 17.1.1 =
 
-# Changelog
+## Changelog
 
-## Bug Fixes
+### Bug Fixes
 
 ### Block Library
 
 Fix fatal error when calling undefined block library function. #56459
 
-
 = 17.0.3 =
 
 ## Changelog
@@ -375,329 +10900,362 @@ Fix fatal error when calling undefined block library function. #56459
 
 #### Block Editor
 
-- PostCSS style transformation: fail gracefully instead of throwing an error (https://github.com/WordPress/gutenberg/pull/56093)
-
-
+-   PostCSS style transformation: fail gracefully instead of throwing an error (https://github.com/WordPress/gutenberg/pull/56093)
 
 = 17.1.0 =
 
-
 ## Changelog
 
 ### Enhancements
 
 #### Block Library
-- Navigation block: Fix Inaccurate description of the Show icon button setting. ([55429](https://github.com/WordPress/gutenberg/pull/55429))
-- Query Loop: Add accesibility markup at the end of the loop in all cases. ([55890](https://github.com/WordPress/gutenberg/pull/55890))
-- Template Part: Add fallback to the current theme when not provided. ([55965](https://github.com/WordPress/gutenberg/pull/55965))
-- Update components to use __next40pxDefaultSize. ([56022](https://github.com/WordPress/gutenberg/pull/56022))
+
+-   Navigation block: Fix Inaccurate description of the Show icon button setting. ([55429](https://github.com/WordPress/gutenberg/pull/55429))
+-   Query Loop: Add accesibility markup at the end of the loop in all cases. ([55890](https://github.com/WordPress/gutenberg/pull/55890))
+-   Template Part: Add fallback to the current theme when not provided. ([55965](https://github.com/WordPress/gutenberg/pull/55965))
+-   Update components to use \_\_next40pxDefaultSize. ([56022](https://github.com/WordPress/gutenberg/pull/56022))
 
 #### Components
-- Tabs: Improve focus behavior. ([55287](https://github.com/WordPress/gutenberg/pull/55287))
-- Tabs: Update subcomponents to accept full HTML element props. ([55860](https://github.com/WordPress/gutenberg/pull/55860))
-- TextControl: Add opt-in prop for 40px default size. ([55471](https://github.com/WordPress/gutenberg/pull/55471))
-- ToggleGroupControl: Add opt-in prop for 40px default size. ([55789](https://github.com/WordPress/gutenberg/pull/55789))
+
+-   Tabs: Improve focus behavior. ([55287](https://github.com/WordPress/gutenberg/pull/55287))
+-   Tabs: Update subcomponents to accept full HTML element props. ([55860](https://github.com/WordPress/gutenberg/pull/55860))
+-   TextControl: Add opt-in prop for 40px default size. ([55471](https://github.com/WordPress/gutenberg/pull/55471))
+-   ToggleGroupControl: Add opt-in prop for 40px default size. ([55789](https://github.com/WordPress/gutenberg/pull/55789))
 
 #### Patterns
-- Move "Manage patterns" below "Detach pattern". ([56018](https://github.com/WordPress/gutenberg/pull/56018))
-- Show theme patterns from directory in site editor. ([55877](https://github.com/WordPress/gutenberg/pull/55877))
+
+-   Move "Manage patterns" below "Detach pattern". ([56018](https://github.com/WordPress/gutenberg/pull/56018))
+-   Show theme patterns from directory in site editor. ([55877](https://github.com/WordPress/gutenberg/pull/55877))
 
 #### Global Styles
-- Global Style Revisions: Ensure consistent back button behaviour. ([55881](https://github.com/WordPress/gutenberg/pull/55881))
-- Global Styles Revisions: More descriptive text timeline. ([55868](https://github.com/WordPress/gutenberg/pull/55868))
-- Global Styles Revisions: Add route for single styles revisions. ([55827](https://github.com/WordPress/gutenberg/pull/55827))
+
+-   Global Style Revisions: Ensure consistent back button behaviour. ([55881](https://github.com/WordPress/gutenberg/pull/55881))
+-   Global Styles Revisions: More descriptive text timeline. ([55868](https://github.com/WordPress/gutenberg/pull/55868))
+-   Global Styles Revisions: Add route for single styles revisions. ([55827](https://github.com/WordPress/gutenberg/pull/55827))
 
 #### Block Locking
-- Block Quick Navigation: Truncate text. ([56142](https://github.com/WordPress/gutenberg/pull/56142))
+
+-   Block Quick Navigation: Truncate text. ([56142](https://github.com/WordPress/gutenberg/pull/56142))
 
 #### Block Editor
-- Button block: Support double enter to skip to default block. ([56134](https://github.com/WordPress/gutenberg/pull/56134))
+
+-   Button block: Support double enter to skip to default block. ([56134](https://github.com/WordPress/gutenberg/pull/56134))
 
 #### Design Tools
-- Add block gap support to Quote block. ([56064](https://github.com/WordPress/gutenberg/pull/56064))
+
+-   Add block gap support to Quote block. ([56064](https://github.com/WordPress/gutenberg/pull/56064))
 
 #### Post Editor
-- "Detach" text change in template options. ([55870](https://github.com/WordPress/gutenberg/pull/55870))
+
+-   "Detach" text change in template options. ([55870](https://github.com/WordPress/gutenberg/pull/55870))
 
 #### Site Editor
-- Site editor: Add edit page slug field. ([55767](https://github.com/WordPress/gutenberg/pull/55767))
+
+-   Site editor: Add edit page slug field. ([55767](https://github.com/WordPress/gutenberg/pull/55767))
 
 #### Interactivity API
-- Server directive processing: Process only root blocks. ([55739](https://github.com/WordPress/gutenberg/pull/55739))
+
+-   Server directive processing: Process only root blocks. ([55739](https://github.com/WordPress/gutenberg/pull/55739))
 
 #### Block settings menu
-- Remove the extraneous template part title in replace control. ([55603](https://github.com/WordPress/gutenberg/pull/55603))
+
+-   Remove the extraneous template part title in replace control. ([55603](https://github.com/WordPress/gutenberg/pull/55603))
 
 #### List View
-- Add keyboard shortcut to select all blocks. ([54899](https://github.com/WordPress/gutenberg/pull/54899))
 
+-   Add keyboard shortcut to select all blocks. ([54899](https://github.com/WordPress/gutenberg/pull/54899))
 
 ### New APIs
 
-- Download blob: Remove downloadjs dependency. ([56024](https://github.com/WordPress/gutenberg/pull/56024))
-
+-   Download blob: Remove downloadjs dependency. ([56024](https://github.com/WordPress/gutenberg/pull/56024))
 
 ### Bug Fixes
 
 #### Block Library
-- Background Image Support: Hide the background image reset button when there's no image. ([55973](https://github.com/WordPress/gutenberg/pull/55973))
-- Background image support: Fix focus loss when resetting background image. ([55984](https://github.com/WordPress/gutenberg/pull/55984))
-- Custom Link: Decode value in URL input field. ([55549](https://github.com/WordPress/gutenberg/pull/55549))
-- Fix lightbox trigger styles. ([55859](https://github.com/WordPress/gutenberg/pull/55859))
-- Form block: Use `type="submit"` for buttons. ([55690](https://github.com/WordPress/gutenberg/pull/55690))
-- Image block: Add check for lightbox values during image block migration. ([56057](https://github.com/WordPress/gutenberg/pull/56057))
-- Image block: Don't show pointer cursor on linked image in the editor. ([55882](https://github.com/WordPress/gutenberg/pull/55882))
-- Lightbox: Fix button misalignment in gallery image. ([56060](https://github.com/WordPress/gutenberg/pull/56060))
-- Lightbox: Fix close button position. ([56125](https://github.com/WordPress/gutenberg/pull/56125))
-- Missing block: Use raw source for originalContent. ([56014](https://github.com/WordPress/gutenberg/pull/56014))
-- Navigation Link block: Register variations on post type / taxonomy registration. ([54801](https://github.com/WordPress/gutenberg/pull/54801))
-- Pattern: Fix regression error in post type templates. ([55858](https://github.com/WordPress/gutenberg/pull/55858))
-- Pattern: Process embeds. ([55979](https://github.com/WordPress/gutenberg/pull/55979))
-- Post feature image block: Wrap images with hrefs in an A tag. ([55498](https://github.com/WordPress/gutenberg/pull/55498))
-- Quote Block: Fix the Quote block layout supports. ([55240](https://github.com/WordPress/gutenberg/pull/55240))
-- Read More block: Reduce text decoration specificity. ([56038](https://github.com/WordPress/gutenberg/pull/56038))
+
+-   Background Image Support: Hide the background image reset button when there's no image. ([55973](https://github.com/WordPress/gutenberg/pull/55973))
+-   Background image support: Fix focus loss when resetting background image. ([55984](https://github.com/WordPress/gutenberg/pull/55984))
+-   Custom Link: Decode value in URL input field. ([55549](https://github.com/WordPress/gutenberg/pull/55549))
+-   Fix lightbox trigger styles. ([55859](https://github.com/WordPress/gutenberg/pull/55859))
+-   Form block: Use `type="submit"` for buttons. ([55690](https://github.com/WordPress/gutenberg/pull/55690))
+-   Image block: Add check for lightbox values during image block migration. ([56057](https://github.com/WordPress/gutenberg/pull/56057))
+-   Image block: Don't show pointer cursor on linked image in the editor. ([55882](https://github.com/WordPress/gutenberg/pull/55882))
+-   Lightbox: Fix button misalignment in gallery image. ([56060](https://github.com/WordPress/gutenberg/pull/56060))
+-   Lightbox: Fix close button position. ([56125](https://github.com/WordPress/gutenberg/pull/56125))
+-   Missing block: Use raw source for originalContent. ([56014](https://github.com/WordPress/gutenberg/pull/56014))
+-   Navigation Link block: Register variations on post type / taxonomy registration. ([54801](https://github.com/WordPress/gutenberg/pull/54801))
+-   Pattern: Fix regression error in post type templates. ([55858](https://github.com/WordPress/gutenberg/pull/55858))
+-   Pattern: Process embeds. ([55979](https://github.com/WordPress/gutenberg/pull/55979))
+-   Post feature image block: Wrap images with hrefs in an A tag. ([55498](https://github.com/WordPress/gutenberg/pull/55498))
+-   Quote Block: Fix the Quote block layout supports. ([55240](https://github.com/WordPress/gutenberg/pull/55240))
+-   Read More block: Reduce text decoration specificity. ([56038](https://github.com/WordPress/gutenberg/pull/56038))
 
 #### Data Views
-- DataViews: Add missing key to `ResetFilters` component. ([56189](https://github.com/WordPress/gutenberg/pull/56189))
-- DataViews: Fix issue with irrelevant statuses. ([55967](https://github.com/WordPress/gutenberg/pull/55967))
-- DataViews: Fix nested button tags on sidebar. ([56089](https://github.com/WordPress/gutenberg/pull/56089))
-- DataViews: Fix pagination on manual input. ([55940](https://github.com/WordPress/gutenberg/pull/55940))
-- DataViews: Fix spacing issue in top-level bar. ([56151](https://github.com/WordPress/gutenberg/pull/56151))
-- DataViews: Fix status filter upon switching the default views from the sidebar. ([55856](https://github.com/WordPress/gutenberg/pull/55856))
-- DataViews: Make items per page an even number. ([55906](https://github.com/WordPress/gutenberg/pull/55906))
-- DataViews: Make used taxonomy private. ([55918](https://github.com/WordPress/gutenberg/pull/55918))
-- DataViews: Reset pagination upon filter change. ([55797](https://github.com/WordPress/gutenberg/pull/55797))
-- DataViews: Add a missing icon for the side by side view. ([55925](https://github.com/WordPress/gutenberg/pull/55925))
-
-#### Components
-- DropdownMenu: Remove extra vertical space around the toggle button. ([56136](https://github.com/WordPress/gutenberg/pull/56136))
-- DropdownMenuV2: Prevent default on Escape key presses. ([55962](https://github.com/WordPress/gutenberg/pull/55962))
-- DropdownMenuV2: Use the `Icon` component to render radio checks. ([55964](https://github.com/WordPress/gutenberg/pull/55964))
+
+-   DataViews: Add missing key to `ResetFilters` component. ([56189](https://github.com/WordPress/gutenberg/pull/56189))
+-   DataViews: Fix issue with irrelevant statuses. ([55967](https://github.com/WordPress/gutenberg/pull/55967))
+-   DataViews: Fix nested button tags on sidebar. ([56089](https://github.com/WordPress/gutenberg/pull/56089))
+-   DataViews: Fix pagination on manual input. ([55940](https://github.com/WordPress/gutenberg/pull/55940))
+-   DataViews: Fix spacing issue in top-level bar. ([56151](https://github.com/WordPress/gutenberg/pull/56151))
+-   DataViews: Fix status filter upon switching the default views from the sidebar. ([55856](https://github.com/WordPress/gutenberg/pull/55856))
+-   DataViews: Make items per page an even number. ([55906](https://github.com/WordPress/gutenberg/pull/55906))
+-   DataViews: Make used taxonomy private. ([55918](https://github.com/WordPress/gutenberg/pull/55918))
+-   DataViews: Reset pagination upon filter change. ([55797](https://github.com/WordPress/gutenberg/pull/55797))
+-   DataViews: Add a missing icon for the side by side view. ([55925](https://github.com/WordPress/gutenberg/pull/55925))
+
+#### Components
+
+-   DropdownMenu: Remove extra vertical space around the toggle button. ([56136](https://github.com/WordPress/gutenberg/pull/56136))
+-   DropdownMenuV2: Prevent default on Escape key presses. ([55962](https://github.com/WordPress/gutenberg/pull/55962))
+-   DropdownMenuV2: Use the `Icon` component to render radio checks. ([55964](https://github.com/WordPress/gutenberg/pull/55964))
 
 #### Typography
-- Fix fatal error in WP_Fonts_Resolver::Get_settings(). ([55981](https://github.com/WordPress/gutenberg/pull/55981))
-- Font Library: Create fonts dir if a font face needs to use the filesystem. ([56120](https://github.com/WordPress/gutenberg/pull/56120))
-- Font Library: Fix font installation failure. ([55893](https://github.com/WordPress/gutenberg/pull/55893))
+
+-   Fix fatal error in WP_Fonts_Resolver::Get_settings(). ([55981](https://github.com/WordPress/gutenberg/pull/55981))
+-   Font Library: Create fonts dir if a font face needs to use the filesystem. ([56120](https://github.com/WordPress/gutenberg/pull/56120))
+-   Font Library: Fix font installation failure. ([55893](https://github.com/WordPress/gutenberg/pull/55893))
 
 #### Block Editor
-- Iframe: Bubble events from html element instead of body element to fix drag chip positioning. ([56099](https://github.com/WordPress/gutenberg/pull/56099))
-- Post Featured Image: Handling correctly when uploading a file without mime type. ([56133](https://github.com/WordPress/gutenberg/pull/56133))
-- Block Editor: Fix Block editor crash. ([56051](https://github.com/WordPress/gutenberg/pull/56051))
-- Move clientId key to BlockContextualToolbar. ([56008](https://github.com/WordPress/gutenberg/pull/56008))
+
+-   Iframe: Bubble events from html element instead of body element to fix drag chip positioning. ([56099](https://github.com/WordPress/gutenberg/pull/56099))
+-   Post Featured Image: Handling correctly when uploading a file without mime type. ([56133](https://github.com/WordPress/gutenberg/pull/56133))
+-   Block Editor: Fix Block editor crash. ([56051](https://github.com/WordPress/gutenberg/pull/56051))
+-   Move clientId key to BlockContextualToolbar. ([56008](https://github.com/WordPress/gutenberg/pull/56008))
 
 #### Patterns
-- Add context for translators to any unclear usage of "synced". ([55935](https://github.com/WordPress/gutenberg/pull/55935))
-- Use existing download function for JSON downloads to fix non-ASCII encoding. ([55912](https://github.com/WordPress/gutenberg/pull/55912))
+
+-   Add context for translators to any unclear usage of "synced". ([55935](https://github.com/WordPress/gutenberg/pull/55935))
+-   Use existing download function for JSON downloads to fix non-ASCII encoding. ([55912](https://github.com/WordPress/gutenberg/pull/55912))
 
 #### Inspector Controls
-- Global Styles: Don't show "Apply Styles Globally" button in non-block based themes. ([56033](https://github.com/WordPress/gutenberg/pull/56033))
+
+-   Global Styles: Don't show "Apply Styles Globally" button in non-block based themes. ([56033](https://github.com/WordPress/gutenberg/pull/56033))
 
 #### Template Editor
-- Templates: Update filter to call all of the individual methods. ([55980](https://github.com/WordPress/gutenberg/pull/55980))
+
+-   Templates: Update filter to call all of the individual methods. ([55980](https://github.com/WordPress/gutenberg/pull/55980))
 
 #### Global Styles
-- Global styles revisions: Load unsaved revision item into the revisions preview. ([55880](https://github.com/WordPress/gutenberg/pull/55880))
+
+-   Global styles revisions: Load unsaved revision item into the revisions preview. ([55880](https://github.com/WordPress/gutenberg/pull/55880))
 
 #### Post Editor
-- Edit Post: Fix pattern modal reopening when making the title empty again. ([55873](https://github.com/WordPress/gutenberg/pull/55873))
+
+-   Edit Post: Fix pattern modal reopening when making the title empty again. ([55873](https://github.com/WordPress/gutenberg/pull/55873))
 
 #### Data Layer
-- Core data: Fix wrong store results when page receives less items that what is stored. ([55832](https://github.com/WordPress/gutenberg/pull/55832))
 
+-   Core data: Fix wrong store results when page receives less items that what is stored. ([55832](https://github.com/WordPress/gutenberg/pull/55832))
 
 ### Accessibility
 
 #### Data Views
-- DataViews: Add labels to "in-filters". ([56001](https://github.com/WordPress/gutenberg/pull/56001))
-- DataViews: Show actions label. ([56027](https://github.com/WordPress/gutenberg/pull/56027))
+
+-   DataViews: Add labels to "in-filters". ([56001](https://github.com/WordPress/gutenberg/pull/56001))
+-   DataViews: Show actions label. ([56027](https://github.com/WordPress/gutenberg/pull/56027))
 
 #### Components
-- Fix the image link button pressed state. ([56123](https://github.com/WordPress/gutenberg/pull/56123))
+
+-   Fix the image link button pressed state. ([56123](https://github.com/WordPress/gutenberg/pull/56123))
 
 #### Block Editor
-- Fix mismatching link control action buttons visual order and DOM order. ([56042](https://github.com/WordPress/gutenberg/pull/56042))
-- Escape on Block Toolbar returns focus to Editor Canvas. ([55712](https://github.com/WordPress/gutenberg/pull/55712))
+
+-   Fix mismatching link control action buttons visual order and DOM order. ([56042](https://github.com/WordPress/gutenberg/pull/56042))
+-   Escape on Block Toolbar returns focus to Editor Canvas. ([55712](https://github.com/WordPress/gutenberg/pull/55712))
 
 #### Site Editor
-- Prevent sidebar focus in site editor on small screens. ([55934](https://github.com/WordPress/gutenberg/pull/55934))
+
+-   Prevent sidebar focus in site editor on small screens. ([55934](https://github.com/WordPress/gutenberg/pull/55934))
 
 #### Block Library
-- Heading level dropdown: Remove obtrusive tooltips in favor of visible text. ([56035](https://github.com/WordPress/gutenberg/pull/56035))
 
+-   Heading level dropdown: Remove obtrusive tooltips in favor of visible text. ([56035](https://github.com/WordPress/gutenberg/pull/56035))
 
 ### Performance
 
 #### Tooling
-- Add a metric to trace template navigation in the site editor. ([55796](https://github.com/WordPress/gutenberg/pull/55796))
+
+-   Add a metric to trace template navigation in the site editor. ([55796](https://github.com/WordPress/gutenberg/pull/55796))
 
 #### List View
-- ListViewBlock: Combine 'useSelect' hooks. ([55889](https://github.com/WordPress/gutenberg/pull/55889))
+
+-   ListViewBlock: Combine 'useSelect' hooks. ([55889](https://github.com/WordPress/gutenberg/pull/55889))
 
 #### Block Editor
-- Block Editor: Optimize 'Block Hooks' inspector controls. ([56101](https://github.com/WordPress/gutenberg/pull/56101))
-- Block Editor: Optimize BlockListAppender. ([56116](https://github.com/WordPress/gutenberg/pull/56116))
+
+-   Block Editor: Optimize 'Block Hooks' inspector controls. ([56101](https://github.com/WordPress/gutenberg/pull/56101))
+-   Block Editor: Optimize BlockListAppender. ([56116](https://github.com/WordPress/gutenberg/pull/56116))
 
 #### Site Editor
-- Avoid rerendering the sitehub unnecessarily. ([55818](https://github.com/WordPress/gutenberg/pull/55818))
+
+-   Avoid rerendering the sitehub unnecessarily. ([55818](https://github.com/WordPress/gutenberg/pull/55818))
 
 #### Layout
-- Block Editor: Optimize layout style renderer subscription. ([55762](https://github.com/WordPress/gutenberg/pull/55762))
 
+-   Block Editor: Optimize layout style renderer subscription. ([55762](https://github.com/WordPress/gutenberg/pull/55762))
 
 ### Experiments
 
 #### Data Views
-- DataViews: Add ability to create custom views. ([55773](https://github.com/WordPress/gutenberg/pull/55773))
-- DataViews: Add control to reset all filters at once. ([55955](https://github.com/WordPress/gutenberg/pull/55955))
-- DataViews: Add delete and restore actions. ([55781](https://github.com/WordPress/gutenberg/pull/55781))
-- DataViews: Add initial "Side by side" prototype. ([55343](https://github.com/WordPress/gutenberg/pull/55343))
-- DataViews: Add new page size option. ([56112](https://github.com/WordPress/gutenberg/pull/56112))
-- DataViews: Add rename functionality to custom views. ([55997](https://github.com/WordPress/gutenberg/pull/55997))
-- DataViews: Allow users to add filters dynamically. ([55992](https://github.com/WordPress/gutenberg/pull/55992))
-- DataViews: Update 'All pages' sidebar heading. ([56148](https://github.com/WordPress/gutenberg/pull/56148))
-- DataViews: Update 'View' button. ([56144](https://github.com/WordPress/gutenberg/pull/56144))
-- DataViews: Update `all templates` page. ([55848](https://github.com/WordPress/gutenberg/pull/55848))
-- DataViews: Update author and title fields in template's list. ([56029](https://github.com/WordPress/gutenberg/pull/56029))
-- DataViews: Update filters in view configuration. ([55735](https://github.com/WordPress/gutenberg/pull/55735))
-- DataViews: Add filters to table columns. ([55508](https://github.com/WordPress/gutenberg/pull/55508))
-- DataViews: Add: Ability to delete custom views. ([55924](https://github.com/WordPress/gutenberg/pull/55924))
-- DataViews: Add: Custom views header indication. ([55926](https://github.com/WordPress/gutenberg/pull/55926))
-- DataViews: Remove unnecessary label when no visible filters exist. ([55838](https://github.com/WordPress/gutenberg/pull/55838))
 
+-   DataViews: Add ability to create custom views. ([55773](https://github.com/WordPress/gutenberg/pull/55773))
+-   DataViews: Add control to reset all filters at once. ([55955](https://github.com/WordPress/gutenberg/pull/55955))
+-   DataViews: Add delete and restore actions. ([55781](https://github.com/WordPress/gutenberg/pull/55781))
+-   DataViews: Add initial "Side by side" prototype. ([55343](https://github.com/WordPress/gutenberg/pull/55343))
+-   DataViews: Add new page size option. ([56112](https://github.com/WordPress/gutenberg/pull/56112))
+-   DataViews: Add rename functionality to custom views. ([55997](https://github.com/WordPress/gutenberg/pull/55997))
+-   DataViews: Allow users to add filters dynamically. ([55992](https://github.com/WordPress/gutenberg/pull/55992))
+-   DataViews: Update 'All pages' sidebar heading. ([56148](https://github.com/WordPress/gutenberg/pull/56148))
+-   DataViews: Update 'View' button. ([56144](https://github.com/WordPress/gutenberg/pull/56144))
+-   DataViews: Update `all templates` page. ([55848](https://github.com/WordPress/gutenberg/pull/55848))
+-   DataViews: Update author and title fields in template's list. ([56029](https://github.com/WordPress/gutenberg/pull/56029))
+-   DataViews: Update filters in view configuration. ([55735](https://github.com/WordPress/gutenberg/pull/55735))
+-   DataViews: Add filters to table columns. ([55508](https://github.com/WordPress/gutenberg/pull/55508))
+-   DataViews: Add: Ability to delete custom views. ([55924](https://github.com/WordPress/gutenberg/pull/55924))
+-   DataViews: Add: Custom views header indication. ([55926](https://github.com/WordPress/gutenberg/pull/55926))
+-   DataViews: Remove unnecessary label when no visible filters exist. ([55838](https://github.com/WordPress/gutenberg/pull/55838))
 
 ### Documentation
 
-- Add a first block type page to the platform documentation. ([56109](https://github.com/WordPress/gutenberg/pull/56109))
-- Add new block development "Quick Start Guide" and update the `create-block-tutorial-template`. ([56056](https://github.com/WordPress/gutenberg/pull/56056))
-- Clean up DataViews docs: `filter.id` is not used. ([55833](https://github.com/WordPress/gutenberg/pull/55833))
-- DataViews: Document `enableSorting` and `enableHiding`. ([55988](https://github.com/WordPress/gutenberg/pull/55988))
-- DataViews: Document actions. ([55959](https://github.com/WordPress/gutenberg/pull/55959))
-- Doc: Corrected + updated links. ([56084](https://github.com/WordPress/gutenberg/pull/56084))
-- Doc: Fixes wrong link in #56084. ([56106](https://github.com/WordPress/gutenberg/pull/56106))
-- Docs: Changes imports from `wp.editor` to `wp.blockEditor` for PlainText and RichText. ([55841](https://github.com/WordPress/gutenberg/pull/55841))
-- Fix formatting issue in the "Get started with create-block" doc. ([55872](https://github.com/WordPress/gutenberg/pull/55872))
-- Fix: 404 Link on git workflow docs. ([55897](https://github.com/WordPress/gutenberg/pull/55897))
-- Fix: 404 link in get-started-with-create-block docs. ([55932](https://github.com/WordPress/gutenberg/pull/55932))
-- Fix: Create meta block link in block attributes documentation. ([55804](https://github.com/WordPress/gutenberg/pull/55804))
-- Fix: Filter duotone link on block-supports documentation. ([55896](https://github.com/WordPress/gutenberg/pull/55896))
-- Fix: Two invalid links on docs/contributors/documentation/README.md. ([55843](https://github.com/WordPress/gutenberg/pull/55843))
-- New additional resource for wp-env. ([55987](https://github.com/WordPress/gutenberg/pull/55987))
-- Update documentation to clarify workflow branch for release package publishing. ([56183](https://github.com/WordPress/gutenberg/pull/56183))
-- Update jest links to the new site. ([55802](https://github.com/WordPress/gutenberg/pull/55802))
-
+-   Add a first block type page to the platform documentation. ([56109](https://github.com/WordPress/gutenberg/pull/56109))
+-   Add new block development "Quick Start Guide" and update the `create-block-tutorial-template`. ([56056](https://github.com/WordPress/gutenberg/pull/56056))
+-   Clean up DataViews docs: `filter.id` is not used. ([55833](https://github.com/WordPress/gutenberg/pull/55833))
+-   DataViews: Document `enableSorting` and `enableHiding`. ([55988](https://github.com/WordPress/gutenberg/pull/55988))
+-   DataViews: Document actions. ([55959](https://github.com/WordPress/gutenberg/pull/55959))
+-   Doc: Corrected + updated links. ([56084](https://github.com/WordPress/gutenberg/pull/56084))
+-   Doc: Fixes wrong link in #56084. ([56106](https://github.com/WordPress/gutenberg/pull/56106))
+-   Docs: Changes imports from `wp.editor` to `wp.blockEditor` for PlainText and RichText. ([55841](https://github.com/WordPress/gutenberg/pull/55841))
+-   Fix formatting issue in the "Get started with create-block" doc. ([55872](https://github.com/WordPress/gutenberg/pull/55872))
+-   Fix: 404 Link on git workflow docs. ([55897](https://github.com/WordPress/gutenberg/pull/55897))
+-   Fix: 404 link in get-started-with-create-block docs. ([55932](https://github.com/WordPress/gutenberg/pull/55932))
+-   Fix: Create meta block link in block attributes documentation. ([55804](https://github.com/WordPress/gutenberg/pull/55804))
+-   Fix: Filter duotone link on block-supports documentation. ([55896](https://github.com/WordPress/gutenberg/pull/55896))
+-   Fix: Two invalid links on docs/contributors/documentation/README.md. ([55843](https://github.com/WordPress/gutenberg/pull/55843))
+-   New additional resource for wp-env. ([55987](https://github.com/WordPress/gutenberg/pull/55987))
+-   Update documentation to clarify workflow branch for release package publishing. ([56183](https://github.com/WordPress/gutenberg/pull/56183))
+-   Update jest links to the new site. ([55802](https://github.com/WordPress/gutenberg/pull/55802))
 
 ### Code Quality
 
-- Block lib: Remove multiline=false (deprecated). ([56113](https://github.com/WordPress/gutenberg/pull/56113))
-- Delete unused `SelectedBlockPopover` component. ([55821](https://github.com/WordPress/gutenberg/pull/55821))
-- Fix: Remove unrequired nullish coalescing. ([55854](https://github.com/WordPress/gutenberg/pull/55854))
-- Fix: Use of integer value in a conditional rendering condition on Gradients. ([55855](https://github.com/WordPress/gutenberg/pull/55855))
-- Give nice unique names to block controls HOCs. ([55795](https://github.com/WordPress/gutenberg/pull/55795))
-- Migrating `PatternTransformationsMenu`. ([56122](https://github.com/WordPress/gutenberg/pull/56122))
-- Migrating block inserter media tab components. ([56195](https://github.com/WordPress/gutenberg/pull/56195))
-- Move document tools motion to header-edit-mode layout level. ([55904](https://github.com/WordPress/gutenberg/pull/55904))
-- Only render block toolbar if blockType has value. ([55861](https://github.com/WordPress/gutenberg/pull/55861))
-- Refactor Edit Widgets Document Tools Navigation to own component. ([55778](https://github.com/WordPress/gutenberg/pull/55778))
-- Refactor Selected Block Tools. ([55737](https://github.com/WordPress/gutenberg/pull/55737))
-- Refactor Site Editor Document Tools Navigation to own component. ([55770](https://github.com/WordPress/gutenberg/pull/55770))
-- Remove BlockStyles.Slot empty component. ([55991](https://github.com/WordPress/gutenberg/pull/55991))
-- Remove obsolete `queryContext`. ([56034](https://github.com/WordPress/gutenberg/pull/56034))
-- Remove unnecessary empty className. ([55998](https://github.com/WordPress/gutenberg/pull/55998))
-- Rename Unforward to Unforwarded and export the named const. ([55820](https://github.com/WordPress/gutenberg/pull/55820))
-- Render Selected Block Tools in Header when using Top Toolbar. ([55787](https://github.com/WordPress/gutenberg/pull/55787))
-- Reusable Blocks: Unlock a private hook and a component at the file level. ([55809](https://github.com/WordPress/gutenberg/pull/55809))
-- Server directive processing: Improve how block references are saved. ([56107](https://github.com/WordPress/gutenberg/pull/56107))
-- Share the editor settings between the post and site editors. ([55970](https://github.com/WordPress/gutenberg/pull/55970))
-- Site Editor: Fix deprecation console error in top toolbar. ([55678](https://github.com/WordPress/gutenberg/pull/55678))
-- Site Editor: Unlock global styles' private hooks at the file level. ([55800](https://github.com/WordPress/gutenberg/pull/55800))
-- Site Editor: Update edited entity sync logic. ([55928](https://github.com/WordPress/gutenberg/pull/55928))
-- Site Editor: Use EditorProvider instead of custom logic. ([56000](https://github.com/WordPress/gutenberg/pull/56000))
-- SiteEditor: Optimize BackToPageNotification component. ([56102](https://github.com/WordPress/gutenberg/pull/56102))
-- SiteEditor: Refactor disable non page content blocks. ([56103](https://github.com/WordPress/gutenberg/pull/56103))
-- Unify the PageUrl and PageSlug components between site and post editors. ([56203](https://github.com/WordPress/gutenberg/pull/56203))
+-   Block lib: Remove multiline=false (deprecated). ([56113](https://github.com/WordPress/gutenberg/pull/56113))
+-   Delete unused `SelectedBlockPopover` component. ([55821](https://github.com/WordPress/gutenberg/pull/55821))
+-   Fix: Remove unrequired nullish coalescing. ([55854](https://github.com/WordPress/gutenberg/pull/55854))
+-   Fix: Use of integer value in a conditional rendering condition on Gradients. ([55855](https://github.com/WordPress/gutenberg/pull/55855))
+-   Give nice unique names to block controls HOCs. ([55795](https://github.com/WordPress/gutenberg/pull/55795))
+-   Migrating `PatternTransformationsMenu`. ([56122](https://github.com/WordPress/gutenberg/pull/56122))
+-   Migrating block inserter media tab components. ([56195](https://github.com/WordPress/gutenberg/pull/56195))
+-   Move document tools motion to header-edit-mode layout level. ([55904](https://github.com/WordPress/gutenberg/pull/55904))
+-   Only render block toolbar if blockType has value. ([55861](https://github.com/WordPress/gutenberg/pull/55861))
+-   Refactor Edit Widgets Document Tools Navigation to own component. ([55778](https://github.com/WordPress/gutenberg/pull/55778))
+-   Refactor Selected Block Tools. ([55737](https://github.com/WordPress/gutenberg/pull/55737))
+-   Refactor Site Editor Document Tools Navigation to own component. ([55770](https://github.com/WordPress/gutenberg/pull/55770))
+-   Remove BlockStyles.Slot empty component. ([55991](https://github.com/WordPress/gutenberg/pull/55991))
+-   Remove obsolete `queryContext`. ([56034](https://github.com/WordPress/gutenberg/pull/56034))
+-   Remove unnecessary empty className. ([55998](https://github.com/WordPress/gutenberg/pull/55998))
+-   Rename Unforward to Unforwarded and export the named const. ([55820](https://github.com/WordPress/gutenberg/pull/55820))
+-   Render Selected Block Tools in Header when using Top Toolbar. ([55787](https://github.com/WordPress/gutenberg/pull/55787))
+-   Reusable Blocks: Unlock a private hook and a component at the file level. ([55809](https://github.com/WordPress/gutenberg/pull/55809))
+-   Server directive processing: Improve how block references are saved. ([56107](https://github.com/WordPress/gutenberg/pull/56107))
+-   Share the editor settings between the post and site editors. ([55970](https://github.com/WordPress/gutenberg/pull/55970))
+-   Site Editor: Fix deprecation console error in top toolbar. ([55678](https://github.com/WordPress/gutenberg/pull/55678))
+-   Site Editor: Unlock global styles' private hooks at the file level. ([55800](https://github.com/WordPress/gutenberg/pull/55800))
+-   Site Editor: Update edited entity sync logic. ([55928](https://github.com/WordPress/gutenberg/pull/55928))
+-   Site Editor: Use EditorProvider instead of custom logic. ([56000](https://github.com/WordPress/gutenberg/pull/56000))
+-   SiteEditor: Optimize BackToPageNotification component. ([56102](https://github.com/WordPress/gutenberg/pull/56102))
+-   SiteEditor: Refactor disable non page content blocks. ([56103](https://github.com/WordPress/gutenberg/pull/56103))
+-   Unify the PageUrl and PageSlug components between site and post editors. ([56203](https://github.com/WordPress/gutenberg/pull/56203))
 
 #### Data Views
-- DataViews: Fix translatable string. ([56075](https://github.com/WordPress/gutenberg/pull/56075))
-- DataViews: Remove `filter.name`. ([55834](https://github.com/WordPress/gutenberg/pull/55834))
-- DataViews: Remove reset values from filters. ([55839](https://github.com/WordPress/gutenberg/pull/55839))
-- DataViews: Remove unnecessary `sortingFn` prop from field description. ([55989](https://github.com/WordPress/gutenberg/pull/55989))
-- DataViews: Simplify filters API. ([55917](https://github.com/WordPress/gutenberg/pull/55917))
-- DataViews: Update actions API. ([56026](https://github.com/WordPress/gutenberg/pull/56026))
+
+-   DataViews: Fix translatable string. ([56075](https://github.com/WordPress/gutenberg/pull/56075))
+-   DataViews: Remove `filter.name`. ([55834](https://github.com/WordPress/gutenberg/pull/55834))
+-   DataViews: Remove reset values from filters. ([55839](https://github.com/WordPress/gutenberg/pull/55839))
+-   DataViews: Remove unnecessary `sortingFn` prop from field description. ([55989](https://github.com/WordPress/gutenberg/pull/55989))
+-   DataViews: Simplify filters API. ([55917](https://github.com/WordPress/gutenberg/pull/55917))
+-   DataViews: Update actions API. ([56026](https://github.com/WordPress/gutenberg/pull/56026))
 
 #### Block Editor
-- Rich text: Remove preserveWhiteSpace serialisation differences. ([55999](https://github.com/WordPress/gutenberg/pull/55999))
-- Rich text: highlight format: Gracefully handle old span format. ([56071](https://github.com/WordPress/gutenberg/pull/56071))
-- Update Link Control labels to use gray-900. ([55867](https://github.com/WordPress/gutenberg/pull/55867))
+
+-   Rich text: Remove preserveWhiteSpace serialisation differences. ([55999](https://github.com/WordPress/gutenberg/pull/55999))
+-   Rich text: highlight format: Gracefully handle old span format. ([56071](https://github.com/WordPress/gutenberg/pull/56071))
+-   Update Link Control labels to use gray-900. ([55867](https://github.com/WordPress/gutenberg/pull/55867))
 
 #### Components
-- `DisclosureContent`: Migrate from `reakit` to `@ariakit/react`. ([55639](https://github.com/WordPress/gutenberg/pull/55639))
-- `Divider`: Migrate from `reakit` to `@ariakit/react`. ([55622](https://github.com/WordPress/gutenberg/pull/55622))
-- `RadioGroup`: Migrate from `reakit` to `ariakit`. ([55580](https://github.com/WordPress/gutenberg/pull/55580))
+
+-   `DisclosureContent`: Migrate from `reakit` to `@ariakit/react`. ([55639](https://github.com/WordPress/gutenberg/pull/55639))
+-   `Divider`: Migrate from `reakit` to `@ariakit/react`. ([55622](https://github.com/WordPress/gutenberg/pull/55622))
+-   `RadioGroup`: Migrate from `reakit` to `ariakit`. ([55580](https://github.com/WordPress/gutenberg/pull/55580))
 
 #### Site Editor
-- Core Data: Move the template lookup to core-data selectors/resolvers. ([55883](https://github.com/WordPress/gutenberg/pull/55883))
-- Don't use 'useEntityRecord' to only dispatch actions. ([56076](https://github.com/WordPress/gutenberg/pull/56076))
+
+-   Core Data: Move the template lookup to core-data selectors/resolvers. ([55883](https://github.com/WordPress/gutenberg/pull/55883))
+-   Don't use 'useEntityRecord' to only dispatch actions. ([56076](https://github.com/WordPress/gutenberg/pull/56076))
 
 #### Block Library
-- Navigation: Refactor the PHP render function to make it easier to make changes in the future. ([55605](https://github.com/WordPress/gutenberg/pull/55605))
-- Update `blockEditor.__unstableCanInsertBlockType` hook namespace. ([55845](https://github.com/WordPress/gutenberg/pull/55845))
+
+-   Navigation: Refactor the PHP render function to make it easier to make changes in the future. ([55605](https://github.com/WordPress/gutenberg/pull/55605))
+-   Update `blockEditor.__unstableCanInsertBlockType` hook namespace. ([55845](https://github.com/WordPress/gutenberg/pull/55845))
 
 #### Data Layer
-- Data: Fix ESLint warnings for the 'useSelect' hook. ([55916](https://github.com/WordPress/gutenberg/pull/55916))
+
+-   Data: Fix ESLint warnings for the 'useSelect' hook. ([55916](https://github.com/WordPress/gutenberg/pull/55916))
 
 #### Post Editor
-- Edit Post: Use a single 'useSelect' hook for getting selectors. ([55902](https://github.com/WordPress/gutenberg/pull/55902))
+
+-   Edit Post: Use a single 'useSelect' hook for getting selectors. ([55902](https://github.com/WordPress/gutenberg/pull/55902))
 
 #### Colors
-- Add Unit testing for duotone enhanced pagination. ([55542](https://github.com/WordPress/gutenberg/pull/55542))
+
+-   Add Unit testing for duotone enhanced pagination. ([55542](https://github.com/WordPress/gutenberg/pull/55542))
 
 #### Patterns
-- Split up the block editor inserter patterns tab into separate component files. ([55315](https://github.com/WordPress/gutenberg/pull/55315))
+
+-   Split up the block editor inserter patterns tab into separate component files. ([55315](https://github.com/WordPress/gutenberg/pull/55315))
 
 #### Design Tools
-- Block styles: Remove __unstableElementContext in favour of useStyleOverride. ([54493](https://github.com/WordPress/gutenberg/pull/54493))
 
+-   Block styles: Remove \_\_unstableElementContext in favour of useStyleOverride. ([54493](https://github.com/WordPress/gutenberg/pull/54493))
 
 ### Tools
 
-- Issue Templates: Add default type labels to issue templates. ([55826](https://github.com/WordPress/gutenberg/pull/55826))
-- Label enforcer: Make the warning message less scary for new contributors. ([55900](https://github.com/WordPress/gutenberg/pull/55900))
-- Quote feature request label. ([55862](https://github.com/WordPress/gutenberg/pull/55862))
+-   Issue Templates: Add default type labels to issue templates. ([55826](https://github.com/WordPress/gutenberg/pull/55826))
+-   Label enforcer: Make the warning message less scary for new contributors. ([55900](https://github.com/WordPress/gutenberg/pull/55900))
+-   Quote feature request label. ([55862](https://github.com/WordPress/gutenberg/pull/55862))
 
 #### Testing
-- Disable 'no-conditional-in-test' ESLint rule for Playwright. ([56088](https://github.com/WordPress/gutenberg/pull/56088))
-- Fix 'Block Switcher' test file name for Playwright end-to-end tests. ([55840](https://github.com/WordPress/gutenberg/pull/55840))
-- Fix flaky 'Meta boxes' end-to-end tests. ([56083](https://github.com/WordPress/gutenberg/pull/56083))
-- Migrate 'CPT locking' end-to-end tests to Playwright. ([55929](https://github.com/WordPress/gutenberg/pull/55929))
-- Migrate 'Meta boxes' end-to-end tests to Playwright. ([55915](https://github.com/WordPress/gutenberg/pull/55915))
-- Migrate 'Plugins API' end-to-end tests to Playwright. ([55958](https://github.com/WordPress/gutenberg/pull/55958))
-- Migrate 'annotations' end-to-end tests to Playwright. ([55966](https://github.com/WordPress/gutenberg/pull/55966))
-- Migrate 'container blocks' end-to-end tests to Playwright. ([56141](https://github.com/WordPress/gutenberg/pull/56141))
-- Migrate 'inner-blocks-prioritized-inserter-blocks' end-to-end tests to Playwright. ([55828](https://github.com/WordPress/gutenberg/pull/55828))
-- Migrate 'inner-blocks-render-appender' end-to-end tests to Playwright. ([55814](https://github.com/WordPress/gutenberg/pull/55814))
-- Migrate 'meta-attribute-block' end-to-end tests to Playwright. ([55830](https://github.com/WordPress/gutenberg/pull/55830))
-- Migrate Child Block Test to Playwright. ([55199](https://github.com/WordPress/gutenberg/pull/55199))
-- Migrate flaky PostPublishButton end-to-end tests to Playwright. ([52285](https://github.com/WordPress/gutenberg/pull/52285))
-- Perf Tests: Stabilise the Site Editor metrics. ([55922](https://github.com/WordPress/gutenberg/pull/55922))
-- Playwright Utils: Fix 'clickBlockOptionsMenuItem' helper. ([55923](https://github.com/WordPress/gutenberg/pull/55923))
-- Query block enhanced pagination: Simplify test setup. ([55805](https://github.com/WordPress/gutenberg/pull/55805))
-- Site editor template preview: Add end-to-end test and aria-pressed attribute to template preview toggle. ([56096](https://github.com/WordPress/gutenberg/pull/56096))
-- Upgrade Playwright to 1.39.0. ([54051](https://github.com/WordPress/gutenberg/pull/54051))
-- end-to-end Utils: Add setPreferences and editPost utils. ([55099](https://github.com/WordPress/gutenberg/pull/55099))
-- end-to-end Utils: Add support for web-vitals.js. ([55660](https://github.com/WordPress/gutenberg/pull/55660))
 
-#### Build Tooling
-- Package `@ariakit/test` should be a dev dependency. ([56091](https://github.com/WordPress/gutenberg/pull/56091))
+-   Disable 'no-conditional-in-test' ESLint rule for Playwright. ([56088](https://github.com/WordPress/gutenberg/pull/56088))
+-   Fix 'Block Switcher' test file name for Playwright end-to-end tests. ([55840](https://github.com/WordPress/gutenberg/pull/55840))
+-   Fix flaky 'Meta boxes' end-to-end tests. ([56083](https://github.com/WordPress/gutenberg/pull/56083))
+-   Migrate 'CPT locking' end-to-end tests to Playwright. ([55929](https://github.com/WordPress/gutenberg/pull/55929))
+-   Migrate 'Meta boxes' end-to-end tests to Playwright. ([55915](https://github.com/WordPress/gutenberg/pull/55915))
+-   Migrate 'Plugins API' end-to-end tests to Playwright. ([55958](https://github.com/WordPress/gutenberg/pull/55958))
+-   Migrate 'annotations' end-to-end tests to Playwright. ([55966](https://github.com/WordPress/gutenberg/pull/55966))
+-   Migrate 'container blocks' end-to-end tests to Playwright. ([56141](https://github.com/WordPress/gutenberg/pull/56141))
+-   Migrate 'inner-blocks-prioritized-inserter-blocks' end-to-end tests to Playwright. ([55828](https://github.com/WordPress/gutenberg/pull/55828))
+-   Migrate 'inner-blocks-render-appender' end-to-end tests to Playwright. ([55814](https://github.com/WordPress/gutenberg/pull/55814))
+-   Migrate 'meta-attribute-block' end-to-end tests to Playwright. ([55830](https://github.com/WordPress/gutenberg/pull/55830))
+-   Migrate Child Block Test to Playwright. ([55199](https://github.com/WordPress/gutenberg/pull/55199))
+-   Migrate flaky PostPublishButton end-to-end tests to Playwright. ([52285](https://github.com/WordPress/gutenberg/pull/52285))
+-   Perf Tests: Stabilise the Site Editor metrics. ([55922](https://github.com/WordPress/gutenberg/pull/55922))
+-   Playwright Utils: Fix 'clickBlockOptionsMenuItem' helper. ([55923](https://github.com/WordPress/gutenberg/pull/55923))
+-   Query block enhanced pagination: Simplify test setup. ([55805](https://github.com/WordPress/gutenberg/pull/55805))
+-   Site editor template preview: Add end-to-end test and aria-pressed attribute to template preview toggle. ([56096](https://github.com/WordPress/gutenberg/pull/56096))
+-   Upgrade Playwright to 1.39.0. ([54051](https://github.com/WordPress/gutenberg/pull/54051))
+-   end-to-end Utils: Add setPreferences and editPost utils. ([55099](https://github.com/WordPress/gutenberg/pull/55099))
+-   end-to-end Utils: Add support for web-vitals.js. ([55660](https://github.com/WordPress/gutenberg/pull/55660))
 
+#### Build Tooling
 
-## First time contributors
+-   Package `@ariakit/test` should be a dev dependency. ([56091](https://github.com/WordPress/gutenberg/pull/56091))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @joanrodas: Update Link Control labels to use gray-900. ([55867](https://github.com/WordPress/gutenberg/pull/55867))
-- @JorgeVilchez95: "Detach" text change in template options. ([55870](https://github.com/WordPress/gutenberg/pull/55870))
-- @sacerro: Styles: More descriptive text for revisions timeline. ([55868](https://github.com/WordPress/gutenberg/pull/55868))
+The following PRs were merged by first-time contributors:
 
+-   @joanrodas: Update Link Control labels to use gray-900. ([55867](https://github.com/WordPress/gutenberg/pull/55867))
+-   @JorgeVilchez95: "Detach" text change in template options. ([55870](https://github.com/WordPress/gutenberg/pull/55870))
+-   @sacerro: Styles: More descriptive text for revisions timeline. ([55868](https://github.com/WordPress/gutenberg/pull/55868))
 
 ## Contributors
 
@@ -705,22 +11263,15 @@ The following contributors merged PRs in this release:
 
 @afercia @andrewhayward @andrewserong @anomiex @anton-vlasenko @aristath @artemiomorales @bph @brookewp @c4rl0sbr4v0 @chad1008 @ciampo @DAreRodz @dcalhoun @dsas @ellatrix @flootr @fluiddot @gaambo @glendaviesnz @gziolo @jameskoster @jeryj @jhnstn @joanrodas @jorgefilipecosta @JorgeVilchez95 @jsnajdr @juanmaguitar @kevin940726 @Mamaduka @masteradhoc @matiasbenedetto @ndiego @ntsekouras @oandregal @peterwilsoncc @pooja-muchandikar @priethor @ramonjd @renatho @richtabor @sacerro @scruffian @shimotmk @SiobhyB @Soean @swissspidy @t-hamano @talldan @tellthemachines @torounit @tyxla @WunderBart @youknowriad
 
-
-
-
 = 17.0.2 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Typography
-- Fix another fatal error in WP_Fonts_Resolver::Get_settings(). ([56067](https://github.com/WordPress/gutenberg/pull/56067))
-
-
 
+-   Fix another fatal error in WP_Fonts_Resolver::Get_settings(). ([56067](https://github.com/WordPress/gutenberg/pull/56067))
 
 ## Contributors
 
@@ -728,228 +11279,243 @@ The following contributors merged PRs in this release:
 
 @arthur791004
 
-
 = 17.0.1 =
 
 ## Changelog
 
 ### Bug Fixes
 
-- Fix a fatal error in `WP_Fonts_Resolver::get_settings()`. ([55981](https://github.com/WordPress/gutenberg/pull/55981))
+-   Fix a fatal error in `WP_Fonts_Resolver::get_settings()`. ([55981](https://github.com/WordPress/gutenberg/pull/55981))
 
 ## Contributors
 
 @anton-vlasenko
 
-
 = 16.9.1 =
 
 Fixes a PHP fatal error in `WP_Fonts_Resolver::get_settings()`: https://github.com/WordPress/gutenberg/pull/55981
 
-
 = 17.0.0 =
 
-
-
 ## Changelog
 
-
 ### Enhancements
 
 #### Link Control
-- Add blog icon to the blog home page in LinkControl search results. ([55610](https://github.com/WordPress/gutenberg/pull/55610))
-- Add home icon to the front page in LinkControl results. ([55606](https://github.com/WordPress/gutenberg/pull/55606))
+
+-   Add blog icon to the blog home page in LinkControl search results. ([55610](https://github.com/WordPress/gutenberg/pull/55610))
+-   Add home icon to the front page in LinkControl results. ([55606](https://github.com/WordPress/gutenberg/pull/55606))
 
 #### Block Theme Preview
-- Block Theme Preview: Display loading state when activating. ([55658](https://github.com/WordPress/gutenberg/pull/55658))
+
+-   Block Theme Preview: Display loading state when activating. ([55658](https://github.com/WordPress/gutenberg/pull/55658))
 
 #### Block Library
-- Template Part block: Use `_build_block_template_result_from_post`. ([55811](https://github.com/WordPress/gutenberg/pull/55811))
+
+-   Template Part block: Use `_build_block_template_result_from_post`. ([55811](https://github.com/WordPress/gutenberg/pull/55811))
 
 #### Block Toolbar
-- Improve toolbar button focus visual. ([55523](https://github.com/WordPress/gutenberg/pull/55523))
+
+-   Improve toolbar button focus visual. ([55523](https://github.com/WordPress/gutenberg/pull/55523))
 
 #### Components
-- Add new ariakit-based `DropdownMenu` component. ([54939](https://github.com/WordPress/gutenberg/pull/54939))
-- Update InputControl and SelectControl default heights. ([55490](https://github.com/WordPress/gutenberg/pull/55490))
-- Update ariakit to version 0.3.5. ([55365](https://github.com/WordPress/gutenberg/pull/55365))
+
+-   Add new ariakit-based `DropdownMenu` component. ([54939](https://github.com/WordPress/gutenberg/pull/54939))
+-   Update InputControl and SelectControl default heights. ([55490](https://github.com/WordPress/gutenberg/pull/55490))
+-   Update ariakit to version 0.3.5. ([55365](https://github.com/WordPress/gutenberg/pull/55365))
 
 #### Block Editor
-- Adjust the padding of the category item to make it visually balanced. ([55598](https://github.com/WordPress/gutenberg/pull/55598))
+
+-   Adjust the padding of the category item to make it visually balanced. ([55598](https://github.com/WordPress/gutenberg/pull/55598))
 
 #### Patterns
-- Suggest commands when editing pattern in site editor. ([55332](https://github.com/WordPress/gutenberg/pull/55332))
+
+-   Suggest commands when editing pattern in site editor. ([55332](https://github.com/WordPress/gutenberg/pull/55332))
 
 ### Bug Fixes
 
-- Fix autocomplete trigger character detection. ([55301](https://github.com/WordPress/gutenberg/pull/55301))
-- Fix typo in `FontCollection`. ([55439](https://github.com/WordPress/gutenberg/pull/55439))
+-   Fix autocomplete trigger character detection. ([55301](https://github.com/WordPress/gutenberg/pull/55301))
+-   Fix typo in `FontCollection`. ([55439](https://github.com/WordPress/gutenberg/pull/55439))
 
 #### Block Editor
 
-- Block Editor: Avoid rendering empty Slot for block alignments. ([55689](https://github.com/WordPress/gutenberg/pull/55689))
-- Block Example: Avoid a crash when block is not registered. ([55686](https://github.com/WordPress/gutenberg/pull/55686))
+-   Block Editor: Avoid rendering empty Slot for block alignments. ([55689](https://github.com/WordPress/gutenberg/pull/55689))
+-   Block Example: Avoid a crash when block is not registered. ([55686](https://github.com/WordPress/gutenberg/pull/55686))
 
 #### Command Palette
-- Command Palette: Fix a crash when transform to a block without icon. ([55676](https://github.com/WordPress/gutenberg/pull/55676))
+
+-   Command Palette: Fix a crash when transform to a block without icon. ([55676](https://github.com/WordPress/gutenberg/pull/55676))
 
 #### Link Control
-- Fix: LinkControl on site editor does not show font page and post page indication. ([55694](https://github.com/WordPress/gutenberg/pull/55694))
-- Fix: LinkControl on widgets editor does not show font page and post page indication. ([55732](https://github.com/WordPress/gutenberg/pull/55732))
+
+-   Fix: LinkControl on site editor does not show font page and post page indication. ([55694](https://github.com/WordPress/gutenberg/pull/55694))
+-   Fix: LinkControl on widgets editor does not show font page and post page indication. ([55732](https://github.com/WordPress/gutenberg/pull/55732))
 
 #### Interactivity API
-- Fix: Update page title when using enhanced pagination in query loop. ([55446](https://github.com/WordPress/gutenberg/pull/55446))
-
-#### Block Library
-- Fix: Post terms block: Missing options for prefix and suffix when the…. ([55726](https://github.com/WordPress/gutenberg/pull/55726))
-- Ensure Term Description block is registered in core. ([55669](https://github.com/WordPress/gutenberg/pull/55669))
-- Fix #55679 missing space in the string. ([55682](https://github.com/WordPress/gutenberg/pull/55682))
-- Image block: Wrap images with hrefs in an A tag. ([55470](https://github.com/WordPress/gutenberg/pull/55470))
-- Image: Improve focus management in lightbox. ([55428](https://github.com/WordPress/gutenberg/pull/55428))
-- Image: Update default fullscreen icon for lightbox trigger. ([55463](https://github.com/WordPress/gutenberg/pull/55463))
-- Navigation block: Remove browser default padding from the two submenu buttons. ([50943](https://github.com/WordPress/gutenberg/pull/50943))
-- Query Loop: Disallow "enhanced pagination" with core blocks that may contain third-party blocks. ([55539](https://github.com/WordPress/gutenberg/pull/55539))
-- Query block enhanced pagination: Detect inner plugin blocks during render. ([55714](https://github.com/WordPress/gutenberg/pull/55714))
-- Query: Require queryId for enhanced pagination to prevent PHP notices. ([55720](https://github.com/WordPress/gutenberg/pull/55720))
-- Update label for lightbox editor UI. ([55724](https://github.com/WordPress/gutenberg/pull/55724))
-- [Block] File: Fix embedded PDF files in Safari. ([55667](https://github.com/WordPress/gutenberg/pull/55667))
+
+-   Fix: Update page title when using enhanced pagination in query loop. ([55446](https://github.com/WordPress/gutenberg/pull/55446))
+
+#### Block Library
+
+-   Fix: Post terms block: Missing options for prefix and suffix when the…. ([55726](https://github.com/WordPress/gutenberg/pull/55726))
+-   Ensure Term Description block is registered in core. ([55669](https://github.com/WordPress/gutenberg/pull/55669))
+-   Fix #55679 missing space in the string. ([55682](https://github.com/WordPress/gutenberg/pull/55682))
+-   Image block: Wrap images with hrefs in an A tag. ([55470](https://github.com/WordPress/gutenberg/pull/55470))
+-   Image: Improve focus management in lightbox. ([55428](https://github.com/WordPress/gutenberg/pull/55428))
+-   Image: Update default fullscreen icon for lightbox trigger. ([55463](https://github.com/WordPress/gutenberg/pull/55463))
+-   Navigation block: Remove browser default padding from the two submenu buttons. ([50943](https://github.com/WordPress/gutenberg/pull/50943))
+-   Query Loop: Disallow "enhanced pagination" with core blocks that may contain third-party blocks. ([55539](https://github.com/WordPress/gutenberg/pull/55539))
+-   Query block enhanced pagination: Detect inner plugin blocks during render. ([55714](https://github.com/WordPress/gutenberg/pull/55714))
+-   Query: Require queryId for enhanced pagination to prevent PHP notices. ([55720](https://github.com/WordPress/gutenberg/pull/55720))
+-   Update label for lightbox editor UI. ([55724](https://github.com/WordPress/gutenberg/pull/55724))
+-   [Block] File: Fix embedded PDF files in Safari. ([55667](https://github.com/WordPress/gutenberg/pull/55667))
 
 #### Patterns
-- Fix bug with authors and contributors not seeing user pattern categories. ([55553](https://github.com/WordPress/gutenberg/pull/55553))
-- Fix pattern category renaming causing potential duplicate categories. ([55607](https://github.com/WordPress/gutenberg/pull/55607))
+
+-   Fix bug with authors and contributors not seeing user pattern categories. ([55553](https://github.com/WordPress/gutenberg/pull/55553))
+-   Fix pattern category renaming causing potential duplicate categories. ([55607](https://github.com/WordPress/gutenberg/pull/55607))
 
 #### Post Editor
-- Edit Post: Fix revision button misalignment. ([55659](https://github.com/WordPress/gutenberg/pull/55659))
-- Preferences modal: Fix the position of sticky heading when blocks are hidden. ([55456](https://github.com/WordPress/gutenberg/pull/55456))
-- Fix: Add __next40pxDefaultSize to author select in PostAuthor. ([55597](https://github.com/WordPress/gutenberg/pull/55597))
+
+-   Edit Post: Fix revision button misalignment. ([55659](https://github.com/WordPress/gutenberg/pull/55659))
+-   Preferences modal: Fix the position of sticky heading when blocks are hidden. ([55456](https://github.com/WordPress/gutenberg/pull/55456))
+-   Fix: Add \_\_next40pxDefaultSize to author select in PostAuthor. ([55597](https://github.com/WordPress/gutenberg/pull/55597))
 
 #### Site Editor
-- Fix the 'Slug' display for draft pages. ([55774](https://github.com/WordPress/gutenberg/pull/55774))
+
+-   Fix the 'Slug' display for draft pages. ([55774](https://github.com/WordPress/gutenberg/pull/55774))
 
 #### Data Views
-- List all users in author filter. ([55723](https://github.com/WordPress/gutenberg/pull/55723))
-- Don't register dataviews postype and taxonomy if experiment is disabled. ([55743](https://github.com/WordPress/gutenberg/pull/55743))
+
+-   List all users in author filter. ([55723](https://github.com/WordPress/gutenberg/pull/55723))
+-   Don't register dataviews postype and taxonomy if experiment is disabled. ([55743](https://github.com/WordPress/gutenberg/pull/55743))
 
 #### Design Tools
-- Remove default dimensions controls from core/avatar. ([55596](https://github.com/WordPress/gutenberg/pull/55596))
 
+-   Remove default dimensions controls from core/avatar. ([55596](https://github.com/WordPress/gutenberg/pull/55596))
 
 #### Interactivity API
-- Fix server processing of an empty `data-wp-context` directive. ([55482](https://github.com/WordPress/gutenberg/pull/55482))
-- Make duotone support compatible with enhanced pagination. ([55415](https://github.com/WordPress/gutenberg/pull/55415))
-- Make layout support compatible with enhanced pagination. ([55416](https://github.com/WordPress/gutenberg/pull/55416))
+
+-   Fix server processing of an empty `data-wp-context` directive. ([55482](https://github.com/WordPress/gutenberg/pull/55482))
+-   Make duotone support compatible with enhanced pagination. ([55415](https://github.com/WordPress/gutenberg/pull/55415))
+-   Make layout support compatible with enhanced pagination. ([55416](https://github.com/WordPress/gutenberg/pull/55416))
 
 #### Global Styles
-- Fix duotone not showing in site editor style block level styles. ([55361](https://github.com/WordPress/gutenberg/pull/55361))
 
+-   Fix duotone not showing in site editor style block level styles. ([55361](https://github.com/WordPress/gutenberg/pull/55361))
 
 ### Accessibility
 
 #### Block Library
-- Navigation block: Change aria-haspopup to dialog. ([55466](https://github.com/WordPress/gutenberg/pull/55466))
+
+-   Navigation block: Change aria-haspopup to dialog. ([55466](https://github.com/WordPress/gutenberg/pull/55466))
 
 #### Components
-- Autocomplete: Fix Voiceover not announcing suggestions. ([54902](https://github.com/WordPress/gutenberg/pull/54902))
+
+-   Autocomplete: Fix Voiceover not announcing suggestions. ([54902](https://github.com/WordPress/gutenberg/pull/54902))
 
 #### Interactivity API
-- Query Loop: Update modal role and focus first element. ([54507](https://github.com/WordPress/gutenberg/pull/54507))
 
+-   Query Loop: Update modal role and focus first element. ([54507](https://github.com/WordPress/gutenberg/pull/54507))
 
 ### Performance
 
-- Add useSettings hook for reading multiple settings at once. ([55337](https://github.com/WordPress/gutenberg/pull/55337))
-- Block Editor: Optimize 'Layout' controls. ([55754](https://github.com/WordPress/gutenberg/pull/55754))
-- Block Editor: Optimize 'anchor' inspector controls. ([55721](https://github.com/WordPress/gutenberg/pull/55721))
-- Block Editor: Optimize 'duotone' controls. ([55753](https://github.com/WordPress/gutenberg/pull/55753))
-- Block Editor: Optimize alignment toolbar controls. ([55692](https://github.com/WordPress/gutenberg/pull/55692))
-- Start logging site editor metrics in codevitals. ([55759](https://github.com/WordPress/gutenberg/pull/55759))
-- useAvailableAlignments: Avoid useSelect subscription when alignments array is empty. ([55449](https://github.com/WordPress/gutenberg/pull/55449))
-
+-   Add useSettings hook for reading multiple settings at once. ([55337](https://github.com/WordPress/gutenberg/pull/55337))
+-   Block Editor: Optimize 'Layout' controls. ([55754](https://github.com/WordPress/gutenberg/pull/55754))
+-   Block Editor: Optimize 'anchor' inspector controls. ([55721](https://github.com/WordPress/gutenberg/pull/55721))
+-   Block Editor: Optimize 'duotone' controls. ([55753](https://github.com/WordPress/gutenberg/pull/55753))
+-   Block Editor: Optimize alignment toolbar controls. ([55692](https://github.com/WordPress/gutenberg/pull/55692))
+-   Start logging site editor metrics in codevitals. ([55759](https://github.com/WordPress/gutenberg/pull/55759))
+-   useAvailableAlignments: Avoid useSelect subscription when alignments array is empty. ([55449](https://github.com/WordPress/gutenberg/pull/55449))
 
 ### Experiments
 
 #### Data Views
-- Trash Data View: Use trash icon. ([55771](https://github.com/WordPress/gutenberg/pull/55771))
-- Add quick actions. ([55488](https://github.com/WordPress/gutenberg/pull/55488))
-- Update icons and design tweaks. ([55391](https://github.com/WordPress/gutenberg/pull/55391))
-- Add ability to persist dataviews on the database. ([55465](https://github.com/WordPress/gutenberg/pull/55465))
-- Extract `search` from filters. ([55722](https://github.com/WordPress/gutenberg/pull/55722))
-- Limit users to those who have published pages. ([55455](https://github.com/WordPress/gutenberg/pull/55455))
-- List all pages, not only those with publish and draft statuses. ([55476](https://github.com/WordPress/gutenberg/pull/55476))
-- Add: Default readonly views to dataviews. ([55740](https://github.com/WordPress/gutenberg/pull/55740))
-- Add: Possibility to tree shake DataViewsProvider. ([55641](https://github.com/WordPress/gutenberg/pull/55641))
+
+-   Trash Data View: Use trash icon. ([55771](https://github.com/WordPress/gutenberg/pull/55771))
+-   Add quick actions. ([55488](https://github.com/WordPress/gutenberg/pull/55488))
+-   Update icons and design tweaks. ([55391](https://github.com/WordPress/gutenberg/pull/55391))
+-   Add ability to persist dataviews on the database. ([55465](https://github.com/WordPress/gutenberg/pull/55465))
+-   Extract `search` from filters. ([55722](https://github.com/WordPress/gutenberg/pull/55722))
+-   Limit users to those who have published pages. ([55455](https://github.com/WordPress/gutenberg/pull/55455))
+-   List all pages, not only those with publish and draft statuses. ([55476](https://github.com/WordPress/gutenberg/pull/55476))
+-   Add: Default readonly views to dataviews. ([55740](https://github.com/WordPress/gutenberg/pull/55740))
+-   Add: Possibility to tree shake DataViewsProvider. ([55641](https://github.com/WordPress/gutenberg/pull/55641))
 
 #### Form block
-- Blocks: Capitalize title and end the description with a period. ([55728](https://github.com/WordPress/gutenberg/pull/55728))
-- Update copy. ([55468](https://github.com/WordPress/gutenberg/pull/55468))
-- Allow using groups and columns inside the experimental form block. ([55758](https://github.com/WordPress/gutenberg/pull/55758))
+
+-   Blocks: Capitalize title and end the description with a period. ([55728](https://github.com/WordPress/gutenberg/pull/55728))
+-   Update copy. ([55468](https://github.com/WordPress/gutenberg/pull/55468))
+-   Allow using groups and columns inside the experimental form block. ([55758](https://github.com/WordPress/gutenberg/pull/55758))
 
 #### Collaborative Editing
-- Remove dangling comma causing PHPUnit failures. ([55494](https://github.com/WordPress/gutenberg/pull/55494))
-- [Try] HTTP based PHP signaling server for colaborative editing. ([53922](https://github.com/WordPress/gutenberg/pull/53922))
 
-### Documentation
+-   Remove dangling comma causing PHPUnit failures. ([55494](https://github.com/WordPress/gutenberg/pull/55494))
+-   [Try] HTTP based PHP signaling server for colaborative editing. ([53922](https://github.com/WordPress/gutenberg/pull/53922))
 
-- Adds a few grammar fixes to `block-registration` documentation. ([55663](https://github.com/WordPress/gutenberg/pull/55663))
-- Block JSON schema: Add heading/button key to color definition. ([55675](https://github.com/WordPress/gutenberg/pull/55675))
-- DataViews: Document `data` and `filters`. ([55504](https://github.com/WordPress/gutenberg/pull/55504))
-- Docs: Fix some typos. ([55654](https://github.com/WordPress/gutenberg/pull/55654))
-- Docs: Sidebar Block editor handbook - create-block before wp-scripts. ([55534](https://github.com/WordPress/gutenberg/pull/55534))
-- Fix: Typos inside /docs. ([55472](https://github.com/WordPress/gutenberg/pull/55472))
-- Scripts: Fix typo in readme. ([55531](https://github.com/WordPress/gutenberg/pull/55531))
-- Update links to point to getting started guides. ([55479](https://github.com/WordPress/gutenberg/pull/55479))
-- docs: Fix end-to-end test documentation formatting. ([55631](https://github.com/WordPress/gutenberg/pull/55631))
+### Documentation
 
+-   Adds a few grammar fixes to `block-registration` documentation. ([55663](https://github.com/WordPress/gutenberg/pull/55663))
+-   Block JSON schema: Add heading/button key to color definition. ([55675](https://github.com/WordPress/gutenberg/pull/55675))
+-   DataViews: Document `data` and `filters`. ([55504](https://github.com/WordPress/gutenberg/pull/55504))
+-   Docs: Fix some typos. ([55654](https://github.com/WordPress/gutenberg/pull/55654))
+-   Docs: Sidebar Block editor handbook - create-block before wp-scripts. ([55534](https://github.com/WordPress/gutenberg/pull/55534))
+-   Fix: Typos inside /docs. ([55472](https://github.com/WordPress/gutenberg/pull/55472))
+-   Scripts: Fix typo in readme. ([55531](https://github.com/WordPress/gutenberg/pull/55531))
+-   Update links to point to getting started guides. ([55479](https://github.com/WordPress/gutenberg/pull/55479))
+-   docs: Fix end-to-end test documentation formatting. ([55631](https://github.com/WordPress/gutenberg/pull/55631))
 
 ### Code Quality
-- Use PostCSS + PostCSS plugins for style transformation. ([49521](https://github.com/WordPress/gutenberg/pull/49521))
-- CS: Remove redundant ignore annotations. ([55615](https://github.com/WordPress/gutenberg/pull/55615))
-- Chore: Fix: Potential access to properties of undefined object. ([55697](https://github.com/WordPress/gutenberg/pull/55697))
-- Fix: Add missing defaultStatuses on PagePages. ([55761](https://github.com/WordPress/gutenberg/pull/55761))
-- Resizeable box (for resizing cover block) should use after block popover slot. ([55784](https://github.com/WordPress/gutenberg/pull/55784))
-- Update: Code quality: Use for each instead of map. ([55798](https://github.com/WordPress/gutenberg/pull/55798))
-- Update: Remove path awareness from data-views specific code. ([55695](https://github.com/WordPress/gutenberg/pull/55695))
-- Update: Remove useless self assignment. ([55696](https://github.com/WordPress/gutenberg/pull/55696))
-- Backport updates from Core during the 6.4 release cycle. ([55703](https://github.com/WordPress/gutenberg/pull/55703))
+
+-   Use PostCSS + PostCSS plugins for style transformation. ([49521](https://github.com/WordPress/gutenberg/pull/49521))
+-   CS: Remove redundant ignore annotations. ([55615](https://github.com/WordPress/gutenberg/pull/55615))
+-   Chore: Fix: Potential access to properties of undefined object. ([55697](https://github.com/WordPress/gutenberg/pull/55697))
+-   Fix: Add missing defaultStatuses on PagePages. ([55761](https://github.com/WordPress/gutenberg/pull/55761))
+-   Resizeable box (for resizing cover block) should use after block popover slot. ([55784](https://github.com/WordPress/gutenberg/pull/55784))
+-   Update: Code quality: Use for each instead of map. ([55798](https://github.com/WordPress/gutenberg/pull/55798))
+-   Update: Remove path awareness from data-views specific code. ([55695](https://github.com/WordPress/gutenberg/pull/55695))
+-   Update: Remove useless self assignment. ([55696](https://github.com/WordPress/gutenberg/pull/55696))
+-   Backport updates from Core during the 6.4 release cycle. ([55703](https://github.com/WordPress/gutenberg/pull/55703))
 
 #### Data Views
-- DataViews: Iterate on filter's API. ([55440](https://github.com/WordPress/gutenberg/pull/55440))
-- DataViews: Pass `search` filter as global, unattached from fields. ([55475](https://github.com/WordPress/gutenberg/pull/55475))
-- DataViews: Remove string from pages sidebar. ([55510](https://github.com/WordPress/gutenberg/pull/55510))
-- Rename `TextFilter` to `Search`. ([55731](https://github.com/WordPress/gutenberg/pull/55731))
-- Remove unused file dataview context. ([55775](https://github.com/WordPress/gutenberg/pull/55775))
+
+-   DataViews: Iterate on filter's API. ([55440](https://github.com/WordPress/gutenberg/pull/55440))
+-   DataViews: Pass `search` filter as global, unattached from fields. ([55475](https://github.com/WordPress/gutenberg/pull/55475))
+-   DataViews: Remove string from pages sidebar. ([55510](https://github.com/WordPress/gutenberg/pull/55510))
+-   Rename `TextFilter` to `Search`. ([55731](https://github.com/WordPress/gutenberg/pull/55731))
+-   Remove unused file dataview context. ([55775](https://github.com/WordPress/gutenberg/pull/55775))
 
 #### Block Library
-- Pattern: Unlock the private hook outside the component. ([55792](https://github.com/WordPress/gutenberg/pull/55792))
+
+-   Pattern: Unlock the private hook outside the component. ([55792](https://github.com/WordPress/gutenberg/pull/55792))
 
 #### Patterns
-- Change pattern category taxonomy public param to false. ([55748](https://github.com/WordPress/gutenberg/pull/55748))
 
+-   Change pattern category taxonomy public param to false. ([55748](https://github.com/WordPress/gutenberg/pull/55748))
 
 ### Tools
 
-- Replace 'npx' with 'node' on test-playwright.js file'. ([55616](https://github.com/WordPress/gutenberg/pull/55616))
-- wp-env: Fix errors which prevent it from working without internet. ([53547](https://github.com/WordPress/gutenberg/pull/53547))
-- [create-block] Add ABSPATH check. ([55533](https://github.com/WordPress/gutenberg/pull/55533))
+-   Replace 'npx' with 'node' on test-playwright.js file'. ([55616](https://github.com/WordPress/gutenberg/pull/55616))
+-   wp-env: Fix errors which prevent it from working without internet. ([53547](https://github.com/WordPress/gutenberg/pull/53547))
+-   [create-block] Add ABSPATH check. ([55533](https://github.com/WordPress/gutenberg/pull/55533))
 
 #### Testing
-- E2E: Revert typing delay on the autocomplete mentions test. ([55132](https://github.com/WordPress/gutenberg/pull/55132))
-- Fix flaky 'Switch to Draft' action in Preview end-to-end tests. ([55772](https://github.com/WordPress/gutenberg/pull/55772))
-- Migrate 'Site Title block' end-to-end tests to Playwright. ([55704](https://github.com/WordPress/gutenberg/pull/55704))
-- Migrate 'block context' end-to-end tests to Playwright. ([55793](https://github.com/WordPress/gutenberg/pull/55793))
-- Performance tests: Fix canvas locator timeout. ([55441](https://github.com/WordPress/gutenberg/pull/55441))
-- Scripts: Fix default Playwright configuration. ([55453](https://github.com/WordPress/gutenberg/pull/55453))
 
+-   E2E: Revert typing delay on the autocomplete mentions test. ([55132](https://github.com/WordPress/gutenberg/pull/55132))
+-   Fix flaky 'Switch to Draft' action in Preview end-to-end tests. ([55772](https://github.com/WordPress/gutenberg/pull/55772))
+-   Migrate 'Site Title block' end-to-end tests to Playwright. ([55704](https://github.com/WordPress/gutenberg/pull/55704))
+-   Migrate 'block context' end-to-end tests to Playwright. ([55793](https://github.com/WordPress/gutenberg/pull/55793))
+-   Performance tests: Fix canvas locator timeout. ([55441](https://github.com/WordPress/gutenberg/pull/55441))
+-   Scripts: Fix default Playwright configuration. ([55453](https://github.com/WordPress/gutenberg/pull/55453))
 
-## First time contributors
-
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @garibiza: Fix #55679 missing space in the string. ([55682](https://github.com/WordPress/gutenberg/pull/55682))
-- @iamsadi22: Replace 'npx' with 'node' on test-playwright.js file'. ([55616](https://github.com/WordPress/gutenberg/pull/55616))
-- @parikshit-adhikari: Fix: Typos inside /docs. ([55472](https://github.com/WordPress/gutenberg/pull/55472))
-- @strarsis: Use PostCSS + PostCSS plugins for style transformation. ([49521](https://github.com/WordPress/gutenberg/pull/49521))
+The following PRs were merged by first-time contributors:
 
+-   @garibiza: Fix #55679 missing space in the string. ([55682](https://github.com/WordPress/gutenberg/pull/55682))
+-   @iamsadi22: Replace 'npx' with 'node' on test-playwright.js file'. ([55616](https://github.com/WordPress/gutenberg/pull/55616))
+-   @parikshit-adhikari: Fix: Typos inside /docs. ([55472](https://github.com/WordPress/gutenberg/pull/55472))
+-   @strarsis: Use PostCSS + PostCSS plugins for style transformation. ([49521](https://github.com/WordPress/gutenberg/pull/49521))
 
 ## Contributors
 
@@ -957,7 +11523,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @ajlende @alexstine @aristath @artemiomorales @arthur791004 @aurooba @c4rl0sbr4v0 @carolinan @ciampo @DAreRodz @dcalhoun @derekblank @dmsnell @fluiddot @garibiza @geriux @glendaviesnz @iamsadi22 @jameskoster @jeryj @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @KevinBatdorf @luisherranz @MaggieCabrera @Mamaduka @noahtallen @ntsekouras @oandregal @parikshit-adhikari @peterwilsoncc @ramonjd @richtabor @SergeyBiryukov @SiobhyB @Soean @strarsis @swissspidy @t-hamano @talldan @WunderBart @youknowriad
 
-
 = 16.9.0 =
 
 ## Changelog
@@ -965,311 +11530,360 @@ The following contributors merged PRs in this release:
 ### Features
 
 #### Create Block
-- Introduce the transformer property. ([55423](https://github.com/WordPress/gutenberg/pull/55423))
+
+-   Introduce the transformer property. ([55423](https://github.com/WordPress/gutenberg/pull/55423))
 
 #### Data Views
-- Enable users to sort by `date`. ([55388](https://github.com/WordPress/gutenberg/pull/55388))
+
+-   Enable users to sort by `date`. ([55388](https://github.com/WordPress/gutenberg/pull/55388))
 
 #### Block Library
-- Enable Block Renaming support for (almost) all blocks. ([54426](https://github.com/WordPress/gutenberg/pull/54426))
 
+-   Enable Block Renaming support for (almost) all blocks. ([54426](https://github.com/WordPress/gutenberg/pull/54426))
 
 ### Enhancements
 
 #### Command API
-- Add block-specific commands as contextual suggestions [#53539]. ([53974](https://github.com/WordPress/gutenberg/pull/53974))
+
+-   Add block-specific commands as contextual suggestions [#53539]. ([53974](https://github.com/WordPress/gutenberg/pull/53974))
 
 #### Components
-- Add `Tabs` (a composable `TabPanel` v2). ([53960](https://github.com/WordPress/gutenberg/pull/53960))
-- Add `type="button"` to vanilla `<button>` elements. ([55125](https://github.com/WordPress/gutenberg/pull/55125))
-- ConfirmDialog: Ts unit test storybook. ([54954](https://github.com/WordPress/gutenberg/pull/54954))
-- GradientPicker: Remove padding and disable overflow of color picker popovers. ([55265](https://github.com/WordPress/gutenberg/pull/55265))
-- Migrate `Composite` component from `reakit` to `ariakit`. ([54225](https://github.com/WordPress/gutenberg/pull/54225))
-- Remove margins from Notice component. ([54800](https://github.com/WordPress/gutenberg/pull/54800))
+
+-   Add `Tabs` (a composable `TabPanel` v2). ([53960](https://github.com/WordPress/gutenberg/pull/53960))
+-   Add `type="button"` to vanilla `<button>` elements. ([55125](https://github.com/WordPress/gutenberg/pull/55125))
+-   ConfirmDialog: Ts unit test storybook. ([54954](https://github.com/WordPress/gutenberg/pull/54954))
+-   GradientPicker: Remove padding and disable overflow of color picker popovers. ([55265](https://github.com/WordPress/gutenberg/pull/55265))
+-   Migrate `Composite` component from `reakit` to `ariakit`. ([54225](https://github.com/WordPress/gutenberg/pull/54225))
+-   Remove margins from Notice component. ([54800](https://github.com/WordPress/gutenberg/pull/54800))
 
 #### Patterns
-- Add duplicate pattern command. ([55292](https://github.com/WordPress/gutenberg/pull/55292))
-- Add rename command. ([55188](https://github.com/WordPress/gutenberg/pull/55188))
-- Add rename/delete options for pattern categories in site editor. ([55035](https://github.com/WordPress/gutenberg/pull/55035))
-- Register new media related categories. ([55236](https://github.com/WordPress/gutenberg/pull/55236))
-- Use modal for pattern duplication flow as workaround for changing sync status. ([54764](https://github.com/WordPress/gutenberg/pull/54764))
+
+-   Add duplicate pattern command. ([55292](https://github.com/WordPress/gutenberg/pull/55292))
+-   Add rename command. ([55188](https://github.com/WordPress/gutenberg/pull/55188))
+-   Add rename/delete options for pattern categories in site editor. ([55035](https://github.com/WordPress/gutenberg/pull/55035))
+-   Register new media related categories. ([55236](https://github.com/WordPress/gutenberg/pull/55236))
+-   Use modal for pattern duplication flow as workaround for changing sync status. ([54764](https://github.com/WordPress/gutenberg/pull/54764))
 
 ### Block Editor
-- Migrating `DownloadableBlocksList` to use updated `Composite` implementation. ([55272](https://github.com/WordPress/gutenberg/pull/55272))
+
+-   Migrating `DownloadableBlocksList` to use updated `Composite` implementation. ([55272](https://github.com/WordPress/gutenberg/pull/55272))
 
 #### Block Library
-- Improve DimensionsTool control layout. ([55060](https://github.com/WordPress/gutenberg/pull/55060))
-- Template Part block: Fall back to current theme if no theme attribute is given. ([55217](https://github.com/WordPress/gutenberg/pull/55217))
+
+-   Improve DimensionsTool control layout. ([55060](https://github.com/WordPress/gutenberg/pull/55060))
+-   Template Part block: Fall back to current theme if no theme attribute is given. ([55217](https://github.com/WordPress/gutenberg/pull/55217))
 
 #### Post Editor
-- Editor: Introduce PluginPostExcerpt slot. ([55200](https://github.com/WordPress/gutenberg/pull/55200))
-- Editor: Use hooks instead of HoCs in PostExcerpt. ([55189](https://github.com/WordPress/gutenberg/pull/55189))
+
+-   Editor: Introduce PluginPostExcerpt slot. ([55200](https://github.com/WordPress/gutenberg/pull/55200))
+-   Editor: Use hooks instead of HoCs in PostExcerpt. ([55189](https://github.com/WordPress/gutenberg/pull/55189))
 
 #### Design Tools
-- Allow using CSS level 4 viewport-relative units. ([54415](https://github.com/WordPress/gutenberg/pull/54415))
-- Add changelog entry for #54415. ([55201](https://github.com/WordPress/gutenberg/pull/55201))
-- Remove 16:10 from 10:16 options from AspectRatioDropdown. ([55053](https://github.com/WordPress/gutenberg/pull/55053))
+
+-   Allow using CSS level 4 viewport-relative units. ([54415](https://github.com/WordPress/gutenberg/pull/54415))
+-   Add changelog entry for #54415. ([55201](https://github.com/WordPress/gutenberg/pull/55201))
+-   Remove 16:10 from 10:16 options from AspectRatioDropdown. ([55053](https://github.com/WordPress/gutenberg/pull/55053))
 
 #### Data Views
-- Add drop down with action in headers. ([55293](https://github.com/WordPress/gutenberg/pull/55293))
+
+-   Add drop down with action in headers. ([55293](https://github.com/WordPress/gutenberg/pull/55293))
 
 #### Icons
-- Update fullscreen icon. ([55021](https://github.com/WordPress/gutenberg/pull/55021))
+
+-   Update fullscreen icon. ([55021](https://github.com/WordPress/gutenberg/pull/55021))
 
 #### Format Library
-- Link format: Auto link pasted urls. ([55195](https://github.com/WordPress/gutenberg/pull/55195))
+
+-   Link format: Auto link pasted urls. ([55195](https://github.com/WordPress/gutenberg/pull/55195))
 
 #### Site Editor
-- Migrating `AddCustomTemplateModalContent` to use updated `Composite` implementation. ([55256](https://github.com/WordPress/gutenberg/pull/55256))
+
+-   Migrating `AddCustomTemplateModalContent` to use updated `Composite` implementation. ([55256](https://github.com/WordPress/gutenberg/pull/55256))
 
 #### Private APIs
-- Update consent string for using private APIs. ([55182](https://github.com/WordPress/gutenberg/pull/55182))
+
+-   Update consent string for using private APIs. ([55182](https://github.com/WordPress/gutenberg/pull/55182))
 
 ### New APIs
 
-- Core Data: Retrieve the pagination totals in the getEntityRecords calls. ([55164](https://github.com/WordPress/gutenberg/pull/55164))
+-   Core Data: Retrieve the pagination totals in the getEntityRecords calls. ([55164](https://github.com/WordPress/gutenberg/pull/55164))
 
 ### Bug Fixes
 
 #### Block Library
-- PHP notice when an image with lightbox is deleted. ([55370](https://github.com/WordPress/gutenberg/pull/55370))
-- Cover Block: Check for previously uploaded media before setting the dimRatio. ([55422](https://github.com/WordPress/gutenberg/pull/55422))
-- Cover: Fix media type check in the onSelectMedia hook. ([55168](https://github.com/WordPress/gutenberg/pull/55168))
-- Fix Block Rename UI perf regression. ([55250](https://github.com/WordPress/gutenberg/pull/55250))
-- Fix PHP notice when an image with lightbox is deleted in the behaviors file. ([55385](https://github.com/WordPress/gutenberg/pull/55385))
-- Fix: Wrong condition on cover block dimRatioToClass. ([55356](https://github.com/WordPress/gutenberg/pull/55356))
-- Focus submenu button when clicked. ([55198](https://github.com/WordPress/gutenberg/pull/55198))
-- Hide footnotes block from the inserter. ([55058](https://github.com/WordPress/gutenberg/pull/55058))
-- Image: Fix Lightbox display bug in Classic Themes. ([54837](https://github.com/WordPress/gutenberg/pull/54837))
-- Latest Posts: Add screen reader title text to Read more links and use alternative to excerpt_more filter. ([55029](https://github.com/WordPress/gutenberg/pull/55029))
-- Latest Posts: Sync updates from Core (6.4). ([55181](https://github.com/WordPress/gutenberg/pull/55181))
-- List View: Change the aria-description attribute to aria-describedby. ([55264](https://github.com/WordPress/gutenberg/pull/55264))
-- Query Loop block: Reuse existing screen-reader-text CSS class for the enhanced pagination aria-live region. ([55309](https://github.com/WordPress/gutenberg/pull/55309))
+
+-   PHP notice when an image with lightbox is deleted. ([55370](https://github.com/WordPress/gutenberg/pull/55370))
+-   Cover Block: Check for previously uploaded media before setting the dimRatio. ([55422](https://github.com/WordPress/gutenberg/pull/55422))
+-   Cover: Fix media type check in the onSelectMedia hook. ([55168](https://github.com/WordPress/gutenberg/pull/55168))
+-   Fix Block Rename UI perf regression. ([55250](https://github.com/WordPress/gutenberg/pull/55250))
+-   Fix PHP notice when an image with lightbox is deleted in the behaviors file. ([55385](https://github.com/WordPress/gutenberg/pull/55385))
+-   Fix: Wrong condition on cover block dimRatioToClass. ([55356](https://github.com/WordPress/gutenberg/pull/55356))
+-   Focus submenu button when clicked. ([55198](https://github.com/WordPress/gutenberg/pull/55198))
+-   Hide footnotes block from the inserter. ([55058](https://github.com/WordPress/gutenberg/pull/55058))
+-   Image: Fix Lightbox display bug in Classic Themes. ([54837](https://github.com/WordPress/gutenberg/pull/54837))
+-   Latest Posts: Add screen reader title text to Read more links and use alternative to excerpt_more filter. ([55029](https://github.com/WordPress/gutenberg/pull/55029))
+-   Latest Posts: Sync updates from Core (6.4). ([55181](https://github.com/WordPress/gutenberg/pull/55181))
+-   List View: Change the aria-description attribute to aria-describedby. ([55264](https://github.com/WordPress/gutenberg/pull/55264))
+-   Query Loop block: Reuse existing screen-reader-text CSS class for the enhanced pagination aria-live region. ([55309](https://github.com/WordPress/gutenberg/pull/55309))
 
 #### Site Editor
-- Alternative: Fix template part area listing when a template has no edits. ([55115](https://github.com/WordPress/gutenberg/pull/55115))
-- Do not display 'trashed' navigation menus in Sidebar. ([55072](https://github.com/WordPress/gutenberg/pull/55072))
-- Pages list: Set `status` as no sortable. ([55210](https://github.com/WordPress/gutenberg/pull/55210))
-- Remove duplicate template areas from the site view sidebar. ([54942](https://github.com/WordPress/gutenberg/pull/54942))
-- Site Editor Styles Screen: Fix dancing styles previews. ([55183](https://github.com/WordPress/gutenberg/pull/55183))
-- Use `accessorFn` instead of `cell` to render `status`. ([55196](https://github.com/WordPress/gutenberg/pull/55196))
+
+-   Alternative: Fix template part area listing when a template has no edits. ([55115](https://github.com/WordPress/gutenberg/pull/55115))
+-   Do not display 'trashed' navigation menus in Sidebar. ([55072](https://github.com/WordPress/gutenberg/pull/55072))
+-   Pages list: Set `status` as no sortable. ([55210](https://github.com/WordPress/gutenberg/pull/55210))
+-   Remove duplicate template areas from the site view sidebar. ([54942](https://github.com/WordPress/gutenberg/pull/54942))
+-   Site Editor Styles Screen: Fix dancing styles previews. ([55183](https://github.com/WordPress/gutenberg/pull/55183))
+-   Use `accessorFn` instead of `cell` to render `status`. ([55196](https://github.com/WordPress/gutenberg/pull/55196))
 
 #### Interactivity API
-- Add `aria-label` attribute to navigation block only when it is open. ([54816](https://github.com/WordPress/gutenberg/pull/54816))
-- Fix server processing of `wp-context` getting out of sync. ([55436](https://github.com/WordPress/gutenberg/pull/55436))
-- Image: Disable lightbox editor UI for linked images. ([55141](https://github.com/WordPress/gutenberg/pull/55141))
-- Image: Reimplement lightbox trigger as a minimal button in corner of image. ([55212](https://github.com/WordPress/gutenberg/pull/55212))
-- Image: Stop crashing with Lightbox on image blocks without an image. ([55269](https://github.com/WordPress/gutenberg/pull/55269))
-- Remove the lightbox filter and view file when the lightbox setting is disabled. ([55120](https://github.com/WordPress/gutenberg/pull/55120))
-- Reset "Expand on click" image styles when window is resized. ([55077](https://github.com/WordPress/gutenberg/pull/55077))
-
-#### Components
-- Changing `Button` component toggled style selector. ([55065](https://github.com/WordPress/gutenberg/pull/55065))
-- ColorPicker: Improve UX of dragging the handle when in popover on top of the editor. ([55149](https://github.com/WordPress/gutenberg/pull/55149))
-- Colors: Fix color button border radii. ([55207](https://github.com/WordPress/gutenberg/pull/55207))
-- Iframe / block drag chip: Fix positioning when dragging over an iframe. ([55150](https://github.com/WordPress/gutenberg/pull/55150))
-- ProgressBar: Use text color to ensure enough contrast against background. ([55285](https://github.com/WordPress/gutenberg/pull/55285))
-- Toolbar: Add unstyled variant. ([55139](https://github.com/WordPress/gutenberg/pull/55139))
-- useBlockPreview: Try outputting EditorStyles to ensure local style overrides are rendered. ([55288](https://github.com/WordPress/gutenberg/pull/55288))
-
-#### Block Editor
-- LinkControl: Prevent horizontally long preview image from being stretched vertically. ([55156](https://github.com/WordPress/gutenberg/pull/55156))
-- List: Fix forward merging of nested list. ([55121](https://github.com/WordPress/gutenberg/pull/55121))
-- Paste: Fix MS Word list paste. ([55127](https://github.com/WordPress/gutenberg/pull/55127))
-- Writing flow: Fix selecting synced pattern. ([55221](https://github.com/WordPress/gutenberg/pull/55221))
-- Writing flow: Preserve block when merging into empty paragraph. ([55134](https://github.com/WordPress/gutenberg/pull/55134))
-- url: Update `filterURLForDisplay` to include all image, video, and audio file types. ([54920](https://github.com/WordPress/gutenberg/pull/54920))
-- Block Styles: Display default style label correctly in the block sidebar. ([55008](https://github.com/WordPress/gutenberg/pull/55008))
-- useBlockSettings: Add missing useMemo dependencies. ([55204](https://github.com/WordPress/gutenberg/pull/55204))
+
+-   Add `aria-label` attribute to navigation block only when it is open. ([54816](https://github.com/WordPress/gutenberg/pull/54816))
+-   Fix server processing of `wp-context` getting out of sync. ([55436](https://github.com/WordPress/gutenberg/pull/55436))
+-   Image: Disable lightbox editor UI for linked images. ([55141](https://github.com/WordPress/gutenberg/pull/55141))
+-   Image: Reimplement lightbox trigger as a minimal button in corner of image. ([55212](https://github.com/WordPress/gutenberg/pull/55212))
+-   Image: Stop crashing with Lightbox on image blocks without an image. ([55269](https://github.com/WordPress/gutenberg/pull/55269))
+-   Remove the lightbox filter and view file when the lightbox setting is disabled. ([55120](https://github.com/WordPress/gutenberg/pull/55120))
+-   Reset "Expand on click" image styles when window is resized. ([55077](https://github.com/WordPress/gutenberg/pull/55077))
+
+#### Components
+
+-   Changing `Button` component toggled style selector. ([55065](https://github.com/WordPress/gutenberg/pull/55065))
+-   ColorPicker: Improve UX of dragging the handle when in popover on top of the editor. ([55149](https://github.com/WordPress/gutenberg/pull/55149))
+-   Colors: Fix color button border radii. ([55207](https://github.com/WordPress/gutenberg/pull/55207))
+-   Iframe / block drag chip: Fix positioning when dragging over an iframe. ([55150](https://github.com/WordPress/gutenberg/pull/55150))
+-   ProgressBar: Use text color to ensure enough contrast against background. ([55285](https://github.com/WordPress/gutenberg/pull/55285))
+-   Toolbar: Add unstyled variant. ([55139](https://github.com/WordPress/gutenberg/pull/55139))
+-   useBlockPreview: Try outputting EditorStyles to ensure local style overrides are rendered. ([55288](https://github.com/WordPress/gutenberg/pull/55288))
+
+#### Block Editor
+
+-   LinkControl: Prevent horizontally long preview image from being stretched vertically. ([55156](https://github.com/WordPress/gutenberg/pull/55156))
+-   List: Fix forward merging of nested list. ([55121](https://github.com/WordPress/gutenberg/pull/55121))
+-   Paste: Fix MS Word list paste. ([55127](https://github.com/WordPress/gutenberg/pull/55127))
+-   Writing flow: Fix selecting synced pattern. ([55221](https://github.com/WordPress/gutenberg/pull/55221))
+-   Writing flow: Preserve block when merging into empty paragraph. ([55134](https://github.com/WordPress/gutenberg/pull/55134))
+-   url: Update `filterURLForDisplay` to include all image, video, and audio file types. ([54920](https://github.com/WordPress/gutenberg/pull/54920))
+-   Block Styles: Display default style label correctly in the block sidebar. ([55008](https://github.com/WordPress/gutenberg/pull/55008))
+-   useBlockSettings: Add missing useMemo dependencies. ([55204](https://github.com/WordPress/gutenberg/pull/55204))
 
 #### Data Views
-- Add linked title fallback. ([55248](https://github.com/WordPress/gutenberg/pull/55248))
-- PagePages: Fix unintended object mutation inside component. ([55314](https://github.com/WordPress/gutenberg/pull/55314))
-- Fix pagination. ([55387](https://github.com/WordPress/gutenberg/pull/55387))
-- Make `date` header translatable. ([55445](https://github.com/WordPress/gutenberg/pull/55445))
+
+-   Add linked title fallback. ([55248](https://github.com/WordPress/gutenberg/pull/55248))
+-   PagePages: Fix unintended object mutation inside component. ([55314](https://github.com/WordPress/gutenberg/pull/55314))
+-   Fix pagination. ([55387](https://github.com/WordPress/gutenberg/pull/55387))
+-   Make `date` header translatable. ([55445](https://github.com/WordPress/gutenberg/pull/55445))
 
 #### Patterns
-- Add category selector to pattern creation modal. ([55024](https://github.com/WordPress/gutenberg/pull/55024))
-- Fix scrollbars on pattern transforms. ([55069](https://github.com/WordPress/gutenberg/pull/55069))
+
+-   Add category selector to pattern creation modal. ([55024](https://github.com/WordPress/gutenberg/pull/55024))
+-   Fix scrollbars on pattern transforms. ([55069](https://github.com/WordPress/gutenberg/pull/55069))
 
 #### HTML API
-- Fix: Directive processor failing on updated HTML API. ([55404](https://github.com/WordPress/gutenberg/pull/55404))
+
+-   Fix: Directive processor failing on updated HTML API. ([55404](https://github.com/WordPress/gutenberg/pull/55404))
 
 #### Widgets Editor
-- Only suppress admin notices when JavaScript is enabled. ([55403](https://github.com/WordPress/gutenberg/pull/55403))
+
+-   Only suppress admin notices when JavaScript is enabled. ([55403](https://github.com/WordPress/gutenberg/pull/55403))
 
 #### Data Layer
-- Fix `combineReducers()` types. ([55321](https://github.com/WordPress/gutenberg/pull/55321))
-- Get the page count as derived data. ([55316](https://github.com/WordPress/gutenberg/pull/55316))
+
+-   Fix `combineReducers()` types. ([55321](https://github.com/WordPress/gutenberg/pull/55321))
+-   Get the page count as derived data. ([55316](https://github.com/WordPress/gutenberg/pull/55316))
 
 #### Layout
-- Add selector as id to layout style overrides. ([55291](https://github.com/WordPress/gutenberg/pull/55291))
+
+-   Add selector as id to layout style overrides. ([55291](https://github.com/WordPress/gutenberg/pull/55291))
 
 #### History
-- Try: Only render LastRevision component if plugin is active. ([55253](https://github.com/WordPress/gutenberg/pull/55253))
+
+-   Try: Only render LastRevision component if plugin is active. ([55253](https://github.com/WordPress/gutenberg/pull/55253))
 
 #### Block Directory
-- Fix filtering for downloadable blocks in inserter. ([55243](https://github.com/WordPress/gutenberg/pull/55243))
+
+-   Fix filtering for downloadable blocks in inserter. ([55243](https://github.com/WordPress/gutenberg/pull/55243))
 
 #### Global Styles
-- Use all the settings origins for a block that consumes paths with merge. ([55219](https://github.com/WordPress/gutenberg/pull/55219))
+
+-   Use all the settings origins for a block that consumes paths with merge. ([55219](https://github.com/WordPress/gutenberg/pull/55219))
 
 #### Post Editor
-- Fix wrong notification message shown when an entity is moved to trash. ([55155](https://github.com/WordPress/gutenberg/pull/55155))
+
+-   Fix wrong notification message shown when an entity is moved to trash. ([55155](https://github.com/WordPress/gutenberg/pull/55155))
 
 #### Typography
-- Font Library: Show error if fetching collection fails. ([54919](https://github.com/WordPress/gutenberg/pull/54919))
+
+-   Font Library: Show error if fetching collection fails. ([54919](https://github.com/WordPress/gutenberg/pull/54919))
 
 #### Colors
-- I18n Make `No color selected` translatable text. ([54814](https://github.com/WordPress/gutenberg/pull/54814))
+
+-   I18n Make `No color selected` translatable text. ([54814](https://github.com/WordPress/gutenberg/pull/54814))
 
 #### Rich Text
-- Paste: Only link selection if URL protocol is http(s). ([53000](https://github.com/WordPress/gutenberg/pull/53000))
+
+-   Paste: Only link selection if URL protocol is http(s). ([53000](https://github.com/WordPress/gutenberg/pull/53000))
 
 #### Patterns
-- Remove the version enforcement for npm in `engines` field. ([55245](https://github.com/WordPress/gutenberg/pull/55245))
+
+-   Remove the version enforcement for npm in `engines` field. ([55245](https://github.com/WordPress/gutenberg/pull/55245))
 
 #### Code Quality
-- Fix: Use y-webrtc room name terminology instead of docName. ([55260](https://github.com/WordPress/gutenberg/pull/55260))
+
+-   Fix: Use y-webrtc room name terminology instead of docName. ([55260](https://github.com/WordPress/gutenberg/pull/55260))
 
 ### Accessibility
 
 #### Global Styles
-- Fix flickering when focusing on global style variations. ([55267](https://github.com/WordPress/gutenberg/pull/55267))
+
+-   Fix flickering when focusing on global style variations. ([55267](https://github.com/WordPress/gutenberg/pull/55267))
 
 #### Interactivity API
-- Fix Image block lightbox missing alt attribute and improve accessibility. ([55010](https://github.com/WordPress/gutenberg/pull/55010))
+
+-   Fix Image block lightbox missing alt attribute and improve accessibility. ([55010](https://github.com/WordPress/gutenberg/pull/55010))
 
 #### Components
-- `Modal`: Fix closing when contained iframe is focused. ([51602](https://github.com/WordPress/gutenberg/pull/51602))
+
+-   `Modal`: Fix closing when contained iframe is focused. ([51602](https://github.com/WordPress/gutenberg/pull/51602))
 
 #### Block Library
-- Cover: Add aria-label to fixed and repeated image backgrounds. ([50990](https://github.com/WordPress/gutenberg/pull/50990))
 
+-   Cover: Add aria-label to fixed and repeated image backgrounds. ([50990](https://github.com/WordPress/gutenberg/pull/50990))
 
 ### Performance
 
 #### Block Editor
-- Rich Text: Cleanup excess `focusin`/`focusout` listeners. ([55382](https://github.com/WordPress/gutenberg/pull/55382))
-- Optimize 'customClassName' controls. ([55345](https://github.com/WordPress/gutenberg/pull/55345))
-- useBlockControlsFill: Avoid unneeded store subscriptions. ([55340](https://github.com/WordPress/gutenberg/pull/55340))
+
+-   Rich Text: Cleanup excess `focusin`/`focusout` listeners. ([55382](https://github.com/WordPress/gutenberg/pull/55382))
+-   Optimize 'customClassName' controls. ([55345](https://github.com/WordPress/gutenberg/pull/55345))
+-   useBlockControlsFill: Avoid unneeded store subscriptions. ([55340](https://github.com/WordPress/gutenberg/pull/55340))
 
 #### Parsing
-- Remove empty attrs. ([54496](https://github.com/WordPress/gutenberg/pull/54496))
+
+-   Remove empty attrs. ([54496](https://github.com/WordPress/gutenberg/pull/54496))
 
 #### Data Layer
-- Fix resolver resolution status key types mismatch causing unwanted resolver calls for identical state data. ([52120](https://github.com/WordPress/gutenberg/pull/52120))
 
+-   Fix resolver resolution status key types mismatch causing unwanted resolver calls for identical state data. ([52120](https://github.com/WordPress/gutenberg/pull/52120))
 
 ### Experiments
 
 #### Data Views
-- Add `status` entity and use it in "admin views" experiment. ([55050](https://github.com/WordPress/gutenberg/pull/55050))
-- Add Grid Layout. ([55353](https://github.com/WordPress/gutenberg/pull/55353))
-- Add featured image field to the page list. ([55246](https://github.com/WordPress/gutenberg/pull/55246))
-- Adds a control to the views actions to switch layouts. ([55311](https://github.com/WordPress/gutenberg/pull/55311))
-- Fix the actions menu in the list view. ([55426](https://github.com/WordPress/gutenberg/pull/55426))
+
+-   Add `status` entity and use it in "admin views" experiment. ([55050](https://github.com/WordPress/gutenberg/pull/55050))
+-   Add Grid Layout. ([55353](https://github.com/WordPress/gutenberg/pull/55353))
+-   Add featured image field to the page list. ([55246](https://github.com/WordPress/gutenberg/pull/55246))
+-   Adds a control to the views actions to switch layouts. ([55311](https://github.com/WordPress/gutenberg/pull/55311))
+-   Fix the actions menu in the list view. ([55426](https://github.com/WordPress/gutenberg/pull/55426))
 
 #### Block Library
-- Introduce experimental form & inputs blocks to allow building basic forms. ([44214](https://github.com/WordPress/gutenberg/pull/44214))
-- Mark forms blocks as experimental in `block.json` files. ([55187](https://github.com/WordPress/gutenberg/pull/55187))
-- Update the apiVersion in experimental blocks block.json files. ([55186](https://github.com/WordPress/gutenberg/pull/55186))
+
+-   Introduce experimental form & inputs blocks to allow building basic forms. ([44214](https://github.com/WordPress/gutenberg/pull/44214))
+-   Mark forms blocks as experimental in `block.json` files. ([55187](https://github.com/WordPress/gutenberg/pull/55187))
+-   Update the apiVersion in experimental blocks block.json files. ([55186](https://github.com/WordPress/gutenberg/pull/55186))
 
 #### Components
-- Expose `Tabs` as private API. ([55327](https://github.com/WordPress/gutenberg/pull/55327))
+
+-   Expose `Tabs` as private API. ([55327](https://github.com/WordPress/gutenberg/pull/55327))
 
 #### Site Editor
-- Add author and status filter to the page list. ([55270](https://github.com/WordPress/gutenberg/pull/55270))
 
+-   Add author and status filter to the page list. ([55270](https://github.com/WordPress/gutenberg/pull/55270))
 
 ### Documentation
 
-- Add "Get started with create-block" doc to the Getting Started section. ([55373](https://github.com/WordPress/gutenberg/pull/55373))
-- Add a "Get started with wp-scripts" doc to the Getting Started section. ([55372](https://github.com/WordPress/gutenberg/pull/55372))
-- Add backgroundImage to the theme json documentation for appearanceTools. ([55376](https://github.com/WordPress/gutenberg/pull/55376))
-- Add initial documentation for the `DataViews` component. ([55435](https://github.com/WordPress/gutenberg/pull/55435))
-- Augment `Block.Edit` filter documentation with performance guidance. ([55252](https://github.com/WordPress/gutenberg/pull/55252))
-- Correct the documented type for the `$w` parameter of `block_core_navigation_add_directives_to_submenu()`. ([53585](https://github.com/WordPress/gutenberg/pull/53585))
-- Document `kind`, `name`, `plural` for entity configuration. ([55158](https://github.com/WordPress/gutenberg/pull/55158))
-- Document updating the consent string to unlock private APIs. ([55235](https://github.com/WordPress/gutenberg/pull/55235))
-- Explain how to translate Gutenberg in standalone apps using the editor packages. ([55080](https://github.com/WordPress/gutenberg/pull/55080))
-- Fix callouts in end-to-end test documentation. ([55300](https://github.com/WordPress/gutenberg/pull/55300))
-- Fix code formatting due to bug in the "Get started with wp-env" doc. ([55458](https://github.com/WordPress/gutenberg/pull/55458))
-- Fix the position of the callout in the "Get started with wp-scripts" doc. ([55457](https://github.com/WordPress/gutenberg/pull/55457))
-- Font Library: Change all references to 6.4.0 by 6.5.0 core version. ([55320](https://github.com/WordPress/gutenberg/pull/55320))
-- Initial documentation of entity configuration. ([55103](https://github.com/WordPress/gutenberg/pull/55103))
-- PHP lib docs: Update to include information about prefixes in block PHP code. ([55402](https://github.com/WordPress/gutenberg/pull/55402))
-- Platform docs: Add a page to explain how to render HTML from a list of blocks. ([55140](https://github.com/WordPress/gutenberg/pull/55140))
-- Remove `@return void` from PHP function docs. ([55237](https://github.com/WordPress/gutenberg/pull/55237))
-- Remove the `wp-now` getting started doc. ([55136](https://github.com/WordPress/gutenberg/pull/55136))
-- Update LinkControl documentation with advice to memoize value prop. ([54659](https://github.com/WordPress/gutenberg/pull/54659))
-- Update nested-blocks-inner-blocks.md for WP 6.4 release. ([55375](https://github.com/WordPress/gutenberg/pull/55375))
-- docs/get-started-with-wp-env: Diagram and links added. ([55381](https://github.com/WordPress/gutenberg/pull/55381))
-- Update broken anchor link. ([55233](https://github.com/WordPress/gutenberg/pull/55233))
-
+-   Add "Get started with create-block" doc to the Getting Started section. ([55373](https://github.com/WordPress/gutenberg/pull/55373))
+-   Add a "Get started with wp-scripts" doc to the Getting Started section. ([55372](https://github.com/WordPress/gutenberg/pull/55372))
+-   Add backgroundImage to the theme json documentation for appearanceTools. ([55376](https://github.com/WordPress/gutenberg/pull/55376))
+-   Add initial documentation for the `DataViews` component. ([55435](https://github.com/WordPress/gutenberg/pull/55435))
+-   Augment `Block.Edit` filter documentation with performance guidance. ([55252](https://github.com/WordPress/gutenberg/pull/55252))
+-   Correct the documented type for the `$w` parameter of `block_core_navigation_add_directives_to_submenu()`. ([53585](https://github.com/WordPress/gutenberg/pull/53585))
+-   Document `kind`, `name`, `plural` for entity configuration. ([55158](https://github.com/WordPress/gutenberg/pull/55158))
+-   Document updating the consent string to unlock private APIs. ([55235](https://github.com/WordPress/gutenberg/pull/55235))
+-   Explain how to translate Gutenberg in standalone apps using the editor packages. ([55080](https://github.com/WordPress/gutenberg/pull/55080))
+-   Fix callouts in end-to-end test documentation. ([55300](https://github.com/WordPress/gutenberg/pull/55300))
+-   Fix code formatting due to bug in the "Get started with wp-env" doc. ([55458](https://github.com/WordPress/gutenberg/pull/55458))
+-   Fix the position of the callout in the "Get started with wp-scripts" doc. ([55457](https://github.com/WordPress/gutenberg/pull/55457))
+-   Font Library: Change all references to 6.4.0 by 6.5.0 core version. ([55320](https://github.com/WordPress/gutenberg/pull/55320))
+-   Initial documentation of entity configuration. ([55103](https://github.com/WordPress/gutenberg/pull/55103))
+-   PHP lib docs: Update to include information about prefixes in block PHP code. ([55402](https://github.com/WordPress/gutenberg/pull/55402))
+-   Platform docs: Add a page to explain how to render HTML from a list of blocks. ([55140](https://github.com/WordPress/gutenberg/pull/55140))
+-   Remove `@return void` from PHP function docs. ([55237](https://github.com/WordPress/gutenberg/pull/55237))
+-   Remove the `wp-now` getting started doc. ([55136](https://github.com/WordPress/gutenberg/pull/55136))
+-   Update LinkControl documentation with advice to memoize value prop. ([54659](https://github.com/WordPress/gutenberg/pull/54659))
+-   Update nested-blocks-inner-blocks.md for WP 6.4 release. ([55375](https://github.com/WordPress/gutenberg/pull/55375))
+-   docs/get-started-with-wp-env: Diagram and links added. ([55381](https://github.com/WordPress/gutenberg/pull/55381))
+-   Update broken anchor link. ([55233](https://github.com/WordPress/gutenberg/pull/55233))
 
 ### Code Quality
 
 #### Data Views
-- Allow actions to be provided declaratively as a prop. ([55192](https://github.com/WordPress/gutenberg/pull/55192))
-- In list view, automatically insert header menu separators. ([55412](https://github.com/WordPress/gutenberg/pull/55412))
-- Update the data views component to pass an view object. ([55154](https://github.com/WordPress/gutenberg/pull/55154))
-- Update the view actions menu to be independent from current view APIs. ([55294](https://github.com/WordPress/gutenberg/pull/55294))
-- Normalize `render` fields function. ([55411](https://github.com/WordPress/gutenberg/pull/55411))
-- Rename accessorFn to getValue. ([55434](https://github.com/WordPress/gutenberg/pull/55434))
-- Update the view configuration to include fields visibility. ([55247](https://github.com/WordPress/gutenberg/pull/55247))
+
+-   Allow actions to be provided declaratively as a prop. ([55192](https://github.com/WordPress/gutenberg/pull/55192))
+-   In list view, automatically insert header menu separators. ([55412](https://github.com/WordPress/gutenberg/pull/55412))
+-   Update the data views component to pass an view object. ([55154](https://github.com/WordPress/gutenberg/pull/55154))
+-   Update the view actions menu to be independent from current view APIs. ([55294](https://github.com/WordPress/gutenberg/pull/55294))
+-   Normalize `render` fields function. ([55411](https://github.com/WordPress/gutenberg/pull/55411))
+-   Rename accessorFn to getValue. ([55434](https://github.com/WordPress/gutenberg/pull/55434))
+-   Update the view configuration to include fields visibility. ([55247](https://github.com/WordPress/gutenberg/pull/55247))
 
 #### Block Library
-- Query block: Remove unnecessary class. ([55438](https://github.com/WordPress/gutenberg/pull/55438))
+
+-   Query block: Remove unnecessary class. ([55438](https://github.com/WordPress/gutenberg/pull/55438))
 
 #### Site Editor
-- Fix: Remove unrequired nullish coalescing operator on canEditCss con…. ([55357](https://github.com/WordPress/gutenberg/pull/55357))
+
+-   Fix: Remove unrequired nullish coalescing operator on canEditCss con…. ([55357](https://github.com/WordPress/gutenberg/pull/55357))
 
 #### Global Styles
-- Update: Unset variable set by reference after a foreach loop. ([55261](https://github.com/WordPress/gutenberg/pull/55261))
+
+-   Update: Unset variable set by reference after a foreach loop. ([55261](https://github.com/WordPress/gutenberg/pull/55261))
 
 #### Design Tools
-- Elements: Add unit tests for class and style generation. ([55113](https://github.com/WordPress/gutenberg/pull/55113))
+
+-   Elements: Add unit tests for class and style generation. ([55113](https://github.com/WordPress/gutenberg/pull/55113))
 
 #### Block Editor
-- Remove value syncing in Link Control. ([51387](https://github.com/WordPress/gutenberg/pull/51387))
-- Chore: Fix: Remove third parameter passed to shouldDismissPastedFiles. ([55262](https://github.com/WordPress/gutenberg/pull/55262))
-- Chore: Simplify code by removing unnecessary and condition. ([55268](https://github.com/WordPress/gutenberg/pull/55268))
-- useBlockSync: Fix typo and simplify test. ([55203](https://github.com/WordPress/gutenberg/pull/55203))
+
+-   Remove value syncing in Link Control. ([51387](https://github.com/WordPress/gutenberg/pull/51387))
+-   Chore: Fix: Remove third parameter passed to shouldDismissPastedFiles. ([55262](https://github.com/WordPress/gutenberg/pull/55262))
+-   Chore: Simplify code by removing unnecessary and condition. ([55268](https://github.com/WordPress/gutenberg/pull/55268))
+-   useBlockSync: Fix typo and simplify test. ([55203](https://github.com/WordPress/gutenberg/pull/55203))
 
 #### Data Layer
-- Update status entity label to `Status` and plural to `getStatuses`. ([55160](https://github.com/WordPress/gutenberg/pull/55160))
+
+-   Update status entity label to `Status` and plural to `getStatuses`. ([55160](https://github.com/WordPress/gutenberg/pull/55160))
 
 #### Gutenberg Plugin
-- Text Component: Typescript'n. ([54953](https://github.com/WordPress/gutenberg/pull/54953))
+
+-   Text Component: Typescript'n. ([54953](https://github.com/WordPress/gutenberg/pull/54953))
 
 ### Tools
 
 #### Testing
-- Don't change error handling in WP_Theme_JSON_Gutenberg::Set_spacing_sizes(). ([55354](https://github.com/WordPress/gutenberg/pull/55354))
-- E2E: Add missing comment. ([55093](https://github.com/WordPress/gutenberg/pull/55093))
-- E2E: Try to fix the flaky autocomplete spec. ([55081](https://github.com/WordPress/gutenberg/pull/55081))
-- Migrate 'Post Title block' end-to-end tests to Playwright. ([55297](https://github.com/WordPress/gutenberg/pull/55297))
-- Migrate 'text color' end-to-end test to Playwright. ([55323](https://github.com/WordPress/gutenberg/pull/55323))
-- Migrate demo page tests to Playwright. ([55054](https://github.com/WordPress/gutenberg/pull/55054))
-- Migrate remaining Link UI tests to Playwright. ([52828](https://github.com/WordPress/gutenberg/pull/52828))
-- Playwright Utils: Introduce the 'editor.saveDraft' helper. ([55308](https://github.com/WordPress/gutenberg/pull/55308))
-- Try to fix flaky synced pattern test. ([55406](https://github.com/WordPress/gutenberg/pull/55406))
-- Try to fix multi-block-selection flakiness. ([55075](https://github.com/WordPress/gutenberg/pull/55075))
-- WP_Theme_JSON_Gutenberg Unit tests: Fix phpunit warnings about set_spacing_sizes. ([55313](https://github.com/WordPress/gutenberg/pull/55313))
-- end-to-end Utils: Use frameLocator for retrieving editor canvas. ([54911](https://github.com/WordPress/gutenberg/pull/54911))
 
-#### Build Tooling
-- Packages: Ensure only changed packages get published for WP releases. ([55334](https://github.com/WordPress/gutenberg/pull/55334))
-- WP_Env: tests-cli phpunit executable file not found in $PATH: Unknown. ([54508](https://github.com/WordPress/gutenberg/pull/54508))
+-   Don't change error handling in WP_Theme_JSON_Gutenberg::Set_spacing_sizes(). ([55354](https://github.com/WordPress/gutenberg/pull/55354))
+-   E2E: Add missing comment. ([55093](https://github.com/WordPress/gutenberg/pull/55093))
+-   E2E: Try to fix the flaky autocomplete spec. ([55081](https://github.com/WordPress/gutenberg/pull/55081))
+-   Migrate 'Post Title block' end-to-end tests to Playwright. ([55297](https://github.com/WordPress/gutenberg/pull/55297))
+-   Migrate 'text color' end-to-end test to Playwright. ([55323](https://github.com/WordPress/gutenberg/pull/55323))
+-   Migrate demo page tests to Playwright. ([55054](https://github.com/WordPress/gutenberg/pull/55054))
+-   Migrate remaining Link UI tests to Playwright. ([52828](https://github.com/WordPress/gutenberg/pull/52828))
+-   Playwright Utils: Introduce the 'editor.saveDraft' helper. ([55308](https://github.com/WordPress/gutenberg/pull/55308))
+-   Try to fix flaky synced pattern test. ([55406](https://github.com/WordPress/gutenberg/pull/55406))
+-   Try to fix multi-block-selection flakiness. ([55075](https://github.com/WordPress/gutenberg/pull/55075))
+-   WP_Theme_JSON_Gutenberg Unit tests: Fix phpunit warnings about set_spacing_sizes. ([55313](https://github.com/WordPress/gutenberg/pull/55313))
+-   end-to-end Utils: Use frameLocator for retrieving editor canvas. ([54911](https://github.com/WordPress/gutenberg/pull/54911))
 
+#### Build Tooling
 
-## First time contributors
+-   Packages: Ensure only changed packages get published for WP releases. ([55334](https://github.com/WordPress/gutenberg/pull/55334))
+-   WP_Env: tests-cli phpunit executable file not found in $PATH: Unknown. ([54508](https://github.com/WordPress/gutenberg/pull/54508))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @unscripted: docs: Update broken anchor link. ([55233](https://github.com/WordPress/gutenberg/pull/55233))
+The following PRs were merged by first-time contributors:
 
+-   @unscripted: docs: Update broken anchor link. ([55233](https://github.com/WordPress/gutenberg/pull/55233))
 
 ## Contributors
 
@@ -1277,24 +11891,17 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @andrewhayward @andrewserong @anton-vlasenko @apeatling @aristath @artemiomorales @brookewp @carolinan @chad1008 @ciampo @dcalhoun @dmsnell @ecgan @ellatrix @fluiddot @getdave @glendaviesnz @gziolo @jffng @jhnstn @johnbillion @jorgefilipecosta @jrtashjian @jsnajdr @juanmaguitar @kevin940726 @kishanjasani @luisherranz @MaggieCabrera @Mamaduka @margolisj @matiasbenedetto @mcsf @michalczaplinski @mikachan @ndiego @ntsekouras @oandregal @ockham @peterwilsoncc @ramonjd @retrofox @richtabor @ryanwelcher @SantosGuillamot @scruffian @sethrubenstein @shimotmk @SiobhyB @spacedmonkey @stokesman @t-hamano @talldan @tellthemachines @tyxla @unscripted @WunderBart @youknowriad
 
-
 = 16.8.1 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
-- Update: Improve footnotes sanitisation by removing unrequired keys. ([55305](https://github.com/WordPress/gutenberg/pull/55305))
-
+-   Update: Improve footnotes sanitisation by removing unrequired keys. ([55305](https://github.com/WordPress/gutenberg/pull/55305))
 
 ### Code Quality
 
-- Update: Navigation link force arrow attribute to be part of the hardcoded set. ([55306](https://github.com/WordPress/gutenberg/pull/55306))
-
-
-
+-   Update: Navigation link force arrow attribute to be part of the hardcoded set. ([55306](https://github.com/WordPress/gutenberg/pull/55306))
 
 ## Contributors
 
@@ -1302,22 +11909,23 @@ The following contributors merged PRs in this release:
 
 @jorgefilipecosta
 
-
 = 16.8.0 =
 
 = 16.8.0-rc.2 =
 
 ## Changelog
+
 This copies the commits from the 16.7.1 patch release into the 16.8.0 main release.
- 
+
 ### Tools
 
 #### Build Tooling
-- Fix incorrect resource URL in source map for sources coming from @wordpress packages. ([51401](https://github.com/WordPress/gutenberg/pull/51401))
+
+-   Fix incorrect resource URL in source map for sources coming from @wordpress packages. ([51401](https://github.com/WordPress/gutenberg/pull/51401))
 
 ### Various
 
-- Add missing schema `type` attribute for in WP 6.4 compat's `block-hooks.php`. ([55138](https://github.com/WordPress/gutenberg/pull/55138))
+-   Add missing schema `type` attribute for in WP 6.4 compat's `block-hooks.php`. ([55138](https://github.com/WordPress/gutenberg/pull/55138))
 
 ## Contributors
 
@@ -1325,7 +11933,6 @@ The following contributors merged PRs in this release:
 
 @fullofcaffeine @torounit
 
-
 = 16.8.0-rc.1 =
 
 ## Changelog
@@ -1333,277 +11940,308 @@ The following contributors merged PRs in this release:
 ### Features
 
 #### Block Editor
-- Adds 'nofollow' setting to Button block. ([54110](https://github.com/WordPress/gutenberg/pull/54110))
+
+-   Adds 'nofollow' setting to Button block. ([54110](https://github.com/WordPress/gutenberg/pull/54110))
 
 #### Site Editor
-- Add 'Show template' toggle when editing pages. ([52674](https://github.com/WordPress/gutenberg/pull/52674))
 
+-   Add 'Show template' toggle when editing pages. ([52674](https://github.com/WordPress/gutenberg/pull/52674))
 
 ### Enhancements
 
-- Update pattern import menu item. ([54782](https://github.com/WordPress/gutenberg/pull/54782))
+-   Update pattern import menu item. ([54782](https://github.com/WordPress/gutenberg/pull/54782))
 
 #### Components
-- Adding label/description to `BlockEditor/DuotoneControl`. ([54473](https://github.com/WordPress/gutenberg/pull/54473))
-- Deprecating `isPressed` in `Button` component. ([54740](https://github.com/WordPress/gutenberg/pull/54740))
-- Follow ariakit best practices. ([54696](https://github.com/WordPress/gutenberg/pull/54696))
-- InputControl-based components: Add opt-in prop for next 40px default size. ([53819](https://github.com/WordPress/gutenberg/pull/53819))
-- Modal: Add `contentWidth` prop to support a selection of preset modal sizes. ([54471](https://github.com/WordPress/gutenberg/pull/54471))
-- Remove unused components from `ui/`. ([54573](https://github.com/WordPress/gutenberg/pull/54573))
-- Update ariakit to 0.3.3. ([54818](https://github.com/WordPress/gutenberg/pull/54818))
-- Update compact search control metrics. ([54663](https://github.com/WordPress/gutenberg/pull/54663))
-- Wrapped `TextareaControl` in a `forwardRef` call. ([54975](https://github.com/WordPress/gutenberg/pull/54975))
+
+-   Adding label/description to `BlockEditor/DuotoneControl`. ([54473](https://github.com/WordPress/gutenberg/pull/54473))
+-   Deprecating `isPressed` in `Button` component. ([54740](https://github.com/WordPress/gutenberg/pull/54740))
+-   Follow ariakit best practices. ([54696](https://github.com/WordPress/gutenberg/pull/54696))
+-   InputControl-based components: Add opt-in prop for next 40px default size. ([53819](https://github.com/WordPress/gutenberg/pull/53819))
+-   Modal: Add `contentWidth` prop to support a selection of preset modal sizes. ([54471](https://github.com/WordPress/gutenberg/pull/54471))
+-   Remove unused components from `ui/`. ([54573](https://github.com/WordPress/gutenberg/pull/54573))
+-   Update ariakit to 0.3.3. ([54818](https://github.com/WordPress/gutenberg/pull/54818))
+-   Update compact search control metrics. ([54663](https://github.com/WordPress/gutenberg/pull/54663))
+-   Wrapped `TextareaControl` in a `forwardRef` call. ([54975](https://github.com/WordPress/gutenberg/pull/54975))
 
 #### Block Library
-- Add a brief description to the Footnotes block. ([54613](https://github.com/WordPress/gutenberg/pull/54613))
-- Footnotes: Use core’s meta revisioning if available. ([52988](https://github.com/WordPress/gutenberg/pull/52988))
-- Login/out: Add spacing support. ([45147](https://github.com/WordPress/gutenberg/pull/45147))
-- Query view.js: Code quality. ([54982](https://github.com/WordPress/gutenberg/pull/54982))
-- Set custom color when applying initial background image. ([54054](https://github.com/WordPress/gutenberg/pull/54054))
-- Use `wp_get_inline_script_tag()` in `build_dropdown_script_block_core_categories()`. ([54637](https://github.com/WordPress/gutenberg/pull/54637))
+
+-   Add a brief description to the Footnotes block. ([54613](https://github.com/WordPress/gutenberg/pull/54613))
+-   Footnotes: Use core’s meta revisioning if available. ([52988](https://github.com/WordPress/gutenberg/pull/52988))
+-   Login/out: Add spacing support. ([45147](https://github.com/WordPress/gutenberg/pull/45147))
+-   Query view.js: Code quality. ([54982](https://github.com/WordPress/gutenberg/pull/54982))
+-   Set custom color when applying initial background image. ([54054](https://github.com/WordPress/gutenberg/pull/54054))
+-   Use `wp_get_inline_script_tag()` in `build_dropdown_script_block_core_categories()`. ([54637](https://github.com/WordPress/gutenberg/pull/54637))
 
 #### Block Editor
-- Default suggested links to pages. ([54622](https://github.com/WordPress/gutenberg/pull/54622))
-- Remove base URL from link control search results. ([54553](https://github.com/WordPress/gutenberg/pull/54553))
-- Simplify `BlockHTMLConvertButton`. ([54972](https://github.com/WordPress/gutenberg/pull/54972))
-- Update strings in blocks 'RenameModal' component. ([54887](https://github.com/WordPress/gutenberg/pull/54887))
+
+-   Default suggested links to pages. ([54622](https://github.com/WordPress/gutenberg/pull/54622))
+-   Remove base URL from link control search results. ([54553](https://github.com/WordPress/gutenberg/pull/54553))
+-   Simplify `BlockHTMLConvertButton`. ([54972](https://github.com/WordPress/gutenberg/pull/54972))
+-   Update strings in blocks 'RenameModal' component. ([54887](https://github.com/WordPress/gutenberg/pull/54887))
 
 #### Post Editor
-- Edit Post: Use hooks instead of HoCs in 'PostStatus' components. ([54951](https://github.com/WordPress/gutenberg/pull/54951))
-- Editor: Use hooks instead of HoCs in 'PostSticky' components. ([54949](https://github.com/WordPress/gutenberg/pull/54949))
-- Editor: Use hooks instead of HoCs in 'PostSwitchToDraftButton'. ([54695](https://github.com/WordPress/gutenberg/pull/54695))
-- Show confirmation dialog when moving a post to the trash. ([50219](https://github.com/WordPress/gutenberg/pull/50219))
+
+-   Edit Post: Use hooks instead of HoCs in 'PostStatus' components. ([54951](https://github.com/WordPress/gutenberg/pull/54951))
+-   Editor: Use hooks instead of HoCs in 'PostSticky' components. ([54949](https://github.com/WordPress/gutenberg/pull/54949))
+-   Editor: Use hooks instead of HoCs in 'PostSwitchToDraftButton'. ([54695](https://github.com/WordPress/gutenberg/pull/54695))
+-   Show confirmation dialog when moving a post to the trash. ([50219](https://github.com/WordPress/gutenberg/pull/50219))
 
 #### Site Editor
-- Add template replace flow to template inspector. ([54609](https://github.com/WordPress/gutenberg/pull/54609))
-- [Site Editor]: Update copy of using  the default template in a page. ([54728](https://github.com/WordPress/gutenberg/pull/54728))
+
+-   Add template replace flow to template inspector. ([54609](https://github.com/WordPress/gutenberg/pull/54609))
+-   [Site Editor]: Update copy of using the default template in a page. ([54728](https://github.com/WordPress/gutenberg/pull/54728))
 
 #### Patterns
-- Remove category description in inserter panel. ([54894](https://github.com/WordPress/gutenberg/pull/54894))
+
+-   Remove category description in inserter panel. ([54894](https://github.com/WordPress/gutenberg/pull/54894))
 
 #### Typography
-- Font Library: Refactor endpoint permissions. ([54829](https://github.com/WordPress/gutenberg/pull/54829))
 
+-   Font Library: Refactor endpoint permissions. ([54829](https://github.com/WordPress/gutenberg/pull/54829))
 
 ### Bug Fixes
 
-- Fix the ShortcutProvider usage. ([54851](https://github.com/WordPress/gutenberg/pull/54851))
-- Fix warning when a template calls a template area twice. ([54861](https://github.com/WordPress/gutenberg/pull/54861))
-- Revert "Fix warning when a template calls a template area twice". ([54926](https://github.com/WordPress/gutenberg/pull/54926))
+-   Fix the ShortcutProvider usage. ([54851](https://github.com/WordPress/gutenberg/pull/54851))
+-   Fix warning when a template calls a template area twice. ([54861](https://github.com/WordPress/gutenberg/pull/54861))
+-   Revert "Fix warning when a template calls a template area twice". ([54926](https://github.com/WordPress/gutenberg/pull/54926))
 
 #### Block Library
-- All Nav block items to break long titles. ([54866](https://github.com/WordPress/gutenberg/pull/54866))
-- Fallback to Twitter provider when embedding X URLs. ([54876](https://github.com/WordPress/gutenberg/pull/54876))
-- Fix Deleted Navigation Menu warning string. ([55033](https://github.com/WordPress/gutenberg/pull/55033))
-- Fix Search Block not updating in Nav block. ([54823](https://github.com/WordPress/gutenberg/pull/54823))
-- Fix left and right aligmnent in children of Post Template. ([54997](https://github.com/WordPress/gutenberg/pull/54997))
-- Fix output of Navigation block classnames in the editor. ([54992](https://github.com/WordPress/gutenberg/pull/54992))
-- Fix overwriting of published post meta when previewing footnote changes. ([54339](https://github.com/WordPress/gutenberg/pull/54339))
-- Image: Ensure Expand on Click toggle is shown if block-level lightbox setting exists. ([54878](https://github.com/WordPress/gutenberg/pull/54878))
-- Image: Fix layout shift when lightbox is opened and closed. ([53026](https://github.com/WordPress/gutenberg/pull/53026))
-- Media & Text: Fix React warning. ([55038](https://github.com/WordPress/gutenberg/pull/55038))
-- Search block: Allow space for input field only when form expanded. ([54846](https://github.com/WordPress/gutenberg/pull/54846))
-- Search block: Update alignment and icon button width. ([54773](https://github.com/WordPress/gutenberg/pull/54773))
+
+-   All Nav block items to break long titles. ([54866](https://github.com/WordPress/gutenberg/pull/54866))
+-   Fallback to Twitter provider when embedding X URLs. ([54876](https://github.com/WordPress/gutenberg/pull/54876))
+-   Fix Deleted Navigation Menu warning string. ([55033](https://github.com/WordPress/gutenberg/pull/55033))
+-   Fix Search Block not updating in Nav block. ([54823](https://github.com/WordPress/gutenberg/pull/54823))
+-   Fix left and right aligmnent in children of Post Template. ([54997](https://github.com/WordPress/gutenberg/pull/54997))
+-   Fix output of Navigation block classnames in the editor. ([54992](https://github.com/WordPress/gutenberg/pull/54992))
+-   Fix overwriting of published post meta when previewing footnote changes. ([54339](https://github.com/WordPress/gutenberg/pull/54339))
+-   Image: Ensure Expand on Click toggle is shown if block-level lightbox setting exists. ([54878](https://github.com/WordPress/gutenberg/pull/54878))
+-   Image: Fix layout shift when lightbox is opened and closed. ([53026](https://github.com/WordPress/gutenberg/pull/53026))
+-   Media & Text: Fix React warning. ([55038](https://github.com/WordPress/gutenberg/pull/55038))
+-   Search block: Allow space for input field only when form expanded. ([54846](https://github.com/WordPress/gutenberg/pull/54846))
+-   Search block: Update alignment and icon button width. ([54773](https://github.com/WordPress/gutenberg/pull/54773))
 
 #### Site Editor
-- Avoid same key warnings in template parts area listings. ([54863](https://github.com/WordPress/gutenberg/pull/54863))
-- Avoid stale navigation block values when parsing entity record. ([54996](https://github.com/WordPress/gutenberg/pull/54996))
-- Don't display the navigation section in template parts details when a menu is missing. ([54993](https://github.com/WordPress/gutenberg/pull/54993))
-- Fix ToolSelector popover variant. ([54840](https://github.com/WordPress/gutenberg/pull/54840))
-- Reset 'Show template' toggle when leaving edit mode. ([54679](https://github.com/WordPress/gutenberg/pull/54679))
-- remove `overflow: Hidden` from the entity title in the site editor sidebar. ([54769](https://github.com/WordPress/gutenberg/pull/54769))
+
+-   Avoid same key warnings in template parts area listings. ([54863](https://github.com/WordPress/gutenberg/pull/54863))
+-   Avoid stale navigation block values when parsing entity record. ([54996](https://github.com/WordPress/gutenberg/pull/54996))
+-   Don't display the navigation section in template parts details when a menu is missing. ([54993](https://github.com/WordPress/gutenberg/pull/54993))
+-   Fix ToolSelector popover variant. ([54840](https://github.com/WordPress/gutenberg/pull/54840))
+-   Reset 'Show template' toggle when leaving edit mode. ([54679](https://github.com/WordPress/gutenberg/pull/54679))
+-   remove `overflow: Hidden` from the entity title in the site editor sidebar. ([54769](https://github.com/WordPress/gutenberg/pull/54769))
 
 #### Components
-- FormTokenField: Add `box-sizing` reset style and reset default padding. ([54734](https://github.com/WordPress/gutenberg/pull/54734))
-- Popover: Fix the styles for components that use emotion within popovers. ([54912](https://github.com/WordPress/gutenberg/pull/54912))
-- Remove hover style for secondary Button when aria-disabled is set. ([54978](https://github.com/WordPress/gutenberg/pull/54978))
-- Reverting addition of `aria-selected` style hook in `Button`. ([54931](https://github.com/WordPress/gutenberg/pull/54931))
-- `SlotFill`: Pass `Component` instance to unregisterSlot. ([54765](https://github.com/WordPress/gutenberg/pull/54765))
+
+-   FormTokenField: Add `box-sizing` reset style and reset default padding. ([54734](https://github.com/WordPress/gutenberg/pull/54734))
+-   Popover: Fix the styles for components that use emotion within popovers. ([54912](https://github.com/WordPress/gutenberg/pull/54912))
+-   Remove hover style for secondary Button when aria-disabled is set. ([54978](https://github.com/WordPress/gutenberg/pull/54978))
+-   Reverting addition of `aria-selected` style hook in `Button`. ([54931](https://github.com/WordPress/gutenberg/pull/54931))
+-   `SlotFill`: Pass `Component` instance to unregisterSlot. ([54765](https://github.com/WordPress/gutenberg/pull/54765))
 
 #### Block Editor
-- Avoid double-wrapping selectors when transforming the styles. ([54981](https://github.com/WordPress/gutenberg/pull/54981))
-- [Inserter]: Fix reset of registered media categories. ([55012](https://github.com/WordPress/gutenberg/pull/55012))
+
+-   Avoid double-wrapping selectors when transforming the styles. ([54981](https://github.com/WordPress/gutenberg/pull/54981))
+-   [Inserter]: Fix reset of registered media categories. ([55012](https://github.com/WordPress/gutenberg/pull/55012))
 
 #### Typography
-- Font Library: Changed the OTF mime type expected value to be what PHP returns. ([54886](https://github.com/WordPress/gutenberg/pull/54886))
-- Font Library: Move font uploads to a new tab. ([54655](https://github.com/WordPress/gutenberg/pull/54655))
+
+-   Font Library: Changed the OTF mime type expected value to be what PHP returns. ([54886](https://github.com/WordPress/gutenberg/pull/54886))
+-   Font Library: Move font uploads to a new tab. ([54655](https://github.com/WordPress/gutenberg/pull/54655))
 
 #### Global Styles
-- Block custom CSS: Fix incorrect CSS when multiple root selectors. ([53602](https://github.com/WordPress/gutenberg/pull/53602))
-- Image: Ensure `false` values are preserved in memory when defined in `theme.json`. ([54639](https://github.com/WordPress/gutenberg/pull/54639))
+
+-   Block custom CSS: Fix incorrect CSS when multiple root selectors. ([53602](https://github.com/WordPress/gutenberg/pull/53602))
+-   Image: Ensure `false` values are preserved in memory when defined in `theme.json`. ([54639](https://github.com/WordPress/gutenberg/pull/54639))
 
 #### List View
-- Fix performance issue when selecting all blocks. ([54900](https://github.com/WordPress/gutenberg/pull/54900))
+
+-   Fix performance issue when selecting all blocks. ([54900](https://github.com/WordPress/gutenberg/pull/54900))
 
 #### Colors
-- Format Library: Try to fix highlight popover jumping. ([54736](https://github.com/WordPress/gutenberg/pull/54736))
+
+-   Format Library: Try to fix highlight popover jumping. ([54736](https://github.com/WordPress/gutenberg/pull/54736))
 
 #### Interactivity API
-- Image: Fix duotone not being applied to lightbox image. ([54670](https://github.com/WordPress/gutenberg/pull/54670))
 
+-   Image: Fix duotone not being applied to lightbox image. ([54670](https://github.com/WordPress/gutenberg/pull/54670))
 
 ### Accessibility
 
 #### Block Library
-- Footnotes: Add aria-label to return links. ([54843](https://github.com/WordPress/gutenberg/pull/54843))
-- Table of contents block accessibility improvements. ([54322](https://github.com/WordPress/gutenberg/pull/54322))
+
+-   Footnotes: Add aria-label to return links. ([54843](https://github.com/WordPress/gutenberg/pull/54843))
+-   Table of contents block accessibility improvements. ([54322](https://github.com/WordPress/gutenberg/pull/54322))
 
 #### Components
-- HTML block: Fix accessibility issues on back-end. ([54408](https://github.com/WordPress/gutenberg/pull/54408))
-- `Modal`: Accessibly hide/show outer modal when nested. ([54743](https://github.com/WordPress/gutenberg/pull/54743))
+
+-   HTML block: Fix accessibility issues on back-end. ([54408](https://github.com/WordPress/gutenberg/pull/54408))
+-   `Modal`: Accessibly hide/show outer modal when nested. ([54743](https://github.com/WordPress/gutenberg/pull/54743))
 
 #### Patterns
-- Use list role instead of listbox in patterns list. ([54884](https://github.com/WordPress/gutenberg/pull/54884))
+
+-   Use list role instead of listbox in patterns list. ([54884](https://github.com/WordPress/gutenberg/pull/54884))
 
 #### Post Editor
-- Editor: Always render the 'Switch to Draft' button to avoid focus loss. ([54722](https://github.com/WordPress/gutenberg/pull/54722))
+
+-   Editor: Always render the 'Switch to Draft' button to avoid focus loss. ([54722](https://github.com/WordPress/gutenberg/pull/54722))
 
 #### Block Editor
-- Block Switcher: Use a different label for multi-selection. ([54692](https://github.com/WordPress/gutenberg/pull/54692))
 
+-   Block Switcher: Use a different label for multi-selection. ([54692](https://github.com/WordPress/gutenberg/pull/54692))
 
 ### Performance
 
-- Tests: Support the Site Editor's legacy spinner. ([54784](https://github.com/WordPress/gutenberg/pull/54784))
-- Use instanceOf over property_exists. ([54835](https://github.com/WordPress/gutenberg/pull/54835))
+-   Tests: Support the Site Editor's legacy spinner. ([54784](https://github.com/WordPress/gutenberg/pull/54784))
+-   Use instanceOf over property_exists. ([54835](https://github.com/WordPress/gutenberg/pull/54835))
 
 #### Block Editor
-- Subscribe only to block editor store in `useBlockSync`. ([55041](https://github.com/WordPress/gutenberg/pull/55041))
 
+-   Subscribe only to block editor store in `useBlockSync`. ([55041](https://github.com/WordPress/gutenberg/pull/55041))
 
 ### Experiments
 
 #### Site Editor
-- al]: First version of pages list in site editor. ([54966](https://github.com/WordPress/gutenberg/pull/54966))
+
+-   al]: First version of pages list in site editor. ([54966](https://github.com/WordPress/gutenberg/pull/54966))
 
 #### Block Editor
-- Expose `getDuotoneFilter()` as private API. ([54905](https://github.com/WordPress/gutenberg/pull/54905))
 
+-   Expose `getDuotoneFilter()` as private API. ([54905](https://github.com/WordPress/gutenberg/pull/54905))
 
 ### Documentation
 
-- Add a documentation page about the block editor settings. ([54870](https://github.com/WordPress/gutenberg/pull/54870))
-- Add a page about the format library to the platform documentation site. ([55037](https://github.com/WordPress/gutenberg/pull/55037))
-- Docs: Add a callout to the `wp-now` documentation to mention it's still experimental. ([55044](https://github.com/WordPress/gutenberg/pull/55044))
-- Docs: Remove outdated info. ([54707](https://github.com/WordPress/gutenberg/pull/54707))
-- Docs: Remove the Full Site Editing doc. ([54516](https://github.com/WordPress/gutenberg/pull/54516))
-- Docs: Rename Block Hooks handbook page to Block Filters. ([54862](https://github.com/WordPress/gutenberg/pull/54862))
-- Document the current state of the Real-Time collaboration experiment. ([54932](https://github.com/WordPress/gutenberg/pull/54932))
-- Fix a broken MD link in callout. ([54772](https://github.com/WordPress/gutenberg/pull/54772))
-- Platform Docs: Add a documentation page explaining how to use the block library. ([54967](https://github.com/WordPress/gutenberg/pull/54967))
-- Update the documentation of the block editor and replace @wordpress/element with react. ([54908](https://github.com/WordPress/gutenberg/pull/54908))
-- Update versions in WP for 6.4. ([54890](https://github.com/WordPress/gutenberg/pull/54890))
-
+-   Add a documentation page about the block editor settings. ([54870](https://github.com/WordPress/gutenberg/pull/54870))
+-   Add a page about the format library to the platform documentation site. ([55037](https://github.com/WordPress/gutenberg/pull/55037))
+-   Docs: Add a callout to the `wp-now` documentation to mention it's still experimental. ([55044](https://github.com/WordPress/gutenberg/pull/55044))
+-   Docs: Remove outdated info. ([54707](https://github.com/WordPress/gutenberg/pull/54707))
+-   Docs: Remove the Full Site Editing doc. ([54516](https://github.com/WordPress/gutenberg/pull/54516))
+-   Docs: Rename Block Hooks handbook page to Block Filters. ([54862](https://github.com/WordPress/gutenberg/pull/54862))
+-   Document the current state of the Real-Time collaboration experiment. ([54932](https://github.com/WordPress/gutenberg/pull/54932))
+-   Fix a broken MD link in callout. ([54772](https://github.com/WordPress/gutenberg/pull/54772))
+-   Platform Docs: Add a documentation page explaining how to use the block library. ([54967](https://github.com/WordPress/gutenberg/pull/54967))
+-   Update the documentation of the block editor and replace @wordpress/element with react. ([54908](https://github.com/WordPress/gutenberg/pull/54908))
+-   Update versions in WP for 6.4. ([54890](https://github.com/WordPress/gutenberg/pull/54890))
 
 ### Code Quality
 
-- Add a unit test for the "ValidBlockLibraryFunctionNameSniff" sniff. ([53928](https://github.com/WordPress/gutenberg/pull/53928))
-- Move dependencies to the right place. ([54597](https://github.com/WordPress/gutenberg/pull/54597))
-- Move mime-type collection generation to a function that can be tested…. ([54844](https://github.com/WordPress/gutenberg/pull/54844))
-- Post Title block should use esc_url(). ([53981](https://github.com/WordPress/gutenberg/pull/53981))
-- Rich text: Use getPasteEventData. ([55048](https://github.com/WordPress/gutenberg/pull/55048))
-- Writing flow: Absorb clipboard handler. ([55006](https://github.com/WordPress/gutenberg/pull/55006))
+-   Add a unit test for the "ValidBlockLibraryFunctionNameSniff" sniff. ([53928](https://github.com/WordPress/gutenberg/pull/53928))
+-   Move dependencies to the right place. ([54597](https://github.com/WordPress/gutenberg/pull/54597))
+-   Move mime-type collection generation to a function that can be tested…. ([54844](https://github.com/WordPress/gutenberg/pull/54844))
+-   Post Title block should use esc_url(). ([53981](https://github.com/WordPress/gutenberg/pull/53981))
+-   Rich text: Use getPasteEventData. ([55048](https://github.com/WordPress/gutenberg/pull/55048))
+-   Writing flow: Absorb clipboard handler. ([55006](https://github.com/WordPress/gutenberg/pull/55006))
 
 #### Block Library
-- Footnotes: Avoid regexes in entity provider. ([54505](https://github.com/WordPress/gutenberg/pull/54505))
-- Image Block: Fix browser console error when clicking "Expand on Click". ([54938](https://github.com/WordPress/gutenberg/pull/54938))
-- Removed unwanted space from the string. ([54654](https://github.com/WordPress/gutenberg/pull/54654))
-- Update CODEOWNERS for `core/image` block. ([54793](https://github.com/WordPress/gutenberg/pull/54793))
+
+-   Footnotes: Avoid regexes in entity provider. ([54505](https://github.com/WordPress/gutenberg/pull/54505))
+-   Image Block: Fix browser console error when clicking "Expand on Click". ([54938](https://github.com/WordPress/gutenberg/pull/54938))
+-   Removed unwanted space from the string. ([54654](https://github.com/WordPress/gutenberg/pull/54654))
+-   Update CODEOWNERS for `core/image` block. ([54793](https://github.com/WordPress/gutenberg/pull/54793))
 
 #### Patterns
-- Add a new spec for for adding an unsynced pattern. ([54892](https://github.com/WordPress/gutenberg/pull/54892))
-- Add end-to-end tests for filtering and searching patterns. ([54906](https://github.com/WordPress/gutenberg/pull/54906))
-- Add new end-to-end test for creating a pattern. ([54855](https://github.com/WordPress/gutenberg/pull/54855))
-- Include pattern category in main end-to-end critical path test. ([54923](https://github.com/WordPress/gutenberg/pull/54923))
+
+-   Add a new spec for for adding an unsynced pattern. ([54892](https://github.com/WordPress/gutenberg/pull/54892))
+-   Add end-to-end tests for filtering and searching patterns. ([54906](https://github.com/WordPress/gutenberg/pull/54906))
+-   Add new end-to-end test for creating a pattern. ([54855](https://github.com/WordPress/gutenberg/pull/54855))
+-   Include pattern category in main end-to-end critical path test. ([54923](https://github.com/WordPress/gutenberg/pull/54923))
 
 #### Components
-- Consolidate utils to remove `ui/`. ([54922](https://github.com/WordPress/gutenberg/pull/54922))
-- Move `ContextSystemProvider` out of `/ui`. ([54847](https://github.com/WordPress/gutenberg/pull/54847))
-- SlotFill: Migrate to Typescript. ([51350](https://github.com/WordPress/gutenberg/pull/51350))
-- Tidying `CircularOptionPicker.Option`. ([54903](https://github.com/WordPress/gutenberg/pull/54903))
+
+-   Consolidate utils to remove `ui/`. ([54922](https://github.com/WordPress/gutenberg/pull/54922))
+-   Move `ContextSystemProvider` out of `/ui`. ([54847](https://github.com/WordPress/gutenberg/pull/54847))
+-   SlotFill: Migrate to Typescript. ([51350](https://github.com/WordPress/gutenberg/pull/51350))
+-   Tidying `CircularOptionPicker.Option`. ([54903](https://github.com/WordPress/gutenberg/pull/54903))
 
 #### Typography
-- Font Library: Syntax refactor repace strpos with str_contains. ([54832](https://github.com/WordPress/gutenberg/pull/54832))
-- Font Library: Use snake_case instead of camelCase on fontFamilies endpoint param. ([54977](https://github.com/WordPress/gutenberg/pull/54977))
+
+-   Font Library: Syntax refactor repace strpos with str_contains. ([54832](https://github.com/WordPress/gutenberg/pull/54832))
+-   Font Library: Use snake_case instead of camelCase on fontFamilies endpoint param. ([54977](https://github.com/WordPress/gutenberg/pull/54977))
 
 #### Block Editor
-- Rich text: Avoid shortcode logic, adjust paste handler instead. ([55052](https://github.com/WordPress/gutenberg/pull/55052))
+
+-   Rich text: Avoid shortcode logic, adjust paste handler instead. ([55052](https://github.com/WordPress/gutenberg/pull/55052))
 
 #### Plugin
-- Remove legacy logic for '__unstableResolvedAssets' setting. ([54812](https://github.com/WordPress/gutenberg/pull/54812))
+
+-   Remove legacy logic for '\_\_unstableResolvedAssets' setting. ([54812](https://github.com/WordPress/gutenberg/pull/54812))
 
 #### Data Layer
-- createResolversCacheMiddleware: Remove dependency on core/data store. ([54733](https://github.com/WordPress/gutenberg/pull/54733))
+
+-   createResolversCacheMiddleware: Remove dependency on core/data store. ([54733](https://github.com/WordPress/gutenberg/pull/54733))
 
 #### Site Editor
-- Use constants rather than hard coded template strings (round 3). ([54705](https://github.com/WordPress/gutenberg/pull/54705))
 
+-   Use constants rather than hard coded template strings (round 3). ([54705](https://github.com/WordPress/gutenberg/pull/54705))
 
 ### Tools
 
-- Label enforcer workflow: Make accessibility a focus instead of a type. ([54941](https://github.com/WordPress/gutenberg/pull/54941))
-- Scripts: Update webpack and related dependencies to the latest version. ([54657](https://github.com/WordPress/gutenberg/pull/54657))
-- Update changelog automation and test fixtures to match the last a11y label renaming. ([54974](https://github.com/WordPress/gutenberg/pull/54974))
+-   Label enforcer workflow: Make accessibility a focus instead of a type. ([54941](https://github.com/WordPress/gutenberg/pull/54941))
+-   Scripts: Update webpack and related dependencies to the latest version. ([54657](https://github.com/WordPress/gutenberg/pull/54657))
+-   Update changelog automation and test fixtures to match the last a11y label renaming. ([54974](https://github.com/WordPress/gutenberg/pull/54974))
 
 #### Testing
-- Don’t use TypeScript files in scripts package. ([54856](https://github.com/WordPress/gutenberg/pull/54856))
-- ESLint: Update eslint-plugin-testing-library to v6. ([54910](https://github.com/WordPress/gutenberg/pull/54910))
-- Fix end-to-end test: ”WP Editor Meta Boxes > Should save the changes”. ([51884](https://github.com/WordPress/gutenberg/pull/51884))
-- Font Library: Avoid deprected error in test. ([54802](https://github.com/WordPress/gutenberg/pull/54802))
-- Make `editor.getBlocks` to return only testing-related properties. ([54901](https://github.com/WordPress/gutenberg/pull/54901))
-- Migrate 'Global styles sidebar' test to Playwright. ([55045](https://github.com/WordPress/gutenberg/pull/55045))
-- Migrate 'iframed block editor settings styles' tests to Playwright. ([55014](https://github.com/WordPress/gutenberg/pull/55014))
-- Migrate 'iframed inline styles' tests to Playwright. ([55009](https://github.com/WordPress/gutenberg/pull/55009))
-- Migrate 'iframed masonry block' tests to Playwright. ([55016](https://github.com/WordPress/gutenberg/pull/55016))
-- Migrate 'iframed multiple block stylesheets' tests to Playwright. ([55003](https://github.com/WordPress/gutenberg/pull/55003))
-- Migrate keyboard-navigable-blocks end-to-end tests from puppeteer to playwright. ([54944](https://github.com/WordPress/gutenberg/pull/54944))
-- Scripts: Properly use CommonJS for default Playwright configuration. ([54988](https://github.com/WordPress/gutenberg/pull/54988))
-- Try fixing the flaky 'Toolbar roving tabindex' end-to-end test. ([54785](https://github.com/WordPress/gutenberg/pull/54785))
-- end-to-end Tests: Revert temporary fixes. ([54865](https://github.com/WordPress/gutenberg/pull/54865))
-- end-to-end Utils: Allow overriding username/password. ([53267](https://github.com/WordPress/gutenberg/pull/53267))
+
+-   Don’t use TypeScript files in scripts package. ([54856](https://github.com/WordPress/gutenberg/pull/54856))
+-   ESLint: Update eslint-plugin-testing-library to v6. ([54910](https://github.com/WordPress/gutenberg/pull/54910))
+-   Fix end-to-end test: ”WP Editor Meta Boxes > Should save the changes”. ([51884](https://github.com/WordPress/gutenberg/pull/51884))
+-   Font Library: Avoid deprected error in test. ([54802](https://github.com/WordPress/gutenberg/pull/54802))
+-   Make `editor.getBlocks` to return only testing-related properties. ([54901](https://github.com/WordPress/gutenberg/pull/54901))
+-   Migrate 'Global styles sidebar' test to Playwright. ([55045](https://github.com/WordPress/gutenberg/pull/55045))
+-   Migrate 'iframed block editor settings styles' tests to Playwright. ([55014](https://github.com/WordPress/gutenberg/pull/55014))
+-   Migrate 'iframed inline styles' tests to Playwright. ([55009](https://github.com/WordPress/gutenberg/pull/55009))
+-   Migrate 'iframed masonry block' tests to Playwright. ([55016](https://github.com/WordPress/gutenberg/pull/55016))
+-   Migrate 'iframed multiple block stylesheets' tests to Playwright. ([55003](https://github.com/WordPress/gutenberg/pull/55003))
+-   Migrate keyboard-navigable-blocks end-to-end tests from puppeteer to playwright. ([54944](https://github.com/WordPress/gutenberg/pull/54944))
+-   Scripts: Properly use CommonJS for default Playwright configuration. ([54988](https://github.com/WordPress/gutenberg/pull/54988))
+-   Try fixing the flaky 'Toolbar roving tabindex' end-to-end test. ([54785](https://github.com/WordPress/gutenberg/pull/54785))
+-   end-to-end Tests: Revert temporary fixes. ([54865](https://github.com/WordPress/gutenberg/pull/54865))
+-   end-to-end Utils: Allow overriding username/password. ([53267](https://github.com/WordPress/gutenberg/pull/53267))
 
 #### Build Tooling
-- Add some @types packages as proper dependencies. ([50231](https://github.com/WordPress/gutenberg/pull/50231))
-- Update the default JSX pragma to React instead of @wordpress/element. ([54494](https://github.com/WordPress/gutenberg/pull/54494))
-- Upgrade wp-prettier to v3.0.3 (final). ([54775](https://github.com/WordPress/gutenberg/pull/54775))
 
+-   Add some @types packages as proper dependencies. ([50231](https://github.com/WordPress/gutenberg/pull/50231))
+-   Update the default JSX pragma to React instead of @wordpress/element. ([54494](https://github.com/WordPress/gutenberg/pull/54494))
+-   Upgrade wp-prettier to v3.0.3 (final). ([54775](https://github.com/WordPress/gutenberg/pull/54775))
 
 ### Security
 
 #### Data Layer
-- Replace turbo-combine-reducers with combineReducers from Redux. ([54606](https://github.com/WordPress/gutenberg/pull/54606))
 
+-   Replace turbo-combine-reducers with combineReducers from Redux. ([54606](https://github.com/WordPress/gutenberg/pull/54606))
 
 ### Various
 
-- (chore) Revert the 16.7 RC2 release in order to release it again due to wrong changelog. ([54744](https://github.com/WordPress/gutenberg/pull/54744))
+-   (chore) Revert the 16.7 RC2 release in order to release it again due to wrong changelog. ([54744](https://github.com/WordPress/gutenberg/pull/54744))
 
 #### Design Tools
-- Background image block support: Add tests, adjust injection logic slightly. ([54489](https://github.com/WordPress/gutenberg/pull/54489))
-- Background support: Backport fix for undefined array key. ([54850](https://github.com/WordPress/gutenberg/pull/54850))
+
+-   Background image block support: Add tests, adjust injection logic slightly. ([54489](https://github.com/WordPress/gutenberg/pull/54489))
+-   Background support: Backport fix for undefined array key. ([54850](https://github.com/WordPress/gutenberg/pull/54850))
 
 #### Typography
-- Revert "Font Library: Avoid rendering font library ui outisde gutenberg plugin". ([54947](https://github.com/WordPress/gutenberg/pull/54947))
+
+-   Revert "Font Library: Avoid rendering font library ui outisde gutenberg plugin". ([54947](https://github.com/WordPress/gutenberg/pull/54947))
 
 #### Commands
-- Make the reset styles command consistent. ([54841](https://github.com/WordPress/gutenberg/pull/54841))
+
+-   Make the reset styles command consistent. ([54841](https://github.com/WordPress/gutenberg/pull/54841))
 
 #### Patterns
-- Use "Not synced" in place of "Standard" nomenclature for patterns. ([54839](https://github.com/WordPress/gutenberg/pull/54839))
+
+-   Use "Not synced" in place of "Standard" nomenclature for patterns. ([54839](https://github.com/WordPress/gutenberg/pull/54839))
 
 #### Block Editor
-- Simplify BlockPatternsSyncFilter with clearer labels and additional context. ([54838](https://github.com/WordPress/gutenberg/pull/54838))
 
-#### Site Editor
-- Use consistent capitalization for template parts in Site Editor constants. ([54709](https://github.com/WordPress/gutenberg/pull/54709))
+-   Simplify BlockPatternsSyncFilter with clearer labels and additional context. ([54838](https://github.com/WordPress/gutenberg/pull/54838))
 
+#### Site Editor
 
-## First time contributors
+-   Use consistent capitalization for template parts in Site Editor constants. ([54709](https://github.com/WordPress/gutenberg/pull/54709))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @leemyongpakvn: Fix a broken MD link in callout. ([54772](https://github.com/WordPress/gutenberg/pull/54772))
+The following PRs were merged by first-time contributors:
 
+-   @leemyongpakvn: Fix a broken MD link in callout. ([54772](https://github.com/WordPress/gutenberg/pull/54772))
 
 ## Contributors
 
@@ -1611,9 +12249,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamsilverstein @alexstine @andrewhayward @andrewserong @annezazu @anton-vlasenko @artemiomorales @aurooba @bangank36 @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @dcalhoun @derekblank @draganescu @ellatrix @fluiddot @fullofcaffeine @geriux @getdave @glendaviesnz @gziolo @jameskoster @jeryj @jsnajdr @juhi123 @kevin940726 @leemyongpakvn @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @michalczaplinski @mirka @mtias @mujuonly @ndiego @noahtallen @noisysocks @ntsekouras @oandregal @ockham @pbking @priethor @ramonjd @richtabor @scruffian @SiobhyB @spacedmonkey @stokesman @swissspidy @t-hamano @tellthemachines @tellyworth @them-es @torounit @tyxla @westonruter @WunderBart @youknowriad
 
-
-
-
 = 16.7.1 =
 
 ## Changelog
@@ -1621,11 +12256,12 @@ The following contributors merged PRs in this release:
 ### Tools
 
 #### Build Tooling
-- Fix incorrect resource URL in source map for sources coming from @wordpress packages. ([51401](https://github.com/WordPress/gutenberg/pull/51401))
+
+-   Fix incorrect resource URL in source map for sources coming from @wordpress packages. ([51401](https://github.com/WordPress/gutenberg/pull/51401))
 
 ### Various
 
-- Add missing schema `type` attribute for in WP 6.4 compat's `block-hooks.php`. ([55138](https://github.com/WordPress/gutenberg/pull/55138))
+-   Add missing schema `type` attribute for in WP 6.4 compat's `block-hooks.php`. ([55138](https://github.com/WordPress/gutenberg/pull/55138))
 
 ## Contributors
 
@@ -1633,7 +12269,6 @@ The following contributors merged PRs in this release:
 
 @fullofcaffeine @torounit
 
-
 = 16.8.0-rc.1 =
 
 ## Changelog
@@ -1641,277 +12276,308 @@ The following contributors merged PRs in this release:
 ### Features
 
 #### Block Editor
-- Adds 'nofollow' setting to Button block. ([54110](https://github.com/WordPress/gutenberg/pull/54110))
+
+-   Adds 'nofollow' setting to Button block. ([54110](https://github.com/WordPress/gutenberg/pull/54110))
 
 #### Site Editor
-- Add 'Show template' toggle when editing pages. ([52674](https://github.com/WordPress/gutenberg/pull/52674))
 
+-   Add 'Show template' toggle when editing pages. ([52674](https://github.com/WordPress/gutenberg/pull/52674))
 
 ### Enhancements
 
-- Update pattern import menu item. ([54782](https://github.com/WordPress/gutenberg/pull/54782))
+-   Update pattern import menu item. ([54782](https://github.com/WordPress/gutenberg/pull/54782))
 
 #### Components
-- Adding label/description to `BlockEditor/DuotoneControl`. ([54473](https://github.com/WordPress/gutenberg/pull/54473))
-- Deprecating `isPressed` in `Button` component. ([54740](https://github.com/WordPress/gutenberg/pull/54740))
-- Follow ariakit best practices. ([54696](https://github.com/WordPress/gutenberg/pull/54696))
-- InputControl-based components: Add opt-in prop for next 40px default size. ([53819](https://github.com/WordPress/gutenberg/pull/53819))
-- Modal: Add `contentWidth` prop to support a selection of preset modal sizes. ([54471](https://github.com/WordPress/gutenberg/pull/54471))
-- Remove unused components from `ui/`. ([54573](https://github.com/WordPress/gutenberg/pull/54573))
-- Update ariakit to 0.3.3. ([54818](https://github.com/WordPress/gutenberg/pull/54818))
-- Update compact search control metrics. ([54663](https://github.com/WordPress/gutenberg/pull/54663))
-- Wrapped `TextareaControl` in a `forwardRef` call. ([54975](https://github.com/WordPress/gutenberg/pull/54975))
+
+-   Adding label/description to `BlockEditor/DuotoneControl`. ([54473](https://github.com/WordPress/gutenberg/pull/54473))
+-   Deprecating `isPressed` in `Button` component. ([54740](https://github.com/WordPress/gutenberg/pull/54740))
+-   Follow ariakit best practices. ([54696](https://github.com/WordPress/gutenberg/pull/54696))
+-   InputControl-based components: Add opt-in prop for next 40px default size. ([53819](https://github.com/WordPress/gutenberg/pull/53819))
+-   Modal: Add `contentWidth` prop to support a selection of preset modal sizes. ([54471](https://github.com/WordPress/gutenberg/pull/54471))
+-   Remove unused components from `ui/`. ([54573](https://github.com/WordPress/gutenberg/pull/54573))
+-   Update ariakit to 0.3.3. ([54818](https://github.com/WordPress/gutenberg/pull/54818))
+-   Update compact search control metrics. ([54663](https://github.com/WordPress/gutenberg/pull/54663))
+-   Wrapped `TextareaControl` in a `forwardRef` call. ([54975](https://github.com/WordPress/gutenberg/pull/54975))
 
 #### Block Library
-- Add a brief description to the Footnotes block. ([54613](https://github.com/WordPress/gutenberg/pull/54613))
-- Footnotes: Use core’s meta revisioning if available. ([52988](https://github.com/WordPress/gutenberg/pull/52988))
-- Login/out: Add spacing support. ([45147](https://github.com/WordPress/gutenberg/pull/45147))
-- Query view.js: Code quality. ([54982](https://github.com/WordPress/gutenberg/pull/54982))
-- Set custom color when applying initial background image. ([54054](https://github.com/WordPress/gutenberg/pull/54054))
-- Use `wp_get_inline_script_tag()` in `build_dropdown_script_block_core_categories()`. ([54637](https://github.com/WordPress/gutenberg/pull/54637))
+
+-   Add a brief description to the Footnotes block. ([54613](https://github.com/WordPress/gutenberg/pull/54613))
+-   Footnotes: Use core’s meta revisioning if available. ([52988](https://github.com/WordPress/gutenberg/pull/52988))
+-   Login/out: Add spacing support. ([45147](https://github.com/WordPress/gutenberg/pull/45147))
+-   Query view.js: Code quality. ([54982](https://github.com/WordPress/gutenberg/pull/54982))
+-   Set custom color when applying initial background image. ([54054](https://github.com/WordPress/gutenberg/pull/54054))
+-   Use `wp_get_inline_script_tag()` in `build_dropdown_script_block_core_categories()`. ([54637](https://github.com/WordPress/gutenberg/pull/54637))
 
 #### Block Editor
-- Default suggested links to pages. ([54622](https://github.com/WordPress/gutenberg/pull/54622))
-- Remove base URL from link control search results. ([54553](https://github.com/WordPress/gutenberg/pull/54553))
-- Simplify `BlockHTMLConvertButton`. ([54972](https://github.com/WordPress/gutenberg/pull/54972))
-- Update strings in blocks 'RenameModal' component. ([54887](https://github.com/WordPress/gutenberg/pull/54887))
+
+-   Default suggested links to pages. ([54622](https://github.com/WordPress/gutenberg/pull/54622))
+-   Remove base URL from link control search results. ([54553](https://github.com/WordPress/gutenberg/pull/54553))
+-   Simplify `BlockHTMLConvertButton`. ([54972](https://github.com/WordPress/gutenberg/pull/54972))
+-   Update strings in blocks 'RenameModal' component. ([54887](https://github.com/WordPress/gutenberg/pull/54887))
 
 #### Post Editor
-- Edit Post: Use hooks instead of HoCs in 'PostStatus' components. ([54951](https://github.com/WordPress/gutenberg/pull/54951))
-- Editor: Use hooks instead of HoCs in 'PostSticky' components. ([54949](https://github.com/WordPress/gutenberg/pull/54949))
-- Editor: Use hooks instead of HoCs in 'PostSwitchToDraftButton'. ([54695](https://github.com/WordPress/gutenberg/pull/54695))
-- Show confirmation dialog when moving a post to the trash. ([50219](https://github.com/WordPress/gutenberg/pull/50219))
+
+-   Edit Post: Use hooks instead of HoCs in 'PostStatus' components. ([54951](https://github.com/WordPress/gutenberg/pull/54951))
+-   Editor: Use hooks instead of HoCs in 'PostSticky' components. ([54949](https://github.com/WordPress/gutenberg/pull/54949))
+-   Editor: Use hooks instead of HoCs in 'PostSwitchToDraftButton'. ([54695](https://github.com/WordPress/gutenberg/pull/54695))
+-   Show confirmation dialog when moving a post to the trash. ([50219](https://github.com/WordPress/gutenberg/pull/50219))
 
 #### Site Editor
-- Add template replace flow to template inspector. ([54609](https://github.com/WordPress/gutenberg/pull/54609))
-- [Site Editor]: Update copy of using  the default template in a page. ([54728](https://github.com/WordPress/gutenberg/pull/54728))
+
+-   Add template replace flow to template inspector. ([54609](https://github.com/WordPress/gutenberg/pull/54609))
+-   [Site Editor]: Update copy of using the default template in a page. ([54728](https://github.com/WordPress/gutenberg/pull/54728))
 
 #### Patterns
-- Remove category description in inserter panel. ([54894](https://github.com/WordPress/gutenberg/pull/54894))
+
+-   Remove category description in inserter panel. ([54894](https://github.com/WordPress/gutenberg/pull/54894))
 
 #### Typography
-- Font Library: Refactor endpoint permissions. ([54829](https://github.com/WordPress/gutenberg/pull/54829))
 
+-   Font Library: Refactor endpoint permissions. ([54829](https://github.com/WordPress/gutenberg/pull/54829))
 
 ### Bug Fixes
 
-- Fix the ShortcutProvider usage. ([54851](https://github.com/WordPress/gutenberg/pull/54851))
-- Fix warning when a template calls a template area twice. ([54861](https://github.com/WordPress/gutenberg/pull/54861))
-- Revert "Fix warning when a template calls a template area twice". ([54926](https://github.com/WordPress/gutenberg/pull/54926))
+-   Fix the ShortcutProvider usage. ([54851](https://github.com/WordPress/gutenberg/pull/54851))
+-   Fix warning when a template calls a template area twice. ([54861](https://github.com/WordPress/gutenberg/pull/54861))
+-   Revert "Fix warning when a template calls a template area twice". ([54926](https://github.com/WordPress/gutenberg/pull/54926))
 
 #### Block Library
-- All Nav block items to break long titles. ([54866](https://github.com/WordPress/gutenberg/pull/54866))
-- Fallback to Twitter provider when embedding X URLs. ([54876](https://github.com/WordPress/gutenberg/pull/54876))
-- Fix Deleted Navigation Menu warning string. ([55033](https://github.com/WordPress/gutenberg/pull/55033))
-- Fix Search Block not updating in Nav block. ([54823](https://github.com/WordPress/gutenberg/pull/54823))
-- Fix left and right aligmnent in children of Post Template. ([54997](https://github.com/WordPress/gutenberg/pull/54997))
-- Fix output of Navigation block classnames in the editor. ([54992](https://github.com/WordPress/gutenberg/pull/54992))
-- Fix overwriting of published post meta when previewing footnote changes. ([54339](https://github.com/WordPress/gutenberg/pull/54339))
-- Image: Ensure Expand on Click toggle is shown if block-level lightbox setting exists. ([54878](https://github.com/WordPress/gutenberg/pull/54878))
-- Image: Fix layout shift when lightbox is opened and closed. ([53026](https://github.com/WordPress/gutenberg/pull/53026))
-- Media & Text: Fix React warning. ([55038](https://github.com/WordPress/gutenberg/pull/55038))
-- Search block: Allow space for input field only when form expanded. ([54846](https://github.com/WordPress/gutenberg/pull/54846))
-- Search block: Update alignment and icon button width. ([54773](https://github.com/WordPress/gutenberg/pull/54773))
+
+-   All Nav block items to break long titles. ([54866](https://github.com/WordPress/gutenberg/pull/54866))
+-   Fallback to Twitter provider when embedding X URLs. ([54876](https://github.com/WordPress/gutenberg/pull/54876))
+-   Fix Deleted Navigation Menu warning string. ([55033](https://github.com/WordPress/gutenberg/pull/55033))
+-   Fix Search Block not updating in Nav block. ([54823](https://github.com/WordPress/gutenberg/pull/54823))
+-   Fix left and right aligmnent in children of Post Template. ([54997](https://github.com/WordPress/gutenberg/pull/54997))
+-   Fix output of Navigation block classnames in the editor. ([54992](https://github.com/WordPress/gutenberg/pull/54992))
+-   Fix overwriting of published post meta when previewing footnote changes. ([54339](https://github.com/WordPress/gutenberg/pull/54339))
+-   Image: Ensure Expand on Click toggle is shown if block-level lightbox setting exists. ([54878](https://github.com/WordPress/gutenberg/pull/54878))
+-   Image: Fix layout shift when lightbox is opened and closed. ([53026](https://github.com/WordPress/gutenberg/pull/53026))
+-   Media & Text: Fix React warning. ([55038](https://github.com/WordPress/gutenberg/pull/55038))
+-   Search block: Allow space for input field only when form expanded. ([54846](https://github.com/WordPress/gutenberg/pull/54846))
+-   Search block: Update alignment and icon button width. ([54773](https://github.com/WordPress/gutenberg/pull/54773))
 
 #### Site Editor
-- Avoid same key warnings in template parts area listings. ([54863](https://github.com/WordPress/gutenberg/pull/54863))
-- Avoid stale navigation block values when parsing entity record. ([54996](https://github.com/WordPress/gutenberg/pull/54996))
-- Don't display the navigation section in template parts details when a menu is missing. ([54993](https://github.com/WordPress/gutenberg/pull/54993))
-- Fix ToolSelector popover variant. ([54840](https://github.com/WordPress/gutenberg/pull/54840))
-- Reset 'Show template' toggle when leaving edit mode. ([54679](https://github.com/WordPress/gutenberg/pull/54679))
-- remove `overflow: Hidden` from the entity title in the site editor sidebar. ([54769](https://github.com/WordPress/gutenberg/pull/54769))
+
+-   Avoid same key warnings in template parts area listings. ([54863](https://github.com/WordPress/gutenberg/pull/54863))
+-   Avoid stale navigation block values when parsing entity record. ([54996](https://github.com/WordPress/gutenberg/pull/54996))
+-   Don't display the navigation section in template parts details when a menu is missing. ([54993](https://github.com/WordPress/gutenberg/pull/54993))
+-   Fix ToolSelector popover variant. ([54840](https://github.com/WordPress/gutenberg/pull/54840))
+-   Reset 'Show template' toggle when leaving edit mode. ([54679](https://github.com/WordPress/gutenberg/pull/54679))
+-   remove `overflow: Hidden` from the entity title in the site editor sidebar. ([54769](https://github.com/WordPress/gutenberg/pull/54769))
 
 #### Components
-- FormTokenField: Add `box-sizing` reset style and reset default padding. ([54734](https://github.com/WordPress/gutenberg/pull/54734))
-- Popover: Fix the styles for components that use emotion within popovers. ([54912](https://github.com/WordPress/gutenberg/pull/54912))
-- Remove hover style for secondary Button when aria-disabled is set. ([54978](https://github.com/WordPress/gutenberg/pull/54978))
-- Reverting addition of `aria-selected` style hook in `Button`. ([54931](https://github.com/WordPress/gutenberg/pull/54931))
-- `SlotFill`: Pass `Component` instance to unregisterSlot. ([54765](https://github.com/WordPress/gutenberg/pull/54765))
+
+-   FormTokenField: Add `box-sizing` reset style and reset default padding. ([54734](https://github.com/WordPress/gutenberg/pull/54734))
+-   Popover: Fix the styles for components that use emotion within popovers. ([54912](https://github.com/WordPress/gutenberg/pull/54912))
+-   Remove hover style for secondary Button when aria-disabled is set. ([54978](https://github.com/WordPress/gutenberg/pull/54978))
+-   Reverting addition of `aria-selected` style hook in `Button`. ([54931](https://github.com/WordPress/gutenberg/pull/54931))
+-   `SlotFill`: Pass `Component` instance to unregisterSlot. ([54765](https://github.com/WordPress/gutenberg/pull/54765))
 
 #### Block Editor
-- Avoid double-wrapping selectors when transforming the styles. ([54981](https://github.com/WordPress/gutenberg/pull/54981))
-- [Inserter]: Fix reset of registered media categories. ([55012](https://github.com/WordPress/gutenberg/pull/55012))
+
+-   Avoid double-wrapping selectors when transforming the styles. ([54981](https://github.com/WordPress/gutenberg/pull/54981))
+-   [Inserter]: Fix reset of registered media categories. ([55012](https://github.com/WordPress/gutenberg/pull/55012))
 
 #### Typography
-- Font Library: Changed the OTF mime type expected value to be what PHP returns. ([54886](https://github.com/WordPress/gutenberg/pull/54886))
-- Font Library: Move font uploads to a new tab. ([54655](https://github.com/WordPress/gutenberg/pull/54655))
+
+-   Font Library: Changed the OTF mime type expected value to be what PHP returns. ([54886](https://github.com/WordPress/gutenberg/pull/54886))
+-   Font Library: Move font uploads to a new tab. ([54655](https://github.com/WordPress/gutenberg/pull/54655))
 
 #### Global Styles
-- Block custom CSS: Fix incorrect CSS when multiple root selectors. ([53602](https://github.com/WordPress/gutenberg/pull/53602))
-- Image: Ensure `false` values are preserved in memory when defined in `theme.json`. ([54639](https://github.com/WordPress/gutenberg/pull/54639))
+
+-   Block custom CSS: Fix incorrect CSS when multiple root selectors. ([53602](https://github.com/WordPress/gutenberg/pull/53602))
+-   Image: Ensure `false` values are preserved in memory when defined in `theme.json`. ([54639](https://github.com/WordPress/gutenberg/pull/54639))
 
 #### List View
-- Fix performance issue when selecting all blocks. ([54900](https://github.com/WordPress/gutenberg/pull/54900))
+
+-   Fix performance issue when selecting all blocks. ([54900](https://github.com/WordPress/gutenberg/pull/54900))
 
 #### Colors
-- Format Library: Try to fix highlight popover jumping. ([54736](https://github.com/WordPress/gutenberg/pull/54736))
+
+-   Format Library: Try to fix highlight popover jumping. ([54736](https://github.com/WordPress/gutenberg/pull/54736))
 
 #### Interactivity API
-- Image: Fix duotone not being applied to lightbox image. ([54670](https://github.com/WordPress/gutenberg/pull/54670))
 
+-   Image: Fix duotone not being applied to lightbox image. ([54670](https://github.com/WordPress/gutenberg/pull/54670))
 
 ### Accessibility
 
 #### Block Library
-- Footnotes: Add aria-label to return links. ([54843](https://github.com/WordPress/gutenberg/pull/54843))
-- Table of contents block accessibility improvements. ([54322](https://github.com/WordPress/gutenberg/pull/54322))
+
+-   Footnotes: Add aria-label to return links. ([54843](https://github.com/WordPress/gutenberg/pull/54843))
+-   Table of contents block accessibility improvements. ([54322](https://github.com/WordPress/gutenberg/pull/54322))
 
 #### Components
-- HTML block: Fix accessibility issues on back-end. ([54408](https://github.com/WordPress/gutenberg/pull/54408))
-- `Modal`: Accessibly hide/show outer modal when nested. ([54743](https://github.com/WordPress/gutenberg/pull/54743))
+
+-   HTML block: Fix accessibility issues on back-end. ([54408](https://github.com/WordPress/gutenberg/pull/54408))
+-   `Modal`: Accessibly hide/show outer modal when nested. ([54743](https://github.com/WordPress/gutenberg/pull/54743))
 
 #### Patterns
-- Use list role instead of listbox in patterns list. ([54884](https://github.com/WordPress/gutenberg/pull/54884))
+
+-   Use list role instead of listbox in patterns list. ([54884](https://github.com/WordPress/gutenberg/pull/54884))
 
 #### Post Editor
-- Editor: Always render the 'Switch to Draft' button to avoid focus loss. ([54722](https://github.com/WordPress/gutenberg/pull/54722))
+
+-   Editor: Always render the 'Switch to Draft' button to avoid focus loss. ([54722](https://github.com/WordPress/gutenberg/pull/54722))
 
 #### Block Editor
-- Block Switcher: Use a different label for multi-selection. ([54692](https://github.com/WordPress/gutenberg/pull/54692))
 
+-   Block Switcher: Use a different label for multi-selection. ([54692](https://github.com/WordPress/gutenberg/pull/54692))
 
 ### Performance
 
-- Tests: Support the Site Editor's legacy spinner. ([54784](https://github.com/WordPress/gutenberg/pull/54784))
-- Use instanceOf over property_exists. ([54835](https://github.com/WordPress/gutenberg/pull/54835))
+-   Tests: Support the Site Editor's legacy spinner. ([54784](https://github.com/WordPress/gutenberg/pull/54784))
+-   Use instanceOf over property_exists. ([54835](https://github.com/WordPress/gutenberg/pull/54835))
 
 #### Block Editor
-- Subscribe only to block editor store in `useBlockSync`. ([55041](https://github.com/WordPress/gutenberg/pull/55041))
 
+-   Subscribe only to block editor store in `useBlockSync`. ([55041](https://github.com/WordPress/gutenberg/pull/55041))
 
 ### Experiments
 
 #### Site Editor
-- al]: First version of pages list in site editor. ([54966](https://github.com/WordPress/gutenberg/pull/54966))
+
+-   al]: First version of pages list in site editor. ([54966](https://github.com/WordPress/gutenberg/pull/54966))
 
 #### Block Editor
-- Expose `getDuotoneFilter()` as private API. ([54905](https://github.com/WordPress/gutenberg/pull/54905))
 
+-   Expose `getDuotoneFilter()` as private API. ([54905](https://github.com/WordPress/gutenberg/pull/54905))
 
 ### Documentation
 
-- Add a documentation page about the block editor settings. ([54870](https://github.com/WordPress/gutenberg/pull/54870))
-- Add a page about the format library to the platform documentation site. ([55037](https://github.com/WordPress/gutenberg/pull/55037))
-- Docs: Add a callout to the `wp-now` documentation to mention it's still experimental. ([55044](https://github.com/WordPress/gutenberg/pull/55044))
-- Docs: Remove outdated info. ([54707](https://github.com/WordPress/gutenberg/pull/54707))
-- Docs: Remove the Full Site Editing doc. ([54516](https://github.com/WordPress/gutenberg/pull/54516))
-- Docs: Rename Block Hooks handbook page to Block Filters. ([54862](https://github.com/WordPress/gutenberg/pull/54862))
-- Document the current state of the Real-Time collaboration experiment. ([54932](https://github.com/WordPress/gutenberg/pull/54932))
-- Fix a broken MD link in callout. ([54772](https://github.com/WordPress/gutenberg/pull/54772))
-- Platform Docs: Add a documentation page explaining how to use the block library. ([54967](https://github.com/WordPress/gutenberg/pull/54967))
-- Update the documentation of the block editor and replace @wordpress/element with react. ([54908](https://github.com/WordPress/gutenberg/pull/54908))
-- Update versions in WP for 6.4. ([54890](https://github.com/WordPress/gutenberg/pull/54890))
-
+-   Add a documentation page about the block editor settings. ([54870](https://github.com/WordPress/gutenberg/pull/54870))
+-   Add a page about the format library to the platform documentation site. ([55037](https://github.com/WordPress/gutenberg/pull/55037))
+-   Docs: Add a callout to the `wp-now` documentation to mention it's still experimental. ([55044](https://github.com/WordPress/gutenberg/pull/55044))
+-   Docs: Remove outdated info. ([54707](https://github.com/WordPress/gutenberg/pull/54707))
+-   Docs: Remove the Full Site Editing doc. ([54516](https://github.com/WordPress/gutenberg/pull/54516))
+-   Docs: Rename Block Hooks handbook page to Block Filters. ([54862](https://github.com/WordPress/gutenberg/pull/54862))
+-   Document the current state of the Real-Time collaboration experiment. ([54932](https://github.com/WordPress/gutenberg/pull/54932))
+-   Fix a broken MD link in callout. ([54772](https://github.com/WordPress/gutenberg/pull/54772))
+-   Platform Docs: Add a documentation page explaining how to use the block library. ([54967](https://github.com/WordPress/gutenberg/pull/54967))
+-   Update the documentation of the block editor and replace @wordpress/element with react. ([54908](https://github.com/WordPress/gutenberg/pull/54908))
+-   Update versions in WP for 6.4. ([54890](https://github.com/WordPress/gutenberg/pull/54890))
 
 ### Code Quality
 
-- Add a unit test for the "ValidBlockLibraryFunctionNameSniff" sniff. ([53928](https://github.com/WordPress/gutenberg/pull/53928))
-- Move dependencies to the right place. ([54597](https://github.com/WordPress/gutenberg/pull/54597))
-- Move mime-type collection generation to a function that can be tested…. ([54844](https://github.com/WordPress/gutenberg/pull/54844))
-- Post Title block should use esc_url(). ([53981](https://github.com/WordPress/gutenberg/pull/53981))
-- Rich text: Use getPasteEventData. ([55048](https://github.com/WordPress/gutenberg/pull/55048))
-- Writing flow: Absorb clipboard handler. ([55006](https://github.com/WordPress/gutenberg/pull/55006))
+-   Add a unit test for the "ValidBlockLibraryFunctionNameSniff" sniff. ([53928](https://github.com/WordPress/gutenberg/pull/53928))
+-   Move dependencies to the right place. ([54597](https://github.com/WordPress/gutenberg/pull/54597))
+-   Move mime-type collection generation to a function that can be tested…. ([54844](https://github.com/WordPress/gutenberg/pull/54844))
+-   Post Title block should use esc_url(). ([53981](https://github.com/WordPress/gutenberg/pull/53981))
+-   Rich text: Use getPasteEventData. ([55048](https://github.com/WordPress/gutenberg/pull/55048))
+-   Writing flow: Absorb clipboard handler. ([55006](https://github.com/WordPress/gutenberg/pull/55006))
 
 #### Block Library
-- Footnotes: Avoid regexes in entity provider. ([54505](https://github.com/WordPress/gutenberg/pull/54505))
-- Image Block: Fix browser console error when clicking "Expand on Click". ([54938](https://github.com/WordPress/gutenberg/pull/54938))
-- Removed unwanted space from the string. ([54654](https://github.com/WordPress/gutenberg/pull/54654))
-- Update CODEOWNERS for `core/image` block. ([54793](https://github.com/WordPress/gutenberg/pull/54793))
+
+-   Footnotes: Avoid regexes in entity provider. ([54505](https://github.com/WordPress/gutenberg/pull/54505))
+-   Image Block: Fix browser console error when clicking "Expand on Click". ([54938](https://github.com/WordPress/gutenberg/pull/54938))
+-   Removed unwanted space from the string. ([54654](https://github.com/WordPress/gutenberg/pull/54654))
+-   Update CODEOWNERS for `core/image` block. ([54793](https://github.com/WordPress/gutenberg/pull/54793))
 
 #### Patterns
-- Add a new spec for for adding an unsynced pattern. ([54892](https://github.com/WordPress/gutenberg/pull/54892))
-- Add end-to-end tests for filtering and searching patterns. ([54906](https://github.com/WordPress/gutenberg/pull/54906))
-- Add new end-to-end test for creating a pattern. ([54855](https://github.com/WordPress/gutenberg/pull/54855))
-- Include pattern category in main end-to-end critical path test. ([54923](https://github.com/WordPress/gutenberg/pull/54923))
+
+-   Add a new spec for for adding an unsynced pattern. ([54892](https://github.com/WordPress/gutenberg/pull/54892))
+-   Add end-to-end tests for filtering and searching patterns. ([54906](https://github.com/WordPress/gutenberg/pull/54906))
+-   Add new end-to-end test for creating a pattern. ([54855](https://github.com/WordPress/gutenberg/pull/54855))
+-   Include pattern category in main end-to-end critical path test. ([54923](https://github.com/WordPress/gutenberg/pull/54923))
 
 #### Components
-- Consolidate utils to remove `ui/`. ([54922](https://github.com/WordPress/gutenberg/pull/54922))
-- Move `ContextSystemProvider` out of `/ui`. ([54847](https://github.com/WordPress/gutenberg/pull/54847))
-- SlotFill: Migrate to Typescript. ([51350](https://github.com/WordPress/gutenberg/pull/51350))
-- Tidying `CircularOptionPicker.Option`. ([54903](https://github.com/WordPress/gutenberg/pull/54903))
+
+-   Consolidate utils to remove `ui/`. ([54922](https://github.com/WordPress/gutenberg/pull/54922))
+-   Move `ContextSystemProvider` out of `/ui`. ([54847](https://github.com/WordPress/gutenberg/pull/54847))
+-   SlotFill: Migrate to Typescript. ([51350](https://github.com/WordPress/gutenberg/pull/51350))
+-   Tidying `CircularOptionPicker.Option`. ([54903](https://github.com/WordPress/gutenberg/pull/54903))
 
 #### Typography
-- Font Library: Syntax refactor repace strpos with str_contains. ([54832](https://github.com/WordPress/gutenberg/pull/54832))
-- Font Library: Use snake_case instead of camelCase on fontFamilies endpoint param. ([54977](https://github.com/WordPress/gutenberg/pull/54977))
+
+-   Font Library: Syntax refactor repace strpos with str_contains. ([54832](https://github.com/WordPress/gutenberg/pull/54832))
+-   Font Library: Use snake_case instead of camelCase on fontFamilies endpoint param. ([54977](https://github.com/WordPress/gutenberg/pull/54977))
 
 #### Block Editor
-- Rich text: Avoid shortcode logic, adjust paste handler instead. ([55052](https://github.com/WordPress/gutenberg/pull/55052))
+
+-   Rich text: Avoid shortcode logic, adjust paste handler instead. ([55052](https://github.com/WordPress/gutenberg/pull/55052))
 
 #### Plugin
-- Remove legacy logic for '__unstableResolvedAssets' setting. ([54812](https://github.com/WordPress/gutenberg/pull/54812))
+
+-   Remove legacy logic for '\_\_unstableResolvedAssets' setting. ([54812](https://github.com/WordPress/gutenberg/pull/54812))
 
 #### Data Layer
-- createResolversCacheMiddleware: Remove dependency on core/data store. ([54733](https://github.com/WordPress/gutenberg/pull/54733))
+
+-   createResolversCacheMiddleware: Remove dependency on core/data store. ([54733](https://github.com/WordPress/gutenberg/pull/54733))
 
 #### Site Editor
-- Use constants rather than hard coded template strings (round 3). ([54705](https://github.com/WordPress/gutenberg/pull/54705))
 
+-   Use constants rather than hard coded template strings (round 3). ([54705](https://github.com/WordPress/gutenberg/pull/54705))
 
 ### Tools
 
-- Label enforcer workflow: Make accessibility a focus instead of a type. ([54941](https://github.com/WordPress/gutenberg/pull/54941))
-- Scripts: Update webpack and related dependencies to the latest version. ([54657](https://github.com/WordPress/gutenberg/pull/54657))
-- Update changelog automation and test fixtures to match the last a11y label renaming. ([54974](https://github.com/WordPress/gutenberg/pull/54974))
+-   Label enforcer workflow: Make accessibility a focus instead of a type. ([54941](https://github.com/WordPress/gutenberg/pull/54941))
+-   Scripts: Update webpack and related dependencies to the latest version. ([54657](https://github.com/WordPress/gutenberg/pull/54657))
+-   Update changelog automation and test fixtures to match the last a11y label renaming. ([54974](https://github.com/WordPress/gutenberg/pull/54974))
 
 #### Testing
-- Don’t use TypeScript files in scripts package. ([54856](https://github.com/WordPress/gutenberg/pull/54856))
-- ESLint: Update eslint-plugin-testing-library to v6. ([54910](https://github.com/WordPress/gutenberg/pull/54910))
-- Fix end-to-end test: ”WP Editor Meta Boxes > Should save the changes”. ([51884](https://github.com/WordPress/gutenberg/pull/51884))
-- Font Library: Avoid deprected error in test. ([54802](https://github.com/WordPress/gutenberg/pull/54802))
-- Make `editor.getBlocks` to return only testing-related properties. ([54901](https://github.com/WordPress/gutenberg/pull/54901))
-- Migrate 'Global styles sidebar' test to Playwright. ([55045](https://github.com/WordPress/gutenberg/pull/55045))
-- Migrate 'iframed block editor settings styles' tests to Playwright. ([55014](https://github.com/WordPress/gutenberg/pull/55014))
-- Migrate 'iframed inline styles' tests to Playwright. ([55009](https://github.com/WordPress/gutenberg/pull/55009))
-- Migrate 'iframed masonry block' tests to Playwright. ([55016](https://github.com/WordPress/gutenberg/pull/55016))
-- Migrate 'iframed multiple block stylesheets' tests to Playwright. ([55003](https://github.com/WordPress/gutenberg/pull/55003))
-- Migrate keyboard-navigable-blocks end-to-end tests from puppeteer to playwright. ([54944](https://github.com/WordPress/gutenberg/pull/54944))
-- Scripts: Properly use CommonJS for default Playwright configuration. ([54988](https://github.com/WordPress/gutenberg/pull/54988))
-- Try fixing the flaky 'Toolbar roving tabindex' end-to-end test. ([54785](https://github.com/WordPress/gutenberg/pull/54785))
-- end-to-end Tests: Revert temporary fixes. ([54865](https://github.com/WordPress/gutenberg/pull/54865))
-- end-to-end Utils: Allow overriding username/password. ([53267](https://github.com/WordPress/gutenberg/pull/53267))
+
+-   Don’t use TypeScript files in scripts package. ([54856](https://github.com/WordPress/gutenberg/pull/54856))
+-   ESLint: Update eslint-plugin-testing-library to v6. ([54910](https://github.com/WordPress/gutenberg/pull/54910))
+-   Fix end-to-end test: ”WP Editor Meta Boxes > Should save the changes”. ([51884](https://github.com/WordPress/gutenberg/pull/51884))
+-   Font Library: Avoid deprected error in test. ([54802](https://github.com/WordPress/gutenberg/pull/54802))
+-   Make `editor.getBlocks` to return only testing-related properties. ([54901](https://github.com/WordPress/gutenberg/pull/54901))
+-   Migrate 'Global styles sidebar' test to Playwright. ([55045](https://github.com/WordPress/gutenberg/pull/55045))
+-   Migrate 'iframed block editor settings styles' tests to Playwright. ([55014](https://github.com/WordPress/gutenberg/pull/55014))
+-   Migrate 'iframed inline styles' tests to Playwright. ([55009](https://github.com/WordPress/gutenberg/pull/55009))
+-   Migrate 'iframed masonry block' tests to Playwright. ([55016](https://github.com/WordPress/gutenberg/pull/55016))
+-   Migrate 'iframed multiple block stylesheets' tests to Playwright. ([55003](https://github.com/WordPress/gutenberg/pull/55003))
+-   Migrate keyboard-navigable-blocks end-to-end tests from puppeteer to playwright. ([54944](https://github.com/WordPress/gutenberg/pull/54944))
+-   Scripts: Properly use CommonJS for default Playwright configuration. ([54988](https://github.com/WordPress/gutenberg/pull/54988))
+-   Try fixing the flaky 'Toolbar roving tabindex' end-to-end test. ([54785](https://github.com/WordPress/gutenberg/pull/54785))
+-   end-to-end Tests: Revert temporary fixes. ([54865](https://github.com/WordPress/gutenberg/pull/54865))
+-   end-to-end Utils: Allow overriding username/password. ([53267](https://github.com/WordPress/gutenberg/pull/53267))
 
 #### Build Tooling
-- Add some @types packages as proper dependencies. ([50231](https://github.com/WordPress/gutenberg/pull/50231))
-- Update the default JSX pragma to React instead of @wordpress/element. ([54494](https://github.com/WordPress/gutenberg/pull/54494))
-- Upgrade wp-prettier to v3.0.3 (final). ([54775](https://github.com/WordPress/gutenberg/pull/54775))
 
+-   Add some @types packages as proper dependencies. ([50231](https://github.com/WordPress/gutenberg/pull/50231))
+-   Update the default JSX pragma to React instead of @wordpress/element. ([54494](https://github.com/WordPress/gutenberg/pull/54494))
+-   Upgrade wp-prettier to v3.0.3 (final). ([54775](https://github.com/WordPress/gutenberg/pull/54775))
 
 ### Security
 
 #### Data Layer
-- Replace turbo-combine-reducers with combineReducers from Redux. ([54606](https://github.com/WordPress/gutenberg/pull/54606))
 
+-   Replace turbo-combine-reducers with combineReducers from Redux. ([54606](https://github.com/WordPress/gutenberg/pull/54606))
 
 ### Various
 
-- (chore) Revert the 16.7 RC2 release in order to release it again due to wrong changelog. ([54744](https://github.com/WordPress/gutenberg/pull/54744))
+-   (chore) Revert the 16.7 RC2 release in order to release it again due to wrong changelog. ([54744](https://github.com/WordPress/gutenberg/pull/54744))
 
 #### Design Tools
-- Background image block support: Add tests, adjust injection logic slightly. ([54489](https://github.com/WordPress/gutenberg/pull/54489))
-- Background support: Backport fix for undefined array key. ([54850](https://github.com/WordPress/gutenberg/pull/54850))
+
+-   Background image block support: Add tests, adjust injection logic slightly. ([54489](https://github.com/WordPress/gutenberg/pull/54489))
+-   Background support: Backport fix for undefined array key. ([54850](https://github.com/WordPress/gutenberg/pull/54850))
 
 #### Typography
-- Revert "Font Library: Avoid rendering font library ui outisde gutenberg plugin". ([54947](https://github.com/WordPress/gutenberg/pull/54947))
+
+-   Revert "Font Library: Avoid rendering font library ui outisde gutenberg plugin". ([54947](https://github.com/WordPress/gutenberg/pull/54947))
 
 #### Commands
-- Make the reset styles command consistent. ([54841](https://github.com/WordPress/gutenberg/pull/54841))
+
+-   Make the reset styles command consistent. ([54841](https://github.com/WordPress/gutenberg/pull/54841))
 
 #### Patterns
-- Use "Not synced" in place of "Standard" nomenclature for patterns. ([54839](https://github.com/WordPress/gutenberg/pull/54839))
+
+-   Use "Not synced" in place of "Standard" nomenclature for patterns. ([54839](https://github.com/WordPress/gutenberg/pull/54839))
 
 #### Block Editor
-- Simplify BlockPatternsSyncFilter with clearer labels and additional context. ([54838](https://github.com/WordPress/gutenberg/pull/54838))
 
-#### Site Editor
-- Use consistent capitalization for template parts in Site Editor constants. ([54709](https://github.com/WordPress/gutenberg/pull/54709))
+-   Simplify BlockPatternsSyncFilter with clearer labels and additional context. ([54838](https://github.com/WordPress/gutenberg/pull/54838))
 
+#### Site Editor
 
-## First time contributors
+-   Use consistent capitalization for template parts in Site Editor constants. ([54709](https://github.com/WordPress/gutenberg/pull/54709))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @leemyongpakvn: Fix a broken MD link in callout. ([54772](https://github.com/WordPress/gutenberg/pull/54772))
+The following PRs were merged by first-time contributors:
 
+-   @leemyongpakvn: Fix a broken MD link in callout. ([54772](https://github.com/WordPress/gutenberg/pull/54772))
 
 ## Contributors
 
@@ -1919,7 +12585,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamsilverstein @alexstine @andrewhayward @andrewserong @annezazu @anton-vlasenko @artemiomorales @aurooba @bangank36 @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @dcalhoun @derekblank @draganescu @ellatrix @fluiddot @fullofcaffeine @geriux @getdave @glendaviesnz @gziolo @jameskoster @jeryj @jsnajdr @juhi123 @kevin940726 @leemyongpakvn @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @michalczaplinski @mirka @mtias @mujuonly @ndiego @noahtallen @noisysocks @ntsekouras @oandregal @ockham @pbking @priethor @ramonjd @richtabor @scruffian @SiobhyB @spacedmonkey @stokesman @swissspidy @t-hamano @tellthemachines @tellyworth @them-es @torounit @tyxla @westonruter @WunderBart @youknowriad
 
-
 = 16.7.0 =
 
 ## Changelog
@@ -1927,532 +12592,601 @@ The following contributors merged PRs in this release:
 ### Features
 
 #### Block Library
-- Social Links: Add X. ([54092](https://github.com/WordPress/gutenberg/pull/54092))
+
+-   Social Links: Add X. ([54092](https://github.com/WordPress/gutenberg/pull/54092))
 
 #### Typography
+
 Font Library:
-- Add mime type validation for font uploads. ([53986](https://github.com/WordPress/gutenberg/pull/53986))
-- Font Collection backend. ([54098](https://github.com/WordPress/gutenberg/pull/54098))
-- Frontend [Stage 1]. ([53884](https://github.com/WordPress/gutenberg/pull/53884))
-- Font Collections frontend. ([54566](https://github.com/WordPress/gutenberg/pull/54566))
+
+-   Add mime type validation for font uploads. ([53986](https://github.com/WordPress/gutenberg/pull/53986))
+-   Font Collection backend. ([54098](https://github.com/WordPress/gutenberg/pull/54098))
+-   Frontend [Stage 1]. ([53884](https://github.com/WordPress/gutenberg/pull/53884))
+-   Font Collections frontend. ([54566](https://github.com/WordPress/gutenberg/pull/54566))
 
 #### Patterns
-- Allow import/export patterns as JSON files. ([54337](https://github.com/WordPress/gutenberg/pull/54337))
+
+-   Allow import/export patterns as JSON files. ([54337](https://github.com/WordPress/gutenberg/pull/54337))
 
 #### Block Editor
-- Adds 'nofollow' setting to inline links (rich text only). ([53945](https://github.com/WordPress/gutenberg/pull/53945))
-- Rename Group blocks in the Editor via Modal. ([53735](https://github.com/WordPress/gutenberg/pull/53735))
 
+-   Adds 'nofollow' setting to inline links (rich text only). ([53945](https://github.com/WordPress/gutenberg/pull/53945))
+-   Rename Group blocks in the Editor via Modal. ([53735](https://github.com/WordPress/gutenberg/pull/53735))
 
 ### Enhancements
 
 #### Core Data
-- Add edits data to the useEntityRecord. ([54167](https://github.com/WordPress/gutenberg/pull/54167))
-
-#### Components
-- Add non-listbox functionality back to `CircularOptionPicker`. ([54290](https://github.com/WordPress/gutenberg/pull/54290))
-- Added missing "middle" allowed tooltip position. ([52147](https://github.com/WordPress/gutenberg/pull/52147))
-- BlockSettingsMenu: Ensure only one block settings menu is open at a time. ([54083](https://github.com/WordPress/gutenberg/pull/54083))
-- Bundle the block copy handler within the BlockCanvas component. ([54207](https://github.com/WordPress/gutenberg/pull/54207))
-- Bundle the block selection clearer hook into the BlockCanvas component. ([54209](https://github.com/WordPress/gutenberg/pull/54209))
-- Ensure that 'Duotone Filter' color pickers have relevant labels. ([54468](https://github.com/WordPress/gutenberg/pull/54468))
-- Export ProgressBar to allow it to be used. ([54404](https://github.com/WordPress/gutenberg/pull/54404))
-- FormTokenField - add prop to allow saving of tokens onBlur. ([53976](https://github.com/WordPress/gutenberg/pull/53976))
-- Refactoring `BorderControl`'s unit tests. ([54155](https://github.com/WordPress/gutenberg/pull/54155))
-- Remove unnecessary padding-right on the dismissible notice. ([52240](https://github.com/WordPress/gutenberg/pull/52240))
-- Support controlling open/closed state for Dropdown and DropdownMenu. ([54257](https://github.com/WordPress/gutenberg/pull/54257))
-- ToggleGroupControl: Rewrite backdrop animation with framer motion shared layout animations. ([50278](https://github.com/WordPress/gutenberg/pull/50278))
-- ToolTip: Refactor using ariakit. ([48440](https://github.com/WordPress/gutenberg/pull/48440))
-- Tooltip: Add `placement` prop to replace deprecated `position`. ([54264](https://github.com/WordPress/gutenberg/pull/54264))
-- Tooltip: Add new `hideOnClick` prop. ([54406](https://github.com/WordPress/gutenberg/pull/54406))
-- Tweak border control button to proper metrics and simpler action. ([53998](https://github.com/WordPress/gutenberg/pull/53998))
-- Update FormTokenField styling for consistency and visibility. ([54402](https://github.com/WordPress/gutenberg/pull/54402))
-- Update spacing sizes control metrics and icons. ([54470](https://github.com/WordPress/gutenberg/pull/54470))
-- Update/form token field onblur. ([54445](https://github.com/WordPress/gutenberg/pull/54445))
-- `Popover`: Update `positionToPlacement` types. ([54101](https://github.com/WordPress/gutenberg/pull/54101))
-- `SearchControl`: Allow for 32px compact size, introduce option to change default size to 40px. ([54548](https://github.com/WordPress/gutenberg/pull/54548))
-
-#### Block Library
-- #39457: Image block keep image size on replacing image. ([49982](https://github.com/WordPress/gutenberg/pull/49982))
-- Add __next40pxDefaultSize to featured image opacity control. ([54389](https://github.com/WordPress/gutenberg/pull/54389))
-- Add aspect ratio to image placeholder. ([54216](https://github.com/WordPress/gutenberg/pull/54216))
-- Allow using a button element for button blocks. ([54206](https://github.com/WordPress/gutenberg/pull/54206))
-- Buttons Block: Show inserter if button have variations (#53498). ([53783](https://github.com/WordPress/gutenberg/pull/53783))
-- Change dialogdescription for renaming group block. ([54358](https://github.com/WordPress/gutenberg/pull/54358))
-- Footnotes: Add missing placeholder instructions text. ([54056](https://github.com/WordPress/gutenberg/pull/54056))
-- Heading block: Add support for writingMode. ([54351](https://github.com/WordPress/gutenberg/pull/54351))
-- Improved description for the post-terms core block. ([47715](https://github.com/WordPress/gutenberg/pull/47715))
-- Make matrix position behave like valign. ([54050](https://github.com/WordPress/gutenberg/pull/54050))
-- Navigation block: Add `core/buttons` to the allowed blocks. ([53966](https://github.com/WordPress/gutenberg/pull/53966))
-- Remove unused prop from GroupPlaceHolder component. ([51493](https://github.com/WordPress/gutenberg/pull/51493))
-- Template parts: Use the template actions component for template parts patterns. ([54173](https://github.com/WordPress/gutenberg/pull/54173))
-- Text orientation: Rotate vertical text when the text is aligned (Upside down text). ([53175](https://github.com/WordPress/gutenberg/pull/53175))
-- Update parent labels in page attributes panel and page list block. ([54403](https://github.com/WordPress/gutenberg/pull/54403))
-- Use __next40pxDefaultSize on more UI. ([54400](https://github.com/WordPress/gutenberg/pull/54400))
+
+-   Add edits data to the useEntityRecord. ([54167](https://github.com/WordPress/gutenberg/pull/54167))
+
+#### Components
+
+-   Add non-listbox functionality back to `CircularOptionPicker`. ([54290](https://github.com/WordPress/gutenberg/pull/54290))
+-   Added missing "middle" allowed tooltip position. ([52147](https://github.com/WordPress/gutenberg/pull/52147))
+-   BlockSettingsMenu: Ensure only one block settings menu is open at a time. ([54083](https://github.com/WordPress/gutenberg/pull/54083))
+-   Bundle the block copy handler within the BlockCanvas component. ([54207](https://github.com/WordPress/gutenberg/pull/54207))
+-   Bundle the block selection clearer hook into the BlockCanvas component. ([54209](https://github.com/WordPress/gutenberg/pull/54209))
+-   Ensure that 'Duotone Filter' color pickers have relevant labels. ([54468](https://github.com/WordPress/gutenberg/pull/54468))
+-   Export ProgressBar to allow it to be used. ([54404](https://github.com/WordPress/gutenberg/pull/54404))
+-   FormTokenField - add prop to allow saving of tokens onBlur. ([53976](https://github.com/WordPress/gutenberg/pull/53976))
+-   Refactoring `BorderControl`'s unit tests. ([54155](https://github.com/WordPress/gutenberg/pull/54155))
+-   Remove unnecessary padding-right on the dismissible notice. ([52240](https://github.com/WordPress/gutenberg/pull/52240))
+-   Support controlling open/closed state for Dropdown and DropdownMenu. ([54257](https://github.com/WordPress/gutenberg/pull/54257))
+-   ToggleGroupControl: Rewrite backdrop animation with framer motion shared layout animations. ([50278](https://github.com/WordPress/gutenberg/pull/50278))
+-   ToolTip: Refactor using ariakit. ([48440](https://github.com/WordPress/gutenberg/pull/48440))
+-   Tooltip: Add `placement` prop to replace deprecated `position`. ([54264](https://github.com/WordPress/gutenberg/pull/54264))
+-   Tooltip: Add new `hideOnClick` prop. ([54406](https://github.com/WordPress/gutenberg/pull/54406))
+-   Tweak border control button to proper metrics and simpler action. ([53998](https://github.com/WordPress/gutenberg/pull/53998))
+-   Update FormTokenField styling for consistency and visibility. ([54402](https://github.com/WordPress/gutenberg/pull/54402))
+-   Update spacing sizes control metrics and icons. ([54470](https://github.com/WordPress/gutenberg/pull/54470))
+-   Update/form token field onblur. ([54445](https://github.com/WordPress/gutenberg/pull/54445))
+-   `Popover`: Update `positionToPlacement` types. ([54101](https://github.com/WordPress/gutenberg/pull/54101))
+-   `SearchControl`: Allow for 32px compact size, introduce option to change default size to 40px. ([54548](https://github.com/WordPress/gutenberg/pull/54548))
+
+#### Block Library
+
+-   #39457: Image block keep image size on replacing image. ([49982](https://github.com/WordPress/gutenberg/pull/49982))
+-   Add \_\_next40pxDefaultSize to featured image opacity control. ([54389](https://github.com/WordPress/gutenberg/pull/54389))
+-   Add aspect ratio to image placeholder. ([54216](https://github.com/WordPress/gutenberg/pull/54216))
+-   Allow using a button element for button blocks. ([54206](https://github.com/WordPress/gutenberg/pull/54206))
+-   Buttons Block: Show inserter if button have variations (#53498). ([53783](https://github.com/WordPress/gutenberg/pull/53783))
+-   Change dialogdescription for renaming group block. ([54358](https://github.com/WordPress/gutenberg/pull/54358))
+-   Footnotes: Add missing placeholder instructions text. ([54056](https://github.com/WordPress/gutenberg/pull/54056))
+-   Heading block: Add support for writingMode. ([54351](https://github.com/WordPress/gutenberg/pull/54351))
+-   Improved description for the post-terms core block. ([47715](https://github.com/WordPress/gutenberg/pull/47715))
+-   Make matrix position behave like valign. ([54050](https://github.com/WordPress/gutenberg/pull/54050))
+-   Navigation block: Add `core/buttons` to the allowed blocks. ([53966](https://github.com/WordPress/gutenberg/pull/53966))
+-   Remove unused prop from GroupPlaceHolder component. ([51493](https://github.com/WordPress/gutenberg/pull/51493))
+-   Template parts: Use the template actions component for template parts patterns. ([54173](https://github.com/WordPress/gutenberg/pull/54173))
+-   Text orientation: Rotate vertical text when the text is aligned (Upside down text). ([53175](https://github.com/WordPress/gutenberg/pull/53175))
+-   Update parent labels in page attributes panel and page list block. ([54403](https://github.com/WordPress/gutenberg/pull/54403))
+-   Use \_\_next40pxDefaultSize on more UI. ([54400](https://github.com/WordPress/gutenberg/pull/54400))
 
 #### Interactivity API
-- Add `timeout` option to `navigate()`. ([54474](https://github.com/WordPress/gutenberg/pull/54474))
-- Add manual Server Side Rendering (SSR) to the Interactivity API blocks. ([54343](https://github.com/WordPress/gutenberg/pull/54343))
-- Ensure that the view scripts of core blocks have the `wp-interactivity` dependency. ([54594](https://github.com/WordPress/gutenberg/pull/54594))
-- Image block: Revise lightbox UI to remove 'behaviors'. ([53851](https://github.com/WordPress/gutenberg/pull/53851))
-- Image block: UI updates for the image lightbox (redo). ([54509](https://github.com/WordPress/gutenberg/pull/54509))
-- Override unfinished `navigate` calls. ([54201](https://github.com/WordPress/gutenberg/pull/54201))
-- Query Loop: Add design enhancements for the "enhanced pagination" setting. ([54455](https://github.com/WordPress/gutenberg/pull/54455))
-- Query Loop: Allow "enhanced pagination" only with core blocks. ([54347](https://github.com/WordPress/gutenberg/pull/54347))
-- Query block: Start prefetching on first click to next/previous. ([54781](https://github.com/WordPress/gutenberg/pull/54781))
+
+-   Add `timeout` option to `navigate()`. ([54474](https://github.com/WordPress/gutenberg/pull/54474))
+-   Add manual Server Side Rendering (SSR) to the Interactivity API blocks. ([54343](https://github.com/WordPress/gutenberg/pull/54343))
+-   Ensure that the view scripts of core blocks have the `wp-interactivity` dependency. ([54594](https://github.com/WordPress/gutenberg/pull/54594))
+-   Image block: Revise lightbox UI to remove 'behaviors'. ([53851](https://github.com/WordPress/gutenberg/pull/53851))
+-   Image block: UI updates for the image lightbox (redo). ([54509](https://github.com/WordPress/gutenberg/pull/54509))
+-   Override unfinished `navigate` calls. ([54201](https://github.com/WordPress/gutenberg/pull/54201))
+-   Query Loop: Add design enhancements for the "enhanced pagination" setting. ([54455](https://github.com/WordPress/gutenberg/pull/54455))
+-   Query Loop: Allow "enhanced pagination" only with core blocks. ([54347](https://github.com/WordPress/gutenberg/pull/54347))
+-   Query block: Start prefetching on first click to next/previous. ([54781](https://github.com/WordPress/gutenberg/pull/54781))
 
 #### Patterns
-- Add categories to user patterns, and allow filtering by these in site and post editor. ([53835](https://github.com/WordPress/gutenberg/pull/53835))
-- Add editing of pattern categories to site editor. ([54640](https://github.com/WordPress/gutenberg/pull/54640))
-- Add user categories to site editor sidebar navigation screen. ([53837](https://github.com/WordPress/gutenberg/pull/53837))
-- Add user pattern categories to post editor inserter patterns tab. ([53933](https://github.com/WordPress/gutenberg/pull/53933))
-- Apply white background to the preview as a fallback. ([54534](https://github.com/WordPress/gutenberg/pull/54534))
-- Merge unsynced into inserter patterns tab and add paging and filtering. ([54007](https://github.com/WordPress/gutenberg/pull/54007))
-- Update empty template part label. ([53842](https://github.com/WordPress/gutenberg/pull/53842))
-- Memoize `useSelect` for `usePatterns`. ([54588](https://github.com/WordPress/gutenberg/pull/54588))
-- Site Editor: Prevent unintended actions on the classic theme. ([54422](https://github.com/WordPress/gutenberg/pull/54422))
+
+-   Add categories to user patterns, and allow filtering by these in site and post editor. ([53835](https://github.com/WordPress/gutenberg/pull/53835))
+-   Add editing of pattern categories to site editor. ([54640](https://github.com/WordPress/gutenberg/pull/54640))
+-   Add user categories to site editor sidebar navigation screen. ([53837](https://github.com/WordPress/gutenberg/pull/53837))
+-   Add user pattern categories to post editor inserter patterns tab. ([53933](https://github.com/WordPress/gutenberg/pull/53933))
+-   Apply white background to the preview as a fallback. ([54534](https://github.com/WordPress/gutenberg/pull/54534))
+-   Merge unsynced into inserter patterns tab and add paging and filtering. ([54007](https://github.com/WordPress/gutenberg/pull/54007))
+-   Update empty template part label. ([53842](https://github.com/WordPress/gutenberg/pull/53842))
+-   Memoize `useSelect` for `usePatterns`. ([54588](https://github.com/WordPress/gutenberg/pull/54588))
+-   Site Editor: Prevent unintended actions on the classic theme. ([54422](https://github.com/WordPress/gutenberg/pull/54422))
 
 #### Design Tools
-- Add back tooltip to styles UI. ([54574](https://github.com/WordPress/gutenberg/pull/54574))
-- Add block gap to Post Content block. ([54282](https://github.com/WordPress/gutenberg/pull/54282))
-- Add block instance elements support for buttons and headings. ([53667](https://github.com/WordPress/gutenberg/pull/53667))
-- Background Image block support: Add reset menu item. ([54341](https://github.com/WordPress/gutenberg/pull/54341))
-- Block Supports: Add background image support to Group block. ([53934](https://github.com/WordPress/gutenberg/pull/53934))
-- Columns: Adopt button and heading element colors. ([54104](https://github.com/WordPress/gutenberg/pull/54104))
-- Update block styles UI. ([54446](https://github.com/WordPress/gutenberg/pull/54446))
-- Improve background image control. ([54439](https://github.com/WordPress/gutenberg/pull/54439))
+
+-   Add back tooltip to styles UI. ([54574](https://github.com/WordPress/gutenberg/pull/54574))
+-   Add block gap to Post Content block. ([54282](https://github.com/WordPress/gutenberg/pull/54282))
+-   Add block instance elements support for buttons and headings. ([53667](https://github.com/WordPress/gutenberg/pull/53667))
+-   Background Image block support: Add reset menu item. ([54341](https://github.com/WordPress/gutenberg/pull/54341))
+-   Block Supports: Add background image support to Group block. ([53934](https://github.com/WordPress/gutenberg/pull/53934))
+-   Columns: Adopt button and heading element colors. ([54104](https://github.com/WordPress/gutenberg/pull/54104))
+-   Update block styles UI. ([54446](https://github.com/WordPress/gutenberg/pull/54446))
+-   Improve background image control. ([54439](https://github.com/WordPress/gutenberg/pull/54439))
 
 #### Site Editor
-- Copy: End the Templates page description in the Site Editor with a period. ([54221](https://github.com/WordPress/gutenberg/pull/54221))
-- Edit Site: Update progress bar to determinate. ([53399](https://github.com/WordPress/gutenberg/pull/53399))
-- Follow up visual tweaks to block-specific commands. ([54427](https://github.com/WordPress/gutenberg/pull/54427))
-- Site editor sidebar: Abstracting footer so it can be used across details screens. ([54082](https://github.com/WordPress/gutenberg/pull/54082))
-- [Page Inspector]: Add ability to switch templates. ([51477](https://github.com/WordPress/gutenberg/pull/51477))
+
+-   Copy: End the Templates page description in the Site Editor with a period. ([54221](https://github.com/WordPress/gutenberg/pull/54221))
+-   Edit Site: Update progress bar to determinate. ([53399](https://github.com/WordPress/gutenberg/pull/53399))
+-   Follow up visual tweaks to block-specific commands. ([54427](https://github.com/WordPress/gutenberg/pull/54427))
+-   Site editor sidebar: Abstracting footer so it can be used across details screens. ([54082](https://github.com/WordPress/gutenberg/pull/54082))
+-   [Page Inspector]: Add ability to switch templates. ([51477](https://github.com/WordPress/gutenberg/pull/51477))
 
 #### Global Styles
-- Rename `settings` & `userSettings` props to `value` & `inheritedValue` respectively in ImageSettingsPanel. ([54593](https://github.com/WordPress/gutenberg/pull/54593))
-- Update Block specific CSS label to include additional instructions. ([49626](https://github.com/WordPress/gutenberg/pull/49626))
+
+-   Rename `settings` & `userSettings` props to `value` & `inheritedValue` respectively in ImageSettingsPanel. ([54593](https://github.com/WordPress/gutenberg/pull/54593))
+-   Update Block specific CSS label to include additional instructions. ([49626](https://github.com/WordPress/gutenberg/pull/49626))
 
 #### Block Editor
-- Use gray color on link control advanced toggle. ([54545](https://github.com/WordPress/gutenberg/pull/54545))
-- Verse: Exit on triple Enter. ([53332](https://github.com/WordPress/gutenberg/pull/53332))
-- Block editor: hooks: Fix rules of hooks violations (2). ([48943](https://github.com/WordPress/gutenberg/pull/48943))
-- Always show the total number of patterns even with only one page. ([54813](https://github.com/WordPress/gutenberg/pull/54813))
+
+-   Use gray color on link control advanced toggle. ([54545](https://github.com/WordPress/gutenberg/pull/54545))
+-   Verse: Exit on triple Enter. ([53332](https://github.com/WordPress/gutenberg/pull/53332))
+-   Block editor: hooks: Fix rules of hooks violations (2). ([48943](https://github.com/WordPress/gutenberg/pull/48943))
+-   Always show the total number of patterns even with only one page. ([54813](https://github.com/WordPress/gutenberg/pull/54813))
 
 #### Typography
-- Font Face: Backport from Core changeset 56500. ([54218](https://github.com/WordPress/gutenberg/pull/54218))
-- Font Library: Changing the upload directory to wp-content/fonts. ([54122](https://github.com/WordPress/gutenberg/pull/54122))
-- Font Library: Load collection JSON data from a URL in the collection configuration. ([54067](https://github.com/WordPress/gutenberg/pull/54067))
-- Font Library: Use wporg cdn to host the google fonts json data. ([54795](https://github.com/WordPress/gutenberg/pull/54795))
+
+-   Font Face: Backport from Core changeset 56500. ([54218](https://github.com/WordPress/gutenberg/pull/54218))
+-   Font Library: Changing the upload directory to wp-content/fonts. ([54122](https://github.com/WordPress/gutenberg/pull/54122))
+-   Font Library: Load collection JSON data from a URL in the collection configuration. ([54067](https://github.com/WordPress/gutenberg/pull/54067))
+-   Font Library: Use wporg cdn to host the google fonts json data. ([54795](https://github.com/WordPress/gutenberg/pull/54795))
 
 #### Themes
-- Theme Previews: Make the back button customizable. ([54242](https://github.com/WordPress/gutenberg/pull/54242))
+
+-   Theme Previews: Make the back button customizable. ([54242](https://github.com/WordPress/gutenberg/pull/54242))
 
 #### Plugin
-- Remove 'Footnotes' and 'Comments' from the non-dynamic block registration list. ([54154](https://github.com/WordPress/gutenberg/pull/54154))
+
+-   Remove 'Footnotes' and 'Comments' from the non-dynamic block registration list. ([54154](https://github.com/WordPress/gutenberg/pull/54154))
 
 #### Media
-- Correct function name handleFileChange is replaced by wrong function name. ([52250](https://github.com/WordPress/gutenberg/pull/52250))
+
+-   Correct function name handleFileChange is replaced by wrong function name. ([52250](https://github.com/WordPress/gutenberg/pull/52250))
 
 #### List View
-- Allow Escape key to deselect blocks if blocks are selected. ([48708](https://github.com/WordPress/gutenberg/pull/48708))
-- Try directing focus to the list view toggle button when closing the list view. ([54175](https://github.com/WordPress/gutenberg/pull/54175))
+
+-   Allow Escape key to deselect blocks if blocks are selected. ([48708](https://github.com/WordPress/gutenberg/pull/48708))
+-   Try directing focus to the list view toggle button when closing the list view. ([54175](https://github.com/WordPress/gutenberg/pull/54175))
 
 #### Block API
-- Deprecated `get_file_path_from_theme` method. ([45831](https://github.com/WordPress/gutenberg/pull/45831))
+
+-   Deprecated `get_file_path_from_theme` method. ([45831](https://github.com/WordPress/gutenberg/pull/45831))
 
 #### Keyboard Shortcuts
-- Make the shortcuts provider optional. ([54080](https://github.com/WordPress/gutenberg/pull/54080))
+
+-   Make the shortcuts provider optional. ([54080](https://github.com/WordPress/gutenberg/pull/54080))
 
 #### Blob
-- refactor(blob): Type URL parameter as optional. ([49201](https://github.com/WordPress/gutenberg/pull/49201))
+
+-   refactor(blob): Type URL parameter as optional. ([49201](https://github.com/WordPress/gutenberg/pull/49201))
 
 #### Collaborative Editing
-- Try bundling sync package. ([54738](https://github.com/WordPress/gutenberg/pull/54738))
 
+-   Try bundling sync package. ([54738](https://github.com/WordPress/gutenberg/pull/54738))
 
 ### New APIs
 
 #### Components
-- Revert "Export ProgressBar to allow it to be used". ([54428](https://github.com/WordPress/gutenberg/pull/54428))
+
+-   Revert "Export ProgressBar to allow it to be used". ([54428](https://github.com/WordPress/gutenberg/pull/54428))
 
 #### Block API
-- Stabilize Block Hooks feature. ([54293](https://github.com/WordPress/gutenberg/pull/54293))
+
+-   Stabilize Block Hooks feature. ([54293](https://github.com/WordPress/gutenberg/pull/54293))
 
 #### Data Layer
-- Data: Introduce `countSelectorsByStatus` redux metadata selector. ([53767](https://github.com/WordPress/gutenberg/pull/53767))
+
+-   Data: Introduce `countSelectorsByStatus` redux metadata selector. ([53767](https://github.com/WordPress/gutenberg/pull/53767))
 
 #### Framework
-- Add useStateWithHistory hook and use to show a block editor with undo/redo. ([54377](https://github.com/WordPress/gutenberg/pull/54377))
-- BlockEditor: Add BlockCanvas component = Iframe + BlockList + WritingFlow. ([54149](https://github.com/WordPress/gutenberg/pull/54149))
-- Extract undo/redo as a separate package. ([54292](https://github.com/WordPress/gutenberg/pull/54292))
+
+-   Add useStateWithHistory hook and use to show a block editor with undo/redo. ([54377](https://github.com/WordPress/gutenberg/pull/54377))
+-   BlockEditor: Add BlockCanvas component = Iframe + BlockList + WritingFlow. ([54149](https://github.com/WordPress/gutenberg/pull/54149))
+-   Extract undo/redo as a separate package. ([54292](https://github.com/WordPress/gutenberg/pull/54292))
 
 ### Bug Fixes
 
 #### Components
-- Add children back to toolbar item render for rendered components. ([53314](https://github.com/WordPress/gutenberg/pull/53314))
-- Add missing useState import in Border Control documentation. ([49476](https://github.com/WordPress/gutenberg/pull/49476))
-- Adjust input-style__focus mixin to proper focus size. ([54398](https://github.com/WordPress/gutenberg/pull/54398))
-- DropdownMenu v2: Fix submenu chevron direction in RTL languages. ([54036](https://github.com/WordPress/gutenberg/pull/54036))
-- Fix incorrect focus style size on InputControl. ([54394](https://github.com/WordPress/gutenberg/pull/54394))
-- Make `CircularOptionPicker` focus styles resilient to button size changes. ([54196](https://github.com/WordPress/gutenberg/pull/54196))
-- PaletteEdit: Fix padding in RTL mode. ([54034](https://github.com/WordPress/gutenberg/pull/54034))
-- Popover: Set is-positioned class only after animation has finished. ([54178](https://github.com/WordPress/gutenberg/pull/54178))
-- Storybook: Restore previous URL for the introduction documentation page. ([54247](https://github.com/WordPress/gutenberg/pull/54247))
-- Storybook: Update doc param values for ConfirmDialog. ([54130](https://github.com/WordPress/gutenberg/pull/54130))
-- Update borderFocus to ADMIN.theme. ([54425](https://github.com/WordPress/gutenberg/pull/54425))
-- Use standard focus style on BorderControl. ([54429](https://github.com/WordPress/gutenberg/pull/54429))
-- DateTimePicker: Fix onChange callback check so that it also works inside iframes. ([54669](https://github.com/WordPress/gutenberg/pull/54669))
+
+-   Add children back to toolbar item render for rendered components. ([53314](https://github.com/WordPress/gutenberg/pull/53314))
+-   Add missing useState import in Border Control documentation. ([49476](https://github.com/WordPress/gutenberg/pull/49476))
+-   Adjust input-style\_\_focus mixin to proper focus size. ([54398](https://github.com/WordPress/gutenberg/pull/54398))
+-   DropdownMenu v2: Fix submenu chevron direction in RTL languages. ([54036](https://github.com/WordPress/gutenberg/pull/54036))
+-   Fix incorrect focus style size on InputControl. ([54394](https://github.com/WordPress/gutenberg/pull/54394))
+-   Make `CircularOptionPicker` focus styles resilient to button size changes. ([54196](https://github.com/WordPress/gutenberg/pull/54196))
+-   PaletteEdit: Fix padding in RTL mode. ([54034](https://github.com/WordPress/gutenberg/pull/54034))
+-   Popover: Set is-positioned class only after animation has finished. ([54178](https://github.com/WordPress/gutenberg/pull/54178))
+-   Storybook: Restore previous URL for the introduction documentation page. ([54247](https://github.com/WordPress/gutenberg/pull/54247))
+-   Storybook: Update doc param values for ConfirmDialog. ([54130](https://github.com/WordPress/gutenberg/pull/54130))
+-   Update borderFocus to ADMIN.theme. ([54425](https://github.com/WordPress/gutenberg/pull/54425))
+-   Use standard focus style on BorderControl. ([54429](https://github.com/WordPress/gutenberg/pull/54429))
+-   DateTimePicker: Fix onChange callback check so that it also works inside iframes. ([54669](https://github.com/WordPress/gutenberg/pull/54669))
 
 #### Post Editor
-- Adds animation state for DFM off to post editor header. ([54244](https://github.com/WordPress/gutenberg/pull/54244))
-- Block Editor: Memoize the createPageEntity callback. ([54580](https://github.com/WordPress/gutenberg/pull/54580))
-- Edit Post: Avoid fetching the edited template for non-viewable posts. ([54158](https://github.com/WordPress/gutenberg/pull/54158))
-- Editor: Catch errors when creating terms. ([53369](https://github.com/WordPress/gutenberg/pull/53369))
-- Fix layout when post content is root block. ([54485](https://github.com/WordPress/gutenberg/pull/54485))
-- Make order of pinned items consistent. ([53908](https://github.com/WordPress/gutenberg/pull/53908))
-- Prevent the list view shortcut from typing unexpected characters. ([54078](https://github.com/WordPress/gutenberg/pull/54078))
-- Top Toolbar: Prevent the focus outline of the button from being cut off. ([54172](https://github.com/WordPress/gutenberg/pull/54172))
-- Try using fallback layout instead of default in post editor. ([54371](https://github.com/WordPress/gutenberg/pull/54371))
-- [Edit Post]: Toggle Distraction free mode mode based on compatibility. ([54073](https://github.com/WordPress/gutenberg/pull/54073))
-
-#### Block Library
-- Block Moving Mode: Prevent the block from being moved into itself. ([54137](https://github.com/WordPress/gutenberg/pull/54137))
-- Fix navigation block submenu focus when closing menu with the ESC key. ([54299](https://github.com/WordPress/gutenberg/pull/54299))
-- List Block: Fix numbering style to be applied correctly. ([53301](https://github.com/WordPress/gutenberg/pull/53301))
-- Navigation Link: Restore tooltip. ([54263](https://github.com/WordPress/gutenberg/pull/54263))
-- Post navigation link: Fix the writing mode setting on the front. ([54053](https://github.com/WordPress/gutenberg/pull/54053))
-- PreviewOptions: Fix critical error when children not passed. ([54284](https://github.com/WordPress/gutenberg/pull/54284))
-- Remove `role` attribute when set to `null` in `data-wp-bind`. ([54608](https://github.com/WordPress/gutenberg/pull/54608))
-- [Commands]: Add group/ungroup commands only when eligible. ([53988](https://github.com/WordPress/gutenberg/pull/53988))
-- Replace the `gutenberg_` prefix with `wp_` in image block. ([54678](https://github.com/WordPress/gutenberg/pull/54678))
-- Navigation block: Fix padding on mobile overlay when global padding is 0. ([53725](https://github.com/WordPress/gutenberg/pull/53725))
+
+-   Adds animation state for DFM off to post editor header. ([54244](https://github.com/WordPress/gutenberg/pull/54244))
+-   Block Editor: Memoize the createPageEntity callback. ([54580](https://github.com/WordPress/gutenberg/pull/54580))
+-   Edit Post: Avoid fetching the edited template for non-viewable posts. ([54158](https://github.com/WordPress/gutenberg/pull/54158))
+-   Editor: Catch errors when creating terms. ([53369](https://github.com/WordPress/gutenberg/pull/53369))
+-   Fix layout when post content is root block. ([54485](https://github.com/WordPress/gutenberg/pull/54485))
+-   Make order of pinned items consistent. ([53908](https://github.com/WordPress/gutenberg/pull/53908))
+-   Prevent the list view shortcut from typing unexpected characters. ([54078](https://github.com/WordPress/gutenberg/pull/54078))
+-   Top Toolbar: Prevent the focus outline of the button from being cut off. ([54172](https://github.com/WordPress/gutenberg/pull/54172))
+-   Try using fallback layout instead of default in post editor. ([54371](https://github.com/WordPress/gutenberg/pull/54371))
+-   [Edit Post]: Toggle Distraction free mode mode based on compatibility. ([54073](https://github.com/WordPress/gutenberg/pull/54073))
+
+#### Block Library
+
+-   Block Moving Mode: Prevent the block from being moved into itself. ([54137](https://github.com/WordPress/gutenberg/pull/54137))
+-   Fix navigation block submenu focus when closing menu with the ESC key. ([54299](https://github.com/WordPress/gutenberg/pull/54299))
+-   List Block: Fix numbering style to be applied correctly. ([53301](https://github.com/WordPress/gutenberg/pull/53301))
+-   Navigation Link: Restore tooltip. ([54263](https://github.com/WordPress/gutenberg/pull/54263))
+-   Post navigation link: Fix the writing mode setting on the front. ([54053](https://github.com/WordPress/gutenberg/pull/54053))
+-   PreviewOptions: Fix critical error when children not passed. ([54284](https://github.com/WordPress/gutenberg/pull/54284))
+-   Remove `role` attribute when set to `null` in `data-wp-bind`. ([54608](https://github.com/WordPress/gutenberg/pull/54608))
+-   [Commands]: Add group/ungroup commands only when eligible. ([53988](https://github.com/WordPress/gutenberg/pull/53988))
+-   Replace the `gutenberg_` prefix with `wp_` in image block. ([54678](https://github.com/WordPress/gutenberg/pull/54678))
+-   Navigation block: Fix padding on mobile overlay when global padding is 0. ([53725](https://github.com/WordPress/gutenberg/pull/53725))
 
 #### Patterns
-- Command Palette: Fix duplicate Patterns command. ([54133](https://github.com/WordPress/gutenberg/pull/54133))
-- Don't output root padding when editing patterns. ([54373](https://github.com/WordPress/gutenberg/pull/54373))
-- Fix user pattern categories in site editor inserter. ([54641](https://github.com/WordPress/gutenberg/pull/54641))
-- Remove pattern category as a variation for post terms block. ([54532](https://github.com/WordPress/gutenberg/pull/54532))
-- StartPageOptions: Improve conditions to show modal only on a brand new page. ([54245](https://github.com/WordPress/gutenberg/pull/54245))
-- Add My patterns back to post editor inserter categories. ([54767](https://github.com/WordPress/gutenberg/pull/54767))
-- De-emphasise pattern filters in inserter. ([54681](https://github.com/WordPress/gutenberg/pull/54681))
-- Fix All Patterns category default display. ([54721](https://github.com/WordPress/gutenberg/pull/54721))
-- Fix bug with new categories not showing. ([54768](https://github.com/WordPress/gutenberg/pull/54768))
-- Fix bug with pattern categories not saving sometimes. ([54676](https://github.com/WordPress/gutenberg/pull/54676))
-- Fix category type for back link. ([54753](https://github.com/WordPress/gutenberg/pull/54753))
-- Fix duplication of uncategorized patterns. ([54755](https://github.com/WordPress/gutenberg/pull/54755))
-- Inject the theme name into the block attributes. ([54595](https://github.com/WordPress/gutenberg/pull/54595))
-- Reinstate my patterns category in site editor. ([54726](https://github.com/WordPress/gutenberg/pull/54726))
-- Require a title in the creation modal. ([54717](https://github.com/WordPress/gutenberg/pull/54717))
-- Use slug as fallback for empty title. ([54731](https://github.com/WordPress/gutenberg/pull/54731))
-- Allow non-user patterns under Standard sync filter. ([54756](https://github.com/WordPress/gutenberg/pull/54756))
-- Check that pattern is synced before replacing blocks with synced pattern on creation. ([54804](https://github.com/WordPress/gutenberg/pull/54804))
-- Fix back navigation after pattern creation. ([54852](https://github.com/WordPress/gutenberg/pull/54852))
-- Fix category control width in site editor. ([54853](https://github.com/WordPress/gutenberg/pull/54853))
-- Improve sentence case consistency of labels and notices. ([54807](https://github.com/WordPress/gutenberg/pull/54807))
-
-#### Block Editor
-- Add keyboardReturn submit button back to LinkControl. ([52620](https://github.com/WordPress/gutenberg/pull/52620))
-- Formats: Memoize link value passed to the LinkControl. ([54603](https://github.com/WordPress/gutenberg/pull/54603))
-- List: Merge consecutive lists. ([52995](https://github.com/WordPress/gutenberg/pull/52995))
-- Rich text: Fix useAnchor (remove nextElementSibling). ([54013](https://github.com/WordPress/gutenberg/pull/54013))
-- Iframe: Adjust keydown event bubbling. ([54565](https://github.com/WordPress/gutenberg/pull/54565))
-- Reset page after changing pattern filters or search value. ([54774](https://github.com/WordPress/gutenberg/pull/54774))
-- Block Editor: Fix 'isBlockSubtreeDisabled' private selector. ([54618](https://github.com/WordPress/gutenberg/pull/54618))
+
+-   Command Palette: Fix duplicate Patterns command. ([54133](https://github.com/WordPress/gutenberg/pull/54133))
+-   Don't output root padding when editing patterns. ([54373](https://github.com/WordPress/gutenberg/pull/54373))
+-   Fix user pattern categories in site editor inserter. ([54641](https://github.com/WordPress/gutenberg/pull/54641))
+-   Remove pattern category as a variation for post terms block. ([54532](https://github.com/WordPress/gutenberg/pull/54532))
+-   StartPageOptions: Improve conditions to show modal only on a brand new page. ([54245](https://github.com/WordPress/gutenberg/pull/54245))
+-   Add My patterns back to post editor inserter categories. ([54767](https://github.com/WordPress/gutenberg/pull/54767))
+-   De-emphasise pattern filters in inserter. ([54681](https://github.com/WordPress/gutenberg/pull/54681))
+-   Fix All Patterns category default display. ([54721](https://github.com/WordPress/gutenberg/pull/54721))
+-   Fix bug with new categories not showing. ([54768](https://github.com/WordPress/gutenberg/pull/54768))
+-   Fix bug with pattern categories not saving sometimes. ([54676](https://github.com/WordPress/gutenberg/pull/54676))
+-   Fix category type for back link. ([54753](https://github.com/WordPress/gutenberg/pull/54753))
+-   Fix duplication of uncategorized patterns. ([54755](https://github.com/WordPress/gutenberg/pull/54755))
+-   Inject the theme name into the block attributes. ([54595](https://github.com/WordPress/gutenberg/pull/54595))
+-   Reinstate my patterns category in site editor. ([54726](https://github.com/WordPress/gutenberg/pull/54726))
+-   Require a title in the creation modal. ([54717](https://github.com/WordPress/gutenberg/pull/54717))
+-   Use slug as fallback for empty title. ([54731](https://github.com/WordPress/gutenberg/pull/54731))
+-   Allow non-user patterns under Standard sync filter. ([54756](https://github.com/WordPress/gutenberg/pull/54756))
+-   Check that pattern is synced before replacing blocks with synced pattern on creation. ([54804](https://github.com/WordPress/gutenberg/pull/54804))
+-   Fix back navigation after pattern creation. ([54852](https://github.com/WordPress/gutenberg/pull/54852))
+-   Fix category control width in site editor. ([54853](https://github.com/WordPress/gutenberg/pull/54853))
+-   Improve sentence case consistency of labels and notices. ([54807](https://github.com/WordPress/gutenberg/pull/54807))
+
+#### Block Editor
+
+-   Add keyboardReturn submit button back to LinkControl. ([52620](https://github.com/WordPress/gutenberg/pull/52620))
+-   Formats: Memoize link value passed to the LinkControl. ([54603](https://github.com/WordPress/gutenberg/pull/54603))
+-   List: Merge consecutive lists. ([52995](https://github.com/WordPress/gutenberg/pull/52995))
+-   Rich text: Fix useAnchor (remove nextElementSibling). ([54013](https://github.com/WordPress/gutenberg/pull/54013))
+-   Iframe: Adjust keydown event bubbling. ([54565](https://github.com/WordPress/gutenberg/pull/54565))
+-   Reset page after changing pattern filters or search value. ([54774](https://github.com/WordPress/gutenberg/pull/54774))
+-   Block Editor: Fix 'isBlockSubtreeDisabled' private selector. ([54618](https://github.com/WordPress/gutenberg/pull/54618))
 
 #### Site Editor
-- Bump the z-index of the rename modal. ([54277](https://github.com/WordPress/gutenberg/pull/54277))
-- Default template lookup should use slug, not the full permalink, in the site editor. ([54599](https://github.com/WordPress/gutenberg/pull/54599))
-- Fix "Blog title" input border radius in Index / Home details panel. ([54192](https://github.com/WordPress/gutenberg/pull/54192))
-- Hide ghost top toolbar. ([54555](https://github.com/WordPress/gutenberg/pull/54555))
-- CreateTemplatePartModal: Disable the 'Create' button while saving. ([54716](https://github.com/WordPress/gutenberg/pull/54716))
+
+-   Bump the z-index of the rename modal. ([54277](https://github.com/WordPress/gutenberg/pull/54277))
+-   Default template lookup should use slug, not the full permalink, in the site editor. ([54599](https://github.com/WordPress/gutenberg/pull/54599))
+-   Fix "Blog title" input border radius in Index / Home details panel. ([54192](https://github.com/WordPress/gutenberg/pull/54192))
+-   Hide ghost top toolbar. ([54555](https://github.com/WordPress/gutenberg/pull/54555))
+-   CreateTemplatePartModal: Disable the 'Create' button while saving. ([54716](https://github.com/WordPress/gutenberg/pull/54716))
 
 #### Plugin
-- Ensure font-face styles are printed in iframe editors. ([54313](https://github.com/WordPress/gutenberg/pull/54313))
-- Font Face & Font Library: Load PHP files only if the main class does not exist. ([54103](https://github.com/WordPress/gutenberg/pull/54103))
-- Gutenberg Plugin: Add hook to allow `writing-mode` as a safe CSS property. ([54581](https://github.com/WordPress/gutenberg/pull/54581))
-- Update readme.txt "tested up to 6.3". ([54072](https://github.com/WordPress/gutenberg/pull/54072))
-- Update cherry-pick script to correctly verify GitHub CLI setup. ([54720](https://github.com/WordPress/gutenberg/pull/54720))
-- Conditionally remove deprecated 'print_emoji_styles'. ([54828](https://github.com/WordPress/gutenberg/pull/54828))
+
+-   Ensure font-face styles are printed in iframe editors. ([54313](https://github.com/WordPress/gutenberg/pull/54313))
+-   Font Face & Font Library: Load PHP files only if the main class does not exist. ([54103](https://github.com/WordPress/gutenberg/pull/54103))
+-   Gutenberg Plugin: Add hook to allow `writing-mode` as a safe CSS property. ([54581](https://github.com/WordPress/gutenberg/pull/54581))
+-   Update readme.txt "tested up to 6.3". ([54072](https://github.com/WordPress/gutenberg/pull/54072))
+-   Update cherry-pick script to correctly verify GitHub CLI setup. ([54720](https://github.com/WordPress/gutenberg/pull/54720))
+-   Conditionally remove deprecated 'print_emoji_styles'. ([54828](https://github.com/WordPress/gutenberg/pull/54828))
 
 #### Typography
-- Font Library: Ensure merged fontFace data is enconded as an array instead of an object. ([54435](https://github.com/WordPress/gutenberg/pull/54435))
-- Font Library: Fix duplicate variants with different file types. ([54490](https://github.com/WordPress/gutenberg/pull/54490))
-- Font Library: Setting wp_font_family custom post type as _builtin and not plublic. ([54559](https://github.com/WordPress/gutenberg/pull/54559))
-- Font Face: Get name from "fontFamily" setting, not "name". ([54615](https://github.com/WordPress/gutenberg/pull/54615))
-- Font Library: Fix modal width on mobile viewport. ([54518](https://github.com/WordPress/gutenberg/pull/54518))
-- Font Library: Fix space above theme fonts in font library modal. ([54598](https://github.com/WordPress/gutenberg/pull/54598))
-- Font Library: Fix error installing system fonts. ([54713](https://github.com/WordPress/gutenberg/pull/54713))
-- Font Library: Remove font files created by tests after tests run. ([54771](https://github.com/WordPress/gutenberg/pull/54771))
-- Font Library: Avoid rendering font library ui outisde gutenberg plugin. ([54830](https://github.com/WordPress/gutenberg/pull/54830))
+
+-   Font Library: Ensure merged fontFace data is enconded as an array instead of an object. ([54435](https://github.com/WordPress/gutenberg/pull/54435))
+-   Font Library: Fix duplicate variants with different file types. ([54490](https://github.com/WordPress/gutenberg/pull/54490))
+-   Font Library: Setting wp_font_family custom post type as \_builtin and not plublic. ([54559](https://github.com/WordPress/gutenberg/pull/54559))
+-   Font Face: Get name from "fontFamily" setting, not "name". ([54615](https://github.com/WordPress/gutenberg/pull/54615))
+-   Font Library: Fix modal width on mobile viewport. ([54518](https://github.com/WordPress/gutenberg/pull/54518))
+-   Font Library: Fix space above theme fonts in font library modal. ([54598](https://github.com/WordPress/gutenberg/pull/54598))
+-   Font Library: Fix error installing system fonts. ([54713](https://github.com/WordPress/gutenberg/pull/54713))
+-   Font Library: Remove font files created by tests after tests run. ([54771](https://github.com/WordPress/gutenberg/pull/54771))
+-   Font Library: Avoid rendering font library ui outisde gutenberg plugin. ([54830](https://github.com/WordPress/gutenberg/pull/54830))
 
 #### Widgets Editor
-- Edit Widgets: Fix broken layout. ([54372](https://github.com/WordPress/gutenberg/pull/54372))
-- Edit Widgets: Fix invisible action area when the top toolbar is enabled. ([54329](https://github.com/WordPress/gutenberg/pull/54329))
-- Fix top toolbar for the customizer widgets sidebar control. ([54255](https://github.com/WordPress/gutenberg/pull/54255))
+
+-   Edit Widgets: Fix broken layout. ([54372](https://github.com/WordPress/gutenberg/pull/54372))
+-   Edit Widgets: Fix invisible action area when the top toolbar is enabled. ([54329](https://github.com/WordPress/gutenberg/pull/54329))
+-   Fix top toolbar for the customizer widgets sidebar control. ([54255](https://github.com/WordPress/gutenberg/pull/54255))
 
 #### Global Styles
-- Font Library: Fix notification error for actions related to custom fonts. ([54535](https://github.com/WordPress/gutenberg/pull/54535))
-- Prevent layout changes from saving the whole inherited settings object. ([54500](https://github.com/WordPress/gutenberg/pull/54500))
+
+-   Font Library: Fix notification error for actions related to custom fonts. ([54535](https://github.com/WordPress/gutenberg/pull/54535))
+-   Prevent layout changes from saving the whole inherited settings object. ([54500](https://github.com/WordPress/gutenberg/pull/54500))
 
 #### Block API
-- Blocks: Fix incorrect placement for hooked blocks in the parent container. ([54349](https://github.com/WordPress/gutenberg/pull/54349))
-- Pass correct content argument to enter transforms. ([54108](https://github.com/WordPress/gutenberg/pull/54108))
-- Block Hooks: Avoid processing empty content for loaded templates. ([54719](https://github.com/WordPress/gutenberg/pull/54719))
+
+-   Blocks: Fix incorrect placement for hooked blocks in the parent container. ([54349](https://github.com/WordPress/gutenberg/pull/54349))
+-   Pass correct content argument to enter transforms. ([54108](https://github.com/WordPress/gutenberg/pull/54108))
+-   Block Hooks: Avoid processing empty content for loaded templates. ([54719](https://github.com/WordPress/gutenberg/pull/54719))
 
 #### Rich Text
-- Revert: Rich text: Copy tag name on internal paste. ([54301](https://github.com/WordPress/gutenberg/pull/54301))
+
+-   Revert: Rich text: Copy tag name on internal paste. ([54301](https://github.com/WordPress/gutenberg/pull/54301))
 
 #### Interactivity API
-- Image: Fix block serialization test case to cover deprecation of `behaviors`. ([54570](https://github.com/WordPress/gutenberg/pull/54570))
-- Query Loop: Select first anchor inside Post Template with "enhanced pagination" enabled. ([54730](https://github.com/WordPress/gutenberg/pull/54730))
+
+-   Image: Fix block serialization test case to cover deprecation of `behaviors`. ([54570](https://github.com/WordPress/gutenberg/pull/54570))
+-   Query Loop: Select first anchor inside Post Template with "enhanced pagination" enabled. ([54730](https://github.com/WordPress/gutenberg/pull/54730))
 
 #### Icons
-- Fix React forwardRef warnings for `TooltipAnchor`s. ([54492](https://github.com/WordPress/gutenberg/pull/54492))
+
+-   Fix React forwardRef warnings for `TooltipAnchor`s. ([54492](https://github.com/WordPress/gutenberg/pull/54492))
 
 #### History
-- Fix extra undo/redo step when removing or replacing all blocks. ([54457](https://github.com/WordPress/gutenberg/pull/54457))
+
+-   Fix extra undo/redo step when removing or replacing all blocks. ([54457](https://github.com/WordPress/gutenberg/pull/54457))
 
 #### Synced Patterns
-- Patterns: Apply layout and alignment to synced patterns in the editor. ([54416](https://github.com/WordPress/gutenberg/pull/54416))
+
+-   Patterns: Apply layout and alignment to synced patterns in the editor. ([54416](https://github.com/WordPress/gutenberg/pull/54416))
 
 #### npm Packages
-- Workflow: Fix the issue with npm publishing for WP major version. ([54088](https://github.com/WordPress/gutenberg/pull/54088))
+
+-   Workflow: Fix the issue with npm publishing for WP major version. ([54088](https://github.com/WordPress/gutenberg/pull/54088))
 
 #### Media
-- useMediaQuery: Avoid crashing on Safari < 14. ([54023](https://github.com/WordPress/gutenberg/pull/54023))
+
+-   useMediaQuery: Avoid crashing on Safari < 14. ([54023](https://github.com/WordPress/gutenberg/pull/54023))
 
 #### Nested / Inner Blocks
-- Fix: InnerBlocks allowed blocks change with different sizes. ([53943](https://github.com/WordPress/gutenberg/pull/53943))
+
+-   Fix: InnerBlocks allowed blocks change with different sizes. ([53943](https://github.com/WordPress/gutenberg/pull/53943))
 
 #### Layout
-- Post Content: Ensure layout classnames are applied in readonly preview. ([53864](https://github.com/WordPress/gutenberg/pull/53864))
+
+-   Post Content: Ensure layout classnames are applied in readonly preview. ([53864](https://github.com/WordPress/gutenberg/pull/53864))
 
 #### Document Settings
-- Set the timezone correctly. ([48083](https://github.com/WordPress/gutenberg/pull/48083))
+
+-   Set the timezone correctly. ([48083](https://github.com/WordPress/gutenberg/pull/48083))
 
 #### React i18n
-- Fix: Invalid import in react-i18n documentation. ([54308](https://github.com/WordPress/gutenberg/pull/54308))
+
+-   Fix: Invalid import in react-i18n documentation. ([54308](https://github.com/WordPress/gutenberg/pull/54308))
 
 #### Design Tools
-- Background Image control: Use consistent button, ensure descriptive text accounts for no image selected. ([54711](https://github.com/WordPress/gutenberg/pull/54711))
+
+-   Background Image control: Use consistent button, ensure descriptive text accounts for no image selected. ([54711](https://github.com/WordPress/gutenberg/pull/54711))
 
 #### Collaborative Editing
-- Make sure sync code only runs when experiment is enabled. ([54710](https://github.com/WordPress/gutenberg/pull/54710))
+
+-   Make sure sync code only runs when experiment is enabled. ([54710](https://github.com/WordPress/gutenberg/pull/54710))
 
 #### Core Data
-- core-data: Fix nested property access with undefined name. ([54790](https://github.com/WordPress/gutenberg/pull/54790))
 
+-   core-data: Fix nested property access with undefined name. ([54790](https://github.com/WordPress/gutenberg/pull/54790))
 
 ### Accessibility
 
 #### Block Library
-- Comments form: Accessibility fixes for back-end. ([54393](https://github.com/WordPress/gutenberg/pull/54393))
-- Navigation: Add ariaLabel block support. ([54418](https://github.com/WordPress/gutenberg/pull/54418))
-- Table block: Fix semantic structure for screen readers on back-end. ([54324](https://github.com/WordPress/gutenberg/pull/54324))
+
+-   Comments form: Accessibility fixes for back-end. ([54393](https://github.com/WordPress/gutenberg/pull/54393))
+-   Navigation: Add ariaLabel block support. ([54418](https://github.com/WordPress/gutenberg/pull/54418))
+-   Table block: Fix semantic structure for screen readers on back-end. ([54324](https://github.com/WordPress/gutenberg/pull/54324))
 
 #### Components
-- Improve Notice component accessibility. ([54498](https://github.com/WordPress/gutenberg/pull/54498))
-- Making Circular Option Picker a `listbox`. ([52255](https://github.com/WordPress/gutenberg/pull/52255))
-- Allow Modal to place focus on first element within contents via new API. ([54590](https://github.com/WordPress/gutenberg/pull/54590))
-- Improve the placeholder instructions accessibility. ([45801](https://github.com/WordPress/gutenberg/pull/45801))
+
+-   Improve Notice component accessibility. ([54498](https://github.com/WordPress/gutenberg/pull/54498))
+-   Making Circular Option Picker a `listbox`. ([52255](https://github.com/WordPress/gutenberg/pull/52255))
+-   Allow Modal to place focus on first element within contents via new API. ([54590](https://github.com/WordPress/gutenberg/pull/54590))
+-   Improve the placeholder instructions accessibility. ([45801](https://github.com/WordPress/gutenberg/pull/45801))
 
 #### Site Editor
-- Clarify the "Entity" message of the snackbar. ([54333](https://github.com/WordPress/gutenberg/pull/54333))
-- Use solid accent color selection in command palette. ([54318](https://github.com/WordPress/gutenberg/pull/54318))
+
+-   Clarify the "Entity" message of the snackbar. ([54333](https://github.com/WordPress/gutenberg/pull/54333))
+-   Use solid accent color selection in command palette. ([54318](https://github.com/WordPress/gutenberg/pull/54318))
 
 #### Block Editor
-- Update nofollow control label. ([54184](https://github.com/WordPress/gutenberg/pull/54184))
 
+-   Update nofollow control label. ([54184](https://github.com/WordPress/gutenberg/pull/54184))
 
 ### Performance
 
-- Use median instead of average to stabilize First Block metric. ([54157](https://github.com/WordPress/gutenberg/pull/54157))
-- improvement: Reduce the use of the `_wp_array_get` function. ([51116](https://github.com/WordPress/gutenberg/pull/51116))
+-   Use median instead of average to stabilize First Block metric. ([54157](https://github.com/WordPress/gutenberg/pull/54157))
+-   improvement: Reduce the use of the `_wp_array_get` function. ([51116](https://github.com/WordPress/gutenberg/pull/51116))
 
 #### Block Library
-- Footnotes: Add block-level caching when parsing content for footnotes. ([52577](https://github.com/WordPress/gutenberg/pull/52577))
-- Table of Contents: Use a custom store subscription for observing headings. ([54094](https://github.com/WordPress/gutenberg/pull/54094))
-- getClientIdsOfDescendants: Support single 'clientId' as a argument. ([54421](https://github.com/WordPress/gutenberg/pull/54421))
+
+-   Footnotes: Add block-level caching when parsing content for footnotes. ([52577](https://github.com/WordPress/gutenberg/pull/52577))
+-   Table of Contents: Use a custom store subscription for observing headings. ([54094](https://github.com/WordPress/gutenberg/pull/54094))
+-   getClientIdsOfDescendants: Support single 'clientId' as a argument. ([54421](https://github.com/WordPress/gutenberg/pull/54421))
 
 #### Site Editor
-- Edit site: Prevent enqueuing entire stylesheet in iframe. ([54254](https://github.com/WordPress/gutenberg/pull/54254))
-- Fix first block locator's page reference. ([54188](https://github.com/WordPress/gutenberg/pull/54188))
+
+-   Edit site: Prevent enqueuing entire stylesheet in iframe. ([54254](https://github.com/WordPress/gutenberg/pull/54254))
+-   Fix first block locator's page reference. ([54188](https://github.com/WordPress/gutenberg/pull/54188))
 
 #### Patterns
-- Move mapping of values from core-data selector into consumers. ([54576](https://github.com/WordPress/gutenberg/pull/54576))
+
+-   Move mapping of values from core-data selector into consumers. ([54576](https://github.com/WordPress/gutenberg/pull/54576))
 
 #### Block API
-- Unnecessary JSON decoding in block parser. ([54424](https://github.com/WordPress/gutenberg/pull/54424))
+
+-   Unnecessary JSON decoding in block parser. ([54424](https://github.com/WordPress/gutenberg/pull/54424))
 
 #### Components
-- Tooltip: Render tooltip markup in the DOM only when open. ([54312](https://github.com/WordPress/gutenberg/pull/54312))
+
+-   Tooltip: Render tooltip markup in the DOM only when open. ([54312](https://github.com/WordPress/gutenberg/pull/54312))
 
 #### Post Editor
-- Editor: Memoize 'getNestedEditedPostProperty' selector helper. ([54160](https://github.com/WordPress/gutenberg/pull/54160))
+
+-   Editor: Memoize 'getNestedEditedPostProperty' selector helper. ([54160](https://github.com/WordPress/gutenberg/pull/54160))
 
 #### Developer Experience
-- Tests: Improve the environment setup. ([54309](https://github.com/WordPress/gutenberg/pull/54309))
+
+-   Tests: Improve the environment setup. ([54309](https://github.com/WordPress/gutenberg/pull/54309))
 
 ### Experiments
 
 #### Interactivity API
-- Remove `wp_store` from query block. ([54359](https://github.com/WordPress/gutenberg/pull/54359))
 
+-   Remove `wp_store` from query block. ([54359](https://github.com/WordPress/gutenberg/pull/54359))
 
 ### Documentation
 
-- Add a documentation page to explain how to implement undo/redo in a third-party editor. ([54546](https://github.com/WordPress/gutenberg/pull/54546))
-- Add the Commands Data page to Handbook. ([53634](https://github.com/WordPress/gutenberg/pull/53634))
-- Bootstrap a documentation website tailored towards the usage of Gutenberg outside WordPress. ([54375](https://github.com/WordPress/gutenberg/pull/54375))
-- Button: Undocument the `focus` prop. ([54397](https://github.com/WordPress/gutenberg/pull/54397))
-- Docs: Add missing callout class. ([54558](https://github.com/WordPress/gutenberg/pull/54558))
-- Docs: Add note about enqueueing assets in the iframe and trim whitespace. ([54125](https://github.com/WordPress/gutenberg/pull/54125))
-- Docs: Consolidated design Reference with the main Design Contributions doc. ([51065](https://github.com/WordPress/gutenberg/pull/51065))
-- Docs: Move Glossary page to Getting Started. ([54120](https://github.com/WordPress/gutenberg/pull/54120))
-- Docs: Move the FAQ page to Getting Started. ([54117](https://github.com/WordPress/gutenberg/pull/54117))
-- Docs: Overhaul the Development Environment section of the Block Editor Handbook. ([54395](https://github.com/WordPress/gutenberg/pull/54395))
-- Docs: Remove Outreach doc from Getting Started section. ([54314](https://github.com/WordPress/gutenberg/pull/54314))
-- Docs: Remove unneeded block theme docs. ([51071](https://github.com/WordPress/gutenberg/pull/51071))
-- Fix bullet hierarchy. ([47178](https://github.com/WordPress/gutenberg/pull/47178))
-- Fix createI18n package import location. ([51328](https://github.com/WordPress/gutenberg/pull/51328))
-- Fix incorrect image src in Design Contributions doc. ([54302](https://github.com/WordPress/gutenberg/pull/54302))
-- Fix: Broken links on ToolbarGroup documentation. ([54229](https://github.com/WordPress/gutenberg/pull/54229))
-- Fix: Remove unrequired code from BorderControl documentation. ([54348](https://github.com/WordPress/gutenberg/pull/54348))
-- Fix: Wrapped `ref` in quotes in theme.json documentation. ([54591](https://github.com/WordPress/gutenberg/pull/54591))
-- Incorrect file extension?. ([54134](https://github.com/WordPress/gutenberg/pull/54134))
-- Theme JSON schema: Fix "not allowed error" in settings property. ([54521](https://github.com/WordPress/gutenberg/pull/54521))
-- Try: Allow `multiple` attribute to be a string in upload components. ([53350](https://github.com/WordPress/gutenberg/pull/53350))
-- Update Commands documentation with examples and more context. ([54441](https://github.com/WordPress/gutenberg/pull/54441))
-- Update the components changelog to mark the popover slot removal as a breaking change. ([54022](https://github.com/WordPress/gutenberg/pull/54022))
-- Update versions in WP for 6.3.1. ([54069](https://github.com/WordPress/gutenberg/pull/54069))
-- Updated Related Components Links. ([49176](https://github.com/WordPress/gutenberg/pull/49176))
-- Updates Edit and Save code examples to have matching open/closing tags. ([53915](https://github.com/WordPress/gutenberg/pull/53915))
-- [Docs:  Getting Started / Block Development Environment] Updates on the text to improve clarity and preciseness. ([54563](https://github.com/WordPress/gutenberg/pull/54563))
-- documentation - Contribution Triage: Formatted text and changed some titles and structure. ([54258](https://github.com/WordPress/gutenberg/pull/54258))
-- documentation [Block Editor Handbook / Getting Started / Block Development Environment]: Fix links. ([54571](https://github.com/WordPress/gutenberg/pull/54571))
-- Add missing global declaration in DocBlock of interactivity files. ([54683](https://github.com/WordPress/gutenberg/pull/54683))
-
+-   Add a documentation page to explain how to implement undo/redo in a third-party editor. ([54546](https://github.com/WordPress/gutenberg/pull/54546))
+-   Add the Commands Data page to Handbook. ([53634](https://github.com/WordPress/gutenberg/pull/53634))
+-   Bootstrap a documentation website tailored towards the usage of Gutenberg outside WordPress. ([54375](https://github.com/WordPress/gutenberg/pull/54375))
+-   Button: Undocument the `focus` prop. ([54397](https://github.com/WordPress/gutenberg/pull/54397))
+-   Docs: Add missing callout class. ([54558](https://github.com/WordPress/gutenberg/pull/54558))
+-   Docs: Add note about enqueueing assets in the iframe and trim whitespace. ([54125](https://github.com/WordPress/gutenberg/pull/54125))
+-   Docs: Consolidated design Reference with the main Design Contributions doc. ([51065](https://github.com/WordPress/gutenberg/pull/51065))
+-   Docs: Move Glossary page to Getting Started. ([54120](https://github.com/WordPress/gutenberg/pull/54120))
+-   Docs: Move the FAQ page to Getting Started. ([54117](https://github.com/WordPress/gutenberg/pull/54117))
+-   Docs: Overhaul the Development Environment section of the Block Editor Handbook. ([54395](https://github.com/WordPress/gutenberg/pull/54395))
+-   Docs: Remove Outreach doc from Getting Started section. ([54314](https://github.com/WordPress/gutenberg/pull/54314))
+-   Docs: Remove unneeded block theme docs. ([51071](https://github.com/WordPress/gutenberg/pull/51071))
+-   Fix bullet hierarchy. ([47178](https://github.com/WordPress/gutenberg/pull/47178))
+-   Fix createI18n package import location. ([51328](https://github.com/WordPress/gutenberg/pull/51328))
+-   Fix incorrect image src in Design Contributions doc. ([54302](https://github.com/WordPress/gutenberg/pull/54302))
+-   Fix: Broken links on ToolbarGroup documentation. ([54229](https://github.com/WordPress/gutenberg/pull/54229))
+-   Fix: Remove unrequired code from BorderControl documentation. ([54348](https://github.com/WordPress/gutenberg/pull/54348))
+-   Fix: Wrapped `ref` in quotes in theme.json documentation. ([54591](https://github.com/WordPress/gutenberg/pull/54591))
+-   Incorrect file extension?. ([54134](https://github.com/WordPress/gutenberg/pull/54134))
+-   Theme JSON schema: Fix "not allowed error" in settings property. ([54521](https://github.com/WordPress/gutenberg/pull/54521))
+-   Try: Allow `multiple` attribute to be a string in upload components. ([53350](https://github.com/WordPress/gutenberg/pull/53350))
+-   Update Commands documentation with examples and more context. ([54441](https://github.com/WordPress/gutenberg/pull/54441))
+-   Update the components changelog to mark the popover slot removal as a breaking change. ([54022](https://github.com/WordPress/gutenberg/pull/54022))
+-   Update versions in WP for 6.3.1. ([54069](https://github.com/WordPress/gutenberg/pull/54069))
+-   Updated Related Components Links. ([49176](https://github.com/WordPress/gutenberg/pull/49176))
+-   Updates Edit and Save code examples to have matching open/closing tags. ([53915](https://github.com/WordPress/gutenberg/pull/53915))
+-   [Docs: Getting Started / Block Development Environment] Updates on the text to improve clarity and preciseness. ([54563](https://github.com/WordPress/gutenberg/pull/54563))
+-   documentation - Contribution Triage: Formatted text and changed some titles and structure. ([54258](https://github.com/WordPress/gutenberg/pull/54258))
+-   documentation [Block Editor Handbook / Getting Started / Block Development Environment]: Fix links. ([54571](https://github.com/WordPress/gutenberg/pull/54571))
+-   Add missing global declaration in DocBlock of interactivity files. ([54683](https://github.com/WordPress/gutenberg/pull/54683))
 
 ### Code Quality
 
-- Adds removal notice to view.js.mustache. ([54105](https://github.com/WordPress/gutenberg/pull/54105))
-- Block editor: Remove `__unstableElementContext` and filter `EditorStyles` instead. ([52888](https://github.com/WordPress/gutenberg/pull/52888))
-- Improving error messages and codes in jest-console, matcher.js. ([53743](https://github.com/WordPress/gutenberg/pull/53743))
-- Indicate nested paths on __experimentalSaveSpecifiedEntityEdits. ([54161](https://github.com/WordPress/gutenberg/pull/54161))
-- JS unit tests: Update popover matcher. ([54168](https://github.com/WordPress/gutenberg/pull/54168))
-- Style engine: Sync doc changes from core. ([54650](https://github.com/WordPress/gutenberg/pull/54650))
+-   Adds removal notice to view.js.mustache. ([54105](https://github.com/WordPress/gutenberg/pull/54105))
+-   Block editor: Remove `__unstableElementContext` and filter `EditorStyles` instead. ([52888](https://github.com/WordPress/gutenberg/pull/52888))
+-   Improving error messages and codes in jest-console, matcher.js. ([53743](https://github.com/WordPress/gutenberg/pull/53743))
+-   Indicate nested paths on \_\_experimentalSaveSpecifiedEntityEdits. ([54161](https://github.com/WordPress/gutenberg/pull/54161))
+-   JS unit tests: Update popover matcher. ([54168](https://github.com/WordPress/gutenberg/pull/54168))
+-   Style engine: Sync doc changes from core. ([54650](https://github.com/WordPress/gutenberg/pull/54650))
 
 #### Components
-- Composite: Refactor to TypeScript. ([54028](https://github.com/WordPress/gutenberg/pull/54028))
-- FocusableIframe: Refactor to TypeScript. ([53979](https://github.com/WordPress/gutenberg/pull/53979))
-- IsolatedEventContainer to Typescript (just test file). ([54316](https://github.com/WordPress/gutenberg/pull/54316))
-- Popover: Remove custom frame scroll/resize listeners. ([54286](https://github.com/WordPress/gutenberg/pull/54286))
-- Revert  FormTokenField - add prop to allow saving of tokens onBlur. ([54444](https://github.com/WordPress/gutenberg/pull/54444))
-- Toolbar/ToolbarDropdownMenu Typescript Conversion. ([54321](https://github.com/WordPress/gutenberg/pull/54321))
-- ToolbarGroup - Typescript. ([54317](https://github.com/WordPress/gutenberg/pull/54317))
-- with-focus-outside: Convert to TypeScript. ([53980](https://github.com/WordPress/gutenberg/pull/53980))
+
+-   Composite: Refactor to TypeScript. ([54028](https://github.com/WordPress/gutenberg/pull/54028))
+-   FocusableIframe: Refactor to TypeScript. ([53979](https://github.com/WordPress/gutenberg/pull/53979))
+-   IsolatedEventContainer to Typescript (just test file). ([54316](https://github.com/WordPress/gutenberg/pull/54316))
+-   Popover: Remove custom frame scroll/resize listeners. ([54286](https://github.com/WordPress/gutenberg/pull/54286))
+-   Revert FormTokenField - add prop to allow saving of tokens onBlur. ([54444](https://github.com/WordPress/gutenberg/pull/54444))
+-   Toolbar/ToolbarDropdownMenu Typescript Conversion. ([54321](https://github.com/WordPress/gutenberg/pull/54321))
+-   ToolbarGroup - Typescript. ([54317](https://github.com/WordPress/gutenberg/pull/54317))
+-   with-focus-outside: Convert to TypeScript. ([53980](https://github.com/WordPress/gutenberg/pull/53980))
 
 #### Patterns
--  Revert usePatternsState to return an array instead of object. ([54582](https://github.com/WordPress/gutenberg/pull/54582))
-- Add missing dependency of `@wordpress/patterns` on `@babel/runtime`. ([54118](https://github.com/WordPress/gutenberg/pull/54118))
-- Move category map creation out of useSelect. ([54584](https://github.com/WordPress/gutenberg/pull/54584))
-- Remove experimental prefixes from patterns package. ([54338](https://github.com/WordPress/gutenberg/pull/54338))
-- Site editor: Consolidate constants. ([54484](https://github.com/WordPress/gutenberg/pull/54484))
-- Fix sidebar nav screen fallback category. ([54754](https://github.com/WordPress/gutenberg/pull/54754))
+
+-   Revert usePatternsState to return an array instead of object. ([54582](https://github.com/WordPress/gutenberg/pull/54582))
+-   Add missing dependency of `@wordpress/patterns` on `@babel/runtime`. ([54118](https://github.com/WordPress/gutenberg/pull/54118))
+-   Move category map creation out of useSelect. ([54584](https://github.com/WordPress/gutenberg/pull/54584))
+-   Remove experimental prefixes from patterns package. ([54338](https://github.com/WordPress/gutenberg/pull/54338))
+-   Site editor: Consolidate constants. ([54484](https://github.com/WordPress/gutenberg/pull/54484))
+-   Fix sidebar nav screen fallback category. ([54754](https://github.com/WordPress/gutenberg/pull/54754))
 
 #### Post Editor
-- Annotations: Run end-to-end tests with iframe. ([54191](https://github.com/WordPress/gutenberg/pull/54191))
-- EditPostPreferencesModal: Refactor to remove snapshots for index.js. ([54141](https://github.com/WordPress/gutenberg/pull/54141))
-- Extract WordPress specific styles from the BlockTools component. ([54356](https://github.com/WordPress/gutenberg/pull/54356))
-- PageAttributesParent: A minor fixes for useSelect and useMemo hook usages. ([54433](https://github.com/WordPress/gutenberg/pull/54433))
-- PostSyncStatus: Derive sync status inside the selector. ([54159](https://github.com/WordPress/gutenberg/pull/54159))
+
+-   Annotations: Run end-to-end tests with iframe. ([54191](https://github.com/WordPress/gutenberg/pull/54191))
+-   EditPostPreferencesModal: Refactor to remove snapshots for index.js. ([54141](https://github.com/WordPress/gutenberg/pull/54141))
+-   Extract WordPress specific styles from the BlockTools component. ([54356](https://github.com/WordPress/gutenberg/pull/54356))
+-   PageAttributesParent: A minor fixes for useSelect and useMemo hook usages. ([54433](https://github.com/WordPress/gutenberg/pull/54433))
+-   PostSyncStatus: Derive sync status inside the selector. ([54159](https://github.com/WordPress/gutenberg/pull/54159))
 
 #### Block Library
-- Heading: Remove unused 'aria-label'. ([54223](https://github.com/WordPress/gutenberg/pull/54223))
-- Image Editor: Fix ESLint warnings and remove unnecessary dependencies. ([53506](https://github.com/WordPress/gutenberg/pull/53506))
-- Pattern Category: Set 'publicly_queryable' to false. ([54567](https://github.com/WordPress/gutenberg/pull/54567))
-- Post Terms: Fix a 'useSelect' warning in the 'usePostTerms' hook. ([54068](https://github.com/WordPress/gutenberg/pull/54068))
+
+-   Heading: Remove unused 'aria-label'. ([54223](https://github.com/WordPress/gutenberg/pull/54223))
+-   Image Editor: Fix ESLint warnings and remove unnecessary dependencies. ([53506](https://github.com/WordPress/gutenberg/pull/53506))
+-   Pattern Category: Set 'publicly_queryable' to false. ([54567](https://github.com/WordPress/gutenberg/pull/54567))
+-   Post Terms: Fix a 'useSelect' warning in the 'usePostTerms' hook. ([54068](https://github.com/WordPress/gutenberg/pull/54068))
 
 #### Interactivity API
-- Prepare image lightbox for private version of the Interactivity API in 6 4. ([54547](https://github.com/WordPress/gutenberg/pull/54547))
-- Remove `gutenberg_should_block_use_interactivity_api ` and the old implementation of interactive blocks. ([54297](https://github.com/WordPress/gutenberg/pull/54297))
-- Search block: Switch interactivity to the Interactivity API. ([53343](https://github.com/WordPress/gutenberg/pull/53343))
+
+-   Prepare image lightbox for private version of the Interactivity API in 6 4. ([54547](https://github.com/WordPress/gutenberg/pull/54547))
+-   Remove `gutenberg_should_block_use_interactivity_api ` and the old implementation of interactive blocks. ([54297](https://github.com/WordPress/gutenberg/pull/54297))
+-   Search block: Switch interactivity to the Interactivity API. ([53343](https://github.com/WordPress/gutenberg/pull/53343))
 
 #### Site Editor
-- Remove Tooltip workarounds added in the site and block editor. ([54450](https://github.com/WordPress/gutenberg/pull/54450))
-- Revisions: Remove 'gutenberg' query param from revisions.php. ([54166](https://github.com/WordPress/gutenberg/pull/54166))
-- Prune store constants. ([54585](https://github.com/WordPress/gutenberg/pull/54585))
-- Use constants rather than hard coded template strings. ([54586](https://github.com/WordPress/gutenberg/pull/54586))
+
+-   Remove Tooltip workarounds added in the site and block editor. ([54450](https://github.com/WordPress/gutenberg/pull/54450))
+-   Revisions: Remove 'gutenberg' query param from revisions.php. ([54166](https://github.com/WordPress/gutenberg/pull/54166))
+-   Prune store constants. ([54585](https://github.com/WordPress/gutenberg/pull/54585))
+-   Use constants rather than hard coded template strings. ([54586](https://github.com/WordPress/gutenberg/pull/54586))
 
 #### Rich Text
-- RichText: Remove __unstableOnSplitMiddle. ([54183](https://github.com/WordPress/gutenberg/pull/54183))
+
+-   RichText: Remove \_\_unstableOnSplitMiddle. ([54183](https://github.com/WordPress/gutenberg/pull/54183))
 
 #### Typography
-- Fluid typography: Backporting Core @since annotations. ([54204](https://github.com/WordPress/gutenberg/pull/54204))
-- Font Face: Remove static instance in wp_print_font_faces(). ([54228](https://github.com/WordPress/gutenberg/pull/54228))
-- Font Library: Refactor logic to disable font library in the frontend. ([54748](https://github.com/WordPress/gutenberg/pull/54748))
+
+-   Fluid typography: Backporting Core @since annotations. ([54204](https://github.com/WordPress/gutenberg/pull/54204))
+-   Font Face: Remove static instance in wp_print_font_faces(). ([54228](https://github.com/WordPress/gutenberg/pull/54228))
+-   Font Library: Refactor logic to disable font library in the frontend. ([54748](https://github.com/WordPress/gutenberg/pull/54748))
 
 #### Block Editor
-- Improve code commenting around focus mount behaviour of rich text Link UI. ([54085](https://github.com/WordPress/gutenberg/pull/54085))
-- List e2e: Run all tests with iframe. ([54181](https://github.com/WordPress/gutenberg/pull/54181))
+
+-   Improve code commenting around focus mount behaviour of rich text Link UI. ([54085](https://github.com/WordPress/gutenberg/pull/54085))
+-   List e2e: Run all tests with iframe. ([54181](https://github.com/WordPress/gutenberg/pull/54181))
 
 #### Layout
-- Use override editor style API. ([54466](https://github.com/WordPress/gutenberg/pull/54466))
+
+-   Use override editor style API. ([54466](https://github.com/WordPress/gutenberg/pull/54466))
 
 #### Plugin
-- Require minimum WordPress 6.2. ([53451](https://github.com/WordPress/gutenberg/pull/53451))
-- Ensure that Block Hooks work correctly after landing in WP core. ([54651](https://github.com/WordPress/gutenberg/pull/54651))
-- Update uuid package to 9.0.1. ([54725](https://github.com/WordPress/gutenberg/pull/54725))
+
+-   Require minimum WordPress 6.2. ([53451](https://github.com/WordPress/gutenberg/pull/53451))
+-   Ensure that Block Hooks work correctly after landing in WP core. ([54651](https://github.com/WordPress/gutenberg/pull/54651))
+-   Update uuid package to 9.0.1. ([54725](https://github.com/WordPress/gutenberg/pull/54725))
 
 #### Themes
-- Iframe: Skip scoping styles. ([46752](https://github.com/WordPress/gutenberg/pull/46752))
 
+-   Iframe: Skip scoping styles. ([46752](https://github.com/WordPress/gutenberg/pull/46752))
 
 ### Tools
 
 #### Testing
-- Button: Update test assertion to match test name. ([54260](https://github.com/WordPress/gutenberg/pull/54260))
-- E2E: Do not run page actions in beforeEach hook when using fixme. ([54065](https://github.com/WordPress/gutenberg/pull/54065))
-- Fix Font library unit tests. ([54645](https://github.com/WordPress/gutenberg/pull/54645))
-- Font Library: Remove upload_mimes filter after uploading fonts. ([54647](https://github.com/WordPress/gutenberg/pull/54647))
-- Migrate RichText end-to-end tests to Playwright. ([53493](https://github.com/WordPress/gutenberg/pull/53493))
-- Perf Tests: Update base point to compare. ([54111](https://github.com/WordPress/gutenberg/pull/54111))
-- Puppeteer tests: Try to fix failing tests related to notices in core. ([54452](https://github.com/WordPress/gutenberg/pull/54452))
-- Remove accidental addition of perf test results (2). ([54363](https://github.com/WordPress/gutenberg/pull/54363))
-- Remove accidental addition of perf test results. ([54355](https://github.com/WordPress/gutenberg/pull/54355))
-- Update WPCS to v3.0, and fix all reported Coding Standards issues. ([53866](https://github.com/WordPress/gutenberg/pull/53866))
-- `Modal`: Add more unit tests. ([54569](https://github.com/WordPress/gutenberg/pull/54569))
-- end-to-end Test Utils: Add new fixtures for performance metrics. ([52993](https://github.com/WordPress/gutenberg/pull/52993))
-- end-to-end Tests: Fix 'no-useless-not' ESLint warnings. ([54652](https://github.com/WordPress/gutenberg/pull/54652))
-- package(e2e-test-utils): Update fixtures. ([54128](https://github.com/WordPress/gutenberg/pull/54128))
-- wp-scripts: Add support for Playwright. ([53108](https://github.com/WordPress/gutenberg/pull/53108))
-- Font Library: Use resolvable domain in test. ([54763](https://github.com/WordPress/gutenberg/pull/54763))
-- Global styles tests: Fire hooks when updating post. ([54836](https://github.com/WordPress/gutenberg/pull/54836))
-- Remove action to fix tests. ([54806](https://github.com/WordPress/gutenberg/pull/54806))
-- Font Library: Fix set upload dir test. ([54762](https://github.com/WordPress/gutenberg/pull/54762))
 
-#### Build Tooling
-- Backport tools: Filter PRs to be cherry picked by merged date. ([54171](https://github.com/WordPress/gutenberg/pull/54171))
-- Changelog tool: Update Automated Testing label. ([54070](https://github.com/WordPress/gutenberg/pull/54070))
-- Running npm run format:Php may result in an error. ([54162](https://github.com/WordPress/gutenberg/pull/54162))
-- Scripts:  Correctly resolve entry points when the directory is symlinked. ([54212](https://github.com/WordPress/gutenberg/pull/54212))
-- Upgrade wp-prettier to v3.0.3. ([54539](https://github.com/WordPress/gutenberg/pull/54539))
-- Update typescript-eslint to v6. ([53975](https://github.com/WordPress/gutenberg/pull/53975))
+-   Button: Update test assertion to match test name. ([54260](https://github.com/WordPress/gutenberg/pull/54260))
+-   E2E: Do not run page actions in beforeEach hook when using fixme. ([54065](https://github.com/WordPress/gutenberg/pull/54065))
+-   Fix Font library unit tests. ([54645](https://github.com/WordPress/gutenberg/pull/54645))
+-   Font Library: Remove upload_mimes filter after uploading fonts. ([54647](https://github.com/WordPress/gutenberg/pull/54647))
+-   Migrate RichText end-to-end tests to Playwright. ([53493](https://github.com/WordPress/gutenberg/pull/53493))
+-   Perf Tests: Update base point to compare. ([54111](https://github.com/WordPress/gutenberg/pull/54111))
+-   Puppeteer tests: Try to fix failing tests related to notices in core. ([54452](https://github.com/WordPress/gutenberg/pull/54452))
+-   Remove accidental addition of perf test results (2). ([54363](https://github.com/WordPress/gutenberg/pull/54363))
+-   Remove accidental addition of perf test results. ([54355](https://github.com/WordPress/gutenberg/pull/54355))
+-   Update WPCS to v3.0, and fix all reported Coding Standards issues. ([53866](https://github.com/WordPress/gutenberg/pull/53866))
+-   `Modal`: Add more unit tests. ([54569](https://github.com/WordPress/gutenberg/pull/54569))
+-   end-to-end Test Utils: Add new fixtures for performance metrics. ([52993](https://github.com/WordPress/gutenberg/pull/52993))
+-   end-to-end Tests: Fix 'no-useless-not' ESLint warnings. ([54652](https://github.com/WordPress/gutenberg/pull/54652))
+-   package(e2e-test-utils): Update fixtures. ([54128](https://github.com/WordPress/gutenberg/pull/54128))
+-   wp-scripts: Add support for Playwright. ([53108](https://github.com/WordPress/gutenberg/pull/53108))
+-   Font Library: Use resolvable domain in test. ([54763](https://github.com/WordPress/gutenberg/pull/54763))
+-   Global styles tests: Fire hooks when updating post. ([54836](https://github.com/WordPress/gutenberg/pull/54836))
+-   Remove action to fix tests. ([54806](https://github.com/WordPress/gutenberg/pull/54806))
+-   Font Library: Fix set upload dir test. ([54762](https://github.com/WordPress/gutenberg/pull/54762))
 
+#### Build Tooling
 
-## First time contributors
+-   Backport tools: Filter PRs to be cherry picked by merged date. ([54171](https://github.com/WordPress/gutenberg/pull/54171))
+-   Changelog tool: Update Automated Testing label. ([54070](https://github.com/WordPress/gutenberg/pull/54070))
+-   Running npm run format:Php may result in an error. ([54162](https://github.com/WordPress/gutenberg/pull/54162))
+-   Scripts: Correctly resolve entry points when the directory is symlinked. ([54212](https://github.com/WordPress/gutenberg/pull/54212))
+-   Upgrade wp-prettier to v3.0.3. ([54539](https://github.com/WordPress/gutenberg/pull/54539))
+-   Update typescript-eslint to v6. ([53975](https://github.com/WordPress/gutenberg/pull/53975))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @andrewhayward: Making Circular Option Picker a `listbox`. ([52255](https://github.com/WordPress/gutenberg/pull/52255))
-- @jamiemchale: Fix createI18n package import location. ([51328](https://github.com/WordPress/gutenberg/pull/51328))
-- @johnhooks: refactor(blob): Type URL parameter as optional. ([49201](https://github.com/WordPress/gutenberg/pull/49201))
-- @MericKarabulut: Improving error messages and codes in jest-console, matcher.js. ([53743](https://github.com/WordPress/gutenberg/pull/53743))
-- @Piyush-Deshmukh: Fix: Wrapped `ref` in quotes in theme.json documentation. ([54591](https://github.com/WordPress/gutenberg/pull/54591))
-- @Rajinsharwar: Editor: Catch errors when creating terms. ([53369](https://github.com/WordPress/gutenberg/pull/53369))
-- @toolstack: Set the timezone correctly. ([48083](https://github.com/WordPress/gutenberg/pull/48083))
+The following PRs were merged by first-time contributors:
 
+-   @andrewhayward: Making Circular Option Picker a `listbox`. ([52255](https://github.com/WordPress/gutenberg/pull/52255))
+-   @jamiemchale: Fix createI18n package import location. ([51328](https://github.com/WordPress/gutenberg/pull/51328))
+-   @johnhooks: refactor(blob): Type URL parameter as optional. ([49201](https://github.com/WordPress/gutenberg/pull/49201))
+-   @MericKarabulut: Improving error messages and codes in jest-console, matcher.js. ([53743](https://github.com/WordPress/gutenberg/pull/53743))
+-   @Piyush-Deshmukh: Fix: Wrapped `ref` in quotes in theme.json documentation. ([54591](https://github.com/WordPress/gutenberg/pull/54591))
+-   @Rajinsharwar: Editor: Catch errors when creating terms. ([53369](https://github.com/WordPress/gutenberg/pull/53369))
+-   @toolstack: Set the timezone correctly. ([48083](https://github.com/WordPress/gutenberg/pull/48083))
 
 ## Contributors
 
@@ -2460,7 +13194,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @alexstine @andrewhayward @andrewserong @annezazu @anomiex @anton-vlasenko @aristath @artemiomorales @atachibana @bangank36 @bfintal @bph @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @chintu51 @ciampo @DAreRodz @dcalhoun @derekblank @draganescu @ediamin @ellatrix @fluiddot @gaambo @geriux @getdave @glendaviesnz @gvgvgvijayan @gziolo @hellofromtonya @jameskoster @jamiemchale @jeherve @jffng @johnhooks @jordesign @jorgefilipecosta @joshuatf @jrtashjian @jsnajdr @juanmaguitar @kevin940726 @kkoppenhaver @kmanijak @leewillis77 @luisherranz @madhusudhand @MaggieCabrera @Mamaduka @margolisj @masteradhoc @matiasbenedetto @mburridge @mcsf @MericKarabulut @mhimon @michalczaplinski @mikachan @mikejolley @mokagio @ndiego @ntsekouras @Olein-jp @petitphp @Piyush-Deshmukh @Rajinsharwar @ramonjd @richtabor @SantosGuillamot @SaxonF @scruffian @spacedmonkey @stokesman @swissspidy @t-hamano @tellthemachines @thelovekesh @toolstack @torounit @tyxla @vcanales @walbo @WunderBart @youknowriad
 
-
 = 16.6.0 =
 
 ## Changelog
@@ -2468,249 +13201,275 @@ The following contributors merged PRs in this release:
 ### Features
 
 #### Interactivity API
-- Add Slot and Fill directives. ([53958](https://github.com/WordPress/gutenberg/pull/53958))
-- Query block: Client-side pagination. ([53812](https://github.com/WordPress/gutenberg/pull/53812))
-- Update `data-wp-bind` directive logic. ([54003](https://github.com/WordPress/gutenberg/pull/54003))
-- Query block: Move "Enhance pagination" toggle under Settings. ([54198](https://github.com/WordPress/gutenberg/pull/54198))
+
+-   Add Slot and Fill directives. ([53958](https://github.com/WordPress/gutenberg/pull/53958))
+-   Query block: Client-side pagination. ([53812](https://github.com/WordPress/gutenberg/pull/53812))
+-   Update `data-wp-bind` directive logic. ([54003](https://github.com/WordPress/gutenberg/pull/54003))
+-   Query block: Move "Enhance pagination" toggle under Settings. ([54198](https://github.com/WordPress/gutenberg/pull/54198))
 
 ### Enhancements
 
-- Bundle ObserveTyping within the BlockList component. ([53875](https://github.com/WordPress/gutenberg/pull/53875))
-- Default appender: Hide the dashed indicator until ancestor is selected. ([53761](https://github.com/WordPress/gutenberg/pull/53761))
-- Register the block editor keyboard shortcuts automatically when using BlockEditorProvider. ([53910](https://github.com/WordPress/gutenberg/pull/53910))
-- [Commands]: Add toggle list view command in site editor. ([53983](https://github.com/WordPress/gutenberg/pull/53983))
+-   Bundle ObserveTyping within the BlockList component. ([53875](https://github.com/WordPress/gutenberg/pull/53875))
+-   Default appender: Hide the dashed indicator until ancestor is selected. ([53761](https://github.com/WordPress/gutenberg/pull/53761))
+-   Register the block editor keyboard shortcuts automatically when using BlockEditorProvider. ([53910](https://github.com/WordPress/gutenberg/pull/53910))
+-   [Commands]: Add toggle list view command in site editor. ([53983](https://github.com/WordPress/gutenberg/pull/53983))
 
 #### Components
-- Bundle SlotFillProvider within BlockEditorProvider. ([53940](https://github.com/WordPress/gutenberg/pull/53940))
-- Make the Popover.Slot optional. ([53889](https://github.com/WordPress/gutenberg/pull/53889))
-- Popover: Update `@floating-ui` to latest version, remove custom fix for iframe positioning and scaling. ([46845](https://github.com/WordPress/gutenberg/pull/46845))
-- `AlignmentMatrixControl`: Replace `act()` with `userEvent`. ([53703](https://github.com/WordPress/gutenberg/pull/53703))
-- `ProgressBar`: Add transition to determinate indicator. ([53877](https://github.com/WordPress/gutenberg/pull/53877))
+
+-   Bundle SlotFillProvider within BlockEditorProvider. ([53940](https://github.com/WordPress/gutenberg/pull/53940))
+-   Make the Popover.Slot optional. ([53889](https://github.com/WordPress/gutenberg/pull/53889))
+-   Popover: Update `@floating-ui` to latest version, remove custom fix for iframe positioning and scaling. ([46845](https://github.com/WordPress/gutenberg/pull/46845))
+-   `AlignmentMatrixControl`: Replace `act()` with `userEvent`. ([53703](https://github.com/WordPress/gutenberg/pull/53703))
+-   `ProgressBar`: Add transition to determinate indicator. ([53877](https://github.com/WordPress/gutenberg/pull/53877))
 
 #### Block Library
-- Blocks: Move bootstrapped block types to Redux state. ([53807](https://github.com/WordPress/gutenberg/pull/53807))
-- Capture toolbars in navigation block. ([53697](https://github.com/WordPress/gutenberg/pull/53697))
-- Content Block: Change placeholder and end-to-end test to refer to Content block. ([53902](https://github.com/WordPress/gutenberg/pull/53902))
-- Make mid size parameter settable for Query Pagination block. ([51216](https://github.com/WordPress/gutenberg/pull/51216))
+
+-   Blocks: Move bootstrapped block types to Redux state. ([53807](https://github.com/WordPress/gutenberg/pull/53807))
+-   Capture toolbars in navigation block. ([53697](https://github.com/WordPress/gutenberg/pull/53697))
+-   Content Block: Change placeholder and end-to-end test to refer to Content block. ([53902](https://github.com/WordPress/gutenberg/pull/53902))
+-   Make mid size parameter settable for Query Pagination block. ([51216](https://github.com/WordPress/gutenberg/pull/51216))
 
 #### Block Editor
-- Capture toolbars in quote block. ([53699](https://github.com/WordPress/gutenberg/pull/53699))
-- Improve writing flow for lists by capturing list item toolbars. ([53306](https://github.com/WordPress/gutenberg/pull/53306))
-- RichTextValue: Typescript Adjustment. ([54002](https://github.com/WordPress/gutenberg/pull/54002))
+
+-   Capture toolbars in quote block. ([53699](https://github.com/WordPress/gutenberg/pull/53699))
+-   Improve writing flow for lists by capturing list item toolbars. ([53306](https://github.com/WordPress/gutenberg/pull/53306))
+-   RichTextValue: Typescript Adjustment. ([54002](https://github.com/WordPress/gutenberg/pull/54002))
 
 #### Typography
-- Font Face: Prepare for merge into Core. ([53858](https://github.com/WordPress/gutenberg/pull/53858))
-- Renames "Fonts Library" to "Font Library". ([53780](https://github.com/WordPress/gutenberg/pull/53780))
+
+-   Font Face: Prepare for merge into Core. ([53858](https://github.com/WordPress/gutenberg/pull/53858))
+-   Renames "Fonts Library" to "Font Library". ([53780](https://github.com/WordPress/gutenberg/pull/53780))
 
 #### Post Editor
-- Edit Post: Use hooks instead of HoCs in `TaxonomyPanel`. ([53773](https://github.com/WordPress/gutenberg/pull/53773))
+
+-   Edit Post: Use hooks instead of HoCs in `TaxonomyPanel`. ([53773](https://github.com/WordPress/gutenberg/pull/53773))
 
 #### List View
-- Add keyboard shortcut for duplicating blocks. ([53559](https://github.com/WordPress/gutenberg/pull/53559))
+
+-   Add keyboard shortcut for duplicating blocks. ([53559](https://github.com/WordPress/gutenberg/pull/53559))
 
 #### Patterns
-- Add a custom taxonomy for user created patterns. ([53163](https://github.com/WordPress/gutenberg/pull/53163))
 
+-   Add a custom taxonomy for user created patterns. ([53163](https://github.com/WordPress/gutenberg/pull/53163))
 
 ### New APIs
 
 #### Interactivity API
-- Router with region-based client-side navigation. ([53733](https://github.com/WordPress/gutenberg/pull/53733))
 
+-   Router with region-based client-side navigation. ([53733](https://github.com/WordPress/gutenberg/pull/53733))
 
 ### Bug Fixes
 
-- Add missing aria roles for block locking toolbar and menu buttons. ([53734](https://github.com/WordPress/gutenberg/pull/53734))
-- Block Editor: Fix cleanup in the 'useNavModeExit' hook. ([53795](https://github.com/WordPress/gutenberg/pull/53795))
-- Command Palette: Fix crash on block-related commands. ([53923](https://github.com/WordPress/gutenberg/pull/53923))
-- Date: Add relative time translations for moment.js. ([53931](https://github.com/WordPress/gutenberg/pull/53931))
-- Date: Update translation domains for strings to be translatable. ([53995](https://github.com/WordPress/gutenberg/pull/53995))
-- Iframe: Set character encoding to utf-8. ([53519](https://github.com/WordPress/gutenberg/pull/53519))
-- Replace horizontal ellipsis icon with vertical ellipsis icon. ([52731](https://github.com/WordPress/gutenberg/pull/52731))
-- Toggle Distraction free mode mode based on compatibility. ([54030](https://github.com/WordPress/gutenberg/pull/54030))
-- Warning: Introduce `SCRIPT_DEBUG` to make the package compatible with webpack 5. ([50122](https://github.com/WordPress/gutenberg/pull/50122))
-- [Commands]: Fix `move to` command condition for registering. ([54049](https://github.com/WordPress/gutenberg/pull/54049))
-- [Commands]: Fix block editor commands availability. ([53994](https://github.com/WordPress/gutenberg/pull/53994))
-- [Format library]: Fix `language` popover position. ([53841](https://github.com/WordPress/gutenberg/pull/53841))
-
-#### Block Library
-- Add init.js module for the Footnotes block. ([53763](https://github.com/WordPress/gutenberg/pull/53763))
-- Adding center align css for social icon issue. ([43120](https://github.com/WordPress/gutenberg/pull/43120))
-- Cover block: Fix exception when adding video background. ([53961](https://github.com/WordPress/gutenberg/pull/53961))
-- List View: Allow replacing template part when a block isn't selected. ([53757](https://github.com/WordPress/gutenberg/pull/53757))
-- Post Navigation Link: Remove unnecessary space between arrows and label. ([53572](https://github.com/WordPress/gutenberg/pull/53572))
-- Search block: Fix width input field. ([53952](https://github.com/WordPress/gutenberg/pull/53952))
-- Simplify check for no posts in query-no-results block. ([53772](https://github.com/WordPress/gutenberg/pull/53772))
-- Site Logo: Remove line-height for the anchor element. ([53909](https://github.com/WordPress/gutenberg/pull/53909))
+-   Add missing aria roles for block locking toolbar and menu buttons. ([53734](https://github.com/WordPress/gutenberg/pull/53734))
+-   Block Editor: Fix cleanup in the 'useNavModeExit' hook. ([53795](https://github.com/WordPress/gutenberg/pull/53795))
+-   Command Palette: Fix crash on block-related commands. ([53923](https://github.com/WordPress/gutenberg/pull/53923))
+-   Date: Add relative time translations for moment.js. ([53931](https://github.com/WordPress/gutenberg/pull/53931))
+-   Date: Update translation domains for strings to be translatable. ([53995](https://github.com/WordPress/gutenberg/pull/53995))
+-   Iframe: Set character encoding to utf-8. ([53519](https://github.com/WordPress/gutenberg/pull/53519))
+-   Replace horizontal ellipsis icon with vertical ellipsis icon. ([52731](https://github.com/WordPress/gutenberg/pull/52731))
+-   Toggle Distraction free mode mode based on compatibility. ([54030](https://github.com/WordPress/gutenberg/pull/54030))
+-   Warning: Introduce `SCRIPT_DEBUG` to make the package compatible with webpack 5. ([50122](https://github.com/WordPress/gutenberg/pull/50122))
+-   [Commands]: Fix `move to` command condition for registering. ([54049](https://github.com/WordPress/gutenberg/pull/54049))
+-   [Commands]: Fix block editor commands availability. ([53994](https://github.com/WordPress/gutenberg/pull/53994))
+-   [Format library]: Fix `language` popover position. ([53841](https://github.com/WordPress/gutenberg/pull/53841))
+
+#### Block Library
+
+-   Add init.js module for the Footnotes block. ([53763](https://github.com/WordPress/gutenberg/pull/53763))
+-   Adding center align css for social icon issue. ([43120](https://github.com/WordPress/gutenberg/pull/43120))
+-   Cover block: Fix exception when adding video background. ([53961](https://github.com/WordPress/gutenberg/pull/53961))
+-   List View: Allow replacing template part when a block isn't selected. ([53757](https://github.com/WordPress/gutenberg/pull/53757))
+-   Post Navigation Link: Remove unnecessary space between arrows and label. ([53572](https://github.com/WordPress/gutenberg/pull/53572))
+-   Search block: Fix width input field. ([53952](https://github.com/WordPress/gutenberg/pull/53952))
+-   Simplify check for no posts in query-no-results block. ([53772](https://github.com/WordPress/gutenberg/pull/53772))
+-   Site Logo: Remove line-height for the anchor element. ([53909](https://github.com/WordPress/gutenberg/pull/53909))
 
 #### Components
-- Always render the fallback Popover anchor within the Popover's parent element. ([53982](https://github.com/WordPress/gutenberg/pull/53982))
-- Fix the cleanup method for SandBox. ([53796](https://github.com/WordPress/gutenberg/pull/53796))
-- PaletteEdit: Fix component height. ([54000](https://github.com/WordPress/gutenberg/pull/54000))
+
+-   Always render the fallback Popover anchor within the Popover's parent element. ([53982](https://github.com/WordPress/gutenberg/pull/53982))
+-   Fix the cleanup method for SandBox. ([53796](https://github.com/WordPress/gutenberg/pull/53796))
+-   PaletteEdit: Fix component height. ([54000](https://github.com/WordPress/gutenberg/pull/54000))
 
 #### Post Editor
-- Edit Post: Fix tab border conflicts in the Document Overview panel. ([53711](https://github.com/WordPress/gutenberg/pull/53711))
-- EditPostPreferencesModal: Fix intermittently failing tests. ([53814](https://github.com/WordPress/gutenberg/pull/53814))
-- getInsertionPoint: Fix type check for the state value. ([53793](https://github.com/WordPress/gutenberg/pull/53793))
+
+-   Edit Post: Fix tab border conflicts in the Document Overview panel. ([53711](https://github.com/WordPress/gutenberg/pull/53711))
+-   EditPostPreferencesModal: Fix intermittently failing tests. ([53814](https://github.com/WordPress/gutenberg/pull/53814))
+-   getInsertionPoint: Fix type check for the state value. ([53793](https://github.com/WordPress/gutenberg/pull/53793))
 
 #### npm Packages
-- Workflow: Run Learn directly from GitHub action when publishing to npm targeting WP core. ([53762](https://github.com/WordPress/gutenberg/pull/53762))
-- Workflows: Fix issues with the npm publishing workflow when using locally. ([53565](https://github.com/WordPress/gutenberg/pull/53565))
+
+-   Workflow: Run Learn directly from GitHub action when publishing to npm targeting WP core. ([53762](https://github.com/WordPress/gutenberg/pull/53762))
+-   Workflows: Fix issues with the npm publishing workflow when using locally. ([53565](https://github.com/WordPress/gutenberg/pull/53565))
 
 #### Themes
-- Command Palette: Proper handling of page/post links in all themes. ([53718](https://github.com/WordPress/gutenberg/pull/53718))
-- Fix query loop bugs by correctly relying on the main query and removing problematic workaround. ([49904](https://github.com/WordPress/gutenberg/pull/49904))
+
+-   Command Palette: Proper handling of page/post links in all themes. ([53718](https://github.com/WordPress/gutenberg/pull/53718))
+-   Fix query loop bugs by correctly relying on the main query and removing problematic workaround. ([49904](https://github.com/WordPress/gutenberg/pull/49904))
 
 #### Block Editor
-- Fix: Indicator style when block moving mode. ([53972](https://github.com/WordPress/gutenberg/pull/53972))
+
+-   Fix: Indicator style when block moving mode. ([53972](https://github.com/WordPress/gutenberg/pull/53972))
 
 #### Icons
-- Fix invalid namespaces. ([53955](https://github.com/WordPress/gutenberg/pull/53955))
+
+-   Fix invalid namespaces. ([53955](https://github.com/WordPress/gutenberg/pull/53955))
 
 #### Patterns
-- Disable the preview option button when editing. ([53913](https://github.com/WordPress/gutenberg/pull/53913))
+
+-   Disable the preview option button when editing. ([53913](https://github.com/WordPress/gutenberg/pull/53913))
 
 #### Global Styles
-- Gallery: Re-enable block spacing at block level while still hiding in global styles. ([53900](https://github.com/WordPress/gutenberg/pull/53900))
+
+-   Gallery: Re-enable block spacing at block level while still hiding in global styles. ([53900](https://github.com/WordPress/gutenberg/pull/53900))
 
 #### Layout
-- BlockList: Ensure element styles (and svg) are always appended at the end of the document. ([53859](https://github.com/WordPress/gutenberg/pull/53859))
+
+-   BlockList: Ensure element styles (and svg) are always appended at the end of the document. ([53859](https://github.com/WordPress/gutenberg/pull/53859))
 
 #### Interactivity API
-- Add "supports.interactivity" to Image block. ([53850](https://github.com/WordPress/gutenberg/pull/53850))
+
+-   Add "supports.interactivity" to Image block. ([53850](https://github.com/WordPress/gutenberg/pull/53850))
 
 #### Style Variations
-- Block Styles: Fix misplaced preview popover on RTL site. ([53726](https://github.com/WordPress/gutenberg/pull/53726))
+
+-   Block Styles: Fix misplaced preview popover on RTL site. ([53726](https://github.com/WordPress/gutenberg/pull/53726))
 
 #### List View
-- Recalculate window list when expanded state changes (fix logic for long nested lists). ([53716](https://github.com/WordPress/gutenberg/pull/53716))
+
+-   Recalculate window list when expanded state changes (fix logic for long nested lists). ([53716](https://github.com/WordPress/gutenberg/pull/53716))
 
 #### Widgets Editor
-- Block Widget: Fix content cutoff in the keyboard shortcut modal. ([53638](https://github.com/WordPress/gutenberg/pull/53638))
+
+-   Block Widget: Fix content cutoff in the keyboard shortcut modal. ([53638](https://github.com/WordPress/gutenberg/pull/53638))
 
 #### Rich Text
-- Fix cleanup in `useRemoveBrowserShortcuts`. ([52225](https://github.com/WordPress/gutenberg/pull/52225))
 
+-   Fix cleanup in `useRemoveBrowserShortcuts`. ([52225](https://github.com/WordPress/gutenberg/pull/52225))
 
 ### Accessibility
 
-- Edit site: Add missing label to post status password protected input field. ([52885](https://github.com/WordPress/gutenberg/pull/52885))
-- [a11y] Fix: Aria-haspop, aria-expanded attributes on the link format button. ([53691](https://github.com/WordPress/gutenberg/pull/53691))
+-   Edit site: Add missing label to post status password protected input field. ([52885](https://github.com/WordPress/gutenberg/pull/52885))
+-   [a11y] Fix: Aria-haspop, aria-expanded attributes on the link format button. ([53691](https://github.com/WordPress/gutenberg/pull/53691))
 
 #### Site Editor
-- Add missing aria roles to the 'Create template part' menu item. ([53754](https://github.com/WordPress/gutenberg/pull/53754))
-- Unify the delete button style in the dropdown menu with red. ([52597](https://github.com/WordPress/gutenberg/pull/52597))
+
+-   Add missing aria roles to the 'Create template part' menu item. ([53754](https://github.com/WordPress/gutenberg/pull/53754))
+-   Unify the delete button style in the dropdown menu with red. ([52597](https://github.com/WordPress/gutenberg/pull/52597))
 
 #### Block Library
-- Add missing aria roles to the 'Replace template part' menu item. ([53755](https://github.com/WordPress/gutenberg/pull/53755))
+
+-   Add missing aria roles to the 'Replace template part' menu item. ([53755](https://github.com/WordPress/gutenberg/pull/53755))
 
 #### Patterns
-- Add missing aria roles to the 'Create pattern' menu item. ([53739](https://github.com/WordPress/gutenberg/pull/53739))
+
+-   Add missing aria roles to the 'Create pattern' menu item. ([53739](https://github.com/WordPress/gutenberg/pull/53739))
 
 #### List View
-- [a11y] Fix: Aria-haspop and aria-expanded attributes on list view button. ([53693](https://github.com/WordPress/gutenberg/pull/53693))
+
+-   [a11y] Fix: Aria-haspop and aria-expanded attributes on list view button. ([53693](https://github.com/WordPress/gutenberg/pull/53693))
 
 #### Block Editor
-- [a11y] Fix: Aria-haspop and aria-expanded attributes on the inserter button. ([53692](https://github.com/WordPress/gutenberg/pull/53692))
 
+-   [a11y] Fix: Aria-haspop and aria-expanded attributes on the inserter button. ([53692](https://github.com/WordPress/gutenberg/pull/53692))
 
 ### Performance
 
-- Revert "Switch performance tests to Playwright (#52022)". ([53741](https://github.com/WordPress/gutenberg/pull/53741))
-- StartPageOptions: Load and parse patterns only after establishing the need for them. ([53673](https://github.com/WordPress/gutenberg/pull/53673))
-- Switch performance tests to Playwright: Take 2. ([53768](https://github.com/WordPress/gutenberg/pull/53768))
-
+-   Revert "Switch performance tests to Playwright (#52022)". ([53741](https://github.com/WordPress/gutenberg/pull/53741))
+-   StartPageOptions: Load and parse patterns only after establishing the need for them. ([53673](https://github.com/WordPress/gutenberg/pull/53673))
+-   Switch performance tests to Playwright: Take 2. ([53768](https://github.com/WordPress/gutenberg/pull/53768))
 
 ### Experiments
 
 #### Block API
-- Auto-inserting blocks: Add block inspector panel. ([52969](https://github.com/WordPress/gutenberg/pull/52969))
-- - Auto-inserting blocks: Add block icon to block inspector panel toggles. ([54029](https://github.com/WordPress/gutenberg/pull/54029))
-- Auto-inserting blocks: Remove toggle if block is present elsewhere. ([54024](https://github.com/WordPress/gutenberg/pull/54024))
-- Rename "auto inserting blocks" to "block hooks". ([54147](https://github.com/WordPress/gutenberg/pull/54147))
-
-
 
+-   Auto-inserting blocks: Add block inspector panel. ([52969](https://github.com/WordPress/gutenberg/pull/52969))
+-   -   Auto-inserting blocks: Add block icon to block inspector panel toggles. ([54029](https://github.com/WordPress/gutenberg/pull/54029))
+-   Auto-inserting blocks: Remove toggle if block is present elsewhere. ([54024](https://github.com/WordPress/gutenberg/pull/54024))
+-   Rename "auto inserting blocks" to "block hooks". ([54147](https://github.com/WordPress/gutenberg/pull/54147))
 
 ### Documentation
 
-- Add juanmaguitar as codeowner of /packages/interactivity/docs. ([53845](https://github.com/WordPress/gutenberg/pull/53845))
-- Add new How-to Guide for enqueueing assets in the Editor. ([53828](https://github.com/WordPress/gutenberg/pull/53828))
-- Adds example for useBlockProps hook. ([53646](https://github.com/WordPress/gutenberg/pull/53646))
-- Adds explanatory text to view.js template. ([53870](https://github.com/WordPress/gutenberg/pull/53870))
-- Clarification for `parent` and `ancestor` hierarchical relationships. ([53855](https://github.com/WordPress/gutenberg/pull/53855))
-- Docs: Extend the information about using `render` with `block.json`. ([53973](https://github.com/WordPress/gutenberg/pull/53973))
-- Docs: Remove duplicate sections from FAQ page. ([53830](https://github.com/WordPress/gutenberg/pull/53830))
-- Document the naming convention for `block-library` PHP functions. ([53777](https://github.com/WordPress/gutenberg/pull/53777))
-- Fix 'lerna' links in the release documentation. ([53770](https://github.com/WordPress/gutenberg/pull/53770))
-- Fix typo in code sample for Interactivity API. ([53916](https://github.com/WordPress/gutenberg/pull/53916))
-- MenuItem: Add Storybook stories. ([53613](https://github.com/WordPress/gutenberg/pull/53613))
-- Shortcut: Add Storybook stories. ([53627](https://github.com/WordPress/gutenberg/pull/53627))
-- Storybook: Add back subcomponents to props table. ([53751](https://github.com/WordPress/gutenberg/pull/53751))
-- Storybook: Fix default source visibility. ([53749](https://github.com/WordPress/gutenberg/pull/53749))
-- Storybook: Show main story before description. ([53753](https://github.com/WordPress/gutenberg/pull/53753))
-- Update local instructions on the dev env documentation. ([53924](https://github.com/WordPress/gutenberg/pull/53924))
-- Update the Block Variations API doc. ([53817](https://github.com/WordPress/gutenberg/pull/53817))
-- Update to node 16 and npm 8 in the getting started with code contribution doc. ([53912](https://github.com/WordPress/gutenberg/pull/53912))
-- docs: Fix report-flaky-test link. ([53848](https://github.com/WordPress/gutenberg/pull/53848))
-
+-   Add juanmaguitar as codeowner of /packages/interactivity/docs. ([53845](https://github.com/WordPress/gutenberg/pull/53845))
+-   Add new How-to Guide for enqueueing assets in the Editor. ([53828](https://github.com/WordPress/gutenberg/pull/53828))
+-   Adds example for useBlockProps hook. ([53646](https://github.com/WordPress/gutenberg/pull/53646))
+-   Adds explanatory text to view.js template. ([53870](https://github.com/WordPress/gutenberg/pull/53870))
+-   Clarification for `parent` and `ancestor` hierarchical relationships. ([53855](https://github.com/WordPress/gutenberg/pull/53855))
+-   Docs: Extend the information about using `render` with `block.json`. ([53973](https://github.com/WordPress/gutenberg/pull/53973))
+-   Docs: Remove duplicate sections from FAQ page. ([53830](https://github.com/WordPress/gutenberg/pull/53830))
+-   Document the naming convention for `block-library` PHP functions. ([53777](https://github.com/WordPress/gutenberg/pull/53777))
+-   Fix 'lerna' links in the release documentation. ([53770](https://github.com/WordPress/gutenberg/pull/53770))
+-   Fix typo in code sample for Interactivity API. ([53916](https://github.com/WordPress/gutenberg/pull/53916))
+-   MenuItem: Add Storybook stories. ([53613](https://github.com/WordPress/gutenberg/pull/53613))
+-   Shortcut: Add Storybook stories. ([53627](https://github.com/WordPress/gutenberg/pull/53627))
+-   Storybook: Add back subcomponents to props table. ([53751](https://github.com/WordPress/gutenberg/pull/53751))
+-   Storybook: Fix default source visibility. ([53749](https://github.com/WordPress/gutenberg/pull/53749))
+-   Storybook: Show main story before description. ([53753](https://github.com/WordPress/gutenberg/pull/53753))
+-   Update local instructions on the dev env documentation. ([53924](https://github.com/WordPress/gutenberg/pull/53924))
+-   Update the Block Variations API doc. ([53817](https://github.com/WordPress/gutenberg/pull/53817))
+-   Update to node 16 and npm 8 in the getting started with code contribution doc. ([53912](https://github.com/WordPress/gutenberg/pull/53912))
+-   docs: Fix report-flaky-test link. ([53848](https://github.com/WordPress/gutenberg/pull/53848))
 
 ### Code Quality
 
-- Components: Update Popover per reviews. ([53907](https://github.com/WordPress/gutenberg/pull/53907))
-- Edit Site: Rename `CanvasSpinner` to `CanvasLoader`. ([53728](https://github.com/WordPress/gutenberg/pull/53728))
-- Enforce valid function names in the packages/block-library/src/*/*.php files. ([53438](https://github.com/WordPress/gutenberg/pull/53438))
-- Fonts Library: Update properties name from snake case to camel case to match the rest of the properties. ([53746](https://github.com/WordPress/gutenberg/pull/53746))
+-   Components: Update Popover per reviews. ([53907](https://github.com/WordPress/gutenberg/pull/53907))
+-   Edit Site: Rename `CanvasSpinner` to `CanvasLoader`. ([53728](https://github.com/WordPress/gutenberg/pull/53728))
+-   Enforce valid function names in the packages/block-library/src/_/_.php files. ([53438](https://github.com/WordPress/gutenberg/pull/53438))
+-   Fonts Library: Update properties name from snake case to camel case to match the rest of the properties. ([53746](https://github.com/WordPress/gutenberg/pull/53746))
 
 #### Block API
-- Auto-inserting blocks: Remove obsolete TODO, fix REST API field description. ([54208](https://github.com/WordPress/gutenberg/pull/54208))
+
+-   Auto-inserting blocks: Remove obsolete TODO, fix REST API field description. ([54208](https://github.com/WordPress/gutenberg/pull/54208))
 
 #### Post Editor
-- Editor: Fix the 'useSelect' warning in the 'useIsDirty' hook. ([53759](https://github.com/WordPress/gutenberg/pull/53759))
-- Fix browser console error when changing device preview mode. ([53969](https://github.com/WordPress/gutenberg/pull/53969))
-- Refactor latest content selectors in 'CopyContentMenuItem' components. ([53676](https://github.com/WordPress/gutenberg/pull/53676))
+
+-   Editor: Fix the 'useSelect' warning in the 'useIsDirty' hook. ([53759](https://github.com/WordPress/gutenberg/pull/53759))
+-   Fix browser console error when changing device preview mode. ([53969](https://github.com/WordPress/gutenberg/pull/53969))
+-   Refactor latest content selectors in 'CopyContentMenuItem' components. ([53676](https://github.com/WordPress/gutenberg/pull/53676))
 
 #### Components
-- Remove unnecessary utils. ([53679](https://github.com/WordPress/gutenberg/pull/53679))
-- SlotFill: Refactor `<Slot bubblesVirtually />`. ([53272](https://github.com/WordPress/gutenberg/pull/53272))
-- Storybook: Update TypeScript types. ([53748](https://github.com/WordPress/gutenberg/pull/53748))
+
+-   Remove unnecessary utils. ([53679](https://github.com/WordPress/gutenberg/pull/53679))
+-   SlotFill: Refactor `<Slot bubblesVirtually />`. ([53272](https://github.com/WordPress/gutenberg/pull/53272))
+-   Storybook: Update TypeScript types. ([53748](https://github.com/WordPress/gutenberg/pull/53748))
 
 #### List View
-- Fix warning error when the gallery block has the same image URLs. ([53809](https://github.com/WordPress/gutenberg/pull/53809))
+
+-   Fix warning error when the gallery block has the same image URLs. ([53809](https://github.com/WordPress/gutenberg/pull/53809))
 
 #### Typography
-- Font Face API: Use `gutenberg_get_global_settings` instead of private API. ([53805](https://github.com/WordPress/gutenberg/pull/53805))
 
+-   Font Face API: Use `gutenberg_get_global_settings` instead of private API. ([53805](https://github.com/WordPress/gutenberg/pull/53805))
 
 ### Tools
 
-- Try: Change PR label enforcer automation not to work on draft PRs by default. ([53417](https://github.com/WordPress/gutenberg/pull/53417))
+-   Try: Change PR label enforcer automation not to work on draft PRs by default. ([53417](https://github.com/WordPress/gutenberg/pull/53417))
 
 #### Testing
-- Attempt to fix intermittent end-to-end test failure. ([53905](https://github.com/WordPress/gutenberg/pull/53905))
-- Fonts Library: Test improvements. ([53702](https://github.com/WordPress/gutenberg/pull/53702))
-- Make fonts test files use Core approach. ([53856](https://github.com/WordPress/gutenberg/pull/53856))
-- Migrate shortcut help end-to-end tests to Playwright. ([53832](https://github.com/WordPress/gutenberg/pull/53832))
-- Relocates Font Face and Fonts Library PHP files into Core's fonts directory. ([53747](https://github.com/WordPress/gutenberg/pull/53747))
-- `ColorPalette`: Refine test query. ([53704](https://github.com/WordPress/gutenberg/pull/53704))
-- end-to-end Playwright Utils: Automatically detect canvas type. ([53744](https://github.com/WordPress/gutenberg/pull/53744))
-- test: Automate mobile editor tests. ([53991](https://github.com/WordPress/gutenberg/pull/53991))
+
+-   Attempt to fix intermittent end-to-end test failure. ([53905](https://github.com/WordPress/gutenberg/pull/53905))
+-   Fonts Library: Test improvements. ([53702](https://github.com/WordPress/gutenberg/pull/53702))
+-   Make fonts test files use Core approach. ([53856](https://github.com/WordPress/gutenberg/pull/53856))
+-   Migrate shortcut help end-to-end tests to Playwright. ([53832](https://github.com/WordPress/gutenberg/pull/53832))
+-   Relocates Font Face and Fonts Library PHP files into Core's fonts directory. ([53747](https://github.com/WordPress/gutenberg/pull/53747))
+-   `ColorPalette`: Refine test query. ([53704](https://github.com/WordPress/gutenberg/pull/53704))
+-   end-to-end Playwright Utils: Automatically detect canvas type. ([53744](https://github.com/WordPress/gutenberg/pull/53744))
+-   test: Automate mobile editor tests. ([53991](https://github.com/WordPress/gutenberg/pull/53991))
 
 #### Build Tooling
-- Update Jest to latest version, and use optimized JSDOM. ([53736](https://github.com/WordPress/gutenberg/pull/53736))
 
-#### Plugin
-- Backport themes `is_block_theme` collection param from core. ([53846](https://github.com/WordPress/gutenberg/pull/53846))
+-   Update Jest to latest version, and use optimized JSDOM. ([53736](https://github.com/WordPress/gutenberg/pull/53736))
 
+#### Plugin
 
-## First time contributors
+-   Backport themes `is_block_theme` collection param from core. ([53846](https://github.com/WordPress/gutenberg/pull/53846))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @JEverhart383: Fix typo in code sample for Interactivity API. ([53916](https://github.com/WordPress/gutenberg/pull/53916))
-- @krokodok: Make mid size parameter settable for Query Pagination block. ([51216](https://github.com/WordPress/gutenberg/pull/51216))
-- @mklute101: Update local instructions on the dev env documentation. ([53924](https://github.com/WordPress/gutenberg/pull/53924))
+The following PRs were merged by first-time contributors:
 
+-   @JEverhart383: Fix typo in code sample for Interactivity API. ([53916](https://github.com/WordPress/gutenberg/pull/53916))
+-   @krokodok: Make mid size parameter settable for Query Pagination block. ([51216](https://github.com/WordPress/gutenberg/pull/51216))
+-   @mklute101: Update local instructions on the dev env documentation. ([53924](https://github.com/WordPress/gutenberg/pull/53924))
 
 ## Contributors
 
@@ -2718,22 +13477,15 @@ The following contributors merged PRs in this release:
 
 @afercia @andrewserong @anton-vlasenko @bangank36 @brookewp @ciampo @colorful-tones @DAreRodz @dcalhoun @derekblank @ellatrix @felixarntz @geriux @glendaviesnz @gziolo @hellofromtonya @jasmussen @jblz @JEverhart383 @jordesign @jorgefilipecosta @jsnajdr @juanmaguitar @krokodok @luisherranz @Mamaduka @margolisj @matiasbenedetto @mburridge @mirka @mklute101 @mokagio @ndiego @ntsekouras @oandregal @ocean90 @ockham @priethor @ramonjd @richtabor @SiobhyB @Smit2808 @stokesman @t-hamano @torounit @tyxla @walbo @WunderBart @youknowriad
 
-
-
-
 = 16.5.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Block Editor
-- Pass entire link value on toggle of setting on Link Preview. ([53949](https://github.com/WordPress/gutenberg/pull/53949))
-
-
 
+-   Pass entire link value on toggle of setting on Link Preview. ([53949](https://github.com/WordPress/gutenberg/pull/53949))
 
 ## Contributors
 
@@ -2741,335 +13493,361 @@ The following contributors merged PRs in this release:
 
 @getdave
 
-
 = 16.5.0 =
 
-
-
 ## Changelog
 
 ### Features
 
 #### Interactivity API
-- Allow passing optional `afterLoad` callbacks to `store` calls. ([53363](https://github.com/WordPress/gutenberg/pull/53363))
+
+-   Allow passing optional `afterLoad` callbacks to `store` calls. ([53363](https://github.com/WordPress/gutenberg/pull/53363))
 
 ### Enhancements
 
 #### Commands
-- Add block-related commands. ([52509](https://github.com/WordPress/gutenberg/pull/52509))
-- Add support for registering commands without icons. ([53647](https://github.com/WordPress/gutenberg/pull/53647))
-- Update the "Preview in a new tab" command to reuse the preview target tab when available. ([53242](https://github.com/WordPress/gutenberg/pull/53242))
-- Update command palette styling. ([53117](https://github.com/WordPress/gutenberg/pull/53117))
-- Improve command palette rendering on smaller viewports. ([53661](https://github.com/WordPress/gutenberg/pull/53661))
-- Tweak existing commands to establish consistency with command language. ([53496](https://github.com/WordPress/gutenberg/pull/53496))
-- End the command palette description with a period in the keyboard shortcut modal. ([53635](https://github.com/WordPress/gutenberg/pull/53635))
-
-#### Components
-- Button: Remove default border from the destructive button. ([53607](https://github.com/WordPress/gutenberg/pull/53607))
-- LineHeightControl: Allow for more granular control of decimal places. ([52902](https://github.com/WordPress/gutenberg/pull/52902))
-- Snackbar: Design and motion improvements. ([53248](https://github.com/WordPress/gutenberg/pull/53248))
-- Modal: 
-  - Add `headerActions` prop to enable buttons or other elements to be injected in the header. ([53328](https://github.com/WordPress/gutenberg/pull/53328))
-  - Enhance overlay interactions, enabling outside interactions without dismissal. ([52994](https://github.com/WordPress/gutenberg/pull/52994))
-- ProgressBar: Update colors, including gray 300 for track color ([53349](https://github.com/WordPress/gutenberg/pull/53349)), theme system accent for indicator color ([53347](https://github.com/WordPress/gutenberg/pull/53347)), and the theme accent color variable. ([53632](https://github.com/WordPress/gutenberg/pull/53632)).
-
-#### Block Library
-- Column block:
-  - Add a `stretch` option to block's vertical alignment options. ([53325](https://github.com/WordPress/gutenberg/pull/53325))
-  - Exit upon pressing enter in an empty paragraph at the end of the block. ([53311](https://github.com/WordPress/gutenberg/pull/53311))
-- Classic block: Increase dimensions of modal and allow toggling fullscreen. ([53449](https://github.com/WordPress/gutenberg/pull/53449))
-- Details block: 
-  - Add `accordion` and `toggle` keywords to improve block's discoverability. ([53501](https://github.com/WordPress/gutenberg/pull/53501))
-  - Add layout and block spacing options. ([53282](https://github.com/WordPress/gutenberg/pull/53282))
-- File block: Add block spacing options. ([45107](https://github.com/WordPress/gutenberg/pull/45107))
-- Image block: Add aspect ratio support to lightbox. ([52765](https://github.com/WordPress/gutenberg/pull/52765))
-- Post Content block: Add color controls. ([51326](https://github.com/WordPress/gutenberg/pull/51326))
-- Remove "post" from block titles. ([53492](https://github.com/WordPress/gutenberg/pull/53492))
+
+-   Add block-related commands. ([52509](https://github.com/WordPress/gutenberg/pull/52509))
+-   Add support for registering commands without icons. ([53647](https://github.com/WordPress/gutenberg/pull/53647))
+-   Update the "Preview in a new tab" command to reuse the preview target tab when available. ([53242](https://github.com/WordPress/gutenberg/pull/53242))
+-   Update command palette styling. ([53117](https://github.com/WordPress/gutenberg/pull/53117))
+-   Improve command palette rendering on smaller viewports. ([53661](https://github.com/WordPress/gutenberg/pull/53661))
+-   Tweak existing commands to establish consistency with command language. ([53496](https://github.com/WordPress/gutenberg/pull/53496))
+-   End the command palette description with a period in the keyboard shortcut modal. ([53635](https://github.com/WordPress/gutenberg/pull/53635))
+
+#### Components
+
+-   Button: Remove default border from the destructive button. ([53607](https://github.com/WordPress/gutenberg/pull/53607))
+-   LineHeightControl: Allow for more granular control of decimal places. ([52902](https://github.com/WordPress/gutenberg/pull/52902))
+-   Snackbar: Design and motion improvements. ([53248](https://github.com/WordPress/gutenberg/pull/53248))
+-   Modal:
+    -   Add `headerActions` prop to enable buttons or other elements to be injected in the header. ([53328](https://github.com/WordPress/gutenberg/pull/53328))
+    -   Enhance overlay interactions, enabling outside interactions without dismissal. ([52994](https://github.com/WordPress/gutenberg/pull/52994))
+-   ProgressBar: Update colors, including gray 300 for track color ([53349](https://github.com/WordPress/gutenberg/pull/53349)), theme system accent for indicator color ([53347](https://github.com/WordPress/gutenberg/pull/53347)), and the theme accent color variable. ([53632](https://github.com/WordPress/gutenberg/pull/53632)).
+
+#### Block Library
+
+-   Column block:
+    -   Add a `stretch` option to block's vertical alignment options. ([53325](https://github.com/WordPress/gutenberg/pull/53325))
+    -   Exit upon pressing enter in an empty paragraph at the end of the block. ([53311](https://github.com/WordPress/gutenberg/pull/53311))
+-   Classic block: Increase dimensions of modal and allow toggling fullscreen. ([53449](https://github.com/WordPress/gutenberg/pull/53449))
+-   Details block:
+    -   Add `accordion` and `toggle` keywords to improve block's discoverability. ([53501](https://github.com/WordPress/gutenberg/pull/53501))
+    -   Add layout and block spacing options. ([53282](https://github.com/WordPress/gutenberg/pull/53282))
+-   File block: Add block spacing options. ([45107](https://github.com/WordPress/gutenberg/pull/45107))
+-   Image block: Add aspect ratio support to lightbox. ([52765](https://github.com/WordPress/gutenberg/pull/52765))
+-   Post Content block: Add color controls. ([51326](https://github.com/WordPress/gutenberg/pull/51326))
+-   Remove "post" from block titles. ([53492](https://github.com/WordPress/gutenberg/pull/53492))
 
 #### Patterns
-- Open detail view when duplicating a pattern. ([53214](https://github.com/WordPress/gutenberg/pull/53214))
-- Prevent the "create pattern" modal from closing the block options menu when it is closed. ([53707](https://github.com/WordPress/gutenberg/pull/53707))
-- Skip migration logs in the patterns screen. ([53626](https://github.com/WordPress/gutenberg/pull/53626))
-- Add missing full stop to string. ([53544](https://github.com/WordPress/gutenberg/pull/53544))
+
+-   Open detail view when duplicating a pattern. ([53214](https://github.com/WordPress/gutenberg/pull/53214))
+-   Prevent the "create pattern" modal from closing the block options menu when it is closed. ([53707](https://github.com/WordPress/gutenberg/pull/53707))
+-   Skip migration logs in the patterns screen. ([53626](https://github.com/WordPress/gutenberg/pull/53626))
+-   Add missing full stop to string. ([53544](https://github.com/WordPress/gutenberg/pull/53544))
 
 #### Global Styles
-- Add a reset to default global styles revision ([52965](https://github.com/WordPress/gutenberg/pull/52965)) and reduce visibility check from two to one revision ([53281](https://github.com/WordPress/gutenberg/pull/53281)).
+
+-   Add a reset to default global styles revision ([52965](https://github.com/WordPress/gutenberg/pull/52965)) and reduce visibility check from two to one revision ([53281](https://github.com/WordPress/gutenberg/pull/53281)).
 
 #### Media
-- Adjust size of image previews in list view. ([53649](https://github.com/WordPress/gutenberg/pull/53649))
-- Add media previews to list view for gallery and image blocks. ([53381](https://github.com/WordPress/gutenberg/pull/53381))
+
+-   Adjust size of image previews in list view. ([53649](https://github.com/WordPress/gutenberg/pull/53649))
+-   Add media previews to list view for gallery and image blocks. ([53381](https://github.com/WordPress/gutenberg/pull/53381))
 
 #### Site Editor
-- Expose `Theme` via private APIs ([53262](https://github.com/WordPress/gutenberg/pull/53262)), which was necessary to use the progress bar component for the site editor loading screen ([53032](https://github.com/WordPress/gutenberg/pull/53032)).
 
-#### Block Editor
-- Add `Opens in new Tab` control into Link Preview. ([53566](https://github.com/WordPress/gutenberg/pull/53566))
-- Dependencies: Bump `remove-accents` to 0.5.0. ([53420](https://github.com/WordPress/gutenberg/pull/53420))
-- Top-align Publish row in the post panel. ([53573](https://github.com/WordPress/gutenberg/pull/53573))
-- Allow layout controls to be disabled per block from theme.json. ([53378](https://github.com/WordPress/gutenberg/pull/53378))
-- Fluid typography: Add min and max viewport width configurable options. ([53081](https://github.com/WordPress/gutenberg/pull/53081))
+-   Expose `Theme` via private APIs ([53262](https://github.com/WordPress/gutenberg/pull/53262)), which was necessary to use the progress bar component for the site editor loading screen ([53032](https://github.com/WordPress/gutenberg/pull/53032)).
+
+#### Block Editor
+
+-   Add `Opens in new Tab` control into Link Preview. ([53566](https://github.com/WordPress/gutenberg/pull/53566))
+-   Dependencies: Bump `remove-accents` to 0.5.0. ([53420](https://github.com/WordPress/gutenberg/pull/53420))
+-   Top-align Publish row in the post panel. ([53573](https://github.com/WordPress/gutenberg/pull/53573))
+-   Allow layout controls to be disabled per block from theme.json. ([53378](https://github.com/WordPress/gutenberg/pull/53378))
+-   Fluid typography: Add min and max viewport width configurable options. ([53081](https://github.com/WordPress/gutenberg/pull/53081))
+
+### New APIs
+
+#### Extensibility
+
+-   Make `useBlockEditingMode()` public. ([52094](https://github.com/WordPress/gutenberg/pull/52094))
+
+### Bug Fixes
+
+#### Commands
 
+-   Style tweaks to fix metrics for resting and no results view in command palette. ([53497](https://github.com/WordPress/gutenberg/pull/53497))
+-   Order template results in Site Editor, to fix some templates not displaying. ([53286](https://github.com/WordPress/gutenberg/pull/53286))
+-   Don't allow access to Styles-related pages via the command palette in the hybrid theme. ([53123](https://github.com/WordPress/gutenberg/pull/53123))
+
+#### Block Library
+
+-   Button block: Avoid losing user changes when the `ButtonEdit` component re-renders. ([53507](https://github.com/WordPress/gutenberg/pull/53507))
+-   Cover block: Fix flickering when inserted in templates and also fix `isDark` calculation bugs. ([53253](https://github.com/WordPress/gutenberg/pull/53253))
+-   Footnotes block:
+    -   Ensure autosave works and escapes quotes as expected. ([53664](https://github.com/WordPress/gutenberg/pull/53664))
+    -   Fix accidental override. ([53663](https://github.com/WordPress/gutenberg/pull/53663))
+    -   Fix recursion into updating attributes when attributes is not an object. ([53257](https://github.com/WordPress/gutenberg/pull/53257))
+    -   Remove Footnotes when interactive formatting is disabled. ([53474](https://github.com/WordPress/gutenberg/pull/53474))
+-   Image block:
+    -   Fix image stretching with only height. ([53443](https://github.com/WordPress/gutenberg/pull/53443))
+    -   Don't render `DimensionsTool` if it is not resizable. ([53181](https://github.com/WordPress/gutenberg/pull/53181))
+    -   Fix stretched images constrained by max-width. ([53274](https://github.com/WordPress/gutenberg/pull/53274))
+    -   Clear aspect ratio when wide aligned. ([53439](https://github.com/WordPress/gutenberg/pull/53439))
+    -   Change the conditions under which we display the scale control. ([53334](https://github.com/WordPress/gutenberg/pull/53334))
+    -   Reset height when selecting the original aspect ratio. ([53339](https://github.com/WordPress/gutenberg/pull/53339))
+-   Latest Posts block: Make categories handling more defensive to prevent multisite error. ([53659](https://github.com/WordPress/gutenberg/pull/53659))
+-   Media & Text block: Fix deprecation with `isStackOnMobile` default value changed. ([49538](https://github.com/WordPress/gutenberg/pull/49538))
+-   Inject theme stylesheet value as template part theme attribute. ([53423](https://github.com/WordPress/gutenberg/pull/53423))
+-   Block serialization: Correctly compare default attribute values. ([53521](https://github.com/WordPress/gutenberg/pull/53521))
 
-### New APIs
+#### Block Editor
 
-#### Extensibility
-- Make `useBlockEditingMode()` public. ([52094](https://github.com/WordPress/gutenberg/pull/52094))
-
-
-### Bug Fixes
-
-#### Commands 
-- Style tweaks to fix metrics for resting and no results view in command palette. ([53497](https://github.com/WordPress/gutenberg/pull/53497))
-- Order template results in Site Editor, to fix some templates not displaying. ([53286](https://github.com/WordPress/gutenberg/pull/53286))
-- Don't allow access to Styles-related pages via the command palette in the hybrid theme. ([53123](https://github.com/WordPress/gutenberg/pull/53123))
-
-#### Block Library
-- Button block: Avoid losing user changes when the `ButtonEdit` component re-renders. ([53507](https://github.com/WordPress/gutenberg/pull/53507))
-- Cover block: Fix flickering when inserted in templates and also fix `isDark` calculation bugs. ([53253](https://github.com/WordPress/gutenberg/pull/53253))
-- Footnotes block: 
-  - Ensure autosave works and escapes quotes as expected. ([53664](https://github.com/WordPress/gutenberg/pull/53664))
-  - Fix accidental override. ([53663](https://github.com/WordPress/gutenberg/pull/53663))
-  - Fix recursion into updating attributes when attributes is not an object. ([53257](https://github.com/WordPress/gutenberg/pull/53257))
-  - Remove Footnotes when interactive formatting is disabled. ([53474](https://github.com/WordPress/gutenberg/pull/53474))
-- Image block: 
-  - Fix image stretching with only height. ([53443](https://github.com/WordPress/gutenberg/pull/53443))
-  - Don't render `DimensionsTool` if it is not resizable. ([53181](https://github.com/WordPress/gutenberg/pull/53181))
-  - Fix stretched images constrained by max-width. ([53274](https://github.com/WordPress/gutenberg/pull/53274))
-  - Clear aspect ratio when wide aligned. ([53439](https://github.com/WordPress/gutenberg/pull/53439))
-  - Change the conditions under which we display the scale control. ([53334](https://github.com/WordPress/gutenberg/pull/53334))
-  - Reset height when selecting the original aspect ratio. ([53339](https://github.com/WordPress/gutenberg/pull/53339))
-- Latest Posts block: Make categories handling more defensive to prevent multisite error. ([53659](https://github.com/WordPress/gutenberg/pull/53659))
-- Media & Text block: Fix deprecation with `isStackOnMobile` default value changed. ([49538](https://github.com/WordPress/gutenberg/pull/49538))
-- Inject theme stylesheet value as template part theme attribute. ([53423](https://github.com/WordPress/gutenberg/pull/53423))
-- Block serialization: Correctly compare default attribute values. ([53521](https://github.com/WordPress/gutenberg/pull/53521))
-
-#### Block Editor
-- LinkControl: Prevent overflow when the title is a URL. ([53356](https://github.com/WordPress/gutenberg/pull/53356))
-- Fix broken flows on Safari, including `ArrowUp` functionality in an empty paragraph ([53341](https://github.com/WordPress/gutenberg/pull/53341)) and multi-selection upon shift plus click ([53440](https://github.com/WordPress/gutenberg/pull/53440)).
-- Restore focus after dragging out of the block repeatedly. ([53429](https://github.com/WordPress/gutenberg/pull/53429))
-- Avoid merging paragraph into a Columns block. ([53508](https://github.com/WordPress/gutenberg/pull/53508))
-- Prevent vertical arrow keys getting stuck in view. ([53454](https://github.com/WordPress/gutenberg/pull/53454))
-- Set top toolbar size dynamically. ([53526](https://github.com/WordPress/gutenberg/pull/53526))
-- Support container queries in editor CSS. ([49915](https://github.com/WordPress/gutenberg/pull/49915))
-- Copy tag name on internal paste. ([48254](https://github.com/WordPress/gutenberg/pull/48254))
+-   LinkControl: Prevent overflow when the title is a URL. ([53356](https://github.com/WordPress/gutenberg/pull/53356))
+-   Fix broken flows on Safari, including `ArrowUp` functionality in an empty paragraph ([53341](https://github.com/WordPress/gutenberg/pull/53341)) and multi-selection upon shift plus click ([53440](https://github.com/WordPress/gutenberg/pull/53440)).
+-   Restore focus after dragging out of the block repeatedly. ([53429](https://github.com/WordPress/gutenberg/pull/53429))
+-   Avoid merging paragraph into a Columns block. ([53508](https://github.com/WordPress/gutenberg/pull/53508))
+-   Prevent vertical arrow keys getting stuck in view. ([53454](https://github.com/WordPress/gutenberg/pull/53454))
+-   Set top toolbar size dynamically. ([53526](https://github.com/WordPress/gutenberg/pull/53526))
+-   Support container queries in editor CSS. ([49915](https://github.com/WordPress/gutenberg/pull/49915))
+-   Copy tag name on internal paste. ([48254](https://github.com/WordPress/gutenberg/pull/48254))
 
 #### Site Editor
-- Add missing i18n in `HomeTemplateDetails`. ([53543](https://github.com/WordPress/gutenberg/pull/53543))
-- Add buttons for block settings and styles in smaller viewport. ([53412](https://github.com/WordPress/gutenberg/pull/53412))
-- Ensure canvas edit mode button occupies the entire frame canvas. ([53730](https://github.com/WordPress/gutenberg/pull/53730))
-- Fix document actions label helper method. ([52974](https://github.com/WordPress/gutenberg/pull/52974))
-- Fix document title alignment in command palette button. ([53224](https://github.com/WordPress/gutenberg/pull/53224))
+
+-   Add missing i18n in `HomeTemplateDetails`. ([53543](https://github.com/WordPress/gutenberg/pull/53543))
+-   Add buttons for block settings and styles in smaller viewport. ([53412](https://github.com/WordPress/gutenberg/pull/53412))
+-   Ensure canvas edit mode button occupies the entire frame canvas. ([53730](https://github.com/WordPress/gutenberg/pull/53730))
+-   Fix document actions label helper method. ([52974](https://github.com/WordPress/gutenberg/pull/52974))
+-   Fix document title alignment in command palette button. ([53224](https://github.com/WordPress/gutenberg/pull/53224))
 
 #### Post Editor
-- Address crash by moving editor style logic into a hook with `useMemo`. ([53596](https://github.com/WordPress/gutenberg/pull/53596))
-- Fix support of sticky position in non-iframed post editor. ([53540](https://github.com/WordPress/gutenberg/pull/53540))
-- Correct typo when setting the preview device type to 'Desktop'. ([53409](https://github.com/WordPress/gutenberg/pull/53409))
-- Avoid returning a different object on every call to `getInsertionPoint`. ([53722](https://github.com/WordPress/gutenberg/pull/53722))
-- Fix top toolbar in the post editor with custom fields in Safari. ([53688](https://github.com/WordPress/gutenberg/pull/53688))
-- Improve metrics on post publish view buttons. ([53245](https://github.com/WordPress/gutenberg/pull/53245))
+
+-   Address crash by moving editor style logic into a hook with `useMemo`. ([53596](https://github.com/WordPress/gutenberg/pull/53596))
+-   Fix support of sticky position in non-iframed post editor. ([53540](https://github.com/WordPress/gutenberg/pull/53540))
+-   Correct typo when setting the preview device type to 'Desktop'. ([53409](https://github.com/WordPress/gutenberg/pull/53409))
+-   Avoid returning a different object on every call to `getInsertionPoint`. ([53722](https://github.com/WordPress/gutenberg/pull/53722))
+-   Fix top toolbar in the post editor with custom fields in Safari. ([53688](https://github.com/WordPress/gutenberg/pull/53688))
+-   Improve metrics on post publish view buttons. ([53245](https://github.com/WordPress/gutenberg/pull/53245))
 
 #### Page Content Focus
-- Fix missing Replace button in content-locked Image blocks. ([53410](https://github.com/WordPress/gutenberg/pull/53410))
-- Fix BlockPreview in Template panel when editing a page in the site editor. ([53550](https://github.com/WordPress/gutenberg/pull/53550))
-- Use `template.blocks` in BlockPreview if it exists. ([53611](https://github.com/WordPress/gutenberg/pull/53611))
+
+-   Fix missing Replace button in content-locked Image blocks. ([53410](https://github.com/WordPress/gutenberg/pull/53410))
+-   Fix BlockPreview in Template panel when editing a page in the site editor. ([53550](https://github.com/WordPress/gutenberg/pull/53550))
+-   Use `template.blocks` in BlockPreview if it exists. ([53611](https://github.com/WordPress/gutenberg/pull/53611))
 
 #### Navigation Menus
-- Make all the 'Loading' strings consistent. ([52901](https://github.com/WordPress/gutenberg/pull/52901))
-- Fix title not being copied correctly when duplicating navigation. ([53610](https://github.com/WordPress/gutenberg/pull/53610))
-- Remove "go to" for terms and posts. ([53408](https://github.com/WordPress/gutenberg/pull/53408))
+
+-   Make all the 'Loading' strings consistent. ([52901](https://github.com/WordPress/gutenberg/pull/52901))
+-   Fix title not being copied correctly when duplicating navigation. ([53610](https://github.com/WordPress/gutenberg/pull/53610))
+-   Remove "go to" for terms and posts. ([53408](https://github.com/WordPress/gutenberg/pull/53408))
 
 #### Typography
-- Fallback to default max viewport if layout wide size is fluid. ([53551](https://github.com/WordPress/gutenberg/pull/53551))
-- Fix typo and add tests for fonts install endpoint. ([53644](https://github.com/WordPress/gutenberg/pull/53644))
+
+-   Fallback to default max viewport if layout wide size is fluid. ([53551](https://github.com/WordPress/gutenberg/pull/53551))
+-   Fix typo and add tests for fonts install endpoint. ([53644](https://github.com/WordPress/gutenberg/pull/53644))
 
 #### Patterns
-- Fix Synced Patterns' color in quick inserter. ([53327](https://github.com/WordPress/gutenberg/pull/53327))
-- Hide pattern previews on hover in inserter. ([53331](https://github.com/WordPress/gutenberg/pull/53331))
-- Ensure it's possible to delete draft patterns. ([53405](https://github.com/WordPress/gutenberg/pull/53405))
-- Fix pattern creation button in list view dropdown menu. ([53562](https://github.com/WordPress/gutenberg/pull/53562))
-- Prevent sync status overlapping for some languages in patterns. ([53243](https://github.com/WordPress/gutenberg/pull/53243))
+
+-   Fix Synced Patterns' color in quick inserter. ([53327](https://github.com/WordPress/gutenberg/pull/53327))
+-   Hide pattern previews on hover in inserter. ([53331](https://github.com/WordPress/gutenberg/pull/53331))
+-   Ensure it's possible to delete draft patterns. ([53405](https://github.com/WordPress/gutenberg/pull/53405))
+-   Fix pattern creation button in list view dropdown menu. ([53562](https://github.com/WordPress/gutenberg/pull/53562))
+-   Prevent sync status overlapping for some languages in patterns. ([53243](https://github.com/WordPress/gutenberg/pull/53243))
 
 #### Global Styles
-- Fix push-to-global-styles clearing of attributes, border fallbacks, link hover colors, and behaviors. ([51621](https://github.com/WordPress/gutenberg/pull/51621))
-- Preserve block style variations when securing theme json. ([53466](https://github.com/WordPress/gutenberg/pull/53466))
+
+-   Fix push-to-global-styles clearing of attributes, border fallbacks, link hover colors, and behaviors. ([51621](https://github.com/WordPress/gutenberg/pull/51621))
+-   Preserve block style variations when securing theme json. ([53466](https://github.com/WordPress/gutenberg/pull/53466))
 
 #### Layout
-- Don't add root padding to children of flex and grid layout blocks. ([53259](https://github.com/WordPress/gutenberg/pull/53259))
-- Include namespace in layout classname for non-core blocks. ([53404](https://github.com/WordPress/gutenberg/pull/53404))
+
+-   Don't add root padding to children of flex and grid layout blocks. ([53259](https://github.com/WordPress/gutenberg/pull/53259))
+-   Include namespace in layout classname for non-core blocks. ([53404](https://github.com/WordPress/gutenberg/pull/53404))
 
 #### Interactivity API
-- Add short-circuit to `useSignalEffect`. ([53358](https://github.com/WordPress/gutenberg/pull/53358))
-- Add support for underscores and leading dashes in the suffix part of the directive. ([53337](https://github.com/WordPress/gutenberg/pull/53337))
-- Update deepsignal version. ([53549](https://github.com/WordPress/gutenberg/pull/53549))
+
+-   Add short-circuit to `useSignalEffect`. ([53358](https://github.com/WordPress/gutenberg/pull/53358))
+-   Add support for underscores and leading dashes in the suffix part of the directive. ([53337](https://github.com/WordPress/gutenberg/pull/53337))
+-   Update deepsignal version. ([53549](https://github.com/WordPress/gutenberg/pull/53549))
 
 #### Components
-- Button: Add `:Disabled` selector to reset hover color for disabled buttons. ([53411](https://github.com/WordPress/gutenberg/pull/53411))
-- Preferences Modal: Insert path and query args to form before submitting. ([53324](https://github.com/WordPress/gutenberg/pull/53324))
 
+-   Button: Add `:Disabled` selector to reset hover color for disabled buttons. ([53411](https://github.com/WordPress/gutenberg/pull/53411))
+-   Preferences Modal: Insert path and query args to form before submitting. ([53324](https://github.com/WordPress/gutenberg/pull/53324))
 
 ### Accessibility
 
-- Type labels GH Action: Fix accessibility issues in error message. ([53371](https://github.com/WordPress/gutenberg/pull/53371))
-- Add accessible description of current Navigation block state. ([53469](https://github.com/WordPress/gutenberg/pull/53469))
-- Implement accessible version of Navigation overlay preview toggle control. ([53462](https://github.com/WordPress/gutenberg/pull/53462))
-- Search Block: Fix unintended wrapping of button text in "Button only" style. ([53373](https://github.com/WordPress/gutenberg/pull/53373))
-
+-   Type labels GH Action: Fix accessibility issues in error message. ([53371](https://github.com/WordPress/gutenberg/pull/53371))
+-   Add accessible description of current Navigation block state. ([53469](https://github.com/WordPress/gutenberg/pull/53469))
+-   Implement accessible version of Navigation overlay preview toggle control. ([53462](https://github.com/WordPress/gutenberg/pull/53462))
+-   Search Block: Fix unintended wrapping of button text in "Button only" style. ([53373](https://github.com/WordPress/gutenberg/pull/53373))
 
 ### Performance
 
-- Compute presets from `theme.json`: Skip those without classes or variables. ([53574](https://github.com/WordPress/gutenberg/pull/53574))
-- Switch performance tests to Playwright. ([52022](https://github.com/WordPress/gutenberg/pull/52022))
-- Fix memory leaks in `<Iframe>`. ([53406](https://github.com/WordPress/gutenberg/pull/53406))
-- `get_root_layout_rules`: Remove unnecessary call to `sanitize_title`. ([53568](https://github.com/WordPress/gutenberg/pull/53568))
-
+-   Compute presets from `theme.json`: Skip those without classes or variables. ([53574](https://github.com/WordPress/gutenberg/pull/53574))
+-   Switch performance tests to Playwright. ([52022](https://github.com/WordPress/gutenberg/pull/52022))
+-   Fix memory leaks in `<Iframe>`. ([53406](https://github.com/WordPress/gutenberg/pull/53406))
+-   `get_root_layout_rules`: Remove unnecessary call to `sanitize_title`. ([53568](https://github.com/WordPress/gutenberg/pull/53568))
 
 ### Experiments
 
-- Fonts Library: Backend. ([52704](https://github.com/WordPress/gutenberg/pull/52704))
-- Add custom connections inspector control. ([53241](https://github.com/WordPress/gutenberg/pull/53241))
-- Allow contents of Paragraph to be "connected" to a meta custom field. ([53247](https://github.com/WordPress/gutenberg/pull/53247))
-- Bootstrap a minimal sync package. ([52681](https://github.com/WordPress/gutenberg/pull/52681))
-
+-   Fonts Library: Backend. ([52704](https://github.com/WordPress/gutenberg/pull/52704))
+-   Add custom connections inspector control. ([53241](https://github.com/WordPress/gutenberg/pull/53241))
+-   Allow contents of Paragraph to be "connected" to a meta custom field. ([53247](https://github.com/WordPress/gutenberg/pull/53247))
+-   Bootstrap a minimal sync package. ([52681](https://github.com/WordPress/gutenberg/pull/52681))
 
 ### Documentation
 
 #### Project Docs
-- Updating `lib/PHP` README.md. ([53614](https://github.com/WordPress/gutenberg/pull/53614))
-- Add documentation for keyboard shortcut selecting text across multiple blocks. ([43164](https://github.com/WordPress/gutenberg/pull/43164))
-- Add keyboard shortcut selecting text across multiple blocks on Windows. ([53625](https://github.com/WordPress/gutenberg/pull/53625))
-- Docs/Gutenberg release process - Better table of contents. ([53394](https://github.com/WordPress/gutenberg/pull/53394))
-- Add the auto-generated commands store documentation. ([52562](https://github.com/WordPress/gutenberg/pull/52562))
+
+-   Updating `lib/PHP` README.md. ([53614](https://github.com/WordPress/gutenberg/pull/53614))
+-   Add documentation for keyboard shortcut selecting text across multiple blocks. ([43164](https://github.com/WordPress/gutenberg/pull/43164))
+-   Add keyboard shortcut selecting text across multiple blocks on Windows. ([53625](https://github.com/WordPress/gutenberg/pull/53625))
+-   Docs/Gutenberg release process - Better table of contents. ([53394](https://github.com/WordPress/gutenberg/pull/53394))
+-   Add the auto-generated commands store documentation. ([52562](https://github.com/WordPress/gutenberg/pull/52562))
 
 #### Getting Started
-- Developer Environment: Refer to Node 16 instead of 14. ([53523](https://github.com/WordPress/gutenberg/pull/53523))
-- Create Block:
-  - Fix typo in finishing.md. ([53609](https://github.com/WordPress/gutenberg/pull/53609))
-  - Fix outdated specification in the "Anatomy of a Block". ([53581](https://github.com/WordPress/gutenberg/pull/53581))
+
+-   Developer Environment: Refer to Node 16 instead of 14. ([53523](https://github.com/WordPress/gutenberg/pull/53523))
+-   Create Block:
+    -   Fix typo in finishing.md. ([53609](https://github.com/WordPress/gutenberg/pull/53609))
+    -   Fix outdated specification in the "Anatomy of a Block". ([53581](https://github.com/WordPress/gutenberg/pull/53581))
 
 #### How To Guides
-- Block Tutorial: 
-  - Adds import from `@wordpress/i18n` in code example. ([53504](https://github.com/WordPress/gutenberg/pull/53504))
-  - Adds package.json configuration instructions to tutorial. ([53689](https://github.com/WordPress/gutenberg/pull/53689))
-- Building a Custom Block Editor: Consolidate and update the guide. ([53159](https://github.com/WordPress/gutenberg/pull/53159))
-- Curating the Editor Experience: Include starter patterns for templates. ([53398](https://github.com/WordPress/gutenberg/pull/53398))
-
-#### Components
-- Popover: Fix iframe story and add test. ([53182](https://github.com/WordPress/gutenberg/pull/53182))
-- BlockCaption: Add README for component. ([52535](https://github.com/WordPress/gutenberg/pull/52535))
-- useSetting: Add README for component. ([53162](https://github.com/WordPress/gutenberg/pull/53162))
-- SelectControl: Update JSDoc. ([53379](https://github.com/WordPress/gutenberg/pull/53379))
-- Card: Update Card component document. ([53172](https://github.com/WordPress/gutenberg/pull/53172))
-- MenuGroup: Add Storybook stories. ([53090](https://github.com/WordPress/gutenberg/pull/53090))
-- Edit Post: Update "PluginDocumentSettingPanel" documentation. ([53393](https://github.com/WordPress/gutenberg/pull/53393))
-- Interface: Fix "complimentary" typo with "complementary". ([53413](https://github.com/WordPress/gutenberg/pull/53413))
-
-#### Interactivity API 
-- Revamp of README to include API Reference among other indications. ([53385](https://github.com/WordPress/gutenberg/pull/53385))
-- Add missing section in ToC and minor improvements to Getting Started Guide. ([53362](https://github.com/WordPress/gutenberg/pull/53362))
-- Update Interactivity API package README with clear references to documentation. ([53388](https://github.com/WordPress/gutenberg/pull/53388))
-- Add code requirements to Interactivity API documentation. ([53342](https://github.com/WordPress/gutenberg/pull/53342))
-- Add JSDoc comments to the public API. ([52469](https://github.com/WordPress/gutenberg/pull/52469))
+
+-   Block Tutorial:
+    -   Adds import from `@wordpress/i18n` in code example. ([53504](https://github.com/WordPress/gutenberg/pull/53504))
+    -   Adds package.json configuration instructions to tutorial. ([53689](https://github.com/WordPress/gutenberg/pull/53689))
+-   Building a Custom Block Editor: Consolidate and update the guide. ([53159](https://github.com/WordPress/gutenberg/pull/53159))
+-   Curating the Editor Experience: Include starter patterns for templates. ([53398](https://github.com/WordPress/gutenberg/pull/53398))
+
+#### Components
+
+-   Popover: Fix iframe story and add test. ([53182](https://github.com/WordPress/gutenberg/pull/53182))
+-   BlockCaption: Add README for component. ([52535](https://github.com/WordPress/gutenberg/pull/52535))
+-   useSetting: Add README for component. ([53162](https://github.com/WordPress/gutenberg/pull/53162))
+-   SelectControl: Update JSDoc. ([53379](https://github.com/WordPress/gutenberg/pull/53379))
+-   Card: Update Card component document. ([53172](https://github.com/WordPress/gutenberg/pull/53172))
+-   MenuGroup: Add Storybook stories. ([53090](https://github.com/WordPress/gutenberg/pull/53090))
+-   Edit Post: Update "PluginDocumentSettingPanel" documentation. ([53393](https://github.com/WordPress/gutenberg/pull/53393))
+-   Interface: Fix "complimentary" typo with "complementary". ([53413](https://github.com/WordPress/gutenberg/pull/53413))
+
+#### Interactivity API
+
+-   Revamp of README to include API Reference among other indications. ([53385](https://github.com/WordPress/gutenberg/pull/53385))
+-   Add missing section in ToC and minor improvements to Getting Started Guide. ([53362](https://github.com/WordPress/gutenberg/pull/53362))
+-   Update Interactivity API package README with clear references to documentation. ([53388](https://github.com/WordPress/gutenberg/pull/53388))
+-   Add code requirements to Interactivity API documentation. ([53342](https://github.com/WordPress/gutenberg/pull/53342))
+-   Add JSDoc comments to the public API. ([52469](https://github.com/WordPress/gutenberg/pull/52469))
 
 #### Packages
-- Create Block: Update npx commands in README.md. ([47150](https://github.com/WordPress/gutenberg/pull/47150))
-- Data: Add changelog entry for the latest `useSelect` enhancement. ([53685](https://github.com/WordPress/gutenberg/pull/53685))
-- Style Engine: Update documentation for css_var. ([53710](https://github.com/WordPress/gutenberg/pull/53710))
 
+-   Create Block: Update npx commands in README.md. ([47150](https://github.com/WordPress/gutenberg/pull/47150))
+-   Data: Add changelog entry for the latest `useSelect` enhancement. ([53685](https://github.com/WordPress/gutenberg/pull/53685))
+-   Style Engine: Update documentation for css_var. ([53710](https://github.com/WordPress/gutenberg/pull/53710))
 
 ### Code Quality
 
-- Remove @types/classnames deprecated package. ([53478](https://github.com/WordPress/gutenberg/pull/53478))
-- Remove `gutenberg_initialize_editor`. ([53527](https://github.com/WordPress/gutenberg/pull/53527))
-- Update package-lock.json to match 16.4.0 version number. ([53499](https://github.com/WordPress/gutenberg/pull/53499))
+-   Remove @types/classnames deprecated package. ([53478](https://github.com/WordPress/gutenberg/pull/53478))
+-   Remove `gutenberg_initialize_editor`. ([53527](https://github.com/WordPress/gutenberg/pull/53527))
+-   Update package-lock.json to match 16.4.0 version number. ([53499](https://github.com/WordPress/gutenberg/pull/53499))
 
 #### Block Library
-- Button block: Replace the `isSmall` deprecated prop in the `WidthPanel`. ([53472](https://github.com/WordPress/gutenberg/pull/53472))
-- Details block: Remove unnecessary comment attributes. ([51610](https://github.com/WordPress/gutenberg/pull/51610))
-- Footnotes block: 
-  - Add some test coverage for footnotes logic in useEntityBlockEditor. ([53376](https://github.com/WordPress/gutenberg/pull/53376))
-  - Checking type before using count(). ([53660](https://github.com/WordPress/gutenberg/pull/53660))
-- LinkControl/LinkUI: Remove unused `className` prop. ([53348](https://github.com/WordPress/gutenberg/pull/53348))
-- Remove unneeded block.json name-only imports. ([53677](https://github.com/WordPress/gutenberg/pull/53677))
-- Template parts: Return a stable reference for the defined 'area'. ([53675](https://github.com/WordPress/gutenberg/pull/53675))
+
+-   Button block: Replace the `isSmall` deprecated prop in the `WidthPanel`. ([53472](https://github.com/WordPress/gutenberg/pull/53472))
+-   Details block: Remove unnecessary comment attributes. ([51610](https://github.com/WordPress/gutenberg/pull/51610))
+-   Footnotes block:
+    -   Add some test coverage for footnotes logic in useEntityBlockEditor. ([53376](https://github.com/WordPress/gutenberg/pull/53376))
+    -   Checking type before using count(). ([53660](https://github.com/WordPress/gutenberg/pull/53660))
+-   LinkControl/LinkUI: Remove unused `className` prop. ([53348](https://github.com/WordPress/gutenberg/pull/53348))
+-   Remove unneeded block.json name-only imports. ([53677](https://github.com/WordPress/gutenberg/pull/53677))
+-   Template parts: Return a stable reference for the defined 'area'. ([53675](https://github.com/WordPress/gutenberg/pull/53675))
 
 #### Components
-- ESLint: Fix all `storybook/prefer-pascal-case` warnings. ([53683](https://github.com/WordPress/gutenberg/pull/53683))
-- Remove unused components from `/ui`. ([52953](https://github.com/WordPress/gutenberg/pull/52953))
-- MenuItem: Refactor to TypeScript. ([53132](https://github.com/WordPress/gutenberg/pull/53132))
-- Move accent colors to theme context. ([53631](https://github.com/WordPress/gutenberg/pull/53631))
-- Interface: Fix ESLint warnings. ([53456](https://github.com/WordPress/gutenberg/pull/53456))
-- Plugins: Introduce the `usePluginContext` hook. ([53291](https://github.com/WordPress/gutenberg/pull/53291))
-- Remove effect dep in Link Control. ([53421](https://github.com/WordPress/gutenberg/pull/53421))
+
+-   ESLint: Fix all `storybook/prefer-pascal-case` warnings. ([53683](https://github.com/WordPress/gutenberg/pull/53683))
+-   Remove unused components from `/ui`. ([52953](https://github.com/WordPress/gutenberg/pull/52953))
+-   MenuItem: Refactor to TypeScript. ([53132](https://github.com/WordPress/gutenberg/pull/53132))
+-   Move accent colors to theme context. ([53631](https://github.com/WordPress/gutenberg/pull/53631))
+-   Interface: Fix ESLint warnings. ([53456](https://github.com/WordPress/gutenberg/pull/53456))
+-   Plugins: Introduce the `usePluginContext` hook. ([53291](https://github.com/WordPress/gutenberg/pull/53291))
+-   Remove effect dep in Link Control. ([53421](https://github.com/WordPress/gutenberg/pull/53421))
 
 #### Data Layer
-- Data: Warn if the `useSelect` hook returns different values when called with the same state and parameters. ([53666](https://github.com/WordPress/gutenberg/pull/53666))
+
+-   Data: Warn if the `useSelect` hook returns different values when called with the same state and parameters. ([53666](https://github.com/WordPress/gutenberg/pull/53666))
 
 #### Site Editor
-- Remove unnecessary `as` prop from `SiteHub` component. ([53372](https://github.com/WordPress/gutenberg/pull/53372))
-- Create patterns package and share the create pattern modal between post editor and site editor. ([53161](https://github.com/WordPress/gutenberg/pull/53161))
+
+-   Remove unnecessary `as` prop from `SiteHub` component. ([53372](https://github.com/WordPress/gutenberg/pull/53372))
+-   Create patterns package and share the create pattern modal between post editor and site editor. ([53161](https://github.com/WordPress/gutenberg/pull/53161))
 
 #### Post Editor
-- Migrate PostTypeSupportCheck usages from withSelect to hooks. ([53330](https://github.com/WordPress/gutenberg/pull/53330))
-- UnsavedChangesWarning: Don't return a function from 'mapSelect'. ([53672](https://github.com/WordPress/gutenberg/pull/53672))
-- Replace HoCs with hooks in:
-  - `PluginDocumentSettingPanel` ([53290](https://github.com/WordPress/gutenberg/pull/53290))
-  - `PostPendingStatusCheck` ([53389](https://github.com/WordPress/gutenberg/pull/53389))
-  - `PostPendingStatus` ([53387](https://github.com/WordPress/gutenberg/pull/53387))
-- Replace `withPluginContext` in `PluginPostPublishPanel` ([53302](https://github.com/WordPress/gutenberg/pull/53302)) and `PluginPrePublishPanel` ([53304](https://github.com/WordPress/gutenberg/pull/53304)).
-- Block previews: Memoize example blocks. ([53640](https://github.com/WordPress/gutenberg/pull/53640))
+
+-   Migrate PostTypeSupportCheck usages from withSelect to hooks. ([53330](https://github.com/WordPress/gutenberg/pull/53330))
+-   UnsavedChangesWarning: Don't return a function from 'mapSelect'. ([53672](https://github.com/WordPress/gutenberg/pull/53672))
+-   Replace HoCs with hooks in:
+    -   `PluginDocumentSettingPanel` ([53290](https://github.com/WordPress/gutenberg/pull/53290))
+    -   `PostPendingStatusCheck` ([53389](https://github.com/WordPress/gutenberg/pull/53389))
+    -   `PostPendingStatus` ([53387](https://github.com/WordPress/gutenberg/pull/53387))
+-   Replace `withPluginContext` in `PluginPostPublishPanel` ([53302](https://github.com/WordPress/gutenberg/pull/53302)) and `PluginPrePublishPanel` ([53304](https://github.com/WordPress/gutenberg/pull/53304)).
+-   Block previews: Memoize example blocks. ([53640](https://github.com/WordPress/gutenberg/pull/53640))
 
 #### Global Styles
-- Try: Bundle `WP_REST_Global_Styles_Controller` class instead of inheriting per WordPress version. ([53618](https://github.com/WordPress/gutenberg/pull/53618))
-- Remove empty usages of `BlockPreviewPanel`. ([53681](https://github.com/WordPress/gutenberg/pull/53681))
+
+-   Try: Bundle `WP_REST_Global_Styles_Controller` class instead of inheriting per WordPress version. ([53618](https://github.com/WordPress/gutenberg/pull/53618))
+-   Remove empty usages of `BlockPreviewPanel`. ([53681](https://github.com/WordPress/gutenberg/pull/53681))
 
 #### Block Editor
-- Remove Firefox work-around to type Space in RichText components inside button/summary. ([53014](https://github.com/WordPress/gutenberg/pull/53014))
-- Rich text: Small perf improvement for selection syncing. ([53583](https://github.com/WordPress/gutenberg/pull/53583))
-- Auto-inserting blocks: Minor fixes to address feedback. ([53183](https://github.com/WordPress/gutenberg/pull/53183))
 
+-   Remove Firefox work-around to type Space in RichText components inside button/summary. ([53014](https://github.com/WordPress/gutenberg/pull/53014))
+-   Rich text: Small perf improvement for selection syncing. ([53583](https://github.com/WordPress/gutenberg/pull/53583))
+-   Auto-inserting blocks: Minor fixes to address feedback. ([53183](https://github.com/WordPress/gutenberg/pull/53183))
 
 ### Tools
 
 #### Project Management
-- Remove automation that checks-in ANY issue without activity in 180 days. ([53390](https://github.com/WordPress/gutenberg/pull/53390))
+
+-   Remove automation that checks-in ANY issue without activity in 180 days. ([53390](https://github.com/WordPress/gutenberg/pull/53390))
 
 #### Build Tooling
-- Update minimal node version to 16 and npm to 8. ([53426](https://github.com/WordPress/gutenberg/pull/53426))
-- Update to TypeScript 5.1. ([52621](https://github.com/WordPress/gutenberg/pull/52621))
-- Update Lerna to 7.1.4. ([53515](https://github.com/WordPress/gutenberg/pull/53515))
-- Update Storybook to v7. ([53520](https://github.com/WordPress/gutenberg/pull/53520))
-- Update `npm-package-json-lint` to v6. ([53636](https://github.com/WordPress/gutenberg/pull/53636))
-- Update `mkdirp` dependency. ([53529](https://github.com/WordPress/gutenberg/pull/53529))
-- ESLint Plugin: Bring JSDoc plugin to the latest version. ([53629](https://github.com/WordPress/gutenberg/pull/53629))
-- Add Storybook TypesSript plugin for compatibility with TypeScript 5. ([53445](https://github.com/WordPress/gutenberg/pull/53445))
-- Update the "update plugin version" workflow step so that it also updates the nested package version for Gutenberg. ([53503](https://github.com/WordPress/gutenberg/pull/53503))
-- Fix wp-scripts watch mode failing when `block.json` contains malformed JSON. ([51971](https://github.com/WordPress/gutenberg/pull/51971))
-- Remove deprecated `stable` deep dependency. ([53630](https://github.com/WordPress/gutenberg/pull/53630))
-- Add some missing internal peer dependencies. ([53275](https://github.com/WordPress/gutenberg/pull/53275))
-- Add some missing package dependencies. ([41486](https://github.com/WordPress/gutenberg/pull/41486))
 
-#### Testing
-- Migrate 'Block variations' end-to-end tests to Playwright. ([53266](https://github.com/WordPress/gutenberg/pull/53266))
-- Interactivity API: Add missing tests for `body`, `init` and `on` directives. ([52952](https://github.com/WordPress/gutenberg/pull/52952))
-- Cover block: Add integration tests to check isDark settings. ([53256](https://github.com/WordPress/gutenberg/pull/53256))
-- Writing flow: Add end-to-end tests for webkit and firefox. ([53458](https://github.com/WordPress/gutenberg/pull/53458))
-- Add tests for fluid layout and typography. ([53554](https://github.com/WordPress/gutenberg/pull/53554))
-- Block editor: Webkit e2e: Attempt to fix shift+click test. ([53564](https://github.com/WordPress/gutenberg/pull/53564))
-- end-to-end Storybook: Fix for Storybook v7. ([53658](https://github.com/WordPress/gutenberg/pull/53658))
-- Dependencies: Update `@testing-library/react` to v14. ([53682](https://github.com/WordPress/gutenberg/pull/53682))
-- Multi-select: Restore pre-Playwright migration test for failed selection attempt. ([53418](https://github.com/WordPress/gutenberg/pull/53418))
+-   Update minimal node version to 16 and npm to 8. ([53426](https://github.com/WordPress/gutenberg/pull/53426))
+-   Update to TypeScript 5.1. ([52621](https://github.com/WordPress/gutenberg/pull/52621))
+-   Update Lerna to 7.1.4. ([53515](https://github.com/WordPress/gutenberg/pull/53515))
+-   Update Storybook to v7. ([53520](https://github.com/WordPress/gutenberg/pull/53520))
+-   Update `npm-package-json-lint` to v6. ([53636](https://github.com/WordPress/gutenberg/pull/53636))
+-   Update `mkdirp` dependency. ([53529](https://github.com/WordPress/gutenberg/pull/53529))
+-   ESLint Plugin: Bring JSDoc plugin to the latest version. ([53629](https://github.com/WordPress/gutenberg/pull/53629))
+-   Add Storybook TypesSript plugin for compatibility with TypeScript 5. ([53445](https://github.com/WordPress/gutenberg/pull/53445))
+-   Update the "update plugin version" workflow step so that it also updates the nested package version for Gutenberg. ([53503](https://github.com/WordPress/gutenberg/pull/53503))
+-   Fix wp-scripts watch mode failing when `block.json` contains malformed JSON. ([51971](https://github.com/WordPress/gutenberg/pull/51971))
+-   Remove deprecated `stable` deep dependency. ([53630](https://github.com/WordPress/gutenberg/pull/53630))
+-   Add some missing internal peer dependencies. ([53275](https://github.com/WordPress/gutenberg/pull/53275))
+-   Add some missing package dependencies. ([41486](https://github.com/WordPress/gutenberg/pull/41486))
 
+#### Testing
 
-## First time contributors
+-   Migrate 'Block variations' end-to-end tests to Playwright. ([53266](https://github.com/WordPress/gutenberg/pull/53266))
+-   Interactivity API: Add missing tests for `body`, `init` and `on` directives. ([52952](https://github.com/WordPress/gutenberg/pull/52952))
+-   Cover block: Add integration tests to check isDark settings. ([53256](https://github.com/WordPress/gutenberg/pull/53256))
+-   Writing flow: Add end-to-end tests for webkit and firefox. ([53458](https://github.com/WordPress/gutenberg/pull/53458))
+-   Add tests for fluid layout and typography. ([53554](https://github.com/WordPress/gutenberg/pull/53554))
+-   Block editor: Webkit e2e: Attempt to fix shift+click test. ([53564](https://github.com/WordPress/gutenberg/pull/53564))
+-   end-to-end Storybook: Fix for Storybook v7. ([53658](https://github.com/WordPress/gutenberg/pull/53658))
+-   Dependencies: Update `@testing-library/react` to v14. ([53682](https://github.com/WordPress/gutenberg/pull/53682))
+-   Multi-select: Restore pre-Playwright migration test for failed selection attempt. ([53418](https://github.com/WordPress/gutenberg/pull/53418))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @behoney: fix: Typo in finishing.md. ([53609](https://github.com/WordPress/gutenberg/pull/53609))
-- @bengreeley: Add documentation for keyboard shortcut selecting text across multiple blocks. ([43164](https://github.com/WordPress/gutenberg/pull/43164))
-- @doughamlin: Update npx commands in create-block README.md. ([47150](https://github.com/WordPress/gutenberg/pull/47150))
-- @ducksblock: Fix: #52886 Make all the 'Loading' strings consistent. ([52901](https://github.com/WordPress/gutenberg/pull/52901))
-- @rtro92: Adds import for internationalization. ([53504](https://github.com/WordPress/gutenberg/pull/53504))
+The following PRs were merged by first-time contributors:
 
+-   @behoney: fix: Typo in finishing.md. ([53609](https://github.com/WordPress/gutenberg/pull/53609))
+-   @bengreeley: Add documentation for keyboard shortcut selecting text across multiple blocks. ([43164](https://github.com/WordPress/gutenberg/pull/43164))
+-   @doughamlin: Update npx commands in create-block README.md. ([47150](https://github.com/WordPress/gutenberg/pull/47150))
+-   @ducksblock: Fix: #52886 Make all the 'Loading' strings consistent. ([52901](https://github.com/WordPress/gutenberg/pull/52901))
+-   @rtro92: Adds import for internationalization. ([53504](https://github.com/WordPress/gutenberg/pull/53504))
 
 ## Contributors
 
@@ -3077,9 +13855,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @ajlende @alexstine @Aljullu @andrewserong @annezazu @anomiex @artemiomorales @atachibana @bangank36 @behoney @bengreeley @c4rl0sbr4v0 @carolinan @DAreRodz @dcalhoun @derekblank @doughamlin @draganescu @dsas @ducksblock @ellatrix @fabiankaegy @fluiddot @fullofcaffeine @geriux @getdave @glendaviesnz @gziolo @ingeniumed @jameskoster @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @luisherranz @Mamaduka @matiasbenedetto @mburridge @michalczaplinski @mikachan @mirka @ndiego @noahtallen @noisysocks @oandregal @ockham @pbking @priethor @ramonjd @richtabor @rtro92 @scruffian @SiobhyB @stokesman @swissspidy @t-hamano @tellthemachines @tjcafferkey @tomjn @tyxla @WunderBart @youknowriad
 
-
-
-
 = 16.4.0 =
 
 ## Changelog
@@ -3087,303 +13862,337 @@ The following contributors merged PRs in this release:
 ### Features
 
 #### Components
-- Introduce a basic ProgressBar component. ([53030](https://github.com/WordPress/gutenberg/pull/53030))
+
+-   Introduce a basic ProgressBar component. ([53030](https://github.com/WordPress/gutenberg/pull/53030))
 
 #### Block Editor
-- Link Control: Persist advanced settings toggle state to preferences if available. ([52799](https://github.com/WordPress/gutenberg/pull/52799))
+
+-   Link Control: Persist advanced settings toggle state to preferences if available. ([52799](https://github.com/WordPress/gutenberg/pull/52799))
 
 #### Block Library
-- Behaviors: Extend Global Styles API to read/write behaviors config. ([52370](https://github.com/WordPress/gutenberg/pull/52370))
+
+-   Behaviors: Extend Global Styles API to read/write behaviors config. ([52370](https://github.com/WordPress/gutenberg/pull/52370))
 
 ### Enhancements
 
 #### Site Editor
-- Add context to the "Reset template" "Delete template" and "Edit template" commands. ([52989](https://github.com/WordPress/gutenberg/pull/52989))
-- Add `xhuge` breakpoint (1920px) and update pattern grid. ([52942](https://github.com/WordPress/gutenberg/pull/52942))
-- Display keyboard shortcut for command palette in site view. ([52841](https://github.com/WordPress/gutenberg/pull/52841))
-- Make sure only one Site updated notice displays at a time. ([53087](https://github.com/WordPress/gutenberg/pull/53087))
-- Pattern library: Switch to three column layout on `huge` screens. ([52927](https://github.com/WordPress/gutenberg/pull/52927))
-- Template Descriptions: Tidy up all abbreviations of 'example' to be e.g. ([52848](https://github.com/WordPress/gutenberg/pull/52848))
-- Try adding further details to template part panel. ([52476](https://github.com/WordPress/gutenberg/pull/52476))
-- Update the `ConfirmDialog` that appears when applying a style revision over unsaved changes. ([52972](https://github.com/WordPress/gutenberg/pull/52972))
-- Update: Improve titles of author templates in query title block. ([52732](https://github.com/WordPress/gutenberg/pull/52732))
+
+-   Add context to the "Reset template" "Delete template" and "Edit template" commands. ([52989](https://github.com/WordPress/gutenberg/pull/52989))
+-   Add `xhuge` breakpoint (1920px) and update pattern grid. ([52942](https://github.com/WordPress/gutenberg/pull/52942))
+-   Display keyboard shortcut for command palette in site view. ([52841](https://github.com/WordPress/gutenberg/pull/52841))
+-   Make sure only one Site updated notice displays at a time. ([53087](https://github.com/WordPress/gutenberg/pull/53087))
+-   Pattern library: Switch to three column layout on `huge` screens. ([52927](https://github.com/WordPress/gutenberg/pull/52927))
+-   Template Descriptions: Tidy up all abbreviations of 'example' to be e.g. ([52848](https://github.com/WordPress/gutenberg/pull/52848))
+-   Try adding further details to template part panel. ([52476](https://github.com/WordPress/gutenberg/pull/52476))
+-   Update the `ConfirmDialog` that appears when applying a style revision over unsaved changes. ([52972](https://github.com/WordPress/gutenberg/pull/52972))
+-   Update: Improve titles of author templates in query title block. ([52732](https://github.com/WordPress/gutenberg/pull/52732))
 
 #### Post Editor
-- Add common commands (breadcrumbs, live preview, pre-publish checklist). ([53073](https://github.com/WordPress/gutenberg/pull/53073))
-- Use hooks instead of HoCs for:
-  - `DiscussionPanel`. ([53232](https://github.com/WordPress/gutenberg/pull/53232))
-  - `PostPingbacks`. ([53228](https://github.com/WordPress/gutenberg/pull/53228))
-  - `PostComments`. ([53231](https://github.com/WordPress/gutenberg/pull/53231))
-  - `PostExcerpt`. ([53229](https://github.com/WordPress/gutenberg/pull/53229))
-  - `PostTypeSupportCheck`. ([53235](https://github.com/WordPress/gutenberg/pull/53235))
+
+-   Add common commands (breadcrumbs, live preview, pre-publish checklist). ([53073](https://github.com/WordPress/gutenberg/pull/53073))
+-   Use hooks instead of HoCs for:
+    -   `DiscussionPanel`. ([53232](https://github.com/WordPress/gutenberg/pull/53232))
+    -   `PostPingbacks`. ([53228](https://github.com/WordPress/gutenberg/pull/53228))
+    -   `PostComments`. ([53231](https://github.com/WordPress/gutenberg/pull/53231))
+    -   `PostExcerpt`. ([53229](https://github.com/WordPress/gutenberg/pull/53229))
+    -   `PostTypeSupportCheck`. ([53235](https://github.com/WordPress/gutenberg/pull/53235))
 
 #### Block Library
-- Footnotes: Add link, background, and text color support. ([52897](https://github.com/WordPress/gutenberg/pull/52897))
-- Image block: Fix flaky tests. ([52442](https://github.com/WordPress/gutenberg/pull/52442))
-- Preformatted: Add spacing support. ([45196](https://github.com/WordPress/gutenberg/pull/45196))
-- Social Links: Add Threads Icon. ([52685](https://github.com/WordPress/gutenberg/pull/52685))
-- Verse: Enable the line breaks. ([52928](https://github.com/WordPress/gutenberg/pull/52928))
+
+-   Footnotes: Add link, background, and text color support. ([52897](https://github.com/WordPress/gutenberg/pull/52897))
+-   Image block: Fix flaky tests. ([52442](https://github.com/WordPress/gutenberg/pull/52442))
+-   Preformatted: Add spacing support. ([45196](https://github.com/WordPress/gutenberg/pull/45196))
+-   Social Links: Add Threads Icon. ([52685](https://github.com/WordPress/gutenberg/pull/52685))
+-   Verse: Enable the line breaks. ([52928](https://github.com/WordPress/gutenberg/pull/52928))
 
 #### Patterns
-- Align height of save button and patterns pagination. ([52764](https://github.com/WordPress/gutenberg/pull/52764))
-- Allow inserting of unsynced patterns from quick inserter. ([52866](https://github.com/WordPress/gutenberg/pull/52866))
-- Show the default patterns icons for all pattern blocks in inserter. ([53208](https://github.com/WordPress/gutenberg/pull/53208))
-- Update the Manage all my patterns command to redirect to site editor patterns list. ([52817](https://github.com/WordPress/gutenberg/pull/52817))
+
+-   Align height of save button and patterns pagination. ([52764](https://github.com/WordPress/gutenberg/pull/52764))
+-   Allow inserting of unsynced patterns from quick inserter. ([52866](https://github.com/WordPress/gutenberg/pull/52866))
+-   Show the default patterns icons for all pattern blocks in inserter. ([53208](https://github.com/WordPress/gutenberg/pull/53208))
+-   Update the Manage all my patterns command to redirect to site editor patterns list. ([52817](https://github.com/WordPress/gutenberg/pull/52817))
 
 #### Interactivity API
-- Use defer loading strategy for frontend view scripts. ([52536](https://github.com/WordPress/gutenberg/pull/52536))
-- [create-block] Refinements to the create-block-interactive-template package. ([52801](https://github.com/WordPress/gutenberg/pull/52801))
+
+-   Use defer loading strategy for frontend view scripts. ([52536](https://github.com/WordPress/gutenberg/pull/52536))
+-   [create-block] Refinements to the create-block-interactive-template package. ([52801](https://github.com/WordPress/gutenberg/pull/52801))
 
 #### Components
-- Settings: Show message when Visual or Code editor are disabled. ([52737](https://github.com/WordPress/gutenberg/pull/52737))
-- `TabPanel`: Implement Ariakit internally. ([52133](https://github.com/WordPress/gutenberg/pull/52133))
+
+-   Settings: Show message when Visual or Code editor are disabled. ([52737](https://github.com/WordPress/gutenberg/pull/52737))
+-   `TabPanel`: Implement Ariakit internally. ([52133](https://github.com/WordPress/gutenberg/pull/52133))
 
 #### Global Styles
-- Site editor: Conditionally render global styles revisions footer in sidebar. ([53204](https://github.com/WordPress/gutenberg/pull/53204))
+
+-   Site editor: Conditionally render global styles revisions footer in sidebar. ([53204](https://github.com/WordPress/gutenberg/pull/53204))
 
 #### Block Editor
-- Remove duplicated display URL in LinkControl. ([53167](https://github.com/WordPress/gutenberg/pull/53167))
+
+-   Remove duplicated display URL in LinkControl. ([53167](https://github.com/WordPress/gutenberg/pull/53167))
 
 #### Synced Patterns
-- Remove extraneous "Detach" ToolbarButton for synced patterns. ([53121](https://github.com/WordPress/gutenberg/pull/53121))
+
+-   Remove extraneous "Detach" ToolbarButton for synced patterns. ([53121](https://github.com/WordPress/gutenberg/pull/53121))
 
 #### Icons
-- Add keyboard icon and use in relative commands. ([53083](https://github.com/WordPress/gutenberg/pull/53083))
+
+-   Add keyboard icon and use in relative commands. ([53083](https://github.com/WordPress/gutenberg/pull/53083))
 
 #### Plugin
-- Bump plugin minimum supported PHP version to 7.0. ([52982](https://github.com/WordPress/gutenberg/pull/52982))
+
+-   Bump plugin minimum supported PHP version to 7.0. ([52982](https://github.com/WordPress/gutenberg/pull/52982))
 
 #### Data Layer
-- Promisify action creator return type for WP data dispatch. ([52530](https://github.com/WordPress/gutenberg/pull/52530))
 
+-   Promisify action creator return type for WP data dispatch. ([52530](https://github.com/WordPress/gutenberg/pull/52530))
 
 ### Bug Fixes
 
 #### Block Library
-- Avatar: Fix global border styles generation. ([53007](https://github.com/WordPress/gutenberg/pull/53007))
-- Check if object exists before accessing its properties. ([52870](https://github.com/WordPress/gutenberg/pull/52870))
-- Cover block: Disable contrast checker. ([53080](https://github.com/WordPress/gutenberg/pull/53080))
-- Disambiguate "Import" button string. ([52907](https://github.com/WordPress/gutenberg/pull/52907))
-- Footnotes:
-  - Footnotes/RichText: Fix getRichTextValues for deeply nested blocks. ([53034](https://github.com/WordPress/gutenberg/pull/53034))
-  - Disable based on post type. ([52934](https://github.com/WordPress/gutenberg/pull/52934))
-  - Disable for synced patterns and prevent duplication for pages in site editor. ([53003](https://github.com/WordPress/gutenberg/pull/53003))
-  - Fix published preview. ([53072](https://github.com/WordPress/gutenberg/pull/53072))
-  - Store in revisions. ([52686](https://github.com/WordPress/gutenberg/pull/52686))
-- Image block: Fix image size at wide and full width. ([53184](https://github.com/WordPress/gutenberg/pull/53184))
-- Navigation Sidebar: Fetch the blocks from the content when trying to load navigations. ([52899](https://github.com/WordPress/gutenberg/pull/52899))
-- Navigation: Load the raw property on the navigation fallback. ([52758](https://github.com/WordPress/gutenberg/pull/52758))
-- Remove block tools back compat component schedule for deprecated in 6.3. ([53115](https://github.com/WordPress/gutenberg/pull/53115))
-- Verse: Disable line breaks. ([52783](https://github.com/WordPress/gutenberg/pull/52783))
-- Video: Fixing styles that vertical alignment of the video. ([53131](https://github.com/WordPress/gutenberg/pull/53131))
+
+-   Avatar: Fix global border styles generation. ([53007](https://github.com/WordPress/gutenberg/pull/53007))
+-   Check if object exists before accessing its properties. ([52870](https://github.com/WordPress/gutenberg/pull/52870))
+-   Cover block: Disable contrast checker. ([53080](https://github.com/WordPress/gutenberg/pull/53080))
+-   Disambiguate "Import" button string. ([52907](https://github.com/WordPress/gutenberg/pull/52907))
+-   Footnotes:
+    -   Footnotes/RichText: Fix getRichTextValues for deeply nested blocks. ([53034](https://github.com/WordPress/gutenberg/pull/53034))
+    -   Disable based on post type. ([52934](https://github.com/WordPress/gutenberg/pull/52934))
+    -   Disable for synced patterns and prevent duplication for pages in site editor. ([53003](https://github.com/WordPress/gutenberg/pull/53003))
+    -   Fix published preview. ([53072](https://github.com/WordPress/gutenberg/pull/53072))
+    -   Store in revisions. ([52686](https://github.com/WordPress/gutenberg/pull/52686))
+-   Image block: Fix image size at wide and full width. ([53184](https://github.com/WordPress/gutenberg/pull/53184))
+-   Navigation Sidebar: Fetch the blocks from the content when trying to load navigations. ([52899](https://github.com/WordPress/gutenberg/pull/52899))
+-   Navigation: Load the raw property on the navigation fallback. ([52758](https://github.com/WordPress/gutenberg/pull/52758))
+-   Remove block tools back compat component schedule for deprecated in 6.3. ([53115](https://github.com/WordPress/gutenberg/pull/53115))
+-   Verse: Disable line breaks. ([52783](https://github.com/WordPress/gutenberg/pull/52783))
+-   Video: Fixing styles that vertical alignment of the video. ([53131](https://github.com/WordPress/gutenberg/pull/53131))
 
 #### Site Editor
-- Add navigation type to title labels map. ([53074](https://github.com/WordPress/gutenberg/pull/53074))
-- Command Palette:
-  - Add `Open styles revisions` command conditionally. ([52945](https://github.com/WordPress/gutenberg/pull/52945))
-  - Command Palette: Remove double border on results pages. ([52873](https://github.com/WordPress/gutenberg/pull/52873))
-  - CommandPalette: Fixed to not execute commands in IME composition. ([52844](https://github.com/WordPress/gutenberg/pull/52844))
-  - Defer to preceding handlers in command palette keyboard shortcut. ([53001](https://github.com/WordPress/gutenberg/pull/53001))
-  - [Core Commands]: Handle navigation commands based on access of site editor. ([52987](https://github.com/WordPress/gutenberg/pull/52987))
-- Fix block top toolbar artifact in navigation isolation. ([53110](https://github.com/WordPress/gutenberg/pull/53110))
-- Fix canvas mode sync with URL. ([52996](https://github.com/WordPress/gutenberg/pull/52996))
-- Fix the template parts link on the list page. ([52891](https://github.com/WordPress/gutenberg/pull/52891))
-- Open template parts from the list page in canvas view mode. ([52916](https://github.com/WordPress/gutenberg/pull/52916))
-- Fix the typo in the title label map. ([53071](https://github.com/WordPress/gutenberg/pull/53071))
-- Fix: Block toolbar obscuring document tools when Top Toolbar is enabled. ([52722](https://github.com/WordPress/gutenberg/pull/52722))
-- ResizableFrame: Account for window resizing. ([52697](https://github.com/WordPress/gutenberg/pull/52697))
-- Sidebar: Restore Back button 'go to parent' functionality. ([52910](https://github.com/WordPress/gutenberg/pull/52910))
-- Top toolbar: Fix issues with save button overlap and plugin buttons. ([53101](https://github.com/WordPress/gutenberg/pull/53101))
-- Update document title buttons radius. ([53221](https://github.com/WordPress/gutenberg/pull/53221))
+
+-   Add navigation type to title labels map. ([53074](https://github.com/WordPress/gutenberg/pull/53074))
+-   Command Palette:
+    -   Add `Open styles revisions` command conditionally. ([52945](https://github.com/WordPress/gutenberg/pull/52945))
+    -   Command Palette: Remove double border on results pages. ([52873](https://github.com/WordPress/gutenberg/pull/52873))
+    -   CommandPalette: Fixed to not execute commands in IME composition. ([52844](https://github.com/WordPress/gutenberg/pull/52844))
+    -   Defer to preceding handlers in command palette keyboard shortcut. ([53001](https://github.com/WordPress/gutenberg/pull/53001))
+    -   [Core Commands]: Handle navigation commands based on access of site editor. ([52987](https://github.com/WordPress/gutenberg/pull/52987))
+-   Fix block top toolbar artifact in navigation isolation. ([53110](https://github.com/WordPress/gutenberg/pull/53110))
+-   Fix canvas mode sync with URL. ([52996](https://github.com/WordPress/gutenberg/pull/52996))
+-   Fix the template parts link on the list page. ([52891](https://github.com/WordPress/gutenberg/pull/52891))
+-   Open template parts from the list page in canvas view mode. ([52916](https://github.com/WordPress/gutenberg/pull/52916))
+-   Fix the typo in the title label map. ([53071](https://github.com/WordPress/gutenberg/pull/53071))
+-   Fix: Block toolbar obscuring document tools when Top Toolbar is enabled. ([52722](https://github.com/WordPress/gutenberg/pull/52722))
+-   ResizableFrame: Account for window resizing. ([52697](https://github.com/WordPress/gutenberg/pull/52697))
+-   Sidebar: Restore Back button 'go to parent' functionality. ([52910](https://github.com/WordPress/gutenberg/pull/52910))
+-   Top toolbar: Fix issues with save button overlap and plugin buttons. ([53101](https://github.com/WordPress/gutenberg/pull/53101))
+-   Update document title buttons radius. ([53221](https://github.com/WordPress/gutenberg/pull/53221))
 
 #### Patterns
-- Add id to pattern inserted notice to stop multiple notices stacking. ([52746](https://github.com/WordPress/gutenberg/pull/52746))
-- Allow orphaned template parts to appear in "general" category. ([52961](https://github.com/WordPress/gutenberg/pull/52961))
-- Correctly color code unsynced patterns titles in Site Editor. ([52958](https://github.com/WordPress/gutenberg/pull/52958))
-- Fix auto-size patterns triggering scrollbar flickering on certain size. ([52921](https://github.com/WordPress/gutenberg/pull/52921))
-- Fix color and behavior of unsynced patterns in block inserter when searching for `reusable`. ([53205](https://github.com/WordPress/gutenberg/pull/53205))
-- Fix editor crashing on certain search filter combinations. ([52956](https://github.com/WordPress/gutenberg/pull/52956))
-- Fix empty general template parts in Patterns. ([52747](https://github.com/WordPress/gutenberg/pull/52747))
-- Fix not expanding pattern in page editor. ([53169](https://github.com/WordPress/gutenberg/pull/53169))
-- Fix: Snack bar not fixed on certain pages in the Site Editor. ([53207](https://github.com/WordPress/gutenberg/pull/53207))
-- Pattern: Add getBlockRootClientId call. ([53206](https://github.com/WordPress/gutenberg/pull/53206))
-- Patterns Browse Screen: Fix back button when switching between categories. ([52964](https://github.com/WordPress/gutenberg/pull/52964))
-- Reset current page when search filters change. ([52933](https://github.com/WordPress/gutenberg/pull/52933))
-- Site Editor: Fix site link accessibility issues. ([52744](https://github.com/WordPress/gutenberg/pull/52744))
-- Site Editor: Use the correct icon for Patterns in sidebar card. ([52931](https://github.com/WordPress/gutenberg/pull/52931))
+
+-   Add id to pattern inserted notice to stop multiple notices stacking. ([52746](https://github.com/WordPress/gutenberg/pull/52746))
+-   Allow orphaned template parts to appear in "general" category. ([52961](https://github.com/WordPress/gutenberg/pull/52961))
+-   Correctly color code unsynced patterns titles in Site Editor. ([52958](https://github.com/WordPress/gutenberg/pull/52958))
+-   Fix auto-size patterns triggering scrollbar flickering on certain size. ([52921](https://github.com/WordPress/gutenberg/pull/52921))
+-   Fix color and behavior of unsynced patterns in block inserter when searching for `reusable`. ([53205](https://github.com/WordPress/gutenberg/pull/53205))
+-   Fix editor crashing on certain search filter combinations. ([52956](https://github.com/WordPress/gutenberg/pull/52956))
+-   Fix empty general template parts in Patterns. ([52747](https://github.com/WordPress/gutenberg/pull/52747))
+-   Fix not expanding pattern in page editor. ([53169](https://github.com/WordPress/gutenberg/pull/53169))
+-   Fix: Snack bar not fixed on certain pages in the Site Editor. ([53207](https://github.com/WordPress/gutenberg/pull/53207))
+-   Pattern: Add getBlockRootClientId call. ([53206](https://github.com/WordPress/gutenberg/pull/53206))
+-   Patterns Browse Screen: Fix back button when switching between categories. ([52964](https://github.com/WordPress/gutenberg/pull/52964))
+-   Reset current page when search filters change. ([52933](https://github.com/WordPress/gutenberg/pull/52933))
+-   Site Editor: Fix site link accessibility issues. ([52744](https://github.com/WordPress/gutenberg/pull/52744))
+-   Site Editor: Use the correct icon for Patterns in sidebar card. ([52931](https://github.com/WordPress/gutenberg/pull/52931))
 
 #### Post Editor
-- Allow styles to be changed dynamically through editor settings. ([52767](https://github.com/WordPress/gutenberg/pull/52767))
-- Distraction Free: Fix conflict with `showListViewByDefault` preference. ([52914](https://github.com/WordPress/gutenberg/pull/52914))
-- Editor: Set default parameter for '__unstableSaveForPreview'. ([53079](https://github.com/WordPress/gutenberg/pull/53079))
-- Fix toolbar when previewing devices in post editor. ([52770](https://github.com/WordPress/gutenberg/pull/52770))
-- I18N: Add missing Gettext wrapper on strings in Edit Post overview sidebar. ([52971](https://github.com/WordPress/gutenberg/pull/52971))
-- shimAttributeSource: Don't run outside the registerBlockType filter. ([53015](https://github.com/WordPress/gutenberg/pull/53015))
+
+-   Allow styles to be changed dynamically through editor settings. ([52767](https://github.com/WordPress/gutenberg/pull/52767))
+-   Distraction Free: Fix conflict with `showListViewByDefault` preference. ([52914](https://github.com/WordPress/gutenberg/pull/52914))
+-   Editor: Set default parameter for '\_\_unstableSaveForPreview'. ([53079](https://github.com/WordPress/gutenberg/pull/53079))
+-   Fix toolbar when previewing devices in post editor. ([52770](https://github.com/WordPress/gutenberg/pull/52770))
+-   I18N: Add missing Gettext wrapper on strings in Edit Post overview sidebar. ([52971](https://github.com/WordPress/gutenberg/pull/52971))
+-   shimAttributeSource: Don't run outside the registerBlockType filter. ([53015](https://github.com/WordPress/gutenberg/pull/53015))
 
 #### Global Styles
-- Global styles revisions: Display text if no revisions are found. ([52865](https://github.com/WordPress/gutenberg/pull/52865))
-- Spacing presets: Fix bug with select control adding undefined preset values. ([53005](https://github.com/WordPress/gutenberg/pull/53005))
-- Style Engine: Switch off optimize by default. ([53085](https://github.com/WordPress/gutenberg/pull/53085))
+
+-   Global styles revisions: Display text if no revisions are found. ([52865](https://github.com/WordPress/gutenberg/pull/52865))
+-   Spacing presets: Fix bug with select control adding undefined preset values. ([53005](https://github.com/WordPress/gutenberg/pull/53005))
+-   Style Engine: Switch off optimize by default. ([53085](https://github.com/WordPress/gutenberg/pull/53085))
 
 #### Block Editor
-- Fix spacing for LinkControl actions. ([53055](https://github.com/WordPress/gutenberg/pull/53055))
-- List: Allow ENTER on multi-selection. ([52947](https://github.com/WordPress/gutenberg/pull/52947))
-- List: Fix merging nested lists. ([52949](https://github.com/WordPress/gutenberg/pull/52949))
+
+-   Fix spacing for LinkControl actions. ([53055](https://github.com/WordPress/gutenberg/pull/53055))
+-   List: Allow ENTER on multi-selection. ([52947](https://github.com/WordPress/gutenberg/pull/52947))
+-   List: Fix merging nested lists. ([52949](https://github.com/WordPress/gutenberg/pull/52949))
 
 #### Design Tools
-- Borders: Prevent console error when clearing custom border color. ([52963](https://github.com/WordPress/gutenberg/pull/52963))
-- Check if spacing tool is defined before displaying controls. ([53008](https://github.com/WordPress/gutenberg/pull/53008))
+
+-   Borders: Prevent console error when clearing custom border color. ([52963](https://github.com/WordPress/gutenberg/pull/52963))
+-   Check if spacing tool is defined before displaying controls. ([53008](https://github.com/WordPress/gutenberg/pull/53008))
 
 #### Distraction Free
-- Add missing command in Site Editor. ([52868](https://github.com/WordPress/gutenberg/pull/52868))
-- Distraction Free Keyboard Shortcut: Fix notices in Site Editor. ([52867](https://github.com/WordPress/gutenberg/pull/52867))
+
+-   Add missing command in Site Editor. ([52868](https://github.com/WordPress/gutenberg/pull/52868))
+-   Distraction Free Keyboard Shortcut: Fix notices in Site Editor. ([52867](https://github.com/WordPress/gutenberg/pull/52867))
 
 #### Layout
-- Prevent the Dimensions UI from being displayed when the block does not support Dimensions. ([53092](https://github.com/WordPress/gutenberg/pull/53092))
+
+-   Prevent the Dimensions UI from being displayed when the block does not support Dimensions. ([53092](https://github.com/WordPress/gutenberg/pull/53092))
 
 #### List View
-- Ensure `onBlockDrop` does not fire if there is no target. ([52959](https://github.com/WordPress/gutenberg/pull/52959))
+
+-   Ensure `onBlockDrop` does not fire if there is no target. ([52959](https://github.com/WordPress/gutenberg/pull/52959))
 
 #### Template Editor
-- Site Editor: Don't navigate to the patterns in Template Parts mode. ([52884](https://github.com/WordPress/gutenberg/pull/52884))
+
+-   Site Editor: Don't navigate to the patterns in Template Parts mode. ([52884](https://github.com/WordPress/gutenberg/pull/52884))
 
 #### Navigation Menus
-- Navigation: Backport Core changes for the navigation fallback. ([52878](https://github.com/WordPress/gutenberg/pull/52878))
+
+-   Navigation: Backport Core changes for the navigation fallback. ([52878](https://github.com/WordPress/gutenberg/pull/52878))
 
 #### REST API
-- Global styles revisions: Update `private` methods to `protected`. ([52748](https://github.com/WordPress/gutenberg/pull/52748))
+
+-   Global styles revisions: Update `private` methods to `protected`. ([52748](https://github.com/WordPress/gutenberg/pull/52748))
 
 #### Block API
-- Parser / Site Editor: Ensure `autop` is not run when freeform block is set to core/html. ([52716](https://github.com/WordPress/gutenberg/pull/52716))
 
+-   Parser / Site Editor: Ensure `autop` is not run when freeform block is set to core/html. ([52716](https://github.com/WordPress/gutenberg/pull/52716))
 
 ### Accessibility
 
-- Fix regression with Edit site Navigate regions. ([52940](https://github.com/WordPress/gutenberg/pull/52940))
-- Return focus more from focus return hook. ([52710](https://github.com/WordPress/gutenberg/pull/52710))
-- [Commands]: Add `aria-activedescendant` attribute to suggestions. ([52930](https://github.com/WordPress/gutenberg/pull/52930))
+-   Fix regression with Edit site Navigate regions. ([52940](https://github.com/WordPress/gutenberg/pull/52940))
+-   Return focus more from focus return hook. ([52710](https://github.com/WordPress/gutenberg/pull/52710))
+-   [Commands]: Add `aria-activedescendant` attribute to suggestions. ([52930](https://github.com/WordPress/gutenberg/pull/52930))
 
 #### Components
-- ColorPalette, BorderControl: Don't hyphenate HEX value in `aria-label`. ([52932](https://github.com/WordPress/gutenberg/pull/52932))
-- `Modal`: Fix loss of focus when clicking outside. ([52653](https://github.com/WordPress/gutenberg/pull/52653))
+
+-   ColorPalette, BorderControl: Don't hyphenate HEX value in `aria-label`. ([52932](https://github.com/WordPress/gutenberg/pull/52932))
+-   `Modal`: Fix loss of focus when clicking outside. ([52653](https://github.com/WordPress/gutenberg/pull/52653))
 
 #### Patterns
-- My Patterns page: Increase color contrast for the toggle group. ([52678](https://github.com/WordPress/gutenberg/pull/52678))
+
+-   My Patterns page: Increase color contrast for the toggle group. ([52678](https://github.com/WordPress/gutenberg/pull/52678))
 
 #### Post Editor
-- Improve consistency of the Post Editor and Site Editor Document actions. ([52246](https://github.com/WordPress/gutenberg/pull/52246))
 
+-   Improve consistency of the Post Editor and Site Editor Document actions. ([52246](https://github.com/WordPress/gutenberg/pull/52246))
 
 ### Performance
 
-- Replace `array_key_exists()` with `isset()` check. ([53098](https://github.com/WordPress/gutenberg/pull/53098))
+-   Replace `array_key_exists()` with `isset()` check. ([53098](https://github.com/WordPress/gutenberg/pull/53098))
 
 #### Block Library
-- Footnotes: Use static closures when not using '$this'. ([52781](https://github.com/WordPress/gutenberg/pull/52781))
 
+-   Footnotes: Use static closures when not using '$this'. ([52781](https://github.com/WordPress/gutenberg/pull/52781))
 
 ### Experiments
 
 #### Block Library
-- Set freeform handler only if Classic block exists. ([52936](https://github.com/WordPress/gutenberg/pull/52936))
-- Backend handle freeform blocks with TinyMCE removal. ([52938](https://github.com/WordPress/gutenberg/pull/52938))
-- Fix TinyMCE removal for heartbeat requests. ([52935](https://github.com/WordPress/gutenberg/pull/52935))
+
+-   Set freeform handler only if Classic block exists. ([52936](https://github.com/WordPress/gutenberg/pull/52936))
+-   Backend handle freeform blocks with TinyMCE removal. ([52938](https://github.com/WordPress/gutenberg/pull/52938))
+-   Fix TinyMCE removal for heartbeat requests. ([52935](https://github.com/WordPress/gutenberg/pull/52935))
 
 #### Interactivity API
-- Improve the Interactivity API priority levels logic. ([52323](https://github.com/WordPress/gutenberg/pull/52323))
-- Remove the `wp-show` directive temporarily. ([53240](https://github.com/WordPress/gutenberg/pull/53240))
+
+-   Improve the Interactivity API priority levels logic. ([52323](https://github.com/WordPress/gutenberg/pull/52323))
+-   Remove the `wp-show` directive temporarily. ([53240](https://github.com/WordPress/gutenberg/pull/53240))
 
 #### Block API
-- Auto-inserting blocks on the frontend and in the editor (via REST API). ([51449](https://github.com/WordPress/gutenberg/pull/51449))
 
+-   Auto-inserting blocks on the frontend and in the editor (via REST API). ([51449](https://github.com/WordPress/gutenberg/pull/51449))
 
 ### Documentation
 
-- API Reference documentation for Interactivity API. ([52948](https://github.com/WordPress/gutenberg/pull/52948))
-- Adding description of the `--no-watch` option. ([53139](https://github.com/WordPress/gutenberg/pull/53139))
-- Adds documentation about selectors. ([52941](https://github.com/WordPress/gutenberg/pull/52941))
-- Add Block API Version 3. ([53046](https://github.com/WordPress/gutenberg/pull/53046))
-- Added missing images via developer.wp.org site. ([53051](https://github.com/WordPress/gutenberg/pull/53051))
-- Clarify that `blockGap` support depends on layout support. ([53254](https://github.com/WordPress/gutenberg/pull/53254))
-- Interactivity API > Getting Started Guide - minor adjustments. ([52786](https://github.com/WordPress/gutenberg/pull/52786))
-- Update Appearance Tools. ([52785](https://github.com/WordPress/gutenberg/pull/52785))
-- Open "docs" folder for the Interactivity API package and Getting Started Guide. ([52462](https://github.com/WordPress/gutenberg/pull/52462))
-- Update the Gutenberg release process documentation. ([52955](https://github.com/WordPress/gutenberg/pull/52955))
-
+-   API Reference documentation for Interactivity API. ([52948](https://github.com/WordPress/gutenberg/pull/52948))
+-   Adding description of the `--no-watch` option. ([53139](https://github.com/WordPress/gutenberg/pull/53139))
+-   Adds documentation about selectors. ([52941](https://github.com/WordPress/gutenberg/pull/52941))
+-   Add Block API Version 3. ([53046](https://github.com/WordPress/gutenberg/pull/53046))
+-   Added missing images via developer.wp.org site. ([53051](https://github.com/WordPress/gutenberg/pull/53051))
+-   Clarify that `blockGap` support depends on layout support. ([53254](https://github.com/WordPress/gutenberg/pull/53254))
+-   Interactivity API > Getting Started Guide - minor adjustments. ([52786](https://github.com/WordPress/gutenberg/pull/52786))
+-   Update Appearance Tools. ([52785](https://github.com/WordPress/gutenberg/pull/52785))
+-   Open "docs" folder for the Interactivity API package and Getting Started Guide. ([52462](https://github.com/WordPress/gutenberg/pull/52462))
+-   Update the Gutenberg release process documentation. ([52955](https://github.com/WordPress/gutenberg/pull/52955))
 
 ### Code Quality
 
-- Add options for debugging PHP unit tests in package.json. ([52778](https://github.com/WordPress/gutenberg/pull/52778))
-- Block Editor: Fix ESLint warning for the `useBlockEditingMode` hook. ([53218](https://github.com/WordPress/gutenberg/pull/53218))
-- Block Editor: Simplify check in 'withBlockControls' styles hook. ([53227](https://github.com/WordPress/gutenberg/pull/53227))
-- BlockVariationPicker: Remove unused `withSelect`. ([53100](https://github.com/WordPress/gutenberg/pull/53100))
-- Enforce checks against redeclaration for functions and classes. ([52696](https://github.com/WordPress/gutenberg/pull/52696))
-- Improve the efficiency of the `useDebouncedInput` hook. ([53263](https://github.com/WordPress/gutenberg/pull/53263))
-- Refactor `useShowMoversGestures` hook. ([52792](https://github.com/WordPress/gutenberg/pull/52792))
-- Remove `withSpokenMessages` HoC from the Link format. ([53106](https://github.com/WordPress/gutenberg/pull/53106))
-- Site Editor: Remove unnecessary hook from 'PageTemplates'. ([52903](https://github.com/WordPress/gutenberg/pull/52903))
-- [Create Block] Add support for the example property and add template defaults. ([52803](https://github.com/WordPress/gutenberg/pull/52803))
+-   Add options for debugging PHP unit tests in package.json. ([52778](https://github.com/WordPress/gutenberg/pull/52778))
+-   Block Editor: Fix ESLint warning for the `useBlockEditingMode` hook. ([53218](https://github.com/WordPress/gutenberg/pull/53218))
+-   Block Editor: Simplify check in 'withBlockControls' styles hook. ([53227](https://github.com/WordPress/gutenberg/pull/53227))
+-   BlockVariationPicker: Remove unused `withSelect`. ([53100](https://github.com/WordPress/gutenberg/pull/53100))
+-   Enforce checks against redeclaration for functions and classes. ([52696](https://github.com/WordPress/gutenberg/pull/52696))
+-   Improve the efficiency of the `useDebouncedInput` hook. ([53263](https://github.com/WordPress/gutenberg/pull/53263))
+-   Refactor `useShowMoversGestures` hook. ([52792](https://github.com/WordPress/gutenberg/pull/52792))
+-   Remove `withSpokenMessages` HoC from the Link format. ([53106](https://github.com/WordPress/gutenberg/pull/53106))
+-   Site Editor: Remove unnecessary hook from 'PageTemplates'. ([52903](https://github.com/WordPress/gutenberg/pull/52903))
+-   [Create Block] Add support for the example property and add template defaults. ([52803](https://github.com/WordPress/gutenberg/pull/52803))
 
 #### Block Library
-- Add PHP since annotations. ([52820](https://github.com/WordPress/gutenberg/pull/52820))
-- Footnotes: Add missing _ in revision field filter. ([53135](https://github.com/WordPress/gutenberg/pull/53135))
-- Refactor navigation title usage. ([52807](https://github.com/WordPress/gutenberg/pull/52807))
-- Template Part Block: Use `get_block_file_template` for rendering. ([52892](https://github.com/WordPress/gutenberg/pull/52892))
+
+-   Add PHP since annotations. ([52820](https://github.com/WordPress/gutenberg/pull/52820))
+-   Footnotes: Add missing \_ in revision field filter. ([53135](https://github.com/WordPress/gutenberg/pull/53135))
+-   Refactor navigation title usage. ([52807](https://github.com/WordPress/gutenberg/pull/52807))
+-   Template Part Block: Use `get_block_file_template` for rendering. ([52892](https://github.com/WordPress/gutenberg/pull/52892))
 
 #### Global Styles
-- Don't use named arguments for `sprintf`. ([52782](https://github.com/WordPress/gutenberg/pull/52782))
-- Remove experimental setting for interactivity API and behaviors. ([52833](https://github.com/WordPress/gutenberg/pull/52833))
-- Site editor: Update function name. ([52869](https://github.com/WordPress/gutenberg/pull/52869))
-- Update PHP unit tests. ([52819](https://github.com/WordPress/gutenberg/pull/52819))
+
+-   Don't use named arguments for `sprintf`. ([52782](https://github.com/WordPress/gutenberg/pull/52782))
+-   Remove experimental setting for interactivity API and behaviors. ([52833](https://github.com/WordPress/gutenberg/pull/52833))
+-   Site editor: Update function name. ([52869](https://github.com/WordPress/gutenberg/pull/52869))
+-   Update PHP unit tests. ([52819](https://github.com/WordPress/gutenberg/pull/52819))
 
 #### Interactivity API
-- Move Store's data encoding to the `echo` call. ([51974](https://github.com/WordPress/gutenberg/pull/51974))
-- Update the `block.json` schema to include Behavior supports. ([52895](https://github.com/WordPress/gutenberg/pull/52895))
+
+-   Move Store's data encoding to the `echo` call. ([51974](https://github.com/WordPress/gutenberg/pull/51974))
+-   Update the `block.json` schema to include Behavior supports. ([52895](https://github.com/WordPress/gutenberg/pull/52895))
 
 #### Typography
-- Fluid typography: Rename viewport variables. ([53082](https://github.com/WordPress/gutenberg/pull/53082))
+
+-   Fluid typography: Rename viewport variables. ([53082](https://github.com/WordPress/gutenberg/pull/53082))
 
 #### Components
-- Update framer-motion to 10.13.0. ([52804](https://github.com/WordPress/gutenberg/pull/52804))
+
+-   Update framer-motion to 10.13.0. ([52804](https://github.com/WordPress/gutenberg/pull/52804))
 
 #### Themes
-- Behaviors - Lightbox: Update theme.json schema. ([51156](https://github.com/WordPress/gutenberg/pull/51156))
 
+-   Behaviors - Lightbox: Update theme.json schema. ([51156](https://github.com/WordPress/gutenberg/pull/51156))
 
 ### Tools
 
-- Add GH action to enforce PR labels. ([52760](https://github.com/WordPress/gutenberg/pull/52760))
-- Changelog automation: 
-  - Make Accessibility a top-level section. ([52900](https://github.com/WordPress/gutenberg/pull/52900))
-  - Update to work with consolidated a11y labels. ([52896](https://github.com/WordPress/gutenberg/pull/52896))
-  - Use the correct label to filter Mobile app PRs. ([53024](https://github.com/WordPress/gutenberg/pull/53024))
-- Enforce PR labels:
-  - Change permissions to `read`. ([52980](https://github.com/WordPress/gutenberg/pull/52980))
-  - Fully re-enabling the pre-merge check. ([52990](https://github.com/WordPress/gutenberg/pull/52990))
-  - Make PR label checks non-blocking to merge while trying a different GH token setting. ([52975](https://github.com/WordPress/gutenberg/pull/52975))
-  - Try using a different token. ([52979](https://github.com/WordPress/gutenberg/pull/52979))
-  - Use `pull_request_target` trigger to work with PRs coming from forks. ([52981](https://github.com/WordPress/gutenberg/pull/52981))
-- Use proper casing on PR template. ([52999](https://github.com/WordPress/gutenberg/pull/52999))
+-   Add GH action to enforce PR labels. ([52760](https://github.com/WordPress/gutenberg/pull/52760))
+-   Changelog automation:
+    -   Make Accessibility a top-level section. ([52900](https://github.com/WordPress/gutenberg/pull/52900))
+    -   Update to work with consolidated a11y labels. ([52896](https://github.com/WordPress/gutenberg/pull/52896))
+    -   Use the correct label to filter Mobile app PRs. ([53024](https://github.com/WordPress/gutenberg/pull/53024))
+-   Enforce PR labels:
+    -   Change permissions to `read`. ([52980](https://github.com/WordPress/gutenberg/pull/52980))
+    -   Fully re-enabling the pre-merge check. ([52990](https://github.com/WordPress/gutenberg/pull/52990))
+    -   Make PR label checks non-blocking to merge while trying a different GH token setting. ([52975](https://github.com/WordPress/gutenberg/pull/52975))
+    -   Try using a different token. ([52979](https://github.com/WordPress/gutenberg/pull/52979))
+    -   Use `pull_request_target` trigger to work with PRs coming from forks. ([52981](https://github.com/WordPress/gutenberg/pull/52981))
+-   Use proper casing on PR template. ([52999](https://github.com/WordPress/gutenberg/pull/52999))
 
 #### Testing
-- Add end-to-end tests for Behaviors in the site editor. ([52809](https://github.com/WordPress/gutenberg/pull/52809))
-- Ignore local test theme folders created by `wp-env`. ([53031](https://github.com/WordPress/gutenberg/pull/53031))
-- Improve slug generation & matching in request utils. ([52414](https://github.com/WordPress/gutenberg/pull/52414))
-- Migrate 'iframed inline styles' end-to-end tests to Playwright. ([53269](https://github.com/WordPress/gutenberg/pull/53269))
-- Migrate Allowed Block Test to Playwright. ([53171](https://github.com/WordPress/gutenberg/pull/53171))
-- Patterns: Reinstate template parts mode spec. ([52780](https://github.com/WordPress/gutenberg/pull/52780))
-- Route to published post instead of homepage on navigation end-to-end tests. ([52802](https://github.com/WordPress/gutenberg/pull/52802))
-- Temporarily skip widget import end-to-end test. ([53226](https://github.com/WordPress/gutenberg/pull/53226))
-- Update end-to-end tests that use code editor. ([52788](https://github.com/WordPress/gutenberg/pull/52788))
-
 
-## First time contributors
+-   Add end-to-end tests for Behaviors in the site editor. ([52809](https://github.com/WordPress/gutenberg/pull/52809))
+-   Ignore local test theme folders created by `wp-env`. ([53031](https://github.com/WordPress/gutenberg/pull/53031))
+-   Improve slug generation & matching in request utils. ([52414](https://github.com/WordPress/gutenberg/pull/52414))
+-   Migrate 'iframed inline styles' end-to-end tests to Playwright. ([53269](https://github.com/WordPress/gutenberg/pull/53269))
+-   Migrate Allowed Block Test to Playwright. ([53171](https://github.com/WordPress/gutenberg/pull/53171))
+-   Patterns: Reinstate template parts mode spec. ([52780](https://github.com/WordPress/gutenberg/pull/52780))
+-   Route to published post instead of homepage on navigation end-to-end tests. ([52802](https://github.com/WordPress/gutenberg/pull/52802))
+-   Temporarily skip widget import end-to-end test. ([53226](https://github.com/WordPress/gutenberg/pull/53226))
+-   Update end-to-end tests that use code editor. ([52788](https://github.com/WordPress/gutenberg/pull/52788))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @Armondal: Adding description of the `--no-watch` option. ([53139](https://github.com/WordPress/gutenberg/pull/53139))
-- @lunaluna: Video: Fixing styles that vertical alignment of the video. ([53131](https://github.com/WordPress/gutenberg/pull/53131))
+The following PRs were merged by first-time contributors:
 
+-   @Armondal: Adding description of the `--no-watch` option. ([53139](https://github.com/WordPress/gutenberg/pull/53139))
+-   @lunaluna: Video: Fixing styles that vertical alignment of the video. ([53131](https://github.com/WordPress/gutenberg/pull/53131))
 
 ## Contributors
 
@@ -3391,7 +14200,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @andrewserong @anton-vlasenko @Armondal @artemiomorales @audrasjb @bph @c4rl0sbr4v0 @carolinan @chad1008 @danielbachhuber @DAreRodz @dcalhoun @derekblank @draganescu @ellatrix @fluiddot @geriux @getdave @glendaviesnz @hellofromtonya @jameskoster @jasmussen @jeherve @jeryj @jordesign @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @luisherranz @lunaluna @Mamaduka @mburridge @michalczaplinski @mikachan @mirka @ndiego @noahtallen @noisysocks @ntsekouras @ockham @pedro-mendonca @pooja-muchandikar @priethor @ramonjd @richtabor @ryanwelcher @scruffian @shimotmk @Soean @stokesman @swissspidy @t-hamano @tellthemachines @torounit @tyxla @westonruter @WunderBart
 
-
 = 16.3.0 =
 
 ## Changelog
@@ -3399,270 +14207,295 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Site Editor
-- Add delay and fade-in animation to loading spinner. ([51902](https://github.com/WordPress/gutenberg/pull/51902))
-- Make "My patterns" category permanently visible. ([52531](https://github.com/WordPress/gutenberg/pull/52531))
-- Remove "Theme patterns" heading in Pattern library. ([52570](https://github.com/WordPress/gutenberg/pull/52570))
-- Remove sidebar group descriptions. ([52453](https://github.com/WordPress/gutenberg/pull/52453))
-- Show warning on removal of Post Template block in the site editor. ([52666](https://github.com/WordPress/gutenberg/pull/52666))
-- Swap pattern creation options. ([52726](https://github.com/WordPress/gutenberg/pull/52726))
-- Update Dashboard button tooltips in the site editor. ([52465](https://github.com/WordPress/gutenberg/pull/52465))
-- Update Site Editor frame z-index. ([52180](https://github.com/WordPress/gutenberg/pull/52180))
-- Update locked pattern tooltips. ([52497](https://github.com/WordPress/gutenberg/pull/52497))
-- Update navigation menu title size & weight in detail panels. ([52477](https://github.com/WordPress/gutenberg/pull/52477))
-- Update pattern library copy. ([52340](https://github.com/WordPress/gutenberg/pull/52340))
-- Show more intuitive archive titles on Query Title block. ([52521](https://github.com/WordPress/gutenberg/pull/52521))
-- Adapt template part hint copy. ([52527](https://github.com/WordPress/gutenberg/pull/52527))
+
+-   Add delay and fade-in animation to loading spinner. ([51902](https://github.com/WordPress/gutenberg/pull/51902))
+-   Make "My patterns" category permanently visible. ([52531](https://github.com/WordPress/gutenberg/pull/52531))
+-   Remove "Theme patterns" heading in Pattern library. ([52570](https://github.com/WordPress/gutenberg/pull/52570))
+-   Remove sidebar group descriptions. ([52453](https://github.com/WordPress/gutenberg/pull/52453))
+-   Show warning on removal of Post Template block in the site editor. ([52666](https://github.com/WordPress/gutenberg/pull/52666))
+-   Swap pattern creation options. ([52726](https://github.com/WordPress/gutenberg/pull/52726))
+-   Update Dashboard button tooltips in the site editor. ([52465](https://github.com/WordPress/gutenberg/pull/52465))
+-   Update Site Editor frame z-index. ([52180](https://github.com/WordPress/gutenberg/pull/52180))
+-   Update locked pattern tooltips. ([52497](https://github.com/WordPress/gutenberg/pull/52497))
+-   Update navigation menu title size & weight in detail panels. ([52477](https://github.com/WordPress/gutenberg/pull/52477))
+-   Update pattern library copy. ([52340](https://github.com/WordPress/gutenberg/pull/52340))
+-   Show more intuitive archive titles on Query Title block. ([52521](https://github.com/WordPress/gutenberg/pull/52521))
+-   Adapt template part hint copy. ([52527](https://github.com/WordPress/gutenberg/pull/52527))
 
 #### Patterns
-- Add hint to show template part move. ([52395](https://github.com/WordPress/gutenberg/pull/52395))
-- Add renaming, duplication, and deletion options. ([52270](https://github.com/WordPress/gutenberg/pull/52270))
-- Add sync tooltip. ([52458](https://github.com/WordPress/gutenberg/pull/52458))
-- Display all custom template part areas in sidebar nav. ([52355](https://github.com/WordPress/gutenberg/pull/52355))
-- Don't override the rootClientID in create menu - only set if undefined. ([52713](https://github.com/WordPress/gutenberg/pull/52713))
-- Enable focus mode editing. ([52427](https://github.com/WordPress/gutenberg/pull/52427))
-- Remove `reusable` text from menu once rename hint has been dismissed. ([52664](https://github.com/WordPress/gutenberg/pull/52664))
-- Stop endless snackbars appearing. ([52012](https://github.com/WordPress/gutenberg/pull/52012))
-- Sticky header and pagination on Patterns page. ([52663](https://github.com/WordPress/gutenberg/pull/52663))
-- Update manage pattern links to go to site editor if available. ([52403](https://github.com/WordPress/gutenberg/pull/52403))
-- Separate sync status into a filter control. ([52303](https://github.com/WordPress/gutenberg/pull/52303))
+
+-   Add hint to show template part move. ([52395](https://github.com/WordPress/gutenberg/pull/52395))
+-   Add renaming, duplication, and deletion options. ([52270](https://github.com/WordPress/gutenberg/pull/52270))
+-   Add sync tooltip. ([52458](https://github.com/WordPress/gutenberg/pull/52458))
+-   Display all custom template part areas in sidebar nav. ([52355](https://github.com/WordPress/gutenberg/pull/52355))
+-   Don't override the rootClientID in create menu - only set if undefined. ([52713](https://github.com/WordPress/gutenberg/pull/52713))
+-   Enable focus mode editing. ([52427](https://github.com/WordPress/gutenberg/pull/52427))
+-   Remove `reusable` text from menu once rename hint has been dismissed. ([52664](https://github.com/WordPress/gutenberg/pull/52664))
+-   Stop endless snackbars appearing. ([52012](https://github.com/WordPress/gutenberg/pull/52012))
+-   Sticky header and pagination on Patterns page. ([52663](https://github.com/WordPress/gutenberg/pull/52663))
+-   Update manage pattern links to go to site editor if available. ([52403](https://github.com/WordPress/gutenberg/pull/52403))
+-   Separate sync status into a filter control. ([52303](https://github.com/WordPress/gutenberg/pull/52303))
 
 #### Components
 
-- Adding support for defined IDs in `TextControl` component. ([52028](https://github.com/WordPress/gutenberg/pull/52028))
-- Updated "position" default value. ([52148](https://github.com/WordPress/gutenberg/pull/52148))
+-   Adding support for defined IDs in `TextControl` component. ([52028](https://github.com/WordPress/gutenberg/pull/52028))
+-   Updated "position" default value. ([52148](https://github.com/WordPress/gutenberg/pull/52148))
 
 #### Interactivity API
-- Add filter to turn off Interactivity API for a block. ([52579](https://github.com/WordPress/gutenberg/pull/52579))
-- Add runtime support for the `wp-style` directive. ([52645](https://github.com/WordPress/gutenberg/pull/52645))
+
+-   Add filter to turn off Interactivity API for a block. ([52579](https://github.com/WordPress/gutenberg/pull/52579))
+-   Add runtime support for the `wp-style` directive. ([52645](https://github.com/WordPress/gutenberg/pull/52645))
 
 #### Block Library
-- Add back old Navigation and File blocks JavaScript implementation when Gutenberg is not installed. ([52553](https://github.com/WordPress/gutenberg/pull/52553))
-- Home link block: Add 'current-menu-item'. ([51478](https://github.com/WordPress/gutenberg/pull/51478))
-- Use next40pxDefaultSize on RangeControl components. ([52257](https://github.com/WordPress/gutenberg/pull/52257))
+
+-   Add back old Navigation and File blocks JavaScript implementation when Gutenberg is not installed. ([52553](https://github.com/WordPress/gutenberg/pull/52553))
+-   Home link block: Add 'current-menu-item'. ([51478](https://github.com/WordPress/gutenberg/pull/51478))
+-   Use next40pxDefaultSize on RangeControl components. ([52257](https://github.com/WordPress/gutenberg/pull/52257))
 
 #### Block Editor
-- Add maxLength to LinkControl search item URLs. ([52523](https://github.com/WordPress/gutenberg/pull/52523))
-- Make the tab labels of `ColorGradientSettingsDropdown` component translatable. ([52669](https://github.com/WordPress/gutenberg/pull/52669))
-- Add support for arrays to `setImmutably` util. ([52280](https://github.com/WordPress/gutenberg/pull/52280))
-- Stabilize `defaultBlock`, `directInsert` API's and `getDirectInsertBlock` selector. ([52083](https://github.com/WordPress/gutenberg/pull/52083))
+
+-   Add maxLength to LinkControl search item URLs. ([52523](https://github.com/WordPress/gutenberg/pull/52523))
+-   Make the tab labels of `ColorGradientSettingsDropdown` component translatable. ([52669](https://github.com/WordPress/gutenberg/pull/52669))
+-   Add support for arrays to `setImmutably` util. ([52280](https://github.com/WordPress/gutenberg/pull/52280))
+-   Stabilize `defaultBlock`, `directInsert` API's and `getDirectInsertBlock` selector. ([52083](https://github.com/WordPress/gutenberg/pull/52083))
 
 #### NUX
-- Restore `@wordpress/nux` to trunk. ([52455](https://github.com/WordPress/gutenberg/pull/52455))
+
+-   Restore `@wordpress/nux` to trunk. ([52455](https://github.com/WordPress/gutenberg/pull/52455))
 
 ### Bug Fixes
 
 #### Patterns
--  Alternative grid layout to improve keyboard accessibility. ([52357](https://github.com/WordPress/gutenberg/pull/52357))
-- Add handling of sync status to the wp-admin patterns list page. ([52346](https://github.com/WordPress/gutenberg/pull/52346))
-- Add missing decoding entities processing in Patterns and Template/Parts pages. ([52449](https://github.com/WordPress/gutenberg/pull/52449))
-- Add option to set sync status when adding from wp-admin patterns list. ([52352](https://github.com/WordPress/gutenberg/pull/52352))
-- Avoid copying global style presets via the styles compatibility hook. ([52640](https://github.com/WordPress/gutenberg/pull/52640))
-- Command Palette: Update label and icon for Patterns. ([52742](https://github.com/WordPress/gutenberg/pull/52742))
-- Ensure that the unsaved title is not persisted when reopening the modal. ([52473](https://github.com/WordPress/gutenberg/pull/52473))
-- Fix bug with Create Patterns menu not showing in site editor page editing. ([52671](https://github.com/WordPress/gutenberg/pull/52671))
-- Fix renaming in Site View sidebar rename saves all edits for Template Parts and Navigation Menus. ([52373](https://github.com/WordPress/gutenberg/pull/52373))
-- Patterns & template parts: Remove "apply globally" option from block settings. ([52160](https://github.com/WordPress/gutenberg/pull/52160))
-- Rename edit label to Edit Block Pattern to resolve edge case in Chrome. ([52496](https://github.com/WordPress/gutenberg/pull/52496))
-- Show uncategorized patterns on the Editor > Patterns page. ([52633](https://github.com/WordPress/gutenberg/pull/52633))
-- Site Editor Patterns: Filter out patterns that are not available in the inserter. ([52675](https://github.com/WordPress/gutenberg/pull/52675))
-- Update the title of Pattern block in the block inspector card. ([52010](https://github.com/WordPress/gutenberg/pull/52010))
+
+-   Alternative grid layout to improve keyboard accessibility. ([52357](https://github.com/WordPress/gutenberg/pull/52357))
+-   Add handling of sync status to the wp-admin patterns list page. ([52346](https://github.com/WordPress/gutenberg/pull/52346))
+-   Add missing decoding entities processing in Patterns and Template/Parts pages. ([52449](https://github.com/WordPress/gutenberg/pull/52449))
+-   Add option to set sync status when adding from wp-admin patterns list. ([52352](https://github.com/WordPress/gutenberg/pull/52352))
+-   Avoid copying global style presets via the styles compatibility hook. ([52640](https://github.com/WordPress/gutenberg/pull/52640))
+-   Command Palette: Update label and icon for Patterns. ([52742](https://github.com/WordPress/gutenberg/pull/52742))
+-   Ensure that the unsaved title is not persisted when reopening the modal. ([52473](https://github.com/WordPress/gutenberg/pull/52473))
+-   Fix bug with Create Patterns menu not showing in site editor page editing. ([52671](https://github.com/WordPress/gutenberg/pull/52671))
+-   Fix renaming in Site View sidebar rename saves all edits for Template Parts and Navigation Menus. ([52373](https://github.com/WordPress/gutenberg/pull/52373))
+-   Patterns & template parts: Remove "apply globally" option from block settings. ([52160](https://github.com/WordPress/gutenberg/pull/52160))
+-   Rename edit label to Edit Block Pattern to resolve edge case in Chrome. ([52496](https://github.com/WordPress/gutenberg/pull/52496))
+-   Show uncategorized patterns on the Editor > Patterns page. ([52633](https://github.com/WordPress/gutenberg/pull/52633))
+-   Site Editor Patterns: Filter out patterns that are not available in the inserter. ([52675](https://github.com/WordPress/gutenberg/pull/52675))
+-   Update the title of Pattern block in the block inspector card. ([52010](https://github.com/WordPress/gutenberg/pull/52010))
 
 #### Site Editor
-- Fix the pattern with the post types becomes the placeholder pattern when editing template part. ([52503](https://github.com/WordPress/gutenberg/pull/52503))
-- Fix "Manage all patterns" link appearance. ([52532](https://github.com/WordPress/gutenberg/pull/52532))
-- Fix document title icon appearance. ([52424](https://github.com/WordPress/gutenberg/pull/52424))
-- Fix entering edit mode in site editor. ([52406](https://github.com/WordPress/gutenberg/pull/52406))
-- Fix missing "Add Template Part" button in Template Parts page. ([52542](https://github.com/WordPress/gutenberg/pull/52542))
-- Fix undo/redo in site editor code editor's mode. ([52695](https://github.com/WordPress/gutenberg/pull/52695))
-- Remove status icon. ([52457](https://github.com/WordPress/gutenberg/pull/52457))
-- Reset device preview type when exiting the editing mode. ([52566](https://github.com/WordPress/gutenberg/pull/52566))
-- ResizableFrame: Fix styling in Firefox. ([52700](https://github.com/WordPress/gutenberg/pull/52700))
-- Site Editor Pages: Load the appropriate template if posts page set. ([52266](https://github.com/WordPress/gutenberg/pull/52266))
-- Site Editor Patterns: Ensure sidebar does not shrink when long pattern titles are used. ([52547](https://github.com/WordPress/gutenberg/pull/52547))
-- Use lowercase p in "Manage Patterns". ([52617](https://github.com/WordPress/gutenberg/pull/52617))
-- Do not navigate to the styles pages unless you're in a random listing page. ([52728](https://github.com/WordPress/gutenberg/pull/52728))
-- Fix multiple navigation blocks in pattern template. ([52707](https://github.com/WordPress/gutenberg/pull/52707))
-- Don't allow creating template part on the Patterns page for non-block themes. ([52656](https://github.com/WordPress/gutenberg/pull/52656))
-- Exit template focus when opening the W menu. ([52235](https://github.com/WordPress/gutenberg/pull/52235))
-
-#### Block Library
-- Fix console warning by improving error handling in Nav block classic menu conversion. ([52591](https://github.com/WordPress/gutenberg/pull/52591))
-- Fix importing classic menus. ([52573](https://github.com/WordPress/gutenberg/pull/52573))
-- Fix: Focus loss on navigation link label editing on Firefox. ([52428](https://github.com/WordPress/gutenberg/pull/52428))
-- List block: Fix selected numbering style option. ([52472](https://github.com/WordPress/gutenberg/pull/52472))
-- Post Title: The changes should be reflected when previewing a post. ([52369](https://github.com/WordPress/gutenberg/pull/52369))
-- Quote block: Add transform to paragraph. ([51809](https://github.com/WordPress/gutenberg/pull/51809))
-- Remove synced blocks from lastBlockInserted. ([52558](https://github.com/WordPress/gutenberg/pull/52558))
-- Rich Text/Footnotes: Fix getRichTextValues for useInnerBlocksProps.save. ([52682](https://github.com/WordPress/gutenberg/pull/52682))
-- Search block: Enqueue view script through block.json. ([52552](https://github.com/WordPress/gutenberg/pull/52552))
-- Use `_get_block_template_file` function and set $area variable. ([52708](https://github.com/WordPress/gutenberg/pull/52708))
-- Cover Block: Fix block deprecation when fixed background is enabled. ([51612](https://github.com/WordPress/gutenberg/pull/51612))
-- Fix image block v6 deprecation. ([52822](https://github.com/WordPress/gutenberg/pull/52822))
-- Image: Use the correct method for caption class in recent deprecation. ([52853](https://github.com/WordPress/gutenberg/pull/52853))
+
+-   Fix the pattern with the post types becomes the placeholder pattern when editing template part. ([52503](https://github.com/WordPress/gutenberg/pull/52503))
+-   Fix "Manage all patterns" link appearance. ([52532](https://github.com/WordPress/gutenberg/pull/52532))
+-   Fix document title icon appearance. ([52424](https://github.com/WordPress/gutenberg/pull/52424))
+-   Fix entering edit mode in site editor. ([52406](https://github.com/WordPress/gutenberg/pull/52406))
+-   Fix missing "Add Template Part" button in Template Parts page. ([52542](https://github.com/WordPress/gutenberg/pull/52542))
+-   Fix undo/redo in site editor code editor's mode. ([52695](https://github.com/WordPress/gutenberg/pull/52695))
+-   Remove status icon. ([52457](https://github.com/WordPress/gutenberg/pull/52457))
+-   Reset device preview type when exiting the editing mode. ([52566](https://github.com/WordPress/gutenberg/pull/52566))
+-   ResizableFrame: Fix styling in Firefox. ([52700](https://github.com/WordPress/gutenberg/pull/52700))
+-   Site Editor Pages: Load the appropriate template if posts page set. ([52266](https://github.com/WordPress/gutenberg/pull/52266))
+-   Site Editor Patterns: Ensure sidebar does not shrink when long pattern titles are used. ([52547](https://github.com/WordPress/gutenberg/pull/52547))
+-   Use lowercase p in "Manage Patterns". ([52617](https://github.com/WordPress/gutenberg/pull/52617))
+-   Do not navigate to the styles pages unless you're in a random listing page. ([52728](https://github.com/WordPress/gutenberg/pull/52728))
+-   Fix multiple navigation blocks in pattern template. ([52707](https://github.com/WordPress/gutenberg/pull/52707))
+-   Don't allow creating template part on the Patterns page for non-block themes. ([52656](https://github.com/WordPress/gutenberg/pull/52656))
+-   Exit template focus when opening the W menu. ([52235](https://github.com/WordPress/gutenberg/pull/52235))
+
+#### Block Library
+
+-   Fix console warning by improving error handling in Nav block classic menu conversion. ([52591](https://github.com/WordPress/gutenberg/pull/52591))
+-   Fix importing classic menus. ([52573](https://github.com/WordPress/gutenberg/pull/52573))
+-   Fix: Focus loss on navigation link label editing on Firefox. ([52428](https://github.com/WordPress/gutenberg/pull/52428))
+-   List block: Fix selected numbering style option. ([52472](https://github.com/WordPress/gutenberg/pull/52472))
+-   Post Title: The changes should be reflected when previewing a post. ([52369](https://github.com/WordPress/gutenberg/pull/52369))
+-   Quote block: Add transform to paragraph. ([51809](https://github.com/WordPress/gutenberg/pull/51809))
+-   Remove synced blocks from lastBlockInserted. ([52558](https://github.com/WordPress/gutenberg/pull/52558))
+-   Rich Text/Footnotes: Fix getRichTextValues for useInnerBlocksProps.save. ([52682](https://github.com/WordPress/gutenberg/pull/52682))
+-   Search block: Enqueue view script through block.json. ([52552](https://github.com/WordPress/gutenberg/pull/52552))
+-   Use `_get_block_template_file` function and set $area variable. ([52708](https://github.com/WordPress/gutenberg/pull/52708))
+-   Cover Block: Fix block deprecation when fixed background is enabled. ([51612](https://github.com/WordPress/gutenberg/pull/51612))
+-   Fix image block v6 deprecation. ([52822](https://github.com/WordPress/gutenberg/pull/52822))
+-   Image: Use the correct method for caption class in recent deprecation. ([52853](https://github.com/WordPress/gutenberg/pull/52853))
 
 #### Accessibility
-- Change "Delete page" menu item to "Move to trash". ([52641](https://github.com/WordPress/gutenberg/pull/52641))
-- Change password input to type text so contents are visible. ([52622](https://github.com/WordPress/gutenberg/pull/52622))
-- Do not autofocus page title field in the 'Draft a new page' modal dialog. ([52603](https://github.com/WordPress/gutenberg/pull/52603))
-- Fix Shift+Tab to Block Toolbar. ([52613](https://github.com/WordPress/gutenberg/pull/52613))
-- Unify focus style and add default font styles. ([52495](https://github.com/WordPress/gutenberg/pull/52495))
-- Navigation block: Add notice on reduced accessibility. ([52251](https://github.com/WordPress/gutenberg/pull/52251))
-- Password protected field: Remove autofocus and improve placeholder text consistency. ([52634](https://github.com/WordPress/gutenberg/pull/52634))
-- ResizableFrame: Make keyboard accessible. ([52443](https://github.com/WordPress/gutenberg/pull/52443))
-- Site Editor: Fix navigation menu sidebar actions order and label. ([52592](https://github.com/WordPress/gutenberg/pull/52592))
-
-#### Block Editor
-- Add 'reusable' keyword to Pattern blocks. ([52543](https://github.com/WordPress/gutenberg/pull/52543))
-- Avoid errors in Dimension visualizers when switching between iframed and non-iframed editors. ([52588](https://github.com/WordPress/gutenberg/pull/52588))
-- Ensure synced patterns are accounted for in 'getAllowedBlocks'. ([52546](https://github.com/WordPress/gutenberg/pull/52546))
-- Remove link action of Link UI for draft pages created from Nav block does not correctly remove link. ([52415](https://github.com/WordPress/gutenberg/pull/52415))
-- LinkControl: Add width to ensure ellipsis truncating works. ([52575](https://github.com/WordPress/gutenberg/pull/52575))
-- LinkControl: Fix mark highlight to bold. ([52517](https://github.com/WordPress/gutenberg/pull/52517))
-- Post Content link color should not be applied to placeholder component links. ([52367](https://github.com/WordPress/gutenberg/pull/52367))
-- Fix highlight change when using transform menu. ([52752](https://github.com/WordPress/gutenberg/pull/52752))
-- Apply text color selection to link color. ([52379](https://github.com/WordPress/gutenberg/pull/52379))
-
-#### Components
-- Block Editor: Display variation icon in the 'BlockDraggable' component. ([52502](https://github.com/WordPress/gutenberg/pull/52502))
-- Copy tweak for the reusable block rename hint. ([52581](https://github.com/WordPress/gutenberg/pull/52581))
-- Fix react-dropdown-menu version to avoid breaking change from one of …. ([52356](https://github.com/WordPress/gutenberg/pull/52356))
-- FormTokenField: Fix token overflow when moving cursor left or right. ([52662](https://github.com/WordPress/gutenberg/pull/52662))
-- Site Editor: Make sidebar back button go *back* instead of *up* if possible. ([52456](https://github.com/WordPress/gutenberg/pull/52456))
-- Top Toolbar: Move the preferences selection into the main useSelect. ([52332](https://github.com/WordPress/gutenberg/pull/52332))
+
+-   Change "Delete page" menu item to "Move to trash". ([52641](https://github.com/WordPress/gutenberg/pull/52641))
+-   Change password input to type text so contents are visible. ([52622](https://github.com/WordPress/gutenberg/pull/52622))
+-   Do not autofocus page title field in the 'Draft a new page' modal dialog. ([52603](https://github.com/WordPress/gutenberg/pull/52603))
+-   Fix Shift+Tab to Block Toolbar. ([52613](https://github.com/WordPress/gutenberg/pull/52613))
+-   Unify focus style and add default font styles. ([52495](https://github.com/WordPress/gutenberg/pull/52495))
+-   Navigation block: Add notice on reduced accessibility. ([52251](https://github.com/WordPress/gutenberg/pull/52251))
+-   Password protected field: Remove autofocus and improve placeholder text consistency. ([52634](https://github.com/WordPress/gutenberg/pull/52634))
+-   ResizableFrame: Make keyboard accessible. ([52443](https://github.com/WordPress/gutenberg/pull/52443))
+-   Site Editor: Fix navigation menu sidebar actions order and label. ([52592](https://github.com/WordPress/gutenberg/pull/52592))
+
+#### Block Editor
+
+-   Add 'reusable' keyword to Pattern blocks. ([52543](https://github.com/WordPress/gutenberg/pull/52543))
+-   Avoid errors in Dimension visualizers when switching between iframed and non-iframed editors. ([52588](https://github.com/WordPress/gutenberg/pull/52588))
+-   Ensure synced patterns are accounted for in 'getAllowedBlocks'. ([52546](https://github.com/WordPress/gutenberg/pull/52546))
+-   Remove link action of Link UI for draft pages created from Nav block does not correctly remove link. ([52415](https://github.com/WordPress/gutenberg/pull/52415))
+-   LinkControl: Add width to ensure ellipsis truncating works. ([52575](https://github.com/WordPress/gutenberg/pull/52575))
+-   LinkControl: Fix mark highlight to bold. ([52517](https://github.com/WordPress/gutenberg/pull/52517))
+-   Post Content link color should not be applied to placeholder component links. ([52367](https://github.com/WordPress/gutenberg/pull/52367))
+-   Fix highlight change when using transform menu. ([52752](https://github.com/WordPress/gutenberg/pull/52752))
+-   Apply text color selection to link color. ([52379](https://github.com/WordPress/gutenberg/pull/52379))
+
+#### Components
+
+-   Block Editor: Display variation icon in the 'BlockDraggable' component. ([52502](https://github.com/WordPress/gutenberg/pull/52502))
+-   Copy tweak for the reusable block rename hint. ([52581](https://github.com/WordPress/gutenberg/pull/52581))
+-   Fix react-dropdown-menu version to avoid breaking change from one of …. ([52356](https://github.com/WordPress/gutenberg/pull/52356))
+-   FormTokenField: Fix token overflow when moving cursor left or right. ([52662](https://github.com/WordPress/gutenberg/pull/52662))
+-   Site Editor: Make sidebar back button go _back_ instead of _up_ if possible. ([52456](https://github.com/WordPress/gutenberg/pull/52456))
+-   Top Toolbar: Move the preferences selection into the main useSelect. ([52332](https://github.com/WordPress/gutenberg/pull/52332))
 
 #### Post Editor
-- Remove a block select button from the multi-entity saving flow. ([52753](https://github.com/WordPress/gutenberg/pull/52753))
-- Fix Site editor page when JS support is disabled. ([52376](https://github.com/WordPress/gutenberg/pull/52376))
-- Fix initial block parsing. ([52417](https://github.com/WordPress/gutenberg/pull/52417))
-- Simplify the code editor of edit-post. ([52751](https://github.com/WordPress/gutenberg/pull/52751))
+
+-   Remove a block select button from the multi-entity saving flow. ([52753](https://github.com/WordPress/gutenberg/pull/52753))
+-   Fix Site editor page when JS support is disabled. ([52376](https://github.com/WordPress/gutenberg/pull/52376))
+-   Fix initial block parsing. ([52417](https://github.com/WordPress/gutenberg/pull/52417))
+-   Simplify the code editor of edit-post. ([52751](https://github.com/WordPress/gutenberg/pull/52751))
 
 #### Global Styles
-- DimensionsPanel: Fix unexpected value decoding/encoding. ([52661](https://github.com/WordPress/gutenberg/pull/52661))
-- Global font sizes: Ensure sizes are unique. ([52483](https://github.com/WordPress/gutenberg/pull/52483))
-- Spacing Sizes: Fix zero size typo and to be output directly. ([52711](https://github.com/WordPress/gutenberg/pull/52711))
+
+-   DimensionsPanel: Fix unexpected value decoding/encoding. ([52661](https://github.com/WordPress/gutenberg/pull/52661))
+-   Global font sizes: Ensure sizes are unique. ([52483](https://github.com/WordPress/gutenberg/pull/52483))
+-   Spacing Sizes: Fix zero size typo and to be output directly. ([52711](https://github.com/WordPress/gutenberg/pull/52711))
 
 #### Themes
-- Fix admin_url() for preview link of block themes. ([52399](https://github.com/WordPress/gutenberg/pull/52399))
+
+-   Fix admin_url() for preview link of block themes. ([52399](https://github.com/WordPress/gutenberg/pull/52399))
 
 #### Fonts API
-- Deprecate and make Fonts API non-functional. ([52485](https://github.com/WordPress/gutenberg/pull/52485))
-- Fix font printing regression when metabox exists. ([52343](https://github.com/WordPress/gutenberg/pull/52343))
+
+-   Deprecate and make Fonts API non-functional. ([52485](https://github.com/WordPress/gutenberg/pull/52485))
+-   Fix font printing regression when metabox exists. ([52343](https://github.com/WordPress/gutenberg/pull/52343))
 
 #### Extensibility
-- Page Content Focus: Ignore page content within a Query Loop block. ([52351](https://github.com/WordPress/gutenberg/pull/52351))
+
+-   Page Content Focus: Ignore page content within a Query Loop block. ([52351](https://github.com/WordPress/gutenberg/pull/52351))
 
 ### Performance
 
 #### Post Editor
-- Fix performance regression for isEditedPostEmpty selector. ([52759](https://github.com/WordPress/gutenberg/pull/52759))
+
+-   Fix performance regression for isEditedPostEmpty selector. ([52759](https://github.com/WordPress/gutenberg/pull/52759))
 
 #### Patterns
-- Add client side pagination to patterns list. ([52538](https://github.com/WordPress/gutenberg/pull/52538))
+
+-   Add client side pagination to patterns list. ([52538](https://github.com/WordPress/gutenberg/pull/52538))
 
 #### Site Editor
-- Fix entity cache misses for single posts due to string as recordKey. ([52338](https://github.com/WordPress/gutenberg/pull/52338))
+
+-   Fix entity cache misses for single posts due to string as recordKey. ([52338](https://github.com/WordPress/gutenberg/pull/52338))
 
 #### Block Library
-- Experimental: Disable TinyMCE compat with classic editor. ([52325](https://github.com/WordPress/gutenberg/pull/52325))
 
+-   Experimental: Disable TinyMCE compat with classic editor. ([52325](https://github.com/WordPress/gutenberg/pull/52325))
 
 ### Experiments
 
 #### Interactivity API
-- Prevent scripts from loading if behaviors are not used. ([52140](https://github.com/WordPress/gutenberg/pull/52140))
 
-#### Fonts API
-- Font Face: To generate and print font-face styles for theme.json fonts. ([51770](https://github.com/WordPress/gutenberg/pull/51770))
+-   Prevent scripts from loading if behaviors are not used. ([52140](https://github.com/WordPress/gutenberg/pull/52140))
 
+#### Fonts API
 
+-   Font Face: To generate and print font-face styles for theme.json fonts. ([51770](https://github.com/WordPress/gutenberg/pull/51770))
 
 ### Documentation
 
-- Document the new process for releasing point releases for old release branches. ([49968](https://github.com/WordPress/gutenberg/pull/49968))
-- Add layout API documentation. ([52673](https://github.com/WordPress/gutenberg/pull/52673))
-- Added README for the "caption" component. ([52033](https://github.com/WordPress/gutenberg/pull/52033))
-- Added documentation text-transform component #52072. ([52243](https://github.com/WordPress/gutenberg/pull/52243))
-- Block Editor: Add README for `BlockControls`. ([52366](https://github.com/WordPress/gutenberg/pull/52366))
-- Lodash: Remove completely. ([52571](https://github.com/WordPress/gutenberg/pull/52571))
-- Removed line break within the code block. ([46920](https://github.com/WordPress/gutenberg/pull/46920))
-- Theme JSON schema: Add missing block names and unify block properties. ([51293](https://github.com/WordPress/gutenberg/pull/51293))
-- Update layout architecture documentation after stabilisation. ([52316](https://github.com/WordPress/gutenberg/pull/52316))
-
+-   Document the new process for releasing point releases for old release branches. ([49968](https://github.com/WordPress/gutenberg/pull/49968))
+-   Add layout API documentation. ([52673](https://github.com/WordPress/gutenberg/pull/52673))
+-   Added README for the "caption" component. ([52033](https://github.com/WordPress/gutenberg/pull/52033))
+-   Added documentation text-transform component #52072. ([52243](https://github.com/WordPress/gutenberg/pull/52243))
+-   Block Editor: Add README for `BlockControls`. ([52366](https://github.com/WordPress/gutenberg/pull/52366))
+-   Lodash: Remove completely. ([52571](https://github.com/WordPress/gutenberg/pull/52571))
+-   Removed line break within the code block. ([46920](https://github.com/WordPress/gutenberg/pull/46920))
+-   Theme JSON schema: Add missing block names and unify block properties. ([51293](https://github.com/WordPress/gutenberg/pull/51293))
+-   Update layout architecture documentation after stabilisation. ([52316](https://github.com/WordPress/gutenberg/pull/52316))
 
 ### Code Quality
 
 #### Block Editor
-- Add missing `@emotion/react` dep to block-editor. ([52475](https://github.com/WordPress/gutenberg/pull/52475))
-- Lodash: Remove remaining `_.get()` from block editor and deprecate. ([52561](https://github.com/WordPress/gutenberg/pull/52561))
-- Make use of accessing private APIs from thunks directly. ([52214](https://github.com/WordPress/gutenberg/pull/52214))
+
+-   Add missing `@emotion/react` dep to block-editor. ([52475](https://github.com/WordPress/gutenberg/pull/52475))
+-   Lodash: Remove remaining `_.get()` from block editor and deprecate. ([52561](https://github.com/WordPress/gutenberg/pull/52561))
+-   Make use of accessing private APIs from thunks directly. ([52214](https://github.com/WordPress/gutenberg/pull/52214))
 
 #### Block Library
-- Footnotes: Backport core changes to excerpt trim. ([52709](https://github.com/WordPress/gutenberg/pull/52709))
-- Navigation: Simplify the useSelect for useNavigationMenus. ([51977](https://github.com/WordPress/gutenberg/pull/51977))
-- Query Pagination: Set 'clientId' as useSelect dependency. ([52358](https://github.com/WordPress/gutenberg/pull/52358))
-- Search: Remove unnecessary useEffect. ([52604](https://github.com/WordPress/gutenberg/pull/52604))
-- Template Parts: Set attributes 'area' as useSelect dependency. ([52330](https://github.com/WordPress/gutenberg/pull/52330))
+
+-   Footnotes: Backport core changes to excerpt trim. ([52709](https://github.com/WordPress/gutenberg/pull/52709))
+-   Navigation: Simplify the useSelect for useNavigationMenus. ([51977](https://github.com/WordPress/gutenberg/pull/51977))
+-   Query Pagination: Set 'clientId' as useSelect dependency. ([52358](https://github.com/WordPress/gutenberg/pull/52358))
+-   Search: Remove unnecessary useEffect. ([52604](https://github.com/WordPress/gutenberg/pull/52604))
+-   Template Parts: Set attributes 'area' as useSelect dependency. ([52330](https://github.com/WordPress/gutenberg/pull/52330))
 
 #### Global Styles
-- Lodash: Refactor away from `_.set()` in `PushChangesToGlobalStylesControl`. ([52404](https://github.com/WordPress/gutenberg/pull/52404))
-- Lodash: Refactor away from `_.set()` in `getNodesWithSettings()`. ([52278](https://github.com/WordPress/gutenberg/pull/52278))
-- Lodash: Refactor away from `_.set()` in global styles. ([52279](https://github.com/WordPress/gutenberg/pull/52279))
-- Lodash: Remove completely from site editor. ([52480](https://github.com/WordPress/gutenberg/pull/52480))
+
+-   Lodash: Refactor away from `_.set()` in `PushChangesToGlobalStylesControl`. ([52404](https://github.com/WordPress/gutenberg/pull/52404))
+-   Lodash: Refactor away from `_.set()` in `getNodesWithSettings()`. ([52278](https://github.com/WordPress/gutenberg/pull/52278))
+-   Lodash: Refactor away from `_.set()` in global styles. ([52279](https://github.com/WordPress/gutenberg/pull/52279))
+-   Lodash: Remove completely from site editor. ([52480](https://github.com/WordPress/gutenberg/pull/52480))
 
 #### Post Editor
-- EntityRecordItem: Fix ESLint warnings and remove unnecessary memoization. ([52630](https://github.com/WordPress/gutenberg/pull/52630))
-- PostPreviewButton: Rewrite to functional, avoid state transitions in lifecycles. ([44971](https://github.com/WordPress/gutenberg/pull/44971))
-- Correct a typo: Sapce -> space. ([52578](https://github.com/WordPress/gutenberg/pull/52578))
+
+-   EntityRecordItem: Fix ESLint warnings and remove unnecessary memoization. ([52630](https://github.com/WordPress/gutenberg/pull/52630))
+-   PostPreviewButton: Rewrite to functional, avoid state transitions in lifecycles. ([44971](https://github.com/WordPress/gutenberg/pull/44971))
+-   Correct a typo: Sapce -> space. ([52578](https://github.com/WordPress/gutenberg/pull/52578))
 
 #### Site Editor
-- Fix incorrect 'useSelect' usage. ([52683](https://github.com/WordPress/gutenberg/pull/52683))
-- SiteHub: Combine site data selector hooks. ([52567](https://github.com/WordPress/gutenberg/pull/52567))
+
+-   Fix incorrect 'useSelect' usage. ([52683](https://github.com/WordPress/gutenberg/pull/52683))
+-   SiteHub: Combine site data selector hooks. ([52567](https://github.com/WordPress/gutenberg/pull/52567))
 
 #### Reusable Blocks
-- Update package to use relative path. ([52712](https://github.com/WordPress/gutenberg/pull/52712))
 
-#### Core Data
-- Core Data: Fix ESLint warning for 'useEntityProp' hook. ([52757](https://github.com/WordPress/gutenberg/pull/52757))
+-   Update package to use relative path. ([52712](https://github.com/WordPress/gutenberg/pull/52712))
 
+#### Core Data
 
+-   Core Data: Fix ESLint warning for 'useEntityProp' hook. ([52757](https://github.com/WordPress/gutenberg/pull/52757))
 
 ### Tools
 
 #### Testing
-- Iframe: Silence style compat warnings when in a BlockPreview. ([52627](https://github.com/WordPress/gutenberg/pull/52627))
-- Make `query` optional in `visitAdminPage`. ([52413](https://github.com/WordPress/gutenberg/pull/52413))
-- Migrate Adding Inline Token test to Playwright. ([52020](https://github.com/WordPress/gutenberg/pull/52020))
-- Migrate site editor multi-entity save flow tests. ([52372](https://github.com/WordPress/gutenberg/pull/52372))
-- Move request utils reset to global setup. ([52412](https://github.com/WordPress/gutenberg/pull/52412))
-- Nav block: Link text color inheritance fixes and tests. ([51710](https://github.com/WordPress/gutenberg/pull/51710))
-- Refactor and split navigation block end-to-end tests into separate files. ([52647](https://github.com/WordPress/gutenberg/pull/52647))
-- Try fixing block context end-to-end test failure. ([52513](https://github.com/WordPress/gutenberg/pull/52513))
-- Use posts instead of template parts for navigation color tests. ([52654](https://github.com/WordPress/gutenberg/pull/52654))
-- end-to-end Test Utils: Improve test reliability in plugins/themes and login procedures. ([52144](https://github.com/WordPress/gutenberg/pull/52144))
-- Enable jest-watch-typeahead for native tests. ([51869](https://github.com/WordPress/gutenberg/pull/51869))
-- Expand mobile editor tests. ([52446](https://github.com/WordPress/gutenberg/pull/52446))
+
+-   Iframe: Silence style compat warnings when in a BlockPreview. ([52627](https://github.com/WordPress/gutenberg/pull/52627))
+-   Make `query` optional in `visitAdminPage`. ([52413](https://github.com/WordPress/gutenberg/pull/52413))
+-   Migrate Adding Inline Token test to Playwright. ([52020](https://github.com/WordPress/gutenberg/pull/52020))
+-   Migrate site editor multi-entity save flow tests. ([52372](https://github.com/WordPress/gutenberg/pull/52372))
+-   Move request utils reset to global setup. ([52412](https://github.com/WordPress/gutenberg/pull/52412))
+-   Nav block: Link text color inheritance fixes and tests. ([51710](https://github.com/WordPress/gutenberg/pull/51710))
+-   Refactor and split navigation block end-to-end tests into separate files. ([52647](https://github.com/WordPress/gutenberg/pull/52647))
+-   Try fixing block context end-to-end test failure. ([52513](https://github.com/WordPress/gutenberg/pull/52513))
+-   Use posts instead of template parts for navigation color tests. ([52654](https://github.com/WordPress/gutenberg/pull/52654))
+-   end-to-end Test Utils: Improve test reliability in plugins/themes and login procedures. ([52144](https://github.com/WordPress/gutenberg/pull/52144))
+-   Enable jest-watch-typeahead for native tests. ([51869](https://github.com/WordPress/gutenberg/pull/51869))
+-   Expand mobile editor tests. ([52446](https://github.com/WordPress/gutenberg/pull/52446))
 
 #### Build Tooling
-- Backport tools: Sort PRs to be cherry picked by merged/closed date. ([52667](https://github.com/WordPress/gutenberg/pull/52667))
-- Create block interactive template. ([52612](https://github.com/WordPress/gutenberg/pull/52612))
-- Fix Webpack to watch the `interactivity` package files. ([52642](https://github.com/WordPress/gutenberg/pull/52642))
-- Update caniuse-lite, browserslist and core-js. ([52420](https://github.com/WordPress/gutenberg/pull/52420))
-- Lodash: Deprecate `_.set()`. ([52407](https://github.com/WordPress/gutenberg/pull/52407))
 
-#### Project Management
-- Update issue gardening automation with new label. ([52173](https://github.com/WordPress/gutenberg/pull/52173))
-- Revert "Update Changelog for 16.1.2". ([52433](https://github.com/WordPress/gutenberg/pull/52433))
--  Github workflow: Add a PHP backport changes action. ([52096](https://github.com/WordPress/gutenberg/pull/52096))
+-   Backport tools: Sort PRs to be cherry picked by merged/closed date. ([52667](https://github.com/WordPress/gutenberg/pull/52667))
+-   Create block interactive template. ([52612](https://github.com/WordPress/gutenberg/pull/52612))
+-   Fix Webpack to watch the `interactivity` package files. ([52642](https://github.com/WordPress/gutenberg/pull/52642))
+-   Update caniuse-lite, browserslist and core-js. ([52420](https://github.com/WordPress/gutenberg/pull/52420))
+-   Lodash: Deprecate `_.set()`. ([52407](https://github.com/WordPress/gutenberg/pull/52407))
 
+#### Project Management
 
-## First time contributors
+-   Update issue gardening automation with new label. ([52173](https://github.com/WordPress/gutenberg/pull/52173))
+-   Revert "Update Changelog for 16.1.2". ([52433](https://github.com/WordPress/gutenberg/pull/52433))
+-   GitHub workflow: Add a PHP backport changes action. ([52096](https://github.com/WordPress/gutenberg/pull/52096))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @andrewhayward: Adding support for defined IDs in `TextControl` component. ([52028](https://github.com/WordPress/gutenberg/pull/52028))
-- @ghorivipul97: Post Content link color should not be applied to placeholder component links. ([52367](https://github.com/WordPress/gutenberg/pull/52367))
-- @sethrubenstein: Stabilize `defaultBlock`, `directInsert` API's and `getDirectInsertBlock` selector. ([52083](https://github.com/WordPress/gutenberg/pull/52083))
+The following PRs were merged by first-time contributors:
 
+-   @andrewhayward: Adding support for defined IDs in `TextControl` component. ([52028](https://github.com/WordPress/gutenberg/pull/52028))
+-   @ghorivipul97: Post Content link color should not be applied to placeholder component links. ([52367](https://github.com/WordPress/gutenberg/pull/52367))
+-   @sethrubenstein: Stabilize `defaultBlock`, `directInsert` API's and `getDirectInsertBlock` selector. ([52083](https://github.com/WordPress/gutenberg/pull/52083))
 
 ## Contributors
 
@@ -3670,9 +14503,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @andrewhayward @andrewserong @anomiex @arthur791004 @BenjaminZekavica @bfintal @carolinan @Clorith @dcalhoun @derekblank @diegohaz @draganescu @ellatrix @fluiddot @fullofcaffeine @geriux @getdave @ghorivipul97 @glendaviesnz @hellofromtonya @jameskoster @jeryj @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @luisherranz @MaggieCabrera @Mamaduka @michalczaplinski @mirka @noisysocks @ntsekouras @peterwilsoncc @pooja-muchandikar @Presskopp @priethor @ramonjd @richtabor @SantosGuillamot @SavPhill @SaxonF @scruffian @sethrubenstein @spacedmonkey @swissspidy @t-hamano @tellthemachines @tyxla @walbo @westonruter @youknowriad
 
-
-
-
 = 16.2.1 =
 
 ## Changelog
@@ -3680,19 +14510,20 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Footnotes
-- Footnotes: show in inserter and placeholder. ([52445](https://github.com/WordPress/gutenberg/pull/52445))
+
+-   Footnotes: show in inserter and placeholder. ([52445](https://github.com/WordPress/gutenberg/pull/52445))
 
 ### Bug Fixes
 
 #### Patterns
-- Make Pattern title text clickable. ([52599](https://github.com/WordPress/gutenberg/pull/52599))
+
+-   Make Pattern title text clickable. ([52599](https://github.com/WordPress/gutenberg/pull/52599))
 
 ## Contributors
 
 The following contributors merged PRs in this release:
 
-@getdave @mcsf 
-
+@getdave @mcsf
 
 = 16.2.0 =
 
@@ -3700,29 +14531,29 @@ The following contributors merged PRs in this release:
 
 ### Bug Fixes
 
-- Library - make pattern title clickable. ([51898](https://github.com/WordPress/gutenberg/pull/51898))
+-   Library - make pattern title clickable. ([51898](https://github.com/WordPress/gutenberg/pull/51898))
 
 #### Block Library
-- Allow editing existing footnote from RichText formats toolbar. ([52506](https://github.com/WordPress/gutenberg/pull/52506))
-- Revert "Post editor: Require confirmation before removing Footnotes (#52277)". ([52486](https://github.com/WordPress/gutenberg/pull/52486))
-- Trim footnote anchors from excerpts. ([52518](https://github.com/WordPress/gutenberg/pull/52518))
+
+-   Allow editing existing footnote from RichText formats toolbar. ([52506](https://github.com/WordPress/gutenberg/pull/52506))
+-   Revert "Post editor: Require confirmation before removing Footnotes (#52277)". ([52486](https://github.com/WordPress/gutenberg/pull/52486))
+-   Trim footnote anchors from excerpts. ([52518](https://github.com/WordPress/gutenberg/pull/52518))
 
 #### Interactivity API
-- Fix md5 class messed up with new block key. ([52557](https://github.com/WordPress/gutenberg/pull/52557))
+
+-   Fix md5 class messed up with new block key. ([52557](https://github.com/WordPress/gutenberg/pull/52557))
 
 #### Block Editor
-- Site Editor: Restore quick inserter 'Browse all' button. ([52529](https://github.com/WordPress/gutenberg/pull/52529))
+
+-   Site Editor: Restore quick inserter 'Browse all' button. ([52529](https://github.com/WordPress/gutenberg/pull/52529))
 
 #### Patterns
-- Check that core hasn't already moved sync status meta before moving and unsetting. ([52494](https://github.com/WordPress/gutenberg/pull/52494))
 
+-   Check that core hasn't already moved sync status meta before moving and unsetting. ([52494](https://github.com/WordPress/gutenberg/pull/52494))
 
 ### Various
 
-- Rename block theme activation nonce variable. ([52398](https://github.com/WordPress/gutenberg/pull/52398))
-
-
-
+-   Rename block theme activation nonce variable. ([52398](https://github.com/WordPress/gutenberg/pull/52398))
 
 ## Contributors
 
@@ -3736,8 +14567,8 @@ The following contributors merged PRs in this release:
 ### Bug Fixes
 
 #### Build Tooling
-- Revert phpcs testVersion back to PHP 5.6. ([52384](https://github.com/WordPress/gutenberg/pull/52384))
 
+-   Revert phpcs testVersion back to PHP 5.6. ([52384](https://github.com/WordPress/gutenberg/pull/52384))
 
 = 16.2.0-rc.2 =
 
@@ -3746,322 +14577,359 @@ The following contributors merged PRs in this release:
 ### Bug Fixes
 
 #### Block Library
-- RichText/Footnotes: Make getRichTextValues work with InnerBlocks.Content. ([52241](https://github.com/WordPress/gutenberg/pull/52241))
+
+-   RichText/Footnotes: Make getRichTextValues work with InnerBlocks.Content. ([52241](https://github.com/WordPress/gutenberg/pull/52241))
 
 #### Blocks
-- Post and Comment Template blocks: Change render_block_context priority to 1 (https://github.com/WordPress/gutenberg/pull/52364)
-- Footnotes: Fix incorrect anchor position in Firefox (https://github.com/WordPress/gutenberg/pull/52425)
-- Footnotes: fix lingering format boundary attr (https://github.com/WordPress/gutenberg/pull/52439)
-- Footnotes: save numbering through the entity provider (https://github.com/WordPress/gutenberg/pull/52423)
+
+-   Post and Comment Template blocks: Change render_block_context priority to 1 (https://github.com/WordPress/gutenberg/pull/52364)
+-   Footnotes: Fix incorrect anchor position in Firefox (https://github.com/WordPress/gutenberg/pull/52425)
+-   Footnotes: fix lingering format boundary attr (https://github.com/WordPress/gutenberg/pull/52439)
+-   Footnotes: save numbering through the entity provider (https://github.com/WordPress/gutenberg/pull/52423)
 
 #### Code Quality / Performance
-- Iframe: avoid asset parsing & fix script localisation 
+
+-   Iframe: avoid asset parsing & fix script localisation
 
 ## Contributors
 
 The following contributors merged PRs in this release:
 
-@ellatrix  @ockham @t-hamano 
-
+@ellatrix @ockham @t-hamano
 
 = 16.2.0-rc.1 =
 
-
-
 ## Changelog
 
 ### Features
 
 #### Patterns
-- feat: Rename Reusable blocks to Patterns. ([51704](https://github.com/WordPress/gutenberg/pull/51704))
 
+-   feat: Rename Reusable blocks to Patterns. ([51704](https://github.com/WordPress/gutenberg/pull/51704))
 
 ### Enhancements
 
-- Export store for the core/customize-widgets package. ([52189](https://github.com/WordPress/gutenberg/pull/52189))
+-   Export store for the core/customize-widgets package. ([52189](https://github.com/WordPress/gutenberg/pull/52189))
 
 #### Patterns
-- Library: Add sync status to pattern details screen. ([51954](https://github.com/WordPress/gutenberg/pull/51954))
-- Rename Library to Patterns. ([52102](https://github.com/WordPress/gutenberg/pull/52102))
-- Update custom patterns label to 'My patterns'. ([51949](https://github.com/WordPress/gutenberg/pull/51949))
-- Update pattern creation modal in library. ([51946](https://github.com/WordPress/gutenberg/pull/51946))
-- Update template part icons in the library mosaic (grid items). ([51963](https://github.com/WordPress/gutenberg/pull/51963))
+
+-   Library: Add sync status to pattern details screen. ([51954](https://github.com/WordPress/gutenberg/pull/51954))
+-   Rename Library to Patterns. ([52102](https://github.com/WordPress/gutenberg/pull/52102))
+-   Update custom patterns label to 'My patterns'. ([51949](https://github.com/WordPress/gutenberg/pull/51949))
+-   Update pattern creation modal in library. ([51946](https://github.com/WordPress/gutenberg/pull/51946))
+-   Update template part icons in the library mosaic (grid items). ([51963](https://github.com/WordPress/gutenberg/pull/51963))
 
 #### Site Editor
-- Change "Home" template name to "Blog home". ([52048](https://github.com/WordPress/gutenberg/pull/52048))
-- Edit Site: Make loading spinner colors consistent. ([51857](https://github.com/WordPress/gutenberg/pull/51857))
-- Update the icon used to reference the blog. ([52075](https://github.com/WordPress/gutenberg/pull/52075))
+
+-   Change "Home" template name to "Blog home". ([52048](https://github.com/WordPress/gutenberg/pull/52048))
+-   Edit Site: Make loading spinner colors consistent. ([51857](https://github.com/WordPress/gutenberg/pull/51857))
+-   Update the icon used to reference the blog. ([52075](https://github.com/WordPress/gutenberg/pull/52075))
 
 #### Interactivity API
-- Image block: Remove extra lookup for external image dimensions in lightbox. ([52178](https://github.com/WordPress/gutenberg/pull/52178))
-- Image block: Use built-in directive for mouseover event in lightbox. ([52067](https://github.com/WordPress/gutenberg/pull/52067))
+
+-   Image block: Remove extra lookup for external image dimensions in lightbox. ([52178](https://github.com/WordPress/gutenberg/pull/52178))
+-   Image block: Use built-in directive for mouseover event in lightbox. ([52067](https://github.com/WordPress/gutenberg/pull/52067))
 
 #### Block Library
-- Force full height for editor in Navigation focus mode. ([51798](https://github.com/WordPress/gutenberg/pull/51798))
-- Social links: Updating class and style attributes. ([51997](https://github.com/WordPress/gutenberg/pull/51997))
+
+-   Force full height for editor in Navigation focus mode. ([51798](https://github.com/WordPress/gutenberg/pull/51798))
+-   Social links: Updating class and style attributes. ([51997](https://github.com/WordPress/gutenberg/pull/51997))
 
 #### Themes
-- Add border theme_support. ([51777](https://github.com/WordPress/gutenberg/pull/51777))
-- Add link color theme_support. ([51775](https://github.com/WordPress/gutenberg/pull/51775))
+
+-   Add border theme_support. ([51777](https://github.com/WordPress/gutenberg/pull/51777))
+-   Add link color theme_support. ([51775](https://github.com/WordPress/gutenberg/pull/51775))
 
 #### Global Styles
-- Style Book: Show tabs and make blocks clickable when entering edit mode from the Styles menu. ([52222](https://github.com/WordPress/gutenberg/pull/52222))
+
+-   Style Book: Show tabs and make blocks clickable when entering edit mode from the Styles menu. ([52222](https://github.com/WordPress/gutenberg/pull/52222))
 
 #### Widgets Editor
-- Add @example tags to the customize-widgets package. ([52141](https://github.com/WordPress/gutenberg/pull/52141))
+
+-   Add @example tags to the customize-widgets package. ([52141](https://github.com/WordPress/gutenberg/pull/52141))
 
 #### NUX
-- Page Content Focus: Add welcome guides. ([52014](https://github.com/WordPress/gutenberg/pull/52014))
+
+-   Page Content Focus: Add welcome guides. ([52014](https://github.com/WordPress/gutenberg/pull/52014))
 
 #### Block Editor
-- Use block label and icon for the inserter draggable chip.. ([51048](https://github.com/WordPress/gutenberg/pull/51048))
+
+-   Use block label and icon for the inserter draggable chip.. ([51048](https://github.com/WordPress/gutenberg/pull/51048))
 
 #### Design Tools
-- Add Typography: Text orientation (writing mode). ([50822](https://github.com/WordPress/gutenberg/pull/50822))
+
+-   Add Typography: Text orientation (writing mode). ([50822](https://github.com/WordPress/gutenberg/pull/50822))
 
 #### Components
-- RangeControl: Add support for large 40px number input size. ([49105](https://github.com/WordPress/gutenberg/pull/49105))
 
+-   RangeControl: Add support for large 40px number input size. ([49105](https://github.com/WordPress/gutenberg/pull/49105))
 
 ### New APIs
 
 #### Block Editor
-- Add new `registerInserterMediaCategory` API to make media categories extensible. ([51542](https://github.com/WordPress/gutenberg/pull/51542))
 
+-   Add new `registerInserterMediaCategory` API to make media categories extensible. ([51542](https://github.com/WordPress/gutenberg/pull/51542))
 
 ### Bug Fixes
 
-- Adjust the position of sticky headings in preferences modal. ([52248](https://github.com/WordPress/gutenberg/pull/52248))
-- BlockRemovalWarningModal: Fix incorrect '_n' usage. ([52164](https://github.com/WordPress/gutenberg/pull/52164))
-- Editor initrial appender: Zero out margins in constrained layouts. ([52026](https://github.com/WordPress/gutenberg/pull/52026))
-- Export store from the edit-site package. ([51986](https://github.com/WordPress/gutenberg/pull/51986))
-- Fix disable DFM when opening styles command. ([52165](https://github.com/WordPress/gutenberg/pull/52165))
-- Fix unintentional toggling on of distraction free. ([52090](https://github.com/WordPress/gutenberg/pull/52090))
-- Footnotes: Increase selector specificity for anchor. ([52179](https://github.com/WordPress/gutenberg/pull/52179))
-- Respect custom aspect ratio. ([52286](https://github.com/WordPress/gutenberg/pull/52286))
-- Turn off DFM for style book and style editing. ([52117](https://github.com/WordPress/gutenberg/pull/52117))
-- Update fixed block toolbar. ([52123](https://github.com/WordPress/gutenberg/pull/52123))
-- Updating the BlockEditorProvider settings prop should reset the store's settings entirely. ([51904](https://github.com/WordPress/gutenberg/pull/51904))
-- [Command Palette]: Remove suggestion for deleting templates/parts. ([52168](https://github.com/WordPress/gutenberg/pull/52168))
-- [Command center]: Add preferences and keyboard shortcuts commands. ([51862](https://github.com/WordPress/gutenberg/pull/51862))
-- [Edit Post]: Add toggle fullscreen mode and list view commands. ([52184](https://github.com/WordPress/gutenberg/pull/52184))
-
-#### Block Library
-- Fix default block dimensions visibility. ([52256](https://github.com/WordPress/gutenberg/pull/52256))
-- Fix fetching Nav fallback ID flushing Navigation entity cache. ([52069](https://github.com/WordPress/gutenberg/pull/52069))
-- Fix flaky tests in `navigation.spec.js` and other tests related to the Post Editor Template mode. ([51790](https://github.com/WordPress/gutenberg/pull/51790))
-- Fix: Term Description block should only be available in the site editor. ([51053](https://github.com/WordPress/gutenberg/pull/51053))
-- Footnotes: Register meta field for pages. ([52024](https://github.com/WordPress/gutenberg/pull/52024))
-- Image block: Fix cursor style when lightbox is opened. ([52187](https://github.com/WordPress/gutenberg/pull/52187))
-- Navigation: Add the draft status to the navigation title. ([51967](https://github.com/WordPress/gutenberg/pull/51967))
-- Navigation: Fix end-to-end test failures caused by sidebar title change. ([52308](https://github.com/WordPress/gutenberg/pull/52308))
-- Navigation: Fix sidebar title. ([52167](https://github.com/WordPress/gutenberg/pull/52167))
-- Navigation: Remove one preloaded endpoint. ([52115](https://github.com/WordPress/gutenberg/pull/52115))
-- Page List: Fix parent block selection when converting to link. ([52193](https://github.com/WordPress/gutenberg/pull/52193))
-- Post editor: Require confirmation before removing Footnotes. ([52277](https://github.com/WordPress/gutenberg/pull/52277))
-- fix: Display heading level dropdown icons and labels. ([52004](https://github.com/WordPress/gutenberg/pull/52004))
+-   Adjust the position of sticky headings in preferences modal. ([52248](https://github.com/WordPress/gutenberg/pull/52248))
+-   BlockRemovalWarningModal: Fix incorrect '\_n' usage. ([52164](https://github.com/WordPress/gutenberg/pull/52164))
+-   Editor initrial appender: Zero out margins in constrained layouts. ([52026](https://github.com/WordPress/gutenberg/pull/52026))
+-   Export store from the edit-site package. ([51986](https://github.com/WordPress/gutenberg/pull/51986))
+-   Fix disable DFM when opening styles command. ([52165](https://github.com/WordPress/gutenberg/pull/52165))
+-   Fix unintentional toggling on of distraction free. ([52090](https://github.com/WordPress/gutenberg/pull/52090))
+-   Footnotes: Increase selector specificity for anchor. ([52179](https://github.com/WordPress/gutenberg/pull/52179))
+-   Respect custom aspect ratio. ([52286](https://github.com/WordPress/gutenberg/pull/52286))
+-   Turn off DFM for style book and style editing. ([52117](https://github.com/WordPress/gutenberg/pull/52117))
+-   Update fixed block toolbar. ([52123](https://github.com/WordPress/gutenberg/pull/52123))
+-   Updating the BlockEditorProvider settings prop should reset the store's settings entirely. ([51904](https://github.com/WordPress/gutenberg/pull/51904))
+-   [Command Palette]: Remove suggestion for deleting templates/parts. ([52168](https://github.com/WordPress/gutenberg/pull/52168))
+-   [Command center]: Add preferences and keyboard shortcuts commands. ([51862](https://github.com/WordPress/gutenberg/pull/51862))
+-   [Edit Post]: Add toggle fullscreen mode and list view commands. ([52184](https://github.com/WordPress/gutenberg/pull/52184))
+
+#### Block Library
+
+-   Fix default block dimensions visibility. ([52256](https://github.com/WordPress/gutenberg/pull/52256))
+-   Fix fetching Nav fallback ID flushing Navigation entity cache. ([52069](https://github.com/WordPress/gutenberg/pull/52069))
+-   Fix flaky tests in `navigation.spec.js` and other tests related to the Post Editor Template mode. ([51790](https://github.com/WordPress/gutenberg/pull/51790))
+-   Fix: Term Description block should only be available in the site editor. ([51053](https://github.com/WordPress/gutenberg/pull/51053))
+-   Footnotes: Register meta field for pages. ([52024](https://github.com/WordPress/gutenberg/pull/52024))
+-   Image block: Fix cursor style when lightbox is opened. ([52187](https://github.com/WordPress/gutenberg/pull/52187))
+-   Navigation: Add the draft status to the navigation title. ([51967](https://github.com/WordPress/gutenberg/pull/51967))
+-   Navigation: Fix end-to-end test failures caused by sidebar title change. ([52308](https://github.com/WordPress/gutenberg/pull/52308))
+-   Navigation: Fix sidebar title. ([52167](https://github.com/WordPress/gutenberg/pull/52167))
+-   Navigation: Remove one preloaded endpoint. ([52115](https://github.com/WordPress/gutenberg/pull/52115))
+-   Page List: Fix parent block selection when converting to link. ([52193](https://github.com/WordPress/gutenberg/pull/52193))
+-   Post editor: Require confirmation before removing Footnotes. ([52277](https://github.com/WordPress/gutenberg/pull/52277))
+-   fix: Display heading level dropdown icons and labels. ([52004](https://github.com/WordPress/gutenberg/pull/52004))
 
 #### Site Editor
-- Add confirmation step when deleting a Template. ([52236](https://github.com/WordPress/gutenberg/pull/52236))
-- Command Palette: Fix incorrect path and snackbar message when template part is deleted. ([52034](https://github.com/WordPress/gutenberg/pull/52034))
-- Default to showing status slug in sidebar. ([52226](https://github.com/WordPress/gutenberg/pull/52226))
-- Fix missing MenuGroup segment in Site Editor header more menu. ([51860](https://github.com/WordPress/gutenberg/pull/51860))
-- Fix missing snackbars in Library. ([52021](https://github.com/WordPress/gutenberg/pull/52021))
-- Fix stepper styling in Home template sidebar. ([52025](https://github.com/WordPress/gutenberg/pull/52025))
-- Get the top toolbar preference from the correct scope. ([51840](https://github.com/WordPress/gutenberg/pull/51840))
-- Hide word count and reading time meta data for the Posts Page details panel. ([52186](https://github.com/WordPress/gutenberg/pull/52186))
-- Modal: Add small top padding to the content so that avoid cutting off the visible outline when hovering items. ([51829](https://github.com/WordPress/gutenberg/pull/51829))
-- Site Editor Frame: Ignore Spotlight in view mode. ([52262](https://github.com/WordPress/gutenberg/pull/52262))
-- Try restoring the site editor animation. ([51956](https://github.com/WordPress/gutenberg/pull/51956))
+
+-   Add confirmation step when deleting a Template. ([52236](https://github.com/WordPress/gutenberg/pull/52236))
+-   Command Palette: Fix incorrect path and snackbar message when template part is deleted. ([52034](https://github.com/WordPress/gutenberg/pull/52034))
+-   Default to showing status slug in sidebar. ([52226](https://github.com/WordPress/gutenberg/pull/52226))
+-   Fix missing MenuGroup segment in Site Editor header more menu. ([51860](https://github.com/WordPress/gutenberg/pull/51860))
+-   Fix missing snackbars in Library. ([52021](https://github.com/WordPress/gutenberg/pull/52021))
+-   Fix stepper styling in Home template sidebar. ([52025](https://github.com/WordPress/gutenberg/pull/52025))
+-   Get the top toolbar preference from the correct scope. ([51840](https://github.com/WordPress/gutenberg/pull/51840))
+-   Hide word count and reading time meta data for the Posts Page details panel. ([52186](https://github.com/WordPress/gutenberg/pull/52186))
+-   Modal: Add small top padding to the content so that avoid cutting off the visible outline when hovering items. ([51829](https://github.com/WordPress/gutenberg/pull/51829))
+-   Site Editor Frame: Ignore Spotlight in view mode. ([52262](https://github.com/WordPress/gutenberg/pull/52262))
+-   Try restoring the site editor animation. ([51956](https://github.com/WordPress/gutenberg/pull/51956))
 
 #### Patterns
-- Fix custom patterns console error. ([51947](https://github.com/WordPress/gutenberg/pull/51947))
-- Fix history back after entering edit mode from Patterns. ([52112](https://github.com/WordPress/gutenberg/pull/52112))
-- Fix setting of sync status for fully synced patterns. ([51952](https://github.com/WordPress/gutenberg/pull/51952))
-- Fix sidebar tab label. ([51953](https://github.com/WordPress/gutenberg/pull/51953))
-- Fix: Pattern focus mode DocumentActions should use the pattern icon. ([52031](https://github.com/WordPress/gutenberg/pull/52031))
-- Include template parts for custom areas in Uncategorized category. ([52159](https://github.com/WordPress/gutenberg/pull/52159))
-- Remove ability for user to toggle sync status after pattern creation. ([51998](https://github.com/WordPress/gutenberg/pull/51998))
-- Rename sync_status and move to top level field on rest return instead of a meta field. ([52146](https://github.com/WordPress/gutenberg/pull/52146))
+
+-   Fix custom patterns console error. ([51947](https://github.com/WordPress/gutenberg/pull/51947))
+-   Fix history back after entering edit mode from Patterns. ([52112](https://github.com/WordPress/gutenberg/pull/52112))
+-   Fix setting of sync status for fully synced patterns. ([51952](https://github.com/WordPress/gutenberg/pull/51952))
+-   Fix sidebar tab label. ([51953](https://github.com/WordPress/gutenberg/pull/51953))
+-   Fix: Pattern focus mode DocumentActions should use the pattern icon. ([52031](https://github.com/WordPress/gutenberg/pull/52031))
+-   Include template parts for custom areas in Uncategorized category. ([52159](https://github.com/WordPress/gutenberg/pull/52159))
+-   Remove ability for user to toggle sync status after pattern creation. ([51998](https://github.com/WordPress/gutenberg/pull/51998))
+-   Rename sync_status and move to top level field on rest return instead of a meta field. ([52146](https://github.com/WordPress/gutenberg/pull/52146))
 
 #### Interactivity API
-- Block Image: Lightbox - Hide animation selector if behavior is Default or None. ([51748](https://github.com/WordPress/gutenberg/pull/51748))
-- Image block: Fix responsive sizing in lightbox. ([51823](https://github.com/WordPress/gutenberg/pull/51823))
-- Image block: Lightbox animation improvements. ([51721](https://github.com/WordPress/gutenberg/pull/51721))
-- Navigation block: Check that the modal is set before using `contains`. ([51962](https://github.com/WordPress/gutenberg/pull/51962))
+
+-   Block Image: Lightbox - Hide animation selector if behavior is Default or None. ([51748](https://github.com/WordPress/gutenberg/pull/51748))
+-   Image block: Fix responsive sizing in lightbox. ([51823](https://github.com/WordPress/gutenberg/pull/51823))
+-   Image block: Lightbox animation improvements. ([51721](https://github.com/WordPress/gutenberg/pull/51721))
+-   Navigation block: Check that the modal is set before using `contains`. ([51962](https://github.com/WordPress/gutenberg/pull/51962))
 
 #### Accessibility
-- Fix incorrect aria-describedby attributes for theme patterns. ([52263](https://github.com/WordPress/gutenberg/pull/52263))
-- Guide: Place focus on the guide's container instead of its first tabbable. ([52300](https://github.com/WordPress/gutenberg/pull/52300))
-- Site Editor: Update headings hierarchy in the 'Manage all' screens. ([52271](https://github.com/WordPress/gutenberg/pull/52271))
+
+-   Fix incorrect aria-describedby attributes for theme patterns. ([52263](https://github.com/WordPress/gutenberg/pull/52263))
+-   Guide: Place focus on the guide's container instead of its first tabbable. ([52300](https://github.com/WordPress/gutenberg/pull/52300))
+-   Site Editor: Update headings hierarchy in the 'Manage all' screens. ([52271](https://github.com/WordPress/gutenberg/pull/52271))
 
 #### Global Styles
-- Check if experiment enabled for realsies this time. ([52315](https://github.com/WordPress/gutenberg/pull/52315))
-- Check randomizer experiment is enabled before rendering button. ([52306](https://github.com/WordPress/gutenberg/pull/52306))
+
+-   Check if experiment enabled for realsies this time. ([52315](https://github.com/WordPress/gutenberg/pull/52315))
+-   Check randomizer experiment is enabled before rendering button. ([52306](https://github.com/WordPress/gutenberg/pull/52306))
 
 #### Navigation Menu Sidebar
-- Make the entire preview clickable in order to enter "edit" mode in focus mode. ([51973](https://github.com/WordPress/gutenberg/pull/51973))
-- Restore sidebar in focus mode on Pattern click through in Browse Mode `Library`. ([51897](https://github.com/WordPress/gutenberg/pull/51897))
+
+-   Make the entire preview clickable in order to enter "edit" mode in focus mode. ([51973](https://github.com/WordPress/gutenberg/pull/51973))
+-   Restore sidebar in focus mode on Pattern click through in Browse Mode `Library`. ([51897](https://github.com/WordPress/gutenberg/pull/51897))
 
 #### Page Content Focus
-- Hide parent selector when parent's block editing mode is 'disabled' or 'contentOnly'. ([52264](https://github.com/WordPress/gutenberg/pull/52264))
+
+-   Hide parent selector when parent's block editing mode is 'disabled' or 'contentOnly'. ([52264](https://github.com/WordPress/gutenberg/pull/52264))
 
 #### Post Editor
-- Editor: Avoid remounting pre-publish sidebar contents during autosave. ([52208](https://github.com/WordPress/gutenberg/pull/52208))
+
+-   Editor: Avoid remounting pre-publish sidebar contents during autosave. ([52208](https://github.com/WordPress/gutenberg/pull/52208))
 
 #### Block Editor
-- Enable draft entity creation in Nav block offcanvas. ([52166](https://github.com/WordPress/gutenberg/pull/52166))
+
+-   Enable draft entity creation in Nav block offcanvas. ([52166](https://github.com/WordPress/gutenberg/pull/52166))
 
 #### History
-- Update the behavior of the cached undo/redo stack. ([51644](https://github.com/WordPress/gutenberg/pull/51644))
+
+-   Update the behavior of the cached undo/redo stack. ([51644](https://github.com/WordPress/gutenberg/pull/51644))
 
 #### Components
-- DropdownMenu: Fix icon style when dashicon is used. ([43574](https://github.com/WordPress/gutenberg/pull/43574))
 
+-   DropdownMenu: Fix icon style when dashicon is used. ([43574](https://github.com/WordPress/gutenberg/pull/43574))
 
 ### Performance
 
-- Migrate performance tests to Playwright. ([51084](https://github.com/WordPress/gutenberg/pull/51084))
-- Social links: Reverts updating class and style attributes. ([52019](https://github.com/WordPress/gutenberg/pull/52019))
-- tests: Configure as a production environment. ([52016](https://github.com/WordPress/gutenberg/pull/52016))
+-   Migrate performance tests to Playwright. ([51084](https://github.com/WordPress/gutenberg/pull/51084))
+-   Social links: Reverts updating class and style attributes. ([52019](https://github.com/WordPress/gutenberg/pull/52019))
+-   tests: Configure as a production environment. ([52016](https://github.com/WordPress/gutenberg/pull/52016))
 
 #### Block Library
-- Try: Aggressive TinyMCE deprecation. ([50387](https://github.com/WordPress/gutenberg/pull/50387))
 
+-   Try: Aggressive TinyMCE deprecation. ([50387](https://github.com/WordPress/gutenberg/pull/50387))
 
 ### Experiments
 
 #### Interactivity API
-- Create @wordpress/interactivity with the Interactivity API. ([50906](https://github.com/WordPress/gutenberg/pull/50906))
 
+-   Create @wordpress/interactivity with the Interactivity API. ([50906](https://github.com/WordPress/gutenberg/pull/50906))
 
 ### Documentation
 
-- Add @examples to the @wordpress/rich-text package selectors and hide the actions from documentation. ([52089](https://github.com/WordPress/gutenberg/pull/52089))
-- Add examples for core/keyboard-shortcut package. ([42831](https://github.com/WordPress/gutenberg/pull/42831))
-- Block Editor: Add README for FontFamilyControl component. ([52118](https://github.com/WordPress/gutenberg/pull/52118))
-- Block Editor: Add README for `PanelColorSettings` component. ([52327](https://github.com/WordPress/gutenberg/pull/52327))
-- Block Editor: Add README for `RecursionProvider`. ([52334](https://github.com/WordPress/gutenberg/pull/52334))
-- Docs: Update release documentation to use the right cherry-picking command. ([51935](https://github.com/WordPress/gutenberg/pull/51935))
-
+-   Add @examples to the @wordpress/rich-text package selectors and hide the actions from documentation. ([52089](https://github.com/WordPress/gutenberg/pull/52089))
+-   Add examples for core/keyboard-shortcut package. ([42831](https://github.com/WordPress/gutenberg/pull/42831))
+-   Block Editor: Add README for FontFamilyControl component. ([52118](https://github.com/WordPress/gutenberg/pull/52118))
+-   Block Editor: Add README for `PanelColorSettings` component. ([52327](https://github.com/WordPress/gutenberg/pull/52327))
+-   Block Editor: Add README for `RecursionProvider`. ([52334](https://github.com/WordPress/gutenberg/pull/52334))
+-   Docs: Update release documentation to use the right cherry-picking command. ([51935](https://github.com/WordPress/gutenberg/pull/51935))
 
 ### Code Quality
 
-- Lodash: Refactor away from `_.kebabCase()` in `getCleanTemplatePartSlug`. ([51906](https://github.com/WordPress/gutenberg/pull/51906))
-- Lodash: Refactor away from `_.kebabCase()` in add page modal. ([51911](https://github.com/WordPress/gutenberg/pull/51911))
-- Lodash: Refactor away from `_.kebabCase()` in generic template modal. ([51910](https://github.com/WordPress/gutenberg/pull/51910))
-- Lodash: Remove completely from `@wordpress/style-engine` package. ([51726](https://github.com/WordPress/gutenberg/pull/51726))
+-   Lodash: Refactor away from `_.kebabCase()` in `getCleanTemplatePartSlug`. ([51906](https://github.com/WordPress/gutenberg/pull/51906))
+-   Lodash: Refactor away from `_.kebabCase()` in add page modal. ([51911](https://github.com/WordPress/gutenberg/pull/51911))
+-   Lodash: Refactor away from `_.kebabCase()` in generic template modal. ([51910](https://github.com/WordPress/gutenberg/pull/51910))
+-   Lodash: Remove completely from `@wordpress/style-engine` package. ([51726](https://github.com/WordPress/gutenberg/pull/51726))
 
 #### Block Library
-- Heading Block: Remove unused `HeadingLevelIcon` component. ([52008](https://github.com/WordPress/gutenberg/pull/52008))
-- Image block and behaviors: Fix some warnings. ([52109](https://github.com/WordPress/gutenberg/pull/52109))
-- Lodash: Refactor embed block away from `_.kebabCase()`. ([51916](https://github.com/WordPress/gutenberg/pull/51916))
-- Lodash: Remove dependency from block library package. ([51976](https://github.com/WordPress/gutenberg/pull/51976))
-- Make Navigation fallback selector private. ([51413](https://github.com/WordPress/gutenberg/pull/51413))
-- Page List: Fix ESLint warnings. ([52267](https://github.com/WordPress/gutenberg/pull/52267))
-- Refactor, document, and fix image block deprecations. ([52081](https://github.com/WordPress/gutenberg/pull/52081))
+
+-   Heading Block: Remove unused `HeadingLevelIcon` component. ([52008](https://github.com/WordPress/gutenberg/pull/52008))
+-   Image block and behaviors: Fix some warnings. ([52109](https://github.com/WordPress/gutenberg/pull/52109))
+-   Lodash: Refactor embed block away from `_.kebabCase()`. ([51916](https://github.com/WordPress/gutenberg/pull/51916))
+-   Lodash: Remove dependency from block library package. ([51976](https://github.com/WordPress/gutenberg/pull/51976))
+-   Make Navigation fallback selector private. ([51413](https://github.com/WordPress/gutenberg/pull/51413))
+-   Page List: Fix ESLint warnings. ([52267](https://github.com/WordPress/gutenberg/pull/52267))
+-   Refactor, document, and fix image block deprecations. ([52081](https://github.com/WordPress/gutenberg/pull/52081))
 
 #### Page Content Focus
-- Add basic test for the page content focus flow. ([52231](https://github.com/WordPress/gutenberg/pull/52231))
+
+-   Add basic test for the page content focus flow. ([52231](https://github.com/WordPress/gutenberg/pull/52231))
 
 #### List View
-- Return primitive value for 'hideInserter' in Appender component. ([52161](https://github.com/WordPress/gutenberg/pull/52161))
+
+-   Return primitive value for 'hideInserter' in Appender component. ([52161](https://github.com/WordPress/gutenberg/pull/52161))
 
 #### Interactivity API
-- Fix the `exsisting` -> `existing` typo. ([52110](https://github.com/WordPress/gutenberg/pull/52110))
+
+-   Fix the `exsisting` -> `existing` typo. ([52110](https://github.com/WordPress/gutenberg/pull/52110))
 
 #### Navigation Menu Sidebar
-- Remove redundant call to Navigation selector in Browse Mode. ([51988](https://github.com/WordPress/gutenberg/pull/51988))
+
+-   Remove redundant call to Navigation selector in Browse Mode. ([51988](https://github.com/WordPress/gutenberg/pull/51988))
 
 #### Site Editor
-- Block removal prompt: Let consumers pass their own rules. ([51841](https://github.com/WordPress/gutenberg/pull/51841))
+
+-   Block removal prompt: Let consumers pass their own rules. ([51841](https://github.com/WordPress/gutenberg/pull/51841))
 
 #### Block Editor
-- Revise LinkControl suggestions UI to use MenuItem. ([50978](https://github.com/WordPress/gutenberg/pull/50978))
 
+-   Revise LinkControl suggestions UI to use MenuItem. ([50978](https://github.com/WordPress/gutenberg/pull/50978))
 
 ### Tools
 
 #### Testing
-- Drops PHP 5.6 CI jobs. ([52345](https://github.com/WordPress/gutenberg/pull/52345))
-- Fix flakiness of saving entities in the site editor. ([51728](https://github.com/WordPress/gutenberg/pull/51728))
-- Fix flaky Site Editor pages end-to-end test. ([52283](https://github.com/WordPress/gutenberg/pull/52283))
-- Have `createNewPost` wait for editor canvas contents. ([51824](https://github.com/WordPress/gutenberg/pull/51824))
+
+-   Drops PHP 5.6 CI jobs. ([52345](https://github.com/WordPress/gutenberg/pull/52345))
+-   Fix flakiness of saving entities in the site editor. ([51728](https://github.com/WordPress/gutenberg/pull/51728))
+-   Fix flaky Site Editor pages end-to-end test. ([52283](https://github.com/WordPress/gutenberg/pull/52283))
+-   Have `createNewPost` wait for editor canvas contents. ([51824](https://github.com/WordPress/gutenberg/pull/51824))
 
 #### Build Tooling
-- Fix phpunit failures. ([51950](https://github.com/WordPress/gutenberg/pull/51950))
-- Use moment-timezone-data-webpack-plugin to optimize timezones shipped in wp/date. ([51519](https://github.com/WordPress/gutenberg/pull/51519))
 
+-   Fix phpunit failures. ([51950](https://github.com/WordPress/gutenberg/pull/51950))
+-   Use moment-timezone-data-webpack-plugin to optimize timezones shipped in wp/date. ([51519](https://github.com/WordPress/gutenberg/pull/51519))
 
 ### Various
 
-- Add caching to schema of REST API. ([52045](https://github.com/WordPress/gutenberg/pull/52045))
-- Add code owners for the Interactivity API runtime. ([52174](https://github.com/WordPress/gutenberg/pull/52174))
-- Backport from core: Rename `gutenberg_get_remote_theme_patterns` to `gutenberg_get_theme_directory_pattern_slugs`. ([51784](https://github.com/WordPress/gutenberg/pull/51784))
-- Block editor store: Also attach private APIs to old store descriptor. ([52088](https://github.com/WordPress/gutenberg/pull/52088))
-- Blocks: Remove gutenberg refs in PHP files. ([51978](https://github.com/WordPress/gutenberg/pull/51978))
-- Command palette: Rename. ([52153](https://github.com/WordPress/gutenberg/pull/52153))
-- Drop-indicator: Remove white border. ([52122](https://github.com/WordPress/gutenberg/pull/52122))
-- First version of the Interactivity API README. ([52104](https://github.com/WordPress/gutenberg/pull/52104))
-- Global Styles Revisions API: Backport changes from Core. ([52095](https://github.com/WordPress/gutenberg/pull/52095))
-- Global Styles Sidebar: Re-add Colors: Heading to selected blocks. ([49131](https://github.com/WordPress/gutenberg/pull/49131))
-- Image block: Update lightbox animation tests. ([52290](https://github.com/WordPress/gutenberg/pull/52290))
-- Patterns: Update section heading levels. ([52273](https://github.com/WordPress/gutenberg/pull/52273))
-- Perf logging: Change date to ISO 8601. ([51833](https://github.com/WordPress/gutenberg/pull/51833))
-- Refactor use-tab-nav shift+tab to use existing utils. ([51817](https://github.com/WordPress/gutenberg/pull/51817))
-- Remove serverSideBlockDefinitions from a test. ([52215](https://github.com/WordPress/gutenberg/pull/52215))
-- Restore "Buttons > can resize width" test. ([51865](https://github.com/WordPress/gutenberg/pull/51865))
-- Update delete page button label. ([51812](https://github.com/WordPress/gutenberg/pull/51812))
-- Update versions in WP for 6.3. ([51984](https://github.com/WordPress/gutenberg/pull/51984))
-- Wrap "Move to trash" and "Switch to draft" buttons when labels are too long to fit on a single row. ([52249](https://github.com/WordPress/gutenberg/pull/52249))
-- [Github-Actions-Workflows][Plugin-Release] Allow shipping a point-release for an older stable release. ([49082](https://github.com/WordPress/gutenberg/pull/49082))
-
-#### Block Library
-- Block Editor: Unify texts for Create pattern modal. ([52151](https://github.com/WordPress/gutenberg/pull/52151))
-- Block Supports: Change prefix in gutenberg_apply_colors_support to wp_ in dynamic blocks. ([51989](https://github.com/WordPress/gutenberg/pull/51989))
-- Navigation in Site View: Readd the edit button. ([52111](https://github.com/WordPress/gutenberg/pull/52111))
-- Navigation submenu: Remove unused doc block. ([52152](https://github.com/WordPress/gutenberg/pull/52152))
-- Page List: Change modal text. ([52116](https://github.com/WordPress/gutenberg/pull/52116))
-- i18n: Add context to the word "Filters". ([52198](https://github.com/WordPress/gutenberg/pull/52198))
+-   Add caching to schema of REST API. ([52045](https://github.com/WordPress/gutenberg/pull/52045))
+-   Add code owners for the Interactivity API runtime. ([52174](https://github.com/WordPress/gutenberg/pull/52174))
+-   Backport from core: Rename `gutenberg_get_remote_theme_patterns` to `gutenberg_get_theme_directory_pattern_slugs`. ([51784](https://github.com/WordPress/gutenberg/pull/51784))
+-   Block editor store: Also attach private APIs to old store descriptor. ([52088](https://github.com/WordPress/gutenberg/pull/52088))
+-   Blocks: Remove gutenberg refs in PHP files. ([51978](https://github.com/WordPress/gutenberg/pull/51978))
+-   Command palette: Rename. ([52153](https://github.com/WordPress/gutenberg/pull/52153))
+-   Drop-indicator: Remove white border. ([52122](https://github.com/WordPress/gutenberg/pull/52122))
+-   First version of the Interactivity API README. ([52104](https://github.com/WordPress/gutenberg/pull/52104))
+-   Global Styles Revisions API: Backport changes from Core. ([52095](https://github.com/WordPress/gutenberg/pull/52095))
+-   Global Styles Sidebar: Re-add Colors: Heading to selected blocks. ([49131](https://github.com/WordPress/gutenberg/pull/49131))
+-   Image block: Update lightbox animation tests. ([52290](https://github.com/WordPress/gutenberg/pull/52290))
+-   Patterns: Update section heading levels. ([52273](https://github.com/WordPress/gutenberg/pull/52273))
+-   Perf logging: Change date to ISO 8601. ([51833](https://github.com/WordPress/gutenberg/pull/51833))
+-   Refactor use-tab-nav shift+tab to use existing utils. ([51817](https://github.com/WordPress/gutenberg/pull/51817))
+-   Remove serverSideBlockDefinitions from a test. ([52215](https://github.com/WordPress/gutenberg/pull/52215))
+-   Restore "Buttons > can resize width" test. ([51865](https://github.com/WordPress/gutenberg/pull/51865))
+-   Update delete page button label. ([51812](https://github.com/WordPress/gutenberg/pull/51812))
+-   Update versions in WP for 6.3. ([51984](https://github.com/WordPress/gutenberg/pull/51984))
+-   Wrap "Move to trash" and "Switch to draft" buttons when labels are too long to fit on a single row. ([52249](https://github.com/WordPress/gutenberg/pull/52249))
+-   [GitHub-Actions-Workflows][Plugin-Release] Allow shipping a point-release for an older stable release. ([49082](https://github.com/WordPress/gutenberg/pull/49082))
+
+#### Block Library
+
+-   Block Editor: Unify texts for Create pattern modal. ([52151](https://github.com/WordPress/gutenberg/pull/52151))
+-   Block Supports: Change prefix in gutenberg*apply_colors_support to wp* in dynamic blocks. ([51989](https://github.com/WordPress/gutenberg/pull/51989))
+-   Navigation in Site View: Readd the edit button. ([52111](https://github.com/WordPress/gutenberg/pull/52111))
+-   Navigation submenu: Remove unused doc block. ([52152](https://github.com/WordPress/gutenberg/pull/52152))
+-   Page List: Change modal text. ([52116](https://github.com/WordPress/gutenberg/pull/52116))
+-   i18n: Add context to the word "Filters". ([52198](https://github.com/WordPress/gutenberg/pull/52198))
 
 #### Site Editor
-- Library: Update icons in the creation menu. ([52108](https://github.com/WordPress/gutenberg/pull/52108))
-- Polish welcome guide copy for page / template editing. ([52282](https://github.com/WordPress/gutenberg/pull/52282))
-- Try: Update template titles. ([51428](https://github.com/WordPress/gutenberg/pull/51428))
-- Update stepper styling in Home template details panel. ([51972](https://github.com/WordPress/gutenberg/pull/51972))
-- Update text color of active menu items. ([51965](https://github.com/WordPress/gutenberg/pull/51965))
+
+-   Library: Update icons in the creation menu. ([52108](https://github.com/WordPress/gutenberg/pull/52108))
+-   Polish welcome guide copy for page / template editing. ([52282](https://github.com/WordPress/gutenberg/pull/52282))
+-   Try: Update template titles. ([51428](https://github.com/WordPress/gutenberg/pull/51428))
+-   Update stepper styling in Home template details panel. ([51972](https://github.com/WordPress/gutenberg/pull/51972))
+-   Update text color of active menu items. ([51965](https://github.com/WordPress/gutenberg/pull/51965))
 
 #### Patterns
-- Add a hint about the rename of reusable blocks to menu and inserter. ([51771](https://github.com/WordPress/gutenberg/pull/51771))
-- Copy: "Detach pattern" instead of "Covert to regular block". ([51993](https://github.com/WordPress/gutenberg/pull/51993))
-- Library: Reinstate manage all template parts page. ([51961](https://github.com/WordPress/gutenberg/pull/51961))
-- [Library] Add lock icon for theme patterns. ([51990](https://github.com/WordPress/gutenberg/pull/51990))
+
+-   Add a hint about the rename of reusable blocks to menu and inserter. ([51771](https://github.com/WordPress/gutenberg/pull/51771))
+-   Copy: "Detach pattern" instead of "Covert to regular block". ([51993](https://github.com/WordPress/gutenberg/pull/51993))
+-   Library: Reinstate manage all template parts page. ([51961](https://github.com/WordPress/gutenberg/pull/51961))
+-   [Library] Add lock icon for theme patterns. ([51990](https://github.com/WordPress/gutenberg/pull/51990))
 
 #### Accessibility
-- Navigation block: Do not toggle aria-expanded on hover when the overlay menu is opened. ([52170](https://github.com/WordPress/gutenberg/pull/52170))
-- Navigation block: Don't close submenu when it has focus. ([52177](https://github.com/WordPress/gutenberg/pull/52177))
+
+-   Navigation block: Do not toggle aria-expanded on hover when the overlay menu is opened. ([52170](https://github.com/WordPress/gutenberg/pull/52170))
+-   Navigation block: Don't close submenu when it has focus. ([52177](https://github.com/WordPress/gutenberg/pull/52177))
 
 #### Widgets Editor
-- Export the store for the core/edit-widgets pacakage. ([52190](https://github.com/WordPress/gutenberg/pull/52190))
+
+-   Export the store for the core/edit-widgets pacakage. ([52190](https://github.com/WordPress/gutenberg/pull/52190))
 
 #### Post Editor
-- Move block editor settings filter into 6.3 compat folder. ([52100](https://github.com/WordPress/gutenberg/pull/52100))
+
+-   Move block editor settings filter into 6.3 compat folder. ([52100](https://github.com/WordPress/gutenberg/pull/52100))
 
 #### Layout
-- Move grid function kses patch into 6.3 compat folder. ([52098](https://github.com/WordPress/gutenberg/pull/52098))
+
+-   Move grid function kses patch into 6.3 compat folder. ([52098](https://github.com/WordPress/gutenberg/pull/52098))
 
 #### Data Layer
-- hasResolvingSelectors: Exclude from result of resolveSelect. ([52038](https://github.com/WordPress/gutenberg/pull/52038))
+
+-   hasResolvingSelectors: Exclude from result of resolveSelect. ([52038](https://github.com/WordPress/gutenberg/pull/52038))
 
 #### Icons
-- Remove fill="none" from pinSmall icon. ([51979](https://github.com/WordPress/gutenberg/pull/51979))
+
+-   Remove fill="none" from pinSmall icon. ([51979](https://github.com/WordPress/gutenberg/pull/51979))
 
 #### Navigation Menu Sidebar
-- Sidebar Navigation: Refactor delete modal with `ConfirmDialog` component. ([51867](https://github.com/WordPress/gutenberg/pull/51867))
+
+-   Sidebar Navigation: Refactor delete modal with `ConfirmDialog` component. ([51867](https://github.com/WordPress/gutenberg/pull/51867))
 
 #### Templates API
-- Template revisions API: Move back to experimental. ([51774](https://github.com/WordPress/gutenberg/pull/51774))
 
+-   Template revisions API: Move back to experimental. ([51774](https://github.com/WordPress/gutenberg/pull/51774))
 
 ## Contributors
 
@@ -4069,316 +14937,347 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @ajlende @annezazu @artemiomorales @c4rl0sbr4v0 @carolinan @DAreRodz @dcalhoun @draganescu @ellatrix @fullofcaffeine @getdave @glendaviesnz @hellofromtonya @jameskoster @jasmussen @jeryj @jsnajdr @juanfra @juanmaguitar @kevin940726 @luisherranz @Mamaduka @mcsf @michalczaplinski @miminari @noisysocks @ntsekouras @oandregal @ockham @priethor @ramonjd @richtabor @ryanwelcher @SaxonF @scruffian @spacedmonkey @stokesman @t-hamano @talldan @tellthemachines @tyxla @WunderBart @youknowriad
 
-
-
-
 = 16.1.2 =
 
-### Bug fixes
+## Changelog
 
-* Footnotes: increase selector specificity for anchor (https://github.com/WordPress/gutenberg/pull/52179)
+### Bug fixes
 
+-   Footnotes: increase selector specificity for anchor (https://github.com/WordPress/gutenberg/pull/52179)
 
 = 16.2.0-rc.1 =
 
-
-
 ## Changelog
 
 ### Features
 
 #### Patterns
-- feat: Rename Reusable blocks to Patterns. ([51704](https://github.com/WordPress/gutenberg/pull/51704))
 
+-   feat: Rename Reusable blocks to Patterns. ([51704](https://github.com/WordPress/gutenberg/pull/51704))
 
 ### Enhancements
 
-- Export store for the core/customize-widgets package. ([52189](https://github.com/WordPress/gutenberg/pull/52189))
+-   Export store for the core/customize-widgets package. ([52189](https://github.com/WordPress/gutenberg/pull/52189))
 
 #### Patterns
-- Library: Add sync status to pattern details screen. ([51954](https://github.com/WordPress/gutenberg/pull/51954))
-- Rename Library to Patterns. ([52102](https://github.com/WordPress/gutenberg/pull/52102))
-- Update custom patterns label to 'My patterns'. ([51949](https://github.com/WordPress/gutenberg/pull/51949))
-- Update pattern creation modal in library. ([51946](https://github.com/WordPress/gutenberg/pull/51946))
-- Update template part icons in the library mosaic (grid items). ([51963](https://github.com/WordPress/gutenberg/pull/51963))
+
+-   Library: Add sync status to pattern details screen. ([51954](https://github.com/WordPress/gutenberg/pull/51954))
+-   Rename Library to Patterns. ([52102](https://github.com/WordPress/gutenberg/pull/52102))
+-   Update custom patterns label to 'My patterns'. ([51949](https://github.com/WordPress/gutenberg/pull/51949))
+-   Update pattern creation modal in library. ([51946](https://github.com/WordPress/gutenberg/pull/51946))
+-   Update template part icons in the library mosaic (grid items). ([51963](https://github.com/WordPress/gutenberg/pull/51963))
 
 #### Site Editor
-- Change "Home" template name to "Blog home". ([52048](https://github.com/WordPress/gutenberg/pull/52048))
-- Edit Site: Make loading spinner colors consistent. ([51857](https://github.com/WordPress/gutenberg/pull/51857))
-- Update the icon used to reference the blog. ([52075](https://github.com/WordPress/gutenberg/pull/52075))
+
+-   Change "Home" template name to "Blog home". ([52048](https://github.com/WordPress/gutenberg/pull/52048))
+-   Edit Site: Make loading spinner colors consistent. ([51857](https://github.com/WordPress/gutenberg/pull/51857))
+-   Update the icon used to reference the blog. ([52075](https://github.com/WordPress/gutenberg/pull/52075))
 
 #### Interactivity API
-- Image block: Remove extra lookup for external image dimensions in lightbox. ([52178](https://github.com/WordPress/gutenberg/pull/52178))
-- Image block: Use built-in directive for mouseover event in lightbox. ([52067](https://github.com/WordPress/gutenberg/pull/52067))
+
+-   Image block: Remove extra lookup for external image dimensions in lightbox. ([52178](https://github.com/WordPress/gutenberg/pull/52178))
+-   Image block: Use built-in directive for mouseover event in lightbox. ([52067](https://github.com/WordPress/gutenberg/pull/52067))
 
 #### Block Library
-- Force full height for editor in Navigation focus mode. ([51798](https://github.com/WordPress/gutenberg/pull/51798))
-- Social links: Updating class and style attributes. ([51997](https://github.com/WordPress/gutenberg/pull/51997))
+
+-   Force full height for editor in Navigation focus mode. ([51798](https://github.com/WordPress/gutenberg/pull/51798))
+-   Social links: Updating class and style attributes. ([51997](https://github.com/WordPress/gutenberg/pull/51997))
 
 #### Themes
-- Add border theme_support. ([51777](https://github.com/WordPress/gutenberg/pull/51777))
-- Add link color theme_support. ([51775](https://github.com/WordPress/gutenberg/pull/51775))
+
+-   Add border theme_support. ([51777](https://github.com/WordPress/gutenberg/pull/51777))
+-   Add link color theme_support. ([51775](https://github.com/WordPress/gutenberg/pull/51775))
 
 #### Global Styles
-- Style Book: Show tabs and make blocks clickable when entering edit mode from the Styles menu. ([52222](https://github.com/WordPress/gutenberg/pull/52222))
+
+-   Style Book: Show tabs and make blocks clickable when entering edit mode from the Styles menu. ([52222](https://github.com/WordPress/gutenberg/pull/52222))
 
 #### Widgets Editor
-- Add @example tags to the customize-widgets package. ([52141](https://github.com/WordPress/gutenberg/pull/52141))
+
+-   Add @example tags to the customize-widgets package. ([52141](https://github.com/WordPress/gutenberg/pull/52141))
 
 #### NUX
-- Page Content Focus: Add welcome guides. ([52014](https://github.com/WordPress/gutenberg/pull/52014))
+
+-   Page Content Focus: Add welcome guides. ([52014](https://github.com/WordPress/gutenberg/pull/52014))
 
 #### Block Editor
-- Use block label and icon for the inserter draggable chip.. ([51048](https://github.com/WordPress/gutenberg/pull/51048))
+
+-   Use block label and icon for the inserter draggable chip.. ([51048](https://github.com/WordPress/gutenberg/pull/51048))
 
 #### Design Tools
-- Add Typography: Text orientation (writing mode). ([50822](https://github.com/WordPress/gutenberg/pull/50822))
+
+-   Add Typography: Text orientation (writing mode). ([50822](https://github.com/WordPress/gutenberg/pull/50822))
 
 #### Components
-- RangeControl: Add support for large 40px number input size. ([49105](https://github.com/WordPress/gutenberg/pull/49105))
 
+-   RangeControl: Add support for large 40px number input size. ([49105](https://github.com/WordPress/gutenberg/pull/49105))
 
 ### New APIs
 
 #### Block Editor
-- Add new `registerInserterMediaCategory` API to make media categories extensible. ([51542](https://github.com/WordPress/gutenberg/pull/51542))
 
+-   Add new `registerInserterMediaCategory` API to make media categories extensible. ([51542](https://github.com/WordPress/gutenberg/pull/51542))
 
 ### Bug Fixes
 
-- Adjust the position of sticky headings in preferences modal. ([52248](https://github.com/WordPress/gutenberg/pull/52248))
-- BlockRemovalWarningModal: Fix incorrect '_n' usage. ([52164](https://github.com/WordPress/gutenberg/pull/52164))
-- Editor initrial appender: Zero out margins in constrained layouts. ([52026](https://github.com/WordPress/gutenberg/pull/52026))
-- Export store from the edit-site package. ([51986](https://github.com/WordPress/gutenberg/pull/51986))
-- Fix disable DFM when opening styles command. ([52165](https://github.com/WordPress/gutenberg/pull/52165))
-- Fix unintentional toggling on of distraction free. ([52090](https://github.com/WordPress/gutenberg/pull/52090))
-- Footnotes: Increase selector specificity for anchor. ([52179](https://github.com/WordPress/gutenberg/pull/52179))
-- Respect custom aspect ratio. ([52286](https://github.com/WordPress/gutenberg/pull/52286))
-- Turn off DFM for style book and style editing. ([52117](https://github.com/WordPress/gutenberg/pull/52117))
-- Update fixed block toolbar. ([52123](https://github.com/WordPress/gutenberg/pull/52123))
-- Updating the BlockEditorProvider settings prop should reset the store's settings entirely. ([51904](https://github.com/WordPress/gutenberg/pull/51904))
-- [Command Palette]: Remove suggestion for deleting templates/parts. ([52168](https://github.com/WordPress/gutenberg/pull/52168))
-- [Command center]: Add preferences and keyboard shortcuts commands. ([51862](https://github.com/WordPress/gutenberg/pull/51862))
-- [Edit Post]: Add toggle fullscreen mode and list view commands. ([52184](https://github.com/WordPress/gutenberg/pull/52184))
-
-#### Block Library
-- Fix default block dimensions visibility. ([52256](https://github.com/WordPress/gutenberg/pull/52256))
-- Fix fetching Nav fallback ID flushing Navigation entity cache. ([52069](https://github.com/WordPress/gutenberg/pull/52069))
-- Fix flaky tests in `navigation.spec.js` and other tests related to the Post Editor Template mode. ([51790](https://github.com/WordPress/gutenberg/pull/51790))
-- Fix: Term Description block should only be available in the site editor. ([51053](https://github.com/WordPress/gutenberg/pull/51053))
-- Footnotes: Register meta field for pages. ([52024](https://github.com/WordPress/gutenberg/pull/52024))
-- Image block: Fix cursor style when lightbox is opened. ([52187](https://github.com/WordPress/gutenberg/pull/52187))
-- Navigation: Add the draft status to the navigation title. ([51967](https://github.com/WordPress/gutenberg/pull/51967))
-- Navigation: Fix end-to-end test failures caused by sidebar title change. ([52308](https://github.com/WordPress/gutenberg/pull/52308))
-- Navigation: Fix sidebar title. ([52167](https://github.com/WordPress/gutenberg/pull/52167))
-- Navigation: Remove one preloaded endpoint. ([52115](https://github.com/WordPress/gutenberg/pull/52115))
-- Page List: Fix parent block selection when converting to link. ([52193](https://github.com/WordPress/gutenberg/pull/52193))
-- Post editor: Require confirmation before removing Footnotes. ([52277](https://github.com/WordPress/gutenberg/pull/52277))
-- fix: Display heading level dropdown icons and labels. ([52004](https://github.com/WordPress/gutenberg/pull/52004))
+-   Adjust the position of sticky headings in preferences modal. ([52248](https://github.com/WordPress/gutenberg/pull/52248))
+-   BlockRemovalWarningModal: Fix incorrect '\_n' usage. ([52164](https://github.com/WordPress/gutenberg/pull/52164))
+-   Editor initrial appender: Zero out margins in constrained layouts. ([52026](https://github.com/WordPress/gutenberg/pull/52026))
+-   Export store from the edit-site package. ([51986](https://github.com/WordPress/gutenberg/pull/51986))
+-   Fix disable DFM when opening styles command. ([52165](https://github.com/WordPress/gutenberg/pull/52165))
+-   Fix unintentional toggling on of distraction free. ([52090](https://github.com/WordPress/gutenberg/pull/52090))
+-   Footnotes: Increase selector specificity for anchor. ([52179](https://github.com/WordPress/gutenberg/pull/52179))
+-   Respect custom aspect ratio. ([52286](https://github.com/WordPress/gutenberg/pull/52286))
+-   Turn off DFM for style book and style editing. ([52117](https://github.com/WordPress/gutenberg/pull/52117))
+-   Update fixed block toolbar. ([52123](https://github.com/WordPress/gutenberg/pull/52123))
+-   Updating the BlockEditorProvider settings prop should reset the store's settings entirely. ([51904](https://github.com/WordPress/gutenberg/pull/51904))
+-   [Command Palette]: Remove suggestion for deleting templates/parts. ([52168](https://github.com/WordPress/gutenberg/pull/52168))
+-   [Command center]: Add preferences and keyboard shortcuts commands. ([51862](https://github.com/WordPress/gutenberg/pull/51862))
+-   [Edit Post]: Add toggle fullscreen mode and list view commands. ([52184](https://github.com/WordPress/gutenberg/pull/52184))
+
+#### Block Library
+
+-   Fix default block dimensions visibility. ([52256](https://github.com/WordPress/gutenberg/pull/52256))
+-   Fix fetching Nav fallback ID flushing Navigation entity cache. ([52069](https://github.com/WordPress/gutenberg/pull/52069))
+-   Fix flaky tests in `navigation.spec.js` and other tests related to the Post Editor Template mode. ([51790](https://github.com/WordPress/gutenberg/pull/51790))
+-   Fix: Term Description block should only be available in the site editor. ([51053](https://github.com/WordPress/gutenberg/pull/51053))
+-   Footnotes: Register meta field for pages. ([52024](https://github.com/WordPress/gutenberg/pull/52024))
+-   Image block: Fix cursor style when lightbox is opened. ([52187](https://github.com/WordPress/gutenberg/pull/52187))
+-   Navigation: Add the draft status to the navigation title. ([51967](https://github.com/WordPress/gutenberg/pull/51967))
+-   Navigation: Fix end-to-end test failures caused by sidebar title change. ([52308](https://github.com/WordPress/gutenberg/pull/52308))
+-   Navigation: Fix sidebar title. ([52167](https://github.com/WordPress/gutenberg/pull/52167))
+-   Navigation: Remove one preloaded endpoint. ([52115](https://github.com/WordPress/gutenberg/pull/52115))
+-   Page List: Fix parent block selection when converting to link. ([52193](https://github.com/WordPress/gutenberg/pull/52193))
+-   Post editor: Require confirmation before removing Footnotes. ([52277](https://github.com/WordPress/gutenberg/pull/52277))
+-   fix: Display heading level dropdown icons and labels. ([52004](https://github.com/WordPress/gutenberg/pull/52004))
 
 #### Site Editor
-- Add confirmation step when deleting a Template. ([52236](https://github.com/WordPress/gutenberg/pull/52236))
-- Command Palette: Fix incorrect path and snackbar message when template part is deleted. ([52034](https://github.com/WordPress/gutenberg/pull/52034))
-- Default to showing status slug in sidebar. ([52226](https://github.com/WordPress/gutenberg/pull/52226))
-- Fix missing MenuGroup segment in Site Editor header more menu. ([51860](https://github.com/WordPress/gutenberg/pull/51860))
-- Fix missing snackbars in Library. ([52021](https://github.com/WordPress/gutenberg/pull/52021))
-- Fix stepper styling in Home template sidebar. ([52025](https://github.com/WordPress/gutenberg/pull/52025))
-- Get the top toolbar preference from the correct scope. ([51840](https://github.com/WordPress/gutenberg/pull/51840))
-- Hide word count and reading time meta data for the Posts Page details panel. ([52186](https://github.com/WordPress/gutenberg/pull/52186))
-- Modal: Add small top padding to the content so that avoid cutting off the visible outline when hovering items. ([51829](https://github.com/WordPress/gutenberg/pull/51829))
-- Site Editor Frame: Ignore Spotlight in view mode. ([52262](https://github.com/WordPress/gutenberg/pull/52262))
-- Try restoring the site editor animation. ([51956](https://github.com/WordPress/gutenberg/pull/51956))
+
+-   Add confirmation step when deleting a Template. ([52236](https://github.com/WordPress/gutenberg/pull/52236))
+-   Command Palette: Fix incorrect path and snackbar message when template part is deleted. ([52034](https://github.com/WordPress/gutenberg/pull/52034))
+-   Default to showing status slug in sidebar. ([52226](https://github.com/WordPress/gutenberg/pull/52226))
+-   Fix missing MenuGroup segment in Site Editor header more menu. ([51860](https://github.com/WordPress/gutenberg/pull/51860))
+-   Fix missing snackbars in Library. ([52021](https://github.com/WordPress/gutenberg/pull/52021))
+-   Fix stepper styling in Home template sidebar. ([52025](https://github.com/WordPress/gutenberg/pull/52025))
+-   Get the top toolbar preference from the correct scope. ([51840](https://github.com/WordPress/gutenberg/pull/51840))
+-   Hide word count and reading time meta data for the Posts Page details panel. ([52186](https://github.com/WordPress/gutenberg/pull/52186))
+-   Modal: Add small top padding to the content so that avoid cutting off the visible outline when hovering items. ([51829](https://github.com/WordPress/gutenberg/pull/51829))
+-   Site Editor Frame: Ignore Spotlight in view mode. ([52262](https://github.com/WordPress/gutenberg/pull/52262))
+-   Try restoring the site editor animation. ([51956](https://github.com/WordPress/gutenberg/pull/51956))
 
 #### Patterns
-- Fix custom patterns console error. ([51947](https://github.com/WordPress/gutenberg/pull/51947))
-- Fix history back after entering edit mode from Patterns. ([52112](https://github.com/WordPress/gutenberg/pull/52112))
-- Fix setting of sync status for fully synced patterns. ([51952](https://github.com/WordPress/gutenberg/pull/51952))
-- Fix sidebar tab label. ([51953](https://github.com/WordPress/gutenberg/pull/51953))
-- Fix: Pattern focus mode DocumentActions should use the pattern icon. ([52031](https://github.com/WordPress/gutenberg/pull/52031))
-- Include template parts for custom areas in Uncategorized category. ([52159](https://github.com/WordPress/gutenberg/pull/52159))
-- Remove ability for user to toggle sync status after pattern creation. ([51998](https://github.com/WordPress/gutenberg/pull/51998))
-- Rename sync_status and move to top level field on rest return instead of a meta field. ([52146](https://github.com/WordPress/gutenberg/pull/52146))
+
+-   Fix custom patterns console error. ([51947](https://github.com/WordPress/gutenberg/pull/51947))
+-   Fix history back after entering edit mode from Patterns. ([52112](https://github.com/WordPress/gutenberg/pull/52112))
+-   Fix setting of sync status for fully synced patterns. ([51952](https://github.com/WordPress/gutenberg/pull/51952))
+-   Fix sidebar tab label. ([51953](https://github.com/WordPress/gutenberg/pull/51953))
+-   Fix: Pattern focus mode DocumentActions should use the pattern icon. ([52031](https://github.com/WordPress/gutenberg/pull/52031))
+-   Include template parts for custom areas in Uncategorized category. ([52159](https://github.com/WordPress/gutenberg/pull/52159))
+-   Remove ability for user to toggle sync status after pattern creation. ([51998](https://github.com/WordPress/gutenberg/pull/51998))
+-   Rename sync_status and move to top level field on rest return instead of a meta field. ([52146](https://github.com/WordPress/gutenberg/pull/52146))
 
 #### Interactivity API
-- Block Image: Lightbox - Hide animation selector if behavior is Default or None. ([51748](https://github.com/WordPress/gutenberg/pull/51748))
-- Image block: Fix responsive sizing in lightbox. ([51823](https://github.com/WordPress/gutenberg/pull/51823))
-- Image block: Lightbox animation improvements. ([51721](https://github.com/WordPress/gutenberg/pull/51721))
-- Navigation block: Check that the modal is set before using `contains`. ([51962](https://github.com/WordPress/gutenberg/pull/51962))
+
+-   Block Image: Lightbox - Hide animation selector if behavior is Default or None. ([51748](https://github.com/WordPress/gutenberg/pull/51748))
+-   Image block: Fix responsive sizing in lightbox. ([51823](https://github.com/WordPress/gutenberg/pull/51823))
+-   Image block: Lightbox animation improvements. ([51721](https://github.com/WordPress/gutenberg/pull/51721))
+-   Navigation block: Check that the modal is set before using `contains`. ([51962](https://github.com/WordPress/gutenberg/pull/51962))
 
 #### Accessibility
-- Fix incorrect aria-describedby attributes for theme patterns. ([52263](https://github.com/WordPress/gutenberg/pull/52263))
-- Guide: Place focus on the guide's container instead of its first tabbable. ([52300](https://github.com/WordPress/gutenberg/pull/52300))
-- Site Editor: Update headings hierarchy in the 'Manage all' screens. ([52271](https://github.com/WordPress/gutenberg/pull/52271))
+
+-   Fix incorrect aria-describedby attributes for theme patterns. ([52263](https://github.com/WordPress/gutenberg/pull/52263))
+-   Guide: Place focus on the guide's container instead of its first tabbable. ([52300](https://github.com/WordPress/gutenberg/pull/52300))
+-   Site Editor: Update headings hierarchy in the 'Manage all' screens. ([52271](https://github.com/WordPress/gutenberg/pull/52271))
 
 #### Global Styles
-- Check if experiment enabled for realsies this time. ([52315](https://github.com/WordPress/gutenberg/pull/52315))
-- Check randomizer experiment is enabled before rendering button. ([52306](https://github.com/WordPress/gutenberg/pull/52306))
+
+-   Check if experiment enabled for realsies this time. ([52315](https://github.com/WordPress/gutenberg/pull/52315))
+-   Check randomizer experiment is enabled before rendering button. ([52306](https://github.com/WordPress/gutenberg/pull/52306))
 
 #### Navigation Menu Sidebar
-- Make the entire preview clickable in order to enter "edit" mode in focus mode. ([51973](https://github.com/WordPress/gutenberg/pull/51973))
-- Restore sidebar in focus mode on Pattern click through in Browse Mode `Library`. ([51897](https://github.com/WordPress/gutenberg/pull/51897))
+
+-   Make the entire preview clickable in order to enter "edit" mode in focus mode. ([51973](https://github.com/WordPress/gutenberg/pull/51973))
+-   Restore sidebar in focus mode on Pattern click through in Browse Mode `Library`. ([51897](https://github.com/WordPress/gutenberg/pull/51897))
 
 #### Page Content Focus
-- Hide parent selector when parent's block editing mode is 'disabled' or 'contentOnly'. ([52264](https://github.com/WordPress/gutenberg/pull/52264))
+
+-   Hide parent selector when parent's block editing mode is 'disabled' or 'contentOnly'. ([52264](https://github.com/WordPress/gutenberg/pull/52264))
 
 #### Post Editor
-- Editor: Avoid remounting pre-publish sidebar contents during autosave. ([52208](https://github.com/WordPress/gutenberg/pull/52208))
+
+-   Editor: Avoid remounting pre-publish sidebar contents during autosave. ([52208](https://github.com/WordPress/gutenberg/pull/52208))
 
 #### Block Editor
-- Enable draft entity creation in Nav block offcanvas. ([52166](https://github.com/WordPress/gutenberg/pull/52166))
+
+-   Enable draft entity creation in Nav block offcanvas. ([52166](https://github.com/WordPress/gutenberg/pull/52166))
 
 #### History
-- Update the behavior of the cached undo/redo stack. ([51644](https://github.com/WordPress/gutenberg/pull/51644))
+
+-   Update the behavior of the cached undo/redo stack. ([51644](https://github.com/WordPress/gutenberg/pull/51644))
 
 #### Components
-- DropdownMenu: Fix icon style when dashicon is used. ([43574](https://github.com/WordPress/gutenberg/pull/43574))
 
+-   DropdownMenu: Fix icon style when dashicon is used. ([43574](https://github.com/WordPress/gutenberg/pull/43574))
 
 ### Performance
 
-- Migrate performance tests to Playwright. ([51084](https://github.com/WordPress/gutenberg/pull/51084))
-- Social links: Reverts updating class and style attributes. ([52019](https://github.com/WordPress/gutenberg/pull/52019))
-- tests: Configure as a production environment. ([52016](https://github.com/WordPress/gutenberg/pull/52016))
+-   Migrate performance tests to Playwright. ([51084](https://github.com/WordPress/gutenberg/pull/51084))
+-   Social links: Reverts updating class and style attributes. ([52019](https://github.com/WordPress/gutenberg/pull/52019))
+-   tests: Configure as a production environment. ([52016](https://github.com/WordPress/gutenberg/pull/52016))
 
 #### Block Library
-- Try: Aggressive TinyMCE deprecation. ([50387](https://github.com/WordPress/gutenberg/pull/50387))
 
+-   Try: Aggressive TinyMCE deprecation. ([50387](https://github.com/WordPress/gutenberg/pull/50387))
 
 ### Experiments
 
 #### Interactivity API
-- Create @wordpress/interactivity with the Interactivity API. ([50906](https://github.com/WordPress/gutenberg/pull/50906))
 
+-   Create @wordpress/interactivity with the Interactivity API. ([50906](https://github.com/WordPress/gutenberg/pull/50906))
 
 ### Documentation
 
-- Add @examples to the @wordpress/rich-text package selectors and hide the actions from documentation. ([52089](https://github.com/WordPress/gutenberg/pull/52089))
-- Add examples for core/keyboard-shortcut package. ([42831](https://github.com/WordPress/gutenberg/pull/42831))
-- Block Editor: Add README for FontFamilyControl component. ([52118](https://github.com/WordPress/gutenberg/pull/52118))
-- Block Editor: Add README for `PanelColorSettings` component. ([52327](https://github.com/WordPress/gutenberg/pull/52327))
-- Block Editor: Add README for `RecursionProvider`. ([52334](https://github.com/WordPress/gutenberg/pull/52334))
-- Docs: Update release documentation to use the right cherry-picking command. ([51935](https://github.com/WordPress/gutenberg/pull/51935))
-
+-   Add @examples to the @wordpress/rich-text package selectors and hide the actions from documentation. ([52089](https://github.com/WordPress/gutenberg/pull/52089))
+-   Add examples for core/keyboard-shortcut package. ([42831](https://github.com/WordPress/gutenberg/pull/42831))
+-   Block Editor: Add README for FontFamilyControl component. ([52118](https://github.com/WordPress/gutenberg/pull/52118))
+-   Block Editor: Add README for `PanelColorSettings` component. ([52327](https://github.com/WordPress/gutenberg/pull/52327))
+-   Block Editor: Add README for `RecursionProvider`. ([52334](https://github.com/WordPress/gutenberg/pull/52334))
+-   Docs: Update release documentation to use the right cherry-picking command. ([51935](https://github.com/WordPress/gutenberg/pull/51935))
 
 ### Code Quality
 
-- Lodash: Refactor away from `_.kebabCase()` in `getCleanTemplatePartSlug`. ([51906](https://github.com/WordPress/gutenberg/pull/51906))
-- Lodash: Refactor away from `_.kebabCase()` in add page modal. ([51911](https://github.com/WordPress/gutenberg/pull/51911))
-- Lodash: Refactor away from `_.kebabCase()` in generic template modal. ([51910](https://github.com/WordPress/gutenberg/pull/51910))
-- Lodash: Remove completely from `@wordpress/style-engine` package. ([51726](https://github.com/WordPress/gutenberg/pull/51726))
+-   Lodash: Refactor away from `_.kebabCase()` in `getCleanTemplatePartSlug`. ([51906](https://github.com/WordPress/gutenberg/pull/51906))
+-   Lodash: Refactor away from `_.kebabCase()` in add page modal. ([51911](https://github.com/WordPress/gutenberg/pull/51911))
+-   Lodash: Refactor away from `_.kebabCase()` in generic template modal. ([51910](https://github.com/WordPress/gutenberg/pull/51910))
+-   Lodash: Remove completely from `@wordpress/style-engine` package. ([51726](https://github.com/WordPress/gutenberg/pull/51726))
 
 #### Block Library
-- Heading Block: Remove unused `HeadingLevelIcon` component. ([52008](https://github.com/WordPress/gutenberg/pull/52008))
-- Image block and behaviors: Fix some warnings. ([52109](https://github.com/WordPress/gutenberg/pull/52109))
-- Lodash: Refactor embed block away from `_.kebabCase()`. ([51916](https://github.com/WordPress/gutenberg/pull/51916))
-- Lodash: Remove dependency from block library package. ([51976](https://github.com/WordPress/gutenberg/pull/51976))
-- Make Navigation fallback selector private. ([51413](https://github.com/WordPress/gutenberg/pull/51413))
-- Page List: Fix ESLint warnings. ([52267](https://github.com/WordPress/gutenberg/pull/52267))
-- Refactor, document, and fix image block deprecations. ([52081](https://github.com/WordPress/gutenberg/pull/52081))
+
+-   Heading Block: Remove unused `HeadingLevelIcon` component. ([52008](https://github.com/WordPress/gutenberg/pull/52008))
+-   Image block and behaviors: Fix some warnings. ([52109](https://github.com/WordPress/gutenberg/pull/52109))
+-   Lodash: Refactor embed block away from `_.kebabCase()`. ([51916](https://github.com/WordPress/gutenberg/pull/51916))
+-   Lodash: Remove dependency from block library package. ([51976](https://github.com/WordPress/gutenberg/pull/51976))
+-   Make Navigation fallback selector private. ([51413](https://github.com/WordPress/gutenberg/pull/51413))
+-   Page List: Fix ESLint warnings. ([52267](https://github.com/WordPress/gutenberg/pull/52267))
+-   Refactor, document, and fix image block deprecations. ([52081](https://github.com/WordPress/gutenberg/pull/52081))
 
 #### Page Content Focus
-- Add basic test for the page content focus flow. ([52231](https://github.com/WordPress/gutenberg/pull/52231))
+
+-   Add basic test for the page content focus flow. ([52231](https://github.com/WordPress/gutenberg/pull/52231))
 
 #### List View
-- Return primitive value for 'hideInserter' in Appender component. ([52161](https://github.com/WordPress/gutenberg/pull/52161))
+
+-   Return primitive value for 'hideInserter' in Appender component. ([52161](https://github.com/WordPress/gutenberg/pull/52161))
 
 #### Interactivity API
-- Fix the `exsisting` -> `existing` typo. ([52110](https://github.com/WordPress/gutenberg/pull/52110))
+
+-   Fix the `exsisting` -> `existing` typo. ([52110](https://github.com/WordPress/gutenberg/pull/52110))
 
 #### Navigation Menu Sidebar
-- Remove redundant call to Navigation selector in Browse Mode. ([51988](https://github.com/WordPress/gutenberg/pull/51988))
+
+-   Remove redundant call to Navigation selector in Browse Mode. ([51988](https://github.com/WordPress/gutenberg/pull/51988))
 
 #### Site Editor
-- Block removal prompt: Let consumers pass their own rules. ([51841](https://github.com/WordPress/gutenberg/pull/51841))
+
+-   Block removal prompt: Let consumers pass their own rules. ([51841](https://github.com/WordPress/gutenberg/pull/51841))
 
 #### Block Editor
-- Revise LinkControl suggestions UI to use MenuItem. ([50978](https://github.com/WordPress/gutenberg/pull/50978))
 
+-   Revise LinkControl suggestions UI to use MenuItem. ([50978](https://github.com/WordPress/gutenberg/pull/50978))
 
 ### Tools
 
 #### Testing
-- Drops PHP 5.6 CI jobs. ([52345](https://github.com/WordPress/gutenberg/pull/52345))
-- Fix flakiness of saving entities in the site editor. ([51728](https://github.com/WordPress/gutenberg/pull/51728))
-- Fix flaky Site Editor pages end-to-end test. ([52283](https://github.com/WordPress/gutenberg/pull/52283))
-- Have `createNewPost` wait for editor canvas contents. ([51824](https://github.com/WordPress/gutenberg/pull/51824))
+
+-   Drops PHP 5.6 CI jobs. ([52345](https://github.com/WordPress/gutenberg/pull/52345))
+-   Fix flakiness of saving entities in the site editor. ([51728](https://github.com/WordPress/gutenberg/pull/51728))
+-   Fix flaky Site Editor pages end-to-end test. ([52283](https://github.com/WordPress/gutenberg/pull/52283))
+-   Have `createNewPost` wait for editor canvas contents. ([51824](https://github.com/WordPress/gutenberg/pull/51824))
 
 #### Build Tooling
-- Fix phpunit failures. ([51950](https://github.com/WordPress/gutenberg/pull/51950))
-- Use moment-timezone-data-webpack-plugin to optimize timezones shipped in wp/date. ([51519](https://github.com/WordPress/gutenberg/pull/51519))
 
+-   Fix phpunit failures. ([51950](https://github.com/WordPress/gutenberg/pull/51950))
+-   Use moment-timezone-data-webpack-plugin to optimize timezones shipped in wp/date. ([51519](https://github.com/WordPress/gutenberg/pull/51519))
 
 ### Various
 
-- Add caching to schema of REST API. ([52045](https://github.com/WordPress/gutenberg/pull/52045))
-- Add code owners for the Interactivity API runtime. ([52174](https://github.com/WordPress/gutenberg/pull/52174))
-- Backport from core: Rename `gutenberg_get_remote_theme_patterns` to `gutenberg_get_theme_directory_pattern_slugs`. ([51784](https://github.com/WordPress/gutenberg/pull/51784))
-- Block editor store: Also attach private APIs to old store descriptor. ([52088](https://github.com/WordPress/gutenberg/pull/52088))
-- Blocks: Remove gutenberg refs in PHP files. ([51978](https://github.com/WordPress/gutenberg/pull/51978))
-- Command palette: Rename. ([52153](https://github.com/WordPress/gutenberg/pull/52153))
-- Drop-indicator: Remove white border. ([52122](https://github.com/WordPress/gutenberg/pull/52122))
-- First version of the Interactivity API README. ([52104](https://github.com/WordPress/gutenberg/pull/52104))
-- Global Styles Revisions API: Backport changes from Core. ([52095](https://github.com/WordPress/gutenberg/pull/52095))
-- Global Styles Sidebar: Re-add Colors: Heading to selected blocks. ([49131](https://github.com/WordPress/gutenberg/pull/49131))
-- Image block: Update lightbox animation tests. ([52290](https://github.com/WordPress/gutenberg/pull/52290))
-- Patterns: Update section heading levels. ([52273](https://github.com/WordPress/gutenberg/pull/52273))
-- Perf logging: Change date to ISO 8601. ([51833](https://github.com/WordPress/gutenberg/pull/51833))
-- Refactor use-tab-nav shift+tab to use existing utils. ([51817](https://github.com/WordPress/gutenberg/pull/51817))
-- Remove serverSideBlockDefinitions from a test. ([52215](https://github.com/WordPress/gutenberg/pull/52215))
-- Restore "Buttons > can resize width" test. ([51865](https://github.com/WordPress/gutenberg/pull/51865))
-- Update delete page button label. ([51812](https://github.com/WordPress/gutenberg/pull/51812))
-- Update versions in WP for 6.3. ([51984](https://github.com/WordPress/gutenberg/pull/51984))
-- Wrap "Move to trash" and "Switch to draft" buttons when labels are too long to fit on a single row. ([52249](https://github.com/WordPress/gutenberg/pull/52249))
-- [Github-Actions-Workflows][Plugin-Release] Allow shipping a point-release for an older stable release. ([49082](https://github.com/WordPress/gutenberg/pull/49082))
-
-#### Block Library
-- Block Editor: Unify texts for Create pattern modal. ([52151](https://github.com/WordPress/gutenberg/pull/52151))
-- Block Supports: Change prefix in gutenberg_apply_colors_support to wp_ in dynamic blocks. ([51989](https://github.com/WordPress/gutenberg/pull/51989))
-- Navigation in Site View: Readd the edit button. ([52111](https://github.com/WordPress/gutenberg/pull/52111))
-- Navigation submenu: Remove unused doc block. ([52152](https://github.com/WordPress/gutenberg/pull/52152))
-- Page List: Change modal text. ([52116](https://github.com/WordPress/gutenberg/pull/52116))
-- i18n: Add context to the word "Filters". ([52198](https://github.com/WordPress/gutenberg/pull/52198))
+-   Add caching to schema of REST API. ([52045](https://github.com/WordPress/gutenberg/pull/52045))
+-   Add code owners for the Interactivity API runtime. ([52174](https://github.com/WordPress/gutenberg/pull/52174))
+-   Backport from core: Rename `gutenberg_get_remote_theme_patterns` to `gutenberg_get_theme_directory_pattern_slugs`. ([51784](https://github.com/WordPress/gutenberg/pull/51784))
+-   Block editor store: Also attach private APIs to old store descriptor. ([52088](https://github.com/WordPress/gutenberg/pull/52088))
+-   Blocks: Remove gutenberg refs in PHP files. ([51978](https://github.com/WordPress/gutenberg/pull/51978))
+-   Command palette: Rename. ([52153](https://github.com/WordPress/gutenberg/pull/52153))
+-   Drop-indicator: Remove white border. ([52122](https://github.com/WordPress/gutenberg/pull/52122))
+-   First version of the Interactivity API README. ([52104](https://github.com/WordPress/gutenberg/pull/52104))
+-   Global Styles Revisions API: Backport changes from Core. ([52095](https://github.com/WordPress/gutenberg/pull/52095))
+-   Global Styles Sidebar: Re-add Colors: Heading to selected blocks. ([49131](https://github.com/WordPress/gutenberg/pull/49131))
+-   Image block: Update lightbox animation tests. ([52290](https://github.com/WordPress/gutenberg/pull/52290))
+-   Patterns: Update section heading levels. ([52273](https://github.com/WordPress/gutenberg/pull/52273))
+-   Perf logging: Change date to ISO 8601. ([51833](https://github.com/WordPress/gutenberg/pull/51833))
+-   Refactor use-tab-nav shift+tab to use existing utils. ([51817](https://github.com/WordPress/gutenberg/pull/51817))
+-   Remove serverSideBlockDefinitions from a test. ([52215](https://github.com/WordPress/gutenberg/pull/52215))
+-   Restore "Buttons > can resize width" test. ([51865](https://github.com/WordPress/gutenberg/pull/51865))
+-   Update delete page button label. ([51812](https://github.com/WordPress/gutenberg/pull/51812))
+-   Update versions in WP for 6.3. ([51984](https://github.com/WordPress/gutenberg/pull/51984))
+-   Wrap "Move to trash" and "Switch to draft" buttons when labels are too long to fit on a single row. ([52249](https://github.com/WordPress/gutenberg/pull/52249))
+-   [GitHub-Actions-Workflows][Plugin-Release] Allow shipping a point-release for an older stable release. ([49082](https://github.com/WordPress/gutenberg/pull/49082))
+
+#### Block Library
+
+-   Block Editor: Unify texts for Create pattern modal. ([52151](https://github.com/WordPress/gutenberg/pull/52151))
+-   Block Supports: Change prefix in gutenberg*apply_colors_support to wp* in dynamic blocks. ([51989](https://github.com/WordPress/gutenberg/pull/51989))
+-   Navigation in Site View: Readd the edit button. ([52111](https://github.com/WordPress/gutenberg/pull/52111))
+-   Navigation submenu: Remove unused doc block. ([52152](https://github.com/WordPress/gutenberg/pull/52152))
+-   Page List: Change modal text. ([52116](https://github.com/WordPress/gutenberg/pull/52116))
+-   i18n: Add context to the word "Filters". ([52198](https://github.com/WordPress/gutenberg/pull/52198))
 
 #### Site Editor
-- Library: Update icons in the creation menu. ([52108](https://github.com/WordPress/gutenberg/pull/52108))
-- Polish welcome guide copy for page / template editing. ([52282](https://github.com/WordPress/gutenberg/pull/52282))
-- Try: Update template titles. ([51428](https://github.com/WordPress/gutenberg/pull/51428))
-- Update stepper styling in Home template details panel. ([51972](https://github.com/WordPress/gutenberg/pull/51972))
-- Update text color of active menu items. ([51965](https://github.com/WordPress/gutenberg/pull/51965))
+
+-   Library: Update icons in the creation menu. ([52108](https://github.com/WordPress/gutenberg/pull/52108))
+-   Polish welcome guide copy for page / template editing. ([52282](https://github.com/WordPress/gutenberg/pull/52282))
+-   Try: Update template titles. ([51428](https://github.com/WordPress/gutenberg/pull/51428))
+-   Update stepper styling in Home template details panel. ([51972](https://github.com/WordPress/gutenberg/pull/51972))
+-   Update text color of active menu items. ([51965](https://github.com/WordPress/gutenberg/pull/51965))
 
 #### Patterns
-- Add a hint about the rename of reusable blocks to menu and inserter. ([51771](https://github.com/WordPress/gutenberg/pull/51771))
-- Copy: "Detach pattern" instead of "Covert to regular block". ([51993](https://github.com/WordPress/gutenberg/pull/51993))
-- Library: Reinstate manage all template parts page. ([51961](https://github.com/WordPress/gutenberg/pull/51961))
-- [Library] Add lock icon for theme patterns. ([51990](https://github.com/WordPress/gutenberg/pull/51990))
+
+-   Add a hint about the rename of reusable blocks to menu and inserter. ([51771](https://github.com/WordPress/gutenberg/pull/51771))
+-   Copy: "Detach pattern" instead of "Covert to regular block". ([51993](https://github.com/WordPress/gutenberg/pull/51993))
+-   Library: Reinstate manage all template parts page. ([51961](https://github.com/WordPress/gutenberg/pull/51961))
+-   [Library] Add lock icon for theme patterns. ([51990](https://github.com/WordPress/gutenberg/pull/51990))
 
 #### Accessibility
-- Navigation block: Do not toggle aria-expanded on hover when the overlay menu is opened. ([52170](https://github.com/WordPress/gutenberg/pull/52170))
-- Navigation block: Don't close submenu when it has focus. ([52177](https://github.com/WordPress/gutenberg/pull/52177))
+
+-   Navigation block: Do not toggle aria-expanded on hover when the overlay menu is opened. ([52170](https://github.com/WordPress/gutenberg/pull/52170))
+-   Navigation block: Don't close submenu when it has focus. ([52177](https://github.com/WordPress/gutenberg/pull/52177))
 
 #### Widgets Editor
-- Export the store for the core/edit-widgets pacakage. ([52190](https://github.com/WordPress/gutenberg/pull/52190))
+
+-   Export the store for the core/edit-widgets pacakage. ([52190](https://github.com/WordPress/gutenberg/pull/52190))
 
 #### Post Editor
-- Move block editor settings filter into 6.3 compat folder. ([52100](https://github.com/WordPress/gutenberg/pull/52100))
+
+-   Move block editor settings filter into 6.3 compat folder. ([52100](https://github.com/WordPress/gutenberg/pull/52100))
 
 #### Layout
-- Move grid function kses patch into 6.3 compat folder. ([52098](https://github.com/WordPress/gutenberg/pull/52098))
+
+-   Move grid function kses patch into 6.3 compat folder. ([52098](https://github.com/WordPress/gutenberg/pull/52098))
 
 #### Data Layer
-- hasResolvingSelectors: Exclude from result of resolveSelect. ([52038](https://github.com/WordPress/gutenberg/pull/52038))
+
+-   hasResolvingSelectors: Exclude from result of resolveSelect. ([52038](https://github.com/WordPress/gutenberg/pull/52038))
 
 #### Icons
-- Remove fill="none" from pinSmall icon. ([51979](https://github.com/WordPress/gutenberg/pull/51979))
 
-#### Navigation Menu Sidebar
-- Sidebar Navigation: Refactor delete modal with `ConfirmDialog` component. ([51867](https://github.com/WordPress/gutenberg/pull/51867))
+-   Remove fill="none" from pinSmall icon. ([51979](https://github.com/WordPress/gutenberg/pull/51979))
 
-#### Templates API
-- Template revisions API: Move back to experimental. ([51774](https://github.com/WordPress/gutenberg/pull/51774))
+#### Navigation Menu Sidebar
 
+-   Sidebar Navigation: Refactor delete modal with `ConfirmDialog` component. ([51867](https://github.com/WordPress/gutenberg/pull/51867))
 
+#### Templates API
 
+-   Template revisions API: Move back to experimental. ([51774](https://github.com/WordPress/gutenberg/pull/51774))
 
 ## Contributors
 
@@ -4386,7 +15285,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @ajlende @annezazu @artemiomorales @c4rl0sbr4v0 @carolinan @DAreRodz @dcalhoun @draganescu @ellatrix @fullofcaffeine @getdave @glendaviesnz @hellofromtonya @jameskoster @jasmussen @jeryj @jsnajdr @juanfra @juanmaguitar @kevin940726 @luisherranz @Mamaduka @mcsf @michalczaplinski @miminari @noisysocks @ntsekouras @oandregal @ockham @priethor @ramonjd @richtabor @ryanwelcher @SaxonF @scruffian @spacedmonkey @stokesman @t-hamano @talldan @tellthemachines @tyxla @WunderBart @youknowriad
 
-
 = 16.1.1 =
 
 ## Changelog
@@ -4395,19 +15293,19 @@ The following contributors merged PRs in this release:
 
 #### Patterns
 
-- Remove ability for user to toggle sync status after pattern creation. This is because changing the sync status can have unintended consequences on existing instances of the block. ([52230](https://github.com/WordPress/gutenberg/pull/52230))
+-   Remove ability for user to toggle sync status after pattern creation. This is because changing the sync status can have unintended consequences on existing instances of the block. ([52230](https://github.com/WordPress/gutenberg/pull/52230))
 
 ### Code Quality
 
 #### Patterns
 
-- Rename sync_status postmeta from `sync_status` to `wp_pattern_sync_status` to avoid clashes with custom plugin fields. ([52232](https://github.com/WordPress/gutenberg/pull/52232))
+-   Rename sync_status postmeta from `sync_status` to `wp_pattern_sync_status` to avoid clashes with custom plugin fields. ([52232](https://github.com/WordPress/gutenberg/pull/52232))
 
 ### Bugs
 
 #### Patterns
 
--  Fix issue with wrong sync status being set in the Site Editor when adding new synced patterns. ([52229 ](https://github.com/WordPress/gutenberg/pull/52229))
+-   Fix issue with wrong sync status being set in the Site Editor when adding new synced patterns. ([52229 ](https://github.com/WordPress/gutenberg/pull/52229))
 
 ## Contributors
 
@@ -4415,7 +15313,6 @@ The following contributors merged PRs in this release:
 
 @glendaviesnz
 
-
 = 16.1.0 =
 
 ## Changelog
@@ -4423,401 +15320,457 @@ The following contributors merged PRs in this release:
 ### Features
 
 #### Navigation Menu Sidebar
-- Add focus mode for Navigation Menus. ([39286](https://github.com/WordPress/gutenberg/pull/39286))
-- Allow renaming, duplication and deleting of Navigation menus from Browse Mode Sidebar. ([50880](https://github.com/WordPress/gutenberg/pull/50880))
+
+-   Add focus mode for Navigation Menus. ([39286](https://github.com/WordPress/gutenberg/pull/39286))
+-   Allow renaming, duplication and deleting of Navigation menus from Browse Mode Sidebar. ([50880](https://github.com/WordPress/gutenberg/pull/50880))
 
 #### Block Library
-- Add Navigation Menus to Template Parts screen sidebar in Browse Mode. ([51492](https://github.com/WordPress/gutenberg/pull/51492))
-- Add Footnotes block to text blocks. ([51201](https://github.com/WordPress/gutenberg/pull/51201))
+
+-   Add Navigation Menus to Template Parts screen sidebar in Browse Mode. ([51492](https://github.com/WordPress/gutenberg/pull/51492))
+-   Add Footnotes block to text blocks. ([51201](https://github.com/WordPress/gutenberg/pull/51201))
 
 #### Patterns
-- Allow for filtering of block patterns by source. ([51672](https://github.com/WordPress/gutenberg/pull/51672))
-- Reusable blocks: Rename to 'Patterns' and add option to also add a non-synced Pattern. ([51144](https://github.com/WordPress/gutenberg/pull/51144))
-- Site Editor: Add Library for Template Parts & Patterns Management. ([51078](https://github.com/WordPress/gutenberg/pull/51078))
+
+-   Allow for filtering of block patterns by source. ([51672](https://github.com/WordPress/gutenberg/pull/51672))
+-   Reusable blocks: Rename to 'Patterns' and add option to also add a non-synced Pattern. ([51144](https://github.com/WordPress/gutenberg/pull/51144))
+-   Site Editor: Add Library for Template Parts & Patterns Management. ([51078](https://github.com/WordPress/gutenberg/pull/51078))
 
 #### Themes
-- Remove the experiment option for Block Theme Previews. ([50983](https://github.com/WordPress/gutenberg/pull/50983))
+
+-   Remove the experiment option for Block Theme Previews. ([50983](https://github.com/WordPress/gutenberg/pull/50983))
 
 #### Site Editor
-- Add distraction free to site editor [51173](https://github.com/WordPress/gutenberg/pull/51173)
+
+-   Add distraction free to site editor [51173](https://github.com/WordPress/gutenberg/pull/51173)
 
 ### Enhancements
 
 #### Site Editor
-- Edit Site: Make admin background consistent with layout. ([51741](https://github.com/WordPress/gutenberg/pull/51741))
-- Edit Site: Remove first loading spinner. ([51736](https://github.com/WordPress/gutenberg/pull/51736))
-- Edit Site: Use global background color while loading. ([51709](https://github.com/WordPress/gutenberg/pull/51709))
-- Improve guidance to editing template when focused on editing a page. ([51366](https://github.com/WordPress/gutenberg/pull/51366))
-- Only show view site link in view mode. ([51279](https://github.com/WordPress/gutenberg/pull/51279))
-- Page Details View: Show featured image only if there is one. ([51649](https://github.com/WordPress/gutenberg/pull/51649))
-- Page Details View: Show parent only if there is one. ([51648](https://github.com/WordPress/gutenberg/pull/51648))
-- Site editor sidebar: Home template details. ([51223](https://github.com/WordPress/gutenberg/pull/51223))
-- Navigation on Browse Mode: Move the action to the leaf menu. ([50843](https://github.com/WordPress/gutenberg/pull/50843))
-- Remove Taxonomy as an option in the add template flow. ([51586](https://github.com/WordPress/gutenberg/pull/51586))
-- Remove shadows in Site Editor sidebar. ([51546](https://github.com/WordPress/gutenberg/pull/51546))
-- Show warning on critical block removal. ([51145](https://github.com/WordPress/gutenberg/pull/51145))
-- Site editor navigation: Use chevron left in RTL mode. ([51588](https://github.com/WordPress/gutenberg/pull/51588))
-- Add ability to set status, publish date and password in site editor. ([51408](https://github.com/WordPress/gutenberg/pull/51408))
-- Add table view to manage templates page. ([50766](https://github.com/WordPress/gutenberg/pull/50766))
-- Update Library panel footer. ([51652](https://github.com/WordPress/gutenberg/pull/51652))
-- Update page list footer. ([51438](https://github.com/WordPress/gutenberg/pull/51438))
-- List draft navigations in Browse mode Navigation section. ([51422](https://github.com/WordPress/gutenberg/pull/51422))
-- Show actions for empty menus in Navigation on Browse mode. ([51420](https://github.com/WordPress/gutenberg/pull/51420))
-- Unify welcome guides labels casing. ([51700](https://github.com/WordPress/gutenberg/pull/51700))
-- Site editor sidebar: Add footer to template part and ensure nested template areas display. ([51669](https://github.com/WordPress/gutenberg/pull/51669))
-- Update colors in 'Site view'. ([51856](https://github.com/WordPress/gutenberg/pull/51856))
-- Site Editor: Make string to add Template parts and Patterns consistent and translatable [51743](https://github.com/WordPress/gutenberg/pull/51743)
-
-#### Components
-- ItemGroup: Update button focus styles to be more consistent. ([51576](https://github.com/WordPress/gutenberg/pull/51576))
-- Toolbar: Use Ariakit instead of Reakit. ([51623](https://github.com/WordPress/gutenberg/pull/51623))
-- Update: Adjust modal radius to be between frame and buttons. ([51254](https://github.com/WordPress/gutenberg/pull/51254))
-- UnitControl: Revamp support for changing unit by typing. ([39303](https://github.com/WordPress/gutenberg/pull/39303))
-- Move HeadinglevelDropdown to its own component. ([46003](https://github.com/WordPress/gutenberg/pull/46003))
-- Button: Introduce size prop [51842](https://github.com/WordPress/gutenberg/pull/51842)
-
-#### Block Editor
-- List View: Try showing blocks that are dragged (no longer hide them). ([51724](https://github.com/WordPress/gutenberg/pull/51724))
-- Updated unstyled Button hover selector to change fill of svg and path element. ([50819](https://github.com/WordPress/gutenberg/pull/50819))
-- Writing Flow: Allow Escape key to deselect blocks and selection during multiselection. ([48904](https://github.com/WordPress/gutenberg/pull/48904))
-- Change "Copy block" to "Copy". ([51532](https://github.com/WordPress/gutenberg/pull/51532))
-- Limit Copy/Paste Styles menu item. ([51503](https://github.com/WordPress/gutenberg/pull/51503))
-- Force disable suggestions until URL field is dirty in Link Control. ([51354](https://github.com/WordPress/gutenberg/pull/51354))
-- Top toolbar: Refine the icons on the right. ([51735](https://github.com/WordPress/gutenberg/pull/51735))
-- Improve LinkControl Edit UI. ([51712](https://github.com/WordPress/gutenberg/pull/51712))
-
-#### Block Library
-- List block: Add numbering type selection. ([51186](https://github.com/WordPress/gutenberg/pull/51186))
-- Patterns: Removes the pattern experiment. ([51719](https://github.com/WordPress/gutenberg/pull/51719))
-- Remove `accordion` from details block keywords. ([51597](https://github.com/WordPress/gutenberg/pull/51597))
-- Add init modules to details and post-time-to-read blocks. ([51606](https://github.com/WordPress/gutenberg/pull/51606))
-- Improve logic in `render_block_core_template_part`. ([50636](https://github.com/WordPress/gutenberg/pull/50636))
-- Indicate Draft status of menus in Nav block menu selector. ([51427](https://github.com/WordPress/gutenberg/pull/51427))
-- Mobile - Image block - Fix issue with set width and height images. ([51463](https://github.com/WordPress/gutenberg/pull/51463))
-- Navigation: Remove destructive colors from modal. ([51691](https://github.com/WordPress/gutenberg/pull/51691))
-- Pass the block to the onGoToPage function. ([51699](https://github.com/WordPress/gutenberg/pull/51699))
-- Post Author - don't show 0 in inspector controls. ([51345](https://github.com/WordPress/gutenberg/pull/51345))
-- Remove anchor support from dynamic blocks. ([51288](https://github.com/WordPress/gutenberg/pull/51288))
-- Site Tagline Block: Remove unnecessary square path from block icon SVG. ([51611](https://github.com/WordPress/gutenberg/pull/51611))
-- Add image block aspect ratio control [51545](https://github.com/WordPress/gutenberg/pull/51545)
-- Updating social link attributes [51997](https://github.com/WordPress/gutenberg/pull/51997)
+
+-   Edit Site: Make admin background consistent with layout. ([51741](https://github.com/WordPress/gutenberg/pull/51741))
+-   Edit Site: Remove first loading spinner. ([51736](https://github.com/WordPress/gutenberg/pull/51736))
+-   Edit Site: Use global background color while loading. ([51709](https://github.com/WordPress/gutenberg/pull/51709))
+-   Improve guidance to editing template when focused on editing a page. ([51366](https://github.com/WordPress/gutenberg/pull/51366))
+-   Only show view site link in view mode. ([51279](https://github.com/WordPress/gutenberg/pull/51279))
+-   Page Details View: Show featured image only if there is one. ([51649](https://github.com/WordPress/gutenberg/pull/51649))
+-   Page Details View: Show parent only if there is one. ([51648](https://github.com/WordPress/gutenberg/pull/51648))
+-   Site editor sidebar: Home template details. ([51223](https://github.com/WordPress/gutenberg/pull/51223))
+-   Navigation on Browse Mode: Move the action to the leaf menu. ([50843](https://github.com/WordPress/gutenberg/pull/50843))
+-   Remove Taxonomy as an option in the add template flow. ([51586](https://github.com/WordPress/gutenberg/pull/51586))
+-   Remove shadows in Site Editor sidebar. ([51546](https://github.com/WordPress/gutenberg/pull/51546))
+-   Show warning on critical block removal. ([51145](https://github.com/WordPress/gutenberg/pull/51145))
+-   Site editor navigation: Use chevron left in RTL mode. ([51588](https://github.com/WordPress/gutenberg/pull/51588))
+-   Add ability to set status, publish date and password in site editor. ([51408](https://github.com/WordPress/gutenberg/pull/51408))
+-   Add table view to manage templates page. ([50766](https://github.com/WordPress/gutenberg/pull/50766))
+-   Update Library panel footer. ([51652](https://github.com/WordPress/gutenberg/pull/51652))
+-   Update page list footer. ([51438](https://github.com/WordPress/gutenberg/pull/51438))
+-   List draft navigations in Browse mode Navigation section. ([51422](https://github.com/WordPress/gutenberg/pull/51422))
+-   Show actions for empty menus in Navigation on Browse mode. ([51420](https://github.com/WordPress/gutenberg/pull/51420))
+-   Unify welcome guides labels casing. ([51700](https://github.com/WordPress/gutenberg/pull/51700))
+-   Site editor sidebar: Add footer to template part and ensure nested template areas display. ([51669](https://github.com/WordPress/gutenberg/pull/51669))
+-   Update colors in 'Site view'. ([51856](https://github.com/WordPress/gutenberg/pull/51856))
+-   Site Editor: Make string to add Template parts and Patterns consistent and translatable [51743](https://github.com/WordPress/gutenberg/pull/51743)
+
+#### Components
+
+-   ItemGroup: Update button focus styles to be more consistent. ([51576](https://github.com/WordPress/gutenberg/pull/51576))
+-   Toolbar: Use Ariakit instead of Reakit. ([51623](https://github.com/WordPress/gutenberg/pull/51623))
+-   Update: Adjust modal radius to be between frame and buttons. ([51254](https://github.com/WordPress/gutenberg/pull/51254))
+-   UnitControl: Revamp support for changing unit by typing. ([39303](https://github.com/WordPress/gutenberg/pull/39303))
+-   Move HeadinglevelDropdown to its own component. ([46003](https://github.com/WordPress/gutenberg/pull/46003))
+-   Button: Introduce size prop [51842](https://github.com/WordPress/gutenberg/pull/51842)
+
+#### Block Editor
+
+-   List View: Try showing blocks that are dragged (no longer hide them). ([51724](https://github.com/WordPress/gutenberg/pull/51724))
+-   Updated unstyled Button hover selector to change fill of svg and path element. ([50819](https://github.com/WordPress/gutenberg/pull/50819))
+-   Writing Flow: Allow Escape key to deselect blocks and selection during multiselection. ([48904](https://github.com/WordPress/gutenberg/pull/48904))
+-   Change "Copy block" to "Copy". ([51532](https://github.com/WordPress/gutenberg/pull/51532))
+-   Limit Copy/Paste Styles menu item. ([51503](https://github.com/WordPress/gutenberg/pull/51503))
+-   Force disable suggestions until URL field is dirty in Link Control. ([51354](https://github.com/WordPress/gutenberg/pull/51354))
+-   Top toolbar: Refine the icons on the right. ([51735](https://github.com/WordPress/gutenberg/pull/51735))
+-   Improve LinkControl Edit UI. ([51712](https://github.com/WordPress/gutenberg/pull/51712))
+
+#### Block Library
+
+-   List block: Add numbering type selection. ([51186](https://github.com/WordPress/gutenberg/pull/51186))
+-   Patterns: Removes the pattern experiment. ([51719](https://github.com/WordPress/gutenberg/pull/51719))
+-   Remove `accordion` from details block keywords. ([51597](https://github.com/WordPress/gutenberg/pull/51597))
+-   Add init modules to details and post-time-to-read blocks. ([51606](https://github.com/WordPress/gutenberg/pull/51606))
+-   Improve logic in `render_block_core_template_part`. ([50636](https://github.com/WordPress/gutenberg/pull/50636))
+-   Indicate Draft status of menus in Nav block menu selector. ([51427](https://github.com/WordPress/gutenberg/pull/51427))
+-   Mobile - Image block - Fix issue with set width and height images. ([51463](https://github.com/WordPress/gutenberg/pull/51463))
+-   Navigation: Remove destructive colors from modal. ([51691](https://github.com/WordPress/gutenberg/pull/51691))
+-   Pass the block to the onGoToPage function. ([51699](https://github.com/WordPress/gutenberg/pull/51699))
+-   Post Author - don't show 0 in inspector controls. ([51345](https://github.com/WordPress/gutenberg/pull/51345))
+-   Remove anchor support from dynamic blocks. ([51288](https://github.com/WordPress/gutenberg/pull/51288))
+-   Site Tagline Block: Remove unnecessary square path from block icon SVG. ([51611](https://github.com/WordPress/gutenberg/pull/51611))
+-   Add image block aspect ratio control [51545](https://github.com/WordPress/gutenberg/pull/51545)
+-   Updating social link attributes [51997](https://github.com/WordPress/gutenberg/pull/51997)
 
 #### Accessibility
-- Autocomplete: Announce results to screen readers when first becoming visible. ([51018](https://github.com/WordPress/gutenberg/pull/51018))
-- List View: A11Y focus enhancements for edit-site based on modifications to edit-post. ([51404](https://github.com/WordPress/gutenberg/pull/51404))
-- Add a description key to theme.json style variations. ([45242](https://github.com/WordPress/gutenberg/pull/45242))
-- Focus first focusable on Link UI. ([51105](https://github.com/WordPress/gutenberg/pull/51105))
-- BlockLockModal: restore focus on fallback toolbar button when original button is not rendered [51666](https://github.com/WordPress/gutenberg/pull/51666)
-- Site Editor Sidebar: improvements to buttons [51762](https://github.com/WordPress/gutenberg/pull/51762)
+
+-   Autocomplete: Announce results to screen readers when first becoming visible. ([51018](https://github.com/WordPress/gutenberg/pull/51018))
+-   List View: A11Y focus enhancements for edit-site based on modifications to edit-post. ([51404](https://github.com/WordPress/gutenberg/pull/51404))
+-   Add a description key to theme.json style variations. ([45242](https://github.com/WordPress/gutenberg/pull/45242))
+-   Focus first focusable on Link UI. ([51105](https://github.com/WordPress/gutenberg/pull/51105))
+-   BlockLockModal: restore focus on fallback toolbar button when original button is not rendered [51666](https://github.com/WordPress/gutenberg/pull/51666)
+-   Site Editor Sidebar: improvements to buttons [51762](https://github.com/WordPress/gutenberg/pull/51762)
 
 #### Interactivity API
-- Add missing tests for image block. ([51305](https://github.com/WordPress/gutenberg/pull/51305))
-- Image block: Add animation toggle to lightbox behavior. ([51357](https://github.com/WordPress/gutenberg/pull/51357))
+
+-   Add missing tests for image block. ([51305](https://github.com/WordPress/gutenberg/pull/51305))
+-   Image block: Add animation toggle to lightbox behavior. ([51357](https://github.com/WordPress/gutenberg/pull/51357))
 
 #### Global Styles
-- Accept transforms in gutenberg_get_global_styles context params. ([50484](https://github.com/WordPress/gutenberg/pull/50484))
-- Split styles menus in revisions and everything else. ([51318](https://github.com/WordPress/gutenberg/pull/51318))
+
+-   Accept transforms in gutenberg_get_global_styles context params. ([50484](https://github.com/WordPress/gutenberg/pull/50484))
+-   Split styles menus in revisions and everything else. ([51318](https://github.com/WordPress/gutenberg/pull/51318))
 
 #### Icons
-- Tweak icons for improved HiDPI devices. ([51511](https://github.com/WordPress/gutenberg/pull/51511))
+
+-   Tweak icons for improved HiDPI devices. ([51511](https://github.com/WordPress/gutenberg/pull/51511))
 
 #### Plugin
-- Remove Details block setting field from the experiments page. ([51372](https://github.com/WordPress/gutenberg/pull/51372))
+
+-   Remove Details block setting field from the experiments page. ([51372](https://github.com/WordPress/gutenberg/pull/51372))
 
 #### Templates API
-- Return post modified datetime in response. ([51362](https://github.com/WordPress/gutenberg/pull/51362))
+
+-   Return post modified datetime in response. ([51362](https://github.com/WordPress/gutenberg/pull/51362))
 
 #### List View
-- Style Book: Close list view when opening the style book. ([50438](https://github.com/WordPress/gutenberg/pull/50438))
+
+-   Style Book: Close list view when opening the style book. ([50438](https://github.com/WordPress/gutenberg/pull/50438))
 
 #### Design Tools
-- List View: Add an indicator of when a position type is set for a block. ([49122](https://github.com/WordPress/gutenberg/pull/49122))
-- Sticky Position: Try re-enabling non-root sticky position. ([49321](https://github.com/WordPress/gutenberg/pull/49321))
-- Clarify error message if duotone color values is incorrect. ([51397](https://github.com/WordPress/gutenberg/pull/51397))
-- List all the font families and font sizes from all the theme.json origins in the font picker. ([51488](https://github.com/WordPress/gutenberg/pull/51488))
+
+-   List View: Add an indicator of when a position type is set for a block. ([49122](https://github.com/WordPress/gutenberg/pull/49122))
+-   Sticky Position: Try re-enabling non-root sticky position. ([49321](https://github.com/WordPress/gutenberg/pull/49321))
+-   Clarify error message if duotone color values is incorrect. ([51397](https://github.com/WordPress/gutenberg/pull/51397))
+-   List all the font families and font sizes from all the theme.json origins in the font picker. ([51488](https://github.com/WordPress/gutenberg/pull/51488))
 
 #### Post Editor
-- Adjust the name of the custom field button labels. ([47407](https://github.com/WordPress/gutenberg/pull/47407))
-- Block manager: Display a 'Reset' button when blocks are hidden to quickly enable all. ([51200](https://github.com/WordPress/gutenberg/pull/51200))
+
+-   Adjust the name of the custom field button labels. ([47407](https://github.com/WordPress/gutenberg/pull/47407))
+-   Block manager: Display a 'Reset' button when blocks are hidden to quickly enable all. ([51200](https://github.com/WordPress/gutenberg/pull/51200))
 
 #### Media
-- Prepublish: Suggest uploading external images. ([46014](https://github.com/WordPress/gutenberg/pull/46014))
+
+-   Prepublish: Suggest uploading external images. ([46014](https://github.com/WordPress/gutenberg/pull/46014))
 
 #### Patterns
-- Block Options: Use consistent capitalization on template parts and patterns. ([51761](https://github.com/WordPress/gutenberg/pull/51761))
+
+-   Block Options: Use consistent capitalization on template parts and patterns. ([51761](https://github.com/WordPress/gutenberg/pull/51761))
 
 #### CSS & Styling
-- Update editor UI modal width. ([51733](https://github.com/WordPress/gutenberg/pull/51733))
+
+-   Update editor UI modal width. ([51733](https://github.com/WordPress/gutenberg/pull/51733))
 
 #### Commands
-- Add commands to access template, template parts and styles. ([51501](https://github.com/WordPress/gutenberg/pull/51501))
-- Add global styles related commands. ([51637](https://github.com/WordPress/gutenberg/pull/51637))
+
+-   Add commands to access template, template parts and styles. ([51501](https://github.com/WordPress/gutenberg/pull/51501))
+-   Add global styles related commands. ([51637](https://github.com/WordPress/gutenberg/pull/51637))
 
 #### Themes
-- Block Theme Previews: Change the URL query string for more safety. ([51312](https://github.com/WordPress/gutenberg/pull/51312))
-- Update the Save Button label when you're previewing a theme. ([51361](https://github.com/WordPress/gutenberg/pull/51361))
+
+-   Block Theme Previews: Change the URL query string for more safety. ([51312](https://github.com/WordPress/gutenberg/pull/51312))
+-   Update the Save Button label when you're previewing a theme. ([51361](https://github.com/WordPress/gutenberg/pull/51361))
 
 #### Navigation
-- Ensure there is always a Navigation available in the browse mode sidebar via fallback algorithm [50321](https://github.com/WordPress/gutenberg/pull/50321)
+
+-   Ensure there is always a Navigation available in the browse mode sidebar via fallback algorithm [50321](https://github.com/WordPress/gutenberg/pull/50321)
 
 ### Bug Fixes
 
 #### Block Library
-- Fix navigation error in library. ([51589](https://github.com/WordPress/gutenberg/pull/51589))
-- Fix site editor rendering of Categories block. ([51329](https://github.com/WordPress/gutenberg/pull/51329))
-- Gallery block - Add default value for innerBlockImages. ([51443](https://github.com/WordPress/gutenberg/pull/51443))
-- Latest posts: Make more link consistent between frontend and editor. ([51190](https://github.com/WordPress/gutenberg/pull/51190))
-- Navigation: Don't interfere with pointer events. ([51378](https://github.com/WordPress/gutenberg/pull/51378))
-- Post editor: Make the Post Content block available as a child of the Query block. ([51405](https://github.com/WordPress/gutenberg/pull/51405))
-- Search Block: Fix problem with buttons not outputting primary status. ([51529](https://github.com/WordPress/gutenberg/pull/51529))
-- Try providing a non-zero value for client width in image editor. ([51285](https://github.com/WordPress/gutenberg/pull/51285))
-- Query Loop: Properly initialize and update `perPage` when we inherit from global query. ([51641](https://github.com/WordPress/gutenberg/pull/51641))
-- Avatar block: Fix not 1:1 between the editor and the front-end. ([49963](https://github.com/WordPress/gutenberg/pull/49963))
-- Spacer block: Fix invalid markup when set to fill. ([51317](https://github.com/WordPress/gutenberg/pull/51317))
-- Buttons Block: add support for orientation-based block movers [51831](https://github.com/WordPress/gutenberg/pull/51831)
-- Rename navigation fallback classes from WP_ to Gutenberg_ [51959](https://github.com/WordPress/gutenberg/pull/51959)
+
+-   Fix navigation error in library. ([51589](https://github.com/WordPress/gutenberg/pull/51589))
+-   Fix site editor rendering of Categories block. ([51329](https://github.com/WordPress/gutenberg/pull/51329))
+-   Gallery block - Add default value for innerBlockImages. ([51443](https://github.com/WordPress/gutenberg/pull/51443))
+-   Latest posts: Make more link consistent between frontend and editor. ([51190](https://github.com/WordPress/gutenberg/pull/51190))
+-   Navigation: Don't interfere with pointer events. ([51378](https://github.com/WordPress/gutenberg/pull/51378))
+-   Post editor: Make the Post Content block available as a child of the Query block. ([51405](https://github.com/WordPress/gutenberg/pull/51405))
+-   Search Block: Fix problem with buttons not outputting primary status. ([51529](https://github.com/WordPress/gutenberg/pull/51529))
+-   Try providing a non-zero value for client width in image editor. ([51285](https://github.com/WordPress/gutenberg/pull/51285))
+-   Query Loop: Properly initialize and update `perPage` when we inherit from global query. ([51641](https://github.com/WordPress/gutenberg/pull/51641))
+-   Avatar block: Fix not 1:1 between the editor and the front-end. ([49963](https://github.com/WordPress/gutenberg/pull/49963))
+-   Spacer block: Fix invalid markup when set to fill. ([51317](https://github.com/WordPress/gutenberg/pull/51317))
+-   Buttons Block: add support for orientation-based block movers [51831](https://github.com/WordPress/gutenberg/pull/51831)
+-   Rename navigation fallback classes from WP* to Gutenberg* [51959](https://github.com/WordPress/gutenberg/pull/51959)
 
 #### Commands
-- Show pages with any status in the command center. ([51324](https://github.com/WordPress/gutenberg/pull/51324))
-- Add manage all custom patterns command [51845](https://github.com/WordPress/gutenberg/pull/51845)
-- Add another batch of commands to the site editor [51832](https://github.com/WordPress/gutenberg/pull/51832)
-- Add UI commands to the post editor [51900](https://github.com/WordPress/gutenberg/pull/51900)
-- Add preferences and keyboard shortcuts commands [51862](https://github.com/WordPress/gutenberg/pull/51862)
+
+-   Show pages with any status in the command center. ([51324](https://github.com/WordPress/gutenberg/pull/51324))
+-   Add manage all custom patterns command [51845](https://github.com/WordPress/gutenberg/pull/51845)
+-   Add another batch of commands to the site editor [51832](https://github.com/WordPress/gutenberg/pull/51832)
+-   Add UI commands to the post editor [51900](https://github.com/WordPress/gutenberg/pull/51900)
+-   Add preferences and keyboard shortcuts commands [51862](https://github.com/WordPress/gutenberg/pull/51862)
 
 #### Core Data
-- Core Data: Fix ESLint warning for the 'useEntityRecord' hook. ([51562](https://github.com/WordPress/gutenberg/pull/51562))
-- useEntityRecord: Fix destructure error when `enabled` option is `false`. ([51534](https://github.com/WordPress/gutenberg/pull/51534))
+
+-   Core Data: Fix ESLint warning for the 'useEntityRecord' hook. ([51562](https://github.com/WordPress/gutenberg/pull/51562))
+-   useEntityRecord: Fix destructure error when `enabled` option is `false`. ([51534](https://github.com/WordPress/gutenberg/pull/51534))
 
 #### Block Editor
-- Fix blocks autocompleter 'rootClientId' selector. ([51673](https://github.com/WordPress/gutenberg/pull/51673))
-- Inserter: Fix arrows in RTL mode. ([51622](https://github.com/WordPress/gutenberg/pull/51622))
-- Link Format: Don't return focus on the selected text 'onFocusOutside'. ([51684](https://github.com/WordPress/gutenberg/pull/51684))
-- ListView: Update drop indicator line positioning to support rtl languages. ([51284](https://github.com/WordPress/gutenberg/pull/51284))
-- Page Content Focus: Default insertion point to the Post Content block. ([51773](https://github.com/WordPress/gutenberg/pull/51773))
+
+-   Fix blocks autocompleter 'rootClientId' selector. ([51673](https://github.com/WordPress/gutenberg/pull/51673))
+-   Inserter: Fix arrows in RTL mode. ([51622](https://github.com/WordPress/gutenberg/pull/51622))
+-   Link Format: Don't return focus on the selected text 'onFocusOutside'. ([51684](https://github.com/WordPress/gutenberg/pull/51684))
+-   ListView: Update drop indicator line positioning to support rtl languages. ([51284](https://github.com/WordPress/gutenberg/pull/51284))
+-   Page Content Focus: Default insertion point to the Post Content block. ([51773](https://github.com/WordPress/gutenberg/pull/51773))
 
 #### Site Editor
-- Add 'Edit template' and 'Back to page' commands. ([51364](https://github.com/WordPress/gutenberg/pull/51364))
-- Fix template display in page details with a custom template. ([51638](https://github.com/WordPress/gutenberg/pull/51638))
-- Page details: Fix displaying slugs with non-latin characters. ([51679](https://github.com/WordPress/gutenberg/pull/51679))
-- Prevent block overlay on blocks with a 'contentOnly' editing mode. ([51780](https://github.com/WordPress/gutenberg/pull/51780))
-- Fix gradient background color repeats. ([51374](https://github.com/WordPress/gutenberg/pull/51374))
-- Global styles: Fix back button tooltip. ([51725](https://github.com/WordPress/gutenberg/pull/51725))
-- Site editor header: Fix document title back and shortcut color contrast. ([51442](https://github.com/WordPress/gutenberg/pull/51442))
-- Site editor sidebar: Fix the heading hierarchy. ([51696](https://github.com/WordPress/gutenberg/pull/51696))
-- Disable the revision button if there is no clickable menu [51851](https://github.com/WordPress/gutenberg/pull/51851)
-- Library: Fix misalignment of description in custom template parts  [51868](https://github.com/WordPress/gutenberg/pull/51868)
-- Library: Fix delete shortcut incorrectly bound to non-user patterns [51830](https://github.com/WordPress/gutenberg/pull/51830)
-- Fix toolbar overlap in site editor [51810](https://github.com/WordPress/gutenberg/pull/51810)
-- Increase space between page meta and details section [51858](https://github.com/WordPress/gutenberg/pull/51858/)
-- Fix missing MenuGroup segment in Site Editor header more menu [51860](https://github.com/WordPress/gutenberg/pull/51860)
-- Update the add template modal design [51806](https://github.com/WordPress/gutenberg/pull/51806)
-- Update text color of site editor menu item hover/active states [51847](https://github.com/WordPress/gutenberg/pull/51847)
-- Fix library command path [51837](https://github.com/WordPress/gutenberg/pull/51837)
-- Restore sidebar in focus mode on Pattern click through in Browse Mode Library [51897](https://github.com/WordPress/gutenberg/pull/51897)
+
+-   Add 'Edit template' and 'Back to page' commands. ([51364](https://github.com/WordPress/gutenberg/pull/51364))
+-   Fix template display in page details with a custom template. ([51638](https://github.com/WordPress/gutenberg/pull/51638))
+-   Page details: Fix displaying slugs with non-latin characters. ([51679](https://github.com/WordPress/gutenberg/pull/51679))
+-   Prevent block overlay on blocks with a 'contentOnly' editing mode. ([51780](https://github.com/WordPress/gutenberg/pull/51780))
+-   Fix gradient background color repeats. ([51374](https://github.com/WordPress/gutenberg/pull/51374))
+-   Global styles: Fix back button tooltip. ([51725](https://github.com/WordPress/gutenberg/pull/51725))
+-   Site editor header: Fix document title back and shortcut color contrast. ([51442](https://github.com/WordPress/gutenberg/pull/51442))
+-   Site editor sidebar: Fix the heading hierarchy. ([51696](https://github.com/WordPress/gutenberg/pull/51696))
+-   Disable the revision button if there is no clickable menu [51851](https://github.com/WordPress/gutenberg/pull/51851)
+-   Library: Fix misalignment of description in custom template parts [51868](https://github.com/WordPress/gutenberg/pull/51868)
+-   Library: Fix delete shortcut incorrectly bound to non-user patterns [51830](https://github.com/WordPress/gutenberg/pull/51830)
+-   Fix toolbar overlap in site editor [51810](https://github.com/WordPress/gutenberg/pull/51810)
+-   Increase space between page meta and details section [51858](https://github.com/WordPress/gutenberg/pull/51858/)
+-   Fix missing MenuGroup segment in Site Editor header more menu [51860](https://github.com/WordPress/gutenberg/pull/51860)
+-   Update the add template modal design [51806](https://github.com/WordPress/gutenberg/pull/51806)
+-   Update text color of site editor menu item hover/active states [51847](https://github.com/WordPress/gutenberg/pull/51847)
+-   Fix library command path [51837](https://github.com/WordPress/gutenberg/pull/51837)
+-   Restore sidebar in focus mode on Pattern click through in Browse Mode Library [51897](https://github.com/WordPress/gutenberg/pull/51897)
 
 #### Accessibility
-- Distraction Free: Avoid focus loss when enabling/disabling distraction free mode via the more menu. ([51627](https://github.com/WordPress/gutenberg/pull/51627))
-- Library: Add an explicit label to the search control. ([51781](https://github.com/WordPress/gutenberg/pull/51781))
-- Site editor: Add a navigable region for content area of Library and Template views. ([51782](https://github.com/WordPress/gutenberg/pull/51782))
-- Fix shift+tab behavior to move to toolbar when the preceding block has a form element. ([51548](https://github.com/WordPress/gutenberg/pull/51548))
+
+-   Distraction Free: Avoid focus loss when enabling/disabling distraction free mode via the more menu. ([51627](https://github.com/WordPress/gutenberg/pull/51627))
+-   Library: Add an explicit label to the search control. ([51781](https://github.com/WordPress/gutenberg/pull/51781))
+-   Site editor: Add a navigable region for content area of Library and Template views. ([51782](https://github.com/WordPress/gutenberg/pull/51782))
+-   Fix shift+tab behavior to move to toolbar when the preceding block has a form element. ([51548](https://github.com/WordPress/gutenberg/pull/51548))
 
 #### Global Styles
-- Color Panel: Fix rendering of tabs with no color. ([51498](https://github.com/WordPress/gutenberg/pull/51498))
-- Remove custom padding on style revisions button. ([51269](https://github.com/WordPress/gutenberg/pull/51269))
+
+-   Color Panel: Fix rendering of tabs with no color. ([51498](https://github.com/WordPress/gutenberg/pull/51498))
+-   Remove custom padding on style revisions button. ([51269](https://github.com/WordPress/gutenberg/pull/51269))
 
 #### Components
-- MediaPlaceholder: Fix position of URLPopover. ([51363](https://github.com/WordPress/gutenberg/pull/51363))
-- Popover: Allow legitimate 0 positions to update popover position. ([51320](https://github.com/WordPress/gutenberg/pull/51320))
-- Button: Remove unnecessary margin from dashicon. ([51395](https://github.com/WordPress/gutenberg/pull/51395))
-- Keep framer-motion from updating minor version [51894](https://github.com/WordPress/gutenberg/pull/51894)
-- ConfirmDialog: Fix affirmative action being triggered an extra time when selecting a button via keyboard [51730](https://github.com/WordPress/gutenberg/pull/51730)
-- Tweak more icons for high-resolution devices [51768](https://github.com/WordPress/gutenberg/pull/51768)
-- ZStack: fix component bounding box to match children [51836](https://github.com/WordPress/gutenberg/pull/51836)
+
+-   MediaPlaceholder: Fix position of URLPopover. ([51363](https://github.com/WordPress/gutenberg/pull/51363))
+-   Popover: Allow legitimate 0 positions to update popover position. ([51320](https://github.com/WordPress/gutenberg/pull/51320))
+-   Button: Remove unnecessary margin from dashicon. ([51395](https://github.com/WordPress/gutenberg/pull/51395))
+-   Keep framer-motion from updating minor version [51894](https://github.com/WordPress/gutenberg/pull/51894)
+-   ConfirmDialog: Fix affirmative action being triggered an extra time when selecting a button via keyboard [51730](https://github.com/WordPress/gutenberg/pull/51730)
+-   Tweak more icons for high-resolution devices [51768](https://github.com/WordPress/gutenberg/pull/51768)
+-   ZStack: fix component bounding box to match children [51836](https://github.com/WordPress/gutenberg/pull/51836)
 
 #### Patterns
-- Library: Reinstate sidebar navigation menu editing for template parts. ([51825](https://github.com/WordPress/gutenberg/pull/51825))
+
+-   Library: Reinstate sidebar navigation menu editing for template parts. ([51825](https://github.com/WordPress/gutenberg/pull/51825))
 
 #### Interactivity API
-- Image block: Remove Lightbox markup if is set as disabled. ([51692](https://github.com/WordPress/gutenberg/pull/51692))
+
+-   Image block: Remove Lightbox markup if is set as disabled. ([51692](https://github.com/WordPress/gutenberg/pull/51692))
 
 #### Block Locking
-- Fix regression in selectors. ([51541](https://github.com/WordPress/gutenberg/pull/51541))
+
+-   Fix regression in selectors. ([51541](https://github.com/WordPress/gutenberg/pull/51541))
 
 #### Typography
-- Fluid typography: Custom font-sizes should use max viewport width. ([51516](https://github.com/WordPress/gutenberg/pull/51516))
+
+-   Fluid typography: Custom font-sizes should use max viewport width. ([51516](https://github.com/WordPress/gutenberg/pull/51516))
 
 #### Widgets Editor
-- Fix fixed toolbar in customize widgets. ([51092](https://github.com/WordPress/gutenberg/pull/51092))
+
+-   Fix fixed toolbar in customize widgets. ([51092](https://github.com/WordPress/gutenberg/pull/51092))
 
 #### Navigation Menu Sidebar
-- Hide the hidden navigation block. ([50662](https://github.com/WordPress/gutenberg/pull/50662))
+
+-   Hide the hidden navigation block. ([50662](https://github.com/WordPress/gutenberg/pull/50662))
 
 #### Block Variations
-- [Block Library - Post Terms]: Custom taxonomies do not show icons when transforming from the toolbar. ([51476](https://github.com/WordPress/gutenberg/pull/51476))
 
-#### Page Content Focus 
-- Switch to Page panel when deselecting a block [51881](https://github.com/WordPress/gutenberg/pull/51881)
-- Don't show 'Back to page' notification when navigating away from page [51880](https://github.com/WordPress/gutenberg/pull/51880)
-- useBlockSync(): Reset inner blocks when component unmounts [51783](https://github.com/WordPress/gutenberg/pull/51783)
-- Fix black pixel appearing when block toolbar is empty [51779](https://github.com/WordPress/gutenberg/pull/51779)
-- Only show Page Content Focus commands when in edit mode [51888](https://github.com/WordPress/gutenberg/pull/51888)
+-   [Block Library - Post Terms]: Custom taxonomies do not show icons when transforming from the toolbar. ([51476](https://github.com/WordPress/gutenberg/pull/51476))
+
+#### Page Content Focus
+
+-   Switch to Page panel when deselecting a block [51881](https://github.com/WordPress/gutenberg/pull/51881)
+-   Don't show 'Back to page' notification when navigating away from page [51880](https://github.com/WordPress/gutenberg/pull/51880)
+-   useBlockSync(): Reset inner blocks when component unmounts [51783](https://github.com/WordPress/gutenberg/pull/51783)
+-   Fix black pixel appearing when block toolbar is empty [51779](https://github.com/WordPress/gutenberg/pull/51779)
+-   Only show Page Content Focus commands when in edit mode [51888](https://github.com/WordPress/gutenberg/pull/51888)
 
 ### Performance
 
 #### Site Editor
-- Edit Site: Add a loading timeout. ([51049](https://github.com/WordPress/gutenberg/pull/51049))
-- Improve DocumentActions performance. ([51432](https://github.com/WordPress/gutenberg/pull/51432))
-- Prevent BlockBreadcrumb from re-rendering unnecessarily when typing. ([51628](https://github.com/WordPress/gutenberg/pull/51628))
-- Reduce number of List View re-renders while typing. ([51518](https://github.com/WordPress/gutenberg/pull/51518))
-- Improve PagePanels performance. ([51319](https://github.com/WordPress/gutenberg/pull/51319))
+
+-   Edit Site: Add a loading timeout. ([51049](https://github.com/WordPress/gutenberg/pull/51049))
+-   Improve DocumentActions performance. ([51432](https://github.com/WordPress/gutenberg/pull/51432))
+-   Prevent BlockBreadcrumb from re-rendering unnecessarily when typing. ([51628](https://github.com/WordPress/gutenberg/pull/51628))
+-   Reduce number of List View re-renders while typing. ([51518](https://github.com/WordPress/gutenberg/pull/51518))
+-   Improve PagePanels performance. ([51319](https://github.com/WordPress/gutenberg/pull/51319))
 
 #### Block Editor
-- Improve getBlockEditingMode() and useAppender() performance. ([51675](https://github.com/WordPress/gutenberg/pull/51675))
+
+-   Improve getBlockEditingMode() and useAppender() performance. ([51675](https://github.com/WordPress/gutenberg/pull/51675))
 
 ### Experiments
 
 #### Global Styles
-- Color Randomizer: Fix an error when the theme has no color palette. ([51539](https://github.com/WordPress/gutenberg/pull/51539))
+
+-   Color Randomizer: Fix an error when the theme has no color palette. ([51539](https://github.com/WordPress/gutenberg/pull/51539))
 
 ### Documentation
 
-- Docs: Fix incorrect import of useEntityRecords in code example. ([51630](https://github.com/WordPress/gutenberg/pull/51630))
-- Fix broken links in editor documentation. ([51321](https://github.com/WordPress/gutenberg/pull/51321))
-- Fix grammar in the Create a Block > WordPress Plugin page. ([51663](https://github.com/WordPress/gutenberg/pull/51663))
-- Fix grammar on the Create a Block tutorial page. ([51662](https://github.com/WordPress/gutenberg/pull/51662))
-- Fix grammar on the Getting Started page. ([51661](https://github.com/WordPress/gutenberg/pull/51661))
-- Update broken link. ([41758](https://github.com/WordPress/gutenberg/pull/41758))
-- Update components README.md. ([51557](https://github.com/WordPress/gutenberg/pull/51557))
-- Update wp-env changelog. ([51614](https://github.com/WordPress/gutenberg/pull/51614))
-- Updated getEntityRecord doc by using selector instead of dispatch. ([51298](https://github.com/WordPress/gutenberg/pull/51298))
+-   Docs: Fix incorrect import of useEntityRecords in code example. ([51630](https://github.com/WordPress/gutenberg/pull/51630))
+-   Fix broken links in editor documentation. ([51321](https://github.com/WordPress/gutenberg/pull/51321))
+-   Fix grammar in the Create a Block > WordPress Plugin page. ([51663](https://github.com/WordPress/gutenberg/pull/51663))
+-   Fix grammar on the Create a Block tutorial page. ([51662](https://github.com/WordPress/gutenberg/pull/51662))
+-   Fix grammar on the Getting Started page. ([51661](https://github.com/WordPress/gutenberg/pull/51661))
+-   Update broken link. ([41758](https://github.com/WordPress/gutenberg/pull/41758))
+-   Update components README.md. ([51557](https://github.com/WordPress/gutenberg/pull/51557))
+-   Update wp-env changelog. ([51614](https://github.com/WordPress/gutenberg/pull/51614))
+-   Updated getEntityRecord doc by using selector instead of dispatch. ([51298](https://github.com/WordPress/gutenberg/pull/51298))
 
 ### Code Quality
 
 #### General
-- Adopt lock-unlock.js and private-apis.js convention. ([51322](https://github.com/WordPress/gutenberg/pull/51322))
-- Formats: Avoid rerendering language edit component when typing. ([51440](https://github.com/WordPress/gutenberg/pull/51440))
-- Keyboard Shortcut: Clean up shortcut names. ([51739](https://github.com/WordPress/gutenberg/pull/51739))
-- Lodash: Refactor away from `_.kebabCase()` in block editor. ([51687](https://github.com/WordPress/gutenberg/pull/51687))
-- Lodash: Refactor away from `_.mergeWith()`. ([51483](https://github.com/WordPress/gutenberg/pull/51483))
-- Lodash: Remove from blocks package. ([51703](https://github.com/WordPress/gutenberg/pull/51703))
-- Remove pattern directory categories endpoint. ([51340](https://github.com/WordPress/gutenberg/pull/51340))
-- Require relocated class files for back-compat in WordPress releases. ([51670](https://github.com/WordPress/gutenberg/pull/51670))
-
-#### Block Library
-- Add tests for WP_Classic_To_Block_Menu_Converter class. ([51410](https://github.com/WordPress/gutenberg/pull/51410))
-- Details: Set 'clientId' as useSelect dependency. ([51634](https://github.com/WordPress/gutenberg/pull/51634))
-- Move Navigation fallback files to 6.3 directory. ([51572](https://github.com/WordPress/gutenberg/pull/51572))
-- Navigation: Fix ListView deprecation notice. ([51094](https://github.com/WordPress/gutenberg/pull/51094))
-- Navigation: Just a simple refactor. ([51382](https://github.com/WordPress/gutenberg/pull/51382))
-- Remove legacy isTopLevelLink attribute from Navigation block tests. ([51759](https://github.com/WordPress/gutenberg/pull/51759))
-- Search Block: Write "Button Only" label in sentence capitalization. ([51629](https://github.com/WordPress/gutenberg/pull/51629))
+
+-   Adopt lock-unlock.js and private-apis.js convention. ([51322](https://github.com/WordPress/gutenberg/pull/51322))
+-   Formats: Avoid rerendering language edit component when typing. ([51440](https://github.com/WordPress/gutenberg/pull/51440))
+-   Keyboard Shortcut: Clean up shortcut names. ([51739](https://github.com/WordPress/gutenberg/pull/51739))
+-   Lodash: Refactor away from `_.kebabCase()` in block editor. ([51687](https://github.com/WordPress/gutenberg/pull/51687))
+-   Lodash: Refactor away from `_.mergeWith()`. ([51483](https://github.com/WordPress/gutenberg/pull/51483))
+-   Lodash: Remove from blocks package. ([51703](https://github.com/WordPress/gutenberg/pull/51703))
+-   Remove pattern directory categories endpoint. ([51340](https://github.com/WordPress/gutenberg/pull/51340))
+-   Require relocated class files for back-compat in WordPress releases. ([51670](https://github.com/WordPress/gutenberg/pull/51670))
+
+#### Block Library
+
+-   Add tests for WP_Classic_To_Block_Menu_Converter class. ([51410](https://github.com/WordPress/gutenberg/pull/51410))
+-   Details: Set 'clientId' as useSelect dependency. ([51634](https://github.com/WordPress/gutenberg/pull/51634))
+-   Move Navigation fallback files to 6.3 directory. ([51572](https://github.com/WordPress/gutenberg/pull/51572))
+-   Navigation: Fix ListView deprecation notice. ([51094](https://github.com/WordPress/gutenberg/pull/51094))
+-   Navigation: Just a simple refactor. ([51382](https://github.com/WordPress/gutenberg/pull/51382))
+-   Remove legacy isTopLevelLink attribute from Navigation block tests. ([51759](https://github.com/WordPress/gutenberg/pull/51759))
+-   Search Block: Write "Button Only" label in sentence capitalization. ([51629](https://github.com/WordPress/gutenberg/pull/51629))
 
 #### Site Editor
-- Browse Mode: Move CSS to more generic selector. ([51547](https://github.com/WordPress/gutenberg/pull/51547))
-- DRY up ContentBlocksList and BlockInspectorLockedBlocks. ([51281](https://github.com/WordPress/gutenberg/pull/51281))
-- Edit Site: Refactor the NavigationMenuContent component and fix the deprecation notice. ([51469](https://github.com/WordPress/gutenberg/pull/51469))
-- PageContent: Fix unlock import. ([51360](https://github.com/WordPress/gutenberg/pull/51360))
-- Refactor Site Editor block editor code. ([51524](https://github.com/WordPress/gutenberg/pull/51524))
+
+-   Browse Mode: Move CSS to more generic selector. ([51547](https://github.com/WordPress/gutenberg/pull/51547))
+-   DRY up ContentBlocksList and BlockInspectorLockedBlocks. ([51281](https://github.com/WordPress/gutenberg/pull/51281))
+-   Edit Site: Refactor the NavigationMenuContent component and fix the deprecation notice. ([51469](https://github.com/WordPress/gutenberg/pull/51469))
+-   PageContent: Fix unlock import. ([51360](https://github.com/WordPress/gutenberg/pull/51360))
+-   Refactor Site Editor block editor code. ([51524](https://github.com/WordPress/gutenberg/pull/51524))
 
 #### Block Editor
-- Lodash: Replace `_.mergeWith()` with `deepmerge` in blocks. ([50637](https://github.com/WordPress/gutenberg/pull/50637))
-- useInsertionPoint: Add missing dependency for useCallback. ([51682](https://github.com/WordPress/gutenberg/pull/51682))
-- Block Editor: Improve data selector for BlockQuickNavigationItem. ([51429](https://github.com/WordPress/gutenberg/pull/51429))
-- Block Editor: Remove redundant memoization from 'ImageURLInputUI'. ([51658](https://github.com/WordPress/gutenberg/pull/51658))
-- Block Editor: Simplify filtering condition for `getBlockParentsByBlockName` selector. ([51439](https://github.com/WordPress/gutenberg/pull/51439))
-- Block Editor: Remove unused selectors. ([51674](https://github.com/WordPress/gutenberg/pull/51674))
+
+-   Lodash: Replace `_.mergeWith()` with `deepmerge` in blocks. ([50637](https://github.com/WordPress/gutenberg/pull/50637))
+-   useInsertionPoint: Add missing dependency for useCallback. ([51682](https://github.com/WordPress/gutenberg/pull/51682))
+-   Block Editor: Improve data selector for BlockQuickNavigationItem. ([51429](https://github.com/WordPress/gutenberg/pull/51429))
+-   Block Editor: Remove redundant memoization from 'ImageURLInputUI'. ([51658](https://github.com/WordPress/gutenberg/pull/51658))
+-   Block Editor: Simplify filtering condition for `getBlockParentsByBlockName` selector. ([51439](https://github.com/WordPress/gutenberg/pull/51439))
+-   Block Editor: Remove unused selectors. ([51674](https://github.com/WordPress/gutenberg/pull/51674))
 
 #### Navigation Menu Sidebar
-- Extract nav editor component in Nav in Browse mode. ([51436](https://github.com/WordPress/gutenberg/pull/51436))
-- Remove custom button and (conditionally) show single menu on Navigation route in Browse Mode. ([51565](https://github.com/WordPress/gutenberg/pull/51565))
+
+-   Extract nav editor component in Nav in Browse mode. ([51436](https://github.com/WordPress/gutenberg/pull/51436))
+-   Remove custom button and (conditionally) show single menu on Navigation route in Browse Mode. ([51565](https://github.com/WordPress/gutenberg/pull/51565))
 
 #### Design Tools
-- Fluid typography: Add missing changelog from #51516. ([51668](https://github.com/WordPress/gutenberg/pull/51668))
+
+-   Fluid typography: Add missing changelog from #51516. ([51668](https://github.com/WordPress/gutenberg/pull/51668))
 
 #### Layout
-- Move layout definitions out of theme.json. ([50621](https://github.com/WordPress/gutenberg/pull/50621))
-- Try stabilising layout and its associated APIs. ([51434](https://github.com/WordPress/gutenberg/pull/51434))
+
+-   Move layout definitions out of theme.json. ([50621](https://github.com/WordPress/gutenberg/pull/50621))
+-   Try stabilising layout and its associated APIs. ([51434](https://github.com/WordPress/gutenberg/pull/51434))
 
 #### Global Styles
-- Global styles revisions: Move from experimental to 6.3. ([51474](https://github.com/WordPress/gutenberg/pull/51474))
+
+-   Global styles revisions: Move from experimental to 6.3. ([51474](https://github.com/WordPress/gutenberg/pull/51474))
 
 #### Post Editor
-- Fix refactor flat term selector to use data api for creating new terms. ([50952](https://github.com/WordPress/gutenberg/pull/50952))
+
+-   Fix refactor flat term selector to use data api for creating new terms. ([50952](https://github.com/WordPress/gutenberg/pull/50952))
 
 #### Data Layer
-- Private actions and selectors: Return stable references, expose to thunks. ([51051](https://github.com/WordPress/gutenberg/pull/51051))
+
+-   Private actions and selectors: Return stable references, expose to thunks. ([51051](https://github.com/WordPress/gutenberg/pull/51051))
 
 #### Themes
-- Block Theme Previews: Rename GET variable and prepare for core compat. ([51738](https://github.com/WordPress/gutenberg/pull/51738))
+
+-   Block Theme Previews: Rename GET variable and prepare for core compat. ([51738](https://github.com/WordPress/gutenberg/pull/51738))
 
 #### Interactivity API
-- Remove the hydration console log of the Interactivity API. ([51571](https://github.com/WordPress/gutenberg/pull/51571))
-- Use interactivity API for Navigation and File blocks only in Gutenberg. ([51694](https://github.com/WordPress/gutenberg/pull/51694))
-- Behaviors: Move behaviors code to experimental folder. ([51654](https://github.com/WordPress/gutenberg/pull/51654))
+
+-   Remove the hydration console log of the Interactivity API. ([51571](https://github.com/WordPress/gutenberg/pull/51571))
+-   Use interactivity API for Navigation and File blocks only in Gutenberg. ([51694](https://github.com/WordPress/gutenberg/pull/51694))
+-   Behaviors: Move behaviors code to experimental folder. ([51654](https://github.com/WordPress/gutenberg/pull/51654))
 
 #### Components
-- Convert `ClipboardButton` to TypeScript. ([51334](https://github.com/WordPress/gutenberg/pull/51334))
-- Use internal context system to apply toolbar variant to toolbar dropdowns. ([51154](https://github.com/WordPress/gutenberg/pull/51154))
+
+-   Convert `ClipboardButton` to TypeScript. ([51334](https://github.com/WordPress/gutenberg/pull/51334))
+-   Use internal context system to apply toolbar variant to toolbar dropdowns. ([51154](https://github.com/WordPress/gutenberg/pull/51154))
 
 #### Parser
-- Split each class in `parser.php` to a separate file. ([48693](https://github.com/WordPress/gutenberg/pull/48693))
+
+-   Split each class in `parser.php` to a separate file. ([48693](https://github.com/WordPress/gutenberg/pull/48693))
 
 ### Tools
 
 #### Testing
-- Add 'Mamaduka' as one of the code owners for Playwright tests. ([51470](https://github.com/WordPress/gutenberg/pull/51470))
-- Combine Site Editor list view tests into a single file. ([51635](https://github.com/WordPress/gutenberg/pull/51635))
-- Consolidate duplicate block tests. ([51352](https://github.com/WordPress/gutenberg/pull/51352))
-- Fix flaky 'Keep styles on block transforms' end-to-end test. ([51593](https://github.com/WordPress/gutenberg/pull/51593))
-- Fix flaky 'Push to Global Styles' end-to-end test. ([51636](https://github.com/WordPress/gutenberg/pull/51636))
-- Fix flaky 'Switch to Draft' action in preview end-to-end tests. ([51564](https://github.com/WordPress/gutenberg/pull/51564))
-- Fix flaky 'hooks API' end-to-end test. ([51592](https://github.com/WordPress/gutenberg/pull/51592))
-- Fix flaky Image block interactivity end-to-end test. ([51573](https://github.com/WordPress/gutenberg/pull/51573))
-- Fix the flaky site editor list view tests. ([51598](https://github.com/WordPress/gutenberg/pull/51598))
-- Migrate 'Allowed Blocks Setting on InnerBlocks' tests to Playwright. ([51677](https://github.com/WordPress/gutenberg/pull/51677))
-- Migrate block hierarchy navigation tests to Playwright. ([51517](https://github.com/WordPress/gutenberg/pull/51517))
-- Playwright Utils: Change preference update method in setIsFixedToolbar. ([51659](https://github.com/WordPress/gutenberg/pull/51659))
-- Playwright Utils: Simplify editor preference updates in createNewPost. ([51560](https://github.com/WordPress/gutenberg/pull/51560))
-- Styles Navigation Screen: Close style book using location. ([51365](https://github.com/WordPress/gutenberg/pull/51365))
-- Update BlockEditorProvider tests. ([51497](https://github.com/WordPress/gutenberg/pull/51497))
-- Update E2E test sharding on CI, make Playwright tests faster, Puppeteer tests slower. ([50362](https://github.com/WordPress/gutenberg/pull/50362))
-- Update the 'Iframe block' test and fix flakiness. ([51631](https://github.com/WordPress/gutenberg/pull/51631))
-- end-to-end tests: Try fixing 'networkidle' timeout errors. ([51826](https://github.com/WordPress/gutenberg/pull/51826))
-- test: Re-enable native integration tests. ([51706](https://github.com/WordPress/gutenberg/pull/51706))
-- Migrate Navigable toolbar test to Playwright. ([51514](https://github.com/WordPress/gutenberg/pull/51514))
-- Mobile unit tests: Remove custom waitFor implementation. ([46735](https://github.com/WordPress/gutenberg/pull/46735))
-- Set fixedToolbar to false after each top toolbar test to ensure proper cleanup. ([51600](https://github.com/WordPress/gutenberg/pull/51600))
-- Fix performance test failure on trunk. ([51407](https://github.com/WordPress/gutenberg/pull/51407))
-- Performance tests: Make theme versions consistent cross-env. ([50905](https://github.com/WordPress/gutenberg/pull/50905))
-- Performance tests: Update base point to compare. ([51381](https://github.com/WordPress/gutenberg/pull/51381))
+
+-   Add 'Mamaduka' as one of the code owners for Playwright tests. ([51470](https://github.com/WordPress/gutenberg/pull/51470))
+-   Combine Site Editor list view tests into a single file. ([51635](https://github.com/WordPress/gutenberg/pull/51635))
+-   Consolidate duplicate block tests. ([51352](https://github.com/WordPress/gutenberg/pull/51352))
+-   Fix flaky 'Keep styles on block transforms' end-to-end test. ([51593](https://github.com/WordPress/gutenberg/pull/51593))
+-   Fix flaky 'Push to Global Styles' end-to-end test. ([51636](https://github.com/WordPress/gutenberg/pull/51636))
+-   Fix flaky 'Switch to Draft' action in preview end-to-end tests. ([51564](https://github.com/WordPress/gutenberg/pull/51564))
+-   Fix flaky 'hooks API' end-to-end test. ([51592](https://github.com/WordPress/gutenberg/pull/51592))
+-   Fix flaky Image block interactivity end-to-end test. ([51573](https://github.com/WordPress/gutenberg/pull/51573))
+-   Fix the flaky site editor list view tests. ([51598](https://github.com/WordPress/gutenberg/pull/51598))
+-   Migrate 'Allowed Blocks Setting on InnerBlocks' tests to Playwright. ([51677](https://github.com/WordPress/gutenberg/pull/51677))
+-   Migrate block hierarchy navigation tests to Playwright. ([51517](https://github.com/WordPress/gutenberg/pull/51517))
+-   Playwright Utils: Change preference update method in setIsFixedToolbar. ([51659](https://github.com/WordPress/gutenberg/pull/51659))
+-   Playwright Utils: Simplify editor preference updates in createNewPost. ([51560](https://github.com/WordPress/gutenberg/pull/51560))
+-   Styles Navigation Screen: Close style book using location. ([51365](https://github.com/WordPress/gutenberg/pull/51365))
+-   Update BlockEditorProvider tests. ([51497](https://github.com/WordPress/gutenberg/pull/51497))
+-   Update E2E test sharding on CI, make Playwright tests faster, Puppeteer tests slower. ([50362](https://github.com/WordPress/gutenberg/pull/50362))
+-   Update the 'Iframe block' test and fix flakiness. ([51631](https://github.com/WordPress/gutenberg/pull/51631))
+-   end-to-end tests: Try fixing 'networkidle' timeout errors. ([51826](https://github.com/WordPress/gutenberg/pull/51826))
+-   test: Re-enable native integration tests. ([51706](https://github.com/WordPress/gutenberg/pull/51706))
+-   Migrate Navigable toolbar test to Playwright. ([51514](https://github.com/WordPress/gutenberg/pull/51514))
+-   Mobile unit tests: Remove custom waitFor implementation. ([46735](https://github.com/WordPress/gutenberg/pull/46735))
+-   Set fixedToolbar to false after each top toolbar test to ensure proper cleanup. ([51600](https://github.com/WordPress/gutenberg/pull/51600))
+-   Fix performance test failure on trunk. ([51407](https://github.com/WordPress/gutenberg/pull/51407))
+-   Performance tests: Make theme versions consistent cross-env. ([50905](https://github.com/WordPress/gutenberg/pull/50905))
+-   Performance tests: Update base point to compare. ([51381](https://github.com/WordPress/gutenberg/pull/51381))
 
 #### Build Tooling
-- Babel config: Enable useSpread option for JSX transform to reduce transpilation. ([51574](https://github.com/WordPress/gutenberg/pull/51574))
-- Lodash: Remove from lint staged type check. ([51698](https://github.com/WordPress/gutenberg/pull/51698))
-- Performance Tests: Update the base point to compare against. ([51689](https://github.com/WordPress/gutenberg/pull/51689))
-- wp-env: Try to fix failing PHP Github actions. ([51513](https://github.com/WordPress/gutenberg/pull/51513))
-- npm lockfile: Hoist reakit and date-fns packages to the top. ([51500](https://github.com/WordPress/gutenberg/pull/51500))
+
+-   Babel config: Enable useSpread option for JSX transform to reduce transpilation. ([51574](https://github.com/WordPress/gutenberg/pull/51574))
+-   Lodash: Remove from lint staged type check. ([51698](https://github.com/WordPress/gutenberg/pull/51698))
+-   Performance Tests: Update the base point to compare against. ([51689](https://github.com/WordPress/gutenberg/pull/51689))
+-   wp-env: Try to fix failing PHP GitHub actions. ([51513](https://github.com/WordPress/gutenberg/pull/51513))
+-   npm lockfile: Hoist reakit and date-fns packages to the top. ([51500](https://github.com/WordPress/gutenberg/pull/51500))
 
 #### Plugin
-- Add script to compile usage of experimental APIs. ([51341](https://github.com/WordPress/gutenberg/pull/51341))
 
-## First time contributors
+-   Add script to compile usage of experimental APIs. ([51341](https://github.com/WordPress/gutenberg/pull/51341))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @bangank36: Update components README.md. ([51557](https://github.com/WordPress/gutenberg/pull/51557))
-- @samnajian: Accept transforms in gutenberg_get_global_styles context params. ([50484](https://github.com/WordPress/gutenberg/pull/50484))
-- @xerpa43: Avatar block: Fix not 1:1 between the editor and the front-end. ([49963](https://github.com/WordPress/gutenberg/pull/49963))
+The following PRs were merged by first-time contributors:
 
+-   @bangank36: Update components README.md. ([51557](https://github.com/WordPress/gutenberg/pull/51557))
+-   @samnajian: Accept transforms in gutenberg_get_global_styles context params. ([50484](https://github.com/WordPress/gutenberg/pull/50484))
+-   @xerpa43: Avatar block: Fix not 1:1 between the editor and the front-end. ([49963](https://github.com/WordPress/gutenberg/pull/49963))
 
 ## Contributors
 
 The following contributors merged PRs in this release:
 
-@aaronrobertshaw @afercia @alexstine @andrewserong @aristath @artemiomorales @aurooba @bangank36 @c4rl0sbr4v0 @carolinan @ciampo @dcalhoun @derekblank @diegohaz @draganescu @ellatrix @fabiankaegy @fluiddot @geriux @getdave @glendaviesnz @jameskoster @jasmussen @jeryj @jhnstn @jsnajdr @juanfra @kozer @luisherranz @MaggieCabrera @Mamaduka @matiasbenedetto @mcliwanow @mcsf @mikachan @n2erjo00 @noahtallen @noisysocks @ntsekouras @oandregal @okmttdhr @paulopmt1 @pbking @peterwilsoncc @pooja-muchandikar @ramonjd @richtabor @samnajian @SantosGuillamot @SavPhill @SaxonF @scruffian @shimotmk @Sidsector9 @SiobhyB @spacedmonkey @stokesman @sunyatasattva @t-hamano @talldan @tellthemachines @tyxla @walbo @WunderBart @xerpa43 @youknowriad @priethor @ajlende @mirka 
-
-
-
+@aaronrobertshaw @afercia @alexstine @andrewserong @aristath @artemiomorales @aurooba @bangank36 @c4rl0sbr4v0 @carolinan @ciampo @dcalhoun @derekblank @diegohaz @draganescu @ellatrix @fabiankaegy @fluiddot @geriux @getdave @glendaviesnz @jameskoster @jasmussen @jeryj @jhnstn @jsnajdr @juanfra @kozer @luisherranz @MaggieCabrera @Mamaduka @matiasbenedetto @mcliwanow @mcsf @mikachan @n2erjo00 @noahtallen @noisysocks @ntsekouras @oandregal @okmttdhr @paulopmt1 @pbking @peterwilsoncc @pooja-muchandikar @ramonjd @richtabor @samnajian @SantosGuillamot @SavPhill @SaxonF @scruffian @shimotmk @Sidsector9 @SiobhyB @spacedmonkey @stokesman @sunyatasattva @t-hamano @talldan @tellthemachines @tyxla @walbo @WunderBart @xerpa43 @youknowriad @priethor @ajlende @mirka
 
 = 16.0.0 =
 
@@ -4826,225 +15779,248 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Editor
-- Block Controls SlotFill: Refactor to allow passing multiple contexts, including internal components context. ([51264](https://github.com/WordPress/gutenberg/pull/51264))
-- Block Toolbar: Update the 'Unlock' button label. ([51083](https://github.com/WordPress/gutenberg/pull/51083))
-- Iframe Editor if all blocks are v3. ([48286](https://github.com/WordPress/gutenberg/pull/48286))
-- Improve (and relax) search vs direct URL entry detection in Link Control. ([51011](https://github.com/WordPress/gutenberg/pull/51011))
-- Link Control require user to manually submit any changes. ([50668](https://github.com/WordPress/gutenberg/pull/50668))
-- List View: Allow dragging outside the immediate area by passing down a dropZoneElement. ([50726](https://github.com/WordPress/gutenberg/pull/50726))
-- List View: Append when dragging into collapsed blocks. ([50936](https://github.com/WordPress/gutenberg/pull/50936))
-- Reinstate Text control outside of settings in Link Control. ([50957](https://github.com/WordPress/gutenberg/pull/50957))
-- Update the document title in the template mode of the post editor. ([50864](https://github.com/WordPress/gutenberg/pull/50864))
-- Use "Save" instead of "Apply" in Link Control. ([50964](https://github.com/WordPress/gutenberg/pull/50964))
-- Use checkbox for `Open in new tab` within Link Control. ([50961](https://github.com/WordPress/gutenberg/pull/50961))
-- Visually hide the LinkControl initial/results heading. ([50977](https://github.com/WordPress/gutenberg/pull/50977))
+
+-   Block Controls SlotFill: Refactor to allow passing multiple contexts, including internal components context. ([51264](https://github.com/WordPress/gutenberg/pull/51264))
+-   Block Toolbar: Update the 'Unlock' button label. ([51083](https://github.com/WordPress/gutenberg/pull/51083))
+-   Iframe Editor if all blocks are v3. ([48286](https://github.com/WordPress/gutenberg/pull/48286))
+-   Improve (and relax) search vs direct URL entry detection in Link Control. ([51011](https://github.com/WordPress/gutenberg/pull/51011))
+-   Link Control require user to manually submit any changes. ([50668](https://github.com/WordPress/gutenberg/pull/50668))
+-   List View: Allow dragging outside the immediate area by passing down a dropZoneElement. ([50726](https://github.com/WordPress/gutenberg/pull/50726))
+-   List View: Append when dragging into collapsed blocks. ([50936](https://github.com/WordPress/gutenberg/pull/50936))
+-   Reinstate Text control outside of settings in Link Control. ([50957](https://github.com/WordPress/gutenberg/pull/50957))
+-   Update the document title in the template mode of the post editor. ([50864](https://github.com/WordPress/gutenberg/pull/50864))
+-   Use "Save" instead of "Apply" in Link Control. ([50964](https://github.com/WordPress/gutenberg/pull/50964))
+-   Use checkbox for `Open in new tab` within Link Control. ([50961](https://github.com/WordPress/gutenberg/pull/50961))
+-   Visually hide the LinkControl initial/results heading. ([50977](https://github.com/WordPress/gutenberg/pull/50977))
 
 #### Site Editor
-- Add `delete` action for pages in navigation sidebar. ([51101](https://github.com/WordPress/gutenberg/pull/51101))
-- Add page details to the Site Editor sidebar. ([50767](https://github.com/WordPress/gutenberg/pull/50767))
-- Add Paragraph prompt to Post Content when empty. ([50623](https://github.com/WordPress/gutenberg/pull/50623))
-- Add template actions in site editor navigation sidebar. ([51054](https://github.com/WordPress/gutenberg/pull/51054))
-- Add the ability to create a new page in the Site Editor. ([50565](https://github.com/WordPress/gutenberg/pull/50565))
-- Add the ability to focus on editing a page's content vs the page's template. ([50857](https://github.com/WordPress/gutenberg/pull/50857))
-- Directly save if only changing current context. ([50567](https://github.com/WordPress/gutenberg/pull/50567))
-- Disable block supports derived design tools when Blocking Editing Mode is not `default`. ([50912](https://github.com/WordPress/gutenberg/pull/50912))
-- DocumentActions: Animate between page and template mode. ([51224](https://github.com/WordPress/gutenberg/pull/51224))
-- Site Editor sidebar: Refactor page details. ([51093](https://github.com/WordPress/gutenberg/pull/51093))
-- Styles Screen: Add link to global styles revisions. ([51149](https://github.com/WordPress/gutenberg/pull/51149))
-- Try adding dynamic page templates to pages section. ([50630](https://github.com/WordPress/gutenberg/pull/50630))
-- Tweak edit site resizable frame handle. ([50878](https://github.com/WordPress/gutenberg/pull/50878))
-- Update the bottom sticky section in the site editor details panel. ([51274](https://github.com/WordPress/gutenberg/pull/51274))
-
-#### Block Library
-- Details Block: Remove experimental flag and stabilize. ([50997](https://github.com/WordPress/gutenberg/pull/50997))
-- Post Excerpt: Improve preview on the editor site. ([50167](https://github.com/WordPress/gutenberg/pull/50167))
-- Post Title: Improve preview on the editor site. ([50147](https://github.com/WordPress/gutenberg/pull/50147))
-- Query Pagination: Address feedback from #50779. ([51165](https://github.com/WordPress/gutenberg/pull/51165))
-- Query Pagination: Allow hiding the label text. ([50779](https://github.com/WordPress/gutenberg/pull/50779))
-- Search Block: Add button only with expandable input. ([50487](https://github.com/WordPress/gutenberg/pull/50487))
-- Search block: Refactor to use HTML Tag Processor. ([51273](https://github.com/WordPress/gutenberg/pull/51273))
-- Post Link: Update block variation icon to match the one used in the Link UI results. ([50190](https://github.com/WordPress/gutenberg/pull/50190))
-- Post Template: Add block spacing and layout. ([49050](https://github.com/WordPress/gutenberg/pull/49050))
-
-#### Components
-- Button: Add opt-in prop for larger `isSmall` size. ([51012](https://github.com/WordPress/gutenberg/pull/51012))
-- ListView: Converted additional content render into a component. ([51163](https://github.com/WordPress/gutenberg/pull/51163))
-- ColorPalette: Improve color name readability. ([50450](https://github.com/WordPress/gutenberg/pull/50450))
-- Spacing: Optimize and condense unlinked spacing controls. ([50660](https://github.com/WordPress/gutenberg/pull/50660))
+
+-   Add `delete` action for pages in navigation sidebar. ([51101](https://github.com/WordPress/gutenberg/pull/51101))
+-   Add page details to the Site Editor sidebar. ([50767](https://github.com/WordPress/gutenberg/pull/50767))
+-   Add Paragraph prompt to Post Content when empty. ([50623](https://github.com/WordPress/gutenberg/pull/50623))
+-   Add template actions in site editor navigation sidebar. ([51054](https://github.com/WordPress/gutenberg/pull/51054))
+-   Add the ability to create a new page in the Site Editor. ([50565](https://github.com/WordPress/gutenberg/pull/50565))
+-   Add the ability to focus on editing a page's content vs the page's template. ([50857](https://github.com/WordPress/gutenberg/pull/50857))
+-   Directly save if only changing current context. ([50567](https://github.com/WordPress/gutenberg/pull/50567))
+-   Disable block supports derived design tools when Blocking Editing Mode is not `default`. ([50912](https://github.com/WordPress/gutenberg/pull/50912))
+-   DocumentActions: Animate between page and template mode. ([51224](https://github.com/WordPress/gutenberg/pull/51224))
+-   Site Editor sidebar: Refactor page details. ([51093](https://github.com/WordPress/gutenberg/pull/51093))
+-   Styles Screen: Add link to global styles revisions. ([51149](https://github.com/WordPress/gutenberg/pull/51149))
+-   Try adding dynamic page templates to pages section. ([50630](https://github.com/WordPress/gutenberg/pull/50630))
+-   Tweak edit site resizable frame handle. ([50878](https://github.com/WordPress/gutenberg/pull/50878))
+-   Update the bottom sticky section in the site editor details panel. ([51274](https://github.com/WordPress/gutenberg/pull/51274))
+
+#### Block Library
+
+-   Details Block: Remove experimental flag and stabilize. ([50997](https://github.com/WordPress/gutenberg/pull/50997))
+-   Post Excerpt: Improve preview on the editor site. ([50167](https://github.com/WordPress/gutenberg/pull/50167))
+-   Post Title: Improve preview on the editor site. ([50147](https://github.com/WordPress/gutenberg/pull/50147))
+-   Query Pagination: Address feedback from #50779. ([51165](https://github.com/WordPress/gutenberg/pull/51165))
+-   Query Pagination: Allow hiding the label text. ([50779](https://github.com/WordPress/gutenberg/pull/50779))
+-   Search Block: Add button only with expandable input. ([50487](https://github.com/WordPress/gutenberg/pull/50487))
+-   Search block: Refactor to use HTML Tag Processor. ([51273](https://github.com/WordPress/gutenberg/pull/51273))
+-   Post Link: Update block variation icon to match the one used in the Link UI results. ([50190](https://github.com/WordPress/gutenberg/pull/50190))
+-   Post Template: Add block spacing and layout. ([49050](https://github.com/WordPress/gutenberg/pull/49050))
+
+#### Components
+
+-   Button: Add opt-in prop for larger `isSmall` size. ([51012](https://github.com/WordPress/gutenberg/pull/51012))
+-   ListView: Converted additional content render into a component. ([51163](https://github.com/WordPress/gutenberg/pull/51163))
+-   ColorPalette: Improve color name readability. ([50450](https://github.com/WordPress/gutenberg/pull/50450))
+-   Spacing: Optimize and condense unlinked spacing controls. ([50660](https://github.com/WordPress/gutenberg/pull/50660))
 
 #### Data Layer
-- Merge selector-binding code (except resolvers) into a new bindSelector function. ([51176](https://github.com/WordPress/gutenberg/pull/51176))
-- Move action-binding code to a bindAction function. ([51161](https://github.com/WordPress/gutenberg/pull/51161))
+
+-   Merge selector-binding code (except resolvers) into a new bindSelector function. ([51176](https://github.com/WordPress/gutenberg/pull/51176))
+-   Move action-binding code to a bindAction function. ([51161](https://github.com/WordPress/gutenberg/pull/51161))
 
 #### Accessibility
-- Add TabPanel to document overview replacing fake tabs. ([50199](https://github.com/WordPress/gutenberg/pull/50199))
-- BorderControl: Improve color code readability in aria-label. ([51197](https://github.com/WordPress/gutenberg/pull/51197))
-- Handle isDraft or isInvalid Enter keypress via onKeyDown instead of a Keyboard Shortcut. ([51021](https://github.com/WordPress/gutenberg/pull/51021))
-- ListView: Allow deleting blocks using keyboard. ([50422](https://github.com/WordPress/gutenberg/pull/50422))
-- Site Editor: Add view site link to site editor nav. ([50420](https://github.com/WordPress/gutenberg/pull/50420))
-- Use generic `div` instead of nav for the SidebarNavigationScreen component. ([51111](https://github.com/WordPress/gutenberg/pull/51111))
+
+-   Add TabPanel to document overview replacing fake tabs. ([50199](https://github.com/WordPress/gutenberg/pull/50199))
+-   BorderControl: Improve color code readability in aria-label. ([51197](https://github.com/WordPress/gutenberg/pull/51197))
+-   Handle isDraft or isInvalid Enter keypress via onKeyDown instead of a Keyboard Shortcut. ([51021](https://github.com/WordPress/gutenberg/pull/51021))
+-   ListView: Allow deleting blocks using keyboard. ([50422](https://github.com/WordPress/gutenberg/pull/50422))
+-   Site Editor: Add view site link to site editor nav. ([50420](https://github.com/WordPress/gutenberg/pull/50420))
+-   Use generic `div` instead of nav for the SidebarNavigationScreen component. ([51111](https://github.com/WordPress/gutenberg/pull/51111))
 
 ### New APIs
 
-- Command Center: Marks the selectors and actions of the commands store as a public API. ([51169](https://github.com/WordPress/gutenberg/pull/51169))
+-   Command Center: Marks the selectors and actions of the commands store as a public API. ([51169](https://github.com/WordPress/gutenberg/pull/51169))
 
 ### Bug Fixes
 
 #### Block Editor
-- Add inert attribute to disabled blocks that have only disabled descendants. ([51079](https://github.com/WordPress/gutenberg/pull/51079))
-- Fix multi-entity multi-property undo redo. ([50911](https://github.com/WordPress/gutenberg/pull/50911))
-- Hide the save draft button for published posts. ([51193](https://github.com/WordPress/gutenberg/pull/51193))
-- Iframe enqueuing: Add editorStyle and warning. ([50091](https://github.com/WordPress/gutenberg/pull/50091))
-- Improvements to how blocks with a 'disabled' editing mode behave. ([51148](https://github.com/WordPress/gutenberg/pull/51148))
-- Link Control: Add missing translation. ([51081](https://github.com/WordPress/gutenberg/pull/51081))
-- Make sure post content always has correct layout. ([51431](https://github.com/WordPress/gutenberg/pull/51431))
-- Navigation: Memoize link value passed to the LinkControl. ([51155](https://github.com/WordPress/gutenberg/pull/51155))
+
+-   Add inert attribute to disabled blocks that have only disabled descendants. ([51079](https://github.com/WordPress/gutenberg/pull/51079))
+-   Fix multi-entity multi-property undo redo. ([50911](https://github.com/WordPress/gutenberg/pull/50911))
+-   Hide the save draft button for published posts. ([51193](https://github.com/WordPress/gutenberg/pull/51193))
+-   Iframe enqueuing: Add editorStyle and warning. ([50091](https://github.com/WordPress/gutenberg/pull/50091))
+-   Improvements to how blocks with a 'disabled' editing mode behave. ([51148](https://github.com/WordPress/gutenberg/pull/51148))
+-   Link Control: Add missing translation. ([51081](https://github.com/WordPress/gutenberg/pull/51081))
+-   Make sure post content always has correct layout. ([51431](https://github.com/WordPress/gutenberg/pull/51431))
+-   Navigation: Memoize link value passed to the LinkControl. ([51155](https://github.com/WordPress/gutenberg/pull/51155))
 
 #### Site Editor
-- Browse Mode: Remove horizontal scrollbar during screen transitions. ([51189](https://github.com/WordPress/gutenberg/pull/51189))
-- Fix styling of actions in site editor navigation sidebar. ([51153](https://github.com/WordPress/gutenberg/pull/51153))
-- Properly decode new template title in snackbar. ([51057](https://github.com/WordPress/gutenberg/pull/51057))
-- Site Editor: Update untitled copy and rendering. ([51074](https://github.com/WordPress/gutenberg/pull/51074))
+
+-   Browse Mode: Remove horizontal scrollbar during screen transitions. ([51189](https://github.com/WordPress/gutenberg/pull/51189))
+-   Fix styling of actions in site editor navigation sidebar. ([51153](https://github.com/WordPress/gutenberg/pull/51153))
+-   Properly decode new template title in snackbar. ([51057](https://github.com/WordPress/gutenberg/pull/51057))
+-   Site Editor: Update untitled copy and rendering. ([51074](https://github.com/WordPress/gutenberg/pull/51074))
 
 #### Widgets Editor
-- Update the settings icon in Widgets Editor. ([51029](https://github.com/WordPress/gutenberg/pull/51029))
+
+-   Update the settings icon in Widgets Editor. ([51029](https://github.com/WordPress/gutenberg/pull/51029))
 
 #### Block Library
-- Freeform/Shortcode: Prevent blocks from converting HTML entities. ([51123](https://github.com/WordPress/gutenberg/pull/51123))
-- Navigation: Apply color classes to the navigation container element. ([50968](https://github.com/WordPress/gutenberg/pull/50968))
-- Post Template: Set block context via filter. ([50313](https://github.com/WordPress/gutenberg/pull/50313))
-- Post Template: Output number of columns as classname for backwards compatibility. ([51358](https://github.com/WordPress/gutenberg/pull/51358))
-- Post Title: Fix autofocus when iframed. ([51331](https://github.com/WordPress/gutenberg/pull/51331), [51367](https://github.com/WordPress/gutenberg/pull/51367))
-- Query: Fix deprecation error when migrating layout. ([51311](https://github.com/WordPress/gutenberg/pull/51311))
-- Term Description: Handle default margin styles. ([51137](https://github.com/WordPress/gutenberg/pull/51137))
+
+-   Freeform/Shortcode: Prevent blocks from converting HTML entities. ([51123](https://github.com/WordPress/gutenberg/pull/51123))
+-   Navigation: Apply color classes to the navigation container element. ([50968](https://github.com/WordPress/gutenberg/pull/50968))
+-   Post Template: Set block context via filter. ([50313](https://github.com/WordPress/gutenberg/pull/50313))
+-   Post Template: Output number of columns as classname for backwards compatibility. ([51358](https://github.com/WordPress/gutenberg/pull/51358))
+-   Post Title: Fix autofocus when iframed. ([51331](https://github.com/WordPress/gutenberg/pull/51331), [51367](https://github.com/WordPress/gutenberg/pull/51367))
+-   Query: Fix deprecation error when migrating layout. ([51311](https://github.com/WordPress/gutenberg/pull/51311))
+-   Term Description: Handle default margin styles. ([51137](https://github.com/WordPress/gutenberg/pull/51137))
 
 #### Global Styles
-- DimensionsPanel: Fix site editor error on Columns block level screen. ([51252](https://github.com/WordPress/gutenberg/pull/51252))
-- Fluid typography: Ensure max viewport width is used in the editor. ([51146](https://github.com/WordPress/gutenberg/pull/51146))
-- Global styles revisions: Ensure redirect runs once for back button. ([51316](https://github.com/WordPress/gutenberg/pull/51316))
-- SpacingSizesControl: Fix problem with the slider position being reset when saving global styles. ([50956](https://github.com/WordPress/gutenberg/pull/50956))
-- Styles Screen: Ensure variations previews will render in mobile viewports. ([51080](https://github.com/WordPress/gutenberg/pull/51080))
+
+-   DimensionsPanel: Fix site editor error on Columns block level screen. ([51252](https://github.com/WordPress/gutenberg/pull/51252))
+-   Fluid typography: Ensure max viewport width is used in the editor. ([51146](https://github.com/WordPress/gutenberg/pull/51146))
+-   Global styles revisions: Ensure redirect runs once for back button. ([51316](https://github.com/WordPress/gutenberg/pull/51316))
+-   SpacingSizesControl: Fix problem with the slider position being reset when saving global styles. ([50956](https://github.com/WordPress/gutenberg/pull/50956))
+-   Styles Screen: Ensure variations previews will render in mobile viewports. ([51080](https://github.com/WordPress/gutenberg/pull/51080))
 
 #### Components
-- Fix: Can't type space if `RichText` component is inside button/summary in Firefox. ([50540](https://github.com/WordPress/gutenberg/pull/50540))
-- FontSizePicker: Fix control header spacing. ([50855](https://github.com/WordPress/gutenberg/pull/50855))
+
+-   Fix: Can't type space if `RichText` component is inside button/summary in Firefox. ([50540](https://github.com/WordPress/gutenberg/pull/50540))
+-   FontSizePicker: Fix control header spacing. ([50855](https://github.com/WordPress/gutenberg/pull/50855))
 
 #### Themes
-- Avoid changing non-theme-preview requests. ([51221](https://github.com/WordPress/gutenberg/pull/51221))
+
+-   Avoid changing non-theme-preview requests. ([51221](https://github.com/WordPress/gutenberg/pull/51221))
 
 #### Data Layer
-- Data: Fix a bug where private selectors on a store with resolvers are inaccessible. ([51166](https://github.com/WordPress/gutenberg/pull/51166))
+
+-   Data: Fix a bug where private selectors on a store with resolvers are inaccessible. ([51166](https://github.com/WordPress/gutenberg/pull/51166))
 
 #### Accessibility
-- Add aria labels to the focal point picker component. ([50993](https://github.com/WordPress/gutenberg/pull/50993))
-- Block Toolbar: Fix text only label for locked blocks. ([50944](https://github.com/WordPress/gutenberg/pull/50944))
-- Fix Navigable Toolbar initialIndex. ([51181](https://github.com/WordPress/gutenberg/pull/51181))
-- Fix screen readers not announcing updated `aria-describedby` in Firefox. ([51035](https://github.com/WordPress/gutenberg/pull/51035))
-- Link Control: Fix the 'Save' button's disabled state. ([51117](https://github.com/WordPress/gutenberg/pull/51117))
-- Social Icons: Manually set Snapchat label color. ([51237](https://github.com/WordPress/gutenberg/pull/51237))
+
+-   Add aria labels to the focal point picker component. ([50993](https://github.com/WordPress/gutenberg/pull/50993))
+-   Block Toolbar: Fix text only label for locked blocks. ([50944](https://github.com/WordPress/gutenberg/pull/50944))
+-   Fix Navigable Toolbar initialIndex. ([51181](https://github.com/WordPress/gutenberg/pull/51181))
+-   Fix screen readers not announcing updated `aria-describedby` in Firefox. ([51035](https://github.com/WordPress/gutenberg/pull/51035))
+-   Link Control: Fix the 'Save' button's disabled state. ([51117](https://github.com/WordPress/gutenberg/pull/51117))
+-   Social Icons: Manually set Snapchat label color. ([51237](https://github.com/WordPress/gutenberg/pull/51237))
 
 ### Performance
 
-- Make getBlockEditingMode() return 'default' when parent is 'contentOnly'. ([51185](https://github.com/WordPress/gutenberg/pull/51185))
-- Use static closures when not using $this. ([50723](https://github.com/WordPress/gutenberg/pull/50723))
-- Add `removeAllNotices` action to allow all notices to be removed from a given context. ([44059](https://github.com/WordPress/gutenberg/pull/44059))
-- Add a new action `removeNotices` which allows bulk removal of notices. ([39940](https://github.com/WordPress/gutenberg/pull/39940))
+-   Make getBlockEditingMode() return 'default' when parent is 'contentOnly'. ([51185](https://github.com/WordPress/gutenberg/pull/51185))
+-   Use static closures when not using $this. ([50723](https://github.com/WordPress/gutenberg/pull/50723))
+-   Add `removeAllNotices` action to allow all notices to be removed from a given context. ([44059](https://github.com/WordPress/gutenberg/pull/44059))
+-   Add a new action `removeNotices` which allows bulk removal of notices. ([39940](https://github.com/WordPress/gutenberg/pull/39940))
 
 ### Experiments
 
 #### Interactivity API
-- Change label and description for the `gutenberg-interactivity-api-core-blocks` experiments setting. ([51059](https://github.com/WordPress/gutenberg/pull/51059))
-- Disable Lightbox UI if link has an image. ([51180](https://github.com/WordPress/gutenberg/pull/51180))
-- Experiment: Put directives on <figure> element and insert lightbox as its child. ([51089](https://github.com/WordPress/gutenberg/pull/51089))
-- Image Lightbox: Add a reset button. ([51239](https://github.com/WordPress/gutenberg/pull/51239))
-- Image Lightbox: Add support for external urls in the lightbox. ([51278](https://github.com/WordPress/gutenberg/pull/51278))
-- Image Lightbox: Fix design of close button for the lightbox (correct PR). ([51206](https://github.com/WordPress/gutenberg/pull/51206))
-- Image Lightbox: Improve image block lightbox escaping. ([51061](https://github.com/WordPress/gutenberg/pull/51061))
-- Move the directives and markup needed for the lightbox to block supports. ([51232](https://github.com/WordPress/gutenberg/pull/51232))
-- Navigation block: Set correct aria-expanded on hover. ([50953](https://github.com/WordPress/gutenberg/pull/50953))
-- Remove experimental flag from navigation and file blocks to use the Interactivity API (as private). ([51266](https://github.com/WordPress/gutenberg/pull/51266))
-- Rename directives suffix character and island directive in the Interactivity API. ([51152](https://github.com/WordPress/gutenberg/pull/51152))
-- Remove not needed aria-hidden attribute in navigation block experiment. ([51044](https://github.com/WordPress/gutenberg/pull/51044))
+
+-   Change label and description for the `gutenberg-interactivity-api-core-blocks` experiments setting. ([51059](https://github.com/WordPress/gutenberg/pull/51059))
+-   Disable Lightbox UI if link has an image. ([51180](https://github.com/WordPress/gutenberg/pull/51180))
+-   Experiment: Put directives on <figure> element and insert lightbox as its child. ([51089](https://github.com/WordPress/gutenberg/pull/51089))
+-   Image Lightbox: Add a reset button. ([51239](https://github.com/WordPress/gutenberg/pull/51239))
+-   Image Lightbox: Add support for external urls in the lightbox. ([51278](https://github.com/WordPress/gutenberg/pull/51278))
+-   Image Lightbox: Fix design of close button for the lightbox (correct PR). ([51206](https://github.com/WordPress/gutenberg/pull/51206))
+-   Image Lightbox: Improve image block lightbox escaping. ([51061](https://github.com/WordPress/gutenberg/pull/51061))
+-   Move the directives and markup needed for the lightbox to block supports. ([51232](https://github.com/WordPress/gutenberg/pull/51232))
+-   Navigation block: Set correct aria-expanded on hover. ([50953](https://github.com/WordPress/gutenberg/pull/50953))
+-   Remove experimental flag from navigation and file blocks to use the Interactivity API (as private). ([51266](https://github.com/WordPress/gutenberg/pull/51266))
+-   Rename directives suffix character and island directive in the Interactivity API. ([51152](https://github.com/WordPress/gutenberg/pull/51152))
+-   Remove not needed aria-hidden attribute in navigation block experiment. ([51044](https://github.com/WordPress/gutenberg/pull/51044))
 
 #### DropdownMenu v2
-- Change default placement to match the legacy DropdownMenu component. ([51133](https://github.com/WordPress/gutenberg/pull/51133))
-- Render in the default Popover.Slot. ([51046](https://github.com/WordPress/gutenberg/pull/51046))
-- Style tweaks. ([50967](https://github.com/WordPress/gutenberg/pull/50967))
-- Tweak styles, add toolbar-specific styles. ([51097](https://github.com/WordPress/gutenberg/pull/51097))
+
+-   Change default placement to match the legacy DropdownMenu component. ([51133](https://github.com/WordPress/gutenberg/pull/51133))
+-   Render in the default Popover.Slot. ([51046](https://github.com/WordPress/gutenberg/pull/51046))
+-   Style tweaks. ([50967](https://github.com/WordPress/gutenberg/pull/50967))
+-   Tweak styles, add toolbar-specific styles. ([51097](https://github.com/WordPress/gutenberg/pull/51097))
 
 ### Documentation
 
-- Add documentation about the entities abstraction and the undo/redo stack. ([51052](https://github.com/WordPress/gutenberg/pull/51052))
-- Fix code example error in the Curating the Editor doc. ([51070](https://github.com/WordPress/gutenberg/pull/51070))
-- Fix formatting and use sentence case for titles in Scripts doc. ([51069](https://github.com/WordPress/gutenberg/pull/51069))
-- Fix headings in the View component readme. ([51157](https://github.com/WordPress/gutenberg/pull/51157))
-- Fix text in readme. ([51268](https://github.com/WordPress/gutenberg/pull/51268))
-- Remove Block Grammar doc and all corresponding internal links. ([51106](https://github.com/WordPress/gutenberg/pull/51106))
-- Remove Roadmap doc. ([51062](https://github.com/WordPress/gutenberg/pull/51062))
-- Undo/Redo: Minor edits. ([51085](https://github.com/WordPress/gutenberg/pull/51085))
-- Update README.md on SlotFills to add info + example about the prop `fillProps`. ([51013](https://github.com/WordPress/gutenberg/pull/51013))
-- Update React documentation link for propTypes. ([51208](https://github.com/WordPress/gutenberg/pull/51208))
+-   Add documentation about the entities abstraction and the undo/redo stack. ([51052](https://github.com/WordPress/gutenberg/pull/51052))
+-   Fix code example error in the Curating the Editor doc. ([51070](https://github.com/WordPress/gutenberg/pull/51070))
+-   Fix formatting and use sentence case for titles in Scripts doc. ([51069](https://github.com/WordPress/gutenberg/pull/51069))
+-   Fix headings in the View component readme. ([51157](https://github.com/WordPress/gutenberg/pull/51157))
+-   Fix text in readme. ([51268](https://github.com/WordPress/gutenberg/pull/51268))
+-   Remove Block Grammar doc and all corresponding internal links. ([51106](https://github.com/WordPress/gutenberg/pull/51106))
+-   Remove Roadmap doc. ([51062](https://github.com/WordPress/gutenberg/pull/51062))
+-   Undo/Redo: Minor edits. ([51085](https://github.com/WordPress/gutenberg/pull/51085))
+-   Update README.md on SlotFills to add info + example about the prop `fillProps`. ([51013](https://github.com/WordPress/gutenberg/pull/51013))
+-   Update React documentation link for propTypes. ([51208](https://github.com/WordPress/gutenberg/pull/51208))
 
 ### Code Quality
-- Extract BlockThemePreviews-related code from the editor package. ([50863](https://github.com/WordPress/gutenberg/pull/50863))
-- Fluid typography: Extract logic to derive fluid typography settings. ([51188](https://github.com/WordPress/gutenberg/pull/51188))
-- Fonts API: Refactor Theme JSON global functions into WP_Fonts_Resolver. ([50811](https://github.com/WordPress/gutenberg/pull/50811))
-- Iframe: Clarify how dependencies related to inline styles work. ([51199](https://github.com/WordPress/gutenberg/pull/51199))
-- Iframe: Fix blob cleanup. ([51004](https://github.com/WordPress/gutenberg/pull/51004))
-- Iframe: Remove obsolete readyState checks. ([51003](https://github.com/WordPress/gutenberg/pull/51003))
-- Iframe: Remove obsolete styles HTML parsing. ([51136](https://github.com/WordPress/gutenberg/pull/51136))
-- Lodash: Remove `_.isEmpty()`. ([51096](https://github.com/WordPress/gutenberg/pull/51096), [50974](https://github.com/WordPress/gutenberg/pull/50974), [51098](https://github.com/WordPress/gutenberg/pull/51098), [50917](https://github.com/WordPress/gutenberg/pull/50917), [51168](https://github.com/WordPress/gutenberg/pull/51168))
-- mapSelectorsWithResolvers: Don't init hasResolver, mapSelectors already did it. ([51160](https://github.com/WordPress/gutenberg/pull/51160))
-- mapValues: Use fromEntries, avoid re-creating object in each reducer call. ([51159](https://github.com/WordPress/gutenberg/pull/51159))
-- Refactor code that adds resolver fulfillment to selector calls. ([51009](https://github.com/WordPress/gutenberg/pull/51009))
-- Remove legacy logic for `__unstableResolvedAssets`. ([51100](https://github.com/WordPress/gutenberg/pull/51100))
-- Remove outdated Babel spread optimization from selectors. ([50987](https://github.com/WordPress/gutenberg/pull/50987))
-- Remove the insert.ref field from insertUsage data. ([51130](https://github.com/WordPress/gutenberg/pull/51130))
-- Rename 'page content lock' to 'page content focus'. ([51280](https://github.com/WordPress/gutenberg/pull/51280))
-- Separate template screens in the Site Editor. ([51040](https://github.com/WordPress/gutenberg/pull/51040))
-- Writing flow: Fix tab into iframe. ([50955](https://github.com/WordPress/gutenberg/pull/50955))
-
-#### Block Editor
-- Refactor Link Control Settings Drawer to avoid unnecessary prop drilling. ([50963](https://github.com/WordPress/gutenberg/pull/50963))
-- ListView: Remove unused 'useSelect' dependency. ([51134](https://github.com/WordPress/gutenberg/pull/51134))
-
-#### Components
-- BlockDraggable: Use the getBlockType selector. ([51174](https://github.com/WordPress/gutenberg/pull/51174))
-- PreferenceToggleMenuItem: Add missing useSelect dependency. ([51158](https://github.com/WordPress/gutenberg/pull/51158))
+
+-   Extract BlockThemePreviews-related code from the editor package. ([50863](https://github.com/WordPress/gutenberg/pull/50863))
+-   Fluid typography: Extract logic to derive fluid typography settings. ([51188](https://github.com/WordPress/gutenberg/pull/51188))
+-   Fonts API: Refactor Theme JSON global functions into WP_Fonts_Resolver. ([50811](https://github.com/WordPress/gutenberg/pull/50811))
+-   Iframe: Clarify how dependencies related to inline styles work. ([51199](https://github.com/WordPress/gutenberg/pull/51199))
+-   Iframe: Fix blob cleanup. ([51004](https://github.com/WordPress/gutenberg/pull/51004))
+-   Iframe: Remove obsolete readyState checks. ([51003](https://github.com/WordPress/gutenberg/pull/51003))
+-   Iframe: Remove obsolete styles HTML parsing. ([51136](https://github.com/WordPress/gutenberg/pull/51136))
+-   Lodash: Remove `_.isEmpty()`. ([51096](https://github.com/WordPress/gutenberg/pull/51096), [50974](https://github.com/WordPress/gutenberg/pull/50974), [51098](https://github.com/WordPress/gutenberg/pull/51098), [50917](https://github.com/WordPress/gutenberg/pull/50917), [51168](https://github.com/WordPress/gutenberg/pull/51168))
+-   mapSelectorsWithResolvers: Don't init hasResolver, mapSelectors already did it. ([51160](https://github.com/WordPress/gutenberg/pull/51160))
+-   mapValues: Use fromEntries, avoid re-creating object in each reducer call. ([51159](https://github.com/WordPress/gutenberg/pull/51159))
+-   Refactor code that adds resolver fulfillment to selector calls. ([51009](https://github.com/WordPress/gutenberg/pull/51009))
+-   Remove legacy logic for `__unstableResolvedAssets`. ([51100](https://github.com/WordPress/gutenberg/pull/51100))
+-   Remove outdated Babel spread optimization from selectors. ([50987](https://github.com/WordPress/gutenberg/pull/50987))
+-   Remove the insert.ref field from insertUsage data. ([51130](https://github.com/WordPress/gutenberg/pull/51130))
+-   Rename 'page content lock' to 'page content focus'. ([51280](https://github.com/WordPress/gutenberg/pull/51280))
+-   Separate template screens in the Site Editor. ([51040](https://github.com/WordPress/gutenberg/pull/51040))
+-   Writing flow: Fix tab into iframe. ([50955](https://github.com/WordPress/gutenberg/pull/50955))
+
+#### Block Editor
+
+-   Refactor Link Control Settings Drawer to avoid unnecessary prop drilling. ([50963](https://github.com/WordPress/gutenberg/pull/50963))
+-   ListView: Remove unused 'useSelect' dependency. ([51134](https://github.com/WordPress/gutenberg/pull/51134))
+
+#### Components
+
+-   BlockDraggable: Use the getBlockType selector. ([51174](https://github.com/WordPress/gutenberg/pull/51174))
+-   PreferenceToggleMenuItem: Add missing useSelect dependency. ([51158](https://github.com/WordPress/gutenberg/pull/51158))
 
 ### Tools
 
 #### wp-env
-- Fixed Docker Image Size Ballooning. ([51034](https://github.com/WordPress/gutenberg/pull/51034))
-- Preferentially Execute Local `wp-env`. ([50980](https://github.com/WordPress/gutenberg/pull/50980))
+
+-   Fixed Docker Image Size Ballooning. ([51034](https://github.com/WordPress/gutenberg/pull/51034))
+-   Preferentially Execute Local `wp-env`. ([50980](https://github.com/WordPress/gutenberg/pull/50980))
 
 #### Scripts
-- Scripts: Optimize updating render paths when developing blocks. ([51162](https://github.com/WordPress/gutenberg/pull/51162))
-- Fix: Build render.php when webpack watch in progress. ([50939](https://github.com/WordPress/gutenberg/pull/50939))
+
+-   Scripts: Optimize updating render paths when developing blocks. ([51162](https://github.com/WordPress/gutenberg/pull/51162))
+-   Fix: Build render.php when webpack watch in progress. ([50939](https://github.com/WordPress/gutenberg/pull/50939))
 
 #### Testing
-- Add tests to `useIsDirty`. ([51036](https://github.com/WordPress/gutenberg/pull/51036))
-- Button: Add basic visual regression tests. ([51000](https://github.com/WordPress/gutenberg/pull/51000))
-- Comment Template Block: Add test coverage for context setting. ([50879](https://github.com/WordPress/gutenberg/pull/50879))
-- Comment Template Block: Retain inner blocks inserted via render_block_data filter. ([50883](https://github.com/WordPress/gutenberg/pull/50883))
-- Fix flaky Behaviors UI end-to-end tests. ([50954](https://github.com/WordPress/gutenberg/pull/50954))
-- Ignore framer-motion warning when running end-to-end tests locally. ([50938](https://github.com/WordPress/gutenberg/pull/50938))
-- Link Control test migration: Should contain a label when it should open in a new tab. ([51001](https://github.com/WordPress/gutenberg/pull/51001))
-- Link control: Migrate tests to Playwright. Can be created by selecting text and using keyboard shortcuts. ([50996](https://github.com/WordPress/gutenberg/pull/50996))
-- End-to-end tests: Add an assertion to confirm that the URL changed. ([50835](https://github.com/WordPress/gutenberg/pull/50835))
+
+-   Add tests to `useIsDirty`. ([51036](https://github.com/WordPress/gutenberg/pull/51036))
+-   Button: Add basic visual regression tests. ([51000](https://github.com/WordPress/gutenberg/pull/51000))
+-   Comment Template Block: Add test coverage for context setting. ([50879](https://github.com/WordPress/gutenberg/pull/50879))
+-   Comment Template Block: Retain inner blocks inserted via render_block_data filter. ([50883](https://github.com/WordPress/gutenberg/pull/50883))
+-   Fix flaky Behaviors UI end-to-end tests. ([50954](https://github.com/WordPress/gutenberg/pull/50954))
+-   Ignore framer-motion warning when running end-to-end tests locally. ([50938](https://github.com/WordPress/gutenberg/pull/50938))
+-   Link Control test migration: Should contain a label when it should open in a new tab. ([51001](https://github.com/WordPress/gutenberg/pull/51001))
+-   Link control: Migrate tests to Playwright. Can be created by selecting text and using keyboard shortcuts. ([50996](https://github.com/WordPress/gutenberg/pull/50996))
+-   End-to-end tests: Add an assertion to confirm that the URL changed. ([50835](https://github.com/WordPress/gutenberg/pull/50835))
 
 #### Build Tooling
-- babel-preset-default: Enable the bugfixes option for preset-env. ([50994](https://github.com/WordPress/gutenberg/pull/50994))
 
-## First time contributors
+-   babel-preset-default: Enable the bugfixes option for preset-env. ([50994](https://github.com/WordPress/gutenberg/pull/50994))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @okmttdhr: Extract BlockThemePreviews-related code from the editor package. ([50863](https://github.com/WordPress/gutenberg/pull/50863))
-- @SaxonF: Directly save if only changing current context. ([50567](https://github.com/WordPress/gutenberg/pull/50567))
-- @Takshil-Kunadia: fix: Build render.php when webpack watch in progress. ([50939](https://github.com/WordPress/gutenberg/pull/50939))
-- @wayheming: Docs: Fix text in readme. ([51268](https://github.com/WordPress/gutenberg/pull/51268))
+The following PRs were merged by first-time contributors:
 
+-   @okmttdhr: Extract BlockThemePreviews-related code from the editor package. ([50863](https://github.com/WordPress/gutenberg/pull/50863))
+-   @SaxonF: Directly save if only changing current context. ([50567](https://github.com/WordPress/gutenberg/pull/50567))
+-   @Takshil-Kunadia: fix: Build render.php when webpack watch in progress. ([50939](https://github.com/WordPress/gutenberg/pull/50939))
+-   @wayheming: Docs: Fix text in readme. ([51268](https://github.com/WordPress/gutenberg/pull/51268))
 
 ## Contributors
 
@@ -5052,28 +16028,25 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @alexstine @andrewserong @anton-vlasenko @artemiomorales @benlk @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @derekblank @ellatrix @fluiddot @geriux @getdave @gigitux @glendaviesnz @gziolo @jameskoster @jeryj @jffng @jsnajdr @juanfra @kevin940726 @luisherranz @MaggieCabrera @Mamaduka @mcsf @michalczaplinski @mikachan @mirka @ndiego @noisysocks @ntsekouras @oandregal @ObliviousHarmony @ockham @okmttdhr @opr @ramonjd @richtabor @rmorse @SantosGuillamot @SaxonF @scruffian @SiobhyB @t-hamano @Takshil-Kunadia @tellthemachines @tyxla @wayheming @westonruter @youknowriad
 
-
 = 15.9.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Fonts API
-- [Fonts API] Make local font asset file URL absolute. ([51178](https://github.com/WordPress/gutenberg/pull/51178))
+
+-   [Fonts API] Make local font asset file URL absolute. ([51178](https://github.com/WordPress/gutenberg/pull/51178))
 
 #### Block Library
-- Social Icons: Add color classes so icon colors correctly reflect changes in Global Styles. ([51020](https://github.com/WordPress/gutenberg/pull/51020))
 
+-   Social Icons: Add color classes so icon colors correctly reflect changes in Global Styles. ([51020](https://github.com/WordPress/gutenberg/pull/51020))
 
 ## Contributors
 
 The following contributors merged PRs in this release:
 
-@hellofromtonya @ndiego 
-
+@hellofromtonya @ndiego
 
 = 15.9.0 =
 
@@ -5082,276 +16055,308 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Add block variations transformation in block switcher. ([50139](https://github.com/WordPress/gutenberg/pull/50139))
-- Code block: Add wide align support. ([50710](https://github.com/WordPress/gutenberg/pull/50710))
-- Post Title edit: Adjust the logic, so it avoids unnecessary OPTIONS requests. ([49839](https://github.com/WordPress/gutenberg/pull/49839))
-- Pattern block: Add experimental flag and syncStatus attrib to allow testing of partial syncing. ([50533](https://github.com/WordPress/gutenberg/pull/50533))
-- Pattern block: Add slug as classname to pattern block wrapper. ([50641](https://github.com/WordPress/gutenberg/pull/50641))
-- Removes the Post Content block from the inserter in the post editor. ([50620](https://github.com/WordPress/gutenberg/pull/50620))
-- Navigation: Handle empty menus in Navigation Browse Mode. ([50870](https://github.com/WordPress/gutenberg/pull/50870))
-- Navigation: browse mode list all Navigation Menus. ([50840](https://github.com/WordPress/gutenberg/pull/50840))
-- Navigation: remove all edit functionality in Browse Mode. ([50788](https://github.com/WordPress/gutenberg/pull/50788))
-- Navigation: Use the ListView in the Navigation block inspector controls. ([49417](https://github.com/WordPress/gutenberg/pull/49417))
-- Navigation: Respect showAppender when there are no items in list view. ([50711](https://github.com/WordPress/gutenberg/pull/50711))
+
+-   Add block variations transformation in block switcher. ([50139](https://github.com/WordPress/gutenberg/pull/50139))
+-   Code block: Add wide align support. ([50710](https://github.com/WordPress/gutenberg/pull/50710))
+-   Post Title edit: Adjust the logic, so it avoids unnecessary OPTIONS requests. ([49839](https://github.com/WordPress/gutenberg/pull/49839))
+-   Pattern block: Add experimental flag and syncStatus attrib to allow testing of partial syncing. ([50533](https://github.com/WordPress/gutenberg/pull/50533))
+-   Pattern block: Add slug as classname to pattern block wrapper. ([50641](https://github.com/WordPress/gutenberg/pull/50641))
+-   Removes the Post Content block from the inserter in the post editor. ([50620](https://github.com/WordPress/gutenberg/pull/50620))
+-   Navigation: Handle empty menus in Navigation Browse Mode. ([50870](https://github.com/WordPress/gutenberg/pull/50870))
+-   Navigation: browse mode list all Navigation Menus. ([50840](https://github.com/WordPress/gutenberg/pull/50840))
+-   Navigation: remove all edit functionality in Browse Mode. ([50788](https://github.com/WordPress/gutenberg/pull/50788))
+-   Navigation: Use the ListView in the Navigation block inspector controls. ([49417](https://github.com/WordPress/gutenberg/pull/49417))
+-   Navigation: Respect showAppender when there are no items in list view. ([50711](https://github.com/WordPress/gutenberg/pull/50711))
 
 #### Command Tool
-- Command tool available without the experimental flag. ([50781](https://github.com/WordPress/gutenberg/pull/50781))
-- Add contextual commands. ([50543](https://github.com/WordPress/gutenberg/pull/50543))
-- Marks the commands APIs as public. ([50691](https://github.com/WordPress/gutenberg/pull/50691))
-- Update the document title in the site editor to open the command tool. ([50369](https://github.com/WordPress/gutenberg/pull/50369))
+
+-   Command tool available without the experimental flag. ([50781](https://github.com/WordPress/gutenberg/pull/50781))
+-   Add contextual commands. ([50543](https://github.com/WordPress/gutenberg/pull/50543))
+-   Marks the commands APIs as public. ([50691](https://github.com/WordPress/gutenberg/pull/50691))
+-   Update the document title in the site editor to open the command tool. ([50369](https://github.com/WordPress/gutenberg/pull/50369))
 
 #### Components
-- Add an outline when the color picker select box is focused. ([50609](https://github.com/WordPress/gutenberg/pull/50609))
-- Button: Update disabled state to be without background. ([50496](https://github.com/WordPress/gutenberg/pull/50496))
-- Update tooltip colors. ([50792](https://github.com/WordPress/gutenberg/pull/50792))
+
+-   Add an outline when the color picker select box is focused. ([50609](https://github.com/WordPress/gutenberg/pull/50609))
+-   Button: Update disabled state to be without background. ([50496](https://github.com/WordPress/gutenberg/pull/50496))
+-   Update tooltip colors. ([50792](https://github.com/WordPress/gutenberg/pull/50792))
 
 #### Site Editor
-- Editor canvas container: Include resizeable iframe in component. ([50682](https://github.com/WordPress/gutenberg/pull/50682))
-- Snackbar: Make sure only one template deleted displays at once. ([50625](https://github.com/WordPress/gutenberg/pull/50625))
-- Snackbar: Simplify the template revert. ([50626](https://github.com/WordPress/gutenberg/pull/50626))
-(https://github.com/WordPress/gutenberg/pull/50369))
-- Update the add template menu. ([50595](https://github.com/WordPress/gutenberg/pull/50595))
-- Browse Mode: Add snackbar notices. ([50794](https://github.com/WordPress/gutenberg/pull/50794))
-- Site Editor navigation: Add corresponding area icon to template part menu items. ([50791](https://github.com/WordPress/gutenberg/pull/50791))
-- Update frame resizing. ([49910](https://github.com/WordPress/gutenberg/pull/49910))
-- Always show the `Styles` navigation item. ([50573](https://github.com/WordPress/gutenberg/pull/50573))
-- Sort template parts by type in navigation screen. ([50841](https://github.com/WordPress/gutenberg/pull/50841))
-- Site editor: Update custom post types with _edit_link. ([50563](https://github.com/WordPress/gutenberg/pull/50563))
+
+-   Editor canvas container: Include resizeable iframe in component. ([50682](https://github.com/WordPress/gutenberg/pull/50682))
+-   Snackbar: Make sure only one template deleted displays at once. ([50625](https://github.com/WordPress/gutenberg/pull/50625))
+-   Snackbar: Simplify the template revert. ([50626](https://github.com/WordPress/gutenberg/pull/50626))
+    (https://github.com/WordPress/gutenberg/pull/50369))
+-   Update the add template menu. ([50595](https://github.com/WordPress/gutenberg/pull/50595))
+-   Browse Mode: Add snackbar notices. ([50794](https://github.com/WordPress/gutenberg/pull/50794))
+-   Site Editor navigation: Add corresponding area icon to template part menu items. ([50791](https://github.com/WordPress/gutenberg/pull/50791))
+-   Update frame resizing. ([49910](https://github.com/WordPress/gutenberg/pull/49910))
+-   Always show the `Styles` navigation item. ([50573](https://github.com/WordPress/gutenberg/pull/50573))
+-   Sort template parts by type in navigation screen. ([50841](https://github.com/WordPress/gutenberg/pull/50841))
+-   Site editor: Update custom post types with \_edit_link. ([50563](https://github.com/WordPress/gutenberg/pull/50563))
 
 #### Interactivity API
-- Image: Add lightbox using directives. ([50373](https://github.com/WordPress/gutenberg/pull/50373))
-- File: Add experimental integration with Interactivity API. ([50377](https://github.com/WordPress/gutenberg/pull/50377))
-- Support negation operator in selectors. ([50732](https://github.com/WordPress/gutenberg/pull/50732))
+
+-   Image: Add lightbox using directives. ([50373](https://github.com/WordPress/gutenberg/pull/50373))
+-   File: Add experimental integration with Interactivity API. ([50377](https://github.com/WordPress/gutenberg/pull/50377))
+-   Support negation operator in selectors. ([50732](https://github.com/WordPress/gutenberg/pull/50732))
 
 #### Block Editor
-- Add `lang` and `dir`  attributes to text-formatting tools. ([49985](https://github.com/WordPress/gutenberg/pull/49985))
-- Use `bdo` element when defining the language of some text. ([50632](https://github.com/WordPress/gutenberg/pull/50632))
-- Block inserter: Improve alignment of block inserter search and close icons. ([50439](https://github.com/WordPress/gutenberg/pull/50439))
-- Show visual cue when dragging over empty group block. ([50826](https://github.com/WordPress/gutenberg/pull/50826))
-- Add ability to prevent editing blocks using useBlockEditingMode(). ([50643](https://github.com/WordPress/gutenberg/pull/50643))
-- Remove `unwrap` from transforms and add `ungroup` to more blocks. ([50385](https://github.com/WordPress/gutenberg/pull/50385))
-- Add new API to allow inserter items to be prioritised. ([50510](https://github.com/WordPress/gutenberg/pull/50510))
-- Integrate `prioritizedInserterBlocks` API to slash inserter. ([50658](https://github.com/WordPress/gutenberg/pull/50658))
-  
+
+-   Add `lang` and `dir` attributes to text-formatting tools. ([49985](https://github.com/WordPress/gutenberg/pull/49985))
+-   Use `bdo` element when defining the language of some text. ([50632](https://github.com/WordPress/gutenberg/pull/50632))
+-   Block inserter: Improve alignment of block inserter search and close icons. ([50439](https://github.com/WordPress/gutenberg/pull/50439))
+-   Show visual cue when dragging over empty group block. ([50826](https://github.com/WordPress/gutenberg/pull/50826))
+-   Add ability to prevent editing blocks using useBlockEditingMode(). ([50643](https://github.com/WordPress/gutenberg/pull/50643))
+-   Remove `unwrap` from transforms and add `ungroup` to more blocks. ([50385](https://github.com/WordPress/gutenberg/pull/50385))
+-   Add new API to allow inserter items to be prioritised. ([50510](https://github.com/WordPress/gutenberg/pull/50510))
+-   Integrate `prioritizedInserterBlocks` API to slash inserter. ([50658](https://github.com/WordPress/gutenberg/pull/50658))
+
 #### Global Styles
-- Custom CSS: Force display of in custom css input boxes to LTR. ([50768](https://github.com/WordPress/gutenberg/pull/50768))
-- Styles Navigation Screen: Add Style Book. ([50566](https://github.com/WordPress/gutenberg/pull/50566))
+
+-   Custom CSS: Force display of in custom css input boxes to LTR. ([50768](https://github.com/WordPress/gutenberg/pull/50768))
+-   Styles Navigation Screen: Add Style Book. ([50566](https://github.com/WordPress/gutenberg/pull/50566))
 
 #### Data Layer
-- Data: Improve `hasResolvingSelectors` redux metadata selector. ([50865](https://github.com/WordPress/gutenberg/pull/50865))
+
+-   Data: Improve `hasResolvingSelectors` redux metadata selector. ([50865](https://github.com/WordPress/gutenberg/pull/50865))
 
 #### List View
-- Remove fade in/out animation for block settings menu icon button. ([50823](https://github.com/WordPress/gutenberg/pull/50823))
+
+-   Remove fade in/out animation for block settings menu icon button. ([50823](https://github.com/WordPress/gutenberg/pull/50823))
 
 #### Full Site Editing
-- Template editing: Improve revert notices. ([50302](https://github.com/WordPress/gutenberg/pull/50302))
-- Template pattern modal: Remove internal modal classnames. ([50655](https://github.com/WordPress/gutenberg/pull/50655))
-- Library: Rename template parts to library. ([50769](https://github.com/WordPress/gutenberg/pull/50769))
+
+-   Template editing: Improve revert notices. ([50302](https://github.com/WordPress/gutenberg/pull/50302))
+-   Template pattern modal: Remove internal modal classnames. ([50655](https://github.com/WordPress/gutenberg/pull/50655))
+-   Library: Rename template parts to library. ([50769](https://github.com/WordPress/gutenberg/pull/50769))
 
 #### Accessibility
-- Modals: Update the Cancel action's button design. ([50544](https://github.com/WordPress/gutenberg/pull/50544))
-- Writing flow: Improve keyboard navigation on certain input types. ([43667](https://github.com/WordPress/gutenberg/pull/43667))
-  
+
+-   Modals: Update the Cancel action's button design. ([50544](https://github.com/WordPress/gutenberg/pull/50544))
+-   Writing flow: Improve keyboard navigation on certain input types. ([43667](https://github.com/WordPress/gutenberg/pull/43667))
+
 #### Icons
-- Add new `HeadingLevel` icons. ([50856](https://github.com/WordPress/gutenberg/pull/50856))
-- Smaller external link icon. ([50728](https://github.com/WordPress/gutenberg/pull/50728))
+
+-   Add new `HeadingLevel` icons. ([50856](https://github.com/WordPress/gutenberg/pull/50856))
+-   Smaller external link icon. ([50728](https://github.com/WordPress/gutenberg/pull/50728))
 
 ### Bug Fixes
 
 #### Block Library
-- Ensure multiple pattern blocks with the same slug each create unique blocks. ([50629](https://github.com/WordPress/gutenberg/pull/50629))
-- Fix inconsistent Link UI in Nav block list view editor. ([50774](https://github.com/WordPress/gutenberg/pull/50774))
-- Pattern block: Update frontend render code to match the new version of syncStatus attrib. ([50646](https://github.com/WordPress/gutenberg/pull/50646))
-- Revert "Browse Mode: Add snackbar notices (#50794)". ([50937](https://github.com/WordPress/gutenberg/pull/50937))
-- Update `rel` and `title` labels for navigation and submenu links. ([50214](https://github.com/WordPress/gutenberg/pull/50214))
-- Social Link: Remove block on `DELETE` if empty URL. ([50903](https://github.com/WordPress/gutenberg/pull/50903))
-- Social Link: Add color classes so icon colors correctly reflect changes in Global Styles. ([51020](https://github.com/WordPress/gutenberg/pull/51020))
-- Navigation: Duplicate LeafMoreMenu into the navigation block and the global sidebar navigation. ([50489](https://github.com/WordPress/gutenberg/pull/50489))
-- Post Comments From: Prevent hidden input fields from being focusable in Safari. ([50834](https://github.com/WordPress/gutenberg/pull/50834))
-- Image: Improve the image block lightbox translations, labelling, and escaping.  ([50962](https://github.com/WordPress/gutenberg/pull/50962))
+
+-   Ensure multiple pattern blocks with the same slug each create unique blocks. ([50629](https://github.com/WordPress/gutenberg/pull/50629))
+-   Fix inconsistent Link UI in Nav block list view editor. ([50774](https://github.com/WordPress/gutenberg/pull/50774))
+-   Pattern block: Update frontend render code to match the new version of syncStatus attrib. ([50646](https://github.com/WordPress/gutenberg/pull/50646))
+-   Revert "Browse Mode: Add snackbar notices (#50794)". ([50937](https://github.com/WordPress/gutenberg/pull/50937))
+-   Update `rel` and `title` labels for navigation and submenu links. ([50214](https://github.com/WordPress/gutenberg/pull/50214))
+-   Social Link: Remove block on `DELETE` if empty URL. ([50903](https://github.com/WordPress/gutenberg/pull/50903))
+-   Social Link: Add color classes so icon colors correctly reflect changes in Global Styles. ([51020](https://github.com/WordPress/gutenberg/pull/51020))
+-   Navigation: Duplicate LeafMoreMenu into the navigation block and the global sidebar navigation. ([50489](https://github.com/WordPress/gutenberg/pull/50489))
+-   Post Comments From: Prevent hidden input fields from being focusable in Safari. ([50834](https://github.com/WordPress/gutenberg/pull/50834))
+-   Image: Improve the image block lightbox translations, labelling, and escaping. ([50962](https://github.com/WordPress/gutenberg/pull/50962))
 
 #### Accessibility
-- Fix Multiple Tooltips from Focus Toolbar Shortcut on Site Editor. ([50349](https://github.com/WordPress/gutenberg/pull/50349))
-- Fix accessibility issues navigation block experiment. ([50786](https://github.com/WordPress/gutenberg/pull/50786))
-- Fix accessibility of the Classic block modal dialog. ([50384](https://github.com/WordPress/gutenberg/pull/50384))
-- Fix labelling, description, and focus style of the block transform to pattern previews. ([50577](https://github.com/WordPress/gutenberg/pull/50577))
-- ToggleGroupControl: Fix focus and selected style to support Windows High Contrast mode. ([50785](https://github.com/WordPress/gutenberg/pull/50785))
+
+-   Fix Multiple Tooltips from Focus Toolbar Shortcut on Site Editor. ([50349](https://github.com/WordPress/gutenberg/pull/50349))
+-   Fix accessibility issues navigation block experiment. ([50786](https://github.com/WordPress/gutenberg/pull/50786))
+-   Fix accessibility of the Classic block modal dialog. ([50384](https://github.com/WordPress/gutenberg/pull/50384))
+-   Fix labelling, description, and focus style of the block transform to pattern previews. ([50577](https://github.com/WordPress/gutenberg/pull/50577))
+-   ToggleGroupControl: Fix focus and selected style to support Windows High Contrast mode. ([50785](https://github.com/WordPress/gutenberg/pull/50785))
 
 #### Global Styles
-- Add back the global styles logic that forces the solid border when color or width applied. ([50498](https://github.com/WordPress/gutenberg/pull/50498))
-- Dimensions Panel: Fix resetting of axial spacing controls. ([50654](https://github.com/WordPress/gutenberg/pull/50654))
-- Global Styles: Enable deep linking to the selected block only in the `Blocks` screen. ([50708](https://github.com/WordPress/gutenberg/pull/50708))
-- Global styles revisions: Highlight currently-loaded revision. ([50725](https://github.com/WordPress/gutenberg/pull/50725))
-- Better error message when theme.json styles use a duotone preset not in settings. ([50714](https://github.com/WordPress/gutenberg/pull/50714))
-- Fix custom duotone filters in frontend. ([50678](https://github.com/WordPress/gutenberg/pull/50678))
+
+-   Add back the global styles logic that forces the solid border when color or width applied. ([50498](https://github.com/WordPress/gutenberg/pull/50498))
+-   Dimensions Panel: Fix resetting of axial spacing controls. ([50654](https://github.com/WordPress/gutenberg/pull/50654))
+-   Global Styles: Enable deep linking to the selected block only in the `Blocks` screen. ([50708](https://github.com/WordPress/gutenberg/pull/50708))
+-   Global styles revisions: Highlight currently-loaded revision. ([50725](https://github.com/WordPress/gutenberg/pull/50725))
+-   Better error message when theme.json styles use a duotone preset not in settings. ([50714](https://github.com/WordPress/gutenberg/pull/50714))
+-   Fix custom duotone filters in frontend. ([50678](https://github.com/WordPress/gutenberg/pull/50678))
 
 #### Command Tool
-- Command tool: Fix contextual commands selectors. ([50829](https://github.com/WordPress/gutenberg/pull/50829))
-- Command tool: Add searchLabel property to commands. ([50663](https://github.com/WordPress/gutenberg/pull/50663))
+
+-   Command tool: Fix contextual commands selectors. ([50829](https://github.com/WordPress/gutenberg/pull/50829))
+-   Command tool: Add searchLabel property to commands. ([50663](https://github.com/WordPress/gutenberg/pull/50663))
 
 #### Components
-- Add transparent outline to input control BackdropUI focus style. ([50772](https://github.com/WordPress/gutenberg/pull/50772))
-- Update border and focus style of the Input selector in ColorPicker Component. ([50703](https://github.com/WordPress/gutenberg/pull/50703))
+
+-   Add transparent outline to input control BackdropUI focus style. ([50772](https://github.com/WordPress/gutenberg/pull/50772))
+-   Update border and focus style of the Input selector in ColorPicker Component. ([50703](https://github.com/WordPress/gutenberg/pull/50703))
 
 #### Site Editor
-- Fix custom template creation regression. ([50797](https://github.com/WordPress/gutenberg/pull/50797))
-- Remove the loader from sidebar navigation screen. ([50326](https://github.com/WordPress/gutenberg/pull/50326))
-- Update site editor sidebar alignment. ([50561](https://github.com/WordPress/gutenberg/pull/50561))
-- Fix `useEditedEntityRecord()` loading state. ([50730](https://github.com/WordPress/gutenberg/pull/50730))
-- Fix width of Template Parts view. ([50836](https://github.com/WordPress/gutenberg/pull/50836))
-- Process template part shortcodes before blocks. ([50801](https://github.com/WordPress/gutenberg/pull/50801))
-- Convert device type margin styles into non-shorthand syntax. ([50441](https://github.com/WordPress/gutenberg/pull/50441))
-- Browse mode Navigation: Fix broken submenu items. ([50551](https://github.com/WordPress/gutenberg/pull/50551))
+
+-   Fix custom template creation regression. ([50797](https://github.com/WordPress/gutenberg/pull/50797))
+-   Remove the loader from sidebar navigation screen. ([50326](https://github.com/WordPress/gutenberg/pull/50326))
+-   Update site editor sidebar alignment. ([50561](https://github.com/WordPress/gutenberg/pull/50561))
+-   Fix `useEditedEntityRecord()` loading state. ([50730](https://github.com/WordPress/gutenberg/pull/50730))
+-   Fix width of Template Parts view. ([50836](https://github.com/WordPress/gutenberg/pull/50836))
+-   Process template part shortcodes before blocks. ([50801](https://github.com/WordPress/gutenberg/pull/50801))
+-   Convert device type margin styles into non-shorthand syntax. ([50441](https://github.com/WordPress/gutenberg/pull/50441))
+-   Browse mode Navigation: Fix broken submenu items. ([50551](https://github.com/WordPress/gutenberg/pull/50551))
 
 #### Inspector Controls
-- Template revisions: Require 2 revisions before showing the revisions UI. ([50762](https://github.com/WordPress/gutenberg/pull/50762))
+
+-   Template revisions: Require 2 revisions before showing the revisions UI. ([50762](https://github.com/WordPress/gutenberg/pull/50762))
 
 #### Block Editor
-- List block: Fix merging nested list into paragraph. ([50634](https://github.com/WordPress/gutenberg/pull/50634))
-- Add grab cursor style for Block mover drag handle button. ([50808](https://github.com/WordPress/gutenberg/pull/50808))
-- Fix gutenberg_get_block_editor_settings overriding other hooks. ([50760](https://github.com/WordPress/gutenberg/pull/50760))
-- Iframe: Use src instead of srcDoc. ([50875](https://github.com/WordPress/gutenberg/pull/50875))
-- Don't use global 'select' in the Behaviors controls component. ([51028](https://github.com/WordPress/gutenberg/pull/51028))
-- Lightbox UI appearing with interactivity experiment disabled. ([51025](https://github.com/WordPress/gutenberg/pull/51025))
-- Move "No Behaviors" to be the first option in the list of behaviors. ([50979](https://github.com/WordPress/gutenberg/pull/50979))
-- Revert "Browse Mode: Add snackbar notices.  ([50937](https://github.com/WordPress/gutenberg/pull/50937))
+
+-   List block: Fix merging nested list into paragraph. ([50634](https://github.com/WordPress/gutenberg/pull/50634))
+-   Add grab cursor style for Block mover drag handle button. ([50808](https://github.com/WordPress/gutenberg/pull/50808))
+-   Fix gutenberg_get_block_editor_settings overriding other hooks. ([50760](https://github.com/WordPress/gutenberg/pull/50760))
+-   Iframe: Use src instead of srcDoc. ([50875](https://github.com/WordPress/gutenberg/pull/50875))
+-   Don't use global 'select' in the Behaviors controls component. ([51028](https://github.com/WordPress/gutenberg/pull/51028))
+-   Lightbox UI appearing with interactivity experiment disabled. ([51025](https://github.com/WordPress/gutenberg/pull/51025))
+-   Move "No Behaviors" to be the first option in the list of behaviors. ([50979](https://github.com/WordPress/gutenberg/pull/50979))
+-   Revert "Browse Mode: Add snackbar notices. ([50937](https://github.com/WordPress/gutenberg/pull/50937))
 
 #### Rich Text
-- File block: Fix editing of empty file name. ([50607](https://github.com/WordPress/gutenberg/pull/50607))
+
+-   File block: Fix editing of empty file name. ([50607](https://github.com/WordPress/gutenberg/pull/50607))
 
 #### List View
-- Ensure settings menu is visible when focused. ([50572](https://github.com/WordPress/gutenberg/pull/50572))
+
+-   Ensure settings menu is visible when focused. ([50572](https://github.com/WordPress/gutenberg/pull/50572))
 
 #### Layout
-- Navigation: Fix warning when stretch justification is used. ([50568](https://github.com/WordPress/gutenberg/pull/50568))
+
+-   Navigation: Fix warning when stretch justification is used. ([50568](https://github.com/WordPress/gutenberg/pull/50568))
 
 #### Tests
-- Fix release performance tests. ([50699](https://github.com/WordPress/gutenberg/pull/50699))
+
+-   Fix release performance tests. ([50699](https://github.com/WordPress/gutenberg/pull/50699))
 
 #### Patterns
-- Library: Revert description change until new grid view lands. ([51039](https://github.com/WordPress/gutenberg/pull/51039))
+
+-   Library: Revert description change until new grid view lands. ([51039](https://github.com/WordPress/gutenberg/pull/51039))
 
 ### Performance
 
 #### Block Library
-- Nav block: Improve loading UX by preloading Navigation menu requests. ([48683](https://github.com/WordPress/gutenberg/pull/48683))
-- Inner blocks: Reduce tree depth to improve performance. ([50447](https://github.com/WordPress/gutenberg/pull/50447))
+
+-   Nav block: Improve loading UX by preloading Navigation menu requests. ([48683](https://github.com/WordPress/gutenberg/pull/48683))
+-   Inner blocks: Reduce tree depth to improve performance. ([50447](https://github.com/WordPress/gutenberg/pull/50447))
 
 #### Site Editor
-- Edit Site: Optimize loading `useSelect` call. ([50546](https://github.com/WordPress/gutenberg/pull/50546))
 
+-   Edit Site: Optimize loading `useSelect` call. ([50546](https://github.com/WordPress/gutenberg/pull/50546))
 
 ### Experiments
 
 #### Components
-- Add new experimental version of DropdownMenu. ([49473](https://github.com/WordPress/gutenberg/pull/49473))
-- Behaviors UI. ([49972](https://github.com/WordPress/gutenberg/pull/49972))
 
+-   Add new experimental version of DropdownMenu. ([49473](https://github.com/WordPress/gutenberg/pull/49473))
+-   Behaviors UI. ([49972](https://github.com/WordPress/gutenberg/pull/49972))
 
 ### Documentation
 
-- Add link for more details about block variations' example. ([50909](https://github.com/WordPress/gutenberg/pull/50909))
-- Components: Back-add changelog for TypeScript types. ([50881](https://github.com/WordPress/gutenberg/pull/50881))
-- Add parent and experimental status to the core block reference. ([48269](https://github.com/WordPress/gutenberg/pull/48269))
-- Fix syntax highlighting of curating the editor experience guide. ([50902](https://github.com/WordPress/gutenberg/pull/50902))
-- Minor updates to theme.json schema pages. ([50742](https://github.com/WordPress/gutenberg/pull/50742))
-- Update PHP docblock for `WP_Theme_JSON_Gutenberg::Get_property_value`. ([50527](https://github.com/WordPress/gutenberg/pull/50527))
-- Mobile app: Fix change log typo. ([50737](https://github.com/WordPress/gutenberg/pull/50737))
-- Icons: Update README.md to include a link to the documentation. ([50606](https://github.com/WordPress/gutenberg/pull/50606))
-
+-   Add link for more details about block variations' example. ([50909](https://github.com/WordPress/gutenberg/pull/50909))
+-   Components: Back-add changelog for TypeScript types. ([50881](https://github.com/WordPress/gutenberg/pull/50881))
+-   Add parent and experimental status to the core block reference. ([48269](https://github.com/WordPress/gutenberg/pull/48269))
+-   Fix syntax highlighting of curating the editor experience guide. ([50902](https://github.com/WordPress/gutenberg/pull/50902))
+-   Minor updates to theme.json schema pages. ([50742](https://github.com/WordPress/gutenberg/pull/50742))
+-   Update PHP docblock for `WP_Theme_JSON_Gutenberg::Get_property_value`. ([50527](https://github.com/WordPress/gutenberg/pull/50527))
+-   Mobile app: Fix change log typo. ([50737](https://github.com/WordPress/gutenberg/pull/50737))
+-   Icons: Update README.md to include a link to the documentation. ([50606](https://github.com/WordPress/gutenberg/pull/50606))
 
 ### Code Quality
 
 #### Block Library
-- Cover: Unlock private APIs outside of the component. ([50686](https://github.com/WordPress/gutenberg/pull/50686))
-- Fix column block category. ([46048](https://github.com/WordPress/gutenberg/pull/46048))
-- Freeform: Move modal styles to the correct file. ([50858](https://github.com/WordPress/gutenberg/pull/50858))
-- Navigation: Remove the check for draft navigation menus from the UnsavedInnerBlocks component. ([49161](https://github.com/WordPress/gutenberg/pull/49161))
-- Navigation: Unlock private APIs outside of the component. ([50509](https://github.com/WordPress/gutenberg/pull/50509))
-- Remove OffCanvasEditor. ([50705](https://github.com/WordPress/gutenberg/pull/50705))
-- Comments: Replace get_comments() with get_comments_number(). ([50798](https://github.com/WordPress/gutenberg/pull/50798))
-- Lodash: Remove from Gallery block. ([50591](https://github.com/WordPress/gutenberg/pull/50591))
-- Lodash: Remove from Image block. ([50592](https://github.com/WordPress/gutenberg/pull/50592))
-- Lodash: Remove from Latest Posts block. ([50593](https://github.com/WordPress/gutenberg/pull/50593))
-- Lodash: Remove from Media & Text block. ([50587](https://github.com/WordPress/gutenberg/pull/50587))
-- Lodash: Remove from template part block. ([50586](https://github.com/WordPress/gutenberg/pull/50586))
-- Lodash: Remove unnecessary mock from Buttons tests. ([50588](https://github.com/WordPress/gutenberg/pull/50588))
+
+-   Cover: Unlock private APIs outside of the component. ([50686](https://github.com/WordPress/gutenberg/pull/50686))
+-   Fix column block category. ([46048](https://github.com/WordPress/gutenberg/pull/46048))
+-   Freeform: Move modal styles to the correct file. ([50858](https://github.com/WordPress/gutenberg/pull/50858))
+-   Navigation: Remove the check for draft navigation menus from the UnsavedInnerBlocks component. ([49161](https://github.com/WordPress/gutenberg/pull/49161))
+-   Navigation: Unlock private APIs outside of the component. ([50509](https://github.com/WordPress/gutenberg/pull/50509))
+-   Remove OffCanvasEditor. ([50705](https://github.com/WordPress/gutenberg/pull/50705))
+-   Comments: Replace get_comments() with get_comments_number(). ([50798](https://github.com/WordPress/gutenberg/pull/50798))
+-   Lodash: Remove from Gallery block. ([50591](https://github.com/WordPress/gutenberg/pull/50591))
+-   Lodash: Remove from Image block. ([50592](https://github.com/WordPress/gutenberg/pull/50592))
+-   Lodash: Remove from Latest Posts block. ([50593](https://github.com/WordPress/gutenberg/pull/50593))
+-   Lodash: Remove from Media & Text block. ([50587](https://github.com/WordPress/gutenberg/pull/50587))
+-   Lodash: Remove from template part block. ([50586](https://github.com/WordPress/gutenberg/pull/50586))
+-   Lodash: Remove unnecessary mock from Buttons tests. ([50588](https://github.com/WordPress/gutenberg/pull/50588))
 
 #### Block Editor
-- Block Editor: Remove unused 'useIsDimensionsSupportValid' method. ([50735](https://github.com/WordPress/gutenberg/pull/50735))
-- Block styles: Remove unused prop from inserter preview component. ([50622](https://github.com/WordPress/gutenberg/pull/50622))
+
+-   Block Editor: Remove unused 'useIsDimensionsSupportValid' method. ([50735](https://github.com/WordPress/gutenberg/pull/50735))
+-   Block styles: Remove unused prop from inserter preview component. ([50622](https://github.com/WordPress/gutenberg/pull/50622))
 
 #### Post Editor
-- Edit Post: Unlock useShouldContextualToolbarShow outside of the component. ([50612](https://github.com/WordPress/gutenberg/pull/50612))
-- FlatTermSelector: Fix the 'useSelect' missing dependency. ([50872](https://github.com/WordPress/gutenberg/pull/50872))
+
+-   Edit Post: Unlock useShouldContextualToolbarShow outside of the component. ([50612](https://github.com/WordPress/gutenberg/pull/50612))
+-   FlatTermSelector: Fix the 'useSelect' missing dependency. ([50872](https://github.com/WordPress/gutenberg/pull/50872))
 
 #### Site Editor
-- Use the keyboard shortcuts package for the title bar. ([50873](https://github.com/WordPress/gutenberg/pull/50873))
-- Simplify variation selectors. ([50687](https://github.com/WordPress/gutenberg/pull/50687))
-- Unlock private APIs outside of the component. ([50534](https://github.com/WordPress/gutenberg/pull/50534))
-- Remove unused 'NavigateToLink' component. ([50908](https://github.com/WordPress/gutenberg/pull/50908))
-- Move `gutenberg_get_remote_theme_patterns`. ([50597](https://github.com/WordPress/gutenberg/pull/50597))
+
+-   Use the keyboard shortcuts package for the title bar. ([50873](https://github.com/WordPress/gutenberg/pull/50873))
+-   Simplify variation selectors. ([50687](https://github.com/WordPress/gutenberg/pull/50687))
+-   Unlock private APIs outside of the component. ([50534](https://github.com/WordPress/gutenberg/pull/50534))
+-   Remove unused 'NavigateToLink' component. ([50908](https://github.com/WordPress/gutenberg/pull/50908))
+-   Move `gutenberg_get_remote_theme_patterns`. ([50597](https://github.com/WordPress/gutenberg/pull/50597))
 
 #### Interactivity API
-- Polish experimental navigation block. ([50670](https://github.com/WordPress/gutenberg/pull/50670))
+
+-   Polish experimental navigation block. ([50670](https://github.com/WordPress/gutenberg/pull/50670))
 
 #### Components
-- DropdownMenu: Refactor to TypeScript. ([50187](https://github.com/WordPress/gutenberg/pull/50187))
+
+-   DropdownMenu: Refactor to TypeScript. ([50187](https://github.com/WordPress/gutenberg/pull/50187))
 
 #### npm Packages
-- chore: Update memize to v2. ([50172](https://github.com/WordPress/gutenberg/pull/50172))
+
+-   chore: Update memize to v2. ([50172](https://github.com/WordPress/gutenberg/pull/50172))
 
 #### Global Styles
-- Global styles revisions: Remove unused private var. ([50763](https://github.com/WordPress/gutenberg/pull/50763))
-- Introduce `prepend_to_selector()` to avoid additional if checks and follow single responsibility principle. ([50266](https://github.com/WordPress/gutenberg/pull/50266))
-- Move `gutenberg_get_global_styles` function. ([50596](https://github.com/WordPress/gutenberg/pull/50596))
 
+-   Global styles revisions: Remove unused private var. ([50763](https://github.com/WordPress/gutenberg/pull/50763))
+-   Introduce `prepend_to_selector()` to avoid additional if checks and follow single responsibility principle. ([50266](https://github.com/WordPress/gutenberg/pull/50266))
+-   Move `gutenberg_get_global_styles` function. ([50596](https://github.com/WordPress/gutenberg/pull/50596))
 
 ### Tools
 
 #### Testing
-- Combine frontend navigation Page list block tests into one test to speed up end-to-end tests. ([50681](https://github.com/WordPress/gutenberg/pull/50681))
-- Command tool: Enable end-to-end tests. ([50833](https://github.com/WordPress/gutenberg/pull/50833))
-- Create pages before navigation tests requiring link control to find page results. ([50680](https://github.com/WordPress/gutenberg/pull/50680))
-- Enable  iframe-inline-styles end-to-end test. ([50548](https://github.com/WordPress/gutenberg/pull/50548))
-- Fix coding-standards issues. ([50656](https://github.com/WordPress/gutenberg/pull/50656))
-- Fix flaky media inserter drag-and-dropping end-to-end test. ([50740](https://github.com/WordPress/gutenberg/pull/50740))
-- Fix flaky template revert end-to-end tests. ([50851](https://github.com/WordPress/gutenberg/pull/50851))
-- In CI, verify that PHPunit is actually running. ([50442](https://github.com/WordPress/gutenberg/pull/50442))
-- Migrate Cover Block tests to Playwright. ([45784](https://github.com/WordPress/gutenberg/pull/45784))
-- Remove redundant calls to disable the Styles welcome guide. ([50871](https://github.com/WordPress/gutenberg/pull/50871))
-- Remove unintentionally added test artifact. ([50795](https://github.com/WordPress/gutenberg/pull/50795))
-- Revert "Enqueue the registered assets (#50185)". ([50537](https://github.com/WordPress/gutenberg/pull/50537))
-- Mobile - end-to-end test - Update code to use the new navigateUp helper. ([50736](https://github.com/WordPress/gutenberg/pull/50736))
-- Playwright Utils: Use 'set' to disable the Styles welcome guide. ([50852](https://github.com/WordPress/gutenberg/pull/50852))
 
+-   Combine frontend navigation Page list block tests into one test to speed up end-to-end tests. ([50681](https://github.com/WordPress/gutenberg/pull/50681))
+-   Command tool: Enable end-to-end tests. ([50833](https://github.com/WordPress/gutenberg/pull/50833))
+-   Create pages before navigation tests requiring link control to find page results. ([50680](https://github.com/WordPress/gutenberg/pull/50680))
+-   Enable iframe-inline-styles end-to-end test. ([50548](https://github.com/WordPress/gutenberg/pull/50548))
+-   Fix coding-standards issues. ([50656](https://github.com/WordPress/gutenberg/pull/50656))
+-   Fix flaky media inserter drag-and-dropping end-to-end test. ([50740](https://github.com/WordPress/gutenberg/pull/50740))
+-   Fix flaky template revert end-to-end tests. ([50851](https://github.com/WordPress/gutenberg/pull/50851))
+-   In CI, verify that PHPunit is actually running. ([50442](https://github.com/WordPress/gutenberg/pull/50442))
+-   Migrate Cover Block tests to Playwright. ([45784](https://github.com/WordPress/gutenberg/pull/45784))
+-   Remove redundant calls to disable the Styles welcome guide. ([50871](https://github.com/WordPress/gutenberg/pull/50871))
+-   Remove unintentionally added test artifact. ([50795](https://github.com/WordPress/gutenberg/pull/50795))
+-   Revert "Enqueue the registered assets (#50185)". ([50537](https://github.com/WordPress/gutenberg/pull/50537))
+-   Mobile - end-to-end test - Update code to use the new navigateUp helper. ([50736](https://github.com/WordPress/gutenberg/pull/50736))
+-   Playwright Utils: Use 'set' to disable the Styles welcome guide. ([50852](https://github.com/WordPress/gutenberg/pull/50852))
 
 #### Build Tooling
-- DateTime: Remove deprecated props (and fix static analysis action in trunk). ([50724](https://github.com/WordPress/gutenberg/pull/50724))
-- Update `runtime` test field in WebPack configuration to support Windows. ([50727](https://github.com/WordPress/gutenberg/pull/50727))
-- Removed `gutenberg` Directory Name Expectation. ([50894](https://github.com/WordPress/gutenberg/pull/50894))
-- Reworked `run` Command Parsing. ([50559](https://github.com/WordPress/gutenberg/pull/50559))
 
-#### wp-env
-- Add `t-hamano` as codeowner for `env` package. ([50817](https://github.com/WordPress/gutenberg/pull/50817))
-- Check `.wp-env.json` For Unknown Options. ([50642](https://github.com/WordPress/gutenberg/pull/50642))
-- Expanded `wp-env` Lifecycle Scripts. ([50570](https://github.com/WordPress/gutenberg/pull/50570))
-- Fixed `wp-env start` On Windows. ([50895](https://github.com/WordPress/gutenberg/pull/50895))
-- Add @ObliviousHarmony to wp-env codeowners. ([50530](https://github.com/WordPress/gutenberg/pull/50530))
+-   DateTime: Remove deprecated props (and fix static analysis action in trunk). ([50724](https://github.com/WordPress/gutenberg/pull/50724))
+-   Update `runtime` test field in WebPack configuration to support Windows. ([50727](https://github.com/WordPress/gutenberg/pull/50727))
+-   Removed `gutenberg` Directory Name Expectation. ([50894](https://github.com/WordPress/gutenberg/pull/50894))
+-   Reworked `run` Command Parsing. ([50559](https://github.com/WordPress/gutenberg/pull/50559))
 
+#### wp-env
 
-## First time contributors
+-   Add `t-hamano` as codeowner for `env` package. ([50817](https://github.com/WordPress/gutenberg/pull/50817))
+-   Check `.wp-env.json` For Unknown Options. ([50642](https://github.com/WordPress/gutenberg/pull/50642))
+-   Expanded `wp-env` Lifecycle Scripts. ([50570](https://github.com/WordPress/gutenberg/pull/50570))
+-   Fixed `wp-env start` On Windows. ([50895](https://github.com/WordPress/gutenberg/pull/50895))
+-   Add @ObliviousHarmony to wp-env codeowners. ([50530](https://github.com/WordPress/gutenberg/pull/50530))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @bacoords: Update README.md to include a link to the documentation. ([50606](https://github.com/WordPress/gutenberg/pull/50606))
-- @falgunihdesai: Update border and focus style of the Input selector in ColorPicker Component. ([50703](https://github.com/WordPress/gutenberg/pull/50703))
-- @kmanijak: Adjust the logic of Post Title edit, so it avoids unnecessary OPTIONS requests. ([49839](https://github.com/WordPress/gutenberg/pull/49839))
-- @kutsu123: Add grab cursor style for Block mover drag handle button. ([50808](https://github.com/WordPress/gutenberg/pull/50808))
-- @megane9988: Add an outline when the color picker select box is focused. ([50609](https://github.com/WordPress/gutenberg/pull/50609))
-- @SaxonF: Update site editor sidebar alignment. ([50561](https://github.com/WordPress/gutenberg/pull/50561))
-- @worldomonation: Migrate Cover Block tests to Playwright. ([45784](https://github.com/WordPress/gutenberg/pull/45784))
+The following PRs were merged by first-time contributors:
 
+-   @bacoords: Update README.md to include a link to the documentation. ([50606](https://github.com/WordPress/gutenberg/pull/50606))
+-   @falgunihdesai: Update border and focus style of the Input selector in ColorPicker Component. ([50703](https://github.com/WordPress/gutenberg/pull/50703))
+-   @kmanijak: Adjust the logic of Post Title edit, so it avoids unnecessary OPTIONS requests. ([49839](https://github.com/WordPress/gutenberg/pull/49839))
+-   @kutsu123: Add grab cursor style for Block mover drag handle button. ([50808](https://github.com/WordPress/gutenberg/pull/50808))
+-   @megane9988: Add an outline when the color picker select box is focused. ([50609](https://github.com/WordPress/gutenberg/pull/50609))
+-   @SaxonF: Update site editor sidebar alignment. ([50561](https://github.com/WordPress/gutenberg/pull/50561))
+-   @worldomonation: Migrate Cover Block tests to Playwright. ([45784](https://github.com/WordPress/gutenberg/pull/45784))
 
 ## Contributors
 
@@ -5359,18 +16364,14 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @ajlende @andrewserong @antpb @aristath @artemiomorales @bacoords @carolinan @chad1008 @ciampo @dcalhoun @derekblank @ellatrix @fabiankaegy @falgunihdesai @felixarntz @fluiddot @geriux @getdave @glendaviesnz @gziolo @jameskoster @jasmussen @jeryj @jhnstn @johnhooks @juanfra @kevin940726 @kmanijak @kutsu123 @MaggieCabrera @Mamaduka @mboynes @mburridge @megane9988 @michalczaplinski @mirka @n2erjo00 @noahtallen @noisysocks @ntsekouras @oandregal @ObliviousHarmony @ramonjd @richtabor @samnajian @SantosGuillamot @SaxonF @scruffian @shimotmk @SiobhyB @t-hamano @talldan @tyxla @worldomonation @WunderBart @youknowriad
 
-
 = 15.8.1 =
 
-
-
 Error: There are no unreleased pull requests associated with the milestone.
-    at fetchAllPullRequests (/home/runner/work/gutenberg/gutenberg/bin/plugin/commands/changelog.js:684:10)
-    at processTicksAndRejections (internal/process/task_queues.js:95:5)
-    at async createChangelog (/home/runner/work/gutenberg/gutenberg/bin/plugin/commands/changelog.js:994:24)
-    at async getReleaseChangelog (/home/runner/work/gutenberg/gutenberg/bin/plugin/commands/changelog.js:1020:2)
-    at async Command.<anonymous> (/home/runner/work/gutenberg/gutenberg/bin/plugin/cli.js:11:4)
-
+at fetchAllPullRequests (/home/runner/work/gutenberg/gutenberg/bin/plugin/commands/changelog.js:684:10)
+at processTicksAndRejections (internal/process/task_queues.js:95:5)
+at async createChangelog (/home/runner/work/gutenberg/gutenberg/bin/plugin/commands/changelog.js:994:24)
+at async getReleaseChangelog (/home/runner/work/gutenberg/gutenberg/bin/plugin/commands/changelog.js:1020:2)
+at async Command.<anonymous> (/home/runner/work/gutenberg/gutenberg/bin/plugin/cli.js:11:4)
 
 = 15.8.0 =
 
@@ -5378,298 +16379,319 @@ Error: There are no unreleased pull requests associated with the milestone.
 
 The following contributors merged PRs in this release:
 
-
 ## Changelog
 
 ### Features
 
-- Add the command center to the post editor. ([50128](https://github.com/WordPress/gutenberg/pull/50128))
-- Add revisions UI. ([50089](https://github.com/WordPress/gutenberg/pull/50089))
-- Add Theme Previews for block themes. ([50030](https://github.com/WordPress/gutenberg/pull/50030))
-
+-   Add the command center to the post editor. ([50128](https://github.com/WordPress/gutenberg/pull/50128))
+-   Add revisions UI. ([50089](https://github.com/WordPress/gutenberg/pull/50089))
+-   Add Theme Previews for block themes. ([50030](https://github.com/WordPress/gutenberg/pull/50030))
 
 ### Enhancements
 
 #### Global Styles
-- Fluid typography: Use `layout.wideSize` as max viewport width. ([49815](https://github.com/WordPress/gutenberg/pull/49815))
-- Global styles revisions: Remove human time diff and custom author fields from the API response. ([50234](https://github.com/WordPress/gutenberg/pull/50234))
-- Unify the global block styles panel with the block inspector panels. ([49428](https://github.com/WordPress/gutenberg/pull/49428))
+
+-   Fluid typography: Use `layout.wideSize` as max viewport width. ([49815](https://github.com/WordPress/gutenberg/pull/49815))
+-   Global styles revisions: Remove human time diff and custom author fields from the API response. ([50234](https://github.com/WordPress/gutenberg/pull/50234))
+-   Unify the global block styles panel with the block inspector panels. ([49428](https://github.com/WordPress/gutenberg/pull/49428))
 
 #### Post Editor
-- Add `<ViewLink>` component. ([50260](https://github.com/WordPress/gutenberg/pull/50260))
-- Update background color of post editor when viewing mobile or tablet viewports, or in template mode. ([50361](https://github.com/WordPress/gutenberg/pull/50361))
-- Display device icon on "preview" and "view" buttons. ([50218](https://github.com/WordPress/gutenberg/pull/50218))
-- Improve "switch to draft" placement. ([50217](https://github.com/WordPress/gutenberg/pull/50217))
-- Post Featured Image: New design for Replace and Remove buttons. ([50269](https://github.com/WordPress/gutenberg/pull/50269))
+
+-   Add `<ViewLink>` component. ([50260](https://github.com/WordPress/gutenberg/pull/50260))
+-   Update background color of post editor when viewing mobile or tablet viewports, or in template mode. ([50361](https://github.com/WordPress/gutenberg/pull/50361))
+-   Display device icon on "preview" and "view" buttons. ([50218](https://github.com/WordPress/gutenberg/pull/50218))
+-   Improve "switch to draft" placement. ([50217](https://github.com/WordPress/gutenberg/pull/50217))
+-   Post Featured Image: New design for Replace and Remove buttons. ([50269](https://github.com/WordPress/gutenberg/pull/50269))
 
 #### Block Library
-- More intuitive Details block with summary and innerBlocks content. ([49808](https://github.com/WordPress/gutenberg/pull/49808))
-- Simplify cover block description. ([50355](https://github.com/WordPress/gutenberg/pull/50355))
-- Cover: Only show overlay controls when color support enabled. ([50115](https://github.com/WordPress/gutenberg/pull/50115))
-- Navigation: Hide color controls when color support is disabled. ([50368](https://github.com/WordPress/gutenberg/pull/50368))
-- Post Featured Image: Hide overlay controls when color support is disabled. ([50331](https://github.com/WordPress/gutenberg/pull/50331))
-- Social Icons: Hide color controls when color support is disabled. ([50275](https://github.com/WordPress/gutenberg/pull/50275))
+
+-   More intuitive Details block with summary and innerBlocks content. ([49808](https://github.com/WordPress/gutenberg/pull/49808))
+-   Simplify cover block description. ([50355](https://github.com/WordPress/gutenberg/pull/50355))
+-   Cover: Only show overlay controls when color support enabled. ([50115](https://github.com/WordPress/gutenberg/pull/50115))
+-   Navigation: Hide color controls when color support is disabled. ([50368](https://github.com/WordPress/gutenberg/pull/50368))
+-   Post Featured Image: Hide overlay controls when color support is disabled. ([50331](https://github.com/WordPress/gutenberg/pull/50331))
+-   Social Icons: Hide color controls when color support is disabled. ([50275](https://github.com/WordPress/gutenberg/pull/50275))
 
 #### Fonts API
-- Separate BC Layer. ([50077](https://github.com/WordPress/gutenberg/pull/50077))
+
+-   Separate BC Layer. ([50077](https://github.com/WordPress/gutenberg/pull/50077))
 
 #### Site Editor
-- Add the pages menu to the site editor. ([50463](https://github.com/WordPress/gutenberg/pull/50463))
-- Introduce new PluginTemplateSettingPanel slot. ([50257](https://github.com/WordPress/gutenberg/pull/50257))
-- Add chevrons to the templates and template parts in site editor. ([50076](https://github.com/WordPress/gutenberg/pull/50076))
-
-#### Components
-- Button: Add opt-in prop for next 40px default size. ([50254](https://github.com/WordPress/gutenberg/pull/50254))
-- Consolidate and add documentation to Storybook. ([50226](https://github.com/WordPress/gutenberg/pull/50226))
-- DimensionControl: Use WordPress package instead of react in code example. ([50435](https://github.com/WordPress/gutenberg/pull/50435))
-- FormTokenField, ComboboxControl: Add opt-in prop for next 40px default size. ([50261](https://github.com/WordPress/gutenberg/pull/50261))
-- Global Styles: Fix palette color popovers. ([49975](https://github.com/WordPress/gutenberg/pull/49975))
-- Relax link pattern matching in CHANGELOG CI check. ([50248](https://github.com/WordPress/gutenberg/pull/50248))
-- Remove custom padding for tertiary buttons. ([50276](https://github.com/WordPress/gutenberg/pull/50276))
-- Update `Autocomplete` usage example. ([49965](https://github.com/WordPress/gutenberg/pull/49965))
-- Update default accent color. ([50193](https://github.com/WordPress/gutenberg/pull/50193))
-- Update has-text has-icon button spacing. ([50277](https://github.com/WordPress/gutenberg/pull/50277))
+
+-   Add the pages menu to the site editor. ([50463](https://github.com/WordPress/gutenberg/pull/50463))
+-   Introduce new PluginTemplateSettingPanel slot. ([50257](https://github.com/WordPress/gutenberg/pull/50257))
+-   Add chevrons to the templates and template parts in site editor. ([50076](https://github.com/WordPress/gutenberg/pull/50076))
+
+#### Components
+
+-   Button: Add opt-in prop for next 40px default size. ([50254](https://github.com/WordPress/gutenberg/pull/50254))
+-   Consolidate and add documentation to Storybook. ([50226](https://github.com/WordPress/gutenberg/pull/50226))
+-   DimensionControl: Use WordPress package instead of react in code example. ([50435](https://github.com/WordPress/gutenberg/pull/50435))
+-   FormTokenField, ComboboxControl: Add opt-in prop for next 40px default size. ([50261](https://github.com/WordPress/gutenberg/pull/50261))
+-   Global Styles: Fix palette color popovers. ([49975](https://github.com/WordPress/gutenberg/pull/49975))
+-   Relax link pattern matching in CHANGELOG CI check. ([50248](https://github.com/WordPress/gutenberg/pull/50248))
+-   Remove custom padding for tertiary buttons. ([50276](https://github.com/WordPress/gutenberg/pull/50276))
+-   Update `Autocomplete` usage example. ([49965](https://github.com/WordPress/gutenberg/pull/49965))
+-   Update default accent color. ([50193](https://github.com/WordPress/gutenberg/pull/50193))
+-   Update has-text has-icon button spacing. ([50277](https://github.com/WordPress/gutenberg/pull/50277))
 
 #### CSS & Styling
-- Polish confirm dialog padding. ([50283](https://github.com/WordPress/gutenberg/pull/50283))
+
+-   Polish confirm dialog padding. ([50283](https://github.com/WordPress/gutenberg/pull/50283))
 
 #### Template Editor
-- Remove `start blank` option in template pattern suggestions and add `skip` button. ([50099](https://github.com/WordPress/gutenberg/pull/50099))
-- Templates: Sort  by the rendered title instead of the slug. ([50353](https://github.com/WordPress/gutenberg/pull/50353))
 
+-   Remove `start blank` option in template pattern suggestions and add `skip` button. ([50099](https://github.com/WordPress/gutenberg/pull/50099))
+-   Templates: Sort by the rendered title instead of the slug. ([50353](https://github.com/WordPress/gutenberg/pull/50353))
 
 #### Block Editor
-- List View: Allow dragging to all levels of the block hierarchy. ([49742](https://github.com/WordPress/gutenberg/pull/49742))
-- Allow dragging-and-dropping images from the inserter to image blocks. ([49673](https://github.com/WordPress/gutenberg/pull/49673))
-- Try always showing the dimensions controls. ([50305](https://github.com/WordPress/gutenberg/pull/50305))
-- Adds a renderAdditionalBlockUI prop to ListView. ([50465](https://github.com/WordPress/gutenberg/pull/50465))
-- Update the expanded text color so that it works in both a dark and light context. ([50434](https://github.com/WordPress/gutenberg/pull/50434))
-- Enable Loginout block in Nav block. ([49160](https://github.com/WordPress/gutenberg/pull/49160))
-- Mark related selector as resolved when sideloading Navigation fallback. ([50324](https://github.com/WordPress/gutenberg/pull/50324))
-- Update Template Parts icon to use the symbol. ([50410](https://github.com/WordPress/gutenberg/pull/50410))
-- Use Core Data for Nav fallbacks and side load resulting entity into state. ([50032](https://github.com/WordPress/gutenberg/pull/50032))
-- Tweak copy for block settings menu "Insert..." to "Add...". ([50444](https://github.com/WordPress/gutenberg/pull/50444))
-- Block settings menu: Rearrange items. ([50453](https://github.com/WordPress/gutenberg/pull/50453))
 
-#### Rest API
-- Update image editor to use new REST API. ([28530](https://github.com/WordPress/gutenberg/pull/28530))
+-   List View: Allow dragging to all levels of the block hierarchy. ([49742](https://github.com/WordPress/gutenberg/pull/49742))
+-   Allow dragging-and-dropping images from the inserter to image blocks. ([49673](https://github.com/WordPress/gutenberg/pull/49673))
+-   Try always showing the dimensions controls. ([50305](https://github.com/WordPress/gutenberg/pull/50305))
+-   Adds a renderAdditionalBlockUI prop to ListView. ([50465](https://github.com/WordPress/gutenberg/pull/50465))
+-   Update the expanded text color so that it works in both a dark and light context. ([50434](https://github.com/WordPress/gutenberg/pull/50434))
+-   Enable Loginout block in Nav block. ([49160](https://github.com/WordPress/gutenberg/pull/49160))
+-   Mark related selector as resolved when sideloading Navigation fallback. ([50324](https://github.com/WordPress/gutenberg/pull/50324))
+-   Update Template Parts icon to use the symbol. ([50410](https://github.com/WordPress/gutenberg/pull/50410))
+-   Use Core Data for Nav fallbacks and side load resulting entity into state. ([50032](https://github.com/WordPress/gutenberg/pull/50032))
+-   Tweak copy for block settings menu "Insert..." to "Add...". ([50444](https://github.com/WordPress/gutenberg/pull/50444))
+-   Block settings menu: Rearrange items. ([50453](https://github.com/WordPress/gutenberg/pull/50453))
 
+#### Rest API
 
+-   Update image editor to use new REST API. ([28530](https://github.com/WordPress/gutenberg/pull/28530))
 
 ### Bug Fixes
 
 #### Block Library
-- Center align button text in editor. ([50228](https://github.com/WordPress/gutenberg/pull/50228))
-- Comment Template Block: Set `commentId` context via filter. ([50279](https://github.com/WordPress/gutenberg/pull/50279))
-- Cover: Use overflow: clip, falling back to overflow: Hidden to allow sticky children (technically). ([50237](https://github.com/WordPress/gutenberg/pull/50237))
-- Ensure imported Classic Menu dirty state to include in Editor entity changes list. ([50318](https://github.com/WordPress/gutenberg/pull/50318))
-- File Block: Defer hiding PDF embeds for unsupported browsers until the page has loaded. ([50113](https://github.com/WordPress/gutenberg/pull/50113))
-- Fix template part area variation matching. ([49500](https://github.com/WordPress/gutenberg/pull/49500))
-- Fix the pocket casts embed variation. ([50132](https://github.com/WordPress/gutenberg/pull/50132))
-- Gallery: Fix inner block selection. ([50363](https://github.com/WordPress/gutenberg/pull/50363))
-- Post Terms: Use publicly_queryable to query taxonomies used to register variations. ([50244](https://github.com/WordPress/gutenberg/pull/50244))
-- Remove extraneous "Link" copy from PanelBody components. ([50186](https://github.com/WordPress/gutenberg/pull/50186))
-- Remove Quote transform from Group ([50424](https://github.com/WordPress/gutenberg/pull/50424))
-- [Post Featured Image]: Revert maxWidth addition. ([50427](https://github.com/WordPress/gutenberg/pull/50427))
-- [Post Title]: Insert default block on Enter at end. ([50312](https://github.com/WordPress/gutenberg/pull/50312))
-- Ensure that view scripts are correctly registered for core blocks. ([50364](https://github.com/WordPress/gutenberg/pull/50364))
+
+-   Center align button text in editor. ([50228](https://github.com/WordPress/gutenberg/pull/50228))
+-   Comment Template Block: Set `commentId` context via filter. ([50279](https://github.com/WordPress/gutenberg/pull/50279))
+-   Cover: Use overflow: clip, falling back to overflow: Hidden to allow sticky children (technically). ([50237](https://github.com/WordPress/gutenberg/pull/50237))
+-   Ensure imported Classic Menu dirty state to include in Editor entity changes list. ([50318](https://github.com/WordPress/gutenberg/pull/50318))
+-   File Block: Defer hiding PDF embeds for unsupported browsers until the page has loaded. ([50113](https://github.com/WordPress/gutenberg/pull/50113))
+-   Fix template part area variation matching. ([49500](https://github.com/WordPress/gutenberg/pull/49500))
+-   Fix the pocket casts embed variation. ([50132](https://github.com/WordPress/gutenberg/pull/50132))
+-   Gallery: Fix inner block selection. ([50363](https://github.com/WordPress/gutenberg/pull/50363))
+-   Post Terms: Use publicly_queryable to query taxonomies used to register variations. ([50244](https://github.com/WordPress/gutenberg/pull/50244))
+-   Remove extraneous "Link" copy from PanelBody components. ([50186](https://github.com/WordPress/gutenberg/pull/50186))
+-   Remove Quote transform from Group ([50424](https://github.com/WordPress/gutenberg/pull/50424))
+-   [Post Featured Image]: Revert maxWidth addition. ([50427](https://github.com/WordPress/gutenberg/pull/50427))
+-   [Post Title]: Insert default block on Enter at end. ([50312](https://github.com/WordPress/gutenberg/pull/50312))
+-   Ensure that view scripts are correctly registered for core blocks. ([50364](https://github.com/WordPress/gutenberg/pull/50364))
 
 #### Global Styles
-- Close stylebook if the editor canvas container slot is not filled. ([50086](https://github.com/WordPress/gutenberg/pull/50086))
-- Fix positioning of gradient palette popovers on mobile. ([50233](https://github.com/WordPress/gutenberg/pull/50233))
-- Fix/wp get global styles for custom props returns internal variable. ([50366](https://github.com/WordPress/gutenberg/pull/50366))
-- Revisions controller: Fix author and date fields. ([50117](https://github.com/WordPress/gutenberg/pull/50117))
-- Fix hover/focus styles for `style variation` buttons. ([50056](https://github.com/WordPress/gutenberg/pull/50056))
-- Use bundled files for enqueuing global styles. ([50310](https://github.com/WordPress/gutenberg/pull/50310))
 
+-   Close stylebook if the editor canvas container slot is not filled. ([50086](https://github.com/WordPress/gutenberg/pull/50086))
+-   Fix positioning of gradient palette popovers on mobile. ([50233](https://github.com/WordPress/gutenberg/pull/50233))
+-   Fix/wp get global styles for custom props returns internal variable. ([50366](https://github.com/WordPress/gutenberg/pull/50366))
+-   Revisions controller: Fix author and date fields. ([50117](https://github.com/WordPress/gutenberg/pull/50117))
+-   Fix hover/focus styles for `style variation` buttons. ([50056](https://github.com/WordPress/gutenberg/pull/50056))
+-   Use bundled files for enqueuing global styles. ([50310](https://github.com/WordPress/gutenberg/pull/50310))
 
 #### Block Editor
-- Fix issue with margin collapsing when selecting blocks. ([50215](https://github.com/WordPress/gutenberg/pull/50215))
-- List View / Block Draggable: Fix scroll to top issue when dragging the second last block in the list. ([50119](https://github.com/WordPress/gutenberg/pull/50119))
-- Multi-select: Capitalise B in blocks. ([50356](https://github.com/WordPress/gutenberg/pull/50356))
-- URLInput: Update the 'ENTER' key down event handler. ([50158](https://github.com/WordPress/gutenberg/pull/50158))
-- Update OffCanvas component's more menu to get clientId from block rather than passed in as prop. ([50473](https://github.com/WordPress/gutenberg/pull/50473))
-- Block Toolbar: Don't use effects for focus management. ([50497](https://github.com/WordPress/gutenberg/pull/50497))
-- Don't remount the block when the 'templateLock' is set to 'contentOnly'. ([50292](https://github.com/WordPress/gutenberg/pull/50292))
+
+-   Fix issue with margin collapsing when selecting blocks. ([50215](https://github.com/WordPress/gutenberg/pull/50215))
+-   List View / Block Draggable: Fix scroll to top issue when dragging the second last block in the list. ([50119](https://github.com/WordPress/gutenberg/pull/50119))
+-   Multi-select: Capitalise B in blocks. ([50356](https://github.com/WordPress/gutenberg/pull/50356))
+-   URLInput: Update the 'ENTER' key down event handler. ([50158](https://github.com/WordPress/gutenberg/pull/50158))
+-   Update OffCanvas component's more menu to get clientId from block rather than passed in as prop. ([50473](https://github.com/WordPress/gutenberg/pull/50473))
+-   Block Toolbar: Don't use effects for focus management. ([50497](https://github.com/WordPress/gutenberg/pull/50497))
+-   Don't remount the block when the 'templateLock' is set to 'contentOnly'. ([50292](https://github.com/WordPress/gutenberg/pull/50292))
 
 #### Themes
-- Refactor theme previews. ([50338](https://github.com/WordPress/gutenberg/pull/50338))
-- Remove gutenberg plugin mention in schema. ([50207](https://github.com/WordPress/gutenberg/pull/50207))
-- Theme Preview: Restrict to admin users. ([50335](https://github.com/WordPress/gutenberg/pull/50335))
-- Theme Previews: Fix refactor. ([50354](https://github.com/WordPress/gutenberg/pull/50354))
+
+-   Refactor theme previews. ([50338](https://github.com/WordPress/gutenberg/pull/50338))
+-   Remove gutenberg plugin mention in schema. ([50207](https://github.com/WordPress/gutenberg/pull/50207))
+-   Theme Preview: Restrict to admin users. ([50335](https://github.com/WordPress/gutenberg/pull/50335))
+-   Theme Previews: Fix refactor. ([50354](https://github.com/WordPress/gutenberg/pull/50354))
 
 #### Site Editor
-- Display conditionally the `styles` in sidebar main navigation screen. ([50329](https://github.com/WordPress/gutenberg/pull/50329))
-- Remove canvas box shadow. ([50374](https://github.com/WordPress/gutenberg/pull/50374))
-- Save Button: Fix the label in the disabled state. ([50284](https://github.com/WordPress/gutenberg/pull/50284))
-- Remove white background on Site Editor 'Frame'. ([48970](https://github.com/WordPress/gutenberg/pull/48970))
-- Update some visual details in the add-template modal(s). ([50143](https://github.com/WordPress/gutenberg/pull/50143))
+
+-   Display conditionally the `styles` in sidebar main navigation screen. ([50329](https://github.com/WordPress/gutenberg/pull/50329))
+-   Remove canvas box shadow. ([50374](https://github.com/WordPress/gutenberg/pull/50374))
+-   Save Button: Fix the label in the disabled state. ([50284](https://github.com/WordPress/gutenberg/pull/50284))
+-   Remove white background on Site Editor 'Frame'. ([48970](https://github.com/WordPress/gutenberg/pull/48970))
+-   Update some visual details in the add-template modal(s). ([50143](https://github.com/WordPress/gutenberg/pull/50143))
 
 #### Components
-- Spacing: Fix reset of spacing sizes control. ([50455](https://github.com/WordPress/gutenberg/pull/50455))
-- `NavigableContailer`: Do not trap focus in `TabbableContainer`. ([49846](https://github.com/WordPress/gutenberg/pull/49846))
-- Remove fill="none" from levelUp icon. ([50264](https://github.com/WordPress/gutenberg/pull/50264))
 
+-   Spacing: Fix reset of spacing sizes control. ([50455](https://github.com/WordPress/gutenberg/pull/50455))
+-   `NavigableContailer`: Do not trap focus in `TabbableContainer`. ([49846](https://github.com/WordPress/gutenberg/pull/49846))
+-   Remove fill="none" from levelUp icon. ([50264](https://github.com/WordPress/gutenberg/pull/50264))
 
 #### Accessibility
-- Add missing tooltip to Site Editor navigation Back icon button. ([50104](https://github.com/WordPress/gutenberg/pull/50104))
-- Fix Multiple Tooltips from Focus Toolbar Shortcut on Widget Editor. ([50344](https://github.com/WordPress/gutenberg/pull/50344))
-- Site Editor Keyboard Navigation Flow. ([50296](https://github.com/WordPress/gutenberg/pull/50296))
-- Small improvements for the sidebars and Close buttons labeling. ([49614](https://github.com/WordPress/gutenberg/pull/49614))
+
+-   Add missing tooltip to Site Editor navigation Back icon button. ([50104](https://github.com/WordPress/gutenberg/pull/50104))
+-   Fix Multiple Tooltips from Focus Toolbar Shortcut on Widget Editor. ([50344](https://github.com/WordPress/gutenberg/pull/50344))
+-   Site Editor Keyboard Navigation Flow. ([50296](https://github.com/WordPress/gutenberg/pull/50296))
+-   Small improvements for the sidebars and Close buttons labeling. ([49614](https://github.com/WordPress/gutenberg/pull/49614))
 
 #### Design Tools
-- Changed so that borders and radius are maintained when Duotone is changed. ([50088](https://github.com/WordPress/gutenberg/pull/50088))
-- LineHeightControl: Fix application of zero values in editor. ([48917](https://github.com/WordPress/gutenberg/pull/48917))
+
+-   Changed so that borders and radius are maintained when Duotone is changed. ([50088](https://github.com/WordPress/gutenberg/pull/50088))
+-   LineHeightControl: Fix application of zero values in editor. ([48917](https://github.com/WordPress/gutenberg/pull/48917))
 
 #### Fonts API
-- [Font API] Do not print in admin using 'admin_print_styles' for themes with theme.json. ([50259](https://github.com/WordPress/gutenberg/pull/50259))
+
+-   [Font API] Do not print in admin using 'admin_print_styles' for themes with theme.json. ([50259](https://github.com/WordPress/gutenberg/pull/50259))
 
 #### Widget Editor
-- Fixes fixed block toolbar in widgets editor. ([50371](https://github.com/WordPress/gutenberg/pull/50371))
 
+-   Fixes fixed block toolbar in widgets editor. ([50371](https://github.com/WordPress/gutenberg/pull/50371))
 
 ### Performance
-- Improve Site Editor loading experience([50222](https://github.com/WordPress/gutenberg/pull/50222))
 
+-   Improve Site Editor loading experience([50222](https://github.com/WordPress/gutenberg/pull/50222))
 
 ### Experiments
 
 #### Interactivity API
-- Add Interactivity API runtime. ([49994](https://github.com/WordPress/gutenberg/pull/49994))
-- Navigation block with the Interactivity API. ([50041](https://github.com/WordPress/gutenberg/pull/50041))
-- Fix building plugin zip to include interactive blocks. ([50598](https://github.com/WordPress/gutenberg/pull/50598))
+
+-   Add Interactivity API runtime. ([49994](https://github.com/WordPress/gutenberg/pull/49994))
+-   Navigation block with the Interactivity API. ([50041](https://github.com/WordPress/gutenberg/pull/50041))
+-   Fix building plugin zip to include interactive blocks. ([50598](https://github.com/WordPress/gutenberg/pull/50598))
 
 #### Command Center
-- Update the experiment label. ([50467](https://github.com/WordPress/gutenberg/pull/50467))
-- Add an API to open/close the command center. ([50423](https://github.com/WordPress/gutenberg/pull/50423))
-- Fix a style glitch on Safari. ([50138](https://github.com/WordPress/gutenberg/pull/50138))
-- Add a button to open it from the site editor view mode. ([50425](https://github.com/WordPress/gutenberg/pull/50425))
-- Do not show dynamic add new post, add new page commands. ([50221](https://github.com/WordPress/gutenberg/pull/50221))
-- Extract the WordPress reusable commands to a dedicated package. ([49956](https://github.com/WordPress/gutenberg/pull/49956))
-- Fix command menu not re-opening after closing it. ([50213](https://github.com/WordPress/gutenberg/pull/50213))
 
+-   Update the experiment label. ([50467](https://github.com/WordPress/gutenberg/pull/50467))
+-   Add an API to open/close the command center. ([50423](https://github.com/WordPress/gutenberg/pull/50423))
+-   Fix a style glitch on Safari. ([50138](https://github.com/WordPress/gutenberg/pull/50138))
+-   Add a button to open it from the site editor view mode. ([50425](https://github.com/WordPress/gutenberg/pull/50425))
+-   Do not show dynamic add new post, add new page commands. ([50221](https://github.com/WordPress/gutenberg/pull/50221))
+-   Extract the WordPress reusable commands to a dedicated package. ([49956](https://github.com/WordPress/gutenberg/pull/49956))
+-   Fix command menu not re-opening after closing it. ([50213](https://github.com/WordPress/gutenberg/pull/50213))
 
 ### Documentation
 
-- Add changelog for eslint-plugin validating dependencies in `useSelect` and `useSuspenseSelect` hooks. ([50247](https://github.com/WordPress/gutenberg/pull/50247))
-- Add client-side filter reference to Curating the Editor doc and fix links. ([50203](https://github.com/WordPress/gutenberg/pull/50203))
-- Add missing closing parenthesis in code example. ([50253](https://github.com/WordPress/gutenberg/pull/50253))
-- Adds example to change the permalink structure. ([50251](https://github.com/WordPress/gutenberg/pull/50251))
-- Adds links to REST-API reference. ([50070](https://github.com/WordPress/gutenberg/pull/50070))
-- Create-block script includes link to documentation in render.php file. ([50206](https://github.com/WordPress/gutenberg/pull/50206))
-- Block API > Registration: Switch markdown to a-tags. ([50110](https://github.com/WordPress/gutenberg/pull/50110))
-- Don't use markdown in the callout section. ([50437](https://github.com/WordPress/gutenberg/pull/50437))
-- Remove  mention of perf testing from release documentation. ([50345](https://github.com/WordPress/gutenberg/pull/50345))
-- Update Callout documentation on links. ([50131](https://github.com/WordPress/gutenberg/pull/50131))
-- Fix incorrect label in contributor docs. ([50201](https://github.com/WordPress/gutenberg/pull/50201))
-- Fix minor formatting issues in Performance doc. ([50202](https://github.com/WordPress/gutenberg/pull/50202))
-- Fixes incorrect URLs in doc blocks. ([50123](https://github.com/WordPress/gutenberg/pull/50123))
-- Use alert callout in the block deprecation documentation. ([50286](https://github.com/WordPress/gutenberg/pull/50286))
-- Improve CardMedia documentation. ([50074](https://github.com/WordPress/gutenberg/pull/50074))
-- Update README of TreeGrid with data-expanded attribute usage. ([50026](https://github.com/WordPress/gutenberg/pull/50026))
-
+-   Add changelog for eslint-plugin validating dependencies in `useSelect` and `useSuspenseSelect` hooks. ([50247](https://github.com/WordPress/gutenberg/pull/50247))
+-   Add client-side filter reference to Curating the Editor doc and fix links. ([50203](https://github.com/WordPress/gutenberg/pull/50203))
+-   Add missing closing parenthesis in code example. ([50253](https://github.com/WordPress/gutenberg/pull/50253))
+-   Adds example to change the permalink structure. ([50251](https://github.com/WordPress/gutenberg/pull/50251))
+-   Adds links to REST-API reference. ([50070](https://github.com/WordPress/gutenberg/pull/50070))
+-   Create-block script includes link to documentation in render.php file. ([50206](https://github.com/WordPress/gutenberg/pull/50206))
+-   Block API > Registration: Switch markdown to a-tags. ([50110](https://github.com/WordPress/gutenberg/pull/50110))
+-   Don't use markdown in the callout section. ([50437](https://github.com/WordPress/gutenberg/pull/50437))
+-   Remove mention of perf testing from release documentation. ([50345](https://github.com/WordPress/gutenberg/pull/50345))
+-   Update Callout documentation on links. ([50131](https://github.com/WordPress/gutenberg/pull/50131))
+-   Fix incorrect label in contributor docs. ([50201](https://github.com/WordPress/gutenberg/pull/50201))
+-   Fix minor formatting issues in Performance doc. ([50202](https://github.com/WordPress/gutenberg/pull/50202))
+-   Fixes incorrect URLs in doc blocks. ([50123](https://github.com/WordPress/gutenberg/pull/50123))
+-   Use alert callout in the block deprecation documentation. ([50286](https://github.com/WordPress/gutenberg/pull/50286))
+-   Improve CardMedia documentation. ([50074](https://github.com/WordPress/gutenberg/pull/50074))
+-   Update README of TreeGrid with data-expanded attribute usage. ([50026](https://github.com/WordPress/gutenberg/pull/50026))
 
 ### Code Quality
 
-- Block Editor: Directly import useShouldContextualToolbarShow hook. ([50506](https://github.com/WordPress/gutenberg/pull/50506))
-- BlockControls, InspectorControls: Remove useSlot, unify behavior on bad group. ([50198](https://github.com/WordPress/gutenberg/pull/50198))
-- Enqueue registered block assets and resolve iframe styles end-to-end failure. ([50185](https://github.com/WordPress/gutenberg/pull/50185))
-- Make eslint-plugin validate dependencies in `useSelect` and `useSuspenseSelect` hooks. ([49900](https://github.com/WordPress/gutenberg/pull/49900))
-- Save Hub: Reuse the save button component to save code. ([50145](https://github.com/WordPress/gutenberg/pull/50145))
-- Use apiFetch instead of window.fetch. ([50043](https://github.com/WordPress/gutenberg/pull/50043))
-- Add types to dispatch and select. ([49930](https://github.com/WordPress/gutenberg/pull/49930))
-- Remove duplicate comment. ([50304](https://github.com/WordPress/gutenberg/pull/50304))
+-   Block Editor: Directly import useShouldContextualToolbarShow hook. ([50506](https://github.com/WordPress/gutenberg/pull/50506))
+-   BlockControls, InspectorControls: Remove useSlot, unify behavior on bad group. ([50198](https://github.com/WordPress/gutenberg/pull/50198))
+-   Enqueue registered block assets and resolve iframe styles end-to-end failure. ([50185](https://github.com/WordPress/gutenberg/pull/50185))
+-   Make eslint-plugin validate dependencies in `useSelect` and `useSuspenseSelect` hooks. ([49900](https://github.com/WordPress/gutenberg/pull/49900))
+-   Save Hub: Reuse the save button component to save code. ([50145](https://github.com/WordPress/gutenberg/pull/50145))
+-   Use apiFetch instead of window.fetch. ([50043](https://github.com/WordPress/gutenberg/pull/50043))
+-   Add types to dispatch and select. ([49930](https://github.com/WordPress/gutenberg/pull/49930))
+-   Remove duplicate comment. ([50304](https://github.com/WordPress/gutenberg/pull/50304))
 
 #### Lodash removal
-- Remove from blocks store reducer. ([50471](https://github.com/WordPress/gutenberg/pull/50471))
-- Remove `_.mapValues()` from `getBlockContentSchemaFromTransforms`. ([50096](https://github.com/WordPress/gutenberg/pull/50096))
-- Refactor away from `_.mapValues()`. ([50285](https://github.com/WordPress/gutenberg/pull/50285))
-- Remove `_.mapValues()` from blocks reducer. ([50097](https://github.com/WordPress/gutenberg/pull/50097))
+
+-   Remove from blocks store reducer. ([50471](https://github.com/WordPress/gutenberg/pull/50471))
+-   Remove `_.mapValues()` from `getBlockContentSchemaFromTransforms`. ([50096](https://github.com/WordPress/gutenberg/pull/50096))
+-   Refactor away from `_.mapValues()`. ([50285](https://github.com/WordPress/gutenberg/pull/50285))
+-   Remove `_.mapValues()` from blocks reducer. ([50097](https://github.com/WordPress/gutenberg/pull/50097))
 
 #### Components
-- Fix incorrect focus style widths. ([50127](https://github.com/WordPress/gutenberg/pull/50127))
-- Refactor/toolbar item component to typescript. ([49190](https://github.com/WordPress/gutenberg/pull/49190))
-- SlotFill: Several code cleanups. ([50098](https://github.com/WordPress/gutenberg/pull/50098))
-- SlotFill: Some code cleanups of the bubblesVirtually version. ([50133](https://github.com/WordPress/gutenberg/pull/50133))
-- Convert `NavigableContainer` to TypeScript. ([49377](https://github.com/WordPress/gutenberg/pull/49377))
+
+-   Fix incorrect focus style widths. ([50127](https://github.com/WordPress/gutenberg/pull/50127))
+-   Refactor/toolbar item component to typescript. ([49190](https://github.com/WordPress/gutenberg/pull/49190))
+-   SlotFill: Several code cleanups. ([50098](https://github.com/WordPress/gutenberg/pull/50098))
+-   SlotFill: Some code cleanups of the bubblesVirtually version. ([50133](https://github.com/WordPress/gutenberg/pull/50133))
+-   Convert `NavigableContainer` to TypeScript. ([49377](https://github.com/WordPress/gutenberg/pull/49377))
 
 #### Block Editor
-- Block Editor: Add names for the 'editor.BlockListBlock' filter HoCs. ([50513](https://github.com/WordPress/gutenberg/pull/50513))
-- Refactor around missing dependency in Link Control internal value sync effect. ([49509](https://github.com/WordPress/gutenberg/pull/49509))
-- Don't export Slot/Fill constants separately. ([50274](https://github.com/WordPress/gutenberg/pull/50274))
+
+-   Block Editor: Add names for the 'editor.BlockListBlock' filter HoCs. ([50513](https://github.com/WordPress/gutenberg/pull/50513))
+-   Refactor around missing dependency in Link Control internal value sync effect. ([49509](https://github.com/WordPress/gutenberg/pull/49509))
+-   Don't export Slot/Fill constants separately. ([50274](https://github.com/WordPress/gutenberg/pull/50274))
 
 #### Block Library
-- Centralize constants for the navigation block. ([50191](https://github.com/WordPress/gutenberg/pull/50191))
-- Move deprecated Nav block functions to bottom of render file. ([50328](https://github.com/WordPress/gutenberg/pull/50328))
-- Refactor BlockList uses Hooks. ([50293](https://github.com/WordPress/gutenberg/pull/50293))
+
+-   Centralize constants for the navigation block. ([50191](https://github.com/WordPress/gutenberg/pull/50191))
+-   Move deprecated Nav block functions to bottom of render file. ([50328](https://github.com/WordPress/gutenberg/pull/50328))
+-   Refactor BlockList uses Hooks. ([50293](https://github.com/WordPress/gutenberg/pull/50293))
 
 #### List View
-- Replace OffCanvasEditor in browse mode with the List View component. ([50287](https://github.com/WordPress/gutenberg/pull/50287))
-- Use block select button class for retaining colors when expanded or hovered. ([50155](https://github.com/WordPress/gutenberg/pull/50155))
+
+-   Replace OffCanvasEditor in browse mode with the List View component. ([50287](https://github.com/WordPress/gutenberg/pull/50287))
+-   Use block select button class for retaining colors when expanded or hovered. ([50155](https://github.com/WordPress/gutenberg/pull/50155))
 
 #### Global Styles
-- Global styles revisions: Ensure the revisions endpoint permissions match the global styles controller. ([50270](https://github.com/WordPress/gutenberg/pull/50270))
-- Simplify CustomCSS UI. ([49721](https://github.com/WordPress/gutenberg/pull/49721))
+
+-   Global styles revisions: Ensure the revisions endpoint permissions match the global styles controller. ([50270](https://github.com/WordPress/gutenberg/pull/50270))
+-   Simplify CustomCSS UI. ([49721](https://github.com/WordPress/gutenberg/pull/49721))
 
 #### Plugin
-- Update REST API Controller PHPUnit tests. ([50120](https://github.com/WordPress/gutenberg/pull/50120))
-- Update the Gutenberg plugin to require at least the WP 6.1 version. ([50079](https://github.com/WordPress/gutenberg/pull/50079))
-- Update the tested up to version for the gutenberg plugin. ([50360](https://github.com/WordPress/gutenberg/pull/50360))
+
+-   Update REST API Controller PHPUnit tests. ([50120](https://github.com/WordPress/gutenberg/pull/50120))
+-   Update the Gutenberg plugin to require at least the WP 6.1 version. ([50079](https://github.com/WordPress/gutenberg/pull/50079))
+-   Update the tested up to version for the gutenberg plugin. ([50360](https://github.com/WordPress/gutenberg/pull/50360))
 
 #### Native
-- Add a few import required for the React Native wrapper distribution as iOS XCFramework. ([50009](https://github.com/WordPress/gutenberg/pull/50009))
 
-#### Site Editor
-- Extract the Router APIs and context into a dedicated package. ([50100](https://github.com/WordPress/gutenberg/pull/50100))
-- Move loading logic to a separate hook. ([50511](https://github.com/WordPress/gutenberg/pull/50511))
+-   Add a few import required for the React Native wrapper distribution as iOS XCFramework. ([50009](https://github.com/WordPress/gutenberg/pull/50009))
 
+#### Site Editor
 
+-   Extract the Router APIs and context into a dedicated package. ([50100](https://github.com/WordPress/gutenberg/pull/50100))
+-   Move loading logic to a separate hook. ([50511](https://github.com/WordPress/gutenberg/pull/50511))
 
 ### Tools
 
 #### wp-env
-- Add `wp-env` After Setup Command. ([50196](https://github.com/WordPress/gutenberg/pull/50196))
-- Fix wp-env destroy. ([50445](https://github.com/WordPress/gutenberg/pull/50445))
-- Refactored `wp-env` configuration Parsing. ([50071](https://github.com/WordPress/gutenberg/pull/50071))
-- Wp-env fix exec command in CI. ([50411](https://github.com/WordPress/gutenberg/pull/50411))
-- wp-env: Add better default PHPunit settings, fix Xdebug, and update documentation. ([50490](https://github.com/WordPress/gutenberg/pull/50490))
-- wp-env: Improve run command execution speed. ([50007](https://github.com/WordPress/gutenberg/pull/50007))
-- Cleaned up Port Validation and Removed Unnecessary Default Ports. ([50300](https://github.com/WordPress/gutenberg/pull/50300))
-- Match Container's User and Group to Host. ([49962](https://github.com/WordPress/gutenberg/pull/49962))
+
+-   Add `wp-env` After Setup Command. ([50196](https://github.com/WordPress/gutenberg/pull/50196))
+-   Fix wp-env destroy. ([50445](https://github.com/WordPress/gutenberg/pull/50445))
+-   Refactored `wp-env` configuration Parsing. ([50071](https://github.com/WordPress/gutenberg/pull/50071))
+-   Wp-env fix exec command in CI. ([50411](https://github.com/WordPress/gutenberg/pull/50411))
+-   wp-env: Add better default PHPunit settings, fix Xdebug, and update documentation. ([50490](https://github.com/WordPress/gutenberg/pull/50490))
+-   wp-env: Improve run command execution speed. ([50007](https://github.com/WordPress/gutenberg/pull/50007))
+-   Cleaned up Port Validation and Removed Unnecessary Default Ports. ([50300](https://github.com/WordPress/gutenberg/pull/50300))
+-   Match Container's User and Group to Host. ([49962](https://github.com/WordPress/gutenberg/pull/49962))
 
 #### Testing
-- Add end-to-end test for editing the title of a new custom template part. ([50195](https://github.com/WordPress/gutenberg/pull/50195))
-- Add test to verify image appears on frontend. ([50472](https://github.com/WordPress/gutenberg/pull/50472))
-- Add tests coverage for the navigation block frontend interactivity. ([50462](https://github.com/WordPress/gutenberg/pull/50462))
-- Migrate Adding Patterns Test to Playwright. ([50083](https://github.com/WordPress/gutenberg/pull/50083))
-- Migrate Keep Transform Block Test Case to Playwright. ([49719](https://github.com/WordPress/gutenberg/pull/49719))
-- Migrate PullQuote test case to playwright. ([50085](https://github.com/WordPress/gutenberg/pull/50085))
-- Migrate undo to Playwright. ([48701](https://github.com/WordPress/gutenberg/pull/48701))
-- Prerelease end-to-end Test Utils for Playwright. ([43998](https://github.com/WordPress/gutenberg/pull/43998))
-- Skip creating flaky issues on PRs. ([50146](https://github.com/WordPress/gutenberg/pull/50146))
-- end-to-end tests: Try to fix flaky global styles revisions tests. ([50454](https://github.com/WordPress/gutenberg/pull/50454))
-- Add BlockList text coverage. ([50252](https://github.com/WordPress/gutenberg/pull/50252))
+
+-   Add end-to-end test for editing the title of a new custom template part. ([50195](https://github.com/WordPress/gutenberg/pull/50195))
+-   Add test to verify image appears on frontend. ([50472](https://github.com/WordPress/gutenberg/pull/50472))
+-   Add tests coverage for the navigation block frontend interactivity. ([50462](https://github.com/WordPress/gutenberg/pull/50462))
+-   Migrate Adding Patterns Test to Playwright. ([50083](https://github.com/WordPress/gutenberg/pull/50083))
+-   Migrate Keep Transform Block Test Case to Playwright. ([49719](https://github.com/WordPress/gutenberg/pull/49719))
+-   Migrate PullQuote test case to playwright. ([50085](https://github.com/WordPress/gutenberg/pull/50085))
+-   Migrate undo to Playwright. ([48701](https://github.com/WordPress/gutenberg/pull/48701))
+-   Prerelease end-to-end Test Utils for Playwright. ([43998](https://github.com/WordPress/gutenberg/pull/43998))
+-   Skip creating flaky issues on PRs. ([50146](https://github.com/WordPress/gutenberg/pull/50146))
+-   end-to-end tests: Try to fix flaky global styles revisions tests. ([50454](https://github.com/WordPress/gutenberg/pull/50454))
+-   Add BlockList text coverage. ([50252](https://github.com/WordPress/gutenberg/pull/50252))
 
 #### Build Tooling
-- Changelog automation: Apply proper top-level categorization precedence to meta PRs. ([50208](https://github.com/WordPress/gutenberg/pull/50208))
-- Do not include first time contributors section in changelog if there are not any. ([50291](https://github.com/WordPress/gutenberg/pull/50291))
-- Publish rich text build types. ([49651](https://github.com/WordPress/gutenberg/pull/49651))
-- Rich text: Rename index.js > index.ts for type-only exports. ([50212](https://github.com/WordPress/gutenberg/pull/50212))
-- Remove PHPUnit and Composer packages. ([50408](https://github.com/WordPress/gutenberg/pull/50408))
 
-#### Repository Maintainance
-- Add ndiego as codeowner for docs. ([50289](https://github.com/WordPress/gutenberg/pull/50289))
+-   Changelog automation: Apply proper top-level categorization precedence to meta PRs. ([50208](https://github.com/WordPress/gutenberg/pull/50208))
+-   Do not include first-time contributors section in changelog if there are not any. ([50291](https://github.com/WordPress/gutenberg/pull/50291))
+-   Publish rich text build types. ([49651](https://github.com/WordPress/gutenberg/pull/49651))
+-   Rich text: Rename index.js > index.ts for type-only exports. ([50212](https://github.com/WordPress/gutenberg/pull/50212))
+-   Remove PHPUnit and Composer packages. ([50408](https://github.com/WordPress/gutenberg/pull/50408))
 
+#### Repository Maintainance
 
-## First time contributors
+-   Add ndiego as codeowner for docs. ([50289](https://github.com/WordPress/gutenberg/pull/50289))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @johnhooks: feature(data): Add types to dispatch and select. ([49930](https://github.com/WordPress/gutenberg/pull/49930))
-- @margolisj: Refactor/toolbar item component to typescript. ([49190](https://github.com/WordPress/gutenberg/pull/49190))
-- @n2erjo00: Create-block script includes link to documentation in render.php file. ([50206](https://github.com/WordPress/gutenberg/pull/50206))
-- @samnajian: Fix/wp get global styles for custom props returns internal variable. ([50366](https://github.com/WordPress/gutenberg/pull/50366))
+The following PRs were merged by first-time contributors:
 
+-   @johnhooks: feature(data): Add types to dispatch and select. ([49930](https://github.com/WordPress/gutenberg/pull/49930))
+-   @margolisj: Refactor/toolbar item component to typescript. ([49190](https://github.com/WordPress/gutenberg/pull/49190))
+-   @n2erjo00: Create-block script includes link to documentation in render.php file. ([50206](https://github.com/WordPress/gutenberg/pull/50206))
+-   @samnajian: Fix/wp get global styles for custom props returns internal variable. ([50366](https://github.com/WordPress/gutenberg/pull/50366))
 
 ## Contributors
 
@@ -5677,25 +16699,21 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @ajlende @alexstine @andrewserong @apeatling @artemiomorales @aurooba @bph @chad1008 @ciampo @DAreRodz @dcalhoun @draganescu @ecgan @fluiddot @fullofcaffeine @geriux @getdave @glendaviesnz @gziolo @hellofromtonya @ironprogrammer @jameskoster @jasmussen @jeryj @jhnstn @johnhooks @jsnajdr @juanfra @kevin940726 @kienstra @Mamaduka @margolisj @mburridge @mirka @mokagio @mtias @n2erjo00 @ndiego @noahtallen @noisysocks @ntsekouras @oandregal @ObliviousHarmony @ocean90 @ockham @pavanpatil1 @pooja-muchandikar @priethor @ramonjd @richtabor @samnajian @SantosGuillamot @scruffian @SiobhyB @t-hamano @talldan @tellthemachines @torounit @tyxla @westonruter @youknowriad
 
-
-
-
 = 15.7.1 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
 #### Fonts API
-- Relocate which fonts to print into wp_print_fonts(). ([50151](https://github.com/WordPress/gutenberg/pull/50151))
 
+-   Relocate which fonts to print into wp_print_fonts(). ([50151](https://github.com/WordPress/gutenberg/pull/50151))
 
 ### Tools
 
 #### Testing
-- Skip  iframe-inline-styles end-to-end test. ([50320](https://github.com/WordPress/gutenberg/pull/50320))
+
+-   Skip iframe-inline-styles end-to-end test. ([50320](https://github.com/WordPress/gutenberg/pull/50320))
 
 ## Contributors
 
@@ -5703,7 +16721,6 @@ The following contributors merged PRs in this release:
 
 @hellofromtonya @scruffian
 
-
 = 15.7.0 =
 
 ## Changelog
@@ -5711,198 +16728,220 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Group: Add allowedBlocks attribute and pass it to innerBlockProps. ([49128](https://github.com/WordPress/gutenberg/pull/49128))
-- Media & Text: Add allowedBlocks attribute and pass it to innerBlock. ([49981](https://github.com/WordPress/gutenberg/pull/49981))
-- Site Logo: Add logo replace flow in Inspector controls. ([49992](https://github.com/WordPress/gutenberg/pull/49992))
+
+-   Group: Add allowedBlocks attribute and pass it to innerBlockProps. ([49128](https://github.com/WordPress/gutenberg/pull/49128))
+-   Media & Text: Add allowedBlocks attribute and pass it to innerBlock. ([49981](https://github.com/WordPress/gutenberg/pull/49981))
+-   Site Logo: Add logo replace flow in Inspector controls. ([49992](https://github.com/WordPress/gutenberg/pull/49992))
 
 #### Global Styles
-- Fluid typography: Use logarithmic scale factor to calculate a min font size. ([49707](https://github.com/WordPress/gutenberg/pull/49707))
-- Style book: Make the style book slot generic. ([49973](https://github.com/WordPress/gutenberg/pull/49973))
-- Base Styles: Add the editor input reset with increased specificity. ([49831](https://github.com/WordPress/gutenberg/pull/49831))
+
+-   Fluid typography: Use logarithmic scale factor to calculate a min font size. ([49707](https://github.com/WordPress/gutenberg/pull/49707))
+-   Style book: Make the style book slot generic. ([49973](https://github.com/WordPress/gutenberg/pull/49973))
+-   Base Styles: Add the editor input reset with increased specificity. ([49831](https://github.com/WordPress/gutenberg/pull/49831))
 
 #### Components
-- Draggable: Allow elementId based elements to be attached to the ownerDocument body. ([49911](https://github.com/WordPress/gutenberg/pull/49911))
-- Spinner: Enforce no background. ([49695](https://github.com/WordPress/gutenberg/pull/49695))
-- Updates the behavior of the top toolbar fixed setting. ([49634](https://github.com/WordPress/gutenberg/pull/49634))
+
+-   Draggable: Allow elementId based elements to be attached to the ownerDocument body. ([49911](https://github.com/WordPress/gutenberg/pull/49911))
+-   Spinner: Enforce no background. ([49695](https://github.com/WordPress/gutenberg/pull/49695))
+-   Updates the behavior of the top toolbar fixed setting. ([49634](https://github.com/WordPress/gutenberg/pull/49634))
 
 #### Design Tools
-- Image: Display custom borders on placeholder. ([49569](https://github.com/WordPress/gutenberg/pull/49569))
-- Patterns: Try a masonry layout on the template pattern suggestion modal. ([49958](https://github.com/WordPress/gutenberg/pull/49958))
+
+-   Image: Display custom borders on placeholder. ([49569](https://github.com/WordPress/gutenberg/pull/49569))
+-   Patterns: Try a masonry layout on the template pattern suggestion modal. ([49958](https://github.com/WordPress/gutenberg/pull/49958))
 
 #### Duotone
-- Duotone: Add block controls on the inspector. ([49838](https://github.com/WordPress/gutenberg/pull/49838))
-- Duotone: Fix setup state for image block. ([49949](https://github.com/WordPress/gutenberg/pull/49949))
-- Polish duotone rendering code. ([49706](https://github.com/WordPress/gutenberg/pull/49706))
-- Deprecate remaining global duotone functions. ([49702](https://github.com/WordPress/gutenberg/pull/49702))
-- Group duotone outputs and refactor rendering. ([49705](https://github.com/WordPress/gutenberg/pull/49705))
+
+-   Duotone: Add block controls on the inspector. ([49838](https://github.com/WordPress/gutenberg/pull/49838))
+-   Duotone: Fix setup state for image block. ([49949](https://github.com/WordPress/gutenberg/pull/49949))
+-   Polish duotone rendering code. ([49706](https://github.com/WordPress/gutenberg/pull/49706))
+-   Deprecate remaining global duotone functions. ([49702](https://github.com/WordPress/gutenberg/pull/49702))
+-   Group duotone outputs and refactor rendering. ([49705](https://github.com/WordPress/gutenberg/pull/49705))
 
 ### Accessibility
-- List view: Refactor ARIA attributes. ([48461](https://github.com/WordPress/gutenberg/pull/48461))
-- Block Mover: Make text labels for left/right move buttons legible. ([49747](https://github.com/WordPress/gutenberg/pull/49747))
-- Block Toolbar: Fix incorrect switcher button width in text mode. ([49847](https://github.com/WordPress/gutenberg/pull/49847))
-- Snackbar: Fix insufficient color contrast on hover. ([49682](https://github.com/WordPress/gutenberg/pull/49682))
-- Update Reakit dep to 1.3.11. ([49763](https://github.com/WordPress/gutenberg/pull/49763))
-- List View: Add aria-description. ([49907](https://github.com/WordPress/gutenberg/pull/49907))
-
-### Bug Fixes
-
-#### Block Library
-
-- Cover block: Remove overflow hidden rule. ([49913](https://github.com/WordPress/gutenberg/pull/49913))
-- Fix BlockInfo slot displaying logic. ([50054](https://github.com/WordPress/gutenberg/pull/50054))
-- Fix block toolbar height and rounded corners of parent selector button when text label mode. ([49556](https://github.com/WordPress/gutenberg/pull/49556))
-- Demo content cover block alignment not respected. ([49848](https://github.com/WordPress/gutenberg/pull/49848))
-- Group block: Remove innerprops from placeholder wrapper. ([49783](https://github.com/WordPress/gutenberg/pull/49783))
-- Only display the modified post date if the post has been modified. ([46839](https://github.com/WordPress/gutenberg/pull/46839))
-- Post Excerpt: Fix crash at runtime when postType is undefined. ([49899](https://github.com/WordPress/gutenberg/pull/49899))
-- Post Featured Image: Fix some sizing issues. ([49641](https://github.com/WordPress/gutenberg/pull/49641))
-- Adjust copy of Site Logo Block. ([49540](https://github.com/WordPress/gutenberg/pull/49540))
-- Adapt flex child controls for Spacer. ([49362](https://github.com/WordPress/gutenberg/pull/49362))
-- Social Icon: Update the `link` and `mail` block variation's icons. ([49952](https://github.com/WordPress/gutenberg/pull/49952))
-- Cover: Re-instate overflow:Hidden rule to fix issue with border radius. ([50209](https://github.com/WordPress/gutenberg/pull/50209))
-- Fix site logo preview image size with long filenames. ([50242](https://github.com/WordPress/gutenberg/pull/50242))
-
-#### Components
-- CheckboxControl: Add support custom IDs. ([49977](https://github.com/WordPress/gutenberg/pull/49977))
-- Equalize modal internal padding. ([49890](https://github.com/WordPress/gutenberg/pull/49890))
-- Increase modal radius. ([49870](https://github.com/WordPress/gutenberg/pull/49870))
-- Query: Fix add new post link position via private SlotFill. ([49819](https://github.com/WordPress/gutenberg/pull/49819))
-- Tweak `WordPressComponent` type. ([49960](https://github.com/WordPress/gutenberg/pull/49960))
-- Update the framer motion dependency to the latest version. ([49822](https://github.com/WordPress/gutenberg/pull/49822))
-- Improve output of CHANGELOG CI check. ([49779](https://github.com/WordPress/gutenberg/pull/49779))
-- Retain context when opening modals on small screens. ([50039](https://github.com/WordPress/gutenberg/pull/50039))
-- Update CHANGELOG CI check to support forked repos. ([49906](https://github.com/WordPress/gutenberg/pull/49906))
-
-#### Global Styles
-- Borders: Fix border style on color/width clearing and global styles fallback logic. ([49738](https://github.com/WordPress/gutenberg/pull/49738))
-- Borders: Maintain radius in Global Styles. ([49950](https://github.com/WordPress/gutenberg/pull/49950))
-- Close stylebook if the global styles side bar is not open. ([50081](https://github.com/WordPress/gutenberg/pull/50081))
-- Do not add unregistered style variations to the theme.json schema. ([49807](https://github.com/WordPress/gutenberg/pull/49807))
-- Update preset styles to use Selectors API. ([49427](https://github.com/WordPress/gutenberg/pull/49427))
-- Change the 'WP_Theme_JSON_Data_Gutenberg' class directory. ([50062](https://github.com/WordPress/gutenberg/pull/50062))
-- Layout: Fix issue where saving user global styles included layout definitions in layout settings. ([50268](https://github.com/WordPress/gutenberg/pull/50268))
+
+-   List view: Refactor ARIA attributes. ([48461](https://github.com/WordPress/gutenberg/pull/48461))
+-   Block Mover: Make text labels for left/right move buttons legible. ([49747](https://github.com/WordPress/gutenberg/pull/49747))
+-   Block Toolbar: Fix incorrect switcher button width in text mode. ([49847](https://github.com/WordPress/gutenberg/pull/49847))
+-   Snackbar: Fix insufficient color contrast on hover. ([49682](https://github.com/WordPress/gutenberg/pull/49682))
+-   Update Reakit dep to 1.3.11. ([49763](https://github.com/WordPress/gutenberg/pull/49763))
+-   List View: Add aria-description. ([49907](https://github.com/WordPress/gutenberg/pull/49907))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Cover block: Remove overflow hidden rule. ([49913](https://github.com/WordPress/gutenberg/pull/49913))
+-   Fix BlockInfo slot displaying logic. ([50054](https://github.com/WordPress/gutenberg/pull/50054))
+-   Fix block toolbar height and rounded corners of parent selector button when text label mode. ([49556](https://github.com/WordPress/gutenberg/pull/49556))
+-   Demo content cover block alignment not respected. ([49848](https://github.com/WordPress/gutenberg/pull/49848))
+-   Group block: Remove innerprops from placeholder wrapper. ([49783](https://github.com/WordPress/gutenberg/pull/49783))
+-   Only display the modified post date if the post has been modified. ([46839](https://github.com/WordPress/gutenberg/pull/46839))
+-   Post Excerpt: Fix crash at runtime when postType is undefined. ([49899](https://github.com/WordPress/gutenberg/pull/49899))
+-   Post Featured Image: Fix some sizing issues. ([49641](https://github.com/WordPress/gutenberg/pull/49641))
+-   Adjust copy of Site Logo Block. ([49540](https://github.com/WordPress/gutenberg/pull/49540))
+-   Adapt flex child controls for Spacer. ([49362](https://github.com/WordPress/gutenberg/pull/49362))
+-   Social Icon: Update the `link` and `mail` block variation's icons. ([49952](https://github.com/WordPress/gutenberg/pull/49952))
+-   Cover: Re-instate overflow:Hidden rule to fix issue with border radius. ([50209](https://github.com/WordPress/gutenberg/pull/50209))
+-   Fix site logo preview image size with long filenames. ([50242](https://github.com/WordPress/gutenberg/pull/50242))
+
+#### Components
+
+-   CheckboxControl: Add support custom IDs. ([49977](https://github.com/WordPress/gutenberg/pull/49977))
+-   Equalize modal internal padding. ([49890](https://github.com/WordPress/gutenberg/pull/49890))
+-   Increase modal radius. ([49870](https://github.com/WordPress/gutenberg/pull/49870))
+-   Query: Fix add new post link position via private SlotFill. ([49819](https://github.com/WordPress/gutenberg/pull/49819))
+-   Tweak `WordPressComponent` type. ([49960](https://github.com/WordPress/gutenberg/pull/49960))
+-   Update the framer motion dependency to the latest version. ([49822](https://github.com/WordPress/gutenberg/pull/49822))
+-   Improve output of CHANGELOG CI check. ([49779](https://github.com/WordPress/gutenberg/pull/49779))
+-   Retain context when opening modals on small screens. ([50039](https://github.com/WordPress/gutenberg/pull/50039))
+-   Update CHANGELOG CI check to support forked repos. ([49906](https://github.com/WordPress/gutenberg/pull/49906))
+
+#### Global Styles
+
+-   Borders: Fix border style on color/width clearing and global styles fallback logic. ([49738](https://github.com/WordPress/gutenberg/pull/49738))
+-   Borders: Maintain radius in Global Styles. ([49950](https://github.com/WordPress/gutenberg/pull/49950))
+-   Close stylebook if the global styles side bar is not open. ([50081](https://github.com/WordPress/gutenberg/pull/50081))
+-   Do not add unregistered style variations to the theme.json schema. ([49807](https://github.com/WordPress/gutenberg/pull/49807))
+-   Update preset styles to use Selectors API. ([49427](https://github.com/WordPress/gutenberg/pull/49427))
+-   Change the 'WP_Theme_JSON_Data_Gutenberg' class directory. ([50062](https://github.com/WordPress/gutenberg/pull/50062))
+-   Layout: Fix issue where saving user global styles included layout definitions in layout settings. ([50268](https://github.com/WordPress/gutenberg/pull/50268))
 
 #### Site Editor
-- Fix screen flash when deleting templates in templates list. ([48449](https://github.com/WordPress/gutenberg/pull/48449))
-- Fix the condition for the modal to choose the initial template pattern. ([49954](https://github.com/WordPress/gutenberg/pull/49954))
-- Fix editor crash caused by missing type conversion in EditorStyles component. ([49882](https://github.com/WordPress/gutenberg/pull/49882))
-- Remove frame shadow in edit view. ([49767](https://github.com/WordPress/gutenberg/pull/49767))
-- Add `home` to list of new templates. ([47389](https://github.com/WordPress/gutenberg/pull/47389))
-- Animate the site icon element between view and edit in the site editor. ([48886](https://github.com/WordPress/gutenberg/pull/48886))
-- Restore click event handler on site icon button. ([50094](https://github.com/WordPress/gutenberg/pull/50094))
-- Correctly return 'isResolving' from 'useAlternativeTemplateParts' hook. ([49921](https://github.com/WordPress/gutenberg/pull/49921))
+
+-   Fix screen flash when deleting templates in templates list. ([48449](https://github.com/WordPress/gutenberg/pull/48449))
+-   Fix the condition for the modal to choose the initial template pattern. ([49954](https://github.com/WordPress/gutenberg/pull/49954))
+-   Fix editor crash caused by missing type conversion in EditorStyles component. ([49882](https://github.com/WordPress/gutenberg/pull/49882))
+-   Remove frame shadow in edit view. ([49767](https://github.com/WordPress/gutenberg/pull/49767))
+-   Add `home` to list of new templates. ([47389](https://github.com/WordPress/gutenberg/pull/47389))
+-   Animate the site icon element between view and edit in the site editor. ([48886](https://github.com/WordPress/gutenberg/pull/48886))
+-   Restore click event handler on site icon button. ([50094](https://github.com/WordPress/gutenberg/pull/50094))
+-   Correctly return 'isResolving' from 'useAlternativeTemplateParts' hook. ([49921](https://github.com/WordPress/gutenberg/pull/49921))
 
 #### Patterns
-- Increase the dimensions of the pattern modal that appears when creating a new page. ([49859](https://github.com/WordPress/gutenberg/pull/49859))
-- Update full screen modal dimensions, and pattern grids. ([49894](https://github.com/WordPress/gutenberg/pull/49894))
-- Increase pattern modal dimensions when creating a new template. ([49722](https://github.com/WordPress/gutenberg/pull/49722))
+
+-   Increase the dimensions of the pattern modal that appears when creating a new page. ([49859](https://github.com/WordPress/gutenberg/pull/49859))
+-   Update full screen modal dimensions, and pattern grids. ([49894](https://github.com/WordPress/gutenberg/pull/49894))
+-   Increase pattern modal dimensions when creating a new template. ([49722](https://github.com/WordPress/gutenberg/pull/49722))
 
 #### List View
-- Add parameters to custom-scrollbars-on-hover. ([49892](https://github.com/WordPress/gutenberg/pull/49892))
-- Update with scrolling and custom scrollbar. ([49793](https://github.com/WordPress/gutenberg/pull/49793))
-- Ensure list view block id is unique to the list view instance. ([49944](https://github.com/WordPress/gutenberg/pull/49944))
+
+-   Add parameters to custom-scrollbars-on-hover. ([49892](https://github.com/WordPress/gutenberg/pull/49892))
+-   Update with scrolling and custom scrollbar. ([49793](https://github.com/WordPress/gutenberg/pull/49793))
+-   Ensure list view block id is unique to the list view instance. ([49944](https://github.com/WordPress/gutenberg/pull/49944))
 
 #### Block Editor
-- Fix quick inserter going off-screen in some situations. ([49881](https://github.com/WordPress/gutenberg/pull/49881))
-- List View: Update drop indicator width to be aware of scroll containers. ([49786](https://github.com/WordPress/gutenberg/pull/49786))
-- Block highlight: Fix radius issue. ([49864](https://github.com/WordPress/gutenberg/pull/49864))
-- DOM: Update getScrollContainer to be aware of horizontal scroll. ([49787](https://github.com/WordPress/gutenberg/pull/49787))
-- Fix fixed block toolbar positioning. ([49990](https://github.com/WordPress/gutenberg/pull/49990))
-- iframe: Add `enqueue_block_assets`. ([49655](https://github.com/WordPress/gutenberg/pull/49655))
-- Rename immutableSet to setImmutably. ([50040](https://github.com/WordPress/gutenberg/pull/50040))
-- Edit Post: Hide overflowing content in visual editor wrapper to prevent block popovers from creating scrollbars. ([49978](https://github.com/WordPress/gutenberg/pull/49978))
+
+-   Fix quick inserter going off-screen in some situations. ([49881](https://github.com/WordPress/gutenberg/pull/49881))
+-   List View: Update drop indicator width to be aware of scroll containers. ([49786](https://github.com/WordPress/gutenberg/pull/49786))
+-   Block highlight: Fix radius issue. ([49864](https://github.com/WordPress/gutenberg/pull/49864))
+-   DOM: Update getScrollContainer to be aware of horizontal scroll. ([49787](https://github.com/WordPress/gutenberg/pull/49787))
+-   Fix fixed block toolbar positioning. ([49990](https://github.com/WordPress/gutenberg/pull/49990))
+-   iframe: Add `enqueue_block_assets`. ([49655](https://github.com/WordPress/gutenberg/pull/49655))
+-   Rename immutableSet to setImmutably. ([50040](https://github.com/WordPress/gutenberg/pull/50040))
+-   Edit Post: Hide overflowing content in visual editor wrapper to prevent block popovers from creating scrollbars. ([49978](https://github.com/WordPress/gutenberg/pull/49978))
 
 #### REST API
-- Replace fallbacks to fallback (singular) in Nav fallback REST endpoint. ([50044](https://github.com/WordPress/gutenberg/pull/50044))
-- Consolidate Navigation fallbacks logic between Editor and Front of Site via REST API. ([48698](https://github.com/WordPress/gutenberg/pull/48698))
-- Add /revisions endpoint for global styles. ([49974](https://github.com/WordPress/gutenberg/pull/49974))
+
+-   Replace fallbacks to fallback (singular) in Nav fallback REST endpoint. ([50044](https://github.com/WordPress/gutenberg/pull/50044))
+-   Consolidate Navigation fallbacks logic between Editor and Front of Site via REST API. ([48698](https://github.com/WordPress/gutenberg/pull/48698))
+-   Add /revisions endpoint for global styles. ([49974](https://github.com/WordPress/gutenberg/pull/49974))
 
 #### Build Tooling
-- Fix multiple tooltips showing on NavigableToolbars. ([49644](https://github.com/WordPress/gutenberg/pull/49644))
-- Add `--env-cwd` Option To `wp-env run`. ([49908](https://github.com/WordPress/gutenberg/pull/49908)) - Add Port To `WP_TESTS_DOMAIN`. ([49883](https://github.com/WordPress/gutenberg/pull/49883))
-- Add support in `check-license` for conjunctive (AND) licenses. ([46801](https://github.com/WordPress/gutenberg/pull/46801))
+
+-   Fix multiple tooltips showing on NavigableToolbars. ([49644](https://github.com/WordPress/gutenberg/pull/49644))
+-   Add `--env-cwd` Option To `wp-env run`. ([49908](https://github.com/WordPress/gutenberg/pull/49908)) - Add Port To `WP_TESTS_DOMAIN`. ([49883](https://github.com/WordPress/gutenberg/pull/49883))
+-   Add support in `check-license` for conjunctive (AND) licenses. ([46801](https://github.com/WordPress/gutenberg/pull/46801))
 
 ### Performance
+
 Continued the work refactor away from Lodash usages to reduce the build size
 [49799](https://github.com/WordPress/gutenberg/pull/49799), [49794](https://github.com/WordPress/gutenberg/pull/49794), [49755](https://github.com/WordPress/gutenberg/pull/49755)
 
 ### Experiments
-- Allow adding posts and pages with custom titles from the command menu. ([49893](https://github.com/WordPress/gutenberg/pull/49893))
-- Update the design of the command center. ([49681](https://github.com/WordPress/gutenberg/pull/49681))
+
+-   Allow adding posts and pages with custom titles from the command menu. ([49893](https://github.com/WordPress/gutenberg/pull/49893))
+-   Update the design of the command center. ([49681](https://github.com/WordPress/gutenberg/pull/49681))
 
 ### Documentation
-- Adds closing code tags. ([49991](https://github.com/WordPress/gutenberg/pull/49991))
-- Add "block-selectors" documentation to TOC and manifest. ([49471](https://github.com/WordPress/gutenberg/pull/49471))
-- Adds note about custom fields to Plugin Sidebar page in documentation. ([49622](https://github.com/WordPress/gutenberg/pull/49622))
-- Autocomplete: Add heading and fix type for `onReplace` in README. ([49798](https://github.com/WordPress/gutenberg/pull/49798))
-- Document the separation between private APIs and experimental APIs. ([47973](https://github.com/WordPress/gutenberg/pull/47973))
-- Fix broken link and update title of Localizing Gutenberg doc. ([49851](https://github.com/WordPress/gutenberg/pull/49851))
-- Fixes broken img link. ([49805](https://github.com/WordPress/gutenberg/pull/49805))
-- Need to use WordPress package for useState. ([49478](https://github.com/WordPress/gutenberg/pull/49478))
-- Remove unused screenshot from documentation folder. ([49896](https://github.com/WordPress/gutenberg/pull/49896))
-- Small grammar fixes for block-context.md. ([49701](https://github.com/WordPress/gutenberg/pull/49701))
-- Update IS_GUTENBERG_PLUGIN to process.env.IS_GUTENBERG_PLUGIN in coding guidelines. ([49825](https://github.com/WordPress/gutenberg/pull/49825))
-- Fixes typo in README. ([49957](https://github.com/WordPress/gutenberg/pull/49957))
-- Update README.md. ([49762](https://github.com/WordPress/gutenberg/pull/49762))
-- Update README.md. ([49855](https://github.com/WordPress/gutenberg/pull/49855))
-- Update outreach.md. ([49961](https://github.com/WordPress/gutenberg/pull/49961))
-- Update wp-env prereq documentation. ([50004](https://github.com/WordPress/gutenberg/pull/50004))
-- Formatting inside alert div. ([50090](https://github.com/WordPress/gutenberg/pull/50090))
+
+-   Adds closing code tags. ([49991](https://github.com/WordPress/gutenberg/pull/49991))
+-   Add "block-selectors" documentation to TOC and manifest. ([49471](https://github.com/WordPress/gutenberg/pull/49471))
+-   Adds note about custom fields to Plugin Sidebar page in documentation. ([49622](https://github.com/WordPress/gutenberg/pull/49622))
+-   Autocomplete: Add heading and fix type for `onReplace` in README. ([49798](https://github.com/WordPress/gutenberg/pull/49798))
+-   Document the separation between private APIs and experimental APIs. ([47973](https://github.com/WordPress/gutenberg/pull/47973))
+-   Fix broken link and update title of Localizing Gutenberg doc. ([49851](https://github.com/WordPress/gutenberg/pull/49851))
+-   Fixes broken img link. ([49805](https://github.com/WordPress/gutenberg/pull/49805))
+-   Need to use WordPress package for useState. ([49478](https://github.com/WordPress/gutenberg/pull/49478))
+-   Remove unused screenshot from documentation folder. ([49896](https://github.com/WordPress/gutenberg/pull/49896))
+-   Small grammar fixes for block-context.md. ([49701](https://github.com/WordPress/gutenberg/pull/49701))
+-   Update IS_GUTENBERG_PLUGIN to process.env.IS_GUTENBERG_PLUGIN in coding guidelines. ([49825](https://github.com/WordPress/gutenberg/pull/49825))
+-   Fixes typo in README. ([49957](https://github.com/WordPress/gutenberg/pull/49957))
+-   Update README.md. ([49762](https://github.com/WordPress/gutenberg/pull/49762))
+-   Update README.md. ([49855](https://github.com/WordPress/gutenberg/pull/49855))
+-   Update outreach.md. ([49961](https://github.com/WordPress/gutenberg/pull/49961))
+-   Update wp-env prereq documentation. ([50004](https://github.com/WordPress/gutenberg/pull/50004))
+-   Formatting inside alert div. ([50090](https://github.com/WordPress/gutenberg/pull/50090))
+
 #### Theme.json
-- Add documentation for `variations` key in `theme.json`. ([49826](https://github.com/WordPress/gutenberg/pull/49826))
-- Update theme.json reference documentation to include more sections. ([48250](https://github.com/WordPress/gutenberg/pull/48250))
+
+-   Add documentation for `variations` key in `theme.json`. ([49826](https://github.com/WordPress/gutenberg/pull/49826))
+-   Update theme.json reference documentation to include more sections. ([48250](https://github.com/WordPress/gutenberg/pull/48250))
 
 #### Gutenberg Plugin release
-- Update the Gutenberg release issue template to reflect the new Gutenberg release team. ([50037](https://github.com/WordPress/gutenberg/pull/50037))
-- Update Gutenberg release documentation to include the new Gutenberg Release Team. ([50036](https://github.com/WordPress/gutenberg/pull/50036))
-- Fix broken link and minor tweaks to formatting and verbiage in the Gutenberg Release Process doc. ([49876](https://github.com/WordPress/gutenberg/pull/49876))
-- Update release checklist. ([50068](https://github.com/WordPress/gutenberg/pull/50068))
+
+-   Update the Gutenberg release issue template to reflect the new Gutenberg release team. ([50037](https://github.com/WordPress/gutenberg/pull/50037))
+-   Update Gutenberg release documentation to include the new Gutenberg Release Team. ([50036](https://github.com/WordPress/gutenberg/pull/50036))
+-   Fix broken link and minor tweaks to formatting and verbiage in the Gutenberg Release Process doc. ([49876](https://github.com/WordPress/gutenberg/pull/49876))
+-   Update release checklist. ([50068](https://github.com/WordPress/gutenberg/pull/50068))
 
 #### Block Development
-- Improve the learning experience for writing blocks. ([49792](https://github.com/WordPress/gutenberg/pull/49792))
-- Re-write of the landing page. ([49643](https://github.com/WordPress/gutenberg/pull/49643))
-- Improve insertBlock(s) documentation. ([50078](https://github.com/WordPress/gutenberg/pull/50078))
-- Small Typo: Remove dots. ([49853](https://github.com/WordPress/gutenberg/pull/49853))
- 
+
+-   Improve the learning experience for writing blocks. ([49792](https://github.com/WordPress/gutenberg/pull/49792))
+-   Re-write of the landing page. ([49643](https://github.com/WordPress/gutenberg/pull/49643))
+-   Improve insertBlock(s) documentation. ([50078](https://github.com/WordPress/gutenberg/pull/50078))
+-   Small Typo: Remove dots. ([49853](https://github.com/WordPress/gutenberg/pull/49853))
+
 ### Code Quality
 
-- Fix PrivateInserter import. ([50038](https://github.com/WordPress/gutenberg/pull/50038))
-- Remove the normalizeFalsyValue util. ([50033](https://github.com/WordPress/gutenberg/pull/50033))
-- Don't programmatically lowercase post type label. ([49591](https://github.com/WordPress/gutenberg/pull/49591))
-- Port colord to PHP. ([49700](https://github.com/WordPress/gutenberg/pull/49700))
-- Reuse cleanEmptyObject utility and fix empty string case. ([49750](https://github.com/WordPress/gutenberg/pull/49750))
-- toStyles: Don't mutate the tree argument. ([49806](https://github.com/WordPress/gutenberg/pull/49806))
-- useInstanceId: Fix useMemo hook dependencies. ([49979](https://github.com/WordPress/gutenberg/pull/49979))
+-   Fix PrivateInserter import. ([50038](https://github.com/WordPress/gutenberg/pull/50038))
+-   Remove the normalizeFalsyValue util. ([50033](https://github.com/WordPress/gutenberg/pull/50033))
+-   Don't programmatically lowercase post type label. ([49591](https://github.com/WordPress/gutenberg/pull/49591))
+-   Port colord to PHP. ([49700](https://github.com/WordPress/gutenberg/pull/49700))
+-   Reuse cleanEmptyObject utility and fix empty string case. ([49750](https://github.com/WordPress/gutenberg/pull/49750))
+-   toStyles: Don't mutate the tree argument. ([49806](https://github.com/WordPress/gutenberg/pull/49806))
+-   useInstanceId: Fix useMemo hook dependencies. ([49979](https://github.com/WordPress/gutenberg/pull/49979))
 
 ### Tools
 
 #### Testing
-- Components: Update `ColorPicker` unit tests. ([49698](https://github.com/WordPress/gutenberg/pull/49698))
-- Migrate CPT end-to-end tests to Playwright. ([50031](https://github.com/WordPress/gutenberg/pull/50031))
-- Fonts API: Add tests for gutenberg_add_registered_fonts_to_theme_json(). ([50049](https://github.com/WordPress/gutenberg/pull/50049))
-- Expand multi-line block tests. ([49732](https://github.com/WordPress/gutenberg/pull/49732))
-- Rich text test helpers mimic user events. ([49804](https://github.com/WordPress/gutenberg/pull/49804)) 
-- Fix editor canvas detaching error in end-to-end tests. ([49374](https://github.com/WordPress/gutenberg/pull/49374))
+
+-   Components: Update `ColorPicker` unit tests. ([49698](https://github.com/WordPress/gutenberg/pull/49698))
+-   Migrate CPT end-to-end tests to Playwright. ([50031](https://github.com/WordPress/gutenberg/pull/50031))
+-   Fonts API: Add tests for gutenberg_add_registered_fonts_to_theme_json(). ([50049](https://github.com/WordPress/gutenberg/pull/50049))
+-   Expand multi-line block tests. ([49732](https://github.com/WordPress/gutenberg/pull/49732))
+-   Rich text test helpers mimic user events. ([49804](https://github.com/WordPress/gutenberg/pull/49804))
+-   Fix editor canvas detaching error in end-to-end tests. ([49374](https://github.com/WordPress/gutenberg/pull/49374))
 
 #### Build Tooling
-- Add script which checks published types for non-checked JS packages. ([49736](https://github.com/WordPress/gutenberg/pull/49736))
-- Docgen: Fix issue where function token can't be found. ([49812](https://github.com/WordPress/gutenberg/pull/49812))
-- Publish build types for notices. ([49650](https://github.com/WordPress/gutenberg/pull/49650))
-- Publish types for plugins package. ([49649](https://github.com/WordPress/gutenberg/pull/49649))
 
-## First time contributors
+-   Add script which checks published types for non-checked JS packages. ([49736](https://github.com/WordPress/gutenberg/pull/49736))
+-   Docgen: Fix issue where function token can't be found. ([49812](https://github.com/WordPress/gutenberg/pull/49812))
+-   Publish build types for notices. ([49650](https://github.com/WordPress/gutenberg/pull/49650))
+-   Publish types for plugins package. ([49649](https://github.com/WordPress/gutenberg/pull/49649))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @annziel: Fix screen flash when deleting templates in templates list. ([48449](https://github.com/WordPress/gutenberg/pull/48449))
-- @courtneyr-dev: Update outreach.md. ([49961](https://github.com/WordPress/gutenberg/pull/49961))
-- @m0hanraj: Fixes typo in README. ([49957](https://github.com/WordPress/gutenberg/pull/49957))
-- @MahendraBishnoi29: Snackbar: Fix insufficient color contrast on hover. ([49682](https://github.com/WordPress/gutenberg/pull/49682))
-- @masteradhoc: Adjust copy of Site Logo Block. ([49540](https://github.com/WordPress/gutenberg/pull/49540))
-- @sque89: Group: Add allowedBlocks attribute and pass it to innerBlockProps. ([49128](https://github.com/WordPress/gutenberg/pull/49128))
-- @tyrann0us: Don't programmatically lowercase post type label. ([49591](https://github.com/WordPress/gutenberg/pull/49591))
-- @Wtower: Update README.md. ([49855](https://github.com/WordPress/gutenberg/pull/49855))
+The following PRs were merged by first-time contributors:
 
+-   @annziel: Fix screen flash when deleting templates in templates list. ([48449](https://github.com/WordPress/gutenberg/pull/48449))
+-   @courtneyr-dev: Update outreach.md. ([49961](https://github.com/WordPress/gutenberg/pull/49961))
+-   @m0hanraj: Fixes typo in README. ([49957](https://github.com/WordPress/gutenberg/pull/49957))
+-   @MahendraBishnoi29: Snackbar: Fix insufficient color contrast on hover. ([49682](https://github.com/WordPress/gutenberg/pull/49682))
+-   @masteradhoc: Adjust copy of Site Logo Block. ([49540](https://github.com/WordPress/gutenberg/pull/49540))
+-   @sque89: Group: Add allowedBlocks attribute and pass it to innerBlockProps. ([49128](https://github.com/WordPress/gutenberg/pull/49128))
+-   @tyrann0us: Don't programmatically lowercase post type label. ([49591](https://github.com/WordPress/gutenberg/pull/49591))
+-   @Wtower: Update README.md. ([49855](https://github.com/WordPress/gutenberg/pull/49855))
 
 ## Contributors
 
@@ -5910,25 +16949,17 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @ajlende @alexstine @andrewserong @annziel @aurooba @bdurette @bph @carolinan @chad1008 @chintu51 @courtneyr-dev @dcalhoun @derekblank @draganescu @ellatrix @fluiddot @gaambo @geriux @getdave @gigitux @guarani @gvgvgvijayan @gziolo @hellofromtonya @jameskoster @jasmussen @jeryj @jhnstn @jsnajdr @juanmaguitar @kevin940726 @m0hanraj @MaggieCabrera @MahendraBishnoi29 @Mamaduka @masteradhoc @mburridge @mcsf @mikachan @mirka @mokagio @mtias @ndiego @noahtallen @ntsekouras @oandregal @ObliviousHarmony @priethor @ramonjd @scruffian @SiobhyB @Soean @sque89 @t-hamano @talldan @tellthemachines @tyrann0us @tyxla @Wtower @youknowriad @zzap
 
-
-
-
 = 15.6.2 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
-- Post Template: Fix broken title editing. ([49984](https://github.com/WordPress/gutenberg/pull/49984))
-
-
-## First time contributors
-
-The following PRs were merged by first time contributors:
+-   Post Template: Fix broken title editing. ([49984](https://github.com/WordPress/gutenberg/pull/49984))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -5936,7 +16967,6 @@ The following contributors merged PRs in this release:
 
 @jsnajdr
 
-
 = 15.6.1 =
 
 ## Changelog
@@ -5944,8 +16974,8 @@ The following contributors merged PRs in this release:
 ### Bug Fixes
 
 #### CSS & Styling
-- Cover: Reduce z-index for inner blocks container. ([49943](https://github.com/WordPress/gutenberg/pull/49943))
 
+-   Cover: Reduce z-index for inner blocks container. ([49943](https://github.com/WordPress/gutenberg/pull/49943))
 
 ## Contributors
 
@@ -5953,7 +16983,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw
 
-
 = 15.6.0 =
 
 ## Changelog
@@ -5961,160 +16990,177 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- A margin option is added to the Embedded preview block. ([39384](https://github.com/WordPress/gutenberg/pull/39384))
-- Add blockGap as a default control on Columns/Column blocks. ([49526](https://github.com/WordPress/gutenberg/pull/49526))
-- Add color tools to the Time to Read block. ([49496](https://github.com/WordPress/gutenberg/pull/49496))
-- Add spacing presets to the Spacer block. ([44002](https://github.com/WordPress/gutenberg/pull/44002))
-- Cover: Add border support using ResizableBox via BlockPopover. ([41153](https://github.com/WordPress/gutenberg/pull/41153))
+
+-   A margin option is added to the Embedded preview block. ([39384](https://github.com/WordPress/gutenberg/pull/39384))
+-   Add blockGap as a default control on Columns/Column blocks. ([49526](https://github.com/WordPress/gutenberg/pull/49526))
+-   Add color tools to the Time to Read block. ([49496](https://github.com/WordPress/gutenberg/pull/49496))
+-   Add spacing presets to the Spacer block. ([44002](https://github.com/WordPress/gutenberg/pull/44002))
+-   Cover: Add border support using ResizableBox via BlockPopover. ([41153](https://github.com/WordPress/gutenberg/pull/41153))
 
 #### Block Editor
-- Add support for hiding breadcrumbs in the Site Editor. ([49518](https://github.com/WordPress/gutenberg/pull/49518))
-- Hide page list on single page list menus. ([48725](https://github.com/WordPress/gutenberg/pull/48725))
-- Small improvements for the Document Overview labeling. ([49555](https://github.com/WordPress/gutenberg/pull/49555))
-- Add a rootClientId prop. ([49475](https://github.com/WordPress/gutenberg/pull/49475))
+
+-   Add support for hiding breadcrumbs in the Site Editor. ([49518](https://github.com/WordPress/gutenberg/pull/49518))
+-   Hide page list on single page list menus. ([48725](https://github.com/WordPress/gutenberg/pull/48725))
+-   Small improvements for the Document Overview labeling. ([49555](https://github.com/WordPress/gutenberg/pull/49555))
+-   Add a rootClientId prop. ([49475](https://github.com/WordPress/gutenberg/pull/49475))
 
 #### Global Styles
-- Add styles section to the browse mode sidebar. ([49014](https://github.com/WordPress/gutenberg/pull/49014))
-- Show child layout controls by default. ([49389](https://github.com/WordPress/gutenberg/pull/49389))
+
+-   Add styles section to the browse mode sidebar. ([49014](https://github.com/WordPress/gutenberg/pull/49014))
+-   Show child layout controls by default. ([49389](https://github.com/WordPress/gutenberg/pull/49389))
 
 #### Components
-- Global Styles: Link to the block type panel when selecting a block with Styles open. ([49350](https://github.com/WordPress/gutenberg/pull/49350))
-- TreeSelect: Remove margin overrides and add new opt-in prop. ([47515](https://github.com/WordPress/gutenberg/pull/47515))
-- Update media and video icons. ([49523](https://github.com/WordPress/gutenberg/pull/49523))
+
+-   Global Styles: Link to the block type panel when selecting a block with Styles open. ([49350](https://github.com/WordPress/gutenberg/pull/49350))
+-   TreeSelect: Remove margin overrides and add new opt-in prop. ([47515](https://github.com/WordPress/gutenberg/pull/47515))
+-   Update media and video icons. ([49523](https://github.com/WordPress/gutenberg/pull/49523))
 
 ### Accessibility
 
-- Add missing focus style to start template options previews. ([49334](https://github.com/WordPress/gutenberg/pull/49334))
-- Consistent labels for the WP logo and back links. ([49659](https://github.com/WordPress/gutenberg/pull/49659))
+-   Add missing focus style to start template options previews. ([49334](https://github.com/WordPress/gutenberg/pull/49334))
+-   Consistent labels for the WP logo and back links. ([49659](https://github.com/WordPress/gutenberg/pull/49659))
 
 ### Experiments
 
-- Add a command center to the site editor. ([49330](https://github.com/WordPress/gutenberg/pull/49330))
-- Add Details/summary block. ([45055](https://github.com/WordPress/gutenberg/pull/45055))
+-   Add a command center to the site editor. ([49330](https://github.com/WordPress/gutenberg/pull/49330))
+-   Add Details/summary block. ([45055](https://github.com/WordPress/gutenberg/pull/45055))
 
 ### Bug Fixes
 
 #### Block Library
-- Columns: Prevent removal of locked columns from the column count change UI. ([49530](https://github.com/WordPress/gutenberg/pull/49530))
-- Cover: Fixed background causes image to be zoomed in on Safari browser on iPad. ([48981](https://github.com/WordPress/gutenberg/pull/48981))
-- Cover: Fix integration tests for ResizableBox via BlockPopover. ([49497](https://github.com/WordPress/gutenberg/pull/49497))
-- Cover: Merge block and global styles. ([49434](https://github.com/WordPress/gutenberg/pull/49434))
-- Fix exhaustive deps warning. ([49291](https://github.com/WordPress/gutenberg/pull/49291))
-- Fix fallback not rendering. ([49576](https://github.com/WordPress/gutenberg/pull/49576))
-- Image block: Fix image size control percentage selection. ([49628](https://github.com/WordPress/gutenberg/pull/49628))
-- Post Featured Image: Don't display the scale control when the aspect ratio is original. ([48894](https://github.com/WordPress/gutenberg/pull/48894))
-- Post Excerpt: Ensure the postId from the block context is used to `get_the_excerpt`. ([49495](https://github.com/WordPress/gutenberg/pull/49495))
-- Shortcode: Prevent external styling of editing UI. ([49723](https://github.com/WordPress/gutenberg/pull/49723))
-- Time To Read: Fix untranslated on the front end. ([49704](https://github.com/WordPress/gutenberg/pull/49704))
-- Post Featured Image: Show all controls when in context without `postId`. ([49609](https://github.com/WordPress/gutenberg/pull/49609))
-- Avoid empty Gallery block error. ([49557](https://github.com/WordPress/gutenberg/pull/49557))
+
+-   Columns: Prevent removal of locked columns from the column count change UI. ([49530](https://github.com/WordPress/gutenberg/pull/49530))
+-   Cover: Fixed background causes image to be zoomed in on Safari browser on iPad. ([48981](https://github.com/WordPress/gutenberg/pull/48981))
+-   Cover: Fix integration tests for ResizableBox via BlockPopover. ([49497](https://github.com/WordPress/gutenberg/pull/49497))
+-   Cover: Merge block and global styles. ([49434](https://github.com/WordPress/gutenberg/pull/49434))
+-   Fix exhaustive deps warning. ([49291](https://github.com/WordPress/gutenberg/pull/49291))
+-   Fix fallback not rendering. ([49576](https://github.com/WordPress/gutenberg/pull/49576))
+-   Image block: Fix image size control percentage selection. ([49628](https://github.com/WordPress/gutenberg/pull/49628))
+-   Post Featured Image: Don't display the scale control when the aspect ratio is original. ([48894](https://github.com/WordPress/gutenberg/pull/48894))
+-   Post Excerpt: Ensure the postId from the block context is used to `get_the_excerpt`. ([49495](https://github.com/WordPress/gutenberg/pull/49495))
+-   Shortcode: Prevent external styling of editing UI. ([49723](https://github.com/WordPress/gutenberg/pull/49723))
+-   Time To Read: Fix untranslated on the front end. ([49704](https://github.com/WordPress/gutenberg/pull/49704))
+-   Post Featured Image: Show all controls when in context without `postId`. ([49609](https://github.com/WordPress/gutenberg/pull/49609))
+-   Avoid empty Gallery block error. ([49557](https://github.com/WordPress/gutenberg/pull/49557))
 
 #### Site Editor
-- Decode the site title properly. ([49685](https://github.com/WordPress/gutenberg/pull/49685))
-- Show UI to update custom links on the sidebar navigation. ([48939](https://github.com/WordPress/gutenberg/pull/48939))
-- Navigate to `editor` when clicking `Edit` in a template part. ([49604](https://github.com/WordPress/gutenberg/pull/49604))
-- Update the template title in the details panel. ([49487](https://github.com/WordPress/gutenberg/pull/49487))
-- Use the keyboard shortcuts package for the command center. ([49680](https://github.com/WordPress/gutenberg/pull/49680))
-- Fix the site editor loading in multi-site installs. ([49861](https://github.com/WordPress/gutenberg/pull/49861))
-
-#### Global Styles
-- Block Level Settings: Remove WP filters in Gutenberg. ([49598](https://github.com/WordPress/gutenberg/pull/49598))
-- Border Panel: Move global styles forcing of split borders to relevant panel's onChange. ([49603](https://github.com/WordPress/gutenberg/pull/49603))
-- Remove the pointer cursor on the style variation preview. ([49573](https://github.com/WordPress/gutenberg/pull/49573))
-- Style Variation Picker: Restore pointer cursor when withHover is in use. ([49596](https://github.com/WordPress/gutenberg/pull/49596))
-
-#### Block Editor
-- DropZone: Smooth animation. ([49517](https://github.com/WordPress/gutenberg/pull/49517))
-- List View: Allow dragging underneath collapsed non-empty container blocks. ([49390](https://github.com/WordPress/gutenberg/pull/49390))
-- List View: Update drop indicator line to be 4px high with a white border. ([49462](https://github.com/WordPress/gutenberg/pull/49462))
-- Tweak remove block label to make it simpler. ([49529](https://github.com/WordPress/gutenberg/pull/49529))
-- Fix redirected links to user documents. ([49537](https://github.com/WordPress/gutenberg/pull/49537))
-- Make InspectorControls tab labels translatable. ([49665](https://github.com/WordPress/gutenberg/pull/49665))
-- Update redirected support link. ([49533](https://github.com/WordPress/gutenberg/pull/49533))
-- Reusable Block: RTL styles don't get added to the `wp-reusable-blocks` stylesheet. ([49632](https://github.com/WordPress/gutenberg/pull/49632))
-- Fix padding and margin visualizer accuracy. ([49422](https://github.com/WordPress/gutenberg/pull/49422))
+
+-   Decode the site title properly. ([49685](https://github.com/WordPress/gutenberg/pull/49685))
+-   Show UI to update custom links on the sidebar navigation. ([48939](https://github.com/WordPress/gutenberg/pull/48939))
+-   Navigate to `editor` when clicking `Edit` in a template part. ([49604](https://github.com/WordPress/gutenberg/pull/49604))
+-   Update the template title in the details panel. ([49487](https://github.com/WordPress/gutenberg/pull/49487))
+-   Use the keyboard shortcuts package for the command center. ([49680](https://github.com/WordPress/gutenberg/pull/49680))
+-   Fix the site editor loading in multi-site installs. ([49861](https://github.com/WordPress/gutenberg/pull/49861))
+
+#### Global Styles
+
+-   Block Level Settings: Remove WP filters in Gutenberg. ([49598](https://github.com/WordPress/gutenberg/pull/49598))
+-   Border Panel: Move global styles forcing of split borders to relevant panel's onChange. ([49603](https://github.com/WordPress/gutenberg/pull/49603))
+-   Remove the pointer cursor on the style variation preview. ([49573](https://github.com/WordPress/gutenberg/pull/49573))
+-   Style Variation Picker: Restore pointer cursor when withHover is in use. ([49596](https://github.com/WordPress/gutenberg/pull/49596))
+
+#### Block Editor
+
+-   DropZone: Smooth animation. ([49517](https://github.com/WordPress/gutenberg/pull/49517))
+-   List View: Allow dragging underneath collapsed non-empty container blocks. ([49390](https://github.com/WordPress/gutenberg/pull/49390))
+-   List View: Update drop indicator line to be 4px high with a white border. ([49462](https://github.com/WordPress/gutenberg/pull/49462))
+-   Tweak remove block label to make it simpler. ([49529](https://github.com/WordPress/gutenberg/pull/49529))
+-   Fix redirected links to user documents. ([49537](https://github.com/WordPress/gutenberg/pull/49537))
+-   Make InspectorControls tab labels translatable. ([49665](https://github.com/WordPress/gutenberg/pull/49665))
+-   Update redirected support link. ([49533](https://github.com/WordPress/gutenberg/pull/49533))
+-   Reusable Block: RTL styles don't get added to the `wp-reusable-blocks` stylesheet. ([49632](https://github.com/WordPress/gutenberg/pull/49632))
+-   Fix padding and margin visualizer accuracy. ([49422](https://github.com/WordPress/gutenberg/pull/49422))
 
 #### Layout
-- Only show alignment info when parent layout is constrained. ([49703](https://github.com/WordPress/gutenberg/pull/49703))
-- Try reducing the specificity of layout margin rules. ([47858](https://github.com/WordPress/gutenberg/pull/47858))
+
+-   Only show alignment info when parent layout is constrained. ([49703](https://github.com/WordPress/gutenberg/pull/49703))
+-   Try reducing the specificity of layout margin rules. ([47858](https://github.com/WordPress/gutenberg/pull/47858))
 
 #### Post Editor
-- Allow root padding setting to affect padding of post title. ([49460](https://github.com/WordPress/gutenberg/pull/49460))
-- Try fixing post editor layout for wide/full Post Content blocks. ([49565](https://github.com/WordPress/gutenberg/pull/49565))
-- Allow horizontal scroll in panels in the post editor. ([49611](https://github.com/WordPress/gutenberg/pull/49611))
+
+-   Allow root padding setting to affect padding of post title. ([49460](https://github.com/WordPress/gutenberg/pull/49460))
+-   Try fixing post editor layout for wide/full Post Content blocks. ([49565](https://github.com/WordPress/gutenberg/pull/49565))
+-   Allow horizontal scroll in panels in the post editor. ([49611](https://github.com/WordPress/gutenberg/pull/49611))
 
 #### Components
-- Fix inbetween-inserter position in RTL languages. ([49683](https://github.com/WordPress/gutenberg/pull/49683))
-- Update Edit icon to be more consistent with other icons. ([49512](https://github.com/WordPress/gutenberg/pull/49512))
-- Update search icon to be optically more balanced. ([49425](https://github.com/WordPress/gutenberg/pull/49425))
-- Update some icons to address aliasing on high-res screens. ([49381](https://github.com/WordPress/gutenberg/pull/49381))
+
+-   Fix inbetween-inserter position in RTL languages. ([49683](https://github.com/WordPress/gutenberg/pull/49683))
+-   Update Edit icon to be more consistent with other icons. ([49512](https://github.com/WordPress/gutenberg/pull/49512))
+-   Update search icon to be optically more balanced. ([49425](https://github.com/WordPress/gutenberg/pull/49425))
+-   Update some icons to address aliasing on high-res screens. ([49381](https://github.com/WordPress/gutenberg/pull/49381))
 
 ### Performance
 
-- Continued the work refactor away from Lodash usages to reduce the build size 
-([49725](https://github.com/WordPress/gutenberg/pull/49725), [49724](https://github.com/WordPress/gutenberg/pull/49724), [49638](https://github.com/WordPress/gutenberg/pull/49638), [49654](https://github.com/WordPress/gutenberg/pull/49654), [49639](https://github.com/WordPress/gutenberg/pull/49639), [49637](https://github.com/WordPress/gutenberg/pull/49637), [49727](https://github.com/WordPress/gutenberg/pull/49727))
+-   Continued the work refactor away from Lodash usages to reduce the build size
+    ([49725](https://github.com/WordPress/gutenberg/pull/49725), [49724](https://github.com/WordPress/gutenberg/pull/49724), [49638](https://github.com/WordPress/gutenberg/pull/49638), [49654](https://github.com/WordPress/gutenberg/pull/49654), [49639](https://github.com/WordPress/gutenberg/pull/49639), [49637](https://github.com/WordPress/gutenberg/pull/49637), [49727](https://github.com/WordPress/gutenberg/pull/49727))
 
 ### Documentation
 
-- Add section about integration testing to testing documentation. ([49454](https://github.com/WordPress/gutenberg/pull/49454))
-- Add some documentation about the Styles UI components. ([49720](https://github.com/WordPress/gutenberg/pull/49720))
-- Fix Create a Block Tutorial link on blocks package README.md. ([49562](https://github.com/WordPress/gutenberg/pull/49562))
-- Fix end-to-end command typos. ([49669](https://github.com/WordPress/gutenberg/pull/49669))
-- Fix line break issue in Schemas and Content Models section. ([44768](https://github.com/WordPress/gutenberg/pull/44768))
-- Fixes some typos. ([49472](https://github.com/WordPress/gutenberg/pull/49472))
-- Update outdated references in react-native-editor documentation. ([49543](https://github.com/WordPress/gutenberg/pull/49543))
-- `getBlockOrder()` - use core/block-editor instead of core/editor. ([49474](https://github.com/WordPress/gutenberg/pull/49474))
-- Fix Xcode spelling across the codebase. ([49625](https://github.com/WordPress/gutenberg/pull/49625))
-- Remove the documentation for Playwright configuration override. ([49660](https://github.com/WordPress/gutenberg/pull/49660))
-- Streamlining the New Release Issue Template. ([49618](https://github.com/WordPress/gutenberg/pull/49618))
-- Update components package's CHANGELOG. ([49586](https://github.com/WordPress/gutenberg/pull/49586))
-- Update documentation for `setGroupingBlockName`. ([49670](https://github.com/WordPress/gutenberg/pull/49670))
+-   Add section about integration testing to testing documentation. ([49454](https://github.com/WordPress/gutenberg/pull/49454))
+-   Add some documentation about the Styles UI components. ([49720](https://github.com/WordPress/gutenberg/pull/49720))
+-   Fix Create a Block Tutorial link on blocks package README.md. ([49562](https://github.com/WordPress/gutenberg/pull/49562))
+-   Fix end-to-end command typos. ([49669](https://github.com/WordPress/gutenberg/pull/49669))
+-   Fix line break issue in Schemas and Content Models section. ([44768](https://github.com/WordPress/gutenberg/pull/44768))
+-   Fixes some typos. ([49472](https://github.com/WordPress/gutenberg/pull/49472))
+-   Update outdated references in react-native-editor documentation. ([49543](https://github.com/WordPress/gutenberg/pull/49543))
+-   `getBlockOrder()` - use core/block-editor instead of core/editor. ([49474](https://github.com/WordPress/gutenberg/pull/49474))
+-   Fix Xcode spelling across the codebase. ([49625](https://github.com/WordPress/gutenberg/pull/49625))
+-   Remove the documentation for Playwright configuration override. ([49660](https://github.com/WordPress/gutenberg/pull/49660))
+-   Streamlining the New Release Issue Template. ([49618](https://github.com/WordPress/gutenberg/pull/49618))
+-   Update components package's CHANGELOG. ([49586](https://github.com/WordPress/gutenberg/pull/49586))
+-   Update documentation for `setGroupingBlockName`. ([49670](https://github.com/WordPress/gutenberg/pull/49670))
 
 ### Code Quality
 
 #### Components
-- Ship TypeScript types. ([49229](https://github.com/WordPress/gutenberg/pull/49229))
-- Simplify `CustomGradientPicker`'s utility props. ([49588](https://github.com/WordPress/gutenberg/pull/49588))
+
+-   Ship TypeScript types. ([49229](https://github.com/WordPress/gutenberg/pull/49229))
+-   Simplify `CustomGradientPicker`'s utility props. ([49588](https://github.com/WordPress/gutenberg/pull/49588))
 
 #### Global Styles
-- Refactor the effects panel as a generic UI Styles component. ([49571](https://github.com/WordPress/gutenberg/pull/49571))
-- Refactor the filters (duotone) panel as a generic UI Styles component. ([49577](https://github.com/WordPress/gutenberg/pull/49577))
+
+-   Refactor the effects panel as a generic UI Styles component. ([49571](https://github.com/WordPress/gutenberg/pull/49571))
+-   Refactor the filters (duotone) panel as a generic UI Styles component. ([49577](https://github.com/WordPress/gutenberg/pull/49577))
 
 #### Block Library
-- Add automated tests for Nav block editable list view. ([49433](https://github.com/WordPress/gutenberg/pull/49433))
-- Cover: Avoid adding empty background image URL. ([49477](https://github.com/WordPress/gutenberg/pull/49477))
-- Remove editor block styles leftovers. ([49567](https://github.com/WordPress/gutenberg/pull/49567))
+
+-   Add automated tests for Nav block editable list view. ([49433](https://github.com/WordPress/gutenberg/pull/49433))
+-   Cover: Avoid adding empty background image URL. ([49477](https://github.com/WordPress/gutenberg/pull/49477))
+-   Remove editor block styles leftovers. ([49567](https://github.com/WordPress/gutenberg/pull/49567))
 
 #### Site Editor
-- Remove unused keyboard shortcut registration code. ([49553](https://github.com/WordPress/gutenberg/pull/49553))
-- Fix Site Editor isFeatureActive deprecation. ([49545](https://github.com/WordPress/gutenberg/pull/49545))
+
+-   Remove unused keyboard shortcut registration code. ([49553](https://github.com/WordPress/gutenberg/pull/49553))
+-   Fix Site Editor isFeatureActive deprecation. ([49545](https://github.com/WordPress/gutenberg/pull/49545))
 
 ### Tools
 
 #### Testing
-- Add tests for some of the drag and drop logic. ([49631](https://github.com/WordPress/gutenberg/pull/49631))
-- Adds to gitignore a playwright.config.override.ts entry. ([49329](https://github.com/WordPress/gutenberg/pull/49329))
-- Cover block: Fix failing test. ([49455](https://github.com/WordPress/gutenberg/pull/49455))
-- Workflows: Run PHP unit tests also against current WP - 1. ([46983](https://github.com/WordPress/gutenberg/pull/46983))
-- e2e: Fix flaky columns test. ([49676](https://github.com/WordPress/gutenberg/pull/49676))
-- test: Add Writing Flow tests. ([49352](https://github.com/WordPress/gutenberg/pull/49352))
+
+-   Add tests for some of the drag and drop logic. ([49631](https://github.com/WordPress/gutenberg/pull/49631))
+-   Adds to gitignore a playwright.config.override.ts entry. ([49329](https://github.com/WordPress/gutenberg/pull/49329))
+-   Cover block: Fix failing test. ([49455](https://github.com/WordPress/gutenberg/pull/49455))
+-   Workflows: Run PHP unit tests also against current WP - 1. ([46983](https://github.com/WordPress/gutenberg/pull/46983))
+-   e2e: Fix flaky columns test. ([49676](https://github.com/WordPress/gutenberg/pull/49676))
+-   test: Add Writing Flow tests. ([49352](https://github.com/WordPress/gutenberg/pull/49352))
 
 #### Build Tooling
-- Add workflow to check for expected @wordpress/components CHANGELOG updates. ([49443](https://github.com/WordPress/gutenberg/pull/49443))
-- Docgen: Replace line breaks with spaces and remove line-ending hyphens. ([49635](https://github.com/WordPress/gutenberg/pull/49635))
-- Convert wp data controls to typescript. ([49647](https://github.com/WordPress/gutenberg/pull/49647))
 
-## First time contributors
+-   Add workflow to check for expected @wordpress/components CHANGELOG updates. ([49443](https://github.com/WordPress/gutenberg/pull/49443))
+-   Docgen: Replace line breaks with spaces and remove line-ending hyphens. ([49635](https://github.com/WordPress/gutenberg/pull/49635))
+-   Convert wp data controls to typescript. ([49647](https://github.com/WordPress/gutenberg/pull/49647))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
 
-- @cawa-93: List View: Allow horizontal scroll in panels in the post editor. ([49611](https://github.com/WordPress/gutenberg/pull/49611))
-- @DustyReagan: Cover Block: Fixed background causes image to be zoomed in on Safari browser on iPad. ([48981](https://github.com/WordPress/gutenberg/pull/48981))
-- @eduwass: Docs: Fix end-to-end command typos. ([49669](https://github.com/WordPress/gutenberg/pull/49669))
-- @HILAYTRIVEDI: A margin option is added to the Embeded preview block. ([39384](https://github.com/WordPress/gutenberg/pull/39384))
-- @mokagio: Fix Xcode spelling across the codebase. ([49625](https://github.com/WordPress/gutenberg/pull/49625))
-- @nefeline: Post excerpt > Ensure the postId from the block context is used to get_the_excerpt. ([49495](https://github.com/WordPress/gutenberg/pull/49495))
-- @thealexandrelara: Docs: Fix Create a Block Tutorial link on blocks package README.md. ([49562](https://github.com/WordPress/gutenberg/pull/49562))
+-   @cawa-93: List View: Allow horizontal scroll in panels in the post editor. ([49611](https://github.com/WordPress/gutenberg/pull/49611))
+-   @DustyReagan: Cover Block: Fixed background causes image to be zoomed in on Safari browser on iPad. ([48981](https://github.com/WordPress/gutenberg/pull/48981))
+-   @eduwass: Docs: Fix end-to-end command typos. ([49669](https://github.com/WordPress/gutenberg/pull/49669))
+-   @HILAYTRIVEDI: A margin option is added to the Embeded preview block. ([39384](https://github.com/WordPress/gutenberg/pull/39384))
+-   @mokagio: Fix Xcode spelling across the codebase. ([49625](https://github.com/WordPress/gutenberg/pull/49625))
+-   @nefeline: Post excerpt > Ensure the postId from the block context is used to get_the_excerpt. ([49495](https://github.com/WordPress/gutenberg/pull/49495))
+-   @thealexandrelara: Docs: Fix Create a Block Tutorial link on blocks package README.md. ([49562](https://github.com/WordPress/gutenberg/pull/49562))
 
 ## Contributors
 
@@ -6122,19 +17168,15 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @andrewserong @aristath @aurooba @brookewp @carolinan @cawa-93 @chad1008 @ciampo @dcalhoun @derekblank @draganescu @DustyReagan @eduwass @fluiddot @geriux @getdave @glendaviesnz @hellofromtonya @HILAYTRIVEDI @imanish003 @jameskoster @jasmussen @jhnstn @jorgefilipecosta @Mamaduka @mirka @mokagio @nefeline @noahtallen @ntsekouras @ockham @ramonjd @richtabor @ryanwelcher @SavPhill @scruffian @Soean @t-hamano @talldan @tellthemachines @thealexandrelara @tyxla @youknowriad
 
-
-
-
 = 15.5.1 =
 
 ## Changelog
 
 ### Bug Fixes
 
-####  Site Editor
-
-* Global styles: Fix error when updating padding input in global styles ([49465](https://github.com/WordPress/gutenberg/pull/49465))
+#### Site Editor
 
+-   Global styles: Fix error when updating padding input in global styles ([49465](https://github.com/WordPress/gutenberg/pull/49465))
 
 = 15.5.0 =
 
@@ -6143,257 +17185,294 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Add Post Date block variation for Post Modified Date. ([49111](https://github.com/WordPress/gutenberg/pull/49111))
-- Add typography support to time to read block. ([49257](https://github.com/WordPress/gutenberg/pull/49257))
-- Allow the time to read block to be inserted multiple times. ([49253](https://github.com/WordPress/gutenberg/pull/49253))
-- Image Block: Don't render if there is no URL set. ([45220](https://github.com/WordPress/gutenberg/pull/45220))
-- Media & Text: Switch default alignment to `none`. ([48404](https://github.com/WordPress/gutenberg/pull/48404))
-- Update alternative text labels and help text. ([49416](https://github.com/WordPress/gutenberg/pull/49416))
-- Navigation Submenu: Refactor to use the block supports function. ([48936](https://github.com/WordPress/gutenberg/pull/48936))
-- Replace "Image size" with "Resolution" in image size controls. ([49112](https://github.com/WordPress/gutenberg/pull/49112))
-- Update Gallery block to use consistent 40px components. ([49101](https://github.com/WordPress/gutenberg/pull/49101))
+
+-   Add Post Date block variation for Post Modified Date. ([49111](https://github.com/WordPress/gutenberg/pull/49111))
+-   Add typography support to time to read block. ([49257](https://github.com/WordPress/gutenberg/pull/49257))
+-   Allow the time to read block to be inserted multiple times. ([49253](https://github.com/WordPress/gutenberg/pull/49253))
+-   Image Block: Don't render if there is no URL set. ([45220](https://github.com/WordPress/gutenberg/pull/45220))
+-   Media & Text: Switch default alignment to `none`. ([48404](https://github.com/WordPress/gutenberg/pull/48404))
+-   Update alternative text labels and help text. ([49416](https://github.com/WordPress/gutenberg/pull/49416))
+-   Navigation Submenu: Refactor to use the block supports function. ([48936](https://github.com/WordPress/gutenberg/pull/48936))
+-   Replace "Image size" with "Resolution" in image size controls. ([49112](https://github.com/WordPress/gutenberg/pull/49112))
+-   Update Gallery block to use consistent 40px components. ([49101](https://github.com/WordPress/gutenberg/pull/49101))
 
 #### Components
-- FormTokenField: Add prop to remove bottom margin. ([48609](https://github.com/WordPress/gutenberg/pull/48609))
-- ImageSizeControl: Remove the "Image Dimensions" label. ([49414](https://github.com/WordPress/gutenberg/pull/49414))
-- ImageSizeControl: Use large 40px sizes. ([49113](https://github.com/WordPress/gutenberg/pull/49113))
-- Tooltip: Refine existing tests. ([48397](https://github.com/WordPress/gutenberg/pull/48397))
-- Update tests from `fireEvent` to `userEvent`. ([44952](https://github.com/WordPress/gutenberg/pull/44952))
-- CustomGradientPicker: Improve initial state UI. ([49146](https://github.com/WordPress/gutenberg/pull/49146))
-- Storybook: Declare stylesheet dependencies explicitly. ([49099](https://github.com/WordPress/gutenberg/pull/49099))
-- `AnglePickerControl`: Style to better fit in narrow contexts and improve RTL layout. ([49046](https://github.com/WordPress/gutenberg/pull/49046))
+
+-   FormTokenField: Add prop to remove bottom margin. ([48609](https://github.com/WordPress/gutenberg/pull/48609))
+-   ImageSizeControl: Remove the "Image Dimensions" label. ([49414](https://github.com/WordPress/gutenberg/pull/49414))
+-   ImageSizeControl: Use large 40px sizes. ([49113](https://github.com/WordPress/gutenberg/pull/49113))
+-   Tooltip: Refine existing tests. ([48397](https://github.com/WordPress/gutenberg/pull/48397))
+-   Update tests from `fireEvent` to `userEvent`. ([44952](https://github.com/WordPress/gutenberg/pull/44952))
+-   CustomGradientPicker: Improve initial state UI. ([49146](https://github.com/WordPress/gutenberg/pull/49146))
+-   Storybook: Declare stylesheet dependencies explicitly. ([49099](https://github.com/WordPress/gutenberg/pull/49099))
+-   `AnglePickerControl`: Style to better fit in narrow contexts and improve RTL layout. ([49046](https://github.com/WordPress/gutenberg/pull/49046))
 
 #### Design Tools
-- Add spacing tools to time to read block. ([49392](https://github.com/WordPress/gutenberg/pull/49392))
-- Position Panel: Open by default if a position type is set. ([49151](https://github.com/WordPress/gutenberg/pull/49151))
-- Revert: Make sticky block action on template part block. ([49219](https://github.com/WordPress/gutenberg/pull/49219))
-- Sticky Position: Add a "Make sticky" action to the Template Part block. ([49085](https://github.com/WordPress/gutenberg/pull/49085))
+
+-   Add spacing tools to time to read block. ([49392](https://github.com/WordPress/gutenberg/pull/49392))
+-   Position Panel: Open by default if a position type is set. ([49151](https://github.com/WordPress/gutenberg/pull/49151))
+-   Revert: Make sticky block action on template part block. ([49219](https://github.com/WordPress/gutenberg/pull/49219))
+-   Sticky Position: Add a "Make sticky" action to the Template Part block. ([49085](https://github.com/WordPress/gutenberg/pull/49085))
 
 #### Testing
-- Adds focus management test for entity undo. ([49236](https://github.com/WordPress/gutenberg/pull/49236))
-- Adds navigation submenu tests. ([49351](https://github.com/WordPress/gutenberg/pull/49351))
-- Cover block: Add integration tests. ([45409](https://github.com/WordPress/gutenberg/pull/45409))
-- test: Expand mobile end-to-end test helpers. ([48978](https://github.com/WordPress/gutenberg/pull/48978))
+
+-   Adds focus management test for entity undo. ([49236](https://github.com/WordPress/gutenberg/pull/49236))
+-   Adds navigation submenu tests. ([49351](https://github.com/WordPress/gutenberg/pull/49351))
+-   Cover block: Add integration tests. ([45409](https://github.com/WordPress/gutenberg/pull/45409))
+-   test: Expand mobile end-to-end test helpers. ([48978](https://github.com/WordPress/gutenberg/pull/48978))
 
 #### Layout
-- Make grid layout Group variation an experiment. ([49359](https://github.com/WordPress/gutenberg/pull/49359))
-- Try adding a grid layout type. ([49018](https://github.com/WordPress/gutenberg/pull/49018))
+
+-   Make grid layout Group variation an experiment. ([49359](https://github.com/WordPress/gutenberg/pull/49359))
+-   Try adding a grid layout type. ([49018](https://github.com/WordPress/gutenberg/pull/49018))
 
 #### Icons
-- Add unseen icon to library. ([49254](https://github.com/WordPress/gutenberg/pull/49254))
+
+-   Add unseen icon to library. ([49254](https://github.com/WordPress/gutenberg/pull/49254))
 
 #### Plugins API
-- Plugins: Refactor the 'PluginArea' component to use the sync store. ([49220](https://github.com/WordPress/gutenberg/pull/49220))
+
+-   Plugins: Refactor the 'PluginArea' component to use the sync store. ([49220](https://github.com/WordPress/gutenberg/pull/49220))
 
 #### Global Styles
-- Add: Story for the full global styles UI. ([49031](https://github.com/WordPress/gutenberg/pull/49031))
-- Caption element UI controls for color and typography. ([49141](https://github.com/WordPress/gutenberg/pull/49141))
+
+-   Add: Story for the full global styles UI. ([49031](https://github.com/WordPress/gutenberg/pull/49031))
+-   Caption element UI controls for color and typography. ([49141](https://github.com/WordPress/gutenberg/pull/49141))
 
 #### Block Editor
-- Rich text: Only consider a format active if active at every selected index. ([48789](https://github.com/WordPress/gutenberg/pull/48789))
-- Update border color on color panel items. ([42283](https://github.com/WordPress/gutenberg/pull/42283))
-- i18n: Add context to labels related to CSS position properties. ([49135](https://github.com/WordPress/gutenberg/pull/49135))
+
+-   Rich text: Only consider a format active if active at every selected index. ([48789](https://github.com/WordPress/gutenberg/pull/48789))
+-   Update border color on color panel items. ([42283](https://github.com/WordPress/gutenberg/pull/42283))
+-   i18n: Add context to labels related to CSS position properties. ([49135](https://github.com/WordPress/gutenberg/pull/49135))
 
 #### Site Editor
-- Add: Patterns to the template start modal. ([47322](https://github.com/WordPress/gutenberg/pull/47322))
+
+-   Add: Patterns to the template start modal. ([47322](https://github.com/WordPress/gutenberg/pull/47322))
 
 #### List View
-- Allow the component to show a custom "more" menu. ([48097](https://github.com/WordPress/gutenberg/pull/48097))
+
+-   Allow the component to show a custom "more" menu. ([48097](https://github.com/WordPress/gutenberg/pull/48097))
 
 #### Block API
-- Block.json: Refactor and stabilize selectors API. ([46496](https://github.com/WordPress/gutenberg/pull/46496))
 
+-   Block.json: Refactor and stabilize selectors API. ([46496](https://github.com/WordPress/gutenberg/pull/46496))
 
 ### Bug Fixes
 
 #### Block Editor
-- BlockHTML: Use correct type when setting 'html' state onBlur. ([49191](https://github.com/WordPress/gutenberg/pull/49191))
-- Duotone: Pass filters to the Post Editor. ([49239](https://github.com/WordPress/gutenberg/pull/49239))
-- Duotone: Use `WP_Theme_JSON_Resolver_Gutenberg` instead of `WP_Theme_JSON_Resolver`. ([49199](https://github.com/WordPress/gutenberg/pull/49199))
-- Fix typo (overriden -> overridden). ([48711](https://github.com/WordPress/gutenberg/pull/48711))
-- Writing flow: Prevent default browser behaviour on input when editable. ([49370](https://github.com/WordPress/gutenberg/pull/49370))
-- Fix `onHover` error on patterns tab in mobile. ([49450](https://github.com/WordPress/gutenberg/pull/49450))
+
+-   BlockHTML: Use correct type when setting 'html' state onBlur. ([49191](https://github.com/WordPress/gutenberg/pull/49191))
+-   Duotone: Pass filters to the Post Editor. ([49239](https://github.com/WordPress/gutenberg/pull/49239))
+-   Duotone: Use `WP_Theme_JSON_Resolver_Gutenberg` instead of `WP_Theme_JSON_Resolver`. ([49199](https://github.com/WordPress/gutenberg/pull/49199))
+-   Fix typo (overriden -> overridden). ([48711](https://github.com/WordPress/gutenberg/pull/48711))
+-   Writing flow: Prevent default browser behaviour on input when editable. ([49370](https://github.com/WordPress/gutenberg/pull/49370))
+-   Fix `onHover` error on patterns tab in mobile. ([49450](https://github.com/WordPress/gutenberg/pull/49450))
 
 #### General Interface
-- Invalid Page address displayed when a future page is first scheduled. ([49092](https://github.com/WordPress/gutenberg/pull/49092))
+
+-   Invalid Page address displayed when a future page is first scheduled. ([49092](https://github.com/WordPress/gutenberg/pull/49092))
 
 #### Patterns
-- Block patterns: Use `WP_Theme_JSON_Resolver_Gutenberg` instead of `WP_Theme_JSON_Resolver`. ([49197](https://github.com/WordPress/gutenberg/pull/49197))
-
-#### Block Library
-- Buttons: Disable edit as HTML support. ([49097](https://github.com/WordPress/gutenberg/pull/49097))
-- Fix center alignment on the dropdown in the categories block. ([44013](https://github.com/WordPress/gutenberg/pull/44013))
-- Fix sprintf() arguments. ([49439](https://github.com/WordPress/gutenberg/pull/49439))
-- Fix: Navigation block width constricted on large viewports. ([49302](https://github.com/WordPress/gutenberg/pull/49302))
-- Group Block: Allow blocks to be dragged onto it in its placeholder state. ([49361](https://github.com/WordPress/gutenberg/pull/49361))
-- Group: Fix the 'double div' deprecation 'templateLock ' attribute. ([49250](https://github.com/WordPress/gutenberg/pull/49250))
-- Group: Fix the 'templateLock' attribute type in deprecations. ([49205](https://github.com/WordPress/gutenberg/pull/49205))
-- Navigation: Fix bug in calculating the active menu item. ([49195](https://github.com/WordPress/gutenberg/pull/49195))
-- Post excerpt: Fix JavaScript error and other misc. bug fixes. ([48730](https://github.com/WordPress/gutenberg/pull/48730))
-- Query Loop: Constraint list item(`li`) styles to the direct children of the main list. ([49303](https://github.com/WordPress/gutenberg/pull/49303))
-- Query Loop: Show Featured Image placeholders in all posts. ([49301](https://github.com/WordPress/gutenberg/pull/49301))
-- Query Title: Changes filters for removing archive title prefixes. ([49306](https://github.com/WordPress/gutenberg/pull/49306))
-- Quote: Disable edit as HTML support. ([49426](https://github.com/WordPress/gutenberg/pull/49426))
-- Revert "Make sure the directly inserted block in the Nav block is a Page link". ([49126](https://github.com/WordPress/gutenberg/pull/49126))
-- Search block: Fix overflow width. ([49192](https://github.com/WordPress/gutenberg/pull/49192))
-- Changes image size description, as it causes confusion. ([48478](https://github.com/WordPress/gutenberg/pull/48478))
-- Post Excerpt Block: Fix unexpected commas in certain site languages. ([49123](https://github.com/WordPress/gutenberg/pull/49123))
-- columns block: Add support for templateLock attribute. ([49132](https://github.com/WordPress/gutenberg/pull/49132))
-
-#### Components
-- CircularOptionPicker: Force swatches to visually render on top of the rest of the component's content. ([49245](https://github.com/WordPress/gutenberg/pull/49245))
-- Fix TabPanel initial rendering. ([49368](https://github.com/WordPress/gutenberg/pull/49368))
-- Fix misaligned textarea input control. ([49116](https://github.com/WordPress/gutenberg/pull/49116))
-- LineHeightControl: Make spin buttons adjust from placeholder value. ([49150](https://github.com/WordPress/gutenberg/pull/49150))
-- ToolsPanel: Make menu item order consistent for SlotFill use cases. ([49222](https://github.com/WordPress/gutenberg/pull/49222))
+
+-   Block patterns: Use `WP_Theme_JSON_Resolver_Gutenberg` instead of `WP_Theme_JSON_Resolver`. ([49197](https://github.com/WordPress/gutenberg/pull/49197))
+
+#### Block Library
+
+-   Buttons: Disable edit as HTML support. ([49097](https://github.com/WordPress/gutenberg/pull/49097))
+-   Fix center alignment on the dropdown in the categories block. ([44013](https://github.com/WordPress/gutenberg/pull/44013))
+-   Fix sprintf() arguments. ([49439](https://github.com/WordPress/gutenberg/pull/49439))
+-   Fix: Navigation block width constricted on large viewports. ([49302](https://github.com/WordPress/gutenberg/pull/49302))
+-   Group Block: Allow blocks to be dragged onto it in its placeholder state. ([49361](https://github.com/WordPress/gutenberg/pull/49361))
+-   Group: Fix the 'double div' deprecation 'templateLock ' attribute. ([49250](https://github.com/WordPress/gutenberg/pull/49250))
+-   Group: Fix the 'templateLock' attribute type in deprecations. ([49205](https://github.com/WordPress/gutenberg/pull/49205))
+-   Navigation: Fix bug in calculating the active menu item. ([49195](https://github.com/WordPress/gutenberg/pull/49195))
+-   Post excerpt: Fix JavaScript error and other misc. bug fixes. ([48730](https://github.com/WordPress/gutenberg/pull/48730))
+-   Query Loop: Constraint list item(`li`) styles to the direct children of the main list. ([49303](https://github.com/WordPress/gutenberg/pull/49303))
+-   Query Loop: Show Featured Image placeholders in all posts. ([49301](https://github.com/WordPress/gutenberg/pull/49301))
+-   Query Title: Changes filters for removing archive title prefixes. ([49306](https://github.com/WordPress/gutenberg/pull/49306))
+-   Quote: Disable edit as HTML support. ([49426](https://github.com/WordPress/gutenberg/pull/49426))
+-   Revert "Make sure the directly inserted block in the Nav block is a Page link". ([49126](https://github.com/WordPress/gutenberg/pull/49126))
+-   Search block: Fix overflow width. ([49192](https://github.com/WordPress/gutenberg/pull/49192))
+-   Changes image size description, as it causes confusion. ([48478](https://github.com/WordPress/gutenberg/pull/48478))
+-   Post Excerpt Block: Fix unexpected commas in certain site languages. ([49123](https://github.com/WordPress/gutenberg/pull/49123))
+-   columns block: Add support for templateLock attribute. ([49132](https://github.com/WordPress/gutenberg/pull/49132))
+
+#### Components
+
+-   CircularOptionPicker: Force swatches to visually render on top of the rest of the component's content. ([49245](https://github.com/WordPress/gutenberg/pull/49245))
+-   Fix TabPanel initial rendering. ([49368](https://github.com/WordPress/gutenberg/pull/49368))
+-   Fix misaligned textarea input control. ([49116](https://github.com/WordPress/gutenberg/pull/49116))
+-   LineHeightControl: Make spin buttons adjust from placeholder value. ([49150](https://github.com/WordPress/gutenberg/pull/49150))
+-   ToolsPanel: Make menu item order consistent for SlotFill use cases. ([49222](https://github.com/WordPress/gutenberg/pull/49222))
 
 #### Layout
-- Fix unstableDisableLayoutClassNames in Group block. ([49385](https://github.com/WordPress/gutenberg/pull/49385))
-- Get orientation for Spacer block from parent layout. ([49322](https://github.com/WordPress/gutenberg/pull/49322))
-- Remove inner wrapper for grid Groups in classic themes. ([49387](https://github.com/WordPress/gutenberg/pull/49387))
+
+-   Fix unstableDisableLayoutClassNames in Group block. ([49385](https://github.com/WordPress/gutenberg/pull/49385))
+-   Get orientation for Spacer block from parent layout. ([49322](https://github.com/WordPress/gutenberg/pull/49322))
+-   Remove inner wrapper for grid Groups in classic themes. ([49387](https://github.com/WordPress/gutenberg/pull/49387))
 
 #### Post Editor
-- Fix breaking distraction free. ([49317](https://github.com/WordPress/gutenberg/pull/49317))
-- Post Lock: Fix the avatar position. ([49421](https://github.com/WordPress/gutenberg/pull/49421))
+
+-   Fix breaking distraction free. ([49317](https://github.com/WordPress/gutenberg/pull/49317))
+-   Post Lock: Fix the avatar position. ([49421](https://github.com/WordPress/gutenberg/pull/49421))
 
 #### Site Editor
-- Fix site editor redirection after creating new template or template part. ([49364](https://github.com/WordPress/gutenberg/pull/49364))
-- Show the created template title in success notice and not the slug. ([49366](https://github.com/WordPress/gutenberg/pull/49366))
-- Template parts: Use `WP_Theme_JSON_Resolver_Gutenberg` instead of `WP_Theme_JSON_Resolver`. ([49198](https://github.com/WordPress/gutenberg/pull/49198))
-- Fix typo in utils.js. ([49178](https://github.com/WordPress/gutenberg/pull/49178))
+
+-   Fix site editor redirection after creating new template or template part. ([49364](https://github.com/WordPress/gutenberg/pull/49364))
+-   Show the created template title in success notice and not the slug. ([49366](https://github.com/WordPress/gutenberg/pull/49366))
+-   Template parts: Use `WP_Theme_JSON_Resolver_Gutenberg` instead of `WP_Theme_JSON_Resolver`. ([49198](https://github.com/WordPress/gutenberg/pull/49198))
+-   Fix typo in utils.js. ([49178](https://github.com/WordPress/gutenberg/pull/49178))
 
 #### Media
-- Image: Don't create an external image 'blob' when a user can't upload files. ([49300](https://github.com/WordPress/gutenberg/pull/49300))
-- MediaReplaceFlow: Check permissions before displaying the 'Media Library' menu item. ([49298](https://github.com/WordPress/gutenberg/pull/49298))
+
+-   Image: Don't create an external image 'blob' when a user can't upload files. ([49300](https://github.com/WordPress/gutenberg/pull/49300))
+-   MediaReplaceFlow: Check permissions before displaying the 'Media Library' menu item. ([49298](https://github.com/WordPress/gutenberg/pull/49298))
 
 #### Global Styles
-- Selectors API: Fix for global styles hook, style variations, and duotone. ([49393](https://github.com/WordPress/gutenberg/pull/49393))
-- Fix typo for the word `accross`. ([49295](https://github.com/WordPress/gutenberg/pull/49295))
-- Duotone: Limit SVG filter output to used filters. ([49103](https://github.com/WordPress/gutenberg/pull/49103))
-- Selectors API: Make duotone selectors fallback and be scoped. (https://github.com/WordPress/gutenberg/pull/49423)
+
+-   Selectors API: Fix for global styles hook, style variations, and duotone. ([49393](https://github.com/WordPress/gutenberg/pull/49393))
+-   Fix typo for the word `accross`. ([49295](https://github.com/WordPress/gutenberg/pull/49295))
+-   Duotone: Limit SVG filter output to used filters. ([49103](https://github.com/WordPress/gutenberg/pull/49103))
+-   Selectors API: Make duotone selectors fallback and be scoped. (https://github.com/WordPress/gutenberg/pull/49423)
 
 #### List View
-- Show close button in List View on mobile. ([49200](https://github.com/WordPress/gutenberg/pull/49200))
-- Add private appender prop. ([49137](https://github.com/WordPress/gutenberg/pull/49137))
+
+-   Show close button in List View on mobile. ([49200](https://github.com/WordPress/gutenberg/pull/49200))
+-   Add private appender prop. ([49137](https://github.com/WordPress/gutenberg/pull/49137))
 
 #### History
-- Bring back revisions button for template parts. ([49163](https://github.com/WordPress/gutenberg/pull/49163))
+
+-   Bring back revisions button for template parts. ([49163](https://github.com/WordPress/gutenberg/pull/49163))
 
 #### Data Layer
-- useSelect: Incrementally subscribe to stores when first selected from. ([47243](https://github.com/WordPress/gutenberg/pull/47243))
-- Data: Refuse to register an already registered store. ([49134](https://github.com/WordPress/gutenberg/pull/49134))
+
+-   useSelect: Incrementally subscribe to stores when first selected from. ([47243](https://github.com/WordPress/gutenberg/pull/47243))
+-   Data: Refuse to register an already registered store. ([49134](https://github.com/WordPress/gutenberg/pull/49134))
 
 #### Tools
-- babel-plugin-makepot: Fix non-existing translation handling. ([49431](https://github.com/WordPress/gutenberg/pull/49431))
+
+-   babel-plugin-makepot: Fix non-existing translation handling. ([49431](https://github.com/WordPress/gutenberg/pull/49431))
 
 #### Navigation
+
 Fix fallback not rendering. ([49431](https://github.com/WordPress/gutenberg/pull/49576))
 
 ### Performance
 
 #### Post Editor
-- Avoid UI shifting when selecting blocks. ([47177](https://github.com/WordPress/gutenberg/pull/47177))
-- Lodash: Remove `_.groupBy()` from `buildTermsTree()` in editor. ([49224](https://github.com/WordPress/gutenberg/pull/49224))
+
+-   Avoid UI shifting when selecting blocks. ([47177](https://github.com/WordPress/gutenberg/pull/47177))
+-   Lodash: Remove `_.groupBy()` from `buildTermsTree()` in editor. ([49224](https://github.com/WordPress/gutenberg/pull/49224))
 
 #### GitHub Actions
-- Fix performance testing themes installation. ([49063](https://github.com/WordPress/gutenberg/pull/49063))
-- Speed up `npm ci` by caching `node_modules`. ([45932](https://github.com/WordPress/gutenberg/pull/45932))
+
+-   Fix performance testing themes installation. ([49063](https://github.com/WordPress/gutenberg/pull/49063))
+-   Speed up `npm ci` by caching `node_modules`. ([45932](https://github.com/WordPress/gutenberg/pull/45932))
 
 #### Testings
-- Fix running performance tests locally via CLI. ([49068](https://github.com/WordPress/gutenberg/pull/49068))
-- Refactor performance tests artifacts handling. ([48684](https://github.com/WordPress/gutenberg/pull/48684))
+
+-   Fix running performance tests locally via CLI. ([49068](https://github.com/WordPress/gutenberg/pull/49068))
+-   Refactor performance tests artifacts handling. ([48684](https://github.com/WordPress/gutenberg/pull/48684))
 
 #### Babel Preset
-- Polyfills: Exclude web.immediate. ([49234](https://github.com/WordPress/gutenberg/pull/49234))
 
+-   Polyfills: Exclude web.immediate. ([49234](https://github.com/WordPress/gutenberg/pull/49234))
 
 ### Experiments
 
 #### Navigation Screen
-- Remove 'edit-navigation' package leftovers. ([49183](https://github.com/WordPress/gutenberg/pull/49183))
 
+-   Remove 'edit-navigation' package leftovers. ([49183](https://github.com/WordPress/gutenberg/pull/49183))
 
 ### Documentation
 
-- Add a missing filter documentation. ([44342](https://github.com/WordPress/gutenberg/pull/44342))
-- Add missing pseudo-selectors to theme.json schema and documentation. ([49202](https://github.com/WordPress/gutenberg/pull/49202))
-- Add readme.txt FAQ entry for filing security bugs. ([49148](https://github.com/WordPress/gutenberg/pull/49148))
-- Adds issue template for the plugin release process. ([49345](https://github.com/WordPress/gutenberg/pull/49345))
-- Adds message about usage of block-editor components. ([49400](https://github.com/WordPress/gutenberg/pull/49400))
-- Block Editor Handbook: Improved the readability and phrasing and corrected mistakes. ([48756](https://github.com/WordPress/gutenberg/pull/48756))
-- Docs: Fix incorrect import of apiFetch. ([49432](https://github.com/WordPress/gutenberg/pull/49432))
-- Docs: Put more structure to Architecture page. ([49184](https://github.com/WordPress/gutenberg/pull/49184))
-- Fix failing CI documentation check. ([49378](https://github.com/WordPress/gutenberg/pull/49378))
-- Fix/missing template header. ([49348](https://github.com/WordPress/gutenberg/pull/49348))
-- FlexItem: Fix typo line 19 of README. ([49284](https://github.com/WordPress/gutenberg/pull/49284))
-- Mention "testsPort" .wp-env.json setting. ([49388](https://github.com/WordPress/gutenberg/pull/49388))
-- Remove errant line break in versions-and-building documentation. ([49353](https://github.com/WordPress/gutenberg/pull/49353))
-- Theme JSON schema: Add defaultPresets property to shadow. ([49204](https://github.com/WordPress/gutenberg/pull/49204))
-- Theme JSON schema: Add position.sticky and dimensions.minHeight properties to settings. ([49335](https://github.com/WordPress/gutenberg/pull/49335))
-- Update @api-fetch README.md with query args. ([49318](https://github.com/WordPress/gutenberg/pull/49318))
-- Update README.md for @wordpress/element. createRoot not available until WordPress 6.2. ([49309](https://github.com/WordPress/gutenberg/pull/49309))
-- docs: Update end-to-end test device documentation. ([49441](https://github.com/WordPress/gutenberg/pull/49441))
-
+-   Add a missing filter documentation. ([44342](https://github.com/WordPress/gutenberg/pull/44342))
+-   Add missing pseudo-selectors to theme.json schema and documentation. ([49202](https://github.com/WordPress/gutenberg/pull/49202))
+-   Add readme.txt FAQ entry for filing security bugs. ([49148](https://github.com/WordPress/gutenberg/pull/49148))
+-   Adds issue template for the plugin release process. ([49345](https://github.com/WordPress/gutenberg/pull/49345))
+-   Adds message about usage of block-editor components. ([49400](https://github.com/WordPress/gutenberg/pull/49400))
+-   Block Editor Handbook: Improved the readability and phrasing and corrected mistakes. ([48756](https://github.com/WordPress/gutenberg/pull/48756))
+-   Docs: Fix incorrect import of apiFetch. ([49432](https://github.com/WordPress/gutenberg/pull/49432))
+-   Docs: Put more structure to Architecture page. ([49184](https://github.com/WordPress/gutenberg/pull/49184))
+-   Fix failing CI documentation check. ([49378](https://github.com/WordPress/gutenberg/pull/49378))
+-   Fix/missing template header. ([49348](https://github.com/WordPress/gutenberg/pull/49348))
+-   FlexItem: Fix typo line 19 of README. ([49284](https://github.com/WordPress/gutenberg/pull/49284))
+-   Mention "testsPort" .wp-env.json setting. ([49388](https://github.com/WordPress/gutenberg/pull/49388))
+-   Remove errant line break in versions-and-building documentation. ([49353](https://github.com/WordPress/gutenberg/pull/49353))
+-   Theme JSON schema: Add defaultPresets property to shadow. ([49204](https://github.com/WordPress/gutenberg/pull/49204))
+-   Theme JSON schema: Add position.sticky and dimensions.minHeight properties to settings. ([49335](https://github.com/WordPress/gutenberg/pull/49335))
+-   Update @api-fetch README.md with query args. ([49318](https://github.com/WordPress/gutenberg/pull/49318))
+-   Update README.md for @wordpress/element. createRoot not available until WordPress 6.2. ([49309](https://github.com/WordPress/gutenberg/pull/49309))
+-   docs: Update end-to-end test device documentation. ([49441](https://github.com/WordPress/gutenberg/pull/49441))
 
 ### Code Quality
 
 #### Components
-- Animate: Refactor to TypeScript. ([49243](https://github.com/WordPress/gutenberg/pull/49243))
-- ColorPicker: TypeScript refactor. ([49214](https://github.com/WordPress/gutenberg/pull/49214))
-- CustomGradientPicker: Refactor to TypeScript. ([48929](https://github.com/WordPress/gutenberg/pull/48929))
-- DuotonePicker, DuotoneSwatch: Convert to TypeScript. ([49060](https://github.com/WordPress/gutenberg/pull/49060))
-- GradientPicker: Refactor to TypeScript. ([48316](https://github.com/WordPress/gutenberg/pull/48316))
+
+-   Animate: Refactor to TypeScript. ([49243](https://github.com/WordPress/gutenberg/pull/49243))
+-   ColorPicker: TypeScript refactor. ([49214](https://github.com/WordPress/gutenberg/pull/49214))
+-   CustomGradientPicker: Refactor to TypeScript. ([48929](https://github.com/WordPress/gutenberg/pull/48929))
+-   DuotonePicker, DuotoneSwatch: Convert to TypeScript. ([49060](https://github.com/WordPress/gutenberg/pull/49060))
+-   GradientPicker: Refactor to TypeScript. ([48316](https://github.com/WordPress/gutenberg/pull/48316))
 
 #### Block Library
-- Home Link Block: Remove leading spaces in class names. ([49397](https://github.com/WordPress/gutenberg/pull/49397))
-- Add column-gap and row-gap as allowed CSS properties for compatibility with WP 6.0. ([49118](https://github.com/WordPress/gutenberg/pull/49118))
+
+-   Home Link Block: Remove leading spaces in class names. ([49397](https://github.com/WordPress/gutenberg/pull/49397))
+-   Add column-gap and row-gap as allowed CSS properties for compatibility with WP 6.0. ([49118](https://github.com/WordPress/gutenberg/pull/49118))
 
 #### Block Editor
-- Duotone: Remove Safari rerender hack. ([49232](https://github.com/WordPress/gutenberg/pull/49232))
-- Replace regex with tag processor for duotone class render. ([49212](https://github.com/WordPress/gutenberg/pull/49212))
-- Use immutableSet utility to set style properties. ([49365](https://github.com/WordPress/gutenberg/pull/49365))
+
+-   Duotone: Remove Safari rerender hack. ([49232](https://github.com/WordPress/gutenberg/pull/49232))
+-   Replace regex with tag processor for duotone class render. ([49212](https://github.com/WordPress/gutenberg/pull/49212))
+-   Use immutableSet utility to set style properties. ([49365](https://github.com/WordPress/gutenberg/pull/49365))
 
 #### Plugins API
-- Plugins: Add unit tests for the 'PluginArea' component. ([49138](https://github.com/WordPress/gutenberg/pull/49138))
+
+-   Plugins: Add unit tests for the 'PluginArea' component. ([49138](https://github.com/WordPress/gutenberg/pull/49138))
 
 #### Global Styles
-- Extract a ColorPanel component as a reusable component between Global Styles and Block Inspector. ([48893](https://github.com/WordPress/gutenberg/pull/48893))
-- Lodash: Refactor away from `_.groupBy()` from `compileCSS()`. ([49227](https://github.com/WordPress/gutenberg/pull/49227))
+
+-   Extract a ColorPanel component as a reusable component between Global Styles and Block Inspector. ([48893](https://github.com/WordPress/gutenberg/pull/48893))
+-   Lodash: Refactor away from `_.groupBy()` from `compileCSS()`. ([49227](https://github.com/WordPress/gutenberg/pull/49227))
 
 #### Webfonts
-- Tests: Fix typos in fonts API. ([47288](https://github.com/WordPress/gutenberg/pull/47288))
+
+-   Tests: Fix typos in fonts API. ([47288](https://github.com/WordPress/gutenberg/pull/47288))
 
 #### Compose
-- Refactor useMediaQuery with useSyncExternalStore. ([48973](https://github.com/WordPress/gutenberg/pull/48973))
+
+-   Refactor useMediaQuery with useSyncExternalStore. ([48973](https://github.com/WordPress/gutenberg/pull/48973))
 
 #### Patterns
-- Add `gutenberg_get_remote_theme_patterns` function. ([49307](https://github.com/WordPress/gutenberg/pull/49307))
+
+-   Add `gutenberg_get_remote_theme_patterns` function. ([49307](https://github.com/WordPress/gutenberg/pull/49307))
 
 #### Element
-- Element: Narrow `createInterpolateElement` param type. ([49182](https://github.com/WordPress/gutenberg/pull/49182))
+
+-   Element: Narrow `createInterpolateElement` param type. ([49182](https://github.com/WordPress/gutenberg/pull/49182))
 
 ### Tools
 
 #### Testing
-- Fix flaky Site Editor title end-to-end tests. ([49203](https://github.com/WordPress/gutenberg/pull/49203))
-- Upgrade Playwright to 1.32. ([49296](https://github.com/WordPress/gutenberg/pull/49296))
 
-#### Build Tooling
-- Upgrade wp-prettier to 2.8.5. ([49258](https://github.com/WordPress/gutenberg/pull/49258))
+-   Fix flaky Site Editor title end-to-end tests. ([49203](https://github.com/WordPress/gutenberg/pull/49203))
+-   Upgrade Playwright to 1.32. ([49296](https://github.com/WordPress/gutenberg/pull/49296))
 
+#### Build Tooling
 
-## First time contributors
+-   Upgrade wp-prettier to 2.8.5. ([49258](https://github.com/WordPress/gutenberg/pull/49258))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @enderandpeter: Mention "testsPort" .wp-env.json setting. ([49388](https://github.com/WordPress/gutenberg/pull/49388))
-- @hareesh-pillai: Site Editor: Fix typo in utils.js. ([49178](https://github.com/WordPress/gutenberg/pull/49178))
-- @helgatheviking: Update @api-fetch README.md with query args. ([49318](https://github.com/WordPress/gutenberg/pull/49318))
-- @janboddez: Fix sprintf() arguments. ([49439](https://github.com/WordPress/gutenberg/pull/49439))
-- @renintw: icons: Add unseen icon to library. ([49254](https://github.com/WordPress/gutenberg/pull/49254))
-- @richiecarey: FlexItem: Fix typo line 19 of README. ([49284](https://github.com/WordPress/gutenberg/pull/49284))
-- @sque89: columns block: Add support for templateLock attribute. ([49132](https://github.com/WordPress/gutenberg/pull/49132))
+The following PRs were merged by first-time contributors:
 
+-   @enderandpeter: Mention "testsPort" .wp-env.json setting. ([49388](https://github.com/WordPress/gutenberg/pull/49388))
+-   @hareesh-pillai: Site Editor: Fix typo in utils.js. ([49178](https://github.com/WordPress/gutenberg/pull/49178))
+-   @helgatheviking: Update @api-fetch README.md with query args. ([49318](https://github.com/WordPress/gutenberg/pull/49318))
+-   @janboddez: Fix sprintf() arguments. ([49439](https://github.com/WordPress/gutenberg/pull/49439))
+-   @renintw: icons: Add unseen icon to library. ([49254](https://github.com/WordPress/gutenberg/pull/49254))
+-   @richiecarey: FlexItem: Fix typo line 19 of README. ([49284](https://github.com/WordPress/gutenberg/pull/49284))
+-   @sque89: columns block: Add support for templateLock attribute. ([49132](https://github.com/WordPress/gutenberg/pull/49132))
 
 ## Contributors
 
@@ -6401,7 +17480,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @ajlende @andrewserong @aristath @brookewp @carolinan @chad1008 @ciampo @corentin-gautier @dcalhoun @draganescu @ellatrix @enderandpeter @felixarntz @fluiddot @glendaviesnz @gziolo @hareesh-pillai @helgatheviking @janboddez @jeryj @jhnstn @johnbillion @jorgefilipecosta @jsnajdr @kevin940726 @madhusudhand @MaggieCabrera @Mamaduka @mburridge @mirka @ntsekouras @oandregal @renintw @richiecarey @richtabor @ryanwelcher @scruffian @sgomes @shreyasikhar @SiobhyB @Soean @sque89 @stokesman @t-hamano @talldan @tellthemachines @tomdevisser @tyxla @WunderBart @youknowriad @ZebulanStanphill
 
-
 = 15.4.0 =
 
 ## Changelog
@@ -6410,311 +17488,312 @@ The following contributors merged PRs in this release:
 
 #### Site Editor
 
-- Adjust whileHover effect to be a bit subtler and less pronounced. ([48928](https://github.com/WordPress/gutenberg/pull/48928))
-- Go direct to edit from manage all templates list. ([48764](https://github.com/WordPress/gutenberg/pull/48764))
-- Move "Add Template"'s descriptions to tooltips. ([48710](https://github.com/WordPress/gutenberg/pull/48710))
-- Add descriptions to all panels in the Site Editor's dark side. ([48739](https://github.com/WordPress/gutenberg/pull/48739))
-- Add hover animation to site editor canvas. ([48575](https://github.com/WordPress/gutenberg/pull/48575))
-- Fix non-us spelling in sidebar. ([48976](https://github.com/WordPress/gutenberg/pull/48976))
-- Prevent the saving button from showing when renaming templates. ([48399](https://github.com/WordPress/gutenberg/pull/48399))
-- Navigation Sidebar: Change the logic about which navigation gets selected for the sidebar. ([48689](https://github.com/WordPress/gutenberg/pull/48689))
-- Add "Added by" description to template part navigation sidebar. ([48732](https://github.com/WordPress/gutenberg/pull/48732))
-- Add border radius to off canvas navigation menu items. ([48798](https://github.com/WordPress/gutenberg/pull/48798))
-- Add page details when viewing a specific page. ([48650](https://github.com/WordPress/gutenberg/pull/48650))
-- Duotone: Limit SVG filter output to used filters. ([48995](https://github.com/WordPress/gutenberg/pull/48995))
-- Hide navigation screen in site editor. ([49043](https://github.com/WordPress/gutenberg/pull/49043))
+-   Adjust whileHover effect to be a bit subtler and less pronounced. ([48928](https://github.com/WordPress/gutenberg/pull/48928))
+-   Go direct to edit from manage all templates list. ([48764](https://github.com/WordPress/gutenberg/pull/48764))
+-   Move "Add Template"'s descriptions to tooltips. ([48710](https://github.com/WordPress/gutenberg/pull/48710))
+-   Add descriptions to all panels in the Site Editor's dark side. ([48739](https://github.com/WordPress/gutenberg/pull/48739))
+-   Add hover animation to site editor canvas. ([48575](https://github.com/WordPress/gutenberg/pull/48575))
+-   Fix non-us spelling in sidebar. ([48976](https://github.com/WordPress/gutenberg/pull/48976))
+-   Prevent the saving button from showing when renaming templates. ([48399](https://github.com/WordPress/gutenberg/pull/48399))
+-   Navigation Sidebar: Change the logic about which navigation gets selected for the sidebar. ([48689](https://github.com/WordPress/gutenberg/pull/48689))
+-   Add "Added by" description to template part navigation sidebar. ([48732](https://github.com/WordPress/gutenberg/pull/48732))
+-   Add border radius to off canvas navigation menu items. ([48798](https://github.com/WordPress/gutenberg/pull/48798))
+-   Add page details when viewing a specific page. ([48650](https://github.com/WordPress/gutenberg/pull/48650))
+-   Duotone: Limit SVG filter output to used filters. ([48995](https://github.com/WordPress/gutenberg/pull/48995))
+-   Hide navigation screen in site editor. ([49043](https://github.com/WordPress/gutenberg/pull/49043))
 
 #### Block Library
 
-- Open convert to links modal on select of a page item. ([48723](https://github.com/WordPress/gutenberg/pull/48723))
-- Post Featured Image: Remove 16:10. ([48969](https://github.com/WordPress/gutenberg/pull/48969))
-- Cover: Add constrained/flow layout. ([45326](https://github.com/WordPress/gutenberg/pull/45326))
-- Cover: Add text color block support. ([41572](https://github.com/WordPress/gutenberg/pull/41572))
+-   Open convert to links modal on select of a page item. ([48723](https://github.com/WordPress/gutenberg/pull/48723))
+-   Post Featured Image: Remove 16:10. ([48969](https://github.com/WordPress/gutenberg/pull/48969))
+-   Cover: Add constrained/flow layout. ([45326](https://github.com/WordPress/gutenberg/pull/45326))
+-   Cover: Add text color block support. ([41572](https://github.com/WordPress/gutenberg/pull/41572))
 
 #### Components
 
-- FontSizePicker: Allow custom units. ([48468](https://github.com/WordPress/gutenberg/pull/48468))
-- `Navigator`: Disable initial animation. ([49062](https://github.com/WordPress/gutenberg/pull/49062))
-- Try: Update Tertiary Button appearance. ([48888](https://github.com/WordPress/gutenberg/pull/48888))
-- FormTokenField: Hide suggestions list on blur event if input value is invalid. ([48785](https://github.com/WordPress/gutenberg/pull/48785))
+-   FontSizePicker: Allow custom units. ([48468](https://github.com/WordPress/gutenberg/pull/48468))
+-   `Navigator`: Disable initial animation. ([49062](https://github.com/WordPress/gutenberg/pull/49062))
+-   Try: Update Tertiary Button appearance. ([48888](https://github.com/WordPress/gutenberg/pull/48888))
+-   FormTokenField: Hide suggestions list on blur event if input value is invalid. ([48785](https://github.com/WordPress/gutenberg/pull/48785))
 
 #### Design Tools
 
-- Block Supports: Add text columns (column count) to typography block supports. ([33587](https://github.com/WordPress/gutenberg/pull/33587))
+-   Block Supports: Add text columns (column count) to typography block supports. ([33587](https://github.com/WordPress/gutenberg/pull/33587))
 
 #### Global Styles
 
-- Move the global styles provider to the app level component. ([49011](https://github.com/WordPress/gutenberg/pull/49011))
-- Add support for `:link` and `:Any-link` in `theme.json`. ([48634](https://github.com/WordPress/gutenberg/pull/48634))
-- Add compound class to layout wrapper for global spacing styles. ([47952](https://github.com/WordPress/gutenberg/pull/47952))
+-   Move the global styles provider to the app level component. ([49011](https://github.com/WordPress/gutenberg/pull/49011))
+-   Add support for `:link` and `:Any-link` in `theme.json`. ([48634](https://github.com/WordPress/gutenberg/pull/48634))
+-   Add compound class to layout wrapper for global spacing styles. ([47952](https://github.com/WordPress/gutenberg/pull/47952))
 
 #### Block API
 
-- Block Deprecations: Provide extra data for isEligible check. ([48815](https://github.com/WordPress/gutenberg/pull/48815))
+-   Block Deprecations: Provide extra data for isEligible check. ([48815](https://github.com/WordPress/gutenberg/pull/48815))
 
 #### Post Editor
 
-- Provide static native editor help article slugs. ([48802](https://github.com/WordPress/gutenberg/pull/48802))
-- Try getting Post Content layout on server before editor loads. ([45299](https://github.com/WordPress/gutenberg/pull/45299))
+-   Provide static native editor help article slugs. ([48802](https://github.com/WordPress/gutenberg/pull/48802))
+-   Try getting Post Content layout on server before editor loads. ([45299](https://github.com/WordPress/gutenberg/pull/45299))
 
 #### Packages
 
-- Introduce prependHTTPS URL util. ([47648](https://github.com/WordPress/gutenberg/pull/47648))
-
-### Bug Fixes
-
-#### Block Library
-
-- Embed Block: Fix Aspect Ratio Classes #29641. ([41141](https://github.com/WordPress/gutenberg/pull/41141))
-- Ensure aspect ratio is applied when Post Featured Image block is linked. ([48495](https://github.com/WordPress/gutenberg/pull/48495))
-- Fix PostContent initial render by waiting for the canEdit request. ([48642](https://github.com/WordPress/gutenberg/pull/48642))
-- Fix classic menu fallback race condition. ([48811](https://github.com/WordPress/gutenberg/pull/48811))
-- Fix navigation block off-canvas appender for empty menus. ([48907](https://github.com/WordPress/gutenberg/pull/48907))
-- Fixes extra UI in navigation block inspector. ([48679](https://github.com/WordPress/gutenberg/pull/48679))
-- Import Classic Menu using the menu name as the block menu title. ([48771](https://github.com/WordPress/gutenberg/pull/48771))
-- Navigation Link: Remove color generation code. ([48927](https://github.com/WordPress/gutenberg/pull/48927))
-- Navigation: Fix missing state for MenuControls. ([48921](https://github.com/WordPress/gutenberg/pull/48921))
-- Update missing translation from label. ([48760](https://github.com/WordPress/gutenberg/pull/48760))
-- Widget Importer: Fix Widget Group block imports. ([48669](https://github.com/WordPress/gutenberg/pull/48669))
-- Query Loop: Show variant patterns even if there are no patterns for the Query Loop block. ([48793](https://github.com/WordPress/gutenberg/pull/48793))
-- Comments: Fix 'sprintf requires more than 1 params' error. ([49054](https://github.com/WordPress/gutenberg/pull/49054))
-- Adjust Post Featured Image PanelBody label to "Settings". ([49076](https://github.com/WordPress/gutenberg/pull/49076))
-- Add help text to Gallery Image Size control. ([49074](https://github.com/WordPress/gutenberg/pull/49074))
-- Comments Block (Legacy): Update missing translation. ([48820](https://github.com/WordPress/gutenberg/pull/48820))
-- I18n of created Navigation menu title. ([48773](https://github.com/WordPress/gutenberg/pull/48773))
-- Make sure the directly inserted block in the Nav block is a Page link. ([48740](https://github.com/WordPress/gutenberg/pull/48740))
-- Navigation Link: Don't remove 'block_core_navigation_link_build_css_colors'. ([49064](https://github.com/WordPress/gutenberg/pull/49064))
-- Navigation: Don't save the level of the link in an attribute. ([48219](https://github.com/WordPress/gutenberg/pull/48219))
-- Refactor away state in Nav menu selector. ([45464](https://github.com/WordPress/gutenberg/pull/45464))
-- Revert: Navigation: Always create a fallback menu. ([48602](https://github.com/WordPress/gutenberg/pull/48602))
-- Tweak Latest Posts block PanelBody labels. ([49079](https://github.com/WordPress/gutenberg/pull/49079))
-- Tweak label for Latest Posts excerpt control. ([49077](https://github.com/WordPress/gutenberg/pull/49077))
-- Page List Block: Show untitled pages on page list on the editor. ([48772](https://github.com/WordPress/gutenberg/pull/48772))
+-   Introduce prependHTTPS URL util. ([47648](https://github.com/WordPress/gutenberg/pull/47648))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Embed Block: Fix Aspect Ratio Classes #29641. ([41141](https://github.com/WordPress/gutenberg/pull/41141))
+-   Ensure aspect ratio is applied when Post Featured Image block is linked. ([48495](https://github.com/WordPress/gutenberg/pull/48495))
+-   Fix PostContent initial render by waiting for the canEdit request. ([48642](https://github.com/WordPress/gutenberg/pull/48642))
+-   Fix classic menu fallback race condition. ([48811](https://github.com/WordPress/gutenberg/pull/48811))
+-   Fix navigation block off-canvas appender for empty menus. ([48907](https://github.com/WordPress/gutenberg/pull/48907))
+-   Fixes extra UI in navigation block inspector. ([48679](https://github.com/WordPress/gutenberg/pull/48679))
+-   Import Classic Menu using the menu name as the block menu title. ([48771](https://github.com/WordPress/gutenberg/pull/48771))
+-   Navigation Link: Remove color generation code. ([48927](https://github.com/WordPress/gutenberg/pull/48927))
+-   Navigation: Fix missing state for MenuControls. ([48921](https://github.com/WordPress/gutenberg/pull/48921))
+-   Update missing translation from label. ([48760](https://github.com/WordPress/gutenberg/pull/48760))
+-   Widget Importer: Fix Widget Group block imports. ([48669](https://github.com/WordPress/gutenberg/pull/48669))
+-   Query Loop: Show variant patterns even if there are no patterns for the Query Loop block. ([48793](https://github.com/WordPress/gutenberg/pull/48793))
+-   Comments: Fix 'sprintf requires more than 1 params' error. ([49054](https://github.com/WordPress/gutenberg/pull/49054))
+-   Adjust Post Featured Image PanelBody label to "Settings". ([49076](https://github.com/WordPress/gutenberg/pull/49076))
+-   Add help text to Gallery Image Size control. ([49074](https://github.com/WordPress/gutenberg/pull/49074))
+-   Comments Block (Legacy): Update missing translation. ([48820](https://github.com/WordPress/gutenberg/pull/48820))
+-   I18n of created Navigation menu title. ([48773](https://github.com/WordPress/gutenberg/pull/48773))
+-   Make sure the directly inserted block in the Nav block is a Page link. ([48740](https://github.com/WordPress/gutenberg/pull/48740))
+-   Navigation Link: Don't remove 'block_core_navigation_link_build_css_colors'. ([49064](https://github.com/WordPress/gutenberg/pull/49064))
+-   Navigation: Don't save the level of the link in an attribute. ([48219](https://github.com/WordPress/gutenberg/pull/48219))
+-   Refactor away state in Nav menu selector. ([45464](https://github.com/WordPress/gutenberg/pull/45464))
+-   Revert: Navigation: Always create a fallback menu. ([48602](https://github.com/WordPress/gutenberg/pull/48602))
+-   Tweak Latest Posts block PanelBody labels. ([49079](https://github.com/WordPress/gutenberg/pull/49079))
+-   Tweak label for Latest Posts excerpt control. ([49077](https://github.com/WordPress/gutenberg/pull/49077))
+-   Page List Block: Show untitled pages on page list on the editor. ([48772](https://github.com/WordPress/gutenberg/pull/48772))
 
 #### Site Editor
 
-- Don't offer Classic block as a recovery action when not registered. ([49051](https://github.com/WordPress/gutenberg/pull/49051))
-- Fix browser history when synchronising state with urls. ([48731](https://github.com/WordPress/gutenberg/pull/48731))
-- Fix lingering insertion point within template parts. ([48913](https://github.com/WordPress/gutenberg/pull/48913))
-- Fix template part actions in List View. ([48905](https://github.com/WordPress/gutenberg/pull/48905))
-- Fix text alignment in the Site Editor sidebar. ([48959](https://github.com/WordPress/gutenberg/pull/48959))
-- Fix typo in template parts description. ([48781](https://github.com/WordPress/gutenberg/pull/48781))
-- Fix browse mode descriptions margin. ([48778](https://github.com/WordPress/gutenberg/pull/48778))
-- Fix scrollbar in site editor. ([48822](https://github.com/WordPress/gutenberg/pull/48822))
-- Site Editor Navigation panel: Update appearance of non-link blocks. ([48933](https://github.com/WordPress/gutenberg/pull/48933))
-- Navigation sidebar shows a wrong submenu popover. ([48941](https://github.com/WordPress/gutenberg/pull/48941))
-- Show creation popover on empty page links in the navigation sidebar. ([48746](https://github.com/WordPress/gutenberg/pull/48746))
-- Site button metrics. ([48918](https://github.com/WordPress/gutenberg/pull/48918))
-- Remove actions from SidebarNavigationScreenWrapper. ([48935](https://github.com/WordPress/gutenberg/pull/48935))
-- Update template descriptions with more detail. ([48934](https://github.com/WordPress/gutenberg/pull/48934))
+-   Don't offer Classic block as a recovery action when not registered. ([49051](https://github.com/WordPress/gutenberg/pull/49051))
+-   Fix browser history when synchronising state with urls. ([48731](https://github.com/WordPress/gutenberg/pull/48731))
+-   Fix lingering insertion point within template parts. ([48913](https://github.com/WordPress/gutenberg/pull/48913))
+-   Fix template part actions in List View. ([48905](https://github.com/WordPress/gutenberg/pull/48905))
+-   Fix text alignment in the Site Editor sidebar. ([48959](https://github.com/WordPress/gutenberg/pull/48959))
+-   Fix typo in template parts description. ([48781](https://github.com/WordPress/gutenberg/pull/48781))
+-   Fix browse mode descriptions margin. ([48778](https://github.com/WordPress/gutenberg/pull/48778))
+-   Fix scrollbar in site editor. ([48822](https://github.com/WordPress/gutenberg/pull/48822))
+-   Site Editor Navigation panel: Update appearance of non-link blocks. ([48933](https://github.com/WordPress/gutenberg/pull/48933))
+-   Navigation sidebar shows a wrong submenu popover. ([48941](https://github.com/WordPress/gutenberg/pull/48941))
+-   Show creation popover on empty page links in the navigation sidebar. ([48746](https://github.com/WordPress/gutenberg/pull/48746))
+-   Site button metrics. ([48918](https://github.com/WordPress/gutenberg/pull/48918))
+-   Remove actions from SidebarNavigationScreenWrapper. ([48935](https://github.com/WordPress/gutenberg/pull/48935))
+-   Update template descriptions with more detail. ([48934](https://github.com/WordPress/gutenberg/pull/48934))
 
 #### Global Styles
 
-- Fix typo: Use WP_Theme_JSON_Gutenberg instead of WP_Theme_JSON class name. ([48648](https://github.com/WordPress/gutenberg/pull/48648))
-- Fix: Crashes on getNodesWithSettings and getNodesWithStyles. ([49023](https://github.com/WordPress/gutenberg/pull/49023))
-- Fix: Global Styles crash in updateConfigWithSeparator when not block styles are passed. ([49045](https://github.com/WordPress/gutenberg/pull/49045))
-- Fix: Global Styles getNodesWithStyles expects an object with elements. ([49044](https://github.com/WordPress/gutenberg/pull/49044))
-- Fix: Global Styles getPresetsClasses crashes if no selector is passed. ([49024](https://github.com/WordPress/gutenberg/pull/49024))
-- Fix: Global styles forces a white background. ([49042](https://github.com/WordPress/gutenberg/pull/49042))
-- Style Book: Move iframe to root of content area to support styles that overflow block previews. ([48664](https://github.com/WordPress/gutenberg/pull/48664))
-- `WP_Theme_JSON`: Sync indirect properties changes from core. ([48646](https://github.com/WordPress/gutenberg/pull/48646))
+-   Fix typo: Use WP_Theme_JSON_Gutenberg instead of WP_Theme_JSON class name. ([48648](https://github.com/WordPress/gutenberg/pull/48648))
+-   Fix: Crashes on getNodesWithSettings and getNodesWithStyles. ([49023](https://github.com/WordPress/gutenberg/pull/49023))
+-   Fix: Global Styles crash in updateConfigWithSeparator when not block styles are passed. ([49045](https://github.com/WordPress/gutenberg/pull/49045))
+-   Fix: Global Styles getNodesWithStyles expects an object with elements. ([49044](https://github.com/WordPress/gutenberg/pull/49044))
+-   Fix: Global Styles getPresetsClasses crashes if no selector is passed. ([49024](https://github.com/WordPress/gutenberg/pull/49024))
+-   Fix: Global styles forces a white background. ([49042](https://github.com/WordPress/gutenberg/pull/49042))
+-   Style Book: Move iframe to root of content area to support styles that overflow block previews. ([48664](https://github.com/WordPress/gutenberg/pull/48664))
+-   `WP_Theme_JSON`: Sync indirect properties changes from core. ([48646](https://github.com/WordPress/gutenberg/pull/48646))
 
 #### Components
 
-- Fix HStack and VStack alignment prop. ([47914](https://github.com/WordPress/gutenberg/pull/47914))
-- ResizeTooltip: Use default.fontFamily on tooltip. ([48805](https://github.com/WordPress/gutenberg/pull/48805))
-- ResponsiveWrapper: Use aspect-ratio CSS prop and support SVG elements. ([48573](https://github.com/WordPress/gutenberg/pull/48573))
+-   Fix HStack and VStack alignment prop. ([47914](https://github.com/WordPress/gutenberg/pull/47914))
+-   ResizeTooltip: Use default.fontFamily on tooltip. ([48805](https://github.com/WordPress/gutenberg/pull/48805))
+-   ResponsiveWrapper: Use aspect-ratio CSS prop and support SVG elements. ([48573](https://github.com/WordPress/gutenberg/pull/48573))
 
 #### Accessibility
 
-- Make sure useFocusOnMount runs when all the children tabbable elements have mounted. ([42187](https://github.com/WordPress/gutenberg/pull/42187))
-- Manage selection on block sync. ([48979](https://github.com/WordPress/gutenberg/pull/48979))
+-   Make sure useFocusOnMount runs when all the children tabbable elements have mounted. ([42187](https://github.com/WordPress/gutenberg/pull/42187))
+-   Manage selection on block sync. ([48979](https://github.com/WordPress/gutenberg/pull/48979))
 
 #### Post Editor
 
-- Distraction Free Mode: Don't show the metaboxes. ([48947](https://github.com/WordPress/gutenberg/pull/48947))
-- Don't add Post Content layout styles to title in the post editor. ([48663](https://github.com/WordPress/gutenberg/pull/48663))
-- Fix animation and browser console error when returning from template edit mode. ([48930](https://github.com/WordPress/gutenberg/pull/48930))
+-   Distraction Free Mode: Don't show the metaboxes. ([48947](https://github.com/WordPress/gutenberg/pull/48947))
+-   Don't add Post Content layout styles to title in the post editor. ([48663](https://github.com/WordPress/gutenberg/pull/48663))
+-   Fix animation and browser console error when returning from template edit mode. ([48930](https://github.com/WordPress/gutenberg/pull/48930))
 
 #### Block Editor
 
-- LinkControl: Remove HTML from suggestion title before passing it to TextHighlight component. ([48685](https://github.com/WordPress/gutenberg/pull/48685))
-- Order initial block items in Navigation with PrivateInserter. ([48752](https://github.com/WordPress/gutenberg/pull/48752))
-- BlockInvalidWarning: Prefer `canInsertBlockType` and refactor to hooks. ([49052](https://github.com/WordPress/gutenberg/pull/49052))
-- Fix grouping actions in List View. ([48910](https://github.com/WordPress/gutenberg/pull/48910))
-- Fix typo in the media-categories component. ([49047](https://github.com/WordPress/gutenberg/pull/49047))
-- Custom link UI does appears outside canvas on the sidebar navigation. ([48633](https://github.com/WordPress/gutenberg/pull/48633))
-- Use proper color for block styles control. ([46684](https://github.com/WordPress/gutenberg/pull/46684))
-- Update Welcome Guide article links to avoid redirect. ([48582](https://github.com/WordPress/gutenberg/pull/48582))
-- Columns Block: Don't show the column count change UI when `templateLock` is `all`. ([48691](https://github.com/WordPress/gutenberg/pull/48691))
-- Remove border from quick inserter child elements. ([48794](https://github.com/WordPress/gutenberg/pull/48794))
+-   LinkControl: Remove HTML from suggestion title before passing it to TextHighlight component. ([48685](https://github.com/WordPress/gutenberg/pull/48685))
+-   Order initial block items in Navigation with PrivateInserter. ([48752](https://github.com/WordPress/gutenberg/pull/48752))
+-   BlockInvalidWarning: Prefer `canInsertBlockType` and refactor to hooks. ([49052](https://github.com/WordPress/gutenberg/pull/49052))
+-   Fix grouping actions in List View. ([48910](https://github.com/WordPress/gutenberg/pull/48910))
+-   Fix typo in the media-categories component. ([49047](https://github.com/WordPress/gutenberg/pull/49047))
+-   Custom link UI does appears outside canvas on the sidebar navigation. ([48633](https://github.com/WordPress/gutenberg/pull/48633))
+-   Use proper color for block styles control. ([46684](https://github.com/WordPress/gutenberg/pull/46684))
+-   Update Welcome Guide article links to avoid redirect. ([48582](https://github.com/WordPress/gutenberg/pull/48582))
+-   Columns Block: Don't show the column count change UI when `templateLock` is `all`. ([48691](https://github.com/WordPress/gutenberg/pull/48691))
+-   Remove border from quick inserter child elements. ([48794](https://github.com/WordPress/gutenberg/pull/48794))
 
 #### Inspector Controls
-- Fix settings tab active state border in block inspector. ([48945](https://github.com/WordPress/gutenberg/pull/48945))
+
+-   Fix settings tab active state border in block inspector. ([48945](https://github.com/WordPress/gutenberg/pull/48945))
 
 #### Testing
 
-- Playwright Utils: Fix the 'publishPost' address locator. ([48729](https://github.com/WordPress/gutenberg/pull/48729))
+-   Playwright Utils: Fix the 'publishPost' address locator. ([48729](https://github.com/WordPress/gutenberg/pull/48729))
 
 #### CSS & Styling
-- Fix duplication of block classname in feature selectors for style variations. ([48662](https://github.com/WordPress/gutenberg/pull/48662))
+
+-   Fix duplication of block classname in feature selectors for style variations. ([48662](https://github.com/WordPress/gutenberg/pull/48662))
 
 #### Experimental
 
-- Fix KSES filter for un-prettified filters. ([49004](https://github.com/WordPress/gutenberg/pull/49004))
+-   Fix KSES filter for un-prettified filters. ([49004](https://github.com/WordPress/gutenberg/pull/49004))
 
 #### Packages
 
-- Rich text: Fix range equality checks for Safari. ([48733](https://github.com/WordPress/gutenberg/pull/48733))
-- Preferences Modal: Fix double focus outline in tab item. ([48996](https://github.com/WordPress/gutenberg/pull/48996))
+-   Rich text: Fix range equality checks for Safari. ([48733](https://github.com/WordPress/gutenberg/pull/48733))
+-   Preferences Modal: Fix double focus outline in tab item. ([48996](https://github.com/WordPress/gutenberg/pull/48996))
 
 #### Tools
 
-- Scripts: Fix `render.php` isn't copied in Windows OS. ([48735](https://github.com/WordPress/gutenberg/pull/48735))
+-   Scripts: Fix `render.php` isn't copied in Windows OS. ([48735](https://github.com/WordPress/gutenberg/pull/48735))
 
 #### Mobile
 
-- Mobile - Fix parsing of CSS units for null matched values. ([48484](https://github.com/WordPress/gutenberg/pull/48484))
+-   Mobile - Fix parsing of CSS units for null matched values. ([48484](https://github.com/WordPress/gutenberg/pull/48484))
 
 ### Performance
 
 #### Block Editor
 
-- Rich text: useAnchor: Remove value dependency. ([48715](https://github.com/WordPress/gutenberg/pull/48715))
+-   Rich text: useAnchor: Remove value dependency. ([48715](https://github.com/WordPress/gutenberg/pull/48715))
 
 #### Post Editor
 
-- Lodash: Refactor away from `_.kebabCase()` in `EditorHelpTopics`. ([48776](https://github.com/WordPress/gutenberg/pull/48776))
-- Lodash: Refactor away from `edit-post` package. ([48786](https://github.com/WordPress/gutenberg/pull/48786))
+-   Lodash: Refactor away from `_.kebabCase()` in `EditorHelpTopics`. ([48776](https://github.com/WordPress/gutenberg/pull/48776))
+-   Lodash: Refactor away from `edit-post` package. ([48786](https://github.com/WordPress/gutenberg/pull/48786))
 
 #### Site Editor
 
-- Improve the Navigation panel's menu query. ([48908](https://github.com/WordPress/gutenberg/pull/48908))
-- Improve Site Editor performance tests. ([48138](https://github.com/WordPress/gutenberg/pull/48138))
+-   Improve the Navigation panel's menu query. ([48908](https://github.com/WordPress/gutenberg/pull/48908))
+-   Improve Site Editor performance tests. ([48138](https://github.com/WordPress/gutenberg/pull/48138))
 
 #### Testing
 
-- Lodash: Remove from e2e-tests package. ([48775](https://github.com/WordPress/gutenberg/pull/48775))
+-   Lodash: Remove from e2e-tests package. ([48775](https://github.com/WordPress/gutenberg/pull/48775))
 
 #### Themes
 
-- Fix: Incorrect selector generated by `append_to_selector` method. ([48759](https://github.com/WordPress/gutenberg/pull/48759))
+-   Fix: Incorrect selector generated by `append_to_selector` method. ([48759](https://github.com/WordPress/gutenberg/pull/48759))
 
 #### Block Library
 
-- Lodash: Remove `_.get()` from various blocks. ([48491](https://github.com/WordPress/gutenberg/pull/48491))
+-   Lodash: Remove `_.get()` from various blocks. ([48491](https://github.com/WordPress/gutenberg/pull/48491))
 
 #### Data Layer
 
-- Lodash: Refactor away from `_.set()` in core-data. ([48784](https://github.com/WordPress/gutenberg/pull/48784))
+-   Lodash: Refactor away from `_.set()` in core-data. ([48784](https://github.com/WordPress/gutenberg/pull/48784))
 
 #### GitHub Actions
 
-- Prefer committer over author date for perf results timestamp. ([48673](https://github.com/WordPress/gutenberg/pull/48673))
+-   Prefer committer over author date for perf results timestamp. ([48673](https://github.com/WordPress/gutenberg/pull/48673))
 
 ### Documentation
 
-- Add links to hook documentation in curation doc. ([48653](https://github.com/WordPress/gutenberg/pull/48653))
-- Add missing playwright end-to-end documentation to toc.json. ([48447](https://github.com/WordPress/gutenberg/pull/48447))
-- Adding examples of how to programmatically remove the panels in Document sidebar. ([48895](https://github.com/WordPress/gutenberg/pull/48895))
-- Adds link to post on the developer blog to the deprecation page. ([49069](https://github.com/WordPress/gutenberg/pull/49069))
-- Add position: Sticky to the Opt-in into UI controls appearanceTools section. ([48763](https://github.com/WordPress/gutenberg/pull/48763))
-- Fix broken Lerna documentation link. ([48890](https://github.com/WordPress/gutenberg/pull/48890))
-- Table of styles keys with since versions. ([48265](https://github.com/WordPress/gutenberg/pull/48265))
-- Fix URL mismatch. ([48931](https://github.com/WordPress/gutenberg/pull/48931))
-- Theme JSON schema: Add sticky position to settings, minHeight to styles. ([48948](https://github.com/WordPress/gutenberg/pull/48948))
-- Update the end-to-end tests documentation. ([48951](https://github.com/WordPress/gutenberg/pull/48951))
-- jest-preset-default: Update README to reflect current status. ([48925](https://github.com/WordPress/gutenberg/pull/48925))
+-   Add links to hook documentation in curation doc. ([48653](https://github.com/WordPress/gutenberg/pull/48653))
+-   Add missing playwright end-to-end documentation to toc.json. ([48447](https://github.com/WordPress/gutenberg/pull/48447))
+-   Adding examples of how to programmatically remove the panels in Document sidebar. ([48895](https://github.com/WordPress/gutenberg/pull/48895))
+-   Adds link to post on the developer blog to the deprecation page. ([49069](https://github.com/WordPress/gutenberg/pull/49069))
+-   Add position: Sticky to the Opt-in into UI controls appearanceTools section. ([48763](https://github.com/WordPress/gutenberg/pull/48763))
+-   Fix broken Lerna documentation link. ([48890](https://github.com/WordPress/gutenberg/pull/48890))
+-   Table of styles keys with since versions. ([48265](https://github.com/WordPress/gutenberg/pull/48265))
+-   Fix URL mismatch. ([48931](https://github.com/WordPress/gutenberg/pull/48931))
+-   Theme JSON schema: Add sticky position to settings, minHeight to styles. ([48948](https://github.com/WordPress/gutenberg/pull/48948))
+-   Update the end-to-end tests documentation. ([48951](https://github.com/WordPress/gutenberg/pull/48951))
+-   jest-preset-default: Update README to reflect current status. ([48925](https://github.com/WordPress/gutenberg/pull/48925))
 
 ### Code Quality
 
 #### Components
 
-- Autocomplete: Refactor to TypeScript. ([47751](https://github.com/WordPress/gutenberg/pull/47751))
-- Navigation: Refactor to TypeScript. ([48742](https://github.com/WordPress/gutenberg/pull/48742))
-- SelectControl: Improve prop types for single vs multiple selection. ([47390](https://github.com/WordPress/gutenberg/pull/47390))
-- `DimensionControl(Experimental)`: Refactor to TypeScript. ([47351](https://github.com/WordPress/gutenberg/pull/47351))
-- `Guide`: Refactor to TypeScript. ([47493](https://github.com/WordPress/gutenberg/pull/47493))
-- `Icon`: Refactor tests to TypeScript. ([49066](https://github.com/WordPress/gutenberg/pull/49066))
-- `PaletteEdit`: Refactor away from `lodash.kebabCase`. ([48637](https://github.com/WordPress/gutenberg/pull/48637))
-- `QueryControls`: Refactor away from `lodash.groupBy`. ([48779](https://github.com/WordPress/gutenberg/pull/48779))
-- components/utils/font: Refactor away from lodash `.get`. ([48629](https://github.com/WordPress/gutenberg/pull/48629))
-- remove lodash from `context/getStyledClassName`:. ([48688](https://github.com/WordPress/gutenberg/pull/48688))
-- withSpokenMessages: Change js files to typescript. ([48163](https://github.com/WordPress/gutenberg/pull/48163))
+-   Autocomplete: Refactor to TypeScript. ([47751](https://github.com/WordPress/gutenberg/pull/47751))
+-   Navigation: Refactor to TypeScript. ([48742](https://github.com/WordPress/gutenberg/pull/48742))
+-   SelectControl: Improve prop types for single vs multiple selection. ([47390](https://github.com/WordPress/gutenberg/pull/47390))
+-   `DimensionControl(Experimental)`: Refactor to TypeScript. ([47351](https://github.com/WordPress/gutenberg/pull/47351))
+-   `Guide`: Refactor to TypeScript. ([47493](https://github.com/WordPress/gutenberg/pull/47493))
+-   `Icon`: Refactor tests to TypeScript. ([49066](https://github.com/WordPress/gutenberg/pull/49066))
+-   `PaletteEdit`: Refactor away from `lodash.kebabCase`. ([48637](https://github.com/WordPress/gutenberg/pull/48637))
+-   `QueryControls`: Refactor away from `lodash.groupBy`. ([48779](https://github.com/WordPress/gutenberg/pull/48779))
+-   components/utils/font: Refactor away from lodash `.get`. ([48629](https://github.com/WordPress/gutenberg/pull/48629))
+-   remove lodash from `context/getStyledClassName`:. ([48688](https://github.com/WordPress/gutenberg/pull/48688))
+-   withSpokenMessages: Change js files to typescript. ([48163](https://github.com/WordPress/gutenberg/pull/48163))
 
 #### Block Library
 
-- Add Nav block files to those triggering error for exhaustive deps. ([48821](https://github.com/WordPress/gutenberg/pull/48821))
-- Fix Nav block exhaustive deps warnings. ([48680](https://github.com/WordPress/gutenberg/pull/48680))
-- Media Text: Refactored constants to it's designated file. ([48480](https://github.com/WordPress/gutenberg/pull/48480))
-- Navigation: Simplify the method for finding the fallback menu. ([48916](https://github.com/WordPress/gutenberg/pull/48916))
-- Duotone.php code cleanup. ([48607](https://github.com/WordPress/gutenberg/pull/48607))
-- Revert "Duotone: Limit SVG filter output to used filters". ([49102](https://github.com/WordPress/gutenberg/pull/49102))
+-   Add Nav block files to those triggering error for exhaustive deps. ([48821](https://github.com/WordPress/gutenberg/pull/48821))
+-   Fix Nav block exhaustive deps warnings. ([48680](https://github.com/WordPress/gutenberg/pull/48680))
+-   Media Text: Refactored constants to it's designated file. ([48480](https://github.com/WordPress/gutenberg/pull/48480))
+-   Navigation: Simplify the method for finding the fallback menu. ([48916](https://github.com/WordPress/gutenberg/pull/48916))
+-   Duotone.php code cleanup. ([48607](https://github.com/WordPress/gutenberg/pull/48607))
+-   Revert "Duotone: Limit SVG filter output to used filters". ([49102](https://github.com/WordPress/gutenberg/pull/49102))
 
 #### Block Editor
 
-- Inserter: Remove outer scope values dependencies. ([48961](https://github.com/WordPress/gutenberg/pull/48961))
-- Inserter: Remove unnecessary dependency 'delayedFilterValue'. ([48960](https://github.com/WordPress/gutenberg/pull/48960))
-- Remove unused CSS from LinkControl Apply button. ([48431](https://github.com/WordPress/gutenberg/pull/48431))
-- Custom Classname block support: Update code comments to remove reference to anchor id. ([48709](https://github.com/WordPress/gutenberg/pull/48709))
-- List View: Remove unused selector from the 'useBlockSelection' hook. ([48984](https://github.com/WordPress/gutenberg/pull/48984))
-- Renames parent selection boolean param and improves documentation. ([48677](https://github.com/WordPress/gutenberg/pull/48677))
-- Tests: Cleanup unnecessary jest timers setup. ([49030](https://github.com/WordPress/gutenberg/pull/49030))
-- Avoid declaring a function inside another function. ([49049](https://github.com/WordPress/gutenberg/pull/49049))
+-   Inserter: Remove outer scope values dependencies. ([48961](https://github.com/WordPress/gutenberg/pull/48961))
+-   Inserter: Remove unnecessary dependency 'delayedFilterValue'. ([48960](https://github.com/WordPress/gutenberg/pull/48960))
+-   Remove unused CSS from LinkControl Apply button. ([48431](https://github.com/WordPress/gutenberg/pull/48431))
+-   Custom Classname block support: Update code comments to remove reference to anchor id. ([48709](https://github.com/WordPress/gutenberg/pull/48709))
+-   List View: Remove unused selector from the 'useBlockSelection' hook. ([48984](https://github.com/WordPress/gutenberg/pull/48984))
+-   Renames parent selection boolean param and improves documentation. ([48677](https://github.com/WordPress/gutenberg/pull/48677))
+-   Tests: Cleanup unnecessary jest timers setup. ([49030](https://github.com/WordPress/gutenberg/pull/49030))
+-   Avoid declaring a function inside another function. ([49049](https://github.com/WordPress/gutenberg/pull/49049))
 
 #### Global Styles
 
-- Theme JSON: Clarify status of fixed position opt-in in appearance tools. ([48660](https://github.com/WordPress/gutenberg/pull/48660))
-- Extract a BorderPanel component as a reusable component between Global Styles and Block Inspector. ([48636](https://github.com/WordPress/gutenberg/pull/48636))
+-   Theme JSON: Clarify status of fixed position opt-in in appearance tools. ([48660](https://github.com/WordPress/gutenberg/pull/48660))
+-   Extract a BorderPanel component as a reusable component between Global Styles and Block Inspector. ([48636](https://github.com/WordPress/gutenberg/pull/48636))
 
 #### Data Layer
 
-- Data: Use real timers for private APIs tests. ([49029](https://github.com/WordPress/gutenberg/pull/49029))
+-   Data: Use real timers for private APIs tests. ([49029](https://github.com/WordPress/gutenberg/pull/49029))
 
 #### Packages
 
-- Preferences: Remove `types` field from `package.json`. ([49053](https://github.com/WordPress/gutenberg/pull/49053))
-- Upgrade `typescript` to 4.9.5. ([48299](https://github.com/WordPress/gutenberg/pull/48299))
-- Compose: Remove useAsyncList from mobile exports. ([48241](https://github.com/WordPress/gutenberg/pull/48241))
-- Animation: Refactor to TypeScript. ([47042](https://github.com/WordPress/gutenberg/pull/47042))
-- PanelBody: Convert to TypeScript. ([47702](https://github.com/WordPress/gutenberg/pull/47702))
-- Refactor ToolbarContext to TS. ([49002](https://github.com/WordPress/gutenberg/pull/49002))
-- Refactor/toolbar button component to typescript. ([47750](https://github.com/WordPress/gutenberg/pull/47750))
-- `PaletteEdit`: Convert to TypeScript. ([47764](https://github.com/WordPress/gutenberg/pull/47764))
-- navigateRegions: Convert to TypeScript. ([48632](https://github.com/WordPress/gutenberg/pull/48632))
-- withFallbackStyles: Convert to TypeScript. ([48720](https://github.com/WordPress/gutenberg/pull/48720))
-- withFilters: Convert to TypeScript. ([48721](https://github.com/WordPress/gutenberg/pull/48721))
-- withFocusReturn: Convert to TypeScript. ([48748](https://github.com/WordPress/gutenberg/pull/48748))
-- withNotices: Convert to TypeScript. ([49088](https://github.com/WordPress/gutenberg/pull/49088))
-- Packages: Remove completely two deprecated webpack plugins. ([48770](https://github.com/WordPress/gutenberg/pull/48770))
+-   Preferences: Remove `types` field from `package.json`. ([49053](https://github.com/WordPress/gutenberg/pull/49053))
+-   Upgrade `typescript` to 4.9.5. ([48299](https://github.com/WordPress/gutenberg/pull/48299))
+-   Compose: Remove useAsyncList from mobile exports. ([48241](https://github.com/WordPress/gutenberg/pull/48241))
+-   Animation: Refactor to TypeScript. ([47042](https://github.com/WordPress/gutenberg/pull/47042))
+-   PanelBody: Convert to TypeScript. ([47702](https://github.com/WordPress/gutenberg/pull/47702))
+-   Refactor ToolbarContext to TS. ([49002](https://github.com/WordPress/gutenberg/pull/49002))
+-   Refactor/toolbar button component to typescript. ([47750](https://github.com/WordPress/gutenberg/pull/47750))
+-   `PaletteEdit`: Convert to TypeScript. ([47764](https://github.com/WordPress/gutenberg/pull/47764))
+-   navigateRegions: Convert to TypeScript. ([48632](https://github.com/WordPress/gutenberg/pull/48632))
+-   withFallbackStyles: Convert to TypeScript. ([48720](https://github.com/WordPress/gutenberg/pull/48720))
+-   withFilters: Convert to TypeScript. ([48721](https://github.com/WordPress/gutenberg/pull/48721))
+-   withFocusReturn: Convert to TypeScript. ([48748](https://github.com/WordPress/gutenberg/pull/48748))
+-   withNotices: Convert to TypeScript. ([49088](https://github.com/WordPress/gutenberg/pull/49088))
+-   Packages: Remove completely two deprecated webpack plugins. ([48770](https://github.com/WordPress/gutenberg/pull/48770))
 
 ### Tools
 
-- Env: Fix typo / grammar README.md. ([48952](https://github.com/WordPress/gutenberg/pull/48952))
-- ci: Add Rich Text code owner. ([48727](https://github.com/WordPress/gutenberg/pull/48727))
+-   Env: Fix typo / grammar README.md. ([48952](https://github.com/WordPress/gutenberg/pull/48952))
+-   ci: Add Rich Text code owner. ([48727](https://github.com/WordPress/gutenberg/pull/48727))
 
 #### Testing
 
-- Add `pageUtils.pressKeys` to playwright utils. ([49009](https://github.com/WordPress/gutenberg/pull/49009))
-- Add artifacts upload for the performance tests. ([48243](https://github.com/WordPress/gutenberg/pull/48243))
-- Fix flaky block hierarchy navigation test by better inserter selection. ([48780](https://github.com/WordPress/gutenberg/pull/48780))
-- Migrate multi-block selection end-to-end tests to Playwright. ([48035](https://github.com/WordPress/gutenberg/pull/48035))
-- Navigation block end-to-end tests: Default to my most recently created menu. ([48132](https://github.com/WordPress/gutenberg/pull/48132))
-- Upgrade Jest from 27 to 29.5.0. ([47388](https://github.com/WordPress/gutenberg/pull/47388))
-- Duotone: Style Engine: Add unit test and associated refactoring. ([49033](https://github.com/WordPress/gutenberg/pull/49033))
-- Query Block: Add tests for `getValueFromObjectPath()` util. ([48956](https://github.com/WordPress/gutenberg/pull/48956))
+-   Add `pageUtils.pressKeys` to playwright utils. ([49009](https://github.com/WordPress/gutenberg/pull/49009))
+-   Add artifacts upload for the performance tests. ([48243](https://github.com/WordPress/gutenberg/pull/48243))
+-   Fix flaky block hierarchy navigation test by better inserter selection. ([48780](https://github.com/WordPress/gutenberg/pull/48780))
+-   Migrate multi-block selection end-to-end tests to Playwright. ([48035](https://github.com/WordPress/gutenberg/pull/48035))
+-   Navigation block end-to-end tests: Default to my most recently created menu. ([48132](https://github.com/WordPress/gutenberg/pull/48132))
+-   Upgrade Jest from 27 to 29.5.0. ([47388](https://github.com/WordPress/gutenberg/pull/47388))
+-   Duotone: Style Engine: Add unit test and associated refactoring. ([49033](https://github.com/WordPress/gutenberg/pull/49033))
+-   Query Block: Add tests for `getValueFromObjectPath()` util. ([48956](https://github.com/WordPress/gutenberg/pull/48956))
 
-## First time contributors
-
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @anver: Env: Fix typo / grammar README.md. ([48952](https://github.com/WordPress/gutenberg/pull/48952))
-- @bhavz-10: withSpokenMessages: Change js files to typescript. ([48163](https://github.com/WordPress/gutenberg/pull/48163))
-- @krishneup: Update missing translation from label. ([48760](https://github.com/WordPress/gutenberg/pull/48760))
-- @mike-day: Refactor/toolbar button component to typescript. ([47750](https://github.com/WordPress/gutenberg/pull/47750))
-- @shvlv: FormTokenField: Hide suggestions list on blur event if input value is invalid. ([48785](https://github.com/WordPress/gutenberg/pull/48785))
-- @TylerB24890: Embed Block: Fix Aspect Ratio Classes #29641. ([41141](https://github.com/WordPress/gutenberg/pull/41141))
+The following PRs were merged by first-time contributors:
 
+-   @anver: Env: Fix typo / grammar README.md. ([48952](https://github.com/WordPress/gutenberg/pull/48952))
+-   @bhavz-10: withSpokenMessages: Change js files to typescript. ([48163](https://github.com/WordPress/gutenberg/pull/48163))
+-   @krishneup: Update missing translation from label. ([48760](https://github.com/WordPress/gutenberg/pull/48760))
+-   @mike-day: Refactor/toolbar button component to typescript. ([47750](https://github.com/WordPress/gutenberg/pull/47750))
+-   @shvlv: FormTokenField: Hide suggestions list on blur event if input value is invalid. ([48785](https://github.com/WordPress/gutenberg/pull/48785))
+-   @TylerB24890: Embed Block: Fix Aspect Ratio Classes #29641. ([41141](https://github.com/WordPress/gutenberg/pull/41141))
 
 ## Contributors
 
@@ -6722,224 +17801,238 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @ajlende @andrewserong @anver @aristath @bhavz-10 @brookewp @chad1008 @ciampo @DaisyOlsen @dcalhoun @draganescu @ellatrix @fabiankaegy @felixarntz @flootr @fluiddot @geriux @getdave @glendaviesnz @gvgvgvijayan @gziolo @hideokamoto @jameskoster @jasmussen @jeryj @jorgefilipecosta @jsnajdr @kevin940726 @kienstra @krishneup @MaggieCabrera @Mamaduka @mburridge @mike-day @mirka @mtias @ndiego @ntsekouras @oandregal @Rahmon @richtabor @ryanwelcher @SavPhill @scruffian @shvlv @SiobhyB @swissspidy @t-hamano @talldan @tellthemachines @tomdevisser @TylerB24890 @tyxla @WunderBart @youknowriad
 
-
 = 15.3.1 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
 #### Site Editor
-- Refactor the site editor URLs for better backward compatibility. ([48063](https://github.com/WordPress/gutenberg/pull/48063))
-- Remove TemplateAreas from template details. ([48490](https://github.com/WordPress/gutenberg/pull/48490))
-- Update the edit button. ([48584](https://github.com/WordPress/gutenberg/pull/48584))
-- Change "Browse all templates" to "Manage all templates" in template details popover. ([48496](https://github.com/WordPress/gutenberg/pull/48496))
-- Match color of the focus template view with site dark material. ([48430](https://github.com/WordPress/gutenberg/pull/48430))
-- Polish add template modal style. ([48445](https://github.com/WordPress/gutenberg/pull/48445))
-- Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
-- Extract a DimensionsPanel component as a reusable component between Global Styles and Block Inspector. ([48070](https://github.com/WordPress/gutenberg/pull/48070))
-- Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
-
-#### Block Editor
-- Apply keyboard shortcut conversions between paragraphs and headings to all editor instances. ([47972](https://github.com/WordPress/gutenberg/pull/47972))
-- Create automatic change higher order reducer. ([48312](https://github.com/WordPress/gutenberg/pull/48312))
-- [Inserter]: Preload media categories empty check - client side. ([47503](https://github.com/WordPress/gutenberg/pull/47503))
-
-#### Post Editor 
-- Revert iframed editor for WP core only. ([48076](https://github.com/WordPress/gutenberg/pull/48076))
-- PageAttributesCheck: Return boolean value directly from the selector. ([48336](https://github.com/WordPress/gutenberg/pull/48336))
-- Apply busy status to the publish button in progress and unify button width. ([48444](https://github.com/WordPress/gutenberg/pull/48444))
-
-#### Block Library
-- Add all allowed innerblocks to the inspector animation experiment. ([47834](https://github.com/WordPress/gutenberg/pull/47834))
-- Make the Site Logo block placeholder state smaller. ([48218](https://github.com/WordPress/gutenberg/pull/48218))
-- ToggleControl: Remove margin overrides and add opt-in prop. ([47866](https://github.com/WordPress/gutenberg/pull/47866))
-- Post Terms block: Add transforms for variations. ([48328](https://github.com/WordPress/gutenberg/pull/48328))
-- List block: Add Firefox end-to-end tests. ([48271](https://github.com/WordPress/gutenberg/pull/48271))
-- Navigation List View: Add block movers to the more menu. ([48099](https://github.com/WordPress/gutenberg/pull/48099))
-- Navigation: Always create a fallback menu. ([47684](https://github.com/WordPress/gutenberg/pull/47684))
-- Navigation: Don't create a fallback navigation menu if there are inner blocks. ([48585](https://github.com/WordPress/gutenberg/pull/48585))
-- Navigation: Don't create duplicate navigation menus. ([48599](https://github.com/WordPress/gutenberg/pull/48599))
-- Navigation: Update the dependencies for the useEffect that handles notifications. ([48066](https://github.com/WordPress/gutenberg/pull/48066))
-- Navigation: Wrap the dependent functions in useCallback. ([48195](https://github.com/WordPress/gutenberg/pull/48195))
-- Page List: Move the modal to its own file. ([47922](https://github.com/WordPress/gutenberg/pull/47922))
-- [New Block] Add post time to read block. ([43403](https://github.com/WordPress/gutenberg/pull/43403))
-- Classic Block: Replace the deprecated `isPrimary` prop with `variant`. ([48230](https://github.com/WordPress/gutenberg/pull/48230))
-- Refactor core blocks to use HTML Tag Processor. ([43178](https://github.com/WordPress/gutenberg/pull/43178))
+
+-   Refactor the site editor URLs for better backward compatibility. ([48063](https://github.com/WordPress/gutenberg/pull/48063))
+-   Remove TemplateAreas from template details. ([48490](https://github.com/WordPress/gutenberg/pull/48490))
+-   Update the edit button. ([48584](https://github.com/WordPress/gutenberg/pull/48584))
+-   Change "Browse all templates" to "Manage all templates" in template details popover. ([48496](https://github.com/WordPress/gutenberg/pull/48496))
+-   Match color of the focus template view with site dark material. ([48430](https://github.com/WordPress/gutenberg/pull/48430))
+-   Polish add template modal style. ([48445](https://github.com/WordPress/gutenberg/pull/48445))
+-   Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
+-   Extract a DimensionsPanel component as a reusable component between Global Styles and Block Inspector. ([48070](https://github.com/WordPress/gutenberg/pull/48070))
+-   Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
+
+#### Block Editor
+
+-   Apply keyboard shortcut conversions between paragraphs and headings to all editor instances. ([47972](https://github.com/WordPress/gutenberg/pull/47972))
+-   Create automatic change higher order reducer. ([48312](https://github.com/WordPress/gutenberg/pull/48312))
+-   [Inserter]: Preload media categories empty check - client side. ([47503](https://github.com/WordPress/gutenberg/pull/47503))
+
+#### Post Editor
+
+-   Revert iframed editor for WP core only. ([48076](https://github.com/WordPress/gutenberg/pull/48076))
+-   PageAttributesCheck: Return boolean value directly from the selector. ([48336](https://github.com/WordPress/gutenberg/pull/48336))
+-   Apply busy status to the publish button in progress and unify button width. ([48444](https://github.com/WordPress/gutenberg/pull/48444))
+
+#### Block Library
+
+-   Add all allowed innerblocks to the inspector animation experiment. ([47834](https://github.com/WordPress/gutenberg/pull/47834))
+-   Make the Site Logo block placeholder state smaller. ([48218](https://github.com/WordPress/gutenberg/pull/48218))
+-   ToggleControl: Remove margin overrides and add opt-in prop. ([47866](https://github.com/WordPress/gutenberg/pull/47866))
+-   Post Terms block: Add transforms for variations. ([48328](https://github.com/WordPress/gutenberg/pull/48328))
+-   List block: Add Firefox end-to-end tests. ([48271](https://github.com/WordPress/gutenberg/pull/48271))
+-   Navigation List View: Add block movers to the more menu. ([48099](https://github.com/WordPress/gutenberg/pull/48099))
+-   Navigation: Always create a fallback menu. ([47684](https://github.com/WordPress/gutenberg/pull/47684))
+-   Navigation: Don't create a fallback navigation menu if there are inner blocks. ([48585](https://github.com/WordPress/gutenberg/pull/48585))
+-   Navigation: Don't create duplicate navigation menus. ([48599](https://github.com/WordPress/gutenberg/pull/48599))
+-   Navigation: Update the dependencies for the useEffect that handles notifications. ([48066](https://github.com/WordPress/gutenberg/pull/48066))
+-   Navigation: Wrap the dependent functions in useCallback. ([48195](https://github.com/WordPress/gutenberg/pull/48195))
+-   Page List: Move the modal to its own file. ([47922](https://github.com/WordPress/gutenberg/pull/47922))
+-   [New Block] Add post time to read block. ([43403](https://github.com/WordPress/gutenberg/pull/43403))
+-   Classic Block: Replace the deprecated `isPrimary` prop with `variant`. ([48230](https://github.com/WordPress/gutenberg/pull/48230))
+-   Refactor core blocks to use HTML Tag Processor. ([43178](https://github.com/WordPress/gutenberg/pull/43178))
 
 #### Block API
-- HTML Tag Processor: Add WP 6.3 compat layer. ([47933](https://github.com/WordPress/gutenberg/pull/47933))
-- Tag Processor: Add bookmark invalidation logic. ([47559](https://github.com/WordPress/gutenberg/pull/47559))
+
+-   HTML Tag Processor: Add WP 6.3 compat layer. ([47933](https://github.com/WordPress/gutenberg/pull/47933))
+-   Tag Processor: Add bookmark invalidation logic. ([47559](https://github.com/WordPress/gutenberg/pull/47559))
 
 #### Design Tools
-- Duotone: Use the style engine to generate CSS for Duotone. ([48281](https://github.com/WordPress/gutenberg/pull/48281))
-- Duotone: Add Global Styles controls for blocks that support duotone. ([48255](https://github.com/WordPress/gutenberg/pull/48255))
-- Use Duotone presets in block duotone attributes. ([48318](https://github.com/WordPress/gutenberg/pull/48318))
-- Duotone: Use CSS variables instead of slugs in block attributes. ([48426](https://github.com/WordPress/gutenberg/pull/48426))
-- Border Panel: Add missing dep for `onBorderChange` callback. ([48010](https://github.com/WordPress/gutenberg/pull/48010))
-- Disable layout toolbar controls for content locked blocks. ([47939](https://github.com/WordPress/gutenberg/pull/47939))
-- SpacingSizesControl: Fix white dot on thumb. ([48574](https://github.com/WordPress/gutenberg/pull/48574))
+
+-   Duotone: Use the style engine to generate CSS for Duotone. ([48281](https://github.com/WordPress/gutenberg/pull/48281))
+-   Duotone: Add Global Styles controls for blocks that support duotone. ([48255](https://github.com/WordPress/gutenberg/pull/48255))
+-   Use Duotone presets in block duotone attributes. ([48318](https://github.com/WordPress/gutenberg/pull/48318))
+-   Duotone: Use CSS variables instead of slugs in block attributes. ([48426](https://github.com/WordPress/gutenberg/pull/48426))
+-   Border Panel: Add missing dep for `onBorderChange` callback. ([48010](https://github.com/WordPress/gutenberg/pull/48010))
+-   Disable layout toolbar controls for content locked blocks. ([47939](https://github.com/WordPress/gutenberg/pull/47939))
+-   SpacingSizesControl: Fix white dot on thumb. ([48574](https://github.com/WordPress/gutenberg/pull/48574))
 
 #### List View
-- Scroll selected block into view when single block selection changes. ([46895](https://github.com/WordPress/gutenberg/pull/46895))
+
+-   Scroll selected block into view when single block selection changes. ([46895](https://github.com/WordPress/gutenberg/pull/46895))
 
 #### Components
-- TabPanel: Refactor unit tests in prep for controlled component updates. ([48086](https://github.com/WordPress/gutenberg/pull/48086))
-- Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
-- CircularOptionPicker: Refactor to TypeScript. ([47937](https://github.com/WordPress/gutenberg/pull/47937))
-- Extract delete handler to hook for RichText. ([48273](https://github.com/WordPress/gutenberg/pull/48273))
-- ToolsPanel: Remove unnecessary dep from resetAll callback. ([48011](https://github.com/WordPress/gutenberg/pull/48011))
-- Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
-- Pin `floating-ui/react-dom` version. ([48402](https://github.com/WordPress/gutenberg/pull/48402))
-- Use React 18 rendering for import dropdown. ([48244](https://github.com/WordPress/gutenberg/pull/48244))
+
+-   TabPanel: Refactor unit tests in prep for controlled component updates. ([48086](https://github.com/WordPress/gutenberg/pull/48086))
+-   Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
+-   CircularOptionPicker: Refactor to TypeScript. ([47937](https://github.com/WordPress/gutenberg/pull/47937))
+-   Extract delete handler to hook for RichText. ([48273](https://github.com/WordPress/gutenberg/pull/48273))
+-   ToolsPanel: Remove unnecessary dep from resetAll callback. ([48011](https://github.com/WordPress/gutenberg/pull/48011))
+-   Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
+-   Pin `floating-ui/react-dom` version. ([48402](https://github.com/WordPress/gutenberg/pull/48402))
+-   Use React 18 rendering for import dropdown. ([48244](https://github.com/WordPress/gutenberg/pull/48244))
 
 ### Bug Fixes
 
 #### Site Editor
-- Fix Site Editor perf tests. ([48240](https://github.com/WordPress/gutenberg/pull/48240))
-- Fix routing for Classic themes using block-based template parts. ([48343](https://github.com/WordPress/gutenberg/pull/48343))
-- Fix the 'Browse all' link in the template details modal. ([48301](https://github.com/WordPress/gutenberg/pull/48301))
-- Fix the site editor home page loading when installed in a subdirectory. ([48363](https://github.com/WordPress/gutenberg/pull/48363))
-- Fix the tooltip and shortcut for the global save button. ([48282](https://github.com/WordPress/gutenberg/pull/48282))
-- Prevent distracting focused back button on site editor load. ([48472](https://github.com/WordPress/gutenberg/pull/48472))
-- Sort templates and template parts by slug. ([48473](https://github.com/WordPress/gutenberg/pull/48473))
-- Specify focus state color for template navigation button. ([48134](https://github.com/WordPress/gutenberg/pull/48134))
-- [Site Editor]: Set `html` block as freeform fallback block. ([48129](https://github.com/WordPress/gutenberg/pull/48129))
-- Remove broken site editor redirect. ([48283](https://github.com/WordPress/gutenberg/pull/48283))
-- Fix: Inserter does not appear on sidebar navigation. ([48623](https://github.com/WordPress/gutenberg/pull/48623))
-- Fix: Make navigation page list load its items on navigation sidebar. ([47853](https://github.com/WordPress/gutenberg/pull/47853))
-- Revert Site Tagline placeholder attribute, move example to block.json. ([48383](https://github.com/WordPress/gutenberg/pull/48383))
-
-#### Block Editor
-- MediaReplaceFlow: Fix styling for LinkControl. ([47949](https://github.com/WordPress/gutenberg/pull/47949))
-- Fix "Reset All" button in the typography panel of the block inspector. ([48123](https://github.com/WordPress/gutenberg/pull/48123))
-- [Inserter - Media tab]: Upload Openverse images when inserted. ([48501](https://github.com/WordPress/gutenberg/pull/48501))
-- Block alignment controls: Don't remount the block when alignments change. ([48209](https://github.com/WordPress/gutenberg/pull/48209))
-- Pin `valtio` version. ([48237](https://github.com/WordPress/gutenberg/pull/48237))
-- Fix block style preview flickering when a 'style' is focused. ([48418](https://github.com/WordPress/gutenberg/pull/48418))
-- Enable access to block settings within UBE. ([48435](https://github.com/WordPress/gutenberg/pull/48435))
-- Fix: Content only CPT template locking. ([48434](https://github.com/WordPress/gutenberg/pull/48434))
-- Firefox: Fix input rules (React async state issue). ([48210](https://github.com/WordPress/gutenberg/pull/48210))
-- Fix: Multiple overwrites on rest_controller_class for wp_template/wp_template_part. ([48078](https://github.com/WordPress/gutenberg/pull/48078))
-- Select blocks in `outline` list. ([48118](https://github.com/WordPress/gutenberg/pull/48118))
-- Only add layout classes to inner wrapper if block is a container. ([48611](https://github.com/WordPress/gutenberg/pull/48611))
+
+-   Fix Site Editor perf tests. ([48240](https://github.com/WordPress/gutenberg/pull/48240))
+-   Fix routing for Classic themes using block-based template parts. ([48343](https://github.com/WordPress/gutenberg/pull/48343))
+-   Fix the 'Browse all' link in the template details modal. ([48301](https://github.com/WordPress/gutenberg/pull/48301))
+-   Fix the site editor home page loading when installed in a subdirectory. ([48363](https://github.com/WordPress/gutenberg/pull/48363))
+-   Fix the tooltip and shortcut for the global save button. ([48282](https://github.com/WordPress/gutenberg/pull/48282))
+-   Prevent distracting focused back button on site editor load. ([48472](https://github.com/WordPress/gutenberg/pull/48472))
+-   Sort templates and template parts by slug. ([48473](https://github.com/WordPress/gutenberg/pull/48473))
+-   Specify focus state color for template navigation button. ([48134](https://github.com/WordPress/gutenberg/pull/48134))
+-   [Site Editor]: Set `html` block as freeform fallback block. ([48129](https://github.com/WordPress/gutenberg/pull/48129))
+-   Remove broken site editor redirect. ([48283](https://github.com/WordPress/gutenberg/pull/48283))
+-   Fix: Inserter does not appear on sidebar navigation. ([48623](https://github.com/WordPress/gutenberg/pull/48623))
+-   Fix: Make navigation page list load its items on navigation sidebar. ([47853](https://github.com/WordPress/gutenberg/pull/47853))
+-   Revert Site Tagline placeholder attribute, move example to block.json. ([48383](https://github.com/WordPress/gutenberg/pull/48383))
+
+#### Block Editor
+
+-   MediaReplaceFlow: Fix styling for LinkControl. ([47949](https://github.com/WordPress/gutenberg/pull/47949))
+-   Fix "Reset All" button in the typography panel of the block inspector. ([48123](https://github.com/WordPress/gutenberg/pull/48123))
+-   [Inserter - Media tab]: Upload Openverse images when inserted. ([48501](https://github.com/WordPress/gutenberg/pull/48501))
+-   Block alignment controls: Don't remount the block when alignments change. ([48209](https://github.com/WordPress/gutenberg/pull/48209))
+-   Pin `valtio` version. ([48237](https://github.com/WordPress/gutenberg/pull/48237))
+-   Fix block style preview flickering when a 'style' is focused. ([48418](https://github.com/WordPress/gutenberg/pull/48418))
+-   Enable access to block settings within UBE. ([48435](https://github.com/WordPress/gutenberg/pull/48435))
+-   Fix: Content only CPT template locking. ([48434](https://github.com/WordPress/gutenberg/pull/48434))
+-   Firefox: Fix input rules (React async state issue). ([48210](https://github.com/WordPress/gutenberg/pull/48210))
+-   Fix: Multiple overwrites on rest_controller_class for wp_template/wp_template_part. ([48078](https://github.com/WordPress/gutenberg/pull/48078))
+-   Select blocks in `outline` list. ([48118](https://github.com/WordPress/gutenberg/pull/48118))
+-   Only add layout classes to inner wrapper if block is a container. ([48611](https://github.com/WordPress/gutenberg/pull/48611))
 
 #### Widgets Editor
-- Widget Editor: Fix a problem with 'Move to Widget Area' button not working. ([48233](https://github.com/WordPress/gutenberg/pull/48233))
-
-#### Block Library
-- Add support for orientation-based block movers to core/social-links. ([48452](https://github.com/WordPress/gutenberg/pull/48452))
-- Fix Post Excerpt: Read more link is always on new line in the editor. ([47772](https://github.com/WordPress/gutenberg/pull/47772))
-- Fix: OffCanvasEditor does not inserts submenu on collapsed items. ([48214](https://github.com/WordPress/gutenberg/pull/48214))
-- List Item: Avoid an error when the 'onReplace' prop is undefined. ([48639](https://github.com/WordPress/gutenberg/pull/48639))
-- Add missing code on the fix page list loading PR. ([48621](https://github.com/WordPress/gutenberg/pull/48621))
-- Prevent text decoration from showing up in all blocks. ([48117](https://github.com/WordPress/gutenberg/pull/48117))
-- Widget Importer: Don't render controls when there's nothing to import. ([48396](https://github.com/WordPress/gutenberg/pull/48396))
-- [Query Loop] Fix top border in pattern selection modal. ([48303](https://github.com/WordPress/gutenberg/pull/48303))
-- [Query Loop] Sync `gutenberg_build_query_vars_from_query_block` with core. ([48640](https://github.com/WordPress/gutenberg/pull/48640))
-- Avatar: Clean up border application in editor. ([48024](https://github.com/WordPress/gutenberg/pull/48024))
-
-#### Global Styles
-- Fix for `WP_Theme_JSON_Resolver_Gutenberg::Get_merged_data`. ([48644](https://github.com/WordPress/gutenberg/pull/48644))
-- Display preset names via the tooltip. ([48304](https://github.com/WordPress/gutenberg/pull/48304))
-- Fix typo in valid settings for fluid typography. ([48605](https://github.com/WordPress/gutenberg/pull/48605))
-- Prevent the global styles previews thumbnails from resizing on load. ([48474](https://github.com/WordPress/gutenberg/pull/48474))
-- Site Tagline: Add example so that it will display in style book. ([48300](https://github.com/WordPress/gutenberg/pull/48300))
-- Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
-- Update code position for constants and methods in `WP_Theme_JSON_Gutenberg` class. ([48631](https://github.com/WordPress/gutenberg/pull/48631))
-- `WP_Theme_JSON_Gutenberg`: Update comments to be aligned with core, so backports are easier. ([48624](https://github.com/WordPress/gutenberg/pull/48624))
+
+-   Widget Editor: Fix a problem with 'Move to Widget Area' button not working. ([48233](https://github.com/WordPress/gutenberg/pull/48233))
+
+#### Block Library
+
+-   Add support for orientation-based block movers to core/social-links. ([48452](https://github.com/WordPress/gutenberg/pull/48452))
+-   Fix Post Excerpt: Read more link is always on new line in the editor. ([47772](https://github.com/WordPress/gutenberg/pull/47772))
+-   Fix: OffCanvasEditor does not inserts submenu on collapsed items. ([48214](https://github.com/WordPress/gutenberg/pull/48214))
+-   List Item: Avoid an error when the 'onReplace' prop is undefined. ([48639](https://github.com/WordPress/gutenberg/pull/48639))
+-   Add missing code on the fix page list loading PR. ([48621](https://github.com/WordPress/gutenberg/pull/48621))
+-   Prevent text decoration from showing up in all blocks. ([48117](https://github.com/WordPress/gutenberg/pull/48117))
+-   Widget Importer: Don't render controls when there's nothing to import. ([48396](https://github.com/WordPress/gutenberg/pull/48396))
+-   [Query Loop] Fix top border in pattern selection modal. ([48303](https://github.com/WordPress/gutenberg/pull/48303))
+-   [Query Loop] Sync `gutenberg_build_query_vars_from_query_block` with core. ([48640](https://github.com/WordPress/gutenberg/pull/48640))
+-   Avatar: Clean up border application in editor. ([48024](https://github.com/WordPress/gutenberg/pull/48024))
+
+#### Global Styles
+
+-   Fix for `WP_Theme_JSON_Resolver_Gutenberg::Get_merged_data`. ([48644](https://github.com/WordPress/gutenberg/pull/48644))
+-   Display preset names via the tooltip. ([48304](https://github.com/WordPress/gutenberg/pull/48304))
+-   Fix typo in valid settings for fluid typography. ([48605](https://github.com/WordPress/gutenberg/pull/48605))
+-   Prevent the global styles previews thumbnails from resizing on load. ([48474](https://github.com/WordPress/gutenberg/pull/48474))
+-   Site Tagline: Add example so that it will display in style book. ([48300](https://github.com/WordPress/gutenberg/pull/48300))
+-   Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
+-   Update code position for constants and methods in `WP_Theme_JSON_Gutenberg` class. ([48631](https://github.com/WordPress/gutenberg/pull/48631))
+-   `WP_Theme_JSON_Gutenberg`: Update comments to be aligned with core, so backports are easier. ([48624](https://github.com/WordPress/gutenberg/pull/48624))
 
 ### Accessibility
-- Autocomplete: Duplicate list within iframe for non visual users. ([47907](https://github.com/WordPress/gutenberg/pull/47907))
-- Fix site editor switch mode message. ([48136](https://github.com/WordPress/gutenberg/pull/48136))
-- Fix the Publish region position and focus style. ([48102](https://github.com/WordPress/gutenberg/pull/48102))
-- Focus 1st parent block on block remove, if no previous block is available. ([48204](https://github.com/WordPress/gutenberg/pull/48204))
-- List view: Allow selected block to override roving tabindex. ([48339](https://github.com/WordPress/gutenberg/pull/48339))
-- Style Book: Allow button text labels for style book icon. ([48088](https://github.com/WordPress/gutenberg/pull/48088))
-- Style Book: Focus the Style Book when opened, and enable ESCAPE key to close. ([48151](https://github.com/WordPress/gutenberg/pull/48151))
-- Try to fix a11y test flakiness. ([48236](https://github.com/WordPress/gutenberg/pull/48236))
-- Make the template customized info accessible. ([48159](https://github.com/WordPress/gutenberg/pull/48159))
 
+-   Autocomplete: Duplicate list within iframe for non visual users. ([47907](https://github.com/WordPress/gutenberg/pull/47907))
+-   Fix site editor switch mode message. ([48136](https://github.com/WordPress/gutenberg/pull/48136))
+-   Fix the Publish region position and focus style. ([48102](https://github.com/WordPress/gutenberg/pull/48102))
+-   Focus 1st parent block on block remove, if no previous block is available. ([48204](https://github.com/WordPress/gutenberg/pull/48204))
+-   List view: Allow selected block to override roving tabindex. ([48339](https://github.com/WordPress/gutenberg/pull/48339))
+-   Style Book: Allow button text labels for style book icon. ([48088](https://github.com/WordPress/gutenberg/pull/48088))
+-   Style Book: Focus the Style Book when opened, and enable ESCAPE key to close. ([48151](https://github.com/WordPress/gutenberg/pull/48151))
+-   Try to fix a11y test flakiness. ([48236](https://github.com/WordPress/gutenberg/pull/48236))
+-   Make the template customized info accessible. ([48159](https://github.com/WordPress/gutenberg/pull/48159))
 
 ### Performance
 
-#### Block Editor 
-- Block Editor: Improve empty `getBlockParents()` perf. ([48242](https://github.com/WordPress/gutenberg/pull/48242))
-- Fix perf regression in duotone hooks. ([48401](https://github.com/WordPress/gutenberg/pull/48401))
-- Writing flow: Avoid recalc style on every selection change. ([48409](https://github.com/WordPress/gutenberg/pull/48409))
-- useAsyncList: Flush state updates when processing queue. ([48238](https://github.com/WordPress/gutenberg/pull/48238))
+#### Block Editor
+
+-   Block Editor: Improve empty `getBlockParents()` perf. ([48242](https://github.com/WordPress/gutenberg/pull/48242))
+-   Fix perf regression in duotone hooks. ([48401](https://github.com/WordPress/gutenberg/pull/48401))
+-   Writing flow: Avoid recalc style on every selection change. ([48409](https://github.com/WordPress/gutenberg/pull/48409))
+-   useAsyncList: Flush state updates when processing queue. ([48238](https://github.com/WordPress/gutenberg/pull/48238))
 
 #### Components
-- Autocomplete: Reduce work before finding trigger. ([48327](https://github.com/WordPress/gutenberg/pull/48327))
-- Disable lazy term meta loading render_block_core_template_part. ([48000](https://github.com/WordPress/gutenberg/pull/48000))
-- Rich text: Only selectively handle keyup/pointerup. ([48385](https://github.com/WordPress/gutenberg/pull/48385))
-- Rich text: Remove unnecessary handleSelectionChange call. ([48373](https://github.com/WordPress/gutenberg/pull/48373))
-- Rich text: Try removing store change on focus. ([48342](https://github.com/WordPress/gutenberg/pull/48342))
-- Autocomplete: Avoid calling setState on input. ([48565](https://github.com/WordPress/gutenberg/pull/48565))
-- Autocomplete: Don't change state on every keystroke. ([48485](https://github.com/WordPress/gutenberg/pull/48485))
+
+-   Autocomplete: Reduce work before finding trigger. ([48327](https://github.com/WordPress/gutenberg/pull/48327))
+-   Disable lazy term meta loading render_block_core_template_part. ([48000](https://github.com/WordPress/gutenberg/pull/48000))
+-   Rich text: Only selectively handle keyup/pointerup. ([48385](https://github.com/WordPress/gutenberg/pull/48385))
+-   Rich text: Remove unnecessary handleSelectionChange call. ([48373](https://github.com/WordPress/gutenberg/pull/48373))
+-   Rich text: Try removing store change on focus. ([48342](https://github.com/WordPress/gutenberg/pull/48342))
+-   Autocomplete: Avoid calling setState on input. ([48565](https://github.com/WordPress/gutenberg/pull/48565))
+-   Autocomplete: Don't change state on every keystroke. ([48485](https://github.com/WordPress/gutenberg/pull/48485))
 
 ### Code Quality
-- Tag Processor: Make `$html` field `protected`. ([48681](https://github.com/WordPress/gutenberg/pull/48681))
-- WP_HTML_Tag_Processor: Support tag closer bookmarks. ([48692](https://github.com/WordPress/gutenberg/pull/48692))
-- Fixed incorrect type annotations in @wordpress/data, part 2. ([48221](https://github.com/WordPress/gutenberg/pull/48221))
-- Lodash: Refactor away from `_.merge()`. ([48239](https://github.com/WordPress/gutenberg/pull/48239))
-- Lodash: Remove from integration tests. ([48122](https://github.com/WordPress/gutenberg/pull/48122))
-- Lodash: Remove remaining `_.get()` from `core-data`. ([48310](https://github.com/WordPress/gutenberg/pull/48310))
-- Lodash: Remove `_.get()` for post type usages. ([48121](https://github.com/WordPress/gutenberg/pull/48121))
-- Lodash: Remove remaining `_.get()` from `editor`. ([48314](https://github.com/WordPress/gutenberg/pull/48314))
-- Lodash: Remove some `_.get()` from editor. ([48104](https://github.com/WordPress/gutenberg/pull/48104))
-- Lodash: Refactor context system provider away from `_.merge()`. ([48036](https://github.com/WordPress/gutenberg/pull/48036))
-- Lodash: Remove `_.merge()` from `getMappedColumnWidths()`. ([48032](https://github.com/WordPress/gutenberg/pull/48032))
-- Lodash: Remove some `_.get()` from Gallery block. ([48488](https://github.com/WordPress/gutenberg/pull/48488))
-- Lodash: Remove some `_.get()` from Image block. ([48489](https://github.com/WordPress/gutenberg/pull/48489))
-- Playwright: Fix request utils for non Docker envs. ([48206](https://github.com/WordPress/gutenberg/pull/48206))
-- [Private APIs] Only prevent module re-registration if IS_WORDPRESS_CORE. ([48352](https://github.com/WordPress/gutenberg/pull/48352))
-- Add a manual performance job that we can trigger from Github UI. ([48302](https://github.com/WordPress/gutenberg/pull/48302))
-- Track new front-end metric: LCP-TTFB. ([48288](https://github.com/WordPress/gutenberg/pull/48288))
+
+-   Tag Processor: Make `$html` field `protected`. ([48681](https://github.com/WordPress/gutenberg/pull/48681))
+-   WP_HTML_Tag_Processor: Support tag closer bookmarks. ([48692](https://github.com/WordPress/gutenberg/pull/48692))
+-   Fixed incorrect type annotations in @wordpress/data, part 2. ([48221](https://github.com/WordPress/gutenberg/pull/48221))
+-   Lodash: Refactor away from `_.merge()`. ([48239](https://github.com/WordPress/gutenberg/pull/48239))
+-   Lodash: Remove from integration tests. ([48122](https://github.com/WordPress/gutenberg/pull/48122))
+-   Lodash: Remove remaining `_.get()` from `core-data`. ([48310](https://github.com/WordPress/gutenberg/pull/48310))
+-   Lodash: Remove `_.get()` for post type usages. ([48121](https://github.com/WordPress/gutenberg/pull/48121))
+-   Lodash: Remove remaining `_.get()` from `editor`. ([48314](https://github.com/WordPress/gutenberg/pull/48314))
+-   Lodash: Remove some `_.get()` from editor. ([48104](https://github.com/WordPress/gutenberg/pull/48104))
+-   Lodash: Refactor context system provider away from `_.merge()`. ([48036](https://github.com/WordPress/gutenberg/pull/48036))
+-   Lodash: Remove `_.merge()` from `getMappedColumnWidths()`. ([48032](https://github.com/WordPress/gutenberg/pull/48032))
+-   Lodash: Remove some `_.get()` from Gallery block. ([48488](https://github.com/WordPress/gutenberg/pull/48488))
+-   Lodash: Remove some `_.get()` from Image block. ([48489](https://github.com/WordPress/gutenberg/pull/48489))
+-   Playwright: Fix request utils for non Docker envs. ([48206](https://github.com/WordPress/gutenberg/pull/48206))
+-   [Private APIs] Only prevent module re-registration if IS_WORDPRESS_CORE. ([48352](https://github.com/WordPress/gutenberg/pull/48352))
+-   Add a manual performance job that we can trigger from GitHub UI. ([48302](https://github.com/WordPress/gutenberg/pull/48302))
+-   Track new front-end metric: LCP-TTFB. ([48288](https://github.com/WordPress/gutenberg/pull/48288))
 
 ### Documentation
-- Clarify backport status of `appearance-tools` theme support. ([48622](https://github.com/WordPress/gutenberg/pull/48622))
-- Docs: Clarify release process for major WP Beta 1. ([48248](https://github.com/WordPress/gutenberg/pull/48248))
-- Docs: Markdown fix for wp_enqueue_script usage. ([48212](https://github.com/WordPress/gutenberg/pull/48212))
-- Fix `e2e-test-utils-playwright`'s jsdoc and types. ([48266](https://github.com/WordPress/gutenberg/pull/48266))
-- Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
-- Proactively update versions in WordPress ahead of 6.2. ([48145](https://github.com/WordPress/gutenberg/pull/48145))
-- Update curation document to include theme.json filters. ([48576](https://github.com/WordPress/gutenberg/pull/48576))
-- Updates to the curating the editor experience to include 6.1 & 6.2 items. ([48294](https://github.com/WordPress/gutenberg/pull/48294))
+
+-   Clarify backport status of `appearance-tools` theme support. ([48622](https://github.com/WordPress/gutenberg/pull/48622))
+-   Docs: Clarify release process for major WP Beta 1. ([48248](https://github.com/WordPress/gutenberg/pull/48248))
+-   Docs: Markdown fix for wp_enqueue_script usage. ([48212](https://github.com/WordPress/gutenberg/pull/48212))
+-   Fix `e2e-test-utils-playwright`'s jsdoc and types. ([48266](https://github.com/WordPress/gutenberg/pull/48266))
+-   Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
+-   Proactively update versions in WordPress ahead of 6.2. ([48145](https://github.com/WordPress/gutenberg/pull/48145))
+-   Update curation document to include theme.json filters. ([48576](https://github.com/WordPress/gutenberg/pull/48576))
+-   Updates to the curating the editor experience to include 6.1 & 6.2 items. ([48294](https://github.com/WordPress/gutenberg/pull/48294))
 
 ### Tools
-#### Testing 
-- Migrate `switch-to-draft` to Playwright. ([48120](https://github.com/WordPress/gutenberg/pull/48120))
-- VizReg end-to-end tests: Programmatically test all combinations of a given list of props/values. ([48260](https://github.com/WordPress/gutenberg/pull/48260))
-- Update end-to-end test snapshots to Jest 29 default. ([48626](https://github.com/WordPress/gutenberg/pull/48626))
-- Update snapshot format to Jest 29 default. ([48366](https://github.com/WordPress/gutenberg/pull/48366))
-- Move react-native-editor parser tests to a test directory. ([48615](https://github.com/WordPress/gutenberg/pull/48615))
-- `ToolsPanel`: Refactor unit tests to TypeScript. ([48275](https://github.com/WordPress/gutenberg/pull/48275))
-- Migrate block deletion end-to-end tests to Playwright. ([48012](https://github.com/WordPress/gutenberg/pull/48012))
-- Migrate list view end-to-end tests to Playwright. ([47919](https://github.com/WordPress/gutenberg/pull/47919))
-- Navigation block: End-to-end code quality fixes. ([48071](https://github.com/WordPress/gutenberg/pull/48071))
-- Remove old end-to-end tests for the navigation block. ([48126](https://github.com/WordPress/gutenberg/pull/48126))
-- Update assertion Autocomplete end-to-end tests. ([48344](https://github.com/WordPress/gutenberg/pull/48344))
-- [Automated Testing]: Fix wrong button fixture. ([48305](https://github.com/WordPress/gutenberg/pull/48305))
-- Add typescript-eslint rules with type informations to end-to-end tests. ([48267](https://github.com/WordPress/gutenberg/pull/48267))
-- Fix snapshots for Spacer mobile unit tests. ([48406](https://github.com/WordPress/gutenberg/pull/48406))
-- Add command to run performance tests in debug mode. ([48614](https://github.com/WordPress/gutenberg/pull/48614))
-- Make the performance tests more stable. ([48094](https://github.com/WordPress/gutenberg/pull/48094))
 
-## First time contributors
+#### Testing
 
-The following PRs were merged by first time contributors:
+-   Migrate `switch-to-draft` to Playwright. ([48120](https://github.com/WordPress/gutenberg/pull/48120))
+-   VizReg end-to-end tests: Programmatically test all combinations of a given list of props/values. ([48260](https://github.com/WordPress/gutenberg/pull/48260))
+-   Update end-to-end test snapshots to Jest 29 default. ([48626](https://github.com/WordPress/gutenberg/pull/48626))
+-   Update snapshot format to Jest 29 default. ([48366](https://github.com/WordPress/gutenberg/pull/48366))
+-   Move react-native-editor parser tests to a test directory. ([48615](https://github.com/WordPress/gutenberg/pull/48615))
+-   `ToolsPanel`: Refactor unit tests to TypeScript. ([48275](https://github.com/WordPress/gutenberg/pull/48275))
+-   Migrate block deletion end-to-end tests to Playwright. ([48012](https://github.com/WordPress/gutenberg/pull/48012))
+-   Migrate list view end-to-end tests to Playwright. ([47919](https://github.com/WordPress/gutenberg/pull/47919))
+-   Navigation block: End-to-end code quality fixes. ([48071](https://github.com/WordPress/gutenberg/pull/48071))
+-   Remove old end-to-end tests for the navigation block. ([48126](https://github.com/WordPress/gutenberg/pull/48126))
+-   Update assertion Autocomplete end-to-end tests. ([48344](https://github.com/WordPress/gutenberg/pull/48344))
+-   [Automated Testing]: Fix wrong button fixture. ([48305](https://github.com/WordPress/gutenberg/pull/48305))
+-   Add typescript-eslint rules with type informations to end-to-end tests. ([48267](https://github.com/WordPress/gutenberg/pull/48267))
+-   Fix snapshots for Spacer mobile unit tests. ([48406](https://github.com/WordPress/gutenberg/pull/48406))
+-   Add command to run performance tests in debug mode. ([48614](https://github.com/WordPress/gutenberg/pull/48614))
+-   Make the performance tests more stable. ([48094](https://github.com/WordPress/gutenberg/pull/48094))
 
-- @abhi3315: Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
-- @hbhalodia: Update: Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
-- @sboerrigter: Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
-- @shreyasikhar: Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
-- @suvrodattamitu: Style Engine: Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
-- @tomdevisser: Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
+-   @abhi3315: Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
+-   @hbhalodia: Update: Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
+-   @sboerrigter: Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
+-   @shreyasikhar: Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
+-   @suvrodattamitu: Style Engine: Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
+-   @tomdevisser: Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
 
 ## Contributors
 
@@ -6947,224 +18040,238 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @abhi3315 @adamziel @afercia @alexstine @andrewserong @annezazu @brookewp @carolinan @chad1008 @ciampo @dcalhoun @draganescu @ellatrix @fluiddot @geriux @getdave @gvgvgvijayan @gziolo @hbhalodia @jorgefilipecosta @jsnajdr @kevin940726 @MaggieCabrera @Mamaduka @marekdedic @ndiego @ntsekouras @oandregal @ockham @richtabor @sboerrigter @scruffian @shreyasikhar @spacedmonkey @suvrodattamitu @t-hamano @tellthemachines @tomdevisser @tyxla @WunderBart @youknowriad
 
-
 = 15.3.0 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
 #### Site Editor
-- Refactor the site editor URLs for better backward compatibility. ([48063](https://github.com/WordPress/gutenberg/pull/48063))
-- Remove TemplateAreas from template details. ([48490](https://github.com/WordPress/gutenberg/pull/48490))
-- Update the edit button. ([48584](https://github.com/WordPress/gutenberg/pull/48584))
-- Change "Browse all templates" to "Manage all templates" in template details popover. ([48496](https://github.com/WordPress/gutenberg/pull/48496))
-- Match color of the focus template view with site dark material. ([48430](https://github.com/WordPress/gutenberg/pull/48430))
-- Polish add template modal style. ([48445](https://github.com/WordPress/gutenberg/pull/48445))
-- Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
-- Extract a DimensionsPanel component as a reusable component between Global Styles and Block Inspector. ([48070](https://github.com/WordPress/gutenberg/pull/48070))
-- Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
-
-#### Block Editor
-- Apply keyboard shortcut conversions between paragraphs and headings to all editor instances. ([47972](https://github.com/WordPress/gutenberg/pull/47972))
-- Create automatic change higher order reducer. ([48312](https://github.com/WordPress/gutenberg/pull/48312))
-- [Inserter]: Preload media categories empty check - client side. ([47503](https://github.com/WordPress/gutenberg/pull/47503))
-
-#### Post Editor 
-- Revert iframed editor for WP core only. ([48076](https://github.com/WordPress/gutenberg/pull/48076))
-- PageAttributesCheck: Return boolean value directly from the selector. ([48336](https://github.com/WordPress/gutenberg/pull/48336))
-- Apply busy status to the publish button in progress and unify button width. ([48444](https://github.com/WordPress/gutenberg/pull/48444))
-
-#### Block Library
-- Add all allowed innerblocks to the inspector animation experiment. ([47834](https://github.com/WordPress/gutenberg/pull/47834))
-- Make the Site Logo block placeholder state smaller. ([48218](https://github.com/WordPress/gutenberg/pull/48218))
-- ToggleControl: Remove margin overrides and add opt-in prop. ([47866](https://github.com/WordPress/gutenberg/pull/47866))
-- Post Terms block: Add transforms for variations. ([48328](https://github.com/WordPress/gutenberg/pull/48328))
-- List block: Add Firefox end-to-end tests. ([48271](https://github.com/WordPress/gutenberg/pull/48271))
-- Navigation List View: Add block movers to the more menu. ([48099](https://github.com/WordPress/gutenberg/pull/48099))
-- Navigation: Always create a fallback menu. ([47684](https://github.com/WordPress/gutenberg/pull/47684))
-- Navigation: Don't create a fallback navigation menu if there are inner blocks. ([48585](https://github.com/WordPress/gutenberg/pull/48585))
-- Navigation: Don't create duplicate navigation menus. ([48599](https://github.com/WordPress/gutenberg/pull/48599))
-- Navigation: Update the dependencies for the useEffect that handles notifications. ([48066](https://github.com/WordPress/gutenberg/pull/48066))
-- Navigation: Wrap the dependent functions in useCallback. ([48195](https://github.com/WordPress/gutenberg/pull/48195))
-- Page List: Move the modal to its own file. ([47922](https://github.com/WordPress/gutenberg/pull/47922))
-- [New Block] Add post time to read block. ([43403](https://github.com/WordPress/gutenberg/pull/43403))
-- Classic Block: Replace the deprecated `isPrimary` prop with `variant`. ([48230](https://github.com/WordPress/gutenberg/pull/48230))
-- Refactor core blocks to use HTML Tag Processor. ([43178](https://github.com/WordPress/gutenberg/pull/43178))
+
+-   Refactor the site editor URLs for better backward compatibility. ([48063](https://github.com/WordPress/gutenberg/pull/48063))
+-   Remove TemplateAreas from template details. ([48490](https://github.com/WordPress/gutenberg/pull/48490))
+-   Update the edit button. ([48584](https://github.com/WordPress/gutenberg/pull/48584))
+-   Change "Browse all templates" to "Manage all templates" in template details popover. ([48496](https://github.com/WordPress/gutenberg/pull/48496))
+-   Match color of the focus template view with site dark material. ([48430](https://github.com/WordPress/gutenberg/pull/48430))
+-   Polish add template modal style. ([48445](https://github.com/WordPress/gutenberg/pull/48445))
+-   Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
+-   Extract a DimensionsPanel component as a reusable component between Global Styles and Block Inspector. ([48070](https://github.com/WordPress/gutenberg/pull/48070))
+-   Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
+
+#### Block Editor
+
+-   Apply keyboard shortcut conversions between paragraphs and headings to all editor instances. ([47972](https://github.com/WordPress/gutenberg/pull/47972))
+-   Create automatic change higher order reducer. ([48312](https://github.com/WordPress/gutenberg/pull/48312))
+-   [Inserter]: Preload media categories empty check - client side. ([47503](https://github.com/WordPress/gutenberg/pull/47503))
+
+#### Post Editor
+
+-   Revert iframed editor for WP core only. ([48076](https://github.com/WordPress/gutenberg/pull/48076))
+-   PageAttributesCheck: Return boolean value directly from the selector. ([48336](https://github.com/WordPress/gutenberg/pull/48336))
+-   Apply busy status to the publish button in progress and unify button width. ([48444](https://github.com/WordPress/gutenberg/pull/48444))
+
+#### Block Library
+
+-   Add all allowed innerblocks to the inspector animation experiment. ([47834](https://github.com/WordPress/gutenberg/pull/47834))
+-   Make the Site Logo block placeholder state smaller. ([48218](https://github.com/WordPress/gutenberg/pull/48218))
+-   ToggleControl: Remove margin overrides and add opt-in prop. ([47866](https://github.com/WordPress/gutenberg/pull/47866))
+-   Post Terms block: Add transforms for variations. ([48328](https://github.com/WordPress/gutenberg/pull/48328))
+-   List block: Add Firefox end-to-end tests. ([48271](https://github.com/WordPress/gutenberg/pull/48271))
+-   Navigation List View: Add block movers to the more menu. ([48099](https://github.com/WordPress/gutenberg/pull/48099))
+-   Navigation: Always create a fallback menu. ([47684](https://github.com/WordPress/gutenberg/pull/47684))
+-   Navigation: Don't create a fallback navigation menu if there are inner blocks. ([48585](https://github.com/WordPress/gutenberg/pull/48585))
+-   Navigation: Don't create duplicate navigation menus. ([48599](https://github.com/WordPress/gutenberg/pull/48599))
+-   Navigation: Update the dependencies for the useEffect that handles notifications. ([48066](https://github.com/WordPress/gutenberg/pull/48066))
+-   Navigation: Wrap the dependent functions in useCallback. ([48195](https://github.com/WordPress/gutenberg/pull/48195))
+-   Page List: Move the modal to its own file. ([47922](https://github.com/WordPress/gutenberg/pull/47922))
+-   [New Block] Add post time to read block. ([43403](https://github.com/WordPress/gutenberg/pull/43403))
+-   Classic Block: Replace the deprecated `isPrimary` prop with `variant`. ([48230](https://github.com/WordPress/gutenberg/pull/48230))
+-   Refactor core blocks to use HTML Tag Processor. ([43178](https://github.com/WordPress/gutenberg/pull/43178))
 
 #### Block API
-- HTML Tag Processor: Add WP 6.3 compat layer. ([47933](https://github.com/WordPress/gutenberg/pull/47933))
-- Tag Processor: Add bookmark invalidation logic. ([47559](https://github.com/WordPress/gutenberg/pull/47559))
+
+-   HTML Tag Processor: Add WP 6.3 compat layer. ([47933](https://github.com/WordPress/gutenberg/pull/47933))
+-   Tag Processor: Add bookmark invalidation logic. ([47559](https://github.com/WordPress/gutenberg/pull/47559))
 
 #### Design Tools
-- Duotone: Use the style engine to generate CSS for Duotone. ([48281](https://github.com/WordPress/gutenberg/pull/48281))
-- Duotone: Add Global Styles controls for blocks that support duotone. ([48255](https://github.com/WordPress/gutenberg/pull/48255))
-- Use Duotone presets in block duotone attributes. ([48318](https://github.com/WordPress/gutenberg/pull/48318))
-- Duotone: Use CSS variables instead of slugs in block attributes. ([48426](https://github.com/WordPress/gutenberg/pull/48426))
-- Border Panel: Add missing dep for `onBorderChange` callback. ([48010](https://github.com/WordPress/gutenberg/pull/48010))
-- Disable layout toolbar controls for content locked blocks. ([47939](https://github.com/WordPress/gutenberg/pull/47939))
-- SpacingSizesControl: Fix white dot on thumb. ([48574](https://github.com/WordPress/gutenberg/pull/48574))
+
+-   Duotone: Use the style engine to generate CSS for Duotone. ([48281](https://github.com/WordPress/gutenberg/pull/48281))
+-   Duotone: Add Global Styles controls for blocks that support duotone. ([48255](https://github.com/WordPress/gutenberg/pull/48255))
+-   Use Duotone presets in block duotone attributes. ([48318](https://github.com/WordPress/gutenberg/pull/48318))
+-   Duotone: Use CSS variables instead of slugs in block attributes. ([48426](https://github.com/WordPress/gutenberg/pull/48426))
+-   Border Panel: Add missing dep for `onBorderChange` callback. ([48010](https://github.com/WordPress/gutenberg/pull/48010))
+-   Disable layout toolbar controls for content locked blocks. ([47939](https://github.com/WordPress/gutenberg/pull/47939))
+-   SpacingSizesControl: Fix white dot on thumb. ([48574](https://github.com/WordPress/gutenberg/pull/48574))
 
 #### List View
-- Scroll selected block into view when single block selection changes. ([46895](https://github.com/WordPress/gutenberg/pull/46895))
+
+-   Scroll selected block into view when single block selection changes. ([46895](https://github.com/WordPress/gutenberg/pull/46895))
 
 #### Components
-- TabPanel: Refactor unit tests in prep for controlled component updates. ([48086](https://github.com/WordPress/gutenberg/pull/48086))
-- Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
-- CircularOptionPicker: Refactor to TypeScript. ([47937](https://github.com/WordPress/gutenberg/pull/47937))
-- Extract delete handler to hook for RichText. ([48273](https://github.com/WordPress/gutenberg/pull/48273))
-- ToolsPanel: Remove unnecessary dep from resetAll callback. ([48011](https://github.com/WordPress/gutenberg/pull/48011))
-- Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
-- Pin `floating-ui/react-dom` version. ([48402](https://github.com/WordPress/gutenberg/pull/48402))
-- Use React 18 rendering for import dropdown. ([48244](https://github.com/WordPress/gutenberg/pull/48244))
+
+-   TabPanel: Refactor unit tests in prep for controlled component updates. ([48086](https://github.com/WordPress/gutenberg/pull/48086))
+-   Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
+-   CircularOptionPicker: Refactor to TypeScript. ([47937](https://github.com/WordPress/gutenberg/pull/47937))
+-   Extract delete handler to hook for RichText. ([48273](https://github.com/WordPress/gutenberg/pull/48273))
+-   ToolsPanel: Remove unnecessary dep from resetAll callback. ([48011](https://github.com/WordPress/gutenberg/pull/48011))
+-   Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
+-   Pin `floating-ui/react-dom` version. ([48402](https://github.com/WordPress/gutenberg/pull/48402))
+-   Use React 18 rendering for import dropdown. ([48244](https://github.com/WordPress/gutenberg/pull/48244))
 
 ### Bug Fixes
 
 #### Site Editor
-- Fix Site Editor perf tests. ([48240](https://github.com/WordPress/gutenberg/pull/48240))
-- Fix routing for Classic themes using block-based template parts. ([48343](https://github.com/WordPress/gutenberg/pull/48343))
-- Fix the 'Browse all' link in the template details modal. ([48301](https://github.com/WordPress/gutenberg/pull/48301))
-- Fix the site editor home page loading when installed in a subdirectory. ([48363](https://github.com/WordPress/gutenberg/pull/48363))
-- Fix the tooltip and shortcut for the global save button. ([48282](https://github.com/WordPress/gutenberg/pull/48282))
-- Prevent distracting focused back button on site editor load. ([48472](https://github.com/WordPress/gutenberg/pull/48472))
-- Sort templates and template parts by slug. ([48473](https://github.com/WordPress/gutenberg/pull/48473))
-- Specify focus state color for template navigation button. ([48134](https://github.com/WordPress/gutenberg/pull/48134))
-- [Site Editor]: Set `html` block as freeform fallback block. ([48129](https://github.com/WordPress/gutenberg/pull/48129))
-- Remove broken site editor redirect. ([48283](https://github.com/WordPress/gutenberg/pull/48283))
-- Fix: Inserter does not appear on sidebar navigation. ([48623](https://github.com/WordPress/gutenberg/pull/48623))
-- Fix: Make navigation page list load its items on navigation sidebar. ([47853](https://github.com/WordPress/gutenberg/pull/47853))
-- Revert Site Tagline placeholder attribute, move example to block.json. ([48383](https://github.com/WordPress/gutenberg/pull/48383))
-
-#### Block Editor
-- MediaReplaceFlow: Fix styling for LinkControl. ([47949](https://github.com/WordPress/gutenberg/pull/47949))
-- Fix "Reset All" button in the typography panel of the block inspector. ([48123](https://github.com/WordPress/gutenberg/pull/48123))
-- [Inserter - Media tab]: Upload Openverse images when inserted. ([48501](https://github.com/WordPress/gutenberg/pull/48501))
-- Block alignment controls: Don't remount the block when alignments change. ([48209](https://github.com/WordPress/gutenberg/pull/48209))
-- Pin `valtio` version. ([48237](https://github.com/WordPress/gutenberg/pull/48237))
-- Fix block style preview flickering when a 'style' is focused. ([48418](https://github.com/WordPress/gutenberg/pull/48418))
-- Enable access to block settings within UBE. ([48435](https://github.com/WordPress/gutenberg/pull/48435))
-- Fix: Content only CPT template locking. ([48434](https://github.com/WordPress/gutenberg/pull/48434))
-- Firefox: Fix input rules (React async state issue). ([48210](https://github.com/WordPress/gutenberg/pull/48210))
-- Fix: Multiple overwrites on rest_controller_class for wp_template/wp_template_part. ([48078](https://github.com/WordPress/gutenberg/pull/48078))
-- Select blocks in `outline` list. ([48118](https://github.com/WordPress/gutenberg/pull/48118))
-- Only add layout classes to inner wrapper if block is a container. ([48611](https://github.com/WordPress/gutenberg/pull/48611))
+
+-   Fix Site Editor perf tests. ([48240](https://github.com/WordPress/gutenberg/pull/48240))
+-   Fix routing for Classic themes using block-based template parts. ([48343](https://github.com/WordPress/gutenberg/pull/48343))
+-   Fix the 'Browse all' link in the template details modal. ([48301](https://github.com/WordPress/gutenberg/pull/48301))
+-   Fix the site editor home page loading when installed in a subdirectory. ([48363](https://github.com/WordPress/gutenberg/pull/48363))
+-   Fix the tooltip and shortcut for the global save button. ([48282](https://github.com/WordPress/gutenberg/pull/48282))
+-   Prevent distracting focused back button on site editor load. ([48472](https://github.com/WordPress/gutenberg/pull/48472))
+-   Sort templates and template parts by slug. ([48473](https://github.com/WordPress/gutenberg/pull/48473))
+-   Specify focus state color for template navigation button. ([48134](https://github.com/WordPress/gutenberg/pull/48134))
+-   [Site Editor]: Set `html` block as freeform fallback block. ([48129](https://github.com/WordPress/gutenberg/pull/48129))
+-   Remove broken site editor redirect. ([48283](https://github.com/WordPress/gutenberg/pull/48283))
+-   Fix: Inserter does not appear on sidebar navigation. ([48623](https://github.com/WordPress/gutenberg/pull/48623))
+-   Fix: Make navigation page list load its items on navigation sidebar. ([47853](https://github.com/WordPress/gutenberg/pull/47853))
+-   Revert Site Tagline placeholder attribute, move example to block.json. ([48383](https://github.com/WordPress/gutenberg/pull/48383))
+
+#### Block Editor
+
+-   MediaReplaceFlow: Fix styling for LinkControl. ([47949](https://github.com/WordPress/gutenberg/pull/47949))
+-   Fix "Reset All" button in the typography panel of the block inspector. ([48123](https://github.com/WordPress/gutenberg/pull/48123))
+-   [Inserter - Media tab]: Upload Openverse images when inserted. ([48501](https://github.com/WordPress/gutenberg/pull/48501))
+-   Block alignment controls: Don't remount the block when alignments change. ([48209](https://github.com/WordPress/gutenberg/pull/48209))
+-   Pin `valtio` version. ([48237](https://github.com/WordPress/gutenberg/pull/48237))
+-   Fix block style preview flickering when a 'style' is focused. ([48418](https://github.com/WordPress/gutenberg/pull/48418))
+-   Enable access to block settings within UBE. ([48435](https://github.com/WordPress/gutenberg/pull/48435))
+-   Fix: Content only CPT template locking. ([48434](https://github.com/WordPress/gutenberg/pull/48434))
+-   Firefox: Fix input rules (React async state issue). ([48210](https://github.com/WordPress/gutenberg/pull/48210))
+-   Fix: Multiple overwrites on rest_controller_class for wp_template/wp_template_part. ([48078](https://github.com/WordPress/gutenberg/pull/48078))
+-   Select blocks in `outline` list. ([48118](https://github.com/WordPress/gutenberg/pull/48118))
+-   Only add layout classes to inner wrapper if block is a container. ([48611](https://github.com/WordPress/gutenberg/pull/48611))
 
 #### Widgets Editor
-- Widget Editor: Fix a problem with 'Move to Widget Area' button not working. ([48233](https://github.com/WordPress/gutenberg/pull/48233))
-
-#### Block Library
-- Add support for orientation-based block movers to core/social-links. ([48452](https://github.com/WordPress/gutenberg/pull/48452))
-- Fix Post Excerpt: Read more link is always on new line in the editor. ([47772](https://github.com/WordPress/gutenberg/pull/47772))
-- Fix: OffCanvasEditor does not inserts submenu on collapsed items. ([48214](https://github.com/WordPress/gutenberg/pull/48214))
-- List Item: Avoid an error when the 'onReplace' prop is undefined. ([48639](https://github.com/WordPress/gutenberg/pull/48639))
-- Add missing code on the fix page list loading PR. ([48621](https://github.com/WordPress/gutenberg/pull/48621))
-- Prevent text decoration from showing up in all blocks. ([48117](https://github.com/WordPress/gutenberg/pull/48117))
-- Widget Importer: Don't render controls when there's nothing to import. ([48396](https://github.com/WordPress/gutenberg/pull/48396))
-- [Query Loop] Fix top border in pattern selection modal. ([48303](https://github.com/WordPress/gutenberg/pull/48303))
-- [Query Loop] Sync `gutenberg_build_query_vars_from_query_block` with core. ([48640](https://github.com/WordPress/gutenberg/pull/48640))
-- Avatar: Clean up border application in editor. ([48024](https://github.com/WordPress/gutenberg/pull/48024))
-
-#### Global Styles
-- Fix for `WP_Theme_JSON_Resolver_Gutenberg::Get_merged_data`. ([48644](https://github.com/WordPress/gutenberg/pull/48644))
-- Display preset names via the tooltip. ([48304](https://github.com/WordPress/gutenberg/pull/48304))
-- Fix typo in valid settings for fluid typography. ([48605](https://github.com/WordPress/gutenberg/pull/48605))
-- Prevent the global styles previews thumbnails from resizing on load. ([48474](https://github.com/WordPress/gutenberg/pull/48474))
-- Site Tagline: Add example so that it will display in style book. ([48300](https://github.com/WordPress/gutenberg/pull/48300))
-- Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
-- Update code position for constants and methods in `WP_Theme_JSON_Gutenberg` class. ([48631](https://github.com/WordPress/gutenberg/pull/48631))
-- `WP_Theme_JSON_Gutenberg`: Update comments to be aligned with core, so backports are easier. ([48624](https://github.com/WordPress/gutenberg/pull/48624))
+
+-   Widget Editor: Fix a problem with 'Move to Widget Area' button not working. ([48233](https://github.com/WordPress/gutenberg/pull/48233))
+
+#### Block Library
+
+-   Add support for orientation-based block movers to core/social-links. ([48452](https://github.com/WordPress/gutenberg/pull/48452))
+-   Fix Post Excerpt: Read more link is always on new line in the editor. ([47772](https://github.com/WordPress/gutenberg/pull/47772))
+-   Fix: OffCanvasEditor does not inserts submenu on collapsed items. ([48214](https://github.com/WordPress/gutenberg/pull/48214))
+-   List Item: Avoid an error when the 'onReplace' prop is undefined. ([48639](https://github.com/WordPress/gutenberg/pull/48639))
+-   Add missing code on the fix page list loading PR. ([48621](https://github.com/WordPress/gutenberg/pull/48621))
+-   Prevent text decoration from showing up in all blocks. ([48117](https://github.com/WordPress/gutenberg/pull/48117))
+-   Widget Importer: Don't render controls when there's nothing to import. ([48396](https://github.com/WordPress/gutenberg/pull/48396))
+-   [Query Loop] Fix top border in pattern selection modal. ([48303](https://github.com/WordPress/gutenberg/pull/48303))
+-   [Query Loop] Sync `gutenberg_build_query_vars_from_query_block` with core. ([48640](https://github.com/WordPress/gutenberg/pull/48640))
+-   Avatar: Clean up border application in editor. ([48024](https://github.com/WordPress/gutenberg/pull/48024))
+
+#### Global Styles
+
+-   Fix for `WP_Theme_JSON_Resolver_Gutenberg::Get_merged_data`. ([48644](https://github.com/WordPress/gutenberg/pull/48644))
+-   Display preset names via the tooltip. ([48304](https://github.com/WordPress/gutenberg/pull/48304))
+-   Fix typo in valid settings for fluid typography. ([48605](https://github.com/WordPress/gutenberg/pull/48605))
+-   Prevent the global styles previews thumbnails from resizing on load. ([48474](https://github.com/WordPress/gutenberg/pull/48474))
+-   Site Tagline: Add example so that it will display in style book. ([48300](https://github.com/WordPress/gutenberg/pull/48300))
+-   Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
+-   Update code position for constants and methods in `WP_Theme_JSON_Gutenberg` class. ([48631](https://github.com/WordPress/gutenberg/pull/48631))
+-   `WP_Theme_JSON_Gutenberg`: Update comments to be aligned with core, so backports are easier. ([48624](https://github.com/WordPress/gutenberg/pull/48624))
 
 ### Accessibility
-- Autocomplete: Duplicate list within iframe for non visual users. ([47907](https://github.com/WordPress/gutenberg/pull/47907))
-- Fix site editor switch mode message. ([48136](https://github.com/WordPress/gutenberg/pull/48136))
-- Fix the Publish region position and focus style. ([48102](https://github.com/WordPress/gutenberg/pull/48102))
-- Focus 1st parent block on block remove, if no previous block is available. ([48204](https://github.com/WordPress/gutenberg/pull/48204))
-- List view: Allow selected block to override roving tabindex. ([48339](https://github.com/WordPress/gutenberg/pull/48339))
-- Style Book: Allow button text labels for style book icon. ([48088](https://github.com/WordPress/gutenberg/pull/48088))
-- Style Book: Focus the Style Book when opened, and enable ESCAPE key to close. ([48151](https://github.com/WordPress/gutenberg/pull/48151))
-- Try to fix a11y test flakiness. ([48236](https://github.com/WordPress/gutenberg/pull/48236))
-- Make the template customized info accessible. ([48159](https://github.com/WordPress/gutenberg/pull/48159))
 
+-   Autocomplete: Duplicate list within iframe for non visual users. ([47907](https://github.com/WordPress/gutenberg/pull/47907))
+-   Fix site editor switch mode message. ([48136](https://github.com/WordPress/gutenberg/pull/48136))
+-   Fix the Publish region position and focus style. ([48102](https://github.com/WordPress/gutenberg/pull/48102))
+-   Focus 1st parent block on block remove, if no previous block is available. ([48204](https://github.com/WordPress/gutenberg/pull/48204))
+-   List view: Allow selected block to override roving tabindex. ([48339](https://github.com/WordPress/gutenberg/pull/48339))
+-   Style Book: Allow button text labels for style book icon. ([48088](https://github.com/WordPress/gutenberg/pull/48088))
+-   Style Book: Focus the Style Book when opened, and enable ESCAPE key to close. ([48151](https://github.com/WordPress/gutenberg/pull/48151))
+-   Try to fix a11y test flakiness. ([48236](https://github.com/WordPress/gutenberg/pull/48236))
+-   Make the template customized info accessible. ([48159](https://github.com/WordPress/gutenberg/pull/48159))
 
 ### Performance
 
-#### Block Editor 
-- Block Editor: Improve empty `getBlockParents()` perf. ([48242](https://github.com/WordPress/gutenberg/pull/48242))
-- Fix perf regression in duotone hooks. ([48401](https://github.com/WordPress/gutenberg/pull/48401))
-- Writing flow: Avoid recalc style on every selection change. ([48409](https://github.com/WordPress/gutenberg/pull/48409))
-- useAsyncList: Flush state updates when processing queue. ([48238](https://github.com/WordPress/gutenberg/pull/48238))
+#### Block Editor
+
+-   Block Editor: Improve empty `getBlockParents()` perf. ([48242](https://github.com/WordPress/gutenberg/pull/48242))
+-   Fix perf regression in duotone hooks. ([48401](https://github.com/WordPress/gutenberg/pull/48401))
+-   Writing flow: Avoid recalc style on every selection change. ([48409](https://github.com/WordPress/gutenberg/pull/48409))
+-   useAsyncList: Flush state updates when processing queue. ([48238](https://github.com/WordPress/gutenberg/pull/48238))
 
 #### Components
-- Autocomplete: Reduce work before finding trigger. ([48327](https://github.com/WordPress/gutenberg/pull/48327))
-- Disable lazy term meta loading render_block_core_template_part. ([48000](https://github.com/WordPress/gutenberg/pull/48000))
-- Rich text: Only selectively handle keyup/pointerup. ([48385](https://github.com/WordPress/gutenberg/pull/48385))
-- Rich text: Remove unnecessary handleSelectionChange call. ([48373](https://github.com/WordPress/gutenberg/pull/48373))
-- Rich text: Try removing store change on focus. ([48342](https://github.com/WordPress/gutenberg/pull/48342))
-- Autocomplete: Avoid calling setState on input. ([48565](https://github.com/WordPress/gutenberg/pull/48565))
-- Autocomplete: Don't change state on every keystroke. ([48485](https://github.com/WordPress/gutenberg/pull/48485))
+
+-   Autocomplete: Reduce work before finding trigger. ([48327](https://github.com/WordPress/gutenberg/pull/48327))
+-   Disable lazy term meta loading render_block_core_template_part. ([48000](https://github.com/WordPress/gutenberg/pull/48000))
+-   Rich text: Only selectively handle keyup/pointerup. ([48385](https://github.com/WordPress/gutenberg/pull/48385))
+-   Rich text: Remove unnecessary handleSelectionChange call. ([48373](https://github.com/WordPress/gutenberg/pull/48373))
+-   Rich text: Try removing store change on focus. ([48342](https://github.com/WordPress/gutenberg/pull/48342))
+-   Autocomplete: Avoid calling setState on input. ([48565](https://github.com/WordPress/gutenberg/pull/48565))
+-   Autocomplete: Don't change state on every keystroke. ([48485](https://github.com/WordPress/gutenberg/pull/48485))
 
 ### Code Quality
-- Tag Processor: Make `$html` field `protected`. ([48681](https://github.com/WordPress/gutenberg/pull/48681))
-- WP_HTML_Tag_Processor: Support tag closer bookmarks. ([48692](https://github.com/WordPress/gutenberg/pull/48692))
-- Fixed incorrect type annotations in @wordpress/data, part 2. ([48221](https://github.com/WordPress/gutenberg/pull/48221))
-- Lodash: Refactor away from `_.merge()`. ([48239](https://github.com/WordPress/gutenberg/pull/48239))
-- Lodash: Remove from integration tests. ([48122](https://github.com/WordPress/gutenberg/pull/48122))
-- Lodash: Remove remaining `_.get()` from `core-data`. ([48310](https://github.com/WordPress/gutenberg/pull/48310))
-- Lodash: Remove `_.get()` for post type usages. ([48121](https://github.com/WordPress/gutenberg/pull/48121))
-- Lodash: Remove remaining `_.get()` from `editor`. ([48314](https://github.com/WordPress/gutenberg/pull/48314))
-- Lodash: Remove some `_.get()` from editor. ([48104](https://github.com/WordPress/gutenberg/pull/48104))
-- Lodash: Refactor context system provider away from `_.merge()`. ([48036](https://github.com/WordPress/gutenberg/pull/48036))
-- Lodash: Remove `_.merge()` from `getMappedColumnWidths()`. ([48032](https://github.com/WordPress/gutenberg/pull/48032))
-- Lodash: Remove some `_.get()` from Gallery block. ([48488](https://github.com/WordPress/gutenberg/pull/48488))
-- Lodash: Remove some `_.get()` from Image block. ([48489](https://github.com/WordPress/gutenberg/pull/48489))
-- Playwright: Fix request utils for non Docker envs. ([48206](https://github.com/WordPress/gutenberg/pull/48206))
-- [Private APIs] Only prevent module re-registration if IS_WORDPRESS_CORE. ([48352](https://github.com/WordPress/gutenberg/pull/48352))
-- Add a manual performance job that we can trigger from Github UI. ([48302](https://github.com/WordPress/gutenberg/pull/48302))
-- Track new front-end metric: LCP-TTFB. ([48288](https://github.com/WordPress/gutenberg/pull/48288))
+
+-   Tag Processor: Make `$html` field `protected`. ([48681](https://github.com/WordPress/gutenberg/pull/48681))
+-   WP_HTML_Tag_Processor: Support tag closer bookmarks. ([48692](https://github.com/WordPress/gutenberg/pull/48692))
+-   Fixed incorrect type annotations in @wordpress/data, part 2. ([48221](https://github.com/WordPress/gutenberg/pull/48221))
+-   Lodash: Refactor away from `_.merge()`. ([48239](https://github.com/WordPress/gutenberg/pull/48239))
+-   Lodash: Remove from integration tests. ([48122](https://github.com/WordPress/gutenberg/pull/48122))
+-   Lodash: Remove remaining `_.get()` from `core-data`. ([48310](https://github.com/WordPress/gutenberg/pull/48310))
+-   Lodash: Remove `_.get()` for post type usages. ([48121](https://github.com/WordPress/gutenberg/pull/48121))
+-   Lodash: Remove remaining `_.get()` from `editor`. ([48314](https://github.com/WordPress/gutenberg/pull/48314))
+-   Lodash: Remove some `_.get()` from editor. ([48104](https://github.com/WordPress/gutenberg/pull/48104))
+-   Lodash: Refactor context system provider away from `_.merge()`. ([48036](https://github.com/WordPress/gutenberg/pull/48036))
+-   Lodash: Remove `_.merge()` from `getMappedColumnWidths()`. ([48032](https://github.com/WordPress/gutenberg/pull/48032))
+-   Lodash: Remove some `_.get()` from Gallery block. ([48488](https://github.com/WordPress/gutenberg/pull/48488))
+-   Lodash: Remove some `_.get()` from Image block. ([48489](https://github.com/WordPress/gutenberg/pull/48489))
+-   Playwright: Fix request utils for non Docker envs. ([48206](https://github.com/WordPress/gutenberg/pull/48206))
+-   [Private APIs] Only prevent module re-registration if IS_WORDPRESS_CORE. ([48352](https://github.com/WordPress/gutenberg/pull/48352))
+-   Add a manual performance job that we can trigger from GitHub UI. ([48302](https://github.com/WordPress/gutenberg/pull/48302))
+-   Track new front-end metric: LCP-TTFB. ([48288](https://github.com/WordPress/gutenberg/pull/48288))
 
 ### Documentation
-- Clarify backport status of `appearance-tools` theme support. ([48622](https://github.com/WordPress/gutenberg/pull/48622))
-- Docs: Clarify release process for major WP Beta 1. ([48248](https://github.com/WordPress/gutenberg/pull/48248))
-- Docs: Markdown fix for wp_enqueue_script usage. ([48212](https://github.com/WordPress/gutenberg/pull/48212))
-- Fix `e2e-test-utils-playwright`'s jsdoc and types. ([48266](https://github.com/WordPress/gutenberg/pull/48266))
-- Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
-- Proactively update versions in WordPress ahead of 6.2. ([48145](https://github.com/WordPress/gutenberg/pull/48145))
-- Update curation document to include theme.json filters. ([48576](https://github.com/WordPress/gutenberg/pull/48576))
-- Updates to the curating the editor experience to include 6.1 & 6.2 items. ([48294](https://github.com/WordPress/gutenberg/pull/48294))
+
+-   Clarify backport status of `appearance-tools` theme support. ([48622](https://github.com/WordPress/gutenberg/pull/48622))
+-   Docs: Clarify release process for major WP Beta 1. ([48248](https://github.com/WordPress/gutenberg/pull/48248))
+-   Docs: Markdown fix for wp_enqueue_script usage. ([48212](https://github.com/WordPress/gutenberg/pull/48212))
+-   Fix `e2e-test-utils-playwright`'s jsdoc and types. ([48266](https://github.com/WordPress/gutenberg/pull/48266))
+-   Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
+-   Proactively update versions in WordPress ahead of 6.2. ([48145](https://github.com/WordPress/gutenberg/pull/48145))
+-   Update curation document to include theme.json filters. ([48576](https://github.com/WordPress/gutenberg/pull/48576))
+-   Updates to the curating the editor experience to include 6.1 & 6.2 items. ([48294](https://github.com/WordPress/gutenberg/pull/48294))
 
 ### Tools
-#### Testing 
-- Migrate `switch-to-draft` to Playwright. ([48120](https://github.com/WordPress/gutenberg/pull/48120))
-- VizReg end-to-end tests: Programmatically test all combinations of a given list of props/values. ([48260](https://github.com/WordPress/gutenberg/pull/48260))
-- Update end-to-end test snapshots to Jest 29 default. ([48626](https://github.com/WordPress/gutenberg/pull/48626))
-- Update snapshot format to Jest 29 default. ([48366](https://github.com/WordPress/gutenberg/pull/48366))
-- Move react-native-editor parser tests to a test directory. ([48615](https://github.com/WordPress/gutenberg/pull/48615))
-- `ToolsPanel`: Refactor unit tests to TypeScript. ([48275](https://github.com/WordPress/gutenberg/pull/48275))
-- Migrate block deletion end-to-end tests to Playwright. ([48012](https://github.com/WordPress/gutenberg/pull/48012))
-- Migrate list view end-to-end tests to Playwright. ([47919](https://github.com/WordPress/gutenberg/pull/47919))
-- Navigation block: End-to-end code quality fixes. ([48071](https://github.com/WordPress/gutenberg/pull/48071))
-- Remove old end-to-end tests for the navigation block. ([48126](https://github.com/WordPress/gutenberg/pull/48126))
-- Update assertion Autocomplete end-to-end tests. ([48344](https://github.com/WordPress/gutenberg/pull/48344))
-- [Automated Testing]: Fix wrong button fixture. ([48305](https://github.com/WordPress/gutenberg/pull/48305))
-- Add typescript-eslint rules with type informations to end-to-end tests. ([48267](https://github.com/WordPress/gutenberg/pull/48267))
-- Fix snapshots for Spacer mobile unit tests. ([48406](https://github.com/WordPress/gutenberg/pull/48406))
-- Add command to run performance tests in debug mode. ([48614](https://github.com/WordPress/gutenberg/pull/48614))
-- Make the performance tests more stable. ([48094](https://github.com/WordPress/gutenberg/pull/48094))
 
-## First time contributors
+#### Testing
 
-The following PRs were merged by first time contributors:
+-   Migrate `switch-to-draft` to Playwright. ([48120](https://github.com/WordPress/gutenberg/pull/48120))
+-   VizReg end-to-end tests: Programmatically test all combinations of a given list of props/values. ([48260](https://github.com/WordPress/gutenberg/pull/48260))
+-   Update end-to-end test snapshots to Jest 29 default. ([48626](https://github.com/WordPress/gutenberg/pull/48626))
+-   Update snapshot format to Jest 29 default. ([48366](https://github.com/WordPress/gutenberg/pull/48366))
+-   Move react-native-editor parser tests to a test directory. ([48615](https://github.com/WordPress/gutenberg/pull/48615))
+-   `ToolsPanel`: Refactor unit tests to TypeScript. ([48275](https://github.com/WordPress/gutenberg/pull/48275))
+-   Migrate block deletion end-to-end tests to Playwright. ([48012](https://github.com/WordPress/gutenberg/pull/48012))
+-   Migrate list view end-to-end tests to Playwright. ([47919](https://github.com/WordPress/gutenberg/pull/47919))
+-   Navigation block: End-to-end code quality fixes. ([48071](https://github.com/WordPress/gutenberg/pull/48071))
+-   Remove old end-to-end tests for the navigation block. ([48126](https://github.com/WordPress/gutenberg/pull/48126))
+-   Update assertion Autocomplete end-to-end tests. ([48344](https://github.com/WordPress/gutenberg/pull/48344))
+-   [Automated Testing]: Fix wrong button fixture. ([48305](https://github.com/WordPress/gutenberg/pull/48305))
+-   Add typescript-eslint rules with type informations to end-to-end tests. ([48267](https://github.com/WordPress/gutenberg/pull/48267))
+-   Fix snapshots for Spacer mobile unit tests. ([48406](https://github.com/WordPress/gutenberg/pull/48406))
+-   Add command to run performance tests in debug mode. ([48614](https://github.com/WordPress/gutenberg/pull/48614))
+-   Make the performance tests more stable. ([48094](https://github.com/WordPress/gutenberg/pull/48094))
 
-- @abhi3315: Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
-- @hbhalodia: Update: Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
-- @sboerrigter: Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
-- @shreyasikhar: Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
-- @suvrodattamitu: Style Engine: Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
-- @tomdevisser: Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
+-   @abhi3315: Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
+-   @hbhalodia: Update: Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
+-   @sboerrigter: Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
+-   @shreyasikhar: Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
+-   @suvrodattamitu: Style Engine: Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
+-   @tomdevisser: Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
 
 ## Contributors
 
@@ -7172,23 +18279,17 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @abhi3315 @adamziel @afercia @alexstine @andrewserong @annezazu @brookewp @carolinan @chad1008 @ciampo @dcalhoun @draganescu @ellatrix @fluiddot @geriux @getdave @gvgvgvijayan @gziolo @hbhalodia @jorgefilipecosta @jsnajdr @kevin940726 @MaggieCabrera @Mamaduka @marekdedic @ndiego @ntsekouras @oandregal @ockham @richtabor @sboerrigter @scruffian @shreyasikhar @spacedmonkey @suvrodattamitu @t-hamano @tellthemachines @tomdevisser @tyxla @WunderBart @youknowriad
 
-
 = 15.2.4 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
-- [post-excerpt][15.2.3] Fix the "is rest api?" condition in the `post-excerpt` PHP package entry point. ([48654](https://github.com/WordPress/gutenberg/pull/48654))
-
-
-## First time contributors
-
-The following PRs were merged by first time contributors:
+-   [post-excerpt][15.2.3] Fix the "is rest api?" condition in the `post-excerpt` PHP package entry point. ([48654](https://github.com/WordPress/gutenberg/pull/48654))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -7196,279 +18297,304 @@ The following contributors merged PRs in this release:
 
 @fullofcaffeine
 
-
 = 15.3.0-rc.1 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
-- Duotone: Use the style engine to generate CSS for Duotone. ([48281](https://github.com/WordPress/gutenberg/pull/48281))
+-   Duotone: Use the style engine to generate CSS for Duotone. ([48281](https://github.com/WordPress/gutenberg/pull/48281))
 
 #### Block Library
-- Adds all allowed innerblocks to the inspector animation experiment. ([47834](https://github.com/WordPress/gutenberg/pull/47834))
-- Make the Site Logo block placeholder state smaller. ([48218](https://github.com/WordPress/gutenberg/pull/48218))
-- ToggleControl: Remove margin overrides and add opt-in prop. ([47866](https://github.com/WordPress/gutenberg/pull/47866))
-- [Post Terms]: Add transforms for variations. ([48328](https://github.com/WordPress/gutenberg/pull/48328))
+
+-   Adds all allowed innerblocks to the inspector animation experiment. ([47834](https://github.com/WordPress/gutenberg/pull/47834))
+-   Make the Site Logo block placeholder state smaller. ([48218](https://github.com/WordPress/gutenberg/pull/48218))
+-   ToggleControl: Remove margin overrides and add opt-in prop. ([47866](https://github.com/WordPress/gutenberg/pull/47866))
+-   [Post Terms]: Add transforms for variations. ([48328](https://github.com/WordPress/gutenberg/pull/48328))
 
 #### Site Editor
-- Refactor the site editor URLs for better backward compatibility. ([48063](https://github.com/WordPress/gutenberg/pull/48063))
-- Remove TemplateAreas from template details. ([48490](https://github.com/WordPress/gutenberg/pull/48490))
-- Update the edit button. ([48584](https://github.com/WordPress/gutenberg/pull/48584))
+
+-   Refactor the site editor URLs for better backward compatibility. ([48063](https://github.com/WordPress/gutenberg/pull/48063))
+-   Remove TemplateAreas from template details. ([48490](https://github.com/WordPress/gutenberg/pull/48490))
+-   Update the edit button. ([48584](https://github.com/WordPress/gutenberg/pull/48584))
 
 #### Components
-- TabPanel: Refactor unit tests in prep for controlled component updates. ([48086](https://github.com/WordPress/gutenberg/pull/48086))
-- VizReg end-to-end tests: Programmatically test all combinations of a given list of props/values. ([48260](https://github.com/WordPress/gutenberg/pull/48260))
+
+-   TabPanel: Refactor unit tests in prep for controlled component updates. ([48086](https://github.com/WordPress/gutenberg/pull/48086))
+-   VizReg end-to-end tests: Programmatically test all combinations of a given list of props/values. ([48260](https://github.com/WordPress/gutenberg/pull/48260))
 
 #### Design Tools
-- Border Panel: Add missing dep for `onBorderChange` callback. ([48010](https://github.com/WordPress/gutenberg/pull/48010))
+
+-   Border Panel: Add missing dep for `onBorderChange` callback. ([48010](https://github.com/WordPress/gutenberg/pull/48010))
 
 #### Block Editor
-- Apply keyboard shortcut conversions between paragraphs and headings to all editor instances. ([47972](https://github.com/WordPress/gutenberg/pull/47972))
+
+-   Apply keyboard shortcut conversions between paragraphs and headings to all editor instances. ([47972](https://github.com/WordPress/gutenberg/pull/47972))
 
 #### List View
-- Scroll selected block into view when single block selection changes. ([46895](https://github.com/WordPress/gutenberg/pull/46895))
 
+-   Scroll selected block into view when single block selection changes. ([46895](https://github.com/WordPress/gutenberg/pull/46895))
 
 ### Bug Fixes
 
-- Firefox: Fix input rules (React async state issue). ([48210](https://github.com/WordPress/gutenberg/pull/48210))
-- Fix Reset All button in the typography panel of the block inspector. ([48123](https://github.com/WordPress/gutenberg/pull/48123))
-- Fix block style preview flickering when a 'style' is focused. ([48418](https://github.com/WordPress/gutenberg/pull/48418))
-- Fix snapshots for Spacer mobile unit tests. ([48406](https://github.com/WordPress/gutenberg/pull/48406))
-- Fix: Add missing code on the fix page list loading PR. ([48621](https://github.com/WordPress/gutenberg/pull/48621))
-- Fix: Content only CPT template locking. ([48434](https://github.com/WordPress/gutenberg/pull/48434))
-- Fix: Inserter does not appear on sidebar navigation. ([48623](https://github.com/WordPress/gutenberg/pull/48623))
-- Fix: Make navigation page list load its items on navigation sidebar. ([47853](https://github.com/WordPress/gutenberg/pull/47853))
-- Fix: Multiple overwrites on rest_controller_class for wp_template/wp_template_part. ([48078](https://github.com/WordPress/gutenberg/pull/48078))
-- Playwright: Fix request utils for non Docker envs. ([48206](https://github.com/WordPress/gutenberg/pull/48206))
-- Remove broken site editor redirect. ([48283](https://github.com/WordPress/gutenberg/pull/48283))
-- Try to fix a11y test flakiness. ([48236](https://github.com/WordPress/gutenberg/pull/48236))
-- [Private APIs] Only prevent module re-registration if IS_WORDPRESS_CORE. ([48352](https://github.com/WordPress/gutenberg/pull/48352))
-- fix: Enable access to block settings within UBE. ([48435](https://github.com/WordPress/gutenberg/pull/48435))
+-   Firefox: Fix input rules (React async state issue). ([48210](https://github.com/WordPress/gutenberg/pull/48210))
+-   Fix Reset All button in the typography panel of the block inspector. ([48123](https://github.com/WordPress/gutenberg/pull/48123))
+-   Fix block style preview flickering when a 'style' is focused. ([48418](https://github.com/WordPress/gutenberg/pull/48418))
+-   Fix snapshots for Spacer mobile unit tests. ([48406](https://github.com/WordPress/gutenberg/pull/48406))
+-   Fix: Add missing code on the fix page list loading PR. ([48621](https://github.com/WordPress/gutenberg/pull/48621))
+-   Fix: Content only CPT template locking. ([48434](https://github.com/WordPress/gutenberg/pull/48434))
+-   Fix: Inserter does not appear on sidebar navigation. ([48623](https://github.com/WordPress/gutenberg/pull/48623))
+-   Fix: Make navigation page list load its items on navigation sidebar. ([47853](https://github.com/WordPress/gutenberg/pull/47853))
+-   Fix: Multiple overwrites on rest_controller_class for wp_template/wp_template_part. ([48078](https://github.com/WordPress/gutenberg/pull/48078))
+-   Playwright: Fix request utils for non Docker envs. ([48206](https://github.com/WordPress/gutenberg/pull/48206))
+-   Remove broken site editor redirect. ([48283](https://github.com/WordPress/gutenberg/pull/48283))
+-   Try to fix a11y test flakiness. ([48236](https://github.com/WordPress/gutenberg/pull/48236))
+-   [Private APIs] Only prevent module re-registration if IS_WORDPRESS_CORE. ([48352](https://github.com/WordPress/gutenberg/pull/48352))
+-   fix: Enable access to block settings within UBE. ([48435](https://github.com/WordPress/gutenberg/pull/48435))
 
 #### Site Editor
-- Fix Site Editor perf tests. ([48240](https://github.com/WordPress/gutenberg/pull/48240))
-- Fix routing for Classic themes using block-based template parts. ([48343](https://github.com/WordPress/gutenberg/pull/48343))
-- Fix the 'Browse all' link in the template details modal. ([48301](https://github.com/WordPress/gutenberg/pull/48301))
-- Fix the site editor home page loading when installed in a subdirectory. ([48363](https://github.com/WordPress/gutenberg/pull/48363))
-- Fix the tooltip and shortcut for the global save button. ([48282](https://github.com/WordPress/gutenberg/pull/48282))
-- Prevent distracting focused back button on site editor load. ([48472](https://github.com/WordPress/gutenberg/pull/48472))
-- Sort templates and template parts by slug. ([48473](https://github.com/WordPress/gutenberg/pull/48473))
-- Specify focus state color for template navigation button. ([48134](https://github.com/WordPress/gutenberg/pull/48134))
-- [Site Editor]: Set `html` block as freeform fallback block. ([48129](https://github.com/WordPress/gutenberg/pull/48129))
-
-#### Block Library
-- Add support for orientation-based block movers to core/social-links. ([48452](https://github.com/WordPress/gutenberg/pull/48452))
-- Fix Post Excerpt: Read more link is always on new line in the editor. ([47772](https://github.com/WordPress/gutenberg/pull/47772))
-- Fix: OffCanvasEditor does not inserts submenu on collapsed items. ([48214](https://github.com/WordPress/gutenberg/pull/48214))
-- List Item: Avoid an error when the 'onReplace' prop is undefined. ([48639](https://github.com/WordPress/gutenberg/pull/48639))
-- Prevent text decoration from showing up in all blocks. ([48117](https://github.com/WordPress/gutenberg/pull/48117))
-- Widget Importer: Don't render controls when there's nothing to import. ([48396](https://github.com/WordPress/gutenberg/pull/48396))
-- [Query Loop] Fix top border in pattern selection modal. ([48303](https://github.com/WordPress/gutenberg/pull/48303))
+
+-   Fix Site Editor perf tests. ([48240](https://github.com/WordPress/gutenberg/pull/48240))
+-   Fix routing for Classic themes using block-based template parts. ([48343](https://github.com/WordPress/gutenberg/pull/48343))
+-   Fix the 'Browse all' link in the template details modal. ([48301](https://github.com/WordPress/gutenberg/pull/48301))
+-   Fix the site editor home page loading when installed in a subdirectory. ([48363](https://github.com/WordPress/gutenberg/pull/48363))
+-   Fix the tooltip and shortcut for the global save button. ([48282](https://github.com/WordPress/gutenberg/pull/48282))
+-   Prevent distracting focused back button on site editor load. ([48472](https://github.com/WordPress/gutenberg/pull/48472))
+-   Sort templates and template parts by slug. ([48473](https://github.com/WordPress/gutenberg/pull/48473))
+-   Specify focus state color for template navigation button. ([48134](https://github.com/WordPress/gutenberg/pull/48134))
+-   [Site Editor]: Set `html` block as freeform fallback block. ([48129](https://github.com/WordPress/gutenberg/pull/48129))
+
+#### Block Library
+
+-   Add support for orientation-based block movers to core/social-links. ([48452](https://github.com/WordPress/gutenberg/pull/48452))
+-   Fix Post Excerpt: Read more link is always on new line in the editor. ([47772](https://github.com/WordPress/gutenberg/pull/47772))
+-   Fix: OffCanvasEditor does not inserts submenu on collapsed items. ([48214](https://github.com/WordPress/gutenberg/pull/48214))
+-   List Item: Avoid an error when the 'onReplace' prop is undefined. ([48639](https://github.com/WordPress/gutenberg/pull/48639))
+-   Prevent text decoration from showing up in all blocks. ([48117](https://github.com/WordPress/gutenberg/pull/48117))
+-   Widget Importer: Don't render controls when there's nothing to import. ([48396](https://github.com/WordPress/gutenberg/pull/48396))
+-   [Query Loop] Fix top border in pattern selection modal. ([48303](https://github.com/WordPress/gutenberg/pull/48303))
 
 #### Accessibility
-- Autocomplete: Duplicate list within iframe for non visual users. ([47907](https://github.com/WordPress/gutenberg/pull/47907))
-- Fix site editor switch mode message. ([48136](https://github.com/WordPress/gutenberg/pull/48136))
-- Fix the Publish region position and focus style. ([48102](https://github.com/WordPress/gutenberg/pull/48102))
-- Focus 1st parent block on block remove, if no previous block is available. ([48204](https://github.com/WordPress/gutenberg/pull/48204))
-- List view: Allow selected block to override roving tabindex. ([48339](https://github.com/WordPress/gutenberg/pull/48339))
-- Style Book: Allow button text labels for style book icon. ([48088](https://github.com/WordPress/gutenberg/pull/48088))
-- Style Book: Focus the Style Book when opened, and enable ESCAPE key to close. ([48151](https://github.com/WordPress/gutenberg/pull/48151))
+
+-   Autocomplete: Duplicate list within iframe for non visual users. ([47907](https://github.com/WordPress/gutenberg/pull/47907))
+-   Fix site editor switch mode message. ([48136](https://github.com/WordPress/gutenberg/pull/48136))
+-   Fix the Publish region position and focus style. ([48102](https://github.com/WordPress/gutenberg/pull/48102))
+-   Focus 1st parent block on block remove, if no previous block is available. ([48204](https://github.com/WordPress/gutenberg/pull/48204))
+-   List view: Allow selected block to override roving tabindex. ([48339](https://github.com/WordPress/gutenberg/pull/48339))
+-   Style Book: Allow button text labels for style book icon. ([48088](https://github.com/WordPress/gutenberg/pull/48088))
+-   Style Book: Focus the Style Book when opened, and enable ESCAPE key to close. ([48151](https://github.com/WordPress/gutenberg/pull/48151))
 
 #### Global Styles
--  Fix for `WP_Theme_JSON_Resolver_Gutenberg::Get_merged_data`. ([48644](https://github.com/WordPress/gutenberg/pull/48644))
-- Display preset names via the tooltip. ([48304](https://github.com/WordPress/gutenberg/pull/48304))
-- Fix typo in valid settings for fluid typography. ([48605](https://github.com/WordPress/gutenberg/pull/48605))
-- Prevent the global styles previews thumbnails from resizing on load. ([48474](https://github.com/WordPress/gutenberg/pull/48474))
-- Site Tagline: Add example so that it will display in style book. ([48300](https://github.com/WordPress/gutenberg/pull/48300))
+
+-   Fix for `WP_Theme_JSON_Resolver_Gutenberg::Get_merged_data`. ([48644](https://github.com/WordPress/gutenberg/pull/48644))
+-   Display preset names via the tooltip. ([48304](https://github.com/WordPress/gutenberg/pull/48304))
+-   Fix typo in valid settings for fluid typography. ([48605](https://github.com/WordPress/gutenberg/pull/48605))
+-   Prevent the global styles previews thumbnails from resizing on load. ([48474](https://github.com/WordPress/gutenberg/pull/48474))
+-   Site Tagline: Add example so that it will display in style book. ([48300](https://github.com/WordPress/gutenberg/pull/48300))
 
 #### Block Editor
-- MediaReplaceFlow: Fix styling for LinkControl. ([47949](https://github.com/WordPress/gutenberg/pull/47949))
-- [Inserter - Media tab]: Upload Openverse images when inserted. ([48501](https://github.com/WordPress/gutenberg/pull/48501))
+
+-   MediaReplaceFlow: Fix styling for LinkControl. ([47949](https://github.com/WordPress/gutenberg/pull/47949))
+-   [Inserter - Media tab]: Upload Openverse images when inserted. ([48501](https://github.com/WordPress/gutenberg/pull/48501))
 
 #### Block Validation/Deprecation
-- Only add layout classes to inner wrapper if block is a container. ([48611](https://github.com/WordPress/gutenberg/pull/48611))
+
+-   Only add layout classes to inner wrapper if block is a container. ([48611](https://github.com/WordPress/gutenberg/pull/48611))
 
 #### Testing
-- Add typescript-eslint rules with type informations to end-to-end tests. ([48267](https://github.com/WordPress/gutenberg/pull/48267))
+
+-   Add typescript-eslint rules with type informations to end-to-end tests. ([48267](https://github.com/WordPress/gutenberg/pull/48267))
 
 #### Widgets Editor
-- Widget Editor: Fix a problem with 'Move to Widget Area' button not working. ([48233](https://github.com/WordPress/gutenberg/pull/48233))
+
+-   Widget Editor: Fix a problem with 'Move to Widget Area' button not working. ([48233](https://github.com/WordPress/gutenberg/pull/48233))
 
 #### Post Editor
-- [Editor]: Select blocks in `outline` list. ([48118](https://github.com/WordPress/gutenberg/pull/48118))
 
+-   [Editor]: Select blocks in `outline` list. ([48118](https://github.com/WordPress/gutenberg/pull/48118))
 
 ### Performance
 
-- Autocomplete: Reduce work before finding trigger. ([48327](https://github.com/WordPress/gutenberg/pull/48327))
-- Block Editor: Improve empty `getBlockParents()` perf. ([48242](https://github.com/WordPress/gutenberg/pull/48242))
-- Disable lazy term meta loading render_block_core_template_part. ([48000](https://github.com/WordPress/gutenberg/pull/48000))
-- Fix perf regression in duotone hooks. ([48401](https://github.com/WordPress/gutenberg/pull/48401))
-- Lodash: Refactor away from `_.merge()`. ([48239](https://github.com/WordPress/gutenberg/pull/48239))
-- Lodash: Remove from integration tests. ([48122](https://github.com/WordPress/gutenberg/pull/48122))
-- Lodash: Remove remaining `_.get()` from `core-data`. ([48310](https://github.com/WordPress/gutenberg/pull/48310))
-- Rich text: Only selectively handle keyup/pointerup. ([48385](https://github.com/WordPress/gutenberg/pull/48385))
-- Rich text: Remove unnecessary handleSelectionChange call. ([48373](https://github.com/WordPress/gutenberg/pull/48373))
-- Rich text: Try removing store change on focus. ([48342](https://github.com/WordPress/gutenberg/pull/48342))
-- Writing flow: Avoid recalc style on every selection change. ([48409](https://github.com/WordPress/gutenberg/pull/48409))
+-   Autocomplete: Reduce work before finding trigger. ([48327](https://github.com/WordPress/gutenberg/pull/48327))
+-   Block Editor: Improve empty `getBlockParents()` perf. ([48242](https://github.com/WordPress/gutenberg/pull/48242))
+-   Disable lazy term meta loading render_block_core_template_part. ([48000](https://github.com/WordPress/gutenberg/pull/48000))
+-   Fix perf regression in duotone hooks. ([48401](https://github.com/WordPress/gutenberg/pull/48401))
+-   Lodash: Refactor away from `_.merge()`. ([48239](https://github.com/WordPress/gutenberg/pull/48239))
+-   Lodash: Remove from integration tests. ([48122](https://github.com/WordPress/gutenberg/pull/48122))
+-   Lodash: Remove remaining `_.get()` from `core-data`. ([48310](https://github.com/WordPress/gutenberg/pull/48310))
+-   Rich text: Only selectively handle keyup/pointerup. ([48385](https://github.com/WordPress/gutenberg/pull/48385))
+-   Rich text: Remove unnecessary handleSelectionChange call. ([48373](https://github.com/WordPress/gutenberg/pull/48373))
+-   Rich text: Try removing store change on focus. ([48342](https://github.com/WordPress/gutenberg/pull/48342))
+-   Writing flow: Avoid recalc style on every selection change. ([48409](https://github.com/WordPress/gutenberg/pull/48409))
 
 #### Components
-- Autocomplete: Avoid calling setState on input. ([48565](https://github.com/WordPress/gutenberg/pull/48565))
-- Autocomplete: Don't change state on every keystroke. ([48485](https://github.com/WordPress/gutenberg/pull/48485))
-- Lodash: Refactor context system provider away from `_.merge()`. ([48036](https://github.com/WordPress/gutenberg/pull/48036))
+
+-   Autocomplete: Avoid calling setState on input. ([48565](https://github.com/WordPress/gutenberg/pull/48565))
+-   Autocomplete: Don't change state on every keystroke. ([48485](https://github.com/WordPress/gutenberg/pull/48485))
+-   Lodash: Refactor context system provider away from `_.merge()`. ([48036](https://github.com/WordPress/gutenberg/pull/48036))
 
 #### Block Library
-- Lodash: Remove `_.merge()` from `getMappedColumnWidths()`. ([48032](https://github.com/WordPress/gutenberg/pull/48032))
-- Lodash: Remove some `_.get()` from Gallery block. ([48488](https://github.com/WordPress/gutenberg/pull/48488))
-- Lodash: Remove some `_.get()` from Image block. ([48489](https://github.com/WordPress/gutenberg/pull/48489))
+
+-   Lodash: Remove `_.merge()` from `getMappedColumnWidths()`. ([48032](https://github.com/WordPress/gutenberg/pull/48032))
+-   Lodash: Remove some `_.get()` from Gallery block. ([48488](https://github.com/WordPress/gutenberg/pull/48488))
+-   Lodash: Remove some `_.get()` from Image block. ([48489](https://github.com/WordPress/gutenberg/pull/48489))
 
 #### Post Editor
-- Lodash: Remove `_.get()` for post type usages. ([48121](https://github.com/WordPress/gutenberg/pull/48121))
-- Lodash: Remove remaining `_.get()` from `editor`. ([48314](https://github.com/WordPress/gutenberg/pull/48314))
-- Lodash: Remove some `_.get()` from editor. ([48104](https://github.com/WordPress/gutenberg/pull/48104))
 
+-   Lodash: Remove `_.get()` for post type usages. ([48121](https://github.com/WordPress/gutenberg/pull/48121))
+-   Lodash: Remove remaining `_.get()` from `editor`. ([48314](https://github.com/WordPress/gutenberg/pull/48314))
+-   Lodash: Remove some `_.get()` from editor. ([48104](https://github.com/WordPress/gutenberg/pull/48104))
 
 ### Experiments
 
 #### Block API
-- Tag Processor: Add bookmark invalidation logic. ([47559](https://github.com/WordPress/gutenberg/pull/47559))
 
+-   Tag Processor: Add bookmark invalidation logic. ([47559](https://github.com/WordPress/gutenberg/pull/47559))
 
 ### Documentation
 
-- Clarify backport status of `appearance-tools` theme support. ([48622](https://github.com/WordPress/gutenberg/pull/48622))
-- Docs: Clarify release process for major WP Beta 1. ([48248](https://github.com/WordPress/gutenberg/pull/48248))
-- Docs: Markdown fix for wp_enqueue_script usage. ([48212](https://github.com/WordPress/gutenberg/pull/48212))
-- Fix `e2e-test-utils-playwright`'s jsdoc and types. ([48266](https://github.com/WordPress/gutenberg/pull/48266))
-- Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
-- Proactively update versions in WordPress ahead of 6.2. ([48145](https://github.com/WordPress/gutenberg/pull/48145))
-- Update curation document to include theme.json filters. ([48576](https://github.com/WordPress/gutenberg/pull/48576))
-- Updates to the curating the editor experience to include 6.1 & 6.2 items. ([48294](https://github.com/WordPress/gutenberg/pull/48294))
-
+-   Clarify backport status of `appearance-tools` theme support. ([48622](https://github.com/WordPress/gutenberg/pull/48622))
+-   Docs: Clarify release process for major WP Beta 1. ([48248](https://github.com/WordPress/gutenberg/pull/48248))
+-   Docs: Markdown fix for wp_enqueue_script usage. ([48212](https://github.com/WordPress/gutenberg/pull/48212))
+-   Fix `e2e-test-utils-playwright`'s jsdoc and types. ([48266](https://github.com/WordPress/gutenberg/pull/48266))
+-   Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
+-   Proactively update versions in WordPress ahead of 6.2. ([48145](https://github.com/WordPress/gutenberg/pull/48145))
+-   Update curation document to include theme.json filters. ([48576](https://github.com/WordPress/gutenberg/pull/48576))
+-   Updates to the curating the editor experience to include 6.1 & 6.2 items. ([48294](https://github.com/WordPress/gutenberg/pull/48294))
 
 ### Code Quality
 
-- Style Engine: Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
-- ToolsPanel: Remove unnecessary dep from resetAll callback. ([48011](https://github.com/WordPress/gutenberg/pull/48011))
-- Update code position for constants and methods in `WP_Theme_JSON_Gutenberg` class. ([48631](https://github.com/WordPress/gutenberg/pull/48631))
-- `WP_Theme_JSON_Gutenberg`: Update comments to be aligned with core, so backports are easier. ([48624](https://github.com/WordPress/gutenberg/pull/48624))
+-   Style Engine: Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
+-   ToolsPanel: Remove unnecessary dep from resetAll callback. ([48011](https://github.com/WordPress/gutenberg/pull/48011))
+-   Update code position for constants and methods in `WP_Theme_JSON_Gutenberg` class. ([48631](https://github.com/WordPress/gutenberg/pull/48631))
+-   `WP_Theme_JSON_Gutenberg`: Update comments to be aligned with core, so backports are easier. ([48624](https://github.com/WordPress/gutenberg/pull/48624))
 
 #### Global Styles
-- Extract a DimensionsPanel component as a reusable component between Global Styles and Block Inspector. ([48070](https://github.com/WordPress/gutenberg/pull/48070))
-- Revert Site Tagline placeholder attribute, move example to block.json. ([48383](https://github.com/WordPress/gutenberg/pull/48383))
+
+-   Extract a DimensionsPanel component as a reusable component between Global Styles and Block Inspector. ([48070](https://github.com/WordPress/gutenberg/pull/48070))
+-   Revert Site Tagline placeholder attribute, move example to block.json. ([48383](https://github.com/WordPress/gutenberg/pull/48383))
 
 #### Components
-- CircularOptionPicker: Refactor to TypeScript. ([47937](https://github.com/WordPress/gutenberg/pull/47937))
-- `ToolsPanel`: Refactor unit tests to TypeScript. ([48275](https://github.com/WordPress/gutenberg/pull/48275))
+
+-   CircularOptionPicker: Refactor to TypeScript. ([47937](https://github.com/WordPress/gutenberg/pull/47937))
+-   `ToolsPanel`: Refactor unit tests to TypeScript. ([48275](https://github.com/WordPress/gutenberg/pull/48275))
 
 #### Block Library
-- Classic Block: Replace the deprecated `isPrimary` prop with `variant`. ([48230](https://github.com/WordPress/gutenberg/pull/48230))
-- Refactor core blocks to use HTML Tag Processor. ([43178](https://github.com/WordPress/gutenberg/pull/43178))
+
+-   Classic Block: Replace the deprecated `isPrimary` prop with `variant`. ([48230](https://github.com/WordPress/gutenberg/pull/48230))
+-   Refactor core blocks to use HTML Tag Processor. ([43178](https://github.com/WordPress/gutenberg/pull/43178))
 
 #### Post Editor
-- PageAttributesCheck: Return boolean value directly from the selector. ([48336](https://github.com/WordPress/gutenberg/pull/48336))
+
+-   PageAttributesCheck: Return boolean value directly from the selector. ([48336](https://github.com/WordPress/gutenberg/pull/48336))
 
 #### Rich Text
-- Extract delete handler to hook. ([48273](https://github.com/WordPress/gutenberg/pull/48273))
+
+-   Extract delete handler to hook. ([48273](https://github.com/WordPress/gutenberg/pull/48273))
 
 #### Data Layer
-- Fixed incorrect type annotations in @wordpress/data, part 2. ([48221](https://github.com/WordPress/gutenberg/pull/48221))
+
+-   Fixed incorrect type annotations in @wordpress/data, part 2. ([48221](https://github.com/WordPress/gutenberg/pull/48221))
 
 #### Design Tools
-- Avatar: Clean up border application in editor. ([48024](https://github.com/WordPress/gutenberg/pull/48024))
 
+-   Avatar: Clean up border application in editor. ([48024](https://github.com/WordPress/gutenberg/pull/48024))
 
 ### Tools
 
 #### Testing
-- Migrate `switch-to-draft` to Playwright. ([48120](https://github.com/WordPress/gutenberg/pull/48120))
-- Migrate block deletion end-to-end tests to Playwright. ([48012](https://github.com/WordPress/gutenberg/pull/48012))
-- Migrate list view end-to-end tests to Playwright. ([47919](https://github.com/WordPress/gutenberg/pull/47919))
-- Navigation block: End-to-end code quality fixes. ([48071](https://github.com/WordPress/gutenberg/pull/48071))
-- Remove old end-to-end tests for the navigation block. ([48126](https://github.com/WordPress/gutenberg/pull/48126))
-- Update assertion Autocomplete end-to-end tests. ([48344](https://github.com/WordPress/gutenberg/pull/48344))
-- [Automated Testing]: Fix wrong button fixture. ([48305](https://github.com/WordPress/gutenberg/pull/48305))
+
+-   Migrate `switch-to-draft` to Playwright. ([48120](https://github.com/WordPress/gutenberg/pull/48120))
+-   Migrate block deletion end-to-end tests to Playwright. ([48012](https://github.com/WordPress/gutenberg/pull/48012))
+-   Migrate list view end-to-end tests to Playwright. ([47919](https://github.com/WordPress/gutenberg/pull/47919))
+-   Navigation block: End-to-end code quality fixes. ([48071](https://github.com/WordPress/gutenberg/pull/48071))
+-   Remove old end-to-end tests for the navigation block. ([48126](https://github.com/WordPress/gutenberg/pull/48126))
+-   Update assertion Autocomplete end-to-end tests. ([48344](https://github.com/WordPress/gutenberg/pull/48344))
+-   [Automated Testing]: Fix wrong button fixture. ([48305](https://github.com/WordPress/gutenberg/pull/48305))
 
 #### Build Tooling
-- Add a manual performance job that we can trigger from Github UI. ([48302](https://github.com/WordPress/gutenberg/pull/48302))
-- Add command to run performance tests in debug mode. ([48614](https://github.com/WordPress/gutenberg/pull/48614))
-- Make the performance tests more stable. ([48094](https://github.com/WordPress/gutenberg/pull/48094))
-- SpacingSizesControl: Fix white dot on thumb. ([48574](https://github.com/WordPress/gutenberg/pull/48574))
-- Track new front-end metric: LCP-TTFB. ([48288](https://github.com/WordPress/gutenberg/pull/48288))
 
+-   Add a manual performance job that we can trigger from GitHub UI. ([48302](https://github.com/WordPress/gutenberg/pull/48302))
+-   Add command to run performance tests in debug mode. ([48614](https://github.com/WordPress/gutenberg/pull/48614))
+-   Make the performance tests more stable. ([48094](https://github.com/WordPress/gutenberg/pull/48094))
+-   SpacingSizesControl: Fix white dot on thumb. ([48574](https://github.com/WordPress/gutenberg/pull/48574))
+-   Track new front-end metric: LCP-TTFB. ([48288](https://github.com/WordPress/gutenberg/pull/48288))
 
 ### Various
 
-- Block alignment controls: Don't remount the block when alignments change. ([48209](https://github.com/WordPress/gutenberg/pull/48209))
-- Block editor: Create automatic change higher order reducer. ([48312](https://github.com/WordPress/gutenberg/pull/48312))
-- Duotone: Add Global Styles controls for blocks that support duotone. ([48255](https://github.com/WordPress/gutenberg/pull/48255))
-- Duotone: Use CSS variables instead of slugs in block attributes. ([48426](https://github.com/WordPress/gutenberg/pull/48426))
-- List block: Add Firefox end-to-end tests. ([48271](https://github.com/WordPress/gutenberg/pull/48271))
-- Pin `valtio` version. ([48237](https://github.com/WordPress/gutenberg/pull/48237))
-- Post editor: Revert iframed editor for WP core only. ([48076](https://github.com/WordPress/gutenberg/pull/48076))
-- Sync `gutenberg_build_query_vars_from_query_block` with core. ([48640](https://github.com/WordPress/gutenberg/pull/48640))
-- Update end-to-end test snapshots to Jest 29 default. ([48626](https://github.com/WordPress/gutenberg/pull/48626))
-- Update snapshot format to Jest 29 default. ([48366](https://github.com/WordPress/gutenberg/pull/48366))
-- Update: Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
-- Update: Disable layout toolbar controls for content locked blocks. ([47939](https://github.com/WordPress/gutenberg/pull/47939))
-- Use Duotone presets in block duotone attributes. ([48318](https://github.com/WordPress/gutenberg/pull/48318))
-- react-native-editor: Move parser tests to a test directory. ([48615](https://github.com/WordPress/gutenberg/pull/48615))
-- useAsyncList: Flush state updates when processing queue. ([48238](https://github.com/WordPress/gutenberg/pull/48238))
-
-#### Block Library
-- Navigation List View: Add block movers to the more menu. ([48099](https://github.com/WordPress/gutenberg/pull/48099))
-- Navigation: Always create a fallback menu. ([47684](https://github.com/WordPress/gutenberg/pull/47684))
-- Navigation: Don't create a fallback navigation menu if there are inner blocks. ([48585](https://github.com/WordPress/gutenberg/pull/48585))
-- Navigation: Don't create duplicate navigation menus. ([48599](https://github.com/WordPress/gutenberg/pull/48599))
-- Navigation: Update the dependencies for the useEffect that handles notifications. ([48066](https://github.com/WordPress/gutenberg/pull/48066))
-- Navigation: Wrap the dependent functions in useCallback. ([48195](https://github.com/WordPress/gutenberg/pull/48195))
-- Page List: Move the modal to its own file. ([47922](https://github.com/WordPress/gutenberg/pull/47922))
-- [New Block] Add post time to read block. ([43403](https://github.com/WordPress/gutenberg/pull/43403))
+-   Block alignment controls: Don't remount the block when alignments change. ([48209](https://github.com/WordPress/gutenberg/pull/48209))
+-   Block editor: Create automatic change higher order reducer. ([48312](https://github.com/WordPress/gutenberg/pull/48312))
+-   Duotone: Add Global Styles controls for blocks that support duotone. ([48255](https://github.com/WordPress/gutenberg/pull/48255))
+-   Duotone: Use CSS variables instead of slugs in block attributes. ([48426](https://github.com/WordPress/gutenberg/pull/48426))
+-   List block: Add Firefox end-to-end tests. ([48271](https://github.com/WordPress/gutenberg/pull/48271))
+-   Pin `valtio` version. ([48237](https://github.com/WordPress/gutenberg/pull/48237))
+-   Post editor: Revert iframed editor for WP core only. ([48076](https://github.com/WordPress/gutenberg/pull/48076))
+-   Sync `gutenberg_build_query_vars_from_query_block` with core. ([48640](https://github.com/WordPress/gutenberg/pull/48640))
+-   Update end-to-end test snapshots to Jest 29 default. ([48626](https://github.com/WordPress/gutenberg/pull/48626))
+-   Update snapshot format to Jest 29 default. ([48366](https://github.com/WordPress/gutenberg/pull/48366))
+-   Update: Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
+-   Update: Disable layout toolbar controls for content locked blocks. ([47939](https://github.com/WordPress/gutenberg/pull/47939))
+-   Use Duotone presets in block duotone attributes. ([48318](https://github.com/WordPress/gutenberg/pull/48318))
+-   react-native-editor: Move parser tests to a test directory. ([48615](https://github.com/WordPress/gutenberg/pull/48615))
+-   useAsyncList: Flush state updates when processing queue. ([48238](https://github.com/WordPress/gutenberg/pull/48238))
+
+#### Block Library
+
+-   Navigation List View: Add block movers to the more menu. ([48099](https://github.com/WordPress/gutenberg/pull/48099))
+-   Navigation: Always create a fallback menu. ([47684](https://github.com/WordPress/gutenberg/pull/47684))
+-   Navigation: Don't create a fallback navigation menu if there are inner blocks. ([48585](https://github.com/WordPress/gutenberg/pull/48585))
+-   Navigation: Don't create duplicate navigation menus. ([48599](https://github.com/WordPress/gutenberg/pull/48599))
+-   Navigation: Update the dependencies for the useEffect that handles notifications. ([48066](https://github.com/WordPress/gutenberg/pull/48066))
+-   Navigation: Wrap the dependent functions in useCallback. ([48195](https://github.com/WordPress/gutenberg/pull/48195))
+-   Page List: Move the modal to its own file. ([47922](https://github.com/WordPress/gutenberg/pull/47922))
+-   [New Block] Add post time to read block. ([43403](https://github.com/WordPress/gutenberg/pull/43403))
 
 #### Site Editor
-- Change "Browse all templates" to "Manage all templates" in template details popover. ([48496](https://github.com/WordPress/gutenberg/pull/48496))
-- Match color of the focus template view with site dark material. ([48430](https://github.com/WordPress/gutenberg/pull/48430))
-- Polish add template modal style. ([48445](https://github.com/WordPress/gutenberg/pull/48445))
-- Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
+
+-   Change "Browse all templates" to "Manage all templates" in template details popover. ([48496](https://github.com/WordPress/gutenberg/pull/48496))
+-   Match color of the focus template view with site dark material. ([48430](https://github.com/WordPress/gutenberg/pull/48430))
+-   Polish add template modal style. ([48445](https://github.com/WordPress/gutenberg/pull/48445))
+-   Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
 
 #### Accessibility
-- Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
-- Make the template customized info accessible. ([48159](https://github.com/WordPress/gutenberg/pull/48159))
+
+-   Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
+-   Make the template customized info accessible. ([48159](https://github.com/WordPress/gutenberg/pull/48159))
 
 #### Post Editor
-- Apply busy status to the publish button in progress and unify button width. ([48444](https://github.com/WordPress/gutenberg/pull/48444))
+
+-   Apply busy status to the publish button in progress and unify button width. ([48444](https://github.com/WordPress/gutenberg/pull/48444))
 
 #### Components
-- Pin `floating-ui/react-dom` version. ([48402](https://github.com/WordPress/gutenberg/pull/48402))
+
+-   Pin `floating-ui/react-dom` version. ([48402](https://github.com/WordPress/gutenberg/pull/48402))
 
 #### Global Styles
-- Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
+
+-   Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
 
 #### Reusable Blocks
-- Use React 18 rendering for import dropdown. ([48244](https://github.com/WordPress/gutenberg/pull/48244))
+
+-   Use React 18 rendering for import dropdown. ([48244](https://github.com/WordPress/gutenberg/pull/48244))
 
 #### Block API
-- HTML Tag Processor: Add WP 6.3 compat layer. ([47933](https://github.com/WordPress/gutenberg/pull/47933))
 
-#### Block Editor
-- [Inserter]: Preload media categories empty check - client side. ([47503](https://github.com/WordPress/gutenberg/pull/47503))
+-   HTML Tag Processor: Add WP 6.3 compat layer. ([47933](https://github.com/WordPress/gutenberg/pull/47933))
 
+#### Block Editor
 
-## First time contributors
+-   [Inserter]: Preload media categories empty check - client side. ([47503](https://github.com/WordPress/gutenberg/pull/47503))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @abhi3315: Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
-- @hbhalodia: Update: Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
-- @sboerrigter: Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
-- @shreyasikhar: Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
-- @suvrodattamitu: Style Engine: Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
-- @tomdevisser: Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
+The following PRs were merged by first-time contributors:
 
+-   @abhi3315: Link Control - Add support for text only labels. ([47930](https://github.com/WordPress/gutenberg/pull/47930))
+-   @hbhalodia: Update: Change higher order `with-constraint-tabbing` from `.js` to `.tsx`. ([48162](https://github.com/WordPress/gutenberg/pull/48162))
+-   @sboerrigter: Fix incorrect css property in editor-color-palette documentation. ([48333](https://github.com/WordPress/gutenberg/pull/48333))
+-   @shreyasikhar: Site Editor Sidebar: Add line-height for template/parts name and update width for edit button. ([48160](https://github.com/WordPress/gutenberg/pull/48160))
+-   @suvrodattamitu: Style Engine: Fix wrong property name letterSpacing to lineHeight. ([48091](https://github.com/WordPress/gutenberg/pull/48091))
+-   @tomdevisser: Remove copy for managing a block's style variations. ([48367](https://github.com/WordPress/gutenberg/pull/48367))
 
 ## Contributors
 
@@ -7476,39 +18602,33 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @abhi3315 @adamziel @afercia @alexstine @andrewserong @annezazu @brookewp @carolinan @chad1008 @ciampo @dcalhoun @draganescu @ellatrix @fluiddot @geriux @getdave @gvgvgvijayan @gziolo @hbhalodia @jorgefilipecosta @jsnajdr @kevin940726 @MaggieCabrera @Mamaduka @marekdedic @ndiego @ntsekouras @oandregal @ockham @richtabor @sboerrigter @scruffian @shreyasikhar @spacedmonkey @suvrodattamitu @t-hamano @tellthemachines @tomdevisser @tyxla @WunderBart @youknowriad
 
-
 = 15.2.3 =
 
 ## Changelog
 
 ### Bug Fixes
 
-- useAsyncList: flush state updates when processing queue (https://github.com/WordPress/gutenberg/pull/48238).
+-   useAsyncList: flush state updates when processing queue (https://github.com/WordPress/gutenberg/pull/48238).
 
 ## Contributors
 
 The following contributors merged PRs in this release:
 
-@jsnajdr 
-
+@jsnajdr
 
 = 15.2.2 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Layout
-- Post Editor: Update postContentBlock check to see if the block is valid. ([48386](https://github.com/WordPress/gutenberg/pull/48386))
 
+-   Post Editor: Update postContentBlock check to see if the block is valid. ([48386](https://github.com/WordPress/gutenberg/pull/48386))
 
-## First time contributors
-
-The following PRs were merged by first time contributors:
-
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -7516,23 +18636,17 @@ The following contributors merged PRs in this release:
 
 @andrewserong
 
-
 = 15.2.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
-- Skip redundant registration for Fonts API-registered fonts. ([48341](https://github.com/WordPress/gutenberg/pull/48341))
-
-
-## First time contributors
-
-The following PRs were merged by first time contributors:
+-   Skip redundant registration for Fonts API-registered fonts. ([48341](https://github.com/WordPress/gutenberg/pull/48341))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -7540,7 +18654,6 @@ The following contributors merged PRs in this release:
 
 @ironprogrammer
 
-
 = 15.2.0 =
 
 ## Changelog
@@ -7549,307 +18662,304 @@ The following contributors merged PRs in this release:
 
 #### Working with Templates
 
-- Add a nested level when selecting templates or template parts. ([47777](https://github.com/WordPress/gutenberg/pull/47777))
-- Add: Modal to choose a start pattern on new templates. ([46248](https://github.com/WordPress/gutenberg/pull/46248))
-- Update gutenberg_get_template_hierarchy. ([47716](https://github.com/WordPress/gutenberg/pull/47716))
-- Add template revision button. ([45215](https://github.com/WordPress/gutenberg/pull/45215))
+-   Add a nested level when selecting templates or template parts. ([47777](https://github.com/WordPress/gutenberg/pull/47777))
+-   Add: Modal to choose a start pattern on new templates. ([46248](https://github.com/WordPress/gutenberg/pull/46248))
+-   Update gutenberg_get_template_hierarchy. ([47716](https://github.com/WordPress/gutenberg/pull/47716))
+-   Add template revision button. ([45215](https://github.com/WordPress/gutenberg/pull/45215))
 
 #### Site Editor
 
-- Add back link to Design heading in site editor navigation to return to Dashboard. ([47950](https://github.com/WordPress/gutenberg/pull/47950))
-- Adds a global save button to the site editor. ([47142](https://github.com/WordPress/gutenberg/pull/47142))
-- Tidy up the generation of the site editor page title. ([48053](https://github.com/WordPress/gutenberg/pull/48053))
+-   Add back link to Design heading in site editor navigation to return to Dashboard. ([47950](https://github.com/WordPress/gutenberg/pull/47950))
+-   Adds a global save button to the site editor. ([47142](https://github.com/WordPress/gutenberg/pull/47142))
+-   Tidy up the generation of the site editor page title. ([48053](https://github.com/WordPress/gutenberg/pull/48053))
 
 #### Block Library
 
-- Button: Update: Make button a content block. ([47936](https://github.com/WordPress/gutenberg/pull/47936))
-- File block: Add color block support to File block. ([41870](https://github.com/WordPress/gutenberg/pull/41870))
-- Navigation: Add integration tests for NavigationMenuSelector component. ([47825](https://github.com/WordPress/gutenberg/pull/47825))
-- Navigation: Updates "Add Submenu item" text to "Add Submenu link". ([48030](https://github.com/WordPress/gutenberg/pull/48030))
-- Post excerpt: Add excerpt length control. ([44964](https://github.com/WordPress/gutenberg/pull/44964))
-- Update: Make OffCanvasEditor use LeafMoreMenu by default. ([47844](https://github.com/WordPress/gutenberg/pull/47844))
-- Add aspect-ratio to post featured image block. ([47854](https://github.com/WordPress/gutenberg/pull/47854))
-- Button: Adopt support for border color, style, and width. ([44574](https://github.com/WordPress/gutenberg/pull/44574))
-- Latest Comments: Add typography support. ([43310](https://github.com/WordPress/gutenberg/pull/43310))
-- Verse: Adopt border supports. ([48021](https://github.com/WordPress/gutenberg/pull/48021))
+-   Button: Update: Make button a content block. ([47936](https://github.com/WordPress/gutenberg/pull/47936))
+-   File block: Add color block support to File block. ([41870](https://github.com/WordPress/gutenberg/pull/41870))
+-   Navigation: Add integration tests for NavigationMenuSelector component. ([47825](https://github.com/WordPress/gutenberg/pull/47825))
+-   Navigation: Updates "Add Submenu item" text to "Add Submenu link". ([48030](https://github.com/WordPress/gutenberg/pull/48030))
+-   Post excerpt: Add excerpt length control. ([44964](https://github.com/WordPress/gutenberg/pull/44964))
+-   Update: Make OffCanvasEditor use LeafMoreMenu by default. ([47844](https://github.com/WordPress/gutenberg/pull/47844))
+-   Add aspect-ratio to post featured image block. ([47854](https://github.com/WordPress/gutenberg/pull/47854))
+-   Button: Adopt support for border color, style, and width. ([44574](https://github.com/WordPress/gutenberg/pull/44574))
+-   Latest Comments: Add typography support. ([43310](https://github.com/WordPress/gutenberg/pull/43310))
+-   Verse: Adopt border supports. ([48021](https://github.com/WordPress/gutenberg/pull/48021))
 
 #### Global Styles
 
-- Extract the Global Styles Typography Panel into block-editor package. ([47356](https://github.com/WordPress/gutenberg/pull/47356))
-- Move more link about custom CSS to part of description. ([47781](https://github.com/WordPress/gutenberg/pull/47781))
-- Site Editor: Update 'Additional CSS' subtitle string. ([47671](https://github.com/WordPress/gutenberg/pull/47671))
-- Style Book: Exclude blocks that are not allowed to insert. ([47461](https://github.com/WordPress/gutenberg/pull/47461))
+-   Extract the Global Styles Typography Panel into block-editor package. ([47356](https://github.com/WordPress/gutenberg/pull/47356))
+-   Move more link about custom CSS to part of description. ([47781](https://github.com/WordPress/gutenberg/pull/47781))
+-   Site Editor: Update 'Additional CSS' subtitle string. ([47671](https://github.com/WordPress/gutenberg/pull/47671))
+-   Style Book: Exclude blocks that are not allowed to insert. ([47461](https://github.com/WordPress/gutenberg/pull/47461))
 
 #### Block Editor
 
-- Migrate from TextControl to NumberControl to remove margin overrides. ([47160](https://github.com/WordPress/gutenberg/pull/47160))
-- Add settings "drawer" to Link Control. ([47328](https://github.com/WordPress/gutenberg/pull/47328))
-- Button: Prepend HTTP to Buttons block links when missing protocol. ([47311](https://github.com/WordPress/gutenberg/pull/47311))
-- Show a pointer/hint in the settings tab informing the user about the styles tab. ([47670](https://github.com/WordPress/gutenberg/pull/47670))
-- [Patterns]: Reorder pattern categories. ([47760](https://github.com/WordPress/gutenberg/pull/47760))
-
+-   Migrate from TextControl to NumberControl to remove margin overrides. ([47160](https://github.com/WordPress/gutenberg/pull/47160))
+-   Add settings "drawer" to Link Control. ([47328](https://github.com/WordPress/gutenberg/pull/47328))
+-   Button: Prepend HTTP to Buttons block links when missing protocol. ([47311](https://github.com/WordPress/gutenberg/pull/47311))
+-   Show a pointer/hint in the settings tab informing the user about the styles tab. ([47670](https://github.com/WordPress/gutenberg/pull/47670))
+-   [Patterns]: Reorder pattern categories. ([47760](https://github.com/WordPress/gutenberg/pull/47760))
 
 #### Components
 
-- Add parent navigation support for the navigator component. ([47883](https://github.com/WordPress/gutenberg/pull/47883))
-- Zoom out mode: Scale iframe instead of contents. ([47004](https://github.com/WordPress/gutenberg/pull/47004))
-- Components: Add support for named arguments in the navigator components. ([47827](https://github.com/WordPress/gutenberg/pull/47827))
-
+-   Add parent navigation support for the navigator component. ([47883](https://github.com/WordPress/gutenberg/pull/47883))
+-   Zoom out mode: Scale iframe instead of contents. ([47004](https://github.com/WordPress/gutenberg/pull/47004))
+-   Components: Add support for named arguments in the navigator components. ([47827](https://github.com/WordPress/gutenberg/pull/47827))
 
 ### Bug Fixes
 
 #### Block Library
 
-- Embed: Fix: Remove browser default border for iframe in the editor. ([47987](https://github.com/WordPress/gutenberg/pull/47987))
-- File block: Re-add editor styles for classic themes. ([47686](https://github.com/WordPress/gutenberg/pull/47686))
-- Image: Revert "Prevent the image from being resized larger than its container". ([47846](https://github.com/WordPress/gutenberg/pull/47846))
-- Image: Update image block margins on RTL. ([47617](https://github.com/WordPress/gutenberg/pull/47617))
-- Navigation Block inspector: Fix link UI popover opening on links that have a URL. ([47828](https://github.com/WordPress/gutenberg/pull/47828))
-- Navigation: Close Link UI if cancelled. ([48029](https://github.com/WordPress/gutenberg/pull/48029))
-- Navigation: Enable undo after creating a new menu. ([47683](https://github.com/WordPress/gutenberg/pull/47683))
-- Navigation: Fixes undo and redo for nesting operations in the navigation block's inspector. ([47633](https://github.com/WordPress/gutenberg/pull/47633))
-- Navigation: Remove the IS_GUTENBERG_PLUGIN check around block_core_navigation_parse_blocks_from_menu_items. ([47824](https://github.com/WordPress/gutenberg/pull/47824))
-- Navigation: Update deps for the useEffect that creates navigation menus. ([47912](https://github.com/WordPress/gutenberg/pull/47912))
-- OffCanvasEditor: Only allow some blocks to be converted to submenus. ([47974](https://github.com/WordPress/gutenberg/pull/47974))
-- Page List: Respect the selected parent page when converting to a list of navigation links. ([47651](https://github.com/WordPress/gutenberg/pull/47651))
-- Read More: I18N: Update string concatenation method in read more block. ([47815](https://github.com/WordPress/gutenberg/pull/47815))
-- ToolsPanel: Display optional items when values are updated externally. ([47727](https://github.com/WordPress/gutenberg/pull/47727))
-- [Quote]: Fix deprectated large style specificity rule. ([47969](https://github.com/WordPress/gutenberg/pull/47969))
-- Fix the 'WP_HTML_Tag_Processor' file path. ([47823](https://github.com/WordPress/gutenberg/pull/47823))
-- Cover: Ensure url is not malformed due to sanitization through wp_kses. ([47906](https://github.com/WordPress/gutenberg/pull/47906))
+-   Embed: Fix: Remove browser default border for iframe in the editor. ([47987](https://github.com/WordPress/gutenberg/pull/47987))
+-   File block: Re-add editor styles for classic themes. ([47686](https://github.com/WordPress/gutenberg/pull/47686))
+-   Image: Revert "Prevent the image from being resized larger than its container". ([47846](https://github.com/WordPress/gutenberg/pull/47846))
+-   Image: Update image block margins on RTL. ([47617](https://github.com/WordPress/gutenberg/pull/47617))
+-   Navigation Block inspector: Fix link UI popover opening on links that have a URL. ([47828](https://github.com/WordPress/gutenberg/pull/47828))
+-   Navigation: Close Link UI if cancelled. ([48029](https://github.com/WordPress/gutenberg/pull/48029))
+-   Navigation: Enable undo after creating a new menu. ([47683](https://github.com/WordPress/gutenberg/pull/47683))
+-   Navigation: Fixes undo and redo for nesting operations in the navigation block's inspector. ([47633](https://github.com/WordPress/gutenberg/pull/47633))
+-   Navigation: Remove the IS_GUTENBERG_PLUGIN check around block_core_navigation_parse_blocks_from_menu_items. ([47824](https://github.com/WordPress/gutenberg/pull/47824))
+-   Navigation: Update deps for the useEffect that creates navigation menus. ([47912](https://github.com/WordPress/gutenberg/pull/47912))
+-   OffCanvasEditor: Only allow some blocks to be converted to submenus. ([47974](https://github.com/WordPress/gutenberg/pull/47974))
+-   Page List: Respect the selected parent page when converting to a list of navigation links. ([47651](https://github.com/WordPress/gutenberg/pull/47651))
+-   Read More: I18N: Update string concatenation method in read more block. ([47815](https://github.com/WordPress/gutenberg/pull/47815))
+-   ToolsPanel: Display optional items when values are updated externally. ([47727](https://github.com/WordPress/gutenberg/pull/47727))
+-   [Quote]: Fix deprectated large style specificity rule. ([47969](https://github.com/WordPress/gutenberg/pull/47969))
+-   Fix the 'WP_HTML_Tag_Processor' file path. ([47823](https://github.com/WordPress/gutenberg/pull/47823))
+-   Cover: Ensure url is not malformed due to sanitization through wp_kses. ([47906](https://github.com/WordPress/gutenberg/pull/47906))
 
 #### Site Editor
 
-- [Block Editor]: Lock blockInspectorAnimation setting. ([47740](https://github.com/WordPress/gutenberg/pull/47740))
-- Disable Strict Mode, breaks dev site editor. ([47701](https://github.com/WordPress/gutenberg/pull/47701))
-- Add: Modal to choose a start pattern on new templates. Take 2. ([47927](https://github.com/WordPress/gutenberg/pull/47927))
-- Fix ComplementaryArea's initial isActive state. ([47498](https://github.com/WordPress/gutenberg/pull/47498))
-- Fix custom Template Parts rename action. ([47932](https://github.com/WordPress/gutenberg/pull/47932))
-- Fix site editor navigation. ([48025](https://github.com/WordPress/gutenberg/pull/48025))
-- Shadow: Move shadow into own panel. ([47634](https://github.com/WordPress/gutenberg/pull/47634))
-- Specify active state color for template navigation button. ([47851](https://github.com/WordPress/gutenberg/pull/47851))
+-   [Block Editor]: Lock blockInspectorAnimation setting. ([47740](https://github.com/WordPress/gutenberg/pull/47740))
+-   Disable Strict Mode, breaks dev site editor. ([47701](https://github.com/WordPress/gutenberg/pull/47701))
+-   Add: Modal to choose a start pattern on new templates. Take 2. ([47927](https://github.com/WordPress/gutenberg/pull/47927))
+-   Fix ComplementaryArea's initial isActive state. ([47498](https://github.com/WordPress/gutenberg/pull/47498))
+-   Fix custom Template Parts rename action. ([47932](https://github.com/WordPress/gutenberg/pull/47932))
+-   Fix site editor navigation. ([48025](https://github.com/WordPress/gutenberg/pull/48025))
+-   Shadow: Move shadow into own panel. ([47634](https://github.com/WordPress/gutenberg/pull/47634))
+-   Specify active state color for template navigation button. ([47851](https://github.com/WordPress/gutenberg/pull/47851))
 
 #### Block Editor
 
-- useBlockSync: Change subscribed.current on unsubscribe. ([47752](https://github.com/WordPress/gutenberg/pull/47752))
-- Edit Post: Fix the 'inlineToolbar' settings toggle. ([47960](https://github.com/WordPress/gutenberg/pull/47960))
-- Fix clicking on the toggle button not closing the block inserter. ([47926](https://github.com/WordPress/gutenberg/pull/47926))
-- LinkControl: Fix scrollbar displayed on toggle link settings. ([47986](https://github.com/WordPress/gutenberg/pull/47986))
-- Rich text: Stabilise onFocus. ([47685](https://github.com/WordPress/gutenberg/pull/47685))
-- Block Spacing: Don't show UI when only one direction is supported. ([47523](https://github.com/WordPress/gutenberg/pull/47523))
-- [Layout]: Fix align controls for hybrid themes. ([47961](https://github.com/WordPress/gutenberg/pull/47961))
+-   useBlockSync: Change subscribed.current on unsubscribe. ([47752](https://github.com/WordPress/gutenberg/pull/47752))
+-   Edit Post: Fix the 'inlineToolbar' settings toggle. ([47960](https://github.com/WordPress/gutenberg/pull/47960))
+-   Fix clicking on the toggle button not closing the block inserter. ([47926](https://github.com/WordPress/gutenberg/pull/47926))
+-   LinkControl: Fix scrollbar displayed on toggle link settings. ([47986](https://github.com/WordPress/gutenberg/pull/47986))
+-   Rich text: Stabilise onFocus. ([47685](https://github.com/WordPress/gutenberg/pull/47685))
+-   Block Spacing: Don't show UI when only one direction is supported. ([47523](https://github.com/WordPress/gutenberg/pull/47523))
+-   [Layout]: Fix align controls for hybrid themes. ([47961](https://github.com/WordPress/gutenberg/pull/47961))
 
 #### Design Tools
 
-- Avatar: Fix application of borders. ([47630](https://github.com/WordPress/gutenberg/pull/47630))
-- Image: Allow deprecated blocks to render border-radius. ([47766](https://github.com/WordPress/gutenberg/pull/47766))
-- ToolsPanel: Ensure display of optional items when panel id is null. ([47864](https://github.com/WordPress/gutenberg/pull/47864))
+-   Avatar: Fix application of borders. ([47630](https://github.com/WordPress/gutenberg/pull/47630))
+-   Image: Allow deprecated blocks to render border-radius. ([47766](https://github.com/WordPress/gutenberg/pull/47766))
+-   ToolsPanel: Ensure display of optional items when panel id is null. ([47864](https://github.com/WordPress/gutenberg/pull/47864))
 
 #### Global Styles
 
-- Fix incorrect targeting of block wrappers for root padding in the edi…. ([48002](https://github.com/WordPress/gutenberg/pull/48002))
-- Fix infinite render of inline block preview. ([47697](https://github.com/WordPress/gutenberg/pull/47697))
-- Fix: Issues on block level settings. ([47842](https://github.com/WordPress/gutenberg/pull/47842))
+-   Fix incorrect targeting of block wrappers for root padding in the edi…. ([48002](https://github.com/WordPress/gutenberg/pull/48002))
+-   Fix infinite render of inline block preview. ([47697](https://github.com/WordPress/gutenberg/pull/47697))
+-   Fix: Issues on block level settings. ([47842](https://github.com/WordPress/gutenberg/pull/47842))
 
 #### Components
 
-- ColorPalette: Ensure text label contrast checking works with CSS variables. ([47373](https://github.com/WordPress/gutenberg/pull/47373))
-- SelectControl: Fix multiple prop styling. ([47893](https://github.com/WordPress/gutenberg/pull/47893))
+-   ColorPalette: Ensure text label contrast checking works with CSS variables. ([47373](https://github.com/WordPress/gutenberg/pull/47373))
+-   SelectControl: Fix multiple prop styling. ([47893](https://github.com/WordPress/gutenberg/pull/47893))
 
 #### Post Editor
 
-- Fix multi entities saved state in the post editor. ([47734](https://github.com/WordPress/gutenberg/pull/47734))
-- LocalAutosaveNotice: Use stable notice id to prevent double notices. ([47776](https://github.com/WordPress/gutenberg/pull/47776))
-- Distraction free mode: Fix keyboard shortcut not working. ([47900](https://github.com/WordPress/gutenberg/pull/47900))
-- Term sorting is incorrect in flat term selector. ([47795](https://github.com/WordPress/gutenberg/pull/47795))
-- useResizeObserver: Handle strict mode double effects. ([47703](https://github.com/WordPress/gutenberg/pull/47703))
+-   Fix multi entities saved state in the post editor. ([47734](https://github.com/WordPress/gutenberg/pull/47734))
+-   LocalAutosaveNotice: Use stable notice id to prevent double notices. ([47776](https://github.com/WordPress/gutenberg/pull/47776))
+-   Distraction free mode: Fix keyboard shortcut not working. ([47900](https://github.com/WordPress/gutenberg/pull/47900))
+-   Term sorting is incorrect in flat term selector. ([47795](https://github.com/WordPress/gutenberg/pull/47795))
+-   useResizeObserver: Handle strict mode double effects. ([47703](https://github.com/WordPress/gutenberg/pull/47703))
 
 ### Accessibility
 
-- List view: Modify the shortcut to focus while open. ([45135](https://github.com/WordPress/gutenberg/pull/45135))
-- Add an aria label to the site save dialog. ([47898](https://github.com/WordPress/gutenberg/pull/47898))
-- Fix UrlInput combobox to use the ARIA 1.0 pattern. ([47148](https://github.com/WordPress/gutenberg/pull/47148))
-- Fix constrained tabbing failures with Safari and Firefox. ([47426](https://github.com/WordPress/gutenberg/pull/47426))
-- Fix the headings hierarchy in the styles sidebar. ([43848](https://github.com/WordPress/gutenberg/pull/43848))
-- Site Editor: Append template type and name to the site editor page title. ([47855](https://github.com/WordPress/gutenberg/pull/47855))
-- Template editor: Only disable the save button if no changes rather than hiding it. ([47895](https://github.com/WordPress/gutenberg/pull/47895))
+-   List view: Modify the shortcut to focus while open. ([45135](https://github.com/WordPress/gutenberg/pull/45135))
+-   Add an aria label to the site save dialog. ([47898](https://github.com/WordPress/gutenberg/pull/47898))
+-   Fix UrlInput combobox to use the ARIA 1.0 pattern. ([47148](https://github.com/WordPress/gutenberg/pull/47148))
+-   Fix constrained tabbing failures with Safari and Firefox. ([47426](https://github.com/WordPress/gutenberg/pull/47426))
+-   Fix the headings hierarchy in the styles sidebar. ([43848](https://github.com/WordPress/gutenberg/pull/43848))
+-   Site Editor: Append template type and name to the site editor page title. ([47855](https://github.com/WordPress/gutenberg/pull/47855))
+-   Template editor: Only disable the save button if no changes rather than hiding it. ([47895](https://github.com/WordPress/gutenberg/pull/47895))
 
 ### Performance
 
-- Avoid string-allocation on keypress with inputRule. ([47094](https://github.com/WordPress/gutenberg/pull/47094))
-- Fix empty results handling in performance test results. ([47646](https://github.com/WordPress/gutenberg/pull/47646))
-- Fix typo in performance script name. ([47647](https://github.com/WordPress/gutenberg/pull/47647))
-- Lodash: Remove from @wordpress/keycodes package. ([47737](https://github.com/WordPress/gutenberg/pull/47737))
+-   Avoid string-allocation on keypress with inputRule. ([47094](https://github.com/WordPress/gutenberg/pull/47094))
+-   Fix empty results handling in performance test results. ([47646](https://github.com/WordPress/gutenberg/pull/47646))
+-   Fix typo in performance script name. ([47647](https://github.com/WordPress/gutenberg/pull/47647))
+-   Lodash: Remove from @wordpress/keycodes package. ([47737](https://github.com/WordPress/gutenberg/pull/47737))
 
 #### Block Editor
 
-- Block Editor: Optimize __unstableGetVisibleBlocks(). ([47681](https://github.com/WordPress/gutenberg/pull/47681))
+-   Block Editor: Optimize \_\_unstableGetVisibleBlocks(). ([47681](https://github.com/WordPress/gutenberg/pull/47681))
 
 #### Site Editor
 
-- Enable React StrictMode again. ([47639](https://github.com/WordPress/gutenberg/pull/47639))
+-   Enable React StrictMode again. ([47639](https://github.com/WordPress/gutenberg/pull/47639))
 
 #### Block Library
 
-- Navigation: Performance: Improve params in block_core_navigation_get_most_recently_published_navigation. ([47998](https://github.com/WordPress/gutenberg/pull/47998))
-- Page List: Block improvement.. ([47981](https://github.com/WordPress/gutenberg/pull/47981))
-- Page List: Performance: Improve page list callback. ([48004](https://github.com/WordPress/gutenberg/pull/48004))
-- Post Title: Performance: Render_block_core_post_title - Use post object instead of id. ([48001](https://github.com/WordPress/gutenberg/pull/48001))
-- Template Part: Performance: Replace usage of wp_get_theme()->get_stylesheet() with get_stylesheet(). ([48027](https://github.com/WordPress/gutenberg/pull/48027))
-- Tweaks to gutenberg_render_layout_support_flag. ([48003](https://github.com/WordPress/gutenberg/pull/48003))
+-   Navigation: Performance: Improve params in block_core_navigation_get_most_recently_published_navigation. ([47998](https://github.com/WordPress/gutenberg/pull/47998))
+-   Page List: Block improvement.. ([47981](https://github.com/WordPress/gutenberg/pull/47981))
+-   Page List: Performance: Improve page list callback. ([48004](https://github.com/WordPress/gutenberg/pull/48004))
+-   Post Title: Performance: Render_block_core_post_title - Use post object instead of id. ([48001](https://github.com/WordPress/gutenberg/pull/48001))
+-   Template Part: Performance: Replace usage of wp_get_theme()->get_stylesheet() with get_stylesheet(). ([48027](https://github.com/WordPress/gutenberg/pull/48027))
+-   Tweaks to gutenberg_render_layout_support_flag. ([48003](https://github.com/WordPress/gutenberg/pull/48003))
 
 #### Data Layer
 
-- Lodash: Refactor away from _.get() in resolvers cache middleware. ([47743](https://github.com/WordPress/gutenberg/pull/47743))
-- Lodash: Refactor away from _.mapValues() in data registry. ([47742](https://github.com/WordPress/gutenberg/pull/47742))
-- Lodash: Refactor persistence plugin away from _.merge(). ([47790](https://github.com/WordPress/gutenberg/pull/47790))
-- Lodash: Remove from @wordpress/data's getResolutionState(). ([47838](https://github.com/WordPress/gutenberg/pull/47838))
-- Lodash: Remove from @wordpress/data. ([47848](https://github.com/WordPress/gutenberg/pull/47848))
-- Lodash: Remove from useDispatchWithMap(). ([47835](https://github.com/WordPress/gutenberg/pull/47835))
+-   Lodash: Refactor away from \_.get() in resolvers cache middleware. ([47743](https://github.com/WordPress/gutenberg/pull/47743))
+-   Lodash: Refactor away from \_.mapValues() in data registry. ([47742](https://github.com/WordPress/gutenberg/pull/47742))
+-   Lodash: Refactor persistence plugin away from \_.merge(). ([47790](https://github.com/WordPress/gutenberg/pull/47790))
+-   Lodash: Remove from @wordpress/data's getResolutionState(). ([47838](https://github.com/WordPress/gutenberg/pull/47838))
+-   Lodash: Remove from @wordpress/data. ([47848](https://github.com/WordPress/gutenberg/pull/47848))
+-   Lodash: Remove from useDispatchWithMap(). ([47835](https://github.com/WordPress/gutenberg/pull/47835))
 
 #### Template Editor
 
-- Disable lazy loading term meta get_block_templates. ([47999](https://github.com/WordPress/gutenberg/pull/47999))
+-   Disable lazy loading term meta get_block_templates. ([47999](https://github.com/WordPress/gutenberg/pull/47999))
 
 #### Themes
 
-- Improvements on append_to_selector method. ([47833](https://github.com/WordPress/gutenberg/pull/47833))
+-   Improvements on append_to_selector method. ([47833](https://github.com/WordPress/gutenberg/pull/47833))
 
 #### Block Directory
 
-- Optimize DownloadableBlocksPanel. ([47679](https://github.com/WordPress/gutenberg/pull/47679))
+-   Optimize DownloadableBlocksPanel. ([47679](https://github.com/WordPress/gutenberg/pull/47679))
 
 ### Experiments
 
-- Handle block metadata attribute and related experimental APIs. ([47791](https://github.com/WordPress/gutenberg/pull/47791))
-- Rename the "experiments" export to "privateApis". ([47975](https://github.com/WordPress/gutenberg/pull/47975))
-- [Trunk] Rename experiments package to private-apis. ([47839](https://github.com/WordPress/gutenberg/pull/47839))
+-   Handle block metadata attribute and related experimental APIs. ([47791](https://github.com/WordPress/gutenberg/pull/47791))
+-   Rename the "experiments" export to "privateApis". ([47975](https://github.com/WordPress/gutenberg/pull/47975))
+-   [Trunk] Rename experiments package to private-apis. ([47839](https://github.com/WordPress/gutenberg/pull/47839))
 
 ### Documentation
 
-- Add: Database credentials to wp-env documentation. ([47940](https://github.com/WordPress/gutenberg/pull/47940))
-- Block schema and block supports docs: Add dimensions and position settings. ([48057](https://github.com/WordPress/gutenberg/pull/48057))
-- Components: Polish heading level component APIs. ([47788](https://github.com/WordPress/gutenberg/pull/47788))
-- Docs: Add ancestor property to block-registration.md doc. ([45832](https://github.com/WordPress/gutenberg/pull/45832))
-- Docs: Don't recommend using short array syntax in WP_HTML_Tag_Processor. ([47958](https://github.com/WordPress/gutenberg/pull/47958))
-- Docs: Fix the incorrect link to eslint-plugin-jsx-a11y. ([47773](https://github.com/WordPress/gutenberg/pull/47773))
-- Fix unbalanced parenthesis in Element README. ([47700](https://github.com/WordPress/gutenberg/pull/47700))
-- Minor updates in Private APIs. ([47953](https://github.com/WordPress/gutenberg/pull/47953))
-- Set block attributes to require either type or enum. ([45365](https://github.com/WordPress/gutenberg/pull/45365))
+-   Add: Database credentials to wp-env documentation. ([47940](https://github.com/WordPress/gutenberg/pull/47940))
+-   Block schema and block supports docs: Add dimensions and position settings. ([48057](https://github.com/WordPress/gutenberg/pull/48057))
+-   Components: Polish heading level component APIs. ([47788](https://github.com/WordPress/gutenberg/pull/47788))
+-   Docs: Add ancestor property to block-registration.md doc. ([45832](https://github.com/WordPress/gutenberg/pull/45832))
+-   Docs: Don't recommend using short array syntax in WP_HTML_Tag_Processor. ([47958](https://github.com/WordPress/gutenberg/pull/47958))
+-   Docs: Fix the incorrect link to eslint-plugin-jsx-a11y. ([47773](https://github.com/WordPress/gutenberg/pull/47773))
+-   Fix unbalanced parenthesis in Element README. ([47700](https://github.com/WordPress/gutenberg/pull/47700))
+-   Minor updates in Private APIs. ([47953](https://github.com/WordPress/gutenberg/pull/47953))
+-   Set block attributes to require either type or enum. ([45365](https://github.com/WordPress/gutenberg/pull/45365))
 
 ### Code Quality
 
-- Core Data: Fix ESLint warnings for the hooks directory. ([47811](https://github.com/WordPress/gutenberg/pull/47811))
-- ESLint: Change jsdoc/check-line-alignment from warn to error. ([47878](https://github.com/WordPress/gutenberg/pull/47878))
-- ESLint: Fix a bunch of ESLint alignment warnings. ([47872](https://github.com/WordPress/gutenberg/pull/47872))
-- Enable react-hooks/exhaustive-deps eslint rules. ([24914](https://github.com/WordPress/gutenberg/pull/24914))
-- Update moment and moment-timezone packages to fix timezone issues. ([47879](https://github.com/WordPress/gutenberg/pull/47879))
-
-#### Components
-
-- AnglePickerControl: Refactor to TypeScript. ([45820](https://github.com/WordPress/gutenberg/pull/45820))
-- BorderBoxControl: Migrate tests to TypeScript, remove act() call. ([47755](https://github.com/WordPress/gutenberg/pull/47755))
-- BoxControl: Convert to TypeScript. ([47622](https://github.com/WordPress/gutenberg/pull/47622))
-- ComboboxControl: Convert to TypeScript. ([47581](https://github.com/WordPress/gutenberg/pull/47581))
-- CustomSelectControl: Privatise __experimentalShowSelectedHint using @wordpress/experiments. ([47229](https://github.com/WordPress/gutenberg/pull/47229))
-- CustomSelectControl: Update size prop options to new format in Storybook examples. ([47779](https://github.com/WordPress/gutenberg/pull/47779))
-- Navigator: Add more pattern matching tests, refine existing tests. ([47910](https://github.com/WordPress/gutenberg/pull/47910))
-- NavigatorButton: Reuse Button types. ([47754](https://github.com/WordPress/gutenberg/pull/47754))
-- Panel: Convert to TypeScript. ([47259](https://github.com/WordPress/gutenberg/pull/47259))
-- Popover: Lock the __experimentalPopoverPositionToPlacement function. ([47505](https://github.com/WordPress/gutenberg/pull/47505))
-- Refactor Toolbar component to TypeScript. ([47087](https://github.com/WordPress/gutenberg/pull/47087))
-- Remove BaseField component. ([47911](https://github.com/WordPress/gutenberg/pull/47911))
-- Remove unnecessary act() from Button tests. ([47687](https://github.com/WordPress/gutenberg/pull/47687))
-- Remove unnecessary act() from DropdownMenu tests. ([47692](https://github.com/WordPress/gutenberg/pull/47692))
-- Remove unnecessary act() from Popover tests. ([47690](https://github.com/WordPress/gutenberg/pull/47690))
-- Remove unnecessary act() from ToolsPanel tests. ([47691](https://github.com/WordPress/gutenberg/pull/47691))
-- ResizableBox: Refactor styles to TypeScript. ([47756](https://github.com/WordPress/gutenberg/pull/47756))
-- TreeGrid: Convert to TypeScript. ([47516](https://github.com/WordPress/gutenberg/pull/47516))
-- MenuItemsChoice: Refactor to TypeScript. ([47180](https://github.com/WordPress/gutenberg/pull/47180))
-- ToolsPanel: Refactor Storybook examples to TypeScript, fix types inconsistencies. ([47944](https://github.com/WordPress/gutenberg/pull/47944))
-
-#### Block Library
-
-- Gallery: Minor code quality update. ([47774](https://github.com/WordPress/gutenberg/pull/47774))
-- Image: Simplify the method for getting block editor settings. ([47903](https://github.com/WordPress/gutenberg/pull/47903))
-- Navigation: Chore Remove unexistant parameter from selectNavigationMenus call. ([47941](https://github.com/WordPress/gutenberg/pull/47941))
-- Site Logo: Simplify the method for getting block editor settings. ([47736](https://github.com/WordPress/gutenberg/pull/47736))
-- Table Block: Don't render empty section. ([47753](https://github.com/WordPress/gutenberg/pull/47753))
+-   Core Data: Fix ESLint warnings for the hooks directory. ([47811](https://github.com/WordPress/gutenberg/pull/47811))
+-   ESLint: Change jsdoc/check-line-alignment from warn to error. ([47878](https://github.com/WordPress/gutenberg/pull/47878))
+-   ESLint: Fix a bunch of ESLint alignment warnings. ([47872](https://github.com/WordPress/gutenberg/pull/47872))
+-   Enable react-hooks/exhaustive-deps eslint rules. ([24914](https://github.com/WordPress/gutenberg/pull/24914))
+-   Update moment and moment-timezone packages to fix timezone issues. ([47879](https://github.com/WordPress/gutenberg/pull/47879))
+
+#### Components
+
+-   AnglePickerControl: Refactor to TypeScript. ([45820](https://github.com/WordPress/gutenberg/pull/45820))
+-   BorderBoxControl: Migrate tests to TypeScript, remove act() call. ([47755](https://github.com/WordPress/gutenberg/pull/47755))
+-   BoxControl: Convert to TypeScript. ([47622](https://github.com/WordPress/gutenberg/pull/47622))
+-   ComboboxControl: Convert to TypeScript. ([47581](https://github.com/WordPress/gutenberg/pull/47581))
+-   CustomSelectControl: Privatise \_\_experimentalShowSelectedHint using @wordpress/experiments. ([47229](https://github.com/WordPress/gutenberg/pull/47229))
+-   CustomSelectControl: Update size prop options to new format in Storybook examples. ([47779](https://github.com/WordPress/gutenberg/pull/47779))
+-   Navigator: Add more pattern matching tests, refine existing tests. ([47910](https://github.com/WordPress/gutenberg/pull/47910))
+-   NavigatorButton: Reuse Button types. ([47754](https://github.com/WordPress/gutenberg/pull/47754))
+-   Panel: Convert to TypeScript. ([47259](https://github.com/WordPress/gutenberg/pull/47259))
+-   Popover: Lock the \_\_experimentalPopoverPositionToPlacement function. ([47505](https://github.com/WordPress/gutenberg/pull/47505))
+-   Refactor Toolbar component to TypeScript. ([47087](https://github.com/WordPress/gutenberg/pull/47087))
+-   Remove BaseField component. ([47911](https://github.com/WordPress/gutenberg/pull/47911))
+-   Remove unnecessary act() from Button tests. ([47687](https://github.com/WordPress/gutenberg/pull/47687))
+-   Remove unnecessary act() from DropdownMenu tests. ([47692](https://github.com/WordPress/gutenberg/pull/47692))
+-   Remove unnecessary act() from Popover tests. ([47690](https://github.com/WordPress/gutenberg/pull/47690))
+-   Remove unnecessary act() from ToolsPanel tests. ([47691](https://github.com/WordPress/gutenberg/pull/47691))
+-   ResizableBox: Refactor styles to TypeScript. ([47756](https://github.com/WordPress/gutenberg/pull/47756))
+-   TreeGrid: Convert to TypeScript. ([47516](https://github.com/WordPress/gutenberg/pull/47516))
+-   MenuItemsChoice: Refactor to TypeScript. ([47180](https://github.com/WordPress/gutenberg/pull/47180))
+-   ToolsPanel: Refactor Storybook examples to TypeScript, fix types inconsistencies. ([47944](https://github.com/WordPress/gutenberg/pull/47944))
+
+#### Block Library
+
+-   Gallery: Minor code quality update. ([47774](https://github.com/WordPress/gutenberg/pull/47774))
+-   Image: Simplify the method for getting block editor settings. ([47903](https://github.com/WordPress/gutenberg/pull/47903))
+-   Navigation: Chore Remove unexistant parameter from selectNavigationMenus call. ([47941](https://github.com/WordPress/gutenberg/pull/47941))
+-   Site Logo: Simplify the method for getting block editor settings. ([47736](https://github.com/WordPress/gutenberg/pull/47736))
+-   Table Block: Don't render empty section. ([47753](https://github.com/WordPress/gutenberg/pull/47753))
 
 #### Site Editor
 
-- Make process_blocks_custom_css method protected. ([47725](https://github.com/WordPress/gutenberg/pull/47725))
-- Move site editor 6.2 specific code to the right file. ([48023](https://github.com/WordPress/gutenberg/pull/48023))
-- Remove: Unused code from the navigation inspector select logic. ([48044](https://github.com/WordPress/gutenberg/pull/48044))
-- Sync: Widget import changes from the core. ([47875](https://github.com/WordPress/gutenberg/pull/47875))
-- Add missing period in keyboard shortcut descriptions. ([47899](https://github.com/WordPress/gutenberg/pull/47899))
-- Extract the getSupportedStyles selector to the blocks store as a private selector. ([47606](https://github.com/WordPress/gutenberg/pull/47606))
-- Remove the name and element props from the TypographyPanel component. ([47908](https://github.com/WordPress/gutenberg/pull/47908))
+-   Make process_blocks_custom_css method protected. ([47725](https://github.com/WordPress/gutenberg/pull/47725))
+-   Move site editor 6.2 specific code to the right file. ([48023](https://github.com/WordPress/gutenberg/pull/48023))
+-   Remove: Unused code from the navigation inspector select logic. ([48044](https://github.com/WordPress/gutenberg/pull/48044))
+-   Sync: Widget import changes from the core. ([47875](https://github.com/WordPress/gutenberg/pull/47875))
+-   Add missing period in keyboard shortcut descriptions. ([47899](https://github.com/WordPress/gutenberg/pull/47899))
+-   Extract the getSupportedStyles selector to the blocks store as a private selector. ([47606](https://github.com/WordPress/gutenberg/pull/47606))
+-   Remove the name and element props from the TypographyPanel component. ([47908](https://github.com/WordPress/gutenberg/pull/47908))
 
 #### Post Editor
 
-- Edit Post: Remove unnecessary 'classnames' in Header component. ([47635](https://github.com/WordPress/gutenberg/pull/47635))
+-   Edit Post: Remove unnecessary 'classnames' in Header component. ([47635](https://github.com/WordPress/gutenberg/pull/47635))
 
 #### REST API
 
-- Chore: Move Gutenberg_REST_Templates_Controller from 6.2 to 6.3 compatibility. ([48077](https://github.com/WordPress/gutenberg/pull/48077))
+-   Chore: Move Gutenberg_REST_Templates_Controller from 6.2 to 6.3 compatibility. ([48077](https://github.com/WordPress/gutenberg/pull/48077))
 
 #### Patterns
 
-- Refactor: usePatternsCategories: Simplify category sorting. ([47843](https://github.com/WordPress/gutenberg/pull/47843))
+-   Refactor: usePatternsCategories: Simplify category sorting. ([47843](https://github.com/WordPress/gutenberg/pull/47843))
 
 #### Document Settings
 
-- Most Used Terms: Pass dependency to the useSelect. ([47810](https://github.com/WordPress/gutenberg/pull/47810))
+-   Most Used Terms: Pass dependency to the useSelect. ([47810](https://github.com/WordPress/gutenberg/pull/47810))
 
 #### Block API
 
-- HTML API: Move into 6.2 Compat Folder since inclusion in Core. ([47749](https://github.com/WordPress/gutenberg/pull/47749))
+-   HTML API: Move into 6.2 Compat Folder since inclusion in Core. ([47749](https://github.com/WordPress/gutenberg/pull/47749))
 
 #### Data Layer
 
-- Fixed incorrect type annotations in @wordpress/data. ([46881](https://github.com/WordPress/gutenberg/pull/46881))
+-   Fixed incorrect type annotations in @wordpress/data. ([46881](https://github.com/WordPress/gutenberg/pull/46881))
 
 ### Tools
 
 #### Testing
 
-- Add tests for gutenberg_render_layout_support_flag. ([47719](https://github.com/WordPress/gutenberg/pull/47719))
-- Migrate Heading block tests to Playwright. ([47955](https://github.com/WordPress/gutenberg/pull/47955))
-- Migrate query test to Playwright. ([47995](https://github.com/WordPress/gutenberg/pull/47995))
-- Navigation: end-to-end tests: Default to classic menu. ([47867](https://github.com/WordPress/gutenberg/pull/47867))
-- Navigation: end-to-end tests: Default to my only existing menu. ([47744](https://github.com/WordPress/gutenberg/pull/47744))
-- Remove obsolete failing test for Font Size Picker. ([47913](https://github.com/WordPress/gutenberg/pull/47913))
-- Shard playwright tests into two separate jobs using a matrix. ([47629](https://github.com/WordPress/gutenberg/pull/47629))
-- Update code and tests for theme json class after the back port in core. ([47668](https://github.com/WordPress/gutenberg/pull/47668))
-- Upgrade Playwright to 1.30.0. ([48007](https://github.com/WordPress/gutenberg/pull/48007))
-- end-to-end perf tests: Run each test in a separate page. ([47889](https://github.com/WordPress/gutenberg/pull/47889))
-- Fix editor.getBlocks for unmodified default block. ([48093](https://github.com/WordPress/gutenberg/pull/48093))
-- Visual Regression tests: Use default playwright utils. ([47991](https://github.com/WordPress/gutenberg/pull/47991))
-- Navigation: Add warning test. ([45207](https://github.com/WordPress/gutenberg/pull/45207))
+-   Add tests for gutenberg_render_layout_support_flag. ([47719](https://github.com/WordPress/gutenberg/pull/47719))
+-   Migrate Heading block tests to Playwright. ([47955](https://github.com/WordPress/gutenberg/pull/47955))
+-   Migrate query test to Playwright. ([47995](https://github.com/WordPress/gutenberg/pull/47995))
+-   Navigation: end-to-end tests: Default to classic menu. ([47867](https://github.com/WordPress/gutenberg/pull/47867))
+-   Navigation: end-to-end tests: Default to my only existing menu. ([47744](https://github.com/WordPress/gutenberg/pull/47744))
+-   Remove obsolete failing test for Font Size Picker. ([47913](https://github.com/WordPress/gutenberg/pull/47913))
+-   Shard playwright tests into two separate jobs using a matrix. ([47629](https://github.com/WordPress/gutenberg/pull/47629))
+-   Update code and tests for theme json class after the back port in core. ([47668](https://github.com/WordPress/gutenberg/pull/47668))
+-   Upgrade Playwright to 1.30.0. ([48007](https://github.com/WordPress/gutenberg/pull/48007))
+-   end-to-end perf tests: Run each test in a separate page. ([47889](https://github.com/WordPress/gutenberg/pull/47889))
+-   Fix editor.getBlocks for unmodified default block. ([48093](https://github.com/WordPress/gutenberg/pull/48093))
+-   Visual Regression tests: Use default playwright utils. ([47991](https://github.com/WordPress/gutenberg/pull/47991))
+-   Navigation: Add warning test. ([45207](https://github.com/WordPress/gutenberg/pull/45207))
 
 #### Build Tooling
 
-- Add basic tsconfig.json validation. ([47595](https://github.com/WordPress/gutenberg/pull/47595))
-- Front-end classic performance test: Set TwentyTwentyOne when running in isolation. ([47965](https://github.com/WordPress/gutenberg/pull/47965))
-- Perf tests: Store test run results as artifact. ([45747](https://github.com/WordPress/gutenberg/pull/45747))
-- Performance suite: Track Largest Contentful Paint in the front-end. ([47938](https://github.com/WordPress/gutenberg/pull/47938))
-- Scripts: Add PostCSS (.pcss extension) file support to wp-scripts. ([45352](https://github.com/WordPress/gutenberg/pull/45352))
-- Performance: Restore initial reduce value in perf results log script. ([47650](https://github.com/WordPress/gutenberg/pull/47650))
-- Cherry-pick CLI: Fix the default label to match the documentation. ([47832](https://github.com/WordPress/gutenberg/pull/47832))
-- Scripts: Use start without watcher using --no-watch. ([44237](https://github.com/WordPress/gutenberg/pull/44237))
-- Fonts API: Add missing files to lib/load.php. ([48108](https://github.com/WordPress/gutenberg/pull/48108))
-- Dependency Extraction Webpack Plugin: Update json2php dependency. ([47831](https://github.com/WordPress/gutenberg/pull/47831))
-
-## First time contributors
+-   Add basic tsconfig.json validation. ([47595](https://github.com/WordPress/gutenberg/pull/47595))
+-   Front-end classic performance test: Set TwentyTwentyOne when running in isolation. ([47965](https://github.com/WordPress/gutenberg/pull/47965))
+-   Perf tests: Store test run results as artifact. ([45747](https://github.com/WordPress/gutenberg/pull/45747))
+-   Performance suite: Track Largest Contentful Paint in the front-end. ([47938](https://github.com/WordPress/gutenberg/pull/47938))
+-   Scripts: Add PostCSS (.pcss extension) file support to wp-scripts. ([45352](https://github.com/WordPress/gutenberg/pull/45352))
+-   Performance: Restore initial reduce value in perf results log script. ([47650](https://github.com/WordPress/gutenberg/pull/47650))
+-   Cherry-pick CLI: Fix the default label to match the documentation. ([47832](https://github.com/WordPress/gutenberg/pull/47832))
+-   Scripts: Use start without watcher using --no-watch. ([44237](https://github.com/WordPress/gutenberg/pull/44237))
+-   Fonts API: Add missing files to lib/load.php. ([48108](https://github.com/WordPress/gutenberg/pull/48108))
+-   Dependency Extraction Webpack Plugin: Update json2php dependency. ([47831](https://github.com/WordPress/gutenberg/pull/47831))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @creative-andrew: Add: Database credentials to wp-env documentation. ([47940](https://github.com/WordPress/gutenberg/pull/47940))
-- @dpellenwood: Scripts: Add PostCSS (.pcss extension) file support to wp-scripts. ([45352](https://github.com/WordPress/gutenberg/pull/45352))
-- @griffinjohndavid: Set block attributes to require either type or enum. ([45365](https://github.com/WordPress/gutenberg/pull/45365))
-- @mike-day: Refactor Toolbar component to TypeScript. ([47087](https://github.com/WordPress/gutenberg/pull/47087))
+The following PRs were merged by first-time contributors:
 
+-   @creative-andrew: Add: Database credentials to wp-env documentation. ([47940](https://github.com/WordPress/gutenberg/pull/47940))
+-   @dpellenwood: Scripts: Add PostCSS (.pcss extension) file support to wp-scripts. ([45352](https://github.com/WordPress/gutenberg/pull/45352))
+-   @griffinjohndavid: Set block attributes to require either type or enum. ([45365](https://github.com/WordPress/gutenberg/pull/45365))
+-   @mike-day: Refactor Toolbar component to TypeScript. ([47087](https://github.com/WordPress/gutenberg/pull/47087))
 
 ## Contributors
 
@@ -7857,25 +18967,17 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @afercia @ajlende @alexstine @andrewserong @aristath @brookewp @carolinan @ciampo @creative-andrew @d-alleyne @dcalhoun @dmsnell @dpellenwood @draganescu @ellatrix @flootr @fluiddot @georgeh @geriux @getdave @glendaviesnz @griffinjohndavid @gziolo @jhnstn @jorgefilipecosta @jsnajdr @kebbet @kevin940726 @kkmuffme @madhusudhand @MaggieCabrera @Mamaduka @marekdedic @mauteri @mcsf @mike-day @mirka @mreishus @nielslange @noahtallen @noisysocks @ntsekouras @oandregal @scruffian @sgomes @SiobhyB @spacedmonkey @t-hamano @talldan @tellthemachines @tyxla @wojtekn @WunderBart @youknowriad
 
-
-
-
 = 15.1.1 =
 
-
-
 ## Changelog
 
 ### Various
 
-- Fonts API: Add missing files to lib/load.php. ([48108](https://github.com/WordPress/gutenberg/pull/48108))
-
-
-## First time contributors
-
-The following PRs were merged by first time contributors:
+-   Fonts API: Add missing files to lib/load.php. ([48108](https://github.com/WordPress/gutenberg/pull/48108))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -7883,333 +18985,376 @@ The following contributors merged PRs in this release:
 
 @hellofromtonya
 
-
 = 15.2.0-rc.1 =
 
-
-
 ## Changelog
 
 ### Features
 
 #### Design Tools
-- Add aspect-ratio to post featured image block. ([47854](https://github.com/WordPress/gutenberg/pull/47854))
 
+-   Add aspect-ratio to post featured image block. ([47854](https://github.com/WordPress/gutenberg/pull/47854))
 
 ### Enhancements
 
 #### Site Editor
-- Add a nested level when selecting templates or template parts. ([47777](https://github.com/WordPress/gutenberg/pull/47777))
-- Add back link to Design heading in site editor navigation to return to Dashboard. ([47950](https://github.com/WordPress/gutenberg/pull/47950))
-- Add: Modal to choose a start pattern on new templates. ([46248](https://github.com/WordPress/gutenberg/pull/46248))
-- Adds a global save button to the site editor. ([47142](https://github.com/WordPress/gutenberg/pull/47142))
-- Tidy up the generation of the site editor page title. ([48053](https://github.com/WordPress/gutenberg/pull/48053))
-- Update gutenberg_get_template_hierarchy. ([47716](https://github.com/WordPress/gutenberg/pull/47716))
+
+-   Add a nested level when selecting templates or template parts. ([47777](https://github.com/WordPress/gutenberg/pull/47777))
+-   Add back link to Design heading in site editor navigation to return to Dashboard. ([47950](https://github.com/WordPress/gutenberg/pull/47950))
+-   Add: Modal to choose a start pattern on new templates. ([46248](https://github.com/WordPress/gutenberg/pull/46248))
+-   Adds a global save button to the site editor. ([47142](https://github.com/WordPress/gutenberg/pull/47142))
+-   Tidy up the generation of the site editor page title. ([48053](https://github.com/WordPress/gutenberg/pull/48053))
+-   Update gutenberg_get_template_hierarchy. ([47716](https://github.com/WordPress/gutenberg/pull/47716))
 
 #### Block Library
-- Button: Update: Make button a content block. ([47936](https://github.com/WordPress/gutenberg/pull/47936))
-- File block: Add color block support to File block. ([41870](https://github.com/WordPress/gutenberg/pull/41870))
-- Navigation: Add integration tests for NavigationMenuSelector component. ([47825](https://github.com/WordPress/gutenberg/pull/47825))
-- Navigation: Updates "Add Submenu item" text to "Add Submenu link". ([48030](https://github.com/WordPress/gutenberg/pull/48030))
-- Post excerpt: Add excerpt length control. ([44964](https://github.com/WordPress/gutenberg/pull/44964))
-- Update: Make OffCanvasEditor use LeafMoreMenu by default. ([47844](https://github.com/WordPress/gutenberg/pull/47844))
+
+-   Button: Update: Make button a content block. ([47936](https://github.com/WordPress/gutenberg/pull/47936))
+-   File block: Add color block support to File block. ([41870](https://github.com/WordPress/gutenberg/pull/41870))
+-   Navigation: Add integration tests for NavigationMenuSelector component. ([47825](https://github.com/WordPress/gutenberg/pull/47825))
+-   Navigation: Updates "Add Submenu item" text to "Add Submenu link". ([48030](https://github.com/WordPress/gutenberg/pull/48030))
+-   Post excerpt: Add excerpt length control. ([44964](https://github.com/WordPress/gutenberg/pull/44964))
+-   Update: Make OffCanvasEditor use LeafMoreMenu by default. ([47844](https://github.com/WordPress/gutenberg/pull/47844))
 
 #### Global Styles
-- Extract the Global Styles Typography Panel into block-editor package. ([47356](https://github.com/WordPress/gutenberg/pull/47356))
-- Move more link about custom CSS to part of description. ([47781](https://github.com/WordPress/gutenberg/pull/47781))
-- Site Editor: Update 'Additional CSS' subtitle string. ([47671](https://github.com/WordPress/gutenberg/pull/47671))
-- Style Book: Exclude blocks that are not allowed to insert. ([47461](https://github.com/WordPress/gutenberg/pull/47461))
+
+-   Extract the Global Styles Typography Panel into block-editor package. ([47356](https://github.com/WordPress/gutenberg/pull/47356))
+-   Move more link about custom CSS to part of description. ([47781](https://github.com/WordPress/gutenberg/pull/47781))
+-   Site Editor: Update 'Additional CSS' subtitle string. ([47671](https://github.com/WordPress/gutenberg/pull/47671))
+-   Style Book: Exclude blocks that are not allowed to insert. ([47461](https://github.com/WordPress/gutenberg/pull/47461))
 
 #### Design Tools
-- Button: Adopt support for border color, style, and width. ([44574](https://github.com/WordPress/gutenberg/pull/44574))
-- Latest Comments: Add typography support. ([43310](https://github.com/WordPress/gutenberg/pull/43310))
-- Verse: Adopt border supports. ([48021](https://github.com/WordPress/gutenberg/pull/48021))
+
+-   Button: Adopt support for border color, style, and width. ([44574](https://github.com/WordPress/gutenberg/pull/44574))
+-   Latest Comments: Add typography support. ([43310](https://github.com/WordPress/gutenberg/pull/43310))
+-   Verse: Adopt border supports. ([48021](https://github.com/WordPress/gutenberg/pull/48021))
 
 #### Block Editor
-- Migrate from TextControl to NumberControl to remove margin overrides. ([47160](https://github.com/WordPress/gutenberg/pull/47160))
-- Add <LinkControl> code owner. ([47733](https://github.com/WordPress/gutenberg/pull/47733))
-- Add settings "drawer" to Link Control. ([47328](https://github.com/WordPress/gutenberg/pull/47328))
-- Button: Prepend HTTP to Buttons block links when missing protocol. ([47311](https://github.com/WordPress/gutenberg/pull/47311))
-- Show a pointer/hint in the settings tab informing the user about the styles tab. ([47670](https://github.com/WordPress/gutenberg/pull/47670))
+
+-   Migrate from TextControl to NumberControl to remove margin overrides. ([47160](https://github.com/WordPress/gutenberg/pull/47160))
+-   Add <LinkControl> code owner. ([47733](https://github.com/WordPress/gutenberg/pull/47733))
+-   Add settings "drawer" to Link Control. ([47328](https://github.com/WordPress/gutenberg/pull/47328))
+-   Button: Prepend HTTP to Buttons block links when missing protocol. ([47311](https://github.com/WordPress/gutenberg/pull/47311))
+-   Show a pointer/hint in the settings tab informing the user about the styles tab. ([47670](https://github.com/WordPress/gutenberg/pull/47670))
 
 #### Components
-- Add parent navigation support for the navigator component. ([47883](https://github.com/WordPress/gutenberg/pull/47883))
-- Zoom out mode: Scale iframe instead of contents. ([47004](https://github.com/WordPress/gutenberg/pull/47004))
+
+-   Add parent navigation support for the navigator component. ([47883](https://github.com/WordPress/gutenberg/pull/47883))
+-   Zoom out mode: Scale iframe instead of contents. ([47004](https://github.com/WordPress/gutenberg/pull/47004))
 
 #### Testing
-- end-to-end perf tests: Run each test in a separate page. ([47889](https://github.com/WordPress/gutenberg/pull/47889))
+
+-   end-to-end perf tests: Run each test in a separate page. ([47889](https://github.com/WordPress/gutenberg/pull/47889))
 
 #### Navigation Screen
-- Components: Add support for named arguments in the navigator components. ([47827](https://github.com/WordPress/gutenberg/pull/47827))
+
+-   Components: Add support for named arguments in the navigator components. ([47827](https://github.com/WordPress/gutenberg/pull/47827))
 
 #### Document Settings
-- Term sorting is incorrect in flat term selector. ([47795](https://github.com/WordPress/gutenberg/pull/47795))
+
+-   Term sorting is incorrect in flat term selector. ([47795](https://github.com/WordPress/gutenberg/pull/47795))
 
 #### Patterns
-- [Patterns]: Reorder pattern categories. ([47760](https://github.com/WordPress/gutenberg/pull/47760))
+
+-   [Patterns]: Reorder pattern categories. ([47760](https://github.com/WordPress/gutenberg/pull/47760))
 
 #### Block API
-- Set block attributes to require either type or enum. ([45365](https://github.com/WordPress/gutenberg/pull/45365))
+
+-   Set block attributes to require either type or enum. ([45365](https://github.com/WordPress/gutenberg/pull/45365))
 
 #### Inspector Controls
-- Add template revision button. ([45215](https://github.com/WordPress/gutenberg/pull/45215))
+
+-   Add template revision button. ([45215](https://github.com/WordPress/gutenberg/pull/45215))
 
 #### Accessibility
-- List view: Modify the shortcut to focus while open. ([45135](https://github.com/WordPress/gutenberg/pull/45135))
+
+-   List view: Modify the shortcut to focus while open. ([45135](https://github.com/WordPress/gutenberg/pull/45135))
 
 #### Scripts
-- Scripts: Add PostCSS (.pcss extension) file support to wp-scripts. ([45352](https://github.com/WordPress/gutenberg/pull/45352))
-- Scripts: Use start without watcher using --no-watch. ([44237](https://github.com/WordPress/gutenberg/pull/44237))
+
+-   Scripts: Add PostCSS (.pcss extension) file support to wp-scripts. ([45352](https://github.com/WordPress/gutenberg/pull/45352))
+-   Scripts: Use start without watcher using --no-watch. ([44237](https://github.com/WordPress/gutenberg/pull/44237))
 
 ### Bug Fixes
 
-- Distraction free mode: Fix keyboard shortcut not working. ([47900](https://github.com/WordPress/gutenberg/pull/47900))
-- useResizeObserver: Handle strict mode double effects. ([47703](https://github.com/WordPress/gutenberg/pull/47703))
+-   Distraction free mode: Fix keyboard shortcut not working. ([47900](https://github.com/WordPress/gutenberg/pull/47900))
+-   useResizeObserver: Handle strict mode double effects. ([47703](https://github.com/WordPress/gutenberg/pull/47703))
 
 #### Block Library
-- Embed: Fix: Remove browser default border for iframe in the editor. ([47987](https://github.com/WordPress/gutenberg/pull/47987))
-- File block: Re-add editor styles for classic themes. ([47686](https://github.com/WordPress/gutenberg/pull/47686))
-- Image: Revert "Prevent the image from being resized larger than its container". ([47846](https://github.com/WordPress/gutenberg/pull/47846))
-- Image: Update image block margins on RTL. ([47617](https://github.com/WordPress/gutenberg/pull/47617))
-- Navigation Block inspector: Fix link UI popover opening on links that have a URL. ([47828](https://github.com/WordPress/gutenberg/pull/47828))
-- Navigation: Close Link UI if cancelled. ([48029](https://github.com/WordPress/gutenberg/pull/48029))
-- Navigation: Enable undo after creating a new menu. ([47683](https://github.com/WordPress/gutenberg/pull/47683))
-- Navigation: Fixes undo and redo for nesting operations in the navigation block's inspector. ([47633](https://github.com/WordPress/gutenberg/pull/47633))
-- Navigation: Remove the IS_GUTENBERG_PLUGIN check around block_core_navigation_parse_blocks_from_menu_items. ([47824](https://github.com/WordPress/gutenberg/pull/47824))
-- Navigation: Update deps for the useEffect that creates navigation menus. ([47912](https://github.com/WordPress/gutenberg/pull/47912))
-- OffCanvasEditor: Only allow some blocks to be converted to submenus. ([47974](https://github.com/WordPress/gutenberg/pull/47974))
-- Page List: Respect the selected parent page when converting to a list of navigation links. ([47651](https://github.com/WordPress/gutenberg/pull/47651))
-- Read More: I18N: Update string concatenation method in read more block. ([47815](https://github.com/WordPress/gutenberg/pull/47815))
-- ToolsPanel: Display optional items when values are updated externally. ([47727](https://github.com/WordPress/gutenberg/pull/47727))
-- [Quote]: Fix deprectated `large` style specificity rule. ([47969](https://github.com/WordPress/gutenberg/pull/47969))
+
+-   Embed: Fix: Remove browser default border for iframe in the editor. ([47987](https://github.com/WordPress/gutenberg/pull/47987))
+-   File block: Re-add editor styles for classic themes. ([47686](https://github.com/WordPress/gutenberg/pull/47686))
+-   Image: Revert "Prevent the image from being resized larger than its container". ([47846](https://github.com/WordPress/gutenberg/pull/47846))
+-   Image: Update image block margins on RTL. ([47617](https://github.com/WordPress/gutenberg/pull/47617))
+-   Navigation Block inspector: Fix link UI popover opening on links that have a URL. ([47828](https://github.com/WordPress/gutenberg/pull/47828))
+-   Navigation: Close Link UI if cancelled. ([48029](https://github.com/WordPress/gutenberg/pull/48029))
+-   Navigation: Enable undo after creating a new menu. ([47683](https://github.com/WordPress/gutenberg/pull/47683))
+-   Navigation: Fixes undo and redo for nesting operations in the navigation block's inspector. ([47633](https://github.com/WordPress/gutenberg/pull/47633))
+-   Navigation: Remove the IS_GUTENBERG_PLUGIN check around block_core_navigation_parse_blocks_from_menu_items. ([47824](https://github.com/WordPress/gutenberg/pull/47824))
+-   Navigation: Update deps for the useEffect that creates navigation menus. ([47912](https://github.com/WordPress/gutenberg/pull/47912))
+-   OffCanvasEditor: Only allow some blocks to be converted to submenus. ([47974](https://github.com/WordPress/gutenberg/pull/47974))
+-   Page List: Respect the selected parent page when converting to a list of navigation links. ([47651](https://github.com/WordPress/gutenberg/pull/47651))
+-   Read More: I18N: Update string concatenation method in read more block. ([47815](https://github.com/WordPress/gutenberg/pull/47815))
+-   ToolsPanel: Display optional items when values are updated externally. ([47727](https://github.com/WordPress/gutenberg/pull/47727))
+-   [Quote]: Fix deprectated `large` style specificity rule. ([47969](https://github.com/WordPress/gutenberg/pull/47969))
 
 #### Site Editor
-- [Block Editor]: Lock `blockInspectorAnimation` setting. ([47740](https://github.com/WordPress/gutenberg/pull/47740))
-- Disable Strict Mode, breaks dev site editor. ([47701](https://github.com/WordPress/gutenberg/pull/47701))
-- Add: Modal to choose a start pattern on new templates. Take 2. ([47927](https://github.com/WordPress/gutenberg/pull/47927))
-- Fix ComplementaryArea's initial isActive state. ([47498](https://github.com/WordPress/gutenberg/pull/47498))
-- Fix custom Template Parts rename action. ([47932](https://github.com/WordPress/gutenberg/pull/47932))
-- Fix site editor navigation. ([48025](https://github.com/WordPress/gutenberg/pull/48025))
-- Shadow: Move shadow into own panel. ([47634](https://github.com/WordPress/gutenberg/pull/47634))
-- Specify active state color for template navigation button. ([47851](https://github.com/WordPress/gutenberg/pull/47851))
+
+-   [Block Editor]: Lock `blockInspectorAnimation` setting. ([47740](https://github.com/WordPress/gutenberg/pull/47740))
+-   Disable Strict Mode, breaks dev site editor. ([47701](https://github.com/WordPress/gutenberg/pull/47701))
+-   Add: Modal to choose a start pattern on new templates. Take 2. ([47927](https://github.com/WordPress/gutenberg/pull/47927))
+-   Fix ComplementaryArea's initial isActive state. ([47498](https://github.com/WordPress/gutenberg/pull/47498))
+-   Fix custom Template Parts rename action. ([47932](https://github.com/WordPress/gutenberg/pull/47932))
+-   Fix site editor navigation. ([48025](https://github.com/WordPress/gutenberg/pull/48025))
+-   Shadow: Move shadow into own panel. ([47634](https://github.com/WordPress/gutenberg/pull/47634))
+-   Specify active state color for template navigation button. ([47851](https://github.com/WordPress/gutenberg/pull/47851))
 
 #### Accessibility
-- Add an aria label to the site save dialog. ([47898](https://github.com/WordPress/gutenberg/pull/47898))
-- Fix UrlInput combobox to use the ARIA 1.0 pattern. ([47148](https://github.com/WordPress/gutenberg/pull/47148))
-- Fix constrained tabbing failures with  Safari and Firefox. ([47426](https://github.com/WordPress/gutenberg/pull/47426))
-- Fix the headings hierarchy in the styles sidebar. ([43848](https://github.com/WordPress/gutenberg/pull/43848))
-- Site Editor: Append template type and name to the site editor page title. ([47855](https://github.com/WordPress/gutenberg/pull/47855))
-- Template editor: Only disable the save button if no changes rather than hiding it. ([47895](https://github.com/WordPress/gutenberg/pull/47895))
+
+-   Add an aria label to the site save dialog. ([47898](https://github.com/WordPress/gutenberg/pull/47898))
+-   Fix UrlInput combobox to use the ARIA 1.0 pattern. ([47148](https://github.com/WordPress/gutenberg/pull/47148))
+-   Fix constrained tabbing failures with Safari and Firefox. ([47426](https://github.com/WordPress/gutenberg/pull/47426))
+-   Fix the headings hierarchy in the styles sidebar. ([43848](https://github.com/WordPress/gutenberg/pull/43848))
+-   Site Editor: Append template type and name to the site editor page title. ([47855](https://github.com/WordPress/gutenberg/pull/47855))
+-   Template editor: Only disable the save button if no changes rather than hiding it. ([47895](https://github.com/WordPress/gutenberg/pull/47895))
 
 #### Block Editor
-- useBlockSync: Change subscribed.current on unsubscribe. ([47752](https://github.com/WordPress/gutenberg/pull/47752))
-- Edit Post: Fix the 'inlineToolbar' settings toggle. ([47960](https://github.com/WordPress/gutenberg/pull/47960))
-- Fix clicking on the toggle button not closing the block inserter. ([47926](https://github.com/WordPress/gutenberg/pull/47926))
-- LinkControl: Fix scrollbar displayed on toggle link settings. ([47986](https://github.com/WordPress/gutenberg/pull/47986))
-- Rich text: Stabilise onFocus. ([47685](https://github.com/WordPress/gutenberg/pull/47685))
+
+-   useBlockSync: Change subscribed.current on unsubscribe. ([47752](https://github.com/WordPress/gutenberg/pull/47752))
+-   Edit Post: Fix the 'inlineToolbar' settings toggle. ([47960](https://github.com/WordPress/gutenberg/pull/47960))
+-   Fix clicking on the toggle button not closing the block inserter. ([47926](https://github.com/WordPress/gutenberg/pull/47926))
+-   LinkControl: Fix scrollbar displayed on toggle link settings. ([47986](https://github.com/WordPress/gutenberg/pull/47986))
+-   Rich text: Stabilise onFocus. ([47685](https://github.com/WordPress/gutenberg/pull/47685))
 
 #### Design Tools
-- Avatar: Fix application of borders. ([47630](https://github.com/WordPress/gutenberg/pull/47630))
-- Image: Allow deprecated blocks to render border-radius. ([47766](https://github.com/WordPress/gutenberg/pull/47766))
-- ToolsPanel: Ensure display of optional items when panel id is null. ([47864](https://github.com/WordPress/gutenberg/pull/47864))
+
+-   Avatar: Fix application of borders. ([47630](https://github.com/WordPress/gutenberg/pull/47630))
+-   Image: Allow deprecated blocks to render border-radius. ([47766](https://github.com/WordPress/gutenberg/pull/47766))
+-   ToolsPanel: Ensure display of optional items when panel id is null. ([47864](https://github.com/WordPress/gutenberg/pull/47864))
 
 #### Testing
-- Fix `editor.getBlocks` for unmodified default block. ([48093](https://github.com/WordPress/gutenberg/pull/48093))
-- Visual Regression tests: Use default playwright utils. ([47991](https://github.com/WordPress/gutenberg/pull/47991))
+
+-   Fix `editor.getBlocks` for unmodified default block. ([48093](https://github.com/WordPress/gutenberg/pull/48093))
+-   Visual Regression tests: Use default playwright utils. ([47991](https://github.com/WordPress/gutenberg/pull/47991))
 
 #### Global Styles
-- Fix incorrect targeting of block wrappers for root padding in the edi…. ([48002](https://github.com/WordPress/gutenberg/pull/48002))
-- Fix infinite render of inline block preview. ([47697](https://github.com/WordPress/gutenberg/pull/47697))
+
+-   Fix incorrect targeting of block wrappers for root padding in the edi…. ([48002](https://github.com/WordPress/gutenberg/pull/48002))
+-   Fix infinite render of inline block preview. ([47697](https://github.com/WordPress/gutenberg/pull/47697))
 
 #### Components
-- ColorPalette: Ensure text label contrast checking works with CSS variables. ([47373](https://github.com/WordPress/gutenberg/pull/47373))
-- SelectControl: Fix `multiple` prop styling. ([47893](https://github.com/WordPress/gutenberg/pull/47893))
+
+-   ColorPalette: Ensure text label contrast checking works with CSS variables. ([47373](https://github.com/WordPress/gutenberg/pull/47373))
+-   SelectControl: Fix `multiple` prop styling. ([47893](https://github.com/WordPress/gutenberg/pull/47893))
 
 #### Post Editor
-- Fix multi entities saved state in the post editor. ([47734](https://github.com/WordPress/gutenberg/pull/47734))
-- LocalAutosaveNotice: Use stable notice id to prevent double notices. ([47776](https://github.com/WordPress/gutenberg/pull/47776))
+
+-   Fix multi entities saved state in the post editor. ([47734](https://github.com/WordPress/gutenberg/pull/47734))
+-   LocalAutosaveNotice: Use stable notice id to prevent double notices. ([47776](https://github.com/WordPress/gutenberg/pull/47776))
 
 #### Layout
-- [Layout]: Fix align controls for hybrid themes. ([47961](https://github.com/WordPress/gutenberg/pull/47961))
+
+-   [Layout]: Fix align controls for hybrid themes. ([47961](https://github.com/WordPress/gutenberg/pull/47961))
 
 #### Patterns
-- Cover: Ensure `url` is not malformed due to sanitization through `wp_kses`. ([47906](https://github.com/WordPress/gutenberg/pull/47906))
+
+-   Cover: Ensure `url` is not malformed due to sanitization through `wp_kses`. ([47906](https://github.com/WordPress/gutenberg/pull/47906))
 
 #### Themes
-- Fix: Issues on block level settings. ([47842](https://github.com/WordPress/gutenberg/pull/47842))
+
+-   Fix: Issues on block level settings. ([47842](https://github.com/WordPress/gutenberg/pull/47842))
 
 #### Plugin
-- Fix the 'WP_HTML_Tag_Processor' file path. ([47823](https://github.com/WordPress/gutenberg/pull/47823))
+
+-   Fix the 'WP_HTML_Tag_Processor' file path. ([47823](https://github.com/WordPress/gutenberg/pull/47823))
 
 #### Build Tooling
-- Performance: Restore initial reduce value in perf results log script. ([47650](https://github.com/WordPress/gutenberg/pull/47650))
+
+-   Performance: Restore initial reduce value in perf results log script. ([47650](https://github.com/WordPress/gutenberg/pull/47650))
 
 #### Block API
-- Block Spacing: Don't show UI when only one direction is supported. ([47523](https://github.com/WordPress/gutenberg/pull/47523))
+
+-   Block Spacing: Don't show UI when only one direction is supported. ([47523](https://github.com/WordPress/gutenberg/pull/47523))
 
 #### Scripts
-- Cherry-pick CLI: Fix the default label to match the documentation. ([47832](https://github.com/WordPress/gutenberg/pull/47832))
+
+-   Cherry-pick CLI: Fix the default label to match the documentation. ([47832](https://github.com/WordPress/gutenberg/pull/47832))
 
 ### Performance
 
-- Avoid string-allocation on keypress with inputRule. ([47094](https://github.com/WordPress/gutenberg/pull/47094))
-- Fix empty results handling in performance test results. ([47646](https://github.com/WordPress/gutenberg/pull/47646))
-- Fix typo in performance script name. ([47647](https://github.com/WordPress/gutenberg/pull/47647))
-- Lodash: Remove from `@wordpress/keycodes` package. ([47737](https://github.com/WordPress/gutenberg/pull/47737))
+-   Avoid string-allocation on keypress with inputRule. ([47094](https://github.com/WordPress/gutenberg/pull/47094))
+-   Fix empty results handling in performance test results. ([47646](https://github.com/WordPress/gutenberg/pull/47646))
+-   Fix typo in performance script name. ([47647](https://github.com/WordPress/gutenberg/pull/47647))
+-   Lodash: Remove from `@wordpress/keycodes` package. ([47737](https://github.com/WordPress/gutenberg/pull/47737))
 
 #### Block Editor
-- Block Editor: Optimize `__unstableGetVisibleBlocks()`. ([47681](https://github.com/WordPress/gutenberg/pull/47681))
+
+-   Block Editor: Optimize `__unstableGetVisibleBlocks()`. ([47681](https://github.com/WordPress/gutenberg/pull/47681))
 
 #### Site Editor
-- Enable React StrictMode again. ([47639](https://github.com/WordPress/gutenberg/pull/47639))
+
+-   Enable React StrictMode again. ([47639](https://github.com/WordPress/gutenberg/pull/47639))
 
 #### Block Library
-- Navigation: Performance: Improve params in `block_core_navigation_get_most_recently_published_navigation`. ([47998](https://github.com/WordPress/gutenberg/pull/47998))
-- Page List: Block improvement.. ([47981](https://github.com/WordPress/gutenberg/pull/47981))
-- Page List: Performance: Improve page list callback. ([48004](https://github.com/WordPress/gutenberg/pull/48004))
-- Post Title: Performance: Render_block_core_post_title - Use post object instead of id. ([48001](https://github.com/WordPress/gutenberg/pull/48001))
-- Template Part: Performance: Replace usage of wp_get_theme()->get_stylesheet() with get_stylesheet(). ([48027](https://github.com/WordPress/gutenberg/pull/48027))
-- Tweaks to gutenberg_render_layout_support_flag. ([48003](https://github.com/WordPress/gutenberg/pull/48003))
+
+-   Navigation: Performance: Improve params in `block_core_navigation_get_most_recently_published_navigation`. ([47998](https://github.com/WordPress/gutenberg/pull/47998))
+-   Page List: Block improvement.. ([47981](https://github.com/WordPress/gutenberg/pull/47981))
+-   Page List: Performance: Improve page list callback. ([48004](https://github.com/WordPress/gutenberg/pull/48004))
+-   Post Title: Performance: Render_block_core_post_title - Use post object instead of id. ([48001](https://github.com/WordPress/gutenberg/pull/48001))
+-   Template Part: Performance: Replace usage of wp_get_theme()->get_stylesheet() with get_stylesheet(). ([48027](https://github.com/WordPress/gutenberg/pull/48027))
+-   Tweaks to gutenberg_render_layout_support_flag. ([48003](https://github.com/WordPress/gutenberg/pull/48003))
 
 #### Data Layer
-- Lodash: Refactor away from `_.get()` in resolvers cache middleware. ([47743](https://github.com/WordPress/gutenberg/pull/47743))
-- Lodash: Refactor away from `_.mapValues()` in data registry. ([47742](https://github.com/WordPress/gutenberg/pull/47742))
-- Lodash: Refactor persistence plugin away from `_.merge()`. ([47790](https://github.com/WordPress/gutenberg/pull/47790))
-- Lodash: Remove from `@wordpress/data`'s `getResolutionState()`. ([47838](https://github.com/WordPress/gutenberg/pull/47838))
-- Lodash: Remove from `@wordpress/data`. ([47848](https://github.com/WordPress/gutenberg/pull/47848))
-- Lodash: Remove from `useDispatchWithMap()`. ([47835](https://github.com/WordPress/gutenberg/pull/47835))
+
+-   Lodash: Refactor away from `_.get()` in resolvers cache middleware. ([47743](https://github.com/WordPress/gutenberg/pull/47743))
+-   Lodash: Refactor away from `_.mapValues()` in data registry. ([47742](https://github.com/WordPress/gutenberg/pull/47742))
+-   Lodash: Refactor persistence plugin away from `_.merge()`. ([47790](https://github.com/WordPress/gutenberg/pull/47790))
+-   Lodash: Remove from `@wordpress/data`'s `getResolutionState()`. ([47838](https://github.com/WordPress/gutenberg/pull/47838))
+-   Lodash: Remove from `@wordpress/data`. ([47848](https://github.com/WordPress/gutenberg/pull/47848))
+-   Lodash: Remove from `useDispatchWithMap()`. ([47835](https://github.com/WordPress/gutenberg/pull/47835))
 
 #### Template Editor
-- Disable lazy loading term meta get_block_templates. ([47999](https://github.com/WordPress/gutenberg/pull/47999))
+
+-   Disable lazy loading term meta get_block_templates. ([47999](https://github.com/WordPress/gutenberg/pull/47999))
 
 #### Themes
-- Improvements on append_to_selector method. ([47833](https://github.com/WordPress/gutenberg/pull/47833))
+
+-   Improvements on append_to_selector method. ([47833](https://github.com/WordPress/gutenberg/pull/47833))
 
 #### Block Directory
-- Optimize `DownloadableBlocksPanel`. ([47679](https://github.com/WordPress/gutenberg/pull/47679))
 
+-   Optimize `DownloadableBlocksPanel`. ([47679](https://github.com/WordPress/gutenberg/pull/47679))
 
 ### Experiments
 
-- Handle block metadata attribute and related experimental APIs. ([47791](https://github.com/WordPress/gutenberg/pull/47791))
-- Rename the "experiments" export to "privateApis". ([47975](https://github.com/WordPress/gutenberg/pull/47975))
-- [Trunk] Rename experiments package to private-apis. ([47839](https://github.com/WordPress/gutenberg/pull/47839))
-
+-   Handle block metadata attribute and related experimental APIs. ([47791](https://github.com/WordPress/gutenberg/pull/47791))
+-   Rename the "experiments" export to "privateApis". ([47975](https://github.com/WordPress/gutenberg/pull/47975))
+-   [Trunk] Rename experiments package to private-apis. ([47839](https://github.com/WordPress/gutenberg/pull/47839))
 
 ### Documentation
 
-- Add: Database credentials to wp-env documentation. ([47940](https://github.com/WordPress/gutenberg/pull/47940))
-- Block schema and block supports docs: Add dimensions and position settings. ([48057](https://github.com/WordPress/gutenberg/pull/48057))
-- Components: Polish heading level component APIs. ([47788](https://github.com/WordPress/gutenberg/pull/47788))
-- Docs: Add ancestor property to block-registration.md doc. ([45832](https://github.com/WordPress/gutenberg/pull/45832))
-- Docs: Don't recommend using short array syntax in WP_HTML_Tag_Processor. ([47958](https://github.com/WordPress/gutenberg/pull/47958))
-- Docs: Fix the incorrect link to eslint-plugin-jsx-a11y. ([47773](https://github.com/WordPress/gutenberg/pull/47773))
-- Fix unbalanced parenthesis in Element README. ([47700](https://github.com/WordPress/gutenberg/pull/47700))
-- Minor updates in Private APIs. ([47953](https://github.com/WordPress/gutenberg/pull/47953))
-
+-   Add: Database credentials to wp-env documentation. ([47940](https://github.com/WordPress/gutenberg/pull/47940))
+-   Block schema and block supports docs: Add dimensions and position settings. ([48057](https://github.com/WordPress/gutenberg/pull/48057))
+-   Components: Polish heading level component APIs. ([47788](https://github.com/WordPress/gutenberg/pull/47788))
+-   Docs: Add ancestor property to block-registration.md doc. ([45832](https://github.com/WordPress/gutenberg/pull/45832))
+-   Docs: Don't recommend using short array syntax in WP_HTML_Tag_Processor. ([47958](https://github.com/WordPress/gutenberg/pull/47958))
+-   Docs: Fix the incorrect link to eslint-plugin-jsx-a11y. ([47773](https://github.com/WordPress/gutenberg/pull/47773))
+-   Fix unbalanced parenthesis in Element README. ([47700](https://github.com/WordPress/gutenberg/pull/47700))
+-   Minor updates in Private APIs. ([47953](https://github.com/WordPress/gutenberg/pull/47953))
 
 ### Code Quality
 
-- Core Data: Fix ESLint warnings for the hooks directory. ([47811](https://github.com/WordPress/gutenberg/pull/47811))
-- ESLint: Change `jsdoc/check-line-alignment` from `warn` to `error`. ([47878](https://github.com/WordPress/gutenberg/pull/47878))
-- ESLint: Fix a bunch of ESLint alignment warnings. ([47872](https://github.com/WordPress/gutenberg/pull/47872))
-- Enable react-hooks/exhaustive-deps eslint rules. ([24914](https://github.com/WordPress/gutenberg/pull/24914))
-- Update `moment` and `moment-timezone` packages to fix timezone issues. ([47879](https://github.com/WordPress/gutenberg/pull/47879))
-
-#### Components
-- AnglePickerControl: Refactor to TypeScript. ([45820](https://github.com/WordPress/gutenberg/pull/45820))
-- BorderBoxControl: Migrate tests to TypeScript, remove `act()` call. ([47755](https://github.com/WordPress/gutenberg/pull/47755))
-- BoxControl: Convert to TypeScript. ([47622](https://github.com/WordPress/gutenberg/pull/47622))
-- ComboboxControl: Convert to TypeScript. ([47581](https://github.com/WordPress/gutenberg/pull/47581))
-- CustomSelectControl: Privatise __experimentalShowSelectedHint using @wordpress/experiments. ([47229](https://github.com/WordPress/gutenberg/pull/47229))
-- CustomSelectControl: Update size prop options to new format in Storybook examples. ([47779](https://github.com/WordPress/gutenberg/pull/47779))
-- Navigator: Add more pattern matching tests, refine existing tests. ([47910](https://github.com/WordPress/gutenberg/pull/47910))
-- NavigatorButton: Reuse Button types. ([47754](https://github.com/WordPress/gutenberg/pull/47754))
-- Panel: Convert to TypeScript. ([47259](https://github.com/WordPress/gutenberg/pull/47259))
-- Popover: Lock the __experimentalPopoverPositionToPlacement function. ([47505](https://github.com/WordPress/gutenberg/pull/47505))
-- Refactor Toolbar component to TypeScript. ([47087](https://github.com/WordPress/gutenberg/pull/47087))
-- Remove BaseField component. ([47911](https://github.com/WordPress/gutenberg/pull/47911))
-- Remove unnecessary `act()` from `Button` tests. ([47687](https://github.com/WordPress/gutenberg/pull/47687))
-- Remove unnecessary `act()` from `DropdownMenu` tests. ([47692](https://github.com/WordPress/gutenberg/pull/47692))
-- Remove unnecessary `act()` from `Popover` tests. ([47690](https://github.com/WordPress/gutenberg/pull/47690))
-- Remove unnecessary `act()` from `ToolsPanel` tests. ([47691](https://github.com/WordPress/gutenberg/pull/47691))
-- ResizableBox: Refactor styles to TypeScript. ([47756](https://github.com/WordPress/gutenberg/pull/47756))
-- TreeGrid: Convert to TypeScript. ([47516](https://github.com/WordPress/gutenberg/pull/47516))
-- `MenuItemsChoice`: Refactor to TypeScript. ([47180](https://github.com/WordPress/gutenberg/pull/47180))
-- `ToolsPanel`: Refactor Storybook examples to TypeScript, fix types inconsistencies. ([47944](https://github.com/WordPress/gutenberg/pull/47944))
-
-#### Block Library
-- Gallery: Minor code quality update. ([47774](https://github.com/WordPress/gutenberg/pull/47774))
-- Image: Simplify the method for getting block editor settings. ([47903](https://github.com/WordPress/gutenberg/pull/47903))
-- Navigation: Chore Remove unexistant parameter from selectNavigationMenus call. ([47941](https://github.com/WordPress/gutenberg/pull/47941))
-- Site Logo: Simplify the method for getting block editor settings. ([47736](https://github.com/WordPress/gutenberg/pull/47736))
-- Table Block: Don't render empty  section. ([47753](https://github.com/WordPress/gutenberg/pull/47753))
+-   Core Data: Fix ESLint warnings for the hooks directory. ([47811](https://github.com/WordPress/gutenberg/pull/47811))
+-   ESLint: Change `jsdoc/check-line-alignment` from `warn` to `error`. ([47878](https://github.com/WordPress/gutenberg/pull/47878))
+-   ESLint: Fix a bunch of ESLint alignment warnings. ([47872](https://github.com/WordPress/gutenberg/pull/47872))
+-   Enable react-hooks/exhaustive-deps eslint rules. ([24914](https://github.com/WordPress/gutenberg/pull/24914))
+-   Update `moment` and `moment-timezone` packages to fix timezone issues. ([47879](https://github.com/WordPress/gutenberg/pull/47879))
+
+#### Components
+
+-   AnglePickerControl: Refactor to TypeScript. ([45820](https://github.com/WordPress/gutenberg/pull/45820))
+-   BorderBoxControl: Migrate tests to TypeScript, remove `act()` call. ([47755](https://github.com/WordPress/gutenberg/pull/47755))
+-   BoxControl: Convert to TypeScript. ([47622](https://github.com/WordPress/gutenberg/pull/47622))
+-   ComboboxControl: Convert to TypeScript. ([47581](https://github.com/WordPress/gutenberg/pull/47581))
+-   CustomSelectControl: Privatise \_\_experimentalShowSelectedHint using @wordpress/experiments. ([47229](https://github.com/WordPress/gutenberg/pull/47229))
+-   CustomSelectControl: Update size prop options to new format in Storybook examples. ([47779](https://github.com/WordPress/gutenberg/pull/47779))
+-   Navigator: Add more pattern matching tests, refine existing tests. ([47910](https://github.com/WordPress/gutenberg/pull/47910))
+-   NavigatorButton: Reuse Button types. ([47754](https://github.com/WordPress/gutenberg/pull/47754))
+-   Panel: Convert to TypeScript. ([47259](https://github.com/WordPress/gutenberg/pull/47259))
+-   Popover: Lock the \_\_experimentalPopoverPositionToPlacement function. ([47505](https://github.com/WordPress/gutenberg/pull/47505))
+-   Refactor Toolbar component to TypeScript. ([47087](https://github.com/WordPress/gutenberg/pull/47087))
+-   Remove BaseField component. ([47911](https://github.com/WordPress/gutenberg/pull/47911))
+-   Remove unnecessary `act()` from `Button` tests. ([47687](https://github.com/WordPress/gutenberg/pull/47687))
+-   Remove unnecessary `act()` from `DropdownMenu` tests. ([47692](https://github.com/WordPress/gutenberg/pull/47692))
+-   Remove unnecessary `act()` from `Popover` tests. ([47690](https://github.com/WordPress/gutenberg/pull/47690))
+-   Remove unnecessary `act()` from `ToolsPanel` tests. ([47691](https://github.com/WordPress/gutenberg/pull/47691))
+-   ResizableBox: Refactor styles to TypeScript. ([47756](https://github.com/WordPress/gutenberg/pull/47756))
+-   TreeGrid: Convert to TypeScript. ([47516](https://github.com/WordPress/gutenberg/pull/47516))
+-   `MenuItemsChoice`: Refactor to TypeScript. ([47180](https://github.com/WordPress/gutenberg/pull/47180))
+-   `ToolsPanel`: Refactor Storybook examples to TypeScript, fix types inconsistencies. ([47944](https://github.com/WordPress/gutenberg/pull/47944))
+
+#### Block Library
+
+-   Gallery: Minor code quality update. ([47774](https://github.com/WordPress/gutenberg/pull/47774))
+-   Image: Simplify the method for getting block editor settings. ([47903](https://github.com/WordPress/gutenberg/pull/47903))
+-   Navigation: Chore Remove unexistant parameter from selectNavigationMenus call. ([47941](https://github.com/WordPress/gutenberg/pull/47941))
+-   Site Logo: Simplify the method for getting block editor settings. ([47736](https://github.com/WordPress/gutenberg/pull/47736))
+-   Table Block: Don't render empty section. ([47753](https://github.com/WordPress/gutenberg/pull/47753))
 
 #### Site Editor
-- Make process_blocks_custom_css method protected. ([47725](https://github.com/WordPress/gutenberg/pull/47725))
-- Move site editor 6.2 specific code to the right file. ([48023](https://github.com/WordPress/gutenberg/pull/48023))
-- Remove: Unused code from the navigation inspector select logic. ([48044](https://github.com/WordPress/gutenberg/pull/48044))
+
+-   Make process_blocks_custom_css method protected. ([47725](https://github.com/WordPress/gutenberg/pull/47725))
+-   Move site editor 6.2 specific code to the right file. ([48023](https://github.com/WordPress/gutenberg/pull/48023))
+-   Remove: Unused code from the navigation inspector select logic. ([48044](https://github.com/WordPress/gutenberg/pull/48044))
 
 #### Global Styles
-- Extract the getSupportedStyles selector to the blocks store as a private selector. ([47606](https://github.com/WordPress/gutenberg/pull/47606))
-- Remove the name and element props from the TypographyPanel component. ([47908](https://github.com/WordPress/gutenberg/pull/47908))
+
+-   Extract the getSupportedStyles selector to the blocks store as a private selector. ([47606](https://github.com/WordPress/gutenberg/pull/47606))
+-   Remove the name and element props from the TypographyPanel component. ([47908](https://github.com/WordPress/gutenberg/pull/47908))
 
 #### Post Editor
-- Add missing period in keyboard shortcut descriptions. ([47899](https://github.com/WordPress/gutenberg/pull/47899))
-- Edit Post: Remove unnecessary 'classnames' in Header component. ([47635](https://github.com/WordPress/gutenberg/pull/47635))
+
+-   Add missing period in keyboard shortcut descriptions. ([47899](https://github.com/WordPress/gutenberg/pull/47899))
+-   Edit Post: Remove unnecessary 'classnames' in Header component. ([47635](https://github.com/WordPress/gutenberg/pull/47635))
 
 #### REST API
-- Chore: Move Gutenberg_REST_Templates_Controller from 6.2 to 6.3 compatibility. ([48077](https://github.com/WordPress/gutenberg/pull/48077))
+
+-   Chore: Move Gutenberg_REST_Templates_Controller from 6.2 to 6.3 compatibility. ([48077](https://github.com/WordPress/gutenberg/pull/48077))
 
 #### Themes
-- Sync: Widget import changes from the core. ([47875](https://github.com/WordPress/gutenberg/pull/47875))
+
+-   Sync: Widget import changes from the core. ([47875](https://github.com/WordPress/gutenberg/pull/47875))
 
 #### Patterns
-- Refactor: usePatternsCategories: Simplify category sorting. ([47843](https://github.com/WordPress/gutenberg/pull/47843))
+
+-   Refactor: usePatternsCategories: Simplify category sorting. ([47843](https://github.com/WordPress/gutenberg/pull/47843))
 
 #### Document Settings
-- Most Used Terms: Pass dependency to the useSelect. ([47810](https://github.com/WordPress/gutenberg/pull/47810))
+
+-   Most Used Terms: Pass dependency to the useSelect. ([47810](https://github.com/WordPress/gutenberg/pull/47810))
 
 #### Block API
-- HTML API: Move into 6.2 Compat Folder since inclusion in Core. ([47749](https://github.com/WordPress/gutenberg/pull/47749))
+
+-   HTML API: Move into 6.2 Compat Folder since inclusion in Core. ([47749](https://github.com/WordPress/gutenberg/pull/47749))
 
 #### Data Layer
-- Fixed incorrect type annotations in @wordpress/data. ([46881](https://github.com/WordPress/gutenberg/pull/46881))
 
+-   Fixed incorrect type annotations in @wordpress/data. ([46881](https://github.com/WordPress/gutenberg/pull/46881))
 
 ### Tools
-- Dependency Extraction Webpack Plugin: Update json2php dependency. ([47831](https://github.com/WordPress/gutenberg/pull/47831))
+
+-   Dependency Extraction Webpack Plugin: Update json2php dependency. ([47831](https://github.com/WordPress/gutenberg/pull/47831))
 
 #### Testing
-- Add tests for gutenberg_render_layout_support_flag. ([47719](https://github.com/WordPress/gutenberg/pull/47719))
-- Migrate Heading block tests to Playwright. ([47955](https://github.com/WordPress/gutenberg/pull/47955))
-- Migrate query test to Playwright. ([47995](https://github.com/WordPress/gutenberg/pull/47995))
-- Navigation: end-to-end tests: Default to classic menu. ([47867](https://github.com/WordPress/gutenberg/pull/47867))
-- Navigation: end-to-end tests: Default to my only existing menu. ([47744](https://github.com/WordPress/gutenberg/pull/47744))
-- Remove obsolete failing test for Font Size Picker. ([47913](https://github.com/WordPress/gutenberg/pull/47913))
-- Shard playwright tests into two separate jobs using a matrix. ([47629](https://github.com/WordPress/gutenberg/pull/47629))
-- Update code and tests for theme json class after the back port in core. ([47668](https://github.com/WordPress/gutenberg/pull/47668))
-- Upgrade Playwright to 1.30.0. ([48007](https://github.com/WordPress/gutenberg/pull/48007))
+
+-   Add tests for gutenberg_render_layout_support_flag. ([47719](https://github.com/WordPress/gutenberg/pull/47719))
+-   Migrate Heading block tests to Playwright. ([47955](https://github.com/WordPress/gutenberg/pull/47955))
+-   Migrate query test to Playwright. ([47995](https://github.com/WordPress/gutenberg/pull/47995))
+-   Navigation: end-to-end tests: Default to classic menu. ([47867](https://github.com/WordPress/gutenberg/pull/47867))
+-   Navigation: end-to-end tests: Default to my only existing menu. ([47744](https://github.com/WordPress/gutenberg/pull/47744))
+-   Remove obsolete failing test for Font Size Picker. ([47913](https://github.com/WordPress/gutenberg/pull/47913))
+-   Shard playwright tests into two separate jobs using a matrix. ([47629](https://github.com/WordPress/gutenberg/pull/47629))
+-   Update code and tests for theme json class after the back port in core. ([47668](https://github.com/WordPress/gutenberg/pull/47668))
+-   Upgrade Playwright to 1.30.0. ([48007](https://github.com/WordPress/gutenberg/pull/48007))
 
 #### Build Tooling
-- Add basic tsconfig.json validation. ([47595](https://github.com/WordPress/gutenberg/pull/47595))
-- Front-end classic performance test: Set TwentyTwentyOne when running in isolation. ([47965](https://github.com/WordPress/gutenberg/pull/47965))
-- Perf tests: Store test run results as artifact. ([45747](https://github.com/WordPress/gutenberg/pull/45747))
-- Performance suite: Track Largest Contentful Paint in the front-end. ([47938](https://github.com/WordPress/gutenberg/pull/47938))
 
-#### Block Library
-- Navigation: Add warning test. ([45207](https://github.com/WordPress/gutenberg/pull/45207))
+-   Add basic tsconfig.json validation. ([47595](https://github.com/WordPress/gutenberg/pull/47595))
+-   Front-end classic performance test: Set TwentyTwentyOne when running in isolation. ([47965](https://github.com/WordPress/gutenberg/pull/47965))
+-   Perf tests: Store test run results as artifact. ([45747](https://github.com/WordPress/gutenberg/pull/45747))
+-   Performance suite: Track Largest Contentful Paint in the front-end. ([47938](https://github.com/WordPress/gutenberg/pull/47938))
 
+#### Block Library
 
-## First time contributors
+-   Navigation: Add warning test. ([45207](https://github.com/WordPress/gutenberg/pull/45207))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @creative-andrew: Add: Database credentials to wp-env documentation. ([47940](https://github.com/WordPress/gutenberg/pull/47940))
-- @dpellenwood: Scripts: Add PostCSS (.pcss extension) file support to wp-scripts. ([45352](https://github.com/WordPress/gutenberg/pull/45352))
-- @griffinjohndavid: Set block attributes to require either type or enum. ([45365](https://github.com/WordPress/gutenberg/pull/45365))
-- @mike-day: Refactor Toolbar component to TypeScript. ([47087](https://github.com/WordPress/gutenberg/pull/47087))
+The following PRs were merged by first-time contributors:
 
+-   @creative-andrew: Add: Database credentials to wp-env documentation. ([47940](https://github.com/WordPress/gutenberg/pull/47940))
+-   @dpellenwood: Scripts: Add PostCSS (.pcss extension) file support to wp-scripts. ([45352](https://github.com/WordPress/gutenberg/pull/45352))
+-   @griffinjohndavid: Set block attributes to require either type or enum. ([45365](https://github.com/WordPress/gutenberg/pull/45365))
+-   @mike-day: Refactor Toolbar component to TypeScript. ([47087](https://github.com/WordPress/gutenberg/pull/47087))
 
 ## Contributors
 
@@ -8217,7 +19362,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @afercia @ajlende @alexstine @andrewserong @aristath @brookewp @carolinan @ciampo @creative-andrew @d-alleyne @dcalhoun @dmsnell @dpellenwood @draganescu @ellatrix @flootr @fluiddot @georgeh @geriux @getdave @glendaviesnz @griffinjohndavid @gziolo @jhnstn @jorgefilipecosta @jsnajdr @kebbet @kevin940726 @kkmuffme @madhusudhand @MaggieCabrera @Mamaduka @marekdedic @mauteri @mcsf @mike-day @mirka @mreishus @nielslange @noahtallen @noisysocks @ntsekouras @oandregal @scruffian @sgomes @SiobhyB @spacedmonkey @t-hamano @talldan @tellthemachines @tyxla @wojtekn @WunderBart @youknowriad
 
-
 = 15.1.0 =
 
 ## Changelog
@@ -8225,336 +19369,356 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Add Crowdsignal Embed Variation for a new oEmbed endpoint. ([47382](https://github.com/WordPress/gutenberg/pull/47382))
-- Add anchor support for dynamic blocks. ([44771](https://github.com/WordPress/gutenberg/pull/44771))
-- Add box shadow support to blocks (using code editor for now). ([46896](https://github.com/WordPress/gutenberg/pull/46896))
-- Cover block: Add HTML element selection. ([46969](https://github.com/WordPress/gutenberg/pull/46969))
-- Decode entities in page list item title. ([47571](https://github.com/WordPress/gutenberg/pull/47571))
-- Enable image size for featured images in templates. ([46848](https://github.com/WordPress/gutenberg/pull/46848))
-- Gallery Block: Add toolbar button to add a caption. ([47325](https://github.com/WordPress/gutenberg/pull/47325))
-- Make the off-canvas navigation editor the default experience. ([46995](https://github.com/WordPress/gutenberg/pull/46995))
-- Move copy and pasting styles menu items to a separate menu group. ([47430](https://github.com/WordPress/gutenberg/pull/47430))
-- Navigation: Add a manage menus button to the menu selector dropdown. ([47005](https://github.com/WordPress/gutenberg/pull/47005))
-- Navigation: Allow multiple navigations with the same ref. ([47453](https://github.com/WordPress/gutenberg/pull/47453))
-- Navigation: Remove filters disabling tabs for link and submenu. ([47593](https://github.com/WordPress/gutenberg/pull/47593))
-- Navigation: Remove the manage menus button from the selector. ([47441](https://github.com/WordPress/gutenberg/pull/47441))
-- Page List: Swap the positions of the parent page selector and customize button. ([47547](https://github.com/WordPress/gutenberg/pull/47547))
-- Page List: Update the edit/customize copy. ([47549](https://github.com/WordPress/gutenberg/pull/47549))
-- Post excerpt: Add text alignment to the placeholder. ([45003](https://github.com/WordPress/gutenberg/pull/45003))
-- Query Loop Block: Use BlockPatternsList component for Query block patterns modal. ([47366](https://github.com/WordPress/gutenberg/pull/47366))
-- Remove endless spinned for removed navigations. ([47578](https://github.com/WordPress/gutenberg/pull/47578))
-- Remove the list view button from the navigation block. ([47032](https://github.com/WordPress/gutenberg/pull/47032))
-- Table Block: Support rowspan attribute in table HTML, including when pasting. ([46629](https://github.com/WordPress/gutenberg/pull/46629))
-- Update icons for off-canvas navigation. ([47337](https://github.com/WordPress/gutenberg/pull/47337))
-- Migrate from TextControl to InputControl to remove margin overrides. ([47161](https://github.com/WordPress/gutenberg/pull/47161))
-- Multiple blocks: Add missing has-link-color class to the front. ([47357](https://github.com/WordPress/gutenberg/pull/47357))
-- [Navigation]: Update example with no mobile view. ([47508](https://github.com/WordPress/gutenberg/pull/47508))
-- Navigation Block List View: Improve the accessible Name of the Tree Grid inside the component. ([47031](https://github.com/WordPress/gutenberg/pull/47031))
-
-#### Global Styles
-- Add "Learn more about CSS" help text to Custom CSS control. ([47091](https://github.com/WordPress/gutenberg/pull/47091))
-- Add padding when no tabs in the background panel. ([44044](https://github.com/WordPress/gutenberg/pull/44044))
-- Add validation message to custom CSS input. ([47132](https://github.com/WordPress/gutenberg/pull/47132))
-- Change "Custom" CSS navigation label to "Additional CSS". ([47093](https://github.com/WordPress/gutenberg/pull/47093))
-- Make css input fill remainder of screen by default. ([47437](https://github.com/WordPress/gutenberg/pull/47437))
-- Move custom CSS to ellipsis menu if no custom CSS present yet. ([47371](https://github.com/WordPress/gutenberg/pull/47371))
-- Move custom css to its own inline style generation method and combine with customizer CSS. ([47396](https://github.com/WordPress/gutenberg/pull/47396))
-- ToggleGroupControl: Add new opt-in prop. ([47269](https://github.com/WordPress/gutenberg/pull/47269))
-- Add check for edit CSS capability to overflow menu. ([47714](https://github.com/WordPress/gutenberg/pull/47714))
-- Reselect blocks after pasting styles. ([47590](https://github.com/WordPress/gutenberg/pull/47590))
+
+-   Add Crowdsignal Embed Variation for a new oEmbed endpoint. ([47382](https://github.com/WordPress/gutenberg/pull/47382))
+-   Add anchor support for dynamic blocks. ([44771](https://github.com/WordPress/gutenberg/pull/44771))
+-   Add box shadow support to blocks (using code editor for now). ([46896](https://github.com/WordPress/gutenberg/pull/46896))
+-   Cover block: Add HTML element selection. ([46969](https://github.com/WordPress/gutenberg/pull/46969))
+-   Decode entities in page list item title. ([47571](https://github.com/WordPress/gutenberg/pull/47571))
+-   Enable image size for featured images in templates. ([46848](https://github.com/WordPress/gutenberg/pull/46848))
+-   Gallery Block: Add toolbar button to add a caption. ([47325](https://github.com/WordPress/gutenberg/pull/47325))
+-   Make the off-canvas navigation editor the default experience. ([46995](https://github.com/WordPress/gutenberg/pull/46995))
+-   Move copy and pasting styles menu items to a separate menu group. ([47430](https://github.com/WordPress/gutenberg/pull/47430))
+-   Navigation: Add a manage menus button to the menu selector dropdown. ([47005](https://github.com/WordPress/gutenberg/pull/47005))
+-   Navigation: Allow multiple navigations with the same ref. ([47453](https://github.com/WordPress/gutenberg/pull/47453))
+-   Navigation: Remove filters disabling tabs for link and submenu. ([47593](https://github.com/WordPress/gutenberg/pull/47593))
+-   Navigation: Remove the manage menus button from the selector. ([47441](https://github.com/WordPress/gutenberg/pull/47441))
+-   Page List: Swap the positions of the parent page selector and customize button. ([47547](https://github.com/WordPress/gutenberg/pull/47547))
+-   Page List: Update the edit/customize copy. ([47549](https://github.com/WordPress/gutenberg/pull/47549))
+-   Post excerpt: Add text alignment to the placeholder. ([45003](https://github.com/WordPress/gutenberg/pull/45003))
+-   Query Loop Block: Use BlockPatternsList component for Query block patterns modal. ([47366](https://github.com/WordPress/gutenberg/pull/47366))
+-   Remove endless spinned for removed navigations. ([47578](https://github.com/WordPress/gutenberg/pull/47578))
+-   Remove the list view button from the navigation block. ([47032](https://github.com/WordPress/gutenberg/pull/47032))
+-   Table Block: Support rowspan attribute in table HTML, including when pasting. ([46629](https://github.com/WordPress/gutenberg/pull/46629))
+-   Update icons for off-canvas navigation. ([47337](https://github.com/WordPress/gutenberg/pull/47337))
+-   Migrate from TextControl to InputControl to remove margin overrides. ([47161](https://github.com/WordPress/gutenberg/pull/47161))
+-   Multiple blocks: Add missing has-link-color class to the front. ([47357](https://github.com/WordPress/gutenberg/pull/47357))
+-   [Navigation]: Update example with no mobile view. ([47508](https://github.com/WordPress/gutenberg/pull/47508))
+-   Navigation Block List View: Improve the accessible Name of the Tree Grid inside the component. ([47031](https://github.com/WordPress/gutenberg/pull/47031))
+
+#### Global Styles
+
+-   Add "Learn more about CSS" help text to Custom CSS control. ([47091](https://github.com/WordPress/gutenberg/pull/47091))
+-   Add padding when no tabs in the background panel. ([44044](https://github.com/WordPress/gutenberg/pull/44044))
+-   Add validation message to custom CSS input. ([47132](https://github.com/WordPress/gutenberg/pull/47132))
+-   Change "Custom" CSS navigation label to "Additional CSS". ([47093](https://github.com/WordPress/gutenberg/pull/47093))
+-   Make css input fill remainder of screen by default. ([47437](https://github.com/WordPress/gutenberg/pull/47437))
+-   Move custom CSS to ellipsis menu if no custom CSS present yet. ([47371](https://github.com/WordPress/gutenberg/pull/47371))
+-   Move custom css to its own inline style generation method and combine with customizer CSS. ([47396](https://github.com/WordPress/gutenberg/pull/47396))
+-   ToggleGroupControl: Add new opt-in prop. ([47269](https://github.com/WordPress/gutenberg/pull/47269))
+-   Add check for edit CSS capability to overflow menu. ([47714](https://github.com/WordPress/gutenberg/pull/47714))
+-   Reselect blocks after pasting styles. ([47590](https://github.com/WordPress/gutenberg/pull/47590))
 
 #### Site Editor
-- Global Styles: Try per block custom CSS. ([46571](https://github.com/WordPress/gutenberg/pull/46571))
-- Restore the navigation menus in the site editor. ([47485](https://github.com/WordPress/gutenberg/pull/47485))
-- Update resize handle. ([47138](https://github.com/WordPress/gutenberg/pull/47138))
-- Update the site editor for better initialization. ([47182](https://github.com/WordPress/gutenberg/pull/47182))
-- Updates some spacing + dimensions in the Site Hub. ([47120](https://github.com/WordPress/gutenberg/pull/47120))
-- Add: Navigation menus to the browse mode sidebar. ([46436](https://github.com/WordPress/gutenberg/pull/46436))
-- Shadow: Add shadow presets and UI tools in global styles. ([46502](https://github.com/WordPress/gutenberg/pull/46502))
-- TextControl: Remove margin overrides and add new opt-in prop (pt 1/2). ([47157](https://github.com/WordPress/gutenberg/pull/47157))
-- [Webfonts] Rename to Fonts API. ([46749](https://github.com/WordPress/gutenberg/pull/46749))
-- Add layout child sizing to Navigation block. ([47584](https://github.com/WordPress/gutenberg/pull/47584))
-- Add missing controls to flex layouts. ([47134](https://github.com/WordPress/gutenberg/pull/47134))
-- Always pass layout to inner blocks. ([47477](https://github.com/WordPress/gutenberg/pull/47477))
-- Site Hub: Remove the aria-label from the Edit button. ([47343](https://github.com/WordPress/gutenberg/pull/47343))
-- Add ability to open the editor on the selected post on navigation. ([47387](https://github.com/WordPress/gutenberg/pull/47387))
-- Allow clicking the site editor frame to enter edit mode. ([47676](https://github.com/WordPress/gutenberg/pull/47676))
-- Pattern Explorer Modal: Select the first category as the initial category. ([47661](https://github.com/WordPress/gutenberg/pull/47661))
-- [Patterns]: Support the `blockTypes` prop for patterns fetched from Pattern Directory. ([47677](https://github.com/WordPress/gutenberg/pull/47677))
-- Sticky Position: Fix top position while logged in on mobile. ([47665](https://github.com/WordPress/gutenberg/pull/47665))
+
+-   Global Styles: Try per block custom CSS. ([46571](https://github.com/WordPress/gutenberg/pull/46571))
+-   Restore the navigation menus in the site editor. ([47485](https://github.com/WordPress/gutenberg/pull/47485))
+-   Update resize handle. ([47138](https://github.com/WordPress/gutenberg/pull/47138))
+-   Update the site editor for better initialization. ([47182](https://github.com/WordPress/gutenberg/pull/47182))
+-   Updates some spacing + dimensions in the Site Hub. ([47120](https://github.com/WordPress/gutenberg/pull/47120))
+-   Add: Navigation menus to the browse mode sidebar. ([46436](https://github.com/WordPress/gutenberg/pull/46436))
+-   Shadow: Add shadow presets and UI tools in global styles. ([46502](https://github.com/WordPress/gutenberg/pull/46502))
+-   TextControl: Remove margin overrides and add new opt-in prop (pt 1/2). ([47157](https://github.com/WordPress/gutenberg/pull/47157))
+-   [Webfonts] Rename to Fonts API. ([46749](https://github.com/WordPress/gutenberg/pull/46749))
+-   Add layout child sizing to Navigation block. ([47584](https://github.com/WordPress/gutenberg/pull/47584))
+-   Add missing controls to flex layouts. ([47134](https://github.com/WordPress/gutenberg/pull/47134))
+-   Always pass layout to inner blocks. ([47477](https://github.com/WordPress/gutenberg/pull/47477))
+-   Site Hub: Remove the aria-label from the Edit button. ([47343](https://github.com/WordPress/gutenberg/pull/47343))
+-   Add ability to open the editor on the selected post on navigation. ([47387](https://github.com/WordPress/gutenberg/pull/47387))
+-   Allow clicking the site editor frame to enter edit mode. ([47676](https://github.com/WordPress/gutenberg/pull/47676))
+-   Pattern Explorer Modal: Select the first category as the initial category. ([47661](https://github.com/WordPress/gutenberg/pull/47661))
+-   [Patterns]: Support the `blockTypes` prop for patterns fetched from Pattern Directory. ([47677](https://github.com/WordPress/gutenberg/pull/47677))
+-   Sticky Position: Fix top position while logged in on mobile. ([47665](https://github.com/WordPress/gutenberg/pull/47665))
 
 #### Testing
-- Clean up sidebar tab end-to-end test utils. ([47097](https://github.com/WordPress/gutenberg/pull/47097))
-- Components: Refactor more tests to use real timers. ([47318](https://github.com/WordPress/gutenberg/pull/47318))
-- Components: Use real timers where possible. ([47056](https://github.com/WordPress/gutenberg/pull/47056))
-- Migrate Classic block tests to Playwright. ([46689](https://github.com/WordPress/gutenberg/pull/46689))
-
-#### Block Editor
-- Add custom label to nav block list view appender. ([47033](https://github.com/WordPress/gutenberg/pull/47033))
-- Move Link Control action buttons into lower settings area. ([47309](https://github.com/WordPress/gutenberg/pull/47309))
-- Pattern Inserter: Show insertion indicator when hovering on patterns. ([47316](https://github.com/WordPress/gutenberg/pull/47316))
-- Add clear Apply and Cancel buttons to Link Control. ([46933](https://github.com/WordPress/gutenberg/pull/46933))
-- [Inserter]: Openverse integration. ([46251](https://github.com/WordPress/gutenberg/pull/46251))
-- TextControl: Remove margin overrides and add new opt-in prop (pt 2/2). ([47158](https://github.com/WordPress/gutenberg/pull/47158))
-- [Block editor]: Add setting to disable Openverse integration. ([47404](https://github.com/WordPress/gutenberg/pull/47404))
-- Block Inspector: Make Settings tab the default. ([47592](https://github.com/WordPress/gutenberg/pull/47592))
-- Sticky Position: Hide controls if the block is non-root (has parents). ([47334](https://github.com/WordPress/gutenberg/pull/47334))
-- Block Inspector: Avoid advanced panel only settings tab. ([47474](https://github.com/WordPress/gutenberg/pull/47474))
-- Stabilize the experimental control groups. ([47105](https://github.com/WordPress/gutenberg/pull/47105))
-- Table: Display fixed width table cells option by default. ([47536](https://github.com/WordPress/gutenberg/pull/47536))
-
-#### Components
-- AligmentMatrixControl: Update center cell label to 'Center'. ([46852](https://github.com/WordPress/gutenberg/pull/46852))
-- Button: Try improving padding for icon + text buttons. ([46764](https://github.com/WordPress/gutenberg/pull/46764))
-- Fix HStack documentation to show code sample. ([47162](https://github.com/WordPress/gutenberg/pull/47162))
+
+-   Clean up sidebar tab end-to-end test utils. ([47097](https://github.com/WordPress/gutenberg/pull/47097))
+-   Components: Refactor more tests to use real timers. ([47318](https://github.com/WordPress/gutenberg/pull/47318))
+-   Components: Use real timers where possible. ([47056](https://github.com/WordPress/gutenberg/pull/47056))
+-   Migrate Classic block tests to Playwright. ([46689](https://github.com/WordPress/gutenberg/pull/46689))
+
+#### Block Editor
+
+-   Add custom label to nav block list view appender. ([47033](https://github.com/WordPress/gutenberg/pull/47033))
+-   Move Link Control action buttons into lower settings area. ([47309](https://github.com/WordPress/gutenberg/pull/47309))
+-   Pattern Inserter: Show insertion indicator when hovering on patterns. ([47316](https://github.com/WordPress/gutenberg/pull/47316))
+-   Add clear Apply and Cancel buttons to Link Control. ([46933](https://github.com/WordPress/gutenberg/pull/46933))
+-   [Inserter]: Openverse integration. ([46251](https://github.com/WordPress/gutenberg/pull/46251))
+-   TextControl: Remove margin overrides and add new opt-in prop (pt 2/2). ([47158](https://github.com/WordPress/gutenberg/pull/47158))
+-   [Block editor]: Add setting to disable Openverse integration. ([47404](https://github.com/WordPress/gutenberg/pull/47404))
+-   Block Inspector: Make Settings tab the default. ([47592](https://github.com/WordPress/gutenberg/pull/47592))
+-   Sticky Position: Hide controls if the block is non-root (has parents). ([47334](https://github.com/WordPress/gutenberg/pull/47334))
+-   Block Inspector: Avoid advanced panel only settings tab. ([47474](https://github.com/WordPress/gutenberg/pull/47474))
+-   Stabilize the experimental control groups. ([47105](https://github.com/WordPress/gutenberg/pull/47105))
+-   Table: Display fixed width table cells option by default. ([47536](https://github.com/WordPress/gutenberg/pull/47536))
+
+#### Components
+
+-   AligmentMatrixControl: Update center cell label to 'Center'. ([46852](https://github.com/WordPress/gutenberg/pull/46852))
+-   Button: Try improving padding for icon + text buttons. ([46764](https://github.com/WordPress/gutenberg/pull/46764))
+-   Fix HStack documentation to show code sample. ([47162](https://github.com/WordPress/gutenberg/pull/47162))
 
 #### Accessibility
-- Announce when block inserted in Navigation list view. ([47034](https://github.com/WordPress/gutenberg/pull/47034))
-- Navigation block: Fix some off canvas appender accessibility issues. ([47047](https://github.com/WordPress/gutenberg/pull/47047))
-- [Block Editor]: Update text align toolbar control label. ([47119](https://github.com/WordPress/gutenberg/pull/47119))
+
+-   Announce when block inserted in Navigation list view. ([47034](https://github.com/WordPress/gutenberg/pull/47034))
+-   Navigation block: Fix some off canvas appender accessibility issues. ([47047](https://github.com/WordPress/gutenberg/pull/47047))
+-   [Block Editor]: Update text align toolbar control label. ([47119](https://github.com/WordPress/gutenberg/pull/47119))
 
 #### Themes
-- Make child themes inherit parent's style variations. ([46554](https://github.com/WordPress/gutenberg/pull/46554))
-- Shadow: Rename shadow palette to presets. ([47272](https://github.com/WordPress/gutenberg/pull/47272))
-
-### Bug Fixes
-
-#### Block Library
-- Ensure appropriate fallback menu title in Nav block menu selector. ([47073](https://github.com/WordPress/gutenberg/pull/47073))
-- Fix duplicate template parts logic overriding existing template part. ([47128](https://github.com/WordPress/gutenberg/pull/47128))
-- Fix post featured image scaling on the front. ([46838](https://github.com/WordPress/gutenberg/pull/46838))
-- Nav offcanvas restore click to edit. ([47608](https://github.com/WordPress/gutenberg/pull/47608))
-- Navigation Block: Avoid showing the contrast checker warning twice. ([47205](https://github.com/WordPress/gutenberg/pull/47205))
-- Navigation Block: Fix warning error when no ref. ([47479](https://github.com/WordPress/gutenberg/pull/47479))
-- Page List: Add extra safety around warnings. ([47603](https://github.com/WordPress/gutenberg/pull/47603))
-- Refactor convert links. ([46930](https://github.com/WordPress/gutenberg/pull/46930))
-- Search Block: Apply border color correctly when button is outside or absent. ([47067](https://github.com/WordPress/gutenberg/pull/47067))
-- Template Parts: Avoid duplicate names on conversion from group of blocks. ([47082](https://github.com/WordPress/gutenberg/pull/47082))
-- [Block Editor - Post Template]: Fix layout styles. ([47221](https://github.com/WordPress/gutenberg/pull/47221))
-- Add an alt attribute to the linked featured image if there is no post title. ([46830](https://github.com/WordPress/gutenberg/pull/46830))
-- Post Template: Add default value for `offset`. ([47308](https://github.com/WordPress/gutenberg/pull/47308))
-- Parse (area-specific) context in template-part block. ([47203](https://github.com/WordPress/gutenberg/pull/47203))
-- Don't use methods with the 'gutenberg_' prefix. ([47649](https://github.com/WordPress/gutenberg/pull/47649))
-- Navigation: Only show the deleted menu warning if a ref is specified. ([47699](https://github.com/WordPress/gutenberg/pull/47699))
-- [Query Loop]: Guard term addtion when the request hasn't resolved. ([47688](https://github.com/WordPress/gutenberg/pull/47688))
-
-
-#### Block Editor
-- Fix Link Control action button visuals. ([47306](https://github.com/WordPress/gutenberg/pull/47306))
-- Fix Link UI incorrect text replacement in Rich Text. ([45710](https://github.com/WordPress/gutenberg/pull/45710))
-- In-between inserter: Fix console error when moving mouse in Firefox. ([47168](https://github.com/WordPress/gutenberg/pull/47168))
-- Remove double edit button in LinkUI. ([47454](https://github.com/WordPress/gutenberg/pull/47454))
-- Template parts and Reusable block: Fix multiple selection overlay styles. ([47342](https://github.com/WordPress/gutenberg/pull/47342))
-- Use tertiary variant on Link Control cancel button. ([47313](https://github.com/WordPress/gutenberg/pull/47313))
-- Add back block editor settings filter. ([47558](https://github.com/WordPress/gutenberg/pull/47558))
-- Backport WP_REST_Pattern_Directory_Controller changes from core. ([47409](https://github.com/WordPress/gutenberg/pull/47409))
-- Block Editor: Move component styles needed for iframes to content styles. ([47103](https://github.com/WordPress/gutenberg/pull/47103))
-- Block Inserter: Correctly apply style to the default inserter. ([47166](https://github.com/WordPress/gutenberg/pull/47166))
-- Block editor: iframe: Fix placeholder colors. ([47416](https://github.com/WordPress/gutenberg/pull/47416))
-- Fix react key error with position controls. ([47367](https://github.com/WordPress/gutenberg/pull/47367))
-- Revert "Navigation List View: Remove empty cell when there is no edit button". ([47061](https://github.com/WordPress/gutenberg/pull/47061))
-- [Block Editor]: Fix `onHover` errors at BlockPattern. ([47466](https://github.com/WordPress/gutenberg/pull/47466))
-- [Block Editor]: Register the store through `registerStore`. ([47488](https://github.com/WordPress/gutenberg/pull/47488))
-- Avoid erroring when getQueryArgs processes a malformed URL. ([45561](https://github.com/WordPress/gutenberg/pull/45561))
-- `MediaUtils`: Move `window` access to function bodies. ([46970](https://github.com/WordPress/gutenberg/pull/46970))
-- Fix and simplify the Modal dialog close button label. ([47540](https://github.com/WordPress/gutenberg/pull/47540))
-- Fix misaligned layout control icons. ([47089](https://github.com/WordPress/gutenberg/pull/47089))
-- Fix/flex controls bugs. ([47533](https://github.com/WordPress/gutenberg/pull/47533))
-- E2E: Improve multiple block moving test stability. ([47423](https://github.com/WordPress/gutenberg/pull/47423))
-- Fix Post Visibility end-to-end tests. ([47520](https://github.com/WordPress/gutenberg/pull/47520))
-- Fix padding and margin visualizer positioning. ([47483](https://github.com/WordPress/gutenberg/pull/47483))
-- Fix padding and margin visualizer styles. ([47139](https://github.com/WordPress/gutenberg/pull/47139))
-- Pattern Inserter: Fix unintended preview panel display when hovering mouse over pattern. ([47693](https://github.com/WordPress/gutenberg/pull/47693))
 
+-   Make child themes inherit parent's style variations. ([46554](https://github.com/WordPress/gutenberg/pull/46554))
+-   Shadow: Rename shadow palette to presets. ([47272](https://github.com/WordPress/gutenberg/pull/47272))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Ensure appropriate fallback menu title in Nav block menu selector. ([47073](https://github.com/WordPress/gutenberg/pull/47073))
+-   Fix duplicate template parts logic overriding existing template part. ([47128](https://github.com/WordPress/gutenberg/pull/47128))
+-   Fix post featured image scaling on the front. ([46838](https://github.com/WordPress/gutenberg/pull/46838))
+-   Nav offcanvas restore click to edit. ([47608](https://github.com/WordPress/gutenberg/pull/47608))
+-   Navigation Block: Avoid showing the contrast checker warning twice. ([47205](https://github.com/WordPress/gutenberg/pull/47205))
+-   Navigation Block: Fix warning error when no ref. ([47479](https://github.com/WordPress/gutenberg/pull/47479))
+-   Page List: Add extra safety around warnings. ([47603](https://github.com/WordPress/gutenberg/pull/47603))
+-   Refactor convert links. ([46930](https://github.com/WordPress/gutenberg/pull/46930))
+-   Search Block: Apply border color correctly when button is outside or absent. ([47067](https://github.com/WordPress/gutenberg/pull/47067))
+-   Template Parts: Avoid duplicate names on conversion from group of blocks. ([47082](https://github.com/WordPress/gutenberg/pull/47082))
+-   [Block Editor - Post Template]: Fix layout styles. ([47221](https://github.com/WordPress/gutenberg/pull/47221))
+-   Add an alt attribute to the linked featured image if there is no post title. ([46830](https://github.com/WordPress/gutenberg/pull/46830))
+-   Post Template: Add default value for `offset`. ([47308](https://github.com/WordPress/gutenberg/pull/47308))
+-   Parse (area-specific) context in template-part block. ([47203](https://github.com/WordPress/gutenberg/pull/47203))
+-   Don't use methods with the 'gutenberg\_' prefix. ([47649](https://github.com/WordPress/gutenberg/pull/47649))
+-   Navigation: Only show the deleted menu warning if a ref is specified. ([47699](https://github.com/WordPress/gutenberg/pull/47699))
+-   [Query Loop]: Guard term addtion when the request hasn't resolved. ([47688](https://github.com/WordPress/gutenberg/pull/47688))
+
+#### Block Editor
+
+-   Fix Link Control action button visuals. ([47306](https://github.com/WordPress/gutenberg/pull/47306))
+-   Fix Link UI incorrect text replacement in Rich Text. ([45710](https://github.com/WordPress/gutenberg/pull/45710))
+-   In-between inserter: Fix console error when moving mouse in Firefox. ([47168](https://github.com/WordPress/gutenberg/pull/47168))
+-   Remove double edit button in LinkUI. ([47454](https://github.com/WordPress/gutenberg/pull/47454))
+-   Template parts and Reusable block: Fix multiple selection overlay styles. ([47342](https://github.com/WordPress/gutenberg/pull/47342))
+-   Use tertiary variant on Link Control cancel button. ([47313](https://github.com/WordPress/gutenberg/pull/47313))
+-   Add back block editor settings filter. ([47558](https://github.com/WordPress/gutenberg/pull/47558))
+-   Backport WP_REST_Pattern_Directory_Controller changes from core. ([47409](https://github.com/WordPress/gutenberg/pull/47409))
+-   Block Editor: Move component styles needed for iframes to content styles. ([47103](https://github.com/WordPress/gutenberg/pull/47103))
+-   Block Inserter: Correctly apply style to the default inserter. ([47166](https://github.com/WordPress/gutenberg/pull/47166))
+-   Block editor: iframe: Fix placeholder colors. ([47416](https://github.com/WordPress/gutenberg/pull/47416))
+-   Fix react key error with position controls. ([47367](https://github.com/WordPress/gutenberg/pull/47367))
+-   Revert "Navigation List View: Remove empty cell when there is no edit button". ([47061](https://github.com/WordPress/gutenberg/pull/47061))
+-   [Block Editor]: Fix `onHover` errors at BlockPattern. ([47466](https://github.com/WordPress/gutenberg/pull/47466))
+-   [Block Editor]: Register the store through `registerStore`. ([47488](https://github.com/WordPress/gutenberg/pull/47488))
+-   Avoid erroring when getQueryArgs processes a malformed URL. ([45561](https://github.com/WordPress/gutenberg/pull/45561))
+-   `MediaUtils`: Move `window` access to function bodies. ([46970](https://github.com/WordPress/gutenberg/pull/46970))
+-   Fix and simplify the Modal dialog close button label. ([47540](https://github.com/WordPress/gutenberg/pull/47540))
+-   Fix misaligned layout control icons. ([47089](https://github.com/WordPress/gutenberg/pull/47089))
+-   Fix/flex controls bugs. ([47533](https://github.com/WordPress/gutenberg/pull/47533))
+-   E2E: Improve multiple block moving test stability. ([47423](https://github.com/WordPress/gutenberg/pull/47423))
+-   Fix Post Visibility end-to-end tests. ([47520](https://github.com/WordPress/gutenberg/pull/47520))
+-   Fix padding and margin visualizer positioning. ([47483](https://github.com/WordPress/gutenberg/pull/47483))
+-   Fix padding and margin visualizer styles. ([47139](https://github.com/WordPress/gutenberg/pull/47139))
+-   Pattern Inserter: Fix unintended preview panel display when hovering mouse over pattern. ([47693](https://github.com/WordPress/gutenberg/pull/47693))
 
 #### Site Editor
-- Allow resizing the sidebar in the site editor using keyboard. ([47176](https://github.com/WordPress/gutenberg/pull/47176))
-- Block Editor: Add inert polyfill to iframe. ([47398](https://github.com/WordPress/gutenberg/pull/47398))
-- Browse mode: Add an H2 inside the sidebar navigation screen title. ([47241](https://github.com/WordPress/gutenberg/pull/47241))
-- Force visual editor in browse mode. ([47329](https://github.com/WordPress/gutenberg/pull/47329))
-- Template Sidebar: Fix list of current template part areas to show nested template parts. ([47232](https://github.com/WordPress/gutenberg/pull/47232))
-- `useDisabled` hook: Fix problem with not working in iframe. ([47459](https://github.com/WordPress/gutenberg/pull/47459))
+
+-   Allow resizing the sidebar in the site editor using keyboard. ([47176](https://github.com/WordPress/gutenberg/pull/47176))
+-   Block Editor: Add inert polyfill to iframe. ([47398](https://github.com/WordPress/gutenberg/pull/47398))
+-   Browse mode: Add an H2 inside the sidebar navigation screen title. ([47241](https://github.com/WordPress/gutenberg/pull/47241))
+-   Force visual editor in browse mode. ([47329](https://github.com/WordPress/gutenberg/pull/47329))
+-   Template Sidebar: Fix list of current template part areas to show nested template parts. ([47232](https://github.com/WordPress/gutenberg/pull/47232))
+-   `useDisabled` hook: Fix problem with not working in iframe. ([47459](https://github.com/WordPress/gutenberg/pull/47459))
 
 #### Global Styles
-- Don't remove Custom CSS for users with the correct caps. ([47062](https://github.com/WordPress/gutenberg/pull/47062))
-- Fix inline block declaration anti-pattern in global styles UI. ([47374](https://github.com/WordPress/gutenberg/pull/47374))
-- Fix param type in Theme_JSON_Resolver DocBlock. ([47385](https://github.com/WordPress/gutenberg/pull/47385))
-- Hide Custom CSS setting for users without 'edit_css' cap. ([46815](https://github.com/WordPress/gutenberg/pull/46815))
+
+-   Don't remove Custom CSS for users with the correct caps. ([47062](https://github.com/WordPress/gutenberg/pull/47062))
+-   Fix inline block declaration anti-pattern in global styles UI. ([47374](https://github.com/WordPress/gutenberg/pull/47374))
+-   Fix param type in Theme_JSON_Resolver DocBlock. ([47385](https://github.com/WordPress/gutenberg/pull/47385))
+-   Hide Custom CSS setting for users without 'edit_css' cap. ([46815](https://github.com/WordPress/gutenberg/pull/46815))
 
 #### Webfonts
-- Add registered fonts to theme JSON AFTER the child and parent data has been merged. ([47290](https://github.com/WordPress/gutenberg/pull/47290))
-- [Fonts API] Remove local() from @font-face styles. ([47254](https://github.com/WordPress/gutenberg/pull/47254))
-- [Webfonts] Use Core's `_deprecated_argument()` for deprecating data structures. ([47125](https://github.com/WordPress/gutenberg/pull/47125))
+
+-   Add registered fonts to theme JSON AFTER the child and parent data has been merged. ([47290](https://github.com/WordPress/gutenberg/pull/47290))
+-   [Fonts API] Remove local() from @font-face styles. ([47254](https://github.com/WordPress/gutenberg/pull/47254))
+-   [Webfonts] Use Core's `_deprecated_argument()` for deprecating data structures. ([47125](https://github.com/WordPress/gutenberg/pull/47125))
 
 #### Components
-- Fix tab panel initial tab selection. ([47100](https://github.com/WordPress/gutenberg/pull/47100))
-- InputControl: Avoid uncontrolled to controlled warning. ([47250](https://github.com/WordPress/gutenberg/pull/47250))
-- `ColorPalette`: Use computed color when css variable is passed to `ColorPicker`. ([47181](https://github.com/WordPress/gutenberg/pull/47181))
-- Tabs focus: Followup for Windows high contrast. ([46647](https://github.com/WordPress/gutenberg/pull/46647))
-- Support private selectors and actions for stores registered via registry.registerStore() and for sub registries. ([47421](https://github.com/WordPress/gutenberg/pull/47421))
+
+-   Fix tab panel initial tab selection. ([47100](https://github.com/WordPress/gutenberg/pull/47100))
+-   InputControl: Avoid uncontrolled to controlled warning. ([47250](https://github.com/WordPress/gutenberg/pull/47250))
+-   `ColorPalette`: Use computed color when css variable is passed to `ColorPicker`. ([47181](https://github.com/WordPress/gutenberg/pull/47181))
+-   Tabs focus: Followup for Windows high contrast. ([46647](https://github.com/WordPress/gutenberg/pull/46647))
+-   Support private selectors and actions for stores registered via registry.registerStore() and for sub registries. ([47421](https://github.com/WordPress/gutenberg/pull/47421))
 
 ### Performance
 
 #### Block Editor
-- Block Editor: Improve `getBlockInsertionPoint` memoization. ([47489](https://github.com/WordPress/gutenberg/pull/47489))
-- Block Editor: Improve `getPatternsByBlockTypes()` selector performance. ([47450](https://github.com/WordPress/gutenberg/pull/47450))
-- Block Editor: Memoize `getBlockInsertionPoint` selector. ([47448](https://github.com/WordPress/gutenberg/pull/47448))
-- Block Editor: Optimize selected blocks in `BlockSettingsMenuControls`. ([47462](https://github.com/WordPress/gutenberg/pull/47462))
-- Color Palette: Don't use unstable array reference for fallbacks. ([47577](https://github.com/WordPress/gutenberg/pull/47577))
-- Element: Enable concurrent mode by implementing mount/unmount with createRoot. ([46467](https://github.com/WordPress/gutenberg/pull/46467))
-- Lodash: Refactor away from `_.setWith()`. ([47017](https://github.com/WordPress/gutenberg/pull/47017))
-- Lodash: Refactor block editor away from `_.map()`. ([47214](https://github.com/WordPress/gutenberg/pull/47214))
-- Lodash: Deprecate `_.map()`. ([47216](https://github.com/WordPress/gutenberg/pull/47216))
-- Lodash: Refactor core data away from `_.map()`. ([47189](https://github.com/WordPress/gutenberg/pull/47189))
-- Log frontend perf results in codehealth. ([47442](https://github.com/WordPress/gutenberg/pull/47442))
-- Perf: Rely on more efficient Map for Priority Queue internal state. ([47156](https://github.com/WordPress/gutenberg/pull/47156))
-- Block Editor: Add a new hook for getting a stable block context object. ([47028](https://github.com/WordPress/gutenberg/pull/47028))
-- Fix crash when the first template-parts is deleted width del key. ([47227](https://github.com/WordPress/gutenberg/pull/47227))
+
+-   Block Editor: Improve `getBlockInsertionPoint` memoization. ([47489](https://github.com/WordPress/gutenberg/pull/47489))
+-   Block Editor: Improve `getPatternsByBlockTypes()` selector performance. ([47450](https://github.com/WordPress/gutenberg/pull/47450))
+-   Block Editor: Memoize `getBlockInsertionPoint` selector. ([47448](https://github.com/WordPress/gutenberg/pull/47448))
+-   Block Editor: Optimize selected blocks in `BlockSettingsMenuControls`. ([47462](https://github.com/WordPress/gutenberg/pull/47462))
+-   Color Palette: Don't use unstable array reference for fallbacks. ([47577](https://github.com/WordPress/gutenberg/pull/47577))
+-   Element: Enable concurrent mode by implementing mount/unmount with createRoot. ([46467](https://github.com/WordPress/gutenberg/pull/46467))
+-   Lodash: Refactor away from `_.setWith()`. ([47017](https://github.com/WordPress/gutenberg/pull/47017))
+-   Lodash: Refactor block editor away from `_.map()`. ([47214](https://github.com/WordPress/gutenberg/pull/47214))
+-   Lodash: Deprecate `_.map()`. ([47216](https://github.com/WordPress/gutenberg/pull/47216))
+-   Lodash: Refactor core data away from `_.map()`. ([47189](https://github.com/WordPress/gutenberg/pull/47189))
+-   Log frontend perf results in codehealth. ([47442](https://github.com/WordPress/gutenberg/pull/47442))
+-   Perf: Rely on more efficient Map for Priority Queue internal state. ([47156](https://github.com/WordPress/gutenberg/pull/47156))
+-   Block Editor: Add a new hook for getting a stable block context object. ([47028](https://github.com/WordPress/gutenberg/pull/47028))
+-   Fix crash when the first template-parts is deleted width del key. ([47227](https://github.com/WordPress/gutenberg/pull/47227))
 
 #### Post Editor
-- Lodash: Refactor `HierarchicalTermSelector` away from `_.unescape()`. ([47567](https://github.com/WordPress/gutenberg/pull/47567))
-- Lodash: Refactor `PageAttributesParent` away from `_.unescape()`. ([47565](https://github.com/WordPress/gutenberg/pull/47565))
-- Lodash: Refactor away from `_.clone()`. ([47315](https://github.com/WordPress/gutenberg/pull/47315))
-- Lodash: Refactor editor away from `_.map()`. ([47191](https://github.com/WordPress/gutenberg/pull/47191))
-- Lodash: Refactor flat term selection away from `_.unescape()`. ([47572](https://github.com/WordPress/gutenberg/pull/47572))
-- Lodash: Refactor post editor away from `_.map()`. ([47193](https://github.com/WordPress/gutenberg/pull/47193))
+
+-   Lodash: Refactor `HierarchicalTermSelector` away from `_.unescape()`. ([47567](https://github.com/WordPress/gutenberg/pull/47567))
+-   Lodash: Refactor `PageAttributesParent` away from `_.unescape()`. ([47565](https://github.com/WordPress/gutenberg/pull/47565))
+-   Lodash: Refactor away from `_.clone()`. ([47315](https://github.com/WordPress/gutenberg/pull/47315))
+-   Lodash: Refactor editor away from `_.map()`. ([47191](https://github.com/WordPress/gutenberg/pull/47191))
+-   Lodash: Refactor flat term selection away from `_.unescape()`. ([47572](https://github.com/WordPress/gutenberg/pull/47572))
+-   Lodash: Refactor post editor away from `_.map()`. ([47193](https://github.com/WordPress/gutenberg/pull/47193))
 
 #### Block Library
-- Lodash: Refactor Categories List block away from `_.unescape()`. ([47561](https://github.com/WordPress/gutenberg/pull/47561))
-- Lodash: Refactor Tag Cloud block away from `_.unescape()`. ([47562](https://github.com/WordPress/gutenberg/pull/47562))
-- Lodash: Refactor `NavigationLinkEdit` away from `_.unescape()`. ([47570](https://github.com/WordPress/gutenberg/pull/47570))
-- Lodash: Refactor block library away from `_.map()`. ([47215](https://github.com/WordPress/gutenberg/pull/47215))
-- Lodash: Refactor some `_.isEmpty()` instances. ([47353](https://github.com/WordPress/gutenberg/pull/47353))
-- Lodash: Refactor blocks away from `_.map()`. ([47188](https://github.com/WordPress/gutenberg/pull/47188))
-- Lodash: Refactor away from `_.unescape()`. ([47613](https://github.com/WordPress/gutenberg/pull/47613))
-- Lodash: Refactor components away from `_.map()`. ([47192](https://github.com/WordPress/gutenberg/pull/47192))
 
+-   Lodash: Refactor Categories List block away from `_.unescape()`. ([47561](https://github.com/WordPress/gutenberg/pull/47561))
+-   Lodash: Refactor Tag Cloud block away from `_.unescape()`. ([47562](https://github.com/WordPress/gutenberg/pull/47562))
+-   Lodash: Refactor `NavigationLinkEdit` away from `_.unescape()`. ([47570](https://github.com/WordPress/gutenberg/pull/47570))
+-   Lodash: Refactor block library away from `_.map()`. ([47215](https://github.com/WordPress/gutenberg/pull/47215))
+-   Lodash: Refactor some `_.isEmpty()` instances. ([47353](https://github.com/WordPress/gutenberg/pull/47353))
+-   Lodash: Refactor blocks away from `_.map()`. ([47188](https://github.com/WordPress/gutenberg/pull/47188))
+-   Lodash: Refactor away from `_.unescape()`. ([47613](https://github.com/WordPress/gutenberg/pull/47613))
+-   Lodash: Refactor components away from `_.map()`. ([47192](https://github.com/WordPress/gutenberg/pull/47192))
 
 ### Experiments
 
-- Introduce ExperimentalBlockEditorProvider. ([47319](https://github.com/WordPress/gutenberg/pull/47319))
-- Sharing private APIs with lock() and unlock(). ([46131](https://github.com/WordPress/gutenberg/pull/46131))
-- Use experiment locking/unlocking system for block interface selector and actions. ([47375](https://github.com/WordPress/gutenberg/pull/47375))
-- WP_HTML_Tag_Processor: Rename attribute_updates to lexical_updates. ([47053](https://github.com/WordPress/gutenberg/pull/47053))
-- Fully remove Navigation Editor screen and associated `edit-navigation` package. ([47055](https://github.com/WordPress/gutenberg/pull/47055))
-- Tag Processor: Only define classes if they don't already exist. ([47434](https://github.com/WordPress/gutenberg/pull/47434))
+-   Introduce ExperimentalBlockEditorProvider. ([47319](https://github.com/WordPress/gutenberg/pull/47319))
+-   Sharing private APIs with lock() and unlock(). ([46131](https://github.com/WordPress/gutenberg/pull/46131))
+-   Use experiment locking/unlocking system for block interface selector and actions. ([47375](https://github.com/WordPress/gutenberg/pull/47375))
+-   WP_HTML_Tag_Processor: Rename attribute_updates to lexical_updates. ([47053](https://github.com/WordPress/gutenberg/pull/47053))
+-   Fully remove Navigation Editor screen and associated `edit-navigation` package. ([47055](https://github.com/WordPress/gutenberg/pull/47055))
+-   Tag Processor: Only define classes if they don't already exist. ([47434](https://github.com/WordPress/gutenberg/pull/47434))
 
 ### Documentation
 
-- Improve gutenberg release documentation to explain the plugin backporting process. ([47372](https://github.com/WordPress/gutenberg/pull/47372))
-- Quick update to the Gutenberg plugin description. ([47432](https://github.com/WordPress/gutenberg/pull/47432))
-- Fix typo in `InspectorControls` documentation. ([47154](https://github.com/WordPress/gutenberg/pull/47154))
-- QueryControls: Improve onCategoryChange prop documentation in README. ([47452](https://github.com/WordPress/gutenberg/pull/47452))
-- Refactor `Button` component to TypeScript. ([46997](https://github.com/WordPress/gutenberg/pull/46997))
-- Release docs: Add some extra clarification that no action is required by the coordinator when publishing packages. ([47480](https://github.com/WordPress/gutenberg/pull/47480))
-- Remove extra locking from Block Editor store. ([47550](https://github.com/WordPress/gutenberg/pull/47550))
-- Theme: Exclude readme from public documentation. ([47220](https://github.com/WordPress/gutenberg/pull/47220)
-- Toolbar: Unify Storybook examples under one file, migrate from knobs to controls. ([47117](https://github.com/WordPress/gutenberg/pull/47117))
+-   Improve gutenberg release documentation to explain the plugin backporting process. ([47372](https://github.com/WordPress/gutenberg/pull/47372))
+-   Quick update to the Gutenberg plugin description. ([47432](https://github.com/WordPress/gutenberg/pull/47432))
+-   Fix typo in `InspectorControls` documentation. ([47154](https://github.com/WordPress/gutenberg/pull/47154))
+-   QueryControls: Improve onCategoryChange prop documentation in README. ([47452](https://github.com/WordPress/gutenberg/pull/47452))
+-   Refactor `Button` component to TypeScript. ([46997](https://github.com/WordPress/gutenberg/pull/46997))
+-   Release docs: Add some extra clarification that no action is required by the coordinator when publishing packages. ([47480](https://github.com/WordPress/gutenberg/pull/47480))
+-   Remove extra locking from Block Editor store. ([47550](https://github.com/WordPress/gutenberg/pull/47550))
+-   Theme: Exclude readme from public documentation. ([47220](https://github.com/WordPress/gutenberg/pull/47220)
+-   Toolbar: Unify Storybook examples under one file, migrate from knobs to controls. ([47117](https://github.com/WordPress/gutenberg/pull/47117))
 
 ### Code Quality
 
-- Remove ESLint ignore directive documentation. ([47096](https://github.com/WordPress/gutenberg/pull/47096))
-- Remove lodash mapKeys usage. ([47600](https://github.com/WordPress/gutenberg/pull/47600))
+-   Remove ESLint ignore directive documentation. ([47096](https://github.com/WordPress/gutenberg/pull/47096))
+-   Remove lodash mapKeys usage. ([47600](https://github.com/WordPress/gutenberg/pull/47600))
 
 #### Components
-- ColorListPicker: Refactor to TypeScript. ([46358](https://github.com/WordPress/gutenberg/pull/46358))
-- ColorPalette, BorderControl, GradientPicker: Refine types and logic around single vs multiple palettes. ([47384](https://github.com/WordPress/gutenberg/pull/47384))
-- DropdownMenu: Convert Storybook examples from knobs to controls. ([47149](https://github.com/WordPress/gutenberg/pull/47149))
-- KeyboardShortcuts: Convert to TypeScript. ([47429](https://github.com/WordPress/gutenberg/pull/47429))
-- Notice: Refactor to TypeScript. ([47118](https://github.com/WordPress/gutenberg/pull/47118))
-- NumberControl: Clarify deprecation message about `hideHTMLArrows` prop. ([47370](https://github.com/WordPress/gutenberg/pull/47370))
-- Refactor `QueryControls` component to TypeScript. ([46721](https://github.com/WordPress/gutenberg/pull/46721))
-- Remove @storybook/addon-knobs from the repository. ([47152](https://github.com/WordPress/gutenberg/pull/47152))
-- `Dropdown`: Deprecate `position`  prop, use `popoverProps` instead. ([46865](https://github.com/WordPress/gutenberg/pull/46865))
-- Fix missing hook deps in distraction free mode. ([47611](https://github.com/WordPress/gutenberg/pull/47611))
-- Sync settings from editor store to block-editor store. ([47287](https://github.com/WordPress/gutenberg/pull/47287))
+
+-   ColorListPicker: Refactor to TypeScript. ([46358](https://github.com/WordPress/gutenberg/pull/46358))
+-   ColorPalette, BorderControl, GradientPicker: Refine types and logic around single vs multiple palettes. ([47384](https://github.com/WordPress/gutenberg/pull/47384))
+-   DropdownMenu: Convert Storybook examples from knobs to controls. ([47149](https://github.com/WordPress/gutenberg/pull/47149))
+-   KeyboardShortcuts: Convert to TypeScript. ([47429](https://github.com/WordPress/gutenberg/pull/47429))
+-   Notice: Refactor to TypeScript. ([47118](https://github.com/WordPress/gutenberg/pull/47118))
+-   NumberControl: Clarify deprecation message about `hideHTMLArrows` prop. ([47370](https://github.com/WordPress/gutenberg/pull/47370))
+-   Refactor `QueryControls` component to TypeScript. ([46721](https://github.com/WordPress/gutenberg/pull/46721))
+-   Remove @storybook/addon-knobs from the repository. ([47152](https://github.com/WordPress/gutenberg/pull/47152))
+-   `Dropdown`: Deprecate `position` prop, use `popoverProps` instead. ([46865](https://github.com/WordPress/gutenberg/pull/46865))
+-   Fix missing hook deps in distraction free mode. ([47611](https://github.com/WordPress/gutenberg/pull/47611))
+-   Sync settings from editor store to block-editor store. ([47287](https://github.com/WordPress/gutenberg/pull/47287))
 
 #### Site Editor
-- Site Hub: Remove the aria-label from the Edit button. ([47343](https://github.com/WordPress/gutenberg/pull/47343))
-- Use variation as a prop instead of variationProp in the global styles UI. ([47455](https://github.com/WordPress/gutenberg/pull/47455))
-- Update theme.json. ([47620](https://github.com/WordPress/gutenberg/pull/47620))
-- Template Parts: Add unit tests for template part creation functions. ([47224](https://github.com/WordPress/gutenberg/pull/47224))
-- Lock browse mode selectors and actions. ([47678](https://github.com/WordPress/gutenberg/pull/47678))
+
+-   Site Hub: Remove the aria-label from the Edit button. ([47343](https://github.com/WordPress/gutenberg/pull/47343))
+-   Use variation as a prop instead of variationProp in the global styles UI. ([47455](https://github.com/WordPress/gutenberg/pull/47455))
+-   Update theme.json. ([47620](https://github.com/WordPress/gutenberg/pull/47620))
+-   Template Parts: Add unit tests for template part creation functions. ([47224](https://github.com/WordPress/gutenberg/pull/47224))
+-   Lock browse mode selectors and actions. ([47678](https://github.com/WordPress/gutenberg/pull/47678))
 
 #### Block Library
-- Export off canvas editor via experiments package. ([47465](https://github.com/WordPress/gutenberg/pull/47465))
-- Image Editor: Merge context provider into editor component. ([47171](https://github.com/WordPress/gutenberg/pull/47171))
-- Mark "post author name" as stable / no longer experimental. ([45008](https://github.com/WordPress/gutenberg/pull/45008))
-- Navigation: Remove the Gutenberg plugin check. ([47579](https://github.com/WordPress/gutenberg/pull/47579))
+
+-   Export off canvas editor via experiments package. ([47465](https://github.com/WordPress/gutenberg/pull/47465))
+-   Image Editor: Merge context provider into editor component. ([47171](https://github.com/WordPress/gutenberg/pull/47171))
+-   Mark "post author name" as stable / no longer experimental. ([45008](https://github.com/WordPress/gutenberg/pull/45008))
+-   Navigation: Remove the Gutenberg plugin check. ([47579](https://github.com/WordPress/gutenberg/pull/47579))
 
 #### Global Styles
-- Change 'get_legacy_theme_supports_for_theme_json' compat dir. ([47456](https://github.com/WordPress/gutenberg/pull/47456))
-- GlobalStyles hooks: Do not smart merge presets in useGlobalSetting. ([47415](https://github.com/WordPress/gutenberg/pull/47415))
-- Move Global Styles APIs to @wordpress/block-editor. ([47098](https://github.com/WordPress/gutenberg/pull/47098))
-- Update Global Styles Controller PHPUnit tests. ([47502](https://github.com/WordPress/gutenberg/pull/47502))
+
+-   Change 'get_legacy_theme_supports_for_theme_json' compat dir. ([47456](https://github.com/WordPress/gutenberg/pull/47456))
+-   GlobalStyles hooks: Do not smart merge presets in useGlobalSetting. ([47415](https://github.com/WordPress/gutenberg/pull/47415))
+-   Move Global Styles APIs to @wordpress/block-editor. ([47098](https://github.com/WordPress/gutenberg/pull/47098))
+-   Update Global Styles Controller PHPUnit tests. ([47502](https://github.com/WordPress/gutenberg/pull/47502))
 
 #### Patterns
-- Update Block Patterns Controller PHPUnit tests. ([47569](https://github.com/WordPress/gutenberg/pull/47569))
-- [Patterns]: Remove bundled patterns. ([46450](https://github.com/WordPress/gutenberg/pull/46450))
-- Move Pattern Directory categories endpoint to `compat/6.3`. ([47486](https://github.com/WordPress/gutenberg/pull/47486))
+
+-   Update Block Patterns Controller PHPUnit tests. ([47569](https://github.com/WordPress/gutenberg/pull/47569))
+-   [Patterns]: Remove bundled patterns. ([46450](https://github.com/WordPress/gutenberg/pull/46450))
+-   Move Pattern Directory categories endpoint to `compat/6.3`. ([47486](https://github.com/WordPress/gutenberg/pull/47486))
 
 #### Plugin
-- No need to remove the 'gutenberg_enqueue_global_styles_assets' action. ([47557](https://github.com/WordPress/gutenberg/pull/47557))
-- Replace 'should_skip_block_supports_serialization' with the core utility method. ([47195](https://github.com/WordPress/gutenberg/pull/47195))
 
+-   No need to remove the 'gutenberg_enqueue_global_styles_assets' action. ([47557](https://github.com/WordPress/gutenberg/pull/47557))
+-   Replace 'should_skip_block_supports_serialization' with the core utility method. ([47195](https://github.com/WordPress/gutenberg/pull/47195))
 
 #### Block Editor
-- HeightControl: Stabilise the height control component in the block editor package. ([47475](https://github.com/WordPress/gutenberg/pull/47475))
-- Replace registerStore() call with register() in the block-editor store. ([47447](https://github.com/WordPress/gutenberg/pull/47447))
-- Stabilise BlockPreview props. ([47231](https://github.com/WordPress/gutenberg/pull/47231))
-- Update `eslint-plugin-jsdoc` to support Node 18 and 19. ([47490](https://github.com/WordPress/gutenberg/pull/47490))
-- Fix: Avoid using index as JSX key on offsite navigation editor LinkControlTransforms. ([47083](https://github.com/WordPress/gutenberg/pull/47083))
-- Refactores __ExperimentalOffCanvasEditor to OffCanvasEditor. ([47553](https://github.com/WordPress/gutenberg/pull/47553))
-- Rename `__unstableInserterMediaCategories` to `inserterMediaCategories`. ([47492](https://github.com/WordPress/gutenberg/pull/47492))
-- Stabilize the clearBlockSelection editor setting. ([47627](https://github.com/WordPress/gutenberg/pull/47627))
-- [Block Editor]: Stabilize __experimentalGetAllowedBlocks. ([47210](https://github.com/WordPress/gutenberg/pull/47210))
-- [Block Editor]: Stabilize `__experimentalGetPatternsByBlockTypes`. ([47183](https://github.com/WordPress/gutenberg/pull/47183))
-- URLInput test: Use valid URL value to pass through validation. ([47444](https://github.com/WordPress/gutenberg/pull/47444))
 
+-   HeightControl: Stabilise the height control component in the block editor package. ([47475](https://github.com/WordPress/gutenberg/pull/47475))
+-   Replace registerStore() call with register() in the block-editor store. ([47447](https://github.com/WordPress/gutenberg/pull/47447))
+-   Stabilise BlockPreview props. ([47231](https://github.com/WordPress/gutenberg/pull/47231))
+-   Update `eslint-plugin-jsdoc` to support Node 18 and 19. ([47490](https://github.com/WordPress/gutenberg/pull/47490))
+-   Fix: Avoid using index as JSX key on offsite navigation editor LinkControlTransforms. ([47083](https://github.com/WordPress/gutenberg/pull/47083))
+-   Refactores \_\_ExperimentalOffCanvasEditor to OffCanvasEditor. ([47553](https://github.com/WordPress/gutenberg/pull/47553))
+-   Rename `__unstableInserterMediaCategories` to `inserterMediaCategories`. ([47492](https://github.com/WordPress/gutenberg/pull/47492))
+-   Stabilize the clearBlockSelection editor setting. ([47627](https://github.com/WordPress/gutenberg/pull/47627))
+-   [Block Editor]: Stabilize \_\_experimentalGetAllowedBlocks. ([47210](https://github.com/WordPress/gutenberg/pull/47210))
+-   [Block Editor]: Stabilize `__experimentalGetPatternsByBlockTypes`. ([47183](https://github.com/WordPress/gutenberg/pull/47183))
+-   URLInput test: Use valid URL value to pass through validation. ([47444](https://github.com/WordPress/gutenberg/pull/47444))
 
 #### Testing
-- Multi-block selection and rich text test: Wait for expected UI to appear. ([47173](https://github.com/WordPress/gutenberg/pull/47173))
-- ESLint: Enable `jest/recommended` for tests. ([47065](https://github.com/WordPress/gutenberg/pull/47065))
-- Remove old test now migrated to Playwright. ([47247](https://github.com/WordPress/gutenberg/pull/47247))
-- RichText tests: Don't use JSDOM explicitly, it's set up by environment. ([47445](https://github.com/WordPress/gutenberg/pull/47445))
-- Position Block Support: Add PHP tests. ([47626](https://github.com/WordPress/gutenberg/pull/47626))
+
+-   Multi-block selection and rich text test: Wait for expected UI to appear. ([47173](https://github.com/WordPress/gutenberg/pull/47173))
+-   ESLint: Enable `jest/recommended` for tests. ([47065](https://github.com/WordPress/gutenberg/pull/47065))
+-   Remove old test now migrated to Playwright. ([47247](https://github.com/WordPress/gutenberg/pull/47247))
+-   RichText tests: Don't use JSDOM explicitly, it's set up by environment. ([47445](https://github.com/WordPress/gutenberg/pull/47445))
+-   Position Block Support: Add PHP tests. ([47626](https://github.com/WordPress/gutenberg/pull/47626))
 
 ### Tools
 
 #### Testing
-- Run PHPUnit jobs across multiple PHP versions. ([46510](https://github.com/WordPress/gutenberg/pull/46510))
-- Add codeowners for Playwright tests. ([47136](https://github.com/WordPress/gutenberg/pull/47136))
-- Add end-to-end tests for 'Import widget area' button. ([47131](https://github.com/WordPress/gutenberg/pull/47131))
-- ESLint: Disable jest rules for storybook playwright. ([47141](https://github.com/WordPress/gutenberg/pull/47141))
-- ESLint: Fix `jest/expect-expect` violations. ([47219](https://github.com/WordPress/gutenberg/pull/47219))
-- Reset default_comment_status to previous value after post comments form end-to-end test. ([47481](https://github.com/WordPress/gutenberg/pull/47481))
-- Tests: Use real timers where fake timers are unnecessary. ([47144](https://github.com/WordPress/gutenberg/pull/47144))
-- WP_HTML_Tag_Processor: Make `get_attribute` reflect attribute set via `set_attribute`, even without updating. ([46680](https://github.com/WordPress/gutenberg/pull/46680))
-- core-data: Refactor tests to use real timers. ([47218](https://github.com/WordPress/gutenberg/pull/47218))
-- test: Add separate mobile experiments file. ([47513](https://github.com/WordPress/gutenberg/pull/47513))
-- Migrate a11y end-to-end tests to Playwright. ([46038](https://github.com/WordPress/gutenberg/pull/46038))
-- Copy failing WP_HTML_Tag_Processor_Bookmark_Test tests from Core. ([47720](https://github.com/WordPress/gutenberg/pull/47720))
 
-#### Build Tooling
-- Add test for experimental/block-editor-settings-mobile endpoint. ([46816](https://github.com/WordPress/gutenberg/pull/46816))
-- Fix GH action warning by upgrading actions/checkout. ([47494](https://github.com/WordPress/gutenberg/pull/47494))
-- Performance suite: Track Time To First Byte in the front-end. ([47037](https://github.com/WordPress/gutenberg/pull/47037))
-- React Native: Remove duplicate metro packages. ([47377](https://github.com/WordPress/gutenberg/pull/47377))
-- Simplify `editor.canvas` by removing `hasIframe`. ([46986](https://github.com/WordPress/gutenberg/pull/46986))
-- Storybook: Update `storybook-source-link` dep. ([47425](https://github.com/WordPress/gutenberg/pull/47425))
-- The `prelint:Php` script doesn't work as expected when new dev dependencies get added to `composer.json`. ([45468](https://github.com/WordPress/gutenberg/pull/45468))
-- end-to-end (cover.test.js): Wait for the height input element. ([47294](https://github.com/WordPress/gutenberg/pull/47294))
-- end-to-end (multi-entity-saving.test.js): Wait for the font size picker controls to appear. ([47242](https://github.com/WordPress/gutenberg/pull/47242))
+-   Run PHPUnit jobs across multiple PHP versions. ([46510](https://github.com/WordPress/gutenberg/pull/46510))
+-   Add codeowners for Playwright tests. ([47136](https://github.com/WordPress/gutenberg/pull/47136))
+-   Add end-to-end tests for 'Import widget area' button. ([47131](https://github.com/WordPress/gutenberg/pull/47131))
+-   ESLint: Disable jest rules for storybook playwright. ([47141](https://github.com/WordPress/gutenberg/pull/47141))
+-   ESLint: Fix `jest/expect-expect` violations. ([47219](https://github.com/WordPress/gutenberg/pull/47219))
+-   Reset default_comment_status to previous value after post comments form end-to-end test. ([47481](https://github.com/WordPress/gutenberg/pull/47481))
+-   Tests: Use real timers where fake timers are unnecessary. ([47144](https://github.com/WordPress/gutenberg/pull/47144))
+-   WP_HTML_Tag_Processor: Make `get_attribute` reflect attribute set via `set_attribute`, even without updating. ([46680](https://github.com/WordPress/gutenberg/pull/46680))
+-   core-data: Refactor tests to use real timers. ([47218](https://github.com/WordPress/gutenberg/pull/47218))
+-   test: Add separate mobile experiments file. ([47513](https://github.com/WordPress/gutenberg/pull/47513))
+-   Migrate a11y end-to-end tests to Playwright. ([46038](https://github.com/WordPress/gutenberg/pull/46038))
+-   Copy failing WP_HTML_Tag_Processor_Bookmark_Test tests from Core. ([47720](https://github.com/WordPress/gutenberg/pull/47720))
 
+#### Build Tooling
 
-## First time contributors
+-   Add test for experimental/block-editor-settings-mobile endpoint. ([46816](https://github.com/WordPress/gutenberg/pull/46816))
+-   Fix GH action warning by upgrading actions/checkout. ([47494](https://github.com/WordPress/gutenberg/pull/47494))
+-   Performance suite: Track Time To First Byte in the front-end. ([47037](https://github.com/WordPress/gutenberg/pull/47037))
+-   React Native: Remove duplicate metro packages. ([47377](https://github.com/WordPress/gutenberg/pull/47377))
+-   Simplify `editor.canvas` by removing `hasIframe`. ([46986](https://github.com/WordPress/gutenberg/pull/46986))
+-   Storybook: Update `storybook-source-link` dep. ([47425](https://github.com/WordPress/gutenberg/pull/47425))
+-   The `prelint:Php` script doesn't work as expected when new dev dependencies get added to `composer.json`. ([45468](https://github.com/WordPress/gutenberg/pull/45468))
+-   end-to-end (cover.test.js): Wait for the height input element. ([47294](https://github.com/WordPress/gutenberg/pull/47294))
+-   end-to-end (multi-entity-saving.test.js): Wait for the font size picker controls to appear. ([47242](https://github.com/WordPress/gutenberg/pull/47242))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @kozer: Avoid erroring when getQueryArgs processes a malformed URL. ([45561](https://github.com/WordPress/gutenberg/pull/45561))
-- @renatoagds:  ([47472](https://github.com/WordPress/gutenberg/pull/47472))
-- @Rodage: Update theme.json. ([47620](https://github.com/WordPress/gutenberg/pull/47620))
+The following PRs were merged by first-time contributors:
 
+-   @kozer: Avoid erroring when getQueryArgs processes a malformed URL. ([45561](https://github.com/WordPress/gutenberg/pull/45561))
+-   @renatoagds: ([47472](https://github.com/WordPress/gutenberg/pull/47472))
+-   @Rodage: Update theme.json. ([47620](https://github.com/WordPress/gutenberg/pull/47620))
 
 ## Contributors
 
@@ -8562,23 +19726,20 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @afercia @ajlende @andrewserong @annezazu @anton-vlasenko @apeatling @audrasjb @brookewp @carolinan @chad1008 @ciampo @dcalhoun @dmsnell @draganescu @ellatrix @fabiankaegy @felixarntz @flootr @fluiddot @geriux @getdave @glendaviesnz @hellofromtonya @jameskoster @jasmussen @jffng @jorgefilipecosta @jsnajdr @kevin940726 @kienstra @kozer @madhusudhand @Mamaduka @mirka @noisysocks @ntsekouras @ntwb @oandregal @ockham @pbking @renatoagds @richtabor @Rodage @scruffian @SiobhyB @Soean @t-hamano @talldan @tellthemachines @tyxla @welenofsky @WunderBart @youknowriad
 
-
-
-
 = 15.0.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Block Editor
-- Move block variation picker styles in the iframe ([47109](https://github.com/WordPress/gutenberg/pull/47109)) 
-- Add useBlockPreview styles in iframe ([47110](https://github.com/WordPress/gutenberg/pull/47110))
+
+-   Move block variation picker styles in the iframe ([47109](https://github.com/WordPress/gutenberg/pull/47109))
+-   Add useBlockPreview styles in iframe ([47110](https://github.com/WordPress/gutenberg/pull/47110))
 
 #### Block Library
-- Tag cloud: Disable clicking on the tag links in the editor. ([47338](https://github.com/WordPress/gutenberg/pull/47338))
+
+-   Tag cloud: Disable clicking on the tag links in the editor. ([47338](https://github.com/WordPress/gutenberg/pull/47338))
 
 ## Contributors
 
@@ -8586,189 +19747,206 @@ The following contributors merged PRs in this release:
 
 @carolinan @ntsekouras
 
-
 = 15.0.0 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
 #### Site Editor
-- Allow resizing the sidebar and frame of the site editor. ([46903](https://github.com/WordPress/gutenberg/pull/46903))
-- Remove the editor notices from the site editor frame. ([46931](https://github.com/WordPress/gutenberg/pull/46931))
-- Synchronize the canvas mode with the site editor URL. ([47002](https://github.com/WordPress/gutenberg/pull/47002))
-- Site Editor: Enable copy/cut shortcut. ([45752](https://github.com/WordPress/gutenberg/pull/45752))
+
+-   Allow resizing the sidebar and frame of the site editor. ([46903](https://github.com/WordPress/gutenberg/pull/46903))
+-   Remove the editor notices from the site editor frame. ([46931](https://github.com/WordPress/gutenberg/pull/46931))
+-   Synchronize the canvas mode with the site editor URL. ([47002](https://github.com/WordPress/gutenberg/pull/47002))
+-   Site Editor: Enable copy/cut shortcut. ([45752](https://github.com/WordPress/gutenberg/pull/45752))
 
 #### Block Library
-- Add paste styles to the block settings. ([45477](https://github.com/WordPress/gutenberg/pull/45477))
-- Prevent the image from being resized larger than its container. ([45775](https://github.com/WordPress/gutenberg/pull/45775))
-- Replace block settings menu with a custom menu in off canvas editor. ([46675](https://github.com/WordPress/gutenberg/pull/46675))
-- Add help text on the HTML element for the Comments and Query Loop blocks. ([46989](https://github.com/WordPress/gutenberg/pull/46989))
-- Navigation: Add an icon to the add submenu item option. ([46884](https://github.com/WordPress/gutenberg/pull/46884))
-- Navigation: Remove ghost inserter. ([46919](https://github.com/WordPress/gutenberg/pull/46919))
-- Navigation: Show the loading indictor when users add a new navigation menu. ([46855](https://github.com/WordPress/gutenberg/pull/46855))
-- Page List Block: Fix warning error when the parent page has no child pages. ([46829](https://github.com/WordPress/gutenberg/pull/46829))
-- Page List Item: Disable block toolbar. ([46950](https://github.com/WordPress/gutenberg/pull/46950))
-- Template Parts: Avoid duplicate titles on creation. ([46996](https://github.com/WordPress/gutenberg/pull/46996))
-- Navigation: Add more explicit labels to the Navigation Menu Selector. ([47015](https://github.com/WordPress/gutenberg/pull/47015))
+
+-   Add paste styles to the block settings. ([45477](https://github.com/WordPress/gutenberg/pull/45477))
+-   Prevent the image from being resized larger than its container. ([45775](https://github.com/WordPress/gutenberg/pull/45775))
+-   Replace block settings menu with a custom menu in off canvas editor. ([46675](https://github.com/WordPress/gutenberg/pull/46675))
+-   Add help text on the HTML element for the Comments and Query Loop blocks. ([46989](https://github.com/WordPress/gutenberg/pull/46989))
+-   Navigation: Add an icon to the add submenu item option. ([46884](https://github.com/WordPress/gutenberg/pull/46884))
+-   Navigation: Remove ghost inserter. ([46919](https://github.com/WordPress/gutenberg/pull/46919))
+-   Navigation: Show the loading indictor when users add a new navigation menu. ([46855](https://github.com/WordPress/gutenberg/pull/46855))
+-   Page List Block: Fix warning error when the parent page has no child pages. ([46829](https://github.com/WordPress/gutenberg/pull/46829))
+-   Page List Item: Disable block toolbar. ([46950](https://github.com/WordPress/gutenberg/pull/46950))
+-   Template Parts: Avoid duplicate titles on creation. ([46996](https://github.com/WordPress/gutenberg/pull/46996))
+-   Navigation: Add more explicit labels to the Navigation Menu Selector. ([47015](https://github.com/WordPress/gutenberg/pull/47015))
 
 #### Block Editor
-- URLInput: Deprecate bottom margin. ([46692](https://github.com/WordPress/gutenberg/pull/46692))
-- Block editor: Move content styles to avoid triggering iframe compat mode. ([46728](https://github.com/WordPress/gutenberg/pull/46728))
-- Iframe: Preload style assets to avoid flash of unstyled content. ([46706](https://github.com/WordPress/gutenberg/pull/46706))
+
+-   URLInput: Deprecate bottom margin. ([46692](https://github.com/WordPress/gutenberg/pull/46692))
+-   Block editor: Move content styles to avoid triggering iframe compat mode. ([46728](https://github.com/WordPress/gutenberg/pull/46728))
+-   Iframe: Preload style assets to avoid flash of unstyled content. ([46706](https://github.com/WordPress/gutenberg/pull/46706))
 
 #### Inspector Controls
-- Sidebar Tabs: Add text only mode for block inspector tabs. ([46968](https://github.com/WordPress/gutenberg/pull/46968))
-- Sidebar Tabs: Stabilize the block inspector tabs experiment. ([47045](https://github.com/WordPress/gutenberg/pull/47045))
-- Remove Block Inspector Button. ([46709](https://github.com/WordPress/gutenberg/pull/46709))
+
+-   Sidebar Tabs: Add text only mode for block inspector tabs. ([46968](https://github.com/WordPress/gutenberg/pull/46968))
+-   Sidebar Tabs: Stabilize the block inspector tabs experiment. ([47045](https://github.com/WordPress/gutenberg/pull/47045))
+-   Remove Block Inspector Button. ([46709](https://github.com/WordPress/gutenberg/pull/46709))
 
 #### Global Styles
-- Update push changes to global styles label text to "apply globally". ([46965](https://github.com/WordPress/gutenberg/pull/46965))
-- Edit block style variations from global styles. ([46343](https://github.com/WordPress/gutenberg/pull/46343))
+
+-   Update push changes to global styles label text to "apply globally". ([46965](https://github.com/WordPress/gutenberg/pull/46965))
+-   Edit block style variations from global styles. ([46343](https://github.com/WordPress/gutenberg/pull/46343))
 
 #### Accessibility
-- TabPanel: Add prop to allow disabling of a tab button. ([46471](https://github.com/WordPress/gutenberg/pull/46471))
+
+-   TabPanel: Add prop to allow disabling of a tab button. ([46471](https://github.com/WordPress/gutenberg/pull/46471))
 
 #### Components
-- SelectControl: Remove margin overrides and add new opt-in prop. ([46448](https://github.com/WordPress/gutenberg/pull/46448))
-- Use data URI for `FocalPointPicker` video story. ([42377](https://github.com/WordPress/gutenberg/pull/42377))
+
+-   SelectControl: Remove margin overrides and add new opt-in prop. ([46448](https://github.com/WordPress/gutenberg/pull/46448))
+-   Use data URI for `FocalPointPicker` video story. ([42377](https://github.com/WordPress/gutenberg/pull/42377))
 
 #### List View
-- Update template part children background color. ([46708](https://github.com/WordPress/gutenberg/pull/46708))
-- Update template part hover style in list view. ([46707](https://github.com/WordPress/gutenberg/pull/46707))
 
+-   Update template part children background color. ([46708](https://github.com/WordPress/gutenberg/pull/46708))
+-   Update template part hover style in list view. ([46707](https://github.com/WordPress/gutenberg/pull/46707))
 
 ### Bug Fixes
 
 #### Block Editor
-- Align labels on Link Control. ([46936](https://github.com/WordPress/gutenberg/pull/46936))
-- Remove the border property from the body element on previews. ([46946](https://github.com/WordPress/gutenberg/pull/46946))
-- [Inserter]: Don't show empty `reusable` tab if not allowed to insert reusable blocks. ([46922](https://github.com/WordPress/gutenberg/pull/46922))
-- [Inserter]: Hide empty pattern categories. ([46923](https://github.com/WordPress/gutenberg/pull/46923))
-- Fix offsite navigation editor component loading issue. ([46937](https://github.com/WordPress/gutenberg/pull/46937))
-- Iframe: compat styles: Check for ownerNode === null. ([46932](https://github.com/WordPress/gutenberg/pull/46932))
+
+-   Align labels on Link Control. ([46936](https://github.com/WordPress/gutenberg/pull/46936))
+-   Remove the border property from the body element on previews. ([46946](https://github.com/WordPress/gutenberg/pull/46946))
+-   [Inserter]: Don't show empty `reusable` tab if not allowed to insert reusable blocks. ([46922](https://github.com/WordPress/gutenberg/pull/46922))
+-   [Inserter]: Hide empty pattern categories. ([46923](https://github.com/WordPress/gutenberg/pull/46923))
+-   Fix offsite navigation editor component loading issue. ([46937](https://github.com/WordPress/gutenberg/pull/46937))
+-   Iframe: compat styles: Check for ownerNode === null. ([46932](https://github.com/WordPress/gutenberg/pull/46932))
 
 #### Block Library
-- Navigation Block: Properly decode URL-encoded links. ([46435](https://github.com/WordPress/gutenberg/pull/46435))
-- RSS: Correctly output 'datetime' string. ([47027](https://github.com/WordPress/gutenberg/pull/47027))
-- [Social Icon]: Fix React warning when adding `link label`. ([46905](https://github.com/WordPress/gutenberg/pull/46905))
+
+-   Navigation Block: Properly decode URL-encoded links. ([46435](https://github.com/WordPress/gutenberg/pull/46435))
+-   RSS: Correctly output 'datetime' string. ([47027](https://github.com/WordPress/gutenberg/pull/47027))
+-   [Social Icon]: Fix React warning when adding `link label`. ([46905](https://github.com/WordPress/gutenberg/pull/46905))
 
 #### Components
-- ComboboxControl: Fix unexpected behaviour in IME Composition. ([46827](https://github.com/WordPress/gutenberg/pull/46827))
-- Fix TreeGrid keyboard nav skipping Edit Block button in off canvas editor. ([46998](https://github.com/WordPress/gutenberg/pull/46998))
-- [Placeholder]: Set fixed right margin for label's icon. ([46918](https://github.com/WordPress/gutenberg/pull/46918))
-- Tabs in preferences: Fix regression from horizontal tabs. ([46796](https://github.com/WordPress/gutenberg/pull/46796))
+
+-   ComboboxControl: Fix unexpected behaviour in IME Composition. ([46827](https://github.com/WordPress/gutenberg/pull/46827))
+-   Fix TreeGrid keyboard nav skipping Edit Block button in off canvas editor. ([46998](https://github.com/WordPress/gutenberg/pull/46998))
+-   [Placeholder]: Set fixed right margin for label's icon. ([46918](https://github.com/WordPress/gutenberg/pull/46918))
+-   Tabs in preferences: Fix regression from horizontal tabs. ([46796](https://github.com/WordPress/gutenberg/pull/46796))
 
 #### Global Styles
-- Fix the 'test_remove_invalid_element_pseudo_selectors' test case. ([47049](https://github.com/WordPress/gutenberg/pull/47049))
-- Fixed Global Styles variables for colors, font family, gradient, fontSize. ([46944](https://github.com/WordPress/gutenberg/pull/46944))
+
+-   Fix the 'test_remove_invalid_element_pseudo_selectors' test case. ([47049](https://github.com/WordPress/gutenberg/pull/47049))
+-   Fixed Global Styles variables for colors, font family, gradient, fontSize. ([46944](https://github.com/WordPress/gutenberg/pull/46944))
 
 #### Inspector Controls
-- Block Inspector: Fix browser warning error when block is not selected. ([46875](https://github.com/WordPress/gutenberg/pull/46875))
 
+-   Block Inspector: Fix browser warning error when block is not selected. ([46875](https://github.com/WordPress/gutenberg/pull/46875))
 
 ### Performance
 
 #### Post Editor
-- Lodash: Remove `_.pickBy()` from editor hooks. ([46982](https://github.com/WordPress/gutenberg/pull/46982))
-- Lodash: Remove `_.pickBy()` from template deletion. ([46975](https://github.com/WordPress/gutenberg/pull/46975))
-- Lodash: Remove `_.pickBy()` from block editor and deprecate. ([46999](https://github.com/WordPress/gutenberg/pull/46999))
-- Optimize keydown event handlers. ([46653](https://github.com/WordPress/gutenberg/pull/46653))
+
+-   Lodash: Remove `_.pickBy()` from editor hooks. ([46982](https://github.com/WordPress/gutenberg/pull/46982))
+-   Lodash: Remove `_.pickBy()` from template deletion. ([46975](https://github.com/WordPress/gutenberg/pull/46975))
+-   Lodash: Remove `_.pickBy()` from block editor and deprecate. ([46999](https://github.com/WordPress/gutenberg/pull/46999))
+-   Optimize keydown event handlers. ([46653](https://github.com/WordPress/gutenberg/pull/46653))
 
 #### Global Styles
-- Lodash: Remove `_.pickBy()` from `getNodesWithStyles()`. ([46980](https://github.com/WordPress/gutenberg/pull/46980))
+
+-   Lodash: Remove `_.pickBy()` from `getNodesWithStyles()`. ([46980](https://github.com/WordPress/gutenberg/pull/46980))
 
 #### Block Library
-- Lodash: Remove `_.pickBy()` from latest posts block. ([46974](https://github.com/WordPress/gutenberg/pull/46974))
+
+-   Lodash: Remove `_.pickBy()` from latest posts block. ([46974](https://github.com/WordPress/gutenberg/pull/46974))
 
 ### Accessibility
-- Block Editor: Revert `aria-controls` to `aria-owns` in `URLInput` to use the more broadly supported ARIA 1.0 combobox pattern. ([47148](https://github.com/WordPress/gutenberg/pull/47148))
+
+-   Block Editor: Revert `aria-controls` to `aria-owns` in `URLInput` to use the more broadly supported ARIA 1.0 combobox pattern. ([47148](https://github.com/WordPress/gutenberg/pull/47148))
 
 ### Experiments
 
-- WP_HTML_Tag_Processor: Add `get_attribute_names_with_prefix()` method. ([46840](https://github.com/WordPress/gutenberg/pull/46840))
+-   WP_HTML_Tag_Processor: Add `get_attribute_names_with_prefix()` method. ([46840](https://github.com/WordPress/gutenberg/pull/46840))
 
 #### Block Editor
-- Update last inserted block state to track multiple blocks. ([46885](https://github.com/WordPress/gutenberg/pull/46885))
+
+-   Update last inserted block state to track multiple blocks. ([46885](https://github.com/WordPress/gutenberg/pull/46885))
 
 #### Block Library
-- Alternative Nav Offcanvas show link UI for submenu creation. ([46857](https://github.com/WordPress/gutenberg/pull/46857))
-- Nav offcanvas disable direct insertion. ([46898](https://github.com/WordPress/gutenberg/pull/46898))
+
+-   Alternative Nav Offcanvas show link UI for submenu creation. ([46857](https://github.com/WordPress/gutenberg/pull/46857))
+-   Nav offcanvas disable direct insertion. ([46898](https://github.com/WordPress/gutenberg/pull/46898))
 
 #### Layout
-- Design Tools: Add a Position block support (including sticky), decoupled from layout. ([46142](https://github.com/WordPress/gutenberg/pull/46142))
 
+-   Design Tools: Add a Position block support (including sticky), decoupled from layout. ([46142](https://github.com/WordPress/gutenberg/pull/46142))
 
 ### Documentation
 
-- Adds "fluid" field inside `settings.typography`. ([45705](https://github.com/WordPress/gutenberg/pull/45705))
-- Docs: Add recommendation for developers to use GH CLI. ([46847](https://github.com/WordPress/gutenberg/pull/46847))
-- Quick update to versions in WordPress doc for 6.1.1. ([46850](https://github.com/WordPress/gutenberg/pull/46850))
-- ReactDOM.render deprecated, update Element README. ([46925](https://github.com/WordPress/gutenberg/pull/46925))
-- Remove stack exchange from new issue templates. ([36158](https://github.com/WordPress/gutenberg/pull/36158))
-- Revise NPM to npm. ([46963](https://github.com/WordPress/gutenberg/pull/46963))
-- Update legacy-widget-block.md. ([44343](https://github.com/WordPress/gutenberg/pull/44343))
-- Updating missing shortcut in FAQ section. ([44968](https://github.com/WordPress/gutenberg/pull/44968))
-- [RFC] Add documentation for snapshot testing in Playwright end-to-end tests. ([45709](https://github.com/WordPress/gutenberg/pull/45709))
-- Update copyright year to 2023 in `license.md`. ([46910](https://github.com/WordPress/gutenberg/pull/46910))
-- Docs: Fix typos. ([46912](https://github.com/WordPress/gutenberg/pull/46912))
+-   Adds "fluid" field inside `settings.typography`. ([45705](https://github.com/WordPress/gutenberg/pull/45705))
+-   Docs: Add recommendation for developers to use GH CLI. ([46847](https://github.com/WordPress/gutenberg/pull/46847))
+-   Quick update to versions in WordPress doc for 6.1.1. ([46850](https://github.com/WordPress/gutenberg/pull/46850))
+-   ReactDOM.render deprecated, update Element README. ([46925](https://github.com/WordPress/gutenberg/pull/46925))
+-   Remove stack exchange from new issue templates. ([36158](https://github.com/WordPress/gutenberg/pull/36158))
+-   Revise NPM to npm. ([46963](https://github.com/WordPress/gutenberg/pull/46963))
+-   Update legacy-widget-block.md. ([44343](https://github.com/WordPress/gutenberg/pull/44343))
+-   Updating missing shortcut in FAQ section. ([44968](https://github.com/WordPress/gutenberg/pull/44968))
+-   [RFC] Add documentation for snapshot testing in Playwright end-to-end tests. ([45709](https://github.com/WordPress/gutenberg/pull/45709))
+-   Update copyright year to 2023 in `license.md`. ([46910](https://github.com/WordPress/gutenberg/pull/46910))
+-   Docs: Fix typos. ([46912](https://github.com/WordPress/gutenberg/pull/46912))
 
 ### Code Quality
 
 #### Components
-- Dashicon: Remove unnecessary type for `className` prop. ([46849](https://github.com/WordPress/gutenberg/pull/46849))
-- ItemGroup: Migrate Storybook to controls, refactor to TypeScript. ([46945](https://github.com/WordPress/gutenberg/pull/46945))
-- Toolbar: Move all subcomponents under the same folder. ([46951](https://github.com/WordPress/gutenberg/pull/46951))
-- ColorPicker: Remove knobs in stories. ([46772](https://github.com/WordPress/gutenberg/pull/46772))
-- Guide: Remove knobs in stories. ([46773](https://github.com/WordPress/gutenberg/pull/46773))
-- Notice: Remove knobs in stories. ([46956](https://github.com/WordPress/gutenberg/pull/46956))
-- Panel: Remove knobs from stories. ([46958](https://github.com/WordPress/gutenberg/pull/46958))
-- ResizableBox: Remove knobs in stories. ([46774](https://github.com/WordPress/gutenberg/pull/46774))
-- ResponsiveWrapper: Convert to TypeScript. ([46480](https://github.com/WordPress/gutenberg/pull/46480))
-- SandBox: Convert to TypeScript. ([46478](https://github.com/WordPress/gutenberg/pull/46478))
-- SlotFill: Remove knobs in stories. ([46957](https://github.com/WordPress/gutenberg/pull/46957))
-- useSelect: Implement with useSyncExternalStore. ([46538](https://github.com/WordPress/gutenberg/pull/46538))
+
+-   Dashicon: Remove unnecessary type for `className` prop. ([46849](https://github.com/WordPress/gutenberg/pull/46849))
+-   ItemGroup: Migrate Storybook to controls, refactor to TypeScript. ([46945](https://github.com/WordPress/gutenberg/pull/46945))
+-   Toolbar: Move all subcomponents under the same folder. ([46951](https://github.com/WordPress/gutenberg/pull/46951))
+-   ColorPicker: Remove knobs in stories. ([46772](https://github.com/WordPress/gutenberg/pull/46772))
+-   Guide: Remove knobs in stories. ([46773](https://github.com/WordPress/gutenberg/pull/46773))
+-   Notice: Remove knobs in stories. ([46956](https://github.com/WordPress/gutenberg/pull/46956))
+-   Panel: Remove knobs from stories. ([46958](https://github.com/WordPress/gutenberg/pull/46958))
+-   ResizableBox: Remove knobs in stories. ([46774](https://github.com/WordPress/gutenberg/pull/46774))
+-   ResponsiveWrapper: Convert to TypeScript. ([46480](https://github.com/WordPress/gutenberg/pull/46480))
+-   SandBox: Convert to TypeScript. ([46478](https://github.com/WordPress/gutenberg/pull/46478))
+-   SlotFill: Remove knobs in stories. ([46957](https://github.com/WordPress/gutenberg/pull/46957))
+-   useSelect: Implement with useSyncExternalStore. ([46538](https://github.com/WordPress/gutenberg/pull/46538))
 
 #### Block Library
-- Navigation Link: Fix PHP notices in unit tests. ([47070](https://github.com/WordPress/gutenberg/pull/47070))
-- Video Block: Fix browser warning error when settings are toggled. ([46835](https://github.com/WordPress/gutenberg/pull/46835))
-- Adds an identifier prop to the RichText component for captions, allowing annotation. ([46917](https://github.com/WordPress/gutenberg/pull/46917))
-- Fix: Use of array index instead of post id on latest posts. ([46911](https://github.com/WordPress/gutenberg/pull/46911))
+
+-   Navigation Link: Fix PHP notices in unit tests. ([47070](https://github.com/WordPress/gutenberg/pull/47070))
+-   Video Block: Fix browser warning error when settings are toggled. ([46835](https://github.com/WordPress/gutenberg/pull/46835))
+-   Adds an identifier prop to the RichText component for captions, allowing annotation. ([46917](https://github.com/WordPress/gutenberg/pull/46917))
+-   Fix: Use of array index instead of post id on latest posts. ([46911](https://github.com/WordPress/gutenberg/pull/46911))
 
 #### Block Editor
-- Simplify the way we create a link UI control in the offcanvas editor. ([46744](https://github.com/WordPress/gutenberg/pull/46744))
-- Fix number of arguments passed to hasBlockMetadataSupport. ([46842](https://github.com/WordPress/gutenberg/pull/46842))
+
+-   Simplify the way we create a link UI control in the offcanvas editor. ([46744](https://github.com/WordPress/gutenberg/pull/46744))
+-   Fix number of arguments passed to hasBlockMetadataSupport. ([46842](https://github.com/WordPress/gutenberg/pull/46842))
 
 ### Tools
 
 #### Testing
-- Block inserter search end-to-end test: Scope list item lookup to the inserter panel. ([47066](https://github.com/WordPress/gutenberg/pull/47066))
-- Migrate Manage Reusable Block to Playwright. ([45621](https://github.com/WordPress/gutenberg/pull/45621))
-- Migrate Post Visibility Test to Playwright. ([44488](https://github.com/WordPress/gutenberg/pull/44488))
-- Navigation block end-to-end tests: Default to a list of pages if there are no menus. ([45070](https://github.com/WordPress/gutenberg/pull/45070))
-- Only use a single comment for the flakiness report on PRs. ([46785](https://github.com/WordPress/gutenberg/pull/46785))
-- Mobile - Move the `gutenberg-editor-block-insertion-2` end-to-end tests to integration tests. ([46882](https://github.com/WordPress/gutenberg/pull/46882))
-- Chore: Fix incorrect usage of map instead of forEach. ([46853](https://github.com/WordPress/gutenberg/pull/46853))
-- Chore: Remove unreachable line from phpunit/fixtures/mock-provider.php. ([46843](https://github.com/WordPress/gutenberg/pull/46843))
 
-#### Build Tooling
-- package.json: Add script to profile unit tests. ([46909](https://github.com/WordPress/gutenberg/pull/46909))
+-   Block inserter search end-to-end test: Scope list item lookup to the inserter panel. ([47066](https://github.com/WordPress/gutenberg/pull/47066))
+-   Migrate Manage Reusable Block to Playwright. ([45621](https://github.com/WordPress/gutenberg/pull/45621))
+-   Migrate Post Visibility Test to Playwright. ([44488](https://github.com/WordPress/gutenberg/pull/44488))
+-   Navigation block end-to-end tests: Default to a list of pages if there are no menus. ([45070](https://github.com/WordPress/gutenberg/pull/45070))
+-   Only use a single comment for the flakiness report on PRs. ([46785](https://github.com/WordPress/gutenberg/pull/46785))
+-   Mobile - Move the `gutenberg-editor-block-insertion-2` end-to-end tests to integration tests. ([46882](https://github.com/WordPress/gutenberg/pull/46882))
+-   Chore: Fix incorrect usage of map instead of forEach. ([46853](https://github.com/WordPress/gutenberg/pull/46853))
+-   Chore: Remove unreachable line from phpunit/fixtures/mock-provider.php. ([46843](https://github.com/WordPress/gutenberg/pull/46843))
 
+#### Build Tooling
 
-## First time contributors
+-   package.json: Add script to profile unit tests. ([46909](https://github.com/WordPress/gutenberg/pull/46909))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @BogdanUngureanu: Fixed Global Styles variables for colors, font family, gradient, fontSize. ([46944](https://github.com/WordPress/gutenberg/pull/46944))
-- @cameronjonesweb: Update legacy-widget-block.md. ([44343](https://github.com/WordPress/gutenberg/pull/44343))
-- @d-alleyne: Prevent the image from being resized larger than its container. ([45775](https://github.com/WordPress/gutenberg/pull/45775))
-- @kozer: Navigation Block: Properly decode URL-encoded links. ([46435](https://github.com/WordPress/gutenberg/pull/46435))
-- @mhkuu: Adds an identifier prop to the RichText component for captions, allowing annotation. ([46917](https://github.com/WordPress/gutenberg/pull/46917))
-- @tekapo: Revise NPM to npm. ([46963](https://github.com/WordPress/gutenberg/pull/46963))
-- @TonyGravagno: ReactDOM.render deprecated, update Element README. ([46925](https://github.com/WordPress/gutenberg/pull/46925))
+The following PRs were merged by first-time contributors:
 
+-   @BogdanUngureanu: Fixed Global Styles variables for colors, font family, gradient, fontSize. ([46944](https://github.com/WordPress/gutenberg/pull/46944))
+-   @cameronjonesweb: Update legacy-widget-block.md. ([44343](https://github.com/WordPress/gutenberg/pull/44343))
+-   @d-alleyne: Prevent the image from being resized larger than its container. ([45775](https://github.com/WordPress/gutenberg/pull/45775))
+-   @kozer: Navigation Block: Properly decode URL-encoded links. ([46435](https://github.com/WordPress/gutenberg/pull/46435))
+-   @mhkuu: Adds an identifier prop to the RichText component for captions, allowing annotation. ([46917](https://github.com/WordPress/gutenberg/pull/46917))
+-   @tekapo: Revise NPM to npm. ([46963](https://github.com/WordPress/gutenberg/pull/46963))
+-   @TonyGravagno: ReactDOM.render deprecated, update Element README. ([46925](https://github.com/WordPress/gutenberg/pull/46925))
 
 ## Contributors
 
@@ -8776,23 +19954,17 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @alanjacobmathew @alexstine @andrewserong @annezazu @apeatling @BogdanUngureanu @brookewp @cameronjonesweb @ciampo @d-alleyne @draganescu @ellatrix @geriux @getdave @jameskoster @jasmussen @jorgefilipecosta @joshuatf @jsnajdr @juanfra @kevin940726 @kozer @MaggieCabrera @Mamaduka @mateuswetah @mhkuu @mirka @ntsekouras @ockham @pooja-muchandikar @scruffian @Soean @stokesman @t-hamano @talldan @tekapo @tellthemachines @tomjn @TonyGravagno @tyxla @youknowriad
 
-
 = 14.9.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
-- REST API: Do not set sidebar status to 'active' when using classic theme. ([46966](https://github.com/WordPress/gutenberg/pull/46966))
-
-
-## First time contributors
-
-The following PRs were merged by first time contributors:
+-   REST API: Do not set sidebar status to 'active' when using classic theme. ([46966](https://github.com/WordPress/gutenberg/pull/46966))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -8800,7 +19972,6 @@ The following contributors merged PRs in this release:
 
 @noisysocks
 
-
 = 14.9.0 =
 
 ## Changelog
@@ -8809,285 +19980,286 @@ The following contributors merged PRs in this release:
 
 #### Global Styles
 
-- Site Editor: Add new 'Push changes to Global Styles' button. ([46446](https://github.com/WordPress/gutenberg/pull/46446))
+-   Site Editor: Add new 'Push changes to Global Styles' button. ([46446](https://github.com/WordPress/gutenberg/pull/46446))
 
 #### Patterns
 
-- Add: Template types to the patterns API. ([45814](https://github.com/WordPress/gutenberg/pull/45814))
+-   Add: Template types to the patterns API. ([45814](https://github.com/WordPress/gutenberg/pull/45814))
 
 ### Enhancements
 
-- Post editor: Iframe for block-based themes. ([46212](https://github.com/WordPress/gutenberg/pull/46212))
-- Move word count to the top of the outline. ([46648](https://github.com/WordPress/gutenberg/pull/46648))
-- Update: Remove need for template prefix in `gutenberg_get_template_hierarchy`. ([46257](https://github.com/WordPress/gutenberg/pull/46257))
-- Update: Use offsite navigation editor on the navigation inspector sidebar. ([46440](https://github.com/WordPress/gutenberg/pull/46440))
+-   Post editor: Iframe for block-based themes. ([46212](https://github.com/WordPress/gutenberg/pull/46212))
+-   Move word count to the top of the outline. ([46648](https://github.com/WordPress/gutenberg/pull/46648))
+-   Update: Remove need for template prefix in `gutenberg_get_template_hierarchy`. ([46257](https://github.com/WordPress/gutenberg/pull/46257))
+-   Update: Use offsite navigation editor on the navigation inspector sidebar. ([46440](https://github.com/WordPress/gutenberg/pull/46440))
 
 #### Site Editor
 
-- Add the template title and type to the site hub. ([46736](https://github.com/WordPress/gutenberg/pull/46736))
-- Increase the width of the site editor sidebar. ([46769](https://github.com/WordPress/gutenberg/pull/46769))
-- Move the edit button in the site editor sidebar to a contextual widget. ([46700](https://github.com/WordPress/gutenberg/pull/46700))
+-   Add the template title and type to the site hub. ([46736](https://github.com/WordPress/gutenberg/pull/46736))
+-   Increase the width of the site editor sidebar. ([46769](https://github.com/WordPress/gutenberg/pull/46769))
+-   Move the edit button in the site editor sidebar to a contextual widget. ([46700](https://github.com/WordPress/gutenberg/pull/46700))
 
 #### Block Library
 
-- Navigation: Adds page list as child of submenu. ([46414](https://github.com/WordPress/gutenberg/pull/46414))
-- Navigation: Bring back the heading and the menu selector in the ellipsis menu. ([46622](https://github.com/WordPress/gutenberg/pull/46622))
-- Template Parts: Add an option to import widgets from the sidebars. ([45509](https://github.com/WordPress/gutenberg/pull/45509))
+-   Navigation: Adds page list as child of submenu. ([46414](https://github.com/WordPress/gutenberg/pull/46414))
+-   Navigation: Bring back the heading and the menu selector in the ellipsis menu. ([46622](https://github.com/WordPress/gutenberg/pull/46622))
+-   Template Parts: Add an option to import widgets from the sidebars. ([45509](https://github.com/WordPress/gutenberg/pull/45509))
 
 #### Design Tools
 
-- Page List: Add typography supports. ([43316](https://github.com/WordPress/gutenberg/pull/43316))
-- Style Engine: Add support for text columns (column-count). ([46566](https://github.com/WordPress/gutenberg/pull/46566))
+-   Page List: Add typography supports. ([43316](https://github.com/WordPress/gutenberg/pull/43316))
+-   Style Engine: Add support for text columns (column-count). ([46566](https://github.com/WordPress/gutenberg/pull/46566))
 
 #### CSS & Styling
 
-- Edit-post site logo: Fix focus style. ([46733](https://github.com/WordPress/gutenberg/pull/46733))
-- Base Styles: Extract long-content-fade to its own file so it can be imported and reused. ([46485](https://github.com/WordPress/gutenberg/pull/46485))
+-   Edit-post site logo: Fix focus style. ([46733](https://github.com/WordPress/gutenberg/pull/46733))
+-   Base Styles: Extract long-content-fade to its own file so it can be imported and reused. ([46485](https://github.com/WordPress/gutenberg/pull/46485))
 
 #### Components
-- `TextareaControl`: Add new opt-in prop. ([46559](https://github.com/WordPress/gutenberg/pull/46559))
+
+-   `TextareaControl`: Add new opt-in prop. ([46559](https://github.com/WordPress/gutenberg/pull/46559))
 
 #### Colors
-- Remove clearable from link `ColorPanel` item. ([46507](https://github.com/WordPress/gutenberg/pull/46507))
 
-#### Global Styles
+-   Remove clearable from link `ColorPanel` item. ([46507](https://github.com/WordPress/gutenberg/pull/46507))
 
-- Shadow: Add shadow presets support via `theme.json`. ([46813](https://github.com/WordPress/gutenberg/pull/46813))
-- Fluid typography: Add configurable settings for minimum font size to `theme.json`. ([42489](https://github.com/WordPress/gutenberg/pull/42489))
-- Inline preview: Center align block in global styles inline preview. ([46727](https://github.com/WordPress/gutenberg/pull/46727))
+#### Global Styles
 
+-   Shadow: Add shadow presets support via `theme.json`. ([46813](https://github.com/WordPress/gutenberg/pull/46813))
+-   Fluid typography: Add configurable settings for minimum font size to `theme.json`. ([42489](https://github.com/WordPress/gutenberg/pull/42489))
+-   Inline preview: Center align block in global styles inline preview. ([46727](https://github.com/WordPress/gutenberg/pull/46727))
 
 ### Bug Fixes
 
-- DOM: Fix `findNext`/`findPrevious` tabbable if target is not in `findFocusable` list. ([46580](https://github.com/WordPress/gutenberg/pull/46580))
-- Fix: Bug on `withSafeTimeouts`. ([46595](https://github.com/WordPress/gutenberg/pull/46595))
-- Fixed incorrect CHANGELOG link. ([46609](https://github.com/WordPress/gutenberg/pull/46609))
-- Fixed table block footer section issue. ([46567](https://github.com/WordPress/gutenberg/pull/46567))
-- Iframe: Restore typewriter effect in post editor. ([46745](https://github.com/WordPress/gutenberg/pull/46745))
-- Parse the attributes in a case-insensitive way to comply with the HTML parsing spec. ([46748](https://github.com/WordPress/gutenberg/pull/46748))
-- Update: Guard against null block in off canvas editor. ([46594](https://github.com/WordPress/gutenberg/pull/46594))
-- docgen: Add function to handle list of types for `theme.json` schema. ([46375](https://github.com/WordPress/gutenberg/pull/46375))
-- Post editor: Fix title margin. ([46698](https://github.com/WordPress/gutenberg/pull/46698))
+-   DOM: Fix `findNext`/`findPrevious` tabbable if target is not in `findFocusable` list. ([46580](https://github.com/WordPress/gutenberg/pull/46580))
+-   Fix: Bug on `withSafeTimeouts`. ([46595](https://github.com/WordPress/gutenberg/pull/46595))
+-   Fixed incorrect CHANGELOG link. ([46609](https://github.com/WordPress/gutenberg/pull/46609))
+-   Fixed table block footer section issue. ([46567](https://github.com/WordPress/gutenberg/pull/46567))
+-   Iframe: Restore typewriter effect in post editor. ([46745](https://github.com/WordPress/gutenberg/pull/46745))
+-   Parse the attributes in a case-insensitive way to comply with the HTML parsing spec. ([46748](https://github.com/WordPress/gutenberg/pull/46748))
+-   Update: Guard against null block in off canvas editor. ([46594](https://github.com/WordPress/gutenberg/pull/46594))
+-   docgen: Add function to handle list of types for `theme.json` schema. ([46375](https://github.com/WordPress/gutenberg/pull/46375))
+-   Post editor: Fix title margin. ([46698](https://github.com/WordPress/gutenberg/pull/46698))
 
 #### Block Library
 
-- Fix Off Canvas Editor add submenu item option. ([46562](https://github.com/WordPress/gutenberg/pull/46562))
-- Make table of contents label in placeholder translatable. ([46788](https://github.com/WordPress/gutenberg/pull/46788))
-- Query Loop: Fetch terms suggestions dynamically. ([46649](https://github.com/WordPress/gutenberg/pull/46649))
+-   Fix Off Canvas Editor add submenu item option. ([46562](https://github.com/WordPress/gutenberg/pull/46562))
+-   Make table of contents label in placeholder translatable. ([46788](https://github.com/WordPress/gutenberg/pull/46788))
+-   Query Loop: Fetch terms suggestions dynamically. ([46649](https://github.com/WordPress/gutenberg/pull/46649))
 
 #### Components
 
-- `FocalPointPicker`: Fix layout misalignment when placed in the `BlockInspector`. ([46631](https://github.com/WordPress/gutenberg/pull/46631))
-- Storybook: Fix crash when `parameters` is undefined. ([46670](https://github.com/WordPress/gutenberg/pull/46670))
-- Toolbar: Fix duplicate focus style on anchor link button. ([46759](https://github.com/WordPress/gutenberg/pull/46759))
+-   `FocalPointPicker`: Fix layout misalignment when placed in the `BlockInspector`. ([46631](https://github.com/WordPress/gutenberg/pull/46631))
+-   Storybook: Fix crash when `parameters` is undefined. ([46670](https://github.com/WordPress/gutenberg/pull/46670))
+-   Toolbar: Fix duplicate focus style on anchor link button. ([46759](https://github.com/WordPress/gutenberg/pull/46759))
 
 #### Widgets Editor
 
-- Revert "[`customize-widgets/utils/widgetToBlock`] Initialize a widget's `raw_content.content` to an empty string if it's `undefined`". ([46600](https://github.com/WordPress/gutenberg/pull/46600))
-- [`customize-widgets/utils/widgetToBlock`] Initialize a widget's `raw_content.content` to an empty string if it's `undefined`. ([46487](https://github.com/WordPress/gutenberg/pull/46487))
+-   Revert "[`customize-widgets/utils/widgetToBlock`] Initialize a widget's `raw_content.content` to an empty string if it's `undefined`". ([46600](https://github.com/WordPress/gutenberg/pull/46600))
+-   [`customize-widgets/utils/widgetToBlock`] Initialize a widget's `raw_content.content` to an empty string if it's `undefined`. ([46487](https://github.com/WordPress/gutenberg/pull/46487))
 
 #### Nested / Inner Blocks
 
-- Inner Blocks: Fix provides context condition. ([46729](https://github.com/WordPress/gutenberg/pull/46729))
+-   Inner Blocks: Fix provides context condition. ([46729](https://github.com/WordPress/gutenberg/pull/46729))
 
 #### Global Styles
 
-- Allow content/wide widths when `unfiltered_html` is not allowed. ([46712](https://github.com/WordPress/gutenberg/pull/46712))
+-   Allow content/wide widths when `unfiltered_html` is not allowed. ([46712](https://github.com/WordPress/gutenberg/pull/46712))
 
 #### CSS & Styling
 
-- Fix nav list alignment. ([46682](https://github.com/WordPress/gutenberg/pull/46682))
+-   Fix nav list alignment. ([46682](https://github.com/WordPress/gutenberg/pull/46682))
 
 #### Block Editor
 
-- Inserter: Try fix media tab when upload of media types has been disabled. ([46676](https://github.com/WordPress/gutenberg/pull/46676))
+-   Inserter: Try fix media tab when upload of media types has been disabled. ([46676](https://github.com/WordPress/gutenberg/pull/46676))
 
 #### Build Tooling
 
-- Restore `gutenberg_` prefix to function calls in PHPUnit tests. ([46662](https://github.com/WordPress/gutenberg/pull/46662))
+-   Restore `gutenberg_` prefix to function calls in PHPUnit tests. ([46662](https://github.com/WordPress/gutenberg/pull/46662))
 
 #### Patterns
 
-- Pattern Setup: Fix full heights during transition. ([46615](https://github.com/WordPress/gutenberg/pull/46615))
+-   Pattern Setup: Fix full heights during transition. ([46615](https://github.com/WordPress/gutenberg/pull/46615))
 
 #### Design Tools
 
-- Verse: Prevent default styles overriding `theme.json` font family. ([46560](https://github.com/WordPress/gutenberg/pull/46560))
+-   Verse: Prevent default styles overriding `theme.json` font family. ([46560](https://github.com/WordPress/gutenberg/pull/46560))
 
 #### Block Variations
 
-- Block Variation Picker: Adds support to declared icon with source. ([46373](https://github.com/WordPress/gutenberg/pull/46373))
+-   Block Variation Picker: Adds support to declared icon with source. ([46373](https://github.com/WordPress/gutenberg/pull/46373))
 
 #### Themes
 
-- `theme.json` schema: Allow object type on style properties. ([45897](https://github.com/WordPress/gutenberg/pull/45897))
+-   `theme.json` schema: Allow object type on style properties. ([45897](https://github.com/WordPress/gutenberg/pull/45897))
 
 ### Accessibility
 
-- Block editor: iframe/writing flow: Change tab index to 0. ([46323](https://github.com/WordPress/gutenberg/pull/46323))
-- Fix region navigation in the site editor. ([46525](https://github.com/WordPress/gutenberg/pull/46525))
-- Keycodes: Fix tilde (`~`) character isn't displayed correctly. ([46826](https://github.com/WordPress/gutenberg/pull/46826))
-- `useNavigateRegions`: Use closest to determine the next region to navigate to. ([44883](https://github.com/WordPress/gutenberg/pull/44883))
+-   Block editor: iframe/writing flow: Change tab index to 0. ([46323](https://github.com/WordPress/gutenberg/pull/46323))
+-   Fix region navigation in the site editor. ([46525](https://github.com/WordPress/gutenberg/pull/46525))
+-   Keycodes: Fix tilde (`~`) character isn't displayed correctly. ([46826](https://github.com/WordPress/gutenberg/pull/46826))
+-   `useNavigateRegions`: Use closest to determine the next region to navigate to. ([44883](https://github.com/WordPress/gutenberg/pull/44883))
 
 ### Performance
 
-- Add a performance metric to measure typing within containers. ([46529](https://github.com/WordPress/gutenberg/pull/46529))
-- Block Editor: Optimize `useAvailableAlignments` performance. ([46655](https://github.com/WordPress/gutenberg/pull/46655))
-- Reset the page between every performance test. ([46646](https://github.com/WordPress/gutenberg/pull/46646))
-- Lodash:
-- Refactor block editor away from `_.find()`. ([46577](https://github.com/WordPress/gutenberg/pull/46577))
-- Remove `omit` usage from RN test mocks. ([46660](https://github.com/WordPress/gutenberg/pull/46660))
-- Remove dependency from server-side-render. ([46746](https://github.com/WordPress/gutenberg/pull/46746))
-- Remove from block editor reducer. ([46656](https://github.com/WordPress/gutenberg/pull/46656))
+-   Add a performance metric to measure typing within containers. ([46529](https://github.com/WordPress/gutenberg/pull/46529))
+-   Block Editor: Optimize `useAvailableAlignments` performance. ([46655](https://github.com/WordPress/gutenberg/pull/46655))
+-   Reset the page between every performance test. ([46646](https://github.com/WordPress/gutenberg/pull/46646))
+-   Lodash:
+-   Refactor block editor away from `_.find()`. ([46577](https://github.com/WordPress/gutenberg/pull/46577))
+-   Remove `omit` usage from RN test mocks. ([46660](https://github.com/WordPress/gutenberg/pull/46660))
+-   Remove dependency from server-side-render. ([46746](https://github.com/WordPress/gutenberg/pull/46746))
+-   Remove from block editor reducer. ([46656](https://github.com/WordPress/gutenberg/pull/46656))
 
 #### Widgets Editor
 
-- Lodash: Remove dependency from `customize-widgets`. ([46747](https://github.com/WordPress/gutenberg/pull/46747))
+-   Lodash: Remove dependency from `customize-widgets`. ([46747](https://github.com/WordPress/gutenberg/pull/46747))
 
 #### Block Library
 
-- Gallery: Avoid creating new layout objects on every render. ([46715](https://github.com/WordPress/gutenberg/pull/46715))
+-   Gallery: Avoid creating new layout objects on every render. ([46715](https://github.com/WordPress/gutenberg/pull/46715))
 
 #### Site Editor
 
-- Memoize sidebar component. ([46604](https://github.com/WordPress/gutenberg/pull/46604))
+-   Memoize sidebar component. ([46604](https://github.com/WordPress/gutenberg/pull/46604))
 
 #### Components
 
-- Lodash: Refactor components away from `_.find()`. ([46537](https://github.com/WordPress/gutenberg/pull/46537))
+-   Lodash: Refactor components away from `_.find()`. ([46537](https://github.com/WordPress/gutenberg/pull/46537))
 
 ### Experiments
 
-- Add rough animation to navigation and links. ([46342](https://github.com/WordPress/gutenberg/pull/46342))
-- Tag Processor: Fix a problem backing up too far after updating HTML. ([46598](https://github.com/WordPress/gutenberg/pull/46598))
+-   Add rough animation to navigation and links. ([46342](https://github.com/WordPress/gutenberg/pull/46342))
+-   Tag Processor: Fix a problem backing up too far after updating HTML. ([46598](https://github.com/WordPress/gutenberg/pull/46598))
 
 #### Block Library
 
-- Improve empty menu state in nav off-canvas editor. ([46602](https://github.com/WordPress/gutenberg/pull/46602))
-- Nav offcanvas - handle non-direct insert block inserter. ([46503](https://github.com/WordPress/gutenberg/pull/46503))
-- Navigation list view: Use smaller lock icon. ([46578](https://github.com/WordPress/gutenberg/pull/46578))
+-   Improve empty menu state in nav off-canvas editor. ([46602](https://github.com/WordPress/gutenberg/pull/46602))
+-   Nav offcanvas - handle non-direct insert block inserter. ([46503](https://github.com/WordPress/gutenberg/pull/46503))
+-   Navigation list view: Use smaller lock icon. ([46578](https://github.com/WordPress/gutenberg/pull/46578))
 
 ### Documentation
 
-- Add missing prefix in PHPDoc comment. ([46808](https://github.com/WordPress/gutenberg/pull/46808))
-- Clarifying the npm package release process for the RC release. ([46555](https://github.com/WordPress/gutenberg/pull/46555))
-- Doc: Fix missing link to Block Styles page. ([46695](https://github.com/WordPress/gutenberg/pull/46695))
-- Fix: Missing links in `block.json` schema. ([46694](https://github.com/WordPress/gutenberg/pull/46694))
-- Lodash: Refactor away from `_.omit()`. ([46674](https://github.com/WordPress/gutenberg/pull/46674))
-- Update PHPDoc for `gutenberg_get_global_stylesheet`. ([46817](https://github.com/WordPress/gutenberg/pull/46817))
-- Added a note to `register_block_pattern_category()`. ([46628](https://github.com/WordPress/gutenberg/pull/46628))
+-   Add missing prefix in PHPDoc comment. ([46808](https://github.com/WordPress/gutenberg/pull/46808))
+-   Clarifying the npm package release process for the RC release. ([46555](https://github.com/WordPress/gutenberg/pull/46555))
+-   Doc: Fix missing link to Block Styles page. ([46695](https://github.com/WordPress/gutenberg/pull/46695))
+-   Fix: Missing links in `block.json` schema. ([46694](https://github.com/WordPress/gutenberg/pull/46694))
+-   Lodash: Refactor away from `_.omit()`. ([46674](https://github.com/WordPress/gutenberg/pull/46674))
+-   Update PHPDoc for `gutenberg_get_global_stylesheet`. ([46817](https://github.com/WordPress/gutenberg/pull/46817))
+-   Added a note to `register_block_pattern_category()`. ([46628](https://github.com/WordPress/gutenberg/pull/46628))
 
 ### Code Quality
 
-- Block Editor:
-- Improve `ImageSizeControl` tests. ([46765](https://github.com/WordPress/gutenberg/pull/46765))
-- Make `URLPopover` tests more precise. ([46654](https://github.com/WordPress/gutenberg/pull/46654))
-- Chore: Remove Inexistent parameter from function call in categories block. ([46804](https://github.com/WordPress/gutenberg/pull/46804))
-- ESLint: Enable `testing-library/no-node-access` rule. ([46703](https://github.com/WordPress/gutenberg/pull/46703))
-- Fix return type of `getSpacingPresetSlug` function. ([46805](https://github.com/WordPress/gutenberg/pull/46805))
-- Iframe: Simplify/reactify compat styles logic. ([46732](https://github.com/WordPress/gutenberg/pull/46732))
-- Mobile BlockToolbar: Improve `useSelect` for fewer rerenders. ([46697](https://github.com/WordPress/gutenberg/pull/46697))
-- Remove leftover pattern. ([46701](https://github.com/WordPress/gutenberg/pull/46701))
-- Remove the nux package. ([46110](https://github.com/WordPress/gutenberg/pull/46110))
-- Remove: `__experimentalHasMultipleOrigins` prop from colors and gradients. ([46315](https://github.com/WordPress/gutenberg/pull/46315))
-- Use `<>` instead of `Fragment`. ([46633](https://github.com/WordPress/gutenberg/pull/46633))
-- `package-lock.json`: Dedupe the scheduler package. ([46605](https://github.com/WordPress/gutenberg/pull/46605))
-- `withFilters` tests: More precise `act()` calls. ([46630](https://github.com/WordPress/gutenberg/pull/46630))
-- Jest config: Use real timers by default. ([46714](https://github.com/WordPress/gutenberg/pull/46714))
-- Element: Export new React 18 APIs. ([46610](https://github.com/WordPress/gutenberg/pull/46610))
-
-#### Block Library
-
-- Comments Block: Remove unnecessary `editorStyle` prop in legacy metadata. ([46514](https://github.com/WordPress/gutenberg/pull/46514))
-- Extract hook for offcanvas inserted block. ([46618](https://github.com/WordPress/gutenberg/pull/46618))
-- Try making page list a controlled block. ([46416](https://github.com/WordPress/gutenberg/pull/46416))
+-   Block Editor:
+-   Improve `ImageSizeControl` tests. ([46765](https://github.com/WordPress/gutenberg/pull/46765))
+-   Make `URLPopover` tests more precise. ([46654](https://github.com/WordPress/gutenberg/pull/46654))
+-   Chore: Remove Inexistent parameter from function call in categories block. ([46804](https://github.com/WordPress/gutenberg/pull/46804))
+-   ESLint: Enable `testing-library/no-node-access` rule. ([46703](https://github.com/WordPress/gutenberg/pull/46703))
+-   Fix return type of `getSpacingPresetSlug` function. ([46805](https://github.com/WordPress/gutenberg/pull/46805))
+-   Iframe: Simplify/reactify compat styles logic. ([46732](https://github.com/WordPress/gutenberg/pull/46732))
+-   Mobile BlockToolbar: Improve `useSelect` for fewer rerenders. ([46697](https://github.com/WordPress/gutenberg/pull/46697))
+-   Remove leftover pattern. ([46701](https://github.com/WordPress/gutenberg/pull/46701))
+-   Remove the nux package. ([46110](https://github.com/WordPress/gutenberg/pull/46110))
+-   Remove: `__experimentalHasMultipleOrigins` prop from colors and gradients. ([46315](https://github.com/WordPress/gutenberg/pull/46315))
+-   Use `<>` instead of `Fragment`. ([46633](https://github.com/WordPress/gutenberg/pull/46633))
+-   `package-lock.json`: Dedupe the scheduler package. ([46605](https://github.com/WordPress/gutenberg/pull/46605))
+-   `withFilters` tests: More precise `act()` calls. ([46630](https://github.com/WordPress/gutenberg/pull/46630))
+-   Jest config: Use real timers by default. ([46714](https://github.com/WordPress/gutenberg/pull/46714))
+-   Element: Export new React 18 APIs. ([46610](https://github.com/WordPress/gutenberg/pull/46610))
+
+#### Block Library
+
+-   Comments Block: Remove unnecessary `editorStyle` prop in legacy metadata. ([46514](https://github.com/WordPress/gutenberg/pull/46514))
+-   Extract hook for offcanvas inserted block. ([46618](https://github.com/WordPress/gutenberg/pull/46618))
+-   Try making page list a controlled block. ([46416](https://github.com/WordPress/gutenberg/pull/46416))
 
 #### Components
 
-- `BorderControl`: Improve popover waiting. ([46713](https://github.com/WordPress/gutenberg/pull/46713))
-- Improve `PanelBody` tests. ([46659](https://github.com/WordPress/gutenberg/pull/46659))
+-   `BorderControl`: Improve popover waiting. ([46713](https://github.com/WordPress/gutenberg/pull/46713))
+-   Improve `PanelBody` tests. ([46659](https://github.com/WordPress/gutenberg/pull/46659))
 
 #### Data Layer
 
-- Data: Fix `no-node-access` violation in suspense tests. ([46657](https://github.com/WordPress/gutenberg/pull/46657))
+-   Data: Fix `no-node-access` violation in suspense tests. ([46657](https://github.com/WordPress/gutenberg/pull/46657))
 
 ### Tools
 
 #### Testing
 
-- Always run initialization code before Playwright end-to-end tests. ([46459](https://github.com/WordPress/gutenberg/pull/46459))
-- E2E: Fix `confirmValidDropZonePosition()` when dropzone not ready. ([46677](https://github.com/WordPress/gutenberg/pull/46677))
-- E2E: Refactor global inserter utility. ([46366](https://github.com/WordPress/gutenberg/pull/46366))
-- Fix CORS error in the demo end-to-end test. ([46668](https://github.com/WordPress/gutenberg/pull/46668))
-- Migrate Font Size Picker tests to Playwright. ([46591](https://github.com/WordPress/gutenberg/pull/46591))
-- Migrate Toolbar roving tabindex tests to Playwright. ([46634](https://github.com/WordPress/gutenberg/pull/46634))
-- Migrate quote end-to-end tests to playwright. ([46549](https://github.com/WordPress/gutenberg/pull/46549))
-- Post a summary of the flaky tests to the commit. ([45798](https://github.com/WordPress/gutenberg/pull/45798))
-- Update performance tests to work with themes that load editor into an iframe. ([46665](https://github.com/WordPress/gutenberg/pull/46665))
+-   Always run initialization code before Playwright end-to-end tests. ([46459](https://github.com/WordPress/gutenberg/pull/46459))
+-   E2E: Fix `confirmValidDropZonePosition()` when dropzone not ready. ([46677](https://github.com/WordPress/gutenberg/pull/46677))
+-   E2E: Refactor global inserter utility. ([46366](https://github.com/WordPress/gutenberg/pull/46366))
+-   Fix CORS error in the demo end-to-end test. ([46668](https://github.com/WordPress/gutenberg/pull/46668))
+-   Migrate Font Size Picker tests to Playwright. ([46591](https://github.com/WordPress/gutenberg/pull/46591))
+-   Migrate Toolbar roving tabindex tests to Playwright. ([46634](https://github.com/WordPress/gutenberg/pull/46634))
+-   Migrate quote end-to-end tests to playwright. ([46549](https://github.com/WordPress/gutenberg/pull/46549))
+-   Post a summary of the flaky tests to the commit. ([45798](https://github.com/WordPress/gutenberg/pull/45798))
+-   Update performance tests to work with themes that load editor into an iframe. ([46665](https://github.com/WordPress/gutenberg/pull/46665))
 
 #### Block Library
 
-- Update `OffCanvasEditor` to use `clientids` tree. ([46541](https://github.com/WordPress/gutenberg/pull/46541))
-- Update copy of off canvas editor 'add submenu item' option. ([46564](https://github.com/WordPress/gutenberg/pull/46564))
-- Page List:
-- Remove duplicate code. ([46620](https://github.com/WordPress/gutenberg/pull/46620))
-- Update the icon to demonstrate that the pages are automatically updated. ([46438](https://github.com/WordPress/gutenberg/pull/46438))
-- Query Loop:
-- Only show the Filters panel when there are allowed controls that need to be displayed. ([45869](https://github.com/WordPress/gutenberg/pull/45869))
-- Connect scoped `block` variation to `inserter` variations. ([46410](https://github.com/WordPress/gutenberg/pull/46410))
-- Show pattern titles in setup. ([46688](https://github.com/WordPress/gutenberg/pull/46688))
+-   Update `OffCanvasEditor` to use `clientids` tree. ([46541](https://github.com/WordPress/gutenberg/pull/46541))
+-   Update copy of off canvas editor 'add submenu item' option. ([46564](https://github.com/WordPress/gutenberg/pull/46564))
+-   Page List:
+-   Remove duplicate code. ([46620](https://github.com/WordPress/gutenberg/pull/46620))
+-   Update the icon to demonstrate that the pages are automatically updated. ([46438](https://github.com/WordPress/gutenberg/pull/46438))
+-   Query Loop:
+-   Only show the Filters panel when there are allowed controls that need to be displayed. ([45869](https://github.com/WordPress/gutenberg/pull/45869))
+-   Connect scoped `block` variation to `inserter` variations. ([46410](https://github.com/WordPress/gutenberg/pull/46410))
+-   Show pattern titles in setup. ([46688](https://github.com/WordPress/gutenberg/pull/46688))
 
 #### Components
 
-- Icon: Remove knobs in stories. ([46517](https://github.com/WordPress/gutenberg/pull/46517))
-- Refactor Dropdown component to TypeScript. ([45787](https://github.com/WordPress/gutenberg/pull/45787))
-- Theme component: Remove public export. ([46427](https://github.com/WordPress/gutenberg/pull/46427))
-- ToolTip: Remove knobs in stories. ([46515](https://github.com/WordPress/gutenberg/pull/46515))
+-   Icon: Remove knobs in stories. ([46517](https://github.com/WordPress/gutenberg/pull/46517))
+-   Refactor Dropdown component to TypeScript. ([45787](https://github.com/WordPress/gutenberg/pull/45787))
+-   Theme component: Remove public export. ([46427](https://github.com/WordPress/gutenberg/pull/46427))
+-   ToolTip: Remove knobs in stories. ([46515](https://github.com/WordPress/gutenberg/pull/46515))
 
 #### Block Editor
 
-- `BlockListAppender`: With custom appender, don't react to nested list settings changes. ([46461](https://github.com/WordPress/gutenberg/pull/46461))
-- Paste: Reuse file transforms for file pasting. ([45891](https://github.com/WordPress/gutenberg/pull/45891))
-- Site Editor: Don't show block inserter when the canvas is view mode. ([46763](https://github.com/WordPress/gutenberg/pull/46763))
+-   `BlockListAppender`: With custom appender, don't react to nested list settings changes. ([46461](https://github.com/WordPress/gutenberg/pull/46461))
+-   Paste: Reuse file transforms for file pasting. ([45891](https://github.com/WordPress/gutenberg/pull/45891))
+-   Site Editor: Don't show block inserter when the canvas is view mode. ([46763](https://github.com/WordPress/gutenberg/pull/46763))
 
 #### Data Layer
 
-- Data: Recreate `listeningStores` set for every `markListeningStores` call. ([46607](https://github.com/WordPress/gutenberg/pull/46607))
-- `useSelect`: Add unit tests for static select mode. ([46606](https://github.com/WordPress/gutenberg/pull/46606))
+-   Data: Recreate `listeningStores` set for every `markListeningStores` call. ([46607](https://github.com/WordPress/gutenberg/pull/46607))
+-   `useSelect`: Add unit tests for static select mode. ([46606](https://github.com/WordPress/gutenberg/pull/46606))
 
 #### Navigation Menu Sidebar
 
-- Navigation Sidebar: Hide behind the experiment flag. ([46710](https://github.com/WordPress/gutenberg/pull/46710))
+-   Navigation Sidebar: Hide behind the experiment flag. ([46710](https://github.com/WordPress/gutenberg/pull/46710))
 
 #### Icons
 
-- Update the update icon. ([46575](https://github.com/WordPress/gutenberg/pull/46575))
+-   Update the update icon. ([46575](https://github.com/WordPress/gutenberg/pull/46575))
 
 #### Accessibility
 
-- Change `SpacingSizesControl` ARIA from region to group. ([46530](https://github.com/WordPress/gutenberg/pull/46530))
+-   Change `SpacingSizesControl` ARIA from region to group. ([46530](https://github.com/WordPress/gutenberg/pull/46530))
 
 #### Global Styles
 
-- Inline block preview: Add preview block in nested global style panels. ([46401](https://github.com/WordPress/gutenberg/pull/46401))
+-   Inline block preview: Add preview block in nested global style panels. ([46401](https://github.com/WordPress/gutenberg/pull/46401))
 
 #### Typography
 
-- Typography block supports: Sync with 6.1 backport. ([43928](https://github.com/WordPress/gutenberg/pull/43928))
+-   Typography block supports: Sync with 6.1 backport. ([43928](https://github.com/WordPress/gutenberg/pull/43928))
 
 #### Web Fonts
 
-- Change architecture to use Core's Dependencies API. ([43492](https://github.com/WordPress/gutenberg/pull/43492))
+-   Change architecture to use Core's Dependencies API. ([43492](https://github.com/WordPress/gutenberg/pull/43492))
 
-## First time contributors
+## First-time contributors
 
-The following PRs were merged by first time contributors:
+The following PRs were merged by first-time contributors:
 
-- @gigitux: Block Variation Picker: Adds support to declared icon with src. ([46373](https://github.com/WordPress/gutenberg/pull/46373))
-- @marekdedic: Fixed incorrect CHANGELOG link. ([46609](https://github.com/WordPress/gutenberg/pull/46609))
-- @viralsampat-multidots: Fixed table block footer section issue. ([46567](https://github.com/WordPress/gutenberg/pull/46567))
-- @vykes-mac: Base Styles: Extract long-content-fade to its own file so it can be imported and reused. ([46485](https://github.com/WordPress/gutenberg/pull/46485))
-- @websitegenii: Added a note to `register_block_pattern_category()`. ([46628](https://github.com/WordPress/gutenberg/pull/46628))
+-   @gigitux: Block Variation Picker: Adds support to declared icon with src. ([46373](https://github.com/WordPress/gutenberg/pull/46373))
+-   @marekdedic: Fixed incorrect CHANGELOG link. ([46609](https://github.com/WordPress/gutenberg/pull/46609))
+-   @viralsampat-multidots: Fixed table block footer section issue. ([46567](https://github.com/WordPress/gutenberg/pull/46567))
+-   @vykes-mac: Base Styles: Extract long-content-fade to its own file so it can be imported and reused. ([46485](https://github.com/WordPress/gutenberg/pull/46485))
+-   @websitegenii: Added a note to `register_block_pattern_category()`. ([46628](https://github.com/WordPress/gutenberg/pull/46628))
 
 ## Contributors
 
@@ -9095,16 +20267,13 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @ajlende @alexstine @artemiomorales @brookewp @danielbachhuber @DAreRodz @dmsnell @draganescu @ellatrix @fluiddot @fullofcaffeine @geriux @getdave @gigitux @hellofromtonya @jasmussen @jorgefilipecosta @jsnajdr @kevin940726 @kienstra @madhusudhand @MaggieCabrera @Mamaduka @marekdedic @mikachan @mirka @mmtr @noisysocks @ntsekouras @oandregal @ramonjd @richtabor @ryanwelcher @scruffian @t-hamano @talldan @tyxla @viralsampat-multidots @vykes-mac @websitegenii @WunderBart @youknowriad
 
-
 = 14.8.4 =
 
-
-
 ## Changelog
 
 ### Various
 
-- Fixes an issue where gutenberg bundled `theme.json` was not utilized. ([46810](https://github.com/WordPress/gutenberg/pull/46810)) This meant that Gutenberg features newer than the WordPress `theme.json` file were unavailable in 14.8.
+-   Fixes an issue where gutenberg bundled `theme.json` was not utilized. ([46810](https://github.com/WordPress/gutenberg/pull/46810)) This meant that Gutenberg features newer than the WordPress `theme.json` file were unavailable in 14.8.
 
 ## Contributors
 
@@ -9112,48 +20281,42 @@ The following contributors merged PRs in this release:
 
 @madhusudhand
 
-
 = 14.8.3 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Plugin
+
 Fixes compatibility with WordPress 6.0.x. This includes the following PRs:
-- #46579
-- #46750
-- #46806
-- #46809
 
-Broadly, this needed to include the two refactors of the Theme_JSON compatibility files, along with two fixes switching `wp_*` and `gutenberg_*` function variants as needed.
- 
+-   #46579
+-   #46750
+-   #46806
+-   #46809
+
+Broadly, this needed to include the two refactors of the Theme*JSON compatibility files, along with two fixes switching `wp*\_`and`gutenberg\_\_` function variants as needed.
+
 ## Contributors
 
 The following contributors were involved with this release:
 
 @geriux @Mamaduka @oandregal @noahtallen
 
-
 = 14.8.2 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Block Editor
-- rich-text: Fix bug where bare tag name format types could not be registered. ([46798](https://github.com/WordPress/gutenberg/pull/46798))
-
-
-## First time contributors
 
-The following PRs were merged by first time contributors:
+-   rich-text: Fix bug where bare tag name format types could not be registered. ([46798](https://github.com/WordPress/gutenberg/pull/46798))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -9161,15 +20324,13 @@ The following contributors merged PRs in this release:
 
 @davilera
 
-
 = 14.8.1 =
 
 ## Changelog
 
 ### Bug Fixes
 
-- Update the script registration of the react scripts with a cache version to prevent browser cache issues. ([46768](https://github.com/WordPress/gutenberg/pull/46768))
-
+-   Update the script registration of the react scripts with a cache version to prevent browser cache issues. ([46768](https://github.com/WordPress/gutenberg/pull/46768))
 
 ## Contributors
 
@@ -9177,7 +20338,6 @@ The following contributors merged PRs in this release:
 
 @youknowriad
 
-
 = 14.8.0 =
 
 ## Changelog
@@ -9185,267 +20345,306 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Add a current-menu-ancestor class to navigation items. ([40778](https://github.com/WordPress/gutenberg/pull/40778))
-- Page List Block: Adds a longdash tree to the parent selector. ([46336](https://github.com/WordPress/gutenberg/pull/46336))
-- Page List Block: Hide page list edit button if no pages are available. ([46331](https://github.com/WordPress/gutenberg/pull/46331))
--  Page List: Add convert panel to Inspector Controls when within Nav block. ([46352](https://github.com/WordPress/gutenberg/pull/46352))
-- Page List: Prevent users from adding inner blocks to Page List. ([46269](https://github.com/WordPress/gutenberg/pull/46269))
-- Reusable block: Pluralize the message "Convert to regular blocks" depending on the number of blocks contained. ([45819](https://github.com/WordPress/gutenberg/pull/45819))
-- Add page list to Link UI transforms in Nav block. ([46426](https://github.com/WordPress/gutenberg/pull/46426))
-- Heading Block: Don't rely on the experimental selector anymore. ([46284](https://github.com/WordPress/gutenberg/pull/46284))
-- Media & Text Block: Create undo history when media width is changed. ([46084](https://github.com/WordPress/gutenberg/pull/46084))
-- Navigation block: Add location->primary to fallback nav creation for classic menus. ([45976](https://github.com/WordPress/gutenberg/pull/45976))
-- Navigation block: Update fallback nav creation to the most recently created menu. ([46286](https://github.com/WordPress/gutenberg/pull/46286))
-- Navigation: Add a 'open list view' button. ([46335](https://github.com/WordPress/gutenberg/pull/46335))
-- Navigation: Removes the header from the navigation list view in the experiment. ([46070](https://github.com/WordPress/gutenberg/pull/46070))
-- Query: Remove color block supports. ([46147](https://github.com/WordPress/gutenberg/pull/46147))
-- Table block: Make `figcaption` styles consistent between editor and front end. ([46172](https://github.com/WordPress/gutenberg/pull/46172))
-- List/quote: Unwrap inner block when pressing Backspace at start. ([45075](https://github.com/WordPress/gutenberg/pull/45075))
+
+-   Add a current-menu-ancestor class to navigation items. ([40778](https://github.com/WordPress/gutenberg/pull/40778))
+-   Page List Block: Adds a longdash tree to the parent selector. ([46336](https://github.com/WordPress/gutenberg/pull/46336))
+-   Page List Block: Hide page list edit button if no pages are available. ([46331](https://github.com/WordPress/gutenberg/pull/46331))
+-   Page List: Add convert panel to Inspector Controls when within Nav block. ([46352](https://github.com/WordPress/gutenberg/pull/46352))
+-   Page List: Prevent users from adding inner blocks to Page List. ([46269](https://github.com/WordPress/gutenberg/pull/46269))
+-   Reusable block: Pluralize the message "Convert to regular blocks" depending on the number of blocks contained. ([45819](https://github.com/WordPress/gutenberg/pull/45819))
+-   Add page list to Link UI transforms in Nav block. ([46426](https://github.com/WordPress/gutenberg/pull/46426))
+-   Heading Block: Don't rely on the experimental selector anymore. ([46284](https://github.com/WordPress/gutenberg/pull/46284))
+-   Media & Text Block: Create undo history when media width is changed. ([46084](https://github.com/WordPress/gutenberg/pull/46084))
+-   Navigation block: Add location->primary to fallback nav creation for classic menus. ([45976](https://github.com/WordPress/gutenberg/pull/45976))
+-   Navigation block: Update fallback nav creation to the most recently created menu. ([46286](https://github.com/WordPress/gutenberg/pull/46286))
+-   Navigation: Add a 'open list view' button. ([46335](https://github.com/WordPress/gutenberg/pull/46335))
+-   Navigation: Removes the header from the navigation list view in the experiment. ([46070](https://github.com/WordPress/gutenberg/pull/46070))
+-   Query: Remove color block supports. ([46147](https://github.com/WordPress/gutenberg/pull/46147))
+-   Table block: Make `figcaption` styles consistent between editor and front end. ([46172](https://github.com/WordPress/gutenberg/pull/46172))
+-   List/quote: Unwrap inner block when pressing Backspace at start. ([45075](https://github.com/WordPress/gutenberg/pull/45075))
 
 #### Inspector Controls
-- Sidebar Tabs: Refine the use of inspector tabs and disable filters for Nav blocks. ([46346](https://github.com/WordPress/gutenberg/pull/46346))
-- Sidebar Tabs: Use editor settings to override display. ([46321](https://github.com/WordPress/gutenberg/pull/46321))
-- Summary panel: Try improving spacing and grid. ([46267](https://github.com/WordPress/gutenberg/pull/46267))
+
+-   Sidebar Tabs: Refine the use of inspector tabs and disable filters for Nav blocks. ([46346](https://github.com/WordPress/gutenberg/pull/46346))
+-   Sidebar Tabs: Use editor settings to override display. ([46321](https://github.com/WordPress/gutenberg/pull/46321))
+-   Summary panel: Try improving spacing and grid. ([46267](https://github.com/WordPress/gutenberg/pull/46267))
 
 #### Global Styles
-- Add Style Book to Global Styles. ([45960](https://github.com/WordPress/gutenberg/pull/45960))
-- Add block preview component in global styles. ([45719](https://github.com/WordPress/gutenberg/pull/45719))
-- Move border from layout to own menu. ([45995](https://github.com/WordPress/gutenberg/pull/45995))
-- Add a css style to theme.json to allow setting of custom css strings. ([46255](https://github.com/WordPress/gutenberg/pull/46255))
-- Expose before filter hook in useSettings for injecting block settings in the editor. ([45089](https://github.com/WordPress/gutenberg/pull/45089))
-- Global styles: Add custom CSS panel to site editor. ([46141](https://github.com/WordPress/gutenberg/pull/46141))
+
+-   Add Style Book to Global Styles. ([45960](https://github.com/WordPress/gutenberg/pull/45960))
+-   Add block preview component in global styles. ([45719](https://github.com/WordPress/gutenberg/pull/45719))
+-   Move border from layout to own menu. ([45995](https://github.com/WordPress/gutenberg/pull/45995))
+-   Add a css style to theme.json to allow setting of custom css strings. ([46255](https://github.com/WordPress/gutenberg/pull/46255))
+-   Expose before filter hook in useSettings for injecting block settings in the editor. ([45089](https://github.com/WordPress/gutenberg/pull/45089))
+-   Global styles: Add custom CSS panel to site editor. ([46141](https://github.com/WordPress/gutenberg/pull/46141))
 
 #### Site Editor
-- Reorganize the site editor to introduce Browse Mode. ([44770](https://github.com/WordPress/gutenberg/pull/44770))
-- Allow adding new templates and template parts directly from the sidebar. ([46458](https://github.com/WordPress/gutenberg/pull/46458))
-- Synchronize the sidebar state in the URL. ([46433](https://github.com/WordPress/gutenberg/pull/46433))
-- Try template drill down on the shell sidebar (browse mode). ([45100](https://github.com/WordPress/gutenberg/pull/45100))
+
+-   Reorganize the site editor to introduce Browse Mode. ([44770](https://github.com/WordPress/gutenberg/pull/44770))
+-   Allow adding new templates and template parts directly from the sidebar. ([46458](https://github.com/WordPress/gutenberg/pull/46458))
+-   Synchronize the sidebar state in the URL. ([46433](https://github.com/WordPress/gutenberg/pull/46433))
+-   Try template drill down on the shell sidebar (browse mode). ([45100](https://github.com/WordPress/gutenberg/pull/45100))
 
 #### Block Editor
-- Update the synced block hover styles in Inserter. ([46442](https://github.com/WordPress/gutenberg/pull/46442))
-- Add new selector getLastInsertedBlockClientId. ([46531](https://github.com/WordPress/gutenberg/pull/46531))
-- Block editor: Hide fixed contextual toolbar. ([46298](https://github.com/WordPress/gutenberg/pull/46298))
-- Inserter: Pattern title tooltip. ([46419](https://github.com/WordPress/gutenberg/pull/46419))
-- useNestedSettingsUpdate: Prevent unneeded syncing of falsy templateLock values. ([46357](https://github.com/WordPress/gutenberg/pull/46357))
-- Design: Augmented shadows for modals and popovers. ([46228](https://github.com/WordPress/gutenberg/pull/46228))
+
+-   Update the synced block hover styles in Inserter. ([46442](https://github.com/WordPress/gutenberg/pull/46442))
+-   Add new selector getLastInsertedBlockClientId. ([46531](https://github.com/WordPress/gutenberg/pull/46531))
+-   Block editor: Hide fixed contextual toolbar. ([46298](https://github.com/WordPress/gutenberg/pull/46298))
+-   Inserter: Pattern title tooltip. ([46419](https://github.com/WordPress/gutenberg/pull/46419))
+-   useNestedSettingsUpdate: Prevent unneeded syncing of falsy templateLock values. ([46357](https://github.com/WordPress/gutenberg/pull/46357))
+-   Design: Augmented shadows for modals and popovers. ([46228](https://github.com/WordPress/gutenberg/pull/46228))
 
 #### Components
-- Tabs: Try a simpler tab focus style, alt. ([46276](https://github.com/WordPress/gutenberg/pull/46276))
-- BaseControl: Add convenience hook to generate id-related props. ([46170](https://github.com/WordPress/gutenberg/pull/46170))
-- Dashicon: Refactor to TypeScript. ([45924](https://github.com/WordPress/gutenberg/pull/45924))
-- Lighten borders to gray-600. ([46252](https://github.com/WordPress/gutenberg/pull/46252))
-- Popover: Check positioning by adding and testing is-positioned class. ([46429](https://github.com/WordPress/gutenberg/pull/46429))
+
+-   Tabs: Try a simpler tab focus style, alt. ([46276](https://github.com/WordPress/gutenberg/pull/46276))
+-   BaseControl: Add convenience hook to generate id-related props. ([46170](https://github.com/WordPress/gutenberg/pull/46170))
+-   Dashicon: Refactor to TypeScript. ([45924](https://github.com/WordPress/gutenberg/pull/45924))
+-   Lighten borders to gray-600. ([46252](https://github.com/WordPress/gutenberg/pull/46252))
+-   Popover: Check positioning by adding and testing is-positioned class. ([46429](https://github.com/WordPress/gutenberg/pull/46429))
 
 ### Icons
-- Icons: Update the border icon. ([46264](https://github.com/WordPress/gutenberg/pull/46264))
+
+-   Icons: Update the border icon. ([46264](https://github.com/WordPress/gutenberg/pull/46264))
 
 #### Testing
-- Tests: Fix `toBePositionedPopover` matcher message function. ([46239](https://github.com/WordPress/gutenberg/pull/46239))
+
+-   Tests: Fix `toBePositionedPopover` matcher message function. ([46239](https://github.com/WordPress/gutenberg/pull/46239))
 
 #### Plugin
-- Update the Gutenberg plugin to require at least the WP 6.0 version. ([46102](https://github.com/WordPress/gutenberg/pull/46102))
-- PHP: Backport changes from core theme resolver. ([46250](https://github.com/WordPress/gutenberg/pull/46250))
-- Update: Move gutenberg_register_core_block_patterns from 6.1 to 6.2. ([46249](https://github.com/WordPress/gutenberg/pull/46249))
-- Upgrade React packages to v18. ([45235](https://github.com/WordPress/gutenberg/pull/45235))
+
+-   Update the Gutenberg plugin to require at least the WP 6.0 version. ([46102](https://github.com/WordPress/gutenberg/pull/46102))
+-   PHP: Backport changes from core theme resolver. ([46250](https://github.com/WordPress/gutenberg/pull/46250))
+-   Update: Move gutenberg_register_core_block_patterns from 6.1 to 6.2. ([46249](https://github.com/WordPress/gutenberg/pull/46249))
+-   Upgrade React packages to v18. ([45235](https://github.com/WordPress/gutenberg/pull/45235))
 
 #### Themes
-- Empty Theme: Add the `$schema` property in `theme.json` and rename template directories. ([46300](https://github.com/WordPress/gutenberg/pull/46300))
+
+-   Empty Theme: Add the `$schema` property in `theme.json` and rename template directories. ([46300](https://github.com/WordPress/gutenberg/pull/46300))
 
 #### Mobile
-- Mobile: Disable Unsupported Block Editor Tests (Android). ([46542](https://github.com/WordPress/gutenberg/pull/46542))
-- Mobile: Inserter - Remove `.done()` usage. ([46460](https://github.com/WordPress/gutenberg/pull/46460))
-- Mobile: Update Heading block end-to-end test. ([46220](https://github.com/WordPress/gutenberg/pull/46220))
-- Mobile: Updates packages to not use Git HTTPS URLs. ([46422](https://github.com/WordPress/gutenberg/pull/46422))
-
-### Bug Fixes
-
-#### Block Library
-- Fix Nav Submenu block Link UI text control. ([46243](https://github.com/WordPress/gutenberg/pull/46243))
-- Fix auto Nav menu creation due to page list inner blocks. ([46223](https://github.com/WordPress/gutenberg/pull/46223))
-- Handle innerContent too when removing innerBlocks. ([46377](https://github.com/WordPress/gutenberg/pull/46377))
-- Image Block: Ensure drag handle matches cursor position when resizing a center aligned image. ([46497](https://github.com/WordPress/gutenberg/pull/46497))
-- Navigation Block: Add social link singular to list of blocks to be allowed. ([46374](https://github.com/WordPress/gutenberg/pull/46374))
-- Navigation Block: Fixes adding a submenu. ([46364](https://github.com/WordPress/gutenberg/pull/46364))
-- Navigation Block: Prevent circular references in navigation block rendering. ([46387](https://github.com/WordPress/gutenberg/pull/46387))
-- Navigation Block: Recursively remove Navigation block’s from appearing inside Navigation block on front of site. ([46279](https://github.com/WordPress/gutenberg/pull/46279))
-- Navigation link: Use stripHTML. ([46317](https://github.com/WordPress/gutenberg/pull/46317))
-- Page List Block: Fix error loading page list parent options. ([46327](https://github.com/WordPress/gutenberg/pull/46327))
-- Query Loop Block: Add migration of colors to v2 deprecation. ([46522](https://github.com/WordPress/gutenberg/pull/46522))
-- Site Logo: Correctly set the image's natural height and width. ([46214](https://github.com/WordPress/gutenberg/pull/46214))
-- Strip markup from link label data in inspector. ([46171](https://github.com/WordPress/gutenberg/pull/46171))
-- Template Parts: Fix modal search stacking context. ([46421](https://github.com/WordPress/gutenberg/pull/46421))
-- Video: Avoid an error when removal is locked. ([46324](https://github.com/WordPress/gutenberg/pull/46324))
-- Layout child fixed size should not be fixed by default and should always have a value set. ([46139](https://github.com/WordPress/gutenberg/pull/46139))
+
+-   Mobile: Disable Unsupported Block Editor Tests (Android). ([46542](https://github.com/WordPress/gutenberg/pull/46542))
+-   Mobile: Inserter - Remove `.done()` usage. ([46460](https://github.com/WordPress/gutenberg/pull/46460))
+-   Mobile: Update Heading block end-to-end test. ([46220](https://github.com/WordPress/gutenberg/pull/46220))
+-   Mobile: Updates packages to not use Git HTTPS URLs. ([46422](https://github.com/WordPress/gutenberg/pull/46422))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Fix Nav Submenu block Link UI text control. ([46243](https://github.com/WordPress/gutenberg/pull/46243))
+-   Fix auto Nav menu creation due to page list inner blocks. ([46223](https://github.com/WordPress/gutenberg/pull/46223))
+-   Handle innerContent too when removing innerBlocks. ([46377](https://github.com/WordPress/gutenberg/pull/46377))
+-   Image Block: Ensure drag handle matches cursor position when resizing a center aligned image. ([46497](https://github.com/WordPress/gutenberg/pull/46497))
+-   Navigation Block: Add social link singular to list of blocks to be allowed. ([46374](https://github.com/WordPress/gutenberg/pull/46374))
+-   Navigation Block: Fixes adding a submenu. ([46364](https://github.com/WordPress/gutenberg/pull/46364))
+-   Navigation Block: Prevent circular references in navigation block rendering. ([46387](https://github.com/WordPress/gutenberg/pull/46387))
+-   Navigation Block: Recursively remove Navigation block’s from appearing inside Navigation block on front of site. ([46279](https://github.com/WordPress/gutenberg/pull/46279))
+-   Navigation link: Use stripHTML. ([46317](https://github.com/WordPress/gutenberg/pull/46317))
+-   Page List Block: Fix error loading page list parent options. ([46327](https://github.com/WordPress/gutenberg/pull/46327))
+-   Query Loop Block: Add migration of colors to v2 deprecation. ([46522](https://github.com/WordPress/gutenberg/pull/46522))
+-   Site Logo: Correctly set the image's natural height and width. ([46214](https://github.com/WordPress/gutenberg/pull/46214))
+-   Strip markup from link label data in inspector. ([46171](https://github.com/WordPress/gutenberg/pull/46171))
+-   Template Parts: Fix modal search stacking context. ([46421](https://github.com/WordPress/gutenberg/pull/46421))
+-   Video: Avoid an error when removal is locked. ([46324](https://github.com/WordPress/gutenberg/pull/46324))
+-   Layout child fixed size should not be fixed by default and should always have a value set. ([46139](https://github.com/WordPress/gutenberg/pull/46139))
 
 #### Blocks
-- Paste handler: Remove styles on inline paste. ([46402](https://github.com/WordPress/gutenberg/pull/46402))
-- Improve performance of gutenberg_render_layout_support_flag. ([46074](https://github.com/WordPress/gutenberg/pull/46074))
+
+-   Paste handler: Remove styles on inline paste. ([46402](https://github.com/WordPress/gutenberg/pull/46402))
+-   Improve performance of gutenberg_render_layout_support_flag. ([46074](https://github.com/WordPress/gutenberg/pull/46074))
 
 #### Global Styles
-- Allow indirect properties when unfiltered_html is not allowed. ([46388](https://github.com/WordPress/gutenberg/pull/46388))
-- Fix Reset to defaults action by moving fills to be within context provider. ([46486](https://github.com/WordPress/gutenberg/pull/46486))
-- Fix duplication of synced block colors in CSS output. ([46297](https://github.com/WordPress/gutenberg/pull/46297))
-- Make style book label font size 11px. ([46341](https://github.com/WordPress/gutenberg/pull/46341))
-- Style Book: Clear Global Styles navigation history when selecting a block. ([46391](https://github.com/WordPress/gutenberg/pull/46391))
-- - Global Styles REST API endpoint: Check custom CSS is included before attempting to validate. ([46561](https://github.com/WordPress/gutenberg/pull/46561))
-- Reverts the custom CSS to an experiment while we resolve the handling of unfiltered html capabilities. ([46663](https://github.com/WordPress/gutenberg/pull/46663))
+
+-   Allow indirect properties when unfiltered_html is not allowed. ([46388](https://github.com/WordPress/gutenberg/pull/46388))
+-   Fix Reset to defaults action by moving fills to be within context provider. ([46486](https://github.com/WordPress/gutenberg/pull/46486))
+-   Fix duplication of synced block colors in CSS output. ([46297](https://github.com/WordPress/gutenberg/pull/46297))
+-   Make style book label font size 11px. ([46341](https://github.com/WordPress/gutenberg/pull/46341))
+-   Style Book: Clear Global Styles navigation history when selecting a block. ([46391](https://github.com/WordPress/gutenberg/pull/46391))
+-   -   Global Styles REST API endpoint: Check custom CSS is included before attempting to validate. ([46561](https://github.com/WordPress/gutenberg/pull/46561))
+-   Reverts the custom CSS to an experiment while we resolve the handling of unfiltered html capabilities. ([46663](https://github.com/WordPress/gutenberg/pull/46663))
 
 #### Block Editor
-- Block Editor: Fix content locked patterns. ([46494](https://github.com/WordPress/gutenberg/pull/46494))
-- Block Editor: Fix memoized pattern selector dependant arguments. ([46238](https://github.com/WordPress/gutenberg/pull/46238))
-- Block Editor: Restore draggable chip styles. ([46396](https://github.com/WordPress/gutenberg/pull/46396))
-- Block Editor: Revert deoptimization useNestedSettingsUpdate. ([46350](https://github.com/WordPress/gutenberg/pull/46350))
-- Block Editor: Fix some usages of useSelect that return unstable results. ([46226](https://github.com/WordPress/gutenberg/pull/46226))
-- useInnerBlockTemplateSync: Cancel template sync on innerBlocks change or unmount. ([46307](https://github.com/WordPress/gutenberg/pull/46307))
+
+-   Block Editor: Fix content locked patterns. ([46494](https://github.com/WordPress/gutenberg/pull/46494))
+-   Block Editor: Fix memoized pattern selector dependant arguments. ([46238](https://github.com/WordPress/gutenberg/pull/46238))
+-   Block Editor: Restore draggable chip styles. ([46396](https://github.com/WordPress/gutenberg/pull/46396))
+-   Block Editor: Revert deoptimization useNestedSettingsUpdate. ([46350](https://github.com/WordPress/gutenberg/pull/46350))
+-   Block Editor: Fix some usages of useSelect that return unstable results. ([46226](https://github.com/WordPress/gutenberg/pull/46226))
+-   useInnerBlockTemplateSync: Cancel template sync on innerBlocks change or unmount. ([46307](https://github.com/WordPress/gutenberg/pull/46307))
 
 #### Patterns
-- Add new pattern categories. ([46144](https://github.com/WordPress/gutenberg/pull/46144))
-- Block Editor: Add initial view mode in `BlockPatternSetup`. ([46399](https://github.com/WordPress/gutenberg/pull/46399))
+
+-   Add new pattern categories. ([46144](https://github.com/WordPress/gutenberg/pull/46144))
+-   Block Editor: Add initial view mode in `BlockPatternSetup`. ([46399](https://github.com/WordPress/gutenberg/pull/46399))
 
 #### Site Editor
-- Do not remount iframe. ([46431](https://github.com/WordPress/gutenberg/pull/46431))
-- Fix the top bar 'exit' animation. ([46533](https://github.com/WordPress/gutenberg/pull/46533))
-- Keep edited entity in sync when Editor canvas isn't mounted. ([46524](https://github.com/WordPress/gutenberg/pull/46524))
-- [Site Editor]: Add default white background for themes with no `background color` set. ([46314](https://github.com/WordPress/gutenberg/pull/46314))
+
+-   Do not remount iframe. ([46431](https://github.com/WordPress/gutenberg/pull/46431))
+-   Fix the top bar 'exit' animation. ([46533](https://github.com/WordPress/gutenberg/pull/46533))
+-   Keep edited entity in sync when Editor canvas isn't mounted. ([46524](https://github.com/WordPress/gutenberg/pull/46524))
+-   [Site Editor]: Add default white background for themes with no `background color` set. ([46314](https://github.com/WordPress/gutenberg/pull/46314))
 
 #### Components
-- InputControl: Fix `Flex` wrapper usage. ([46213](https://github.com/WordPress/gutenberg/pull/46213))
-- Modal: Fix unexpected modal closing in IME Composition. ([46453](https://github.com/WordPress/gutenberg/pull/46453))
-- MaybeCategoryPanel: Avoid 403 requests for users with low permissions. ([46349](https://github.com/WordPress/gutenberg/pull/46349))
-- Rich text: Add button to clear unknown format. ([44086](https://github.com/WordPress/gutenberg/pull/44086))
+
+-   InputControl: Fix `Flex` wrapper usage. ([46213](https://github.com/WordPress/gutenberg/pull/46213))
+-   Modal: Fix unexpected modal closing in IME Composition. ([46453](https://github.com/WordPress/gutenberg/pull/46453))
+-   MaybeCategoryPanel: Avoid 403 requests for users with low permissions. ([46349](https://github.com/WordPress/gutenberg/pull/46349))
+-   Rich text: Add button to clear unknown format. ([44086](https://github.com/WordPress/gutenberg/pull/44086))
 
 #### Document Settings
-- Fix template title in `summary` panel and requests for low privileged users. ([46304](https://github.com/WordPress/gutenberg/pull/46304))
-- Permalink: Hide edit field for users without publishing capabilities. ([46361](https://github.com/WordPress/gutenberg/pull/46361))
+
+-   Fix template title in `summary` panel and requests for low privileged users. ([46304](https://github.com/WordPress/gutenberg/pull/46304))
+-   Permalink: Hide edit field for users without publishing capabilities. ([46361](https://github.com/WordPress/gutenberg/pull/46361))
 
 #### Patterns
-- Content lock: Make filter hook namespace unique. ([46344](https://github.com/WordPress/gutenberg/pull/46344))
+
+-   Content lock: Make filter hook namespace unique. ([46344](https://github.com/WordPress/gutenberg/pull/46344))
 
 #### Layout
-- Child Layout controls: Fix help text for height. ([46319](https://github.com/WordPress/gutenberg/pull/46319))
+
+-   Child Layout controls: Fix help text for height. ([46319](https://github.com/WordPress/gutenberg/pull/46319))
 
 #### Widgets Editor
-- Shortcuts: Add Ctrl+Y for redo to all editor instances on Windows. ([43392](https://github.com/WordPress/gutenberg/pull/43392))
+
+-   Shortcuts: Add Ctrl+Y for redo to all editor instances on Windows. ([43392](https://github.com/WordPress/gutenberg/pull/43392))
 
 #### Block API
-- HTML block: Fix parsing. ([27268](https://github.com/WordPress/gutenberg/pull/27268))
+
+-   HTML block: Fix parsing. ([27268](https://github.com/WordPress/gutenberg/pull/27268))
 
 #### Mobile
-- Social Links mobile test: Wait for URL bottom sheet to appear. ([46308](https://github.com/WordPress/gutenberg/pull/46308))
+
+-   Social Links mobile test: Wait for URL bottom sheet to appear. ([46308](https://github.com/WordPress/gutenberg/pull/46308))
 
 ### Performance
 
 #### Components
-- Avoid paint on popover when hovering content. ([46201](https://github.com/WordPress/gutenberg/pull/46201))
-- CircularOption: Avoid paint on circular option hover. ([46197](https://github.com/WordPress/gutenberg/pull/46197))
-- Lodash: Replace `_.isEqual()` with `fastDeepEqual`. ([46200](https://github.com/WordPress/gutenberg/pull/46200))
-- Popover: Avoid paint on popovers when scrolling. ([46187](https://github.com/WordPress/gutenberg/pull/46187))
-- Resizable Box: Avoid paint on resizable-box handles. ([46196](https://github.com/WordPress/gutenberg/pull/46196))
-- ListView: Avoid paint on list view item hover. ([46188](https://github.com/WordPress/gutenberg/pull/46188))
+
+-   Avoid paint on popover when hovering content. ([46201](https://github.com/WordPress/gutenberg/pull/46201))
+-   CircularOption: Avoid paint on circular option hover. ([46197](https://github.com/WordPress/gutenberg/pull/46197))
+-   Lodash: Replace `_.isEqual()` with `fastDeepEqual`. ([46200](https://github.com/WordPress/gutenberg/pull/46200))
+-   Popover: Avoid paint on popovers when scrolling. ([46187](https://github.com/WordPress/gutenberg/pull/46187))
+-   Resizable Box: Avoid paint on resizable-box handles. ([46196](https://github.com/WordPress/gutenberg/pull/46196))
+-   ListView: Avoid paint on list view item hover. ([46188](https://github.com/WordPress/gutenberg/pull/46188))
 
 #### Code Quality
-- Lodash: Refactor `blocks` away from `_.find()`. ([46428](https://github.com/WordPress/gutenberg/pull/46428))
-- Lodash: Refactor `core-data` away from `_.find()`. ([46468](https://github.com/WordPress/gutenberg/pull/46468))
-- Lodash: Refactor `edit-site` away from `_.find()`. ([46539](https://github.com/WordPress/gutenberg/pull/46539))
-- Lodash: Refactor away from `_.orderBy()`. ([45146](https://github.com/WordPress/gutenberg/pull/45146))
-- Lodash: Refactor block library away from `_.find()`. ([46430](https://github.com/WordPress/gutenberg/pull/46430))
-- Remove usage of get_default_block_editor_settings. ([46112](https://github.com/WordPress/gutenberg/pull/46112))
+
+-   Lodash: Refactor `blocks` away from `_.find()`. ([46428](https://github.com/WordPress/gutenberg/pull/46428))
+-   Lodash: Refactor `core-data` away from `_.find()`. ([46468](https://github.com/WordPress/gutenberg/pull/46468))
+-   Lodash: Refactor `edit-site` away from `_.find()`. ([46539](https://github.com/WordPress/gutenberg/pull/46539))
+-   Lodash: Refactor away from `_.orderBy()`. ([45146](https://github.com/WordPress/gutenberg/pull/45146))
+-   Lodash: Refactor block library away from `_.find()`. ([46430](https://github.com/WordPress/gutenberg/pull/46430))
+-   Remove usage of get_default_block_editor_settings. ([46112](https://github.com/WordPress/gutenberg/pull/46112))
 
 #### Post Editor
-- Lodash: Refactor editor away from `_.find()`. ([46464](https://github.com/WordPress/gutenberg/pull/46464))
-- Lodash: Refactor post editor away from `_.find()`. ([46432](https://github.com/WordPress/gutenberg/pull/46432))
+
+-   Lodash: Refactor editor away from `_.find()`. ([46464](https://github.com/WordPress/gutenberg/pull/46464))
+-   Lodash: Refactor post editor away from `_.find()`. ([46432](https://github.com/WordPress/gutenberg/pull/46432))
 
 #### Block Editor
-- Avoid paint on inserter animation. ([46185](https://github.com/WordPress/gutenberg/pull/46185))
-- Improve inserter search performance. ([46153](https://github.com/WordPress/gutenberg/pull/46153))
-- Block Editor: Refactor the "order" state in the block editor reducer to use a map instead of a plain object. ([46221](https://github.com/WordPress/gutenberg/pull/46221))
-- Block Editor: Refactor the block-editor parents state to use maps instead of objects. ([46225](https://github.com/WordPress/gutenberg/pull/46225))
-- Refactor the block-editor "tree" state to use maps instead of objects. ([46229](https://github.com/WordPress/gutenberg/pull/46229))
-- Refactor the block-editor byClientId redux state to use maps instead of plain objects. ([46204](https://github.com/WordPress/gutenberg/pull/46204))
-- Fix typing performance issue for container blocks. ([46527](https://github.com/WordPress/gutenberg/pull/46527))
+
+-   Avoid paint on inserter animation. ([46185](https://github.com/WordPress/gutenberg/pull/46185))
+-   Improve inserter search performance. ([46153](https://github.com/WordPress/gutenberg/pull/46153))
+-   Block Editor: Refactor the "order" state in the block editor reducer to use a map instead of a plain object. ([46221](https://github.com/WordPress/gutenberg/pull/46221))
+-   Block Editor: Refactor the block-editor parents state to use maps instead of objects. ([46225](https://github.com/WordPress/gutenberg/pull/46225))
+-   Refactor the block-editor "tree" state to use maps instead of objects. ([46229](https://github.com/WordPress/gutenberg/pull/46229))
+-   Refactor the block-editor byClientId redux state to use maps instead of plain objects. ([46204](https://github.com/WordPress/gutenberg/pull/46204))
+-   Fix typing performance issue for container blocks. ([46527](https://github.com/WordPress/gutenberg/pull/46527))
 
 #### Testing
-- E2E: Fix performance tests by making inserter search container waiting optional. ([46268](https://github.com/WordPress/gutenberg/pull/46268))
+
+-   E2E: Fix performance tests by making inserter search container waiting optional. ([46268](https://github.com/WordPress/gutenberg/pull/46268))
 
 #### Mobile
-- Columns mobile block: Avoid returning unstable innerWidths from useSelect. ([46403](https://github.com/WordPress/gutenberg/pull/46403))
+
+-   Columns mobile block: Avoid returning unstable innerWidths from useSelect. ([46403](https://github.com/WordPress/gutenberg/pull/46403))
 
 ### Experiments
 
 #### Block Library
-- Navigation List View: Remove empty cell when there is no edit button. ([46439](https://github.com/WordPress/gutenberg/pull/46439))
+
+-   Navigation List View: Remove empty cell when there is no edit button. ([46439](https://github.com/WordPress/gutenberg/pull/46439))
 
 #### Web Fonts
-- WP Webfonts: Avoid duplicated font families if the font family name was defined using fallback values. ([46378](https://github.com/WordPress/gutenberg/pull/46378))
+
+-   WP Webfonts: Avoid duplicated font families if the font family name was defined using fallback values. ([46378](https://github.com/WordPress/gutenberg/pull/46378))
 
 ### Documentation
-- Adds clarifications and clears up inaccuracies. ([46283](https://github.com/WordPress/gutenberg/pull/46283))
-- Adds details of how to find the .zip file. ([46305](https://github.com/WordPress/gutenberg/pull/46305))
-- Doc: Fix description and documentation for link color support. ([46405](https://github.com/WordPress/gutenberg/pull/46405))
-- Docs: Add missing useState import in BorderBoxControl documentation. ([42067](https://github.com/WordPress/gutenberg/pull/42067))
-- Docs: Add missing useState import in color picker docs. ([42069](https://github.com/WordPress/gutenberg/pull/42069))
-- Docs: Add missing useState import in confirm dialog docs. ([42071](https://github.com/WordPress/gutenberg/pull/42071))
-- Docs: Adds reminder to use Node.js v14 in Quick Start. ([46216](https://github.com/WordPress/gutenberg/pull/46216))
-- Docs: Fix missing link to `primitives` package. ([46290](https://github.com/WordPress/gutenberg/pull/46290))
-- Docs: Update reference to IE 11. ([46296](https://github.com/WordPress/gutenberg/pull/46296))
+
+-   Adds clarifications and clears up inaccuracies. ([46283](https://github.com/WordPress/gutenberg/pull/46283))
+-   Adds details of how to find the .zip file. ([46305](https://github.com/WordPress/gutenberg/pull/46305))
+-   Doc: Fix description and documentation for link color support. ([46405](https://github.com/WordPress/gutenberg/pull/46405))
+-   Docs: Add missing useState import in BorderBoxControl documentation. ([42067](https://github.com/WordPress/gutenberg/pull/42067))
+-   Docs: Add missing useState import in color picker docs. ([42069](https://github.com/WordPress/gutenberg/pull/42069))
+-   Docs: Add missing useState import in confirm dialog docs. ([42071](https://github.com/WordPress/gutenberg/pull/42071))
+-   Docs: Adds reminder to use Node.js v14 in Quick Start. ([46216](https://github.com/WordPress/gutenberg/pull/46216))
+-   Docs: Fix missing link to `primitives` package. ([46290](https://github.com/WordPress/gutenberg/pull/46290))
+-   Docs: Update reference to IE 11. ([46296](https://github.com/WordPress/gutenberg/pull/46296))
 
 ### Code Quality
-- Block Editor: Fix `no-node-access` violations in `BlockPreview`. ([46409](https://github.com/WordPress/gutenberg/pull/46409))
-- Block Editor: Fix `no-node-access` violations in `BlockSelectionClearer`. ([46408](https://github.com/WordPress/gutenberg/pull/46408))
-- Columns mobile edit: Remove unused updateBlockSettings action bind. ([46455](https://github.com/WordPress/gutenberg/pull/46455))
-- ESLint: Fix warning in `getBlockAttribute` documentation. ([46500](https://github.com/WordPress/gutenberg/pull/46500))
-- List View: Use default parameters instead of defaultProps. ([46266](https://github.com/WordPress/gutenberg/pull/46266))
-- Removed: Remove small APIs marked to be removed in WP 6.2. ([46106](https://github.com/WordPress/gutenberg/pull/46106))
-- Site Editor: Remove invalid CSS. ([46288](https://github.com/WordPress/gutenberg/pull/46288))
-
-#### Block Library
-- Group Block: Remove placeholder leftovers. ([46423](https://github.com/WordPress/gutenberg/pull/46423))
-- Group: Remove unnecessary 'useCallback'. ([46418](https://github.com/WordPress/gutenberg/pull/46418))
-- Navigation Block: Add tests for Nav block uncontrolled blocks dirty state checking. ([46329](https://github.com/WordPress/gutenberg/pull/46329))
-- Navigation Block: Update attribute test for `are-blocks-dirty.js`. ([46355](https://github.com/WordPress/gutenberg/pull/46355))
-- Page List Block: Move shared "convert" description to constant. ([46368](https://github.com/WordPress/gutenberg/pull/46368))
-- Page List Block: Simplify Page List convert to links function API. ([46365](https://github.com/WordPress/gutenberg/pull/46365))
-- Query: Cleanup variation picker component. ([46424](https://github.com/WordPress/gutenberg/pull/46424))
-- RNMobile: Add an inline comment to clarify usage of 'hard' limit vs. unbounded query. ([46245](https://github.com/WordPress/gutenberg/pull/46245))
-- Shared standard Link UI component between Nav Link and Submenu blocks. ([46370](https://github.com/WordPress/gutenberg/pull/46370))
-- Template Parts: Remove unnecessary 'useCallback'. ([46420](https://github.com/WordPress/gutenberg/pull/46420))
-
-#### Components
-- AlignmentMatrixControl: Refactor to TypeScript. ([46162](https://github.com/WordPress/gutenberg/pull/46162))
-- Also ignore `no-node-access` for some components. ([46501](https://github.com/WordPress/gutenberg/pull/46501))
-- Fix `no-node-access` violations in `FocalPointPicker` tests. ([46312](https://github.com/WordPress/gutenberg/pull/46312))
-- Fix `no-node-access` violations in `Popover`. ([46311](https://github.com/WordPress/gutenberg/pull/46311))
-- Fix `no-node-access` violations in `Theme`. ([46310](https://github.com/WordPress/gutenberg/pull/46310))
-- Fix `no-node-access` violations in `ToolsPanel` tests. ([46313](https://github.com/WordPress/gutenberg/pull/46313))
-- withFilters: Use 'act' from React Testing Library. ([46237](https://github.com/WordPress/gutenberg/pull/46237))
+
+-   Block Editor: Fix `no-node-access` violations in `BlockPreview`. ([46409](https://github.com/WordPress/gutenberg/pull/46409))
+-   Block Editor: Fix `no-node-access` violations in `BlockSelectionClearer`. ([46408](https://github.com/WordPress/gutenberg/pull/46408))
+-   Columns mobile edit: Remove unused updateBlockSettings action bind. ([46455](https://github.com/WordPress/gutenberg/pull/46455))
+-   ESLint: Fix warning in `getBlockAttribute` documentation. ([46500](https://github.com/WordPress/gutenberg/pull/46500))
+-   List View: Use default parameters instead of defaultProps. ([46266](https://github.com/WordPress/gutenberg/pull/46266))
+-   Removed: Remove small APIs marked to be removed in WP 6.2. ([46106](https://github.com/WordPress/gutenberg/pull/46106))
+-   Site Editor: Remove invalid CSS. ([46288](https://github.com/WordPress/gutenberg/pull/46288))
+
+#### Block Library
+
+-   Group Block: Remove placeholder leftovers. ([46423](https://github.com/WordPress/gutenberg/pull/46423))
+-   Group: Remove unnecessary 'useCallback'. ([46418](https://github.com/WordPress/gutenberg/pull/46418))
+-   Navigation Block: Add tests for Nav block uncontrolled blocks dirty state checking. ([46329](https://github.com/WordPress/gutenberg/pull/46329))
+-   Navigation Block: Update attribute test for `are-blocks-dirty.js`. ([46355](https://github.com/WordPress/gutenberg/pull/46355))
+-   Page List Block: Move shared "convert" description to constant. ([46368](https://github.com/WordPress/gutenberg/pull/46368))
+-   Page List Block: Simplify Page List convert to links function API. ([46365](https://github.com/WordPress/gutenberg/pull/46365))
+-   Query: Cleanup variation picker component. ([46424](https://github.com/WordPress/gutenberg/pull/46424))
+-   RNMobile: Add an inline comment to clarify usage of 'hard' limit vs. unbounded query. ([46245](https://github.com/WordPress/gutenberg/pull/46245))
+-   Shared standard Link UI component between Nav Link and Submenu blocks. ([46370](https://github.com/WordPress/gutenberg/pull/46370))
+-   Template Parts: Remove unnecessary 'useCallback'. ([46420](https://github.com/WordPress/gutenberg/pull/46420))
+
+#### Components
+
+-   AlignmentMatrixControl: Refactor to TypeScript. ([46162](https://github.com/WordPress/gutenberg/pull/46162))
+-   Also ignore `no-node-access` for some components. ([46501](https://github.com/WordPress/gutenberg/pull/46501))
+-   Fix `no-node-access` violations in `FocalPointPicker` tests. ([46312](https://github.com/WordPress/gutenberg/pull/46312))
+-   Fix `no-node-access` violations in `Popover`. ([46311](https://github.com/WordPress/gutenberg/pull/46311))
+-   Fix `no-node-access` violations in `Theme`. ([46310](https://github.com/WordPress/gutenberg/pull/46310))
+-   Fix `no-node-access` violations in `ToolsPanel` tests. ([46313](https://github.com/WordPress/gutenberg/pull/46313))
+-   withFilters: Use 'act' from React Testing Library. ([46237](https://github.com/WordPress/gutenberg/pull/46237))
 
 #### Data Layer
-- Data: Add ability to subscribe to one store, remove __unstableSubscribeStore. ([45513](https://github.com/WordPress/gutenberg/pull/45513))
-- ESLint: Fix warnings in the data package. ([46499](https://github.com/WordPress/gutenberg/pull/46499))
+
+-   Data: Add ability to subscribe to one store, remove \_\_unstableSubscribeStore. ([45513](https://github.com/WordPress/gutenberg/pull/45513))
+-   ESLint: Fix warnings in the data package. ([46499](https://github.com/WordPress/gutenberg/pull/46499))
 
 #### Global Styles
-- Add "custom-css" as an acceptable value in the documentation for gutenberg_get_global_stylesheet. ([46493](https://github.com/WordPress/gutenberg/pull/46493))
-- PaletteEdit: Add changelog. ([46095](https://github.com/WordPress/gutenberg/pull/46095))
+
+-   Add "custom-css" as an acceptable value in the documentation for gutenberg_get_global_stylesheet. ([46493](https://github.com/WordPress/gutenberg/pull/46493))
+-   PaletteEdit: Add changelog. ([46095](https://github.com/WordPress/gutenberg/pull/46095))
 
 #### Block Editor
-- Inserter: Update mobile tab navigation styles. ([46186](https://github.com/WordPress/gutenberg/pull/46186))
+
+-   Inserter: Update mobile tab navigation styles. ([46186](https://github.com/WordPress/gutenberg/pull/46186))
 
 #### Layout
-- Clarify inline comment about switching to `safecss_filter_attr`. ([46061](https://github.com/WordPress/gutenberg/pull/46061))
+
+-   Clarify inline comment about switching to `safecss_filter_attr`. ([46061](https://github.com/WordPress/gutenberg/pull/46061))
 
 ### Tools
 
 #### Build Tooling
-- Adds Github Action to validate Gradle Wrapper. ([46247](https://github.com/WordPress/gutenberg/pull/46247))
-- Prevent api-fetch and core-data from being imported in the block editor package. ([46302](https://github.com/WordPress/gutenberg/pull/46302))
-- Serialize the map objects properly in the Redux dev tools. ([46282](https://github.com/WordPress/gutenberg/pull/46282))
-
-#### Testing
-- E2E: Fix flaky Block Switcher tests. ([46406](https://github.com/WordPress/gutenberg/pull/46406))
-- end-to-end tests: Add width and color test to button block. ([46452](https://github.com/WordPress/gutenberg/pull/46452))
 
+-   Adds GitHub Action to validate Gradle Wrapper. ([46247](https://github.com/WordPress/gutenberg/pull/46247))
+-   Prevent api-fetch and core-data from being imported in the block editor package. ([46302](https://github.com/WordPress/gutenberg/pull/46302))
+-   Serialize the map objects properly in the Redux dev tools. ([46282](https://github.com/WordPress/gutenberg/pull/46282))
 
+#### Testing
 
+-   E2E: Fix flaky Block Switcher tests. ([46406](https://github.com/WordPress/gutenberg/pull/46406))
+-   end-to-end tests: Add width and color test to button block. ([46452](https://github.com/WordPress/gutenberg/pull/46452))
 
 ## Contributors
 
@@ -9453,7 +20652,6 @@ The following contributors merged PRs in this release:
 
 @andrewserong @glendaviesnz
 
-
 = 14.8.0-rc.1 =
 
 ## Changelog
@@ -9461,276 +20659,317 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Add a current-menu-ancestor class to navigation items. ([40778](https://github.com/WordPress/gutenberg/pull/40778))
-- Page List Block: Adds a longdash tree to the parent selector. ([46336](https://github.com/WordPress/gutenberg/pull/46336))
-- Page List Block: Hide page list edit button if no pages are available. ([46331](https://github.com/WordPress/gutenberg/pull/46331))
-- Reusable block: Pluralize the message "Convert to regular blocks" depending on the number of blocks contained. ([45819](https://github.com/WordPress/gutenberg/pull/45819))
-- Add page list to Link UI transforms in Nav block. ([46426](https://github.com/WordPress/gutenberg/pull/46426))
-- Heading Block: Don't rely on the experimental selector anymore. ([46284](https://github.com/WordPress/gutenberg/pull/46284))
-- Media & Text Block: Create undo history when media width is changed. ([46084](https://github.com/WordPress/gutenberg/pull/46084))
-- Navigation block: Add location->primary to fallback nav creation for classic menus. ([45976](https://github.com/WordPress/gutenberg/pull/45976))
-- Navigation block: Update fallback nav creation to the most recently created menu. ([46286](https://github.com/WordPress/gutenberg/pull/46286))
-- Navigation: Add a 'open list view' button. ([46335](https://github.com/WordPress/gutenberg/pull/46335))
-- Navigation: Removes the header from the navigation list view in the experiment. ([46070](https://github.com/WordPress/gutenberg/pull/46070))
-- Page List: Add convert panel to Inspector Controls when within Nav block. ([46352](https://github.com/WordPress/gutenberg/pull/46352))
-- Page List: Prevent users from adding inner blocks to Page List. ([46269](https://github.com/WordPress/gutenberg/pull/46269))
-- Query: Remove color block supports. ([46147](https://github.com/WordPress/gutenberg/pull/46147))
-- Table block: Make `figcaption` styles consistent between editor and front end. ([46172](https://github.com/WordPress/gutenberg/pull/46172))
-- List/quote: Unwrap inner block when pressing Backspace at start. ([45075](https://github.com/WordPress/gutenberg/pull/45075))
+
+-   Add a current-menu-ancestor class to navigation items. ([40778](https://github.com/WordPress/gutenberg/pull/40778))
+-   Page List Block: Adds a longdash tree to the parent selector. ([46336](https://github.com/WordPress/gutenberg/pull/46336))
+-   Page List Block: Hide page list edit button if no pages are available. ([46331](https://github.com/WordPress/gutenberg/pull/46331))
+-   Reusable block: Pluralize the message "Convert to regular blocks" depending on the number of blocks contained. ([45819](https://github.com/WordPress/gutenberg/pull/45819))
+-   Add page list to Link UI transforms in Nav block. ([46426](https://github.com/WordPress/gutenberg/pull/46426))
+-   Heading Block: Don't rely on the experimental selector anymore. ([46284](https://github.com/WordPress/gutenberg/pull/46284))
+-   Media & Text Block: Create undo history when media width is changed. ([46084](https://github.com/WordPress/gutenberg/pull/46084))
+-   Navigation block: Add location->primary to fallback nav creation for classic menus. ([45976](https://github.com/WordPress/gutenberg/pull/45976))
+-   Navigation block: Update fallback nav creation to the most recently created menu. ([46286](https://github.com/WordPress/gutenberg/pull/46286))
+-   Navigation: Add a 'open list view' button. ([46335](https://github.com/WordPress/gutenberg/pull/46335))
+-   Navigation: Removes the header from the navigation list view in the experiment. ([46070](https://github.com/WordPress/gutenberg/pull/46070))
+-   Page List: Add convert panel to Inspector Controls when within Nav block. ([46352](https://github.com/WordPress/gutenberg/pull/46352))
+-   Page List: Prevent users from adding inner blocks to Page List. ([46269](https://github.com/WordPress/gutenberg/pull/46269))
+-   Query: Remove color block supports. ([46147](https://github.com/WordPress/gutenberg/pull/46147))
+-   Table block: Make `figcaption` styles consistent between editor and front end. ([46172](https://github.com/WordPress/gutenberg/pull/46172))
+-   List/quote: Unwrap inner block when pressing Backspace at start. ([45075](https://github.com/WordPress/gutenberg/pull/45075))
 
 #### Inspector Controls
-- Sidebar Tabs: Refine the use of inspector tabs and disable filters for Nav blocks. ([46346](https://github.com/WordPress/gutenberg/pull/46346))
-- Sidebar Tabs: Use editor settings to override display. ([46321](https://github.com/WordPress/gutenberg/pull/46321))
-- Summary panel: Try improving spacing and grid. ([46267](https://github.com/WordPress/gutenberg/pull/46267))
+
+-   Sidebar Tabs: Refine the use of inspector tabs and disable filters for Nav blocks. ([46346](https://github.com/WordPress/gutenberg/pull/46346))
+-   Sidebar Tabs: Use editor settings to override display. ([46321](https://github.com/WordPress/gutenberg/pull/46321))
+-   Summary panel: Try improving spacing and grid. ([46267](https://github.com/WordPress/gutenberg/pull/46267))
 
 #### Global Styles
-- Add Style Book to Global Styles. ([45960](https://github.com/WordPress/gutenberg/pull/45960))
-- Add block preview component in global styles. ([45719](https://github.com/WordPress/gutenberg/pull/45719))
-- Move border from layout to own menu. ([45995](https://github.com/WordPress/gutenberg/pull/45995))
-- Add a css style to theme.json to allow setting of custom css strings. ([46255](https://github.com/WordPress/gutenberg/pull/46255))
-- Expose before filter hook in useSettings for injecting block settings in the editor. ([45089](https://github.com/WordPress/gutenberg/pull/45089))
-- Global styles: Add custom CSS panel to site editor. ([46141](https://github.com/WordPress/gutenberg/pull/46141))
+
+-   Add Style Book to Global Styles. ([45960](https://github.com/WordPress/gutenberg/pull/45960))
+-   Add block preview component in global styles. ([45719](https://github.com/WordPress/gutenberg/pull/45719))
+-   Move border from layout to own menu. ([45995](https://github.com/WordPress/gutenberg/pull/45995))
+-   Add a css style to theme.json to allow setting of custom css strings. ([46255](https://github.com/WordPress/gutenberg/pull/46255))
+-   Expose before filter hook in useSettings for injecting block settings in the editor. ([45089](https://github.com/WordPress/gutenberg/pull/45089))
+-   Global styles: Add custom CSS panel to site editor. ([46141](https://github.com/WordPress/gutenberg/pull/46141))
 
 #### Site Editor
-- Allow adding new templates and template parts directly from the sidebar. ([46458](https://github.com/WordPress/gutenberg/pull/46458))
-- Synchronize the sidebar state in the URL. ([46433](https://github.com/WordPress/gutenberg/pull/46433))
-- Try template drill down on the shell sidebar (browse mode). ([45100](https://github.com/WordPress/gutenberg/pull/45100))
+
+-   Allow adding new templates and template parts directly from the sidebar. ([46458](https://github.com/WordPress/gutenberg/pull/46458))
+-   Synchronize the sidebar state in the URL. ([46433](https://github.com/WordPress/gutenberg/pull/46433))
+-   Try template drill down on the shell sidebar (browse mode). ([45100](https://github.com/WordPress/gutenberg/pull/45100))
 
 #### Block Editor
-- Update the synced block hover styles in Inserter. ([46442](https://github.com/WordPress/gutenberg/pull/46442))
-- Add new selector getLastInsertedBlockClientId. ([46531](https://github.com/WordPress/gutenberg/pull/46531))
-- Block editor: Hide fixed contextual toolbar. ([46298](https://github.com/WordPress/gutenberg/pull/46298))
-- Inserter: Pattern title tooltip. ([46419](https://github.com/WordPress/gutenberg/pull/46419))
-- useNestedSettingsUpdate: Prevent unneeded syncing of falsy templateLock values. ([46357](https://github.com/WordPress/gutenberg/pull/46357))
-- Design: Augmented shadows for modals and popovers. ([46228](https://github.com/WordPress/gutenberg/pull/46228))
+
+-   Update the synced block hover styles in Inserter. ([46442](https://github.com/WordPress/gutenberg/pull/46442))
+-   Add new selector getLastInsertedBlockClientId. ([46531](https://github.com/WordPress/gutenberg/pull/46531))
+-   Block editor: Hide fixed contextual toolbar. ([46298](https://github.com/WordPress/gutenberg/pull/46298))
+-   Inserter: Pattern title tooltip. ([46419](https://github.com/WordPress/gutenberg/pull/46419))
+-   useNestedSettingsUpdate: Prevent unneeded syncing of falsy templateLock values. ([46357](https://github.com/WordPress/gutenberg/pull/46357))
+-   Design: Augmented shadows for modals and popovers. ([46228](https://github.com/WordPress/gutenberg/pull/46228))
 
 #### Components
-- Tabs: Try a simpler tab focus style, alt. ([46276](https://github.com/WordPress/gutenberg/pull/46276))
-- BaseControl: Add convenience hook to generate id-related props. ([46170](https://github.com/WordPress/gutenberg/pull/46170))
-- Dashicon: Refactor to TypeScript. ([45924](https://github.com/WordPress/gutenberg/pull/45924))
-- Lighten borders to gray-600. ([46252](https://github.com/WordPress/gutenberg/pull/46252))
-- Popover: Check positioning by adding and testing is-positioned class. ([46429](https://github.com/WordPress/gutenberg/pull/46429))
+
+-   Tabs: Try a simpler tab focus style, alt. ([46276](https://github.com/WordPress/gutenberg/pull/46276))
+-   BaseControl: Add convenience hook to generate id-related props. ([46170](https://github.com/WordPress/gutenberg/pull/46170))
+-   Dashicon: Refactor to TypeScript. ([45924](https://github.com/WordPress/gutenberg/pull/45924))
+-   Lighten borders to gray-600. ([46252](https://github.com/WordPress/gutenberg/pull/46252))
+-   Popover: Check positioning by adding and testing is-positioned class. ([46429](https://github.com/WordPress/gutenberg/pull/46429))
 
 ### Icons
-- Icons: Update the border icon. ([46264](https://github.com/WordPress/gutenberg/pull/46264))
+
+-   Icons: Update the border icon. ([46264](https://github.com/WordPress/gutenberg/pull/46264))
 
 #### Testing
-- Tests: Fix `toBePositionedPopover` matcher message function. ([46239](https://github.com/WordPress/gutenberg/pull/46239))
+
+-   Tests: Fix `toBePositionedPopover` matcher message function. ([46239](https://github.com/WordPress/gutenberg/pull/46239))
 
 #### Accessibility
-- Reorganize the site editor to introduce Browse Mode. ([44770](https://github.com/WordPress/gutenberg/pull/44770))
+
+-   Reorganize the site editor to introduce Browse Mode. ([44770](https://github.com/WordPress/gutenberg/pull/44770))
 
 #### Plugin
-- Update the Gutenberg plugin to require at least the WP 6.0 version. ([46102](https://github.com/WordPress/gutenberg/pull/46102))
-- PHP: Backport changes from core theme resolver. ([46250](https://github.com/WordPress/gutenberg/pull/46250))
-- Update: Move gutenberg_register_core_block_patterns from 6.1 to 6.2. ([46249](https://github.com/WordPress/gutenberg/pull/46249))
-- Upgrade React packages to v18. ([45235](https://github.com/WordPress/gutenberg/pull/45235))
+
+-   Update the Gutenberg plugin to require at least the WP 6.0 version. ([46102](https://github.com/WordPress/gutenberg/pull/46102))
+-   PHP: Backport changes from core theme resolver. ([46250](https://github.com/WordPress/gutenberg/pull/46250))
+-   Update: Move gutenberg_register_core_block_patterns from 6.1 to 6.2. ([46249](https://github.com/WordPress/gutenberg/pull/46249))
+-   Upgrade React packages to v18. ([45235](https://github.com/WordPress/gutenberg/pull/45235))
 
 #### Themes
-- Empty Theme: Add the `$schema` property in `theme.json` and rename template directories. ([46300](https://github.com/WordPress/gutenberg/pull/46300))
+
+-   Empty Theme: Add the `$schema` property in `theme.json` and rename template directories. ([46300](https://github.com/WordPress/gutenberg/pull/46300))
 
 #### Mobile
-- Mobile: Disable Unsupported Block Editor Tests (Android). ([46542](https://github.com/WordPress/gutenberg/pull/46542))
-- Mobile: Inserter - Remove `.done()` usage. ([46460](https://github.com/WordPress/gutenberg/pull/46460))
-- Mobile: Update Heading block end-to-end test. ([46220](https://github.com/WordPress/gutenberg/pull/46220))
-- Mobile: Updates packages to not use Git HTTPS URLs. ([46422](https://github.com/WordPress/gutenberg/pull/46422))
-
-### Bug Fixes
-
-#### Block Library
-- Fix Nav Submenu block Link UI text control. ([46243](https://github.com/WordPress/gutenberg/pull/46243))
-- Fix auto Nav menu creation due to page list inner blocks. ([46223](https://github.com/WordPress/gutenberg/pull/46223))
-- Handle innerContent too when removing innerBlocks. ([46377](https://github.com/WordPress/gutenberg/pull/46377))
-- Image Block: Ensure drag handle matches cursor position when resizing a center aligned image. ([46497](https://github.com/WordPress/gutenberg/pull/46497))
-- Navigation Block: Add social link singular to list of blocks to be allowed. ([46374](https://github.com/WordPress/gutenberg/pull/46374))
-- Navigation Block: Fixes adding a submenu. ([46364](https://github.com/WordPress/gutenberg/pull/46364))
-- Navigation Block: Prevent circular references in navigation block rendering. ([46387](https://github.com/WordPress/gutenberg/pull/46387))
-- Navigation Block: Recursively remove Navigation block’s from appearing inside Navigation block on front of site. ([46279](https://github.com/WordPress/gutenberg/pull/46279))
-- Navigation link: Use stripHTML. ([46317](https://github.com/WordPress/gutenberg/pull/46317))
-- Page List Block: Fix error loading page list parent options. ([46327](https://github.com/WordPress/gutenberg/pull/46327))
-- Query Loop Block: Add migration of colors to v2 deprecation. ([46522](https://github.com/WordPress/gutenberg/pull/46522))
-- Site Logo: Correctly set the image's natural height and width. ([46214](https://github.com/WordPress/gutenberg/pull/46214))
-- Strip markup from link label data in inspector. ([46171](https://github.com/WordPress/gutenberg/pull/46171))
-- Template Parts: Fix modal search stacking context. ([46421](https://github.com/WordPress/gutenberg/pull/46421))
-- Video: Avoid an error when removal is locked. ([46324](https://github.com/WordPress/gutenberg/pull/46324))
-- Layout child fixed size should not be fixed by default and should always have a value set. ([46139](https://github.com/WordPress/gutenberg/pull/46139))
+
+-   Mobile: Disable Unsupported Block Editor Tests (Android). ([46542](https://github.com/WordPress/gutenberg/pull/46542))
+-   Mobile: Inserter - Remove `.done()` usage. ([46460](https://github.com/WordPress/gutenberg/pull/46460))
+-   Mobile: Update Heading block end-to-end test. ([46220](https://github.com/WordPress/gutenberg/pull/46220))
+-   Mobile: Updates packages to not use Git HTTPS URLs. ([46422](https://github.com/WordPress/gutenberg/pull/46422))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Fix Nav Submenu block Link UI text control. ([46243](https://github.com/WordPress/gutenberg/pull/46243))
+-   Fix auto Nav menu creation due to page list inner blocks. ([46223](https://github.com/WordPress/gutenberg/pull/46223))
+-   Handle innerContent too when removing innerBlocks. ([46377](https://github.com/WordPress/gutenberg/pull/46377))
+-   Image Block: Ensure drag handle matches cursor position when resizing a center aligned image. ([46497](https://github.com/WordPress/gutenberg/pull/46497))
+-   Navigation Block: Add social link singular to list of blocks to be allowed. ([46374](https://github.com/WordPress/gutenberg/pull/46374))
+-   Navigation Block: Fixes adding a submenu. ([46364](https://github.com/WordPress/gutenberg/pull/46364))
+-   Navigation Block: Prevent circular references in navigation block rendering. ([46387](https://github.com/WordPress/gutenberg/pull/46387))
+-   Navigation Block: Recursively remove Navigation block’s from appearing inside Navigation block on front of site. ([46279](https://github.com/WordPress/gutenberg/pull/46279))
+-   Navigation link: Use stripHTML. ([46317](https://github.com/WordPress/gutenberg/pull/46317))
+-   Page List Block: Fix error loading page list parent options. ([46327](https://github.com/WordPress/gutenberg/pull/46327))
+-   Query Loop Block: Add migration of colors to v2 deprecation. ([46522](https://github.com/WordPress/gutenberg/pull/46522))
+-   Site Logo: Correctly set the image's natural height and width. ([46214](https://github.com/WordPress/gutenberg/pull/46214))
+-   Strip markup from link label data in inspector. ([46171](https://github.com/WordPress/gutenberg/pull/46171))
+-   Template Parts: Fix modal search stacking context. ([46421](https://github.com/WordPress/gutenberg/pull/46421))
+-   Video: Avoid an error when removal is locked. ([46324](https://github.com/WordPress/gutenberg/pull/46324))
+-   Layout child fixed size should not be fixed by default and should always have a value set. ([46139](https://github.com/WordPress/gutenberg/pull/46139))
 
 #### Blocks
-- Paste handler: Remove styles on inline paste. ([46402](https://github.com/WordPress/gutenberg/pull/46402))
-- Improve performance of gutenberg_render_layout_support_flag. ([46074](https://github.com/WordPress/gutenberg/pull/46074))
+
+-   Paste handler: Remove styles on inline paste. ([46402](https://github.com/WordPress/gutenberg/pull/46402))
+-   Improve performance of gutenberg_render_layout_support_flag. ([46074](https://github.com/WordPress/gutenberg/pull/46074))
 
 #### Global Styles
-- Allow indirect properties when unfiltered_html is not allowed. ([46388](https://github.com/WordPress/gutenberg/pull/46388))
-- Fix Reset to defaults action by moving fills to be within context provider. ([46486](https://github.com/WordPress/gutenberg/pull/46486))
-- Fix duplication of synced block colors in CSS output. ([46297](https://github.com/WordPress/gutenberg/pull/46297))
-- Make style book label font size 11px. ([46341](https://github.com/WordPress/gutenberg/pull/46341))
-- Style Book: Clear Global Styles navigation history when selecting a block. ([46391](https://github.com/WordPress/gutenberg/pull/46391))
-- Global Styles REST API endpoint: Check custom CSS is included before attempting to validate. ([46561](https://github.com/WordPress/gutenberg/pull/46561))
-- Reverts the custom CSS to an experiment while we resolve the handling of unfiltered html capabilities. ([46663](https://github.com/WordPress/gutenberg/pull/46663))
+
+-   Allow indirect properties when unfiltered_html is not allowed. ([46388](https://github.com/WordPress/gutenberg/pull/46388))
+-   Fix Reset to defaults action by moving fills to be within context provider. ([46486](https://github.com/WordPress/gutenberg/pull/46486))
+-   Fix duplication of synced block colors in CSS output. ([46297](https://github.com/WordPress/gutenberg/pull/46297))
+-   Make style book label font size 11px. ([46341](https://github.com/WordPress/gutenberg/pull/46341))
+-   Style Book: Clear Global Styles navigation history when selecting a block. ([46391](https://github.com/WordPress/gutenberg/pull/46391))
+-   Global Styles REST API endpoint: Check custom CSS is included before attempting to validate. ([46561](https://github.com/WordPress/gutenberg/pull/46561))
+-   Reverts the custom CSS to an experiment while we resolve the handling of unfiltered html capabilities. ([46663](https://github.com/WordPress/gutenberg/pull/46663))
 
 #### Block Editor
-- Block Editor: Fix content locked patterns. ([46494](https://github.com/WordPress/gutenberg/pull/46494))
-- Block Editor: Fix memoized pattern selector dependant arguments. ([46238](https://github.com/WordPress/gutenberg/pull/46238))
-- Block Editor: Restore draggable chip styles. ([46396](https://github.com/WordPress/gutenberg/pull/46396))
-- Block Editor: Revert deoptimization useNestedSettingsUpdate. ([46350](https://github.com/WordPress/gutenberg/pull/46350))
-- Block Editor: Fix some usages of useSelect that return unstable results. ([46226](https://github.com/WordPress/gutenberg/pull/46226))
-- useInnerBlockTemplateSync: Cancel template sync on innerBlocks change or unmount. ([46307](https://github.com/WordPress/gutenberg/pull/46307))
+
+-   Block Editor: Fix content locked patterns. ([46494](https://github.com/WordPress/gutenberg/pull/46494))
+-   Block Editor: Fix memoized pattern selector dependant arguments. ([46238](https://github.com/WordPress/gutenberg/pull/46238))
+-   Block Editor: Restore draggable chip styles. ([46396](https://github.com/WordPress/gutenberg/pull/46396))
+-   Block Editor: Revert deoptimization useNestedSettingsUpdate. ([46350](https://github.com/WordPress/gutenberg/pull/46350))
+-   Block Editor: Fix some usages of useSelect that return unstable results. ([46226](https://github.com/WordPress/gutenberg/pull/46226))
+-   useInnerBlockTemplateSync: Cancel template sync on innerBlocks change or unmount. ([46307](https://github.com/WordPress/gutenberg/pull/46307))
 
 #### Patterns
-- Add new pattern categories. ([46144](https://github.com/WordPress/gutenberg/pull/46144))
-- Block Editor: Add initial view mode in `BlockPatternSetup`. ([46399](https://github.com/WordPress/gutenberg/pull/46399))
+
+-   Add new pattern categories. ([46144](https://github.com/WordPress/gutenberg/pull/46144))
+-   Block Editor: Add initial view mode in `BlockPatternSetup`. ([46399](https://github.com/WordPress/gutenberg/pull/46399))
 
 #### Site Editor
-- Do not remount iframe. ([46431](https://github.com/WordPress/gutenberg/pull/46431))
-- Fix the top bar 'exit' animation. ([46533](https://github.com/WordPress/gutenberg/pull/46533))
-- Keep edited entity in sync when Editor canvas isn't mounted. ([46524](https://github.com/WordPress/gutenberg/pull/46524))
-- [Site Editor]: Add default white background for themes with no `background color` set. ([46314](https://github.com/WordPress/gutenberg/pull/46314))
+
+-   Do not remount iframe. ([46431](https://github.com/WordPress/gutenberg/pull/46431))
+-   Fix the top bar 'exit' animation. ([46533](https://github.com/WordPress/gutenberg/pull/46533))
+-   Keep edited entity in sync when Editor canvas isn't mounted. ([46524](https://github.com/WordPress/gutenberg/pull/46524))
+-   [Site Editor]: Add default white background for themes with no `background color` set. ([46314](https://github.com/WordPress/gutenberg/pull/46314))
 
 #### Components
-- InputControl: Fix `Flex` wrapper usage. ([46213](https://github.com/WordPress/gutenberg/pull/46213))
-- Modal: Fix unexpected modal closing in IME Composition. ([46453](https://github.com/WordPress/gutenberg/pull/46453))
-- MaybeCategoryPanel: Avoid 403 requests for users with low permissions. ([46349](https://github.com/WordPress/gutenberg/pull/46349))
-- Rich text: Add button to clear unknown format. ([44086](https://github.com/WordPress/gutenberg/pull/44086))
+
+-   InputControl: Fix `Flex` wrapper usage. ([46213](https://github.com/WordPress/gutenberg/pull/46213))
+-   Modal: Fix unexpected modal closing in IME Composition. ([46453](https://github.com/WordPress/gutenberg/pull/46453))
+-   MaybeCategoryPanel: Avoid 403 requests for users with low permissions. ([46349](https://github.com/WordPress/gutenberg/pull/46349))
+-   Rich text: Add button to clear unknown format. ([44086](https://github.com/WordPress/gutenberg/pull/44086))
 
 #### Document Settings
-- Fix template title in `summary` panel and requests for low privileged users. ([46304](https://github.com/WordPress/gutenberg/pull/46304))
-- Permalink: Hide edit field for users without publishing capabilities. ([46361](https://github.com/WordPress/gutenberg/pull/46361))
+
+-   Fix template title in `summary` panel and requests for low privileged users. ([46304](https://github.com/WordPress/gutenberg/pull/46304))
+-   Permalink: Hide edit field for users without publishing capabilities. ([46361](https://github.com/WordPress/gutenberg/pull/46361))
 
 #### Patterns
-- Content lock: Make filter hook namespace unique. ([46344](https://github.com/WordPress/gutenberg/pull/46344))
+
+-   Content lock: Make filter hook namespace unique. ([46344](https://github.com/WordPress/gutenberg/pull/46344))
 
 #### Layout
-- Child Layout controls: Fix help text for height. ([46319](https://github.com/WordPress/gutenberg/pull/46319))
+
+-   Child Layout controls: Fix help text for height. ([46319](https://github.com/WordPress/gutenberg/pull/46319))
 
 #### Widgets Editor
-- Shortcuts: Add Ctrl+Y for redo to all editor instances on Windows. ([43392](https://github.com/WordPress/gutenberg/pull/43392))
+
+-   Shortcuts: Add Ctrl+Y for redo to all editor instances on Windows. ([43392](https://github.com/WordPress/gutenberg/pull/43392))
 
 #### Block API
-- HTML block: Fix parsing. ([27268](https://github.com/WordPress/gutenberg/pull/27268))
+
+-   HTML block: Fix parsing. ([27268](https://github.com/WordPress/gutenberg/pull/27268))
 
 #### Mobile
-- Social Links mobile test: Wait for URL bottom sheet to appear. ([46308](https://github.com/WordPress/gutenberg/pull/46308))
+
+-   Social Links mobile test: Wait for URL bottom sheet to appear. ([46308](https://github.com/WordPress/gutenberg/pull/46308))
 
 ### Performance
 
 #### Components
-- Avoid paint on popover when hovering content. ([46201](https://github.com/WordPress/gutenberg/pull/46201))
-- CircularOption: Avoid paint on circular option hover. ([46197](https://github.com/WordPress/gutenberg/pull/46197))
-- Lodash: Replace `_.isEqual()` with `fastDeepEqual`. ([46200](https://github.com/WordPress/gutenberg/pull/46200))
-- Popover: Avoid paint on popovers when scrolling. ([46187](https://github.com/WordPress/gutenberg/pull/46187))
-- Resizable Box: Avoid paint on resizable-box handles. ([46196](https://github.com/WordPress/gutenberg/pull/46196))
-- ListView: Avoid paint on list view item hover. ([46188](https://github.com/WordPress/gutenberg/pull/46188))
+
+-   Avoid paint on popover when hovering content. ([46201](https://github.com/WordPress/gutenberg/pull/46201))
+-   CircularOption: Avoid paint on circular option hover. ([46197](https://github.com/WordPress/gutenberg/pull/46197))
+-   Lodash: Replace `_.isEqual()` with `fastDeepEqual`. ([46200](https://github.com/WordPress/gutenberg/pull/46200))
+-   Popover: Avoid paint on popovers when scrolling. ([46187](https://github.com/WordPress/gutenberg/pull/46187))
+-   Resizable Box: Avoid paint on resizable-box handles. ([46196](https://github.com/WordPress/gutenberg/pull/46196))
+-   ListView: Avoid paint on list view item hover. ([46188](https://github.com/WordPress/gutenberg/pull/46188))
 
 #### Code Quality
-- Lodash: Refactor `blocks` away from `_.find()`. ([46428](https://github.com/WordPress/gutenberg/pull/46428))
-- Lodash: Refactor `core-data` away from `_.find()`. ([46468](https://github.com/WordPress/gutenberg/pull/46468))
-- Lodash: Refactor `edit-site` away from `_.find()`. ([46539](https://github.com/WordPress/gutenberg/pull/46539))
-- Lodash: Refactor away from `_.orderBy()`. ([45146](https://github.com/WordPress/gutenberg/pull/45146))
-- Lodash: Refactor block library away from `_.find()`. ([46430](https://github.com/WordPress/gutenberg/pull/46430))
-- Remove usage of get_default_block_editor_settings. ([46112](https://github.com/WordPress/gutenberg/pull/46112))
+
+-   Lodash: Refactor `blocks` away from `_.find()`. ([46428](https://github.com/WordPress/gutenberg/pull/46428))
+-   Lodash: Refactor `core-data` away from `_.find()`. ([46468](https://github.com/WordPress/gutenberg/pull/46468))
+-   Lodash: Refactor `edit-site` away from `_.find()`. ([46539](https://github.com/WordPress/gutenberg/pull/46539))
+-   Lodash: Refactor away from `_.orderBy()`. ([45146](https://github.com/WordPress/gutenberg/pull/45146))
+-   Lodash: Refactor block library away from `_.find()`. ([46430](https://github.com/WordPress/gutenberg/pull/46430))
+-   Remove usage of get_default_block_editor_settings. ([46112](https://github.com/WordPress/gutenberg/pull/46112))
 
 #### Post Editor
-- Lodash: Refactor editor away from `_.find()`. ([46464](https://github.com/WordPress/gutenberg/pull/46464))
-- Lodash: Refactor post editor away from `_.find()`. ([46432](https://github.com/WordPress/gutenberg/pull/46432))
+
+-   Lodash: Refactor editor away from `_.find()`. ([46464](https://github.com/WordPress/gutenberg/pull/46464))
+-   Lodash: Refactor post editor away from `_.find()`. ([46432](https://github.com/WordPress/gutenberg/pull/46432))
 
 #### Block Editor
-- Avoid paint on inserter animation. ([46185](https://github.com/WordPress/gutenberg/pull/46185))
-- Improve inserter search performance. ([46153](https://github.com/WordPress/gutenberg/pull/46153))
-- Block Editor: Refactor the "order" state in the block editor reducer to use a map instead of a plain object. ([46221](https://github.com/WordPress/gutenberg/pull/46221))
-- Block Editor: Refactor the block-editor parents state to use maps instead of objects. ([46225](https://github.com/WordPress/gutenberg/pull/46225))
-- Refactor the block-editor "tree" state to use maps instead of objects. ([46229](https://github.com/WordPress/gutenberg/pull/46229))
-- Refactor the block-editor byClientId redux state to use maps instead of plain objects. ([46204](https://github.com/WordPress/gutenberg/pull/46204))
-- Fix typing performance issue for container blocks. ([46527](https://github.com/WordPress/gutenberg/pull/46527))
+
+-   Avoid paint on inserter animation. ([46185](https://github.com/WordPress/gutenberg/pull/46185))
+-   Improve inserter search performance. ([46153](https://github.com/WordPress/gutenberg/pull/46153))
+-   Block Editor: Refactor the "order" state in the block editor reducer to use a map instead of a plain object. ([46221](https://github.com/WordPress/gutenberg/pull/46221))
+-   Block Editor: Refactor the block-editor parents state to use maps instead of objects. ([46225](https://github.com/WordPress/gutenberg/pull/46225))
+-   Refactor the block-editor "tree" state to use maps instead of objects. ([46229](https://github.com/WordPress/gutenberg/pull/46229))
+-   Refactor the block-editor byClientId redux state to use maps instead of plain objects. ([46204](https://github.com/WordPress/gutenberg/pull/46204))
+-   Fix typing performance issue for container blocks. ([46527](https://github.com/WordPress/gutenberg/pull/46527))
 
 #### Testing
-- E2E: Fix performance tests by making inserter search container waiting optional. ([46268](https://github.com/WordPress/gutenberg/pull/46268))
+
+-   E2E: Fix performance tests by making inserter search container waiting optional. ([46268](https://github.com/WordPress/gutenberg/pull/46268))
 
 #### Mobile
-- Columns mobile block: Avoid returning unstable innerWidths from useSelect. ([46403](https://github.com/WordPress/gutenberg/pull/46403))
+
+-   Columns mobile block: Avoid returning unstable innerWidths from useSelect. ([46403](https://github.com/WordPress/gutenberg/pull/46403))
 
 ### Experiments
 
 #### Block Library
-- Navigation List View: Remove empty cell when there is no edit button. ([46439](https://github.com/WordPress/gutenberg/pull/46439))
+
+-   Navigation List View: Remove empty cell when there is no edit button. ([46439](https://github.com/WordPress/gutenberg/pull/46439))
 
 #### Web Fonts
-- WP Webfonts: Avoid duplicated font families if the font family name was defined using fallback values. ([46378](https://github.com/WordPress/gutenberg/pull/46378))
+
+-   WP Webfonts: Avoid duplicated font families if the font family name was defined using fallback values. ([46378](https://github.com/WordPress/gutenberg/pull/46378))
 
 ### Documentation
-- Adds clarifications and clears up inaccuracies. ([46283](https://github.com/WordPress/gutenberg/pull/46283))
-- Adds details of how to find the .zip file. ([46305](https://github.com/WordPress/gutenberg/pull/46305))
-- Doc: Fix description and documentation for link color support. ([46405](https://github.com/WordPress/gutenberg/pull/46405))
-- Docs: Add missing useState import in BorderBoxControl documentation. ([42067](https://github.com/WordPress/gutenberg/pull/42067))
-- Docs: Add missing useState import in color picker docs. ([42069](https://github.com/WordPress/gutenberg/pull/42069))
-- Docs: Add missing useState import in confirm dialog docs. ([42071](https://github.com/WordPress/gutenberg/pull/42071))
-- Docs: Adds reminder to use Node.js v14 in Quick Start. ([46216](https://github.com/WordPress/gutenberg/pull/46216))
-- Docs: Fix missing link to `primitives` package. ([46290](https://github.com/WordPress/gutenberg/pull/46290))
-- Docs: Update reference to IE 11. ([46296](https://github.com/WordPress/gutenberg/pull/46296))
+
+-   Adds clarifications and clears up inaccuracies. ([46283](https://github.com/WordPress/gutenberg/pull/46283))
+-   Adds details of how to find the .zip file. ([46305](https://github.com/WordPress/gutenberg/pull/46305))
+-   Doc: Fix description and documentation for link color support. ([46405](https://github.com/WordPress/gutenberg/pull/46405))
+-   Docs: Add missing useState import in BorderBoxControl documentation. ([42067](https://github.com/WordPress/gutenberg/pull/42067))
+-   Docs: Add missing useState import in color picker docs. ([42069](https://github.com/WordPress/gutenberg/pull/42069))
+-   Docs: Add missing useState import in confirm dialog docs. ([42071](https://github.com/WordPress/gutenberg/pull/42071))
+-   Docs: Adds reminder to use Node.js v14 in Quick Start. ([46216](https://github.com/WordPress/gutenberg/pull/46216))
+-   Docs: Fix missing link to `primitives` package. ([46290](https://github.com/WordPress/gutenberg/pull/46290))
+-   Docs: Update reference to IE 11. ([46296](https://github.com/WordPress/gutenberg/pull/46296))
 
 ### Code Quality
-- Block Editor: Fix `no-node-access` violations in `BlockPreview`. ([46409](https://github.com/WordPress/gutenberg/pull/46409))
-- Block Editor: Fix `no-node-access` violations in `BlockSelectionClearer`. ([46408](https://github.com/WordPress/gutenberg/pull/46408))
-- Columns mobile edit: Remove unused updateBlockSettings action bind. ([46455](https://github.com/WordPress/gutenberg/pull/46455))
-- ESLint: Fix warning in `getBlockAttribute` documentation. ([46500](https://github.com/WordPress/gutenberg/pull/46500))
-- List View: Use default parameters instead of defaultProps. ([46266](https://github.com/WordPress/gutenberg/pull/46266))
-- Removed: Remove small APIs marked to be removed in WP 6.2. ([46106](https://github.com/WordPress/gutenberg/pull/46106))
-- Site Editor: Remove invalid CSS. ([46288](https://github.com/WordPress/gutenberg/pull/46288))
-
-#### Block Library
-- Group Block: Remove placeholder leftovers. ([46423](https://github.com/WordPress/gutenberg/pull/46423))
-- Group: Remove unnecessary 'useCallback'. ([46418](https://github.com/WordPress/gutenberg/pull/46418))
-- Navigation Block: Add tests for Nav block uncontrolled blocks dirty state checking. ([46329](https://github.com/WordPress/gutenberg/pull/46329))
-- Navigation Block: Update attribute test for `are-blocks-dirty.js`. ([46355](https://github.com/WordPress/gutenberg/pull/46355))
-- Page List Block: Move shared "convert" description to constant. ([46368](https://github.com/WordPress/gutenberg/pull/46368))
-- Page List Block: Simplify Page List convert to links function API. ([46365](https://github.com/WordPress/gutenberg/pull/46365))
-- Query: Cleanup variation picker component. ([46424](https://github.com/WordPress/gutenberg/pull/46424))
-- RNMobile: Add an inline comment to clarify usage of 'hard' limit vs. unbounded query. ([46245](https://github.com/WordPress/gutenberg/pull/46245))
-- Shared standard Link UI component between Nav Link and Submenu blocks. ([46370](https://github.com/WordPress/gutenberg/pull/46370))
-- Template Parts: Remove unnecessary 'useCallback'. ([46420](https://github.com/WordPress/gutenberg/pull/46420))
-
-#### Components
-- AlignmentMatrixControl: Refactor to TypeScript. ([46162](https://github.com/WordPress/gutenberg/pull/46162))
-- Also ignore `no-node-access` for some components. ([46501](https://github.com/WordPress/gutenberg/pull/46501))
-- Fix `no-node-access` violations in `FocalPointPicker` tests. ([46312](https://github.com/WordPress/gutenberg/pull/46312))
-- Fix `no-node-access` violations in `Popover`. ([46311](https://github.com/WordPress/gutenberg/pull/46311))
-- Fix `no-node-access` violations in `Theme`. ([46310](https://github.com/WordPress/gutenberg/pull/46310))
-- Fix `no-node-access` violations in `ToolsPanel` tests. ([46313](https://github.com/WordPress/gutenberg/pull/46313))
-- withFilters: Use 'act' from React Testing Library. ([46237](https://github.com/WordPress/gutenberg/pull/46237))
+
+-   Block Editor: Fix `no-node-access` violations in `BlockPreview`. ([46409](https://github.com/WordPress/gutenberg/pull/46409))
+-   Block Editor: Fix `no-node-access` violations in `BlockSelectionClearer`. ([46408](https://github.com/WordPress/gutenberg/pull/46408))
+-   Columns mobile edit: Remove unused updateBlockSettings action bind. ([46455](https://github.com/WordPress/gutenberg/pull/46455))
+-   ESLint: Fix warning in `getBlockAttribute` documentation. ([46500](https://github.com/WordPress/gutenberg/pull/46500))
+-   List View: Use default parameters instead of defaultProps. ([46266](https://github.com/WordPress/gutenberg/pull/46266))
+-   Removed: Remove small APIs marked to be removed in WP 6.2. ([46106](https://github.com/WordPress/gutenberg/pull/46106))
+-   Site Editor: Remove invalid CSS. ([46288](https://github.com/WordPress/gutenberg/pull/46288))
+
+#### Block Library
+
+-   Group Block: Remove placeholder leftovers. ([46423](https://github.com/WordPress/gutenberg/pull/46423))
+-   Group: Remove unnecessary 'useCallback'. ([46418](https://github.com/WordPress/gutenberg/pull/46418))
+-   Navigation Block: Add tests for Nav block uncontrolled blocks dirty state checking. ([46329](https://github.com/WordPress/gutenberg/pull/46329))
+-   Navigation Block: Update attribute test for `are-blocks-dirty.js`. ([46355](https://github.com/WordPress/gutenberg/pull/46355))
+-   Page List Block: Move shared "convert" description to constant. ([46368](https://github.com/WordPress/gutenberg/pull/46368))
+-   Page List Block: Simplify Page List convert to links function API. ([46365](https://github.com/WordPress/gutenberg/pull/46365))
+-   Query: Cleanup variation picker component. ([46424](https://github.com/WordPress/gutenberg/pull/46424))
+-   RNMobile: Add an inline comment to clarify usage of 'hard' limit vs. unbounded query. ([46245](https://github.com/WordPress/gutenberg/pull/46245))
+-   Shared standard Link UI component between Nav Link and Submenu blocks. ([46370](https://github.com/WordPress/gutenberg/pull/46370))
+-   Template Parts: Remove unnecessary 'useCallback'. ([46420](https://github.com/WordPress/gutenberg/pull/46420))
+
+#### Components
+
+-   AlignmentMatrixControl: Refactor to TypeScript. ([46162](https://github.com/WordPress/gutenberg/pull/46162))
+-   Also ignore `no-node-access` for some components. ([46501](https://github.com/WordPress/gutenberg/pull/46501))
+-   Fix `no-node-access` violations in `FocalPointPicker` tests. ([46312](https://github.com/WordPress/gutenberg/pull/46312))
+-   Fix `no-node-access` violations in `Popover`. ([46311](https://github.com/WordPress/gutenberg/pull/46311))
+-   Fix `no-node-access` violations in `Theme`. ([46310](https://github.com/WordPress/gutenberg/pull/46310))
+-   Fix `no-node-access` violations in `ToolsPanel` tests. ([46313](https://github.com/WordPress/gutenberg/pull/46313))
+-   withFilters: Use 'act' from React Testing Library. ([46237](https://github.com/WordPress/gutenberg/pull/46237))
 
 #### Data Layer
-- Data: Add ability to subscribe to one store, remove __unstableSubscribeStore. ([45513](https://github.com/WordPress/gutenberg/pull/45513))
-- ESLint: Fix warnings in the data package. ([46499](https://github.com/WordPress/gutenberg/pull/46499))
+
+-   Data: Add ability to subscribe to one store, remove \_\_unstableSubscribeStore. ([45513](https://github.com/WordPress/gutenberg/pull/45513))
+-   ESLint: Fix warnings in the data package. ([46499](https://github.com/WordPress/gutenberg/pull/46499))
 
 #### Global Styles
-- Add "custom-css" as an acceptable value in the documentation for gutenberg_get_global_stylesheet. ([46493](https://github.com/WordPress/gutenberg/pull/46493))
-- PaletteEdit: Add changelog. ([46095](https://github.com/WordPress/gutenberg/pull/46095))
+
+-   Add "custom-css" as an acceptable value in the documentation for gutenberg_get_global_stylesheet. ([46493](https://github.com/WordPress/gutenberg/pull/46493))
+-   PaletteEdit: Add changelog. ([46095](https://github.com/WordPress/gutenberg/pull/46095))
 
 #### Block Editor
-- Inserter: Update mobile tab navigation styles. ([46186](https://github.com/WordPress/gutenberg/pull/46186))
+
+-   Inserter: Update mobile tab navigation styles. ([46186](https://github.com/WordPress/gutenberg/pull/46186))
 
 #### Layout
-- Clarify inline comment about switching to `safecss_filter_attr`. ([46061](https://github.com/WordPress/gutenberg/pull/46061))
+
+-   Clarify inline comment about switching to `safecss_filter_attr`. ([46061](https://github.com/WordPress/gutenberg/pull/46061))
 
 ### Tools
 
 #### Build Tooling
-- Adds Github Action to validate Gradle Wrapper. ([46247](https://github.com/WordPress/gutenberg/pull/46247))
-- Prevent api-fetch and core-data from being imported in the block editor package. ([46302](https://github.com/WordPress/gutenberg/pull/46302))
-- Serialize the map objects properly in the Redux dev tools. ([46282](https://github.com/WordPress/gutenberg/pull/46282))
+
+-   Adds GitHub Action to validate Gradle Wrapper. ([46247](https://github.com/WordPress/gutenberg/pull/46247))
+-   Prevent api-fetch and core-data from being imported in the block editor package. ([46302](https://github.com/WordPress/gutenberg/pull/46302))
+-   Serialize the map objects properly in the Redux dev tools. ([46282](https://github.com/WordPress/gutenberg/pull/46282))
 
 #### Testing
-- E2E: Fix flaky Block Switcher tests. ([46406](https://github.com/WordPress/gutenberg/pull/46406))
-- end-to-end tests: Add width and color test to button block. ([46452](https://github.com/WordPress/gutenberg/pull/46452))
 
+-   E2E: Fix flaky Block Switcher tests. ([46406](https://github.com/WordPress/gutenberg/pull/46406))
+-   end-to-end tests: Add width and color test to button block. ([46452](https://github.com/WordPress/gutenberg/pull/46452))
 
-## First time contributors
-
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @corentin-gautier: Avoid paint on popover when hovering content. ([46201](https://github.com/WordPress/gutenberg/pull/46201))
-- @ingeniumed: Expose before filter hook in useSettings for injecting block settings in the editor. ([45089](https://github.com/WordPress/gutenberg/pull/45089))
-- @janusqa: Reusable block: Pluralize the message "Convert to regular blocks" depending on the number of blocks contained. ([45819](https://github.com/WordPress/gutenberg/pull/45819))
+The following PRs were merged by first-time contributors:
 
+-   @corentin-gautier: Avoid paint on popover when hovering content. ([46201](https://github.com/WordPress/gutenberg/pull/46201))
+-   @ingeniumed: Expose before filter hook in useSettings for injecting block settings in the editor. ([45089](https://github.com/WordPress/gutenberg/pull/45089))
+-   @janusqa: Reusable block: Pluralize the message "Convert to regular blocks" depending on the number of blocks contained. ([45819](https://github.com/WordPress/gutenberg/pull/45819))
 
 ## Contributors
 
@@ -9738,38 +20977,31 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @ajlende @andrewserong @aristath @chad1008 @chintu51 @corentin-gautier @derekblank @draganescu @ellatrix @geriux @getdave @glendaviesnz @hideokamoto @ingeniumed @jameskoster @janusqa @jasmussen @jffng @jorgefilipecosta @jsnajdr @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @mburridge @mikachan @mirka @noisysocks @ntsekouras @oandregal @oguzkocer @ramonjd @scruffian @SiobhyB @spacedmonkey @t-hamano @talldan @tellthemachines @tyxla @WunderBart @youknowriad
 
-
 = 14.7.3 =
 
 ## Changelog
 
 ### Bug fixes
 
-- Fix typing performance issue for container blocks. ([46527](https://github.com/WordPress/gutenberg/pull/46527))
+-   Fix typing performance issue for container blocks. ([46527](https://github.com/WordPress/gutenberg/pull/46527))
 
 ## Contributors
 
 The following contributors merged PRs in this release:
 
-@youknowriad 
-
+@youknowriad
 
 = 14.7.2 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
-- Fix fatal error when using the plugin with PHP 8 and WordPress 6.0 by checking if block_type asset properties are set. ([46488](https://github.com/WordPress/gutenberg/pull/46488))
-
-
-## First time contributors
-
-The following PRs were merged by first time contributors:
+-   Fix fatal error when using the plugin with PHP 8 and WordPress 6.0 by checking if block_type asset properties are set. ([46488](https://github.com/WordPress/gutenberg/pull/46488))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -9777,17 +21009,15 @@ The following contributors merged PRs in this release:
 
 @noahtallen
 
-
 = 14.7.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Layout
-- Only pass parentLayout to block edit if not empty. ([46390](https://github.com/WordPress/gutenberg/pull/46390))
+
+-   Only pass parentLayout to block edit if not empty. ([46390](https://github.com/WordPress/gutenberg/pull/46390))
 
 ## Contributors
 
@@ -9795,257 +21025,280 @@ The following contributors merged PRs in this release:
 
 @tellthemachines
 
-
 = 14.7.0 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
 #### Style Engine
-- Style engine: Trim multiple selector strings. ([45873](https://github.com/WordPress/gutenberg/pull/45873))
-
-#### Block Library
-- Heading Block: Add a wp-block-heading CSS class. ([42122](https://github.com/WordPress/gutenberg/pull/42122))
-- Nav Block: Clarify explanation of how 'Convert to Links' works in Page List block. ([45394](https://github.com/WordPress/gutenberg/pull/45394))
-- Nav Block: Add label field to navigation link and navigation submenu. ([45964](https://github.com/WordPress/gutenberg/pull/45964))
-- Nav Block: Add link URL to the navigation submenu inspector controls. ([45816](https://github.com/WordPress/gutenberg/pull/45816))
-- Nav Block: Fix for navigation anchor links to close modal. ([45829](https://github.com/WordPress/gutenberg/pull/45829))
-- Template Part Block: Colorize template parts and Reusable blocks. ([45473](https://github.com/WordPress/gutenberg/pull/45473))
-- List: Allow pasting pre/code. ([45016](https://github.com/WordPress/gutenberg/pull/45016))
-- Page List: Enable page list to expand in list view. ([45776](https://github.com/WordPress/gutenberg/pull/45776))
-- Page List: Add a starting page for page list block's hierarchy. ([45861](https://github.com/WordPress/gutenberg/pull/45861))
-- Page List Item: Hide edit button. ([46163](https://github.com/WordPress/gutenberg/pull/46163))
-- Site Logo: Apply width to logo container in editor. ([45821](https://github.com/WordPress/gutenberg/pull/45821))
-- Table Block: Support colspan attribute in table HTML, including when pasting. ([45981](https://github.com/WordPress/gutenberg/pull/45981))
-
-#### Components
-- Add themeable background color. ([45466](https://github.com/WordPress/gutenberg/pull/45466))
-- Autocomplete: Only show UI on user input. ([45904](https://github.com/WordPress/gutenberg/pull/45904))
-- Bump `DateTimePicker` deprecated prop removal version. ([46006](https://github.com/WordPress/gutenberg/pull/46006))
-- ComboboxControl: Add new opt-in prop. ([45796](https://github.com/WordPress/gutenberg/pull/45796))
-- FocalPointPicker: Add new opt-in prop. ([45958](https://github.com/WordPress/gutenberg/pull/45958))
-- Global styles: Add onChange actions to color palette items. ([45681](https://github.com/WordPress/gutenberg/pull/45681))
-- InputControl: Add `help` prop. ([45931](https://github.com/WordPress/gutenberg/pull/45931))
-- RangeControl: Remove margin override and add new opt-in prop. ([45985](https://github.com/WordPress/gutenberg/pull/45985))
-- SearchControl: Remove margin overrides and add new opt-in prop. ([46081](https://github.com/WordPress/gutenberg/pull/46081))
-- Storybook: Opt in to story store v7. ([42486](https://github.com/WordPress/gutenberg/pull/42486))
-- ToggleControl text overflows when it has a long label. ([45962](https://github.com/WordPress/gutenberg/pull/45962))
-- useControlledValue: Let TypeScript infer the return type. ([46164](https://github.com/WordPress/gutenberg/pull/46164))
+
+-   Style engine: Trim multiple selector strings. ([45873](https://github.com/WordPress/gutenberg/pull/45873))
+
+#### Block Library
+
+-   Heading Block: Add a wp-block-heading CSS class. ([42122](https://github.com/WordPress/gutenberg/pull/42122))
+-   Nav Block: Clarify explanation of how 'Convert to Links' works in Page List block. ([45394](https://github.com/WordPress/gutenberg/pull/45394))
+-   Nav Block: Add label field to navigation link and navigation submenu. ([45964](https://github.com/WordPress/gutenberg/pull/45964))
+-   Nav Block: Add link URL to the navigation submenu inspector controls. ([45816](https://github.com/WordPress/gutenberg/pull/45816))
+-   Nav Block: Fix for navigation anchor links to close modal. ([45829](https://github.com/WordPress/gutenberg/pull/45829))
+-   Template Part Block: Colorize template parts and Reusable blocks. ([45473](https://github.com/WordPress/gutenberg/pull/45473))
+-   List: Allow pasting pre/code. ([45016](https://github.com/WordPress/gutenberg/pull/45016))
+-   Page List: Enable page list to expand in list view. ([45776](https://github.com/WordPress/gutenberg/pull/45776))
+-   Page List: Add a starting page for page list block's hierarchy. ([45861](https://github.com/WordPress/gutenberg/pull/45861))
+-   Page List Item: Hide edit button. ([46163](https://github.com/WordPress/gutenberg/pull/46163))
+-   Site Logo: Apply width to logo container in editor. ([45821](https://github.com/WordPress/gutenberg/pull/45821))
+-   Table Block: Support colspan attribute in table HTML, including when pasting. ([45981](https://github.com/WordPress/gutenberg/pull/45981))
+
+#### Components
+
+-   Add themeable background color. ([45466](https://github.com/WordPress/gutenberg/pull/45466))
+-   Autocomplete: Only show UI on user input. ([45904](https://github.com/WordPress/gutenberg/pull/45904))
+-   Bump `DateTimePicker` deprecated prop removal version. ([46006](https://github.com/WordPress/gutenberg/pull/46006))
+-   ComboboxControl: Add new opt-in prop. ([45796](https://github.com/WordPress/gutenberg/pull/45796))
+-   FocalPointPicker: Add new opt-in prop. ([45958](https://github.com/WordPress/gutenberg/pull/45958))
+-   Global styles: Add onChange actions to color palette items. ([45681](https://github.com/WordPress/gutenberg/pull/45681))
+-   InputControl: Add `help` prop. ([45931](https://github.com/WordPress/gutenberg/pull/45931))
+-   RangeControl: Remove margin override and add new opt-in prop. ([45985](https://github.com/WordPress/gutenberg/pull/45985))
+-   SearchControl: Remove margin overrides and add new opt-in prop. ([46081](https://github.com/WordPress/gutenberg/pull/46081))
+-   Storybook: Opt in to story store v7. ([42486](https://github.com/WordPress/gutenberg/pull/42486))
+-   ToggleControl text overflows when it has a long label. ([45962](https://github.com/WordPress/gutenberg/pull/45962))
+-   useControlledValue: Let TypeScript infer the return type. ([46164](https://github.com/WordPress/gutenberg/pull/46164))
 
 #### Inspector Controls
-- Sidebar: Add list view tab for Navigation block et al. ([45483](https://github.com/WordPress/gutenberg/pull/45483))
-- Sidebar: Only render sidebar tabs possessing items to display. ([45991](https://github.com/WordPress/gutenberg/pull/45991))
-- Sidebar: Rename appearance tab to styles. ([46027](https://github.com/WordPress/gutenberg/pull/46027))
-- Sidebar: Split block tools into menu, settings, and appearance tabs. ([45005](https://github.com/WordPress/gutenberg/pull/45005))
+
+-   Sidebar: Add list view tab for Navigation block et al. ([45483](https://github.com/WordPress/gutenberg/pull/45483))
+-   Sidebar: Only render sidebar tabs possessing items to display. ([45991](https://github.com/WordPress/gutenberg/pull/45991))
+-   Sidebar: Rename appearance tab to styles. ([46027](https://github.com/WordPress/gutenberg/pull/46027))
+-   Sidebar: Split block tools into menu, settings, and appearance tabs. ([45005](https://github.com/WordPress/gutenberg/pull/45005))
 
 #### Design Tools
-- Min Height: Add height control component with slider. ([45875](https://github.com/WordPress/gutenberg/pull/45875))
-- Spacing: Make  visualiser appear on focus. ([46096](https://github.com/WordPress/gutenberg/pull/46096))
+
+-   Min Height: Add height control component with slider. ([45875](https://github.com/WordPress/gutenberg/pull/45875))
+-   Spacing: Make visualiser appear on focus. ([46096](https://github.com/WordPress/gutenberg/pull/46096))
 
 #### Block Editor
-- [Inserter]: Replace text in `Reusable` tab with an icon. ([45851](https://github.com/WordPress/gutenberg/pull/45851))
-- [Inserter]: Update pattern explorer button css. ([45735](https://github.com/WordPress/gutenberg/pull/45735))
-- [Inserter]: Add media tab. ([44918](https://github.com/WordPress/gutenberg/pull/44918))
+
+-   [Inserter]: Replace text in `Reusable` tab with an icon. ([45851](https://github.com/WordPress/gutenberg/pull/45851))
+-   [Inserter]: Update pattern explorer button css. ([45735](https://github.com/WordPress/gutenberg/pull/45735))
+-   [Inserter]: Add media tab. ([44918](https://github.com/WordPress/gutenberg/pull/44918))
 
 #### Patterns
-- [Pattern Directory]: Add categories endpoint. ([45749](https://github.com/WordPress/gutenberg/pull/45749))
-- [Patterns]: Update pattern category descriptions. ([46005](https://github.com/WordPress/gutenberg/pull/46005))
+
+-   [Pattern Directory]: Add categories endpoint. ([45749](https://github.com/WordPress/gutenberg/pull/45749))
+-   [Patterns]: Update pattern category descriptions. ([46005](https://github.com/WordPress/gutenberg/pull/46005))
 
 #### Nested / Inner Blocks
-- Mark applying block templates not persistent. ([45843](https://github.com/WordPress/gutenberg/pull/45843))
+
+-   Mark applying block templates not persistent. ([45843](https://github.com/WordPress/gutenberg/pull/45843))
 
 #### Rich Text
-- Create undo level before autocorrect. ([45670](https://github.com/WordPress/gutenberg/pull/45670))
+
+-   Create undo level before autocorrect. ([45670](https://github.com/WordPress/gutenberg/pull/45670))
 
 #### Layout
-- Add Layout controls to children of Flex layout blocks. ([45364](https://github.com/WordPress/gutenberg/pull/45364))
 
+-   Add Layout controls to children of Flex layout blocks. ([45364](https://github.com/WordPress/gutenberg/pull/45364))
 
 ### Bug Fixes
 
 #### Preferences
-- Disable distraction free prefference effects on small viewports. ([45591](https://github.com/WordPress/gutenberg/pull/45591))
+
+-   Disable distraction free prefference effects on small viewports. ([45591](https://github.com/WordPress/gutenberg/pull/45591))
 
 #### Block Library
-- List Block: Fixed a bug that List block attributes were reset in 6.1.1. ([46000](https://github.com/WordPress/gutenberg/pull/46000))
-- Gallery: Use unbound query when fetching image details. ([46143](https://github.com/WordPress/gutenberg/pull/46143))
-- Heading: Add block classname deprecation. ([46138](https://github.com/WordPress/gutenberg/pull/46138))
-- Page List: If no parent page is set, still render all children. ([45967](https://github.com/WordPress/gutenberg/pull/45967))
-- Page List: Render the children correctly in the editor. ([46165](https://github.com/WordPress/gutenberg/pull/46165))
-- Post Author: Avoid errors when the user avatars are disabled. ([45989](https://github.com/WordPress/gutenberg/pull/45989))
-- Nav Block: Navigation menu doesn't appear when hamburger clicked on. ([45773](https://github.com/WordPress/gutenberg/pull/45773))
+
+-   List Block: Fixed a bug that List block attributes were reset in 6.1.1. ([46000](https://github.com/WordPress/gutenberg/pull/46000))
+-   Gallery: Use unbound query when fetching image details. ([46143](https://github.com/WordPress/gutenberg/pull/46143))
+-   Heading: Add block classname deprecation. ([46138](https://github.com/WordPress/gutenberg/pull/46138))
+-   Page List: If no parent page is set, still render all children. ([45967](https://github.com/WordPress/gutenberg/pull/45967))
+-   Page List: Render the children correctly in the editor. ([46165](https://github.com/WordPress/gutenberg/pull/46165))
+-   Post Author: Avoid errors when the user avatars are disabled. ([45989](https://github.com/WordPress/gutenberg/pull/45989))
+-   Nav Block: Navigation menu doesn't appear when hamburger clicked on. ([45773](https://github.com/WordPress/gutenberg/pull/45773))
 
 #### Block Editor
-- Fix broken Link Control hook. ([46113](https://github.com/WordPress/gutenberg/pull/46113))
-- Fix inserter tab panel content buttons' position. ([45800](https://github.com/WordPress/gutenberg/pull/45800))
-- Block editor: rich text: Return early if __experimentalUndo is not defined. ([46152](https://github.com/WordPress/gutenberg/pull/46152))
+
+-   Fix broken Link Control hook. ([46113](https://github.com/WordPress/gutenberg/pull/46113))
+-   Fix inserter tab panel content buttons' position. ([45800](https://github.com/WordPress/gutenberg/pull/45800))
+-   Block editor: rich text: Return early if \_\_experimentalUndo is not defined. ([46152](https://github.com/WordPress/gutenberg/pull/46152))
 
 #### Global Styles
-- Global Style Context: Consider global user styles ready if a theme has none. ([46073](https://github.com/WordPress/gutenberg/pull/46073))
-- Merged data should consider origin to return early. ([45969](https://github.com/WordPress/gutenberg/pull/45969))
+
+-   Global Style Context: Consider global user styles ready if a theme has none. ([46073](https://github.com/WordPress/gutenberg/pull/46073))
+-   Merged data should consider origin to return early. ([45969](https://github.com/WordPress/gutenberg/pull/45969))
 
 #### Components
-- Remove CircleIndicatorWrapper `focus-visible` outline. ([45758](https://github.com/WordPress/gutenberg/pull/45758))
-- `ColorPalette`: Show `Clear` button even when `colors` array is empty. ([46001](https://github.com/WordPress/gutenberg/pull/46001))
+
+-   Remove CircleIndicatorWrapper `focus-visible` outline. ([45758](https://github.com/WordPress/gutenberg/pull/45758))
+-   `ColorPalette`: Show `Clear` button even when `colors` array is empty. ([46001](https://github.com/WordPress/gutenberg/pull/46001))
 
 #### Site Editor
-- Fix template list width. ([45888](https://github.com/WordPress/gutenberg/pull/45888))
-- Prevent edit-post from being loaded in edit-site. ([45895](https://github.com/WordPress/gutenberg/pull/45895))
+
+-   Fix template list width. ([45888](https://github.com/WordPress/gutenberg/pull/45888))
+-   Prevent edit-post from being loaded in edit-site. ([45895](https://github.com/WordPress/gutenberg/pull/45895))
 
 #### CSS & Styling
-- Fix the editor area height. ([45799](https://github.com/WordPress/gutenberg/pull/45799))
+
+-   Fix the editor area height. ([45799](https://github.com/WordPress/gutenberg/pull/45799))
 
 #### Full Site Editing
-- Ensure post-featured-image block is in_the_loop() for BC with core and plugins, and to fix lazy-loading. ([45534](https://github.com/WordPress/gutenberg/pull/45534))
+
+-   Ensure post-featured-image block is in_the_loop() for BC with core and plugins, and to fix lazy-loading. ([45534](https://github.com/WordPress/gutenberg/pull/45534))
 
 ### Accessibility
 
-- Add "Testing Instructions for Keyboard" to PR template to encourage accessibility testing. ([45957](https://github.com/WordPress/gutenberg/pull/45957))
-- BlockVariationPicker: Remove Unnecessary ARIA Role. ([45916](https://github.com/WordPress/gutenberg/pull/45916))
-- Sidebar Tabs: Set default tab to first available. ([45998](https://github.com/WordPress/gutenberg/pull/45998))
-- `TabPanel`: Support manual tab activation. ([46004](https://github.com/WordPress/gutenberg/pull/46004))
-- - Constrained tabbing: Fix unstable behavior in firefox. ([42653](https://github.com/WordPress/gutenberg/pull/42653))
+-   Add "Testing Instructions for Keyboard" to PR template to encourage accessibility testing. ([45957](https://github.com/WordPress/gutenberg/pull/45957))
+-   BlockVariationPicker: Remove Unnecessary ARIA Role. ([45916](https://github.com/WordPress/gutenberg/pull/45916))
+-   Sidebar Tabs: Set default tab to first available. ([45998](https://github.com/WordPress/gutenberg/pull/45998))
+-   `TabPanel`: Support manual tab activation. ([46004](https://github.com/WordPress/gutenberg/pull/46004))
+-   -   Constrained tabbing: Fix unstable behavior in firefox. ([42653](https://github.com/WordPress/gutenberg/pull/42653))
 
 ### Performance
 
-- Work on refactor away from Lodash to reduce build size continued" ([see 13.7](https://make.wordpress.org/core/2022/07/20/whats-new-in-gutenberg-13-7-20-july/))
+-   Work on refactor away from Lodash to reduce build size continued" ([see 13.7](https://make.wordpress.org/core/2022/07/20/whats-new-in-gutenberg-13-7-20-july/))
 
 #### Global Styles
-- Add `WP_Object_Cache` to the `gutenberg_get_global_settings` method. ([45372](https://github.com/WordPress/gutenberg/pull/45372))
-- Global styles WP_Query. ([46043](https://github.com/WordPress/gutenberg/pull/46043))
-- Ignore cached `wp_theme_has_theme_json` when `WP_DEBUG` is enabled. ([45882](https://github.com/WordPress/gutenberg/pull/45882))
-- Make `theme.json` object caches non persistent. ([46150](https://github.com/WordPress/gutenberg/pull/46150))
-- Remove `test_global_styles_user_cpt_change_invalidates_cached_stylesheet`. ([45993](https://github.com/WordPress/gutenberg/pull/45993))
-- Update `gutenberg_get_global_stylesheet` to use `WP_Object_Cache`. ([45679](https://github.com/WordPress/gutenberg/pull/45679))
-- Update which origins are queried for `gutenberg_get_global_settings`. ([45971](https://github.com/WordPress/gutenberg/pull/45971))
+
+-   Add `WP_Object_Cache` to the `gutenberg_get_global_settings` method. ([45372](https://github.com/WordPress/gutenberg/pull/45372))
+-   Global styles WP_Query. ([46043](https://github.com/WordPress/gutenberg/pull/46043))
+-   Ignore cached `wp_theme_has_theme_json` when `WP_DEBUG` is enabled. ([45882](https://github.com/WordPress/gutenberg/pull/45882))
+-   Make `theme.json` object caches non persistent. ([46150](https://github.com/WordPress/gutenberg/pull/46150))
+-   Remove `test_global_styles_user_cpt_change_invalidates_cached_stylesheet`. ([45993](https://github.com/WordPress/gutenberg/pull/45993))
+-   Update `gutenberg_get_global_stylesheet` to use `WP_Object_Cache`. ([45679](https://github.com/WordPress/gutenberg/pull/45679))
+-   Update which origins are queried for `gutenberg_get_global_settings`. ([45971](https://github.com/WordPress/gutenberg/pull/45971))
 
 #### Post Editor
-- useBlockEditorSettings: Return const empty array to avoid rerenders. ([46117](https://github.com/WordPress/gutenberg/pull/46117))
+
+-   useBlockEditorSettings: Return const empty array to avoid rerenders. ([46117](https://github.com/WordPress/gutenberg/pull/46117))
 
 #### Block Editor
-- Update the attributes reducer to use a map instead of a regular object. ([46146](https://github.com/WordPress/gutenberg/pull/46146))
 
+-   Update the attributes reducer to use a map instead of a regular object. ([46146](https://github.com/WordPress/gutenberg/pull/46146))
 
 ### Experiments
 
 #### Block Library
-- Nav Block: Add basic edit button UI to Nav block offcanvas editor. ([45815](https://github.com/WordPress/gutenberg/pull/45815))
-- Nav Block: Add submenu menu item to list view. ([45794](https://github.com/WordPress/gutenberg/pull/45794))
-- Nav Block: Alternative: Add inserter to Nav block offcanvas experiment. ([45947](https://github.com/WordPress/gutenberg/pull/45947))
-- Nav Block: Display inserter popover in offcanvas UI. ([46013](https://github.com/WordPress/gutenberg/pull/46013))
-- Nav Block: List View - Stop child item selecting a parent which is already selected. ([45860](https://github.com/WordPress/gutenberg/pull/45860))
-- Nav Block: Add simple back button to inspector controls. ([45852](https://github.com/WordPress/gutenberg/pull/45852))
-- Nav Block: Move color controls to support panel. ([46049](https://github.com/WordPress/gutenberg/pull/46049))
-- Nav Block: Enable easier drag and drop for navigation building. ([45906](https://github.com/WordPress/gutenberg/pull/45906))
-- Nav Block: Hide the create new menu button if the experiment is enabled. ([46019](https://github.com/WordPress/gutenberg/pull/46019))
-- Navigation List view: Fix incorect class. ([46129](https://github.com/WordPress/gutenberg/pull/46129))
-- Navigation List view: Include offcanvas specific styles. ([45963](https://github.com/WordPress/gutenberg/pull/45963))
-- Navigation List view: Scroll horizontally when table overflows. ([45966](https://github.com/WordPress/gutenberg/pull/45966))
 
+-   Nav Block: Add basic edit button UI to Nav block offcanvas editor. ([45815](https://github.com/WordPress/gutenberg/pull/45815))
+-   Nav Block: Add submenu menu item to list view. ([45794](https://github.com/WordPress/gutenberg/pull/45794))
+-   Nav Block: Alternative: Add inserter to Nav block offcanvas experiment. ([45947](https://github.com/WordPress/gutenberg/pull/45947))
+-   Nav Block: Display inserter popover in offcanvas UI. ([46013](https://github.com/WordPress/gutenberg/pull/46013))
+-   Nav Block: List View - Stop child item selecting a parent which is already selected. ([45860](https://github.com/WordPress/gutenberg/pull/45860))
+-   Nav Block: Add simple back button to inspector controls. ([45852](https://github.com/WordPress/gutenberg/pull/45852))
+-   Nav Block: Move color controls to support panel. ([46049](https://github.com/WordPress/gutenberg/pull/46049))
+-   Nav Block: Enable easier drag and drop for navigation building. ([45906](https://github.com/WordPress/gutenberg/pull/45906))
+-   Nav Block: Hide the create new menu button if the experiment is enabled. ([46019](https://github.com/WordPress/gutenberg/pull/46019))
+-   Navigation List view: Fix incorect class. ([46129](https://github.com/WordPress/gutenberg/pull/46129))
+-   Navigation List view: Include offcanvas specific styles. ([45963](https://github.com/WordPress/gutenberg/pull/45963))
+-   Navigation List view: Scroll horizontally when table overflows. ([45966](https://github.com/WordPress/gutenberg/pull/45966))
 
 ### Documentation
 
-- (docs) Document the special case of shipping point releases when new release branch already exists. ([46083](https://github.com/WordPress/gutenberg/pull/46083))
-- Added InspectorControls import to example. ([45872](https://github.com/WordPress/gutenberg/pull/45872))
-- Fix NavigableRegion README. ([45879](https://github.com/WordPress/gutenberg/pull/45879))
-- Fix link & code markdown. ([45708](https://github.com/WordPress/gutenberg/pull/45708))
-- Navigation: Adds a warning about duplicate code for the future. ([45844](https://github.com/WordPress/gutenberg/pull/45844))
-- Storybook: Add link to component folder on GitHub, retire Storysource. ([45727](https://github.com/WordPress/gutenberg/pull/45727))
-- Style Engine: Add first draft of contributing doc. ([45930](https://github.com/WordPress/gutenberg/pull/45930))
-- Update applying-styles-with-stylesheets.md. ([45925](https://github.com/WordPress/gutenberg/pull/45925))
+-   (docs) Document the special case of shipping point releases when new release branch already exists. ([46083](https://github.com/WordPress/gutenberg/pull/46083))
+-   Added InspectorControls import to example. ([45872](https://github.com/WordPress/gutenberg/pull/45872))
+-   Fix NavigableRegion README. ([45879](https://github.com/WordPress/gutenberg/pull/45879))
+-   Fix link & code markdown. ([45708](https://github.com/WordPress/gutenberg/pull/45708))
+-   Navigation: Adds a warning about duplicate code for the future. ([45844](https://github.com/WordPress/gutenberg/pull/45844))
+-   Storybook: Add link to component folder on GitHub, retire Storysource. ([45727](https://github.com/WordPress/gutenberg/pull/45727))
+-   Style Engine: Add first draft of contributing doc. ([45930](https://github.com/WordPress/gutenberg/pull/45930))
+-   Update applying-styles-with-stylesheets.md. ([45925](https://github.com/WordPress/gutenberg/pull/45925))
 
 ### Code Quality
 
 #### Components
-- Cleanup the BlockPreview component. ([45936](https://github.com/WordPress/gutenberg/pull/45936))
-- Convert the `Snackbar` component to TypeScript. ([45472](https://github.com/WordPress/gutenberg/pull/45472))
-- Fix ESLint violations in `ContextSystemProvider` tests. ([46010](https://github.com/WordPress/gutenberg/pull/46010))
-- Fix ESLint violations in `NoticeList` tests. ([46011](https://github.com/WordPress/gutenberg/pull/46011))
-- Fix `no-node-access` in `Grid` tests. ([45900](https://github.com/WordPress/gutenberg/pull/45900))
-- Fix `no-node-access` in `Sandbox` tests. ([45908](https://github.com/WordPress/gutenberg/pull/45908))
-- Fix `no-node-access` in `Text` tests. ([45898](https://github.com/WordPress/gutenberg/pull/45898))
-- Fix `no-node-access` in `Theme` tests. ([45896](https://github.com/WordPress/gutenberg/pull/45896))
-- Fix `no-node-access` violation in `ControlLabel` tests. ([46007](https://github.com/WordPress/gutenberg/pull/46007))
-- Fix `no-node-access` violations in `Card` tests. ([46158](https://github.com/WordPress/gutenberg/pull/46158))
-- Fix `no-node-access` violations in `Disabled` tests. ([46156](https://github.com/WordPress/gutenberg/pull/46156))
-- Improve `BoxControl` tests. ([45968](https://github.com/WordPress/gutenberg/pull/45968))
-- Improve `Dropdown` tests. ([45911](https://github.com/WordPress/gutenberg/pull/45911))
-- LinkedButton: Remove unnecessary span tag. ([46063](https://github.com/WordPress/gutenberg/pull/46063))
-- TextControl: Restrict `type` prop in TypeScript. ([45433](https://github.com/WordPress/gutenberg/pull/45433))
-- Tooltip: Add readme and unit tests for `shortcut` prop. ([46092](https://github.com/WordPress/gutenberg/pull/46092))
-- `NumberControl`: Refactor styles/tests/stories to TypeScript, replace `fireEvent` with `user-event`. ([45990](https://github.com/WordPress/gutenberg/pull/45990))
-- useBaseField: Convert component to TypeScript. ([45712](https://github.com/WordPress/gutenberg/pull/45712))
-- Small refactoring to the NavigableRegion component. ([45849](https://github.com/WordPress/gutenberg/pull/45849))
-
-#### Block Library
-- ESLint: Fix minor ESLint warning in `LinkUI`. ([46161](https://github.com/WordPress/gutenberg/pull/46161))
-- Fix ESLint warnings in tests. ([46034](https://github.com/WordPress/gutenberg/pull/46034))
-- Fix invalid attribute markup in core/home-link block. ([46089](https://github.com/WordPress/gutenberg/pull/46089))
-- Link UI: Destructure the props earlier in the component. ([46209](https://github.com/WordPress/gutenberg/pull/46209))
-- Navigation Link UI: Try to align both files. ([46205](https://github.com/WordPress/gutenberg/pull/46205))
-- Navigation Menu Selector: Share the functions needed for the NavigationMenuSelector. ([46053](https://github.com/WordPress/gutenberg/pull/46053))
-- Navigation: Extract components. ([45850](https://github.com/WordPress/gutenberg/pull/45850))
-- Navigation: Reduce duplicate code. ([45779](https://github.com/WordPress/gutenberg/pull/45779))
-- Navigation: Remove unused clientId prop. ([46020](https://github.com/WordPress/gutenberg/pull/46020))
-- Post Featured Image: Only get the post title when rendering alt text. ([45835](https://github.com/WordPress/gutenberg/pull/45835))
-- Reduce prop drilling in Block Card component. ([46052](https://github.com/WordPress/gutenberg/pull/46052))
-- Refactor link creation UI to standalone component/file. ([46031](https://github.com/WordPress/gutenberg/pull/46031))
-- Remove Nav block specific classes from Nav offcanvas Link UI. ([46182](https://github.com/WordPress/gutenberg/pull/46182))
-- Remove WrappedNavigationMenuSelector. ([46056](https://github.com/WordPress/gutenberg/pull/46056))
-- Update offcanvas back button to select parent Nav block and limited to Nav block only. ([46037](https://github.com/WordPress/gutenberg/pull/46037))
-- Don't check if constants set by `wp_initial_constants()` are defined. ([45979](https://github.com/WordPress/gutenberg/pull/45979))
-
-#### Block Editor
-- LinkControl unit tests: Use user.type to type into search field. ([45802](https://github.com/WordPress/gutenberg/pull/45802))
-- Simplify api for link UI abstraction to use a single prop for the value. ([46189](https://github.com/WordPress/gutenberg/pull/46189))
-- URLInput: Keep the search results label in sync with the results list. ([45806](https://github.com/WordPress/gutenberg/pull/45806))
-- Use @wordpress/escape-html escapeHTML in Link UI in preference to Lodash method. ([46184](https://github.com/WordPress/gutenberg/pull/46184))
-
-#### Global Styles
-- Cleaner logic in wp_theme_has_theme_json. ([45950](https://github.com/WordPress/gutenberg/pull/45950))
-- Remove usage of wp_get_theme. ([45770](https://github.com/WordPress/gutenberg/pull/45770))
+
+-   Cleanup the BlockPreview component. ([45936](https://github.com/WordPress/gutenberg/pull/45936))
+-   Convert the `Snackbar` component to TypeScript. ([45472](https://github.com/WordPress/gutenberg/pull/45472))
+-   Fix ESLint violations in `ContextSystemProvider` tests. ([46010](https://github.com/WordPress/gutenberg/pull/46010))
+-   Fix ESLint violations in `NoticeList` tests. ([46011](https://github.com/WordPress/gutenberg/pull/46011))
+-   Fix `no-node-access` in `Grid` tests. ([45900](https://github.com/WordPress/gutenberg/pull/45900))
+-   Fix `no-node-access` in `Sandbox` tests. ([45908](https://github.com/WordPress/gutenberg/pull/45908))
+-   Fix `no-node-access` in `Text` tests. ([45898](https://github.com/WordPress/gutenberg/pull/45898))
+-   Fix `no-node-access` in `Theme` tests. ([45896](https://github.com/WordPress/gutenberg/pull/45896))
+-   Fix `no-node-access` violation in `ControlLabel` tests. ([46007](https://github.com/WordPress/gutenberg/pull/46007))
+-   Fix `no-node-access` violations in `Card` tests. ([46158](https://github.com/WordPress/gutenberg/pull/46158))
+-   Fix `no-node-access` violations in `Disabled` tests. ([46156](https://github.com/WordPress/gutenberg/pull/46156))
+-   Improve `BoxControl` tests. ([45968](https://github.com/WordPress/gutenberg/pull/45968))
+-   Improve `Dropdown` tests. ([45911](https://github.com/WordPress/gutenberg/pull/45911))
+-   LinkedButton: Remove unnecessary span tag. ([46063](https://github.com/WordPress/gutenberg/pull/46063))
+-   TextControl: Restrict `type` prop in TypeScript. ([45433](https://github.com/WordPress/gutenberg/pull/45433))
+-   Tooltip: Add readme and unit tests for `shortcut` prop. ([46092](https://github.com/WordPress/gutenberg/pull/46092))
+-   `NumberControl`: Refactor styles/tests/stories to TypeScript, replace `fireEvent` with `user-event`. ([45990](https://github.com/WordPress/gutenberg/pull/45990))
+-   useBaseField: Convert component to TypeScript. ([45712](https://github.com/WordPress/gutenberg/pull/45712))
+-   Small refactoring to the NavigableRegion component. ([45849](https://github.com/WordPress/gutenberg/pull/45849))
+
+#### Block Library
+
+-   ESLint: Fix minor ESLint warning in `LinkUI`. ([46161](https://github.com/WordPress/gutenberg/pull/46161))
+-   Fix ESLint warnings in tests. ([46034](https://github.com/WordPress/gutenberg/pull/46034))
+-   Fix invalid attribute markup in core/home-link block. ([46089](https://github.com/WordPress/gutenberg/pull/46089))
+-   Link UI: Destructure the props earlier in the component. ([46209](https://github.com/WordPress/gutenberg/pull/46209))
+-   Navigation Link UI: Try to align both files. ([46205](https://github.com/WordPress/gutenberg/pull/46205))
+-   Navigation Menu Selector: Share the functions needed for the NavigationMenuSelector. ([46053](https://github.com/WordPress/gutenberg/pull/46053))
+-   Navigation: Extract components. ([45850](https://github.com/WordPress/gutenberg/pull/45850))
+-   Navigation: Reduce duplicate code. ([45779](https://github.com/WordPress/gutenberg/pull/45779))
+-   Navigation: Remove unused clientId prop. ([46020](https://github.com/WordPress/gutenberg/pull/46020))
+-   Post Featured Image: Only get the post title when rendering alt text. ([45835](https://github.com/WordPress/gutenberg/pull/45835))
+-   Reduce prop drilling in Block Card component. ([46052](https://github.com/WordPress/gutenberg/pull/46052))
+-   Refactor link creation UI to standalone component/file. ([46031](https://github.com/WordPress/gutenberg/pull/46031))
+-   Remove Nav block specific classes from Nav offcanvas Link UI. ([46182](https://github.com/WordPress/gutenberg/pull/46182))
+-   Remove WrappedNavigationMenuSelector. ([46056](https://github.com/WordPress/gutenberg/pull/46056))
+-   Update offcanvas back button to select parent Nav block and limited to Nav block only. ([46037](https://github.com/WordPress/gutenberg/pull/46037))
+-   Don't check if constants set by `wp_initial_constants()` are defined. ([45979](https://github.com/WordPress/gutenberg/pull/45979))
+
+#### Block Editor
+
+-   LinkControl unit tests: Use user.type to type into search field. ([45802](https://github.com/WordPress/gutenberg/pull/45802))
+-   Simplify api for link UI abstraction to use a single prop for the value. ([46189](https://github.com/WordPress/gutenberg/pull/46189))
+-   URLInput: Keep the search results label in sync with the results list. ([45806](https://github.com/WordPress/gutenberg/pull/45806))
+-   Use @wordpress/escape-html escapeHTML in Link UI in preference to Lodash method. ([46184](https://github.com/WordPress/gutenberg/pull/46184))
+
+#### Global Styles
+
+-   Cleaner logic in wp_theme_has_theme_json. ([45950](https://github.com/WordPress/gutenberg/pull/45950))
+-   Remove usage of wp_get_theme. ([45770](https://github.com/WordPress/gutenberg/pull/45770))
 
 #### Post Editor
-- Update BlockCard to pass className instead of isSynced prop. ([46021](https://github.com/WordPress/gutenberg/pull/46021))
+
+-   Update BlockCard to pass className instead of isSynced prop. ([46021](https://github.com/WordPress/gutenberg/pull/46021))
 
 #### Full Site Editing
-- Block editor: Separate content styles for the iframe. ([44298](https://github.com/WordPress/gutenberg/pull/44298))
+
+-   Block editor: Separate content styles for the iframe. ([44298](https://github.com/WordPress/gutenberg/pull/44298))
 
 ### Tools
 
 #### Build Tooling
-- Bump caniuse-lite version. ([46093](https://github.com/WordPress/gutenberg/pull/46093))
+
+-   Bump caniuse-lite version. ([46093](https://github.com/WordPress/gutenberg/pull/46093))
 
 #### Testing
-- Fix Quote block's unwrap end-to-end test. ([46168](https://github.com/WordPress/gutenberg/pull/46168))
-- Remove 'response.deleted' check. ([45992](https://github.com/WordPress/gutenberg/pull/45992))
-- Warning: Fix ESLint warnings in tests. ([46033](https://github.com/WordPress/gutenberg/pull/46033))
-- ESLint: Enable `testing-library/no-container` rule. ([46160](https://github.com/WordPress/gutenberg/pull/46160))
-- Element: Fix `no-node-access` in `createInterpolateElement`. ([45894](https://github.com/WordPress/gutenberg/pull/45894))
-- Block Editor: Fix ESLint warnings in `MediaUpload` tests. ([46035](https://github.com/WordPress/gutenberg/pull/46035))
-- Block Editor: Fix `no-node-access` in `RecursionProvider` tests. ([45902](https://github.com/WordPress/gutenberg/pull/45902))
-- Block Editor: Fix block alignment tests for React 18. ([45937](https://github.com/WordPress/gutenberg/pull/45937))
-- Block Editor: Wait for popover positioning in `MediaReplaceFlow` tests. ([45863](https://github.com/WordPress/gutenberg/pull/45863))
-- Compose: Fix 'no-container' violations in 'useDisabled' tests. ([45797](https://github.com/WordPress/gutenberg/pull/45797))
-- Compose: Fix ESLint violations in `withGlobalEvents` tests. ([46012](https://github.com/WordPress/gutenberg/pull/46012))
 
-## First time contributors
+-   Fix Quote block's unwrap end-to-end test. ([46168](https://github.com/WordPress/gutenberg/pull/46168))
+-   Remove 'response.deleted' check. ([45992](https://github.com/WordPress/gutenberg/pull/45992))
+-   Warning: Fix ESLint warnings in tests. ([46033](https://github.com/WordPress/gutenberg/pull/46033))
+-   ESLint: Enable `testing-library/no-container` rule. ([46160](https://github.com/WordPress/gutenberg/pull/46160))
+-   Element: Fix `no-node-access` in `createInterpolateElement`. ([45894](https://github.com/WordPress/gutenberg/pull/45894))
+-   Block Editor: Fix ESLint warnings in `MediaUpload` tests. ([46035](https://github.com/WordPress/gutenberg/pull/46035))
+-   Block Editor: Fix `no-node-access` in `RecursionProvider` tests. ([45902](https://github.com/WordPress/gutenberg/pull/45902))
+-   Block Editor: Fix block alignment tests for React 18. ([45937](https://github.com/WordPress/gutenberg/pull/45937))
+-   Block Editor: Wait for popover positioning in `MediaReplaceFlow` tests. ([45863](https://github.com/WordPress/gutenberg/pull/45863))
+-   Compose: Fix 'no-container' violations in 'useDisabled' tests. ([45797](https://github.com/WordPress/gutenberg/pull/45797))
+-   Compose: Fix ESLint violations in `withGlobalEvents` tests. ([46012](https://github.com/WordPress/gutenberg/pull/46012))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @albarin: Remove 'response.deleted' check. ([45992](https://github.com/WordPress/gutenberg/pull/45992))
-- @artemiomorales: Clarify explanation of how 'Convert to Links' works in Page List block. ([45394](https://github.com/WordPress/gutenberg/pull/45394))
-- @coreyworrell: Fix for navigation anchor links to close modal. ([45829](https://github.com/WordPress/gutenberg/pull/45829))
-- @devanshijoshi9: Components: ToggleControl text overflows when it has a long label. ([45962](https://github.com/WordPress/gutenberg/pull/45962))
-- @flexseth: Added InspectorControls import to example. ([45872](https://github.com/WordPress/gutenberg/pull/45872))
-- @hiyascout: Update applying-styles-with-stylesheets.md. ([45925](https://github.com/WordPress/gutenberg/pull/45925))
-- @marissa-makes: BlockVariationPicker: Remove Unnecessary ARIA Role. ([45916](https://github.com/WordPress/gutenberg/pull/45916))
-- @mpkelly: Support `colspan` attribute in `table` HTML, including when pasting. ([45981](https://github.com/WordPress/gutenberg/pull/45981))
-- @TobiasBg: Fix invalid attribute markup in core/home-link block. ([46089](https://github.com/WordPress/gutenberg/pull/46089))
+The following PRs were merged by first-time contributors:
 
+-   @albarin: Remove 'response.deleted' check. ([45992](https://github.com/WordPress/gutenberg/pull/45992))
+-   @artemiomorales: Clarify explanation of how 'Convert to Links' works in Page List block. ([45394](https://github.com/WordPress/gutenberg/pull/45394))
+-   @coreyworrell: Fix for navigation anchor links to close modal. ([45829](https://github.com/WordPress/gutenberg/pull/45829))
+-   @devanshijoshi9: Components: ToggleControl text overflows when it has a long label. ([45962](https://github.com/WordPress/gutenberg/pull/45962))
+-   @flexseth: Added InspectorControls import to example. ([45872](https://github.com/WordPress/gutenberg/pull/45872))
+-   @hiyascout: Update applying-styles-with-stylesheets.md. ([45925](https://github.com/WordPress/gutenberg/pull/45925))
+-   @marissa-makes: BlockVariationPicker: Remove Unnecessary ARIA Role. ([45916](https://github.com/WordPress/gutenberg/pull/45916))
+-   @mpkelly: Support `colspan` attribute in `table` HTML, including when pasting. ([45981](https://github.com/WordPress/gutenberg/pull/45981))
+-   @TobiasBg: Fix invalid attribute markup in core/home-link block. ([46089](https://github.com/WordPress/gutenberg/pull/46089))
 
 ## Contributors
 
@@ -10053,7 +21306,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @afercia @ajlende @albarin @alexstine @andrewserong @artemiomorales @brookewp @chad1008 @ciampo @coreyworrell @ddryo @devanshijoshi9 @draganescu @ellatrix @felixarntz @flexseth @fullofcaffeine @geriux @getdave @glendaviesnz @gvgvgvijayan @hiyascout @jsnajdr @kienstra @MaggieCabrera @Mamaduka @marissa-makes @mikachan @mirka @mmtr @mpkelly @ntsekouras @oandregal @ocean90 @oguzkocer @ramonjd @scruffian @SiobhyB @spacedmonkey @stokesman @t-hamano @tellthemachines @TobiasBg @tyxla @walbo @youknowriad
 
-
 = 14.6.1 =
 
 ## Changelog
@@ -10061,11 +21313,13 @@ The following contributors merged PRs in this release:
 ### Fixes
 
 #### Global Styles
-- Fix the `upgrader_process_complete` hook for `wp_theme_has_theme_json`. ([45881](https://github.com/WordPress/gutenberg/pull/45881))
-- Update `wp_theme_has_theme_json` to use `WP_Object_Cache`. ([45543](https://github.com/WordPress/gutenberg/pull/45543))
+
+-   Fix the `upgrader_process_complete` hook for `wp_theme_has_theme_json`. ([45881](https://github.com/WordPress/gutenberg/pull/45881))
+-   Update `wp_theme_has_theme_json` to use `WP_Object_Cache`. ([45543](https://github.com/WordPress/gutenberg/pull/45543))
 
 ### Bug Fixes
-- Tag Processor: Prevent bugs from pre-PHP8 strspn/strcspn behavior. ([45822](https://github.com/WordPress/gutenberg/pull/45822))
+
+-   Tag Processor: Prevent bugs from pre-PHP8 strspn/strcspn behavior. ([45822](https://github.com/WordPress/gutenberg/pull/45822))
 
 ## Contributors
 
@@ -10073,8 +21327,6 @@ The following contributors merged PRs in this release:
 
 @oandregal @dmsnell
 
-
-
 = 14.6.0 =
 
 ## Changelog
@@ -10300,14 +21552,13 @@ The following contributors merged PRs in this release:
 
 -   Configure labels for GHA Dependabot PRs. ([45516](https://github.com/WordPress/gutenberg/pull/45516))
 
-## First time contributors
-
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @edanzer: Template Part Block: Update block isActive method. ([45672](https://github.com/WordPress/gutenberg/pull/45672))
-- @TimBroddin: Fix alignment of create new post link. ([45638](https://github.com/WordPress/gutenberg/pull/45638))
-- @wojtekn: Make Author block selector to display all users instead of just 10. ([45640](https://github.com/WordPress/gutenberg/pull/45640))
+The following PRs were merged by first-time contributors:
 
+-   @edanzer: Template Part Block: Update block isActive method. ([45672](https://github.com/WordPress/gutenberg/pull/45672))
+-   @TimBroddin: Fix alignment of create new post link. ([45638](https://github.com/WordPress/gutenberg/pull/45638))
+-   @wojtekn: Make Author block selector to display all users instead of just 10. ([45640](https://github.com/WordPress/gutenberg/pull/45640))
 
 ## Contributors
 
@@ -10315,9 +21566,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @andrewserong @bph @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @Copons @DaisyOlsen @desrosj @dinhtungdu @draganescu @dsas @edanzer @ellatrix @enejb @flootr @getdave @glendaviesnz @hz-tyfoon @jasmussen @javierarce @jffng @jonathanbossenger @jorgefilipecosta @jsnajdr @juanmaguitar @juhi123 @kevin940726 @Mamaduka @matiasbenedetto @mikachan @mirka @mmtr @mtias @ndiego @nielslange @noisysocks @ntsekouras @peterwilsoncc @ramonjd @ryelle @scruffian @spacedmonkey @t-hamano @TimBroddin @tyxla @vcanales @walbo @wojtekn @youknowriad @yuliyan
 
-
-
-
 = 14.5.4 =
 
 ## Changelog
@@ -10325,7 +21573,8 @@ The following contributors merged PRs in this release:
 ### Fixes
 
 #### Global Styles
-- Fix the `upgrader_process_complete` hook for `wp_theme_has_theme_json`. ([45881](https://github.com/WordPress/gutenberg/pull/45881))
+
+-   Fix the `upgrader_process_complete` hook for `wp_theme_has_theme_json`. ([45881](https://github.com/WordPress/gutenberg/pull/45881))
 
 ## Contributors
 
@@ -10333,25 +21582,19 @@ The following contributors merged PRs in this release:
 
 @oandregal
 
-
-
 = 14.5.3 =
 
-
-
 ## Changelog
 
 ### Performance
 
 #### Global Styles
-- Update `wp_theme_has_theme_json` to use `WP_Object_Cache`. ([45543](https://github.com/WordPress/gutenberg/pull/45543))
-
 
-## First time contributors
-
-The following PRs were merged by first time contributors:
+-   Update `wp_theme_has_theme_json` to use `WP_Object_Cache`. ([45543](https://github.com/WordPress/gutenberg/pull/45543))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -10359,16 +21602,13 @@ The following contributors merged PRs in this release:
 
 @oandregal
 
-
 = 14.5.2 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
-- Tag Processor: Prevent bugs from pre-PHP8 strspn/strcspn behavior. ([45822](https://github.com/WordPress/gutenberg/pull/45822))
+-   Tag Processor: Prevent bugs from pre-PHP8 strspn/strcspn behavior. ([45822](https://github.com/WordPress/gutenberg/pull/45822))
 
 ## Contributors
 
@@ -10376,7 +21616,6 @@ The following contributors merged PRs in this release:
 
 @dmsnell
 
-
 = 14.6.0-rc.1 =
 
 ## Changelog
@@ -10384,226 +21623,237 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Add color block support to latest posts. ([41874](https://github.com/WordPress/gutenberg/pull/41874))
-- Adds a list view to the navigation block. ([45546](https://github.com/WordPress/gutenberg/pull/45546))
-- Latest posts and latest comments: Add spacing support. ([45110](https://github.com/WordPress/gutenberg/pull/45110))
-- Navigation Link: Add the URL field to the Navigation Link inspector controls. ([45751](https://github.com/WordPress/gutenberg/pull/45751))
-- Reposition navigation selector. ([45555](https://github.com/WordPress/gutenberg/pull/45555))
-- Make Author block selector to display all users instead of just 10. ([45640](https://github.com/WordPress/gutenberg/pull/45640))
-- Columns: Add transform to unwrap the contents. ([45666](https://github.com/WordPress/gutenberg/pull/45666))
-- Navigation: Add a new ManageMenusButton component. ([45782](https://github.com/WordPress/gutenberg/pull/45782))
-- Read More block: Add aria-label and screen reader text. ([45490](https://github.com/WordPress/gutenberg/pull/45490))
-- Group block: Use a variation picker in the placeholder. ([43496](https://github.com/WordPress/gutenberg/pull/43496))
+
+-   Add color block support to latest posts. ([41874](https://github.com/WordPress/gutenberg/pull/41874))
+-   Adds a list view to the navigation block. ([45546](https://github.com/WordPress/gutenberg/pull/45546))
+-   Latest posts and latest comments: Add spacing support. ([45110](https://github.com/WordPress/gutenberg/pull/45110))
+-   Navigation Link: Add the URL field to the Navigation Link inspector controls. ([45751](https://github.com/WordPress/gutenberg/pull/45751))
+-   Reposition navigation selector. ([45555](https://github.com/WordPress/gutenberg/pull/45555))
+-   Make Author block selector to display all users instead of just 10. ([45640](https://github.com/WordPress/gutenberg/pull/45640))
+-   Columns: Add transform to unwrap the contents. ([45666](https://github.com/WordPress/gutenberg/pull/45666))
+-   Navigation: Add a new ManageMenusButton component. ([45782](https://github.com/WordPress/gutenberg/pull/45782))
+-   Read More block: Add aria-label and screen reader text. ([45490](https://github.com/WordPress/gutenberg/pull/45490))
+-   Group block: Use a variation picker in the placeholder. ([43496](https://github.com/WordPress/gutenberg/pull/43496))
 
 #### Components
-- CheckboxControl: Replace margin overrides with new opt-in prop. ([45434](https://github.com/WordPress/gutenberg/pull/45434))
-- FontSizePicker: Update hint text to match the design. ([44966](https://github.com/WordPress/gutenberg/pull/44966))
-- Update the design of the focal point handle. ([45053](https://github.com/WordPress/gutenberg/pull/45053))
-- Use new theming accent color in all components. ([45289](https://github.com/WordPress/gutenberg/pull/45289))
-- CheckboxControl: Move icons out of labels. ([45535](https://github.com/WordPress/gutenberg/pull/45535))
+
+-   CheckboxControl: Replace margin overrides with new opt-in prop. ([45434](https://github.com/WordPress/gutenberg/pull/45434))
+-   FontSizePicker: Update hint text to match the design. ([44966](https://github.com/WordPress/gutenberg/pull/44966))
+-   Update the design of the focal point handle. ([45053](https://github.com/WordPress/gutenberg/pull/45053))
+-   Use new theming accent color in all components. ([45289](https://github.com/WordPress/gutenberg/pull/45289))
+-   CheckboxControl: Move icons out of labels. ([45535](https://github.com/WordPress/gutenberg/pull/45535))
 
 #### Block Editor
-- Converts paragraphs to headings with keyboard shortcuts. ([44681](https://github.com/WordPress/gutenberg/pull/44681))
-- Restore the empty paragraph inserter. ([45542](https://github.com/WordPress/gutenberg/pull/45542))
-- Transform: Select all blocks if the result has more than one block. ([45015](https://github.com/WordPress/gutenberg/pull/45015))
-- Content-only locked patterns: Move "Modify" to elllipsis menu. ([45391](https://github.com/WordPress/gutenberg/pull/45391))
-- Patterns: Ajust the space in the pattern explorer list. ([45730](https://github.com/WordPress/gutenberg/pull/45730))
-- Update: Lock icon to outline. ([45645](https://github.com/WordPress/gutenberg/pull/45645))
-- Don't use capital case for 'Distraction free' strings. ([45538](https://github.com/WordPress/gutenberg/pull/45538))
-- Replace Justification/Orientation controls with ToggleGroupControl. ([45637](https://github.com/WordPress/gutenberg/pull/45637))
+
+-   Converts paragraphs to headings with keyboard shortcuts. ([44681](https://github.com/WordPress/gutenberg/pull/44681))
+-   Restore the empty paragraph inserter. ([45542](https://github.com/WordPress/gutenberg/pull/45542))
+-   Transform: Select all blocks if the result has more than one block. ([45015](https://github.com/WordPress/gutenberg/pull/45015))
+-   Content-only locked patterns: Move "Modify" to elllipsis menu. ([45391](https://github.com/WordPress/gutenberg/pull/45391))
+-   Patterns: Ajust the space in the pattern explorer list. ([45730](https://github.com/WordPress/gutenberg/pull/45730))
+-   Update: Lock icon to outline. ([45645](https://github.com/WordPress/gutenberg/pull/45645))
+-   Don't use capital case for 'Distraction free' strings. ([45538](https://github.com/WordPress/gutenberg/pull/45538))
+-   Replace Justification/Orientation controls with ToggleGroupControl. ([45637](https://github.com/WordPress/gutenberg/pull/45637))
 
 #### Site Editor
-- Update: Improve performance of block template object retrieval. ([45646](https://github.com/WordPress/gutenberg/pull/45646))
-- Replace FSE with Site Editor. ([45699](https://github.com/WordPress/gutenberg/pull/45699))
+
+-   Update: Improve performance of block template object retrieval. ([45646](https://github.com/WordPress/gutenberg/pull/45646))
+-   Replace FSE with Site Editor. ([45699](https://github.com/WordPress/gutenberg/pull/45699))
 
 #### Design Tools
-- Add a minHeight block support under dimensions. ([45300](https://github.com/WordPress/gutenberg/pull/45300))
-- Hide block toolbar when spacing visualizer is showing. ([45131](https://github.com/WordPress/gutenberg/pull/45131))
+
+-   Add a minHeight block support under dimensions. ([45300](https://github.com/WordPress/gutenberg/pull/45300))
+-   Hide block toolbar when spacing visualizer is showing. ([45131](https://github.com/WordPress/gutenberg/pull/45131))
 
 #### Global Styles
-- Elements: Add a text decoration control to link elements. ([45643](https://github.com/WordPress/gutenberg/pull/45643))
-- Global styles: Convert preset font size values to CSS vars. ([44967](https://github.com/WordPress/gutenberg/pull/44967))
-- Fluid typography: Adjust font size min and max rules. ([45536](https://github.com/WordPress/gutenberg/pull/45536))
-- Try generating random color palettes. ([40988](https://github.com/WordPress/gutenberg/pull/40988))
 
+-   Elements: Add a text decoration control to link elements. ([45643](https://github.com/WordPress/gutenberg/pull/45643))
+-   Global styles: Convert preset font size values to CSS vars. ([44967](https://github.com/WordPress/gutenberg/pull/44967))
+-   Fluid typography: Adjust font size min and max rules. ([45536](https://github.com/WordPress/gutenberg/pull/45536))
+-   Try generating random color palettes. ([40988](https://github.com/WordPress/gutenberg/pull/40988))
 
 #### Plugin
-- Updates tested up to version to 6.1. ([45630](https://github.com/WordPress/gutenberg/pull/45630))
 
+-   Updates tested up to version to 6.1. ([45630](https://github.com/WordPress/gutenberg/pull/45630))
 
 ### Bug Fixes
 
 #### Block Library
-- Change the order of the pseudo-states in the pseudo selectors array. ([45559](https://github.com/WordPress/gutenberg/pull/45559))
-- Cover: Avoid content loss when the templateLock value is all or contentOnly. ([45632](https://github.com/WordPress/gutenberg/pull/45632))
-- Fix alignment of create new post link. ([45638](https://github.com/WordPress/gutenberg/pull/45638))
-- Fix navigation appender position to prevent obstructing its items. ([43530](https://github.com/WordPress/gutenberg/pull/43530))
-- Fix: Button block text alignment. ([45663](https://github.com/WordPress/gutenberg/pull/45663))
-- Query Pagination: Fix positioning of next link in editor when parent is selected. ([45651](https://github.com/WordPress/gutenberg/pull/45651))
-- Site Logo: Use the correct home URL setting. ([45476](https://github.com/WordPress/gutenberg/pull/45476))
-- Switch background color to text color on block separator. ([44943](https://github.com/WordPress/gutenberg/pull/44943))
-- Table Block: Apply borders and padding on both front end and editor. ([45069](https://github.com/WordPress/gutenberg/pull/45069))
-- Table block: Fix error in margin value. ([45674](https://github.com/WordPress/gutenberg/pull/45674))
-- Template Part Block: Update block isActive method. ([45672](https://github.com/WordPress/gutenberg/pull/45672))
-- Navigation: Fix overflowing menu name in the navigation selector dropdown. ([45647](https://github.com/WordPress/gutenberg/pull/45647))
+
+-   Change the order of the pseudo-states in the pseudo selectors array. ([45559](https://github.com/WordPress/gutenberg/pull/45559))
+-   Cover: Avoid content loss when the templateLock value is all or contentOnly. ([45632](https://github.com/WordPress/gutenberg/pull/45632))
+-   Fix alignment of create new post link. ([45638](https://github.com/WordPress/gutenberg/pull/45638))
+-   Fix navigation appender position to prevent obstructing its items. ([43530](https://github.com/WordPress/gutenberg/pull/43530))
+-   Fix: Button block text alignment. ([45663](https://github.com/WordPress/gutenberg/pull/45663))
+-   Query Pagination: Fix positioning of next link in editor when parent is selected. ([45651](https://github.com/WordPress/gutenberg/pull/45651))
+-   Site Logo: Use the correct home URL setting. ([45476](https://github.com/WordPress/gutenberg/pull/45476))
+-   Switch background color to text color on block separator. ([44943](https://github.com/WordPress/gutenberg/pull/44943))
+-   Table Block: Apply borders and padding on both front end and editor. ([45069](https://github.com/WordPress/gutenberg/pull/45069))
+-   Table block: Fix error in margin value. ([45674](https://github.com/WordPress/gutenberg/pull/45674))
+-   Template Part Block: Update block isActive method. ([45672](https://github.com/WordPress/gutenberg/pull/45672))
+-   Navigation: Fix overflowing menu name in the navigation selector dropdown. ([45647](https://github.com/WordPress/gutenberg/pull/45647))
 
 #### Accessibility
-- Fix focus return when closing the Post publish panel. ([45623](https://github.com/WordPress/gutenberg/pull/45623))
-- Fix navigate regions backwards for macOS Firefox and Safari. ([45019](https://github.com/WordPress/gutenberg/pull/45019))
-- Fix the Save buttons labelling and tooltip. ([43952](https://github.com/WordPress/gutenberg/pull/43952))
-- Fix the navigate regions focus style. ([45369](https://github.com/WordPress/gutenberg/pull/45369))
-- Fix: Contrast checker appears unexpectedly on some blocks. ([45639](https://github.com/WordPress/gutenberg/pull/45639))
-- Fix: Contrast checker does not update properly. ([45686](https://github.com/WordPress/gutenberg/pull/45686))
-
-#### Components
-- Autocomplete: Fix unexpected block insertion during IME composition. ([45510](https://github.com/WordPress/gutenberg/pull/45510))
-- Fix ESLint warning for Dashicon. ([45795](https://github.com/WordPress/gutenberg/pull/45795))
-- FormTokenField: Fix duplicate input in IME composition. ([45607](https://github.com/WordPress/gutenberg/pull/45607))
-- Making size prop work for icon components using dash icon strings. ([45593](https://github.com/WordPress/gutenberg/pull/45593))
-- ToolsPanel: Prevent calling deselect when panel remounts. ([45673](https://github.com/WordPress/gutenberg/pull/45673))
-- Color Picker: Prevent all number fields to become 0 when one of them is an empty string. ([45649](https://github.com/WordPress/gutenberg/pull/45649))
-- ToggleGroupControl: Only show enclosing border when `isBlock`. ([45492](https://github.com/WordPress/gutenberg/pull/45492))
-- Autocomplete: Check key events more strictly in IME composition. ([45626](https://github.com/WordPress/gutenberg/pull/45626))
+
+-   Fix focus return when closing the Post publish panel. ([45623](https://github.com/WordPress/gutenberg/pull/45623))
+-   Fix navigate regions backwards for macOS Firefox and Safari. ([45019](https://github.com/WordPress/gutenberg/pull/45019))
+-   Fix the Save buttons labelling and tooltip. ([43952](https://github.com/WordPress/gutenberg/pull/43952))
+-   Fix the navigate regions focus style. ([45369](https://github.com/WordPress/gutenberg/pull/45369))
+-   Fix: Contrast checker appears unexpectedly on some blocks. ([45639](https://github.com/WordPress/gutenberg/pull/45639))
+-   Fix: Contrast checker does not update properly. ([45686](https://github.com/WordPress/gutenberg/pull/45686))
+
+#### Components
+
+-   Autocomplete: Fix unexpected block insertion during IME composition. ([45510](https://github.com/WordPress/gutenberg/pull/45510))
+-   Fix ESLint warning for Dashicon. ([45795](https://github.com/WordPress/gutenberg/pull/45795))
+-   FormTokenField: Fix duplicate input in IME composition. ([45607](https://github.com/WordPress/gutenberg/pull/45607))
+-   Making size prop work for icon components using dash icon strings. ([45593](https://github.com/WordPress/gutenberg/pull/45593))
+-   ToolsPanel: Prevent calling deselect when panel remounts. ([45673](https://github.com/WordPress/gutenberg/pull/45673))
+-   Color Picker: Prevent all number fields to become 0 when one of them is an empty string. ([45649](https://github.com/WordPress/gutenberg/pull/45649))
+-   ToggleGroupControl: Only show enclosing border when `isBlock`. ([45492](https://github.com/WordPress/gutenberg/pull/45492))
+-   Autocomplete: Check key events more strictly in IME composition. ([45626](https://github.com/WordPress/gutenberg/pull/45626))
 
 #### CSS & Styling
-- Inherit font from theme on overlay close button. ([45635](https://github.com/WordPress/gutenberg/pull/45635))
-- Navigation: Fix font inheritance when using text menu button. ([45514](https://github.com/WordPress/gutenberg/pull/45514))
-- Remove hover style to button on dark block tools UI. ([45653](https://github.com/WordPress/gutenberg/pull/45653))
-- Remove width from block mover button focus style. ([45665](https://github.com/WordPress/gutenberg/pull/45665))
-- Site editor hover/select: Fix double border. ([45589](https://github.com/WordPress/gutenberg/pull/45589))
-- Remove duplicate output of existing classnames in layout classnames. ([45499](https://github.com/WordPress/gutenberg/pull/45499))
+
+-   Inherit font from theme on overlay close button. ([45635](https://github.com/WordPress/gutenberg/pull/45635))
+-   Navigation: Fix font inheritance when using text menu button. ([45514](https://github.com/WordPress/gutenberg/pull/45514))
+-   Remove hover style to button on dark block tools UI. ([45653](https://github.com/WordPress/gutenberg/pull/45653))
+-   Remove width from block mover button focus style. ([45665](https://github.com/WordPress/gutenberg/pull/45665))
+-   Site editor hover/select: Fix double border. ([45589](https://github.com/WordPress/gutenberg/pull/45589))
+-   Remove duplicate output of existing classnames in layout classnames. ([45499](https://github.com/WordPress/gutenberg/pull/45499))
 
 #### Post Editor
-- BlockManagerCategory: Fix styles for indeterminate. ([45564](https://github.com/WordPress/gutenberg/pull/45564))
-- Fix: Updated names from List View to Document Overview. ([45524](https://github.com/WordPress/gutenberg/pull/45524))
-- Strip HTML from Post Title when pasting multiline title containing HTML. ([35825](https://github.com/WordPress/gutenberg/pull/35825))
+
+-   BlockManagerCategory: Fix styles for indeterminate. ([45564](https://github.com/WordPress/gutenberg/pull/45564))
+-   Fix: Updated names from List View to Document Overview. ([45524](https://github.com/WordPress/gutenberg/pull/45524))
+-   Strip HTML from Post Title when pasting multiline title containing HTML. ([35825](https://github.com/WordPress/gutenberg/pull/35825))
 
 #### Site Editor
-- Decode entities in template title and description. ([45716](https://github.com/WordPress/gutenberg/pull/45716))
-- Link to homeUrl from site editor view menu. ([45475](https://github.com/WordPress/gutenberg/pull/45475))
+
+-   Decode entities in template title and description. ([45716](https://github.com/WordPress/gutenberg/pull/45716))
+-   Link to homeUrl from site editor view menu. ([45475](https://github.com/WordPress/gutenberg/pull/45475))
 
 #### Block Editor
-- Fix Link UI popover positioning when inspector control input is focused. ([45661](https://github.com/WordPress/gutenberg/pull/45661))
-- Paste: Fix list only paste from Google documentation. ([45498](https://github.com/WordPress/gutenberg/pull/45498))
-- Make Manage Reusable blocks match similar links. ([45641](https://github.com/WordPress/gutenberg/pull/45641))([45689](https://github.com/WordPress/gutenberg/pull/45689))
-- List View: Disable branch expansion when block editing is locked. ([45541](https://github.com/WordPress/gutenberg/pull/45541))
-- Spacing visualizer: Fix display of unexpected visualizer for certain mouse actions. ([45739](https://github.com/WordPress/gutenberg/pull/45739))
 
+-   Fix Link UI popover positioning when inspector control input is focused. ([45661](https://github.com/WordPress/gutenberg/pull/45661))
+-   Paste: Fix list only paste from Google documentation. ([45498](https://github.com/WordPress/gutenberg/pull/45498))
+-   Make Manage Reusable blocks match similar links. ([45641](https://github.com/WordPress/gutenberg/pull/45641))([45689](https://github.com/WordPress/gutenberg/pull/45689))
+-   List View: Disable branch expansion when block editing is locked. ([45541](https://github.com/WordPress/gutenberg/pull/45541))
+-   Spacing visualizer: Fix display of unexpected visualizer for certain mouse actions. ([45739](https://github.com/WordPress/gutenberg/pull/45739))
 
 ### Performance
 
-- Lodash: Refactor away from `_.reduce()`. ([45460](https://github.com/WordPress/gutenberg/pull/45460))
-- Lodash: Refactor block editor away from `_.reduce()`. ([45455](https://github.com/WordPress/gutenberg/pull/45455))
-- Lodash: Refactor blocks away from `_.reduce()`. ([45457](https://github.com/WordPress/gutenberg/pull/45457))
-- Lodash: Refactor site editor away from `_.reduce()`. ([45459](https://github.com/WordPress/gutenberg/pull/45459))
-- Lodash: Refactor post editor away from `_.reduce()`. ([45458](https://github.com/WordPress/gutenberg/pull/45458))
+-   Lodash: Refactor away from `_.reduce()`. ([45460](https://github.com/WordPress/gutenberg/pull/45460))
+-   Lodash: Refactor block editor away from `_.reduce()`. ([45455](https://github.com/WordPress/gutenberg/pull/45455))
+-   Lodash: Refactor blocks away from `_.reduce()`. ([45457](https://github.com/WordPress/gutenberg/pull/45457))
+-   Lodash: Refactor site editor away from `_.reduce()`. ([45459](https://github.com/WordPress/gutenberg/pull/45459))
+-   Lodash: Refactor post editor away from `_.reduce()`. ([45458](https://github.com/WordPress/gutenberg/pull/45458))
 
 #### Block Library
-- Do not look for block variants, if not supporting block-templates. ([45362](https://github.com/WordPress/gutenberg/pull/45362))
-- List: Disable nested list drop zone so dropping list items works. ([45321](https://github.com/WordPress/gutenberg/pull/45321))
+
+-   Do not look for block variants, if not supporting block-templates. ([45362](https://github.com/WordPress/gutenberg/pull/45362))
+-   List: Disable nested list drop zone so dropping list items works. ([45321](https://github.com/WordPress/gutenberg/pull/45321))
 
 #### Global Styles
-- Use low-level cache for get_user_data_from_wp_global_styles. ([45634](https://github.com/WordPress/gutenberg/pull/45634))
 
+-   Use low-level cache for get_user_data_from_wp_global_styles. ([45634](https://github.com/WordPress/gutenberg/pull/45634))
 
 ### Experiments
 
-- Al list view duplicate for use in navigation list view experiment. ([45544](https://github.com/WordPress/gutenberg/pull/45544))
-- Introduce experiment for inspector based navigation editing. ([45515](https://github.com/WordPress/gutenberg/pull/45515))
-
+-   Al list view duplicate for use in navigation list view experiment. ([45544](https://github.com/WordPress/gutenberg/pull/45544))
+-   Introduce experiment for inspector based navigation editing. ([45515](https://github.com/WordPress/gutenberg/pull/45515))
 
 ### Documentation
 
-- Add missing CHANGELOG entry. ([45691](https://github.com/WordPress/gutenberg/pull/45691))
-- Change Title: How to use JavaScript with Gutenberg. ([45323](https://github.com/WordPress/gutenberg/pull/45323))
-- Docs: Update the readme for the integration test fixtures. ([45581](https://github.com/WordPress/gutenberg/pull/45581))
-- Summarize "Available commands" section and refer them it to `scripts` documentation. ([45636](https://github.com/WordPress/gutenberg/pull/45636))
-- Update applying-styles-with-stylesheets.md. ([45604](https://github.com/WordPress/gutenberg/pull/45604))
-- [create-block] Reorganized sections to provide a better learning experience of this package. ([45676](https://github.com/WordPress/gutenberg/pull/45676))
-- Change "block style variations" references to "block style". ([45650](https://github.com/WordPress/gutenberg/pull/45650))
-
-
+-   Add missing CHANGELOG entry. ([45691](https://github.com/WordPress/gutenberg/pull/45691))
+-   Change Title: How to use JavaScript with Gutenberg. ([45323](https://github.com/WordPress/gutenberg/pull/45323))
+-   Docs: Update the readme for the integration test fixtures. ([45581](https://github.com/WordPress/gutenberg/pull/45581))
+-   Summarize "Available commands" section and refer them it to `scripts` documentation. ([45636](https://github.com/WordPress/gutenberg/pull/45636))
+-   Update applying-styles-with-stylesheets.md. ([45604](https://github.com/WordPress/gutenberg/pull/45604))
+-   [create-block] Reorganized sections to provide a better learning experience of this package. ([45676](https://github.com/WordPress/gutenberg/pull/45676))
+-   Change "block style variations" references to "block style". ([45650](https://github.com/WordPress/gutenberg/pull/45650))
 
 ### Code Quality
 
 #### Block Editor
-- Block Editor: Improve `LinkControl` tests. ([45609](https://github.com/WordPress/gutenberg/pull/45609))
-- Block Editor: Improve `ResponsiveBlockControl` tests. ([45610](https://github.com/WordPress/gutenberg/pull/45610))
-- Block Editor: Improve `ReusableBlocksTab` tests. ([45652](https://github.com/WordPress/gutenberg/pull/45652))
-- LinkControl: Suppress errors on null values. ([45742](https://github.com/WordPress/gutenberg/pull/45742))
-- Simplify ResizableEditor component. ([45578](https://github.com/WordPress/gutenberg/pull/45578))
-- Remove duplicate colon. ([45763](https://github.com/WordPress/gutenberg/pull/45763))
-- Extract the manage menus button to a shared component to reduce duplicate code. ([45769](https://github.com/WordPress/gutenberg/pull/45769))
-- Backport pseudo selector comments from core. ([45619](https://github.com/WordPress/gutenberg/pull/45619))
-- unstableSubscribeStore: Support store descriptors. ([45481](https://github.com/WordPress/gutenberg/pull/45481))
-
-
-#### Components
-- BaseField: Remove unnecessary `.firstChild` from tests. ([45687](https://github.com/WordPress/gutenberg/pull/45687))
-- DateTime: Remove unused types. ([45615](https://github.com/WordPress/gutenberg/pull/45615))
-- Draggable: Convert component to TypeScript. ([45471](https://github.com/WordPress/gutenberg/pull/45471))
-- Fix `no-container` violations in `FormGroup` tests. ([45662](https://github.com/WordPress/gutenberg/pull/45662))
-- Fix `testing-library/no-node-access` in `TreeGrid` tests. ([45554](https://github.com/WordPress/gutenberg/pull/45554))
-- FontSizePicker: Use components instead of helper functions. ([44891](https://github.com/WordPress/gutenberg/pull/44891))
-- Improve tests for `ToggleGroupControl`. ([45627](https://github.com/WordPress/gutenberg/pull/45627))
-- MenuGroup: Convert component to TypeScript. ([45617](https://github.com/WordPress/gutenberg/pull/45617))
-- Popover: Fix exhaustive-deps warning. ([45656](https://github.com/WordPress/gutenberg/pull/45656))
-- Refactor `ItemGroup` to pass `exhaustive-deps`. ([45531](https://github.com/WordPress/gutenberg/pull/45531))
-- Refactor `useFlex` to pass `exhaustive-deps`. ([45528](https://github.com/WordPress/gutenberg/pull/45528))
-- Refactor `withNotices` to pass `exhaustive-deps`. ([45530](https://github.com/WordPress/gutenberg/pull/45530))
-- Refactor`PaletteEditListView` to ignore `exhaustive-deps`. ([45467](https://github.com/WordPress/gutenberg/pull/45467))
-- TabPanel: Fix the `exhaustive-deps` warning. ([45660](https://github.com/WordPress/gutenberg/pull/45660))
-- ToolsPanel: Fix exhaustive-deps hook warning. ([45715](https://github.com/WordPress/gutenberg/pull/45715))
-- Truncate: Remove unnecessary `.firstChild` from tests. ([45694](https://github.com/WordPress/gutenberg/pull/45694))
-- View component: Rename index.js to index.ts. ([45667](https://github.com/WordPress/gutenberg/pull/45667))
-- `ColorPalette`, `BorderBox`, `BorderBoxControl`: Polish and DRY prop types, add default values. ([45463](https://github.com/WordPress/gutenberg/pull/45463))
-- `NavigatorScreen`: Satisfy `exhaustive-deps` eslint rule. ([45648](https://github.com/WordPress/gutenberg/pull/45648))
-- Fix `useCx` story to satisfy `exhaustive-deps` eslint rule. ([45614](https://github.com/WordPress/gutenberg/pull/45614))
-- URLPopover: Use new placement prop instead of legacy position prop. ([44391](https://github.com/WordPress/gutenberg/pull/44391))
-- Tidy and minor refactor of Link UI code. ([37833](https://github.com/WordPress/gutenberg/pull/37833))
-
-#### Block Library
-- Avatar: Escape the 'get_author_posts_url()'. ([45427](https://github.com/WordPress/gutenberg/pull/45427))
-- Button: Remove unnecessary 'useCallback'. ([45584](https://github.com/WordPress/gutenberg/pull/45584))
-- Make unwrapping columns slighly more efficient. ([45684](https://github.com/WordPress/gutenberg/pull/45684))
-- Simplfy handling of save of Nav block uncontrolled inner blocks. ([45517](https://github.com/WordPress/gutenberg/pull/45517))
-- Lodash: Refactor block library away from `_.reduce()`. ([45456](https://github.com/WordPress/gutenberg/pull/45456))
 
+-   Block Editor: Improve `LinkControl` tests. ([45609](https://github.com/WordPress/gutenberg/pull/45609))
+-   Block Editor: Improve `ResponsiveBlockControl` tests. ([45610](https://github.com/WordPress/gutenberg/pull/45610))
+-   Block Editor: Improve `ReusableBlocksTab` tests. ([45652](https://github.com/WordPress/gutenberg/pull/45652))
+-   LinkControl: Suppress errors on null values. ([45742](https://github.com/WordPress/gutenberg/pull/45742))
+-   Simplify ResizableEditor component. ([45578](https://github.com/WordPress/gutenberg/pull/45578))
+-   Remove duplicate colon. ([45763](https://github.com/WordPress/gutenberg/pull/45763))
+-   Extract the manage menus button to a shared component to reduce duplicate code. ([45769](https://github.com/WordPress/gutenberg/pull/45769))
+-   Backport pseudo selector comments from core. ([45619](https://github.com/WordPress/gutenberg/pull/45619))
+-   unstableSubscribeStore: Support store descriptors. ([45481](https://github.com/WordPress/gutenberg/pull/45481))
+
+#### Components
+
+-   BaseField: Remove unnecessary `.firstChild` from tests. ([45687](https://github.com/WordPress/gutenberg/pull/45687))
+-   DateTime: Remove unused types. ([45615](https://github.com/WordPress/gutenberg/pull/45615))
+-   Draggable: Convert component to TypeScript. ([45471](https://github.com/WordPress/gutenberg/pull/45471))
+-   Fix `no-container` violations in `FormGroup` tests. ([45662](https://github.com/WordPress/gutenberg/pull/45662))
+-   Fix `testing-library/no-node-access` in `TreeGrid` tests. ([45554](https://github.com/WordPress/gutenberg/pull/45554))
+-   FontSizePicker: Use components instead of helper functions. ([44891](https://github.com/WordPress/gutenberg/pull/44891))
+-   Improve tests for `ToggleGroupControl`. ([45627](https://github.com/WordPress/gutenberg/pull/45627))
+-   MenuGroup: Convert component to TypeScript. ([45617](https://github.com/WordPress/gutenberg/pull/45617))
+-   Popover: Fix exhaustive-deps warning. ([45656](https://github.com/WordPress/gutenberg/pull/45656))
+-   Refactor `ItemGroup` to pass `exhaustive-deps`. ([45531](https://github.com/WordPress/gutenberg/pull/45531))
+-   Refactor `useFlex` to pass `exhaustive-deps`. ([45528](https://github.com/WordPress/gutenberg/pull/45528))
+-   Refactor `withNotices` to pass `exhaustive-deps`. ([45530](https://github.com/WordPress/gutenberg/pull/45530))
+-   Refactor`PaletteEditListView` to ignore `exhaustive-deps`. ([45467](https://github.com/WordPress/gutenberg/pull/45467))
+-   TabPanel: Fix the `exhaustive-deps` warning. ([45660](https://github.com/WordPress/gutenberg/pull/45660))
+-   ToolsPanel: Fix exhaustive-deps hook warning. ([45715](https://github.com/WordPress/gutenberg/pull/45715))
+-   Truncate: Remove unnecessary `.firstChild` from tests. ([45694](https://github.com/WordPress/gutenberg/pull/45694))
+-   View component: Rename index.js to index.ts. ([45667](https://github.com/WordPress/gutenberg/pull/45667))
+-   `ColorPalette`, `BorderBox`, `BorderBoxControl`: Polish and DRY prop types, add default values. ([45463](https://github.com/WordPress/gutenberg/pull/45463))
+-   `NavigatorScreen`: Satisfy `exhaustive-deps` eslint rule. ([45648](https://github.com/WordPress/gutenberg/pull/45648))
+-   Fix `useCx` story to satisfy `exhaustive-deps` eslint rule. ([45614](https://github.com/WordPress/gutenberg/pull/45614))
+-   URLPopover: Use new placement prop instead of legacy position prop. ([44391](https://github.com/WordPress/gutenberg/pull/44391))
+-   Tidy and minor refactor of Link UI code. ([37833](https://github.com/WordPress/gutenberg/pull/37833))
+
+#### Block Library
+
+-   Avatar: Escape the 'get_author_posts_url()'. ([45427](https://github.com/WordPress/gutenberg/pull/45427))
+-   Button: Remove unnecessary 'useCallback'. ([45584](https://github.com/WordPress/gutenberg/pull/45584))
+-   Make unwrapping columns slighly more efficient. ([45684](https://github.com/WordPress/gutenberg/pull/45684))
+-   Simplfy handling of save of Nav block uncontrolled inner blocks. ([45517](https://github.com/WordPress/gutenberg/pull/45517))
+-   Lodash: Refactor block library away from `_.reduce()`. ([45456](https://github.com/WordPress/gutenberg/pull/45456))
 
 ### Tools
 
 #### Testing
-- Components: Add `exhaustive-deps` eslint rule. ([41166](https://github.com/WordPress/gutenberg/pull/41166))
-- Fix typos in Paragraph block end-to-end tests. ([45611](https://github.com/WordPress/gutenberg/pull/45611))
-- FontSizePicker: Fix a buggy unit test. ([45529](https://github.com/WordPress/gutenberg/pull/45529))
-- Ignore warnings for `window.wp` in Playwright. ([45598](https://github.com/WordPress/gutenberg/pull/45598))
-- Migrate mentions tests to playwright. ([43064](https://github.com/WordPress/gutenberg/pull/43064))
-- Navigation Toggle unit test: Unmount synchronously to cancel popover positioning. ([45726](https://github.com/WordPress/gutenberg/pull/45726))
-- React Native unit tests: Migrate getByA11yLabel usages. ([45454](https://github.com/WordPress/gutenberg/pull/45454))
-- Unit Tests: Rewrite ReactDOM.render usages to RTL. ([45453](https://github.com/WordPress/gutenberg/pull/45453))
-- E2E: Add site and widget editor supports for ensureSidebarOpened. ([45480](https://github.com/WordPress/gutenberg/pull/45480))
+
+-   Components: Add `exhaustive-deps` eslint rule. ([41166](https://github.com/WordPress/gutenberg/pull/41166))
+-   Fix typos in Paragraph block end-to-end tests. ([45611](https://github.com/WordPress/gutenberg/pull/45611))
+-   FontSizePicker: Fix a buggy unit test. ([45529](https://github.com/WordPress/gutenberg/pull/45529))
+-   Ignore warnings for `window.wp` in Playwright. ([45598](https://github.com/WordPress/gutenberg/pull/45598))
+-   Migrate mentions tests to playwright. ([43064](https://github.com/WordPress/gutenberg/pull/43064))
+-   Navigation Toggle unit test: Unmount synchronously to cancel popover positioning. ([45726](https://github.com/WordPress/gutenberg/pull/45726))
+-   React Native unit tests: Migrate getByA11yLabel usages. ([45454](https://github.com/WordPress/gutenberg/pull/45454))
+-   Unit Tests: Rewrite ReactDOM.render usages to RTL. ([45453](https://github.com/WordPress/gutenberg/pull/45453))
+-   E2E: Add site and widget editor supports for ensureSidebarOpened. ([45480](https://github.com/WordPress/gutenberg/pull/45480))
 
 #### Build Tooling
-- Include TS and JSX files to testing-library lint. ([45533](https://github.com/WordPress/gutenberg/pull/45533))
-- Remove use of `set-output` in workflows. ([45357](https://github.com/WordPress/gutenberg/pull/45357))
 
-#### Triage
-- Configure labels for GHA Dependabot PRs. ([45516](https://github.com/WordPress/gutenberg/pull/45516))
+-   Include TS and JSX files to testing-library lint. ([45533](https://github.com/WordPress/gutenberg/pull/45533))
+-   Remove use of `set-output` in workflows. ([45357](https://github.com/WordPress/gutenberg/pull/45357))
 
-#### Patterns
-- Pattern Directory API: Add support for pagination parameters. ([45293](https://github.com/WordPress/gutenberg/pull/45293))
-- Update bundled patterns compat directory. ([45620](https://github.com/WordPress/gutenberg/pull/45620))
+#### Triage
 
+-   Configure labels for GHA Dependabot PRs. ([45516](https://github.com/WordPress/gutenberg/pull/45516))
 
+#### Patterns
 
-## First time contributors
+-   Pattern Directory API: Add support for pagination parameters. ([45293](https://github.com/WordPress/gutenberg/pull/45293))
+-   Update bundled patterns compat directory. ([45620](https://github.com/WordPress/gutenberg/pull/45620))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @edanzer: Template Part Block: Update block isActive method. ([45672](https://github.com/WordPress/gutenberg/pull/45672))
-- @TimBroddin: Fix alignment of create new post link. ([45638](https://github.com/WordPress/gutenberg/pull/45638))
-- @wojtekn: Make Author block selector to display all users instead of just 10. ([45640](https://github.com/WordPress/gutenberg/pull/45640))
+The following PRs were merged by first-time contributors:
 
+-   @edanzer: Template Part Block: Update block isActive method. ([45672](https://github.com/WordPress/gutenberg/pull/45672))
+-   @TimBroddin: Fix alignment of create new post link. ([45638](https://github.com/WordPress/gutenberg/pull/45638))
+-   @wojtekn: Make Author block selector to display all users instead of just 10. ([45640](https://github.com/WordPress/gutenberg/pull/45640))
 
 ## Contributors
 
@@ -10611,17 +21861,13 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @andrewserong @bph @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @Copons @DaisyOlsen @desrosj @dinhtungdu @draganescu @dsas @edanzer @ellatrix @enejb @flootr @getdave @glendaviesnz @hz-tyfoon @jasmussen @javierarce @jffng @jonathanbossenger @jorgefilipecosta @jsnajdr @juanmaguitar @juhi123 @kevin940726 @Mamaduka @matiasbenedetto @mikachan @mirka @mmtr @mtias @ndiego @nielslange @noisysocks @ntsekouras @peterwilsoncc @ramonjd @ryelle @scruffian @spacedmonkey @t-hamano @TimBroddin @tyxla @vcanales @walbo @wojtekn @youknowriad @yuliyan
 
-
 = 14.5.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
-- Fix: Prevent infinite loop in Tag Processor in certain truncated documents (https://github.com/WordPress/gutenberg/pull/45537)
-
+-   Fix: Prevent infinite loop in Tag Processor in certain truncated documents (https://github.com/WordPress/gutenberg/pull/45537)
 
 = 14.5.0 =
 
@@ -10629,185 +21875,185 @@ The following contributors merged PRs in this release:
 
 ### Enhancements
 
-- Add block pattern categories' descriptions to the REST API and update the descriptions. ([45244](https://github.com/WordPress/gutenberg/pull/45244))
-- Create Block: Update templates to use APIs introduced in WP 6.1. ([44185](https://github.com/WordPress/gutenberg/pull/44185))
-- setAvailableMetaBoxesPerLocation: Merge new metaboxes into existing. ([45156](https://github.com/WordPress/gutenberg/pull/45156))
-- Spacing visualizer: Add option to trigger with mousover as well as value change. ([44955](https://github.com/WordPress/gutenberg/pull/44955))
-- Style Engine: Add support for dimensions.minHeight property. ([45334](https://github.com/WordPress/gutenberg/pull/45334))
-- Try: Add layout classnames to inner block wrapper. ([44600](https://github.com/WordPress/gutenberg/pull/44600))
-
-#### Block Library
-
-- Audio, Video: Add toolbar button to add/remove caption. ([45112](https://github.com/WordPress/gutenberg/pull/45112), [45113](https://github.com/WordPress/gutenberg/pull/45113))
-- Comment Template, Post Comment Count, Post Comments Form, Post Comments Link: Add spacing support. ([45101](https://github.com/WordPress/gutenberg/pull/45101), [45150](https://github.com/WordPress/gutenberg/pull/45150), [45091](https://github.com/WordPress/gutenberg/pull/45091), [45184](https://github.com/WordPress/gutenberg/pull/45184))
-- Gallery: Register styles with Style Engine. ([43070](https://github.com/WordPress/gutenberg/pull/43070))
-- Navigation: Return undefined from useEffect. ([45239](https://github.com/WordPress/gutenberg/pull/45239))
-- Social Icons: Add rel attribute. ([45469](https://github.com/WordPress/gutenberg/pull/45469))
-- Video: Update tracks editor icon to text button. ([45245](https://github.com/WordPress/gutenberg/pull/45245))
-
-#### Components
-
-- Block mover button: Do not show focus styles on pointer interactions. ([45126](https://github.com/WordPress/gutenberg/pull/45126))
-- BorderControl, BorderBoxControl, BorderRadiusControl: Update control components to allow 40px height. ([41860](https://github.com/WordPress/gutenberg/pull/41860))
-- BoxControl, Card, ToolsPanel: Remove unnecessary wrappers in stories. ([45305](https://github.com/WordPress/gutenberg/pull/45305))
-- Button: Change the color on the destructive button focus state. ([44427](https://github.com/WordPress/gutenberg/pull/44427))
-- Button: Refactor Storybook to controls and align documentation. ([44105](https://github.com/WordPress/gutenberg/pull/44105))
-- ColorPalette: Convert to TypeScript. ([44632](https://github.com/WordPress/gutenberg/pull/44632))
-- DateTimePicker: Add `__next*` props in Storybook. ([45164](https://github.com/WordPress/gutenberg/pull/45164))
-- FontSizePicker: Update design when `withSlider` is set. ([44598](https://github.com/WordPress/gutenberg/pull/44598))
-- FormFileUpload: Remove unused story file. ([45286](https://github.com/WordPress/gutenberg/pull/45286))
-- NumberControl: Add custom spin buttons. ([45333](https://github.com/WordPress/gutenberg/pull/45333))
-- RadioGroup: Mark as deprecated. ([45389](https://github.com/WordPress/gutenberg/pull/45389))
-- Navigator: Revert the removal of overflow styles from NavigatorScreen. ([45303](https://github.com/WordPress/gutenberg/pull/45303))
-- SelectControl: Add onChange, onBlur, and onFocus to storybook actions. ([45432](https://github.com/WordPress/gutenberg/pull/45432))
-- Storybook: Addon to wrap stories in max-width div. ([45134](https://github.com/WordPress/gutenberg/pull/45134))
-- TextControl: Set Storybook control types on help, label and type. ([45405](https://github.com/WordPress/gutenberg/pull/45405))
-- ToggleGroupControl: Add de-selectable variant. ([45123](https://github.com/WordPress/gutenberg/pull/45123))
-- ToggleGroupControl: Remove invalid props from types. ([45114](https://github.com/WordPress/gutenberg/pull/45114))
+-   Add block pattern categories' descriptions to the REST API and update the descriptions. ([45244](https://github.com/WordPress/gutenberg/pull/45244))
+-   Create Block: Update templates to use APIs introduced in WP 6.1. ([44185](https://github.com/WordPress/gutenberg/pull/44185))
+-   setAvailableMetaBoxesPerLocation: Merge new metaboxes into existing. ([45156](https://github.com/WordPress/gutenberg/pull/45156))
+-   Spacing visualizer: Add option to trigger with mousover as well as value change. ([44955](https://github.com/WordPress/gutenberg/pull/44955))
+-   Style Engine: Add support for dimensions.minHeight property. ([45334](https://github.com/WordPress/gutenberg/pull/45334))
+-   Try: Add layout classnames to inner block wrapper. ([44600](https://github.com/WordPress/gutenberg/pull/44600))
+
+#### Block Library
+
+-   Audio, Video: Add toolbar button to add/remove caption. ([45112](https://github.com/WordPress/gutenberg/pull/45112), [45113](https://github.com/WordPress/gutenberg/pull/45113))
+-   Comment Template, Post Comment Count, Post Comments Form, Post Comments Link: Add spacing support. ([45101](https://github.com/WordPress/gutenberg/pull/45101), [45150](https://github.com/WordPress/gutenberg/pull/45150), [45091](https://github.com/WordPress/gutenberg/pull/45091), [45184](https://github.com/WordPress/gutenberg/pull/45184))
+-   Gallery: Register styles with Style Engine. ([43070](https://github.com/WordPress/gutenberg/pull/43070))
+-   Navigation: Return undefined from useEffect. ([45239](https://github.com/WordPress/gutenberg/pull/45239))
+-   Social Icons: Add rel attribute. ([45469](https://github.com/WordPress/gutenberg/pull/45469))
+-   Video: Update tracks editor icon to text button. ([45245](https://github.com/WordPress/gutenberg/pull/45245))
+
+#### Components
+
+-   Block mover button: Do not show focus styles on pointer interactions. ([45126](https://github.com/WordPress/gutenberg/pull/45126))
+-   BorderControl, BorderBoxControl, BorderRadiusControl: Update control components to allow 40px height. ([41860](https://github.com/WordPress/gutenberg/pull/41860))
+-   BoxControl, Card, ToolsPanel: Remove unnecessary wrappers in stories. ([45305](https://github.com/WordPress/gutenberg/pull/45305))
+-   Button: Change the color on the destructive button focus state. ([44427](https://github.com/WordPress/gutenberg/pull/44427))
+-   Button: Refactor Storybook to controls and align documentation. ([44105](https://github.com/WordPress/gutenberg/pull/44105))
+-   ColorPalette: Convert to TypeScript. ([44632](https://github.com/WordPress/gutenberg/pull/44632))
+-   DateTimePicker: Add `__next*` props in Storybook. ([45164](https://github.com/WordPress/gutenberg/pull/45164))
+-   FontSizePicker: Update design when `withSlider` is set. ([44598](https://github.com/WordPress/gutenberg/pull/44598))
+-   FormFileUpload: Remove unused story file. ([45286](https://github.com/WordPress/gutenberg/pull/45286))
+-   NumberControl: Add custom spin buttons. ([45333](https://github.com/WordPress/gutenberg/pull/45333))
+-   RadioGroup: Mark as deprecated. ([45389](https://github.com/WordPress/gutenberg/pull/45389))
+-   Navigator: Revert the removal of overflow styles from NavigatorScreen. ([45303](https://github.com/WordPress/gutenberg/pull/45303))
+-   SelectControl: Add onChange, onBlur, and onFocus to storybook actions. ([45432](https://github.com/WordPress/gutenberg/pull/45432))
+-   Storybook: Addon to wrap stories in max-width div. ([45134](https://github.com/WordPress/gutenberg/pull/45134))
+-   TextControl: Set Storybook control types on help, label and type. ([45405](https://github.com/WordPress/gutenberg/pull/45405))
+-   ToggleGroupControl: Add de-selectable variant. ([45123](https://github.com/WordPress/gutenberg/pull/45123))
+-   ToggleGroupControl: Remove invalid props from types. ([45114](https://github.com/WordPress/gutenberg/pull/45114))
 
 #### Post Editor
 
-- Edit Post: Improve distraction-free mode notices. ([45348](https://github.com/WordPress/gutenberg/pull/45348))
-- hasChangedContent: Remove obsolete blocks check. ([45090](https://github.com/WordPress/gutenberg/pull/45090))
-- Move document information and outline to list view panel. ([44788](https://github.com/WordPress/gutenberg/pull/44788))
+-   Edit Post: Improve distraction-free mode notices. ([45348](https://github.com/WordPress/gutenberg/pull/45348))
+-   hasChangedContent: Remove obsolete blocks check. ([45090](https://github.com/WordPress/gutenberg/pull/45090))
+-   Move document information and outline to list view panel. ([44788](https://github.com/WordPress/gutenberg/pull/44788))
 
 #### Global Styles
 
-- Add `:visited` pseudo selector to theme.json schema. ([45236](https://github.com/WordPress/gutenberg/pull/45236))
-- Embed, Gallery, Video: Add deprecation for the caption element. ([45166](https://github.com/WordPress/gutenberg/pull/45166), [45173](https://github.com/WordPress/gutenberg/pull/45173), [45169](https://github.com/WordPress/gutenberg/pull/45169))
-- File Block: Add a deprecation for the button element class name. ([45159](https://github.com/WordPress/gutenberg/pull/45159))
-- Table Block: Add a deprecation for the figcaption element class name. ([45161](https://github.com/WordPress/gutenberg/pull/45161))
+-   Add `:visited` pseudo selector to theme.json schema. ([45236](https://github.com/WordPress/gutenberg/pull/45236))
+-   Embed, Gallery, Video: Add deprecation for the caption element. ([45166](https://github.com/WordPress/gutenberg/pull/45166), [45173](https://github.com/WordPress/gutenberg/pull/45173), [45169](https://github.com/WordPress/gutenberg/pull/45169))
+-   File Block: Add a deprecation for the button element class name. ([45159](https://github.com/WordPress/gutenberg/pull/45159))
+-   Table Block: Add a deprecation for the figcaption element class name. ([45161](https://github.com/WordPress/gutenberg/pull/45161))
 
 ### Bug Fixes
 
-- Ensure block content is always returned as a string after processing. ([45330](https://github.com/WordPress/gutenberg/pull/45330))
-- Fix distraction free shortcut typo. ([45186](https://github.com/WordPress/gutenberg/pull/45186))
-- Fix resizeable editor scrolling. ([45189](https://github.com/WordPress/gutenberg/pull/45189))
-- Fix handling of nullish comments in the pot-to-PHP script. ([45414](https://github.com/WordPress/gutenberg/pull/45414))
-- Fix image caption supports Voice Control. ([44850](https://github.com/WordPress/gutenberg/pull/44850))
-- Fix PHP warning in pattern categories REST API controller. ([45410](https://github.com/WordPress/gutenberg/pull/45410))
-- Fix Prevent infinite loop in Tag Processor in certain truncated documents. ([45537](https://github.com/WordPress/gutenberg/pull/45537))
-- Hide insertion point when moving out of the canvas. ([45420](https://github.com/WordPress/gutenberg/pull/45420))
-- Metaboxes: Perform hasMetaBoxes check on every save. ([45145](https://github.com/WordPress/gutenberg/pull/45145))
-- Prevent unexpected copying of the post title. ([41284](https://github.com/WordPress/gutenberg/pull/41284))
-- Raw Handling: When pasting bullet characters, convert to astericks for markdown converter. ([45017](https://github.com/WordPress/gutenberg/pull/45017))
-- Web Font: Fix ascent/descent-override property typo. ([45125](https://github.com/WordPress/gutenberg/pull/45125))
-
-#### Block Library
-
-- Button: Reset background-image property for outline button style. ([45234](https://github.com/WordPress/gutenberg/pull/45234))
-- Cover, Search, Spacer: Fix control widths. ([45329](https://github.com/WordPress/gutenberg/pull/45329))
-- Navigation: Fix saving/loading experience of uncontrolled blocks. ([45486](https://github.com/WordPress/gutenberg/pull/45486))
-- Navigation: Add padding to buttons when Submenus Open on click is enabled. ([44605](https://github.com/WordPress/gutenberg/pull/44605))
-- List: Fix migration when the nested list is invalid. ([44822](https://github.com/WordPress/gutenberg/pull/44822))
-- Page List: Allow direct selection of nested Page List block by avoiding dual rendering within block. ([45143](https://github.com/WordPress/gutenberg/pull/45143))
-- Site Tagline: Fix user permission HTTP errors. ([45140](https://github.com/WordPress/gutenberg/pull/45140))
-- Site Title: Avoid 403 errors for users with low permissions. ([45093](https://github.com/WordPress/gutenberg/pull/45093))
+-   Ensure block content is always returned as a string after processing. ([45330](https://github.com/WordPress/gutenberg/pull/45330))
+-   Fix distraction free shortcut typo. ([45186](https://github.com/WordPress/gutenberg/pull/45186))
+-   Fix resizeable editor scrolling. ([45189](https://github.com/WordPress/gutenberg/pull/45189))
+-   Fix handling of nullish comments in the pot-to-PHP script. ([45414](https://github.com/WordPress/gutenberg/pull/45414))
+-   Fix image caption supports Voice Control. ([44850](https://github.com/WordPress/gutenberg/pull/44850))
+-   Fix PHP warning in pattern categories REST API controller. ([45410](https://github.com/WordPress/gutenberg/pull/45410))
+-   Fix Prevent infinite loop in Tag Processor in certain truncated documents. ([45537](https://github.com/WordPress/gutenberg/pull/45537))
+-   Hide insertion point when moving out of the canvas. ([45420](https://github.com/WordPress/gutenberg/pull/45420))
+-   Metaboxes: Perform hasMetaBoxes check on every save. ([45145](https://github.com/WordPress/gutenberg/pull/45145))
+-   Prevent unexpected copying of the post title. ([41284](https://github.com/WordPress/gutenberg/pull/41284))
+-   Raw Handling: When pasting bullet characters, convert to astericks for markdown converter. ([45017](https://github.com/WordPress/gutenberg/pull/45017))
+-   Web Font: Fix ascent/descent-override property typo. ([45125](https://github.com/WordPress/gutenberg/pull/45125))
+
+#### Block Library
+
+-   Button: Reset background-image property for outline button style. ([45234](https://github.com/WordPress/gutenberg/pull/45234))
+-   Cover, Search, Spacer: Fix control widths. ([45329](https://github.com/WordPress/gutenberg/pull/45329))
+-   Navigation: Fix saving/loading experience of uncontrolled blocks. ([45486](https://github.com/WordPress/gutenberg/pull/45486))
+-   Navigation: Add padding to buttons when Submenus Open on click is enabled. ([44605](https://github.com/WordPress/gutenberg/pull/44605))
+-   List: Fix migration when the nested list is invalid. ([44822](https://github.com/WordPress/gutenberg/pull/44822))
+-   Page List: Allow direct selection of nested Page List block by avoiding dual rendering within block. ([45143](https://github.com/WordPress/gutenberg/pull/45143))
+-   Site Tagline: Fix user permission HTTP errors. ([45140](https://github.com/WordPress/gutenberg/pull/45140))
+-   Site Title: Avoid 403 errors for users with low permissions. ([45093](https://github.com/WordPress/gutenberg/pull/45093))
 
 #### Components
 
-- AnglePickerControl: Set Storybook label control type to text. ([45122](https://github.com/WordPress/gutenberg/pull/45122))
-- AutocompleteUI: Close popup when click happens outside of the popover. ([44795](https://github.com/WordPress/gutenberg/pull/44795))
-- BorderControl: Await floating-ui state changes when rendering/opening popover to fix unit test failures. ([45241](https://github.com/WordPress/gutenberg/pull/45241))
-- Button component: Fix RTL alignment when containing icon and text. ([44787](https://github.com/WordPress/gutenberg/pull/44787))
-- ColorPalette: Fix transparent checkered background pattern. ([45295](https://github.com/WordPress/gutenberg/pull/45295))
-- ExternalLink: Update to support onClick handler. ([45214](https://github.com/WordPress/gutenberg/pull/45214))
-- InputControl: Allow inline styles to be applied to wrapper instead of inner input. ([45340](https://github.com/WordPress/gutenberg/pull/45340))
-- ItemGroup: Fix RTL text alignment when item is clickable. ([45280](https://github.com/WordPress/gutenberg/pull/45280))
-- Popover: Fix deprecations. ([45195](https://github.com/WordPress/gutenberg/pull/45195))
-- PublishDateTimePicker: Retrieve all future posts in a given month. ([44540](https://github.com/WordPress/gutenberg/pull/44540))
-- SpacingSizesControl: Remove UnitControl inline style use. ([45412](https://github.com/WordPress/gutenberg/pull/45412))
-- TabPanel: Add tests and changelog for onSelect behavior change. ([45211](https://github.com/WordPress/gutenberg/pull/45211))
-- UnitControl: Fix disabled style is overridden by forms.css. ([45250](https://github.com/WordPress/gutenberg/pull/45250))
-- Visual Editor: Fix permission error. ([45262](https://github.com/WordPress/gutenberg/pull/45262))
+-   AnglePickerControl: Set Storybook label control type to text. ([45122](https://github.com/WordPress/gutenberg/pull/45122))
+-   AutocompleteUI: Close popup when click happens outside of the popover. ([44795](https://github.com/WordPress/gutenberg/pull/44795))
+-   BorderControl: Await floating-ui state changes when rendering/opening popover to fix unit test failures. ([45241](https://github.com/WordPress/gutenberg/pull/45241))
+-   Button component: Fix RTL alignment when containing icon and text. ([44787](https://github.com/WordPress/gutenberg/pull/44787))
+-   ColorPalette: Fix transparent checkered background pattern. ([45295](https://github.com/WordPress/gutenberg/pull/45295))
+-   ExternalLink: Update to support onClick handler. ([45214](https://github.com/WordPress/gutenberg/pull/45214))
+-   InputControl: Allow inline styles to be applied to wrapper instead of inner input. ([45340](https://github.com/WordPress/gutenberg/pull/45340))
+-   ItemGroup: Fix RTL text alignment when item is clickable. ([45280](https://github.com/WordPress/gutenberg/pull/45280))
+-   Popover: Fix deprecations. ([45195](https://github.com/WordPress/gutenberg/pull/45195))
+-   PublishDateTimePicker: Retrieve all future posts in a given month. ([44540](https://github.com/WordPress/gutenberg/pull/44540))
+-   SpacingSizesControl: Remove UnitControl inline style use. ([45412](https://github.com/WordPress/gutenberg/pull/45412))
+-   TabPanel: Add tests and changelog for onSelect behavior change. ([45211](https://github.com/WordPress/gutenberg/pull/45211))
+-   UnitControl: Fix disabled style is overridden by forms.css. ([45250](https://github.com/WordPress/gutenberg/pull/45250))
+-   Visual Editor: Fix permission error. ([45262](https://github.com/WordPress/gutenberg/pull/45262))
 
 #### Site Editor
 
-- Fix clipped body background style in the Site Editor. ([45261](https://github.com/WordPress/gutenberg/pull/45261))
-- Only mark the 'Site' menu item active when editing a home template. ([42807](https://github.com/WordPress/gutenberg/pull/42807))
+-   Fix clipped body background style in the Site Editor. ([45261](https://github.com/WordPress/gutenberg/pull/45261))
+-   Only mark the 'Site' menu item active when editing a home template. ([42807](https://github.com/WordPress/gutenberg/pull/42807))
 
 ### Performance
 
-- Lodash: Refactor away from using Lodash. ([45311](https://github.com/WordPress/gutenberg/pull/45311), [45306](https://github.com/WordPress/gutenberg/pull/45306), [45335](https://github.com/WordPress/gutenberg/pull/45335), [45338](https://github.com/WordPress/gutenberg/pull/45338), [45310](https://github.com/WordPress/gutenberg/pull/45310), [45098](https://github.com/WordPress/gutenberg/pull/45098), [45282](https://github.com/WordPress/gutenberg/pull/45282), [45316](https://github.com/WordPress/gutenberg/pull/45316), [45342](https://github.com/WordPress/gutenberg/pull/45342), [45307](https://github.com/WordPress/gutenberg/pull/45307), [45312](https://github.com/WordPress/gutenberg/pull/45312), [45337](https://github.com/WordPress/gutenberg/pull/45337), [45367](https://github.com/WordPress/gutenberg/pull/45367), [44980](https://github.com/WordPress/gutenberg/pull/44980), [45281](https://github.com/WordPress/gutenberg/pull/45281))
+-   Lodash: Refactor away from using Lodash. ([45311](https://github.com/WordPress/gutenberg/pull/45311), [45306](https://github.com/WordPress/gutenberg/pull/45306), [45335](https://github.com/WordPress/gutenberg/pull/45335), [45338](https://github.com/WordPress/gutenberg/pull/45338), [45310](https://github.com/WordPress/gutenberg/pull/45310), [45098](https://github.com/WordPress/gutenberg/pull/45098), [45282](https://github.com/WordPress/gutenberg/pull/45282), [45316](https://github.com/WordPress/gutenberg/pull/45316), [45342](https://github.com/WordPress/gutenberg/pull/45342), [45307](https://github.com/WordPress/gutenberg/pull/45307), [45312](https://github.com/WordPress/gutenberg/pull/45312), [45337](https://github.com/WordPress/gutenberg/pull/45337), [45367](https://github.com/WordPress/gutenberg/pull/45367), [44980](https://github.com/WordPress/gutenberg/pull/44980), [45281](https://github.com/WordPress/gutenberg/pull/45281))
 
 ### Documentation
 
-- Add a readme to the letter spacing component. ([45308](https://github.com/WordPress/gutenberg/pull/45308))
-- Add changelogs for internal refactorings using inert. ([45269](https://github.com/WordPress/gutenberg/pull/45269))
-- Add "Do not use in production" message to content locking experimental API's. ([45291](https://github.com/WordPress/gutenberg/pull/45291))
-- Add Storybook intro. ([45115](https://github.com/WordPress/gutenberg/pull/45115))
-- Code Quality: Fix some misspelled words. ([45222](https://github.com/WordPress/gutenberg/pull/45222))
-- Disabled: Update documentation to clarify the absence of inert polyfill. ([45272](https://github.com/WordPress/gutenberg/pull/45272))
-- Fix incorrect character in code example. ([45355](https://github.com/WordPress/gutenberg/pull/45355))
-- Fix missing anchor link in FAQ URL. ([45232](https://github.com/WordPress/gutenberg/pull/45232))
-- FontSizePicker: Update changelog for #45041. ([45180](https://github.com/WordPress/gutenberg/pull/45180))
-- Updating curation document to include content lock ability. ([44908](https://github.com/WordPress/gutenberg/pull/44908))
-- useAnchorRef: Update deprecation message. ([45302](https://github.com/WordPress/gutenberg/pull/45302))
+-   Add a readme to the letter spacing component. ([45308](https://github.com/WordPress/gutenberg/pull/45308))
+-   Add changelogs for internal refactorings using inert. ([45269](https://github.com/WordPress/gutenberg/pull/45269))
+-   Add "Do not use in production" message to content locking experimental API's. ([45291](https://github.com/WordPress/gutenberg/pull/45291))
+-   Add Storybook intro. ([45115](https://github.com/WordPress/gutenberg/pull/45115))
+-   Code Quality: Fix some misspelled words. ([45222](https://github.com/WordPress/gutenberg/pull/45222))
+-   Disabled: Update documentation to clarify the absence of inert polyfill. ([45272](https://github.com/WordPress/gutenberg/pull/45272))
+-   Fix incorrect character in code example. ([45355](https://github.com/WordPress/gutenberg/pull/45355))
+-   Fix missing anchor link in FAQ URL. ([45232](https://github.com/WordPress/gutenberg/pull/45232))
+-   FontSizePicker: Update changelog for #45041. ([45180](https://github.com/WordPress/gutenberg/pull/45180))
+-   Updating curation document to include content lock ability. ([44908](https://github.com/WordPress/gutenberg/pull/44908))
+-   useAnchorRef: Update deprecation message. ([45302](https://github.com/WordPress/gutenberg/pull/45302))
 
 ### Code Quality
 
-- Block Editor: Improve `MediaReplaceFlow` tests. ([45424](https://github.com/WordPress/gutenberg/pull/45424))
-- Block Editor: Refactor align tests to RTL. ([45152](https://github.com/WordPress/gutenberg/pull/45152))
-- Editors: Refactor icon tests to follow `no-container` rule. ([45422](https://github.com/WordPress/gutenberg/pull/45422))
-- Fix indent and quote in dependbot.yml. ([45167](https://github.com/WordPress/gutenberg/pull/45167))
-- Fix PHP 8.1 deprecation for `strncmp()`. ([44829](https://github.com/WordPress/gutenberg/pull/44829))
-- Popover: Use new placement prop instead of legacy position prop. ([44392](https://github.com/WordPress/gutenberg/pull/44392), [44387](https://github.com/WordPress/gutenberg/pull/44387), [44389](https://github.com/WordPress/gutenberg/pull/44389), [44398](https://github.com/WordPress/gutenberg/pull/44398), [44399](https://github.com/WordPress/gutenberg/pull/44399), [44394](https://github.com/WordPress/gutenberg/pull/44394), [44395](https://github.com/WordPress/gutenberg/pull/44395), [44390](https://github.com/WordPress/gutenberg/pull/44390), [44396](https://github.com/WordPress/gutenberg/pull/44396), [44388](https://github.com/WordPress/gutenberg/pull/44388))
-- PostTextEditor test: Wrap `.blur` calls in `act()`. ([45243](https://github.com/WordPress/gutenberg/pull/45243))
-- Replace the MainDashboardButton slot with a setting in the site editor. ([45149](https://github.com/WordPress/gutenberg/pull/45149))
-- Run script loader test. ([45288](https://github.com/WordPress/gutenberg/pull/45288))
-- Site Editor: Move the save view state to the edit site store. ([45200](https://github.com/WordPress/gutenberg/pull/45200))
-- Small follow-ups to the distraction free mode PR. ([45151](https://github.com/WordPress/gutenberg/pull/45151))
-- Tests: Use `container` instead of `container.firstChild` for snapshots. ([45278](https://github.com/WordPress/gutenberg/pull/45278))
-- useFocusOutside: Rewrite hook to TypeScript, rewrite tests to model RTL and user-event. ([45317](https://github.com/WordPress/gutenberg/pull/45317))
-- useFocusableIframe: Refactor to TypeScript. ([45428](https://github.com/WordPress/gutenberg/pull/45428))
+-   Block Editor: Improve `MediaReplaceFlow` tests. ([45424](https://github.com/WordPress/gutenberg/pull/45424))
+-   Block Editor: Refactor align tests to RTL. ([45152](https://github.com/WordPress/gutenberg/pull/45152))
+-   Editors: Refactor icon tests to follow `no-container` rule. ([45422](https://github.com/WordPress/gutenberg/pull/45422))
+-   Fix indent and quote in dependbot.yml. ([45167](https://github.com/WordPress/gutenberg/pull/45167))
+-   Fix PHP 8.1 deprecation for `strncmp()`. ([44829](https://github.com/WordPress/gutenberg/pull/44829))
+-   Popover: Use new placement prop instead of legacy position prop. ([44392](https://github.com/WordPress/gutenberg/pull/44392), [44387](https://github.com/WordPress/gutenberg/pull/44387), [44389](https://github.com/WordPress/gutenberg/pull/44389), [44398](https://github.com/WordPress/gutenberg/pull/44398), [44399](https://github.com/WordPress/gutenberg/pull/44399), [44394](https://github.com/WordPress/gutenberg/pull/44394), [44395](https://github.com/WordPress/gutenberg/pull/44395), [44390](https://github.com/WordPress/gutenberg/pull/44390), [44396](https://github.com/WordPress/gutenberg/pull/44396), [44388](https://github.com/WordPress/gutenberg/pull/44388))
+-   PostTextEditor test: Wrap `.blur` calls in `act()`. ([45243](https://github.com/WordPress/gutenberg/pull/45243))
+-   Replace the MainDashboardButton slot with a setting in the site editor. ([45149](https://github.com/WordPress/gutenberg/pull/45149))
+-   Run script loader test. ([45288](https://github.com/WordPress/gutenberg/pull/45288))
+-   Site Editor: Move the save view state to the edit site store. ([45200](https://github.com/WordPress/gutenberg/pull/45200))
+-   Small follow-ups to the distraction free mode PR. ([45151](https://github.com/WordPress/gutenberg/pull/45151))
+-   Tests: Use `container` instead of `container.firstChild` for snapshots. ([45278](https://github.com/WordPress/gutenberg/pull/45278))
+-   useFocusOutside: Rewrite hook to TypeScript, rewrite tests to model RTL and user-event. ([45317](https://github.com/WordPress/gutenberg/pull/45317))
+-   useFocusableIframe: Refactor to TypeScript. ([45428](https://github.com/WordPress/gutenberg/pull/45428))
 
 #### Components
 
-- Add a popover `variant` prop and refactor popovers to use it, deprecate `isAlternate`. ([45137](https://github.com/WordPress/gutenberg/pull/45137))
-- Add parseQuantityAndUnitFromRawValue tests. ([45260](https://github.com/WordPress/gutenberg/pull/45260))
-- FontSizePicker: Rewrite unit tests to use userEvent and be more comprehensive. ([45298](https://github.com/WordPress/gutenberg/pull/45298))
-- BorderBoxControl: Improve tests. ([45208](https://github.com/WordPress/gutenberg/pull/45208))
-- ContextSystemProvider, useUpdateEffect, SlotFill, Snackbar, TabPanel: Refactor to pass `exhaustive-deps`. ([45044](https://github.com/WordPress/gutenberg/pull/45044), [44403](https://github.com/WordPress/gutenberg/pull/44403), [44934](https://github.com/WordPress/gutenberg/pull/44934), [44935](https://github.com/WordPress/gutenberg/pull/44935))
-- Remove unnecessary `.firstChild` from tests. ([45419](https://github.com/WordPress/gutenberg/pull/45419))
-- Update some React 18 related types. ([45279](https://github.com/WordPress/gutenberg/pull/45279))
+-   Add a popover `variant` prop and refactor popovers to use it, deprecate `isAlternate`. ([45137](https://github.com/WordPress/gutenberg/pull/45137))
+-   Add parseQuantityAndUnitFromRawValue tests. ([45260](https://github.com/WordPress/gutenberg/pull/45260))
+-   FontSizePicker: Rewrite unit tests to use userEvent and be more comprehensive. ([45298](https://github.com/WordPress/gutenberg/pull/45298))
+-   BorderBoxControl: Improve tests. ([45208](https://github.com/WordPress/gutenberg/pull/45208))
+-   ContextSystemProvider, useUpdateEffect, SlotFill, Snackbar, TabPanel: Refactor to pass `exhaustive-deps`. ([45044](https://github.com/WordPress/gutenberg/pull/45044), [44403](https://github.com/WordPress/gutenberg/pull/44403), [44934](https://github.com/WordPress/gutenberg/pull/44934), [44935](https://github.com/WordPress/gutenberg/pull/44935))
+-   Remove unnecessary `.firstChild` from tests. ([45419](https://github.com/WordPress/gutenberg/pull/45419))
+-   Update some React 18 related types. ([45279](https://github.com/WordPress/gutenberg/pull/45279))
 
 #### Global Styles
 
-- Add `wp_theme_has_theme_json` as a public API to know whether a theme has a `theme.json`. ([45168](https://github.com/WordPress/gutenberg/pull/45168))
-- Deprecate `WP_Theme_JSON_Resolver:Theme_has_support()`. ([45380](https://github.com/WordPress/gutenberg/pull/45380))
+-   Add `wp_theme_has_theme_json` as a public API to know whether a theme has a `theme.json`. ([45168](https://github.com/WordPress/gutenberg/pull/45168))
+-   Deprecate `WP_Theme_JSON_Resolver:Theme_has_support()`. ([45380](https://github.com/WordPress/gutenberg/pull/45380))
 
 ### Tools
 
 #### Testing
 
-- Add Playwright Compatibility-classic-editor Test. ([43979](https://github.com/WordPress/gutenberg/pull/43979))
-- Add end-to-end tests for Drag-and-Drop in the inserter. ([44631](https://github.com/WordPress/gutenberg/pull/44631))
-- Cleanup after the writing flow end-to-end tests. ([45119](https://github.com/WordPress/gutenberg/pull/45119))
-- Fix failing PHPUnit tests. ([45265](https://github.com/WordPress/gutenberg/pull/45265))
-- Fix uploading artifacts even when the tests are successful. ([45187](https://github.com/WordPress/gutenberg/pull/45187))
-- Migrate iframe-rendering test case. ([44535](https://github.com/WordPress/gutenberg/pull/44535))
-- Migrate tests to Playwright. ([43963](https://github.com/WordPress/gutenberg/pull/43963), [45267](https://github.com/WordPress/gutenberg/pull/45267), [44916](https://github.com/WordPress/gutenberg/pull/44916), [44507](https://github.com/WordPress/gutenberg/pull/44507), [45393](https://github.com/WordPress/gutenberg/pull/45393), [43964](https://github.com/WordPress/gutenberg/pull/43964), [45202](https://github.com/WordPress/gutenberg/pull/45202))
-- Re-enable skipped Gallery block end-to-end test. ([45266](https://github.com/WordPress/gutenberg/pull/45266))
-- Try fixing Site Title flaky end-to-end tests. ([45160](https://github.com/WordPress/gutenberg/pull/45160))
-- Update Playwright to v1.27. ([45193](https://github.com/WordPress/gutenberg/pull/45193))
+-   Add Playwright Compatibility-classic-editor Test. ([43979](https://github.com/WordPress/gutenberg/pull/43979))
+-   Add end-to-end tests for Drag-and-Drop in the inserter. ([44631](https://github.com/WordPress/gutenberg/pull/44631))
+-   Cleanup after the writing flow end-to-end tests. ([45119](https://github.com/WordPress/gutenberg/pull/45119))
+-   Fix failing PHPUnit tests. ([45265](https://github.com/WordPress/gutenberg/pull/45265))
+-   Fix uploading artifacts even when the tests are successful. ([45187](https://github.com/WordPress/gutenberg/pull/45187))
+-   Migrate iframe-rendering test case. ([44535](https://github.com/WordPress/gutenberg/pull/44535))
+-   Migrate tests to Playwright. ([43963](https://github.com/WordPress/gutenberg/pull/43963), [45267](https://github.com/WordPress/gutenberg/pull/45267), [44916](https://github.com/WordPress/gutenberg/pull/44916), [44507](https://github.com/WordPress/gutenberg/pull/44507), [45393](https://github.com/WordPress/gutenberg/pull/45393), [43964](https://github.com/WordPress/gutenberg/pull/43964), [45202](https://github.com/WordPress/gutenberg/pull/45202))
+-   Re-enable skipped Gallery block end-to-end test. ([45266](https://github.com/WordPress/gutenberg/pull/45266))
+-   Try fixing Site Title flaky end-to-end tests. ([45160](https://github.com/WordPress/gutenberg/pull/45160))
+-   Update Playwright to v1.27. ([45193](https://github.com/WordPress/gutenberg/pull/45193))
 
 #### Build Tooling
 
-- ESLint: Add and enable `eslint-plugin-testing-library`. ([45103](https://github.com/WordPress/gutenberg/pull/45103))
-- ESLint: Exclude Playwright tests from testing library rules. ([45366](https://github.com/WordPress/gutenberg/pull/45366))
-- Fix native Demo editor build error when using Xcode 14 to build to a physical device. ([45120](https://github.com/WordPress/gutenberg/pull/45120))
-- Remove comments from compiled styles. ([43177](https://github.com/WordPress/gutenberg/pull/43177))
-- Upgrade rtlcss to v4.0.0. ([43208](https://github.com/WordPress/gutenberg/pull/43208))
+-   ESLint: Add and enable `eslint-plugin-testing-library`. ([45103](https://github.com/WordPress/gutenberg/pull/45103))
+-   ESLint: Exclude Playwright tests from testing library rules. ([45366](https://github.com/WordPress/gutenberg/pull/45366))
+-   Fix native Demo editor build error when using Xcode 14 to build to a physical device. ([45120](https://github.com/WordPress/gutenberg/pull/45120))
+-   Remove comments from compiled styles. ([43177](https://github.com/WordPress/gutenberg/pull/43177))
+-   Upgrade rtlcss to v4.0.0. ([43208](https://github.com/WordPress/gutenberg/pull/43208))
 
-## First time contributors
+## First-time contributors
 
-The following PRs were merged by first time contributors:
+The following PRs were merged by first-time contributors:
 
-- @alvitazwar: Migrate iframe-rendering test case. ([44535](https://github.com/WordPress/gutenberg/pull/44535))
-- @GeoJunkie: PublishDateTimePicker: Retrieve all future posts in a given month. ([44540](https://github.com/WordPress/gutenberg/pull/44540))
-- @Initsogar: Components: Update ExternalLink to support onClick handler. ([45214](https://github.com/WordPress/gutenberg/pull/45214))
-- @jornp: Button component: Fix RTL alignment when containing icon and text. ([44787](https://github.com/WordPress/gutenberg/pull/44787))
-- @pkorzelius: Character Swap. ([45355](https://github.com/WordPress/gutenberg/pull/45355))
+-   @alvitazwar: Migrate iframe-rendering test case. ([44535](https://github.com/WordPress/gutenberg/pull/44535))
+-   @GeoJunkie: PublishDateTimePicker: Retrieve all future posts in a given month. ([44540](https://github.com/WordPress/gutenberg/pull/44540))
+-   @Initsogar: Components: Update ExternalLink to support onClick handler. ([45214](https://github.com/WordPress/gutenberg/pull/45214))
+-   @jornp: Button component: Fix RTL alignment when containing icon and text. ([44787](https://github.com/WordPress/gutenberg/pull/44787))
+-   @pkorzelius: Character Swap. ([45355](https://github.com/WordPress/gutenberg/pull/45355))
 
 ## Contributors
 
@@ -10815,251 +22061,244 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @alvitazwar @andrewserong @annezazu @aristath @BE-Webdesign @bph @brookewp @carolinan @chad1008 @ciampo @dcalhoun @dmsnell @ellatrix @fluiddot @GeoJunkie @georgeh @getdave @glendaviesnz @gziolo @Initsogar @jorgefilipecosta @jornp @jsnajdr @kevin940726 @KevinBatdorf @kienstra @Mamaduka @mikachan @mirka @noisysocks @ntsekouras @oandregal @pkorzelius @pooja-muchandikar @ramonjd @SavPhill @scruffian @SiobhyB @Soean @t-hamano @talldan @tellthemachines @tyxla @walbo @youknowriad
 
-
-
-
 = 14.4.0 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
-- Add prop to disable block selection clearer in BlockList. ([44517](https://github.com/WordPress/gutenberg/pull/44517))
-- Multi-select: Fix 1px indent. ([44709](https://github.com/WordPress/gutenberg/pull/44709))
-- ServerSideRender: Add new `skipBlockSupportAttributes` prop. ([44491](https://github.com/WordPress/gutenberg/pull/44491))
-- Tag Processor: Add get_updated_html as a non-toString method of stringifying the markup. ([44597](https://github.com/WordPress/gutenberg/pull/44597))
-- Try: Add a small radius to the multi selection style. ([44708](https://github.com/WordPress/gutenberg/pull/44708))
-- Block Locking: Adds content locking to navigation block. ([44739](https://github.com/WordPress/gutenberg/pull/44739))
-- Rich Text: Use fallback icon for highlight format. ([44705](https://github.com/WordPress/gutenberg/pull/44705))
-- Create Block: Allows custom keys to be generated in block.json files and package.json files. ([44649](https://github.com/WordPress/gutenberg/pull/44649))
+-   Add prop to disable block selection clearer in BlockList. ([44517](https://github.com/WordPress/gutenberg/pull/44517))
+-   Multi-select: Fix 1px indent. ([44709](https://github.com/WordPress/gutenberg/pull/44709))
+-   ServerSideRender: Add new `skipBlockSupportAttributes` prop. ([44491](https://github.com/WordPress/gutenberg/pull/44491))
+-   Tag Processor: Add get_updated_html as a non-toString method of stringifying the markup. ([44597](https://github.com/WordPress/gutenberg/pull/44597))
+-   Try: Add a small radius to the multi selection style. ([44708](https://github.com/WordPress/gutenberg/pull/44708))
+-   Block Locking: Adds content locking to navigation block. ([44739](https://github.com/WordPress/gutenberg/pull/44739))
+-   Rich Text: Use fallback icon for highlight format. ([44705](https://github.com/WordPress/gutenberg/pull/44705))
+-   Create Block: Allows custom keys to be generated in block.json files and package.json files. ([44649](https://github.com/WordPress/gutenberg/pull/44649))
 
 #### Block Library
-- Comments: Add spacing support. ([45102](https://github.com/WordPress/gutenberg/pull/45102))
-- Tag Cloud: Add typography supports (except font size). ([43452](https://github.com/WordPress/gutenberg/pull/43452))
-- Image: Add toolbar button to add a caption. ([44965](https://github.com/WordPress/gutenberg/pull/44965))
-- List Item: Adopt typography supports. ([43312](https://github.com/WordPress/gutenberg/pull/43312))
+
+-   Comments: Add spacing support. ([45102](https://github.com/WordPress/gutenberg/pull/45102))
+-   Tag Cloud: Add typography supports (except font size). ([43452](https://github.com/WordPress/gutenberg/pull/43452))
+-   Image: Add toolbar button to add a caption. ([44965](https://github.com/WordPress/gutenberg/pull/44965))
+-   List Item: Adopt typography supports. ([43312](https://github.com/WordPress/gutenberg/pull/43312))
 
 #### Components
-- BorderBoxControl: Omit unit select when values are mixed. ([44592](https://github.com/WordPress/gutenberg/pull/44592))
-- SuggestionList: Use requestAnimationFrame instead of setTimeout when scrolling selected item into view. ([44573](https://github.com/WordPress/gutenberg/pull/44573))
 
+-   BorderBoxControl: Omit unit select when values are mixed. ([44592](https://github.com/WordPress/gutenberg/pull/44592))
+-   SuggestionList: Use requestAnimationFrame instead of setTimeout when scrolling selected item into view. ([44573](https://github.com/WordPress/gutenberg/pull/44573))
 
 #### Block Editor
-- Introduce distraction free mode. ([41740](https://github.com/WordPress/gutenberg/pull/41740))
-- Redesign the main pattern inserter. ([44028](https://github.com/WordPress/gutenberg/pull/44028))
-- Inserter: Add a more pronounced hover effect. ([44711](https://github.com/WordPress/gutenberg/pull/44711))
 
+-   Introduce distraction free mode. ([41740](https://github.com/WordPress/gutenberg/pull/41740))
+-   Redesign the main pattern inserter. ([44028](https://github.com/WordPress/gutenberg/pull/44028))
+-   Inserter: Add a more pronounced hover effect. ([44711](https://github.com/WordPress/gutenberg/pull/44711))
 
 #### Design Tools
-- SpacingSizesControl: Increase slider's max value to 300. ([44956](https://github.com/WordPress/gutenberg/pull/44956))
-- Style engine: Permit wp custom CSS properties. ([43071](https://github.com/WordPress/gutenberg/pull/43071))
-- Try color theming. ([44668](https://github.com/WordPress/gutenberg/pull/44668))
-- Global Styles: Modify Frame animation of styles grid. ([39717](https://github.com/WordPress/gutenberg/pull/39717))
-
-
-
-### Bug Fixes
-
-
-- Clickable placeholder upload button. ([44817](https://github.com/WordPress/gutenberg/pull/44817))
-- Insertion point showing up unexpectedly. ([44702](https://github.com/WordPress/gutenberg/pull/44702))
-- Overflowing patterns. ([44853](https://github.com/WordPress/gutenberg/pull/44853))
-- Inspector is usable on the top level block even if it is content locked. ([44878](https://github.com/WordPress/gutenberg/pull/44878))
-- Use active variation as the parent block if available. ([44609](https://github.com/WordPress/gutenberg/pull/44609))
-- Placeholder for the navigation link label, to be about the label. ([44733](https://github.com/WordPress/gutenberg/pull/44733))
-- Hide the inbetween inserter consistently as you move the mouse. ([44814](https://github.com/WordPress/gutenberg/pull/44814))
-- Margin visualiser: Apply negative value to margins with calc(). ([44718](https://github.com/WordPress/gutenberg/pull/44718))
-- Placeholder: Fix hover style. ([44701](https://github.com/WordPress/gutenberg/pull/44701))
-- Post editor: Rename view to Preview. ([45074](https://github.com/WordPress/gutenberg/pull/45074))
-- Prevent empty block toolbars from showing empty slots. ([44704](https://github.com/WordPress/gutenberg/pull/44704))
-- Use inert attribute instead of useDisabled. ([44865](https://github.com/WordPress/gutenberg/pull/44865))
-- cleanForSlug: Replace multiple hyphens with a single one. ([44873](https://github.com/WordPress/gutenberg/pull/44873))
-- Block Popover: Fix incorrect positioning of padding and margin visualizers on scroll. ([44998](https://github.com/WordPress/gutenberg/pull/44998))
-- Most used tags: Try fixing label. ([44859](https://github.com/WordPress/gutenberg/pull/44859))
-- Only include theme.css if the theme declares support for wp-block-styles. ([44640](https://github.com/WordPress/gutenberg/pull/44640))
-- Merge inner blocks if wrappers are equal. ([43181](https://github.com/WordPress/gutenberg/pull/43181))
-- Try nested patterns previews with block editor setting. ([44784](https://github.com/WordPress/gutenberg/pull/44784))
-- Design Tools Adjust the custom range steps to match the units chosen. ([44959](https://github.com/WordPress/gutenberg/pull/44959))
-- Global Styles: Invoke zoomed-out view when selecting a style variation. ([44987](https://github.com/WordPress/gutenberg/pull/44987))
-- Plugin: Don't use the custom 'Template Parts' page with WP 6.1 and above. ([45158](https://github.com/WordPress/gutenberg/pull/45158))
-
-
-#### Block Library
-- Avoid querying block templates during installation. ([44584](https://github.com/WordPress/gutenberg/pull/44584))
-- Buttons: Add specificity for the editor. ([44731](https://github.com/WordPress/gutenberg/pull/44731))
-- Embed Block: Add support for Tumblr Dashboard URLs. ([44854](https://github.com/WordPress/gutenberg/pull/44854))
-- Fix list outdents on Enter in quote block. ([44809](https://github.com/WordPress/gutenberg/pull/44809))
-- Fix the cover block focal point picker. ([44991](https://github.com/WordPress/gutenberg/pull/44991))
-- Fix typo for word occurred. ([44914](https://github.com/WordPress/gutenberg/pull/44914))
-- Fix visibility of nested Group block appender. ([45050](https://github.com/WordPress/gutenberg/pull/45050))
-- Fix: Follow discussion settings in the comments block edit. ([44463](https://github.com/WordPress/gutenberg/pull/44463))
-- Group, Row, Stack, Columns. Fix missing border regression. ([44696](https://github.com/WordPress/gutenberg/pull/44696))
-- List Item: Allow Gutenberg to override core block type. ([44911](https://github.com/WordPress/gutenberg/pull/44911))
-- List v2: Selection when creating paragraph from empty list item. ([44864](https://github.com/WordPress/gutenberg/pull/44864))
-- Remove anchor support from the navigation block. ([44721](https://github.com/WordPress/gutenberg/pull/44721))
-- Removes __unstableMaxPages attribute from Page List block (and Nav block). ([44415](https://github.com/WordPress/gutenberg/pull/44415))
-- Site Logo: User permission HTTP errors. ([45104](https://github.com/WordPress/gutenberg/pull/45104))
-- Site logo: Centered state, for upload button. ([44861](https://github.com/WordPress/gutenberg/pull/44861))
-- Media: Cover block text color heuristic for cross origin media. ([44552](https://github.com/WordPress/gutenberg/pull/44552))
-- Icons: Arrow icons being misaligned. ([44666](https://github.com/WordPress/gutenberg/pull/44666))
-- Patterns: Hide list items from content area of content locked blocks. ([44676](https://github.com/WordPress/gutenberg/pull/44676))
-- Templates API: Avoid PHP warning when getting dynamic template data. ([44783](https://github.com/WordPress/gutenberg/pull/44783))
-- Block Settings: Show `move to` on nested blocks when only one root block. ([44827](https://github.com/WordPress/gutenberg/pull/44827))
-- Navigation: Fallback to a classic menu if one is available. ([44173](https://github.com/WordPress/gutenberg/pull/44173))
+
+-   SpacingSizesControl: Increase slider's max value to 300. ([44956](https://github.com/WordPress/gutenberg/pull/44956))
+-   Style engine: Permit wp custom CSS properties. ([43071](https://github.com/WordPress/gutenberg/pull/43071))
+-   Try color theming. ([44668](https://github.com/WordPress/gutenberg/pull/44668))
+-   Global Styles: Modify Frame animation of styles grid. ([39717](https://github.com/WordPress/gutenberg/pull/39717))
+
+### Bug Fixes
+
+-   Clickable placeholder upload button. ([44817](https://github.com/WordPress/gutenberg/pull/44817))
+-   Insertion point showing up unexpectedly. ([44702](https://github.com/WordPress/gutenberg/pull/44702))
+-   Overflowing patterns. ([44853](https://github.com/WordPress/gutenberg/pull/44853))
+-   Inspector is usable on the top level block even if it is content locked. ([44878](https://github.com/WordPress/gutenberg/pull/44878))
+-   Use active variation as the parent block if available. ([44609](https://github.com/WordPress/gutenberg/pull/44609))
+-   Placeholder for the navigation link label, to be about the label. ([44733](https://github.com/WordPress/gutenberg/pull/44733))
+-   Hide the inbetween inserter consistently as you move the mouse. ([44814](https://github.com/WordPress/gutenberg/pull/44814))
+-   Margin visualiser: Apply negative value to margins with calc(). ([44718](https://github.com/WordPress/gutenberg/pull/44718))
+-   Placeholder: Fix hover style. ([44701](https://github.com/WordPress/gutenberg/pull/44701))
+-   Post editor: Rename view to Preview. ([45074](https://github.com/WordPress/gutenberg/pull/45074))
+-   Prevent empty block toolbars from showing empty slots. ([44704](https://github.com/WordPress/gutenberg/pull/44704))
+-   Use inert attribute instead of useDisabled. ([44865](https://github.com/WordPress/gutenberg/pull/44865))
+-   cleanForSlug: Replace multiple hyphens with a single one. ([44873](https://github.com/WordPress/gutenberg/pull/44873))
+-   Block Popover: Fix incorrect positioning of padding and margin visualizers on scroll. ([44998](https://github.com/WordPress/gutenberg/pull/44998))
+-   Most used tags: Try fixing label. ([44859](https://github.com/WordPress/gutenberg/pull/44859))
+-   Only include theme.css if the theme declares support for wp-block-styles. ([44640](https://github.com/WordPress/gutenberg/pull/44640))
+-   Merge inner blocks if wrappers are equal. ([43181](https://github.com/WordPress/gutenberg/pull/43181))
+-   Try nested patterns previews with block editor setting. ([44784](https://github.com/WordPress/gutenberg/pull/44784))
+-   Design Tools Adjust the custom range steps to match the units chosen. ([44959](https://github.com/WordPress/gutenberg/pull/44959))
+-   Global Styles: Invoke zoomed-out view when selecting a style variation. ([44987](https://github.com/WordPress/gutenberg/pull/44987))
+-   Plugin: Don't use the custom 'Template Parts' page with WP 6.1 and above. ([45158](https://github.com/WordPress/gutenberg/pull/45158))
+
+#### Block Library
+
+-   Avoid querying block templates during installation. ([44584](https://github.com/WordPress/gutenberg/pull/44584))
+-   Buttons: Add specificity for the editor. ([44731](https://github.com/WordPress/gutenberg/pull/44731))
+-   Embed Block: Add support for Tumblr Dashboard URLs. ([44854](https://github.com/WordPress/gutenberg/pull/44854))
+-   Fix list outdents on Enter in quote block. ([44809](https://github.com/WordPress/gutenberg/pull/44809))
+-   Fix the cover block focal point picker. ([44991](https://github.com/WordPress/gutenberg/pull/44991))
+-   Fix typo for word occurred. ([44914](https://github.com/WordPress/gutenberg/pull/44914))
+-   Fix visibility of nested Group block appender. ([45050](https://github.com/WordPress/gutenberg/pull/45050))
+-   Fix: Follow discussion settings in the comments block edit. ([44463](https://github.com/WordPress/gutenberg/pull/44463))
+-   Group, Row, Stack, Columns. Fix missing border regression. ([44696](https://github.com/WordPress/gutenberg/pull/44696))
+-   List Item: Allow Gutenberg to override core block type. ([44911](https://github.com/WordPress/gutenberg/pull/44911))
+-   List v2: Selection when creating paragraph from empty list item. ([44864](https://github.com/WordPress/gutenberg/pull/44864))
+-   Remove anchor support from the navigation block. ([44721](https://github.com/WordPress/gutenberg/pull/44721))
+-   Removes \_\_unstableMaxPages attribute from Page List block (and Nav block). ([44415](https://github.com/WordPress/gutenberg/pull/44415))
+-   Site Logo: User permission HTTP errors. ([45104](https://github.com/WordPress/gutenberg/pull/45104))
+-   Site logo: Centered state, for upload button. ([44861](https://github.com/WordPress/gutenberg/pull/44861))
+-   Media: Cover block text color heuristic for cross origin media. ([44552](https://github.com/WordPress/gutenberg/pull/44552))
+-   Icons: Arrow icons being misaligned. ([44666](https://github.com/WordPress/gutenberg/pull/44666))
+-   Patterns: Hide list items from content area of content locked blocks. ([44676](https://github.com/WordPress/gutenberg/pull/44676))
+-   Templates API: Avoid PHP warning when getting dynamic template data. ([44783](https://github.com/WordPress/gutenberg/pull/44783))
+-   Block Settings: Show `move to` on nested blocks when only one root block. ([44827](https://github.com/WordPress/gutenberg/pull/44827))
+-   Navigation: Fallback to a classic menu if one is available. ([44173](https://github.com/WordPress/gutenberg/pull/44173))
 
 #### Site Editor
-- Toggle Navigation Menus Sidebar. ([44860](https://github.com/WordPress/gutenberg/pull/44860))
-- Zoomed out view: Keep list view open when entering mode. ([44781](https://github.com/WordPress/gutenberg/pull/44781))
 
+-   Toggle Navigation Menus Sidebar. ([44860](https://github.com/WordPress/gutenberg/pull/44860))
+-   Zoomed out view: Keep list view open when entering mode. ([44781](https://github.com/WordPress/gutenberg/pull/44781))
 
 #### Block Editor
-- Cover: Fix erroneous focus style in editor. ([44707](https://github.com/WordPress/gutenberg/pull/44707))
-- Native inner blocks merge where appropriate. ([45048](https://github.com/WordPress/gutenberg/pull/45048))
 
+-   Cover: Fix erroneous focus style in editor. ([44707](https://github.com/WordPress/gutenberg/pull/44707))
+-   Native inner blocks merge where appropriate. ([45048](https://github.com/WordPress/gutenberg/pull/45048))
 
 #### Typography
-- Fluid typography: Convert server-side block support values. ([44762](https://github.com/WordPress/gutenberg/pull/44762))
-- Fluid typography: Covert font size number values to pixels. ([44807](https://github.com/WordPress/gutenberg/pull/44807))
-- Fluid typography: Ensure fontsizes are strings or integers. ([44847](https://github.com/WordPress/gutenberg/pull/44847))
-- Font Size Picker Hint: Fallback to font size `slug` if `name` is undefined. ([45041](https://github.com/WordPress/gutenberg/pull/45041))
-- Make custom font sizes appear fluid in the block editor when fluid typography is enabled. ([44765](https://github.com/WordPress/gutenberg/pull/44765))
-- Search block: Ensure font sizes values are converted to fluid in the editor. ([44852](https://github.com/WordPress/gutenberg/pull/44852))
-- Fluid typography: Convert font size inline style attributes to fluid values. ([44764](https://github.com/WordPress/gutenberg/pull/44764))
+
+-   Fluid typography: Convert server-side block support values. ([44762](https://github.com/WordPress/gutenberg/pull/44762))
+-   Fluid typography: Covert font size number values to pixels. ([44807](https://github.com/WordPress/gutenberg/pull/44807))
+-   Fluid typography: Ensure fontsizes are strings or integers. ([44847](https://github.com/WordPress/gutenberg/pull/44847))
+-   Font Size Picker Hint: Fallback to font size `slug` if `name` is undefined. ([45041](https://github.com/WordPress/gutenberg/pull/45041))
+-   Make custom font sizes appear fluid in the block editor when fluid typography is enabled. ([44765](https://github.com/WordPress/gutenberg/pull/44765))
+-   Search block: Ensure font sizes values are converted to fluid in the editor. ([44852](https://github.com/WordPress/gutenberg/pull/44852))
+-   Fluid typography: Convert font size inline style attributes to fluid values. ([44764](https://github.com/WordPress/gutenberg/pull/44764))
 
 #### Components
-- FontSizePicker: Fix header order in RTL languages. ([44590](https://github.com/WordPress/gutenberg/pull/44590))
-- Navigator: Restore focus only once per location. ([44972](https://github.com/WordPress/gutenberg/pull/44972))
-- Spacing Sizes Control: Try improving layout spacing. ([44858](https://github.com/WordPress/gutenberg/pull/44858))
 
+-   FontSizePicker: Fix header order in RTL languages. ([44590](https://github.com/WordPress/gutenberg/pull/44590))
+-   Navigator: Restore focus only once per location. ([44972](https://github.com/WordPress/gutenberg/pull/44972))
+-   Spacing Sizes Control: Try improving layout spacing. ([44858](https://github.com/WordPress/gutenberg/pull/44858))
 
 #### Global Styles
-- Ensure style card effect doesn't cause scrollbars to appear. ([44823](https://github.com/WordPress/gutenberg/pull/44823))
-- Fluid Typography: Fix bug in global styles where fluid clamp rules were not calculated for custom values. ([44761](https://github.com/WordPress/gutenberg/pull/44761))
+
+-   Ensure style card effect doesn't cause scrollbars to appear. ([44823](https://github.com/WordPress/gutenberg/pull/44823))
+-   Fluid Typography: Fix bug in global styles where fluid clamp rules were not calculated for custom values. ([44761](https://github.com/WordPress/gutenberg/pull/44761))
 
 ### Accessibility
-- Fix the block toolbar styling when the 'Show button text labels' preference is enabled. ([44779](https://github.com/WordPress/gutenberg/pull/44779))
-- Fluid typography: Add font size constraints. ([44993](https://github.com/WordPress/gutenberg/pull/44993))
 
+-   Fix the block toolbar styling when the 'Show button text labels' preference is enabled. ([44779](https://github.com/WordPress/gutenberg/pull/44779))
+-   Fluid typography: Add font size constraints. ([44993](https://github.com/WordPress/gutenberg/pull/44993))
 
 ### Performance
 
-- Lodash refactor away ([44892](https://github.com/WordPress/gutenberg/pull/44892), [45014](https://github.com/WordPress/gutenberg/pull/45014), [45010](https://github.com/WordPress/gutenberg/pull/45010), [44875](https://github.com/WordPress/gutenberg/pull/44875), [44901](https://github.com/WordPress/gutenberg/pull/44901), [44874](https://github.com/WordPress/gutenberg/pull/44874), [44894](https://github.com/WordPress/gutenberg/pull/44894))
-- Lodash: Remove completely from `@wordpress/viewport` package. ([44572](https://github.com/WordPress/gutenberg/pull/44572))
-- Remove unnecessary repeated function call. ([44545](https://github.com/WordPress/gutenberg/pull/44545))
-- Block Library, QueryInspectorControls: Avoid rerender of TaxonomyControls on every keystroke. ([44562](https://github.com/WordPress/gutenberg/pull/44562))
+-   Lodash refactor away ([44892](https://github.com/WordPress/gutenberg/pull/44892), [45014](https://github.com/WordPress/gutenberg/pull/45014), [45010](https://github.com/WordPress/gutenberg/pull/45010), [44875](https://github.com/WordPress/gutenberg/pull/44875), [44901](https://github.com/WordPress/gutenberg/pull/44901), [44874](https://github.com/WordPress/gutenberg/pull/44874), [44894](https://github.com/WordPress/gutenberg/pull/44894))
+-   Lodash: Remove completely from `@wordpress/viewport` package. ([44572](https://github.com/WordPress/gutenberg/pull/44572))
+-   Remove unnecessary repeated function call. ([44545](https://github.com/WordPress/gutenberg/pull/44545))
+-   Block Library, QueryInspectorControls: Avoid rerender of TaxonomyControls on every keystroke. ([44562](https://github.com/WordPress/gutenberg/pull/44562))
 
 ### Documentation
 
-- Fix broken link to `01-basic-esnext` example. ([45000](https://github.com/WordPress/gutenberg/pull/45000))
-- Add `ariaLabel` support to block supports reference documentation. ([45006](https://github.com/WordPress/gutenberg/pull/45006))
-- Docs: Fix some typos. ([44713](https://github.com/WordPress/gutenberg/pull/44713))
-- Layout Docs: Fix broken link in table of contents. ([44719](https://github.com/WordPress/gutenberg/pull/44719))
-- Layout: Document the current state of the layout block support. ([42619](https://github.com/WordPress/gutenberg/pull/42619))
-- Make `spacingScale` description more accurate in theme.json schema. ([44794](https://github.com/WordPress/gutenberg/pull/44794))
-- Remove duplicate img tag. ([44936](https://github.com/WordPress/gutenberg/pull/44936))
-- Updating versions in WP in light of 6.0.3 release. ([45052](https://github.com/WordPress/gutenberg/pull/45052))
-- package(prettier-config): Update documentation. ([44620](https://github.com/WordPress/gutenberg/pull/44620))
-- Connect extend Query Loop documentation. ([44699](https://github.com/WordPress/gutenberg/pull/44699))
-- Update Extending the Query Loop block documentation. ([44703](https://github.com/WordPress/gutenberg/pull/44703))
-- Update link to plugin-sidebar example in documentation. ([44790](https://github.com/WordPress/gutenberg/pull/44790))
-- Update versions in WordPress documentation for 6.1. ([44785](https://github.com/WordPress/gutenberg/pull/44785))
-- Update visually hidden documentation to mention stacking context. ([44867](https://github.com/WordPress/gutenberg/pull/44867))
-
-
+-   Fix broken link to `01-basic-esnext` example. ([45000](https://github.com/WordPress/gutenberg/pull/45000))
+-   Add `ariaLabel` support to block supports reference documentation. ([45006](https://github.com/WordPress/gutenberg/pull/45006))
+-   Docs: Fix some typos. ([44713](https://github.com/WordPress/gutenberg/pull/44713))
+-   Layout Docs: Fix broken link in table of contents. ([44719](https://github.com/WordPress/gutenberg/pull/44719))
+-   Layout: Document the current state of the layout block support. ([42619](https://github.com/WordPress/gutenberg/pull/42619))
+-   Make `spacingScale` description more accurate in theme.json schema. ([44794](https://github.com/WordPress/gutenberg/pull/44794))
+-   Remove duplicate img tag. ([44936](https://github.com/WordPress/gutenberg/pull/44936))
+-   Updating versions in WP in light of 6.0.3 release. ([45052](https://github.com/WordPress/gutenberg/pull/45052))
+-   package(prettier-config): Update documentation. ([44620](https://github.com/WordPress/gutenberg/pull/44620))
+-   Connect extend Query Loop documentation. ([44699](https://github.com/WordPress/gutenberg/pull/44699))
+-   Update Extending the Query Loop block documentation. ([44703](https://github.com/WordPress/gutenberg/pull/44703))
+-   Update link to plugin-sidebar example in documentation. ([44790](https://github.com/WordPress/gutenberg/pull/44790))
+-   Update versions in WordPress documentation for 6.1. ([44785](https://github.com/WordPress/gutenberg/pull/44785))
+-   Update visually hidden documentation to mention stacking context. ([44867](https://github.com/WordPress/gutenberg/pull/44867))
 
 ### Code Quality
 
-- Fix comment in edit post reducer. ([44978](https://github.com/WordPress/gutenberg/pull/44978))
-- Fix: PHP 8.1 Deprecation messages. ([44828](https://github.com/WordPress/gutenberg/pull/44828))
-- Navigator: Remove overflow styles from NavigatorScreen. ([44973](https://github.com/WordPress/gutenberg/pull/44973))
-- Refactor the document actions component. ([45060](https://github.com/WordPress/gutenberg/pull/45060))
-- Simplify BlockStyles preview by removing the slot. ([44825](https://github.com/WordPress/gutenberg/pull/44825))
-- Update 6.1 CSS filter to match core. ([44962](https://github.com/WordPress/gutenberg/pull/44962))
-- Fluid Typography: Add missing style.css file to test theme. ([44958](https://github.com/WordPress/gutenberg/pull/44958))
-- Site Editor: Dynamic Templates Names and Descriptions: Code parity with wp/6.1. ([44646](https://github.com/WordPress/gutenberg/pull/44646))
-- Fluid Typography: Use wp_ prefixed function. ([44876](https://github.com/WordPress/gutenberg/pull/44876))
-- Remove gutenberg_ prefix for theme_json_get_style_nodes filter. ([44949](https://github.com/WordPress/gutenberg/pull/44949))
--  Update the names of filters for global styles data. ([44940](https://github.com/WordPress/gutenberg/pull/44940))
-- Try: Refresh selection styles. ([44150](https://github.com/WordPress/gutenberg/pull/44150))
-- Design Tools, Archive Block: Prevent spacing styles and additional CSS classes from being printed twice. ([44438](https://github.com/WordPress/gutenberg/pull/44438))
-- Design Tools, Tag Cloud Block: Prevent block support styles and additional CSS classes from being printed twice. ([44439](https://github.com/WordPress/gutenberg/pull/44439))
-- Site Editor: Rename header and sidebar components in edit-site. ([44974](https://github.com/WordPress/gutenberg/pull/44974))
-- Refactor dropzone for unmodified default blocks with `useBlockDropZone` and `InsertionPoint`. ([44647](https://github.com/WordPress/gutenberg/pull/44647))
-- Data: Cleanup `useDispatch` tests. ([44856](https://github.com/WordPress/gutenberg/pull/44856))
-
+-   Fix comment in edit post reducer. ([44978](https://github.com/WordPress/gutenberg/pull/44978))
+-   Fix: PHP 8.1 Deprecation messages. ([44828](https://github.com/WordPress/gutenberg/pull/44828))
+-   Navigator: Remove overflow styles from NavigatorScreen. ([44973](https://github.com/WordPress/gutenberg/pull/44973))
+-   Refactor the document actions component. ([45060](https://github.com/WordPress/gutenberg/pull/45060))
+-   Simplify BlockStyles preview by removing the slot. ([44825](https://github.com/WordPress/gutenberg/pull/44825))
+-   Update 6.1 CSS filter to match core. ([44962](https://github.com/WordPress/gutenberg/pull/44962))
+-   Fluid Typography: Add missing style.css file to test theme. ([44958](https://github.com/WordPress/gutenberg/pull/44958))
+-   Site Editor: Dynamic Templates Names and Descriptions: Code parity with wp/6.1. ([44646](https://github.com/WordPress/gutenberg/pull/44646))
+-   Fluid Typography: Use wp\_ prefixed function. ([44876](https://github.com/WordPress/gutenberg/pull/44876))
+-   Remove gutenberg\_ prefix for theme_json_get_style_nodes filter. ([44949](https://github.com/WordPress/gutenberg/pull/44949))
+-   Update the names of filters for global styles data. ([44940](https://github.com/WordPress/gutenberg/pull/44940))
+-   Try: Refresh selection styles. ([44150](https://github.com/WordPress/gutenberg/pull/44150))
+-   Design Tools, Archive Block: Prevent spacing styles and additional CSS classes from being printed twice. ([44438](https://github.com/WordPress/gutenberg/pull/44438))
+-   Design Tools, Tag Cloud Block: Prevent block support styles and additional CSS classes from being printed twice. ([44439](https://github.com/WordPress/gutenberg/pull/44439))
+-   Site Editor: Rename header and sidebar components in edit-site. ([44974](https://github.com/WordPress/gutenberg/pull/44974))
+-   Refactor dropzone for unmodified default blocks with `useBlockDropZone` and `InsertionPoint`. ([44647](https://github.com/WordPress/gutenberg/pull/44647))
+-   Data: Cleanup `useDispatch` tests. ([44856](https://github.com/WordPress/gutenberg/pull/44856))
 
 #### ESLint
-- ESLint: Fix rule violations. ([44927](https://github.com/WordPress/gutenberg/pull/44927), [44896](https://github.com/WordPress/gutenberg/pull/44896), [44895](https://github.com/WordPress/gutenberg/pull/44895), [44926](https://github.com/WordPress/gutenberg/pull/44926), [44939](https://github.com/WordPress/gutenberg/pull/44939), [44930](https://github.com/WordPress/gutenberg/pull/44930), [44902](https://github.com/WordPress/gutenberg/pull/44902), [44928](https://github.com/WordPress/gutenberg/pull/44928), [44925](https://github.com/WordPress/gutenberg/pull/44925), [45061](https://github.com/WordPress/gutenberg/pull/45061), [45067](https://github.com/WordPress/gutenberg/pull/45067), [45097](https://github.com/WordPress/gutenberg/pull/45097), [45064](https://github.com/WordPress/gutenberg/pull/45064), [45068](https://github.com/WordPress/gutenberg/pull/45068), [45062](https://github.com/WordPress/gutenberg/pull/45062), [45096](https://github.com/WordPress/gutenberg/pull/45096), [45106](https://github.com/WordPress/gutenberg/pull/45106), [45018](https://github.com/WordPress/gutenberg/pull/45018))
-- ESLint: Fix a few jsdoc/check-line-alignment warnings. ([44984](https://github.com/WordPress/gutenberg/pull/44984))
-- ESLint: Fix empty `toHaveTextContent`. ([45007](https://github.com/WordPress/gutenberg/pull/45007))
+
+-   ESLint: Fix rule violations. ([44927](https://github.com/WordPress/gutenberg/pull/44927), [44896](https://github.com/WordPress/gutenberg/pull/44896), [44895](https://github.com/WordPress/gutenberg/pull/44895), [44926](https://github.com/WordPress/gutenberg/pull/44926), [44939](https://github.com/WordPress/gutenberg/pull/44939), [44930](https://github.com/WordPress/gutenberg/pull/44930), [44902](https://github.com/WordPress/gutenberg/pull/44902), [44928](https://github.com/WordPress/gutenberg/pull/44928), [44925](https://github.com/WordPress/gutenberg/pull/44925), [45061](https://github.com/WordPress/gutenberg/pull/45061), [45067](https://github.com/WordPress/gutenberg/pull/45067), [45097](https://github.com/WordPress/gutenberg/pull/45097), [45064](https://github.com/WordPress/gutenberg/pull/45064), [45068](https://github.com/WordPress/gutenberg/pull/45068), [45062](https://github.com/WordPress/gutenberg/pull/45062), [45096](https://github.com/WordPress/gutenberg/pull/45096), [45106](https://github.com/WordPress/gutenberg/pull/45106), [45018](https://github.com/WordPress/gutenberg/pull/45018))
+-   ESLint: Fix a few jsdoc/check-line-alignment warnings. ([44984](https://github.com/WordPress/gutenberg/pull/44984))
+-   ESLint: Fix empty `toHaveTextContent`. ([45007](https://github.com/WordPress/gutenberg/pull/45007))
 
 #### Refactor tests to RTL
-- Data Layer ([44802](https://github.com/WordPress/gutenberg/pull/44802), [44855](https://github.com/WordPress/gutenberg/pull/44855), [45058](https://github.com/WordPress/gutenberg/pull/45058))
-- Block Editor ([44869](https://github.com/WordPress/gutenberg/pull/44869), [44870](https://github.com/WordPress/gutenberg/pull/44870), [44871](https://github.com/WordPress/gutenberg/pull/44871), [45071](https://github.com/WordPress/gutenberg/pull/45071))
-- Components ([45072](https://github.com/WordPress/gutenberg/pull/45072), [45012](https://github.com/WordPress/gutenberg/pull/45012), [44801](https://github.com/WordPress/gutenberg/pull/44801), [44826](https://github.com/WordPress/gutenberg/pull/44826), [44824](https://github.com/WordPress/gutenberg/pull/44824), [44821](https://github.com/WordPress/gutenberg/pull/44821), [44820](https://github.com/WordPress/gutenberg/pull/44820))
-- Post Editor([45011](https://github.com/WordPress/gutenberg/pull/45011), [44835](https://github.com/WordPress/gutenberg/pull/44835), [45066](https://github.com/WordPress/gutenberg/pull/45066), [44923](https://github.com/WordPress/gutenberg/pull/44923), [44872](https://github.com/WordPress/gutenberg/pull/44872))
-- Compose ([44818](https://github.com/WordPress/gutenberg/pull/44818), [44819](https://github.com/WordPress/gutenberg/pull/44819), [44912](https://github.com/WordPress/gutenberg/pull/44912), [45108](https://github.com/WordPress/gutenberg/pull/45108))
-- Viewport ([44766](https://github.com/WordPress/gutenberg/pull/44766), [44769](https://github.com/WordPress/gutenberg/pull/44769))
-- Element ([44804](https://github.com/WordPress/gutenberg/pull/44804))
-- Interface ([44803](https://github.com/WordPress/gutenberg/pull/44803))
 
+-   Data Layer ([44802](https://github.com/WordPress/gutenberg/pull/44802), [44855](https://github.com/WordPress/gutenberg/pull/44855), [45058](https://github.com/WordPress/gutenberg/pull/45058))
+-   Block Editor ([44869](https://github.com/WordPress/gutenberg/pull/44869), [44870](https://github.com/WordPress/gutenberg/pull/44870), [44871](https://github.com/WordPress/gutenberg/pull/44871), [45071](https://github.com/WordPress/gutenberg/pull/45071))
+-   Components ([45072](https://github.com/WordPress/gutenberg/pull/45072), [45012](https://github.com/WordPress/gutenberg/pull/45012), [44801](https://github.com/WordPress/gutenberg/pull/44801), [44826](https://github.com/WordPress/gutenberg/pull/44826), [44824](https://github.com/WordPress/gutenberg/pull/44824), [44821](https://github.com/WordPress/gutenberg/pull/44821), [44820](https://github.com/WordPress/gutenberg/pull/44820))
+-   Post Editor([45011](https://github.com/WordPress/gutenberg/pull/45011), [44835](https://github.com/WordPress/gutenberg/pull/44835), [45066](https://github.com/WordPress/gutenberg/pull/45066), [44923](https://github.com/WordPress/gutenberg/pull/44923), [44872](https://github.com/WordPress/gutenberg/pull/44872))
+-   Compose ([44818](https://github.com/WordPress/gutenberg/pull/44818), [44819](https://github.com/WordPress/gutenberg/pull/44819), [44912](https://github.com/WordPress/gutenberg/pull/44912), [45108](https://github.com/WordPress/gutenberg/pull/45108))
+-   Viewport ([44766](https://github.com/WordPress/gutenberg/pull/44766), [44769](https://github.com/WordPress/gutenberg/pull/44769))
+-   Element ([44804](https://github.com/WordPress/gutenberg/pull/44804))
+-   Interface ([44803](https://github.com/WordPress/gutenberg/pull/44803))
 
 #### Components
-- Navigator: Refactor Storybook code to TypeScript and controls. ([44979](https://github.com/WordPress/gutenberg/pull/44979))
-- Navigator: Refactor tests to TypeScript and user-event. ([44970](https://github.com/WordPress/gutenberg/pull/44970))
-- Refactor `ToolsPanel` to pass `exhaustive-deps`. ([45028](https://github.com/WordPress/gutenberg/pull/45028))
-- Refactor `Tooltip` tests to always render inline. ([45105](https://github.com/WordPress/gutenberg/pull/45105))
-- Refactor to use `@testing-library/react`. ([44698](https://github.com/WordPress/gutenberg/pull/44698), [44695](https://github.com/WordPress/gutenberg/pull/44695), [44697](https://github.com/WordPress/gutenberg/pull/44697))
-- Refactor `Tooltip` to ignore `exhaustive-deps`. ([45043](https://github.com/WordPress/gutenberg/pull/45043))
-- Modal: Convert component to TypeScript. ([42949](https://github.com/WordPress/gutenberg/pull/42949))
-- Sandbox: Use toString to create observe and resize script string. ([42872](https://github.com/WordPress/gutenberg/pull/42872))
-
 
+-   Navigator: Refactor Storybook code to TypeScript and controls. ([44979](https://github.com/WordPress/gutenberg/pull/44979))
+-   Navigator: Refactor tests to TypeScript and user-event. ([44970](https://github.com/WordPress/gutenberg/pull/44970))
+-   Refactor `ToolsPanel` to pass `exhaustive-deps`. ([45028](https://github.com/WordPress/gutenberg/pull/45028))
+-   Refactor `Tooltip` tests to always render inline. ([45105](https://github.com/WordPress/gutenberg/pull/45105))
+-   Refactor to use `@testing-library/react`. ([44698](https://github.com/WordPress/gutenberg/pull/44698), [44695](https://github.com/WordPress/gutenberg/pull/44695), [44697](https://github.com/WordPress/gutenberg/pull/44697))
+-   Refactor `Tooltip` to ignore `exhaustive-deps`. ([45043](https://github.com/WordPress/gutenberg/pull/45043))
+-   Modal: Convert component to TypeScript. ([42949](https://github.com/WordPress/gutenberg/pull/42949))
+-   Sandbox: Use toString to create observe and resize script string. ([42872](https://github.com/WordPress/gutenberg/pull/42872))
 
 ### Tools
 
-- Combine stale issue gardening workflows into one. ([44754](https://github.com/WordPress/gutenberg/pull/44754))
-- Ensure stale github actions workflow only runs for particular issue labels. ([44910](https://github.com/WordPress/gutenberg/pull/44910))
-- Configure Dependabot pull requests for GitHub Actions. ([44677](https://github.com/WordPress/gutenberg/pull/44677))
-- Storybook: Add theme switcher tool. ([44715](https://github.com/WordPress/gutenberg/pull/44715))
-- Bug Fix, wp-env: Use case insensitive regex when checking WP version string. ([44887](https://github.com/WordPress/gutenberg/pull/44887))
-- Cherry Pick Script: Restore retrieval of merge_commit_sha. ([44890](https://github.com/WordPress/gutenberg/pull/44890))
+-   Combine stale issue gardening workflows into one. ([44754](https://github.com/WordPress/gutenberg/pull/44754))
+-   Ensure stale github actions workflow only runs for particular issue labels. ([44910](https://github.com/WordPress/gutenberg/pull/44910))
+-   Configure Dependabot pull requests for GitHub Actions. ([44677](https://github.com/WordPress/gutenberg/pull/44677))
+-   Storybook: Add theme switcher tool. ([44715](https://github.com/WordPress/gutenberg/pull/44715))
+-   Bug Fix, wp-env: Use case insensitive regex when checking WP version string. ([44887](https://github.com/WordPress/gutenberg/pull/44887))
+-   Cherry Pick Script: Restore retrieval of merge_commit_sha. ([44890](https://github.com/WordPress/gutenberg/pull/44890))
 
 #### Schemas
 
-- Fix: Typo in block.json schema default scope values. ([44944](https://github.com/WordPress/gutenberg/pull/44944))
-- Fix: typo in block.json schema. ([44798](https://github.com/WordPress/gutenberg/pull/44798))
-- Fix: theme json schema validation. ([44799](https://github.com/WordPress/gutenberg/pull/44799))
-- Add title property to theme.json schema. ([44797](https://github.com/WordPress/gutenberg/pull/44797))
+-   Fix: Typo in block.json schema default scope values. ([44944](https://github.com/WordPress/gutenberg/pull/44944))
+-   Fix: typo in block.json schema. ([44798](https://github.com/WordPress/gutenberg/pull/44798))
+-   Fix: theme json schema validation. ([44799](https://github.com/WordPress/gutenberg/pull/44799))
+-   Add title property to theme.json schema. ([44797](https://github.com/WordPress/gutenberg/pull/44797))
 
 #### Build Tooling
-- Add `.eslintcache` to `.gitignore`. ([44938](https://github.com/WordPress/gutenberg/pull/44938))
-- ESLint: Add and enable `eslint-plugin-jest-dom`. ([44983](https://github.com/WordPress/gutenberg/pull/44983))
-- Style Engine: Move PHP unit tests to Gutenberg. ([44722](https://github.com/WordPress/gutenberg/pull/44722))
 
-#### Testing
-- Add support for React 18 and later to jest-preset-default. ([44680](https://github.com/WordPress/gutenberg/pull/44680))
-- Migrate `nonce.test.js` to Playwright. ([44929](https://github.com/WordPress/gutenberg/pull/44929))
-- end-to-end Tests: Make attributes and innerblocks optional in insertBlock. ([44933](https://github.com/WordPress/gutenberg/pull/44933))
-- Bug Fix, end-to-end tests: Update button selector. ([45087](https://github.com/WordPress/gutenberg/pull/45087))
-- Mobile
-    - Code block - Migrate from React Test Render to React Native Testing Library. ([44833](https://github.com/WordPress/gutenberg/pull/44833))
-    - Tooltip - Migrate from React Test Render to React Native Testing Library. ([44831](https://github.com/WordPress/gutenberg/pull/44831))
-    - Update editor initial HTML test for iOS and update Appium. ([44732](https://github.com/WordPress/gutenberg/pull/44732))
-    - useResizeObserver - Migrate from React Test Render to React Native Testing Library. ([44832](https://github.com/WordPress/gutenberg/pull/44832))
+-   Add `.eslintcache` to `.gitignore`. ([44938](https://github.com/WordPress/gutenberg/pull/44938))
+-   ESLint: Add and enable `eslint-plugin-jest-dom`. ([44983](https://github.com/WordPress/gutenberg/pull/44983))
+-   Style Engine: Move PHP unit tests to Gutenberg. ([44722](https://github.com/WordPress/gutenberg/pull/44722))
 
+#### Testing
 
-## First time contributors
+-   Add support for React 18 and later to jest-preset-default. ([44680](https://github.com/WordPress/gutenberg/pull/44680))
+-   Migrate `nonce.test.js` to Playwright. ([44929](https://github.com/WordPress/gutenberg/pull/44929))
+-   end-to-end Tests: Make attributes and innerblocks optional in insertBlock. ([44933](https://github.com/WordPress/gutenberg/pull/44933))
+-   Bug Fix, end-to-end tests: Update button selector. ([45087](https://github.com/WordPress/gutenberg/pull/45087))
+-   Mobile
+    -   Code block - Migrate from React Test Render to React Native Testing Library. ([44833](https://github.com/WordPress/gutenberg/pull/44833))
+    -   Tooltip - Migrate from React Test Render to React Native Testing Library. ([44831](https://github.com/WordPress/gutenberg/pull/44831))
+    -   Update editor initial HTML test for iOS and update Appium. ([44732](https://github.com/WordPress/gutenberg/pull/44732))
+    -   useResizeObserver - Migrate from React Test Render to React Native Testing Library. ([44832](https://github.com/WordPress/gutenberg/pull/44832))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @benridane: Fix list outdents on Enter in quote block. ([44809](https://github.com/WordPress/gutenberg/pull/44809))
-- @jeremylind: FIX: Typo in block.json schema default scope values. ([44944](https://github.com/WordPress/gutenberg/pull/44944))
-- @PooSham: Add support for React 18 and later to jest-preset-default. ([44680](https://github.com/WordPress/gutenberg/pull/44680))
-- @thelovekesh: package(prettier-config): Update documentation. ([44620](https://github.com/WordPress/gutenberg/pull/44620))
+The following PRs were merged by first-time contributors:
 
+-   @benridane: Fix list outdents on Enter in quote block. ([44809](https://github.com/WordPress/gutenberg/pull/44809))
+-   @jeremylind: FIX: Typo in block.json schema default scope values. ([44944](https://github.com/WordPress/gutenberg/pull/44944))
+-   @PooSham: Add support for React 18 and later to jest-preset-default. ([44680](https://github.com/WordPress/gutenberg/pull/44680))
+-   @thelovekesh: package(prettier-config): Update documentation. ([44620](https://github.com/WordPress/gutenberg/pull/44620))
 
 ## Contributors
 
@@ -11067,24 +22306,19 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @afercia @ajlende @alanjacobmathew @amustaque97 @andrewserong @annezazu @BE-Webdesign @benridane @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @costdev @danielbachhuber @dcalhoun @desrosj @dinhtungdu @draganescu @ellatrix @fabiankaegy @fluiddot @geriux @getdave @glendaviesnz @gvgvgvijayan @jasmussen @jeremylind @jorgefilipecosta @joshuatf @jrfnl @jsnajdr @kevin940726 @Mamaduka @mikachan @mirka @mtias @noisysocks @ntsekouras @oandregal @ockham @pento @PooSham @ramonjd @ryanwelcher @sabernhardt @SantosGuillamot @scruffian @Soean @t-hamano @talldan @tellthemachines @thelovekesh @tyxla @walbo @youknowriad
 
-
 = 14.3.1 =
 
-
-
 ## Changelog
 
 ### Code Quality
 
 #### Block Library
-- Add: Missing output escaping on some blocks. ([45045](https://github.com/WordPress/gutenberg/pull/45045))
-
-
-## First time contributors
 
-The following PRs were merged by first time contributors:
+-   Add: Missing output escaping on some blocks. ([45045](https://github.com/WordPress/gutenberg/pull/45045))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -11092,257 +22326,276 @@ The following contributors merged PRs in this release:
 
 @jorgefilipecosta
 
-
 = 14.3.0 =
 
-
 ## Changelog
 
 ### Enhancements
 
 #### Post Editor
-- Optimize legacy post content layout. ([44506](https://github.com/WordPress/gutenberg/pull/44506))
-- Remove right border when sidebars are closed. ([44613](https://github.com/WordPress/gutenberg/pull/44613))
+
+-   Optimize legacy post content layout. ([44506](https://github.com/WordPress/gutenberg/pull/44506))
+-   Remove right border when sidebars are closed. ([44613](https://github.com/WordPress/gutenberg/pull/44613))
 
 #### Block Library
-- Comment Pagination Numbers: Add background color. ([43902](https://github.com/WordPress/gutenberg/pull/43902))
-- Navigation Submenu: Use `get_queried_object_id` when setting `current-menu-item` classes. ([44474](https://github.com/WordPress/gutenberg/pull/44474))
-- Post Author: Include option to link author archive. ([42670](https://github.com/WordPress/gutenberg/pull/42670))
-- Post Terms: Add spacing support. ([43646](https://github.com/WordPress/gutenberg/pull/43646))
-- Query Loop: Hide instructions for FormTokenField. ([44641](https://github.com/WordPress/gutenberg/pull/44641))
-- Tag Cloud: Remove `strtolower` around taxonomy name. ([16112](https://github.com/WordPress/gutenberg/pull/16112))
-- Video: Update placeholder style. ([44215](https://github.com/WordPress/gutenberg/pull/44215))
- 
+
+-   Comment Pagination Numbers: Add background color. ([43902](https://github.com/WordPress/gutenberg/pull/43902))
+-   Navigation Submenu: Use `get_queried_object_id` when setting `current-menu-item` classes. ([44474](https://github.com/WordPress/gutenberg/pull/44474))
+-   Post Author: Include option to link author archive. ([42670](https://github.com/WordPress/gutenberg/pull/42670))
+-   Post Terms: Add spacing support. ([43646](https://github.com/WordPress/gutenberg/pull/43646))
+-   Query Loop: Hide instructions for FormTokenField. ([44641](https://github.com/WordPress/gutenberg/pull/44641))
+-   Tag Cloud: Remove `strtolower` around taxonomy name. ([16112](https://github.com/WordPress/gutenberg/pull/16112))
+-   Video: Update placeholder style. ([44215](https://github.com/WordPress/gutenberg/pull/44215))
+
 #### Components
-- FontSizePicker: Make control take up full width. ([44559](https://github.com/WordPress/gutenberg/pull/44559))
-- Placeholder: Remove unnecessary background color. ([44497](https://github.com/WordPress/gutenberg/pull/44497))
-- Placeholder: Update placeholder style. ([44190](https://github.com/WordPress/gutenberg/pull/44190))
-- ToggleGroupControl: Fix unselected icon color. ([44575](https://github.com/WordPress/gutenberg/pull/44575))
-- ToolsPanel: Add subheadings and reset text to tools panel menu. ([44260](https://github.com/WordPress/gutenberg/pull/44260))
+
+-   FontSizePicker: Make control take up full width. ([44559](https://github.com/WordPress/gutenberg/pull/44559))
+-   Placeholder: Remove unnecessary background color. ([44497](https://github.com/WordPress/gutenberg/pull/44497))
+-   Placeholder: Update placeholder style. ([44190](https://github.com/WordPress/gutenberg/pull/44190))
+-   ToggleGroupControl: Fix unselected icon color. ([44575](https://github.com/WordPress/gutenberg/pull/44575))
+-   ToolsPanel: Add subheadings and reset text to tools panel menu. ([44260](https://github.com/WordPress/gutenberg/pull/44260))
 
 #### Block API
-- Blocks: Deprecate non-string descriptions. ([44455](https://github.com/WordPress/gutenberg/pull/44455))
-- Tag Processor: Document and test XSS prevention in set_attribute. ([44447](https://github.com/WordPress/gutenberg/pull/44447))
-- Tag Processor: Throw error when supplied with unacceptable attribute names. ([44431](https://github.com/WordPress/gutenberg/pull/44431))
-- Tag Processor: Use (start,length) values for tracking tag name. ([44479](https://github.com/WordPress/gutenberg/pull/44479))
-- Tag processor: Update 'since' version tags to 6.2.0. ([44432](https://github.com/WordPress/gutenberg/pull/44432))
+
+-   Blocks: Deprecate non-string descriptions. ([44455](https://github.com/WordPress/gutenberg/pull/44455))
+-   Tag Processor: Document and test XSS prevention in set_attribute. ([44447](https://github.com/WordPress/gutenberg/pull/44447))
+-   Tag Processor: Throw error when supplied with unacceptable attribute names. ([44431](https://github.com/WordPress/gutenberg/pull/44431))
+-   Tag Processor: Use (start,length) values for tracking tag name. ([44479](https://github.com/WordPress/gutenberg/pull/44479))
+-   Tag processor: Update 'since' version tags to 6.2.0. ([44432](https://github.com/WordPress/gutenberg/pull/44432))
 
 #### Global Styles
-- Hide the done button of the Global Style palette editor when there aren't colors to edit. ([44372](https://github.com/WordPress/gutenberg/pull/44372))
-- Use ToolsPanel in Global Styles → Typography. ([44180](https://github.com/WordPress/gutenberg/pull/44180))
+
+-   Hide the done button of the Global Style palette editor when there aren't colors to edit. ([44372](https://github.com/WordPress/gutenberg/pull/44372))
+-   Use ToolsPanel in Global Styles → Typography. ([44180](https://github.com/WordPress/gutenberg/pull/44180))
 
 #### Block Editor
-- Allow dropping an image on an empty paragraph block to create an image block. ([42722](https://github.com/WordPress/gutenberg/pull/42722))
-- Writing flow: Implement Alt+Arrow. ([44081](https://github.com/WordPress/gutenberg/pull/44081))
+
+-   Allow dropping an image on an empty paragraph block to create an image block. ([42722](https://github.com/WordPress/gutenberg/pull/42722))
+-   Writing flow: Implement Alt+Arrow. ([44081](https://github.com/WordPress/gutenberg/pull/44081))
 
 #### Site Editor
-- Allow drag and drop for blocks and patterns in zoom-out mode. ([44402](https://github.com/WordPress/gutenberg/pull/44402))
+
+-   Allow drag and drop for blocks and patterns in zoom-out mode. ([44402](https://github.com/WordPress/gutenberg/pull/44402))
 
 #### Block Directory
-- Use 'tertiary' in missing block warning. ([44368](https://github.com/WordPress/gutenberg/pull/44368))
 
+-   Use 'tertiary' in missing block warning. ([44368](https://github.com/WordPress/gutenberg/pull/44368))
 
 ### New APIs
 
 #### Block Library
-- WP_HTML_Tag_Processor: Inject dynamic data to block HTML markup in PHP. ([42485](https://github.com/WordPress/gutenberg/pull/42485))
-
-
-### Bug Fixes
-
-- Add a correct TS signature for useEntityRecords. ([44448](https://github.com/WordPress/gutenberg/pull/44448))
-- BlockDraggable: Change prop name passed to children when dragging is disabled. ([44371](https://github.com/WordPress/gutenberg/pull/44371))
-- Fix Lint warning/errors in cherry-pick script. ([44662](https://github.com/WordPress/gutenberg/pull/44662))
-- Fix: Content blocks with nested blocks always appear as top level. ([44098](https://github.com/WordPress/gutenberg/pull/44098))
-- Hide the Classic block in the Site Editor. ([44554](https://github.com/WordPress/gutenberg/pull/44554))
-- PHP 8.2: Remove deprecated callable in Style Engine value functions. ([44561](https://github.com/WordPress/gutenberg/pull/44561))
-- Persisted preferences: Fix context property of user meta configuration. ([44489](https://github.com/WordPress/gutenberg/pull/44489))
-- Resizable editor: Fix height setting bug. ([44637](https://github.com/WordPress/gutenberg/pull/44637))
-- Style engine: Kebab case preset slugs in the editor. ([44406](https://github.com/WordPress/gutenberg/pull/44406))
-- Add submenu block href only if URL is not empty. ([44337](https://github.com/WordPress/gutenberg/pull/44337))
-- Update Theme JSON `$schema` to allow pseudo selectors on `button` property. ([44303](https://github.com/WordPress/gutenberg/pull/44303))
-- Preserve the generic signature of getEntityRecord and getEntityRecords through currying. ([44453](https://github.com/WordPress/gutenberg/pull/44453))
-- Template editor: Fix crashes due to undefined vars. ([44482](https://github.com/WordPress/gutenberg/pull/44482))
-- Add missing value to CSS font-display descriptor in theme.json. ([44622](https://github.com/WordPress/gutenberg/pull/44622))
-- Rich text: Avoid updating partial selection unnecessarily. ([44330](https://github.com/WordPress/gutenberg/pull/44330))
-- useMergeRefs: Don't call/mutate refs passed if unused. ([44629](https://github.com/WordPress/gutenberg/pull/44629))
-
-#### Block Library
-- Code Block: Add box-sizing to fix inconsistent layout. ([44580](https://github.com/WordPress/gutenberg/pull/44580))
-- Comment Author: Fix empty links created for the author's name. ([44650](https://github.com/WordPress/gutenberg/pull/44650))
-- Comments: Support nested comments settings in the comments blocks. ([44351](https://github.com/WordPress/gutenberg/pull/44351))
-- Group: Legacy Group inner block wrapper should work with a constrained layout. ([44660](https://github.com/WordPress/gutenberg/pull/44660))
-- Image: Fix rotated image crop area aspect ratio. ([44425](https://github.com/WordPress/gutenberg/pull/44425))
-- Image: Upgrade react-easy-crop to bring in fix for site editor iframe. ([44408](https://github.com/WordPress/gutenberg/pull/44408))
-- Navigation: Fix console error. ([44594](https://github.com/WordPress/gutenberg/pull/44594))
-- Navigation: Fix semitransparent burger icon. ([44525](https://github.com/WordPress/gutenberg/pull/44525))
-- Navigation: Try fixing link color in some TT2 contexts. ([44578](https://github.com/WordPress/gutenberg/pull/44578))
-- Paragraph: Disable drop cap control if text is aligned. ([42326](https://github.com/WordPress/gutenberg/pull/42326))
-- Post Featured Image: Fix borders after addition of overlay feature. ([44286](https://github.com/WordPress/gutenberg/pull/44286))
-- Post Featured Image: Fix application of default border style in editor. ([44520](https://github.com/WordPress/gutenberg/pull/44520))
-- Query Loop: Fix condition for displaying 'parents' control. ([44630](https://github.com/WordPress/gutenberg/pull/44630))
-- Query Loop: Rename Query Loop variations `allowControls` to `allowedControls`. ([44523](https://github.com/WordPress/gutenberg/pull/44523))
-- Quote block: Stop slash inserter popup showing in the citation. ([44634](https://github.com/WordPress/gutenberg/pull/44634))
-- Site Title: Fix link color not being applied in editor #37071. ([44333](https://github.com/WordPress/gutenberg/pull/44333))
-- Template part: Prevent adding block in post editor or inside post template or content blocks. ([44480](https://github.com/WordPress/gutenberg/pull/44480))
-- Video: Don't display placeholder SVG when Video block selected. ([44564](https://github.com/WordPress/gutenberg/pull/44564))
-
-
-#### Global Styles
-- Fix empty color indicator with a custom style. ([44364](https://github.com/WordPress/gutenberg/pull/44364))
-- Re-add styles that were removed for classic themes. ([44334](https://github.com/WordPress/gutenberg/pull/44334))
-- Remove border from Global Styles previews. ([44556](https://github.com/WordPress/gutenberg/pull/44556))
-- Spacing presets: Modify the styling of the input controls when in unlinked mode in order to better differentiate sides. ([44141](https://github.com/WordPress/gutenberg/pull/44141))
-- Style cards: Fix focus style. ([44612](https://github.com/WordPress/gutenberg/pull/44612))
-- Theme.json: Fix some shadow properties not working properly in the site editor. ([44569](https://github.com/WordPress/gutenberg/pull/44569))
-- Use color hex + index as key in the Palette component color indicator. ([44344](https://github.com/WordPress/gutenberg/pull/44344))
+
+-   WP_HTML_Tag_Processor: Inject dynamic data to block HTML markup in PHP. ([42485](https://github.com/WordPress/gutenberg/pull/42485))
+
+### Bug Fixes
+
+-   Add a correct TS signature for useEntityRecords. ([44448](https://github.com/WordPress/gutenberg/pull/44448))
+-   BlockDraggable: Change prop name passed to children when dragging is disabled. ([44371](https://github.com/WordPress/gutenberg/pull/44371))
+-   Fix Lint warning/errors in cherry-pick script. ([44662](https://github.com/WordPress/gutenberg/pull/44662))
+-   Fix: Content blocks with nested blocks always appear as top level. ([44098](https://github.com/WordPress/gutenberg/pull/44098))
+-   Hide the Classic block in the Site Editor. ([44554](https://github.com/WordPress/gutenberg/pull/44554))
+-   PHP 8.2: Remove deprecated callable in Style Engine value functions. ([44561](https://github.com/WordPress/gutenberg/pull/44561))
+-   Persisted preferences: Fix context property of user meta configuration. ([44489](https://github.com/WordPress/gutenberg/pull/44489))
+-   Resizable editor: Fix height setting bug. ([44637](https://github.com/WordPress/gutenberg/pull/44637))
+-   Style engine: Kebab case preset slugs in the editor. ([44406](https://github.com/WordPress/gutenberg/pull/44406))
+-   Add submenu block href only if URL is not empty. ([44337](https://github.com/WordPress/gutenberg/pull/44337))
+-   Update Theme JSON `$schema` to allow pseudo selectors on `button` property. ([44303](https://github.com/WordPress/gutenberg/pull/44303))
+-   Preserve the generic signature of getEntityRecord and getEntityRecords through currying. ([44453](https://github.com/WordPress/gutenberg/pull/44453))
+-   Template editor: Fix crashes due to undefined vars. ([44482](https://github.com/WordPress/gutenberg/pull/44482))
+-   Add missing value to CSS font-display descriptor in theme.json. ([44622](https://github.com/WordPress/gutenberg/pull/44622))
+-   Rich text: Avoid updating partial selection unnecessarily. ([44330](https://github.com/WordPress/gutenberg/pull/44330))
+-   useMergeRefs: Don't call/mutate refs passed if unused. ([44629](https://github.com/WordPress/gutenberg/pull/44629))
+
+#### Block Library
+
+-   Code Block: Add box-sizing to fix inconsistent layout. ([44580](https://github.com/WordPress/gutenberg/pull/44580))
+-   Comment Author: Fix empty links created for the author's name. ([44650](https://github.com/WordPress/gutenberg/pull/44650))
+-   Comments: Support nested comments settings in the comments blocks. ([44351](https://github.com/WordPress/gutenberg/pull/44351))
+-   Group: Legacy Group inner block wrapper should work with a constrained layout. ([44660](https://github.com/WordPress/gutenberg/pull/44660))
+-   Image: Fix rotated image crop area aspect ratio. ([44425](https://github.com/WordPress/gutenberg/pull/44425))
+-   Image: Upgrade react-easy-crop to bring in fix for site editor iframe. ([44408](https://github.com/WordPress/gutenberg/pull/44408))
+-   Navigation: Fix console error. ([44594](https://github.com/WordPress/gutenberg/pull/44594))
+-   Navigation: Fix semitransparent burger icon. ([44525](https://github.com/WordPress/gutenberg/pull/44525))
+-   Navigation: Try fixing link color in some TT2 contexts. ([44578](https://github.com/WordPress/gutenberg/pull/44578))
+-   Paragraph: Disable drop cap control if text is aligned. ([42326](https://github.com/WordPress/gutenberg/pull/42326))
+-   Post Featured Image: Fix borders after addition of overlay feature. ([44286](https://github.com/WordPress/gutenberg/pull/44286))
+-   Post Featured Image: Fix application of default border style in editor. ([44520](https://github.com/WordPress/gutenberg/pull/44520))
+-   Query Loop: Fix condition for displaying 'parents' control. ([44630](https://github.com/WordPress/gutenberg/pull/44630))
+-   Query Loop: Rename Query Loop variations `allowControls` to `allowedControls`. ([44523](https://github.com/WordPress/gutenberg/pull/44523))
+-   Quote block: Stop slash inserter popup showing in the citation. ([44634](https://github.com/WordPress/gutenberg/pull/44634))
+-   Site Title: Fix link color not being applied in editor #37071. ([44333](https://github.com/WordPress/gutenberg/pull/44333))
+-   Template part: Prevent adding block in post editor or inside post template or content blocks. ([44480](https://github.com/WordPress/gutenberg/pull/44480))
+-   Video: Don't display placeholder SVG when Video block selected. ([44564](https://github.com/WordPress/gutenberg/pull/44564))
+
+#### Global Styles
+
+-   Fix empty color indicator with a custom style. ([44364](https://github.com/WordPress/gutenberg/pull/44364))
+-   Re-add styles that were removed for classic themes. ([44334](https://github.com/WordPress/gutenberg/pull/44334))
+-   Remove border from Global Styles previews. ([44556](https://github.com/WordPress/gutenberg/pull/44556))
+-   Spacing presets: Modify the styling of the input controls when in unlinked mode in order to better differentiate sides. ([44141](https://github.com/WordPress/gutenberg/pull/44141))
+-   Style cards: Fix focus style. ([44612](https://github.com/WordPress/gutenberg/pull/44612))
+-   Theme.json: Fix some shadow properties not working properly in the site editor. ([44569](https://github.com/WordPress/gutenberg/pull/44569))
+-   Use color hex + index as key in the Palette component color indicator. ([44344](https://github.com/WordPress/gutenberg/pull/44344))
 
 #### Design Tools
-- Fix padding/margin visualizer accuracy. ([44485](https://github.com/WordPress/gutenberg/pull/44485))
-- Fix padding/margin visualizer placement. ([44484](https://github.com/WordPress/gutenberg/pull/44484))
-- Fix spacing property generation in flow layout type. ([44446](https://github.com/WordPress/gutenberg/pull/44446))
+
+-   Fix padding/margin visualizer accuracy. ([44485](https://github.com/WordPress/gutenberg/pull/44485))
+-   Fix padding/margin visualizer placement. ([44484](https://github.com/WordPress/gutenberg/pull/44484))
+-   Fix spacing property generation in flow layout type. ([44446](https://github.com/WordPress/gutenberg/pull/44446))
 
 #### Components
-- BorderBoxControl: Ensure the most common unit selection is maintained. ([44565](https://github.com/WordPress/gutenberg/pull/44565))
-- Popover: Fix limitShift logic by adding iframe offset correctly (and a custom shift limiter). ([42950](https://github.com/WordPress/gutenberg/pull/42950))
-- Popover: Refine position-to-placement conversion logic, add tests. ([44377](https://github.com/WordPress/gutenberg/pull/44377))
-- Navigator Screen: Fix bug where focus moved erroneously. ([44239](https://github.com/WordPress/gutenberg/pull/44239))
+
+-   BorderBoxControl: Ensure the most common unit selection is maintained. ([44565](https://github.com/WordPress/gutenberg/pull/44565))
+-   Popover: Fix limitShift logic by adding iframe offset correctly (and a custom shift limiter). ([42950](https://github.com/WordPress/gutenberg/pull/42950))
+-   Popover: Refine position-to-placement conversion logic, add tests. ([44377](https://github.com/WordPress/gutenberg/pull/44377))
+-   Navigator Screen: Fix bug where focus moved erroneously. ([44239](https://github.com/WordPress/gutenberg/pull/44239))
 
 #### Block Editor
-- Fix block search for non-Latin characters. ([44652](https://github.com/WordPress/gutenberg/pull/44652))
-- Prevent empty block toolbars from showing empty slots. ([44704](https://github.com/WordPress/gutenberg/pull/44704))
+
+-   Fix block search for non-Latin characters. ([44652](https://github.com/WordPress/gutenberg/pull/44652))
+-   Prevent empty block toolbars from showing empty slots. ([44704](https://github.com/WordPress/gutenberg/pull/44704))
 
 #### Widgets Editor
-- Add extra guarding against legacy widget preview errors. ([44635](https://github.com/WordPress/gutenberg/pull/44635))
+
+-   Add extra guarding against legacy widget preview errors. ([44635](https://github.com/WordPress/gutenberg/pull/44635))
 
 #### Themes
-- Theme export: Fix broken spacingScale export. ([44555](https://github.com/WordPress/gutenberg/pull/44555))
-- Theme export: Stop slugs being cast to integers when a theme is exported. ([44589](https://github.com/WordPress/gutenberg/pull/44589))
+
+-   Theme export: Fix broken spacingScale export. ([44555](https://github.com/WordPress/gutenberg/pull/44555))
+-   Theme export: Stop slugs being cast to integers when a theme is exported. ([44589](https://github.com/WordPress/gutenberg/pull/44589))
 
 #### Accessibility
-- TokenInput field: Try alternative approach to fix screen reader focus issue. ([44526](https://github.com/WordPress/gutenberg/pull/44526))
+
+-   TokenInput field: Try alternative approach to fix screen reader focus issue. ([44526](https://github.com/WordPress/gutenberg/pull/44526))
 
 #### Patterns
-- Fix patterns drag and drop in Safari. ([44366](https://github.com/WordPress/gutenberg/pull/44366))
+
+-   Fix patterns drag and drop in Safari. ([44366](https://github.com/WordPress/gutenberg/pull/44366))
 
 #### Post Editor
-- Add layout styles from Post Content block to post editor. ([44258](https://github.com/WordPress/gutenberg/pull/44258))
 
+-   Add layout styles from Post Content block to post editor. ([44258](https://github.com/WordPress/gutenberg/pull/44258))
 
 ### Performance
 
-- Compose: Introduce an in-house `throttle()` utility, deprecate Lodash version. ([44225](https://github.com/WordPress/gutenberg/pull/44225))
-- Improve Slot/Fill performance. ([44642](https://github.com/WordPress/gutenberg/pull/44642))
-
+-   Compose: Introduce an in-house `throttle()` utility, deprecate Lodash version. ([44225](https://github.com/WordPress/gutenberg/pull/44225))
+-   Improve Slot/Fill performance. ([44642](https://github.com/WordPress/gutenberg/pull/44642))
 
 ### Documentation
 
-- Add documentation for extending the Query Loop block via variations. ([44137](https://github.com/WordPress/gutenberg/pull/44137))
-- Add more details about possible values for block assets in `block.json`. ([44199](https://github.com/WordPress/gutenberg/pull/44199))
-- Add missing import statement for useBlockProps. ([44607](https://github.com/WordPress/gutenberg/pull/44607))
-- Instruct people to keep using `wp-scripts` even when extending webpack. ([44348](https://github.com/WordPress/gutenberg/pull/44348))
-- Style engine: Updating and fleshing out documentation. ([44405](https://github.com/WordPress/gutenberg/pull/44405))
-- Style engine: Update readme. ([44308](https://github.com/WordPress/gutenberg/pull/44308))
-- Add callout for experimental packages. ([44056](https://github.com/WordPress/gutenberg/pull/44056))
-- Expand class-level documentation for `WP_HTML_Tag_Processor`. ([44478](https://github.com/WordPress/gutenberg/pull/44478))
-- Experiments: Add README.md and CHANGELOG.md. ([44457](https://github.com/WordPress/gutenberg/pull/44457))
-- Remove the package name from the sub-menu item for clarity. ([44643](https://github.com/WordPress/gutenberg/pull/44643))
+-   Add documentation for extending the Query Loop block via variations. ([44137](https://github.com/WordPress/gutenberg/pull/44137))
+-   Add more details about possible values for block assets in `block.json`. ([44199](https://github.com/WordPress/gutenberg/pull/44199))
+-   Add missing import statement for useBlockProps. ([44607](https://github.com/WordPress/gutenberg/pull/44607))
+-   Instruct people to keep using `wp-scripts` even when extending webpack. ([44348](https://github.com/WordPress/gutenberg/pull/44348))
+-   Style engine: Updating and fleshing out documentation. ([44405](https://github.com/WordPress/gutenberg/pull/44405))
+-   Style engine: Update readme. ([44308](https://github.com/WordPress/gutenberg/pull/44308))
+-   Add callout for experimental packages. ([44056](https://github.com/WordPress/gutenberg/pull/44056))
+-   Expand class-level documentation for `WP_HTML_Tag_Processor`. ([44478](https://github.com/WordPress/gutenberg/pull/44478))
+-   Experiments: Add README.md and CHANGELOG.md. ([44457](https://github.com/WordPress/gutenberg/pull/44457))
+-   Remove the package name from the sub-menu item for clarity. ([44643](https://github.com/WordPress/gutenberg/pull/44643))
 
 ### Code Quality
 
-- Avoid calling get_blocks_metadata in WP_Theme_JSON constructor. ([44658](https://github.com/WordPress/gutenberg/pull/44658))
-- Block Popover: Use placement instead of position; move to useBlockToolbarPopoverProps hook. ([44323](https://github.com/WordPress/gutenberg/pull/44323))
-- CS/QA: Various minor fixes. ([44551](https://github.com/WordPress/gutenberg/pull/44551))
-- CS: Always use parentheses when instantiating objects. ([44550](https://github.com/WordPress/gutenberg/pull/44550))
-- CS: Remove redundant parentheses for include/require statements. ([44544](https://github.com/WordPress/gutenberg/pull/44544))
-- CS: Use pre-increment instead of post-increment. ([44549](https://github.com/WordPress/gutenberg/pull/44549))
-- Fix comment typo in document generation tools. ([44583](https://github.com/WordPress/gutenberg/pull/44583))
-- I18n: Use consistent string: 'Link rel'. ([20162](https://github.com/WordPress/gutenberg/pull/20162))
-- PHP 8.2 | Fix deprecated embedded variables in text strings. ([44538](https://github.com/WordPress/gutenberg/pull/44538))
-- PHP 8.2 | Fix for partially supported callback. ([44537](https://github.com/WordPress/gutenberg/pull/44537))
-- PHPCS: Use PHPCompatibilityWP. ([44542](https://github.com/WordPress/gutenberg/pull/44542))
-- QA: No control structures with empty body. ([44548](https://github.com/WordPress/gutenberg/pull/44548))
-- Script loader: Remove 6.1 wp actions. ([44519](https://github.com/WordPress/gutenberg/pull/44519))
-
-#### Components
-- Components refactor `Mobile` to ignore `exhaustive-deps`. ([44207](https://github.com/WordPress/gutenberg/pull/44207))
-- Convert FontSizePicker to TypeScript. ([44449](https://github.com/WordPress/gutenberg/pull/44449))
-- FontSizePicker: Replace SCSS with Emotion + components. ([44483](https://github.com/WordPress/gutenberg/pull/44483))
-- RangeControl: Remove unused UseDebouncedHoverInteractionArgs type. ([44411](https://github.com/WordPress/gutenberg/pull/44411))
-- Refactor `Notice` to pass `exhaustive-deps`. ([44157](https://github.com/WordPress/gutenberg/pull/44157))
-- Refactor `ResizableBox` to pass `exhaustive-deps`. ([44370](https://github.com/WordPress/gutenberg/pull/44370))
-- Refactor `Sandbox` to pass `exhaustive-deps`. ([44378](https://github.com/WordPress/gutenberg/pull/44378))
-- Refactor `SearchControl` native files to ignore `exhaustive-deps`. ([44381](https://github.com/WordPress/gutenberg/pull/44381))
-
-#### Block Library
-- Archive Block: Remove unnecessary spaces from class attributes. ([44440](https://github.com/WordPress/gutenberg/pull/44440))
-- Archive: No need to escape class variable. ([44468](https://github.com/WordPress/gutenberg/pull/44468))
-- Gallery: Remove unnecessary caption state. ([44383](https://github.com/WordPress/gutenberg/pull/44383))
-- Remove unnecessary `view.js` file from navigation-submenu block. ([44570](https://github.com/WordPress/gutenberg/pull/44570))
+-   Avoid calling get_blocks_metadata in WP_Theme_JSON constructor. ([44658](https://github.com/WordPress/gutenberg/pull/44658))
+-   Block Popover: Use placement instead of position; move to useBlockToolbarPopoverProps hook. ([44323](https://github.com/WordPress/gutenberg/pull/44323))
+-   CS/QA: Various minor fixes. ([44551](https://github.com/WordPress/gutenberg/pull/44551))
+-   CS: Always use parentheses when instantiating objects. ([44550](https://github.com/WordPress/gutenberg/pull/44550))
+-   CS: Remove redundant parentheses for include/require statements. ([44544](https://github.com/WordPress/gutenberg/pull/44544))
+-   CS: Use pre-increment instead of post-increment. ([44549](https://github.com/WordPress/gutenberg/pull/44549))
+-   Fix comment typo in document generation tools. ([44583](https://github.com/WordPress/gutenberg/pull/44583))
+-   I18n: Use consistent string: 'Link rel'. ([20162](https://github.com/WordPress/gutenberg/pull/20162))
+-   PHP 8.2 | Fix deprecated embedded variables in text strings. ([44538](https://github.com/WordPress/gutenberg/pull/44538))
+-   PHP 8.2 | Fix for partially supported callback. ([44537](https://github.com/WordPress/gutenberg/pull/44537))
+-   PHPCS: Use PHPCompatibilityWP. ([44542](https://github.com/WordPress/gutenberg/pull/44542))
+-   QA: No control structures with empty body. ([44548](https://github.com/WordPress/gutenberg/pull/44548))
+-   Script loader: Remove 6.1 wp actions. ([44519](https://github.com/WordPress/gutenberg/pull/44519))
+
+#### Components
+
+-   Components refactor `Mobile` to ignore `exhaustive-deps`. ([44207](https://github.com/WordPress/gutenberg/pull/44207))
+-   Convert FontSizePicker to TypeScript. ([44449](https://github.com/WordPress/gutenberg/pull/44449))
+-   FontSizePicker: Replace SCSS with Emotion + components. ([44483](https://github.com/WordPress/gutenberg/pull/44483))
+-   RangeControl: Remove unused UseDebouncedHoverInteractionArgs type. ([44411](https://github.com/WordPress/gutenberg/pull/44411))
+-   Refactor `Notice` to pass `exhaustive-deps`. ([44157](https://github.com/WordPress/gutenberg/pull/44157))
+-   Refactor `ResizableBox` to pass `exhaustive-deps`. ([44370](https://github.com/WordPress/gutenberg/pull/44370))
+-   Refactor `Sandbox` to pass `exhaustive-deps`. ([44378](https://github.com/WordPress/gutenberg/pull/44378))
+-   Refactor `SearchControl` native files to ignore `exhaustive-deps`. ([44381](https://github.com/WordPress/gutenberg/pull/44381))
+
+#### Block Library
+
+-   Archive Block: Remove unnecessary spaces from class attributes. ([44440](https://github.com/WordPress/gutenberg/pull/44440))
+-   Archive: No need to escape class variable. ([44468](https://github.com/WordPress/gutenberg/pull/44468))
+-   Gallery: Remove unnecessary caption state. ([44383](https://github.com/WordPress/gutenberg/pull/44383))
+-   Remove unnecessary `view.js` file from navigation-submenu block. ([44570](https://github.com/WordPress/gutenberg/pull/44570))
 
 #### Plugin
-- CS: All methods must declare visibility. ([44543](https://github.com/WordPress/gutenberg/pull/44543))
-- Move `wp_enqueue_block_view_script` to experiments. ([44414](https://github.com/WordPress/gutenberg/pull/44414))
+
+-   CS: All methods must declare visibility. ([44543](https://github.com/WordPress/gutenberg/pull/44543))
+-   Move `wp_enqueue_block_view_script` to experiments. ([44414](https://github.com/WordPress/gutenberg/pull/44414))
 
 #### Layout
-- Backport code quality changes from core to Gutenberg. ([44661](https://github.com/WordPress/gutenberg/pull/44661))
+
+-   Backport code quality changes from core to Gutenberg. ([44661](https://github.com/WordPress/gutenberg/pull/44661))
 
 #### Parsing
-- Block Serialization Default Parser: Bring back `no-more-tokens` type. ([44459](https://github.com/WordPress/gutenberg/pull/44459))
+
+-   Block Serialization Default Parser: Bring back `no-more-tokens` type. ([44459](https://github.com/WordPress/gutenberg/pull/44459))
 
 #### Global Styles
-- Add `blocks` to the list of valid origins for `theme.json`. ([44363](https://github.com/WordPress/gutenberg/pull/44363))
+
+-   Add `blocks` to the list of valid origins for `theme.json`. ([44363](https://github.com/WordPress/gutenberg/pull/44363))
 
 #### Lodash
-- Lodash: Remove completely from `@wordpress/compose` package. ([44568](https://github.com/WordPress/gutenberg/pull/44568))
-- Lodash: Remove completely from `@wordpress/library-export-default-webpack-plugin` package. ([44571](https://github.com/WordPress/gutenberg/pull/44571))
-- Lodash: Remove completely from `@wordpress/list-reusable-blocks` package. ([44567](https://github.com/WordPress/gutenberg/pull/44567))
-- Lodash: Refactor away from `_.flow()`. ([44500](https://github.com/WordPress/gutenberg/pull/44500))
-- Lodash: Remove completely from `@wordpress/block-directory` package. ([44206](https://github.com/WordPress/gutenberg/pull/44206))
-- Lodash: Remove completely from `@wordpress/rich-text` package. ([44204](https://github.com/WordPress/gutenberg/pull/44204))
+
+-   Lodash: Remove completely from `@wordpress/compose` package. ([44568](https://github.com/WordPress/gutenberg/pull/44568))
+-   Lodash: Remove completely from `@wordpress/library-export-default-webpack-plugin` package. ([44571](https://github.com/WordPress/gutenberg/pull/44571))
+-   Lodash: Remove completely from `@wordpress/list-reusable-blocks` package. ([44567](https://github.com/WordPress/gutenberg/pull/44567))
+-   Lodash: Refactor away from `_.flow()`. ([44500](https://github.com/WordPress/gutenberg/pull/44500))
+-   Lodash: Remove completely from `@wordpress/block-directory` package. ([44206](https://github.com/WordPress/gutenberg/pull/44206))
+-   Lodash: Remove completely from `@wordpress/rich-text` package. ([44204](https://github.com/WordPress/gutenberg/pull/44204))
 
 ### Tools
 
-- Scripts: Use default value for process.env.WP_SRC_DIRECTORY. ([44367](https://github.com/WordPress/gutenberg/pull/44367))
-- Limit access to experimental APIs to WordPress codebase. ([43386](https://github.com/WordPress/gutenberg/pull/43386))
-- Cherry Pick Script: Restore retrieval of merge_commit_sha. ([44890](https://github.com/WordPress/gutenberg/pull/44890))
+-   Scripts: Use default value for process.env.WP_SRC_DIRECTORY. ([44367](https://github.com/WordPress/gutenberg/pull/44367))
+-   Limit access to experimental APIs to WordPress codebase. ([43386](https://github.com/WordPress/gutenberg/pull/43386))
+-   Cherry Pick Script: Restore retrieval of merge_commit_sha. ([44890](https://github.com/WordPress/gutenberg/pull/44890))
 
 #### Testing
-- Autocomplete Component: Add end-to-end tests (take two). ([42905](https://github.com/WordPress/gutenberg/pull/42905))
-- Fix failing quote to reusable block conversion end-to-end test. ([44350](https://github.com/WordPress/gutenberg/pull/44350))
-- Add strict meta schema validation test for block.json. ([44423](https://github.com/WordPress/gutenberg/pull/44423))
-- Migrate iframed block test to Playwright. ([44164](https://github.com/WordPress/gutenberg/pull/44164))
-- Add theme.json schema tests. ([44252](https://github.com/WordPress/gutenberg/pull/44252))
-- Remove enzyme completely. ([44494](https://github.com/WordPress/gutenberg/pull/44494))
-- Fix typo from in writing flow spec. ([44358](https://github.com/WordPress/gutenberg/pull/44358))
-- Fix typo in WP_Navigation_Page_Test. ([44685](https://github.com/WordPress/gutenberg/pull/44685))
-- Popover: Convert unit tests to TypeScript and modern RTL assertions. ([44373](https://github.com/WordPress/gutenberg/pull/44373))
-- Refactor `AlignmentMatrixControl` tests to use `@testing-library/react`. ([44670](https://github.com/WordPress/gutenberg/pull/44670))
-- End-to-end Test Utils: Don't use hardcoded login credentials. ([44331](https://github.com/WordPress/gutenberg/pull/44331))
-- Refactor `PluginPostPublishPanel` tests to use RTL render. ([44667](https://github.com/WordPress/gutenberg/pull/44667))
-- Refactor `AutosaveMonitor` tests to `@testing-library/react`. ([44492](https://github.com/WordPress/gutenberg/pull/44492))
-- Refactor `PostPreviewButton` tests to `@testing-library/react`. ([44470](https://github.com/WordPress/gutenberg/pull/44470))
-- Refactor `BlockSwitcher` tests to `@testing-library/react`. ([44493](https://github.com/WordPress/gutenberg/pull/44493))
-- Refactor `ResponsiveBlockControl` tests to use `@testing-library/react`. ([44669](https://github.com/WordPress/gutenberg/pull/44669))
-- Style engine: Add JS unit tests for outline properties. ([44518](https://github.com/WordPress/gutenberg/pull/44518))
 
-#### Build Tooling
-- Upgrade Lerna to the latest version. ([44456](https://github.com/WordPress/gutenberg/pull/44456))
-- wp-env: Use case insensitive regex when checking WP version string. ([44887](https://github.com/WordPress/gutenberg/pull/44887))
+-   Autocomplete Component: Add end-to-end tests (take two). ([42905](https://github.com/WordPress/gutenberg/pull/42905))
+-   Fix failing quote to reusable block conversion end-to-end test. ([44350](https://github.com/WordPress/gutenberg/pull/44350))
+-   Add strict meta schema validation test for block.json. ([44423](https://github.com/WordPress/gutenberg/pull/44423))
+-   Migrate iframed block test to Playwright. ([44164](https://github.com/WordPress/gutenberg/pull/44164))
+-   Add theme.json schema tests. ([44252](https://github.com/WordPress/gutenberg/pull/44252))
+-   Remove enzyme completely. ([44494](https://github.com/WordPress/gutenberg/pull/44494))
+-   Fix typo from in writing flow spec. ([44358](https://github.com/WordPress/gutenberg/pull/44358))
+-   Fix typo in WP_Navigation_Page_Test. ([44685](https://github.com/WordPress/gutenberg/pull/44685))
+-   Popover: Convert unit tests to TypeScript and modern RTL assertions. ([44373](https://github.com/WordPress/gutenberg/pull/44373))
+-   Refactor `AlignmentMatrixControl` tests to use `@testing-library/react`. ([44670](https://github.com/WordPress/gutenberg/pull/44670))
+-   End-to-end Test Utils: Don't use hardcoded login credentials. ([44331](https://github.com/WordPress/gutenberg/pull/44331))
+-   Refactor `PluginPostPublishPanel` tests to use RTL render. ([44667](https://github.com/WordPress/gutenberg/pull/44667))
+-   Refactor `AutosaveMonitor` tests to `@testing-library/react`. ([44492](https://github.com/WordPress/gutenberg/pull/44492))
+-   Refactor `PostPreviewButton` tests to `@testing-library/react`. ([44470](https://github.com/WordPress/gutenberg/pull/44470))
+-   Refactor `BlockSwitcher` tests to `@testing-library/react`. ([44493](https://github.com/WordPress/gutenberg/pull/44493))
+-   Refactor `ResponsiveBlockControl` tests to use `@testing-library/react`. ([44669](https://github.com/WordPress/gutenberg/pull/44669))
+-   Style engine: Add JS unit tests for outline properties. ([44518](https://github.com/WordPress/gutenberg/pull/44518))
 
+#### Build Tooling
 
-## First time contributors
+-   Upgrade Lerna to the latest version. ([44456](https://github.com/WordPress/gutenberg/pull/44456))
+-   wp-env: Use case insensitive regex when checking WP version string. ([44887](https://github.com/WordPress/gutenberg/pull/44887))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @alecgeatches: Add theme.json schema tests. ([44252](https://github.com/WordPress/gutenberg/pull/44252))
-- @BenoitZugmeyer: Use `get_queried_object_id` when setting `current-menu-item` classes. ([44474](https://github.com/WordPress/gutenberg/pull/44474))
-- @blindingstars: Update Theme JSON `$schema` to allow pseudo selectors on `button` property. ([44303](https://github.com/WordPress/gutenberg/pull/44303))
-- @imanish003: Add missing import statement for useBlockProps. ([44607](https://github.com/WordPress/gutenberg/pull/44607))
-- @loxK: Scripts: Use default value for process.env.WP_SRC_DIRECTORY. ([44367](https://github.com/WordPress/gutenberg/pull/44367))
-- @Lucisu: Fix empty links being created for the author's name comment. ([44650](https://github.com/WordPress/gutenberg/pull/44650))
-- @philwp: Post Author block now includes option to link author archive. ([42670](https://github.com/WordPress/gutenberg/pull/42670))
+The following PRs were merged by first-time contributors:
 
+-   @alecgeatches: Add theme.json schema tests. ([44252](https://github.com/WordPress/gutenberg/pull/44252))
+-   @BenoitZugmeyer: Use `get_queried_object_id` when setting `current-menu-item` classes. ([44474](https://github.com/WordPress/gutenberg/pull/44474))
+-   @blindingstars: Update Theme JSON `$schema` to allow pseudo selectors on `button` property. ([44303](https://github.com/WordPress/gutenberg/pull/44303))
+-   @imanish003: Add missing import statement for useBlockProps. ([44607](https://github.com/WordPress/gutenberg/pull/44607))
+-   @loxK: Scripts: Use default value for process.env.WP_SRC_DIRECTORY. ([44367](https://github.com/WordPress/gutenberg/pull/44367))
+-   @Lucisu: Fix empty links being created for the author's name comment. ([44650](https://github.com/WordPress/gutenberg/pull/44650))
+-   @philwp: Post Author block now includes option to link author archive. ([42670](https://github.com/WordPress/gutenberg/pull/42670))
 
 ## Contributors
 
@@ -11350,222 +22603,211 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @ajlende @alecgeatches @andrewserong @anton-vlasenko @BE-Webdesign @BenoitZugmeyer @blindingstars @carolinan @chad1008 @ciampo @derekblank @dmsnell @ellatrix @getdave @glendaviesnz @gziolo @imanish003 @inc2734 @jameskoster @jasmussen @javierarce @jorgefilipecosta @jrfnl @kevin940726 @loxK @Lucisu @luisherranz @Mamaduka @michalczaplinski @ndiego @noisysocks @ntsekouras @oandregal @pagelab @philwp @ramonjd @Rink9 @ryanwelcher @SantosGuillamot @scruffian @Soean @sunyatasattva @t-hamano @talldan @tellthemachines @tyxla @vcanales @youknowriad
 
-
-
-
 = 14.2.0 =
 
 ## Changelog
 
 ### Deprecations
 
-- Officially deprecate the `children` and `node` block attribute sources. ([44265](https://github.com/WordPress/gutenberg/pull/44265))
+-   Officially deprecate the `children` and `node` block attribute sources. ([44265](https://github.com/WordPress/gutenberg/pull/44265))
 
 ### Enhancements
 
 #### Components
 
-- Link/Unlink buttons: Add more polished styling and UX. ([43802](https://github.com/WordPress/gutenberg/pull/43802))
+-   Link/Unlink buttons: Add more polished styling and UX. ([43802](https://github.com/WordPress/gutenberg/pull/43802))
 
 #### Global Styles
 
-- Allow setting Letter case and Decoration to 'None' and add Letter case to Global Styles. ([44067](https://github.com/WordPress/gutenberg/pull/44067))
-- Block supports: Allow overriding prettify options for enqueued CSS. ([44248](https://github.com/WordPress/gutenberg/pull/44248))
-- Show Letter Spacing in Global Styles -> Typography -> Headings. ([44142](https://github.com/WordPress/gutenberg/pull/44142))
-- Spacing presets: Switch to using numbers instead of t-shirt sizes for labels. ([44247](https://github.com/WordPress/gutenberg/pull/44247))
+-   Allow setting Letter case and Decoration to 'None' and add Letter case to Global Styles. ([44067](https://github.com/WordPress/gutenberg/pull/44067))
+-   Block supports: Allow overriding prettify options for enqueued CSS. ([44248](https://github.com/WordPress/gutenberg/pull/44248))
+-   Show Letter Spacing in Global Styles -> Typography -> Headings. ([44142](https://github.com/WordPress/gutenberg/pull/44142))
+-   Spacing presets: Switch to using numbers instead of t-shirt sizes for labels. ([44247](https://github.com/WordPress/gutenberg/pull/44247))
 
 #### Block Editor
 
-- Hide all floating block UI when typing. ([44083](https://github.com/WordPress/gutenberg/pull/44083))
-- Update animation for line and sibling inserter. ([44269](https://github.com/WordPress/gutenberg/pull/44269))
-- Warning component: Align the action buttons. ([44328](https://github.com/WordPress/gutenberg/pull/44328))
+-   Hide all floating block UI when typing. ([44083](https://github.com/WordPress/gutenberg/pull/44083))
+-   Update animation for line and sibling inserter. ([44269](https://github.com/WordPress/gutenberg/pull/44269))
+-   Warning component: Align the action buttons. ([44328](https://github.com/WordPress/gutenberg/pull/44328))
 
 #### Block Library
 
-- Calendar block: Add color supports and polish styles. ([42029](https://github.com/WordPress/gutenberg/pull/42029))
-- Embed block: Mark which attributes should be considered content. ([44039](https://github.com/WordPress/gutenberg/pull/44039))
-- List Item block: Improve writing flow. ([43954](https://github.com/WordPress/gutenberg/pull/43954))
-- Post Navigation Link block: Add arrows. ([40684](https://github.com/WordPress/gutenberg/pull/40684))
-- Query Loop block: Suggest active variation patterns.
-  ([44197](https://github.com/WordPress/gutenberg/pull/44197))
+-   Calendar block: Add color supports and polish styles. ([42029](https://github.com/WordPress/gutenberg/pull/42029))
+-   Embed block: Mark which attributes should be considered content. ([44039](https://github.com/WordPress/gutenberg/pull/44039))
+-   List Item block: Improve writing flow. ([43954](https://github.com/WordPress/gutenberg/pull/43954))
+-   Post Navigation Link block: Add arrows. ([40684](https://github.com/WordPress/gutenberg/pull/40684))
+-   Query Loop block: Suggest active variation patterns.
+    ([44197](https://github.com/WordPress/gutenberg/pull/44197))
 
 #### Patterns
 
-- Add a new category for block patterns called "Banners". ([44203](https://github.com/WordPress/gutenberg/pull/44203))
-- Add a new category for block patterns called "Footers".
-  ([44200](https://github.com/WordPress/gutenberg/pull/44200))
+-   Add a new category for block patterns called "Banners". ([44203](https://github.com/WordPress/gutenberg/pull/44203))
+-   Add a new category for block patterns called "Footers".
+    ([44200](https://github.com/WordPress/gutenberg/pull/44200))
 
 ### Bug Fixes
 
 #### Components
 
-- BlockMover: Clean up focus styles. ([44241](https://github.com/WordPress/gutenberg/pull/44241))
-- Fix animation running in loop while dragging an image on a dropzone. ([44264](https://github.com/WordPress/gutenberg/pull/44264))
-- Fix popover stacking in the customize widgets editor. ([44282](https://github.com/WordPress/gutenberg/pull/44282))
-- Link autocompleter: Enable for all blocks. ([44078](https://github.com/WordPress/gutenberg/pull/44078))
-- Remove unexpected `has-text` class when empty children are passed to `Button`. ([44198](https://github.com/WordPress/gutenberg/pull/44198))
+-   BlockMover: Clean up focus styles. ([44241](https://github.com/WordPress/gutenberg/pull/44241))
+-   Fix animation running in loop while dragging an image on a dropzone. ([44264](https://github.com/WordPress/gutenberg/pull/44264))
+-   Fix popover stacking in the customize widgets editor. ([44282](https://github.com/WordPress/gutenberg/pull/44282))
+-   Link autocompleter: Enable for all blocks. ([44078](https://github.com/WordPress/gutenberg/pull/44078))
+-   Remove unexpected `has-text` class when empty children are passed to `Button`. ([44198](https://github.com/WordPress/gutenberg/pull/44198))
 
 #### Block Library
 
 ##### Bugfixes to blocks:
 
-- Cover block: Fix preview. ([44321](https://github.com/WordPress/gutenberg/pull/44321))
-- Freeform block: Hide "Convert to blocks" when the block locked.
-  ([44288](https://github.com/WordPress/gutenberg/pull/44288))
-- Group block: Change default variation in inserter. ([44176](https://github.com/WordPress/gutenberg/pull/44176))
-- Missing block: Fix HTML block check. ([44327](https://github.com/WordPress/gutenberg/pull/44327))
-- Navigation block: Fix submenu colors for imported classic menus.
-  ([44283](https://github.com/WordPress/gutenberg/pull/44283))
-- Navigation block: Remove ellipses as menu icon options for now. ([44222](https://github.com/WordPress/gutenberg/pull/44222))
-- Pullquote block: Fix transform to quote crash.
-  ([44315](https://github.com/WordPress/gutenberg/pull/44315))
-- Post Featured Image block: Fix height/scale overwriting `img` inline styles. ([44213](https://github.com/WordPress/gutenberg/pull/44213))
-- Query Loop block: Fix broken preview in specific category template. ([44294](https://github.com/WordPress/gutenberg/pull/44294))
-- Query Loop block: Fix variation with declared`icon` object with `src`.
-  ([44270](https://github.com/WordPress/gutenberg/pull/44270))
+-   Cover block: Fix preview. ([44321](https://github.com/WordPress/gutenberg/pull/44321))
+-   Freeform block: Hide "Convert to blocks" when the block locked.
+    ([44288](https://github.com/WordPress/gutenberg/pull/44288))
+-   Group block: Change default variation in inserter. ([44176](https://github.com/WordPress/gutenberg/pull/44176))
+-   Missing block: Fix HTML block check. ([44327](https://github.com/WordPress/gutenberg/pull/44327))
+-   Navigation block: Fix submenu colors for imported classic menus.
+    ([44283](https://github.com/WordPress/gutenberg/pull/44283))
+-   Navigation block: Remove ellipses as menu icon options for now. ([44222](https://github.com/WordPress/gutenberg/pull/44222))
+-   Pullquote block: Fix transform to quote crash.
+    ([44315](https://github.com/WordPress/gutenberg/pull/44315))
+-   Post Featured Image block: Fix height/scale overwriting `img` inline styles. ([44213](https://github.com/WordPress/gutenberg/pull/44213))
+-   Query Loop block: Fix broken preview in specific category template. ([44294](https://github.com/WordPress/gutenberg/pull/44294))
+-   Query Loop block: Fix variation with declared`icon` object with `src`.
+    ([44270](https://github.com/WordPress/gutenberg/pull/44270))
 
 ##### Other bugfixes not related to a specific block:
 
-- Avoid showing the recursion warning in previews when replacing template parts. ([44256](https://github.com/WordPress/gutenberg/pull/44256))
-- Ensure replacing a template part using a pattern doesn't update the existing
-- Fix demo content cover block text color. ([44174](https://github.com/WordPress/gutenberg/pull/44174))
-  entity. ([44221](https://github.com/WordPress/gutenberg/pull/44221))
-- Add style-engine to Gutenberg's `tsconfig.json` references. ([44516](https://github.com/WordPress/gutenberg/pull/44516))
+-   Avoid showing the recursion warning in previews when replacing template parts. ([44256](https://github.com/WordPress/gutenberg/pull/44256))
+-   Ensure replacing a template part using a pattern doesn't update the existing
+-   Fix demo content cover block text color. ([44174](https://github.com/WordPress/gutenberg/pull/44174))
+    entity. ([44221](https://github.com/WordPress/gutenberg/pull/44221))
+-   Add style-engine to Gutenberg's `tsconfig.json` references. ([44516](https://github.com/WordPress/gutenberg/pull/44516))
 
 #### Block Editor
 
-- Block Toolbar: Update position when moving blocks. ([44301](https://github.com/WordPress/gutenberg/pull/44301))
-- Capture state changes scheduled between render and effect. ([38509](https://github.com/WordPress/gutenberg/pull/38509))
-- Writing flow: Fix partial selection when dragging in between blocks. ([44230](https://github.com/WordPress/gutenberg/pull/44230))
+-   Block Toolbar: Update position when moving blocks. ([44301](https://github.com/WordPress/gutenberg/pull/44301))
+-   Capture state changes scheduled between render and effect. ([38509](https://github.com/WordPress/gutenberg/pull/38509))
+-   Writing flow: Fix partial selection when dragging in between blocks. ([44230](https://github.com/WordPress/gutenberg/pull/44230))
 
 #### Accessibility
 
-- Add `role=application` to List View to prevent browse mode triggering in NVDA. ([44291](https://github.com/WordPress/gutenberg/pull/44291))
-- Block label and title don't consider variations. ([44250](https://github.com/WordPress/gutenberg/pull/44250))
-- Make inline toolbar navigable by arrow keys. ([43645](https://github.com/WordPress/gutenberg/pull/43645))
-- Text Selection in Safari: Try new fix for recent version. ([44148](https://github.com/WordPress/gutenberg/pull/44148))
+-   Add `role=application` to List View to prevent browse mode triggering in NVDA. ([44291](https://github.com/WordPress/gutenberg/pull/44291))
+-   Block label and title don't consider variations. ([44250](https://github.com/WordPress/gutenberg/pull/44250))
+-   Make inline toolbar navigable by arrow keys. ([43645](https://github.com/WordPress/gutenberg/pull/43645))
+-   Text Selection in Safari: Try new fix for recent version. ([44148](https://github.com/WordPress/gutenberg/pull/44148))
 
 #### Global Styles
 
-- Add: Frontend section presets output. ([42124](https://github.com/WordPress/gutenberg/pull/42124))
-- Block supports: Prioritize prettify options over `SCRIPT_DEBUG`. ([44254](https://github.com/WordPress/gutenberg/pull/44254))
-- Fix padding on the post editor when `RootPaddingAwareAlignments` setting is enabled. ([44209](https://github.com/WordPress/gutenberg/pull/44209))
-- Remove the beta label from global styles header. ([44251](https://github.com/WordPress/gutenberg/pull/44251))
-- Theme.json: Fix some outline properties that don't work properly in the editor. ([44504](https://github.com/WordPress/gutenberg/pull/44504))
+-   Add: Frontend section presets output. ([42124](https://github.com/WordPress/gutenberg/pull/42124))
+-   Block supports: Prioritize prettify options over `SCRIPT_DEBUG`. ([44254](https://github.com/WordPress/gutenberg/pull/44254))
+-   Fix padding on the post editor when `RootPaddingAwareAlignments` setting is enabled. ([44209](https://github.com/WordPress/gutenberg/pull/44209))
+-   Remove the beta label from global styles header. ([44251](https://github.com/WordPress/gutenberg/pull/44251))
+-   Theme.json: Fix some outline properties that don't work properly in the editor. ([44504](https://github.com/WordPress/gutenberg/pull/44504))
 
 #### Site Editor
 
-- Make template names and descriptions dynamic. ([43862](https://github.com/WordPress/gutenberg/pull/43862))
-- Prevent editor from creating multiple templates when multi-clicking the
-  "create" button. ([44146](https://github.com/WordPress/gutenberg/pull/44146))
+-   Make template names and descriptions dynamic. ([43862](https://github.com/WordPress/gutenberg/pull/43862))
+-   Prevent editor from creating multiple templates when multi-clicking the
+    "create" button. ([44146](https://github.com/WordPress/gutenberg/pull/44146))
 
 #### Keycodes
 
-- Keyboard Shortcuts: Fix settings sidebar toggle shortcut. ([43428](https://github.com/WordPress/gutenberg/pull/43428))
+-   Keyboard Shortcuts: Fix settings sidebar toggle shortcut. ([43428](https://github.com/WordPress/gutenberg/pull/43428))
 
 ### Performance
 
-- Avoid calling redux actions constantly when moving the mouse or scrolling. ([44325](https://github.com/WordPress/gutenberg/pull/44325))
-- Batch container block settings action calls. ([43958](https://github.com/WordPress/gutenberg/pull/43958))
-- Prevent resize observer loops in BlockPreview. ([44319](https://github.com/WordPress/gutenberg/pull/44319))
+-   Avoid calling redux actions constantly when moving the mouse or scrolling. ([44325](https://github.com/WordPress/gutenberg/pull/44325))
+-   Batch container block settings action calls. ([43958](https://github.com/WordPress/gutenberg/pull/43958))
+-   Prevent resize observer loops in BlockPreview. ([44319](https://github.com/WordPress/gutenberg/pull/44319))
 
 ### Documentation
 
-- Include information about multiple scripts support added in WP 6.1. ([44155](https://github.com/WordPress/gutenberg/pull/44155))
-- Popover: Write better documentation regarding the recent API changes. ([44195](https://github.com/WordPress/gutenberg/pull/44195))
-- RangeControl component: Clarify rail vs track difference. ([44057](https://github.com/WordPress/gutenberg/pull/44057))
-- Update links in the Development Platform document. ([44181](https://github.com/WordPress/gutenberg/pull/44181))
-- Updating versions in WP for 6.0.2. ([43826](https://github.com/WordPress/gutenberg/pull/43826))
+-   Include information about multiple scripts support added in WP 6.1. ([44155](https://github.com/WordPress/gutenberg/pull/44155))
+-   Popover: Write better documentation regarding the recent API changes. ([44195](https://github.com/WordPress/gutenberg/pull/44195))
+-   RangeControl component: Clarify rail vs track difference. ([44057](https://github.com/WordPress/gutenberg/pull/44057))
+-   Update links in the Development Platform document. ([44181](https://github.com/WordPress/gutenberg/pull/44181))
+-   Updating versions in WP for 6.0.2. ([43826](https://github.com/WordPress/gutenberg/pull/43826))
 
 ### Code Quality
 
-- Backport template creation changes from Core.
-- Enforce coding guideline regarding the usage of quotation marks. ([44305](https://github.com/WordPress/gutenberg/pull/44305))
-- Fix missing TS types for a11y in `packages/components`. ([44277](https://github.com/WordPress/gutenberg/pull/44277))
-- Preferences-persistence: Remove `@wordpress/compose` dependency. ([44202](https://github.com/WordPress/gutenberg/pull/44202))
-- Refactor style engine border styles. ([43594](https://github.com/WordPress/gutenberg/pull/43594))
-- Removes whitespace from l18n-strings. ([44314](https://github.com/WordPress/gutenberg/pull/44314))
-- Renaming functions to match their naming in Core. ([44266](https://github.com/WordPress/gutenberg/pull/44266))
-  ([44299](https://github.com/WordPress/gutenberg/pull/44299))
-- `useInstanceId`: Convert to typescript. ([43790](https://github.com/WordPress/gutenberg/pull/43790))
+-   Backport template creation changes from Core.
+-   Enforce coding guideline regarding the usage of quotation marks. ([44305](https://github.com/WordPress/gutenberg/pull/44305))
+-   Fix missing TS types for a11y in `packages/components`. ([44277](https://github.com/WordPress/gutenberg/pull/44277))
+-   Preferences-persistence: Remove `@wordpress/compose` dependency. ([44202](https://github.com/WordPress/gutenberg/pull/44202))
+-   Refactor style engine border styles. ([43594](https://github.com/WordPress/gutenberg/pull/43594))
+-   Removes whitespace from l18n-strings. ([44314](https://github.com/WordPress/gutenberg/pull/44314))
+-   Renaming functions to match their naming in Core. ([44266](https://github.com/WordPress/gutenberg/pull/44266))
+    ([44299](https://github.com/WordPress/gutenberg/pull/44299))
+-   `useInstanceId`: Convert to typescript. ([43790](https://github.com/WordPress/gutenberg/pull/43790))
 
 #### Updating dependencies
 
-- Update `fast-average-color` library to latest version. ([44175](https://github.com/WordPress/gutenberg/pull/44175))
-- Update `json2php` to `v0.0.5`. ([44313](https://github.com/WordPress/gutenberg/pull/44313))
-- Remove `wp-editor` from `wp-edit-blocks` dependencies. ([33496](https://github.com/WordPress/gutenberg/pull/33496))
+-   Update `fast-average-color` library to latest version. ([44175](https://github.com/WordPress/gutenberg/pull/44175))
+-   Update `json2php` to `v0.0.5`. ([44313](https://github.com/WordPress/gutenberg/pull/44313))
+-   Remove `wp-editor` from `wp-edit-blocks` dependencies. ([33496](https://github.com/WordPress/gutenberg/pull/33496))
 
 #### Block Library
 
-- Comments Pagination blocks: Rename for consistency. ([44287](https://github.com/WordPress/gutenberg/pull/44287))
-- Embed block: Remove incorrect comments about block variations. ([43834](https://github.com/WordPress/gutenberg/pull/43834))
+-   Comments Pagination blocks: Rename for consistency. ([44287](https://github.com/WordPress/gutenberg/pull/44287))
+-   Embed block: Remove incorrect comments about block variations. ([43834](https://github.com/WordPress/gutenberg/pull/43834))
 
 #### Components
 
-- Refactor `NavigationMenu` to ignore `exhaustive-deps`. ([44090](https://github.com/WordPress/gutenberg/pull/44090))
-- Refactor `RangeControl` to pass `exhaustive-deps`.
-  ([44271](https://github.com/WordPress/gutenberg/pull/44271))
-- Popover: Add `anchor` prop which supersedes all previous anchor-related props. ([43691](https://github.com/WordPress/gutenberg/pull/43691))
-- UnitControl: Fix exhaustive-deps warnings. ([44161](https://github.com/WordPress/gutenberg/pull/44161))
-- UnitControl: Use `hideHTMLArrows` prop to hide spin buttons. ([43985](https://github.com/WordPress/gutenberg/pull/43985))
-- `useSetting`: Minor refactor. ([44267](https://github.com/WordPress/gutenberg/pull/44267))
+-   Refactor `NavigationMenu` to ignore `exhaustive-deps`. ([44090](https://github.com/WordPress/gutenberg/pull/44090))
+-   Refactor `RangeControl` to pass `exhaustive-deps`.
+    ([44271](https://github.com/WordPress/gutenberg/pull/44271))
+-   Popover: Add `anchor` prop which supersedes all previous anchor-related props. ([43691](https://github.com/WordPress/gutenberg/pull/43691))
+-   UnitControl: Fix exhaustive-deps warnings. ([44161](https://github.com/WordPress/gutenberg/pull/44161))
+-   UnitControl: Use `hideHTMLArrows` prop to hide spin buttons. ([43985](https://github.com/WordPress/gutenberg/pull/43985))
+-   `useSetting`: Minor refactor. ([44267](https://github.com/WordPress/gutenberg/pull/44267))
 
 #### Refactoring tests to use `@testing-library/react`
 
-- Refactor `BlockControls` tests to `@testing-library/react`. ([44122](https://github.com/WordPress/gutenberg/pull/44122))
-- Refactor `ColorPalette` tests to `@testing-library/react`. ([44108](https://github.com/WordPress/gutenberg/pull/44108))
-- Refactor `KeyboardShortcutHelpModal` tests to `@testing-library/react`.
-  ([44077](https://github.com/WordPress/gutenberg/pull/44077))
+-   Refactor `BlockControls` tests to `@testing-library/react`. ([44122](https://github.com/WordPress/gutenberg/pull/44122))
+-   Refactor `ColorPalette` tests to `@testing-library/react`. ([44108](https://github.com/WordPress/gutenberg/pull/44108))
+-   Refactor `KeyboardShortcutHelpModal` tests to `@testing-library/react`.
+    ([44077](https://github.com/WordPress/gutenberg/pull/44077))
 
 #### Work to remove dependency on `lodash`
 
-- Compose: Introduce in-house `compose` and `pipe` utils. ([44112](https://github.com/WordPress/gutenberg/pull/44112))
-- Compose: Introduce in-house `debounce()` utility, deprecate Lodash version. ([43943](https://github.com/WordPress/gutenberg/pull/43943))
-- Lodash: Remove dependency from `@wordpress/widgets` package. ([44201](https://github.com/WordPress/gutenberg/pull/44201))
-- Lodash: Refactor away from `_.flowRight()`.
-  ([44188](https://github.com/WordPress/gutenberg/pull/44188))
+-   Compose: Introduce in-house `compose` and `pipe` utils. ([44112](https://github.com/WordPress/gutenberg/pull/44112))
+-   Compose: Introduce in-house `debounce()` utility, deprecate Lodash version. ([43943](https://github.com/WordPress/gutenberg/pull/43943))
+-   Lodash: Remove dependency from `@wordpress/widgets` package. ([44201](https://github.com/WordPress/gutenberg/pull/44201))
+-   Lodash: Refactor away from `_.flowRight()`.
+    ([44188](https://github.com/WordPress/gutenberg/pull/44188))
 
 #### Testing
 
-- Storybook: Set up local visual regression testing.
-  ([43393](https://github.com/WordPress/gutenberg/pull/43393))
+-   Storybook: Set up local visual regression testing.
+    ([43393](https://github.com/WordPress/gutenberg/pull/43393))
 
 #### Tooling
 
-- Ensure all packages get minor/major version bump when requested. ([44317](https://github.com/WordPress/gutenberg/pull/44317))
+-   Ensure all packages get minor/major version bump when requested. ([44317](https://github.com/WordPress/gutenberg/pull/44317))
 
-## First time contributors
+## First-time contributors
 
-The following PRs were merged by first time contributors:
+The following PRs were merged by first-time contributors:
 
-- @kkoppenhaver: Update RangeControl documentation to clarify rail vs track. ([44057](https://github.com/WordPress/gutenberg/pull/44057))
-- @pagelab: Enforce coding guideline regarding the usage of quotation marks. ([44305](https://github.com/WordPress/gutenberg/pull/44305))
+-   @kkoppenhaver: Update RangeControl documentation to clarify rail vs track. ([44057](https://github.com/WordPress/gutenberg/pull/44057))
+-   @pagelab: Enforce coding guideline regarding the usage of quotation marks. ([44305](https://github.com/WordPress/gutenberg/pull/44305))
 
 ## Contributors
 
 The following contributors merged PRs in this release:
 
-@aaronrobertshaw @ajlende @annezazu @apmatthews @aristath @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @dcalhoun @draganescu @ellatrix @geriux @glendaviesnz @gziolo @jasmussen @jorgefilipecosta @kebbet @kkoppenhaver @Mamaduka @matiasbenedetto @mcsf @michalczaplinski @mirka @mtias @noisysocks @ntsekouras @pagelab @ramonjd @t-hamano @talldan @tellthemachines @tyxla @walbo @youknowriad 
-
-
-
+@aaronrobertshaw @ajlende @annezazu @apmatthews @aristath @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @dcalhoun @draganescu @ellatrix @geriux @glendaviesnz @gziolo @jasmussen @jorgefilipecosta @kebbet @kkoppenhaver @Mamaduka @matiasbenedetto @mcsf @michalczaplinski @mirka @mtias @noisysocks @ntsekouras @pagelab @ramonjd @t-hamano @talldan @tellthemachines @tyxla @walbo @youknowriad
 
 = 14.1.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
-- Blocks: Fix searching of blocks when description is non-string. ([44233](https://github.com/WordPress/gutenberg/pull/44233)) Resolves an editor crash which could happen when searching for blocks.
-
-
-## First time contributors
-
-The following PRs were merged by first time contributors:
+-   Blocks: Fix searching of blocks when description is non-string. ([44233](https://github.com/WordPress/gutenberg/pull/44233)) Resolves an editor crash which could happen when searching for blocks.
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -11573,7 +22815,6 @@ The following contributors merged PRs in this release:
 
 @tyxla
 
-
 = 14.1.0 =
 
 ## Changelog
@@ -11581,483 +22822,526 @@ The following contributors merged PRs in this release:
 ### Features
 
 #### Block Library
-- Add select icon for Navigation Block's menu button. ([43674](https://github.com/WordPress/gutenberg/pull/43674))
+
+-   Add select icon for Navigation Block's menu button. ([43674](https://github.com/WordPress/gutenberg/pull/43674))
 
 #### Full Site Editing
-- Add a zoomed out view to the site editor. ([41156](https://github.com/WordPress/gutenberg/pull/41156))
 
+-   Add a zoomed out view to the site editor. ([41156](https://github.com/WordPress/gutenberg/pull/41156))
 
 ### Enhancements
 
 #### Design Tools
-- Add padding and margin support to the gallery block. ([43965](https://github.com/WordPress/gutenberg/pull/43965))
-- Archives: Add typography support. ([43935](https://github.com/WordPress/gutenberg/pull/43935))
-- Avatar: Add padding support. ([43519](https://github.com/WordPress/gutenberg/pull/43519))
-- Buttons: Add typography supports to button/s blocks. ([43934](https://github.com/WordPress/gutenberg/pull/43934))
-- Calendar: Add typography supports (except text-decoration). ([43969](https://github.com/WordPress/gutenberg/pull/43969))
-- Categories List: Add spacing support. ([43647](https://github.com/WordPress/gutenberg/pull/43647))
-- Comment Date: Add spacing support. ([43656](https://github.com/WordPress/gutenberg/pull/43656))
-- Comment Edit Link: Add spacing support. ([43657](https://github.com/WordPress/gutenberg/pull/43657))
-- Comment Reply Link: Add spacing support. ([43658](https://github.com/WordPress/gutenberg/pull/43658))
-- Heading: Add missing typography support. ([44003](https://github.com/WordPress/gutenberg/pull/44003))
-- Home Link: Add typography support. ([43307](https://github.com/WordPress/gutenberg/pull/43307))
-- Latest Posts: Add typography supports. ([43540](https://github.com/WordPress/gutenberg/pull/43540))
-- List: Add missing typography block supports. ([43311](https://github.com/WordPress/gutenberg/pull/43311))
-- Navigation Link: Add typography support. ([44005](https://github.com/WordPress/gutenberg/pull/44005))
-- Post Content: Add typography supports. ([43339](https://github.com/WordPress/gutenberg/pull/43339))
-- Post Excerpt: Add missing typography supports. ([43341](https://github.com/WordPress/gutenberg/pull/43341))
-- Query No Results: Add typography supports. ([43551](https://github.com/WordPress/gutenberg/pull/43551))
-- Query Pagination Next: Add missing typography supports. ([43555](https://github.com/WordPress/gutenberg/pull/43555))
-- Query Pagination Numbers: Add missing typography supports. ([43559](https://github.com/WordPress/gutenberg/pull/43559))
-- Query Pagination Previous: Add missing typography supports. ([43556](https://github.com/WordPress/gutenberg/pull/43556))
-- Query Pagination: Add typography support. ([43552](https://github.com/WordPress/gutenberg/pull/43552))
-- Query Title: Add missing typography supports. ([43565](https://github.com/WordPress/gutenberg/pull/43565))
-- Quote: Add missing typography supports. ([43567](https://github.com/WordPress/gutenberg/pull/43567))
-- Search block: Add typography supports. ([43499](https://github.com/WordPress/gutenberg/pull/43499))
-- Site Logo: Add padding and margin support. ([43520](https://github.com/WordPress/gutenberg/pull/43520))
-- Site Title and Tagline: Add text decoration support. ([43972](https://github.com/WordPress/gutenberg/pull/43972))
-- Social Icons: Add missing padding support, update margin support. ([43885](https://github.com/WordPress/gutenberg/pull/43885))
-- Table: Add missing typography supports. ([43974](https://github.com/WordPress/gutenberg/pull/43974))
-- Term Description: Add missing typography supports. ([43568](https://github.com/WordPress/gutenberg/pull/43568))
-- Verse: Add missing typography supports. ([43569](https://github.com/WordPress/gutenberg/pull/43569))
-
-#### Block Library
-- Add: Content role to relevant audio block attributes. ([44037](https://github.com/WordPress/gutenberg/pull/44037))
-- Audio: Display upload error notices using snackbars. ([43891](https://github.com/WordPress/gutenberg/pull/43891))
-- Code: Add transformation to Paragraph. ([43938](https://github.com/WordPress/gutenberg/pull/43938))
-- Columns: Add axial block spacing to Columns block (alternate attempt). ([44101](https://github.com/WordPress/gutenberg/pull/44101))
-- Comments block (legacy mode): Update warning message wording. ([43527](https://github.com/WordPress/gutenberg/pull/43527))
-- Cover Block: Keep the inner contents in a physical direction even in RTL languages. ([43663](https://github.com/WordPress/gutenberg/pull/43663))
-- Create classic navigation menus as draft and dirty the site editor. ([43580](https://github.com/WordPress/gutenberg/pull/43580))
-- File: Display upload error notices using snackbars. ([43893](https://github.com/WordPress/gutenberg/pull/43893))
-- Gallery: Display upload error notices using snackbars. ([43946](https://github.com/WordPress/gutenberg/pull/43946))
-- Image: Display transformation error notice using snackbars. ([44031](https://github.com/WordPress/gutenberg/pull/44031))
-- Improves the UX of menu management in the navigation block. ([42987](https://github.com/WordPress/gutenberg/pull/42987))
-- Mark which attributes of the video should be considered content. ([44038](https://github.com/WordPress/gutenberg/pull/44038))
-- Media & Text: Display upload error notices using snackbars. ([43890](https://github.com/WordPress/gutenberg/pull/43890))
-- Navigation: Add overlay close button to icon toggle control. ([43067](https://github.com/WordPress/gutenberg/pull/43067))
-- Navigation: Set the icon control to full width. ([43844](https://github.com/WordPress/gutenberg/pull/43844))
-- Navigation: Try adding minimal animation to overlay. ([43851](https://github.com/WordPress/gutenberg/pull/43851))
-- Navigation: Try making it possible for themes to have the X overlay the = icon. ([43576](https://github.com/WordPress/gutenberg/pull/43576))
-- Navigation: Update to use translate instead of top. ([44082](https://github.com/WordPress/gutenberg/pull/44082))
-- Prevent single Columns blocks transforming into Columns. ([43641](https://github.com/WordPress/gutenberg/pull/43641))
-- Query Loop: Add `allowedControls` in block variations for better extensibility. ([43632](https://github.com/WordPress/gutenberg/pull/43632))
-- Query Loop: Pass extra query args in REST API call for accurate preview for extenders. ([44093](https://github.com/WordPress/gutenberg/pull/44093))
-- Quote: Restrict single block transforms to specific blocks. ([44106](https://github.com/WordPress/gutenberg/pull/44106))
-- Update: Add __experimentalRole attributes to media text block. ([43957](https://github.com/WordPress/gutenberg/pull/43957))
-- Video: Display upload error notices using snackbars. ([43892](https://github.com/WordPress/gutenberg/pull/43892))
-
-
-#### Components
-- Add contextConnectWithoutRef() to bypass ref forwarding. ([43611](https://github.com/WordPress/gutenberg/pull/43611))
-- AlignmentMatrixControl: Keep the physical direction in RTL languages. ([43126](https://github.com/WordPress/gutenberg/pull/43126))
-- ColorPalette: Make popover style consistent. ([43570](https://github.com/WordPress/gutenberg/pull/43570))
-- DropdownMenu: Use KeyboardEvent.code, refactor tests to model RTL and user-event. ([43439](https://github.com/WordPress/gutenberg/pull/43439))
-- GradientPicker: Show custom picker before swatches. ([43577](https://github.com/WordPress/gutenberg/pull/43577))
-- Guide: Use `code` instead of `keyCode` for keyboard events. ([43604](https://github.com/WordPress/gutenberg/pull/43604))
-- NavigableContainer: Use code instead of keyCode for keyboard events. ([43606](https://github.com/WordPress/gutenberg/pull/43606))
-- Popover: Refactor to TypeScript. ([43823](https://github.com/WordPress/gutenberg/pull/43823))
-- Storybook: Support dashicons for testing. ([43721](https://github.com/WordPress/gutenberg/pull/43721))
-- Style engine: Pass CSS formatting options from global functions. ([43886](https://github.com/WordPress/gutenberg/pull/43886))
-- TextControl, TextareaControl: Add flag to remove bottom margin. ([43782](https://github.com/WordPress/gutenberg/pull/43782))
-- ToggleGroupControl: Decouple borderless style with icon use. ([43771](https://github.com/WordPress/gutenberg/pull/43771))
-- Upsize typography tools. ([43331](https://github.com/WordPress/gutenberg/pull/43331))
-
-#### Block Editor
-- Add icons for different types of suggestions in LinkControl. ([43970](https://github.com/WordPress/gutenberg/pull/43970))
-- Add justification controls to constrained layout. ([44065](https://github.com/WordPress/gutenberg/pull/44065))
-- Adds block supports for metadata. ([43986](https://github.com/WordPress/gutenberg/pull/43986))
-- Better block transforms organization. ([44072](https://github.com/WordPress/gutenberg/pull/44072))
-- Block Setttings Menu Controls: Add unstableDisplayLocation prop. ([43987](https://github.com/WordPress/gutenberg/pull/43987))
-- Content width toggle: Polish wording and appearance. ([43702](https://github.com/WordPress/gutenberg/pull/43702))
-- CustomGradientPicker: Remove and deprecate outer margins. ([43436](https://github.com/WordPress/gutenberg/pull/43436))
-- Improve content locking experience. ([43956](https://github.com/WordPress/gutenberg/pull/43956))
-- Multi-select: Add transition to reduce chance of flash. ([43510](https://github.com/WordPress/gutenberg/pull/43510))
-- Partial multi selection: Limit if selection contains unmergeable block. ([42934](https://github.com/WordPress/gutenberg/pull/42934))
-- Rich text: Log deprecation message for multiline prop. ([43613](https://github.com/WordPress/gutenberg/pull/43613))
-- Show parent block as selected when there is content locking. ([43918](https://github.com/WordPress/gutenberg/pull/43918))
-- Simplify the inserter styles and scrollable. ([44088](https://github.com/WordPress/gutenberg/pull/44088))
-- TextTransformControl/TextDecorationControl: Migrate to ToggleGroupControl. ([43328](https://github.com/WordPress/gutenberg/pull/43328))
+
+-   Add padding and margin support to the gallery block. ([43965](https://github.com/WordPress/gutenberg/pull/43965))
+-   Archives: Add typography support. ([43935](https://github.com/WordPress/gutenberg/pull/43935))
+-   Avatar: Add padding support. ([43519](https://github.com/WordPress/gutenberg/pull/43519))
+-   Buttons: Add typography supports to button/s blocks. ([43934](https://github.com/WordPress/gutenberg/pull/43934))
+-   Calendar: Add typography supports (except text-decoration). ([43969](https://github.com/WordPress/gutenberg/pull/43969))
+-   Categories List: Add spacing support. ([43647](https://github.com/WordPress/gutenberg/pull/43647))
+-   Comment Date: Add spacing support. ([43656](https://github.com/WordPress/gutenberg/pull/43656))
+-   Comment Edit Link: Add spacing support. ([43657](https://github.com/WordPress/gutenberg/pull/43657))
+-   Comment Reply Link: Add spacing support. ([43658](https://github.com/WordPress/gutenberg/pull/43658))
+-   Heading: Add missing typography support. ([44003](https://github.com/WordPress/gutenberg/pull/44003))
+-   Home Link: Add typography support. ([43307](https://github.com/WordPress/gutenberg/pull/43307))
+-   Latest Posts: Add typography supports. ([43540](https://github.com/WordPress/gutenberg/pull/43540))
+-   List: Add missing typography block supports. ([43311](https://github.com/WordPress/gutenberg/pull/43311))
+-   Navigation Link: Add typography support. ([44005](https://github.com/WordPress/gutenberg/pull/44005))
+-   Post Content: Add typography supports. ([43339](https://github.com/WordPress/gutenberg/pull/43339))
+-   Post Excerpt: Add missing typography supports. ([43341](https://github.com/WordPress/gutenberg/pull/43341))
+-   Query No Results: Add typography supports. ([43551](https://github.com/WordPress/gutenberg/pull/43551))
+-   Query Pagination Next: Add missing typography supports. ([43555](https://github.com/WordPress/gutenberg/pull/43555))
+-   Query Pagination Numbers: Add missing typography supports. ([43559](https://github.com/WordPress/gutenberg/pull/43559))
+-   Query Pagination Previous: Add missing typography supports. ([43556](https://github.com/WordPress/gutenberg/pull/43556))
+-   Query Pagination: Add typography support. ([43552](https://github.com/WordPress/gutenberg/pull/43552))
+-   Query Title: Add missing typography supports. ([43565](https://github.com/WordPress/gutenberg/pull/43565))
+-   Quote: Add missing typography supports. ([43567](https://github.com/WordPress/gutenberg/pull/43567))
+-   Search block: Add typography supports. ([43499](https://github.com/WordPress/gutenberg/pull/43499))
+-   Site Logo: Add padding and margin support. ([43520](https://github.com/WordPress/gutenberg/pull/43520))
+-   Site Title and Tagline: Add text decoration support. ([43972](https://github.com/WordPress/gutenberg/pull/43972))
+-   Social Icons: Add missing padding support, update margin support. ([43885](https://github.com/WordPress/gutenberg/pull/43885))
+-   Table: Add missing typography supports. ([43974](https://github.com/WordPress/gutenberg/pull/43974))
+-   Term Description: Add missing typography supports. ([43568](https://github.com/WordPress/gutenberg/pull/43568))
+-   Verse: Add missing typography supports. ([43569](https://github.com/WordPress/gutenberg/pull/43569))
+
+#### Block Library
+
+-   Add: Content role to relevant audio block attributes. ([44037](https://github.com/WordPress/gutenberg/pull/44037))
+-   Audio: Display upload error notices using snackbars. ([43891](https://github.com/WordPress/gutenberg/pull/43891))
+-   Code: Add transformation to Paragraph. ([43938](https://github.com/WordPress/gutenberg/pull/43938))
+-   Columns: Add axial block spacing to Columns block (alternate attempt). ([44101](https://github.com/WordPress/gutenberg/pull/44101))
+-   Comments block (legacy mode): Update warning message wording. ([43527](https://github.com/WordPress/gutenberg/pull/43527))
+-   Cover Block: Keep the inner contents in a physical direction even in RTL languages. ([43663](https://github.com/WordPress/gutenberg/pull/43663))
+-   Create classic navigation menus as draft and dirty the site editor. ([43580](https://github.com/WordPress/gutenberg/pull/43580))
+-   File: Display upload error notices using snackbars. ([43893](https://github.com/WordPress/gutenberg/pull/43893))
+-   Gallery: Display upload error notices using snackbars. ([43946](https://github.com/WordPress/gutenberg/pull/43946))
+-   Image: Display transformation error notice using snackbars. ([44031](https://github.com/WordPress/gutenberg/pull/44031))
+-   Improves the UX of menu management in the navigation block. ([42987](https://github.com/WordPress/gutenberg/pull/42987))
+-   Mark which attributes of the video should be considered content. ([44038](https://github.com/WordPress/gutenberg/pull/44038))
+-   Media & Text: Display upload error notices using snackbars. ([43890](https://github.com/WordPress/gutenberg/pull/43890))
+-   Navigation: Add overlay close button to icon toggle control. ([43067](https://github.com/WordPress/gutenberg/pull/43067))
+-   Navigation: Set the icon control to full width. ([43844](https://github.com/WordPress/gutenberg/pull/43844))
+-   Navigation: Try adding minimal animation to overlay. ([43851](https://github.com/WordPress/gutenberg/pull/43851))
+-   Navigation: Try making it possible for themes to have the X overlay the = icon. ([43576](https://github.com/WordPress/gutenberg/pull/43576))
+-   Navigation: Update to use translate instead of top. ([44082](https://github.com/WordPress/gutenberg/pull/44082))
+-   Prevent single Columns blocks transforming into Columns. ([43641](https://github.com/WordPress/gutenberg/pull/43641))
+-   Query Loop: Add `allowedControls` in block variations for better extensibility. ([43632](https://github.com/WordPress/gutenberg/pull/43632))
+-   Query Loop: Pass extra query args in REST API call for accurate preview for extenders. ([44093](https://github.com/WordPress/gutenberg/pull/44093))
+-   Quote: Restrict single block transforms to specific blocks. ([44106](https://github.com/WordPress/gutenberg/pull/44106))
+-   Update: Add \_\_experimentalRole attributes to media text block. ([43957](https://github.com/WordPress/gutenberg/pull/43957))
+-   Video: Display upload error notices using snackbars. ([43892](https://github.com/WordPress/gutenberg/pull/43892))
+
+#### Components
+
+-   Add contextConnectWithoutRef() to bypass ref forwarding. ([43611](https://github.com/WordPress/gutenberg/pull/43611))
+-   AlignmentMatrixControl: Keep the physical direction in RTL languages. ([43126](https://github.com/WordPress/gutenberg/pull/43126))
+-   ColorPalette: Make popover style consistent. ([43570](https://github.com/WordPress/gutenberg/pull/43570))
+-   DropdownMenu: Use KeyboardEvent.code, refactor tests to model RTL and user-event. ([43439](https://github.com/WordPress/gutenberg/pull/43439))
+-   GradientPicker: Show custom picker before swatches. ([43577](https://github.com/WordPress/gutenberg/pull/43577))
+-   Guide: Use `code` instead of `keyCode` for keyboard events. ([43604](https://github.com/WordPress/gutenberg/pull/43604))
+-   NavigableContainer: Use code instead of keyCode for keyboard events. ([43606](https://github.com/WordPress/gutenberg/pull/43606))
+-   Popover: Refactor to TypeScript. ([43823](https://github.com/WordPress/gutenberg/pull/43823))
+-   Storybook: Support dashicons for testing. ([43721](https://github.com/WordPress/gutenberg/pull/43721))
+-   Style engine: Pass CSS formatting options from global functions. ([43886](https://github.com/WordPress/gutenberg/pull/43886))
+-   TextControl, TextareaControl: Add flag to remove bottom margin. ([43782](https://github.com/WordPress/gutenberg/pull/43782))
+-   ToggleGroupControl: Decouple borderless style with icon use. ([43771](https://github.com/WordPress/gutenberg/pull/43771))
+-   Upsize typography tools. ([43331](https://github.com/WordPress/gutenberg/pull/43331))
+
+#### Block Editor
+
+-   Add icons for different types of suggestions in LinkControl. ([43970](https://github.com/WordPress/gutenberg/pull/43970))
+-   Add justification controls to constrained layout. ([44065](https://github.com/WordPress/gutenberg/pull/44065))
+-   Adds block supports for metadata. ([43986](https://github.com/WordPress/gutenberg/pull/43986))
+-   Better block transforms organization. ([44072](https://github.com/WordPress/gutenberg/pull/44072))
+-   Block Setttings Menu Controls: Add unstableDisplayLocation prop. ([43987](https://github.com/WordPress/gutenberg/pull/43987))
+-   Content width toggle: Polish wording and appearance. ([43702](https://github.com/WordPress/gutenberg/pull/43702))
+-   CustomGradientPicker: Remove and deprecate outer margins. ([43436](https://github.com/WordPress/gutenberg/pull/43436))
+-   Improve content locking experience. ([43956](https://github.com/WordPress/gutenberg/pull/43956))
+-   Multi-select: Add transition to reduce chance of flash. ([43510](https://github.com/WordPress/gutenberg/pull/43510))
+-   Partial multi selection: Limit if selection contains unmergeable block. ([42934](https://github.com/WordPress/gutenberg/pull/42934))
+-   Rich text: Log deprecation message for multiline prop. ([43613](https://github.com/WordPress/gutenberg/pull/43613))
+-   Show parent block as selected when there is content locking. ([43918](https://github.com/WordPress/gutenberg/pull/43918))
+-   Simplify the inserter styles and scrollable. ([44088](https://github.com/WordPress/gutenberg/pull/44088))
+-   TextTransformControl/TextDecorationControl: Migrate to ToggleGroupControl. ([43328](https://github.com/WordPress/gutenberg/pull/43328))
 
 #### Post Editor
-- Add 'isDeletingPost' selector. ([44012](https://github.com/WordPress/gutenberg/pull/44012))
+
+-   Add 'isDeletingPost' selector. ([44012](https://github.com/WordPress/gutenberg/pull/44012))
 
 #### CSS & Styling
-- Categories List Block: Match the markup on the block editor to the front end. ([43666](https://github.com/WordPress/gutenberg/pull/43666))
-- Placeholders: Make dashed style a mixin, and apply across. ([43512](https://github.com/WordPress/gutenberg/pull/43512))
-- Separator: Remove appearance of "inset" style. ([43948](https://github.com/WordPress/gutenberg/pull/43948))
+
+-   Categories List Block: Match the markup on the block editor to the front end. ([43666](https://github.com/WordPress/gutenberg/pull/43666))
+-   Placeholders: Make dashed style a mixin, and apply across. ([43512](https://github.com/WordPress/gutenberg/pull/43512))
+-   Separator: Remove appearance of "inset" style. ([43948](https://github.com/WordPress/gutenberg/pull/43948))
 
 #### Patterns
-- Allow remote pattern registration in theme.json when core patterns are disabled. ([43634](https://github.com/WordPress/gutenberg/pull/43634))
-- Content lock ability. ([43037](https://github.com/WordPress/gutenberg/pull/43037))
-- Post type restriction API for patterns. ([41842](https://github.com/WordPress/gutenberg/pull/41842))
+
+-   Allow remote pattern registration in theme.json when core patterns are disabled. ([43634](https://github.com/WordPress/gutenberg/pull/43634))
+-   Content lock ability. ([43037](https://github.com/WordPress/gutenberg/pull/43037))
+-   Post type restriction API for patterns. ([41842](https://github.com/WordPress/gutenberg/pull/41842))
 
 #### Global Styles
-- Added outline support for blocks via theme.json. ([43526](https://github.com/WordPress/gutenberg/pull/43526))
-- Block Spacing: Using spacing controls for block gap values to support presets in the UI. ([43466](https://github.com/WordPress/gutenberg/pull/43466))
-- Add box-shadow support for blocks via theme.json. ([41972](https://github.com/WordPress/gutenberg/pull/41972))
-- Make global styles data filterable. ([44015](https://github.com/WordPress/gutenberg/pull/44015))
+
+-   Added outline support for blocks via theme.json. ([43526](https://github.com/WordPress/gutenberg/pull/43526))
+-   Block Spacing: Using spacing controls for block gap values to support presets in the UI. ([43466](https://github.com/WordPress/gutenberg/pull/43466))
+-   Add box-shadow support for blocks via theme.json. ([41972](https://github.com/WordPress/gutenberg/pull/41972))
+-   Make global styles data filterable. ([44015](https://github.com/WordPress/gutenberg/pull/44015))
 
 #### Build Tooling
-- Update unstaged documentation error message. ([43953](https://github.com/WordPress/gutenberg/pull/43953))
-- Scripts: Change webpack configuration to include `render` files in the build folder. ([43917](https://github.com/WordPress/gutenberg/pull/43917))
-- Scripts: Update webpack configuration to allow modern image format. ([43880](https://github.com/WordPress/gutenberg/pull/43880))
+
+-   Update unstaged documentation error message. ([43953](https://github.com/WordPress/gutenberg/pull/43953))
+-   Scripts: Change webpack configuration to include `render` files in the build folder. ([43917](https://github.com/WordPress/gutenberg/pull/43917))
+-   Scripts: Update webpack configuration to allow modern image format. ([43880](https://github.com/WordPress/gutenberg/pull/43880))
 
 #### Testing
-- Draggable block tests: Click block inserter instead of pressing Enter key. ([43734](https://github.com/WordPress/gutenberg/pull/43734))
+
+-   Draggable block tests: Click block inserter instead of pressing Enter key. ([43734](https://github.com/WordPress/gutenberg/pull/43734))
 
 #### Document Settings
-- Display pretty permalink for draft posts. ([43600](https://github.com/WordPress/gutenberg/pull/43600))
+
+-   Display pretty permalink for draft posts. ([43600](https://github.com/WordPress/gutenberg/pull/43600))
 
 #### Themes
-- Add cite to theme.json elements. ([43543](https://github.com/WordPress/gutenberg/pull/43543))
-- Block-based template parts for Classic themes. ([42729](https://github.com/WordPress/gutenberg/pull/42729))
-- Post Featured Image block: Enable gradient overlay. ([43838](https://github.com/WordPress/gutenberg/pull/43838))
+
+-   Add cite to theme.json elements. ([43543](https://github.com/WordPress/gutenberg/pull/43543))
+-   Block-based template parts for Classic themes. ([42729](https://github.com/WordPress/gutenberg/pull/42729))
+-   Post Featured Image block: Enable gradient overlay. ([43838](https://github.com/WordPress/gutenberg/pull/43838))
 
 #### Site Editor
-- Archive-PostType template UI. ([42746](https://github.com/WordPress/gutenberg/pull/42746))
-- New archive-$postType templates get proper fallback content. ([43603](https://github.com/WordPress/gutenberg/pull/43603))
-- Template for specific category: Only load posts from that category in post template block. ([43699](https://github.com/WordPress/gutenberg/pull/43699))
 
+-   Archive-PostType template UI. ([42746](https://github.com/WordPress/gutenberg/pull/42746))
+-   New archive-$postType templates get proper fallback content. ([43603](https://github.com/WordPress/gutenberg/pull/43603))
+-   Template for specific category: Only load posts from that category in post template block. ([43699](https://github.com/WordPress/gutenberg/pull/43699))
 
 ### New APIs
 
 #### Block Library
-- Add filter for inner blocks in the Navigation block. ([37998](https://github.com/WordPress/gutenberg/pull/37998))
-- Make it possible to import individual blocks. ([42258](https://github.com/WordPress/gutenberg/pull/42258))
+
+-   Add filter for inner blocks in the Navigation block. ([37998](https://github.com/WordPress/gutenberg/pull/37998))
+-   Make it possible to import individual blocks. ([42258](https://github.com/WordPress/gutenberg/pull/42258))
 
 #### Extensibility
-- Add a filter to `build_query_vars_from_query_block`. ([43590](https://github.com/WordPress/gutenberg/pull/43590))
+
+-   Add a filter to `build_query_vars_from_query_block`. ([43590](https://github.com/WordPress/gutenberg/pull/43590))
 
 #### Block API
-- Blocks: Add new `render` field to `block.json`. ([42430](https://github.com/WordPress/gutenberg/pull/42430))
-
-
-### Bug Fixes
-
-#### Block Library
-- Code Block: Fix duplicate background color. ([43599](https://github.com/WordPress/gutenberg/pull/43599))
-- File Block: Remove i18n from save function. ([43050](https://github.com/WordPress/gutenberg/pull/43050))
-- Fix block switcher preview scrollbar. ([44079](https://github.com/WordPress/gutenberg/pull/44079))
-- Fix block transform preview height. ([44076](https://github.com/WordPress/gutenberg/pull/44076))
-- Fix duplicate navigation block props. ([43596](https://github.com/WordPress/gutenberg/pull/43596))
-- Fix error in useClientWidth. ([43585](https://github.com/WordPress/gutenberg/pull/43585))
-- Fix site editor toolbar when block is bigger than viewport. ([43548](https://github.com/WordPress/gutenberg/pull/43548))
-- Fix the default icon for the navigation block. ([44104](https://github.com/WordPress/gutenberg/pull/44104))
-- Fix: Site logo rounded on mobile. ([43903](https://github.com/WordPress/gutenberg/pull/43903))
-- Fix: Site logo rounded. ([43762](https://github.com/WordPress/gutenberg/pull/43762))
-- Group: Fix click-first state. ([43513](https://github.com/WordPress/gutenberg/pull/43513))
-- Image: Display upload error notices using snackbars. ([43767](https://github.com/WordPress/gutenberg/pull/43767))
-- List: Add cut clipboard handler. ([43609](https://github.com/WordPress/gutenberg/pull/43609))
-- Navigation: Add current-menu-item also for archive links. ([43800](https://github.com/WordPress/gutenberg/pull/43800))
-- Navigation: Hide overlay preview settings when the overlay is off. ([44032](https://github.com/WordPress/gutenberg/pull/44032))
-- Navigation: Remove unneeded gap:Inherit rule on wrapper element of navigation block. ([43669](https://github.com/WordPress/gutenberg/pull/43669))
-- Post Terms: Use unbound query in the usePostTerms hook. ([43501](https://github.com/WordPress/gutenberg/pull/43501))
-- Site Logo: Fix border radius regression. ([43701](https://github.com/WordPress/gutenberg/pull/43701))
-- Fix cover flex issue in the editor. ([43413](https://github.com/WordPress/gutenberg/pull/43413))
-- Fix embed iframe sizing issue. ([40213](https://github.com/WordPress/gutenberg/pull/40213))
-- Update: Make it possible to change list items even if parent is template locked. ([43959](https://github.com/WordPress/gutenberg/pull/43959))
-- Latest Posts categories settings. ([43685](https://github.com/WordPress/gutenberg/pull/43685))
-- navigation block: Fix empty site-log `li` element in the dom. ([44049](https://github.com/WordPress/gutenberg/pull/44049))
-
-#### Global Styles
-- Block editor: Move margins to theme.scss and common.scss. ([43813](https://github.com/WordPress/gutenberg/pull/43813))
-- Don't apply root padding to nested layout blocks. ([43842](https://github.com/WordPress/gutenberg/pull/43842))
-- Duotone palette doesn't reflect settings in theme.json. ([43671](https://github.com/WordPress/gutenberg/pull/43671))
-- Fixing broken layout styles for themes using theme.json settings on blocks that require layout styles. ([43925](https://github.com/WordPress/gutenberg/pull/43925))
-- Layout: Fix issue with fallback gap styles where gap was being output for constrained layout type. ([44001](https://github.com/WordPress/gutenberg/pull/44001))
-- Remove main content layout padding in preview. ([43601](https://github.com/WordPress/gutenberg/pull/43601))
-- Split root layout rules into a different function. ([43792](https://github.com/WordPress/gutenberg/pull/43792))
-
-#### Components
-- Button, Icon: Fix iconSize prop doesn't work with some icons. ([43821](https://github.com/WordPress/gutenberg/pull/43821))
-- Flex: Remove flex `gap` polyfill. ([43995](https://github.com/WordPress/gutenberg/pull/43995))
-- Popover: Enable auto-updating every animation frame. ([43617](https://github.com/WordPress/gutenberg/pull/43617))
-- Popover: Make more reactive to prop changes, avoid unnecessary updates. ([43335](https://github.com/WordPress/gutenberg/pull/43335))
-- Site editor: Fix padding and margin visualizer positioning. ([43971](https://github.com/WordPress/gutenberg/pull/43971))
-- `Disabled`: Preserve input values when toggling the `isDisabled` prop. ([43508](https://github.com/WordPress/gutenberg/pull/43508))
-
-#### Block Editor
-- BlockInspector, ComplementaryArea: Fix overscoped `p` style. ([43866](https://github.com/WordPress/gutenberg/pull/43866))
-- Column Block: Enable global template_lock inheritance. ([42677](https://github.com/WordPress/gutenberg/pull/42677))
-- Fix blank screen on templates page. ([43602](https://github.com/WordPress/gutenberg/pull/43602))
-- Fix the horizontal block list drop indicator when dragging to the start. ([43944](https://github.com/WordPress/gutenberg/pull/43944))
-- Fix: Block styles preview is not displayed. ([43837](https://github.com/WordPress/gutenberg/pull/43837))
-- Fix: Non boolean usage on react output. ([43919](https://github.com/WordPress/gutenberg/pull/43919))
-- hasContentRoleAttribute: Check that block type exists. ([43864](https://github.com/WordPress/gutenberg/pull/43864))
-- Improve Safari text-selection style. ([43313](https://github.com/WordPress/gutenberg/pull/43313))
-- Prevent the default browser behaviour for dropped files from running. ([43493](https://github.com/WordPress/gutenberg/pull/43493))
-- RTL fix for inlined block-styles. ([41762](https://github.com/WordPress/gutenberg/pull/41762))
-- Spacing presets: fix bug with unlinked not applying if non int slugs used.  ([44136](https://github.com/WordPress/gutenberg/pull/44136))
+
+-   Blocks: Add new `render` field to `block.json`. ([42430](https://github.com/WordPress/gutenberg/pull/42430))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Code Block: Fix duplicate background color. ([43599](https://github.com/WordPress/gutenberg/pull/43599))
+-   File Block: Remove i18n from save function. ([43050](https://github.com/WordPress/gutenberg/pull/43050))
+-   Fix block switcher preview scrollbar. ([44079](https://github.com/WordPress/gutenberg/pull/44079))
+-   Fix block transform preview height. ([44076](https://github.com/WordPress/gutenberg/pull/44076))
+-   Fix duplicate navigation block props. ([43596](https://github.com/WordPress/gutenberg/pull/43596))
+-   Fix error in useClientWidth. ([43585](https://github.com/WordPress/gutenberg/pull/43585))
+-   Fix site editor toolbar when block is bigger than viewport. ([43548](https://github.com/WordPress/gutenberg/pull/43548))
+-   Fix the default icon for the navigation block. ([44104](https://github.com/WordPress/gutenberg/pull/44104))
+-   Fix: Site logo rounded on mobile. ([43903](https://github.com/WordPress/gutenberg/pull/43903))
+-   Fix: Site logo rounded. ([43762](https://github.com/WordPress/gutenberg/pull/43762))
+-   Group: Fix click-first state. ([43513](https://github.com/WordPress/gutenberg/pull/43513))
+-   Image: Display upload error notices using snackbars. ([43767](https://github.com/WordPress/gutenberg/pull/43767))
+-   List: Add cut clipboard handler. ([43609](https://github.com/WordPress/gutenberg/pull/43609))
+-   Navigation: Add current-menu-item also for archive links. ([43800](https://github.com/WordPress/gutenberg/pull/43800))
+-   Navigation: Hide overlay preview settings when the overlay is off. ([44032](https://github.com/WordPress/gutenberg/pull/44032))
+-   Navigation: Remove unneeded gap:Inherit rule on wrapper element of navigation block. ([43669](https://github.com/WordPress/gutenberg/pull/43669))
+-   Post Terms: Use unbound query in the usePostTerms hook. ([43501](https://github.com/WordPress/gutenberg/pull/43501))
+-   Site Logo: Fix border radius regression. ([43701](https://github.com/WordPress/gutenberg/pull/43701))
+-   Fix cover flex issue in the editor. ([43413](https://github.com/WordPress/gutenberg/pull/43413))
+-   Fix embed iframe sizing issue. ([40213](https://github.com/WordPress/gutenberg/pull/40213))
+-   Update: Make it possible to change list items even if parent is template locked. ([43959](https://github.com/WordPress/gutenberg/pull/43959))
+-   Latest Posts categories settings. ([43685](https://github.com/WordPress/gutenberg/pull/43685))
+-   navigation block: Fix empty site-log `li` element in the dom. ([44049](https://github.com/WordPress/gutenberg/pull/44049))
+
+#### Global Styles
+
+-   Block editor: Move margins to theme.scss and common.scss. ([43813](https://github.com/WordPress/gutenberg/pull/43813))
+-   Don't apply root padding to nested layout blocks. ([43842](https://github.com/WordPress/gutenberg/pull/43842))
+-   Duotone palette doesn't reflect settings in theme.json. ([43671](https://github.com/WordPress/gutenberg/pull/43671))
+-   Fixing broken layout styles for themes using theme.json settings on blocks that require layout styles. ([43925](https://github.com/WordPress/gutenberg/pull/43925))
+-   Layout: Fix issue with fallback gap styles where gap was being output for constrained layout type. ([44001](https://github.com/WordPress/gutenberg/pull/44001))
+-   Remove main content layout padding in preview. ([43601](https://github.com/WordPress/gutenberg/pull/43601))
+-   Split root layout rules into a different function. ([43792](https://github.com/WordPress/gutenberg/pull/43792))
+
+#### Components
+
+-   Button, Icon: Fix iconSize prop doesn't work with some icons. ([43821](https://github.com/WordPress/gutenberg/pull/43821))
+-   Flex: Remove flex `gap` polyfill. ([43995](https://github.com/WordPress/gutenberg/pull/43995))
+-   Popover: Enable auto-updating every animation frame. ([43617](https://github.com/WordPress/gutenberg/pull/43617))
+-   Popover: Make more reactive to prop changes, avoid unnecessary updates. ([43335](https://github.com/WordPress/gutenberg/pull/43335))
+-   Site editor: Fix padding and margin visualizer positioning. ([43971](https://github.com/WordPress/gutenberg/pull/43971))
+-   `Disabled`: Preserve input values when toggling the `isDisabled` prop. ([43508](https://github.com/WordPress/gutenberg/pull/43508))
+
+#### Block Editor
+
+-   BlockInspector, ComplementaryArea: Fix overscoped `p` style. ([43866](https://github.com/WordPress/gutenberg/pull/43866))
+-   Column Block: Enable global template_lock inheritance. ([42677](https://github.com/WordPress/gutenberg/pull/42677))
+-   Fix blank screen on templates page. ([43602](https://github.com/WordPress/gutenberg/pull/43602))
+-   Fix the horizontal block list drop indicator when dragging to the start. ([43944](https://github.com/WordPress/gutenberg/pull/43944))
+-   Fix: Block styles preview is not displayed. ([43837](https://github.com/WordPress/gutenberg/pull/43837))
+-   Fix: Non boolean usage on react output. ([43919](https://github.com/WordPress/gutenberg/pull/43919))
+-   hasContentRoleAttribute: Check that block type exists. ([43864](https://github.com/WordPress/gutenberg/pull/43864))
+-   Improve Safari text-selection style. ([43313](https://github.com/WordPress/gutenberg/pull/43313))
+-   Prevent the default browser behaviour for dropped files from running. ([43493](https://github.com/WordPress/gutenberg/pull/43493))
+-   RTL fix for inlined block-styles. ([41762](https://github.com/WordPress/gutenberg/pull/41762))
+-   Spacing presets: fix bug with unlinked not applying if non int slugs used. ([44136](https://github.com/WordPress/gutenberg/pull/44136))
 
 #### Design Tools
-- Fix display of width controls for legacy layouts. ([43688](https://github.com/WordPress/gutenberg/pull/43688))
-- FontFamily: Fix server-side attribute registration via typography support. ([43937](https://github.com/WordPress/gutenberg/pull/43937))
-- Layout: Fix blockGap output when using a falsy 0 value. ([43757](https://github.com/WordPress/gutenberg/pull/43757))
-- Layout: Fix toggling off inner blocks content width setting for legacy markup. ([43888](https://github.com/WordPress/gutenberg/pull/43888))
+
+-   Fix display of width controls for legacy layouts. ([43688](https://github.com/WordPress/gutenberg/pull/43688))
+-   FontFamily: Fix server-side attribute registration via typography support. ([43937](https://github.com/WordPress/gutenberg/pull/43937))
+-   Layout: Fix blockGap output when using a falsy 0 value. ([43757](https://github.com/WordPress/gutenberg/pull/43757))
+-   Layout: Fix toggling off inner blocks content width setting for legacy markup. ([43888](https://github.com/WordPress/gutenberg/pull/43888))
 
 #### Testing
-- Fix asserting Post Format without opening the document settings sidebar. ([43710](https://github.com/WordPress/gutenberg/pull/43710))
-- Fix clicking on top of the publish panel in meta box end-to-end test. ([43708](https://github.com/WordPress/gutenberg/pull/43708))
-- Fix playwright's `openDocumentSettingsSidebar` util not opening the sidebar. ([43506](https://github.com/WordPress/gutenberg/pull/43506))
+
+-   Fix asserting Post Format without opening the document settings sidebar. ([43710](https://github.com/WordPress/gutenberg/pull/43710))
+-   Fix clicking on top of the publish panel in meta box end-to-end test. ([43708](https://github.com/WordPress/gutenberg/pull/43708))
+-   Fix playwright's `openDocumentSettingsSidebar` util not opening the sidebar. ([43506](https://github.com/WordPress/gutenberg/pull/43506))
 
 #### Accessibility
-- Better handling of loading states for navigation selector. ([43904](https://github.com/WordPress/gutenberg/pull/43904))
-- Limit contrast checker to only blocks that have at least one color defined. ([43592](https://github.com/WordPress/gutenberg/pull/43592))
+
+-   Better handling of loading states for navigation selector. ([43904](https://github.com/WordPress/gutenberg/pull/43904))
+-   Limit contrast checker to only blocks that have at least one color defined. ([43592](https://github.com/WordPress/gutenberg/pull/43592))
 
 #### Style Variations
-- Styles API: Fixed selectors for nested elements. ([43988](https://github.com/WordPress/gutenberg/pull/43988))
+
+-   Styles API: Fixed selectors for nested elements. ([43988](https://github.com/WordPress/gutenberg/pull/43988))
 
 #### Typography
-- Font size picker: Add a fallback for the name property. ([43794](https://github.com/WordPress/gutenberg/pull/43794))
+
+-   Font size picker: Add a fallback for the name property. ([43794](https://github.com/WordPress/gutenberg/pull/43794))
 
 #### Post Editor
-- Editor: Simplify 'findOrCreateTerm' method logic. ([43766](https://github.com/WordPress/gutenberg/pull/43766))
-- Fix the style settings from core/post-content block in theme.json that are not applied in the editor. ([42270](https://github.com/WordPress/gutenberg/pull/42270))
+
+-   Editor: Simplify 'findOrCreateTerm' method logic. ([43766](https://github.com/WordPress/gutenberg/pull/43766))
+-   Fix the style settings from core/post-content block in theme.json that are not applied in the editor. ([42270](https://github.com/WordPress/gutenberg/pull/42270))
 
 #### Site Editor
-- Site Editor: Fix focus outline cut off in code editor. ([42980](https://github.com/WordPress/gutenberg/pull/42980))
+
+-   Site Editor: Fix focus outline cut off in code editor. ([42980](https://github.com/WordPress/gutenberg/pull/42980))
 
 #### Templates API
-- Block Templates: Add the custom templates info for the template posts. ([43597](https://github.com/WordPress/gutenberg/pull/43597))
+
+-   Block Templates: Add the custom templates info for the template posts. ([43597](https://github.com/WordPress/gutenberg/pull/43597))
 
 #### Build Tooling
-- Makepot: Fix translations object handling. ([43797](https://github.com/WordPress/gutenberg/pull/43797))
 
+-   Makepot: Fix translations object handling. ([43797](https://github.com/WordPress/gutenberg/pull/43797))
 
 ### Performance
 
 #### Block Library
-- Comments Pagination: Avoid creating a new allowedBlocks array on every render. ([44021](https://github.com/WordPress/gutenberg/pull/44021))
-- Lodash: Refactor away from `_.first()` and `_.last()`. ([43894](https://github.com/WordPress/gutenberg/pull/43894))
-- Lodash: Remove _`.omit()` from block library. ([43707](https://github.com/WordPress/gutenberg/pull/43707))
-- Query Pagination: Avoid creating a new allowedBlocks array on every render. ([44020](https://github.com/WordPress/gutenberg/pull/44020))
-- Query by name. ([43850](https://github.com/WordPress/gutenberg/pull/43850))
+
+-   Comments Pagination: Avoid creating a new allowedBlocks array on every render. ([44021](https://github.com/WordPress/gutenberg/pull/44021))
+-   Lodash: Refactor away from `_.first()` and `_.last()`. ([43894](https://github.com/WordPress/gutenberg/pull/43894))
+-   Lodash: Remove \_`.omit()` from block library. ([43707](https://github.com/WordPress/gutenberg/pull/43707))
+-   Query Pagination: Avoid creating a new allowedBlocks array on every render. ([44020](https://github.com/WordPress/gutenberg/pull/44020))
+-   Query by name. ([43850](https://github.com/WordPress/gutenberg/pull/43850))
 
 #### Components
-- Lodash: Refactor away from `_.cloneDeep()`. ([43631](https://github.com/WordPress/gutenberg/pull/43631))
-- Lodash: Refactor away from `_.partial()`. ([43895](https://github.com/WordPress/gutenberg/pull/43895))
-- Lodash: Remove from `FormTokenField` component. ([43744](https://github.com/WordPress/gutenberg/pull/43744))
+
+-   Lodash: Refactor away from `_.cloneDeep()`. ([43631](https://github.com/WordPress/gutenberg/pull/43631))
+-   Lodash: Refactor away from `_.partial()`. ([43895](https://github.com/WordPress/gutenberg/pull/43895))
+-   Lodash: Remove from `FormTokenField` component. ([43744](https://github.com/WordPress/gutenberg/pull/43744))
 
 #### Data Layer
-- Lodash: Refactor away from `_.forEach()`. ([43807](https://github.com/WordPress/gutenberg/pull/43807))
-- Lodash: Refactor away from `_.has()`. ([43626](https://github.com/WordPress/gutenberg/pull/43626))
-- Lodash: Remove `_.omit()` from `@wordpress/data`. ([43712](https://github.com/WordPress/gutenberg/pull/43712))
+
+-   Lodash: Refactor away from `_.forEach()`. ([43807](https://github.com/WordPress/gutenberg/pull/43807))
+-   Lodash: Refactor away from `_.has()`. ([43626](https://github.com/WordPress/gutenberg/pull/43626))
+-   Lodash: Remove `_.omit()` from `@wordpress/data`. ([43712](https://github.com/WordPress/gutenberg/pull/43712))
 
 #### Post Editor
-- Lodash: Refactor away from `_.unionBy()`. ([43735](https://github.com/WordPress/gutenberg/pull/43735))
-- Lodash: Remove `_.omit()` from a few other packages. ([43714](https://github.com/WordPress/gutenberg/pull/43714))
+
+-   Lodash: Refactor away from `_.unionBy()`. ([43735](https://github.com/WordPress/gutenberg/pull/43735))
+-   Lodash: Remove `_.omit()` from a few other packages. ([43714](https://github.com/WordPress/gutenberg/pull/43714))
 
 #### Testing
-- Updates the content we use for performance testing. ([43770](https://github.com/WordPress/gutenberg/pull/43770))
+
+-   Updates the content we use for performance testing. ([43770](https://github.com/WordPress/gutenberg/pull/43770))
 
 #### Widgets Editor
-- Lodash: Remove completely from `@wordpress/edit-widgets` package. ([43682](https://github.com/WordPress/gutenberg/pull/43682))
+
+-   Lodash: Remove completely from `@wordpress/edit-widgets` package. ([43682](https://github.com/WordPress/gutenberg/pull/43682))
 
 #### Block Editor
-- Lodash: Remove from blocks API raw handling. ([43575](https://github.com/WordPress/gutenberg/pull/43575))
-- Lodash: Refactor away from `BlockActionsMenu` (RN). ([43849](https://github.com/WordPress/gutenberg/pull/43849))
-- Lodash: Refactor away from `BlockActions`. ([43846](https://github.com/WordPress/gutenberg/pull/43846))
-- Lodash: Refactor away from `BlockMover`. ([43853](https://github.com/WordPress/gutenberg/pull/43853))
-- Lodash: Refactor away from `useFocusFirstElement`. ([43847](https://github.com/WordPress/gutenberg/pull/43847))
-- Lodash: Remove `_.first()` and `_.last()` from block editor store. ([43854](https://github.com/WordPress/gutenberg/pull/43854))
-- Lodash: Remove `_.first()` and `_.last()` from block tools and `useSelectAll` hook. ([43855](https://github.com/WordPress/gutenberg/pull/43855))
-- Lodash: Remove `_.omit()` from block editor. ([43704](https://github.com/WordPress/gutenberg/pull/43704))
+
+-   Lodash: Remove from blocks API raw handling. ([43575](https://github.com/WordPress/gutenberg/pull/43575))
+-   Lodash: Refactor away from `BlockActionsMenu` (RN). ([43849](https://github.com/WordPress/gutenberg/pull/43849))
+-   Lodash: Refactor away from `BlockActions`. ([43846](https://github.com/WordPress/gutenberg/pull/43846))
+-   Lodash: Refactor away from `BlockMover`. ([43853](https://github.com/WordPress/gutenberg/pull/43853))
+-   Lodash: Refactor away from `useFocusFirstElement`. ([43847](https://github.com/WordPress/gutenberg/pull/43847))
+-   Lodash: Remove `_.first()` and `_.last()` from block editor store. ([43854](https://github.com/WordPress/gutenberg/pull/43854))
+-   Lodash: Remove `_.first()` and `_.last()` from block tools and `useSelectAll` hook. ([43855](https://github.com/WordPress/gutenberg/pull/43855))
+-   Lodash: Remove `_.omit()` from block editor. ([43704](https://github.com/WordPress/gutenberg/pull/43704))
 
 #### REST API
-- Core Data: Stop sending duplicate requests in canUser resolver. ([43480](https://github.com/WordPress/gutenberg/pull/43480))
 
+-   Core Data: Stop sending duplicate requests in canUser resolver. ([43480](https://github.com/WordPress/gutenberg/pull/43480))
 
 ### Documentation
 
-- Add documentation for the block template parts theme support. ([44009](https://github.com/WordPress/gutenberg/pull/44009))
-- Adding instructions for adding sub-pages to packages documentation. ([43750](https://github.com/WordPress/gutenberg/pull/43750))
-- Create a new handbook page for propagating updates. ([43538](https://github.com/WordPress/gutenberg/pull/43538))
-- Create Block: Split documentation into two sections. ([43718](https://github.com/WordPress/gutenberg/pull/43718))
-- Docgen: Add basic handling for the `@since` tag. ([43550](https://github.com/WordPress/gutenberg/pull/43550))
-- Docs: Add example of BlockControls to Format API how to guide. ([43581](https://github.com/WordPress/gutenberg/pull/43581))
-- Docs: Fix required status of `onSelectUrl` prop of `MediaReplaceFlow` component. ([44025](https://github.com/WordPress/gutenberg/pull/44025))
-- Document new global styles filters. ([44111](https://github.com/WordPress/gutenberg/pull/44111))
-- Document template_lock=noContent for Custom Post Types. ([43977](https://github.com/WordPress/gutenberg/pull/43977))
-- InnerBlocks: document that `templateLock:NoContent` cannot be overridden by children. ([43825](https://github.com/WordPress/gutenberg/pull/43825))
-- Theme.json: Add default values for settings.spacing.spacingScale. ([43860](https://github.com/WordPress/gutenberg/pull/43860))
-- Theme.json: Fix schema for useRootPaddingAwareAlignments. ([43628](https://github.com/WordPress/gutenberg/pull/43628))
-- Typography block supports: Call tear_down in tests and format PHP doc blocks. ([43968](https://github.com/WordPress/gutenberg/pull/43968))
-- Update a broken link to the format-api example. ([44058](https://github.com/WordPress/gutenberg/pull/44058))
-- Update playwright end-to-end utils readme. ([44016](https://github.com/WordPress/gutenberg/pull/44016))
-- Updated the "Create your First App with Gutenberg Data" how-to guide. ([43633](https://github.com/WordPress/gutenberg/pull/43633))
-- Add select icon for Navigation Block's menu button. ([43674](https://github.com/WordPress/gutenberg/pull/43674))
-- Style engine: pre-core migration documentation and house keeping. ([43840](https://github.com/WordPress/gutenberg/pull/43840))
-- Fix JSON syntax issues in theme.json examples. ([43828](https://github.com/WordPress/gutenberg/pull/43828))
+-   Add documentation for the block template parts theme support. ([44009](https://github.com/WordPress/gutenberg/pull/44009))
+-   Adding instructions for adding sub-pages to packages documentation. ([43750](https://github.com/WordPress/gutenberg/pull/43750))
+-   Create a new handbook page for propagating updates. ([43538](https://github.com/WordPress/gutenberg/pull/43538))
+-   Create Block: Split documentation into two sections. ([43718](https://github.com/WordPress/gutenberg/pull/43718))
+-   Docgen: Add basic handling for the `@since` tag. ([43550](https://github.com/WordPress/gutenberg/pull/43550))
+-   Docs: Add example of BlockControls to Format API how to guide. ([43581](https://github.com/WordPress/gutenberg/pull/43581))
+-   Docs: Fix required status of `onSelectUrl` prop of `MediaReplaceFlow` component. ([44025](https://github.com/WordPress/gutenberg/pull/44025))
+-   Document new global styles filters. ([44111](https://github.com/WordPress/gutenberg/pull/44111))
+-   Document template_lock=noContent for Custom Post Types. ([43977](https://github.com/WordPress/gutenberg/pull/43977))
+-   InnerBlocks: document that `templateLock:NoContent` cannot be overridden by children. ([43825](https://github.com/WordPress/gutenberg/pull/43825))
+-   Theme.json: Add default values for settings.spacing.spacingScale. ([43860](https://github.com/WordPress/gutenberg/pull/43860))
+-   Theme.json: Fix schema for useRootPaddingAwareAlignments. ([43628](https://github.com/WordPress/gutenberg/pull/43628))
+-   Typography block supports: Call tear_down in tests and format PHP doc blocks. ([43968](https://github.com/WordPress/gutenberg/pull/43968))
+-   Update a broken link to the format-api example. ([44058](https://github.com/WordPress/gutenberg/pull/44058))
+-   Update playwright end-to-end utils readme. ([44016](https://github.com/WordPress/gutenberg/pull/44016))
+-   Updated the "Create your First App with Gutenberg Data" how-to guide. ([43633](https://github.com/WordPress/gutenberg/pull/43633))
+-   Add select icon for Navigation Block's menu button. ([43674](https://github.com/WordPress/gutenberg/pull/43674))
+-   Style engine: pre-core migration documentation and house keeping. ([43840](https://github.com/WordPress/gutenberg/pull/43840))
+-   Fix JSON syntax issues in theme.json examples. ([43828](https://github.com/WordPress/gutenberg/pull/43828))
 
 ### Code Quality
 
 #### Components
 
-- AnglePickerControl: Deprecate margin bottom. ([43867](https://github.com/WordPress/gutenberg/pull/43867))
-- CheckboxControl: Add flag to remove bottom margin. ([43720](https://github.com/WordPress/gutenberg/pull/43720))
-- ComboboxControl: Add unit tests. ([42403](https://github.com/WordPress/gutenberg/pull/42403))
-- DateTimePicker: Address feedback after recent refactor to `date-fns` and `use-lilius`. ([43495](https://github.com/WordPress/gutenberg/pull/43495))
-- DropZone: Convert to TypeScript. ([43962](https://github.com/WordPress/gutenberg/pull/43962))
-- Fix TS types for `isValueDefined()`/`isValueEmpty()`. ([43983](https://github.com/WordPress/gutenberg/pull/43983))
-- FocalPointControl: Add flag to remove bottom margin. ([43996](https://github.com/WordPress/gutenberg/pull/43996))
-- FocalPointPicker: Convert to TypeScript. ([43872](https://github.com/WordPress/gutenberg/pull/43872))
-- FontSizePicker: Deprecate bottom margin. ([43870](https://github.com/WordPress/gutenberg/pull/43870))
-- FormFileUpload: Convert to TypeScript. ([43960](https://github.com/WordPress/gutenberg/pull/43960))
-- Invert tsconfig to be exclude-based. ([43534](https://github.com/WordPress/gutenberg/pull/43534))
-- Lodash: Refactor away from `_.escapeRegExp()`. ([43629](https://github.com/WordPress/gutenberg/pull/43629))
-- Lodash: Remove from block factory API. ([43560](https://github.com/WordPress/gutenberg/pull/43560))
-- Lodash: Remove from block registration API. ([43558](https://github.com/WordPress/gutenberg/pull/43558))
-- Lodash: Remove from block serializer API. ([43561](https://github.com/WordPress/gutenberg/pull/43561))
-- Lodash: Remove from block templates API. ([43563](https://github.com/WordPress/gutenberg/pull/43563))
-- Make more components pass type checks. ([43579](https://github.com/WordPress/gutenberg/pull/43579))
-- RadioControl: Clean up CSS. ([43868](https://github.com/WordPress/gutenberg/pull/43868))
-- Remove unused normalizeArrowKey utility function. ([43640](https://github.com/WordPress/gutenberg/pull/43640))
-- Remove unused Storybook utils. ([43578](https://github.com/WordPress/gutenberg/pull/43578))
-- Retire `DARK_GRAY` colors. ([43773](https://github.com/WordPress/gutenberg/pull/43773))
-- Retire `LIGHT_GRAY[ 200 ]` and `DARK_GRAY[ 150 ]`. ([43719](https://github.com/WordPress/gutenberg/pull/43719))
-- Retire `LIGHT_GRAY` color object. ([43994](https://github.com/WordPress/gutenberg/pull/43994))
-- SearchControl: Convert to TypeScript and add flag to remove bottom margin. ([43871](https://github.com/WordPress/gutenberg/pull/43871))
-- Style engine: Refer to 'context' rather than 'store' in global function. ([43841](https://github.com/WordPress/gutenberg/pull/43841))
-- TabPanel: Convert to TypeScript. ([43536](https://github.com/WordPress/gutenberg/pull/43536))
-- ToggleControl: Convert to TypeScript. ([43717](https://github.com/WordPress/gutenberg/pull/43717))
-- WordPressComponentProps: Only add refs when they are actually added. ([43610](https://github.com/WordPress/gutenberg/pull/43610))
-- Refactor `Icon` tests to `@testing-library/react`. ([44051](https://github.com/WordPress/gutenberg/pull/44051))
-- Refactor `IsolatedEventContainer` tests to `@testing-library/react`. ([44073](https://github.com/WordPress/gutenberg/pull/44073))
-- Refactor `KeyboardShortcuts` tests to `@testing-library/react`. ([44075](https://github.com/WordPress/gutenberg/pull/44075))
-- NUX: Refactor `DotTip` tests to `@testing-library/react`. ([43768](https://github.com/WordPress/gutenberg/pull/43768))
+-   AnglePickerControl: Deprecate margin bottom. ([43867](https://github.com/WordPress/gutenberg/pull/43867))
+-   CheckboxControl: Add flag to remove bottom margin. ([43720](https://github.com/WordPress/gutenberg/pull/43720))
+-   ComboboxControl: Add unit tests. ([42403](https://github.com/WordPress/gutenberg/pull/42403))
+-   DateTimePicker: Address feedback after recent refactor to `date-fns` and `use-lilius`. ([43495](https://github.com/WordPress/gutenberg/pull/43495))
+-   DropZone: Convert to TypeScript. ([43962](https://github.com/WordPress/gutenberg/pull/43962))
+-   Fix TS types for `isValueDefined()`/`isValueEmpty()`. ([43983](https://github.com/WordPress/gutenberg/pull/43983))
+-   FocalPointControl: Add flag to remove bottom margin. ([43996](https://github.com/WordPress/gutenberg/pull/43996))
+-   FocalPointPicker: Convert to TypeScript. ([43872](https://github.com/WordPress/gutenberg/pull/43872))
+-   FontSizePicker: Deprecate bottom margin. ([43870](https://github.com/WordPress/gutenberg/pull/43870))
+-   FormFileUpload: Convert to TypeScript. ([43960](https://github.com/WordPress/gutenberg/pull/43960))
+-   Invert tsconfig to be exclude-based. ([43534](https://github.com/WordPress/gutenberg/pull/43534))
+-   Lodash: Refactor away from `_.escapeRegExp()`. ([43629](https://github.com/WordPress/gutenberg/pull/43629))
+-   Lodash: Remove from block factory API. ([43560](https://github.com/WordPress/gutenberg/pull/43560))
+-   Lodash: Remove from block registration API. ([43558](https://github.com/WordPress/gutenberg/pull/43558))
+-   Lodash: Remove from block serializer API. ([43561](https://github.com/WordPress/gutenberg/pull/43561))
+-   Lodash: Remove from block templates API. ([43563](https://github.com/WordPress/gutenberg/pull/43563))
+-   Make more components pass type checks. ([43579](https://github.com/WordPress/gutenberg/pull/43579))
+-   RadioControl: Clean up CSS. ([43868](https://github.com/WordPress/gutenberg/pull/43868))
+-   Remove unused normalizeArrowKey utility function. ([43640](https://github.com/WordPress/gutenberg/pull/43640))
+-   Remove unused Storybook utils. ([43578](https://github.com/WordPress/gutenberg/pull/43578))
+-   Retire `DARK_GRAY` colors. ([43773](https://github.com/WordPress/gutenberg/pull/43773))
+-   Retire `LIGHT_GRAY[ 200 ]` and `DARK_GRAY[ 150 ]`. ([43719](https://github.com/WordPress/gutenberg/pull/43719))
+-   Retire `LIGHT_GRAY` color object. ([43994](https://github.com/WordPress/gutenberg/pull/43994))
+-   SearchControl: Convert to TypeScript and add flag to remove bottom margin. ([43871](https://github.com/WordPress/gutenberg/pull/43871))
+-   Style engine: Refer to 'context' rather than 'store' in global function. ([43841](https://github.com/WordPress/gutenberg/pull/43841))
+-   TabPanel: Convert to TypeScript. ([43536](https://github.com/WordPress/gutenberg/pull/43536))
+-   ToggleControl: Convert to TypeScript. ([43717](https://github.com/WordPress/gutenberg/pull/43717))
+-   WordPressComponentProps: Only add refs when they are actually added. ([43610](https://github.com/WordPress/gutenberg/pull/43610))
+-   Refactor `Icon` tests to `@testing-library/react`. ([44051](https://github.com/WordPress/gutenberg/pull/44051))
+-   Refactor `IsolatedEventContainer` tests to `@testing-library/react`. ([44073](https://github.com/WordPress/gutenberg/pull/44073))
+-   Refactor `KeyboardShortcuts` tests to `@testing-library/react`. ([44075](https://github.com/WordPress/gutenberg/pull/44075))
+-   NUX: Refactor `DotTip` tests to `@testing-library/react`. ([43768](https://github.com/WordPress/gutenberg/pull/43768))
 
 #### Compose
 
-- Refactor `pure` HoC tests to `@testing-library/react`. ([43913](https://github.com/WordPress/gutenberg/pull/43913))
-- Refactor `withInstanceId` HoC tests to `@testing-library/react`. ([43915](https://github.com/WordPress/gutenberg/pull/43915))
+-   Refactor `pure` HoC tests to `@testing-library/react`. ([43913](https://github.com/WordPress/gutenberg/pull/43913))
+-   Refactor `withInstanceId` HoC tests to `@testing-library/react`. ([43915](https://github.com/WordPress/gutenberg/pull/43915))
 
 #### Post Editor
-- Edit Post: Refactor `BrowserURL` tests to `@testing-library/react`. ([43978](https://github.com/WordPress/gutenberg/pull/43978))
-- Edit Post: Refactor `PageAttributesOrder` tests to `@testing-library/react`. ([43980](https://github.com/WordPress/gutenberg/pull/43980))
-- Refactor `PostPublishButton` tests to `@testing-library/react`. ([43909](https://github.com/WordPress/gutenberg/pull/43909))
-- Refactor `PostPublishPanel` tests to `@testing-library/react`. ([43908](https://github.com/WordPress/gutenberg/pull/43908))
-- Refactor `PostSavedState` tests to `@testing-library/react`. ([43769](https://github.com/WordPress/gutenberg/pull/43769))
-- Refactor `PostSlug` tests to `@testing-library/react`. ([43973](https://github.com/WordPress/gutenberg/pull/43973))
-- Update changelog to include a new 'isDeletingPost' selector. ([44120](https://github.com/WordPress/gutenberg/pull/44120))
-- Refactor `MetaBoxesSection` tests to `@testing-library/react`. ([43774](https://github.com/WordPress/gutenberg/pull/43774))
-- Refactor `PostPublishButtonOrToggle` tests to `@testing-library/react`. ([43776](https://github.com/WordPress/gutenberg/pull/43776))
-- Refactor `PreferencesModal` tests to `@testing-library/react`. ([43775](https://github.com/WordPress/gutenberg/pull/43775))
-- NumberControl: Add TypeScript prop types. ([43791](https://github.com/WordPress/gutenberg/pull/43791))
-- Popover: Stabilize __unstableShift prop to shift. ([43845](https://github.com/WordPress/gutenberg/pull/43845))
-
-#### Block Library
-- Button: Remove hardcoded white. ([43553](https://github.com/WordPress/gutenberg/pull/43553))
-- Categories List Block: Escape home_url(). ([43824](https://github.com/WordPress/gutenberg/pull/43824))
-- Gallery Block: Use `wp_enqueue_block_support_styles()`. ([43859](https://github.com/WordPress/gutenberg/pull/43859))
-- Post Terms: Refactor the usePostTerms hook. ([43503](https://github.com/WordPress/gutenberg/pull/43503))
-- Navigation: Use `code` instead of `keyCode` for keyboard events. ([43644](https://github.com/WordPress/gutenberg/pull/43644))
-- Create an alias get_element_class_name to use it in blocks. ([44099](https://github.com/WordPress/gutenberg/pull/44099))
-
-#### Block Editor
-
-- Refactor `AlignmentControl` tests to `@testing-library/react`. ([44022](https://github.com/WordPress/gutenberg/pull/44022))
-- Refactor `BlockAlignmentUI` tests to `@testing-library/react`. ([44023](https://github.com/WordPress/gutenberg/pull/44023))
-- Refactor `BlockEdit` tests to `@testing-library/react`. ([44027](https://github.com/WordPress/gutenberg/pull/44027))
-- Refactor `BlockIcon` tests to `@testing-library/react`. ([44089](https://github.com/WordPress/gutenberg/pull/44089))
-- Refactor `BlockTitle` tests to `@testing-library/react`. ([43811](https://github.com/WordPress/gutenberg/pull/43811))
-- Refactor `BlockVerticalAlignmentUI` tests to `@testing-library/react`. ([44029](https://github.com/WordPress/gutenberg/pull/44029))
-- Refactor `BlockView` tests to `@testing-library/react`. ([43818](https://github.com/WordPress/gutenberg/pull/43818))
-- Refactor `ComboboxControl` to pass `exhaustive-deps`. ([41417](https://github.com/WordPress/gutenberg/pull/41417))
-- Refactor `ContrastChecker` tests to `@testing-library/react`. ([43975](https://github.com/WordPress/gutenberg/pull/43975))
-- Refactor `DefaultBlockAppender` tests to `@testing-library/react`. ([43990](https://github.com/WordPress/gutenberg/pull/43990))
-- Refactor `DimensionControl` tests to `@testing-library/react`. ([43916](https://github.com/WordPress/gutenberg/pull/43916))
-- Refactor `DocumentOutline` tests to `@testing-library/react`. ([43772](https://github.com/WordPress/gutenberg/pull/43772))
-- Refactor `FocalPointPicker` to function component. ([39168](https://github.com/WordPress/gutenberg/pull/39168))
-- Refactor `MediaPlaceholder` tests to `@testing-library/react`. ([43991](https://github.com/WordPress/gutenberg/pull/43991))
-- Refactor `MenuItem` tests to `@testing-library/react`. ([43778](https://github.com/WordPress/gutenberg/pull/43778))
-- Refactor `NavigatorButton` to pass `exhaustive-deps`. ([42051](https://github.com/WordPress/gutenberg/pull/42051))
-- Refactor `NavigatorScreen` to pass `exhaustive-deps`. ([43876](https://github.com/WordPress/gutenberg/pull/43876))
-- Refactor `Panel` tests to `@testing-library/react`. ([43896](https://github.com/WordPress/gutenberg/pull/43896))
-- Refactor `PostTaxonomies` tests to `@testing-library/react`. ([44068](https://github.com/WordPress/gutenberg/pull/44068)))
-- Refactor `Slot`/`Fill` tests to `@testing-library/react`. ([44084](https://github.com/WordPress/gutenberg/pull/44084))
-- Refactor `URLInputButton` tests to `@testing-library/react`. ([43899](https://github.com/WordPress/gutenberg/pull/43899))
-- Refactor `UrlPopover` tests to `@testing-library/react`. ([43898](https://github.com/WordPress/gutenberg/pull/43898))
-- Refactor `Warning` tests to `@testing-library/react`. ([43817](https://github.com/WordPress/gutenberg/pull/43817))
-- Refactor `withColors` tests to `@testing-library/react`. ([43976](https://github.com/WordPress/gutenberg/pull/43976))
-- Refactor `withFilters` tests to `@testing-library/react`. ([44017](https://github.com/WordPress/gutenberg/pull/44017))
-- Refactor popover to use separate flip and resize props instead of forcePosition. ([43546](https://github.com/WordPress/gutenberg/pull/43546)
-- Fix: Inexistent parameter passed to parseUnitFunction. ([43920](https://github.com/WordPress/gutenberg/pull/43920))
-- Minor code tweaks/optimizations (PHP). ([43375](https://github.com/WordPress/gutenberg/pull/43375))
+
+-   Edit Post: Refactor `BrowserURL` tests to `@testing-library/react`. ([43978](https://github.com/WordPress/gutenberg/pull/43978))
+-   Edit Post: Refactor `PageAttributesOrder` tests to `@testing-library/react`. ([43980](https://github.com/WordPress/gutenberg/pull/43980))
+-   Refactor `PostPublishButton` tests to `@testing-library/react`. ([43909](https://github.com/WordPress/gutenberg/pull/43909))
+-   Refactor `PostPublishPanel` tests to `@testing-library/react`. ([43908](https://github.com/WordPress/gutenberg/pull/43908))
+-   Refactor `PostSavedState` tests to `@testing-library/react`. ([43769](https://github.com/WordPress/gutenberg/pull/43769))
+-   Refactor `PostSlug` tests to `@testing-library/react`. ([43973](https://github.com/WordPress/gutenberg/pull/43973))
+-   Update changelog to include a new 'isDeletingPost' selector. ([44120](https://github.com/WordPress/gutenberg/pull/44120))
+-   Refactor `MetaBoxesSection` tests to `@testing-library/react`. ([43774](https://github.com/WordPress/gutenberg/pull/43774))
+-   Refactor `PostPublishButtonOrToggle` tests to `@testing-library/react`. ([43776](https://github.com/WordPress/gutenberg/pull/43776))
+-   Refactor `PreferencesModal` tests to `@testing-library/react`. ([43775](https://github.com/WordPress/gutenberg/pull/43775))
+-   NumberControl: Add TypeScript prop types. ([43791](https://github.com/WordPress/gutenberg/pull/43791))
+-   Popover: Stabilize \_\_unstableShift prop to shift. ([43845](https://github.com/WordPress/gutenberg/pull/43845))
+
+#### Block Library
+
+-   Button: Remove hardcoded white. ([43553](https://github.com/WordPress/gutenberg/pull/43553))
+-   Categories List Block: Escape home_url(). ([43824](https://github.com/WordPress/gutenberg/pull/43824))
+-   Gallery Block: Use `wp_enqueue_block_support_styles()`. ([43859](https://github.com/WordPress/gutenberg/pull/43859))
+-   Post Terms: Refactor the usePostTerms hook. ([43503](https://github.com/WordPress/gutenberg/pull/43503))
+-   Navigation: Use `code` instead of `keyCode` for keyboard events. ([43644](https://github.com/WordPress/gutenberg/pull/43644))
+-   Create an alias get_element_class_name to use it in blocks. ([44099](https://github.com/WordPress/gutenberg/pull/44099))
+
+#### Block Editor
+
+-   Refactor `AlignmentControl` tests to `@testing-library/react`. ([44022](https://github.com/WordPress/gutenberg/pull/44022))
+-   Refactor `BlockAlignmentUI` tests to `@testing-library/react`. ([44023](https://github.com/WordPress/gutenberg/pull/44023))
+-   Refactor `BlockEdit` tests to `@testing-library/react`. ([44027](https://github.com/WordPress/gutenberg/pull/44027))
+-   Refactor `BlockIcon` tests to `@testing-library/react`. ([44089](https://github.com/WordPress/gutenberg/pull/44089))
+-   Refactor `BlockTitle` tests to `@testing-library/react`. ([43811](https://github.com/WordPress/gutenberg/pull/43811))
+-   Refactor `BlockVerticalAlignmentUI` tests to `@testing-library/react`. ([44029](https://github.com/WordPress/gutenberg/pull/44029))
+-   Refactor `BlockView` tests to `@testing-library/react`. ([43818](https://github.com/WordPress/gutenberg/pull/43818))
+-   Refactor `ComboboxControl` to pass `exhaustive-deps`. ([41417](https://github.com/WordPress/gutenberg/pull/41417))
+-   Refactor `ContrastChecker` tests to `@testing-library/react`. ([43975](https://github.com/WordPress/gutenberg/pull/43975))
+-   Refactor `DefaultBlockAppender` tests to `@testing-library/react`. ([43990](https://github.com/WordPress/gutenberg/pull/43990))
+-   Refactor `DimensionControl` tests to `@testing-library/react`. ([43916](https://github.com/WordPress/gutenberg/pull/43916))
+-   Refactor `DocumentOutline` tests to `@testing-library/react`. ([43772](https://github.com/WordPress/gutenberg/pull/43772))
+-   Refactor `FocalPointPicker` to function component. ([39168](https://github.com/WordPress/gutenberg/pull/39168))
+-   Refactor `MediaPlaceholder` tests to `@testing-library/react`. ([43991](https://github.com/WordPress/gutenberg/pull/43991))
+-   Refactor `MenuItem` tests to `@testing-library/react`. ([43778](https://github.com/WordPress/gutenberg/pull/43778))
+-   Refactor `NavigatorButton` to pass `exhaustive-deps`. ([42051](https://github.com/WordPress/gutenberg/pull/42051))
+-   Refactor `NavigatorScreen` to pass `exhaustive-deps`. ([43876](https://github.com/WordPress/gutenberg/pull/43876))
+-   Refactor `Panel` tests to `@testing-library/react`. ([43896](https://github.com/WordPress/gutenberg/pull/43896))
+-   Refactor `PostTaxonomies` tests to `@testing-library/react`. ([44068](https://github.com/WordPress/gutenberg/pull/44068)))
+-   Refactor `Slot`/`Fill` tests to `@testing-library/react`. ([44084](https://github.com/WordPress/gutenberg/pull/44084))
+-   Refactor `URLInputButton` tests to `@testing-library/react`. ([43899](https://github.com/WordPress/gutenberg/pull/43899))
+-   Refactor `UrlPopover` tests to `@testing-library/react`. ([43898](https://github.com/WordPress/gutenberg/pull/43898))
+-   Refactor `Warning` tests to `@testing-library/react`. ([43817](https://github.com/WordPress/gutenberg/pull/43817))
+-   Refactor `withColors` tests to `@testing-library/react`. ([43976](https://github.com/WordPress/gutenberg/pull/43976))
+-   Refactor `withFilters` tests to `@testing-library/react`. ([44017](https://github.com/WordPress/gutenberg/pull/44017))
+-   Refactor popover to use separate flip and resize props instead of forcePosition. ([43546](https://github.com/WordPress/gutenberg/pull/43546)
+-   Fix: Inexistent parameter passed to parseUnitFunction. ([43920](https://github.com/WordPress/gutenberg/pull/43920))
+-   Minor code tweaks/optimizations (PHP). ([43375](https://github.com/WordPress/gutenberg/pull/43375))
 
 #### Rich Text
-- Remove deprecated wrapperClassName prop. ([44033](https://github.com/WordPress/gutenberg/pull/44033))
+
+-   Remove deprecated wrapperClassName prop. ([44033](https://github.com/WordPress/gutenberg/pull/44033))
 
 #### Inspector Controls
-- Remove leftovers from previous iterations in block inspector. ([43806](https://github.com/WordPress/gutenberg/pull/43806))
+
+-   Remove leftovers from previous iterations in block inspector. ([43806](https://github.com/WordPress/gutenberg/pull/43806))
 
 #### Plugin
-- Remove 'gutenberg_rest_nonce' method. ([43805](https://github.com/WordPress/gutenberg/pull/43805))
+
+-   Remove 'gutenberg_rest_nonce' method. ([43805](https://github.com/WordPress/gutenberg/pull/43805))
 
 #### List View
-- ListViewBlock: Refactor to have locking data in a single place. ([43803](https://github.com/WordPress/gutenberg/pull/43803))
+
+-   ListViewBlock: Refactor to have locking data in a single place. ([43803](https://github.com/WordPress/gutenberg/pull/43803))
 
 #### npm Packages
-- Block Serialization Default Parser: Include TypeScript type declarations. ([43722](https://github.com/WordPress/gutenberg/pull/43722))
-- Lodash: Remove `_.omit()` from `@wordpress/blocks`. ([43711](https://github.com/WordPress/gutenberg/pull/43711))
-- Lodash: Remove completely from `@wordpress/format-library` package. ([43738](https://github.com/WordPress/gutenberg/pull/43738))
-- Lodash: Remove completely from `@wordpress/i18n` package. ([43677](https://github.com/WordPress/gutenberg/pull/43677))
-- Lodash: Remove completely from `@wordpress/redux-routine` package. ([43741](https://github.com/WordPress/gutenberg/pull/43741))
-- @wordpress/date: Rename __experimentalGetSettings() to getSettings(). ([43884](https://github.com/WordPress/gutenberg/pull/43884))
+
+-   Block Serialization Default Parser: Include TypeScript type declarations. ([43722](https://github.com/WordPress/gutenberg/pull/43722))
+-   Lodash: Remove `_.omit()` from `@wordpress/blocks`. ([43711](https://github.com/WordPress/gutenberg/pull/43711))
+-   Lodash: Remove completely from `@wordpress/format-library` package. ([43738](https://github.com/WordPress/gutenberg/pull/43738))
+-   Lodash: Remove completely from `@wordpress/i18n` package. ([43677](https://github.com/WordPress/gutenberg/pull/43677))
+-   Lodash: Remove completely from `@wordpress/redux-routine` package. ([43741](https://github.com/WordPress/gutenberg/pull/43741))
+-   @wordpress/date: Rename \_\_experimentalGetSettings() to getSettings(). ([43884](https://github.com/WordPress/gutenberg/pull/43884))
 
 #### Global Styles
-- Elements: Check value and whitelist before building style nodes. ([43622](https://github.com/WordPress/gutenberg/pull/43622))
-- Prepare `WP_Theme_JSON_Data` class for backporting. ([44109](https://github.com/WordPress/gutenberg/pull/44109))
-- Safeguard for backport of `get_template_hierarchy` function. ([44085](https://github.com/WordPress/gutenberg/pull/44085))
-- Format Library: Remove redundant inline link test. ([43912](https://github.com/WordPress/gutenberg/pull/43912))
-- Layout: Unit tests for gutenberg_get_layout_style. ([44006](https://github.com/WordPress/gutenberg/pull/44006))
+
+-   Elements: Check value and whitelist before building style nodes. ([43622](https://github.com/WordPress/gutenberg/pull/43622))
+-   Prepare `WP_Theme_JSON_Data` class for backporting. ([44109](https://github.com/WordPress/gutenberg/pull/44109))
+-   Safeguard for backport of `get_template_hierarchy` function. ([44085](https://github.com/WordPress/gutenberg/pull/44085))
+-   Format Library: Remove redundant inline link test. ([43912](https://github.com/WordPress/gutenberg/pull/43912))
+-   Layout: Unit tests for gutenberg_get_layout_style. ([44006](https://github.com/WordPress/gutenberg/pull/44006))
 
 #### Block Editor
-- Rich text: Remove unused unstable list functions. ([43614](https://github.com/WordPress/gutenberg/pull/43614))
+
+-   Rich text: Remove unused unstable list functions. ([43614](https://github.com/WordPress/gutenberg/pull/43614))
 
 #### Data Layer
-- Add tsconfig.json to core-data package. ([43638](https://github.com/WordPress/gutenberg/pull/43638))
-- Add type signature for useDispatch. ([43528](https://github.com/WordPress/gutenberg/pull/43528))
-- Bundle TypeScript types with the data package. ([43643](https://github.com/WordPress/gutenberg/pull/43643))
-- Simplify TypeScript types in wordpress/core-data. ([43515](https://github.com/WordPress/gutenberg/pull/43515))
+
+-   Add tsconfig.json to core-data package. ([43638](https://github.com/WordPress/gutenberg/pull/43638))
+-   Add type signature for useDispatch. ([43528](https://github.com/WordPress/gutenberg/pull/43528))
+-   Bundle TypeScript types with the data package. ([43643](https://github.com/WordPress/gutenberg/pull/43643))
+-   Simplify TypeScript types in wordpress/core-data. ([43515](https://github.com/WordPress/gutenberg/pull/43515))
 
 #### Navigation
-- Unskip navigation menu selector focus test. ([43507](https://github.com/WordPress/gutenberg/pull/43507))
+
+-   Unskip navigation menu selector focus test. ([43507](https://github.com/WordPress/gutenberg/pull/43507))
 
 #### Build Tools
-- Update scaffold.js. ([43740](https://github.com/WordPress/gutenberg/pull/43740))
 
+-   Update scaffold.js. ([43740](https://github.com/WordPress/gutenberg/pull/43740))
 
 ### Tools
 
 #### Testing
-- Add comments for the repeated move commands in draggable end-to-end tests. ([43933](https://github.com/WordPress/gutenberg/pull/43933))
-- Add stale issue workflow for flaky test reports. ([43547](https://github.com/WordPress/gutenberg/pull/43547))
-- Avatar: Add test to ensure that user image updates when user switched. ([42657](https://github.com/WordPress/gutenberg/pull/42657))
-- Fix PHP Tests: Try removing registry from WP_Block constructor calls. ([43927](https://github.com/WordPress/gutenberg/pull/43927))
-- Iframed editor: Fixed skipped tests. ([43697](https://github.com/WordPress/gutenberg/pull/43697))
-- Migrate draggable block tests to Playwright. ([43798](https://github.com/WordPress/gutenberg/pull/43798))
-- Migrate duplicating block test to playwright. ([43171](https://github.com/WordPress/gutenberg/pull/43171))
-- Migrate register block test case to playwright. ([43170](https://github.com/WordPress/gutenberg/pull/43170))
-- Migrate writing flow tests to Playwright. ([43637](https://github.com/WordPress/gutenberg/pull/43637))
-- Preview tests: Wait for the post-status change. ([43874](https://github.com/WordPress/gutenberg/pull/43874))
-- Skip draggable block end-to-end tests. ([43736](https://github.com/WordPress/gutenberg/pull/43736))
-- Skip navigation block end-to-end tests. ([43571](https://github.com/WordPress/gutenberg/pull/43571))
-- Update Playwright. ([43887](https://github.com/WordPress/gutenberg/pull/43887))
-
 
-## First time contributors
+-   Add comments for the repeated move commands in draggable end-to-end tests. ([43933](https://github.com/WordPress/gutenberg/pull/43933))
+-   Add stale issue workflow for flaky test reports. ([43547](https://github.com/WordPress/gutenberg/pull/43547))
+-   Avatar: Add test to ensure that user image updates when user switched. ([42657](https://github.com/WordPress/gutenberg/pull/42657))
+-   Fix PHP Tests: Try removing registry from WP_Block constructor calls. ([43927](https://github.com/WordPress/gutenberg/pull/43927))
+-   Iframed editor: Fixed skipped tests. ([43697](https://github.com/WordPress/gutenberg/pull/43697))
+-   Migrate draggable block tests to Playwright. ([43798](https://github.com/WordPress/gutenberg/pull/43798))
+-   Migrate duplicating block test to playwright. ([43171](https://github.com/WordPress/gutenberg/pull/43171))
+-   Migrate register block test case to playwright. ([43170](https://github.com/WordPress/gutenberg/pull/43170))
+-   Migrate writing flow tests to Playwright. ([43637](https://github.com/WordPress/gutenberg/pull/43637))
+-   Preview tests: Wait for the post-status change. ([43874](https://github.com/WordPress/gutenberg/pull/43874))
+-   Skip draggable block end-to-end tests. ([43736](https://github.com/WordPress/gutenberg/pull/43736))
+-   Skip navigation block end-to-end tests. ([43571](https://github.com/WordPress/gutenberg/pull/43571))
+-   Update Playwright. ([43887](https://github.com/WordPress/gutenberg/pull/43887))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @afragen: Block Library: Add filter for inner blocks in the Navigation block. ([37998](https://github.com/WordPress/gutenberg/pull/37998))
-- @dgwyer: Updated the "Create your First App with Gutenberg Data" how-to guide. ([43633](https://github.com/WordPress/gutenberg/pull/43633))
-- @jonathanbossenger: Update scaffold.js. ([43740](https://github.com/WordPress/gutenberg/pull/43740))
-- @kkoppenhaver: Update a broken link to the format-api example. ([44058](https://github.com/WordPress/gutenberg/pull/44058))
-- @madhusudhand: Add box-shadow support for blocks via theme.json. ([41972](https://github.com/WordPress/gutenberg/pull/41972))
-- @mrobit: Fix JSON syntax issues in theme.json examples. ([43828](https://github.com/WordPress/gutenberg/pull/43828))
-- @RahiDroid: Post Featured Image block: Enable gradient overlay. ([43838](https://github.com/WordPress/gutenberg/pull/43838))
+The following PRs were merged by first-time contributors:
 
+-   @afragen: Block Library: Add filter for inner blocks in the Navigation block. ([37998](https://github.com/WordPress/gutenberg/pull/37998))
+-   @dgwyer: Updated the "Create your First App with Gutenberg Data" how-to guide. ([43633](https://github.com/WordPress/gutenberg/pull/43633))
+-   @jonathanbossenger: Update scaffold.js. ([43740](https://github.com/WordPress/gutenberg/pull/43740))
+-   @kkoppenhaver: Update a broken link to the format-api example. ([44058](https://github.com/WordPress/gutenberg/pull/44058))
+-   @madhusudhand: Add box-shadow support for blocks via theme.json. ([41972](https://github.com/WordPress/gutenberg/pull/41972))
+-   @mrobit: Fix JSON syntax issues in theme.json examples. ([43828](https://github.com/WordPress/gutenberg/pull/43828))
+-   @RahiDroid: Post Featured Image block: Enable gradient overlay. ([43838](https://github.com/WordPress/gutenberg/pull/43838))
 
 ## Contributors
 
@@ -12065,14 +23349,13 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @afragen @amustaque97 @andrewserong @annezazu @aristath @BE-Webdesign @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @colorful-tones @dcalhoun @dgwyer @draganescu @ellatrix @fabiankaegy @flootr @geriux @getdave @glendaviesnz @gziolo @jasmussen @jonathanbossenger @jorgefilipecosta @kevin940726 @kkoppenhaver @madhusudhand @MaggieCabrera @Mamaduka @matiasbenedetto @mikachan @mirka @mrobit @ndiego @niklasp @noisysocks @ntsekouras @oandregal @ockham @pavanpatil1 @petitphp @pooja-muchandikar @RahiDroid @ramonjd @ryanwelcher @SantosGuillamot @scruffian @SiobhyB @spacedmonkey @stokesman @sunyatasattva @t-hamano @talldan @tellthemachines @torounit @tyxla @youknowriad
 
-
 = 14.0.3 =
 
 ## Changelog
 
 ### Bug Fixes
 
-- Fix GitHub Actions failure due to duplicate functions. ([44052](https://github.com/WordPress/gutenberg/pull/44052))
+-   Fix GitHub Actions failure due to duplicate functions. ([44052](https://github.com/WordPress/gutenberg/pull/44052))
 
 ## Contributors
 
@@ -12080,24 +23363,18 @@ The following contributors merged PRs in this release:
 
 @t-hamano
 
-
 = 14.0.2 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
-- Layout: Fix undefined index notice when attempting to check layout type. ([43756](https://github.com/WordPress/gutenberg/pull/43756))
-- List block: Prevent error upon pasting when list is empty. ([43761](https://github.com/WordPress/gutenberg/pull/43761))
-
-
-## First time contributors
-
-The following PRs were merged by first time contributors:
+-   Layout: Fix undefined index notice when attempting to check layout type. ([43756](https://github.com/WordPress/gutenberg/pull/43756))
+-   List block: Prevent error upon pasting when list is empty. ([43761](https://github.com/WordPress/gutenberg/pull/43761))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -12105,24 +23382,19 @@ The following contributors merged PRs in this release:
 
 @andrewserong @oandregal
 
-
 = 14.0.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Post Editor
-- Fix layout applied to post editor on classic themes. ([43755](https://github.com/WordPress/gutenberg/pull/43755))
 
+-   Fix layout applied to post editor on classic themes. ([43755](https://github.com/WordPress/gutenberg/pull/43755))
 
-## First time contributors
-
-The following PRs were merged by first time contributors:
-
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
 ## Contributors
 
@@ -12130,20 +23402,19 @@ The following contributors merged PRs in this release:
 
 @tellthemachines
 
-
 = 14.0.0 =
 
 ## Changelog
 
 ### Enhancements
 
-- Add optional capture group to URL regex in wp-env. ([43200](https://github.com/WordPress/gutenberg/pull/43200))
-- Core Data: Add canRead to useResourcePermissions. ([43484](https://github.com/WordPress/gutenberg/pull/43484))
-- Element: Remove `enzyme` from `platform` test. ([43531](https://github.com/WordPress/gutenberg/pull/43531))
-- [Create-block] Add `--variant` flag to allow creation of different block type variants. ([41289](https://github.com/WordPress/gutenberg/pull/41289))
-- Use str_starts_with. ([43371](https://github.com/WordPress/gutenberg/pull/43371))
-- [Create Block] Adding a `--no-plugin` flag to scaffold only block files. ([41642](https://github.com/WordPress/gutenberg/pull/41642))
-- Customize widgets: Fix top contents cutoff in keyboard shortcuts. ([43391](https://github.com/WordPress/gutenberg/pull/43391))
+-   Add optional capture group to URL regex in wp-env. ([43200](https://github.com/WordPress/gutenberg/pull/43200))
+-   Core Data: Add canRead to useResourcePermissions. ([43484](https://github.com/WordPress/gutenberg/pull/43484))
+-   Element: Remove `enzyme` from `platform` test. ([43531](https://github.com/WordPress/gutenberg/pull/43531))
+-   [Create-block] Add `--variant` flag to allow creation of different block type variants. ([41289](https://github.com/WordPress/gutenberg/pull/41289))
+-   Use str_starts_with. ([43371](https://github.com/WordPress/gutenberg/pull/43371))
+-   [Create Block] Adding a `--no-plugin` flag to scaffold only block files. ([41642](https://github.com/WordPress/gutenberg/pull/41642))
+-   Customize widgets: Fix top contents cutoff in keyboard shortcuts. ([43391](https://github.com/WordPress/gutenberg/pull/43391))
 
 #### Design Tools
 
@@ -12151,205 +23422,223 @@ As part of the effort to improve design tool consistency for typography and spac
 
 Added typography support:
 
-- Paragraph: ([39642](https://github.com/WordPress/gutenberg/pull/39642))
-- Categories List: ([43254](https://github.com/WordPress/gutenberg/pull/43254))
-- Code Block: ([43255](https://github.com/WordPress/gutenberg/pull/43255))
-- Column Block: ([43252](https://github.com/WordPress/gutenberg/pull/43252))
-- Columns Block: ([43253](https://github.com/WordPress/gutenberg/pull/43253))
-- Comment Author Name: ([43256](https://github.com/WordPress/gutenberg/pull/43256))
-- Comment Date: ([43262](https://github.com/WordPress/gutenberg/pull/43262))
-- Comment Edit Link: ([43263](https://github.com/WordPress/gutenberg/pull/43263))
-- Comment Template: ([43266](https://github.com/WordPress/gutenberg/pull/43266))
-- Comments Content:  ([43257](https://github.com/WordPress/gutenberg/pull/43257))
-- Comments Pagination: ([43288](https://github.com/WordPress/gutenberg/pull/43288), [43289](https://github.com/WordPress/gutenberg/pull/43289), [43290](https://github.com/WordPress/gutenberg/pull/43290), [43287](https://github.com/WordPress/gutenberg/pull/43287))
-- Comments Reply Link: ([43264](https://github.com/WordPress/gutenberg/pull/43264))
-- Comments Title: ([43291](https://github.com/WordPress/gutenberg/pull/43291))
-- Comments: ([43286](https://github.com/WordPress/gutenberg/pull/43286))
-- Cover: ([43298](https://github.com/WordPress/gutenberg/pull/43298))
-- Group: ([43308](https://github.com/WordPress/gutenberg/pull/43308))
-- Media & Text: ([43314](https://github.com/WordPress/gutenberg/pull/43314))
-- Navigation: ([43542](https://github.com/WordPress/gutenberg/pull/43542))
-- Post Author Biography: ([43318](https://github.com/WordPress/gutenberg/pull/43318))
-- Post Author Name: ([43319](https://github.com/WordPress/gutenberg/pull/43319))
-- Post Author: ([43317](https://github.com/WordPress/gutenberg/pull/43317))
-- Post Comments Count: ([43321](https://github.com/WordPress/gutenberg/pull/43321))
-- Post Comments Link: ([43338](https://github.com/WordPress/gutenberg/pull/43338))
-- Post Date: ([43340](https://github.com/WordPress/gutenberg/pull/43340))
-- Post Navigation Link: ([43344](https://github.com/WordPress/gutenberg/pull/43344))
-- Post Template: ([43342](https://github.com/WordPress/gutenberg/pull/43342))
-- Post Terms: ([43343](https://github.com/WordPress/gutenberg/pull/43343))
-- Preformatted: ([43345](https://github.com/WordPress/gutenberg/pull/43345))
-- Pullquote: ([43346](https://github.com/WordPress/gutenberg/pull/43346))
-- Table of Contents: ([43509](https://github.com/WordPress/gutenberg/pull/43509))
+-   Paragraph: ([39642](https://github.com/WordPress/gutenberg/pull/39642))
+-   Categories List: ([43254](https://github.com/WordPress/gutenberg/pull/43254))
+-   Code Block: ([43255](https://github.com/WordPress/gutenberg/pull/43255))
+-   Column Block: ([43252](https://github.com/WordPress/gutenberg/pull/43252))
+-   Columns Block: ([43253](https://github.com/WordPress/gutenberg/pull/43253))
+-   Comment Author Name: ([43256](https://github.com/WordPress/gutenberg/pull/43256))
+-   Comment Date: ([43262](https://github.com/WordPress/gutenberg/pull/43262))
+-   Comment Edit Link: ([43263](https://github.com/WordPress/gutenberg/pull/43263))
+-   Comment Template: ([43266](https://github.com/WordPress/gutenberg/pull/43266))
+-   Comments Content: ([43257](https://github.com/WordPress/gutenberg/pull/43257))
+-   Comments Pagination: ([43288](https://github.com/WordPress/gutenberg/pull/43288), [43289](https://github.com/WordPress/gutenberg/pull/43289), [43290](https://github.com/WordPress/gutenberg/pull/43290), [43287](https://github.com/WordPress/gutenberg/pull/43287))
+-   Comments Reply Link: ([43264](https://github.com/WordPress/gutenberg/pull/43264))
+-   Comments Title: ([43291](https://github.com/WordPress/gutenberg/pull/43291))
+-   Comments: ([43286](https://github.com/WordPress/gutenberg/pull/43286))
+-   Cover: ([43298](https://github.com/WordPress/gutenberg/pull/43298))
+-   Group: ([43308](https://github.com/WordPress/gutenberg/pull/43308))
+-   Media & Text: ([43314](https://github.com/WordPress/gutenberg/pull/43314))
+-   Navigation: ([43542](https://github.com/WordPress/gutenberg/pull/43542))
+-   Post Author Biography: ([43318](https://github.com/WordPress/gutenberg/pull/43318))
+-   Post Author Name: ([43319](https://github.com/WordPress/gutenberg/pull/43319))
+-   Post Author: ([43317](https://github.com/WordPress/gutenberg/pull/43317))
+-   Post Comments Count: ([43321](https://github.com/WordPress/gutenberg/pull/43321))
+-   Post Comments Link: ([43338](https://github.com/WordPress/gutenberg/pull/43338))
+-   Post Date: ([43340](https://github.com/WordPress/gutenberg/pull/43340))
+-   Post Navigation Link: ([43344](https://github.com/WordPress/gutenberg/pull/43344))
+-   Post Template: ([43342](https://github.com/WordPress/gutenberg/pull/43342))
+-   Post Terms: ([43343](https://github.com/WordPress/gutenberg/pull/43343))
+-   Preformatted: ([43345](https://github.com/WordPress/gutenberg/pull/43345))
+-   Pullquote: ([43346](https://github.com/WordPress/gutenberg/pull/43346))
+-   Table of Contents: ([43509](https://github.com/WordPress/gutenberg/pull/43509))
 
 Added spacing supports:
 
-- Paragraph: Add spacing block supports. ([43455](https://github.com/WordPress/gutenberg/pull/43455))
-- Heading: Add padding support. ([43454](https://github.com/WordPress/gutenberg/pull/43454))
-- List: Add spacing block supports. ([43402](https://github.com/WordPress/gutenberg/pull/43402))
-- Media & Text: Add spacing block supports. ([43456](https://github.com/WordPress/gutenberg/pull/43456))
-- Post Date: Add spacing support. ([43406](https://github.com/WordPress/gutenberg/pull/43406))
-- Post Title: Add padding support. ([43457](https://github.com/WordPress/gutenberg/pull/43457))
-- Query Title: Add padding support. ([43458](https://github.com/WordPress/gutenberg/pull/43458))
-- Spacer: Add spacing block supports. ([43366](https://github.com/WordPress/gutenberg/pull/43366))
-- Table of contents: Add spacing supports. ([43368](https://github.com/WordPress/gutenberg/pull/43368))
-- Table: Add spacing block supports. ([43370](https://github.com/WordPress/gutenberg/pull/43370))
-- Tag cloud: Add spacing block supports. ([43367](https://github.com/WordPress/gutenberg/pull/43367))
-- Term description: Add spacing block supports. ([43372](https://github.com/WordPress/gutenberg/pull/43372))
-- Verse: Add margin support. ([43461](https://github.com/WordPress/gutenberg/pull/43461))
-- Video: Add spacing block supports. ([43365](https://github.com/WordPress/gutenberg/pull/43365))
+-   Paragraph: Add spacing block supports. ([43455](https://github.com/WordPress/gutenberg/pull/43455))
+-   Heading: Add padding support. ([43454](https://github.com/WordPress/gutenberg/pull/43454))
+-   List: Add spacing block supports. ([43402](https://github.com/WordPress/gutenberg/pull/43402))
+-   Media & Text: Add spacing block supports. ([43456](https://github.com/WordPress/gutenberg/pull/43456))
+-   Post Date: Add spacing support. ([43406](https://github.com/WordPress/gutenberg/pull/43406))
+-   Post Title: Add padding support. ([43457](https://github.com/WordPress/gutenberg/pull/43457))
+-   Query Title: Add padding support. ([43458](https://github.com/WordPress/gutenberg/pull/43458))
+-   Spacer: Add spacing block supports. ([43366](https://github.com/WordPress/gutenberg/pull/43366))
+-   Table of contents: Add spacing supports. ([43368](https://github.com/WordPress/gutenberg/pull/43368))
+-   Table: Add spacing block supports. ([43370](https://github.com/WordPress/gutenberg/pull/43370))
+-   Tag cloud: Add spacing block supports. ([43367](https://github.com/WordPress/gutenberg/pull/43367))
+-   Term description: Add spacing block supports. ([43372](https://github.com/WordPress/gutenberg/pull/43372))
+-   Verse: Add margin support. ([43461](https://github.com/WordPress/gutenberg/pull/43461))
+-   Video: Add spacing block supports. ([43365](https://github.com/WordPress/gutenberg/pull/43365))
 
 Added other supports:
 
-- Gallery: Add background color block supports. ([43294](https://github.com/WordPress/gutenberg/pull/43294))
-- Post Featured Image: Add border support applied to inner img. ([42847](https://github.com/WordPress/gutenberg/pull/42847))
-- Social Links: Enable alpha on color pickers. ([43453](https://github.com/WordPress/gutenberg/pull/43453))
-- Social links: Add background color block supports. ([43293](https://github.com/WordPress/gutenberg/pull/43293))
-- Table of contents block: Add color block supports. ([43363](https://github.com/WordPress/gutenberg/pull/43363))
-
-
-#### Components
-- (Custom)SelectControl: Refresh and refactor chevron. ([42962](https://github.com/WordPress/gutenberg/pull/42962))
-- Always use `screen` for `testing-library` queries. ([43152](https://github.com/WordPress/gutenberg/pull/43152))
-- Autocomplete: Use KeyboardEvent.code instead of KeyboardEvent.keyCode. ([43432](https://github.com/WordPress/gutenberg/pull/43432))
-- Card: Migrate to TypeScript. ([42941](https://github.com/WordPress/gutenberg/pull/42941))
-- ComboboxControl: Normalize hyphen-like Unicode characters to ASCII hyphens when matching search queries. ([42942](https://github.com/WordPress/gutenberg/pull/42942))
-- CustomGradientPicker: Use KeyboardEvent.code instead of KeyboardEvent.keyCode. ([43437](https://github.com/WordPress/gutenberg/pull/43437))
-- DateTimePicker: Replace react-dates and moment with useLilius and date-fns. ([43005](https://github.com/WordPress/gutenberg/pull/43005))
-- FocalPointPicker: Use KeyboardEvent.code, partially refactor tests to modern RTL and user-event. ([43441](https://github.com/WordPress/gutenberg/pull/43441))
-- FontSizePicker: Add a flag to remove bottom margin. ([43062](https://github.com/WordPress/gutenberg/pull/43062))
-- FormTokenField: Add the ability to auto-select first matching suggestion for incomplete token. ([42527](https://github.com/WordPress/gutenberg/pull/42527))
-- FormTokenField: Use KeyboardEvent.code, refactor tests to model RTL and user-event. ([43442](https://github.com/WordPress/gutenberg/pull/43442))
-- Modal: Use code instead of keyCode for keyboard events. ([43429](https://github.com/WordPress/gutenberg/pull/43429))
-- Popover: Move eslint-disable comment to the correct deps array. ([43320](https://github.com/WordPress/gutenberg/pull/43320))
-- ToggleGroupControl: Improve styling for icon options. ([43060](https://github.com/WordPress/gutenberg/pull/43060))
-
-#### Block Library
-- Add a setting to hide the prefix in the archive title. ([42594](https://github.com/WordPress/gutenberg/pull/42594))
-- Embed: Update Reddit icon. ([43326](https://github.com/WordPress/gutenberg/pull/43326))
-- Post date: Add option to display as the last modified date. ([42312](https://github.com/WordPress/gutenberg/pull/42312))
-- Reset focalPoint after replacing the cover image. ([42859](https://github.com/WordPress/gutenberg/pull/42859))
-- Social Link: Update Reddit icon and color to match brand guidelines. ([43325](https://github.com/WordPress/gutenberg/pull/43325))
-- Try "constrained" content width as new layout type. ([42763](https://github.com/WordPress/gutenberg/pull/42763))
-- Try: Add a clickable Group setup state. ([40664](https://github.com/WordPress/gutenberg/pull/40664))
-- Use page list instead of placeholder as fallback. ([42735](https://github.com/WordPress/gutenberg/pull/42735))
-- [Query Loop]: Honour intended post type when previewing patterns and when replacing them with patterns. ([43285](https://github.com/WordPress/gutenberg/pull/43285))
-- List: Use nested blocks. ([42711](https://github.com/WordPress/gutenberg/pull/42711))
-
-#### Global Styles
-- BlockGap: Add axial gap option to global styles where available. ([42490](https://github.com/WordPress/gutenberg/pull/42490))
-- BlockGap: Add support for spacing presets. ([43296](https://github.com/WordPress/gutenberg/pull/43296))
-- Spacing presets: Add check for 0 spacing steps. ([43105](https://github.com/WordPress/gutenberg/pull/43105))
-- Spacing presets: Add support for margins. ([43246](https://github.com/WordPress/gutenberg/pull/43246))
-- Spacing presets: Implement disabling of custom space sizes. ([43216](https://github.com/WordPress/gutenberg/pull/43216))
-- Pseudo-elements supports on button elements. ([43088](https://github.com/WordPress/gutenberg/pull/43088))
+-   Gallery: Add background color block supports. ([43294](https://github.com/WordPress/gutenberg/pull/43294))
+-   Post Featured Image: Add border support applied to inner img. ([42847](https://github.com/WordPress/gutenberg/pull/42847))
+-   Social Links: Enable alpha on color pickers. ([43453](https://github.com/WordPress/gutenberg/pull/43453))
+-   Social links: Add background color block supports. ([43293](https://github.com/WordPress/gutenberg/pull/43293))
+-   Table of contents block: Add color block supports. ([43363](https://github.com/WordPress/gutenberg/pull/43363))
+
+#### Components
+
+-   (Custom)SelectControl: Refresh and refactor chevron. ([42962](https://github.com/WordPress/gutenberg/pull/42962))
+-   Always use `screen` for `testing-library` queries. ([43152](https://github.com/WordPress/gutenberg/pull/43152))
+-   Autocomplete: Use KeyboardEvent.code instead of KeyboardEvent.keyCode. ([43432](https://github.com/WordPress/gutenberg/pull/43432))
+-   Card: Migrate to TypeScript. ([42941](https://github.com/WordPress/gutenberg/pull/42941))
+-   ComboboxControl: Normalize hyphen-like Unicode characters to ASCII hyphens when matching search queries. ([42942](https://github.com/WordPress/gutenberg/pull/42942))
+-   CustomGradientPicker: Use KeyboardEvent.code instead of KeyboardEvent.keyCode. ([43437](https://github.com/WordPress/gutenberg/pull/43437))
+-   DateTimePicker: Replace react-dates and moment with useLilius and date-fns. ([43005](https://github.com/WordPress/gutenberg/pull/43005))
+-   FocalPointPicker: Use KeyboardEvent.code, partially refactor tests to modern RTL and user-event. ([43441](https://github.com/WordPress/gutenberg/pull/43441))
+-   FontSizePicker: Add a flag to remove bottom margin. ([43062](https://github.com/WordPress/gutenberg/pull/43062))
+-   FormTokenField: Add the ability to auto-select first matching suggestion for incomplete token. ([42527](https://github.com/WordPress/gutenberg/pull/42527))
+-   FormTokenField: Use KeyboardEvent.code, refactor tests to model RTL and user-event. ([43442](https://github.com/WordPress/gutenberg/pull/43442))
+-   Modal: Use code instead of keyCode for keyboard events. ([43429](https://github.com/WordPress/gutenberg/pull/43429))
+-   Popover: Move eslint-disable comment to the correct deps array. ([43320](https://github.com/WordPress/gutenberg/pull/43320))
+-   ToggleGroupControl: Improve styling for icon options. ([43060](https://github.com/WordPress/gutenberg/pull/43060))
+
+#### Block Library
+
+-   Add a setting to hide the prefix in the archive title. ([42594](https://github.com/WordPress/gutenberg/pull/42594))
+-   Embed: Update Reddit icon. ([43326](https://github.com/WordPress/gutenberg/pull/43326))
+-   Post date: Add option to display as the last modified date. ([42312](https://github.com/WordPress/gutenberg/pull/42312))
+-   Reset focalPoint after replacing the cover image. ([42859](https://github.com/WordPress/gutenberg/pull/42859))
+-   Social Link: Update Reddit icon and color to match brand guidelines. ([43325](https://github.com/WordPress/gutenberg/pull/43325))
+-   Try "constrained" content width as new layout type. ([42763](https://github.com/WordPress/gutenberg/pull/42763))
+-   Try: Add a clickable Group setup state. ([40664](https://github.com/WordPress/gutenberg/pull/40664))
+-   Use page list instead of placeholder as fallback. ([42735](https://github.com/WordPress/gutenberg/pull/42735))
+-   [Query Loop]: Honour intended post type when previewing patterns and when replacing them with patterns. ([43285](https://github.com/WordPress/gutenberg/pull/43285))
+-   List: Use nested blocks. ([42711](https://github.com/WordPress/gutenberg/pull/42711))
+
+#### Global Styles
+
+-   BlockGap: Add axial gap option to global styles where available. ([42490](https://github.com/WordPress/gutenberg/pull/42490))
+-   BlockGap: Add support for spacing presets. ([43296](https://github.com/WordPress/gutenberg/pull/43296))
+-   Spacing presets: Add check for 0 spacing steps. ([43105](https://github.com/WordPress/gutenberg/pull/43105))
+-   Spacing presets: Add support for margins. ([43246](https://github.com/WordPress/gutenberg/pull/43246))
+-   Spacing presets: Implement disabling of custom space sizes. ([43216](https://github.com/WordPress/gutenberg/pull/43216))
+-   Pseudo-elements supports on button elements. ([43088](https://github.com/WordPress/gutenberg/pull/43088))
 
 #### CSS & Styling
-- Placeholder: Add blurred background to work in nested cases. ([43379](https://github.com/WordPress/gutenberg/pull/43379))
-- Placeholder: Refactor and simplify dashed placeholders used for Featured Image & Site Logo. ([43228](https://github.com/WordPress/gutenberg/pull/43228))
+
+-   Placeholder: Add blurred background to work in nested cases. ([43379](https://github.com/WordPress/gutenberg/pull/43379))
+-   Placeholder: Refactor and simplify dashed placeholders used for Featured Image & Site Logo. ([43228](https://github.com/WordPress/gutenberg/pull/43228))
 
 #### Data Layer
-- [data] Export the type for the combineReducers export. ([43516](https://github.com/WordPress/gutenberg/pull/43516))
+
+-   [data] Export the type for the combineReducers export. ([43516](https://github.com/WordPress/gutenberg/pull/43516))
 
 #### Site Editor
-- Template Part: Allow changing properties in focus mode. ([43151](https://github.com/WordPress/gutenberg/pull/43151))
-
-#### Block Editor
-- Refactor `LinkControl` tests to `@testing-library`. ([43147](https://github.com/WordPress/gutenberg/pull/43147))
-
-
-### Bug Fixes
-
-- Create Block: Refactor handling for template variants. ([43481](https://github.com/WordPress/gutenberg/pull/43481))
-- Fix no-results grammar. ([43168](https://github.com/WordPress/gutenberg/pull/43168))
-- Fix spinner causing a flash when loading site editor. ([43226](https://github.com/WordPress/gutenberg/pull/43226))
-- Image: Fix unclickable buttons. ([43361](https://github.com/WordPress/gutenberg/pull/43361))
-- Keycodes: Fix display of symbols in keyboard shortcut modal. ([43137](https://github.com/WordPress/gutenberg/pull/43137))
-- MediaReplaceFlow: Reset default LinkControl margins. ([43156](https://github.com/WordPress/gutenberg/pull/43156))
-- Post title: Fix pasting into existing content. ([43123](https://github.com/WordPress/gutenberg/pull/43123))
-- [Block Editor]: Fix block switcher label to take into account block variations. ([43309](https://github.com/WordPress/gutenberg/pull/43309))
-- [useEntityRecord] Pass the correct kind, name, and recordId to getEditedEntityRecord. ([43517](https://github.com/WordPress/gutenberg/pull/43517))
-- wp-env: Set core source to latest when null. ([43133](https://github.com/WordPress/gutenberg/pull/43133))
-
-#### Block Library
-- Ensure the block toolbar doesn't overlap block by modifying forcePosition and shift popover props. ([42887](https://github.com/WordPress/gutenberg/pull/42887))
-- Ensure pagination numbers have an href in block edit function. ([43354](https://github.com/WordPress/gutenberg/pull/43354))
-- Fix Post Featured Image border attributes. ([43426](https://github.com/WordPress/gutenberg/pull/43426))
-- Fix classic block converted to regular blocks when clicking new 'Edit visually' button. ([43219](https://github.com/WordPress/gutenberg/pull/43219))
-- Fix featured image being unselectable using arrow keys. ([43323](https://github.com/WordPress/gutenberg/pull/43323))
-- Fix navigation block undefined index error on frontend. ([43302](https://github.com/WordPress/gutenberg/pull/43302))
-- Gallery block: Ensure image attributes copy correctly between transforms. ([42796](https://github.com/WordPress/gutenberg/pull/42796))
-- Home Link: Fix undo trap. ([43112](https://github.com/WordPress/gutenberg/pull/43112))
-- List v2: Copy list wrapper when copying list items. ([42860](https://github.com/WordPress/gutenberg/pull/42860))
-- Navigation: Page List fix missing padding. ([43358](https://github.com/WordPress/gutenberg/pull/43358))
-- Prevent query block from looping in classic themes. ([43221](https://github.com/WordPress/gutenberg/pull/43221))
-- Pullquote block: Avoid text-align settings affecting block width and font size. ([43188](https://github.com/WordPress/gutenberg/pull/43188))
-- Pullquote block: Remove font definition from the default block styles. ([43195](https://github.com/WordPress/gutenberg/pull/43195))
-- taxonomy-controls.js: Change REST context to "view" when fetching taxonomy terms. ([43274](https://github.com/WordPress/gutenberg/pull/43274))
-- Home Link: Properly close tags. ([43706](https://github.com/WordPress/gutenberg/pull/43706))
-- Social Link: Fix background color on WhatsApp icon. ([43683](https://github.com/WordPress/gutenberg/pull/43683))
-
-#### Components
-- (Custom)SelectControl: Truncate long options. ([43301](https://github.com/WordPress/gutenberg/pull/43301))
-- AlignmentMatrixControl: Fix `width` bug. ([43482](https://github.com/WordPress/gutenberg/pull/43482))
-- ColorPalette, GradientPicker: Fix color picker popover positioning. ([42989](https://github.com/WordPress/gutenberg/pull/42989))
-- ColorPalette: Make sure "key" is unique when iterating over color entries with the same value. ([43096](https://github.com/WordPress/gutenberg/pull/43096))
-- Dropdown: Anchor popover to the dropdown wrapper (instead of the toggle). ([43377](https://github.com/WordPress/gutenberg/pull/43377))
-- Fix block toolbar offset in site editor when toggling sidebars. ([43172](https://github.com/WordPress/gutenberg/pull/43172))
-- Fix popover glitch that results in incorrect toolbar positioning in site editor. ([43267](https://github.com/WordPress/gutenberg/pull/43267))
-- Improve appearance of controls in the Global Styles Typography panel. ([43304](https://github.com/WordPress/gutenberg/pull/43304))
-- Popover: Fix and improve opening animation, use framer motion. ([43186](https://github.com/WordPress/gutenberg/pull/43186))
-- Popover: Make sure offset middleware always applies the latest frame offset values. ([43329](https://github.com/WordPress/gutenberg/pull/43329))
-- Refactor `Guide` tests to `@testing-library/react`. ([43380](https://github.com/WordPress/gutenberg/pull/43380))
-
-#### Global Styles
-- Check for recursive dynamic reference in the site editor. ([43166](https://github.com/WordPress/gutenberg/pull/43166))
-- Duotone: Prevent early return blocking other style generation. ([43300](https://github.com/WordPress/gutenberg/pull/43300))
-- Fix dynamic references on the site editor. ([42976](https://github.com/WordPress/gutenberg/pull/42976))
-- Fix error in handling spacing preset slugs. ([43237](https://github.com/WordPress/gutenberg/pull/43237))
-- Layout: Re-instate alignwide and alignfull in flow layout get alignments. ([43502](https://github.com/WordPress/gutenberg/pull/43502))
-- Spacing presets: Fix/minor issues noted in initial UI PR. ([43214](https://github.com/WordPress/gutenberg/pull/43214))
-- Layout: Fix has-global-padding classname for constrained layouts without contentSize. ([43689](https://github.com/WordPress/gutenberg/pull/43689))
-
-#### Block Editor
-- Fix Cmd+A issue in Storybook. ([43145](https://github.com/WordPress/gutenberg/pull/43145))
-- Fix drag and drop indicator before first block and after last block. ([43135](https://github.com/WordPress/gutenberg/pull/43135))
-- Fix spinner position in URLInput component. ([43472](https://github.com/WordPress/gutenberg/pull/43472))
-- Partial select: Fix selecting into image. ([42983](https://github.com/WordPress/gutenberg/pull/42983))
+
+-   Template Part: Allow changing properties in focus mode. ([43151](https://github.com/WordPress/gutenberg/pull/43151))
+
+#### Block Editor
+
+-   Refactor `LinkControl` tests to `@testing-library`. ([43147](https://github.com/WordPress/gutenberg/pull/43147))
+
+### Bug Fixes
+
+-   Create Block: Refactor handling for template variants. ([43481](https://github.com/WordPress/gutenberg/pull/43481))
+-   Fix no-results grammar. ([43168](https://github.com/WordPress/gutenberg/pull/43168))
+-   Fix spinner causing a flash when loading site editor. ([43226](https://github.com/WordPress/gutenberg/pull/43226))
+-   Image: Fix unclickable buttons. ([43361](https://github.com/WordPress/gutenberg/pull/43361))
+-   Keycodes: Fix display of symbols in keyboard shortcut modal. ([43137](https://github.com/WordPress/gutenberg/pull/43137))
+-   MediaReplaceFlow: Reset default LinkControl margins. ([43156](https://github.com/WordPress/gutenberg/pull/43156))
+-   Post title: Fix pasting into existing content. ([43123](https://github.com/WordPress/gutenberg/pull/43123))
+-   [Block Editor]: Fix block switcher label to take into account block variations. ([43309](https://github.com/WordPress/gutenberg/pull/43309))
+-   [useEntityRecord] Pass the correct kind, name, and recordId to getEditedEntityRecord. ([43517](https://github.com/WordPress/gutenberg/pull/43517))
+-   wp-env: Set core source to latest when null. ([43133](https://github.com/WordPress/gutenberg/pull/43133))
+
+#### Block Library
+
+-   Ensure the block toolbar doesn't overlap block by modifying forcePosition and shift popover props. ([42887](https://github.com/WordPress/gutenberg/pull/42887))
+-   Ensure pagination numbers have an href in block edit function. ([43354](https://github.com/WordPress/gutenberg/pull/43354))
+-   Fix Post Featured Image border attributes. ([43426](https://github.com/WordPress/gutenberg/pull/43426))
+-   Fix classic block converted to regular blocks when clicking new 'Edit visually' button. ([43219](https://github.com/WordPress/gutenberg/pull/43219))
+-   Fix featured image being unselectable using arrow keys. ([43323](https://github.com/WordPress/gutenberg/pull/43323))
+-   Fix navigation block undefined index error on frontend. ([43302](https://github.com/WordPress/gutenberg/pull/43302))
+-   Gallery block: Ensure image attributes copy correctly between transforms. ([42796](https://github.com/WordPress/gutenberg/pull/42796))
+-   Home Link: Fix undo trap. ([43112](https://github.com/WordPress/gutenberg/pull/43112))
+-   List v2: Copy list wrapper when copying list items. ([42860](https://github.com/WordPress/gutenberg/pull/42860))
+-   Navigation: Page List fix missing padding. ([43358](https://github.com/WordPress/gutenberg/pull/43358))
+-   Prevent query block from looping in classic themes. ([43221](https://github.com/WordPress/gutenberg/pull/43221))
+-   Pullquote block: Avoid text-align settings affecting block width and font size. ([43188](https://github.com/WordPress/gutenberg/pull/43188))
+-   Pullquote block: Remove font definition from the default block styles. ([43195](https://github.com/WordPress/gutenberg/pull/43195))
+-   taxonomy-controls.js: Change REST context to "view" when fetching taxonomy terms. ([43274](https://github.com/WordPress/gutenberg/pull/43274))
+-   Home Link: Properly close tags. ([43706](https://github.com/WordPress/gutenberg/pull/43706))
+-   Social Link: Fix background color on WhatsApp icon. ([43683](https://github.com/WordPress/gutenberg/pull/43683))
+
+#### Components
+
+-   (Custom)SelectControl: Truncate long options. ([43301](https://github.com/WordPress/gutenberg/pull/43301))
+-   AlignmentMatrixControl: Fix `width` bug. ([43482](https://github.com/WordPress/gutenberg/pull/43482))
+-   ColorPalette, GradientPicker: Fix color picker popover positioning. ([42989](https://github.com/WordPress/gutenberg/pull/42989))
+-   ColorPalette: Make sure "key" is unique when iterating over color entries with the same value. ([43096](https://github.com/WordPress/gutenberg/pull/43096))
+-   Dropdown: Anchor popover to the dropdown wrapper (instead of the toggle). ([43377](https://github.com/WordPress/gutenberg/pull/43377))
+-   Fix block toolbar offset in site editor when toggling sidebars. ([43172](https://github.com/WordPress/gutenberg/pull/43172))
+-   Fix popover glitch that results in incorrect toolbar positioning in site editor. ([43267](https://github.com/WordPress/gutenberg/pull/43267))
+-   Improve appearance of controls in the Global Styles Typography panel. ([43304](https://github.com/WordPress/gutenberg/pull/43304))
+-   Popover: Fix and improve opening animation, use framer motion. ([43186](https://github.com/WordPress/gutenberg/pull/43186))
+-   Popover: Make sure offset middleware always applies the latest frame offset values. ([43329](https://github.com/WordPress/gutenberg/pull/43329))
+-   Refactor `Guide` tests to `@testing-library/react`. ([43380](https://github.com/WordPress/gutenberg/pull/43380))
+
+#### Global Styles
+
+-   Check for recursive dynamic reference in the site editor. ([43166](https://github.com/WordPress/gutenberg/pull/43166))
+-   Duotone: Prevent early return blocking other style generation. ([43300](https://github.com/WordPress/gutenberg/pull/43300))
+-   Fix dynamic references on the site editor. ([42976](https://github.com/WordPress/gutenberg/pull/42976))
+-   Fix error in handling spacing preset slugs. ([43237](https://github.com/WordPress/gutenberg/pull/43237))
+-   Layout: Re-instate alignwide and alignfull in flow layout get alignments. ([43502](https://github.com/WordPress/gutenberg/pull/43502))
+-   Spacing presets: Fix/minor issues noted in initial UI PR. ([43214](https://github.com/WordPress/gutenberg/pull/43214))
+-   Layout: Fix has-global-padding classname for constrained layouts without contentSize. ([43689](https://github.com/WordPress/gutenberg/pull/43689))
+
+#### Block Editor
+
+-   Fix Cmd+A issue in Storybook. ([43145](https://github.com/WordPress/gutenberg/pull/43145))
+-   Fix drag and drop indicator before first block and after last block. ([43135](https://github.com/WordPress/gutenberg/pull/43135))
+-   Fix spinner position in URLInput component. ([43472](https://github.com/WordPress/gutenberg/pull/43472))
+-   Partial select: Fix selecting into image. ([42983](https://github.com/WordPress/gutenberg/pull/42983))
 
 #### Design Tools
-- Border Radius: Prevent invalid css unit only styles or empty radii style attribute. ([42409](https://github.com/WordPress/gutenberg/pull/42409))
-- Border Support: Fix disabling of border style control. ([43109](https://github.com/WordPress/gutenberg/pull/43109))
-- Post Comments Count: Prevent text-decoration from affecting warning. ([43497](https://github.com/WordPress/gutenberg/pull/43497))
+
+-   Border Radius: Prevent invalid css unit only styles or empty radii style attribute. ([42409](https://github.com/WordPress/gutenberg/pull/42409))
+-   Border Support: Fix disabling of border style control. ([43109](https://github.com/WordPress/gutenberg/pull/43109))
+-   Post Comments Count: Prevent text-decoration from affecting warning. ([43497](https://github.com/WordPress/gutenberg/pull/43497))
 
 #### Site Editor
-- Do not show scrollbar when toolbar overflows the editor wrapper. ([43332](https://github.com/WordPress/gutenberg/pull/43332))
-- Fix template part focus mode resizable editor height. ([43408](https://github.com/WordPress/gutenberg/pull/43408))
+
+-   Do not show scrollbar when toolbar overflows the editor wrapper. ([43332](https://github.com/WordPress/gutenberg/pull/43332))
+-   Fix template part focus mode resizable editor height. ([43408](https://github.com/WordPress/gutenberg/pull/43408))
 
 #### npm Packages
-- Jest Preset: Ignore `is-plain-obj` transformation. ([43179](https://github.com/WordPress/gutenberg/pull/43179))
-- Jest Preset: Improve `is-plain-obj` transformation ignore. ([43271](https://github.com/WordPress/gutenberg/pull/43271))
+
+-   Jest Preset: Ignore `is-plain-obj` transformation. ([43179](https://github.com/WordPress/gutenberg/pull/43179))
+-   Jest Preset: Improve `is-plain-obj` transformation ignore. ([43271](https://github.com/WordPress/gutenberg/pull/43271))
 
 #### Widgets Editor
-- Fix legacy widget form positioning in customizer. ([43297](https://github.com/WordPress/gutenberg/pull/43297))
+
+-   Fix legacy widget form positioning in customizer. ([43297](https://github.com/WordPress/gutenberg/pull/43297))
 
 #### CSS & Styling
-- Group/Stack/Row: Scope the dashed placeholder rules. ([43169](https://github.com/WordPress/gutenberg/pull/43169))
+
+-   Group/Stack/Row: Scope the dashed placeholder rules. ([43169](https://github.com/WordPress/gutenberg/pull/43169))
 
 #### List View
-- Ensure long anchors don't cause the List View to extend. ([43134](https://github.com/WordPress/gutenberg/pull/43134))
+
+-   Ensure long anchors don't cause the List View to extend. ([43134](https://github.com/WordPress/gutenberg/pull/43134))
 
 #### Post Editor
-- Post Template: Don't fetch settings and templates for non-admin users. ([42845](https://github.com/WordPress/gutenberg/pull/42845))
+
+-   Post Template: Don't fetch settings and templates for non-admin users. ([42845](https://github.com/WordPress/gutenberg/pull/42845))
 
 #### Patterns
-- Fix custom placeholder not displaying on subsequent Paragraph blocks. ([42519](https://github.com/WordPress/gutenberg/pull/42519))
+
+-   Fix custom placeholder not displaying on subsequent Paragraph blocks. ([42519](https://github.com/WordPress/gutenberg/pull/42519))
 
 ### Accessibility
-- Block Editor: Remove `aria-selected` from `LinkPreview`. ([43279](https://github.com/WordPress/gutenberg/pull/43279))
-- Block Editor: Replace `aria-owns` with `aria-controls` in `URLInput`. ([43278](https://github.com/WordPress/gutenberg/pull/43278))
-- Separator: Disable the contrastChecker via block.json. ([43357](https://github.com/WordPress/gutenberg/pull/43357))
-- Fix Top toolbar buttons tooltips and style when 'Show button text labels' is enabled. ([42815](https://github.com/WordPress/gutenberg/pull/42815))
+
+-   Block Editor: Remove `aria-selected` from `LinkPreview`. ([43279](https://github.com/WordPress/gutenberg/pull/43279))
+-   Block Editor: Replace `aria-owns` with `aria-controls` in `URLInput`. ([43278](https://github.com/WordPress/gutenberg/pull/43278))
+-   Separator: Disable the contrastChecker via block.json. ([43357](https://github.com/WordPress/gutenberg/pull/43357))
+-   Fix Top toolbar buttons tooltips and style when 'Show button text labels' is enabled. ([42815](https://github.com/WordPress/gutenberg/pull/42815))
 
 ### Performance
 
@@ -12360,140 +23649,153 @@ The related PRs are: [43118](https://github.com/WordPress/gutenberg/pull/43118),
 ### Experiments
 
 #### Components
-- Font size picker: Use t-shirt sizes for the ToggleGroupControl component. ([43074](https://github.com/WordPress/gutenberg/pull/43074))
 
+-   Font size picker: Use t-shirt sizes for the ToggleGroupControl component. ([43074](https://github.com/WordPress/gutenberg/pull/43074))
 
 ### Documentation
 
-- Add documentation for useRootPaddingAwareAlignments in theme.json. ([43463](https://github.com/WordPress/gutenberg/pull/43463))
-- Comma is missing. ([43446](https://github.com/WordPress/gutenberg/pull/43446))
-- Convert HTML to Markdown in changelog for 13.9. ([43324](https://github.com/WordPress/gutenberg/pull/43324))
-- Handbook: Fix format API example link. ([43477](https://github.com/WordPress/gutenberg/pull/43477))
-- Stabilize the useResourcePermissions hook. ([43268](https://github.com/WordPress/gutenberg/pull/43268))
-- [Docs] Replace useState with edit in useEntityRecord usage examples. ([43270](https://github.com/WordPress/gutenberg/pull/43270))
-- Block Editor Handbook: Added missing codetabs end marker. ([43185](https://github.com/WordPress/gutenberg/pull/43185))
-- Docs: Fix some typos. ([43175](https://github.com/WordPress/gutenberg/pull/43175))
-
+-   Add documentation for useRootPaddingAwareAlignments in theme.json. ([43463](https://github.com/WordPress/gutenberg/pull/43463))
+-   Comma is missing. ([43446](https://github.com/WordPress/gutenberg/pull/43446))
+-   Convert HTML to Markdown in changelog for 13.9. ([43324](https://github.com/WordPress/gutenberg/pull/43324))
+-   Handbook: Fix format API example link. ([43477](https://github.com/WordPress/gutenberg/pull/43477))
+-   Stabilize the useResourcePermissions hook. ([43268](https://github.com/WordPress/gutenberg/pull/43268))
+-   [Docs] Replace useState with edit in useEntityRecord usage examples. ([43270](https://github.com/WordPress/gutenberg/pull/43270))
+-   Block Editor Handbook: Added missing codetabs end marker. ([43185](https://github.com/WordPress/gutenberg/pull/43185))
+-   Docs: Fix some typos. ([43175](https://github.com/WordPress/gutenberg/pull/43175))
 
 ### Code Quality
 
-- PHP: Use str_contains(). ([43382](https://github.com/WordPress/gutenberg/pull/43382))
-- PHP: Use str_starts_with. ([43410](https://github.com/WordPress/gutenberg/pull/43410))
-- Style engine: Pass options to CSS static methods. ([43399](https://github.com/WordPress/gutenberg/pull/43399))
-- Style engine tweaks. ([43303](https://github.com/WordPress/gutenberg/pull/43303))
-- Navigation block - minor refactor to classic menu conversion code. ([43081](https://github.com/WordPress/gutenberg/pull/43081))
-- Data: Bundle TypeScript types with the data package. ([43315](https://github.com/WordPress/gutenberg/pull/43315))
-- getTemplateInfo: Return stable reference to an empty object. ([43155](https://github.com/WordPress/gutenberg/pull/43155))
-- Remove duplicated 'import' comments. ([43478](https://github.com/WordPress/gutenberg/pull/43478))
-- Disabled: Migrate to TypeScript. ([42708](https://github.com/WordPress/gutenberg/pull/42708))
+-   PHP: Use str_contains(). ([43382](https://github.com/WordPress/gutenberg/pull/43382))
+-   PHP: Use str_starts_with. ([43410](https://github.com/WordPress/gutenberg/pull/43410))
+-   Style engine: Pass options to CSS static methods. ([43399](https://github.com/WordPress/gutenberg/pull/43399))
+-   Style engine tweaks. ([43303](https://github.com/WordPress/gutenberg/pull/43303))
+-   Navigation block - minor refactor to classic menu conversion code. ([43081](https://github.com/WordPress/gutenberg/pull/43081))
+-   Data: Bundle TypeScript types with the data package. ([43315](https://github.com/WordPress/gutenberg/pull/43315))
+-   getTemplateInfo: Return stable reference to an empty object. ([43155](https://github.com/WordPress/gutenberg/pull/43155))
+-   Remove duplicated 'import' comments. ([43478](https://github.com/WordPress/gutenberg/pull/43478))
+-   Disabled: Migrate to TypeScript. ([42708](https://github.com/WordPress/gutenberg/pull/42708))
 
 #### Components
-- Clean up unused and duplicate `COLORS` values. ([43445](https://github.com/WordPress/gutenberg/pull/43445))
-- Packages: Ensure dependencies use version ranges. ([43355](https://github.com/WordPress/gutenberg/pull/43355))
-- Swatch: Remove component in favor of ColorIndicator. ([43068](https://github.com/WordPress/gutenberg/pull/43068))
-- Update/floating UI version. ([43206](https://github.com/WordPress/gutenberg/pull/43206))
+
+-   Clean up unused and duplicate `COLORS` values. ([43445](https://github.com/WordPress/gutenberg/pull/43445))
+-   Packages: Ensure dependencies use version ranges. ([43355](https://github.com/WordPress/gutenberg/pull/43355))
+-   Swatch: Remove component in favor of ColorIndicator. ([43068](https://github.com/WordPress/gutenberg/pull/43068))
+-   Update/floating UI version. ([43206](https://github.com/WordPress/gutenberg/pull/43206))
 
 #### List View
-- Block list: Update block list view preferences name for consistency. ([43494](https://github.com/WordPress/gutenberg/pull/43494))
+
+-   Block list: Update block list view preferences name for consistency. ([43494](https://github.com/WordPress/gutenberg/pull/43494))
 
 #### Widgets Editor
-- Use useResourcePermissions in block-library and the widgets editor. ([43305](https://github.com/WordPress/gutenberg/pull/43305))
+
+-   Use useResourcePermissions in block-library and the widgets editor. ([43305](https://github.com/WordPress/gutenberg/pull/43305))
 
 #### Block Editor
-- Rich Text: Eliminate second scan when getting text content. ([43207](https://github.com/WordPress/gutenberg/pull/43207))
+
+-   Rich Text: Eliminate second scan when getting text content. ([43207](https://github.com/WordPress/gutenberg/pull/43207))
 
 #### Global Styles
-- Theme_JSON: Use existing append_to_selector for pseudo-elements. ([43167](https://github.com/WordPress/gutenberg/pull/43167))
-- Enable appearance tools via theme_support. ([43337](https://github.com/WordPress/gutenberg/pull/43337))
 
+-   Theme_JSON: Use existing append_to_selector for pseudo-elements. ([43167](https://github.com/WordPress/gutenberg/pull/43167))
+-   Enable appearance tools via theme_support. ([43337](https://github.com/WordPress/gutenberg/pull/43337))
 
 #### Testing
-- Migrate wp editor meta box test to Playwright. ([41519](https://github.com/WordPress/gutenberg/pull/41519))
-- PHPCS: Exclude PHPUnit tests from file and class name sniffs (for Core parity). ([43131](https://github.com/WordPress/gutenberg/pull/43131))
-- PHPUnit: Let PHPUnit Polyfills match PHPUnit version. ([43334](https://github.com/WordPress/gutenberg/pull/43334))
-- PHPUnit: Turns on PHP notices and deprecations. ([43102](https://github.com/WordPress/gutenberg/pull/43102))
-- Update incorrect quote end-to-end test snapshot. ([43407](https://github.com/WordPress/gutenberg/pull/43407))
-- Update test fixture for performance test. ([43359](https://github.com/WordPress/gutenberg/pull/43359))
-- Quote: Stabilise flaky end-to-end test. ([43460](https://github.com/WordPress/gutenberg/pull/43460))
+
+-   Migrate wp editor meta box test to Playwright. ([41519](https://github.com/WordPress/gutenberg/pull/41519))
+-   PHPCS: Exclude PHPUnit tests from file and class name sniffs (for Core parity). ([43131](https://github.com/WordPress/gutenberg/pull/43131))
+-   PHPUnit: Let PHPUnit Polyfills match PHPUnit version. ([43334](https://github.com/WordPress/gutenberg/pull/43334))
+-   PHPUnit: Turns on PHP notices and deprecations. ([43102](https://github.com/WordPress/gutenberg/pull/43102))
+-   Update incorrect quote end-to-end test snapshot. ([43407](https://github.com/WordPress/gutenberg/pull/43407))
+-   Update test fixture for performance test. ([43359](https://github.com/WordPress/gutenberg/pull/43359))
+-   Quote: Stabilise flaky end-to-end test. ([43460](https://github.com/WordPress/gutenberg/pull/43460))
 
 #### Build Tooling
-- Build Tools: Fix typo in performance tests workflow. ([43153](https://github.com/WordPress/gutenberg/pull/43153))
-- Packages: Update the minimum required Node.js version to 14 for tools. ([43141](https://github.com/WordPress/gutenberg/pull/43141))
-- ESLint Plugin: Remove all rules targeting test files from recommended presets. ([43272](https://github.com/WordPress/gutenberg/pull/43272))
-- Ignore library CSS and built CSS in stylelint. ([42027](https://github.com/WordPress/gutenberg/pull/42027))
-- Fix 'Mark issues stale after needs testing for 30 days' workflow. ([43545](https://github.com/WordPress/gutenberg/pull/43545))
+
+-   Build Tools: Fix typo in performance tests workflow. ([43153](https://github.com/WordPress/gutenberg/pull/43153))
+-   Packages: Update the minimum required Node.js version to 14 for tools. ([43141](https://github.com/WordPress/gutenberg/pull/43141))
+-   ESLint Plugin: Remove all rules targeting test files from recommended presets. ([43272](https://github.com/WordPress/gutenberg/pull/43272))
+-   Ignore library CSS and built CSS in stylelint. ([42027](https://github.com/WordPress/gutenberg/pull/42027))
+-   Fix 'Mark issues stale after needs testing for 30 days' workflow. ([43545](https://github.com/WordPress/gutenberg/pull/43545))
 
 #### npm Packages
-- Packages: Replace `is-plain-obj` with `is-plain-object`. ([43511](https://github.com/WordPress/gutenberg/pull/43511))
 
+-   Packages: Replace `is-plain-obj` with `is-plain-object`. ([43511](https://github.com/WordPress/gutenberg/pull/43511))
 
 #### Components
-- (Custom)GradientPicker: Add flag to remove margins. ([43387](https://github.com/WordPress/gutenberg/pull/43387))
-- AlignmentMatrixControl: Improve stories. ([43438](https://github.com/WordPress/gutenberg/pull/43438))
-- AnglePickerControl: Add flag to remove bottom margin. ([43160](https://github.com/WordPress/gutenberg/pull/43160))
-- ComboboxControl: Add flag to remove bottom margin. ([43165](https://github.com/WordPress/gutenberg/pull/43165))
-- CustomSelectControl: Deprecate constrained width style. ([43230](https://github.com/WordPress/gutenberg/pull/43230))
-- DuotonePicker/DuotoneSwatch: Add stories. ([43225](https://github.com/WordPress/gutenberg/pull/43225))
-- Storybook: Add margin checker tool. ([43223](https://github.com/WordPress/gutenberg/pull/43223))
-- ToggleGroupControl: Improve stories for documentation view. ([43265](https://github.com/WordPress/gutenberg/pull/43265))
-- ToolsPanel: Tighten grid gaps. ([43424](https://github.com/WordPress/gutenberg/pull/43424))
+
+-   (Custom)GradientPicker: Add flag to remove margins. ([43387](https://github.com/WordPress/gutenberg/pull/43387))
+-   AlignmentMatrixControl: Improve stories. ([43438](https://github.com/WordPress/gutenberg/pull/43438))
+-   AnglePickerControl: Add flag to remove bottom margin. ([43160](https://github.com/WordPress/gutenberg/pull/43160))
+-   ComboboxControl: Add flag to remove bottom margin. ([43165](https://github.com/WordPress/gutenberg/pull/43165))
+-   CustomSelectControl: Deprecate constrained width style. ([43230](https://github.com/WordPress/gutenberg/pull/43230))
+-   DuotonePicker/DuotoneSwatch: Add stories. ([43225](https://github.com/WordPress/gutenberg/pull/43225))
+-   Storybook: Add margin checker tool. ([43223](https://github.com/WordPress/gutenberg/pull/43223))
+-   ToggleGroupControl: Improve stories for documentation view. ([43265](https://github.com/WordPress/gutenberg/pull/43265))
+-   ToolsPanel: Tighten grid gaps. ([43424](https://github.com/WordPress/gutenberg/pull/43424))
 
 #### Block Library
-- Buttons: Update selectors to work better with button elements. ([43022](https://github.com/WordPress/gutenberg/pull/43022))
-- Comments block: Remove empty block wrapper. ([43383](https://github.com/WordPress/gutenberg/pull/43383))
-- Group block: Update description to remove "layout." ([43498](https://github.com/WordPress/gutenberg/pull/43498))
-- Image: Try different resting state for placeholder, alternate version. ([43180](https://github.com/WordPress/gutenberg/pull/43180))
-- Navigation: Try to improve the appender in an empty block. ([43115](https://github.com/WordPress/gutenberg/pull/43115))
-- Polish placeholder radius and enable duotone on image setup state. ([43425](https://github.com/WordPress/gutenberg/pull/43425))
-- Pullquote: Use inline rich text instead of multiline. ([43210](https://github.com/WordPress/gutenberg/pull/43210))
-- [Blocks] Paragraph and Heading: Add gradient support. ([43119](https://github.com/WordPress/gutenberg/pull/43119))
+
+-   Buttons: Update selectors to work better with button elements. ([43022](https://github.com/WordPress/gutenberg/pull/43022))
+-   Comments block: Remove empty block wrapper. ([43383](https://github.com/WordPress/gutenberg/pull/43383))
+-   Group block: Update description to remove "layout." ([43498](https://github.com/WordPress/gutenberg/pull/43498))
+-   Image: Try different resting state for placeholder, alternate version. ([43180](https://github.com/WordPress/gutenberg/pull/43180))
+-   Navigation: Try to improve the appender in an empty block. ([43115](https://github.com/WordPress/gutenberg/pull/43115))
+-   Polish placeholder radius and enable duotone on image setup state. ([43425](https://github.com/WordPress/gutenberg/pull/43425))
+-   Pullquote: Use inline rich text instead of multiline. ([43210](https://github.com/WordPress/gutenberg/pull/43210))
+-   [Blocks] Paragraph and Heading: Add gradient support. ([43119](https://github.com/WordPress/gutenberg/pull/43119))
 
 #### Patterns
-- Bundle new collection of Header and Footer block patterns. ([43157](https://github.com/WordPress/gutenberg/pull/43157))
-- Mark which attributes of the image should be considered content. ([43280](https://github.com/WordPress/gutenberg/pull/43280))
-- Prefer _x() for i18n context in core patterns. ([43409](https://github.com/WordPress/gutenberg/pull/43409))
+
+-   Bundle new collection of Header and Footer block patterns. ([43157](https://github.com/WordPress/gutenberg/pull/43157))
+-   Mark which attributes of the image should be considered content. ([43280](https://github.com/WordPress/gutenberg/pull/43280))
+-   Prefer \_x() for i18n context in core patterns. ([43409](https://github.com/WordPress/gutenberg/pull/43409))
 
 #### Design Tools
-- Add margin and padding supports to Audio block. ([43351](https://github.com/WordPress/gutenberg/pull/43351))
-- Add margin/padding support to Archives block. ([43350](https://github.com/WordPress/gutenberg/pull/43350))
+
+-   Add margin and padding supports to Audio block. ([43351](https://github.com/WordPress/gutenberg/pull/43351))
+-   Add margin/padding support to Archives block. ([43350](https://github.com/WordPress/gutenberg/pull/43350))
 
 #### Global Styles
-- Add documentation about spacing presets. ([43349](https://github.com/WordPress/gutenberg/pull/43349))
-- Spacing presets: Add editor UI support. ([42173](https://github.com/WordPress/gutenberg/pull/42173))
+
+-   Add documentation about spacing presets. ([43349](https://github.com/WordPress/gutenberg/pull/43349))
+-   Spacing presets: Add editor UI support. ([42173](https://github.com/WordPress/gutenberg/pull/42173))
 
 #### Site Editor
-- [Site Editor]: Add success notice upon template creation. ([43430](https://github.com/WordPress/gutenberg/pull/43430))
+
+-   [Site Editor]: Add success notice upon template creation. ([43430](https://github.com/WordPress/gutenberg/pull/43430))
 
 #### CSS & Styling
-- Style engine: Use style engine for block supports CSS in editor. ([43055](https://github.com/WordPress/gutenberg/pull/43055))
-- Style engine: Remove `enqueue` flag. ([43103](https://github.com/WordPress/gutenberg/pull/43103))
+
+-   Style engine: Use style engine for block supports CSS in editor. ([43055](https://github.com/WordPress/gutenberg/pull/43055))
+-   Style engine: Remove `enqueue` flag. ([43103](https://github.com/WordPress/gutenberg/pull/43103))
 
 #### Block Editor
-- Merging blocks: Allow x to be merged into wrapper blocks (quote, list, group...). ([42780](https://github.com/WordPress/gutenberg/pull/42780))
+
+-   Merging blocks: Allow x to be merged into wrapper blocks (quote, list, group...). ([42780](https://github.com/WordPress/gutenberg/pull/42780))
 
 ### Tools
 
 #### Testing
-- Refactor `Button` tests to `@testing-library/react`. ([42981](https://github.com/WordPress/gutenberg/pull/42981))
-- Refactor `Guide` `PageControl` tests to @testing-library/react. ([43148](https://github.com/WordPress/gutenberg/pull/43148))
-- Refactor `MenuGroup` tests to `@testing-library/react`. ([43275](https://github.com/WordPress/gutenberg/pull/43275))
-- Refactor `withSpokenMessages` tests to `@testing-library`. ([43273](https://github.com/WordPress/gutenberg/pull/43273))
-- Editor: Refactor `PostAuthorCheck` tests to `@testing-library`. ([43176](https://github.com/WordPress/gutenberg/pull/43176))
-- Editor: Refactor `ThemeSupportCheck` tests to `@testing-library/react`. ([43532](https://github.com/WordPress/gutenberg/pull/43532))
-- Editor: Refactor a few component tests to `@testing-library/react`. ([43376](https://github.com/WordPress/gutenberg/pull/43376))
-- Components: Refactor Placeholder tests to @testing-library/react. ([43069](https://github.com/WordPress/gutenberg/pull/43069))
-- Components: Refactor `Tooltip` tests to `@testing-library/react`. ([43061](https://github.com/WordPress/gutenberg/pull/43061))
 
-## First time contributors
+-   Refactor `Button` tests to `@testing-library/react`. ([42981](https://github.com/WordPress/gutenberg/pull/42981))
+-   Refactor `Guide` `PageControl` tests to @testing-library/react. ([43148](https://github.com/WordPress/gutenberg/pull/43148))
+-   Refactor `MenuGroup` tests to `@testing-library/react`. ([43275](https://github.com/WordPress/gutenberg/pull/43275))
+-   Refactor `withSpokenMessages` tests to `@testing-library`. ([43273](https://github.com/WordPress/gutenberg/pull/43273))
+-   Editor: Refactor `PostAuthorCheck` tests to `@testing-library`. ([43176](https://github.com/WordPress/gutenberg/pull/43176))
+-   Editor: Refactor `ThemeSupportCheck` tests to `@testing-library/react`. ([43532](https://github.com/WordPress/gutenberg/pull/43532))
+-   Editor: Refactor a few component tests to `@testing-library/react`. ([43376](https://github.com/WordPress/gutenberg/pull/43376))
+-   Components: Refactor Placeholder tests to @testing-library/react. ([43069](https://github.com/WordPress/gutenberg/pull/43069))
+-   Components: Refactor `Tooltip` tests to `@testing-library/react`. ([43061](https://github.com/WordPress/gutenberg/pull/43061))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @drzraf: taxonomy-controls.js: Change REST context to "view" when fetching taxonomy terms. ([43274](https://github.com/WordPress/gutenberg/pull/43274))
-- @markbiek: ComboboxControl: Normalize hyphen-like Unicode characters to ASCII hyphens when matching search queries. ([42942](https://github.com/WordPress/gutenberg/pull/42942))
-- @randhirexpresstech: Add font family and text-decoration typography supports to paragraph blocks. ([39642](https://github.com/WordPress/gutenberg/pull/39642))
-- @Rink9: Migrate wp editor meta box test to Playwright. ([41519](https://github.com/WordPress/gutenberg/pull/41519))
-- @titusdmoore: Add optional capture group to URL regex in wp-env. ([43200](https://github.com/WordPress/gutenberg/pull/43200))
+The following PRs were merged by first-time contributors:
 
+-   @drzraf: taxonomy-controls.js: Change REST context to "view" when fetching taxonomy terms. ([43274](https://github.com/WordPress/gutenberg/pull/43274))
+-   @markbiek: ComboboxControl: Normalize hyphen-like Unicode characters to ASCII hyphens when matching search queries. ([42942](https://github.com/WordPress/gutenberg/pull/42942))
+-   @randhirexpresstech: Add font family and text-decoration typography supports to paragraph blocks. ([39642](https://github.com/WordPress/gutenberg/pull/39642))
+-   @Rink9: Migrate wp editor meta box test to Playwright. ([41519](https://github.com/WordPress/gutenberg/pull/41519))
+-   @titusdmoore: Add optional capture group to URL regex in wp-env. ([43200](https://github.com/WordPress/gutenberg/pull/43200))
 
 ## Contributors
 
@@ -12501,7 +23803,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @afercia @andrewserong @aristath @awps @carolinan @ciampo @derekblank @dinhtungdu @dmsnell @draganescu @drzraf @ellatrix @geriux @glendaviesnz @gziolo @hellofromtonya @hz-tyfoon @jasmussen @jostnes @kdevnel @MaggieCabrera @Mamaduka @markbiek @matiasbenedetto @mcsf @mirka @ndiego @noahtallen @noisysocks @ntsekouras @oandregal @ockham @paulopmt1 @pbking @ramonjd @randhirexpresstech @Rink9 @ryanwelcher @scruffian @SiobhyB @Soean @t-hamano @talldan @tellthemachines @titusdmoore @torounit @tyxla @walbo
 
-
 = 13.9.0 =
 
 ## Changelog
@@ -12510,278 +23811,280 @@ The following contributors merged PRs in this release:
 
 #### Block Library
 
-- Archives: Add a control to make block's dropdown label invisible. ([43025](https://github.com/WordPress/gutenberg/pull/43025))
-- Media&Text: Add help to ImageSizeControl. ([40642](https://github.com/WordPress/gutenberg/pull/40642))
-- Navigation: Move overlay colors to the responsive wrapper. ([42875](https://github.com/WordPress/gutenberg/pull/42875))
-- Navigation: Extract navigation block utils. ([42865](https://github.com/WordPress/gutenberg/pull/42865))
-- Navigation: Fix link inheritance in overlay. ([42929](https://github.com/WordPress/gutenberg/pull/42929))
-- Post Author: Rendering html for the author description at the editor. ([42109](https://github.com/WordPress/gutenberg/pull/42109))
-- Post Featured Image: Add link target and rel attributes. ([42853](https://github.com/WordPress/gutenberg/pull/42853))
-- Post Title: Do not add `rel` attribute if empty. ([42855](https://github.com/WordPress/gutenberg/pull/42855))
-- Query Pagination: Correctly position the "next" link on the first page. ([42764](https://github.com/WordPress/gutenberg/pull/42764))
-- Query Title: Add a search title variation. ([42662](https://github.com/WordPress/gutenberg/pull/42662))
-- Quote: Unwrap on Backspace at start. ([42808](https://github.com/WordPress/gutenberg/pull/42808))
-- Search Block: Remove margins from the input. ([42959](https://github.com/WordPress/gutenberg/pull/42959))
-- Transforms: Add group unwrap. ([42685](https://github.com/WordPress/gutenberg/pull/42685))
-
-#### Components
-
-- BaseControl: Add `box-sizing` reset. ([42889](https://github.com/WordPress/gutenberg/pull/42889))
-- BorderControl: Add `box-sizing` reset. ([42754](https://github.com/WordPress/gutenberg/pull/42754))
-- BoxControl: Export `applyValueToSides` util function. ([42733](https://github.com/WordPress/gutenberg/pull/42733))
-- ComboboxControl and FormTokenField: Enhance components with custom render callback for options. ([42597](https://github.com/WordPress/gutenberg/pull/42597))
-- ComboboxControl: Add support for uncontrolled mode. ([42752](https://github.com/WordPress/gutenberg/pull/42752))
-- Flex: Convert component to TypeScript. ([42537](https://github.com/WordPress/gutenberg/pull/42537))
-- FontSizePicker: Add 40px size variant. ([42716](https://github.com/WordPress/gutenberg/pull/42716))
-- List View Expander: Fix icon in RTL mode. ([42997](https://github.com/WordPress/gutenberg/pull/42997))
-- Placeholder: Convert component to TypeScript. ([42990](https://github.com/WordPress/gutenberg/pull/42990))
-- Popover: Rewrite Storybook examples using controls. ([42903](https://github.com/WordPress/gutenberg/pull/42903))
-- Popover: Tidy up code, add more comments. ([42944](https://github.com/WordPress/gutenberg/pull/42944))
-- ResizableBox: Change tooltip background to match other tooltips. ([42800](https://github.com/WordPress/gutenberg/pull/42800))
-- Storybook: Add global CSS switcher. ([42747](https://github.com/WordPress/gutenberg/pull/42747))
-- StyleProvider: Convert component to TypeScript. ([42541](https://github.com/WordPress/gutenberg/pull/42541))
-- Swatch: Convert component to TypeScript. ([42162](https://github.com/WordPress/gutenberg/pull/42162))
-- Tooltip (Experimental), CustomSelectControl, TimePicker: add missing font sizes which were necessary in non-WordPress contexts. ([42844](https://github.com/WordPress/gutenberg/pull/42844))
-- Typography Panel: Fix font appearance control width. ([42795](https://github.com/WordPress/gutenberg/pull/42795))
-- UnitControl: Update unit dropdown design. ([42000](https://github.com/WordPress/gutenberg/pull/42000))
-- Update control labels to the new uppercase styles. ([42789](https://github.com/WordPress/gutenberg/pull/42789))
+-   Archives: Add a control to make block's dropdown label invisible. ([43025](https://github.com/WordPress/gutenberg/pull/43025))
+-   Media&Text: Add help to ImageSizeControl. ([40642](https://github.com/WordPress/gutenberg/pull/40642))
+-   Navigation: Move overlay colors to the responsive wrapper. ([42875](https://github.com/WordPress/gutenberg/pull/42875))
+-   Navigation: Extract navigation block utils. ([42865](https://github.com/WordPress/gutenberg/pull/42865))
+-   Navigation: Fix link inheritance in overlay. ([42929](https://github.com/WordPress/gutenberg/pull/42929))
+-   Post Author: Rendering html for the author description at the editor. ([42109](https://github.com/WordPress/gutenberg/pull/42109))
+-   Post Featured Image: Add link target and rel attributes. ([42853](https://github.com/WordPress/gutenberg/pull/42853))
+-   Post Title: Do not add `rel` attribute if empty. ([42855](https://github.com/WordPress/gutenberg/pull/42855))
+-   Query Pagination: Correctly position the "next" link on the first page. ([42764](https://github.com/WordPress/gutenberg/pull/42764))
+-   Query Title: Add a search title variation. ([42662](https://github.com/WordPress/gutenberg/pull/42662))
+-   Quote: Unwrap on Backspace at start. ([42808](https://github.com/WordPress/gutenberg/pull/42808))
+-   Search Block: Remove margins from the input. ([42959](https://github.com/WordPress/gutenberg/pull/42959))
+-   Transforms: Add group unwrap. ([42685](https://github.com/WordPress/gutenberg/pull/42685))
+
+#### Components
+
+-   BaseControl: Add `box-sizing` reset. ([42889](https://github.com/WordPress/gutenberg/pull/42889))
+-   BorderControl: Add `box-sizing` reset. ([42754](https://github.com/WordPress/gutenberg/pull/42754))
+-   BoxControl: Export `applyValueToSides` util function. ([42733](https://github.com/WordPress/gutenberg/pull/42733))
+-   ComboboxControl and FormTokenField: Enhance components with custom render callback for options. ([42597](https://github.com/WordPress/gutenberg/pull/42597))
+-   ComboboxControl: Add support for uncontrolled mode. ([42752](https://github.com/WordPress/gutenberg/pull/42752))
+-   Flex: Convert component to TypeScript. ([42537](https://github.com/WordPress/gutenberg/pull/42537))
+-   FontSizePicker: Add 40px size variant. ([42716](https://github.com/WordPress/gutenberg/pull/42716))
+-   List View Expander: Fix icon in RTL mode. ([42997](https://github.com/WordPress/gutenberg/pull/42997))
+-   Placeholder: Convert component to TypeScript. ([42990](https://github.com/WordPress/gutenberg/pull/42990))
+-   Popover: Rewrite Storybook examples using controls. ([42903](https://github.com/WordPress/gutenberg/pull/42903))
+-   Popover: Tidy up code, add more comments. ([42944](https://github.com/WordPress/gutenberg/pull/42944))
+-   ResizableBox: Change tooltip background to match other tooltips. ([42800](https://github.com/WordPress/gutenberg/pull/42800))
+-   Storybook: Add global CSS switcher. ([42747](https://github.com/WordPress/gutenberg/pull/42747))
+-   StyleProvider: Convert component to TypeScript. ([42541](https://github.com/WordPress/gutenberg/pull/42541))
+-   Swatch: Convert component to TypeScript. ([42162](https://github.com/WordPress/gutenberg/pull/42162))
+-   Tooltip (Experimental), CustomSelectControl, TimePicker: add missing font sizes which were necessary in non-WordPress contexts. ([42844](https://github.com/WordPress/gutenberg/pull/42844))
+-   Typography Panel: Fix font appearance control width. ([42795](https://github.com/WordPress/gutenberg/pull/42795))
+-   UnitControl: Update unit dropdown design. ([42000](https://github.com/WordPress/gutenberg/pull/42000))
+-   Update control labels to the new uppercase styles. ([42789](https://github.com/WordPress/gutenberg/pull/42789))
 
 #### Reusable Blocks
 
-- Make template part and reusable block creation language consistent. ([43032](https://github.com/WordPress/gutenberg/pull/43032))
+-   Make template part and reusable block creation language consistent. ([43032](https://github.com/WordPress/gutenberg/pull/43032))
 
 #### CSS & Styling
 
-- Rename solid color. ([42918](https://github.com/WordPress/gutenberg/pull/42918))
-- Tab style subpixel fix. ([42892](https://github.com/WordPress/gutenberg/pull/42892))
-- Navigation: Try to keep :Where just for paddings. ([42967](https://github.com/WordPress/gutenberg/pull/42967))
+-   Rename solid color. ([42918](https://github.com/WordPress/gutenberg/pull/42918))
+-   Tab style subpixel fix. ([42892](https://github.com/WordPress/gutenberg/pull/42892))
+-   Navigation: Try to keep :Where just for paddings. ([42967](https://github.com/WordPress/gutenberg/pull/42967))
 
 #### Global Styles
 
-- Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles. ([42544](https://github.com/WordPress/gutenberg/pull/42544))
-- Enable alpha (opacity) in Global Styles color pickers. ([43045](https://github.com/WordPress/gutenberg/pull/43045))
-- Add block spacing to root block support UI. ([42797](https://github.com/WordPress/gutenberg/pull/42797))
-- Elements: Update the load order of the CSS in the Site Editor. ([42863](https://github.com/WordPress/gutenberg/pull/42863))
-- Heading element UI controls. ([42176](https://github.com/WordPress/gutenberg/pull/42176))
-- Theme JSON: Add a static $blocks\_metadata data definition to the Gutenberg instance of WP\_Theme\_JSON. ([42776](https://github.com/WordPress/gutenberg/pull/42776))
-- Upsize typography panel components. ([42718](https://github.com/WordPress/gutenberg/pull/42718))
+-   Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles. ([42544](https://github.com/WordPress/gutenberg/pull/42544))
+-   Enable alpha (opacity) in Global Styles color pickers. ([43045](https://github.com/WordPress/gutenberg/pull/43045))
+-   Add block spacing to root block support UI. ([42797](https://github.com/WordPress/gutenberg/pull/42797))
+-   Elements: Update the load order of the CSS in the Site Editor. ([42863](https://github.com/WordPress/gutenberg/pull/42863))
+-   Heading element UI controls. ([42176](https://github.com/WordPress/gutenberg/pull/42176))
+-   Theme JSON: Add a static $blocks_metadata data definition to the Gutenberg instance of WP_Theme_JSON. ([42776](https://github.com/WordPress/gutenberg/pull/42776))
+-   Upsize typography panel components. ([42718](https://github.com/WordPress/gutenberg/pull/42718))
 
 #### Design Tools
 
-- Cover: Show Resize Tooltip on Drag. ([23522](https://github.com/WordPress/gutenberg/pull/23522))
-- Update color button style. ([41838](https://github.com/WordPress/gutenberg/pull/41838))
-- Add explicit bypass for fluid font size calculation. ([42757](https://github.com/WordPress/gutenberg/pull/42757))
+-   Cover: Show Resize Tooltip on Drag. ([23522](https://github.com/WordPress/gutenberg/pull/23522))
+-   Update color button style. ([41838](https://github.com/WordPress/gutenberg/pull/41838))
+-   Add explicit bypass for fluid font size calculation. ([42757](https://github.com/WordPress/gutenberg/pull/42757))
 
 #### Post Editor
 
-- Post Template: Update template title selector. ([42091](https://github.com/WordPress/gutenberg/pull/42091))
+-   Post Template: Update template title selector. ([42091](https://github.com/WordPress/gutenberg/pull/42091))
 
 #### Site Editor
 
-- Add author nicename template creation ability. ([42165](https://github.com/WordPress/gutenberg/pull/42165))
-- Add fallback template content on creation. ([42520](https://github.com/WordPress/gutenberg/pull/42520))
-- Add a 'View Site' link in the site editor. ([42331](https://github.com/WordPress/gutenberg/pull/42331))
-- Update `clear customizations` copy for templates. ([41765](https://github.com/WordPress/gutenberg/pull/41765))
+-   Add author nicename template creation ability. ([42165](https://github.com/WordPress/gutenberg/pull/42165))
+-   Add fallback template content on creation. ([42520](https://github.com/WordPress/gutenberg/pull/42520))
+-   Add a 'View Site' link in the site editor. ([42331](https://github.com/WordPress/gutenberg/pull/42331))
+-   Update `clear customizations` copy for templates. ([41765](https://github.com/WordPress/gutenberg/pull/41765))
 
 #### Widgets Editor
 
-- Format Library: Add missing keyboard shortcut description in customizer widget. ([43044](https://github.com/WordPress/gutenberg/pull/43044))
+-   Format Library: Add missing keyboard shortcut description in customizer widget. ([43044](https://github.com/WordPress/gutenberg/pull/43044))
 
 #### Block Editor
 
-- Rich text: Add character shortcuts for wrapping selection. ([42469](https://github.com/WordPress/gutenberg/pull/42469))
+-   Rich text: Add character shortcuts for wrapping selection. ([42469](https://github.com/WordPress/gutenberg/pull/42469))
 
 #### Block Directory
 
-- Modernize `DownloadableBlockListItem` tests. ([43026](https://github.com/WordPress/gutenberg/pull/43026))
+-   Modernize `DownloadableBlockListItem` tests. ([43026](https://github.com/WordPress/gutenberg/pull/43026))
 
 ### Bug Fixes
 
 #### Accessibility
 
-- Fix issue where changing the id of the recursion provider can result in focus loss. ([42916](https://github.com/WordPress/gutenberg/pull/42916))
-- Site Editor: Don't disable the Save button. ([42842](https://github.com/WordPress/gutenberg/pull/42842))
+-   Fix issue where changing the id of the recursion provider can result in focus loss. ([42916](https://github.com/WordPress/gutenberg/pull/42916))
+-   Site Editor: Don't disable the Save button. ([42842](https://github.com/WordPress/gutenberg/pull/42842))
 
 #### Components
 
-- Block Styles: Truncate long button labels. ([42975](https://github.com/WordPress/gutenberg/pull/42975))
-- ColorGradientControl: Fix awkward padding in popover. ([43018](https://github.com/WordPress/gutenberg/pull/43018))
-- ColorPicker: Fix layout overflow. ([42992](https://github.com/WordPress/gutenberg/pull/42992))
-- External link component: Add a check for on page anchor links. ([42259](https://github.com/WordPress/gutenberg/pull/42259))
-- Icons: Fix storybook library icon names. ([43034](https://github.com/WordPress/gutenberg/pull/43034))
-- InputControl: Fix acceptance of falsy values in controlled updates. ([42484](https://github.com/WordPress/gutenberg/pull/42484))
-- InputControl: Fix incorrect size prop passing to `Text`. ([42793](https://github.com/WordPress/gutenberg/pull/42793))
-- Popover: Anchor correctly to parent node when no explicit anchor is passed. ([42971](https://github.com/WordPress/gutenberg/pull/42971))
-- Popover: Fix arrow placement and design. ([42874](https://github.com/WordPress/gutenberg/pull/42874))
-- Popover: Improve iframe offset computation. ([42417](https://github.com/WordPress/gutenberg/pull/42417))
-- Popover: Make sure that ownerDocument is always defined. ([42886](https://github.com/WordPress/gutenberg/pull/42886))
-
-#### Block Library
-
-- Disabled blocks passed to BlockTypesList are no longer draggable. ([42751](https://github.com/WordPress/gutenberg/pull/42751))
-- Fix drag and drop performance when dragging over the insertion point. ([42806](https://github.com/WordPress/gutenberg/pull/42806))
-- LatestPost: Fix issue with floated featured images overflowing focus style. ([40663](https://github.com/WordPress/gutenberg/pull/40663))
-- List v2: Fix Cmd+A. ([42858](https://github.com/WordPress/gutenberg/pull/42858))
-- Media&Text: Round position attribute on focal point save. ([33915](https://github.com/WordPress/gutenberg/pull/33915))
-- Navigation: Fix `current-menu-item` class logic. ([42849](https://github.com/WordPress/gutenberg/pull/42849))
-- Navigation: Fix invalid permissions warning by avoiding using trashed wp\_navigation posts (JS implementation). ([42982](https://github.com/WordPress/gutenberg/pull/42982))
-- Separator: Fix the block CSS classes in the editor. ([42769](https://github.com/WordPress/gutenberg/pull/42769))
-- Social Link: add missing 'width' and 'height' attributes. ([41373](https://github.com/WordPress/gutenberg/pull/41373))
-- Social: Include has-visible-labels on edit component. ([42791](https://github.com/WordPress/gutenberg/pull/42791))
-- Tag Cloud: Fix alignment issue when align center. ([43017](https://github.com/WordPress/gutenberg/pull/43017))
-- Writing flow: Fix Shift+Arrow partial selection for lists & quote. ([42885](https://github.com/WordPress/gutenberg/pull/42885))
+-   Block Styles: Truncate long button labels. ([42975](https://github.com/WordPress/gutenberg/pull/42975))
+-   ColorGradientControl: Fix awkward padding in popover. ([43018](https://github.com/WordPress/gutenberg/pull/43018))
+-   ColorPicker: Fix layout overflow. ([42992](https://github.com/WordPress/gutenberg/pull/42992))
+-   External link component: Add a check for on page anchor links. ([42259](https://github.com/WordPress/gutenberg/pull/42259))
+-   Icons: Fix storybook library icon names. ([43034](https://github.com/WordPress/gutenberg/pull/43034))
+-   InputControl: Fix acceptance of falsy values in controlled updates. ([42484](https://github.com/WordPress/gutenberg/pull/42484))
+-   InputControl: Fix incorrect size prop passing to `Text`. ([42793](https://github.com/WordPress/gutenberg/pull/42793))
+-   Popover: Anchor correctly to parent node when no explicit anchor is passed. ([42971](https://github.com/WordPress/gutenberg/pull/42971))
+-   Popover: Fix arrow placement and design. ([42874](https://github.com/WordPress/gutenberg/pull/42874))
+-   Popover: Improve iframe offset computation. ([42417](https://github.com/WordPress/gutenberg/pull/42417))
+-   Popover: Make sure that ownerDocument is always defined. ([42886](https://github.com/WordPress/gutenberg/pull/42886))
+
+#### Block Library
+
+-   Disabled blocks passed to BlockTypesList are no longer draggable. ([42751](https://github.com/WordPress/gutenberg/pull/42751))
+-   Fix drag and drop performance when dragging over the insertion point. ([42806](https://github.com/WordPress/gutenberg/pull/42806))
+-   LatestPost: Fix issue with floated featured images overflowing focus style. ([40663](https://github.com/WordPress/gutenberg/pull/40663))
+-   List v2: Fix Cmd+A. ([42858](https://github.com/WordPress/gutenberg/pull/42858))
+-   Media&Text: Round position attribute on focal point save. ([33915](https://github.com/WordPress/gutenberg/pull/33915))
+-   Navigation: Fix `current-menu-item` class logic. ([42849](https://github.com/WordPress/gutenberg/pull/42849))
+-   Navigation: Fix invalid permissions warning by avoiding using trashed wp_navigation posts (JS implementation). ([42982](https://github.com/WordPress/gutenberg/pull/42982))
+-   Separator: Fix the block CSS classes in the editor. ([42769](https://github.com/WordPress/gutenberg/pull/42769))
+-   Social Link: add missing 'width' and 'height' attributes. ([41373](https://github.com/WordPress/gutenberg/pull/41373))
+-   Social: Include has-visible-labels on edit component. ([42791](https://github.com/WordPress/gutenberg/pull/42791))
+-   Tag Cloud: Fix alignment issue when align center. ([43017](https://github.com/WordPress/gutenberg/pull/43017))
+-   Writing flow: Fix Shift+Arrow partial selection for lists & quote. ([42885](https://github.com/WordPress/gutenberg/pull/42885))
 
 #### CSS & Styling
 
-- Layout: Fix flex direction column. ([42939](https://github.com/WordPress/gutenberg/pull/42939))
-- Layout: Merge CSS rule for block gap. ([43052](https://github.com/WordPress/gutenberg/pull/43052))
-- Style Engine: Include 6.1 CSS filter, ensure style engine can output CSS functions like clamp. ([43004](https://github.com/WordPress/gutenberg/pull/43004))
-- Style engine: Disable stylesheet optimization temporarily. ([43051](https://github.com/WordPress/gutenberg/pull/43051))
-- Style Engine: Defensive guarding for when style does not define 'individual' property. ([43122](https://github.com/WordPress/gutenberg/pull/43122))
+-   Layout: Fix flex direction column. ([42939](https://github.com/WordPress/gutenberg/pull/42939))
+-   Layout: Merge CSS rule for block gap. ([43052](https://github.com/WordPress/gutenberg/pull/43052))
+-   Style Engine: Include 6.1 CSS filter, ensure style engine can output CSS functions like clamp. ([43004](https://github.com/WordPress/gutenberg/pull/43004))
+-   Style engine: Disable stylesheet optimization temporarily. ([43051](https://github.com/WordPress/gutenberg/pull/43051))
+-   Style Engine: Defensive guarding for when style does not define 'individual' property. ([43122](https://github.com/WordPress/gutenberg/pull/43122))
 
 #### Global Styles
 
-- Fix styles declarations returning before all properties output. ([42954](https://github.com/WordPress/gutenberg/pull/42954))
-- Fluid typography: Migrate fluid typography algorithm to JS for site editor. ([42688](https://github.com/WordPress/gutenberg/pull/42688))
-- Spacing presets: Prevent % spacing size units being stripped by sanitize\_title. ([43101](https://github.com/WordPress/gutenberg/pull/43101))
-- Specify priority in remove\_action. ([43073](https://github.com/WordPress/gutenberg/pull/43073))
+-   Fix styles declarations returning before all properties output. ([42954](https://github.com/WordPress/gutenberg/pull/42954))
+-   Fluid typography: Migrate fluid typography algorithm to JS for site editor. ([42688](https://github.com/WordPress/gutenberg/pull/42688))
+-   Spacing presets: Prevent % spacing size units being stripped by sanitize_title. ([43101](https://github.com/WordPress/gutenberg/pull/43101))
+-   Specify priority in remove_action. ([43073](https://github.com/WordPress/gutenberg/pull/43073))
 
 #### Block Editor
 
-- Inserter: Avoid warning when CRA is displayed. ([42723](https://github.com/WordPress/gutenberg/pull/42723))
-- Pasting: Dismiss pasted image if file:// schema detected. ([42785](https://github.com/WordPress/gutenberg/pull/42785))
-- Prevent multiselection via dragging when already dragging blocks. ([42877](https://github.com/WordPress/gutenberg/pull/42877))
-- Quote: Fix raw transform handler. ([43093](https://github.com/WordPress/gutenberg/pull/43093))
-- Rich text: Fix error when attempting to remove placeholder on composition start. ([42821](https://github.com/WordPress/gutenberg/pull/42821))
-- Paste from Slack: Interpret paragraph markup. ([43114](https://github.com/WordPress/gutenberg/pull/43114))
+-   Inserter: Avoid warning when CRA is displayed. ([42723](https://github.com/WordPress/gutenberg/pull/42723))
+-   Pasting: Dismiss pasted image if file:// schema detected. ([42785](https://github.com/WordPress/gutenberg/pull/42785))
+-   Prevent multiselection via dragging when already dragging blocks. ([42877](https://github.com/WordPress/gutenberg/pull/42877))
+-   Quote: Fix raw transform handler. ([43093](https://github.com/WordPress/gutenberg/pull/43093))
+-   Rich text: Fix error when attempting to remove placeholder on composition start. ([42821](https://github.com/WordPress/gutenberg/pull/42821))
+-   Paste from Slack: Interpret paragraph markup. ([43114](https://github.com/WordPress/gutenberg/pull/43114))
 
 #### Post Editor
 
-- Decode the post URL for the button label. ([42930](https://github.com/WordPress/gutenberg/pull/42930))
+-   Decode the post URL for the button label. ([42930](https://github.com/WordPress/gutenberg/pull/42930))
 
 #### Site Editor
 
-- Internalization fixes for site editor template creation. ([42762](https://github.com/WordPress/gutenberg/pull/42762))
-- Fix error in compileStyleValue. ([43116](https://github.com/WordPress/gutenberg/pull/43116))
+-   Internalization fixes for site editor template creation. ([42762](https://github.com/WordPress/gutenberg/pull/42762))
+-   Fix error in compileStyleValue. ([43116](https://github.com/WordPress/gutenberg/pull/43116))
 
 #### RichText
 
-- Firefox: Fix issue where it selects a nearby contentEditable. ([42777](https://github.com/WordPress/gutenberg/pull/42777))
+-   Firefox: Fix issue where it selects a nearby contentEditable. ([42777](https://github.com/WordPress/gutenberg/pull/42777))
 
 #### Build Tooling
 
-- Fix: CSS files don't build in dev mode on Windows. ([42041](https://github.com/WordPress/gutenberg/pull/42041))
-- Fix: Script name error in main package.json. ([43089](https://github.com/WordPress/gutenberg/pull/43089))
+-   Fix: CSS files don't build in dev mode on Windows. ([42041](https://github.com/WordPress/gutenberg/pull/42041))
+-   Fix: Script name error in main package.json. ([43089](https://github.com/WordPress/gutenberg/pull/43089))
 
 #### Testing
 
-- Fix: Just another end-to-end test. ([42947](https://github.com/WordPress/gutenberg/pull/42947))
+-   Fix: Just another end-to-end test. ([42947](https://github.com/WordPress/gutenberg/pull/42947))
 
 #### CreateBlock
 
-- Remove i18n references from save properties. ([43035](https://github.com/WordPress/gutenberg/pull/43035))
+-   Remove i18n references from save properties. ([43035](https://github.com/WordPress/gutenberg/pull/43035))
 
 ### Accessibility
 
-- Shortcuts: Add Ctrl+Y for redo on Windows. ([42627](https://github.com/WordPress/gutenberg/pull/42627))
-- Change shortcut text for redo tooltip on Windows. ([42830](https://github.com/WordPress/gutenberg/pull/42830))
+-   Shortcuts: Add Ctrl+Y for redo on Windows. ([42627](https://github.com/WordPress/gutenberg/pull/42627))
+-   Change shortcut text for redo tooltip on Windows. ([42830](https://github.com/WordPress/gutenberg/pull/42830))
 
 ### Performance
 
-- Lodash: Refactor away from `_.isMatch()`. ([42271](https://github.com/WordPress/gutenberg/pull/42271))
-- Lodash: Refactor away from `_.zip()`. ([42926](https://github.com/WordPress/gutenberg/pull/42926))
-- Lodash: Refactor away from `_.delay()`. ([42966](https://github.com/WordPress/gutenberg/pull/42966))
-- Lodash: Refactor away from `_.startsWith()`. ([43019](https://github.com/WordPress/gutenberg/pull/43019))
-- Lodash: Refactor away from `_.isPlainObject()`. ([42508](https://github.com/WordPress/gutenberg/pull/42508))
-- Lodash: Refactor away from `_.maxBy()`. ([42914](https://github.com/WordPress/gutenberg/pull/42914))
-- Lodash: Refactor Calendar block away from `moment`. ([43029](https://github.com/WordPress/gutenberg/pull/43029))
-- Lodash: Remove completely from `@wordpress/dom` package. ([42912](https://github.com/WordPress/gutenberg/pull/42912))
-- Lodash: Remove completely from `@wordpress/element` package. ([42898](https://github.com/WordPress/gutenberg/pull/42898))
+-   Lodash: Refactor away from `_.isMatch()`. ([42271](https://github.com/WordPress/gutenberg/pull/42271))
+-   Lodash: Refactor away from `_.zip()`. ([42926](https://github.com/WordPress/gutenberg/pull/42926))
+-   Lodash: Refactor away from `_.delay()`. ([42966](https://github.com/WordPress/gutenberg/pull/42966))
+-   Lodash: Refactor away from `_.startsWith()`. ([43019](https://github.com/WordPress/gutenberg/pull/43019))
+-   Lodash: Refactor away from `_.isPlainObject()`. ([42508](https://github.com/WordPress/gutenberg/pull/42508))
+-   Lodash: Refactor away from `_.maxBy()`. ([42914](https://github.com/WordPress/gutenberg/pull/42914))
+-   Lodash: Refactor Calendar block away from `moment`. ([43029](https://github.com/WordPress/gutenberg/pull/43029))
+-   Lodash: Remove completely from `@wordpress/dom` package. ([42912](https://github.com/WordPress/gutenberg/pull/42912))
+-   Lodash: Remove completely from `@wordpress/element` package. ([42898](https://github.com/WordPress/gutenberg/pull/42898))
 
 ### Experiments
 
 #### Style Engine
-- Enqueue block support styles. ([42452](https://github.com/WordPress/gutenberg/pull/42452)) ([42880](https://github.com/WordPress/gutenberg/pull/42880))
-- Prettify combined selectors. ([43003](https://github.com/WordPress/gutenberg/pull/43003))
-- Prettify output. ([42909](https://github.com/WordPress/gutenberg/pull/42909))
-- Rename global function. ([42719](https://github.com/WordPress/gutenberg/pull/42719))
-- Combine style-engine stores for block-supports. ([42970](https://github.com/WordPress/gutenberg/pull/42970))
-- Add optimize flag and combine functions into wp\_style\_engine\_get\_stylesheet. ([42878](https://github.com/WordPress/gutenberg/pull/42878))
+
+-   Enqueue block support styles. ([42452](https://github.com/WordPress/gutenberg/pull/42452)) ([42880](https://github.com/WordPress/gutenberg/pull/42880))
+-   Prettify combined selectors. ([43003](https://github.com/WordPress/gutenberg/pull/43003))
+-   Prettify output. ([42909](https://github.com/WordPress/gutenberg/pull/42909))
+-   Rename global function. ([42719](https://github.com/WordPress/gutenberg/pull/42719))
+-   Combine style-engine stores for block-supports. ([42970](https://github.com/WordPress/gutenberg/pull/42970))
+-   Add optimize flag and combine functions into wp_style_engine_get_stylesheet. ([42878](https://github.com/WordPress/gutenberg/pull/42878))
 
 ### Documentation
 
-- Add examples for `core/blocks` actions. ([42637](https://github.com/WordPress/gutenberg/pull/42637))
-- Add examples for core/viewport package. ([42921](https://github.com/WordPress/gutenberg/pull/42921))
-- Added the allowedFormat details in richtext readme. ([42426](https://github.com/WordPress/gutenberg/pull/42426))
-- Adding `@example` entries to the public API exposed in `core/blocks`. ([42745](https://github.com/WordPress/gutenberg/pull/42745))
-- Cover: Fix rendered content PHPDoc type. ([43099](https://github.com/WordPress/gutenberg/pull/43099))
-- Create Block: Update document links in templates. ([42839](https://github.com/WordPress/gutenberg/pull/42839))
-- Fix return type of home link attribute function. ([42901](https://github.com/WordPress/gutenberg/pull/42901))
-- Fix textual consistency about block attributes. ([43075](https://github.com/WordPress/gutenberg/pull/43075))
-- Link plugins GitHub release pages. ([42736](https://github.com/WordPress/gutenberg/pull/42736))
-- Document the cherry-picking automation. ([42932](https://github.com/WordPress/gutenberg/pull/42932))
-- Fixed broken external link to Mozilla Developer documentation. ([43065](https://github.com/WordPress/gutenberg/pull/43065))
-- Release Docs: Troubleshooting failed "Bump version" job. ([42936](https://github.com/WordPress/gutenberg/pull/42936))
-- Release docs: Update performance test instructions. ([43015](https://github.com/WordPress/gutenberg/pull/43015))
-- Remove the emoji characters to fix the handbook rendering. ([43028](https://github.com/WordPress/gutenberg/pull/43028))
-- Update broken internal link. ([43094](https://github.com/WordPress/gutenberg/pull/43094))
-- Update theme-json.md to include new element support and :Ref. ([42412](https://github.com/WordPress/gutenberg/pull/42412))
-- Gutenberg Data Tutorial: Adjust the image URLs and whitespace to render correctly in the Handbook. ([42969](https://github.com/WordPress/gutenberg/pull/42969))
+-   Add examples for `core/blocks` actions. ([42637](https://github.com/WordPress/gutenberg/pull/42637))
+-   Add examples for core/viewport package. ([42921](https://github.com/WordPress/gutenberg/pull/42921))
+-   Added the allowedFormat details in richtext readme. ([42426](https://github.com/WordPress/gutenberg/pull/42426))
+-   Adding `@example` entries to the public API exposed in `core/blocks`. ([42745](https://github.com/WordPress/gutenberg/pull/42745))
+-   Cover: Fix rendered content PHPDoc type. ([43099](https://github.com/WordPress/gutenberg/pull/43099))
+-   Create Block: Update document links in templates. ([42839](https://github.com/WordPress/gutenberg/pull/42839))
+-   Fix return type of home link attribute function. ([42901](https://github.com/WordPress/gutenberg/pull/42901))
+-   Fix textual consistency about block attributes. ([43075](https://github.com/WordPress/gutenberg/pull/43075))
+-   Link plugins GitHub release pages. ([42736](https://github.com/WordPress/gutenberg/pull/42736))
+-   Document the cherry-picking automation. ([42932](https://github.com/WordPress/gutenberg/pull/42932))
+-   Fixed broken external link to Mozilla Developer documentation. ([43065](https://github.com/WordPress/gutenberg/pull/43065))
+-   Release Docs: Troubleshooting failed "Bump version" job. ([42936](https://github.com/WordPress/gutenberg/pull/42936))
+-   Release docs: Update performance test instructions. ([43015](https://github.com/WordPress/gutenberg/pull/43015))
+-   Remove the emoji characters to fix the handbook rendering. ([43028](https://github.com/WordPress/gutenberg/pull/43028))
+-   Update broken internal link. ([43094](https://github.com/WordPress/gutenberg/pull/43094))
+-   Update theme-json.md to include new element support and :Ref. ([42412](https://github.com/WordPress/gutenberg/pull/42412))
+-   Gutenberg Data Tutorial: Adjust the image URLs and whitespace to render correctly in the Handbook. ([42969](https://github.com/WordPress/gutenberg/pull/42969))
 
 ### Code Quality
 
-- Add mutations data and helper functions to useEntityRecord. ([39595](https://github.com/WordPress/gutenberg/pull/39595))
-- Remove old WordPress 5.8 code. ([42818](https://github.com/WordPress/gutenberg/pull/42818))
+-   Add mutations data and helper functions to useEntityRecord. ([39595](https://github.com/WordPress/gutenberg/pull/39595))
+-   Remove old WordPress 5.8 code. ([42818](https://github.com/WordPress/gutenberg/pull/42818))
 
 #### Block Library
 
-- Add separate callbacks for selecting a classic or navigation menu in the nav block. ([43057](https://github.com/WordPress/gutenberg/pull/43057))
-- Avoid reliance on status constants when consuming useCreateNavigationMenu hook. ([42704](https://github.com/WordPress/gutenberg/pull/42704))
-- Home Link: Use 'sprintf' in the render callback. ([43024](https://github.com/WordPress/gutenberg/pull/43024))
-- Nav block: Extract hook for inner blocks. ([42743](https://github.com/WordPress/gutenberg/pull/42743))
-- Nav block: Normalize to function expressions. ([42744](https://github.com/WordPress/gutenberg/pull/42744))
-- Normalize usage of Notifications in Nav block. ([42706](https://github.com/WordPress/gutenberg/pull/42706))
-- Remove duplicate speak calls from navigation block. ([43079](https://github.com/WordPress/gutenberg/pull/43079))
-- Site Title: Use home\_url instead of get\_bloginfo. ([42857](https://github.com/WordPress/gutenberg/pull/42857))
-- Page List: Fix indentation in PHP file. ([42852](https://github.com/WordPress/gutenberg/pull/42852))
-- Query Loop: Try filters with ToolsPanel. ([42629](https://github.com/WordPress/gutenberg/pull/42629))
+-   Add separate callbacks for selecting a classic or navigation menu in the nav block. ([43057](https://github.com/WordPress/gutenberg/pull/43057))
+-   Avoid reliance on status constants when consuming useCreateNavigationMenu hook. ([42704](https://github.com/WordPress/gutenberg/pull/42704))
+-   Home Link: Use 'sprintf' in the render callback. ([43024](https://github.com/WordPress/gutenberg/pull/43024))
+-   Nav block: Extract hook for inner blocks. ([42743](https://github.com/WordPress/gutenberg/pull/42743))
+-   Nav block: Normalize to function expressions. ([42744](https://github.com/WordPress/gutenberg/pull/42744))
+-   Normalize usage of Notifications in Nav block. ([42706](https://github.com/WordPress/gutenberg/pull/42706))
+-   Remove duplicate speak calls from navigation block. ([43079](https://github.com/WordPress/gutenberg/pull/43079))
+-   Site Title: Use home_url instead of get_bloginfo. ([42857](https://github.com/WordPress/gutenberg/pull/42857))
+-   Page List: Fix indentation in PHP file. ([42852](https://github.com/WordPress/gutenberg/pull/42852))
+-   Query Loop: Try filters with ToolsPanel. ([42629](https://github.com/WordPress/gutenberg/pull/42629))
 
 #### Site Editor
 
-- Navigation Menu Sidebar: Remove unnecessary Fragment. ([43021](https://github.com/WordPress/gutenberg/pull/43021))
+-   Navigation Menu Sidebar: Remove unnecessary Fragment. ([43021](https://github.com/WordPress/gutenberg/pull/43021))
 
 #### Style Engine
 
-- Tweak Declarations filtering logic slightly. ([43215](https://github.com/WordPress/gutenberg/pull/43215))
-- Minor tweaks. ([43111](https://github.com/WordPress/gutenberg/pull/43111))
+-   Tweak Declarations filtering logic slightly. ([43215](https://github.com/WordPress/gutenberg/pull/43215))
+-   Minor tweaks. ([43111](https://github.com/WordPress/gutenberg/pull/43111))
 
 #### Global Styles
 
-- useGlobalStylesOutput: Use memo for derived values. ([42917](https://github.com/WordPress/gutenberg/pull/42917))
+-   useGlobalStylesOutput: Use memo for derived values. ([42917](https://github.com/WordPress/gutenberg/pull/42917))
 
 ### Tools
 
 #### Env
 
-- Use git for `wp-env`'s default WordPress version. ([42826](https://github.com/WordPress/gutenberg/pull/42826))
+-   Use git for `wp-env`'s default WordPress version. ([42826](https://github.com/WordPress/gutenberg/pull/42826))
 
 #### Testing
 
-- Migrate deprecated node matcher tests to playwright. ([42759](https://github.com/WordPress/gutenberg/pull/42759))
-- Migrate group block tests to Playwright. ([42801](https://github.com/WordPress/gutenberg/pull/42801))
-- Migrate missing block tests to Playwright. ([41680](https://github.com/WordPress/gutenberg/pull/41680))
-- Migrate Convert Block Type test to Playwright. ([42760](https://github.com/WordPress/gutenberg/pull/42760))
+-   Migrate deprecated node matcher tests to playwright. ([42759](https://github.com/WordPress/gutenberg/pull/42759))
+-   Migrate group block tests to Playwright. ([42801](https://github.com/WordPress/gutenberg/pull/42801))
+-   Migrate missing block tests to Playwright. ([41680](https://github.com/WordPress/gutenberg/pull/41680))
+-   Migrate Convert Block Type test to Playwright. ([42760](https://github.com/WordPress/gutenberg/pull/42760))
 
 #### Build Tooling
 
-- Lodash: Refactor away from `_.flatMap()`. ([42360](https://github.com/WordPress/gutenberg/pull/42360))
-- Standardize script naming in main package.json. ([42368](https://github.com/WordPress/gutenberg/pull/42368))
+-   Lodash: Refactor away from `_.flatMap()`. ([42360](https://github.com/WordPress/gutenberg/pull/42360))
+-   Standardize script naming in main package.json. ([42368](https://github.com/WordPress/gutenberg/pull/42368))
 
-## First time contributors
-- @fellyph: Rendering html for the author description at the editor. ([42109](https://github.com/WordPress/gutenberg/pull/42109))
-- @merkys7: Fix social-link block missing 'width' and 'height' attributes. ([41373](https://github.com/WordPress/gutenberg/pull/41373))
-- @Smit2808: Added the allowedFormat details in richtext readme. ([42426](https://github.com/WordPress/gutenberg/pull/42426))
-- @theminaldiwan: Fixed alignment issue of tagcloud block when align center. ([43017](https://github.com/WordPress/gutenberg/pull/43017))
+## First-time contributors
+
+-   @fellyph: Rendering html for the author description at the editor. ([42109](https://github.com/WordPress/gutenberg/pull/42109))
+-   @merkys7: Fix social-link block missing 'width' and 'height' attributes. ([41373](https://github.com/WordPress/gutenberg/pull/41373))
+-   @Smit2808: Added the allowedFormat details in richtext readme. ([42426](https://github.com/WordPress/gutenberg/pull/42426))
+-   @theminaldiwan: Fixed alignment issue of tagcloud block when align center. ([43017](https://github.com/WordPress/gutenberg/pull/43017))
 
 ## Contributors
 
@@ -12789,244 +24092,267 @@ The following contributors merged PRs in this release: @aaronrobertshaw @adamzie
 
 = 13.8.2 =
 
+## Changelog
+
+### Enhancements
 
+-   Allow removing CSS declarations from the WP_Style_Engine_CSS_Declarations object. ([42428](https://github.com/WordPress/gutenberg/pull/42428))
+-   Equalize modal content padding. ([42370](https://github.com/WordPress/gutenberg/pull/42370))
+-   Remove top margin on the first paragraph in a modal. ([42369](https://github.com/WordPress/gutenberg/pull/42369))
 
-## Changelog
+#### Components
 
+-   BorderControl: Render border color/style dropdown as UnitControl prefix. ([42212](https://github.com/WordPress/gutenberg/pull/42212))
+-   ColorPicker: Cleanly implement large size. ([42002](https://github.com/WordPress/gutenberg/pull/42002))
+-   ComboboxControl: Refactor `onKeyDown` to use `keyboardEvent.code`. ([42569](https://github.com/WordPress/gutenberg/pull/42569))
+-   Elevation: Convert component to TypeScript. ([42302](https://github.com/WordPress/gutenberg/pull/42302))
+-   InputControl: Decrease large default padding if has prefix/suffix. ([42166](https://github.com/WordPress/gutenberg/pull/42166))
+-   ScrollLock: Covert component to TypeScript. ([42303](https://github.com/WordPress/gutenberg/pull/42303))
+-   SelectControl: Add flag for larger default size. ([42456](https://github.com/WordPress/gutenberg/pull/42456))
+-   Shortcut: Covert component to TypeScript. ([42272](https://github.com/WordPress/gutenberg/pull/42272))
+-   Divider: Complete TypeScript migration of component. ([41991](https://github.com/WordPress/gutenberg/pull/41991))
+-   ToggleGroupControl: Add size variants. ([42008](https://github.com/WordPress/gutenberg/pull/42008))
+-   UnitControl: Update unit select's focus styles. ([42383](https://github.com/WordPress/gutenberg/pull/42383))
+-   BorderControl: Add missing changelog for accessibility enhancements. ([42411](https://github.com/WordPress/gutenberg/pull/42411))
+-   CustomSelectControl: Use styles from SelectControl. ([42460](https://github.com/WordPress/gutenberg/pull/42460))
+-   Dropdown: Add wrapper for custom padding. ([42595](https://github.com/WordPress/gutenberg/pull/42595))
+-   InputControl: Add padding wrapper for prefix/suffix. ([42378](https://github.com/WordPress/gutenberg/pull/42378))
+-   ScrollLock: Improve Storybook story for documentation view. ([42344](https://github.com/WordPress/gutenberg/pull/42344))
+-   `ColorPalette`: Display checkered preview background when `value` is transparent. ([42232](https://github.com/WordPress/gutenberg/pull/42232))
+
+#### Block Library
+
+-   Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
+-   Template Part: Swap block action places. ([42221](https://github.com/WordPress/gutenberg/pull/42221))
+-   Template Parts: Add search to replacement modal. ([42459](https://github.com/WordPress/gutenberg/pull/42459))
+-   Image: Add border block support for color, width, and style. ([31366](https://github.com/WordPress/gutenberg/pull/31366))
+-   List v2: Remove quote transforms as removed by Quote v2. ([42700](https://github.com/WordPress/gutenberg/pull/42700))
+-   Merge Comments and Post Comments blocks. ([41807](https://github.com/WordPress/gutenberg/pull/41807))
+-   Theme.json: Add support for heading / caption elements in theme.json schema. ([42433](https://github.com/WordPress/gutenberg/pull/42433))
 
-### Enhancements
+#### Global Styles
 
-- Allow removing CSS declarations from the WP_Style_Engine_CSS_Declarations object. ([42428](https://github.com/WordPress/gutenberg/pull/42428))
-- Equalize modal content padding. ([42370](https://github.com/WordPress/gutenberg/pull/42370))
-- Remove top margin on the first paragraph in a modal. ([42369](https://github.com/WordPress/gutenberg/pull/42369))
-
-#### Components
-- BorderControl: Render border color/style dropdown as UnitControl prefix. ([42212](https://github.com/WordPress/gutenberg/pull/42212))
-- ColorPicker: Cleanly implement large size. ([42002](https://github.com/WordPress/gutenberg/pull/42002))
-- ComboboxControl: Refactor `onKeyDown` to use `keyboardEvent.code`. ([42569](https://github.com/WordPress/gutenberg/pull/42569))
-- Elevation: Convert component to TypeScript. ([42302](https://github.com/WordPress/gutenberg/pull/42302))
-- InputControl: Decrease large default padding if has prefix/suffix. ([42166](https://github.com/WordPress/gutenberg/pull/42166))
-- ScrollLock: Covert component to TypeScript. ([42303](https://github.com/WordPress/gutenberg/pull/42303))
-- SelectControl: Add flag for larger default size. ([42456](https://github.com/WordPress/gutenberg/pull/42456))
-- Shortcut: Covert component to TypeScript. ([42272](https://github.com/WordPress/gutenberg/pull/42272))
-- Divider: Complete TypeScript migration of component. ([41991](https://github.com/WordPress/gutenberg/pull/41991))
-- ToggleGroupControl: Add size variants. ([42008](https://github.com/WordPress/gutenberg/pull/42008))
-- UnitControl: Update unit select's focus styles. ([42383](https://github.com/WordPress/gutenberg/pull/42383))
-- BorderControl: Add missing changelog for accessibility enhancements. ([42411](https://github.com/WordPress/gutenberg/pull/42411))
-- CustomSelectControl: Use styles from SelectControl. ([42460](https://github.com/WordPress/gutenberg/pull/42460))
-- Dropdown: Add wrapper for custom padding. ([42595](https://github.com/WordPress/gutenberg/pull/42595))
-- InputControl: Add padding wrapper for prefix/suffix. ([42378](https://github.com/WordPress/gutenberg/pull/42378))
-- ScrollLock: Improve Storybook story for documentation view. ([42344](https://github.com/WordPress/gutenberg/pull/42344))
-- `ColorPalette`: Display checkered preview background when `value` is transparent. ([42232](https://github.com/WordPress/gutenberg/pull/42232))
-
-#### Block Library
-- Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
-- Template Part: Swap block action places. ([42221](https://github.com/WordPress/gutenberg/pull/42221))
-- Template Parts: Add search to replacement modal. ([42459](https://github.com/WordPress/gutenberg/pull/42459))
-- Image: Add border block support for color, width, and style. ([31366](https://github.com/WordPress/gutenberg/pull/31366))
-- List v2: Remove quote transforms as removed by Quote v2. ([42700](https://github.com/WordPress/gutenberg/pull/42700))
-- Merge Comments and Post Comments blocks. ([41807](https://github.com/WordPress/gutenberg/pull/41807))
-- Theme.json: Add support for heading / caption elements in theme.json schema. ([42433](https://github.com/WordPress/gutenberg/pull/42433))
-
-#### Global Styles
-- Add layout content size controls to global styles. ([42309](https://github.com/WordPress/gutenberg/pull/42309))
-- Core CSS support for root padding and alignfull blocks. ([42085](https://github.com/WordPress/gutenberg/pull/42085))
-- Theme.json: Add block support feature level selectors for blocks. ([42087](https://github.com/WordPress/gutenberg/pull/42087))
+-   Add layout content size controls to global styles. ([42309](https://github.com/WordPress/gutenberg/pull/42309))
+-   Core CSS support for root padding and alignfull blocks. ([42085](https://github.com/WordPress/gutenberg/pull/42085))
+-   Theme.json: Add block support feature level selectors for blocks. ([42087](https://github.com/WordPress/gutenberg/pull/42087))
 
 #### Document Settings
-- Make 'Move to trash' button full width. ([42577](https://github.com/WordPress/gutenberg/pull/42577))
+
+-   Make 'Move to trash' button full width. ([42577](https://github.com/WordPress/gutenberg/pull/42577))
 
 #### Block Editor
-- Add setting to display rich text toolbar inline. ([42399](https://github.com/WordPress/gutenberg/pull/42399))
-- Add block variations for individual template parts. ([42454](https://github.com/WordPress/gutenberg/pull/42454))
-- Enable `onEnter` support for group block. ([40724](https://github.com/WordPress/gutenberg/pull/40724))
+
+-   Add setting to display rich text toolbar inline. ([42399](https://github.com/WordPress/gutenberg/pull/42399))
+-   Add block variations for individual template parts. ([42454](https://github.com/WordPress/gutenberg/pull/42454))
+-   Enable `onEnter` support for group block. ([40724](https://github.com/WordPress/gutenberg/pull/40724))
 
 #### Site Editor
-- On template creation, don't show search if not needed. ([42357](https://github.com/WordPress/gutenberg/pull/42357))
+
+-   On template creation, don't show search if not needed. ([42357](https://github.com/WordPress/gutenberg/pull/42357))
 
 #### Accessibility
-- BorderControl: Update labelling, tooltips and wrap with fieldset and legend. ([42348](https://github.com/WordPress/gutenberg/pull/42348))
+
+-   BorderControl: Update labelling, tooltips and wrap with fieldset and legend. ([42348](https://github.com/WordPress/gutenberg/pull/42348))
 
 #### Icons
-- Add shuffle icon to library. ([42193](https://github.com/WordPress/gutenberg/pull/42193))
+
+-   Add shuffle icon to library. ([42193](https://github.com/WordPress/gutenberg/pull/42193))
 
 #### Nested / Inner Blocks
-- Quote: Use nested blocks. ([25892](https://github.com/WordPress/gutenberg/pull/25892))
+
+-   Quote: Use nested blocks. ([25892](https://github.com/WordPress/gutenberg/pull/25892))
 
 #### Colors
-- Update color palette popover style. ([41900](https://github.com/WordPress/gutenberg/pull/41900))
-
-
-### Bug Fixes
-- Quote: fix raw transform handler ([https://github.com/WordPress/gutenberg/pull/43093])(https://github.com/WordPress/gutenberg/commit/9649f759c2235cde4281b1fd7fa9d8f9bf2f3f0e)
-- Paste from Slack: interpret paragraph markup ([https://github.com/WordPress/gutenberg/pull/43114])(https://github.com/WordPress/gutenberg/commit/1a2f08e59646f1d6a20fcb9cdd9182dbb3a6aeac)
-- Env: Download WordPress PHPUnit Into Container. ([41780](https://github.com/WordPress/gutenberg/pull/41780))
-- Env: Restrict `WP_TESTS_DOMAIN` constant to just hostname and not home URL. ([41039](https://github.com/WordPress/gutenberg/pull/41039))
-- Fix: Condition bug on BoxControl. ([42402](https://github.com/WordPress/gutenberg/pull/42402))
-- MaybeCategoryPanel: Update category selector. ([42663](https://github.com/WordPress/gutenberg/pull/42663))
-- Post title: Fix single line paste. ([42321](https://github.com/WordPress/gutenberg/pull/42321))
-- Scripts: Exit error code 1 when status value is null. ([42396](https://github.com/WordPress/gutenberg/pull/42396))
-- Style engine: Check item value validity. ([42487](https://github.com/WordPress/gutenberg/pull/42487))
-- Utilize WordPress PHPUnit Test Library Included By `wp-env`. ([41852](https://github.com/WordPress/gutenberg/pull/41852))
-- fix: Correct alt text footnote spacing. ([42504](https://github.com/WordPress/gutenberg/pull/42504))
-
-#### Block Library
-- Cover Block: Prevent transform to Group block when featured image is set. ([42638](https://github.com/WordPress/gutenberg/pull/42638))
-- Cover block: Adding background-size and background-repeat properties to the block CSS. ([42470](https://github.com/WordPress/gutenberg/pull/42470))
-- Fix tab/focus order issue in Media & text block. ([40806](https://github.com/WordPress/gutenberg/pull/40806))
-- List v2: Add forward delete. ([42564](https://github.com/WordPress/gutenberg/pull/42564))
-- List v2: Improve paste handling. ([42524](https://github.com/WordPress/gutenberg/pull/42524))
-- List v2: Merge with nested items. ([42551](https://github.com/WordPress/gutenberg/pull/42551))
-- List v2: Switch to default block type on Backspace from start. ([42633](https://github.com/WordPress/gutenberg/pull/42633))
-- Page List: Fetch items with 'view' context. ([42559](https://github.com/WordPress/gutenberg/pull/42559))
-- Social Icons Block: Fix button opacity in template parts. ([42641](https://github.com/WordPress/gutenberg/pull/42641))
-- Group block: Add context to the word "Row". ([42255](https://github.com/WordPress/gutenberg/pull/42255))
-- Hide prefix and suffix placeholders in post terms. ([42418](https://github.com/WordPress/gutenberg/pull/42418))
-- Theme.json: Fix schema for button elements. ([42431](https://github.com/WordPress/gutenberg/pull/42431))
-- [Media Text]: Fix deprecations regression. ([42816](https://github.com/WordPress/gutenberg/pull/42816))
-- Site Logo: Add the missing 'site_icon_url' to the REST_API index. ([42957](https://github.com/WordPress/gutenberg/pull/42957))
-
-#### Components
-- AnglePickerControl: Fix gap between elements in RTL mode. ([42534](https://github.com/WordPress/gutenberg/pull/42534))
-- ColorPalette: Fix background image in RTL mode. ([42510](https://github.com/WordPress/gutenberg/pull/42510))
-- Context System: Don't explicitly set `undefined` value to `children`. ([42686](https://github.com/WordPress/gutenberg/pull/42686))
-- Popover: Fix width on `expandOnMobile`. ([42635](https://github.com/WordPress/gutenberg/pull/42635))
-- RangeControl: Clamp initialPosition between min and max values. ([42571](https://github.com/WordPress/gutenberg/pull/42571))
-- Tooltip: Avoid unnecessary re-renders of `<select>` child elements. ([42483](https://github.com/WordPress/gutenberg/pull/42483))
-- Tooltip: Fix positioning by anchoring to child element. ([41268](https://github.com/WordPress/gutenberg/pull/41268))
+
+-   Update color palette popover style. ([41900](https://github.com/WordPress/gutenberg/pull/41900))
+
+### Bug Fixes
+
+-   Quote: fix raw transform handler ([https://github.com/WordPress/gutenberg/pull/43093])(https://github.com/WordPress/gutenberg/commit/9649f759c2235cde4281b1fd7fa9d8f9bf2f3f0e)
+-   Paste from Slack: interpret paragraph markup ([https://github.com/WordPress/gutenberg/pull/43114])(https://github.com/WordPress/gutenberg/commit/1a2f08e59646f1d6a20fcb9cdd9182dbb3a6aeac)
+-   Env: Download WordPress PHPUnit Into Container. ([41780](https://github.com/WordPress/gutenberg/pull/41780))
+-   Env: Restrict `WP_TESTS_DOMAIN` constant to just hostname and not home URL. ([41039](https://github.com/WordPress/gutenberg/pull/41039))
+-   Fix: Condition bug on BoxControl. ([42402](https://github.com/WordPress/gutenberg/pull/42402))
+-   MaybeCategoryPanel: Update category selector. ([42663](https://github.com/WordPress/gutenberg/pull/42663))
+-   Post title: Fix single line paste. ([42321](https://github.com/WordPress/gutenberg/pull/42321))
+-   Scripts: Exit error code 1 when status value is null. ([42396](https://github.com/WordPress/gutenberg/pull/42396))
+-   Style engine: Check item value validity. ([42487](https://github.com/WordPress/gutenberg/pull/42487))
+-   Utilize WordPress PHPUnit Test Library Included By `wp-env`. ([41852](https://github.com/WordPress/gutenberg/pull/41852))
+-   fix: Correct alt text footnote spacing. ([42504](https://github.com/WordPress/gutenberg/pull/42504))
+
+#### Block Library
+
+-   Cover Block: Prevent transform to Group block when featured image is set. ([42638](https://github.com/WordPress/gutenberg/pull/42638))
+-   Cover block: Adding background-size and background-repeat properties to the block CSS. ([42470](https://github.com/WordPress/gutenberg/pull/42470))
+-   Fix tab/focus order issue in Media & text block. ([40806](https://github.com/WordPress/gutenberg/pull/40806))
+-   List v2: Add forward delete. ([42564](https://github.com/WordPress/gutenberg/pull/42564))
+-   List v2: Improve paste handling. ([42524](https://github.com/WordPress/gutenberg/pull/42524))
+-   List v2: Merge with nested items. ([42551](https://github.com/WordPress/gutenberg/pull/42551))
+-   List v2: Switch to default block type on Backspace from start. ([42633](https://github.com/WordPress/gutenberg/pull/42633))
+-   Page List: Fetch items with 'view' context. ([42559](https://github.com/WordPress/gutenberg/pull/42559))
+-   Social Icons Block: Fix button opacity in template parts. ([42641](https://github.com/WordPress/gutenberg/pull/42641))
+-   Group block: Add context to the word "Row". ([42255](https://github.com/WordPress/gutenberg/pull/42255))
+-   Hide prefix and suffix placeholders in post terms. ([42418](https://github.com/WordPress/gutenberg/pull/42418))
+-   Theme.json: Fix schema for button elements. ([42431](https://github.com/WordPress/gutenberg/pull/42431))
+-   [Media Text]: Fix deprecations regression. ([42816](https://github.com/WordPress/gutenberg/pull/42816))
+-   Site Logo: Add the missing 'site_icon_url' to the REST_API index. ([42957](https://github.com/WordPress/gutenberg/pull/42957))
+
+#### Components
+
+-   AnglePickerControl: Fix gap between elements in RTL mode. ([42534](https://github.com/WordPress/gutenberg/pull/42534))
+-   ColorPalette: Fix background image in RTL mode. ([42510](https://github.com/WordPress/gutenberg/pull/42510))
+-   Context System: Don't explicitly set `undefined` value to `children`. ([42686](https://github.com/WordPress/gutenberg/pull/42686))
+-   Popover: Fix width on `expandOnMobile`. ([42635](https://github.com/WordPress/gutenberg/pull/42635))
+-   RangeControl: Clamp initialPosition between min and max values. ([42571](https://github.com/WordPress/gutenberg/pull/42571))
+-   Tooltip: Avoid unnecessary re-renders of `<select>` child elements. ([42483](https://github.com/WordPress/gutenberg/pull/42483))
+-   Tooltip: Fix positioning by anchoring to child element. ([41268](https://github.com/WordPress/gutenberg/pull/41268))
 
 #### Accessibility
-- Add aria-hidden to query pagination arrows. ([42583](https://github.com/WordPress/gutenberg/pull/42583))
-- Fix labelling and semantics of the paragraph block Left to right control. ([42324](https://github.com/WordPress/gutenberg/pull/42324))
-- Fix mismatching label and visible text on the Toggle block inserter button. ([42359](https://github.com/WordPress/gutenberg/pull/42359))
-- Fix: The description text of block movers for horizontal movement. ([42393](https://github.com/WordPress/gutenberg/pull/42393))
-- Replace clickable div elements with buttons in the Add template modal. ([42668](https://github.com/WordPress/gutenberg/pull/42668))
+
+-   Add aria-hidden to query pagination arrows. ([42583](https://github.com/WordPress/gutenberg/pull/42583))
+-   Fix labelling and semantics of the paragraph block Left to right control. ([42324](https://github.com/WordPress/gutenberg/pull/42324))
+-   Fix mismatching label and visible text on the Toggle block inserter button. ([42359](https://github.com/WordPress/gutenberg/pull/42359))
+-   Fix: The description text of block movers for horizontal movement. ([42393](https://github.com/WordPress/gutenberg/pull/42393))
+-   Replace clickable div elements with buttons in the Add template modal. ([42668](https://github.com/WordPress/gutenberg/pull/42668))
 
 #### Post Editor
-- Avoid 403 errors for users with low permissions. ([42413](https://github.com/WordPress/gutenberg/pull/42413))
-- Display post template selection for non-admin users. ([42705](https://github.com/WordPress/gutenberg/pull/42705))
-- Editor: Fix typo in translation string. ([42673](https://github.com/WordPress/gutenberg/pull/42673))
+
+-   Avoid 403 errors for users with low permissions. ([42413](https://github.com/WordPress/gutenberg/pull/42413))
+-   Display post template selection for non-admin users. ([42705](https://github.com/WordPress/gutenberg/pull/42705))
+-   Editor: Fix typo in translation string. ([42673](https://github.com/WordPress/gutenberg/pull/42673))
 
 #### Block Editor
-- Prevent link control popover from going offscreen. ([42389](https://github.com/WordPress/gutenberg/pull/42389))
-- Writing flow: Fix caret movement for multiple lines. ([42423](https://github.com/WordPress/gutenberg/pull/42423))
-- Writing flow: Fix caret placement in corners. ([42437](https://github.com/WordPress/gutenberg/pull/42437))
-- Writing flow: Esc should enter Nav mode consistently, avoid focus loss when clearing selection. ([42530](https://github.com/WordPress/gutenberg/pull/42530))
+
+-   Prevent link control popover from going offscreen. ([42389](https://github.com/WordPress/gutenberg/pull/42389))
+-   Writing flow: Fix caret movement for multiple lines. ([42423](https://github.com/WordPress/gutenberg/pull/42423))
+-   Writing flow: Fix caret placement in corners. ([42437](https://github.com/WordPress/gutenberg/pull/42437))
+-   Writing flow: Esc should enter Nav mode consistently, avoid focus loss when clearing selection. ([42530](https://github.com/WordPress/gutenberg/pull/42530))
 
 #### CSS & Styling
-- Elements: Buttons: Fix the path with the css to style the cursor for all button elements. ([42129](https://github.com/WordPress/gutenberg/pull/42129))
-- Link elements: Add a :where selector to the :Not to lower specificity. ([42669](https://github.com/WordPress/gutenberg/pull/42669))
-- Button Block: Change text-decoration style to low specificity. ([42545](https://github.com/WordPress/gutenberg/pull/42545))
-- Element styles: Adding stylesheet to load in the editor. ([42132](https://github.com/WordPress/gutenberg/pull/42132))
+
+-   Elements: Buttons: Fix the path with the css to style the cursor for all button elements. ([42129](https://github.com/WordPress/gutenberg/pull/42129))
+-   Link elements: Add a :where selector to the :Not to lower specificity. ([42669](https://github.com/WordPress/gutenberg/pull/42669))
+-   Button Block: Change text-decoration style to low specificity. ([42545](https://github.com/WordPress/gutenberg/pull/42545))
+-   Element styles: Adding stylesheet to load in the editor. ([42132](https://github.com/WordPress/gutenberg/pull/42132))
 
 #### Global Styles
-- Elements: Fix heading and caption element selectors. ([42479](https://github.com/WordPress/gutenberg/pull/42479))
-- Layout content size controls: Add left alignment to line up with description and other elements. ([42576](https://github.com/WordPress/gutenberg/pull/42576))
-- Layout: Ensure defaultEditorStyles are still output in Classic themes. ([42906](https://github.com/WordPress/gutenberg/pull/42906))
-- Theme JSON Resolver: Update cache check to also check that the object is an instance of the Gutenberg version. ([42756](https://github.com/WordPress/gutenberg/pull/42756))
+
+-   Elements: Fix heading and caption element selectors. ([42479](https://github.com/WordPress/gutenberg/pull/42479))
+-   Layout content size controls: Add left alignment to line up with description and other elements. ([42576](https://github.com/WordPress/gutenberg/pull/42576))
+-   Layout: Ensure defaultEditorStyles are still output in Classic themes. ([42906](https://github.com/WordPress/gutenberg/pull/42906))
+-   Theme JSON Resolver: Update cache check to also check that the object is an instance of the Gutenberg version. ([42756](https://github.com/WordPress/gutenberg/pull/42756))
 
 #### Widgets Editor
-- Add configuration option to skip autop on freeform blocks when parsing blocks. ([42623](https://github.com/WordPress/gutenberg/pull/42623))
+
+-   Add configuration option to skip autop on freeform blocks when parsing blocks. ([42623](https://github.com/WordPress/gutenberg/pull/42623))
 
 #### Rich Text
-- Annotation API: Fix __experimentalGetPropsForEditableTreePreparation. ([42596](https://github.com/WordPress/gutenberg/pull/42596))
+
+-   Annotation API: Fix \_\_experimentalGetPropsForEditableTreePreparation. ([42596](https://github.com/WordPress/gutenberg/pull/42596))
 
 #### Site Editor
-- Fix typo in default category template's description. ([42586](https://github.com/WordPress/gutenberg/pull/42586))
-- [Site Editor]: Fix Reakit warning on creation template component. ([42392](https://github.com/WordPress/gutenberg/pull/42392))
-- Site Editor: Remove leftover class. ([42591](https://github.com/WordPress/gutenberg/pull/42591))
+
+-   Fix typo in default category template's description. ([42586](https://github.com/WordPress/gutenberg/pull/42586))
+-   [Site Editor]: Fix Reakit warning on creation template component. ([42392](https://github.com/WordPress/gutenberg/pull/42392))
+-   Site Editor: Remove leftover class. ([42591](https://github.com/WordPress/gutenberg/pull/42591))
 
 #### Themes
-- Remove core/post-comments-form block styles that are overriding button element styles. ([42053](https://github.com/WordPress/gutenberg/pull/42053))
+
+-   Remove core/post-comments-form block styles that are overriding button element styles. ([42053](https://github.com/WordPress/gutenberg/pull/42053))
 
 #### Icons
-- Icons Package: Fix line icons styling. ([40315](https://github.com/WordPress/gutenberg/pull/40315))
 
+-   Icons Package: Fix line icons styling. ([40315](https://github.com/WordPress/gutenberg/pull/40315))
 
 ### Performance
 
 #### Components
-- Lodash: Refactor a few components away from `_.isEmpty()`. ([42468](https://github.com/WordPress/gutenberg/pull/42468))
-- Lodash: Refactor away from `_.compact()`. ([42438](https://github.com/WordPress/gutenberg/pull/42438))
+
+-   Lodash: Refactor a few components away from `_.isEmpty()`. ([42468](https://github.com/WordPress/gutenberg/pull/42468))
+-   Lodash: Refactor away from `_.compact()`. ([42438](https://github.com/WordPress/gutenberg/pull/42438))
 
 #### Post Editor
-- Lodash: Refactor `PageAttributesParent` away from `_.deburr()`. ([42429](https://github.com/WordPress/gutenberg/pull/42429))
+
+-   Lodash: Refactor `PageAttributesParent` away from `_.deburr()`. ([42429](https://github.com/WordPress/gutenberg/pull/42429))
 
 #### Testing
-- Lodash: Refactor away from `_.snakeCase()`. ([42427](https://github.com/WordPress/gutenberg/pull/42427))
+
+-   Lodash: Refactor away from `_.snakeCase()`. ([42427](https://github.com/WordPress/gutenberg/pull/42427))
 
 #### Block Validation/Deprecation
-- Lodash: Refactor away from `_.fromPairs()`. ([42217](https://github.com/WordPress/gutenberg/pull/42217))
 
+-   Lodash: Refactor away from `_.fromPairs()`. ([42217](https://github.com/WordPress/gutenberg/pull/42217))
 
 ### Experiments
 
-- Style Engine Rules & Store objects. ([42222](https://github.com/WordPress/gutenberg/pull/42222))
-- Style Engine: Add a WP_Style_Engine_Processor object. ([42463](https://github.com/WordPress/gutenberg/pull/42463))
+-   Style Engine Rules & Store objects. ([42222](https://github.com/WordPress/gutenberg/pull/42222))
+-   Style Engine: Add a WP_Style_Engine_Processor object. ([42463](https://github.com/WordPress/gutenberg/pull/42463))
 
 #### CSS & Styling
-- Style Engine: Add elements to the frontend. ([41732](https://github.com/WordPress/gutenberg/pull/41732))
+
+-   Style Engine: Add elements to the frontend. ([41732](https://github.com/WordPress/gutenberg/pull/41732))
 
 #### Global Styles
-- Block supports: Add fluid typography. ([39529](https://github.com/WordPress/gutenberg/pull/39529))
-- Layout: Reduce specificity of fallback blockGap styles. ([42665](https://github.com/WordPress/gutenberg/pull/42665))
 
+-   Block supports: Add fluid typography. ([39529](https://github.com/WordPress/gutenberg/pull/39529))
+-   Layout: Reduce specificity of fallback blockGap styles. ([42665](https://github.com/WordPress/gutenberg/pull/42665))
 
 ### Documentation
 
-- Add @examples to core/blocks selectors. ([42572](https://github.com/WordPress/gutenberg/pull/42572))
-- Consolidate editor filters and actions. ([42356](https://github.com/WordPress/gutenberg/pull/42356))
-- Correct the documented return type for `WP_Block_Parser::Render()`. ([42642](https://github.com/WordPress/gutenberg/pull/42642))
-- Doc: Update getEntityRecord/s param description. ([42488](https://github.com/WordPress/gutenberg/pull/42488))
-- Docs: Add `variations` key to `block.json` JSON schema definition. ([42539](https://github.com/WordPress/gutenberg/pull/42539))
-- Docs: Add missing data module references. ([42651](https://github.com/WordPress/gutenberg/pull/42651))
-- Fix: Repetition of wrong word in string. ([42621](https://github.com/WordPress/gutenberg/pull/42621))
-- Flex: Remove experimental from documentation and storybook. ([42301](https://github.com/WordPress/gutenberg/pull/42301))
-- Include section on how to test code for a given WP major. ([42390](https://github.com/WordPress/gutenberg/pull/42390))
-- Marking internal action as @ignore to remove them from the documentation. ([42163](https://github.com/WordPress/gutenberg/pull/42163))
-- Theme JSON Docs: Clarify null, true, and false values for blockGap setting. ([42447](https://github.com/WordPress/gutenberg/pull/42447))
-- ToolsPanel: Add a readme section related to laying out a ToolsPanel. ([42615](https://github.com/WordPress/gutenberg/pull/42615))
+-   Add @examples to core/blocks selectors. ([42572](https://github.com/WordPress/gutenberg/pull/42572))
+-   Consolidate editor filters and actions. ([42356](https://github.com/WordPress/gutenberg/pull/42356))
+-   Correct the documented return type for `WP_Block_Parser::Render()`. ([42642](https://github.com/WordPress/gutenberg/pull/42642))
+-   Doc: Update getEntityRecord/s param description. ([42488](https://github.com/WordPress/gutenberg/pull/42488))
+-   Docs: Add `variations` key to `block.json` JSON schema definition. ([42539](https://github.com/WordPress/gutenberg/pull/42539))
+-   Docs: Add missing data module references. ([42651](https://github.com/WordPress/gutenberg/pull/42651))
+-   Fix: Repetition of wrong word in string. ([42621](https://github.com/WordPress/gutenberg/pull/42621))
+-   Flex: Remove experimental from documentation and storybook. ([42301](https://github.com/WordPress/gutenberg/pull/42301))
+-   Include section on how to test code for a given WP major. ([42390](https://github.com/WordPress/gutenberg/pull/42390))
+-   Marking internal action as @ignore to remove them from the documentation. ([42163](https://github.com/WordPress/gutenberg/pull/42163))
+-   Theme JSON Docs: Clarify null, true, and false values for blockGap setting. ([42447](https://github.com/WordPress/gutenberg/pull/42447))
+-   ToolsPanel: Add a readme section related to laying out a ToolsPanel. ([42615](https://github.com/WordPress/gutenberg/pull/42615))
 
 #### Components
-- Improve documentation for the `SpaceInput` type. ([42376](https://github.com/WordPress/gutenberg/pull/42376))
 
+-   Improve documentation for the `SpaceInput` type. ([42376](https://github.com/WordPress/gutenberg/pull/42376))
 
 ### Code Quality
 
-- Base Styles: Apply `long-content-fade` gradient from transparent to color. ([42401](https://github.com/WordPress/gutenberg/pull/42401))
-- Fix jsx-a11y label-has-associated-control configuration. ([42671](https://github.com/WordPress/gutenberg/pull/42671))
-- Fix: Two code issues on navigation link edit missing text. ([42440](https://github.com/WordPress/gutenberg/pull/42440))
-- Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
-- Style Engine: Rename WP_Style_Engine_CSS_Rule->set_declarations to add_declarations. ([42464](https://github.com/WordPress/gutenberg/pull/42464))
-- Style engine: Update return PHP doc comment and other nitpicks. ([42453](https://github.com/WordPress/gutenberg/pull/42453))
+-   Base Styles: Apply `long-content-fade` gradient from transparent to color. ([42401](https://github.com/WordPress/gutenberg/pull/42401))
+-   Fix jsx-a11y label-has-associated-control configuration. ([42671](https://github.com/WordPress/gutenberg/pull/42671))
+-   Fix: Two code issues on navigation link edit missing text. ([42440](https://github.com/WordPress/gutenberg/pull/42440))
+-   Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
+-   Style Engine: Rename WP_Style_Engine_CSS_Rule->set_declarations to add_declarations. ([42464](https://github.com/WordPress/gutenberg/pull/42464))
+-   Style engine: Update return PHP doc comment and other nitpicks. ([42453](https://github.com/WordPress/gutenberg/pull/42453))
 
 #### Global Styles
-- Dimensions Global Styles: Split props into separate hooks to tidy up the panel component. ([42620](https://github.com/WordPress/gutenberg/pull/42620))
+
+-   Dimensions Global Styles: Split props into separate hooks to tidy up the panel component. ([42620](https://github.com/WordPress/gutenberg/pull/42620))
 
 #### Block Library
-- Remove unnecessary React Fragments. ([42529](https://github.com/WordPress/gutenberg/pull/42529))
 
+-   Remove unnecessary React Fragments. ([42529](https://github.com/WordPress/gutenberg/pull/42529))
 
 ### Tools
 
 #### Testing
-- Added unit test for cover block render function. ([42108](https://github.com/WordPress/gutenberg/pull/42108))
-- Migrate hooks api test to playwright. ([42584](https://github.com/WordPress/gutenberg/pull/42584))
-- Skip flaky navigation block permissions test. ([42693](https://github.com/WordPress/gutenberg/pull/42693))
-- end-to-end Tests: Tweak Comments block tests after migrating to Playwright. ([42406](https://github.com/WordPress/gutenberg/pull/42406))
 
-#### Build Tooling
-- Update to reflect change in Documentation label. ([42395](https://github.com/WordPress/gutenberg/pull/42395))
-- Add inline documentation on building API documentation to commit block API verify error message. ([42432](https://github.com/WordPress/gutenberg/pull/42432))
+-   Added unit test for cover block render function. ([42108](https://github.com/WordPress/gutenberg/pull/42108))
+-   Migrate hooks api test to playwright. ([42584](https://github.com/WordPress/gutenberg/pull/42584))
+-   Skip flaky navigation block permissions test. ([42693](https://github.com/WordPress/gutenberg/pull/42693))
+-   end-to-end Tests: Tweak Comments block tests after migrating to Playwright. ([42406](https://github.com/WordPress/gutenberg/pull/42406))
 
+#### Build Tooling
 
-## First time contributors
+-   Update to reflect change in Documentation label. ([42395](https://github.com/WordPress/gutenberg/pull/42395))
+-   Add inline documentation on building API documentation to commit block API verify error message. ([42432](https://github.com/WordPress/gutenberg/pull/42432))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @kkmuffme: Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
-- @paulopmt1: Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
+The following PRs were merged by first-time contributors:
 
+-   @kkmuffme: Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
+-   @paulopmt1: Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
 
 ## Contributors
 
@@ -13034,313 +24360,306 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @ajlende @amustaque97 @andrewserong @arcangelini @aristath @bph @carolinan @chad1008 @ciampo @danielbachhuber @DAreRodz @dcalhoun @ellatrix @fabiankaegy @geriux @getdave @gziolo @jameskoster @johnbillion @jorgefilipecosta @kkmuffme @Mamaduka @matiasbenedetto @mirka @ndiego @noisysocks @ntsekouras @oandregal @ObliviousHarmony @paulopmt1 @pedro-mendonca @pooja-muchandikar @ramonjd @ryanwelcher @scruffian @SiobhyB @sunil25393 @t-hamano @talldan @tellthemachines @tyxla @vcanales @walbo @westonruter @zaguiini
 
-
-
-
 = 13.9.0-rc.1 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
-- Style engine: Prettify combined selectors. ([43003](https://github.com/WordPress/gutenberg/pull/43003))
-- Style engine: Prettify output. ([42909](https://github.com/WordPress/gutenberg/pull/42909))
-- Style engine: Rename global function. ([42719](https://github.com/WordPress/gutenberg/pull/42719))
-- Shortcuts: Add Ctrl+Y for redo on Windows. ([42627](https://github.com/WordPress/gutenberg/pull/42627))
+-   Style engine: Prettify combined selectors. ([43003](https://github.com/WordPress/gutenberg/pull/43003))
+-   Style engine: Prettify output. ([42909](https://github.com/WordPress/gutenberg/pull/42909))
+-   Style engine: Rename global function. ([42719](https://github.com/WordPress/gutenberg/pull/42719))
+-   Shortcuts: Add Ctrl+Y for redo on Windows. ([42627](https://github.com/WordPress/gutenberg/pull/42627))
 
 #### Components
 
-- BaseControl: Add `box-sizing` resets. ([42889](https://github.com/WordPress/gutenberg/pull/42889))
-- BorderControl: Add box sizing reset. ([42754](https://github.com/WordPress/gutenberg/pull/42754))
-- BoxControl: Export `applyValueToSides` util function. ([42733](https://github.com/WordPress/gutenberg/pull/42733))
-- ComboboxControl and FormTokenField: Enhance components with custom render callback for options. ([42597](https://github.com/WordPress/gutenberg/pull/42597))
-- ComboboxControl: Add support for uncontrolled mode. ([42752](https://github.com/WordPress/gutenberg/pull/42752))
-- Flex: Convert component to TypeScript. ([42537](https://github.com/WordPress/gutenberg/pull/42537))
-- FontSizePicker: Add 40px size variant. ([42716](https://github.com/WordPress/gutenberg/pull/42716))
-- Placeholder: Convert component to TypeScript. ([42990](https://github.com/WordPress/gutenberg/pull/42990))
-- Popover: Rewrite Storybook examples using controls. ([42903](https://github.com/WordPress/gutenberg/pull/42903))
-- Popover: Tidy up code 🧹 , add more comments. ([42944](https://github.com/WordPress/gutenberg/pull/42944))
-- ResizableBox: Change tooltip background to match other tooltips. ([42800](https://github.com/WordPress/gutenberg/pull/42800))
-- Storybook: Add global CSS switcher. ([42747](https://github.com/WordPress/gutenberg/pull/42747))
-- StyleProvider: Convert component to TypeScript. ([42541](https://github.com/WordPress/gutenberg/pull/42541))
-- Swatch: Convert component to TypeScript. ([42162](https://github.com/WordPress/gutenberg/pull/42162))
-- Tooltip (Experimental), CustomSelectControl, TimePicker: add missing font sizes which were necessary in non-WordPress contexts. ([42844](https://github.com/WordPress/gutenberg/pull/42844))
-- Typography Panel: Fix font appearance control width. ([42795](https://github.com/WordPress/gutenberg/pull/42795))
-- UnitControl: Update unit dropdown design. ([42000](https://github.com/WordPress/gutenberg/pull/42000))
-- Update control labels to the new uppercase styles. ([42789](https://github.com/WordPress/gutenberg/pull/42789))
-
-#### Block Library
-
-- Archives: Add a control to make block's dropdown label invisible. ([43025](https://github.com/WordPress/gutenberg/pull/43025))
-- Query Title: Add a search title variation. ([42662](https://github.com/WordPress/gutenberg/pull/42662))
-- Media&Text: Add help to ImageSizeControl. ([40642](https://github.com/WordPress/gutenberg/pull/40642))
-- Post Author: Rendering html for the author description at the editor. ([42109](https://github.com/WordPress/gutenberg/pull/42109))
-- Post Featured Image: Add link target and rel attributes. ([42853](https://github.com/WordPress/gutenberg/pull/42853))
+-   BaseControl: Add `box-sizing` resets. ([42889](https://github.com/WordPress/gutenberg/pull/42889))
+-   BorderControl: Add box sizing reset. ([42754](https://github.com/WordPress/gutenberg/pull/42754))
+-   BoxControl: Export `applyValueToSides` util function. ([42733](https://github.com/WordPress/gutenberg/pull/42733))
+-   ComboboxControl and FormTokenField: Enhance components with custom render callback for options. ([42597](https://github.com/WordPress/gutenberg/pull/42597))
+-   ComboboxControl: Add support for uncontrolled mode. ([42752](https://github.com/WordPress/gutenberg/pull/42752))
+-   Flex: Convert component to TypeScript. ([42537](https://github.com/WordPress/gutenberg/pull/42537))
+-   FontSizePicker: Add 40px size variant. ([42716](https://github.com/WordPress/gutenberg/pull/42716))
+-   Placeholder: Convert component to TypeScript. ([42990](https://github.com/WordPress/gutenberg/pull/42990))
+-   Popover: Rewrite Storybook examples using controls. ([42903](https://github.com/WordPress/gutenberg/pull/42903))
+-   Popover: Tidy up code 🧹 , add more comments. ([42944](https://github.com/WordPress/gutenberg/pull/42944))
+-   ResizableBox: Change tooltip background to match other tooltips. ([42800](https://github.com/WordPress/gutenberg/pull/42800))
+-   Storybook: Add global CSS switcher. ([42747](https://github.com/WordPress/gutenberg/pull/42747))
+-   StyleProvider: Convert component to TypeScript. ([42541](https://github.com/WordPress/gutenberg/pull/42541))
+-   Swatch: Convert component to TypeScript. ([42162](https://github.com/WordPress/gutenberg/pull/42162))
+-   Tooltip (Experimental), CustomSelectControl, TimePicker: add missing font sizes which were necessary in non-WordPress contexts. ([42844](https://github.com/WordPress/gutenberg/pull/42844))
+-   Typography Panel: Fix font appearance control width. ([42795](https://github.com/WordPress/gutenberg/pull/42795))
+-   UnitControl: Update unit dropdown design. ([42000](https://github.com/WordPress/gutenberg/pull/42000))
+-   Update control labels to the new uppercase styles. ([42789](https://github.com/WordPress/gutenberg/pull/42789))
+
+#### Block Library
+
+-   Archives: Add a control to make block's dropdown label invisible. ([43025](https://github.com/WordPress/gutenberg/pull/43025))
+-   Query Title: Add a search title variation. ([42662](https://github.com/WordPress/gutenberg/pull/42662))
+-   Media&Text: Add help to ImageSizeControl. ([40642](https://github.com/WordPress/gutenberg/pull/40642))
+-   Post Author: Rendering html for the author description at the editor. ([42109](https://github.com/WordPress/gutenberg/pull/42109))
+-   Post Featured Image: Add link target and rel attributes. ([42853](https://github.com/WordPress/gutenberg/pull/42853))
 
 #### CSS & Styling
 
-- Rename solid color. ([42918](https://github.com/WordPress/gutenberg/pull/42918))
-- Try: Tab style subpixel fix. ([42892](https://github.com/WordPress/gutenberg/pull/42892))
+-   Rename solid color. ([42918](https://github.com/WordPress/gutenberg/pull/42918))
+-   Try: Tab style subpixel fix. ([42892](https://github.com/WordPress/gutenberg/pull/42892))
 
 #### Site Editor
 
-- Add: Author nicename template creation ability. ([42165](https://github.com/WordPress/gutenberg/pull/42165))
-- [Site Editor]: Add fallback template content on creation. ([42520](https://github.com/WordPress/gutenberg/pull/42520))
+-   Add: Author nicename template creation ability. ([42165](https://github.com/WordPress/gutenberg/pull/42165))
+-   [Site Editor]: Add fallback template content on creation. ([42520](https://github.com/WordPress/gutenberg/pull/42520))
 
 #### Block Directory
 
-- Modernize `DownloadableBlockListItem` tests. ([43026](https://github.com/WordPress/gutenberg/pull/43026))
+-   Modernize `DownloadableBlockListItem` tests. ([43026](https://github.com/WordPress/gutenberg/pull/43026))
 
 #### List View
 
-- List View Expander: Fix icon in RTL mode. ([42997](https://github.com/WordPress/gutenberg/pull/42997))
+-   List View Expander: Fix icon in RTL mode. ([42997](https://github.com/WordPress/gutenberg/pull/42997))
 
 #### Global Styles
 
-- Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles. ([42544](https://github.com/WordPress/gutenberg/pull/42544))
+-   Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles. ([42544](https://github.com/WordPress/gutenberg/pull/42544))
 
 #### Block Editor
 
-- Rich text: Add character shortcuts for wrapping selection. ([42469](https://github.com/WordPress/gutenberg/pull/42469))
+-   Rich text: Add character shortcuts for wrapping selection. ([42469](https://github.com/WordPress/gutenberg/pull/42469))
 
 #### Document Settings
 
-- Post Template: Update template title selector. ([42091](https://github.com/WordPress/gutenberg/pull/42091))
+-   Post Template: Update template title selector. ([42091](https://github.com/WordPress/gutenberg/pull/42091))
 
 #### Design Tools
 
-- Cover: Show Resize Tooltip on Drag. ([23522](https://github.com/WordPress/gutenberg/pull/23522))
-- Update color button style. ([41838](https://github.com/WordPress/gutenberg/pull/41838))
-- Add explicit bypass for fluid font size calculation. ([42757](https://github.com/WordPress/gutenberg/pull/42757))
+-   Cover: Show Resize Tooltip on Drag. ([23522](https://github.com/WordPress/gutenberg/pull/23522))
+-   Update color button style. ([41838](https://github.com/WordPress/gutenberg/pull/41838))
+-   Add explicit bypass for fluid font size calculation. ([42757](https://github.com/WordPress/gutenberg/pull/42757))
 
 ### Bug Fixes
 
-- Block Styles: Truncate long button labels. ([42975](https://github.com/WordPress/gutenberg/pull/42975))
-- ColorGradientControl: Fix awkward padding in popover. ([43018](https://github.com/WordPress/gutenberg/pull/43018))
-- Create Block: Remove i18n references from save properties. ([43035](https://github.com/WordPress/gutenberg/pull/43035))
-- Firefox: Fix issue where it selects a nearby contentEditable. ([42777](https://github.com/WordPress/gutenberg/pull/42777))
-- Layout: Fix flex direction column. ([42939](https://github.com/WordPress/gutenberg/pull/42939))
-- List v2: Fix Cmd+A. ([42858](https://github.com/WordPress/gutenberg/pull/42858))
-- Style Engine: Include 6.1 CSS filter, ensure style engine can output CSS functions like clamp. ([43004](https://github.com/WordPress/gutenberg/pull/43004))
-- Style engine: Disable stylesheet optimization temporarily. ([43051](https://github.com/WordPress/gutenberg/pull/43051))
-
-#### Block Library
-
-- Navigation: Fix invalid permissions warning by avoiding using trashed wp_navigation posts (JS implementation). ([42982](https://github.com/WordPress/gutenberg/pull/42982))
-- Disabled blocks passed to BlockTypesList are no longer draggable. ([42751](https://github.com/WordPress/gutenberg/pull/42751))
-- Fix drag and drop performance when dragging over the insertion point. ([42806](https://github.com/WordPress/gutenberg/pull/42806))
-- Social Link: add missing 'width' and 'height' attributes. ([41373](https://github.com/WordPress/gutenberg/pull/41373))
-- Separator: Fix the block CSS classes in the editor. ([42769](https://github.com/WordPress/gutenberg/pull/42769))
-- Tag Cloud: Fix alignment issue when align center. ([43017](https://github.com/WordPress/gutenberg/pull/43017))
-- Navigation: Fix `current-menu-item` class logic. ([42849](https://github.com/WordPress/gutenberg/pull/42849))
-- Media&Text: Round position attribute on focal point save. ([33915](https://github.com/WordPress/gutenberg/pull/33915))
-- Social: Include has-visible-labels on edit component. ([42791](https://github.com/WordPress/gutenberg/pull/42791))
-- Writing flow: Fix Shift+Arrow partial selection for lists & quote. ([42885](https://github.com/WordPress/gutenberg/pull/42885))
-- LatestPost: Fix issue with floated featured images overflowing focus style. ([40663](https://github.com/WordPress/gutenberg/pull/40663))
+-   Block Styles: Truncate long button labels. ([42975](https://github.com/WordPress/gutenberg/pull/42975))
+-   ColorGradientControl: Fix awkward padding in popover. ([43018](https://github.com/WordPress/gutenberg/pull/43018))
+-   Create Block: Remove i18n references from save properties. ([43035](https://github.com/WordPress/gutenberg/pull/43035))
+-   Firefox: Fix issue where it selects a nearby contentEditable. ([42777](https://github.com/WordPress/gutenberg/pull/42777))
+-   Layout: Fix flex direction column. ([42939](https://github.com/WordPress/gutenberg/pull/42939))
+-   List v2: Fix Cmd+A. ([42858](https://github.com/WordPress/gutenberg/pull/42858))
+-   Style Engine: Include 6.1 CSS filter, ensure style engine can output CSS functions like clamp. ([43004](https://github.com/WordPress/gutenberg/pull/43004))
+-   Style engine: Disable stylesheet optimization temporarily. ([43051](https://github.com/WordPress/gutenberg/pull/43051))
+
+#### Block Library
+
+-   Navigation: Fix invalid permissions warning by avoiding using trashed wp_navigation posts (JS implementation). ([42982](https://github.com/WordPress/gutenberg/pull/42982))
+-   Disabled blocks passed to BlockTypesList are no longer draggable. ([42751](https://github.com/WordPress/gutenberg/pull/42751))
+-   Fix drag and drop performance when dragging over the insertion point. ([42806](https://github.com/WordPress/gutenberg/pull/42806))
+-   Social Link: add missing 'width' and 'height' attributes. ([41373](https://github.com/WordPress/gutenberg/pull/41373))
+-   Separator: Fix the block CSS classes in the editor. ([42769](https://github.com/WordPress/gutenberg/pull/42769))
+-   Tag Cloud: Fix alignment issue when align center. ([43017](https://github.com/WordPress/gutenberg/pull/43017))
+-   Navigation: Fix `current-menu-item` class logic. ([42849](https://github.com/WordPress/gutenberg/pull/42849))
+-   Media&Text: Round position attribute on focal point save. ([33915](https://github.com/WordPress/gutenberg/pull/33915))
+-   Social: Include has-visible-labels on edit component. ([42791](https://github.com/WordPress/gutenberg/pull/42791))
+-   Writing flow: Fix Shift+Arrow partial selection for lists & quote. ([42885](https://github.com/WordPress/gutenberg/pull/42885))
+-   LatestPost: Fix issue with floated featured images overflowing focus style. ([40663](https://github.com/WordPress/gutenberg/pull/40663))
 
 #### Components
 
-- ColorPicker: Fix layout overflow. ([42992](https://github.com/WordPress/gutenberg/pull/42992))
-- External link component: Add a check for on page anchor links. ([42259](https://github.com/WordPress/gutenberg/pull/42259))
-- Icons: Fix storybook library icon names. ([43034](https://github.com/WordPress/gutenberg/pull/43034))
-- InputControl: Fix incorrect size prop passing to `Text`. ([42793](https://github.com/WordPress/gutenberg/pull/42793))
-- Popover: Anchor correctly to parent node when no explicit anchor is passed. ([42971](https://github.com/WordPress/gutenberg/pull/42971))
-- Popover: Fix arrow placement and design. ([42874](https://github.com/WordPress/gutenberg/pull/42874))
-- Popover: Improve iframe offset computation. ([42417](https://github.com/WordPress/gutenberg/pull/42417))
-- Popover: Make sure that ownerDocument is always defined. ([42886](https://github.com/WordPress/gutenberg/pull/42886))
-- `InputControl`: Fix acceptance of falsy values in controlled updates. ([42484](https://github.com/WordPress/gutenberg/pull/42484))
+-   ColorPicker: Fix layout overflow. ([42992](https://github.com/WordPress/gutenberg/pull/42992))
+-   External link component: Add a check for on page anchor links. ([42259](https://github.com/WordPress/gutenberg/pull/42259))
+-   Icons: Fix storybook library icon names. ([43034](https://github.com/WordPress/gutenberg/pull/43034))
+-   InputControl: Fix incorrect size prop passing to `Text`. ([42793](https://github.com/WordPress/gutenberg/pull/42793))
+-   Popover: Anchor correctly to parent node when no explicit anchor is passed. ([42971](https://github.com/WordPress/gutenberg/pull/42971))
+-   Popover: Fix arrow placement and design. ([42874](https://github.com/WordPress/gutenberg/pull/42874))
+-   Popover: Improve iframe offset computation. ([42417](https://github.com/WordPress/gutenberg/pull/42417))
+-   Popover: Make sure that ownerDocument is always defined. ([42886](https://github.com/WordPress/gutenberg/pull/42886))
+-   `InputControl`: Fix acceptance of falsy values in controlled updates. ([42484](https://github.com/WordPress/gutenberg/pull/42484))
 
 #### Block Editor
 
-- Inserter: Avoid warning when CRA is displayed. ([42723](https://github.com/WordPress/gutenberg/pull/42723))
-- Pasting: Dismiss pasted image if file:// schema detected. ([42785](https://github.com/WordPress/gutenberg/pull/42785))
-- Prevent multiselection via dragging when already dragging blocks. ([42877](https://github.com/WordPress/gutenberg/pull/42877))
-- Quote: Fix raw transform handler. ([43093](https://github.com/WordPress/gutenberg/pull/43093))
-- Rich text: Fix error when attempting to remove placeholder on composition start. ([42821](https://github.com/WordPress/gutenberg/pull/42821))
+-   Inserter: Avoid warning when CRA is displayed. ([42723](https://github.com/WordPress/gutenberg/pull/42723))
+-   Pasting: Dismiss pasted image if file:// schema detected. ([42785](https://github.com/WordPress/gutenberg/pull/42785))
+-   Prevent multiselection via dragging when already dragging blocks. ([42877](https://github.com/WordPress/gutenberg/pull/42877))
+-   Quote: Fix raw transform handler. ([43093](https://github.com/WordPress/gutenberg/pull/43093))
+-   Rich text: Fix error when attempting to remove placeholder on composition start. ([42821](https://github.com/WordPress/gutenberg/pull/42821))
 
 #### Global Styles
 
-- Fix styles declarations returning before all properties output. ([42954](https://github.com/WordPress/gutenberg/pull/42954))
-- Fluid typography: Migrate fluid typography algorithm to JS for site editor. ([42688](https://github.com/WordPress/gutenberg/pull/42688))
-- Spacing presets: Prevent % spacing size units being stripped by sanitize_title. ([43101](https://github.com/WordPress/gutenberg/pull/43101))
-- Specify priority in remove_action. ([43073](https://github.com/WordPress/gutenberg/pull/43073))
+-   Fix styles declarations returning before all properties output. ([42954](https://github.com/WordPress/gutenberg/pull/42954))
+-   Fluid typography: Migrate fluid typography algorithm to JS for site editor. ([42688](https://github.com/WordPress/gutenberg/pull/42688))
+-   Spacing presets: Prevent % spacing size units being stripped by sanitize_title. ([43101](https://github.com/WordPress/gutenberg/pull/43101))
+-   Specify priority in remove_action. ([43073](https://github.com/WordPress/gutenberg/pull/43073))
 
 #### Build Tooling
 
-- Fix: CSS files don't build in dev mode on Windows. ([42041](https://github.com/WordPress/gutenberg/pull/42041))
-- Fix: Script name error in main package.json. ([43089](https://github.com/WordPress/gutenberg/pull/43089))
+-   Fix: CSS files don't build in dev mode on Windows. ([42041](https://github.com/WordPress/gutenberg/pull/42041))
+-   Fix: Script name error in main package.json. ([43089](https://github.com/WordPress/gutenberg/pull/43089))
 
 #### Accessibility
 
-- Fix issue where changing the id of the recursion provider can result in focus loss. ([42916](https://github.com/WordPress/gutenberg/pull/42916))
-- Site Editor: Don't disable the Save button. ([42842](https://github.com/WordPress/gutenberg/pull/42842))
+-   Fix issue where changing the id of the recursion provider can result in focus loss. ([42916](https://github.com/WordPress/gutenberg/pull/42916))
+-   Site Editor: Don't disable the Save button. ([42842](https://github.com/WordPress/gutenberg/pull/42842))
 
 #### CSS & Styling
 
-- Layout: Merge CSS rule for block gap. ([43052](https://github.com/WordPress/gutenberg/pull/43052))
+-   Layout: Merge CSS rule for block gap. ([43052](https://github.com/WordPress/gutenberg/pull/43052))
 
 #### Testing
 
-- Fix: Just another end-to-end test. ([42947](https://github.com/WordPress/gutenberg/pull/42947))
+-   Fix: Just another end-to-end test. ([42947](https://github.com/WordPress/gutenberg/pull/42947))
 
 #### Document Settings
 
-- Decode the post URL for the button label. ([42930](https://github.com/WordPress/gutenberg/pull/42930))
+-   Decode the post URL for the button label. ([42930](https://github.com/WordPress/gutenberg/pull/42930))
 
 #### Site Editor
 
-- Internalization fixes for site editor template creation. ([42762](https://github.com/WordPress/gutenberg/pull/42762))
+-   Internalization fixes for site editor template creation. ([42762](https://github.com/WordPress/gutenberg/pull/42762))
 
 ### Performance
 
-- Lodash: Refactor away from `_.isMatch()`. ([42271](https://github.com/WordPress/gutenberg/pull/42271))
-- Lodash: Refactor away from `_.zip()`. ([42926](https://github.com/WordPress/gutenberg/pull/42926))
-- Lodash: Remove completely from `@wordpress/dom` package. ([42912](https://github.com/WordPress/gutenberg/pull/42912))
-- Lodash: Remove completely from `@wordpress/element` package. ([42898](https://github.com/WordPress/gutenberg/pull/42898))
+-   Lodash: Refactor away from `_.isMatch()`. ([42271](https://github.com/WordPress/gutenberg/pull/42271))
+-   Lodash: Refactor away from `_.zip()`. ([42926](https://github.com/WordPress/gutenberg/pull/42926))
+-   Lodash: Remove completely from `@wordpress/dom` package. ([42912](https://github.com/WordPress/gutenberg/pull/42912))
+-   Lodash: Remove completely from `@wordpress/element` package. ([42898](https://github.com/WordPress/gutenberg/pull/42898))
 
 #### Components
 
-- Lodash: Refactor away from `_.delay()`. ([42966](https://github.com/WordPress/gutenberg/pull/42966))
-- Lodash: Refactor away from `_.startsWith()`. ([43019](https://github.com/WordPress/gutenberg/pull/43019))
+-   Lodash: Refactor away from `_.delay()`. ([42966](https://github.com/WordPress/gutenberg/pull/42966))
+-   Lodash: Refactor away from `_.startsWith()`. ([43019](https://github.com/WordPress/gutenberg/pull/43019))
 
 #### Block Library
 
-- Refactor Calendar block away from `moment`. ([43029](https://github.com/WordPress/gutenberg/pull/43029))
+-   Refactor Calendar block away from `moment`. ([43029](https://github.com/WordPress/gutenberg/pull/43029))
 
 #### Accessibility
 
-- Lodash: Refactor away from `_.maxBy()`. ([42914](https://github.com/WordPress/gutenberg/pull/42914))
+-   Lodash: Refactor away from `_.maxBy()`. ([42914](https://github.com/WordPress/gutenberg/pull/42914))
 
 #### Data Layer
 
-- Lodash: Refactor away from `_.isPlainObject()`. ([42508](https://github.com/WordPress/gutenberg/pull/42508))
+-   Lodash: Refactor away from `_.isPlainObject()`. ([42508](https://github.com/WordPress/gutenberg/pull/42508))
 
 ### Experiments
 
-- Style engine: Enqueue block support styles. ([42452](https://github.com/WordPress/gutenberg/pull/42452)) ([42880](https://github.com/WordPress/gutenberg/pull/42880))
-- Combine style-engine stores for block-supports. ([42970](https://github.com/WordPress/gutenberg/pull/42970))
-- Style engine: Add optimize flag and combine functions into wp_style_engine_get_stylesheet. ([42878](https://github.com/WordPress/gutenberg/pull/42878))
+-   Style engine: Enqueue block support styles. ([42452](https://github.com/WordPress/gutenberg/pull/42452)) ([42880](https://github.com/WordPress/gutenberg/pull/42880))
+-   Combine style-engine stores for block-supports. ([42970](https://github.com/WordPress/gutenberg/pull/42970))
+-   Style engine: Add optimize flag and combine functions into wp_style_engine_get_stylesheet. ([42878](https://github.com/WordPress/gutenberg/pull/42878))
 
 ### Documentation
 
-- Add examples for `core/blocks` actions. ([42637](https://github.com/WordPress/gutenberg/pull/42637))
-- Add examples for core/viewport package. ([42921](https://github.com/WordPress/gutenberg/pull/42921))
-- Added the allowedFormat details in richtext readme. ([42426](https://github.com/WordPress/gutenberg/pull/42426))
-- Adding `@example` entries to the public API exposed in `core/blocks`. ([42745](https://github.com/WordPress/gutenberg/pull/42745))
-- Cover: Fix rendered content PHPDoc type. ([43099](https://github.com/WordPress/gutenberg/pull/43099))
-- Create Block: Update document links in templates. ([42839](https://github.com/WordPress/gutenberg/pull/42839))
-- Docs: Fix return type of home link attribute function. ([42901](https://github.com/WordPress/gutenberg/pull/42901))
-- Docs: Fix textual consistency about block attributes. ([43075](https://github.com/WordPress/gutenberg/pull/43075))
-- Docs: Link plugins GitHub release pages. ([42736](https://github.com/WordPress/gutenberg/pull/42736))
-- Document the cherry-picking automation. ([42932](https://github.com/WordPress/gutenberg/pull/42932))
-- Fixed broken external link to Mozilla Developer documentation. ([43065](https://github.com/WordPress/gutenberg/pull/43065))
-- Release Docs: Troubleshooting failed "Bump version" job. ([42936](https://github.com/WordPress/gutenberg/pull/42936))
-- Release docs: Update performance test instructions. ([43015](https://github.com/WordPress/gutenberg/pull/43015))
-- Remove the emoji characters to fix the handbook rendering. ([43028](https://github.com/WordPress/gutenberg/pull/43028))
-- Update broken internal link. ([43094](https://github.com/WordPress/gutenberg/pull/43094))
-- Update theme-json.md to include new element support and :Ref. ([42412](https://github.com/WordPress/gutenberg/pull/42412))
-- [Gutenberg Data Tutorial] Adjust the image URLs and whitespace to render correctly in the Handbook. ([42969](https://github.com/WordPress/gutenberg/pull/42969))
+-   Add examples for `core/blocks` actions. ([42637](https://github.com/WordPress/gutenberg/pull/42637))
+-   Add examples for core/viewport package. ([42921](https://github.com/WordPress/gutenberg/pull/42921))
+-   Added the allowedFormat details in richtext readme. ([42426](https://github.com/WordPress/gutenberg/pull/42426))
+-   Adding `@example` entries to the public API exposed in `core/blocks`. ([42745](https://github.com/WordPress/gutenberg/pull/42745))
+-   Cover: Fix rendered content PHPDoc type. ([43099](https://github.com/WordPress/gutenberg/pull/43099))
+-   Create Block: Update document links in templates. ([42839](https://github.com/WordPress/gutenberg/pull/42839))
+-   Docs: Fix return type of home link attribute function. ([42901](https://github.com/WordPress/gutenberg/pull/42901))
+-   Docs: Fix textual consistency about block attributes. ([43075](https://github.com/WordPress/gutenberg/pull/43075))
+-   Docs: Link plugins GitHub release pages. ([42736](https://github.com/WordPress/gutenberg/pull/42736))
+-   Document the cherry-picking automation. ([42932](https://github.com/WordPress/gutenberg/pull/42932))
+-   Fixed broken external link to Mozilla Developer documentation. ([43065](https://github.com/WordPress/gutenberg/pull/43065))
+-   Release Docs: Troubleshooting failed "Bump version" job. ([42936](https://github.com/WordPress/gutenberg/pull/42936))
+-   Release docs: Update performance test instructions. ([43015](https://github.com/WordPress/gutenberg/pull/43015))
+-   Remove the emoji characters to fix the handbook rendering. ([43028](https://github.com/WordPress/gutenberg/pull/43028))
+-   Update broken internal link. ([43094](https://github.com/WordPress/gutenberg/pull/43094))
+-   Update theme-json.md to include new element support and :Ref. ([42412](https://github.com/WordPress/gutenberg/pull/42412))
+-   [Gutenberg Data Tutorial] Adjust the image URLs and whitespace to render correctly in the Handbook. ([42969](https://github.com/WordPress/gutenberg/pull/42969))
 
 ### Code Quality
 
-- Add mutations data and helper functions to useEntityRecord. ([39595](https://github.com/WordPress/gutenberg/pull/39595))
-- Remove old WordPress 5.8 code. ([42818](https://github.com/WordPress/gutenberg/pull/42818))
+-   Add mutations data and helper functions to useEntityRecord. ([39595](https://github.com/WordPress/gutenberg/pull/39595))
+-   Remove old WordPress 5.8 code. ([42818](https://github.com/WordPress/gutenberg/pull/42818))
 
 #### Block Library
 
-- Add separate callbacks for selecting a classic or navigation menu in the nav block. ([43057](https://github.com/WordPress/gutenberg/pull/43057))
-- Avoid reliance on status constants when consuming useCreateNavigationMenu hook. ([42704](https://github.com/WordPress/gutenberg/pull/42704))
-- Home Link: Use 'sprintf' in the render callback. ([43024](https://github.com/WordPress/gutenberg/pull/43024))
-- Nav block: Extract hook for inner blocks. ([42743](https://github.com/WordPress/gutenberg/pull/42743))
-- Nav block: Normalize to function expressions. ([42744](https://github.com/WordPress/gutenberg/pull/42744))
-- Normalize usage of Notifications in Nav block. ([42706](https://github.com/WordPress/gutenberg/pull/42706))
-- Remove duplicate speak calls from navigation block. ([43079](https://github.com/WordPress/gutenberg/pull/43079))
-- Site Title: Use home_url instead of get_bloginfo. ([42857](https://github.com/WordPress/gutenberg/pull/42857))
+-   Add separate callbacks for selecting a classic or navigation menu in the nav block. ([43057](https://github.com/WordPress/gutenberg/pull/43057))
+-   Avoid reliance on status constants when consuming useCreateNavigationMenu hook. ([42704](https://github.com/WordPress/gutenberg/pull/42704))
+-   Home Link: Use 'sprintf' in the render callback. ([43024](https://github.com/WordPress/gutenberg/pull/43024))
+-   Nav block: Extract hook for inner blocks. ([42743](https://github.com/WordPress/gutenberg/pull/42743))
+-   Nav block: Normalize to function expressions. ([42744](https://github.com/WordPress/gutenberg/pull/42744))
+-   Normalize usage of Notifications in Nav block. ([42706](https://github.com/WordPress/gutenberg/pull/42706))
+-   Remove duplicate speak calls from navigation block. ([43079](https://github.com/WordPress/gutenberg/pull/43079))
+-   Site Title: Use home_url instead of get_bloginfo. ([42857](https://github.com/WordPress/gutenberg/pull/42857))
 
 #### Site Editor
 
-- Navigation Menu Sidebar: Remove unnecessary Fragment. ([43021](https://github.com/WordPress/gutenberg/pull/43021))
+-   Navigation Menu Sidebar: Remove unnecessary Fragment. ([43021](https://github.com/WordPress/gutenberg/pull/43021))
 
 #### Global Styles
 
-- useGlobalStylesOutput: Use memo for derived values. ([42917](https://github.com/WordPress/gutenberg/pull/42917))
+-   useGlobalStylesOutput: Use memo for derived values. ([42917](https://github.com/WordPress/gutenberg/pull/42917))
 
 ### Tools
 
-- Use git for `wp-env`'s default WordPress version. ([42826](https://github.com/WordPress/gutenberg/pull/42826))
+-   Use git for `wp-env`'s default WordPress version. ([42826](https://github.com/WordPress/gutenberg/pull/42826))
 
 #### Testing
 
-- Migrate deprecated node matcher tests to playwright. ([42759](https://github.com/WordPress/gutenberg/pull/42759))
-- Migrate group block tests to Playwright. ([42801](https://github.com/WordPress/gutenberg/pull/42801))
-- Migrate missing block tests to Playwright. ([41680](https://github.com/WordPress/gutenberg/pull/41680))
-- Migrate Convert Block Type test to Playwright. ([42760](https://github.com/WordPress/gutenberg/pull/42760))
+-   Migrate deprecated node matcher tests to playwright. ([42759](https://github.com/WordPress/gutenberg/pull/42759))
+-   Migrate group block tests to Playwright. ([42801](https://github.com/WordPress/gutenberg/pull/42801))
+-   Migrate missing block tests to Playwright. ([41680](https://github.com/WordPress/gutenberg/pull/41680))
+-   Migrate Convert Block Type test to Playwright. ([42760](https://github.com/WordPress/gutenberg/pull/42760))
 
 #### Build Tooling
 
-- Lodash: Refactor away from `_.flatMap()`. ([42360](https://github.com/WordPress/gutenberg/pull/42360))
-- Standardize script naming in main package.json. ([42368](https://github.com/WordPress/gutenberg/pull/42368))
+-   Lodash: Refactor away from `_.flatMap()`. ([42360](https://github.com/WordPress/gutenberg/pull/42360))
+-   Standardize script naming in main package.json. ([42368](https://github.com/WordPress/gutenberg/pull/42368))
 
 #### Block Library
 
-- Nav block: Move overlay colors to the responsive wrapper. ([42875](https://github.com/WordPress/gutenberg/pull/42875))
-- Navigation block: Extract navigation block utils. ([42865](https://github.com/WordPress/gutenberg/pull/42865))
-- Navigation: Overlay: Fix link inheritance. ([42929](https://github.com/WordPress/gutenberg/pull/42929))
-- Page List: Fix indentation in PHP file. ([42852](https://github.com/WordPress/gutenberg/pull/42852))
-- Query Pagination: Correctly position the  "next" link on the first page. ([42764](https://github.com/WordPress/gutenberg/pull/42764))
-- Search Block: Remove margins from the input. ([42959](https://github.com/WordPress/gutenberg/pull/42959))
-- Transforms: Add group unwrap. ([42685](https://github.com/WordPress/gutenberg/pull/42685))
-- [Post Title]: Do not add `rel` attribute if empty. ([42855](https://github.com/WordPress/gutenberg/pull/42855))
-- [Query Loop]: Try filters with ToolsPanel. ([42629](https://github.com/WordPress/gutenberg/pull/42629))
+-   Nav block: Move overlay colors to the responsive wrapper. ([42875](https://github.com/WordPress/gutenberg/pull/42875))
+-   Navigation block: Extract navigation block utils. ([42865](https://github.com/WordPress/gutenberg/pull/42865))
+-   Navigation: Overlay: Fix link inheritance. ([42929](https://github.com/WordPress/gutenberg/pull/42929))
+-   Page List: Fix indentation in PHP file. ([42852](https://github.com/WordPress/gutenberg/pull/42852))
+-   Query Pagination: Correctly position the "next" link on the first page. ([42764](https://github.com/WordPress/gutenberg/pull/42764))
+-   Search Block: Remove margins from the input. ([42959](https://github.com/WordPress/gutenberg/pull/42959))
+-   Transforms: Add group unwrap. ([42685](https://github.com/WordPress/gutenberg/pull/42685))
+-   [Post Title]: Do not add `rel` attribute if empty. ([42855](https://github.com/WordPress/gutenberg/pull/42855))
+-   [Query Loop]: Try filters with ToolsPanel. ([42629](https://github.com/WordPress/gutenberg/pull/42629))
 
 #### Global Styles
 
-- Add block spacing to root block support UI. ([42797](https://github.com/WordPress/gutenberg/pull/42797))
-- Elements: Update the load order of the CSS in the Site Editor. ([42863](https://github.com/WordPress/gutenberg/pull/42863))
-- Heading element UI controls. ([42176](https://github.com/WordPress/gutenberg/pull/42176))
-- Theme JSON: Add a static $blocks_metadata data definition to the Gutenberg instance of WP_Theme_JSON. ([42776](https://github.com/WordPress/gutenberg/pull/42776))
-- Upsize typography panel components. ([42718](https://github.com/WordPress/gutenberg/pull/42718))
+-   Add block spacing to root block support UI. ([42797](https://github.com/WordPress/gutenberg/pull/42797))
+-   Elements: Update the load order of the CSS in the Site Editor. ([42863](https://github.com/WordPress/gutenberg/pull/42863))
+-   Heading element UI controls. ([42176](https://github.com/WordPress/gutenberg/pull/42176))
+-   Theme JSON: Add a static $blocks_metadata data definition to the Gutenberg instance of WP_Theme_JSON. ([42776](https://github.com/WordPress/gutenberg/pull/42776))
+-   Upsize typography panel components. ([42718](https://github.com/WordPress/gutenberg/pull/42718))
 
 #### Widgets Editor
 
-- Format Library: Add missing keyboard shortcut description in customizer widget. ([43044](https://github.com/WordPress/gutenberg/pull/43044))
+-   Format Library: Add missing keyboard shortcut description in customizer widget. ([43044](https://github.com/WordPress/gutenberg/pull/43044))
 
 #### Reusable Blocks
 
-- Make template part and reusable block creation language consistent. ([43032](https://github.com/WordPress/gutenberg/pull/43032))
+-   Make template part and reusable block creation language consistent. ([43032](https://github.com/WordPress/gutenberg/pull/43032))
 
 #### CSS & Styling
 
-- Navigation: Try to keep :Where just for paddings. ([42967](https://github.com/WordPress/gutenberg/pull/42967))
+-   Navigation: Try to keep :Where just for paddings. ([42967](https://github.com/WordPress/gutenberg/pull/42967))
 
 #### Accessibility
 
-- Change shortcut text for redo tooltip on Windows. ([42830](https://github.com/WordPress/gutenberg/pull/42830))
+-   Change shortcut text for redo tooltip on Windows. ([42830](https://github.com/WordPress/gutenberg/pull/42830))
 
 #### Block Editor
 
-- Quote: Unwrap on Backspace at start. ([42808](https://github.com/WordPress/gutenberg/pull/42808))
+-   Quote: Unwrap on Backspace at start. ([42808](https://github.com/WordPress/gutenberg/pull/42808))
 
 #### Site Editor
 
-- Add a 'View Site' link in the site editor. ([42331](https://github.com/WordPress/gutenberg/pull/42331))
+-   Add a 'View Site' link in the site editor. ([42331](https://github.com/WordPress/gutenberg/pull/42331))
 
 #### Full Site Editing
 
-- [Full Site Editing]: Update `clear customizations` copy for templates. ([41765](https://github.com/WordPress/gutenberg/pull/41765))
-
-
-## First time contributors
+-   [Full Site Editing]: Update `clear customizations` copy for templates. ([41765](https://github.com/WordPress/gutenberg/pull/41765))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @fellyph: Rendering html for the author description at the editor. ([42109](https://github.com/WordPress/gutenberg/pull/42109))
-- @merkys7: Fix social-link block missing 'width' and 'height' attributes. ([41373](https://github.com/WordPress/gutenberg/pull/41373))
-- @Smit2808: Added the allowedFormat details in richtext readme. ([42426](https://github.com/WordPress/gutenberg/pull/42426))
-- @theminaldiwan: Fixed alignment issue of tagcloud block when align center. ([43017](https://github.com/WordPress/gutenberg/pull/43017))
+The following PRs were merged by first-time contributors:
 
+-   @fellyph: Rendering html for the author description at the editor. ([42109](https://github.com/WordPress/gutenberg/pull/42109))
+-   @merkys7: Fix social-link block missing 'width' and 'height' attributes. ([41373](https://github.com/WordPress/gutenberg/pull/41373))
+-   @Smit2808: Added the allowedFormat details in richtext readme. ([42426](https://github.com/WordPress/gutenberg/pull/42426))
+-   @theminaldiwan: Fixed alignment issue of tagcloud block when align center. ([43017](https://github.com/WordPress/gutenberg/pull/43017))
 
 ## Contributors
 
@@ -13348,246 +24667,267 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @andrewserong @aristath @carolinan @chad1008 @ciampo @derekblank @dougwollison @ellatrix @fellyph @geriux @getdave @glendaviesnz @ItsJonQ @jameskoster @jasmussen @jorgefilipecosta @JustinyAhin @kjohnson @Mamaduka @manzoorwanijk @matiasbenedetto @mcsf @merkys7 @mikachan @mirka @noahtallen @ntsekouras @pavanpatil1 @pooja-muchandikar @ramonjd @ryanwelcher @SavPhill @scruffian @shimotmk @SiobhyB @Smit2808 @Soean @stokesman @t-hamano @talldan @tellthemachines @theminaldiwan @tyxla @walbo
 
-
 = 13.8.1 =
 
+## Changelog
+
+### Enhancements
 
+-   Allow removing CSS declarations from the WP_Style_Engine_CSS_Declarations object. ([42428](https://github.com/WordPress/gutenberg/pull/42428))
+-   Equalize modal content padding. ([42370](https://github.com/WordPress/gutenberg/pull/42370))
+-   Remove top margin on the first paragraph in a modal. ([42369](https://github.com/WordPress/gutenberg/pull/42369))
 
-## Changelog
+#### Components
 
+-   BorderControl: Render border color/style dropdown as UnitControl prefix. ([42212](https://github.com/WordPress/gutenberg/pull/42212))
+-   ColorPicker: Cleanly implement large size. ([42002](https://github.com/WordPress/gutenberg/pull/42002))
+-   ComboboxControl: Refactor `onKeyDown` to use `keyboardEvent.code`. ([42569](https://github.com/WordPress/gutenberg/pull/42569))
+-   Elevation: Convert component to TypeScript. ([42302](https://github.com/WordPress/gutenberg/pull/42302))
+-   InputControl: Decrease large default padding if has prefix/suffix. ([42166](https://github.com/WordPress/gutenberg/pull/42166))
+-   ScrollLock: Covert component to TypeScript. ([42303](https://github.com/WordPress/gutenberg/pull/42303))
+-   SelectControl: Add flag for larger default size. ([42456](https://github.com/WordPress/gutenberg/pull/42456))
+-   Shortcut: Covert component to TypeScript. ([42272](https://github.com/WordPress/gutenberg/pull/42272))
+-   Divider: Complete TypeScript migration of component. ([41991](https://github.com/WordPress/gutenberg/pull/41991))
+-   ToggleGroupControl: Add size variants. ([42008](https://github.com/WordPress/gutenberg/pull/42008))
+-   UnitControl: Update unit select's focus styles. ([42383](https://github.com/WordPress/gutenberg/pull/42383))
+-   BorderControl: Add missing changelog for accessibility enhancements. ([42411](https://github.com/WordPress/gutenberg/pull/42411))
+-   CustomSelectControl: Use styles from SelectControl. ([42460](https://github.com/WordPress/gutenberg/pull/42460))
+-   Dropdown: Add wrapper for custom padding. ([42595](https://github.com/WordPress/gutenberg/pull/42595))
+-   InputControl: Add padding wrapper for prefix/suffix. ([42378](https://github.com/WordPress/gutenberg/pull/42378))
+-   ScrollLock: Improve Storybook story for documentation view. ([42344](https://github.com/WordPress/gutenberg/pull/42344))
+-   `ColorPalette`: Display checkered preview background when `value` is transparent. ([42232](https://github.com/WordPress/gutenberg/pull/42232))
+
+#### Block Library
+
+-   Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
+-   Template Part: Swap block action places. ([42221](https://github.com/WordPress/gutenberg/pull/42221))
+-   Template Parts: Add search to replacement modal. ([42459](https://github.com/WordPress/gutenberg/pull/42459))
+-   Image: Add border block support for color, width, and style. ([31366](https://github.com/WordPress/gutenberg/pull/31366))
+-   List v2: Remove quote transforms as removed by Quote v2. ([42700](https://github.com/WordPress/gutenberg/pull/42700))
+-   Merge Comments and Post Comments blocks. ([41807](https://github.com/WordPress/gutenberg/pull/41807))
+-   Theme.json: Add support for heading / caption elements in theme.json schema. ([42433](https://github.com/WordPress/gutenberg/pull/42433))
 
-### Enhancements
+#### Global Styles
 
-- Allow removing CSS declarations from the WP_Style_Engine_CSS_Declarations object. ([42428](https://github.com/WordPress/gutenberg/pull/42428))
-- Equalize modal content padding. ([42370](https://github.com/WordPress/gutenberg/pull/42370))
-- Remove top margin on the first paragraph in a modal. ([42369](https://github.com/WordPress/gutenberg/pull/42369))
-
-#### Components
-- BorderControl: Render border color/style dropdown as UnitControl prefix. ([42212](https://github.com/WordPress/gutenberg/pull/42212))
-- ColorPicker: Cleanly implement large size. ([42002](https://github.com/WordPress/gutenberg/pull/42002))
-- ComboboxControl: Refactor `onKeyDown` to use `keyboardEvent.code`. ([42569](https://github.com/WordPress/gutenberg/pull/42569))
-- Elevation: Convert component to TypeScript. ([42302](https://github.com/WordPress/gutenberg/pull/42302))
-- InputControl: Decrease large default padding if has prefix/suffix. ([42166](https://github.com/WordPress/gutenberg/pull/42166))
-- ScrollLock: Covert component to TypeScript. ([42303](https://github.com/WordPress/gutenberg/pull/42303))
-- SelectControl: Add flag for larger default size. ([42456](https://github.com/WordPress/gutenberg/pull/42456))
-- Shortcut: Covert component to TypeScript. ([42272](https://github.com/WordPress/gutenberg/pull/42272))
-- Divider: Complete TypeScript migration of component. ([41991](https://github.com/WordPress/gutenberg/pull/41991))
-- ToggleGroupControl: Add size variants. ([42008](https://github.com/WordPress/gutenberg/pull/42008))
-- UnitControl: Update unit select's focus styles. ([42383](https://github.com/WordPress/gutenberg/pull/42383))
-- BorderControl: Add missing changelog for accessibility enhancements. ([42411](https://github.com/WordPress/gutenberg/pull/42411))
-- CustomSelectControl: Use styles from SelectControl. ([42460](https://github.com/WordPress/gutenberg/pull/42460))
-- Dropdown: Add wrapper for custom padding. ([42595](https://github.com/WordPress/gutenberg/pull/42595))
-- InputControl: Add padding wrapper for prefix/suffix. ([42378](https://github.com/WordPress/gutenberg/pull/42378))
-- ScrollLock: Improve Storybook story for documentation view. ([42344](https://github.com/WordPress/gutenberg/pull/42344))
-- `ColorPalette`: Display checkered preview background when `value` is transparent. ([42232](https://github.com/WordPress/gutenberg/pull/42232))
-
-#### Block Library
-- Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
-- Template Part: Swap block action places. ([42221](https://github.com/WordPress/gutenberg/pull/42221))
-- Template Parts: Add search to replacement modal. ([42459](https://github.com/WordPress/gutenberg/pull/42459))
-- Image: Add border block support for color, width, and style. ([31366](https://github.com/WordPress/gutenberg/pull/31366))
-- List v2: Remove quote transforms as removed by Quote v2. ([42700](https://github.com/WordPress/gutenberg/pull/42700))
-- Merge Comments and Post Comments blocks. ([41807](https://github.com/WordPress/gutenberg/pull/41807))
-- Theme.json: Add support for heading / caption elements in theme.json schema. ([42433](https://github.com/WordPress/gutenberg/pull/42433))
-
-#### Global Styles
-- Add layout content size controls to global styles. ([42309](https://github.com/WordPress/gutenberg/pull/42309))
-- Core CSS support for root padding and alignfull blocks. ([42085](https://github.com/WordPress/gutenberg/pull/42085))
-- Theme.json: Add block support feature level selectors for blocks. ([42087](https://github.com/WordPress/gutenberg/pull/42087))
+-   Add layout content size controls to global styles. ([42309](https://github.com/WordPress/gutenberg/pull/42309))
+-   Core CSS support for root padding and alignfull blocks. ([42085](https://github.com/WordPress/gutenberg/pull/42085))
+-   Theme.json: Add block support feature level selectors for blocks. ([42087](https://github.com/WordPress/gutenberg/pull/42087))
 
 #### Document Settings
-- Make 'Move to trash' button full width. ([42577](https://github.com/WordPress/gutenberg/pull/42577))
+
+-   Make 'Move to trash' button full width. ([42577](https://github.com/WordPress/gutenberg/pull/42577))
 
 #### Block Editor
-- Add setting to display rich text toolbar inline. ([42399](https://github.com/WordPress/gutenberg/pull/42399))
-- Add block variations for individual template parts. ([42454](https://github.com/WordPress/gutenberg/pull/42454))
-- Enable `onEnter` support for group block. ([40724](https://github.com/WordPress/gutenberg/pull/40724))
+
+-   Add setting to display rich text toolbar inline. ([42399](https://github.com/WordPress/gutenberg/pull/42399))
+-   Add block variations for individual template parts. ([42454](https://github.com/WordPress/gutenberg/pull/42454))
+-   Enable `onEnter` support for group block. ([40724](https://github.com/WordPress/gutenberg/pull/40724))
 
 #### Site Editor
-- On template creation, don't show search if not needed. ([42357](https://github.com/WordPress/gutenberg/pull/42357))
+
+-   On template creation, don't show search if not needed. ([42357](https://github.com/WordPress/gutenberg/pull/42357))
 
 #### Accessibility
-- BorderControl: Update labelling, tooltips and wrap with fieldset and legend. ([42348](https://github.com/WordPress/gutenberg/pull/42348))
+
+-   BorderControl: Update labelling, tooltips and wrap with fieldset and legend. ([42348](https://github.com/WordPress/gutenberg/pull/42348))
 
 #### Icons
-- Add shuffle icon to library. ([42193](https://github.com/WordPress/gutenberg/pull/42193))
+
+-   Add shuffle icon to library. ([42193](https://github.com/WordPress/gutenberg/pull/42193))
 
 #### Nested / Inner Blocks
-- Quote: Use nested blocks. ([25892](https://github.com/WordPress/gutenberg/pull/25892))
+
+-   Quote: Use nested blocks. ([25892](https://github.com/WordPress/gutenberg/pull/25892))
 
 #### Colors
-- Update color palette popover style. ([41900](https://github.com/WordPress/gutenberg/pull/41900))
-
-
-### Bug Fixes
-
-- Env: Download WordPress PHPUnit Into Container. ([41780](https://github.com/WordPress/gutenberg/pull/41780))
-- Env: Restrict `WP_TESTS_DOMAIN` constant to just hostname and not home URL. ([41039](https://github.com/WordPress/gutenberg/pull/41039))
-- Fix: Condition bug on BoxControl. ([42402](https://github.com/WordPress/gutenberg/pull/42402))
-- MaybeCategoryPanel: Update category selector. ([42663](https://github.com/WordPress/gutenberg/pull/42663))
-- Post title: Fix single line paste. ([42321](https://github.com/WordPress/gutenberg/pull/42321))
-- Scripts: Exit error code 1 when status value is null. ([42396](https://github.com/WordPress/gutenberg/pull/42396))
-- Style engine: Check item value validity. ([42487](https://github.com/WordPress/gutenberg/pull/42487))
-- Utilize WordPress PHPUnit Test Library Included By `wp-env`. ([41852](https://github.com/WordPress/gutenberg/pull/41852))
-- fix: Correct alt text footnote spacing. ([42504](https://github.com/WordPress/gutenberg/pull/42504))
-
-#### Block Library
-- Cover Block: Prevent transform to Group block when featured image is set. ([42638](https://github.com/WordPress/gutenberg/pull/42638))
-- Cover block: Adding background-size and background-repeat properties to the block CSS. ([42470](https://github.com/WordPress/gutenberg/pull/42470))
-- Fix tab/focus order issue in Media & text block. ([40806](https://github.com/WordPress/gutenberg/pull/40806))
-- List v2: Add forward delete. ([42564](https://github.com/WordPress/gutenberg/pull/42564))
-- List v2: Improve paste handling. ([42524](https://github.com/WordPress/gutenberg/pull/42524))
-- List v2: Merge with nested items. ([42551](https://github.com/WordPress/gutenberg/pull/42551))
-- List v2: Switch to default block type on Backspace from start. ([42633](https://github.com/WordPress/gutenberg/pull/42633))
-- Page List: Fetch items with 'view' context. ([42559](https://github.com/WordPress/gutenberg/pull/42559))
-- Social Icons Block: Fix button opacity in template parts. ([42641](https://github.com/WordPress/gutenberg/pull/42641))
-- Group block: Add context to the word "Row". ([42255](https://github.com/WordPress/gutenberg/pull/42255))
-- Hide prefix and suffix placeholders in post terms. ([42418](https://github.com/WordPress/gutenberg/pull/42418))
-- Theme.json: Fix schema for button elements. ([42431](https://github.com/WordPress/gutenberg/pull/42431))
-- [Media Text]: Fix deprecations regression. ([42816](https://github.com/WordPress/gutenberg/pull/42816))
-- Site Logo: Add the missing 'site_icon_url' to the REST_API index. ([42957](https://github.com/WordPress/gutenberg/pull/42957))
-
-#### Components
-- AnglePickerControl: Fix gap between elements in RTL mode. ([42534](https://github.com/WordPress/gutenberg/pull/42534))
-- ColorPalette: Fix background image in RTL mode. ([42510](https://github.com/WordPress/gutenberg/pull/42510))
-- Context System: Don't explicitly set `undefined` value to `children`. ([42686](https://github.com/WordPress/gutenberg/pull/42686))
-- Popover: Fix width on `expandOnMobile`. ([42635](https://github.com/WordPress/gutenberg/pull/42635))
-- RangeControl: Clamp initialPosition between min and max values. ([42571](https://github.com/WordPress/gutenberg/pull/42571))
-- Tooltip: Avoid unnecessary re-renders of `<select>` child elements. ([42483](https://github.com/WordPress/gutenberg/pull/42483))
-- Tooltip: Fix positioning by anchoring to child element. ([41268](https://github.com/WordPress/gutenberg/pull/41268))
+
+-   Update color palette popover style. ([41900](https://github.com/WordPress/gutenberg/pull/41900))
+
+### Bug Fixes
+
+-   Env: Download WordPress PHPUnit Into Container. ([41780](https://github.com/WordPress/gutenberg/pull/41780))
+-   Env: Restrict `WP_TESTS_DOMAIN` constant to just hostname and not home URL. ([41039](https://github.com/WordPress/gutenberg/pull/41039))
+-   Fix: Condition bug on BoxControl. ([42402](https://github.com/WordPress/gutenberg/pull/42402))
+-   MaybeCategoryPanel: Update category selector. ([42663](https://github.com/WordPress/gutenberg/pull/42663))
+-   Post title: Fix single line paste. ([42321](https://github.com/WordPress/gutenberg/pull/42321))
+-   Scripts: Exit error code 1 when status value is null. ([42396](https://github.com/WordPress/gutenberg/pull/42396))
+-   Style engine: Check item value validity. ([42487](https://github.com/WordPress/gutenberg/pull/42487))
+-   Utilize WordPress PHPUnit Test Library Included By `wp-env`. ([41852](https://github.com/WordPress/gutenberg/pull/41852))
+-   fix: Correct alt text footnote spacing. ([42504](https://github.com/WordPress/gutenberg/pull/42504))
+
+#### Block Library
+
+-   Cover Block: Prevent transform to Group block when featured image is set. ([42638](https://github.com/WordPress/gutenberg/pull/42638))
+-   Cover block: Adding background-size and background-repeat properties to the block CSS. ([42470](https://github.com/WordPress/gutenberg/pull/42470))
+-   Fix tab/focus order issue in Media & text block. ([40806](https://github.com/WordPress/gutenberg/pull/40806))
+-   List v2: Add forward delete. ([42564](https://github.com/WordPress/gutenberg/pull/42564))
+-   List v2: Improve paste handling. ([42524](https://github.com/WordPress/gutenberg/pull/42524))
+-   List v2: Merge with nested items. ([42551](https://github.com/WordPress/gutenberg/pull/42551))
+-   List v2: Switch to default block type on Backspace from start. ([42633](https://github.com/WordPress/gutenberg/pull/42633))
+-   Page List: Fetch items with 'view' context. ([42559](https://github.com/WordPress/gutenberg/pull/42559))
+-   Social Icons Block: Fix button opacity in template parts. ([42641](https://github.com/WordPress/gutenberg/pull/42641))
+-   Group block: Add context to the word "Row". ([42255](https://github.com/WordPress/gutenberg/pull/42255))
+-   Hide prefix and suffix placeholders in post terms. ([42418](https://github.com/WordPress/gutenberg/pull/42418))
+-   Theme.json: Fix schema for button elements. ([42431](https://github.com/WordPress/gutenberg/pull/42431))
+-   [Media Text]: Fix deprecations regression. ([42816](https://github.com/WordPress/gutenberg/pull/42816))
+-   Site Logo: Add the missing 'site_icon_url' to the REST_API index. ([42957](https://github.com/WordPress/gutenberg/pull/42957))
+
+#### Components
+
+-   AnglePickerControl: Fix gap between elements in RTL mode. ([42534](https://github.com/WordPress/gutenberg/pull/42534))
+-   ColorPalette: Fix background image in RTL mode. ([42510](https://github.com/WordPress/gutenberg/pull/42510))
+-   Context System: Don't explicitly set `undefined` value to `children`. ([42686](https://github.com/WordPress/gutenberg/pull/42686))
+-   Popover: Fix width on `expandOnMobile`. ([42635](https://github.com/WordPress/gutenberg/pull/42635))
+-   RangeControl: Clamp initialPosition between min and max values. ([42571](https://github.com/WordPress/gutenberg/pull/42571))
+-   Tooltip: Avoid unnecessary re-renders of `<select>` child elements. ([42483](https://github.com/WordPress/gutenberg/pull/42483))
+-   Tooltip: Fix positioning by anchoring to child element. ([41268](https://github.com/WordPress/gutenberg/pull/41268))
 
 #### Accessibility
-- Add aria-hidden to query pagination arrows. ([42583](https://github.com/WordPress/gutenberg/pull/42583))
-- Fix labelling and semantics of the paragraph block Left to right control. ([42324](https://github.com/WordPress/gutenberg/pull/42324))
-- Fix mismatching label and visible text on the Toggle block inserter button. ([42359](https://github.com/WordPress/gutenberg/pull/42359))
-- Fix: The description text of block movers for horizontal movement. ([42393](https://github.com/WordPress/gutenberg/pull/42393))
-- Replace clickable div elements with buttons in the Add template modal. ([42668](https://github.com/WordPress/gutenberg/pull/42668))
+
+-   Add aria-hidden to query pagination arrows. ([42583](https://github.com/WordPress/gutenberg/pull/42583))
+-   Fix labelling and semantics of the paragraph block Left to right control. ([42324](https://github.com/WordPress/gutenberg/pull/42324))
+-   Fix mismatching label and visible text on the Toggle block inserter button. ([42359](https://github.com/WordPress/gutenberg/pull/42359))
+-   Fix: The description text of block movers for horizontal movement. ([42393](https://github.com/WordPress/gutenberg/pull/42393))
+-   Replace clickable div elements with buttons in the Add template modal. ([42668](https://github.com/WordPress/gutenberg/pull/42668))
 
 #### Post Editor
-- Avoid 403 errors for users with low permissions. ([42413](https://github.com/WordPress/gutenberg/pull/42413))
-- Display post template selection for non-admin users. ([42705](https://github.com/WordPress/gutenberg/pull/42705))
-- Editor: Fix typo in translation string. ([42673](https://github.com/WordPress/gutenberg/pull/42673))
+
+-   Avoid 403 errors for users with low permissions. ([42413](https://github.com/WordPress/gutenberg/pull/42413))
+-   Display post template selection for non-admin users. ([42705](https://github.com/WordPress/gutenberg/pull/42705))
+-   Editor: Fix typo in translation string. ([42673](https://github.com/WordPress/gutenberg/pull/42673))
 
 #### Block Editor
-- Prevent link control popover from going offscreen. ([42389](https://github.com/WordPress/gutenberg/pull/42389))
-- Writing flow: Fix caret movement for multiple lines. ([42423](https://github.com/WordPress/gutenberg/pull/42423))
-- Writing flow: Fix caret placement in corners. ([42437](https://github.com/WordPress/gutenberg/pull/42437))
-- Writing flow: Esc should enter Nav mode consistently, avoid focus loss when clearing selection. ([42530](https://github.com/WordPress/gutenberg/pull/42530))
+
+-   Prevent link control popover from going offscreen. ([42389](https://github.com/WordPress/gutenberg/pull/42389))
+-   Writing flow: Fix caret movement for multiple lines. ([42423](https://github.com/WordPress/gutenberg/pull/42423))
+-   Writing flow: Fix caret placement in corners. ([42437](https://github.com/WordPress/gutenberg/pull/42437))
+-   Writing flow: Esc should enter Nav mode consistently, avoid focus loss when clearing selection. ([42530](https://github.com/WordPress/gutenberg/pull/42530))
 
 #### CSS & Styling
-- Elements: Buttons: Fix the path with the css to style the cursor for all button elements. ([42129](https://github.com/WordPress/gutenberg/pull/42129))
-- Link elements: Add a :where selector to the :Not to lower specificity. ([42669](https://github.com/WordPress/gutenberg/pull/42669))
-- Button Block: Change text-decoration style to low specificity. ([42545](https://github.com/WordPress/gutenberg/pull/42545))
-- Element styles: Adding stylesheet to load in the editor. ([42132](https://github.com/WordPress/gutenberg/pull/42132))
+
+-   Elements: Buttons: Fix the path with the css to style the cursor for all button elements. ([42129](https://github.com/WordPress/gutenberg/pull/42129))
+-   Link elements: Add a :where selector to the :Not to lower specificity. ([42669](https://github.com/WordPress/gutenberg/pull/42669))
+-   Button Block: Change text-decoration style to low specificity. ([42545](https://github.com/WordPress/gutenberg/pull/42545))
+-   Element styles: Adding stylesheet to load in the editor. ([42132](https://github.com/WordPress/gutenberg/pull/42132))
 
 #### Global Styles
-- Elements: Fix heading and caption element selectors. ([42479](https://github.com/WordPress/gutenberg/pull/42479))
-- Layout content size controls: Add left alignment to line up with description and other elements. ([42576](https://github.com/WordPress/gutenberg/pull/42576))
-- Layout: Ensure defaultEditorStyles are still output in Classic themes. ([42906](https://github.com/WordPress/gutenberg/pull/42906))
-- Theme JSON Resolver: Update cache check to also check that the object is an instance of the Gutenberg version. ([42756](https://github.com/WordPress/gutenberg/pull/42756))
+
+-   Elements: Fix heading and caption element selectors. ([42479](https://github.com/WordPress/gutenberg/pull/42479))
+-   Layout content size controls: Add left alignment to line up with description and other elements. ([42576](https://github.com/WordPress/gutenberg/pull/42576))
+-   Layout: Ensure defaultEditorStyles are still output in Classic themes. ([42906](https://github.com/WordPress/gutenberg/pull/42906))
+-   Theme JSON Resolver: Update cache check to also check that the object is an instance of the Gutenberg version. ([42756](https://github.com/WordPress/gutenberg/pull/42756))
 
 #### Widgets Editor
-- Add configuration option to skip autop on freeform blocks when parsing blocks. ([42623](https://github.com/WordPress/gutenberg/pull/42623))
+
+-   Add configuration option to skip autop on freeform blocks when parsing blocks. ([42623](https://github.com/WordPress/gutenberg/pull/42623))
 
 #### Rich Text
-- Annotation API: Fix __experimentalGetPropsForEditableTreePreparation. ([42596](https://github.com/WordPress/gutenberg/pull/42596))
+
+-   Annotation API: Fix \_\_experimentalGetPropsForEditableTreePreparation. ([42596](https://github.com/WordPress/gutenberg/pull/42596))
 
 #### Site Editor
-- Fix typo in default category template's description. ([42586](https://github.com/WordPress/gutenberg/pull/42586))
-- [Site Editor]: Fix Reakit warning on creation template component. ([42392](https://github.com/WordPress/gutenberg/pull/42392))
-- Site Editor: Remove leftover class. ([42591](https://github.com/WordPress/gutenberg/pull/42591))
+
+-   Fix typo in default category template's description. ([42586](https://github.com/WordPress/gutenberg/pull/42586))
+-   [Site Editor]: Fix Reakit warning on creation template component. ([42392](https://github.com/WordPress/gutenberg/pull/42392))
+-   Site Editor: Remove leftover class. ([42591](https://github.com/WordPress/gutenberg/pull/42591))
 
 #### Themes
-- Remove core/post-comments-form block styles that are overriding button element styles. ([42053](https://github.com/WordPress/gutenberg/pull/42053))
+
+-   Remove core/post-comments-form block styles that are overriding button element styles. ([42053](https://github.com/WordPress/gutenberg/pull/42053))
 
 #### Icons
-- Icons Package: Fix line icons styling. ([40315](https://github.com/WordPress/gutenberg/pull/40315))
 
+-   Icons Package: Fix line icons styling. ([40315](https://github.com/WordPress/gutenberg/pull/40315))
 
 ### Performance
 
 #### Components
-- Lodash: Refactor a few components away from `_.isEmpty()`. ([42468](https://github.com/WordPress/gutenberg/pull/42468))
-- Lodash: Refactor away from `_.compact()`. ([42438](https://github.com/WordPress/gutenberg/pull/42438))
+
+-   Lodash: Refactor a few components away from `_.isEmpty()`. ([42468](https://github.com/WordPress/gutenberg/pull/42468))
+-   Lodash: Refactor away from `_.compact()`. ([42438](https://github.com/WordPress/gutenberg/pull/42438))
 
 #### Post Editor
-- Lodash: Refactor `PageAttributesParent` away from `_.deburr()`. ([42429](https://github.com/WordPress/gutenberg/pull/42429))
+
+-   Lodash: Refactor `PageAttributesParent` away from `_.deburr()`. ([42429](https://github.com/WordPress/gutenberg/pull/42429))
 
 #### Testing
-- Lodash: Refactor away from `_.snakeCase()`. ([42427](https://github.com/WordPress/gutenberg/pull/42427))
+
+-   Lodash: Refactor away from `_.snakeCase()`. ([42427](https://github.com/WordPress/gutenberg/pull/42427))
 
 #### Block Validation/Deprecation
-- Lodash: Refactor away from `_.fromPairs()`. ([42217](https://github.com/WordPress/gutenberg/pull/42217))
 
+-   Lodash: Refactor away from `_.fromPairs()`. ([42217](https://github.com/WordPress/gutenberg/pull/42217))
 
 ### Experiments
 
-- Style Engine Rules & Store objects. ([42222](https://github.com/WordPress/gutenberg/pull/42222))
-- Style Engine: Add a WP_Style_Engine_Processor object. ([42463](https://github.com/WordPress/gutenberg/pull/42463))
+-   Style Engine Rules & Store objects. ([42222](https://github.com/WordPress/gutenberg/pull/42222))
+-   Style Engine: Add a WP_Style_Engine_Processor object. ([42463](https://github.com/WordPress/gutenberg/pull/42463))
 
 #### CSS & Styling
-- Style Engine: Add elements to the frontend. ([41732](https://github.com/WordPress/gutenberg/pull/41732))
+
+-   Style Engine: Add elements to the frontend. ([41732](https://github.com/WordPress/gutenberg/pull/41732))
 
 #### Global Styles
-- Block supports: Add fluid typography. ([39529](https://github.com/WordPress/gutenberg/pull/39529))
-- Layout: Reduce specificity of fallback blockGap styles. ([42665](https://github.com/WordPress/gutenberg/pull/42665))
 
+-   Block supports: Add fluid typography. ([39529](https://github.com/WordPress/gutenberg/pull/39529))
+-   Layout: Reduce specificity of fallback blockGap styles. ([42665](https://github.com/WordPress/gutenberg/pull/42665))
 
 ### Documentation
 
-- Add @examples to core/blocks selectors. ([42572](https://github.com/WordPress/gutenberg/pull/42572))
-- Consolidate editor filters and actions. ([42356](https://github.com/WordPress/gutenberg/pull/42356))
-- Correct the documented return type for `WP_Block_Parser::Render()`. ([42642](https://github.com/WordPress/gutenberg/pull/42642))
-- Doc: Update getEntityRecord/s param description. ([42488](https://github.com/WordPress/gutenberg/pull/42488))
-- Docs: Add `variations` key to `block.json` JSON schema definition. ([42539](https://github.com/WordPress/gutenberg/pull/42539))
-- Docs: Add missing data module references. ([42651](https://github.com/WordPress/gutenberg/pull/42651))
-- Fix: Repetition of wrong word in string. ([42621](https://github.com/WordPress/gutenberg/pull/42621))
-- Flex: Remove experimental from documentation and storybook. ([42301](https://github.com/WordPress/gutenberg/pull/42301))
-- Include section on how to test code for a given WP major. ([42390](https://github.com/WordPress/gutenberg/pull/42390))
-- Marking internal action as @ignore to remove them from the documentation. ([42163](https://github.com/WordPress/gutenberg/pull/42163))
-- Theme JSON Docs: Clarify null, true, and false values for blockGap setting. ([42447](https://github.com/WordPress/gutenberg/pull/42447))
-- ToolsPanel: Add a readme section related to laying out a ToolsPanel. ([42615](https://github.com/WordPress/gutenberg/pull/42615))
+-   Add @examples to core/blocks selectors. ([42572](https://github.com/WordPress/gutenberg/pull/42572))
+-   Consolidate editor filters and actions. ([42356](https://github.com/WordPress/gutenberg/pull/42356))
+-   Correct the documented return type for `WP_Block_Parser::Render()`. ([42642](https://github.com/WordPress/gutenberg/pull/42642))
+-   Doc: Update getEntityRecord/s param description. ([42488](https://github.com/WordPress/gutenberg/pull/42488))
+-   Docs: Add `variations` key to `block.json` JSON schema definition. ([42539](https://github.com/WordPress/gutenberg/pull/42539))
+-   Docs: Add missing data module references. ([42651](https://github.com/WordPress/gutenberg/pull/42651))
+-   Fix: Repetition of wrong word in string. ([42621](https://github.com/WordPress/gutenberg/pull/42621))
+-   Flex: Remove experimental from documentation and storybook. ([42301](https://github.com/WordPress/gutenberg/pull/42301))
+-   Include section on how to test code for a given WP major. ([42390](https://github.com/WordPress/gutenberg/pull/42390))
+-   Marking internal action as @ignore to remove them from the documentation. ([42163](https://github.com/WordPress/gutenberg/pull/42163))
+-   Theme JSON Docs: Clarify null, true, and false values for blockGap setting. ([42447](https://github.com/WordPress/gutenberg/pull/42447))
+-   ToolsPanel: Add a readme section related to laying out a ToolsPanel. ([42615](https://github.com/WordPress/gutenberg/pull/42615))
 
 #### Components
-- Improve documentation for the `SpaceInput` type. ([42376](https://github.com/WordPress/gutenberg/pull/42376))
 
+-   Improve documentation for the `SpaceInput` type. ([42376](https://github.com/WordPress/gutenberg/pull/42376))
 
 ### Code Quality
 
-- Base Styles: Apply `long-content-fade` gradient from transparent to color. ([42401](https://github.com/WordPress/gutenberg/pull/42401))
-- Fix jsx-a11y label-has-associated-control configuration. ([42671](https://github.com/WordPress/gutenberg/pull/42671))
-- Fix: Two code issues on navigation link edit missing text. ([42440](https://github.com/WordPress/gutenberg/pull/42440))
-- Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
-- Style Engine: Rename WP_Style_Engine_CSS_Rule->set_declarations to add_declarations. ([42464](https://github.com/WordPress/gutenberg/pull/42464))
-- Style engine: Update return PHP doc comment and other nitpicks. ([42453](https://github.com/WordPress/gutenberg/pull/42453))
+-   Base Styles: Apply `long-content-fade` gradient from transparent to color. ([42401](https://github.com/WordPress/gutenberg/pull/42401))
+-   Fix jsx-a11y label-has-associated-control configuration. ([42671](https://github.com/WordPress/gutenberg/pull/42671))
+-   Fix: Two code issues on navigation link edit missing text. ([42440](https://github.com/WordPress/gutenberg/pull/42440))
+-   Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
+-   Style Engine: Rename WP_Style_Engine_CSS_Rule->set_declarations to add_declarations. ([42464](https://github.com/WordPress/gutenberg/pull/42464))
+-   Style engine: Update return PHP doc comment and other nitpicks. ([42453](https://github.com/WordPress/gutenberg/pull/42453))
 
 #### Global Styles
-- Dimensions Global Styles: Split props into separate hooks to tidy up the panel component. ([42620](https://github.com/WordPress/gutenberg/pull/42620))
+
+-   Dimensions Global Styles: Split props into separate hooks to tidy up the panel component. ([42620](https://github.com/WordPress/gutenberg/pull/42620))
 
 #### Block Library
-- Remove unnecessary React Fragments. ([42529](https://github.com/WordPress/gutenberg/pull/42529))
 
+-   Remove unnecessary React Fragments. ([42529](https://github.com/WordPress/gutenberg/pull/42529))
 
 ### Tools
 
 #### Testing
-- Added unit test for cover block render function. ([42108](https://github.com/WordPress/gutenberg/pull/42108))
-- Migrate hooks api test to playwright. ([42584](https://github.com/WordPress/gutenberg/pull/42584))
-- Skip flaky navigation block permissions test. ([42693](https://github.com/WordPress/gutenberg/pull/42693))
-- end-to-end Tests: Tweak Comments block tests after migrating to Playwright. ([42406](https://github.com/WordPress/gutenberg/pull/42406))
 
-#### Build Tooling
-- Update to reflect change in Documentation label. ([42395](https://github.com/WordPress/gutenberg/pull/42395))
-- Add inline documentation on building API documentation to commit block API verify error message. ([42432](https://github.com/WordPress/gutenberg/pull/42432))
+-   Added unit test for cover block render function. ([42108](https://github.com/WordPress/gutenberg/pull/42108))
+-   Migrate hooks api test to playwright. ([42584](https://github.com/WordPress/gutenberg/pull/42584))
+-   Skip flaky navigation block permissions test. ([42693](https://github.com/WordPress/gutenberg/pull/42693))
+-   end-to-end Tests: Tweak Comments block tests after migrating to Playwright. ([42406](https://github.com/WordPress/gutenberg/pull/42406))
 
+#### Build Tooling
 
-## First time contributors
+-   Update to reflect change in Documentation label. ([42395](https://github.com/WordPress/gutenberg/pull/42395))
+-   Add inline documentation on building API documentation to commit block API verify error message. ([42432](https://github.com/WordPress/gutenberg/pull/42432))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @kkmuffme: Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
-- @paulopmt1: Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
+The following PRs were merged by first-time contributors:
 
+-   @kkmuffme: Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
+-   @paulopmt1: Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
 
 ## Contributors
 
@@ -13595,247 +24935,266 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @ajlende @amustaque97 @andrewserong @arcangelini @aristath @bph @carolinan @chad1008 @ciampo @danielbachhuber @DAreRodz @dcalhoun @ellatrix @fabiankaegy @geriux @getdave @gziolo @jameskoster @johnbillion @jorgefilipecosta @kkmuffme @Mamaduka @matiasbenedetto @mirka @ndiego @noisysocks @ntsekouras @oandregal @ObliviousHarmony @paulopmt1 @pedro-mendonca @pooja-muchandikar @ramonjd @ryanwelcher @scruffian @SiobhyB @sunil25393 @t-hamano @talldan @tellthemachines @tyxla @vcanales @walbo @westonruter @zaguiini
 
-
-
-
 = 13.8.0 =
 
+## Changelog
 
+### Enhancements
 
-## Changelog
+-   Allow removing CSS declarations from the WP_Style_Engine_CSS_Declarations object. ([42428](https://github.com/WordPress/gutenberg/pull/42428))
+-   Equalize modal content padding. ([42370](https://github.com/WordPress/gutenberg/pull/42370))
+-   Remove top margin on the first paragraph in a modal. ([42369](https://github.com/WordPress/gutenberg/pull/42369))
 
+#### Components
 
-### Enhancements
+-   BorderControl: Render border color/style dropdown as UnitControl prefix. ([42212](https://github.com/WordPress/gutenberg/pull/42212))
+-   ColorPicker: Cleanly implement large size. ([42002](https://github.com/WordPress/gutenberg/pull/42002))
+-   ComboboxControl: Refactor `onKeyDown` to use `keyboardEvent.code`. ([42569](https://github.com/WordPress/gutenberg/pull/42569))
+-   Elevation: Convert component to TypeScript. ([42302](https://github.com/WordPress/gutenberg/pull/42302))
+-   InputControl: Decrease large default padding if has prefix/suffix. ([42166](https://github.com/WordPress/gutenberg/pull/42166))
+-   ScrollLock: Covert component to TypeScript. ([42303](https://github.com/WordPress/gutenberg/pull/42303))
+-   SelectControl: Add flag for larger default size. ([42456](https://github.com/WordPress/gutenberg/pull/42456))
+-   Shortcut: Covert component to TypeScript. ([42272](https://github.com/WordPress/gutenberg/pull/42272))
+-   Divider: Complete TypeScript migration of component. ([41991](https://github.com/WordPress/gutenberg/pull/41991))
+-   ToggleGroupControl: Add size variants. ([42008](https://github.com/WordPress/gutenberg/pull/42008))
+-   UnitControl: Update unit select's focus styles. ([42383](https://github.com/WordPress/gutenberg/pull/42383))
+-   BorderControl: Add missing changelog for accessibility enhancements. ([42411](https://github.com/WordPress/gutenberg/pull/42411))
+-   CustomSelectControl: Use styles from SelectControl. ([42460](https://github.com/WordPress/gutenberg/pull/42460))
+-   Dropdown: Add wrapper for custom padding. ([42595](https://github.com/WordPress/gutenberg/pull/42595))
+-   InputControl: Add padding wrapper for prefix/suffix. ([42378](https://github.com/WordPress/gutenberg/pull/42378))
+-   ScrollLock: Improve Storybook story for documentation view. ([42344](https://github.com/WordPress/gutenberg/pull/42344))
+-   `ColorPalette`: Display checkered preview background when `value` is transparent. ([42232](https://github.com/WordPress/gutenberg/pull/42232))
+
+#### Block Library
+
+-   Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
+-   Template Part: Swap block action places. ([42221](https://github.com/WordPress/gutenberg/pull/42221))
+-   Template Parts: Add search to replacement modal. ([42459](https://github.com/WordPress/gutenberg/pull/42459))
+-   Image: Add border block support for color, width, and style. ([31366](https://github.com/WordPress/gutenberg/pull/31366))
+-   List v2: Remove quote transforms as removed by Quote v2. ([42700](https://github.com/WordPress/gutenberg/pull/42700))
+-   Merge Comments and Post Comments blocks. ([41807](https://github.com/WordPress/gutenberg/pull/41807))
+-   Theme.json: Add support for heading / caption elements in theme.json schema. ([42433](https://github.com/WordPress/gutenberg/pull/42433))
 
-- Allow removing CSS declarations from the WP_Style_Engine_CSS_Declarations object. ([42428](https://github.com/WordPress/gutenberg/pull/42428))
-- Equalize modal content padding. ([42370](https://github.com/WordPress/gutenberg/pull/42370))
-- Remove top margin on the first paragraph in a modal. ([42369](https://github.com/WordPress/gutenberg/pull/42369))
-
-#### Components
-- BorderControl: Render border color/style dropdown as UnitControl prefix. ([42212](https://github.com/WordPress/gutenberg/pull/42212))
-- ColorPicker: Cleanly implement large size. ([42002](https://github.com/WordPress/gutenberg/pull/42002))
-- ComboboxControl: Refactor `onKeyDown` to use `keyboardEvent.code`. ([42569](https://github.com/WordPress/gutenberg/pull/42569))
-- Elevation: Convert component to TypeScript. ([42302](https://github.com/WordPress/gutenberg/pull/42302))
-- InputControl: Decrease large default padding if has prefix/suffix. ([42166](https://github.com/WordPress/gutenberg/pull/42166))
-- ScrollLock: Covert component to TypeScript. ([42303](https://github.com/WordPress/gutenberg/pull/42303))
-- SelectControl: Add flag for larger default size. ([42456](https://github.com/WordPress/gutenberg/pull/42456))
-- Shortcut: Covert component to TypeScript. ([42272](https://github.com/WordPress/gutenberg/pull/42272))
-- Divider: Complete TypeScript migration of component. ([41991](https://github.com/WordPress/gutenberg/pull/41991))
-- ToggleGroupControl: Add size variants. ([42008](https://github.com/WordPress/gutenberg/pull/42008))
-- UnitControl: Update unit select's focus styles. ([42383](https://github.com/WordPress/gutenberg/pull/42383))
-- BorderControl: Add missing changelog for accessibility enhancements. ([42411](https://github.com/WordPress/gutenberg/pull/42411))
-- CustomSelectControl: Use styles from SelectControl. ([42460](https://github.com/WordPress/gutenberg/pull/42460))
-- Dropdown: Add wrapper for custom padding. ([42595](https://github.com/WordPress/gutenberg/pull/42595))
-- InputControl: Add padding wrapper for prefix/suffix. ([42378](https://github.com/WordPress/gutenberg/pull/42378))
-- ScrollLock: Improve Storybook story for documentation view. ([42344](https://github.com/WordPress/gutenberg/pull/42344))
-- `ColorPalette`: Display checkered preview background when `value` is transparent. ([42232](https://github.com/WordPress/gutenberg/pull/42232))
-
-#### Block Library
-- Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
-- Template Part: Swap block action places. ([42221](https://github.com/WordPress/gutenberg/pull/42221))
-- Template Parts: Add search to replacement modal. ([42459](https://github.com/WordPress/gutenberg/pull/42459))
-- Image: Add border block support for color, width, and style. ([31366](https://github.com/WordPress/gutenberg/pull/31366))
-- List v2: Remove quote transforms as removed by Quote v2. ([42700](https://github.com/WordPress/gutenberg/pull/42700))
-- Merge Comments and Post Comments blocks. ([41807](https://github.com/WordPress/gutenberg/pull/41807))
-- Theme.json: Add support for heading / caption elements in theme.json schema. ([42433](https://github.com/WordPress/gutenberg/pull/42433))
-
-#### Global Styles
-- Add layout content size controls to global styles. ([42309](https://github.com/WordPress/gutenberg/pull/42309))
-- Core CSS support for root padding and alignfull blocks. ([42085](https://github.com/WordPress/gutenberg/pull/42085))
-- Theme.json: Add block support feature level selectors for blocks. ([42087](https://github.com/WordPress/gutenberg/pull/42087))
+#### Global Styles
+
+-   Add layout content size controls to global styles. ([42309](https://github.com/WordPress/gutenberg/pull/42309))
+-   Core CSS support for root padding and alignfull blocks. ([42085](https://github.com/WordPress/gutenberg/pull/42085))
+-   Theme.json: Add block support feature level selectors for blocks. ([42087](https://github.com/WordPress/gutenberg/pull/42087))
 
 #### Document Settings
-- Make 'Move to trash' button full width. ([42577](https://github.com/WordPress/gutenberg/pull/42577))
+
+-   Make 'Move to trash' button full width. ([42577](https://github.com/WordPress/gutenberg/pull/42577))
 
 #### Block Editor
-- Add setting to display rich text toolbar inline. ([42399](https://github.com/WordPress/gutenberg/pull/42399))
-- Add block variations for individual template parts. ([42454](https://github.com/WordPress/gutenberg/pull/42454))
-- Enable `onEnter` support for group block. ([40724](https://github.com/WordPress/gutenberg/pull/40724))
+
+-   Add setting to display rich text toolbar inline. ([42399](https://github.com/WordPress/gutenberg/pull/42399))
+-   Add block variations for individual template parts. ([42454](https://github.com/WordPress/gutenberg/pull/42454))
+-   Enable `onEnter` support for group block. ([40724](https://github.com/WordPress/gutenberg/pull/40724))
 
 #### Site Editor
-- On template creation, don't show search if not needed. ([42357](https://github.com/WordPress/gutenberg/pull/42357))
+
+-   On template creation, don't show search if not needed. ([42357](https://github.com/WordPress/gutenberg/pull/42357))
 
 #### Accessibility
-- BorderControl: Update labelling, tooltips and wrap with fieldset and legend. ([42348](https://github.com/WordPress/gutenberg/pull/42348))
+
+-   BorderControl: Update labelling, tooltips and wrap with fieldset and legend. ([42348](https://github.com/WordPress/gutenberg/pull/42348))
 
 #### Icons
-- Add shuffle icon to library. ([42193](https://github.com/WordPress/gutenberg/pull/42193))
+
+-   Add shuffle icon to library. ([42193](https://github.com/WordPress/gutenberg/pull/42193))
 
 #### Nested / Inner Blocks
-- Quote: Use nested blocks. ([25892](https://github.com/WordPress/gutenberg/pull/25892))
+
+-   Quote: Use nested blocks. ([25892](https://github.com/WordPress/gutenberg/pull/25892))
 
 #### Colors
-- Update color palette popover style. ([41900](https://github.com/WordPress/gutenberg/pull/41900))
 
+-   Update color palette popover style. ([41900](https://github.com/WordPress/gutenberg/pull/41900))
 
 ### Bug Fixes
 
-- Env: Download WordPress PHPUnit Into Container. ([41780](https://github.com/WordPress/gutenberg/pull/41780))
-- Env: Restrict `WP_TESTS_DOMAIN` constant to just hostname and not home URL. ([41039](https://github.com/WordPress/gutenberg/pull/41039))
-- Fix: Condition bug on BoxControl. ([42402](https://github.com/WordPress/gutenberg/pull/42402))
-- MaybeCategoryPanel: Update category selector. ([42663](https://github.com/WordPress/gutenberg/pull/42663))
-- Post title: Fix single line paste. ([42321](https://github.com/WordPress/gutenberg/pull/42321))
-- Scripts: Exit error code 1 when status value is null. ([42396](https://github.com/WordPress/gutenberg/pull/42396))
-- Style engine: Check item value validity. ([42487](https://github.com/WordPress/gutenberg/pull/42487))
-- Utilize WordPress PHPUnit Test Library Included By `wp-env`. ([41852](https://github.com/WordPress/gutenberg/pull/41852))
-- fix: Correct alt text footnote spacing. ([42504](https://github.com/WordPress/gutenberg/pull/42504))
-
-#### Block Library
-- Cover Block: Prevent transform to Group block when featured image is set. ([42638](https://github.com/WordPress/gutenberg/pull/42638))
-- Cover block: Adding background-size and background-repeat properties to the block CSS. ([42470](https://github.com/WordPress/gutenberg/pull/42470))
-- Fix tab/focus order issue in Media & text block. ([40806](https://github.com/WordPress/gutenberg/pull/40806))
-- List v2: Add forward delete. ([42564](https://github.com/WordPress/gutenberg/pull/42564))
-- List v2: Improve paste handling. ([42524](https://github.com/WordPress/gutenberg/pull/42524))
-- List v2: Merge with nested items. ([42551](https://github.com/WordPress/gutenberg/pull/42551))
-- List v2: Switch to default block type on Backspace from start. ([42633](https://github.com/WordPress/gutenberg/pull/42633))
-- Page List: Fetch items with 'view' context. ([42559](https://github.com/WordPress/gutenberg/pull/42559))
-- Social Icons Block: Fix button opacity in template parts. ([42641](https://github.com/WordPress/gutenberg/pull/42641))
-- Group block: Add context to the word "Row". ([42255](https://github.com/WordPress/gutenberg/pull/42255))
-- Hide prefix and suffix placeholders in post terms. ([42418](https://github.com/WordPress/gutenberg/pull/42418))
-- Theme.json: Fix schema for button elements. ([42431](https://github.com/WordPress/gutenberg/pull/42431))
-- [Media Text]: Fix deprecations regression. ([42816](https://github.com/WordPress/gutenberg/pull/42816))
+-   Env: Download WordPress PHPUnit Into Container. ([41780](https://github.com/WordPress/gutenberg/pull/41780))
+-   Env: Restrict `WP_TESTS_DOMAIN` constant to just hostname and not home URL. ([41039](https://github.com/WordPress/gutenberg/pull/41039))
+-   Fix: Condition bug on BoxControl. ([42402](https://github.com/WordPress/gutenberg/pull/42402))
+-   MaybeCategoryPanel: Update category selector. ([42663](https://github.com/WordPress/gutenberg/pull/42663))
+-   Post title: Fix single line paste. ([42321](https://github.com/WordPress/gutenberg/pull/42321))
+-   Scripts: Exit error code 1 when status value is null. ([42396](https://github.com/WordPress/gutenberg/pull/42396))
+-   Style engine: Check item value validity. ([42487](https://github.com/WordPress/gutenberg/pull/42487))
+-   Utilize WordPress PHPUnit Test Library Included By `wp-env`. ([41852](https://github.com/WordPress/gutenberg/pull/41852))
+-   fix: Correct alt text footnote spacing. ([42504](https://github.com/WordPress/gutenberg/pull/42504))
+
+#### Block Library
+
+-   Cover Block: Prevent transform to Group block when featured image is set. ([42638](https://github.com/WordPress/gutenberg/pull/42638))
+-   Cover block: Adding background-size and background-repeat properties to the block CSS. ([42470](https://github.com/WordPress/gutenberg/pull/42470))
+-   Fix tab/focus order issue in Media & text block. ([40806](https://github.com/WordPress/gutenberg/pull/40806))
+-   List v2: Add forward delete. ([42564](https://github.com/WordPress/gutenberg/pull/42564))
+-   List v2: Improve paste handling. ([42524](https://github.com/WordPress/gutenberg/pull/42524))
+-   List v2: Merge with nested items. ([42551](https://github.com/WordPress/gutenberg/pull/42551))
+-   List v2: Switch to default block type on Backspace from start. ([42633](https://github.com/WordPress/gutenberg/pull/42633))
+-   Page List: Fetch items with 'view' context. ([42559](https://github.com/WordPress/gutenberg/pull/42559))
+-   Social Icons Block: Fix button opacity in template parts. ([42641](https://github.com/WordPress/gutenberg/pull/42641))
+-   Group block: Add context to the word "Row". ([42255](https://github.com/WordPress/gutenberg/pull/42255))
+-   Hide prefix and suffix placeholders in post terms. ([42418](https://github.com/WordPress/gutenberg/pull/42418))
+-   Theme.json: Fix schema for button elements. ([42431](https://github.com/WordPress/gutenberg/pull/42431))
+-   [Media Text]: Fix deprecations regression. ([42816](https://github.com/WordPress/gutenberg/pull/42816))
 
 #### Components
-- AnglePickerControl: Fix gap between elements in RTL mode. ([42534](https://github.com/WordPress/gutenberg/pull/42534))
-- ColorPalette: Fix background image in RTL mode. ([42510](https://github.com/WordPress/gutenberg/pull/42510))
-- Context System: Don't explicitly set `undefined` value to `children`. ([42686](https://github.com/WordPress/gutenberg/pull/42686))
-- Popover: Fix width on `expandOnMobile`. ([42635](https://github.com/WordPress/gutenberg/pull/42635))
-- RangeControl: Clamp initialPosition between min and max values. ([42571](https://github.com/WordPress/gutenberg/pull/42571))
-- Tooltip: Avoid unnecessary re-renders of `<select>` child elements. ([42483](https://github.com/WordPress/gutenberg/pull/42483))
-- Tooltip: Fix positioning by anchoring to child element. ([41268](https://github.com/WordPress/gutenberg/pull/41268))
+
+-   AnglePickerControl: Fix gap between elements in RTL mode. ([42534](https://github.com/WordPress/gutenberg/pull/42534))
+-   ColorPalette: Fix background image in RTL mode. ([42510](https://github.com/WordPress/gutenberg/pull/42510))
+-   Context System: Don't explicitly set `undefined` value to `children`. ([42686](https://github.com/WordPress/gutenberg/pull/42686))
+-   Popover: Fix width on `expandOnMobile`. ([42635](https://github.com/WordPress/gutenberg/pull/42635))
+-   RangeControl: Clamp initialPosition between min and max values. ([42571](https://github.com/WordPress/gutenberg/pull/42571))
+-   Tooltip: Avoid unnecessary re-renders of `<select>` child elements. ([42483](https://github.com/WordPress/gutenberg/pull/42483))
+-   Tooltip: Fix positioning by anchoring to child element. ([41268](https://github.com/WordPress/gutenberg/pull/41268))
 
 #### Accessibility
-- Add aria-hidden to query pagination arrows. ([42583](https://github.com/WordPress/gutenberg/pull/42583))
-- Fix labelling and semantics of the paragraph block Left to right control. ([42324](https://github.com/WordPress/gutenberg/pull/42324))
-- Fix mismatching label and visible text on the Toggle block inserter button. ([42359](https://github.com/WordPress/gutenberg/pull/42359))
-- Fix: The description text of block movers for horizontal movement. ([42393](https://github.com/WordPress/gutenberg/pull/42393))
-- Replace clickable div elements with buttons in the Add template modal. ([42668](https://github.com/WordPress/gutenberg/pull/42668))
+
+-   Add aria-hidden to query pagination arrows. ([42583](https://github.com/WordPress/gutenberg/pull/42583))
+-   Fix labelling and semantics of the paragraph block Left to right control. ([42324](https://github.com/WordPress/gutenberg/pull/42324))
+-   Fix mismatching label and visible text on the Toggle block inserter button. ([42359](https://github.com/WordPress/gutenberg/pull/42359))
+-   Fix: The description text of block movers for horizontal movement. ([42393](https://github.com/WordPress/gutenberg/pull/42393))
+-   Replace clickable div elements with buttons in the Add template modal. ([42668](https://github.com/WordPress/gutenberg/pull/42668))
 
 #### Post Editor
-- Avoid 403 errors for users with low permissions. ([42413](https://github.com/WordPress/gutenberg/pull/42413))
-- Display post template selection for non-admin users. ([42705](https://github.com/WordPress/gutenberg/pull/42705))
-- Editor: Fix typo in translation string. ([42673](https://github.com/WordPress/gutenberg/pull/42673))
+
+-   Avoid 403 errors for users with low permissions. ([42413](https://github.com/WordPress/gutenberg/pull/42413))
+-   Display post template selection for non-admin users. ([42705](https://github.com/WordPress/gutenberg/pull/42705))
+-   Editor: Fix typo in translation string. ([42673](https://github.com/WordPress/gutenberg/pull/42673))
 
 #### Block Editor
-- Prevent link control popover from going offscreen. ([42389](https://github.com/WordPress/gutenberg/pull/42389))
-- Writing flow: Fix caret movement for multiple lines. ([42423](https://github.com/WordPress/gutenberg/pull/42423))
-- Writing flow: Fix caret placement in corners. ([42437](https://github.com/WordPress/gutenberg/pull/42437))
-- Writing flow: Esc should enter Nav mode consistently, avoid focus loss when clearing selection. ([42530](https://github.com/WordPress/gutenberg/pull/42530))
+
+-   Prevent link control popover from going offscreen. ([42389](https://github.com/WordPress/gutenberg/pull/42389))
+-   Writing flow: Fix caret movement for multiple lines. ([42423](https://github.com/WordPress/gutenberg/pull/42423))
+-   Writing flow: Fix caret placement in corners. ([42437](https://github.com/WordPress/gutenberg/pull/42437))
+-   Writing flow: Esc should enter Nav mode consistently, avoid focus loss when clearing selection. ([42530](https://github.com/WordPress/gutenberg/pull/42530))
 
 #### CSS & Styling
-- Elements: Buttons: Fix the path with the css to style the cursor for all button elements. ([42129](https://github.com/WordPress/gutenberg/pull/42129))
-- Link elements: Add a :where selector to the :Not to lower specificity. ([42669](https://github.com/WordPress/gutenberg/pull/42669))
-- Button Block: Change text-decoration style to low specificity. ([42545](https://github.com/WordPress/gutenberg/pull/42545))
-- Element styles: Adding stylesheet to load in the editor. ([42132](https://github.com/WordPress/gutenberg/pull/42132))
+
+-   Elements: Buttons: Fix the path with the css to style the cursor for all button elements. ([42129](https://github.com/WordPress/gutenberg/pull/42129))
+-   Link elements: Add a :where selector to the :Not to lower specificity. ([42669](https://github.com/WordPress/gutenberg/pull/42669))
+-   Button Block: Change text-decoration style to low specificity. ([42545](https://github.com/WordPress/gutenberg/pull/42545))
+-   Element styles: Adding stylesheet to load in the editor. ([42132](https://github.com/WordPress/gutenberg/pull/42132))
 
 #### Global Styles
-- Elements: Fix heading and caption element selectors. ([42479](https://github.com/WordPress/gutenberg/pull/42479))
-- Layout content size controls: Add left alignment to line up with description and other elements. ([42576](https://github.com/WordPress/gutenberg/pull/42576))
-- Layout: Ensure defaultEditorStyles are still output in Classic themes. ([42906](https://github.com/WordPress/gutenberg/pull/42906))
-- Theme JSON Resolver: Update cache check to also check that the object is an instance of the Gutenberg version. ([42756](https://github.com/WordPress/gutenberg/pull/42756))
+
+-   Elements: Fix heading and caption element selectors. ([42479](https://github.com/WordPress/gutenberg/pull/42479))
+-   Layout content size controls: Add left alignment to line up with description and other elements. ([42576](https://github.com/WordPress/gutenberg/pull/42576))
+-   Layout: Ensure defaultEditorStyles are still output in Classic themes. ([42906](https://github.com/WordPress/gutenberg/pull/42906))
+-   Theme JSON Resolver: Update cache check to also check that the object is an instance of the Gutenberg version. ([42756](https://github.com/WordPress/gutenberg/pull/42756))
 
 #### Widgets Editor
-- Add configuration option to skip autop on freeform blocks when parsing blocks. ([42623](https://github.com/WordPress/gutenberg/pull/42623))
+
+-   Add configuration option to skip autop on freeform blocks when parsing blocks. ([42623](https://github.com/WordPress/gutenberg/pull/42623))
 
 #### Rich Text
-- Annotation API: Fix __experimentalGetPropsForEditableTreePreparation. ([42596](https://github.com/WordPress/gutenberg/pull/42596))
+
+-   Annotation API: Fix \_\_experimentalGetPropsForEditableTreePreparation. ([42596](https://github.com/WordPress/gutenberg/pull/42596))
 
 #### Site Editor
-- Fix typo in default category template's description. ([42586](https://github.com/WordPress/gutenberg/pull/42586))
-- [Site Editor]: Fix Reakit warning on creation template component. ([42392](https://github.com/WordPress/gutenberg/pull/42392))
-- Site Editor: Remove leftover class. ([42591](https://github.com/WordPress/gutenberg/pull/42591))
+
+-   Fix typo in default category template's description. ([42586](https://github.com/WordPress/gutenberg/pull/42586))
+-   [Site Editor]: Fix Reakit warning on creation template component. ([42392](https://github.com/WordPress/gutenberg/pull/42392))
+-   Site Editor: Remove leftover class. ([42591](https://github.com/WordPress/gutenberg/pull/42591))
 
 #### Themes
-- Remove core/post-comments-form block styles that are overriding button element styles. ([42053](https://github.com/WordPress/gutenberg/pull/42053))
+
+-   Remove core/post-comments-form block styles that are overriding button element styles. ([42053](https://github.com/WordPress/gutenberg/pull/42053))
 
 #### Icons
-- Icons Package: Fix line icons styling. ([40315](https://github.com/WordPress/gutenberg/pull/40315))
 
+-   Icons Package: Fix line icons styling. ([40315](https://github.com/WordPress/gutenberg/pull/40315))
 
 ### Performance
 
 #### Components
-- Lodash: Refactor a few components away from `_.isEmpty()`. ([42468](https://github.com/WordPress/gutenberg/pull/42468))
-- Lodash: Refactor away from `_.compact()`. ([42438](https://github.com/WordPress/gutenberg/pull/42438))
+
+-   Lodash: Refactor a few components away from `_.isEmpty()`. ([42468](https://github.com/WordPress/gutenberg/pull/42468))
+-   Lodash: Refactor away from `_.compact()`. ([42438](https://github.com/WordPress/gutenberg/pull/42438))
 
 #### Post Editor
-- Lodash: Refactor `PageAttributesParent` away from `_.deburr()`. ([42429](https://github.com/WordPress/gutenberg/pull/42429))
+
+-   Lodash: Refactor `PageAttributesParent` away from `_.deburr()`. ([42429](https://github.com/WordPress/gutenberg/pull/42429))
 
 #### Testing
-- Lodash: Refactor away from `_.snakeCase()`. ([42427](https://github.com/WordPress/gutenberg/pull/42427))
+
+-   Lodash: Refactor away from `_.snakeCase()`. ([42427](https://github.com/WordPress/gutenberg/pull/42427))
 
 #### Block Validation/Deprecation
-- Lodash: Refactor away from `_.fromPairs()`. ([42217](https://github.com/WordPress/gutenberg/pull/42217))
 
+-   Lodash: Refactor away from `_.fromPairs()`. ([42217](https://github.com/WordPress/gutenberg/pull/42217))
 
 ### Experiments
 
-- Style Engine Rules & Store objects. ([42222](https://github.com/WordPress/gutenberg/pull/42222))
-- Style Engine: Add a WP_Style_Engine_Processor object. ([42463](https://github.com/WordPress/gutenberg/pull/42463))
+-   Style Engine Rules & Store objects. ([42222](https://github.com/WordPress/gutenberg/pull/42222))
+-   Style Engine: Add a WP_Style_Engine_Processor object. ([42463](https://github.com/WordPress/gutenberg/pull/42463))
 
 #### CSS & Styling
-- Style Engine: Add elements to the frontend. ([41732](https://github.com/WordPress/gutenberg/pull/41732))
+
+-   Style Engine: Add elements to the frontend. ([41732](https://github.com/WordPress/gutenberg/pull/41732))
 
 #### Global Styles
-- Block supports: Add fluid typography. ([39529](https://github.com/WordPress/gutenberg/pull/39529))
-- Layout: Reduce specificity of fallback blockGap styles. ([42665](https://github.com/WordPress/gutenberg/pull/42665))
 
+-   Block supports: Add fluid typography. ([39529](https://github.com/WordPress/gutenberg/pull/39529))
+-   Layout: Reduce specificity of fallback blockGap styles. ([42665](https://github.com/WordPress/gutenberg/pull/42665))
 
 ### Documentation
 
-- Add @examples to core/blocks selectors. ([42572](https://github.com/WordPress/gutenberg/pull/42572))
-- Consolidate editor filters and actions. ([42356](https://github.com/WordPress/gutenberg/pull/42356))
-- Correct the documented return type for `WP_Block_Parser::Render()`. ([42642](https://github.com/WordPress/gutenberg/pull/42642))
-- Doc: Update getEntityRecord/s param description. ([42488](https://github.com/WordPress/gutenberg/pull/42488))
-- Docs: Add `variations` key to `block.json` JSON schema definition. ([42539](https://github.com/WordPress/gutenberg/pull/42539))
-- Docs: Add missing data module references. ([42651](https://github.com/WordPress/gutenberg/pull/42651))
-- Fix: Repetition of wrong word in string. ([42621](https://github.com/WordPress/gutenberg/pull/42621))
-- Flex: Remove experimental from documentation and storybook. ([42301](https://github.com/WordPress/gutenberg/pull/42301))
-- Include section on how to test code for a given WP major. ([42390](https://github.com/WordPress/gutenberg/pull/42390))
-- Marking internal action as @ignore to remove them from the documentation. ([42163](https://github.com/WordPress/gutenberg/pull/42163))
-- Theme JSON Docs: Clarify null, true, and false values for blockGap setting. ([42447](https://github.com/WordPress/gutenberg/pull/42447))
-- ToolsPanel: Add a readme section related to laying out a ToolsPanel. ([42615](https://github.com/WordPress/gutenberg/pull/42615))
+-   Add @examples to core/blocks selectors. ([42572](https://github.com/WordPress/gutenberg/pull/42572))
+-   Consolidate editor filters and actions. ([42356](https://github.com/WordPress/gutenberg/pull/42356))
+-   Correct the documented return type for `WP_Block_Parser::Render()`. ([42642](https://github.com/WordPress/gutenberg/pull/42642))
+-   Doc: Update getEntityRecord/s param description. ([42488](https://github.com/WordPress/gutenberg/pull/42488))
+-   Docs: Add `variations` key to `block.json` JSON schema definition. ([42539](https://github.com/WordPress/gutenberg/pull/42539))
+-   Docs: Add missing data module references. ([42651](https://github.com/WordPress/gutenberg/pull/42651))
+-   Fix: Repetition of wrong word in string. ([42621](https://github.com/WordPress/gutenberg/pull/42621))
+-   Flex: Remove experimental from documentation and storybook. ([42301](https://github.com/WordPress/gutenberg/pull/42301))
+-   Include section on how to test code for a given WP major. ([42390](https://github.com/WordPress/gutenberg/pull/42390))
+-   Marking internal action as @ignore to remove them from the documentation. ([42163](https://github.com/WordPress/gutenberg/pull/42163))
+-   Theme JSON Docs: Clarify null, true, and false values for blockGap setting. ([42447](https://github.com/WordPress/gutenberg/pull/42447))
+-   ToolsPanel: Add a readme section related to laying out a ToolsPanel. ([42615](https://github.com/WordPress/gutenberg/pull/42615))
 
 #### Components
-- Improve documentation for the `SpaceInput` type. ([42376](https://github.com/WordPress/gutenberg/pull/42376))
 
+-   Improve documentation for the `SpaceInput` type. ([42376](https://github.com/WordPress/gutenberg/pull/42376))
 
 ### Code Quality
 
-- Base Styles: Apply `long-content-fade` gradient from transparent to color. ([42401](https://github.com/WordPress/gutenberg/pull/42401))
-- Fix jsx-a11y label-has-associated-control configuration. ([42671](https://github.com/WordPress/gutenberg/pull/42671))
-- Fix: Two code issues on navigation link edit missing text. ([42440](https://github.com/WordPress/gutenberg/pull/42440))
-- Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
-- Style Engine: Rename WP_Style_Engine_CSS_Rule->set_declarations to add_declarations. ([42464](https://github.com/WordPress/gutenberg/pull/42464))
-- Style engine: Update return PHP doc comment and other nitpicks. ([42453](https://github.com/WordPress/gutenberg/pull/42453))
+-   Base Styles: Apply `long-content-fade` gradient from transparent to color. ([42401](https://github.com/WordPress/gutenberg/pull/42401))
+-   Fix jsx-a11y label-has-associated-control configuration. ([42671](https://github.com/WordPress/gutenberg/pull/42671))
+-   Fix: Two code issues on navigation link edit missing text. ([42440](https://github.com/WordPress/gutenberg/pull/42440))
+-   Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
+-   Style Engine: Rename WP_Style_Engine_CSS_Rule->set_declarations to add_declarations. ([42464](https://github.com/WordPress/gutenberg/pull/42464))
+-   Style engine: Update return PHP doc comment and other nitpicks. ([42453](https://github.com/WordPress/gutenberg/pull/42453))
 
 #### Global Styles
-- Dimensions Global Styles: Split props into separate hooks to tidy up the panel component. ([42620](https://github.com/WordPress/gutenberg/pull/42620))
+
+-   Dimensions Global Styles: Split props into separate hooks to tidy up the panel component. ([42620](https://github.com/WordPress/gutenberg/pull/42620))
 
 #### Block Library
-- Remove unnecessary React Fragments. ([42529](https://github.com/WordPress/gutenberg/pull/42529))
 
+-   Remove unnecessary React Fragments. ([42529](https://github.com/WordPress/gutenberg/pull/42529))
 
 ### Tools
 
 #### Testing
-- Added unit test for cover block render function. ([42108](https://github.com/WordPress/gutenberg/pull/42108))
-- Migrate hooks api test to playwright. ([42584](https://github.com/WordPress/gutenberg/pull/42584))
-- Skip flaky navigation block permissions test. ([42693](https://github.com/WordPress/gutenberg/pull/42693))
-- end-to-end Tests: Tweak Comments block tests after migrating to Playwright. ([42406](https://github.com/WordPress/gutenberg/pull/42406))
 
-#### Build Tooling
-- Update to reflect change in Documentation label. ([42395](https://github.com/WordPress/gutenberg/pull/42395))
-- Add inline documentation on building API documentation to commit block API verify error message. ([42432](https://github.com/WordPress/gutenberg/pull/42432))
+-   Added unit test for cover block render function. ([42108](https://github.com/WordPress/gutenberg/pull/42108))
+-   Migrate hooks api test to playwright. ([42584](https://github.com/WordPress/gutenberg/pull/42584))
+-   Skip flaky navigation block permissions test. ([42693](https://github.com/WordPress/gutenberg/pull/42693))
+-   end-to-end Tests: Tweak Comments block tests after migrating to Playwright. ([42406](https://github.com/WordPress/gutenberg/pull/42406))
 
+#### Build Tooling
 
-## First time contributors
+-   Update to reflect change in Documentation label. ([42395](https://github.com/WordPress/gutenberg/pull/42395))
+-   Add inline documentation on building API documentation to commit block API verify error message. ([42432](https://github.com/WordPress/gutenberg/pull/42432))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @kkmuffme: Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
-- @paulopmt1: Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
+The following PRs were merged by first-time contributors:
 
+-   @kkmuffme: Remove deprecated eslint rules. ([42654](https://github.com/WordPress/gutenberg/pull/42654))
+-   @paulopmt1: Added WhatsApp icon to the Social Icon Block. ([42137](https://github.com/WordPress/gutenberg/pull/42137))
 
 ## Contributors
 
@@ -13843,18 +25202,13 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @afercia @ajlende @amustaque97 @andrewserong @arcangelini @aristath @bph @carolinan @chad1008 @ciampo @danielbachhuber @DAreRodz @dcalhoun @ellatrix @fabiankaegy @geriux @getdave @gziolo @jameskoster @johnbillion @jorgefilipecosta @kkmuffme @Mamaduka @matiasbenedetto @mirka @ndiego @noisysocks @ntsekouras @oandregal @ObliviousHarmony @paulopmt1 @pedro-mendonca @pooja-muchandikar @ramonjd @ryanwelcher @scruffian @SiobhyB @sunil25393 @t-hamano @talldan @tellthemachines @tyxla @vcanales @walbo @westonruter @zaguiini
 
-
-
-
 = 13.7.3 =
 
-
-
 ## Changelog
 
 ### Various
 
-- Redirect old `theme_page` Site Editor routes to the new `site-editor.php` page. ([42643](https://github.com/WordPress/gutenberg/pull/42643))
+-   Redirect old `theme_page` Site Editor routes to the new `site-editor.php` page. ([42643](https://github.com/WordPress/gutenberg/pull/42643))
 
 ## Contributors
 
@@ -13862,15 +25216,13 @@ The following contributors merged PRs in this release:
 
 @fullofcaffeine
 
-
 = 13.7.2 =
 
 ## Changelog
 
 ### Bug Fixes
 
-- Layout: Add not .alignfull rule from root CSS PR. ([42614](https://github.com/WordPress/gutenberg/pull/42614))
-
+-   Layout: Add not .alignfull rule from root CSS PR. ([42614](https://github.com/WordPress/gutenberg/pull/42614))
 
 = 13.7.1 =
 
@@ -13878,232 +25230,256 @@ The following contributors merged PRs in this release:
 
 ### Bug Fixes
 
-- Plugin: Compatibility fixes for WP 5.9 and Site Editor ([42549](https://github.com/WordPress/gutenberg/pull/42549))
-- Plugin: Fix PHP fatal error when using WP 5.9. ([42550](https://github.com/WordPress/gutenberg/pull/42550))
-
+-   Plugin: Compatibility fixes for WP 5.9 and Site Editor ([42549](https://github.com/WordPress/gutenberg/pull/42549))
+-   Plugin: Fix PHP fatal error when using WP 5.9. ([42550](https://github.com/WordPress/gutenberg/pull/42550))
 
 = 13.7.0 =
 
 ## Changelog
 
 ### Enhancements
-- Update the modal design. ([40781](https://github.com/WordPress/gutenberg/pull/40781))
-- Themes: Adds text decoration support to post title block. ([42328](https://github.com/WordPress/gutenberg/pull/42328))
-- Social Link: Automatically prepend emails with mailto protocol. ([42186](https://github.com/WordPress/gutenberg/pull/42186))
-- Add better ARIA labels to toggle buttons in Summary panel. ([42114](https://github.com/WordPress/gutenberg/pull/42114))
-- Start with featured image in media placeholder. ([41722](https://github.com/WordPress/gutenberg/pull/41722))
 
+-   Update the modal design. ([40781](https://github.com/WordPress/gutenberg/pull/40781))
+-   Themes: Adds text decoration support to post title block. ([42328](https://github.com/WordPress/gutenberg/pull/42328))
+-   Social Link: Automatically prepend emails with mailto protocol. ([42186](https://github.com/WordPress/gutenberg/pull/42186))
+-   Add better ARIA labels to toggle buttons in Summary panel. ([42114](https://github.com/WordPress/gutenberg/pull/42114))
+-   Start with featured image in media placeholder. ([41722](https://github.com/WordPress/gutenberg/pull/41722))
 
 #### Components
-- ColorPicker: Widen hex input field for mobile. ([42004](https://github.com/WordPress/gutenberg/pull/42004))
-- ComboboxControl / FormTokenField: Add flag for larger default size. ([40746](https://github.com/WordPress/gutenberg/pull/40746))
-- Try tabs instead of segmented control for switching between solid/gradient in color panels. ([41937](https://github.com/WordPress/gutenberg/pull/41937))
+
+-   ColorPicker: Widen hex input field for mobile. ([42004](https://github.com/WordPress/gutenberg/pull/42004))
+-   ComboboxControl / FormTokenField: Add flag for larger default size. ([40746](https://github.com/WordPress/gutenberg/pull/40746))
+-   Try tabs instead of segmented control for switching between solid/gradient in color panels. ([41937](https://github.com/WordPress/gutenberg/pull/41937))
 
 #### Document Settings
-- Make Post Format, Slug and Author fields fill the sidebar. ([42146](https://github.com/WordPress/gutenberg/pull/42146))
-- Post Template: Update fallback label. ([42063](https://github.com/WordPress/gutenberg/pull/42063))
-- Rewrite URL (Permalink) panel as a popover. ([42033](https://github.com/WordPress/gutenberg/pull/42033))
+
+-   Make Post Format, Slug and Author fields fill the sidebar. ([42146](https://github.com/WordPress/gutenberg/pull/42146))
+-   Post Template: Update fallback label. ([42063](https://github.com/WordPress/gutenberg/pull/42063))
+-   Rewrite URL (Permalink) panel as a popover. ([42033](https://github.com/WordPress/gutenberg/pull/42033))
 
 #### Full Site Editing
-- Expand the templates that can be added - custom taxonomies, specific term, specific category and tag. ([41875](https://github.com/WordPress/gutenberg/pull/41875))
-- Expand the templates that can be added - specific pages. ([42138](https://github.com/WordPress/gutenberg/pull/42138))
-- Re-architect templates addition. ([42457](https://github.com/WordPress/gutenberg/pull/42457))
-- List View: Use heading content for button label text if available. ([41855](https://github.com/WordPress/gutenberg/pull/41855))
-- Add New - Custom/General template. ([42127](https://github.com/WordPress/gutenberg/pull/42127))
-- Add the 'Apply to inner blocks' option to Block locking ([41876](https://github.com/WordPress/gutenberg/pull/41876))
-- Update: Wording on add generic template modal. ([42379](https://github.com/WordPress/gutenberg/pull/42379))
+
+-   Expand the templates that can be added - custom taxonomies, specific term, specific category and tag. ([41875](https://github.com/WordPress/gutenberg/pull/41875))
+-   Expand the templates that can be added - specific pages. ([42138](https://github.com/WordPress/gutenberg/pull/42138))
+-   Re-architect templates addition. ([42457](https://github.com/WordPress/gutenberg/pull/42457))
+-   List View: Use heading content for button label text if available. ([41855](https://github.com/WordPress/gutenberg/pull/41855))
+-   Add New - Custom/General template. ([42127](https://github.com/WordPress/gutenberg/pull/42127))
+-   Add the 'Apply to inner blocks' option to Block locking ([41876](https://github.com/WordPress/gutenberg/pull/41876))
+-   Update: Wording on add generic template modal. ([42379](https://github.com/WordPress/gutenberg/pull/42379))
 
 #### Post Editor
-- Add estimated time to read to table of contents in editor. ([41611](https://github.com/WordPress/gutenberg/pull/41611))
-- Add month and day as a suggest format to the date format picker. ([42317](https://github.com/WordPress/gutenberg/pull/42317))
-- Post Editor: Preload templates post type permissions (REST-API). ([42209](https://github.com/WordPress/gutenberg/pull/42209))
+
+-   Add estimated time to read to table of contents in editor. ([41611](https://github.com/WordPress/gutenberg/pull/41611))
+-   Add month and day as a suggest format to the date format picker. ([42317](https://github.com/WordPress/gutenberg/pull/42317))
+-   Post Editor: Preload templates post type permissions (REST-API). ([42209](https://github.com/WordPress/gutenberg/pull/42209))
 
 ### New APIs
 
-- JS Error Tracking: Allow custom error reporting logic to be called in Error Boundaries via a WP action hook. ([42024](https://github.com/WordPress/gutenberg/pull/42024))
+-   JS Error Tracking: Allow custom error reporting logic to be called in Error Boundaries via a WP action hook. ([42024](https://github.com/WordPress/gutenberg/pull/42024))
 
-### Accessibility 
+### Accessibility
 
-- Add aria-checked to the selected heading level menu item. ([42273](https://github.com/WordPress/gutenberg/pull/42273))
-- Fix tabbing from first or last block in site editor. ([42036](https://github.com/WordPress/gutenberg/pull/42036))
-- Navigation block: Only focus submenu trigger on escape key press. ([41986](https://github.com/WordPress/gutenberg/pull/41986))
-- Change the BoxControl ARIA role from region to group. ([42094](https://github.com/WordPress/gutenberg/pull/42094))
-- Update site editor region labels to match post editor. ([42037](https://github.com/WordPress/gutenberg/pull/42037))
+-   Add aria-checked to the selected heading level menu item. ([42273](https://github.com/WordPress/gutenberg/pull/42273))
+-   Fix tabbing from first or last block in site editor. ([42036](https://github.com/WordPress/gutenberg/pull/42036))
+-   Navigation block: Only focus submenu trigger on escape key press. ([41986](https://github.com/WordPress/gutenberg/pull/41986))
+-   Change the BoxControl ARIA role from region to group. ([42094](https://github.com/WordPress/gutenberg/pull/42094))
+-   Update site editor region labels to match post editor. ([42037](https://github.com/WordPress/gutenberg/pull/42037))
 
 ### Bug Fixes
 
-- Enable `shift` in URLPopover component. ([42214](https://github.com/WordPress/gutenberg/pull/42214))
-- Multi-selection: Fix select all in Safari. ([42340](https://github.com/WordPress/gutenberg/pull/42340))
-- Playwright: Fix relative URLs. ([42361](https://github.com/WordPress/gutenberg/pull/42361))
-- Document Settings: Fix tooltip appearing when opening popovers in Summary panel. ([42381](https://github.com/WordPress/gutenberg/pull/42381))
-- MediaReplaceFlow: Fix UI showing stale URL by avoiding state duplication. ([42116](https://github.com/WordPress/gutenberg/pull/42116))
-- Template Mode: Allow clearing name field while typing. ([42065](https://github.com/WordPress/gutenberg/pull/42065))
-- Navigation: Prevent title and href props from being rendered as HTML attributes. ([41833](https://github.com/WordPress/gutenberg/pull/41833))
-- Recurse into conditional CSS rules for Editor iframe stylesheets. ([41110](https://github.com/WordPress/gutenberg/pull/41110))
+-   Enable `shift` in URLPopover component. ([42214](https://github.com/WordPress/gutenberg/pull/42214))
+-   Multi-selection: Fix select all in Safari. ([42340](https://github.com/WordPress/gutenberg/pull/42340))
+-   Playwright: Fix relative URLs. ([42361](https://github.com/WordPress/gutenberg/pull/42361))
+-   Document Settings: Fix tooltip appearing when opening popovers in Summary panel. ([42381](https://github.com/WordPress/gutenberg/pull/42381))
+-   MediaReplaceFlow: Fix UI showing stale URL by avoiding state duplication. ([42116](https://github.com/WordPress/gutenberg/pull/42116))
+-   Template Mode: Allow clearing name field while typing. ([42065](https://github.com/WordPress/gutenberg/pull/42065))
+-   Navigation: Prevent title and href props from being rendered as HTML attributes. ([41833](https://github.com/WordPress/gutenberg/pull/41833))
+-   Recurse into conditional CSS rules for Editor iframe stylesheets. ([41110](https://github.com/WordPress/gutenberg/pull/41110))
 
 #### Block Library
-- Comment template: Left, center and right alignments. ([41892](https://github.com/WordPress/gutenberg/pull/41892))
-- Comments block: Remove stray legacy class from edit. ([42335](https://github.com/WordPress/gutenberg/pull/42335))
-- Filter out images with no local id before loading media library. ([42083](https://github.com/WordPress/gutenberg/pull/42083))
-- Fix undo trap in Gallery block when transforming from shortcode. ([42001](https://github.com/WordPress/gutenberg/pull/42001))
-- Remove sticky posts setting when we inherit the query. ([40656](https://github.com/WordPress/gutenberg/pull/40656))
-- Social Links: Set the default protocol to 'https' if not specified. ([42167](https://github.com/WordPress/gutenberg/pull/42167))
+
+-   Comment template: Left, center and right alignments. ([41892](https://github.com/WordPress/gutenberg/pull/41892))
+-   Comments block: Remove stray legacy class from edit. ([42335](https://github.com/WordPress/gutenberg/pull/42335))
+-   Filter out images with no local id before loading media library. ([42083](https://github.com/WordPress/gutenberg/pull/42083))
+-   Fix undo trap in Gallery block when transforming from shortcode. ([42001](https://github.com/WordPress/gutenberg/pull/42001))
+-   Remove sticky posts setting when we inherit the query. ([40656](https://github.com/WordPress/gutenberg/pull/40656))
+-   Social Links: Set the default protocol to 'https' if not specified. ([42167](https://github.com/WordPress/gutenberg/pull/42167))
 
 #### Components
-- Add missing label to border radius range control. ([42118](https://github.com/WordPress/gutenberg/pull/42118))
-- ComboboxControl: Use custom prefix when generating the instanceId. ([42134](https://github.com/WordPress/gutenberg/pull/42134))
-- Popover: Pass missing anchor ref to the getAnchorRect callback prop. ([42076](https://github.com/WordPress/gutenberg/pull/42076))
-- [Popover]: Fix regression of inbetween inserter in site editor. ([42329](https://github.com/WordPress/gutenberg/pull/42329))
+
+-   Add missing label to border radius range control. ([42118](https://github.com/WordPress/gutenberg/pull/42118))
+-   ComboboxControl: Use custom prefix when generating the instanceId. ([42134](https://github.com/WordPress/gutenberg/pull/42134))
+-   Popover: Pass missing anchor ref to the getAnchorRect callback prop. ([42076](https://github.com/WordPress/gutenberg/pull/42076))
+-   [Popover]: Fix regression of inbetween inserter in site editor. ([42329](https://github.com/WordPress/gutenberg/pull/42329))
 
 #### Block Editor
-- Fix Link Control 'Open in new tab' option not saving properly on committing link in buttons block. ([42073](https://github.com/WordPress/gutenberg/pull/42073))
-- Fix list view drop indicator positioning. ([42353](https://github.com/WordPress/gutenberg/pull/42353))
-- Make sure comments keep their location when inside paragraph. ([31374](https://github.com/WordPress/gutenberg/pull/31374))
-- Handle cases when getBlockType returns undefined. ([41884](https://github.com/WordPress/gutenberg/pull/41884))
+
+-   Fix Link Control 'Open in new tab' option not saving properly on committing link in buttons block. ([42073](https://github.com/WordPress/gutenberg/pull/42073))
+-   Fix list view drop indicator positioning. ([42353](https://github.com/WordPress/gutenberg/pull/42353))
+-   Make sure comments keep their location when inside paragraph. ([31374](https://github.com/WordPress/gutenberg/pull/31374))
+-   Handle cases when getBlockType returns undefined. ([41884](https://github.com/WordPress/gutenberg/pull/41884))
 
 #### Site Editor
-- Allow clearing template name field while typing. ([42149](https://github.com/WordPress/gutenberg/pull/42149))
-- Template Parts: Disable block transformations. ([42090](https://github.com/WordPress/gutenberg/pull/42090))
-- Update template details browse label. ([42350](https://github.com/WordPress/gutenberg/pull/42350))
-- Fix pattern carousel / grid styling regression. ([42194](https://github.com/WordPress/gutenberg/pull/42194))
+
+-   Allow clearing template name field while typing. ([42149](https://github.com/WordPress/gutenberg/pull/42149))
+-   Template Parts: Disable block transformations. ([42090](https://github.com/WordPress/gutenberg/pull/42090))
+-   Update template details browse label. ([42350](https://github.com/WordPress/gutenberg/pull/42350))
+-   Fix pattern carousel / grid styling regression. ([42194](https://github.com/WordPress/gutenberg/pull/42194))
 
 #### Global Styles
-- Filter block level styles before compiling global stylesheet. ([42207](https://github.com/WordPress/gutenberg/pull/42207))
-- Fix link element hover bleeding into button element default styles. ([42072](https://github.com/WordPress/gutenberg/pull/42072))
+
+-   Filter block level styles before compiling global stylesheet. ([42207](https://github.com/WordPress/gutenberg/pull/42207))
+-   Fix link element hover bleeding into button element default styles. ([42072](https://github.com/WordPress/gutenberg/pull/42072))
 
 #### Post Editor
-- Editor: Fix term selector component exports. ([41784](https://github.com/WordPress/gutenberg/pull/41784))
-- Post Template: Fix condition checks. ([42038](https://github.com/WordPress/gutenberg/pull/42038))
+
+-   Editor: Fix term selector component exports. ([41784](https://github.com/WordPress/gutenberg/pull/41784))
+-   Post Template: Fix condition checks. ([42038](https://github.com/WordPress/gutenberg/pull/42038))
 
 #### Build Tooling
-- Tests: Ignore test files in `build-types` folder. ([42260](https://github.com/WordPress/gutenberg/pull/42260))
-- Fix: IsEditedPostAutosaveable test case. ([42280](https://github.com/WordPress/gutenberg/pull/42280))
+
+-   Tests: Ignore test files in `build-types` folder. ([42260](https://github.com/WordPress/gutenberg/pull/42260))
+-   Fix: IsEditedPostAutosaveable test case. ([42280](https://github.com/WordPress/gutenberg/pull/42280))
 
 ### Performance
-- Work on refactor away from Lodash to reduce build size continued
+
+-   Work on refactor away from Lodash to reduce build size continued
 
 ### Documentation
-- Add support for @ignore in the docgen tool. ([42198](https://github.com/WordPress/gutenberg/pull/42198))
-- Button Component readme :  Suggest label in case there is not text. ([40639](https://github.com/WordPress/gutenberg/pull/40639))
-- New handbook page for curating the editor experience. ([42022](https://github.com/WordPress/gutenberg/pull/42022))
-- Rename Templates page to Block Templates. ([42276](https://github.com/WordPress/gutenberg/pull/42276))
-- Gutenberg Data Tutorial 5: Adding a Delete Button. ([40940](https://github.com/WordPress/gutenberg/pull/40940))
-- Added new FAQ on disabling caching of theme.json. ([42346](https://github.com/WordPress/gutenberg/pull/42346))
-- Update link to sample code in gutenberg-examples. ([42208](https://github.com/WordPress/gutenberg/pull/42208))
-- Add @example for getNotices to create example in the handbook. ([42023](https://github.com/WordPress/gutenberg/pull/42023))
-- Add examples for all actions/selectors for the @wordpress/notice package. ([42077](https://github.com/WordPress/gutenberg/pull/42077))
-- Update versions in WordPress for upcoming 6.0.1 release. ([42161](https://github.com/WordPress/gutenberg/pull/42161))
-- Fix code blocks for Block Transforms API. ([42287](https://github.com/WordPress/gutenberg/pull/42287))
-- Fix formatting problems with curating handbook page. ([42135](https://github.com/WordPress/gutenberg/pull/42135))
-- Fix link to meta box example. ([42293](https://github.com/WordPress/gutenberg/pull/42293))
-- Update attributes example: Alter source children. ([41016](https://github.com/WordPress/gutenberg/pull/41016))
+
+-   Add support for @ignore in the docgen tool. ([42198](https://github.com/WordPress/gutenberg/pull/42198))
+-   Button Component readme : Suggest label in case there is not text. ([40639](https://github.com/WordPress/gutenberg/pull/40639))
+-   New handbook page for curating the editor experience. ([42022](https://github.com/WordPress/gutenberg/pull/42022))
+-   Rename Templates page to Block Templates. ([42276](https://github.com/WordPress/gutenberg/pull/42276))
+-   Gutenberg Data Tutorial 5: Adding a Delete Button. ([40940](https://github.com/WordPress/gutenberg/pull/40940))
+-   Added new FAQ on disabling caching of theme.json. ([42346](https://github.com/WordPress/gutenberg/pull/42346))
+-   Update link to sample code in gutenberg-examples. ([42208](https://github.com/WordPress/gutenberg/pull/42208))
+-   Add @example for getNotices to create example in the handbook. ([42023](https://github.com/WordPress/gutenberg/pull/42023))
+-   Add examples for all actions/selectors for the @wordpress/notice package. ([42077](https://github.com/WordPress/gutenberg/pull/42077))
+-   Update versions in WordPress for upcoming 6.0.1 release. ([42161](https://github.com/WordPress/gutenberg/pull/42161))
+-   Fix code blocks for Block Transforms API. ([42287](https://github.com/WordPress/gutenberg/pull/42287))
+-   Fix formatting problems with curating handbook page. ([42135](https://github.com/WordPress/gutenberg/pull/42135))
+-   Fix link to meta box example. ([42293](https://github.com/WordPress/gutenberg/pull/42293))
+-   Update attributes example: Alter source children. ([41016](https://github.com/WordPress/gutenberg/pull/41016))
 
 #### npm publishing workflow
-- Simplify workflow with GitHub Actions ([42189](https://github.com/WordPress/gutenberg/pull/42189))
-- Update details related to npm publishing. ([42364](https://github.com/WordPress/gutenberg/pull/42364))
+
+-   Simplify workflow with GitHub Actions ([42189](https://github.com/WordPress/gutenberg/pull/42189))
+-   Update details related to npm publishing. ([42364](https://github.com/WordPress/gutenberg/pull/42364))
 
 ### Experiments
-- Add a `WP_Style_Engine_CSS_Declarations` object. ([42043](https://github.com/WordPress/gutenberg/pull/42043))
-- Style engine: Rename 'css_var' option property to 'convert_vars_to_classnames'. ([42113](https://github.com/WordPress/gutenberg/pull/42113))
-- Style engine: Return declarations in array response. ([42307](https://github.com/WordPress/gutenberg/pull/42307))
-- Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json. ([40875](https://github.com/WordPress/gutenberg/pull/40875))
+
+-   Add a `WP_Style_Engine_CSS_Declarations` object. ([42043](https://github.com/WordPress/gutenberg/pull/42043))
+-   Style engine: Rename 'css_var' option property to 'convert_vars_to_classnames'. ([42113](https://github.com/WordPress/gutenberg/pull/42113))
+-   Style engine: Return declarations in array response. ([42307](https://github.com/WordPress/gutenberg/pull/42307))
+-   Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json. ([40875](https://github.com/WordPress/gutenberg/pull/40875))
 
 ### Code Quality
-- Block Editor: Use optional chaining in 'block-list' component. ([42068](https://github.com/WordPress/gutenberg/pull/42068))
-- Blocks: Remove no longer used Block Content Context. ([41395](https://github.com/WordPress/gutenberg/pull/41395))
-- Chore: Remove two empty unrequired object destructuring. ([42279](https://github.com/WordPress/gutenberg/pull/42279))
-- Fix fix. ([42160](https://github.com/WordPress/gutenberg/pull/42160))
-- Fix: Inexistent parameter passed to getBlockIndex on getBlockInsertionPoint. ([42250](https://github.com/WordPress/gutenberg/pull/42250))
-- Fix: State type in automaticChangeStatus reducer. ([42251](https://github.com/WordPress/gutenberg/pull/42251))
-- Style engine: Add unit test coverage for WP_Style_Engine_CSS_Declarations. ([42306](https://github.com/WordPress/gutenberg/pull/42306))
-- Style engine: Rename main public function to reflect functionality. ([42140](https://github.com/WordPress/gutenberg/pull/42140))
-- Update: Remove repeated and condition on useElevation. ([42048](https://github.com/WordPress/gutenberg/pull/42048))
-- useSelect: Use useDebugValue to better display data in DevTools. ([42225](https://github.com/WordPress/gutenberg/pull/42225))
+
+-   Block Editor: Use optional chaining in 'block-list' component. ([42068](https://github.com/WordPress/gutenberg/pull/42068))
+-   Blocks: Remove no longer used Block Content Context. ([41395](https://github.com/WordPress/gutenberg/pull/41395))
+-   Chore: Remove two empty unrequired object destructuring. ([42279](https://github.com/WordPress/gutenberg/pull/42279))
+-   Fix fix. ([42160](https://github.com/WordPress/gutenberg/pull/42160))
+-   Fix: Inexistent parameter passed to getBlockIndex on getBlockInsertionPoint. ([42250](https://github.com/WordPress/gutenberg/pull/42250))
+-   Fix: State type in automaticChangeStatus reducer. ([42251](https://github.com/WordPress/gutenberg/pull/42251))
+-   Style engine: Add unit test coverage for WP_Style_Engine_CSS_Declarations. ([42306](https://github.com/WordPress/gutenberg/pull/42306))
+-   Style engine: Rename main public function to reflect functionality. ([42140](https://github.com/WordPress/gutenberg/pull/42140))
+-   Update: Remove repeated and condition on useElevation. ([42048](https://github.com/WordPress/gutenberg/pull/42048))
+-   useSelect: Use useDebugValue to better display data in DevTools. ([42225](https://github.com/WordPress/gutenberg/pull/42225))
 
 #### Migration to Typescript
-- Grid: Convert component to TypeScript. ([41923](https://github.com/WordPress/gutenberg/pull/41923))
-- HStack: Convert component to TypeScript. ([41580](https://github.com/WordPress/gutenberg/pull/41580))
-- RangeControl: Convert component to TypeScript. ([40535](https://github.com/WordPress/gutenberg/pull/40535))
-- RangeControl: Convert stories to TypeScript. ([41444](https://github.com/WordPress/gutenberg/pull/41444))
-- RangeControl: Convert unit tests to typescript. ([41445](https://github.com/WordPress/gutenberg/pull/41445))
-- Scrollable: Convert component to TypeScript. ([42016](https://github.com/WordPress/gutenberg/pull/42016))
-- TextHighlight: Convert component to TypeScript. ([41698](https://github.com/WordPress/gutenberg/pull/41698))
-- Tip: Covert component to TypeScript. ([42262](https://github.com/WordPress/gutenberg/pull/42262))
-- VisuallyHidden: Convert component to TypeScript. ([42220](https://github.com/WordPress/gutenberg/pull/42220))
-- Spacer: Complete TypeScript migration of component. ([42013](https://github.com/WordPress/gutenberg/pull/42013))
-- 
+
+-   Grid: Convert component to TypeScript. ([41923](https://github.com/WordPress/gutenberg/pull/41923))
+-   HStack: Convert component to TypeScript. ([41580](https://github.com/WordPress/gutenberg/pull/41580))
+-   RangeControl: Convert component to TypeScript. ([40535](https://github.com/WordPress/gutenberg/pull/40535))
+-   RangeControl: Convert stories to TypeScript. ([41444](https://github.com/WordPress/gutenberg/pull/41444))
+-   RangeControl: Convert unit tests to typescript. ([41445](https://github.com/WordPress/gutenberg/pull/41445))
+-   Scrollable: Convert component to TypeScript. ([42016](https://github.com/WordPress/gutenberg/pull/42016))
+-   TextHighlight: Convert component to TypeScript. ([41698](https://github.com/WordPress/gutenberg/pull/41698))
+-   Tip: Covert component to TypeScript. ([42262](https://github.com/WordPress/gutenberg/pull/42262))
+-   VisuallyHidden: Convert component to TypeScript. ([42220](https://github.com/WordPress/gutenberg/pull/42220))
+-   Spacer: Complete TypeScript migration of component. ([42013](https://github.com/WordPress/gutenberg/pull/42013))
+-
+
 #### Components
-- Add eslint to prevent SSR breakage. ([42248](https://github.com/WordPress/gutenberg/pull/42248))
-- Fix typos in components changelog. ([42244](https://github.com/WordPress/gutenberg/pull/42244))
-- Refactor `ColorPicker` to pass `exhaustive-deps`. ([41294](https://github.com/WordPress/gutenberg/pull/41294))
-- Refactor `Navigation` to pass `exhaustive-deps`. ([41612](https://github.com/WordPress/gutenberg/pull/41612))
-- Refactor`FocalPointPicker` to pass exhaustive-deps. ([41520](https://github.com/WordPress/gutenberg/pull/41520))
 
+-   Add eslint to prevent SSR breakage. ([42248](https://github.com/WordPress/gutenberg/pull/42248))
+-   Fix typos in components changelog. ([42244](https://github.com/WordPress/gutenberg/pull/42244))
+-   Refactor `ColorPicker` to pass `exhaustive-deps`. ([41294](https://github.com/WordPress/gutenberg/pull/41294))
+-   Refactor `Navigation` to pass `exhaustive-deps`. ([41612](https://github.com/WordPress/gutenberg/pull/41612))
+-   Refactor`FocalPointPicker` to pass exhaustive-deps. ([41520](https://github.com/WordPress/gutenberg/pull/41520))
 
 #### Block Library
-- More Block: Remove duplicate block class. ([42120](https://github.com/WordPress/gutenberg/pull/42120))
-- Page Break Block: Remove duplicate block class. ([42121](https://github.com/WordPress/gutenberg/pull/42121))
-- Page List Block: Remove duplicate useBlockProps hook. ([42123](https://github.com/WordPress/gutenberg/pull/42123))
-- Remove client side variation fallbacks. ([42180](https://github.com/WordPress/gutenberg/pull/42180))
-- Site Logo: Remove unnecessary state. ([42042](https://github.com/WordPress/gutenberg/pull/42042))
 
-### Tools
+-   More Block: Remove duplicate block class. ([42120](https://github.com/WordPress/gutenberg/pull/42120))
+-   Page Break Block: Remove duplicate block class. ([42121](https://github.com/WordPress/gutenberg/pull/42121))
+-   Page List Block: Remove duplicate useBlockProps hook. ([42123](https://github.com/WordPress/gutenberg/pull/42123))
+-   Remove client side variation fallbacks. ([42180](https://github.com/WordPress/gutenberg/pull/42180))
+-   Site Logo: Remove unnecessary state. ([42042](https://github.com/WordPress/gutenberg/pull/42042))
 
-- Automate the cherry-picking process for WordPress and Gutenberg releases. ([40969](https://github.com/WordPress/gutenberg/pull/40969))
-- Update the minimum WP version to 5.9. ([41306](https://github.com/WordPress/gutenberg/pull/41306))
-- Components: Remove duplicate CHANGELOG titles. ([42334](https://github.com/WordPress/gutenberg/pull/42334))
+### Tools
 
+-   Automate the cherry-picking process for WordPress and Gutenberg releases. ([40969](https://github.com/WordPress/gutenberg/pull/40969))
+-   Update the minimum WP version to 5.9. ([41306](https://github.com/WordPress/gutenberg/pull/41306))
+-   Components: Remove duplicate CHANGELOG titles. ([42334](https://github.com/WordPress/gutenberg/pull/42334))
 
 #### Testing
-- Fix: Multiple regex in packages/env/lib/config/test/config.js. ([42249](https://github.com/WordPress/gutenberg/pull/42249))
-- Migrate Block Mover Test For Playwright. ([42039](https://github.com/WordPress/gutenberg/pull/42039))
-- Migrate format API test for playwright. ([42035](https://github.com/WordPress/gutenberg/pull/42035))
-- Migrate list block test to Playwright. ([41555](https://github.com/WordPress/gutenberg/pull/41555))
-- end-to-end Tests: Migrate Comments block test to Playwright. ([39826](https://github.com/WordPress/gutenberg/pull/39826))
-- fix: Update Image block native end-to-end test fixture. ([42050](https://github.com/WordPress/gutenberg/pull/42050))
-- SelectControl: Use roles and @testing-library/user-event in unit tests. ([42308](https://github.com/WordPress/gutenberg/pull/42308))
+
+-   Fix: Multiple regex in packages/env/lib/config/test/config.js. ([42249](https://github.com/WordPress/gutenberg/pull/42249))
+-   Migrate Block Mover Test For Playwright. ([42039](https://github.com/WordPress/gutenberg/pull/42039))
+-   Migrate format API test for playwright. ([42035](https://github.com/WordPress/gutenberg/pull/42035))
+-   Migrate list block test to Playwright. ([41555](https://github.com/WordPress/gutenberg/pull/41555))
+-   end-to-end Tests: Migrate Comments block test to Playwright. ([39826](https://github.com/WordPress/gutenberg/pull/39826))
+-   fix: Update Image block native end-to-end test fixture. ([42050](https://github.com/WordPress/gutenberg/pull/42050))
+-   SelectControl: Use roles and @testing-library/user-event in unit tests. ([42308](https://github.com/WordPress/gutenberg/pull/42308))
 
 #### Build Tooling
-- Ignore *.d.ts files when running unit tests. ([42304](https://github.com/WordPress/gutenberg/pull/42304))
-- Dependency Extraction: Output asset.php files for shared chunks too. ([41002](https://github.com/WordPress/gutenberg/pull/41002))
+
+-   Ignore \*.d.ts files when running unit tests. ([42304](https://github.com/WordPress/gutenberg/pull/42304))
+-   Dependency Extraction: Output asset.php files for shared chunks too. ([41002](https://github.com/WordPress/gutenberg/pull/41002))
 
 #### Create Block
-- Added prompt to continue when minimum system requirements not met. ([42151](https://github.com/WordPress/gutenberg/pull/42151))
-- More careful prompts to continue when minimum system requirements are not met. ([42254](https://github.com/WordPress/gutenberg/pull/42254))
-- Fix regression from `_.size()` refactoring. ([42049](https://github.com/WordPress/gutenberg/pull/42049))
+
+-   Added prompt to continue when minimum system requirements not met. ([42151](https://github.com/WordPress/gutenberg/pull/42151))
+-   More careful prompts to continue when minimum system requirements are not met. ([42254](https://github.com/WordPress/gutenberg/pull/42254))
+-   Fix regression from `_.size()` refactoring. ([42049](https://github.com/WordPress/gutenberg/pull/42049))
 
 #### Block Library
-- Comments block: Change ID to `core/comments`. ([40506](https://github.com/WordPress/gutenberg/pull/40506))
-- Elements: Buttons: Style the cursor for all button elements. ([42102](https://github.com/WordPress/gutenberg/pull/42102))
-- Post Comments Form: Fix warning i18n. ([42131](https://github.com/WordPress/gutenberg/pull/42131))
-- Use more clear and inclusive language in comments. ([42155](https://github.com/WordPress/gutenberg/pull/42155))
+
+-   Comments block: Change ID to `core/comments`. ([40506](https://github.com/WordPress/gutenberg/pull/40506))
+-   Elements: Buttons: Style the cursor for all button elements. ([42102](https://github.com/WordPress/gutenberg/pull/42102))
+-   Post Comments Form: Fix warning i18n. ([42131](https://github.com/WordPress/gutenberg/pull/42131))
+-   Use more clear and inclusive language in comments. ([42155](https://github.com/WordPress/gutenberg/pull/42155))
 
 #### Global Styles
-- Add link element `:Hover` interactivity control to global styles UI. ([41976](https://github.com/WordPress/gutenberg/pull/41976))
-- Add support for heading elements. ([41981](https://github.com/WordPress/gutenberg/pull/41981))
-- Add visited to link element allowed pseudo selector list. ([42096](https://github.com/WordPress/gutenberg/pull/42096))
-- Button Elements: Allow element styles in classic themes. ([42012](https://github.com/WordPress/gutenberg/pull/42012))
-- Theme.json:  Add spacing size presets. ([41527](https://github.com/WordPress/gutenberg/pull/41527))
-- Theme.json Schema: Add support for button elements. ([42133](https://github.com/WordPress/gutenberg/pull/42133))
+
+-   Add link element `:Hover` interactivity control to global styles UI. ([41976](https://github.com/WordPress/gutenberg/pull/41976))
+-   Add support for heading elements. ([41981](https://github.com/WordPress/gutenberg/pull/41981))
+-   Add visited to link element allowed pseudo selector list. ([42096](https://github.com/WordPress/gutenberg/pull/42096))
+-   Button Elements: Allow element styles in classic themes. ([42012](https://github.com/WordPress/gutenberg/pull/42012))
+-   Theme.json: Add spacing size presets. ([41527](https://github.com/WordPress/gutenberg/pull/41527))
+-   Theme.json Schema: Add support for button elements. ([42133](https://github.com/WordPress/gutenberg/pull/42133))
 
 #### Block Editor
-- Rich text: Remove placeholder on composition start. ([41970](https://github.com/WordPress/gutenberg/pull/41970))
-- Rich text: Remove space handling (for BUTTON and SUMMARY). ([41977](https://github.com/WordPress/gutenberg/pull/41977))
-- Site Editor: Make Code Editor reflect block conversions. ([42081](https://github.com/WordPress/gutenberg/pull/42081))
-- Remove the Template panel option from the Preferences modal ([42030](https://github.com/WordPress/gutenberg/pull/42030))
+
+-   Rich text: Remove placeholder on composition start. ([41970](https://github.com/WordPress/gutenberg/pull/41970))
+-   Rich text: Remove space handling (for BUTTON and SUMMARY). ([41977](https://github.com/WordPress/gutenberg/pull/41977))
+-   Site Editor: Make Code Editor reflect block conversions. ([42081](https://github.com/WordPress/gutenberg/pull/42081))
+-   Remove the Template panel option from the Preferences modal ([42030](https://github.com/WordPress/gutenberg/pull/42030))
+
 #### Data Layer
-- Enable useSelect autocompletion. ([41911](https://github.com/WordPress/gutenberg/pull/41911))
-- Update wordpress/data documentation in order to prefer store object instead of store name to access the store. ([41210](https://github.com/WordPress/gutenberg/pull/41210))
 
-## First time contributors
+-   Enable useSelect autocompletion. ([41911](https://github.com/WordPress/gutenberg/pull/41911))
+-   Update wordpress/data documentation in order to prefer store object instead of store name to access the store. ([41210](https://github.com/WordPress/gutenberg/pull/41210))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @MarieComet: Button Component readme :  Suggest label in case there is not text. ([40639](https://github.com/WordPress/gutenberg/pull/40639))
-- @rflw: Update attributes example: Alter source children. ([41016](https://github.com/WordPress/gutenberg/pull/41016))
-- @schutzsmith: Theme.json Documentation - Added new FAQ on disabling caching of theme.json. ([42346](https://github.com/WordPress/gutenberg/pull/42346))
-- @welenofsky: Update link to sample code in gutenberg-examples. ([42208](https://github.com/WordPress/gutenberg/pull/42208))
+The following PRs were merged by first-time contributors:
 
+-   @MarieComet: Button Component readme : Suggest label in case there is not text. ([40639](https://github.com/WordPress/gutenberg/pull/40639))
+-   @rflw: Update attributes example: Alter source children. ([41016](https://github.com/WordPress/gutenberg/pull/41016))
+-   @schutzsmith: Theme.json Documentation - Added new FAQ on disabling caching of theme.json. ([42346](https://github.com/WordPress/gutenberg/pull/42346))
+-   @welenofsky: Update link to sample code in gutenberg-examples. ([42208](https://github.com/WordPress/gutenberg/pull/42208))
 
 ## Contributors
 
@@ -14111,200 +25487,199 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @afercia @alexstine @andrewserong @annezazu @aristath @bph @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @dcalhoun @draganescu @ellatrix @fullofcaffeine @geriux @getdave @glendaviesnz @gziolo @hz-tyfoon @jameskoster @jorgefilipecosta @jsnajdr @kevin940726 @Mamaduka @MarieComet @mcliwanow @mcsf @mikachan @mirka @ndiego @noisysocks @ntsekouras @ockham @oguzkocer @opr @pavanpatil1 @pooja-muchandikar @ralucaStan @ramonjd @renatho @rflw @ryanwelcher @schutzsmith @scruffian @SiobhyB @stokesman @t-hamano @talldan @torounit @tyxla @vdwijngaert @walbo @welenofsky @youknowriad
 
-
-
-
 = 13.6.0 =
 
-
 ## Changelog
 
 ### Enhancements
 
-#### UI 
-- Increase fade intensity during spotlight mode. ([40454](https://github.com/WordPress/gutenberg/pull/40454))
-- Improvements to "inherit default layout" toggle. ([41893](https://github.com/WordPress/gutenberg/pull/41893))
-- Make it easier to select "Edit visually" when in "Edit as HTML. ([41516](https://github.com/WordPress/gutenberg/pull/41516))
-- Abbreviate post schedule date when possible. ([41738](https://github.com/WordPress/gutenberg/pull/41738))
+#### UI
+
+-   Increase fade intensity during spotlight mode. ([40454](https://github.com/WordPress/gutenberg/pull/40454))
+-   Improvements to "inherit default layout" toggle. ([41893](https://github.com/WordPress/gutenberg/pull/41893))
+-   Make it easier to select "Edit visually" when in "Edit as HTML. ([41516](https://github.com/WordPress/gutenberg/pull/41516))
+-   Abbreviate post schedule date when possible. ([41738](https://github.com/WordPress/gutenberg/pull/41738))
 
 #### Global Styles
-- Add support for caption elements. ([41140](https://github.com/WordPress/gutenberg/pull/41140))
-- Add UI for button elements ([41659](https://github.com/WordPress/gutenberg/pull/41659)) and fix the button element selectors. ([41822](https://github.com/WordPress/gutenberg/pull/41822))
-- Support pseudo selectors on `elements` in theme json. ([41786](https://github.com/WordPress/gutenberg/pull/41786))
-- Add the ability to unset duotone in themes with default duotone set. ([39564](https://github.com/WordPress/gutenberg/pull/39564))
-- Allow references to values in other locations in the tree. ([41696](https://github.com/WordPress/gutenberg/pull/41696))
-- Lower specificity of elements block css. ([41931](https://github.com/WordPress/gutenberg/pull/41931))
-- Add border to frontend style engine. ([41803](https://github.com/WordPress/gutenberg/pull/41803))
-- Add schema support for styles.filter.duotone. ([41920](https://github.com/WordPress/gutenberg/pull/41920))
-- Add an API make it easier to get class names. ([41753](https://github.com/WordPress/gutenberg/pull/41753))
-- Update Theme JSON `$schema` to account for pseudo selector support. ([41936](https://github.com/WordPress/gutenberg/pull/41936))
+
+-   Add support for caption elements. ([41140](https://github.com/WordPress/gutenberg/pull/41140))
+-   Add UI for button elements ([41659](https://github.com/WordPress/gutenberg/pull/41659)) and fix the button element selectors. ([41822](https://github.com/WordPress/gutenberg/pull/41822))
+-   Support pseudo selectors on `elements` in theme json. ([41786](https://github.com/WordPress/gutenberg/pull/41786))
+-   Add the ability to unset duotone in themes with default duotone set. ([39564](https://github.com/WordPress/gutenberg/pull/39564))
+-   Allow references to values in other locations in the tree. ([41696](https://github.com/WordPress/gutenberg/pull/41696))
+-   Lower specificity of elements block css. ([41931](https://github.com/WordPress/gutenberg/pull/41931))
+-   Add border to frontend style engine. ([41803](https://github.com/WordPress/gutenberg/pull/41803))
+-   Add schema support for styles.filter.duotone. ([41920](https://github.com/WordPress/gutenberg/pull/41920))
+-   Add an API make it easier to get class names. ([41753](https://github.com/WordPress/gutenberg/pull/41753))
+-   Update Theme JSON `$schema` to account for pseudo selector support. ([41936](https://github.com/WordPress/gutenberg/pull/41936))
 
 #### Patterns
-- Add the ability to use creation patterns for other post types besides page. ([41791](https://github.com/WordPress/gutenberg/pull/41791))
 
-#### Block Library
+-   Add the ability to use creation patterns for other post types besides page. ([41791](https://github.com/WordPress/gutenberg/pull/41791))
 
-- Columns: Change title of one third/two thirds column variation to 66/33. ([41734](https://github.com/WordPress/gutenberg/pull/41734))
-- Navigation:
-- Adjust mobile close button position when admin bar is visible. ([41664](https://github.com/WordPress/gutenberg/pull/41664))
-- Make additional top margin specific to open modal. ([41949](https://github.com/WordPress/gutenberg/pull/41949))
-- Move block CSS to JSON. ([41898](https://github.com/WordPress/gutenberg/pull/41898))
-- Post Comments Form: Add button that enables commenting to warning. ([41603](https://github.com/WordPress/gutenberg/pull/41603))
-- Cover:
-- Strip whitespaces in render_block_core_cover. ([40859](https://github.com/WordPress/gutenberg/pull/40859))
-- Implement axial top bottom margin. ([41963](https://github.com/WordPress/gutenberg/pull/41963))
-- Image: Set Default state to media library for library button in image block. ([41678](https://github.com/WordPress/gutenberg/pull/41678))
-- Classic: Remove CSS properties with vendor prefixes. ([41995](https://github.com/WordPress/gutenberg/pull/41995))
-- Embed: Add Pocket Casts embed block variation. ([41006](https://github.com/WordPress/gutenberg/pull/41006))
+#### Block Library
 
+-   Columns: Change title of one third/two thirds column variation to 66/33. ([41734](https://github.com/WordPress/gutenberg/pull/41734))
+-   Navigation:
+-   Adjust mobile close button position when admin bar is visible. ([41664](https://github.com/WordPress/gutenberg/pull/41664))
+-   Make additional top margin specific to open modal. ([41949](https://github.com/WordPress/gutenberg/pull/41949))
+-   Move block CSS to JSON. ([41898](https://github.com/WordPress/gutenberg/pull/41898))
+-   Post Comments Form: Add button that enables commenting to warning. ([41603](https://github.com/WordPress/gutenberg/pull/41603))
+-   Cover:
+-   Strip whitespaces in render_block_core_cover. ([40859](https://github.com/WordPress/gutenberg/pull/40859))
+-   Implement axial top bottom margin. ([41963](https://github.com/WordPress/gutenberg/pull/41963))
+-   Image: Set Default state to media library for library button in image block. ([41678](https://github.com/WordPress/gutenberg/pull/41678))
+-   Classic: Remove CSS properties with vendor prefixes. ([41995](https://github.com/WordPress/gutenberg/pull/41995))
+-   Embed: Add Pocket Casts embed block variation. ([41006](https://github.com/WordPress/gutenberg/pull/41006))
 
 #### Site and Template Editor
-- Turn Template settings panel into a Template popover. ([41925](https://github.com/WordPress/gutenberg/pull/41925))
-- Expand the template types that can be added - single custom post type and specific posts templates. ([41189](https://github.com/WordPress/gutenberg/pull/41189))
-- Add clear customizations to template card. ([41743](https://github.com/WordPress/gutenberg/pull/41743))
+
+-   Turn Template settings panel into a Template popover. ([41925](https://github.com/WordPress/gutenberg/pull/41925))
+-   Expand the template types that can be added - single custom post type and specific posts templates. ([41189](https://github.com/WordPress/gutenberg/pull/41189))
+-   Add clear customizations to template card. ([41743](https://github.com/WordPress/gutenberg/pull/41743))
 
 #### Accessibility
-- Make the site editor header toolbar use the ARIA toolbar pattern. ([41902](https://github.com/WordPress/gutenberg/pull/41902))
-- Allow defining an aria-label in group blocks. ([41744](https://github.com/WordPress/gutenberg/pull/41744))
-- Add keyboard shortcut for Strikethrough. ([41910](https://github.com/WordPress/gutenberg/pull/41910)) and inline code. ([41816](https://github.com/WordPress/gutenberg/pull/41816)) in the format library.
-- Navigation submenus: Allow Escape key to close the submenu and focus trigger. ([41774](https://github.com/WordPress/gutenberg/pull/41774))
-- Show the link completer shortcut on the help modals. ([41872](https://github.com/WordPress/gutenberg/pull/41872))
-
-
-### Bug Fixes
-
-- Fix incorrect '_n' usage in the block Editor. ([41886](https://github.com/WordPress/gutenberg/pull/41886))
-- BlockPreview: Fix 'Infinity' is invalid 'minHeight' value warning. ([41766](https://github.com/WordPress/gutenberg/pull/41766))
-- Compare against default category in the settings instead of hardcoded slug. ([41956](https://github.com/WordPress/gutenberg/pull/41956))
-- Fix PHP 8.1 deprecation in the gallery block. ([41193](https://github.com/WordPress/gutenberg/pull/41193))
-- Add 'application/zip' accept header. ([41602](https://github.com/WordPress/gutenberg/pull/41602))
-- [Block Editor]: Fix content loss from `replaceInnerBlocks` with controlled blocks. ([41948](https://github.com/WordPress/gutenberg/pull/41948))
-- Fix action button spacing on the widget editor. ([41915](https://github.com/WordPress/gutenberg/pull/41915))
-- Render duotone presets in pattern preview. ([41249](https://github.com/WordPress/gutenberg/pull/41249))
- 
-#### Block Library
-- List  v2:
-- Fix impossible to outdent multiple list items. ([41713](https://github.com/WordPress/gutenberg/pull/41713))
-- Set selection to created block after split with Enter. ([41899](https://github.com/WordPress/gutenberg/pull/41899))
-- Transforms don't take into account nested blocks. ([41741](https://github.com/WordPress/gutenberg/pull/41741))
-- Comments: Fix issue with custom font sizes and links color. ([41627](https://github.com/WordPress/gutenberg/pull/41627))
-- Navigation: Fix permissions warning. ([41862](https://github.com/WordPress/gutenberg/pull/41862))
-- Post Template: Ensure layout classnames are not attached to inner li elements. ([41827](https://github.com/WordPress/gutenberg/pull/41827))
-- Image block: Preserve alt text from media library. ([41839](https://github.com/WordPress/gutenberg/pull/41839))
-- Search block: Remove double spaces. ([41746](https://github.com/WordPress/gutenberg/pull/41746))
-- Fix issue of background min height. ([41693](https://github.com/WordPress/gutenberg/pull/41693))
-- Only use the post-title if the featured image is a link. ([41775](https://github.com/WordPress/gutenberg/pull/41775))
-- Always load block CSS from __experimentalStyle on global styles output. ([42005](https://github.com/WordPress/gutenberg/pull/42005))
-
-#### Components
-- Border Controls/Color Palette: Ensure popovers remain within small viewports. ([41930](https://github.com/WordPress/gutenberg/pull/41930))
-- ColorPicker: Remove horizontal scrollbar when using HSL or RGB color input types. ([41646](https://github.com/WordPress/gutenberg/pull/41646))
-- DatePicker:  Respect site's 'Week Starts On' setting. ([41648](https://github.com/WordPress/gutenberg/pull/41648))
-- BlockSettingsMenuControls: Fix 'showLockButton' check. ([41788](https://github.com/WordPress/gutenberg/pull/41788))
-- Color Controls: Allow popovers to remain within smaller viewports. ([41929](https://github.com/WordPress/gutenberg/pull/41929))
 
-#### REST API
-- Fix retrieving autosaves when using a custom rest_namespace. ([41542](https://github.com/WordPress/gutenberg/pull/41542))
-- Remove hardcoded references to rest namespace. ([41950](https://github.com/WordPress/gutenberg/pull/41950)), ([41951](https://github.com/WordPress/gutenberg/pull/41951)).
+-   Make the site editor header toolbar use the ARIA toolbar pattern. ([41902](https://github.com/WordPress/gutenberg/pull/41902))
+-   Allow defining an aria-label in group blocks. ([41744](https://github.com/WordPress/gutenberg/pull/41744))
+-   Add keyboard shortcut for Strikethrough. ([41910](https://github.com/WordPress/gutenberg/pull/41910)) and inline code. ([41816](https://github.com/WordPress/gutenberg/pull/41816)) in the format library.
+-   Navigation submenus: Allow Escape key to close the submenu and focus trigger. ([41774](https://github.com/WordPress/gutenberg/pull/41774))
+-   Show the link completer shortcut on the help modals. ([41872](https://github.com/WordPress/gutenberg/pull/41872))
 
+### Bug Fixes
 
-### Performance
+-   Fix incorrect '\_n' usage in the block Editor. ([41886](https://github.com/WordPress/gutenberg/pull/41886))
+-   BlockPreview: Fix 'Infinity' is invalid 'minHeight' value warning. ([41766](https://github.com/WordPress/gutenberg/pull/41766))
+-   Compare against default category in the settings instead of hardcoded slug. ([41956](https://github.com/WordPress/gutenberg/pull/41956))
+-   Fix PHP 8.1 deprecation in the gallery block. ([41193](https://github.com/WordPress/gutenberg/pull/41193))
+-   Add 'application/zip' accept header. ([41602](https://github.com/WordPress/gutenberg/pull/41602))
+-   [Block Editor]: Fix content loss from `replaceInnerBlocks` with controlled blocks. ([41948](https://github.com/WordPress/gutenberg/pull/41948))
+-   Fix action button spacing on the widget editor. ([41915](https://github.com/WordPress/gutenberg/pull/41915))
+-   Render duotone presets in pattern preview. ([41249](https://github.com/WordPress/gutenberg/pull/41249))
+
+#### Block Library
+
+-   List v2:
+-   Fix impossible to outdent multiple list items. ([41713](https://github.com/WordPress/gutenberg/pull/41713))
+-   Set selection to created block after split with Enter. ([41899](https://github.com/WordPress/gutenberg/pull/41899))
+-   Transforms don't take into account nested blocks. ([41741](https://github.com/WordPress/gutenberg/pull/41741))
+-   Comments: Fix issue with custom font sizes and links color. ([41627](https://github.com/WordPress/gutenberg/pull/41627))
+-   Navigation: Fix permissions warning. ([41862](https://github.com/WordPress/gutenberg/pull/41862))
+-   Post Template: Ensure layout classnames are not attached to inner li elements. ([41827](https://github.com/WordPress/gutenberg/pull/41827))
+-   Image block: Preserve alt text from media library. ([41839](https://github.com/WordPress/gutenberg/pull/41839))
+-   Search block: Remove double spaces. ([41746](https://github.com/WordPress/gutenberg/pull/41746))
+-   Fix issue of background min height. ([41693](https://github.com/WordPress/gutenberg/pull/41693))
+-   Only use the post-title if the featured image is a link. ([41775](https://github.com/WordPress/gutenberg/pull/41775))
+-   Always load block CSS from \_\_experimentalStyle on global styles output. ([42005](https://github.com/WordPress/gutenberg/pull/42005))
 
-- Continued the work refactor away from lodash usages in order to reduce the build size.
-- Remove: Unrequired regex search on duotone supports. ([42020](https://github.com/WordPress/gutenberg/pull/42020))
-- Ensure only the main query is modified when resolving template for new posts. ([40799](https://github.com/WordPress/gutenberg/pull/40799))
-- Avoid calculating html block styles in useSelect. ([42026](https://github.com/WordPress/gutenberg/pull/42026))
-- Fix performance regressionon pasting due to removeWindowsFragments. ([41907](https://github.com/WordPress/gutenberg/pull/41907))
+#### Components
 
+-   Border Controls/Color Palette: Ensure popovers remain within small viewports. ([41930](https://github.com/WordPress/gutenberg/pull/41930))
+-   ColorPicker: Remove horizontal scrollbar when using HSL or RGB color input types. ([41646](https://github.com/WordPress/gutenberg/pull/41646))
+-   DatePicker: Respect site's 'Week Starts On' setting. ([41648](https://github.com/WordPress/gutenberg/pull/41648))
+-   BlockSettingsMenuControls: Fix 'showLockButton' check. ([41788](https://github.com/WordPress/gutenberg/pull/41788))
+-   Color Controls: Allow popovers to remain within smaller viewports. ([41929](https://github.com/WordPress/gutenberg/pull/41929))
 
-### Documentation
+#### REST API
 
-- Add an explanation how to setup environment to run the performance test. ([41883](https://github.com/WordPress/gutenberg/pull/41883))
-- Add local dev notes to aid when doing work on schemas. ([41968](https://github.com/WordPress/gutenberg/pull/41968))
-- Fix Minor documentation inconsistencies on block attributes. ([41468](https://github.com/WordPress/gutenberg/pull/41468))
-- Add an example for the end-to-end tests snapshot update. ([41999](https://github.com/WordPress/gutenberg/pull/41999))
-- Fix documentation of Flex component to no longer be experimental. ([41926](https://github.com/WordPress/gutenberg/pull/41926))
-- Fix link to "Good First Review" issues in README. ([41754](https://github.com/WordPress/gutenberg/pull/41754))
-- Fix link to Flex component in FlexItem Readme. ([41928](https://github.com/WordPress/gutenberg/pull/41928))
-- Fix some small inconsistencies in the block editor documentation. ([41861](https://github.com/WordPress/gutenberg/pull/41861))
-- Update terminology and documentation of Style engine. ([41964](https://github.com/WordPress/gutenberg/pull/41964))
-- Update skip serialization documentation to reflect ability to target specific properties. ([41277](https://github.com/WordPress/gutenberg/pull/41277))
-- Add supports to basic sample code documentation. ([41589](https://github.com/WordPress/gutenberg/pull/41589))
-- Update nested-blocks-inner-blocks.md. ([41962](https://github.com/WordPress/gutenberg/pull/41962))
-- Document `fontFace` and it’s values in `theme.json` schema for the Webfonts API. ([41844](https://github.com/WordPress/gutenberg/pull/41844))
+-   Fix retrieving autosaves when using a custom rest_namespace. ([41542](https://github.com/WordPress/gutenberg/pull/41542))
+-   Remove hardcoded references to rest namespace. ([41950](https://github.com/WordPress/gutenberg/pull/41950)), ([41951](https://github.com/WordPress/gutenberg/pull/41951)).
 
+### Performance
 
-### Code Quality
+-   Continued the work refactor away from lodash usages in order to reduce the build size.
+-   Remove: Unrequired regex search on duotone supports. ([42020](https://github.com/WordPress/gutenberg/pull/42020))
+-   Ensure only the main query is modified when resolving template for new posts. ([40799](https://github.com/WordPress/gutenberg/pull/40799))
+-   Avoid calculating html block styles in useSelect. ([42026](https://github.com/WordPress/gutenberg/pull/42026))
+-   Fix performance regressionon pasting due to removeWindowsFragments. ([41907](https://github.com/WordPress/gutenberg/pull/41907))
 
-- Fix: Double condition on or on block editor reducer. ([42019](https://github.com/WordPress/gutenberg/pull/42019))
-- Remove WP 6.0 WP_REST_Block_Patterns_Controller class. ([41914](https://github.com/WordPress/gutenberg/pull/41914))
-- Remove leftovers of legacy query-loop block. ([41891](https://github.com/WordPress/gutenberg/pull/41891))
-- Remove `startBlankComponent` from __experimentalBlockPatternSetup. ([41721](https://github.com/WordPress/gutenberg/pull/41721))
-- Move setting registration into WP 6.0 compat. ([41985](https://github.com/WordPress/gutenberg/pull/41985))
-- Add __experimentalUseResourcePermissions to make code simpler. ([38785](https://github.com/WordPress/gutenberg/pull/38785))
-))
-- Remove Unnecessary '&& check' as 'optional chaining (authorDetails?.avatar_urls) check' is already used in the Avatar Block. ([41779](https://github.com/WordPress/gutenberg/pull/41779))
-- Refactor `NavigationItem` component to pass `exhaustive-deps`. ([41639](https://github.com/WordPress/gutenberg/pull/41639))
-- Move generation of layout util classes to existing method to avoid adding global public method WP. ([41885](https://github.com/WordPress/gutenberg/pull/41885))
+### Documentation
 
+-   Add an explanation how to setup environment to run the performance test. ([41883](https://github.com/WordPress/gutenberg/pull/41883))
+-   Add local dev notes to aid when doing work on schemas. ([41968](https://github.com/WordPress/gutenberg/pull/41968))
+-   Fix Minor documentation inconsistencies on block attributes. ([41468](https://github.com/WordPress/gutenberg/pull/41468))
+-   Add an example for the end-to-end tests snapshot update. ([41999](https://github.com/WordPress/gutenberg/pull/41999))
+-   Fix documentation of Flex component to no longer be experimental. ([41926](https://github.com/WordPress/gutenberg/pull/41926))
+-   Fix link to "Good First Review" issues in README. ([41754](https://github.com/WordPress/gutenberg/pull/41754))
+-   Fix link to Flex component in FlexItem Readme. ([41928](https://github.com/WordPress/gutenberg/pull/41928))
+-   Fix some small inconsistencies in the block editor documentation. ([41861](https://github.com/WordPress/gutenberg/pull/41861))
+-   Update terminology and documentation of Style engine. ([41964](https://github.com/WordPress/gutenberg/pull/41964))
+-   Update skip serialization documentation to reflect ability to target specific properties. ([41277](https://github.com/WordPress/gutenberg/pull/41277))
+-   Add supports to basic sample code documentation. ([41589](https://github.com/WordPress/gutenberg/pull/41589))
+-   Update nested-blocks-inner-blocks.md. ([41962](https://github.com/WordPress/gutenberg/pull/41962))
+-   Document `fontFace` and it’s values in `theme.json` schema for the Webfonts API. ([41844](https://github.com/WordPress/gutenberg/pull/41844))
 
+### Code Quality
 
+-   Fix: Double condition on or on block editor reducer. ([42019](https://github.com/WordPress/gutenberg/pull/42019))
+-   Remove WP 6.0 WP_REST_Block_Patterns_Controller class. ([41914](https://github.com/WordPress/gutenberg/pull/41914))
+-   Remove leftovers of legacy query-loop block. ([41891](https://github.com/WordPress/gutenberg/pull/41891))
+-   Remove `startBlankComponent` from \_\_experimentalBlockPatternSetup. ([41721](https://github.com/WordPress/gutenberg/pull/41721))
+-   Move setting registration into WP 6.0 compat. ([41985](https://github.com/WordPress/gutenberg/pull/41985))
+-   Add \_\_experimentalUseResourcePermissions to make code simpler. ([38785](https://github.com/WordPress/gutenberg/pull/38785))
+    ))
+-   Remove Unnecessary '&& check' as 'optional chaining (authorDetails?.avatar_urls) check' is already used in the Avatar Block. ([41779](https://github.com/WordPress/gutenberg/pull/41779))
+-   Refactor `NavigationItem` component to pass `exhaustive-deps`. ([41639](https://github.com/WordPress/gutenberg/pull/41639))
+-   Move generation of layout util classes to existing method to avoid adding global public method WP. ([41885](https://github.com/WordPress/gutenberg/pull/41885))
 
 ### Tooling
 
 #### Static analysis
-- ESLint: Enable `ignoreRestSiblings` option for `no-unused-vars` rule. ([41897](https://github.com/WordPress/gutenberg/pull/41897))
-- Fix a prettier error. ([41916](https://github.com/WordPress/gutenberg/pull/41916))
-- SerializeBlock fix ESLint warning. ([41763](https://github.com/WordPress/gutenberg/pull/41763))
+
+-   ESLint: Enable `ignoreRestSiblings` option for `no-unused-vars` rule. ([41897](https://github.com/WordPress/gutenberg/pull/41897))
+-   Fix a prettier error. ([41916](https://github.com/WordPress/gutenberg/pull/41916))
+-   SerializeBlock fix ESLint warning. ([41763](https://github.com/WordPress/gutenberg/pull/41763))
 
 #### Testing
-- Test migrations toPlaywright:
-- spacer ([41590](https://github.com/WordPress/gutenberg/pull/41590))
-- table block ([41945](https://github.com/WordPress/gutenberg/pull/41945))
-- preview end-to-end tests ([41380](https://github.com/WordPress/gutenberg/pull/41380))
-- style variations ([41427](https://github.com/WordPress/gutenberg/pull/41427))
-- Button Block ([41494](https://github.com/WordPress/gutenberg/pull/41494))
-- RTL test cases  ([41495](https://github.com/WordPress/gutenberg/pull/41495))
-- `InputControl`: Add tests and update to use @testing-library/user-event. ([41421](https://github.com/WordPress/gutenberg/pull/41421))
-- Skip flaky navingation end-to-end test. ([41829](https://github.com/WordPress/gutenberg/pull/41829))
-- Fix the image rotating flaky test. ([41808](https://github.com/WordPress/gutenberg/pull/41808))
+
+-   Test migrations toPlaywright:
+-   spacer ([41590](https://github.com/WordPress/gutenberg/pull/41590))
+-   table block ([41945](https://github.com/WordPress/gutenberg/pull/41945))
+-   preview end-to-end tests ([41380](https://github.com/WordPress/gutenberg/pull/41380))
+-   style variations ([41427](https://github.com/WordPress/gutenberg/pull/41427))
+-   Button Block ([41494](https://github.com/WordPress/gutenberg/pull/41494))
+-   RTL test cases ([41495](https://github.com/WordPress/gutenberg/pull/41495))
+-   `InputControl`: Add tests and update to use @testing-library/user-event. ([41421](https://github.com/WordPress/gutenberg/pull/41421))
+-   Skip flaky navingation end-to-end test. ([41829](https://github.com/WordPress/gutenberg/pull/41829))
+-   Fix the image rotating flaky test. ([41808](https://github.com/WordPress/gutenberg/pull/41808))
 
 #### Storybook
-- Add 40px size variant to NumberControl. ([41997](https://github.com/WordPress/gutenberg/pull/41997))
-- Convert knobs to controls in NumberControl. ([41849](https://github.com/WordPress/gutenberg/pull/41849))
-- Convert knobs to controls in spacer. ([41851](https://github.com/WordPress/gutenberg/pull/41851))
+
+-   Add 40px size variant to NumberControl. ([41997](https://github.com/WordPress/gutenberg/pull/41997))
+-   Convert knobs to controls in NumberControl. ([41849](https://github.com/WordPress/gutenberg/pull/41849))
+-   Convert knobs to controls in spacer. ([41851](https://github.com/WordPress/gutenberg/pull/41851))
 
 #### IDE's integrations
-- Autocompletion support for useSelect (via jsDoc annotations). ([41596](https://github.com/WordPress/gutenberg/pull/41596))
+
+-   Autocompletion support for useSelect (via jsDoc annotations). ([41596](https://github.com/WordPress/gutenberg/pull/41596))
 
 #### Migrations to typescript
-- ColorIndicator ([41587](https://github.com/WordPress/gutenberg/pull/41587)),
-- FormToggle  ([41729](https://github.com/WordPress/gutenberg/pull/41729))
-- Spinner([41540](https://github.com/WordPress/gutenberg/pull/41540))
-- Truncate ([41697](https://github.com/WordPress/gutenberg/pull/41697))
-- VStack ([41850](https://github.com/WordPress/gutenberg/pull/41850))
-- BorderControl ([41843](https://github.com/WordPress/gutenberg/pull/41843))
-- Heading ([41921](https://github.com/WordPress/gutenberg/pull/41921))
 
+-   ColorIndicator ([41587](https://github.com/WordPress/gutenberg/pull/41587)),
+-   FormToggle ([41729](https://github.com/WordPress/gutenberg/pull/41729))
+-   Spinner([41540](https://github.com/WordPress/gutenberg/pull/41540))
+-   Truncate ([41697](https://github.com/WordPress/gutenberg/pull/41697))
+-   VStack ([41850](https://github.com/WordPress/gutenberg/pull/41850))
+-   BorderControl ([41843](https://github.com/WordPress/gutenberg/pull/41843))
+-   Heading ([41921](https://github.com/WordPress/gutenberg/pull/41921))
 
 ## First-time contributors
 
-The following PRs were merged by first time contributors:
-
-- @adambasa-dp: #30930 -  Make it easier to select "Edit visually" when in "Edit as HTML. ([41516](https://github.com/WordPress/gutenberg/pull/41516))
-- @arturgrabo: Change case. ([41792](https://github.com/WordPress/gutenberg/pull/41792))
-- @hz-tyfoon: Block Library (Avatar Block): Remove Unnecessary '&& check' as 'optional chaining (authorDetails?.avatar_urls) check' is already used. ([41779](https://github.com/WordPress/gutenberg/pull/41779))
-- @inc2734: Add supports to basic sample code. ([41589](https://github.com/WordPress/gutenberg/pull/41589))
-- @kbrown9: [RN Mobile] RichText: Return early when content has changed in onSelectionChangeFromAztec. ([41682](https://github.com/WordPress/gutenberg/pull/41682))
-- @mcliwanow: Fix link to "Good First Review" issues in README. ([41754](https://github.com/WordPress/gutenberg/pull/41754))
-- @navigatrum: Strip whitespaces in render_block_core_cover. ([40859](https://github.com/WordPress/gutenberg/pull/40859))
-- @pavanpatil1: Migrate rtl test case to it's playwright version. ([41495](https://github.com/WordPress/gutenberg/pull/41495))
-- @petitphp: #40675: Ensure only the main query is modified when resolving template for new posts. ([40799](https://github.com/WordPress/gutenberg/pull/40799))
-- @phcp: Add Pocket Casts embed block variation. ([41006](https://github.com/WordPress/gutenberg/pull/41006))
-- @vasartam: Block attributes docs: Minor documentation inconsistencies. ([41468](https://github.com/WordPress/gutenberg/pull/41468))
-- @xylocone: Update nested-blocks-inner-blocks.md. ([41962](https://github.com/WordPress/gutenberg/pull/41962))
-- @zaerl: Fix: Add 'application/zip' accept header. ([41602](https://github.com/WordPress/gutenberg/pull/41602))
+The following PRs were merged by first-time contributors:
 
+-   @adambasa-dp: #30930 - Make it easier to select "Edit visually" when in "Edit as HTML. ([41516](https://github.com/WordPress/gutenberg/pull/41516))
+-   @arturgrabo: Change case. ([41792](https://github.com/WordPress/gutenberg/pull/41792))
+-   @hz-tyfoon: Block Library (Avatar Block): Remove Unnecessary '&& check' as 'optional chaining (authorDetails?.avatar_urls) check' is already used. ([41779](https://github.com/WordPress/gutenberg/pull/41779))
+-   @inc2734: Add supports to basic sample code. ([41589](https://github.com/WordPress/gutenberg/pull/41589))
+-   @kbrown9: [RN Mobile] RichText: Return early when content has changed in onSelectionChangeFromAztec. ([41682](https://github.com/WordPress/gutenberg/pull/41682))
+-   @mcliwanow: Fix link to "Good First Review" issues in README. ([41754](https://github.com/WordPress/gutenberg/pull/41754))
+-   @navigatrum: Strip whitespaces in render_block_core_cover. ([40859](https://github.com/WordPress/gutenberg/pull/40859))
+-   @pavanpatil1: Migrate rtl test case to it's playwright version. ([41495](https://github.com/WordPress/gutenberg/pull/41495))
+-   @petitphp: #40675: Ensure only the main query is modified when resolving template for new posts. ([40799](https://github.com/WordPress/gutenberg/pull/40799))
+-   @phcp: Add Pocket Casts embed block variation. ([41006](https://github.com/WordPress/gutenberg/pull/41006))
+-   @vasartam: Block attributes docs: Minor documentation inconsistencies. ([41468](https://github.com/WordPress/gutenberg/pull/41468))
+-   @xylocone: Update nested-blocks-inner-blocks.md. ([41962](https://github.com/WordPress/gutenberg/pull/41962))
+-   @zaerl: Fix: Add 'application/zip' accept header. ([41602](https://github.com/WordPress/gutenberg/pull/41602))
 
 ## Contributors
 
@@ -14312,7 +25687,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adambasa-dp @adamziel @afercia @ajlende @alexstine @andrewserong @aristath @arturgrabo @chad1008 @ciampo @dcalhoun @derekblank @fabiankaegy @fluiddot @georgeh @getdave @glendaviesnz @grappler @hz-tyfoon @inc2734 @jorgefilipecosta @kbrown9 @kevin940726 @MaggieCabrera @Mamaduka @matiasbenedetto @mcliwanow @mcsf @mikachan @miminari @mirka @mtias @navigatrum @noisysocks @ntsekouras @ockham @opr @pavanpatil1 @petitphp @phcp @pooja-muchandikar @ramonjd @scruffian @SiobhyB @spacedmonkey @stokesman @sunil25393 @t-hamano @talldan @tellthemachines @tomjn @tyxla @vasartam @walbo @xylocone @zaerl
 
-
 = 13.5.2 =
 
 ## Changelog
@@ -14320,8 +25694,8 @@ The following contributors merged PRs in this release:
 ### Bug Fixes
 
 ### Components
-Revert: Refactor Autocomplete component to pass exhaustive-deps. (https://github.com/WordPress/gutenberg/pull/41820)
 
+Revert: Refactor Autocomplete component to pass exhaustive-deps. (https://github.com/WordPress/gutenberg/pull/41820)
 
 = 13.6.0-rc.1 =
 
@@ -14329,244 +25703,269 @@ Revert: Refactor Autocomplete component to pass exhaustive-deps. (https://github
 
 ### Enhancements
 
-- ESLint: Enable `ignoreRestSiblings` option for `no-unused-vars` rule. ([41897](https://github.com/WordPress/gutenberg/pull/41897))
-- Format Library: Add keyboard shortcut for Strikethrough. ([41910](https://github.com/WordPress/gutenberg/pull/41910))
-- Format Library: Add keyboard shortcut for inline code. ([41816](https://github.com/WordPress/gutenberg/pull/41816))
+-   ESLint: Enable `ignoreRestSiblings` option for `no-unused-vars` rule. ([41897](https://github.com/WordPress/gutenberg/pull/41897))
+-   Format Library: Add keyboard shortcut for Strikethrough. ([41910](https://github.com/WordPress/gutenberg/pull/41910))
+-   Format Library: Add keyboard shortcut for inline code. ([41816](https://github.com/WordPress/gutenberg/pull/41816))
 
 #### Components
-- ColorIndicator: Convert component to TypeScript. ([41587](https://github.com/WordPress/gutenberg/pull/41587))
-- FormToggle: Covert component to TypeScript. ([41729](https://github.com/WordPress/gutenberg/pull/41729))
-- Spinner: Convert component to TypeScript. ([41540](https://github.com/WordPress/gutenberg/pull/41540))
-- Truncate: Convert component to TypeScript. ([41697](https://github.com/WordPress/gutenberg/pull/41697))
-- VStack: Convert component to TypeScript. ([41850](https://github.com/WordPress/gutenberg/pull/41850))
+
+-   ColorIndicator: Convert component to TypeScript. ([41587](https://github.com/WordPress/gutenberg/pull/41587))
+-   FormToggle: Covert component to TypeScript. ([41729](https://github.com/WordPress/gutenberg/pull/41729))
+-   Spinner: Convert component to TypeScript. ([41540](https://github.com/WordPress/gutenberg/pull/41540))
+-   Truncate: Convert component to TypeScript. ([41697](https://github.com/WordPress/gutenberg/pull/41697))
+-   VStack: Convert component to TypeScript. ([41850](https://github.com/WordPress/gutenberg/pull/41850))
 
 #### Global Styles
-- Add support for caption elements. ([41140](https://github.com/WordPress/gutenberg/pull/41140))
-- Elements: Add UI for button elements. ([41659](https://github.com/WordPress/gutenberg/pull/41659))
-- Support pseudo selectors on `elements` in theme json. ([41786](https://github.com/WordPress/gutenberg/pull/41786))
+
+-   Add support for caption elements. ([41140](https://github.com/WordPress/gutenberg/pull/41140))
+-   Elements: Add UI for button elements. ([41659](https://github.com/WordPress/gutenberg/pull/41659))
+-   Support pseudo selectors on `elements` in theme json. ([41786](https://github.com/WordPress/gutenberg/pull/41786))
 
 #### Widgets Editor
-- Editors: Add a link completer shortcut to the help modals. ([41872](https://github.com/WordPress/gutenberg/pull/41872))
-- Improve action button spacing. ([41915](https://github.com/WordPress/gutenberg/pull/41915))
+
+-   Editors: Add a link completer shortcut to the help modals. ([41872](https://github.com/WordPress/gutenberg/pull/41872))
+-   Improve action button spacing. ([41915](https://github.com/WordPress/gutenberg/pull/41915))
 
 #### Block Library
-- Elements: Add an API make it easier to get class names. ([41753](https://github.com/WordPress/gutenberg/pull/41753))
-- Elements: Button - Fix element selectors. ([41822](https://github.com/WordPress/gutenberg/pull/41822))
+
+-   Elements: Add an API make it easier to get class names. ([41753](https://github.com/WordPress/gutenberg/pull/41753))
+-   Elements: Button - Fix element selectors. ([41822](https://github.com/WordPress/gutenberg/pull/41822))
 
 #### Design Tools
-- Adding axial top bottom margin to the cover block. ([41963](https://github.com/WordPress/gutenberg/pull/41963))
+
+-   Adding axial top bottom margin to the cover block. ([41963](https://github.com/WordPress/gutenberg/pull/41963))
 
 #### Template Editor
-- Turn Template settings panel into a Template popover. ([41925](https://github.com/WordPress/gutenberg/pull/41925))
+
+-   Turn Template settings panel into a Template popover. ([41925](https://github.com/WordPress/gutenberg/pull/41925))
 
 #### Accessibility
-- Make the site editor header toolbar use the ARIA toolbar pattern. ([41902](https://github.com/WordPress/gutenberg/pull/41902))
+
+-   Make the site editor header toolbar use the ARIA toolbar pattern. ([41902](https://github.com/WordPress/gutenberg/pull/41902))
 
 #### Document Settings
-- Abbreviate post schedule date when possible. ([41738](https://github.com/WordPress/gutenberg/pull/41738))
+
+-   Abbreviate post schedule date when possible. ([41738](https://github.com/WordPress/gutenberg/pull/41738))
 
 #### Site Editor
-- [Site Editor]: Expand the template types that can be added - single custom post type and specific posts templates. ([41189](https://github.com/WordPress/gutenberg/pull/41189))
 
+-   [Site Editor]: Expand the template types that can be added - single custom post type and specific posts templates. ([41189](https://github.com/WordPress/gutenberg/pull/41189))
 
 ### New APIs
 
-- Add __experimentalUseResourcePermissions. ([38785](https://github.com/WordPress/gutenberg/pull/38785))
-
+-   Add \_\_experimentalUseResourcePermissions. ([38785](https://github.com/WordPress/gutenberg/pull/38785))
 
 ### Bug Fixes
 
-- Block Editor: Fix incorrect '_n' usage. ([41886](https://github.com/WordPress/gutenberg/pull/41886))
-- BlockPreview: Fix 'Infinity' is invalid 'minHeight' value warning. ([41766](https://github.com/WordPress/gutenberg/pull/41766))
-- Change case. ([41792](https://github.com/WordPress/gutenberg/pull/41792))
-- Compare against default category in the settings instead of hardcoded slug. ([41956](https://github.com/WordPress/gutenberg/pull/41956))
-- Fix PHP 8.1 deprecation in the gallery block. ([41193](https://github.com/WordPress/gutenberg/pull/41193))
-- Fix: Add 'application/zip' accept header. ([41602](https://github.com/WordPress/gutenberg/pull/41602))
-- Skip flaky nav end-to-end test. ([41829](https://github.com/WordPress/gutenberg/pull/41829))
-- Try to fix the image rotating flaky test. ([41808](https://github.com/WordPress/gutenberg/pull/41808))
-- [Block Editor]: Fix content loss from `replaceInnerBlocks` with controlled blocks. ([41948](https://github.com/WordPress/gutenberg/pull/41948))
+-   Block Editor: Fix incorrect '\_n' usage. ([41886](https://github.com/WordPress/gutenberg/pull/41886))
+-   BlockPreview: Fix 'Infinity' is invalid 'minHeight' value warning. ([41766](https://github.com/WordPress/gutenberg/pull/41766))
+-   Change case. ([41792](https://github.com/WordPress/gutenberg/pull/41792))
+-   Compare against default category in the settings instead of hardcoded slug. ([41956](https://github.com/WordPress/gutenberg/pull/41956))
+-   Fix PHP 8.1 deprecation in the gallery block. ([41193](https://github.com/WordPress/gutenberg/pull/41193))
+-   Fix: Add 'application/zip' accept header. ([41602](https://github.com/WordPress/gutenberg/pull/41602))
+-   Skip flaky nav end-to-end test. ([41829](https://github.com/WordPress/gutenberg/pull/41829))
+-   Try to fix the image rotating flaky test. ([41808](https://github.com/WordPress/gutenberg/pull/41808))
+-   [Block Editor]: Fix content loss from `replaceInnerBlocks` with controlled blocks. ([41948](https://github.com/WordPress/gutenberg/pull/41948))
 
 #### Block Library
-- Comments Block: Fixed issue with custom font sizes and links color. ([41627](https://github.com/WordPress/gutenberg/pull/41627))
-- Fix permissions warning showing when inserting a navigation block. ([41862](https://github.com/WordPress/gutenberg/pull/41862))
-- Fixed issue of background min height. ([41693](https://github.com/WordPress/gutenberg/pull/41693))
-- List block v2: Transform don't take into account nested blocks. ([41741](https://github.com/WordPress/gutenberg/pull/41741))
-- Only use the post-title if the featured image is a link. ([41775](https://github.com/WordPress/gutenberg/pull/41775))
-- Post Template: Ensure layout classnames are not attached to inner li elements. ([41827](https://github.com/WordPress/gutenberg/pull/41827))
-- [List v2]: Set selection to created block after split with Enter. ([41899](https://github.com/WordPress/gutenberg/pull/41899))
-- fix: Image block preserves alt text from media library. ([41839](https://github.com/WordPress/gutenberg/pull/41839))
+
+-   Comments Block: Fixed issue with custom font sizes and links color. ([41627](https://github.com/WordPress/gutenberg/pull/41627))
+-   Fix permissions warning showing when inserting a navigation block. ([41862](https://github.com/WordPress/gutenberg/pull/41862))
+-   Fixed issue of background min height. ([41693](https://github.com/WordPress/gutenberg/pull/41693))
+-   List block v2: Transform don't take into account nested blocks. ([41741](https://github.com/WordPress/gutenberg/pull/41741))
+-   Only use the post-title if the featured image is a link. ([41775](https://github.com/WordPress/gutenberg/pull/41775))
+-   Post Template: Ensure layout classnames are not attached to inner li elements. ([41827](https://github.com/WordPress/gutenberg/pull/41827))
+-   [List v2]: Set selection to created block after split with Enter. ([41899](https://github.com/WordPress/gutenberg/pull/41899))
+-   fix: Image block preserves alt text from media library. ([41839](https://github.com/WordPress/gutenberg/pull/41839))
 
 #### Components
-- Border Controls/Color Palette: Ensure popovers remain within small viewports. ([41930](https://github.com/WordPress/gutenberg/pull/41930))
-- ColorPicker: Remove horizontal scrollbar when using HSL or RGB color input types. ([41646](https://github.com/WordPress/gutenberg/pull/41646))
-- Make date picker respect site's 'Week Starts On' setting. ([41648](https://github.com/WordPress/gutenberg/pull/41648))
-- Revert: Refactor `Autocomplete` component to pass `exhaustive-deps`. ([41820](https://github.com/WordPress/gutenberg/pull/41820))
+
+-   Border Controls/Color Palette: Ensure popovers remain within small viewports. ([41930](https://github.com/WordPress/gutenberg/pull/41930))
+-   ColorPicker: Remove horizontal scrollbar when using HSL or RGB color input types. ([41646](https://github.com/WordPress/gutenberg/pull/41646))
+-   Make date picker respect site's 'Week Starts On' setting. ([41648](https://github.com/WordPress/gutenberg/pull/41648))
+-   Revert: Refactor `Autocomplete` component to pass `exhaustive-deps`. ([41820](https://github.com/WordPress/gutenberg/pull/41820))
 
 #### REST API
-- Fix retrieving autosaves when using a custom rest_namespace. ([41542](https://github.com/WordPress/gutenberg/pull/41542))
-- Remove hardcoded reference to rest namespace in trash post. ([41950](https://github.com/WordPress/gutenberg/pull/41950))
-- Remove hardcoded reference to wp/v2 in findOrCreateTerm. ([41951](https://github.com/WordPress/gutenberg/pull/41951))
+
+-   Fix retrieving autosaves when using a custom rest_namespace. ([41542](https://github.com/WordPress/gutenberg/pull/41542))
+-   Remove hardcoded reference to rest namespace in trash post. ([41950](https://github.com/WordPress/gutenberg/pull/41950))
+-   Remove hardcoded reference to wp/v2 in findOrCreateTerm. ([41951](https://github.com/WordPress/gutenberg/pull/41951))
 
 #### Global Styles
-- Always load block CSS from __experimentalStyle. ([42005](https://github.com/WordPress/gutenberg/pull/42005))
+
+-   Always load block CSS from \_\_experimentalStyle. ([42005](https://github.com/WordPress/gutenberg/pull/42005))
 
 #### Design Tools
-- Color Controls: Allow popovers to remain within smaller viewports. ([41929](https://github.com/WordPress/gutenberg/pull/41929))
+
+-   Color Controls: Allow popovers to remain within smaller viewports. ([41929](https://github.com/WordPress/gutenberg/pull/41929))
 
 #### Block Locking
-- BlockSettingsMenuControls: Fix 'showLockButton' check. ([41788](https://github.com/WordPress/gutenberg/pull/41788))
+
+-   BlockSettingsMenuControls: Fix 'showLockButton' check. ([41788](https://github.com/WordPress/gutenberg/pull/41788))
 
 #### Accessibility
-- Navigation submenus: Allow Escape key to close the submenu and focus trigger. ([41774](https://github.com/WordPress/gutenberg/pull/41774))
+
+-   Navigation submenus: Allow Escape key to close the submenu and focus trigger. ([41774](https://github.com/WordPress/gutenberg/pull/41774))
 
 #### Patterns
-- Rendering duotone presets in pattern preview. ([41249](https://github.com/WordPress/gutenberg/pull/41249))
 
+-   Rendering duotone presets in pattern preview. ([41249](https://github.com/WordPress/gutenberg/pull/41249))
 
 ### Performance
 
-- Continued the work refactor away from lodash usages in order to reduce the build size.
-- Remove: Unrequired regex search on duotone supports. ([42020](https://github.com/WordPress/gutenberg/pull/42020))
+-   Continued the work refactor away from lodash usages in order to reduce the build size.
+-   Remove: Unrequired regex search on duotone supports. ([42020](https://github.com/WordPress/gutenberg/pull/42020))
 
 #### Block Library
-- Avoid calculating html block styles in useSelect. ([42026](https://github.com/WordPress/gutenberg/pull/42026))
 
+-   Avoid calculating html block styles in useSelect. ([42026](https://github.com/WordPress/gutenberg/pull/42026))
 
 #### Block Editor
-- Pasting: Fix performance regression due to removeWindowsFragments. ([41907](https://github.com/WordPress/gutenberg/pull/41907))
-
 
+-   Pasting: Fix performance regression due to removeWindowsFragments. ([41907](https://github.com/WordPress/gutenberg/pull/41907))
 
 ### Experiments
 
 #### CSS & Styling
-- Style engine: Add border to frontend. ([41803](https://github.com/WordPress/gutenberg/pull/41803))
 
+-   Style engine: Add border to frontend. ([41803](https://github.com/WordPress/gutenberg/pull/41803))
 
 ### Documentation
 
-- Add an explanation how to setup environment to do run the performance test. ([41883](https://github.com/WordPress/gutenberg/pull/41883))
-- Add local dev notes to aid when doing work on schemas. ([41968](https://github.com/WordPress/gutenberg/pull/41968))
-- Block attributes docs: Minor documentation inconsistencies. ([41468](https://github.com/WordPress/gutenberg/pull/41468))
-- Docs: Add an example for the end-to-end tests snapshot update. ([41999](https://github.com/WordPress/gutenberg/pull/41999))
-- Fix documentation of Flex component to no longer be experimental. ([41926](https://github.com/WordPress/gutenberg/pull/41926))
-- Fix link to "Good First Review" issues in README. ([41754](https://github.com/WordPress/gutenberg/pull/41754))
-- Fix link to Flex component in FlexItem Readme. ([41928](https://github.com/WordPress/gutenberg/pull/41928))
-- Fix some small inconsistencies in the block editor documentation. ([41861](https://github.com/WordPress/gutenberg/pull/41861))
-- Style engine: Update terminology and documentation. ([41964](https://github.com/WordPress/gutenberg/pull/41964))
-- Update skip serialization documentation to reflect ability to target specific properties. ([41277](https://github.com/WordPress/gutenberg/pull/41277))
-
+-   Add an explanation how to setup environment to do run the performance test. ([41883](https://github.com/WordPress/gutenberg/pull/41883))
+-   Add local dev notes to aid when doing work on schemas. ([41968](https://github.com/WordPress/gutenberg/pull/41968))
+-   Block attributes docs: Minor documentation inconsistencies. ([41468](https://github.com/WordPress/gutenberg/pull/41468))
+-   Docs: Add an example for the end-to-end tests snapshot update. ([41999](https://github.com/WordPress/gutenberg/pull/41999))
+-   Fix documentation of Flex component to no longer be experimental. ([41926](https://github.com/WordPress/gutenberg/pull/41926))
+-   Fix link to "Good First Review" issues in README. ([41754](https://github.com/WordPress/gutenberg/pull/41754))
+-   Fix link to Flex component in FlexItem Readme. ([41928](https://github.com/WordPress/gutenberg/pull/41928))
+-   Fix some small inconsistencies in the block editor documentation. ([41861](https://github.com/WordPress/gutenberg/pull/41861))
+-   Style engine: Update terminology and documentation. ([41964](https://github.com/WordPress/gutenberg/pull/41964))
+-   Update skip serialization documentation to reflect ability to target specific properties. ([41277](https://github.com/WordPress/gutenberg/pull/41277))
 
 ### Code Quality
 
-- Fix: Double condition on or on block editor reducer. ([42019](https://github.com/WordPress/gutenberg/pull/42019))
-- Remove WP 6.0 WP_REST_Block_Patterns_Controller class. ([41914](https://github.com/WordPress/gutenberg/pull/41914))
-- Remove leftovers of legacy query-loop block. ([41891](https://github.com/WordPress/gutenberg/pull/41891))
-- [Block editor]: Remove `startBlankComponent` from __experimentalBlockPatternSetup. ([41721](https://github.com/WordPress/gutenberg/pull/41721))
+-   Fix: Double condition on or on block editor reducer. ([42019](https://github.com/WordPress/gutenberg/pull/42019))
+-   Remove WP 6.0 WP_REST_Block_Patterns_Controller class. ([41914](https://github.com/WordPress/gutenberg/pull/41914))
+-   Remove leftovers of legacy query-loop block. ([41891](https://github.com/WordPress/gutenberg/pull/41891))
+-   [Block editor]: Remove `startBlankComponent` from \_\_experimentalBlockPatternSetup. ([41721](https://github.com/WordPress/gutenberg/pull/41721))
 
 #### Components
-- Heading: Complete TypeScript migration of component. ([41921](https://github.com/WordPress/gutenberg/pull/41921))
-- Refactor `NavigationItem` to pass `exhaustive-deps`. ([41639](https://github.com/WordPress/gutenberg/pull/41639))
+
+-   Heading: Complete TypeScript migration of component. ([41921](https://github.com/WordPress/gutenberg/pull/41921))
+-   Refactor `NavigationItem` to pass `exhaustive-deps`. ([41639](https://github.com/WordPress/gutenberg/pull/41639))
 
 #### Plugin
-- Move setting registration into WP 6.0 compat. ([41985](https://github.com/WordPress/gutenberg/pull/41985))
+
+-   Move setting registration into WP 6.0 compat. ([41985](https://github.com/WordPress/gutenberg/pull/41985))
 
 #### CSS & Styling
-- Layout: Move generation of util classes to existing method to avoid adding global public method WP. ([41885](https://github.com/WordPress/gutenberg/pull/41885))
+
+-   Layout: Move generation of util classes to existing method to avoid adding global public method WP. ([41885](https://github.com/WordPress/gutenberg/pull/41885))
 
 #### Block Library
-- Block Library (Avatar Block): Remove Unnecessary '&& check' as 'optional chaining (authorDetails?.avatar_urls) check' is already used. ([41779](https://github.com/WordPress/gutenberg/pull/41779))
 
+-   Block Library (Avatar Block): Remove Unnecessary '&& check' as 'optional chaining (authorDetails?.avatar_urls) check' is already used. ([41779](https://github.com/WordPress/gutenberg/pull/41779))
 
 ### Tools
 
 #### Testing
-- Migrate spacer test to playwright. ([41590](https://github.com/WordPress/gutenberg/pull/41590))
-- Migrate table block tests to Playwright. ([41945](https://github.com/WordPress/gutenberg/pull/41945))
-- Refactor preview end-to-end tests to use Playwright. ([41380](https://github.com/WordPress/gutenberg/pull/41380))
-- `InputControl`: Add tests and update to use @testing-library/user-event. ([41421](https://github.com/WordPress/gutenberg/pull/41421))
-- end-to-end Tests: Migrate style variations tests to Playwright. ([41427](https://github.com/WordPress/gutenberg/pull/41427))
+
+-   Migrate spacer test to playwright. ([41590](https://github.com/WordPress/gutenberg/pull/41590))
+-   Migrate table block tests to Playwright. ([41945](https://github.com/WordPress/gutenberg/pull/41945))
+-   Refactor preview end-to-end tests to use Playwright. ([41380](https://github.com/WordPress/gutenberg/pull/41380))
+-   `InputControl`: Add tests and update to use @testing-library/user-event. ([41421](https://github.com/WordPress/gutenberg/pull/41421))
+-   end-to-end Tests: Migrate style variations tests to Playwright. ([41427](https://github.com/WordPress/gutenberg/pull/41427))
 
 ### Various
 
-- Add schema support for styles.filter.duotone. ([41920](https://github.com/WordPress/gutenberg/pull/41920))
-- Add supports to basic sample code. ([41589](https://github.com/WordPress/gutenberg/pull/41589))
-- Improvements to "inherit default layout" toggle. ([41893](https://github.com/WordPress/gutenberg/pull/41893))
-- Increase fade intensity during spotlight mode. ([40454](https://github.com/WordPress/gutenberg/pull/40454))
-- List block v2: Fix impossible to outdent multiple list items. ([41713](https://github.com/WordPress/gutenberg/pull/41713))
-- Migrate Button Block tests to Playwright. ([41494](https://github.com/WordPress/gutenberg/pull/41494))
-- Migrate rtl test case to it's playwright version. ([41495](https://github.com/WordPress/gutenberg/pull/41495))
-- Search block: Remove double spaces. ([41746](https://github.com/WordPress/gutenberg/pull/41746))
-- SerializeBlock fix ESLint warning. ([41763](https://github.com/WordPress/gutenberg/pull/41763))
-- Update Theme JSON `$schema` to account for pseudo selector support. ([41936](https://github.com/WordPress/gutenberg/pull/41936))
-- Update nested-blocks-inner-blocks.md. ([41962](https://github.com/WordPress/gutenberg/pull/41962))
-- Webfonts API: Document `fontFace` and it’s values in `theme.json` schema. ([41844](https://github.com/WordPress/gutenberg/pull/41844))
-- [RN Mobile] RichText: Return early when content has changed in onSelectionChangeFromAztec. ([41682](https://github.com/WordPress/gutenberg/pull/41682))
-
-#### Block Library
-- #30930 -  Make it easier to select "Edit visually" when in "Edit as HTML. ([41516](https://github.com/WordPress/gutenberg/pull/41516))
-- Columns block: Change title of one third/two thirds column variation to 66/33. ([41734](https://github.com/WordPress/gutenberg/pull/41734))
-- Fix Prettier error. ([41916](https://github.com/WordPress/gutenberg/pull/41916))
-- Navigation: Adjust mobile close button position when admin bar is visible. ([41664](https://github.com/WordPress/gutenberg/pull/41664))
-- Navigation: Make additional top margin specific to open modal. ([41949](https://github.com/WordPress/gutenberg/pull/41949))
-- Navigation: Move block CSS to JSON. ([41898](https://github.com/WordPress/gutenberg/pull/41898))
-- Post Comments Form: Add button that enables commenting to warning. ([41603](https://github.com/WordPress/gutenberg/pull/41603))
-- Strip whitespaces in render_block_core_cover. ([40859](https://github.com/WordPress/gutenberg/pull/40859))
-
-#### Components
-- BorderControl: Complete TypeScript migration. ([41843](https://github.com/WordPress/gutenberg/pull/41843))
-- NumberControl: Add 40px size variant to Storybook. ([41997](https://github.com/WordPress/gutenberg/pull/41997))
-- NumberControl: Convert knobs to controls in Storybook. ([41849](https://github.com/WordPress/gutenberg/pull/41849))
-- Set Default state to media library for library button in image block. ([41678](https://github.com/WordPress/gutenberg/pull/41678))
-- Spacer: Convert knobs to controls in Storybook. ([41851](https://github.com/WordPress/gutenberg/pull/41851))
-
-#### Global Styles
-- Allow references to values in other locations in the tree. ([41696](https://github.com/WordPress/gutenberg/pull/41696))
-- Elements: Lower specificity of elements block css. ([41931](https://github.com/WordPress/gutenberg/pull/41931))
+-   Add schema support for styles.filter.duotone. ([41920](https://github.com/WordPress/gutenberg/pull/41920))
+-   Add supports to basic sample code. ([41589](https://github.com/WordPress/gutenberg/pull/41589))
+-   Improvements to "inherit default layout" toggle. ([41893](https://github.com/WordPress/gutenberg/pull/41893))
+-   Increase fade intensity during spotlight mode. ([40454](https://github.com/WordPress/gutenberg/pull/40454))
+-   List block v2: Fix impossible to outdent multiple list items. ([41713](https://github.com/WordPress/gutenberg/pull/41713))
+-   Migrate Button Block tests to Playwright. ([41494](https://github.com/WordPress/gutenberg/pull/41494))
+-   Migrate rtl test case to it's playwright version. ([41495](https://github.com/WordPress/gutenberg/pull/41495))
+-   Search block: Remove double spaces. ([41746](https://github.com/WordPress/gutenberg/pull/41746))
+-   SerializeBlock fix ESLint warning. ([41763](https://github.com/WordPress/gutenberg/pull/41763))
+-   Update Theme JSON `$schema` to account for pseudo selector support. ([41936](https://github.com/WordPress/gutenberg/pull/41936))
+-   Update nested-blocks-inner-blocks.md. ([41962](https://github.com/WordPress/gutenberg/pull/41962))
+-   Webfonts API: Document `fontFace` and it’s values in `theme.json` schema. ([41844](https://github.com/WordPress/gutenberg/pull/41844))
+-   [RN Mobile] RichText: Return early when content has changed in onSelectionChangeFromAztec. ([41682](https://github.com/WordPress/gutenberg/pull/41682))
+
+#### Block Library
+
+-   #30930 - Make it easier to select "Edit visually" when in "Edit as HTML. ([41516](https://github.com/WordPress/gutenberg/pull/41516))
+-   Columns block: Change title of one third/two thirds column variation to 66/33. ([41734](https://github.com/WordPress/gutenberg/pull/41734))
+-   Fix Prettier error. ([41916](https://github.com/WordPress/gutenberg/pull/41916))
+-   Navigation: Adjust mobile close button position when admin bar is visible. ([41664](https://github.com/WordPress/gutenberg/pull/41664))
+-   Navigation: Make additional top margin specific to open modal. ([41949](https://github.com/WordPress/gutenberg/pull/41949))
+-   Navigation: Move block CSS to JSON. ([41898](https://github.com/WordPress/gutenberg/pull/41898))
+-   Post Comments Form: Add button that enables commenting to warning. ([41603](https://github.com/WordPress/gutenberg/pull/41603))
+-   Strip whitespaces in render_block_core_cover. ([40859](https://github.com/WordPress/gutenberg/pull/40859))
+
+#### Components
+
+-   BorderControl: Complete TypeScript migration. ([41843](https://github.com/WordPress/gutenberg/pull/41843))
+-   NumberControl: Add 40px size variant to Storybook. ([41997](https://github.com/WordPress/gutenberg/pull/41997))
+-   NumberControl: Convert knobs to controls in Storybook. ([41849](https://github.com/WordPress/gutenberg/pull/41849))
+-   Set Default state to media library for library button in image block. ([41678](https://github.com/WordPress/gutenberg/pull/41678))
+-   Spacer: Convert knobs to controls in Storybook. ([41851](https://github.com/WordPress/gutenberg/pull/41851))
+
+#### Global Styles
+
+-   Allow references to values in other locations in the tree. ([41696](https://github.com/WordPress/gutenberg/pull/41696))
+-   Elements: Lower specificity of elements block css. ([41931](https://github.com/WordPress/gutenberg/pull/41931))
 
 #### CSS & Styling
-- Classic Block: Remove CSS properties with vendor prefixes. ([41995](https://github.com/WordPress/gutenberg/pull/41995))
+
+-   Classic Block: Remove CSS properties with vendor prefixes. ([41995](https://github.com/WordPress/gutenberg/pull/41995))
 
 #### Patterns
-- Add: Ability to use creation patterns for other post types besides page. ([41791](https://github.com/WordPress/gutenberg/pull/41791))
+
+-   Add: Ability to use creation patterns for other post types besides page. ([41791](https://github.com/WordPress/gutenberg/pull/41791))
 
 #### Accessibility
-- Allow defining an aria-label in group blocks. ([41744](https://github.com/WordPress/gutenberg/pull/41744))
+
+-   Allow defining an aria-label in group blocks. ([41744](https://github.com/WordPress/gutenberg/pull/41744))
 
 #### Full Site Editing
-- [Full Site Editing]: Add clear customizations to template card. ([41743](https://github.com/WordPress/gutenberg/pull/41743))
+
+-   [Full Site Editing]: Add clear customizations to template card. ([41743](https://github.com/WordPress/gutenberg/pull/41743))
 
 #### Data Layer
-- Autocompletion support for useSelect (via jsDoc annotations). ([41596](https://github.com/WordPress/gutenberg/pull/41596))
+
+-   Autocompletion support for useSelect (via jsDoc annotations). ([41596](https://github.com/WordPress/gutenberg/pull/41596))
 
 #### Block Variations
-- Add Pocket Casts embed block variation. ([41006](https://github.com/WordPress/gutenberg/pull/41006))
+
+-   Add Pocket Casts embed block variation. ([41006](https://github.com/WordPress/gutenberg/pull/41006))
 
 #### Templates API
-- #40675: Ensure only the main query is modified when resolving template for new posts. ([40799](https://github.com/WordPress/gutenberg/pull/40799))
+
+-   #40675: Ensure only the main query is modified when resolving template for new posts. ([40799](https://github.com/WordPress/gutenberg/pull/40799))
 
 #### Themes
-- Add the ability to unset duotone in themes with default duotone set. ([39564](https://github.com/WordPress/gutenberg/pull/39564))
 
+-   Add the ability to unset duotone in themes with default duotone set. ([39564](https://github.com/WordPress/gutenberg/pull/39564))
 
 ## First-time contributors
 
-The following PRs were merged by first time contributors:
-
-- @adambasa-dp: #30930 -  Make it easier to select "Edit visually" when in "Edit as HTML. ([41516](https://github.com/WordPress/gutenberg/pull/41516))
-- @arturgrabo: Change case. ([41792](https://github.com/WordPress/gutenberg/pull/41792))
-- @hz-tyfoon: Block Library (Avatar Block): Remove Unnecessary '&& check' as 'optional chaining (authorDetails?.avatar_urls) check' is already used. ([41779](https://github.com/WordPress/gutenberg/pull/41779))
-- @inc2734: Add supports to basic sample code. ([41589](https://github.com/WordPress/gutenberg/pull/41589))
-- @kbrown9: [RN Mobile] RichText: Return early when content has changed in onSelectionChangeFromAztec. ([41682](https://github.com/WordPress/gutenberg/pull/41682))
-- @mcliwanow: Fix link to "Good First Review" issues in README. ([41754](https://github.com/WordPress/gutenberg/pull/41754))
-- @navigatrum: Strip whitespaces in render_block_core_cover. ([40859](https://github.com/WordPress/gutenberg/pull/40859))
-- @pavanpatil1: Migrate rtl test case to it's playwright version. ([41495](https://github.com/WordPress/gutenberg/pull/41495))
-- @petitphp: #40675: Ensure only the main query is modified when resolving template for new posts. ([40799](https://github.com/WordPress/gutenberg/pull/40799))
-- @phcp: Add Pocket Casts embed block variation. ([41006](https://github.com/WordPress/gutenberg/pull/41006))
-- @vasartam: Block attributes docs: Minor documentation inconsistencies. ([41468](https://github.com/WordPress/gutenberg/pull/41468))
-- @xylocone: Update nested-blocks-inner-blocks.md. ([41962](https://github.com/WordPress/gutenberg/pull/41962))
-- @zaerl: Fix: Add 'application/zip' accept header. ([41602](https://github.com/WordPress/gutenberg/pull/41602))
+The following PRs were merged by first-time contributors:
 
+-   @adambasa-dp: #30930 - Make it easier to select "Edit visually" when in "Edit as HTML. ([41516](https://github.com/WordPress/gutenberg/pull/41516))
+-   @arturgrabo: Change case. ([41792](https://github.com/WordPress/gutenberg/pull/41792))
+-   @hz-tyfoon: Block Library (Avatar Block): Remove Unnecessary '&& check' as 'optional chaining (authorDetails?.avatar_urls) check' is already used. ([41779](https://github.com/WordPress/gutenberg/pull/41779))
+-   @inc2734: Add supports to basic sample code. ([41589](https://github.com/WordPress/gutenberg/pull/41589))
+-   @kbrown9: [RN Mobile] RichText: Return early when content has changed in onSelectionChangeFromAztec. ([41682](https://github.com/WordPress/gutenberg/pull/41682))
+-   @mcliwanow: Fix link to "Good First Review" issues in README. ([41754](https://github.com/WordPress/gutenberg/pull/41754))
+-   @navigatrum: Strip whitespaces in render_block_core_cover. ([40859](https://github.com/WordPress/gutenberg/pull/40859))
+-   @pavanpatil1: Migrate rtl test case to it's playwright version. ([41495](https://github.com/WordPress/gutenberg/pull/41495))
+-   @petitphp: #40675: Ensure only the main query is modified when resolving template for new posts. ([40799](https://github.com/WordPress/gutenberg/pull/40799))
+-   @phcp: Add Pocket Casts embed block variation. ([41006](https://github.com/WordPress/gutenberg/pull/41006))
+-   @vasartam: Block attributes docs: Minor documentation inconsistencies. ([41468](https://github.com/WordPress/gutenberg/pull/41468))
+-   @xylocone: Update nested-blocks-inner-blocks.md. ([41962](https://github.com/WordPress/gutenberg/pull/41962))
+-   @zaerl: Fix: Add 'application/zip' accept header. ([41602](https://github.com/WordPress/gutenberg/pull/41602))
 
 ## Contributors
 
@@ -14574,18 +25973,15 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adambasa-dp @adamziel @afercia @ajlende @alexstine @andrewserong @aristath @arturgrabo @chad1008 @ciampo @dcalhoun @derekblank @fabiankaegy @fluiddot @georgeh @getdave @glendaviesnz @grappler @hz-tyfoon @inc2734 @jorgefilipecosta @kbrown9 @kevin940726 @MaggieCabrera @Mamaduka @matiasbenedetto @mcliwanow @mcsf @mikachan @miminari @mirka @mtias @navigatrum @noisysocks @ntsekouras @ockham @opr @pavanpatil1 @petitphp @phcp @pooja-muchandikar @ramonjd @scruffian @SiobhyB @spacedmonkey @stokesman @sunil25393 @t-hamano @talldan @tellthemachines @tomjn @tyxla @vasartam @walbo @xylocone @zaerl
 
-
 = 13.5.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 ### Block Themes
 
-- Global Styles: Add block CSS rules after the Global Styles rules. ([41934](https://github.com/WordPress/gutenberg/pull/41934))
+-   Global Styles: Add block CSS rules after the Global Styles rules. ([41934](https://github.com/WordPress/gutenberg/pull/41934))
 
 ## Contributors
 
@@ -14593,7 +25989,6 @@ The following contributors merged PRs in this release:
 
 @scruffian
 
-
 = 13.5.0 =
 
 ## Changelog
@@ -14601,149 +25996,169 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Components
-- Use NumberControl as input field. ([41472](https://github.com/WordPress/gutenberg/pull/41472))
-- Convert component to TypeScript. ([41681](https://github.com/WordPress/gutenberg/pull/41681))
-- RadioControl: Convert component to TypeScript. ([41568](https://github.com/WordPress/gutenberg/pull/41568))
+
+-   Use NumberControl as input field. ([41472](https://github.com/WordPress/gutenberg/pull/41472))
+-   Convert component to TypeScript. ([41681](https://github.com/WordPress/gutenberg/pull/41681))
+-   RadioControl: Convert component to TypeScript. ([41568](https://github.com/WordPress/gutenberg/pull/41568))
 
 #### Media
-- Adds featured image toggle to media replace flow. ([41476](https://github.com/WordPress/gutenberg/pull/41476))
-- Add tooltip on replace image's URL. ([41504](https://github.com/WordPress/gutenberg/pull/41504))
+
+-   Adds featured image toggle to media replace flow. ([41476](https://github.com/WordPress/gutenberg/pull/41476))
+-   Add tooltip on replace image's URL. ([41504](https://github.com/WordPress/gutenberg/pull/41504))
 
 #### Block Library
-- Cover: Adds placeholder when feature image is in use. ([41460](https://github.com/WordPress/gutenberg/pull/41460))
-- Post Navigation Link: Add design controls (color, text decoration, and font family). ([41378](https://github.com/WordPress/gutenberg/pull/41378))
+
+-   Cover: Adds placeholder when feature image is in use. ([41460](https://github.com/WordPress/gutenberg/pull/41460))
+-   Post Navigation Link: Add design controls (color, text decoration, and font family). ([41378](https://github.com/WordPress/gutenberg/pull/41378))
 
 #### Block Editor
-- Copy plain text variant of blocks. ([41366](https://github.com/WordPress/gutenberg/pull/41366))
-- Adds CTA and external link to block inserter flow. ([41112](https://github.com/WordPress/gutenberg/pull/41112))
+
+-   Copy plain text variant of blocks. ([41366](https://github.com/WordPress/gutenberg/pull/41366))
+-   Adds CTA and external link to block inserter flow. ([41112](https://github.com/WordPress/gutenberg/pull/41112))
 
 #### Global Styles
-- Move CSS from the stylesheet to the block definition. ([41689](https://github.com/WordPress/gutenberg/pull/41689))
+
+-   Move CSS from the stylesheet to the block definition. ([41689](https://github.com/WordPress/gutenberg/pull/41689))
 
 #### Document Settings
-- Highlight today's date in DatePicker. ([41647](https://github.com/WordPress/gutenberg/pull/41647))
+
+-   Highlight today's date in DatePicker. ([41647](https://github.com/WordPress/gutenberg/pull/41647))
 
 #### Design Tools
-- Cover: Move overlay and opacity controls to color panel. ([41102](https://github.com/WordPress/gutenberg/pull/41102))
+
+-   Cover: Move overlay and opacity controls to color panel. ([41102](https://github.com/WordPress/gutenberg/pull/41102))
 
 ### Bug Fixes
 
 #### Block Editor
-- Preferences Panel: Filters hidden blocks to only count those which are still registered. ([41454](https://github.com/WordPress/gutenberg/pull/41454))
+
+-   Preferences Panel: Filters hidden blocks to only count those which are still registered. ([41454](https://github.com/WordPress/gutenberg/pull/41454))
 
 #### Components
-- Avoid including null values in blocks list. ([41496](https://github.com/WordPress/gutenberg/pull/41496))
-- CustomGradientBar: Fix insertion and control point positioning to more closely follow cursor. ([41492](https://github.com/WordPress/gutenberg/pull/41492))
-- Fix `ComboboxControl` post-reset focus. ([41737](https://github.com/WordPress/gutenberg/pull/41737))
-- FormTokenField: Added Padding to resolve close button overlap issue. ([41556](https://github.com/WordPress/gutenberg/pull/41556))
-- Tooltip: Fix jitter at edge of screen by enabling __unstableShift. ([41524](https://github.com/WordPress/gutenberg/pull/41524))
+
+-   Avoid including null values in blocks list. ([41496](https://github.com/WordPress/gutenberg/pull/41496))
+-   CustomGradientBar: Fix insertion and control point positioning to more closely follow cursor. ([41492](https://github.com/WordPress/gutenberg/pull/41492))
+-   Fix `ComboboxControl` post-reset focus. ([41737](https://github.com/WordPress/gutenberg/pull/41737))
+-   FormTokenField: Added Padding to resolve close button overlap issue. ([41556](https://github.com/WordPress/gutenberg/pull/41556))
+-   Tooltip: Fix jitter at edge of screen by enabling \_\_unstableShift. ([41524](https://github.com/WordPress/gutenberg/pull/41524))
 
 #### Block Library
-- Fix JS Error in Avatar Block. ([41354](https://github.com/WordPress/gutenberg/pull/41354))
-- Query Loop: Render `replace` button only if eligible patterns exist. ([41690](https://github.com/WordPress/gutenberg/pull/41690))
-- Comments Title: Plural has been used instead of single in 1st parameter. ([41521](https://github.com/WordPress/gutenberg/pull/41521))
+
+-   Fix JS Error in Avatar Block. ([41354](https://github.com/WordPress/gutenberg/pull/41354))
+-   Query Loop: Render `replace` button only if eligible patterns exist. ([41690](https://github.com/WordPress/gutenberg/pull/41690))
+-   Comments Title: Plural has been used instead of single in 1st parameter. ([41521](https://github.com/WordPress/gutenberg/pull/41521))
 
 #### Design Tools
-- Fix CSS Selectors rendered by theme.json duotone/filter settings for blocks on public pages. ([41335](https://github.com/WordPress/gutenberg/pull/41335))
-- Webfonts: Increase priority of init hook to account for block reregistration. ([41569](https://github.com/WordPress/gutenberg/pull/41569))
+
+-   Fix CSS Selectors rendered by theme.json duotone/filter settings for blocks on public pages. ([41335](https://github.com/WordPress/gutenberg/pull/41335))
+-   Webfonts: Increase priority of init hook to account for block reregistration. ([41569](https://github.com/WordPress/gutenberg/pull/41569))
 
 #### Template Editor
-- Include theme's templates in template list in post editor. ([41630](https://github.com/WordPress/gutenberg/pull/41630))
+
+-   Include theme's templates in template list in post editor. ([41630](https://github.com/WordPress/gutenberg/pull/41630))
 
 #### Site Editor
-- Theme variations UI: Ensure that equality check takes into account all default theme properties. ([41591](https://github.com/WordPress/gutenberg/pull/41591))
+
+-   Theme variations UI: Ensure that equality check takes into account all default theme properties. ([41591](https://github.com/WordPress/gutenberg/pull/41591))
 
 #### CSS & Styling
-- Add utility classnames back to blocks that have layout attributes specified. ([41487](https://github.com/WordPress/gutenberg/pull/41487))
-- Allow for zero values for CSS properties in the style engine. ([41561](https://github.com/WordPress/gutenberg/pull/41561))
+
+-   Add utility classnames back to blocks that have layout attributes specified. ([41487](https://github.com/WordPress/gutenberg/pull/41487))
+-   Allow for zero values for CSS properties in the style engine. ([41561](https://github.com/WordPress/gutenberg/pull/41561))
 
 ### Accessibility
 
-- Fix lack of context on action buttons and improve A11Y for the template action buttons Edit/New. ([41615](https://github.com/WordPress/gutenberg/pull/41615))
-- Fix focus trap on certain input types. ([41538](https://github.com/WordPress/gutenberg/pull/41538))
-- Add label to Preview options dropdown menu. ([41566](https://github.com/WordPress/gutenberg/pull/41566))
+-   Fix lack of context on action buttons and improve A11Y for the template action buttons Edit/New. ([41615](https://github.com/WordPress/gutenberg/pull/41615))
+-   Fix focus trap on certain input types. ([41538](https://github.com/WordPress/gutenberg/pull/41538))
+-   Add label to Preview options dropdown menu. ([41566](https://github.com/WordPress/gutenberg/pull/41566))
 
 ### Experiments
 
-- Style engine: Add border to backend. ([40531](https://github.com/WordPress/gutenberg/pull/40531))
-- Style engine: Elements backend support. ([40987](https://github.com/WordPress/gutenberg/pull/40987))
-- Global styles: Merge block CSS with `theme.json` styles. ([34180](https://github.com/WordPress/gutenberg/pull/34180))
+-   Style engine: Add border to backend. ([40531](https://github.com/WordPress/gutenberg/pull/40531))
+-   Style engine: Elements backend support. ([40987](https://github.com/WordPress/gutenberg/pull/40987))
+-   Global styles: Merge block CSS with `theme.json` styles. ([34180](https://github.com/WordPress/gutenberg/pull/34180))
 
 ### Documentation
 
-- Add missing CHANGELOG entry. ([41745](https://github.com/WordPress/gutenberg/pull/41745))
-- Enhancements to TypeScript migration guidelines. ([41669](https://github.com/WordPress/gutenberg/pull/41669))
-- Add step for build and asset file. ([41511](https://github.com/WordPress/gutenberg/pull/41511))
-- Feature flag refresh. ([41522](https://github.com/WordPress/gutenberg/pull/41522))
-- Update link title and add the correct URL. ([41666](https://github.com/WordPress/gutenberg/pull/41666))
-- Fix typo in block schema description. ([41570](https://github.com/WordPress/gutenberg/pull/41570))
+-   Add missing CHANGELOG entry. ([41745](https://github.com/WordPress/gutenberg/pull/41745))
+-   Enhancements to TypeScript migration guidelines. ([41669](https://github.com/WordPress/gutenberg/pull/41669))
+-   Add step for build and asset file. ([41511](https://github.com/WordPress/gutenberg/pull/41511))
+-   Feature flag refresh. ([41522](https://github.com/WordPress/gutenberg/pull/41522))
+-   Update link title and add the correct URL. ([41666](https://github.com/WordPress/gutenberg/pull/41666))
+-   Fix typo in block schema description. ([41570](https://github.com/WordPress/gutenberg/pull/41570))
 
 ### Code Quality
 
-- Entity-aware type signature for getEntityRecord and getEntityRecords. ([41235](https://github.com/WordPress/gutenberg/pull/41235))
-- Improves the types of createHigherOrderComponent and its usages. ([41138](https://github.com/WordPress/gutenberg/pull/41138))
-- ESLint: Restrict removed Lodash functions. ([41651](https://github.com/WordPress/gutenberg/pull/41651))
-- TypeScript: Add default context types to Entity Records in core-data. ([41595](https://github.com/WordPress/gutenberg/pull/41595))
-- TypeScript: Improve type definitions in @wordpress/core-data. ([41593](https://github.com/WordPress/gutenberg/pull/41593))
-- RNMobile: Update clicks to use clickIfClickable() when possible. ([41367](https://github.com/WordPress/gutenberg/pull/41367))
-
-#### Components
-- Draggable: Add clarifying inline comment after the recent hook dependency changes. ([41658](https://github.com/WordPress/gutenberg/pull/41658))
-- Limit `Dropdown` cleanup to renders where the menu has actually been opened. ([41604](https://github.com/WordPress/gutenberg/pull/41604))
-- Placeholder: Add an illustration option to the Placeholder component. ([41605](https://github.com/WordPress/gutenberg/pull/41605))
-- Refactor `CustomGradientBar` to pass `exhaustive-deps`. ([41463](https://github.com/WordPress/gutenberg/pull/41463))
-- Refactor `DateDayPicker` to pass `exhaustive-deps`. ([41470](https://github.com/WordPress/gutenberg/pull/41470))
-- Refactor `Flex` to pass `exhaustive-deps`. ([41507](https://github.com/WordPress/gutenberg/pull/41507))
-- Refactor `FontSizePicker` to pass `exhaustive-deps`. ([41600](https://github.com/WordPress/gutenberg/pull/41600))
-- Refactor `InputControl` to pass `exhaustive-deps`. ([41601](https://github.com/WordPress/gutenberg/pull/41601))
-- Refactor `Modal` to pass `exhaustive-deps`. ([41610](https://github.com/WordPress/gutenberg/pull/41610))
-- Refactor`Draggable` to pass `exhaustive-deps`. ([41499](https://github.com/WordPress/gutenberg/pull/41499))
-- Refactor`Dropdown` to pass `exhaustive-deps`. ([41505](https://github.com/WordPress/gutenberg/pull/41505))
-- Rewrite `<FormTokenField>` to functional component and Typescript. ([41216](https://github.com/WordPress/gutenberg/pull/41216))
-- TreeSelect Convert to Typescript. ([41536](https://github.com/WordPress/gutenberg/pull/41536))
-- ZStack: Convert component story to TypeScript and add inline documentation. ([41694](https://github.com/WordPress/gutenberg/pull/41694))
-
-#### Block Library
-- Clarify updateNavigationLinkBlockAttributes. ([41657](https://github.com/WordPress/gutenberg/pull/41657))
-- Comment Author and Date blocks: Aligned editor markup with the frontend. ([41631](https://github.com/WordPress/gutenberg/pull/41631))
-- Cover Block: Move components to variables so they can be shared. ([41742](https://github.com/WordPress/gutenberg/pull/41742))
-- Split useNavigationMenu into bite-size functions and add unit tests. ([41139](https://github.com/WordPress/gutenberg/pull/41139))
-- File, Search Blocks: Lower CSS specificity. ([41393](https://github.com/WordPress/gutenberg/pull/41393))
+-   Entity-aware type signature for getEntityRecord and getEntityRecords. ([41235](https://github.com/WordPress/gutenberg/pull/41235))
+-   Improves the types of createHigherOrderComponent and its usages. ([41138](https://github.com/WordPress/gutenberg/pull/41138))
+-   ESLint: Restrict removed Lodash functions. ([41651](https://github.com/WordPress/gutenberg/pull/41651))
+-   TypeScript: Add default context types to Entity Records in core-data. ([41595](https://github.com/WordPress/gutenberg/pull/41595))
+-   TypeScript: Improve type definitions in @wordpress/core-data. ([41593](https://github.com/WordPress/gutenberg/pull/41593))
+-   RNMobile: Update clicks to use clickIfClickable() when possible. ([41367](https://github.com/WordPress/gutenberg/pull/41367))
+
+#### Components
+
+-   Draggable: Add clarifying inline comment after the recent hook dependency changes. ([41658](https://github.com/WordPress/gutenberg/pull/41658))
+-   Limit `Dropdown` cleanup to renders where the menu has actually been opened. ([41604](https://github.com/WordPress/gutenberg/pull/41604))
+-   Placeholder: Add an illustration option to the Placeholder component. ([41605](https://github.com/WordPress/gutenberg/pull/41605))
+-   Refactor `CustomGradientBar` to pass `exhaustive-deps`. ([41463](https://github.com/WordPress/gutenberg/pull/41463))
+-   Refactor `DateDayPicker` to pass `exhaustive-deps`. ([41470](https://github.com/WordPress/gutenberg/pull/41470))
+-   Refactor `Flex` to pass `exhaustive-deps`. ([41507](https://github.com/WordPress/gutenberg/pull/41507))
+-   Refactor `FontSizePicker` to pass `exhaustive-deps`. ([41600](https://github.com/WordPress/gutenberg/pull/41600))
+-   Refactor `InputControl` to pass `exhaustive-deps`. ([41601](https://github.com/WordPress/gutenberg/pull/41601))
+-   Refactor `Modal` to pass `exhaustive-deps`. ([41610](https://github.com/WordPress/gutenberg/pull/41610))
+-   Refactor`Draggable` to pass `exhaustive-deps`. ([41499](https://github.com/WordPress/gutenberg/pull/41499))
+-   Refactor`Dropdown` to pass `exhaustive-deps`. ([41505](https://github.com/WordPress/gutenberg/pull/41505))
+-   Rewrite `<FormTokenField>` to functional component and Typescript. ([41216](https://github.com/WordPress/gutenberg/pull/41216))
+-   TreeSelect Convert to Typescript. ([41536](https://github.com/WordPress/gutenberg/pull/41536))
+-   ZStack: Convert component story to TypeScript and add inline documentation. ([41694](https://github.com/WordPress/gutenberg/pull/41694))
+
+#### Block Library
+
+-   Clarify updateNavigationLinkBlockAttributes. ([41657](https://github.com/WordPress/gutenberg/pull/41657))
+-   Comment Author and Date blocks: Aligned editor markup with the frontend. ([41631](https://github.com/WordPress/gutenberg/pull/41631))
+-   Cover Block: Move components to variables so they can be shared. ([41742](https://github.com/WordPress/gutenberg/pull/41742))
+-   Split useNavigationMenu into bite-size functions and add unit tests. ([41139](https://github.com/WordPress/gutenberg/pull/41139))
+-   File, Search Blocks: Lower CSS specificity. ([41393](https://github.com/WordPress/gutenberg/pull/41393))
 
 #### Document Settings
-- Extract header used in PostVisibility and PublishDateTimePicker to a new InspectorPopoverHeader component. ([41362](https://github.com/WordPress/gutenberg/pull/41362))
+
+-   Extract header used in PostVisibility and PublishDateTimePicker to a new InspectorPopoverHeader component. ([41362](https://github.com/WordPress/gutenberg/pull/41362))
 
 #### Lodash
-- Refactor various Lodash methods. ([41701](https://github.com/WordPress/gutenberg/pull/41701)), ([41626](https://github.com/WordPress/gutenberg/pull/41626)), ([41731](https://github.com/WordPress/gutenberg/pull/41731)), ([41635](https://github.com/WordPress/gutenberg/pull/41635)), ([41672](https://github.com/WordPress/gutenberg/pull/41672)), ([41703](https://github.com/WordPress/gutenberg/pull/41703)), ([41692](https://github.com/WordPress/gutenberg/pull/41692)), ([41653](https://github.com/WordPress/gutenberg/pull/41653)), ([41654](https://github.com/WordPress/gutenberg/pull/41654)), ([41624](https://github.com/WordPress/gutenberg/pull/41624)), ([41688](https://github.com/WordPress/gutenberg/pull/41688)), ([41702](https://github.com/WordPress/gutenberg/pull/41702)), ([41652](https://github.com/WordPress/gutenberg/pull/41652)), ([41674](https://github.com/WordPress/gutenberg/pull/41674)), ([41634](https://github.com/WordPress/gutenberg/pull/41634)), ([41633](https://github.com/WordPress/gutenberg/pull/41633)), ([41632](https://github.com/WordPress/gutenberg/pull/41632)), ([41629](https://github.com/WordPress/gutenberg/pull/41629)), ([41706](https://github.com/WordPress/gutenberg/pull/41706)), ([41625](https://github.com/WordPress/gutenberg/pull/41625)), ([41701](https://github.com/WordPress/gutenberg/pull/41701))
-- Remove various lodash usages. ([41719](https://github.com/WordPress/gutenberg/pull/41719)), ([41687](https://github.com/WordPress/gutenberg/pull/41687))
 
+-   Refactor various Lodash methods. ([41701](https://github.com/WordPress/gutenberg/pull/41701)), ([41626](https://github.com/WordPress/gutenberg/pull/41626)), ([41731](https://github.com/WordPress/gutenberg/pull/41731)), ([41635](https://github.com/WordPress/gutenberg/pull/41635)), ([41672](https://github.com/WordPress/gutenberg/pull/41672)), ([41703](https://github.com/WordPress/gutenberg/pull/41703)), ([41692](https://github.com/WordPress/gutenberg/pull/41692)), ([41653](https://github.com/WordPress/gutenberg/pull/41653)), ([41654](https://github.com/WordPress/gutenberg/pull/41654)), ([41624](https://github.com/WordPress/gutenberg/pull/41624)), ([41688](https://github.com/WordPress/gutenberg/pull/41688)), ([41702](https://github.com/WordPress/gutenberg/pull/41702)), ([41652](https://github.com/WordPress/gutenberg/pull/41652)), ([41674](https://github.com/WordPress/gutenberg/pull/41674)), ([41634](https://github.com/WordPress/gutenberg/pull/41634)), ([41633](https://github.com/WordPress/gutenberg/pull/41633)), ([41632](https://github.com/WordPress/gutenberg/pull/41632)), ([41629](https://github.com/WordPress/gutenberg/pull/41629)), ([41706](https://github.com/WordPress/gutenberg/pull/41706)), ([41625](https://github.com/WordPress/gutenberg/pull/41625)), ([41701](https://github.com/WordPress/gutenberg/pull/41701))
+-   Remove various lodash usages. ([41719](https://github.com/WordPress/gutenberg/pull/41719)), ([41687](https://github.com/WordPress/gutenberg/pull/41687))
 
 ### Tools
 
 #### Build Tooling
-- Bump caniuse-lite version. ([41675](https://github.com/WordPress/gutenberg/pull/41675))
-- Update testing-library dependencies to latest version. ([41710](https://github.com/WordPress/gutenberg/pull/41710))
-- Upgrade wp-prettier to 2.6.2. ([40542](https://github.com/WordPress/gutenberg/pull/40542))
-- Package.json: Bump engines.node version to >=14. ([41599](https://github.com/WordPress/gutenberg/pull/41599))
+
+-   Bump caniuse-lite version. ([41675](https://github.com/WordPress/gutenberg/pull/41675))
+-   Update testing-library dependencies to latest version. ([41710](https://github.com/WordPress/gutenberg/pull/41710))
+-   Upgrade wp-prettier to 2.6.2. ([40542](https://github.com/WordPress/gutenberg/pull/40542))
+-   Package.json: Bump engines.node version to >=14. ([41599](https://github.com/WordPress/gutenberg/pull/41599))
 
 #### Testing
-- Fixed failing DateTimePicker Unit test. ([41483](https://github.com/WordPress/gutenberg/pull/41483))
-- Remove snapshot from Post Editor Template Mode test and target expected string instead. ([41563](https://github.com/WordPress/gutenberg/pull/41563))
-- Skip some of the Drag & Drop end-to-end on iOS. ([41529](https://github.com/WordPress/gutenberg/pull/41529))
-- Add controlled unit test, use modern Testing Library features. ([41668](https://github.com/WordPress/gutenberg/pull/41668))
+
+-   Fixed failing DateTimePicker Unit test. ([41483](https://github.com/WordPress/gutenberg/pull/41483))
+-   Remove snapshot from Post Editor Template Mode test and target expected string instead. ([41563](https://github.com/WordPress/gutenberg/pull/41563))
+-   Skip some of the Drag & Drop end-to-end on iOS. ([41529](https://github.com/WordPress/gutenberg/pull/41529))
+-   Add controlled unit test, use modern Testing Library features. ([41668](https://github.com/WordPress/gutenberg/pull/41668))
 
 #### Components
-- Storybook: Update to the version 6.5. ([41585](https://github.com/WordPress/gutenberg/pull/41585))
 
-## First time contributors
+-   Storybook: Update to the version 6.5. ([41585](https://github.com/WordPress/gutenberg/pull/41585))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
+
+The following PRs were merged by first-time contributors:
 
-- @FilipposZ: Block-Editor: Add tooltip on replace image's URL. ([41504](https://github.com/WordPress/gutenberg/pull/41504))
-- @manzurahammed: Block Library: Fix JS Error in Avatar Block. ([41354](https://github.com/WordPress/gutenberg/pull/41354))
-- @msurdi: Avoid including null values in blocks list. ([41496](https://github.com/WordPress/gutenberg/pull/41496))
-- @sebastienserre: Plural has been used instead of single in 1st parameter. ([41521](https://github.com/WordPress/gutenberg/pull/41521))
-- @tharsheblows: Docs: Add step for build and asset file. ([41511](https://github.com/WordPress/gutenberg/pull/41511))
+-   @FilipposZ: Block-Editor: Add tooltip on replace image's URL. ([41504](https://github.com/WordPress/gutenberg/pull/41504))
+-   @manzurahammed: Block Library: Fix JS Error in Avatar Block. ([41354](https://github.com/WordPress/gutenberg/pull/41354))
+-   @msurdi: Avoid including null values in blocks list. ([41496](https://github.com/WordPress/gutenberg/pull/41496))
+-   @sebastienserre: Plural has been used instead of single in 1st parameter. ([41521](https://github.com/WordPress/gutenberg/pull/41521))
+-   @tharsheblows: Docs: Add step for build and asset file. ([41511](https://github.com/WordPress/gutenberg/pull/41511))
 
 ## Contributors
 
@@ -14751,7 +26166,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @alexstine @andrewserong @chad1008 @ciampo @derekblank @draganescu @FilipposZ @fluiddot @geriux @glendaviesnz @jffng @jostnes @jsnajdr @MaggieCabrera @Mamaduka @manzurahammed @matiasbenedetto @mburridge @mcsf @mirka @msurdi @noisysocks @ntsekouras @oandregal @ramonjd @SavPhill @scruffian @sebastienserre @sunil25393 @t-hamano @tharsheblows @torounit @tyxla @walbo
 
-
 = 13.4.0 =
 
 ## Changelog
@@ -14759,166 +26173,180 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Block deprecations: Provide context when `blocks.registerBlockType` is applied to deprecations. ([36628](https://github.com/WordPress/gutenberg/pull/36628))
-- File Block: Makes the button an element button. ([41239](https://github.com/WordPress/gutenberg/pull/41239))
-- Gallery: Opt-in to axial (column/row) block spacing controls. ([41175](https://github.com/WordPress/gutenberg/pull/41175))
-- Gallery block: Update the gallery gap to load styles in header for block themes. ([41015](https://github.com/WordPress/gutenberg/pull/41015))
-- Navigation: Remove unnecessary 'role' attribute. ([41360](https://github.com/WordPress/gutenberg/pull/41360))
-- Post Author Name: Add to and from Post Author transformations. ([41151](https://github.com/WordPress/gutenberg/pull/41151))
-- Post Comments: Make the button an element button. ([41251](https://github.com/WordPress/gutenberg/pull/41251))
-- Search Block - ability to specify additional search query vars. ([40585](https://github.com/WordPress/gutenberg/pull/40585))
-- Site Logo: Update/site logo constrain image. ([41298](https://github.com/WordPress/gutenberg/pull/41298))
+
+-   Block deprecations: Provide context when `blocks.registerBlockType` is applied to deprecations. ([36628](https://github.com/WordPress/gutenberg/pull/36628))
+-   File Block: Makes the button an element button. ([41239](https://github.com/WordPress/gutenberg/pull/41239))
+-   Gallery: Opt-in to axial (column/row) block spacing controls. ([41175](https://github.com/WordPress/gutenberg/pull/41175))
+-   Gallery block: Update the gallery gap to load styles in header for block themes. ([41015](https://github.com/WordPress/gutenberg/pull/41015))
+-   Navigation: Remove unnecessary 'role' attribute. ([41360](https://github.com/WordPress/gutenberg/pull/41360))
+-   Post Author Name: Add to and from Post Author transformations. ([41151](https://github.com/WordPress/gutenberg/pull/41151))
+-   Post Comments: Make the button an element button. ([41251](https://github.com/WordPress/gutenberg/pull/41251))
+-   Search Block - ability to specify additional search query vars. ([40585](https://github.com/WordPress/gutenberg/pull/40585))
+-   Site Logo: Update/site logo constrain image. ([41298](https://github.com/WordPress/gutenberg/pull/41298))
 
 #### Components
-- Allow removing bottom margin from SelectControl. ([41269](https://github.com/WordPress/gutenberg/pull/41269))
-- ColorPicker: Only display detailed inputs. ([41222](https://github.com/WordPress/gutenberg/pull/41222))
-- ColorPicker: Strip hash from pasted hex values in ColorPicker. ([41223](https://github.com/WordPress/gutenberg/pull/41223))
-- Design updates to the Publish popover (`DateTimePicker`). ([41097](https://github.com/WordPress/gutenberg/pull/41097))
-- Spacer: Add RTL support. ([41172](https://github.com/WordPress/gutenberg/pull/41172))
+
+-   Allow removing bottom margin from SelectControl. ([41269](https://github.com/WordPress/gutenberg/pull/41269))
+-   ColorPicker: Only display detailed inputs. ([41222](https://github.com/WordPress/gutenberg/pull/41222))
+-   ColorPicker: Strip hash from pasted hex values in ColorPicker. ([41223](https://github.com/WordPress/gutenberg/pull/41223))
+-   Design updates to the Publish popover (`DateTimePicker`). ([41097](https://github.com/WordPress/gutenberg/pull/41097))
+-   Spacer: Add RTL support. ([41172](https://github.com/WordPress/gutenberg/pull/41172))
 
 #### Global Styles
-- Add support for button elements to theme.json. ([40260](https://github.com/WordPress/gutenberg/pull/40260))
-- Button Element: Add support to Site Editor. ([41246](https://github.com/WordPress/gutenberg/pull/41246))
-- Button Element: Update button element selector. ([41240](https://github.com/WordPress/gutenberg/pull/41240))
+
+-   Add support for button elements to theme.json. ([40260](https://github.com/WordPress/gutenberg/pull/40260))
+-   Button Element: Add support to Site Editor. ([41246](https://github.com/WordPress/gutenberg/pull/41246))
+-   Button Element: Update button element selector. ([41240](https://github.com/WordPress/gutenberg/pull/41240))
 
 #### Design Tools
-- Unify color UI. Refactor panel color gradient settings to use a tools panel.  ([41091](https://github.com/WordPress/gutenberg/pull/41091))
+
+-   Unify color UI. Refactor panel color gradient settings to use a tools panel. ([41091](https://github.com/WordPress/gutenberg/pull/41091))
 
 #### Full Site Editing
-- Site Editor: Update `single` default template copy. ([41302](https://github.com/WordPress/gutenberg/pull/41302))
-- FSE Templates: Add info to templates created from wp suggestion. ([41387](https://github.com/WordPress/gutenberg/pull/41387))
+
+-   Site Editor: Update `single` default template copy. ([41302](https://github.com/WordPress/gutenberg/pull/41302))
+-   FSE Templates: Add info to templates created from wp suggestion. ([41387](https://github.com/WordPress/gutenberg/pull/41387))
 
 ### New APIs
 
-- Move the visible blocks state to the block editor store. ([41104](https://github.com/WordPress/gutenberg/pull/41104))
+-   Move the visible blocks state to the block editor store. ([41104](https://github.com/WordPress/gutenberg/pull/41104))
 
 ### Bug Fixes
 
-- Fix customizer block toolbar after popover refactor. ([41312](https://github.com/WordPress/gutenberg/pull/41312))
-- Get_style_nodes should be compatible with parent method. ([41217](https://github.com/WordPress/gutenberg/pull/41217))
+-   Fix customizer block toolbar after popover refactor. ([41312](https://github.com/WordPress/gutenberg/pull/41312))
+-   Get_style_nodes should be compatible with parent method. ([41217](https://github.com/WordPress/gutenberg/pull/41217))
 
 #### Block Library
-- Columns: Add default fallback gap value in block.json, and set to 2em for Columns blocks. ([41098](https://github.com/WordPress/gutenberg/pull/41098))
-- Cover: Fix duotone when background is set to fixed. ([40554](https://github.com/WordPress/gutenberg/pull/40554))
-- Gallery: Lower the priority of the gallery gap css so it loads after the block  layout css. ([41423](https://github.com/WordPress/gutenberg/pull/41423))
-- Gallery: Support gaps that define column/row gaps to avoid PHP Warning/Fatal. ([41125](https://github.com/WordPress/gutenberg/pull/41125))
-- Group: Check variation is registered before displaying it in the toolbar. ([41305](https://github.com/WordPress/gutenberg/pull/41305))
-- Image: Revert error handling. ([41221](https://github.com/WordPress/gutenberg/pull/41221))
-- List: List split bugs if the one of the splits is empty. ([41283](https://github.com/WordPress/gutenberg/pull/41283))
-- Navigation: Fix broken Page title for pages created inline within in Nav block. ([41063](https://github.com/WordPress/gutenberg/pull/41063))
-- Navigation: Remove all references to the navigation areas. ([41205](https://github.com/WordPress/gutenberg/pull/41205))
-- Query: Inherit author from global query. ([40648](https://github.com/WordPress/gutenberg/pull/40648))
-- Table of Contents: Convert `<br>` tags to spaces in headings. ([41206](https://github.com/WordPress/gutenberg/pull/41206))
-- Table of Contents: Fix list block check. ([41351](https://github.com/WordPress/gutenberg/pull/41351))
+
+-   Columns: Add default fallback gap value in block.json, and set to 2em for Columns blocks. ([41098](https://github.com/WordPress/gutenberg/pull/41098))
+-   Cover: Fix duotone when background is set to fixed. ([40554](https://github.com/WordPress/gutenberg/pull/40554))
+-   Gallery: Lower the priority of the gallery gap css so it loads after the block layout css. ([41423](https://github.com/WordPress/gutenberg/pull/41423))
+-   Gallery: Support gaps that define column/row gaps to avoid PHP Warning/Fatal. ([41125](https://github.com/WordPress/gutenberg/pull/41125))
+-   Group: Check variation is registered before displaying it in the toolbar. ([41305](https://github.com/WordPress/gutenberg/pull/41305))
+-   Image: Revert error handling. ([41221](https://github.com/WordPress/gutenberg/pull/41221))
+-   List: List split bugs if the one of the splits is empty. ([41283](https://github.com/WordPress/gutenberg/pull/41283))
+-   Navigation: Fix broken Page title for pages created inline within in Nav block. ([41063](https://github.com/WordPress/gutenberg/pull/41063))
+-   Navigation: Remove all references to the navigation areas. ([41205](https://github.com/WordPress/gutenberg/pull/41205))
+-   Query: Inherit author from global query. ([40648](https://github.com/WordPress/gutenberg/pull/40648))
+-   Table of Contents: Convert `<br>` tags to spaces in headings. ([41206](https://github.com/WordPress/gutenberg/pull/41206))
+-   Table of Contents: Fix list block check. ([41351](https://github.com/WordPress/gutenberg/pull/41351))
 
 #### Block Editor
-- Block Variations: Fix block variation registration when `icon` is an `object` and contains `transform` scope. ([41457](https://github.com/WordPress/gutenberg/pull/41457))
-- Handle no variation case in the block transform menu. ([41328](https://github.com/WordPress/gutenberg/pull/41328))
-- Update the block popover position as we scroll the container. ([41402](https://github.com/WordPress/gutenberg/pull/41402))
-- Writing Flow: Fix browser formatting with shortcuts on multiple selection. ([41207](https://github.com/WordPress/gutenberg/pull/41207))
+
+-   Block Variations: Fix block variation registration when `icon` is an `object` and contains `transform` scope. ([41457](https://github.com/WordPress/gutenberg/pull/41457))
+-   Handle no variation case in the block transform menu. ([41328](https://github.com/WordPress/gutenberg/pull/41328))
+-   Update the block popover position as we scroll the container. ([41402](https://github.com/WordPress/gutenberg/pull/41402))
+-   Writing Flow: Fix browser formatting with shortcuts on multiple selection. ([41207](https://github.com/WordPress/gutenberg/pull/41207))
 
 #### Components
-- BorderBoxControl: Fix right border control alignment on small viewports and RTL styles. ([41254](https://github.com/WordPress/gutenberg/pull/41254))
-- ColorPalette: Update label correctly when value is CSS variable. ([41461](https://github.com/WordPress/gutenberg/pull/41461))
-- InputControl: Fix undo when changing padding values. ([40518](https://github.com/WordPress/gutenberg/pull/40518))
-- Popover, CustomGradientPicker, Dropdown: Fix positioning of popover when used in a dropdown. ([41361](https://github.com/WordPress/gutenberg/pull/41361))
-- Style Variations: Set min-width for styles preview. ([41198](https://github.com/WordPress/gutenberg/pull/41198))
+
+-   BorderBoxControl: Fix right border control alignment on small viewports and RTL styles. ([41254](https://github.com/WordPress/gutenberg/pull/41254))
+-   ColorPalette: Update label correctly when value is CSS variable. ([41461](https://github.com/WordPress/gutenberg/pull/41461))
+-   InputControl: Fix undo when changing padding values. ([40518](https://github.com/WordPress/gutenberg/pull/40518))
+-   Popover, CustomGradientPicker, Dropdown: Fix positioning of popover when used in a dropdown. ([41361](https://github.com/WordPress/gutenberg/pull/41361))
+-   Style Variations: Set min-width for styles preview. ([41198](https://github.com/WordPress/gutenberg/pull/41198))
 
 #### CSS & Styling
-- Block styles: Account for style block nodes that have no name. ([41446](https://github.com/WordPress/gutenberg/pull/41446))
+
+-   Block styles: Account for style block nodes that have no name. ([41446](https://github.com/WordPress/gutenberg/pull/41446))
 
 #### Site Editor
-- Code Editor: Avoid content loss when switching between editors. ([41407](https://github.com/WordPress/gutenberg/pull/41407))
-- Fix description in GetTemplateInfo. ([41394](https://github.com/WordPress/gutenberg/pull/41394))
-- Navigation Menu Sidebar: Fix vertical alignment of rows in nav panel. ([40883](https://github.com/WordPress/gutenberg/pull/40883))
-- Persist new template's description on creation. ([41281](https://github.com/WordPress/gutenberg/pull/41281))
+
+-   Code Editor: Avoid content loss when switching between editors. ([41407](https://github.com/WordPress/gutenberg/pull/41407))
+-   Fix description in GetTemplateInfo. ([41394](https://github.com/WordPress/gutenberg/pull/41394))
+-   Navigation Menu Sidebar: Fix vertical alignment of rows in nav panel. ([40883](https://github.com/WordPress/gutenberg/pull/40883))
+-   Persist new template's description on creation. ([41281](https://github.com/WordPress/gutenberg/pull/41281))
 
 ### Performance
 
-- Improve autocompleter performance. ([41197](https://github.com/WordPress/gutenberg/pull/41197))
-- Load block CSS conditionally. ([41160](https://github.com/WordPress/gutenberg/pull/41160))
-- Update React Spring. ([41185](https://github.com/WordPress/gutenberg/pull/41185))
+-   Improve autocompleter performance. ([41197](https://github.com/WordPress/gutenberg/pull/41197))
+-   Load block CSS conditionally. ([41160](https://github.com/WordPress/gutenberg/pull/41160))
+-   Update React Spring. ([41185](https://github.com/WordPress/gutenberg/pull/41185))
 
 ### Experiments
 
-- Remove Navigation screen from experiments page. ([40878](https://github.com/WordPress/gutenberg/pull/40878))
+-   Remove Navigation screen from experiments page. ([40878](https://github.com/WordPress/gutenberg/pull/40878))
 
 ### Documentation
 
-- Add missing entries to components package CHANGELOG. ([41159](https://github.com/WordPress/gutenberg/pull/41159))
-- Added example for getSaveElement. ([41211](https://github.com/WordPress/gutenberg/pull/41211))
-- Block support docs: Update blockGap notes. ([41225](https://github.com/WordPress/gutenberg/pull/41225))
-- Change 'author' to 'category' in onCategoryChange. ([41299](https://github.com/WordPress/gutenberg/pull/41299))
-- Components: Link Storybook in readme. ([41182](https://github.com/WordPress/gutenberg/pull/41182))
-- Create Block: Improve block templates. ([41273](https://github.com/WordPress/gutenberg/pull/41273))
-- Fix spelling mistake broswer to browser. ([41137](https://github.com/WordPress/gutenberg/pull/41137))
-- Improve inline documentation. ([41209](https://github.com/WordPress/gutenberg/pull/41209))
-- SlotFill: Remove note about portals being unstable. ([41359](https://github.com/WordPress/gutenberg/pull/41359))
-- Update Page URL. ([41188](https://github.com/WordPress/gutenberg/pull/41188))
+-   Add missing entries to components package CHANGELOG. ([41159](https://github.com/WordPress/gutenberg/pull/41159))
+-   Added example for getSaveElement. ([41211](https://github.com/WordPress/gutenberg/pull/41211))
+-   Block support docs: Update blockGap notes. ([41225](https://github.com/WordPress/gutenberg/pull/41225))
+-   Change 'author' to 'category' in onCategoryChange. ([41299](https://github.com/WordPress/gutenberg/pull/41299))
+-   Components: Link Storybook in readme. ([41182](https://github.com/WordPress/gutenberg/pull/41182))
+-   Create Block: Improve block templates. ([41273](https://github.com/WordPress/gutenberg/pull/41273))
+-   Fix spelling mistake broswer to browser. ([41137](https://github.com/WordPress/gutenberg/pull/41137))
+-   Improve inline documentation. ([41209](https://github.com/WordPress/gutenberg/pull/41209))
+-   SlotFill: Remove note about portals being unstable. ([41359](https://github.com/WordPress/gutenberg/pull/41359))
+-   Update Page URL. ([41188](https://github.com/WordPress/gutenberg/pull/41188))
 
 ### Code Quality
 
-- Entity configuration types. ([40995](https://github.com/WordPress/gutenberg/pull/40995))
-- Remove unused color panel files. ([41148](https://github.com/WordPress/gutenberg/pull/41148))
-- Remove the tooltip from the block selection button. ([41154](https://github.com/WordPress/gutenberg/pull/41154))
-- Search: Avoid double escaping. ([41147](https://github.com/WordPress/gutenberg/pull/41147))
-- Upgrade Rememo to v4. ([41415](https://github.com/WordPress/gutenberg/pull/41415))
+-   Entity configuration types. ([40995](https://github.com/WordPress/gutenberg/pull/40995))
+-   Remove unused color panel files. ([41148](https://github.com/WordPress/gutenberg/pull/41148))
+-   Remove the tooltip from the block selection button. ([41154](https://github.com/WordPress/gutenberg/pull/41154))
+-   Search: Avoid double escaping. ([41147](https://github.com/WordPress/gutenberg/pull/41147))
+-   Upgrade Rememo to v4. ([41415](https://github.com/WordPress/gutenberg/pull/41415))
 
 #### Components
-- Refactor `Autocomplete` to pass `exhaustive-deps`. ([41382](https://github.com/WordPress/gutenberg/pull/41382))
-- Refactor `BorderControl` to pass `exhaustive-deps`. ([41259](https://github.com/WordPress/gutenberg/pull/41259))
-- Refactor `ColorPalette` to disable `exhaustive-deps` check for now. ([41253](https://github.com/WordPress/gutenberg/pull/41253))
-- Remove 'useCombinedRef' hook. ([41186](https://github.com/WordPress/gutenberg/pull/41186))
-- Update @types/react-dates. ([41266](https://github.com/WordPress/gutenberg/pull/41266))
-- Refactor `AlignmentMatrixControl` to pass `exhaustive-deps`. ([41167](https://github.com/WordPress/gutenberg/pull/41167))
-- Surface: Convert component to TypeScript. ([41212](https://github.com/WordPress/gutenberg/pull/41212))
-- TextareaControl: Convert component to TypeScript. ([41215](https://github.com/WordPress/gutenberg/pull/41215))
+
+-   Refactor `Autocomplete` to pass `exhaustive-deps`. ([41382](https://github.com/WordPress/gutenberg/pull/41382))
+-   Refactor `BorderControl` to pass `exhaustive-deps`. ([41259](https://github.com/WordPress/gutenberg/pull/41259))
+-   Refactor `ColorPalette` to disable `exhaustive-deps` check for now. ([41253](https://github.com/WordPress/gutenberg/pull/41253))
+-   Remove 'useCombinedRef' hook. ([41186](https://github.com/WordPress/gutenberg/pull/41186))
+-   Update @types/react-dates. ([41266](https://github.com/WordPress/gutenberg/pull/41266))
+-   Refactor `AlignmentMatrixControl` to pass `exhaustive-deps`. ([41167](https://github.com/WordPress/gutenberg/pull/41167))
+-   Surface: Convert component to TypeScript. ([41212](https://github.com/WordPress/gutenberg/pull/41212))
+-   TextareaControl: Convert component to TypeScript. ([41215](https://github.com/WordPress/gutenberg/pull/41215))
 
 ### Tools
 
 #### Build Tooling
-- jest-console: Add types directory to "files". ([41386](https://github.com/WordPress/gutenberg/pull/41386))
-- Scripts: Convert file extension to js in `block.json` during build. ([41068](https://github.com/WordPress/gutenberg/pull/41068))
-- Scripts:  Plugin-zip to include root path files. ([41439](https://github.com/WordPress/gutenberg/pull/41439))
 
+-   jest-console: Add types directory to "files". ([41386](https://github.com/WordPress/gutenberg/pull/41386))
+-   Scripts: Convert file extension to js in `block.json` during build. ([41068](https://github.com/WordPress/gutenberg/pull/41068))
+-   Scripts: Plugin-zip to include root path files. ([41439](https://github.com/WordPress/gutenberg/pull/41439))
 
 #### Plugin
-- Updates tested up to with 6.0 version. ([41272](https://github.com/WordPress/gutenberg/pull/41272))
+
+-   Updates tested up to with 6.0 version. ([41272](https://github.com/WordPress/gutenberg/pull/41272))
 
 #### Project Management
-- Limit my codeowners to the REST API. ([41411](https://github.com/WordPress/gutenberg/pull/41411))
+
+-   Limit my codeowners to the REST API. ([41411](https://github.com/WordPress/gutenberg/pull/41411))
 
 #### Testing
-- CheckboxControl: Add unit tests. ([41165](https://github.com/WordPress/gutenberg/pull/41165))
-- Enable iframe-inline-styles end-to-end test. ([35171](https://github.com/WordPress/gutenberg/pull/35171))
-- Migrate code block tests to Playwright. ([41136](https://github.com/WordPress/gutenberg/pull/41136))
-- Migrate html block test case to Playwright. ([41231](https://github.com/WordPress/gutenberg/pull/41231))
-- Migrate preformatted block tests to Playwright. ([41128](https://github.com/WordPress/gutenberg/pull/41128))
-- Migrate revert template test to Playwright. ([41310](https://github.com/WordPress/gutenberg/pull/41310))
-- Migrate separator block tests to Playwright. ([41130](https://github.com/WordPress/gutenberg/pull/41130))
-- Migrate template part test to playwright. ([41048](https://github.com/WordPress/gutenberg/pull/41048))
-- Refactor check-local-changes script. ([41074](https://github.com/WordPress/gutenberg/pull/41074))
-- Rewrite flaky tests reporter into its own package. ([41106](https://github.com/WordPress/gutenberg/pull/41106))
-- Revert "Enable iframe-inline-styles end-to-end test". ([41369](https://github.com/WordPress/gutenberg/pull/41369))
-- Upgrade Playwright and use the official role selector engine. ([41389](https://github.com/WordPress/gutenberg/pull/41389))
-- Use @testing-library/user-event in `BoxControl` tests. ([41422](https://github.com/WordPress/gutenberg/pull/41422))
-- Use @testing-library/user-event in TimePicker tests. ([41270](https://github.com/WordPress/gutenberg/pull/41270))
+
+-   CheckboxControl: Add unit tests. ([41165](https://github.com/WordPress/gutenberg/pull/41165))
+-   Enable iframe-inline-styles end-to-end test. ([35171](https://github.com/WordPress/gutenberg/pull/35171))
+-   Migrate code block tests to Playwright. ([41136](https://github.com/WordPress/gutenberg/pull/41136))
+-   Migrate html block test case to Playwright. ([41231](https://github.com/WordPress/gutenberg/pull/41231))
+-   Migrate preformatted block tests to Playwright. ([41128](https://github.com/WordPress/gutenberg/pull/41128))
+-   Migrate revert template test to Playwright. ([41310](https://github.com/WordPress/gutenberg/pull/41310))
+-   Migrate separator block tests to Playwright. ([41130](https://github.com/WordPress/gutenberg/pull/41130))
+-   Migrate template part test to playwright. ([41048](https://github.com/WordPress/gutenberg/pull/41048))
+-   Refactor check-local-changes script. ([41074](https://github.com/WordPress/gutenberg/pull/41074))
+-   Rewrite flaky tests reporter into its own package. ([41106](https://github.com/WordPress/gutenberg/pull/41106))
+-   Revert "Enable iframe-inline-styles end-to-end test". ([41369](https://github.com/WordPress/gutenberg/pull/41369))
+-   Upgrade Playwright and use the official role selector engine. ([41389](https://github.com/WordPress/gutenberg/pull/41389))
+-   Use @testing-library/user-event in `BoxControl` tests. ([41422](https://github.com/WordPress/gutenberg/pull/41422))
+-   Use @testing-library/user-event in TimePicker tests. ([41270](https://github.com/WordPress/gutenberg/pull/41270))
 
 #### wp-env
-- Allow skipping setting a configuration value by specifying it as null. ([41084](https://github.com/WordPress/gutenberg/pull/41084))
-- Fixed `run` Argument Passing. ([41179](https://github.com/WordPress/gutenberg/pull/41179))
-- Remove explicit git branch fallbacks for wp-env and update readme. ([41043](https://github.com/WordPress/gutenberg/pull/41043))
 
-## First time contributors
+-   Allow skipping setting a configuration value by specifying it as null. ([41084](https://github.com/WordPress/gutenberg/pull/41084))
+-   Fixed `run` Argument Passing. ([41179](https://github.com/WordPress/gutenberg/pull/41179))
+-   Remove explicit git branch fallbacks for wp-env and update readme. ([41043](https://github.com/WordPress/gutenberg/pull/41043))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @CWBudde: Added example for getSaveElement. ([41211](https://github.com/WordPress/gutenberg/pull/41211))
-- @derekblank:  ([40334](https://github.com/WordPress/gutenberg/pull/40334))
-- @ObliviousHarmony: Env: Fixed `run` Argument Passing. ([41179](https://github.com/WordPress/gutenberg/pull/41179))
-- @pooja-muchandikar: Migrate html block test case to Playwright. ([41231](https://github.com/WordPress/gutenberg/pull/41231))
-- @xconsau: Change 'author' to 'category' in onCategoryChange. ([41299](https://github.com/WordPress/gutenberg/pull/41299))
+The following PRs were merged by first-time contributors:
 
+-   @CWBudde: Added example for getSaveElement. ([41211](https://github.com/WordPress/gutenberg/pull/41211))
+-   @derekblank: ([40334](https://github.com/WordPress/gutenberg/pull/40334))
+-   @ObliviousHarmony: Env: Fixed `run` Argument Passing. ([41179](https://github.com/WordPress/gutenberg/pull/41179))
+-   @pooja-muchandikar: Migrate html block test case to Playwright. ([41231](https://github.com/WordPress/gutenberg/pull/41231))
+-   @xconsau: Change 'author' to 'category' in onCategoryChange. ([41299](https://github.com/WordPress/gutenberg/pull/41299))
 
 ## Contributors
 
@@ -14926,7 +26354,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @aduth @amustaque97 @andrewserong @aristath @chad1008 @ciampo @CWBudde @dd32 @derekblank @draganescu @ethitter @fluiddot @geriux @getdave @glendaviesnz @gvgvgvijayan @gziolo @jameskoster @jorgefilipecosta @jostnes @JustinyAhin @kevin940726 @Mamaduka @matiasbenedetto @mirka @noisysocks @ntsekouras @ObliviousHarmony @pooja-muchandikar @ramonjd @SavPhill @scruffian @SiobhyB @stokesman @t-hamano @talldan @tellthemachines @TimothyBJacobs @tomasztunik @torounit @walbo @xconsau @youknowriad @ZebulanStanphill
 
-
 = 13.3.0 =
 
 ## Changelog
@@ -14934,266 +26361,293 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Preferences
-- Avoid persisting preference every time the sidebar tab is changed. ([40923](https://github.com/WordPress/gutenberg/pull/40923))
-- Editor preferences: Update order and copy. ([40981](https://github.com/WordPress/gutenberg/pull/40981))
+
+-   Avoid persisting preference every time the sidebar tab is changed. ([40923](https://github.com/WordPress/gutenberg/pull/40923))
+-   Editor preferences: Update order and copy. ([40981](https://github.com/WordPress/gutenberg/pull/40981))
 
 #### Components
-- BorderControl
-    - Make border color consistent with other controls. ([40921](https://github.com/WordPress/gutenberg/pull/40921))
-    - Make height consistent with other controls. ([40920](https://github.com/WordPress/gutenberg/pull/40920))
-    - Make reset to default button only display when required. ([40917](https://github.com/WordPress/gutenberg/pull/40917))
-- Select Component: Remove the lineheight setting to fix issue with font descenders being cut off. ([40985](https://github.com/WordPress/gutenberg/pull/40985))
+
+-   BorderControl
+    -   Make border color consistent with other controls. ([40921](https://github.com/WordPress/gutenberg/pull/40921))
+    -   Make height consistent with other controls. ([40920](https://github.com/WordPress/gutenberg/pull/40920))
+    -   Make reset to default button only display when required. ([40917](https://github.com/WordPress/gutenberg/pull/40917))
+-   Select Component: Remove the lineheight setting to fix issue with font descenders being cut off. ([40985](https://github.com/WordPress/gutenberg/pull/40985))
 
 #### Block Library
-- Add an explicit error message if an image block fails to load the image. ([40982](https://github.com/WordPress/gutenberg/pull/40982))
-- Add transform between cover and media & text. ([38458](https://github.com/WordPress/gutenberg/pull/38458))
-- Post Terms: Add dynamic variations of custom taxonomies. ([39837](https://github.com/WordPress/gutenberg/pull/39837))
-- Query Loop: Add `parents` filter. ([40933](https://github.com/WordPress/gutenberg/pull/40933))
-- Add: Space to indent list item. ([39949](https://github.com/WordPress/gutenberg/pull/39949))
-- Separator Block: Add border property for dots style to editor stylesheet. ([40855](https://github.com/WordPress/gutenberg/pull/40855))
-- Button: Add text transform control. ([40858](https://github.com/WordPress/gutenberg/pull/40858))
+
+-   Add an explicit error message if an image block fails to load the image. ([40982](https://github.com/WordPress/gutenberg/pull/40982))
+-   Add transform between cover and media & text. ([38458](https://github.com/WordPress/gutenberg/pull/38458))
+-   Post Terms: Add dynamic variations of custom taxonomies. ([39837](https://github.com/WordPress/gutenberg/pull/39837))
+-   Query Loop: Add `parents` filter. ([40933](https://github.com/WordPress/gutenberg/pull/40933))
+-   Add: Space to indent list item. ([39949](https://github.com/WordPress/gutenberg/pull/39949))
+-   Separator Block: Add border property for dots style to editor stylesheet. ([40855](https://github.com/WordPress/gutenberg/pull/40855))
+-   Button: Add text transform control. ([40858](https://github.com/WordPress/gutenberg/pull/40858))
 
 #### Build Tooling
-- dependency-extraction-webpack-plugin: Calculate vendor hash from file output rather than Webpack internal state. ([34969](https://github.com/WordPress/gutenberg/pull/34969))
-- Dependency Extraction Webpack Plugin: Use OpenSSL provider supported in Node 17+. ([40503](https://github.com/WordPress/gutenberg/pull/40503))
-- Update actions/setup-node GitHub action. ([40816](https://github.com/WordPress/gutenberg/pull/40816))
+
+-   dependency-extraction-webpack-plugin: Calculate vendor hash from file output rather than Webpack internal state. ([34969](https://github.com/WordPress/gutenberg/pull/34969))
+-   Dependency Extraction Webpack Plugin: Use OpenSSL provider supported in Node 17+. ([40503](https://github.com/WordPress/gutenberg/pull/40503))
+-   Update actions/setup-node GitHub action. ([40816](https://github.com/WordPress/gutenberg/pull/40816))
 
 #### Design Tools
-- BorderRadiusControl: Add tooltips to split border radius controls. ([40983](https://github.com/WordPress/gutenberg/pull/40983))
+
+-   BorderRadiusControl: Add tooltips to split border radius controls. ([40983](https://github.com/WordPress/gutenberg/pull/40983))
 
 #### CSS & Styling
-- BorderRadiusControl: Tweak spacing between input and range control to line up with BorderControl. ([40958](https://github.com/WordPress/gutenberg/pull/40958))
+
+-   BorderRadiusControl: Tweak spacing between input and range control to line up with BorderControl. ([40958](https://github.com/WordPress/gutenberg/pull/40958))
 
 #### Template Editor
-- Use the label 'Clear customizations' when changes are revertable. ([40935](https://github.com/WordPress/gutenberg/pull/40935))
+
+-   Use the label 'Clear customizations' when changes are revertable. ([40935](https://github.com/WordPress/gutenberg/pull/40935))
 
 #### npm Packages
-- Packages: Add command to publish to npm targeting WP major release. ([40927](https://github.com/WordPress/gutenberg/pull/40927))
+
+-   Packages: Add command to publish to npm targeting WP major release. ([40927](https://github.com/WordPress/gutenberg/pull/40927))
 
 #### List View
-- Block list: Add option in editor settings to show open list view as default. ([40757](https://github.com/WordPress/gutenberg/pull/40757))
-
-
-### Bug Fixes
-
-- Add missing styling panels for uncontrolled navigation. ([41114](https://github.com/WordPress/gutenberg/pull/41114))
-- DOM: Allow copying text from non-text input elements. ([40192](https://github.com/WordPress/gutenberg/pull/40192))
-- DOM: Deprecate `isNumberInput` and fix its handling of value=0. ([40896](https://github.com/WordPress/gutenberg/pull/40896))
-- FlatTermSelector: Avoid errors when returned terms aren't iterable. ([41099](https://github.com/WordPress/gutenberg/pull/41099))
-- Provide translators comment for Font size and Letter Case. ([40879](https://github.com/WordPress/gutenberg/pull/40879))
-
-#### Block Library
-- BorderControl: Fix focus styling. ([40951](https://github.com/WordPress/gutenberg/pull/40951))
-- Add missing "type" to the search field on the editor. ([40782](https://github.com/WordPress/gutenberg/pull/40782))
-- Comments Title
-    - Fix post title translation. ([40972](https://github.com/WordPress/gutenberg/pull/40972))
-    - Make non-editable. ([40817](https://github.com/WordPress/gutenberg/pull/40817))
-- Cover: Update background type when using featured image. ([40873](https://github.com/WordPress/gutenberg/pull/40873))
-- Fix Comments Form Title text alignment. ([40795](https://github.com/WordPress/gutenberg/pull/40795))
-- Fix external styles leaking into Warning component. ([40868](https://github.com/WordPress/gutenberg/pull/40868))
-- Image Editor: Remove HTML from error messages. ([40812](https://github.com/WordPress/gutenberg/pull/40812))
-- Post Comments Block: Allow placeholders to reorder items in translations. ([40849](https://github.com/WordPress/gutenberg/pull/40849))
-- Post Comments: Fix invalid date format in placeholder. ([40929](https://github.com/WordPress/gutenberg/pull/40929))
-- Quote: Fix the embed discovery. ([41134](https://github.com/WordPress/gutenberg/pull/41134))
-- Return immediately from Avatar block's render_callback if `$comment` is null. ([40835](https://github.com/WordPress/gutenberg/pull/40835))
-- Use `get_the_post_thumbnail` function in the cover block.. ([40853](https://github.com/WordPress/gutenberg/pull/40853))
-- List v2
-    - Fix outdent on empty list item if we press enter. ([40939](https://github.com/WordPress/gutenberg/pull/40939))
-    - Focus new list item added from sibling inserter. ([41051](https://github.com/WordPress/gutenberg/pull/41051))
-    - Fixes an issue where pressing enter deletes innerblocks. ([41109](https://github.com/WordPress/gutenberg/pull/41109))
-- CircularOptionPicker: Fix focused styles. ([40990](https://github.com/WordPress/gutenberg/pull/40990))
-- Gallery block
-    - Fix bug with initial image size. ([41079](https://github.com/WordPress/gutenberg/pull/41079))
-    - Include image caption when converting a classic block gallery. ([40872](https://github.com/WordPress/gutenberg/pull/40872))
-- Post Author block: Hide select author controle if there is no postId. ([40910](https://github.com/WordPress/gutenberg/pull/40910))
+
+-   Block list: Add option in editor settings to show open list view as default. ([40757](https://github.com/WordPress/gutenberg/pull/40757))
+
+### Bug Fixes
+
+-   Add missing styling panels for uncontrolled navigation. ([41114](https://github.com/WordPress/gutenberg/pull/41114))
+-   DOM: Allow copying text from non-text input elements. ([40192](https://github.com/WordPress/gutenberg/pull/40192))
+-   DOM: Deprecate `isNumberInput` and fix its handling of value=0. ([40896](https://github.com/WordPress/gutenberg/pull/40896))
+-   FlatTermSelector: Avoid errors when returned terms aren't iterable. ([41099](https://github.com/WordPress/gutenberg/pull/41099))
+-   Provide translators comment for Font size and Letter Case. ([40879](https://github.com/WordPress/gutenberg/pull/40879))
+
+#### Block Library
+
+-   BorderControl: Fix focus styling. ([40951](https://github.com/WordPress/gutenberg/pull/40951))
+-   Add missing "type" to the search field on the editor. ([40782](https://github.com/WordPress/gutenberg/pull/40782))
+-   Comments Title
+    -   Fix post title translation. ([40972](https://github.com/WordPress/gutenberg/pull/40972))
+    -   Make non-editable. ([40817](https://github.com/WordPress/gutenberg/pull/40817))
+-   Cover: Update background type when using featured image. ([40873](https://github.com/WordPress/gutenberg/pull/40873))
+-   Fix Comments Form Title text alignment. ([40795](https://github.com/WordPress/gutenberg/pull/40795))
+-   Fix external styles leaking into Warning component. ([40868](https://github.com/WordPress/gutenberg/pull/40868))
+-   Image Editor: Remove HTML from error messages. ([40812](https://github.com/WordPress/gutenberg/pull/40812))
+-   Post Comments Block: Allow placeholders to reorder items in translations. ([40849](https://github.com/WordPress/gutenberg/pull/40849))
+-   Post Comments: Fix invalid date format in placeholder. ([40929](https://github.com/WordPress/gutenberg/pull/40929))
+-   Quote: Fix the embed discovery. ([41134](https://github.com/WordPress/gutenberg/pull/41134))
+-   Return immediately from Avatar block's render_callback if `$comment` is null. ([40835](https://github.com/WordPress/gutenberg/pull/40835))
+-   Use `get_the_post_thumbnail` function in the cover block.. ([40853](https://github.com/WordPress/gutenberg/pull/40853))
+-   List v2
+    -   Fix outdent on empty list item if we press enter. ([40939](https://github.com/WordPress/gutenberg/pull/40939))
+    -   Focus new list item added from sibling inserter. ([41051](https://github.com/WordPress/gutenberg/pull/41051))
+    -   Fixes an issue where pressing enter deletes innerblocks. ([41109](https://github.com/WordPress/gutenberg/pull/41109))
+-   CircularOptionPicker: Fix focused styles. ([40990](https://github.com/WordPress/gutenberg/pull/40990))
+-   Gallery block
+    -   Fix bug with initial image size. ([41079](https://github.com/WordPress/gutenberg/pull/41079))
+    -   Include image caption when converting a classic block gallery. ([40872](https://github.com/WordPress/gutenberg/pull/40872))
+-   Post Author block: Hide select author controle if there is no postId. ([40910](https://github.com/WordPress/gutenberg/pull/40910))
 
 #### Site Editor
-- Avoid previous content flash when a new template is created. ([40841](https://github.com/WordPress/gutenberg/pull/40841))
-- Decode entities in the site title. ([40956](https://github.com/WordPress/gutenberg/pull/40956))
-- Fix opinionated block styles loading in editor. ([40937](https://github.com/WordPress/gutenberg/pull/40937))
-- Post Comments: Fix Older/Newer comments links styling. ([40948](https://github.com/WordPress/gutenberg/pull/40948))
-- Template List: Fix word break for the 'Added by' column. ([40959](https://github.com/WordPress/gutenberg/pull/40959))
-- Template editor: Show the inserter if the template part is empty. ([41024](https://github.com/WordPress/gutenberg/pull/41024))
+
+-   Avoid previous content flash when a new template is created. ([40841](https://github.com/WordPress/gutenberg/pull/40841))
+-   Decode entities in the site title. ([40956](https://github.com/WordPress/gutenberg/pull/40956))
+-   Fix opinionated block styles loading in editor. ([40937](https://github.com/WordPress/gutenberg/pull/40937))
+-   Post Comments: Fix Older/Newer comments links styling. ([40948](https://github.com/WordPress/gutenberg/pull/40948))
+-   Template List: Fix word break for the 'Added by' column. ([40959](https://github.com/WordPress/gutenberg/pull/40959))
+-   Template editor: Show the inserter if the template part is empty. ([41024](https://github.com/WordPress/gutenberg/pull/41024))
 
 #### Accessibility
-- Prevent navigation on URL input suggestion selection via enter key. ([40906](https://github.com/WordPress/gutenberg/pull/40906))
-- Table block: Fix focus loss after Create Table button is selected. ([40399](https://github.com/WordPress/gutenberg/pull/40399))
-- Block Library - Latest Posts: Prevent opening the links in editor. ([40593](https://github.com/WordPress/gutenberg/pull/40593))
+
+-   Prevent navigation on URL input suggestion selection via enter key. ([40906](https://github.com/WordPress/gutenberg/pull/40906))
+-   Table block: Fix focus loss after Create Table button is selected. ([40399](https://github.com/WordPress/gutenberg/pull/40399))
+-   Block Library - Latest Posts: Prevent opening the links in editor. ([40593](https://github.com/WordPress/gutenberg/pull/40593))
 
 #### Global Styles
-- Fix: Global Styles are always resettable. ([40887](https://github.com/WordPress/gutenberg/pull/40887))
-- Fix: Global Styles: Impossible to open welcome guide if global styles are empty. ([40888](https://github.com/WordPress/gutenberg/pull/40888))
-- Site editor: Preset custom color duplicates. ([40837](https://github.com/WordPress/gutenberg/pull/40837))
-- Reduce active tab accent weight. ([40998](https://github.com/WordPress/gutenberg/pull/40998))
+
+-   Fix: Global Styles are always resettable. ([40887](https://github.com/WordPress/gutenberg/pull/40887))
+-   Fix: Global Styles: Impossible to open welcome guide if global styles are empty. ([40888](https://github.com/WordPress/gutenberg/pull/40888))
+-   Site editor: Preset custom color duplicates. ([40837](https://github.com/WordPress/gutenberg/pull/40837))
+-   Reduce active tab accent weight. ([40998](https://github.com/WordPress/gutenberg/pull/40998))
 
 #### Post Editor
-- Fix typo in the test description didPostSaveRequestSucceed. ([41064](https://github.com/WordPress/gutenberg/pull/41064))
-- Post saved draft button: Overwrite default button component margin. ([40834](https://github.com/WordPress/gutenberg/pull/40834))
+
+-   Fix typo in the test description didPostSaveRequestSucceed. ([41064](https://github.com/WordPress/gutenberg/pull/41064))
+-   Post saved draft button: Overwrite default button component margin. ([40834](https://github.com/WordPress/gutenberg/pull/40834))
 
 #### Themes
-- Theme Export: Use a better method to determine the theme name. ([40829](https://github.com/WordPress/gutenberg/pull/40829))
-- Theme Export: Use basename when determining the theme slug. ([41058](https://github.com/WordPress/gutenberg/pull/41058))
+
+-   Theme Export: Use a better method to determine the theme name. ([40829](https://github.com/WordPress/gutenberg/pull/40829))
+-   Theme Export: Use basename when determining the theme slug. ([41058](https://github.com/WordPress/gutenberg/pull/41058))
 
 #### Template Editor
-- Create single template via site editor if not existing. ([40830](https://github.com/WordPress/gutenberg/pull/40830))
-- Templates: Only allow renaming user-created and non-default templates. ([40881](https://github.com/WordPress/gutenberg/pull/40881))
+
+-   Create single template via site editor if not existing. ([40830](https://github.com/WordPress/gutenberg/pull/40830))
+-   Templates: Only allow renaming user-created and non-default templates. ([40881](https://github.com/WordPress/gutenberg/pull/40881))
 
 #### Components
-- Fix Storybook builds. ([41089](https://github.com/WordPress/gutenberg/pull/41089))
+
+-   Fix Storybook builds. ([41089](https://github.com/WordPress/gutenberg/pull/41089))
 
 #### Design Tools
-- Layout: Remove double output of align-items in horizontal layouts. ([41018](https://github.com/WordPress/gutenberg/pull/41018))
+
+-   Layout: Remove double output of align-items in horizontal layouts. ([41018](https://github.com/WordPress/gutenberg/pull/41018))
 
 #### Code Editor
-- Fix save shortcut. ([40848](https://github.com/WordPress/gutenberg/pull/40848))
+
+-   Fix save shortcut. ([40848](https://github.com/WordPress/gutenberg/pull/40848))
 
 #### Global Styles
-- Theme Json: Don't output double selectors for elements inside blocks. ([40889](https://github.com/WordPress/gutenberg/pull/40889))
 
+-   Theme Json: Don't output double selectors for elements inside blocks. ([40889](https://github.com/WordPress/gutenberg/pull/40889))
 
 ### Performance
 
 #### Block Library
-- Ensure that post thumbnail is cached in latest post block. ([40571](https://github.com/WordPress/gutenberg/pull/40571))
-- Ensure that post thumbnail is cached in post template block. ([40572](https://github.com/WordPress/gutenberg/pull/40572))
-- Navigation link: Prime caches for all posts in menu items. ([40752](https://github.com/WordPress/gutenberg/pull/40752))
-- useShortCodeTransform: Fetch media data in single request. ([40945](https://github.com/WordPress/gutenberg/pull/40945))
-- Update the block overlay to rely on useDisabled hook. ([40649](https://github.com/WordPress/gutenberg/pull/40649))
 
+-   Ensure that post thumbnail is cached in latest post block. ([40571](https://github.com/WordPress/gutenberg/pull/40571))
+-   Ensure that post thumbnail is cached in post template block. ([40572](https://github.com/WordPress/gutenberg/pull/40572))
+-   Navigation link: Prime caches for all posts in menu items. ([40752](https://github.com/WordPress/gutenberg/pull/40752))
+-   useShortCodeTransform: Fetch media data in single request. ([40945](https://github.com/WordPress/gutenberg/pull/40945))
+-   Update the block overlay to rely on useDisabled hook. ([40649](https://github.com/WordPress/gutenberg/pull/40649))
 
 ### Experiments
 
-- Style Engine: Add typography and color to frontend. ([40665](https://github.com/WordPress/gutenberg/pull/40665))
-- Add: Raw handling to the new list block. ([39954](https://github.com/WordPress/gutenberg/pull/39954))
+-   Style Engine: Add typography and color to frontend. ([40665](https://github.com/WordPress/gutenberg/pull/40665))
+-   Add: Raw handling to the new list block. ([39954](https://github.com/WordPress/gutenberg/pull/39954))
 
 #### Block Library
-- List v2
-   - Indent multiple list items. ([40991](https://github.com/WordPress/gutenberg/pull/40991))
-   - Outdent list item when pressing `Backspace` at the start. ([40962](https://github.com/WordPress/gutenberg/pull/40962))
-- ToC block
-    - Re-enable + use static markup and only support core Heading and Page Break blocks. ([29739](https://github.com/WordPress/gutenberg/pull/29739))
-    - Mark Table of Contents block as experimental using `block.json` flag. ([40905](https://github.com/WordPress/gutenberg/pull/40905))
+
+-   List v2
+    -   Indent multiple list items. ([40991](https://github.com/WordPress/gutenberg/pull/40991))
+    -   Outdent list item when pressing `Backspace` at the start. ([40962](https://github.com/WordPress/gutenberg/pull/40962))
+-   ToC block
+    -   Re-enable + use static markup and only support core Heading and Page Break blocks. ([29739](https://github.com/WordPress/gutenberg/pull/29739))
+    -   Mark Table of Contents block as experimental using `block.json` flag. ([40905](https://github.com/WordPress/gutenberg/pull/40905))
 
 #### Data Layer
-- Add suspense support to the data module. ([37261](https://github.com/WordPress/gutenberg/pull/37261))
+
+-   Add suspense support to the data module. ([37261](https://github.com/WordPress/gutenberg/pull/37261))
 
 ### Documentation
 
-- Add "How To Get Your Pull Request Reviewed?" to developer handbook. ([40589](https://github.com/WordPress/gutenberg/pull/40589))
-- Add link to npm release details to the release documentation. ([40867](https://github.com/WordPress/gutenberg/pull/40867))
-- Corrected the order in the code tabs. ([40569](https://github.com/WordPress/gutenberg/pull/40569))
-- Docs: Git.io deprecation - Replace links. ([40734](https://github.com/WordPress/gutenberg/pull/40734))
-- Document useEntityRecord/s in README.md and CHANGELOG.md. ([40932](https://github.com/WordPress/gutenberg/pull/40932))
-- Fix typo in `Panel` readme. ([41111](https://github.com/WordPress/gutenberg/pull/41111))
-- Remove mid-paragraph line breaks from 2-building-a-list-of-pages.md markdown. ([41025](https://github.com/WordPress/gutenberg/pull/41025))
-- Typo - enqueue to enqueued. ([40880](https://github.com/WordPress/gutenberg/pull/40880))
-- Update broken links. ([41071](https://github.com/WordPress/gutenberg/pull/41071))
-- [Gutenberg Data Tutorial] Part 4: Building a new record form. ([39261](https://github.com/WordPress/gutenberg/pull/39261))
+-   Add "How To Get Your Pull Request Reviewed?" to developer handbook. ([40589](https://github.com/WordPress/gutenberg/pull/40589))
+-   Add link to npm release details to the release documentation. ([40867](https://github.com/WordPress/gutenberg/pull/40867))
+-   Corrected the order in the code tabs. ([40569](https://github.com/WordPress/gutenberg/pull/40569))
+-   Docs: Git.io deprecation - Replace links. ([40734](https://github.com/WordPress/gutenberg/pull/40734))
+-   Document useEntityRecord/s in README.md and CHANGELOG.md. ([40932](https://github.com/WordPress/gutenberg/pull/40932))
+-   Fix typo in `Panel` readme. ([41111](https://github.com/WordPress/gutenberg/pull/41111))
+-   Remove mid-paragraph line breaks from 2-building-a-list-of-pages.md markdown. ([41025](https://github.com/WordPress/gutenberg/pull/41025))
+-   Typo - enqueue to enqueued. ([40880](https://github.com/WordPress/gutenberg/pull/40880))
+-   Update broken links. ([41071](https://github.com/WordPress/gutenberg/pull/41071))
+-   [Gutenberg Data Tutorial] Part 4: Building a new record form. ([39261](https://github.com/WordPress/gutenberg/pull/39261))
 
 #### Components
-- Use TypeScript and controls for `DateTimePicker`'s stories. ([40986](https://github.com/WordPress/gutenberg/pull/40986))
+
+-   Use TypeScript and controls for `DateTimePicker`'s stories. ([40986](https://github.com/WordPress/gutenberg/pull/40986))
 
 ### Code Quality
 
-- Convert core-data selectors from jsDoc annotations into TypeScript type signatures. ([40025](https://github.com/WordPress/gutenberg/pull/40025))
-- Dependency extraction
-    - Improve calculation of contentHash. ([40930](https://github.com/WordPress/gutenberg/pull/40930))
-    - Respect hashDigestLength option for version field. ([40977](https://github.com/WordPress/gutenberg/pull/40977))
-- Improve function name for finding navigation links that use the featured image. ([40904](https://github.com/WordPress/gutenberg/pull/40904))
-- Interface: Fix deprecation messages. ([40825](https://github.com/WordPress/gutenberg/pull/40825))
-- Make the useDisabled hook stable. ([40890](https://github.com/WordPress/gutenberg/pull/40890))
-- Packages [Dependency Extraction Webpack Plugin]: Add new line at the end of *.assets.php. ([40753](https://github.com/WordPress/gutenberg/pull/40753))
-- Remove unreachable inserter component. ([41103](https://github.com/WordPress/gutenberg/pull/41103))
-- Styles hook: Swap out lodash methods with their JS equivalents. ([40918](https://github.com/WordPress/gutenberg/pull/40918))
-- Update react-resize-aware with use-resize-observer. ([40509](https://github.com/WordPress/gutenberg/pull/40509))
-- useRefEffect: Replace undefined with void in callback return type. ([40798](https://github.com/WordPress/gutenberg/pull/40798))
-- Remove Flyout leftovers. ([41129](https://github.com/WordPress/gutenberg/pull/41129))
-- Send registered patterns in HTML and combine them with REST ones. ([40818](https://github.com/WordPress/gutenberg/pull/40818))
-- Refactor the Popover component to use the floatingUI library. ([40740](https://github.com/WordPress/gutenberg/pull/40740))
-- Table of Contents block: Remove editor-only wrapper `<div>`. ([40899](https://github.com/WordPress/gutenberg/pull/40899))
-- Color Controls: Merge color dropdown components. ([40084](https://github.com/WordPress/gutenberg/pull/40084))
-
-#### Block Library
-- Cover:
-    - Refactor controls. ([40832](https://github.com/WordPress/gutenberg/pull/40832))
-    - Correct resizeable spelling to US resizable. ([41100](https://github.com/WordPress/gutenberg/pull/41100))
-- Post Terms:
-    - Add wp_kses_post to prefix/suffix for consistency. ([40803](https://github.com/WordPress/gutenberg/pull/40803))
-    - Post Terms: Insert defaultBlock on suffix end split. ([40934](https://github.com/WordPress/gutenberg/pull/40934))
-- Replace hardcoded core/paragraph with getDefaultBlockName in onSplitAtEnd callbacks. ([40954](https://github.com/WordPress/gutenberg/pull/40954))
-- Query Loop: Move sticky control to separate file. ([41101](https://github.com/WordPress/gutenberg/pull/41101))
-- Search Block: Remove id attribute from svg. ([40828](https://github.com/WordPress/gutenberg/pull/40828))
-- ButtonGroup: Convert to TypeScript. ([41007](https://github.com/WordPress/gutenberg/pull/41007))
-
-#### Components
-- Add jest-console typings and convert DateTimePicker tests to TypeScript. ([40957](https://github.com/WordPress/gutenberg/pull/40957))
-- Rewrite DatePicker, TimePicker and DateTimePicker in TypeScript. ([40775](https://github.com/WordPress/gutenberg/pull/40775))
-- Update `react-dates` to 21.8.0. ([40801](https://github.com/WordPress/gutenberg/pull/40801))
-- Stabilize useEntityRecord and useEntityRecords. ([40162](https://github.com/WordPress/gutenberg/pull/40162))
-- CheckboxControl: Convert component to TypeScript. ([40915](https://github.com/WordPress/gutenberg/pull/40915))
+-   Convert core-data selectors from jsDoc annotations into TypeScript type signatures. ([40025](https://github.com/WordPress/gutenberg/pull/40025))
+-   Dependency extraction
+    -   Improve calculation of contentHash. ([40930](https://github.com/WordPress/gutenberg/pull/40930))
+    -   Respect hashDigestLength option for version field. ([40977](https://github.com/WordPress/gutenberg/pull/40977))
+-   Improve function name for finding navigation links that use the featured image. ([40904](https://github.com/WordPress/gutenberg/pull/40904))
+-   Interface: Fix deprecation messages. ([40825](https://github.com/WordPress/gutenberg/pull/40825))
+-   Make the useDisabled hook stable. ([40890](https://github.com/WordPress/gutenberg/pull/40890))
+-   Packages [Dependency Extraction Webpack Plugin]: Add new line at the end of \*.assets.php. ([40753](https://github.com/WordPress/gutenberg/pull/40753))
+-   Remove unreachable inserter component. ([41103](https://github.com/WordPress/gutenberg/pull/41103))
+-   Styles hook: Swap out lodash methods with their JS equivalents. ([40918](https://github.com/WordPress/gutenberg/pull/40918))
+-   Update react-resize-aware with use-resize-observer. ([40509](https://github.com/WordPress/gutenberg/pull/40509))
+-   useRefEffect: Replace undefined with void in callback return type. ([40798](https://github.com/WordPress/gutenberg/pull/40798))
+-   Remove Flyout leftovers. ([41129](https://github.com/WordPress/gutenberg/pull/41129))
+-   Send registered patterns in HTML and combine them with REST ones. ([40818](https://github.com/WordPress/gutenberg/pull/40818))
+-   Refactor the Popover component to use the floatingUI library. ([40740](https://github.com/WordPress/gutenberg/pull/40740))
+-   Table of Contents block: Remove editor-only wrapper `<div>`. ([40899](https://github.com/WordPress/gutenberg/pull/40899))
+-   Color Controls: Merge color dropdown components. ([40084](https://github.com/WordPress/gutenberg/pull/40084))
+
+#### Block Library
+
+-   Cover:
+    -   Refactor controls. ([40832](https://github.com/WordPress/gutenberg/pull/40832))
+    -   Correct resizeable spelling to US resizable. ([41100](https://github.com/WordPress/gutenberg/pull/41100))
+-   Post Terms:
+    -   Add wp_kses_post to prefix/suffix for consistency. ([40803](https://github.com/WordPress/gutenberg/pull/40803))
+    -   Post Terms: Insert defaultBlock on suffix end split. ([40934](https://github.com/WordPress/gutenberg/pull/40934))
+-   Replace hardcoded core/paragraph with getDefaultBlockName in onSplitAtEnd callbacks. ([40954](https://github.com/WordPress/gutenberg/pull/40954))
+-   Query Loop: Move sticky control to separate file. ([41101](https://github.com/WordPress/gutenberg/pull/41101))
+-   Search Block: Remove id attribute from svg. ([40828](https://github.com/WordPress/gutenberg/pull/40828))
+-   ButtonGroup: Convert to TypeScript. ([41007](https://github.com/WordPress/gutenberg/pull/41007))
+
+#### Components
+
+-   Add jest-console typings and convert DateTimePicker tests to TypeScript. ([40957](https://github.com/WordPress/gutenberg/pull/40957))
+-   Rewrite DatePicker, TimePicker and DateTimePicker in TypeScript. ([40775](https://github.com/WordPress/gutenberg/pull/40775))
+-   Update `react-dates` to 21.8.0. ([40801](https://github.com/WordPress/gutenberg/pull/40801))
+-   Stabilize useEntityRecord and useEntityRecords. ([40162](https://github.com/WordPress/gutenberg/pull/40162))
+-   CheckboxControl: Convert component to TypeScript. ([40915](https://github.com/WordPress/gutenberg/pull/40915))
 
 #### Plugin
-- Declare blocks as __experimental in block.json to automate syncing Gutenberg packages to WordPress. ([40655](https://github.com/WordPress/gutenberg/pull/40655))
-- Tools: Improve configuration for formatting files. ([40994](https://github.com/WordPress/gutenberg/pull/40994))
-- Packages: Add command to publish to npm targeting WP major release. ([40927](https://github.com/WordPress/gutenberg/pull/40927))
+
+-   Declare blocks as \_\_experimental in block.json to automate syncing Gutenberg packages to WordPress. ([40655](https://github.com/WordPress/gutenberg/pull/40655))
+-   Tools: Improve configuration for formatting files. ([40994](https://github.com/WordPress/gutenberg/pull/40994))
+-   Packages: Add command to publish to npm targeting WP major release. ([40927](https://github.com/WordPress/gutenberg/pull/40927))
 
 #### Code Editor
-- Don't commit 'non-dirty' changes. ([41092](https://github.com/WordPress/gutenberg/pull/41092))
+
+-   Don't commit 'non-dirty' changes. ([41092](https://github.com/WordPress/gutenberg/pull/41092))
 
 #### Media
-- Media Utils: Don't convert error messages into an array. ([39448](https://github.com/WordPress/gutenberg/pull/39448))
+
+-   Media Utils: Don't convert error messages into an array. ([39448](https://github.com/WordPress/gutenberg/pull/39448))
 
 #### Block Editor
-- Add constants for link entry types. ([36490](https://github.com/WordPress/gutenberg/pull/36490))
+
+-   Add constants for link entry types. ([36490](https://github.com/WordPress/gutenberg/pull/36490))
 
 #### Post Editor
-- DevicePreview: Remove unnecessary div tag. ([40911](https://github.com/WordPress/gutenberg/pull/40911))
+
+-   DevicePreview: Remove unnecessary div tag. ([40911](https://github.com/WordPress/gutenberg/pull/40911))
 
 ### Tools
 
-- Fix pull-request-automation CI check (temporarily until an upstream fix lands). ([41044](https://github.com/WordPress/gutenberg/pull/41044))
-- Update package-lock.json. ([41045](https://github.com/WordPress/gutenberg/pull/41045))
-- env :: Support ssh protocol for github repos. ([40451](https://github.com/WordPress/gutenberg/pull/40451))
-- Add @fabiankaegy as a code owner for the docs/ directory. ([41057](https://github.com/WordPress/gutenberg/pull/41057))
+-   Fix pull-request-automation CI check (temporarily until an upstream fix lands). ([41044](https://github.com/WordPress/gutenberg/pull/41044))
+-   Update package-lock.json. ([41045](https://github.com/WordPress/gutenberg/pull/41045))
+-   env :: Support ssh protocol for github repos. ([40451](https://github.com/WordPress/gutenberg/pull/40451))
+-   Add @fabiankaegy as a code owner for the docs/ directory. ([41057](https://github.com/WordPress/gutenberg/pull/41057))
 
 #### Testing
-- Add eslint warning about use of waitForTimeout to playwright eslint. ([40802](https://github.com/WordPress/gutenberg/pull/40802))
-- Comment Template: Reorganize block tests to ease backport process. ([40739](https://github.com/WordPress/gutenberg/pull/40739))
-- Fix: Env unit test fails on Windows. ([41070](https://github.com/WordPress/gutenberg/pull/41070))
-- Migrate 'block-locking' to Playwright. ([41050](https://github.com/WordPress/gutenberg/pull/41050))
-- Migrate and refactor image block end-to-end tests to Playwright. ([40804](https://github.com/WordPress/gutenberg/pull/40804))
-- Migrated popovers.test.js to Playwright. ([39910](https://github.com/WordPress/gutenberg/pull/39910))
-- Reorganize playwright utils and make canvas utils usable in the site editor. ([40815](https://github.com/WordPress/gutenberg/pull/40815))
-- Setup user-event inline once per test. ([40839](https://github.com/WordPress/gutenberg/pull/40839))
-- Test block insertion after title post blur. ([32944](https://github.com/WordPress/gutenberg/pull/32944))
-- Tests: Remove comment template unit tests. ([40965](https://github.com/WordPress/gutenberg/pull/40965))
-- useSelect: Add unit tests for usage without deps. ([40732](https://github.com/WordPress/gutenberg/pull/40732))
+
+-   Add eslint warning about use of waitForTimeout to playwright eslint. ([40802](https://github.com/WordPress/gutenberg/pull/40802))
+-   Comment Template: Reorganize block tests to ease backport process. ([40739](https://github.com/WordPress/gutenberg/pull/40739))
+-   Fix: Env unit test fails on Windows. ([41070](https://github.com/WordPress/gutenberg/pull/41070))
+-   Migrate 'block-locking' to Playwright. ([41050](https://github.com/WordPress/gutenberg/pull/41050))
+-   Migrate and refactor image block end-to-end tests to Playwright. ([40804](https://github.com/WordPress/gutenberg/pull/40804))
+-   Migrated popovers.test.js to Playwright. ([39910](https://github.com/WordPress/gutenberg/pull/39910))
+-   Reorganize playwright utils and make canvas utils usable in the site editor. ([40815](https://github.com/WordPress/gutenberg/pull/40815))
+-   Setup user-event inline once per test. ([40839](https://github.com/WordPress/gutenberg/pull/40839))
+-   Test block insertion after title post blur. ([32944](https://github.com/WordPress/gutenberg/pull/32944))
+-   Tests: Remove comment template unit tests. ([40965](https://github.com/WordPress/gutenberg/pull/40965))
+-   useSelect: Add unit tests for usage without deps. ([40732](https://github.com/WordPress/gutenberg/pull/40732))
 
 #### npm Packages
-- Packages: Add GitHub workflow for publishing to npm. ([40976](https://github.com/WordPress/gutenberg/pull/40976))
-- Packages: Add more npm release types to the GitHub workflow. ([41046](https://github.com/WordPress/gutenberg/pull/41046))
 
+-   Packages: Add GitHub workflow for publishing to npm. ([40976](https://github.com/WordPress/gutenberg/pull/40976))
+-   Packages: Add more npm release types to the GitHub workflow. ([41046](https://github.com/WordPress/gutenberg/pull/41046))
 
 #### Block Library
-- Heading block - add font family support. ([40970](https://github.com/WordPress/gutenberg/pull/40970))
-- Only allow template part to be replaced if its a header or footer. ([40787](https://github.com/WordPress/gutenberg/pull/40787))
-- Try a single icon for title blocks. ([40596](https://github.com/WordPress/gutenberg/pull/40596))
-
 
+-   Heading block - add font family support. ([40970](https://github.com/WordPress/gutenberg/pull/40970))
+-   Only allow template part to be replaced if its a header or footer. ([40787](https://github.com/WordPress/gutenberg/pull/40787))
+-   Try a single icon for title blocks. ([40596](https://github.com/WordPress/gutenberg/pull/40596))
 
 ## First-time contributors
 
 The following PRs were merged by first-time contributors:
 
-- @anomiex: dependency-extraction-webpack-plugin: Calculate vendor hash from file output rather than Webpack internal state. ([34969](https://github.com/WordPress/gutenberg/pull/34969))
-- @damiencarbery: Typo - enqueue to enqueued. ([40880](https://github.com/WordPress/gutenberg/pull/40880))
-- @JessicaGosselin: Fix typo in `Panel` readme. ([41111](https://github.com/WordPress/gutenberg/pull/41111))
-- @luminuu: Create single template via site editor if not existing. ([40830](https://github.com/WordPress/gutenberg/pull/40830))
-- @n3f: env :: Support ssh protocol for github repos. ([40451](https://github.com/WordPress/gutenberg/pull/40451))
-- @SavPhill: Update broken links. ([41071](https://github.com/WordPress/gutenberg/pull/41071))
-- @shanjidah: Migrated popovers.test.js to Playwright. ([39910](https://github.com/WordPress/gutenberg/pull/39910))
-- @tomjdv: Corrected the order in the code tabs. ([40569](https://github.com/WordPress/gutenberg/pull/40569))
-
+-   @anomiex: dependency-extraction-webpack-plugin: Calculate vendor hash from file output rather than Webpack internal state. ([34969](https://github.com/WordPress/gutenberg/pull/34969))
+-   @damiencarbery: Typo - enqueue to enqueued. ([40880](https://github.com/WordPress/gutenberg/pull/40880))
+-   @JessicaGosselin: Fix typo in `Panel` readme. ([41111](https://github.com/WordPress/gutenberg/pull/41111))
+-   @luminuu: Create single template via site editor if not existing. ([40830](https://github.com/WordPress/gutenberg/pull/40830))
+-   @n3f: env :: Support ssh protocol for github repos. ([40451](https://github.com/WordPress/gutenberg/pull/40451))
+-   @SavPhill: Update broken links. ([41071](https://github.com/WordPress/gutenberg/pull/41071))
+-   @shanjidah: Migrated popovers.test.js to Playwright. ([39910](https://github.com/WordPress/gutenberg/pull/39910))
+-   @tomjdv: Corrected the order in the code tabs. ([40569](https://github.com/WordPress/gutenberg/pull/40569))
 
 ## Contributors
 
@@ -15201,17 +26655,15 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @Addison-Stavlo @alexstine @amustaque97 @andrewserong @anomiex @aristath @c4rl0sbr4v0 @carolinan @ciampo @damiencarbery @DAreRodz @dcalhoun @draganescu @fabiankaegy @fluiddot @geriux @getdave @glendaviesnz @gziolo @jameskoster @JessicaGosselin @jffng @jhnstn @jorgefilipecosta @jostnes @jsnajdr @kevin940726 @luisherranz @luminuu @Mamaduka @mauriac @mchowning @mcsf @michalczaplinski @mikachan @n3f @noisysocks @ntsekouras @ockham @ramonjd @SavPhill @scruffian @shanjidah @SiobhyB @Soean @spacedmonkey @t-hamano @talldan @tomasztunik @tomjdv @walbo @youknowriad @ZebulanStanphill
 
-
 = 13.2.2 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Block Library
-- Blocks: Don't abort registering blocks when a missing block file is found. ([41122](https://github.com/WordPress/gutenberg/pull/41122))
+
+-   Blocks: Don't abort registering blocks when a missing block file is found. ([41122](https://github.com/WordPress/gutenberg/pull/41122))
 
 ## Contributors
 
@@ -15219,270 +26671,294 @@ The following contributors merged PRs in this release:
 
 @dd32
 
-
 = 13.3.0-rc.1 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
-- Avoid persisting preference every time the sidebar tab is changed. ([40923](https://github.com/WordPress/gutenberg/pull/40923))
-- Editor preferences: Update order and copy. ([40981](https://github.com/WordPress/gutenberg/pull/40981))
-- Update the block overlay to rely on useDisabled hook. ([40649](https://github.com/WordPress/gutenberg/pull/40649))
-- dependency-extraction-webpack-plugin: Calculate vendor hash from file output rather than Webpack internal state. ([34969](https://github.com/WordPress/gutenberg/pull/34969))
+-   Avoid persisting preference every time the sidebar tab is changed. ([40923](https://github.com/WordPress/gutenberg/pull/40923))
+-   Editor preferences: Update order and copy. ([40981](https://github.com/WordPress/gutenberg/pull/40981))
+-   Update the block overlay to rely on useDisabled hook. ([40649](https://github.com/WordPress/gutenberg/pull/40649))
+-   dependency-extraction-webpack-plugin: Calculate vendor hash from file output rather than Webpack internal state. ([34969](https://github.com/WordPress/gutenberg/pull/34969))
 
 #### Components
-- BorderControl: Fix focus styling. ([40951](https://github.com/WordPress/gutenberg/pull/40951))
-- BorderControl: Make border color consistent with other controls. ([40921](https://github.com/WordPress/gutenberg/pull/40921))
-- BorderControl: Make height consistent with other controls. ([40920](https://github.com/WordPress/gutenberg/pull/40920))
-- BorderControl: Make reset to default button only display when required. ([40917](https://github.com/WordPress/gutenberg/pull/40917))
-- ButtonGroup: Convert to TypeScript. ([41007](https://github.com/WordPress/gutenberg/pull/41007))
-- CheckboxControl: Convert component to TypeScript. ([40915](https://github.com/WordPress/gutenberg/pull/40915))
-- CircularOptionPicker: Fix focused styles. ([40990](https://github.com/WordPress/gutenberg/pull/40990))
-- Refactor the Popover component to use the floatingUI library. ([40740](https://github.com/WordPress/gutenberg/pull/40740))
+
+-   BorderControl: Fix focus styling. ([40951](https://github.com/WordPress/gutenberg/pull/40951))
+-   BorderControl: Make border color consistent with other controls. ([40921](https://github.com/WordPress/gutenberg/pull/40921))
+-   BorderControl: Make height consistent with other controls. ([40920](https://github.com/WordPress/gutenberg/pull/40920))
+-   BorderControl: Make reset to default button only display when required. ([40917](https://github.com/WordPress/gutenberg/pull/40917))
+-   ButtonGroup: Convert to TypeScript. ([41007](https://github.com/WordPress/gutenberg/pull/41007))
+-   CheckboxControl: Convert component to TypeScript. ([40915](https://github.com/WordPress/gutenberg/pull/40915))
+-   CircularOptionPicker: Fix focused styles. ([40990](https://github.com/WordPress/gutenberg/pull/40990))
+-   Refactor the Popover component to use the floatingUI library. ([40740](https://github.com/WordPress/gutenberg/pull/40740))
 
 #### Block Library
-- Add an explicit error message if an image block fails to load the image. ([40982](https://github.com/WordPress/gutenberg/pull/40982))
-- Add transform between cover and media & text. ([38458](https://github.com/WordPress/gutenberg/pull/38458))
-- Post Terms: Add dynamic variations of custom taxonomies. ([39837](https://github.com/WordPress/gutenberg/pull/39837))
-- Query Loop: Add `parents` filter. ([40933](https://github.com/WordPress/gutenberg/pull/40933))
+
+-   Add an explicit error message if an image block fails to load the image. ([40982](https://github.com/WordPress/gutenberg/pull/40982))
+-   Add transform between cover and media & text. ([38458](https://github.com/WordPress/gutenberg/pull/38458))
+-   Post Terms: Add dynamic variations of custom taxonomies. ([39837](https://github.com/WordPress/gutenberg/pull/39837))
+-   Query Loop: Add `parents` filter. ([40933](https://github.com/WordPress/gutenberg/pull/40933))
 
 #### Design Tools
-- BorderRadiusControl: Add tooltips to split border radius controls. ([40983](https://github.com/WordPress/gutenberg/pull/40983))
-- Color Controls: Merge color dropdown components. ([40084](https://github.com/WordPress/gutenberg/pull/40084))
+
+-   BorderRadiusControl: Add tooltips to split border radius controls. ([40983](https://github.com/WordPress/gutenberg/pull/40983))
+-   Color Controls: Merge color dropdown components. ([40084](https://github.com/WordPress/gutenberg/pull/40084))
 
 #### CSS & Styling
-- BorderRadiusControl: Tweak spacing between input and range control to line up with BorderControl. ([40958](https://github.com/WordPress/gutenberg/pull/40958))
-- Table of Contents block: Remove editor-only wrapper `<div>`. ([40899](https://github.com/WordPress/gutenberg/pull/40899))
+
+-   BorderRadiusControl: Tweak spacing between input and range control to line up with BorderControl. ([40958](https://github.com/WordPress/gutenberg/pull/40958))
+-   Table of Contents block: Remove editor-only wrapper `<div>`. ([40899](https://github.com/WordPress/gutenberg/pull/40899))
 
 #### Template Editor
-- Use the label 'Clear customizations' when changes are revertable. ([40935](https://github.com/WordPress/gutenberg/pull/40935))
+
+-   Use the label 'Clear customizations' when changes are revertable. ([40935](https://github.com/WordPress/gutenberg/pull/40935))
 
 #### npm Packages
-- Packages: Add command to publish to npm targeting WP major release. ([40927](https://github.com/WordPress/gutenberg/pull/40927))
+
+-   Packages: Add command to publish to npm targeting WP major release. ([40927](https://github.com/WordPress/gutenberg/pull/40927))
 
 #### Post Editor
-- DevicePreview: Remove unnecessary div tag. ([40911](https://github.com/WordPress/gutenberg/pull/40911))
+
+-   DevicePreview: Remove unnecessary div tag. ([40911](https://github.com/WordPress/gutenberg/pull/40911))
 
 #### List View
-- Block list: Add option in editor settings to show open list view as default. ([40757](https://github.com/WordPress/gutenberg/pull/40757))
 
+-   Block list: Add option in editor settings to show open list view as default. ([40757](https://github.com/WordPress/gutenberg/pull/40757))
 
 ### Bug Fixes
 
-- Add missing styling panels for uncontrolled navigation. ([41114](https://github.com/WordPress/gutenberg/pull/41114))
-- DOM: Allow copying text from non-text input elements. ([40192](https://github.com/WordPress/gutenberg/pull/40192))
-- DOM: Deprecate `isNumberInput` and fix its handling of value=0. ([40896](https://github.com/WordPress/gutenberg/pull/40896))
-- Dependency Extraction Webpack Plugin: Use OpenSSL provider supported in Node 17+. ([40503](https://github.com/WordPress/gutenberg/pull/40503))
-- FlatTermSelector: Avoid errors when returned terms aren't iterable. ([41099](https://github.com/WordPress/gutenberg/pull/41099))
-- Provide translators comment for Font size and Letter Case. ([40879](https://github.com/WordPress/gutenberg/pull/40879))
-
-#### Block Library
-- Add missing "type" to the search field on the editor. ([40782](https://github.com/WordPress/gutenberg/pull/40782))
-- Comments Title: Fix post title translation. ([40972](https://github.com/WordPress/gutenberg/pull/40972))
-- Comments Title: Make non-editable. ([40817](https://github.com/WordPress/gutenberg/pull/40817))
-- Cover: Update background type when using featured image. ([40873](https://github.com/WordPress/gutenberg/pull/40873))
-- Fix Comments Form Title text alignment. ([40795](https://github.com/WordPress/gutenberg/pull/40795))
-- Fix external styles leaking into Warning component. ([40868](https://github.com/WordPress/gutenberg/pull/40868))
-- Image Editor: Remove HTML from error messages. ([40812](https://github.com/WordPress/gutenberg/pull/40812))
-- Post Comments Block: Allow placeholders to reorder items in translations. ([40849](https://github.com/WordPress/gutenberg/pull/40849))
-- Post Comments: Fix invalid date format in placeholder. ([40929](https://github.com/WordPress/gutenberg/pull/40929))
-- Quote: Fix the embed discovery. ([41134](https://github.com/WordPress/gutenberg/pull/41134))
-- Return immediately from Avatar block's render_callback if `$comment` is null. ([40835](https://github.com/WordPress/gutenberg/pull/40835))
-- Use `get_the_post_thumbnail` function in the cover block.. ([40853](https://github.com/WordPress/gutenberg/pull/40853))
-- List v2: Fix outdent on empty list item if we press enter. ([40939](https://github.com/WordPress/gutenberg/pull/40939))
-- List v2: Focus new list item added from sibling inserter. ([41051](https://github.com/WordPress/gutenberg/pull/41051))
-- List v2: Fixes an issue where pressing enter deletes innerblocks. ([41109](https://github.com/WordPress/gutenberg/pull/41109))
+-   Add missing styling panels for uncontrolled navigation. ([41114](https://github.com/WordPress/gutenberg/pull/41114))
+-   DOM: Allow copying text from non-text input elements. ([40192](https://github.com/WordPress/gutenberg/pull/40192))
+-   DOM: Deprecate `isNumberInput` and fix its handling of value=0. ([40896](https://github.com/WordPress/gutenberg/pull/40896))
+-   Dependency Extraction Webpack Plugin: Use OpenSSL provider supported in Node 17+. ([40503](https://github.com/WordPress/gutenberg/pull/40503))
+-   FlatTermSelector: Avoid errors when returned terms aren't iterable. ([41099](https://github.com/WordPress/gutenberg/pull/41099))
+-   Provide translators comment for Font size and Letter Case. ([40879](https://github.com/WordPress/gutenberg/pull/40879))
+
+#### Block Library
+
+-   Add missing "type" to the search field on the editor. ([40782](https://github.com/WordPress/gutenberg/pull/40782))
+-   Comments Title: Fix post title translation. ([40972](https://github.com/WordPress/gutenberg/pull/40972))
+-   Comments Title: Make non-editable. ([40817](https://github.com/WordPress/gutenberg/pull/40817))
+-   Cover: Update background type when using featured image. ([40873](https://github.com/WordPress/gutenberg/pull/40873))
+-   Fix Comments Form Title text alignment. ([40795](https://github.com/WordPress/gutenberg/pull/40795))
+-   Fix external styles leaking into Warning component. ([40868](https://github.com/WordPress/gutenberg/pull/40868))
+-   Image Editor: Remove HTML from error messages. ([40812](https://github.com/WordPress/gutenberg/pull/40812))
+-   Post Comments Block: Allow placeholders to reorder items in translations. ([40849](https://github.com/WordPress/gutenberg/pull/40849))
+-   Post Comments: Fix invalid date format in placeholder. ([40929](https://github.com/WordPress/gutenberg/pull/40929))
+-   Quote: Fix the embed discovery. ([41134](https://github.com/WordPress/gutenberg/pull/41134))
+-   Return immediately from Avatar block's render_callback if `$comment` is null. ([40835](https://github.com/WordPress/gutenberg/pull/40835))
+-   Use `get_the_post_thumbnail` function in the cover block.. ([40853](https://github.com/WordPress/gutenberg/pull/40853))
+-   List v2: Fix outdent on empty list item if we press enter. ([40939](https://github.com/WordPress/gutenberg/pull/40939))
+-   List v2: Focus new list item added from sibling inserter. ([41051](https://github.com/WordPress/gutenberg/pull/41051))
+-   List v2: Fixes an issue where pressing enter deletes innerblocks. ([41109](https://github.com/WordPress/gutenberg/pull/41109))
 
 #### Site Editor
-- Avoid previous content flash when a new template is created. ([40841](https://github.com/WordPress/gutenberg/pull/40841))
-- Decode entities in the site title. ([40956](https://github.com/WordPress/gutenberg/pull/40956))
-- Fix opinionated block styles loading in editor. ([40937](https://github.com/WordPress/gutenberg/pull/40937))
-- Post Comments: Fix Older/Newer comments links styling. ([40948](https://github.com/WordPress/gutenberg/pull/40948))
-- Template List: Fix word break for the 'Added by' column. ([40959](https://github.com/WordPress/gutenberg/pull/40959))
-- Template editor: Show the inserter if the template part is empty. ([41024](https://github.com/WordPress/gutenberg/pull/41024))
+
+-   Avoid previous content flash when a new template is created. ([40841](https://github.com/WordPress/gutenberg/pull/40841))
+-   Decode entities in the site title. ([40956](https://github.com/WordPress/gutenberg/pull/40956))
+-   Fix opinionated block styles loading in editor. ([40937](https://github.com/WordPress/gutenberg/pull/40937))
+-   Post Comments: Fix Older/Newer comments links styling. ([40948](https://github.com/WordPress/gutenberg/pull/40948))
+-   Template List: Fix word break for the 'Added by' column. ([40959](https://github.com/WordPress/gutenberg/pull/40959))
+-   Template editor: Show the inserter if the template part is empty. ([41024](https://github.com/WordPress/gutenberg/pull/41024))
 
 #### Accessibility
-- Prevent navigation on URL input suggestion selection via enter key. ([40906](https://github.com/WordPress/gutenberg/pull/40906))
-- Table block: Fix focus loss after Create Table button is selected. ([40399](https://github.com/WordPress/gutenberg/pull/40399))
-- Block Library - Latest Posts: Prevent opening the links in editor. ([40593](https://github.com/WordPress/gutenberg/pull/40593))
+
+-   Prevent navigation on URL input suggestion selection via enter key. ([40906](https://github.com/WordPress/gutenberg/pull/40906))
+-   Table block: Fix focus loss after Create Table button is selected. ([40399](https://github.com/WordPress/gutenberg/pull/40399))
+-   Block Library - Latest Posts: Prevent opening the links in editor. ([40593](https://github.com/WordPress/gutenberg/pull/40593))
 
 #### Global Styles
-- Fix: Global Styles are always resettable. ([40887](https://github.com/WordPress/gutenberg/pull/40887))
-- Fix: Global Styles: Impossible to open welcome guide if global styles are empty. ([40888](https://github.com/WordPress/gutenberg/pull/40888))
-- Site editor: Preset custom color duplicates. ([40837](https://github.com/WordPress/gutenberg/pull/40837))
-- Reduce active tab accent weight. ([40998](https://github.com/WordPress/gutenberg/pull/40998))
+
+-   Fix: Global Styles are always resettable. ([40887](https://github.com/WordPress/gutenberg/pull/40887))
+-   Fix: Global Styles: Impossible to open welcome guide if global styles are empty. ([40888](https://github.com/WordPress/gutenberg/pull/40888))
+-   Site editor: Preset custom color duplicates. ([40837](https://github.com/WordPress/gutenberg/pull/40837))
+-   Reduce active tab accent weight. ([40998](https://github.com/WordPress/gutenberg/pull/40998))
 
 #### Post Editor
-- Fix typo in the test description didPostSaveRequestSucceed. ([41064](https://github.com/WordPress/gutenberg/pull/41064))
-- Post saved draft button: Overwrite default button component margin. ([40834](https://github.com/WordPress/gutenberg/pull/40834))
+
+-   Fix typo in the test description didPostSaveRequestSucceed. ([41064](https://github.com/WordPress/gutenberg/pull/41064))
+-   Post saved draft button: Overwrite default button component margin. ([40834](https://github.com/WordPress/gutenberg/pull/40834))
 
 #### Themes
-- Theme Export: Use a better method to determine the theme name. ([40829](https://github.com/WordPress/gutenberg/pull/40829))
-- Theme Export: Use basename when determining the theme slug. ([41058](https://github.com/WordPress/gutenberg/pull/41058))
+
+-   Theme Export: Use a better method to determine the theme name. ([40829](https://github.com/WordPress/gutenberg/pull/40829))
+-   Theme Export: Use basename when determining the theme slug. ([41058](https://github.com/WordPress/gutenberg/pull/41058))
 
 #### Template Editor
-- Create single template via site editor if not existing. ([40830](https://github.com/WordPress/gutenberg/pull/40830))
-- Templates: Only allow renaming user-created and non-default templates. ([40881](https://github.com/WordPress/gutenberg/pull/40881))
+
+-   Create single template via site editor if not existing. ([40830](https://github.com/WordPress/gutenberg/pull/40830))
+-   Templates: Only allow renaming user-created and non-default templates. ([40881](https://github.com/WordPress/gutenberg/pull/40881))
 
 #### Components
-- Fix Storybook builds. ([41089](https://github.com/WordPress/gutenberg/pull/41089))
+
+-   Fix Storybook builds. ([41089](https://github.com/WordPress/gutenberg/pull/41089))
 
 #### Design Tools
-- Layout: Remove double output of align-items in horizontal layouts. ([41018](https://github.com/WordPress/gutenberg/pull/41018))
+
+-   Layout: Remove double output of align-items in horizontal layouts. ([41018](https://github.com/WordPress/gutenberg/pull/41018))
 
 #### Code Editor
-- Fix save shortcut. ([40848](https://github.com/WordPress/gutenberg/pull/40848))
 
+-   Fix save shortcut. ([40848](https://github.com/WordPress/gutenberg/pull/40848))
 
 ### Performance
 
 #### Block Library
-- Ensure that post thumbnail is cached in latest post block. ([40571](https://github.com/WordPress/gutenberg/pull/40571))
-- Ensure that post thumbnail is cached in post template block. ([40572](https://github.com/WordPress/gutenberg/pull/40572))
-- Navigation link: Prime caches for all posts in menu items. ([40752](https://github.com/WordPress/gutenberg/pull/40752))
-- useShortCodeTransform: Fetch media data in single request. ([40945](https://github.com/WordPress/gutenberg/pull/40945))
 
+-   Ensure that post thumbnail is cached in latest post block. ([40571](https://github.com/WordPress/gutenberg/pull/40571))
+-   Ensure that post thumbnail is cached in post template block. ([40572](https://github.com/WordPress/gutenberg/pull/40572))
+-   Navigation link: Prime caches for all posts in menu items. ([40752](https://github.com/WordPress/gutenberg/pull/40752))
+-   useShortCodeTransform: Fetch media data in single request. ([40945](https://github.com/WordPress/gutenberg/pull/40945))
 
 ### Experiments
 
-- Style Engine: Add typography and color to frontend. ([40665](https://github.com/WordPress/gutenberg/pull/40665))
+-   Style Engine: Add typography and color to frontend. ([40665](https://github.com/WordPress/gutenberg/pull/40665))
 
 #### Block Library
-- List v2: Indent multiple list items. ([40991](https://github.com/WordPress/gutenberg/pull/40991))
-- List v2: Outdent list item when pressing `Backspace` at the start. ([40962](https://github.com/WordPress/gutenberg/pull/40962))
 
+-   List v2: Indent multiple list items. ([40991](https://github.com/WordPress/gutenberg/pull/40991))
+-   List v2: Outdent list item when pressing `Backspace` at the start. ([40962](https://github.com/WordPress/gutenberg/pull/40962))
 
 ### Documentation
 
-- Add "How To Get Your Pull Request Reviewed?" to developer handbook. ([40589](https://github.com/WordPress/gutenberg/pull/40589))
-- Add link to npm release details to the release documentation. ([40867](https://github.com/WordPress/gutenberg/pull/40867))
-- Corrected the order in the code tabs. ([40569](https://github.com/WordPress/gutenberg/pull/40569))
-- Docs: Git.io deprecation - Replace links. ([40734](https://github.com/WordPress/gutenberg/pull/40734))
-- Document useEntityRecord/s in README.md and CHANGELOG.md. ([40932](https://github.com/WordPress/gutenberg/pull/40932))
-- Fix typo in `Panel` readme. ([41111](https://github.com/WordPress/gutenberg/pull/41111))
-- Remove mid-paragraph line breaks from 2-building-a-list-of-pages.md markdown. ([41025](https://github.com/WordPress/gutenberg/pull/41025))
-- Typo - enqueue to enqueued. ([40880](https://github.com/WordPress/gutenberg/pull/40880))
-- Update broken links. ([41071](https://github.com/WordPress/gutenberg/pull/41071))
-- [Gutenberg Data Tutorial] Part 4: Building a new record form. ([39261](https://github.com/WordPress/gutenberg/pull/39261))
+-   Add "How To Get Your Pull Request Reviewed?" to developer handbook. ([40589](https://github.com/WordPress/gutenberg/pull/40589))
+-   Add link to npm release details to the release documentation. ([40867](https://github.com/WordPress/gutenberg/pull/40867))
+-   Corrected the order in the code tabs. ([40569](https://github.com/WordPress/gutenberg/pull/40569))
+-   Docs: Git.io deprecation - Replace links. ([40734](https://github.com/WordPress/gutenberg/pull/40734))
+-   Document useEntityRecord/s in README.md and CHANGELOG.md. ([40932](https://github.com/WordPress/gutenberg/pull/40932))
+-   Fix typo in `Panel` readme. ([41111](https://github.com/WordPress/gutenberg/pull/41111))
+-   Remove mid-paragraph line breaks from 2-building-a-list-of-pages.md markdown. ([41025](https://github.com/WordPress/gutenberg/pull/41025))
+-   Typo - enqueue to enqueued. ([40880](https://github.com/WordPress/gutenberg/pull/40880))
+-   Update broken links. ([41071](https://github.com/WordPress/gutenberg/pull/41071))
+-   [Gutenberg Data Tutorial] Part 4: Building a new record form. ([39261](https://github.com/WordPress/gutenberg/pull/39261))
 
 #### Components
-- Use TypeScript and controls for `DateTimePicker`'s stories. ([40986](https://github.com/WordPress/gutenberg/pull/40986))
 
+-   Use TypeScript and controls for `DateTimePicker`'s stories. ([40986](https://github.com/WordPress/gutenberg/pull/40986))
 
 ### Code Quality
 
-- Convert core-data selectors from jsDoc annotations into TypeScript type signatures. ([40025](https://github.com/WordPress/gutenberg/pull/40025))
-- Dependency extraction: Improve calculation of contentHash. ([40930](https://github.com/WordPress/gutenberg/pull/40930))
-- Dependency extraction: Respect hashDigestLength option for version field. ([40977](https://github.com/WordPress/gutenberg/pull/40977))
-- Improve function name for finding navigation links that use the featured image. ([40904](https://github.com/WordPress/gutenberg/pull/40904))
-- Interface: Fix deprecation messages. ([40825](https://github.com/WordPress/gutenberg/pull/40825))
-- Make the useDisabled hook stable. ([40890](https://github.com/WordPress/gutenberg/pull/40890))
-- Packages [Dependency Extraction Webpack Plugin]: Add new line at the end of *.assets.php. ([40753](https://github.com/WordPress/gutenberg/pull/40753))
-- Remove unreachable inserter component. ([41103](https://github.com/WordPress/gutenberg/pull/41103))
-- Styles hook: Swap out lodash methods with their JS equivalents. ([40918](https://github.com/WordPress/gutenberg/pull/40918))
-- Update react-resize-aware with use-resize-observer. ([40509](https://github.com/WordPress/gutenberg/pull/40509))
-- useRefEffect: Replace undefined with void in callback return type. ([40798](https://github.com/WordPress/gutenberg/pull/40798))
-- Remove Flyout leftovers. ([41129](https://github.com/WordPress/gutenberg/pull/41129))
-- Send registered patterns in HTML and combine them with REST ones. ([40818](https://github.com/WordPress/gutenberg/pull/40818))
-
-#### Block Library
-- Cover: Refactor controls. ([40832](https://github.com/WordPress/gutenberg/pull/40832))
-- Cover: Correct resizeable spelling to US resizable. ([41100](https://github.com/WordPress/gutenberg/pull/41100))
-- Post Terms: Add wp_kses_post to prefix/suffix for consistency. ([40803](https://github.com/WordPress/gutenberg/pull/40803))
-- Replace hardcoded core/paragraph with getDefaultBlockName in onSplitAtEnd callbacks. ([40954](https://github.com/WordPress/gutenberg/pull/40954))
-- Post Terms: Insert defaultBlock on suffix end split. ([40934](https://github.com/WordPress/gutenberg/pull/40934))
-- Query Loop: Move sticky control to separate file. ([41101](https://github.com/WordPress/gutenberg/pull/41101))
-
-#### Components
-- Add jest-console typings and convert DateTimePicker tests to TypeScript. ([40957](https://github.com/WordPress/gutenberg/pull/40957))
-- Rewrite DatePicker, TimePicker and DateTimePicker in TypeScript. ([40775](https://github.com/WordPress/gutenberg/pull/40775))
-- Update `react-dates` to 21.8.0. ([40801](https://github.com/WordPress/gutenberg/pull/40801))
-- Stabilize useEntityRecord and useEntityRecords. ([40162](https://github.com/WordPress/gutenberg/pull/40162))
+-   Convert core-data selectors from jsDoc annotations into TypeScript type signatures. ([40025](https://github.com/WordPress/gutenberg/pull/40025))
+-   Dependency extraction: Improve calculation of contentHash. ([40930](https://github.com/WordPress/gutenberg/pull/40930))
+-   Dependency extraction: Respect hashDigestLength option for version field. ([40977](https://github.com/WordPress/gutenberg/pull/40977))
+-   Improve function name for finding navigation links that use the featured image. ([40904](https://github.com/WordPress/gutenberg/pull/40904))
+-   Interface: Fix deprecation messages. ([40825](https://github.com/WordPress/gutenberg/pull/40825))
+-   Make the useDisabled hook stable. ([40890](https://github.com/WordPress/gutenberg/pull/40890))
+-   Packages [Dependency Extraction Webpack Plugin]: Add new line at the end of \*.assets.php. ([40753](https://github.com/WordPress/gutenberg/pull/40753))
+-   Remove unreachable inserter component. ([41103](https://github.com/WordPress/gutenberg/pull/41103))
+-   Styles hook: Swap out lodash methods with their JS equivalents. ([40918](https://github.com/WordPress/gutenberg/pull/40918))
+-   Update react-resize-aware with use-resize-observer. ([40509](https://github.com/WordPress/gutenberg/pull/40509))
+-   useRefEffect: Replace undefined with void in callback return type. ([40798](https://github.com/WordPress/gutenberg/pull/40798))
+-   Remove Flyout leftovers. ([41129](https://github.com/WordPress/gutenberg/pull/41129))
+-   Send registered patterns in HTML and combine them with REST ones. ([40818](https://github.com/WordPress/gutenberg/pull/40818))
+
+#### Block Library
+
+-   Cover: Refactor controls. ([40832](https://github.com/WordPress/gutenberg/pull/40832))
+-   Cover: Correct resizeable spelling to US resizable. ([41100](https://github.com/WordPress/gutenberg/pull/41100))
+-   Post Terms: Add wp_kses_post to prefix/suffix for consistency. ([40803](https://github.com/WordPress/gutenberg/pull/40803))
+-   Replace hardcoded core/paragraph with getDefaultBlockName in onSplitAtEnd callbacks. ([40954](https://github.com/WordPress/gutenberg/pull/40954))
+-   Post Terms: Insert defaultBlock on suffix end split. ([40934](https://github.com/WordPress/gutenberg/pull/40934))
+-   Query Loop: Move sticky control to separate file. ([41101](https://github.com/WordPress/gutenberg/pull/41101))
+
+#### Components
+
+-   Add jest-console typings and convert DateTimePicker tests to TypeScript. ([40957](https://github.com/WordPress/gutenberg/pull/40957))
+-   Rewrite DatePicker, TimePicker and DateTimePicker in TypeScript. ([40775](https://github.com/WordPress/gutenberg/pull/40775))
+-   Update `react-dates` to 21.8.0. ([40801](https://github.com/WordPress/gutenberg/pull/40801))
+-   Stabilize useEntityRecord and useEntityRecords. ([40162](https://github.com/WordPress/gutenberg/pull/40162))
 
 #### Plugin
-- Declare blocks as __experimental in block.json to automate syncing Gutenberg packages to WordPress. ([40655](https://github.com/WordPress/gutenberg/pull/40655))
-- Tools: Improve configuration for formatting files. ([40994](https://github.com/WordPress/gutenberg/pull/40994))
+
+-   Declare blocks as \_\_experimental in block.json to automate syncing Gutenberg packages to WordPress. ([40655](https://github.com/WordPress/gutenberg/pull/40655))
+-   Tools: Improve configuration for formatting files. ([40994](https://github.com/WordPress/gutenberg/pull/40994))
 
 #### Code Editor
-- Don't commit 'non-dirty' changes. ([41092](https://github.com/WordPress/gutenberg/pull/41092))
+
+-   Don't commit 'non-dirty' changes. ([41092](https://github.com/WordPress/gutenberg/pull/41092))
 
 #### Media
-- Media Utils: Don't convert error messages into an array. ([39448](https://github.com/WordPress/gutenberg/pull/39448))
+
+-   Media Utils: Don't convert error messages into an array. ([39448](https://github.com/WordPress/gutenberg/pull/39448))
 
 #### Block Editor
-- Add constants for link entry types. ([36490](https://github.com/WordPress/gutenberg/pull/36490))
 
+-   Add constants for link entry types. ([36490](https://github.com/WordPress/gutenberg/pull/36490))
 
 ### Tools
 
-- Fix pull-request-automation CI check (temporarily until an upstream fix lands). ([41044](https://github.com/WordPress/gutenberg/pull/41044))
-- Update package-lock.json. ([41045](https://github.com/WordPress/gutenberg/pull/41045))
-- env :: Support ssh protocol for github repos. ([40451](https://github.com/WordPress/gutenberg/pull/40451))
-- Add @fabiankaegy as a code owner for the docs/ directory. ([41057](https://github.com/WordPress/gutenberg/pull/41057))
+-   Fix pull-request-automation CI check (temporarily until an upstream fix lands). ([41044](https://github.com/WordPress/gutenberg/pull/41044))
+-   Update package-lock.json. ([41045](https://github.com/WordPress/gutenberg/pull/41045))
+-   env :: Support ssh protocol for github repos. ([40451](https://github.com/WordPress/gutenberg/pull/40451))
+-   Add @fabiankaegy as a code owner for the docs/ directory. ([41057](https://github.com/WordPress/gutenberg/pull/41057))
 
 #### Testing
-- Add eslint warning about use of waitForTimeout to playwright eslint. ([40802](https://github.com/WordPress/gutenberg/pull/40802))
-- Comment Template: Reorganize block tests to ease backport process. ([40739](https://github.com/WordPress/gutenberg/pull/40739))
-- Fix: Env unit test fails on Windows. ([41070](https://github.com/WordPress/gutenberg/pull/41070))
-- Migrate 'block-locking' to Playwright. ([41050](https://github.com/WordPress/gutenberg/pull/41050))
-- Migrate and refactor image block end-to-end tests to Playwright. ([40804](https://github.com/WordPress/gutenberg/pull/40804))
-- Migrated popovers.test.js to Playwright. ([39910](https://github.com/WordPress/gutenberg/pull/39910))
-- Reorganize playwright utils and make canvas utils usable in the site editor. ([40815](https://github.com/WordPress/gutenberg/pull/40815))
-- Setup user-event inline once per test. ([40839](https://github.com/WordPress/gutenberg/pull/40839))
-- Test block insertion after title post blur. ([32944](https://github.com/WordPress/gutenberg/pull/32944))
-- Tests: Remove comment template unit tests. ([40965](https://github.com/WordPress/gutenberg/pull/40965))
+
+-   Add eslint warning about use of waitForTimeout to playwright eslint. ([40802](https://github.com/WordPress/gutenberg/pull/40802))
+-   Comment Template: Reorganize block tests to ease backport process. ([40739](https://github.com/WordPress/gutenberg/pull/40739))
+-   Fix: Env unit test fails on Windows. ([41070](https://github.com/WordPress/gutenberg/pull/41070))
+-   Migrate 'block-locking' to Playwright. ([41050](https://github.com/WordPress/gutenberg/pull/41050))
+-   Migrate and refactor image block end-to-end tests to Playwright. ([40804](https://github.com/WordPress/gutenberg/pull/40804))
+-   Migrated popovers.test.js to Playwright. ([39910](https://github.com/WordPress/gutenberg/pull/39910))
+-   Reorganize playwright utils and make canvas utils usable in the site editor. ([40815](https://github.com/WordPress/gutenberg/pull/40815))
+-   Setup user-event inline once per test. ([40839](https://github.com/WordPress/gutenberg/pull/40839))
+-   Test block insertion after title post blur. ([32944](https://github.com/WordPress/gutenberg/pull/32944))
+-   Tests: Remove comment template unit tests. ([40965](https://github.com/WordPress/gutenberg/pull/40965))
 
 #### npm Packages
-- Packages: Add GitHub workflow for publishing to npm. ([40976](https://github.com/WordPress/gutenberg/pull/40976))
-- Packages: Add more npm release types to the GitHub workflow. ([41046](https://github.com/WordPress/gutenberg/pull/41046))
+
+-   Packages: Add GitHub workflow for publishing to npm. ([40976](https://github.com/WordPress/gutenberg/pull/40976))
+-   Packages: Add more npm release types to the GitHub workflow. ([41046](https://github.com/WordPress/gutenberg/pull/41046))
 
 #### Build Tooling
-- Build Tools: Update actions/setup-node GitHub action. ([40816](https://github.com/WordPress/gutenberg/pull/40816))
-
-#### Block Library
-- Add: Raw handling to the new list block. ([39954](https://github.com/WordPress/gutenberg/pull/39954))
-- Add: Space to indent list item. ([39949](https://github.com/WordPress/gutenberg/pull/39949))
-- Gallery block: Fix bug with initial image size. ([41079](https://github.com/WordPress/gutenberg/pull/41079))
-- Gallery block: Include image caption when converting a classic block gallery. ([40872](https://github.com/WordPress/gutenberg/pull/40872))
-- Heading block - add font family support. ([40970](https://github.com/WordPress/gutenberg/pull/40970))
-- Mark Table of Contents block as experimental using `block.json` flag. ([40905](https://github.com/WordPress/gutenberg/pull/40905))
-- Only allow template part to be replaced if its a header or footer. ([40787](https://github.com/WordPress/gutenberg/pull/40787))
-- Post Author block: Hide select author controle if there is no postId. ([40910](https://github.com/WordPress/gutenberg/pull/40910))
-- Search Block: Remove id attribute from svg. ([40828](https://github.com/WordPress/gutenberg/pull/40828))
-- Separator Block: Add border property for dots style to editor stylesheet. ([40855](https://github.com/WordPress/gutenberg/pull/40855))
-- ToC block: Re-enable + use static markup and only support core Heading and Page Break blocks. ([29739](https://github.com/WordPress/gutenberg/pull/29739))
-- Try a single icon for title blocks. ([40596](https://github.com/WordPress/gutenberg/pull/40596))
+
+-   Build Tools: Update actions/setup-node GitHub action. ([40816](https://github.com/WordPress/gutenberg/pull/40816))
+
+#### Block Library
+
+-   Add: Raw handling to the new list block. ([39954](https://github.com/WordPress/gutenberg/pull/39954))
+-   Add: Space to indent list item. ([39949](https://github.com/WordPress/gutenberg/pull/39949))
+-   Gallery block: Fix bug with initial image size. ([41079](https://github.com/WordPress/gutenberg/pull/41079))
+-   Gallery block: Include image caption when converting a classic block gallery. ([40872](https://github.com/WordPress/gutenberg/pull/40872))
+-   Heading block - add font family support. ([40970](https://github.com/WordPress/gutenberg/pull/40970))
+-   Mark Table of Contents block as experimental using `block.json` flag. ([40905](https://github.com/WordPress/gutenberg/pull/40905))
+-   Only allow template part to be replaced if its a header or footer. ([40787](https://github.com/WordPress/gutenberg/pull/40787))
+-   Post Author block: Hide select author controle if there is no postId. ([40910](https://github.com/WordPress/gutenberg/pull/40910))
+-   Search Block: Remove id attribute from svg. ([40828](https://github.com/WordPress/gutenberg/pull/40828))
+-   Separator Block: Add border property for dots style to editor stylesheet. ([40855](https://github.com/WordPress/gutenberg/pull/40855))
+-   ToC block: Re-enable + use static markup and only support core Heading and Page Break blocks. ([29739](https://github.com/WordPress/gutenberg/pull/29739))
+-   Try a single icon for title blocks. ([40596](https://github.com/WordPress/gutenberg/pull/40596))
 
 #### Data Layer
-- Add suspense support to the data module. ([37261](https://github.com/WordPress/gutenberg/pull/37261))
-- useSelect: Add unit tests for usage without deps. ([40732](https://github.com/WordPress/gutenberg/pull/40732))
+
+-   Add suspense support to the data module. ([37261](https://github.com/WordPress/gutenberg/pull/37261))
+-   useSelect: Add unit tests for usage without deps. ([40732](https://github.com/WordPress/gutenberg/pull/40732))
 
 #### Components
-- Select Component: Remove the lineheight setting to fix issue with font descenders being cut off. ([40985](https://github.com/WordPress/gutenberg/pull/40985))
+
+-   Select Component: Remove the lineheight setting to fix issue with font descenders being cut off. ([40985](https://github.com/WordPress/gutenberg/pull/40985))
 
 #### Global Styles
-- Theme Json: Don't output double selectors for elements inside blocks. ([40889](https://github.com/WordPress/gutenberg/pull/40889))
 
-#### Design Tools
-- Button: Add text transform control. ([40858](https://github.com/WordPress/gutenberg/pull/40858))
+-   Theme Json: Don't output double selectors for elements inside blocks. ([40889](https://github.com/WordPress/gutenberg/pull/40889))
 
+#### Design Tools
 
-## First time contributors
+-   Button: Add text transform control. ([40858](https://github.com/WordPress/gutenberg/pull/40858))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @anomiex: dependency-extraction-webpack-plugin: Calculate vendor hash from file output rather than Webpack internal state. ([34969](https://github.com/WordPress/gutenberg/pull/34969))
-- @damiencarbery: Typo - enqueue to enqueued. ([40880](https://github.com/WordPress/gutenberg/pull/40880))
-- @JessicaGosselin: Fix typo in `Panel` readme. ([41111](https://github.com/WordPress/gutenberg/pull/41111))
-- @luminuu: Create single template via site editor if not existing. ([40830](https://github.com/WordPress/gutenberg/pull/40830))
-- @n3f: env :: Support ssh protocol for github repos. ([40451](https://github.com/WordPress/gutenberg/pull/40451))
-- @SavPhill: Update broken links. ([41071](https://github.com/WordPress/gutenberg/pull/41071))
-- @shanjidah: Migrated popovers.test.js to Playwright. ([39910](https://github.com/WordPress/gutenberg/pull/39910))
-- @tomjdv: Corrected the order in the code tabs. ([40569](https://github.com/WordPress/gutenberg/pull/40569))
+The following PRs were merged by first-time contributors:
 
+-   @anomiex: dependency-extraction-webpack-plugin: Calculate vendor hash from file output rather than Webpack internal state. ([34969](https://github.com/WordPress/gutenberg/pull/34969))
+-   @damiencarbery: Typo - enqueue to enqueued. ([40880](https://github.com/WordPress/gutenberg/pull/40880))
+-   @JessicaGosselin: Fix typo in `Panel` readme. ([41111](https://github.com/WordPress/gutenberg/pull/41111))
+-   @luminuu: Create single template via site editor if not existing. ([40830](https://github.com/WordPress/gutenberg/pull/40830))
+-   @n3f: env :: Support ssh protocol for github repos. ([40451](https://github.com/WordPress/gutenberg/pull/40451))
+-   @SavPhill: Update broken links. ([41071](https://github.com/WordPress/gutenberg/pull/41071))
+-   @shanjidah: Migrated popovers.test.js to Playwright. ([39910](https://github.com/WordPress/gutenberg/pull/39910))
+-   @tomjdv: Corrected the order in the code tabs. ([40569](https://github.com/WordPress/gutenberg/pull/40569))
 
 ## Contributors
 
@@ -15490,15 +26966,13 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @Addison-Stavlo @alexstine @amustaque97 @andrewserong @anomiex @aristath @c4rl0sbr4v0 @carolinan @ciampo @damiencarbery @DAreRodz @dcalhoun @draganescu @fabiankaegy @fluiddot @geriux @getdave @glendaviesnz @gziolo @jameskoster @JessicaGosselin @jffng @jhnstn @jorgefilipecosta @jostnes @jsnajdr @kevin940726 @luisherranz @luminuu @Mamaduka @mauriac @mchowning @mcsf @michalczaplinski @mikachan @n3f @noisysocks @ntsekouras @ockham @ramonjd @SavPhill @scruffian @shanjidah @SiobhyB @Soean @spacedmonkey @t-hamano @talldan @tomasztunik @tomjdv @walbo @youknowriad @ZebulanStanphill
 
-
 = 13.2.1 =
 
 ## Changelog
 
 ### Bug Fixes
 
-- Fix the position of the block inserter in between blocks ([40919](https://github.com/WordPress/gutenberg/pull/40919)) 
-
+-   Fix the position of the block inserter in between blocks ([40919](https://github.com/WordPress/gutenberg/pull/40919))
 
 = 13.2.0 =
 
@@ -15506,299 +26980,297 @@ The following contributors merged PRs in this release:
 
 ### Features
 
-- Add new preferences persistence API, and save editor preferences in user meta. ([39795](https://github.com/WordPress/gutenberg/pull/39795))
+-   Add new preferences persistence API, and save editor preferences in user meta. ([39795](https://github.com/WordPress/gutenberg/pull/39795))
 
 ### Enhancements
 
-- Add visualizers for padding and margin for all blocks. ([40505](https://github.com/WordPress/gutenberg/pull/40505))
-- Remove the spotlight mode from template parts. ([40652](https://github.com/WordPress/gutenberg/pull/40652))
+-   Add visualizers for padding and margin for all blocks. ([40505](https://github.com/WordPress/gutenberg/pull/40505))
+-   Remove the spotlight mode from template parts. ([40652](https://github.com/WordPress/gutenberg/pull/40652))
 
 #### Block Library
 
-- Placeholders:
-  - Update post content placeholder. ([40177](https://github.com/WordPress/gutenberg/pull/40177))
-  - Update the placeholder for post excerpt. ([40178](https://github.com/WordPress/gutenberg/pull/40178))
-  - Add placeholder to Post Comments block. ([40484](https://github.com/WordPress/gutenberg/pull/40484))
-  - Improve the logic for warnings for Post Comments Form placeholder. ([40563](https://github.com/WordPress/gutenberg/pull/40563))
-  - Post Comments Form: Add "proper" visual representation in the editor. ([40368](https://github.com/WordPress/gutenberg/pull/40368))
-- Comments Query Loop: Add Post Comments Form block to Comments Query Loop template. ([40256](https://github.com/WordPress/gutenberg/pull/40256))
-- Post Comments block: Enqueue comment-reply script. ([40366](https://github.com/WordPress/gutenberg/pull/40366))
-- Cover: Avoid unnecessary wrapping when transformed from Group. ([40602](https://github.com/WordPress/gutenberg/pull/40602))
-- Quote v2: Implement exiting on Enter at end. ([39911](https://github.com/WordPress/gutenberg/pull/39911))
-- Separator Block: Add top & bottom margin support. ([40551](https://github.com/WordPress/gutenberg/pull/40551))
+-   Placeholders:
+    -   Update post content placeholder. ([40177](https://github.com/WordPress/gutenberg/pull/40177))
+    -   Update the placeholder for post excerpt. ([40178](https://github.com/WordPress/gutenberg/pull/40178))
+    -   Add placeholder to Post Comments block. ([40484](https://github.com/WordPress/gutenberg/pull/40484))
+    -   Improve the logic for warnings for Post Comments Form placeholder. ([40563](https://github.com/WordPress/gutenberg/pull/40563))
+    -   Post Comments Form: Add "proper" visual representation in the editor. ([40368](https://github.com/WordPress/gutenberg/pull/40368))
+-   Comments Query Loop: Add Post Comments Form block to Comments Query Loop template. ([40256](https://github.com/WordPress/gutenberg/pull/40256))
+-   Post Comments block: Enqueue comment-reply script. ([40366](https://github.com/WordPress/gutenberg/pull/40366))
+-   Cover: Avoid unnecessary wrapping when transformed from Group. ([40602](https://github.com/WordPress/gutenberg/pull/40602))
+-   Quote v2: Implement exiting on Enter at end. ([39911](https://github.com/WordPress/gutenberg/pull/39911))
+-   Separator Block: Add top & bottom margin support. ([40551](https://github.com/WordPress/gutenberg/pull/40551))
 
 #### Components
 
-- Fix async timing in tests using `user-event`. ([40790](https://github.com/WordPress/gutenberg/pull/40790))
-- Add flag for larger default size. (InputControl:  [40622](https://github.com/WordPress/gutenberg/pull/40622), UnitControl: [40627](https://github.com/WordPress/gutenberg/pull/40627))
+-   Fix async timing in tests using `user-event`. ([40790](https://github.com/WordPress/gutenberg/pull/40790))
+-   Add flag for larger default size. (InputControl: [40622](https://github.com/WordPress/gutenberg/pull/40622), UnitControl: [40627](https://github.com/WordPress/gutenberg/pull/40627))
 
 #### Site Editor
 
-- Use default cursor for non-editable text blocks. ([40785](https://github.com/WordPress/gutenberg/pull/40785))
+-   Use default cursor for non-editable text blocks. ([40785](https://github.com/WordPress/gutenberg/pull/40785))
 
 #### Block Editor
 
-- Show add pattern label when patterns are being prioritised. ([40598](https://github.com/WordPress/gutenberg/pull/40598))
-- Improve button spacing in the top right corner of the editor. ([40411](https://github.com/WordPress/gutenberg/pull/40411))
+-   Show add pattern label when patterns are being prioritised. ([40598](https://github.com/WordPress/gutenberg/pull/40598))
+-   Improve button spacing in the top right corner of the editor. ([40411](https://github.com/WordPress/gutenberg/pull/40411))
 
 #### Document Settings
 
-- Design tweaks to Post Visibility popover. ([40530](https://github.com/WordPress/gutenberg/pull/40530))
+-   Design tweaks to Post Visibility popover. ([40530](https://github.com/WordPress/gutenberg/pull/40530))
 
 #### Global Styles
 
-- Global Styles Sidebar: Tweak separator margin. ([40526](https://github.com/WordPress/gutenberg/pull/40526))
+-   Global Styles Sidebar: Tweak separator margin. ([40526](https://github.com/WordPress/gutenberg/pull/40526))
 
 #### Webfonts
 
-- Register all fonts before enqueing any. ([40489](https://github.com/WordPress/gutenberg/pull/40489))
-- Turn off WP 6.0 stopgap handler to use Webfonts API. ([40555](https://github.com/WordPress/gutenberg/pull/40555))
+-   Register all fonts before enqueing any. ([40489](https://github.com/WordPress/gutenberg/pull/40489))
+-   Turn off WP 6.0 stopgap handler to use Webfonts API. ([40555](https://github.com/WordPress/gutenberg/pull/40555))
 
 #### Block API
 
-- Allow using a custom domainpath for viewscripts. ([40136](https://github.com/WordPress/gutenberg/pull/40136))
-- Add `settings` hook. ([40547](https://github.com/WordPress/gutenberg/pull/40547))
+-   Allow using a custom domainpath for viewscripts. ([40136](https://github.com/WordPress/gutenberg/pull/40136))
+-   Add `settings` hook. ([40547](https://github.com/WordPress/gutenberg/pull/40547))
 
 #### Post Editor
 
-- Editor: Refactor PostFeaturedImage component to improve uploading state ([40126](https://github.com/WordPress/gutenberg/pull/40126))
+-   Editor: Refactor PostFeaturedImage component to improve uploading state ([40126](https://github.com/WordPress/gutenberg/pull/40126))
 
 ### Bug Fixes
 
 #### Block Library
 
-- Audio: Correctly handle drag and drop upload errors. ([40623](https://github.com/WordPress/gutenberg/pull/40623))
-- Comments:
-  - Comment Content: Show moderation message. ([40612](https://github.com/WordPress/gutenberg/pull/40612))
-  - Comment Template: With pagination, make sure to request page 1 if there are no comments. ([40759](https://github.com/WordPress/gutenberg/pull/40759))
-  - Comments Title: Count toggle working in 'Singular' editing mode (fix). ([40728](https://github.com/WordPress/gutenberg/pull/40728))
-  - Comments block: Fix glitches found while backporting. ([40628](https://github.com/WordPress/gutenberg/pull/40628))
-  - Fix alignment issue with comment author name. ([40610](https://github.com/WordPress/gutenberg/pull/40610))
-  - Fix alignment issue with the comment edit link. ([40584](https://github.com/WordPress/gutenberg/pull/40584))
-  - Fix alignment issue with the comment reply link. ([40582](https://github.com/WordPress/gutenberg/pull/40582))
-  - Fix an alignment issue with the post comments form. ([40613](https://github.com/WordPress/gutenberg/pull/40613))
-  - Fix style comment awaiting moderation indentation. ([40681](https://github.com/WordPress/gutenberg/pull/40681))
-  - Prevent comments rendering on password protected posts. ([40755](https://github.com/WordPress/gutenberg/pull/40755))
-  - Display paragraph breaks in comment contents block.. ([40667](https://github.com/WordPress/gutenberg/pull/40667))
-  - Prevent spam links of author's name in pending moderation comments. ([40702](https://github.com/WordPress/gutenberg/pull/40702))
-- Cover Block: Fix focal point error when the Featured Image is applied. ([40643](https://github.com/WordPress/gutenberg/pull/40643))
-- Cover: Avoid adding a wrapper Group block when transforming to Group, where possible. ([40293](https://github.com/WordPress/gutenberg/pull/40293))
-- Cover Block: Fixed iOS bug handling background-attachment to properly work with iOS 13+. ([40087](https://github.com/WordPress/gutenberg/pull/40087))
-- Navigation block "Open on click": Inherit font style and font weight. ([40671](https://github.com/WordPress/gutenberg/pull/40671))
-- Post Author: Switch byline to use kses so that rich text elements are rendered correctly. ([40776](https://github.com/WordPress/gutenberg/pull/40776))
-- Latest Post: Fix regression with featured images in latest posts. ([40662](https://github.com/WordPress/gutenberg/pull/40662))
-- Video: Fix drag and drop upload error state. ([40552](https://github.com/WordPress/gutenberg/pull/40552))
-- Heading: Include text alignment when transforming from paragraph to header and back. ([40709](https://github.com/WordPress/gutenberg/pull/40709))
-- No Results: Remove a typo from the no results block. ([40573](https://github.com/WordPress/gutenberg/pull/40573))
+-   Audio: Correctly handle drag and drop upload errors. ([40623](https://github.com/WordPress/gutenberg/pull/40623))
+-   Comments:
+    -   Comment Content: Show moderation message. ([40612](https://github.com/WordPress/gutenberg/pull/40612))
+    -   Comment Template: With pagination, make sure to request page 1 if there are no comments. ([40759](https://github.com/WordPress/gutenberg/pull/40759))
+    -   Comments Title: Count toggle working in 'Singular' editing mode (fix). ([40728](https://github.com/WordPress/gutenberg/pull/40728))
+    -   Comments block: Fix glitches found while backporting. ([40628](https://github.com/WordPress/gutenberg/pull/40628))
+    -   Fix alignment issue with comment author name. ([40610](https://github.com/WordPress/gutenberg/pull/40610))
+    -   Fix alignment issue with the comment edit link. ([40584](https://github.com/WordPress/gutenberg/pull/40584))
+    -   Fix alignment issue with the comment reply link. ([40582](https://github.com/WordPress/gutenberg/pull/40582))
+    -   Fix an alignment issue with the post comments form. ([40613](https://github.com/WordPress/gutenberg/pull/40613))
+    -   Fix style comment awaiting moderation indentation. ([40681](https://github.com/WordPress/gutenberg/pull/40681))
+    -   Prevent comments rendering on password protected posts. ([40755](https://github.com/WordPress/gutenberg/pull/40755))
+    -   Display paragraph breaks in comment contents block.. ([40667](https://github.com/WordPress/gutenberg/pull/40667))
+    -   Prevent spam links of author's name in pending moderation comments. ([40702](https://github.com/WordPress/gutenberg/pull/40702))
+-   Cover Block: Fix focal point error when the Featured Image is applied. ([40643](https://github.com/WordPress/gutenberg/pull/40643))
+-   Cover: Avoid adding a wrapper Group block when transforming to Group, where possible. ([40293](https://github.com/WordPress/gutenberg/pull/40293))
+-   Cover Block: Fixed iOS bug handling background-attachment to properly work with iOS 13+. ([40087](https://github.com/WordPress/gutenberg/pull/40087))
+-   Navigation block "Open on click": Inherit font style and font weight. ([40671](https://github.com/WordPress/gutenberg/pull/40671))
+-   Post Author: Switch byline to use kses so that rich text elements are rendered correctly. ([40776](https://github.com/WordPress/gutenberg/pull/40776))
+-   Latest Post: Fix regression with featured images in latest posts. ([40662](https://github.com/WordPress/gutenberg/pull/40662))
+-   Video: Fix drag and drop upload error state. ([40552](https://github.com/WordPress/gutenberg/pull/40552))
+-   Heading: Include text alignment when transforming from paragraph to header and back. ([40709](https://github.com/WordPress/gutenberg/pull/40709))
+-   No Results: Remove a typo from the no results block. ([40573](https://github.com/WordPress/gutenberg/pull/40573))
 
 #### Components
 
-- UnitControl
-  - Avoid calling onChange callback twice when unit changes. ([40796](https://github.com/WordPress/gutenberg/pull/40796))
-  - Show unit label when `units` prop has only one unit. ([40784](https://github.com/WordPress/gutenberg/pull/40784))
-- Gradient Tool: Fix closing of popover when the angle control is clicked. ([40735](https://github.com/WordPress/gutenberg/pull/40735))
-- Simpler clear button ([40437](https://github.com/WordPress/gutenberg/pull/40437))
+-   UnitControl
+    -   Avoid calling onChange callback twice when unit changes. ([40796](https://github.com/WordPress/gutenberg/pull/40796))
+    -   Show unit label when `units` prop has only one unit. ([40784](https://github.com/WordPress/gutenberg/pull/40784))
+-   Gradient Tool: Fix closing of popover when the angle control is clicked. ([40735](https://github.com/WordPress/gutenberg/pull/40735))
+-   Simpler clear button ([40437](https://github.com/WordPress/gutenberg/pull/40437))
 
 #### Block Editor
 
-- Fix dragging in inspector causing block deselection. ([40604](https://github.com/WordPress/gutenberg/pull/40604))
-- [RichText]: Ignore selection changes on non contentEditable nodes. ([40611](https://github.com/WordPress/gutenberg/pull/40611))
-- [Writing Flow]: Try to fix multi-selection with `shift+click`. ([40687](https://github.com/WordPress/gutenberg/pull/40687))
-- Fix the styles compatibility hook for the editor iframes. ([40842](https://github.com/WordPress/gutenberg/pull/40842))
+-   Fix dragging in inspector causing block deselection. ([40604](https://github.com/WordPress/gutenberg/pull/40604))
+-   [RichText]: Ignore selection changes on non contentEditable nodes. ([40611](https://github.com/WordPress/gutenberg/pull/40611))
+-   [Writing Flow]: Try to fix multi-selection with `shift+click`. ([40687](https://github.com/WordPress/gutenberg/pull/40687))
+-   Fix the styles compatibility hook for the editor iframes. ([40842](https://github.com/WordPress/gutenberg/pull/40842))
 
 #### Patterns
 
-- Fix core 'Featured' pattern category registration. ([40650](https://github.com/WordPress/gutenberg/pull/40650))
-- Fix: Page patterns don't show when only one pattern is available. ([40707](https://github.com/WordPress/gutenberg/pull/40707))
+-   Fix core 'Featured' pattern category registration. ([40650](https://github.com/WordPress/gutenberg/pull/40650))
+-   Fix: Page patterns don't show when only one pattern is available. ([40707](https://github.com/WordPress/gutenberg/pull/40707))
 
 #### Block Locking
 
-- Avoid 'lock' attribute registration warning. ([40654](https://github.com/WordPress/gutenberg/pull/40654))
-- Register the 'lock' attribute on the server. ([40468](https://github.com/WordPress/gutenberg/pull/40468))
+-   Avoid 'lock' attribute registration warning. ([40654](https://github.com/WordPress/gutenberg/pull/40654))
+-   Register the 'lock' attribute on the server. ([40468](https://github.com/WordPress/gutenberg/pull/40468))
 
 #### Code Editor
 
-- Commit changes upon switching editors to avoid content loss. ([40730](https://github.com/WordPress/gutenberg/pull/40730))
+-   Commit changes upon switching editors to avoid content loss. ([40730](https://github.com/WordPress/gutenberg/pull/40730))
 
 #### Navigation Menu Sidebar
 
-- Fix Nav Sidebar Site Editor error. ([40722](https://github.com/WordPress/gutenberg/pull/40722))
-- Close overlay menu when clicking an anchor link. ([39625](https://github.com/WordPress/gutenberg/pull/39625))
+-   Fix Nav Sidebar Site Editor error. ([40722](https://github.com/WordPress/gutenberg/pull/40722))
+-   Close overlay menu when clicking an anchor link. ([39625](https://github.com/WordPress/gutenberg/pull/39625))
 
 #### Icons
 
-- Fix/block meta icon prop errors. ([40710](https://github.com/WordPress/gutenberg/pull/40710))
-- Fix the Icon component mobile icon. ([40748](https://github.com/WordPress/gutenberg/pull/40748))
+-   Fix/block meta icon prop errors. ([40710](https://github.com/WordPress/gutenberg/pull/40710))
+-   Fix the Icon component mobile icon. ([40748](https://github.com/WordPress/gutenberg/pull/40748))
 
 #### Global Styles
 
-- Element styles: Prevent the WordPress filter callback from being executed. ([40594](https://github.com/WordPress/gutenberg/pull/40594))
-- Global Styles Sidebar: Fix nav header styles and semantics. ([40592](https://github.com/WordPress/gutenberg/pull/40592))
-- Global Styles Sidebar: Tweak spacing. ([40588](https://github.com/WordPress/gutenberg/pull/40588))
+-   Element styles: Prevent the WordPress filter callback from being executed. ([40594](https://github.com/WordPress/gutenberg/pull/40594))
+-   Global Styles Sidebar: Fix nav header styles and semantics. ([40592](https://github.com/WordPress/gutenberg/pull/40592))
+-   Global Styles Sidebar: Tweak spacing. ([40588](https://github.com/WordPress/gutenberg/pull/40588))
 
 #### Data Layer
 
-- useSelect: Prevent nested component update after unmount. ([40677](https://github.com/WordPress/gutenberg/pull/40677))
-- core-data: Change "include" type in getQueryParts. ([40570](https://github.com/WordPress/gutenberg/pull/40570))
+-   useSelect: Prevent nested component update after unmount. ([40677](https://github.com/WordPress/gutenberg/pull/40677))
+-   core-data: Change "include" type in getQueryParts. ([40570](https://github.com/WordPress/gutenberg/pull/40570))
 
 #### Themes
 
-- Theme Export: Bug: Add .DS_Store to the list of ignored files. ([40539](https://github.com/WordPress/gutenberg/pull/40539))
+-   Theme Export: Bug: Add .DS_Store to the list of ignored files. ([40539](https://github.com/WordPress/gutenberg/pull/40539))
 
 #### Reusable Blocks
 
-- Fix template part / reusable block click through on non-safari browsers. ([40339](https://github.com/WordPress/gutenberg/pull/40339))
+-   Fix template part / reusable block click through on non-safari browsers. ([40339](https://github.com/WordPress/gutenberg/pull/40339))
 
 #### Block API
 
-- Check that a transform matches at the time of running the transform. ([40497](https://github.com/WordPress/gutenberg/pull/40497))
+-   Check that a transform matches at the time of running the transform. ([40497](https://github.com/WordPress/gutenberg/pull/40497))
 
 ### Accessibility
 
 #### Components
 
-- Improve tools panel accessibility. ([40716](https://github.com/WordPress/gutenberg/pull/40716))
+-   Improve tools panel accessibility. ([40716](https://github.com/WordPress/gutenberg/pull/40716))
 
 #### Block Editor
 
-- URLInput now always has an ID and accessible label. ([40310](https://github.com/WordPress/gutenberg/pull/40310))
+-   URLInput now always has an ID and accessible label. ([40310](https://github.com/WordPress/gutenberg/pull/40310))
 
 #### Block Library
 
-- Post Comments block: Fix missing label in placeholder. ([40527](https://github.com/WordPress/gutenberg/pull/40527))
+-   Post Comments block: Fix missing label in placeholder. ([40527](https://github.com/WordPress/gutenberg/pull/40527))
 
 ### Performance
 
 #### Block Editor
 
-- getBlockTransformItems: Support single block object. ([40718](https://github.com/WordPress/gutenberg/pull/40718))
+-   getBlockTransformItems: Support single block object. ([40718](https://github.com/WordPress/gutenberg/pull/40718))
 
 #### Block Library
 
-- Navigation Link: Avoid unnecessary re-renders. ([40696](https://github.com/WordPress/gutenberg/pull/40696))
-- Navigation: Improve selector performance. ([40700](https://github.com/WordPress/gutenberg/pull/40700))
+-   Navigation Link: Avoid unnecessary re-renders. ([40696](https://github.com/WordPress/gutenberg/pull/40696))
+-   Navigation: Improve selector performance. ([40700](https://github.com/WordPress/gutenberg/pull/40700))
 
 ### Experiments
 
 #### CSS & Styling
 
-- Style Engine: Add typography and color to backend. ([40332](https://github.com/WordPress/gutenberg/pull/40332))
+-   Style Engine: Add typography and color to backend. ([40332](https://github.com/WordPress/gutenberg/pull/40332))
 
 ### Documentation
 
-- Docs: Omit name from settings object in registerPlugin. ([40629](https://github.com/WordPress/gutenberg/pull/40629))
-- Docs: Update the Block Metadata title. ([40482](https://github.com/WordPress/gutenberg/pull/40482))
-- Fix ColorPalette component's documentation. ([40620](https://github.com/WordPress/gutenberg/pull/40620))
-- Fix indentation inconsistency in documentation for block variations. ([40515](https://github.com/WordPress/gutenberg/pull/40515))
-- Fix broken links. ([40578](https://github.com/WordPress/gutenberg/pull/40578))
+-   Docs: Omit name from settings object in registerPlugin. ([40629](https://github.com/WordPress/gutenberg/pull/40629))
+-   Docs: Update the Block Metadata title. ([40482](https://github.com/WordPress/gutenberg/pull/40482))
+-   Fix ColorPalette component's documentation. ([40620](https://github.com/WordPress/gutenberg/pull/40620))
+-   Fix indentation inconsistency in documentation for block variations. ([40515](https://github.com/WordPress/gutenberg/pull/40515))
+-   Fix broken links. ([40578](https://github.com/WordPress/gutenberg/pull/40578))
 
 #### Components
 
-- Add TypeScript refactor guidelines. ([40153](https://github.com/WordPress/gutenberg/pull/40153))
-- InputControl: Remove default value argument from Storybook. ([40410](https://github.com/WordPress/gutenberg/pull/40410))
-- Components: Fix error in CONTRIBUTING guide. ([40682](https://github.com/WordPress/gutenberg/pull/40682))
-- Components: Update changelog for [#40735](https://github.com/WordPress/gutenberg/pull/40735). ([40797](https://github.com/WordPress/gutenberg/pull/40797))
-- Fix/typos in documentation. ([40579](https://github.com/WordPress/gutenberg/pull/40579))
+-   Add TypeScript refactor guidelines. ([40153](https://github.com/WordPress/gutenberg/pull/40153))
+-   InputControl: Remove default value argument from Storybook. ([40410](https://github.com/WordPress/gutenberg/pull/40410))
+-   Components: Fix error in CONTRIBUTING guide. ([40682](https://github.com/WordPress/gutenberg/pull/40682))
+-   Components: Update changelog for [#40735](https://github.com/WordPress/gutenberg/pull/40735). ([40797](https://github.com/WordPress/gutenberg/pull/40797))
+-   Fix/typos in documentation. ([40579](https://github.com/WordPress/gutenberg/pull/40579))
 
 #### Themes
 
-- Adding schema info to theme.json reference. ([40599](https://github.com/WordPress/gutenberg/pull/40599))
+-   Adding schema info to theme.json reference. ([40599](https://github.com/WordPress/gutenberg/pull/40599))
 
 ### Code Quality
 
-- Block Editor: Deprecate 'BlockColorsStyleSelector' component. ([40502](https://github.com/WordPress/gutenberg/pull/40502))
-- Global Styles Sidebar: Rename `NavigationButton` so semantics are clearer. ([40590](https://github.com/WordPress/gutenberg/pull/40590))
-- Handle promise rejections from preferences persistence if the user is offline or the REST API errors. ([40641](https://github.com/WordPress/gutenberg/pull/40641))
-- Improve the useDisabled hook and Disabled component. ([40631](https://github.com/WordPress/gutenberg/pull/40631))
-- Preferences persistence - mark modified property as not readonly in schema. ([40637](https://github.com/WordPress/gutenberg/pull/40637))
-- Preferences: Improve initial configuration for the new persistence package. ([40715](https://github.com/WordPress/gutenberg/pull/40715))
-- Remove padding prop from popover. ([40544](https://github.com/WordPress/gutenberg/pull/40544))
+-   Block Editor: Deprecate 'BlockColorsStyleSelector' component. ([40502](https://github.com/WordPress/gutenberg/pull/40502))
+-   Global Styles Sidebar: Rename `NavigationButton` so semantics are clearer. ([40590](https://github.com/WordPress/gutenberg/pull/40590))
+-   Handle promise rejections from preferences persistence if the user is offline or the REST API errors. ([40641](https://github.com/WordPress/gutenberg/pull/40641))
+-   Improve the useDisabled hook and Disabled component. ([40631](https://github.com/WordPress/gutenberg/pull/40631))
+-   Preferences persistence - mark modified property as not readonly in schema. ([40637](https://github.com/WordPress/gutenberg/pull/40637))
+-   Preferences: Improve initial configuration for the new persistence package. ([40715](https://github.com/WordPress/gutenberg/pull/40715))
+-   Remove padding prop from popover. ([40544](https://github.com/WordPress/gutenberg/pull/40544))
 
 #### Components
 
-- Add `DatePicker` tests using React Testing Library. ([40754](https://github.com/WordPress/gutenberg/pull/40754))
-- Borders: Remove unused BorderStyleControl component. ([40635](https://github.com/WordPress/gutenberg/pull/40635))
-- Migrate `ConfirmDialog` component's Stories from knobs to controls. ([40164](https://github.com/WordPress/gutenberg/pull/40164))
-- SelectControl: Finish typescript migration. ([40737](https://github.com/WordPress/gutenberg/pull/40737))
-- [components] Use internal `Icon` component for `ToggleGroupControlOptionIcon`. ([40717](https://github.com/WordPress/gutenberg/pull/40717))
-- TextControl: Covert component to TypeScript. ([40633](https://github.com/WordPress/gutenberg/pull/40633))
-
+-   Add `DatePicker` tests using React Testing Library. ([40754](https://github.com/WordPress/gutenberg/pull/40754))
+-   Borders: Remove unused BorderStyleControl component. ([40635](https://github.com/WordPress/gutenberg/pull/40635))
+-   Migrate `ConfirmDialog` component's Stories from knobs to controls. ([40164](https://github.com/WordPress/gutenberg/pull/40164))
+-   SelectControl: Finish typescript migration. ([40737](https://github.com/WordPress/gutenberg/pull/40737))
+-   [components] Use internal `Icon` component for `ToggleGroupControlOptionIcon`. ([40717](https://github.com/WordPress/gutenberg/pull/40717))
+-   TextControl: Covert component to TypeScript. ([40633](https://github.com/WordPress/gutenberg/pull/40633))
 
 #### Block Library
 
-- Comments Query Loop block: Rename to Comments (but keep ID). ([40763](https://github.com/WordPress/gutenberg/pull/40763))
-- Post Comments Form Block: Mark as stable. ([40452](https://github.com/WordPress/gutenberg/pull/40452))
-- Remove Navigation Area block. ([40645](https://github.com/WordPress/gutenberg/pull/40645))
-- Remove testid and update tests. ([40534](https://github.com/WordPress/gutenberg/pull/40534))
-- Refactor: Reuse code of the editor placeholder across Post Comments and Post Comments Form. ([40560](https://github.com/WordPress/gutenberg/pull/40560))
+-   Comments Query Loop block: Rename to Comments (but keep ID). ([40763](https://github.com/WordPress/gutenberg/pull/40763))
+-   Post Comments Form Block: Mark as stable. ([40452](https://github.com/WordPress/gutenberg/pull/40452))
+-   Remove Navigation Area block. ([40645](https://github.com/WordPress/gutenberg/pull/40645))
+-   Remove testid and update tests. ([40534](https://github.com/WordPress/gutenberg/pull/40534))
+-   Refactor: Reuse code of the editor placeholder across Post Comments and Post Comments Form. ([40560](https://github.com/WordPress/gutenberg/pull/40560))
 
 #### Data Layer
 
-- useSelect: Improve transition from async to sync mode. ([40680](https://github.com/WordPress/gutenberg/pull/40680))
+-   useSelect: Improve transition from async to sync mode. ([40680](https://github.com/WordPress/gutenberg/pull/40680))
 
 #### List View
 
-- Rename list view prop `expandNested` to `isExpanded`. ([40731](https://github.com/WordPress/gutenberg/pull/40731))
-- Tidy list view props and deprecate `BlockNavigationDropdown`. ([40777](https://github.com/WordPress/gutenberg/pull/40777))
+-   Rename list view prop `expandNested` to `isExpanded`. ([40731](https://github.com/WordPress/gutenberg/pull/40731))
+-   Tidy list view props and deprecate `BlockNavigationDropdown`. ([40777](https://github.com/WordPress/gutenberg/pull/40777))
 
 #### Post Editor
 
-- Edit Post: Remove unused code. ([40499](https://github.com/WordPress/gutenberg/pull/40499))
+-   Edit Post: Remove unused code. ([40499](https://github.com/WordPress/gutenberg/pull/40499))
 
 #### Plugin
 
-- Remove experimental PWA support for WP-Admin. ([40475](https://github.com/WordPress/gutenberg/pull/40475))
+-   Remove experimental PWA support for WP-Admin. ([40475](https://github.com/WordPress/gutenberg/pull/40475))
 
 ### Tools
 
-- Remove [@mkaz](https://github.com/mkaz) from CODEOWNERS 😢. ([40685](https://github.com/WordPress/gutenberg/pull/40685))
-- Scripts: Add `--dist-tag` flag to the `packages-update` command. ([40514](https://github.com/WordPress/gutenberg/pull/40514))
-- Scripts: Remove broken `lint-md-js` command. ([40511](https://github.com/WordPress/gutenberg/pull/40511))
-- Scripts: Remove deprecated `format-js` command. ([40512](https://github.com/WordPress/gutenberg/pull/40512))
-- Update `oandregal` notifications. ([40549](https://github.com/WordPress/gutenberg/pull/40549))
-- Update native mobile wrangler in rich-text CODEOWNER. ([40783](https://github.com/WordPress/gutenberg/pull/40783))
-- Export hydrate in `@wordpress/element`. ([40723](https://github.com/WordPress/gutenberg/pull/40723))
+-   Remove [@mkaz](https://github.com/mkaz) from CODEOWNERS 😢. ([40685](https://github.com/WordPress/gutenberg/pull/40685))
+-   Scripts: Add `--dist-tag` flag to the `packages-update` command. ([40514](https://github.com/WordPress/gutenberg/pull/40514))
+-   Scripts: Remove broken `lint-md-js` command. ([40511](https://github.com/WordPress/gutenberg/pull/40511))
+-   Scripts: Remove deprecated `format-js` command. ([40512](https://github.com/WordPress/gutenberg/pull/40512))
+-   Update `oandregal` notifications. ([40549](https://github.com/WordPress/gutenberg/pull/40549))
+-   Update native mobile wrangler in rich-text CODEOWNER. ([40783](https://github.com/WordPress/gutenberg/pull/40783))
+-   Export hydrate in `@wordpress/element`. ([40723](https://github.com/WordPress/gutenberg/pull/40723))
 
 #### Storybook
 
-- Storybook: Make description-loader more reliable. ([40616](https://github.com/WordPress/gutenberg/pull/40616))
+-   Storybook: Make description-loader more reliable. ([40616](https://github.com/WordPress/gutenberg/pull/40616))
 
 #### Testing
 
-- Comment Template Unit Test: Cover odd/even classes. ([40471](https://github.com/WordPress/gutenberg/pull/40471))
-- Comments block end-to-end test: Remove now-obsolete Post Comments Form block. ([40793](https://github.com/WordPress/gutenberg/pull/40793))
-- Migrate Image Size to Playwright. ([40467](https://github.com/WordPress/gutenberg/pull/40467))
-- Migrate paragraph test to Playwright. ([40779](https://github.com/WordPress/gutenberg/pull/40779))
-- Refactor image-size test to follow Playwright's best practices. ([40644](https://github.com/WordPress/gutenberg/pull/40644))
-- Remove require editor hooks line from full-content test setup. ([40772](https://github.com/WordPress/gutenberg/pull/40772))
-- Tests: Restore real timers after using Jest's fake timers. ([40760](https://github.com/WordPress/gutenberg/pull/40760))
-- Update @testing-library/user-event to stable version (14.1.1). ([40761](https://github.com/WordPress/gutenberg/pull/40761))
-- [Automated Testing]: Fix partial selection copy flaky tests. ([40607](https://github.com/WordPress/gutenberg/pull/40607))
-- Retain Playwright end-to-end test's trace on failure on CI. ([40586](https://github.com/WordPress/gutenberg/pull/40586))
-- Rewrite UnitControl tests in TypeScript. ([40697](https://github.com/WordPress/gutenberg/pull/40697))
-- Fix `batchRest` not throwing errors in Playwright. ([40668](https://github.com/WordPress/gutenberg/pull/40668))
-- Fix replacing with undefined in stripAnsi. ([40384](https://github.com/WordPress/gutenberg/pull/40384))
-- Nav link block PHP tests replace prefixed function with non-prefixed. ([40657](https://github.com/WordPress/gutenberg/pull/40657))
-- Fix the html data is wrong in clipboard emulation in Playwright. ([40638](https://github.com/WordPress/gutenberg/pull/40638))
-- Fix incorrect results in the flaky tests reporter. ([40567](https://github.com/WordPress/gutenberg/pull/40567))
+-   Comment Template Unit Test: Cover odd/even classes. ([40471](https://github.com/WordPress/gutenberg/pull/40471))
+-   Comments block end-to-end test: Remove now-obsolete Post Comments Form block. ([40793](https://github.com/WordPress/gutenberg/pull/40793))
+-   Migrate Image Size to Playwright. ([40467](https://github.com/WordPress/gutenberg/pull/40467))
+-   Migrate paragraph test to Playwright. ([40779](https://github.com/WordPress/gutenberg/pull/40779))
+-   Refactor image-size test to follow Playwright's best practices. ([40644](https://github.com/WordPress/gutenberg/pull/40644))
+-   Remove require editor hooks line from full-content test setup. ([40772](https://github.com/WordPress/gutenberg/pull/40772))
+-   Tests: Restore real timers after using Jest's fake timers. ([40760](https://github.com/WordPress/gutenberg/pull/40760))
+-   Update @testing-library/user-event to stable version (14.1.1). ([40761](https://github.com/WordPress/gutenberg/pull/40761))
+-   [Automated Testing]: Fix partial selection copy flaky tests. ([40607](https://github.com/WordPress/gutenberg/pull/40607))
+-   Retain Playwright end-to-end test's trace on failure on CI. ([40586](https://github.com/WordPress/gutenberg/pull/40586))
+-   Rewrite UnitControl tests in TypeScript. ([40697](https://github.com/WordPress/gutenberg/pull/40697))
+-   Fix `batchRest` not throwing errors in Playwright. ([40668](https://github.com/WordPress/gutenberg/pull/40668))
+-   Fix replacing with undefined in stripAnsi. ([40384](https://github.com/WordPress/gutenberg/pull/40384))
+-   Nav link block PHP tests replace prefixed function with non-prefixed. ([40657](https://github.com/WordPress/gutenberg/pull/40657))
+-   Fix the html data is wrong in clipboard emulation in Playwright. ([40638](https://github.com/WordPress/gutenberg/pull/40638))
+-   Fix incorrect results in the flaky tests reporter. ([40567](https://github.com/WordPress/gutenberg/pull/40567))
 
 #### Build Tooling
 
-- Eslint: Add TypeScript tests and stories to development files. ([40504](https://github.com/WordPress/gutenberg/pull/40504))
-- Fix: npm script(dev:Package) is not working on Windows. ([40566](https://github.com/WordPress/gutenberg/pull/40566))
-- ESLint Plugin: Fix `recommended` preset when `prettier` is not installed. ([40634](https://github.com/WordPress/gutenberg/pull/40634))
-
-## First time contributors
+-   Eslint: Add TypeScript tests and stories to development files. ([40504](https://github.com/WordPress/gutenberg/pull/40504))
+-   Fix: npm script(dev:Package) is not working on Windows. ([40566](https://github.com/WordPress/gutenberg/pull/40566))
+-   ESLint Plugin: Fix `recommended` preset when `prettier` is not installed. ([40634](https://github.com/WordPress/gutenberg/pull/40634))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- [@chriszarate](https://github.com/chriszarate): ESLint Plugin: Fix `recommended` preset when `prettier` is not installed. ([40634](https://github.com/WordPress/gutenberg/pull/40634))
-- [@danieliser](https://github.com/danieliser): Fix/block meta icon prop errors. ([40710](https://github.com/WordPress/gutenberg/pull/40710))
-- [@gvgvgvijayan](https://github.com/gvgvgvijayan): Fixes broken links. ([40578](https://github.com/WordPress/gutenberg/pull/40578))
-- [@iansvo](https://github.com/iansvo): URLInput now always has an ID and accessible label. ([40310](https://github.com/WordPress/gutenberg/pull/40310))
-- [@juhi123](https://github.com/juhi123): Migrate Image Size to Playwright. ([40467](https://github.com/WordPress/gutenberg/pull/40467))
-- [@Trapsta](https://github.com/Trapsta): Close overlay menu when clicking an anchor link. ([39625](https://github.com/WordPress/gutenberg/pull/39625))
+The following PRs were merged by first-time contributors:
 
+-   [@chriszarate](https://github.com/chriszarate): ESLint Plugin: Fix `recommended` preset when `prettier` is not installed. ([40634](https://github.com/WordPress/gutenberg/pull/40634))
+-   [@danieliser](https://github.com/danieliser): Fix/block meta icon prop errors. ([40710](https://github.com/WordPress/gutenberg/pull/40710))
+-   [@gvgvgvijayan](https://github.com/gvgvgvijayan): Fixes broken links. ([40578](https://github.com/WordPress/gutenberg/pull/40578))
+-   [@iansvo](https://github.com/iansvo): URLInput now always has an ID and accessible label. ([40310](https://github.com/WordPress/gutenberg/pull/40310))
+-   [@juhi123](https://github.com/juhi123): Migrate Image Size to Playwright. ([40467](https://github.com/WordPress/gutenberg/pull/40467))
+-   [@Trapsta](https://github.com/Trapsta): Close overlay menu when clicking an anchor link. ([39625](https://github.com/WordPress/gutenberg/pull/39625))
 
 = 13.1.0 =
 
@@ -15806,159 +27278,159 @@ The following PRs were merged by first time contributors:
 
 ### Enhancements
 
-- Block Editor: Removed the logic that was preventing the toolbar from hiding when typing within formats. ([40476](https://github.com/WordPress/gutenberg/pull/40476))
-- Block settings: Remove redundant block name from "settings" panels. ([40275](https://github.com/WordPress/gutenberg/pull/40275))
-- Components: Unified black color to gray-900. ([40391](https://github.com/WordPress/gutenberg/pull/40391))
-- Design Tools, Borders: Use new border control components in block support. ([37770](https://github.com/WordPress/gutenberg/pull/37770))
-- Document Setting: Removed plugin icon fallback. ([40355](https://github.com/WordPress/gutenberg/pull/40355))
-- Icons: Added new duotone filter icon. ([40435](https://github.com/WordPress/gutenberg/pull/40435))
+-   Block Editor: Removed the logic that was preventing the toolbar from hiding when typing within formats. ([40476](https://github.com/WordPress/gutenberg/pull/40476))
+-   Block settings: Remove redundant block name from "settings" panels. ([40275](https://github.com/WordPress/gutenberg/pull/40275))
+-   Components: Unified black color to gray-900. ([40391](https://github.com/WordPress/gutenberg/pull/40391))
+-   Design Tools, Borders: Use new border control components in block support. ([37770](https://github.com/WordPress/gutenberg/pull/37770))
+-   Document Setting: Removed plugin icon fallback. ([40355](https://github.com/WordPress/gutenberg/pull/40355))
+-   Icons: Added new duotone filter icon. ([40435](https://github.com/WordPress/gutenberg/pull/40435))
 
 #### Block Library
 
-- Categories: Added new option to show or hide empty categories. ([39426](https://github.com/WordPress/gutenberg/pull/39426))
-- Column: Add border support to column blocks. ([39967](https://github.com/WordPress/gutenberg/pull/39967))
-- Comments: Create comments title with simple styling. ([40419](https://github.com/WordPress/gutenberg/pull/40419))
-- Media & Text: Removed font size declaration from template. ([40329](https://github.com/WordPress/gutenberg/pull/40329))
-- Navigation: Renamed Navigation Menus to Navigation. ([40413](https://github.com/WordPress/gutenberg/pull/40413))
+-   Categories: Added new option to show or hide empty categories. ([39426](https://github.com/WordPress/gutenberg/pull/39426))
+-   Column: Add border support to column blocks. ([39967](https://github.com/WordPress/gutenberg/pull/39967))
+-   Comments: Create comments title with simple styling. ([40419](https://github.com/WordPress/gutenberg/pull/40419))
+-   Media & Text: Removed font size declaration from template. ([40329](https://github.com/WordPress/gutenberg/pull/40329))
+-   Navigation: Renamed Navigation Menus to Navigation. ([40413](https://github.com/WordPress/gutenberg/pull/40413))
 
 ### Bug Fixes
 
-- Patterns API: Add 'inserter' to the schema. ([40416](https://github.com/WordPress/gutenberg/pull/40416))
-- Toolbar: Fixed block toolbar text button padding. ([40438](https://github.com/WordPress/gutenberg/pull/40438))
+-   Patterns API: Add 'inserter' to the schema. ([40416](https://github.com/WordPress/gutenberg/pull/40416))
+-   Toolbar: Fixed block toolbar text button padding. ([40438](https://github.com/WordPress/gutenberg/pull/40438))
 
 #### Block Library
 
-- Post Featured Image: Used translatable post type label. ([40378](https://github.com/WordPress/gutenberg/pull/40378))
-- Comments:
-  - Comment template: Call `comment_class()` before recursing into child comments. ([40455](https://github.com/WordPress/gutenberg/pull/40455))
-  - Fixed comments query loop pagination not respecting Discussion Settings. ([40284](https://github.com/WordPress/gutenberg/pull/40284))
-  - Fixed comments no results placeholder not appearing. ([40234](https://github.com/WordPress/gutenberg/pull/40234))
-  - Post Comments Form: Fix layout quirks. ([40359](https://github.com/WordPress/gutenberg/pull/40359))
-- Embed:
-  - Fixed inline preview cut-off when editing URL. ([35326](https://github.com/WordPress/gutenberg/pull/35326))
-  - Use preview html for flickr embed previews in editor. ([40187](https://github.com/WordPress/gutenberg/pull/40187))
-- Image: Added window to the optional chaining. ([40394](https://github.com/WordPress/gutenberg/pull/40394))
+-   Post Featured Image: Used translatable post type label. ([40378](https://github.com/WordPress/gutenberg/pull/40378))
+-   Comments:
+    -   Comment template: Call `comment_class()` before recursing into child comments. ([40455](https://github.com/WordPress/gutenberg/pull/40455))
+    -   Fixed comments query loop pagination not respecting Discussion Settings. ([40284](https://github.com/WordPress/gutenberg/pull/40284))
+    -   Fixed comments no results placeholder not appearing. ([40234](https://github.com/WordPress/gutenberg/pull/40234))
+    -   Post Comments Form: Fix layout quirks. ([40359](https://github.com/WordPress/gutenberg/pull/40359))
+-   Embed:
+    -   Fixed inline preview cut-off when editing URL. ([35326](https://github.com/WordPress/gutenberg/pull/35326))
+    -   Use preview html for flickr embed previews in editor. ([40187](https://github.com/WordPress/gutenberg/pull/40187))
+-   Image: Added window to the optional chaining. ([40394](https://github.com/WordPress/gutenberg/pull/40394))
 
 ### Styles
 
-- Add a debounce to the custom color onChange event. ([40285](https://github.com/WordPress/gutenberg/pull/40285))
-- Do not render global styles coming from the server in the site editor. ([40185](https://github.com/WordPress/gutenberg/pull/40185))
-- Elements: Add styles to the footer before the block is rendered. ([37728](https://github.com/WordPress/gutenberg/pull/37728))
-- Fixed duotone rendering in site editor. ([37727](https://github.com/WordPress/gutenberg/pull/37727))
+-   Add a debounce to the custom color onChange event. ([40285](https://github.com/WordPress/gutenberg/pull/40285))
+-   Do not render global styles coming from the server in the site editor. ([40185](https://github.com/WordPress/gutenberg/pull/40185))
+-   Elements: Add styles to the footer before the block is rendered. ([37728](https://github.com/WordPress/gutenberg/pull/37728))
+-   Fixed duotone rendering in site editor. ([37727](https://github.com/WordPress/gutenberg/pull/37727))
 
 ### Site Editor
 
-- Don't render the secondary sidebar in text mode. ([40337](https://github.com/WordPress/gutenberg/pull/40337))
-- Fixed webfont loading in the Site Editor. ([40262](https://github.com/WordPress/gutenberg/pull/40262))
+-   Don't render the secondary sidebar in text mode. ([40337](https://github.com/WordPress/gutenberg/pull/40337))
+-   Fixed webfont loading in the Site Editor. ([40262](https://github.com/WordPress/gutenberg/pull/40262))
 
 ### Block Editor
 
-- Block Locking, useBlockLock: Always check inherited 'templateLock' status. ([40263](https://github.com/WordPress/gutenberg/pull/40263))
-- i18n: Fix incorrect '_n' usage. ([40292](https://github.com/WordPress/gutenberg/pull/40292))
-- List View, useBlockDisplayInformation: Return anchor for block variations in list view. ([40458](https://github.com/WordPress/gutenberg/pull/40458))
-- Multi-selection: Copy whole block when selection is collapsed. ([40374](https://github.com/WordPress/gutenberg/pull/40374))
-- Add optional chaining in case taxonomy visibility is not defined. ([40532](https://github.com/WordPress/gutenberg/pull/40532))
+-   Block Locking, useBlockLock: Always check inherited 'templateLock' status. ([40263](https://github.com/WordPress/gutenberg/pull/40263))
+-   i18n: Fix incorrect '\_n' usage. ([40292](https://github.com/WordPress/gutenberg/pull/40292))
+-   List View, useBlockDisplayInformation: Return anchor for block variations in list view. ([40458](https://github.com/WordPress/gutenberg/pull/40458))
+-   Multi-selection: Copy whole block when selection is collapsed. ([40374](https://github.com/WordPress/gutenberg/pull/40374))
+-   Add optional chaining in case taxonomy visibility is not defined. ([40532](https://github.com/WordPress/gutenberg/pull/40532))
 
 ### Accessibility
 
-- Post editing: After closing welcome dialog, if content is empty, focus title field. ([40195](https://github.com/WordPress/gutenberg/pull/40195))
-- Fixed focus loss happening when installing blocks from the directory. ([40340](https://github.com/WordPress/gutenberg/pull/40340))
-- Fixed focus loss when creating pages from link control search results. ([40342](https://github.com/WordPress/gutenberg/pull/40342))
-- Fixed focus loss when navigating the guide component. ([40324](https://github.com/WordPress/gutenberg/pull/40324))
-- Navigation block: After choosing an option from Select Menu, focus after block rerender. ([40390](https://github.com/WordPress/gutenberg/pull/40390))
-- Block Styles: Remove unnecessary button role and 'onKeyDown' handler. ([40427](https://github.com/WordPress/gutenberg/pull/40427))
-  
+-   Post editing: After closing welcome dialog, if content is empty, focus title field. ([40195](https://github.com/WordPress/gutenberg/pull/40195))
+-   Fixed focus loss happening when installing blocks from the directory. ([40340](https://github.com/WordPress/gutenberg/pull/40340))
+-   Fixed focus loss when creating pages from link control search results. ([40342](https://github.com/WordPress/gutenberg/pull/40342))
+-   Fixed focus loss when navigating the guide component. ([40324](https://github.com/WordPress/gutenberg/pull/40324))
+-   Navigation block: After choosing an option from Select Menu, focus after block rerender. ([40390](https://github.com/WordPress/gutenberg/pull/40390))
+-   Block Styles: Remove unnecessary button role and 'onKeyDown' handler. ([40427](https://github.com/WordPress/gutenberg/pull/40427))
+
 ### Performance
 
-- Added a context param to sidebar entity request. ([40148](https://github.com/WordPress/gutenberg/pull/40148))
+-   Added a context param to sidebar entity request. ([40148](https://github.com/WordPress/gutenberg/pull/40148))
 
 ### Developer Experience
 
-- [wp-env]: Add support to override `core` by the `WP_ENV_CORE` environment variable. ([40407](https://github.com/WordPress/gutenberg/pull/40407))
-- Create Block: Fix warnings and errors reported during scaffolding and validation. ([40479](https://github.com/WordPress/gutenberg/pull/40479))
+-   [wp-env]: Add support to override `core` by the `WP_ENV_CORE` environment variable. ([40407](https://github.com/WordPress/gutenberg/pull/40407))
+-   Create Block: Fix warnings and errors reported during scaffolding and validation. ([40479](https://github.com/WordPress/gutenberg/pull/40479))
 
 ### Documentation
 
-- Added README for Gradient and NavigableToolbar. ([25580](https://github.com/WordPress/gutenberg/pull/25580))
-- Added documentation for `ancestor` property in block metadata. ([40027](https://github.com/WordPress/gutenberg/pull/40027))
-- Fixed OnNumberOfItemsChange event docs error. ([39942](https://github.com/WordPress/gutenberg/pull/39942))
-- InputControl: Improved type annotations and stories. ([40119](https://github.com/WordPress/gutenberg/pull/40119))
-- Patterns: Documented 'inserter' argument. ([40425](https://github.com/WordPress/gutenberg/pull/40425))
-- Removed WordPress 5.9 specific warning from FSE documentation. ([40274](https://github.com/WordPress/gutenberg/pull/40274))
-- Replaced fixtures with inline parsed code. ([40428](https://github.com/WordPress/gutenberg/pull/40428))
-- Updated individual block locking section. ([40372](https://github.com/WordPress/gutenberg/pull/40372))
-- Updates `theme.json` documentation for theme authors. ([40005](https://github.com/WordPress/gutenberg/pull/40005))
-- Unwrapped wrapped selectors when inferring types of JSDoc params. ([40236](https://github.com/WordPress/gutenberg/pull/40236))
+-   Added README for Gradient and NavigableToolbar. ([25580](https://github.com/WordPress/gutenberg/pull/25580))
+-   Added documentation for `ancestor` property in block metadata. ([40027](https://github.com/WordPress/gutenberg/pull/40027))
+-   Fixed OnNumberOfItemsChange event docs error. ([39942](https://github.com/WordPress/gutenberg/pull/39942))
+-   InputControl: Improved type annotations and stories. ([40119](https://github.com/WordPress/gutenberg/pull/40119))
+-   Patterns: Documented 'inserter' argument. ([40425](https://github.com/WordPress/gutenberg/pull/40425))
+-   Removed WordPress 5.9 specific warning from FSE documentation. ([40274](https://github.com/WordPress/gutenberg/pull/40274))
+-   Replaced fixtures with inline parsed code. ([40428](https://github.com/WordPress/gutenberg/pull/40428))
+-   Updated individual block locking section. ([40372](https://github.com/WordPress/gutenberg/pull/40372))
+-   Updates `theme.json` documentation for theme authors. ([40005](https://github.com/WordPress/gutenberg/pull/40005))
+-   Unwrapped wrapped selectors when inferring types of JSDoc params. ([40236](https://github.com/WordPress/gutenberg/pull/40236))
 
 ### Code Quality
 
 #### Block Library
 
-- Navigation: Remove async useEffect. ([40373](https://github.com/WordPress/gutenberg/pull/40373))
-- HTML: Remove pointless `<span>`s in Custom HTML block controls. ([39820](https://github.com/WordPress/gutenberg/pull/39820))
-- Comments Query Loop: comment meta data isn’t queued for lazy loading. ([40242](https://github.com/WordPress/gutenberg/pull/40242))
-- Split navigation block view script. ([40135](https://github.com/WordPress/gutenberg/pull/40135))
-- Spacer: Added constants file to Spacer block. ([40446](https://github.com/WordPress/gutenberg/pull/40446))
+-   Navigation: Remove async useEffect. ([40373](https://github.com/WordPress/gutenberg/pull/40373))
+-   HTML: Remove pointless `<span>`s in Custom HTML block controls. ([39820](https://github.com/WordPress/gutenberg/pull/39820))
+-   Comments Query Loop: comment meta data isn’t queued for lazy loading. ([40242](https://github.com/WordPress/gutenberg/pull/40242))
+-   Split navigation block view script. ([40135](https://github.com/WordPress/gutenberg/pull/40135))
+-   Spacer: Added constants file to Spacer block. ([40446](https://github.com/WordPress/gutenberg/pull/40446))
 
 #### Components
 
-- Stop exporting individual color objects from color values file. ([40387](https://github.com/WordPress/gutenberg/pull/40387))
-- Added reusable BlockPopover and BlockPopoverInbetween components. ([40441](https://github.com/WordPress/gutenberg/pull/40441))
-- Cleaned BlockMover component and styles. ([40379](https://github.com/WordPress/gutenberg/pull/40379))
-  
+-   Stop exporting individual color objects from color values file. ([40387](https://github.com/WordPress/gutenberg/pull/40387))
+-   Added reusable BlockPopover and BlockPopoverInbetween components. ([40441](https://github.com/WordPress/gutenberg/pull/40441))
+-   Cleaned BlockMover component and styles. ([40379](https://github.com/WordPress/gutenberg/pull/40379))
+
 #### Packages
 
-- Block Editor: Remove unused sub-components in list view. ([40448](https://github.com/WordPress/gutenberg/pull/40448))
-- Data: Cancel render queue in a more straightforward way. ([40433](https://github.com/WordPress/gutenberg/pull/40433))
-  
+-   Block Editor: Remove unused sub-components in list view. ([40448](https://github.com/WordPress/gutenberg/pull/40448))
+-   Data: Cancel render queue in a more straightforward way. ([40433](https://github.com/WordPress/gutenberg/pull/40433))
+
 #### Plugin
 
-- Added `edit` context to patterns REST controllers. ([40259](https://github.com/WordPress/gutenberg/pull/40259))
-- Add @talldan as a codeowner for wordpress/preferences. ([40295](https://github.com/WordPress/gutenberg/pull/40295))
-- Cleaned up non-dynamic block registration list. ([40426](https://github.com/WordPress/gutenberg/pull/40426))
-- Moved list and quote block registration to experimental blocks. ([40350](https://github.com/WordPress/gutenberg/pull/40350))
-- Moved the logic for iframed editor to WP 6.0 compat. ([40278](https://github.com/WordPress/gutenberg/pull/40278))
-- Post WordPress 6.0 Beta 1 cleanup. ([40349](https://github.com/WordPress/gutenberg/pull/40349))
-- Rename `wp_translate_settings_using_i18n_schema` to `translate_settings_using_i18n_schema`. ([40227](https://github.com/WordPress/gutenberg/pull/40227))
-- Plugin: Fix fatal error for older WP/PHP versions. ([40538](https://github.com/WordPress/gutenberg/pull/40538))
+-   Added `edit` context to patterns REST controllers. ([40259](https://github.com/WordPress/gutenberg/pull/40259))
+-   Add @talldan as a codeowner for wordpress/preferences. ([40295](https://github.com/WordPress/gutenberg/pull/40295))
+-   Cleaned up non-dynamic block registration list. ([40426](https://github.com/WordPress/gutenberg/pull/40426))
+-   Moved list and quote block registration to experimental blocks. ([40350](https://github.com/WordPress/gutenberg/pull/40350))
+-   Moved the logic for iframed editor to WP 6.0 compat. ([40278](https://github.com/WordPress/gutenberg/pull/40278))
+-   Post WordPress 6.0 Beta 1 cleanup. ([40349](https://github.com/WordPress/gutenberg/pull/40349))
+-   Rename `wp_translate_settings_using_i18n_schema` to `translate_settings_using_i18n_schema`. ([40227](https://github.com/WordPress/gutenberg/pull/40227))
+-   Plugin: Fix fatal error for older WP/PHP versions. ([40538](https://github.com/WordPress/gutenberg/pull/40538))
 
 ### Tools
 
 #### Testing
 
-- Playwright migration:
-  - Fixed outdated playwright snapshot directory. ([40422](https://github.com/WordPress/gutenberg/pull/40422))
-  - Tried to fix flaky playwright tests not being reported. ([40290](https://github.com/WordPress/gutenberg/pull/40290))
-  - E2E: Cross-platform support for Playwright end-to-end tests. ([39765](https://github.com/WordPress/gutenberg/pull/39765))
-  - Migrate `post-editor-template-mode` to Playwright. ([40175](https://github.com/WordPress/gutenberg/pull/40175))
-  - Migrate block api test to Playwright. ([40217](https://github.com/WordPress/gutenberg/pull/40217))
-  - Migrate document settings test to playwright. ([40258](https://github.com/WordPress/gutenberg/pull/40258))
-  - Migrate style variation test to Playwright. ([40216](https://github.com/WordPress/gutenberg/pull/40216))
-- Quote: Verify that user can type right after inserting the quote block. ([40466](https://github.com/WordPress/gutenberg/pull/40466))
-- `useSelect`:
-  - Add async mode test suite and fix two bugs. ([40321](https://github.com/WordPress/gutenberg/pull/40321))
-  - Update unit tests to testing-library. ([40229](https://github.com/WordPress/gutenberg/pull/40229))
-- Block supports: Unregister block in PHP unit tests. ([40239](https://github.com/WordPress/gutenberg/pull/40239))
-- CreateBlock: Fix escaping for error message in create block test. ([40473](https://github.com/WordPress/gutenberg/pull/40473))
-- Comments Query Loop: Add end-to-end comments tests to stable, wait for selector on set option. ([40405](https://github.com/WordPress/gutenberg/pull/40405))
+-   Playwright migration:
+    -   Fixed outdated playwright snapshot directory. ([40422](https://github.com/WordPress/gutenberg/pull/40422))
+    -   Tried to fix flaky playwright tests not being reported. ([40290](https://github.com/WordPress/gutenberg/pull/40290))
+    -   E2E: Cross-platform support for Playwright end-to-end tests. ([39765](https://github.com/WordPress/gutenberg/pull/39765))
+    -   Migrate `post-editor-template-mode` to Playwright. ([40175](https://github.com/WordPress/gutenberg/pull/40175))
+    -   Migrate block api test to Playwright. ([40217](https://github.com/WordPress/gutenberg/pull/40217))
+    -   Migrate document settings test to playwright. ([40258](https://github.com/WordPress/gutenberg/pull/40258))
+    -   Migrate style variation test to Playwright. ([40216](https://github.com/WordPress/gutenberg/pull/40216))
+-   Quote: Verify that user can type right after inserting the quote block. ([40466](https://github.com/WordPress/gutenberg/pull/40466))
+-   `useSelect`:
+    -   Add async mode test suite and fix two bugs. ([40321](https://github.com/WordPress/gutenberg/pull/40321))
+    -   Update unit tests to testing-library. ([40229](https://github.com/WordPress/gutenberg/pull/40229))
+-   Block supports: Unregister block in PHP unit tests. ([40239](https://github.com/WordPress/gutenberg/pull/40239))
+-   CreateBlock: Fix escaping for error message in create block test. ([40473](https://github.com/WordPress/gutenberg/pull/40473))
+-   Comments Query Loop: Add end-to-end comments tests to stable, wait for selector on set option. ([40405](https://github.com/WordPress/gutenberg/pull/40405))
 
 #### Build Tooling
 
-- Added the missing class-wp-style-engine-gutenberg.php in the plugin build. ([40191](https://github.com/WordPress/gutenberg/pull/40191))
-- Fixed commands containing dot-slashes in npm scripts. ([39739](https://github.com/WordPress/gutenberg/pull/39739))
-- Added new TypeScript project for unit tests. ([39436](https://github.com/WordPress/gutenberg/pull/39436))
-- Fixed the flaky template editor mode test. ([40325](https://github.com/WordPress/gutenberg/pull/40325))
-- Excluded BEM class from stylelint @wordpress/scripts. ([37531](https://github.com/WordPress/gutenberg/pull/37531))
+-   Added the missing class-wp-style-engine-gutenberg.php in the plugin build. ([40191](https://github.com/WordPress/gutenberg/pull/40191))
+-   Fixed commands containing dot-slashes in npm scripts. ([39739](https://github.com/WordPress/gutenberg/pull/39739))
+-   Added new TypeScript project for unit tests. ([39436](https://github.com/WordPress/gutenberg/pull/39436))
+-   Fixed the flaky template editor mode test. ([40325](https://github.com/WordPress/gutenberg/pull/40325))
+-   Excluded BEM class from stylelint @wordpress/scripts. ([37531](https://github.com/WordPress/gutenberg/pull/37531))
 
-## First time contributors
+## First-time contributors
 
-The following PRs were merged by first time contributors:
+The following PRs were merged by first-time contributors:
 
-- @chintu51: OnNumberOfItemsChange event attribute issue. ([39942](https://github.com/WordPress/gutenberg/pull/39942))
-- @khoipro: Scripts: Exclude BEM class from stylelint @wordpress/scripts. ([37531](https://github.com/WordPress/gutenberg/pull/37531))
-- @mauriac: Add new option to show or hide empty categories. ([39426](https://github.com/WordPress/gutenberg/pull/39426))
-- @roseg43: Media & Text: Remove font size declaration from template. ([40329](https://github.com/WordPress/gutenberg/pull/40329))
-- @zutigrm: Update `theme.json` documentation for theme authors. ([40005](https://github.com/WordPress/gutenberg/pull/40005))
+-   @chintu51: OnNumberOfItemsChange event attribute issue. ([39942](https://github.com/WordPress/gutenberg/pull/39942))
+-   @khoipro: Scripts: Exclude BEM class from stylelint @wordpress/scripts. ([37531](https://github.com/WordPress/gutenberg/pull/37531))
+-   @mauriac: Add new option to show or hide empty categories. ([39426](https://github.com/WordPress/gutenberg/pull/39426))
+-   @roseg43: Media & Text: Remove font size declaration from template. ([40329](https://github.com/WordPress/gutenberg/pull/40329))
+-   @zutigrm: Update `theme.json` documentation for theme authors. ([40005](https://github.com/WordPress/gutenberg/pull/40005))
 
 ## Contributors
 
@@ -15966,7 +27438,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @ajlende @alexstine @aristath @c4rl0sbr4v0 @chintu51 @ciampo @dmsnell @EliezerSPP @fabiankaegy @fluiddot @georgeh @geriux @glendaviesnz @gziolo @jasmussen @jsnajdr @JustinyAhin @kevin940726 @khoipro @Mamaduka @mashikag @mauriac @mchowning @michalczaplinski @mirka @ntsekouras @oandregal @ockham @peterwilsoncc @ramonjd @roseg43 @scruffian @SiobhyB @t-hamano @talldan @tomasztunik @torounit @youknowriad @ZebulanStanphill @zutigrm
 
-
 = 13.0.0 =
 
 ## Changelog
@@ -15974,380 +27445,384 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Archives: Add yearly, weekly and daily archive settings to the archives block. ([38440](https://github.com/WordPress/gutenberg/pull/38440))
-- Avatar: Increase the size of the Avatar image to be 2x of the width chosen. ([39728](https://github.com/WordPress/gutenberg/pull/39728))
-- Code: Preserves source of unrecognized blocks inside of Code Editor. ([39523](https://github.com/WordPress/gutenberg/pull/39523))
-- Column Block: Add blockGap support. ([40122](https://github.com/WordPress/gutenberg/pull/40122))
-- Comment blocks: Update block descriptions. ([39735](https://github.com/WordPress/gutenberg/pull/39735))
-- Comments Query Loop:
-- Always inherit from core Discussion settings. ([39664](https://github.com/WordPress/gutenberg/pull/39664))
-- Update default template. ([40165](https://github.com/WordPress/gutenberg/pull/40165))
-- Cover: Makes cover block dynamic and adds featured image binding. ([39658](https://github.com/WordPress/gutenberg/pull/39658))
-- Gallery: Add css var to enable theme authors to set a default gallery gap. ([40008](https://github.com/WordPress/gutenberg/pull/40008))
-- Group:
-- New Group, Stack, Row block descriptions. ([40176](https://github.com/WordPress/gutenberg/pull/40176))
-- Cover: Always allow transform from Group block, add handling for Row and Stack variations. ([40212](https://github.com/WordPress/gutenberg/pull/40212))
-- Add the stack block variation to the group block. ([39690](https://github.com/WordPress/gutenberg/pull/39690))
-- Add group block variations to Group toolbar. ([39920](https://github.com/WordPress/gutenberg/pull/39920))
-- Block Variations Transforms: Display as icon buttons if each block variation has a unique icon. ([40036](https://github.com/WordPress/gutenberg/pull/40036))
-- Improve Stack and Row setup states. ([39935](https://github.com/WordPress/gutenberg/pull/39935))
-- Turn the wrap to multiple lines option off by default on the row block. ([40171](https://github.com/WordPress/gutenberg/pull/40171))
-- List: Add a box-sizing border-box to lists. ([39895](https://github.com/WordPress/gutenberg/pull/39895))
-- Navigation:
-- Avoid automatic saving of uncontrolled Nav blocks. ([39883](https://github.com/WordPress/gutenberg/pull/39883))
-- Auto set first Navigation Menu as current if only 1 exists. ([39880](https://github.com/WordPress/gutenberg/pull/39880))
-- Enable navigation nesting to be filtered and manually set. ([38621](https://github.com/WordPress/gutenberg/pull/38621))
-- Improve feedback on Nav Menu deletion. ([39677](https://github.com/WordPress/gutenberg/pull/39677))
-- Skip text decoration support serialization and apply as CSS class. ([36345](https://github.com/WordPress/gutenberg/pull/36345))
-- Navigation Link: Add support for navigation-link descriptions. ([39808](https://github.com/WordPress/gutenberg/pull/39808))
-- Post Comments: Deprecate the Post Comments block. ([40167](https://github.com/WordPress/gutenberg/pull/40167))
-- Post Tags: Update the Post Tags block icon. ([40096](https://github.com/WordPress/gutenberg/pull/40096))
-- Query Loop: Update query block creation and replacement flows. ([38997](https://github.com/WordPress/gutenberg/pull/38997))
-- Query page numbers block: Add same supports that next/prev page have. ([39835](https://github.com/WordPress/gutenberg/pull/39835))
-- Quote: Add color support to the quote block. ([39899](https://github.com/WordPress/gutenberg/pull/39899))
-- Read more: Add support for text color. ([39796](https://github.com/WordPress/gutenberg/pull/39796))
-- RSS:
-- Add missing classnames. ([39716](https://github.com/WordPress/gutenberg/pull/39716))
-- Try prepending HTTP to a URL. ([39758](https://github.com/WordPress/gutenberg/pull/39758))
-- Update max items. ([39819](https://github.com/WordPress/gutenberg/pull/39819))
-- Site Logo and Featured Image: Add duotone to placeholders. ([40085](https://github.com/WordPress/gutenberg/pull/40085))
-- Social Links: Disable vertical alignment controls for navigation and social links. ([40182](https://github.com/WordPress/gutenberg/pull/40182))
-- Template Part: Adjust the layout of thumbnails in the template part replacement modal. ([39766](https://github.com/WordPress/gutenberg/pull/39766))
+
+-   Archives: Add yearly, weekly and daily archive settings to the archives block. ([38440](https://github.com/WordPress/gutenberg/pull/38440))
+-   Avatar: Increase the size of the Avatar image to be 2x of the width chosen. ([39728](https://github.com/WordPress/gutenberg/pull/39728))
+-   Code: Preserves source of unrecognized blocks inside of Code Editor. ([39523](https://github.com/WordPress/gutenberg/pull/39523))
+-   Column Block: Add blockGap support. ([40122](https://github.com/WordPress/gutenberg/pull/40122))
+-   Comment blocks: Update block descriptions. ([39735](https://github.com/WordPress/gutenberg/pull/39735))
+-   Comments Query Loop:
+-   Always inherit from core Discussion settings. ([39664](https://github.com/WordPress/gutenberg/pull/39664))
+-   Update default template. ([40165](https://github.com/WordPress/gutenberg/pull/40165))
+-   Cover: Makes cover block dynamic and adds featured image binding. ([39658](https://github.com/WordPress/gutenberg/pull/39658))
+-   Gallery: Add css var to enable theme authors to set a default gallery gap. ([40008](https://github.com/WordPress/gutenberg/pull/40008))
+-   Group:
+-   New Group, Stack, Row block descriptions. ([40176](https://github.com/WordPress/gutenberg/pull/40176))
+-   Cover: Always allow transform from Group block, add handling for Row and Stack variations. ([40212](https://github.com/WordPress/gutenberg/pull/40212))
+-   Add the stack block variation to the group block. ([39690](https://github.com/WordPress/gutenberg/pull/39690))
+-   Add group block variations to Group toolbar. ([39920](https://github.com/WordPress/gutenberg/pull/39920))
+-   Block Variations Transforms: Display as icon buttons if each block variation has a unique icon. ([40036](https://github.com/WordPress/gutenberg/pull/40036))
+-   Improve Stack and Row setup states. ([39935](https://github.com/WordPress/gutenberg/pull/39935))
+-   Turn the wrap to multiple lines option off by default on the row block. ([40171](https://github.com/WordPress/gutenberg/pull/40171))
+-   List: Add a box-sizing border-box to lists. ([39895](https://github.com/WordPress/gutenberg/pull/39895))
+-   Navigation:
+-   Avoid automatic saving of uncontrolled Nav blocks. ([39883](https://github.com/WordPress/gutenberg/pull/39883))
+-   Auto set first Navigation Menu as current if only 1 exists. ([39880](https://github.com/WordPress/gutenberg/pull/39880))
+-   Enable navigation nesting to be filtered and manually set. ([38621](https://github.com/WordPress/gutenberg/pull/38621))
+-   Improve feedback on Nav Menu deletion. ([39677](https://github.com/WordPress/gutenberg/pull/39677))
+-   Skip text decoration support serialization and apply as CSS class. ([36345](https://github.com/WordPress/gutenberg/pull/36345))
+-   Navigation Link: Add support for navigation-link descriptions. ([39808](https://github.com/WordPress/gutenberg/pull/39808))
+-   Post Comments: Deprecate the Post Comments block. ([40167](https://github.com/WordPress/gutenberg/pull/40167))
+-   Post Tags: Update the Post Tags block icon. ([40096](https://github.com/WordPress/gutenberg/pull/40096))
+-   Query Loop: Update query block creation and replacement flows. ([38997](https://github.com/WordPress/gutenberg/pull/38997))
+-   Query page numbers block: Add same supports that next/prev page have. ([39835](https://github.com/WordPress/gutenberg/pull/39835))
+-   Quote: Add color support to the quote block. ([39899](https://github.com/WordPress/gutenberg/pull/39899))
+-   Read more: Add support for text color. ([39796](https://github.com/WordPress/gutenberg/pull/39796))
+-   RSS:
+-   Add missing classnames. ([39716](https://github.com/WordPress/gutenberg/pull/39716))
+-   Try prepending HTTP to a URL. ([39758](https://github.com/WordPress/gutenberg/pull/39758))
+-   Update max items. ([39819](https://github.com/WordPress/gutenberg/pull/39819))
+-   Site Logo and Featured Image: Add duotone to placeholders. ([40085](https://github.com/WordPress/gutenberg/pull/40085))
+-   Social Links: Disable vertical alignment controls for navigation and social links. ([40182](https://github.com/WordPress/gutenberg/pull/40182))
+-   Template Part: Adjust the layout of thumbnails in the template part replacement modal. ([39766](https://github.com/WordPress/gutenberg/pull/39766))
 
 #### Components 
-- Borders: Add new BorderControl component. ([37769](https://github.com/WordPress/gutenberg/pull/37769))
-- Borders: Add BorderBoxControl component. ([38876](https://github.com/WordPress/gutenberg/pull/38876))
-- BorderControl: Add ability to apply custom CSS classes to popover content. ([39753](https://github.com/WordPress/gutenberg/pull/39753))
-- BorderControl: Fix vertical alignment of inner slider control. ([39750](https://github.com/WordPress/gutenberg/pull/39750))
-- Card: Adjust border radius size. ([40032](https://github.com/WordPress/gutenberg/pull/40032))
-- ColorPalette: Add SlotFillProvider to story to correct tooltip positioning. ([39674](https://github.com/WordPress/gutenberg/pull/39674))
-- UnitControl: Forward onBlur prop as expected. ([39589](https://github.com/WordPress/gutenberg/pull/39589))
-- Add ToggleGroupControlOptionIcon component. ([39760](https://github.com/WordPress/gutenberg/pull/39760))
-- CustomSelectControl: Make chevron consistent with SelectControl. ([40049](https://github.com/WordPress/gutenberg/pull/40049))
+
+-   Borders: Add new BorderControl component. ([37769](https://github.com/WordPress/gutenberg/pull/37769))
+-   Borders: Add BorderBoxControl component. ([38876](https://github.com/WordPress/gutenberg/pull/38876))
+-   BorderControl: Add ability to apply custom CSS classes to popover content. ([39753](https://github.com/WordPress/gutenberg/pull/39753))
+-   BorderControl: Fix vertical alignment of inner slider control. ([39750](https://github.com/WordPress/gutenberg/pull/39750))
+-   Card: Adjust border radius size. ([40032](https://github.com/WordPress/gutenberg/pull/40032))
+-   ColorPalette: Add SlotFillProvider to story to correct tooltip positioning. ([39674](https://github.com/WordPress/gutenberg/pull/39674))
+-   UnitControl: Forward onBlur prop as expected. ([39589](https://github.com/WordPress/gutenberg/pull/39589))
+-   Add ToggleGroupControlOptionIcon component. ([39760](https://github.com/WordPress/gutenberg/pull/39760))
+-   CustomSelectControl: Make chevron consistent with SelectControl. ([40049](https://github.com/WordPress/gutenberg/pull/40049))
 
 #### Styles Sidebar
 
-- Add search in the block types list. ([39117](https://github.com/WordPress/gutenberg/pull/39117))
-- Add labels to the global styles variations. ([39322](https://github.com/WordPress/gutenberg/pull/39322))
-- Show translated strings coming from global styles variations. ([39960](https://github.com/WordPress/gutenberg/pull/39960))
-- Adjust icon vertical alignment with labels. ([39982](https://github.com/WordPress/gutenberg/pull/39982))
-- Tweak preview box. ([39978](https://github.com/WordPress/gutenberg/pull/39978))
-- Update Other styles to Browse styles. ([39752](https://github.com/WordPress/gutenberg/pull/39752))
-- Wrap the preview box in the CardMedia component. ([39980](https://github.com/WordPress/gutenberg/pull/39980))
+-   Add search in the block types list. ([39117](https://github.com/WordPress/gutenberg/pull/39117))
+-   Add labels to the global styles variations. ([39322](https://github.com/WordPress/gutenberg/pull/39322))
+-   Show translated strings coming from global styles variations. ([39960](https://github.com/WordPress/gutenberg/pull/39960))
+-   Adjust icon vertical alignment with labels. ([39982](https://github.com/WordPress/gutenberg/pull/39982))
+-   Tweak preview box. ([39978](https://github.com/WordPress/gutenberg/pull/39978))
+-   Update Other styles to Browse styles. ([39752](https://github.com/WordPress/gutenberg/pull/39752))
+-   Wrap the preview box in the CardMedia component. ([39980](https://github.com/WordPress/gutenberg/pull/39980))
 
 #### Block Editor
 
-- BlockToolbar: Show Group button in toolbar when multiple blocks are selected. ([39710](https://github.com/WordPress/gutenberg/pull/39710))
-- Improvements to use-focus-first-element and utils (dom). ([39461](https://github.com/WordPress/gutenberg/pull/39461))
-- Multi-selection: Allow partial block selection. ([38892](https://github.com/WordPress/gutenberg/pull/38892))
-- [Multi-selection]: Copy/cut partial selected blocks. ([40098](https://github.com/WordPress/gutenberg/pull/40098))- Order ids in getClientIdsOfDescendants and getClientIdsWithDescendants selectors. ([39985](https://github.com/WordPress/gutenberg/pull/39985))
-- Revert Try: Summary panel excerpt max-height.. ([40127](https://github.com/WordPress/gutenberg/pull/40127))
-- Link directly to files stored in the Media Library using the Link UI. ([39701](https://github.com/WordPress/gutenberg/pull/39701))
-- Partial multi-select: Fix error with dead key. ([39850](https://github.com/WordPress/gutenberg/pull/39850))
+-   BlockToolbar: Show Group button in toolbar when multiple blocks are selected. ([39710](https://github.com/WordPress/gutenberg/pull/39710))
+-   Improvements to use-focus-first-element and utils (dom). ([39461](https://github.com/WordPress/gutenberg/pull/39461))
+-   Multi-selection: Allow partial block selection. ([38892](https://github.com/WordPress/gutenberg/pull/38892))
+-   [Multi-selection]: Copy/cut partial selected blocks. ([40098](https://github.com/WordPress/gutenberg/pull/40098))- Order ids in getClientIdsOfDescendants and getClientIdsWithDescendants selectors. ([39985](https://github.com/WordPress/gutenberg/pull/39985))
+-   Revert Try: Summary panel excerpt max-height.. ([40127](https://github.com/WordPress/gutenberg/pull/40127))
+-   Link directly to files stored in the Media Library using the Link UI. ([39701](https://github.com/WordPress/gutenberg/pull/39701))
+-   Partial multi-select: Fix error with dead key. ([39850](https://github.com/WordPress/gutenberg/pull/39850))
 
 #### Post Editor
 
-- Document Settings: Summary panel excerpt max-height. ([40090](https://github.com/WordPress/gutenberg/pull/40090))
-- Migrate editor package isPublishSidebarEnabled to preferences store. ([39707](https://github.com/WordPress/gutenberg/pull/39707))
-- Migrate post editor panels state to preferences store. ([39604](https://github.com/WordPress/gutenberg/pull/39604))
-- Migrate interface enableItems data to preferences package. ([39449](https://github.com/WordPress/gutenberg/pull/39449))
-- Try: Remove iframe 100% width rule. ([38614](https://github.com/WordPress/gutenberg/pull/38614))
+-   Document Settings: Summary panel excerpt max-height. ([40090](https://github.com/WordPress/gutenberg/pull/40090))
+-   Migrate editor package isPublishSidebarEnabled to preferences store. ([39707](https://github.com/WordPress/gutenberg/pull/39707))
+-   Migrate post editor panels state to preferences store. ([39604](https://github.com/WordPress/gutenberg/pull/39604))
+-   Migrate interface enableItems data to preferences package. ([39449](https://github.com/WordPress/gutenberg/pull/39449))
+-   Try: Remove iframe 100% width rule. ([38614](https://github.com/WordPress/gutenberg/pull/38614))
 
 #### Site Editor
 
-- Add a dedicated sidebar for managing layout of navigation menus. ([39290](https://github.com/WordPress/gutenberg/pull/39290), [40083](https://github.com/WordPress/gutenberg/pull/40083))
+-   Add a dedicated sidebar for managing layout of navigation menus. ([39290](https://github.com/WordPress/gutenberg/pull/39290), [40083](https://github.com/WordPress/gutenberg/pull/40083))
 
 #### Block Locking
 
-- Add the useBlockLock hook. ([40210](https://github.com/WordPress/gutenberg/pull/40210), [40220](https://github.com/WordPress/gutenberg/pull/40220))
-- Display lock status in List View. ([40088](https://github.com/WordPress/gutenberg/pull/40088))
-- Styling changes for modal. ([39998](https://github.com/WordPress/gutenberg/pull/39998))
-- Try: Reusable block edit locking. ([39950](https://github.com/WordPress/gutenberg/pull/39950))
-- Block Toolbar: Fix lock icon focus. ([40302](https://github.com/WordPress/gutenberg/pull/40302))
+-   Add the useBlockLock hook. ([40210](https://github.com/WordPress/gutenberg/pull/40210), [40220](https://github.com/WordPress/gutenberg/pull/40220))
+-   Display lock status in List View. ([40088](https://github.com/WordPress/gutenberg/pull/40088))
+-   Styling changes for modal. ([39998](https://github.com/WordPress/gutenberg/pull/39998))
+-   Try: Reusable block edit locking. ([39950](https://github.com/WordPress/gutenberg/pull/39950))
+-   Block Toolbar: Fix lock icon focus. ([40302](https://github.com/WordPress/gutenberg/pull/40302))
+
 #### Reusable Blocks
 
-- Make the Cancel button tertiary. ([39872](https://github.com/WordPress/gutenberg/pull/39872))
-- Use the symbol icon for Reusable Block menu item. ([40020](https://github.com/WordPress/gutenberg/pull/40020))
+-   Make the Cancel button tertiary. ([39872](https://github.com/WordPress/gutenberg/pull/39872))
+-   Use the symbol icon for Reusable Block menu item. ([40020](https://github.com/WordPress/gutenberg/pull/40020))
 
 #### CSS & Styling
 
-- Revert Global styles: Remove block gap control. ([39845](https://github.com/WordPress/gutenberg/pull/39845))
-- Block Styles: Revert changing default overflow-wrap to all headers, lists, and paragraphs. ([39846](https://github.com/WordPress/gutenberg/pull/39846))
-- Style Engine:
-- Add margin support. ([39790](https://github.com/WordPress/gutenberg/pull/39790))
-- Block supports backend. ([39446](https://github.com/WordPress/gutenberg/pull/39446))
+-   Revert Global styles: Remove block gap control. ([39845](https://github.com/WordPress/gutenberg/pull/39845))
+-   Block Styles: Revert changing default overflow-wrap to all headers, lists, and paragraphs. ([39846](https://github.com/WordPress/gutenberg/pull/39846))
+-   Style Engine:
+-   Add margin support. ([39790](https://github.com/WordPress/gutenberg/pull/39790))
+-   Block supports backend. ([39446](https://github.com/WordPress/gutenberg/pull/39446))
 
 #### Design Tools
 
-- Add vertical alignment to blocks using flex control. ([40013](https://github.com/WordPress/gutenberg/pull/40013))
-- Block Supports: Allow skipping serialization of individual features. ([36293](https://github.com/WordPress/gutenberg/pull/36293))
+-   Add vertical alignment to blocks using flex control. ([40013](https://github.com/WordPress/gutenberg/pull/40013))
+-   Block Supports: Allow skipping serialization of individual features. ([36293](https://github.com/WordPress/gutenberg/pull/36293))
 
 #### Block API
 
-- Allow multiple view scripts per block. ([36176](https://github.com/WordPress/gutenberg/pull/36176))
+-   Allow multiple view scripts per block. ([36176](https://github.com/WordPress/gutenberg/pull/36176))
 
 #### Patterns
 
-- Option to pick a pattern on page creation. ([40034](https://github.com/WordPress/gutenberg/pull/40034))
-- Translate pattern metadata (title & description). ([40047](https://github.com/WordPress/gutenberg/pull/40047))
-- Remove batch support declaration from block patterns REST, fix navigation areas. ([39834](https://github.com/WordPress/gutenberg/pull/39834))
+-   Option to pick a pattern on page creation. ([40034](https://github.com/WordPress/gutenberg/pull/40034))
+-   Translate pattern metadata (title & description). ([40047](https://github.com/WordPress/gutenberg/pull/40047))
+-   Remove batch support declaration from block patterns REST, fix navigation areas. ([39834](https://github.com/WordPress/gutenberg/pull/39834))
 
 #### Theme Export
 
-- Change the schema URL. ([40106](https://github.com/WordPress/gutenberg/pull/40106))
-- Convert spaces to tabs in theme.json. ([39751](https://github.com/WordPress/gutenberg/pull/39751))
-- If the theme declares a version number then add a schema. ([39775](https://github.com/WordPress/gutenberg/pull/39775))
-- Remove default theme.json properties on export. ([39848](https://github.com/WordPress/gutenberg/pull/39848))
-- Restore appearanceTools when exporting a theme. ([39840](https://github.com/WordPress/gutenberg/pull/39840))
-- Sort theme.json properties. ([39842](https://github.com/WordPress/gutenberg/pull/39842))
-- Backport changes for Theme Export from 6.0. ([40215](https://github.com/WordPress/gutenberg/pull/40215))
+-   Change the schema URL. ([40106](https://github.com/WordPress/gutenberg/pull/40106))
+-   Convert spaces to tabs in theme.json. ([39751](https://github.com/WordPress/gutenberg/pull/39751))
+-   If the theme declares a version number then add a schema. ([39775](https://github.com/WordPress/gutenberg/pull/39775))
+-   Remove default theme.json properties on export. ([39848](https://github.com/WordPress/gutenberg/pull/39848))
+-   Restore appearanceTools when exporting a theme. ([39840](https://github.com/WordPress/gutenberg/pull/39840))
+-   Sort theme.json properties. ([39842](https://github.com/WordPress/gutenberg/pull/39842))
+-   Backport changes for Theme Export from 6.0. ([40215](https://github.com/WordPress/gutenberg/pull/40215))
 
 #### Webfonts
 
-- Do not trigger warning on already enqueued font families. ([40060](https://github.com/WordPress/gutenberg/pull/40060))
-- Register webfonts defined in styles variations. ([39886](https://github.com/WordPress/gutenberg/pull/39886))
-- Register and enqueue fonts by font-family. ([39559](https://github.com/WordPress/gutenberg/pull/39559))
-- Return font family slug when registering a webfont. ([40120](https://github.com/WordPress/gutenberg/pull/40120))
+-   Do not trigger warning on already enqueued font families. ([40060](https://github.com/WordPress/gutenberg/pull/40060))
+-   Register webfonts defined in styles variations. ([39886](https://github.com/WordPress/gutenberg/pull/39886))
+-   Register and enqueue fonts by font-family. ([39559](https://github.com/WordPress/gutenberg/pull/39559))
+-   Return font family slug when registering a webfont. ([40120](https://github.com/WordPress/gutenberg/pull/40120))
 
 ### Bug Fixes
 
 #### Block Library
 
-- Avatar:
-- Do not show User Selection inside Comments Loop, on the Site Editor. ([40100](https://github.com/WordPress/gutenberg/pull/40100))
-- Fix wrong aligment. ([39794](https://github.com/WordPress/gutenberg/pull/39794))
-- Buttons: Fix focus on insert. ([39684](https://github.com/WordPress/gutenberg/pull/39684))
-- Comments Query Loop: Fix pagination setting not being applied on frontend. ([40146](https://github.com/WordPress/gutenberg/pull/40146))
-- Group: Fix variation isActive check to cover case where type is not set, but inherit is. ([40065](https://github.com/WordPress/gutenberg/pull/40065))
-- Post Author: Fix duplicate Additional CSS classes post author, etc. ([39759](https://github.com/WordPress/gutenberg/pull/39759))
-- Post Comments Form: Allow to add it to the Site Editor. ([40108](https://github.com/WordPress/gutenberg/pull/40108))
-- Post Template: Add missing wp-block-post class in the editor. ([40010](https://github.com/WordPress/gutenberg/pull/40010))
-- Post Terms: Use variation title in placeholder. ([40092](https://github.com/WordPress/gutenberg/pull/40092))
-- Query Loop: Fix some missing term sanitizations. ([39970](https://github.com/WordPress/gutenberg/pull/39970))
-- RSS: Add missing self-URL check. ([39756](https://github.com/WordPress/gutenberg/pull/39756))
-- Site Logo:
-- Correctly reset the site icon. ([40046](https://github.com/WordPress/gutenberg/pull/40046))
-- Fix duplicate Additional CSS classes site-logo Block & social-link Block. ([39777](https://github.com/WordPress/gutenberg/pull/39777))
-- Fix adding the site icon. ([40041](https://github.com/WordPress/gutenberg/pull/40041))
-- Template Parts: Limit slug to Latin chars. ([38861](https://github.com/WordPress/gutenberg/pull/38861))
+-   Avatar:
+-   Do not show User Selection inside Comments Loop, on the Site Editor. ([40100](https://github.com/WordPress/gutenberg/pull/40100))
+-   Fix wrong aligment. ([39794](https://github.com/WordPress/gutenberg/pull/39794))
+-   Buttons: Fix focus on insert. ([39684](https://github.com/WordPress/gutenberg/pull/39684))
+-   Comments Query Loop: Fix pagination setting not being applied on frontend. ([40146](https://github.com/WordPress/gutenberg/pull/40146))
+-   Group: Fix variation isActive check to cover case where type is not set, but inherit is. ([40065](https://github.com/WordPress/gutenberg/pull/40065))
+-   Post Author: Fix duplicate Additional CSS classes post author, etc. ([39759](https://github.com/WordPress/gutenberg/pull/39759))
+-   Post Comments Form: Allow to add it to the Site Editor. ([40108](https://github.com/WordPress/gutenberg/pull/40108))
+-   Post Template: Add missing wp-block-post class in the editor. ([40010](https://github.com/WordPress/gutenberg/pull/40010))
+-   Post Terms: Use variation title in placeholder. ([40092](https://github.com/WordPress/gutenberg/pull/40092))
+-   Query Loop: Fix some missing term sanitizations. ([39970](https://github.com/WordPress/gutenberg/pull/39970))
+-   RSS: Add missing self-URL check. ([39756](https://github.com/WordPress/gutenberg/pull/39756))
+-   Site Logo:
+-   Correctly reset the site icon. ([40046](https://github.com/WordPress/gutenberg/pull/40046))
+-   Fix duplicate Additional CSS classes site-logo Block & social-link Block. ([39777](https://github.com/WordPress/gutenberg/pull/39777))
+-   Fix adding the site icon. ([40041](https://github.com/WordPress/gutenberg/pull/40041))
+-   Template Parts: Limit slug to Latin chars. ([38861](https://github.com/WordPress/gutenberg/pull/38861))
 
 #### Components
 
-- Components utils: Use Object.assign instead of { ...spread } syntax. ([39932](https://github.com/WordPress/gutenberg/pull/39932))
-- ToggleGroupControl: Reintroduce backdrop animation. ([40021](https://github.com/WordPress/gutenberg/pull/40021))
+-   Components utils: Use Object.assign instead of { ...spread } syntax. ([39932](https://github.com/WordPress/gutenberg/pull/39932))
+-   ToggleGroupControl: Reintroduce backdrop animation. ([40021](https://github.com/WordPress/gutenberg/pull/40021))
 
 #### Block Editor
 
-- List View:
-- Only show ellipsis on first selected item or when focused. ([40174](https://github.com/WordPress/gutenberg/pull/40174))
-- Wrap title of block in \<ListView\> in a span. ([39687](https://github.com/WordPress/gutenberg/pull/39687))
-- Disable dragging when block movement is locked. ([40086](https://github.com/WordPress/gutenberg/pull/40086))
-- Fix list-view focus radius. ([39969](https://github.com/WordPress/gutenberg/pull/39969))
-- MultiSelectSidebar: Fix spacing of color panel items. ([40071](https://github.com/WordPress/gutenberg/pull/40071))
-- Fix Block Editor Iframe component to render in standards mode. ([38855](https://github.com/WordPress/gutenberg/pull/38855))
-- Fix collapsing issue with the URL input suggestion container. ([40147](https://github.com/WordPress/gutenberg/pull/40147))
-- Try: Fix regression with mover and block control sizes. ([40037](https://github.com/WordPress/gutenberg/pull/40037))
+-   List View:
+-   Only show ellipsis on first selected item or when focused. ([40174](https://github.com/WordPress/gutenberg/pull/40174))
+-   Wrap title of block in \<ListView\> in a span. ([39687](https://github.com/WordPress/gutenberg/pull/39687))
+-   Disable dragging when block movement is locked. ([40086](https://github.com/WordPress/gutenberg/pull/40086))
+-   Fix list-view focus radius. ([39969](https://github.com/WordPress/gutenberg/pull/39969))
+-   MultiSelectSidebar: Fix spacing of color panel items. ([40071](https://github.com/WordPress/gutenberg/pull/40071))
+-   Fix Block Editor Iframe component to render in standards mode. ([38855](https://github.com/WordPress/gutenberg/pull/38855))
+-   Fix collapsing issue with the URL input suggestion container. ([40147](https://github.com/WordPress/gutenberg/pull/40147))
+-   Try: Fix regression with mover and block control sizes. ([40037](https://github.com/WordPress/gutenberg/pull/40037))
 
 #### Site Editor
 
-- Add block styles slot to the site editor so block style previews can be rendered. ([40245](https://github.com/WordPress/gutenberg/pull/40245))
+-   Add block styles slot to the site editor so block style previews can be rendered. ([40245](https://github.com/WordPress/gutenberg/pull/40245))
 
 #### Block Locking
 
-- Reusable Blocks: Hide Convert to Blocks when locked. ([39939](https://github.com/WordPress/gutenberg/pull/39939))
-- Template Parts: Hide Detach blocks when locked. ([40000](https://github.com/WordPress/gutenberg/pull/40000))
-- Stabilize settings. ([40145](https://github.com/WordPress/gutenberg/pull/40145))
-- Display block title when no switcher is available. ([40207](https://github.com/WordPress/gutenberg/pull/40207))
+-   Reusable Blocks: Hide Convert to Blocks when locked. ([39939](https://github.com/WordPress/gutenberg/pull/39939))
+-   Template Parts: Hide Detach blocks when locked. ([40000](https://github.com/WordPress/gutenberg/pull/40000))
+-   Stabilize settings. ([40145](https://github.com/WordPress/gutenberg/pull/40145))
+-   Display block title when no switcher is available. ([40207](https://github.com/WordPress/gutenberg/pull/40207))
 
 #### Styles Sidebar
 
-- Fix global style variations previews not showing correct height. ([39737](https://github.com/WordPress/gutenberg/pull/39737))
-- Restore defaultPalette/defaultGradients to only hide UI. ([39966](https://github.com/WordPress/gutenberg/pull/39966))
-- Global Styles: Fix alignment of Global Styles color controls. ([40081](https://github.com/WordPress/gutenberg/pull/40081))
-- Global Styles: Fix black inconsistencies in sidebar. ([40055](https://github.com/WordPress/gutenberg/pull/40055))
+-   Fix global style variations previews not showing correct height. ([39737](https://github.com/WordPress/gutenberg/pull/39737))
+-   Restore defaultPalette/defaultGradients to only hide UI. ([39966](https://github.com/WordPress/gutenberg/pull/39966))
+-   Global Styles: Fix alignment of Global Styles color controls. ([40081](https://github.com/WordPress/gutenberg/pull/40081))
+-   Global Styles: Fix black inconsistencies in sidebar. ([40055](https://github.com/WordPress/gutenberg/pull/40055))
 
 #### Design Tools
 
-- Block gap: Check for splitOnAxis in the onChange callback. ([39788](https://github.com/WordPress/gutenberg/pull/39788))
-- Duotone: Backport changes made to duotone in core. ([40067](https://github.com/WordPress/gutenberg/pull/40067))
-- Layout: Only show inherit toggle in default layout (hide on Row block variation). ([39665](https://github.com/WordPress/gutenberg/pull/39665))
+-   Block gap: Check for splitOnAxis in the onChange callback. ([39788](https://github.com/WordPress/gutenberg/pull/39788))
+-   Duotone: Backport changes made to duotone in core. ([40067](https://github.com/WordPress/gutenberg/pull/40067))
+-   Layout: Only show inherit toggle in default layout (hide on Row block variation). ([39665](https://github.com/WordPress/gutenberg/pull/39665))
 
 #### Meta Boxes
 
-- Fix incorrect meta box position when switching device preview. ([38910](https://github.com/WordPress/gutenberg/pull/38910))
+-   Fix incorrect meta box position when switching device preview. ([38910](https://github.com/WordPress/gutenberg/pull/38910))
 
 #### Other packages
 
-- Data: Exclude all meta-selectors, handle selectors without resolvers. ([39976](https://github.com/WordPress/gutenberg/pull/39976))
-- Date: Fix ordinal token (S), RFC2822 token (r), and timezone offset handling. ([39670](https://github.com/WordPress/gutenberg/pull/39670))
-- RichText: Fix splitValue with undefined selection. ([39822](https://github.com/WordPress/gutenberg/pull/39822))
-- Scripts: Add vendor/ to .markdownlintignore. ([39724](https://github.com/WordPress/gutenberg/pull/39724))
+-   Data: Exclude all meta-selectors, handle selectors without resolvers. ([39976](https://github.com/WordPress/gutenberg/pull/39976))
+-   Date: Fix ordinal token (S), RFC2822 token (r), and timezone offset handling. ([39670](https://github.com/WordPress/gutenberg/pull/39670))
+-   RichText: Fix splitValue with undefined selection. ([39822](https://github.com/WordPress/gutenberg/pull/39822))
+-   Scripts: Add vendor/ to .markdownlintignore. ([39724](https://github.com/WordPress/gutenberg/pull/39724))
 
 ### Plugin
 
-- Fix REST API class redeclaration. ([40265](https://github.com/WordPress/gutenberg/pull/40265))
+-   Fix REST API class redeclaration. ([40265](https://github.com/WordPress/gutenberg/pull/40265))
 
 ### Accessibility
 
-- Add select-parent button to block toolbar More options menu. ([40105](https://github.com/WordPress/gutenberg/pull/40105))
-- Hide block movers in new navigation sidebar. ([40039](https://github.com/WordPress/gutenberg/pull/40039))
-- Accessibility improvements to the query pagination block. ([39536](https://github.com/WordPress/gutenberg/pull/39536))
-- Conditionally set secondary sidebar landmark region labels. ([40296](https://github.com/WordPress/gutenberg/pull/40296))
-- List View: Indicate locked status in block label. ([40270](https://github.com/WordPress/gutenberg/pull/40270))
+-   Add select-parent button to block toolbar More options menu. ([40105](https://github.com/WordPress/gutenberg/pull/40105))
+-   Hide block movers in new navigation sidebar. ([40039](https://github.com/WordPress/gutenberg/pull/40039))
+-   Accessibility improvements to the query pagination block. ([39536](https://github.com/WordPress/gutenberg/pull/39536))
+-   Conditionally set secondary sidebar landmark region labels. ([40296](https://github.com/WordPress/gutenberg/pull/40296))
+-   List View: Indicate locked status in block label. ([40270](https://github.com/WordPress/gutenberg/pull/40270))
 
 ### Performance
 
-- Optimize getClientIdsOfDescendants and getClientIdsWithDescendants selectors. ([40054](https://github.com/WordPress/gutenberg/pull/40054))
-- Try to optimize getClientIdsOfDescendants using createSelector memoization. ([40112](https://github.com/WordPress/gutenberg/pull/40112))
+-   Optimize getClientIdsOfDescendants and getClientIdsWithDescendants selectors. ([40054](https://github.com/WordPress/gutenberg/pull/40054))
+-   Try to optimize getClientIdsOfDescendants using createSelector memoization. ([40112](https://github.com/WordPress/gutenberg/pull/40112))
 
 ### Developer Experience
 
-- create-block: Add npmDevDependencies as a template variable. ([39723](https://github.com/WordPress/gutenberg/pull/39723))
-- Schemas, block.json:
-- Add ancestor prop to schema. ([39894](https://github.com/WordPress/gutenberg/pull/39894))
-- Add supports.lock to schema. ([40161](https://github.com/WordPress/gutenberg/pull/40161))
-- Schemas, theme.json:
-- Add Avatar to schema. ([40189](https://github.com/WordPress/gutenberg/pull/40189))
-- Add title key to i18n schema. ([39936](https://github.com/WordPress/gutenberg/pull/39936))
-- Scripts: Add new flag to allow customization of the src directory. ([39618](https://github.com/WordPress/gutenberg/pull/39618))
+-   create-block: Add npmDevDependencies as a template variable. ([39723](https://github.com/WordPress/gutenberg/pull/39723))
+-   Schemas, block.json:
+-   Add ancestor prop to schema. ([39894](https://github.com/WordPress/gutenberg/pull/39894))
+-   Add supports.lock to schema. ([40161](https://github.com/WordPress/gutenberg/pull/40161))
+-   Schemas, theme.json:
+-   Add Avatar to schema. ([40189](https://github.com/WordPress/gutenberg/pull/40189))
+-   Add title key to i18n schema. ([39936](https://github.com/WordPress/gutenberg/pull/39936))
+-   Scripts: Add new flag to allow customization of the src directory. ([39618](https://github.com/WordPress/gutenberg/pull/39618))
 
 ### Experiments
 
-- List v2:
-- Add migration from v1 to v2. ([39799](https://github.com/WordPress/gutenberg/pull/39799), [39892](https://github.com/WordPress/gutenberg/pull/39892))
-- Add new list item icon. ([39929](https://github.com/WordPress/gutenberg/pull/39929))
-- Avoid using global select. ([39821](https://github.com/WordPress/gutenberg/pull/39821), [39849](https://github.com/WordPress/gutenberg/pull/39849))
-- Handle Enter in empty list items. ([39858](https://github.com/WordPress/gutenberg/pull/39858))
-- Outdent and Indent actions for the list block v2. ([39773](https://github.com/WordPress/gutenberg/pull/39773))
-- Quote v2:
-- Add \_\_experimentalEnableQuoteBlockV2 flag. ([40089](https://github.com/WordPress/gutenberg/pull/40089))
-- Add align feature to have feature parity with v1. ([39876](https://github.com/WordPress/gutenberg/pull/39876))
-- Add innerblocks support. ([39704](https://github.com/WordPress/gutenberg/pull/39704))
-- Add migration. ([39844](https://github.com/WordPress/gutenberg/pull/39844))
-- Add transforms. ([39718](https://github.com/WordPress/gutenberg/pull/39718))
-- Bootstrap flag in experiments page. ([39703](https://github.com/WordPress/gutenberg/pull/39703))
-- Retain selection after transform. ([39838](https://github.com/WordPress/gutenberg/pull/39838))
-- Revert markup changes. ([39824](https://github.com/WordPress/gutenberg/pull/39824))
-- Fix how attributes are registered. ([39729](https://github.com/WordPress/gutenberg/pull/39729))
-- \_\_experimentalBlockPatterns: Load them with REST API. ([39185](https://github.com/WordPress/gutenberg/pull/39185))
+-   List v2:
+-   Add migration from v1 to v2. ([39799](https://github.com/WordPress/gutenberg/pull/39799), [39892](https://github.com/WordPress/gutenberg/pull/39892))
+-   Add new list item icon. ([39929](https://github.com/WordPress/gutenberg/pull/39929))
+-   Avoid using global select. ([39821](https://github.com/WordPress/gutenberg/pull/39821), [39849](https://github.com/WordPress/gutenberg/pull/39849))
+-   Handle Enter in empty list items. ([39858](https://github.com/WordPress/gutenberg/pull/39858))
+-   Outdent and Indent actions for the list block v2. ([39773](https://github.com/WordPress/gutenberg/pull/39773))
+-   Quote v2:
+-   Add \_\_experimentalEnableQuoteBlockV2 flag. ([40089](https://github.com/WordPress/gutenberg/pull/40089))
+-   Add align feature to have feature parity with v1. ([39876](https://github.com/WordPress/gutenberg/pull/39876))
+-   Add innerblocks support. ([39704](https://github.com/WordPress/gutenberg/pull/39704))
+-   Add migration. ([39844](https://github.com/WordPress/gutenberg/pull/39844))
+-   Add transforms. ([39718](https://github.com/WordPress/gutenberg/pull/39718))
+-   Bootstrap flag in experiments page. ([39703](https://github.com/WordPress/gutenberg/pull/39703))
+-   Retain selection after transform. ([39838](https://github.com/WordPress/gutenberg/pull/39838))
+-   Revert markup changes. ([39824](https://github.com/WordPress/gutenberg/pull/39824))
+-   Fix how attributes are registered. ([39729](https://github.com/WordPress/gutenberg/pull/39729))
+-   \_\_experimentalBlockPatterns: Load them with REST API. ([39185](https://github.com/WordPress/gutenberg/pull/39185))
 
 ### Documentation
 
-- Add missing props mediaPreview in the ReadMe. ([38114](https://github.com/WordPress/gutenberg/pull/38114))
-- Add note to Handbook themes page about FSE eligible themes. ([39662](https://github.com/WordPress/gutenberg/pull/39662))
-- Adds links to contributing pages to README file. ([39959](https://github.com/WordPress/gutenberg/pull/39959))
-- Block-Editor Docs: Link to component readme. ([37975](https://github.com/WordPress/gutenberg/pull/37975))
-- Components: Add changelogs for new border control components. ([39747](https://github.com/WordPress/gutenberg/pull/39747))
-- Components: Add more prominent documentation around popover use. ([39709](https://github.com/WordPress/gutenberg/pull/39709))
-- Disabled: Add documentation for Disabled.Context. ([39627](https://github.com/WordPress/gutenberg/pull/39627))
-- Docs: Update README.md for FormToggle component. ([36932](https://github.com/WordPress/gutenberg/pull/36932))
-- Docs: Update block-filters.md. ([38462](https://github.com/WordPress/gutenberg/pull/38462))
-- FIX missing images of Gutenberg Data Apps document. ([39499](https://github.com/WordPress/gutenberg/pull/39499))
-- Fix grammar error in documentation. ([40009](https://github.com/WordPress/gutenberg/pull/40009))
-- Fix linguistic error in theme-json.md. ([39995](https://github.com/WordPress/gutenberg/pull/39995))
-- Import the Notice package in the example. ([40022](https://github.com/WordPress/gutenberg/pull/40022))
-- Sidebar: Update post editor help links to use newer documentation. ([39688](https://github.com/WordPress/gutenberg/pull/39688))
-- Style Engine: Remove since 6.0 comment. ([40006](https://github.com/WordPress/gutenberg/pull/40006))
-- Update typo in the code comment. ([39429](https://github.com/WordPress/gutenberg/pull/39429))
-- Updating versions in WordPress to add 5.9.x & 6.0. ([39866](https://github.com/WordPress/gutenberg/pull/39866))
+-   Add missing props mediaPreview in the ReadMe. ([38114](https://github.com/WordPress/gutenberg/pull/38114))
+-   Add note to Handbook themes page about FSE eligible themes. ([39662](https://github.com/WordPress/gutenberg/pull/39662))
+-   Adds links to contributing pages to README file. ([39959](https://github.com/WordPress/gutenberg/pull/39959))
+-   Block-Editor Docs: Link to component readme. ([37975](https://github.com/WordPress/gutenberg/pull/37975))
+-   Components: Add changelogs for new border control components. ([39747](https://github.com/WordPress/gutenberg/pull/39747))
+-   Components: Add more prominent documentation around popover use. ([39709](https://github.com/WordPress/gutenberg/pull/39709))
+-   Disabled: Add documentation for Disabled.Context. ([39627](https://github.com/WordPress/gutenberg/pull/39627))
+-   Docs: Update README.md for FormToggle component. ([36932](https://github.com/WordPress/gutenberg/pull/36932))
+-   Docs: Update block-filters.md. ([38462](https://github.com/WordPress/gutenberg/pull/38462))
+-   FIX missing images of Gutenberg Data Apps document. ([39499](https://github.com/WordPress/gutenberg/pull/39499))
+-   Fix grammar error in documentation. ([40009](https://github.com/WordPress/gutenberg/pull/40009))
+-   Fix linguistic error in theme-json.md. ([39995](https://github.com/WordPress/gutenberg/pull/39995))
+-   Import the Notice package in the example. ([40022](https://github.com/WordPress/gutenberg/pull/40022))
+-   Sidebar: Update post editor help links to use newer documentation. ([39688](https://github.com/WordPress/gutenberg/pull/39688))
+-   Style Engine: Remove since 6.0 comment. ([40006](https://github.com/WordPress/gutenberg/pull/40006))
+-   Update typo in the code comment. ([39429](https://github.com/WordPress/gutenberg/pull/39429))
+-   Updating versions in WordPress to add 5.9.x & 6.0. ([39866](https://github.com/WordPress/gutenberg/pull/39866))
 
 ### Code Quality
 
 #### Block Library
-- Avatar: Two unneeded spaces removed. ([39902](https://github.com/WordPress/gutenberg/pull/39902))
-- List: List block indent outdent naming. ([39956](https://github.com/WordPress/gutenberg/pull/39956))
-- HTML: Use Disabled.Context. ([39669](https://github.com/WordPress/gutenberg/pull/39669))
-- Gallery: Use wp\_unique\_id() instead of uniqid() in block\_core\_gallery\_render(). ([39983](https://github.com/WordPress/gutenberg/pull/39983))
+
+-   Avatar: Two unneeded spaces removed. ([39902](https://github.com/WordPress/gutenberg/pull/39902))
+-   List: List block indent outdent naming. ([39956](https://github.com/WordPress/gutenberg/pull/39956))
+-   HTML: Use Disabled.Context. ([39669](https://github.com/WordPress/gutenberg/pull/39669))
+-   Gallery: Use wp_unique_id() instead of uniqid() in block_core_gallery_render(). ([39983](https://github.com/WordPress/gutenberg/pull/39983))
 
 #### Block Editor
 
-- Block Lock toolbar remove leftovers. ([39881](https://github.com/WordPress/gutenberg/pull/39881))
-- List View: Remove unwanted default false in ListView branch component. ([39719](https://github.com/WordPress/gutenberg/pull/39719))
+-   Block Lock toolbar remove leftovers. ([39881](https://github.com/WordPress/gutenberg/pull/39881))
+-   List View: Remove unwanted default false in ListView branch component. ([39719](https://github.com/WordPress/gutenberg/pull/39719))
 
 #### Components
 
-- BaseControl: Migrate to TypeScript. ([39468](https://github.com/WordPress/gutenberg/pull/39468))
+-   BaseControl: Migrate to TypeScript. ([39468](https://github.com/WordPress/gutenberg/pull/39468))
 
 #### Plugin
 
-- Add the missing class-wp-style-engine-gutenberg.php in the plugin build ([40191](https://github.com/WordPress/gutenberg/pull/40191))
-- Block Editor: Stabilize generateAnchors setting. ([40143](https://github.com/WordPress/gutenberg/pull/40143))
-- Correctly classify functionality in the lib folder. ([39972](https://github.com/WordPress/gutenberg/pull/39972))
-- Consolidate WP\_Theme\_JSON\_Resolver changes in both lib/compat/wordpress-6.0 and lib/experimental. ([40140](https://github.com/WordPress/gutenberg/pull/40140))
-- Don't run preg\_match() on null values. ([39927](https://github.com/WordPress/gutenberg/pull/39927))
-- Guard code from redeclaration errors after WP core merge. ([39888](https://github.com/WordPress/gutenberg/pull/39888))
-- Move files from lib to the compat subfolder. ([39904](https://github.com/WordPress/gutenberg/pull/39904))
-- Move changes from [\#38681](https://github.com/WordPress/gutenberg/pull/38681) and [\#39966](https://github.com/WordPress/gutenberg/pull/39966) to compat 6.0. ([40123](https://github.com/WordPress/gutenberg/pull/40123))
-- Plugin: Ensure that PHP code for blocks is correctly assigned to WP releases. ([40179](https://github.com/WordPress/gutenberg/pull/40179))
-- Remove the experimental Progressive Web Apps (PWA) integration. ([38810](https://github.com/WordPress/gutenberg/pull/38810))
-- Revert Plugin: Remove the experimental Progressive Web Apps (PWA) integration. ([39930](https://github.com/WordPress/gutenberg/pull/39930))
-- Theme JSON compat: Refer to static instead of self for ROOT\_BLOCK\_SELECTOR const. ([39921](https://github.com/WordPress/gutenberg/pull/39921))
-- i18n: Add context to 'None' strings. ([40273](https://github.com/WordPress/gutenberg/pull/40273))
+-   Add the missing class-wp-style-engine-gutenberg.php in the plugin build ([40191](https://github.com/WordPress/gutenberg/pull/40191))
+-   Block Editor: Stabilize generateAnchors setting. ([40143](https://github.com/WordPress/gutenberg/pull/40143))
+-   Correctly classify functionality in the lib folder. ([39972](https://github.com/WordPress/gutenberg/pull/39972))
+-   Consolidate WP_Theme_JSON_Resolver changes in both lib/compat/wordpress-6.0 and lib/experimental. ([40140](https://github.com/WordPress/gutenberg/pull/40140))
+-   Don't run preg_match() on null values. ([39927](https://github.com/WordPress/gutenberg/pull/39927))
+-   Guard code from redeclaration errors after WP core merge. ([39888](https://github.com/WordPress/gutenberg/pull/39888))
+-   Move files from lib to the compat subfolder. ([39904](https://github.com/WordPress/gutenberg/pull/39904))
+-   Move changes from [\#38681](https://github.com/WordPress/gutenberg/pull/38681) and [\#39966](https://github.com/WordPress/gutenberg/pull/39966) to compat 6.0. ([40123](https://github.com/WordPress/gutenberg/pull/40123))
+-   Plugin: Ensure that PHP code for blocks is correctly assigned to WP releases. ([40179](https://github.com/WordPress/gutenberg/pull/40179))
+-   Remove the experimental Progressive Web Apps (PWA) integration. ([38810](https://github.com/WordPress/gutenberg/pull/38810))
+-   Revert Plugin: Remove the experimental Progressive Web Apps (PWA) integration. ([39930](https://github.com/WordPress/gutenberg/pull/39930))
+-   Theme JSON compat: Refer to static instead of self for ROOT_BLOCK_SELECTOR const. ([39921](https://github.com/WordPress/gutenberg/pull/39921))
+-   i18n: Add context to 'None' strings. ([40273](https://github.com/WordPress/gutenberg/pull/40273))
 
 #### Packages
 
-- Core Data:
-- Migrate entities.js to Typescript. ([39547](https://github.com/WordPress/gutenberg/pull/39547))
-- Rename core-data/src/selectors.js to selectors.ts (TypeScript). ([40026](https://github.com/WordPress/gutenberg/pull/40026))
-- Fixes necessary for converting to TypeScript. ([39211](https://github.com/WordPress/gutenberg/pull/39211))
-- Create type for undo state and initialize atomically. ([39659](https://github.com/WordPress/gutenberg/pull/39659))
-- Expand type signature of useQuerySelect. ([39656](https://github.com/WordPress/gutenberg/pull/39656))
-- Fix minor type issue in onSubKey. ([39655](https://github.com/WordPress/gutenberg/pull/39655))
-- Data:
-- Mark/data apis unstable. ([40028](https://github.com/WordPress/gutenberg/pull/40028))
-- Two code improvements. ([39975](https://github.com/WordPress/gutenberg/pull/39975))
-- Scripts: Fix typo in the webpack configuration. ([39867](https://github.com/WordPress/gutenberg/pull/39867))
+-   Core Data:
+-   Migrate entities.js to Typescript. ([39547](https://github.com/WordPress/gutenberg/pull/39547))
+-   Rename core-data/src/selectors.js to selectors.ts (TypeScript). ([40026](https://github.com/WordPress/gutenberg/pull/40026))
+-   Fixes necessary for converting to TypeScript. ([39211](https://github.com/WordPress/gutenberg/pull/39211))
+-   Create type for undo state and initialize atomically. ([39659](https://github.com/WordPress/gutenberg/pull/39659))
+-   Expand type signature of useQuerySelect. ([39656](https://github.com/WordPress/gutenberg/pull/39656))
+-   Fix minor type issue in onSubKey. ([39655](https://github.com/WordPress/gutenberg/pull/39655))
+-   Data:
+-   Mark/data apis unstable. ([40028](https://github.com/WordPress/gutenberg/pull/40028))
+-   Two code improvements. ([39975](https://github.com/WordPress/gutenberg/pull/39975))
+-   Scripts: Fix typo in the webpack configuration. ([39867](https://github.com/WordPress/gutenberg/pull/39867))
 
 #### REST API
 
-- Block patterns REST endpoint: Use snake case for field names. ([40254](https://github.com/WordPress/gutenberg/pull/40254))
-- Update patterns REST controllers namespace to stable. ([40252](https://github.com/WordPress/gutenberg/pull/40252))
+-   Block patterns REST endpoint: Use snake case for field names. ([40254](https://github.com/WordPress/gutenberg/pull/40254))
+-   Update patterns REST controllers namespace to stable. ([40252](https://github.com/WordPress/gutenberg/pull/40252))
 
 #### Styles
 
-- Rename name to title in the global style variations. ([39715](https://github.com/WordPress/gutenberg/pull/39715))
+-   Rename name to title in the global style variations. ([39715](https://github.com/WordPress/gutenberg/pull/39715))
 
 ### Tools
 
 #### Linting
 
-- Revert unwanted breaking changes in eslint-plugin. ([39745](https://github.com/WordPress/gutenberg/pull/39745))
-- UseBlockDisplayTitle fix ESLint warning. ([39815](https://github.com/WordPress/gutenberg/pull/39815))
-- UseEntityRecord(s) fix ESLint warning. ([39852](https://github.com/WordPress/gutenberg/pull/39852))
+-   Revert unwanted breaking changes in eslint-plugin. ([39745](https://github.com/WordPress/gutenberg/pull/39745))
+-   UseBlockDisplayTitle fix ESLint warning. ([39815](https://github.com/WordPress/gutenberg/pull/39815))
+-   UseEntityRecord(s) fix ESLint warning. ([39852](https://github.com/WordPress/gutenberg/pull/39852))
 
 #### Testing
 
-- ActivateTheme wait for the user to switch. ([39873](https://github.com/WordPress/gutenberg/pull/39873))
-- Add a unit test for wp\_recursive\_ksort. ([40149](https://github.com/WordPress/gutenberg/pull/40149))
-- Check for missing figcaption before clicking gallery image again from list view. ([39666](https://github.com/WordPress/gutenberg/pull/39666))
-- Comments Query Loop: Add end-to-end tests for the block. ([39502](https://github.com/WordPress/gutenberg/pull/39502))
-- waitForNavigation in Comments Query Loop test. ([39818](https://github.com/WordPress/gutenberg/pull/39818))
-- Fix flaky issue reporter not splitting ... separator. ([40129](https://github.com/WordPress/gutenberg/pull/40129))
-- Fix flaky test results overflowing the character limits of GitHub's issue. ([39928](https://github.com/WordPress/gutenberg/pull/39928))
-- ListView: Fix end-to-end flakiness. ([39742](https://github.com/WordPress/gutenberg/pull/39742))
-- Migrate customizing-widgets to Playwright. ([39540](https://github.com/WordPress/gutenberg/pull/39540))
-- Migrate cut-copy-paste-whole-blocks to Playwright. ([39807](https://github.com/WordPress/gutenberg/pull/39807))
-- Migrate new-post to Playwright. ([39539](https://github.com/WordPress/gutenberg/pull/39539))
-- Navigaton block: Fix flaky test by finalising request resolution in Nav block end-to-end test. ([39633](https://github.com/WordPress/gutenberg/pull/39633))
-- Navigation Editor: Skip failing navigation editor tests. ([39746](https://github.com/WordPress/gutenberg/pull/39746))
-- Style variations: Apply style variations using labels. ([39725](https://github.com/WordPress/gutenberg/pull/39725))
-- Template Mode: Try fix flaky tests. ([39711](https://github.com/WordPress/gutenberg/pull/39711))
-- Template parts: Try fixing template part tests again. ([40007](https://github.com/WordPress/gutenberg/pull/40007))
-- Use a description that matches the filename for the annotations end-to-end tests. ([40011](https://github.com/WordPress/gutenberg/pull/40011))
-- Use templates endpoint to delete templates. ([39965](https://github.com/WordPress/gutenberg/pull/39965))
+-   ActivateTheme wait for the user to switch. ([39873](https://github.com/WordPress/gutenberg/pull/39873))
+-   Add a unit test for wp_recursive_ksort. ([40149](https://github.com/WordPress/gutenberg/pull/40149))
+-   Check for missing figcaption before clicking gallery image again from list view. ([39666](https://github.com/WordPress/gutenberg/pull/39666))
+-   Comments Query Loop: Add end-to-end tests for the block. ([39502](https://github.com/WordPress/gutenberg/pull/39502))
+-   waitForNavigation in Comments Query Loop test. ([39818](https://github.com/WordPress/gutenberg/pull/39818))
+-   Fix flaky issue reporter not splitting ... separator. ([40129](https://github.com/WordPress/gutenberg/pull/40129))
+-   Fix flaky test results overflowing the character limits of GitHub's issue. ([39928](https://github.com/WordPress/gutenberg/pull/39928))
+-   ListView: Fix end-to-end flakiness. ([39742](https://github.com/WordPress/gutenberg/pull/39742))
+-   Migrate customizing-widgets to Playwright. ([39540](https://github.com/WordPress/gutenberg/pull/39540))
+-   Migrate cut-copy-paste-whole-blocks to Playwright. ([39807](https://github.com/WordPress/gutenberg/pull/39807))
+-   Migrate new-post to Playwright. ([39539](https://github.com/WordPress/gutenberg/pull/39539))
+-   Navigaton block: Fix flaky test by finalising request resolution in Nav block end-to-end test. ([39633](https://github.com/WordPress/gutenberg/pull/39633))
+-   Navigation Editor: Skip failing navigation editor tests. ([39746](https://github.com/WordPress/gutenberg/pull/39746))
+-   Style variations: Apply style variations using labels. ([39725](https://github.com/WordPress/gutenberg/pull/39725))
+-   Template Mode: Try fix flaky tests. ([39711](https://github.com/WordPress/gutenberg/pull/39711))
+-   Template parts: Try fixing template part tests again. ([40007](https://github.com/WordPress/gutenberg/pull/40007))
+-   Use a description that matches the filename for the annotations end-to-end tests. ([40011](https://github.com/WordPress/gutenberg/pull/40011))
+-   Use templates endpoint to delete templates. ([39965](https://github.com/WordPress/gutenberg/pull/39965))
 
 #### Build Tooling
 
-- Add peer deps for postcss and end-to-end tests. ([39080](https://github.com/WordPress/gutenberg/pull/39080))
-- Plugin: Pin dependencies that slipped into trunk. ([39865](https://github.com/WordPress/gutenberg/pull/39865))
-- Mark new blocks to be included in WordPress core. ([40186](https://github.com/WordPress/gutenberg/pull/40186))
-- Style engine: Move backend scripts to package. ([39736](https://github.com/WordPress/gutenberg/pull/39736))
-- Scripts: Add .jsx file extension to Webpack. ([39613](https://github.com/WordPress/gutenberg/pull/39613))
-- Tooling: Escape quotes in npm scripts. ([39447](https://github.com/WordPress/gutenberg/pull/39447))
+-   Add peer deps for postcss and end-to-end tests. ([39080](https://github.com/WordPress/gutenberg/pull/39080))
+-   Plugin: Pin dependencies that slipped into trunk. ([39865](https://github.com/WordPress/gutenberg/pull/39865))
+-   Mark new blocks to be included in WordPress core. ([40186](https://github.com/WordPress/gutenberg/pull/40186))
+-   Style engine: Move backend scripts to package. ([39736](https://github.com/WordPress/gutenberg/pull/39736))
+-   Scripts: Add .jsx file extension to Webpack. ([39613](https://github.com/WordPress/gutenberg/pull/39613))
+-   Tooling: Escape quotes in npm scripts. ([39447](https://github.com/WordPress/gutenberg/pull/39447))
 
 #### Project management
 
-- Remove Antonis as codeowner. ([39697](https://github.com/WordPress/gutenberg/pull/39697))
+-   Remove Antonis as codeowner. ([39697](https://github.com/WordPress/gutenberg/pull/39697))
 
 ## Contributors
 
@@ -16355,366 +27830,309 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @ajlende @alexstine @andrewserong @annezazu @arcangelini @aristath @arthur791004 @atachibana @c4rl0sbr4v0 @carolinan @chintu51 @ciampo @dali-rajab @DAreRodz @dd32 @delowardev @dmsnell @draganescu @EliezerSPP @ellatrix @fluiddot @geriux @getdave @glendaviesnz @grappler @gwwar @gziolo @HILAYTRIVEDI @hypest @imangm @jakeparis @jameskoster @jasmussen @jezemery @jorgefilipecosta @jostnes @jsnajdr @JustinyAhin @kadimi @karolinakulinska @kevin940726 @MaggieCabrera @Mamaduka @mburridge @mchowning @michalczaplinski @mirka @ndiego @NekoJonez @noahtallen @noisysocks @ntsekouras @oandregal @ockham @ramonjd @ryanwelcher @scruffian @shimotmk @SiobhyB @sunil25393 @t-hamano @talldan @tomalec @tomasztunik @westonruter @youknowriad @zaguiini @ZebulanStanphill
 
-
-
-
 = 12.9.0 =
 
+## Changelog
 
+### Features
 
-## **Changelog**
-
-
-### **Features**
-
-
-#### **Block Library**
-
-* Block Editor: Introduce block locking UI. ([39183](https://github.com/WordPress/gutenberg/pull/39183))
-* Post Date: Allow user to pick Site Default, a suggested date format, or a custom date format. ([39209](https://github.com/WordPress/gutenberg/pull/39209))
-* Try: "No results" block container for the query block. ([38806](https://github.com/WordPress/gutenberg/pull/38806))
-
-
-### **Enhancements**
-
-
-#### **Accessibility**
-
-* Add aria label to Nav block on front of site. ([39161](https://github.com/WordPress/gutenberg/pull/39161))
-* Add button text labels to site editor. ([38317](https://github.com/WordPress/gutenberg/pull/38317))
-* Prevent focus loss after removing a block from List View. ([39031](https://github.com/WordPress/gutenberg/pull/39031))
-
-
-#### **Components**
-
-* Add onClick prop to FormFileUpload. ([39268](https://github.com/WordPress/gutenberg/pull/39268))
-* CheckboxControl: Support indeterminate state. ([39462](https://github.com/WordPress/gutenberg/pull/39462))
-* List View: Add multi-select support for shift + Home and End keys. ([39272](https://github.com/WordPress/gutenberg/pull/39272))
-* `BoxControl`: Stop using `UnitControl`'s deprecated `unit` prop. ([39511](https://github.com/WordPress/gutenberg/pull/39511))
-* `FocalPointPicker`: Stop using `UnitControl`'s deprecated `unit` prop. ([39504](https://github.com/WordPress/gutenberg/pull/39504))
-* `ColorPalette`: Refine the label of the custom color button. ([39386](https://github.com/WordPress/gutenberg/pull/39386))
-* Rich text: Allow behaviour to be overridden by ref. ([39631](https://github.com/WordPress/gutenberg/pull/39631))
-* Add id prop to ListView. ([39494](https://github.com/WordPress/gutenberg/pull/39494))
-* Collapse list view by default in Site Editor. ([39573](https://github.com/WordPress/gutenberg/pull/39573))
-* Collapse list view by default in all editors. ([39611](https://github.com/WordPress/gutenberg/pull/39611))
-* Add prop to control default expand/collapse state of ListView nodes. ([39486](https://github.com/WordPress/gutenberg/pull/39486))
-* BaseControl: Add opt-in prop for margin-free styles. ([39325](https://github.com/WordPress/gutenberg/pull/39325))
-* CustomSelectControl: Add flag for larger default size. ([39401](https://github.com/WordPress/gutenberg/pull/39401))
-* RangeControl: Refactor stories to use Controls. ([39357](https://github.com/WordPress/gutenberg/pull/39357))
-
-
-#### **Block Library**
-
-* Cover: Use Snackbar to display upload errors. ([39428](https://github.com/WordPress/gutenberg/pull/39428))
-* Spacer block: Use same `min` value resizable box and controls, remove `max` limit. ([39577](https://github.com/WordPress/gutenberg/pull/39577))
-* Block Title: truncate all block labels/titles. ([39416](https://github.com/WordPress/gutenberg/pull/39416))
-* Add `NumberControl` to support min/max font size for `Tag Cloud Block`. ([37311](https://github.com/WordPress/gutenberg/pull/37311))
-* Embeds: Update the Wolfram embed name. ([39528](https://github.com/WordPress/gutenberg/pull/39528))
-* Flag invalid Navigation Link items. ([31716](https://github.com/WordPress/gutenberg/pull/31716))
-* Gallery block: Add gap support. ([38164](https://github.com/WordPress/gutenberg/pull/38164))
-* Separator block: Refactor to use color block supports. ([38428](https://github.com/WordPress/gutenberg/pull/38428))
-
-
-#### **Post Editor**
-
-* Migrate post editor `editorMode` to use preferences store and remove `localAutosaveInterval` preference. ([39180](https://github.com/WordPress/gutenberg/pull/39180))
-* Migrate post editor preferred style variations to preferences store. ([39337](https://github.com/WordPress/gutenberg/pull/39337))
-* Show 'View Preview' link for 'Draft Saved' Snackbar notice. ([39482](https://github.com/WordPress/gutenberg/pull/39482))
-
-
-#### **Site editor**
-
-* Add preferences modal to site editor. ([39485](https://github.com/WordPress/gutenberg/pull/39485))
-* Site Editor: Add more template types. ([39353](https://github.com/WordPress/gutenberg/pull/39353))
-* Theme Export: Export the whole theme. ([39202](https://github.com/WordPress/gutenberg/pull/39202))
-* Theme Export: Use the theme name for the zip file. ([39471](https://github.com/WordPress/gutenberg/pull/39471))
-
-
-#### **Navigation editor**
-
-* Migrate navigation editor selected menu to preferences store. ([39606](https://github.com/WordPress/gutenberg/pull/39606))
-
-
-#### **Testing**
-
-* Add `@testing-library/user-event` to the project. ([39360](https://github.com/WordPress/gutenberg/pull/39360))
-
-
-#### **Webfonts**
-
-* Change class properties from static to instance members. ([39361](https://github.com/WordPress/gutenberg/pull/39361))
-
-
-#### **Icons**
-
-* Update lock and unlock icons to be smaller. ([39252](https://github.com/WordPress/gutenberg/pull/39252))
-
-
-#### **Extensibility**
-
-* Set $name on WP_Block_Editor_Context. ([39299](https://github.com/WordPress/gutenberg/pull/39299))
-
-
-#### **CSS & Styling**
-
-* Layout: Use CSS logical properties for margin top and bottom. ([38816](https://github.com/WordPress/gutenberg/pull/38816))
-
-
-#### **Design Tools**
-
-* Block spacing: Block-level axial gap block support. ([37736](https://github.com/WordPress/gutenberg/pull/37736))
-
-
-### **New APIs**
-
-
-#### **Block API**
-
-* Blocks: Deprecate `isValidBlockContent`. ([38794](https://github.com/WordPress/gutenberg/pull/38794))
-* Blocks: Remember raw source block for invalid blocks. ([38923](https://github.com/WordPress/gutenberg/pull/38923))
-* Blocks: Add flag in `parse` to skip logging migration details from patterns parsing. ([39404](https://github.com/WordPress/gutenberg/pull/39404))
-
-
-#### **Block Library**
-
-* Block Patterns: Automatically load files with headers from a theme's `/patterns` directory. ([36751](https://github.com/WordPress/gutenberg/pull/36751))
-
-
-### **Bug Fixes**
-
-
-#### **Core data**
-
-* Revert addition of Navigation entity. ([39572](https://github.com/WordPress/gutenberg/pull/39572))
-* Add raw attributes configuration for media entity. ([39512](https://github.com/WordPress/gutenberg/pull/39512))
+#### Block Library
 
+-   Block Editor: Introduce block locking UI. ([39183](https://github.com/WordPress/gutenberg/pull/39183))
+-   Post Date: Allow user to pick Site Default, a suggested date format, or a custom date format. ([39209](https://github.com/WordPress/gutenberg/pull/39209))
+-   Try: "No results" block container for the query block. ([38806](https://github.com/WordPress/gutenberg/pull/38806))
 
-#### **Block editor**
+### Enhancements
 
-* Revert: Fix/editor content z-index stack context. ([39620](https://github.com/WordPress/gutenberg/pull/39620))
+#### Accessibility
 
+-   Add aria label to Nav block on front of site. ([39161](https://github.com/WordPress/gutenberg/pull/39161))
+-   Add button text labels to site editor. ([38317](https://github.com/WordPress/gutenberg/pull/38317))
+-   Prevent focus loss after removing a block from List View. ([39031](https://github.com/WordPress/gutenberg/pull/39031))
 
-#### **Widgets editor**
+#### Components
 
-* Preload paths: Avoid fatal error on Widgets page. ([39470](https://github.com/WordPress/gutenberg/pull/39470))
+-   Add onClick prop to FormFileUpload. ([39268](https://github.com/WordPress/gutenberg/pull/39268))
+-   CheckboxControl: Support indeterminate state. ([39462](https://github.com/WordPress/gutenberg/pull/39462))
+-   List View: Add multi-select support for shift + Home and End keys. ([39272](https://github.com/WordPress/gutenberg/pull/39272))
+-   `BoxControl`: Stop using `UnitControl`'s deprecated `unit` prop. ([39511](https://github.com/WordPress/gutenberg/pull/39511))
+-   `FocalPointPicker`: Stop using `UnitControl`'s deprecated `unit` prop. ([39504](https://github.com/WordPress/gutenberg/pull/39504))
+-   `ColorPalette`: Refine the label of the custom color button. ([39386](https://github.com/WordPress/gutenberg/pull/39386))
+-   Rich text: Allow behaviour to be overridden by ref. ([39631](https://github.com/WordPress/gutenberg/pull/39631))
+-   Add id prop to ListView. ([39494](https://github.com/WordPress/gutenberg/pull/39494))
+-   Collapse list view by default in Site Editor. ([39573](https://github.com/WordPress/gutenberg/pull/39573))
+-   Collapse list view by default in all editors. ([39611](https://github.com/WordPress/gutenberg/pull/39611))
+-   Add prop to control default expand/collapse state of ListView nodes. ([39486](https://github.com/WordPress/gutenberg/pull/39486))
+-   BaseControl: Add opt-in prop for margin-free styles. ([39325](https://github.com/WordPress/gutenberg/pull/39325))
+-   CustomSelectControl: Add flag for larger default size. ([39401](https://github.com/WordPress/gutenberg/pull/39401))
+-   RangeControl: Refactor stories to use Controls. ([39357](https://github.com/WordPress/gutenberg/pull/39357))
+
+#### Block Library
+
+-   Cover: Use Snackbar to display upload errors. ([39428](https://github.com/WordPress/gutenberg/pull/39428))
+-   Spacer block: Use same `min` value resizable box and controls, remove `max` limit. ([39577](https://github.com/WordPress/gutenberg/pull/39577))
+-   Block Title: truncate all block labels/titles. ([39416](https://github.com/WordPress/gutenberg/pull/39416))
+-   Add `NumberControl` to support min/max font size for `Tag Cloud Block`. ([37311](https://github.com/WordPress/gutenberg/pull/37311))
+-   Embeds: Update the Wolfram embed name. ([39528](https://github.com/WordPress/gutenberg/pull/39528))
+-   Flag invalid Navigation Link items. ([31716](https://github.com/WordPress/gutenberg/pull/31716))
+-   Gallery block: Add gap support. ([38164](https://github.com/WordPress/gutenberg/pull/38164))
+-   Separator block: Refactor to use color block supports. ([38428](https://github.com/WordPress/gutenberg/pull/38428))
 
+#### Post Editor
 
-#### **Block Library**
+-   Migrate post editor `editorMode` to use preferences store and remove `localAutosaveInterval` preference. ([39180](https://github.com/WordPress/gutenberg/pull/39180))
+-   Migrate post editor preferred style variations to preferences store. ([39337](https://github.com/WordPress/gutenberg/pull/39337))
+-   Show 'View Preview' link for 'Draft Saved' Snackbar notice. ([39482](https://github.com/WordPress/gutenberg/pull/39482))
 
-* Fix `Comments` blocks pagination. ([39227](https://github.com/WordPress/gutenberg/pull/39227))
-* Fix center aligned images styles. ([39422](https://github.com/WordPress/gutenberg/pull/39422))
-* Fix experimental full site editing blocks not being registered. ([39415](https://github.com/WordPress/gutenberg/pull/39415))
-* Fix: `Comment Query Loop`'s inner block selection and duplicate inspector control settings. ([39472](https://github.com/WordPress/gutenberg/pull/39472))
-* Fix: `Table` block doesn't keep background color. ([39445](https://github.com/WordPress/gutenberg/pull/39445))
-* `Gallery` block: Disable edit as html support. ([39318](https://github.com/WordPress/gutenberg/pull/39318))
-* `Gallery` block: Fix image upload bug. ([39269](https://github.com/WordPress/gutenberg/pull/39269))
-* `Image`: Allow authors to select image sizes from dropdown. ([39580](https://github.com/WordPress/gutenberg/pull/39580))
-* `Image`: Restore baseline responsiveness in the block. ([39340](https://github.com/WordPress/gutenberg/pull/39340))
-* `Media & Text`: Allow authors to select image sizes from dropdown. ([39608](https://github.com/WordPress/gutenberg/pull/39608))
-* `Pullquote` block: Fix citation markup in Editor. ([39414](https://github.com/WordPress/gutenberg/pull/39414))
-* `Pullquote` block: Remove deprecated pullquote style. ([39413](https://github.com/WordPress/gutenberg/pull/39413))
-* [Site Logo] Fix center alignment. ([39579](https://github.com/WordPress/gutenberg/pull/39579))
-* Hide the orientation switcher from the group block. ([39650](https://github.com/WordPress/gutenberg/pull/39650))
-* Image Block: Move any is-style and custom classnames up to deprecated alignment wrapper. ([39330](https://github.com/WordPress/gutenberg/pull/39330))
-* Social Icons: Avoid loss of previously selected background color when switching back from "Logos Only" style. ([39276](https://github.com/WordPress/gutenberg/pull/39276))
-* Fix the block toolbar styles to evenly space buttons. ([39630](https://github.com/WordPress/gutenberg/pull/39630))
-* Fix Image block link rel handling. ([39319](https://github.com/WordPress/gutenberg/pull/39319))
+#### Site editor
 
+-   Add preferences modal to site editor. ([39485](https://github.com/WordPress/gutenberg/pull/39485))
+-   Site Editor: Add more template types. ([39353](https://github.com/WordPress/gutenberg/pull/39353))
+-   Theme Export: Export the whole theme. ([39202](https://github.com/WordPress/gutenberg/pull/39202))
+-   Theme Export: Use the theme name for the zip file. ([39471](https://github.com/WordPress/gutenberg/pull/39471))
 
-#### **Components**
+#### Navigation editor
 
-* `BlockSettingsMenuControls` don't render empty `MenuGroup`. ([39537](https://github.com/WordPress/gutenberg/pull/39537))
-* Fix `UnitControl` resets unit when value is cleared. ([39531](https://github.com/WordPress/gutenberg/pull/39531))
-* Fix changelog entry in wrong version. ([39450](https://github.com/WordPress/gutenberg/pull/39450))
-* `ResizableBox`: Ensure tooltip text remains on a single line. ([39623](https://github.com/WordPress/gutenberg/pull/39623))
-* [Block Library]: Use `UnitControl` from `components` package in Cover and Search blocks. ([39383](https://github.com/WordPress/gutenberg/pull/39383))
-* `NumberControl`: Commit (and constrain) value on `blur` event. ([39186](https://github.com/WordPress/gutenberg/pull/39186))
+-   Migrate navigation editor selected menu to preferences store. ([39606](https://github.com/WordPress/gutenberg/pull/39606))
 
+#### Testing
 
-#### **Testing**
+-   Add `@testing-library/user-event` to the project. ([39360](https://github.com/WordPress/gutenberg/pull/39360))
 
-* Fix Gallery block flaky test image captions. ([39689](https://github.com/WordPress/gutenberg/pull/39689))
-* Fix performance tests - attempt 2. ([39333](https://github.com/WordPress/gutenberg/pull/39333))
-* Env: Fix PHP unit tests for "non-standard" cloned directories. ([39362](https://github.com/WordPress/gutenberg/pull/39362))
+#### Webfonts
 
+-   Change class properties from static to instance members. ([39361](https://github.com/WordPress/gutenberg/pull/39361))
 
-#### **Accessibility**
+#### Icons
 
-* Fix `useFocusFirstElement` in non-`contenteditable` Blocks. ([37934](https://github.com/WordPress/gutenberg/pull/37934))
-* Use the post-title as the featured-image's alt text when linked to the post. ([39634](https://github.com/WordPress/gutenberg/pull/39634))
+-   Update lock and unlock icons to be smaller. ([39252](https://github.com/WordPress/gutenberg/pull/39252))
 
+#### Extensibility
 
-#### **Design Tools**
+-   Set $name on WP_Block_Editor_Context. ([39299](https://github.com/WordPress/gutenberg/pull/39299))
 
-* Fix Border Radius Control showing Mixed when switching between units in an empty control. ([39563](https://github.com/WordPress/gutenberg/pull/39563))
-* Flex Layout: Fix visibility control of allowOrientation. ([39532](https://github.com/WordPress/gutenberg/pull/39532))
+#### CSS & Styling
 
+-   Layout: Use CSS logical properties for margin top and bottom. ([38816](https://github.com/WordPress/gutenberg/pull/38816))
 
-#### **Block Conversion**
+#### Design Tools
 
-* Blocks: Disable Grouping when block removal is locked. ([39541](https://github.com/WordPress/gutenberg/pull/39541))
+-   Block spacing: Block-level axial gap block support. ([37736](https://github.com/WordPress/gutenberg/pull/37736))
 
+### New APIs
 
-#### **Post Editor**
+#### Block API
 
-* Add default `as` prop to `PluginMoreMenuItem` component. ([39517](https://github.com/WordPress/gutenberg/pull/39517))
+-   Blocks: Deprecate `isValidBlockContent`. ([38794](https://github.com/WordPress/gutenberg/pull/38794))
+-   Blocks: Remember raw source block for invalid blocks. ([38923](https://github.com/WordPress/gutenberg/pull/38923))
+-   Blocks: Add flag in `parse` to skip logging migration details from patterns parsing. ([39404](https://github.com/WordPress/gutenberg/pull/39404))
 
+#### Block Library
 
-#### **Patterns**
+-   Block Patterns: Automatically load files with headers from a theme's `/patterns` directory. ([36751](https://github.com/WordPress/gutenberg/pull/36751))
 
-* [Patterns]: Load theme patterns only in block and site editor. ([39493](https://github.com/WordPress/gutenberg/pull/39493))
+### Bug Fixes
 
+#### Core data
 
-#### **npm Packages**
+-   Revert addition of Navigation entity. ([39572](https://github.com/WordPress/gutenberg/pull/39572))
+-   Add raw attributes configuration for media entity. ([39512](https://github.com/WordPress/gutenberg/pull/39512))
 
-* Packages: Ensure that `@wordpress/preferences` gets published to npm. ([39390](https://github.com/WordPress/gutenberg/pull/39390))
+#### Block editor
 
+-   Revert: Fix/editor content z-index stack context. ([39620](https://github.com/WordPress/gutenberg/pull/39620))
 
-#### **Global Styles**
+#### Widgets editor
 
-* Fix display of color palettes for border panel. ([38798](https://github.com/WordPress/gutenberg/pull/38798))
+-   Preload paths: Avoid fatal error on Widgets page. ([39470](https://github.com/WordPress/gutenberg/pull/39470))
 
+#### Block Library
 
-### **Performance**
+-   Fix `Comments` blocks pagination. ([39227](https://github.com/WordPress/gutenberg/pull/39227))
+-   Fix center aligned images styles. ([39422](https://github.com/WordPress/gutenberg/pull/39422))
+-   Fix experimental full site editing blocks not being registered. ([39415](https://github.com/WordPress/gutenberg/pull/39415))
+-   Fix: `Comment Query Loop`'s inner block selection and duplicate inspector control settings. ([39472](https://github.com/WordPress/gutenberg/pull/39472))
+-   Fix: `Table` block doesn't keep background color. ([39445](https://github.com/WordPress/gutenberg/pull/39445))
+-   `Gallery` block: Disable edit as html support. ([39318](https://github.com/WordPress/gutenberg/pull/39318))
+-   `Gallery` block: Fix image upload bug. ([39269](https://github.com/WordPress/gutenberg/pull/39269))
+-   `Image`: Allow authors to select image sizes from dropdown. ([39580](https://github.com/WordPress/gutenberg/pull/39580))
+-   `Image`: Restore baseline responsiveness in the block. ([39340](https://github.com/WordPress/gutenberg/pull/39340))
+-   `Media & Text`: Allow authors to select image sizes from dropdown. ([39608](https://github.com/WordPress/gutenberg/pull/39608))
+-   `Pullquote` block: Fix citation markup in Editor. ([39414](https://github.com/WordPress/gutenberg/pull/39414))
+-   `Pullquote` block: Remove deprecated pullquote style. ([39413](https://github.com/WordPress/gutenberg/pull/39413))
+-   [Site Logo] Fix center alignment. ([39579](https://github.com/WordPress/gutenberg/pull/39579))
+-   Hide the orientation switcher from the group block. ([39650](https://github.com/WordPress/gutenberg/pull/39650))
+-   Image Block: Move any is-style and custom classnames up to deprecated alignment wrapper. ([39330](https://github.com/WordPress/gutenberg/pull/39330))
+-   Social Icons: Avoid loss of previously selected background color when switching back from "Logos Only" style. ([39276](https://github.com/WordPress/gutenberg/pull/39276))
+-   Fix the block toolbar styles to evenly space buttons. ([39630](https://github.com/WordPress/gutenberg/pull/39630))
+-   Fix Image block link rel handling. ([39319](https://github.com/WordPress/gutenberg/pull/39319))
 
+#### Components
 
-#### **Block editor and site editor**
+-   `BlockSettingsMenuControls` don't render empty `MenuGroup`. ([39537](https://github.com/WordPress/gutenberg/pull/39537))
+-   Fix `UnitControl` resets unit when value is cleared. ([39531](https://github.com/WordPress/gutenberg/pull/39531))
+-   Fix changelog entry in wrong version. ([39450](https://github.com/WordPress/gutenberg/pull/39450))
+-   `ResizableBox`: Ensure tooltip text remains on a single line. ([39623](https://github.com/WordPress/gutenberg/pull/39623))
+-   [Block Library]: Use `UnitControl` from `components` package in Cover and Search blocks. ([39383](https://github.com/WordPress/gutenberg/pull/39383))
+-   `NumberControl`: Commit (and constrain) value on `blur` event. ([39186](https://github.com/WordPress/gutenberg/pull/39186))
 
-* Optimise preload paths for post and site editors. ([39256](https://github.com/WordPress/gutenberg/pull/39256))
+#### Testing
 
+-   Fix Gallery block flaky test image captions. ([39689](https://github.com/WordPress/gutenberg/pull/39689))
+-   Fix performance tests - attempt 2. ([39333](https://github.com/WordPress/gutenberg/pull/39333))
+-   Env: Fix PHP unit tests for "non-standard" cloned directories. ([39362](https://github.com/WordPress/gutenberg/pull/39362))
 
-#### **Parsing**
+#### Accessibility
 
-* Optimise block parser by avoiding repeated HTML parsing and matcher creation. ([39424](https://github.com/WordPress/gutenberg/pull/39424))
+-   Fix `useFocusFirstElement` in non-`contenteditable` Blocks. ([37934](https://github.com/WordPress/gutenberg/pull/37934))
+-   Use the post-title as the featured-image's alt text when linked to the post. ([39634](https://github.com/WordPress/gutenberg/pull/39634))
 
+#### Design Tools
 
-### **Experiments**
+-   Fix Border Radius Control showing Mixed when switching between units in an empty control. ([39563](https://github.com/WordPress/gutenberg/pull/39563))
+-   Flex Layout: Fix visibility control of allowOrientation. ([39532](https://github.com/WordPress/gutenberg/pull/39532))
 
+#### Block Conversion
 
-#### **Block Library**
+-   Blocks: Disable Grouping when block removal is locked. ([39541](https://github.com/WordPress/gutenberg/pull/39541))
 
-* New block: list block v2. Add an empty list block v2. ([39459](https://github.com/WordPress/gutenberg/pull/39459)), implement the nested block behaviour in list block v2. ([39487](https://github.com/WordPress/gutenberg/pull/39487)), add transforms for the list v2 block. ([39652](https://github.com/WordPress/gutenberg/pull/39652)), add start, ordered and reversed list block attributes. ([39605](https://github.com/WordPress/gutenberg/pull/39605)), add simple list item splitting and merging. ([39542](https://github.com/WordPress/gutenberg/pull/39542)).
-* New block: Generic Avatar. Create a Generic Avatar block for Authors. ([38591](https://github.com/WordPress/gutenberg/pull/38591))
+#### Post Editor
 
+-   Add default `as` prop to `PluginMoreMenuItem` component. ([39517](https://github.com/WordPress/gutenberg/pull/39517))
 
-#### **Block editor**
+#### Patterns
 
-* Add __experimentalGetGlobalBlocksByName selector. ([39610](https://github.com/WordPress/gutenberg/pull/39610))
+-   [Patterns]: Load theme patterns only in block and site editor. ([39493](https://github.com/WordPress/gutenberg/pull/39493))
 
+#### npm Packages
 
-### **Documentation**
+-   Packages: Ensure that `@wordpress/preferences` gets published to npm. ([39390](https://github.com/WordPress/gutenberg/pull/39390))
 
+#### Global Styles
 
-#### **Themes**
+-   Fix display of color palettes for border panel. ([38798](https://github.com/WordPress/gutenberg/pull/38798))
 
-* Add some detail to handbook about different theme types. ([39562](https://github.com/WordPress/gutenberg/pull/39562))
-* Remove duplicate theme documentation. ([38800](https://github.com/WordPress/gutenberg/pull/38800))
+### Performance
 
+#### Block editor and site editor
 
-#### **Block library**
+-   Optimise preload paths for post and site editors. ([39256](https://github.com/WordPress/gutenberg/pull/39256))
 
-* Block Title: Update documentation. ([39328](https://github.com/WordPress/gutenberg/pull/39328))
-* Dependency `wp-editor` should be `wp-block-editor` in the code example. ([39505](https://github.com/WordPress/gutenberg/pull/39505))
-* Document `__experimentalGenerateAnchors` default setting. ([39554](https://github.com/WordPress/gutenberg/pull/39554))
+#### Parsing
 
+-   Optimise block parser by avoiding repeated HTML parsing and matcher creation. ([39424](https://github.com/WordPress/gutenberg/pull/39424))
 
-#### **Contributing**
+### Experiments
 
-* Plugin: Document the project structure and conventions used in the `lib` folder for PHP code. ([39603](https://github.com/WordPress/gutenberg/pull/39603))
-* Update plugin `readme.txt` content for intended audience. ([38724](https://github.com/WordPress/gutenberg/pull/38724))
-* Fix the missing page in the manifest file. ([39507](https://github.com/WordPress/gutenberg/pull/39507))
+#### Block Library
 
+-   New block: list block v2. Add an empty list block v2. ([39459](https://github.com/WordPress/gutenberg/pull/39459)), implement the nested block behaviour in list block v2. ([39487](https://github.com/WordPress/gutenberg/pull/39487)), add transforms for the list v2 block. ([39652](https://github.com/WordPress/gutenberg/pull/39652)), add start, ordered and reversed list block attributes. ([39605](https://github.com/WordPress/gutenberg/pull/39605)), add simple list item splitting and merging. ([39542](https://github.com/WordPress/gutenberg/pull/39542)).
+-   New block: Generic Avatar. Create a Generic Avatar block for Authors. ([38591](https://github.com/WordPress/gutenberg/pull/38591))
 
-#### **Components**
+#### Block editor
 
-* Divider: Improve default behaviour when in vertical orientation. ([39316](https://github.com/WordPress/gutenberg/pull/39316))
-* `UnitControl`: Convert Storybook example to TypeScript and Controls. ([39320](https://github.com/WordPress/gutenberg/pull/39320))
-* `UnitControl`: Mark `unit` prop as deprecated. ([39503](https://github.com/WordPress/gutenberg/pull/39503))
-* Add missing `}` to LinkControl code example. ([39469](https://github.com/WordPress/gutenberg/pull/39469))
+-   Add \_\_experimentalGetGlobalBlocksByName selector. ([39610](https://github.com/WordPress/gutenberg/pull/39610))
 
+### Documentation
 
-### **Code Quality**
+#### Themes
 
-#### **Core data**
+-   Add some detail to handbook about different theme types. ([39562](https://github.com/WordPress/gutenberg/pull/39562))
+-   Remove duplicate theme documentation. ([38800](https://github.com/WordPress/gutenberg/pull/38800))
 
-* Use consistent terminology across @wordpress/core-data. ([39349](https://github.com/WordPress/gutenberg/pull/39349)) without renaming useEntityId hook. ([39683](https://github.com/WordPress/gutenberg/pull/39683))
-* Add an "enabled" option to useEntityRecord and useEntityRecords. ([39288](https://github.com/WordPress/gutenberg/pull/39288))
-* Add Navigation menu to known entities. ([39498](https://github.com/WordPress/gutenberg/pull/39498))
-* Use the word `record` for the entity record TypeScript types. ([39251](https://github.com/WordPress/gutenberg/pull/39251))
-* throwOnError option for saveEntityRecord and deleteEntityRecord actions. ([39258](https://github.com/WordPress/gutenberg/pull/39258))
-* Fix preferences actions/selectors deprecated calls. ([39640](https://github.com/WordPress/gutenberg/pull/39640))
-* Check for nullity in experimental fetch methods. ([39480](https://github.com/WordPress/gutenberg/pull/39480))
-* Check for presence of entity configuration before testing plural form. ([39476](https://github.com/WordPress/gutenberg/pull/39476))
-* Import types before exporting them. ([39479](https://github.com/WordPress/gutenberg/pull/39479))
-* Pass explicit `undefined` initial value to `createContext`. ([39526](https://github.com/WordPress/gutenberg/pull/39526))
-* Replace spread arguments with non-spread variants. ([39477](https://github.com/WordPress/gutenberg/pull/39477))
-* Fix minor type-related issues. ([39525](https://github.com/WordPress/gutenberg/pull/39525))
-* Do not suppress errors in the getEntityRecord and getEntityRecords resolvers. ([39317](https://github.com/WordPress/gutenberg/pull/39317))
+#### Block library
 
+-   Block Title: Update documentation. ([39328](https://github.com/WordPress/gutenberg/pull/39328))
+-   Dependency `wp-editor` should be `wp-block-editor` in the code example. ([39505](https://github.com/WordPress/gutenberg/pull/39505))
+-   Document `__experimentalGenerateAnchors` default setting. ([39554](https://github.com/WordPress/gutenberg/pull/39554))
 
-#### **Block Library**
+#### Contributing
 
-* `Cover` block: Stop using `UnitControl`'s deprecated `unit` prop. ([39522](https://github.com/WordPress/gutenberg/pull/39522))
-* `Search` block: Stop using `UnitControl`'s deprecated `unit` prop. ([39514](https://github.com/WordPress/gutenberg/pull/39514))
-* `Spacer` block: Stop using `UnitControl`'s deprecated `unit` prop. ([39513](https://github.com/WordPress/gutenberg/pull/39513))
-* [Blocks]: Add flag in `parse` to skip logging migration details from patterns parsing. ([39404](https://github.com/WordPress/gutenberg/pull/39404))
-* Use block specific filters for the backward compatibility markup hooks. ([39321](https://github.com/WordPress/gutenberg/pull/39321))
+-   Plugin: Document the project structure and conventions used in the `lib` folder for PHP code. ([39603](https://github.com/WordPress/gutenberg/pull/39603))
+-   Update plugin `readme.txt` content for intended audience. ([38724](https://github.com/WordPress/gutenberg/pull/38724))
+-   Fix the missing page in the manifest file. ([39507](https://github.com/WordPress/gutenberg/pull/39507))
 
-#### **Testing**
+#### Components
 
-* Fix Nav block flaky end-to-end test by correctly waiting on menu creation resolution. ([39637](https://github.com/WordPress/gutenberg/pull/39637))
+-   Divider: Improve default behaviour when in vertical orientation. ([39316](https://github.com/WordPress/gutenberg/pull/39316))
+-   `UnitControl`: Convert Storybook example to TypeScript and Controls. ([39320](https://github.com/WordPress/gutenberg/pull/39320))
+-   `UnitControl`: Mark `unit` prop as deprecated. ([39503](https://github.com/WordPress/gutenberg/pull/39503))
+-   Add missing `}` to LinkControl code example. ([39469](https://github.com/WordPress/gutenberg/pull/39469))
 
-#### **Plugin**
+### Code Quality
 
-* Fix PHP notice in `gutenberg_get_block_editor_settings`. ([39543](https://github.com/WordPress/gutenberg/pull/39543))
+#### Core data
 
+-   Use consistent terminology across @wordpress/core-data. ([39349](https://github.com/WordPress/gutenberg/pull/39349)) without renaming useEntityId hook. ([39683](https://github.com/WordPress/gutenberg/pull/39683))
+-   Add an "enabled" option to useEntityRecord and useEntityRecords. ([39288](https://github.com/WordPress/gutenberg/pull/39288))
+-   Add Navigation menu to known entities. ([39498](https://github.com/WordPress/gutenberg/pull/39498))
+-   Use the word `record` for the entity record TypeScript types. ([39251](https://github.com/WordPress/gutenberg/pull/39251))
+-   throwOnError option for saveEntityRecord and deleteEntityRecord actions. ([39258](https://github.com/WordPress/gutenberg/pull/39258))
+-   Fix preferences actions/selectors deprecated calls. ([39640](https://github.com/WordPress/gutenberg/pull/39640))
+-   Check for nullity in experimental fetch methods. ([39480](https://github.com/WordPress/gutenberg/pull/39480))
+-   Check for presence of entity configuration before testing plural form. ([39476](https://github.com/WordPress/gutenberg/pull/39476))
+-   Import types before exporting them. ([39479](https://github.com/WordPress/gutenberg/pull/39479))
+-   Pass explicit `undefined` initial value to `createContext`. ([39526](https://github.com/WordPress/gutenberg/pull/39526))
+-   Replace spread arguments with non-spread variants. ([39477](https://github.com/WordPress/gutenberg/pull/39477))
+-   Fix minor type-related issues. ([39525](https://github.com/WordPress/gutenberg/pull/39525))
+-   Do not suppress errors in the getEntityRecord and getEntityRecords resolvers. ([39317](https://github.com/WordPress/gutenberg/pull/39317))
 
-#### **Components**
+#### Block Library
 
-* Drop `composeStateReducers`. ([39262](https://github.com/WordPress/gutenberg/pull/39262))
-* `BorderRadiusControl`: Stop using `UnitControl`’s deprecated `unit` prop. ([39549](https://github.com/WordPress/gutenberg/pull/39549))
+-   `Cover` block: Stop using `UnitControl`'s deprecated `unit` prop. ([39522](https://github.com/WordPress/gutenberg/pull/39522))
+-   `Search` block: Stop using `UnitControl`'s deprecated `unit` prop. ([39514](https://github.com/WordPress/gutenberg/pull/39514))
+-   `Spacer` block: Stop using `UnitControl`'s deprecated `unit` prop. ([39513](https://github.com/WordPress/gutenberg/pull/39513))
+-   [Blocks]: Add flag in `parse` to skip logging migration details from patterns parsing. ([39404](https://github.com/WordPress/gutenberg/pull/39404))
+-   Use block specific filters for the backward compatibility markup hooks. ([39321](https://github.com/WordPress/gutenberg/pull/39321))
 
+#### Testing
 
-### **Tools**
+-   Fix Nav block flaky end-to-end test by correctly waiting on menu creation resolution. ([39637](https://github.com/WordPress/gutenberg/pull/39637))
 
-#### **Codeowners updates**
+#### Plugin
 
-* Add [@michalczaplinski](https://github.com/michalczaplinski) to codeowners. ([39440](https://github.com/WordPress/gutenberg/pull/39440))
-* Add [@juanmaguitar](https://github.com/juanmaguitar) as codeowners of gutenberg documentation. ([39453](https://github.com/WordPress/gutenberg/pull/39453))
+-   Fix PHP notice in `gutenberg_get_block_editor_settings`. ([39543](https://github.com/WordPress/gutenberg/pull/39543))
 
+#### Components
 
-#### **Testing**
+-   Drop `composeStateReducers`. ([39262](https://github.com/WordPress/gutenberg/pull/39262))
+-   `BorderRadiusControl`: Stop using `UnitControl`’s deprecated `unit` prop. ([39549](https://github.com/WordPress/gutenberg/pull/39549))
 
-* Add infrastructure for writing Playwright end-to-end tests. ([38570](https://github.com/WordPress/gutenberg/pull/38570))
-* Gallery block: Reduce end-to-end flakiness. ([39565](https://github.com/WordPress/gutenberg/pull/39565))
+### Tools
 
+#### Codeowners updates
 
-#### **Build Tooling**
+-   Add [@michalczaplinski](https://github.com/michalczaplinski) to codeowners. ([39440](https://github.com/WordPress/gutenberg/pull/39440))
+-   Add [@juanmaguitar](https://github.com/juanmaguitar) as codeowners of gutenberg documentation. ([39453](https://github.com/WordPress/gutenberg/pull/39453))
 
-* Simplify vendor scripts handling. ([39534](https://github.com/WordPress/gutenberg/pull/39534))
-* ing: Remove unused npm scripts. ([39369](https://github.com/WordPress/gutenberg/pull/39369))
-* Use android artefacts for react-native libraries in react-native-bridge. ([39294](https://github.com/WordPress/gutenberg/pull/39294))
-* ESlint: Exempt TS files from `jsdoc/require-param`. ([39458](https://github.com/WordPress/gutenberg/pull/39458))
+#### Testing
 
+-   Add infrastructure for writing Playwright end-to-end tests. ([38570](https://github.com/WordPress/gutenberg/pull/38570))
+-   Gallery block: Reduce end-to-end flakiness. ([39565](https://github.com/WordPress/gutenberg/pull/39565))
 
-#### **NPM Packages**
+#### Build Tooling
 
-* Packages: Finalise the revised strategy for NPM publishing. ([39389](https://github.com/WordPress/gutenberg/pull/39389))
+-   Simplify vendor scripts handling. ([39534](https://github.com/WordPress/gutenberg/pull/39534))
+-   ing: Remove unused npm scripts. ([39369](https://github.com/WordPress/gutenberg/pull/39369))
+-   Use android artefacts for react-native libraries in react-native-bridge. ([39294](https://github.com/WordPress/gutenberg/pull/39294))
+-   ESlint: Exempt TS files from `jsdoc/require-param`. ([39458](https://github.com/WordPress/gutenberg/pull/39458))
 
+#### npm Packages
 
-## First time contributors
+-   Packages: Finalise the revised strategy for NPM publishing. ([39389](https://github.com/WordPress/gutenberg/pull/39389))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @alefesouza: Add onClick prop to FormFileUpload. ([39268](https://github.com/WordPress/gutenberg/pull/39268))
-- @brookewp: Show 'View Preview' link for 'Draft Saved' snackbar notice. ([39482](https://github.com/WordPress/gutenberg/pull/39482))
-- @HILAYTRIVEDI: Social Icons: Avoid loss of previously selected background color when switching back from "Logos Only" style. ([39276](https://github.com/WordPress/gutenberg/pull/39276))
-- @ironprogrammer: Update plugin `readme.txt` content for intended audience. ([38724](https://github.com/WordPress/gutenberg/pull/38724))
-- @mhimon: Add missing `}` to LinkControl code example. ([39469](https://github.com/WordPress/gutenberg/pull/39469))
-- @ParaskP7:  ([39508](https://github.com/WordPress/gutenberg/pull/39508))
-- @SantosGuillamot: Fix Comments blocks pagination. ([39227](https://github.com/WordPress/gutenberg/pull/39227))
-- @stefanolissa: Dependency "wp-editor" should be "wp-block-editor" in the code example. ([39505](https://github.com/WordPress/gutenberg/pull/39505))
+The following PRs were merged by first-time contributors:
 
+-   @alefesouza: Add onClick prop to FormFileUpload. ([39268](https://github.com/WordPress/gutenberg/pull/39268))
+-   @brookewp: Show 'View Preview' link for 'Draft Saved' snackbar notice. ([39482](https://github.com/WordPress/gutenberg/pull/39482))
+-   @HILAYTRIVEDI: Social Icons: Avoid loss of previously selected background color when switching back from "Logos Only" style. ([39276](https://github.com/WordPress/gutenberg/pull/39276))
+-   @ironprogrammer: Update plugin `readme.txt` content for intended audience. ([38724](https://github.com/WordPress/gutenberg/pull/38724))
+-   @mhimon: Add missing `}` to LinkControl code example. ([39469](https://github.com/WordPress/gutenberg/pull/39469))
+-   @ParaskP7: ([39508](https://github.com/WordPress/gutenberg/pull/39508))
+-   @SantosGuillamot: Fix Comments blocks pagination. ([39227](https://github.com/WordPress/gutenberg/pull/39227))
+-   @stefanolissa: Dependency "wp-editor" should be "wp-block-editor" in the code example. ([39505](https://github.com/WordPress/gutenberg/pull/39505))
 
 ## Contributors
 
@@ -16722,222 +28140,230 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @alefesouza @alexstine @amustaque97 @andrewserong @AnthonyLedesma @aristath @brookewp @c4rl0sbr4v0 @carolinan @ciampo @delowardev @dmsnell @ellatrix @fluiddot @getdave @glendaviesnz @gziolo @HILAYTRIVEDI @hypest @ironprogrammer @jarcos @jasmussen @jeherve @jhnstn @jorgefilipecosta @jostnes @jsnajdr @juanmaguitar @kevin940726 @kjellr @Mamaduka @mcsf @mhimon @michalczaplinski @mirka @ndiego @noisysocks @ntsekouras @oguzkocer @ParaskP7 @pento @ramonjd @SantosGuillamot @scruffian @SiobhyB @stefanolissa @stokesman @t-hamano @talldan @tellthemachines @vcanales @xknown @youknowriad @zaguiini
 
-
-
-
 = 12.8.1 =
 
 ## Changelog
 
 ### Bug Fixes
 
-- Templates page: reduce z-index of content area [39331](https://github.com/WordPress/gutenberg/pull/39331)
-
+-   Templates page: reduce z-index of content area [39331](https://github.com/WordPress/gutenberg/pull/39331)
 
 = 12.8.0 =
 
-
 ## Changelog
 
 ### Enhancements
 
 #### Block Library
-- Group: Show `group` option in `Group` blocks. ([39094](https://github.com/WordPress/gutenberg/pull/39094))
-- Navigation: Improve loading and placeholder states. ([38907](https://github.com/WordPress/gutenberg/pull/38907))
-- Navigation: Improve create new UI feedback in Nav block. ([39219](https://github.com/WordPress/gutenberg/pull/39219))
-- Media & Text: Display media while uploading. ([39275](https://github.com/WordPress/gutenberg/pull/39275))
-- Tag Cloud: Use flex for the Outline style. ([38995](https://github.com/WordPress/gutenberg/pull/38995))
+
+-   Group: Show `group` option in `Group` blocks. ([39094](https://github.com/WordPress/gutenberg/pull/39094))
+-   Navigation: Improve loading and placeholder states. ([38907](https://github.com/WordPress/gutenberg/pull/38907))
+-   Navigation: Improve create new UI feedback in Nav block. ([39219](https://github.com/WordPress/gutenberg/pull/39219))
+-   Media & Text: Display media while uploading. ([39275](https://github.com/WordPress/gutenberg/pull/39275))
+-   Tag Cloud: Use flex for the Outline style. ([38995](https://github.com/WordPress/gutenberg/pull/38995))
 
 #### Components
-- ConfirmDialog: add custom button text. ([38994](https://github.com/WordPress/gutenberg/pull/38994))
-- InputControl: Allow onBlur for empty values to commit the change, move reset behaviour to ESCAPE key. ([39109](https://github.com/WordPress/gutenberg/pull/39109))
+
+-   ConfirmDialog: add custom button text. ([38994](https://github.com/WordPress/gutenberg/pull/38994))
+-   InputControl: Allow onBlur for empty values to commit the change, move reset behaviour to ESCAPE key. ([39109](https://github.com/WordPress/gutenberg/pull/39109))
 
 #### Block Editor
-- Add a link completer for inline links to posts. ([29172](https://github.com/WordPress/gutenberg/pull/29172))
+
+-   Add a link completer for inline links to posts. ([29172](https://github.com/WordPress/gutenberg/pull/29172))
 
 #### Site Editor
-- Add theme.json to export file. ([39048](https://github.com/WordPress/gutenberg/pull/39048))
-- Resolve homepage template on server-side. ([38817](https://github.com/WordPress/gutenberg/pull/38817))
-- Theme Export: Add index.php and style.css. ([39173](https://github.com/WordPress/gutenberg/pull/39173))
+
+-   Add theme.json to export file. ([39048](https://github.com/WordPress/gutenberg/pull/39048))
+-   Resolve homepage template on server-side. ([38817](https://github.com/WordPress/gutenberg/pull/38817))
+-   Theme Export: Add index.php and style.css. ([39173](https://github.com/WordPress/gutenberg/pull/39173))
 
 #### Icons
-- Update drag handle footprint. ([39342](https://github.com/WordPress/gutenberg/pull/39342))
-- Update Pin icon, add new Post icon. ([39139](https://github.com/WordPress/gutenberg/pull/39139))
+
+-   Update drag handle footprint. ([39342](https://github.com/WordPress/gutenberg/pull/39342))
+-   Update Pin icon, add new Post icon. ([39139](https://github.com/WordPress/gutenberg/pull/39139))
 
 #### General Interface
-- Raise z-index of content div relative to sidebars. ([38893](https://github.com/WordPress/gutenberg/pull/38893))
+
+-   Raise z-index of content div relative to sidebars. ([38893](https://github.com/WordPress/gutenberg/pull/38893))
 
 #### Media
-- MediaReplaceFlow: Add 'onError' prop to handle error notifications. ([39197](https://github.com/WordPress/gutenberg/pull/39197))
+
+-   MediaReplaceFlow: Add 'onError' prop to handle error notifications. ([39197](https://github.com/WordPress/gutenberg/pull/39197))
 
 ### Accessibility
 
-- Block settings dropdown: Use block display title in remove label. ([39110](https://github.com/WordPress/gutenberg/pull/39110))
-- Try allowing tab into block placeholder. ([39085](https://github.com/WordPress/gutenberg/pull/39085))
+-   Block settings dropdown: Use block display title in remove label. ([39110](https://github.com/WordPress/gutenberg/pull/39110))
+-   Try allowing tab into block placeholder. ([39085](https://github.com/WordPress/gutenberg/pull/39085))
 
 ### New APIs
 
-- Webfonts API. ([37140](https://github.com/WordPress/gutenberg/pull/37140))
-- Add new `@wordpress/preferences` package. ([38873](https://github.com/WordPress/gutenberg/pull/38873))
-- Add reusable preferences modal to interface package. ([39153](https://github.com/WordPress/gutenberg/pull/39153))
-  - Add interface preferences modal to edit post. ([39176](https://github.com/WordPress/gutenberg/pull/39176))
-  - Migrate hidden block types (block manager data) to new preferences packages. ([39132](https://github.com/WordPress/gutenberg/pull/39132))
-  - Migrate post editor feature preferences to use new preferences package. ([39115](https://github.com/WordPress/gutenberg/pull/39115))
-  - Migrate customize widgets editor to use new preferences package. ([39112](https://github.com/WordPress/gutenberg/pull/39112))
-  - Migrate standalone widgets editor to use new preferences package. ([39084](https://github.com/WordPress/gutenberg/pull/39084))
-  - Migrate site editor to use new preferences package. ([39158](https://github.com/WordPress/gutenberg/pull/39158))
-  - Deprecate interface package's preference APIs. ([39418](https://github.com/WordPress/gutenberg/pull/39418))
-- Create Block: Add support for more plugin header fields. ([39096](https://github.com/WordPress/gutenberg/pull/39096))
-
-
-### Bug Fixes
-
-#### Block Library
-- Buttons: Added aria label to the button block with icon. ([38966](https://github.com/WordPress/gutenberg/pull/38966))
-- Buttons: Fixes Button highlight popover overflow conflict with link popover. ([38771](https://github.com/WordPress/gutenberg/pull/38771))
-- Buttons: Don't set a placeholder text color. ([39034](https://github.com/WordPress/gutenberg/pull/39034))
-- Code: Restructure code bock styling. ([38712](https://github.com/WordPress/gutenberg/pull/38712))
-- Comments Pagination Number_ Fix Comments Pagination Number with no pagination settings. ([39204](https://github.com/WordPress/gutenberg/pull/39204))
-- Cover: Fix keep selected unit on deleting minHeight value. ([39145](https://github.com/WordPress/gutenberg/pull/39145))
-- Cover: Fixes #38761 by removing obsolete `::Before` pseudo element. ([38762](https://github.com/WordPress/gutenberg/pull/38762))
-- File: Check if 'fileId' exists before setting the attribute. ([39088](https://github.com/WordPress/gutenberg/pull/39088))
-- File: Don't display loading animation on upload error. ([39213](https://github.com/WordPress/gutenberg/pull/39213))
-- File: Fix file block validation error by not outputting aria-describedby if there's no description. ([39083](https://github.com/WordPress/gutenberg/pull/39083))
-- File: Fix the undo trap. ([39215](https://github.com/WordPress/gutenberg/pull/39215))
-- Hide border panel when all border features have been disabled. ([36791](https://github.com/WordPress/gutenberg/pull/36791))
-- Hide current menu from dropdown list in Nav block. ([38916](https://github.com/WordPress/gutenberg/pull/38916))
-- Image: Fix image responsive rules. ([39045](https://github.com/WordPress/gutenberg/pull/39045))
-- Image: Display errors after failed upload. ([39178](https://github.com/WordPress/gutenberg/pull/39178))
-- Media & Text: Display errors after failed upload. ([39245](https://github.com/WordPress/gutenberg/pull/39245))
-- Navigation: Fix navigation menu error when menus are not yet fetched. ([39151](https://github.com/WordPress/gutenberg/pull/39151))
-- Post Comments Form: Show correctwarning relative to post/page context. ([38011](https://github.com/WordPress/gutenberg/pull/38011))
-- Post Expert: Fix missing class in post excerpt. ([38747](https://github.com/WordPress/gutenberg/pull/38747))
-- Post Terms: Unescape HTML entities in term names. ([39216](https://github.com/WordPress/gutenberg/pull/39216))
-- Widget Group: Make `save()` markup the same as `render_callback` markup. ([38510](https://github.com/WordPress/gutenberg/pull/38510))
+-   Webfonts API. ([37140](https://github.com/WordPress/gutenberg/pull/37140))
+-   Add new `@wordpress/preferences` package. ([38873](https://github.com/WordPress/gutenberg/pull/38873))
+-   Add reusable preferences modal to interface package. ([39153](https://github.com/WordPress/gutenberg/pull/39153))
+    -   Add interface preferences modal to edit post. ([39176](https://github.com/WordPress/gutenberg/pull/39176))
+    -   Migrate hidden block types (block manager data) to new preferences packages. ([39132](https://github.com/WordPress/gutenberg/pull/39132))
+    -   Migrate post editor feature preferences to use new preferences package. ([39115](https://github.com/WordPress/gutenberg/pull/39115))
+    -   Migrate customize widgets editor to use new preferences package. ([39112](https://github.com/WordPress/gutenberg/pull/39112))
+    -   Migrate standalone widgets editor to use new preferences package. ([39084](https://github.com/WordPress/gutenberg/pull/39084))
+    -   Migrate site editor to use new preferences package. ([39158](https://github.com/WordPress/gutenberg/pull/39158))
+    -   Deprecate interface package's preference APIs. ([39418](https://github.com/WordPress/gutenberg/pull/39418))
+-   Create Block: Add support for more plugin header fields. ([39096](https://github.com/WordPress/gutenberg/pull/39096))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Buttons: Added aria label to the button block with icon. ([38966](https://github.com/WordPress/gutenberg/pull/38966))
+-   Buttons: Fixes Button highlight popover overflow conflict with link popover. ([38771](https://github.com/WordPress/gutenberg/pull/38771))
+-   Buttons: Don't set a placeholder text color. ([39034](https://github.com/WordPress/gutenberg/pull/39034))
+-   Code: Restructure code bock styling. ([38712](https://github.com/WordPress/gutenberg/pull/38712))
+-   Comments Pagination Number\_ Fix Comments Pagination Number with no pagination settings. ([39204](https://github.com/WordPress/gutenberg/pull/39204))
+-   Cover: Fix keep selected unit on deleting minHeight value. ([39145](https://github.com/WordPress/gutenberg/pull/39145))
+-   Cover: Fixes #38761 by removing obsolete `::Before` pseudo element. ([38762](https://github.com/WordPress/gutenberg/pull/38762))
+-   File: Check if 'fileId' exists before setting the attribute. ([39088](https://github.com/WordPress/gutenberg/pull/39088))
+-   File: Don't display loading animation on upload error. ([39213](https://github.com/WordPress/gutenberg/pull/39213))
+-   File: Fix file block validation error by not outputting aria-describedby if there's no description. ([39083](https://github.com/WordPress/gutenberg/pull/39083))
+-   File: Fix the undo trap. ([39215](https://github.com/WordPress/gutenberg/pull/39215))
+-   Hide border panel when all border features have been disabled. ([36791](https://github.com/WordPress/gutenberg/pull/36791))
+-   Hide current menu from dropdown list in Nav block. ([38916](https://github.com/WordPress/gutenberg/pull/38916))
+-   Image: Fix image responsive rules. ([39045](https://github.com/WordPress/gutenberg/pull/39045))
+-   Image: Display errors after failed upload. ([39178](https://github.com/WordPress/gutenberg/pull/39178))
+-   Media & Text: Display errors after failed upload. ([39245](https://github.com/WordPress/gutenberg/pull/39245))
+-   Navigation: Fix navigation menu error when menus are not yet fetched. ([39151](https://github.com/WordPress/gutenberg/pull/39151))
+-   Post Comments Form: Show correctwarning relative to post/page context. ([38011](https://github.com/WordPress/gutenberg/pull/38011))
+-   Post Expert: Fix missing class in post excerpt. ([38747](https://github.com/WordPress/gutenberg/pull/38747))
+-   Post Terms: Unescape HTML entities in term names. ([39216](https://github.com/WordPress/gutenberg/pull/39216))
+-   Widget Group: Make `save()` markup the same as `render_callback` markup. ([38510](https://github.com/WordPress/gutenberg/pull/38510))
 
 #### Styles
-- Fix Blocks list ordering in Global Styles. ([39093](https://github.com/WordPress/gutenberg/pull/39093))
-- Fix default duotone preset SVG and style generation. ([38681](https://github.com/WordPress/gutenberg/pull/38681))
-- Fix header panel height. ([39119](https://github.com/WordPress/gutenberg/pull/39119))
-- Fix Global styles overriding block's element styles. ([39012](https://github.com/WordPress/gutenberg/pull/39012))
+
+-   Fix Blocks list ordering in Global Styles. ([39093](https://github.com/WordPress/gutenberg/pull/39093))
+-   Fix default duotone preset SVG and style generation. ([38681](https://github.com/WordPress/gutenberg/pull/38681))
+-   Fix header panel height. ([39119](https://github.com/WordPress/gutenberg/pull/39119))
+-   Fix Global styles overriding block's element styles. ([39012](https://github.com/WordPress/gutenberg/pull/39012))
 
 #### Components
-- Update drag gesture of `InputControl`-based controls with axial constraint. ([38968](https://github.com/WordPress/gutenberg/pull/38968))
-- `UnitControl`: Fix controlled `unit` behavior. ([39148](https://github.com/WordPress/gutenberg/pull/39148))
-- Normalize font-family. ([38969](https://github.com/WordPress/gutenberg/pull/38969))
+
+-   Update drag gesture of `InputControl`-based controls with axial constraint. ([38968](https://github.com/WordPress/gutenberg/pull/38968))
+-   `UnitControl`: Fix controlled `unit` behavior. ([39148](https://github.com/WordPress/gutenberg/pull/39148))
+-   Normalize font-family. ([38969](https://github.com/WordPress/gutenberg/pull/38969))
 
 #### Block Editor
-- Fixes block highlight after block move. ([38915](https://github.com/WordPress/gutenberg/pull/38915))
-- Improve in_footer handling in gutenberg_override_script(). ([39497](https://github.com/WordPress/gutenberg/pull/39497))
+
+-   Fixes block highlight after block move. ([38915](https://github.com/WordPress/gutenberg/pull/38915))
+-   Improve in_footer handling in gutenberg_override_script(). ([39497](https://github.com/WordPress/gutenberg/pull/39497))
 
 #### Post Editor
-- Avoid error when 'styles' settings are removed. ([39091](https://github.com/WordPress/gutenberg/pull/39091))
-- URL: Fix code drift in the Editor package by removing duplicate cleanForSlug function. ([39033](https://github.com/WordPress/gutenberg/pull/39033))
 
-####  Site Editor
-- Expose plugin area to site editor's List page. ([39078](https://github.com/WordPress/gutenberg/pull/39078))
+-   Avoid error when 'styles' settings are removed. ([39091](https://github.com/WordPress/gutenberg/pull/39091))
+-   URL: Fix code drift in the Editor package by removing duplicate cleanForSlug function. ([39033](https://github.com/WordPress/gutenberg/pull/39033))
+
+#### Site Editor
+
+-   Expose plugin area to site editor's List page. ([39078](https://github.com/WordPress/gutenberg/pull/39078))
 
 #### Other Packages
-- `apiFetch`: Handle urlencoded and rest_route query params. ([38914](https://github.com/WordPress/gutenberg/pull/38914))
-- Base Styles: Add a resolvable JavaScript entry point to base-styles. ([39240](https://github.com/WordPress/gutenberg/pull/39240))
-- Compose: Avoid memory leak in use-drop-zone. ([39038](https://github.com/WordPress/gutenberg/pull/39038))
-- Render SVG props that have dashes correctly. ([38936](https://github.com/WordPress/gutenberg/pull/38936))
-- Url: Improvement to prototype handling. ([39365](https://github.com/WordPress/gutenberg/pull/39365))
 
+-   `apiFetch`: Handle urlencoded and rest_route query params. ([38914](https://github.com/WordPress/gutenberg/pull/38914))
+-   Base Styles: Add a resolvable JavaScript entry point to base-styles. ([39240](https://github.com/WordPress/gutenberg/pull/39240))
+-   Compose: Avoid memory leak in use-drop-zone. ([39038](https://github.com/WordPress/gutenberg/pull/39038))
+-   Render SVG props that have dashes correctly. ([38936](https://github.com/WordPress/gutenberg/pull/38936))
+-   Url: Improvement to prototype handling. ([39365](https://github.com/WordPress/gutenberg/pull/39365))
 
 ### Developer experience
-- Change copying PHP files to dist directory to opt-in via a CLI  flag. ([39171](https://github.com/WordPress/gutenberg/pull/39171))
-- Create Block: Add confirm prompt before showing the plugin options. ([39105](https://github.com/WordPress/gutenberg/pull/39105))
-- Create Block: Improve custom project template configuration. ([39049](https://github.com/WordPress/gutenberg/pull/39049))
-- Handle resolution errors in @wordpress/data. ([38669](https://github.com/WordPress/gutenberg/pull/38669))
 
+-   Change copying PHP files to dist directory to opt-in via a CLI flag. ([39171](https://github.com/WordPress/gutenberg/pull/39171))
+-   Create Block: Add confirm prompt before showing the plugin options. ([39105](https://github.com/WordPress/gutenberg/pull/39105))
+-   Create Block: Improve custom project template configuration. ([39049](https://github.com/WordPress/gutenberg/pull/39049))
+-   Handle resolution errors in @wordpress/data. ([38669](https://github.com/WordPress/gutenberg/pull/38669))
 
 ### Documentation
 
-- Add import useBlockProps. ([39072](https://github.com/WordPress/gutenberg/pull/39072))
-- Components: Update changelog follow up for #38985. ([39013](https://github.com/WordPress/gutenberg/pull/39013))
-- Emphasized requirement to enclose in quotation marks wp-env run…. ([39101](https://github.com/WordPress/gutenberg/pull/39101))
-- Element: Add changelog notes for serialize attribute casing. ([39141](https://github.com/WordPress/gutenberg/pull/39141))
-- Gutenberg Data Tutorial Part 3: Building an edit form. ([38581](https://github.com/WordPress/gutenberg/pull/38581))
-- Fix code example in flyout component. ([39156](https://github.com/WordPress/gutenberg/pull/39156))
-- Missing `,toggleFormat` from last code block. ([39146](https://github.com/WordPress/gutenberg/pull/39146))
-- Move recent CHANGELOG entry to `Unreleased` section. ([39169](https://github.com/WordPress/gutenberg/pull/39169))
-- Spelling error in `JustifyContentControl` example. ([39234](https://github.com/WordPress/gutenberg/pull/39234))
-- Storybook: Support proper extraction of TypeScript prop types. ([38842](https://github.com/WordPress/gutenberg/pull/38842))
-- Storybook: Add webpack loader for easier story descriptions. ([39165](https://github.com/WordPress/gutenberg/pull/39165))
-
+-   Add import useBlockProps. ([39072](https://github.com/WordPress/gutenberg/pull/39072))
+-   Components: Update changelog follow up for #38985. ([39013](https://github.com/WordPress/gutenberg/pull/39013))
+-   Emphasized requirement to enclose in quotation marks wp-env run…. ([39101](https://github.com/WordPress/gutenberg/pull/39101))
+-   Element: Add changelog notes for serialize attribute casing. ([39141](https://github.com/WordPress/gutenberg/pull/39141))
+-   Gutenberg Data Tutorial Part 3: Building an edit form. ([38581](https://github.com/WordPress/gutenberg/pull/38581))
+-   Fix code example in flyout component. ([39156](https://github.com/WordPress/gutenberg/pull/39156))
+-   Missing `,toggleFormat` from last code block. ([39146](https://github.com/WordPress/gutenberg/pull/39146))
+-   Move recent CHANGELOG entry to `Unreleased` section. ([39169](https://github.com/WordPress/gutenberg/pull/39169))
+-   Spelling error in `JustifyContentControl` example. ([39234](https://github.com/WordPress/gutenberg/pull/39234))
+-   Storybook: Support proper extraction of TypeScript prop types. ([38842](https://github.com/WordPress/gutenberg/pull/38842))
+-   Storybook: Add webpack loader for easier story descriptions. ([39165](https://github.com/WordPress/gutenberg/pull/39165))
 
 ### Code Quality
 
-- Componentes, UnitControl: Tidy up utils and types. ([38987](https://github.com/WordPress/gutenberg/pull/38987))
-- Components, FontSizePicker: Refactor stories to use Controls. ([38727](https://github.com/WordPress/gutenberg/pull/38727))
-- Components, ToggleGroupControlOption: Calculate width from button content and remove `LabelPlaceholderView`. ([39345](https://github.com/WordPress/gutenberg/pull/39345))
-- Core Data: Rename `types` directory to `entity-types`. ([39225](https://github.com/WordPress/gutenberg/pull/39225))
-- Core data: Fix some typing issues. ([39212](https://github.com/WordPress/gutenberg/pull/39212))
-- Core data: Fix some typing issues. ([39214](https://github.com/WordPress/gutenberg/pull/39214))
-- Fix `@wordpress/comment-case` ESlint errors but without adding the disable-rule pragma. ([37006](https://github.com/WordPress/gutenberg/pull/37006))
-- Delete widget editor redundant css for more menu. ([39113](https://github.com/WordPress/gutenberg/pull/39113))
-- Layout: Remove duplicate var declaration. ([39111](https://github.com/WordPress/gutenberg/pull/39111))
-- Move editor settings code to compat folder. ([39030](https://github.com/WordPress/gutenberg/pull/39030))
-- Refactor useSelect usages to useEntityRecords. ([38827](https://github.com/WordPress/gutenberg/pull/38827))
-- Refactor classic menu conversion process. ([38858](https://github.com/WordPress/gutenberg/pull/38858))
-- Post author name: Add "post" prefix to CSS class. ([38320](https://github.com/WordPress/gutenberg/pull/38320))
-- TreeGrid: Update callback unit tests to use TreeGridRow and TreeGridCell sub components. ([39002](https://github.com/WordPress/gutenberg/pull/39002))
-- Update framer motion to 6.2.8. ([38999](https://github.com/WordPress/gutenberg/pull/38999))
-- useBlockEditorSettings: Remove unused unstableBase fetch. ([39221](https://github.com/WordPress/gutenberg/pull/39221))
-
+-   Componentes, UnitControl: Tidy up utils and types. ([38987](https://github.com/WordPress/gutenberg/pull/38987))
+-   Components, FontSizePicker: Refactor stories to use Controls. ([38727](https://github.com/WordPress/gutenberg/pull/38727))
+-   Components, ToggleGroupControlOption: Calculate width from button content and remove `LabelPlaceholderView`. ([39345](https://github.com/WordPress/gutenberg/pull/39345))
+-   Core Data: Rename `types` directory to `entity-types`. ([39225](https://github.com/WordPress/gutenberg/pull/39225))
+-   Core data: Fix some typing issues. ([39212](https://github.com/WordPress/gutenberg/pull/39212))
+-   Core data: Fix some typing issues. ([39214](https://github.com/WordPress/gutenberg/pull/39214))
+-   Fix `@wordpress/comment-case` ESlint errors but without adding the disable-rule pragma. ([37006](https://github.com/WordPress/gutenberg/pull/37006))
+-   Delete widget editor redundant css for more menu. ([39113](https://github.com/WordPress/gutenberg/pull/39113))
+-   Layout: Remove duplicate var declaration. ([39111](https://github.com/WordPress/gutenberg/pull/39111))
+-   Move editor settings code to compat folder. ([39030](https://github.com/WordPress/gutenberg/pull/39030))
+-   Refactor useSelect usages to useEntityRecords. ([38827](https://github.com/WordPress/gutenberg/pull/38827))
+-   Refactor classic menu conversion process. ([38858](https://github.com/WordPress/gutenberg/pull/38858))
+-   Post author name: Add "post" prefix to CSS class. ([38320](https://github.com/WordPress/gutenberg/pull/38320))
+-   TreeGrid: Update callback unit tests to use TreeGridRow and TreeGridCell sub components. ([39002](https://github.com/WordPress/gutenberg/pull/39002))
+-   Update framer motion to 6.2.8. ([38999](https://github.com/WordPress/gutenberg/pull/38999))
+-   useBlockEditorSettings: Remove unused unstableBase fetch. ([39221](https://github.com/WordPress/gutenberg/pull/39221))
 
 ### Tools
 
 #### Project Management
-- Code owners: Remove users without write access and fix typos. ([39238](https://github.com/WordPress/gutenberg/pull/39238))
-- Simplify Pull Request template. ([39229](https://github.com/WordPress/gutenberg/pull/39229))
+
+-   Code owners: Remove users without write access and fix typos. ([39238](https://github.com/WordPress/gutenberg/pull/39238))
+-   Simplify Pull Request template. ([39229](https://github.com/WordPress/gutenberg/pull/39229))
 
 #### Testing
-- Add end-to-end testing for experimental nav menu deletion. ([38955](https://github.com/WordPress/gutenberg/pull/38955))
-- Add Home/End keyboard end-to-end test for List View. ([39265](https://github.com/WordPress/gutenberg/pull/39265))
-- Add some tests for TreeGrid. Update README to reflect latest functionality. ([39302](https://github.com/WordPress/gutenberg/pull/39302))
-- Add test case for post locking feature saving. ([39022](https://github.com/WordPress/gutenberg/pull/39022))
-- Add tests for media replace flow. ([39005](https://github.com/WordPress/gutenberg/pull/39005))
-- Block Test Fixtures: Add additional error message for serialized test fixtures that reserialize identically. ([39039](https://github.com/WordPress/gutenberg/pull/39039))
-- ESLint Plugin: Make Prettier integration optional. ([39244](https://github.com/WordPress/gutenberg/pull/39244))
-- Fix performance tests by adding backwards compatibility to welcome guide utility. ([39300](https://github.com/WordPress/gutenberg/pull/39300))
-- Improve switch to draft button end-to-end test robustness. ([38971](https://github.com/WordPress/gutenberg/pull/38971))
-- Remove rename rn UI tests. ([39042](https://github.com/WordPress/gutenberg/pull/39042))
-- Social Icons: Begin Automating Existing Manual Test Cases. ([39027](https://github.com/WordPress/gutenberg/pull/39027))
-- Update 'clickMenuItem' test util to use full label matching. ([39274](https://github.com/WordPress/gutenberg/pull/39274))
-- Update preview test to wait for publish panel to appear before closing it. ([39100](https://github.com/WordPress/gutenberg/pull/39100))
+
+-   Add end-to-end testing for experimental nav menu deletion. ([38955](https://github.com/WordPress/gutenberg/pull/38955))
+-   Add Home/End keyboard end-to-end test for List View. ([39265](https://github.com/WordPress/gutenberg/pull/39265))
+-   Add some tests for TreeGrid. Update README to reflect latest functionality. ([39302](https://github.com/WordPress/gutenberg/pull/39302))
+-   Add test case for post locking feature saving. ([39022](https://github.com/WordPress/gutenberg/pull/39022))
+-   Add tests for media replace flow. ([39005](https://github.com/WordPress/gutenberg/pull/39005))
+-   Block Test Fixtures: Add additional error message for serialized test fixtures that reserialize identically. ([39039](https://github.com/WordPress/gutenberg/pull/39039))
+-   ESLint Plugin: Make Prettier integration optional. ([39244](https://github.com/WordPress/gutenberg/pull/39244))
+-   Fix performance tests by adding backwards compatibility to welcome guide utility. ([39300](https://github.com/WordPress/gutenberg/pull/39300))
+-   Improve switch to draft button end-to-end test robustness. ([38971](https://github.com/WordPress/gutenberg/pull/38971))
+-   Remove rename rn UI tests. ([39042](https://github.com/WordPress/gutenberg/pull/39042))
+-   Social Icons: Begin Automating Existing Manual Test Cases. ([39027](https://github.com/WordPress/gutenberg/pull/39027))
+-   Update 'clickMenuItem' test util to use full label matching. ([39274](https://github.com/WordPress/gutenberg/pull/39274))
+-   Update preview test to wait for publish panel to appear before closing it. ([39100](https://github.com/WordPress/gutenberg/pull/39100))
 
 #### Build Tooling
-- Fix spelling of contributors in changelog script. ([39029](https://github.com/WordPress/gutenberg/pull/39029))
-- Resolve peer dependency warnings. ([39043](https://github.com/WordPress/gutenberg/pull/39043))
+
+-   Fix spelling of contributors in changelog script. ([39029](https://github.com/WordPress/gutenberg/pull/39029))
+-   Resolve peer dependency warnings. ([39043](https://github.com/WordPress/gutenberg/pull/39043))
 
 #### npm Packages
-- Fix `npm run docs:Build` crashing when a `block.json` lacks `supports` key. ([39241](https://github.com/WordPress/gutenberg/pull/39241))
-- Packages: Automate npm publishing as part of Gutenberg release workflow. ([39259](https://github.com/WordPress/gutenberg/pull/39259))
-- Packages: Automatically acceppt all Lerna commands when run with CI flag. ([39199](https://github.com/WordPress/gutenberg/pull/39199))
-- Packages: Update CLI publishing tool to run in CI mode. ([38993](https://github.com/WordPress/gutenberg/pull/38993))
 
-#### Plugin
-- Account for upcoming changes in styles metadata in WordPress 5.9. ([36327](https://github.com/WordPress/gutenberg/pull/36327))
-- Don't filter 'theme_templates' when running WP 5.9. ([39017](https://github.com/WordPress/gutenberg/pull/39017))
+-   Fix `npm run docs:Build` crashing when a `block.json` lacks `supports` key. ([39241](https://github.com/WordPress/gutenberg/pull/39241))
+-   Packages: Automate npm publishing as part of Gutenberg release workflow. ([39259](https://github.com/WordPress/gutenberg/pull/39259))
+-   Packages: Automatically acceppt all Lerna commands when run with CI flag. ([39199](https://github.com/WordPress/gutenberg/pull/39199))
+-   Packages: Update CLI publishing tool to run in CI mode. ([38993](https://github.com/WordPress/gutenberg/pull/38993))
 
+#### Plugin
 
-## First time contributors
+-   Account for upcoming changes in styles metadata in WordPress 5.9. ([36327](https://github.com/WordPress/gutenberg/pull/36327))
+-   Don't filter 'theme_templates' when running WP 5.9. ([39017](https://github.com/WordPress/gutenberg/pull/39017))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @ahsanshaheen199: fix: Code example in flyout component. ([39156](https://github.com/WordPress/gutenberg/pull/39156))
-- @alshakerM: Render SVG props that have dashes correctly. ([38936](https://github.com/WordPress/gutenberg/pull/38936))
-- @awps: Missing `,toggleFormat` from last code block. ([39146](https://github.com/WordPress/gutenberg/pull/39146))
-- @francisei: Docs: Emphasized requirement to enclose in quotation marks wp-env run…. ([39101](https://github.com/WordPress/gutenberg/pull/39101))
-- @ironprogrammer: Raise z-index of content div relative to sidebars. ([38893](https://github.com/WordPress/gutenberg/pull/38893))
-- @joshuafredrickson: Add a resolvable JavaScript entry point to base-styles. ([39240](https://github.com/WordPress/gutenberg/pull/39240))
-- @jostnes: Remove rename rn UI tests. ([39042](https://github.com/WordPress/gutenberg/pull/39042))
-- @mashikag: Fix Blocks list ordering in Global Styles. ([39093](https://github.com/WordPress/gutenberg/pull/39093))
-- @tomasztunik: Fix Global styles overriding block's element styles. ([39012](https://github.com/WordPress/gutenberg/pull/39012))
-- @Tumas2: Spelling error in `JustifyContentControl` example. ([39234](https://github.com/WordPress/gutenberg/pull/39234))
+The following PRs were merged by first-time contributors:
 
+-   @ahsanshaheen199: fix: Code example in flyout component. ([39156](https://github.com/WordPress/gutenberg/pull/39156))
+-   @alshakerM: Render SVG props that have dashes correctly. ([38936](https://github.com/WordPress/gutenberg/pull/38936))
+-   @awps: Missing `,toggleFormat` from last code block. ([39146](https://github.com/WordPress/gutenberg/pull/39146))
+-   @francisei: Docs: Emphasized requirement to enclose in quotation marks wp-env run…. ([39101](https://github.com/WordPress/gutenberg/pull/39101))
+-   @ironprogrammer: Raise z-index of content div relative to sidebars. ([38893](https://github.com/WordPress/gutenberg/pull/38893))
+-   @joshuafredrickson: Add a resolvable JavaScript entry point to base-styles. ([39240](https://github.com/WordPress/gutenberg/pull/39240))
+-   @jostnes: Remove rename rn UI tests. ([39042](https://github.com/WordPress/gutenberg/pull/39042))
+-   @mashikag: Fix Blocks list ordering in Global Styles. ([39093](https://github.com/WordPress/gutenberg/pull/39093))
+-   @tomasztunik: Fix Global styles overriding block's element styles. ([39012](https://github.com/WordPress/gutenberg/pull/39012))
+-   @Tumas2: Spelling error in `JustifyContentControl` example. ([39234](https://github.com/WordPress/gutenberg/pull/39234))
 
 ## Contributors
 
@@ -16945,17 +28371,14 @@ The following contributors merged PRs in this release:
 
 @adamziel @ahsanshaheen199 @ajlende @alexstine @alshakerM @amustaque97 @andrewserong @aristath @awps @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @delowardev @dmsnell @draganescu @fluiddot @francisei @getdave @gwwar @gziolo @illusaen @ironprogrammer @jasmussen @joshuafredrickson @jostnes @jsnajdr @Mamaduka @mashikag @mirka @ndiego @noahtallen @noisysocks @ntsekouras @oandregal @ocean90 @opr @priethor @ramonjd @ryanwelcher @scruffian @Sidsector9 @SiobhyB @Sisanu @stokesman @talldan @tellthemachines @tomasztunik @ttahmouch @Tumas2 @walbo @webmandesign @zaguiini @ZebulanStanphill
 
-
 = 12.7.2 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
-- Block Editor: Improve Global Styles filtering order. ([39364](https://github.com/WordPress/gutenberg/pull/39364))
-- getQueryArgs: Improvement to prototype handling. ([39365](https://github.com/WordPress/gutenberg/pull/39365))
+-   Block Editor: Improve Global Styles filtering order. ([39364](https://github.com/WordPress/gutenberg/pull/39364))
+-   getQueryArgs: Improvement to prototype handling. ([39365](https://github.com/WordPress/gutenberg/pull/39365))
 
 ## Contributors
 
@@ -16963,250 +28386,279 @@ The following contributors merged PRs in this release:
 
 @jorgefilipecosta
 
-
 = 12.8.0-rc.1 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
-- Change copying PHP files to dist directory to opt-in via a CLI  flag. ([39171](https://github.com/WordPress/gutenberg/pull/39171))
-- Raise z-index of content div relative to sidebars. ([38893](https://github.com/WordPress/gutenberg/pull/38893))
+-   Change copying PHP files to dist directory to opt-in via a CLI flag. ([39171](https://github.com/WordPress/gutenberg/pull/39171))
+-   Raise z-index of content div relative to sidebars. ([38893](https://github.com/WordPress/gutenberg/pull/38893))
 
 #### Components
-- Enhance/confirmdialog add custom button text. ([38994](https://github.com/WordPress/gutenberg/pull/38994))
-- InputControl: Allow onBlur for empty values to commit the change, move reset behaviour to ESCAPE key. ([39109](https://github.com/WordPress/gutenberg/pull/39109))
-- Update framer motion to 6.2.8. ([38999](https://github.com/WordPress/gutenberg/pull/38999))
-- `UnitControl`: Tidy up utils and types. ([38987](https://github.com/WordPress/gutenberg/pull/38987))
+
+-   Enhance/confirmdialog add custom button text. ([38994](https://github.com/WordPress/gutenberg/pull/38994))
+-   InputControl: Allow onBlur for empty values to commit the change, move reset behaviour to ESCAPE key. ([39109](https://github.com/WordPress/gutenberg/pull/39109))
+-   Update framer motion to 6.2.8. ([38999](https://github.com/WordPress/gutenberg/pull/38999))
+-   `UnitControl`: Tidy up utils and types. ([38987](https://github.com/WordPress/gutenberg/pull/38987))
 
 #### Post Editor
-- Add interface preferences modal to edit post. ([39176](https://github.com/WordPress/gutenberg/pull/39176))
-- Migrate hidden block types (block manager data) to new preferences packages. ([39132](https://github.com/WordPress/gutenberg/pull/39132))
-- Migrate post editor feature preferences to use new preferences package. ([39115](https://github.com/WordPress/gutenberg/pull/39115))
+
+-   Add interface preferences modal to edit post. ([39176](https://github.com/WordPress/gutenberg/pull/39176))
+-   Migrate hidden block types (block manager data) to new preferences packages. ([39132](https://github.com/WordPress/gutenberg/pull/39132))
+-   Migrate post editor feature preferences to use new preferences package. ([39115](https://github.com/WordPress/gutenberg/pull/39115))
 
 #### Block Library
-- Improve create new UI feedback in Nav block. ([39219](https://github.com/WordPress/gutenberg/pull/39219))
-- Media & Text: Display media while uploading. ([39275](https://github.com/WordPress/gutenberg/pull/39275))
+
+-   Improve create new UI feedback in Nav block. ([39219](https://github.com/WordPress/gutenberg/pull/39219))
+-   Media & Text: Display media while uploading. ([39275](https://github.com/WordPress/gutenberg/pull/39275))
 
 #### Testing
-- Add Home/End keyboard end-to-end test for List View. ([39265](https://github.com/WordPress/gutenberg/pull/39265))
-- Improve switch to draft button end-to-end test robustness. ([38971](https://github.com/WordPress/gutenberg/pull/38971))
+
+-   Add Home/End keyboard end-to-end test for List View. ([39265](https://github.com/WordPress/gutenberg/pull/39265))
+-   Improve switch to draft button end-to-end test robustness. ([38971](https://github.com/WordPress/gutenberg/pull/38971))
 
 #### Site Editor
-- Migrate site editor to use new preferences package. ([39158](https://github.com/WordPress/gutenberg/pull/39158))
-- Resolve homepage template on server-side. ([38817](https://github.com/WordPress/gutenberg/pull/38817))
+
+-   Migrate site editor to use new preferences package. ([39158](https://github.com/WordPress/gutenberg/pull/39158))
+-   Resolve homepage template on server-side. ([38817](https://github.com/WordPress/gutenberg/pull/38817))
 
 #### Widgets Editor
-- Migrate customize widgets editor to use new preferences package. ([39112](https://github.com/WordPress/gutenberg/pull/39112))
-- Migrate standalone widgets editor to use new preferences package. ([39084](https://github.com/WordPress/gutenberg/pull/39084))
+
+-   Migrate customize widgets editor to use new preferences package. ([39112](https://github.com/WordPress/gutenberg/pull/39112))
+-   Migrate standalone widgets editor to use new preferences package. ([39084](https://github.com/WordPress/gutenberg/pull/39084))
 
 #### Media
-- MediaReplaceFlow: Add 'onError' prop to handle error notifications. ([39197](https://github.com/WordPress/gutenberg/pull/39197))
+
+-   MediaReplaceFlow: Add 'onError' prop to handle error notifications. ([39197](https://github.com/WordPress/gutenberg/pull/39197))
 
 #### Accessibility
-- Block settings dropdown: Use block display title in remove label. ([39110](https://github.com/WordPress/gutenberg/pull/39110))
+
+-   Block settings dropdown: Use block display title in remove label. ([39110](https://github.com/WordPress/gutenberg/pull/39110))
 
 #### Global Styles
-- Site Editor: Add theme.json to export file. ([39048](https://github.com/WordPress/gutenberg/pull/39048))
+
+-   Site Editor: Add theme.json to export file. ([39048](https://github.com/WordPress/gutenberg/pull/39048))
 
 #### npm Packages
-- Packages: Update CLI publishing tool to run in CI mode. ([38993](https://github.com/WordPress/gutenberg/pull/38993))
+
+-   Packages: Update CLI publishing tool to run in CI mode. ([38993](https://github.com/WordPress/gutenberg/pull/38993))
 
 #### Block Editor
-- Add a link completer for inline links to posts. ([29172](https://github.com/WordPress/gutenberg/pull/29172))
 
+-   Add a link completer for inline links to posts. ([29172](https://github.com/WordPress/gutenberg/pull/29172))
 
 ### New APIs
 
-- Add new `@wordpress/preferences` package. ([38873](https://github.com/WordPress/gutenberg/pull/38873))
-- Create Block: Add support for more plugin header fields. ([39096](https://github.com/WordPress/gutenberg/pull/39096))
-
+-   Add new `@wordpress/preferences` package. ([38873](https://github.com/WordPress/gutenberg/pull/38873))
+-   Create Block: Add support for more plugin header fields. ([39096](https://github.com/WordPress/gutenberg/pull/39096))
 
 ### Bug Fixes
 
-- Compose: Avoid memory leak in use-drop-zone. ([39038](https://github.com/WordPress/gutenberg/pull/39038))
-- Fix Global styles overriding block's element styles. ([39012](https://github.com/WordPress/gutenberg/pull/39012))
-- Fix: Button highlight popover overflow conflict with link popover. ([38771](https://github.com/WordPress/gutenberg/pull/38771))
-- Fixes block highlight after block move. ([38915](https://github.com/WordPress/gutenberg/pull/38915))
-- Render SVG props that have dashes correctly. ([38936](https://github.com/WordPress/gutenberg/pull/38936))
-- apiFetch preloading middleware: Handle urlencoded and rest_route query params. ([38914](https://github.com/WordPress/gutenberg/pull/38914))
-
-#### Block Library
-- Added aria label to the button block with icon. ([38966](https://github.com/WordPress/gutenberg/pull/38966))
-- File: Check if 'fileId' exists before setting the attribute. ([39088](https://github.com/WordPress/gutenberg/pull/39088))
-- File: Don't display loading animation on upload error. ([39213](https://github.com/WordPress/gutenberg/pull/39213))
-- File: Fix the undo trap. ([39215](https://github.com/WordPress/gutenberg/pull/39215))
-- Fix Comments Pagination Number with no pagination settings. ([39204](https://github.com/WordPress/gutenberg/pull/39204))
-- Fix file block validation error by not outputting aria-describedby if there's no description. ([39083](https://github.com/WordPress/gutenberg/pull/39083))
-- Fix navigation menu error when menus are not yet fetched. ([39151](https://github.com/WordPress/gutenberg/pull/39151))
-- Hide border panel when all border features have been disabled. ([36791](https://github.com/WordPress/gutenberg/pull/36791))
-- Hide current menu from dropdown list in Nav block. ([38916](https://github.com/WordPress/gutenberg/pull/38916))
-- Image: Display errors after failed upload. ([39178](https://github.com/WordPress/gutenberg/pull/39178))
-- Media & Text: Display errors after failed upload. ([39245](https://github.com/WordPress/gutenberg/pull/39245))
-- Post Expert: Fix missing class in post excerpt. ([38747](https://github.com/WordPress/gutenberg/pull/38747))
-- Post Terms: Unescape HTML entities in term names. ([39216](https://github.com/WordPress/gutenberg/pull/39216))
-- Restructure code bock styling. ([38712](https://github.com/WordPress/gutenberg/pull/38712))
-- Try: Fix image responsive rules. ([39045](https://github.com/WordPress/gutenberg/pull/39045))
-- Widget Group: Make `save()` markup the same as `render_callback` markup. ([38510](https://github.com/WordPress/gutenberg/pull/38510))
-- [Cover]: Fix keep selected unit on deleting minHeight value. ([39145](https://github.com/WordPress/gutenberg/pull/39145))
+-   Compose: Avoid memory leak in use-drop-zone. ([39038](https://github.com/WordPress/gutenberg/pull/39038))
+-   Fix Global styles overriding block's element styles. ([39012](https://github.com/WordPress/gutenberg/pull/39012))
+-   Fix: Button highlight popover overflow conflict with link popover. ([38771](https://github.com/WordPress/gutenberg/pull/38771))
+-   Fixes block highlight after block move. ([38915](https://github.com/WordPress/gutenberg/pull/38915))
+-   Render SVG props that have dashes correctly. ([38936](https://github.com/WordPress/gutenberg/pull/38936))
+-   apiFetch preloading middleware: Handle urlencoded and rest_route query params. ([38914](https://github.com/WordPress/gutenberg/pull/38914))
+
+#### Block Library
+
+-   Added aria label to the button block with icon. ([38966](https://github.com/WordPress/gutenberg/pull/38966))
+-   File: Check if 'fileId' exists before setting the attribute. ([39088](https://github.com/WordPress/gutenberg/pull/39088))
+-   File: Don't display loading animation on upload error. ([39213](https://github.com/WordPress/gutenberg/pull/39213))
+-   File: Fix the undo trap. ([39215](https://github.com/WordPress/gutenberg/pull/39215))
+-   Fix Comments Pagination Number with no pagination settings. ([39204](https://github.com/WordPress/gutenberg/pull/39204))
+-   Fix file block validation error by not outputting aria-describedby if there's no description. ([39083](https://github.com/WordPress/gutenberg/pull/39083))
+-   Fix navigation menu error when menus are not yet fetched. ([39151](https://github.com/WordPress/gutenberg/pull/39151))
+-   Hide border panel when all border features have been disabled. ([36791](https://github.com/WordPress/gutenberg/pull/36791))
+-   Hide current menu from dropdown list in Nav block. ([38916](https://github.com/WordPress/gutenberg/pull/38916))
+-   Image: Display errors after failed upload. ([39178](https://github.com/WordPress/gutenberg/pull/39178))
+-   Media & Text: Display errors after failed upload. ([39245](https://github.com/WordPress/gutenberg/pull/39245))
+-   Post Expert: Fix missing class in post excerpt. ([38747](https://github.com/WordPress/gutenberg/pull/38747))
+-   Post Terms: Unescape HTML entities in term names. ([39216](https://github.com/WordPress/gutenberg/pull/39216))
+-   Restructure code bock styling. ([38712](https://github.com/WordPress/gutenberg/pull/38712))
+-   Try: Fix image responsive rules. ([39045](https://github.com/WordPress/gutenberg/pull/39045))
+-   Widget Group: Make `save()` markup the same as `render_callback` markup. ([38510](https://github.com/WordPress/gutenberg/pull/38510))
+-   [Cover]: Fix keep selected unit on deleting minHeight value. ([39145](https://github.com/WordPress/gutenberg/pull/39145))
 
 #### Global Styles
-- Fix Blocks list ordering in Global Styles. ([39093](https://github.com/WordPress/gutenberg/pull/39093))
-- Fix default duotone preset SVG and style generation. ([38681](https://github.com/WordPress/gutenberg/pull/38681))
-- [Global Styles]: Fix header panel height. ([39119](https://github.com/WordPress/gutenberg/pull/39119))
+
+-   Fix Blocks list ordering in Global Styles. ([39093](https://github.com/WordPress/gutenberg/pull/39093))
+-   Fix default duotone preset SVG and style generation. ([38681](https://github.com/WordPress/gutenberg/pull/38681))
+-   [Global Styles]: Fix header panel height. ([39119](https://github.com/WordPress/gutenberg/pull/39119))
 
 #### Testing
-- Fix performance tests by adding backwards compatibility to welcome guide utility. ([39300](https://github.com/WordPress/gutenberg/pull/39300))
-- e2e-tests: Update preview test to wait for publish panel to appear before closing it. ([39100](https://github.com/WordPress/gutenberg/pull/39100))
+
+-   Fix performance tests by adding backwards compatibility to welcome guide utility. ([39300](https://github.com/WordPress/gutenberg/pull/39300))
+-   e2e-tests: Update preview test to wait for publish panel to appear before closing it. ([39100](https://github.com/WordPress/gutenberg/pull/39100))
 
 #### Components
-- Update drag gesture of `InputControl`-based controls with axial constraint. ([38968](https://github.com/WordPress/gutenberg/pull/38968))
-- `UnitControl`: Fix controlled `unit` behavior. ([39148](https://github.com/WordPress/gutenberg/pull/39148))
+
+-   Update drag gesture of `InputControl`-based controls with axial constraint. ([38968](https://github.com/WordPress/gutenberg/pull/38968))
+-   `UnitControl`: Fix controlled `unit` behavior. ([39148](https://github.com/WordPress/gutenberg/pull/39148))
 
 #### Post Editor
-- Avoid error when 'styles' settings are removed. ([39091](https://github.com/WordPress/gutenberg/pull/39091))
-- URL: Fix code drift in the Editor package by removing duplicate cleanForSlug function. ([39033](https://github.com/WordPress/gutenberg/pull/39033))
+
+-   Avoid error when 'styles' settings are removed. ([39091](https://github.com/WordPress/gutenberg/pull/39091))
+-   URL: Fix code drift in the Editor package by removing duplicate cleanForSlug function. ([39033](https://github.com/WordPress/gutenberg/pull/39033))
 
 #### Build Tooling
-- Fix `npm run docs:Build` crashing when a `block.json` lacks `supports` key. ([39241](https://github.com/WordPress/gutenberg/pull/39241))
+
+-   Fix `npm run docs:Build` crashing when a `block.json` lacks `supports` key. ([39241](https://github.com/WordPress/gutenberg/pull/39241))
 
 #### npm Packages
-- Packages: Automatically acceppt all Lerna commands when run with CI flag. ([39199](https://github.com/WordPress/gutenberg/pull/39199))
+
+-   Packages: Automatically acceppt all Lerna commands when run with CI flag. ([39199](https://github.com/WordPress/gutenberg/pull/39199))
 
 #### CSS & Styling
-- Fixes #38761 by removing obsolete `::Before` pseudo element. ([38762](https://github.com/WordPress/gutenberg/pull/38762))
 
+-   Fixes #38761 by removing obsolete `::Before` pseudo element. ([38762](https://github.com/WordPress/gutenberg/pull/38762))
 
 ### Documentation
 
-- Add import useBlockProps. ([39072](https://github.com/WordPress/gutenberg/pull/39072))
-- Docs: Emphasized requirement to enclose in quotation marks wp-env run…. ([39101](https://github.com/WordPress/gutenberg/pull/39101))
-- Spelling error in `JustifyContentControl` example. ([39234](https://github.com/WordPress/gutenberg/pull/39234))
-- [Gutenberg Data Tutorial] Part 3: Building an edit form. ([38581](https://github.com/WordPress/gutenberg/pull/38581))
+-   Add import useBlockProps. ([39072](https://github.com/WordPress/gutenberg/pull/39072))
+-   Docs: Emphasized requirement to enclose in quotation marks wp-env run…. ([39101](https://github.com/WordPress/gutenberg/pull/39101))
+-   Spelling error in `JustifyContentControl` example. ([39234](https://github.com/WordPress/gutenberg/pull/39234))
+-   [Gutenberg Data Tutorial] Part 3: Building an edit form. ([38581](https://github.com/WordPress/gutenberg/pull/38581))
 
 #### Components
-- Move recent CHANGELOG entry to `Unreleased` section. ([39169](https://github.com/WordPress/gutenberg/pull/39169))
-- Storybook: Support proper extraction of TypeScript prop types. ([38842](https://github.com/WordPress/gutenberg/pull/38842))
-- fix: Code example in flyout component. ([39156](https://github.com/WordPress/gutenberg/pull/39156))
 
+-   Move recent CHANGELOG entry to `Unreleased` section. ([39169](https://github.com/WordPress/gutenberg/pull/39169))
+-   Storybook: Support proper extraction of TypeScript prop types. ([38842](https://github.com/WordPress/gutenberg/pull/38842))
+-   fix: Code example in flyout component. ([39156](https://github.com/WordPress/gutenberg/pull/39156))
 
 ### Code Quality
 
-- Core Data: Rename `types` directory to `entity-types`. ([39225](https://github.com/WordPress/gutenberg/pull/39225))
-- Core data: Fix some typing issues. ([39212](https://github.com/WordPress/gutenberg/pull/39212))
-- Core data: Fix some typing issues. ([39214](https://github.com/WordPress/gutenberg/pull/39214))
-- Fix `@wordpress/comment-case` ESlint errors but without adding the disable-rule pragma. ([37006](https://github.com/WordPress/gutenberg/pull/37006))
-- Refactor useSelect usages to useEntityRecords. ([38827](https://github.com/WordPress/gutenberg/pull/38827))
+-   Core Data: Rename `types` directory to `entity-types`. ([39225](https://github.com/WordPress/gutenberg/pull/39225))
+-   Core data: Fix some typing issues. ([39212](https://github.com/WordPress/gutenberg/pull/39212))
+-   Core data: Fix some typing issues. ([39214](https://github.com/WordPress/gutenberg/pull/39214))
+-   Fix `@wordpress/comment-case` ESlint errors but without adding the disable-rule pragma. ([37006](https://github.com/WordPress/gutenberg/pull/37006))
+-   Refactor useSelect usages to useEntityRecords. ([38827](https://github.com/WordPress/gutenberg/pull/38827))
 
 #### Post Editor
-- useBlockEditorSettings: Remove unused unstableBase fetch. ([39221](https://github.com/WordPress/gutenberg/pull/39221))
+
+-   useBlockEditorSettings: Remove unused unstableBase fetch. ([39221](https://github.com/WordPress/gutenberg/pull/39221))
 
 #### Widgets Editor
-- Delete widget editor redundant css for more menu. ([39113](https://github.com/WordPress/gutenberg/pull/39113))
+
+-   Delete widget editor redundant css for more menu. ([39113](https://github.com/WordPress/gutenberg/pull/39113))
 
 #### Plugin
-- Layout: Remove duplicate var declaration. ([39111](https://github.com/WordPress/gutenberg/pull/39111))
+
+-   Layout: Remove duplicate var declaration. ([39111](https://github.com/WordPress/gutenberg/pull/39111))
 
 #### Global Styles
-- Move editor settings code to compat folder. ([39030](https://github.com/WordPress/gutenberg/pull/39030))
+
+-   Move editor settings code to compat folder. ([39030](https://github.com/WordPress/gutenberg/pull/39030))
 
 #### Themes
-- Don't filter 'theme_templates' when running WP 5.9. ([39017](https://github.com/WordPress/gutenberg/pull/39017))
+
+-   Don't filter 'theme_templates' when running WP 5.9. ([39017](https://github.com/WordPress/gutenberg/pull/39017))
 
 #### Components
-- TreeGrid: Update callback unit tests to use TreeGridRow and TreeGridCell sub components. ([39002](https://github.com/WordPress/gutenberg/pull/39002))
+
+-   TreeGrid: Update callback unit tests to use TreeGridRow and TreeGridCell sub components. ([39002](https://github.com/WordPress/gutenberg/pull/39002))
 
 #### Block Library
-- Improve Nav block loading and placeholder states. ([38907](https://github.com/WordPress/gutenberg/pull/38907))
 
+-   Improve Nav block loading and placeholder states. ([38907](https://github.com/WordPress/gutenberg/pull/38907))
 
 ### Tools
 
-- Code owners: Remove users without write access and fix typos. ([39238](https://github.com/WordPress/gutenberg/pull/39238))
-- Simplify Pull Request template. ([39229](https://github.com/WordPress/gutenberg/pull/39229))
+-   Code owners: Remove users without write access and fix typos. ([39238](https://github.com/WordPress/gutenberg/pull/39238))
+-   Simplify Pull Request template. ([39229](https://github.com/WordPress/gutenberg/pull/39229))
 
 #### Testing
-- Add end-to-end testing for experimental nav menu deletion. ([38955](https://github.com/WordPress/gutenberg/pull/38955))
-- Add test case for post locking feature saving. ([39022](https://github.com/WordPress/gutenberg/pull/39022))
-- Add tests for media replace flow. ([39005](https://github.com/WordPress/gutenberg/pull/39005))
-- Block Test Fixtures: Add additional error message for serialized test fixtures that reserialize identically. ([39039](https://github.com/WordPress/gutenberg/pull/39039))
-- Update 'clickMenuItem' test util to use full label matching. ([39274](https://github.com/WordPress/gutenberg/pull/39274))
+
+-   Add end-to-end testing for experimental nav menu deletion. ([38955](https://github.com/WordPress/gutenberg/pull/38955))
+-   Add test case for post locking feature saving. ([39022](https://github.com/WordPress/gutenberg/pull/39022))
+-   Add tests for media replace flow. ([39005](https://github.com/WordPress/gutenberg/pull/39005))
+-   Block Test Fixtures: Add additional error message for serialized test fixtures that reserialize identically. ([39039](https://github.com/WordPress/gutenberg/pull/39039))
+-   Update 'clickMenuItem' test util to use full label matching. ([39274](https://github.com/WordPress/gutenberg/pull/39274))
 
 #### Build Tooling
-- Fix spelling of contributors in changelog script. ([39029](https://github.com/WordPress/gutenberg/pull/39029))
-- Resolve peer dependency warnings. ([39043](https://github.com/WordPress/gutenberg/pull/39043))
+
+-   Fix spelling of contributors in changelog script. ([39029](https://github.com/WordPress/gutenberg/pull/39029))
+-   Resolve peer dependency warnings. ([39043](https://github.com/WordPress/gutenberg/pull/39043))
 
 #### npm Packages
-- Packages: Automate npm publishing as part of Gutenberg release workflow. ([39259](https://github.com/WordPress/gutenberg/pull/39259))
 
+-   Packages: Automate npm publishing as part of Gutenberg release workflow. ([39259](https://github.com/WordPress/gutenberg/pull/39259))
 
 ### Various
 
-- Add a resolvable JavaScript entry point to base-styles. ([39240](https://github.com/WordPress/gutenberg/pull/39240))
-- Add reusable preferences modal to interface package. ([39153](https://github.com/WordPress/gutenberg/pull/39153))
-- Create Block: Add confirm prompt before showing the plugin options. ([39105](https://github.com/WordPress/gutenberg/pull/39105))
-- Create Block: Improve custom project template configuration. ([39049](https://github.com/WordPress/gutenberg/pull/39049))
-- Element: Add changelog notes for serialize attribute casing. ([39141](https://github.com/WordPress/gutenberg/pull/39141))
-- Missing `,toggleFormat` from last code block. ([39146](https://github.com/WordPress/gutenberg/pull/39146))
-- Remove rename rn UI tests. ([39042](https://github.com/WordPress/gutenberg/pull/39042))
+-   Add a resolvable JavaScript entry point to base-styles. ([39240](https://github.com/WordPress/gutenberg/pull/39240))
+-   Add reusable preferences modal to interface package. ([39153](https://github.com/WordPress/gutenberg/pull/39153))
+-   Create Block: Add confirm prompt before showing the plugin options. ([39105](https://github.com/WordPress/gutenberg/pull/39105))
+-   Create Block: Improve custom project template configuration. ([39049](https://github.com/WordPress/gutenberg/pull/39049))
+-   Element: Add changelog notes for serialize attribute casing. ([39141](https://github.com/WordPress/gutenberg/pull/39141))
+-   Missing `,toggleFormat` from last code block. ([39146](https://github.com/WordPress/gutenberg/pull/39146))
+-   Remove rename rn UI tests. ([39042](https://github.com/WordPress/gutenberg/pull/39042))
 
 #### Block Library
-- Adding a GIF badge to image blocks with gifs in them. ([38996](https://github.com/WordPress/gutenberg/pull/38996))
-- Buttons: Don't set a placeholder text color. ([39034](https://github.com/WordPress/gutenberg/pull/39034))
-- Post author name: Add "post" prefix to CSS class. ([38320](https://github.com/WordPress/gutenberg/pull/38320))
-- Post comments form block show warning wrt to post/page. ([38011](https://github.com/WordPress/gutenberg/pull/38011))
-- Refactor classic menu conversion process. ([38858](https://github.com/WordPress/gutenberg/pull/38858))
-- Social Icons - Begin Automating Existing Manual Test Cases. ([39027](https://github.com/WordPress/gutenberg/pull/39027))
-- Tag Cloud: Use flex for the Outline style. ([38995](https://github.com/WordPress/gutenberg/pull/38995))
+
+-   Adding a GIF badge to image blocks with gifs in them. ([38996](https://github.com/WordPress/gutenberg/pull/38996))
+-   Buttons: Don't set a placeholder text color. ([39034](https://github.com/WordPress/gutenberg/pull/39034))
+-   Post author name: Add "post" prefix to CSS class. ([38320](https://github.com/WordPress/gutenberg/pull/38320))
+-   Post comments form block show warning wrt to post/page. ([38011](https://github.com/WordPress/gutenberg/pull/38011))
+-   Refactor classic menu conversion process. ([38858](https://github.com/WordPress/gutenberg/pull/38858))
+-   Social Icons - Begin Automating Existing Manual Test Cases. ([39027](https://github.com/WordPress/gutenberg/pull/39027))
+-   Tag Cloud: Use flex for the Outline style. ([38995](https://github.com/WordPress/gutenberg/pull/38995))
 
 #### Components
-- FontSizePicker: Refactor stories to use Controls. ([38727](https://github.com/WordPress/gutenberg/pull/38727))
-- Normalize font-family. ([38969](https://github.com/WordPress/gutenberg/pull/38969))
-- Storybook: Add webpack loader for easier story descriptions. ([39165](https://github.com/WordPress/gutenberg/pull/39165))
-- [Components]: Update changelog follow up for #38985. ([39013](https://github.com/WordPress/gutenberg/pull/39013))
+
+-   FontSizePicker: Refactor stories to use Controls. ([38727](https://github.com/WordPress/gutenberg/pull/38727))
+-   Normalize font-family. ([38969](https://github.com/WordPress/gutenberg/pull/38969))
+-   Storybook: Add webpack loader for easier story descriptions. ([39165](https://github.com/WordPress/gutenberg/pull/39165))
+-   [Components]: Update changelog follow up for #38985. ([39013](https://github.com/WordPress/gutenberg/pull/39013))
 
 #### Themes
-- Theme Export: Add index.php and style.css. ([39173](https://github.com/WordPress/gutenberg/pull/39173))
+
+-   Theme Export: Add index.php and style.css. ([39173](https://github.com/WordPress/gutenberg/pull/39173))
 
 #### Icons
-- Update Pin icon, add new Post icon. ([39139](https://github.com/WordPress/gutenberg/pull/39139))
+
+-   Update Pin icon, add new Post icon. ([39139](https://github.com/WordPress/gutenberg/pull/39139))
 
 #### Block Conversion
-- [Block Conversion]: Show `group` option in `Group` blocks. ([39094](https://github.com/WordPress/gutenberg/pull/39094))
+
+-   [Block Conversion]: Show `group` option in `Group` blocks. ([39094](https://github.com/WordPress/gutenberg/pull/39094))
 
 #### Accessibility
-- Try allowing tab into block placeholder. ([39085](https://github.com/WordPress/gutenberg/pull/39085))
+
+-   Try allowing tab into block placeholder. ([39085](https://github.com/WordPress/gutenberg/pull/39085))
 
 #### Full Site Editing
-- Expose plugin area to site editor's List page. ([39078](https://github.com/WordPress/gutenberg/pull/39078))
+
+-   Expose plugin area to site editor's List page. ([39078](https://github.com/WordPress/gutenberg/pull/39078))
 
 #### Data Layer
-- Handle resolution errors in @wordpress/data. ([38669](https://github.com/WordPress/gutenberg/pull/38669))
+
+-   Handle resolution errors in @wordpress/data. ([38669](https://github.com/WordPress/gutenberg/pull/38669))
 
 #### Design Tools
-- Webfonts API. ([37140](https://github.com/WordPress/gutenberg/pull/37140))
 
-#### Global Styles
-- Account for upcoming changes in styles metadata in WordPress 5.9. ([36327](https://github.com/WordPress/gutenberg/pull/36327))
+-   Webfonts API. ([37140](https://github.com/WordPress/gutenberg/pull/37140))
 
+#### Global Styles
 
-## First time contributors
+-   Account for upcoming changes in styles metadata in WordPress 5.9. ([36327](https://github.com/WordPress/gutenberg/pull/36327))
 
-The following PRs were merged by first time contributors:
+## First-time contributors
 
-- @ahsanshaheen199: fix: Code example in flyout component. ([39156](https://github.com/WordPress/gutenberg/pull/39156))
-- @alshakerM: Render SVG props that have dashes correctly. ([38936](https://github.com/WordPress/gutenberg/pull/38936))
-- @awps: Missing `,toggleFormat` from last code block. ([39146](https://github.com/WordPress/gutenberg/pull/39146))
-- @francisei: Docs: Emphasized requirement to enclose in quotation marks wp-env run…. ([39101](https://github.com/WordPress/gutenberg/pull/39101))
-- @ironprogrammer: Raise z-index of content div relative to sidebars. ([38893](https://github.com/WordPress/gutenberg/pull/38893))
-- @joshuafredrickson: Add a resolvable JavaScript entry point to base-styles. ([39240](https://github.com/WordPress/gutenberg/pull/39240))
-- @jostnes: Remove rename rn UI tests. ([39042](https://github.com/WordPress/gutenberg/pull/39042))
-- @mashikag: Fix Blocks list ordering in Global Styles. ([39093](https://github.com/WordPress/gutenberg/pull/39093))
-- @tomasztunik: Fix Global styles overriding block's element styles. ([39012](https://github.com/WordPress/gutenberg/pull/39012))
-- @Tumas2: Spelling error in `JustifyContentControl` example. ([39234](https://github.com/WordPress/gutenberg/pull/39234))
+The following PRs were merged by first-time contributors:
 
+-   @ahsanshaheen199: fix: Code example in flyout component. ([39156](https://github.com/WordPress/gutenberg/pull/39156))
+-   @alshakerM: Render SVG props that have dashes correctly. ([38936](https://github.com/WordPress/gutenberg/pull/38936))
+-   @awps: Missing `,toggleFormat` from last code block. ([39146](https://github.com/WordPress/gutenberg/pull/39146))
+-   @francisei: Docs: Emphasized requirement to enclose in quotation marks wp-env run…. ([39101](https://github.com/WordPress/gutenberg/pull/39101))
+-   @ironprogrammer: Raise z-index of content div relative to sidebars. ([38893](https://github.com/WordPress/gutenberg/pull/38893))
+-   @joshuafredrickson: Add a resolvable JavaScript entry point to base-styles. ([39240](https://github.com/WordPress/gutenberg/pull/39240))
+-   @jostnes: Remove rename rn UI tests. ([39042](https://github.com/WordPress/gutenberg/pull/39042))
+-   @mashikag: Fix Blocks list ordering in Global Styles. ([39093](https://github.com/WordPress/gutenberg/pull/39093))
+-   @tomasztunik: Fix Global styles overriding block's element styles. ([39012](https://github.com/WordPress/gutenberg/pull/39012))
+-   @Tumas2: Spelling error in `JustifyContentControl` example. ([39234](https://github.com/WordPress/gutenberg/pull/39234))
 
 ## Contributors
 
@@ -17214,17 +28666,15 @@ The following contributors merged PRs in this release:
 
 @adamziel @ahsanshaheen199 @ajlende @alexstine @alshakerM @amustaque97 @andrewserong @aristath @awps @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @delowardev @dmsnell @draganescu @fluiddot @francisei @getdave @gwwar @gziolo @illusaen @ironprogrammer @jasmussen @joshuafredrickson @jostnes @jsnajdr @Mamaduka @mashikag @mirka @ndiego @noahtallen @noisysocks @ntsekouras @oandregal @ocean90 @opr @priethor @ramonjd @ryanwelcher @scruffian @Sidsector9 @SiobhyB @Sisanu @stokesman @talldan @tellthemachines @tomasztunik @ttahmouch @Tumas2 @walbo @webmandesign @zaguiini @ZebulanStanphill
 
-
 = 12.7.1 =
 
-
-
 ## Changelog
 
 ### Bug Fixes
 
 #### Block Library
-- Image block: Add additional selector to account for the move of is-style classes. ([39295](https://github.com/WordPress/gutenberg/pull/39295))
+
+-   Image block: Add additional selector to account for the move of is-style classes. ([39295](https://github.com/WordPress/gutenberg/pull/39295))
 
 ## Contributors
 
@@ -17232,7 +28682,6 @@ The following contributors merged PRs in this release:
 
 @glendaviesnz
 
-
 = 12.7.0 =
 
 ## Changelog
@@ -17240,231 +28689,262 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Columns: Add border support. ([31737](https://github.com/WordPress/gutenberg/pull/31737))
-- Comment Template: Fix comment pagination with nested replies. ([38187](https://github.com/WordPress/gutenberg/pull/38187))
-- Comments Query Loop: Show placeholder comments on site editor. ([38072](https://github.com/WordPress/gutenberg/pull/38072))
-- Group Blocks: Add margin support (top/bottom). ([37344](https://github.com/WordPress/gutenberg/pull/37344))
-- Navigation: Try unifying submenu arrow positioning. ([37003](https://github.com/WordPress/gutenberg/pull/37003))
-- Page List: Simplify loading state. ([38983](https://github.com/WordPress/gutenberg/pull/38983))
-- Submenu: Add revert button. ([38203](https://github.com/WordPress/gutenberg/pull/38203))
+
+-   Columns: Add border support. ([31737](https://github.com/WordPress/gutenberg/pull/31737))
+-   Comment Template: Fix comment pagination with nested replies. ([38187](https://github.com/WordPress/gutenberg/pull/38187))
+-   Comments Query Loop: Show placeholder comments on site editor. ([38072](https://github.com/WordPress/gutenberg/pull/38072))
+-   Group Blocks: Add margin support (top/bottom). ([37344](https://github.com/WordPress/gutenberg/pull/37344))
+-   Navigation: Try unifying submenu arrow positioning. ([37003](https://github.com/WordPress/gutenberg/pull/37003))
+-   Page List: Simplify loading state. ([38983](https://github.com/WordPress/gutenberg/pull/38983))
+-   Submenu: Add revert button. ([38203](https://github.com/WordPress/gutenberg/pull/38203))
 
 #### Components
-- FocalPointPicker: Allow updating its value while dragging. ([38247](https://github.com/WordPress/gutenberg/pull/38247))
-- General Interface: Simplify site icon animation on hover. ([38783](https://github.com/WordPress/gutenberg/pull/38783))
-- Navigator: Add `NavigatorButton` and `NavigatorBackButton` components. ([38634](https://github.com/WordPress/gutenberg/pull/38634))
-- Type Refactor: Use `forwardedRef` type for all forwarded refs in @wordpress/components. ([38948](https://github.com/WordPress/gutenberg/pull/38948))
+
+-   FocalPointPicker: Allow updating its value while dragging. ([38247](https://github.com/WordPress/gutenberg/pull/38247))
+-   General Interface: Simplify site icon animation on hover. ([38783](https://github.com/WordPress/gutenberg/pull/38783))
+-   Navigator: Add `NavigatorButton` and `NavigatorBackButton` components. ([38634](https://github.com/WordPress/gutenberg/pull/38634))
+-   Type Refactor: Use `forwardedRef` type for all forwarded refs in @wordpress/components. ([38948](https://github.com/WordPress/gutenberg/pull/38948))
 
 #### Block Editor
-- Block Editor: Add settings to enable/disable auto anchor generation. ([38780](https://github.com/WordPress/gutenberg/pull/38780))
-- Block Transforms: Keep additional HTML classes during a block transform. ([38964](https://github.com/WordPress/gutenberg/pull/38964))
-- LineHeightControl: Enhance interactions by migrating internals to `NumberControl` on Style options. ([37160](https://github.com/WordPress/gutenberg/pull/37160))
-- List View: Add multi-select behaviour for blocks when shift key is selected. ([38314](https://github.com/WordPress/gutenberg/pull/38314))
-- Quick Inserter: Prioritize showing patterns instead of blocks. ([38709](https://github.com/WordPress/gutenberg/pull/38709))
-- Template Parts: Show existing template parts and a list of block patterns at creation flow. ([38814](https://github.com/WordPress/gutenberg/pull/38814))
+
+-   Block Editor: Add settings to enable/disable auto anchor generation. ([38780](https://github.com/WordPress/gutenberg/pull/38780))
+-   Block Transforms: Keep additional HTML classes during a block transform. ([38964](https://github.com/WordPress/gutenberg/pull/38964))
+-   LineHeightControl: Enhance interactions by migrating internals to `NumberControl` on Style options. ([37160](https://github.com/WordPress/gutenberg/pull/37160))
+-   List View: Add multi-select behaviour for blocks when shift key is selected. ([38314](https://github.com/WordPress/gutenberg/pull/38314))
+-   Quick Inserter: Prioritize showing patterns instead of blocks. ([38709](https://github.com/WordPress/gutenberg/pull/38709))
+-   Template Parts: Show existing template parts and a list of block patterns at creation flow. ([38814](https://github.com/WordPress/gutenberg/pull/38814))
 
 #### Styles
-- Add initial version of the style engine. ([37978](https://github.com/WordPress/gutenberg/pull/37978))
-- Style engine: Refine `Box` type. ([38894](https://github.com/WordPress/gutenberg/pull/38894))
+
+-   Add initial version of the style engine. ([37978](https://github.com/WordPress/gutenberg/pull/37978))
+-   Style engine: Refine `Box` type. ([38894](https://github.com/WordPress/gutenberg/pull/38894))
 
 #### Post Editor
-- Enable tooltip for the main dashboard button. ([38790](https://github.com/WordPress/gutenberg/pull/38790))
+
+-   Enable tooltip for the main dashboard button. ([38790](https://github.com/WordPress/gutenberg/pull/38790))
 
 #### Themes
-- Lowered specificity of alignment rules for support layout so wide alignments work. ([38947](https://github.com/WordPress/gutenberg/pull/38947))
-- Remove data-align divs for themes that support layout. ([38613](https://github.com/WordPress/gutenberg/pull/38613))
-- Remove the div wrapper from the aligned image blocks. ([38657](https://github.com/WordPress/gutenberg/pull/38657))
+
+-   Lowered specificity of alignment rules for support layout so wide alignments work. ([38947](https://github.com/WordPress/gutenberg/pull/38947))
+-   Remove data-align divs for themes that support layout. ([38613](https://github.com/WordPress/gutenberg/pull/38613))
+-   Remove the div wrapper from the aligned image blocks. ([38657](https://github.com/WordPress/gutenberg/pull/38657))
 
 #### Patterns
-- Allow pattern registration from directory with theme.json. ([38323](https://github.com/WordPress/gutenberg/pull/38323))
+
+-   Allow pattern registration from directory with theme.json. ([38323](https://github.com/WordPress/gutenberg/pull/38323))
 
 #### List View
-- Expand block list tree on selection. ([35817](https://github.com/WordPress/gutenberg/pull/35817))
+
+-   Expand block list tree on selection. ([35817](https://github.com/WordPress/gutenberg/pull/35817))
 
 ### Bug Fixes
 
 #### Block Library
-- Block Transforms: Fix Image and Video to Cover block transformations. ([38959](https://github.com/WordPress/gutenberg/pull/38959))
-- Cover: Fix gradient overlay (remove black background color) ([38765](https://github.com/WordPress/gutenberg/pull/38765))
-- File: Fix PDF file block full content fixture. ([38725](https://github.com/WordPress/gutenberg/pull/38725))
-- Latest Posts: Add missing class to post title. ([38740](https://github.com/WordPress/gutenberg/pull/38740))
-- Logo: Avoid division by zero in site logo. ([38808](https://github.com/WordPress/gutenberg/pull/38808))
-- Post navigation link: Use correct closing tag. ([38976](https://github.com/WordPress/gutenberg/pull/38976))
-- Query Loop: Display nothing if we want only sticky posts but no stickies exist. ([38909](https://github.com/WordPress/gutenberg/pull/38909))
-- Template Parts: Decode entities in labels. ([38805](https://github.com/WordPress/gutenberg/pull/38805))
-- Social Links: Only apply the social links block migration if there's a need for a migration. ([38561](https://github.com/WordPress/gutenberg/pull/38561))
+
+-   Block Transforms: Fix Image and Video to Cover block transformations. ([38959](https://github.com/WordPress/gutenberg/pull/38959))
+-   Cover: Fix gradient overlay (remove black background color) ([38765](https://github.com/WordPress/gutenberg/pull/38765))
+-   File: Fix PDF file block full content fixture. ([38725](https://github.com/WordPress/gutenberg/pull/38725))
+-   Latest Posts: Add missing class to post title. ([38740](https://github.com/WordPress/gutenberg/pull/38740))
+-   Logo: Avoid division by zero in site logo. ([38808](https://github.com/WordPress/gutenberg/pull/38808))
+-   Post navigation link: Use correct closing tag. ([38976](https://github.com/WordPress/gutenberg/pull/38976))
+-   Query Loop: Display nothing if we want only sticky posts but no stickies exist. ([38909](https://github.com/WordPress/gutenberg/pull/38909))
+-   Template Parts: Decode entities in labels. ([38805](https://github.com/WordPress/gutenberg/pull/38805))
+-   Social Links: Only apply the social links block migration if there's a need for a migration. ([38561](https://github.com/WordPress/gutenberg/pull/38561))
 
 #### Block Editor
-- Backport from core: Global styles duotone not rendering in post editor. ([38897](https://github.com/WordPress/gutenberg/pull/38897))
-- Block Editor: insertDefaultBlock should not trigger an error if the default block is not registered. ([38886](https://github.com/WordPress/gutenberg/pull/38886))
-- Inserter: Fix focus loss after closing patterns explorer from modal. ([38884](https://github.com/WordPress/gutenberg/pull/38884))
-- Multi-selection: avoid RichText instances becoming disabled after multi selection. ([38821](https://github.com/WordPress/gutenberg/pull/38821))
-- Rehabilitate drag gesture in `LineHeightControl`. ([38930](https://github.com/WordPress/gutenberg/pull/38930))
-- RichText: Fix wrong block merging when pressing  `delete` consecutively. ([38991](https://github.com/WordPress/gutenberg/pull/38991))
+
+-   Backport from core: Global styles duotone not rendering in post editor. ([38897](https://github.com/WordPress/gutenberg/pull/38897))
+-   Block Editor: insertDefaultBlock should not trigger an error if the default block is not registered. ([38886](https://github.com/WordPress/gutenberg/pull/38886))
+-   Inserter: Fix focus loss after closing patterns explorer from modal. ([38884](https://github.com/WordPress/gutenberg/pull/38884))
+-   Multi-selection: avoid RichText instances becoming disabled after multi selection. ([38821](https://github.com/WordPress/gutenberg/pull/38821))
+-   Rehabilitate drag gesture in `LineHeightControl`. ([38930](https://github.com/WordPress/gutenberg/pull/38930))
+-   RichText: Fix wrong block merging when pressing `delete` consecutively. ([38991](https://github.com/WordPress/gutenberg/pull/38991))
 
 #### Site Editor
-- Add site editor initial redirect error handling. ([38655](https://github.com/WordPress/gutenberg/pull/38655))
-- Add template check to 'setPage' action. ([38656](https://github.com/WordPress/gutenberg/pull/38656))
-- Adds additional check to guard against incompete presets. ([38902](https://github.com/WordPress/gutenberg/pull/38902))
-- Limit template part slugs to Latin chars. ([38695](https://github.com/WordPress/gutenberg/pull/38695))
-- Template List: Decode entities in record titles. ([38863](https://github.com/WordPress/gutenberg/pull/38863))
+
+-   Add site editor initial redirect error handling. ([38655](https://github.com/WordPress/gutenberg/pull/38655))
+-   Add template check to 'setPage' action. ([38656](https://github.com/WordPress/gutenberg/pull/38656))
+-   Adds additional check to guard against incompete presets. ([38902](https://github.com/WordPress/gutenberg/pull/38902))
+-   Limit template part slugs to Latin chars. ([38695](https://github.com/WordPress/gutenberg/pull/38695))
+-   Template List: Decode entities in record titles. ([38863](https://github.com/WordPress/gutenberg/pull/38863))
 
 #### Styles
-- Allow child classes to be called instead of the parents. ([38857](https://github.com/WordPress/gutenberg/pull/38857))
-- Backport: Allow for classic themes using default presets. ([38701](https://github.com/WordPress/gutenberg/pull/38701))
-- Fix global styles loading logic. ([38745](https://github.com/WordPress/gutenberg/pull/38745))
+
+-   Allow child classes to be called instead of the parents. ([38857](https://github.com/WordPress/gutenberg/pull/38857))
+-   Backport: Allow for classic themes using default presets. ([38701](https://github.com/WordPress/gutenberg/pull/38701))
+-   Fix global styles loading logic. ([38745](https://github.com/WordPress/gutenberg/pull/38745))
 
 #### Components
-- Fix unexpected dragging triggered on spinner buttons on hover in Safari. ([38840](https://github.com/WordPress/gutenberg/pull/38840))
-- Show tooltip on toggle custom size in FontSizePicker. ([38985](https://github.com/WordPress/gutenberg/pull/38985))
+
+-   Fix unexpected dragging triggered on spinner buttons on hover in Safari. ([38840](https://github.com/WordPress/gutenberg/pull/38840))
+-   Show tooltip on toggle custom size in FontSizePicker. ([38985](https://github.com/WordPress/gutenberg/pull/38985))
 
 #### List View
-- Fix error triggering after duplicating a block making it unselectable. ([38760](https://github.com/WordPress/gutenberg/pull/38760))
-- Fix UI broken due to error when deleting first item in canvas. ([38775](https://github.com/WordPress/gutenberg/pull/38775))
+
+-   Fix error triggering after duplicating a block making it unselectable. ([38760](https://github.com/WordPress/gutenberg/pull/38760))
+-   Fix UI broken due to error when deleting first item in canvas. ([38775](https://github.com/WordPress/gutenberg/pull/38775))
 
 #### CSS & Styling
-- Fix button width on Widgets Editor. ([38846](https://github.com/WordPress/gutenberg/pull/38846))
-- Load block support styles in the `<head>` for block themes. ([38750](https://github.com/WordPress/gutenberg/pull/38750))
-- Change location of block support styles in `<head>`. ([39164](https://github.com/WordPress/gutenberg/pull/39164))
-- Reduce the margin of the block toolbar. ([38746](https://github.com/WordPress/gutenberg/pull/38746))
+
+-   Fix button width on Widgets Editor. ([38846](https://github.com/WordPress/gutenberg/pull/38846))
+-   Load block support styles in the `<head>` for block themes. ([38750](https://github.com/WordPress/gutenberg/pull/38750))
+-   Change location of block support styles in `<head>`. ([39164](https://github.com/WordPress/gutenberg/pull/39164))
+-   Reduce the margin of the block toolbar. ([38746](https://github.com/WordPress/gutenberg/pull/38746))
 
 #### Block Directory
-- Fix the block activation when metadata registered on server. ([38697](https://github.com/WordPress/gutenberg/pull/38697))
+
+-   Fix the block activation when metadata registered on server. ([38697](https://github.com/WordPress/gutenberg/pull/38697))
 
 #### Colors
-- Strip double # char on HexInput. ([38335](https://github.com/WordPress/gutenberg/pull/38335))
+
+-   Strip double # char on HexInput. ([38335](https://github.com/WordPress/gutenberg/pull/38335))
 
 #### Packages
-- Core Data: CanUser resolver always use the OPTIONS method. ([38901](https://github.com/WordPress/gutenberg/pull/38901))
-- Dom: Avoid RangeError in findPrevious method. ([38961](https://github.com/WordPress/gutenberg/pull/38961))
+
+-   Core Data: CanUser resolver always use the OPTIONS method. ([38901](https://github.com/WordPress/gutenberg/pull/38901))
+-   Dom: Avoid RangeError in findPrevious method. ([38961](https://github.com/WordPress/gutenberg/pull/38961))
 
 #### Apps
-- Fix Custom Palette colors and support multiple origins and theme cache issues. ([38417](https://github.com/WordPress/gutenberg/pull/38417))
+
+-   Fix Custom Palette colors and support multiple origins and theme cache issues. ([38417](https://github.com/WordPress/gutenberg/pull/38417))
 
 ### Accessibility
-- Adds aria-label to the search button, as accessibility enhancement. ([38136](https://github.com/WordPress/gutenberg/pull/38136))
-- Avoid duplicate labels for "Save Draft" and "Save as pending" buttons. ([38776](https://github.com/WordPress/gutenberg/pull/38776))
-- RichText: Reverse disableLineBreaks to determine aria-multiline state. ([38652](https://github.com/WordPress/gutenberg/pull/38652))
-- TreeGrid: Add Home/End keys to jump to start/end of grid. ([38679](https://github.com/WordPress/gutenberg/pull/38679))
+
+-   Adds aria-label to the search button, as accessibility enhancement. ([38136](https://github.com/WordPress/gutenberg/pull/38136))
+-   Avoid duplicate labels for "Save Draft" and "Save as pending" buttons. ([38776](https://github.com/WordPress/gutenberg/pull/38776))
+-   RichText: Reverse disableLineBreaks to determine aria-multiline state. ([38652](https://github.com/WordPress/gutenberg/pull/38652))
+-   TreeGrid: Add Home/End keys to jump to start/end of grid. ([38679](https://github.com/WordPress/gutenberg/pull/38679))
 
 ### Performance
 
 #### CSS & Styling
-- Use `wp_unique_id()` instead of `uniqid()` to generate CSS class names. ([38891](https://github.com/WordPress/gutenberg/pull/38891))
+
+-   Use `wp_unique_id()` instead of `uniqid()` to generate CSS class names. ([38891](https://github.com/WordPress/gutenberg/pull/38891))
 
 ### Experiments
 
 #### New APIs in Core Data
-- Propose useEntityRecords (experimental). ([38782](https://github.com/WordPress/gutenberg/pull/38782))
-- UseEntityRecord (experimental). ([38522](https://github.com/WordPress/gutenberg/pull/38522))
+
+-   Propose useEntityRecords (experimental). ([38782](https://github.com/WordPress/gutenberg/pull/38782))
+-   UseEntityRecord (experimental). ([38522](https://github.com/WordPress/gutenberg/pull/38522))
 
 ### Documentation
 
 #### Handbook
-- Add documentation for deprecating styles. ([38540](https://github.com/WordPress/gutenberg/pull/38540))
-- Add documentation about the `patterns` field of `theme.json`. ([38700](https://github.com/WordPress/gutenberg/pull/38700))
-- Add more info about contextual patterns and pattern transformations. ([38809](https://github.com/WordPress/gutenberg/pull/38809))
-- Add semantic patterns documentation. ([38778](https://github.com/WordPress/gutenberg/pull/38778))
-- Clarify deprecations documentation. ([38683](https://github.com/WordPress/gutenberg/pull/38683))
-- Fix hyperlink in block `Metadata` page. ([38941](https://github.com/WordPress/gutenberg/pull/38941))
-- Improve point release documentation to include even more detail. ([38631](https://github.com/WordPress/gutenberg/pull/38631))
-- Increase support for `experimental-link-color` until WordPress 5.9 is the minimum version. ([38711](https://github.com/WordPress/gutenberg/pull/38711))
-- Group: Update block supports. ([38962](https://github.com/WordPress/gutenberg/pull/38962))
-- Links changed for Developer.wordpress.org on block editor section. ([38841](https://github.com/WordPress/gutenberg/pull/38841))
-- Removing comma so that the code snippet of `theme.json` represents standard JSON. ([38938](https://github.com/WordPress/gutenberg/pull/38938))
-- `theme.json` Update version section docs to v2 ([38937](https://github.com/WordPress/gutenberg/pull/38937))
-- Update Getting Started with more granular options. ([38682](https://github.com/WordPress/gutenberg/pull/38682))
+
+-   Add documentation for deprecating styles. ([38540](https://github.com/WordPress/gutenberg/pull/38540))
+-   Add documentation about the `patterns` field of `theme.json`. ([38700](https://github.com/WordPress/gutenberg/pull/38700))
+-   Add more info about contextual patterns and pattern transformations. ([38809](https://github.com/WordPress/gutenberg/pull/38809))
+-   Add semantic patterns documentation. ([38778](https://github.com/WordPress/gutenberg/pull/38778))
+-   Clarify deprecations documentation. ([38683](https://github.com/WordPress/gutenberg/pull/38683))
+-   Fix hyperlink in block `Metadata` page. ([38941](https://github.com/WordPress/gutenberg/pull/38941))
+-   Improve point release documentation to include even more detail. ([38631](https://github.com/WordPress/gutenberg/pull/38631))
+-   Increase support for `experimental-link-color` until WordPress 5.9 is the minimum version. ([38711](https://github.com/WordPress/gutenberg/pull/38711))
+-   Group: Update block supports. ([38962](https://github.com/WordPress/gutenberg/pull/38962))
+-   Links changed for Developer.wordpress.org on block editor section. ([38841](https://github.com/WordPress/gutenberg/pull/38841))
+-   Removing comma so that the code snippet of `theme.json` represents standard JSON. ([38938](https://github.com/WordPress/gutenberg/pull/38938))
+-   `theme.json` Update version section docs to v2 ([38937](https://github.com/WordPress/gutenberg/pull/38937))
+-   Update Getting Started with more granular options. ([38682](https://github.com/WordPress/gutenberg/pull/38682))
 
 #### Block Library
-- Add instructions on how to add new core blocks to block-library. ([38868](https://github.com/WordPress/gutenberg/pull/38868))
+
+-   Add instructions on how to add new core blocks to block-library. ([38868](https://github.com/WordPress/gutenberg/pull/38868))
 
 #### Components
-- FormFileUpload: Add Storybook stories. ([38734](https://github.com/WordPress/gutenberg/pull/38734))
-- Storybook: Move experimental components to correct section. ([38640](https://github.com/WordPress/gutenberg/pull/38640))
-- Storybook: Remove story for Typography Panel. ([38867](https://github.com/WordPress/gutenberg/pull/38867))
-- wp-env: Document some caveats when using xdebug with VSCode. ([38882](https://github.com/WordPress/gutenberg/pull/38882))
 
+-   FormFileUpload: Add Storybook stories. ([38734](https://github.com/WordPress/gutenberg/pull/38734))
+-   Storybook: Move experimental components to correct section. ([38640](https://github.com/WordPress/gutenberg/pull/38640))
+-   Storybook: Remove story for Typography Panel. ([38867](https://github.com/WordPress/gutenberg/pull/38867))
+-   wp-env: Document some caveats when using xdebug with VSCode. ([38882](https://github.com/WordPress/gutenberg/pull/38882))
 
 ### Code Quality
 
 #### Block Library
-- Cover: Remove unnecessary `temporaryMinHeight`. ([38887](https://github.com/WordPress/gutenberg/pull/38887))
-- Cover block: Update deprecated gradient fixture. ([38728](https://github.com/WordPress/gutenberg/pull/38728))
-- Gallery: Register gallery in block_names dynamic block array. ([38689](https://github.com/WordPress/gutenberg/pull/38689))
-- Navigation: Improve consistency of block hook. ([38705](https://github.com/WordPress/gutenberg/pull/38705))
-- Navigation: Select dropdown encapsulation and further consolidation. ([38627](https://github.com/WordPress/gutenberg/pull/38627))
-- Navigation: Update wp_kses usage to be consistent (use wp_kses_post). ([38732](https://github.com/WordPress/gutenberg/pull/38732))
-- Post Navigation Link: Prefer kses to blanket esc_html on label. ([38696](https://github.com/WordPress/gutenberg/pull/38696))
-- Remove data-controls mock from Image block RN tests. ([38852](https://github.com/WordPress/gutenberg/pull/38852))
+
+-   Cover: Remove unnecessary `temporaryMinHeight`. ([38887](https://github.com/WordPress/gutenberg/pull/38887))
+-   Cover block: Update deprecated gradient fixture. ([38728](https://github.com/WordPress/gutenberg/pull/38728))
+-   Gallery: Register gallery in block_names dynamic block array. ([38689](https://github.com/WordPress/gutenberg/pull/38689))
+-   Navigation: Improve consistency of block hook. ([38705](https://github.com/WordPress/gutenberg/pull/38705))
+-   Navigation: Select dropdown encapsulation and further consolidation. ([38627](https://github.com/WordPress/gutenberg/pull/38627))
+-   Navigation: Update wp_kses usage to be consistent (use wp_kses_post). ([38732](https://github.com/WordPress/gutenberg/pull/38732))
+-   Post Navigation Link: Prefer kses to blanket esc_html on label. ([38696](https://github.com/WordPress/gutenberg/pull/38696))
+-   Remove data-controls mock from Image block RN tests. ([38852](https://github.com/WordPress/gutenberg/pull/38852))
 
 #### Components
-- Block Supports: Improve image block regex. ([38742](https://github.com/WordPress/gutenberg/pull/38742))
-- Block Supports: Load Styles on `<head>` backport to core. ([38880](https://github.com/WordPress/gutenberg/pull/38880))
-- Context: Omit `as` prop in types. ([38844](https://github.com/WordPress/gutenberg/pull/38844))
-- Core Data: Remove fallback for OPTIONS response headers in canUser resolver. ([38881](https://github.com/WordPress/gutenberg/pull/38881))
-- Core Data: TypeScript definitions for entity records. ([38666](https://github.com/WordPress/gutenberg/pull/38666))
-- Data: Normalize selector args when handling metadata selectors/actions. ([38945](https://github.com/WordPress/gutenberg/pull/38945))
-- Edit Site: Migrate store to thunks. ([38812](https://github.com/WordPress/gutenberg/pull/38812))
-- Icons: Deprecate duplicate icons. ([38849](https://github.com/WordPress/gutenberg/pull/38849))
-- PostTrash: Call trashPost action with no arguments, rewrite to hooks. ([38615](https://github.com/WordPress/gutenberg/pull/38615))
+
+-   Block Supports: Improve image block regex. ([38742](https://github.com/WordPress/gutenberg/pull/38742))
+-   Block Supports: Load Styles on `<head>` backport to core. ([38880](https://github.com/WordPress/gutenberg/pull/38880))
+-   Context: Omit `as` prop in types. ([38844](https://github.com/WordPress/gutenberg/pull/38844))
+-   Core Data: Remove fallback for OPTIONS response headers in canUser resolver. ([38881](https://github.com/WordPress/gutenberg/pull/38881))
+-   Core Data: TypeScript definitions for entity records. ([38666](https://github.com/WordPress/gutenberg/pull/38666))
+-   Data: Normalize selector args when handling metadata selectors/actions. ([38945](https://github.com/WordPress/gutenberg/pull/38945))
+-   Edit Site: Migrate store to thunks. ([38812](https://github.com/WordPress/gutenberg/pull/38812))
+-   Icons: Deprecate duplicate icons. ([38849](https://github.com/WordPress/gutenberg/pull/38849))
+-   PostTrash: Call trashPost action with no arguments, rewrite to hooks. ([38615](https://github.com/WordPress/gutenberg/pull/38615))
 
 #### npm Packages
-- Packages: Automate cherry-picking to `trunk` commits created during publishing. ([38977](https://github.com/WordPress/gutenberg/pull/38977))
-- Packages: Ensure that private packages do not update when publishing to npm. ([38946](https://github.com/WordPress/gutenberg/pull/38946))
 
+-   Packages: Automate cherry-picking to `trunk` commits created during publishing. ([38977](https://github.com/WordPress/gutenberg/pull/38977))
+-   Packages: Ensure that private packages do not update when publishing to npm. ([38946](https://github.com/WordPress/gutenberg/pull/38946))
 
 ### Tools
 
 #### Testing
-- Add end-to-end test for merging paragraphs and soft line break afterwards. ([39009](https://github.com/WordPress/gutenberg/pull/39009))
-- Post Visibility end-to-end test: Improve XPath selector to avoid reliance on DOM structure. ([38717](https://github.com/WordPress/gutenberg/pull/38717))
-- Replace no-shadow eslint rule with @typescript-eslint/no-shadow. ([38665](https://github.com/WordPress/gutenberg/pull/38665))
-- Remove client ID from fixtures. ([38685](https://github.com/WordPress/gutenberg/pull/38685))
-- Remove `originalContent` from fixtures. ([38638](https://github.com/WordPress/gutenberg/pull/38638))
-- RichText: Add test for merging and then splitting paragraphs. ([39007](https://github.com/WordPress/gutenberg/pull/39007))
-- Site Editor Tests: Use REST API to delete templates and template parts. ([38524](https://github.com/WordPress/gutenberg/pull/38524))
-- TreeGrid: Add tests for callback functions. ([38942](https://github.com/WordPress/gutenberg/pull/38942))
+
+-   Add end-to-end test for merging paragraphs and soft line break afterwards. ([39009](https://github.com/WordPress/gutenberg/pull/39009))
+-   Post Visibility end-to-end test: Improve XPath selector to avoid reliance on DOM structure. ([38717](https://github.com/WordPress/gutenberg/pull/38717))
+-   Replace no-shadow eslint rule with @typescript-eslint/no-shadow. ([38665](https://github.com/WordPress/gutenberg/pull/38665))
+-   Remove client ID from fixtures. ([38685](https://github.com/WordPress/gutenberg/pull/38685))
+-   Remove `originalContent` from fixtures. ([38638](https://github.com/WordPress/gutenberg/pull/38638))
+-   RichText: Add test for merging and then splitting paragraphs. ([39007](https://github.com/WordPress/gutenberg/pull/39007))
+-   Site Editor Tests: Use REST API to delete templates and template parts. ([38524](https://github.com/WordPress/gutenberg/pull/38524))
+-   TreeGrid: Add tests for callback functions. ([38942](https://github.com/WordPress/gutenberg/pull/38942))
 
 #### Build Tooling
-- Build separate full contributors list. ([38777](https://github.com/WordPress/gutenberg/pull/38777))
-- Bump @svgr/webpack from ^5.5.0 to ^6.2.1 ([38866](https://github.com/WordPress/gutenberg/pull/38866))
-- Generate full release contributors list in release changelog. ([38704](https://github.com/WordPress/gutenberg/pull/38704))
-- Generate sourcemap for production plugin builds. ([33718](https://github.com/WordPress/gutenberg/pull/33718))
-- Mobile: Improve npm clean scripts for react-native-editor. ([38752](https://github.com/WordPress/gutenberg/pull/38752))
-- PWA: Fix URL query param issue. ([38755](https://github.com/WordPress/gutenberg/pull/38755))
-- Scripts: Do not exit `build` when no entry found in `src` directory. ([38737](https://github.com/WordPress/gutenberg/pull/38737))
-- Scripts: Fix Entry points are not detected in Windows OS. ([38781](https://github.com/WordPress/gutenberg/pull/38781))
-- Scripts: Copy PHP files from `src` into `build`. ([38715](https://github.com/WordPress/gutenberg/pull/38715))
-
-#### Components
-- BaseControl: Refactor stories to use Controls. ([38741](https://github.com/WordPress/gutenberg/pull/38741))
-- Migrate Post Template Delete button from `confirm()` to `ConfirmDialog`. ([37535](https://github.com/WordPress/gutenberg/pull/37535))
-- Migrate the Post 'Switch to draft' button to `ConfirmDialog` component. ([37491](https://github.com/WordPress/gutenberg/pull/37491))
-- Storybook: Ensure rerender for RTL switcher. ([38963](https://github.com/WordPress/gutenberg/pull/38963))
+
+-   Build separate full contributors list. ([38777](https://github.com/WordPress/gutenberg/pull/38777))
+-   Bump @svgr/webpack from ^5.5.0 to ^6.2.1 ([38866](https://github.com/WordPress/gutenberg/pull/38866))
+-   Generate full release contributors list in release changelog. ([38704](https://github.com/WordPress/gutenberg/pull/38704))
+-   Generate sourcemap for production plugin builds. ([33718](https://github.com/WordPress/gutenberg/pull/33718))
+-   Mobile: Improve npm clean scripts for react-native-editor. ([38752](https://github.com/WordPress/gutenberg/pull/38752))
+-   PWA: Fix URL query param issue. ([38755](https://github.com/WordPress/gutenberg/pull/38755))
+-   Scripts: Do not exit `build` when no entry found in `src` directory. ([38737](https://github.com/WordPress/gutenberg/pull/38737))
+-   Scripts: Fix Entry points are not detected in Windows OS. ([38781](https://github.com/WordPress/gutenberg/pull/38781))
+-   Scripts: Copy PHP files from `src` into `build`. ([38715](https://github.com/WordPress/gutenberg/pull/38715))
+
+#### Components
+
+-   BaseControl: Refactor stories to use Controls. ([38741](https://github.com/WordPress/gutenberg/pull/38741))
+-   Migrate Post Template Delete button from `confirm()` to `ConfirmDialog`. ([37535](https://github.com/WordPress/gutenberg/pull/37535))
+-   Migrate the Post 'Switch to draft' button to `ConfirmDialog` component. ([37491](https://github.com/WordPress/gutenberg/pull/37491))
+-   Storybook: Ensure rerender for RTL switcher. ([38963](https://github.com/WordPress/gutenberg/pull/38963))
 
 #### Post Editor
-- Edit Post: Migrate store actions to thunks. ([36551](https://github.com/WordPress/gutenberg/pull/36551))
-- Editor store: Remove a noop SETUP_EDITOR action. ([38622](https://github.com/WordPress/gutenberg/pull/38622))
-- Migrate editor store to thunks. ([35929](https://github.com/WordPress/gutenberg/pull/35929))
+
+-   Edit Post: Migrate store actions to thunks. ([36551](https://github.com/WordPress/gutenberg/pull/36551))
+-   Editor store: Remove a noop SETUP_EDITOR action. ([38622](https://github.com/WordPress/gutenberg/pull/38622))
+-   Migrate editor store to thunks. ([35929](https://github.com/WordPress/gutenberg/pull/35929))
 
 #### Styles
-- Allow to extend the `WP_Theme_JSON_Gutenberg` class. ([38671](https://github.com/WordPress/gutenberg/pull/38671))
-- Global Styles: Fix PHP warning in WP_REST_Global_Styles_Controller. ([38888](https://github.com/WordPress/gutenberg/pull/38888))
-- Update Global Styles code to continue adding settings & styles. ([38883](https://github.com/WordPress/gutenberg/pull/38883))
+
+-   Allow to extend the `WP_Theme_JSON_Gutenberg` class. ([38671](https://github.com/WordPress/gutenberg/pull/38671))
+-   Global Styles: Fix PHP warning in WP_REST_Global_Styles_Controller. ([38888](https://github.com/WordPress/gutenberg/pull/38888))
+-   Update Global Styles code to continue adding settings & styles. ([38883](https://github.com/WordPress/gutenberg/pull/38883))
 
 #### Block Library
-- Change Gallery block code ownership. ([38722](https://github.com/WordPress/gutenberg/pull/38722))
 
-## First time contributors
+-   Change Gallery block code ownership. ([38722](https://github.com/WordPress/gutenberg/pull/38722))
 
-The following PRs were merged by first time contrbutors:
+## First-time contributors
 
-- @Alex-Kostov: Fix for widget customizer panel,. ([38746](https://github.com/WordPress/gutenberg/pull/38746))
-- @HasnainAshfaq: Version section update. ([38937](https://github.com/WordPress/gutenberg/pull/38937))
-- @mjstoney: (Issue #38390) Fixed CSS position property to fix button width. ([38846](https://github.com/WordPress/gutenberg/pull/38846))
-- @razwan: Add resolvePoint prop to FocalPointPicker component to allow updating value while dragging. ([38247](https://github.com/WordPress/gutenberg/pull/38247))
-- @sanzeeb3: Fix hyperlink in block `Metadata` page. ([38941](https://github.com/WordPress/gutenberg/pull/38941))
-- @Sisanu: Adds aria-label to the search button, as accessibility enhancement. ([38136](https://github.com/WordPress/gutenberg/pull/38136))
+The following PRs were merged by first-time contributors:
 
+-   @Alex-Kostov: Fix for widget customizer panel,. ([38746](https://github.com/WordPress/gutenberg/pull/38746))
+-   @HasnainAshfaq: Version section update. ([38937](https://github.com/WordPress/gutenberg/pull/38937))
+-   @mjstoney: (Issue #38390) Fixed CSS position property to fix button width. ([38846](https://github.com/WordPress/gutenberg/pull/38846))
+-   @razwan: Add resolvePoint prop to FocalPointPicker component to allow updating value while dragging. ([38247](https://github.com/WordPress/gutenberg/pull/38247))
+-   @sanzeeb3: Fix hyperlink in block `Metadata` page. ([38941](https://github.com/WordPress/gutenberg/pull/38941))
+-   @Sisanu: Adds aria-label to the search button, as accessibility enhancement. ([38136](https://github.com/WordPress/gutenberg/pull/38136))
 
 ## Contributors
 
@@ -17472,284 +28952,315 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @ajlende @Alex-Kostov @alexstine @andrewserong @annezazu @audrasjb @bph @c4rl0sbr4v0 @chad1008 @ciampo @DAreRodz @delowardev @dmsnell @ellatrix @fluiddot @geriux @getdave @glendaviesnz @gziolo @HasnainAshfaq @jasmussen @jeherve @jorgefilipecosta @jsnajdr @KevinBatdorf @MaggieCabrera @Mamaduka @mchowning @michalczaplinski @mirka @mjstoney @mkevins @ndiego @noahtallen @ntsekouras @oandregal @ocean90 @PatelUtkarsh @ramonjd @razwan @ryanwelcher @sanzeeb3 @Sisanu @stokesman @t-hamano @talldan @twstokes @webmandesign @westonruter @youknowriad
 
-
 = 12.6.1 =
 
+## Changelog
+
 ### Bug Fixes
 
 **Block Editor**
-- Fix an issue where content copied from certain editors (like MS Word) would paste as an image rather than the actual content. ([38992](https://github.com/WordPress/gutenberg/pull/38992))
 
+-   Fix an issue where content copied from certain editors (like MS Word) would paste as an image rather than the actual content. ([38992](https://github.com/WordPress/gutenberg/pull/38992))
 
 = 12.7.0-rc.1 =
 
-
-
 ## Changelog
 
 ### Enhancements
 
-- Remove data-align divs for themes that support layout. ([38613](https://github.com/WordPress/gutenberg/pull/38613))
-- Scripts: Copy PHP files from `src` into `build`. ([38715](https://github.com/WordPress/gutenberg/pull/38715))
-- Update template part creation and replacement flows. ([38814](https://github.com/WordPress/gutenberg/pull/38814))
-- Update: Keep additional classes during a block transform. ([38964](https://github.com/WordPress/gutenberg/pull/38964))
+-   Remove data-align divs for themes that support layout. ([38613](https://github.com/WordPress/gutenberg/pull/38613))
+-   Scripts: Copy PHP files from `src` into `build`. ([38715](https://github.com/WordPress/gutenberg/pull/38715))
+-   Update template part creation and replacement flows. ([38814](https://github.com/WordPress/gutenberg/pull/38814))
+-   Update: Keep additional classes during a block transform. ([38964](https://github.com/WordPress/gutenberg/pull/38964))
 
 #### Block Library
-- Add margin support (top/bottom) to group blocks. ([37344](https://github.com/WordPress/gutenberg/pull/37344))
-- Add revert button to submenu block. ([38203](https://github.com/WordPress/gutenberg/pull/38203))
-- Block Editor: Add settings to enable/disable auto anchor generation. ([38780](https://github.com/WordPress/gutenberg/pull/38780))
-- Navigation: Try unifying submenu arrow positioning. ([37003](https://github.com/WordPress/gutenberg/pull/37003))
-- Page List: Simplify loading state. ([38983](https://github.com/WordPress/gutenberg/pull/38983))
-- [Comments Query Loop] Show placeholder comments on site editor. ([38072](https://github.com/WordPress/gutenberg/pull/38072))
+
+-   Add margin support (top/bottom) to group blocks. ([37344](https://github.com/WordPress/gutenberg/pull/37344))
+-   Add revert button to submenu block. ([38203](https://github.com/WordPress/gutenberg/pull/38203))
+-   Block Editor: Add settings to enable/disable auto anchor generation. ([38780](https://github.com/WordPress/gutenberg/pull/38780))
+-   Navigation: Try unifying submenu arrow positioning. ([37003](https://github.com/WordPress/gutenberg/pull/37003))
+-   Page List: Simplify loading state. ([38983](https://github.com/WordPress/gutenberg/pull/38983))
+-   [Comments Query Loop] Show placeholder comments on site editor. ([38072](https://github.com/WordPress/gutenberg/pull/38072))
 
 #### Components
-- Add resolvePoint prop to FocalPointPicker component to allow updating value while dragging. ([38247](https://github.com/WordPress/gutenberg/pull/38247))
-- LineHeightControl: Migrate internals to `NumberControl` (Part 1: Styles). ([37160](https://github.com/WordPress/gutenberg/pull/37160))
-- Use `forwardedRef` type for all forwarded refs. ([38948](https://github.com/WordPress/gutenberg/pull/38948))
-- `Navigator`: Add `NavigatorButton` and `NavigatorBackButton` components. ([38634](https://github.com/WordPress/gutenberg/pull/38634))
+
+-   Add resolvePoint prop to FocalPointPicker component to allow updating value while dragging. ([38247](https://github.com/WordPress/gutenberg/pull/38247))
+-   LineHeightControl: Migrate internals to `NumberControl` (Part 1: Styles). ([37160](https://github.com/WordPress/gutenberg/pull/37160))
+-   Use `forwardedRef` type for all forwarded refs. ([38948](https://github.com/WordPress/gutenberg/pull/38948))
+-   `Navigator`: Add `NavigatorButton` and `NavigatorBackButton` components. ([38634](https://github.com/WordPress/gutenberg/pull/38634))
 
 #### Block Editor
-- List View: Add multi-select behaviour for blocks when shift key is selected. ([38314](https://github.com/WordPress/gutenberg/pull/38314))
-- Update: Prioritize patterns on quick inserter. ([38709](https://github.com/WordPress/gutenberg/pull/38709))
+
+-   List View: Add multi-select behaviour for blocks when shift key is selected. ([38314](https://github.com/WordPress/gutenberg/pull/38314))
+-   Update: Prioritize patterns on quick inserter. ([38709](https://github.com/WordPress/gutenberg/pull/38709))
 
 #### Accessibility
-- RichText: Reverse disableLineBreaks to determine aria-multiline state. ([38652](https://github.com/WordPress/gutenberg/pull/38652))
-- TreeGrid: Add Home/End keys to jump to start/end of grid. ([38679](https://github.com/WordPress/gutenberg/pull/38679))
+
+-   RichText: Reverse disableLineBreaks to determine aria-multiline state. ([38652](https://github.com/WordPress/gutenberg/pull/38652))
+-   TreeGrid: Add Home/End keys to jump to start/end of grid. ([38679](https://github.com/WordPress/gutenberg/pull/38679))
 
 #### Global Styles
-- Style engine: Refine `Box` type. ([38894](https://github.com/WordPress/gutenberg/pull/38894))
+
+-   Style engine: Refine `Box` type. ([38894](https://github.com/WordPress/gutenberg/pull/38894))
 
 #### Post Editor
-- Enable tooltip for the main dashboard button. ([38790](https://github.com/WordPress/gutenberg/pull/38790))
+
+-   Enable tooltip for the main dashboard button. ([38790](https://github.com/WordPress/gutenberg/pull/38790))
 
 #### Themes
-- Remove the div wrapper from the aligned image blocks. ([38657](https://github.com/WordPress/gutenberg/pull/38657))
+
+-   Remove the div wrapper from the aligned image blocks. ([38657](https://github.com/WordPress/gutenberg/pull/38657))
 
 #### Patterns
-- [Pattern Directory]: Allow pattern registration from directory with theme.json. ([38323](https://github.com/WordPress/gutenberg/pull/38323))
+
+-   [Pattern Directory]: Allow pattern registration from directory with theme.json. ([38323](https://github.com/WordPress/gutenberg/pull/38323))
 
 #### REST API
-- Comment Template: Optimize comment pagination with nested replies. ([38187](https://github.com/WordPress/gutenberg/pull/38187))
+
+-   Comment Template: Optimize comment pagination with nested replies. ([38187](https://github.com/WordPress/gutenberg/pull/38187))
 
 #### List View
-- Try/expand block list tree on selection. ([35817](https://github.com/WordPress/gutenberg/pull/35817))
+
+-   Try/expand block list tree on selection. ([35817](https://github.com/WordPress/gutenberg/pull/35817))
 
 #### Build Tooling
-- Generate sourcemap for production plugin builds. ([33718](https://github.com/WordPress/gutenberg/pull/33718))
+
+-   Generate sourcemap for production plugin builds. ([33718](https://github.com/WordPress/gutenberg/pull/33718))
 
 #### Design Tools
-- Columns: Add border support. ([31737](https://github.com/WordPress/gutenberg/pull/31737))
 
+-   Columns: Add border support. ([31737](https://github.com/WordPress/gutenberg/pull/31737))
 
 ### New APIs
 
-- Propose useEntityRecords (experimental). ([38782](https://github.com/WordPress/gutenberg/pull/38782))
-- UseEntityRecord (experimental). ([38522](https://github.com/WordPress/gutenberg/pull/38522))
-
+-   Propose useEntityRecords (experimental). ([38782](https://github.com/WordPress/gutenberg/pull/38782))
+-   UseEntityRecord (experimental). ([38522](https://github.com/WordPress/gutenberg/pull/38522))
 
 ### Bug Fixes
 
-- Block Editor: Fix Redux error. ([38886](https://github.com/WordPress/gutenberg/pull/38886))
-- Core Data: CanUser resolver always use the OPTIONS method. ([38901](https://github.com/WordPress/gutenberg/pull/38901))
-- Dom: Avoid RangeError in findPrevious method. ([38961](https://github.com/WordPress/gutenberg/pull/38961))
-- Edit Site: Add template check to 'setPage' action. ([38656](https://github.com/WordPress/gutenberg/pull/38656))
-- Rehabilitate drag gesture in `LineHeightControl`. ([38930](https://github.com/WordPress/gutenberg/pull/38930))
-- Scripts: Do not exit `build` when no entry found in `src` directory. ([38737](https://github.com/WordPress/gutenberg/pull/38737))
-- Scripts: Fix Entry points are not detected in Windows OS. ([38781](https://github.com/WordPress/gutenberg/pull/38781))
-- admin-manifest: Fix URL query param issue. ([38755](https://github.com/WordPress/gutenberg/pull/38755))
+-   Block Editor: Fix Redux error. ([38886](https://github.com/WordPress/gutenberg/pull/38886))
+-   Core Data: CanUser resolver always use the OPTIONS method. ([38901](https://github.com/WordPress/gutenberg/pull/38901))
+-   Dom: Avoid RangeError in findPrevious method. ([38961](https://github.com/WordPress/gutenberg/pull/38961))
+-   Edit Site: Add template check to 'setPage' action. ([38656](https://github.com/WordPress/gutenberg/pull/38656))
+-   Rehabilitate drag gesture in `LineHeightControl`. ([38930](https://github.com/WordPress/gutenberg/pull/38930))
+-   Scripts: Do not exit `build` when no entry found in `src` directory. ([38737](https://github.com/WordPress/gutenberg/pull/38737))
+-   Scripts: Fix Entry points are not detected in Windows OS. ([38781](https://github.com/WordPress/gutenberg/pull/38781))
+-   admin-manifest: Fix URL query param issue. ([38755](https://github.com/WordPress/gutenberg/pull/38755))
 
 #### Block Library
-- Avoid division by zero in site logo block. ([38808](https://github.com/WordPress/gutenberg/pull/38808))
-- Fixes #38764 by setting transparent bg color on gradient overlay. ([38765](https://github.com/WordPress/gutenberg/pull/38765))
-- Latest Posts: Add missing class to post title. ([38740](https://github.com/WordPress/gutenberg/pull/38740))
-- Only apply the social links block migration if there's a need for a migration. ([38561](https://github.com/WordPress/gutenberg/pull/38561))
-- Post navigation link: Use correct closing tag. ([38976](https://github.com/WordPress/gutenberg/pull/38976))
-- Template Parts: Decode entities in labels. ([38805](https://github.com/WordPress/gutenberg/pull/38805))
-- [Query Loop]: Display nothing if we want only sticky posts but no stickies exist. ([38909](https://github.com/WordPress/gutenberg/pull/38909))
+
+-   Avoid division by zero in site logo block. ([38808](https://github.com/WordPress/gutenberg/pull/38808))
+-   Fixes #38764 by setting transparent bg color on gradient overlay. ([38765](https://github.com/WordPress/gutenberg/pull/38765))
+-   Latest Posts: Add missing class to post title. ([38740](https://github.com/WordPress/gutenberg/pull/38740))
+-   Only apply the social links block migration if there's a need for a migration. ([38561](https://github.com/WordPress/gutenberg/pull/38561))
+-   Post navigation link: Use correct closing tag. ([38976](https://github.com/WordPress/gutenberg/pull/38976))
+-   Template Parts: Decode entities in labels. ([38805](https://github.com/WordPress/gutenberg/pull/38805))
+-   [Query Loop]: Display nothing if we want only sticky posts but no stickies exist. ([38909](https://github.com/WordPress/gutenberg/pull/38909))
 
 #### Block Editor
-- Multi-selection: Avoid rich text contentEditable toggling. ([38821](https://github.com/WordPress/gutenberg/pull/38821))
-- [Inserter]: Fix focus loss after closing patterns explorer from modal. ([38884](https://github.com/WordPress/gutenberg/pull/38884))
-- [RichText]: Fix wrong block merging when pressing  `delete` consecutively. ([38991](https://github.com/WordPress/gutenberg/pull/38991))
+
+-   Multi-selection: Avoid rich text contentEditable toggling. ([38821](https://github.com/WordPress/gutenberg/pull/38821))
+-   [Inserter]: Fix focus loss after closing patterns explorer from modal. ([38884](https://github.com/WordPress/gutenberg/pull/38884))
+-   [RichText]: Fix wrong block merging when pressing `delete` consecutively. ([38991](https://github.com/WordPress/gutenberg/pull/38991))
 
 #### Site Editor
-- Add site editor initial redirect error handling. ([38655](https://github.com/WordPress/gutenberg/pull/38655))
-- Limit template part slugs to Latin chars. ([38695](https://github.com/WordPress/gutenberg/pull/38695))
-- Template List: Decode entities in record titles. ([38863](https://github.com/WordPress/gutenberg/pull/38863))
+
+-   Add site editor initial redirect error handling. ([38655](https://github.com/WordPress/gutenberg/pull/38655))
+-   Limit template part slugs to Latin chars. ([38695](https://github.com/WordPress/gutenberg/pull/38695))
+-   Template List: Decode entities in record titles. ([38863](https://github.com/WordPress/gutenberg/pull/38863))
 
 #### Global Styles
--  Fix for classic themes using default presets. ([38701](https://github.com/WordPress/gutenberg/pull/38701))
-- Fix for late static binding in the resolver. ([38857](https://github.com/WordPress/gutenberg/pull/38857))
-- Fix global styles loading logic. ([38745](https://github.com/WordPress/gutenberg/pull/38745))
+
+-   Fix for classic themes using default presets. ([38701](https://github.com/WordPress/gutenberg/pull/38701))
+-   Fix for late static binding in the resolver. ([38857](https://github.com/WordPress/gutenberg/pull/38857))
+-   Fix global styles loading logic. ([38745](https://github.com/WordPress/gutenberg/pull/38745))
 
 #### Components
-- Fix spin buttons of number inputs in Safari. ([38840](https://github.com/WordPress/gutenberg/pull/38840))
-- [Components]: Show tooltip on toggle custom size in FontSizePicker. ([38985](https://github.com/WordPress/gutenberg/pull/38985))
+
+-   Fix spin buttons of number inputs in Safari. ([38840](https://github.com/WordPress/gutenberg/pull/38840))
+-   [Components]: Show tooltip on toggle custom size in FontSizePicker. ([38985](https://github.com/WordPress/gutenberg/pull/38985))
 
 #### List View
-- Fix list view error when deleting first item in canvas. ([38775](https://github.com/WordPress/gutenberg/pull/38775))
-- Fix: Select block after duplicate. ([38760](https://github.com/WordPress/gutenberg/pull/38760))
+
+-   Fix list view error when deleting first item in canvas. ([38775](https://github.com/WordPress/gutenberg/pull/38775))
+-   Fix: Select block after duplicate. ([38760](https://github.com/WordPress/gutenberg/pull/38760))
 
 #### CSS & Styling
-- Fix for widget customizer panel,. ([38746](https://github.com/WordPress/gutenberg/pull/38746))
-- Load block support styles in the head for block themes. ([38750](https://github.com/WordPress/gutenberg/pull/38750))
+
+-   Fix for widget customizer panel,. ([38746](https://github.com/WordPress/gutenberg/pull/38746))
+-   Load block support styles in the head for block themes. ([38750](https://github.com/WordPress/gutenberg/pull/38750))
 
 #### Widgets Editor
-- (Issue #38390) Fixed CSS position property to fix button width. ([38846](https://github.com/WordPress/gutenberg/pull/38846))
+
+-   (Issue #38390) Fixed CSS position property to fix button width. ([38846](https://github.com/WordPress/gutenberg/pull/38846))
 
 #### Accessibility
-- Avoid duplicate labels for "Save Draft" and "Save as pending" buttons. ([38776](https://github.com/WordPress/gutenberg/pull/38776))
+
+-   Avoid duplicate labels for "Save Draft" and "Save as pending" buttons. ([38776](https://github.com/WordPress/gutenberg/pull/38776))
 
 #### Testing
-- Fix file block full content fixture. ([38725](https://github.com/WordPress/gutenberg/pull/38725))
+
+-   Fix file block full content fixture. ([38725](https://github.com/WordPress/gutenberg/pull/38725))
 
 #### Block Directory
-- Fix the block activation when metadata registered on server. ([38697](https://github.com/WordPress/gutenberg/pull/38697))
+
+-   Fix the block activation when metadata registered on server. ([38697](https://github.com/WordPress/gutenberg/pull/38697))
 
 #### Colors
-- Strip double # char on HexInput. ([38335](https://github.com/WordPress/gutenberg/pull/38335))
 
+-   Strip double # char on HexInput. ([38335](https://github.com/WordPress/gutenberg/pull/38335))
 
 ### Performance
 
 #### CSS & Styling
-- Use `wp_unique_id()` instead of `uniqid()` to generate CSS class names. ([38891](https://github.com/WordPress/gutenberg/pull/38891))
 
+-   Use `wp_unique_id()` instead of `uniqid()` to generate CSS class names. ([38891](https://github.com/WordPress/gutenberg/pull/38891))
 
 ### Experiments
 
 #### Global Styles
-- Add initial version of the style engine. ([37978](https://github.com/WordPress/gutenberg/pull/37978))
 
+-   Add initial version of the style engine. ([37978](https://github.com/WordPress/gutenberg/pull/37978))
 
 ### Documentation
 
-- Add documentation about the `patterns` field of `theme.json`. ([38700](https://github.com/WordPress/gutenberg/pull/38700))
-- Add documentation for deprecating styles. ([38540](https://github.com/WordPress/gutenberg/pull/38540))
-- Add more info about contextual patterns and pattern transformations. ([38809](https://github.com/WordPress/gutenberg/pull/38809))
-- Add semantic patterns documentation. ([38778](https://github.com/WordPress/gutenberg/pull/38778))
-- Docs: Add instructions on how to add new core blocks to block-library. ([38868](https://github.com/WordPress/gutenberg/pull/38868))
-- Docs: Update Group block supports. ([38962](https://github.com/WordPress/gutenberg/pull/38962))
-- Fix hyperlink in block `Metadata` page. ([38941](https://github.com/WordPress/gutenberg/pull/38941))
-- Improve point release documentation to include even more detail. ([38631](https://github.com/WordPress/gutenberg/pull/38631))
-- Increase support for `experimental-link-color` until WordPress 5.9 is the minimum version. ([38711](https://github.com/WordPress/gutenberg/pull/38711))
-- Links changed for Develeoper.wordpress.org. ([38841](https://github.com/WordPress/gutenberg/pull/38841))
-- Removing comma so that the code snippet represents standard JSON. ([38938](https://github.com/WordPress/gutenberg/pull/38938))
-- Try and clarify deprecations documentation. ([38683](https://github.com/WordPress/gutenberg/pull/38683))
-- Update Getting Started with more granular options. ([38682](https://github.com/WordPress/gutenberg/pull/38682))
-- Version section update. ([38937](https://github.com/WordPress/gutenberg/pull/38937))
+-   Add documentation about the `patterns` field of `theme.json`. ([38700](https://github.com/WordPress/gutenberg/pull/38700))
+-   Add documentation for deprecating styles. ([38540](https://github.com/WordPress/gutenberg/pull/38540))
+-   Add more info about contextual patterns and pattern transformations. ([38809](https://github.com/WordPress/gutenberg/pull/38809))
+-   Add semantic patterns documentation. ([38778](https://github.com/WordPress/gutenberg/pull/38778))
+-   Docs: Add instructions on how to add new core blocks to block-library. ([38868](https://github.com/WordPress/gutenberg/pull/38868))
+-   Docs: Update Group block supports. ([38962](https://github.com/WordPress/gutenberg/pull/38962))
+-   Fix hyperlink in block `Metadata` page. ([38941](https://github.com/WordPress/gutenberg/pull/38941))
+-   Improve point release documentation to include even more detail. ([38631](https://github.com/WordPress/gutenberg/pull/38631))
+-   Increase support for `experimental-link-color` until WordPress 5.9 is the minimum version. ([38711](https://github.com/WordPress/gutenberg/pull/38711))
+-   Links changed for Develeoper.wordpress.org. ([38841](https://github.com/WordPress/gutenberg/pull/38841))
+-   Removing comma so that the code snippet represents standard JSON. ([38938](https://github.com/WordPress/gutenberg/pull/38938))
+-   Try and clarify deprecations documentation. ([38683](https://github.com/WordPress/gutenberg/pull/38683))
+-   Update Getting Started with more granular options. ([38682](https://github.com/WordPress/gutenberg/pull/38682))
+-   Version section update. ([38937](https://github.com/WordPress/gutenberg/pull/38937))
 
 #### Components
-- FormFileUpload: Add Storybook stories. ([38734](https://github.com/WordPress/gutenberg/pull/38734))
-- Storybook: Move experimental components to correct section. ([38640](https://github.com/WordPress/gutenberg/pull/38640))
 
+-   FormFileUpload: Add Storybook stories. ([38734](https://github.com/WordPress/gutenberg/pull/38734))
+-   Storybook: Move experimental components to correct section. ([38640](https://github.com/WordPress/gutenberg/pull/38640))
 
 ### Code Quality
 
-- Improve image block regex. ([38742](https://github.com/WordPress/gutenberg/pull/38742))
+-   Improve image block regex. ([38742](https://github.com/WordPress/gutenberg/pull/38742))
 
 #### Block Library
-- - Cover]: Remove unnecessary `temporaryMinHeight`. ([38887](https://github.com/WordPress/gutenberg/pull/38887))
-- Cover block: Update deprecated gradient fixture. ([38728](https://github.com/WordPress/gutenberg/pull/38728))
-- Gallery: Register gallery in block_names dynamic block array. ([38689](https://github.com/WordPress/gutenberg/pull/38689))
-- Improve consistency of Navigation block hook. ([38705](https://github.com/WordPress/gutenberg/pull/38705))
-- Nav block menu select dropdown encapsulation and further consolidation. ([38627](https://github.com/WordPress/gutenberg/pull/38627))
-- Prefer kses to blanket esc_html on label. ([38696](https://github.com/WordPress/gutenberg/pull/38696))
-- Update wp_kses usage to be consistent in navigation blocks (use wp_kses_post). ([38732](https://github.com/WordPress/gutenberg/pull/38732))
+
+-   -   Cover]: Remove unnecessary `temporaryMinHeight`. ([38887](https://github.com/WordPress/gutenberg/pull/38887))
+-   Cover block: Update deprecated gradient fixture. ([38728](https://github.com/WordPress/gutenberg/pull/38728))
+-   Gallery: Register gallery in block_names dynamic block array. ([38689](https://github.com/WordPress/gutenberg/pull/38689))
+-   Improve consistency of Navigation block hook. ([38705](https://github.com/WordPress/gutenberg/pull/38705))
+-   Nav block menu select dropdown encapsulation and further consolidation. ([38627](https://github.com/WordPress/gutenberg/pull/38627))
+-   Prefer kses to blanket esc_html on label. ([38696](https://github.com/WordPress/gutenberg/pull/38696))
+-   Update wp_kses usage to be consistent in navigation blocks (use wp_kses_post). ([38732](https://github.com/WordPress/gutenberg/pull/38732))
 
 #### Components
-- Context: Omit `as` prop in types. ([38844](https://github.com/WordPress/gutenberg/pull/38844))
-- Storybook: Remove story for Typography Panel. ([38867](https://github.com/WordPress/gutenberg/pull/38867))
+
+-   Context: Omit `as` prop in types. ([38844](https://github.com/WordPress/gutenberg/pull/38844))
+-   Storybook: Remove story for Typography Panel. ([38867](https://github.com/WordPress/gutenberg/pull/38867))
 
 #### npm Packages
-- Packages: Ensure that private packages do not update when publishing to npm. ([38946](https://github.com/WordPress/gutenberg/pull/38946))
 
+-   Packages: Ensure that private packages do not update when publishing to npm. ([38946](https://github.com/WordPress/gutenberg/pull/38946))
 
 ### Tools
 
-- Scripts: Update to @svgr/webpack v6. ([38866](https://github.com/WordPress/gutenberg/pull/38866))
-- wp-env: Document some caveats when using xdebug with VSCode. ([38882](https://github.com/WordPress/gutenberg/pull/38882))
+-   Scripts: Update to @svgr/webpack v6. ([38866](https://github.com/WordPress/gutenberg/pull/38866))
+-   wp-env: Document some caveats when using xdebug with VSCode. ([38882](https://github.com/WordPress/gutenberg/pull/38882))
 
 #### Testing
-- Post Visibility end-to-end test: Improve XPath selector to avoid reliance on DOM structure. ([38717](https://github.com/WordPress/gutenberg/pull/38717))
-- Replace no-shadow eslint rule with @typescript-eslint/no-shadow. ([38665](https://github.com/WordPress/gutenberg/pull/38665))
-- RichText: Add test for merging and then splitting paragraphs. ([39007](https://github.com/WordPress/gutenberg/pull/39007))
-- Tests: Use REST API to delete templates and template parts. ([38524](https://github.com/WordPress/gutenberg/pull/38524))
-- [Automated Testing]: Add end-to-end test for merging paragraphs and soft line break afterwards. ([39009](https://github.com/WordPress/gutenberg/pull/39009))
+
+-   Post Visibility end-to-end test: Improve XPath selector to avoid reliance on DOM structure. ([38717](https://github.com/WordPress/gutenberg/pull/38717))
+-   Replace no-shadow eslint rule with @typescript-eslint/no-shadow. ([38665](https://github.com/WordPress/gutenberg/pull/38665))
+-   RichText: Add test for merging and then splitting paragraphs. ([39007](https://github.com/WordPress/gutenberg/pull/39007))
+-   Tests: Use REST API to delete templates and template parts. ([38524](https://github.com/WordPress/gutenberg/pull/38524))
+-   [Automated Testing]: Add end-to-end test for merging paragraphs and soft line break afterwards. ([39009](https://github.com/WordPress/gutenberg/pull/39009))
 
 #### Build Tooling
-- Build separate full contributors list. ([38777](https://github.com/WordPress/gutenberg/pull/38777))
-- Generate full release contributors list in release changelog. ([38704](https://github.com/WordPress/gutenberg/pull/38704))
+
+-   Build separate full contributors list. ([38777](https://github.com/WordPress/gutenberg/pull/38777))
+-   Generate full release contributors list in release changelog. ([38704](https://github.com/WordPress/gutenberg/pull/38704))
 
 #### Components
-- TreeGrid: Add tests for callback functions. ([38942](https://github.com/WordPress/gutenberg/pull/38942))
 
+-   TreeGrid: Add tests for callback functions. ([38942](https://github.com/WordPress/gutenberg/pull/38942))
 
 ### Various
 
-- Backport from core: Global styles duotone not rendering in post editor. ([38897](https://github.com/WordPress/gutenberg/pull/38897))
-- Block support styles: Port changes from core to Gutenberg. ([38880](https://github.com/WordPress/gutenberg/pull/38880))
-- Data: Enable thunks by default and remove the experimental flag. ([38853](https://github.com/WordPress/gutenberg/pull/38853))
-- Editor: Adds additional check to guard against incompete presets. ([38902](https://github.com/WordPress/gutenberg/pull/38902))
-- Integration tests: Remove client ID from fixtures. ([38685](https://github.com/WordPress/gutenberg/pull/38685))
-- Lowered specificity of alignment rules. ([38947](https://github.com/WordPress/gutenberg/pull/38947))
-- Mobile - Fix Custom Palette colors and support multiple origins and theme cache issues. ([38417](https://github.com/WordPress/gutenberg/pull/38417))
-- Mobile: Improve npm clean scripts for react-native-editor. ([38752](https://github.com/WordPress/gutenberg/pull/38752))
-- PostTrash: Call trashPost action with no arguments, rewrite to hooks. ([38615](https://github.com/WordPress/gutenberg/pull/38615))
-- Simplify site icon animation on hover. ([38783](https://github.com/WordPress/gutenberg/pull/38783))
-- Tests: Remove `originalContent` from fixtures. ([38638](https://github.com/WordPress/gutenberg/pull/38638))
-- Theme.json `styles` check: Port changes from core to Gutenberg. ([38888](https://github.com/WordPress/gutenberg/pull/38888))
-- TypeScript definitions for core-data entity records. ([38666](https://github.com/WordPress/gutenberg/pull/38666))
-- Upgrade react-native-video and drop jetifier on Android. ([38426](https://github.com/WordPress/gutenberg/pull/38426))
-- canUser resolver: Remove fallback for OPTIONS response headers. ([38881](https://github.com/WordPress/gutenberg/pull/38881))
-- edit-site store: Migrate to thunks. ([38812](https://github.com/WordPress/gutenberg/pull/38812))
-
-#### Components
-- BaseControl: Refactor stories to use Controls. ([38741](https://github.com/WordPress/gutenberg/pull/38741))
-- Migrate Post Template Delete button from `confirm()` to `ConfirmDialog`. ([37535](https://github.com/WordPress/gutenberg/pull/37535))
-- Migrate the Post 'Switch to draft' button to `ConfirmDialog` component. ([37491](https://github.com/WordPress/gutenberg/pull/37491))
-- Storybook: Ensure rerender for RTL switcher. ([38963](https://github.com/WordPress/gutenberg/pull/38963))
+-   Backport from core: Global styles duotone not rendering in post editor. ([38897](https://github.com/WordPress/gutenberg/pull/38897))
+-   Block support styles: Port changes from core to Gutenberg. ([38880](https://github.com/WordPress/gutenberg/pull/38880))
+-   Data: Enable thunks by default and remove the experimental flag. ([38853](https://github.com/WordPress/gutenberg/pull/38853))
+-   Editor: Adds additional check to guard against incompete presets. ([38902](https://github.com/WordPress/gutenberg/pull/38902))
+-   Integration tests: Remove client ID from fixtures. ([38685](https://github.com/WordPress/gutenberg/pull/38685))
+-   Lowered specificity of alignment rules. ([38947](https://github.com/WordPress/gutenberg/pull/38947))
+-   Mobile - Fix Custom Palette colors and support multiple origins and theme cache issues. ([38417](https://github.com/WordPress/gutenberg/pull/38417))
+-   Mobile: Improve npm clean scripts for react-native-editor. ([38752](https://github.com/WordPress/gutenberg/pull/38752))
+-   PostTrash: Call trashPost action with no arguments, rewrite to hooks. ([38615](https://github.com/WordPress/gutenberg/pull/38615))
+-   Simplify site icon animation on hover. ([38783](https://github.com/WordPress/gutenberg/pull/38783))
+-   Tests: Remove `originalContent` from fixtures. ([38638](https://github.com/WordPress/gutenberg/pull/38638))
+-   Theme.json `styles` check: Port changes from core to Gutenberg. ([38888](https://github.com/WordPress/gutenberg/pull/38888))
+-   TypeScript definitions for core-data entity records. ([38666](https://github.com/WordPress/gutenberg/pull/38666))
+-   Upgrade react-native-video and drop jetifier on Android. ([38426](https://github.com/WordPress/gutenberg/pull/38426))
+-   canUser resolver: Remove fallback for OPTIONS response headers. ([38881](https://github.com/WordPress/gutenberg/pull/38881))
+-   edit-site store: Migrate to thunks. ([38812](https://github.com/WordPress/gutenberg/pull/38812))
+
+#### Components
+
+-   BaseControl: Refactor stories to use Controls. ([38741](https://github.com/WordPress/gutenberg/pull/38741))
+-   Migrate Post Template Delete button from `confirm()` to `ConfirmDialog`. ([37535](https://github.com/WordPress/gutenberg/pull/37535))
+-   Migrate the Post 'Switch to draft' button to `ConfirmDialog` component. ([37491](https://github.com/WordPress/gutenberg/pull/37491))
+-   Storybook: Ensure rerender for RTL switcher. ([38963](https://github.com/WordPress/gutenberg/pull/38963))
 
 #### Post Editor
-- Editor store: Remove a noop SETUP_EDITOR action. ([38622](https://github.com/WordPress/gutenberg/pull/38622))
-- Migrate editor store to thunks. ([35929](https://github.com/WordPress/gutenberg/pull/35929))
-- [Edit Post]: Migrate store actions to thunks. ([36551](https://github.com/WordPress/gutenberg/pull/36551))
+
+-   Editor store: Remove a noop SETUP_EDITOR action. ([38622](https://github.com/WordPress/gutenberg/pull/38622))
+-   Migrate editor store to thunks. ([35929](https://github.com/WordPress/gutenberg/pull/35929))
+-   [Edit Post]: Migrate store actions to thunks. ([36551](https://github.com/WordPress/gutenberg/pull/36551))
 
 #### Global Styles
-- Allow to extend the `WP_Theme_JSON_Gutenberg` class. ([38671](https://github.com/WordPress/gutenberg/pull/38671))
-- Update Global Styles code to continue adding settings & styles. ([38883](https://github.com/WordPress/gutenberg/pull/38883))
+
+-   Allow to extend the `WP_Theme_JSON_Gutenberg` class. ([38671](https://github.com/WordPress/gutenberg/pull/38671))
+-   Update Global Styles code to continue adding settings & styles. ([38883](https://github.com/WordPress/gutenberg/pull/38883))
 
 #### Block Library
-- Change Gallery block code ownership. ([38722](https://github.com/WordPress/gutenberg/pull/38722))
-- Remove data-controls mock from Image block RN tests. ([38852](https://github.com/WordPress/gutenberg/pull/38852))
+
+-   Change Gallery block code ownership. ([38722](https://github.com/WordPress/gutenberg/pull/38722))
+-   Remove data-controls mock from Image block RN tests. ([38852](https://github.com/WordPress/gutenberg/pull/38852))
 
 #### npm Packages
-- Packages: Automate cherry-picking to `trunk` commits created during publishing. ([38977](https://github.com/WordPress/gutenberg/pull/38977))
+
+-   Packages: Automate cherry-picking to `trunk` commits created during publishing. ([38977](https://github.com/WordPress/gutenberg/pull/38977))
 
 #### Block Conversion
-- [Block Conversion]: Fix Image and Video to Cover block transformations. ([38959](https://github.com/WordPress/gutenberg/pull/38959))
+
+-   [Block Conversion]: Fix Image and Video to Cover block transformations. ([38959](https://github.com/WordPress/gutenberg/pull/38959))
 
 #### Data Layer
-- Data: Normalize selector args when handling metadata selectors/actions. ([38945](https://github.com/WordPress/gutenberg/pull/38945))
+
+-   Data: Normalize selector args when handling metadata selectors/actions. ([38945](https://github.com/WordPress/gutenberg/pull/38945))
 
 #### Icons
-- Deprecate duplicate icons. ([38849](https://github.com/WordPress/gutenberg/pull/38849))
 
-#### Accessibility
-- Adds aria-label to the search button, as accessibility enhancement. ([38136](https://github.com/WordPress/gutenberg/pull/38136))
+-   Deprecate duplicate icons. ([38849](https://github.com/WordPress/gutenberg/pull/38849))
 
+#### Accessibility
 
-## First time contributors
+-   Adds aria-label to the search button, as accessibility enhancement. ([38136](https://github.com/WordPress/gutenberg/pull/38136))
 
-The following PRs were merged by first time contrbutors:
+## First-time contributors
 
-- @Alex-Kostov: Fix for widget customizer panel,. ([38746](https://github.com/WordPress/gutenberg/pull/38746))
-- @HasnainAshfaq: Version section update. ([38937](https://github.com/WordPress/gutenberg/pull/38937))
-- @mjstoney: (Issue #38390) Fixed CSS position property to fix button width. ([38846](https://github.com/WordPress/gutenberg/pull/38846))
-- @razwan: Add resolvePoint prop to FocalPointPicker component to allow updating value while dragging. ([38247](https://github.com/WordPress/gutenberg/pull/38247))
-- @sanzeeb3: Fix hyperlink in block `Metadata` page. ([38941](https://github.com/WordPress/gutenberg/pull/38941))
-- @Sisanu: Adds aria-label to the search button, as accessibility enhancement. ([38136](https://github.com/WordPress/gutenberg/pull/38136))
+The following PRs were merged by first-time contributors:
 
+-   @Alex-Kostov: Fix for widget customizer panel,. ([38746](https://github.com/WordPress/gutenberg/pull/38746))
+-   @HasnainAshfaq: Version section update. ([38937](https://github.com/WordPress/gutenberg/pull/38937))
+-   @mjstoney: (Issue #38390) Fixed CSS position property to fix button width. ([38846](https://github.com/WordPress/gutenberg/pull/38846))
+-   @razwan: Add resolvePoint prop to FocalPointPicker component to allow updating value while dragging. ([38247](https://github.com/WordPress/gutenberg/pull/38247))
+-   @sanzeeb3: Fix hyperlink in block `Metadata` page. ([38941](https://github.com/WordPress/gutenberg/pull/38941))
+-   @Sisanu: Adds aria-label to the search button, as accessibility enhancement. ([38136](https://github.com/WordPress/gutenberg/pull/38136))
 
 ## Contributors
 
@@ -17757,7 +29268,6 @@ The following contributors merged PRs in this release:
 
 @aaronrobertshaw @adamziel @ajlende @Alex-Kostov @alexstine @andrewserong @annezazu @audrasjb @bph @c4rl0sbr4v0 @chad1008 @ciampo @DAreRodz @delowardev @dmsnell @ellatrix @fluiddot @geriux @getdave @glendaviesnz @gziolo @HasnainAshfaq @jasmussen @jeherve @jorgefilipecosta @jsnajdr @KevinBatdorf @MaggieCabrera @Mamaduka @mchowning @michalczaplinski @mirka @mjstoney @mkevins @ndiego @noahtallen @ntsekouras @oandregal @ocean90 @PatelUtkarsh @ramonjd @razwan @ryanwelcher @sanzeeb3 @Sisanu @stokesman @t-hamano @talldan @twstokes @webmandesign @westonruter @youknowriad
 
-
 = 12.6.0 =
 
 ## Changelog
@@ -17765,7292 +29275,7779 @@ The following contributors merged PRs in this release:
 ### Enhancements
 
 #### Block Library
-- Add transform between calendar and archives. ([38324](https://github.com/WordPress/gutenberg/pull/38324))
-- Add: Mechanism to keep styles during block transforms. ([37596](https://github.com/WordPress/gutenberg/pull/37596))
-- Code block: Add `core/paragraph` in transforms object. ([38295](https://github.com/WordPress/gutenberg/pull/38295))
-- Heading: Omit anchor when transforming to paragraph. ([38604](https://github.com/WordPress/gutenberg/pull/38604))
-- Navigation: Try removing "Add all pages" from placeholder. ([36775](https://github.com/WordPress/gutenberg/pull/36775))
-- Remove the Large style option from the quote block. ([37580](https://github.com/WordPress/gutenberg/pull/37580))
-- Social Icons: Add the ability to show/hide labels. ([38152](https://github.com/WordPress/gutenberg/pull/38152))
-- [Block Library]: Add transform between `Tag Cloud` and `Categories`. ([38566](https://github.com/WordPress/gutenberg/pull/38566))
-- [Block: Group] Add transform to row variation. ([36202](https://github.com/WordPress/gutenberg/pull/36202))
-- Add post author biography block. ([38269](https://github.com/WordPress/gutenberg/pull/38269))
-- Prompt to keep or replace Featured Image when replacing Image block media that is set as the Featured Image. ([34666](https://github.com/WordPress/gutenberg/pull/34666))
-- Block Library: Add new `Read More` block (post link). ([37649](https://github.com/WordPress/gutenberg/pull/37649))
-- Images: Try moving responsive rule to common.scss. ([38399](https://github.com/WordPress/gutenberg/pull/38399))
-
-#### Components
-- Dropdown: Tweak prop destructuring to be TypeScript friendly. ([38431](https://github.com/WordPress/gutenberg/pull/38431))
-- Tools Panel: Only show header ➕ icon when all items are optional. ([38262](https://github.com/WordPress/gutenberg/pull/38262))
-- Update the Spinner design. ([37551](https://github.com/WordPress/gutenberg/pull/37551))
-- `Navigator`: Add focus restoration. ([38149](https://github.com/WordPress/gutenberg/pull/38149))
-- `Navigator`: Rename `push`/`pop` to `goTo`/`goBack`. ([38582](https://github.com/WordPress/gutenberg/pull/38582))
-- Migrate Edit Navigation screen "Delete menu" button from `confirm()` …. ([37492](https://github.com/WordPress/gutenberg/pull/37492))
+
+-   Add transform between calendar and archives. ([38324](https://github.com/WordPress/gutenberg/pull/38324))
+-   Add: Mechanism to keep styles during block transforms. ([37596](https://github.com/WordPress/gutenberg/pull/37596))
+-   Code block: Add `core/paragraph` in transforms object. ([38295](https://github.com/WordPress/gutenberg/pull/38295))
+-   Heading: Omit anchor when transforming to paragraph. ([38604](https://github.com/WordPress/gutenberg/pull/38604))
+-   Navigation: Try removing "Add all pages" from placeholder. ([36775](https://github.com/WordPress/gutenberg/pull/36775))
+-   Remove the Large style option from the quote block. ([37580](https://github.com/WordPress/gutenberg/pull/37580))
+-   Social Icons: Add the ability to show/hide labels. ([38152](https://github.com/WordPress/gutenberg/pull/38152))
+-   [Block Library]: Add transform between `Tag Cloud` and `Categories`. ([38566](https://github.com/WordPress/gutenberg/pull/38566))
+-   [Block: Group] Add transform to row variation. ([36202](https://github.com/WordPress/gutenberg/pull/36202))
+-   Add post author biography block. ([38269](https://github.com/WordPress/gutenberg/pull/38269))
+-   Prompt to keep or replace Featured Image when replacing Image block media that is set as the Featured Image. ([34666](https://github.com/WordPress/gutenberg/pull/34666))
+-   Block Library: Add new `Read More` block (post link). ([37649](https://github.com/WordPress/gutenberg/pull/37649))
+-   Images: Try moving responsive rule to common.scss. ([38399](https://github.com/WordPress/gutenberg/pull/38399))
+
+#### Components
+
+-   Dropdown: Tweak prop destructuring to be TypeScript friendly. ([38431](https://github.com/WordPress/gutenberg/pull/38431))
+-   Tools Panel: Only show header ➕ icon when all items are optional. ([38262](https://github.com/WordPress/gutenberg/pull/38262))
+-   Update the Spinner design. ([37551](https://github.com/WordPress/gutenberg/pull/37551))
+-   `Navigator`: Add focus restoration. ([38149](https://github.com/WordPress/gutenberg/pull/38149))
+-   `Navigator`: Rename `push`/`pop` to `goTo`/`goBack`. ([38582](https://github.com/WordPress/gutenberg/pull/38582))
+-   Migrate Edit Navigation screen "Delete menu" button from `confirm()` …. ([37492](https://github.com/WordPress/gutenberg/pull/37492))
 
 #### Post Editor
-- Editor: Export FlatTermSelector and HierarchicalTermSelector. ([38419](https://github.com/WordPress/gutenberg/pull/38419))
-- Migrate post privacy confirmation from `confirm()` to `ConfirmDialog`. ([37602](https://github.com/WordPress/gutenberg/pull/37602))
-- Most Used Terms: Update show terms condition. ([38513](https://github.com/WordPress/gutenberg/pull/38513))
+
+-   Editor: Export FlatTermSelector and HierarchicalTermSelector. ([38419](https://github.com/WordPress/gutenberg/pull/38419))
+-   Migrate post privacy confirmation from `confirm()` to `ConfirmDialog`. ([37602](https://github.com/WordPress/gutenberg/pull/37602))
+-   Most Used Terms: Update show terms condition. ([38513](https://github.com/WordPress/gutenberg/pull/38513))
 
 #### Testing
-- Refactor Site Editor test utils to the `e2e-test-utils` package. ([38463](https://github.com/WordPress/gutenberg/pull/38463))
-- Test Create Block with more OS and Node versions. ([38368](https://github.com/WordPress/gutenberg/pull/38368))
-- Include tests-mysql port in dev:Start output. ([38590](https://github.com/WordPress/gutenberg/pull/38590))
+
+-   Refactor Site Editor test utils to the `e2e-test-utils` package. ([38463](https://github.com/WordPress/gutenberg/pull/38463))
+-   Test Create Block with more OS and Node versions. ([38368](https://github.com/WordPress/gutenberg/pull/38368))
+-   Include tests-mysql port in dev:Start output. ([38590](https://github.com/WordPress/gutenberg/pull/38590))
 
 #### Accessibility
-- Accessibility improvements for List View Part 2. ([38358](https://github.com/WordPress/gutenberg/pull/38358))
-- Contrast Checker: Check link color. ([38100](https://github.com/WordPress/gutenberg/pull/38100))
+
+-   Accessibility improvements for List View Part 2. ([38358](https://github.com/WordPress/gutenberg/pull/38358))
+-   Contrast Checker: Check link color. ([38100](https://github.com/WordPress/gutenberg/pull/38100))
 
 #### Block Editor
-- [Inserter]: Prioritize core blocks over core block variations when they have the same rank. ([38616](https://github.com/WordPress/gutenberg/pull/38616))
+
+-   [Inserter]: Prioritize core blocks over core block variations when they have the same rank. ([38616](https://github.com/WordPress/gutenberg/pull/38616))
 
 #### Design Tools
-- Block Support: Update color panel default controls. ([38511](https://github.com/WordPress/gutenberg/pull/38511))
-- Duotone: Allow users to specify custom filters. ([38442](https://github.com/WordPress/gutenberg/pull/38442))
+
+-   Block Support: Update color panel default controls. ([38511](https://github.com/WordPress/gutenberg/pull/38511))
+-   Duotone: Allow users to specify custom filters. ([38442](https://github.com/WordPress/gutenberg/pull/38442))
 
 #### Site Editor
-- Update footer breadcrumb text. ([38477](https://github.com/WordPress/gutenberg/pull/38477))
+
+-   Update footer breadcrumb text. ([38477](https://github.com/WordPress/gutenberg/pull/38477))
 
 #### Extensibility
-- Plugins: Add error boundary. ([38397](https://github.com/WordPress/gutenberg/pull/38397))
+
+-   Plugins: Add error boundary. ([38397](https://github.com/WordPress/gutenberg/pull/38397))
 
 #### Widgets Editor
-- Add tools slot on the navigation and widgets page settings menu. ([37928](https://github.com/WordPress/gutenberg/pull/37928))
+
+-   Add tools slot on the navigation and widgets page settings menu. ([37928](https://github.com/WordPress/gutenberg/pull/37928))
 
 #### Global Styles
-- Color Block Support: Switch to ToolsPanel for displaying UI. ([34027](https://github.com/WordPress/gutenberg/pull/34027))
-- Allow child classes to use the private methods and constants. ([38625](https://github.com/WordPress/gutenberg/pull/38625))
-- Use the theme.json classes defined by the plugin in the REST controller. ([38663](https://github.com/WordPress/gutenberg/pull/38663))
+
+-   Color Block Support: Switch to ToolsPanel for displaying UI. ([34027](https://github.com/WordPress/gutenberg/pull/34027))
+-   Allow child classes to use the private methods and constants. ([38625](https://github.com/WordPress/gutenberg/pull/38625))
+-   Use the theme.json classes defined by the plugin in the REST controller. ([38663](https://github.com/WordPress/gutenberg/pull/38663))
 
 #### Icons
-- Add Tip icon to library and use in the Tip component. ([38424](https://github.com/WordPress/gutenberg/pull/38424))
-- Update pagination icons, add new query title and post terms icons. ([38521](https://github.com/WordPress/gutenberg/pull/38521))
+
+-   Add Tip icon to library and use in the Tip component. ([38424](https://github.com/WordPress/gutenberg/pull/38424))
+-   Update pagination icons, add new query title and post terms icons. ([38521](https://github.com/WordPress/gutenberg/pull/38521))
 
 #### WP-Env
-- Adding the "env" script when --wp-env or wpEnv is present. ([38530](https://github.com/WordPress/gutenberg/pull/38530))
+
+-   Adding the "env" script when --wp-env or wpEnv is present. ([38530](https://github.com/WordPress/gutenberg/pull/38530))
 
 ### New APIs
 
-- Introduce the `customScripts` property to allow templates to define additional scripts in package.json. ([38535](https://github.com/WordPress/gutenberg/pull/38535))
+-   Introduce the `customScripts` property to allow templates to define additional scripts in package.json. ([38535](https://github.com/WordPress/gutenberg/pull/38535))
 
 ### Bug Fixes
 
 #### Block Library
-- Audio: Avoid error when locked. ([38282](https://github.com/WordPress/gutenberg/pull/38282))
-- Comment Template: Improve UX of inner block selection. ([38263](https://github.com/WordPress/gutenberg/pull/38263))
-- Cover block :Add back missing styles. ([38362](https://github.com/WordPress/gutenberg/pull/38362))
-- Fix filtering of content when rendering read more block. ([38650](https://github.com/WordPress/gutenberg/pull/38650))
-- Fix search block html handling for label and button text. ([38649](https://github.com/WordPress/gutenberg/pull/38649))
-- Gallery block: Copy all attributes when transforming to Image blocks. ([38642](https://github.com/WordPress/gutenberg/pull/38642))
-- Gallery block: Fix bug with link destination default option not being set. ([38310](https://github.com/WordPress/gutenberg/pull/38310))
-- Gallery block: Fix bug with uploaded images being replaced with same image during selection phase. ([38259](https://github.com/WordPress/gutenberg/pull/38259))
-- Navigation: Try fixing issue with submenu button in dark contexts. ([38270](https://github.com/WordPress/gutenberg/pull/38270))
-- Navigation: Try inheriting orientation in setup state. ([36778](https://github.com/WordPress/gutenberg/pull/36778))
-- Gallery: Ensure last image takes up all available space. ([38189](https://github.com/WordPress/gutenberg/pull/38189))
-- Navigation: Remove blobs that look like a loading state. ([37099](https://github.com/WordPress/gutenberg/pull/37099))
-- Navigation: Try always showing appender even when child is selected. ([37637](https://github.com/WordPress/gutenberg/pull/37637))
-- Separator block: Remove width from wide style. ([38635](https://github.com/WordPress/gutenberg/pull/38635))
-- Tag Cloud: Add the style to the block.json file. ([38403](https://github.com/WordPress/gutenberg/pull/38403))
-- Block Library: Remove unnecessary usages of `RawHTML`. ([38527](https://github.com/WordPress/gutenberg/pull/38527))
-- Site Tagline: Disable line breaks. ([38475](https://github.com/WordPress/gutenberg/pull/38475))
+
+-   Audio: Avoid error when locked. ([38282](https://github.com/WordPress/gutenberg/pull/38282))
+-   Comment Template: Improve UX of inner block selection. ([38263](https://github.com/WordPress/gutenberg/pull/38263))
+-   Cover block :Add back missing styles. ([38362](https://github.com/WordPress/gutenberg/pull/38362))
+-   Fix filtering of content when rendering read more block. ([38650](https://github.com/WordPress/gutenberg/pull/38650))
+-   Fix search block html handling for label and button text. ([38649](https://github.com/WordPress/gutenberg/pull/38649))
+-   Gallery block: Copy all attributes when transforming to Image blocks. ([38642](https://github.com/WordPress/gutenberg/pull/38642))
+-   Gallery block: Fix bug with link destination default option not being set. ([38310](https://github.com/WordPress/gutenberg/pull/38310))
+-   Gallery block: Fix bug with uploaded images being replaced with same image during selection phase. ([38259](https://github.com/WordPress/gutenberg/pull/38259))
+-   Navigation: Try fixing issue with submenu button in dark contexts. ([38270](https://github.com/WordPress/gutenberg/pull/38270))
+-   Navigation: Try inheriting orientation in setup state. ([36778](https://github.com/WordPress/gutenberg/pull/36778))
+-   Gallery: Ensure last image takes up all available space. ([38189](https://github.com/WordPress/gutenberg/pull/38189))
+-   Navigation: Remove blobs that look like a loading state. ([37099](https://github.com/WordPress/gutenberg/pull/37099))
+-   Navigation: Try always showing appender even when child is selected. ([37637](https://github.com/WordPress/gutenberg/pull/37637))
+-   Separator block: Remove width from wide style. ([38635](https://github.com/WordPress/gutenberg/pull/38635))
+-   Tag Cloud: Add the style to the block.json file. ([38403](https://github.com/WordPress/gutenberg/pull/38403))
+-   Block Library: Remove unnecessary usages of `RawHTML`. ([38527](https://github.com/WordPress/gutenberg/pull/38527))
+-   Site Tagline: Disable line breaks. ([38475](https://github.com/WordPress/gutenberg/pull/38475))
 
 #### Components
-- Add `cx` as a dependency of `useMemo` across `@wordpress/components` package. ([38541](https://github.com/WordPress/gutenberg/pull/38541))
-- Fix `Slot`/`Fill` Emotion `StyleProvider`. ([38237](https://github.com/WordPress/gutenberg/pull/38237))
-- UnitControl: Add __unstableInputWidth to prop types. ([38429](https://github.com/WordPress/gutenberg/pull/38429))
-- `ComboBox`: Fix `reset` button's height. ([38020](https://github.com/WordPress/gutenberg/pull/38020))
-- `DateTimePicker`: Fix date format when switching to 12-hour time format. ([37465](https://github.com/WordPress/gutenberg/pull/37465))
+
+-   Add `cx` as a dependency of `useMemo` across `@wordpress/components` package. ([38541](https://github.com/WordPress/gutenberg/pull/38541))
+-   Fix `Slot`/`Fill` Emotion `StyleProvider`. ([38237](https://github.com/WordPress/gutenberg/pull/38237))
+-   UnitControl: Add \_\_unstableInputWidth to prop types. ([38429](https://github.com/WordPress/gutenberg/pull/38429))
+-   `ComboBox`: Fix `reset` button's height. ([38020](https://github.com/WordPress/gutenberg/pull/38020))
+-   `DateTimePicker`: Fix date format when switching to 12-hour time format. ([37465](https://github.com/WordPress/gutenberg/pull/37465))
 
 #### Testing
-- First Time Contributor check: Update args for getByUsername. ([38467](https://github.com/WordPress/gutenberg/pull/38467))
-- Silence editor initialization act warnings triggered by asynchronous resolvers during unmount. ([38344](https://github.com/WordPress/gutenberg/pull/38344))
-- Tests: Enable post type UI for templates and template parts. ([38486](https://github.com/WordPress/gutenberg/pull/38486))
+
+-   first-time contributor check: Update args for getByUsername. ([38467](https://github.com/WordPress/gutenberg/pull/38467))
+-   Silence editor initialization act warnings triggered by asynchronous resolvers during unmount. ([38344](https://github.com/WordPress/gutenberg/pull/38344))
+-   Tests: Enable post type UI for templates and template parts. ([38486](https://github.com/WordPress/gutenberg/pull/38486))
 
 #### Accessibility
-- Block Manager: Announce search results. ([38654](https://github.com/WordPress/gutenberg/pull/38654))
-- TreeGrid accessibility: Improve browser support for Left Arrow focus to parent row in child row. ([38639](https://github.com/WordPress/gutenberg/pull/38639))
-- Ensure placeholder description is read by VoiceOver. ([38366](https://github.com/WordPress/gutenberg/pull/38366))
-- Remove role attributes on SVGs meant for "decoration" to improve a11y. ([38301](https://github.com/WordPress/gutenberg/pull/38301))
+
+-   Block Manager: Announce search results. ([38654](https://github.com/WordPress/gutenberg/pull/38654))
+-   TreeGrid accessibility: Improve browser support for Left Arrow focus to parent row in child row. ([38639](https://github.com/WordPress/gutenberg/pull/38639))
+-   Ensure placeholder description is read by VoiceOver. ([38366](https://github.com/WordPress/gutenberg/pull/38366))
+-   Remove role attributes on SVGs meant for "decoration" to improve a11y. ([38301](https://github.com/WordPress/gutenberg/pull/38301))
 
 #### Block Editor
-- Don't ignore legitimate files when pasting mixed content. ([38459](https://github.com/WordPress/gutenberg/pull/38459))
-- Handle the absence of href attrib in links. ([37034](https://github.com/WordPress/gutenberg/pull/37034))
-- Block preview: Fix resize listener. ([38516](https://github.com/WordPress/gutenberg/pull/38516))
-- Guard against undefined entity in site editor page setter. ([38503](https://github.com/WordPress/gutenberg/pull/38503))
-- Page for Posts: Display notice in template panel. ([38607](https://github.com/WordPress/gutenberg/pull/38607))
-- Editor store: Remove createUndoLevel and refreshPost actions. ([38585](https://github.com/WordPress/gutenberg/pull/38585))
+
+-   Don't ignore legitimate files when pasting mixed content. ([38459](https://github.com/WordPress/gutenberg/pull/38459))
+-   Handle the absence of href attrib in links. ([37034](https://github.com/WordPress/gutenberg/pull/37034))
+-   Block preview: Fix resize listener. ([38516](https://github.com/WordPress/gutenberg/pull/38516))
+-   Guard against undefined entity in site editor page setter. ([38503](https://github.com/WordPress/gutenberg/pull/38503))
+-   Page for Posts: Display notice in template panel. ([38607](https://github.com/WordPress/gutenberg/pull/38607))
+-   Editor store: Remove createUndoLevel and refreshPost actions. ([38585](https://github.com/WordPress/gutenberg/pull/38585))
 
 #### Template Editor
-- Template Editing Mode: Fix horizontal scrollbar. ([38612](https://github.com/WordPress/gutenberg/pull/38612))
-- Full Site Editing: Improve compat with 3rd party Customizer links. ([38598](https://github.com/WordPress/gutenberg/pull/38598))
-- Site Editor: Remove extra div on post content. ([38451](https://github.com/WordPress/gutenberg/pull/38451))
+
+-   Template Editing Mode: Fix horizontal scrollbar. ([38612](https://github.com/WordPress/gutenberg/pull/38612))
+-   Full Site Editing: Improve compat with 3rd party Customizer links. ([38598](https://github.com/WordPress/gutenberg/pull/38598))
+-   Site Editor: Remove extra div on post content. ([38451](https://github.com/WordPress/gutenberg/pull/38451))
 
 #### Design Tools
-- Search Block: Fix border radius reset. ([38478](https://github.com/WordPress/gutenberg/pull/38478))
+
+-   Search Block: Fix border radius reset. ([38478](https://github.com/WordPress/gutenberg/pull/38478))
 
 #### Scripts
-- Avoid first time contributor workflows for bots. ([38393](https://github.com/WordPress/gutenberg/pull/38393))
-- Fix: Wp-scripts command does not generate assets on Windows OS. ([38348](https://github.com/WordPress/gutenberg/pull/38348))
-- Script: Ensure that `start` works when React Fast Refresh scripts missing. ([38318](https://github.com/WordPress/gutenberg/pull/38318))
-- Scripts: Fallback to `src/index.js` when no valid scripts in metadata for `build` command. ([38367](https://github.com/WordPress/gutenberg/pull/38367))
-- Scripts: Improve the handling for build entry points. ([38584](https://github.com/WordPress/gutenberg/pull/38584))
+
+-   Avoid first-time contributor workflows for bots. ([38393](https://github.com/WordPress/gutenberg/pull/38393))
+-   Fix: Wp-scripts command does not generate assets on Windows OS. ([38348](https://github.com/WordPress/gutenberg/pull/38348))
+-   Script: Ensure that `start` works when React Fast Refresh scripts missing. ([38318](https://github.com/WordPress/gutenberg/pull/38318))
+-   Scripts: Fallback to `src/index.js` when no valid scripts in metadata for `build` command. ([38367](https://github.com/WordPress/gutenberg/pull/38367))
+-   Scripts: Improve the handling for build entry points. ([38584](https://github.com/WordPress/gutenberg/pull/38584))
 
 #### Apps
-- Declare package visibility to query URL handler apps. ([38377](https://github.com/WordPress/gutenberg/pull/38377))
-- Drop jcenter repository from react-native Android projects. ([38142](https://github.com/WordPress/gutenberg/pull/38142))
-- Mobile - Rich Text - Validate link colors. ([38474](https://github.com/WordPress/gutenberg/pull/38474))
 
+-   Declare package visibility to query URL handler apps. ([38377](https://github.com/WordPress/gutenberg/pull/38377))
+-   Drop jcenter repository from react-native Android projects. ([38142](https://github.com/WordPress/gutenberg/pull/38142))
+-   Mobile - Rich Text - Validate link colors. ([38474](https://github.com/WordPress/gutenberg/pull/38474))
 
 ### Performance
 
 #### Block Library
-- Latest Posts: Avoid unnecessary re-renders. ([38402](https://github.com/WordPress/gutenberg/pull/38402))
-- Site Logo: Avoid unnecessary re-renders. ([38316](https://github.com/WordPress/gutenberg/pull/38316))
+
+-   Latest Posts: Avoid unnecessary re-renders. ([38402](https://github.com/WordPress/gutenberg/pull/38402))
+-   Site Logo: Avoid unnecessary re-renders. ([38316](https://github.com/WordPress/gutenberg/pull/38316))
 
 #### Post Editor
-- Avoid unnecessary Post Formats re-renders. ([38285](https://github.com/WordPress/gutenberg/pull/38285))
-- Avoid unnecessary Template panel re-renders. ([38292](https://github.com/WordPress/gutenberg/pull/38292))
+
+-   Avoid unnecessary Post Formats re-renders. ([38285](https://github.com/WordPress/gutenberg/pull/38285))
+-   Avoid unnecessary Template panel re-renders. ([38292](https://github.com/WordPress/gutenberg/pull/38292))
 
 ### Documentation
-- Add a block supports chapter to the block creation tutorial. ([38210](https://github.com/WordPress/gutenberg/pull/38210))
-- Add a block supports for dynamic blocks chapter to the block creation tutorial. ([38249](https://github.com/WordPress/gutenberg/pull/38249))
-- Add a high-level intro to styles in the block editor. ([38208](https://github.com/WordPress/gutenberg/pull/38208))
-- Add contributing information to packages. ([38122](https://github.com/WordPress/gutenberg/pull/38122))
-- Add the Gutenberg data tutorial to the block editor handbook. ([38587](https://github.com/WordPress/gutenberg/pull/38587))
-- Docs: Move design documentation to user interface explanations. ([37807](https://github.com/WordPress/gutenberg/pull/37807))
-- Fix components package README contributing link and duplicate footers. ([38605](https://github.com/WordPress/gutenberg/pull/38605))
-- Fix relative links in main package READMEs so that they work in npm. ([38609](https://github.com/WordPress/gutenberg/pull/38609))
-- Fix: npm script error on Windows (api-docs:Ref). ([38326](https://github.com/WordPress/gutenberg/pull/38326))
-- Move backward compatibility documentation under Contributors Guide. ([37654](https://github.com/WordPress/gutenberg/pull/37654))
-- Provide proper path to image in the handbook. ([38480](https://github.com/WordPress/gutenberg/pull/38480))
-- Remove reference to `upcoming` WordPress 5.9 release. ([38272](https://github.com/WordPress/gutenberg/pull/38272))
-- Scripts: Fix copypasta typo in README file. ([38531](https://github.com/WordPress/gutenberg/pull/38531))
-- Show the block supports for static blocks tutorial in the handbook. ([38452](https://github.com/WordPress/gutenberg/pull/38452))
-- ToolsPanel StoryBook: Removing knobs in favour of controls. ([38308](https://github.com/WordPress/gutenberg/pull/38308))
-- Tutorial: Create your First App with Gutenberg Data. ([38250](https://github.com/WordPress/gutenberg/pull/38250))
-- Update attributes.md. ([38626](https://github.com/WordPress/gutenberg/pull/38626))
-- Update core/archive block schema to reflect no block-level settings support. ([37778](https://github.com/WordPress/gutenberg/pull/37778))
-- Update explanation of block.json file scanning. ([38379](https://github.com/WordPress/gutenberg/pull/38379))
-- Update theme support documentation. ([38514](https://github.com/WordPress/gutenberg/pull/38514))
-- VisuallyHidden: Remove stray readme file. ([38641](https://github.com/WordPress/gutenberg/pull/38641))
-- [Docs]: Add documentation for `schema` in block API. ([36839](https://github.com/WordPress/gutenberg/pull/36839))
-- Update Contributing Guidelines to reflect Dual-License. ([38303](https://github.com/WordPress/gutenberg/pull/38303))
-- Update version required before gutenberg_safe_style_attrs filter can be removed. ([38359](https://github.com/WordPress/gutenberg/pull/38359))
-- Updated changelog to reflect new tip icon. ([38450](https://github.com/WordPress/gutenberg/pull/38450))
-- Use a fixed link to the latest release in readme.txt. ([38550](https://github.com/WordPress/gutenberg/pull/38550))
-
-#### Components
-- Add CHANGELOG entries for recent `TreeGrid` improvements. ([38661](https://github.com/WordPress/gutenberg/pull/38661))
-- Add missing changelog entry. ([38325](https://github.com/WordPress/gutenberg/pull/38325))
-- Changelog: Add missed entries for recent typing fixes and tweaks. ([38469](https://github.com/WordPress/gutenberg/pull/38469))
-- Fix missing link in  `@wordpress/components`'s CHANGELOG. ([38611](https://github.com/WordPress/gutenberg/pull/38611))
+
+-   Add a block supports chapter to the block creation tutorial. ([38210](https://github.com/WordPress/gutenberg/pull/38210))
+-   Add a block supports for dynamic blocks chapter to the block creation tutorial. ([38249](https://github.com/WordPress/gutenberg/pull/38249))
+-   Add a high-level intro to styles in the block editor. ([38208](https://github.com/WordPress/gutenberg/pull/38208))
+-   Add contributing information to packages. ([38122](https://github.com/WordPress/gutenberg/pull/38122))
+-   Add the Gutenberg data tutorial to the block editor handbook. ([38587](https://github.com/WordPress/gutenberg/pull/38587))
+-   Docs: Move design documentation to user interface explanations. ([37807](https://github.com/WordPress/gutenberg/pull/37807))
+-   Fix components package README contributing link and duplicate footers. ([38605](https://github.com/WordPress/gutenberg/pull/38605))
+-   Fix relative links in main package READMEs so that they work in npm. ([38609](https://github.com/WordPress/gutenberg/pull/38609))
+-   Fix: npm script error on Windows (api-docs:Ref). ([38326](https://github.com/WordPress/gutenberg/pull/38326))
+-   Move backward compatibility documentation under Contributors Guide. ([37654](https://github.com/WordPress/gutenberg/pull/37654))
+-   Provide proper path to image in the handbook. ([38480](https://github.com/WordPress/gutenberg/pull/38480))
+-   Remove reference to `upcoming` WordPress 5.9 release. ([38272](https://github.com/WordPress/gutenberg/pull/38272))
+-   Scripts: Fix copypasta typo in README file. ([38531](https://github.com/WordPress/gutenberg/pull/38531))
+-   Show the block supports for static blocks tutorial in the handbook. ([38452](https://github.com/WordPress/gutenberg/pull/38452))
+-   ToolsPanel StoryBook: Removing knobs in favour of controls. ([38308](https://github.com/WordPress/gutenberg/pull/38308))
+-   Tutorial: Create your First App with Gutenberg Data. ([38250](https://github.com/WordPress/gutenberg/pull/38250))
+-   Update attributes.md. ([38626](https://github.com/WordPress/gutenberg/pull/38626))
+-   Update core/archive block schema to reflect no block-level settings support. ([37778](https://github.com/WordPress/gutenberg/pull/37778))
+-   Update explanation of block.json file scanning. ([38379](https://github.com/WordPress/gutenberg/pull/38379))
+-   Update theme support documentation. ([38514](https://github.com/WordPress/gutenberg/pull/38514))
+-   VisuallyHidden: Remove stray readme file. ([38641](https://github.com/WordPress/gutenberg/pull/38641))
+-   [Docs]: Add documentation for `schema` in block API. ([36839](https://github.com/WordPress/gutenberg/pull/36839))
+-   Update Contributing Guidelines to reflect Dual-License. ([38303](https://github.com/WordPress/gutenberg/pull/38303))
+-   Update version required before gutenberg_safe_style_attrs filter can be removed. ([38359](https://github.com/WordPress/gutenberg/pull/38359))
+-   Updated changelog to reflect new tip icon. ([38450](https://github.com/WordPress/gutenberg/pull/38450))
+-   Use a fixed link to the latest release in readme.txt. ([38550](https://github.com/WordPress/gutenberg/pull/38550))
+
+#### Components
+
+-   Add CHANGELOG entries for recent `TreeGrid` improvements. ([38661](https://github.com/WordPress/gutenberg/pull/38661))
+-   Add missing changelog entry. ([38325](https://github.com/WordPress/gutenberg/pull/38325))
+-   Changelog: Add missed entries for recent typing fixes and tweaks. ([38469](https://github.com/WordPress/gutenberg/pull/38469))
+-   Fix missing link in `@wordpress/components`'s CHANGELOG. ([38611](https://github.com/WordPress/gutenberg/pull/38611))
 
 ### Code Quality
-- Chore: Fix: Remove isReversed usage. ([38484](https://github.com/WordPress/gutenberg/pull/38484))
-- Remove APIs deprecated on WordPress 5.4. ([38564](https://github.com/WordPress/gutenberg/pull/38564))
-- Update the minimum supported version to WordPress 5.8. ([38273](https://github.com/WordPress/gutenberg/pull/38273))
+
+-   Chore: Fix: Remove isReversed usage. ([38484](https://github.com/WordPress/gutenberg/pull/38484))
+-   Remove APIs deprecated on WordPress 5.4. ([38564](https://github.com/WordPress/gutenberg/pull/38564))
+-   Update the minimum supported version to WordPress 5.8. ([38273](https://github.com/WordPress/gutenberg/pull/38273))
 
 #### Plugin
-- Bump bl from 4.0.2 to 4.1.0. ([38396](https://github.com/WordPress/gutenberg/pull/38396))
-- Bump follow-redirects from 1.14.1 to 1.14.7. ([38371](https://github.com/WordPress/gutenberg/pull/38371))
-- Bump jszip from 3.6.0 to 3.7.1. ([38410](https://github.com/WordPress/gutenberg/pull/38410))
-- Bump ssri from 6.0.1 to 6.0.2. ([38382](https://github.com/WordPress/gutenberg/pull/38382))
+
+-   Bump bl from 4.0.2 to 4.1.0. ([38396](https://github.com/WordPress/gutenberg/pull/38396))
+-   Bump follow-redirects from 1.14.1 to 1.14.7. ([38371](https://github.com/WordPress/gutenberg/pull/38371))
+-   Bump jszip from 3.6.0 to 3.7.1. ([38410](https://github.com/WordPress/gutenberg/pull/38410))
+-   Bump ssri from 6.0.1 to 6.0.2. ([38382](https://github.com/WordPress/gutenberg/pull/38382))
 
 #### Components
-- ColorIndicator: Add ts-nocheck to color indicator. ([38433](https://github.com/WordPress/gutenberg/pull/38433))
-- ColorPicker: Fix typing errors. ([38430](https://github.com/WordPress/gutenberg/pull/38430))
-- Refresh `object-keys` version in package-lock. ([38645](https://github.com/WordPress/gutenberg/pull/38645))
+
+-   ColorIndicator: Add ts-nocheck to color indicator. ([38433](https://github.com/WordPress/gutenberg/pull/38433))
+-   ColorPicker: Fix typing errors. ([38430](https://github.com/WordPress/gutenberg/pull/38430))
+-   Refresh `object-keys` version in package-lock. ([38645](https://github.com/WordPress/gutenberg/pull/38645))
 
 #### Block Library
-- Consolidate select menus dropdown in Nav block code. ([38179](https://github.com/WordPress/gutenberg/pull/38179))
-- Cover block: Background element's classname consistency. ([38392](https://github.com/WordPress/gutenberg/pull/38392))
-- Image Block: Explicitly check for false from strpos(). ([38505](https://github.com/WordPress/gutenberg/pull/38505))
+
+-   Consolidate select menus dropdown in Nav block code. ([38179](https://github.com/WordPress/gutenberg/pull/38179))
+-   Cover block: Background element's classname consistency. ([38392](https://github.com/WordPress/gutenberg/pull/38392))
+-   Image Block: Explicitly check for false from strpos(). ([38505](https://github.com/WordPress/gutenberg/pull/38505))
 
 #### npm Packages
-- Remove unused dependencies. ([38388](https://github.com/WordPress/gutenberg/pull/38388))
+
+-   Remove unused dependencies. ([38388](https://github.com/WordPress/gutenberg/pull/38388))
 
 ### Tools
 
 #### Testing
-- Add: End to end test for the block transforms. ([38300](https://github.com/WordPress/gutenberg/pull/38300))
-- Add: End to end tests for style variations. ([38485](https://github.com/WordPress/gutenberg/pull/38485))
-- E2E: Fix flakey gallery and template end-to-end specs. ([38342](https://github.com/WordPress/gutenberg/pull/38342))
-- Minor retouches to test-create-block script. ([38482](https://github.com/WordPress/gutenberg/pull/38482))
-- Scripts: Update Puppeteer to v13. ([37078](https://github.com/WordPress/gutenberg/pull/37078))
-
-#### Build Tooling
-- Build workflow: Don't update version in readme.txt. ([38596](https://github.com/WordPress/gutenberg/pull/38596))
-- Changelog: Append a generated list of first time contributors by PR label. ([38372](https://github.com/WordPress/gutenberg/pull/38372))
-- Rename `GUTENBERG_PHASE` to `IS_GUTENBERG_PLUGIN`. ([38202](https://github.com/WordPress/gutenberg/pull/38202))
-- Bump axios from 0.21.1 to 0.21.4. ([38369](https://github.com/WordPress/gutenberg/pull/38369))
-- Bump hosted-git-info from 2.7.1 to 2.8.9. ([38327](https://github.com/WordPress/gutenberg/pull/38327))
-- Bump addressable from 2.7.0 to 2.8.0 in /packages/react-native-editor/ios. ([38234](https://github.com/WordPress/gutenberg/pull/38234))
-- Bump shelljs from 0.8.4 to 0.8.5. ([38370](https://github.com/WordPress/gutenberg/pull/38370))
-- Update kotlin version for react-native Android projects to 1.5.32. ([37970](https://github.com/WordPress/gutenberg/pull/37970))
-- ESLint Plugin: Add flanking whitespace and hyphenated range rules. ([38225](https://github.com/WordPress/gutenberg/pull/38225))
-- WP Env: Fix infinite redirection with custom site URL. ([38352](https://github.com/WordPress/gutenberg/pull/38352))
 
-### People
-- Add @ryanwelcher as code owner to three packages and docs. ([38532](https://github.com/WordPress/gutenberg/pull/38532))
+-   Add: End to end test for the block transforms. ([38300](https://github.com/WordPress/gutenberg/pull/38300))
+-   Add: End to end tests for style variations. ([38485](https://github.com/WordPress/gutenberg/pull/38485))
+-   E2E: Fix flakey gallery and template end-to-end specs. ([38342](https://github.com/WordPress/gutenberg/pull/38342))
+-   Minor retouches to test-create-block script. ([38482](https://github.com/WordPress/gutenberg/pull/38482))
+-   Scripts: Update Puppeteer to v13. ([37078](https://github.com/WordPress/gutenberg/pull/37078))
 
-## First time contributors
+#### Build Tooling
 
-The following PRs were merged by first time contrbutors:
+-   Build workflow: Don't update version in readme.txt. ([38596](https://github.com/WordPress/gutenberg/pull/38596))
+-   Changelog: Append a generated list of first-time contributors by PR label. ([38372](https://github.com/WordPress/gutenberg/pull/38372))
+-   Rename `GUTENBERG_PHASE` to `IS_GUTENBERG_PLUGIN`. ([38202](https://github.com/WordPress/gutenberg/pull/38202))
+-   Bump axios from 0.21.1 to 0.21.4. ([38369](https://github.com/WordPress/gutenberg/pull/38369))
+-   Bump hosted-git-info from 2.7.1 to 2.8.9. ([38327](https://github.com/WordPress/gutenberg/pull/38327))
+-   Bump addressable from 2.7.0 to 2.8.0 in /packages/react-native-editor/ios. ([38234](https://github.com/WordPress/gutenberg/pull/38234))
+-   Bump shelljs from 0.8.4 to 0.8.5. ([38370](https://github.com/WordPress/gutenberg/pull/38370))
+-   Update kotlin version for react-native Android projects to 1.5.32. ([37970](https://github.com/WordPress/gutenberg/pull/37970))
+-   ESLint Plugin: Add flanking whitespace and hyphenated range rules. ([38225](https://github.com/WordPress/gutenberg/pull/38225))
+-   WP Env: Fix infinite redirection with custom site URL. ([38352](https://github.com/WordPress/gutenberg/pull/38352))
 
-- @JeffMatsonPagely: Scripts: Fix copypasta typo in README file. ([38531](https://github.com/WordPress/gutenberg/pull/38531))
-- @angelistudio: Update attributes.md. ([38626](https://github.com/WordPress/gutenberg/pull/38626))
-- @sunyatasattva: Refactor Site Editor test utils to the `e2e-test-utils` package. ([38463](https://github.com/WordPress/gutenberg/pull/38463))
+### People
 
+-   Add @ryanwelcher as code owner to three packages and docs. ([38532](https://github.com/WordPress/gutenberg/pull/38532))
 
+## First-time contributors
 
+The following PRs were merged by first-time contributors:
 
+-   @JeffMatsonPagely: Scripts: Fix copypasta typo in README file. ([38531](https://github.com/WordPress/gutenberg/pull/38531))
+-   @angelistudio: Update attributes.md. ([38626](https://github.com/WordPress/gutenberg/pull/38626))
+-   @sunyatasattva: Refactor Site Editor test utils to the `e2e-test-utils` package. ([38463](https://github.com/WordPress/gutenberg/pull/38463))
 
 = 12.5.4 =
 
+## Changelog
+
 ### Bug Fixes
 
 #### Block Library
-- Fix and refine core function escaping in block output. ([38569](https://github.com/WordPress/gutenberg/pull/38569))
 
+-   Fix and refine core function escaping in block output. ([38569](https://github.com/WordPress/gutenberg/pull/38569))
 
 = 12.5.3 =
 
+## Changelog
+
 ### Bug Fixes
 
 #### Block Library
-- Fix escaping to consider addition of pagination arrow in Query Loop. ([38519](https://github.com/WordPress/gutenberg/pull/38519))
 
+-   Fix escaping to consider addition of pagination arrow in Query Loop. ([38519](https://github.com/WordPress/gutenberg/pull/38519))
 
 = 12.5.2 =
 
-
+## Changelog
 
 ### Bug Fixes
 
 #### Block Library
-- Fix latest posts excerpt escaping. ([38517](https://github.com/WordPress/gutenberg/pull/38517))
-
-
-
 
+-   Fix latest posts excerpt escaping. ([38517](https://github.com/WordPress/gutenberg/pull/38517))
 
 = 12.5.1 =
 
+## Changelog
+
 ### Bug Fixes
 
 #### Site Editor
 
-- Fix a WSOD in the site editor which occurred when an entity could be undefined (https://github.com/WordPress/gutenberg/pull/38503)
-
+-   Fix a WSOD in the site editor which occurred when an entity could be undefined (https://github.com/WordPress/gutenberg/pull/38503)
 
 = 12.5.0 =
 
+## Changelog
+
 ### Features
 
-*   Allow switching global styles variations. ([35619](https://github.com/WordPress/gutenberg/pull/35619))
-*   Add: Code editor to edit site. ([37765](https://github.com/WordPress/gutenberg/pull/37765))
-*   [Post Featured Image]: Show all the controls when inside a Query Loop. ([37945](https://github.com/WordPress/gutenberg/pull/37945))
+-   Allow switching global styles variations. ([35619](https://github.com/WordPress/gutenberg/pull/35619))
+-   Add: Code editor to edit site. ([37765](https://github.com/WordPress/gutenberg/pull/37765))
+-   [Post Featured Image]: Show all the controls when inside a Query Loop. ([37945](https://github.com/WordPress/gutenberg/pull/37945))
 
 ### Enhancements
 
 #### Block Library
 
-*   Add transform between core/site-logo and core/site-title blocks. ([37920](https://github.com/WordPress/gutenberg/pull/37920))
-*   Allow using a text label instead of an icon on overlay menu toggle button. ([36149](https://github.com/WordPress/gutenberg/pull/36149))
-*   Post Featured Image: Add size selector. ([38044](https://github.com/WordPress/gutenberg/pull/38044))
-*   [Query Loop]: Add multiple authors support. ([38024](https://github.com/WordPress/gutenberg/pull/38024))
-*   [Query Loop]: Add support for custom taxonomies filtering. ([38063](https://github.com/WordPress/gutenberg/pull/38063))
-*   Comments Query Loop: Add discuss options to the block. ([37297](https://github.com/WordPress/gutenberg/pull/37297))
-*   Fetch classic Menus and Pages using view (readonly) context. ([37884](https://github.com/WordPress/gutenberg/pull/37884))
-*   Gallery block: Move add/edit media to block toolbar. ([38036](https://github.com/WordPress/gutenberg/pull/38036))
-*   Navigation Block : Try not using css variable for block gap support. ([37543](https://github.com/WordPress/gutenberg/pull/37543))
-*   Paragraph: Try to avoid a trailing word in the description. ([37483](https://github.com/WordPress/gutenberg/pull/37483))
-*   Rename next and previous to newer an older. ([38143](https://github.com/WordPress/gutenberg/pull/38143))
-*   Show menus selection in placeholder only if available. ([37980](https://github.com/WordPress/gutenberg/pull/37980))
-*   Unset inherited backgrounds on Posts Lists. ([37941](https://github.com/WordPress/gutenberg/pull/37941))
-*   Unset inherited backgrounds on social icons. ([37940](https://github.com/WordPress/gutenberg/pull/37940))
+-   Add transform between core/site-logo and core/site-title blocks. ([37920](https://github.com/WordPress/gutenberg/pull/37920))
+-   Allow using a text label instead of an icon on overlay menu toggle button. ([36149](https://github.com/WordPress/gutenberg/pull/36149))
+-   Post Featured Image: Add size selector. ([38044](https://github.com/WordPress/gutenberg/pull/38044))
+-   [Query Loop]: Add multiple authors support. ([38024](https://github.com/WordPress/gutenberg/pull/38024))
+-   [Query Loop]: Add support for custom taxonomies filtering. ([38063](https://github.com/WordPress/gutenberg/pull/38063))
+-   Comments Query Loop: Add discuss options to the block. ([37297](https://github.com/WordPress/gutenberg/pull/37297))
+-   Fetch classic Menus and Pages using view (readonly) context. ([37884](https://github.com/WordPress/gutenberg/pull/37884))
+-   Gallery block: Move add/edit media to block toolbar. ([38036](https://github.com/WordPress/gutenberg/pull/38036))
+-   Navigation Block : Try not using css variable for block gap support. ([37543](https://github.com/WordPress/gutenberg/pull/37543))
+-   Paragraph: Try to avoid a trailing word in the description. ([37483](https://github.com/WordPress/gutenberg/pull/37483))
+-   Rename next and previous to newer an older. ([38143](https://github.com/WordPress/gutenberg/pull/38143))
+-   Show menus selection in placeholder only if available. ([37980](https://github.com/WordPress/gutenberg/pull/37980))
+-   Unset inherited backgrounds on Posts Lists. ([37941](https://github.com/WordPress/gutenberg/pull/37941))
+-   Unset inherited backgrounds on social icons. ([37940](https://github.com/WordPress/gutenberg/pull/37940))
 
 #### Components
 
-*   CustomSelectControl: Add hints example to storybook. ([38056](https://github.com/WordPress/gutenberg/pull/38056))
-*   ToolsPanel: Add CSS classes to first and last displayed ToolsPanelItems. ([37546](https://github.com/WordPress/gutenberg/pull/37546))
-*   `Navigator`: Add basic location history. ([37416](https://github.com/WordPress/gutenberg/pull/37416))
-*   Add: Hover and Selected states to the palette editor. ([37962](https://github.com/WordPress/gutenberg/pull/37962))
-*   Update gray color palette to match base styles. ([38109](https://github.com/WordPress/gutenberg/pull/38109))
+-   CustomSelectControl: Add hints example to storybook. ([38056](https://github.com/WordPress/gutenberg/pull/38056))
+-   ToolsPanel: Add CSS classes to first and last displayed ToolsPanelItems. ([37546](https://github.com/WordPress/gutenberg/pull/37546))
+-   `Navigator`: Add basic location history. ([37416](https://github.com/WordPress/gutenberg/pull/37416))
+-   Add: Hover and Selected states to the palette editor. ([37962](https://github.com/WordPress/gutenberg/pull/37962))
+-   Update gray color palette to match base styles. ([38109](https://github.com/WordPress/gutenberg/pull/38109))
 
 #### Post Editor
 
-*   Post Lock Modal: Update avatar size. ([38040](https://github.com/WordPress/gutenberg/pull/38040))
-*   Post Lock: Adjust avatar design and update message. ([37979](https://github.com/WordPress/gutenberg/pull/37979))
-*   Block styles: Remove box-sizing rule on Post Editor container to achieve editor/frontend parity. ([37902](https://github.com/WordPress/gutenberg/pull/37902))
+-   Post Lock Modal: Update avatar size. ([38040](https://github.com/WordPress/gutenberg/pull/38040))
+-   Post Lock: Adjust avatar design and update message. ([37979](https://github.com/WordPress/gutenberg/pull/37979))
+-   Block styles: Remove box-sizing rule on Post Editor container to achieve editor/frontend parity. ([37902](https://github.com/WordPress/gutenberg/pull/37902))
 
 #### Block Editor
 
-*   Buttons: Preserve styling from adjacent button blocks when inserting a new button block. ([37905](https://github.com/WordPress/gutenberg/pull/37905))
-*   Identify the site frontpage in link UI search results. ([36493](https://github.com/WordPress/gutenberg/pull/36493))
-*   Rich text: Use file on internal dependencies. ([38005](https://github.com/WordPress/gutenberg/pull/38005))
-*   Transform pasted div tags to p tags. ([38042](https://github.com/WordPress/gutenberg/pull/38042))
+-   Buttons: Preserve styling from adjacent button blocks when inserting a new button block. ([37905](https://github.com/WordPress/gutenberg/pull/37905))
+-   Identify the site frontpage in link UI search results. ([36493](https://github.com/WordPress/gutenberg/pull/36493))
+-   Rich text: Use file on internal dependencies. ([38005](https://github.com/WordPress/gutenberg/pull/38005))
+-   Transform pasted div tags to p tags. ([38042](https://github.com/WordPress/gutenberg/pull/38042))
 
 #### Site Editor
 
-*   Update template home, front-page, and search template descriptions. ([38132](https://github.com/WordPress/gutenberg/pull/38132))
-*   Add: Copy all content to edit site. ([37781](https://github.com/WordPress/gutenberg/pull/37781))
+-   Update template home, front-page, and search template descriptions. ([38132](https://github.com/WordPress/gutenberg/pull/38132))
+-   Add: Copy all content to edit site. ([37781](https://github.com/WordPress/gutenberg/pull/37781))
 
 #### Global Styles
 
-*   Load the global styles before the theme styles in the editor. ([37885](https://github.com/WordPress/gutenberg/pull/37885))
-*   Duotone: Allow users to specify custom filters. ([38055](https://github.com/WordPress/gutenberg/pull/38055))
-*   Enable alpha on Block Inspector Color ToolsPanel. ([37731](https://github.com/WordPress/gutenberg/pull/37731))
+-   Load the global styles before the theme styles in the editor. ([37885](https://github.com/WordPress/gutenberg/pull/37885))
+-   Duotone: Allow users to specify custom filters. ([38055](https://github.com/WordPress/gutenberg/pull/38055))
+-   Enable alpha on Block Inspector Color ToolsPanel. ([37731](https://github.com/WordPress/gutenberg/pull/37731))
 
 #### Internationalization
 
-*   i18n: Create new function `addLocaleData` to merge domain configuration. ([37704](https://github.com/WordPress/gutenberg/pull/37704))
+-   i18n: Create new function `addLocaleData` to merge domain configuration. ([37704](https://github.com/WordPress/gutenberg/pull/37704))
 
 #### REST API
 
-*   [Global Styles]: Add REST API endpoint to fetch variations. ([38124](https://github.com/WordPress/gutenberg/pull/38124))
+-   [Global Styles]: Add REST API endpoint to fetch variations. ([38124](https://github.com/WordPress/gutenberg/pull/38124))
 
 #### WP ENV
 
-*   wp-env: Add install-path command. ([35638](https://github.com/WordPress/gutenberg/pull/35638))
+-   wp-env: Add install-path command. ([35638](https://github.com/WordPress/gutenberg/pull/35638))
 
 ### Bug Fixes
 
 #### Block Library
 
-*   Add classic menus to menu switcher. ([38168](https://github.com/WordPress/gutenberg/pull/38168))
-*   Always allow accessing edit.php?post_type=wp_navigation page. ([38170](https://github.com/WordPress/gutenberg/pull/38170))
-*   Fix Post Date block escaping of date HTML. ([38023](https://github.com/WordPress/gutenberg/pull/38023))
-*   Fix duotone render in non-fse themes. ([37954](https://github.com/WordPress/gutenberg/pull/37954))
-*   Social Icons: Fix color picker bug when set to Logos Only. ([38006](https://github.com/WordPress/gutenberg/pull/38006))
-*   Temporarily remove text decoration from Nav block. ([37963](https://github.com/WordPress/gutenberg/pull/37963))
-*   [Query Loop]: Reorganise inspector controls + `order` selection bug. ([37949](https://github.com/WordPress/gutenberg/pull/37949))
-*   Revert "Late escape RSS block (#37878)". ([38117](https://github.com/WordPress/gutenberg/pull/38117))
-*   Fix missing default `align-items` when items are oriented vertically in `flex` layout. ([38069](https://github.com/WordPress/gutenberg/pull/38069))
-*   Update `micromodal` to 0.4.10 to fix navigation close button. ([38032](https://github.com/WordPress/gutenberg/pull/38032))
+-   Add classic menus to menu switcher. ([38168](https://github.com/WordPress/gutenberg/pull/38168))
+-   Always allow accessing edit.php?post_type=wp_navigation page. ([38170](https://github.com/WordPress/gutenberg/pull/38170))
+-   Fix Post Date block escaping of date HTML. ([38023](https://github.com/WordPress/gutenberg/pull/38023))
+-   Fix duotone render in non-fse themes. ([37954](https://github.com/WordPress/gutenberg/pull/37954))
+-   Social Icons: Fix color picker bug when set to Logos Only. ([38006](https://github.com/WordPress/gutenberg/pull/38006))
+-   Temporarily remove text decoration from Nav block. ([37963](https://github.com/WordPress/gutenberg/pull/37963))
+-   [Query Loop]: Reorganise inspector controls + `order` selection bug. ([37949](https://github.com/WordPress/gutenberg/pull/37949))
+-   Revert "Late escape RSS block (#37878)". ([38117](https://github.com/WordPress/gutenberg/pull/38117))
+-   Fix missing default `align-items` when items are oriented vertically in `flex` layout. ([38069](https://github.com/WordPress/gutenberg/pull/38069))
+-   Update `micromodal` to 0.4.10 to fix navigation close button. ([38032](https://github.com/WordPress/gutenberg/pull/38032))
 
 #### Site Editor
 
-*   Fix empty gray circle when site has no logo on template list page. ([37474](https://github.com/WordPress/gutenberg/pull/37474))
-*   Fix hiding the bottom of tablet/mobile preview in Site Editor. ([38019](https://github.com/WordPress/gutenberg/pull/38019))
-*   Fix resizable box scrollbars in blocks. ([38123](https://github.com/WordPress/gutenberg/pull/38123))
-*   Override Site Editor URLs to use plugin page. ([38232](https://github.com/WordPress/gutenberg/pull/38232))
-*   Restore ?styles=open functionality. ([38093](https://github.com/WordPress/gutenberg/pull/38093))
-*   Site Editor: Fix Inserter classes. ([38112](https://github.com/WordPress/gutenberg/pull/38112))
+-   Fix empty gray circle when site has no logo on template list page. ([37474](https://github.com/WordPress/gutenberg/pull/37474))
+-   Fix hiding the bottom of tablet/mobile preview in Site Editor. ([38019](https://github.com/WordPress/gutenberg/pull/38019))
+-   Fix resizable box scrollbars in blocks. ([38123](https://github.com/WordPress/gutenberg/pull/38123))
+-   Override Site Editor URLs to use plugin page. ([38232](https://github.com/WordPress/gutenberg/pull/38232))
+-   Restore ?styles=open functionality. ([38093](https://github.com/WordPress/gutenberg/pull/38093))
+-   Site Editor: Fix Inserter classes. ([38112](https://github.com/WordPress/gutenberg/pull/38112))
 
 #### Block Editor
 
-*   Fix pattern preview expanding height and scrollbar issues. ([38175](https://github.com/WordPress/gutenberg/pull/38175))
-*   Remove warning for enqueued styles in Editor. ([37937](https://github.com/WordPress/gutenberg/pull/37937))
-*   Fix draft previews. ([37952](https://github.com/WordPress/gutenberg/pull/37952))
-*   Add context to font style and font weight related translation strings. ([37939](https://github.com/WordPress/gutenberg/pull/37939))
+-   Fix pattern preview expanding height and scrollbar issues. ([38175](https://github.com/WordPress/gutenberg/pull/38175))
+-   Remove warning for enqueued styles in Editor. ([37937](https://github.com/WordPress/gutenberg/pull/37937))
+-   Fix draft previews. ([37952](https://github.com/WordPress/gutenberg/pull/37952))
+-   Add context to font style and font weight related translation strings. ([37939](https://github.com/WordPress/gutenberg/pull/37939))
 
 #### Post Editor
 
-*   Editor: Fix post lock data inconsistency. ([37914](https://github.com/WordPress/gutenberg/pull/37914))
-*   Fix template queries. ([38070](https://github.com/WordPress/gutenberg/pull/38070))
+-   Editor: Fix post lock data inconsistency. ([37914](https://github.com/WordPress/gutenberg/pull/37914))
+-   Fix template queries. ([38070](https://github.com/WordPress/gutenberg/pull/38070))
 
 #### Block Library
 
-*   Latest Posts: Fix featured image alignment label position. ([38125](https://github.com/WordPress/gutenberg/pull/38125))
-*   Remove the aria-label from the site title block. ([38432](https://github.com/WordPress/gutenberg/pull/38432))
+-   Latest Posts: Fix featured image alignment label position. ([38125](https://github.com/WordPress/gutenberg/pull/38125))
+-   Remove the aria-label from the site title block. ([38432](https://github.com/WordPress/gutenberg/pull/38432))
 
 #### Components
 
-*   Increase ConfirmDialog overlay's z-index to render above popovers. ([37959](https://github.com/WordPress/gutenberg/pull/37959))
-*   Label components: Improve consistency by setting to 8px margin-bottom. ([37844](https://github.com/WordPress/gutenberg/pull/37844))
-*   RangeControl: Fix space between icons and rail. ([36935](https://github.com/WordPress/gutenberg/pull/36935))
-*   `SelectControl`: Mark the `children` prop as optional. ([37872](https://github.com/WordPress/gutenberg/pull/37872))
-*   `ToggleGroupControl`: Remove animated backdrop. ([38008](https://github.com/WordPress/gutenberg/pull/38008))
+-   Increase ConfirmDialog overlay's z-index to render above popovers. ([37959](https://github.com/WordPress/gutenberg/pull/37959))
+-   Label components: Improve consistency by setting to 8px margin-bottom. ([37844](https://github.com/WordPress/gutenberg/pull/37844))
+-   RangeControl: Fix space between icons and rail. ([36935](https://github.com/WordPress/gutenberg/pull/36935))
+-   `SelectControl`: Mark the `children` prop as optional. ([37872](https://github.com/WordPress/gutenberg/pull/37872))
+-   `ToggleGroupControl`: Remove animated backdrop. ([38008](https://github.com/WordPress/gutenberg/pull/38008))
 
 #### Design Tools
 
-*   Fix: Double border on palette editor. ([38035](https://github.com/WordPress/gutenberg/pull/38035))
-*   Fix: PanelColorSettings renders an empty when a color setting is falsy. ([38029](https://github.com/WordPress/gutenberg/pull/38029))
+-   Fix: Double border on palette editor. ([38035](https://github.com/WordPress/gutenberg/pull/38035))
+-   Fix: PanelColorSettings renders an empty when a color setting is falsy. ([38029](https://github.com/WordPress/gutenberg/pull/38029))
 
 #### Accessibility
 
-*   Make sure when on last block focus cannot enter the block. ([37965](https://github.com/WordPress/gutenberg/pull/37965))
-*   Tree Grid: Fix keyboard navigation for expand/collapse table rows in Firefox. ([37983](https://github.com/WordPress/gutenberg/pull/37983))
+-   Make sure when on last block focus cannot enter the block. ([37965](https://github.com/WordPress/gutenberg/pull/37965))
+-   Tree Grid: Fix keyboard navigation for expand/collapse table rows in Firefox. ([37983](https://github.com/WordPress/gutenberg/pull/37983))
 
 #### Data API
 
-*   Load the entities list using the view context. ([37685](https://github.com/WordPress/gutenberg/pull/37685))
-*   Fix inconsistent response when preloading OPTIONS type requests. ([38051](https://github.com/WordPress/gutenberg/pull/38051))
+-   Load the entities list using the view context. ([37685](https://github.com/WordPress/gutenberg/pull/37685))
+-   Fix inconsistent response when preloading OPTIONS type requests. ([38051](https://github.com/WordPress/gutenberg/pull/38051))
 
 #### Widgets Editor
 
-*   Fix empty secondary sidebar overlapping widget editor content on mobile viewports. ([38017](https://github.com/WordPress/gutenberg/pull/38017))
+-   Fix empty secondary sidebar overlapping widget editor content on mobile viewports. ([38017](https://github.com/WordPress/gutenberg/pull/38017))
 
 #### Developer Tooling
 
-*   Docgen/stop crashing on missing return types. ([37929](https://github.com/WordPress/gutenberg/pull/37929))
-*   Add temporary workaround to fix broken common js import of mini-css-extract-plugin. ([38004](https://github.com/WordPress/gutenberg/pull/38004))
-*   Fix back button aria name in customizing widgets tests. ([38195](https://github.com/WordPress/gutenberg/pull/38195))
+-   Docgen/stop crashing on missing return types. ([37929](https://github.com/WordPress/gutenberg/pull/37929))
+-   Add temporary workaround to fix broken common js import of mini-css-extract-plugin. ([38004](https://github.com/WordPress/gutenberg/pull/38004))
+-   Fix back button aria name in customizing widgets tests. ([38195](https://github.com/WordPress/gutenberg/pull/38195))
 
 #### Mobile
 
-*   Mobile - Highlight text - Force format for some edge cases. ([37915](https://github.com/WordPress/gutenberg/pull/37915))
-*   Send non-deprecated language tags from Android in initialProps. ([37565](https://github.com/WordPress/gutenberg/pull/37565))
-*   Wrap long cell labels on Android. ([37993](https://github.com/WordPress/gutenberg/pull/37993))
+-   Mobile - Highlight text - Force format for some edge cases. ([37915](https://github.com/WordPress/gutenberg/pull/37915))
+-   Send non-deprecated language tags from Android in initialProps. ([37565](https://github.com/WordPress/gutenberg/pull/37565))
+-   Wrap long cell labels on Android. ([37993](https://github.com/WordPress/gutenberg/pull/37993))
 
 ### Performance
 
 #### Plugin
 
-*   Don't use WP_Query::Get_posts directly. ([38104](https://github.com/WordPress/gutenberg/pull/38104))
+-   Don't use WP_Query::Get_posts directly. ([38104](https://github.com/WordPress/gutenberg/pull/38104))
 
 #### Components
 
-*   ToolsPanel: Memoize callbacks and context to prevent unnecessary rerenders. ([38037](https://github.com/WordPress/gutenberg/pull/38037))
+-   ToolsPanel: Memoize callbacks and context to prevent unnecessary rerenders. ([38037](https://github.com/WordPress/gutenberg/pull/38037))
 
 ### Documentation
 
-*   Add anchors to all terms of the glossary. ([38073](https://github.com/WordPress/gutenberg/pull/38073))
-*   Add documentation for useBlockEditContext hook. ([36299](https://github.com/WordPress/gutenberg/pull/36299))
-*   Add note about "local styles" in the glossary. ([38083](https://github.com/WordPress/gutenberg/pull/38083))
-*   Add some terms related to styles to the glossary. ([38076](https://github.com/WordPress/gutenberg/pull/38076))
-*   Add theme.json v1 reference and v1 to v2 migration documentation. ([37886](https://github.com/WordPress/gutenberg/pull/37886))
-*   Block API Reference: Fix 'isSelected' property type. ([38161](https://github.com/WordPress/gutenberg/pull/38161))
-*   Capitalise the GitHub wordmark correctly in the Wordpress Gutenberg project. ([38092](https://github.com/WordPress/gutenberg/pull/38092))
-*   Component: Update color-picker documentation. ([38010](https://github.com/WordPress/gutenberg/pull/38010))
-*   Document that `__experimentalSelector` requires server-side block registration. ([37984](https://github.com/WordPress/gutenberg/pull/37984))
-*   Document the Global Styles Presets. ([38129](https://github.com/WordPress/gutenberg/pull/38129))
-*   Fix documentation regression. ([38235](https://github.com/WordPress/gutenberg/pull/38235))
-*   Include partialRight import from lodash in DimensionControl example. ([38088](https://github.com/WordPress/gutenberg/pull/38088))
-*   Multiple typos fixed. ([38071](https://github.com/WordPress/gutenberg/pull/38071))
-*   Scripts: Corrected "npm start:Hot" in the README file. ([38178](https://github.com/WordPress/gutenberg/pull/38178))
-*   Update Block Supports Documentation to better reflect how it works. ([37847](https://github.com/WordPress/gutenberg/pull/37847))
-*   Update BlockPreview component readme. ([38209](https://github.com/WordPress/gutenberg/pull/38209))
-*   Update versions for 5.8.2 and 5.8.3\. ([37924](https://github.com/WordPress/gutenberg/pull/37924))
-*   Use consistent punctuation, capitalization in templateParts documentation. ([38193](https://github.com/WordPress/gutenberg/pull/38193))
-*   [Type] Documentation Updating Faq.md typo. ([38154](https://github.com/WordPress/gutenberg/pull/38154))
+-   Add anchors to all terms of the glossary. ([38073](https://github.com/WordPress/gutenberg/pull/38073))
+-   Add documentation for useBlockEditContext hook. ([36299](https://github.com/WordPress/gutenberg/pull/36299))
+-   Add note about "local styles" in the glossary. ([38083](https://github.com/WordPress/gutenberg/pull/38083))
+-   Add some terms related to styles to the glossary. ([38076](https://github.com/WordPress/gutenberg/pull/38076))
+-   Add theme.json v1 reference and v1 to v2 migration documentation. ([37886](https://github.com/WordPress/gutenberg/pull/37886))
+-   Block API Reference: Fix 'isSelected' property type. ([38161](https://github.com/WordPress/gutenberg/pull/38161))
+-   Capitalise the GitHub wordmark correctly in the Wordpress Gutenberg project. ([38092](https://github.com/WordPress/gutenberg/pull/38092))
+-   Component: Update color-picker documentation. ([38010](https://github.com/WordPress/gutenberg/pull/38010))
+-   Document that `__experimentalSelector` requires server-side block registration. ([37984](https://github.com/WordPress/gutenberg/pull/37984))
+-   Document the Global Styles Presets. ([38129](https://github.com/WordPress/gutenberg/pull/38129))
+-   Fix documentation regression. ([38235](https://github.com/WordPress/gutenberg/pull/38235))
+-   Include partialRight import from lodash in DimensionControl example. ([38088](https://github.com/WordPress/gutenberg/pull/38088))
+-   Multiple typos fixed. ([38071](https://github.com/WordPress/gutenberg/pull/38071))
+-   Scripts: Corrected "npm start:Hot" in the README file. ([38178](https://github.com/WordPress/gutenberg/pull/38178))
+-   Update Block Supports Documentation to better reflect how it works. ([37847](https://github.com/WordPress/gutenberg/pull/37847))
+-   Update BlockPreview component readme. ([38209](https://github.com/WordPress/gutenberg/pull/38209))
+-   Update versions for 5.8.2 and 5.8.3\. ([37924](https://github.com/WordPress/gutenberg/pull/37924))
+-   Use consistent punctuation, capitalization in templateParts documentation. ([38193](https://github.com/WordPress/gutenberg/pull/38193))
+-   [Type] Documentation Updating Faq.md typo. ([38154](https://github.com/WordPress/gutenberg/pull/38154))
 
 ### Code Quality
 
-*   Compose: Rework types of createHigherOrderComponent for closer match to API. ([37795](https://github.com/WordPress/gutenberg/pull/37795))
-*   Docblock typos. ([38067](https://github.com/WordPress/gutenberg/pull/38067))
-*   Fix two inline typos. ([38048](https://github.com/WordPress/gutenberg/pull/38048))
-*   Testing: Upgrade Jest to v27\. ([33287](https://github.com/WordPress/gutenberg/pull/33287))
-*   Add a missing `@since` tag. ([38151](https://github.com/WordPress/gutenberg/pull/38151))
-*   Ignore local environment .tool-versions configuration file. ([38013](https://github.com/WordPress/gutenberg/pull/38013))
-*   Add allowed-plugins in composer configuration. ([38085](https://github.com/WordPress/gutenberg/pull/38085))
-*   Site editor - try redirecting to homepage before the react render. ([37248](https://github.com/WordPress/gutenberg/pull/37248))
-
-#### Block Library
-
-*   Allow for HTML in `get_the_title`. ([38145](https://github.com/WordPress/gutenberg/pull/38145))
-*   Fix double escaping in blocks. ([37985](https://github.com/WordPress/gutenberg/pull/37985))
-*   Late escape Latest Posts block. ([37866](https://github.com/WordPress/gutenberg/pull/37866))
-*   Late escape Navigation blocks. ([37870](https://github.com/WordPress/gutenberg/pull/37870))
-*   Late escape Post blocks. ([37876](https://github.com/WordPress/gutenberg/pull/37876))
-*   Late escape Social block. ([37881](https://github.com/WordPress/gutenberg/pull/37881))
-*   Late escape comment blocks. ([37860](https://github.com/WordPress/gutenberg/pull/37860))
-*   Late escape comments link block. ([37875](https://github.com/WordPress/gutenberg/pull/37875))
-*   Late escape latest comments block. ([37865](https://github.com/WordPress/gutenberg/pull/37865))
-*   Late escape post author blocks. ([37874](https://github.com/WordPress/gutenberg/pull/37874))
-*   Late escape site blocks. ([37880](https://github.com/WordPress/gutenberg/pull/37880))
-*   Spacer: No need to use withDispatch HOC. ([38206](https://github.com/WordPress/gutenberg/pull/38206))
+-   Compose: Rework types of createHigherOrderComponent for closer match to API. ([37795](https://github.com/WordPress/gutenberg/pull/37795))
+-   Docblock typos. ([38067](https://github.com/WordPress/gutenberg/pull/38067))
+-   Fix two inline typos. ([38048](https://github.com/WordPress/gutenberg/pull/38048))
+-   Testing: Upgrade Jest to v27\. ([33287](https://github.com/WordPress/gutenberg/pull/33287))
+-   Add a missing `@since` tag. ([38151](https://github.com/WordPress/gutenberg/pull/38151))
+-   Ignore local environment .tool-versions configuration file. ([38013](https://github.com/WordPress/gutenberg/pull/38013))
+-   Add allowed-plugins in composer configuration. ([38085](https://github.com/WordPress/gutenberg/pull/38085))
+-   Site editor - try redirecting to homepage before the react render. ([37248](https://github.com/WordPress/gutenberg/pull/37248))
+
+#### Block Library
+
+-   Allow for HTML in `get_the_title`. ([38145](https://github.com/WordPress/gutenberg/pull/38145))
+-   Fix double escaping in blocks. ([37985](https://github.com/WordPress/gutenberg/pull/37985))
+-   Late escape Latest Posts block. ([37866](https://github.com/WordPress/gutenberg/pull/37866))
+-   Late escape Navigation blocks. ([37870](https://github.com/WordPress/gutenberg/pull/37870))
+-   Late escape Post blocks. ([37876](https://github.com/WordPress/gutenberg/pull/37876))
+-   Late escape Social block. ([37881](https://github.com/WordPress/gutenberg/pull/37881))
+-   Late escape comment blocks. ([37860](https://github.com/WordPress/gutenberg/pull/37860))
+-   Late escape comments link block. ([37875](https://github.com/WordPress/gutenberg/pull/37875))
+-   Late escape latest comments block. ([37865](https://github.com/WordPress/gutenberg/pull/37865))
+-   Late escape post author blocks. ([37874](https://github.com/WordPress/gutenberg/pull/37874))
+-   Late escape site blocks. ([37880](https://github.com/WordPress/gutenberg/pull/37880))
+-   Spacer: No need to use withDispatch HOC. ([38206](https://github.com/WordPress/gutenberg/pull/38206))
 
 ### Tools
 
-*   Bump dot-prop from 4.2.0 to 4.2.1\. ([38101](https://github.com/WordPress/gutenberg/pull/38101))
-*   Bump ini from 1.3.5 to 1.3.8\. ([38106](https://github.com/WordPress/gutenberg/pull/38106))
-*   Bump tar from 4.4.13 to 4.4.19\. ([37917](https://github.com/WordPress/gutenberg/pull/37917))
-*   Bump tree-kill from 1.2.0 to 1.2.2\. ([38102](https://github.com/WordPress/gutenberg/pull/38102))
-*   Bump trim-off-newlines from 1.0.1 to 1.0.3\. ([38095](https://github.com/WordPress/gutenberg/pull/38095))
-*   Update MiniCSSExtractPlugin to version 2.5.1\. ([38027](https://github.com/WordPress/gutenberg/pull/38027))
-*   Bump follow-redirects from 1.14.1 to 1.14.7\. ([37957](https://github.com/WordPress/gutenberg/pull/37957))
-*   Bump handlebars from 4.7.6 to 4.7.7\. ([38054](https://github.com/WordPress/gutenberg/pull/38054))
-*   Bump path-parse from 1.0.5 to 1.0.7\. ([37990](https://github.com/WordPress/gutenberg/pull/37990))
-*   Bump tmpl from 1.0.4 to 1.0.5\. ([37916](https://github.com/WordPress/gutenberg/pull/37916))
-*   Add '.git-blame-ignore-revs' to the project. ([37822](https://github.com/WordPress/gutenberg/pull/37822))
-*   Require stylelint v14 for stylelint configuration and scripts. ([38091](https://github.com/WordPress/gutenberg/pull/38091))
-*   Tested up to WP 5.9\. ([38162](https://github.com/WordPress/gutenberg/pull/38162))
+-   Bump dot-prop from 4.2.0 to 4.2.1\. ([38101](https://github.com/WordPress/gutenberg/pull/38101))
+-   Bump ini from 1.3.5 to 1.3.8\. ([38106](https://github.com/WordPress/gutenberg/pull/38106))
+-   Bump tar from 4.4.13 to 4.4.19\. ([37917](https://github.com/WordPress/gutenberg/pull/37917))
+-   Bump tree-kill from 1.2.0 to 1.2.2\. ([38102](https://github.com/WordPress/gutenberg/pull/38102))
+-   Bump trim-off-newlines from 1.0.1 to 1.0.3\. ([38095](https://github.com/WordPress/gutenberg/pull/38095))
+-   Update MiniCSSExtractPlugin to version 2.5.1\. ([38027](https://github.com/WordPress/gutenberg/pull/38027))
+-   Bump follow-redirects from 1.14.1 to 1.14.7\. ([37957](https://github.com/WordPress/gutenberg/pull/37957))
+-   Bump handlebars from 4.7.6 to 4.7.7\. ([38054](https://github.com/WordPress/gutenberg/pull/38054))
+-   Bump path-parse from 1.0.5 to 1.0.7\. ([37990](https://github.com/WordPress/gutenberg/pull/37990))
+-   Bump tmpl from 1.0.4 to 1.0.5\. ([37916](https://github.com/WordPress/gutenberg/pull/37916))
+-   Add '.git-blame-ignore-revs' to the project. ([37822](https://github.com/WordPress/gutenberg/pull/37822))
+-   Require stylelint v14 for stylelint configuration and scripts. ([38091](https://github.com/WordPress/gutenberg/pull/38091))
+-   Tested up to WP 5.9\. ([38162](https://github.com/WordPress/gutenberg/pull/38162))
 
 #### Testing
 
-*   Fix flaky Nav block user permissions end-to-end test. ([38025](https://github.com/WordPress/gutenberg/pull/38025))
-*   Fix flaky classic block conversion undo test. ([37933](https://github.com/WordPress/gutenberg/pull/37933))
-*   Improve flaky draft creation navigation block end-to-end test. ([37931](https://github.com/WordPress/gutenberg/pull/37931))
-*   Skip flaky nav permissions test until fixed. ([38099](https://github.com/WordPress/gutenberg/pull/38099))
-*   [docgen] Refactor code to use require() instead of JSON.parse(fs.readFileSync()). ([38148](https://github.com/WordPress/gutenberg/pull/38148))
-*   end-to-end Tests: Add coverage for reusable blocks save button state regression. ([33151](https://github.com/WordPress/gutenberg/pull/33151))
-*   Add new Testing Instructions section to PR template. ([38147](https://github.com/WordPress/gutenberg/pull/38147))
-
-
-
+-   Fix flaky Nav block user permissions end-to-end test. ([38025](https://github.com/WordPress/gutenberg/pull/38025))
+-   Fix flaky classic block conversion undo test. ([37933](https://github.com/WordPress/gutenberg/pull/37933))
+-   Improve flaky draft creation navigation block end-to-end test. ([37931](https://github.com/WordPress/gutenberg/pull/37931))
+-   Skip flaky nav permissions test until fixed. ([38099](https://github.com/WordPress/gutenberg/pull/38099))
+-   [docgen] Refactor code to use require() instead of JSON.parse(fs.readFileSync()). ([38148](https://github.com/WordPress/gutenberg/pull/38148))
+-   end-to-end Tests: Add coverage for reusable blocks save button state regression. ([33151](https://github.com/WordPress/gutenberg/pull/33151))
+-   Add new Testing Instructions section to PR template. ([38147](https://github.com/WordPress/gutenberg/pull/38147))
 
 = 12.4.1 =
 
+## Changelog
+
 ### Bug Fixes
 
 #### Block Library
-- RSS: Reverts the late escape RSS block enhancement (#37878) to resolve an issue where raw HTML was shown to users of the RSS block (#38117)
 
+-   RSS: Reverts the late escape RSS block enhancement (#37878) to resolve an issue where raw HTML was shown to users of the RSS block (#38117)
 
 = 12.4.0 =
 
-
+## Changelog
 
 ### Enhancements
 
 #### Accessibility
-- Accessibility improvements for Block Inserter. ([37357](https://github.com/WordPress/gutenberg/pull/37357))
-- Try possibly better method for Block Inserter Search focus. ([37793](https://github.com/WordPress/gutenberg/pull/37793))
-- Accessibility improvements for List View Part 1. ([37798](https://github.com/WordPress/gutenberg/pull/37798))
-- Improve successful draft save notification for screen readers. ([37683](https://github.com/WordPress/gutenberg/pull/37683))
+
+-   Accessibility improvements for Block Inserter. ([37357](https://github.com/WordPress/gutenberg/pull/37357))
+-   Try possibly better method for Block Inserter Search focus. ([37793](https://github.com/WordPress/gutenberg/pull/37793))
+-   Accessibility improvements for List View Part 1. ([37798](https://github.com/WordPress/gutenberg/pull/37798))
+-   Improve successful draft save notification for screen readers. ([37683](https://github.com/WordPress/gutenberg/pull/37683))
 
 #### Block Library
-- Audio: Add uploading state. ([37739](https://github.com/WordPress/gutenberg/pull/37739))
-- Post Excerpt: Add to and from Post Content transformations. ([37651](https://github.com/WordPress/gutenberg/pull/37651))
-- Search: Improve escaping on the search block. ([37829](https://github.com/WordPress/gutenberg/pull/37829))
-- Page List: Add menu-item-home class to Navigation for front page. ([37301](https://github.com/WordPress/gutenberg/pull/37301))
-- Tag Cloud: Add outline style. ([37092](https://github.com/WordPress/gutenberg/pull/37092))
+
+-   Audio: Add uploading state. ([37739](https://github.com/WordPress/gutenberg/pull/37739))
+-   Post Excerpt: Add to and from Post Content transformations. ([37651](https://github.com/WordPress/gutenberg/pull/37651))
+-   Search: Improve escaping on the search block. ([37829](https://github.com/WordPress/gutenberg/pull/37829))
+-   Page List: Add menu-item-home class to Navigation for front page. ([37301](https://github.com/WordPress/gutenberg/pull/37301))
+-   Tag Cloud: Add outline style. ([37092](https://github.com/WordPress/gutenberg/pull/37092))
 
 #### Components
-- ExternalLink: Update icon to be smaller, have no margin. ([37859](https://github.com/WordPress/gutenberg/pull/37859))
+
+-   ExternalLink: Update icon to be smaller, have no margin. ([37859](https://github.com/WordPress/gutenberg/pull/37859))
 
 #### Post Editor
-- PostLockedModal: Display preview link as part of the text. ([37852](https://github.com/WordPress/gutenberg/pull/37852))
-- Try: Polish post takeover modal. ([37821](https://github.com/WordPress/gutenberg/pull/37821))
-- Suggest picking a category on the pre-publish panel. ([37703](https://github.com/WordPress/gutenberg/pull/37703))
+
+-   PostLockedModal: Display preview link as part of the text. ([37852](https://github.com/WordPress/gutenberg/pull/37852))
+-   Try: Polish post takeover modal. ([37821](https://github.com/WordPress/gutenberg/pull/37821))
+-   Suggest picking a category on the pre-publish panel. ([37703](https://github.com/WordPress/gutenberg/pull/37703))
 
 #### Block Editor
-- Inserter: Update categories for theme blocks. ([37723](https://github.com/WordPress/gutenberg/pull/37723))
+
+-   Inserter: Update categories for theme blocks. ([37723](https://github.com/WordPress/gutenberg/pull/37723))
 
 #### Site Editor
-- Add keyboard shortcut help modal. ([37650](https://github.com/WordPress/gutenberg/pull/37650))
-- Update copy on Snackbar that appears when a template is deleted. ([37888](https://github.com/WordPress/gutenberg/pull/37888))
+
+-   Add keyboard shortcut help modal. ([37650](https://github.com/WordPress/gutenberg/pull/37650))
+-   Update copy on Snackbar that appears when a template is deleted. ([37888](https://github.com/WordPress/gutenberg/pull/37888))
 
 #### Icons
-- Add unlock icon. ([37855](https://github.com/WordPress/gutenberg/pull/37855))
-
-### Bug Fixes
-
-#### Block Library
-- Code: Remove color from code theme.scss. ([37816](https://github.com/WordPress/gutenberg/pull/37816))
-- Code: Try: Polish code styles to properly apply border properties. ([37818](https://github.com/WordPress/gutenberg/pull/37818))
-- Columns: Avoid using CSS variables for block gap styles. ([37436](https://github.com/WordPress/gutenberg/pull/37436))
-- Comments Pagination Next: Fix accidental division by zero. ([37788](https://github.com/WordPress/gutenberg/pull/37788))
-- Gallery: Pass any custom attributes through the gallery v2 migration script. ([37812](https://github.com/WordPress/gutenberg/pull/37812))
-- Gallery: Remove warning notice about mobile version required. ([37842](https://github.com/WordPress/gutenberg/pull/37842))
-- Navigation: HTML tags like inline images in nav links break submenu layout. ([37665](https://github.com/WordPress/gutenberg/pull/37665))
-- Navigation: Set the default for --navigation-layout-align to "flex-start" when using vertical orientation. ([37696](https://github.com/WordPress/gutenberg/pull/37696))
-- Navigation: Fix overlay menu errant focus style on scrim. ([37824](https://github.com/WordPress/gutenberg/pull/37824))
-- Page List: Show UI warning if Pages cannot be retrieved in Page List block. ([37486](https://github.com/WordPress/gutenberg/pull/37486))
-- Page List: Update page list flex variables to match navigation. ([37718](https://github.com/WordPress/gutenberg/pull/37718))
-- Post Comments: Tidy up Post Comments default styling. ([37709](https://github.com/WordPress/gutenberg/pull/37709))
-- Post Content: Check for nextpage to display page links for paginated posts. ([37672](https://github.com/WordPress/gutenberg/pull/37672))
-- Post Excerpt: Fix previews. ([37648](https://github.com/WordPress/gutenberg/pull/37648))
-- Query Loop: Use `gap` for the `grid` view. ([37711](https://github.com/WordPress/gutenberg/pull/37711))
-- Query Loop: Check for `zero` `queryId` on initialization. ([37867](https://github.com/WordPress/gutenberg/pull/37867))
-- Site logo: Fix range control on landscape logos. ([37733](https://github.com/WordPress/gutenberg/pull/37733))
-- Simplify and unify a few modal dialogs. ([37857](https://github.com/WordPress/gutenberg/pull/37857))
-- Fix enqueueing additional styles for blocks only when rendered. ([37848](https://github.com/WordPress/gutenberg/pull/37848))
-- Fix typo (hanle -> handle). ([37849](https://github.com/WordPress/gutenberg/pull/37849))
-- Revert "[Paragraph Block] add font family support". ([37815](https://github.com/WordPress/gutenberg/pull/37815))
+
+-   Add unlock icon. ([37855](https://github.com/WordPress/gutenberg/pull/37855))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Code: Remove color from code theme.scss. ([37816](https://github.com/WordPress/gutenberg/pull/37816))
+-   Code: Try: Polish code styles to properly apply border properties. ([37818](https://github.com/WordPress/gutenberg/pull/37818))
+-   Columns: Avoid using CSS variables for block gap styles. ([37436](https://github.com/WordPress/gutenberg/pull/37436))
+-   Comments Pagination Next: Fix accidental division by zero. ([37788](https://github.com/WordPress/gutenberg/pull/37788))
+-   Gallery: Pass any custom attributes through the gallery v2 migration script. ([37812](https://github.com/WordPress/gutenberg/pull/37812))
+-   Gallery: Remove warning notice about mobile version required. ([37842](https://github.com/WordPress/gutenberg/pull/37842))
+-   Navigation: HTML tags like inline images in nav links break submenu layout. ([37665](https://github.com/WordPress/gutenberg/pull/37665))
+-   Navigation: Set the default for --navigation-layout-align to "flex-start" when using vertical orientation. ([37696](https://github.com/WordPress/gutenberg/pull/37696))
+-   Navigation: Fix overlay menu errant focus style on scrim. ([37824](https://github.com/WordPress/gutenberg/pull/37824))
+-   Page List: Show UI warning if Pages cannot be retrieved in Page List block. ([37486](https://github.com/WordPress/gutenberg/pull/37486))
+-   Page List: Update page list flex variables to match navigation. ([37718](https://github.com/WordPress/gutenberg/pull/37718))
+-   Post Comments: Tidy up Post Comments default styling. ([37709](https://github.com/WordPress/gutenberg/pull/37709))
+-   Post Content: Check for nextpage to display page links for paginated posts. ([37672](https://github.com/WordPress/gutenberg/pull/37672))
+-   Post Excerpt: Fix previews. ([37648](https://github.com/WordPress/gutenberg/pull/37648))
+-   Query Loop: Use `gap` for the `grid` view. ([37711](https://github.com/WordPress/gutenberg/pull/37711))
+-   Query Loop: Check for `zero` `queryId` on initialization. ([37867](https://github.com/WordPress/gutenberg/pull/37867))
+-   Site logo: Fix range control on landscape logos. ([37733](https://github.com/WordPress/gutenberg/pull/37733))
+-   Simplify and unify a few modal dialogs. ([37857](https://github.com/WordPress/gutenberg/pull/37857))
+-   Fix enqueueing additional styles for blocks only when rendered. ([37848](https://github.com/WordPress/gutenberg/pull/37848))
+-   Fix typo (hanle -> handle). ([37849](https://github.com/WordPress/gutenberg/pull/37849))
+-   Revert "[Paragraph Block] add font family support". ([37815](https://github.com/WordPress/gutenberg/pull/37815))
 
 #### Colors
-- Coloring panel is unusable in RTL. ([37644](https://github.com/WordPress/gutenberg/pull/37644))
-- Impossible to clear colors if color palettes are removed. ([37791](https://github.com/WordPress/gutenberg/pull/37791))
-- Use useCallback hook from @wordpress/elements in color-picker. ([37745](https://github.com/WordPress/gutenberg/pull/37745))
+
+-   Coloring panel is unusable in RTL. ([37644](https://github.com/WordPress/gutenberg/pull/37644))
+-   Impossible to clear colors if color palettes are removed. ([37791](https://github.com/WordPress/gutenberg/pull/37791))
+-   Use useCallback hook from @wordpress/elements in color-picker. ([37745](https://github.com/WordPress/gutenberg/pull/37745))
 
 #### Components
-- BaseControl: Fix VisualLabel styles. ([37747](https://github.com/WordPress/gutenberg/pull/37747))
-- ConfirmDialog: Use hooks from @wordpress/elements. ([37771](https://github.com/WordPress/gutenberg/pull/37771))
-- CustomSelectControl: Stop keypresses being caught by other elements when they happen. ([30557](https://github.com/WordPress/gutenberg/pull/30557))
+
+-   BaseControl: Fix VisualLabel styles. ([37747](https://github.com/WordPress/gutenberg/pull/37747))
+-   ConfirmDialog: Use hooks from @wordpress/elements. ([37771](https://github.com/WordPress/gutenberg/pull/37771))
+-   CustomSelectControl: Stop keypresses being caught by other elements when they happen. ([30557](https://github.com/WordPress/gutenberg/pull/30557))
 
 #### Post Editor
-- Restore canvas padding for classic themes. ([37741](https://github.com/WordPress/gutenberg/pull/37741))
+
+-   Restore canvas padding for classic themes. ([37741](https://github.com/WordPress/gutenberg/pull/37741))
 
 #### History
-- Fix broken 'Redo' by removing faulty logic for discarding unsaved Logo changes. ([37895](https://github.com/WordPress/gutenberg/pull/37895))
-- Fix redo after update/publish with transient edits. ([37840](https://github.com/WordPress/gutenberg/pull/37840))
+
+-   Fix broken 'Redo' by removing faulty logic for discarding unsaved Logo changes. ([37895](https://github.com/WordPress/gutenberg/pull/37895))
+-   Fix redo after update/publish with transient edits. ([37840](https://github.com/WordPress/gutenberg/pull/37840))
 
 #### Templates API
-- Fix Home template description typo. ([37843](https://github.com/WordPress/gutenberg/pull/37843))
-- Improve user experience with blocks editor when a block is not registered. ([37646](https://github.com/WordPress/gutenberg/pull/37646))
+
+-   Fix Home template description typo. ([37843](https://github.com/WordPress/gutenberg/pull/37843))
+-   Improve user experience with blocks editor when a block is not registered. ([37646](https://github.com/WordPress/gutenberg/pull/37646))
 
 #### Block Editor
-- Fix LinkPicker freeze when virtual keyboard is hidden. ([37782](https://github.com/WordPress/gutenberg/pull/37782))
-- RichText: Fix dead key input on Windows. ([37777](https://github.com/WordPress/gutenberg/pull/37777))
-- Link control: Translate empty link string. ([36975](https://github.com/WordPress/gutenberg/pull/36975))
-- Add `post-type-x` classname to iframe. ([37429](https://github.com/WordPress/gutenberg/pull/37429))
+
+-   Fix LinkPicker freeze when virtual keyboard is hidden. ([37782](https://github.com/WordPress/gutenberg/pull/37782))
+-   RichText: Fix dead key input on Windows. ([37777](https://github.com/WordPress/gutenberg/pull/37777))
+-   Link control: Translate empty link string. ([36975](https://github.com/WordPress/gutenberg/pull/36975))
+-   Add `post-type-x` classname to iframe. ([37429](https://github.com/WordPress/gutenberg/pull/37429))
 
 #### Global Styles
-- Reduce specificity of legacy font sizes defined by core. ([37819](https://github.com/WordPress/gutenberg/pull/37819))
+
+-   Reduce specificity of legacy font sizes defined by core. ([37819](https://github.com/WordPress/gutenberg/pull/37819))
 
 #### Accessibility
-- Fix aria-modal attribution with multiple navs on page. ([37813](https://github.com/WordPress/gutenberg/pull/37813))
+
+-   Fix aria-modal attribution with multiple navs on page. ([37813](https://github.com/WordPress/gutenberg/pull/37813))
 
 #### Template Editor
-- Template Mode: Trim long post titles in large viewports. ([37720](https://github.com/WordPress/gutenberg/pull/37720))
+
+-   Template Mode: Trim long post titles in large viewports. ([37720](https://github.com/WordPress/gutenberg/pull/37720))
 
 #### Site Editor
-- Add the "Help" link to the tools menu. ([37647](https://github.com/WordPress/gutenberg/pull/37647))
-- Contextualize "Export" string to differentiate it from other occurrences in WP Core. ([37660](https://github.com/WordPress/gutenberg/pull/37660))
 
+-   Add the "Help" link to the tools menu. ([37647](https://github.com/WordPress/gutenberg/pull/37647))
+-   Contextualize "Export" string to differentiate it from other occurrences in WP Core. ([37660](https://github.com/WordPress/gutenberg/pull/37660))
 
 ### Documentation
 
-- Block.json Schema: Update fontSize and lineHeight props. ([37853](https://github.com/WordPress/gutenberg/pull/37853))
-- Theme.json Schema: Fix appearanceTools in theme.json schema. ([37762](https://github.com/WordPress/gutenberg/pull/37762))
-- Theme.json Schema: Update theme.json schema to allow for per-block management of settings. ([36746](https://github.com/WordPress/gutenberg/pull/36746))
-- Add checkbox for updating schemas if appropriate. ([37780](https://github.com/WordPress/gutenberg/pull/37780))
-  - Fix issue template typo. ([37825](https://github.com/WordPress/gutenberg/pull/37825))
-- Add automated theme.json reference documentation. ([37569](https://github.com/WordPress/gutenberg/pull/37569))
-- Add link to block source for reference. ([37750](https://github.com/WordPress/gutenberg/pull/37750))
-- Add missing end tag for codetabs in stylesheet guide. ([37827](https://github.com/WordPress/gutenberg/pull/37827))
-- Fix broken URL on block variation page. ([37702](https://github.com/WordPress/gutenberg/pull/37702))
-- Fix type of saved $content. ([37688](https://github.com/WordPress/gutenberg/pull/37688))
-  - Fix type of saved content - part two. ([37740](https://github.com/WordPress/gutenberg/pull/37740))
-  - Fix PHPCS failure. ([37742](https://github.com/WordPress/gutenberg/pull/37742))
-- Update create block type how to guide for block.json. ([37674](https://github.com/WordPress/gutenberg/pull/37674))
-- Update stylesheets guide with using block.json file. ([37679](https://github.com/WordPress/gutenberg/pull/37679))
-- OSX Setup guide: Wrap `lts/*` in quotes for `nvm` commands. ([37722](https://github.com/WordPress/gutenberg/pull/37722))
-- Remove "experimental" from full site editing documentation. ([37655](https://github.com/WordPress/gutenberg/pull/37655))
-- Update copyright year to 2022 in `license.md`. ([37689](https://github.com/WordPress/gutenberg/pull/37689))
-- Update wp-plugin.md. ([37846](https://github.com/WordPress/gutenberg/pull/37846))
-- Updated ColorIndicator readme. ([37638](https://github.com/WordPress/gutenberg/pull/37638))
-- Update the Post Author block description. ([37836](https://github.com/WordPress/gutenberg/pull/37836))
-- Fixing broken links and adding colon. ([37664](https://github.com/WordPress/gutenberg/pull/37664))
-- Improve Gutenberg release documentation. ([37898](https://github.com/WordPress/gutenberg/pull/37898))
-
+-   Block.json Schema: Update fontSize and lineHeight props. ([37853](https://github.com/WordPress/gutenberg/pull/37853))
+-   Theme.json Schema: Fix appearanceTools in theme.json schema. ([37762](https://github.com/WordPress/gutenberg/pull/37762))
+-   Theme.json Schema: Update theme.json schema to allow for per-block management of settings. ([36746](https://github.com/WordPress/gutenberg/pull/36746))
+-   Add checkbox for updating schemas if appropriate. ([37780](https://github.com/WordPress/gutenberg/pull/37780))
+    -   Fix issue template typo. ([37825](https://github.com/WordPress/gutenberg/pull/37825))
+-   Add automated theme.json reference documentation. ([37569](https://github.com/WordPress/gutenberg/pull/37569))
+-   Add link to block source for reference. ([37750](https://github.com/WordPress/gutenberg/pull/37750))
+-   Add missing end tag for codetabs in stylesheet guide. ([37827](https://github.com/WordPress/gutenberg/pull/37827))
+-   Fix broken URL on block variation page. ([37702](https://github.com/WordPress/gutenberg/pull/37702))
+-   Fix type of saved $content. ([37688](https://github.com/WordPress/gutenberg/pull/37688))
+    -   Fix type of saved content - part two. ([37740](https://github.com/WordPress/gutenberg/pull/37740))
+    -   Fix PHPCS failure. ([37742](https://github.com/WordPress/gutenberg/pull/37742))
+-   Update create block type how to guide for block.json. ([37674](https://github.com/WordPress/gutenberg/pull/37674))
+-   Update stylesheets guide with using block.json file. ([37679](https://github.com/WordPress/gutenberg/pull/37679))
+-   OSX Setup guide: Wrap `lts/*` in quotes for `nvm` commands. ([37722](https://github.com/WordPress/gutenberg/pull/37722))
+-   Remove "experimental" from full site editing documentation. ([37655](https://github.com/WordPress/gutenberg/pull/37655))
+-   Update copyright year to 2022 in `license.md`. ([37689](https://github.com/WordPress/gutenberg/pull/37689))
+-   Update wp-plugin.md. ([37846](https://github.com/WordPress/gutenberg/pull/37846))
+-   Updated ColorIndicator readme. ([37638](https://github.com/WordPress/gutenberg/pull/37638))
+-   Update the Post Author block description. ([37836](https://github.com/WordPress/gutenberg/pull/37836))
+-   Fixing broken links and adding colon. ([37664](https://github.com/WordPress/gutenberg/pull/37664))
+-   Improve Gutenberg release documentation. ([37898](https://github.com/WordPress/gutenberg/pull/37898))
 
 ### Code Quality
 
-- Add the WP version in which some JS APIs will be removed. ([37854](https://github.com/WordPress/gutenberg/pull/37854))
+-   Add the WP version in which some JS APIs will be removed. ([37854](https://github.com/WordPress/gutenberg/pull/37854))
 
 #### Block Library
-- Late escape Categories block. ([37835](https://github.com/WordPress/gutenberg/pull/37835))
-- Late escape Page List block. ([37873](https://github.com/WordPress/gutenberg/pull/37873))
-- Late escape Query blocks. ([37877](https://github.com/WordPress/gutenberg/pull/37877))
-- Late escape RSS block. ([37878](https://github.com/WordPress/gutenberg/pull/37878))
-- Late escape Table of Contents block. ([37882](https://github.com/WordPress/gutenberg/pull/37882))
-- Late escape Search block. ([37879](https://github.com/WordPress/gutenberg/pull/37879))
-- Move escaping to point of output in Archives block. ([37834](https://github.com/WordPress/gutenberg/pull/37834))
-- Post Content: No need to pass default get_the_content args. ([37701](https://github.com/WordPress/gutenberg/pull/37701))
+
+-   Late escape Categories block. ([37835](https://github.com/WordPress/gutenberg/pull/37835))
+-   Late escape Page List block. ([37873](https://github.com/WordPress/gutenberg/pull/37873))
+-   Late escape Query blocks. ([37877](https://github.com/WordPress/gutenberg/pull/37877))
+-   Late escape RSS block. ([37878](https://github.com/WordPress/gutenberg/pull/37878))
+-   Late escape Table of Contents block. ([37882](https://github.com/WordPress/gutenberg/pull/37882))
+-   Late escape Search block. ([37879](https://github.com/WordPress/gutenberg/pull/37879))
+-   Move escaping to point of output in Archives block. ([37834](https://github.com/WordPress/gutenberg/pull/37834))
+-   Post Content: No need to pass default get_the_content args. ([37701](https://github.com/WordPress/gutenberg/pull/37701))
 
 #### Post Editor
-- PostLockedModal: Update action buttons markup. ([37837](https://github.com/WordPress/gutenberg/pull/37837))
+
+-   PostLockedModal: Update action buttons markup. ([37837](https://github.com/WordPress/gutenberg/pull/37837))
 
 #### Parsing
-- Block API: Separate validation stage during block parsing. ([37763](https://github.com/WordPress/gutenberg/pull/37763))
+
+-   Block API: Separate validation stage during block parsing. ([37763](https://github.com/WordPress/gutenberg/pull/37763))
 
 #### Components
-- Refactor SuggestionsList to use hooks and change class to function component. ([36924](https://github.com/WordPress/gutenberg/pull/36924))
 
+-   Refactor SuggestionsList to use hooks and change class to function component. ([36924](https://github.com/WordPress/gutenberg/pull/36924))
 
 ### Tools
 
 #### Testing
-- Allow type imports for React everywhere. ([37862](https://github.com/WordPress/gutenberg/pull/37862))
-- Change the performance job folder structure to avoid nested node_modules. ([37775](https://github.com/WordPress/gutenberg/pull/37775))
-- Fix flaky test by using waitForResponse to ensure the URL details request completes. ([37901](https://github.com/WordPress/gutenberg/pull/37901))
-- Marking test that consistently fails as skipped. ([37729](https://github.com/WordPress/gutenberg/pull/37729))
-
-#### Build Tooling
-- wp-env: Replace TT1-Blocks with Empty Theme in the wp-env of gutenberg and CI. ([37446](https://github.com/WordPress/gutenberg/pull/37446))
-- wp-env: Show `--help` when no subcommand is passed. ([32755](https://github.com/WordPress/gutenberg/pull/32755))
-- Scripts: Scan `block.json` files to detect entry points for the build process. ([37661](https://github.com/WordPress/gutenberg/pull/37661))
-- Scripts: Add `plugin-zip` command to create a zip file for a WordPress plugin. ([37687](https://github.com/WordPress/gutenberg/pull/37687))
-
-#### Create Block
-- Allow custom folder name for a block. ([37612](https://github.com/WordPress/gutenberg/pull/37612))
-- Speed up scaffolding by omitting WordPress dependencies. ([37639](https://github.com/WordPress/gutenberg/pull/37639))
 
+-   Allow type imports for React everywhere. ([37862](https://github.com/WordPress/gutenberg/pull/37862))
+-   Change the performance job folder structure to avoid nested node_modules. ([37775](https://github.com/WordPress/gutenberg/pull/37775))
+-   Fix flaky test by using waitForResponse to ensure the URL details request completes. ([37901](https://github.com/WordPress/gutenberg/pull/37901))
+-   Marking test that consistently fails as skipped. ([37729](https://github.com/WordPress/gutenberg/pull/37729))
 
+#### Build Tooling
 
+-   wp-env: Replace TT1-Blocks with Empty Theme in the wp-env of gutenberg and CI. ([37446](https://github.com/WordPress/gutenberg/pull/37446))
+-   wp-env: Show `--help` when no subcommand is passed. ([32755](https://github.com/WordPress/gutenberg/pull/32755))
+-   Scripts: Scan `block.json` files to detect entry points for the build process. ([37661](https://github.com/WordPress/gutenberg/pull/37661))
+-   Scripts: Add `plugin-zip` command to create a zip file for a WordPress plugin. ([37687](https://github.com/WordPress/gutenberg/pull/37687))
 
+#### Create Block
 
+-   Allow custom folder name for a block. ([37612](https://github.com/WordPress/gutenberg/pull/37612))
+-   Speed up scaffolding by omitting WordPress dependencies. ([37639](https://github.com/WordPress/gutenberg/pull/37639))
 
 = 12.3.2 =
 
+## Changelog
+
 ### Bug Fixes
 
 #### Block Library
-- Spacer: Fix unit settings filter. ([37774](https://github.com/WordPress/gutenberg/pull/37774))
-
-
-
 
+-   Spacer: Fix unit settings filter. ([37774](https://github.com/WordPress/gutenberg/pull/37774))
 
 = 12.3.1 =
 
+## Changelog
 
 ### Bug Fixes
 
-- Restore canvas padding for classic themes (#37741).
-- Site logo: Fix range control on landscape logos (#37733).
-- RichText: Fix dead key input on Windows (#37777).
-- Update: Improve escaping on the search block (#37829).
-- Fix: Impossible to clear colors if color palettes are removed. (#37791).
-
+-   Restore canvas padding for classic themes (#37741).
+-   Site logo: Fix range control on landscape logos (#37733).
+-   RichText: Fix dead key input on Windows (#37777).
+-   Update: Improve escaping on the search block (#37829).
+-   Fix: Impossible to clear colors if color palettes are removed. (#37791).
 
 = 12.3.0 =
 
+## Changelog
+
 ### Features
 
 #### Block Library
 
-- Group/row blocks:
-  - Add Gap support. ([37459](https://github.com/WordPress/gutenberg/pull/37459))
-  - Add Typography support. ([37456](https://github.com/WordPress/gutenberg/pull/37456))
-- New Author Name block. ([36001](https://github.com/WordPress/gutenberg/pull/36001))
-- Comments Pagination:
-  - New Comments Pagination Next block. ([36562](https://github.com/WordPress/gutenberg/pull/36562))
-  - New Comments Pagination Previous block. ([36912](https://github.com/WordPress/gutenberg/pull/36912))
+-   Group/row blocks:
+    -   Add Gap support. ([37459](https://github.com/WordPress/gutenberg/pull/37459))
+    -   Add Typography support. ([37456](https://github.com/WordPress/gutenberg/pull/37456))
+-   New Author Name block. ([36001](https://github.com/WordPress/gutenberg/pull/36001))
+-   Comments Pagination:
+    -   New Comments Pagination Next block. ([36562](https://github.com/WordPress/gutenberg/pull/36562))
+    -   New Comments Pagination Previous block. ([36912](https://github.com/WordPress/gutenberg/pull/36912))
 
 ### Enhancements
 
 #### Block Library
 
-- Navigation:
-  - Enable even more compact setup state. ([37089](https://github.com/WordPress/gutenberg/pull/37089))
-  - Use rems for padding. ([37478](https://github.com/WordPress/gutenberg/pull/37478))
-- Site Logo: Add option to set site icon from Site Logo block. ([35892](https://github.com/WordPress/gutenberg/pull/35892))
-- Paragraph: Add font family support. ([37586](https://github.com/WordPress/gutenberg/pull/37586))
-- Comments Template: Add comments pagination. ([37610](https://github.com/WordPress/gutenberg/pull/37610))
-- Embeds: Simplify the embed loading state. ([37548](https://github.com/WordPress/gutenberg/pull/37548))
-- Spacer: Add custom units for height and width. ([36186](https://github.com/WordPress/gutenberg/pull/36186))
+-   Navigation:
+    -   Enable even more compact setup state. ([37089](https://github.com/WordPress/gutenberg/pull/37089))
+    -   Use rems for padding. ([37478](https://github.com/WordPress/gutenberg/pull/37478))
+-   Site Logo: Add option to set site icon from Site Logo block. ([35892](https://github.com/WordPress/gutenberg/pull/35892))
+-   Paragraph: Add font family support. ([37586](https://github.com/WordPress/gutenberg/pull/37586))
+-   Comments Template: Add comments pagination. ([37610](https://github.com/WordPress/gutenberg/pull/37610))
+-   Embeds: Simplify the embed loading state. ([37548](https://github.com/WordPress/gutenberg/pull/37548))
+-   Spacer: Add custom units for height and width. ([36186](https://github.com/WordPress/gutenberg/pull/36186))
 
 #### Global Styles
 
-- Make the global styles subtitles font smaller. ([37600](https://github.com/WordPress/gutenberg/pull/37600))
-- Add support for nameless font sizes. ([37410](https://github.com/WordPress/gutenberg/pull/37410))
+-   Make the global styles subtitles font smaller. ([37600](https://github.com/WordPress/gutenberg/pull/37600))
+-   Add support for nameless font sizes. ([37410](https://github.com/WordPress/gutenberg/pull/37410))
 
 #### Colors
 
-- Allow color gradient popover to be above the color toggle. ([37430](https://github.com/WordPress/gutenberg/pull/37430))
-- Make color styles labels simpler. ([37493](https://github.com/WordPress/gutenberg/pull/37493))
-- Use subtitle styles for the palette names. ([37460](https://github.com/WordPress/gutenberg/pull/37460))
+-   Allow color gradient popover to be above the color toggle. ([37430](https://github.com/WordPress/gutenberg/pull/37430))
+-   Make color styles labels simpler. ([37493](https://github.com/WordPress/gutenberg/pull/37493))
+-   Use subtitle styles for the palette names. ([37460](https://github.com/WordPress/gutenberg/pull/37460))
 
 #### Design Tools
 
-- Border panel: Collapse color controls. ([37425](https://github.com/WordPress/gutenberg/pull/37425))
+-   Border panel: Collapse color controls. ([37425](https://github.com/WordPress/gutenberg/pull/37425))
 
 #### Document Settings
 
-- Add class name to post author on edit post sidebar. ([36269](https://github.com/WordPress/gutenberg/pull/36269))
+-   Add class name to post author on edit post sidebar. ([36269](https://github.com/WordPress/gutenberg/pull/36269))
 
 #### Site Editor
 
-- Update save panel's cancel button from icon to visible text. ([37310](https://github.com/WordPress/gutenberg/pull/37310))
+-   Update save panel's cancel button from icon to visible text. ([37310](https://github.com/WordPress/gutenberg/pull/37310))
 
 #### Accessibility
 
-- Latest Posts: Add aria-label to featured links. ([36251](https://github.com/WordPress/gutenberg/pull/36251))
+-   Latest Posts: Add aria-label to featured links. ([36251](https://github.com/WordPress/gutenberg/pull/36251))
 
 ### Bug Fixes
 
 #### Block Library
 
-- Navigation:
-  - Restrict Navigation permissions and show UI warning if cannot create. ([37454](https://github.com/WordPress/gutenberg/pull/37454))
-  - Ensure the overlay menu works when inserting navigation block patterns and that inner blocks are retained. ([37358](https://github.com/WordPress/gutenberg/pull/37358))
-  - Fix navigation appender. ([37447](https://github.com/WordPress/gutenberg/pull/37447))
-  - Revert all margins on navigation-item in editor. ([37587](https://github.com/WordPress/gutenberg/pull/37587))
-  - Fix page list issues in overlay. ([37444](https://github.com/WordPress/gutenberg/pull/37444))
-  - Show a UI warning when user does not have permission to update/edit an existing Navigation block. ([37286](https://github.com/WordPress/gutenberg/pull/37286))
-  - Try cascading nav styles through classnames. ([37473](https://github.com/WordPress/gutenberg/pull/37473))
-- Query Loop:
-  - Fix editable post blocks in Query Loop with `zero` `queryId`. ([37629](https://github.com/WordPress/gutenberg/pull/37629))
-  - Changed the letter case for Post Type to Post type. ([37499](https://github.com/WordPress/gutenberg/pull/37499))
-  - Query Pagination Next: Hide block if custom query has no results. ([37553](https://github.com/WordPress/gutenberg/pull/37553))
-  - Revert Query Pagination Next/Previous placeholder(36681). ([37520](https://github.com/WordPress/gutenberg/pull/37520))
-- Site Logo: Fix block alignment issues. ([36627](https://github.com/WordPress/gutenberg/pull/36627))
-- Gallery: Fix block registration hook priority. ([37409](https://github.com/WordPress/gutenberg/pull/37409))
-- Post Content/Title: Reflect changes when previewing post. ([37622](https://github.com/WordPress/gutenberg/pull/37622))
-- Post Excerpt: Specify paragraph as post excerpt tag name. ([37412](https://github.com/WordPress/gutenberg/pull/37412))
-- Reusable Block: Fix embed handling. ([37554](https://github.com/WordPress/gutenberg/pull/37554))
-- Site icon: Fix site icon styling to display non-square site icons within a square button. ([37570](https://github.com/WordPress/gutenberg/pull/37570))
-- Template Part: Only display a missing notice in debug mode. ([37404](https://github.com/WordPress/gutenberg/pull/37404))
-- ServerSideRender: Fix loading state. ([37623](https://github.com/WordPress/gutenberg/pull/37623))
-- Comments Avatar Block: Show avatar drag handles only when selected. ([37567](https://github.com/WordPress/gutenberg/pull/37567))
+-   Navigation:
+    -   Restrict Navigation permissions and show UI warning if cannot create. ([37454](https://github.com/WordPress/gutenberg/pull/37454))
+    -   Ensure the overlay menu works when inserting navigation block patterns and that inner blocks are retained. ([37358](https://github.com/WordPress/gutenberg/pull/37358))
+    -   Fix navigation appender. ([37447](https://github.com/WordPress/gutenberg/pull/37447))
+    -   Revert all margins on navigation-item in editor. ([37587](https://github.com/WordPress/gutenberg/pull/37587))
+    -   Fix page list issues in overlay. ([37444](https://github.com/WordPress/gutenberg/pull/37444))
+    -   Show a UI warning when user does not have permission to update/edit an existing Navigation block. ([37286](https://github.com/WordPress/gutenberg/pull/37286))
+    -   Try cascading nav styles through classnames. ([37473](https://github.com/WordPress/gutenberg/pull/37473))
+-   Query Loop:
+    -   Fix editable post blocks in Query Loop with `zero` `queryId`. ([37629](https://github.com/WordPress/gutenberg/pull/37629))
+    -   Changed the letter case for Post Type to Post type. ([37499](https://github.com/WordPress/gutenberg/pull/37499))
+    -   Query Pagination Next: Hide block if custom query has no results. ([37553](https://github.com/WordPress/gutenberg/pull/37553))
+    -   Revert Query Pagination Next/Previous placeholder(36681). ([37520](https://github.com/WordPress/gutenberg/pull/37520))
+-   Site Logo: Fix block alignment issues. ([36627](https://github.com/WordPress/gutenberg/pull/36627))
+-   Gallery: Fix block registration hook priority. ([37409](https://github.com/WordPress/gutenberg/pull/37409))
+-   Post Content/Title: Reflect changes when previewing post. ([37622](https://github.com/WordPress/gutenberg/pull/37622))
+-   Post Excerpt: Specify paragraph as post excerpt tag name. ([37412](https://github.com/WordPress/gutenberg/pull/37412))
+-   Reusable Block: Fix embed handling. ([37554](https://github.com/WordPress/gutenberg/pull/37554))
+-   Site icon: Fix site icon styling to display non-square site icons within a square button. ([37570](https://github.com/WordPress/gutenberg/pull/37570))
+-   Template Part: Only display a missing notice in debug mode. ([37404](https://github.com/WordPress/gutenberg/pull/37404))
+-   ServerSideRender: Fix loading state. ([37623](https://github.com/WordPress/gutenberg/pull/37623))
+-   Comments Avatar Block: Show avatar drag handles only when selected. ([37567](https://github.com/WordPress/gutenberg/pull/37567))
 
 #### Global Styles
 
-- Color editor discards colors with default name. ([37496](https://github.com/WordPress/gutenberg/pull/37496))
-- Gradients are not being applied by class. ([37597](https://github.com/WordPress/gutenberg/pull/37597))
-- Impossible to edit theme and default colors. ([37497](https://github.com/WordPress/gutenberg/pull/37497))
-- Blank site editor when theme name contains a period. ([37167](https://github.com/WordPress/gutenberg/pull/37167))
-- Lower the specificity of font size CSS Custom Properties in the editor. ([37526](https://github.com/WordPress/gutenberg/pull/37526))
-- Use inset shadow on color indicators and adjust spacing. ([37500](https://github.com/WordPress/gutenberg/pull/37500))
+-   Color editor discards colors with default name. ([37496](https://github.com/WordPress/gutenberg/pull/37496))
+-   Gradients are not being applied by class. ([37597](https://github.com/WordPress/gutenberg/pull/37597))
+-   Impossible to edit theme and default colors. ([37497](https://github.com/WordPress/gutenberg/pull/37497))
+-   Blank site editor when theme name contains a period. ([37167](https://github.com/WordPress/gutenberg/pull/37167))
+-   Lower the specificity of font size CSS Custom Properties in the editor. ([37526](https://github.com/WordPress/gutenberg/pull/37526))
+-   Use inset shadow on color indicators and adjust spacing. ([37500](https://github.com/WordPress/gutenberg/pull/37500))
 
 #### Block Editor
 
-- Fix Enter handling for nested blocks. ([37453](https://github.com/WordPress/gutenberg/pull/37453))
-- Restrict delete multi selected blocks shortcut. ([37595](https://github.com/WordPress/gutenberg/pull/37595))
-- Avoid using CSS variables for block gap styles. ([37360](https://github.com/WordPress/gutenberg/pull/37360))
+-   Fix Enter handling for nested blocks. ([37453](https://github.com/WordPress/gutenberg/pull/37453))
+-   Restrict delete multi selected blocks shortcut. ([37595](https://github.com/WordPress/gutenberg/pull/37595))
+-   Avoid using CSS variables for block gap styles. ([37360](https://github.com/WordPress/gutenberg/pull/37360))
 
 #### Themes
 
-- Add comment-form and comment-list to default html5 theme support. ([37536](https://github.com/WordPress/gutenberg/pull/37536))
-- Avoid Duplicated "Theme File Editor" menu. ([37592](https://github.com/WordPress/gutenberg/pull/37592))
-- Fix conditional check "Theme File Editor" menu. ([37616](https://github.com/WordPress/gutenberg/pull/37616))
-- Fix duotone theme cache. ([36236](https://github.com/WordPress/gutenberg/pull/36236))
+-   Add comment-form and comment-list to default html5 theme support. ([37536](https://github.com/WordPress/gutenberg/pull/37536))
+-   Avoid Duplicated "Theme File Editor" menu. ([37592](https://github.com/WordPress/gutenberg/pull/37592))
+-   Fix conditional check "Theme File Editor" menu. ([37616](https://github.com/WordPress/gutenberg/pull/37616))
+-   Fix duotone theme cache. ([36236](https://github.com/WordPress/gutenberg/pull/36236))
 
 #### Template Editor
 
-- Avoid undo issues when reset parent blocks for controlled blocks. ([37484](https://github.com/WordPress/gutenberg/pull/37484))
-- Change color of welcome dialog close icon so it is visible against black background. ([37435](https://github.com/WordPress/gutenberg/pull/37435))
-- Template Editing Mode: Fix options dropdown. ([37442](https://github.com/WordPress/gutenberg/pull/37442))
-- Try to fix auto resizing in template part focus mode. ([37394](https://github.com/WordPress/gutenberg/pull/37394))
-- Update the template list action labels. ([37576](https://github.com/WordPress/gutenberg/pull/37576))
+-   Avoid undo issues when reset parent blocks for controlled blocks. ([37484](https://github.com/WordPress/gutenberg/pull/37484))
+-   Change color of welcome dialog close icon so it is visible against black background. ([37435](https://github.com/WordPress/gutenberg/pull/37435))
+-   Template Editing Mode: Fix options dropdown. ([37442](https://github.com/WordPress/gutenberg/pull/37442))
+-   Try to fix auto resizing in template part focus mode. ([37394](https://github.com/WordPress/gutenberg/pull/37394))
+-   Update the template list action labels. ([37576](https://github.com/WordPress/gutenberg/pull/37576))
 
 #### Site Editor
 
-- Add customized indicator to plugin templates that have been customized. ([37329](https://github.com/WordPress/gutenberg/pull/37329))
-- Register block editor shortcuts. ([37577](https://github.com/WordPress/gutenberg/pull/37577))
-- Update regex to handle 404 template slug. ([37579](https://github.com/WordPress/gutenberg/pull/37579))
-- Parse shortcode blocks outside the content. ([37545](https://github.com/WordPress/gutenberg/pull/37545))
+-   Add customized indicator to plugin templates that have been customized. ([37329](https://github.com/WordPress/gutenberg/pull/37329))
+-   Register block editor shortcuts. ([37577](https://github.com/WordPress/gutenberg/pull/37577))
+-   Update regex to handle 404 template slug. ([37579](https://github.com/WordPress/gutenberg/pull/37579))
+-   Parse shortcode blocks outside the content. ([37545](https://github.com/WordPress/gutenberg/pull/37545))
 
 #### Accessibility
 
-- Editor: Focus when navigation toggle receives state false. ([37265](https://github.com/WordPress/gutenberg/pull/37265))
-- Navigation: Only add dialog role when modal is open. ([37434](https://github.com/WordPress/gutenberg/pull/37434))
+-   Editor: Focus when navigation toggle receives state false. ([37265](https://github.com/WordPress/gutenberg/pull/37265))
+-   Navigation: Only add dialog role when modal is open. ([37434](https://github.com/WordPress/gutenberg/pull/37434))
 
 #### npm Packages
 
-- Fix missing peer dependencies where React is used indirectly. ([37578](https://github.com/WordPress/gutenberg/pull/37578))
+-   Fix missing peer dependencies where React is used indirectly. ([37578](https://github.com/WordPress/gutenberg/pull/37578))
 
 #### Testing
 
-- Fix flaky Navigation block end-to-end test by mocking out URL details endpoint to avoid 404. ([37501](https://github.com/WordPress/gutenberg/pull/37501))
+-   Fix flaky Navigation block end-to-end test by mocking out URL details endpoint to avoid 404. ([37501](https://github.com/WordPress/gutenberg/pull/37501))
 
 #### Post Editor
 
-- Multi-entity saving: Allow publishing a post while not saving changes to non-post entities. ([37383](https://github.com/WordPress/gutenberg/pull/37383))
+-   Multi-entity saving: Allow publishing a post while not saving changes to non-post entities. ([37383](https://github.com/WordPress/gutenberg/pull/37383))
 
 #### Components
 
-- ToolsPanel: Allow items to register when panelId is null. ([37273](https://github.com/WordPress/gutenberg/pull/37273))
+-   ToolsPanel: Allow items to register when panelId is null. ([37273](https://github.com/WordPress/gutenberg/pull/37273))
 
 #### Design Tools
 
-- Make block support tools panels compatible with multi-selection. ([37216](https://github.com/WordPress/gutenberg/pull/37216))
+-   Make block support tools panels compatible with multi-selection. ([37216](https://github.com/WordPress/gutenberg/pull/37216))
 
 ### Documentation
 
 #### Packages
 
-- Add automated core blocks documentation. ([36183](https://github.com/WordPress/gutenberg/pull/36183))
-- Added README for GradientPicker. ([37614](https://github.com/WordPress/gutenberg/pull/37614))
-- Add link to meta-block example in gutenberg-examples repo. ([37633](https://github.com/WordPress/gutenberg/pull/37633))
-- Fix parameter type in render function of file block. ([36262](https://github.com/WordPress/gutenberg/pull/36262))
-- Add changelog entry for \_\_experimentalIsRenderedInSidebar gradient components flag. ([37457](https://github.com/WordPress/gutenberg/pull/37457))
+-   Add automated core blocks documentation. ([36183](https://github.com/WordPress/gutenberg/pull/36183))
+-   Added README for GradientPicker. ([37614](https://github.com/WordPress/gutenberg/pull/37614))
+-   Add link to meta-block example in gutenberg-examples repo. ([37633](https://github.com/WordPress/gutenberg/pull/37633))
+-   Fix parameter type in render function of file block. ([36262](https://github.com/WordPress/gutenberg/pull/36262))
+-   Add changelog entry for \_\_experimentalIsRenderedInSidebar gradient components flag. ([37457](https://github.com/WordPress/gutenberg/pull/37457))
 
 #### Handbook
 
-- Switch code distinction to JSX & Plain. ([37348](https://github.com/WordPress/gutenberg/pull/37348))
-- Fix a grammatical error in the Create Block tutorial. ([37636](https://github.com/WordPress/gutenberg/pull/37636))
-- Fix plugin sidebar tutorial not publishing. ([37505](https://github.com/WordPress/gutenberg/pull/37505))
-- Update plugin sidebar to new how to guide template. ([37490](https://github.com/WordPress/gutenberg/pull/37490))
-- Update "Local by Flywheel" name and URL. ([37512](https://github.com/WordPress/gutenberg/pull/37512))
-- Update Meta Boxes to a single page how to guide. ([37621](https://github.com/WordPress/gutenberg/pull/37621))
+-   Switch code distinction to JSX & Plain. ([37348](https://github.com/WordPress/gutenberg/pull/37348))
+-   Fix a grammatical error in the Create Block tutorial. ([37636](https://github.com/WordPress/gutenberg/pull/37636))
+-   Fix plugin sidebar tutorial not publishing. ([37505](https://github.com/WordPress/gutenberg/pull/37505))
+-   Update plugin sidebar to new how to guide template. ([37490](https://github.com/WordPress/gutenberg/pull/37490))
+-   Update "Local by Flywheel" name and URL. ([37512](https://github.com/WordPress/gutenberg/pull/37512))
+-   Update Meta Boxes to a single page how to guide. ([37621](https://github.com/WordPress/gutenberg/pull/37621))
 
 ### Code Quality
 
 #### Compatibility with Core
 
-- Adds missing block template class properties. ([37556](https://github.com/WordPress/gutenberg/pull/37556))
+-   Adds missing block template class properties. ([37556](https://github.com/WordPress/gutenberg/pull/37556))
 
 #### Formatting
 
-- Fix lint issues. ([37618](https://github.com/WordPress/gutenberg/pull/37618))
-- Move block patterns compatibility code to lib/compat folder. ([37451](https://github.com/WordPress/gutenberg/pull/37451))
+-   Fix lint issues. ([37618](https://github.com/WordPress/gutenberg/pull/37618))
+-   Move block patterns compatibility code to lib/compat folder. ([37451](https://github.com/WordPress/gutenberg/pull/37451))
 
 #### Packages
 
-- Data:
-  - Block top level useSetting paths. ([37428](https://github.com/WordPress/gutenberg/pull/37428))
-  - Deprecate receiveUploadPermissions. ([37508](https://github.com/WordPress/gutenberg/pull/37508))
+-   Data:
+    -   Block top level useSetting paths. ([37428](https://github.com/WordPress/gutenberg/pull/37428))
+    -   Deprecate receiveUploadPermissions. ([37508](https://github.com/WordPress/gutenberg/pull/37508))
 
 #### Site Editor
 
-- Remove dead code. ([37581](https://github.com/WordPress/gutenberg/pull/37581))
+-   Remove dead code. ([37581](https://github.com/WordPress/gutenberg/pull/37581))
 
 #### Components
 
-- Storybook: Tweak configuration for v6.4 update. ([37544](https://github.com/WordPress/gutenberg/pull/37544))
+-   Storybook: Tweak configuration for v6.4 update. ([37544](https://github.com/WordPress/gutenberg/pull/37544))
 
 #### Security
 
-- Update `yargs` dependency for `@wordpress/env` to fix CVE-2021-3807. ([37601](https://github.com/WordPress/gutenberg/pull/37601))
+-   Update `yargs` dependency for `@wordpress/env` to fix CVE-2021-3807. ([37601](https://github.com/WordPress/gutenberg/pull/37601))
 
 ### Tools
 
 #### Testing
 
-- End to end:
-  - Switch to using a $eval to fill user creation fields. ([37469](https://github.com/WordPress/gutenberg/pull/37469))
-  - Fix and enable remaining navigation block end-to-end tests. ([37437](https://github.com/WordPress/gutenberg/pull/37437))
-  - Add block editor shortcuts end-to-end tests. ([37624](https://github.com/WordPress/gutenberg/pull/37624))
+-   End to end:
+    -   Switch to using a $eval to fill user creation fields. ([37469](https://github.com/WordPress/gutenberg/pull/37469))
+    -   Fix and enable remaining navigation block end-to-end tests. ([37437](https://github.com/WordPress/gutenberg/pull/37437))
+    -   Add block editor shortcuts end-to-end tests. ([37624](https://github.com/WordPress/gutenberg/pull/37624))
 
 #### Build Tooling
 
-- Add npm-run-all package to simplify running scripts. ([37558](https://github.com/WordPress/gutenberg/pull/37558))
-- Update caniuse to latest. ([37588](https://github.com/WordPress/gutenberg/pull/37588))
-- Fix pre commit hook to build block documentation. ([37613](https://github.com/WordPress/gutenberg/pull/37613))
-
-
-
+-   Add npm-run-all package to simplify running scripts. ([37558](https://github.com/WordPress/gutenberg/pull/37558))
+-   Update caniuse to latest. ([37588](https://github.com/WordPress/gutenberg/pull/37588))
+-   Fix pre commit hook to build block documentation. ([37613](https://github.com/WordPress/gutenberg/pull/37613))
 
 = 12.2.0 =
 
+## Changelog
+
 ### Enhancements
 
 #### Block Library
-- New block: Add `Comments Pagination Numbers` block. ([36890](https://github.com/WordPress/gutenberg/pull/36890))
-- Comment Template block: Handle nested comments. ([36065](https://github.com/WordPress/gutenberg/pull/36065))
-- Comments Query Loop: Improve context handling in inner blocks. ([37196](https://github.com/WordPress/gutenberg/pull/37196))
-- Image: Reflect media deletion in the editor. ([35973](https://github.com/WordPress/gutenberg/pull/35973))
-- Navigation:
-   - Add navigation blocks post-processing after migration from menu items. ([36950](https://github.com/WordPress/gutenberg/pull/36950))
-   - Refactor modal padding to be simpler and more flexible. ([37323](https://github.com/WordPress/gutenberg/pull/37323))
-   - Remove Navigation Menus from the Appearance menu. ([37212](https://github.com/WordPress/gutenberg/pull/37212))
-   - Add clearance for appender in submenus. ([36720](https://github.com/WordPress/gutenberg/pull/36720))
-- Refactor handling of padding for group and column blocks. ([37356](https://github.com/WordPress/gutenberg/pull/37356))
-- Template Part: Add actions that fire during the loading process of block template parts. ([36884](https://github.com/WordPress/gutenberg/pull/36884))
+
+-   New block: Add `Comments Pagination Numbers` block. ([36890](https://github.com/WordPress/gutenberg/pull/36890))
+-   Comment Template block: Handle nested comments. ([36065](https://github.com/WordPress/gutenberg/pull/36065))
+-   Comments Query Loop: Improve context handling in inner blocks. ([37196](https://github.com/WordPress/gutenberg/pull/37196))
+-   Image: Reflect media deletion in the editor. ([35973](https://github.com/WordPress/gutenberg/pull/35973))
+-   Navigation:
+    -   Add navigation blocks post-processing after migration from menu items. ([36950](https://github.com/WordPress/gutenberg/pull/36950))
+    -   Refactor modal padding to be simpler and more flexible. ([37323](https://github.com/WordPress/gutenberg/pull/37323))
+    -   Remove Navigation Menus from the Appearance menu. ([37212](https://github.com/WordPress/gutenberg/pull/37212))
+    -   Add clearance for appender in submenus. ([36720](https://github.com/WordPress/gutenberg/pull/36720))
+-   Refactor handling of padding for group and column blocks. ([37356](https://github.com/WordPress/gutenberg/pull/37356))
+-   Template Part: Add actions that fire during the loading process of block template parts. ([36884](https://github.com/WordPress/gutenberg/pull/36884))
 
 #### Styles and design tools
-- Add the `Welcome Guide` option to the `More Global Styles Actions` dropdown. ([37180](https://github.com/WordPress/gutenberg/pull/37180))
-- Make the `Blocks` section more distinguishable. ([37293](https://github.com/WordPress/gutenberg/pull/37293))
-- Move the `Edit colors` button to a standard menu item. ([36842](https://github.com/WordPress/gutenberg/pull/36842))
-- Move Duotone palette to the bottom of global styles gradients. ([37253](https://github.com/WordPress/gutenberg/pull/37253))
-- Border controls: display border properties in the `ToolPanel`. ([34061](https://github.com/WordPress/gutenberg/pull/34061))
+
+-   Add the `Welcome Guide` option to the `More Global Styles Actions` dropdown. ([37180](https://github.com/WordPress/gutenberg/pull/37180))
+-   Make the `Blocks` section more distinguishable. ([37293](https://github.com/WordPress/gutenberg/pull/37293))
+-   Move the `Edit colors` button to a standard menu item. ([36842](https://github.com/WordPress/gutenberg/pull/36842))
+-   Move Duotone palette to the bottom of global styles gradients. ([37253](https://github.com/WordPress/gutenberg/pull/37253))
+-   Border controls: display border properties in the `ToolPanel`. ([34061](https://github.com/WordPress/gutenberg/pull/34061))
 
 #### Components
-- FontSizePicker: Use an incremental sequence of numbers as labels for the available font sizes at the segmented control (conditionally). ([37038](https://github.com/WordPress/gutenberg/pull/37038))
-- ColorPalette: Improve accessibility and visibility. ([36925](https://github.com/WordPress/gutenberg/pull/36925))
-- ToolsPanel: Standardize input control label margin. ([36387](https://github.com/WordPress/gutenberg/pull/36387))
-- Unify styles for `ColorIndicator` with how they appear in Global Styles. ([37028](https://github.com/WordPress/gutenberg/pull/37028))
-- Update `PanelColorGradientSettings` component to use dropdowns. ([37067](https://github.com/WordPress/gutenberg/pull/37067))
+
+-   FontSizePicker: Use an incremental sequence of numbers as labels for the available font sizes at the segmented control (conditionally). ([37038](https://github.com/WordPress/gutenberg/pull/37038))
+-   ColorPalette: Improve accessibility and visibility. ([36925](https://github.com/WordPress/gutenberg/pull/36925))
+-   ToolsPanel: Standardize input control label margin. ([36387](https://github.com/WordPress/gutenberg/pull/36387))
+-   Unify styles for `ColorIndicator` with how they appear in Global Styles. ([37028](https://github.com/WordPress/gutenberg/pull/37028))
+-   Update `PanelColorGradientSettings` component to use dropdowns. ([37067](https://github.com/WordPress/gutenberg/pull/37067))
 
 #### Site Editor
-- Add the Customizer back to the Appearance menu. ([37175](https://github.com/WordPress/gutenberg/pull/37175))
-- Add client-side routing for Site Editor. ([36488](https://github.com/WordPress/gutenberg/pull/36488))
-- Add a new `aria-pressed` attribute to the `Toggle navigation` button. ([37351](https://github.com/WordPress/gutenberg/pull/37351))
-- Template revert flow: Make label description source agnostic. ([37004](https://github.com/WordPress/gutenberg/pull/37004))
+
+-   Add the Customizer back to the Appearance menu. ([37175](https://github.com/WordPress/gutenberg/pull/37175))
+-   Add client-side routing for Site Editor. ([36488](https://github.com/WordPress/gutenberg/pull/36488))
+-   Add a new `aria-pressed` attribute to the `Toggle navigation` button. ([37351](https://github.com/WordPress/gutenberg/pull/37351))
+-   Template revert flow: Make label description source agnostic. ([37004](https://github.com/WordPress/gutenberg/pull/37004))
 
 #### Packages
-- Scripts: Enable React Fast Refresh for block development. ([28273](https://github.com/WordPress/gutenberg/pull/28273))
-- List Reusable Blocks: Refactor `ImportForm` into a functional component and use hooks. ([36938](https://github.com/WordPress/gutenberg/pull/36938))
+
+-   Scripts: Enable React Fast Refresh for block development. ([28273](https://github.com/WordPress/gutenberg/pull/28273))
+-   List Reusable Blocks: Refactor `ImportForm` into a functional component and use hooks. ([36938](https://github.com/WordPress/gutenberg/pull/36938))
 
 #### Widgets Editor
-- Implement preview for blocks. ([37012](https://github.com/WordPress/gutenberg/pull/37012))
+
+-   Implement preview for blocks. ([37012](https://github.com/WordPress/gutenberg/pull/37012))
 
 #### Post Editor
-- Template Part block should not be available in the Post Editor inserter. ([37157](https://github.com/WordPress/gutenberg/pull/37157))
-
-### Bug Fixes
-
-- Remove 4 instances of `gutenberg` text-domain from Core. ([37229](https://github.com/WordPress/gutenberg/pull/37229))
-
-#### Block Library
-- Fix return type in the DocBlock. ([37352](https://github.com/WordPress/gutenberg/pull/37352))
-- Fix deprecated usage of passing null to `explode` function. ([37392](https://github.com/WordPress/gutenberg/pull/37392))
-- Gallery:
-   - Fix color issue for captions with hyperlinks in the Gallery block. ([37033](https://github.com/WordPress/gutenberg/pull/37033))
-   - Fix documentation and function naming for gallery block registration in PHP. ([37132](https://github.com/WordPress/gutenberg/pull/37132))
-   - Remove placeholder border. ([37050](https://github.com/WordPress/gutenberg/pull/37050))
-- Post Comments:
-   - Fix form-submit styles by adding button classes to the submit button in the post-comments block. ([37245](https://github.com/WordPress/gutenberg/pull/37245))
-   - Fix width of the post comment form input. ([37238](https://github.com/WordPress/gutenberg/pull/37238))
-   - Use block markup for the comment form button when using a block theme. ([37315](https://github.com/WordPress/gutenberg/pull/37315))
-- Comments Pagination Block: Add default styling. ([37057](https://github.com/WordPress/gutenberg/pull/37057))
-- Image:
-   - Set image display mode to `grid` when no alignment is set to align caption `onresize` event properly. ([35787](https://github.com/WordPress/gutenberg/pull/35787))
-   - Fix resizer controls being hidden in Safari when switching between alignments. ([37210](https://github.com/WordPress/gutenberg/pull/37210))
-- Navigation:
-   - Fix `gutenberg_` prefixed function references in Core. ([37021](https://github.com/WordPress/gutenberg/pull/37021))
-   - Fix navigation justifications. ([36991](https://github.com/WordPress/gutenberg/pull/36991))
-   - Fix vertical alignment of page list in the modal. ([37321](https://github.com/WordPress/gutenberg/pull/37321))
-   - Remove hardcoded typography units. ([37349](https://github.com/WordPress/gutenberg/pull/37349))
-   - Fix vertical layout. ([37009](https://github.com/WordPress/gutenberg/pull/37009))
-   - Switch to `addEventListener` event for load event in the navigation block view script. ([37135](https://github.com/WordPress/gutenberg/pull/37135))
-   - Don't request the deprecated navigation areas endpoint outside of the Gutenberg plugin. ([37187](https://github.com/WordPress/gutenberg/pull/37187))
-   - Navigation Link Control: Hide the `Transforms` component when no options are available. ([37284](https://github.com/WordPress/gutenberg/pull/37284))
-   - Remove the deprecated navigation area block from the inserter. ([37026](https://github.com/WordPress/gutenberg/pull/37026))
-- Query Loop: Add `useBlockPreview` component, fix alignment of the `Query Loop` block in the editor. ([36431](https://github.com/WordPress/gutenberg/pull/36431))
-- Query Pagination: `core/query-pagination-next` and `core/query-pagination-previous` blocks: change the markup on the first and last pages of the pagination. ([36681](https://github.com/WordPress/gutenberg/pull/36681))
-- Search: Fix application of border color class in the editor. ([37242](https://github.com/WordPress/gutenberg/pull/37242))
-- Template Part:
-   - Fix `isMissing` condition check. ([37370](https://github.com/WordPress/gutenberg/pull/37370))
-   - Use Core version of template and template part post types and REST endpoints for WordPress 5.9, with backward compatibility for WordPress 5.8. ([36898](https://github.com/WordPress/gutenberg/pull/36898))
-- Update the `micromodal` package to include a click-through fix. ([36837](https://github.com/WordPress/gutenberg/pull/36837))
-
-#### Components
-- Card: Support the `extraSmall` option for the `size` prop. ([37097](https://github.com/WordPress/gutenberg/pull/37097))
-- Drop Zone: Fix HTML drop issues with the Windows browsers. ([37151](https://github.com/WordPress/gutenberg/pull/37151))
-- Don't load `Radio` and `RadioGroup` components directly. ([36934](https://github.com/WordPress/gutenberg/pull/36934))
-- DuotonePicker typo fix. ([36662](https://github.com/WordPress/gutenberg/pull/36662))
-- Element: Ensure that the package uses the up-to-date React types. ([37365](https://github.com/WordPress/gutenberg/pull/37365))
-- Fix incorrect rendering of `ToggleGroupControl`'s active state. ([37332](https://github.com/WordPress/gutenberg/pull/37332))
-- Hide the `remove control point` button because removing it would break gradient control. ([37186](https://github.com/WordPress/gutenberg/pull/37186))
-- Import experimental `Heading` and `Text` Components. ([37290](https://github.com/WordPress/gutenberg/pull/37290))
-- Make the color popover on the gradient picker appear as expected. ([37115](https://github.com/WordPress/gutenberg/pull/37115))
-- Remove unused `reakit-utils` dependency from peer dependencies. ([37369](https://github.com/WordPress/gutenberg/pull/37369))
-- Storybook: Fix deprecated `disabled` key. ([37112](https://github.com/WordPress/gutenberg/pull/37112))
-- ToggleGroupControl: Fix extra update on incoming change. ([37224](https://github.com/WordPress/gutenberg/pull/37224))
+
+-   Template Part block should not be available in the Post Editor inserter. ([37157](https://github.com/WordPress/gutenberg/pull/37157))
+
+### Bug Fixes
+
+-   Remove 4 instances of `gutenberg` text-domain from Core. ([37229](https://github.com/WordPress/gutenberg/pull/37229))
+
+#### Block Library
+
+-   Fix return type in the DocBlock. ([37352](https://github.com/WordPress/gutenberg/pull/37352))
+-   Fix deprecated usage of passing null to `explode` function. ([37392](https://github.com/WordPress/gutenberg/pull/37392))
+-   Gallery:
+    -   Fix color issue for captions with hyperlinks in the Gallery block. ([37033](https://github.com/WordPress/gutenberg/pull/37033))
+    -   Fix documentation and function naming for gallery block registration in PHP. ([37132](https://github.com/WordPress/gutenberg/pull/37132))
+    -   Remove placeholder border. ([37050](https://github.com/WordPress/gutenberg/pull/37050))
+-   Post Comments:
+    -   Fix form-submit styles by adding button classes to the submit button in the post-comments block. ([37245](https://github.com/WordPress/gutenberg/pull/37245))
+    -   Fix width of the post comment form input. ([37238](https://github.com/WordPress/gutenberg/pull/37238))
+    -   Use block markup for the comment form button when using a block theme. ([37315](https://github.com/WordPress/gutenberg/pull/37315))
+-   Comments Pagination Block: Add default styling. ([37057](https://github.com/WordPress/gutenberg/pull/37057))
+-   Image:
+    -   Set image display mode to `grid` when no alignment is set to align caption `onresize` event properly. ([35787](https://github.com/WordPress/gutenberg/pull/35787))
+    -   Fix resizer controls being hidden in Safari when switching between alignments. ([37210](https://github.com/WordPress/gutenberg/pull/37210))
+-   Navigation:
+    -   Fix `gutenberg_` prefixed function references in Core. ([37021](https://github.com/WordPress/gutenberg/pull/37021))
+    -   Fix navigation justifications. ([36991](https://github.com/WordPress/gutenberg/pull/36991))
+    -   Fix vertical alignment of page list in the modal. ([37321](https://github.com/WordPress/gutenberg/pull/37321))
+    -   Remove hardcoded typography units. ([37349](https://github.com/WordPress/gutenberg/pull/37349))
+    -   Fix vertical layout. ([37009](https://github.com/WordPress/gutenberg/pull/37009))
+    -   Switch to `addEventListener` event for load event in the navigation block view script. ([37135](https://github.com/WordPress/gutenberg/pull/37135))
+    -   Don't request the deprecated navigation areas endpoint outside of the Gutenberg plugin. ([37187](https://github.com/WordPress/gutenberg/pull/37187))
+    -   Navigation Link Control: Hide the `Transforms` component when no options are available. ([37284](https://github.com/WordPress/gutenberg/pull/37284))
+    -   Remove the deprecated navigation area block from the inserter. ([37026](https://github.com/WordPress/gutenberg/pull/37026))
+-   Query Loop: Add `useBlockPreview` component, fix alignment of the `Query Loop` block in the editor. ([36431](https://github.com/WordPress/gutenberg/pull/36431))
+-   Query Pagination: `core/query-pagination-next` and `core/query-pagination-previous` blocks: change the markup on the first and last pages of the pagination. ([36681](https://github.com/WordPress/gutenberg/pull/36681))
+-   Search: Fix application of border color class in the editor. ([37242](https://github.com/WordPress/gutenberg/pull/37242))
+-   Template Part:
+    -   Fix `isMissing` condition check. ([37370](https://github.com/WordPress/gutenberg/pull/37370))
+    -   Use Core version of template and template part post types and REST endpoints for WordPress 5.9, with backward compatibility for WordPress 5.8. ([36898](https://github.com/WordPress/gutenberg/pull/36898))
+-   Update the `micromodal` package to include a click-through fix. ([36837](https://github.com/WordPress/gutenberg/pull/36837))
+
+#### Components
+
+-   Card: Support the `extraSmall` option for the `size` prop. ([37097](https://github.com/WordPress/gutenberg/pull/37097))
+-   Drop Zone: Fix HTML drop issues with the Windows browsers. ([37151](https://github.com/WordPress/gutenberg/pull/37151))
+-   Don't load `Radio` and `RadioGroup` components directly. ([36934](https://github.com/WordPress/gutenberg/pull/36934))
+-   DuotonePicker typo fix. ([36662](https://github.com/WordPress/gutenberg/pull/36662))
+-   Element: Ensure that the package uses the up-to-date React types. ([37365](https://github.com/WordPress/gutenberg/pull/37365))
+-   Fix incorrect rendering of `ToggleGroupControl`'s active state. ([37332](https://github.com/WordPress/gutenberg/pull/37332))
+-   Hide the `remove control point` button because removing it would break gradient control. ([37186](https://github.com/WordPress/gutenberg/pull/37186))
+-   Import experimental `Heading` and `Text` Components. ([37290](https://github.com/WordPress/gutenberg/pull/37290))
+-   Make the color popover on the gradient picker appear as expected. ([37115](https://github.com/WordPress/gutenberg/pull/37115))
+-   Remove unused `reakit-utils` dependency from peer dependencies. ([37369](https://github.com/WordPress/gutenberg/pull/37369))
+-   Storybook: Fix deprecated `disabled` key. ([37112](https://github.com/WordPress/gutenberg/pull/37112))
+-   ToggleGroupControl: Fix extra update on incoming change. ([37224](https://github.com/WordPress/gutenberg/pull/37224))
 
 #### Site Editor
-- Allow global styles sidebar panels to fill vertical space. ([36845](https://github.com/WordPress/gutenberg/pull/36845))
-- Display a notice if export fails. ([37131](https://github.com/WordPress/gutenberg/pull/37131))
-- Fix edit template part link in header dropdown. ([37249](https://github.com/WordPress/gutenberg/pull/37249))
-- Fix template resolution to give precedence to PHP templates defined in a child theme. ([37074](https://github.com/WordPress/gutenberg/pull/37074))
-- Hide the block appender in the Template Part editor. ([37213](https://github.com/WordPress/gutenberg/pull/37213))
-- Improve notification when saving content in the Site Editor. ([36897](https://github.com/WordPress/gutenberg/pull/36897))
-- Improve handling of parsed requests. ([37209](https://github.com/WordPress/gutenberg/pull/37209))
-- Sync Export API error codes. ([37347](https://github.com/WordPress/gutenberg/pull/37347))
-- Template Editor Mode: Hide editor mode switcher. ([37359](https://github.com/WordPress/gutenberg/pull/37359))
-- Use server definition for the Template Areas. ([37215](https://github.com/WordPress/gutenberg/pull/37215))
-- Fixes the white screen of death on the Templates page when user avatars are disabled. ([37458](https://github.com/WordPress/gutenberg/pull/37458))
+
+-   Allow global styles sidebar panels to fill vertical space. ([36845](https://github.com/WordPress/gutenberg/pull/36845))
+-   Display a notice if export fails. ([37131](https://github.com/WordPress/gutenberg/pull/37131))
+-   Fix edit template part link in header dropdown. ([37249](https://github.com/WordPress/gutenberg/pull/37249))
+-   Fix template resolution to give precedence to PHP templates defined in a child theme. ([37074](https://github.com/WordPress/gutenberg/pull/37074))
+-   Hide the block appender in the Template Part editor. ([37213](https://github.com/WordPress/gutenberg/pull/37213))
+-   Improve notification when saving content in the Site Editor. ([36897](https://github.com/WordPress/gutenberg/pull/36897))
+-   Improve handling of parsed requests. ([37209](https://github.com/WordPress/gutenberg/pull/37209))
+-   Sync Export API error codes. ([37347](https://github.com/WordPress/gutenberg/pull/37347))
+-   Template Editor Mode: Hide editor mode switcher. ([37359](https://github.com/WordPress/gutenberg/pull/37359))
+-   Use server definition for the Template Areas. ([37215](https://github.com/WordPress/gutenberg/pull/37215))
+-   Fixes the white screen of death on the Templates page when user avatars are disabled. ([37458](https://github.com/WordPress/gutenberg/pull/37458))
 
 #### Styles
-- Allow selector ordering to ensure `theme.json` root selector margin takes precedence. ([36960](https://github.com/WordPress/gutenberg/pull/36960))
-- Custom keys from `theme.json`: Fix kebabCase conversion. ([37380](https://github.com/WordPress/gutenberg/pull/37380))
-- Do not remove theme presets if defaults are hidden. ([37008](https://github.com/WordPress/gutenberg/pull/37008))
-- Fix CSS Custom Properties for presets in the Site Editor. ([36851](https://github.com/WordPress/gutenberg/pull/36851))
-- Fix how `appearanceTools` works. ([37254](https://github.com/WordPress/gutenberg/pull/37254))
-- Fix styles for previews and patterns. ([37296](https://github.com/WordPress/gutenberg/pull/37296))
-- Font sizes: Update default values. ([37381](https://github.com/WordPress/gutenberg/pull/37381))
-- Remove CSS that causes conflict with `theme.json`. ([36424](https://github.com/WordPress/gutenberg/pull/36424))
+
+-   Allow selector ordering to ensure `theme.json` root selector margin takes precedence. ([36960](https://github.com/WordPress/gutenberg/pull/36960))
+-   Custom keys from `theme.json`: Fix kebabCase conversion. ([37380](https://github.com/WordPress/gutenberg/pull/37380))
+-   Do not remove theme presets if defaults are hidden. ([37008](https://github.com/WordPress/gutenberg/pull/37008))
+-   Fix CSS Custom Properties for presets in the Site Editor. ([36851](https://github.com/WordPress/gutenberg/pull/36851))
+-   Fix how `appearanceTools` works. ([37254](https://github.com/WordPress/gutenberg/pull/37254))
+-   Fix styles for previews and patterns. ([37296](https://github.com/WordPress/gutenberg/pull/37296))
+-   Font sizes: Update default values. ([37381](https://github.com/WordPress/gutenberg/pull/37381))
+-   Remove CSS that causes conflict with `theme.json`. ([36424](https://github.com/WordPress/gutenberg/pull/36424))
 
 #### Design Tools
-- Border Style Control: Update styling for consistency with border width control. ([37244](https://github.com/WordPress/gutenberg/pull/37244))
-- Border panel:
-   - Don't restore deselected border color when width gets changed. ([37049](https://github.com/WordPress/gutenberg/pull/37049))
-   - Update the value of the `ColorPicker` component when color is cleared. ([37048](https://github.com/WordPress/gutenberg/pull/37048))
-- Gradients
-   - Fix clearing a custom gradient from throwing a React warning. ([37051](https://github.com/WordPress/gutenberg/pull/37051))
-   - Enable adding custom gradient when gradients are disabled. ([36900](https://github.com/WordPress/gutenberg/pull/36900))
+
+-   Border Style Control: Update styling for consistency with border width control. ([37244](https://github.com/WordPress/gutenberg/pull/37244))
+-   Border panel:
+    -   Don't restore deselected border color when width gets changed. ([37049](https://github.com/WordPress/gutenberg/pull/37049))
+    -   Update the value of the `ColorPicker` component when color is cleared. ([37048](https://github.com/WordPress/gutenberg/pull/37048))
+-   Gradients
+    -   Fix clearing a custom gradient from throwing a React warning. ([37051](https://github.com/WordPress/gutenberg/pull/37051))
+    -   Enable adding custom gradient when gradients are disabled. ([36900](https://github.com/WordPress/gutenberg/pull/36900))
 
 #### Compatibility with Core and library code
-- Fix array key warning in block supports layout. ([37101](https://github.com/WordPress/gutenberg/pull/37101))
-- Templates: Search for old template names in the parent theme too. ([36910](https://github.com/WordPress/gutenberg/pull/36910))
-- Fix theme requirement validation when using WordPress 5.8. ([37226](https://github.com/WordPress/gutenberg/pull/37226))
-- Fix WordPress 5.9 check for conditionally running code. ([37235](https://github.com/WordPress/gutenberg/pull/37235))
-- Fix mistake in the`_remove_theme_attribute_in_block_template_content` function. ([37137](https://github.com/WordPress/gutenberg/pull/37137))
-- Gallery: Enable the new gallery block by default if running in Core. ([37134](https://github.com/WordPress/gutenberg/pull/37134))
 
+-   Fix array key warning in block supports layout. ([37101](https://github.com/WordPress/gutenberg/pull/37101))
+-   Templates: Search for old template names in the parent theme too. ([36910](https://github.com/WordPress/gutenberg/pull/36910))
+-   Fix theme requirement validation when using WordPress 5.8. ([37226](https://github.com/WordPress/gutenberg/pull/37226))
+-   Fix WordPress 5.9 check for conditionally running code. ([37235](https://github.com/WordPress/gutenberg/pull/37235))
+-   Fix mistake in the`_remove_theme_attribute_in_block_template_content` function. ([37137](https://github.com/WordPress/gutenberg/pull/37137))
+-   Gallery: Enable the new gallery block by default if running in Core. ([37134](https://github.com/WordPress/gutenberg/pull/37134))
 
 #### Packages
-- Core Data: Fix returning empty array in the `getEntityRecords` function for unknown entities. ([36984](https://github.com/WordPress/gutenberg/pull/36984))
-- Include `@babel/core` as a dependency where applicable. ([37328](https://github.com/WordPress/gutenberg/pull/37328))
-- Format library: Fix unsetting highlight color. ([37062](https://github.com/WordPress/gutenberg/pull/37062))
+
+-   Core Data: Fix returning empty array in the `getEntityRecords` function for unknown entities. ([36984](https://github.com/WordPress/gutenberg/pull/36984))
+-   Include `@babel/core` as a dependency where applicable. ([37328](https://github.com/WordPress/gutenberg/pull/37328))
+-   Format library: Fix unsetting highlight color. ([37062](https://github.com/WordPress/gutenberg/pull/37062))
 
 #### Block Editor
-- Mark the last change as persistent on save. ([36887](https://github.com/WordPress/gutenberg/pull/36887))
-- Fix content loss when ungrouping template parts or reusable blocks. ([37280](https://github.com/WordPress/gutenberg/pull/37280))
-- Simplify the `RESET_BLOCK` action to fix the loss of content when using template part focus mode. ([37283](https://github.com/WordPress/gutenberg/pull/37283))
+
+-   Mark the last change as persistent on save. ([36887](https://github.com/WordPress/gutenberg/pull/36887))
+-   Fix content loss when ungrouping template parts or reusable blocks. ([37280](https://github.com/WordPress/gutenberg/pull/37280))
+-   Simplify the `RESET_BLOCK` action to fix the loss of content when using template part focus mode. ([37283](https://github.com/WordPress/gutenberg/pull/37283))
 
 #### Post Editor
-- Multi-Entity Saving: Decode HTML entities in item titles. ([37353](https://github.com/WordPress/gutenberg/pull/37353))
+
+-   Multi-Entity Saving: Decode HTML entities in item titles. ([37353](https://github.com/WordPress/gutenberg/pull/37353))
 
 ### Documentation
 
-- Update documentation related to schemas. ([37294](https://github.com/WordPress/gutenberg/pull/37294))
-- Remove versioning in theme schema descriptions. ([37165](https://github.com/WordPress/gutenberg/pull/37165))
-- Fix the broken link on the plugin description page. ([37362](https://github.com/WordPress/gutenberg/pull/37362))
-
-- Handbook:
-   - Add information about skip links to the block theme overview. ([36555](https://github.com/WordPress/gutenberg/pull/36555))
-   - Add closing ticks for `blockGap` code example. ([37338](https://github.com/WordPress/gutenberg/pull/37338))
-   - Add how-to guide documentation template. ([36694](https://github.com/WordPress/gutenberg/pull/36694))
-   - Add link and details for `npx` in create block tutorial. ([37376](https://github.com/WordPress/gutenberg/pull/37376))
-   - Consolidate React Native documentation. ([36685](https://github.com/WordPress/gutenberg/pull/36685))
-   - Fix a link to the how-to guide template. ([37191](https://github.com/WordPress/gutenberg/pull/37191))
-   - Move classes used in the navigation block from the component to the new readme. ([37375](https://github.com/WordPress/gutenberg/pull/37375))
-   - Update Format API how-to guide. ([37298](https://github.com/WordPress/gutenberg/pull/37298))
-   - Update broken links. ([37121](https://github.com/WordPress/gutenberg/pull/37121))
-   - Improve formatting of headings in the contributors' guide. ([36689](https://github.com/WordPress/gutenberg/pull/36689))
-   - Fix `type` for `prefix` transformation. ([36362](https://github.com/WordPress/gutenberg/pull/36362))
-   - Fix broken links in the Resources section. ([37307](https://github.com/WordPress/gutenberg/pull/37307))
-   - Remove the semicolons from the JSON examples. ([37129](https://github.com/WordPress/gutenberg/pull/37129))
-
-- Packages:
-   - Block Editor:
-      - Add a documentation note about inner blocks and excerpts. ([36405](https://github.com/WordPress/gutenberg/pull/36405))
-      - Update example of usage for `suggestionsQuery` component. ([37281](https://github.com/WordPress/gutenberg/pull/37281))
-   - Componentes:
-      - Add missing changelog entries. ([37384](https://github.com/WordPress/gutenberg/pull/37384))
-      - Fix code formatting for card components. ([37268](https://github.com/WordPress/gutenberg/pull/37268))
-      - Fix importing from the wrong package. ([37192](https://github.com/WordPress/gutenberg/pull/37192))
-      - Fix missing link for shortcut documentation. ([36800](https://github.com/WordPress/gutenberg/pull/36800))
-      - Update `QueryControls` README.md. ([37233](https://github.com/WordPress/gutenberg/pull/37233))
-   - Site Editor: Update support documentation URL in the Welcome Guide. ([37176](https://github.com/WordPress/gutenberg/pull/37176))
+-   Update documentation related to schemas. ([37294](https://github.com/WordPress/gutenberg/pull/37294))
+-   Remove versioning in theme schema descriptions. ([37165](https://github.com/WordPress/gutenberg/pull/37165))
+-   Fix the broken link on the plugin description page. ([37362](https://github.com/WordPress/gutenberg/pull/37362))
+
+-   Handbook:
+
+    -   Add information about skip links to the block theme overview. ([36555](https://github.com/WordPress/gutenberg/pull/36555))
+    -   Add closing ticks for `blockGap` code example. ([37338](https://github.com/WordPress/gutenberg/pull/37338))
+    -   Add how-to guide documentation template. ([36694](https://github.com/WordPress/gutenberg/pull/36694))
+    -   Add link and details for `npx` in create block tutorial. ([37376](https://github.com/WordPress/gutenberg/pull/37376))
+    -   Consolidate React Native documentation. ([36685](https://github.com/WordPress/gutenberg/pull/36685))
+    -   Fix a link to the how-to guide template. ([37191](https://github.com/WordPress/gutenberg/pull/37191))
+    -   Move classes used in the navigation block from the component to the new readme. ([37375](https://github.com/WordPress/gutenberg/pull/37375))
+    -   Update Format API how-to guide. ([37298](https://github.com/WordPress/gutenberg/pull/37298))
+    -   Update broken links. ([37121](https://github.com/WordPress/gutenberg/pull/37121))
+    -   Improve formatting of headings in the contributors' guide. ([36689](https://github.com/WordPress/gutenberg/pull/36689))
+    -   Fix `type` for `prefix` transformation. ([36362](https://github.com/WordPress/gutenberg/pull/36362))
+    -   Fix broken links in the Resources section. ([37307](https://github.com/WordPress/gutenberg/pull/37307))
+    -   Remove the semicolons from the JSON examples. ([37129](https://github.com/WordPress/gutenberg/pull/37129))
+
+-   Packages:
+    -   Block Editor:
+        -   Add a documentation note about inner blocks and excerpts. ([36405](https://github.com/WordPress/gutenberg/pull/36405))
+        -   Update example of usage for `suggestionsQuery` component. ([37281](https://github.com/WordPress/gutenberg/pull/37281))
+    -   Componentes:
+        -   Add missing changelog entries. ([37384](https://github.com/WordPress/gutenberg/pull/37384))
+        -   Fix code formatting for card components. ([37268](https://github.com/WordPress/gutenberg/pull/37268))
+        -   Fix importing from the wrong package. ([37192](https://github.com/WordPress/gutenberg/pull/37192))
+        -   Fix missing link for shortcut documentation. ([36800](https://github.com/WordPress/gutenberg/pull/36800))
+        -   Update `QueryControls` README.md. ([37233](https://github.com/WordPress/gutenberg/pull/37233))
+    -   Site Editor: Update support documentation URL in the Welcome Guide. ([37176](https://github.com/WordPress/gutenberg/pull/37176))
 
 ### Code Quality
 
 #### Compatibility with Core
-- Better synchronization between Gutenberg and Core code. ([37141](https://github.com/WordPress/gutenberg/pull/37141))
-- Move WordPress 5.9 `wp-admin` menus compatibility code to `lib/compat` folder. ([37257](https://github.com/WordPress/gutenberg/pull/37257))
-- Move the block page templates hook into `compat/5.9` folder. ([37142](https://github.com/WordPress/gutenberg/pull/37142))
-- Move template loader hooks and functions into `lib/compat` folder. ([37149](https://github.com/WordPress/gutenberg/pull/37149))
-- Synchronize `wp_is_block_theme` function and `block-templates` block support with Core. ([37218](https://github.com/WordPress/gutenberg/pull/37218))
+
+-   Better synchronization between Gutenberg and Core code. ([37141](https://github.com/WordPress/gutenberg/pull/37141))
+-   Move WordPress 5.9 `wp-admin` menus compatibility code to `lib/compat` folder. ([37257](https://github.com/WordPress/gutenberg/pull/37257))
+-   Move the block page templates hook into `compat/5.9` folder. ([37142](https://github.com/WordPress/gutenberg/pull/37142))
+-   Move template loader hooks and functions into `lib/compat` folder. ([37149](https://github.com/WordPress/gutenberg/pull/37149))
+-   Synchronize `wp_is_block_theme` function and `block-templates` block support with Core. ([37218](https://github.com/WordPress/gutenberg/pull/37218))
 
 #### Global Styles
-- Do not register `Global Styles` custom post type in WordPress 5.9. ([37282](https://github.com/WordPress/gutenberg/pull/37282))
-- Port `Global Styles` code to `lib/compat/wordpress-5.9`:
-   - CSS custom properties. ([37334](https://github.com/WordPress/gutenberg/pull/37334))
-   - Front assets. ([37335](https://github.com/WordPress/gutenberg/pull/37335))
-- Rename `WP_Theme_JSON_Resolver` methods to make them compatible with Core. ([37393](https://github.com/WordPress/gutenberg/pull/37393))
+
+-   Do not register `Global Styles` custom post type in WordPress 5.9. ([37282](https://github.com/WordPress/gutenberg/pull/37282))
+-   Port `Global Styles` code to `lib/compat/wordpress-5.9`:
+    -   CSS custom properties. ([37334](https://github.com/WordPress/gutenberg/pull/37334))
+    -   Front assets. ([37335](https://github.com/WordPress/gutenberg/pull/37335))
+-   Rename `WP_Theme_JSON_Resolver` methods to make them compatible with Core. ([37393](https://github.com/WordPress/gutenberg/pull/37393))
 
 #### Packages
-- Dependency Extraction Webpack Plugin: Sort externalized dependencies report. ([37377](https://github.com/WordPress/gutenberg/pull/37377))
-- Block Editor:
-   - Iframe component: Use block settings to pass assets. ([37193](https://github.com/WordPress/gutenberg/pull/37193))
-   - Remove duplicate block styles. ([37133](https://github.com/WordPress/gutenberg/pull/37133))
-   - Specify the WordPress versions where API is deprecated. ([37150](https://github.com/WordPress/gutenberg/pull/37150))
-- Components
-   - Refactor `DatePicker` into a functional component. ([36835](https://github.com/WordPress/gutenberg/pull/36835))
-   - Storybook: Update to version 6.4. ([37367](https://github.com/WordPress/gutenberg/pull/37367))
-- Data
-   - Ensure that `redux` is listed as a dependency. ([37364](https://github.com/WordPress/gutenberg/pull/37364))
-   - @wordpress/data: Refactor `use-select` component in preparation for adding types. ([37017](https://github.com/WordPress/gutenberg/pull/37017))
-- Scripts: Update dependencies shared with other WordPress packages. ([37395](https://github.com/WordPress/gutenberg/pull/37395))
+
+-   Dependency Extraction Webpack Plugin: Sort externalized dependencies report. ([37377](https://github.com/WordPress/gutenberg/pull/37377))
+-   Block Editor:
+    -   Iframe component: Use block settings to pass assets. ([37193](https://github.com/WordPress/gutenberg/pull/37193))
+    -   Remove duplicate block styles. ([37133](https://github.com/WordPress/gutenberg/pull/37133))
+    -   Specify the WordPress versions where API is deprecated. ([37150](https://github.com/WordPress/gutenberg/pull/37150))
+-   Components
+    -   Refactor `DatePicker` into a functional component. ([36835](https://github.com/WordPress/gutenberg/pull/36835))
+    -   Storybook: Update to version 6.4. ([37367](https://github.com/WordPress/gutenberg/pull/37367))
+-   Data
+    -   Ensure that `redux` is listed as a dependency. ([37364](https://github.com/WordPress/gutenberg/pull/37364))
+    -   @wordpress/data: Refactor `use-select` component in preparation for adding types. ([37017](https://github.com/WordPress/gutenberg/pull/37017))
+-   Scripts: Update dependencies shared with other WordPress packages. ([37395](https://github.com/WordPress/gutenberg/pull/37395))
 
 #### Site Editor
-- Remove unused PHP code. ([36997](https://github.com/WordPress/gutenberg/pull/36997))
-- Revert `Site Editor: Set the <title> on the list page to be the same as the CPT name`. ([37270](https://github.com/WordPress/gutenberg/pull/37270))
+
+-   Remove unused PHP code. ([36997](https://github.com/WordPress/gutenberg/pull/36997))
+-   Revert `Site Editor: Set the <title> on the list page to be the same as the CPT name`. ([37270](https://github.com/WordPress/gutenberg/pull/37270))
 
 #### Block Library
-- Remove `gutenberg_` prefix from `@wordpress/block-library`. ([37341](https://github.com/WordPress/gutenberg/pull/37341))
-- Block Library: Rename Query Pagination blocks. ([37091](https://github.com/WordPress/gutenberg/pull/37091))
+
+-   Remove `gutenberg_` prefix from `@wordpress/block-library`. ([37341](https://github.com/WordPress/gutenberg/pull/37341))
+-   Block Library: Rename Query Pagination blocks. ([37091](https://github.com/WordPress/gutenberg/pull/37091))
 
 ### Tools
 
 #### Testing
-- End-to-end Tests:
-   - Increase delay in image block end-to-end test to fix intermittent failure when clearing URL field. ([37136](https://github.com/WordPress/gutenberg/pull/37136))
-   - Update Multi-Entity Saving test to improve reliability. ([37139](https://github.com/WordPress/gutenberg/pull/37139))
-   - Sanitize flaky test report file names. ([37390](https://github.com/WordPress/gutenberg/pull/37390))
-   - Retry login again after a bad nonce request to prevent intermittent test failures. ([37219](https://github.com/WordPress/gutenberg/pull/37219))
-   - Fix `Multi-entity saving` and `Template parts` related tests. ([37333](https://github.com/WordPress/gutenberg/pull/37333))
-   - Fix `Heading` test. ([37382](https://github.com/WordPress/gutenberg/pull/37382))
-   - Re-enable most of the navigation block end-to-end tests. ([37214](https://github.com/WordPress/gutenberg/pull/37214))
-   - Use global transients for PHPUnit tests. ([37122](https://github.com/WordPress/gutenberg/pull/37122))
-   - Fix usage of `useSetting('color.palette')`. ([37108](https://github.com/WordPress/gutenberg/pull/37108))
-   - Add tests for the new gallery hooks. ([36801](https://github.com/WordPress/gutenberg/pull/36801))
+
+-   End-to-end Tests:
+    -   Increase delay in image block end-to-end test to fix intermittent failure when clearing URL field. ([37136](https://github.com/WordPress/gutenberg/pull/37136))
+    -   Update Multi-Entity Saving test to improve reliability. ([37139](https://github.com/WordPress/gutenberg/pull/37139))
+    -   Sanitize flaky test report file names. ([37390](https://github.com/WordPress/gutenberg/pull/37390))
+    -   Retry login again after a bad nonce request to prevent intermittent test failures. ([37219](https://github.com/WordPress/gutenberg/pull/37219))
+    -   Fix `Multi-entity saving` and `Template parts` related tests. ([37333](https://github.com/WordPress/gutenberg/pull/37333))
+    -   Fix `Heading` test. ([37382](https://github.com/WordPress/gutenberg/pull/37382))
+    -   Re-enable most of the navigation block end-to-end tests. ([37214](https://github.com/WordPress/gutenberg/pull/37214))
+    -   Use global transients for PHPUnit tests. ([37122](https://github.com/WordPress/gutenberg/pull/37122))
+    -   Fix usage of `useSetting('color.palette')`. ([37108](https://github.com/WordPress/gutenberg/pull/37108))
+    -   Add tests for the new gallery hooks. ([36801](https://github.com/WordPress/gutenberg/pull/36801))
 
 #### Linting
-- ESLint:
-  - Add support for ESLint v8. ([36283](https://github.com/WordPress/gutenberg/pull/36283))
-  - Fix Babel config resolution when a custom ESLint config is present. ([37406](https://github.com/WordPress/gutenberg/pull/37406))
+
+-   ESLint:
+    -   Add support for ESLint v8. ([36283](https://github.com/WordPress/gutenberg/pull/36283))
+    -   Fix Babel config resolution when a custom ESLint config is present. ([37406](https://github.com/WordPress/gutenberg/pull/37406))
 
 #### Build Tooling
-- Specify PHP version in Composer. ([37007](https://github.com/WordPress/gutenberg/pull/37007))
-- Remove unused `jest-serializer-enzyme` dependency. ([37373](https://github.com/WordPress/gutenberg/pull/37373))
-- Remove some labels from the `Experiments` section of the changelog. ([37098](https://github.com/WordPress/gutenberg/pull/37098))
-- `npm`:
-   - Fix package dependencies issues discovered with `pnpm`. ([37396](https://github.com/WordPress/gutenberg/pull/37396))
-   - Use the latest minor version of webpack in Gutenberg. ([37371](https://github.com/WordPress/gutenberg/pull/37371))
-- Fix build failure on Windows. ([37189](https://github.com/WordPress/gutenberg/pull/37189))
 
+-   Specify PHP version in Composer. ([37007](https://github.com/WordPress/gutenberg/pull/37007))
+-   Remove unused `jest-serializer-enzyme` dependency. ([37373](https://github.com/WordPress/gutenberg/pull/37373))
+-   Remove some labels from the `Experiments` section of the changelog. ([37098](https://github.com/WordPress/gutenberg/pull/37098))
+-   `npm`:
+    -   Fix package dependencies issues discovered with `pnpm`. ([37396](https://github.com/WordPress/gutenberg/pull/37396))
+    -   Use the latest minor version of webpack in Gutenberg. ([37371](https://github.com/WordPress/gutenberg/pull/37371))
+-   Fix build failure on Windows. ([37189](https://github.com/WordPress/gutenberg/pull/37189))
 
 = 12.1.0 =
 
+## Changelog
+
 ### Enhancements
 
 #### Site Editor
-- Add Template List View. ([36379](https://github.com/WordPress/gutenberg/pull/36379))
-  - Show theme, plugin or author in Added By column with appropriate icon or avatar. ([36763](https://github.com/WordPress/gutenberg/pull/36763))
-  - Add success and error snackbars. ([36808](https://github.com/WordPress/gutenberg/pull/36808))
-  - Implement "Add New". ([36592](https://github.com/WordPress/gutenberg/pull/36592))
-  - Use table layout. ([36707](https://github.com/WordPress/gutenberg/pull/36707))
-  - Set the document title properly. ([36805](https://github.com/WordPress/gutenberg/pull/36805))
-  - Add rename action. ([36879](https://github.com/WordPress/gutenberg/pull/36879))
-  - Update delete template button. ([36815](https://github.com/WordPress/gutenberg/pull/36815))
-- Make Reusable blocks available in the Site Editor. ([36511](https://github.com/WordPress/gutenberg/pull/36511))
-- Remove the Styles link in Site Editor. ([36637](https://github.com/WordPress/gutenberg/pull/36637))
-- Update and align template descriptions. ([36000](https://github.com/WordPress/gutenberg/pull/36000))
-- Add icons to navigation sidebar items. ([36893](https://github.com/WordPress/gutenberg/pull/36893))
-- Allow editing custom template title. ([36933](https://github.com/WordPress/gutenberg/pull/36933))
-- Only render the site editor canvas when the global styles are loaded. ([36643](https://github.com/WordPress/gutenberg/pull/36643))
-- Remove extra border radius from the canvas. ([37022](https://github.com/WordPress/gutenberg/pull/37022))
-- Update navigation sidebar responsiveness. ([36638](https://github.com/WordPress/gutenberg/pull/36638))
-- Update resize handle styling in template part focus mode. ([36410](https://github.com/WordPress/gutenberg/pull/36410))
-
-#### Global Styles
-- Add elements support to the typography panel. ([36718](https://github.com/WordPress/gutenberg/pull/36718))
-- Add the gradient palette editor. ([36820](https://github.com/WordPress/gutenberg/pull/36820))
-- Add transparency support to the colors panel. ([36840](https://github.com/WordPress/gutenberg/pull/36840))
-- Add read-only duotone palette. ([36920](https://github.com/WordPress/gutenberg/pull/36920))
-- Do not show default palette if theme opts-out. ([36639](https://github.com/WordPress/gutenberg/pull/36639))
-- Make user able to change all color palette origins. ([36674](https://github.com/WordPress/gutenberg/pull/36674)) ([36747](https://github.com/WordPress/gutenberg/pull/36747)) ([36817](https://github.com/WordPress/gutenberg/pull/36817))
-- Rename `core` origin key to `default` for presets. ([36645](https://github.com/WordPress/gutenberg/pull/36645))
-- Count all color palette origins on the palette counter. ([36922](https://github.com/WordPress/gutenberg/pull/36922))
-- Add `appearanceTools` flag in theme.json to opt-in into appearance UI controls. ([36646](https://github.com/WordPress/gutenberg/pull/36646))
-- Switch the borders panel to ToolsPanel for displaying UI. ([33743](https://github.com/WordPress/gutenberg/pull/33743))
-- Improve the design and copy of the color panels. ([36959](https://github.com/WordPress/gutenberg/pull/36959)) ([36994](https://github.com/WordPress/gutenberg/pull/36994)) ([37015](https://github.com/WordPress/gutenberg/pull/37015)) ([37016](https://github.com/WordPress/gutenberg/pull/37016)) ([36921](https://github.com/WordPress/gutenberg/pull/36921)) ([36963](https://github.com/WordPress/gutenberg/pull/36963)) ([36622](https://github.com/WordPress/gutenberg/pull/36622)) ([36965](https://github.com/WordPress/gutenberg/pull/36965)) ([36819](https://github.com/WordPress/gutenberg/pull/36819)) ([36748](https://github.com/WordPress/gutenberg/pull/36748)) ([36940](https://github.com/WordPress/gutenberg/pull/36940)) ([36684](https://github.com/WordPress/gutenberg/pull/36684))
-- Schemas: Allow custom blocks in theme.json styles. ([36411](https://github.com/WordPress/gutenberg/pull/36411))
-
-#### Block Editor
-- Improve the position of the block appenders and behavior. ([36656](https://github.com/WordPress/gutenberg/pull/36656)) ([36605](https://github.com/WordPress/gutenberg/pull/36605))
-- Keyboard shortcuts: Double escape unselects all blocks. ([36945](https://github.com/WordPress/gutenberg/pull/36945))
-- Adjust order of theme blocks and reorder inserter items. ([36719](https://github.com/WordPress/gutenberg/pull/36719))
-- Block Editor List View: Use anchor elements instead of buttons. ([35655](https://github.com/WordPress/gutenberg/pull/35655))
-
-#### Block Library
--  Block Library: Add the Comments Pagination block. ([36872](https://github.com/WordPress/gutenberg/pull/36872))
-- Comment Author Avatar block: Add spacing support. ([36322](https://github.com/WordPress/gutenberg/pull/36322))
-- Navigation block: Only show submenu options and Show arrow button when relevant. ([36826](https://github.com/WordPress/gutenberg/pull/36826))
-- Navigation block: Implement suitable fallback for Nav block on front end of site when no menu selected. ([36849](https://github.com/WordPress/gutenberg/pull/36849)) ([36724](https://github.com/WordPress/gutenberg/pull/36724)) ([36850](https://github.com/WordPress/gutenberg/pull/36850)) ([36854](https://github.com/WordPress/gutenberg/pull/36854)) ([36740](https://github.com/WordPress/gutenberg/pull/36740))
-- Navigation block: Rename navigationMenuId to ref. ([36739](https://github.com/WordPress/gutenberg/pull/36739))
-- Navigation block: Automatically generate navigation post title. ([36760](https://github.com/WordPress/gutenberg/pull/36760))
-- Template Part block: Remove color, spacing, layout options and reusable block conversion. ([36571](https://github.com/WordPress/gutenberg/pull/36571)) ([36918](https://github.com/WordPress/gutenberg/pull/36918))
-- Gallery block: Turn on auto-migration of v1 Gallery blocks to v2 format when edited. ([36191](https://github.com/WordPress/gutenberg/pull/36191))
-- Update featured image placeholder graphic. ([36712](https://github.com/WordPress/gutenberg/pull/36712))
-- Post Featured Image: Move width and height controls into the Dimensions panel via SlotFill. ([36540](https://github.com/WordPress/gutenberg/pull/36540))
-
-#### Components
-- Font Size Picker: Allow non-integers as simple CSS values and in hints. ([36636](https://github.com/WordPress/gutenberg/pull/36636))
-- Divider: Improve `vertical` and RTL support. ([36579](https://github.com/WordPress/gutenberg/pull/36579))
-- ItemGroup: Experimenting with chevron icon. ([36654](https://github.com/WordPress/gutenberg/pull/36654))
-- Toggle Group Control: Add tooltip. ([36726](https://github.com/WordPress/gutenberg/pull/36726))
-- Modal: Support ref forwarding. ([36831](https://github.com/WordPress/gutenberg/pull/36831))
-- ZStack: Support RTL layouts when applying `offset`. ([36769](https://github.com/WordPress/gutenberg/pull/36769))
+
+-   Add Template List View. ([36379](https://github.com/WordPress/gutenberg/pull/36379))
+    -   Show theme, plugin or author in Added By column with appropriate icon or avatar. ([36763](https://github.com/WordPress/gutenberg/pull/36763))
+    -   Add success and error snackbars. ([36808](https://github.com/WordPress/gutenberg/pull/36808))
+    -   Implement "Add New". ([36592](https://github.com/WordPress/gutenberg/pull/36592))
+    -   Use table layout. ([36707](https://github.com/WordPress/gutenberg/pull/36707))
+    -   Set the document title properly. ([36805](https://github.com/WordPress/gutenberg/pull/36805))
+    -   Add rename action. ([36879](https://github.com/WordPress/gutenberg/pull/36879))
+    -   Update delete template button. ([36815](https://github.com/WordPress/gutenberg/pull/36815))
+-   Make Reusable blocks available in the Site Editor. ([36511](https://github.com/WordPress/gutenberg/pull/36511))
+-   Remove the Styles link in Site Editor. ([36637](https://github.com/WordPress/gutenberg/pull/36637))
+-   Update and align template descriptions. ([36000](https://github.com/WordPress/gutenberg/pull/36000))
+-   Add icons to navigation sidebar items. ([36893](https://github.com/WordPress/gutenberg/pull/36893))
+-   Allow editing custom template title. ([36933](https://github.com/WordPress/gutenberg/pull/36933))
+-   Only render the site editor canvas when the global styles are loaded. ([36643](https://github.com/WordPress/gutenberg/pull/36643))
+-   Remove extra border radius from the canvas. ([37022](https://github.com/WordPress/gutenberg/pull/37022))
+-   Update navigation sidebar responsiveness. ([36638](https://github.com/WordPress/gutenberg/pull/36638))
+-   Update resize handle styling in template part focus mode. ([36410](https://github.com/WordPress/gutenberg/pull/36410))
+
+#### Global Styles
+
+-   Add elements support to the typography panel. ([36718](https://github.com/WordPress/gutenberg/pull/36718))
+-   Add the gradient palette editor. ([36820](https://github.com/WordPress/gutenberg/pull/36820))
+-   Add transparency support to the colors panel. ([36840](https://github.com/WordPress/gutenberg/pull/36840))
+-   Add read-only duotone palette. ([36920](https://github.com/WordPress/gutenberg/pull/36920))
+-   Do not show default palette if theme opts-out. ([36639](https://github.com/WordPress/gutenberg/pull/36639))
+-   Make user able to change all color palette origins. ([36674](https://github.com/WordPress/gutenberg/pull/36674)) ([36747](https://github.com/WordPress/gutenberg/pull/36747)) ([36817](https://github.com/WordPress/gutenberg/pull/36817))
+-   Rename `core` origin key to `default` for presets. ([36645](https://github.com/WordPress/gutenberg/pull/36645))
+-   Count all color palette origins on the palette counter. ([36922](https://github.com/WordPress/gutenberg/pull/36922))
+-   Add `appearanceTools` flag in theme.json to opt-in into appearance UI controls. ([36646](https://github.com/WordPress/gutenberg/pull/36646))
+-   Switch the borders panel to ToolsPanel for displaying UI. ([33743](https://github.com/WordPress/gutenberg/pull/33743))
+-   Improve the design and copy of the color panels. ([36959](https://github.com/WordPress/gutenberg/pull/36959)) ([36994](https://github.com/WordPress/gutenberg/pull/36994)) ([37015](https://github.com/WordPress/gutenberg/pull/37015)) ([37016](https://github.com/WordPress/gutenberg/pull/37016)) ([36921](https://github.com/WordPress/gutenberg/pull/36921)) ([36963](https://github.com/WordPress/gutenberg/pull/36963)) ([36622](https://github.com/WordPress/gutenberg/pull/36622)) ([36965](https://github.com/WordPress/gutenberg/pull/36965)) ([36819](https://github.com/WordPress/gutenberg/pull/36819)) ([36748](https://github.com/WordPress/gutenberg/pull/36748)) ([36940](https://github.com/WordPress/gutenberg/pull/36940)) ([36684](https://github.com/WordPress/gutenberg/pull/36684))
+-   Schemas: Allow custom blocks in theme.json styles. ([36411](https://github.com/WordPress/gutenberg/pull/36411))
+
+#### Block Editor
+
+-   Improve the position of the block appenders and behavior. ([36656](https://github.com/WordPress/gutenberg/pull/36656)) ([36605](https://github.com/WordPress/gutenberg/pull/36605))
+-   Keyboard shortcuts: Double escape unselects all blocks. ([36945](https://github.com/WordPress/gutenberg/pull/36945))
+-   Adjust order of theme blocks and reorder inserter items. ([36719](https://github.com/WordPress/gutenberg/pull/36719))
+-   Block Editor List View: Use anchor elements instead of buttons. ([35655](https://github.com/WordPress/gutenberg/pull/35655))
+
+#### Block Library
+
+-   Block Library: Add the Comments Pagination block. ([36872](https://github.com/WordPress/gutenberg/pull/36872))
+-   Comment Author Avatar block: Add spacing support. ([36322](https://github.com/WordPress/gutenberg/pull/36322))
+-   Navigation block: Only show submenu options and Show arrow button when relevant. ([36826](https://github.com/WordPress/gutenberg/pull/36826))
+-   Navigation block: Implement suitable fallback for Nav block on front end of site when no menu selected. ([36849](https://github.com/WordPress/gutenberg/pull/36849)) ([36724](https://github.com/WordPress/gutenberg/pull/36724)) ([36850](https://github.com/WordPress/gutenberg/pull/36850)) ([36854](https://github.com/WordPress/gutenberg/pull/36854)) ([36740](https://github.com/WordPress/gutenberg/pull/36740))
+-   Navigation block: Rename navigationMenuId to ref. ([36739](https://github.com/WordPress/gutenberg/pull/36739))
+-   Navigation block: Automatically generate navigation post title. ([36760](https://github.com/WordPress/gutenberg/pull/36760))
+-   Template Part block: Remove color, spacing, layout options and reusable block conversion. ([36571](https://github.com/WordPress/gutenberg/pull/36571)) ([36918](https://github.com/WordPress/gutenberg/pull/36918))
+-   Gallery block: Turn on auto-migration of v1 Gallery blocks to v2 format when edited. ([36191](https://github.com/WordPress/gutenberg/pull/36191))
+-   Update featured image placeholder graphic. ([36712](https://github.com/WordPress/gutenberg/pull/36712))
+-   Post Featured Image: Move width and height controls into the Dimensions panel via SlotFill. ([36540](https://github.com/WordPress/gutenberg/pull/36540))
+
+#### Components
+
+-   Font Size Picker: Allow non-integers as simple CSS values and in hints. ([36636](https://github.com/WordPress/gutenberg/pull/36636))
+-   Divider: Improve `vertical` and RTL support. ([36579](https://github.com/WordPress/gutenberg/pull/36579))
+-   ItemGroup: Experimenting with chevron icon. ([36654](https://github.com/WordPress/gutenberg/pull/36654))
+-   Toggle Group Control: Add tooltip. ([36726](https://github.com/WordPress/gutenberg/pull/36726))
+-   Modal: Support ref forwarding. ([36831](https://github.com/WordPress/gutenberg/pull/36831))
+-   ZStack: Support RTL layouts when applying `offset`. ([36769](https://github.com/WordPress/gutenberg/pull/36769))
 
 #### Themes
-- Move the theme editor under tools for FSE themes. ([36723](https://github.com/WordPress/gutenberg/pull/36723))
-- Update the block theme folders to templates and parts. ([36647](https://github.com/WordPress/gutenberg/pull/36647))
 
+-   Move the theme editor under tools for FSE themes. ([36723](https://github.com/WordPress/gutenberg/pull/36723))
+-   Update the block theme folders to templates and parts. ([36647](https://github.com/WordPress/gutenberg/pull/36647))
 
 ### Bug Fixes
 
 #### Global Styles
-- Make the core color palette opt-in for themes with not `theme.json`. ([36496](https://github.com/WordPress/gutenberg/pull/36496))
-- Fix: Apply by slug on all origins. ([36841](https://github.com/WordPress/gutenberg/pull/36841))
-- Fix: Theme colors cannot override defaults. ([36811](https://github.com/WordPress/gutenberg/pull/36811))
 
-#### Block Library
-- Cover block: Fix undo trap. ([36807](https://github.com/WordPress/gutenberg/pull/36807))
-- Navigation block: Add page list to navigation direct insert conditions. ([36591](https://github.com/WordPress/gutenberg/pull/36591))
-- Navigation block: Fix Nav block editing wrong entity on creation of new Menu. ([36880](https://github.com/WordPress/gutenberg/pull/36880))
-- Navigation block: Scale submenu icon. ([36714](https://github.com/WordPress/gutenberg/pull/36714)) ([36948](https://github.com/WordPress/gutenberg/pull/36948))
-- Navigation block: Fix non existent menu handling. ([36507](https://github.com/WordPress/gutenberg/pull/36507))
-- Navigation block: Fix page list missing button styles when set to open on click. ([36601](https://github.com/WordPress/gutenberg/pull/36601))
-- Navigation block: Include cascading properties in deprecation. ([36432](https://github.com/WordPress/gutenberg/pull/36432))
-- Navigation block: Remove absorb toolbar prop. ([36990](https://github.com/WordPress/gutenberg/pull/36990))
-- Navigation block: Add accessible labelling to submenu buttons. ([36631](https://github.com/WordPress/gutenberg/pull/36631))
-- Navigation block: Fix space-between. ([36441](https://github.com/WordPress/gutenberg/pull/36441))
-- Template Part block: Fix slug generation when creating through the block placeholder. ([36764](https://github.com/WordPress/gutenberg/pull/36764))
-- Gallery block: Allow clicks within replace media placeholder state. ([36804](https://github.com/WordPress/gutenberg/pull/36804))
-- Gallery block: Fix stuck image size options loader. ([36806](https://github.com/WordPress/gutenberg/pull/36806))
-- Post Featured Image: Add a "Reset" button. ([36572](https://github.com/WordPress/gutenberg/pull/36572))
-- Post Title block: Fix render error when setting Page to homepage. ([36786](https://github.com/WordPress/gutenberg/pull/36786))
-- Query Pagination Next/Previous blocks: Remove text and link color support. ([36954](https://github.com/WordPress/gutenberg/pull/36954))
+-   Make the core color palette opt-in for themes with not `theme.json`. ([36496](https://github.com/WordPress/gutenberg/pull/36496))
+-   Fix: Apply by slug on all origins. ([36841](https://github.com/WordPress/gutenberg/pull/36841))
+-   Fix: Theme colors cannot override defaults. ([36811](https://github.com/WordPress/gutenberg/pull/36811))
+
+#### Block Library
+
+-   Cover block: Fix undo trap. ([36807](https://github.com/WordPress/gutenberg/pull/36807))
+-   Navigation block: Add page list to navigation direct insert conditions. ([36591](https://github.com/WordPress/gutenberg/pull/36591))
+-   Navigation block: Fix Nav block editing wrong entity on creation of new Menu. ([36880](https://github.com/WordPress/gutenberg/pull/36880))
+-   Navigation block: Scale submenu icon. ([36714](https://github.com/WordPress/gutenberg/pull/36714)) ([36948](https://github.com/WordPress/gutenberg/pull/36948))
+-   Navigation block: Fix non existent menu handling. ([36507](https://github.com/WordPress/gutenberg/pull/36507))
+-   Navigation block: Fix page list missing button styles when set to open on click. ([36601](https://github.com/WordPress/gutenberg/pull/36601))
+-   Navigation block: Include cascading properties in deprecation. ([36432](https://github.com/WordPress/gutenberg/pull/36432))
+-   Navigation block: Remove absorb toolbar prop. ([36990](https://github.com/WordPress/gutenberg/pull/36990))
+-   Navigation block: Add accessible labelling to submenu buttons. ([36631](https://github.com/WordPress/gutenberg/pull/36631))
+-   Navigation block: Fix space-between. ([36441](https://github.com/WordPress/gutenberg/pull/36441))
+-   Template Part block: Fix slug generation when creating through the block placeholder. ([36764](https://github.com/WordPress/gutenberg/pull/36764))
+-   Gallery block: Allow clicks within replace media placeholder state. ([36804](https://github.com/WordPress/gutenberg/pull/36804))
+-   Gallery block: Fix stuck image size options loader. ([36806](https://github.com/WordPress/gutenberg/pull/36806))
+-   Post Featured Image: Add a "Reset" button. ([36572](https://github.com/WordPress/gutenberg/pull/36572))
+-   Post Title block: Fix render error when setting Page to homepage. ([36786](https://github.com/WordPress/gutenberg/pull/36786))
+-   Query Pagination Next/Previous blocks: Remove text and link color support. ([36954](https://github.com/WordPress/gutenberg/pull/36954))
 
 #### Site Editor
-- Stabilize theme export Rest API endpoint. ([36559](https://github.com/WordPress/gutenberg/pull/36559)) ([36908](https://github.com/WordPress/gutenberg/pull/36908))
-- Template list view fixes. ([36947](https://github.com/WordPress/gutenberg/pull/36947)) ([36822](https://github.com/WordPress/gutenberg/pull/36822)) ([36705](https://github.com/WordPress/gutenberg/pull/36705))
-- Templates Rest API endpoint: Add missing 'is_custom' prop. ([36911](https://github.com/WordPress/gutenberg/pull/36911))
-- Templates Rest API endpoint: Add origin and author. ([36896](https://github.com/WordPress/gutenberg/pull/36896))
-- Validate the postType query argument. ([36706](https://github.com/WordPress/gutenberg/pull/36706))
-- Fix site editor region navigation. ([36709](https://github.com/WordPress/gutenberg/pull/36709))
-- Navigation Sidebar: Add aria-current="page" to active navigation item. ([36946](https://github.com/WordPress/gutenberg/pull/36946))
-- Navigation Sidebar: Highlight "Site" in the navigation panel. ([36762](https://github.com/WordPress/gutenberg/pull/36762))
-- Navigation Sidebar: Show all templates and template parts on the site editor list screens. ([36761](https://github.com/WordPress/gutenberg/pull/36761))
-
-#### Components
-- Color Picker: Re-instate debounce and controlled value to fix issue with gradient picker. ([36941](https://github.com/WordPress/gutenberg/pull/36941))
-- ColorPicker: Replace hardcoded "blue" with theme color. ([36153](https://github.com/WordPress/gutenberg/pull/36153))
-- Tools Panel: Fix race conditions caused by conditionally displayed ToolsPanelItems. ([36588](https://github.com/WordPress/gutenberg/pull/36588))
-- DateTimePicker: Set PM hours correctly. ([36878](https://github.com/WordPress/gutenberg/pull/36878))
-- LinkControl: Fix wordbreak for URLs. ([36993](https://github.com/WordPress/gutenberg/pull/36993))
-- Offset the parent iframe when computing Popover position. ([36876](https://github.com/WordPress/gutenberg/pull/36876))
-- ToolsPanel: Prevent tools panel menu increasing empty panel height. ([36895](https://github.com/WordPress/gutenberg/pull/36895))
-- Update destructive tertiary button styles, and template list. ([36915](https://github.com/WordPress/gutenberg/pull/36915))
+
+-   Stabilize theme export Rest API endpoint. ([36559](https://github.com/WordPress/gutenberg/pull/36559)) ([36908](https://github.com/WordPress/gutenberg/pull/36908))
+-   Template list view fixes. ([36947](https://github.com/WordPress/gutenberg/pull/36947)) ([36822](https://github.com/WordPress/gutenberg/pull/36822)) ([36705](https://github.com/WordPress/gutenberg/pull/36705))
+-   Templates Rest API endpoint: Add missing 'is_custom' prop. ([36911](https://github.com/WordPress/gutenberg/pull/36911))
+-   Templates Rest API endpoint: Add origin and author. ([36896](https://github.com/WordPress/gutenberg/pull/36896))
+-   Validate the postType query argument. ([36706](https://github.com/WordPress/gutenberg/pull/36706))
+-   Fix site editor region navigation. ([36709](https://github.com/WordPress/gutenberg/pull/36709))
+-   Navigation Sidebar: Add aria-current="page" to active navigation item. ([36946](https://github.com/WordPress/gutenberg/pull/36946))
+-   Navigation Sidebar: Highlight "Site" in the navigation panel. ([36762](https://github.com/WordPress/gutenberg/pull/36762))
+-   Navigation Sidebar: Show all templates and template parts on the site editor list screens. ([36761](https://github.com/WordPress/gutenberg/pull/36761))
+
+#### Components
+
+-   Color Picker: Re-instate debounce and controlled value to fix issue with gradient picker. ([36941](https://github.com/WordPress/gutenberg/pull/36941))
+-   ColorPicker: Replace hardcoded "blue" with theme color. ([36153](https://github.com/WordPress/gutenberg/pull/36153))
+-   Tools Panel: Fix race conditions caused by conditionally displayed ToolsPanelItems. ([36588](https://github.com/WordPress/gutenberg/pull/36588))
+-   DateTimePicker: Set PM hours correctly. ([36878](https://github.com/WordPress/gutenberg/pull/36878))
+-   LinkControl: Fix wordbreak for URLs. ([36993](https://github.com/WordPress/gutenberg/pull/36993))
+-   Offset the parent iframe when computing Popover position. ([36876](https://github.com/WordPress/gutenberg/pull/36876))
+-   ToolsPanel: Prevent tools panel menu increasing empty panel height. ([36895](https://github.com/WordPress/gutenberg/pull/36895))
+-   Update destructive tertiary button styles, and template list. ([36915](https://github.com/WordPress/gutenberg/pull/36915))
 
 #### Themes
-- Block Templates: Fix PHP notices on WP 5.8. ([36964](https://github.com/WordPress/gutenberg/pull/36964))
-- Don't try and render unstable location if Nav block has ID. ([36863](https://github.com/WordPress/gutenberg/pull/36863))
+
+-   Block Templates: Fix PHP notices on WP 5.8. ([36964](https://github.com/WordPress/gutenberg/pull/36964))
+-   Don't try and render unstable location if Nav block has ID. ([36863](https://github.com/WordPress/gutenberg/pull/36863))
 
 #### Design Tools
-- Border panel: Update to display multiple palette origins. ([36753](https://github.com/WordPress/gutenberg/pull/36753))
-- Cover: Move BoxControlVisualizer in the markup to make it visible. ([36635](https://github.com/WordPress/gutenberg/pull/36635))
-- Fix duotone first render in Safari. ([36754](https://github.com/WordPress/gutenberg/pull/36754))
+
+-   Border panel: Update to display multiple palette origins. ([36753](https://github.com/WordPress/gutenberg/pull/36753))
+-   Cover: Move BoxControlVisualizer in the markup to make it visible. ([36635](https://github.com/WordPress/gutenberg/pull/36635))
+-   Fix duotone first render in Safari. ([36754](https://github.com/WordPress/gutenberg/pull/36754))
 
 #### Icons
-- [Icons]: Fix Comment Author Name icon. ([36738](https://github.com/WordPress/gutenberg/pull/36738))
-- [Icons]: Fix property names for Comment Author Avatar icon. ([36737](https://github.com/WordPress/gutenberg/pull/36737))
 
-#### Milaceanous
+-   [Icons]: Fix Comment Author Name icon. ([36738](https://github.com/WordPress/gutenberg/pull/36738))
+-   [Icons]: Fix property names for Comment Author Avatar icon. ([36737](https://github.com/WordPress/gutenberg/pull/36737))
 
-- Block Styles: Add a separating margin to the default picker. ([36976](https://github.com/WordPress/gutenberg/pull/36976))
-- Block Styles: Check for existence of scroll container. ([37010](https://github.com/WordPress/gutenberg/pull/37010))
-- Data package: Update types and fix type error. ([36190](https://github.com/WordPress/gutenberg/pull/36190))
-- Writing Flow Multi-select: Ensure post title content editable after multi-select. ([36843](https://github.com/WordPress/gutenberg/pull/36843))
-- Insertion point bar: Hide onBlur and onMouseLeave. ([36798](https://github.com/WordPress/gutenberg/pull/36798))
-- Dependency Extraction Webpack Plugin: Make the plugin work when using `optimizations.runtimeChunk = 'single'`. ([26214](https://github.com/WordPress/gutenberg/pull/26214))
-- Fix document typo. ([36776](https://github.com/WordPress/gutenberg/pull/36776))
-- Prevent CleanWebpackPlugin webpack plugin from deleting webpack assets. ([35986](https://github.com/WordPress/gutenberg/pull/35986))
-- Hide the columns inserter in pattern previews. ([36626](https://github.com/WordPress/gutenberg/pull/36626))
-- Update theme.json version. ([36917](https://github.com/WordPress/gutenberg/pull/36917))
-- Multi-entity save: Only set site entity to pending if really saving. ([36573](https://github.com/WordPress/gutenberg/pull/36573))
-- Widgets Editor: Add CSS fix for wp_footer called multiple times. ([36759](https://github.com/WordPress/gutenberg/pull/36759))
-- Fix the templates REST API endpoint for the almost pretty permalink config. ([36881](https://github.com/WordPress/gutenberg/pull/36881))
+#### Milaceanous
 
+-   Block Styles: Add a separating margin to the default picker. ([36976](https://github.com/WordPress/gutenberg/pull/36976))
+-   Block Styles: Check for existence of scroll container. ([37010](https://github.com/WordPress/gutenberg/pull/37010))
+-   Data package: Update types and fix type error. ([36190](https://github.com/WordPress/gutenberg/pull/36190))
+-   Writing Flow Multi-select: Ensure post title content editable after multi-select. ([36843](https://github.com/WordPress/gutenberg/pull/36843))
+-   Insertion point bar: Hide onBlur and onMouseLeave. ([36798](https://github.com/WordPress/gutenberg/pull/36798))
+-   Dependency Extraction Webpack Plugin: Make the plugin work when using `optimizations.runtimeChunk = 'single'`. ([26214](https://github.com/WordPress/gutenberg/pull/26214))
+-   Fix document typo. ([36776](https://github.com/WordPress/gutenberg/pull/36776))
+-   Prevent CleanWebpackPlugin webpack plugin from deleting webpack assets. ([35986](https://github.com/WordPress/gutenberg/pull/35986))
+-   Hide the columns inserter in pattern previews. ([36626](https://github.com/WordPress/gutenberg/pull/36626))
+-   Update theme.json version. ([36917](https://github.com/WordPress/gutenberg/pull/36917))
+-   Multi-entity save: Only set site entity to pending if really saving. ([36573](https://github.com/WordPress/gutenberg/pull/36573))
+-   Widgets Editor: Add CSS fix for wp_footer called multiple times. ([36759](https://github.com/WordPress/gutenberg/pull/36759))
+-   Fix the templates REST API endpoint for the almost pretty permalink config. ([36881](https://github.com/WordPress/gutenberg/pull/36881))
 
 ### Performance
 
-- Improve performance of wp_navigation lookup. ([36891](https://github.com/WordPress/gutenberg/pull/36891))
-
+-   Improve performance of wp_navigation lookup. ([36891](https://github.com/WordPress/gutenberg/pull/36891))
 
 ### Experiments
 
-- Add `__unstable-large` size variant on `InputControl` `SelectControl` `UnitControl`. ([35646](https://github.com/WordPress/gutenberg/pull/35646))
-- Add experimental `ConfirmDialog`. ([34153](https://github.com/WordPress/gutenberg/pull/34153))
-
+-   Add `__unstable-large` size variant on `InputControl` `SelectControl` `UnitControl`. ([35646](https://github.com/WordPress/gutenberg/pull/35646))
+-   Add experimental `ConfirmDialog`. ([34153](https://github.com/WordPress/gutenberg/pull/34153))
 
 ### Documentation
 
-- Add brief information about blockGap to the theme.json how-to guide. ([36558](https://github.com/WordPress/gutenberg/pull/36558))
-- Add placeholder in URLInput documentation. ([36799](https://github.com/WordPress/gutenberg/pull/36799))
-- Block Supports: Update block supports documentation after typography reshaping. ([36894](https://github.com/WordPress/gutenberg/pull/36894))
-- Alphabetize the How to Guides section. ([35904](https://github.com/WordPress/gutenberg/pull/35904))
-- Fix broken link to @wordpress/stylelint-config. ([36936](https://github.com/WordPress/gutenberg/pull/36936))
-- Improvements on `Create a Block Tutorial` from `Block Editor handbook`. ([36553](https://github.com/WordPress/gutenberg/pull/36553))
-- Update history.md with description of the page. ([36888](https://github.com/WordPress/gutenberg/pull/36888))
-- Update Getting Started with info to stay informed. ([36498](https://github.com/WordPress/gutenberg/pull/36498))
-- Update Pattern block category and add documentation. ([36144](https://github.com/WordPress/gutenberg/pull/36144))
-- Various inline docblock corrections. ([36793](https://github.com/WordPress/gutenberg/pull/36793))
-- ToolsPanel: Update panel readme and stories. ([36557](https://github.com/WordPress/gutenberg/pull/36557))
-- Change .nvmrc and documentation for Node.js version (LTS to 14.18.1). ([36744](https://github.com/WordPress/gutenberg/pull/36744))
-
+-   Add brief information about blockGap to the theme.json how-to guide. ([36558](https://github.com/WordPress/gutenberg/pull/36558))
+-   Add placeholder in URLInput documentation. ([36799](https://github.com/WordPress/gutenberg/pull/36799))
+-   Block Supports: Update block supports documentation after typography reshaping. ([36894](https://github.com/WordPress/gutenberg/pull/36894))
+-   Alphabetize the How to Guides section. ([35904](https://github.com/WordPress/gutenberg/pull/35904))
+-   Fix broken link to @wordpress/stylelint-config. ([36936](https://github.com/WordPress/gutenberg/pull/36936))
+-   Improvements on `Create a Block Tutorial` from `Block Editor handbook`. ([36553](https://github.com/WordPress/gutenberg/pull/36553))
+-   Update history.md with description of the page. ([36888](https://github.com/WordPress/gutenberg/pull/36888))
+-   Update Getting Started with info to stay informed. ([36498](https://github.com/WordPress/gutenberg/pull/36498))
+-   Update Pattern block category and add documentation. ([36144](https://github.com/WordPress/gutenberg/pull/36144))
+-   Various inline docblock corrections. ([36793](https://github.com/WordPress/gutenberg/pull/36793))
+-   ToolsPanel: Update panel readme and stories. ([36557](https://github.com/WordPress/gutenberg/pull/36557))
+-   Change .nvmrc and documentation for Node.js version (LTS to 14.18.1). ([36744](https://github.com/WordPress/gutenberg/pull/36744))
 
 ### Code Quality
 
-- Blocks: Refactor generator-based actions to thunks. ([36468](https://github.com/WordPress/gutenberg/pull/36468))
-- Remove useless bubblesVirtually prop from BlockInspector. ([37024](https://github.com/WordPress/gutenberg/pull/37024))
-- Remove EditPostSettings context provider. ([36949](https://github.com/WordPress/gutenberg/pull/36949))
-- Report dependencies externalized with Dependency Extraction Plugin. ([35106](https://github.com/WordPress/gutenberg/pull/35106))
-- Comment Author Avatar block: Escape styles attribute. ([36988](https://github.com/WordPress/gutenberg/pull/36988))
-- Clarify i18n context for PostTemplateActions's "New" label. ([36679](https://github.com/WordPress/gutenberg/pull/36679))
-- Data: Remove usage of deprecated register methods. ([36344](https://github.com/WordPress/gutenberg/pull/36344))
+-   Blocks: Refactor generator-based actions to thunks. ([36468](https://github.com/WordPress/gutenberg/pull/36468))
+-   Remove useless bubblesVirtually prop from BlockInspector. ([37024](https://github.com/WordPress/gutenberg/pull/37024))
+-   Remove EditPostSettings context provider. ([36949](https://github.com/WordPress/gutenberg/pull/36949))
+-   Report dependencies externalized with Dependency Extraction Plugin. ([35106](https://github.com/WordPress/gutenberg/pull/35106))
+-   Comment Author Avatar block: Escape styles attribute. ([36988](https://github.com/WordPress/gutenberg/pull/36988))
+-   Clarify i18n context for PostTemplateActions's "New" label. ([36679](https://github.com/WordPress/gutenberg/pull/36679))
+-   Data: Remove usage of deprecated register methods. ([36344](https://github.com/WordPress/gutenberg/pull/36344))
 
 #### Global Styles
-- Move Global Styles code to `lib/compat/wordpress-5.9` folder. ([36978](https://github.com/WordPress/gutenberg/pull/36978))
-- Rename `gutenberg_` to `wp_` for some functions that land in WordPress 5.9. ([36913](https://github.com/WordPress/gutenberg/pull/36913))
-- Update global styles public API. ([36610](https://github.com/WordPress/gutenberg/pull/36610))
-- Update the `WP_Theme_JSON_Gutenberg` class to be like the core one. ([36973](https://github.com/WordPress/gutenberg/pull/36973))
-- Update the `WP_Theme_JSON_Resolver_Gutenberg` class to be like the core one. ([36974](https://github.com/WordPress/gutenberg/pull/36974))
-- `theme.json`: Sort keys alphabetically. ([36968](https://github.com/WordPress/gutenberg/pull/36968))
-- Update function names for the public global styles API functions. ([36907](https://github.com/WordPress/gutenberg/pull/36907))
+
+-   Move Global Styles code to `lib/compat/wordpress-5.9` folder. ([36978](https://github.com/WordPress/gutenberg/pull/36978))
+-   Rename `gutenberg_` to `wp_` for some functions that land in WordPress 5.9. ([36913](https://github.com/WordPress/gutenberg/pull/36913))
+-   Update global styles public API. ([36610](https://github.com/WordPress/gutenberg/pull/36610))
+-   Update the `WP_Theme_JSON_Gutenberg` class to be like the core one. ([36973](https://github.com/WordPress/gutenberg/pull/36973))
+-   Update the `WP_Theme_JSON_Resolver_Gutenberg` class to be like the core one. ([36974](https://github.com/WordPress/gutenberg/pull/36974))
+-   `theme.json`: Sort keys alphabetically. ([36968](https://github.com/WordPress/gutenberg/pull/36968))
+-   Update function names for the public global styles API functions. ([36907](https://github.com/WordPress/gutenberg/pull/36907))
 
 #### Block Library
-- Navigation: Remove outdated separate "Home" link styles. ([36608](https://github.com/WordPress/gutenberg/pull/36608))
-- Post Featured Image: Remove withNotices HOC. ([36596](https://github.com/WordPress/gutenberg/pull/36596))
-- [Comment Author Avatar]: Remove extraneous color link support flag. ([36956](https://github.com/WordPress/gutenberg/pull/36956))
-- Deprecate navigation areas. ([36981](https://github.com/WordPress/gutenberg/pull/36981)) ([36727](https://github.com/WordPress/gutenberg/pull/36727))
-- Remove unstable max pages attribute from Nav block. ([36877](https://github.com/WordPress/gutenberg/pull/36877))
-- Remove reference to gutenberg_, swap with wp_. ([36652](https://github.com/WordPress/gutenberg/pull/36652))
-- Add plugin meta data to Nav Area block deprecation notice. ([36777](https://github.com/WordPress/gutenberg/pull/36777))
+
+-   Navigation: Remove outdated separate "Home" link styles. ([36608](https://github.com/WordPress/gutenberg/pull/36608))
+-   Post Featured Image: Remove withNotices HOC. ([36596](https://github.com/WordPress/gutenberg/pull/36596))
+-   [Comment Author Avatar]: Remove extraneous color link support flag. ([36956](https://github.com/WordPress/gutenberg/pull/36956))
+-   Deprecate navigation areas. ([36981](https://github.com/WordPress/gutenberg/pull/36981)) ([36727](https://github.com/WordPress/gutenberg/pull/36727))
+-   Remove unstable max pages attribute from Nav block. ([36877](https://github.com/WordPress/gutenberg/pull/36877))
+-   Remove reference to gutenberg*, swap with wp*. ([36652](https://github.com/WordPress/gutenberg/pull/36652))
+-   Add plugin meta data to Nav Area block deprecation notice. ([36777](https://github.com/WordPress/gutenberg/pull/36777))
 
 #### Testing
-- Reorganize end-to-end tests folders and files. ([36734](https://github.com/WordPress/gutenberg/pull/36734))
-- Scripts: Upgrade Puppeteer to v11. ([36040](https://github.com/WordPress/gutenberg/pull/36040))
-- Update template controller unit test now that author support is in WP core. ([36987](https://github.com/WordPress/gutenberg/pull/36987))
-- end-to-end Tests: Fix failing image end-to-end test by waiting for required element. ([36982](https://github.com/WordPress/gutenberg/pull/36982))
-- Remove block template resolution unit tests. ([36855](https://github.com/WordPress/gutenberg/pull/36855))
 
+-   Reorganize end-to-end tests folders and files. ([36734](https://github.com/WordPress/gutenberg/pull/36734))
+-   Scripts: Upgrade Puppeteer to v11. ([36040](https://github.com/WordPress/gutenberg/pull/36040))
+-   Update template controller unit test now that author support is in WP core. ([36987](https://github.com/WordPress/gutenberg/pull/36987))
+-   end-to-end Tests: Fix failing image end-to-end test by waiting for required element. ([36982](https://github.com/WordPress/gutenberg/pull/36982))
+-   Remove block template resolution unit tests. ([36855](https://github.com/WordPress/gutenberg/pull/36855))
 
 = 12.0.2 =
 
+## Changelog
+
 ### Bug Fixes
 
 #### Block Variations
-- Block Styles: Check for existence of scroll container. ([37010](https://github.com/WordPress/gutenberg/pull/37010))
-
-
-
 
+-   Block Styles: Check for existence of scroll container. ([37010](https://github.com/WordPress/gutenberg/pull/37010))
 
 = 12.1.0-rc.1 =
 
-
+## Changelog
 
 ### Enhancements
 
 #### Components
-- Add `__unstable-large` size variant on `InputControl` `SelectControl` `UnitControl`. ([35646](https://github.com/WordPress/gutenberg/pull/35646))
-- Font Size Picker: Allow non-integers as simple CSS values and in hints. ([36636](https://github.com/WordPress/gutenberg/pull/36636))
-- Improve `vertical` and RTL support for `Divider`. ([36579](https://github.com/WordPress/gutenberg/pull/36579))
-- ItemGroup: Experimenting with chevron icon. ([36654](https://github.com/WordPress/gutenberg/pull/36654))
-- Toggle Group Control: Add tooltip. ([36726](https://github.com/WordPress/gutenberg/pull/36726))
-- `Modal`: Add `__experimentalHideHeader` prop, wrap in `forwardref`. ([36831](https://github.com/WordPress/gutenberg/pull/36831))
-- `ZStack`: Support RTL layouts when applying `offset`. ([36769](https://github.com/WordPress/gutenberg/pull/36769))
+
+-   Add `__unstable-large` size variant on `InputControl` `SelectControl` `UnitControl`. ([35646](https://github.com/WordPress/gutenberg/pull/35646))
+-   Font Size Picker: Allow non-integers as simple CSS values and in hints. ([36636](https://github.com/WordPress/gutenberg/pull/36636))
+-   Improve `vertical` and RTL support for `Divider`. ([36579](https://github.com/WordPress/gutenberg/pull/36579))
+-   ItemGroup: Experimenting with chevron icon. ([36654](https://github.com/WordPress/gutenberg/pull/36654))
+-   Toggle Group Control: Add tooltip. ([36726](https://github.com/WordPress/gutenberg/pull/36726))
+-   `Modal`: Add `__experimentalHideHeader` prop, wrap in `forwardref`. ([36831](https://github.com/WordPress/gutenberg/pull/36831))
+-   `ZStack`: Support RTL layouts when applying `offset`. ([36769](https://github.com/WordPress/gutenberg/pull/36769))
 
 #### Site Editor
-- Add icons to navigation sidebar items. ([36893](https://github.com/WordPress/gutenberg/pull/36893))
-- Allow editing custom template title. ([36933](https://github.com/WordPress/gutenberg/pull/36933))
-- Only render the site editor canvas when the global styles are ready. ([36643](https://github.com/WordPress/gutenberg/pull/36643))
-- Remove extra border radius. ([37022](https://github.com/WordPress/gutenberg/pull/37022))
-- Show theme, plugin or author in Added By column with appropriate icon or avatar. ([36763](https://github.com/WordPress/gutenberg/pull/36763))
-- Update navigation sidebar responsiveness. ([36638](https://github.com/WordPress/gutenberg/pull/36638))
+
+-   Add icons to navigation sidebar items. ([36893](https://github.com/WordPress/gutenberg/pull/36893))
+-   Allow editing custom template title. ([36933](https://github.com/WordPress/gutenberg/pull/36933))
+-   Only render the site editor canvas when the global styles are ready. ([36643](https://github.com/WordPress/gutenberg/pull/36643))
+-   Remove extra border radius. ([37022](https://github.com/WordPress/gutenberg/pull/37022))
+-   Show theme, plugin or author in Added By column with appropriate icon or avatar. ([36763](https://github.com/WordPress/gutenberg/pull/36763))
+-   Update navigation sidebar responsiveness. ([36638](https://github.com/WordPress/gutenberg/pull/36638))
 
 #### Global Styles
-- Borders: Switch to ToolsPanel for displaying UI. ([33743](https://github.com/WordPress/gutenberg/pull/33743))
-- Custom color palette: Add default color name. ([36940](https://github.com/WordPress/gutenberg/pull/36940))
-- Polish unset color indicator. ([36994](https://github.com/WordPress/gutenberg/pull/36994))
+
+-   Borders: Switch to ToolsPanel for displaying UI. ([33743](https://github.com/WordPress/gutenberg/pull/33743))
+-   Custom color palette: Add default color name. ([36940](https://github.com/WordPress/gutenberg/pull/36940))
+-   Polish unset color indicator. ([36994](https://github.com/WordPress/gutenberg/pull/36994))
 
 #### Block Editor
-- Always show the block appender when its parent is selected. ([36656](https://github.com/WordPress/gutenberg/pull/36656))
-- Insertion point bar: Hide onBlur and onMouseLeave. ([36798](https://github.com/WordPress/gutenberg/pull/36798))
-- Writing Flow: Double escape unselects all blocks. ([36945](https://github.com/WordPress/gutenberg/pull/36945))
+
+-   Always show the block appender when its parent is selected. ([36656](https://github.com/WordPress/gutenberg/pull/36656))
+-   Insertion point bar: Hide onBlur and onMouseLeave. ([36798](https://github.com/WordPress/gutenberg/pull/36798))
+-   Writing Flow: Double escape unselects all blocks. ([36945](https://github.com/WordPress/gutenberg/pull/36945))
 
 #### Block Library
-- Add spacing attributes to comment author avatar. ([36322](https://github.com/WordPress/gutenberg/pull/36322))
-- Only show submenu options and Show arrow button when relevant. ([36826](https://github.com/WordPress/gutenberg/pull/36826))
 
+-   Add spacing attributes to comment author avatar. ([36322](https://github.com/WordPress/gutenberg/pull/36322))
+-   Only show submenu options and Show arrow button when relevant. ([36826](https://github.com/WordPress/gutenberg/pull/36826))
 
 ### Bug Fixes
 
-- Dependency Extraction Webpack Plugin: Make the plugin work when using `optimizations.runtimeChunk = 'single'`. ([26214](https://github.com/WordPress/gutenberg/pull/26214))
-- Fix document typo. ([36776](https://github.com/WordPress/gutenberg/pull/36776))
-- Prevent CleanWebpackPlugin webpack plugin from deleting webpack assets. ([35986](https://github.com/WordPress/gutenberg/pull/35986))
-- Try: Hide the columns inserter in pattern previews. ([36626](https://github.com/WordPress/gutenberg/pull/36626))
-- Update theme.json version. ([36917](https://github.com/WordPress/gutenberg/pull/36917))
-
-#### Block Library
-- Add page list to navigation direct insert conditions. ([36591](https://github.com/WordPress/gutenberg/pull/36591))
-- Cover: Fix undo trap. ([36807](https://github.com/WordPress/gutenberg/pull/36807))
-- Fix Nav block editing wrong entity on creation of new Menu. ([36880](https://github.com/WordPress/gutenberg/pull/36880))
-- Fix Nav block fallback DB query to match on full block grammar start tag. ([36854](https://github.com/WordPress/gutenberg/pull/36854))
-- Fix icon scaling. ([36948](https://github.com/WordPress/gutenberg/pull/36948))
-- Fix non existent menu handling in nav block. ([36507](https://github.com/WordPress/gutenberg/pull/36507))
-- Fix page list missing button styles when set to open on click. ([36601](https://github.com/WordPress/gutenberg/pull/36601))
-- Fix template part slug generation when creating through the block placeholder. ([36764](https://github.com/WordPress/gutenberg/pull/36764))
-- Gallery v1: Allow clicks within replace media placeholder state. ([36804](https://github.com/WordPress/gutenberg/pull/36804))
-- Gallery: Fix stuck image size options loader. ([36806](https://github.com/WordPress/gutenberg/pull/36806))
-- Include cascading properties in Navigation deprecation. ([36432](https://github.com/WordPress/gutenberg/pull/36432))
-- Navigation: Scale submenu icon. ([36714](https://github.com/WordPress/gutenberg/pull/36714))
-- Navigation: Try removing absorb toolbar prop. ([36990](https://github.com/WordPress/gutenberg/pull/36990))
-- Post Featured Image: Add the "Reset" button. ([36572](https://github.com/WordPress/gutenberg/pull/36572))
-- [Post Title]: Fix render error when setting Page to homepage. ([36786](https://github.com/WordPress/gutenberg/pull/36786))
-- [Query Pagination Next/Previous]: Remove text and link color support. ([36954](https://github.com/WordPress/gutenberg/pull/36954))
+-   Dependency Extraction Webpack Plugin: Make the plugin work when using `optimizations.runtimeChunk = 'single'`. ([26214](https://github.com/WordPress/gutenberg/pull/26214))
+-   Fix document typo. ([36776](https://github.com/WordPress/gutenberg/pull/36776))
+-   Prevent CleanWebpackPlugin webpack plugin from deleting webpack assets. ([35986](https://github.com/WordPress/gutenberg/pull/35986))
+-   Try: Hide the columns inserter in pattern previews. ([36626](https://github.com/WordPress/gutenberg/pull/36626))
+-   Update theme.json version. ([36917](https://github.com/WordPress/gutenberg/pull/36917))
+
+#### Block Library
+
+-   Add page list to navigation direct insert conditions. ([36591](https://github.com/WordPress/gutenberg/pull/36591))
+-   Cover: Fix undo trap. ([36807](https://github.com/WordPress/gutenberg/pull/36807))
+-   Fix Nav block editing wrong entity on creation of new Menu. ([36880](https://github.com/WordPress/gutenberg/pull/36880))
+-   Fix Nav block fallback DB query to match on full block grammar start tag. ([36854](https://github.com/WordPress/gutenberg/pull/36854))
+-   Fix icon scaling. ([36948](https://github.com/WordPress/gutenberg/pull/36948))
+-   Fix non existent menu handling in nav block. ([36507](https://github.com/WordPress/gutenberg/pull/36507))
+-   Fix page list missing button styles when set to open on click. ([36601](https://github.com/WordPress/gutenberg/pull/36601))
+-   Fix template part slug generation when creating through the block placeholder. ([36764](https://github.com/WordPress/gutenberg/pull/36764))
+-   Gallery v1: Allow clicks within replace media placeholder state. ([36804](https://github.com/WordPress/gutenberg/pull/36804))
+-   Gallery: Fix stuck image size options loader. ([36806](https://github.com/WordPress/gutenberg/pull/36806))
+-   Include cascading properties in Navigation deprecation. ([36432](https://github.com/WordPress/gutenberg/pull/36432))
+-   Navigation: Scale submenu icon. ([36714](https://github.com/WordPress/gutenberg/pull/36714))
+-   Navigation: Try removing absorb toolbar prop. ([36990](https://github.com/WordPress/gutenberg/pull/36990))
+-   Post Featured Image: Add the "Reset" button. ([36572](https://github.com/WordPress/gutenberg/pull/36572))
+-   [Post Title]: Fix render error when setting Page to homepage. ([36786](https://github.com/WordPress/gutenberg/pull/36786))
+-   [Query Pagination Next/Previous]: Remove text and link color support. ([36954](https://github.com/WordPress/gutenberg/pull/36954))
 
 #### Site Editor
-- Stabilize export endpoint. ([36559](https://github.com/WordPress/gutenberg/pull/36559))
-- Templat list fallback to slug. ([36947](https://github.com/WordPress/gutenberg/pull/36947))
-- Templates Controller: Add missing 'is_custom' prop. ([36911](https://github.com/WordPress/gutenberg/pull/36911))
-- Update hrefs to not specifically refer to themes.php?page=gutenberg-edit-site. ([36705](https://github.com/WordPress/gutenberg/pull/36705))
-- Validate the postType query argument. ([36706](https://github.com/WordPress/gutenberg/pull/36706))
+
+-   Stabilize export endpoint. ([36559](https://github.com/WordPress/gutenberg/pull/36559))
+-   Templat list fallback to slug. ([36947](https://github.com/WordPress/gutenberg/pull/36947))
+-   Templates Controller: Add missing 'is_custom' prop. ([36911](https://github.com/WordPress/gutenberg/pull/36911))
+-   Update hrefs to not specifically refer to themes.php?page=gutenberg-edit-site. ([36705](https://github.com/WordPress/gutenberg/pull/36705))
+-   Validate the postType query argument. ([36706](https://github.com/WordPress/gutenberg/pull/36706))
 
 #### Components
-- Color Picker: Re-instate debounce and controlled value to fix issue with gradient picker. ([36941](https://github.com/WordPress/gutenberg/pull/36941))
-- ColorPicker: Replace hardcoded "blue" with theme color. ([36153](https://github.com/WordPress/gutenberg/pull/36153))
-- Tools Panel: Fix race conditions caused by conditionally displayed ToolsPanelItems. ([36588](https://github.com/WordPress/gutenberg/pull/36588))
-- `DateTimePicker`: Set PM hours correctly. ([36878](https://github.com/WordPress/gutenberg/pull/36878))
+
+-   Color Picker: Re-instate debounce and controlled value to fix issue with gradient picker. ([36941](https://github.com/WordPress/gutenberg/pull/36941))
+-   ColorPicker: Replace hardcoded "blue" with theme color. ([36153](https://github.com/WordPress/gutenberg/pull/36153))
+-   Tools Panel: Fix race conditions caused by conditionally displayed ToolsPanelItems. ([36588](https://github.com/WordPress/gutenberg/pull/36588))
+-   `DateTimePicker`: Set PM hours correctly. ([36878](https://github.com/WordPress/gutenberg/pull/36878))
 
 #### Themes
-- Block Templates: Fix PHP notices on WP 5.8. ([36964](https://github.com/WordPress/gutenberg/pull/36964))
-- Don't try and render unstable location if Nav block has ID. ([36863](https://github.com/WordPress/gutenberg/pull/36863))
-- Fix duotone first render in Safari. ([36754](https://github.com/WordPress/gutenberg/pull/36754))
+
+-   Block Templates: Fix PHP notices on WP 5.8. ([36964](https://github.com/WordPress/gutenberg/pull/36964))
+-   Don't try and render unstable location if Nav block has ID. ([36863](https://github.com/WordPress/gutenberg/pull/36863))
+-   Fix duotone first render in Safari. ([36754](https://github.com/WordPress/gutenberg/pull/36754))
 
 #### Accessibility
-- Add accessible labelling to submenu buttons. ([36631](https://github.com/WordPress/gutenberg/pull/36631))
-- Add aria-current="page" to active navigation item. ([36946](https://github.com/WordPress/gutenberg/pull/36946))
-- Fix site editor region navigation. ([36709](https://github.com/WordPress/gutenberg/pull/36709))
+
+-   Add accessible labelling to submenu buttons. ([36631](https://github.com/WordPress/gutenberg/pull/36631))
+-   Add aria-current="page" to active navigation item. ([36946](https://github.com/WordPress/gutenberg/pull/36946))
+-   Fix site editor region navigation. ([36709](https://github.com/WordPress/gutenberg/pull/36709))
 
 #### Block Editor
-- Fix wordbreak for URLs. ([36993](https://github.com/WordPress/gutenberg/pull/36993))
-- Writing Flow Multi-select: Ensure post title content editable after multi-select. ([36843](https://github.com/WordPress/gutenberg/pull/36843))
+
+-   Fix wordbreak for URLs. ([36993](https://github.com/WordPress/gutenberg/pull/36993))
+-   Writing Flow Multi-select: Ensure post title content editable after multi-select. ([36843](https://github.com/WordPress/gutenberg/pull/36843))
 
 #### Full Site Editing
-- Highlight "Site" in the navigation panel. ([36762](https://github.com/WordPress/gutenberg/pull/36762))
-- Show all templates and template parts on the site editor list screens. ([36761](https://github.com/WordPress/gutenberg/pull/36761))
+
+-   Highlight "Site" in the navigation panel. ([36762](https://github.com/WordPress/gutenberg/pull/36762))
+-   Show all templates and template parts on the site editor list screens. ([36761](https://github.com/WordPress/gutenberg/pull/36761))
 
 #### Design Tools
-- Border panel: Update to display multiple palette origins. ([36753](https://github.com/WordPress/gutenberg/pull/36753))
-- Cover: Move BoxControlVisualizer in the markup to make it visible. ([36635](https://github.com/WordPress/gutenberg/pull/36635))
+
+-   Border panel: Update to display multiple palette origins. ([36753](https://github.com/WordPress/gutenberg/pull/36753))
+-   Cover: Move BoxControlVisualizer in the markup to make it visible. ([36635](https://github.com/WordPress/gutenberg/pull/36635))
 
 #### Icons
-- [Icons]: Fix Comment Author Name icon. ([36738](https://github.com/WordPress/gutenberg/pull/36738))
-- [Icons]: Fix property names for Comment Author Avatar icon. ([36737](https://github.com/WordPress/gutenberg/pull/36737))
+
+-   [Icons]: Fix Comment Author Name icon. ([36738](https://github.com/WordPress/gutenberg/pull/36738))
+-   [Icons]: Fix property names for Comment Author Avatar icon. ([36737](https://github.com/WordPress/gutenberg/pull/36737))
 
 #### Block Variations
-- Block Styles: Check for existence of scroll container. ([37010](https://github.com/WordPress/gutenberg/pull/37010))
+
+-   Block Styles: Check for existence of scroll container. ([37010](https://github.com/WordPress/gutenberg/pull/37010))
 
 #### Style Variations
-- Block Styles: Add a separating margin to the default picker. ([36976](https://github.com/WordPress/gutenberg/pull/36976))
+
+-   Block Styles: Add a separating margin to the default picker. ([36976](https://github.com/WordPress/gutenberg/pull/36976))
 
 #### Testing
-- Fix: Failing PHPUnit test. ([36931](https://github.com/WordPress/gutenberg/pull/36931))
+
+-   Fix: Failing PHPUnit test. ([36931](https://github.com/WordPress/gutenberg/pull/36931))
 
 #### Widgets Editor
-- Add CSS fix for 33580. ([36759](https://github.com/WordPress/gutenberg/pull/36759))
+
+-   Add CSS fix for 33580. ([36759](https://github.com/WordPress/gutenberg/pull/36759))
 
 #### Post Editor
-- Multi-entity save: Only set site entity to pending if really saving. ([36573](https://github.com/WordPress/gutenberg/pull/36573))
+
+-   Multi-entity save: Only set site entity to pending if really saving. ([36573](https://github.com/WordPress/gutenberg/pull/36573))
 
 #### Global Styles
-- Make the core color palette opt-in for themes with not `theme.json`. ([36496](https://github.com/WordPress/gutenberg/pull/36496))
+
+-   Make the core color palette opt-in for themes with not `theme.json`. ([36496](https://github.com/WordPress/gutenberg/pull/36496))
 
 #### Data Layer
-- Data: Update types and fix type error. ([36190](https://github.com/WordPress/gutenberg/pull/36190))
 
+-   Data: Update types and fix type error. ([36190](https://github.com/WordPress/gutenberg/pull/36190))
 
 ### Performance
 
 #### Block Library
-- Improve performance of wp_navigation lookup.. ([36891](https://github.com/WordPress/gutenberg/pull/36891))
 
+-   Improve performance of wp_navigation lookup.. ([36891](https://github.com/WordPress/gutenberg/pull/36891))
 
 ### Experiments
 
 #### Global Styles
-- Add elements support to the typography panel in global styles. ([36718](https://github.com/WordPress/gutenberg/pull/36718))
-- Add: Border indication to global styles colors. ([36959](https://github.com/WordPress/gutenberg/pull/36959))
-- Add: Corners to custom color picker popover. ([37015](https://github.com/WordPress/gutenberg/pull/37015))
-- Add: Gradient palette editor. ([36820](https://github.com/WordPress/gutenberg/pull/36820))
-- Add: Missing margin to the color picker clear button. ([37016](https://github.com/WordPress/gutenberg/pull/37016))
-- Add: Transparency support on global styles colors. ([36840](https://github.com/WordPress/gutenberg/pull/36840))
-- Add: Uneditable duotone palette on the palette gradient panel. ([36920](https://github.com/WordPress/gutenberg/pull/36920))
-- Call "palettes" and not "color palettes" on panel label. ([36921](https://github.com/WordPress/gutenberg/pull/36921))
-- Color Picker: Improve border, padding, and box shadow styles. ([36963](https://github.com/WordPress/gutenberg/pull/36963))
-- Color UI component: Reorder palettes and update names (core by defaults, user by custom). ([36622](https://github.com/WordPress/gutenberg/pull/36622))
-- Fix: Apply by slug on all origins. ([36841](https://github.com/WordPress/gutenberg/pull/36841))
-- Fix: Color palette is not being stored. ([36817](https://github.com/WordPress/gutenberg/pull/36817))
-- Fix: Custom color picker popover position. ([36965](https://github.com/WordPress/gutenberg/pull/36965))
-- Fix: Theme colors cannot override defaults. ([36811](https://github.com/WordPress/gutenberg/pull/36811))
-- GlobalStyles sidebar: Do not show default palette if theme opts-out. ([36639](https://github.com/WordPress/gutenberg/pull/36639))
-- Make links plural in global styles. ([36819](https://github.com/WordPress/gutenberg/pull/36819))
-- Make user able to change all color palette origins. ([36674](https://github.com/WordPress/gutenberg/pull/36674))
-- Rename `core` origin key to `default` for presets. ([36645](https://github.com/WordPress/gutenberg/pull/36645))
-- Update function names for the public global styles API functions. ([36907](https://github.com/WordPress/gutenberg/pull/36907))
-- Update: Global Styes: Count all color palette origins on the palette counter. ([36922](https://github.com/WordPress/gutenberg/pull/36922))
-- Update: Rename user preset origin to custom. ([36748](https://github.com/WordPress/gutenberg/pull/36748))
-- theme.json: Add `appearanceTools` flag to opt-in into appearance UI controls. ([36646](https://github.com/WordPress/gutenberg/pull/36646))
-
-#### Block Library
-- Allow filtering of Nav block fallback. ([36850](https://github.com/WordPress/gutenberg/pull/36850))
-- Deprecate navigation areas. ([36727](https://github.com/WordPress/gutenberg/pull/36727))
-- Implement suitable fallback for Nav block on front end of site when no menu selected. ([36724](https://github.com/WordPress/gutenberg/pull/36724))
-- Navigation: Fix space-between. ([36441](https://github.com/WordPress/gutenberg/pull/36441))
-- Remove navigationArea context. ([36981](https://github.com/WordPress/gutenberg/pull/36981))
-- Remove unstable max pages attribute from Nav block. ([36877](https://github.com/WordPress/gutenberg/pull/36877))
-- Rename navigationMenuId to ref. ([36739](https://github.com/WordPress/gutenberg/pull/36739))
-- Render empty Nav block if no fallback block can be utilised. ([36849](https://github.com/WordPress/gutenberg/pull/36849))
-- Try always generating navigation post title. ([36760](https://github.com/WordPress/gutenberg/pull/36760))
-- Use first non-empty Nav post as primary fallback for Nav block. ([36740](https://github.com/WordPress/gutenberg/pull/36740))
+
+-   Add elements support to the typography panel in global styles. ([36718](https://github.com/WordPress/gutenberg/pull/36718))
+-   Add: Border indication to global styles colors. ([36959](https://github.com/WordPress/gutenberg/pull/36959))
+-   Add: Corners to custom color picker popover. ([37015](https://github.com/WordPress/gutenberg/pull/37015))
+-   Add: Gradient palette editor. ([36820](https://github.com/WordPress/gutenberg/pull/36820))
+-   Add: Missing margin to the color picker clear button. ([37016](https://github.com/WordPress/gutenberg/pull/37016))
+-   Add: Transparency support on global styles colors. ([36840](https://github.com/WordPress/gutenberg/pull/36840))
+-   Add: Uneditable duotone palette on the palette gradient panel. ([36920](https://github.com/WordPress/gutenberg/pull/36920))
+-   Call "palettes" and not "color palettes" on panel label. ([36921](https://github.com/WordPress/gutenberg/pull/36921))
+-   Color Picker: Improve border, padding, and box shadow styles. ([36963](https://github.com/WordPress/gutenberg/pull/36963))
+-   Color UI component: Reorder palettes and update names (core by defaults, user by custom). ([36622](https://github.com/WordPress/gutenberg/pull/36622))
+-   Fix: Apply by slug on all origins. ([36841](https://github.com/WordPress/gutenberg/pull/36841))
+-   Fix: Color palette is not being stored. ([36817](https://github.com/WordPress/gutenberg/pull/36817))
+-   Fix: Custom color picker popover position. ([36965](https://github.com/WordPress/gutenberg/pull/36965))
+-   Fix: Theme colors cannot override defaults. ([36811](https://github.com/WordPress/gutenberg/pull/36811))
+-   GlobalStyles sidebar: Do not show default palette if theme opts-out. ([36639](https://github.com/WordPress/gutenberg/pull/36639))
+-   Make links plural in global styles. ([36819](https://github.com/WordPress/gutenberg/pull/36819))
+-   Make user able to change all color palette origins. ([36674](https://github.com/WordPress/gutenberg/pull/36674))
+-   Rename `core` origin key to `default` for presets. ([36645](https://github.com/WordPress/gutenberg/pull/36645))
+-   Update function names for the public global styles API functions. ([36907](https://github.com/WordPress/gutenberg/pull/36907))
+-   Update: Global Styes: Count all color palette origins on the palette counter. ([36922](https://github.com/WordPress/gutenberg/pull/36922))
+-   Update: Rename user preset origin to custom. ([36748](https://github.com/WordPress/gutenberg/pull/36748))
+-   theme.json: Add `appearanceTools` flag to opt-in into appearance UI controls. ([36646](https://github.com/WordPress/gutenberg/pull/36646))
+
+#### Block Library
+
+-   Allow filtering of Nav block fallback. ([36850](https://github.com/WordPress/gutenberg/pull/36850))
+-   Deprecate navigation areas. ([36727](https://github.com/WordPress/gutenberg/pull/36727))
+-   Implement suitable fallback for Nav block on front end of site when no menu selected. ([36724](https://github.com/WordPress/gutenberg/pull/36724))
+-   Navigation: Fix space-between. ([36441](https://github.com/WordPress/gutenberg/pull/36441))
+-   Remove navigationArea context. ([36981](https://github.com/WordPress/gutenberg/pull/36981))
+-   Remove unstable max pages attribute from Nav block. ([36877](https://github.com/WordPress/gutenberg/pull/36877))
+-   Rename navigationMenuId to ref. ([36739](https://github.com/WordPress/gutenberg/pull/36739))
+-   Render empty Nav block if no fallback block can be utilised. ([36849](https://github.com/WordPress/gutenberg/pull/36849))
+-   Try always generating navigation post title. ([36760](https://github.com/WordPress/gutenberg/pull/36760))
+-   Use first non-empty Nav post as primary fallback for Nav block. ([36740](https://github.com/WordPress/gutenberg/pull/36740))
 
 #### Full Site Editing
-- Add success and error snackbars to the templates list page. ([36808](https://github.com/WordPress/gutenberg/pull/36808))
-- Add templates list page for site editor. ([36379](https://github.com/WordPress/gutenberg/pull/36379))
-- Implement "Add New" for templates list in Site Editor. ([36592](https://github.com/WordPress/gutenberg/pull/36592))
-- Remove block template resolution unit tests. ([36855](https://github.com/WordPress/gutenberg/pull/36855))
-- Remove the Styles link in Site Editor. ([36637](https://github.com/WordPress/gutenberg/pull/36637))
-- Update and align template descriptions. ([36000](https://github.com/WordPress/gutenberg/pull/36000))
-- [REST] Restore the missing double slash in the ID received by /templates. ([36881](https://github.com/WordPress/gutenberg/pull/36881))
+
+-   Add success and error snackbars to the templates list page. ([36808](https://github.com/WordPress/gutenberg/pull/36808))
+-   Add templates list page for site editor. ([36379](https://github.com/WordPress/gutenberg/pull/36379))
+-   Implement "Add New" for templates list in Site Editor. ([36592](https://github.com/WordPress/gutenberg/pull/36592))
+-   Remove block template resolution unit tests. ([36855](https://github.com/WordPress/gutenberg/pull/36855))
+-   Remove the Styles link in Site Editor. ([36637](https://github.com/WordPress/gutenberg/pull/36637))
+-   Update and align template descriptions. ([36000](https://github.com/WordPress/gutenberg/pull/36000))
+-   [REST] Restore the missing double slash in the ID received by /templates. ([36881](https://github.com/WordPress/gutenberg/pull/36881))
 
 #### Accessibility
-- Use table layout in templates list screen. ([36707](https://github.com/WordPress/gutenberg/pull/36707))
 
+-   Use table layout in templates list screen. ([36707](https://github.com/WordPress/gutenberg/pull/36707))
 
 ### Documentation
 
-- Add brief information about blockGap to the theme.json how-to guide. ([36558](https://github.com/WordPress/gutenberg/pull/36558))
-- Add placeholder in URLInput documentation. ([36799](https://github.com/WordPress/gutenberg/pull/36799))
-- Block Supports: Update block supports documentation after typography reshaping. ([36894](https://github.com/WordPress/gutenberg/pull/36894))
-- Docs: Alphabetize the How to Guides section. ([35904](https://github.com/WordPress/gutenberg/pull/35904))
-- Docs: Fix broken link to @wordpress/stylelint-config. ([36936](https://github.com/WordPress/gutenberg/pull/36936))
-- Docs: Improvements on `Create a Block Tutorial` from `Block Editor handbook`. ([36553](https://github.com/WordPress/gutenberg/pull/36553))
-- Docs: Update history.md with description of the page. ([36888](https://github.com/WordPress/gutenberg/pull/36888))
-- Update Getting Started with info to stay informed. ([36498](https://github.com/WordPress/gutenberg/pull/36498))
-- Update Pattern block category and add documentation. ([36144](https://github.com/WordPress/gutenberg/pull/36144))
-- Various inline docblock corrections. ([36793](https://github.com/WordPress/gutenberg/pull/36793))
+-   Add brief information about blockGap to the theme.json how-to guide. ([36558](https://github.com/WordPress/gutenberg/pull/36558))
+-   Add placeholder in URLInput documentation. ([36799](https://github.com/WordPress/gutenberg/pull/36799))
+-   Block Supports: Update block supports documentation after typography reshaping. ([36894](https://github.com/WordPress/gutenberg/pull/36894))
+-   Docs: Alphabetize the How to Guides section. ([35904](https://github.com/WordPress/gutenberg/pull/35904))
+-   Docs: Fix broken link to @wordpress/stylelint-config. ([36936](https://github.com/WordPress/gutenberg/pull/36936))
+-   Docs: Improvements on `Create a Block Tutorial` from `Block Editor handbook`. ([36553](https://github.com/WordPress/gutenberg/pull/36553))
+-   Docs: Update history.md with description of the page. ([36888](https://github.com/WordPress/gutenberg/pull/36888))
+-   Update Getting Started with info to stay informed. ([36498](https://github.com/WordPress/gutenberg/pull/36498))
+-   Update Pattern block category and add documentation. ([36144](https://github.com/WordPress/gutenberg/pull/36144))
+-   Various inline docblock corrections. ([36793](https://github.com/WordPress/gutenberg/pull/36793))
 
 #### Components
-- ToolsPanel: Update panel readme and stories. ([36557](https://github.com/WordPress/gutenberg/pull/36557))
 
+-   ToolsPanel: Update panel readme and stories. ([36557](https://github.com/WordPress/gutenberg/pull/36557))
 
 ### Code Quality
 
-- Blocks: Refactor generator-based actions to thunks. ([36468](https://github.com/WordPress/gutenberg/pull/36468))
-- Remove useless bubblesVirtually prop from BlockInspector. ([37024](https://github.com/WordPress/gutenberg/pull/37024))
+-   Blocks: Refactor generator-based actions to thunks. ([36468](https://github.com/WordPress/gutenberg/pull/36468))
+-   Remove useless bubblesVirtually prop from BlockInspector. ([37024](https://github.com/WordPress/gutenberg/pull/37024))
 
 #### Global Styles
-- Move Global Styles code to `lib/compat/wordpress-5.9` folder. ([36978](https://github.com/WordPress/gutenberg/pull/36978))
-- Rename `gutenberg_` to `wp_` for some functions that land in WordPress 5.9. ([36913](https://github.com/WordPress/gutenberg/pull/36913))
-- Update global styles public API. ([36610](https://github.com/WordPress/gutenberg/pull/36610))
-- Update the `WP_Theme_JSON_Gutenberg` class to be like the core one. ([36973](https://github.com/WordPress/gutenberg/pull/36973))
-- Update the `WP_Theme_JSON_Resolver_Gutenberg` class to be like the core one. ([36974](https://github.com/WordPress/gutenberg/pull/36974))
-- `theme.json`: Sort keys alphabetically. ([36968](https://github.com/WordPress/gutenberg/pull/36968))
+
+-   Move Global Styles code to `lib/compat/wordpress-5.9` folder. ([36978](https://github.com/WordPress/gutenberg/pull/36978))
+-   Rename `gutenberg_` to `wp_` for some functions that land in WordPress 5.9. ([36913](https://github.com/WordPress/gutenberg/pull/36913))
+-   Update global styles public API. ([36610](https://github.com/WordPress/gutenberg/pull/36610))
+-   Update the `WP_Theme_JSON_Gutenberg` class to be like the core one. ([36973](https://github.com/WordPress/gutenberg/pull/36973))
+-   Update the `WP_Theme_JSON_Resolver_Gutenberg` class to be like the core one. ([36974](https://github.com/WordPress/gutenberg/pull/36974))
+-   `theme.json`: Sort keys alphabetically. ([36968](https://github.com/WordPress/gutenberg/pull/36968))
 
 #### Block Library
-- Navigation: Remove outdated separate "Home" link styles. ([36608](https://github.com/WordPress/gutenberg/pull/36608))
-- Post Featured Image: Remove withNotices HOC. ([36596](https://github.com/WordPress/gutenberg/pull/36596))
-- [Comment Author Avatar]: Remove extraneous color link support flag. ([36956](https://github.com/WordPress/gutenberg/pull/36956))
+
+-   Navigation: Remove outdated separate "Home" link styles. ([36608](https://github.com/WordPress/gutenberg/pull/36608))
+-   Post Featured Image: Remove withNotices HOC. ([36596](https://github.com/WordPress/gutenberg/pull/36596))
+-   [Comment Author Avatar]: Remove extraneous color link support flag. ([36956](https://github.com/WordPress/gutenberg/pull/36956))
 
 #### Post Editor
-- [Edit Post]: Remove EditPostSettings context provider. ([36949](https://github.com/WordPress/gutenberg/pull/36949))
 
+-   [Edit Post]: Remove EditPostSettings context provider. ([36949](https://github.com/WordPress/gutenberg/pull/36949))
 
 ### Tools
 
-- Add ajlende to JSON Schema codeowners. ([36580](https://github.com/WordPress/gutenberg/pull/36580))
-- Report dependencies externalized with Dependency Extraction Plugin. ([35106](https://github.com/WordPress/gutenberg/pull/35106))
-- Update CODEOWNERS for @mkaz and documentation cleanup. ([36581](https://github.com/WordPress/gutenberg/pull/36581))
-- Update mkaz codeowner on schemas. ([36686](https://github.com/WordPress/gutenberg/pull/36686))
+-   Add ajlende to JSON Schema codeowners. ([36580](https://github.com/WordPress/gutenberg/pull/36580))
+-   Report dependencies externalized with Dependency Extraction Plugin. ([35106](https://github.com/WordPress/gutenberg/pull/35106))
+-   Update CODEOWNERS for @mkaz and documentation cleanup. ([36581](https://github.com/WordPress/gutenberg/pull/36581))
+-   Update mkaz codeowner on schemas. ([36686](https://github.com/WordPress/gutenberg/pull/36686))
 
 #### Testing
-- Reorganize end-to-end tests folders and files. ([36734](https://github.com/WordPress/gutenberg/pull/36734))
-- Scripts: Upgrade Puppeteer to v11. ([36040](https://github.com/WordPress/gutenberg/pull/36040))
-- Update template controller unit test now that author support is in WP core. ([36987](https://github.com/WordPress/gutenberg/pull/36987))
-- end-to-end Tests: Fix failing image end-to-end test by waiting for required element. ([36982](https://github.com/WordPress/gutenberg/pull/36982))
 
+-   Reorganize end-to-end tests folders and files. ([36734](https://github.com/WordPress/gutenberg/pull/36734))
+-   Scripts: Upgrade Puppeteer to v11. ([36040](https://github.com/WordPress/gutenberg/pull/36040))
+-   Update template controller unit test now that author support is in WP core. ([36987](https://github.com/WordPress/gutenberg/pull/36987))
+-   end-to-end Tests: Fix failing image end-to-end test by waiting for required element. ([36982](https://github.com/WordPress/gutenberg/pull/36982))
 
 ### Security
 
 #### Block Library
-- [ Comment Author Avatar Block ] - Escape styles attribute. ([36988](https://github.com/WordPress/gutenberg/pull/36988))
 
+-   [ Comment Author Avatar Block ] - Escape styles attribute. ([36988](https://github.com/WordPress/gutenberg/pull/36988))
 
 ### Various
 
-- Add button text when no colors found. ([36684](https://github.com/WordPress/gutenberg/pull/36684))
-- Add origin and author to template rest api. ([36896](https://github.com/WordPress/gutenberg/pull/36896))
-- Change .nvmrc and documentation for Node.js version (LTS to 14.18.1). ([36744](https://github.com/WordPress/gutenberg/pull/36744))
-- Clarify i18n context for PostTemplateActions's "New" label. ([36679](https://github.com/WordPress/gutenberg/pull/36679))
-- Mobile - Preformatted block - Fix showing the default background color. ([36883](https://github.com/WordPress/gutenberg/pull/36883))
-- Mobile - RichText - Fixes an issue where the font size value won't update. ([36621](https://github.com/WordPress/gutenberg/pull/36621))
-- Revert erroneous native editor package version bumps. ([36633](https://github.com/WordPress/gutenberg/pull/36633))
-- Schemas: Allow custom blocks in theme.json styles. ([36411](https://github.com/WordPress/gutenberg/pull/36411))
-- Site Editor: Sync export API. ([36908](https://github.com/WordPress/gutenberg/pull/36908))
-- Update: Migrate global styles user database data on the rest endpoint. ([36747](https://github.com/WordPress/gutenberg/pull/36747))
+-   Add button text when no colors found. ([36684](https://github.com/WordPress/gutenberg/pull/36684))
+-   Add origin and author to template rest api. ([36896](https://github.com/WordPress/gutenberg/pull/36896))
+-   Change .nvmrc and documentation for Node.js version (LTS to 14.18.1). ([36744](https://github.com/WordPress/gutenberg/pull/36744))
+-   Clarify i18n context for PostTemplateActions's "New" label. ([36679](https://github.com/WordPress/gutenberg/pull/36679))
+-   Mobile - Preformatted block - Fix showing the default background color. ([36883](https://github.com/WordPress/gutenberg/pull/36883))
+-   Mobile - RichText - Fixes an issue where the font size value won't update. ([36621](https://github.com/WordPress/gutenberg/pull/36621))
+-   Revert erroneous native editor package version bumps. ([36633](https://github.com/WordPress/gutenberg/pull/36633))
+-   Schemas: Allow custom blocks in theme.json styles. ([36411](https://github.com/WordPress/gutenberg/pull/36411))
+-   Site Editor: Sync export API. ([36908](https://github.com/WordPress/gutenberg/pull/36908))
+-   Update: Migrate global styles user database data on the rest endpoint. ([36747](https://github.com/WordPress/gutenberg/pull/36747))
 
 #### Site Editor
-- Add 'Clear customizations' button to template list page. ([36802](https://github.com/WordPress/gutenberg/pull/36802))
-- Make Reusable blocks available in the Site Editor. ([36511](https://github.com/WordPress/gutenberg/pull/36511))
-- Remove color, spacing, and layout options for Template Part block. ([36571](https://github.com/WordPress/gutenberg/pull/36571))
-- Set the <title> on the list page to be same as the CPT name. ([36805](https://github.com/WordPress/gutenberg/pull/36805))
-- Template list add rename action. ([36879](https://github.com/WordPress/gutenberg/pull/36879))
-- Update delete template button. ([36815](https://github.com/WordPress/gutenberg/pull/36815))
-- Update some small style regressions in the template list. ([36822](https://github.com/WordPress/gutenberg/pull/36822))
+
+-   Add 'Clear customizations' button to template list page. ([36802](https://github.com/WordPress/gutenberg/pull/36802))
+-   Make Reusable blocks available in the Site Editor. ([36511](https://github.com/WordPress/gutenberg/pull/36511))
+-   Remove color, spacing, and layout options for Template Part block. ([36571](https://github.com/WordPress/gutenberg/pull/36571))
+-   Set the <title> on the list page to be same as the CPT name. ([36805](https://github.com/WordPress/gutenberg/pull/36805))
+-   Template list add rename action. ([36879](https://github.com/WordPress/gutenberg/pull/36879))
+-   Update delete template button. ([36815](https://github.com/WordPress/gutenberg/pull/36815))
+-   Update some small style regressions in the template list. ([36822](https://github.com/WordPress/gutenberg/pull/36822))
 
 #### Block Library
--  Block Library: Add the Comments Pagination block. ([36872](https://github.com/WordPress/gutenberg/pull/36872))
-- Gallery block: Turn on auto-migration of v1 Gallery blocks to v2 format when edited. ([36191](https://github.com/WordPress/gutenberg/pull/36191))
-- Remove reference to gutenberg_, swap with wp_. ([36652](https://github.com/WordPress/gutenberg/pull/36652))
-- Update featured image placeholder graphic. ([36712](https://github.com/WordPress/gutenberg/pull/36712))
-- [Template Part]:Remove support for conversion to Reusable block. ([36918](https://github.com/WordPress/gutenberg/pull/36918))
+
+-   Block Library: Add the Comments Pagination block. ([36872](https://github.com/WordPress/gutenberg/pull/36872))
+-   Gallery block: Turn on auto-migration of v1 Gallery blocks to v2 format when edited. ([36191](https://github.com/WordPress/gutenberg/pull/36191))
+-   Remove reference to gutenberg*, swap with wp*. ([36652](https://github.com/WordPress/gutenberg/pull/36652))
+-   Update featured image placeholder graphic. ([36712](https://github.com/WordPress/gutenberg/pull/36712))
+-   [Template Part]:Remove support for conversion to Reusable block. ([36918](https://github.com/WordPress/gutenberg/pull/36918))
 
 #### Components
-- Add experimental `ConfirmDialog`. ([34153](https://github.com/WordPress/gutenberg/pull/34153))
-- Offset the parent iframe when computing Popover position. ([36876](https://github.com/WordPress/gutenberg/pull/36876))
-- ToolsPanel: Prevent tools panel menu increasing empty panel height. ([36895](https://github.com/WordPress/gutenberg/pull/36895))
-- Update destructive tertiary button styles, and template list. ([36915](https://github.com/WordPress/gutenberg/pull/36915))
+
+-   Add experimental `ConfirmDialog`. ([34153](https://github.com/WordPress/gutenberg/pull/34153))
+-   Offset the parent iframe when computing Popover position. ([36876](https://github.com/WordPress/gutenberg/pull/36876))
+-   ToolsPanel: Prevent tools panel menu increasing empty panel height. ([36895](https://github.com/WordPress/gutenberg/pull/36895))
+-   Update destructive tertiary button styles, and template list. ([36915](https://github.com/WordPress/gutenberg/pull/36915))
 
 #### Themes
-- Move the theme editor under tools for FSE themes. ([36723](https://github.com/WordPress/gutenberg/pull/36723))
-- Update the block theme folders to templates and parts. ([36647](https://github.com/WordPress/gutenberg/pull/36647))
+
+-   Move the theme editor under tools for FSE themes. ([36723](https://github.com/WordPress/gutenberg/pull/36723))
+-   Update the block theme folders to templates and parts. ([36647](https://github.com/WordPress/gutenberg/pull/36647))
 
 #### Block Editor
-- Make appender fixed position to avoid jumps in the UI. ([36605](https://github.com/WordPress/gutenberg/pull/36605))
-- [Inserter]: Adjust order of theme blocks and reorder inserter items. ([36719](https://github.com/WordPress/gutenberg/pull/36719))
+
+-   Make appender fixed position to avoid jumps in the UI. ([36605](https://github.com/WordPress/gutenberg/pull/36605))
+-   [Inserter]: Adjust order of theme blocks and reorder inserter items. ([36719](https://github.com/WordPress/gutenberg/pull/36719))
 
 #### Block Validation/Deprecation
-- Add plugin meta data to Nav Area block deprecation notice. ([36777](https://github.com/WordPress/gutenberg/pull/36777))
+
+-   Add plugin meta data to Nav Area block deprecation notice. ([36777](https://github.com/WordPress/gutenberg/pull/36777))
 
 #### Design Tools
-- Post Featured Image: Move width and height controls into the Dimensions panel via SlotFill. ([36540](https://github.com/WordPress/gutenberg/pull/36540))
 
-#### Template Editor
-- Update resize handle styling in template part focus mode. ([36410](https://github.com/WordPress/gutenberg/pull/36410))
+-   Post Featured Image: Move width and height controls into the Dimensions panel via SlotFill. ([36540](https://github.com/WordPress/gutenberg/pull/36540))
 
-#### Data Layer
-- Data: Remove usage of deprecated register methods. ([36344](https://github.com/WordPress/gutenberg/pull/36344))
+#### Template Editor
 
-#### Accessibility
-- Block Editor List View: Use anchor elements instead of buttons. ([35655](https://github.com/WordPress/gutenberg/pull/35655))
+-   Update resize handle styling in template part focus mode. ([36410](https://github.com/WordPress/gutenberg/pull/36410))
 
+#### Data Layer
 
+-   Data: Remove usage of deprecated register methods. ([36344](https://github.com/WordPress/gutenberg/pull/36344))
 
+#### Accessibility
 
+-   Block Editor List View: Use anchor elements instead of buttons. ([35655](https://github.com/WordPress/gutenberg/pull/35655))
 
 = 12.0.1 =
 
+## Changelog
+
 ### Enhancements
 
 #### Global Styles
-- Add caching to `WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_custom_post_type()`. ([36584](https://github.com/WordPress/gutenberg/pull/36584))
 
+-   Add caching to `WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_custom_post_type()`. ([36584](https://github.com/WordPress/gutenberg/pull/36584))
 
 = 12.0.0 =
 
-### Features
+## Changelog
 
-- Disable BottomSheet swipe gesture to navigate backwards. ([36271](https://github.com/WordPress/gutenberg/pull/36271))
+### Features
 
+-   Disable BottomSheet swipe gesture to navigate backwards. ([36271](https://github.com/WordPress/gutenberg/pull/36271))
 
 ### Enhancements
 
 #### Block Library
-- Move WP_REST_Block_Navigation_Areas_Controller from Gutenberg to Core. ([36374](https://github.com/WordPress/gutenberg/pull/36374))
-- Let Featured Image block inherit dimensions, look like a placeholder. ([36517](https://github.com/WordPress/gutenberg/pull/36517))
-- Change all the uses of "website" to "site". ([36220](https://github.com/WordPress/gutenberg/pull/36220))
-- Enable Previews for Navigation Link Blocks. ([36412](https://github.com/WordPress/gutenberg/pull/36412))
+
+-   Move WP_REST_Block_Navigation_Areas_Controller from Gutenberg to Core. ([36374](https://github.com/WordPress/gutenberg/pull/36374))
+-   Let Featured Image block inherit dimensions, look like a placeholder. ([36517](https://github.com/WordPress/gutenberg/pull/36517))
+-   Change all the uses of "website" to "site". ([36220](https://github.com/WordPress/gutenberg/pull/36220))
+-   Enable Previews for Navigation Link Blocks. ([36412](https://github.com/WordPress/gutenberg/pull/36412))
 
 #### Site Editor
-- Add  welcome guide. ([36172](https://github.com/WordPress/gutenberg/pull/36172))
-- Update back button URL. ([36313](https://github.com/WordPress/gutenberg/pull/36313))
-- Improve compatiblity with menu endpoints WordPress 5.9. ([36372](https://github.com/WordPress/gutenberg/pull/36372))
-- React to any errors coming up in gutenberg_migrate_menu_to_navigation_post. ([36461](https://github.com/WordPress/gutenberg/pull/36461))
+
+-   Add welcome guide. ([36172](https://github.com/WordPress/gutenberg/pull/36172))
+-   Update back button URL. ([36313](https://github.com/WordPress/gutenberg/pull/36313))
+-   Improve compatiblity with menu endpoints WordPress 5.9. ([36372](https://github.com/WordPress/gutenberg/pull/36372))
+-   React to any errors coming up in gutenberg_migrate_menu_to_navigation_post. ([36461](https://github.com/WordPress/gutenberg/pull/36461))
 
 #### Block API
-- Update schema to require either a type or an enum. ([36267](https://github.com/WordPress/gutenberg/pull/36267))
-- Add `_wp_array_set` and `_wp_to_kebab_case` to 5.8 compat. ([36399](https://github.com/WordPress/gutenberg/pull/36399))
+
+-   Update schema to require either a type or an enum. ([36267](https://github.com/WordPress/gutenberg/pull/36267))
+-   Add `_wp_array_set` and `_wp_to_kebab_case` to 5.8 compat. ([36399](https://github.com/WordPress/gutenberg/pull/36399))
 
 #### Design Tools
-- Paragraph: Merge text settings into typography panel. ([36334](https://github.com/WordPress/gutenberg/pull/36334))
+
+-   Paragraph: Merge text settings into typography panel. ([36334](https://github.com/WordPress/gutenberg/pull/36334))
 
 #### Build Tooling
-- Add TypeScript for builds and tests. ([36260](https://github.com/WordPress/gutenberg/pull/36260))
-- stylelint-config: Widen the acceptable version range for the 'stylelint' peerDependency. ([36518](https://github.com/WordPress/gutenberg/pull/36518))
-- Update Babel packages to 7.16 version. ([36244](https://github.com/WordPress/gutenberg/pull/36244))
+
+-   Add TypeScript for builds and tests. ([36260](https://github.com/WordPress/gutenberg/pull/36260))
+-   stylelint-config: Widen the acceptable version range for the 'stylelint' peerDependency. ([36518](https://github.com/WordPress/gutenberg/pull/36518))
+-   Update Babel packages to 7.16 version. ([36244](https://github.com/WordPress/gutenberg/pull/36244))
 
 #### Style Variations
-- Block Styles: Show style preview when hovered or focused. ([34522](https://github.com/WordPress/gutenberg/pull/34522))
+
+-   Block Styles: Show style preview when hovered or focused. ([34522](https://github.com/WordPress/gutenberg/pull/34522))
 
 #### Schema
-- Update schema URL to wp.org domain. ([36316](https://github.com/WordPress/gutenberg/pull/36316))
-- Allow block.json attribute type to be an array. ([36295](https://github.com/WordPress/gutenberg/pull/36295))
+
+-   Update schema URL to wp.org domain. ([36316](https://github.com/WordPress/gutenberg/pull/36316))
+-   Allow block.json attribute type to be an array. ([36295](https://github.com/WordPress/gutenberg/pull/36295))
 
 ### Bug Fixes
 
-- Chore: Fix small typos on the rest endpoints. ([36272](https://github.com/WordPress/gutenberg/pull/36272))
-- DEWP: Fix deprecation warning. ([36285](https://github.com/WordPress/gutenberg/pull/36285))
-- Fix mobile horizontal scrollbar. ([36567](https://github.com/WordPress/gutenberg/pull/36567))
-- Fix schema to allow for custom blocks in theme.json. ([36341](https://github.com/WordPress/gutenberg/pull/36341))
-- Theme switch on the global styles rest api unit test. ([36277](https://github.com/WordPress/gutenberg/pull/36277))
-- Polish metabox container. ([36297](https://github.com/WordPress/gutenberg/pull/36297))
+-   Chore: Fix small typos on the rest endpoints. ([36272](https://github.com/WordPress/gutenberg/pull/36272))
+-   DEWP: Fix deprecation warning. ([36285](https://github.com/WordPress/gutenberg/pull/36285))
+-   Fix mobile horizontal scrollbar. ([36567](https://github.com/WordPress/gutenberg/pull/36567))
+-   Fix schema to allow for custom blocks in theme.json. ([36341](https://github.com/WordPress/gutenberg/pull/36341))
+-   Theme switch on the global styles rest api unit test. ([36277](https://github.com/WordPress/gutenberg/pull/36277))
+-   Polish metabox container. ([36297](https://github.com/WordPress/gutenberg/pull/36297))
 
 #### Block Library
-- Fix background colours in nested submenus. ([36476](https://github.com/WordPress/gutenberg/pull/36476))
-- Fix colour rendering in Navigation overlay. ([36479](https://github.com/WordPress/gutenberg/pull/36479))
-- Fix duplicate custom classnames in navigation submenu block. ([36478](https://github.com/WordPress/gutenberg/pull/36478))
-- Fix submenu justification and spacer orientation. ([36340](https://github.com/WordPress/gutenberg/pull/36340))
-- Group - Fix overzealous regex when restoring inner containers. ([36221](https://github.com/WordPress/gutenberg/pull/36221))
-- Hide visilibility and status for navigation posts. ([36363](https://github.com/WordPress/gutenberg/pull/36363))
-- Nav block menu switcher - decode HTML entities and utilise accessible markup pattern. ([36397](https://github.com/WordPress/gutenberg/pull/36397))
-- Navigation: Fix click-button size, submenu directions, scrollbars. ([36215](https://github.com/WordPress/gutenberg/pull/36215))
-- Page List block: Fix space before `href` attribute. ([36505](https://github.com/WordPress/gutenberg/pull/36505))
-- Page List: Use core entities instead of direct apiFetch. ([36531](https://github.com/WordPress/gutenberg/pull/36531))
-- Post Comments Form: Ensure typography styles are applied to child elements. ([36425](https://github.com/WordPress/gutenberg/pull/36425))
-- Post title block default CSS: Add a break-word rule by default. ([35703](https://github.com/WordPress/gutenberg/pull/35703))
+
+-   Fix background colours in nested submenus. ([36476](https://github.com/WordPress/gutenberg/pull/36476))
+-   Fix colour rendering in Navigation overlay. ([36479](https://github.com/WordPress/gutenberg/pull/36479))
+-   Fix duplicate custom classnames in navigation submenu block. ([36478](https://github.com/WordPress/gutenberg/pull/36478))
+-   Fix submenu justification and spacer orientation. ([36340](https://github.com/WordPress/gutenberg/pull/36340))
+-   Group - Fix overzealous regex when restoring inner containers. ([36221](https://github.com/WordPress/gutenberg/pull/36221))
+-   Hide visilibility and status for navigation posts. ([36363](https://github.com/WordPress/gutenberg/pull/36363))
+-   Nav block menu switcher - decode HTML entities and utilise accessible markup pattern. ([36397](https://github.com/WordPress/gutenberg/pull/36397))
+-   Navigation: Fix click-button size, submenu directions, scrollbars. ([36215](https://github.com/WordPress/gutenberg/pull/36215))
+-   Page List block: Fix space before `href` attribute. ([36505](https://github.com/WordPress/gutenberg/pull/36505))
+-   Page List: Use core entities instead of direct apiFetch. ([36531](https://github.com/WordPress/gutenberg/pull/36531))
+-   Post Comments Form: Ensure typography styles are applied to child elements. ([36425](https://github.com/WordPress/gutenberg/pull/36425))
+-   Post title block default CSS: Add a break-word rule by default. ([35703](https://github.com/WordPress/gutenberg/pull/35703))
 
 #### Block API
-- Use firstChild and lastChild when parsing lists from MS Word. ([36019](https://github.com/WordPress/gutenberg/pull/36019))
+
+-   Use firstChild and lastChild when parsing lists from MS Word. ([36019](https://github.com/WordPress/gutenberg/pull/36019))
 
 #### Mobile
-- [Android] Synchronize content retrieval over the bridge. ([36072](https://github.com/WordPress/gutenberg/pull/36072))
+
+-   [Android] Synchronize content retrieval over the bridge. ([36072](https://github.com/WordPress/gutenberg/pull/36072))
 
 #### Full Site Editing
-- Fix layout shift in `core/post-featured-image` block with `isLink` enabled. ([36552](https://github.com/WordPress/gutenberg/pull/36552))
-- Template Part Block: Add some guards. ([36324](https://github.com/WordPress/gutenberg/pull/36324))
-- Chore: Add rewrite false to global styles CPT. ([36273](https://github.com/WordPress/gutenberg/pull/36273))
-- Revert "theme.json: Adds a setting property that enables some other ones". ([36477](https://github.com/WordPress/gutenberg/pull/36477))
--  Update more references to __experimental menu endpoints to make them stable. ([36386](https://github.com/WordPress/gutenberg/pull/36386))
+
+-   Fix layout shift in `core/post-featured-image` block with `isLink` enabled. ([36552](https://github.com/WordPress/gutenberg/pull/36552))
+-   Template Part Block: Add some guards. ([36324](https://github.com/WordPress/gutenberg/pull/36324))
+-   Chore: Add rewrite false to global styles CPT. ([36273](https://github.com/WordPress/gutenberg/pull/36273))
+-   Revert "theme.json: Adds a setting property that enables some other ones". ([36477](https://github.com/WordPress/gutenberg/pull/36477))
+-   Update more references to \_\_experimental menu endpoints to make them stable. ([36386](https://github.com/WordPress/gutenberg/pull/36386))
 
 #### Site Editor
-- Fix site editor reset styles in WP 5.9. ([36390](https://github.com/WordPress/gutenberg/pull/36390))
-- Site Editor - prevent loading state from showing the admin menu. ([36455](https://github.com/WordPress/gutenberg/pull/36455))
+
+-   Fix site editor reset styles in WP 5.9. ([36390](https://github.com/WordPress/gutenberg/pull/36390))
+-   Site Editor - prevent loading state from showing the admin menu. ([36455](https://github.com/WordPress/gutenberg/pull/36455))
 
 #### Themes
-- Add the ability to opt-out of Core color palette V2. ([36492](https://github.com/WordPress/gutenberg/pull/36492))
+
+-   Add the ability to opt-out of Core color palette V2. ([36492](https://github.com/WordPress/gutenberg/pull/36492))
 
 #### Build Tooling
-- Fix not transforming logical assignments for packages. ([36484](https://github.com/WordPress/gutenberg/pull/36484))
+
+-   Fix not transforming logical assignments for packages. ([36484](https://github.com/WordPress/gutenberg/pull/36484))
 
 #### Global Styles
-- Replace get_theme_file_path in theme_has_support. ([36398](https://github.com/WordPress/gutenberg/pull/36398))
+
+-   Replace get_theme_file_path in theme_has_support. ([36398](https://github.com/WordPress/gutenberg/pull/36398))
 
 #### Block Editor
-- Strip meta tags from pasted links in Chromium. ([36356](https://github.com/WordPress/gutenberg/pull/36356))
-- Add `webp` extension in `filePasteHandler` and `getPasteEventData`. ([36361](https://github.com/WordPress/gutenberg/pull/36361))
+
+-   Strip meta tags from pasted links in Chromium. ([36356](https://github.com/WordPress/gutenberg/pull/36356))
+-   Add `webp` extension in `filePasteHandler` and `getPasteEventData`. ([36361](https://github.com/WordPress/gutenberg/pull/36361))
 
 #### CSS & Styling
-- Update theme styles for the code block. ([36282](https://github.com/WordPress/gutenberg/pull/36282))
 
+-   Update theme styles for the code block. ([36282](https://github.com/WordPress/gutenberg/pull/36282))
 
 ### Experiments
 
 #### Global Styles
-- Chore: Add comment to Remove filter to allow WP variables after min version is 5.8. ([36281](https://github.com/WordPress/gutenberg/pull/36281))
-- Chore: Update: Centralize safe_style_css usages. ([36280](https://github.com/WordPress/gutenberg/pull/36280))
-- Add block icon next to blocks list. ([36520](https://github.com/WordPress/gutenberg/pull/36520))
-- theme.json: Adds a setting property that enables some other ones. ([36246](https://github.com/WordPress/gutenberg/pull/36246))
+
+-   Chore: Add comment to Remove filter to allow WP variables after min version is 5.8. ([36281](https://github.com/WordPress/gutenberg/pull/36281))
+-   Chore: Update: Centralize safe_style_css usages. ([36280](https://github.com/WordPress/gutenberg/pull/36280))
+-   Add block icon next to blocks list. ([36520](https://github.com/WordPress/gutenberg/pull/36520))
+-   theme.json: Adds a setting property that enables some other ones. ([36246](https://github.com/WordPress/gutenberg/pull/36246))
 
 #### Block Library
-- Apply i18n functions to Nav block menu drops when selecting existing Menu. ([36301](https://github.com/WordPress/gutenberg/pull/36301))
-- Navigation: Refactor and simplify setup state. ([36375](https://github.com/WordPress/gutenberg/pull/36375))
-- Rename fse_navigation_area to wp_navigation_area. ([36460](https://github.com/WordPress/gutenberg/pull/36460))
-- Return wp error from wp_insert_post. ([36483](https://github.com/WordPress/gutenberg/pull/36483))
+
+-   Apply i18n functions to Nav block menu drops when selecting existing Menu. ([36301](https://github.com/WordPress/gutenberg/pull/36301))
+-   Navigation: Refactor and simplify setup state. ([36375](https://github.com/WordPress/gutenberg/pull/36375))
+-   Rename fse_navigation_area to wp_navigation_area. ([36460](https://github.com/WordPress/gutenberg/pull/36460))
+-   Return wp error from wp_insert_post. ([36483](https://github.com/WordPress/gutenberg/pull/36483))
 
 #### Full Site Editing
-- Add template_type guards. ([36318](https://github.com/WordPress/gutenberg/pull/36318))
 
+-   Add template_type guards. ([36318](https://github.com/WordPress/gutenberg/pull/36318))
 
 ### Documentation
 
-- "npm install" suggestion provides a better learning experience. ([36217](https://github.com/WordPress/gutenberg/pull/36217))
-- Added specific links to agenda and notes posts related to core editor meetings. ([36199](https://github.com/WordPress/gutenberg/pull/36199))
-- Schemastore - $schema is VS Code-specific. ([36179](https://github.com/WordPress/gutenberg/pull/36179))
-- Update GIF image in documentation with wp.org schema URL. ([36456](https://github.com/WordPress/gutenberg/pull/36456))
-- Update Versions in WordPress to include 5.9. ([36156](https://github.com/WordPress/gutenberg/pull/36156))
-- Update combobox-control component readme. ([36413](https://github.com/WordPress/gutenberg/pull/36413))
-- Update theme.json schema to refer to wp.org URL. ([36332](https://github.com/WordPress/gutenberg/pull/36332))
+-   "npm install" suggestion provides a better learning experience. ([36217](https://github.com/WordPress/gutenberg/pull/36217))
+-   Added specific links to agenda and notes posts related to core editor meetings. ([36199](https://github.com/WordPress/gutenberg/pull/36199))
+-   Schemastore - $schema is VS Code-specific. ([36179](https://github.com/WordPress/gutenberg/pull/36179))
+-   Update GIF image in documentation with wp.org schema URL. ([36456](https://github.com/WordPress/gutenberg/pull/36456))
+-   Update Versions in WordPress to include 5.9. ([36156](https://github.com/WordPress/gutenberg/pull/36156))
+-   Update combobox-control component readme. ([36413](https://github.com/WordPress/gutenberg/pull/36413))
+-   Update theme.json schema to refer to wp.org URL. ([36332](https://github.com/WordPress/gutenberg/pull/36332))
 
 #### Components
-- Update `@wordpress/components` changelog. ([36448](https://github.com/WordPress/gutenberg/pull/36448))
 
+-   Update `@wordpress/components` changelog. ([36448](https://github.com/WordPress/gutenberg/pull/36448))
 
 ### Code Quality
 
-- Change @package to WordPress in block-library. ([36494](https://github.com/WordPress/gutenberg/pull/36494))
-- postcss-themes: Fix PostCSS 8 deprecation warning. ([36284](https://github.com/WordPress/gutenberg/pull/36284))
+-   Change @package to WordPress in block-library. ([36494](https://github.com/WordPress/gutenberg/pull/36494))
+-   postcss-themes: Fix PostCSS 8 deprecation warning. ([36284](https://github.com/WordPress/gutenberg/pull/36284))
 
 #### Navigation Screen
-- Prepare navigation php code for core patch. ([36336](https://github.com/WordPress/gutenberg/pull/36336))
+
+-   Prepare navigation php code for core patch. ([36336](https://github.com/WordPress/gutenberg/pull/36336))
 
 #### Block Library
-- Add block.json schema defintion to core blocks. ([35900](https://github.com/WordPress/gutenberg/pull/35900))
 
+-   Add block.json schema defintion to core blocks. ([35900](https://github.com/WordPress/gutenberg/pull/35900))
 
 ### Tools
 
 #### Testing
-- E2E: Add more Cover block tests. ([36321](https://github.com/WordPress/gutenberg/pull/36321))
-- Fix Performance CI tests and make them always use the latest major as base branch. ([36463](https://github.com/WordPress/gutenberg/pull/36463))
-- Fix failing tests and compatibility with 5.9. ([36368](https://github.com/WordPress/gutenberg/pull/36368))
-- Add integration tests with core blocks schema validation. ([36351](https://github.com/WordPress/gutenberg/pull/36351))
-- Skip flaky image block test. ([36446](https://github.com/WordPress/gutenberg/pull/36446))
+
+-   E2E: Add more Cover block tests. ([36321](https://github.com/WordPress/gutenberg/pull/36321))
+-   Fix Performance CI tests and make them always use the latest major as base branch. ([36463](https://github.com/WordPress/gutenberg/pull/36463))
+-   Fix failing tests and compatibility with 5.9. ([36368](https://github.com/WordPress/gutenberg/pull/36368))
+-   Add integration tests with core blocks schema validation. ([36351](https://github.com/WordPress/gutenberg/pull/36351))
+-   Skip flaky image block test. ([36446](https://github.com/WordPress/gutenberg/pull/36446))
 
 #### Icons
-- Add the missing comment edit link icon. ([36565](https://github.com/WordPress/gutenberg/pull/36565))
-- Remove hard coded color from query pagination icons. ([35837](https://github.com/WordPress/gutenberg/pull/35837))
-- Remove hard-coded values on icons. ([36564](https://github.com/WordPress/gutenberg/pull/36564))
+
+-   Add the missing comment edit link icon. ([36565](https://github.com/WordPress/gutenberg/pull/36565))
+-   Remove hard coded color from query pagination icons. ([35837](https://github.com/WordPress/gutenberg/pull/35837))
+-   Remove hard-coded values on icons. ([36564](https://github.com/WordPress/gutenberg/pull/36564))
 
 #### Components
-- ToolsPanel: Allow additional props on ToolsPanel. ([36428](https://github.com/WordPress/gutenberg/pull/36428))
-- Typography Panel: Make letter spacing jsDoc and prop use consistent. ([36367](https://github.com/WordPress/gutenberg/pull/36367))
+
+-   ToolsPanel: Allow additional props on ToolsPanel. ([36428](https://github.com/WordPress/gutenberg/pull/36428))
+-   Typography Panel: Make letter spacing jsDoc and prop use consistent. ([36367](https://github.com/WordPress/gutenberg/pull/36367))
 
 #### Block Library
-- Remove textdomain from calendar block. ([36500](https://github.com/WordPress/gutenberg/pull/36500))
+
+-   Remove textdomain from calendar block. ([36500](https://github.com/WordPress/gutenberg/pull/36500))
 
 #### Site Editor
-- Update site editor title truncation. ([36436](https://github.com/WordPress/gutenberg/pull/36436))
+
+-   Update site editor title truncation. ([36436](https://github.com/WordPress/gutenberg/pull/36436))
 
 #### Design Tools
-- Letter spacing: Update label copy. ([36385](https://github.com/WordPress/gutenberg/pull/36385))
+
+-   Letter spacing: Update label copy. ([36385](https://github.com/WordPress/gutenberg/pull/36385))
 
 #### Block API
-- Add pattern to `name` key in block.json Schema. ([36343](https://github.com/WordPress/gutenberg/pull/36343))
+
+-   Add pattern to `name` key in block.json Schema. ([36343](https://github.com/WordPress/gutenberg/pull/36343))
 
 #### Data Layer
-- Data: Clean up registerGenericStore param names. ([36300](https://github.com/WordPress/gutenberg/pull/36300))
+
+-   Data: Clean up registerGenericStore param names. ([36300](https://github.com/WordPress/gutenberg/pull/36300))
 
 #### Template Editor
-- Change edit links for templates and template parts. ([36294](https://github.com/WordPress/gutenberg/pull/36294))
 
+-   Change edit links for templates and template parts. ([36294](https://github.com/WordPress/gutenberg/pull/36294))
 
 = 11.9.1 =
 
+## Changelog
+
 ### Bug Fixes
 
 #### Block Library
-- Gallery: Fix issue with columns and link destination not copying across when gallery updated to v2 format. ([36388](https://github.com/WordPress/gutenberg/pull/36388))
-
-#### Full Site Editing
-- Site editor: Add feature flag to toggle the new site editor sidebar. ([36516](https://github.com/WordPress/gutenberg/pull/36516))
-- Site editor: Prevent loading state from showing the admin menu. ([36455](https://github.com/WordPress/gutenberg/pull/36455))
 
-#### Testing
-- Cover Block: Fix regressions in opacity. ([36406](https://github.com/WordPress/gutenberg/pull/36406))
-- E2E: Add more Cover block tests ([36321](https://github.com/WordPress/gutenberg/pull/36321))
+-   Gallery: Fix issue with columns and link destination not copying across when gallery updated to v2 format. ([36388](https://github.com/WordPress/gutenberg/pull/36388))
 
+#### Full Site Editing
 
+-   Site editor: Add feature flag to toggle the new site editor sidebar. ([36516](https://github.com/WordPress/gutenberg/pull/36516))
+-   Site editor: Prevent loading state from showing the admin menu. ([36455](https://github.com/WordPress/gutenberg/pull/36455))
 
+#### Testing
 
+-   Cover Block: Fix regressions in opacity. ([36406](https://github.com/WordPress/gutenberg/pull/36406))
+-   E2E: Add more Cover block tests ([36321](https://github.com/WordPress/gutenberg/pull/36321))
 
 = 11.9.0 =
 
+## Changelog
+
 ### Features
 
 #### Block Library
-- New Block: Comment Reply Link. ([35774](https://github.com/WordPress/gutenberg/pull/35774))
-- New Block: Comment Link. ([35965](https://github.com/WordPress/gutenberg/pull/35965))
-- New Block: Comment Avatar. ([35396](https://github.com/WordPress/gutenberg/pull/35396))
-- New Block: Comments Query Loop. ([35231](https://github.com/WordPress/gutenberg/pull/35231))
+
+-   New Block: Comment Reply Link. ([35774](https://github.com/WordPress/gutenberg/pull/35774))
+-   New Block: Comment Link. ([35965](https://github.com/WordPress/gutenberg/pull/35965))
+-   New Block: Comment Avatar. ([35396](https://github.com/WordPress/gutenberg/pull/35396))
+-   New Block: Comments Query Loop. ([35231](https://github.com/WordPress/gutenberg/pull/35231))
 
 ### Enhancements
 
 #### Block Library
-- Buttons: Add flex layout and new layout type. ([35819](https://github.com/WordPress/gutenberg/pull/35819))
-- Code: Add support for padding, color, and border styles. ([27582](https://github.com/WordPress/gutenberg/pull/27582))
-- Columns: Add padding support. ([35701](https://github.com/WordPress/gutenberg/pull/35701))
-- Comment Author Name: Add spacing to have same options as Post Author Name. ([36213](https://github.com/WordPress/gutenberg/pull/36213))
-- Comment Edit Link: Add alignment option. ([36033](https://github.com/WordPress/gutenberg/pull/36033))
-- Embed: Add Wolfram Cloud as an embed provider. ([35656](https://github.com/WordPress/gutenberg/pull/35656))
-- Gallery: Replace gallery experimental setting with a check for use_balanceTags. ([34979](https://github.com/WordPress/gutenberg/pull/34979))
-- Image: Add data-id attribute on server side render for core galleries. ([35975](https://github.com/WordPress/gutenberg/pull/35975))
-- Navigation: Add create new menu button. ([36245](https://github.com/WordPress/gutenberg/pull/36245))
-- Navigation: Add delete nav menu button. ([35981](https://github.com/WordPress/gutenberg/pull/35981))
-- Navigation: Add featured transforms in Link Control for Navigation Link items. ([35857](https://github.com/WordPress/gutenberg/pull/35857))
-- Navigation: Add flex layout. ([36169](https://github.com/WordPress/gutenberg/pull/36169))
-- Navigation: Add missing menu item attributes. ([35634](https://github.com/WordPress/gutenberg/pull/35634))
-- Navigation: Create nav menu on pattern insertion or when the block has uncontrolled inner blocks. ([36024](https://github.com/WordPress/gutenberg/pull/36024))
-- Navigation: Migrate classic menus to block-based menus on theme switch. ([36255](https://github.com/WordPress/gutenberg/pull/36255))
-- Navigation: Mobile responsive navigation by default. ([35917](https://github.com/WordPress/gutenberg/pull/35917))
-- Navigation: Provide a way to manage wp_navigation posts from wp-admin. ([36126](https://github.com/WordPress/gutenberg/pull/36126))
-- Navigation: Reword navigation color labels. ([35916](https://github.com/WordPress/gutenberg/pull/35916))
-- Navigation: Save data to a wp_navigation post type. ([35746](https://github.com/WordPress/gutenberg/pull/35746))
-- Navigation: Show the placeholder again when moving from a valid menu to non-existing menu. ([36210](https://github.com/WordPress/gutenberg/pull/36210))
-- Navigation: Update block entity automatic name generation and refine naming UI. ([36238](https://github.com/WordPress/gutenberg/pull/36238))
-- Navigation: Use a single placeholder for the block. ([36023](https://github.com/WordPress/gutenberg/pull/36023))
-- Page List: Create a JS version for the editor. ([31670](https://github.com/WordPress/gutenberg/pull/31670))
-- Post Author: Add spacing controls. ([35963](https://github.com/WordPress/gutenberg/pull/35963))
-- Post Comment: Deprecate the block now that the Comment Query Loop block has been added. ([36032](https://github.com/WordPress/gutenberg/pull/36032))
-- Post Comment Author: Add alignment options. ([36045](https://github.com/WordPress/gutenberg/pull/36045))
-- Post Comments: Even out the top margin inside the block. ([35887](https://github.com/WordPress/gutenberg/pull/35887))
-- Post Comments: Hide the "Comments Closed" message. ([35743](https://github.com/WordPress/gutenberg/pull/35743))
-- Post Comment Form: Adds in basic styling for post comment form. ([35704](https://github.com/WordPress/gutenberg/pull/35704))
-- Post Excerpt: Add spacing controls. ([35959](https://github.com/WordPress/gutenberg/pull/35959))
-- Post Excerpt: Don't print the wrapper when there is no excerpt. ([35749](https://github.com/WordPress/gutenberg/pull/35749))
-- Post Title: Return no markup if title is empty. ([35861](https://github.com/WordPress/gutenberg/pull/35861))
-- Search: Add contextual defaults when inserted in Navigation block. ([36125](https://github.com/WordPress/gutenberg/pull/36125))
-- Gallery block: Add a dismissible warning about the need for versions >=18.2 of the mobile app. ([36012](https://github.com/WordPress/gutenberg/pull/36012))
+
+-   Buttons: Add flex layout and new layout type. ([35819](https://github.com/WordPress/gutenberg/pull/35819))
+-   Code: Add support for padding, color, and border styles. ([27582](https://github.com/WordPress/gutenberg/pull/27582))
+-   Columns: Add padding support. ([35701](https://github.com/WordPress/gutenberg/pull/35701))
+-   Comment Author Name: Add spacing to have same options as Post Author Name. ([36213](https://github.com/WordPress/gutenberg/pull/36213))
+-   Comment Edit Link: Add alignment option. ([36033](https://github.com/WordPress/gutenberg/pull/36033))
+-   Embed: Add Wolfram Cloud as an embed provider. ([35656](https://github.com/WordPress/gutenberg/pull/35656))
+-   Gallery: Replace gallery experimental setting with a check for use_balanceTags. ([34979](https://github.com/WordPress/gutenberg/pull/34979))
+-   Image: Add data-id attribute on server side render for core galleries. ([35975](https://github.com/WordPress/gutenberg/pull/35975))
+-   Navigation: Add create new menu button. ([36245](https://github.com/WordPress/gutenberg/pull/36245))
+-   Navigation: Add delete nav menu button. ([35981](https://github.com/WordPress/gutenberg/pull/35981))
+-   Navigation: Add featured transforms in Link Control for Navigation Link items. ([35857](https://github.com/WordPress/gutenberg/pull/35857))
+-   Navigation: Add flex layout. ([36169](https://github.com/WordPress/gutenberg/pull/36169))
+-   Navigation: Add missing menu item attributes. ([35634](https://github.com/WordPress/gutenberg/pull/35634))
+-   Navigation: Create nav menu on pattern insertion or when the block has uncontrolled inner blocks. ([36024](https://github.com/WordPress/gutenberg/pull/36024))
+-   Navigation: Migrate classic menus to block-based menus on theme switch. ([36255](https://github.com/WordPress/gutenberg/pull/36255))
+-   Navigation: Mobile responsive navigation by default. ([35917](https://github.com/WordPress/gutenberg/pull/35917))
+-   Navigation: Provide a way to manage wp_navigation posts from wp-admin. ([36126](https://github.com/WordPress/gutenberg/pull/36126))
+-   Navigation: Reword navigation color labels. ([35916](https://github.com/WordPress/gutenberg/pull/35916))
+-   Navigation: Save data to a wp_navigation post type. ([35746](https://github.com/WordPress/gutenberg/pull/35746))
+-   Navigation: Show the placeholder again when moving from a valid menu to non-existing menu. ([36210](https://github.com/WordPress/gutenberg/pull/36210))
+-   Navigation: Update block entity automatic name generation and refine naming UI. ([36238](https://github.com/WordPress/gutenberg/pull/36238))
+-   Navigation: Use a single placeholder for the block. ([36023](https://github.com/WordPress/gutenberg/pull/36023))
+-   Page List: Create a JS version for the editor. ([31670](https://github.com/WordPress/gutenberg/pull/31670))
+-   Post Author: Add spacing controls. ([35963](https://github.com/WordPress/gutenberg/pull/35963))
+-   Post Comment: Deprecate the block now that the Comment Query Loop block has been added. ([36032](https://github.com/WordPress/gutenberg/pull/36032))
+-   Post Comment Author: Add alignment options. ([36045](https://github.com/WordPress/gutenberg/pull/36045))
+-   Post Comments: Even out the top margin inside the block. ([35887](https://github.com/WordPress/gutenberg/pull/35887))
+-   Post Comments: Hide the "Comments Closed" message. ([35743](https://github.com/WordPress/gutenberg/pull/35743))
+-   Post Comment Form: Adds in basic styling for post comment form. ([35704](https://github.com/WordPress/gutenberg/pull/35704))
+-   Post Excerpt: Add spacing controls. ([35959](https://github.com/WordPress/gutenberg/pull/35959))
+-   Post Excerpt: Don't print the wrapper when there is no excerpt. ([35749](https://github.com/WordPress/gutenberg/pull/35749))
+-   Post Title: Return no markup if title is empty. ([35861](https://github.com/WordPress/gutenberg/pull/35861))
+-   Search: Add contextual defaults when inserted in Navigation block. ([36125](https://github.com/WordPress/gutenberg/pull/36125))
+-   Gallery block: Add a dismissible warning about the need for versions >=18.2 of the mobile app. ([36012](https://github.com/WordPress/gutenberg/pull/36012))
 
 #### Accessibility
-- Add announcement on formatting change for screen readers. ([35896](https://github.com/WordPress/gutenberg/pull/35896))
-- Add aria-current to navigation link, submenu, page list. ([35880](https://github.com/WordPress/gutenberg/pull/35880))
-- Link editing: Improve focus styles for Link UI preview title. ([35853](https://github.com/WordPress/gutenberg/pull/35853))
-- Site Editor: Enable the "Save" keyboard shortcut. ([36138](https://github.com/WordPress/gutenberg/pull/36138))
-- Try to communicate to screen readers that post title is textarea. ([35898](https://github.com/WordPress/gutenberg/pull/35898))
+
+-   Add announcement on formatting change for screen readers. ([35896](https://github.com/WordPress/gutenberg/pull/35896))
+-   Add aria-current to navigation link, submenu, page list. ([35880](https://github.com/WordPress/gutenberg/pull/35880))
+-   Link editing: Improve focus styles for Link UI preview title. ([35853](https://github.com/WordPress/gutenberg/pull/35853))
+-   Site Editor: Enable the "Save" keyboard shortcut. ([36138](https://github.com/WordPress/gutenberg/pull/36138))
+-   Try to communicate to screen readers that post title is textarea. ([35898](https://github.com/WordPress/gutenberg/pull/35898))
 
 #### Block Editor
-- Block toolbar: Remove visual clue from text alignment icon. ([35922](https://github.com/WordPress/gutenberg/pull/35922))
-- Drag and drop: Show drag slot instead of hiding the block being dragged. ([33950](https://github.com/WordPress/gutenberg/pull/33950))
-- Enable rich previews in the Link UI for the Site Editor. ([35951](https://github.com/WordPress/gutenberg/pull/35951))
-- Link editing: Update Link UI design for preview action buttons to use icons for edit and unlink. ([35833](https://github.com/WordPress/gutenberg/pull/35833))
-- Multi-Entity Saving UI Improvements. ([35933](https://github.com/WordPress/gutenberg/pull/35933))
-- Use the block's name in the "remove block" menu item in the block settings dropdown. ([35872](https://github.com/WordPress/gutenberg/pull/35872))
-- StripHTML: preserve leading and trailing spaces and strip script and on* attributes. ([35539](https://github.com/WordPress/gutenberg/pull/35539))
+
+-   Block toolbar: Remove visual clue from text alignment icon. ([35922](https://github.com/WordPress/gutenberg/pull/35922))
+-   Drag and drop: Show drag slot instead of hiding the block being dragged. ([33950](https://github.com/WordPress/gutenberg/pull/33950))
+-   Enable rich previews in the Link UI for the Site Editor. ([35951](https://github.com/WordPress/gutenberg/pull/35951))
+-   Link editing: Update Link UI design for preview action buttons to use icons for edit and unlink. ([35833](https://github.com/WordPress/gutenberg/pull/35833))
+-   Multi-Entity Saving UI Improvements. ([35933](https://github.com/WordPress/gutenberg/pull/35933))
+-   Use the block's name in the "remove block" menu item in the block settings dropdown. ([35872](https://github.com/WordPress/gutenberg/pull/35872))
+-   StripHTML: preserve leading and trailing spaces and strip script and on\* attributes. ([35539](https://github.com/WordPress/gutenberg/pull/35539))
 
 #### Full Site Editing
-- Improve the initial loading of the site editor. ([36044](https://github.com/WordPress/gutenberg/pull/36044))
-- Move the Site Editor menu item to sit under Appearance and rename to Editor. ([36064](https://github.com/WordPress/gutenberg/pull/36064))
-- Remove navigation panel in site editor. ([36194](https://github.com/WordPress/gutenberg/pull/36194))
-- Use Heading component on NavigationMenu and NavigationGroup components. ([36009](https://github.com/WordPress/gutenberg/pull/36009))
-- Use SearchControl component inside nav menu. ([36011](https://github.com/WordPress/gutenberg/pull/36011))
-
-#### Components
-- ColorPicker: Implement new color palette editor component. ([35783](https://github.com/WordPress/gutenberg/pull/35783))
-- Duotone: Add description to clarify that the underlying image will not be affected. ([36018](https://github.com/WordPress/gutenberg/pull/36018))
-- Modal: Wrap the modal contents in a StyleProvider. ([36261](https://github.com/WordPress/gutenberg/pull/36261))
-- ToolsPanel: Update typography panel layout. ([35911](https://github.com/WordPress/gutenberg/pull/35911))
-- LinkControl: Split control for URL and Text within Link UI. ([33849](https://github.com/WordPress/gutenberg/pull/33849))
+
+-   Improve the initial loading of the site editor. ([36044](https://github.com/WordPress/gutenberg/pull/36044))
+-   Move the Site Editor menu item to sit under Appearance and rename to Editor. ([36064](https://github.com/WordPress/gutenberg/pull/36064))
+-   Remove navigation panel in site editor. ([36194](https://github.com/WordPress/gutenberg/pull/36194))
+-   Use Heading component on NavigationMenu and NavigationGroup components. ([36009](https://github.com/WordPress/gutenberg/pull/36009))
+-   Use SearchControl component inside nav menu. ([36011](https://github.com/WordPress/gutenberg/pull/36011))
+
+#### Components
+
+-   ColorPicker: Implement new color palette editor component. ([35783](https://github.com/WordPress/gutenberg/pull/35783))
+-   Duotone: Add description to clarify that the underlying image will not be affected. ([36018](https://github.com/WordPress/gutenberg/pull/36018))
+-   Modal: Wrap the modal contents in a StyleProvider. ([36261](https://github.com/WordPress/gutenberg/pull/36261))
+-   ToolsPanel: Update typography panel layout. ([35911](https://github.com/WordPress/gutenberg/pull/35911))
+-   LinkControl: Split control for URL and Text within Link UI. ([33849](https://github.com/WordPress/gutenberg/pull/33849))
+
 #### Template Editor
-- Add resizer to template part focus mode. ([35728](https://github.com/WordPress/gutenberg/pull/35728))
-- Auto resize the height of template part focus mode. ([35974](https://github.com/WordPress/gutenberg/pull/35974))
+
+-   Add resizer to template part focus mode. ([35728](https://github.com/WordPress/gutenberg/pull/35728))
+-   Auto resize the height of template part focus mode. ([35974](https://github.com/WordPress/gutenberg/pull/35974))
 
 #### Global Styles
-- Remove the duplicated title in background, text and link views. ([35583](https://github.com/WordPress/gutenberg/pull/35583))
-- Typography: Switch to ToolsPanel for block support UI. ([33744](https://github.com/WordPress/gutenberg/pull/33744))
-- Add a Global Styles endpoint and use it in the site editor. ([35801](https://github.com/WordPress/gutenberg/pull/35801))
-- Migrate theme.json v1 to v2. ([36155](https://github.com/WordPress/gutenberg/pull/36155))
-- Update: Show all color and gradient origins (core, theme, and user). ([35970](https://github.com/WordPress/gutenberg/pull/35970))
+
+-   Remove the duplicated title in background, text and link views. ([35583](https://github.com/WordPress/gutenberg/pull/35583))
+-   Typography: Switch to ToolsPanel for block support UI. ([33744](https://github.com/WordPress/gutenberg/pull/33744))
+-   Add a Global Styles endpoint and use it in the site editor. ([35801](https://github.com/WordPress/gutenberg/pull/35801))
+-   Migrate theme.json v1 to v2. ([36155](https://github.com/WordPress/gutenberg/pull/36155))
+-   Update: Show all color and gradient origins (core, theme, and user). ([35970](https://github.com/WordPress/gutenberg/pull/35970))
 
 #### Design Tools
-- Duotone: Enable transparency. ([34130](https://github.com/WordPress/gutenberg/pull/34130))
-- Layout: Add `flex-wrap` control to `flex` layout. ([36003](https://github.com/WordPress/gutenberg/pull/36003))
-- Typography block support: Add typography support and defaults. ([34064](https://github.com/WordPress/gutenberg/pull/34064))
+
+-   Duotone: Enable transparency. ([34130](https://github.com/WordPress/gutenberg/pull/34130))
+-   Layout: Add `flex-wrap` control to `flex` layout. ([36003](https://github.com/WordPress/gutenberg/pull/36003))
+-   Typography block support: Add typography support and defaults. ([34064](https://github.com/WordPress/gutenberg/pull/34064))
 
 #### Media
-- Remove "security" verbiage from warning when filetype does not pass on upload. ([36226](https://github.com/WordPress/gutenberg/pull/36226))
+
+-   Remove "security" verbiage from warning when filetype does not pass on upload. ([36226](https://github.com/WordPress/gutenberg/pull/36226))
 
 #### Patterns
-- Add an `inserter` flag to hide patterns from UI. ([36108](https://github.com/WordPress/gutenberg/pull/36108))
+
+-   Add an `inserter` flag to hide patterns from UI. ([36108](https://github.com/WordPress/gutenberg/pull/36108))
 
 #### Themes
-- Remove experimental feature notice for block themes. ([36083](https://github.com/WordPress/gutenberg/pull/36083))
+
+-   Remove experimental feature notice for block themes. ([36083](https://github.com/WordPress/gutenberg/pull/36083))
 
 #### General Interface
-- Apply borders to canvas rather than other UI elements. ([31081](https://github.com/WordPress/gutenberg/pull/31081))
+
+-   Apply borders to canvas rather than other UI elements. ([31081](https://github.com/WordPress/gutenberg/pull/31081))
 
 #### REST API
-- Respect fields param for global styles REST API requests. ([36206](https://github.com/WordPress/gutenberg/pull/36206))
-- URL Details: Update regex to include `og:Description`. ([35875](https://github.com/WordPress/gutenberg/pull/35875))
 
+-   Respect fields param for global styles REST API requests. ([36206](https://github.com/WordPress/gutenberg/pull/36206))
+-   URL Details: Update regex to include `og:Description`. ([35875](https://github.com/WordPress/gutenberg/pull/35875))
 
 ### New APIs
 
 #### Global Styles
-- Add API to access global settings, styles, and stylesheet. ([34843](https://github.com/WordPress/gutenberg/pull/34843))
-
-#### Block Library
-- Inner blocks: Add `useInnerBlocksProps.save` function for edit/save symmetry, and stabilise API. ([26031](https://github.com/WordPress/gutenberg/pull/26031))
-
-
-### Bug Fixes
-
-#### Block Library
-- Buttons: Address deprecation issues from Buttons flex layout PR. ([36192](https://github.com/WordPress/gutenberg/pull/36192))
-- Classic: Fix select all blocks side effect that overwrote paragraph block contents. ([35999](https://github.com/WordPress/gutenberg/pull/35999))
-- Column: Only add flex-basis if width contains a number. ([35831](https://github.com/WordPress/gutenberg/pull/35831))
-- Comment Template: Move inner blocks container to separate components. ([36174](https://github.com/WordPress/gutenberg/pull/36174))
-- Blocks: Fix relative URLs for inlined styles. ([35538](https://github.com/WordPress/gutenberg/pull/35538))
-- Navigation: Disable ability to edit wp_navigation menus via `Appearance -> Navigation Menus` for non-FSE themes. ([36257](https://github.com/WordPress/gutenberg/pull/36257))
-- Fix incorrect attributes definitions. ([36264](https://github.com/WordPress/gutenberg/pull/36264))
-- Fix saving template parts in the site editor by fixing controlled inner blocks parent block attributes updates. ([35827](https://github.com/WordPress/gutenberg/pull/35827))
-- Fix incorrect attributes definitions for Column, Cover, and Group blocks. ([36140](https://github.com/WordPress/gutenberg/pull/36140))
-- Gallery: Make sure the mobile warning notice only runs when images are added to a new block. ([36326](https://github.com/WordPress/gutenberg/pull/36326))
-- Gallery: Only show the gallery upload error message if mixed multiple files are uploaded. ([35790](https://github.com/WordPress/gutenberg/pull/35790))
-- Gallery: Remove the arbitrary alt text that is added to gallery images. ([35936](https://github.com/WordPress/gutenberg/pull/35936))
-- Group: Fix inner container regexes that relied on fixed div tag. ([36256](https://github.com/WordPress/gutenberg/pull/36256))
-- Heading: Avoid error on split when the paragraph isn't registered. ([35871](https://github.com/WordPress/gutenberg/pull/35871))
-- Image: Make sure the Image block border radius is inherited if the image is linked. ([36289](https://github.com/WordPress/gutenberg/pull/36289))
-- Navigation Submenu: Fix PHP notice caused by stale id reference. ([35984](https://github.com/WordPress/gutenberg/pull/35984))
-- Navigation overlay menu: Fix submenu spacing. ([35823](https://github.com/WordPress/gutenberg/pull/35823))
-- Navigation: Ensure menus exist before map operation. ([36355](https://github.com/WordPress/gutenberg/pull/36355))
-- Navigation: Fix accessibility issues. ([36292](https://github.com/WordPress/gutenberg/pull/36292))
-- Navigation: Fix dropdown indicator position. ([36106](https://github.com/WordPress/gutenberg/pull/36106))
-- Navigation: Fix issues with responsive justifications. ([35913](https://github.com/WordPress/gutenberg/pull/35913)) and ([36105](https://github.com/WordPress/gutenberg/pull/36105))
-- Navigation: Fix padding for social links on mobile. ([35824](https://github.com/WordPress/gutenberg/pull/35824))
-- Navigation: Fix submenus not opening on click. ([36290](https://github.com/WordPress/gutenberg/pull/36290))
-- Navigation: Hide post attributes meta box. ([36358](https://github.com/WordPress/gutenberg/pull/36358))
-- Navigation: Small styling fixes and tweaks. ([36298](https://github.com/WordPress/gutenberg/pull/36298))
-- Pattern: Remove wrapping div. ([36090](https://github.com/WordPress/gutenberg/pull/36090))
-- Post Comment: Handle the case where a comment does not exist. ([35810](https://github.com/WordPress/gutenberg/pull/35810))
-- Post Navigation Link: Do not translate HTML tag. ([35930](https://github.com/WordPress/gutenberg/pull/35930))
-- Post Template Block: Move inner blocks container to separate component. ([35945](https://github.com/WordPress/gutenberg/pull/35945))
-- Post Terms: Prevent the block from breaking on pages. ([35957](https://github.com/WordPress/gutenberg/pull/35957))
-- Site Logo: Fix center alignment. ([35971](https://github.com/WordPress/gutenberg/pull/35971))
-- Site Logo: Fix fatal error in Site Logo block in WP 5.9. ([36195](https://github.com/WordPress/gutenberg/pull/36195))
-- Prevent PHP notice in Elements block support for blocks with empty content. ([35836](https://github.com/WordPress/gutenberg/pull/35836))
-
-#### Components
-- AnglePickerControl: Use admin color scheme. ([35908](https://github.com/WordPress/gutenberg/pull/35908))
-- BaseControl: Fix undefined Help text id if no id is passed to component. ([35899](https://github.com/WordPress/gutenberg/pull/35899))
-- ColorListPicker: Fix spacing to accomodate the new color picker. ([36017](https://github.com/WordPress/gutenberg/pull/36017))
-- ColorPalette: Fix className. ([36016](https://github.com/WordPress/gutenberg/pull/36016))
-- ColorPicker: Fix unexpected movements, and closing on first click in the color picker. ([35670](https://github.com/WordPress/gutenberg/pull/35670))
-- Popover: Check anchorDocument default view before removing events. ([35832](https://github.com/WordPress/gutenberg/pull/35832))
-- RangeControl: Fix style issue in RTL. ([35777](https://github.com/WordPress/gutenberg/pull/35777))
-- Storybook: Lazy load LTR/RTL styles for consistent specificity. ([35771](https://github.com/WordPress/gutenberg/pull/35771))
-- Text: Fix text color value to use correct gray color value for Link UI preview description text. ([35851](https://github.com/WordPress/gutenberg/pull/35851))
-
-#### Global Styles
-- Fix navigation in global styles sidebar. ([36203](https://github.com/WordPress/gutenberg/pull/36203))
-- Fix presets data for themes that do not provide any preset. ([36054](https://github.com/WordPress/gutenberg/pull/36054))
-- Generate preset metadata for font-family in the site editor. ([36022](https://github.com/WordPress/gutenberg/pull/36022))
-- Hotfix for leftovers of `WP_Theme_JSON_Resolver::Get_merged_data`. ([36173](https://github.com/WordPress/gutenberg/pull/36173))
-- Lower the specificity of border & padding styles for the outline block style in the button block. ([35968](https://github.com/WordPress/gutenberg/pull/35968))
-- Theme.json: Remove custom prefixes from properties that did not land in 5.8. ([34485](https://github.com/WordPress/gutenberg/pull/34485))
-- Fix Rest global styles controller accessing configuration that may not exist. ([36047](https://github.com/WordPress/gutenberg/pull/36047))
-
-#### Block Editor
-- Allow moving metaboxes to previously empty area. ([25187](https://github.com/WordPress/gutenberg/pull/25187))
-- Change `console.error` to `console.warn` for enqueued styles in the editor. ([35914](https://github.com/WordPress/gutenberg/pull/35914))
-- Fix inserter with block pattern categories. ([36116](https://github.com/WordPress/gutenberg/pull/36116))
-- Fix navigation block link control zero value in it. ([36198](https://github.com/WordPress/gutenberg/pull/36198))
-- Fix the update of link and suggestions in LinkControl. ([32320](https://github.com/WordPress/gutenberg/pull/32320))
-- Make Link UI inactive if selection extends beyond format bounds or encounters new link. ([35946](https://github.com/WordPress/gutenberg/pull/35946))
-- Fix selection by holding shift key for nested blocks. ([35668](https://github.com/WordPress/gutenberg/pull/35668))
-- Fix shift+click on a child block with its parent selected. ([35988](https://github.com/WordPress/gutenberg/pull/35988))
-- Fix: Crash when resetting user color palette. ([36233](https://github.com/WordPress/gutenberg/pull/36233))
-- Fix: Show user colors on palette indicator. ([36232](https://github.com/WordPress/gutenberg/pull/36232))
-- Fix `getPxFromCssUnit` test stability and test that memoized function works correctly. ([35939](https://github.com/WordPress/gutenberg/pull/35939))
-- Link editing: Account for link anchor no longer being present when generating unique link instance key. ([36357](https://github.com/WordPress/gutenberg/pull/36357))
-- Preserve highlighted text selection when changing colors ([36263](https://github.com/WordPress/gutenberg/pull/36263))
+
+-   Add API to access global settings, styles, and stylesheet. ([34843](https://github.com/WordPress/gutenberg/pull/34843))
+
+#### Block Library
+
+-   Inner blocks: Add `useInnerBlocksProps.save` function for edit/save symmetry, and stabilise API. ([26031](https://github.com/WordPress/gutenberg/pull/26031))
+
+### Bug Fixes
+
+#### Block Library
+
+-   Buttons: Address deprecation issues from Buttons flex layout PR. ([36192](https://github.com/WordPress/gutenberg/pull/36192))
+-   Classic: Fix select all blocks side effect that overwrote paragraph block contents. ([35999](https://github.com/WordPress/gutenberg/pull/35999))
+-   Column: Only add flex-basis if width contains a number. ([35831](https://github.com/WordPress/gutenberg/pull/35831))
+-   Comment Template: Move inner blocks container to separate components. ([36174](https://github.com/WordPress/gutenberg/pull/36174))
+-   Blocks: Fix relative URLs for inlined styles. ([35538](https://github.com/WordPress/gutenberg/pull/35538))
+-   Navigation: Disable ability to edit wp_navigation menus via `Appearance -> Navigation Menus` for non-FSE themes. ([36257](https://github.com/WordPress/gutenberg/pull/36257))
+-   Fix incorrect attributes definitions. ([36264](https://github.com/WordPress/gutenberg/pull/36264))
+-   Fix saving template parts in the site editor by fixing controlled inner blocks parent block attributes updates. ([35827](https://github.com/WordPress/gutenberg/pull/35827))
+-   Fix incorrect attributes definitions for Column, Cover, and Group blocks. ([36140](https://github.com/WordPress/gutenberg/pull/36140))
+-   Gallery: Make sure the mobile warning notice only runs when images are added to a new block. ([36326](https://github.com/WordPress/gutenberg/pull/36326))
+-   Gallery: Only show the gallery upload error message if mixed multiple files are uploaded. ([35790](https://github.com/WordPress/gutenberg/pull/35790))
+-   Gallery: Remove the arbitrary alt text that is added to gallery images. ([35936](https://github.com/WordPress/gutenberg/pull/35936))
+-   Group: Fix inner container regexes that relied on fixed div tag. ([36256](https://github.com/WordPress/gutenberg/pull/36256))
+-   Heading: Avoid error on split when the paragraph isn't registered. ([35871](https://github.com/WordPress/gutenberg/pull/35871))
+-   Image: Make sure the Image block border radius is inherited if the image is linked. ([36289](https://github.com/WordPress/gutenberg/pull/36289))
+-   Navigation Submenu: Fix PHP notice caused by stale id reference. ([35984](https://github.com/WordPress/gutenberg/pull/35984))
+-   Navigation overlay menu: Fix submenu spacing. ([35823](https://github.com/WordPress/gutenberg/pull/35823))
+-   Navigation: Ensure menus exist before map operation. ([36355](https://github.com/WordPress/gutenberg/pull/36355))
+-   Navigation: Fix accessibility issues. ([36292](https://github.com/WordPress/gutenberg/pull/36292))
+-   Navigation: Fix dropdown indicator position. ([36106](https://github.com/WordPress/gutenberg/pull/36106))
+-   Navigation: Fix issues with responsive justifications. ([35913](https://github.com/WordPress/gutenberg/pull/35913)) and ([36105](https://github.com/WordPress/gutenberg/pull/36105))
+-   Navigation: Fix padding for social links on mobile. ([35824](https://github.com/WordPress/gutenberg/pull/35824))
+-   Navigation: Fix submenus not opening on click. ([36290](https://github.com/WordPress/gutenberg/pull/36290))
+-   Navigation: Hide post attributes meta box. ([36358](https://github.com/WordPress/gutenberg/pull/36358))
+-   Navigation: Small styling fixes and tweaks. ([36298](https://github.com/WordPress/gutenberg/pull/36298))
+-   Pattern: Remove wrapping div. ([36090](https://github.com/WordPress/gutenberg/pull/36090))
+-   Post Comment: Handle the case where a comment does not exist. ([35810](https://github.com/WordPress/gutenberg/pull/35810))
+-   Post Navigation Link: Do not translate HTML tag. ([35930](https://github.com/WordPress/gutenberg/pull/35930))
+-   Post Template Block: Move inner blocks container to separate component. ([35945](https://github.com/WordPress/gutenberg/pull/35945))
+-   Post Terms: Prevent the block from breaking on pages. ([35957](https://github.com/WordPress/gutenberg/pull/35957))
+-   Site Logo: Fix center alignment. ([35971](https://github.com/WordPress/gutenberg/pull/35971))
+-   Site Logo: Fix fatal error in Site Logo block in WP 5.9. ([36195](https://github.com/WordPress/gutenberg/pull/36195))
+-   Prevent PHP notice in Elements block support for blocks with empty content. ([35836](https://github.com/WordPress/gutenberg/pull/35836))
+
+#### Components
+
+-   AnglePickerControl: Use admin color scheme. ([35908](https://github.com/WordPress/gutenberg/pull/35908))
+-   BaseControl: Fix undefined Help text id if no id is passed to component. ([35899](https://github.com/WordPress/gutenberg/pull/35899))
+-   ColorListPicker: Fix spacing to accomodate the new color picker. ([36017](https://github.com/WordPress/gutenberg/pull/36017))
+-   ColorPalette: Fix className. ([36016](https://github.com/WordPress/gutenberg/pull/36016))
+-   ColorPicker: Fix unexpected movements, and closing on first click in the color picker. ([35670](https://github.com/WordPress/gutenberg/pull/35670))
+-   Popover: Check anchorDocument default view before removing events. ([35832](https://github.com/WordPress/gutenberg/pull/35832))
+-   RangeControl: Fix style issue in RTL. ([35777](https://github.com/WordPress/gutenberg/pull/35777))
+-   Storybook: Lazy load LTR/RTL styles for consistent specificity. ([35771](https://github.com/WordPress/gutenberg/pull/35771))
+-   Text: Fix text color value to use correct gray color value for Link UI preview description text. ([35851](https://github.com/WordPress/gutenberg/pull/35851))
+
+#### Global Styles
+
+-   Fix navigation in global styles sidebar. ([36203](https://github.com/WordPress/gutenberg/pull/36203))
+-   Fix presets data for themes that do not provide any preset. ([36054](https://github.com/WordPress/gutenberg/pull/36054))
+-   Generate preset metadata for font-family in the site editor. ([36022](https://github.com/WordPress/gutenberg/pull/36022))
+-   Hotfix for leftovers of `WP_Theme_JSON_Resolver::Get_merged_data`. ([36173](https://github.com/WordPress/gutenberg/pull/36173))
+-   Lower the specificity of border & padding styles for the outline block style in the button block. ([35968](https://github.com/WordPress/gutenberg/pull/35968))
+-   Theme.json: Remove custom prefixes from properties that did not land in 5.8. ([34485](https://github.com/WordPress/gutenberg/pull/34485))
+-   Fix Rest global styles controller accessing configuration that may not exist. ([36047](https://github.com/WordPress/gutenberg/pull/36047))
+
+#### Block Editor
+
+-   Allow moving metaboxes to previously empty area. ([25187](https://github.com/WordPress/gutenberg/pull/25187))
+-   Change `console.error` to `console.warn` for enqueued styles in the editor. ([35914](https://github.com/WordPress/gutenberg/pull/35914))
+-   Fix inserter with block pattern categories. ([36116](https://github.com/WordPress/gutenberg/pull/36116))
+-   Fix navigation block link control zero value in it. ([36198](https://github.com/WordPress/gutenberg/pull/36198))
+-   Fix the update of link and suggestions in LinkControl. ([32320](https://github.com/WordPress/gutenberg/pull/32320))
+-   Make Link UI inactive if selection extends beyond format bounds or encounters new link. ([35946](https://github.com/WordPress/gutenberg/pull/35946))
+-   Fix selection by holding shift key for nested blocks. ([35668](https://github.com/WordPress/gutenberg/pull/35668))
+-   Fix shift+click on a child block with its parent selected. ([35988](https://github.com/WordPress/gutenberg/pull/35988))
+-   Fix: Crash when resetting user color palette. ([36233](https://github.com/WordPress/gutenberg/pull/36233))
+-   Fix: Show user colors on palette indicator. ([36232](https://github.com/WordPress/gutenberg/pull/36232))
+-   Fix `getPxFromCssUnit` test stability and test that memoized function works correctly. ([35939](https://github.com/WordPress/gutenberg/pull/35939))
+-   Link editing: Account for link anchor no longer being present when generating unique link instance key. ([36357](https://github.com/WordPress/gutenberg/pull/36357))
+-   Preserve highlighted text selection when changing colors ([36263](https://github.com/WordPress/gutenberg/pull/36263))
 
 #### Design Tools
-- Font Appearance: Improve consistency of label in Typography panel. ([35860](https://github.com/WordPress/gutenberg/pull/35860))
-- Font Family Support: Fix skip serialization check. ([36073](https://github.com/WordPress/gutenberg/pull/36073))
-- Navigation: Force text decoration styles on nav item in editor. ([35859](https://github.com/WordPress/gutenberg/pull/35859))
+
+-   Font Appearance: Improve consistency of label in Typography panel. ([35860](https://github.com/WordPress/gutenberg/pull/35860))
+-   Font Family Support: Fix skip serialization check. ([36073](https://github.com/WordPress/gutenberg/pull/36073))
+-   Navigation: Force text decoration styles on nav item in editor. ([35859](https://github.com/WordPress/gutenberg/pull/35859))
 
 #### Template Editor
-- Clear selected block when clicking outside in the template part focus mode. ([35816](https://github.com/WordPress/gutenberg/pull/35816))
-- Templates: Only include templates for the current post types. ([35802](https://github.com/WordPress/gutenberg/pull/35802))
+
+-   Clear selected block when clicking outside in the template part focus mode. ([35816](https://github.com/WordPress/gutenberg/pull/35816))
+-   Templates: Only include templates for the current post types. ([35802](https://github.com/WordPress/gutenberg/pull/35802))
 
 #### Core Data
-- Avoid showing deleted records in editor saving flow. ([36027](https://github.com/WordPress/gutenberg/pull/36027))
-- Fix getEntityRecords to ensure resolution on REST API failure. ([36353](https://github.com/WordPress/gutenberg/pull/36353))
-- Fix Core Data using hardcoded baseURL prefix for taxonomies and post types API requests. ([35850](https://github.com/WordPress/gutenberg/pull/35850))
-- Make `saveEditedEntityRecord` use the entity key when available. ([36212](https://github.com/WordPress/gutenberg/pull/36212))
+
+-   Avoid showing deleted records in editor saving flow. ([36027](https://github.com/WordPress/gutenberg/pull/36027))
+-   Fix getEntityRecords to ensure resolution on REST API failure. ([36353](https://github.com/WordPress/gutenberg/pull/36353))
+-   Fix Core Data using hardcoded baseURL prefix for taxonomies and post types API requests. ([35850](https://github.com/WordPress/gutenberg/pull/35850))
+-   Make `saveEditedEntityRecord` use the entity key when available. ([36212](https://github.com/WordPress/gutenberg/pull/36212))
 
 #### Patterns
-- Update unsaved navigation block flow. ([35976](https://github.com/WordPress/gutenberg/pull/35976))
+
+-   Update unsaved navigation block flow. ([35976](https://github.com/WordPress/gutenberg/pull/35976))
 
 #### Full Site Editing
-- Add fallback handling for plugins or themes using the Customizer. ([35877](https://github.com/WordPress/gutenberg/pull/35877))
-- Fix missing `<MainDashboardButton>` slot fill in site editor. ([36369](https://github.com/WordPress/gutenberg/pull/36369))
-- Remove duplicate Editor menu item. ([36342](https://github.com/WordPress/gutenberg/pull/36342))
-- Theme resolver: Fix crash from calls to `undefined` functions. ([36248](https://github.com/WordPress/gutenberg/pull/36248))
-- Unhook `_block_template_render_title_tag` to prevent duplicate title tags from rendering. ([36133](https://github.com/WordPress/gutenberg/pull/36133))
+
+-   Add fallback handling for plugins or themes using the Customizer. ([35877](https://github.com/WordPress/gutenberg/pull/35877))
+-   Fix missing `<MainDashboardButton>` slot fill in site editor. ([36369](https://github.com/WordPress/gutenberg/pull/36369))
+-   Remove duplicate Editor menu item. ([36342](https://github.com/WordPress/gutenberg/pull/36342))
+-   Theme resolver: Fix crash from calls to `undefined` functions. ([36248](https://github.com/WordPress/gutenberg/pull/36248))
+-   Unhook `_block_template_render_title_tag` to prevent duplicate title tags from rendering. ([36133](https://github.com/WordPress/gutenberg/pull/36133))
 
 #### Widgets Editor
-- Fix layout styles not applying in widgets customizer. ([35865](https://github.com/WordPress/gutenberg/pull/35865))
+
+-   Fix layout styles not applying in widgets customizer. ([35865](https://github.com/WordPress/gutenberg/pull/35865))
 
 #### CSS & Styling
-- Editor defaults for themes with no editor styles and when user disables theme styles. ([35736](https://github.com/WordPress/gutenberg/pull/35736))
+
+-   Editor defaults for themes with no editor styles and when user disables theme styles. ([35736](https://github.com/WordPress/gutenberg/pull/35736))
 
 #### History
-- Support disabling autosave for native Unsupported Block Editor. ([35639](https://github.com/WordPress/gutenberg/pull/35639))
 
+-   Support disabling autosave for native Unsupported Block Editor. ([35639](https://github.com/WordPress/gutenberg/pull/35639))
 
 ### Performance
 
 #### List View
-- Fix pagedown/pageup and improve scrolling. ([36063](https://github.com/WordPress/gutenberg/pull/36063))
-- List View: Render a fixed number of items. ([35230](https://github.com/WordPress/gutenberg/pull/35230))
+
+-   Fix pagedown/pageup and improve scrolling. ([36063](https://github.com/WordPress/gutenberg/pull/36063))
+-   List View: Render a fixed number of items. ([35230](https://github.com/WordPress/gutenberg/pull/35230))
 
 #### Block Editor
-- Improve opening of the block inserter via manual token-based analysis of reusable blocks. ([35763](https://github.com/WordPress/gutenberg/pull/35763))
+
+-   Improve opening of the block inserter via manual token-based analysis of reusable blocks. ([35763](https://github.com/WordPress/gutenberg/pull/35763))
 
 #### Widgets Editor
-- List View: Avoid re-rendering all items on block focus. Enable persistent List View in the widget editor. ([35706](https://github.com/WordPress/gutenberg/pull/35706))
+
+-   List View: Avoid re-rendering all items on block focus. Enable persistent List View in the widget editor. ([35706](https://github.com/WordPress/gutenberg/pull/35706))
 
 ### Experiments
 
 #### Block Library
-- Navigation Area block. ([36178](https://github.com/WordPress/gutenberg/pull/36178))
 
+-   Navigation Area block. ([36178](https://github.com/WordPress/gutenberg/pull/36178))
 
 #### Full Site Editing
-- Always display Customizer menu item. ([36168](https://github.com/WordPress/gutenberg/pull/36168))
-- Revert "Always display Customizer menu item". ([36189](https://github.com/WordPress/gutenberg/pull/36189))
-- Remove slug and status columns from templates list in Appearance > Templates. ([35996](https://github.com/WordPress/gutenberg/pull/35996))
+
+-   Always display Customizer menu item. ([36168](https://github.com/WordPress/gutenberg/pull/36168))
+-   Revert "Always display Customizer menu item". ([36189](https://github.com/WordPress/gutenberg/pull/36189))
+-   Remove slug and status columns from templates list in Appearance > Templates. ([35996](https://github.com/WordPress/gutenberg/pull/35996))
 
 #### REST API
 
 #### Navigation Editor
-- Show a warning when trying to save unsupported blocks. ([35993](https://github.com/WordPress/gutenberg/pull/35993))
+
+-   Show a warning when trying to save unsupported blocks. ([35993](https://github.com/WordPress/gutenberg/pull/35993))
 
 ### Documentation
-- Added link to Ways to keep up with Gutenberg & Full Site Editing. ([36077](https://github.com/WordPress/gutenberg/pull/36077))
+
+-   Added link to Ways to keep up with Gutenberg & Full Site Editing. ([36077](https://github.com/WordPress/gutenberg/pull/36077))
+
 #### Handbook
-- Add Thunks Tutorial. ([36051](https://github.com/WordPress/gutenberg/pull/36051))
-- Add a more detailed guide for react native development. ([35529](https://github.com/WordPress/gutenberg/pull/35529))
-- Blocks: Add view script to block schema and documentation. ([36175](https://github.com/WordPress/gutenberg/pull/36175))
-- Blocks: Document changes to style and editorStyle in `block.json`. ([36218](https://github.com/WordPress/gutenberg/pull/36218))
-- Add Getting Started level for documentation. ([35891](https://github.com/WordPress/gutenberg/pull/35891))
-- Add section about using the schema during development. ([35835](https://github.com/WordPress/gutenberg/pull/35835))
-- Fix a small typo in the "Getting started" documentation. ([36109](https://github.com/WordPress/gutenberg/pull/36109))
-- Fix Typos in widgets/overview.md. ([36078](https://github.com/WordPress/gutenberg/pull/36078))
-- Fix wording in the Authoring Experience documentation. ([35969](https://github.com/WordPress/gutenberg/pull/35969))
-- Improve Getting Started landing page. ([35893](https://github.com/WordPress/gutenberg/pull/35893))
-- Release Docs: Remove consecutive RCs warning. ([35855](https://github.com/WordPress/gutenberg/pull/35855))
-- Theme.json: Fix typo. ([36139](https://github.com/WordPress/gutenberg/pull/36139))
-- Theme.json docs: Add missing settings & styles. ([36137](https://github.com/WordPress/gutenberg/pull/36137))
-- Tweak organization for getting-started documentation. ([34091](https://github.com/WordPress/gutenberg/pull/34091))
-- Update the recommendation for the cadence of npm releases. ([35925](https://github.com/WordPress/gutenberg/pull/35925))
+
+-   Add Thunks Tutorial. ([36051](https://github.com/WordPress/gutenberg/pull/36051))
+-   Add a more detailed guide for react native development. ([35529](https://github.com/WordPress/gutenberg/pull/35529))
+-   Blocks: Add view script to block schema and documentation. ([36175](https://github.com/WordPress/gutenberg/pull/36175))
+-   Blocks: Document changes to style and editorStyle in `block.json`. ([36218](https://github.com/WordPress/gutenberg/pull/36218))
+-   Add Getting Started level for documentation. ([35891](https://github.com/WordPress/gutenberg/pull/35891))
+-   Add section about using the schema during development. ([35835](https://github.com/WordPress/gutenberg/pull/35835))
+-   Fix a small typo in the "Getting started" documentation. ([36109](https://github.com/WordPress/gutenberg/pull/36109))
+-   Fix Typos in widgets/overview.md. ([36078](https://github.com/WordPress/gutenberg/pull/36078))
+-   Fix wording in the Authoring Experience documentation. ([35969](https://github.com/WordPress/gutenberg/pull/35969))
+-   Improve Getting Started landing page. ([35893](https://github.com/WordPress/gutenberg/pull/35893))
+-   Release Docs: Remove consecutive RCs warning. ([35855](https://github.com/WordPress/gutenberg/pull/35855))
+-   Theme.json: Fix typo. ([36139](https://github.com/WordPress/gutenberg/pull/36139))
+-   Theme.json docs: Add missing settings & styles. ([36137](https://github.com/WordPress/gutenberg/pull/36137))
+-   Tweak organization for getting-started documentation. ([34091](https://github.com/WordPress/gutenberg/pull/34091))
+-   Update the recommendation for the cadence of npm releases. ([35925](https://github.com/WordPress/gutenberg/pull/35925))
 
 #### Packages
-- Components: Update Components CONTRIBUTING.md indentation. ([35866](https://github.com/WordPress/gutenberg/pull/35866))
-- Create Block: Move create-block changelog entries back to Unreleased section. ([35886](https://github.com/WordPress/gutenberg/pull/35886))
-- DOM: Backtick added around `<textarea>` input tag in readme file. ([34813](https://github.com/WordPress/gutenberg/pull/34813))
-- Env: Update wordpress-develop example to clarify src/build location. ([35978](https://github.com/WordPress/gutenberg/pull/35978))
-- Rich Text: Add usage documentation for Rich Text package. ([35885](https://github.com/WordPress/gutenberg/pull/35885))
-- Schemas: Fix schema file URL. ([36157](https://github.com/WordPress/gutenberg/pull/36157))
+
+-   Components: Update Components CONTRIBUTING.md indentation. ([35866](https://github.com/WordPress/gutenberg/pull/35866))
+-   Create Block: Move create-block changelog entries back to Unreleased section. ([35886](https://github.com/WordPress/gutenberg/pull/35886))
+-   DOM: Backtick added around `<textarea>` input tag in readme file. ([34813](https://github.com/WordPress/gutenberg/pull/34813))
+-   Env: Update wordpress-develop example to clarify src/build location. ([35978](https://github.com/WordPress/gutenberg/pull/35978))
+-   Rich Text: Add usage documentation for Rich Text package. ([35885](https://github.com/WordPress/gutenberg/pull/35885))
+-   Schemas: Fix schema file URL. ([36157](https://github.com/WordPress/gutenberg/pull/36157))
 
 ### Code Quality
 
 #### REST API
-- Add Theme's base global styles endpoint. ([35985](https://github.com/WordPress/gutenberg/pull/35985))
-- Improvements for the global styles endpoint. ([36071](https://github.com/WordPress/gutenberg/pull/36071))
-- Remove "experimental" from URL details REST controller and promote to `v1` namespace. ([35915](https://github.com/WordPress/gutenberg/pull/35915))
 
+-   Add Theme's base global styles endpoint. ([35985](https://github.com/WordPress/gutenberg/pull/35985))
+-   Improvements for the global styles endpoint. ([36071](https://github.com/WordPress/gutenberg/pull/36071))
+-   Remove "experimental" from URL details REST controller and promote to `v1` namespace. ([35915](https://github.com/WordPress/gutenberg/pull/35915))
 
 #### Block Library
-- Heading: Auto-generated anchors hide implementation details. ([35747](https://github.com/WordPress/gutenberg/pull/35747))
-- Mark FSE blocks as non experimental. ([35979](https://github.com/WordPress/gutenberg/pull/35979))
-- Mark Post Comments as stable and Comments Query Loop as experimental. ([36132](https://github.com/WordPress/gutenberg/pull/36132))
-- Mark Post Navigation Link and Term Description blocks as stable. ([36163](https://github.com/WordPress/gutenberg/pull/36163))
-- Remove `post-` prefix from Comment Template inner blocks. ([36171](https://github.com/WordPress/gutenberg/pull/36171))
+
+-   Heading: Auto-generated anchors hide implementation details. ([35747](https://github.com/WordPress/gutenberg/pull/35747))
+-   Mark FSE blocks as non experimental. ([35979](https://github.com/WordPress/gutenberg/pull/35979))
+-   Mark Post Comments as stable and Comments Query Loop as experimental. ([36132](https://github.com/WordPress/gutenberg/pull/36132))
+-   Mark Post Navigation Link and Term Description blocks as stable. ([36163](https://github.com/WordPress/gutenberg/pull/36163))
+-   Remove `post-` prefix from Comment Template inner blocks. ([36171](https://github.com/WordPress/gutenberg/pull/36171))
 
 #### Global Styles
-- Linting: Fix WPCS lint errors in global styles. ([36058](https://github.com/WordPress/gutenberg/pull/36058))
-- Refactor theme.json migrations to be a single class. ([36182](https://github.com/WordPress/gutenberg/pull/36182))
-- Remove locations we do not translate from `theme-i18n.json`. ([35881](https://github.com/WordPress/gutenberg/pull/35881))
-- Update `theme.json` schema migrations. ([36154](https://github.com/WordPress/gutenberg/pull/36154))
+
+-   Linting: Fix WPCS lint errors in global styles. ([36058](https://github.com/WordPress/gutenberg/pull/36058))
+-   Refactor theme.json migrations to be a single class. ([36182](https://github.com/WordPress/gutenberg/pull/36182))
+-   Remove locations we do not translate from `theme-i18n.json`. ([35881](https://github.com/WordPress/gutenberg/pull/35881))
+-   Update `theme.json` schema migrations. ([36154](https://github.com/WordPress/gutenberg/pull/36154))
 
 #### Post Editor
-- Migrate to thunks. ([35720](https://github.com/WordPress/gutenberg/pull/35720))
-- Refactor FlatTermSelector into a functional component. ([33459](https://github.com/WordPress/gutenberg/pull/33459))
-- Remove GB prefixed functions from template part. ([36180](https://github.com/WordPress/gutenberg/pull/36180))
-- Translated site properties. ([36097](https://github.com/WordPress/gutenberg/pull/36097))
+
+-   Migrate to thunks. ([35720](https://github.com/WordPress/gutenberg/pull/35720))
+-   Refactor FlatTermSelector into a functional component. ([33459](https://github.com/WordPress/gutenberg/pull/33459))
+-   Remove GB prefixed functions from template part. ([36180](https://github.com/WordPress/gutenberg/pull/36180))
+-   Translated site properties. ([36097](https://github.com/WordPress/gutenberg/pull/36097))
 
 #### Components
-- ToolsPanel: Use Grid component to handle layout. ([35621](https://github.com/WordPress/gutenberg/pull/35621))
-- Update spacing in CircularOptionPicker. ([36014](https://github.com/WordPress/gutenberg/pull/36014))
-- Use small button on tools panel toggle. ([35935](https://github.com/WordPress/gutenberg/pull/35935))
+
+-   ToolsPanel: Use Grid component to handle layout. ([35621](https://github.com/WordPress/gutenberg/pull/35621))
+-   Update spacing in CircularOptionPicker. ([36014](https://github.com/WordPress/gutenberg/pull/36014))
+-   Use small button on tools panel toggle. ([35935](https://github.com/WordPress/gutenberg/pull/35935))
 
 #### Other Packages
-- Create Block: Add block.json schema to generated file. ([35843](https://github.com/WordPress/gutenberg/pull/35843))
-- Data: Rename types file from .d.ts to .ts. ([36062](https://github.com/WordPress/gutenberg/pull/36062))
-- Url: Move getStablePath function into the wordrpess/url package. ([35992](https://github.com/WordPress/gutenberg/pull/35992))
-- Schemas: Add schemas package. ([35998](https://github.com/WordPress/gutenberg/pull/35998))
-- Schemas: Theme.json - Add `title` to templateParts. ([36145](https://github.com/WordPress/gutenberg/pull/36145))
+
+-   Create Block: Add block.json schema to generated file. ([35843](https://github.com/WordPress/gutenberg/pull/35843))
+-   Data: Rename types file from .d.ts to .ts. ([36062](https://github.com/WordPress/gutenberg/pull/36062))
+-   Url: Move getStablePath function into the wordrpess/url package. ([35992](https://github.com/WordPress/gutenberg/pull/35992))
+-   Schemas: Add schemas package. ([35998](https://github.com/WordPress/gutenberg/pull/35998))
+-   Schemas: Theme.json - Add `title` to templateParts. ([36145](https://github.com/WordPress/gutenberg/pull/36145))
 
 #### CSS & Styling
-- Remove invalid buttons block CSS property. ([33793](https://github.com/WordPress/gutenberg/pull/33793))
 
+-   Remove invalid buttons block CSS property. ([33793](https://github.com/WordPress/gutenberg/pull/33793))
 
 ### Tools
 
 #### Plugin and backporting to WordPress core
-- Updates `WP_Theme_JSON_Resolver` and tests to be equal to core. ([36223](https://github.com/WordPress/gutenberg/pull/36223))
-- Changes for FSE backport in core. ([36201](https://github.com/WordPress/gutenberg/pull/36201))
-- Temporarily pin .wp-env.json to WP 5.8.1. ([36333](https://github.com/WordPress/gutenberg/pull/36333))
+
+-   Updates `WP_Theme_JSON_Resolver` and tests to be equal to core. ([36223](https://github.com/WordPress/gutenberg/pull/36223))
+-   Changes for FSE backport in core. ([36201](https://github.com/WordPress/gutenberg/pull/36201))
+-   Temporarily pin .wp-env.json to WP 5.8.1. ([36333](https://github.com/WordPress/gutenberg/pull/36333))
 
 #### Testing
-- Add a method to disable auto-accepting dialogs. ([35828](https://github.com/WordPress/gutenberg/pull/35828))
-- Skip broken widgets test. ([36239](https://github.com/WordPress/gutenberg/pull/36239))
-- Skip flaky test for loading block stylesheets in iframe. ([35961](https://github.com/WordPress/gutenberg/pull/35961))
-- Tests: Run block fixtures through KSES. ([35611](https://github.com/WordPress/gutenberg/pull/35611))
-- theme.json: Make sure tests are pure. ([36253](https://github.com/WordPress/gutenberg/pull/36253))
-- theme.json: Update test data. ([35883](https://github.com/WordPress/gutenberg/pull/35883))
-- Scripts: Increase timeout for end-to-end tests to 30 seconds. ([35983](https://github.com/WordPress/gutenberg/pull/35983))
-- Improve unit test coverage for REST API menus endpoints. ([36177](https://github.com/WordPress/gutenberg/pull/36177))
-- Update child theme.json merge test to match core. ([36329](https://github.com/WordPress/gutenberg/pull/36329))
+
+-   Add a method to disable auto-accepting dialogs. ([35828](https://github.com/WordPress/gutenberg/pull/35828))
+-   Skip broken widgets test. ([36239](https://github.com/WordPress/gutenberg/pull/36239))
+-   Skip flaky test for loading block stylesheets in iframe. ([35961](https://github.com/WordPress/gutenberg/pull/35961))
+-   Tests: Run block fixtures through KSES. ([35611](https://github.com/WordPress/gutenberg/pull/35611))
+-   theme.json: Make sure tests are pure. ([36253](https://github.com/WordPress/gutenberg/pull/36253))
+-   theme.json: Update test data. ([35883](https://github.com/WordPress/gutenberg/pull/35883))
+-   Scripts: Increase timeout for end-to-end tests to 30 seconds. ([35983](https://github.com/WordPress/gutenberg/pull/35983))
+-   Improve unit test coverage for REST API menus endpoints. ([36177](https://github.com/WordPress/gutenberg/pull/36177))
+-   Update child theme.json merge test to match core. ([36329](https://github.com/WordPress/gutenberg/pull/36329))
 
 #### Debugging
-- Wp-env: Disable Xdebug by default unless specified by user. ([34324](https://github.com/WordPress/gutenberg/pull/34324))
 
+-   Wp-env: Disable Xdebug by default unless specified by user. ([34324](https://github.com/WordPress/gutenberg/pull/34324))
 
 = 11.8.3 =
 
+## Changelog
 
 ### Various
 
-- Fix Gutenberg WordPress trunk https://github.com/WordPress/gutenberg/pull/36347.
-
+-   Fix Gutenberg WordPress trunk https://github.com/WordPress/gutenberg/pull/36347.
 
 = 11.9.0-rc.3 =
 
+## Changelog
+
 ### Features
 
 #### Block Library
-- New Block: Comment Reply Link. ([35774](https://github.com/WordPress/gutenberg/pull/35774))
-- New Block: Comment Link. ([35965](https://github.com/WordPress/gutenberg/pull/35965))
-- New Block: Comment Avatar. ([35396](https://github.com/WordPress/gutenberg/pull/35396))
-- New Block: Comments Query Loop. ([35231](https://github.com/WordPress/gutenberg/pull/35231))
 
+-   New Block: Comment Reply Link. ([35774](https://github.com/WordPress/gutenberg/pull/35774))
+-   New Block: Comment Link. ([35965](https://github.com/WordPress/gutenberg/pull/35965))
+-   New Block: Comment Avatar. ([35396](https://github.com/WordPress/gutenberg/pull/35396))
+-   New Block: Comments Query Loop. ([35231](https://github.com/WordPress/gutenberg/pull/35231))
 
 ### Enhancements
 
-- Block toolbar: Remove visual clue from text alignment icon. ([35922](https://github.com/WordPress/gutenberg/pull/35922))
-- Improve the initial loading of the site editor. ([36044](https://github.com/WordPress/gutenberg/pull/36044))
-- StripHTML: preserve leading and trailing spaces and strip script and on* attributes. ([35539](https://github.com/WordPress/gutenberg/pull/35539))
-
-#### Block Library
-
-- Buttons: Add flex layout and new layout type. ([35819](https://github.com/WordPress/gutenberg/pull/35819))
-- Code: Add support for padding, color, and border styles. ([27582](https://github.com/WordPress/gutenberg/pull/27582))
-- Columns: Add padding support. ([35701](https://github.com/WordPress/gutenberg/pull/35701))
-- Comment Author Name: Add spacing to have same options as Post Author Name. ([36213](https://github.com/WordPress/gutenberg/pull/36213))
-- Comment Edit Link: Add alignment option. ([36033](https://github.com/WordPress/gutenberg/pull/36033))
-- Embed: Add Wolfram Cloud as an embed provider. ([35656](https://github.com/WordPress/gutenberg/pull/35656))
-- Gallery: Replace gallery experimental setting with a check for use_balanceTags. ([34979](https://github.com/WordPress/gutenberg/pull/34979))
-- Image: Add data-id attribute on server side render for core galleries. ([35975](https://github.com/WordPress/gutenberg/pull/35975))
-- Navigation: Add create new menu button. ([36245](https://github.com/WordPress/gutenberg/pull/36245))
-- Navigation: Add delete nav menu button. ([35981](https://github.com/WordPress/gutenberg/pull/35981))
-- Navigation: Add featured transforms in Link Control for Navigation Link items. ([35857](https://github.com/WordPress/gutenberg/pull/35857))
-- Navigation: Add flex layout. ([36169](https://github.com/WordPress/gutenberg/pull/36169))
-- Navigation: Add missing menu item attributes. ([35634](https://github.com/WordPress/gutenberg/pull/35634))
-- Navigation: Create nav menu on pattern insertion or when the block has uncontrolled inner blocks. ([36024](https://github.com/WordPress/gutenberg/pull/36024))
-- Navigation: Save data to a wp_navigation post type. ([35746](https://github.com/WordPress/gutenberg/pull/35746))
-- Navigation: Update block entity automatic name generation and refine naming UI. ([36238](https://github.com/WordPress/gutenberg/pull/36238))
-- Navigation: Use a single placeholder for the block. ([36023](https://github.com/WordPress/gutenberg/pull/36023))
-- Page List: Create a JS version for the editor. ([31670](https://github.com/WordPress/gutenberg/pull/31670))
-- Post Author: Add spacing controls. ([35963](https://github.com/WordPress/gutenberg/pull/35963))
-- Post Comment: Deprecate the block now that the Comment Query Loop block has been added. ([36032](https://github.com/WordPress/gutenberg/pull/36032))
-- Post Comment Author: Add alignment options. ([36045](https://github.com/WordPress/gutenberg/pull/36045))
-- Post Comments: Even out the top margin inside the block. ([35887](https://github.com/WordPress/gutenberg/pull/35887))
-- Post Excerpt: Add spacing controls. ([35959](https://github.com/WordPress/gutenberg/pull/35959))
-- Post Excerpt: Don't print the wrapper when there is no excerpt. ([35749](https://github.com/WordPress/gutenberg/pull/35749))
-- Post Title: Return no markup if title is empty. ([35861](https://github.com/WordPress/gutenberg/pull/35861))
-- Search: Add contextual defaults when inserted in Navigation block. ([36125](https://github.com/WordPress/gutenberg/pull/36125))
-- Gallery block: Add a dismissible warning about the need for versions >=18.2 of the mobile app. ([36012](https://github.com/WordPress/gutenberg/pull/36012))
+-   Block toolbar: Remove visual clue from text alignment icon. ([35922](https://github.com/WordPress/gutenberg/pull/35922))
+-   Improve the initial loading of the site editor. ([36044](https://github.com/WordPress/gutenberg/pull/36044))
+-   StripHTML: preserve leading and trailing spaces and strip script and on\* attributes. ([35539](https://github.com/WordPress/gutenberg/pull/35539))
+
+#### Block Library
+
+-   Buttons: Add flex layout and new layout type. ([35819](https://github.com/WordPress/gutenberg/pull/35819))
+-   Code: Add support for padding, color, and border styles. ([27582](https://github.com/WordPress/gutenberg/pull/27582))
+-   Columns: Add padding support. ([35701](https://github.com/WordPress/gutenberg/pull/35701))
+-   Comment Author Name: Add spacing to have same options as Post Author Name. ([36213](https://github.com/WordPress/gutenberg/pull/36213))
+-   Comment Edit Link: Add alignment option. ([36033](https://github.com/WordPress/gutenberg/pull/36033))
+-   Embed: Add Wolfram Cloud as an embed provider. ([35656](https://github.com/WordPress/gutenberg/pull/35656))
+-   Gallery: Replace gallery experimental setting with a check for use_balanceTags. ([34979](https://github.com/WordPress/gutenberg/pull/34979))
+-   Image: Add data-id attribute on server side render for core galleries. ([35975](https://github.com/WordPress/gutenberg/pull/35975))
+-   Navigation: Add create new menu button. ([36245](https://github.com/WordPress/gutenberg/pull/36245))
+-   Navigation: Add delete nav menu button. ([35981](https://github.com/WordPress/gutenberg/pull/35981))
+-   Navigation: Add featured transforms in Link Control for Navigation Link items. ([35857](https://github.com/WordPress/gutenberg/pull/35857))
+-   Navigation: Add flex layout. ([36169](https://github.com/WordPress/gutenberg/pull/36169))
+-   Navigation: Add missing menu item attributes. ([35634](https://github.com/WordPress/gutenberg/pull/35634))
+-   Navigation: Create nav menu on pattern insertion or when the block has uncontrolled inner blocks. ([36024](https://github.com/WordPress/gutenberg/pull/36024))
+-   Navigation: Save data to a wp_navigation post type. ([35746](https://github.com/WordPress/gutenberg/pull/35746))
+-   Navigation: Update block entity automatic name generation and refine naming UI. ([36238](https://github.com/WordPress/gutenberg/pull/36238))
+-   Navigation: Use a single placeholder for the block. ([36023](https://github.com/WordPress/gutenberg/pull/36023))
+-   Page List: Create a JS version for the editor. ([31670](https://github.com/WordPress/gutenberg/pull/31670))
+-   Post Author: Add spacing controls. ([35963](https://github.com/WordPress/gutenberg/pull/35963))
+-   Post Comment: Deprecate the block now that the Comment Query Loop block has been added. ([36032](https://github.com/WordPress/gutenberg/pull/36032))
+-   Post Comment Author: Add alignment options. ([36045](https://github.com/WordPress/gutenberg/pull/36045))
+-   Post Comments: Even out the top margin inside the block. ([35887](https://github.com/WordPress/gutenberg/pull/35887))
+-   Post Excerpt: Add spacing controls. ([35959](https://github.com/WordPress/gutenberg/pull/35959))
+-   Post Excerpt: Don't print the wrapper when there is no excerpt. ([35749](https://github.com/WordPress/gutenberg/pull/35749))
+-   Post Title: Return no markup if title is empty. ([35861](https://github.com/WordPress/gutenberg/pull/35861))
+-   Search: Add contextual defaults when inserted in Navigation block. ([36125](https://github.com/WordPress/gutenberg/pull/36125))
+-   Gallery block: Add a dismissible warning about the need for versions >=18.2 of the mobile app. ([36012](https://github.com/WordPress/gutenberg/pull/36012))
 
 #### Accessibility
-- Add announcement on formatting change for screen readers. ([35896](https://github.com/WordPress/gutenberg/pull/35896))
-- Add aria-current to navigation link, submenu, page list. ([35880](https://github.com/WordPress/gutenberg/pull/35880))
-- Link editing: Improve focus styles for Link UI preview title. ([35853](https://github.com/WordPress/gutenberg/pull/35853))
-- Site Editor: Enable the "Save" keyboard shortcut. ([36138](https://github.com/WordPress/gutenberg/pull/36138))
+
+-   Add announcement on formatting change for screen readers. ([35896](https://github.com/WordPress/gutenberg/pull/35896))
+-   Add aria-current to navigation link, submenu, page list. ([35880](https://github.com/WordPress/gutenberg/pull/35880))
+-   Link editing: Improve focus styles for Link UI preview title. ([35853](https://github.com/WordPress/gutenberg/pull/35853))
+-   Site Editor: Enable the "Save" keyboard shortcut. ([36138](https://github.com/WordPress/gutenberg/pull/36138))
 
 #### Block Editor
-- Drag and drop: Show drag slot instead of hiding the block being dragged. ([33950](https://github.com/WordPress/gutenberg/pull/33950))
-- Enable rich previews in the Link UI for the Site Editor. ([35951](https://github.com/WordPress/gutenberg/pull/35951))
-- Link editing: Update Link UI design for preview action buttons to use icons for edit and unlink. ([35833](https://github.com/WordPress/gutenberg/pull/35833))
-- Use the block's name in the "remove block" menu item in the block settings dropdown. ([35872](https://github.com/WordPress/gutenberg/pull/35872))
+
+-   Drag and drop: Show drag slot instead of hiding the block being dragged. ([33950](https://github.com/WordPress/gutenberg/pull/33950))
+-   Enable rich previews in the Link UI for the Site Editor. ([35951](https://github.com/WordPress/gutenberg/pull/35951))
+-   Link editing: Update Link UI design for preview action buttons to use icons for edit and unlink. ([35833](https://github.com/WordPress/gutenberg/pull/35833))
+-   Use the block's name in the "remove block" menu item in the block settings dropdown. ([35872](https://github.com/WordPress/gutenberg/pull/35872))
 
 #### Full Site Editing
-- Move the Site Editor menu item to sit under Appearance and rename to Editor. ([36064](https://github.com/WordPress/gutenberg/pull/36064))
-- Use Heading component on NavigationMenu and NavigationGroup components. ([36009](https://github.com/WordPress/gutenberg/pull/36009))
-- Use SearchControl component inside nav menu. ([36011](https://github.com/WordPress/gutenberg/pull/36011))
+
+-   Move the Site Editor menu item to sit under Appearance and rename to Editor. ([36064](https://github.com/WordPress/gutenberg/pull/36064))
+-   Use Heading component on NavigationMenu and NavigationGroup components. ([36009](https://github.com/WordPress/gutenberg/pull/36009))
+-   Use SearchControl component inside nav menu. ([36011](https://github.com/WordPress/gutenberg/pull/36011))
 
 #### Components
-- Duotone: Add description to clarify that the underlying image will not be affected. ([36018](https://github.com/WordPress/gutenberg/pull/36018))
-- ToolsPanel: Update typography panel layout. ([35911](https://github.com/WordPress/gutenberg/pull/35911))
+
+-   Duotone: Add description to clarify that the underlying image will not be affected. ([36018](https://github.com/WordPress/gutenberg/pull/36018))
+-   ToolsPanel: Update typography panel layout. ([35911](https://github.com/WordPress/gutenberg/pull/35911))
 
 #### Template Editor
-- Add resizer to template part focus mode. ([35728](https://github.com/WordPress/gutenberg/pull/35728))
-- Auto resize the height of template part focus mode. ([35974](https://github.com/WordPress/gutenberg/pull/35974))
+
+-   Add resizer to template part focus mode. ([35728](https://github.com/WordPress/gutenberg/pull/35728))
+-   Auto resize the height of template part focus mode. ([35974](https://github.com/WordPress/gutenberg/pull/35974))
 
 #### Global Styles
-- Remove the duplicated title in background, text and link views. ([35583](https://github.com/WordPress/gutenberg/pull/35583))
-- Typography: Switch to ToolsPanel for block support UI. ([33744](https://github.com/WordPress/gutenberg/pull/33744))
+
+-   Remove the duplicated title in background, text and link views. ([35583](https://github.com/WordPress/gutenberg/pull/35583))
+-   Typography: Switch to ToolsPanel for block support UI. ([33744](https://github.com/WordPress/gutenberg/pull/33744))
 
 #### Design Tools
-- Duotone: Enable transparency. ([34130](https://github.com/WordPress/gutenberg/pull/34130))
-- Layout: Add `flex-wrap` control to `flex` layout. ([36003](https://github.com/WordPress/gutenberg/pull/36003))
-- Typography block support: Add typography support and defaults. ([34064](https://github.com/WordPress/gutenberg/pull/34064))
+
+-   Duotone: Enable transparency. ([34130](https://github.com/WordPress/gutenberg/pull/34130))
+-   Layout: Add `flex-wrap` control to `flex` layout. ([36003](https://github.com/WordPress/gutenberg/pull/36003))
+-   Typography block support: Add typography support and defaults. ([34064](https://github.com/WordPress/gutenberg/pull/34064))
 
 #### Media
-- Remove "security" verbiage from warning when filetype does not pass on upload. ([36226](https://github.com/WordPress/gutenberg/pull/36226))
+
+-   Remove "security" verbiage from warning when filetype does not pass on upload. ([36226](https://github.com/WordPress/gutenberg/pull/36226))
 
 #### Patterns
-- Add an `inserter` flag to hide patterns from UI. ([36108](https://github.com/WordPress/gutenberg/pull/36108))
+
+-   Add an `inserter` flag to hide patterns from UI. ([36108](https://github.com/WordPress/gutenberg/pull/36108))
 
 #### Themes
-- Remove experimental feature notice for block themes. ([36083](https://github.com/WordPress/gutenberg/pull/36083))
+
+-   Remove experimental feature notice for block themes. ([36083](https://github.com/WordPress/gutenberg/pull/36083))
 
 #### Testing
-- Scripts: Increase timeout for end-to-end tests to 30 seconds. ([35983](https://github.com/WordPress/gutenberg/pull/35983))
+
+-   Scripts: Increase timeout for end-to-end tests to 30 seconds. ([35983](https://github.com/WordPress/gutenberg/pull/35983))
 
 #### Tools
-- Wp-env: Disable Xdebug by default unless specified by user. ([34324](https://github.com/WordPress/gutenberg/pull/34324))
+
+-   Wp-env: Disable Xdebug by default unless specified by user. ([34324](https://github.com/WordPress/gutenberg/pull/34324))
 
 #### REST API
-- URL Details: Update regex to include `og:Description`. ([35875](https://github.com/WordPress/gutenberg/pull/35875))
 
+-   URL Details: Update regex to include `og:Description`. ([35875](https://github.com/WordPress/gutenberg/pull/35875))
 
 ### New APIs
 
 #### Global Styles
-- Add API to access global settings, styles, and stylesheet. ([34843](https://github.com/WordPress/gutenberg/pull/34843))
-
-#### Block Library
-- Inner blocks: Add `useInnerBlocksProps.save` function for edit/save symmetry, and stabilise API. ([26031](https://github.com/WordPress/gutenberg/pull/26031))
-
-
-### Bug Fixes
-
-- Allow moving metaboxes to previously empty area. ([25187](https://github.com/WordPress/gutenberg/pull/25187))
-- Avoid showing deleted records in editor saving flow. ([36027](https://github.com/WordPress/gutenberg/pull/36027))
-- BaseControl: Fix undefined Help text id if no id is passed to component. ([35899](https://github.com/WordPress/gutenberg/pull/35899))
-- Change `console.error` to `console.warn` for enqueued styles in the editor. ([35914](https://github.com/WordPress/gutenberg/pull/35914))
-- Disable ability to edit wp_navigation menus via `Appearance -> Navigation Menus` for non-FSE themes. ([36257](https://github.com/WordPress/gutenberg/pull/36257))
-- Fix Core Data using hardcoded baseURL prefix for taxonomies and post types API requests. ([35850](https://github.com/WordPress/gutenberg/pull/35850))
-- Fix WPCS lint errors in global styles. ([36058](https://github.com/WordPress/gutenberg/pull/36058))
-- Fix `getPxFromCssUnit` test stability and test that memoized function works correctly. ([35939](https://github.com/WordPress/gutenberg/pull/35939))
-- Fix Rest global styles controller accessing configuration that may not exist. ([36047](https://github.com/WordPress/gutenberg/pull/36047))
-- Make `saveEditedEntityRecord` use the entity key when available. ([36212](https://github.com/WordPress/gutenberg/pull/36212))
-- Preserve highlighted text selection when changing colors ([36263](https://github.com/WordPress/gutenberg/pull/36263))
-- Prevent PHP notice in Elements block support for blocks with empty content. ([35836](https://github.com/WordPress/gutenberg/pull/35836))
-- Theme resolver: Fix crash from calls to `undefined` functions. ([36248](https://github.com/WordPress/gutenberg/pull/36248))
-- Unhook `_block_template_render_title_tag` to prevent duplicate title tags from rendering. ([36133](https://github.com/WordPress/gutenberg/pull/36133))
-
-#### Block Library
-- Classic: Fix select all blocks side effect that overwrote paragraph block contents. ([35999](https://github.com/WordPress/gutenberg/pull/35999))
-- Column: Only add flex-basis if width contains a number. ([35831](https://github.com/WordPress/gutenberg/pull/35831))
-- Comment Template: Move inner blocks container to separate components. ([36174](https://github.com/WordPress/gutenberg/pull/36174))
-- Blocks: Fix relative URLs for inlined styles. ([35538](https://github.com/WordPress/gutenberg/pull/35538))
-- Fix saving template parts in the site editor by fixing controlled inner blocks parent block attributes updates. ([35827](https://github.com/WordPress/gutenberg/pull/35827))
-- Fix incorrect attributes definitions for Column, Cover, and Group blocks. ([36140](https://github.com/WordPress/gutenberg/pull/36140))
-- Gallery: Only show the gallery upload error message if mixed multiple files are uploaded. ([35790](https://github.com/WordPress/gutenberg/pull/35790))
-- Gallery: Remove the arbitrary alt text that is added to gallery images. ([35936](https://github.com/WordPress/gutenberg/pull/35936))
-- Heading: Avoid error on split when the paragraph isn't registered. ([35871](https://github.com/WordPress/gutenberg/pull/35871))
-- Navigation Submenu: Fix PHP notice caused by stale id reference. ([35984](https://github.com/WordPress/gutenberg/pull/35984))
-- Navigation overlay menu: Fix submenu spacing. ([35823](https://github.com/WordPress/gutenberg/pull/35823))
-- Navigation: Fix dropdown indicator position. ([36106](https://github.com/WordPress/gutenberg/pull/36106))
-- Navigation: Fix issues with responsive justifications. ([35913](https://github.com/WordPress/gutenberg/pull/35913)) and ([36105](https://github.com/WordPress/gutenberg/pull/36105))
-- Navigation: Fix padding for social links on mobile. ([35824](https://github.com/WordPress/gutenberg/pull/35824))
-- Pattern: Remove wrapping div. ([36090](https://github.com/WordPress/gutenberg/pull/36090))
-- Post Comment: Handle the case where a comment does not exist. ([35810](https://github.com/WordPress/gutenberg/pull/35810))
-- Post Content: Ensure the item after post content clears floats. ([36006](https://github.com/WordPress/gutenberg/pull/36006))
-- Post Navigation Link: Do not translate HTML tag. ([35930](https://github.com/WordPress/gutenberg/pull/35930))
-- Post Template Block: Move inner blocks container to separate component. ([35945](https://github.com/WordPress/gutenberg/pull/35945))
-- Post Terms: Prevent the block from breaking on pages. ([35957](https://github.com/WordPress/gutenberg/pull/35957))
-- Site Logo: Fix center alignment. ([35971](https://github.com/WordPress/gutenberg/pull/35971))
-- Fix submenus not opening on click. ([36290](https://github.com/WordPress/gutenberg/pull/36290))
-
-
-#### Components
-- AnglePickerControl: Use admin color scheme. ([35908](https://github.com/WordPress/gutenberg/pull/35908))
-- ColorListPicker: Fix spacing to accomodate the new color picker. ([36017](https://github.com/WordPress/gutenberg/pull/36017))
-- ColorPalette: Fix className. ([36016](https://github.com/WordPress/gutenberg/pull/36016))
-- ColorPicker: Fix unexpected movements, and closing on first click in the color picker. ([35670](https://github.com/WordPress/gutenberg/pull/35670))
-- Popover: Check anchorDocument default view before removing events. ([35832](https://github.com/WordPress/gutenberg/pull/35832))
-- RangeControl: Fix style issue in RTL. ([35777](https://github.com/WordPress/gutenberg/pull/35777))
-- Storybook: Lazy load LTR/RTL styles for consistent specificity. ([35771](https://github.com/WordPress/gutenberg/pull/35771))
-- Text: Fix text color value to use correct gray color value for Link UI preview description text. ([35851](https://github.com/WordPress/gutenberg/pull/35851))
-
-#### Global Styles
-- Fix navigation in global styles sidebar. ([36203](https://github.com/WordPress/gutenberg/pull/36203))
-- Fix presets data for themes that do not provide any preset. ([36054](https://github.com/WordPress/gutenberg/pull/36054))
-- Generate preset metadata for font-family in the site editor. ([36022](https://github.com/WordPress/gutenberg/pull/36022))
-- Hotfix for leftovers of `WP_Theme_JSON_Resolver::Get_merged_data`. ([36173](https://github.com/WordPress/gutenberg/pull/36173))
-- Lower the specificity of border & padding styles for the outline block style in the button block. ([35968](https://github.com/WordPress/gutenberg/pull/35968))
-- Theme.json: Remove custom prefixes from properties that did not land in 5.8. ([34485](https://github.com/WordPress/gutenberg/pull/34485))
-
-#### Block Editor
-- Fix inserter with block pattern categories. ([36116](https://github.com/WordPress/gutenberg/pull/36116))
-- Fix navigation block link control zero value in it. ([36198](https://github.com/WordPress/gutenberg/pull/36198))
-- Fix the update of link and suggestions in LinkControl. ([32320](https://github.com/WordPress/gutenberg/pull/32320))
-- Make Link UI inactive if selection extends beyond format bounds or encounters new link. ([35946](https://github.com/WordPress/gutenberg/pull/35946))
-- Fix selection by holding shift key for nested blocks. ([35668](https://github.com/WordPress/gutenberg/pull/35668))
-- Fix shift+click on a child block with its parent selected. ([35988](https://github.com/WordPress/gutenberg/pull/35988))
+
+-   Add API to access global settings, styles, and stylesheet. ([34843](https://github.com/WordPress/gutenberg/pull/34843))
+
+#### Block Library
+
+-   Inner blocks: Add `useInnerBlocksProps.save` function for edit/save symmetry, and stabilise API. ([26031](https://github.com/WordPress/gutenberg/pull/26031))
+
+### Bug Fixes
+
+-   Allow moving metaboxes to previously empty area. ([25187](https://github.com/WordPress/gutenberg/pull/25187))
+-   Avoid showing deleted records in editor saving flow. ([36027](https://github.com/WordPress/gutenberg/pull/36027))
+-   BaseControl: Fix undefined Help text id if no id is passed to component. ([35899](https://github.com/WordPress/gutenberg/pull/35899))
+-   Change `console.error` to `console.warn` for enqueued styles in the editor. ([35914](https://github.com/WordPress/gutenberg/pull/35914))
+-   Disable ability to edit wp_navigation menus via `Appearance -> Navigation Menus` for non-FSE themes. ([36257](https://github.com/WordPress/gutenberg/pull/36257))
+-   Fix Core Data using hardcoded baseURL prefix for taxonomies and post types API requests. ([35850](https://github.com/WordPress/gutenberg/pull/35850))
+-   Fix WPCS lint errors in global styles. ([36058](https://github.com/WordPress/gutenberg/pull/36058))
+-   Fix `getPxFromCssUnit` test stability and test that memoized function works correctly. ([35939](https://github.com/WordPress/gutenberg/pull/35939))
+-   Fix Rest global styles controller accessing configuration that may not exist. ([36047](https://github.com/WordPress/gutenberg/pull/36047))
+-   Make `saveEditedEntityRecord` use the entity key when available. ([36212](https://github.com/WordPress/gutenberg/pull/36212))
+-   Preserve highlighted text selection when changing colors ([36263](https://github.com/WordPress/gutenberg/pull/36263))
+-   Prevent PHP notice in Elements block support for blocks with empty content. ([35836](https://github.com/WordPress/gutenberg/pull/35836))
+-   Theme resolver: Fix crash from calls to `undefined` functions. ([36248](https://github.com/WordPress/gutenberg/pull/36248))
+-   Unhook `_block_template_render_title_tag` to prevent duplicate title tags from rendering. ([36133](https://github.com/WordPress/gutenberg/pull/36133))
+
+#### Block Library
+
+-   Classic: Fix select all blocks side effect that overwrote paragraph block contents. ([35999](https://github.com/WordPress/gutenberg/pull/35999))
+-   Column: Only add flex-basis if width contains a number. ([35831](https://github.com/WordPress/gutenberg/pull/35831))
+-   Comment Template: Move inner blocks container to separate components. ([36174](https://github.com/WordPress/gutenberg/pull/36174))
+-   Blocks: Fix relative URLs for inlined styles. ([35538](https://github.com/WordPress/gutenberg/pull/35538))
+-   Fix saving template parts in the site editor by fixing controlled inner blocks parent block attributes updates. ([35827](https://github.com/WordPress/gutenberg/pull/35827))
+-   Fix incorrect attributes definitions for Column, Cover, and Group blocks. ([36140](https://github.com/WordPress/gutenberg/pull/36140))
+-   Gallery: Only show the gallery upload error message if mixed multiple files are uploaded. ([35790](https://github.com/WordPress/gutenberg/pull/35790))
+-   Gallery: Remove the arbitrary alt text that is added to gallery images. ([35936](https://github.com/WordPress/gutenberg/pull/35936))
+-   Heading: Avoid error on split when the paragraph isn't registered. ([35871](https://github.com/WordPress/gutenberg/pull/35871))
+-   Navigation Submenu: Fix PHP notice caused by stale id reference. ([35984](https://github.com/WordPress/gutenberg/pull/35984))
+-   Navigation overlay menu: Fix submenu spacing. ([35823](https://github.com/WordPress/gutenberg/pull/35823))
+-   Navigation: Fix dropdown indicator position. ([36106](https://github.com/WordPress/gutenberg/pull/36106))
+-   Navigation: Fix issues with responsive justifications. ([35913](https://github.com/WordPress/gutenberg/pull/35913)) and ([36105](https://github.com/WordPress/gutenberg/pull/36105))
+-   Navigation: Fix padding for social links on mobile. ([35824](https://github.com/WordPress/gutenberg/pull/35824))
+-   Pattern: Remove wrapping div. ([36090](https://github.com/WordPress/gutenberg/pull/36090))
+-   Post Comment: Handle the case where a comment does not exist. ([35810](https://github.com/WordPress/gutenberg/pull/35810))
+-   Post Content: Ensure the item after post content clears floats. ([36006](https://github.com/WordPress/gutenberg/pull/36006))
+-   Post Navigation Link: Do not translate HTML tag. ([35930](https://github.com/WordPress/gutenberg/pull/35930))
+-   Post Template Block: Move inner blocks container to separate component. ([35945](https://github.com/WordPress/gutenberg/pull/35945))
+-   Post Terms: Prevent the block from breaking on pages. ([35957](https://github.com/WordPress/gutenberg/pull/35957))
+-   Site Logo: Fix center alignment. ([35971](https://github.com/WordPress/gutenberg/pull/35971))
+-   Fix submenus not opening on click. ([36290](https://github.com/WordPress/gutenberg/pull/36290))
+
+#### Components
+
+-   AnglePickerControl: Use admin color scheme. ([35908](https://github.com/WordPress/gutenberg/pull/35908))
+-   ColorListPicker: Fix spacing to accomodate the new color picker. ([36017](https://github.com/WordPress/gutenberg/pull/36017))
+-   ColorPalette: Fix className. ([36016](https://github.com/WordPress/gutenberg/pull/36016))
+-   ColorPicker: Fix unexpected movements, and closing on first click in the color picker. ([35670](https://github.com/WordPress/gutenberg/pull/35670))
+-   Popover: Check anchorDocument default view before removing events. ([35832](https://github.com/WordPress/gutenberg/pull/35832))
+-   RangeControl: Fix style issue in RTL. ([35777](https://github.com/WordPress/gutenberg/pull/35777))
+-   Storybook: Lazy load LTR/RTL styles for consistent specificity. ([35771](https://github.com/WordPress/gutenberg/pull/35771))
+-   Text: Fix text color value to use correct gray color value for Link UI preview description text. ([35851](https://github.com/WordPress/gutenberg/pull/35851))
+
+#### Global Styles
+
+-   Fix navigation in global styles sidebar. ([36203](https://github.com/WordPress/gutenberg/pull/36203))
+-   Fix presets data for themes that do not provide any preset. ([36054](https://github.com/WordPress/gutenberg/pull/36054))
+-   Generate preset metadata for font-family in the site editor. ([36022](https://github.com/WordPress/gutenberg/pull/36022))
+-   Hotfix for leftovers of `WP_Theme_JSON_Resolver::Get_merged_data`. ([36173](https://github.com/WordPress/gutenberg/pull/36173))
+-   Lower the specificity of border & padding styles for the outline block style in the button block. ([35968](https://github.com/WordPress/gutenberg/pull/35968))
+-   Theme.json: Remove custom prefixes from properties that did not land in 5.8. ([34485](https://github.com/WordPress/gutenberg/pull/34485))
+
+#### Block Editor
+
+-   Fix inserter with block pattern categories. ([36116](https://github.com/WordPress/gutenberg/pull/36116))
+-   Fix navigation block link control zero value in it. ([36198](https://github.com/WordPress/gutenberg/pull/36198))
+-   Fix the update of link and suggestions in LinkControl. ([32320](https://github.com/WordPress/gutenberg/pull/32320))
+-   Make Link UI inactive if selection extends beyond format bounds or encounters new link. ([35946](https://github.com/WordPress/gutenberg/pull/35946))
+-   Fix selection by holding shift key for nested blocks. ([35668](https://github.com/WordPress/gutenberg/pull/35668))
+-   Fix shift+click on a child block with its parent selected. ([35988](https://github.com/WordPress/gutenberg/pull/35988))
 
 #### Design Tools
-- Font Appearance: Improve consistency of label in Typography panel. ([35860](https://github.com/WordPress/gutenberg/pull/35860))
-- Font Family Support: Fix skip serialization check. ([36073](https://github.com/WordPress/gutenberg/pull/36073))
-- Navigation: Force text decoration styles on nav item in editor. ([35859](https://github.com/WordPress/gutenberg/pull/35859))
+
+-   Font Appearance: Improve consistency of label in Typography panel. ([35860](https://github.com/WordPress/gutenberg/pull/35860))
+-   Font Family Support: Fix skip serialization check. ([36073](https://github.com/WordPress/gutenberg/pull/36073))
+-   Navigation: Force text decoration styles on nav item in editor. ([35859](https://github.com/WordPress/gutenberg/pull/35859))
 
 #### Template Editor
-- Clear selected block when clicking outside in the template part focus mode. ([35816](https://github.com/WordPress/gutenberg/pull/35816))
-- Templates: Only include templates for the current post types. ([35802](https://github.com/WordPress/gutenberg/pull/35802))
+
+-   Clear selected block when clicking outside in the template part focus mode. ([35816](https://github.com/WordPress/gutenberg/pull/35816))
+-   Templates: Only include templates for the current post types. ([35802](https://github.com/WordPress/gutenberg/pull/35802))
 
 #### Plugin
-- Fix fatal error in Site Logo block in WP 5.9. ([36195](https://github.com/WordPress/gutenberg/pull/36195))
+
+-   Fix fatal error in Site Logo block in WP 5.9. ([36195](https://github.com/WordPress/gutenberg/pull/36195))
 
 #### Patterns
-- Update unsaved navigation block flow. ([35976](https://github.com/WordPress/gutenberg/pull/35976))
+
+-   Update unsaved navigation block flow. ([35976](https://github.com/WordPress/gutenberg/pull/35976))
 
 #### Accessibility
-- Try to communicate to screen readers that post title is textarea. ([35898](https://github.com/WordPress/gutenberg/pull/35898))
+
+-   Try to communicate to screen readers that post title is textarea. ([35898](https://github.com/WordPress/gutenberg/pull/35898))
 
 #### Full Site Editing
-- Add fallback handling for plugins or themes using the Customizer. ([35877](https://github.com/WordPress/gutenberg/pull/35877))
+
+-   Add fallback handling for plugins or themes using the Customizer. ([35877](https://github.com/WordPress/gutenberg/pull/35877))
 
 #### Widgets Editor
-- Fix layout styles not applying in widgets customizer. ([35865](https://github.com/WordPress/gutenberg/pull/35865))
+
+-   Fix layout styles not applying in widgets customizer. ([35865](https://github.com/WordPress/gutenberg/pull/35865))
 
 #### CSS & Styling
-- Editor defaults for themes with no editor styles and when user disables theme styles. ([35736](https://github.com/WordPress/gutenberg/pull/35736))
+
+-   Editor defaults for themes with no editor styles and when user disables theme styles. ([35736](https://github.com/WordPress/gutenberg/pull/35736))
 
 #### History
-- Support disabling autosave for native Unsupported Block Editor. ([35639](https://github.com/WordPress/gutenberg/pull/35639))
 
+-   Support disabling autosave for native Unsupported Block Editor. ([35639](https://github.com/WordPress/gutenberg/pull/35639))
 
 ### Performance
 
 #### List View
-- Fix pagedown/pageup and improve scrolling. ([36063](https://github.com/WordPress/gutenberg/pull/36063))
+
+-   Fix pagedown/pageup and improve scrolling. ([36063](https://github.com/WordPress/gutenberg/pull/36063))
 
 #### Block Editor
-- Improve opening of the block inserter via manual token-based analysis of reusable blocks. ([35763](https://github.com/WordPress/gutenberg/pull/35763))
+
+-   Improve opening of the block inserter via manual token-based analysis of reusable blocks. ([35763](https://github.com/WordPress/gutenberg/pull/35763))
 
 #### Widgets Editor
-- List View: Avoid re-rendering all items on block focus. Enable persistent List View in the widget editor. ([35706](https://github.com/WordPress/gutenberg/pull/35706))
+
+-   List View: Avoid re-rendering all items on block focus. Enable persistent List View in the widget editor. ([35706](https://github.com/WordPress/gutenberg/pull/35706))
 
 #### Accessibility
-- List View: Render a fixed number of items. ([35230](https://github.com/WordPress/gutenberg/pull/35230))
 
+-   List View: Render a fixed number of items. ([35230](https://github.com/WordPress/gutenberg/pull/35230))
 
 ### Experiments
 
 #### Block Library
-- Adds in basic styling for post comment form. ([35704](https://github.com/WordPress/gutenberg/pull/35704))
-- Navigation Area block. ([36178](https://github.com/WordPress/gutenberg/pull/36178))
-- Migrate classic menus to block-based menus on theme switch. ([36255](https://github.com/WordPress/gutenberg/pull/36255))
-- Post Comments block: Hide the "Comments Closed" message. ([35743](https://github.com/WordPress/gutenberg/pull/35743))
-- Mobile responsive navigation by default. ([35917](https://github.com/WordPress/gutenberg/pull/35917))
-- Reword navigation color labels. ([35916](https://github.com/WordPress/gutenberg/pull/35916))
-- Show the placeholder again when moving from a valid menu to non-existing menu. ([36210](https://github.com/WordPress/gutenberg/pull/36210))
-- Provide a way to manage wp_navigation posts from wp-admin. ([36126](https://github.com/WordPress/gutenberg/pull/36126))
+
+-   Adds in basic styling for post comment form. ([35704](https://github.com/WordPress/gutenberg/pull/35704))
+-   Navigation Area block. ([36178](https://github.com/WordPress/gutenberg/pull/36178))
+-   Migrate classic menus to block-based menus on theme switch. ([36255](https://github.com/WordPress/gutenberg/pull/36255))
+-   Post Comments block: Hide the "Comments Closed" message. ([35743](https://github.com/WordPress/gutenberg/pull/35743))
+-   Mobile responsive navigation by default. ([35917](https://github.com/WordPress/gutenberg/pull/35917))
+-   Reword navigation color labels. ([35916](https://github.com/WordPress/gutenberg/pull/35916))
+-   Show the placeholder again when moving from a valid menu to non-existing menu. ([36210](https://github.com/WordPress/gutenberg/pull/36210))
+-   Provide a way to manage wp_navigation posts from wp-admin. ([36126](https://github.com/WordPress/gutenberg/pull/36126))
 
 #### Global Styles
-- Add a Global Styles endpoint and use it in the site editor. ([35801](https://github.com/WordPress/gutenberg/pull/35801))
-- Fix: Crash when resetting user color palette. ([36233](https://github.com/WordPress/gutenberg/pull/36233))
-- Fix: Show user colors on palette indicator. ([36232](https://github.com/WordPress/gutenberg/pull/36232))
-- Migrate theme.json v1 to v2. ([36155](https://github.com/WordPress/gutenberg/pull/36155))
-- Update: Show all color and gradient origins (core, theme, and user). ([35970](https://github.com/WordPress/gutenberg/pull/35970))
+
+-   Add a Global Styles endpoint and use it in the site editor. ([35801](https://github.com/WordPress/gutenberg/pull/35801))
+-   Fix: Crash when resetting user color palette. ([36233](https://github.com/WordPress/gutenberg/pull/36233))
+-   Fix: Show user colors on palette indicator. ([36232](https://github.com/WordPress/gutenberg/pull/36232))
+-   Migrate theme.json v1 to v2. ([36155](https://github.com/WordPress/gutenberg/pull/36155))
+-   Update: Show all color and gradient origins (core, theme, and user). ([35970](https://github.com/WordPress/gutenberg/pull/35970))
 
 #### Full Site Editing
-- Always display Customizer menu item. ([36168](https://github.com/WordPress/gutenberg/pull/36168))
-- Revert "Always display Customizer menu item". ([36189](https://github.com/WordPress/gutenberg/pull/36189))
-- Remove slug and status columns from templates list in Appearance > Templates. ([35996](https://github.com/WordPress/gutenberg/pull/35996))
+
+-   Always display Customizer menu item. ([36168](https://github.com/WordPress/gutenberg/pull/36168))
+-   Revert "Always display Customizer menu item". ([36189](https://github.com/WordPress/gutenberg/pull/36189))
+-   Remove slug and status columns from templates list in Appearance > Templates. ([35996](https://github.com/WordPress/gutenberg/pull/35996))
 
 #### REST API
-- Improve unit test coverage for REST API menus endpoints.. ([36177](https://github.com/WordPress/gutenberg/pull/36177))
+
+-   Improve unit test coverage for REST API menus endpoints.. ([36177](https://github.com/WordPress/gutenberg/pull/36177))
 
 #### Navigation Screen
-- Navigation Editor: Show a warning when trying to save unsupported blocks. ([35993](https://github.com/WordPress/gutenberg/pull/35993))
+
+-   Navigation Editor: Show a warning when trying to save unsupported blocks. ([35993](https://github.com/WordPress/gutenberg/pull/35993))
 
 #### Reusable Blocks
-- Editor: Multi-Entity Saving UI Improvements. ([35933](https://github.com/WordPress/gutenberg/pull/35933))
+
+-   Editor: Multi-Entity Saving UI Improvements. ([35933](https://github.com/WordPress/gutenberg/pull/35933))
 
 #### Components
-- Update: Implement new color palette editor component. ([35783](https://github.com/WordPress/gutenberg/pull/35783))
+
+-   Update: Implement new color palette editor component. ([35783](https://github.com/WordPress/gutenberg/pull/35783))
 
 #### Block Editor
-- Split control for URL and Text within Link UI. ([33849](https://github.com/WordPress/gutenberg/pull/33849))
 
+-   Split control for URL and Text within Link UI. ([33849](https://github.com/WordPress/gutenberg/pull/33849))
 
 ### Documentation
 
-- Add Thunks Tutorial. ([36051](https://github.com/WordPress/gutenberg/pull/36051))
-- Add a more detailed guide for react native development. ([35529](https://github.com/WordPress/gutenberg/pull/35529))
-- Add usage documentation for Rich Text package. ([35885](https://github.com/WordPress/gutenberg/pull/35885))
-- Added link to Ways to keep up with Gutenberg & Full Site Editing. ([36077](https://github.com/WordPress/gutenberg/pull/36077))
-- Blocks: Add view script to block schema and documentation. ([36175](https://github.com/WordPress/gutenberg/pull/36175))
-- Blocks: Document changes to style and editorStyle in `block.json`. ([36218](https://github.com/WordPress/gutenberg/pull/36218))
-- Docs: Add Getting Started level for documentation. ([35891](https://github.com/WordPress/gutenberg/pull/35891))
-- Docs: Add section about using the schema during development. ([35835](https://github.com/WordPress/gutenberg/pull/35835))
-- Docs: Fix Typos in widgets/overview.md. ([36078](https://github.com/WordPress/gutenberg/pull/36078))
-- Docs: Fix schema file URL. ([36157](https://github.com/WordPress/gutenberg/pull/36157))
-- Docs: Improve Getting Started landing page. ([35893](https://github.com/WordPress/gutenberg/pull/35893))
-- Docs: Theme.json - fix typo. ([36139](https://github.com/WordPress/gutenberg/pull/36139))
-- Docs: Tweak organization for getting-started documentation. ([34091](https://github.com/WordPress/gutenberg/pull/34091))
-- Docs: Update the recommendation for the cadence of npm releases. ([35925](https://github.com/WordPress/gutenberg/pull/35925))
-- Env docs: Update wordpress-develop example to clarify src/build location. ([35978](https://github.com/WordPress/gutenberg/pull/35978))
-- Fix a small typo in the "Getting started" documentation. ([36109](https://github.com/WordPress/gutenberg/pull/36109))
-- Fix wording in the Authoring Experience documentation. ([35969](https://github.com/WordPress/gutenberg/pull/35969))
-- Move create-block changelog entries back to Unreleased section. ([35886](https://github.com/WordPress/gutenberg/pull/35886))
-- Release Docs: Remove consecutive RCs warning. ([35855](https://github.com/WordPress/gutenberg/pull/35855))
-- Update Components CONTRIBUTING.md indentation. ([35866](https://github.com/WordPress/gutenberg/pull/35866))
-- fix: Backtick added around `<textarea>` input tag in readme file. ([34813](https://github.com/WordPress/gutenberg/pull/34813))
-- theme.json docs: Add missing settings & styles. ([36137](https://github.com/WordPress/gutenberg/pull/36137))
-
+-   Add Thunks Tutorial. ([36051](https://github.com/WordPress/gutenberg/pull/36051))
+-   Add a more detailed guide for react native development. ([35529](https://github.com/WordPress/gutenberg/pull/35529))
+-   Add usage documentation for Rich Text package. ([35885](https://github.com/WordPress/gutenberg/pull/35885))
+-   Added link to Ways to keep up with Gutenberg & Full Site Editing. ([36077](https://github.com/WordPress/gutenberg/pull/36077))
+-   Blocks: Add view script to block schema and documentation. ([36175](https://github.com/WordPress/gutenberg/pull/36175))
+-   Blocks: Document changes to style and editorStyle in `block.json`. ([36218](https://github.com/WordPress/gutenberg/pull/36218))
+-   Docs: Add Getting Started level for documentation. ([35891](https://github.com/WordPress/gutenberg/pull/35891))
+-   Docs: Add section about using the schema during development. ([35835](https://github.com/WordPress/gutenberg/pull/35835))
+-   Docs: Fix Typos in widgets/overview.md. ([36078](https://github.com/WordPress/gutenberg/pull/36078))
+-   Docs: Fix schema file URL. ([36157](https://github.com/WordPress/gutenberg/pull/36157))
+-   Docs: Improve Getting Started landing page. ([35893](https://github.com/WordPress/gutenberg/pull/35893))
+-   Docs: Theme.json - fix typo. ([36139](https://github.com/WordPress/gutenberg/pull/36139))
+-   Docs: Tweak organization for getting-started documentation. ([34091](https://github.com/WordPress/gutenberg/pull/34091))
+-   Docs: Update the recommendation for the cadence of npm releases. ([35925](https://github.com/WordPress/gutenberg/pull/35925))
+-   Env docs: Update wordpress-develop example to clarify src/build location. ([35978](https://github.com/WordPress/gutenberg/pull/35978))
+-   Fix a small typo in the "Getting started" documentation. ([36109](https://github.com/WordPress/gutenberg/pull/36109))
+-   Fix wording in the Authoring Experience documentation. ([35969](https://github.com/WordPress/gutenberg/pull/35969))
+-   Move create-block changelog entries back to Unreleased section. ([35886](https://github.com/WordPress/gutenberg/pull/35886))
+-   Release Docs: Remove consecutive RCs warning. ([35855](https://github.com/WordPress/gutenberg/pull/35855))
+-   Update Components CONTRIBUTING.md indentation. ([35866](https://github.com/WordPress/gutenberg/pull/35866))
+-   fix: Backtick added around `<textarea>` input tag in readme file. ([34813](https://github.com/WordPress/gutenberg/pull/34813))
+-   theme.json docs: Add missing settings & styles. ([36137](https://github.com/WordPress/gutenberg/pull/36137))
 
 ### Code Quality
 
-- Add Theme's base global styles endpoint. ([35985](https://github.com/WordPress/gutenberg/pull/35985))
-- Add alexstine as code owner for post-title. ([36056](https://github.com/WordPress/gutenberg/pull/36056))
-- Add block.json schema to generated file. ([35843](https://github.com/WordPress/gutenberg/pull/35843))
-- Add schemas package. ([35998](https://github.com/WordPress/gutenberg/pull/35998))
-- Improvements for the global styles endpoint. ([36071](https://github.com/WordPress/gutenberg/pull/36071))
-- Make sure tests are pure. ([36253](https://github.com/WordPress/gutenberg/pull/36253))
-- Move getStablePath function into the wordrpess/url package. ([35992](https://github.com/WordPress/gutenberg/pull/35992))
-- Remove "experimental" from URL details REST controller and promote to `v1` namespace. ([35915](https://github.com/WordPress/gutenberg/pull/35915))
-- Remove GB prefixed functions from template part. ([36180](https://github.com/WordPress/gutenberg/pull/36180))
-- Schemas: Theme.json - Add `title` to templateParts. ([36145](https://github.com/WordPress/gutenberg/pull/36145))
-- Updates `WP_Theme_JSON_Resolver` and tests to be equal to core. ([36223](https://github.com/WordPress/gutenberg/pull/36223))
-- Update: Use small button on tools panel toggle. ([35935](https://github.com/WordPress/gutenberg/pull/35935))
-- block-editor store: Migrate to thunks. ([35720](https://github.com/WordPress/gutenberg/pull/35720))
-- theme.json: Update test data. ([35883](https://github.com/WordPress/gutenberg/pull/35883))
+-   Add Theme's base global styles endpoint. ([35985](https://github.com/WordPress/gutenberg/pull/35985))
+-   Add alexstine as code owner for post-title. ([36056](https://github.com/WordPress/gutenberg/pull/36056))
+-   Add block.json schema to generated file. ([35843](https://github.com/WordPress/gutenberg/pull/35843))
+-   Add schemas package. ([35998](https://github.com/WordPress/gutenberg/pull/35998))
+-   Improvements for the global styles endpoint. ([36071](https://github.com/WordPress/gutenberg/pull/36071))
+-   Make sure tests are pure. ([36253](https://github.com/WordPress/gutenberg/pull/36253))
+-   Move getStablePath function into the wordrpess/url package. ([35992](https://github.com/WordPress/gutenberg/pull/35992))
+-   Remove "experimental" from URL details REST controller and promote to `v1` namespace. ([35915](https://github.com/WordPress/gutenberg/pull/35915))
+-   Remove GB prefixed functions from template part. ([36180](https://github.com/WordPress/gutenberg/pull/36180))
+-   Schemas: Theme.json - Add `title` to templateParts. ([36145](https://github.com/WordPress/gutenberg/pull/36145))
+-   Updates `WP_Theme_JSON_Resolver` and tests to be equal to core. ([36223](https://github.com/WordPress/gutenberg/pull/36223))
+-   Update: Use small button on tools panel toggle. ([35935](https://github.com/WordPress/gutenberg/pull/35935))
+-   block-editor store: Migrate to thunks. ([35720](https://github.com/WordPress/gutenberg/pull/35720))
+-   theme.json: Update test data. ([35883](https://github.com/WordPress/gutenberg/pull/35883))
 
 #### Block Library
-- Heading: Auto-generated anchors hide implementation details. ([35747](https://github.com/WordPress/gutenberg/pull/35747))
-- Mark Post Comments as stable and Comments Query Loop as experimental. ([36132](https://github.com/WordPress/gutenberg/pull/36132))
-- Mark Post Navigation Link and Term Description blocks as stable. ([36163](https://github.com/WordPress/gutenberg/pull/36163))
-- Remove `post-` prefix from Comment Template inner blocks. ([36171](https://github.com/WordPress/gutenberg/pull/36171))
+
+-   Heading: Auto-generated anchors hide implementation details. ([35747](https://github.com/WordPress/gutenberg/pull/35747))
+-   Mark Post Comments as stable and Comments Query Loop as experimental. ([36132](https://github.com/WordPress/gutenberg/pull/36132))
+-   Mark Post Navigation Link and Term Description blocks as stable. ([36163](https://github.com/WordPress/gutenberg/pull/36163))
+-   Remove `post-` prefix from Comment Template inner blocks. ([36171](https://github.com/WordPress/gutenberg/pull/36171))
 
 #### Global Styles
-- Refactor theme.json migrations to be a single class. ([36182](https://github.com/WordPress/gutenberg/pull/36182))
-- Remove locations we do not translate from `theme-i18n.json`. ([35881](https://github.com/WordPress/gutenberg/pull/35881))
-- Update `theme.json` schema migrations. ([36154](https://github.com/WordPress/gutenberg/pull/36154))
+
+-   Refactor theme.json migrations to be a single class. ([36182](https://github.com/WordPress/gutenberg/pull/36182))
+-   Remove locations we do not translate from `theme-i18n.json`. ([35881](https://github.com/WordPress/gutenberg/pull/35881))
+-   Update `theme.json` schema migrations. ([36154](https://github.com/WordPress/gutenberg/pull/36154))
 
 #### Post Editor
-- Refactor FlatTermSelector into a functional component. ([33459](https://github.com/WordPress/gutenberg/pull/33459))
-- Typo: Translated site properties. ([36097](https://github.com/WordPress/gutenberg/pull/36097))
+
+-   Refactor FlatTermSelector into a functional component. ([33459](https://github.com/WordPress/gutenberg/pull/33459))
+-   Typo: Translated site properties. ([36097](https://github.com/WordPress/gutenberg/pull/36097))
 
 #### Components
-- ToolsPanel: Use Grid component to handle layout. ([35621](https://github.com/WordPress/gutenberg/pull/35621))
-- Update spacing in CircularOptionPicker. ([36014](https://github.com/WordPress/gutenberg/pull/36014))
+
+-   ToolsPanel: Use Grid component to handle layout. ([35621](https://github.com/WordPress/gutenberg/pull/35621))
+-   Update spacing in CircularOptionPicker. ([36014](https://github.com/WordPress/gutenberg/pull/36014))
 
 #### Data Layer
-- [data]: Rename types file from .d.ts to .ts. ([36062](https://github.com/WordPress/gutenberg/pull/36062))
+
+-   [data]: Rename types file from .d.ts to .ts. ([36062](https://github.com/WordPress/gutenberg/pull/36062))
 
 #### CSS & Styling
-- Remove invalid buttons block CSS property. ([33793](https://github.com/WordPress/gutenberg/pull/33793))
 
+-   Remove invalid buttons block CSS property. ([33793](https://github.com/WordPress/gutenberg/pull/33793))
 
 ### Tools
 
-- Remove @chrisvanpatten from CODEOWNERS. ([35937](https://github.com/WordPress/gutenberg/pull/35937))
+-   Remove @chrisvanpatten from CODEOWNERS. ([35937](https://github.com/WordPress/gutenberg/pull/35937))
 
 #### Testing
-- Add a method to disable auto-accepting dialogs. ([35828](https://github.com/WordPress/gutenberg/pull/35828))
-- Skip broken widgets test. ([36239](https://github.com/WordPress/gutenberg/pull/36239))
-- Skip flaky test for loading block stylesheets in iframe. ([35961](https://github.com/WordPress/gutenberg/pull/35961))
-- Tests: Run block fixtures through KSES. ([35611](https://github.com/WordPress/gutenberg/pull/35611))
+
+-   Add a method to disable auto-accepting dialogs. ([35828](https://github.com/WordPress/gutenberg/pull/35828))
+-   Skip broken widgets test. ([36239](https://github.com/WordPress/gutenberg/pull/36239))
+-   Skip flaky test for loading block stylesheets in iframe. ([35961](https://github.com/WordPress/gutenberg/pull/35961))
+-   Tests: Run block fixtures through KSES. ([35611](https://github.com/WordPress/gutenberg/pull/35611))
 
 #### Block Library
-- Mark FSE blocks as non experimental. ([35979](https://github.com/WordPress/gutenberg/pull/35979))
 
+-   Mark FSE blocks as non experimental. ([35979](https://github.com/WordPress/gutenberg/pull/35979))
 
 ### Various
 
-- Apply borders to canvas rather than other UI elements. ([31081](https://github.com/WordPress/gutenberg/pull/31081))
-- Changes for FSE backport in core. ([36201](https://github.com/WordPress/gutenberg/pull/36201))
+-   Apply borders to canvas rather than other UI elements. ([31081](https://github.com/WordPress/gutenberg/pull/31081))
+-   Changes for FSE backport in core. ([36201](https://github.com/WordPress/gutenberg/pull/36201))
 
 #### Site Editor
-- Remove navigation panel in site editor. ([36194](https://github.com/WordPress/gutenberg/pull/36194))
 
-#### Components
-- Modal: Wrap the modal contents in a StyleProvider. ([36261](https://github.com/WordPress/gutenberg/pull/36261))
+-   Remove navigation panel in site editor. ([36194](https://github.com/WordPress/gutenberg/pull/36194))
 
+#### Components
 
+-   Modal: Wrap the modal contents in a StyleProvider. ([36261](https://github.com/WordPress/gutenberg/pull/36261))
 
 = 11.8.2 =
 
-
+## Changelog
 
 ### Various
 
 #### Block Library
-- Cover Block: Fix default background dim. ([36312](https://github.com/WordPress/gutenberg/pull/36312))
-
-
-
 
+-   Cover Block: Fix default background dim. ([36312](https://github.com/WordPress/gutenberg/pull/36312))
 
 = 11.9.0-rc.2 =
 
+## Changelog
+
 ### Various
 
-- Keep a copy of anchor ref to preserve highlighted text selection. ([36263](https://github.com/WordPress/gutenberg/pull/36263))
+-   Keep a copy of anchor ref to preserve highlighted text selection. ([36263](https://github.com/WordPress/gutenberg/pull/36263))
 
 ### Features
 
 #### Block Library
-- Add Media File and Attachment Page options to the native Image block Link To menu. ([34846](https://github.com/WordPress/gutenberg/pull/34846))
-- Add new Comment Reply Link block. ([35774](https://github.com/WordPress/gutenberg/pull/35774))
-- Add new Edit Comment Link block. ([35965](https://github.com/WordPress/gutenberg/pull/35965))
-- Site Editor: Add Comment Avatar Core Block. ([35396](https://github.com/WordPress/gutenberg/pull/35396))
-- Site Editor: Add new Comments Query Loop block. ([35231](https://github.com/WordPress/gutenberg/pull/35231))
+
+-   Add Media File and Attachment Page options to the native Image block Link To menu. ([34846](https://github.com/WordPress/gutenberg/pull/34846))
+-   Add new Comment Reply Link block. ([35774](https://github.com/WordPress/gutenberg/pull/35774))
+-   Add new Edit Comment Link block. ([35965](https://github.com/WordPress/gutenberg/pull/35965))
+-   Site Editor: Add Comment Avatar Core Block. ([35396](https://github.com/WordPress/gutenberg/pull/35396))
+-   Site Editor: Add new Comments Query Loop block. ([35231](https://github.com/WordPress/gutenberg/pull/35231))
 
 #### Block Editor
-- Enable native editor onboarding features globally. ([35201](https://github.com/WordPress/gutenberg/pull/35201))
 
+-   Enable native editor onboarding features globally. ([35201](https://github.com/WordPress/gutenberg/pull/35201))
 
 ### Enhancements
 
-- Disable Xdebug by default unless specified by user. ([34324](https://github.com/WordPress/gutenberg/pull/34324))
-- Improve the initial loading of the site editor. ([36044](https://github.com/WordPress/gutenberg/pull/36044))
-- StripHTML - preserve leading and trailing spaces and strip script and on* attributes. ([35539](https://github.com/WordPress/gutenberg/pull/35539))
-- Remove visual clue from text alignment toolbar. ([35922](https://github.com/WordPress/gutenberg/pull/35922))
-- Add `flex-wrap` control to `flex` layout. ([36003](https://github.com/WordPress/gutenberg/pull/36003))
-
-#### Block Library
-- Add alignment option to the Comment Edit Link block. ([36033](https://github.com/WordPress/gutenberg/pull/36033))
-- Add featured transforms in Link Control for Navigation Link items. ([35857](https://github.com/WordPress/gutenberg/pull/35857))
-- Add flex layout to Buttons block and new layout type. ([35819](https://github.com/WordPress/gutenberg/pull/35819))
-- Add spacing controls to Post Author block. ([35963](https://github.com/WordPress/gutenberg/pull/35963))
-- Add spacing controls to Post Excerpt. ([35959](https://github.com/WordPress/gutenberg/pull/35959))
-- Add create new menu button to nav block. ([36245](https://github.com/WordPress/gutenberg/pull/36245))
-- Code block: Add support for padding, color & border styles. ([27582](https://github.com/WordPress/gutenberg/pull/27582))
-- Columns: Add padding support. ([35701](https://github.com/WordPress/gutenberg/pull/35701))
-- Comment Author Name: Add spacing to have same options as Post Author Name. ([36213](https://github.com/WordPress/gutenberg/pull/36213))
-- Deprecate the Post Comment block. ([36032](https://github.com/WordPress/gutenberg/pull/36032))
-- Embed: Add Wolfram Cloud as an embed provider. ([35656](https://github.com/WordPress/gutenberg/pull/35656))
-- Gallery block: Replace gallery experimental setting with a check for use_balanceTags. ([34979](https://github.com/WordPress/gutenberg/pull/34979))
-- Image Block: Add data-id attribute on server side render for core galleries. ([35975](https://github.com/WordPress/gutenberg/pull/35975))
-- Navigation Block: Add missing menu item attributes to core/navigation. ([35634](https://github.com/WordPress/gutenberg/pull/35634))
-- Navigation: Add delete nav menu button. ([35981](https://github.com/WordPress/gutenberg/pull/35981))
-- Navigation: Create nav menu on pattern insertion or when the block has uncontrolled inner blocks. ([36024](https://github.com/WordPress/gutenberg/pull/36024))
-- Navigation: Use a single placeholder for the block. ([36023](https://github.com/WordPress/gutenberg/pull/36023))
-- Page List: Create a JS version for the editor. ([31670](https://github.com/WordPress/gutenberg/pull/31670))
-- Post Comment Author: Add alignment options. ([36045](https://github.com/WordPress/gutenberg/pull/36045))
-- Post Comments: Even out the top margin inside the block. ([35887](https://github.com/WordPress/gutenberg/pull/35887))
-- Post Excerpt: Don't print the wrapper when there is no excerpt. ([35749](https://github.com/WordPress/gutenberg/pull/35749))
-- Post Title: Return no markup if title is empty. ([35861](https://github.com/WordPress/gutenberg/pull/35861))
-- Save Navigation Block data to a wp_navigation post type. ([35746](https://github.com/WordPress/gutenberg/pull/35746))
-- Search: Add contextual defaults when inserted in Navigation block. ([36125](https://github.com/WordPress/gutenberg/pull/36125))
-- Try using flex layout on the Navigation block. ([36169](https://github.com/WordPress/gutenberg/pull/36169))
-- Update navigation block entity automatic name generation and refine naming UI. ([36238](https://github.com/WordPress/gutenberg/pull/36238))
+-   Disable Xdebug by default unless specified by user. ([34324](https://github.com/WordPress/gutenberg/pull/34324))
+-   Improve the initial loading of the site editor. ([36044](https://github.com/WordPress/gutenberg/pull/36044))
+-   StripHTML - preserve leading and trailing spaces and strip script and on\* attributes. ([35539](https://github.com/WordPress/gutenberg/pull/35539))
+-   Remove visual clue from text alignment toolbar. ([35922](https://github.com/WordPress/gutenberg/pull/35922))
+-   Add `flex-wrap` control to `flex` layout. ([36003](https://github.com/WordPress/gutenberg/pull/36003))
+
+#### Block Library
+
+-   Add alignment option to the Comment Edit Link block. ([36033](https://github.com/WordPress/gutenberg/pull/36033))
+-   Add featured transforms in Link Control for Navigation Link items. ([35857](https://github.com/WordPress/gutenberg/pull/35857))
+-   Add flex layout to Buttons block and new layout type. ([35819](https://github.com/WordPress/gutenberg/pull/35819))
+-   Add spacing controls to Post Author block. ([35963](https://github.com/WordPress/gutenberg/pull/35963))
+-   Add spacing controls to Post Excerpt. ([35959](https://github.com/WordPress/gutenberg/pull/35959))
+-   Add create new menu button to nav block. ([36245](https://github.com/WordPress/gutenberg/pull/36245))
+-   Code block: Add support for padding, color & border styles. ([27582](https://github.com/WordPress/gutenberg/pull/27582))
+-   Columns: Add padding support. ([35701](https://github.com/WordPress/gutenberg/pull/35701))
+-   Comment Author Name: Add spacing to have same options as Post Author Name. ([36213](https://github.com/WordPress/gutenberg/pull/36213))
+-   Deprecate the Post Comment block. ([36032](https://github.com/WordPress/gutenberg/pull/36032))
+-   Embed: Add Wolfram Cloud as an embed provider. ([35656](https://github.com/WordPress/gutenberg/pull/35656))
+-   Gallery block: Replace gallery experimental setting with a check for use_balanceTags. ([34979](https://github.com/WordPress/gutenberg/pull/34979))
+-   Image Block: Add data-id attribute on server side render for core galleries. ([35975](https://github.com/WordPress/gutenberg/pull/35975))
+-   Navigation Block: Add missing menu item attributes to core/navigation. ([35634](https://github.com/WordPress/gutenberg/pull/35634))
+-   Navigation: Add delete nav menu button. ([35981](https://github.com/WordPress/gutenberg/pull/35981))
+-   Navigation: Create nav menu on pattern insertion or when the block has uncontrolled inner blocks. ([36024](https://github.com/WordPress/gutenberg/pull/36024))
+-   Navigation: Use a single placeholder for the block. ([36023](https://github.com/WordPress/gutenberg/pull/36023))
+-   Page List: Create a JS version for the editor. ([31670](https://github.com/WordPress/gutenberg/pull/31670))
+-   Post Comment Author: Add alignment options. ([36045](https://github.com/WordPress/gutenberg/pull/36045))
+-   Post Comments: Even out the top margin inside the block. ([35887](https://github.com/WordPress/gutenberg/pull/35887))
+-   Post Excerpt: Don't print the wrapper when there is no excerpt. ([35749](https://github.com/WordPress/gutenberg/pull/35749))
+-   Post Title: Return no markup if title is empty. ([35861](https://github.com/WordPress/gutenberg/pull/35861))
+-   Save Navigation Block data to a wp_navigation post type. ([35746](https://github.com/WordPress/gutenberg/pull/35746))
+-   Search: Add contextual defaults when inserted in Navigation block. ([36125](https://github.com/WordPress/gutenberg/pull/36125))
+-   Try using flex layout on the Navigation block. ([36169](https://github.com/WordPress/gutenberg/pull/36169))
+-   Update navigation block entity automatic name generation and refine naming UI. ([36238](https://github.com/WordPress/gutenberg/pull/36238))
 
 #### Accessibility
-- Add announcement on formatting change for screen readers. ([35896](https://github.com/WordPress/gutenberg/pull/35896))
-- Add aria-current to navigation link, submenu, page list. ([35880](https://github.com/WordPress/gutenberg/pull/35880))
-- Full Site Editing: Use SearchControl component inside nav menu. ([36011](https://github.com/WordPress/gutenberg/pull/36011))
-- Improve focus styles for Link UI preview title. ([35853](https://github.com/WordPress/gutenberg/pull/35853))
-- Site Editor: Enable the "Save" keyboard shortcut. ([36138](https://github.com/WordPress/gutenberg/pull/36138))
+
+-   Add announcement on formatting change for screen readers. ([35896](https://github.com/WordPress/gutenberg/pull/35896))
+-   Add aria-current to navigation link, submenu, page list. ([35880](https://github.com/WordPress/gutenberg/pull/35880))
+-   Full Site Editing: Use SearchControl component inside nav menu. ([36011](https://github.com/WordPress/gutenberg/pull/36011))
+-   Improve focus styles for Link UI preview title. ([35853](https://github.com/WordPress/gutenberg/pull/35853))
+-   Site Editor: Enable the "Save" keyboard shortcut. ([36138](https://github.com/WordPress/gutenberg/pull/36138))
 
 #### Block Editor
-- Enable rich previews in the Link UI for the Site Editor. ([35951](https://github.com/WordPress/gutenberg/pull/35951))
-- Try: Show drag slot instead of hiding the item being dragged. ([33950](https://github.com/WordPress/gutenberg/pull/33950))
-- Update Link UI design for preview action buttons to use icons for edit and unlink. ([35833](https://github.com/WordPress/gutenberg/pull/35833))
+
+-   Enable rich previews in the Link UI for the Site Editor. ([35951](https://github.com/WordPress/gutenberg/pull/35951))
+-   Try: Show drag slot instead of hiding the item being dragged. ([33950](https://github.com/WordPress/gutenberg/pull/33950))
+-   Update Link UI design for preview action buttons to use icons for edit and unlink. ([35833](https://github.com/WordPress/gutenberg/pull/35833))
 
 #### Full Site Editing
-- Move and rename the site editor menu item. ([36064](https://github.com/WordPress/gutenberg/pull/36064))
-- Use Heading component on NavigationMenu and NavigationGroup components. ([36009](https://github.com/WordPress/gutenberg/pull/36009))
+
+-   Move and rename the site editor menu item. ([36064](https://github.com/WordPress/gutenberg/pull/36064))
+-   Use Heading component on NavigationMenu and NavigationGroup components. ([36009](https://github.com/WordPress/gutenberg/pull/36009))
 
 #### Components
-- Add duotone description. ([36018](https://github.com/WordPress/gutenberg/pull/36018))
-- ToolsPanel: Update typography panel layout. ([35911](https://github.com/WordPress/gutenberg/pull/35911))
+
+-   Add duotone description. ([36018](https://github.com/WordPress/gutenberg/pull/36018))
+-   ToolsPanel: Update typography panel layout. ([35911](https://github.com/WordPress/gutenberg/pull/35911))
 
 #### Template Editor
-- Add resizer to template part focus mode. ([35728](https://github.com/WordPress/gutenberg/pull/35728))
-- Auto resize the height of template part focus mode. ([35974](https://github.com/WordPress/gutenberg/pull/35974))
+
+-   Add resizer to template part focus mode. ([35728](https://github.com/WordPress/gutenberg/pull/35728))
+-   Auto resize the height of template part focus mode. ([35974](https://github.com/WordPress/gutenberg/pull/35974))
 
 #### Global Styles
-- Remove the duplicated title in background, text and link views in Global Styles. ([35583](https://github.com/WordPress/gutenberg/pull/35583))
-- Typography: Switch to ToolsPanel for block support UI. ([33744](https://github.com/WordPress/gutenberg/pull/33744))
+
+-   Remove the duplicated title in background, text and link views in Global Styles. ([35583](https://github.com/WordPress/gutenberg/pull/35583))
+-   Typography: Switch to ToolsPanel for block support UI. ([33744](https://github.com/WordPress/gutenberg/pull/33744))
 
 #### Design Tools
-- Enable transparency for duotone. ([34130](https://github.com/WordPress/gutenberg/pull/34130))
-- Typography block support: Add typography support and defaults. ([34064](https://github.com/WordPress/gutenberg/pull/34064))
+
+-   Enable transparency for duotone. ([34130](https://github.com/WordPress/gutenberg/pull/34130))
+-   Typography block support: Add typography support and defaults. ([34064](https://github.com/WordPress/gutenberg/pull/34064))
 
 #### Media
-- Remove "security" verbiage from warning when filetype does not pass on upload. ([36226](https://github.com/WordPress/gutenberg/pull/36226))
+
+-   Remove "security" verbiage from warning when filetype does not pass on upload. ([36226](https://github.com/WordPress/gutenberg/pull/36226))
 
 #### Patterns
-- [Patterns]: Add a flag to hide patterns from UI. ([36108](https://github.com/WordPress/gutenberg/pull/36108))
+
+-   [Patterns]: Add a flag to hide patterns from UI. ([36108](https://github.com/WordPress/gutenberg/pull/36108))
 
 #### Themes
-- Remove experimental feature notice. ([36083](https://github.com/WordPress/gutenberg/pull/36083))
+
+-   Remove experimental feature notice. ([36083](https://github.com/WordPress/gutenberg/pull/36083))
 
 #### Testing
-- Scripts: Increase timeout for end-to-end tests. ([35983](https://github.com/WordPress/gutenberg/pull/35983))
+
+-   Scripts: Increase timeout for end-to-end tests. ([35983](https://github.com/WordPress/gutenberg/pull/35983))
 
 #### REST API
-- URL Details: Update regex to include `og:Description`. ([35875](https://github.com/WordPress/gutenberg/pull/35875))
 
+-   URL Details: Update regex to include `og:Description`. ([35875](https://github.com/WordPress/gutenberg/pull/35875))
 
 ### New APIs
 
 #### Global Styles
-- Add API to access global settings, styles, and stylesheet. ([34843](https://github.com/WordPress/gutenberg/pull/34843))
-
-#### Block Library
-- Inner blocks: Edit/save symmetry + stabilise API. ([26031](https://github.com/WordPress/gutenberg/pull/26031))
-
-
-### Bug Fixes
-
-- Allow moving metaboxes to previously empty area. ([25187](https://github.com/WordPress/gutenberg/pull/25187))
-- Avoid showing deleted records in editor saving flow. ([36027](https://github.com/WordPress/gutenberg/pull/36027))
-- BaseControl: Help text id has undefined value if no id is passed to component. ([35899](https://github.com/WordPress/gutenberg/pull/35899))
-- Change `console.error` to `console.warn` for enqueued styles in the editor. ([35914](https://github.com/WordPress/gutenberg/pull/35914))
-- Core Data uses hardcoded baseURL prefix for taxonomies and post types. ([35850](https://github.com/WordPress/gutenberg/pull/35850))
-- Do not translate HTML tag. ([35930](https://github.com/WordPress/gutenberg/pull/35930))
-- Disable ability to edit menus via `Appearance -> Navigation Menus` for non-FSE themes. ([36257](https://github.com/WordPress/gutenberg/pull/36257))
-- Fix crash from calls to `undefined` functions. ([36248](https://github.com/WordPress/gutenberg/pull/36248))
-- Fix WPCS lint errors in global styles. ([36058](https://github.com/WordPress/gutenberg/pull/36058))
-- Fix getPxFromCssUnit test stability and test that memoized function works correctly. ([35939](https://github.com/WordPress/gutenberg/pull/35939))
-- Fix: Rest global styles controller accessing configuration that may not exist. ([36047](https://github.com/WordPress/gutenberg/pull/36047))
-- Make saveEditedEntityRecord use the entity key when available. ([36212](https://github.com/WordPress/gutenberg/pull/36212))
-- Prevent PHP notice from block-supports elements. ([35836](https://github.com/WordPress/gutenberg/pull/35836))
-- Revert "Post Content: Fix float clearing on entry content (#35958)". ([36004](https://github.com/WordPress/gutenberg/pull/36004))
-- Try ensuring the item after post content clears floats. ([36006](https://github.com/WordPress/gutenberg/pull/36006))
-- Unhook _block_template_render_title_tag. ([36133](https://github.com/WordPress/gutenberg/pull/36133))
-
-#### Block Library
-- Classic Block: Fix select all blocks side effect. ([35999](https://github.com/WordPress/gutenberg/pull/35999))
-- Column block: Only add flex-basis if width contains a number. ([35831](https://github.com/WordPress/gutenberg/pull/35831))
-- Comment Template: Move inner blocks container to separate components. ([36174](https://github.com/WordPress/gutenberg/pull/36174))
-- Blocks: Fix relative URLs for inlined styles. ([35538](https://github.com/WordPress/gutenberg/pull/35538))
-- Fix controlled inner blocks parent block attributes updates. ([35827](https://github.com/WordPress/gutenberg/pull/35827))
-- Fix incorrect attributes definitions. ([36140](https://github.com/WordPress/gutenberg/pull/36140))
-- Gallery block: Only show the gallery upload error message if mixed multiple files uploaded. ([35790](https://github.com/WordPress/gutenberg/pull/35790))
-- Gallery block: Remove the arbitrary alt text that is added to gallery images. ([35936](https://github.com/WordPress/gutenberg/pull/35936))
-- Heading: Avoid error on split when the paragraph isn't registered. ([35871](https://github.com/WordPress/gutenberg/pull/35871))
-- Navigation Submenu: Fix PHP notice. ([35984](https://github.com/WordPress/gutenberg/pull/35984))
-- Navigation overlay menu: Fix submenu spacing. ([35823](https://github.com/WordPress/gutenberg/pull/35823))
-- Navigation: Fix dropdown indicator. ([36106](https://github.com/WordPress/gutenberg/pull/36106))
-- Navigation: Fix issues with responsive justifications. ([35913](https://github.com/WordPress/gutenberg/pull/35913))
-- Navigation: Fix justifications. ([36105](https://github.com/WordPress/gutenberg/pull/36105))
-- Navigation: Fix padding for social links on mobile. ([35824](https://github.com/WordPress/gutenberg/pull/35824))
-- Pattern block: Remove wrapping div. ([36090](https://github.com/WordPress/gutenberg/pull/36090))
-- Post Comment: Handle the case where a comment does not exist. ([35810](https://github.com/WordPress/gutenberg/pull/35810))
-- Post Content: Fix float clearing on entry content. ([35958](https://github.com/WordPress/gutenberg/pull/35958))
-- Post Template Block: Move inner blocks container to separate component. ([35945](https://github.com/WordPress/gutenberg/pull/35945))
-- Post Terms: Prevent the block from breaking on pages. ([35957](https://github.com/WordPress/gutenberg/pull/35957))
-- Site Logo: Fix center alignment. ([35971](https://github.com/WordPress/gutenberg/pull/35971))
-
-#### Components
-- Fix ColorPalette className. ([36016](https://github.com/WordPress/gutenberg/pull/36016))
-- Fix `<Text>` component text color value to correct color value for Link UI preview description text. ([35851](https://github.com/WordPress/gutenberg/pull/35851))
-- Fix color list picker spacing to accomodate the new color picker. ([36017](https://github.com/WordPress/gutenberg/pull/36017))
-- Fix unexpected movements, and closing on first click in the color picker. ([35670](https://github.com/WordPress/gutenberg/pull/35670))
-- Fixes #34855 RangeControl style issue in RTL. ([35777](https://github.com/WordPress/gutenberg/pull/35777))
-- Popover: Check anchorDocument default view before removing events. ([35832](https://github.com/WordPress/gutenberg/pull/35832))
-- Storybook: Lazy load LTR/RTL styles for consistent specificity. ([35771](https://github.com/WordPress/gutenberg/pull/35771))
-- fix/35709: Set admin color scheme to angle color picker. ([35908](https://github.com/WordPress/gutenberg/pull/35908))
-
-#### Global Styles
-- Fix navigation in global styles sidebar. ([36203](https://github.com/WordPress/gutenberg/pull/36203))
-- Fix presets data for themes that do not provide any preset. ([36054](https://github.com/WordPress/gutenberg/pull/36054))
-- Generate preset metadata for font-family in the site editor. ([36022](https://github.com/WordPress/gutenberg/pull/36022))
-- Hotfix for leftovers of `WP_Theme_JSON_Resolver::Get_merged_data`. ([36173](https://github.com/WordPress/gutenberg/pull/36173))
-- Lower the specificity of border & padding styles for the outline block style in the button block. ([35968](https://github.com/WordPress/gutenberg/pull/35968))
-- Theme.json: Remove custom prefixes from properties that did not land in 5.8. ([34485](https://github.com/WordPress/gutenberg/pull/34485))
-
-#### Block Editor
-- Fix inserter with block pattern categories. ([36116](https://github.com/WordPress/gutenberg/pull/36116))
-- Fix navigation block link control zero value in it. ([36198](https://github.com/WordPress/gutenberg/pull/36198))
-- Fix the update of link and suggestions in LinkControl. ([32320](https://github.com/WordPress/gutenberg/pull/32320))
-- Make Link UI inactive if selection extends beyond format bounds or encounters new link. ([35946](https://github.com/WordPress/gutenberg/pull/35946))
-- Fix selection by holding shift key for nested blocks. ([35668](https://github.com/WordPress/gutenberg/pull/35668))
-- Fix shift+click on a child block with its parent selected. ([35988](https://github.com/WordPress/gutenberg/pull/35988))
+
+-   Add API to access global settings, styles, and stylesheet. ([34843](https://github.com/WordPress/gutenberg/pull/34843))
+
+#### Block Library
+
+-   Inner blocks: Edit/save symmetry + stabilise API. ([26031](https://github.com/WordPress/gutenberg/pull/26031))
+
+### Bug Fixes
+
+-   Allow moving metaboxes to previously empty area. ([25187](https://github.com/WordPress/gutenberg/pull/25187))
+-   Avoid showing deleted records in editor saving flow. ([36027](https://github.com/WordPress/gutenberg/pull/36027))
+-   BaseControl: Help text id has undefined value if no id is passed to component. ([35899](https://github.com/WordPress/gutenberg/pull/35899))
+-   Change `console.error` to `console.warn` for enqueued styles in the editor. ([35914](https://github.com/WordPress/gutenberg/pull/35914))
+-   Core Data uses hardcoded baseURL prefix for taxonomies and post types. ([35850](https://github.com/WordPress/gutenberg/pull/35850))
+-   Do not translate HTML tag. ([35930](https://github.com/WordPress/gutenberg/pull/35930))
+-   Disable ability to edit menus via `Appearance -> Navigation Menus` for non-FSE themes. ([36257](https://github.com/WordPress/gutenberg/pull/36257))
+-   Fix crash from calls to `undefined` functions. ([36248](https://github.com/WordPress/gutenberg/pull/36248))
+-   Fix WPCS lint errors in global styles. ([36058](https://github.com/WordPress/gutenberg/pull/36058))
+-   Fix getPxFromCssUnit test stability and test that memoized function works correctly. ([35939](https://github.com/WordPress/gutenberg/pull/35939))
+-   Fix: Rest global styles controller accessing configuration that may not exist. ([36047](https://github.com/WordPress/gutenberg/pull/36047))
+-   Make saveEditedEntityRecord use the entity key when available. ([36212](https://github.com/WordPress/gutenberg/pull/36212))
+-   Prevent PHP notice from block-supports elements. ([35836](https://github.com/WordPress/gutenberg/pull/35836))
+-   Revert "Post Content: Fix float clearing on entry content (#35958)". ([36004](https://github.com/WordPress/gutenberg/pull/36004))
+-   Try ensuring the item after post content clears floats. ([36006](https://github.com/WordPress/gutenberg/pull/36006))
+-   Unhook \_block_template_render_title_tag. ([36133](https://github.com/WordPress/gutenberg/pull/36133))
+
+#### Block Library
+
+-   Classic Block: Fix select all blocks side effect. ([35999](https://github.com/WordPress/gutenberg/pull/35999))
+-   Column block: Only add flex-basis if width contains a number. ([35831](https://github.com/WordPress/gutenberg/pull/35831))
+-   Comment Template: Move inner blocks container to separate components. ([36174](https://github.com/WordPress/gutenberg/pull/36174))
+-   Blocks: Fix relative URLs for inlined styles. ([35538](https://github.com/WordPress/gutenberg/pull/35538))
+-   Fix controlled inner blocks parent block attributes updates. ([35827](https://github.com/WordPress/gutenberg/pull/35827))
+-   Fix incorrect attributes definitions. ([36140](https://github.com/WordPress/gutenberg/pull/36140))
+-   Gallery block: Only show the gallery upload error message if mixed multiple files uploaded. ([35790](https://github.com/WordPress/gutenberg/pull/35790))
+-   Gallery block: Remove the arbitrary alt text that is added to gallery images. ([35936](https://github.com/WordPress/gutenberg/pull/35936))
+-   Heading: Avoid error on split when the paragraph isn't registered. ([35871](https://github.com/WordPress/gutenberg/pull/35871))
+-   Navigation Submenu: Fix PHP notice. ([35984](https://github.com/WordPress/gutenberg/pull/35984))
+-   Navigation overlay menu: Fix submenu spacing. ([35823](https://github.com/WordPress/gutenberg/pull/35823))
+-   Navigation: Fix dropdown indicator. ([36106](https://github.com/WordPress/gutenberg/pull/36106))
+-   Navigation: Fix issues with responsive justifications. ([35913](https://github.com/WordPress/gutenberg/pull/35913))
+-   Navigation: Fix justifications. ([36105](https://github.com/WordPress/gutenberg/pull/36105))
+-   Navigation: Fix padding for social links on mobile. ([35824](https://github.com/WordPress/gutenberg/pull/35824))
+-   Pattern block: Remove wrapping div. ([36090](https://github.com/WordPress/gutenberg/pull/36090))
+-   Post Comment: Handle the case where a comment does not exist. ([35810](https://github.com/WordPress/gutenberg/pull/35810))
+-   Post Content: Fix float clearing on entry content. ([35958](https://github.com/WordPress/gutenberg/pull/35958))
+-   Post Template Block: Move inner blocks container to separate component. ([35945](https://github.com/WordPress/gutenberg/pull/35945))
+-   Post Terms: Prevent the block from breaking on pages. ([35957](https://github.com/WordPress/gutenberg/pull/35957))
+-   Site Logo: Fix center alignment. ([35971](https://github.com/WordPress/gutenberg/pull/35971))
+
+#### Components
+
+-   Fix ColorPalette className. ([36016](https://github.com/WordPress/gutenberg/pull/36016))
+-   Fix `<Text>` component text color value to correct color value for Link UI preview description text. ([35851](https://github.com/WordPress/gutenberg/pull/35851))
+-   Fix color list picker spacing to accomodate the new color picker. ([36017](https://github.com/WordPress/gutenberg/pull/36017))
+-   Fix unexpected movements, and closing on first click in the color picker. ([35670](https://github.com/WordPress/gutenberg/pull/35670))
+-   Fixes #34855 RangeControl style issue in RTL. ([35777](https://github.com/WordPress/gutenberg/pull/35777))
+-   Popover: Check anchorDocument default view before removing events. ([35832](https://github.com/WordPress/gutenberg/pull/35832))
+-   Storybook: Lazy load LTR/RTL styles for consistent specificity. ([35771](https://github.com/WordPress/gutenberg/pull/35771))
+-   fix/35709: Set admin color scheme to angle color picker. ([35908](https://github.com/WordPress/gutenberg/pull/35908))
+
+#### Global Styles
+
+-   Fix navigation in global styles sidebar. ([36203](https://github.com/WordPress/gutenberg/pull/36203))
+-   Fix presets data for themes that do not provide any preset. ([36054](https://github.com/WordPress/gutenberg/pull/36054))
+-   Generate preset metadata for font-family in the site editor. ([36022](https://github.com/WordPress/gutenberg/pull/36022))
+-   Hotfix for leftovers of `WP_Theme_JSON_Resolver::Get_merged_data`. ([36173](https://github.com/WordPress/gutenberg/pull/36173))
+-   Lower the specificity of border & padding styles for the outline block style in the button block. ([35968](https://github.com/WordPress/gutenberg/pull/35968))
+-   Theme.json: Remove custom prefixes from properties that did not land in 5.8. ([34485](https://github.com/WordPress/gutenberg/pull/34485))
+
+#### Block Editor
+
+-   Fix inserter with block pattern categories. ([36116](https://github.com/WordPress/gutenberg/pull/36116))
+-   Fix navigation block link control zero value in it. ([36198](https://github.com/WordPress/gutenberg/pull/36198))
+-   Fix the update of link and suggestions in LinkControl. ([32320](https://github.com/WordPress/gutenberg/pull/32320))
+-   Make Link UI inactive if selection extends beyond format bounds or encounters new link. ([35946](https://github.com/WordPress/gutenberg/pull/35946))
+-   Fix selection by holding shift key for nested blocks. ([35668](https://github.com/WordPress/gutenberg/pull/35668))
+-   Fix shift+click on a child block with its parent selected. ([35988](https://github.com/WordPress/gutenberg/pull/35988))
 
 #### Design Tools
-- Font Appearance: Improve consistency of label in Typography panel. ([35860](https://github.com/WordPress/gutenberg/pull/35860))
-- Font Family Support: Fix skip serialization check. ([36073](https://github.com/WordPress/gutenberg/pull/36073))
-- Navigation: Force text decoration styles on nav item in editor. ([35859](https://github.com/WordPress/gutenberg/pull/35859))
+
+-   Font Appearance: Improve consistency of label in Typography panel. ([35860](https://github.com/WordPress/gutenberg/pull/35860))
+-   Font Family Support: Fix skip serialization check. ([36073](https://github.com/WordPress/gutenberg/pull/36073))
+-   Navigation: Force text decoration styles on nav item in editor. ([35859](https://github.com/WordPress/gutenberg/pull/35859))
 
 #### Template Editor
-- Clear selected block when clicking outside in the template part focus mode. ([35816](https://github.com/WordPress/gutenberg/pull/35816))
-- Templates: Only include templates for the current post types. ([35802](https://github.com/WordPress/gutenberg/pull/35802))
+
+-   Clear selected block when clicking outside in the template part focus mode. ([35816](https://github.com/WordPress/gutenberg/pull/35816))
+-   Templates: Only include templates for the current post types. ([35802](https://github.com/WordPress/gutenberg/pull/35802))
 
 #### Plugin
-- Fix fatal error in Site Logo block in WP 5.9. ([36195](https://github.com/WordPress/gutenberg/pull/36195))
+
+-   Fix fatal error in Site Logo block in WP 5.9. ([36195](https://github.com/WordPress/gutenberg/pull/36195))
 
 #### Patterns
-- Update unsaved navigation block flow. ([35976](https://github.com/WordPress/gutenberg/pull/35976))
+
+-   Update unsaved navigation block flow. ([35976](https://github.com/WordPress/gutenberg/pull/35976))
 
 #### Accessibility
-- Try to communicate to screen readers that post title is textarea. ([35898](https://github.com/WordPress/gutenberg/pull/35898))
+
+-   Try to communicate to screen readers that post title is textarea. ([35898](https://github.com/WordPress/gutenberg/pull/35898))
 
 #### Full Site Editing
-- Add fallback handling for plugins or themes using the Customizer. ([35877](https://github.com/WordPress/gutenberg/pull/35877))
+
+-   Add fallback handling for plugins or themes using the Customizer. ([35877](https://github.com/WordPress/gutenberg/pull/35877))
 
 #### Widgets Editor
-- Fix layout styles not applying in widgets customizer. ([35865](https://github.com/WordPress/gutenberg/pull/35865))
+
+-   Fix layout styles not applying in widgets customizer. ([35865](https://github.com/WordPress/gutenberg/pull/35865))
 
 #### CSS & Styling
-- Editor defaults for themes with no editor styles and when user disables theme styles. ([35736](https://github.com/WordPress/gutenberg/pull/35736))
+
+-   Editor defaults for themes with no editor styles and when user disables theme styles. ([35736](https://github.com/WordPress/gutenberg/pull/35736))
 
 #### History
-- Support disabling autosave for native Unsupported Block Editor. ([35639](https://github.com/WordPress/gutenberg/pull/35639))
 
+-   Support disabling autosave for native Unsupported Block Editor. ([35639](https://github.com/WordPress/gutenberg/pull/35639))
 
 ### Performance
 
 #### List View
-- Fix pagedown/pageup and improve scrolling. ([36063](https://github.com/WordPress/gutenberg/pull/36063))
+
+-   Fix pagedown/pageup and improve scrolling. ([36063](https://github.com/WordPress/gutenberg/pull/36063))
 
 #### Block Editor
-- Improve opening of the block inserter via manual token-based analysis of reusable blocks. ([35763](https://github.com/WordPress/gutenberg/pull/35763))
+
+-   Improve opening of the block inserter via manual token-based analysis of reusable blocks. ([35763](https://github.com/WordPress/gutenberg/pull/35763))
 
 #### Widgets Editor
-- List View: Avoid re-rendering all items on block focus. Enable persistent List View in the widget editor. ([35706](https://github.com/WordPress/gutenberg/pull/35706))
+
+-   List View: Avoid re-rendering all items on block focus. Enable persistent List View in the widget editor. ([35706](https://github.com/WordPress/gutenberg/pull/35706))
 
 #### Accessibility
-- List View: Render a fixed number of items. ([35230](https://github.com/WordPress/gutenberg/pull/35230))
 
+-   List View: Render a fixed number of items. ([35230](https://github.com/WordPress/gutenberg/pull/35230))
 
 ### Experiments
 
 #### Block Library
-- Adds in basic styling for post comment form. ([35704](https://github.com/WordPress/gutenberg/pull/35704))
-- Navigation Area block. ([36178](https://github.com/WordPress/gutenberg/pull/36178))
-- Migrate classic menus to block-based menus on theme switch. ([36255](https://github.com/WordPress/gutenberg/pull/36255))
-- Post Comments block: Hide the "Comments Closed" message. ([35743](https://github.com/WordPress/gutenberg/pull/35743))
-- Mobile responsive navigation by default. ([35917](https://github.com/WordPress/gutenberg/pull/35917))
-- Reword navigation color labels. ([35916](https://github.com/WordPress/gutenberg/pull/35916))
-- Show the placeholder again when moving from a valid menu to non-existing menu. ([36210](https://github.com/WordPress/gutenberg/pull/36210))
-- Provide a way to manage wp_navigation posts from wp-admin. ([36126](https://github.com/WordPress/gutenberg/pull/36126))
+
+-   Adds in basic styling for post comment form. ([35704](https://github.com/WordPress/gutenberg/pull/35704))
+-   Navigation Area block. ([36178](https://github.com/WordPress/gutenberg/pull/36178))
+-   Migrate classic menus to block-based menus on theme switch. ([36255](https://github.com/WordPress/gutenberg/pull/36255))
+-   Post Comments block: Hide the "Comments Closed" message. ([35743](https://github.com/WordPress/gutenberg/pull/35743))
+-   Mobile responsive navigation by default. ([35917](https://github.com/WordPress/gutenberg/pull/35917))
+-   Reword navigation color labels. ([35916](https://github.com/WordPress/gutenberg/pull/35916))
+-   Show the placeholder again when moving from a valid menu to non-existing menu. ([36210](https://github.com/WordPress/gutenberg/pull/36210))
+-   Provide a way to manage wp_navigation posts from wp-admin. ([36126](https://github.com/WordPress/gutenberg/pull/36126))
 
 #### Global Styles
-- Add a Global Styles endpoint and use it in the site editor. ([35801](https://github.com/WordPress/gutenberg/pull/35801))
-- Fix: Crash when resetting user color palette. ([36233](https://github.com/WordPress/gutenberg/pull/36233))
-- Fix: Show user colors on palette indicator. ([36232](https://github.com/WordPress/gutenberg/pull/36232))
-- Migrate theme.json v1 to v2. ([36155](https://github.com/WordPress/gutenberg/pull/36155))
-- Update: Show all color and gradient origins (core, theme, and user). ([35970](https://github.com/WordPress/gutenberg/pull/35970))
+
+-   Add a Global Styles endpoint and use it in the site editor. ([35801](https://github.com/WordPress/gutenberg/pull/35801))
+-   Fix: Crash when resetting user color palette. ([36233](https://github.com/WordPress/gutenberg/pull/36233))
+-   Fix: Show user colors on palette indicator. ([36232](https://github.com/WordPress/gutenberg/pull/36232))
+-   Migrate theme.json v1 to v2. ([36155](https://github.com/WordPress/gutenberg/pull/36155))
+-   Update: Show all color and gradient origins (core, theme, and user). ([35970](https://github.com/WordPress/gutenberg/pull/35970))
 
 #### Full Site Editing
-- Always display Customizer menu item. ([36168](https://github.com/WordPress/gutenberg/pull/36168))
-- Revert "Always display Customizer menu item". ([36189](https://github.com/WordPress/gutenberg/pull/36189))
-- Remove slug and status columns from templates list in Appearance > Templates. ([35996](https://github.com/WordPress/gutenberg/pull/35996))
+
+-   Always display Customizer menu item. ([36168](https://github.com/WordPress/gutenberg/pull/36168))
+-   Revert "Always display Customizer menu item". ([36189](https://github.com/WordPress/gutenberg/pull/36189))
+-   Remove slug and status columns from templates list in Appearance > Templates. ([35996](https://github.com/WordPress/gutenberg/pull/35996))
 
 #### REST API
-- Improve unit test coverage for REST API menus endpoints.. ([36177](https://github.com/WordPress/gutenberg/pull/36177))
+
+-   Improve unit test coverage for REST API menus endpoints.. ([36177](https://github.com/WordPress/gutenberg/pull/36177))
 
 #### Navigation Screen
-- Navigation Editor: Show a warning when trying to save unsupported blocks. ([35993](https://github.com/WordPress/gutenberg/pull/35993))
+
+-   Navigation Editor: Show a warning when trying to save unsupported blocks. ([35993](https://github.com/WordPress/gutenberg/pull/35993))
 
 #### Reusable Blocks
-- Editor: Multi-Entity Saving UI Improvements. ([35933](https://github.com/WordPress/gutenberg/pull/35933))
+
+-   Editor: Multi-Entity Saving UI Improvements. ([35933](https://github.com/WordPress/gutenberg/pull/35933))
 
 #### Components
-- Update: Implement new color palette editor component. ([35783](https://github.com/WordPress/gutenberg/pull/35783))
+
+-   Update: Implement new color palette editor component. ([35783](https://github.com/WordPress/gutenberg/pull/35783))
 
 #### Block Editor
-- Split control for URL and Text within Link UI. ([33849](https://github.com/WordPress/gutenberg/pull/33849))
 
+-   Split control for URL and Text within Link UI. ([33849](https://github.com/WordPress/gutenberg/pull/33849))
 
 ### Documentation
 
-- Add Thunks Tutorial. ([36051](https://github.com/WordPress/gutenberg/pull/36051))
-- Add a more detailed guide for react native development. ([35529](https://github.com/WordPress/gutenberg/pull/35529))
-- Add usage documentation for Rich Text package. ([35885](https://github.com/WordPress/gutenberg/pull/35885))
-- Added link to Ways to keep up with Gutenberg & Full Site Editing. ([36077](https://github.com/WordPress/gutenberg/pull/36077))
-- Blocks: Add view script to block schema and documentation. ([36175](https://github.com/WordPress/gutenberg/pull/36175))
-- Blocks: Document changes to style and editorStyle in `block.json`. ([36218](https://github.com/WordPress/gutenberg/pull/36218))
-- Docs: Add Getting Started level for documentation. ([35891](https://github.com/WordPress/gutenberg/pull/35891))
-- Docs: Add section about using the schema during development. ([35835](https://github.com/WordPress/gutenberg/pull/35835))
-- Docs: Fix Typos in widgets/overview.md. ([36078](https://github.com/WordPress/gutenberg/pull/36078))
-- Docs: Fix schema file URL. ([36157](https://github.com/WordPress/gutenberg/pull/36157))
-- Docs: Improve Getting Started landing page. ([35893](https://github.com/WordPress/gutenberg/pull/35893))
-- Docs: Theme.json - fix typo. ([36139](https://github.com/WordPress/gutenberg/pull/36139))
-- Docs: Tweak organization for getting-started documentation. ([34091](https://github.com/WordPress/gutenberg/pull/34091))
-- Docs: Update the recommendation for the cadence of npm releases. ([35925](https://github.com/WordPress/gutenberg/pull/35925))
-- Env docs: Update wordpress-develop example to clarify src/build location. ([35978](https://github.com/WordPress/gutenberg/pull/35978))
-- Fix a small typo in the "Getting started" documentation. ([36109](https://github.com/WordPress/gutenberg/pull/36109))
-- Fix wording in the Authoring Experience documentation. ([35969](https://github.com/WordPress/gutenberg/pull/35969))
-- Move create-block changelog entries back to Unreleased section. ([35886](https://github.com/WordPress/gutenberg/pull/35886))
-- Release Docs: Remove consecutive RCs warning. ([35855](https://github.com/WordPress/gutenberg/pull/35855))
-- Update Components CONTRIBUTING.md indentation. ([35866](https://github.com/WordPress/gutenberg/pull/35866))
-- fix: Backtick added around `<textarea>` input tag in readme file. ([34813](https://github.com/WordPress/gutenberg/pull/34813))
-- theme.json docs: Add missing settings & styles. ([36137](https://github.com/WordPress/gutenberg/pull/36137))
-
+-   Add Thunks Tutorial. ([36051](https://github.com/WordPress/gutenberg/pull/36051))
+-   Add a more detailed guide for react native development. ([35529](https://github.com/WordPress/gutenberg/pull/35529))
+-   Add usage documentation for Rich Text package. ([35885](https://github.com/WordPress/gutenberg/pull/35885))
+-   Added link to Ways to keep up with Gutenberg & Full Site Editing. ([36077](https://github.com/WordPress/gutenberg/pull/36077))
+-   Blocks: Add view script to block schema and documentation. ([36175](https://github.com/WordPress/gutenberg/pull/36175))
+-   Blocks: Document changes to style and editorStyle in `block.json`. ([36218](https://github.com/WordPress/gutenberg/pull/36218))
+-   Docs: Add Getting Started level for documentation. ([35891](https://github.com/WordPress/gutenberg/pull/35891))
+-   Docs: Add section about using the schema during development. ([35835](https://github.com/WordPress/gutenberg/pull/35835))
+-   Docs: Fix Typos in widgets/overview.md. ([36078](https://github.com/WordPress/gutenberg/pull/36078))
+-   Docs: Fix schema file URL. ([36157](https://github.com/WordPress/gutenberg/pull/36157))
+-   Docs: Improve Getting Started landing page. ([35893](https://github.com/WordPress/gutenberg/pull/35893))
+-   Docs: Theme.json - fix typo. ([36139](https://github.com/WordPress/gutenberg/pull/36139))
+-   Docs: Tweak organization for getting-started documentation. ([34091](https://github.com/WordPress/gutenberg/pull/34091))
+-   Docs: Update the recommendation for the cadence of npm releases. ([35925](https://github.com/WordPress/gutenberg/pull/35925))
+-   Env docs: Update wordpress-develop example to clarify src/build location. ([35978](https://github.com/WordPress/gutenberg/pull/35978))
+-   Fix a small typo in the "Getting started" documentation. ([36109](https://github.com/WordPress/gutenberg/pull/36109))
+-   Fix wording in the Authoring Experience documentation. ([35969](https://github.com/WordPress/gutenberg/pull/35969))
+-   Move create-block changelog entries back to Unreleased section. ([35886](https://github.com/WordPress/gutenberg/pull/35886))
+-   Release Docs: Remove consecutive RCs warning. ([35855](https://github.com/WordPress/gutenberg/pull/35855))
+-   Update Components CONTRIBUTING.md indentation. ([35866](https://github.com/WordPress/gutenberg/pull/35866))
+-   fix: Backtick added around `<textarea>` input tag in readme file. ([34813](https://github.com/WordPress/gutenberg/pull/34813))
+-   theme.json docs: Add missing settings & styles. ([36137](https://github.com/WordPress/gutenberg/pull/36137))
 
 ### Code Quality
 
-- Add Theme's base global styles endpoint. ([35985](https://github.com/WordPress/gutenberg/pull/35985))
-- Add alexstine as code owner for post-title. ([36056](https://github.com/WordPress/gutenberg/pull/36056))
-- Add block.json schema to generated file. ([35843](https://github.com/WordPress/gutenberg/pull/35843))
-- Add schemas package. ([35998](https://github.com/WordPress/gutenberg/pull/35998))
-- Improvements for the global styles endpoint. ([36071](https://github.com/WordPress/gutenberg/pull/36071))
-- Make sure tests are pure. ([36253](https://github.com/WordPress/gutenberg/pull/36253))
-- Move getStablePath function into the wordrpess/url package. ([35992](https://github.com/WordPress/gutenberg/pull/35992))
-- Remove "experimental" from URL details REST controller and promote to `v1` namespace. ([35915](https://github.com/WordPress/gutenberg/pull/35915))
-- Remove GB prefixed functions from template part. ([36180](https://github.com/WordPress/gutenberg/pull/36180))
-- Schemas: Theme.json - Add `title` to templateParts. ([36145](https://github.com/WordPress/gutenberg/pull/36145))
-- Updates `WP_Theme_JSON_Resolver` and tests to be equal to core. ([36223](https://github.com/WordPress/gutenberg/pull/36223))
-- Update: Use small button on tools panel toggle. ([35935](https://github.com/WordPress/gutenberg/pull/35935))
-- block-editor store: Migrate to thunks. ([35720](https://github.com/WordPress/gutenberg/pull/35720))
-- theme.json: Update test data. ([35883](https://github.com/WordPress/gutenberg/pull/35883))
+-   Add Theme's base global styles endpoint. ([35985](https://github.com/WordPress/gutenberg/pull/35985))
+-   Add alexstine as code owner for post-title. ([36056](https://github.com/WordPress/gutenberg/pull/36056))
+-   Add block.json schema to generated file. ([35843](https://github.com/WordPress/gutenberg/pull/35843))
+-   Add schemas package. ([35998](https://github.com/WordPress/gutenberg/pull/35998))
+-   Improvements for the global styles endpoint. ([36071](https://github.com/WordPress/gutenberg/pull/36071))
+-   Make sure tests are pure. ([36253](https://github.com/WordPress/gutenberg/pull/36253))
+-   Move getStablePath function into the wordrpess/url package. ([35992](https://github.com/WordPress/gutenberg/pull/35992))
+-   Remove "experimental" from URL details REST controller and promote to `v1` namespace. ([35915](https://github.com/WordPress/gutenberg/pull/35915))
+-   Remove GB prefixed functions from template part. ([36180](https://github.com/WordPress/gutenberg/pull/36180))
+-   Schemas: Theme.json - Add `title` to templateParts. ([36145](https://github.com/WordPress/gutenberg/pull/36145))
+-   Updates `WP_Theme_JSON_Resolver` and tests to be equal to core. ([36223](https://github.com/WordPress/gutenberg/pull/36223))
+-   Update: Use small button on tools panel toggle. ([35935](https://github.com/WordPress/gutenberg/pull/35935))
+-   block-editor store: Migrate to thunks. ([35720](https://github.com/WordPress/gutenberg/pull/35720))
+-   theme.json: Update test data. ([35883](https://github.com/WordPress/gutenberg/pull/35883))
 
 #### Block Library
-- Heading: Auto-generated anchors hide implementation details. ([35747](https://github.com/WordPress/gutenberg/pull/35747))
-- Mark Post Comments as stable and Comments Query Loop as experimental. ([36132](https://github.com/WordPress/gutenberg/pull/36132))
-- Mark Post Navigation Link and Term Description blocks as stable. ([36163](https://github.com/WordPress/gutenberg/pull/36163))
-- Remove `post-` prefix from Comment Template inner blocks. ([36171](https://github.com/WordPress/gutenberg/pull/36171))
+
+-   Heading: Auto-generated anchors hide implementation details. ([35747](https://github.com/WordPress/gutenberg/pull/35747))
+-   Mark Post Comments as stable and Comments Query Loop as experimental. ([36132](https://github.com/WordPress/gutenberg/pull/36132))
+-   Mark Post Navigation Link and Term Description blocks as stable. ([36163](https://github.com/WordPress/gutenberg/pull/36163))
+-   Remove `post-` prefix from Comment Template inner blocks. ([36171](https://github.com/WordPress/gutenberg/pull/36171))
 
 #### Global Styles
-- Refactor theme.json migrations to be a single class. ([36182](https://github.com/WordPress/gutenberg/pull/36182))
-- Remove locations we do not translate from `theme-i18n.json`. ([35881](https://github.com/WordPress/gutenberg/pull/35881))
-- Update `theme.json` schema migrations. ([36154](https://github.com/WordPress/gutenberg/pull/36154))
+
+-   Refactor theme.json migrations to be a single class. ([36182](https://github.com/WordPress/gutenberg/pull/36182))
+-   Remove locations we do not translate from `theme-i18n.json`. ([35881](https://github.com/WordPress/gutenberg/pull/35881))
+-   Update `theme.json` schema migrations. ([36154](https://github.com/WordPress/gutenberg/pull/36154))
 
 #### Post Editor
-- Refactor FlatTermSelector into a functional component. ([33459](https://github.com/WordPress/gutenberg/pull/33459))
-- Typo: Translated site properties. ([36097](https://github.com/WordPress/gutenberg/pull/36097))
+
+-   Refactor FlatTermSelector into a functional component. ([33459](https://github.com/WordPress/gutenberg/pull/33459))
+-   Typo: Translated site properties. ([36097](https://github.com/WordPress/gutenberg/pull/36097))
 
 #### Components
-- ToolsPanel: Use Grid component to handle layout. ([35621](https://github.com/WordPress/gutenberg/pull/35621))
-- Update spacing in CircularOptionPicker. ([36014](https://github.com/WordPress/gutenberg/pull/36014))
+
+-   ToolsPanel: Use Grid component to handle layout. ([35621](https://github.com/WordPress/gutenberg/pull/35621))
+-   Update spacing in CircularOptionPicker. ([36014](https://github.com/WordPress/gutenberg/pull/36014))
 
 #### Data Layer
-- [data]: Rename types file from .d.ts to .ts. ([36062](https://github.com/WordPress/gutenberg/pull/36062))
+
+-   [data]: Rename types file from .d.ts to .ts. ([36062](https://github.com/WordPress/gutenberg/pull/36062))
 
 #### CSS & Styling
-- Remove invalid buttons block CSS property. ([33793](https://github.com/WordPress/gutenberg/pull/33793))
 
+-   Remove invalid buttons block CSS property. ([33793](https://github.com/WordPress/gutenberg/pull/33793))
 
 ### Tools
 
-- Remove @chrisvanpatten from CODEOWNERS. ([35937](https://github.com/WordPress/gutenberg/pull/35937))
+-   Remove @chrisvanpatten from CODEOWNERS. ([35937](https://github.com/WordPress/gutenberg/pull/35937))
 
 #### Testing
-- Add a method to disable auto-accepting dialogs. ([35828](https://github.com/WordPress/gutenberg/pull/35828))
-- Skip broken widgets test. ([36239](https://github.com/WordPress/gutenberg/pull/36239))
-- Skip flaky test for loading block stylesheets in iframe. ([35961](https://github.com/WordPress/gutenberg/pull/35961))
-- Tests: Run block fixtures through KSES. ([35611](https://github.com/WordPress/gutenberg/pull/35611))
+
+-   Add a method to disable auto-accepting dialogs. ([35828](https://github.com/WordPress/gutenberg/pull/35828))
+-   Skip broken widgets test. ([36239](https://github.com/WordPress/gutenberg/pull/36239))
+-   Skip flaky test for loading block stylesheets in iframe. ([35961](https://github.com/WordPress/gutenberg/pull/35961))
+-   Tests: Run block fixtures through KSES. ([35611](https://github.com/WordPress/gutenberg/pull/35611))
 
 #### Block Library
-- Mark FSE blocks as non experimental. ([35979](https://github.com/WordPress/gutenberg/pull/35979))
 
+-   Mark FSE blocks as non experimental. ([35979](https://github.com/WordPress/gutenberg/pull/35979))
 
 ### Various
 
-- Apply borders to canvas rather than other UI elements. ([31081](https://github.com/WordPress/gutenberg/pull/31081))
-- Changes for FSE backport in core. ([36201](https://github.com/WordPress/gutenberg/pull/36201))
-- Mobile - Add support for the Mark HTML tag and updates Aztec iOS to 1.19.5. ([35956](https://github.com/WordPress/gutenberg/pull/35956))
-- Update Appium to 1.22.0. ([35829](https://github.com/WordPress/gutenberg/pull/35829))
-- Updates publish-to-s3 plugin to 0.7.0 for react-native-bridge & react-native-aztec Android and publishes '-sources.jar'. ([36034](https://github.com/WordPress/gutenberg/pull/36034))
-- Use the block name in the "remove block" menu item in the settings dropdown. ([35872](https://github.com/WordPress/gutenberg/pull/35872))
+-   Apply borders to canvas rather than other UI elements. ([31081](https://github.com/WordPress/gutenberg/pull/31081))
+-   Changes for FSE backport in core. ([36201](https://github.com/WordPress/gutenberg/pull/36201))
+-   Mobile - Add support for the Mark HTML tag and updates Aztec iOS to 1.19.5. ([35956](https://github.com/WordPress/gutenberg/pull/35956))
+-   Update Appium to 1.22.0. ([35829](https://github.com/WordPress/gutenberg/pull/35829))
+-   Updates publish-to-s3 plugin to 0.7.0 for react-native-bridge & react-native-aztec Android and publishes '-sources.jar'. ([36034](https://github.com/WordPress/gutenberg/pull/36034))
+-   Use the block name in the "remove block" menu item in the settings dropdown. ([35872](https://github.com/WordPress/gutenberg/pull/35872))
 
 #### Site Editor
-- Remove navigation panel in site editor. ([36194](https://github.com/WordPress/gutenberg/pull/36194))
-
 
+-   Remove navigation panel in site editor. ([36194](https://github.com/WordPress/gutenberg/pull/36194))
 
 = 11.8.1 =
 
-
+## Changelog
 
 ### Various
 
-- Keep a copy of anchor ref to preserve highlighted text selection. ([36263](https://github.com/WordPress/gutenberg/pull/36263))
-
-
-
-
+-   Keep a copy of anchor ref to preserve highlighted text selection. ([36263](https://github.com/WordPress/gutenberg/pull/36263))
 
 = 11.9.0-rc.1 =
 
+## Changelog
+
 ### Features
 
 #### Block Library
-- Add Media File and Attachment Page options to the native Image block Link To menu. ([34846](https://github.com/WordPress/gutenberg/pull/34846))
-- Add new Comment Reply Link block. ([35774](https://github.com/WordPress/gutenberg/pull/35774))
-- Add new Edit Comment Link block. ([35965](https://github.com/WordPress/gutenberg/pull/35965))
-- Site Editor: Add Comment Avatar Core Block. ([35396](https://github.com/WordPress/gutenberg/pull/35396))
-- Site Editor: Add new Comments Query Loop block. ([35231](https://github.com/WordPress/gutenberg/pull/35231))
+
+-   Add Media File and Attachment Page options to the native Image block Link To menu. ([34846](https://github.com/WordPress/gutenberg/pull/34846))
+-   Add new Comment Reply Link block. ([35774](https://github.com/WordPress/gutenberg/pull/35774))
+-   Add new Edit Comment Link block. ([35965](https://github.com/WordPress/gutenberg/pull/35965))
+-   Site Editor: Add Comment Avatar Core Block. ([35396](https://github.com/WordPress/gutenberg/pull/35396))
+-   Site Editor: Add new Comments Query Loop block. ([35231](https://github.com/WordPress/gutenberg/pull/35231))
 
 #### Block Editor
-- Enable native editor onboarding features globally. ([35201](https://github.com/WordPress/gutenberg/pull/35201))
 
+-   Enable native editor onboarding features globally. ([35201](https://github.com/WordPress/gutenberg/pull/35201))
 
 ### Enhancements
 
-- Disable Xdebug by default unless specified by user. ([34324](https://github.com/WordPress/gutenberg/pull/34324))
-- Improve the initial loading of the site editor. ([36044](https://github.com/WordPress/gutenberg/pull/36044))
-- StripHTML - preserve leading and trailing spaces and strip script and on* attributes. ([35539](https://github.com/WordPress/gutenberg/pull/35539))
-- Remove visual clue from text alignment toolbar. ([35922](https://github.com/WordPress/gutenberg/pull/35922))
-- Add `flex-wrap` control to `flex` layout. ([36003](https://github.com/WordPress/gutenberg/pull/36003))
-
-#### Block Library
-- Add alignment option to the Comment Edit Link block. ([36033](https://github.com/WordPress/gutenberg/pull/36033))
-- Add featured transforms in Link Control for Navigation Link items. ([35857](https://github.com/WordPress/gutenberg/pull/35857))
-- Add flex layout to Buttons block and new layout type. ([35819](https://github.com/WordPress/gutenberg/pull/35819))
-- Add spacing controls to Post Author block. ([35963](https://github.com/WordPress/gutenberg/pull/35963))
-- Add spacing controls to Post Excerpt. ([35959](https://github.com/WordPress/gutenberg/pull/35959))
-- Add create new menu button to nav block. ([36245](https://github.com/WordPress/gutenberg/pull/36245))
-- Code block: Add support for padding, color & border styles. ([27582](https://github.com/WordPress/gutenberg/pull/27582))
-- Columns: Add padding support. ([35701](https://github.com/WordPress/gutenberg/pull/35701))
-- Comment Author Name: Add spacing to have same options as Post Author Name. ([36213](https://github.com/WordPress/gutenberg/pull/36213))
-- Deprecate the Post Comment block. ([36032](https://github.com/WordPress/gutenberg/pull/36032))
-- Embed: Add Wolfram Cloud as an embed provider. ([35656](https://github.com/WordPress/gutenberg/pull/35656))
-- Gallery block: Replace gallery experimental setting with a check for use_balanceTags. ([34979](https://github.com/WordPress/gutenberg/pull/34979))
-- Image Block: Add data-id attribute on server side render for core galleries. ([35975](https://github.com/WordPress/gutenberg/pull/35975))
-- Navigation Block: Add missing menu item attributes to core/navigation. ([35634](https://github.com/WordPress/gutenberg/pull/35634))
-- Navigation: Add delete nav menu button. ([35981](https://github.com/WordPress/gutenberg/pull/35981))
-- Navigation: Create nav menu on pattern insertion or when the block has uncontrolled inner blocks. ([36024](https://github.com/WordPress/gutenberg/pull/36024))
-- Navigation: Use a single placeholder for the block. ([36023](https://github.com/WordPress/gutenberg/pull/36023))
-- Page List: Create a JS version for the editor. ([31670](https://github.com/WordPress/gutenberg/pull/31670))
-- Post Comment Author: Add alignment options. ([36045](https://github.com/WordPress/gutenberg/pull/36045))
-- Post Comments: Even out the top margin inside the block. ([35887](https://github.com/WordPress/gutenberg/pull/35887))
-- Post Excerpt: Don't print the wrapper when there is no excerpt. ([35749](https://github.com/WordPress/gutenberg/pull/35749))
-- Post Title: Return no markup if title is empty. ([35861](https://github.com/WordPress/gutenberg/pull/35861))
-- Save Navigation Block data to a wp_navigation post type. ([35746](https://github.com/WordPress/gutenberg/pull/35746))
-- Search: Add contextual defaults when inserted in Navigation block. ([36125](https://github.com/WordPress/gutenberg/pull/36125))
-- Try using flex layout on the Navigation block. ([36169](https://github.com/WordPress/gutenberg/pull/36169))
-- Update navigation block entity automatic name generation and refine naming UI. ([36238](https://github.com/WordPress/gutenberg/pull/36238))
+-   Disable Xdebug by default unless specified by user. ([34324](https://github.com/WordPress/gutenberg/pull/34324))
+-   Improve the initial loading of the site editor. ([36044](https://github.com/WordPress/gutenberg/pull/36044))
+-   StripHTML - preserve leading and trailing spaces and strip script and on\* attributes. ([35539](https://github.com/WordPress/gutenberg/pull/35539))
+-   Remove visual clue from text alignment toolbar. ([35922](https://github.com/WordPress/gutenberg/pull/35922))
+-   Add `flex-wrap` control to `flex` layout. ([36003](https://github.com/WordPress/gutenberg/pull/36003))
+
+#### Block Library
+
+-   Add alignment option to the Comment Edit Link block. ([36033](https://github.com/WordPress/gutenberg/pull/36033))
+-   Add featured transforms in Link Control for Navigation Link items. ([35857](https://github.com/WordPress/gutenberg/pull/35857))
+-   Add flex layout to Buttons block and new layout type. ([35819](https://github.com/WordPress/gutenberg/pull/35819))
+-   Add spacing controls to Post Author block. ([35963](https://github.com/WordPress/gutenberg/pull/35963))
+-   Add spacing controls to Post Excerpt. ([35959](https://github.com/WordPress/gutenberg/pull/35959))
+-   Add create new menu button to nav block. ([36245](https://github.com/WordPress/gutenberg/pull/36245))
+-   Code block: Add support for padding, color & border styles. ([27582](https://github.com/WordPress/gutenberg/pull/27582))
+-   Columns: Add padding support. ([35701](https://github.com/WordPress/gutenberg/pull/35701))
+-   Comment Author Name: Add spacing to have same options as Post Author Name. ([36213](https://github.com/WordPress/gutenberg/pull/36213))
+-   Deprecate the Post Comment block. ([36032](https://github.com/WordPress/gutenberg/pull/36032))
+-   Embed: Add Wolfram Cloud as an embed provider. ([35656](https://github.com/WordPress/gutenberg/pull/35656))
+-   Gallery block: Replace gallery experimental setting with a check for use_balanceTags. ([34979](https://github.com/WordPress/gutenberg/pull/34979))
+-   Image Block: Add data-id attribute on server side render for core galleries. ([35975](https://github.com/WordPress/gutenberg/pull/35975))
+-   Navigation Block: Add missing menu item attributes to core/navigation. ([35634](https://github.com/WordPress/gutenberg/pull/35634))
+-   Navigation: Add delete nav menu button. ([35981](https://github.com/WordPress/gutenberg/pull/35981))
+-   Navigation: Create nav menu on pattern insertion or when the block has uncontrolled inner blocks. ([36024](https://github.com/WordPress/gutenberg/pull/36024))
+-   Navigation: Use a single placeholder for the block. ([36023](https://github.com/WordPress/gutenberg/pull/36023))
+-   Page List: Create a JS version for the editor. ([31670](https://github.com/WordPress/gutenberg/pull/31670))
+-   Post Comment Author: Add alignment options. ([36045](https://github.com/WordPress/gutenberg/pull/36045))
+-   Post Comments: Even out the top margin inside the block. ([35887](https://github.com/WordPress/gutenberg/pull/35887))
+-   Post Excerpt: Don't print the wrapper when there is no excerpt. ([35749](https://github.com/WordPress/gutenberg/pull/35749))
+-   Post Title: Return no markup if title is empty. ([35861](https://github.com/WordPress/gutenberg/pull/35861))
+-   Save Navigation Block data to a wp_navigation post type. ([35746](https://github.com/WordPress/gutenberg/pull/35746))
+-   Search: Add contextual defaults when inserted in Navigation block. ([36125](https://github.com/WordPress/gutenberg/pull/36125))
+-   Try using flex layout on the Navigation block. ([36169](https://github.com/WordPress/gutenberg/pull/36169))
+-   Update navigation block entity automatic name generation and refine naming UI. ([36238](https://github.com/WordPress/gutenberg/pull/36238))
 
 #### Accessibility
-- Add announcement on formatting change for screen readers. ([35896](https://github.com/WordPress/gutenberg/pull/35896))
-- Add aria-current to navigation link, submenu, page list. ([35880](https://github.com/WordPress/gutenberg/pull/35880))
-- Full Site Editing: Use SearchControl component inside nav menu. ([36011](https://github.com/WordPress/gutenberg/pull/36011))
-- Improve focus styles for Link UI preview title. ([35853](https://github.com/WordPress/gutenberg/pull/35853))
-- Site Editor: Enable the "Save" keyboard shortcut. ([36138](https://github.com/WordPress/gutenberg/pull/36138))
+
+-   Add announcement on formatting change for screen readers. ([35896](https://github.com/WordPress/gutenberg/pull/35896))
+-   Add aria-current to navigation link, submenu, page list. ([35880](https://github.com/WordPress/gutenberg/pull/35880))
+-   Full Site Editing: Use SearchControl component inside nav menu. ([36011](https://github.com/WordPress/gutenberg/pull/36011))
+-   Improve focus styles for Link UI preview title. ([35853](https://github.com/WordPress/gutenberg/pull/35853))
+-   Site Editor: Enable the "Save" keyboard shortcut. ([36138](https://github.com/WordPress/gutenberg/pull/36138))
 
 #### Block Editor
-- Enable rich previews in the Link UI for the Site Editor. ([35951](https://github.com/WordPress/gutenberg/pull/35951))
-- Try: Show drag slot instead of hiding the item being dragged. ([33950](https://github.com/WordPress/gutenberg/pull/33950))
-- Update Link UI design for preview action buttons to use icons for edit and unlink. ([35833](https://github.com/WordPress/gutenberg/pull/35833))
+
+-   Enable rich previews in the Link UI for the Site Editor. ([35951](https://github.com/WordPress/gutenberg/pull/35951))
+-   Try: Show drag slot instead of hiding the item being dragged. ([33950](https://github.com/WordPress/gutenberg/pull/33950))
+-   Update Link UI design for preview action buttons to use icons for edit and unlink. ([35833](https://github.com/WordPress/gutenberg/pull/35833))
 
 #### Full Site Editing
-- Move and rename the site editor menu item. ([36064](https://github.com/WordPress/gutenberg/pull/36064))
-- Use Heading component on NavigationMenu and NavigationGroup components. ([36009](https://github.com/WordPress/gutenberg/pull/36009))
+
+-   Move and rename the site editor menu item. ([36064](https://github.com/WordPress/gutenberg/pull/36064))
+-   Use Heading component on NavigationMenu and NavigationGroup components. ([36009](https://github.com/WordPress/gutenberg/pull/36009))
 
 #### Components
-- Add duotone description. ([36018](https://github.com/WordPress/gutenberg/pull/36018))
-- ToolsPanel: Update typography panel layout. ([35911](https://github.com/WordPress/gutenberg/pull/35911))
+
+-   Add duotone description. ([36018](https://github.com/WordPress/gutenberg/pull/36018))
+-   ToolsPanel: Update typography panel layout. ([35911](https://github.com/WordPress/gutenberg/pull/35911))
 
 #### Template Editor
-- Add resizer to template part focus mode. ([35728](https://github.com/WordPress/gutenberg/pull/35728))
-- Auto resize the height of template part focus mode. ([35974](https://github.com/WordPress/gutenberg/pull/35974))
+
+-   Add resizer to template part focus mode. ([35728](https://github.com/WordPress/gutenberg/pull/35728))
+-   Auto resize the height of template part focus mode. ([35974](https://github.com/WordPress/gutenberg/pull/35974))
 
 #### Global Styles
-- Remove the duplicated title in background, text and link views in Global Styles. ([35583](https://github.com/WordPress/gutenberg/pull/35583))
-- Typography: Switch to ToolsPanel for block support UI. ([33744](https://github.com/WordPress/gutenberg/pull/33744))
+
+-   Remove the duplicated title in background, text and link views in Global Styles. ([35583](https://github.com/WordPress/gutenberg/pull/35583))
+-   Typography: Switch to ToolsPanel for block support UI. ([33744](https://github.com/WordPress/gutenberg/pull/33744))
 
 #### Design Tools
-- Enable transparency for duotone. ([34130](https://github.com/WordPress/gutenberg/pull/34130))
-- Typography block support: Add typography support and defaults. ([34064](https://github.com/WordPress/gutenberg/pull/34064))
+
+-   Enable transparency for duotone. ([34130](https://github.com/WordPress/gutenberg/pull/34130))
+-   Typography block support: Add typography support and defaults. ([34064](https://github.com/WordPress/gutenberg/pull/34064))
 
 #### Media
-- Remove "security" verbiage from warning when filetype does not pass on upload. ([36226](https://github.com/WordPress/gutenberg/pull/36226))
+
+-   Remove "security" verbiage from warning when filetype does not pass on upload. ([36226](https://github.com/WordPress/gutenberg/pull/36226))
 
 #### Patterns
-- [Patterns]: Add a flag to hide patterns from UI. ([36108](https://github.com/WordPress/gutenberg/pull/36108))
+
+-   [Patterns]: Add a flag to hide patterns from UI. ([36108](https://github.com/WordPress/gutenberg/pull/36108))
 
 #### Themes
-- Remove experimental feature notice. ([36083](https://github.com/WordPress/gutenberg/pull/36083))
+
+-   Remove experimental feature notice. ([36083](https://github.com/WordPress/gutenberg/pull/36083))
 
 #### Testing
-- Scripts: Increase timeout for end-to-end tests. ([35983](https://github.com/WordPress/gutenberg/pull/35983))
+
+-   Scripts: Increase timeout for end-to-end tests. ([35983](https://github.com/WordPress/gutenberg/pull/35983))
 
 #### REST API
-- URL Details: Update regex to include `og:Description`. ([35875](https://github.com/WordPress/gutenberg/pull/35875))
 
+-   URL Details: Update regex to include `og:Description`. ([35875](https://github.com/WordPress/gutenberg/pull/35875))
 
 ### New APIs
 
 #### Global Styles
-- Add API to access global settings, styles, and stylesheet. ([34843](https://github.com/WordPress/gutenberg/pull/34843))
-
-#### Block Library
-- Inner blocks: Edit/save symmetry + stabilise API. ([26031](https://github.com/WordPress/gutenberg/pull/26031))
-
-
-### Bug Fixes
-
-- Allow moving metaboxes to previously empty area. ([25187](https://github.com/WordPress/gutenberg/pull/25187))
-- Avoid showing deleted records in editor saving flow. ([36027](https://github.com/WordPress/gutenberg/pull/36027))
-- BaseControl: Help text id has undefined value if no id is passed to component. ([35899](https://github.com/WordPress/gutenberg/pull/35899))
-- Change `console.error` to `console.warn` for enqueued styles in the editor. ([35914](https://github.com/WordPress/gutenberg/pull/35914))
-- Core Data uses hardcoded baseURL prefix for taxonomies and post types. ([35850](https://github.com/WordPress/gutenberg/pull/35850))
-- Do not translate HTML tag. ([35930](https://github.com/WordPress/gutenberg/pull/35930))
-- Disable ability to edit menus via `Appearance -> Navigation Menus` for non-FSE themes. ([36257](https://github.com/WordPress/gutenberg/pull/36257))
-- Fix crash from calls to `undefined` functions. ([36248](https://github.com/WordPress/gutenberg/pull/36248))
-- Fix WPCS lint errors in global styles. ([36058](https://github.com/WordPress/gutenberg/pull/36058))
-- Fix getPxFromCssUnit test stability and test that memoized function works correctly. ([35939](https://github.com/WordPress/gutenberg/pull/35939))
-- Fix: Rest global styles controller accessing configuration that may not exist. ([36047](https://github.com/WordPress/gutenberg/pull/36047))
-- Make saveEditedEntityRecord use the entity key when available. ([36212](https://github.com/WordPress/gutenberg/pull/36212))
-- Prevent PHP notice from block-supports elements. ([35836](https://github.com/WordPress/gutenberg/pull/35836))
-- Revert "Post Content: Fix float clearing on entry content (#35958)". ([36004](https://github.com/WordPress/gutenberg/pull/36004))
-- Try ensuring the item after post content clears floats. ([36006](https://github.com/WordPress/gutenberg/pull/36006))
-- Unhook _block_template_render_title_tag. ([36133](https://github.com/WordPress/gutenberg/pull/36133))
-
-#### Block Library
-- Classic Block: Fix select all blocks side effect. ([35999](https://github.com/WordPress/gutenberg/pull/35999))
-- Column block: Only add flex-basis if width contains a number. ([35831](https://github.com/WordPress/gutenberg/pull/35831))
-- Comment Template: Move inner blocks container to separate components. ([36174](https://github.com/WordPress/gutenberg/pull/36174))
-- Blocks: Fix relative URLs for inlined styles. ([35538](https://github.com/WordPress/gutenberg/pull/35538))
-- Fix controlled inner blocks parent block attributes updates. ([35827](https://github.com/WordPress/gutenberg/pull/35827))
-- Fix incorrect attributes definitions. ([36140](https://github.com/WordPress/gutenberg/pull/36140))
-- Gallery block: Only show the gallery upload error message if mixed multiple files uploaded. ([35790](https://github.com/WordPress/gutenberg/pull/35790))
-- Gallery block: Remove the arbitrary alt text that is added to gallery images. ([35936](https://github.com/WordPress/gutenberg/pull/35936))
-- Heading: Avoid error on split when the paragraph isn't registered. ([35871](https://github.com/WordPress/gutenberg/pull/35871))
-- Navigation Submenu: Fix PHP notice. ([35984](https://github.com/WordPress/gutenberg/pull/35984))
-- Navigation overlay menu: Fix submenu spacing. ([35823](https://github.com/WordPress/gutenberg/pull/35823))
-- Navigation: Fix dropdown indicator. ([36106](https://github.com/WordPress/gutenberg/pull/36106))
-- Navigation: Fix issues with responsive justifications. ([35913](https://github.com/WordPress/gutenberg/pull/35913))
-- Navigation: Fix justifications. ([36105](https://github.com/WordPress/gutenberg/pull/36105))
-- Navigation: Fix padding for social links on mobile. ([35824](https://github.com/WordPress/gutenberg/pull/35824))
-- Pattern block: Remove wrapping div. ([36090](https://github.com/WordPress/gutenberg/pull/36090))
-- Post Comment: Handle the case where a comment does not exist. ([35810](https://github.com/WordPress/gutenberg/pull/35810))
-- Post Content: Fix float clearing on entry content. ([35958](https://github.com/WordPress/gutenberg/pull/35958))
-- Post Template Block: Move inner blocks container to separate component. ([35945](https://github.com/WordPress/gutenberg/pull/35945))
-- Post Terms: Prevent the block from breaking on pages. ([35957](https://github.com/WordPress/gutenberg/pull/35957))
-- Site Logo: Fix center alignment. ([35971](https://github.com/WordPress/gutenberg/pull/35971))
-
-#### Components
-- Fix ColorPalette className. ([36016](https://github.com/WordPress/gutenberg/pull/36016))
-- Fix `<Text>` component text color value to correct color value for Link UI preview description text. ([35851](https://github.com/WordPress/gutenberg/pull/35851))
-- Fix color list picker spacing to accomodate the new color picker. ([36017](https://github.com/WordPress/gutenberg/pull/36017))
-- Fix unexpected movements, and closing on first click in the color picker. ([35670](https://github.com/WordPress/gutenberg/pull/35670))
-- Fixes #34855 RangeControl style issue in RTL. ([35777](https://github.com/WordPress/gutenberg/pull/35777))
-- Popover: Check anchorDocument default view before removing events. ([35832](https://github.com/WordPress/gutenberg/pull/35832))
-- Storybook: Lazy load LTR/RTL styles for consistent specificity. ([35771](https://github.com/WordPress/gutenberg/pull/35771))
-- fix/35709: Set admin color scheme to angle color picker. ([35908](https://github.com/WordPress/gutenberg/pull/35908))
-
-#### Global Styles
-- Fix navigation in global styles sidebar. ([36203](https://github.com/WordPress/gutenberg/pull/36203))
-- Fix presets data for themes that do not provide any preset. ([36054](https://github.com/WordPress/gutenberg/pull/36054))
-- Generate preset metadata for font-family in the site editor. ([36022](https://github.com/WordPress/gutenberg/pull/36022))
-- Hotfix for leftovers of `WP_Theme_JSON_Resolver::Get_merged_data`. ([36173](https://github.com/WordPress/gutenberg/pull/36173))
-- Lower the specificity of border & padding styles for the outline block style in the button block. ([35968](https://github.com/WordPress/gutenberg/pull/35968))
-- Theme.json: Remove custom prefixes from properties that did not land in 5.8. ([34485](https://github.com/WordPress/gutenberg/pull/34485))
-
-#### Block Editor
-- Fix inserter with block pattern categories. ([36116](https://github.com/WordPress/gutenberg/pull/36116))
-- Fix navigation block link control zero value in it. ([36198](https://github.com/WordPress/gutenberg/pull/36198))
-- Fix the update of link and suggestions in LinkControl. ([32320](https://github.com/WordPress/gutenberg/pull/32320))
-- Make Link UI inactive if selection extends beyond format bounds or encounters new link. ([35946](https://github.com/WordPress/gutenberg/pull/35946))
-- Fix selection by holding shift key for nested blocks. ([35668](https://github.com/WordPress/gutenberg/pull/35668))
-- Fix shift+click on a child block with its parent selected. ([35988](https://github.com/WordPress/gutenberg/pull/35988))
+
+-   Add API to access global settings, styles, and stylesheet. ([34843](https://github.com/WordPress/gutenberg/pull/34843))
+
+#### Block Library
+
+-   Inner blocks: Edit/save symmetry + stabilise API. ([26031](https://github.com/WordPress/gutenberg/pull/26031))
+
+### Bug Fixes
+
+-   Allow moving metaboxes to previously empty area. ([25187](https://github.com/WordPress/gutenberg/pull/25187))
+-   Avoid showing deleted records in editor saving flow. ([36027](https://github.com/WordPress/gutenberg/pull/36027))
+-   BaseControl: Help text id has undefined value if no id is passed to component. ([35899](https://github.com/WordPress/gutenberg/pull/35899))
+-   Change `console.error` to `console.warn` for enqueued styles in the editor. ([35914](https://github.com/WordPress/gutenberg/pull/35914))
+-   Core Data uses hardcoded baseURL prefix for taxonomies and post types. ([35850](https://github.com/WordPress/gutenberg/pull/35850))
+-   Do not translate HTML tag. ([35930](https://github.com/WordPress/gutenberg/pull/35930))
+-   Disable ability to edit menus via `Appearance -> Navigation Menus` for non-FSE themes. ([36257](https://github.com/WordPress/gutenberg/pull/36257))
+-   Fix crash from calls to `undefined` functions. ([36248](https://github.com/WordPress/gutenberg/pull/36248))
+-   Fix WPCS lint errors in global styles. ([36058](https://github.com/WordPress/gutenberg/pull/36058))
+-   Fix getPxFromCssUnit test stability and test that memoized function works correctly. ([35939](https://github.com/WordPress/gutenberg/pull/35939))
+-   Fix: Rest global styles controller accessing configuration that may not exist. ([36047](https://github.com/WordPress/gutenberg/pull/36047))
+-   Make saveEditedEntityRecord use the entity key when available. ([36212](https://github.com/WordPress/gutenberg/pull/36212))
+-   Prevent PHP notice from block-supports elements. ([35836](https://github.com/WordPress/gutenberg/pull/35836))
+-   Revert "Post Content: Fix float clearing on entry content (#35958)". ([36004](https://github.com/WordPress/gutenberg/pull/36004))
+-   Try ensuring the item after post content clears floats. ([36006](https://github.com/WordPress/gutenberg/pull/36006))
+-   Unhook \_block_template_render_title_tag. ([36133](https://github.com/WordPress/gutenberg/pull/36133))
+
+#### Block Library
+
+-   Classic Block: Fix select all blocks side effect. ([35999](https://github.com/WordPress/gutenberg/pull/35999))
+-   Column block: Only add flex-basis if width contains a number. ([35831](https://github.com/WordPress/gutenberg/pull/35831))
+-   Comment Template: Move inner blocks container to separate components. ([36174](https://github.com/WordPress/gutenberg/pull/36174))
+-   Blocks: Fix relative URLs for inlined styles. ([35538](https://github.com/WordPress/gutenberg/pull/35538))
+-   Fix controlled inner blocks parent block attributes updates. ([35827](https://github.com/WordPress/gutenberg/pull/35827))
+-   Fix incorrect attributes definitions. ([36140](https://github.com/WordPress/gutenberg/pull/36140))
+-   Gallery block: Only show the gallery upload error message if mixed multiple files uploaded. ([35790](https://github.com/WordPress/gutenberg/pull/35790))
+-   Gallery block: Remove the arbitrary alt text that is added to gallery images. ([35936](https://github.com/WordPress/gutenberg/pull/35936))
+-   Heading: Avoid error on split when the paragraph isn't registered. ([35871](https://github.com/WordPress/gutenberg/pull/35871))
+-   Navigation Submenu: Fix PHP notice. ([35984](https://github.com/WordPress/gutenberg/pull/35984))
+-   Navigation overlay menu: Fix submenu spacing. ([35823](https://github.com/WordPress/gutenberg/pull/35823))
+-   Navigation: Fix dropdown indicator. ([36106](https://github.com/WordPress/gutenberg/pull/36106))
+-   Navigation: Fix issues with responsive justifications. ([35913](https://github.com/WordPress/gutenberg/pull/35913))
+-   Navigation: Fix justifications. ([36105](https://github.com/WordPress/gutenberg/pull/36105))
+-   Navigation: Fix padding for social links on mobile. ([35824](https://github.com/WordPress/gutenberg/pull/35824))
+-   Pattern block: Remove wrapping div. ([36090](https://github.com/WordPress/gutenberg/pull/36090))
+-   Post Comment: Handle the case where a comment does not exist. ([35810](https://github.com/WordPress/gutenberg/pull/35810))
+-   Post Content: Fix float clearing on entry content. ([35958](https://github.com/WordPress/gutenberg/pull/35958))
+-   Post Template Block: Move inner blocks container to separate component. ([35945](https://github.com/WordPress/gutenberg/pull/35945))
+-   Post Terms: Prevent the block from breaking on pages. ([35957](https://github.com/WordPress/gutenberg/pull/35957))
+-   Site Logo: Fix center alignment. ([35971](https://github.com/WordPress/gutenberg/pull/35971))
+
+#### Components
+
+-   Fix ColorPalette className. ([36016](https://github.com/WordPress/gutenberg/pull/36016))
+-   Fix `<Text>` component text color value to correct color value for Link UI preview description text. ([35851](https://github.com/WordPress/gutenberg/pull/35851))
+-   Fix color list picker spacing to accomodate the new color picker. ([36017](https://github.com/WordPress/gutenberg/pull/36017))
+-   Fix unexpected movements, and closing on first click in the color picker. ([35670](https://github.com/WordPress/gutenberg/pull/35670))
+-   Fixes #34855 RangeControl style issue in RTL. ([35777](https://github.com/WordPress/gutenberg/pull/35777))
+-   Popover: Check anchorDocument default view before removing events. ([35832](https://github.com/WordPress/gutenberg/pull/35832))
+-   Storybook: Lazy load LTR/RTL styles for consistent specificity. ([35771](https://github.com/WordPress/gutenberg/pull/35771))
+-   fix/35709: Set admin color scheme to angle color picker. ([35908](https://github.com/WordPress/gutenberg/pull/35908))
+
+#### Global Styles
+
+-   Fix navigation in global styles sidebar. ([36203](https://github.com/WordPress/gutenberg/pull/36203))
+-   Fix presets data for themes that do not provide any preset. ([36054](https://github.com/WordPress/gutenberg/pull/36054))
+-   Generate preset metadata for font-family in the site editor. ([36022](https://github.com/WordPress/gutenberg/pull/36022))
+-   Hotfix for leftovers of `WP_Theme_JSON_Resolver::Get_merged_data`. ([36173](https://github.com/WordPress/gutenberg/pull/36173))
+-   Lower the specificity of border & padding styles for the outline block style in the button block. ([35968](https://github.com/WordPress/gutenberg/pull/35968))
+-   Theme.json: Remove custom prefixes from properties that did not land in 5.8. ([34485](https://github.com/WordPress/gutenberg/pull/34485))
+
+#### Block Editor
+
+-   Fix inserter with block pattern categories. ([36116](https://github.com/WordPress/gutenberg/pull/36116))
+-   Fix navigation block link control zero value in it. ([36198](https://github.com/WordPress/gutenberg/pull/36198))
+-   Fix the update of link and suggestions in LinkControl. ([32320](https://github.com/WordPress/gutenberg/pull/32320))
+-   Make Link UI inactive if selection extends beyond format bounds or encounters new link. ([35946](https://github.com/WordPress/gutenberg/pull/35946))
+-   Fix selection by holding shift key for nested blocks. ([35668](https://github.com/WordPress/gutenberg/pull/35668))
+-   Fix shift+click on a child block with its parent selected. ([35988](https://github.com/WordPress/gutenberg/pull/35988))
 
 #### Design Tools
-- Font Appearance: Improve consistency of label in Typography panel. ([35860](https://github.com/WordPress/gutenberg/pull/35860))
-- Font Family Support: Fix skip serialization check. ([36073](https://github.com/WordPress/gutenberg/pull/36073))
-- Navigation: Force text decoration styles on nav item in editor. ([35859](https://github.com/WordPress/gutenberg/pull/35859))
+
+-   Font Appearance: Improve consistency of label in Typography panel. ([35860](https://github.com/WordPress/gutenberg/pull/35860))
+-   Font Family Support: Fix skip serialization check. ([36073](https://github.com/WordPress/gutenberg/pull/36073))
+-   Navigation: Force text decoration styles on nav item in editor. ([35859](https://github.com/WordPress/gutenberg/pull/35859))
 
 #### Template Editor
-- Clear selected block when clicking outside in the template part focus mode. ([35816](https://github.com/WordPress/gutenberg/pull/35816))
-- Templates: Only include templates for the current post types. ([35802](https://github.com/WordPress/gutenberg/pull/35802))
+
+-   Clear selected block when clicking outside in the template part focus mode. ([35816](https://github.com/WordPress/gutenberg/pull/35816))
+-   Templates: Only include templates for the current post types. ([35802](https://github.com/WordPress/gutenberg/pull/35802))
 
 #### Plugin
-- Fix fatal error in Site Logo block in WP 5.9. ([36195](https://github.com/WordPress/gutenberg/pull/36195))
+
+-   Fix fatal error in Site Logo block in WP 5.9. ([36195](https://github.com/WordPress/gutenberg/pull/36195))
 
 #### Patterns
-- Update unsaved navigation block flow. ([35976](https://github.com/WordPress/gutenberg/pull/35976))
+
+-   Update unsaved navigation block flow. ([35976](https://github.com/WordPress/gutenberg/pull/35976))
 
 #### Accessibility
-- Try to communicate to screen readers that post title is textarea. ([35898](https://github.com/WordPress/gutenberg/pull/35898))
+
+-   Try to communicate to screen readers that post title is textarea. ([35898](https://github.com/WordPress/gutenberg/pull/35898))
 
 #### Full Site Editing
-- Add fallback handling for plugins or themes using the Customizer. ([35877](https://github.com/WordPress/gutenberg/pull/35877))
+
+-   Add fallback handling for plugins or themes using the Customizer. ([35877](https://github.com/WordPress/gutenberg/pull/35877))
 
 #### Widgets Editor
-- Fix layout styles not applying in widgets customizer. ([35865](https://github.com/WordPress/gutenberg/pull/35865))
+
+-   Fix layout styles not applying in widgets customizer. ([35865](https://github.com/WordPress/gutenberg/pull/35865))
 
 #### CSS & Styling
-- Editor defaults for themes with no editor styles and when user disables theme styles. ([35736](https://github.com/WordPress/gutenberg/pull/35736))
+
+-   Editor defaults for themes with no editor styles and when user disables theme styles. ([35736](https://github.com/WordPress/gutenberg/pull/35736))
 
 #### History
-- Support disabling autosave for native Unsupported Block Editor. ([35639](https://github.com/WordPress/gutenberg/pull/35639))
 
+-   Support disabling autosave for native Unsupported Block Editor. ([35639](https://github.com/WordPress/gutenberg/pull/35639))
 
 ### Performance
 
 #### List View
-- Fix pagedown/pageup and improve scrolling. ([36063](https://github.com/WordPress/gutenberg/pull/36063))
+
+-   Fix pagedown/pageup and improve scrolling. ([36063](https://github.com/WordPress/gutenberg/pull/36063))
 
 #### Block Editor
-- Improve opening of the block inserter via manual token-based analysis of reusable blocks. ([35763](https://github.com/WordPress/gutenberg/pull/35763))
+
+-   Improve opening of the block inserter via manual token-based analysis of reusable blocks. ([35763](https://github.com/WordPress/gutenberg/pull/35763))
 
 #### Widgets Editor
-- List View: Avoid re-rendering all items on block focus. Enable persistent List View in the widget editor. ([35706](https://github.com/WordPress/gutenberg/pull/35706))
+
+-   List View: Avoid re-rendering all items on block focus. Enable persistent List View in the widget editor. ([35706](https://github.com/WordPress/gutenberg/pull/35706))
 
 #### Accessibility
-- List View: Render a fixed number of items. ([35230](https://github.com/WordPress/gutenberg/pull/35230))
 
+-   List View: Render a fixed number of items. ([35230](https://github.com/WordPress/gutenberg/pull/35230))
 
 ### Experiments
 
 #### Block Library
-- Adds in basic styling for post comment form. ([35704](https://github.com/WordPress/gutenberg/pull/35704))
-- Navigation Area block. ([36178](https://github.com/WordPress/gutenberg/pull/36178))
-- Migrate classic menus to block-based menus on theme switch. ([36255](https://github.com/WordPress/gutenberg/pull/36255))
-- Post Comments block: Hide the "Comments Closed" message. ([35743](https://github.com/WordPress/gutenberg/pull/35743))
-- Mobile responsive navigation by default. ([35917](https://github.com/WordPress/gutenberg/pull/35917))
-- Reword navigation color labels. ([35916](https://github.com/WordPress/gutenberg/pull/35916))
-- Show the placeholder again when moving from a valid menu to non-existing menu. ([36210](https://github.com/WordPress/gutenberg/pull/36210))
-- Provide a way to manage wp_navigation posts from wp-admin. ([36126](https://github.com/WordPress/gutenberg/pull/36126))
+
+-   Adds in basic styling for post comment form. ([35704](https://github.com/WordPress/gutenberg/pull/35704))
+-   Navigation Area block. ([36178](https://github.com/WordPress/gutenberg/pull/36178))
+-   Migrate classic menus to block-based menus on theme switch. ([36255](https://github.com/WordPress/gutenberg/pull/36255))
+-   Post Comments block: Hide the "Comments Closed" message. ([35743](https://github.com/WordPress/gutenberg/pull/35743))
+-   Mobile responsive navigation by default. ([35917](https://github.com/WordPress/gutenberg/pull/35917))
+-   Reword navigation color labels. ([35916](https://github.com/WordPress/gutenberg/pull/35916))
+-   Show the placeholder again when moving from a valid menu to non-existing menu. ([36210](https://github.com/WordPress/gutenberg/pull/36210))
+-   Provide a way to manage wp_navigation posts from wp-admin. ([36126](https://github.com/WordPress/gutenberg/pull/36126))
 
 #### Global Styles
-- Add a Global Styles endpoint and use it in the site editor. ([35801](https://github.com/WordPress/gutenberg/pull/35801))
-- Fix: Crash when resetting user color palette. ([36233](https://github.com/WordPress/gutenberg/pull/36233))
-- Fix: Show user colors on palette indicator. ([36232](https://github.com/WordPress/gutenberg/pull/36232))
-- Migrate theme.json v1 to v2. ([36155](https://github.com/WordPress/gutenberg/pull/36155))
-- Update: Show all color and gradient origins (core, theme, and user). ([35970](https://github.com/WordPress/gutenberg/pull/35970))
+
+-   Add a Global Styles endpoint and use it in the site editor. ([35801](https://github.com/WordPress/gutenberg/pull/35801))
+-   Fix: Crash when resetting user color palette. ([36233](https://github.com/WordPress/gutenberg/pull/36233))
+-   Fix: Show user colors on palette indicator. ([36232](https://github.com/WordPress/gutenberg/pull/36232))
+-   Migrate theme.json v1 to v2. ([36155](https://github.com/WordPress/gutenberg/pull/36155))
+-   Update: Show all color and gradient origins (core, theme, and user). ([35970](https://github.com/WordPress/gutenberg/pull/35970))
 
 #### Full Site Editing
-- Always display Customizer menu item. ([36168](https://github.com/WordPress/gutenberg/pull/36168))
-- Revert "Always display Customizer menu item". ([36189](https://github.com/WordPress/gutenberg/pull/36189))
-- Remove slug and status columns from templates list in Appearance > Templates. ([35996](https://github.com/WordPress/gutenberg/pull/35996))
+
+-   Always display Customizer menu item. ([36168](https://github.com/WordPress/gutenberg/pull/36168))
+-   Revert "Always display Customizer menu item". ([36189](https://github.com/WordPress/gutenberg/pull/36189))
+-   Remove slug and status columns from templates list in Appearance > Templates. ([35996](https://github.com/WordPress/gutenberg/pull/35996))
 
 #### REST API
-- Improve unit test coverage for REST API menus endpoints.. ([36177](https://github.com/WordPress/gutenberg/pull/36177))
+
+-   Improve unit test coverage for REST API menus endpoints.. ([36177](https://github.com/WordPress/gutenberg/pull/36177))
 
 #### Navigation Screen
-- Navigation Editor: Show a warning when trying to save unsupported blocks. ([35993](https://github.com/WordPress/gutenberg/pull/35993))
+
+-   Navigation Editor: Show a warning when trying to save unsupported blocks. ([35993](https://github.com/WordPress/gutenberg/pull/35993))
 
 #### Reusable Blocks
-- Editor: Multi-Entity Saving UI Improvements. ([35933](https://github.com/WordPress/gutenberg/pull/35933))
+
+-   Editor: Multi-Entity Saving UI Improvements. ([35933](https://github.com/WordPress/gutenberg/pull/35933))
 
 #### Components
-- Update: Implement new color palette editor component. ([35783](https://github.com/WordPress/gutenberg/pull/35783))
+
+-   Update: Implement new color palette editor component. ([35783](https://github.com/WordPress/gutenberg/pull/35783))
 
 #### Block Editor
-- Split control for URL and Text within Link UI. ([33849](https://github.com/WordPress/gutenberg/pull/33849))
 
+-   Split control for URL and Text within Link UI. ([33849](https://github.com/WordPress/gutenberg/pull/33849))
 
 ### Documentation
 
-- Add Thunks Tutorial. ([36051](https://github.com/WordPress/gutenberg/pull/36051))
-- Add a more detailed guide for react native development. ([35529](https://github.com/WordPress/gutenberg/pull/35529))
-- Add usage documentation for Rich Text package. ([35885](https://github.com/WordPress/gutenberg/pull/35885))
-- Added link to Ways to keep up with Gutenberg & Full Site Editing. ([36077](https://github.com/WordPress/gutenberg/pull/36077))
-- Blocks: Add view script to block schema and documentation. ([36175](https://github.com/WordPress/gutenberg/pull/36175))
-- Blocks: Document changes to style and editorStyle in `block.json`. ([36218](https://github.com/WordPress/gutenberg/pull/36218))
-- Docs: Add Getting Started level for documentation. ([35891](https://github.com/WordPress/gutenberg/pull/35891))
-- Docs: Add section about using the schema during development. ([35835](https://github.com/WordPress/gutenberg/pull/35835))
-- Docs: Fix Typos in widgets/overview.md. ([36078](https://github.com/WordPress/gutenberg/pull/36078))
-- Docs: Fix schema file URL. ([36157](https://github.com/WordPress/gutenberg/pull/36157))
-- Docs: Improve Getting Started landing page. ([35893](https://github.com/WordPress/gutenberg/pull/35893))
-- Docs: Theme.json - fix typo. ([36139](https://github.com/WordPress/gutenberg/pull/36139))
-- Docs: Tweak organization for getting-started documentation. ([34091](https://github.com/WordPress/gutenberg/pull/34091))
-- Docs: Update the recommendation for the cadence of npm releases. ([35925](https://github.com/WordPress/gutenberg/pull/35925))
-- Env docs: Update wordpress-develop example to clarify src/build location. ([35978](https://github.com/WordPress/gutenberg/pull/35978))
-- Fix a small typo in the "Getting started" documentation. ([36109](https://github.com/WordPress/gutenberg/pull/36109))
-- Fix wording in the Authoring Experience documentation. ([35969](https://github.com/WordPress/gutenberg/pull/35969))
-- Move create-block changelog entries back to Unreleased section. ([35886](https://github.com/WordPress/gutenberg/pull/35886))
-- Release Docs: Remove consecutive RCs warning. ([35855](https://github.com/WordPress/gutenberg/pull/35855))
-- Update Components CONTRIBUTING.md indentation. ([35866](https://github.com/WordPress/gutenberg/pull/35866))
-- fix: Backtick added around `<textarea>` input tag in readme file. ([34813](https://github.com/WordPress/gutenberg/pull/34813))
-- theme.json docs: Add missing settings & styles. ([36137](https://github.com/WordPress/gutenberg/pull/36137))
-
+-   Add Thunks Tutorial. ([36051](https://github.com/WordPress/gutenberg/pull/36051))
+-   Add a more detailed guide for react native development. ([35529](https://github.com/WordPress/gutenberg/pull/35529))
+-   Add usage documentation for Rich Text package. ([35885](https://github.com/WordPress/gutenberg/pull/35885))
+-   Added link to Ways to keep up with Gutenberg & Full Site Editing. ([36077](https://github.com/WordPress/gutenberg/pull/36077))
+-   Blocks: Add view script to block schema and documentation. ([36175](https://github.com/WordPress/gutenberg/pull/36175))
+-   Blocks: Document changes to style and editorStyle in `block.json`. ([36218](https://github.com/WordPress/gutenberg/pull/36218))
+-   Docs: Add Getting Started level for documentation. ([35891](https://github.com/WordPress/gutenberg/pull/35891))
+-   Docs: Add section about using the schema during development. ([35835](https://github.com/WordPress/gutenberg/pull/35835))
+-   Docs: Fix Typos in widgets/overview.md. ([36078](https://github.com/WordPress/gutenberg/pull/36078))
+-   Docs: Fix schema file URL. ([36157](https://github.com/WordPress/gutenberg/pull/36157))
+-   Docs: Improve Getting Started landing page. ([35893](https://github.com/WordPress/gutenberg/pull/35893))
+-   Docs: Theme.json - fix typo. ([36139](https://github.com/WordPress/gutenberg/pull/36139))
+-   Docs: Tweak organization for getting-started documentation. ([34091](https://github.com/WordPress/gutenberg/pull/34091))
+-   Docs: Update the recommendation for the cadence of npm releases. ([35925](https://github.com/WordPress/gutenberg/pull/35925))
+-   Env docs: Update wordpress-develop example to clarify src/build location. ([35978](https://github.com/WordPress/gutenberg/pull/35978))
+-   Fix a small typo in the "Getting started" documentation. ([36109](https://github.com/WordPress/gutenberg/pull/36109))
+-   Fix wording in the Authoring Experience documentation. ([35969](https://github.com/WordPress/gutenberg/pull/35969))
+-   Move create-block changelog entries back to Unreleased section. ([35886](https://github.com/WordPress/gutenberg/pull/35886))
+-   Release Docs: Remove consecutive RCs warning. ([35855](https://github.com/WordPress/gutenberg/pull/35855))
+-   Update Components CONTRIBUTING.md indentation. ([35866](https://github.com/WordPress/gutenberg/pull/35866))
+-   fix: Backtick added around `<textarea>` input tag in readme file. ([34813](https://github.com/WordPress/gutenberg/pull/34813))
+-   theme.json docs: Add missing settings & styles. ([36137](https://github.com/WordPress/gutenberg/pull/36137))
 
 ### Code Quality
 
-- Add Theme's base global styles endpoint. ([35985](https://github.com/WordPress/gutenberg/pull/35985))
-- Add alexstine as code owner for post-title. ([36056](https://github.com/WordPress/gutenberg/pull/36056))
-- Add block.json schema to generated file. ([35843](https://github.com/WordPress/gutenberg/pull/35843))
-- Add schemas package. ([35998](https://github.com/WordPress/gutenberg/pull/35998))
-- Improvements for the global styles endpoint. ([36071](https://github.com/WordPress/gutenberg/pull/36071))
-- Make sure tests are pure. ([36253](https://github.com/WordPress/gutenberg/pull/36253))
-- Move getStablePath function into the wordrpess/url package. ([35992](https://github.com/WordPress/gutenberg/pull/35992))
-- Remove "experimental" from URL details REST controller and promote to `v1` namespace. ([35915](https://github.com/WordPress/gutenberg/pull/35915))
-- Remove GB prefixed functions from template part. ([36180](https://github.com/WordPress/gutenberg/pull/36180))
-- Schemas: Theme.json - Add `title` to templateParts. ([36145](https://github.com/WordPress/gutenberg/pull/36145))
-- Updates `WP_Theme_JSON_Resolver` and tests to be equal to core. ([36223](https://github.com/WordPress/gutenberg/pull/36223))
-- Update: Use small button on tools panel toggle. ([35935](https://github.com/WordPress/gutenberg/pull/35935))
-- block-editor store: Migrate to thunks. ([35720](https://github.com/WordPress/gutenberg/pull/35720))
-- theme.json: Update test data. ([35883](https://github.com/WordPress/gutenberg/pull/35883))
+-   Add Theme's base global styles endpoint. ([35985](https://github.com/WordPress/gutenberg/pull/35985))
+-   Add alexstine as code owner for post-title. ([36056](https://github.com/WordPress/gutenberg/pull/36056))
+-   Add block.json schema to generated file. ([35843](https://github.com/WordPress/gutenberg/pull/35843))
+-   Add schemas package. ([35998](https://github.com/WordPress/gutenberg/pull/35998))
+-   Improvements for the global styles endpoint. ([36071](https://github.com/WordPress/gutenberg/pull/36071))
+-   Make sure tests are pure. ([36253](https://github.com/WordPress/gutenberg/pull/36253))
+-   Move getStablePath function into the wordrpess/url package. ([35992](https://github.com/WordPress/gutenberg/pull/35992))
+-   Remove "experimental" from URL details REST controller and promote to `v1` namespace. ([35915](https://github.com/WordPress/gutenberg/pull/35915))
+-   Remove GB prefixed functions from template part. ([36180](https://github.com/WordPress/gutenberg/pull/36180))
+-   Schemas: Theme.json - Add `title` to templateParts. ([36145](https://github.com/WordPress/gutenberg/pull/36145))
+-   Updates `WP_Theme_JSON_Resolver` and tests to be equal to core. ([36223](https://github.com/WordPress/gutenberg/pull/36223))
+-   Update: Use small button on tools panel toggle. ([35935](https://github.com/WordPress/gutenberg/pull/35935))
+-   block-editor store: Migrate to thunks. ([35720](https://github.com/WordPress/gutenberg/pull/35720))
+-   theme.json: Update test data. ([35883](https://github.com/WordPress/gutenberg/pull/35883))
 
 #### Block Library
-- Heading: Auto-generated anchors hide implementation details. ([35747](https://github.com/WordPress/gutenberg/pull/35747))
-- Mark Post Comments as stable and Comments Query Loop as experimental. ([36132](https://github.com/WordPress/gutenberg/pull/36132))
-- Mark Post Navigation Link and Term Description blocks as stable. ([36163](https://github.com/WordPress/gutenberg/pull/36163))
-- Remove `post-` prefix from Comment Template inner blocks. ([36171](https://github.com/WordPress/gutenberg/pull/36171))
+
+-   Heading: Auto-generated anchors hide implementation details. ([35747](https://github.com/WordPress/gutenberg/pull/35747))
+-   Mark Post Comments as stable and Comments Query Loop as experimental. ([36132](https://github.com/WordPress/gutenberg/pull/36132))
+-   Mark Post Navigation Link and Term Description blocks as stable. ([36163](https://github.com/WordPress/gutenberg/pull/36163))
+-   Remove `post-` prefix from Comment Template inner blocks. ([36171](https://github.com/WordPress/gutenberg/pull/36171))
 
 #### Global Styles
-- Refactor theme.json migrations to be a single class. ([36182](https://github.com/WordPress/gutenberg/pull/36182))
-- Remove locations we do not translate from `theme-i18n.json`. ([35881](https://github.com/WordPress/gutenberg/pull/35881))
-- Update `theme.json` schema migrations. ([36154](https://github.com/WordPress/gutenberg/pull/36154))
+
+-   Refactor theme.json migrations to be a single class. ([36182](https://github.com/WordPress/gutenberg/pull/36182))
+-   Remove locations we do not translate from `theme-i18n.json`. ([35881](https://github.com/WordPress/gutenberg/pull/35881))
+-   Update `theme.json` schema migrations. ([36154](https://github.com/WordPress/gutenberg/pull/36154))
 
 #### Post Editor
-- Refactor FlatTermSelector into a functional component. ([33459](https://github.com/WordPress/gutenberg/pull/33459))
-- Typo: Translated site properties. ([36097](https://github.com/WordPress/gutenberg/pull/36097))
+
+-   Refactor FlatTermSelector into a functional component. ([33459](https://github.com/WordPress/gutenberg/pull/33459))
+-   Typo: Translated site properties. ([36097](https://github.com/WordPress/gutenberg/pull/36097))
 
 #### Components
-- ToolsPanel: Use Grid component to handle layout. ([35621](https://github.com/WordPress/gutenberg/pull/35621))
-- Update spacing in CircularOptionPicker. ([36014](https://github.com/WordPress/gutenberg/pull/36014))
+
+-   ToolsPanel: Use Grid component to handle layout. ([35621](https://github.com/WordPress/gutenberg/pull/35621))
+-   Update spacing in CircularOptionPicker. ([36014](https://github.com/WordPress/gutenberg/pull/36014))
 
 #### Data Layer
-- [data]: Rename types file from .d.ts to .ts. ([36062](https://github.com/WordPress/gutenberg/pull/36062))
+
+-   [data]: Rename types file from .d.ts to .ts. ([36062](https://github.com/WordPress/gutenberg/pull/36062))
 
 #### CSS & Styling
-- Remove invalid buttons block CSS property. ([33793](https://github.com/WordPress/gutenberg/pull/33793))
 
+-   Remove invalid buttons block CSS property. ([33793](https://github.com/WordPress/gutenberg/pull/33793))
 
 ### Tools
 
-- Remove @chrisvanpatten from CODEOWNERS. ([35937](https://github.com/WordPress/gutenberg/pull/35937))
+-   Remove @chrisvanpatten from CODEOWNERS. ([35937](https://github.com/WordPress/gutenberg/pull/35937))
 
 #### Testing
-- Add a method to disable auto-accepting dialogs. ([35828](https://github.com/WordPress/gutenberg/pull/35828))
-- Skip broken widgets test. ([36239](https://github.com/WordPress/gutenberg/pull/36239))
-- Skip flaky test for loading block stylesheets in iframe. ([35961](https://github.com/WordPress/gutenberg/pull/35961))
-- Tests: Run block fixtures through KSES. ([35611](https://github.com/WordPress/gutenberg/pull/35611))
+
+-   Add a method to disable auto-accepting dialogs. ([35828](https://github.com/WordPress/gutenberg/pull/35828))
+-   Skip broken widgets test. ([36239](https://github.com/WordPress/gutenberg/pull/36239))
+-   Skip flaky test for loading block stylesheets in iframe. ([35961](https://github.com/WordPress/gutenberg/pull/35961))
+-   Tests: Run block fixtures through KSES. ([35611](https://github.com/WordPress/gutenberg/pull/35611))
 
 #### Block Library
-- Mark FSE blocks as non experimental. ([35979](https://github.com/WordPress/gutenberg/pull/35979))
 
+-   Mark FSE blocks as non experimental. ([35979](https://github.com/WordPress/gutenberg/pull/35979))
 
 ### Various
 
-- Apply borders to canvas rather than other UI elements. ([31081](https://github.com/WordPress/gutenberg/pull/31081))
-- Changes for FSE backport in core. ([36201](https://github.com/WordPress/gutenberg/pull/36201))
-- Mobile - Add support for the Mark HTML tag and updates Aztec iOS to 1.19.5. ([35956](https://github.com/WordPress/gutenberg/pull/35956))
-- Update Appium to 1.22.0. ([35829](https://github.com/WordPress/gutenberg/pull/35829))
-- Updates publish-to-s3 plugin to 0.7.0 for react-native-bridge & react-native-aztec Android and publishes '-sources.jar'. ([36034](https://github.com/WordPress/gutenberg/pull/36034))
-- Use the block name in the "remove block" menu item in the settings dropdown. ([35872](https://github.com/WordPress/gutenberg/pull/35872))
+-   Apply borders to canvas rather than other UI elements. ([31081](https://github.com/WordPress/gutenberg/pull/31081))
+-   Changes for FSE backport in core. ([36201](https://github.com/WordPress/gutenberg/pull/36201))
+-   Mobile - Add support for the Mark HTML tag and updates Aztec iOS to 1.19.5. ([35956](https://github.com/WordPress/gutenberg/pull/35956))
+-   Update Appium to 1.22.0. ([35829](https://github.com/WordPress/gutenberg/pull/35829))
+-   Updates publish-to-s3 plugin to 0.7.0 for react-native-bridge & react-native-aztec Android and publishes '-sources.jar'. ([36034](https://github.com/WordPress/gutenberg/pull/36034))
+-   Use the block name in the "remove block" menu item in the settings dropdown. ([35872](https://github.com/WordPress/gutenberg/pull/35872))
 
 #### Site Editor
-- Remove navigation panel in site editor. ([36194](https://github.com/WordPress/gutenberg/pull/36194))
 
+-   Remove navigation panel in site editor. ([36194](https://github.com/WordPress/gutenberg/pull/36194))
 
 = 11.8.0 =
 
+## Changelog
+
 ### Enhancements
 
 #### Block Library
-- Add spacing controls to all heading blocks. ([35772](https://github.com/WordPress/gutenberg/pull/35772))
-- Enable slash inserter for heading, list, and quote. ([35360](https://github.com/WordPress/gutenberg/pull/35360))
-- Unify theme block placeholder content. ([35517](https://github.com/WordPress/gutenberg/pull/35517))
-- Buttons: Add gap and vertical margin support. ([34546](https://github.com/WordPress/gutenberg/pull/34546))
-- Categories: Add support for showing only top-level categories. ([35726](https://github.com/WordPress/gutenberg/pull/35726))
-- Column: Allow the specification of blocks allowed within columns. ([35342](https://github.com/WordPress/gutenberg/pull/35342))
-- Comment Content Block: Add typography, color and padding support. ([35183](https://github.com/WordPress/gutenberg/pull/35183))
-- Cover: Add allowedBlocks and TemplateLock attributes in Cover Block. ([31326](https://github.com/WordPress/gutenberg/pull/31326))
-- Cover: Add option to set opacity when background colour used. ([35065](https://github.com/WordPress/gutenberg/pull/35065))
-- Cover: Allow setting the height from the placeholder state. ([35068](https://github.com/WordPress/gutenberg/pull/35068))
-- Cover: Change dimRatio to 50 if media added and dimRatio is set to 100. ([35789](https://github.com/WordPress/gutenberg/pull/35789))
-- Cover: Only use white text when the background of the cover block is dark. ([33541](https://github.com/WordPress/gutenberg/pull/33541))
-- Cover: Use the description in the placeholder. ([34970](https://github.com/WordPress/gutenberg/pull/34970))
-- Embed: Add Pinterest as an embed provider. ([34895](https://github.com/WordPress/gutenberg/pull/34895))
-- Feature Image: Add spacing controls to the featured image block. ([35775](https://github.com/WordPress/gutenberg/pull/35775))
-- Featured image and Image: Remove descendent space. ([35466](https://github.com/WordPress/gutenberg/pull/35466))
-- Gallery Block: Get media data in a single request. ([34389](https://github.com/WordPress/gutenberg/pull/34389))
-- Heading: Autogenerate heading anchors. ([30825](https://github.com/WordPress/gutenberg/pull/30825))
-- Quote: Update deprecation to expect style block supports. ([35615](https://github.com/WordPress/gutenberg/pull/35615))
-- Page List: Show empty placeholder if no items. ([35441](https://github.com/WordPress/gutenberg/pull/35441))
-- Post Date: Add more typography options. ([35422](https://github.com/WordPress/gutenberg/pull/35422))
-- Post Comment Author: Add link settings and block supports. ([35595](https://github.com/WordPress/gutenberg/pull/35595))
-- Post Comment Date: Add link setting and block supports. ([35112](https://github.com/WordPress/gutenberg/pull/35112))
-- Quote: Added a "plain" style for quote blocks. ([29856](https://github.com/WordPress/gutenberg/pull/29856))
-- Search: Enable inheritance in search block. ([35723](https://github.com/WordPress/gutenberg/pull/35723))
-- Site Logo: Add a basic example to the site logo block. ([35588](https://github.com/WordPress/gutenberg/pull/35588))
-- Site Logo: Move the Reset button to the Replace menu dropdown. ([35372](https://github.com/WordPress/gutenberg/pull/35372))
-- Site Logo: placeholder tweaks. ([35397](https://github.com/WordPress/gutenberg/pull/35397))
-- Site Tagline: Add fontStyle control to Site Tagline block. ([35507](https://github.com/WordPress/gutenberg/pull/35507))
-- Site Tagline: Add wide + full support to the site tagline block. ([35589](https://github.com/WordPress/gutenberg/pull/35589))
-- Site Title: Add basic example to site-title block. ([35590](https://github.com/WordPress/gutenberg/pull/35590))
-- Site Logo: Remove "Reset" button icon. ([35434](https://github.com/WordPress/gutenberg/pull/35434))
-- Social Icons: Add top and bottom margin support. ([35374](https://github.com/WordPress/gutenberg/pull/35374))
-- Social Links: Polish logos only style. ([35586](https://github.com/WordPress/gutenberg/pull/35586))
+
+-   Add spacing controls to all heading blocks. ([35772](https://github.com/WordPress/gutenberg/pull/35772))
+-   Enable slash inserter for heading, list, and quote. ([35360](https://github.com/WordPress/gutenberg/pull/35360))
+-   Unify theme block placeholder content. ([35517](https://github.com/WordPress/gutenberg/pull/35517))
+-   Buttons: Add gap and vertical margin support. ([34546](https://github.com/WordPress/gutenberg/pull/34546))
+-   Categories: Add support for showing only top-level categories. ([35726](https://github.com/WordPress/gutenberg/pull/35726))
+-   Column: Allow the specification of blocks allowed within columns. ([35342](https://github.com/WordPress/gutenberg/pull/35342))
+-   Comment Content Block: Add typography, color and padding support. ([35183](https://github.com/WordPress/gutenberg/pull/35183))
+-   Cover: Add allowedBlocks and TemplateLock attributes in Cover Block. ([31326](https://github.com/WordPress/gutenberg/pull/31326))
+-   Cover: Add option to set opacity when background colour used. ([35065](https://github.com/WordPress/gutenberg/pull/35065))
+-   Cover: Allow setting the height from the placeholder state. ([35068](https://github.com/WordPress/gutenberg/pull/35068))
+-   Cover: Change dimRatio to 50 if media added and dimRatio is set to 100. ([35789](https://github.com/WordPress/gutenberg/pull/35789))
+-   Cover: Only use white text when the background of the cover block is dark. ([33541](https://github.com/WordPress/gutenberg/pull/33541))
+-   Cover: Use the description in the placeholder. ([34970](https://github.com/WordPress/gutenberg/pull/34970))
+-   Embed: Add Pinterest as an embed provider. ([34895](https://github.com/WordPress/gutenberg/pull/34895))
+-   Feature Image: Add spacing controls to the featured image block. ([35775](https://github.com/WordPress/gutenberg/pull/35775))
+-   Featured image and Image: Remove descendent space. ([35466](https://github.com/WordPress/gutenberg/pull/35466))
+-   Gallery Block: Get media data in a single request. ([34389](https://github.com/WordPress/gutenberg/pull/34389))
+-   Heading: Autogenerate heading anchors. ([30825](https://github.com/WordPress/gutenberg/pull/30825))
+-   Quote: Update deprecation to expect style block supports. ([35615](https://github.com/WordPress/gutenberg/pull/35615))
+-   Page List: Show empty placeholder if no items. ([35441](https://github.com/WordPress/gutenberg/pull/35441))
+-   Post Date: Add more typography options. ([35422](https://github.com/WordPress/gutenberg/pull/35422))
+-   Post Comment Author: Add link settings and block supports. ([35595](https://github.com/WordPress/gutenberg/pull/35595))
+-   Post Comment Date: Add link setting and block supports. ([35112](https://github.com/WordPress/gutenberg/pull/35112))
+-   Quote: Added a "plain" style for quote blocks. ([29856](https://github.com/WordPress/gutenberg/pull/29856))
+-   Search: Enable inheritance in search block. ([35723](https://github.com/WordPress/gutenberg/pull/35723))
+-   Site Logo: Add a basic example to the site logo block. ([35588](https://github.com/WordPress/gutenberg/pull/35588))
+-   Site Logo: Move the Reset button to the Replace menu dropdown. ([35372](https://github.com/WordPress/gutenberg/pull/35372))
+-   Site Logo: placeholder tweaks. ([35397](https://github.com/WordPress/gutenberg/pull/35397))
+-   Site Tagline: Add fontStyle control to Site Tagline block. ([35507](https://github.com/WordPress/gutenberg/pull/35507))
+-   Site Tagline: Add wide + full support to the site tagline block. ([35589](https://github.com/WordPress/gutenberg/pull/35589))
+-   Site Title: Add basic example to site-title block. ([35590](https://github.com/WordPress/gutenberg/pull/35590))
+-   Site Logo: Remove "Reset" button icon. ([35434](https://github.com/WordPress/gutenberg/pull/35434))
+-   Social Icons: Add top and bottom margin support. ([35374](https://github.com/WordPress/gutenberg/pull/35374))
+-   Social Links: Polish logos only style. ([35586](https://github.com/WordPress/gutenberg/pull/35586))
 
 #### Design Tools
-- ToolsPanel: Switch to plus icon when no controls present in panel body. ([34107](https://github.com/WordPress/gutenberg/pull/34107))
-- Block Supports: Add panel specific className. ([35793](https://github.com/WordPress/gutenberg/pull/35793))
-- Block Supports: Switch dimensions inspector controls slot to bubble virtually. ([34725](https://github.com/WordPress/gutenberg/pull/34725))
-- Inspector Controls: Resort the order of the design tools associated with styles hooks. ([35574](https://github.com/WordPress/gutenberg/pull/35574))
+
+-   ToolsPanel: Switch to plus icon when no controls present in panel body. ([34107](https://github.com/WordPress/gutenberg/pull/34107))
+-   Block Supports: Add panel specific className. ([35793](https://github.com/WordPress/gutenberg/pull/35793))
+-   Block Supports: Switch dimensions inspector controls slot to bubble virtually. ([34725](https://github.com/WordPress/gutenberg/pull/34725))
+-   Inspector Controls: Resort the order of the design tools associated with styles hooks. ([35574](https://github.com/WordPress/gutenberg/pull/35574))
 
 #### Global Styles
-- Allow users to store duotone data. ([35318](https://github.com/WordPress/gutenberg/pull/35318))
-- Allow child theme.json to be merged with parent theme.json. ([35459](https://github.com/WordPress/gutenberg/pull/35459))
-- Extract the three color panels to their own global styles view. ([35400](https://github.com/WordPress/gutenberg/pull/35400))
-- Font family: Switch from CSS Custom Property to classes. ([31910](https://github.com/WordPress/gutenberg/pull/31910))
-- Move the global styles reset action to a dropdown menu. ([35559](https://github.com/WordPress/gutenberg/pull/35559))
-- Update descriptions for the different screens under global styles. ([35429](https://github.com/WordPress/gutenberg/pull/35429))
-- Update the global styles sidebar's root view to use Card components. ([35547](https://github.com/WordPress/gutenberg/pull/35547))
-- Use text color to render the Aa preview in global styles. ([35631](https://github.com/WordPress/gutenberg/pull/35631))
+
+-   Allow users to store duotone data. ([35318](https://github.com/WordPress/gutenberg/pull/35318))
+-   Allow child theme.json to be merged with parent theme.json. ([35459](https://github.com/WordPress/gutenberg/pull/35459))
+-   Extract the three color panels to their own global styles view. ([35400](https://github.com/WordPress/gutenberg/pull/35400))
+-   Font family: Switch from CSS Custom Property to classes. ([31910](https://github.com/WordPress/gutenberg/pull/31910))
+-   Move the global styles reset action to a dropdown menu. ([35559](https://github.com/WordPress/gutenberg/pull/35559))
+-   Update descriptions for the different screens under global styles. ([35429](https://github.com/WordPress/gutenberg/pull/35429))
+-   Update the global styles sidebar's root view to use Card components. ([35547](https://github.com/WordPress/gutenberg/pull/35547))
+-   Use text color to render the Aa preview in global styles. ([35631](https://github.com/WordPress/gutenberg/pull/35631))
 
 #### Theming
-- Add [data-block] to appender. ([35356](https://github.com/WordPress/gutenberg/pull/35356))
-- Enable theme supports automatically for FSE theme. ([35593](https://github.com/WordPress/gutenberg/pull/35593))
-- Remove default padding/margin on the body of the page and editor canvas. ([35421](https://github.com/WordPress/gutenberg/pull/35421))
-- Support title in templateParts. ([35626](https://github.com/WordPress/gutenberg/pull/35626))
-- CSS: Add a reset for image heights. ([30092](https://github.com/WordPress/gutenberg/pull/30092))
+
+-   Add [data-block] to appender. ([35356](https://github.com/WordPress/gutenberg/pull/35356))
+-   Enable theme supports automatically for FSE theme. ([35593](https://github.com/WordPress/gutenberg/pull/35593))
+-   Remove default padding/margin on the body of the page and editor canvas. ([35421](https://github.com/WordPress/gutenberg/pull/35421))
+-   Support title in templateParts. ([35626](https://github.com/WordPress/gutenberg/pull/35626))
+-   CSS: Add a reset for image heights. ([30092](https://github.com/WordPress/gutenberg/pull/30092))
 
 #### Patterns
-- Increase number of items per page for default Query Loop Block. ([35603](https://github.com/WordPress/gutenberg/pull/35603))
-- Featured patterns from pattern directory. ([35115](https://github.com/WordPress/gutenberg/pull/35115))
+
+-   Increase number of items per page for default Query Loop Block. ([35603](https://github.com/WordPress/gutenberg/pull/35603))
+-   Featured patterns from pattern directory. ([35115](https://github.com/WordPress/gutenberg/pull/35115))
 
 #### Block Editor
-- Add animations for insertion point, dropzone, and other elements. ([33132](https://github.com/WordPress/gutenberg/pull/33132))
-- Adjust Link UI visual styling. ([35414](https://github.com/WordPress/gutenberg/pull/35414))
-- Add some top margin. ([35717](https://github.com/WordPress/gutenberg/pull/35717))
-- Show ellipsis menu in the List View. ([35170](https://github.com/WordPress/gutenberg/pull/35170))
+
+-   Add animations for insertion point, dropzone, and other elements. ([33132](https://github.com/WordPress/gutenberg/pull/33132))
+-   Adjust Link UI visual styling. ([35414](https://github.com/WordPress/gutenberg/pull/35414))
+-   Add some top margin. ([35717](https://github.com/WordPress/gutenberg/pull/35717))
+-   Show ellipsis menu in the List View. ([35170](https://github.com/WordPress/gutenberg/pull/35170))
 
 #### Template Editor
-- Add more options to template areas in template details. ([35577](https://github.com/WordPress/gutenberg/pull/35577))
-- Add template areas to template inspector. ([35239](https://github.com/WordPress/gutenberg/pull/35239))
-- Add template details to template parts. ([35444](https://github.com/WordPress/gutenberg/pull/35444))
-- Align the layout of the template card with the block card. ([35391](https://github.com/WordPress/gutenberg/pull/35391))
-- Update site editor block placeholder styling. ([35513](https://github.com/WordPress/gutenberg/pull/35513))
-- Use a dark background for the site editor. ([35520](https://github.com/WordPress/gutenberg/pull/35520))
-
-#### Components
-- Add shortcut provider. ([35652](https://github.com/WordPress/gutenberg/pull/35652))
-- Iterate on the design of the colors and gradients panel. ([35535](https://github.com/WordPress/gutenberg/pull/35535))
-- Navigator: Update `Navigator` styling to facilitate sticky positioning. ([35518](https://github.com/WordPress/gutenberg/pull/35518))
-- Repositioned RangeControl tooltip and adjusted image zoom control dropdown height. ([27374](https://github.com/WordPress/gutenberg/pull/27374))
-- Remove segmented control vertical separators. ([35497](https://github.com/WordPress/gutenberg/pull/35497))
-- Storybook: Add RTL switcher to toolbar. ([35711](https://github.com/WordPress/gutenberg/pull/35711))
-- Storybook: Add story for TypographyPanel. ([35293](https://github.com/WordPress/gutenberg/pull/35293))
-- Storybook: Enable Controls and disable Knobs by default. ([35682](https://github.com/WordPress/gutenberg/pull/35682))
-- Storybook: Remove outdated decorator configuration. ([35678](https://github.com/WordPress/gutenberg/pull/35678))
-- Support "any" step in NumberControl and RangeControl. ([34542](https://github.com/WordPress/gutenberg/pull/34542))
-- ToggleGroupControl: Allow custom aria-label. ([35423](https://github.com/WordPress/gutenberg/pull/35423))
-- Update range control metrics. ([35540](https://github.com/WordPress/gutenberg/pull/35540))
-- Update FontSize control. ([35395](https://github.com/WordPress/gutenberg/pull/35395))
+
+-   Add more options to template areas in template details. ([35577](https://github.com/WordPress/gutenberg/pull/35577))
+-   Add template areas to template inspector. ([35239](https://github.com/WordPress/gutenberg/pull/35239))
+-   Add template details to template parts. ([35444](https://github.com/WordPress/gutenberg/pull/35444))
+-   Align the layout of the template card with the block card. ([35391](https://github.com/WordPress/gutenberg/pull/35391))
+-   Update site editor block placeholder styling. ([35513](https://github.com/WordPress/gutenberg/pull/35513))
+-   Use a dark background for the site editor. ([35520](https://github.com/WordPress/gutenberg/pull/35520))
+
+#### Components
+
+-   Add shortcut provider. ([35652](https://github.com/WordPress/gutenberg/pull/35652))
+-   Iterate on the design of the colors and gradients panel. ([35535](https://github.com/WordPress/gutenberg/pull/35535))
+-   Navigator: Update `Navigator` styling to facilitate sticky positioning. ([35518](https://github.com/WordPress/gutenberg/pull/35518))
+-   Repositioned RangeControl tooltip and adjusted image zoom control dropdown height. ([27374](https://github.com/WordPress/gutenberg/pull/27374))
+-   Remove segmented control vertical separators. ([35497](https://github.com/WordPress/gutenberg/pull/35497))
+-   Storybook: Add RTL switcher to toolbar. ([35711](https://github.com/WordPress/gutenberg/pull/35711))
+-   Storybook: Add story for TypographyPanel. ([35293](https://github.com/WordPress/gutenberg/pull/35293))
+-   Storybook: Enable Controls and disable Knobs by default. ([35682](https://github.com/WordPress/gutenberg/pull/35682))
+-   Storybook: Remove outdated decorator configuration. ([35678](https://github.com/WordPress/gutenberg/pull/35678))
+-   Support "any" step in NumberControl and RangeControl. ([34542](https://github.com/WordPress/gutenberg/pull/34542))
+-   ToggleGroupControl: Allow custom aria-label. ([35423](https://github.com/WordPress/gutenberg/pull/35423))
+-   Update range control metrics. ([35540](https://github.com/WordPress/gutenberg/pull/35540))
+-   Update FontSize control. ([35395](https://github.com/WordPress/gutenberg/pull/35395))
 
 #### Packages
-- Create Block: Add PascalCase slug to create-block template strings. ([35462](https://github.com/WordPress/gutenberg/pull/35462))
-- Create Block: Allow local directories to be passed to --template as relative paths. ([35645](https://github.com/WordPress/gutenberg/pull/35645))
-- Test Setup: Add more-complete mocks of common timer functions. ([35368](https://github.com/WordPress/gutenberg/pull/35368))
-- Scripts: Allow customization of the ARTIFACTS_PATH via WP_ARTIFACTS_PATH env var. ([35371](https://github.com/WordPress/gutenberg/pull/35371))
 
+-   Create Block: Add PascalCase slug to create-block template strings. ([35462](https://github.com/WordPress/gutenberg/pull/35462))
+-   Create Block: Allow local directories to be passed to --template as relative paths. ([35645](https://github.com/WordPress/gutenberg/pull/35645))
+-   Test Setup: Add more-complete mocks of common timer functions. ([35368](https://github.com/WordPress/gutenberg/pull/35368))
+-   Scripts: Allow customization of the ARTIFACTS_PATH via WP_ARTIFACTS_PATH env var. ([35371](https://github.com/WordPress/gutenberg/pull/35371))
 
 ### Accessibility
-- Rich text popovers: Move to block tools to fix tab order. ([34956](https://github.com/WordPress/gutenberg/pull/34956))
-- Save button: Prevent focus loss. ([34731](https://github.com/WordPress/gutenberg/pull/34731))
+
+-   Rich text popovers: Move to block tools to fix tab order. ([34956](https://github.com/WordPress/gutenberg/pull/34956))
+-   Save button: Prevent focus loss. ([34731](https://github.com/WordPress/gutenberg/pull/34731))
 
 ### Performance
 
 #### Global Styles
-- Pass only the data the site editor uses. ([35458](https://github.com/WordPress/gutenberg/pull/35458))
-- Use a context provider for global styles configuration. ([35622](https://github.com/WordPress/gutenberg/pull/35622))
+
+-   Pass only the data the site editor uses. ([35458](https://github.com/WordPress/gutenberg/pull/35458))
+-   Use a context provider for global styles configuration. ([35622](https://github.com/WordPress/gutenberg/pull/35622))
 
 ### Bug Fixes
 
 #### Block Library
-- Block Settings: Don't render 'Move to' if the block cannot be moved. ([35463](https://github.com/WordPress/gutenberg/pull/35463))
-- Cover: Update placeholder minHeight style to support non-px units. ([35614](https://github.com/WordPress/gutenberg/pull/35614))
-- Cover: Update 'templateLock' attribute. ([35671](https://github.com/WordPress/gutenberg/pull/35671))
-- Featured Image: Center placeholder chip contents. ([35417](https://github.com/WordPress/gutenberg/pull/35417))
-- Heading: Fix undo/redo "trap". ([35767](https://github.com/WordPress/gutenberg/pull/35767))
-- Heading: Remove anchor map when block unmounts. ([35761](https://github.com/WordPress/gutenberg/pull/35761))
-- Site Logo: Fix site logo block on dark backgrounds. ([35718](https://github.com/WordPress/gutenberg/pull/35718))
+
+-   Block Settings: Don't render 'Move to' if the block cannot be moved. ([35463](https://github.com/WordPress/gutenberg/pull/35463))
+-   Cover: Update placeholder minHeight style to support non-px units. ([35614](https://github.com/WordPress/gutenberg/pull/35614))
+-   Cover: Update 'templateLock' attribute. ([35671](https://github.com/WordPress/gutenberg/pull/35671))
+-   Featured Image: Center placeholder chip contents. ([35417](https://github.com/WordPress/gutenberg/pull/35417))
+-   Heading: Fix undo/redo "trap". ([35767](https://github.com/WordPress/gutenberg/pull/35767))
+-   Heading: Remove anchor map when block unmounts. ([35761](https://github.com/WordPress/gutenberg/pull/35761))
+-   Site Logo: Fix site logo block on dark backgrounds. ([35718](https://github.com/WordPress/gutenberg/pull/35718))
 
 #### i18n
-- Fix HelpHub link i18n for page-jumps. ([35404](https://github.com/WordPress/gutenberg/pull/35404))
-- Fix template part block untranslated strings. ([35715](https://github.com/WordPress/gutenberg/pull/35715))
-- Translation note for Home/end to avoid mistranslations. ([35669](https://github.com/WordPress/gutenberg/pull/35669))
+
+-   Fix HelpHub link i18n for page-jumps. ([35404](https://github.com/WordPress/gutenberg/pull/35404))
+-   Fix template part block untranslated strings. ([35715](https://github.com/WordPress/gutenberg/pull/35715))
+-   Translation note for Home/end to avoid mistranslations. ([35669](https://github.com/WordPress/gutenberg/pull/35669))
 
 #### Packages
-- Server Site Render: Prevent empty renders in ServerSideRender component caused by changing props while already fetching markup. ([35433](https://github.com/WordPress/gutenberg/pull/35433))
-- Rich text: formats: allow format to filter value when changing tag name ([35516](https://github.com/WordPress/gutenberg/pull/35516/files))
+
+-   Server Site Render: Prevent empty renders in ServerSideRender component caused by changing props while already fetching markup. ([35433](https://github.com/WordPress/gutenberg/pull/35433))
+-   Rich text: formats: allow format to filter value when changing tag name ([35516](https://github.com/WordPress/gutenberg/pull/35516/files))
 
 #### Components
-- Color Picker: Fix some issues on the color picker component; Remove tinycolor2;. ([35562](https://github.com/WordPress/gutenberg/pull/35562))
-- Navigator: Hide horizontal overflow in `Navigator`. ([35332](https://github.com/WordPress/gutenberg/pull/35332))
-- Popover: Fix __unstableBoundaryParent. ([35082](https://github.com/WordPress/gutenberg/pull/35082))
-- RawHTML component: Allow multiple children. ([35532](https://github.com/WordPress/gutenberg/pull/35532))
-- Rich text: Fix internal paste across multiline and single line instances. ([35416](https://github.com/WordPress/gutenberg/pull/35416))
-- Toggle Group Control: Fix visual state when no option is selected. ([35545](https://github.com/WordPress/gutenberg/pull/35545))
-- Toggle Group Control: Fixed condition to show separator correctly. ([35409](https://github.com/WordPress/gutenberg/pull/35409))
-- Toogle Group Control: Fix `ToggleGroupControlOption` not passing `ref` to the underlying element. ([35546](https://github.com/WordPress/gutenberg/pull/35546))
-- Tooltip: For Tooltips, prevent emitting events to child elements if they are disabled. ([35254](https://github.com/WordPress/gutenberg/pull/35254))
-- Tooltip: Remove extra comma character from Tooltip when underlying component is disabled. ([35247](https://github.com/WordPress/gutenberg/pull/35247))
+
+-   Color Picker: Fix some issues on the color picker component; Remove tinycolor2;. ([35562](https://github.com/WordPress/gutenberg/pull/35562))
+-   Navigator: Hide horizontal overflow in `Navigator`. ([35332](https://github.com/WordPress/gutenberg/pull/35332))
+-   Popover: Fix \_\_unstableBoundaryParent. ([35082](https://github.com/WordPress/gutenberg/pull/35082))
+-   RawHTML component: Allow multiple children. ([35532](https://github.com/WordPress/gutenberg/pull/35532))
+-   Rich text: Fix internal paste across multiline and single line instances. ([35416](https://github.com/WordPress/gutenberg/pull/35416))
+-   Toggle Group Control: Fix visual state when no option is selected. ([35545](https://github.com/WordPress/gutenberg/pull/35545))
+-   Toggle Group Control: Fixed condition to show separator correctly. ([35409](https://github.com/WordPress/gutenberg/pull/35409))
+-   Toogle Group Control: Fix `ToggleGroupControlOption` not passing `ref` to the underlying element. ([35546](https://github.com/WordPress/gutenberg/pull/35546))
+-   Tooltip: For Tooltips, prevent emitting events to child elements if they are disabled. ([35254](https://github.com/WordPress/gutenberg/pull/35254))
+-   Tooltip: Remove extra comma character from Tooltip when underlying component is disabled. ([35247](https://github.com/WordPress/gutenberg/pull/35247))
 
 #### Themes
-- Custom Templates: Use "title" from the theme.json. ([35592](https://github.com/WordPress/gutenberg/pull/35592))
-- Elements block support: Fix link color rendering on site front end. ([35446](https://github.com/WordPress/gutenberg/pull/35446))
-- Move the link color styles to the footer. ([35425](https://github.com/WordPress/gutenberg/pull/35425))
-- Reset margin for all children of flow layouts. ([35426](https://github.com/WordPress/gutenberg/pull/35426))
+
+-   Custom Templates: Use "title" from the theme.json. ([35592](https://github.com/WordPress/gutenberg/pull/35592))
+-   Elements block support: Fix link color rendering on site front end. ([35446](https://github.com/WordPress/gutenberg/pull/35446))
+-   Move the link color styles to the footer. ([35425](https://github.com/WordPress/gutenberg/pull/35425))
+-   Reset margin for all children of flow layouts. ([35426](https://github.com/WordPress/gutenberg/pull/35426))
 
 #### Template Editor
-- Use slug as template parts area item key. ([35796](https://github.com/WordPress/gutenberg/pull/35796))
-- Fix missing titles in general areas. ([35657](https://github.com/WordPress/gutenberg/pull/35657))
+
+-   Use slug as template parts area item key. ([35796](https://github.com/WordPress/gutenberg/pull/35796))
+-   Fix missing titles in general areas. ([35657](https://github.com/WordPress/gutenberg/pull/35657))
 
 #### Block API
-- Blocks: Apply the most recent filters to previously registered blocks. ([34299](https://github.com/WordPress/gutenberg/pull/34299))
-- Fix class serialization of font size and colors in dynamic blocks that use block supports. ([35751](https://github.com/WordPress/gutenberg/pull/35751))
+
+-   Blocks: Apply the most recent filters to previously registered blocks. ([34299](https://github.com/WordPress/gutenberg/pull/34299))
+-   Fix class serialization of font size and colors in dynamic blocks that use block supports. ([35751](https://github.com/WordPress/gutenberg/pull/35751))
 
 #### Design Tools
-- Border Radius Control: Fix undefined value on first click into RangeControl. ([35651](https://github.com/WordPress/gutenberg/pull/35651))
+
+-   Border Radius Control: Fix undefined value on first click into RangeControl. ([35651](https://github.com/WordPress/gutenberg/pull/35651))
 
 #### Block Editor
-- Fix updating the block list after block removal. ([35721](https://github.com/WordPress/gutenberg/pull/35721))
-- Fix sibling inserter animation. ([35729](https://github.com/WordPress/gutenberg/pull/35729))
-- Inserter: Fix gap between Search and Tabs. ([35537](https://github.com/WordPress/gutenberg/pull/35537))
-- Saving post: Transparent disabled button. ([35542](https://github.com/WordPress/gutenberg/pull/35542))
-- FSE: Coding standards: DOCTYPE should be the first line/character of any HTML document. ([35442](https://github.com/WordPress/gutenberg/pull/35442))
-- [Block Editor]: Fix displaying only the none alignment option ([35822](https://github.com/WordPress/gutenberg/pull/35822))
+
+-   Fix updating the block list after block removal. ([35721](https://github.com/WordPress/gutenberg/pull/35721))
+-   Fix sibling inserter animation. ([35729](https://github.com/WordPress/gutenberg/pull/35729))
+-   Inserter: Fix gap between Search and Tabs. ([35537](https://github.com/WordPress/gutenberg/pull/35537))
+-   Saving post: Transparent disabled button. ([35542](https://github.com/WordPress/gutenberg/pull/35542))
+-   FSE: Coding standards: DOCTYPE should be the first line/character of any HTML document. ([35442](https://github.com/WordPress/gutenberg/pull/35442))
+-   [Block Editor]: Fix displaying only the none alignment option ([35822](https://github.com/WordPress/gutenberg/pull/35822))
 
 #### REST API
-- Fix preloading middleware referencing stale data for OPTIONS requests. ([35527](https://github.com/WordPress/gutenberg/pull/35527))
+
+-   Fix preloading middleware referencing stale data for OPTIONS requests. ([35527](https://github.com/WordPress/gutenberg/pull/35527))
 
 #### List View
-- Fix expand and collapse when the icon is clicked. ([35526](https://github.com/WordPress/gutenberg/pull/35526))
+
+-   Fix expand and collapse when the icon is clicked. ([35526](https://github.com/WordPress/gutenberg/pull/35526))
 
 #### Global Styles
-- Fix presets that use a callback to validate user data. ([35255](https://github.com/WordPress/gutenberg/pull/35255))
+
+-   Fix presets that use a callback to validate user data. ([35255](https://github.com/WordPress/gutenberg/pull/35255))
 
 #### CSS & Styling
-- Remove font size classes that are enqueued in the global stylesheet. ([35182](https://github.com/WordPress/gutenberg/pull/35182))
+
+-   Remove font size classes that are enqueued in the global stylesheet. ([35182](https://github.com/WordPress/gutenberg/pull/35182))
 
 #### Block API
-- Allow more than 1 block stylesheets. ([32510](https://github.com/WordPress/gutenberg/pull/32510))
+
+-   Allow more than 1 block stylesheets. ([32510](https://github.com/WordPress/gutenberg/pull/32510))
 
 ### Experiments
 
 #### Navigation Block
-- Add block gap support. ([35277](https://github.com/WordPress/gutenberg/pull/35277))
-- Enable always on burger menu for responsive navigation menus. ([35568](https://github.com/WordPress/gutenberg/pull/35568))
-- Fix issue with space-between. ([35722](https://github.com/WordPress/gutenberg/pull/35722))
-- Submenu item paddings & fixes. ([35716](https://github.com/WordPress/gutenberg/pull/35716))
-- Fix navigation gap & padding issues. ([35752](https://github.com/WordPress/gutenberg/pull/35752))
-- Remove color inheritance specificity. ([35725](https://github.com/WordPress/gutenberg/pull/35725))
-- Remove deprecated classnames from Navigation Link block. ([35358](https://github.com/WordPress/gutenberg/pull/35358))
+
+-   Add block gap support. ([35277](https://github.com/WordPress/gutenberg/pull/35277))
+-   Enable always on burger menu for responsive navigation menus. ([35568](https://github.com/WordPress/gutenberg/pull/35568))
+-   Fix issue with space-between. ([35722](https://github.com/WordPress/gutenberg/pull/35722))
+-   Submenu item paddings & fixes. ([35716](https://github.com/WordPress/gutenberg/pull/35716))
+-   Fix navigation gap & padding issues. ([35752](https://github.com/WordPress/gutenberg/pull/35752))
+-   Remove color inheritance specificity. ([35725](https://github.com/WordPress/gutenberg/pull/35725))
+-   Remove deprecated classnames from Navigation Link block. ([35358](https://github.com/WordPress/gutenberg/pull/35358))
 -
-#### Navigation Screen
-- Use new core functions in menu items REST API. ([35648](https://github.com/WordPress/gutenberg/pull/35648))
-- Navigation: Preload more API requests. ([35402](https://github.com/WordPress/gutenberg/pull/35402))
-- Refactor `gutenberg_initialize_editor` function and remove `block_editor_preload_data` filter. ([35838](https://github.com/WordPress/gutenberg/pull/35838))
 
+#### Navigation Screen
 
+-   Use new core functions in menu items REST API. ([35648](https://github.com/WordPress/gutenberg/pull/35648))
+-   Navigation: Preload more API requests. ([35402](https://github.com/WordPress/gutenberg/pull/35402))
+-   Refactor `gutenberg_initialize_editor` function and remove `block_editor_preload_data` filter. ([35838](https://github.com/WordPress/gutenberg/pull/35838))
 
 #### Full Site Editing
-- Try: Remove dotted ancestor border. ([35637](https://github.com/WordPress/gutenberg/pull/35637))
 
+-   Try: Remove dotted ancestor border. ([35637](https://github.com/WordPress/gutenberg/pull/35637))
 
 ### Documentation
 
 #### Handbook
-- Add categories to TOC to help digest the FAQ. ([35519](https://github.com/WordPress/gutenberg/pull/35519))
-- Add missing documentation for the `wrapperProps` property for the `BlockListBlock` component returned by the `editor.blockListEdit` filter. ([26961](https://github.com/WordPress/gutenberg/pull/26961))
-- Add section on using theme.json schema. ([35739](https://github.com/WordPress/gutenberg/pull/35739))
-- Add Table of Contents to FAQ page. ([35455](https://github.com/WordPress/gutenberg/pull/35455))
-- Clarify documentation for InnerBlocks orientation prop. ([35712](https://github.com/WordPress/gutenberg/pull/35712))
-- CustomRadius - Remove plugin only text. ([35582](https://github.com/WordPress/gutenberg/pull/35582))
-- Update block categories. ([35523](https://github.com/WordPress/gutenberg/pull/35523))
-- Update `npm run build` command for developing with Gutenberg locally. ([35681](https://github.com/WordPress/gutenberg/pull/35681))
+
+-   Add categories to TOC to help digest the FAQ. ([35519](https://github.com/WordPress/gutenberg/pull/35519))
+-   Add missing documentation for the `wrapperProps` property for the `BlockListBlock` component returned by the `editor.blockListEdit` filter. ([26961](https://github.com/WordPress/gutenberg/pull/26961))
+-   Add section on using theme.json schema. ([35739](https://github.com/WordPress/gutenberg/pull/35739))
+-   Add Table of Contents to FAQ page. ([35455](https://github.com/WordPress/gutenberg/pull/35455))
+-   Clarify documentation for InnerBlocks orientation prop. ([35712](https://github.com/WordPress/gutenberg/pull/35712))
+-   CustomRadius - Remove plugin only text. ([35582](https://github.com/WordPress/gutenberg/pull/35582))
+-   Update block categories. ([35523](https://github.com/WordPress/gutenberg/pull/35523))
+-   Update `npm run build` command for developing with Gutenberg locally. ([35681](https://github.com/WordPress/gutenberg/pull/35681))
 
 #### Packages
-- Block Editor: Update default value of the viewportWidth attribute in documentation. ([35659](https://github.com/WordPress/gutenberg/pull/35659))
-- Components: Add the storybook link to the `/components` README. ([35493](https://github.com/WordPress/gutenberg/pull/35493))
-- Components: Add readme for SkipToSelectedBlock component. ([32958](https://github.com/WordPress/gutenberg/pull/32958))
-- Componentes: Add CHANGELOG entry for the fieldset removal from `FontAppearanceControl`. ([35585](https://github.com/WordPress/gutenberg/pull/35585))
-- Components: Add entry to CHANGELOG regarding new ColorPicker. ([35486](https://github.com/WordPress/gutenberg/pull/35486))
-- Components: Fix markdown highlighting on components CONTRIBUTING.md. ([35633](https://github.com/WordPress/gutenberg/pull/35633))
-- Components: Mark `CustomSelectControl` `hint` option as experimental. ([35673](https://github.com/WordPress/gutenberg/pull/35673))
-- Components: Polish `ToggleGroupControl`. ([35600](https://github.com/WordPress/gutenberg/pull/35600))
-- Components: Small tweaks to contributing guidelines. ([35620](https://github.com/WordPress/gutenberg/pull/35620))
-- Components: Update README for SelectControl. ([28811](https://github.com/WordPress/gutenberg/pull/28811))
-- Components: Update DateTimePicker component README to remove reference to isDayHighlighted callback. ([35363](https://github.com/WordPress/gutenberg/pull/35363))
-- Components, feat(SelectControl): Add children prop. ([29540](https://github.com/WordPress/gutenberg/pull/29540))
-- Create Block: Update documentation and readme post merge of #35645. ([35679](https://github.com/WordPress/gutenberg/pull/35679))
+
+-   Block Editor: Update default value of the viewportWidth attribute in documentation. ([35659](https://github.com/WordPress/gutenberg/pull/35659))
+-   Components: Add the storybook link to the `/components` README. ([35493](https://github.com/WordPress/gutenberg/pull/35493))
+-   Components: Add readme for SkipToSelectedBlock component. ([32958](https://github.com/WordPress/gutenberg/pull/32958))
+-   Componentes: Add CHANGELOG entry for the fieldset removal from `FontAppearanceControl`. ([35585](https://github.com/WordPress/gutenberg/pull/35585))
+-   Components: Add entry to CHANGELOG regarding new ColorPicker. ([35486](https://github.com/WordPress/gutenberg/pull/35486))
+-   Components: Fix markdown highlighting on components CONTRIBUTING.md. ([35633](https://github.com/WordPress/gutenberg/pull/35633))
+-   Components: Mark `CustomSelectControl` `hint` option as experimental. ([35673](https://github.com/WordPress/gutenberg/pull/35673))
+-   Components: Polish `ToggleGroupControl`. ([35600](https://github.com/WordPress/gutenberg/pull/35600))
+-   Components: Small tweaks to contributing guidelines. ([35620](https://github.com/WordPress/gutenberg/pull/35620))
+-   Components: Update README for SelectControl. ([28811](https://github.com/WordPress/gutenberg/pull/28811))
+-   Components: Update DateTimePicker component README to remove reference to isDayHighlighted callback. ([35363](https://github.com/WordPress/gutenberg/pull/35363))
+-   Components, feat(SelectControl): Add children prop. ([29540](https://github.com/WordPress/gutenberg/pull/29540))
+-   Create Block: Update documentation and readme post merge of #35645. ([35679](https://github.com/WordPress/gutenberg/pull/35679))
 
 ### Code Quality
-- Block Editor: Fix odd usage of transform-styles wrap function (and tighten types). ([23599](https://github.com/WordPress/gutenberg/pull/23599))
-- Constrained tabbing: Simplify. ([34836](https://github.com/WordPress/gutenberg/pull/34836))
-- Compose: Convert `usePrevious` hook to TypeScript. ([35597](https://github.com/WordPress/gutenberg/pull/35597))
-- Update Callers to handle when getBlockType return undefined. ([35097](https://github.com/WordPress/gutenberg/pull/35097))
-- Components: Polish ResizableBox and convert it to TypeScript. ([35062](https://github.com/WordPress/gutenberg/pull/35062))
-- Components: Remove tinycolor object usage from the gradient picker. ([35544](https://github.com/WordPress/gutenberg/pull/35544))
-- Components: Remove duplicated className in Card component. ([35333](https://github.com/WordPress/gutenberg/pull/35333))
-- Components: Remove unused `useJumpStep` utility. ([35561](https://github.com/WordPress/gutenberg/pull/35561))
-- Components: Use new color picker props. ([35566](https://github.com/WordPress/gutenberg/pull/35566))
-- Components: Replace the color picker component with the new version. ([35220](https://github.com/WordPress/gutenberg/pull/35220))
-- Components, FontAppearanceControl: Remove `fieldset` wrapper. ([35461](https://github.com/WordPress/gutenberg/pull/35461))
-- Components, ToolsPanel: Remove hardcoded classnames. ([35415](https://github.com/WordPress/gutenberg/pull/35415))
-- Components, UnitControl component: Refactor JSX components to TypeScript. ([35281](https://github.com/WordPress/gutenberg/pull/35281))
-- Global Styles: Refactor how the Global Styles access and sets data. ([35264](https://github.com/WordPress/gutenberg/pull/35264))
-- Post Editor: Fix-up Post Editor’s preferences modal. ([35369](https://github.com/WordPress/gutenberg/pull/35369))
-- Remove Tinycolor usage from component color utils. ([35553](https://github.com/WordPress/gutenberg/pull/35553))
-- Reusable Blocks: Thunkify reusable-blocks store. ([35217](https://github.com/WordPress/gutenberg/pull/35217))
 
+-   Block Editor: Fix odd usage of transform-styles wrap function (and tighten types). ([23599](https://github.com/WordPress/gutenberg/pull/23599))
+-   Constrained tabbing: Simplify. ([34836](https://github.com/WordPress/gutenberg/pull/34836))
+-   Compose: Convert `usePrevious` hook to TypeScript. ([35597](https://github.com/WordPress/gutenberg/pull/35597))
+-   Update Callers to handle when getBlockType return undefined. ([35097](https://github.com/WordPress/gutenberg/pull/35097))
+-   Components: Polish ResizableBox and convert it to TypeScript. ([35062](https://github.com/WordPress/gutenberg/pull/35062))
+-   Components: Remove tinycolor object usage from the gradient picker. ([35544](https://github.com/WordPress/gutenberg/pull/35544))
+-   Components: Remove duplicated className in Card component. ([35333](https://github.com/WordPress/gutenberg/pull/35333))
+-   Components: Remove unused `useJumpStep` utility. ([35561](https://github.com/WordPress/gutenberg/pull/35561))
+-   Components: Use new color picker props. ([35566](https://github.com/WordPress/gutenberg/pull/35566))
+-   Components: Replace the color picker component with the new version. ([35220](https://github.com/WordPress/gutenberg/pull/35220))
+-   Components, FontAppearanceControl: Remove `fieldset` wrapper. ([35461](https://github.com/WordPress/gutenberg/pull/35461))
+-   Components, ToolsPanel: Remove hardcoded classnames. ([35415](https://github.com/WordPress/gutenberg/pull/35415))
+-   Components, UnitControl component: Refactor JSX components to TypeScript. ([35281](https://github.com/WordPress/gutenberg/pull/35281))
+-   Global Styles: Refactor how the Global Styles access and sets data. ([35264](https://github.com/WordPress/gutenberg/pull/35264))
+-   Post Editor: Fix-up Post Editor’s preferences modal. ([35369](https://github.com/WordPress/gutenberg/pull/35369))
+-   Remove Tinycolor usage from component color utils. ([35553](https://github.com/WordPress/gutenberg/pull/35553))
+-   Reusable Blocks: Thunkify reusable-blocks store. ([35217](https://github.com/WordPress/gutenberg/pull/35217))
 
 ### Tools
 
 #### Packages
-- Scripts: Remove inject polyfill by default. ([35436](https://github.com/WordPress/gutenberg/pull/35436))
+
+-   Scripts: Remove inject polyfill by default. ([35436](https://github.com/WordPress/gutenberg/pull/35436))
 
 #### Testing
-- Child theme.json: Update test to better capture that childs can update single parts in isolation. ([35759](https://github.com/WordPress/gutenberg/pull/35759))
-- Border Radius Control: Add fallback px unit and add utils tests. ([35786](https://github.com/WordPress/gutenberg/pull/35786))
-- Fix preview end-to-end tests. ([35565](https://github.com/WordPress/gutenberg/pull/35565))
-- Flaky Tests: Fix taxonomies flaky tests. ([35534](https://github.com/WordPress/gutenberg/pull/35534))
-- Flaky Tests: Try another fix for flaky nav test. ([35443](https://github.com/WordPress/gutenberg/pull/35443))
-- Performance tests: Add more detailed loading metrics. ([32237](https://github.com/WordPress/gutenberg/pull/32237))
-- Components, Panel: Improve unit tests. ([35658](https://github.com/WordPress/gutenberg/pull/35658))
-- Enable/skipped metabox test. ([35594](https://github.com/WordPress/gutenberg/pull/35594))
+
+-   Child theme.json: Update test to better capture that childs can update single parts in isolation. ([35759](https://github.com/WordPress/gutenberg/pull/35759))
+-   Border Radius Control: Add fallback px unit and add utils tests. ([35786](https://github.com/WordPress/gutenberg/pull/35786))
+-   Fix preview end-to-end tests. ([35565](https://github.com/WordPress/gutenberg/pull/35565))
+-   Flaky Tests: Fix taxonomies flaky tests. ([35534](https://github.com/WordPress/gutenberg/pull/35534))
+-   Flaky Tests: Try another fix for flaky nav test. ([35443](https://github.com/WordPress/gutenberg/pull/35443))
+-   Performance tests: Add more detailed loading metrics. ([32237](https://github.com/WordPress/gutenberg/pull/32237))
+-   Components, Panel: Improve unit tests. ([35658](https://github.com/WordPress/gutenberg/pull/35658))
+-   Enable/skipped metabox test. ([35594](https://github.com/WordPress/gutenberg/pull/35594))
 
 #### Build Tooling
-- Revert version bump if build job fails. ([33239](https://github.com/WordPress/gutenberg/pull/33239))
-- Updates react-native-aztec android to use S3 dependency for Aztec editor. ([35606](https://github.com/WordPress/gutenberg/pull/35606))
 
+-   Revert version bump if build job fails. ([33239](https://github.com/WordPress/gutenberg/pull/33239))
+-   Updates react-native-aztec android to use S3 dependency for Aztec editor. ([35606](https://github.com/WordPress/gutenberg/pull/35606))
 
 = 11.7.1 =
 
-### Bug Fixes
+## Changelog
 
--  Rich text: formats: allow format to filter value when changing tag name ([35516](https://github.com/WordPress/gutenberg/pull/35516))
+### Bug Fixes
 
+-   Rich text: formats: allow format to filter value when changing tag name ([35516](https://github.com/WordPress/gutenberg/pull/35516))
 
 = 11.8.0-rc.1 =
 
-
+## Changelog
 
 ### Enhancements
 
-- Allow customization of the ARTIFACTS_PATH via WP_ARTIFACTS_PATH env var. ([35371](https://github.com/WordPress/gutenberg/pull/35371))
-- Allow local directories to be passed to --template as relative paths. ([35645](https://github.com/WordPress/gutenberg/pull/35645))
-- Test Setup: Add more-complete mocks of common timer functions. ([35368](https://github.com/WordPress/gutenberg/pull/35368))
-
-#### Block Library
-- Add basic example to site logo block. ([35588](https://github.com/WordPress/gutenberg/pull/35588))
-- Add basic example to site-title block. ([35590](https://github.com/WordPress/gutenberg/pull/35590))
-- Add fontStyle control to Site Tagline block. ([35507](https://github.com/WordPress/gutenberg/pull/35507))
-- Add spacing controls to the featured image block. ([35775](https://github.com/WordPress/gutenberg/pull/35775))
-- Add wide + full support to the site tagline block. ([35589](https://github.com/WordPress/gutenberg/pull/35589))
-- Added a "plain" style for quote blocks. ([29856](https://github.com/WordPress/gutenberg/pull/29856))
-- Autogenerate heading anchors. ([30825](https://github.com/WordPress/gutenberg/pull/30825))
-- Comment Content Block: Add typography, color and padding support. ([35183](https://github.com/WordPress/gutenberg/pull/35183))
-- Cover block: Add option to set opacity when background colour used. ([35065](https://github.com/WordPress/gutenberg/pull/35065))
-- Cover block: Allow setting the height from the placeholder state. ([35068](https://github.com/WordPress/gutenberg/pull/35068))
-- Embed: Add Pinterest as an embed provider. ([34895](https://github.com/WordPress/gutenberg/pull/34895))
-- Enable always on burger menu for responsive navigation menus. ([35568](https://github.com/WordPress/gutenberg/pull/35568))
-- Enable slash inserter for heading, list, and quote. ([35360](https://github.com/WordPress/gutenberg/pull/35360))
-- Post editor: Add some top margin. ([35717](https://github.com/WordPress/gutenberg/pull/35717))
-- Try: Site Logo placeholder tweaks. ([35397](https://github.com/WordPress/gutenberg/pull/35397))
-- [Block: Post comment date]: Add link setting and block supports. ([35112](https://github.com/WordPress/gutenberg/pull/35112))
-- [Categories]: Add support for showing only top level categories. ([35726](https://github.com/WordPress/gutenberg/pull/35726))
-
-#### Components
-- Fix some issues on the color picker component; Remove tinycolor2;. ([35562](https://github.com/WordPress/gutenberg/pull/35562))
-- Iterate on the design of the colors and gradients panel. ([35535](https://github.com/WordPress/gutenberg/pull/35535))
-- Storybook: Add RTL switcher to toolbar. ([35711](https://github.com/WordPress/gutenberg/pull/35711))
-- Storybook: Enable Controls and disable Knobs by default. ([35682](https://github.com/WordPress/gutenberg/pull/35682))
-- Support "any" step in NumberControl and RangeControl. ([34542](https://github.com/WordPress/gutenberg/pull/34542))
-- ToggleGroupControl: Allow custom aria-label. ([35423](https://github.com/WordPress/gutenberg/pull/35423))
-- Try: Remove segmented control vertical separators. ([35497](https://github.com/WordPress/gutenberg/pull/35497))
-- Update `Navigator` styling to facilitate sticky positioning. ([35518](https://github.com/WordPress/gutenberg/pull/35518))
-- Update the global styles sidebar's root view to use Card components. ([35547](https://github.com/WordPress/gutenberg/pull/35547))
+-   Allow customization of the ARTIFACTS_PATH via WP_ARTIFACTS_PATH env var. ([35371](https://github.com/WordPress/gutenberg/pull/35371))
+-   Allow local directories to be passed to --template as relative paths. ([35645](https://github.com/WordPress/gutenberg/pull/35645))
+-   Test Setup: Add more-complete mocks of common timer functions. ([35368](https://github.com/WordPress/gutenberg/pull/35368))
+
+#### Block Library
+
+-   Add basic example to site logo block. ([35588](https://github.com/WordPress/gutenberg/pull/35588))
+-   Add basic example to site-title block. ([35590](https://github.com/WordPress/gutenberg/pull/35590))
+-   Add fontStyle control to Site Tagline block. ([35507](https://github.com/WordPress/gutenberg/pull/35507))
+-   Add spacing controls to the featured image block. ([35775](https://github.com/WordPress/gutenberg/pull/35775))
+-   Add wide + full support to the site tagline block. ([35589](https://github.com/WordPress/gutenberg/pull/35589))
+-   Added a "plain" style for quote blocks. ([29856](https://github.com/WordPress/gutenberg/pull/29856))
+-   Autogenerate heading anchors. ([30825](https://github.com/WordPress/gutenberg/pull/30825))
+-   Comment Content Block: Add typography, color and padding support. ([35183](https://github.com/WordPress/gutenberg/pull/35183))
+-   Cover block: Add option to set opacity when background colour used. ([35065](https://github.com/WordPress/gutenberg/pull/35065))
+-   Cover block: Allow setting the height from the placeholder state. ([35068](https://github.com/WordPress/gutenberg/pull/35068))
+-   Embed: Add Pinterest as an embed provider. ([34895](https://github.com/WordPress/gutenberg/pull/34895))
+-   Enable always on burger menu for responsive navigation menus. ([35568](https://github.com/WordPress/gutenberg/pull/35568))
+-   Enable slash inserter for heading, list, and quote. ([35360](https://github.com/WordPress/gutenberg/pull/35360))
+-   Post editor: Add some top margin. ([35717](https://github.com/WordPress/gutenberg/pull/35717))
+-   Try: Site Logo placeholder tweaks. ([35397](https://github.com/WordPress/gutenberg/pull/35397))
+-   [Block: Post comment date]: Add link setting and block supports. ([35112](https://github.com/WordPress/gutenberg/pull/35112))
+-   [Categories]: Add support for showing only top level categories. ([35726](https://github.com/WordPress/gutenberg/pull/35726))
+
+#### Components
+
+-   Fix some issues on the color picker component; Remove tinycolor2;. ([35562](https://github.com/WordPress/gutenberg/pull/35562))
+-   Iterate on the design of the colors and gradients panel. ([35535](https://github.com/WordPress/gutenberg/pull/35535))
+-   Storybook: Add RTL switcher to toolbar. ([35711](https://github.com/WordPress/gutenberg/pull/35711))
+-   Storybook: Enable Controls and disable Knobs by default. ([35682](https://github.com/WordPress/gutenberg/pull/35682))
+-   Support "any" step in NumberControl and RangeControl. ([34542](https://github.com/WordPress/gutenberg/pull/34542))
+-   ToggleGroupControl: Allow custom aria-label. ([35423](https://github.com/WordPress/gutenberg/pull/35423))
+-   Try: Remove segmented control vertical separators. ([35497](https://github.com/WordPress/gutenberg/pull/35497))
+-   Update `Navigator` styling to facilitate sticky positioning. ([35518](https://github.com/WordPress/gutenberg/pull/35518))
+-   Update the global styles sidebar's root view to use Card components. ([35547](https://github.com/WordPress/gutenberg/pull/35547))
 
 #### Themes
-- Enable theme supports automatically for FSE theme. ([35593](https://github.com/WordPress/gutenberg/pull/35593))
-- Remove default padding/margin on the body of the page and editor canvas. ([35421](https://github.com/WordPress/gutenberg/pull/35421))
-- Support title in templateParts. ([35626](https://github.com/WordPress/gutenberg/pull/35626))
+
+-   Enable theme supports automatically for FSE theme. ([35593](https://github.com/WordPress/gutenberg/pull/35593))
+-   Remove default padding/margin on the body of the page and editor canvas. ([35421](https://github.com/WordPress/gutenberg/pull/35421))
+-   Support title in templateParts. ([35626](https://github.com/WordPress/gutenberg/pull/35626))
 
 #### Design Tools
-- Add spacing controls to all heading blocks. ([35772](https://github.com/WordPress/gutenberg/pull/35772))
-- ToolsPanel: Switch to plus icon when no controls present in panel body. ([34107](https://github.com/WordPress/gutenberg/pull/34107))
+
+-   Add spacing controls to all heading blocks. ([35772](https://github.com/WordPress/gutenberg/pull/35772))
+-   ToolsPanel: Switch to plus icon when no controls present in panel body. ([34107](https://github.com/WordPress/gutenberg/pull/34107))
 
 #### Patterns
-- Increase number of items per page for default Query Loop Block. ([35603](https://github.com/WordPress/gutenberg/pull/35603))
-- [Patterns]: Featured patterns from pattern directory. ([35115](https://github.com/WordPress/gutenberg/pull/35115))
+
+-   Increase number of items per page for default Query Loop Block. ([35603](https://github.com/WordPress/gutenberg/pull/35603))
+-   [Patterns]: Featured patterns from pattern directory. ([35115](https://github.com/WordPress/gutenberg/pull/35115))
 
 #### Global Styles
-- Extract the three color panels to their own global styles view. ([35400](https://github.com/WordPress/gutenberg/pull/35400))
-- Move the global styles reset action to a dropdown menu. ([35559](https://github.com/WordPress/gutenberg/pull/35559))
+
+-   Extract the three color panels to their own global styles view. ([35400](https://github.com/WordPress/gutenberg/pull/35400))
+-   Move the global styles reset action to a dropdown menu. ([35559](https://github.com/WordPress/gutenberg/pull/35559))
 
 #### List View
-- Show ellipsis menu in the List View. ([35170](https://github.com/WordPress/gutenberg/pull/35170))
+
+-   Show ellipsis menu in the List View. ([35170](https://github.com/WordPress/gutenberg/pull/35170))
 
 #### REST API
-- Gallery Block: Get media data in a single request. ([34389](https://github.com/WordPress/gutenberg/pull/34389))
 
+-   Gallery Block: Get media data in a single request. ([34389](https://github.com/WordPress/gutenberg/pull/34389))
 
 ### New APIs
 
-- Add PascalCase slug to create-block template strings. ([35462](https://github.com/WordPress/gutenberg/pull/35462))
-
+-   Add PascalCase slug to create-block template strings. ([35462](https://github.com/WordPress/gutenberg/pull/35462))
 
 ### Bug Fixes
 
-- Constrained tabbing: Simplify. ([34836](https://github.com/WordPress/gutenberg/pull/34836))
-- Fix HelpHub link i18n for page-jumps. ([35404](https://github.com/WordPress/gutenberg/pull/35404))
-- Fix invisible bottom sheet backdrop on Android. ([35557](https://github.com/WordPress/gutenberg/pull/35557))
-- Fix overflowing content for native Help screen. ([35552](https://github.com/WordPress/gutenberg/pull/35552))
-- Fix sibling inserter animation. ([35729](https://github.com/WordPress/gutenberg/pull/35729))
-- Fix template part block untranslated strings. ([35715](https://github.com/WordPress/gutenberg/pull/35715))
-- Fix updating the block list after block removal. ([35721](https://github.com/WordPress/gutenberg/pull/35721))
-- Fix: Prevent empty renders in ServerSideRender component caused by changing props while already fetching markup. ([35433](https://github.com/WordPress/gutenberg/pull/35433))
-- Fixed condition to show separator correctly. ([35409](https://github.com/WordPress/gutenberg/pull/35409))
-- Popover: Fix __unstableBoundaryParent. ([35082](https://github.com/WordPress/gutenberg/pull/35082))
-- Rich text: Fix internal paste across multiline and single line instances. ([35416](https://github.com/WordPress/gutenberg/pull/35416))
-- Saving post: Transparent disabled button. ([35542](https://github.com/WordPress/gutenberg/pull/35542))
-
-#### Block Library
-- Block Settings: Don't render 'Move to' if the block cannot be moved. ([35463](https://github.com/WordPress/gutenberg/pull/35463))
-- Cover block: Update placeholder minHeight style to support non-px units. ([35614](https://github.com/WordPress/gutenberg/pull/35614))
-- Cover: Update 'templateLock' attribute. ([35671](https://github.com/WordPress/gutenberg/pull/35671))
-- Featured Image: Center placeholder chip contents. ([35417](https://github.com/WordPress/gutenberg/pull/35417))
-- Fix site logo block on dark backgrounds. ([35718](https://github.com/WordPress/gutenberg/pull/35718))
-- Heading: Fix undo/redo "trap". ([35767](https://github.com/WordPress/gutenberg/pull/35767))
-- Heading: Remove anchor map when block unmounts. ([35761](https://github.com/WordPress/gutenberg/pull/35761))
+-   Constrained tabbing: Simplify. ([34836](https://github.com/WordPress/gutenberg/pull/34836))
+-   Fix HelpHub link i18n for page-jumps. ([35404](https://github.com/WordPress/gutenberg/pull/35404))
+-   Fix invisible bottom sheet backdrop on Android. ([35557](https://github.com/WordPress/gutenberg/pull/35557))
+-   Fix overflowing content for native Help screen. ([35552](https://github.com/WordPress/gutenberg/pull/35552))
+-   Fix sibling inserter animation. ([35729](https://github.com/WordPress/gutenberg/pull/35729))
+-   Fix template part block untranslated strings. ([35715](https://github.com/WordPress/gutenberg/pull/35715))
+-   Fix updating the block list after block removal. ([35721](https://github.com/WordPress/gutenberg/pull/35721))
+-   Fix: Prevent empty renders in ServerSideRender component caused by changing props while already fetching markup. ([35433](https://github.com/WordPress/gutenberg/pull/35433))
+-   Fixed condition to show separator correctly. ([35409](https://github.com/WordPress/gutenberg/pull/35409))
+-   Popover: Fix \_\_unstableBoundaryParent. ([35082](https://github.com/WordPress/gutenberg/pull/35082))
+-   Rich text: Fix internal paste across multiline and single line instances. ([35416](https://github.com/WordPress/gutenberg/pull/35416))
+-   Saving post: Transparent disabled button. ([35542](https://github.com/WordPress/gutenberg/pull/35542))
+
+#### Block Library
+
+-   Block Settings: Don't render 'Move to' if the block cannot be moved. ([35463](https://github.com/WordPress/gutenberg/pull/35463))
+-   Cover block: Update placeholder minHeight style to support non-px units. ([35614](https://github.com/WordPress/gutenberg/pull/35614))
+-   Cover: Update 'templateLock' attribute. ([35671](https://github.com/WordPress/gutenberg/pull/35671))
+-   Featured Image: Center placeholder chip contents. ([35417](https://github.com/WordPress/gutenberg/pull/35417))
+-   Fix site logo block on dark backgrounds. ([35718](https://github.com/WordPress/gutenberg/pull/35718))
+-   Heading: Fix undo/redo "trap". ([35767](https://github.com/WordPress/gutenberg/pull/35767))
+-   Heading: Remove anchor map when block unmounts. ([35761](https://github.com/WordPress/gutenberg/pull/35761))
 
 #### Components
-- Add shortcut provider. ([35652](https://github.com/WordPress/gutenberg/pull/35652))
-- Fix `ToggleGroupControlOption` not passing `ref` to the underlying element. ([35546](https://github.com/WordPress/gutenberg/pull/35546))
-- For Tooltips, prevent emitting events to child elements if they are disabled. ([35254](https://github.com/WordPress/gutenberg/pull/35254))
-- Hide horizontal overflow in `Navigator`. ([35332](https://github.com/WordPress/gutenberg/pull/35332))
-- RawHTML component: Allow multiple children. ([35532](https://github.com/WordPress/gutenberg/pull/35532))
-- Remove extra comma character from Tooltip when underlying component is disabled. ([35247](https://github.com/WordPress/gutenberg/pull/35247))
-- [ToggleGroupControl]: Fix visual state when no option is selected. ([35545](https://github.com/WordPress/gutenberg/pull/35545))
+
+-   Add shortcut provider. ([35652](https://github.com/WordPress/gutenberg/pull/35652))
+-   Fix `ToggleGroupControlOption` not passing `ref` to the underlying element. ([35546](https://github.com/WordPress/gutenberg/pull/35546))
+-   For Tooltips, prevent emitting events to child elements if they are disabled. ([35254](https://github.com/WordPress/gutenberg/pull/35254))
+-   Hide horizontal overflow in `Navigator`. ([35332](https://github.com/WordPress/gutenberg/pull/35332))
+-   RawHTML component: Allow multiple children. ([35532](https://github.com/WordPress/gutenberg/pull/35532))
+-   Remove extra comma character from Tooltip when underlying component is disabled. ([35247](https://github.com/WordPress/gutenberg/pull/35247))
+-   [ToggleGroupControl]: Fix visual state when no option is selected. ([35545](https://github.com/WordPress/gutenberg/pull/35545))
 
 #### Themes
-- Custom Templates: Use "title" from the theme.json. ([35592](https://github.com/WordPress/gutenberg/pull/35592))
-- Elements block support: Fix link color rendering on site front end. ([35446](https://github.com/WordPress/gutenberg/pull/35446))
-- Move the link color styles to the footer. ([35425](https://github.com/WordPress/gutenberg/pull/35425))
-- Reset margin for all children of flow layouts. ([35426](https://github.com/WordPress/gutenberg/pull/35426))
+
+-   Custom Templates: Use "title" from the theme.json. ([35592](https://github.com/WordPress/gutenberg/pull/35592))
+-   Elements block support: Fix link color rendering on site front end. ([35446](https://github.com/WordPress/gutenberg/pull/35446))
+-   Move the link color styles to the footer. ([35425](https://github.com/WordPress/gutenberg/pull/35425))
+-   Reset margin for all children of flow layouts. ([35426](https://github.com/WordPress/gutenberg/pull/35426))
 
 #### Template Editor
-- FSE: Use slug as template parts area item key. ([35796](https://github.com/WordPress/gutenberg/pull/35796))
-- Fix missing titles in general areas. ([35657](https://github.com/WordPress/gutenberg/pull/35657))
+
+-   FSE: Use slug as template parts area item key. ([35796](https://github.com/WordPress/gutenberg/pull/35796))
+-   Fix missing titles in general areas. ([35657](https://github.com/WordPress/gutenberg/pull/35657))
 
 #### Block API
-- Blocks: Apply the most recent filters to previously registered blocks. ([34299](https://github.com/WordPress/gutenberg/pull/34299))
-- Fix class serialization of font-size and colors in dynamic blocks that use block supports. ([35751](https://github.com/WordPress/gutenberg/pull/35751))
+
+-   Blocks: Apply the most recent filters to previously registered blocks. ([34299](https://github.com/WordPress/gutenberg/pull/34299))
+-   Fix class serialization of font-size and colors in dynamic blocks that use block supports. ([35751](https://github.com/WordPress/gutenberg/pull/35751))
 
 #### Design Tools
-- Border Radius Control: Fix undefined value on first click into RangeControl. ([35651](https://github.com/WordPress/gutenberg/pull/35651))
+
+-   Border Radius Control: Fix undefined value on first click into RangeControl. ([35651](https://github.com/WordPress/gutenberg/pull/35651))
 
 #### Block Editor
-- Inserter: Fix gap between Search and Tabs. ([35537](https://github.com/WordPress/gutenberg/pull/35537))
+
+-   Inserter: Fix gap between Search and Tabs. ([35537](https://github.com/WordPress/gutenberg/pull/35537))
 
 #### REST API
-- Fix preloading middleware referencing stale data for OPTIONS requests. ([35527](https://github.com/WordPress/gutenberg/pull/35527))
+
+-   Fix preloading middleware referencing stale data for OPTIONS requests. ([35527](https://github.com/WordPress/gutenberg/pull/35527))
 
 #### List View
-- Fix expand and collapsing when the icon is clicked. ([35526](https://github.com/WordPress/gutenberg/pull/35526))
+
+-   Fix expand and collapsing when the icon is clicked. ([35526](https://github.com/WordPress/gutenberg/pull/35526))
 
 #### Navigation Screen
-- Navigation: Preload more API requests. ([35402](https://github.com/WordPress/gutenberg/pull/35402))
 
+-   Navigation: Preload more API requests. ([35402](https://github.com/WordPress/gutenberg/pull/35402))
 
 ### Performance
 
 #### Global Styles
-- Pass only the data the site editor uses. ([35458](https://github.com/WordPress/gutenberg/pull/35458))
-- Use a context provider for global styles configuration. ([35622](https://github.com/WordPress/gutenberg/pull/35622))
+
+-   Pass only the data the site editor uses. ([35458](https://github.com/WordPress/gutenberg/pull/35458))
+-   Use a context provider for global styles configuration. ([35622](https://github.com/WordPress/gutenberg/pull/35622))
 
 #### CSS & Styling
-- Remove font size classes that are enqueued in the global stylesheet. ([35182](https://github.com/WordPress/gutenberg/pull/35182))
+
+-   Remove font size classes that are enqueued in the global stylesheet. ([35182](https://github.com/WordPress/gutenberg/pull/35182))
 
 #### Block API
-- Allow more than 1 block stylesheets. ([32510](https://github.com/WordPress/gutenberg/pull/32510))
 
+-   Allow more than 1 block stylesheets. ([32510](https://github.com/WordPress/gutenberg/pull/32510))
 
 ### Experiments
 
 #### Global Styles
-- Allow users to store duotone data. ([35318](https://github.com/WordPress/gutenberg/pull/35318))
-- FSE: Allow child theme.json to be merged with parent theme.json. ([35459](https://github.com/WordPress/gutenberg/pull/35459))
-- Fix presets that use a callback to validate user data. ([35255](https://github.com/WordPress/gutenberg/pull/35255))
-- Font family: Switch from CSS Custom Property to classes. ([31910](https://github.com/WordPress/gutenberg/pull/31910))
-- Update descriptions for the different screens under global styles. ([35429](https://github.com/WordPress/gutenberg/pull/35429))
-- Use text color to render the Aa preview in global styles. ([35631](https://github.com/WordPress/gutenberg/pull/35631))
+
+-   Allow users to store duotone data. ([35318](https://github.com/WordPress/gutenberg/pull/35318))
+-   FSE: Allow child theme.json to be merged with parent theme.json. ([35459](https://github.com/WordPress/gutenberg/pull/35459))
+-   Fix presets that use a callback to validate user data. ([35255](https://github.com/WordPress/gutenberg/pull/35255))
+-   Font family: Switch from CSS Custom Property to classes. ([31910](https://github.com/WordPress/gutenberg/pull/31910))
+-   Update descriptions for the different screens under global styles. ([35429](https://github.com/WordPress/gutenberg/pull/35429))
+-   Use text color to render the Aa preview in global styles. ([35631](https://github.com/WordPress/gutenberg/pull/35631))
 
 #### Block Library
-- Navigation: Fix issue with space-between. ([35722](https://github.com/WordPress/gutenberg/pull/35722))
-- Submenu item paddings & fixes. ([35716](https://github.com/WordPress/gutenberg/pull/35716))
-- Try: Fix navigation gap & padding issues. ([35752](https://github.com/WordPress/gutenberg/pull/35752))
-- Try: Remove color inheritance specificity. ([35725](https://github.com/WordPress/gutenberg/pull/35725))
+
+-   Navigation: Fix issue with space-between. ([35722](https://github.com/WordPress/gutenberg/pull/35722))
+-   Submenu item paddings & fixes. ([35716](https://github.com/WordPress/gutenberg/pull/35716))
+-   Try: Fix navigation gap & padding issues. ([35752](https://github.com/WordPress/gutenberg/pull/35752))
+-   Try: Remove color inheritance specificity. ([35725](https://github.com/WordPress/gutenberg/pull/35725))
 
 #### Navigation Screen
-- Use new core functions in menu items REST API. ([35648](https://github.com/WordPress/gutenberg/pull/35648))
+
+-   Use new core functions in menu items REST API. ([35648](https://github.com/WordPress/gutenberg/pull/35648))
 
 #### Full Site Editing
-- Try: Remove dotted ancestor border. ([35637](https://github.com/WordPress/gutenberg/pull/35637))
+
+-   Try: Remove dotted ancestor border. ([35637](https://github.com/WordPress/gutenberg/pull/35637))
 
 #### Design Tools
-- Navigation Block: Add block gap support. ([35277](https://github.com/WordPress/gutenberg/pull/35277))
+
+-   Navigation Block: Add block gap support. ([35277](https://github.com/WordPress/gutenberg/pull/35277))
 
 #### Themes
-- CSS: Add a reset for image heights. ([30092](https://github.com/WordPress/gutenberg/pull/30092))
 
+-   CSS: Add a reset for image heights. ([30092](https://github.com/WordPress/gutenberg/pull/30092))
 
 ### Documentation
 
-- Add readme for SkipToSelectedBlock component. ([32958](https://github.com/WordPress/gutenberg/pull/32958))
-- Added Table of Contents to FAQ page. ([35455](https://github.com/WordPress/gutenberg/pull/35455))
-- Added missing documentation for the `wrapperProps` property for the `BlockListBlock` component returned by the `editor.blockListEdit` filter. ([26961](https://github.com/WordPress/gutenberg/pull/26961))
-- Docs: Add section on using theme.json schema. ([35739](https://github.com/WordPress/gutenberg/pull/35739))
-- Docs: CustomRadius - Remove plugin only text. ([35582](https://github.com/WordPress/gutenberg/pull/35582))
-- Docs: Update block categories. ([35523](https://github.com/WordPress/gutenberg/pull/35523))
-- Fix markdown highlighting on components CONTRIBUTING.md. ([35633](https://github.com/WordPress/gutenberg/pull/35633))
-- Handbook: Add categories to TOC to help digest the FAQ. ([35519](https://github.com/WordPress/gutenberg/pull/35519))
-- Update README for SelectControl. ([28811](https://github.com/WordPress/gutenberg/pull/28811))
-- Update `npm run build` command for developing with Gutenberg locally. ([35681](https://github.com/WordPress/gutenberg/pull/35681))
-- Update default value of the viewportWidth attribute in documentation. ([35659](https://github.com/WordPress/gutenberg/pull/35659))
-- Update documentation and readme post merge of #35645. ([35679](https://github.com/WordPress/gutenberg/pull/35679))
+-   Add readme for SkipToSelectedBlock component. ([32958](https://github.com/WordPress/gutenberg/pull/32958))
+-   Added Table of Contents to FAQ page. ([35455](https://github.com/WordPress/gutenberg/pull/35455))
+-   Added missing documentation for the `wrapperProps` property for the `BlockListBlock` component returned by the `editor.blockListEdit` filter. ([26961](https://github.com/WordPress/gutenberg/pull/26961))
+-   Docs: Add section on using theme.json schema. ([35739](https://github.com/WordPress/gutenberg/pull/35739))
+-   Docs: CustomRadius - Remove plugin only text. ([35582](https://github.com/WordPress/gutenberg/pull/35582))
+-   Docs: Update block categories. ([35523](https://github.com/WordPress/gutenberg/pull/35523))
+-   Fix markdown highlighting on components CONTRIBUTING.md. ([35633](https://github.com/WordPress/gutenberg/pull/35633))
+-   Handbook: Add categories to TOC to help digest the FAQ. ([35519](https://github.com/WordPress/gutenberg/pull/35519))
+-   Update README for SelectControl. ([28811](https://github.com/WordPress/gutenberg/pull/28811))
+-   Update `npm run build` command for developing with Gutenberg locally. ([35681](https://github.com/WordPress/gutenberg/pull/35681))
+-   Update default value of the viewportWidth attribute in documentation. ([35659](https://github.com/WordPress/gutenberg/pull/35659))
+-   Update documentation and readme post merge of #35645. ([35679](https://github.com/WordPress/gutenberg/pull/35679))
 
 #### Components
-- Add CHANGELOG entry for the fieldset removal from `FontAppearanceControl`. ([35585](https://github.com/WordPress/gutenberg/pull/35585))
-- Add entry to CHANGELOG regarding new ColorPicker. ([35486](https://github.com/WordPress/gutenberg/pull/35486))
-- Mark `CustomSelectControl` `hint` option as experimental. ([35673](https://github.com/WordPress/gutenberg/pull/35673))
-- Polish `ToggleGroupControl`. ([35600](https://github.com/WordPress/gutenberg/pull/35600))
-- Small tweaks to contributing guidelines. ([35620](https://github.com/WordPress/gutenberg/pull/35620))
 
+-   Add CHANGELOG entry for the fieldset removal from `FontAppearanceControl`. ([35585](https://github.com/WordPress/gutenberg/pull/35585))
+-   Add entry to CHANGELOG regarding new ColorPicker. ([35486](https://github.com/WordPress/gutenberg/pull/35486))
+-   Mark `CustomSelectControl` `hint` option as experimental. ([35673](https://github.com/WordPress/gutenberg/pull/35673))
+-   Polish `ToggleGroupControl`. ([35600](https://github.com/WordPress/gutenberg/pull/35600))
+-   Small tweaks to contributing guidelines. ([35620](https://github.com/WordPress/gutenberg/pull/35620))
 
 ### Code Quality
 
-- Convert `usePrevious` hook to TypeScript. ([35597](https://github.com/WordPress/gutenberg/pull/35597))
-- Fix odd usage of transform-styles wrap function (and tighten types). ([23599](https://github.com/WordPress/gutenberg/pull/23599))
-- Update Callers to handle when getBlockType return undefined. ([35097](https://github.com/WordPress/gutenberg/pull/35097))
-- Use new color picker props. ([35566](https://github.com/WordPress/gutenberg/pull/35566))
+-   Convert `usePrevious` hook to TypeScript. ([35597](https://github.com/WordPress/gutenberg/pull/35597))
+-   Fix odd usage of transform-styles wrap function (and tighten types). ([23599](https://github.com/WordPress/gutenberg/pull/23599))
+-   Update Callers to handle when getBlockType return undefined. ([35097](https://github.com/WordPress/gutenberg/pull/35097))
+-   Use new color picker props. ([35566](https://github.com/WordPress/gutenberg/pull/35566))
 
 #### Components
-- Chore: Remove tinycolor object usage from the gradient picker. ([35544](https://github.com/WordPress/gutenberg/pull/35544))
-- FontAppearanceControl: Remove `fieldset` wrapper. ([35461](https://github.com/WordPress/gutenberg/pull/35461))
-- Polish ResizableBox and convert it to TypeScript. ([35062](https://github.com/WordPress/gutenberg/pull/35062))
-- Remove duplicated className in Card component. ([35333](https://github.com/WordPress/gutenberg/pull/35333))
-- Remove unused `useJumpStep` utility. ([35561](https://github.com/WordPress/gutenberg/pull/35561))
-- Replace the color picker component with the new version. ([35220](https://github.com/WordPress/gutenberg/pull/35220))
-- ToolsPanel: Remove hardcoded classnames. ([35415](https://github.com/WordPress/gutenberg/pull/35415))
-- UnitControl component: Refactor JSX components to TypeScript. ([35281](https://github.com/WordPress/gutenberg/pull/35281))
+
+-   Chore: Remove tinycolor object usage from the gradient picker. ([35544](https://github.com/WordPress/gutenberg/pull/35544))
+-   FontAppearanceControl: Remove `fieldset` wrapper. ([35461](https://github.com/WordPress/gutenberg/pull/35461))
+-   Polish ResizableBox and convert it to TypeScript. ([35062](https://github.com/WordPress/gutenberg/pull/35062))
+-   Remove duplicated className in Card component. ([35333](https://github.com/WordPress/gutenberg/pull/35333))
+-   Remove unused `useJumpStep` utility. ([35561](https://github.com/WordPress/gutenberg/pull/35561))
+-   Replace the color picker component with the new version. ([35220](https://github.com/WordPress/gutenberg/pull/35220))
+-   ToolsPanel: Remove hardcoded classnames. ([35415](https://github.com/WordPress/gutenberg/pull/35415))
+-   UnitControl component: Refactor JSX components to TypeScript. ([35281](https://github.com/WordPress/gutenberg/pull/35281))
 
 #### Global Styles
-- Child theme.json: Update test to better capture that childs can update single parts in isolation. ([35759](https://github.com/WordPress/gutenberg/pull/35759))
-- Refactor how the Global Styles access and sets data. ([35264](https://github.com/WordPress/gutenberg/pull/35264))
+
+-   Child theme.json: Update test to better capture that childs can update single parts in isolation. ([35759](https://github.com/WordPress/gutenberg/pull/35759))
+-   Refactor how the Global Styles access and sets data. ([35264](https://github.com/WordPress/gutenberg/pull/35264))
 
 #### Design Tools
-- Border Radius Control: Add fallback px unit and add utils tests. ([35786](https://github.com/WordPress/gutenberg/pull/35786))
+
+-   Border Radius Control: Add fallback px unit and add utils tests. ([35786](https://github.com/WordPress/gutenberg/pull/35786))
 
 #### Post Editor
-- Fix-up Post Editor’s preferences modal. ([35369](https://github.com/WordPress/gutenberg/pull/35369))
 
+-   Fix-up Post Editor’s preferences modal. ([35369](https://github.com/WordPress/gutenberg/pull/35369))
 
 ### Tools
 
-- Scripts: Remove inject polyfill by default. ([35436](https://github.com/WordPress/gutenberg/pull/35436))
+-   Scripts: Remove inject polyfill by default. ([35436](https://github.com/WordPress/gutenberg/pull/35436))
 
 #### Testing
-- Fix taxonomies flaky tests. ([35534](https://github.com/WordPress/gutenberg/pull/35534))
-- Performance tests: Add more detailed loading metrics. ([32237](https://github.com/WordPress/gutenberg/pull/32237))
-- Try another fix for flaky nav test. ([35443](https://github.com/WordPress/gutenberg/pull/35443))
-- [Automated Testing]: Fix preview end-to-end tests. ([35565](https://github.com/WordPress/gutenberg/pull/35565))
+
+-   Fix taxonomies flaky tests. ([35534](https://github.com/WordPress/gutenberg/pull/35534))
+-   Performance tests: Add more detailed loading metrics. ([32237](https://github.com/WordPress/gutenberg/pull/32237))
+-   Try another fix for flaky nav test. ([35443](https://github.com/WordPress/gutenberg/pull/35443))
+-   [Automated Testing]: Fix preview end-to-end tests. ([35565](https://github.com/WordPress/gutenberg/pull/35565))
 
 #### Build Tooling
-- Build Workflow: Revert version bump if build job fails. ([33239](https://github.com/WordPress/gutenberg/pull/33239))
-- Updates react-native-aztec android to use S3 dependency for Aztec editor. ([35606](https://github.com/WordPress/gutenberg/pull/35606))
+
+-   Build Workflow: Revert version bump if build job fails. ([33239](https://github.com/WordPress/gutenberg/pull/33239))
+-   Updates react-native-aztec android to use S3 dependency for Aztec editor. ([35606](https://github.com/WordPress/gutenberg/pull/35606))
 
 #### Components
-- Panel: Improve unit tests. ([35658](https://github.com/WordPress/gutenberg/pull/35658))
 
+-   Panel: Improve unit tests. ([35658](https://github.com/WordPress/gutenberg/pull/35658))
 
 ### Various
 
-- Add the storybook link to the `/components` README. ([35493](https://github.com/WordPress/gutenberg/pull/35493))
-- Allow the specification of blocks allowed within columns. ([35342](https://github.com/WordPress/gutenberg/pull/35342))
-- Enable/skipped metabox test. ([35594](https://github.com/WordPress/gutenberg/pull/35594))
-- FSE: Coding standards: DOCTYPE should be the first line/character of any HTML document. ([35442](https://github.com/WordPress/gutenberg/pull/35442))
-- Mobile - Update macos version from latest to 11. ([35770](https://github.com/WordPress/gutenberg/pull/35770))
-- Remove: Tinycolor usage from component color utils. ([35553](https://github.com/WordPress/gutenberg/pull/35553))
-- Storybook: Add story for TypographyPanel. ([35293](https://github.com/WordPress/gutenberg/pull/35293))
-- Translation note for Home/end to avoid mistranslations. ([35669](https://github.com/WordPress/gutenberg/pull/35669))
-- Unify theme block placeholder content. ([35517](https://github.com/WordPress/gutenberg/pull/35517))
-- Update DateTimePicker component README to remove reference to isDayHighlighted callback. ([35363](https://github.com/WordPress/gutenberg/pull/35363))
-- [Block: Post comment author]: Add link settings and block supports. ([35595](https://github.com/WordPress/gutenberg/pull/35595))
-- feat(SelectControl): Add children prop. ([29540](https://github.com/WordPress/gutenberg/pull/29540))
-
-#### Block Library
-- Add allowedBlocks and TemplateLock attributes in Cover Block. ([31326](https://github.com/WordPress/gutenberg/pull/31326))
-- Cover Block: Use the description in the placeholder. ([34970](https://github.com/WordPress/gutenberg/pull/34970))
-- Cover block: Change dimRatio to 50 if media added and dimRatio is set to 100. ([35789](https://github.com/WordPress/gutenberg/pull/35789))
-- Cover block: Only use white text when the background of the cover block is dark. ([33541](https://github.com/WordPress/gutenberg/pull/33541))
-- Enable inheritance in search block. ([35723](https://github.com/WordPress/gutenberg/pull/35723))
-- Featured image block and Image blocks: Remove descendent space. ([35466](https://github.com/WordPress/gutenberg/pull/35466))
-- Page List: Show empty placeholder if no items. ([35441](https://github.com/WordPress/gutenberg/pull/35441))
-- Polish logos only style. ([35586](https://github.com/WordPress/gutenberg/pull/35586))
-- Quote: Update deprecation to expect style block supports. ([35615](https://github.com/WordPress/gutenberg/pull/35615))
-- Remove deprecated classnames from Navigation Link block. ([35358](https://github.com/WordPress/gutenberg/pull/35358))
-- Site Logo: Move Reset button to the Replace menu dropdown. ([35372](https://github.com/WordPress/gutenberg/pull/35372))
-- Site Logo: Remove "Reset" button icon. ([35434](https://github.com/WordPress/gutenberg/pull/35434))
-- Social Icons: Add top and bottom margin support. ([35374](https://github.com/WordPress/gutenberg/pull/35374))
-- [Buttons block]: Add gap and vertical margin support. ([34546](https://github.com/WordPress/gutenberg/pull/34546))
-
-#### Components
-- Repositioned RangeControl tooltip and adjusted image zoom control dropdown height. ([27374](https://github.com/WordPress/gutenberg/pull/27374))
-- Storybook: Remove outdated decorator configuration. ([35678](https://github.com/WordPress/gutenberg/pull/35678))
-- Update range control metrics. ([35540](https://github.com/WordPress/gutenberg/pull/35540))
-- [Components] Update FontSize control. ([35395](https://github.com/WordPress/gutenberg/pull/35395))
+-   Add the storybook link to the `/components` README. ([35493](https://github.com/WordPress/gutenberg/pull/35493))
+-   Allow the specification of blocks allowed within columns. ([35342](https://github.com/WordPress/gutenberg/pull/35342))
+-   Enable/skipped metabox test. ([35594](https://github.com/WordPress/gutenberg/pull/35594))
+-   FSE: Coding standards: DOCTYPE should be the first line/character of any HTML document. ([35442](https://github.com/WordPress/gutenberg/pull/35442))
+-   Mobile - Update macos version from latest to 11. ([35770](https://github.com/WordPress/gutenberg/pull/35770))
+-   Remove: Tinycolor usage from component color utils. ([35553](https://github.com/WordPress/gutenberg/pull/35553))
+-   Storybook: Add story for TypographyPanel. ([35293](https://github.com/WordPress/gutenberg/pull/35293))
+-   Translation note for Home/end to avoid mistranslations. ([35669](https://github.com/WordPress/gutenberg/pull/35669))
+-   Unify theme block placeholder content. ([35517](https://github.com/WordPress/gutenberg/pull/35517))
+-   Update DateTimePicker component README to remove reference to isDayHighlighted callback. ([35363](https://github.com/WordPress/gutenberg/pull/35363))
+-   [Block: Post comment author]: Add link settings and block supports. ([35595](https://github.com/WordPress/gutenberg/pull/35595))
+-   feat(SelectControl): Add children prop. ([29540](https://github.com/WordPress/gutenberg/pull/29540))
+
+#### Block Library
+
+-   Add allowedBlocks and TemplateLock attributes in Cover Block. ([31326](https://github.com/WordPress/gutenberg/pull/31326))
+-   Cover Block: Use the description in the placeholder. ([34970](https://github.com/WordPress/gutenberg/pull/34970))
+-   Cover block: Change dimRatio to 50 if media added and dimRatio is set to 100. ([35789](https://github.com/WordPress/gutenberg/pull/35789))
+-   Cover block: Only use white text when the background of the cover block is dark. ([33541](https://github.com/WordPress/gutenberg/pull/33541))
+-   Enable inheritance in search block. ([35723](https://github.com/WordPress/gutenberg/pull/35723))
+-   Featured image block and Image blocks: Remove descendent space. ([35466](https://github.com/WordPress/gutenberg/pull/35466))
+-   Page List: Show empty placeholder if no items. ([35441](https://github.com/WordPress/gutenberg/pull/35441))
+-   Polish logos only style. ([35586](https://github.com/WordPress/gutenberg/pull/35586))
+-   Quote: Update deprecation to expect style block supports. ([35615](https://github.com/WordPress/gutenberg/pull/35615))
+-   Remove deprecated classnames from Navigation Link block. ([35358](https://github.com/WordPress/gutenberg/pull/35358))
+-   Site Logo: Move Reset button to the Replace menu dropdown. ([35372](https://github.com/WordPress/gutenberg/pull/35372))
+-   Site Logo: Remove "Reset" button icon. ([35434](https://github.com/WordPress/gutenberg/pull/35434))
+-   Social Icons: Add top and bottom margin support. ([35374](https://github.com/WordPress/gutenberg/pull/35374))
+-   [Buttons block]: Add gap and vertical margin support. ([34546](https://github.com/WordPress/gutenberg/pull/34546))
+
+#### Components
+
+-   Repositioned RangeControl tooltip and adjusted image zoom control dropdown height. ([27374](https://github.com/WordPress/gutenberg/pull/27374))
+-   Storybook: Remove outdated decorator configuration. ([35678](https://github.com/WordPress/gutenberg/pull/35678))
+-   Update range control metrics. ([35540](https://github.com/WordPress/gutenberg/pull/35540))
+-   [Components] Update FontSize control. ([35395](https://github.com/WordPress/gutenberg/pull/35395))
 
 #### Template Editor
-- Add more options to template areas in template details. ([35577](https://github.com/WordPress/gutenberg/pull/35577))
-- Add template areas to template inspector. ([35239](https://github.com/WordPress/gutenberg/pull/35239))
-- Add template details to template parts. ([35444](https://github.com/WordPress/gutenberg/pull/35444))
-- Align the layout of the template card with the block card. ([35391](https://github.com/WordPress/gutenberg/pull/35391))
+
+-   Add more options to template areas in template details. ([35577](https://github.com/WordPress/gutenberg/pull/35577))
+-   Add template areas to template inspector. ([35239](https://github.com/WordPress/gutenberg/pull/35239))
+-   Add template details to template parts. ([35444](https://github.com/WordPress/gutenberg/pull/35444))
+-   Align the layout of the template card with the block card. ([35391](https://github.com/WordPress/gutenberg/pull/35391))
 
 #### Design Tools
-- Block Supports: Switch dimensions inspector controls slot to bubble virtually. ([34725](https://github.com/WordPress/gutenberg/pull/34725))
-- Inspector Controls: Resort the order of the design tools associated with styles hooks. ([35574](https://github.com/WordPress/gutenberg/pull/35574))
-- Post Date: Add more typography options. ([35422](https://github.com/WordPress/gutenberg/pull/35422))
+
+-   Block Supports: Switch dimensions inspector controls slot to bubble virtually. ([34725](https://github.com/WordPress/gutenberg/pull/34725))
+-   Inspector Controls: Resort the order of the design tools associated with styles hooks. ([35574](https://github.com/WordPress/gutenberg/pull/35574))
+-   Post Date: Add more typography options. ([35422](https://github.com/WordPress/gutenberg/pull/35422))
 
 #### Site Editor
-- Update site editor block placeholder styling. ([35513](https://github.com/WordPress/gutenberg/pull/35513))
-- Use a dark background for the site editor. ([35520](https://github.com/WordPress/gutenberg/pull/35520))
+
+-   Update site editor block placeholder styling. ([35513](https://github.com/WordPress/gutenberg/pull/35513))
+-   Use a dark background for the site editor. ([35520](https://github.com/WordPress/gutenberg/pull/35520))
 
 #### Block Editor
-- Add animations for insertion point, dropzone, and other elements. ([33132](https://github.com/WordPress/gutenberg/pull/33132))
-- Adjust Link UI visual styling. ([35414](https://github.com/WordPress/gutenberg/pull/35414))
+
+-   Add animations for insertion point, dropzone, and other elements. ([33132](https://github.com/WordPress/gutenberg/pull/33132))
+-   Adjust Link UI visual styling. ([35414](https://github.com/WordPress/gutenberg/pull/35414))
 
 #### Accessibility
-- Rich text popovers: Move to block tools to fix tab order. ([34956](https://github.com/WordPress/gutenberg/pull/34956))
-- Save button: Prevent focus loss. ([34731](https://github.com/WordPress/gutenberg/pull/34731))
+
+-   Rich text popovers: Move to block tools to fix tab order. ([34956](https://github.com/WordPress/gutenberg/pull/34956))
+-   Save button: Prevent focus loss. ([34731](https://github.com/WordPress/gutenberg/pull/34731))
 
 #### CSS & Styling
-- Block Supports: Add panel specific className. ([35793](https://github.com/WordPress/gutenberg/pull/35793))
 
-#### Documentation
-- Clarify documentation for InnerBlocks orientation prop. ([35712](https://github.com/WordPress/gutenberg/pull/35712))
+-   Block Supports: Add panel specific className. ([35793](https://github.com/WordPress/gutenberg/pull/35793))
 
-#### Themes
-- Add [data-block] to appender. ([35356](https://github.com/WordPress/gutenberg/pull/35356))
+#### Documentation
 
-#### Reusable Blocks
-- Thunkify reusable-blocks store. ([35217](https://github.com/WordPress/gutenberg/pull/35217))
+-   Clarify documentation for InnerBlocks orientation prop. ([35712](https://github.com/WordPress/gutenberg/pull/35712))
 
+#### Themes
 
+-   Add [data-block] to appender. ([35356](https://github.com/WordPress/gutenberg/pull/35356))
 
+#### Reusable Blocks
 
+-   Thunkify reusable-blocks store. ([35217](https://github.com/WordPress/gutenberg/pull/35217))
 
 = 11.7.0 =
 
+## Changelog
+
 ### Enhancements
 
 #### Accessibility
-- Adjust wording for post format suggestions. ([14124](https://github.com/WordPress/gutenberg/pull/14124))
-- Add a visually hidden label for the Search block. ([35034](https://github.com/WordPress/gutenberg/pull/35034))
-- Add an accessible label to the Back button in preferences. ([35340](https://github.com/WordPress/gutenberg/pull/35340))
-- Global Styles: Add accessible label to Back button. ([35325](https://github.com/WordPress/gutenberg/pull/35325))
-- Template title: Include a button and label text when there is no post/page title. ([35148](https://github.com/WordPress/gutenberg/pull/35148))
-
-
-#### Block Editor
-- Allow other blocks to use the slash inserter. ([35196](https://github.com/WordPress/gutenberg/pull/35196))
-- Enable ability to create Pages from the inline Link UI. ([35083](https://github.com/WordPress/gutenberg/pull/35083))
-- Polish quick inserter. ([35339](https://github.com/WordPress/gutenberg/pull/35339))
-- Remove visual clue from alignment toolbar. ([35080](https://github.com/WordPress/gutenberg/pull/35080))
-- Remove native block inserter onboarding tooltip. ([35150](https://github.com/WordPress/gutenberg/pull/35150))
-
-#### Block Library
-- Site Logo: Add duotone support. ([35344](https://github.com/WordPress/gutenberg/pull/35344))
-- Columns block: Enable blockGap and vertical margin support. ([34630](https://github.com/WordPress/gutenberg/pull/34630))
-- File Block: Only display PDF preview height `RangeControl` when embed is enabled. ([35207](https://github.com/WordPress/gutenberg/pull/35207))
-- Navigation: Add transformations from a link to other allowed nav blocks. ([34978](https://github.com/WordPress/gutenberg/pull/34978))
-- Query Loop: Include a Query Pagination option on the block variations. ([35347](https://github.com/WordPress/gutenberg/pull/35347))
-- Show "none" as an alignment option and use contextual text to clarify settings. ([34710](https://github.com/WordPress/gutenberg/pull/34710))
-- Social Links: Add block gap support. ([35236](https://github.com/WordPress/gutenberg/pull/35236))
-- Site Title: Add option to toggle home link. ([31540](https://github.com/WordPress/gutenberg/pull/31540))
-- Site title: update block description. ([34474](https://github.com/WordPress/gutenberg/pull/34474))
-- Transform Nav Links with children into Submenus. ([34831](https://github.com/WordPress/gutenberg/pull/34831))
-- Add an option for displaying the label inside the Navigation Link block. ([34952](https://github.com/WordPress/gutenberg/pull/34952))
-- Add typography settings for the Navigation Link block. ([35324](https://github.com/WordPress/gutenberg/pull/35324))
-- Add option to remove/clear logo from the Site Logo block. ([34820](https://github.com/WordPress/gutenberg/pull/34820))
+
+-   Adjust wording for post format suggestions. ([14124](https://github.com/WordPress/gutenberg/pull/14124))
+-   Add a visually hidden label for the Search block. ([35034](https://github.com/WordPress/gutenberg/pull/35034))
+-   Add an accessible label to the Back button in preferences. ([35340](https://github.com/WordPress/gutenberg/pull/35340))
+-   Global Styles: Add accessible label to Back button. ([35325](https://github.com/WordPress/gutenberg/pull/35325))
+-   Template title: Include a button and label text when there is no post/page title. ([35148](https://github.com/WordPress/gutenberg/pull/35148))
+
+#### Block Editor
+
+-   Allow other blocks to use the slash inserter. ([35196](https://github.com/WordPress/gutenberg/pull/35196))
+-   Enable ability to create Pages from the inline Link UI. ([35083](https://github.com/WordPress/gutenberg/pull/35083))
+-   Polish quick inserter. ([35339](https://github.com/WordPress/gutenberg/pull/35339))
+-   Remove visual clue from alignment toolbar. ([35080](https://github.com/WordPress/gutenberg/pull/35080))
+-   Remove native block inserter onboarding tooltip. ([35150](https://github.com/WordPress/gutenberg/pull/35150))
+
+#### Block Library
+
+-   Site Logo: Add duotone support. ([35344](https://github.com/WordPress/gutenberg/pull/35344))
+-   Columns block: Enable blockGap and vertical margin support. ([34630](https://github.com/WordPress/gutenberg/pull/34630))
+-   File Block: Only display PDF preview height `RangeControl` when embed is enabled. ([35207](https://github.com/WordPress/gutenberg/pull/35207))
+-   Navigation: Add transformations from a link to other allowed nav blocks. ([34978](https://github.com/WordPress/gutenberg/pull/34978))
+-   Query Loop: Include a Query Pagination option on the block variations. ([35347](https://github.com/WordPress/gutenberg/pull/35347))
+-   Show "none" as an alignment option and use contextual text to clarify settings. ([34710](https://github.com/WordPress/gutenberg/pull/34710))
+-   Social Links: Add block gap support. ([35236](https://github.com/WordPress/gutenberg/pull/35236))
+-   Site Title: Add option to toggle home link. ([31540](https://github.com/WordPress/gutenberg/pull/31540))
+-   Site title: update block description. ([34474](https://github.com/WordPress/gutenberg/pull/34474))
+-   Transform Nav Links with children into Submenus. ([34831](https://github.com/WordPress/gutenberg/pull/34831))
+-   Add an option for displaying the label inside the Navigation Link block. ([34952](https://github.com/WordPress/gutenberg/pull/34952))
+-   Add typography settings for the Navigation Link block. ([35324](https://github.com/WordPress/gutenberg/pull/35324))
+-   Add option to remove/clear logo from the Site Logo block. ([34820](https://github.com/WordPress/gutenberg/pull/34820))
 
 #### Core data
-- Add 'context' to the query parts type definition. ([35069](https://github.com/WordPress/gutenberg/pull/35069))
+
+-   Add 'context' to the query parts type definition. ([35069](https://github.com/WordPress/gutenberg/pull/35069))
 
 #### Components
-- Add new Navigator components and use them in the global styles sidebar. ([34904](https://github.com/WordPress/gutenberg/pull/34904))
-- Use _builtin property of classes in navigation link PHP. ([35166](https://github.com/WordPress/gutenberg/pull/35166))
-- `Item`:  Remove `isAction` and use `onClick` to decide if it should render as `button`. ([35152](https://github.com/WordPress/gutenberg/pull/35152))
-- Make tooltip delay configurable with a property. ([35246](https://github.com/WordPress/gutenberg/pull/35246))
+
+-   Add new Navigator components and use them in the global styles sidebar. ([34904](https://github.com/WordPress/gutenberg/pull/34904))
+-   Use \_builtin property of classes in navigation link PHP. ([35166](https://github.com/WordPress/gutenberg/pull/35166))
+-   `Item`: Remove `isAction` and use `onClick` to decide if it should render as `button`. ([35152](https://github.com/WordPress/gutenberg/pull/35152))
+-   Make tooltip delay configurable with a property. ([35246](https://github.com/WordPress/gutenberg/pull/35246))
 
 #### Design Tools
-- Block gap: Only render CSS variable if corresponding theme setting is enabled. ([35209](https://github.com/WordPress/gutenberg/pull/35209))
-- Format library: Add background color. ([34680](https://github.com/WordPress/gutenberg/pull/34680))
-- Update: Custom gradient picker design. ([34712](https://github.com/WordPress/gutenberg/pull/34712))
+
+-   Block gap: Only render CSS variable if corresponding theme setting is enabled. ([35209](https://github.com/WordPress/gutenberg/pull/35209))
+-   Format library: Add background color. ([34680](https://github.com/WordPress/gutenberg/pull/34680))
+-   Update: Custom gradient picker design. ([34712](https://github.com/WordPress/gutenberg/pull/34712))
 
 #### Global Styles
-- Add Padding to the root level of global styles. ([35241](https://github.com/WordPress/gutenberg/pull/35241))
-- Add duotone theme.json styles support. ([34667](https://github.com/WordPress/gutenberg/pull/34667))
-- Extract the color palette to its own global styles screen. ([35109](https://github.com/WordPress/gutenberg/pull/35109))
-- Update the rules to hide/show blocks in the global styles sidebar. ([35178](https://github.com/WordPress/gutenberg/pull/35178))
+
+-   Add Padding to the root level of global styles. ([35241](https://github.com/WordPress/gutenberg/pull/35241))
+-   Add duotone theme.json styles support. ([34667](https://github.com/WordPress/gutenberg/pull/34667))
+-   Extract the color palette to its own global styles screen. ([35109](https://github.com/WordPress/gutenberg/pull/35109))
+-   Update the rules to hide/show blocks in the global styles sidebar. ([35178](https://github.com/WordPress/gutenberg/pull/35178))
 
 #### Icons
-- Add color icon. ([35187](https://github.com/WordPress/gutenberg/pull/35187))
-- Rename globe icon to url. ([35032](https://github.com/WordPress/gutenberg/pull/35032))
+
+-   Add color icon. ([35187](https://github.com/WordPress/gutenberg/pull/35187))
+-   Rename globe icon to url. ([35032](https://github.com/WordPress/gutenberg/pull/35032))
 
 #### Site Editor
-- Remove warning box from post terms. ([35242](https://github.com/WordPress/gutenberg/pull/35242))
+
+-   Remove warning box from post terms. ([35242](https://github.com/WordPress/gutenberg/pull/35242))
 
 #### Template Editor
-- Add back button for isolated template part editor. ([34732](https://github.com/WordPress/gutenberg/pull/34732))
-- Add template areas to template details. ([35202](https://github.com/WordPress/gutenberg/pull/35202))
 
+-   Add back button for isolated template part editor. ([34732](https://github.com/WordPress/gutenberg/pull/34732))
+-   Add template areas to template details. ([35202](https://github.com/WordPress/gutenberg/pull/35202))
 
 ### Bug Fixes
 
 #### Block Editor
-- Block Editor: Fix duplicate clientIds when dragging patterns. ([35124](https://github.com/WordPress/gutenberg/pull/35124))
-- Disallow creation of empty links using Link UI directly. ([35060](https://github.com/WordPress/gutenberg/pull/35060))
-- Fix Link UI when hyperlink has an empty `href` value. ([35043](https://github.com/WordPress/gutenberg/pull/35043))
-- Fix missing border in the quick inserter. ([35307](https://github.com/WordPress/gutenberg/pull/35307))
-- Fix toggle off for Duotone control and Post Date block’s date picking control. ([35024](https://github.com/WordPress/gutenberg/pull/35024))
-- useMultiSelection: Avoid crashing editor when block refs aren't available. ([35177](https://github.com/WordPress/gutenberg/pull/35177))
-- Rich text: fix internal paste across multiline and single line instances. ([35416](https://github.com/WordPress/gutenberg/pull/35416))
 
-#### Block Library
-- Embed: Remove meetup-com from variations. ([35146](https://github.com/WordPress/gutenberg/pull/35146))
-- Featured Image: Remove descendent space. ([35273](https://github.com/WordPress/gutenberg/pull/35273))
-- Fix: Broken disabled select style in the editor area. ([35135](https://github.com/WordPress/gutenberg/pull/35135))
-- Fix native BlockAlignmentControl. ([35191](https://github.com/WordPress/gutenberg/pull/35191))
-- Gallery block: Fix Safari image sizing issue. ([35309](https://github.com/WordPress/gutenberg/pull/35309))
-- Gallery block: Fix problem with caption showing encode tags when not selected. ([35131](https://github.com/WordPress/gutenberg/pull/35131))
-- Gallery block: Unset alignment on new images to prevent it breaking layout. ([35132](https://github.com/WordPress/gutenberg/pull/35132))
-- Post Template: Remove margins from the block. ([35193](https://github.com/WordPress/gutenberg/pull/35193))
-- Post Title: Always use blockProps. ([35286](https://github.com/WordPress/gutenberg/pull/35286))
-- Post Title: Only render link element if we have a post. ([35284](https://github.com/WordPress/gutenberg/pull/35284))
-- Query Pagination: Don't render an empty container. ([35092](https://github.com/WordPress/gutenberg/pull/35092))
-- Navigation Link: Fix PHP notice in the Navigation Link block. ([34984](https://github.com/WordPress/gutenberg/pull/34984))
-- Fix Post Comment Content block's edit function. ([35190](https://github.com/WordPress/gutenberg/pull/35190))
+-   Block Editor: Fix duplicate clientIds when dragging patterns. ([35124](https://github.com/WordPress/gutenberg/pull/35124))
+-   Disallow creation of empty links using Link UI directly. ([35060](https://github.com/WordPress/gutenberg/pull/35060))
+-   Fix Link UI when hyperlink has an empty `href` value. ([35043](https://github.com/WordPress/gutenberg/pull/35043))
+-   Fix missing border in the quick inserter. ([35307](https://github.com/WordPress/gutenberg/pull/35307))
+-   Fix toggle off for Duotone control and Post Date block’s date picking control. ([35024](https://github.com/WordPress/gutenberg/pull/35024))
+-   useMultiSelection: Avoid crashing editor when block refs aren't available. ([35177](https://github.com/WordPress/gutenberg/pull/35177))
+-   Rich text: fix internal paste across multiline and single line instances. ([35416](https://github.com/WordPress/gutenberg/pull/35416))
+
+#### Block Library
+
+-   Embed: Remove meetup-com from variations. ([35146](https://github.com/WordPress/gutenberg/pull/35146))
+-   Featured Image: Remove descendent space. ([35273](https://github.com/WordPress/gutenberg/pull/35273))
+-   Fix: Broken disabled select style in the editor area. ([35135](https://github.com/WordPress/gutenberg/pull/35135))
+-   Fix native BlockAlignmentControl. ([35191](https://github.com/WordPress/gutenberg/pull/35191))
+-   Gallery block: Fix Safari image sizing issue. ([35309](https://github.com/WordPress/gutenberg/pull/35309))
+-   Gallery block: Fix problem with caption showing encode tags when not selected. ([35131](https://github.com/WordPress/gutenberg/pull/35131))
+-   Gallery block: Unset alignment on new images to prevent it breaking layout. ([35132](https://github.com/WordPress/gutenberg/pull/35132))
+-   Post Template: Remove margins from the block. ([35193](https://github.com/WordPress/gutenberg/pull/35193))
+-   Post Title: Always use blockProps. ([35286](https://github.com/WordPress/gutenberg/pull/35286))
+-   Post Title: Only render link element if we have a post. ([35284](https://github.com/WordPress/gutenberg/pull/35284))
+-   Query Pagination: Don't render an empty container. ([35092](https://github.com/WordPress/gutenberg/pull/35092))
+-   Navigation Link: Fix PHP notice in the Navigation Link block. ([34984](https://github.com/WordPress/gutenberg/pull/34984))
+-   Fix Post Comment Content block's edit function. ([35190](https://github.com/WordPress/gutenberg/pull/35190))
 
 #### Components
-- Color Picker: Match figma metrics. ([35039](https://github.com/WordPress/gutenberg/pull/35039))
-- Remove shift-stepping from range in RangeControl. ([35020](https://github.com/WordPress/gutenberg/pull/35020))
-- Popover: fix __unstableBoundaryParent ([35082](https://github.com/WordPress/gutenberg/pull/35082))
+
+-   Color Picker: Match figma metrics. ([35039](https://github.com/WordPress/gutenberg/pull/35039))
+-   Remove shift-stepping from range in RangeControl. ([35020](https://github.com/WordPress/gutenberg/pull/35020))
+-   Popover: fix \_\_unstableBoundaryParent ([35082](https://github.com/WordPress/gutenberg/pull/35082))
 
 #### Design Tools
-- ToolsPanelItem: Add panelId check before calling toggle methods. ([35375](https://github.com/WordPress/gutenberg/pull/35375))
+
+-   ToolsPanelItem: Add panelId check before calling toggle methods. ([35375](https://github.com/WordPress/gutenberg/pull/35375))
 
 #### Media
-- MediaUpload: Ensure current images in a gallery are selected after opening media library. ([35070](https://github.com/WordPress/gutenberg/pull/35070))
+
+-   MediaUpload: Ensure current images in a gallery are selected after opening media library. ([35070](https://github.com/WordPress/gutenberg/pull/35070))
 
 #### Post Editor
-- Fix missing save label. ([34948](https://github.com/WordPress/gutenberg/pull/34948))
-- Keyboard shortcut: Prevent post saving through keyboard if post saving locked. ([35361](https://github.com/WordPress/gutenberg/pull/35361))
+
+-   Fix missing save label. ([34948](https://github.com/WordPress/gutenberg/pull/34948))
+-   Keyboard shortcut: Prevent post saving through keyboard if post saving locked. ([35361](https://github.com/WordPress/gutenberg/pull/35361))
 
 #### REST API
-- API Fetch: Improve isMediaUploadRequest check. ([34417](https://github.com/WordPress/gutenberg/pull/34417))
-- Fix slashing when creating or updating a menu item. ([35147](https://github.com/WordPress/gutenberg/pull/35147))
+
+-   API Fetch: Improve isMediaUploadRequest check. ([34417](https://github.com/WordPress/gutenberg/pull/34417))
+-   Fix slashing when creating or updating a menu item. ([35147](https://github.com/WordPress/gutenberg/pull/35147))
 
 #### Server Side Render
-- Prevent empty renders in ServerSideRender component caused by changing props while already fetching markup ([35433](https://github.com/WordPress/gutenberg/pull/35433))
+
+-   Prevent empty renders in ServerSideRender component caused by changing props while already fetching markup ([35433](https://github.com/WordPress/gutenberg/pull/35433))
 
 #### Template Editor
-- Fix the styling of template details. ([35285](https://github.com/WordPress/gutenberg/pull/35285))
+
+-   Fix the styling of template details. ([35285](https://github.com/WordPress/gutenberg/pull/35285))
 
 #### Widgets Editor
-- inspector-section: Track isOpen to make a better isContextuallyActive() function. ([35055](https://github.com/WordPress/gutenberg/pull/35055))
 
+-   inspector-section: Track isOpen to make a better isContextuallyActive() function. ([35055](https://github.com/WordPress/gutenberg/pull/35055))
 
 ### Performance
 
-- Edit Site: Optimize useSelect calls. ([35213](https://github.com/WordPress/gutenberg/pull/35213))
-- Memoize entity records selectors properly. ([34323](https://github.com/WordPress/gutenberg/pull/34323))
-- Widgets: Optimize useSelect calls. ([35256](https://github.com/WordPress/gutenberg/pull/35256))
-
+-   Edit Site: Optimize useSelect calls. ([35213](https://github.com/WordPress/gutenberg/pull/35213))
+-   Memoize entity records selectors properly. ([34323](https://github.com/WordPress/gutenberg/pull/34323))
+-   Widgets: Optimize useSelect calls. ([35256](https://github.com/WordPress/gutenberg/pull/35256))
 
 ### Experiments
 
 #### Block Library
-- Polish responsive navigation modal, inherit justifications, fix submenu direction. ([35077](https://github.com/WordPress/gutenberg/pull/35077))
-- Polish submenu indicator button. ([35030](https://github.com/WordPress/gutenberg/pull/35030))
-- Fix: Adding nav items from existing menu. ([34837](https://github.com/WordPress/gutenberg/pull/34837))
+
+-   Polish responsive navigation modal, inherit justifications, fix submenu direction. ([35077](https://github.com/WordPress/gutenberg/pull/35077))
+-   Polish submenu indicator button. ([35030](https://github.com/WordPress/gutenberg/pull/35030))
+-   Fix: Adding nav items from existing menu. ([34837](https://github.com/WordPress/gutenberg/pull/34837))
 
 #### Global Styles
-- Add Padding to the root level of global styles. ([35241](https://github.com/WordPress/gutenberg/pull/35241))
-- Add duotone theme.json styles support. ([34667](https://github.com/WordPress/gutenberg/pull/34667))
-- Block gap: Only render CSS variable if corresponding theme setting is enabled. ([35209](https://github.com/WordPress/gutenberg/pull/35209))
-- Extract the color palette to its own global styles screen. ([35109](https://github.com/WordPress/gutenberg/pull/35109))
-- Update the rules to hide/show blocks in the global styles sidebar. ([35178](https://github.com/WordPress/gutenberg/pull/35178))
-- Clean up logic to retrieve GS settings depending on context. ([35437](https://github.com/WordPress/gutenberg/pull/35437))
-- Synchronize user custom post type registration and UI visibility. ([35427](https://github.com/WordPress/gutenberg/pull/35427))
-- Enqueue preset styles for all themes in the editor. ([35424](https://github.com/WordPress/gutenberg/pull/35424))
 
+-   Add Padding to the root level of global styles. ([35241](https://github.com/WordPress/gutenberg/pull/35241))
+-   Add duotone theme.json styles support. ([34667](https://github.com/WordPress/gutenberg/pull/34667))
+-   Block gap: Only render CSS variable if corresponding theme setting is enabled. ([35209](https://github.com/WordPress/gutenberg/pull/35209))
+-   Extract the color palette to its own global styles screen. ([35109](https://github.com/WordPress/gutenberg/pull/35109))
+-   Update the rules to hide/show blocks in the global styles sidebar. ([35178](https://github.com/WordPress/gutenberg/pull/35178))
+-   Clean up logic to retrieve GS settings depending on context. ([35437](https://github.com/WordPress/gutenberg/pull/35437))
+-   Synchronize user custom post type registration and UI visibility. ([35427](https://github.com/WordPress/gutenberg/pull/35427))
+-   Enqueue preset styles for all themes in the editor. ([35424](https://github.com/WordPress/gutenberg/pull/35424))
 
 #### Navigation Screen
-- Remove i18n of help link in navigation editor. ([35313](https://github.com/WordPress/gutenberg/pull/35313))
-- Add a tooltip to Navigation items in a setup state. ([35139](https://github.com/WordPress/gutenberg/pull/35139))
-- Fix gap regression in navigation screen. ([35234](https://github.com/WordPress/gutenberg/pull/35234))
-- Truncate long menu names. ([35188](https://github.com/WordPress/gutenberg/pull/35188))
-- Insert Navigation Link blocks by default in Navigation block. ([34899](https://github.com/WordPress/gutenberg/pull/34899))
-- Migrate resolvers to thunks. ([35044](https://github.com/WordPress/gutenberg/pull/35044))
+
+-   Remove i18n of help link in navigation editor. ([35313](https://github.com/WordPress/gutenberg/pull/35313))
+-   Add a tooltip to Navigation items in a setup state. ([35139](https://github.com/WordPress/gutenberg/pull/35139))
+-   Fix gap regression in navigation screen. ([35234](https://github.com/WordPress/gutenberg/pull/35234))
+-   Truncate long menu names. ([35188](https://github.com/WordPress/gutenberg/pull/35188))
+-   Insert Navigation Link blocks by default in Navigation block. ([34899](https://github.com/WordPress/gutenberg/pull/34899))
+-   Migrate resolvers to thunks. ([35044](https://github.com/WordPress/gutenberg/pull/35044))
 
 #### Full Site Editing
-- Remove extra styling around "Post content" placeholder. ([35243](https://github.com/WordPress/gutenberg/pull/35243))
 
+-   Remove extra styling around "Post content" placeholder. ([35243](https://github.com/WordPress/gutenberg/pull/35243))
 
 ### Documentation
 
 #### Handbook
-- Docs: Update testing overview with minor fixes. ([35232](https://github.com/WordPress/gutenberg/pull/35232))
-- Fix typos, grammar in contributors release doc. ([35268](https://github.com/WordPress/gutenberg/pull/35268))
-- Update `nvm` to latest `0.38.0` version in Handbook. ([35125](https://github.com/WordPress/gutenberg/pull/35125))
-- Adding example readme template to contributing guidelines. ([34847](https://github.com/WordPress/gutenberg/pull/34847))
-- Fix erroneous usage of the word `master`. ([35392](https://github.com/WordPress/gutenberg/pull/35392))
+
+-   Docs: Update testing overview with minor fixes. ([35232](https://github.com/WordPress/gutenberg/pull/35232))
+-   Fix typos, grammar in contributors release doc. ([35268](https://github.com/WordPress/gutenberg/pull/35268))
+-   Update `nvm` to latest `0.38.0` version in Handbook. ([35125](https://github.com/WordPress/gutenberg/pull/35125))
+-   Adding example readme template to contributing guidelines. ([34847](https://github.com/WordPress/gutenberg/pull/34847))
+-   Fix erroneous usage of the word `master`. ([35392](https://github.com/WordPress/gutenberg/pull/35392))
 
 #### Packages
-- Add instructions for installing plugins/themes with wp-env. ([35064](https://github.com/WordPress/gutenberg/pull/35064))
-- MediaUpload: Reflect the correct filter name in the readme. ([35240](https://github.com/WordPress/gutenberg/pull/35240))
-- Update LinkControl documentation with additional examples. ([35199](https://github.com/WordPress/gutenberg/pull/35199))
-- Update doc block in block editor to fix documentation generation lint error. ([35295](https://github.com/WordPress/gutenberg/pull/35295))
-- Add missing doc blocks for the exported members of edit-widgets store. ([35263](https://github.com/WordPress/gutenberg/pull/35263))
+
+-   Add instructions for installing plugins/themes with wp-env. ([35064](https://github.com/WordPress/gutenberg/pull/35064))
+-   MediaUpload: Reflect the correct filter name in the readme. ([35240](https://github.com/WordPress/gutenberg/pull/35240))
+-   Update LinkControl documentation with additional examples. ([35199](https://github.com/WordPress/gutenberg/pull/35199))
+-   Update doc block in block editor to fix documentation generation lint error. ([35295](https://github.com/WordPress/gutenberg/pull/35295))
+-   Add missing doc blocks for the exported members of edit-widgets store. ([35263](https://github.com/WordPress/gutenberg/pull/35263))
 
 ### Code Quality
 
 #### Block Editor
-- Add colord package to block editor; Replace tinycolor2 with colord on duotone. (https://github.com/WordPress/gutenberg/pull/34616), [34605](https://github.com/WordPress/gutenberg/pull/34605), [35165](https://github.com/WordPress/gutenberg/pull/35165), [35164](https://github.com/WordPress/gutenberg/pull/35164))
-- Migrate the toggleFeature action to a thunk. ([35075](https://github.com/WordPress/gutenberg/pull/35075))
+
+-   Add colord package to block editor; Replace tinycolor2 with colord on duotone. (https://github.com/WordPress/gutenberg/pull/34616), [34605](https://github.com/WordPress/gutenberg/pull/34605), [35165](https://github.com/WordPress/gutenberg/pull/35165), [35164](https://github.com/WordPress/gutenberg/pull/35164))
+-   Migrate the toggleFeature action to a thunk. ([35075](https://github.com/WordPress/gutenberg/pull/35075))
 
 #### Block Library
-- Migrate store actions to thunks. ([35031](https://github.com/WordPress/gutenberg/pull/35031))
-- Post Title Block: Fix argument numbering in 'sprintf'. ([35338](https://github.com/WordPress/gutenberg/pull/35338))
-- Replace tinycolor2 with colord on block library package. ([35184](https://github.com/WordPress/gutenberg/pull/35184)
 
+-   Migrate store actions to thunks. ([35031](https://github.com/WordPress/gutenberg/pull/35031))
+-   Post Title Block: Fix argument numbering in 'sprintf'. ([35338](https://github.com/WordPress/gutenberg/pull/35338))
+-   Replace tinycolor2 with colord on block library package. ([35184](https://github.com/WordPress/gutenberg/pull/35184)
 
 #### Components
-- Refactor `Navigator*` folder structure, rename `Navigator` to `NavigatorProvider`. ([35160](https://github.com/WordPress/gutenberg/pull/35160))
-- Replace tinycolor2 with colord. ([35185](https://github.com/WordPress/gutenberg/pull/35185))
-- ToolsPanel component: Refactor to typescript. ([34028](https://github.com/WordPress/gutenberg/pull/34028))
-- UnitControl component: Refactor utils to TypeScript. ([35138](https://github.com/WordPress/gutenberg/pull/35138))
-- Do not export `SimpleColorSwatch` in Storybook examples for Item Group. ([35179](https://github.com/WordPress/gutenberg/pull/35179))
-- Refactor Navigator to TypeScript. ([35214](https://github.com/WordPress/gutenberg/pull/35214))
+
+-   Refactor `Navigator*` folder structure, rename `Navigator` to `NavigatorProvider`. ([35160](https://github.com/WordPress/gutenberg/pull/35160))
+-   Replace tinycolor2 with colord. ([35185](https://github.com/WordPress/gutenberg/pull/35185))
+-   ToolsPanel component: Refactor to typescript. ([34028](https://github.com/WordPress/gutenberg/pull/34028))
+-   UnitControl component: Refactor utils to TypeScript. ([35138](https://github.com/WordPress/gutenberg/pull/35138))
+-   Do not export `SimpleColorSwatch` in Storybook examples for Item Group. ([35179](https://github.com/WordPress/gutenberg/pull/35179))
+-   Refactor Navigator to TypeScript. ([35214](https://github.com/WordPress/gutenberg/pull/35214))
 
 #### Global Styles
-- Simplify code that deals with user data for clarity. ([35248](https://github.com/WordPress/gutenberg/pull/35248))
-- Simplify how we register preset metadata. ([35228](https://github.com/WordPress/gutenberg/pull/35228))
-- Reorganize the global styles UI code base. ([35218](https://github.com/WordPress/gutenberg/pull/35218))
-- Don't output preset classes for colors defined by the theme ([35514](https://github.com/WordPress/gutenberg/pull/35514))
+
+-   Simplify code that deals with user data for clarity. ([35248](https://github.com/WordPress/gutenberg/pull/35248))
+-   Simplify how we register preset metadata. ([35228](https://github.com/WordPress/gutenberg/pull/35228))
+-   Reorganize the global styles UI code base. ([35218](https://github.com/WordPress/gutenberg/pull/35218))
+-   Don't output preset classes for colors defined by the theme ([35514](https://github.com/WordPress/gutenberg/pull/35514))
 
 #### Post Editor
-- Keyboard Shortcuts: Use a new selector getter method. ([35385](https://github.com/WordPress/gutenberg/pull/35385))
+
+-   Keyboard Shortcuts: Use a new selector getter method. ([35385](https://github.com/WordPress/gutenberg/pull/35385))
 
 #### Navigation Component
-- Refactor the preferences modal to use the new Navigator components. ([35142](https://github.com/WordPress/gutenberg/pull/35142))
-- Navigation Editor: Remove duplicated stripHTML. ([35189](https://github.com/WordPress/gutenberg/pull/35189))
+
+-   Refactor the preferences modal to use the new Navigator components. ([35142](https://github.com/WordPress/gutenberg/pull/35142))
+-   Navigation Editor: Remove duplicated stripHTML. ([35189](https://github.com/WordPress/gutenberg/pull/35189))
 
 #### Widgets Editor
-- Migrate edit-widgets store to thunks. ([35110](https://github.com/WordPress/gutenberg/pull/35110))
+
+-   Migrate edit-widgets store to thunks. ([35110](https://github.com/WordPress/gutenberg/pull/35110))
 
 ### Tools
 
 #### Build Tooling
-- Remove polyfills from view.js block scripts. ([35038](https://github.com/WordPress/gutenberg/pull/35038))
+
+-   Remove polyfills from view.js block scripts. ([35038](https://github.com/WordPress/gutenberg/pull/35038))
 
 #### Testing
-- Add tests for `Navigator*`. ([35163](https://github.com/WordPress/gutenberg/pull/35163))
-- Enable flaky tests reporter bot in PRs. ([35029](https://github.com/WordPress/gutenberg/pull/35029))
-- Replace tinycolor2 with colord on getMostReadableColor util. Add unit test. ([34625](https://github.com/WordPress/gutenberg/pull/34625))
-- Try fixing flaky navigation test. ([35380](https://github.com/WordPress/gutenberg/pull/35380))
-- Fix not archiving failure artifacts for flaky tests. ([35379](https://github.com/WordPress/gutenberg/pull/35379))
 
+-   Add tests for `Navigator*`. ([35163](https://github.com/WordPress/gutenberg/pull/35163))
+-   Enable flaky tests reporter bot in PRs. ([35029](https://github.com/WordPress/gutenberg/pull/35029))
+-   Replace tinycolor2 with colord on getMostReadableColor util. Add unit test. ([34625](https://github.com/WordPress/gutenberg/pull/34625))
+-   Try fixing flaky navigation test. ([35380](https://github.com/WordPress/gutenberg/pull/35380))
+-   Fix not archiving failure artifacts for flaky tests. ([35379](https://github.com/WordPress/gutenberg/pull/35379))
 
 #### Plugins
-- Add `oandregal` and `tellthemachines` to codeowners file. ([35233](https://github.com/WordPress/gutenberg/pull/35233))
 
+-   Add `oandregal` and `tellthemachines` to codeowners file. ([35233](https://github.com/WordPress/gutenberg/pull/35233))
 
 = 11.6.0 =
 
+## Changelog
+
 ### Enhancements
 
 #### Block Library
-- Post Title block: Add typography formatting options. ([31623](https://github.com/WordPress/gutenberg/pull/31623))
-- Query Pagination block: Use flex layout. ([34876](https://github.com/WordPress/gutenberg/pull/34876))
-- Site logo: Add site logo crop. ([31607](https://github.com/WordPress/gutenberg/pull/31607))
-- Cover: Move cover min-height into dimensions panel via SlotFill. ([34065](https://github.com/WordPress/gutenberg/pull/34065))
-- Group Block: Add information about selected element types for Group Block. ([33976](https://github.com/WordPress/gutenberg/pull/33976))
-- Image Block: Create two-way data binding for ImageSizeControl. ([34649](https://github.com/WordPress/gutenberg/pull/34649))
-- Columns Block: Update block description of columns block. ([34705](https://github.com/WordPress/gutenberg/pull/34705))
-- Gallery block: Add toolbar button to convert old galleries to new format. ([34606](https://github.com/WordPress/gutenberg/pull/34606))
+
+-   Post Title block: Add typography formatting options. ([31623](https://github.com/WordPress/gutenberg/pull/31623))
+-   Query Pagination block: Use flex layout. ([34876](https://github.com/WordPress/gutenberg/pull/34876))
+-   Site logo: Add site logo crop. ([31607](https://github.com/WordPress/gutenberg/pull/31607))
+-   Cover: Move cover min-height into dimensions panel via SlotFill. ([34065](https://github.com/WordPress/gutenberg/pull/34065))
+-   Group Block: Add information about selected element types for Group Block. ([33976](https://github.com/WordPress/gutenberg/pull/33976))
+-   Image Block: Create two-way data binding for ImageSizeControl. ([34649](https://github.com/WordPress/gutenberg/pull/34649))
+-   Columns Block: Update block description of columns block. ([34705](https://github.com/WordPress/gutenberg/pull/34705))
+-   Gallery block: Add toolbar button to convert old galleries to new format. ([34606](https://github.com/WordPress/gutenberg/pull/34606))
 
 #### Block Editor
-- Format toolbar: Visual clue for hidden active items. ([21892](https://github.com/WordPress/gutenberg/pull/21892))
-- Increase Link UI search results to 10 on the Navigation Editor screen. ([34808](https://github.com/WordPress/gutenberg/pull/34808))
-- Inserter: Pass filter value when clicking Browse All. ([34912](https://github.com/WordPress/gutenberg/pull/34912))
+
+-   Format toolbar: Visual clue for hidden active items. ([21892](https://github.com/WordPress/gutenberg/pull/21892))
+-   Increase Link UI search results to 10 on the Navigation Editor screen. ([34808](https://github.com/WordPress/gutenberg/pull/34808))
+-   Inserter: Pass filter value when clicking Browse All. ([34912](https://github.com/WordPress/gutenberg/pull/34912))
 
 #### Components
-- ColorPicker: Enhance the new color picker design. ([34598](https://github.com/WordPress/gutenberg/pull/34598))
-- ColorPicker: Add reset timeout to ColorPicker's copy functionality. ([34601](https://github.com/WordPress/gutenberg/pull/34601))
-- ToolsPanel: Refine component behaviour. ([34530](https://github.com/WordPress/gutenberg/pull/34530))
-- Resize Handles: Fix stroke width of resize handles. ([34949](https://github.com/WordPress/gutenberg/pull/34949))
-- ServerSideRender: Improve ServerSideRender Component to retain preview of the component while it is loading new state. ([28289](https://github.com/WordPress/gutenberg/pull/28289))
-- ServerSideRender: Delayed loading state of ServerSideRender component. ([35033](https://github.com/WordPress/gutenberg/pull/35033))
+
+-   ColorPicker: Enhance the new color picker design. ([34598](https://github.com/WordPress/gutenberg/pull/34598))
+-   ColorPicker: Add reset timeout to ColorPicker's copy functionality. ([34601](https://github.com/WordPress/gutenberg/pull/34601))
+-   ToolsPanel: Refine component behaviour. ([34530](https://github.com/WordPress/gutenberg/pull/34530))
+-   Resize Handles: Fix stroke width of resize handles. ([34949](https://github.com/WordPress/gutenberg/pull/34949))
+-   ServerSideRender: Improve ServerSideRender Component to retain preview of the component while it is loading new state. ([28289](https://github.com/WordPress/gutenberg/pull/28289))
+-   ServerSideRender: Delayed loading state of ServerSideRender component. ([35033](https://github.com/WordPress/gutenberg/pull/35033))
 
 #### Global Styles
-- Add a simple Global Styles preview to the sidebar. ([34991](https://github.com/WordPress/gutenberg/pull/34991))
-- Update the Global Styles Icon and use it in the site editor's panel. ([34871](https://github.com/WordPress/gutenberg/pull/34871))
-- Update the global styles sidebar to use a navigation component. ([34885](https://github.com/WordPress/gutenberg/pull/34885))
+
+-   Add a simple Global Styles preview to the sidebar. ([34991](https://github.com/WordPress/gutenberg/pull/34991))
+-   Update the Global Styles Icon and use it in the site editor's panel. ([34871](https://github.com/WordPress/gutenberg/pull/34871))
+-   Update the global styles sidebar to use a navigation component. ([34885](https://github.com/WordPress/gutenberg/pull/34885))
 
 #### Widgets Editor
-- Widget Group: Make title directly editable. ([34799](https://github.com/WordPress/gutenberg/pull/34799))
+
+-   Widget Group: Make title directly editable. ([34799](https://github.com/WordPress/gutenberg/pull/34799))
 
 #### Template Editor
-- Add edit template part menu button. ([34679](https://github.com/WordPress/gutenberg/pull/34679))
+
+-   Add edit template part menu button. ([34679](https://github.com/WordPress/gutenberg/pull/34679))
 
 #### Themes
-- FSE: Add basic support for child themes. ([34354](https://github.com/WordPress/gutenberg/pull/34354))
+
+-   FSE: Add basic support for child themes. ([34354](https://github.com/WordPress/gutenberg/pull/34354))
 
 ### New APIs
 
 #### Block API
-- Introduce lock control at the block-type level. ([32457](https://github.com/WordPress/gutenberg/pull/32457))
+
+-   Introduce lock control at the block-type level. ([32457](https://github.com/WordPress/gutenberg/pull/32457))
 
 #### Design Tools
-- InspectorControls: Wrap block support slots in ToolsPanel. ([34157](https://github.com/WordPress/gutenberg/pull/34157))
+
+-   InspectorControls: Wrap block support slots in ToolsPanel. ([34157](https://github.com/WordPress/gutenberg/pull/34157))
 
 ### Accessibility
-- Improve file block accessibility by adding aria-describedby to download button. ([28062](https://github.com/WordPress/gutenberg/pull/28062))
-- Button Block: Add prefix to the description ID. ([34900](https://github.com/WordPress/gutenberg/pull/34900))
-- Snackbar: Fix focus loss on dismiss. ([34736](https://github.com/WordPress/gutenberg/pull/34736))
+
+-   Improve file block accessibility by adding aria-describedby to download button. ([28062](https://github.com/WordPress/gutenberg/pull/28062))
+-   Button Block: Add prefix to the description ID. ([34900](https://github.com/WordPress/gutenberg/pull/34900))
+-   Snackbar: Fix focus loss on dismiss. ([34736](https://github.com/WordPress/gutenberg/pull/34736))
 
 ### Performance
-- List View: Try disabling async mode provider around selected block in ListView. ([34519](https://github.com/WordPress/gutenberg/pull/34519))
+
+-   List View: Try disabling async mode provider around selected block in ListView. ([34519](https://github.com/WordPress/gutenberg/pull/34519))
 
 ### Bug Fixes
 
 #### Block Editor
-- Copy Handler: Only handle paste event once. ([34430](https://github.com/WordPress/gutenberg/pull/34430))
-- Fix save-state indicator appearance. ([34947](https://github.com/WordPress/gutenberg/pull/34947))
-- MediaReplaceFlow: Avoid React warning when selecting media. ([34618](https://github.com/WordPress/gutenberg/pull/34618))
-- Remove .has-link-color class upon clearing the link color. ([34700](https://github.com/WordPress/gutenberg/pull/34700))
-- Rich Text: Fix arrow navigation with consecutive formats. ([35014](https://github.com/WordPress/gutenberg/pull/35014))
-- Rich Text: Also strip object replacement character when removing padding. ([34851](https://github.com/WordPress/gutenberg/pull/34851))
-- Writing flow: Fix focus trap on non-text input types. ([32714](https://github.com/WordPress/gutenberg/pull/32714))
-- Fix bug in the receiveBlocks action resulting in a broken block list. ([35076](https://github.com/WordPress/gutenberg/pull/35076))
+
+-   Copy Handler: Only handle paste event once. ([34430](https://github.com/WordPress/gutenberg/pull/34430))
+-   Fix save-state indicator appearance. ([34947](https://github.com/WordPress/gutenberg/pull/34947))
+-   MediaReplaceFlow: Avoid React warning when selecting media. ([34618](https://github.com/WordPress/gutenberg/pull/34618))
+-   Remove .has-link-color class upon clearing the link color. ([34700](https://github.com/WordPress/gutenberg/pull/34700))
+-   Rich Text: Fix arrow navigation with consecutive formats. ([35014](https://github.com/WordPress/gutenberg/pull/35014))
+-   Rich Text: Also strip object replacement character when removing padding. ([34851](https://github.com/WordPress/gutenberg/pull/34851))
+-   Writing flow: Fix focus trap on non-text input types. ([32714](https://github.com/WordPress/gutenberg/pull/32714))
+-   Fix bug in the receiveBlocks action resulting in a broken block list. ([35076](https://github.com/WordPress/gutenberg/pull/35076))
 
 #### Block Library
-- HTML block: Prevent external styling of editing UI. ([34727](https://github.com/WordPress/gutenberg/pull/34727))
-- Page List Block: Fix gap in vertical page list. ([35026](https://github.com/WordPress/gutenberg/pull/35026))
-- MediaPlaceholder: Fix media library button opening the file upload modal. ([34894](https://github.com/WordPress/gutenberg/pull/34894))
-- QueryPagination: Fix layout support. ([34897](https://github.com/WordPress/gutenberg/pull/34897))
-- Query Pagination: Fix center alignment. ([34739](https://github.com/WordPress/gutenberg/pull/34739))
-- Group block: Lower CSS specificity of padding declaration. ([34854](https://github.com/WordPress/gutenberg/pull/34854))
+
+-   HTML block: Prevent external styling of editing UI. ([34727](https://github.com/WordPress/gutenberg/pull/34727))
+-   Page List Block: Fix gap in vertical page list. ([35026](https://github.com/WordPress/gutenberg/pull/35026))
+-   MediaPlaceholder: Fix media library button opening the file upload modal. ([34894](https://github.com/WordPress/gutenberg/pull/34894))
+-   QueryPagination: Fix layout support. ([34897](https://github.com/WordPress/gutenberg/pull/34897))
+-   Query Pagination: Fix center alignment. ([34739](https://github.com/WordPress/gutenberg/pull/34739))
+-   Group block: Lower CSS specificity of padding declaration. ([34854](https://github.com/WordPress/gutenberg/pull/34854))
 
 #### Global Styles
-- Cache global stylesheet keyed by theme. ([34704](https://github.com/WordPress/gutenberg/pull/34704))
-- Clean theme data when switching themes in the customizer. ([34540](https://github.com/WordPress/gutenberg/pull/34540))
-- Fix dimensions panel default controls display. ([34828](https://github.com/WordPress/gutenberg/pull/34828))
-- Fix for link color in containers. ([34689](https://github.com/WordPress/gutenberg/pull/34689))
+
+-   Cache global stylesheet keyed by theme. ([34704](https://github.com/WordPress/gutenberg/pull/34704))
+-   Clean theme data when switching themes in the customizer. ([34540](https://github.com/WordPress/gutenberg/pull/34540))
+-   Fix dimensions panel default controls display. ([34828](https://github.com/WordPress/gutenberg/pull/34828))
+-   Fix for link color in containers. ([34689](https://github.com/WordPress/gutenberg/pull/34689))
 
 #### Components
-- Fix Dropdown/DropdownMenu toggle closing in all UAs. ([31170](https://github.com/WordPress/gutenberg/pull/31170))
-- Font Appearance Control: Fix selectedItem downshift uncontrolled prop warning. ([34721](https://github.com/WordPress/gutenberg/pull/34721))
-- ToolsPanel: Allow SlotFill injection of panel items. ([34632](https://github.com/WordPress/gutenberg/pull/34632))
-- ToolsPanel: Remove / re-register panel items if the panelId changes. ([34726](https://github.com/WordPress/gutenberg/pull/34726))
-- ToogleGroupControl: Fix update when unmounted. ([34756](https://github.com/WordPress/gutenberg/pull/34756))
-- Unit Control: Always display current unit value if valid. ([34768](https://github.com/WordPress/gutenberg/pull/34768))
+
+-   Fix Dropdown/DropdownMenu toggle closing in all UAs. ([31170](https://github.com/WordPress/gutenberg/pull/31170))
+-   Font Appearance Control: Fix selectedItem downshift uncontrolled prop warning. ([34721](https://github.com/WordPress/gutenberg/pull/34721))
+-   ToolsPanel: Allow SlotFill injection of panel items. ([34632](https://github.com/WordPress/gutenberg/pull/34632))
+-   ToolsPanel: Remove / re-register panel items if the panelId changes. ([34726](https://github.com/WordPress/gutenberg/pull/34726))
+-   ToogleGroupControl: Fix update when unmounted. ([34756](https://github.com/WordPress/gutenberg/pull/34756))
+-   Unit Control: Always display current unit value if valid. ([34768](https://github.com/WordPress/gutenberg/pull/34768))
 
 #### Template Editor
-- Fixes left & right floats for blocks that are direct children of .wp-site-blocks. ([34635](https://github.com/WordPress/gutenberg/pull/34635))
-- Fix new template form onSubmit logic. ([34988](https://github.com/WordPress/gutenberg/pull/34988))
+
+-   Fixes left & right floats for blocks that are direct children of .wp-site-blocks. ([34635](https://github.com/WordPress/gutenberg/pull/34635))
+-   Fix new template form onSubmit logic. ([34988](https://github.com/WordPress/gutenberg/pull/34988))
 
 #### REST API
-- Add missing field _invalid in menu item REST API. ([34670](https://github.com/WordPress/gutenberg/pull/34670))
-- Fix 'menu_exists' response status code. ([34888](https://github.com/WordPress/gutenberg/pull/34888))
-- Remove parent and position validation from menu item REST API endpoint. ([34672](https://github.com/WordPress/gutenberg/pull/34672))
-- Filters are incorrectly applied in the __experimental/menu-items controller. ([34857](https://github.com/WordPress/gutenberg/pull/34857))
-- Fix the parent menu item field in REST API responses. ([34835](https://github.com/WordPress/gutenberg/pull/34835))
 
+-   Add missing field \_invalid in menu item REST API. ([34670](https://github.com/WordPress/gutenberg/pull/34670))
+-   Fix 'menu_exists' response status code. ([34888](https://github.com/WordPress/gutenberg/pull/34888))
+-   Remove parent and position validation from menu item REST API endpoint. ([34672](https://github.com/WordPress/gutenberg/pull/34672))
+-   Filters are incorrectly applied in the \_\_experimental/menu-items controller. ([34857](https://github.com/WordPress/gutenberg/pull/34857))
+-   Fix the parent menu item field in REST API responses. ([34835](https://github.com/WordPress/gutenberg/pull/34835))
 
 #### Themes
-- Fix block gap added to the block templates skip link. ([34986](https://github.com/WordPress/gutenberg/pull/34986))
+
+-   Fix block gap added to the block templates skip link. ([34986](https://github.com/WordPress/gutenberg/pull/34986))
 
 #### Widgets Editor
-- Fix disabled blocks logical error on Widgets screen. ([34634](https://github.com/WordPress/gutenberg/pull/34634))
-- Prevent welcome guide overflow x scroll. ([34713](https://github.com/WordPress/gutenberg/pull/34713))
+
+-   Fix disabled blocks logical error on Widgets screen. ([34634](https://github.com/WordPress/gutenberg/pull/34634))
+-   Prevent welcome guide overflow x scroll. ([34713](https://github.com/WordPress/gutenberg/pull/34713))
 
 ### Experiments
 
 #### Navigation Block
-- Add a Submenu block for use in Navigation. ([33775](https://github.com/WordPress/gutenberg/pull/33775))
-- Initialize responsive modals with window onload event. ([34544](https://github.com/WordPress/gutenberg/pull/34544))
-- Enable open on click for Page List inside Navigation. ([34675](https://github.com/WordPress/gutenberg/pull/34675))
-- Hide theme-provided underlines when menu item is in setup state. ([34486](https://github.com/WordPress/gutenberg/pull/34486))
-- Only capture toolbars on the parent Navigation block when not in vertical mode. ([34615](https://github.com/WordPress/gutenberg/pull/34615))
-- Polish wavy underline. ([34954](https://github.com/WordPress/gutenberg/pull/34954))
+
+-   Add a Submenu block for use in Navigation. ([33775](https://github.com/WordPress/gutenberg/pull/33775))
+-   Initialize responsive modals with window onload event. ([34544](https://github.com/WordPress/gutenberg/pull/34544))
+-   Enable open on click for Page List inside Navigation. ([34675](https://github.com/WordPress/gutenberg/pull/34675))
+-   Hide theme-provided underlines when menu item is in setup state. ([34486](https://github.com/WordPress/gutenberg/pull/34486))
+-   Only capture toolbars on the parent Navigation block when not in vertical mode. ([34615](https://github.com/WordPress/gutenberg/pull/34615))
+-   Polish wavy underline. ([34954](https://github.com/WordPress/gutenberg/pull/34954))
 
 #### Navigation Editor
-- Add initial navigation editor user documentation. ([34985](https://github.com/WordPress/gutenberg/pull/34985))
-- Adjust header toolbar icon styles. ([34833](https://github.com/WordPress/gutenberg/pull/34833))
-- Consolidate menu name and switcher. ([34786](https://github.com/WordPress/gutenberg/pull/34786))
-- Update Navigation Editor to support new submenu block. ([34281](https://github.com/WordPress/gutenberg/pull/34281))
-- Use response messages returned from API for notices. ([34903](https://github.com/WordPress/gutenberg/pull/34903))
-- Add global inserter to Navigation Editor. ([34619](https://github.com/WordPress/gutenberg/pull/34619))
-- Save menu items using the REST API. ([34541](https://github.com/WordPress/gutenberg/pull/34541))
-- Add space between menu name and switcher button. ([34960](https://github.com/WordPress/gutenberg/pull/34960))
-- Keep Navigation Editor snackbar from overflowing notices. ([34661](https://github.com/WordPress/gutenberg/pull/34661))
-- Navigation Editor: Avoid crash when transforming navigation link. ([34980](https://github.com/WordPress/gutenberg/pull/34980))
-- Correctly display notices. ([34852](https://github.com/WordPress/gutenberg/pull/34852))
-- Display error notice inside modal. ([34884](https://github.com/WordPress/gutenberg/pull/34884))
-- Fix navigation editor missing appender not showing appender when no blocks selected. ([34678](https://github.com/WordPress/gutenberg/pull/34678))
-- Fix navigation editor undo button being active when editor loads. ([34839](https://github.com/WordPress/gutenberg/pull/34839))
-- Open link control if submenu parent is link. ([34798](https://github.com/WordPress/gutenberg/pull/34798))
-- Stop submitting Create Menu form in busy state. ([34983](https://github.com/WordPress/gutenberg/pull/34983))
-- Fix saving locations using the "Manage Locations" popup. ([34714](https://github.com/WordPress/gutenberg/pull/34714))
+
+-   Add initial navigation editor user documentation. ([34985](https://github.com/WordPress/gutenberg/pull/34985))
+-   Adjust header toolbar icon styles. ([34833](https://github.com/WordPress/gutenberg/pull/34833))
+-   Consolidate menu name and switcher. ([34786](https://github.com/WordPress/gutenberg/pull/34786))
+-   Update Navigation Editor to support new submenu block. ([34281](https://github.com/WordPress/gutenberg/pull/34281))
+-   Use response messages returned from API for notices. ([34903](https://github.com/WordPress/gutenberg/pull/34903))
+-   Add global inserter to Navigation Editor. ([34619](https://github.com/WordPress/gutenberg/pull/34619))
+-   Save menu items using the REST API. ([34541](https://github.com/WordPress/gutenberg/pull/34541))
+-   Add space between menu name and switcher button. ([34960](https://github.com/WordPress/gutenberg/pull/34960))
+-   Keep Navigation Editor snackbar from overflowing notices. ([34661](https://github.com/WordPress/gutenberg/pull/34661))
+-   Navigation Editor: Avoid crash when transforming navigation link. ([34980](https://github.com/WordPress/gutenberg/pull/34980))
+-   Correctly display notices. ([34852](https://github.com/WordPress/gutenberg/pull/34852))
+-   Display error notice inside modal. ([34884](https://github.com/WordPress/gutenberg/pull/34884))
+-   Fix navigation editor missing appender not showing appender when no blocks selected. ([34678](https://github.com/WordPress/gutenberg/pull/34678))
+-   Fix navigation editor undo button being active when editor loads. ([34839](https://github.com/WordPress/gutenberg/pull/34839))
+-   Open link control if submenu parent is link. ([34798](https://github.com/WordPress/gutenberg/pull/34798))
+-   Stop submitting Create Menu form in busy state. ([34983](https://github.com/WordPress/gutenberg/pull/34983))
+-   Fix saving locations using the "Manage Locations" popup. ([34714](https://github.com/WordPress/gutenberg/pull/34714))
 
 #### Site Editor
-- Site Editor - add basic plugin support. ([34460](https://github.com/WordPress/gutenberg/pull/34460))
+
+-   Site Editor - add basic plugin support. ([34460](https://github.com/WordPress/gutenberg/pull/34460))
 
 ### Documentation
 
 #### Handbook
-- Minor copy improvements. ([35015](https://github.com/WordPress/gutenberg/pull/35015))
-- Update versions to include 5.8.1. ([34789](https://github.com/WordPress/gutenberg/pull/34789))
-- Fix typography.customLineHeight value in the compatibility table. ([34791](https://github.com/WordPress/gutenberg/pull/34791))
+
+-   Minor copy improvements. ([35015](https://github.com/WordPress/gutenberg/pull/35015))
+-   Update versions to include 5.8.1. ([34789](https://github.com/WordPress/gutenberg/pull/34789))
+-   Fix typography.customLineHeight value in the compatibility table. ([34791](https://github.com/WordPress/gutenberg/pull/34791))
 
 #### Packages
-- Update the note about using polyfill for ES2015+ features. ([34878](https://github.com/WordPress/gutenberg/pull/34878))
-- Components
-  - Add Compound Components section to components CONTRIBUTING.md. ([34697](https://github.com/WordPress/gutenberg/pull/34697))
-  - Dropdown: Tidy up documentation. ([34861](https://github.com/WordPress/gutenberg/pull/34861))
-  - Fix small typo in the component's CONTRIBUTING guidelines documentation. ([34753](https://github.com/WordPress/gutenberg/pull/34753))
-  - ItemGroup: Add story showcasing more complex layouts. ([34708](https://github.com/WordPress/gutenberg/pull/34708))
-  - Update @wordpress/components package's contributing guidelines. ([33960](https://github.com/WordPress/gutenberg/pull/33960))
-  - Update AlignmentMatrixControl documentation post merge. ([34662](https://github.com/WordPress/gutenberg/pull/34662))
-  - Update components CONTRIBUTING.md structure. ([34877](https://github.com/WordPress/gutenberg/pull/34877))
-  - Update documentation for ClipboardButton component. ([34711](https://github.com/WordPress/gutenberg/pull/34711))
-- Create Block: Remove wp-cli callout since not recommended and outdated. ([34821](https://github.com/WordPress/gutenberg/pull/34821))
-- Navigation Editor:
-  - Fix inconsistencies and errors. ([34682](https://github.com/WordPress/gutenberg/pull/34682))
-  - Update the Hooks section in documentation. ([35035](https://github.com/WordPress/gutenberg/pull/35035))
-- Scripts: Add CHANGELOG entry for jest-dev-server upgrade. ([34657](https://github.com/WordPress/gutenberg/pull/34657))
+
+-   Update the note about using polyfill for ES2015+ features. ([34878](https://github.com/WordPress/gutenberg/pull/34878))
+-   Components
+    -   Add Compound Components section to components CONTRIBUTING.md. ([34697](https://github.com/WordPress/gutenberg/pull/34697))
+    -   Dropdown: Tidy up documentation. ([34861](https://github.com/WordPress/gutenberg/pull/34861))
+    -   Fix small typo in the component's CONTRIBUTING guidelines documentation. ([34753](https://github.com/WordPress/gutenberg/pull/34753))
+    -   ItemGroup: Add story showcasing more complex layouts. ([34708](https://github.com/WordPress/gutenberg/pull/34708))
+    -   Update @wordpress/components package's contributing guidelines. ([33960](https://github.com/WordPress/gutenberg/pull/33960))
+    -   Update AlignmentMatrixControl documentation post merge. ([34662](https://github.com/WordPress/gutenberg/pull/34662))
+    -   Update components CONTRIBUTING.md structure. ([34877](https://github.com/WordPress/gutenberg/pull/34877))
+    -   Update documentation for ClipboardButton component. ([34711](https://github.com/WordPress/gutenberg/pull/34711))
+-   Create Block: Remove wp-cli callout since not recommended and outdated. ([34821](https://github.com/WordPress/gutenberg/pull/34821))
+-   Navigation Editor:
+    -   Fix inconsistencies and errors. ([34682](https://github.com/WordPress/gutenberg/pull/34682))
+    -   Update the Hooks section in documentation. ([35035](https://github.com/WordPress/gutenberg/pull/35035))
+-   Scripts: Add CHANGELOG entry for jest-dev-server upgrade. ([34657](https://github.com/WordPress/gutenberg/pull/34657))
 
 #### Other
-- Update overall plugin description. ([34850](https://github.com/WordPress/gutenberg/pull/34850))
+
+-   Update overall plugin description. ([34850](https://github.com/WordPress/gutenberg/pull/34850))
 
 ### Code Quality
-- Add tests for slug to class/css variable conversion. ([34787](https://github.com/WordPress/gutenberg/pull/34787))
-- Refactor the core-data store to thunks. ([28389](https://github.com/WordPress/gutenberg/pull/28389))
-- Remove some low impact APIs that were deprecated on WP 5.3. ([34537](https://github.com/WordPress/gutenberg/pull/34537))
-- Rewrite FocusableIframe as hook API. ([26753](https://github.com/WordPress/gutenberg/pull/26753))
-- Rich text: Only merge neighbouring equal formats when applying a format. ([35016](https://github.com/WordPress/gutenberg/pull/35016))
-- Writing Flow: Merge place caret at edge functions. ([30481](https://github.com/WordPress/gutenberg/pull/30481))
-- Site editor: fix PHP notice: Undefined index: __unstableType. ([34735](https://github.com/WordPress/gutenberg/pull/34735))
-- Use rest_is_field_included function in menu endpoints. ([34673](https://github.com/WordPress/gutenberg/pull/34673))
-- Remove duplicate Theme JSON block gap key. ([34774](https://github.com/WordPress/gutenberg/pull/34774))
+
+-   Add tests for slug to class/css variable conversion. ([34787](https://github.com/WordPress/gutenberg/pull/34787))
+-   Refactor the core-data store to thunks. ([28389](https://github.com/WordPress/gutenberg/pull/28389))
+-   Remove some low impact APIs that were deprecated on WP 5.3. ([34537](https://github.com/WordPress/gutenberg/pull/34537))
+-   Rewrite FocusableIframe as hook API. ([26753](https://github.com/WordPress/gutenberg/pull/26753))
+-   Rich text: Only merge neighbouring equal formats when applying a format. ([35016](https://github.com/WordPress/gutenberg/pull/35016))
+-   Writing Flow: Merge place caret at edge functions. ([30481](https://github.com/WordPress/gutenberg/pull/30481))
+-   Site editor: fix PHP notice: Undefined index: \_\_unstableType. ([34735](https://github.com/WordPress/gutenberg/pull/34735))
+-   Use rest_is_field_included function in menu endpoints. ([34673](https://github.com/WordPress/gutenberg/pull/34673))
+-   Remove duplicate Theme JSON block gap key. ([34774](https://github.com/WordPress/gutenberg/pull/34774))
 
 #### Block Editor
-- Global shortcuts: Use React events (portal bubbles & contextual). ([34539](https://github.com/WordPress/gutenberg/pull/34539))
-- Rename experimental prop used in BlockControls. ([34644](https://github.com/WordPress/gutenberg/pull/34644))
-- Update callers to handle when getBlockType returns undefined. ([34891](https://github.com/WordPress/gutenberg/pull/34891))
+
+-   Global shortcuts: Use React events (portal bubbles & contextual). ([34539](https://github.com/WordPress/gutenberg/pull/34539))
+-   Rename experimental prop used in BlockControls. ([34644](https://github.com/WordPress/gutenberg/pull/34644))
+-   Update callers to handle when getBlockType returns undefined. ([34891](https://github.com/WordPress/gutenberg/pull/34891))
 
 #### Block Library
-- Latest Comments: Add missing parameter to widget_comments_args. ([29403](https://github.com/WordPress/gutenberg/pull/29403))
-- Navigation submenu block: Replace global shortcut event handlers with local ones. ([34812](https://github.com/WordPress/gutenberg/pull/34812))
+
+-   Latest Comments: Add missing parameter to widget_comments_args. ([29403](https://github.com/WordPress/gutenberg/pull/29403))
+-   Navigation submenu block: Replace global shortcut event handlers with local ones. ([34812](https://github.com/WordPress/gutenberg/pull/34812))
 
 #### Components
-- ColorPicker: Replace global shortcut event handlers with local ones. ([34508](https://github.com/WordPress/gutenberg/pull/34508))
-- Delete the createComponent utility function. ([34929](https://github.com/WordPress/gutenberg/pull/34929))
-- Refactor away from the createComponent function: CardMedia ([34915](https://github.com/WordPress/gutenberg/pull/34915)), ControlLabel ([34927](https://github.com/WordPress/gutenberg/pull/34927)), Elevation ([34916](https://github.com/WordPress/gutenberg/pull/34916)), FlexBlock ([34917](https://github.com/WordPress/gutenberg/pull/34917)), FlexItem ([34918](https://github.com/WordPress/gutenberg/pull/34918)), Grid ([34919](https://github.com/WordPress/gutenberg/pull/34919)), HStack ([34920](https://github.com/WordPress/gutenberg/pull/34920)), Heading ([34921](https://github.com/WordPress/gutenberg/pull/34921)), Scrollable ([34922](https://github.com/WordPress/gutenberg/pull/34922)), Spacer ([34923](https://github.com/WordPress/gutenberg/pull/34923)), Surface ([34924](https://github.com/WordPress/gutenberg/pull/34924)), Text ([34925](https://github.com/WordPress/gutenberg/pull/34925)), Truncate ([34926](https://github.com/WordPress/gutenberg/pull/34926)), VStack ([34928](https://github.com/WordPress/gutenberg/pull/34928)).
-- Remove all dashicon usages from Storybook stories. ([33984](https://github.com/WordPress/gutenberg/pull/33984))
-- Mark ControlLabel, FormGroupLabel and FormGroupContent as non-polymorphic. ([34966](https://github.com/WordPress/gutenberg/pull/34966))
+
+-   ColorPicker: Replace global shortcut event handlers with local ones. ([34508](https://github.com/WordPress/gutenberg/pull/34508))
+-   Delete the createComponent utility function. ([34929](https://github.com/WordPress/gutenberg/pull/34929))
+-   Refactor away from the createComponent function: CardMedia ([34915](https://github.com/WordPress/gutenberg/pull/34915)), ControlLabel ([34927](https://github.com/WordPress/gutenberg/pull/34927)), Elevation ([34916](https://github.com/WordPress/gutenberg/pull/34916)), FlexBlock ([34917](https://github.com/WordPress/gutenberg/pull/34917)), FlexItem ([34918](https://github.com/WordPress/gutenberg/pull/34918)), Grid ([34919](https://github.com/WordPress/gutenberg/pull/34919)), HStack ([34920](https://github.com/WordPress/gutenberg/pull/34920)), Heading ([34921](https://github.com/WordPress/gutenberg/pull/34921)), Scrollable ([34922](https://github.com/WordPress/gutenberg/pull/34922)), Spacer ([34923](https://github.com/WordPress/gutenberg/pull/34923)), Surface ([34924](https://github.com/WordPress/gutenberg/pull/34924)), Text ([34925](https://github.com/WordPress/gutenberg/pull/34925)), Truncate ([34926](https://github.com/WordPress/gutenberg/pull/34926)), VStack ([34928](https://github.com/WordPress/gutenberg/pull/34928)).
+-   Remove all dashicon usages from Storybook stories. ([33984](https://github.com/WordPress/gutenberg/pull/33984))
+-   Mark ControlLabel, FormGroupLabel and FormGroupContent as non-polymorphic. ([34966](https://github.com/WordPress/gutenberg/pull/34966))
 
 #### Global Styles
-- Fix Global Styles double border. ([34906](https://github.com/WordPress/gutenberg/pull/34906))
-- Rename globalStyles to styles. ([34946](https://github.com/WordPress/gutenberg/pull/34946))
+
+-   Fix Global Styles double border. ([34906](https://github.com/WordPress/gutenberg/pull/34906))
+-   Rename globalStyles to styles. ([34946](https://github.com/WordPress/gutenberg/pull/34946))
 
 #### i18n
-- Add a "translators:" comment in the core class used to implement a Block widget. ([34840](https://github.com/WordPress/gutenberg/pull/34840))
+
+-   Add a "translators:" comment in the core class used to implement a Block widget. ([34840](https://github.com/WordPress/gutenberg/pull/34840))
 
 ### Tools
 
 #### Testing
-- Add editor onboarding tests. ([34431](https://github.com/WordPress/gutenberg/pull/34431))
-- Fix flaky navigation editor test by waiting for required elements. ([34767](https://github.com/WordPress/gutenberg/pull/34767))
-- Fix native Latest Posts end-to-end device tests. ([34715](https://github.com/WordPress/gutenberg/pull/34715))
-- Iframed editor: Add jQuery integration end-to-end test. ([33007](https://github.com/WordPress/gutenberg/pull/33007))
-- Navigation Editor: Migrate from response mocking to rest api util. ([34869](https://github.com/WordPress/gutenberg/pull/34869))
-- Navigation Editor: Fix failing end-to-end test. ([34874](https://github.com/WordPress/gutenberg/pull/34874))
-- Navigation Editor: Add end-to-end tests for global inserter to the Navigation Editor screen. ([34804](https://github.com/WordPress/gutenberg/pull/34804))
-- Navigation Editor: Update new navigation editor test to use REST API to create a menu instead of response mocking. ([35025](https://github.com/WordPress/gutenberg/pull/35025))
-- Try reporting flaky tests to issues. ([34432](https://github.com/WordPress/gutenberg/pull/34432))
-- Try to fix flaky iframe test. ([34776](https://github.com/WordPress/gutenberg/pull/34776))
-- Test that add_theme_supports are loaded for themes without theme.json. ([34998](https://github.com/WordPress/gutenberg/pull/34998))
-
-#### Build Tooling
-- Fix package lock inconsistencies. ([34790](https://github.com/WordPress/gutenberg/pull/34790))
-- Update caniuse package to the latest version. ([34685](https://github.com/WordPress/gutenberg/pull/34685))
-- VSCode integration: Update var ${workspaceRoot} to ${workspaceFolder}. ([34269](https://github.com/WordPress/gutenberg/pull/34269))
-- Replace usages of workspaceRoot with workspaceFolder. ([34887](https://github.com/WordPress/gutenberg/pull/34887))
-- Bump jest-dev-server to v5. ([34560](https://github.com/WordPress/gutenberg/pull/34560))
-- ESLint Plugin: Update eslint jsdoc dependency. ([34338](https://github.com/WordPress/gutenberg/pull/34338))
-- Storybook: Remove G2 prefix from the Components section. ([34734](https://github.com/WordPress/gutenberg/pull/34734))
-- Block Editor: Update react-spring to 9.2.4. ([30979](https://github.com/WordPress/gutenberg/pull/30979))
-- Move react-native-url-polyfill to dev dependencies. ([34687](https://github.com/WordPress/gutenberg/pull/34687))
-- Use Jest related rules only when the package is installed. ([33120](https://github.com/WordPress/gutenberg/pull/33120))
-- Ensure that all *.asset.php files are included in plugin.zip. ([34875](https://github.com/WordPress/gutenberg/pull/34875))
-
-
 
+-   Add editor onboarding tests. ([34431](https://github.com/WordPress/gutenberg/pull/34431))
+-   Fix flaky navigation editor test by waiting for required elements. ([34767](https://github.com/WordPress/gutenberg/pull/34767))
+-   Fix native Latest Posts end-to-end device tests. ([34715](https://github.com/WordPress/gutenberg/pull/34715))
+-   Iframed editor: Add jQuery integration end-to-end test. ([33007](https://github.com/WordPress/gutenberg/pull/33007))
+-   Navigation Editor: Migrate from response mocking to rest api util. ([34869](https://github.com/WordPress/gutenberg/pull/34869))
+-   Navigation Editor: Fix failing end-to-end test. ([34874](https://github.com/WordPress/gutenberg/pull/34874))
+-   Navigation Editor: Add end-to-end tests for global inserter to the Navigation Editor screen. ([34804](https://github.com/WordPress/gutenberg/pull/34804))
+-   Navigation Editor: Update new navigation editor test to use REST API to create a menu instead of response mocking. ([35025](https://github.com/WordPress/gutenberg/pull/35025))
+-   Try reporting flaky tests to issues. ([34432](https://github.com/WordPress/gutenberg/pull/34432))
+-   Try to fix flaky iframe test. ([34776](https://github.com/WordPress/gutenberg/pull/34776))
+-   Test that add_theme_supports are loaded for themes without theme.json. ([34998](https://github.com/WordPress/gutenberg/pull/34998))
 
+#### Build Tooling
 
+-   Fix package lock inconsistencies. ([34790](https://github.com/WordPress/gutenberg/pull/34790))
+-   Update caniuse package to the latest version. ([34685](https://github.com/WordPress/gutenberg/pull/34685))
+-   VSCode integration: Update var ${workspaceRoot} to ${workspaceFolder}. ([34269](https://github.com/WordPress/gutenberg/pull/34269))
+-   Replace usages of workspaceRoot with workspaceFolder. ([34887](https://github.com/WordPress/gutenberg/pull/34887))
+-   Bump jest-dev-server to v5. ([34560](https://github.com/WordPress/gutenberg/pull/34560))
+-   ESLint Plugin: Update eslint jsdoc dependency. ([34338](https://github.com/WordPress/gutenberg/pull/34338))
+-   Storybook: Remove G2 prefix from the Components section. ([34734](https://github.com/WordPress/gutenberg/pull/34734))
+-   Block Editor: Update react-spring to 9.2.4. ([30979](https://github.com/WordPress/gutenberg/pull/30979))
+-   Move react-native-url-polyfill to dev dependencies. ([34687](https://github.com/WordPress/gutenberg/pull/34687))
+-   Use Jest related rules only when the package is installed. ([33120](https://github.com/WordPress/gutenberg/pull/33120))
+-   Ensure that all \*.asset.php files are included in plugin.zip. ([34875](https://github.com/WordPress/gutenberg/pull/34875))
 
 = 11.5.1 =
 
+## Changelog
+
 ### Bug Fixes
 
 #### Global Styles
 
-- Fix theme supports for themes without theme.json. ([34955](https://github.com/WordPress/gutenberg/pull/34955))
+-   Fix theme supports for themes without theme.json. ([34955](https://github.com/WordPress/gutenberg/pull/34955))
 
 ### Various
 
-- Build plugin zip: Verify npm cache before a clean install. ([34973](https://github.com/WordPress/gutenberg/pull/34973))
-
-
-
-
+-   Build plugin zip: Verify npm cache before a clean install. ([34973](https://github.com/WordPress/gutenberg/pull/34973))
 
 = 11.5.0 =
 
+## Changelog
+
 ### Features
 
 #### Design Tools
-- Block Support: Add gap block support feature. ([33991](https://github.com/WordPress/gutenberg/pull/33991))
+
+-   Block Support: Add gap block support feature. ([33991](https://github.com/WordPress/gutenberg/pull/33991))
 
 ### Enhancements
 
 #### Accessibility
-- Font weight screen reader description. ([34312](https://github.com/WordPress/gutenberg/pull/34312))
+
+-   Font weight screen reader description. ([34312](https://github.com/WordPress/gutenberg/pull/34312))
+
 #### Block Editor:
-- Media Placeholder: Change media URL input type to allow a local URL path. ([29138](https://github.com/WordPress/gutenberg/pull/29138))
-#### Block Library
-- Columns Block: Use `blockGap` between Columns blocks. ([34456](https://github.com/WordPress/gutenberg/pull/34456))
-- Group Block: Add a row variation. ([34535](https://github.com/WordPress/gutenberg/pull/34535))
-- Heading Block: Vertical heading levels menu. ([32926](https://github.com/WordPress/gutenberg/pull/32926))
-- Navigation Block: Allow Site Title and Logo inside Navigation block. ([33316](https://github.com/WordPress/gutenberg/pull/33316))
-- Navigation Block, List View: Do not show appender and avoid closing the modal on block select. ([34337](https://github.com/WordPress/gutenberg/pull/34337))
-- Navigation Block: Remove horizontal and vertical navigation block variations from inserter. ([34614](https://github.com/WordPress/gutenberg/pull/34614))
-- Navigation Block: Use gap instead of margin. ([32367](https://github.com/WordPress/gutenberg/pull/32367))
-- Post Author Block: Add duotone suport. ([34408](https://github.com/WordPress/gutenberg/pull/34408))
-- Query Pagination Next/Previous: Add an arrow attribute and sync next/previous block's arrow. ([33656](https://github.com/WordPress/gutenberg/pull/33656))
-- Site Logo Block: Update block description to be concise. ([34471](https://github.com/WordPress/gutenberg/pull/34471))
-- Site Title Block: Update block description to be concise. ([34475](https://github.com/WordPress/gutenberg/pull/34475))
-- Social Links Block: Use the new `flex` layout. ([34493](https://github.com/WordPress/gutenberg/pull/34493))
-- Video Block: Use existing video poster image on insert. ([34415](https://github.com/WordPress/gutenberg/pull/34415))
-#### Components
-- MenuItem: Add right padding for unchecked radio and checkbox items. ([34406](https://github.com/WordPress/gutenberg/pull/34406))
-- ToggleGroupControl: Update stories to use knobs. ([34497](https://github.com/WordPress/gutenberg/pull/34497))
+
+-   Media Placeholder: Change media URL input type to allow a local URL path. ([29138](https://github.com/WordPress/gutenberg/pull/29138))
+
+#### Block Library
+
+-   Columns Block: Use `blockGap` between Columns blocks. ([34456](https://github.com/WordPress/gutenberg/pull/34456))
+-   Group Block: Add a row variation. ([34535](https://github.com/WordPress/gutenberg/pull/34535))
+-   Heading Block: Vertical heading levels menu. ([32926](https://github.com/WordPress/gutenberg/pull/32926))
+-   Navigation Block: Allow Site Title and Logo inside Navigation block. ([33316](https://github.com/WordPress/gutenberg/pull/33316))
+-   Navigation Block, List View: Do not show appender and avoid closing the modal on block select. ([34337](https://github.com/WordPress/gutenberg/pull/34337))
+-   Navigation Block: Remove horizontal and vertical navigation block variations from inserter. ([34614](https://github.com/WordPress/gutenberg/pull/34614))
+-   Navigation Block: Use gap instead of margin. ([32367](https://github.com/WordPress/gutenberg/pull/32367))
+-   Post Author Block: Add duotone suport. ([34408](https://github.com/WordPress/gutenberg/pull/34408))
+-   Query Pagination Next/Previous: Add an arrow attribute and sync next/previous block's arrow. ([33656](https://github.com/WordPress/gutenberg/pull/33656))
+-   Site Logo Block: Update block description to be concise. ([34471](https://github.com/WordPress/gutenberg/pull/34471))
+-   Site Title Block: Update block description to be concise. ([34475](https://github.com/WordPress/gutenberg/pull/34475))
+-   Social Links Block: Use the new `flex` layout. ([34493](https://github.com/WordPress/gutenberg/pull/34493))
+-   Video Block: Use existing video poster image on insert. ([34415](https://github.com/WordPress/gutenberg/pull/34415))
+
+#### Components
+
+-   MenuItem: Add right padding for unchecked radio and checkbox items. ([34406](https://github.com/WordPress/gutenberg/pull/34406))
+-   ToggleGroupControl: Update stories to use knobs. ([34497](https://github.com/WordPress/gutenberg/pull/34497))
+
 #### Core Data
-- Add `isRawAttribute` to entity configuration. ([34388](https://github.com/WordPress/gutenberg/pull/34388))
+
+-   Add `isRawAttribute` to entity configuration. ([34388](https://github.com/WordPress/gutenberg/pull/34388))
+
 #### Design Tools
-- Add wide alignment control only if theme provides `layout.wideSize`. ([34586](https://github.com/WordPress/gutenberg/pull/34586))
-- Update justification control in `flex` layout. ([34651](https://github.com/WordPress/gutenberg/pull/34651))
-- ToolsPanel: Change icon from horizontal to vertical ellipsis. ([34369](https://github.com/WordPress/gutenberg/pull/34369))
+
+-   Add wide alignment control only if theme provides `layout.wideSize`. ([34586](https://github.com/WordPress/gutenberg/pull/34586))
+-   Update justification control in `flex` layout. ([34651](https://github.com/WordPress/gutenberg/pull/34651))
+-   ToolsPanel: Change icon from horizontal to vertical ellipsis. ([34369](https://github.com/WordPress/gutenberg/pull/34369))
+
 #### Full Site Editing
-- Limit FSE admin notices to the Themes screen. ([34353](https://github.com/WordPress/gutenberg/pull/34353))
+
+-   Limit FSE admin notices to the Themes screen. ([34353](https://github.com/WordPress/gutenberg/pull/34353))
+
 #### Global Styles
-- Allow disabling `text` and `background` color via `theme.json`. ([34420](https://github.com/WordPress/gutenberg/pull/34420))
-- Make global styles available to all themes. ([34334](https://github.com/WordPress/gutenberg/pull/34334))
+
+-   Allow disabling `text` and `background` color via `theme.json`. ([34420](https://github.com/WordPress/gutenberg/pull/34420))
+-   Make global styles available to all themes. ([34334](https://github.com/WordPress/gutenberg/pull/34334))
+
 #### i18n
-- Add context to 'none' strings for better translations. ([34341](https://github.com/WordPress/gutenberg/pull/34341))
-- Make permalinks documentation URL translatable. ([34282](https://github.com/WordPress/gutenberg/pull/34282))
+
+-   Add context to 'none' strings for better translations. ([34341](https://github.com/WordPress/gutenberg/pull/34341))
+-   Make permalinks documentation URL translatable. ([34282](https://github.com/WordPress/gutenberg/pull/34282))
+
 #### Post Editor
-- Expose `ThemeSupportCheck` component. ([20506](https://github.com/WordPress/gutenberg/pull/20506))
-- Title block gap. ([34570](https://github.com/WordPress/gutenberg/pull/34570))
+
+-   Expose `ThemeSupportCheck` component. ([20506](https://github.com/WordPress/gutenberg/pull/20506))
+-   Title block gap. ([34570](https://github.com/WordPress/gutenberg/pull/34570))
+
 #### Themes
-- Add default editor styles applied to themes without `theme.json` and without editor styles. ([34439](https://github.com/WordPress/gutenberg/pull/34439))
+
+-   Add default editor styles applied to themes without `theme.json` and without editor styles. ([34439](https://github.com/WordPress/gutenberg/pull/34439))
+
 #### Widgets Editor
-- Add 'Widget Group' block to widgets screens. ([34484](https://github.com/WordPress/gutenberg/pull/34484))
-- Legacy widget rendering endpoint. ([34230](https://github.com/WordPress/gutenberg/pull/34230))
+
+-   Add 'Widget Group' block to widgets screens. ([34484](https://github.com/WordPress/gutenberg/pull/34484))
+-   Legacy widget rendering endpoint. ([34230](https://github.com/WordPress/gutenberg/pull/34230))
 
 ### New APIs
 
 #### Design Tools
-- Allow themes with `theme.json` to opt-out of block gap styles. ([34491](https://github.com/WordPress/gutenberg/pull/34491))
+
+-   Allow themes with `theme.json` to opt-out of block gap styles. ([34491](https://github.com/WordPress/gutenberg/pull/34491))
 
 ### Bug Fixes
 
 #### Accessibility
-- Fix button block focus trap after a URL has been added. ([34314](https://github.com/WordPress/gutenberg/pull/34314))
-#### Block Editor
-- Fix menu item padding regression. ([34435](https://github.com/WordPress/gutenberg/pull/34435))
-- Fix text-menu min widths. ([34532](https://github.com/WordPress/gutenberg/pull/34532))
-- Keep id on paste if internal link points to it. ([31107](https://github.com/WordPress/gutenberg/pull/31107))
-- Fix caret position on block merging. ([34169](https://github.com/WordPress/gutenberg/pull/34169))
-#### Block Library
-- Heading Block, Paragraph Block: Fix long strings of text without spaces overflow the block. ([34222](https://github.com/WordPress/gutenberg/pull/34222))
-- Gallery Block: Fix bug with stalled upload when image size too large. ([34371](https://github.com/WordPress/gutenberg/pull/34371))
-- Gallery Block: Fix media placeholder height in site editor. ([34629](https://github.com/WordPress/gutenberg/pull/34629))
-- Gallery Block: Fix problem with overflowing captions on new gallery block format. ([34402](https://github.com/WordPress/gutenberg/pull/34402))
-- Latest Posts: Fix various React warnings in development log. ([34428](https://github.com/WordPress/gutenberg/pull/34428))
-- Navigation: Fix navigation block classname issues. ([34344](https://github.com/WordPress/gutenberg/pull/34344))
-- Navigation: Fix Page List styles inside responsive Navigation. ([34517](https://github.com/WordPress/gutenberg/pull/34517))
-- Navigation: Fix responsive menu height regression. ([34488](https://github.com/WordPress/gutenberg/pull/34488))
-- Navigation: Fix submenu layout in navigation page list. ([34342](https://github.com/WordPress/gutenberg/pull/34342))
-- Navigation: Fix submenus to only take up space when visible. ([34382](https://github.com/WordPress/gutenberg/pull/34382))
-- Navigation: Fix undo/redo 'trap' in navigation link block. ([34565](https://github.com/WordPress/gutenberg/pull/34565))
-- Site Title: Allow empty title in edit mode. ([34274](https://github.com/WordPress/gutenberg/pull/34274))
-- Social Links Block: Fix deprecation. ([34639](https://github.com/WordPress/gutenberg/pull/34639))
-- Video Block: Fix `TypeError` when removing poster. ([34411](https://github.com/WordPress/gutenberg/pull/34411))
-#### Components
-- Align labels on focal point picker position controls above the inputs. ([34209](https://github.com/WordPress/gutenberg/pull/34209))
-- Check if in browser env before calling `CSS.supports`. ([34572](https://github.com/WordPress/gutenberg/pull/34572))
-- Combobox Component: Only force expanded state if the input has focus. ([34090](https://github.com/WordPress/gutenberg/pull/34090))
-- CustomSelectControl: Add describedBy fallback. ([34385](https://github.com/WordPress/gutenberg/pull/34385))
-- DateTime Component: Fix sizing of help info. ([34370](https://github.com/WordPress/gutenberg/pull/34370))
-- Fix `ToggleGroupControlBackdrop` not updating size when `isAdaptiveWidth` prop changes. ([34595](https://github.com/WordPress/gutenberg/pull/34595))
-- Fix selected value computation in `CustomSelectControl` when no initial `value` is set. ([34490](https://github.com/WordPress/gutenberg/pull/34490))
-- Fix subheadings from wrapping. ([34319](https://github.com/WordPress/gutenberg/pull/34319))
+
+-   Fix button block focus trap after a URL has been added. ([34314](https://github.com/WordPress/gutenberg/pull/34314))
+
+#### Block Editor
+
+-   Fix menu item padding regression. ([34435](https://github.com/WordPress/gutenberg/pull/34435))
+-   Fix text-menu min widths. ([34532](https://github.com/WordPress/gutenberg/pull/34532))
+-   Keep id on paste if internal link points to it. ([31107](https://github.com/WordPress/gutenberg/pull/31107))
+-   Fix caret position on block merging. ([34169](https://github.com/WordPress/gutenberg/pull/34169))
+
+#### Block Library
+
+-   Heading Block, Paragraph Block: Fix long strings of text without spaces overflow the block. ([34222](https://github.com/WordPress/gutenberg/pull/34222))
+-   Gallery Block: Fix bug with stalled upload when image size too large. ([34371](https://github.com/WordPress/gutenberg/pull/34371))
+-   Gallery Block: Fix media placeholder height in site editor. ([34629](https://github.com/WordPress/gutenberg/pull/34629))
+-   Gallery Block: Fix problem with overflowing captions on new gallery block format. ([34402](https://github.com/WordPress/gutenberg/pull/34402))
+-   Latest Posts: Fix various React warnings in development log. ([34428](https://github.com/WordPress/gutenberg/pull/34428))
+-   Navigation: Fix navigation block classname issues. ([34344](https://github.com/WordPress/gutenberg/pull/34344))
+-   Navigation: Fix Page List styles inside responsive Navigation. ([34517](https://github.com/WordPress/gutenberg/pull/34517))
+-   Navigation: Fix responsive menu height regression. ([34488](https://github.com/WordPress/gutenberg/pull/34488))
+-   Navigation: Fix submenu layout in navigation page list. ([34342](https://github.com/WordPress/gutenberg/pull/34342))
+-   Navigation: Fix submenus to only take up space when visible. ([34382](https://github.com/WordPress/gutenberg/pull/34382))
+-   Navigation: Fix undo/redo 'trap' in navigation link block. ([34565](https://github.com/WordPress/gutenberg/pull/34565))
+-   Site Title: Allow empty title in edit mode. ([34274](https://github.com/WordPress/gutenberg/pull/34274))
+-   Social Links Block: Fix deprecation. ([34639](https://github.com/WordPress/gutenberg/pull/34639))
+-   Video Block: Fix `TypeError` when removing poster. ([34411](https://github.com/WordPress/gutenberg/pull/34411))
+
+#### Components
+
+-   Align labels on focal point picker position controls above the inputs. ([34209](https://github.com/WordPress/gutenberg/pull/34209))
+-   Check if in browser env before calling `CSS.supports`. ([34572](https://github.com/WordPress/gutenberg/pull/34572))
+-   Combobox Component: Only force expanded state if the input has focus. ([34090](https://github.com/WordPress/gutenberg/pull/34090))
+-   CustomSelectControl: Add describedBy fallback. ([34385](https://github.com/WordPress/gutenberg/pull/34385))
+-   DateTime Component: Fix sizing of help info. ([34370](https://github.com/WordPress/gutenberg/pull/34370))
+-   Fix `ToggleGroupControlBackdrop` not updating size when `isAdaptiveWidth` prop changes. ([34595](https://github.com/WordPress/gutenberg/pull/34595))
+-   Fix selected value computation in `CustomSelectControl` when no initial `value` is set. ([34490](https://github.com/WordPress/gutenberg/pull/34490))
+-   Fix subheadings from wrapping. ([34319](https://github.com/WordPress/gutenberg/pull/34319))
+
 #### Design Tools
-- Border Controls: Display color indicator and check selected color. ([34467](https://github.com/WordPress/gutenberg/pull/34467))
-- Border Support: Fix check for displaying border support panel. ([34516](https://github.com/WordPress/gutenberg/pull/34516))
-- Gap block support: Force gap change to cause the block to re-render (fix Safari issue). ([34567](https://github.com/WordPress/gutenberg/pull/34567))
-- Letter Spacing: Group letter spacing correctly under typography supports. ([34515](https://github.com/WordPress/gutenberg/pull/34515))
+
+-   Border Controls: Display color indicator and check selected color. ([34467](https://github.com/WordPress/gutenberg/pull/34467))
+-   Border Support: Fix check for displaying border support panel. ([34516](https://github.com/WordPress/gutenberg/pull/34516))
+-   Gap block support: Force gap change to cause the block to re-render (fix Safari issue). ([34567](https://github.com/WordPress/gutenberg/pull/34567))
+-   Letter Spacing: Group letter spacing correctly under typography supports. ([34515](https://github.com/WordPress/gutenberg/pull/34515))
+
 #### Global Styles
-- Fix block-level global styles color panels. ([34293](https://github.com/WordPress/gutenberg/pull/34293))
-- Font Appearance Control: Fix error in global styles for Site Title in TT1-Blocks. ([34520](https://github.com/WordPress/gutenberg/pull/34520))
+
+-   Fix block-level global styles color panels. ([34293](https://github.com/WordPress/gutenberg/pull/34293))
+-   Font Appearance Control: Fix error in global styles for Site Title in TT1-Blocks. ([34520](https://github.com/WordPress/gutenberg/pull/34520))
+
 #### Meta Boxes
-- Change default value of `enableCustomFields` to `undefined`. ([33931](https://github.com/WordPress/gutenberg/pull/33931))
-- Fix metabox reordering. ([30617](https://github.com/WordPress/gutenberg/pull/30617))
+
+-   Change default value of `enableCustomFields` to `undefined`. ([33931](https://github.com/WordPress/gutenberg/pull/33931))
+-   Fix metabox reordering. ([30617](https://github.com/WordPress/gutenberg/pull/30617))
+
 #### Packages
-- Blocks: Register block when invalid value provided for the icon. ([34350](https://github.com/WordPress/gutenberg/pull/34350))
-- Core Data: Add 'include' to the query key. ([34583](https://github.com/WordPress/gutenberg/pull/34583))
-- Core Data: Use `resolveSelect` instead of `select` in `saveEntityRecord`. ([34584](https://github.com/WordPress/gutenberg/pull/34584))
-- Interface: Block Toolbar & Popover component - Prevent sticky position from causing permanently obscured areas of the selected block. ([33981](https://github.com/WordPress/gutenberg/pull/33981))
-- Scripts: Only use svgr/webpack in js files. ([34394](https://github.com/WordPress/gutenberg/pull/34394))
-- Scripts: Convert legacy entry point arguments for compatibility with webpack 5. ([34264](https://github.com/WordPress/gutenberg/pull/34264))
+
+-   Blocks: Register block when invalid value provided for the icon. ([34350](https://github.com/WordPress/gutenberg/pull/34350))
+-   Core Data: Add 'include' to the query key. ([34583](https://github.com/WordPress/gutenberg/pull/34583))
+-   Core Data: Use `resolveSelect` instead of `select` in `saveEntityRecord`. ([34584](https://github.com/WordPress/gutenberg/pull/34584))
+-   Interface: Block Toolbar & Popover component - Prevent sticky position from causing permanently obscured areas of the selected block. ([33981](https://github.com/WordPress/gutenberg/pull/33981))
+-   Scripts: Only use svgr/webpack in js files. ([34394](https://github.com/WordPress/gutenberg/pull/34394))
+-   Scripts: Convert legacy entry point arguments for compatibility with webpack 5. ([34264](https://github.com/WordPress/gutenberg/pull/34264))
+
 #### REST API
-- Default batch processor: Respect the batch endpoint's `maxItems`. ([34280](https://github.com/WordPress/gutenberg/pull/34280))
+
+-   Default batch processor: Respect the batch endpoint's `maxItems`. ([34280](https://github.com/WordPress/gutenberg/pull/34280))
+
 #### Widgets Editor
-- Fix Block Settings sidebar unexpectedly collapsing. ([34543](https://github.com/WordPress/gutenberg/pull/34543))
-- Legacy widget's preview functionality is broken when the page is moved. ([34384](https://github.com/WordPress/gutenberg/pull/34384))
-- Prevent focus trap in Legacy Widget block’s preview iframe. ([33614](https://github.com/WordPress/gutenberg/pull/33614))
+
+-   Fix Block Settings sidebar unexpectedly collapsing. ([34543](https://github.com/WordPress/gutenberg/pull/34543))
+-   Legacy widget's preview functionality is broken when the page is moved. ([34384](https://github.com/WordPress/gutenberg/pull/34384))
+-   Prevent focus trap in Legacy Widget block’s preview iframe. ([33614](https://github.com/WordPress/gutenberg/pull/33614))
 
 ### Performance
 
 #### Block Editor
-- Improve the `getBlock` and `getBlocks` performance. ([34241](https://github.com/WordPress/gutenberg/pull/34241))
-- Remove duplicated `useValidAlignment` hook. ([34593](https://github.com/WordPress/gutenberg/pull/34593))
+
+-   Improve the `getBlock` and `getBlocks` performance. ([34241](https://github.com/WordPress/gutenberg/pull/34241))
+-   Remove duplicated `useValidAlignment` hook. ([34593](https://github.com/WordPress/gutenberg/pull/34593))
+
 #### Core Data
-- Move locks state from store to local variable. ([34374](https://github.com/WordPress/gutenberg/pull/34374))
+
+-   Move locks state from store to local variable. ([34374](https://github.com/WordPress/gutenberg/pull/34374))
+
 #### Global Styles
-- Remove colors classes from the packages that are already provided by global styles. ([34510](https://github.com/WordPress/gutenberg/pull/34510))
+
+-   Remove colors classes from the packages that are already provided by global styles. ([34510](https://github.com/WordPress/gutenberg/pull/34510))
 
 ### Experiments
 
 #### Navigation Editor
-- Add undo redo buttons in navigation editor. ([34533](https://github.com/WordPress/gutenberg/pull/34533))
-- Decode entities in the menu names. ([34263](https://github.com/WordPress/gutenberg/pull/34263))
-- Disable "block-nav-menus" feature for the purposes of removing the "experimental" status on the Navigation Editor. ([34444](https://github.com/WordPress/gutenberg/pull/34444))
-- Preload menu REST API requests on new navigation editor. ([34364](https://github.com/WordPress/gutenberg/pull/34364))
-- Update navigation editor placeholder. ([34568](https://github.com/WordPress/gutenberg/pull/34568))
+
+-   Add undo redo buttons in navigation editor. ([34533](https://github.com/WordPress/gutenberg/pull/34533))
+-   Decode entities in the menu names. ([34263](https://github.com/WordPress/gutenberg/pull/34263))
+-   Disable "block-nav-menus" feature for the purposes of removing the "experimental" status on the Navigation Editor. ([34444](https://github.com/WordPress/gutenberg/pull/34444))
+-   Preload menu REST API requests on new navigation editor. ([34364](https://github.com/WordPress/gutenberg/pull/34364))
+-   Update navigation editor placeholder. ([34568](https://github.com/WordPress/gutenberg/pull/34568))
 
 ### Documentation
 
 #### Handbook
-- Replace `withSelect` references with `useSelect`. ([34549](https://github.com/WordPress/gutenberg/pull/34549))
-- Updated Template Section copy. ([34383](https://github.com/WordPress/gutenberg/pull/34383))
-- Update block variations documentation about `block` scope. ([34455](https://github.com/WordPress/gutenberg/pull/34455))
+
+-   Replace `withSelect` references with `useSelect`. ([34549](https://github.com/WordPress/gutenberg/pull/34549))
+-   Updated Template Section copy. ([34383](https://github.com/WordPress/gutenberg/pull/34383))
+-   Update block variations documentation about `block` scope. ([34455](https://github.com/WordPress/gutenberg/pull/34455))
+
 #### Packages
-- Blocks: Correct typo in Blocks Documentation. ([34396](https://github.com/WordPress/gutenberg/pull/34396))
-- Componentes: Fix/update documentation alignment matrix control. ([34624](https://github.com/WordPress/gutenberg/pull/34624))
-- Componentes: Update `DuotonePicker` documentation for accuracy. ([34494](https://github.com/WordPress/gutenberg/pull/34494))
-- Eslint: Add `no-unsafe-wp-apis` to rules list in the documentation. ([34416](https://github.com/WordPress/gutenberg/pull/34416))
-- Prettier: Correct syntax in `README.md` for `prettier-config`. ([34600](https://github.com/WordPress/gutenberg/pull/34600))
 
+-   Blocks: Correct typo in Blocks Documentation. ([34396](https://github.com/WordPress/gutenberg/pull/34396))
+-   Componentes: Fix/update documentation alignment matrix control. ([34624](https://github.com/WordPress/gutenberg/pull/34624))
+-   Componentes: Update `DuotonePicker` documentation for accuracy. ([34494](https://github.com/WordPress/gutenberg/pull/34494))
+-   Eslint: Add `no-unsafe-wp-apis` to rules list in the documentation. ([34416](https://github.com/WordPress/gutenberg/pull/34416))
+-   Prettier: Correct syntax in `README.md` for `prettier-config`. ([34600](https://github.com/WordPress/gutenberg/pull/34600))
 
 ### Code Quality
 
 #### Block Editor
-- Code cleanup to the `getBlock` refactoring. ([34326](https://github.com/WordPress/gutenberg/pull/34326))
-- Ensure that `blockType` is defined when accessing `apiVersion`. ([34346](https://github.com/WordPress/gutenberg/pull/34346))
-- Migrate `lightBlockWrapper` support to `apiVersion` for blocks. ([34459](https://github.com/WordPress/gutenberg/pull/34459))
-- Fix Animated warning log. ([34197](https://github.com/WordPress/gutenberg/pull/34197))
-- Rich Text: Replace global event handlers with local ones. ([34492](https://github.com/WordPress/gutenberg/pull/34492))
-- Rich text (core): OnFocus method can be replaced with HTMLElement.focus. ([32054](https://github.com/WordPress/gutenberg/pull/32054))
-- Use Setting: Consolidate the `PATHS_WITH_MERGE` constant to one instance. ([34407](https://github.com/WordPress/gutenberg/pull/34407))
-#### Block Library
-- Gallery Block: Add docblock comments to the new gallery hooks. ([34562](https://github.com/WordPress/gutenberg/pull/34562))
-- Gallery Block: Remove IE specific CSS hacks. ([34372](https://github.com/WordPress/gutenberg/pull/34372))
-- Button Block: Replace global shortcut event handlers with local ones. ([34498](https://github.com/WordPress/gutenberg/pull/34498))
-- Navigation Block: Refactor to use generic classnames. ([34171](https://github.com/WordPress/gutenberg/pull/34171))
-- Navigation Link Block: Replace global shortcut event handlers with local ones. ([34500](https://github.com/WordPress/gutenberg/pull/34500))
-- Gallery Block: Remove redundant css selector. ([34277](https://github.com/WordPress/gutenberg/pull/34277))
-#### Components
-- CustomGradientBar: Replace global shortcut event handlers with local ones. ([34505](https://github.com/WordPress/gutenberg/pull/34505))
-- Guide: Replace global shortcut event handlers with local ones. ([34503](https://github.com/WordPress/gutenberg/pull/34503))
-- Navigate regions: Use React events for shortcuts (portal bubbles & contextual). ([33633](https://github.com/WordPress/gutenberg/pull/33633))
-- Rename `PolymorphicComponent*` types to `WordPressComponent*`. ([34330](https://github.com/WordPress/gutenberg/pull/34330))
-- Simplify Modal with hooks. ([34412](https://github.com/WordPress/gutenberg/pull/34412))
-- Simplify & polish heading levels. ([34378](https://github.com/WordPress/gutenberg/pull/34378))
+
+-   Code cleanup to the `getBlock` refactoring. ([34326](https://github.com/WordPress/gutenberg/pull/34326))
+-   Ensure that `blockType` is defined when accessing `apiVersion`. ([34346](https://github.com/WordPress/gutenberg/pull/34346))
+-   Migrate `lightBlockWrapper` support to `apiVersion` for blocks. ([34459](https://github.com/WordPress/gutenberg/pull/34459))
+-   Fix Animated warning log. ([34197](https://github.com/WordPress/gutenberg/pull/34197))
+-   Rich Text: Replace global event handlers with local ones. ([34492](https://github.com/WordPress/gutenberg/pull/34492))
+-   Rich text (core): OnFocus method can be replaced with HTMLElement.focus. ([32054](https://github.com/WordPress/gutenberg/pull/32054))
+-   Use Setting: Consolidate the `PATHS_WITH_MERGE` constant to one instance. ([34407](https://github.com/WordPress/gutenberg/pull/34407))
+
+#### Block Library
+
+-   Gallery Block: Add docblock comments to the new gallery hooks. ([34562](https://github.com/WordPress/gutenberg/pull/34562))
+-   Gallery Block: Remove IE specific CSS hacks. ([34372](https://github.com/WordPress/gutenberg/pull/34372))
+-   Button Block: Replace global shortcut event handlers with local ones. ([34498](https://github.com/WordPress/gutenberg/pull/34498))
+-   Navigation Block: Refactor to use generic classnames. ([34171](https://github.com/WordPress/gutenberg/pull/34171))
+-   Navigation Link Block: Replace global shortcut event handlers with local ones. ([34500](https://github.com/WordPress/gutenberg/pull/34500))
+-   Gallery Block: Remove redundant css selector. ([34277](https://github.com/WordPress/gutenberg/pull/34277))
+
+#### Components
+
+-   CustomGradientBar: Replace global shortcut event handlers with local ones. ([34505](https://github.com/WordPress/gutenberg/pull/34505))
+-   Guide: Replace global shortcut event handlers with local ones. ([34503](https://github.com/WordPress/gutenberg/pull/34503))
+-   Navigate regions: Use React events for shortcuts (portal bubbles & contextual). ([33633](https://github.com/WordPress/gutenberg/pull/33633))
+-   Rename `PolymorphicComponent*` types to `WordPressComponent*`. ([34330](https://github.com/WordPress/gutenberg/pull/34330))
+-   Simplify Modal with hooks. ([34412](https://github.com/WordPress/gutenberg/pull/34412))
+-   Simplify & polish heading levels. ([34378](https://github.com/WordPress/gutenberg/pull/34378))
+
 #### Core Data
-- Fix linting errors. ([34596](https://github.com/WordPress/gutenberg/pull/34596))
-- Fix linting error in trunk. ([34464](https://github.com/WordPress/gutenberg/pull/34464))
-- Migrate `canUser` resolver to thunks. ([34580](https://github.com/WordPress/gutenberg/pull/34580))
-- Migrate `entities.js` to thunks. ([34582](https://github.com/WordPress/gutenberg/pull/34582))
-- Migrate `getAutosaves` resolver to thunks. ([34581](https://github.com/WordPress/gutenberg/pull/34581))
-- Migrate `getEntityRecord` resolver to thunks. ([34576](https://github.com/WordPress/gutenberg/pull/34576))
-- Migrate `getEntityRecords` resolver to thunks. ([34578](https://github.com/WordPress/gutenberg/pull/34578))
-- Migrate resolvers to thunks: `GetAuthors`, `_getCurrentUser`, `__getCurrentTheme`, `__getThemeSupports`. ([34579](https://github.com/WordPress/gutenberg/pull/34579))
-- Refactor `deleteEntityRecord` to use thunks instead of generators. ([34386](https://github.com/WordPress/gutenberg/pull/34386))
-- Refactor `editEntityRecord`, undo, and redo to be thunks instead of generators. ([34387](https://github.com/WordPress/gutenberg/pull/34387))
-- Remove the `PROCESS_PENDING_LOCK_REQUESTS` action. ([34343](https://github.com/WordPress/gutenberg/pull/34343))
-- Refactor `saveEntityRecord` from `redux-rungen` to async thunks. ([33201](https://github.com/WordPress/gutenberg/pull/33201))
-- Remove extraction of raw values in `saveEntityRecords`. ([34502](https://github.com/WordPress/gutenberg/pull/34502))
+
+-   Fix linting errors. ([34596](https://github.com/WordPress/gutenberg/pull/34596))
+-   Fix linting error in trunk. ([34464](https://github.com/WordPress/gutenberg/pull/34464))
+-   Migrate `canUser` resolver to thunks. ([34580](https://github.com/WordPress/gutenberg/pull/34580))
+-   Migrate `entities.js` to thunks. ([34582](https://github.com/WordPress/gutenberg/pull/34582))
+-   Migrate `getAutosaves` resolver to thunks. ([34581](https://github.com/WordPress/gutenberg/pull/34581))
+-   Migrate `getEntityRecord` resolver to thunks. ([34576](https://github.com/WordPress/gutenberg/pull/34576))
+-   Migrate `getEntityRecords` resolver to thunks. ([34578](https://github.com/WordPress/gutenberg/pull/34578))
+-   Migrate resolvers to thunks: `GetAuthors`, `_getCurrentUser`, `__getCurrentTheme`, `__getThemeSupports`. ([34579](https://github.com/WordPress/gutenberg/pull/34579))
+-   Refactor `deleteEntityRecord` to use thunks instead of generators. ([34386](https://github.com/WordPress/gutenberg/pull/34386))
+-   Refactor `editEntityRecord`, undo, and redo to be thunks instead of generators. ([34387](https://github.com/WordPress/gutenberg/pull/34387))
+-   Remove the `PROCESS_PENDING_LOCK_REQUESTS` action. ([34343](https://github.com/WordPress/gutenberg/pull/34343))
+-   Refactor `saveEntityRecord` from `redux-rungen` to async thunks. ([33201](https://github.com/WordPress/gutenberg/pull/33201))
+-   Remove extraction of raw values in `saveEntityRecords`. ([34502](https://github.com/WordPress/gutenberg/pull/34502))
+
 #### Other Packages
-- Compose, useDropZone: Ensure drag event targets `HTMLElement`. ([34272](https://github.com/WordPress/gutenberg/pull/34272))
-- Editor: Replace hardcoded store key. ([34296](https://github.com/WordPress/gutenberg/pull/34296))
-- Env: Clarify config error within `parse-config.js`. ([34322](https://github.com/WordPress/gutenberg/pull/34322))
-- Post Editor: Fix gray W menu color. ([34318](https://github.com/WordPress/gutenberg/pull/34318))
-- URL: Add `getFilename` method to the URL package. ([34313](https://github.com/WordPress/gutenberg/pull/34313))
 
+-   Compose, useDropZone: Ensure drag event targets `HTMLElement`. ([34272](https://github.com/WordPress/gutenberg/pull/34272))
+-   Editor: Replace hardcoded store key. ([34296](https://github.com/WordPress/gutenberg/pull/34296))
+-   Env: Clarify config error within `parse-config.js`. ([34322](https://github.com/WordPress/gutenberg/pull/34322))
+-   Post Editor: Fix gray W menu color. ([34318](https://github.com/WordPress/gutenberg/pull/34318))
+-   URL: Add `getFilename` method to the URL package. ([34313](https://github.com/WordPress/gutenberg/pull/34313))
 
 ### Tools
 
 #### Build Tooling
-- ESLint: Add `useSelect` to direct function calls list. ([34301](https://github.com/WordPress/gutenberg/pull/34301))
-- ESLint: Update error message for `@emotion/css` with info about the `useCx` hook. ([34418](https://github.com/WordPress/gutenberg/pull/34418))
-- Fix build hang on Windows 10. ([23589](https://github.com/WordPress/gutenberg/pull/23589))
-- Linting: Remove global event listener warning. ([34528](https://github.com/WordPress/gutenberg/pull/34528))
-- More work on the stability of the performance metrics. ([34229](https://github.com/WordPress/gutenberg/pull/34229))
+
+-   ESLint: Add `useSelect` to direct function calls list. ([34301](https://github.com/WordPress/gutenberg/pull/34301))
+-   ESLint: Update error message for `@emotion/css` with info about the `useCx` hook. ([34418](https://github.com/WordPress/gutenberg/pull/34418))
+-   Fix build hang on Windows 10. ([23589](https://github.com/WordPress/gutenberg/pull/23589))
+-   Linting: Remove global event listener warning. ([34528](https://github.com/WordPress/gutenberg/pull/34528))
+-   More work on the stability of the performance metrics. ([34229](https://github.com/WordPress/gutenberg/pull/34229))
+
 #### Plugin
-- Added janw-me to the Codeowners for the PHP FSE folder. ([32990](https://github.com/WordPress/gutenberg/pull/32990))
-- Fix title missing in bug report form. ([34504](https://github.com/WordPress/gutenberg/pull/34504))
-- Update bug form to use drop downs. ([34458](https://github.com/WordPress/gutenberg/pull/34458))
-- Update the minimum supported WordPress version to 5.7. ([34536](https://github.com/WordPress/gutenberg/pull/34536))
+
+-   Added janw-me to the Codeowners for the PHP FSE folder. ([32990](https://github.com/WordPress/gutenberg/pull/32990))
+-   Fix title missing in bug report form. ([34504](https://github.com/WordPress/gutenberg/pull/34504))
+-   Update bug form to use drop downs. ([34458](https://github.com/WordPress/gutenberg/pull/34458))
+-   Update the minimum supported WordPress version to 5.7. ([34536](https://github.com/WordPress/gutenberg/pull/34536))
+
 #### Testing
-- Add unit tests for edit site editor utils. ([34401](https://github.com/WordPress/gutenberg/pull/34401))
-- Debug e2e-tests in vscode. ([29788](https://github.com/WordPress/gutenberg/pull/29788))
-- Jest Preset: Restore the default setting for the `verbose` option. ([34327](https://github.com/WordPress/gutenberg/pull/34327))
-- Make `Test_Widget` compatible with `WP_Widget`. ([34355](https://github.com/WordPress/gutenberg/pull/34355))
 
+-   Add unit tests for edit site editor utils. ([34401](https://github.com/WordPress/gutenberg/pull/34401))
+-   Debug e2e-tests in vscode. ([29788](https://github.com/WordPress/gutenberg/pull/29788))
+-   Jest Preset: Restore the default setting for the `verbose` option. ([34327](https://github.com/WordPress/gutenberg/pull/34327))
+-   Make `Test_Widget` compatible with `WP_Widget`. ([34355](https://github.com/WordPress/gutenberg/pull/34355))
 
 = 11.4.1 =
 
-### Bug Fixes
+## Changelog
 
-- Post title: Remove class from old div to fix alignment. ([34489](https://github.com/WordPress/gutenberg/pull/34489))
+### Bug Fixes
 
+-   Post title: Remove class from old div to fix alignment. ([34489](https://github.com/WordPress/gutenberg/pull/34489))
 
 = 11.4.0 =
 
+## Changelog
+
 ### Enhancements
-- Accessibility
-    - Cover Block: Allow alt text in Cover blocks. ([33226](https://github.com/WordPress/gutenberg/pull/33226))
-    - Add `aria-describedby` to custom select control component to describe currently-selected font size. ([33941](https://github.com/WordPress/gutenberg/pull/33941))
-- Block Editor
-    - Block Lists: improve iframe block, pattern and template previews. ([28165](https://github.com/WordPress/gutenberg/pull/28165))
-- Block Library
-    - Query Loop: update Post Template sub-block icon. ([34204](https://github.com/WordPress/gutenberg/pull/34204))
-    - Convert Gallery block to use Image blocks. ([25940](https://github.com/WordPress/gutenberg/pull/25940))
-    - Post Featured Image: add duotone block supports. ([34113](https://github.com/WordPress/gutenberg/pull/34113))
-    - Post Featured Image: add contextual help text to the `scale`property. ([34158](https://github.com/WordPress/gutenberg/pull/34158))
-    - File block: update transform from image to use image filename if caption is empty. ([34256](https://github.com/WordPress/gutenberg/pull/34256))
-    - Post date Block: add font weight support to the block. ([34070](https://github.com/WordPress/gutenberg/pull/34070))
-    - Post terms: add font weight support to the block. ([34142](https://github.com/WordPress/gutenberg/pull/34142))
-    - Site Tagline: add font weight support. ([33983](https://github.com/WordPress/gutenberg/pull/33983))
-    - Button: update spacing support to use axial padding. ([33859](https://github.com/WordPress/gutenberg/pull/33859))
-- Components
-    - Add deprecated props adapter for ColorPicker. ([34014](https://github.com/WordPress/gutenberg/pull/34014))
-    - Wrap SegmentedControl in a BaseControl with an added `help` property. ([34017](https://github.com/WordPress/gutenberg/pull/34017))
-    - Combobox: update the current selection if the list of suggestions is filtered. ([33928](https://github.com/WordPress/gutenberg/pull/33928))
-    - Post Title: use rich text hook and updating tag to `h1` ([31569](https://github.com/WordPress/gutenberg/pull/31569))
-- Design Tools
-    - Add layout default value support for blocks. ([34194](https://github.com/WordPress/gutenberg/pull/34194))
-    - Dimensions Panel: add padding tool as default for blocks where this is a common setting. ([34026](https://github.com/WordPress/gutenberg/pull/34026))
-- Navigation Screen
-    - Update navigation screen topbar. ([34166](https://github.com/WordPress/gutenberg/pull/34166))
-- Packages
-    - Updates the "settings" icon, which toggles the display of additional controls in an interface. ([34165](https://github.com/WordPress/gutenberg/pull/34165))
-- Post Editor
-    - Migrate post editor feature preferences to the interface package. ([34154](https://github.com/WordPress/gutenberg/pull/34154))
-- Widgets Editor
-    - Migrate customize widgets feature preferences to interface package. ([34135](https://github.com/WordPress/gutenberg/pull/34135))
-    - Refactor editor 'feature' preferences to interface package. ([33774](https://github.com/WordPress/gutenberg/pull/33774))
-
-### Bug Fixes
-- Block API
-    - Spacing/Dimensions Supports: separate spacing from dimensions for compatibility purposes. ([34059](https://github.com/WordPress/gutenberg/pull/34059))
-- Block Editor
-    - Font-size adjustment for tablet and mobile device previews. ([33342](https://github.com/WordPress/gutenberg/pull/33342))
-    - Fix single block selection by holding `shift` key. ([34137](https://github.com/WordPress/gutenberg/pull/34137))
-    - Fix unwanted additional spaces added around pasted text on Windows. ([33607](https://github.com/WordPress/gutenberg/pull/33607))
-    - Inserter: prevent non-deterministic order of inserter items. ([34078](https://github.com/WordPress/gutenberg/pull/34078))
-    - Try: Fix multiselect toolbar indent and reformat `BlockContextualToolbar()`. ([34038](https://github.com/WordPress/gutenberg/pull/34038)) ([34173](https://github.com/WordPress/gutenberg/pull/34173))
-- Block Library
-    - Latest Comments: use site locale in the editor. ([33944](https://github.com/WordPress/gutenberg/pull/33944))
-    - Navigation: fix vertical layout on the frontend. ([34226](https://github.com/WordPress/gutenberg/pull/34226))
-    - Navigation: add z-index value to responsive menu overlay. ([34228](https://github.com/WordPress/gutenberg/pull/34228))
-    - Navigation: enable flex on container to fix space between. ([34258](https://github.com/WordPress/gutenberg/pull/34258))
-    - Navigation: fix submenu icon positioning. ([34168](https://github.com/WordPress/gutenberg/pull/34168))
-    - Navigation block: add missing `</ul>` closing tag. ([34077](https://github.com/WordPress/gutenberg/pull/34077))
-    - Post Excerpt: remove interactive formatting. ([34083](https://github.com/WordPress/gutenberg/pull/34083))
-    - RichText: fix `space` key for button and summary elements. ([30244](https://github.com/WordPress/gutenberg/pull/30244))
-    - Search Block: add space between generated border class names. ([34025](https://github.com/WordPress/gutenberg/pull/34025))
-- Build Tooling
-    - Webpack: Fix watch on `.json` and `.php` files. ([34024](https://github.com/WordPress/gutenberg/pull/34024))
-    - Pin TypeScript dependency to a specific version to avoid pulling in breaking changes. ([34422](https://github.com/WordPress/gutenberg/pull/34422))
-- Components
-    - Fix RTL on `Flex` component. ([33729](https://github.com/WordPress/gutenberg/pull/33729))
-    - NavigationSidebar: fix template content for content-navigation-item preview. ([34203](https://github.com/WordPress/gutenberg/pull/34203))
-    - Remove deprecated import style for storybook/addon-docs. ([34095](https://github.com/WordPress/gutenberg/pull/34095))
-    - ToolsPanel: add tools panel item deregistration. ([34085](https://github.com/WordPress/gutenberg/pull/34085))
-    - Post Title: remove wrapper div and fix border style. ([34167](https://github.com/WordPress/gutenberg/pull/34167))
-- Core Data
-    - `GetEntityRecords` returns items even if some included IDs don't exist. ([34034](https://github.com/WordPress/gutenberg/pull/34034))
-- Design Tools
-    - Allow zero values for `theme.json` styles. ([34251](https://github.com/WordPress/gutenberg/pull/34251))
-- Global Styles
-    - Site editor: fix for how CSS custom properties are generated. ([33932](https://github.com/WordPress/gutenberg/pull/33932))
-- Packages
-    - Rich Text: add check to `toTree()` in replacements before accessing its type. ([34020](https://github.com/WordPress/gutenberg/pull/34020))
-- Post Editor
-    - Fix selector params in `isPluginItemPinned()` selector. ([34155](https://github.com/WordPress/gutenberg/pull/34155))
 
+-   Accessibility
+    -   Cover Block: Allow alt text in Cover blocks. ([33226](https://github.com/WordPress/gutenberg/pull/33226))
+    -   Add `aria-describedby` to custom select control component to describe currently-selected font size. ([33941](https://github.com/WordPress/gutenberg/pull/33941))
+-   Block Editor
+    -   Block Lists: improve iframe block, pattern and template previews. ([28165](https://github.com/WordPress/gutenberg/pull/28165))
+-   Block Library
+    -   Query Loop: update Post Template sub-block icon. ([34204](https://github.com/WordPress/gutenberg/pull/34204))
+    -   Convert Gallery block to use Image blocks. ([25940](https://github.com/WordPress/gutenberg/pull/25940))
+    -   Post Featured Image: add duotone block supports. ([34113](https://github.com/WordPress/gutenberg/pull/34113))
+    -   Post Featured Image: add contextual help text to the `scale`property. ([34158](https://github.com/WordPress/gutenberg/pull/34158))
+    -   File block: update transform from image to use image filename if caption is empty. ([34256](https://github.com/WordPress/gutenberg/pull/34256))
+    -   Post date Block: add font weight support to the block. ([34070](https://github.com/WordPress/gutenberg/pull/34070))
+    -   Post terms: add font weight support to the block. ([34142](https://github.com/WordPress/gutenberg/pull/34142))
+    -   Site Tagline: add font weight support. ([33983](https://github.com/WordPress/gutenberg/pull/33983))
+    -   Button: update spacing support to use axial padding. ([33859](https://github.com/WordPress/gutenberg/pull/33859))
+-   Components
+    -   Add deprecated props adapter for ColorPicker. ([34014](https://github.com/WordPress/gutenberg/pull/34014))
+    -   Wrap SegmentedControl in a BaseControl with an added `help` property. ([34017](https://github.com/WordPress/gutenberg/pull/34017))
+    -   Combobox: update the current selection if the list of suggestions is filtered. ([33928](https://github.com/WordPress/gutenberg/pull/33928))
+    -   Post Title: use rich text hook and updating tag to `h1` ([31569](https://github.com/WordPress/gutenberg/pull/31569))
+-   Design Tools
+    -   Add layout default value support for blocks. ([34194](https://github.com/WordPress/gutenberg/pull/34194))
+    -   Dimensions Panel: add padding tool as default for blocks where this is a common setting. ([34026](https://github.com/WordPress/gutenberg/pull/34026))
+-   Navigation Screen
+    -   Update navigation screen topbar. ([34166](https://github.com/WordPress/gutenberg/pull/34166))
+-   Packages
+    -   Updates the "settings" icon, which toggles the display of additional controls in an interface. ([34165](https://github.com/WordPress/gutenberg/pull/34165))
+-   Post Editor
+    -   Migrate post editor feature preferences to the interface package. ([34154](https://github.com/WordPress/gutenberg/pull/34154))
+-   Widgets Editor
+    -   Migrate customize widgets feature preferences to interface package. ([34135](https://github.com/WordPress/gutenberg/pull/34135))
+    -   Refactor editor 'feature' preferences to interface package. ([33774](https://github.com/WordPress/gutenberg/pull/33774))
+
+### Bug Fixes
+
+-   Block API
+    -   Spacing/Dimensions Supports: separate spacing from dimensions for compatibility purposes. ([34059](https://github.com/WordPress/gutenberg/pull/34059))
+-   Block Editor
+    -   Font-size adjustment for tablet and mobile device previews. ([33342](https://github.com/WordPress/gutenberg/pull/33342))
+    -   Fix single block selection by holding `shift` key. ([34137](https://github.com/WordPress/gutenberg/pull/34137))
+    -   Fix unwanted additional spaces added around pasted text on Windows. ([33607](https://github.com/WordPress/gutenberg/pull/33607))
+    -   Inserter: prevent non-deterministic order of inserter items. ([34078](https://github.com/WordPress/gutenberg/pull/34078))
+    -   Try: Fix multiselect toolbar indent and reformat `BlockContextualToolbar()`. ([34038](https://github.com/WordPress/gutenberg/pull/34038)) ([34173](https://github.com/WordPress/gutenberg/pull/34173))
+-   Block Library
+    -   Latest Comments: use site locale in the editor. ([33944](https://github.com/WordPress/gutenberg/pull/33944))
+    -   Navigation: fix vertical layout on the frontend. ([34226](https://github.com/WordPress/gutenberg/pull/34226))
+    -   Navigation: add z-index value to responsive menu overlay. ([34228](https://github.com/WordPress/gutenberg/pull/34228))
+    -   Navigation: enable flex on container to fix space between. ([34258](https://github.com/WordPress/gutenberg/pull/34258))
+    -   Navigation: fix submenu icon positioning. ([34168](https://github.com/WordPress/gutenberg/pull/34168))
+    -   Navigation block: add missing `</ul>` closing tag. ([34077](https://github.com/WordPress/gutenberg/pull/34077))
+    -   Post Excerpt: remove interactive formatting. ([34083](https://github.com/WordPress/gutenberg/pull/34083))
+    -   RichText: fix `space` key for button and summary elements. ([30244](https://github.com/WordPress/gutenberg/pull/30244))
+    -   Search Block: add space between generated border class names. ([34025](https://github.com/WordPress/gutenberg/pull/34025))
+-   Build Tooling
+    -   Webpack: Fix watch on `.json` and `.php` files. ([34024](https://github.com/WordPress/gutenberg/pull/34024))
+    -   Pin TypeScript dependency to a specific version to avoid pulling in breaking changes. ([34422](https://github.com/WordPress/gutenberg/pull/34422))
+-   Components
+    -   Fix RTL on `Flex` component. ([33729](https://github.com/WordPress/gutenberg/pull/33729))
+    -   NavigationSidebar: fix template content for content-navigation-item preview. ([34203](https://github.com/WordPress/gutenberg/pull/34203))
+    -   Remove deprecated import style for storybook/addon-docs. ([34095](https://github.com/WordPress/gutenberg/pull/34095))
+    -   ToolsPanel: add tools panel item deregistration. ([34085](https://github.com/WordPress/gutenberg/pull/34085))
+    -   Post Title: remove wrapper div and fix border style. ([34167](https://github.com/WordPress/gutenberg/pull/34167))
+-   Core Data
+    -   `GetEntityRecords` returns items even if some included IDs don't exist. ([34034](https://github.com/WordPress/gutenberg/pull/34034))
+-   Design Tools
+    -   Allow zero values for `theme.json` styles. ([34251](https://github.com/WordPress/gutenberg/pull/34251))
+-   Global Styles
+    -   Site editor: fix for how CSS custom properties are generated. ([33932](https://github.com/WordPress/gutenberg/pull/33932))
+-   Packages
+    -   Rich Text: add check to `toTree()` in replacements before accessing its type. ([34020](https://github.com/WordPress/gutenberg/pull/34020))
+-   Post Editor
+    -   Fix selector params in `isPluginItemPinned()` selector. ([34155](https://github.com/WordPress/gutenberg/pull/34155))
 
 ### Performance
-- Data Layer
-    - Data: Add a batch function to the data module to batch actions. ([34046](https://github.com/WordPress/gutenberg/pull/34046))
+
+-   Data Layer
+    -   Data: Add a batch function to the data module to batch actions. ([34046](https://github.com/WordPress/gutenberg/pull/34046))
 
 ### Experiments
-- Block API
-    - Block Editor: absorb parent block toolbar controls. ([33955](https://github.com/WordPress/gutenberg/pull/33955))
-    - Block Editor: use groups for InspectorControls. ([34069](https://github.com/WordPress/gutenberg/pull/34069))
-- Block Library
-    - Add generic classnames to children of Navigation. ([33918](https://github.com/WordPress/gutenberg/pull/33918))
-- Global Styles
-    - Add slashes back to the Theme JSON. ([33919](https://github.com/WordPress/gutenberg/pull/33919))
-    - Add block spacing gap configuration to `theme.json` and add support for this CSS variable to the "flow/default" layout. ([33812](https://github.com/WordPress/gutenberg/pull/33812))
 
+-   Block API
+    -   Block Editor: absorb parent block toolbar controls. ([33955](https://github.com/WordPress/gutenberg/pull/33955))
+    -   Block Editor: use groups for InspectorControls. ([34069](https://github.com/WordPress/gutenberg/pull/34069))
+-   Block Library
+    -   Add generic classnames to children of Navigation. ([33918](https://github.com/WordPress/gutenberg/pull/33918))
+-   Global Styles
+    -   Add slashes back to the Theme JSON. ([33919](https://github.com/WordPress/gutenberg/pull/33919))
+    -   Add block spacing gap configuration to `theme.json` and add support for this CSS variable to the "flow/default" layout. ([33812](https://github.com/WordPress/gutenberg/pull/33812))
 
 ### Documentation
-- Handbook
-    - Alphabetize glossary entries. ([34058](https://github.com/WordPress/gutenberg/pull/34058))
-    - Correct minor typos in `wp-plugin.md` ([34185](https://github.com/WordPress/gutenberg/pull/34185))
-    - Remove extraneous params from `block_type_metadata` hook. ([34151](https://github.com/WordPress/gutenberg/pull/34151))
-    - Update incorrect settings examples in "Global Settings & Styles". ([34084](https://github.com/WordPress/gutenberg/pull/34084))
-    - Use `block.json` to add attributes in create block tutorial. ([33978](https://github.com/WordPress/gutenberg/pull/33978))
-    - Fix typo in block gap documentation in `theme-json.md`. ([34231](https://github.com/WordPress/gutenberg/pull/34231))
-    - Fix broken mobile testing documentation link in `testing-overview.md`. ([34187](https://github.com/WordPress/gutenberg/pull/34187))
-    - Fix typo in `legacy-widget-block.md`. ([34103](https://github.com/WordPress/gutenberg/pull/34103))
-    - Update spelling and `fontSize` examples in `create-block-theme.md`. ([34152](https://github.com/WordPress/gutenberg/pull/34152))
-- Library
-    - Bump mobile version in experiments page for Gallery. ([34220](https://github.com/WordPress/gutenberg/pull/34220))
-- Packages
-    - Add documentation for mobile components directory. ([33872](https://github.com/WordPress/gutenberg/pull/33872))
-
-### Code Quality
-- Block Editor
-    - Render head and body with single portal for block previews. ([34208](https://github.com/WordPress/gutenberg/pull/34208))
-    - BlockList: refactor element context for style/svg appending. ([34183](https://github.com/WordPress/gutenberg/pull/34183))
-    - BlockList: use InnerBlocks internally. ([29895](https://github.com/WordPress/gutenberg/pull/29895))
-- Components
-    - Unit Control: add unit tests for `getValidParsedUnit` utility method. ([34029](https://github.com/WordPress/gutenberg/pull/34029))
-    - Rename `SegmentedControl` to `ToggleGroupControl`. ([34111](https://github.com/WordPress/gutenberg/pull/34111))
-    - Dropdown Menu: remove min-width from the dropdown component and add whitespace rule to avoid wrapping ([33995](https://github.com/WordPress/gutenberg/pull/33995))
-- Core Data
-    - Allow passing store definitions to controls. ([34170](https://github.com/WordPress/gutenberg/pull/34170))
-- Site Editor
-    - Remove extra DOM element used for template part overlay. ([34012](https://github.com/WordPress/gutenberg/pull/34012))
 
-### Tools
-- Build Tooling
-    - Automated Changelog: force group all documentation tasks under `Documentation`. ([34042](https://github.com/WordPress/gutenberg/pull/34042))
-    - Automated Changelog: rename "Editor" grouping to "Post Editor" to avoid ambiguity with other editors. ([34093](https://github.com/WordPress/gutenberg/pull/34093))
-    - Automated Changelog: sort feature groups by issue name. ([34071](https://github.com/WordPress/gutenberg/pull/34071))
-    - Automated Changelog: use nested headings for feature groups instead of indenting lists. ([34040](https://github.com/WordPress/gutenberg/pull/34040))
-    - Automated Changelog: remove `Uncategorized` header in output and place items at top. ([34037](https://github.com/WordPress/gutenberg/pull/34037))
-    - Add Typescript extensions to watched files. ([34094](https://github.com/WordPress/gutenberg/pull/34094))
-    - Remove obsolete step that pushes tags in NPM publishing flow. ([34114](https://github.com/WordPress/gutenberg/pull/34114))
-    - Release workflow: only commit modified changelogs. ([34211](https://github.com/WordPress/gutenberg/pull/34211))
-- ESLint
-    - Eslint plugin: use `@typescript-eslint/no-duplicate-imports` in TS projects. ([34055](https://github.com/WordPress/gutenberg/pull/34055))
-- GitHub Contributor Templates
-    - Issue Forms: simplify the bug report form template. ([34007](https://github.com/WordPress/gutenberg/pull/34007))
-- Logs
-    - Hide deprecation logs under a console group. ([34163](https://github.com/WordPress/gutenberg/pull/34163))
-- Testing
-    - Emulate reduced-motion in end-to-end tests. ([34132](https://github.com/WordPress/gutenberg/pull/34132))
-    - Re-enable Android end-to-end tests. ([34243](https://github.com/WordPress/gutenberg/pull/34243))
-    - Remove extra props from Cover deprecations. ([34066](https://github.com/WordPress/gutenberg/pull/34066))
-    - Remove the `ENVIRONMENT_DIRECTORY` env variable that was added to the performance jobs. ([34086](https://github.com/WordPress/gutenberg/pull/34086))
-    - Add snapshot test for changelog formatting. ([34049](https://github.com/WordPress/gutenberg/pull/34049))
-    - Experiment with using REST API in end-to-end tests to build up states. ([33414](https://github.com/WordPress/gutenberg/pull/33414))
+-   Handbook
+    -   Alphabetize glossary entries. ([34058](https://github.com/WordPress/gutenberg/pull/34058))
+    -   Correct minor typos in `wp-plugin.md` ([34185](https://github.com/WordPress/gutenberg/pull/34185))
+    -   Remove extraneous params from `block_type_metadata` hook. ([34151](https://github.com/WordPress/gutenberg/pull/34151))
+    -   Update incorrect settings examples in "Global Settings & Styles". ([34084](https://github.com/WordPress/gutenberg/pull/34084))
+    -   Use `block.json` to add attributes in create block tutorial. ([33978](https://github.com/WordPress/gutenberg/pull/33978))
+    -   Fix typo in block gap documentation in `theme-json.md`. ([34231](https://github.com/WordPress/gutenberg/pull/34231))
+    -   Fix broken mobile testing documentation link in `testing-overview.md`. ([34187](https://github.com/WordPress/gutenberg/pull/34187))
+    -   Fix typo in `legacy-widget-block.md`. ([34103](https://github.com/WordPress/gutenberg/pull/34103))
+    -   Update spelling and `fontSize` examples in `create-block-theme.md`. ([34152](https://github.com/WordPress/gutenberg/pull/34152))
+-   Library
+    -   Bump mobile version in experiments page for Gallery. ([34220](https://github.com/WordPress/gutenberg/pull/34220))
+-   Packages
+    -   Add documentation for mobile components directory. ([33872](https://github.com/WordPress/gutenberg/pull/33872))
 
+### Code Quality
 
+-   Block Editor
+    -   Render head and body with single portal for block previews. ([34208](https://github.com/WordPress/gutenberg/pull/34208))
+    -   BlockList: refactor element context for style/svg appending. ([34183](https://github.com/WordPress/gutenberg/pull/34183))
+    -   BlockList: use InnerBlocks internally. ([29895](https://github.com/WordPress/gutenberg/pull/29895))
+-   Components
+    -   Unit Control: add unit tests for `getValidParsedUnit` utility method. ([34029](https://github.com/WordPress/gutenberg/pull/34029))
+    -   Rename `SegmentedControl` to `ToggleGroupControl`. ([34111](https://github.com/WordPress/gutenberg/pull/34111))
+    -   Dropdown Menu: remove min-width from the dropdown component and add whitespace rule to avoid wrapping ([33995](https://github.com/WordPress/gutenberg/pull/33995))
+-   Core Data
+    -   Allow passing store definitions to controls. ([34170](https://github.com/WordPress/gutenberg/pull/34170))
+-   Site Editor
+    -   Remove extra DOM element used for template part overlay. ([34012](https://github.com/WordPress/gutenberg/pull/34012))
 
+### Tools
 
+-   Build Tooling
+    -   Automated Changelog: force group all documentation tasks under `Documentation`. ([34042](https://github.com/WordPress/gutenberg/pull/34042))
+    -   Automated Changelog: rename "Editor" grouping to "Post Editor" to avoid ambiguity with other editors. ([34093](https://github.com/WordPress/gutenberg/pull/34093))
+    -   Automated Changelog: sort feature groups by issue name. ([34071](https://github.com/WordPress/gutenberg/pull/34071))
+    -   Automated Changelog: use nested headings for feature groups instead of indenting lists. ([34040](https://github.com/WordPress/gutenberg/pull/34040))
+    -   Automated Changelog: remove `Uncategorized` header in output and place items at top. ([34037](https://github.com/WordPress/gutenberg/pull/34037))
+    -   Add Typescript extensions to watched files. ([34094](https://github.com/WordPress/gutenberg/pull/34094))
+    -   Remove obsolete step that pushes tags in NPM publishing flow. ([34114](https://github.com/WordPress/gutenberg/pull/34114))
+    -   Release workflow: only commit modified changelogs. ([34211](https://github.com/WordPress/gutenberg/pull/34211))
+-   ESLint
+    -   Eslint plugin: use `@typescript-eslint/no-duplicate-imports` in TS projects. ([34055](https://github.com/WordPress/gutenberg/pull/34055))
+-   GitHub Contributor Templates
+    -   Issue Forms: simplify the bug report form template. ([34007](https://github.com/WordPress/gutenberg/pull/34007))
+-   Logs
+    -   Hide deprecation logs under a console group. ([34163](https://github.com/WordPress/gutenberg/pull/34163))
+-   Testing
+    -   Emulate reduced-motion in end-to-end tests. ([34132](https://github.com/WordPress/gutenberg/pull/34132))
+    -   Re-enable Android end-to-end tests. ([34243](https://github.com/WordPress/gutenberg/pull/34243))
+    -   Remove extra props from Cover deprecations. ([34066](https://github.com/WordPress/gutenberg/pull/34066))
+    -   Remove the `ENVIRONMENT_DIRECTORY` env variable that was added to the performance jobs. ([34086](https://github.com/WordPress/gutenberg/pull/34086))
+    -   Add snapshot test for changelog formatting. ([34049](https://github.com/WordPress/gutenberg/pull/34049))
+    -   Experiment with using REST API in end-to-end tests to build up states. ([33414](https://github.com/WordPress/gutenberg/pull/33414))
 
 = 11.3.0 =
 
+## Changelog
+
 ### Enhancements
 
-- Block Library
-  - Button: Add padding block support. ([31774](https://github.com/WordPress/gutenberg/pull/31774))
-  - Post Featured Image: Add basic dimension controls. ([31634](https://github.com/WordPress/gutenberg/pull/31634))
-  - Template Part: Try new icons for reusable blocks and template parts. ([34002](https://github.com/WordPress/gutenberg/pull/34002))
-- Block Patterns
-  - Add translation context on titles. ([33734](https://github.com/WordPress/gutenberg/pull/33734))
-- Block Editor
-  - Enable rich previews for internal links. ([33086](https://github.com/WordPress/gutenberg/pull/33086))
-- Components
-  - Add new ColorPicker. ([33714](https://github.com/WordPress/gutenberg/pull/33714))
-  - Promote `ItemGroup`. ([33701](https://github.com/WordPress/gutenberg/pull/33701))
-  - Polish the focus style for the segmented control. ([33842](https://github.com/WordPress/gutenberg/pull/33842))
-  - Tune appender margin. ([33866](https://github.com/WordPress/gutenberg/pull/33866))
-  - Update snackbar to use framer motion instead of react spring. ([33717](https://github.com/WordPress/gutenberg/pull/33717))
-  - Use updated range styles. ([33824](https://github.com/WordPress/gutenberg/pull/33824))
-- CSS & Styling
-  - Reduce specificity of reset & classic styles. ([32659](https://github.com/WordPress/gutenberg/pull/32659))
-- Document Settings
-  - Disable spellcheck and autocomplete in permalink slug field. ([33708](https://github.com/WordPress/gutenberg/pull/33708))
-- Global Styles
-  - Dimensions Panel: Add new ToolsPanel component and update spacing supports. ([32392](https://github.com/WordPress/gutenberg/pull/32392))
-- REST API
-  - Improve the likelihood of getting rich link previews by modifying UA string for URL Details REST API endpoint. ([33747](https://github.com/WordPress/gutenberg/pull/33747))
-- Site Editor
-  - Add error boundary. ([33921](https://github.com/WordPress/gutenberg/pull/33921))
-- Template Editor
-  - Template Mode: Add busy state to template creation modal. ([33076](https://github.com/WordPress/gutenberg/pull/33076))
-- Widgets Editor
-  - Add error boundaries to widget screens. ([33771](https://github.com/WordPress/gutenberg/pull/33771))
-
-### Bug Fixes
-
-- Accessibility
-  - Fix some JAWS bugs. ([33627](https://github.com/WordPress/gutenberg/pull/33627))
-- Block Library
-  - Button: Fix justification for button block when selected. ([33739](https://github.com/WordPress/gutenberg/pull/33739))
-  - Image: Fix issue with canInsertCover not being set to false for empty arrays. ([33863](https://github.com/WordPress/gutenberg/pull/33863))
-  - Query Pagination Numbers: Fix first page's link. ([33629](https://github.com/WordPress/gutenberg/pull/33629))
-- Block API
-  - Dimensions Support: Switch dimensions block support back to using spacing key. ([34030](https://github.com/WordPress/gutenberg/pull/34030))
-- Block Editor
-  - Closing the block inserter decrements block type impressions. ([33906](https://github.com/WordPress/gutenberg/pull/33906))
-  - Fix block appender position in classic themes. ([33895](https://github.com/WordPress/gutenberg/pull/33895))
-  - Fix positioning discrepancy with draggable chip. ([33893](https://github.com/WordPress/gutenberg/pull/33893))
-  - Force link text to wrap in the Link UI when encountering extra long link text. ([33753](https://github.com/WordPress/gutenberg/pull/33753))
-  - Improve display of LinkURL menu and fix spacing. ([33652](https://github.com/WordPress/gutenberg/pull/33652))
-  - Only show rich preview for image and description if data is available. ([33660](https://github.com/WordPress/gutenberg/pull/33660))
-  - URL Details: Avoid PHP notice when parsing protocol-relative icon URLs. ([33779](https://github.com/WordPress/gutenberg/pull/33779))
-- Components
-  - `useBreakpointIndex`: Attach `resize` event listener to `window` instead of `document`. ([33902](https://github.com/WordPress/gutenberg/pull/33902))
-  - Components: Fix RTL on custom gradient picker. ([33831](https://github.com/WordPress/gutenberg/pull/33831))
-  - FontSizePicker: Use number values when the initial value is a number. ([33679](https://github.com/WordPress/gutenberg/pull/33679))
-  - FormTokenField: Avoid error when maxLength value is hit. ([33623](https://github.com/WordPress/gutenberg/pull/33623))
-- CSS & Styling
-  - Fix navigation block placeholder preview markup. ([33963](https://github.com/WordPress/gutenberg/pull/33963))
-- Global Styles
-  - Avoid rendering duplicate elements stylesheet. ([33680](https://github.com/WordPress/gutenberg/pull/33680))
-  - Fix presets for blocks with multiple selectors. ([33951](https://github.com/WordPress/gutenberg/pull/33951))
-  - Fix Global Styles transient key clash. ([33844](https://github.com/WordPress/gutenberg/pull/33844))
-- Meta Boxes
-  - Fix Safari 13 metaboxes from overlapping the content. ([33817](https://github.com/WordPress/gutenberg/pull/33817))
-- Navigation Editor
-  - Avoid React warning when creating a new menu. ([33843](https://github.com/WordPress/gutenberg/pull/33843))
-  - Fix regressed menu selection dropdown placeholder value for Nav Editor menu locations UI. ([33748](https://github.com/WordPress/gutenberg/pull/33748))
-- Site Editor
-  - Fix the site editor breaking in firefox. ([33896](https://github.com/WordPress/gutenberg/pull/33896))
-- Post Editor
-  - Editor: Safer isPreviewingPost check. ([33840](https://github.com/WordPress/gutenberg/pull/33840))
-- Template Editor
-  - Only show post template actions to users with correct capabilities. ([33392](https://github.com/WordPress/gutenberg/pull/33392))
+-   Block Library
+    -   Button: Add padding block support. ([31774](https://github.com/WordPress/gutenberg/pull/31774))
+    -   Post Featured Image: Add basic dimension controls. ([31634](https://github.com/WordPress/gutenberg/pull/31634))
+    -   Template Part: Try new icons for reusable blocks and template parts. ([34002](https://github.com/WordPress/gutenberg/pull/34002))
+-   Block Patterns
+    -   Add translation context on titles. ([33734](https://github.com/WordPress/gutenberg/pull/33734))
+-   Block Editor
+    -   Enable rich previews for internal links. ([33086](https://github.com/WordPress/gutenberg/pull/33086))
+-   Components
+    -   Add new ColorPicker. ([33714](https://github.com/WordPress/gutenberg/pull/33714))
+    -   Promote `ItemGroup`. ([33701](https://github.com/WordPress/gutenberg/pull/33701))
+    -   Polish the focus style for the segmented control. ([33842](https://github.com/WordPress/gutenberg/pull/33842))
+    -   Tune appender margin. ([33866](https://github.com/WordPress/gutenberg/pull/33866))
+    -   Update snackbar to use framer motion instead of react spring. ([33717](https://github.com/WordPress/gutenberg/pull/33717))
+    -   Use updated range styles. ([33824](https://github.com/WordPress/gutenberg/pull/33824))
+-   CSS & Styling
+    -   Reduce specificity of reset & classic styles. ([32659](https://github.com/WordPress/gutenberg/pull/32659))
+-   Document Settings
+    -   Disable spellcheck and autocomplete in permalink slug field. ([33708](https://github.com/WordPress/gutenberg/pull/33708))
+-   Global Styles
+    -   Dimensions Panel: Add new ToolsPanel component and update spacing supports. ([32392](https://github.com/WordPress/gutenberg/pull/32392))
+-   REST API
+    -   Improve the likelihood of getting rich link previews by modifying UA string for URL Details REST API endpoint. ([33747](https://github.com/WordPress/gutenberg/pull/33747))
+-   Site Editor
+    -   Add error boundary. ([33921](https://github.com/WordPress/gutenberg/pull/33921))
+-   Template Editor
+    -   Template Mode: Add busy state to template creation modal. ([33076](https://github.com/WordPress/gutenberg/pull/33076))
+-   Widgets Editor
+    -   Add error boundaries to widget screens. ([33771](https://github.com/WordPress/gutenberg/pull/33771))
+
+### Bug Fixes
 
+-   Accessibility
+    -   Fix some JAWS bugs. ([33627](https://github.com/WordPress/gutenberg/pull/33627))
+-   Block Library
+    -   Button: Fix justification for button block when selected. ([33739](https://github.com/WordPress/gutenberg/pull/33739))
+    -   Image: Fix issue with canInsertCover not being set to false for empty arrays. ([33863](https://github.com/WordPress/gutenberg/pull/33863))
+    -   Query Pagination Numbers: Fix first page's link. ([33629](https://github.com/WordPress/gutenberg/pull/33629))
+-   Block API
+    -   Dimensions Support: Switch dimensions block support back to using spacing key. ([34030](https://github.com/WordPress/gutenberg/pull/34030))
+-   Block Editor
+    -   Closing the block inserter decrements block type impressions. ([33906](https://github.com/WordPress/gutenberg/pull/33906))
+    -   Fix block appender position in classic themes. ([33895](https://github.com/WordPress/gutenberg/pull/33895))
+    -   Fix positioning discrepancy with draggable chip. ([33893](https://github.com/WordPress/gutenberg/pull/33893))
+    -   Force link text to wrap in the Link UI when encountering extra long link text. ([33753](https://github.com/WordPress/gutenberg/pull/33753))
+    -   Improve display of LinkURL menu and fix spacing. ([33652](https://github.com/WordPress/gutenberg/pull/33652))
+    -   Only show rich preview for image and description if data is available. ([33660](https://github.com/WordPress/gutenberg/pull/33660))
+    -   URL Details: Avoid PHP notice when parsing protocol-relative icon URLs. ([33779](https://github.com/WordPress/gutenberg/pull/33779))
+-   Components
+    -   `useBreakpointIndex`: Attach `resize` event listener to `window` instead of `document`. ([33902](https://github.com/WordPress/gutenberg/pull/33902))
+    -   Components: Fix RTL on custom gradient picker. ([33831](https://github.com/WordPress/gutenberg/pull/33831))
+    -   FontSizePicker: Use number values when the initial value is a number. ([33679](https://github.com/WordPress/gutenberg/pull/33679))
+    -   FormTokenField: Avoid error when maxLength value is hit. ([33623](https://github.com/WordPress/gutenberg/pull/33623))
+-   CSS & Styling
+    -   Fix navigation block placeholder preview markup. ([33963](https://github.com/WordPress/gutenberg/pull/33963))
+-   Global Styles
+    -   Avoid rendering duplicate elements stylesheet. ([33680](https://github.com/WordPress/gutenberg/pull/33680))
+    -   Fix presets for blocks with multiple selectors. ([33951](https://github.com/WordPress/gutenberg/pull/33951))
+    -   Fix Global Styles transient key clash. ([33844](https://github.com/WordPress/gutenberg/pull/33844))
+-   Meta Boxes
+    -   Fix Safari 13 metaboxes from overlapping the content. ([33817](https://github.com/WordPress/gutenberg/pull/33817))
+-   Navigation Editor
+    -   Avoid React warning when creating a new menu. ([33843](https://github.com/WordPress/gutenberg/pull/33843))
+    -   Fix regressed menu selection dropdown placeholder value for Nav Editor menu locations UI. ([33748](https://github.com/WordPress/gutenberg/pull/33748))
+-   Site Editor
+    -   Fix the site editor breaking in firefox. ([33896](https://github.com/WordPress/gutenberg/pull/33896))
+-   Post Editor
+    -   Editor: Safer isPreviewingPost check. ([33840](https://github.com/WordPress/gutenberg/pull/33840))
+-   Template Editor
+    -   Only show post template actions to users with correct capabilities. ([33392](https://github.com/WordPress/gutenberg/pull/33392))
 
 ### Performance
 
-- Block Library
-  - Improve the rendering/update performance of the image block. ([33974](https://github.com/WordPress/gutenberg/pull/33974))
-  - Do not add to the block-library CSS bundle the colors that come from `theme.json`. ([33924](https://github.com/WordPress/gutenberg/pull/33924))
-- Block Editor
-  - Lazy render the inserter search results. ([33868](https://github.com/WordPress/gutenberg/pull/33868))
-  - Lazy render block types in the inserter. ([33749](https://github.com/WordPress/gutenberg/pull/33749))
-- Parsing
-  - Improve the performance of the parser by removing the automatic custom classnames handling. ([33903](https://github.com/WordPress/gutenberg/pull/33903))
-- Post Editor
-  - Refactor the HierarchicalTermSelector so that it does not cause unnecessary loading of terms. ([33418](https://github.com/WordPress/gutenberg/pull/33418))
-- Template Editor
-  - Template Mode: Remove 'per_page' argument from the template data selector. ([33742](https://github.com/WordPress/gutenberg/pull/33742))
+-   Block Library
+    -   Improve the rendering/update performance of the image block. ([33974](https://github.com/WordPress/gutenberg/pull/33974))
+    -   Do not add to the block-library CSS bundle the colors that come from `theme.json`. ([33924](https://github.com/WordPress/gutenberg/pull/33924))
+-   Block Editor
+    -   Lazy render the inserter search results. ([33868](https://github.com/WordPress/gutenberg/pull/33868))
+    -   Lazy render block types in the inserter. ([33749](https://github.com/WordPress/gutenberg/pull/33749))
+-   Parsing
+    -   Improve the performance of the parser by removing the automatic custom classnames handling. ([33903](https://github.com/WordPress/gutenberg/pull/33903))
+-   Post Editor
+    -   Refactor the HierarchicalTermSelector so that it does not cause unnecessary loading of terms. ([33418](https://github.com/WordPress/gutenberg/pull/33418))
+-   Template Editor
+    -   Template Mode: Remove 'per_page' argument from the template data selector. ([33742](https://github.com/WordPress/gutenberg/pull/33742))
 
 ### Experiments
 
-- Full Site Editing
-  - Site Editor: Implement a settings object filter. ([33737](https://github.com/WordPress/gutenberg/pull/33737))
-  - Template part selection popover - minor style updates for visiblity. ([33733](https://github.com/WordPress/gutenberg/pull/33733))
-  - Template Part placeholder - Add title step to creation flow. ([33703](https://github.com/WordPress/gutenberg/pull/33703))
-- Navigation Block
-  - Navigation: Fix navigation block appender invalid html. ([33964](https://github.com/WordPress/gutenberg/pull/33964))
-  - Enable the ability to remove a link from the Nav Link block in the Nav Block. ([33777](https://github.com/WordPress/gutenberg/pull/33777))
-  - Fix navigation margin collapsing. ([33021](https://github.com/WordPress/gutenberg/pull/33021))
-
+-   Full Site Editing
+    -   Site Editor: Implement a settings object filter. ([33737](https://github.com/WordPress/gutenberg/pull/33737))
+    -   Template part selection popover - minor style updates for visiblity. ([33733](https://github.com/WordPress/gutenberg/pull/33733))
+    -   Template Part placeholder - Add title step to creation flow. ([33703](https://github.com/WordPress/gutenberg/pull/33703))
+-   Navigation Block
+    -   Navigation: Fix navigation block appender invalid html. ([33964](https://github.com/WordPress/gutenberg/pull/33964))
+    -   Enable the ability to remove a link from the Nav Link block in the Nav Block. ([33777](https://github.com/WordPress/gutenberg/pull/33777))
+    -   Fix navigation margin collapsing. ([33021](https://github.com/WordPress/gutenberg/pull/33021))
 
 ### Documentation
 
-- Handbook
-  - Add documentation to disable remote calls for block patterns. ([33930](https://github.com/WordPress/gutenberg/pull/33930))
-  - Add missing comma. ([33764](https://github.com/WordPress/gutenberg/pull/33764))
-  - Add more details about block attributes. ([33880](https://github.com/WordPress/gutenberg/pull/33880))
-  - Add spaces in add_theme_support documentation code. ([33796](https://github.com/WordPress/gutenberg/pull/33796))
-  - Correct spelling and grammar in documentation. ([33860](https://github.com/WordPress/gutenberg/pull/33860))
-  - fix: `supports.color.gradients` is plural. ([33781](https://github.com/WordPress/gutenberg/pull/33781))
-  - fix: Broken link in documentation to block support mechanism. ([33780](https://github.com/WordPress/gutenberg/pull/33780))
-  - Update documentation to reflect new automated process for feature grouping. ([33573](https://github.com/WordPress/gutenberg/pull/33573))
-  - link fix: Block editor Sidebar Tutorial. ([33308](https://github.com/WordPress/gutenberg/pull/33308))
-- Library
-  - Fix gutenberg_resolve_template() return documentation. ([33800](https://github.com/WordPress/gutenberg/pull/33800))
-  - Fix misspelling of "queries" in filter documentation. ([33799](https://github.com/WordPress/gutenberg/pull/33799))
-- Packages
-  - Example for rest_endpoints filter in PHP. ([33738](https://github.com/WordPress/gutenberg/pull/33738))
-
+-   Handbook
+    -   Add documentation to disable remote calls for block patterns. ([33930](https://github.com/WordPress/gutenberg/pull/33930))
+    -   Add missing comma. ([33764](https://github.com/WordPress/gutenberg/pull/33764))
+    -   Add more details about block attributes. ([33880](https://github.com/WordPress/gutenberg/pull/33880))
+    -   Add spaces in add_theme_support documentation code. ([33796](https://github.com/WordPress/gutenberg/pull/33796))
+    -   Correct spelling and grammar in documentation. ([33860](https://github.com/WordPress/gutenberg/pull/33860))
+    -   fix: `supports.color.gradients` is plural. ([33781](https://github.com/WordPress/gutenberg/pull/33781))
+    -   fix: Broken link in documentation to block support mechanism. ([33780](https://github.com/WordPress/gutenberg/pull/33780))
+    -   Update documentation to reflect new automated process for feature grouping. ([33573](https://github.com/WordPress/gutenberg/pull/33573))
+    -   link fix: Block editor Sidebar Tutorial. ([33308](https://github.com/WordPress/gutenberg/pull/33308))
+-   Library
+    -   Fix gutenberg_resolve_template() return documentation. ([33800](https://github.com/WordPress/gutenberg/pull/33800))
+    -   Fix misspelling of "queries" in filter documentation. ([33799](https://github.com/WordPress/gutenberg/pull/33799))
+-   Packages
+    -   Example for rest_endpoints filter in PHP. ([33738](https://github.com/WordPress/gutenberg/pull/33738))
 
 ### Code Quality
 
-- Block Library
-  - Site Logo: Use getMedia shorthand. ([33992](https://github.com/WordPress/gutenberg/pull/33992))
-  - Featured Image: Use getMedia shorthand. ([33943](https://github.com/WordPress/gutenberg/pull/33943))
-  - Search Block: Removed components class from icon button and polished css. ([33961](https://github.com/WordPress/gutenberg/pull/33961))
-- Components
-  - Components utils: `rtl()` return type, `rtl.watch()` utility. ([33882](https://github.com/WordPress/gutenberg/pull/33882))
-  - InputControl to TypeScript. ([33696](https://github.com/WordPress/gutenberg/pull/33696))
-  - Use the `__unsafe_useEmotionCache` in the `useCx` hook. ([33982](https://github.com/WordPress/gutenberg/pull/33982))
-- Core Data
-  - Deprecate getAuthors in favor of getUsers. ([33725](https://github.com/WordPress/gutenberg/pull/33725))
-- Global Styles
-  - No longer read from `experimental-theme.json`. ([33904](https://github.com/WordPress/gutenberg/pull/33904))
-  - Remove the experimental prefix and rename `theme.json` files. ([33925](https://github.com/WordPress/gutenberg/pull/33925))
-- Post Editor
-  - Refactor MetaBoxesArea to to functional components using hooks. ([30542](https://github.com/WordPress/gutenberg/pull/30542))
-- Scripts
-  - Fix typo in format change message. ([33945](https://github.com/WordPress/gutenberg/pull/33945))
+-   Block Library
+    -   Site Logo: Use getMedia shorthand. ([33992](https://github.com/WordPress/gutenberg/pull/33992))
+    -   Featured Image: Use getMedia shorthand. ([33943](https://github.com/WordPress/gutenberg/pull/33943))
+    -   Search Block: Removed components class from icon button and polished css. ([33961](https://github.com/WordPress/gutenberg/pull/33961))
+-   Components
+    -   Components utils: `rtl()` return type, `rtl.watch()` utility. ([33882](https://github.com/WordPress/gutenberg/pull/33882))
+    -   InputControl to TypeScript. ([33696](https://github.com/WordPress/gutenberg/pull/33696))
+    -   Use the `__unsafe_useEmotionCache` in the `useCx` hook. ([33982](https://github.com/WordPress/gutenberg/pull/33982))
+-   Core Data
+    -   Deprecate getAuthors in favor of getUsers. ([33725](https://github.com/WordPress/gutenberg/pull/33725))
+-   Global Styles
+    -   No longer read from `experimental-theme.json`. ([33904](https://github.com/WordPress/gutenberg/pull/33904))
+    -   Remove the experimental prefix and rename `theme.json` files. ([33925](https://github.com/WordPress/gutenberg/pull/33925))
+-   Post Editor
+    -   Refactor MetaBoxesArea to to functional components using hooks. ([30542](https://github.com/WordPress/gutenberg/pull/30542))
+-   Scripts
+    -   Fix typo in format change message. ([33945](https://github.com/WordPress/gutenberg/pull/33945))
 
 ### Tools
 
-- Testing
-  - Add search performance measures and make other measures more stable. ([33848](https://github.com/WordPress/gutenberg/pull/33848))
-  - Avoid double parsing the content when loading the editor. ([33727](https://github.com/WordPress/gutenberg/pull/33727))
-  - Block Hierarchy Navigation waits for the column to be highlighted. ([33721](https://github.com/WordPress/gutenberg/pull/33721))
-  - Widgets Editor: Try to fix flaky customizer inspector test. ([33890](https://github.com/WordPress/gutenberg/pull/33890), [33965](https://github.com/WordPress/gutenberg/pull/33965))
-- Build Tooling
-  - Readable JS assets Plugin: Fix webpack 5 support. ([33785](https://github.com/WordPress/gutenberg/pull/33785))
-  - Scripts: Use cssnano to minimize CSS files with build. ([33750](https://github.com/WordPress/gutenberg/pull/33750))
-  - Scripts: Webpack configuration update to minimize CSS. ([33676](https://github.com/WordPress/gutenberg/pull/33676))
-  - Scripts: Update webpack to v5 (try 2). ([33818](https://github.com/WordPress/gutenberg/pull/33818))
-  - Scripts: Add missing fallback for target in webpack 5 configuration. ([34112](https://github.com/WordPress/gutenberg/pull/34112))
-
-- ESLint
-  - Include .jsx extenstion when linting import statements. ([33746](https://github.com/WordPress/gutenberg/pull/33746))
-- GitHub Contributor Templates
-  - Update bug issue template to use forms. ([33713](https://github.com/WordPress/gutenberg/pull/33713), [33786](https://github.com/WordPress/gutenberg/pull/33786), [33761](https://github.com/WordPress/gutenberg/pull/33761))
-- Plugin
-  - Plugin: Fix `jsdoc/check-line-alignment` ESLint warnings. ([33901](https://github.com/WordPress/gutenberg/pull/33901))
-  - Correct `function_exists()` check typo introduced in #33331. ([33513](https://github.com/WordPress/gutenberg/pull/33513))
-
+-   Testing
+    -   Add search performance measures and make other measures more stable. ([33848](https://github.com/WordPress/gutenberg/pull/33848))
+    -   Avoid double parsing the content when loading the editor. ([33727](https://github.com/WordPress/gutenberg/pull/33727))
+    -   Block Hierarchy Navigation waits for the column to be highlighted. ([33721](https://github.com/WordPress/gutenberg/pull/33721))
+    -   Widgets Editor: Try to fix flaky customizer inspector test. ([33890](https://github.com/WordPress/gutenberg/pull/33890), [33965](https://github.com/WordPress/gutenberg/pull/33965))
+-   Build Tooling
+
+    -   Readable JS assets Plugin: Fix webpack 5 support. ([33785](https://github.com/WordPress/gutenberg/pull/33785))
+    -   Scripts: Use cssnano to minimize CSS files with build. ([33750](https://github.com/WordPress/gutenberg/pull/33750))
+    -   Scripts: Webpack configuration update to minimize CSS. ([33676](https://github.com/WordPress/gutenberg/pull/33676))
+    -   Scripts: Update webpack to v5 (try 2). ([33818](https://github.com/WordPress/gutenberg/pull/33818))
+    -   Scripts: Add missing fallback for target in webpack 5 configuration. ([34112](https://github.com/WordPress/gutenberg/pull/34112))
+
+-   ESLint
+    -   Include .jsx extenstion when linting import statements. ([33746](https://github.com/WordPress/gutenberg/pull/33746))
+-   GitHub Contributor Templates
+    -   Update bug issue template to use forms. ([33713](https://github.com/WordPress/gutenberg/pull/33713), [33786](https://github.com/WordPress/gutenberg/pull/33786), [33761](https://github.com/WordPress/gutenberg/pull/33761))
+-   Plugin
+    -   Plugin: Fix `jsdoc/check-line-alignment` ESLint warnings. ([33901](https://github.com/WordPress/gutenberg/pull/33901))
+    -   Correct `function_exists()` check typo introduced in #33331. ([33513](https://github.com/WordPress/gutenberg/pull/33513))
 
 = 11.2.1 =
 
-### Bug Fixes
+## Changelog
 
-- Fix available alignments and layout for the post editor. ([33894](https://github.com/WordPress/gutenberg/pull/33894))
+### Bug Fixes
 
+-   Fix available alignments and layout for the post editor. ([33894](https://github.com/WordPress/gutenberg/pull/33894))
 
+= 11.2.0 =
 
+## Changelog
 
+### Features
 
-= 11.2.0 =
+-   Search Block: Add color support to search button. ([32416](https://github.com/WordPress/gutenberg/pull/32416))
+-   Search Block: Add border color support. ([31783](https://github.com/WordPress/gutenberg/pull/31783))
+-   Pullquote: Add border and color support. ([30951](https://github.com/WordPress/gutenberg/pull/30951))
 
-### Features
+### Enhancements
 
-- Search Block: Add color support to search button. ([32416](https://github.com/WordPress/gutenberg/pull/32416))
-- Search Block: Add border color support. ([31783](https://github.com/WordPress/gutenberg/pull/31783))
-- Pullquote: Add border and color support. ([30951](https://github.com/WordPress/gutenberg/pull/30951))
+-   Post Editor
 
+    -   Add a new page/post button on publish panel. ([33276](https://github.com/WordPress/gutenberg/pull/33276))
 
-### Enhancements
+-   Widgets Editor
 
-- Post Editor
-  - Add a new page/post button on publish panel. ([33276](https://github.com/WordPress/gutenberg/pull/33276))
+    -   Widget inserter: Clarify that the button toggles the inserter. ([33561](https://github.com/WordPress/gutenberg/pull/33561))
+    -   Update widget editor help links to point to the new support article. ([33482](https://github.com/WordPress/gutenberg/pull/33482))
 
-- Widgets Editor
-  - Widget inserter: Clarify that the button toggles the inserter. ([33561](https://github.com/WordPress/gutenberg/pull/33561))
-  - Update widget editor help links to point to the new support article. ([33482](https://github.com/WordPress/gutenberg/pull/33482))
+-   Components
 
-- Components
-  - `Spacer`: Change props override order, split types. ([33555](https://github.com/WordPress/gutenberg/pull/33555))
-  - `Elevation`: Reduced motion styles, updated documentation and README. ([33551](https://github.com/WordPress/gutenberg/pull/33551))
-  - components: Add unit values utils. ([33514](https://github.com/WordPress/gutenberg/pull/33514))
-  - components: Add isValueNumeric util. ([33206](https://github.com/WordPress/gutenberg/pull/33206))
-  - [Components]: Add SegmentedControl. ([31937](https://github.com/WordPress/gutenberg/pull/31937))
-  - Components: Promote VisuallyHidden from ui into full components (#31244). ([31902](https://github.com/WordPress/gutenberg/pull/31902))
+    -   `Spacer`: Change props override order, split types. ([33555](https://github.com/WordPress/gutenberg/pull/33555))
+    -   `Elevation`: Reduced motion styles, updated documentation and README. ([33551](https://github.com/WordPress/gutenberg/pull/33551))
+    -   components: Add unit values utils. ([33514](https://github.com/WordPress/gutenberg/pull/33514))
+    -   components: Add isValueNumeric util. ([33206](https://github.com/WordPress/gutenberg/pull/33206))
+    -   [Components]: Add SegmentedControl. ([31937](https://github.com/WordPress/gutenberg/pull/31937))
+    -   Components: Promote VisuallyHidden from ui into full components (#31244). ([31902](https://github.com/WordPress/gutenberg/pull/31902))
 
-- Accessibility
-  - Inserter: In text label mode, use "Close" label when inserter is open. ([33534](https://github.com/WordPress/gutenberg/pull/33534))
+-   Accessibility
 
-- Data
-  - Core Data: Pass query argument to data selector shortcuts. ([33689](https://github.com/WordPress/gutenberg/pull/33689))
+    -   Inserter: In text label mode, use "Close" label when inserter is open. ([33534](https://github.com/WordPress/gutenberg/pull/33534))
 
+-   Data
+    -   Core Data: Pass query argument to data selector shortcuts. ([33689](https://github.com/WordPress/gutenberg/pull/33689))
 
 ### Bug Fixes
 
-- Block Library
-  - Featured Image: Allow authors to select images uploaded by other users. ([33567](https://github.com/WordPress/gutenberg/pull/33567))
-  - Template Part: Avoid button layout shift. ([33362](https://github.com/WordPress/gutenberg/pull/33362))
-  - Remove instagram reference from embed block's description. ([33519](https://github.com/WordPress/gutenberg/pull/33519))
+-   Block Library
 
-- Block Editor
-  - Fixed that the block is selected instead of the title when using the select all shortcut. ([33621](https://github.com/WordPress/gutenberg/pull/33621))
+    -   Featured Image: Allow authors to select images uploaded by other users. ([33567](https://github.com/WordPress/gutenberg/pull/33567))
+    -   Template Part: Avoid button layout shift. ([33362](https://github.com/WordPress/gutenberg/pull/33362))
+    -   Remove instagram reference from embed block's description. ([33519](https://github.com/WordPress/gutenberg/pull/33519))
 
-- Post Editor
-  - Most Used Terms: Avoid 403 error for non-administrators. ([33569](https://github.com/WordPress/gutenberg/pull/33569))
-  - Editor: Set 'hide_empty' for the most used terms query. ([33457](https://github.com/WordPress/gutenberg/pull/33457))
-  - HierarchicalTermSelector: Use TextControl component. ([33545](https://github.com/WordPress/gutenberg/pull/33545))
-  - PWA manifest: icon: Fix error when admin bar is gone. ([33702](https://github.com/WordPress/gutenberg/pull/33702))
+-   Block Editor
 
-- Widgets Editor
-  - Fix plugin/theme incompatibility, call onChangeSectionExpanded conditionally. ([33618](https://github.com/WordPress/gutenberg/pull/33618))
+    -   Fixed that the block is selected instead of the title when using the select all shortcut. ([33621](https://github.com/WordPress/gutenberg/pull/33621))
 
-- Components
-  - Fix: Native UnitControl to handle single unit configuration. ([33641](https://github.com/WordPress/gutenberg/pull/33641))
-  - NumberControl: Allow empty values. ([33485](https://github.com/WordPress/gutenberg/pull/33485))
-  - BoxControl: Prevent invalid style values. ([33444](https://github.com/WordPress/gutenberg/pull/33444))
-  - FocalPointPicker: Check if value is NaN. ([33637](https://github.com/WordPress/gutenberg/pull/33637))
-  - UnitControl: Set correct unit when units has one option. ([33634](https://github.com/WordPress/gutenberg/pull/33634))
-  - components: Use useCx to fix iframe support. ([33301](https://github.com/WordPress/gutenberg/pull/33301))
-  - Card: Add missing `box-sizing` CSS rules. ([33511](https://github.com/WordPress/gutenberg/pull/33511))
-  - CardBody: Change default value of `isScrollable` to `false`. ([33490](https://github.com/WordPress/gutenberg/pull/33490))
-  - `ItemGroup`: Fix padding, split types, rename boolean props. ([33553](https://github.com/WordPress/gutenberg/pull/33553))
+-   Post Editor
 
-- Themes
-  - I18n: Fix broken loop in `WP_Theme_JSON_Resolver`. ([33624](https://github.com/WordPress/gutenberg/pull/33624))
+    -   Most Used Terms: Avoid 403 error for non-administrators. ([33569](https://github.com/WordPress/gutenberg/pull/33569))
+    -   Editor: Set 'hide_empty' for the most used terms query. ([33457](https://github.com/WordPress/gutenberg/pull/33457))
+    -   HierarchicalTermSelector: Use TextControl component. ([33545](https://github.com/WordPress/gutenberg/pull/33545))
+    -   PWA manifest: icon: Fix error when admin bar is gone. ([33702](https://github.com/WordPress/gutenberg/pull/33702))
 
-- Site Editor
-  - Site editor: Check template resolution. ([33527](https://github.com/WordPress/gutenberg/pull/33527))
-  - FSE: Fix content height. ([33698](https://github.com/WordPress/gutenberg/pull/33698))
+-   Widgets Editor
 
-- Media
-  - Format Library: Remove `style` from inline image if `width` not set. ([32516](https://github.com/WordPress/gutenberg/pull/32516))
+    -   Fix plugin/theme incompatibility, call onChangeSectionExpanded conditionally. ([33618](https://github.com/WordPress/gutenberg/pull/33618))
 
+-   Components
 
-### Performance
+    -   Fix: Native UnitControl to handle single unit configuration. ([33641](https://github.com/WordPress/gutenberg/pull/33641))
+    -   NumberControl: Allow empty values. ([33485](https://github.com/WordPress/gutenberg/pull/33485))
+    -   BoxControl: Prevent invalid style values. ([33444](https://github.com/WordPress/gutenberg/pull/33444))
+    -   FocalPointPicker: Check if value is NaN. ([33637](https://github.com/WordPress/gutenberg/pull/33637))
+    -   UnitControl: Set correct unit when units has one option. ([33634](https://github.com/WordPress/gutenberg/pull/33634))
+    -   components: Use useCx to fix iframe support. ([33301](https://github.com/WordPress/gutenberg/pull/33301))
+    -   Card: Add missing `box-sizing` CSS rules. ([33511](https://github.com/WordPress/gutenberg/pull/33511))
+    -   CardBody: Change default value of `isScrollable` to `false`. ([33490](https://github.com/WordPress/gutenberg/pull/33490))
+    -   `ItemGroup`: Fix padding, split types, rename boolean props. ([33553](https://github.com/WordPress/gutenberg/pull/33553))
+
+-   Themes
+
+    -   I18n: Fix broken loop in `WP_Theme_JSON_Resolver`. ([33624](https://github.com/WordPress/gutenberg/pull/33624))
+
+-   Site Editor
+
+    -   Site editor: Check template resolution. ([33527](https://github.com/WordPress/gutenberg/pull/33527))
+    -   FSE: Fix content height. ([33698](https://github.com/WordPress/gutenberg/pull/33698))
 
-- Drag and drop
-  - Set passive listener option for use popover scroll to avoid affecting scrolling performance. ([33478](https://github.com/WordPress/gutenberg/pull/33478))
-  - Drag items via transform property to avoid layout and re-paints. ([33395](https://github.com/WordPress/gutenberg/pull/33395))
+-   Media
+    -   Format Library: Remove `style` from inline image if `width` not set. ([32516](https://github.com/WordPress/gutenberg/pull/32516))
 
+### Performance
+
+-   Drag and drop
+    -   Set passive listener option for use popover scroll to avoid affecting scrolling performance. ([33478](https://github.com/WordPress/gutenberg/pull/33478))
+    -   Drag items via transform property to avoid layout and re-paints. ([33395](https://github.com/WordPress/gutenberg/pull/33395))
 
 ### Experiments
 
-- Full Site Editing
-  - Query Pagination: Update the arrows on the Next and Prev pagination blocks. ([33626](https://github.com/WordPress/gutenberg/pull/33626))
+-   Full Site Editing
 
-- Block Library
-  - Add flex layout support to the block editor. ([33359](https://github.com/WordPress/gutenberg/pull/33359))
+    -   Query Pagination: Update the arrows on the Next and Prev pagination blocks. ([33626](https://github.com/WordPress/gutenberg/pull/33626))
 
+-   Block Library
+    -   Add flex layout support to the block editor. ([33359](https://github.com/WordPress/gutenberg/pull/33359))
 
 ### Tools
 
-- Testing
-  - E2E: Navigation wait for links before counting them. ([33704](https://github.com/WordPress/gutenberg/pull/33704))
-  - Automation: Track Gutenberg performance metrics over time. ([33694](https://github.com/WordPress/gutenberg/pull/33694))
-  - Re-enable "Save flow should work as expected" end-to-end test. ([33548](https://github.com/WordPress/gutenberg/pull/33548))
-  - Skip some widgets editing related tests. ([33547](https://github.com/WordPress/gutenberg/pull/33547))
-  - Enable the reusable blocks skipped test. ([33510](https://github.com/WordPress/gutenberg/pull/33510))
-  - Skip end-to-end tests. ([33503](https://github.com/WordPress/gutenberg/pull/33503))
-  - Tests: Run Prettier after regenerating test fixture. ([33502](https://github.com/WordPress/gutenberg/pull/33502))
-  - Fix screenshots not being captured when snapshots failed. ([33448](https://github.com/WordPress/gutenberg/pull/33448))
-  - Add coverage folder to .gitignore. ([33413](https://github.com/WordPress/gutenberg/pull/33413))
-  - Automated Testing: Disable remote patterns in tests. ([33160](https://github.com/WordPress/gutenberg/pull/33160))
-  - Improve function widgets test. ([33489](https://github.com/WordPress/gutenberg/pull/33489))
-  - Make the performance CI job more stable. ([33710](https://github.com/WordPress/gutenberg/pull/33710))
-  - Update button block corner radius test to px. ([33562](https://github.com/WordPress/gutenberg/pull/33562))
-  - Add unsupported block title translation test. ([33340](https://github.com/WordPress/gutenberg/pull/33340))
-  - Re-enable skipped widgets end-to-end test. ([33449](https://github.com/WordPress/gutenberg/pull/33449))
-
-- Build Tooling
-  - Update sass version to 1.35.2 with fixes. ([33433](https://github.com/WordPress/gutenberg/pull/33433))
-  - Improve `Feature` mapping in automatically generated changelog. ([33625](https://github.com/WordPress/gutenberg/pull/33625))
-  - Add depth to git fetch in npm publishing. ([33595](https://github.com/WordPress/gutenberg/pull/33595))
-  - Release docs: Add process for creating a point release of the Plugin. ([33546](https://github.com/WordPress/gutenberg/pull/33546))
-  - Docs: Run Prettier after updating API in documentation. ([33498](https://github.com/WordPress/gutenberg/pull/33498))
-  - Publish android artifacts with publish to s3 gradle plugin. ([33441](https://github.com/WordPress/gutenberg/pull/33441))
-  - Build: Split configuration into two parts - blocks and packages. ([33293](https://github.com/WordPress/gutenberg/pull/33293))
-  - Automate grouping of release `Changelog` PRs by feature. ([33229](https://github.com/WordPress/gutenberg/pull/33229))
-  - Fix dependency extraction webpack v5 deprecation. ([33090](https://github.com/WordPress/gutenberg/pull/33090))
-  - Scripts: Update eslint-plugin-markdown version. ([33432](https://github.com/WordPress/gutenberg/pull/33432))
-  - Replace CRLF with LF when generating unminified assets. ([33509](https://github.com/WordPress/gutenberg/pull/33509))
-
+-   Testing
+
+    -   E2E: Navigation wait for links before counting them. ([33704](https://github.com/WordPress/gutenberg/pull/33704))
+    -   Automation: Track Gutenberg performance metrics over time. ([33694](https://github.com/WordPress/gutenberg/pull/33694))
+    -   Re-enable "Save flow should work as expected" end-to-end test. ([33548](https://github.com/WordPress/gutenberg/pull/33548))
+    -   Skip some widgets editing related tests. ([33547](https://github.com/WordPress/gutenberg/pull/33547))
+    -   Enable the reusable blocks skipped test. ([33510](https://github.com/WordPress/gutenberg/pull/33510))
+    -   Skip end-to-end tests. ([33503](https://github.com/WordPress/gutenberg/pull/33503))
+    -   Tests: Run Prettier after regenerating test fixture. ([33502](https://github.com/WordPress/gutenberg/pull/33502))
+    -   Fix screenshots not being captured when snapshots failed. ([33448](https://github.com/WordPress/gutenberg/pull/33448))
+    -   Add coverage folder to .gitignore. ([33413](https://github.com/WordPress/gutenberg/pull/33413))
+    -   Automated Testing: Disable remote patterns in tests. ([33160](https://github.com/WordPress/gutenberg/pull/33160))
+    -   Improve function widgets test. ([33489](https://github.com/WordPress/gutenberg/pull/33489))
+    -   Make the performance CI job more stable. ([33710](https://github.com/WordPress/gutenberg/pull/33710))
+    -   Update button block corner radius test to px. ([33562](https://github.com/WordPress/gutenberg/pull/33562))
+    -   Add unsupported block title translation test. ([33340](https://github.com/WordPress/gutenberg/pull/33340))
+    -   Re-enable skipped widgets end-to-end test. ([33449](https://github.com/WordPress/gutenberg/pull/33449))
+
+-   Build Tooling
+    -   Update sass version to 1.35.2 with fixes. ([33433](https://github.com/WordPress/gutenberg/pull/33433))
+    -   Improve `Feature` mapping in automatically generated changelog. ([33625](https://github.com/WordPress/gutenberg/pull/33625))
+    -   Add depth to git fetch in npm publishing. ([33595](https://github.com/WordPress/gutenberg/pull/33595))
+    -   Release docs: Add process for creating a point release of the Plugin. ([33546](https://github.com/WordPress/gutenberg/pull/33546))
+    -   Docs: Run Prettier after updating API in documentation. ([33498](https://github.com/WordPress/gutenberg/pull/33498))
+    -   Publish android artifacts with publish to s3 gradle plugin. ([33441](https://github.com/WordPress/gutenberg/pull/33441))
+    -   Build: Split configuration into two parts - blocks and packages. ([33293](https://github.com/WordPress/gutenberg/pull/33293))
+    -   Automate grouping of release `Changelog` PRs by feature. ([33229](https://github.com/WordPress/gutenberg/pull/33229))
+    -   Fix dependency extraction webpack v5 deprecation. ([33090](https://github.com/WordPress/gutenberg/pull/33090))
+    -   Scripts: Update eslint-plugin-markdown version. ([33432](https://github.com/WordPress/gutenberg/pull/33432))
+    -   Replace CRLF with LF when generating unminified assets. ([33509](https://github.com/WordPress/gutenberg/pull/33509))
 
 ### Documentation
 
-  - Add missing space in documentation. ([33690](https://github.com/WordPress/gutenberg/pull/33690))
-  - Added common steps of plugin translation. ([23535](https://github.com/WordPress/gutenberg/pull/23535))
-  - Packages: Ensure changelog entries are attributed to the correct release. ([33590](https://github.com/WordPress/gutenberg/pull/33590))
-  - Add i18n filters to documentation table of contents. ([33556](https://github.com/WordPress/gutenberg/pull/33556))
-  - Update the create a block theme how-to guide. ([33382](https://github.com/WordPress/gutenberg/pull/33382))
-  - Block API: Improve how blocks assets are versioned. ([33075](https://github.com/WordPress/gutenberg/pull/33075))
-  - Update the tested up to version in the readme file. ([33760](https://github.com/WordPress/gutenberg/pull/33760))
-  - Correct {% end%} tag - missing a space. ([33189](https://github.com/WordPress/gutenberg/pull/33189))
-  - Use tabs instead of spaces in block transform doc example. ([33549](https://github.com/WordPress/gutenberg/pull/33549))
-  - Fix flaky widgets end-to-end tests by waiting for the snackbar correctly. ([33317](https://github.com/WordPress/gutenberg/pull/33317))
-  - Scripts: Add changlog entry for module update. ([33473](https://github.com/WordPress/gutenberg/pull/33473))
-  - Create block: Update "Tested up to" in readme.txt. ([33493](https://github.com/WordPress/gutenberg/pull/33493))
-
+-   Add missing space in documentation. ([33690](https://github.com/WordPress/gutenberg/pull/33690))
+-   Added common steps of plugin translation. ([23535](https://github.com/WordPress/gutenberg/pull/23535))
+-   Packages: Ensure changelog entries are attributed to the correct release. ([33590](https://github.com/WordPress/gutenberg/pull/33590))
+-   Add i18n filters to documentation table of contents. ([33556](https://github.com/WordPress/gutenberg/pull/33556))
+-   Update the create a block theme how-to guide. ([33382](https://github.com/WordPress/gutenberg/pull/33382))
+-   Block API: Improve how blocks assets are versioned. ([33075](https://github.com/WordPress/gutenberg/pull/33075))
+-   Update the tested up to version in the readme file. ([33760](https://github.com/WordPress/gutenberg/pull/33760))
+-   Correct {% end%} tag - missing a space. ([33189](https://github.com/WordPress/gutenberg/pull/33189))
+-   Use tabs instead of spaces in block transform doc example. ([33549](https://github.com/WordPress/gutenberg/pull/33549))
+-   Fix flaky widgets end-to-end tests by waiting for the snackbar correctly. ([33317](https://github.com/WordPress/gutenberg/pull/33317))
+-   Scripts: Add changlog entry for module update. ([33473](https://github.com/WordPress/gutenberg/pull/33473))
+-   Create block: Update "Tested up to" in readme.txt. ([33493](https://github.com/WordPress/gutenberg/pull/33493))
 
 ### Code Quality
 
-- Block Library
-  - Fix optional params in page list rendering. ([33639](https://github.com/WordPress/gutenberg/pull/33639))
+-   Block Library
 
-- Block Editor
-  - Block editor: Use React events for shortcuts (portal bubbles & contextual). ([32323](https://github.com/WordPress/gutenberg/pull/32323))
-  - Block editor: Remove focus stopPropagation from appender. ([32003](https://github.com/WordPress/gutenberg/pull/32003))
-  - Block editor: iframe: Incorporate writing flow. ([33497](https://github.com/WordPress/gutenberg/pull/33497))
-  - Escape key sanity (avoid event.stopPropagation). ([33630](https://github.com/WordPress/gutenberg/pull/33630))
-  - Writing flow: select all: Remove early return for post title. ([33699](https://github.com/WordPress/gutenberg/pull/33699))
-  - Remove event.stopPropagation for past WritingFlow/ObserveTyping compatibility. ([33632](https://github.com/WordPress/gutenberg/pull/33632))
-
-- Post Editor
-  - Editor: Refactor Post Author component. ([33695](https://github.com/WordPress/gutenberg/pull/33695))
+    -   Fix optional params in page list rendering. ([33639](https://github.com/WordPress/gutenberg/pull/33639))
 
+-   Block Editor
 
+    -   Block editor: Use React events for shortcuts (portal bubbles & contextual). ([32323](https://github.com/WordPress/gutenberg/pull/32323))
+    -   Block editor: Remove focus stopPropagation from appender. ([32003](https://github.com/WordPress/gutenberg/pull/32003))
+    -   Block editor: iframe: Incorporate writing flow. ([33497](https://github.com/WordPress/gutenberg/pull/33497))
+    -   Escape key sanity (avoid event.stopPropagation). ([33630](https://github.com/WordPress/gutenberg/pull/33630))
+    -   Writing flow: select all: Remove early return for post title. ([33699](https://github.com/WordPress/gutenberg/pull/33699))
+    -   Remove event.stopPropagation for past WritingFlow/ObserveTyping compatibility. ([33632](https://github.com/WordPress/gutenberg/pull/33632))
 
+-   Post Editor
+    -   Editor: Refactor Post Author component. ([33695](https://github.com/WordPress/gutenberg/pull/33695))
 
 = 11.1.0 =
 
+## Changelog
+
 ### Enhancements
 
-- Admin panel available as PWA. ([33102](https://github.com/WordPress/gutenberg/pull/33102), [33310](https://github.com/WordPress/gutenberg/pull/33310))
-- Block Breadcrumbs: Small chevron icon for breadcrumb separators. ([33042](https://github.com/WordPress/gutenberg/pull/33042))
-- Block Library:
-    - Columns Block:
-        - Add stack on mobile setting to allow for columns without mobile breakpoints. ([31816](https://github.com/WordPress/gutenberg/pull/31816))
-        - Add the percent unit to the default units in Core. ([33468](https://github.com/WordPress/gutenberg/pull/33468))
-    - Latest posts: Remove grey color for dark themes. ([33325](https://github.com/WordPress/gutenberg/pull/33325))
-    - List Block: Add link color control to list block. ([33185](https://github.com/WordPress/gutenberg/pull/33185))
-    - Post Terms Block: Add a "separator" attribute to post-terms block. ([32812](https://github.com/WordPress/gutenberg/pull/32812))
-    - RSS Block: Update block styles. ([33294](https://github.com/WordPress/gutenberg/pull/33294))
-    - Tag Cloud Block:
-        - Add ability to change number of tags shown. ([32201](https://github.com/WordPress/gutenberg/pull/32201))
-        - Remove editor style so editor matches frontend. ([33289](https://github.com/WordPress/gutenberg/pull/33289))
-- Design Tools, Border:
-    - Add support for custom border units. ([33315](https://github.com/WordPress/gutenberg/pull/33315))
-    - Update border support UI. ([31585](https://github.com/WordPress/gutenberg/pull/31585))
-    - Set border style none when border width zero. ([32080](https://github.com/WordPress/gutenberg/pull/32080))
-- Link Editing: Add Unlink button to LinkControl popover. ([32541](https://github.com/WordPress/gutenberg/pull/32541))
-- List View: Enable drag and drop in List View. ([33320](https://github.com/WordPress/gutenberg/pull/33320))
-- Widget Editor: Adds auxiliary class names for editor styles. ([33388](https://github.com/WordPress/gutenberg/pull/33388))
-- General UI:
-    - Block Settings Menu: Don't render 'Move to' if there is only one block. ([33158](https://github.com/WordPress/gutenberg/pull/33158))
-    - Disable 'Post Publish' button if saving non-post entities. ([33140](https://github.com/WordPress/gutenberg/pull/33140))
-    - Preferences: Polish labels and consolidate options in preferences. ([33133](https://github.com/WordPress/gutenberg/pull/33133))
+-   Admin panel available as PWA. ([33102](https://github.com/WordPress/gutenberg/pull/33102), [33310](https://github.com/WordPress/gutenberg/pull/33310))
+-   Block Breadcrumbs: Small chevron icon for breadcrumb separators. ([33042](https://github.com/WordPress/gutenberg/pull/33042))
+-   Block Library:
+    -   Columns Block:
+        -   Add stack on mobile setting to allow for columns without mobile breakpoints. ([31816](https://github.com/WordPress/gutenberg/pull/31816))
+        -   Add the percent unit to the default units in Core. ([33468](https://github.com/WordPress/gutenberg/pull/33468))
+    -   Latest posts: Remove grey color for dark themes. ([33325](https://github.com/WordPress/gutenberg/pull/33325))
+    -   List Block: Add link color control to list block. ([33185](https://github.com/WordPress/gutenberg/pull/33185))
+    -   Post Terms Block: Add a "separator" attribute to post-terms block. ([32812](https://github.com/WordPress/gutenberg/pull/32812))
+    -   RSS Block: Update block styles. ([33294](https://github.com/WordPress/gutenberg/pull/33294))
+    -   Tag Cloud Block:
+        -   Add ability to change number of tags shown. ([32201](https://github.com/WordPress/gutenberg/pull/32201))
+        -   Remove editor style so editor matches frontend. ([33289](https://github.com/WordPress/gutenberg/pull/33289))
+-   Design Tools, Border:
+    -   Add support for custom border units. ([33315](https://github.com/WordPress/gutenberg/pull/33315))
+    -   Update border support UI. ([31585](https://github.com/WordPress/gutenberg/pull/31585))
+    -   Set border style none when border width zero. ([32080](https://github.com/WordPress/gutenberg/pull/32080))
+-   Link Editing: Add Unlink button to LinkControl popover. ([32541](https://github.com/WordPress/gutenberg/pull/32541))
+-   List View: Enable drag and drop in List View. ([33320](https://github.com/WordPress/gutenberg/pull/33320))
+-   Widget Editor: Adds auxiliary class names for editor styles. ([33388](https://github.com/WordPress/gutenberg/pull/33388))
+-   General UI:
+    -   Block Settings Menu: Don't render 'Move to' if there is only one block. ([33158](https://github.com/WordPress/gutenberg/pull/33158))
+    -   Disable 'Post Publish' button if saving non-post entities. ([33140](https://github.com/WordPress/gutenberg/pull/33140))
+    -   Preferences: Polish labels and consolidate options in preferences. ([33133](https://github.com/WordPress/gutenberg/pull/33133))
 
 ### New APIs
 
-- REST API: Block editor settings endpoint. ([33128](https://github.com/WordPress/gutenberg/pull/33128))
-- UI Components: Add a SearchControl component and reuse across the UI. ([32935](https://github.com/WordPress/gutenberg/pull/32935))
+-   REST API: Block editor settings endpoint. ([33128](https://github.com/WordPress/gutenberg/pull/33128))
+-   UI Components: Add a SearchControl component and reuse across the UI. ([32935](https://github.com/WordPress/gutenberg/pull/32935))
 
 ### Performance
 
-- Improve List View performance. ([33320](https://github.com/WordPress/gutenberg/pull/33320))
-- Pattern Directory: Caching updates. ([33052](https://github.com/WordPress/gutenberg/pull/33052))
+-   Improve List View performance. ([33320](https://github.com/WordPress/gutenberg/pull/33320))
+-   Pattern Directory: Caching updates. ([33052](https://github.com/WordPress/gutenberg/pull/33052))
 
 ### Accessibility
 
-- Improve high contrast mode rendering of icon buttons. ([33062](https://github.com/WordPress/gutenberg/pull/33062))
-
-### Bug Fixes
-
-- Block Breadcrumbs: Fix breadcrumbs html structure and React warnings. ([33159](https://github.com/WordPress/gutenberg/pull/33159))
-- Block Editor:
-    - Move layout styles to document head (instead of rendering inline). ([32083](https://github.com/WordPress/gutenberg/pull/32083))
-    - Warn only in `edit` implementation when using `useBlockProps`. ([33380](https://github.com/WordPress/gutenberg/pull/33380))
-    - Iframe: Remove reset styles. ([33204](https://github.com/WordPress/gutenberg/pull/33204))
-- Block Library:
-    - Buttons Block: Remove green background color in button preview. ([33116](https://github.com/WordPress/gutenberg/pull/33116))
-    - Embed Block: Include missing attributes when upgrading embed block. ([33235](https://github.com/WordPress/gutenberg/pull/33235))
-    - Image Block:
-        - Improve "can switch to cover" check. ([33095](https://github.com/WordPress/gutenberg/pull/33095))
-        - Fix replace link control styling. ([33326](https://github.com/WordPress/gutenberg/pull/33326))
-    - Query Loop Block:
-        - Prevent entering invalid values in the Query Loop block configuration. ([33285](https://github.com/WordPress/gutenberg/pull/33285))
-        - Update getTermsInfo() to workaround parsing issue for translatable strings. ([33341](https://github.com/WordPress/gutenberg/pull/33341))
-    - Search Block:
-        - Fix search block button position dropdown accessibility/UX issues. ([33376](https://github.com/WordPress/gutenberg/pull/33376))
-        - Update search block to handle per corner border radii. ([33023](https://github.com/WordPress/gutenberg/pull/33023))
-    - Site Title: Decode entities in site title. ([33323](https://github.com/WordPress/gutenberg/pull/33323))
-    - Home Link: Remove padding. ([33461](https://github.com/WordPress/gutenberg/pull/33461))
-    - Post Except: Fix `excerpt_more` filter conflict and remove `wordCount` attribute. ([33366](https://github.com/WordPress/gutenberg/pull/33366))
-- Design Tools:
-    - Color: Prevent color panel from showing as empty. ([33369](https://github.com/WordPress/gutenberg/pull/33369))
-    - Duotone:
-        - Avoid rendering duplicate stylesheet and SVG. ([33233](https://github.com/WordPress/gutenberg/pull/33233))
-        - Update conditions to hide duotone panel. ([33295](https://github.com/WordPress/gutenberg/pull/33295))
-    - Theme.json
-        - Allow themes to provide empty values for `color.duotone` and `spacing.units`. ([33280](https://github.com/WordPress/gutenberg/pull/33280))
-        - Specify what settings can be part of `settings.layout`. ([33303](https://github.com/WordPress/gutenberg/pull/33303))
-- Rich text:
-     - Fix format deregistration. ([31518](https://github.com/WordPress/gutenberg/pull/31518))
-     - Autocomplete: Reset state for empty text. ([33450](https://github.com/WordPress/gutenberg/pull/33450))
-     - Run input rules after composition end. ([33416](https://github.com/WordPress/gutenberg/pull/33416))
-- Site Editor: Close navigation sidebar when all posts clicked. ([33393](https://github.com/WordPress/gutenberg/pull/33393))
-- Slash Inserter: Fix slash command focus style. ([33084](https://github.com/WordPress/gutenberg/pull/33084))
-- Widgets Editor:
-    - Fix moving inner blocks in the Widgets Customizer. ([33243](https://github.com/WordPress/gutenberg/pull/33243))
-    - Fix inserter size on Widgets Editor header. ([33118](https://github.com/WordPress/gutenberg/pull/33118))
-    - Merge conflicting `wp.editor` objects into a single, non-conflicting module. ([33228](https://github.com/WordPress/gutenberg/pull/33228))
-    - Retrieve latest widgets before loading sidebars. ([32997](https://github.com/WordPress/gutenberg/pull/32997))
-- Writing flow:
-    - Allow select all from empty selection. ([33446](https://github.com/WordPress/gutenberg/pull/33446))
-    - Attempt to fix preview end-to-end failure. ([33467](https://github.com/WordPress/gutenberg/pull/33467))
-- Components:
-     - Suggestion List: Check if a node exists to scroll into view. ([33419](https://github.com/WordPress/gutenberg/pull/33419))
-     - Navigation component: Fix item handling onClick twice. ([33286](https://github.com/WordPress/gutenberg/pull/33286))
-- Editor: Extract snackbars into a separate component. ([33355](https://github.com/WordPress/gutenberg/pull/33355))
+-   Improve high contrast mode rendering of icon buttons. ([33062](https://github.com/WordPress/gutenberg/pull/33062))
+
+### Bug Fixes
+
+-   Block Breadcrumbs: Fix breadcrumbs html structure and React warnings. ([33159](https://github.com/WordPress/gutenberg/pull/33159))
+-   Block Editor:
+    -   Move layout styles to document head (instead of rendering inline). ([32083](https://github.com/WordPress/gutenberg/pull/32083))
+    -   Warn only in `edit` implementation when using `useBlockProps`. ([33380](https://github.com/WordPress/gutenberg/pull/33380))
+    -   Iframe: Remove reset styles. ([33204](https://github.com/WordPress/gutenberg/pull/33204))
+-   Block Library:
+    -   Buttons Block: Remove green background color in button preview. ([33116](https://github.com/WordPress/gutenberg/pull/33116))
+    -   Embed Block: Include missing attributes when upgrading embed block. ([33235](https://github.com/WordPress/gutenberg/pull/33235))
+    -   Image Block:
+        -   Improve "can switch to cover" check. ([33095](https://github.com/WordPress/gutenberg/pull/33095))
+        -   Fix replace link control styling. ([33326](https://github.com/WordPress/gutenberg/pull/33326))
+    -   Query Loop Block:
+        -   Prevent entering invalid values in the Query Loop block configuration. ([33285](https://github.com/WordPress/gutenberg/pull/33285))
+        -   Update getTermsInfo() to workaround parsing issue for translatable strings. ([33341](https://github.com/WordPress/gutenberg/pull/33341))
+    -   Search Block:
+        -   Fix search block button position dropdown accessibility/UX issues. ([33376](https://github.com/WordPress/gutenberg/pull/33376))
+        -   Update search block to handle per corner border radii. ([33023](https://github.com/WordPress/gutenberg/pull/33023))
+    -   Site Title: Decode entities in site title. ([33323](https://github.com/WordPress/gutenberg/pull/33323))
+    -   Home Link: Remove padding. ([33461](https://github.com/WordPress/gutenberg/pull/33461))
+    -   Post Except: Fix `excerpt_more` filter conflict and remove `wordCount` attribute. ([33366](https://github.com/WordPress/gutenberg/pull/33366))
+-   Design Tools:
+    -   Color: Prevent color panel from showing as empty. ([33369](https://github.com/WordPress/gutenberg/pull/33369))
+    -   Duotone:
+        -   Avoid rendering duplicate stylesheet and SVG. ([33233](https://github.com/WordPress/gutenberg/pull/33233))
+        -   Update conditions to hide duotone panel. ([33295](https://github.com/WordPress/gutenberg/pull/33295))
+    -   Theme.json
+        -   Allow themes to provide empty values for `color.duotone` and `spacing.units`. ([33280](https://github.com/WordPress/gutenberg/pull/33280))
+        -   Specify what settings can be part of `settings.layout`. ([33303](https://github.com/WordPress/gutenberg/pull/33303))
+-   Rich text:
+    -   Fix format deregistration. ([31518](https://github.com/WordPress/gutenberg/pull/31518))
+    -   Autocomplete: Reset state for empty text. ([33450](https://github.com/WordPress/gutenberg/pull/33450))
+    -   Run input rules after composition end. ([33416](https://github.com/WordPress/gutenberg/pull/33416))
+-   Site Editor: Close navigation sidebar when all posts clicked. ([33393](https://github.com/WordPress/gutenberg/pull/33393))
+-   Slash Inserter: Fix slash command focus style. ([33084](https://github.com/WordPress/gutenberg/pull/33084))
+-   Widgets Editor:
+    -   Fix moving inner blocks in the Widgets Customizer. ([33243](https://github.com/WordPress/gutenberg/pull/33243))
+    -   Fix inserter size on Widgets Editor header. ([33118](https://github.com/WordPress/gutenberg/pull/33118))
+    -   Merge conflicting `wp.editor` objects into a single, non-conflicting module. ([33228](https://github.com/WordPress/gutenberg/pull/33228))
+    -   Retrieve latest widgets before loading sidebars. ([32997](https://github.com/WordPress/gutenberg/pull/32997))
+-   Writing flow:
+    -   Allow select all from empty selection. ([33446](https://github.com/WordPress/gutenberg/pull/33446))
+    -   Attempt to fix preview end-to-end failure. ([33467](https://github.com/WordPress/gutenberg/pull/33467))
+-   Components:
+    -   Suggestion List: Check if a node exists to scroll into view. ([33419](https://github.com/WordPress/gutenberg/pull/33419))
+    -   Navigation component: Fix item handling onClick twice. ([33286](https://github.com/WordPress/gutenberg/pull/33286))
+-   Editor: Extract snackbars into a separate component. ([33355](https://github.com/WordPress/gutenberg/pull/33355))
 
 ### Experiments
 
-- Component System:
-    - Promote g2 `Popover` as `Flyout`. ([32197](https://github.com/WordPress/gutenberg/pull/32197))
-    - Add useControlledValue. ([33039](https://github.com/WordPress/gutenberg/pull/33039))
-    - Add normalizeArrowKey. ([33208](https://github.com/WordPress/gutenberg/pull/33208))
-    - Add mergeEventHandlers. ([33205](https://github.com/WordPress/gutenberg/pull/33205))
-    - Add useCx. ([33172](https://github.com/WordPress/gutenberg/pull/33172))
-    - Add useLatestRef hook. ([33137](https://github.com/WordPress/gutenberg/pull/33137))
-    - Remove `@emotion/css` from Divider. ([33054](https://github.com/WordPress/gutenberg/pull/33054))
-- Navigation Block:
-    - Add Color Options for Submenus. ([31149](https://github.com/WordPress/gutenberg/pull/31149))
-    - Change Navigation block markup on front end only. ([30551](https://github.com/WordPress/gutenberg/pull/30551))
-    - Improve handling of open overlay. ([32886](https://github.com/WordPress/gutenberg/pull/32886))
-    - Menu item placeholder inheritance. ([32512](https://github.com/WordPress/gutenberg/pull/32512))
-    - Pass block attributes with rendering with location. ([33043](https://github.com/WordPress/gutenberg/pull/33043))
-    - Refactor of navigation block rendering using location attribute. ([33244](https://github.com/WordPress/gutenberg/pull/33244))
-- Global Styles:
-    - Cover against non existing styles. ([33127](https://github.com/WordPress/gutenberg/pull/33127))
-    - Missing link color on style properties to css var mapping. ([33150](https://github.com/WordPress/gutenberg/pull/33150))
-    - Preset variables not being user on the site editor. ([33149](https://github.com/WordPress/gutenberg/pull/33149))
+-   Component System:
+    -   Promote g2 `Popover` as `Flyout`. ([32197](https://github.com/WordPress/gutenberg/pull/32197))
+    -   Add useControlledValue. ([33039](https://github.com/WordPress/gutenberg/pull/33039))
+    -   Add normalizeArrowKey. ([33208](https://github.com/WordPress/gutenberg/pull/33208))
+    -   Add mergeEventHandlers. ([33205](https://github.com/WordPress/gutenberg/pull/33205))
+    -   Add useCx. ([33172](https://github.com/WordPress/gutenberg/pull/33172))
+    -   Add useLatestRef hook. ([33137](https://github.com/WordPress/gutenberg/pull/33137))
+    -   Remove `@emotion/css` from Divider. ([33054](https://github.com/WordPress/gutenberg/pull/33054))
+-   Navigation Block:
+    -   Add Color Options for Submenus. ([31149](https://github.com/WordPress/gutenberg/pull/31149))
+    -   Change Navigation block markup on front end only. ([30551](https://github.com/WordPress/gutenberg/pull/30551))
+    -   Improve handling of open overlay. ([32886](https://github.com/WordPress/gutenberg/pull/32886))
+    -   Menu item placeholder inheritance. ([32512](https://github.com/WordPress/gutenberg/pull/32512))
+    -   Pass block attributes with rendering with location. ([33043](https://github.com/WordPress/gutenberg/pull/33043))
+    -   Refactor of navigation block rendering using location attribute. ([33244](https://github.com/WordPress/gutenberg/pull/33244))
+-   Global Styles:
+    -   Cover against non existing styles. ([33127](https://github.com/WordPress/gutenberg/pull/33127))
+    -   Missing link color on style properties to css var mapping. ([33150](https://github.com/WordPress/gutenberg/pull/33150))
+    -   Preset variables not being user on the site editor. ([33149](https://github.com/WordPress/gutenberg/pull/33149))
 
 ### Documentation
 
-- Admin PWA: Make readme private. ([33216](https://github.com/WordPress/gutenberg/pull/33216))
-- Handbook:
-    - Block API:
-        - Apply enhancements included in WordPress 5.8. ([33252](https://github.com/WordPress/gutenberg/pull/33252))
-        - Clarify the type of `apiVersion` in block metadata. ([33249](https://github.com/WordPress/gutenberg/pull/33249))
-        - Fixes a typo in the documentation for block supports. ([33247](https://github.com/WordPress/gutenberg/pull/33247))
-    - Block Editor API: Changes to support multiple admin screens in WP 5.8. ([33262](https://github.com/WordPress/gutenberg/pull/33262))
-    - Custom Block Editor: Fixed bad image syntax and bold text. ([32897](https://github.com/WordPress/gutenberg/pull/32897))
-    - Fix API documentation for data reference guides. ([33384](https://github.com/WordPress/gutenberg/pull/33384))
-    - Plugin Release: Update Gutenberg release documentation to clarify release post workflow. ([33328](https://github.com/WordPress/gutenberg/pull/33328))
-    - `theme.json`:
-        - Add examples and highlight backward compatibility. ([33421](https://github.com/WordPress/gutenberg/pull/33421))
-        - Update `theme.json` documentation for WordPress 5.8. ([33131](https://github.com/WordPress/gutenberg/pull/33131))
-        - Fix codetabs syntax in `theme.json` documentation. ([33417](https://github.com/WordPress/gutenberg/pull/33417))
-    - Use markdown headings instead of links for API declarations. ([33381](https://github.com/WordPress/gutenberg/pull/33381))
-- Update documentation for link color in WordPress 5.8. ([33162](https://github.com/WordPress/gutenberg/pull/33162))
-- Packages:
-    - Add `PanelBody` for `InspectorControls`. ([33227](https://github.com/WordPress/gutenberg/pull/33227))
-    - Correct wrong setState call. ([32808](https://github.com/WordPress/gutenberg/pull/32808))
-    - Remove `withState` HOC references. ([33173](https://github.com/WordPress/gutenberg/pull/33173), [33222](https://github.com/WordPress/gutenberg/pull/33222), [33259](https://github.com/WordPress/gutenberg/pull/33259))
+-   Admin PWA: Make readme private. ([33216](https://github.com/WordPress/gutenberg/pull/33216))
+-   Handbook:
+    -   Block API:
+        -   Apply enhancements included in WordPress 5.8. ([33252](https://github.com/WordPress/gutenberg/pull/33252))
+        -   Clarify the type of `apiVersion` in block metadata. ([33249](https://github.com/WordPress/gutenberg/pull/33249))
+        -   Fixes a typo in the documentation for block supports. ([33247](https://github.com/WordPress/gutenberg/pull/33247))
+    -   Block Editor API: Changes to support multiple admin screens in WP 5.8. ([33262](https://github.com/WordPress/gutenberg/pull/33262))
+    -   Custom Block Editor: Fixed bad image syntax and bold text. ([32897](https://github.com/WordPress/gutenberg/pull/32897))
+    -   Fix API documentation for data reference guides. ([33384](https://github.com/WordPress/gutenberg/pull/33384))
+    -   Plugin Release: Update Gutenberg release documentation to clarify release post workflow. ([33328](https://github.com/WordPress/gutenberg/pull/33328))
+    -   `theme.json`:
+        -   Add examples and highlight backward compatibility. ([33421](https://github.com/WordPress/gutenberg/pull/33421))
+        -   Update `theme.json` documentation for WordPress 5.8. ([33131](https://github.com/WordPress/gutenberg/pull/33131))
+        -   Fix codetabs syntax in `theme.json` documentation. ([33417](https://github.com/WordPress/gutenberg/pull/33417))
+    -   Use markdown headings instead of links for API declarations. ([33381](https://github.com/WordPress/gutenberg/pull/33381))
+-   Update documentation for link color in WordPress 5.8. ([33162](https://github.com/WordPress/gutenberg/pull/33162))
+-   Packages:
+    -   Add `PanelBody` for `InspectorControls`. ([33227](https://github.com/WordPress/gutenberg/pull/33227))
+    -   Correct wrong setState call. ([32808](https://github.com/WordPress/gutenberg/pull/32808))
+    -   Remove `withState` HOC references. ([33173](https://github.com/WordPress/gutenberg/pull/33173), [33222](https://github.com/WordPress/gutenberg/pull/33222), [33259](https://github.com/WordPress/gutenberg/pull/33259))
 
 ### Code Quality
 
-- Avoid calling `gutenberg_` functions within code shipped through WordPress Core. ([33331](https://github.com/WordPress/gutenberg/pull/33331))
-- Block Editor:
-    - Refactor the user autocompleter to avoid apiFetch and rely on the data module. ([33028](https://github.com/WordPress/gutenberg/pull/33028))
-    - Warn when `useBlockProps` hook used with a wrong Block API version. ([33274](https://github.com/WordPress/gutenberg/pull/33274))
+-   Avoid calling `gutenberg_` functions within code shipped through WordPress Core. ([33331](https://github.com/WordPress/gutenberg/pull/33331))
+-   Block Editor:
+    -   Refactor the user autocompleter to avoid apiFetch and rely on the data module. ([33028](https://github.com/WordPress/gutenberg/pull/33028))
+    -   Warn when `useBlockProps` hook used with a wrong Block API version. ([33274](https://github.com/WordPress/gutenberg/pull/33274))
     -
-- Block Library:
-    - Image Block: Fix uncaught error. ([24334](https://github.com/WordPress/gutenberg/pull/24334))
-    - Latest Posts Block: Refactor to drop apiFetch usage in favor of using the data module. ([33063](https://github.com/WordPress/gutenberg/pull/33063))
-    - Template Part Block: Remove unnecessary function exists check on wp_filter_content_tags. ([33182](https://github.com/WordPress/gutenberg/pull/33182))
-- Components:
-    - BlockNavigation: Restructure the BlockNavigation component. ([31892](https://github.com/WordPress/gutenberg/pull/31892))
-    - Box Control: Rename VerticalHorizontalInputControls to AxialInputControls. ([33016](https://github.com/WordPress/gutenberg/pull/33016))
-    - GradientPicker: Stabilises GradientPicker and CustomGradientPicker components. ([31440](https://github.com/WordPress/gutenberg/pull/31440))
-    - Toolbar: Enforce `isAlternate` on `ToolbarDropdownMenu`. ([33129](https://github.com/WordPress/gutenberg/pull/33129))
-    - ZStack: Remove `@emotion/css` from ZStack. ([33053](https://github.com/WordPress/gutenberg/pull/33053))
-- Packages: Hoist dependencies for WordPress packages. ([33387](https://github.com/WordPress/gutenberg/pull/33387))
-- Plugin: Remove deprecated APIs that are no longer supported in version 11.0. ([33258](https://github.com/WordPress/gutenberg/pull/33258))
+-   Block Library:
+    -   Image Block: Fix uncaught error. ([24334](https://github.com/WordPress/gutenberg/pull/24334))
+    -   Latest Posts Block: Refactor to drop apiFetch usage in favor of using the data module. ([33063](https://github.com/WordPress/gutenberg/pull/33063))
+    -   Template Part Block: Remove unnecessary function exists check on wp_filter_content_tags. ([33182](https://github.com/WordPress/gutenberg/pull/33182))
+-   Components:
+    -   BlockNavigation: Restructure the BlockNavigation component. ([31892](https://github.com/WordPress/gutenberg/pull/31892))
+    -   Box Control: Rename VerticalHorizontalInputControls to AxialInputControls. ([33016](https://github.com/WordPress/gutenberg/pull/33016))
+    -   GradientPicker: Stabilises GradientPicker and CustomGradientPicker components. ([31440](https://github.com/WordPress/gutenberg/pull/31440))
+    -   Toolbar: Enforce `isAlternate` on `ToolbarDropdownMenu`. ([33129](https://github.com/WordPress/gutenberg/pull/33129))
+    -   ZStack: Remove `@emotion/css` from ZStack. ([33053](https://github.com/WordPress/gutenberg/pull/33053))
+-   Packages: Hoist dependencies for WordPress packages. ([33387](https://github.com/WordPress/gutenberg/pull/33387))
+-   Plugin: Remove deprecated APIs that are no longer supported in version 11.0. ([33258](https://github.com/WordPress/gutenberg/pull/33258))
 
 ### Tools
 
-- Testing:
-    - Add basic Site Title block coverage. ([32868](https://github.com/WordPress/gutenberg/pull/32868))
-    - Add some functionality to `createUser` and `deleteUser`. ([33067](https://github.com/WordPress/gutenberg/pull/33067))
-    - Enable previously skipped widgets tests. ([33121](https://github.com/WordPress/gutenberg/pull/33121))
-    - Skipping more end-to-end tests. ([33353](https://github.com/WordPress/gutenberg/pull/33353))
-    - Skip unstable end-to-end tests. ([33352](https://github.com/WordPress/gutenberg/pull/33352))
-    - Switch to new puppeteer APIs for emulating conditions. ([33410](https://github.com/WordPress/gutenberg/pull/33410))
-    - Update end-to-end tests to use new puppeteer drag and drop api. ([33386](https://github.com/WordPress/gutenberg/pull/33386))
-- Dependencies:
-    - Update CopyWebpackPlugin to v6. ([33220](https://github.com/WordPress/gutenberg/pull/33220))
-    - Upgrade Husky to 7.0.0 and git ignorance improved. ([33183](https://github.com/WordPress/gutenberg/pull/33183))
-    - Upgrade Puppeteer to 10.1. ([33327](https://github.com/WordPress/gutenberg/pull/33327))
-    - Upgrade Storybook to v6.3. ([33219](https://github.com/WordPress/gutenberg/pull/33219))
-- NPM Packages: Introduce release types to npm publishing script. ([33329](https://github.com/WordPress/gutenberg/pull/33329))
-- Plugin: Introduce `tools` folder with configuration files. ([33281](https://github.com/WordPress/gutenberg/pull/33281))
-- Workflows:
-    - Release Worflow: Remove “experimental” status from WP 5.8 stable items. ([33214](https://github.com/WordPress/gutenberg/pull/33214))
-    - Re-enable manually triggered workflows on forks. ([32821](https://github.com/WordPress/gutenberg/pull/32821))
-    - Use NPM caching built into `action/setup-node`. ([33190](https://github.com/WordPress/gutenberg/pull/33190))
-
+-   Testing:
+    -   Add basic Site Title block coverage. ([32868](https://github.com/WordPress/gutenberg/pull/32868))
+    -   Add some functionality to `createUser` and `deleteUser`. ([33067](https://github.com/WordPress/gutenberg/pull/33067))
+    -   Enable previously skipped widgets tests. ([33121](https://github.com/WordPress/gutenberg/pull/33121))
+    -   Skipping more end-to-end tests. ([33353](https://github.com/WordPress/gutenberg/pull/33353))
+    -   Skip unstable end-to-end tests. ([33352](https://github.com/WordPress/gutenberg/pull/33352))
+    -   Switch to new puppeteer APIs for emulating conditions. ([33410](https://github.com/WordPress/gutenberg/pull/33410))
+    -   Update end-to-end tests to use new puppeteer drag and drop api. ([33386](https://github.com/WordPress/gutenberg/pull/33386))
+-   Dependencies:
+    -   Update CopyWebpackPlugin to v6. ([33220](https://github.com/WordPress/gutenberg/pull/33220))
+    -   Upgrade Husky to 7.0.0 and git ignorance improved. ([33183](https://github.com/WordPress/gutenberg/pull/33183))
+    -   Upgrade Puppeteer to 10.1. ([33327](https://github.com/WordPress/gutenberg/pull/33327))
+    -   Upgrade Storybook to v6.3. ([33219](https://github.com/WordPress/gutenberg/pull/33219))
+-   NPM Packages: Introduce release types to npm publishing script. ([33329](https://github.com/WordPress/gutenberg/pull/33329))
+-   Plugin: Introduce `tools` folder with configuration files. ([33281](https://github.com/WordPress/gutenberg/pull/33281))
+-   Workflows:
+    -   Release Worflow: Remove “experimental” status from WP 5.8 stable items. ([33214](https://github.com/WordPress/gutenberg/pull/33214))
+    -   Re-enable manually triggered workflows on forks. ([32821](https://github.com/WordPress/gutenberg/pull/32821))
+    -   Use NPM caching built into `action/setup-node`. ([33190](https://github.com/WordPress/gutenberg/pull/33190))
 
+= 11.0.0 =
 
+## Changelog
 
+### Enhancements
 
+-   Template Parts & Reusable Blocks: Add editing overlay. ([31109](https://github.com/WordPress/gutenberg/pull/31109))
+-   General UI: Improve UI/UX for block manager search. ([32922](https://github.com/WordPress/gutenberg/pull/32922))
+-   Widgets editor:
+    -   Display shortcuts for navigating regions. ([32757](https://github.com/WordPress/gutenberg/pull/32757))
+    -   Improve insertion point and drag-n-drop in the widgets screen. ([32953](https://github.com/WordPress/gutenberg/pull/32953))
+    -   Set Legacy Widget form to display only when not hidden. ([33015](https://github.com/WordPress/gutenberg/pull/33015))
+    -   Stretch Widgets editor layout to full height. ([32905](https://github.com/WordPress/gutenberg/pull/32905))
+    -   Add ability for Legacy custom HTML widget to transform into custom HTML block. ([32862](https://github.com/WordPress/gutenberg/pull/32862))
+    -   Remove the widget switcher block toolbar button for the Legacy Widget. ([32733](https://github.com/WordPress/gutenberg/pull/32733))
+    -   Wire `handle_legacy_widget_preview_iframe` to `admin_init_hook`. ([32854](https://github.com/WordPress/gutenberg/pull/32854))
+    -   Add <CopyHandler> to WidgetAreasBlockEditorProvider. ([33166](https://github.com/WordPress/gutenberg/pull/33166))
+    -   Replace "technical" error notice with a user-friendly version. ([33165](https://github.com/WordPress/gutenberg/pull/33165))
+    -   Replace legacy widget icon with its new version. ([33041](https://github.com/WordPress/gutenberg/pull/33041))
+-   Block Library:
+    -   Media Text block: allow drag and drop media replacement for Media & Text. ([29710](https://github.com/WordPress/gutenberg/pull/29710))
+    -   Categories block: Add a label for screen readers. ([33060](https://github.com/WordPress/gutenberg/pull/33060))
+    -   Post Template Block: Add post-classes in the loop for Post Template block. ([30497](https://github.com/WordPress/gutenberg/pull/30497))
+-   Global Styles and Templates:
+    -   Allow left/right/center alignments when a layout is defined. ([32810](https://github.com/WordPress/gutenberg/pull/32810))
+    -   Allow longhand and shorthand properties in `theme.json` and block attributes. ([31641](https://github.com/WordPress/gutenberg/pull/31641))
+    -   Add filters to `get_block_templates` functions. ([31806](https://github.com/WordPress/gutenberg/pull/31806))
+-   Core Data:
+    -   Allow making context-specific requests using the data module. ([32961](https://github.com/WordPress/gutenberg/pull/32961))
+    -   Make `apiFetch` requests abortable via `AbortController` in `@wordpress/api-fetch`. ([32530](https://github.com/WordPress/gutenberg/pull/32530))
 
-= 11.0.0 =
+### New APIs
 
-### Enhancements
+-   Add an API to define the default template used for the template mode. ([32771](https://github.com/WordPress/gutenberg/pull/32771))
 
-- Template Parts & Reusable Blocks: Add editing overlay. ([31109](https://github.com/WordPress/gutenberg/pull/31109))
-- General UI: Improve UI/UX for block manager search. ([32922](https://github.com/WordPress/gutenberg/pull/32922))
-- Widgets editor:
-  - Display shortcuts for navigating regions. ([32757](https://github.com/WordPress/gutenberg/pull/32757))
-  - Improve insertion point and drag-n-drop in the widgets screen. ([32953](https://github.com/WordPress/gutenberg/pull/32953))
-  - Set Legacy Widget form to display only when not hidden. ([33015](https://github.com/WordPress/gutenberg/pull/33015))
-  - Stretch Widgets editor layout to full height. ([32905](https://github.com/WordPress/gutenberg/pull/32905))
-  - Add ability for Legacy custom HTML widget to transform into custom HTML block. ([32862](https://github.com/WordPress/gutenberg/pull/32862))
-  - Remove the widget switcher block toolbar button for the Legacy Widget. ([32733](https://github.com/WordPress/gutenberg/pull/32733))
-  - Wire `handle_legacy_widget_preview_iframe` to `admin_init_hook`. ([32854](https://github.com/WordPress/gutenberg/pull/32854))
-  - Add <CopyHandler> to WidgetAreasBlockEditorProvider. ([33166](https://github.com/WordPress/gutenberg/pull/33166))
-  - Replace "technical" error notice with a user-friendly version. ([33165](https://github.com/WordPress/gutenberg/pull/33165))
-  - Replace legacy widget icon with its new version. ([33041](https://github.com/WordPress/gutenberg/pull/33041))
-- Block Library:
-  - Media Text block: allow drag and drop media replacement for Media & Text. ([29710](https://github.com/WordPress/gutenberg/pull/29710))
-  - Categories block: Add a label for screen readers. ([33060](https://github.com/WordPress/gutenberg/pull/33060))
-  - Post Template Block: Add post-classes in the loop for Post Template block. ([30497](https://github.com/WordPress/gutenberg/pull/30497))
-- Global Styles and Templates:
-  - Allow left/right/center alignments when a layout is defined. ([32810](https://github.com/WordPress/gutenberg/pull/32810))
-  - Allow longhand and shorthand properties in `theme.json` and block attributes. ([31641](https://github.com/WordPress/gutenberg/pull/31641))
-  - Add filters to `get_block_templates` functions. ([31806](https://github.com/WordPress/gutenberg/pull/31806))
-- Core Data:
-  - Allow making context-specific requests using the data module. ([32961](https://github.com/WordPress/gutenberg/pull/32961))
-  - Make `apiFetch` requests abortable via `AbortController` in `@wordpress/api-fetch`. ([32530](https://github.com/WordPress/gutenberg/pull/32530))
+### Bug Fixes
 
-### New APIs
+-   Widgets Editor:
 
-- Add an API to define the default template used for the template mode. ([32771](https://github.com/WordPress/gutenberg/pull/32771))
-
-### Bug Fixes
-
-- Widgets Editor:
-
-  - Adjust widget form margins in the new Widgets Editor. ([33040](https://github.com/WordPress/gutenberg/pull/33040))
-  - Adjust Legacy Widget form styles to match editor. ([32974](https://github.com/WordPress/gutenberg/pull/32974))
-  - Fix creating and editing non-multi widgets. ([32978](https://github.com/WordPress/gutenberg/pull/32978))
-  - Fix wide widget styles to allow floated contents. ([32976](https://github.com/WordPress/gutenberg/pull/32976))
-  - Fix to allow adding the same image twice in Widgets Editor. ([32951](https://github.com/WordPress/gutenberg/pull/32951))
-  - Fix Legacy Widget edit style bleed. ([32871](https://github.com/WordPress/gutenberg/pull/32871))
-  - Fix flaky widgets-related end-to-end tests. ([33066](https://github.com/WordPress/gutenberg/pull/33066))
-  - Fix widgets background when loading theme styles. ([32683](https://github.com/WordPress/gutenberg/pull/32683))
-  - Fix widget preview not working if widget registered via an instance. ([32781](https://github.com/WordPress/gutenberg/pull/32781))
-  - Don't display admin notices on the Widgets Editor. ([32877](https://github.com/WordPress/gutenberg/pull/32877))
-  - Remove classic block in Widgets Editor. ([32800](https://github.com/WordPress/gutenberg/pull/32800))
-  - Disable "FSE" blocks in Widgets Editor. ([32761](https://github.com/WordPress/gutenberg/pull/32761))
-  - Align widget sidebar button. ([32738](https://github.com/WordPress/gutenberg/pull/32738))
-  - Fix move to widget area checkmark. ([33213](https://github.com/WordPress/gutenberg/pull/33213))
-  - Fix Widget Block: `widget_id` is undefined when a widget is placed. ([33152](https://github.com/WordPress/gutenberg/pull/33152))
-  - Reset z-index on focused widget form. ([33122](https://github.com/WordPress/gutenberg/pull/33122))
-  - Increase specificity of the NoPreview CSS rules to avoid conflicts with theme styles. ([33200](https://github.com/WordPress/gutenberg/pull/33200))
-  - Fix legacy widget height overflow. ([33191](https://github.com/WordPress/gutenberg/pull/33191))
-  - Fix pasting blocks by setting html block as freeform content handler. ([33164](https://github.com/WordPress/gutenberg/pull/33164))
-  - Fix slash inserter for widgets screen. ([33161](https://github.com/WordPress/gutenberg/pull/33161))
-  - Add `width: 100%` to `components-base-control` inside `wp-block-legacy-widget`. ([33141](https://github.com/WordPress/gutenberg/pull/33141))
-  - Fix error message - bail out if `get_current_screen()` returns null. ([33261](https://github.com/WordPress/gutenberg/pull/33261))
-  - Customizer:
-    - Fix block toolbar deselection when clicking scrollbar. ([32762]
-    - Avoid adding default block to empty widget areas in customizer. ([32979](https://github.com/WordPress/gutenberg/pull/32979))
-      (https://github.com/WordPress/gutenberg/pull/32762))
-    - Fix apparent overflow in Customizer caused by widgets editor. ([32749](https://github.com/WordPress/gutenberg/pull/32749))
-    - Fix scroll jitter in Customize Widgets. ([32479](https://github.com/WordPress/gutenberg/pull/32479))
-
-- Block Library
-  - [Regression] Button block: Add deprecation for `style.border.radius` `number`. ([33117](https://github.com/WordPress/gutenberg/pull/33117))
-  - Query loop:
-    - Select first Query Loop found from pattern selection. ([32737](https://github.com/WordPress/gutenberg/pull/32737))
-    - Fix race condition for making Post blocks inside uneditable. ([33037](https://github.com/WordPress/gutenberg/pull/33037))
-    - Fix full width children from scrolling horizontally only in the editor. ([32892](https://github.com/WordPress/gutenberg/pull/32892))
-    - Set default block variations not to inherit from global query. ([33163](https://github.com/WordPress/gutenberg/pull/33163))
-  - Group block: Avoid rendering the layout configuration twice. ([33045](https://github.com/WordPress/gutenberg/pull/33045))
-  - Button block:
-    - Use border support provided styles and classes. ([33017](https://github.com/WordPress/gutenberg/pull/33017))
-    - Adding buttons should respect the preferred style. ([31089](https://github.com/WordPress/gutenberg/pull/31089))
-  - Categories block:
-    - Fix broken experience for lower privileged users when fetching Categories . ([32994](https://github.com/WordPress/gutenberg/pull/32994))
-    - Fix crash when trying to access categories on insertion. ([32989](https://github.com/WordPress/gutenberg/pull/32989))
-  - Latest Posts & Latest Comments blocks: Fix to remove the default indent in various editors. ([32983](https://github.com/WordPress/gutenberg/pull/32983))
-  - Archives block: add custom classes to archive dropdown. ([32971](https://github.com/WordPress/gutenberg/pull/32971))
-  - Post terms block: Fix broken experience for lower privileged users when fetching Terms. ([32947](https://github.com/WordPress/gutenberg/pull/32947))
-  - Site Title and Site Tagline blocks: `readonly` view when the user has no the right permissions. ([32817](https://github.com/WordPress/gutenberg/pull/32817))
-  - Image block:
-    - Fix block validation errors when clearing height/width. ([32524](https://github.com/WordPress/gutenberg/pull/32524))
-    - Correctly set image size slug. ([32364](https://github.com/WordPress/gutenberg/pull/32364))
-  - Site Logo block: fix broken experience for lower privileged users via permissions handling. ([32919](https://github.com/WordPress/gutenberg/pull/32919))
-  - Site Logo block: Update Site Logo block UI and option syncing. ([33179](https://github.com/WordPress/gutenberg/pull/33179))
-  - Show fewer warnings when blocks try to render themselves. ([33032](https://github.com/WordPress/gutenberg/pull/33032))
-- Block editor:
-  - Fix switcher focus style. ([33031](https://github.com/WordPress/gutenberg/pull/33031))
-  - Fix drag and drop indicator above first block and RTL drop indicators. ([33024](https://github.com/WordPress/gutenberg/pull/33024))
-  - Fix glitchy block focus style when multi selecting blocks. ([32927](https://github.com/WordPress/gutenberg/pull/32927))
-  - Fix collapsing appender when paragraph disabled. ([32894](https://github.com/WordPress/gutenberg/pull/32894))
-  - Fix unintended HTTP search request in `<LinkControl>` when `showSuggestions` is `false`. ([32857](https://github.com/WordPress/gutenberg/pull/32857))
-  - Ensure only valid URLs or anchors within the text are automatically created as links. ([32663](https://github.com/WordPress/gutenberg/pull/32663))
-  - Fix drag and drop indices when a block list contains a style element. ([32776](https://github.com/WordPress/gutenberg/pull/32776))
-  - Consistent border with focus styles for block appender. ([33022](https://github.com/WordPress/gutenberg/pull/33022))
-  - Improve scrolling experience in Safari ([32824](https://github.com/WordPress/gutenberg/pull/32824))
-  - Avoid flash of background color when scrolling in Safari. ([32747](https://github.com/WordPress/gutenberg/pull/32747))
-  - Refactor appender margin. ([33088](https://github.com/WordPress/gutenberg/pull/33088))
-  - Block Inserter: Prevent page scroll when searching a block. ([33012](https://github.com/WordPress/gutenberg/pull/33012))
-- Components:
-  - useNavigateRegions: Don't remove click event if there's no element. ([32816](https://github.com/WordPress/gutenberg/pull/32816))
-  - Stop modifying the parent context and correctly memoize it. ([32745](https://github.com/WordPress/gutenberg/pull/32745))
-  - Clear event listeners on unmount in Tooltip component. ([32729](https://github.com/WordPress/gutenberg/pull/32729))
-  - Allow decimals in spacing controls. ([32692](https://github.com/WordPress/gutenberg/pull/32692))
-- CSS and styling:
-  - Remove "is-dark-theme" rules from mixins. ([33058](https://github.com/WordPress/gutenberg/pull/33058))
-  - Set explicit z-index on interface body to ensure it’s pinned under interface header. ([32732](https://github.com/WordPress/gutenberg/pull/32732))
-  - Rename `.interface-interface-skeleton__body` `z-index` to `.interface-interface-skeleton__content`. ([32869](https://github.com/WordPress/gutenberg/pull/32869))
-- Template editor:
-  - Fix: Template editor header area is difficult to navigate with screenreaders. ([32938](https://github.com/WordPress/gutenberg/pull/32938))
-  - Do not allow users to create templates with blank titles. ([32809](https://github.com/WordPress/gutenberg/pull/32809))
-  - TemplatePanel: Fixed a problem that when a new template is created, the template is not displayed in the select box. ([32744](https://github.com/WordPress/gutenberg/pull/32744))
-- Global styles:
-  - Fix a regression where `custom-units` are forced as an array. ([32898](https://github.com/WordPress/gutenberg/pull/32898))
-  - Allow custom properties to merge. ([31840](https://github.com/WordPress/gutenberg/pull/31840))
-- Editor
-  - Fix "Select all" behavior in the editor. ([33167](https://github.com/WordPress/gutenberg/pull/33167))
-  - Prepublish Panel: Disable the Publish and Cancel buttons while saving. ([32889](https://github.com/WordPress/gutenberg/pull/32889))
-  - Revert "Prepublish Panel: Disable the Publish and Cancel buttons while saving". ([33113](https://github.com/WordPress/gutenberg/pull/33113))
+    -   Adjust widget form margins in the new Widgets Editor. ([33040](https://github.com/WordPress/gutenberg/pull/33040))
+    -   Adjust Legacy Widget form styles to match editor. ([32974](https://github.com/WordPress/gutenberg/pull/32974))
+    -   Fix creating and editing non-multi widgets. ([32978](https://github.com/WordPress/gutenberg/pull/32978))
+    -   Fix wide widget styles to allow floated contents. ([32976](https://github.com/WordPress/gutenberg/pull/32976))
+    -   Fix to allow adding the same image twice in Widgets Editor. ([32951](https://github.com/WordPress/gutenberg/pull/32951))
+    -   Fix Legacy Widget edit style bleed. ([32871](https://github.com/WordPress/gutenberg/pull/32871))
+    -   Fix flaky widgets-related end-to-end tests. ([33066](https://github.com/WordPress/gutenberg/pull/33066))
+    -   Fix widgets background when loading theme styles. ([32683](https://github.com/WordPress/gutenberg/pull/32683))
+    -   Fix widget preview not working if widget registered via an instance. ([32781](https://github.com/WordPress/gutenberg/pull/32781))
+    -   Don't display admin notices on the Widgets Editor. ([32877](https://github.com/WordPress/gutenberg/pull/32877))
+    -   Remove classic block in Widgets Editor. ([32800](https://github.com/WordPress/gutenberg/pull/32800))
+    -   Disable "FSE" blocks in Widgets Editor. ([32761](https://github.com/WordPress/gutenberg/pull/32761))
+    -   Align widget sidebar button. ([32738](https://github.com/WordPress/gutenberg/pull/32738))
+    -   Fix move to widget area checkmark. ([33213](https://github.com/WordPress/gutenberg/pull/33213))
+    -   Fix Widget Block: `widget_id` is undefined when a widget is placed. ([33152](https://github.com/WordPress/gutenberg/pull/33152))
+    -   Reset z-index on focused widget form. ([33122](https://github.com/WordPress/gutenberg/pull/33122))
+    -   Increase specificity of the NoPreview CSS rules to avoid conflicts with theme styles. ([33200](https://github.com/WordPress/gutenberg/pull/33200))
+    -   Fix legacy widget height overflow. ([33191](https://github.com/WordPress/gutenberg/pull/33191))
+    -   Fix pasting blocks by setting html block as freeform content handler. ([33164](https://github.com/WordPress/gutenberg/pull/33164))
+    -   Fix slash inserter for widgets screen. ([33161](https://github.com/WordPress/gutenberg/pull/33161))
+    -   Add `width: 100%` to `components-base-control` inside `wp-block-legacy-widget`. ([33141](https://github.com/WordPress/gutenberg/pull/33141))
+    -   Fix error message - bail out if `get_current_screen()` returns null. ([33261](https://github.com/WordPress/gutenberg/pull/33261))
+    -   Customizer:
+        -   Fix block toolbar deselection when clicking scrollbar. ([32762]
+        -   Avoid adding default block to empty widget areas in customizer. ([32979](https://github.com/WordPress/gutenberg/pull/32979))
+            (https://github.com/WordPress/gutenberg/pull/32762))
+        -   Fix apparent overflow in Customizer caused by widgets editor. ([32749](https://github.com/WordPress/gutenberg/pull/32749))
+        -   Fix scroll jitter in Customize Widgets. ([32479](https://github.com/WordPress/gutenberg/pull/32479))
+
+-   Block Library
+    -   [Regression] Button block: Add deprecation for `style.border.radius` `number`. ([33117](https://github.com/WordPress/gutenberg/pull/33117))
+    -   Query loop:
+        -   Select first Query Loop found from pattern selection. ([32737](https://github.com/WordPress/gutenberg/pull/32737))
+        -   Fix race condition for making Post blocks inside uneditable. ([33037](https://github.com/WordPress/gutenberg/pull/33037))
+        -   Fix full width children from scrolling horizontally only in the editor. ([32892](https://github.com/WordPress/gutenberg/pull/32892))
+        -   Set default block variations not to inherit from global query. ([33163](https://github.com/WordPress/gutenberg/pull/33163))
+    -   Group block: Avoid rendering the layout configuration twice. ([33045](https://github.com/WordPress/gutenberg/pull/33045))
+    -   Button block:
+        -   Use border support provided styles and classes. ([33017](https://github.com/WordPress/gutenberg/pull/33017))
+        -   Adding buttons should respect the preferred style. ([31089](https://github.com/WordPress/gutenberg/pull/31089))
+    -   Categories block:
+        -   Fix broken experience for lower privileged users when fetching Categories . ([32994](https://github.com/WordPress/gutenberg/pull/32994))
+        -   Fix crash when trying to access categories on insertion. ([32989](https://github.com/WordPress/gutenberg/pull/32989))
+    -   Latest Posts & Latest Comments blocks: Fix to remove the default indent in various editors. ([32983](https://github.com/WordPress/gutenberg/pull/32983))
+    -   Archives block: add custom classes to archive dropdown. ([32971](https://github.com/WordPress/gutenberg/pull/32971))
+    -   Post terms block: Fix broken experience for lower privileged users when fetching Terms. ([32947](https://github.com/WordPress/gutenberg/pull/32947))
+    -   Site Title and Site Tagline blocks: `readonly` view when the user has no the right permissions. ([32817](https://github.com/WordPress/gutenberg/pull/32817))
+    -   Image block:
+        -   Fix block validation errors when clearing height/width. ([32524](https://github.com/WordPress/gutenberg/pull/32524))
+        -   Correctly set image size slug. ([32364](https://github.com/WordPress/gutenberg/pull/32364))
+    -   Site Logo block: fix broken experience for lower privileged users via permissions handling. ([32919](https://github.com/WordPress/gutenberg/pull/32919))
+    -   Site Logo block: Update Site Logo block UI and option syncing. ([33179](https://github.com/WordPress/gutenberg/pull/33179))
+    -   Show fewer warnings when blocks try to render themselves. ([33032](https://github.com/WordPress/gutenberg/pull/33032))
+-   Block editor:
+    -   Fix switcher focus style. ([33031](https://github.com/WordPress/gutenberg/pull/33031))
+    -   Fix drag and drop indicator above first block and RTL drop indicators. ([33024](https://github.com/WordPress/gutenberg/pull/33024))
+    -   Fix glitchy block focus style when multi selecting blocks. ([32927](https://github.com/WordPress/gutenberg/pull/32927))
+    -   Fix collapsing appender when paragraph disabled. ([32894](https://github.com/WordPress/gutenberg/pull/32894))
+    -   Fix unintended HTTP search request in `<LinkControl>` when `showSuggestions` is `false`. ([32857](https://github.com/WordPress/gutenberg/pull/32857))
+    -   Ensure only valid URLs or anchors within the text are automatically created as links. ([32663](https://github.com/WordPress/gutenberg/pull/32663))
+    -   Fix drag and drop indices when a block list contains a style element. ([32776](https://github.com/WordPress/gutenberg/pull/32776))
+    -   Consistent border with focus styles for block appender. ([33022](https://github.com/WordPress/gutenberg/pull/33022))
+    -   Improve scrolling experience in Safari ([32824](https://github.com/WordPress/gutenberg/pull/32824))
+    -   Avoid flash of background color when scrolling in Safari. ([32747](https://github.com/WordPress/gutenberg/pull/32747))
+    -   Refactor appender margin. ([33088](https://github.com/WordPress/gutenberg/pull/33088))
+    -   Block Inserter: Prevent page scroll when searching a block. ([33012](https://github.com/WordPress/gutenberg/pull/33012))
+-   Components:
+    -   useNavigateRegions: Don't remove click event if there's no element. ([32816](https://github.com/WordPress/gutenberg/pull/32816))
+    -   Stop modifying the parent context and correctly memoize it. ([32745](https://github.com/WordPress/gutenberg/pull/32745))
+    -   Clear event listeners on unmount in Tooltip component. ([32729](https://github.com/WordPress/gutenberg/pull/32729))
+    -   Allow decimals in spacing controls. ([32692](https://github.com/WordPress/gutenberg/pull/32692))
+-   CSS and styling:
+    -   Remove "is-dark-theme" rules from mixins. ([33058](https://github.com/WordPress/gutenberg/pull/33058))
+    -   Set explicit z-index on interface body to ensure it’s pinned under interface header. ([32732](https://github.com/WordPress/gutenberg/pull/32732))
+    -   Rename `.interface-interface-skeleton__body` `z-index` to `.interface-interface-skeleton__content`. ([32869](https://github.com/WordPress/gutenberg/pull/32869))
+-   Template editor:
+    -   Fix: Template editor header area is difficult to navigate with screenreaders. ([32938](https://github.com/WordPress/gutenberg/pull/32938))
+    -   Do not allow users to create templates with blank titles. ([32809](https://github.com/WordPress/gutenberg/pull/32809))
+    -   TemplatePanel: Fixed a problem that when a new template is created, the template is not displayed in the select box. ([32744](https://github.com/WordPress/gutenberg/pull/32744))
+-   Global styles:
+    -   Fix a regression where `custom-units` are forced as an array. ([32898](https://github.com/WordPress/gutenberg/pull/32898))
+    -   Allow custom properties to merge. ([31840](https://github.com/WordPress/gutenberg/pull/31840))
+-   Editor
+    -   Fix "Select all" behavior in the editor. ([33167](https://github.com/WordPress/gutenberg/pull/33167))
+    -   Prepublish Panel: Disable the Publish and Cancel buttons while saving. ([32889](https://github.com/WordPress/gutenberg/pull/32889))
+    -   Revert "Prepublish Panel: Disable the Publish and Cancel buttons while saving". ([33113](https://github.com/WordPress/gutenberg/pull/33113))
 
 ### WordPress Core compatibility
 
-- Block Library: Improve view script integration to account for WordPress Core. ([32977](https://github.com/WordPress/gutenberg/pull/32977))
-- Auto-enable the template editor for themes with theme.json only. ([32858](https://github.com/WordPress/gutenberg/pull/32858))
-- Unify handling for block view scripts. ([32814](https://github.com/WordPress/gutenberg/pull/32814))
+-   Block Library: Improve view script integration to account for WordPress Core. ([32977](https://github.com/WordPress/gutenberg/pull/32977))
+-   Auto-enable the template editor for themes with theme.json only. ([32858](https://github.com/WordPress/gutenberg/pull/32858))
+-   Unify handling for block view scripts. ([32814](https://github.com/WordPress/gutenberg/pull/32814))
 
 ### Documentation
 
-- Handbook:
-  - Update ESnext code in the block toolbar documentation. ([32422](https://github.com/WordPress/gutenberg/pull/32422))
-  - Fix "Gutenberg" typo in dynamic blocks tutorial. ([33013](https://github.com/WordPress/gutenberg/pull/33013))
-  - Polish the Gutenberg release docs, performance audit section. ([32770](https://github.com/WordPress/gutenberg/pull/32770))
-  - Update filter in Widget Block Editor documentation. ([32759](https://github.com/WordPress/gutenberg/pull/32759))
-  - Block Editor and Block API:
-    - Add link color supports to Block API documentation. ([32936](https://github.com/WordPress/gutenberg/pull/32936))
-    - Unify Block Editor readme language and example. ([31850](https://github.com/WordPress/gutenberg/pull/31850))
-  - Architecture: Add a schema explaining the relationship between the packages that comprise the post editor. ([32921](https://github.com/WordPress/gutenberg/pull/32921))
-  - Testing: Update testing overview documentation. ([32829](https://github.com/WordPress/gutenberg/pull/32829))
-- Components:
-  - ServerSideRender: Update documentation for placeholder props. ([33030](https://github.com/WordPress/gutenberg/pull/33030))
-  - Add 'area' key to function doc for `gutenberg_get_block_templates`. ([32746](https://github.com/WordPress/gutenberg/pull/32746))
-- Widgets: Add technical implementation details for Widgets Customizer. ([33026](https://github.com/WordPress/gutenberg/pull/33026))
+-   Handbook:
+    -   Update ESnext code in the block toolbar documentation. ([32422](https://github.com/WordPress/gutenberg/pull/32422))
+    -   Fix "Gutenberg" typo in dynamic blocks tutorial. ([33013](https://github.com/WordPress/gutenberg/pull/33013))
+    -   Polish the Gutenberg release docs, performance audit section. ([32770](https://github.com/WordPress/gutenberg/pull/32770))
+    -   Update filter in Widget Block Editor documentation. ([32759](https://github.com/WordPress/gutenberg/pull/32759))
+    -   Block Editor and Block API:
+        -   Add link color supports to Block API documentation. ([32936](https://github.com/WordPress/gutenberg/pull/32936))
+        -   Unify Block Editor readme language and example. ([31850](https://github.com/WordPress/gutenberg/pull/31850))
+    -   Architecture: Add a schema explaining the relationship between the packages that comprise the post editor. ([32921](https://github.com/WordPress/gutenberg/pull/32921))
+    -   Testing: Update testing overview documentation. ([32829](https://github.com/WordPress/gutenberg/pull/32829))
+-   Components:
+    -   ServerSideRender: Update documentation for placeholder props. ([33030](https://github.com/WordPress/gutenberg/pull/33030))
+    -   Add 'area' key to function doc for `gutenberg_get_block_templates`. ([32746](https://github.com/WordPress/gutenberg/pull/32746))
+-   Widgets: Add technical implementation details for Widgets Customizer. ([33026](https://github.com/WordPress/gutenberg/pull/33026))
 
 ### Code Quality
 
-- Block Library:
-  - Query Loop: use plain `div` for wrapper element in patterns. ([32867](https://github.com/WordPress/gutenberg/pull/32867))
-  - Post Template block: remove `gutenberg` domain from Post Template block. ([32804](https://github.com/WordPress/gutenberg/pull/32804))
-  - Ensure there is no direct import from core/editor store. ([32866](https://github.com/WordPress/gutenberg/pull/32866))
-  - Improve block categories by moving several blocks from `Design` to `Theme`. ([32568](https://github.com/WordPress/gutenberg/pull/32568))
-- Typings:
-  - Begin adding types, starting with redus-store/meta/actions. ([32855](https://github.com/WordPress/gutenberg/pull/32855))
-  - Type `promise-middleware`. ([32967](https://github.com/WordPress/gutenberg/pull/32967))
-  - Add types to redux-store/metadata/selectors. ([32965](https://github.com/WordPress/gutenberg/pull/32965))
-  - Add types to redux-store metadata reducer. ([32942](https://github.com/WordPress/gutenberg/pull/32942))
-  - Redux routine: Add types. ([21313](https://github.com/WordPress/gutenberg/pull/21313))
-- Card component refactor:
-  - Remove the g2 implementation of `Card`. ([32764](https://github.com/WordPress/gutenberg/pull/32764))
-  - Update `Card` component Storybook story. ([32763](https://github.com/WordPress/gutenberg/pull/32763))
-  - Update components provider story. ([32743](https://github.com/WordPress/gutenberg/pull/32743))
-  - Update to g2 implementation. ([32566](https://github.com/WordPress/gutenberg/pull/32566))
-- Components:
-  - Remove duplicated space utilities. ([32852](https://github.com/WordPress/gutenberg/pull/32852))
-  - Unit control Utils: Update JS documentation and add basic test coverage. ([32774](https://github.com/WordPress/gutenberg/pull/32774))
-  - Allow for non-polymorphic components. ([32796](https://github.com/WordPress/gutenberg/pull/32796))
-- Editors & Interface:
-  - Update pre-publish setting copy. ([32874](https://github.com/WordPress/gutenberg/pull/32874))
-  - Update `FullscreenMode` from class components to functional components. ([32925](https://github.com/WordPress/gutenberg/pull/32925))
-  - Remove `@wordpress/editor` as a dependency from `@wordpress/block-library`. ([32801](https://github.com/WordPress/gutenberg/pull/32801))
-- Testing:
-  - Iframed editor: Add Masonry integration end-to-end test. ([33008](https://github.com/WordPress/gutenberg/pull/33008))
-  - Add regression end-to-end test for the bug that caused some wp_options to get corrupted data. ([32797](https://github.com/WordPress/gutenberg/pull/32797))
-  - Fix broken the post-template-editor test. ([32904](https://github.com/WordPress/gutenberg/pull/32904))
-- Linting:
-  - Promote lint rule to error when validating store string literals. ([32537](https://github.com/WordPress/gutenberg/pull/32537))
-  - Cleanup PHP Codesniffer warnings and enable fail. ([26516](https://github.com/WordPress/gutenberg/pull/26516))
-- Data: Handle `context` state updates in `core-data` reducer on `edits`. ([32991](https://github.com/WordPress/gutenberg/pull/32991))
-- APIs: Remove deprecated APIs that are no longer supported in version 11.0. ([33258](https://github.com/WordPress/gutenberg/pull/33258))
+-   Block Library:
+    -   Query Loop: use plain `div` for wrapper element in patterns. ([32867](https://github.com/WordPress/gutenberg/pull/32867))
+    -   Post Template block: remove `gutenberg` domain from Post Template block. ([32804](https://github.com/WordPress/gutenberg/pull/32804))
+    -   Ensure there is no direct import from core/editor store. ([32866](https://github.com/WordPress/gutenberg/pull/32866))
+    -   Improve block categories by moving several blocks from `Design` to `Theme`. ([32568](https://github.com/WordPress/gutenberg/pull/32568))
+-   Typings:
+    -   Begin adding types, starting with redus-store/meta/actions. ([32855](https://github.com/WordPress/gutenberg/pull/32855))
+    -   Type `promise-middleware`. ([32967](https://github.com/WordPress/gutenberg/pull/32967))
+    -   Add types to redux-store/metadata/selectors. ([32965](https://github.com/WordPress/gutenberg/pull/32965))
+    -   Add types to redux-store metadata reducer. ([32942](https://github.com/WordPress/gutenberg/pull/32942))
+    -   Redux routine: Add types. ([21313](https://github.com/WordPress/gutenberg/pull/21313))
+-   Card component refactor:
+    -   Remove the g2 implementation of `Card`. ([32764](https://github.com/WordPress/gutenberg/pull/32764))
+    -   Update `Card` component Storybook story. ([32763](https://github.com/WordPress/gutenberg/pull/32763))
+    -   Update components provider story. ([32743](https://github.com/WordPress/gutenberg/pull/32743))
+    -   Update to g2 implementation. ([32566](https://github.com/WordPress/gutenberg/pull/32566))
+-   Components:
+    -   Remove duplicated space utilities. ([32852](https://github.com/WordPress/gutenberg/pull/32852))
+    -   Unit control Utils: Update JS documentation and add basic test coverage. ([32774](https://github.com/WordPress/gutenberg/pull/32774))
+    -   Allow for non-polymorphic components. ([32796](https://github.com/WordPress/gutenberg/pull/32796))
+-   Editors & Interface:
+    -   Update pre-publish setting copy. ([32874](https://github.com/WordPress/gutenberg/pull/32874))
+    -   Update `FullscreenMode` from class components to functional components. ([32925](https://github.com/WordPress/gutenberg/pull/32925))
+    -   Remove `@wordpress/editor` as a dependency from `@wordpress/block-library`. ([32801](https://github.com/WordPress/gutenberg/pull/32801))
+-   Testing:
+    -   Iframed editor: Add Masonry integration end-to-end test. ([33008](https://github.com/WordPress/gutenberg/pull/33008))
+    -   Add regression end-to-end test for the bug that caused some wp_options to get corrupted data. ([32797](https://github.com/WordPress/gutenberg/pull/32797))
+    -   Fix broken the post-template-editor test. ([32904](https://github.com/WordPress/gutenberg/pull/32904))
+-   Linting:
+    -   Promote lint rule to error when validating store string literals. ([32537](https://github.com/WordPress/gutenberg/pull/32537))
+    -   Cleanup PHP Codesniffer warnings and enable fail. ([26516](https://github.com/WordPress/gutenberg/pull/26516))
+-   Data: Handle `context` state updates in `core-data` reducer on `edits`. ([32991](https://github.com/WordPress/gutenberg/pull/32991))
+-   APIs: Remove deprecated APIs that are no longer supported in version 11.0. ([33258](https://github.com/WordPress/gutenberg/pull/33258))
 
 ### Tools
 
-- Testing:
-  - Improve image caret e2e-test. ([32832](https://github.com/WordPress/gutenberg/pull/32832))
-  - Add `getCurrentUser()` to e2e test utils: , and use it for user switching. ([33050](https://github.com/WordPress/gutenberg/pull/33050))
-  - Fix WP editor metabox e2e test. ([32915](https://github.com/WordPress/gutenberg/pull/32915))
-  - Fix failing PHPUnit test caused by changes in WP core. ([32888](https://github.com/WordPress/gutenberg/pull/32888))
-- CSS & Styling:
-  - Restrict imports of @emotion/css. ([33051](https://github.com/WordPress/gutenberg/pull/33051))
-  - `@wordpress/scripts`: Support path-based chunk names in FixStyleWebpackPlugin. ([32834](https://github.com/WordPress/gutenberg/pull/32834))
-  - Upgrade to Emotion 11. ([32930](https://github.com/WordPress/gutenberg/pull/32930))
-- Linting:
-  - Fix eslint-import resolver with extraneous dependencies. ([32906](https://github.com/WordPress/gutenberg/pull/32906))
-  - Scripts: Update `lint-md-docs` script to use ignore-path. ([32633](https://github.com/WordPress/gutenberg/pull/32633))
-- Workflows:
-  - Recursively clear node modules when building for ci. ([32856](https://github.com/WordPress/gutenberg/pull/32856))
-  - Allow point releases after a new RC is out. ([32560](https://github.com/WordPress/gutenberg/pull/32560))
+-   Testing:
+    -   Improve image caret e2e-test. ([32832](https://github.com/WordPress/gutenberg/pull/32832))
+    -   Add `getCurrentUser()` to e2e test utils: , and use it for user switching. ([33050](https://github.com/WordPress/gutenberg/pull/33050))
+    -   Fix WP editor metabox e2e test. ([32915](https://github.com/WordPress/gutenberg/pull/32915))
+    -   Fix failing PHPUnit test caused by changes in WP core. ([32888](https://github.com/WordPress/gutenberg/pull/32888))
+-   CSS & Styling:
+    -   Restrict imports of @emotion/css. ([33051](https://github.com/WordPress/gutenberg/pull/33051))
+    -   `@wordpress/scripts`: Support path-based chunk names in FixStyleWebpackPlugin. ([32834](https://github.com/WordPress/gutenberg/pull/32834))
+    -   Upgrade to Emotion 11. ([32930](https://github.com/WordPress/gutenberg/pull/32930))
+-   Linting:
+    -   Fix eslint-import resolver with extraneous dependencies. ([32906](https://github.com/WordPress/gutenberg/pull/32906))
+    -   Scripts: Update `lint-md-docs` script to use ignore-path. ([32633](https://github.com/WordPress/gutenberg/pull/32633))
+-   Workflows:
+    -   Recursively clear node modules when building for ci. ([32856](https://github.com/WordPress/gutenberg/pull/32856))
+    -   Allow point releases after a new RC is out. ([32560](https://github.com/WordPress/gutenberg/pull/32560))
 
 ### Performance
 
-- Add in memory cache for rich link previews data. ([32741](https://github.com/WordPress/gutenberg/pull/32741))
+-   Add in memory cache for rich link previews data. ([32741](https://github.com/WordPress/gutenberg/pull/32741))
 
 ### Experiments
 
-- Navigation Block and Editor:
-  - Update the function name and correct the comment. ([32918](https://github.com/WordPress/gutenberg/pull/32918))
-  - Correct the case of navigation `__unstableLocation`. ([32783](https://github.com/WordPress/gutenberg/pull/32783)
-  - Navigation block: Add an unstable location attribute. ([32491](https://github.com/WordPress/gutenberg/pull/32491))
-  - Avoid double encoding of URLs in Navigation Link block. ([32840](https://github.com/WordPress/gutenberg/pull/32840))
-- Site Editor:
-  - Fix logic error on site editor `useSetting`. ([32793](https://github.com/WordPress/gutenberg/pull/32793))
-  - Fix oEmbeds not working in block template parts. ([32331](https://github.com/WordPress/gutenberg/pull/32331))
-
+-   Navigation Block and Editor:
+    -   Update the function name and correct the comment. ([32918](https://github.com/WordPress/gutenberg/pull/32918))
+    -   Correct the case of navigation `__unstableLocation`. ([32783](https://github.com/WordPress/gutenberg/pull/32783)
+    -   Navigation block: Add an unstable location attribute. ([32491](https://github.com/WordPress/gutenberg/pull/32491))
+    -   Avoid double encoding of URLs in Navigation Link block. ([32840](https://github.com/WordPress/gutenberg/pull/32840))
+-   Site Editor:
+    -   Fix logic error on site editor `useSetting`. ([32793](https://github.com/WordPress/gutenberg/pull/32793))
+    -   Fix oEmbeds not working in block template parts. ([32331](https://github.com/WordPress/gutenberg/pull/32331))
 
 = 10.9.1 =
 
+## Changelog
+
 ### Bug Fixes
 
-- Autocomplete: Fix double popover. ([32988](https://github.com/WordPress/gutenberg/pull/32988))
+-   Autocomplete: Fix double popover. ([32988](https://github.com/WordPress/gutenberg/pull/32988))
 
+= 10.9.0 =
 
+## Changelog
 
+### Enhancements
 
-= 10.9.0 =
+-   Components:
+-   UnitControl: Reduce code duplication for defined units. ([32731](https://github.com/WordPress/gutenberg/pull/32731))
+-   BoxControl: Add support for grouped directions (vertical and horizontal controls). ([32610](https://github.com/WordPress/gutenberg/pull/32610))
+-   Notice: Added onDismiss option in createInfoNotice. ([32338](https://github.com/WordPress/gutenberg/pull/32338))
+-   Block Library:
+-   Latest Posts: Limit latest-post authors dropdown to users with published posts. ([32662](https://github.com/WordPress/gutenberg/pull/32662))
+-   Calendar: Add loading and empty state. ([31504](https://github.com/WordPress/gutenberg/pull/31504))
+-   Query Loop: Add helpful text to the block. ([32694](https://github.com/WordPress/gutenberg/pull/32694))
+-   Query Loop: Rename QueryLoop to PostTemplate and change Query label. ([32514](https://github.com/WordPress/gutenberg/pull/32514))
+-   Spacer: Try an alternate min-height fix. ([32543](https://github.com/WordPress/gutenberg/pull/32543))
+-   Heading: Show all heading levels in toolbar group. ([32483](https://github.com/WordPress/gutenberg/pull/32483))
+-   Post Terms: Add a CSS class to identify the taxonomy. ([31832](https://github.com/WordPress/gutenberg/pull/31832))
+-   Legacy Widget: Move block to `@wordpress/widgets`. ([32501](https://github.com/WordPress/gutenberg/pull/32501))
+-   Block Editor:
+-   Enhance link control UI with rich URL previews. ([31464](https://github.com/WordPress/gutenberg/pull/31464))
+-   List View: Allow expanding and collapsing of nested blocks. ([32117](https://github.com/WordPress/gutenberg/pull/32117))
+-   Editor Breadcrumb: Add a `rootLabelText` prop. ([32528](https://github.com/WordPress/gutenberg/pull/32528))
+-   Don't hardcode CSS units. ([32482](https://github.com/WordPress/gutenberg/pull/32482))
+-   Refactor LinkControl component to support React 17. ([32552](https://github.com/WordPress/gutenberg/pull/32552))
+-   Remove snapshots from tests for LinkControl. ([32592](https://github.com/WordPress/gutenberg/pull/32592))
+-   Block Support:
+-   Update border support to allow non-pixel units. ([31483](https://github.com/WordPress/gutenberg/pull/31483))
+-   Icons:
+-   Add new icons. ([32371](https://github.com/WordPress/gutenberg/pull/32371))
+-   Tweak people icon. ([32354](https://github.com/WordPress/gutenberg/pull/32354))
+-   Expose `trendingDown` and `trendindUp` icons. ([32124](https://github.com/WordPress/gutenberg/pull/32124))
+-   Template Editing Mode:
+-   Update welcome guide language for the template editor. ([32639](https://github.com/WordPress/gutenberg/pull/32639))
+-   Translate delete template confirmation message. ([32647](https://github.com/WordPress/gutenberg/pull/32647))
+-   Disable renaming templates named by core; Display descriptions. ([32636](https://github.com/WordPress/gutenberg/pull/32636))
+-   Update the template creation modal. ([32427](https://github.com/WordPress/gutenberg/pull/32427))
+-   Post Editor:
+-   Use the post type singular_name as the root Block Breadcrumb label. ([32609](https://github.com/WordPress/gutenberg/pull/32609))
+-   Absorb block manager within blocks preferences. ([32166](https://github.com/WordPress/gutenberg/pull/32166))
+-   Widget Editor:
+-   Hide some settings from the "Options" menu on small screens. ([32690](https://github.com/WordPress/gutenberg/pull/32690))
+-   Add Breadcrumbs Block. ([32498](https://github.com/WordPress/gutenberg/pull/32498))
+-   Use button block appender in widget areas. ([32580](https://github.com/WordPress/gutenberg/pull/32580))
+-   Add show block bread crumbs feature toggle to more menu. ([32569](https://github.com/WordPress/gutenberg/pull/32569))
+-   Unhide the classic menu widget. ([32431](https://github.com/WordPress/gutenberg/pull/32431))
 
-### Enhancements
+### Bug Fixes
 
-- Components:
-- UnitControl: Reduce code duplication for defined units. ([32731](https://github.com/WordPress/gutenberg/pull/32731))
-- BoxControl: Add support for grouped directions (vertical and horizontal controls). ([32610](https://github.com/WordPress/gutenberg/pull/32610))
-- Notice: Added onDismiss option in createInfoNotice. ([32338](https://github.com/WordPress/gutenberg/pull/32338))
-- Block Library:
-- Latest Posts: Limit latest-post authors dropdown to users with published posts. ([32662](https://github.com/WordPress/gutenberg/pull/32662))
-- Calendar: Add loading and empty state. ([31504](https://github.com/WordPress/gutenberg/pull/31504))
-- Query Loop: Add helpful text to the block. ([32694](https://github.com/WordPress/gutenberg/pull/32694))
-- Query Loop: Rename QueryLoop to PostTemplate and change Query label. ([32514](https://github.com/WordPress/gutenberg/pull/32514))
-- Spacer: Try an alternate min-height fix. ([32543](https://github.com/WordPress/gutenberg/pull/32543))
-- Heading: Show all heading levels in toolbar group. ([32483](https://github.com/WordPress/gutenberg/pull/32483))
-- Post Terms: Add a CSS class to identify the taxonomy. ([31832](https://github.com/WordPress/gutenberg/pull/31832))
-- Legacy Widget: Move block to `@wordpress/widgets`. ([32501](https://github.com/WordPress/gutenberg/pull/32501))
-- Block Editor:
-- Enhance link control UI with rich URL previews. ([31464](https://github.com/WordPress/gutenberg/pull/31464))
-- List View: Allow expanding and collapsing of nested blocks. ([32117](https://github.com/WordPress/gutenberg/pull/32117))
-- Editor Breadcrumb: Add a `rootLabelText` prop. ([32528](https://github.com/WordPress/gutenberg/pull/32528))
-- Don't hardcode CSS units. ([32482](https://github.com/WordPress/gutenberg/pull/32482))
-- Refactor LinkControl component to support React 17. ([32552](https://github.com/WordPress/gutenberg/pull/32552))
-- Remove snapshots from tests for LinkControl. ([32592](https://github.com/WordPress/gutenberg/pull/32592))
-- Block Support:
-- Update border support to allow non-pixel units. ([31483](https://github.com/WordPress/gutenberg/pull/31483))
-- Icons:
-- Add new icons. ([32371](https://github.com/WordPress/gutenberg/pull/32371))
-- Tweak people icon. ([32354](https://github.com/WordPress/gutenberg/pull/32354))
-- Expose `trendingDown` and `trendindUp` icons. ([32124](https://github.com/WordPress/gutenberg/pull/32124))
-- Template Editing Mode:
-- Update welcome guide language for the template editor. ([32639](https://github.com/WordPress/gutenberg/pull/32639))
-- Translate delete template confirmation message. ([32647](https://github.com/WordPress/gutenberg/pull/32647))
-- Disable renaming templates named by core; Display descriptions. ([32636](https://github.com/WordPress/gutenberg/pull/32636))
-- Update the template creation modal. ([32427](https://github.com/WordPress/gutenberg/pull/32427))
-- Post Editor:
-- Use the post type singular_name as the root Block Breadcrumb label. ([32609](https://github.com/WordPress/gutenberg/pull/32609))
-- Absorb block manager within blocks preferences. ([32166](https://github.com/WordPress/gutenberg/pull/32166))
-- Widget Editor:
-- Hide some settings from the "Options" menu on small screens. ([32690](https://github.com/WordPress/gutenberg/pull/32690))
-- Add Breadcrumbs Block. ([32498](https://github.com/WordPress/gutenberg/pull/32498))
-- Use button block appender in widget areas. ([32580](https://github.com/WordPress/gutenberg/pull/32580))
-- Add show block bread crumbs feature toggle to more menu. ([32569](https://github.com/WordPress/gutenberg/pull/32569))
-- Unhide the classic menu widget. ([32431](https://github.com/WordPress/gutenberg/pull/32431))
-
-
-### Bug Fixes
-
-- Block Library:
-- Image Block: Fix cover block exists check. ([32666](https://github.com/WordPress/gutenberg/pull/32666))
-- Embed: Fix embed to paragraph transform when caption has rich text formats. ([32355](https://github.com/WordPress/gutenberg/pull/32355))
-- Columns: Fix deprecation caused when adding a column. ([32378](https://github.com/WordPress/gutenberg/pull/32378))
-- Site Logo: Fix site-logo not getting removed on `remove_theme_mod`. ([32370](https://github.com/WordPress/gutenberg/pull/32370))
-- Social: Try to fix color inheritance for social links. ([32625](https://github.com/WordPress/gutenberg/pull/32625))
-- Social: Correctly position the link popover when List View is open. ([32525](https://github.com/WordPress/gutenberg/pull/32525))
-- Code: Try an experimentalSelector. ([31742](https://github.com/WordPress/gutenberg/pull/31742))
-- Block Editor:
-- RichText: Fix loss of list content when switching list types. ([32432](https://github.com/WordPress/gutenberg/pull/32432))
-- `useBlockDropZone`: Fix horizontal indicator. ([32589](https://github.com/WordPress/gutenberg/pull/32589))
-- Inserter: Fix insertion point displaying when there are no inserter items. ([32576](https://github.com/WordPress/gutenberg/pull/32576))
-- Drop indicator: Show around dragged block and show above selected block for file drop. ([31896](https://github.com/WordPress/gutenberg/pull/31896))
-- Fix vertical scroll in horizontal toolbar. ([32655](https://github.com/WordPress/gutenberg/pull/32655))
-- Fix block multi selection in nested blocks. ([32536](https://github.com/WordPress/gutenberg/pull/32536))
-- Fix block toolbar overlap with header. ([32424](https://github.com/WordPress/gutenberg/pull/32424))
-- Blocks:
-- Avoid keeping the same client ID when transforming blocks. ([32453](https://github.com/WordPress/gutenberg/pull/32453))
-- Allow themes to add inline styles for all blocks when using lazy styles loading. ([32275](https://github.com/WordPress/gutenberg/pull/32275))
-- Components:
-- RadioControl: Add `hideLabelFromVision` prop. ([32414](https://github.com/WordPress/gutenberg/pull/32414))
-- DatePicker: Fix crash when navigating between months. ([31751](https://github.com/WordPress/gutenberg/pull/31751))
-- Autocomplete: Prevent setting state for unmounted component. ([32654](https://github.com/WordPress/gutenberg/pull/32654))
-- Editor:
-- Make link UI rich previews target agnostic and fix unwanted preview for internal URLs. ([32658](https://github.com/WordPress/gutenberg/pull/32658))
-- Widget Editor:
-- Don't delete a widget if it is moved to a different area. ([32608](https://github.com/WordPress/gutenberg/pull/32608))
-- Fix button spacing in header. ([32585](https://github.com/WordPress/gutenberg/pull/32585))
-- Decode HTML entities for name and description props. ([32503](https://github.com/WordPress/gutenberg/pull/32503))
-- Fix dirty state after adding new block. ([32573](https://github.com/WordPress/gutenberg/pull/32573))
-- Don't add undo levels when editing records on save. ([32572](https://github.com/WordPress/gutenberg/pull/32572))
-- Save deleted and restored widgets. ([32534](https://github.com/WordPress/gutenberg/pull/32534))
-- Don't show widgets in menu without theme support. ([32420](https://github.com/WordPress/gutenberg/pull/32420))
-- Fix inspector opening on click outside widget area. ([32450](https://github.com/WordPress/gutenberg/pull/32450))
-- Legacy Widget: Don't display "No preview" when widget has image tags. ([32605](https://github.com/WordPress/gutenberg/pull/32605))
-- Post Editor:
-- Prevent locking users in saving state when saving meta boxes fails. ([32485](https://github.com/WordPress/gutenberg/pull/32485))
-- Edit Post: Add metaBoxUpdatesFailure action. ([32623](https://github.com/WordPress/gutenberg/pull/32623))
-- Full Site Editing
-- Only add skip-link for block themes & templates on the frontend. ([32451](https://github.com/WordPress/gutenberg/pull/32451))
-- Storybook:
-- Fix misc warnings. ([32401](https://github.com/WordPress/gutenberg/pull/32401))
-- Data:
-- useSelect: Silently error (for block zombie children). ([32088](https://github.com/WordPress/gutenberg/pull/32088))
+-   Block Library:
+-   Image Block: Fix cover block exists check. ([32666](https://github.com/WordPress/gutenberg/pull/32666))
+-   Embed: Fix embed to paragraph transform when caption has rich text formats. ([32355](https://github.com/WordPress/gutenberg/pull/32355))
+-   Columns: Fix deprecation caused when adding a column. ([32378](https://github.com/WordPress/gutenberg/pull/32378))
+-   Site Logo: Fix site-logo not getting removed on `remove_theme_mod`. ([32370](https://github.com/WordPress/gutenberg/pull/32370))
+-   Social: Try to fix color inheritance for social links. ([32625](https://github.com/WordPress/gutenberg/pull/32625))
+-   Social: Correctly position the link popover when List View is open. ([32525](https://github.com/WordPress/gutenberg/pull/32525))
+-   Code: Try an experimentalSelector. ([31742](https://github.com/WordPress/gutenberg/pull/31742))
+-   Block Editor:
+-   RichText: Fix loss of list content when switching list types. ([32432](https://github.com/WordPress/gutenberg/pull/32432))
+-   `useBlockDropZone`: Fix horizontal indicator. ([32589](https://github.com/WordPress/gutenberg/pull/32589))
+-   Inserter: Fix insertion point displaying when there are no inserter items. ([32576](https://github.com/WordPress/gutenberg/pull/32576))
+-   Drop indicator: Show around dragged block and show above selected block for file drop. ([31896](https://github.com/WordPress/gutenberg/pull/31896))
+-   Fix vertical scroll in horizontal toolbar. ([32655](https://github.com/WordPress/gutenberg/pull/32655))
+-   Fix block multi selection in nested blocks. ([32536](https://github.com/WordPress/gutenberg/pull/32536))
+-   Fix block toolbar overlap with header. ([32424](https://github.com/WordPress/gutenberg/pull/32424))
+-   Blocks:
+-   Avoid keeping the same client ID when transforming blocks. ([32453](https://github.com/WordPress/gutenberg/pull/32453))
+-   Allow themes to add inline styles for all blocks when using lazy styles loading. ([32275](https://github.com/WordPress/gutenberg/pull/32275))
+-   Components:
+-   RadioControl: Add `hideLabelFromVision` prop. ([32414](https://github.com/WordPress/gutenberg/pull/32414))
+-   DatePicker: Fix crash when navigating between months. ([31751](https://github.com/WordPress/gutenberg/pull/31751))
+-   Autocomplete: Prevent setting state for unmounted component. ([32654](https://github.com/WordPress/gutenberg/pull/32654))
+-   Editor:
+-   Make link UI rich previews target agnostic and fix unwanted preview for internal URLs. ([32658](https://github.com/WordPress/gutenberg/pull/32658))
+-   Widget Editor:
+-   Don't delete a widget if it is moved to a different area. ([32608](https://github.com/WordPress/gutenberg/pull/32608))
+-   Fix button spacing in header. ([32585](https://github.com/WordPress/gutenberg/pull/32585))
+-   Decode HTML entities for name and description props. ([32503](https://github.com/WordPress/gutenberg/pull/32503))
+-   Fix dirty state after adding new block. ([32573](https://github.com/WordPress/gutenberg/pull/32573))
+-   Don't add undo levels when editing records on save. ([32572](https://github.com/WordPress/gutenberg/pull/32572))
+-   Save deleted and restored widgets. ([32534](https://github.com/WordPress/gutenberg/pull/32534))
+-   Don't show widgets in menu without theme support. ([32420](https://github.com/WordPress/gutenberg/pull/32420))
+-   Fix inspector opening on click outside widget area. ([32450](https://github.com/WordPress/gutenberg/pull/32450))
+-   Legacy Widget: Don't display "No preview" when widget has image tags. ([32605](https://github.com/WordPress/gutenberg/pull/32605))
+-   Post Editor:
+-   Prevent locking users in saving state when saving meta boxes fails. ([32485](https://github.com/WordPress/gutenberg/pull/32485))
+-   Edit Post: Add metaBoxUpdatesFailure action. ([32623](https://github.com/WordPress/gutenberg/pull/32623))
+-   Full Site Editing
+-   Only add skip-link for block themes & templates on the frontend. ([32451](https://github.com/WordPress/gutenberg/pull/32451))
+-   Storybook:
+-   Fix misc warnings. ([32401](https://github.com/WordPress/gutenberg/pull/32401))
+-   Data:
+-   useSelect: Silently error (for block zombie children). ([32088](https://github.com/WordPress/gutenberg/pull/32088))
 
 ### Performance
 
-- Block Editor: Remove `is-typing` root class. ([32567](https://github.com/WordPress/gutenberg/pull/32567))
-- Header Toolbar: UseCallback to avoid unnecessary rerenders. ([32406](https://github.com/WordPress/gutenberg/pull/32406))
+-   Block Editor: Remove `is-typing` root class. ([32567](https://github.com/WordPress/gutenberg/pull/32567))
+-   Header Toolbar: UseCallback to avoid unnecessary rerenders. ([32406](https://github.com/WordPress/gutenberg/pull/32406))
 
 ### Experiments
-- Component System:
-- Promote `Scrollable` component to a full export. ([32446](https://github.com/WordPress/gutenberg/pull/32446))
-- Promote `Surface` component to a full export. ([32439](https://github.com/WordPress/gutenberg/pull/32439))
-- Global Styles:
-- Allow presets to provide an empty set of values. ([32679](https://github.com/WordPress/gutenberg/pull/32679))
-- Allow theme authors hook into the preset classes generated by global styles. ([32627](https://github.com/WordPress/gutenberg/pull/32627))
-- Update `WP_Theme_JSON` API so presets are always keyed by origin. ([32622](https://github.com/WordPress/gutenberg/pull/32622))
-- Make syntax errors in `theme.json` visible to users. ([32404](https://github.com/WordPress/gutenberg/pull/32404))
-- Enqueue global styles in editor only once. ([32377](https://github.com/WordPress/gutenberg/pull/32377))
-- Enqueue core and theme colors by using separate structures per origin. ([32358](https://github.com/WordPress/gutenberg/pull/32358))
-- Do not migrate the old typography support if core already did it. ([32487](https://github.com/WordPress/gutenberg/pull/32487))
-- Generate classes and custom properties for global styles in the same way the post editor does. ([32766](https://github.com/WordPress/gutenberg/pull/32766))
-- Full Site Editing:
-- Template resolution for new posts and pages. ([32442](https://github.com/WordPress/gutenberg/pull/32442))
-- Monopolize navigation in Site Editor. ([31810](https://github.com/WordPress/gutenberg/pull/31810))
-- Prevent duplicate queries. ([32700](https://github.com/WordPress/gutenberg/pull/32700))
-- Split `theme.css` styles loading. ([31239](https://github.com/WordPress/gutenberg/pull/31239))
-- Navigation Editor:
-- Alternative fix: Set persisted menu id when no menus or missing menu. ([32313](https://github.com/WordPress/gutenberg/pull/32313))
+
+-   Component System:
+-   Promote `Scrollable` component to a full export. ([32446](https://github.com/WordPress/gutenberg/pull/32446))
+-   Promote `Surface` component to a full export. ([32439](https://github.com/WordPress/gutenberg/pull/32439))
+-   Global Styles:
+-   Allow presets to provide an empty set of values. ([32679](https://github.com/WordPress/gutenberg/pull/32679))
+-   Allow theme authors hook into the preset classes generated by global styles. ([32627](https://github.com/WordPress/gutenberg/pull/32627))
+-   Update `WP_Theme_JSON` API so presets are always keyed by origin. ([32622](https://github.com/WordPress/gutenberg/pull/32622))
+-   Make syntax errors in `theme.json` visible to users. ([32404](https://github.com/WordPress/gutenberg/pull/32404))
+-   Enqueue global styles in editor only once. ([32377](https://github.com/WordPress/gutenberg/pull/32377))
+-   Enqueue core and theme colors by using separate structures per origin. ([32358](https://github.com/WordPress/gutenberg/pull/32358))
+-   Do not migrate the old typography support if core already did it. ([32487](https://github.com/WordPress/gutenberg/pull/32487))
+-   Generate classes and custom properties for global styles in the same way the post editor does. ([32766](https://github.com/WordPress/gutenberg/pull/32766))
+-   Full Site Editing:
+-   Template resolution for new posts and pages. ([32442](https://github.com/WordPress/gutenberg/pull/32442))
+-   Monopolize navigation in Site Editor. ([31810](https://github.com/WordPress/gutenberg/pull/31810))
+-   Prevent duplicate queries. ([32700](https://github.com/WordPress/gutenberg/pull/32700))
+-   Split `theme.css` styles loading. ([31239](https://github.com/WordPress/gutenberg/pull/31239))
+-   Navigation Editor:
+-   Alternative fix: Set persisted menu id when no menus or missing menu. ([32313](https://github.com/WordPress/gutenberg/pull/32313))
 
 ### Documentation
 
-- Handbook:
-- Update references to `register_block_type_from_metadata`. ([32582](https://github.com/WordPress/gutenberg/pull/32582))
-- Fix duotone support documentation. ([32440](https://github.com/WordPress/gutenberg/pull/32440))
-- Detail the Gutenberg release post process. ([32429](https://github.com/WordPress/gutenberg/pull/32429))
-- Update Legacy Widget documentation with new info on `show_instance_in_rest` feature. ([32726](https://github.com/WordPress/gutenberg/pull/32726))
+-   Handbook:
+-   Update references to `register_block_type_from_metadata`. ([32582](https://github.com/WordPress/gutenberg/pull/32582))
+-   Fix duotone support documentation. ([32440](https://github.com/WordPress/gutenberg/pull/32440))
+-   Detail the Gutenberg release post process. ([32429](https://github.com/WordPress/gutenberg/pull/32429))
+-   Update Legacy Widget documentation with new info on `show_instance_in_rest` feature. ([32726](https://github.com/WordPress/gutenberg/pull/32726))
 
 ### Code Quality
 
-- Components:
-- Remove duplicated compose dependencies. ([32709](https://github.com/WordPress/gutenberg/pull/32709))
-- Sort entries in `packages/components/tsconfig.json`. ([32675](https://github.com/WordPress/gutenberg/pull/32675))
-- Update the popover component to rely on `useDialog`. ([27675](https://github.com/WordPress/gutenberg/pull/27675))
-- Card: Add types. ([32561](https://github.com/WordPress/gutenberg/pull/32561))
-- Card: Refactor subcomponents folder structure. ([32557](https://github.com/WordPress/gutenberg/pull/32557))
-- Compose:
-- Add types to `useDialog` and `useFocusOnMount`. ([32676](https://github.com/WordPress/gutenberg/pull/32676))
-- Add types to `withSafeTimeout`. ([32674](https://github.com/WordPress/gutenberg/pull/32674))
-- Type `withState` as any. ([32326](https://github.com/WordPress/gutenberg/pull/32326))
-- Block Library:
-- Page List: Avoid generic function names for page list block internal functions. ([32736](https://github.com/WordPress/gutenberg/pull/32736))
-- Latest Comments: Correct the format used for duplicate hook documentation. ([32563](https://github.com/WordPress/gutenberg/pull/32563))
-- Login/out: Update documentation for render_block_core_loginout function. ([32158](https://github.com/WordPress/gutenberg/pull/32158))
-- Block Editor: Remove unused select block function. ([32532](https://github.com/WordPress/gutenberg/pull/32532))
-- Core Data: Fix typos. ([32480](https://github.com/WordPress/gutenberg/pull/32480))
-- Editor: Fix different typos in inline comments, deprecation warnings and variable names. ([32474](https://github.com/WordPress/gutenberg/pull/32474))
-- Linting:
-- Edit Post: Fix no-string-literals warning. ([32518](https://github.com/WordPress/gutenberg/pull/32518))
-- Add ESLint import resolver. ([31792](https://github.com/WordPress/gutenberg/pull/31792))
-- Plugin:
-- Copy `wp_should_load_separate_core_block_assets` function from core. ([32611](https://github.com/WordPress/gutenberg/pull/32611))
-- Fix PHPCS Warnings. ([32513](https://github.com/WordPress/gutenberg/pull/32513))
+-   Components:
+-   Remove duplicated compose dependencies. ([32709](https://github.com/WordPress/gutenberg/pull/32709))
+-   Sort entries in `packages/components/tsconfig.json`. ([32675](https://github.com/WordPress/gutenberg/pull/32675))
+-   Update the popover component to rely on `useDialog`. ([27675](https://github.com/WordPress/gutenberg/pull/27675))
+-   Card: Add types. ([32561](https://github.com/WordPress/gutenberg/pull/32561))
+-   Card: Refactor subcomponents folder structure. ([32557](https://github.com/WordPress/gutenberg/pull/32557))
+-   Compose:
+-   Add types to `useDialog` and `useFocusOnMount`. ([32676](https://github.com/WordPress/gutenberg/pull/32676))
+-   Add types to `withSafeTimeout`. ([32674](https://github.com/WordPress/gutenberg/pull/32674))
+-   Type `withState` as any. ([32326](https://github.com/WordPress/gutenberg/pull/32326))
+-   Block Library:
+-   Page List: Avoid generic function names for page list block internal functions. ([32736](https://github.com/WordPress/gutenberg/pull/32736))
+-   Latest Comments: Correct the format used for duplicate hook documentation. ([32563](https://github.com/WordPress/gutenberg/pull/32563))
+-   Login/out: Update documentation for render_block_core_loginout function. ([32158](https://github.com/WordPress/gutenberg/pull/32158))
+-   Block Editor: Remove unused select block function. ([32532](https://github.com/WordPress/gutenberg/pull/32532))
+-   Core Data: Fix typos. ([32480](https://github.com/WordPress/gutenberg/pull/32480))
+-   Editor: Fix different typos in inline comments, deprecation warnings and variable names. ([32474](https://github.com/WordPress/gutenberg/pull/32474))
+-   Linting:
+-   Edit Post: Fix no-string-literals warning. ([32518](https://github.com/WordPress/gutenberg/pull/32518))
+-   Add ESLint import resolver. ([31792](https://github.com/WordPress/gutenberg/pull/31792))
+-   Plugin:
+-   Copy `wp_should_load_separate_core_block_assets` function from core. ([32611](https://github.com/WordPress/gutenberg/pull/32611))
+-   Fix PHPCS Warnings. ([32513](https://github.com/WordPress/gutenberg/pull/32513))
 
 ### Tools
 
-- Workflow:
-- Fix the add milestone github action. ([32691](https://github.com/WordPress/gutenberg/pull/32691))
-- Use a different cache key for the PR automation workflow. ([32588](https://github.com/WordPress/gutenberg/pull/32588))
-- Improvements to NPM package caching across workflows. ([32458](https://github.com/WordPress/gutenberg/pull/32458))
-- Limit when release artifacts are built on forks: Pt. 2. ([32494](https://github.com/WordPress/gutenberg/pull/32494))
-- Build:
-- Load .min.js files even in dev mode, output unminified assets only in prod. ([32621](https://github.com/WordPress/gutenberg/pull/32621))
-- Upgrade husky package to the latest version. ([32077](https://github.com/WordPress/gutenberg/pull/32077))
-- Generate minified .min.js and unminified .js files for GB js entry points when building. ([31732](https://github.com/WordPress/gutenberg/pull/31732))
-- Include Legacy Widget block files in the plugin build. ([32803](https://github.com/WordPress/gutenberg/pull/32803))
-- End to End Tests:
-- Update mentions tests to use `toMatchInlineSnapshot`. ([32727](https://github.com/WordPress/gutenberg/pull/32727))
-- Add more user auto-completer (mentions) coverage. ([32697](https://github.com/WordPress/gutenberg/pull/32697))
-- Ignore JQMIGRATE (jQuery migrate) deprecation warnings. ([32656](https://github.com/WordPress/gutenberg/pull/32656))
-- Linting:
-- Update linting and formatting for test plugin files. ([28033](https://github.com/WordPress/gutenberg/pull/28033))
-- Update Eslint JSDoc package, introducing JSDoc line alignment check. ([25300](https://github.com/WordPress/gutenberg/pull/25300))
-- wp-env: Bump TT1 Blocks to v0.4.7. ([32661](https://github.com/WordPress/gutenberg/pull/32661))
-
-
-
-
+-   Workflow:
+-   Fix the add milestone github action. ([32691](https://github.com/WordPress/gutenberg/pull/32691))
+-   Use a different cache key for the PR automation workflow. ([32588](https://github.com/WordPress/gutenberg/pull/32588))
+-   Improvements to NPM package caching across workflows. ([32458](https://github.com/WordPress/gutenberg/pull/32458))
+-   Limit when release artifacts are built on forks: Pt. 2. ([32494](https://github.com/WordPress/gutenberg/pull/32494))
+-   Build:
+-   Load .min.js files even in dev mode, output unminified assets only in prod. ([32621](https://github.com/WordPress/gutenberg/pull/32621))
+-   Upgrade husky package to the latest version. ([32077](https://github.com/WordPress/gutenberg/pull/32077))
+-   Generate minified .min.js and unminified .js files for GB js entry points when building. ([31732](https://github.com/WordPress/gutenberg/pull/31732))
+-   Include Legacy Widget block files in the plugin build. ([32803](https://github.com/WordPress/gutenberg/pull/32803))
+-   End to End Tests:
+-   Update mentions tests to use `toMatchInlineSnapshot`. ([32727](https://github.com/WordPress/gutenberg/pull/32727))
+-   Add more user auto-completer (mentions) coverage. ([32697](https://github.com/WordPress/gutenberg/pull/32697))
+-   Ignore JQMIGRATE (jQuery migrate) deprecation warnings. ([32656](https://github.com/WordPress/gutenberg/pull/32656))
+-   Linting:
+-   Update linting and formatting for test plugin files. ([28033](https://github.com/WordPress/gutenberg/pull/28033))
+-   Update Eslint JSDoc package, introducing JSDoc line alignment check. ([25300](https://github.com/WordPress/gutenberg/pull/25300))
+-   wp-env: Bump TT1 Blocks to v0.4.7. ([32661](https://github.com/WordPress/gutenberg/pull/32661))
 
 = 10.8.2 =
 
-### Bug fixes
+## Changelog
 
-- Revert removal of lodash's kebabCase function https://github.com/WordPress/gutenberg/pull/32742
+### Bug fixes
 
+-   Revert removal of lodash's kebabCase function https://github.com/WordPress/gutenberg/pull/32742
 
 = 10.8.1 =
 
-
+## Changelog
 
 ### Bug Fixes
 
-- Fix Post Content block regression. ([32693](https://github.com/WordPress/gutenberg/pull/32693))
-- Fix Safari 13 issue. ([32581](https://github.com/WordPress/gutenberg/pull/32581))
+-   Fix Post Content block regression. ([32693](https://github.com/WordPress/gutenberg/pull/32693))
+-   Fix Safari 13 issue. ([32581](https://github.com/WordPress/gutenberg/pull/32581))
 
 ### Performance
 
-- Site editor: Add typing performance test. ([32553](https://github.com/WordPress/gutenberg/pull/32553))
+-   Site editor: Add typing performance test. ([32553](https://github.com/WordPress/gutenberg/pull/32553))
 
 ### Tools
 
-- Fix Post Title end-to-end test. ([32686](https://github.com/WordPress/gutenberg/pull/32686))
-
-
-
+-   Fix Post Title end-to-end test. ([32686](https://github.com/WordPress/gutenberg/pull/32686))
 
 = 10.8.0 =
 
+## Changelog
 
 ### Enhancements
 
-- Block Editor:
-  - Update Modal styling. ([31639](https://github.com/WordPress/gutenberg/pull/31639))
-- Block Library:
-  - Archives Block: Show the label for archives block dropdown. ([30527](https://github.com/WordPress/gutenberg/pull/30527))
-  - Audio Block: Add an example preview. ([32333](https://github.com/WordPress/gutenberg/pull/32333))
-  - File Block: Add an example preview. ([32350](https://github.com/WordPress/gutenberg/pull/32350))
-  - Heading Block: Add support for font-weight. ([27639](https://github.com/WordPress/gutenberg/pull/27639))
-  - List Block: Add font family to the list block. ([27510](https://github.com/WordPress/gutenberg/pull/27510))
-  - Page list block: Add active page classes. ([32134](https://github.com/WordPress/gutenberg/pull/32134))
-  - Site Logo: Use option instead of theme-mod. ([32229](https://github.com/WordPress/gutenberg/pull/32229))
-- Components:
-  - BoxControl: Add allowReset option. ([32345](https://github.com/WordPress/gutenberg/pull/32345))
-General Interface:
-  - Remove opacity animation on canvas. ([32266](https://github.com/WordPress/gutenberg/pull/32266))
-- Design tools:
-  - Add Letter-spacing and enable this for site title and site tagline. ([31118](https://github.com/WordPress/gutenberg/pull/31118))
-  - Block Supports: Allow skipping spacing support serialization. ([31973](https://github.com/WordPress/gutenberg/pull/31973))
-- Reusable Block:
-  - Add Convert to Regular Blocks button to ellipsis Dropdown. ([32310](https://github.com/WordPress/gutenberg/pull/32310))
-- REST API:
-  - Improve parsing and retrieve additional data in REST url-details endpoint. ([31763](https://github.com/WordPress/gutenberg/pull/31763))
-- Template Editing Mode:
-  - Don't display snackbar with the Welcome Guide. ([32076](https://github.com/WordPress/gutenberg/pull/32076))
-  - Update the appearance of the template details popover. ([32042](https://github.com/WordPress/gutenberg/pull/32042))
-  - Update the title area in the template editor. ([32037](https://github.com/WordPress/gutenberg/pull/32037))
-- Block-based Widgets:
-  - Customizer:
-    - Add preferences menu group label to widgets and customize widget editor. ([32259](https://github.com/WordPress/gutenberg/pull/32259))
-    - Display wide widgets as popovers in Customizer. ([31736](https://github.com/WordPress/gutenberg/pull/31736))
-  - Editor:
-    - Link to widgets.php instead of themes.php?page=gutenberg-widgets. ([32299](https://github.com/WordPress/gutenberg/pull/32299))
-
-### Bug Fixes
-
-- Block Library:
-  - Image Block: Fix image border radius. ([32393](https://github.com/WordPress/gutenberg/pull/32393))
-  - List Block: Fix `theme.json` styles for the `core/list` block. ([32343](https://github.com/WordPress/gutenberg/pull/32343))
-  - Latest Posts: Limit latest posts featured image width to 100%. ([32245](https://github.com/WordPress/gutenberg/pull/32245))
-  - Legacy Widget Block:
-    - Fix legacy widget block preview iframe. ([32300](https://github.com/WordPress/gutenberg/pull/32300))
-    - Fix legacy widget previews. ([32260](https://github.com/WordPress/gutenberg/pull/32260))
-  - Search block: Fix vertical alignment of the search button text. ([32340](https://github.com/WordPress/gutenberg/pull/32340))
-- Block Editor:
-  - Block Variation Transforms: Make focus style valid CSS. ([32305](https://github.com/WordPress/gutenberg/pull/32305))
-  - Fixed Random Collapse of Colors Setting Section. ([32388](https://github.com/WordPress/gutenberg/pull/32388))
-  - Block Toolbar:
-    - Always close the options menu after toggling the sidebar. ([31921](https://github.com/WordPress/gutenberg/pull/31921))
-    - Fix toolbar alignment in widget block editor. ([31991](https://github.com/WordPress/gutenberg/pull/31991))
-  - Iframe: Fix embed dimensions with missing wp-embed-responsive class. ([32057](https://github.com/WordPress/gutenberg/pull/32057))
-  - Patterns: Fix allowed patterns check. ([32376](https://github.com/WordPress/gutenberg/pull/32376))
-- Block-Based Widgets:
-  - Editor:
-    - Fix error when saving empty Legacy Widget block. ([32359](https://github.com/WordPress/gutenberg/pull/32359))
-    - Assume light theme when editor canvas background color isn't set. ([32477](https://github.com/WordPress/gutenberg/pull/32477))
-  - Customizer:
-    - Center the welcome image in the narrow viewport of widgets customizer. ([32264](https://github.com/WordPress/gutenberg/pull/32264))
-    - Fix aspect ratio of welcome image. ([32302](https://github.com/WordPress/gutenberg/pull/32302))
-    - Fix deselecting block when inspector is opened. ([32361](https://github.com/WordPress/gutenberg/pull/32361))
-    - Fix escape key events in customizer closing the editor. ([32175](https://github.com/WordPress/gutenberg/pull/32175))
-    - Fix some smaller styling issues and bugs in Widgets Customizer. ([32072](https://github.com/WordPress/gutenberg/pull/32072))
-    - Fix creating and replacing legacy widgets in customizer. ([32005](https://github.com/WordPress/gutenberg/pull/32005))
-- Components:
-  - SuggestionsList: Try to use a unique "key". ([32344](https://github.com/WordPress/gutenberg/pull/32344))
-  - Update Dropdown’s close-on-blur logic to work inside dialogs. ([32133](https://github.com/WordPress/gutenberg/pull/32133))
-- Editor:
-  - Allow non-latin characters in slugs. ([32232](https://github.com/WordPress/gutenberg/pull/32232))
-  - Post Preview Button: Prevent saving the post before previewing in locked/read-only mode. ([32341](https://github.com/WordPress/gutenberg/pull/32341))
-- General Interface: Fix overlap of Notices and block toolbar. ([32238](https://github.com/WordPress/gutenberg/pull/32238))
-- Template Editing Mode: Remove metaboxes from template mode. ([32315](https://github.com/WordPress/gutenberg/pull/32315))
-- Fix the layout definition in the template mode. ([32425](https://github.com/WordPress/gutenberg/pull/32425))
+-   Block Editor:
+    -   Update Modal styling. ([31639](https://github.com/WordPress/gutenberg/pull/31639))
+-   Block Library:
+    -   Archives Block: Show the label for archives block dropdown. ([30527](https://github.com/WordPress/gutenberg/pull/30527))
+    -   Audio Block: Add an example preview. ([32333](https://github.com/WordPress/gutenberg/pull/32333))
+    -   File Block: Add an example preview. ([32350](https://github.com/WordPress/gutenberg/pull/32350))
+    -   Heading Block: Add support for font-weight. ([27639](https://github.com/WordPress/gutenberg/pull/27639))
+    -   List Block: Add font family to the list block. ([27510](https://github.com/WordPress/gutenberg/pull/27510))
+    -   Page list block: Add active page classes. ([32134](https://github.com/WordPress/gutenberg/pull/32134))
+    -   Site Logo: Use option instead of theme-mod. ([32229](https://github.com/WordPress/gutenberg/pull/32229))
+-   Components:
+    -   BoxControl: Add allowReset option. ([32345](https://github.com/WordPress/gutenberg/pull/32345))
+        General Interface:
+    -   Remove opacity animation on canvas. ([32266](https://github.com/WordPress/gutenberg/pull/32266))
+-   Design tools:
+    -   Add Letter-spacing and enable this for site title and site tagline. ([31118](https://github.com/WordPress/gutenberg/pull/31118))
+    -   Block Supports: Allow skipping spacing support serialization. ([31973](https://github.com/WordPress/gutenberg/pull/31973))
+-   Reusable Block:
+    -   Add Convert to Regular Blocks button to ellipsis Dropdown. ([32310](https://github.com/WordPress/gutenberg/pull/32310))
+-   REST API:
+    -   Improve parsing and retrieve additional data in REST url-details endpoint. ([31763](https://github.com/WordPress/gutenberg/pull/31763))
+-   Template Editing Mode:
+    -   Don't display snackbar with the Welcome Guide. ([32076](https://github.com/WordPress/gutenberg/pull/32076))
+    -   Update the appearance of the template details popover. ([32042](https://github.com/WordPress/gutenberg/pull/32042))
+    -   Update the title area in the template editor. ([32037](https://github.com/WordPress/gutenberg/pull/32037))
+-   Block-based Widgets:
+    -   Customizer:
+        -   Add preferences menu group label to widgets and customize widget editor. ([32259](https://github.com/WordPress/gutenberg/pull/32259))
+        -   Display wide widgets as popovers in Customizer. ([31736](https://github.com/WordPress/gutenberg/pull/31736))
+    -   Editor:
+        -   Link to widgets.php instead of themes.php?page=gutenberg-widgets. ([32299](https://github.com/WordPress/gutenberg/pull/32299))
+
+### Bug Fixes
+
+-   Block Library:
+    -   Image Block: Fix image border radius. ([32393](https://github.com/WordPress/gutenberg/pull/32393))
+    -   List Block: Fix `theme.json` styles for the `core/list` block. ([32343](https://github.com/WordPress/gutenberg/pull/32343))
+    -   Latest Posts: Limit latest posts featured image width to 100%. ([32245](https://github.com/WordPress/gutenberg/pull/32245))
+    -   Legacy Widget Block:
+        -   Fix legacy widget block preview iframe. ([32300](https://github.com/WordPress/gutenberg/pull/32300))
+        -   Fix legacy widget previews. ([32260](https://github.com/WordPress/gutenberg/pull/32260))
+    -   Search block: Fix vertical alignment of the search button text. ([32340](https://github.com/WordPress/gutenberg/pull/32340))
+-   Block Editor:
+    -   Block Variation Transforms: Make focus style valid CSS. ([32305](https://github.com/WordPress/gutenberg/pull/32305))
+    -   Fixed Random Collapse of Colors Setting Section. ([32388](https://github.com/WordPress/gutenberg/pull/32388))
+    -   Block Toolbar:
+        -   Always close the options menu after toggling the sidebar. ([31921](https://github.com/WordPress/gutenberg/pull/31921))
+        -   Fix toolbar alignment in widget block editor. ([31991](https://github.com/WordPress/gutenberg/pull/31991))
+    -   Iframe: Fix embed dimensions with missing wp-embed-responsive class. ([32057](https://github.com/WordPress/gutenberg/pull/32057))
+    -   Patterns: Fix allowed patterns check. ([32376](https://github.com/WordPress/gutenberg/pull/32376))
+-   Block-Based Widgets:
+    -   Editor:
+        -   Fix error when saving empty Legacy Widget block. ([32359](https://github.com/WordPress/gutenberg/pull/32359))
+        -   Assume light theme when editor canvas background color isn't set. ([32477](https://github.com/WordPress/gutenberg/pull/32477))
+    -   Customizer:
+        -   Center the welcome image in the narrow viewport of widgets customizer. ([32264](https://github.com/WordPress/gutenberg/pull/32264))
+        -   Fix aspect ratio of welcome image. ([32302](https://github.com/WordPress/gutenberg/pull/32302))
+        -   Fix deselecting block when inspector is opened. ([32361](https://github.com/WordPress/gutenberg/pull/32361))
+        -   Fix escape key events in customizer closing the editor. ([32175](https://github.com/WordPress/gutenberg/pull/32175))
+        -   Fix some smaller styling issues and bugs in Widgets Customizer. ([32072](https://github.com/WordPress/gutenberg/pull/32072))
+        -   Fix creating and replacing legacy widgets in customizer. ([32005](https://github.com/WordPress/gutenberg/pull/32005))
+-   Components:
+    -   SuggestionsList: Try to use a unique "key". ([32344](https://github.com/WordPress/gutenberg/pull/32344))
+    -   Update Dropdown’s close-on-blur logic to work inside dialogs. ([32133](https://github.com/WordPress/gutenberg/pull/32133))
+-   Editor:
+    -   Allow non-latin characters in slugs. ([32232](https://github.com/WordPress/gutenberg/pull/32232))
+    -   Post Preview Button: Prevent saving the post before previewing in locked/read-only mode. ([32341](https://github.com/WordPress/gutenberg/pull/32341))
+-   General Interface: Fix overlap of Notices and block toolbar. ([32238](https://github.com/WordPress/gutenberg/pull/32238))
+-   Template Editing Mode: Remove metaboxes from template mode. ([32315](https://github.com/WordPress/gutenberg/pull/32315))
+-   Fix the layout definition in the template mode. ([32425](https://github.com/WordPress/gutenberg/pull/32425))
 
 ### Performance
 
-- Buttons: Move options to constants to avoid unneeded renders. ([32356](https://github.com/WordPress/gutenberg/pull/32356))
-- Experimental Layout: Pass the same object when no data changes. ([32380](https://github.com/WordPress/gutenberg/pull/32380))
-- Navigation: Avoid rerendering when the placeholder does not change. ([32357](https://github.com/WordPress/gutenberg/pull/32357))
-- Update Welcome Guides to use external image URLs. ([32026](https://github.com/WordPress/gutenberg/pull/32026))
+-   Buttons: Move options to constants to avoid unneeded renders. ([32356](https://github.com/WordPress/gutenberg/pull/32356))
+-   Experimental Layout: Pass the same object when no data changes. ([32380](https://github.com/WordPress/gutenberg/pull/32380))
+-   Navigation: Avoid rerendering when the placeholder does not change. ([32357](https://github.com/WordPress/gutenberg/pull/32357))
+-   Update Welcome Guides to use external image URLs. ([32026](https://github.com/WordPress/gutenberg/pull/32026))
 
 ### Experiments
 
-- Block Editor:
-  - Block Navigation: Try using CSS for indentation with known max indent instead of spacer divs. ([32063](https://github.com/WordPress/gutenberg/pull/32063))
-- Component System:
-  - Add missing Divider, Heading type reference in tsconfig. ([32104](https://github.com/WordPress/gutenberg/pull/32104))
-  - Adds a new ZStack component. ([31613](https://github.com/WordPress/gutenberg/pull/31613))
-  - Adds new ItemGroup and Item components. ([30097](https://github.com/WordPress/gutenberg/pull/30097))
-  - Add new `BaseField` Component. ([32250](https://github.com/WordPress/gutenberg/pull/32250))
-  - Fix Shortcut polymorphism. ([31555](https://github.com/WordPress/gutenberg/pull/31555))
-  - Promotes the Elevation component to a full export. ([31614](https://github.com/WordPress/gutenberg/pull/31614))
-- Global Styles:
-  - Bugfix: Generate classes from preset slugs in the same way (server & client). ([32352](https://github.com/WordPress/gutenberg/pull/32352))
-  - Fix Logic to enable custom colors, gradients, and font sizes. ([32200](https://github.com/WordPress/gutenberg/pull/32200))
-  - Fix incorrect useCustomUnits import. ([32248](https://github.com/WordPress/gutenberg/pull/32248))
-  - Group typographic block supports under a `typography` key. ([32252](https://github.com/WordPress/gutenberg/pull/32252))
-  - Letter spacing should also respect skip serialization flag. ([32459](https://github.com/WordPress/gutenberg/pull/32459))
-  - Skip typography serialization. ([32444](https://github.com/WordPress/gutenberg/pull/32444))
-- Full Site Editing:
-  - Align block hover and select styles across list view, site editor, select mode. ([31277](https://github.com/WordPress/gutenberg/pull/31277))
-  - Alignment styles: Centre blocks using grid not margins. ([32231](https://github.com/WordPress/gutenberg/pull/32231))
-  - Avoid duplicate skip-links in WP 5.8+. ([32346](https://github.com/WordPress/gutenberg/pull/32346))
-  - Remove now-obsolete get_template_hierarchy(). ([32116](https://github.com/WordPress/gutenberg/pull/32116))
-  - Templates: Remove now-obsolete `gutenberg_get_template_paths()`. ([32066](https://github.com/WordPress/gutenberg/pull/32066))
-- Navigation:
-  - Block:
-    - Fix css bleed from navigation. ([32384](https://github.com/WordPress/gutenberg/pull/32384))
-    - Fix collapsing regression of Navigation Menu. ([32081](https://github.com/WordPress/gutenberg/pull/32081))
-    - Lock the document from scrolling when the modal is open. ([32269](https://github.com/WordPress/gutenberg/pull/32269))
-    - Refactor Navigation block paddings/margins to inherit global styles. ([31878](https://github.com/WordPress/gutenberg/pull/31878))
-  - Editor:
-    - Allow block attributes passed to block renderer by way of wp_nav_menu. ([31911](https://github.com/WordPress/gutenberg/pull/31911))
-    - Hide sidebar when a menu isn't selected. ([32090](https://github.com/WordPress/gutenberg/pull/32090))
-    - Fix the visible widget area toolbar. ([32262](https://github.com/WordPress/gutenberg/pull/32262))
-    - Fix block toolbar position after scroll. ([32212](https://github.com/WordPress/gutenberg/pull/32212))
-    - Move modal state to ManageLocations component. ([32078](https://github.com/WordPress/gutenberg/pull/32078))
-- Site Editor:
-  - Fix broken template part converter modal styles. ([32097](https://github.com/WordPress/gutenberg/pull/32097))
-  - Remove title attribute from NavigationItem inside the site-editor. ([30744](https://github.com/WordPress/gutenberg/pull/30744))
+-   Block Editor:
+    -   Block Navigation: Try using CSS for indentation with known max indent instead of spacer divs. ([32063](https://github.com/WordPress/gutenberg/pull/32063))
+-   Component System:
+    -   Add missing Divider, Heading type reference in tsconfig. ([32104](https://github.com/WordPress/gutenberg/pull/32104))
+    -   Adds a new ZStack component. ([31613](https://github.com/WordPress/gutenberg/pull/31613))
+    -   Adds new ItemGroup and Item components. ([30097](https://github.com/WordPress/gutenberg/pull/30097))
+    -   Add new `BaseField` Component. ([32250](https://github.com/WordPress/gutenberg/pull/32250))
+    -   Fix Shortcut polymorphism. ([31555](https://github.com/WordPress/gutenberg/pull/31555))
+    -   Promotes the Elevation component to a full export. ([31614](https://github.com/WordPress/gutenberg/pull/31614))
+-   Global Styles:
+    -   Bugfix: Generate classes from preset slugs in the same way (server & client). ([32352](https://github.com/WordPress/gutenberg/pull/32352))
+    -   Fix Logic to enable custom colors, gradients, and font sizes. ([32200](https://github.com/WordPress/gutenberg/pull/32200))
+    -   Fix incorrect useCustomUnits import. ([32248](https://github.com/WordPress/gutenberg/pull/32248))
+    -   Group typographic block supports under a `typography` key. ([32252](https://github.com/WordPress/gutenberg/pull/32252))
+    -   Letter spacing should also respect skip serialization flag. ([32459](https://github.com/WordPress/gutenberg/pull/32459))
+    -   Skip typography serialization. ([32444](https://github.com/WordPress/gutenberg/pull/32444))
+-   Full Site Editing:
+    -   Align block hover and select styles across list view, site editor, select mode. ([31277](https://github.com/WordPress/gutenberg/pull/31277))
+    -   Alignment styles: Centre blocks using grid not margins. ([32231](https://github.com/WordPress/gutenberg/pull/32231))
+    -   Avoid duplicate skip-links in WP 5.8+. ([32346](https://github.com/WordPress/gutenberg/pull/32346))
+    -   Remove now-obsolete get_template_hierarchy(). ([32116](https://github.com/WordPress/gutenberg/pull/32116))
+    -   Templates: Remove now-obsolete `gutenberg_get_template_paths()`. ([32066](https://github.com/WordPress/gutenberg/pull/32066))
+-   Navigation:
+    -   Block:
+        -   Fix css bleed from navigation. ([32384](https://github.com/WordPress/gutenberg/pull/32384))
+        -   Fix collapsing regression of Navigation Menu. ([32081](https://github.com/WordPress/gutenberg/pull/32081))
+        -   Lock the document from scrolling when the modal is open. ([32269](https://github.com/WordPress/gutenberg/pull/32269))
+        -   Refactor Navigation block paddings/margins to inherit global styles. ([31878](https://github.com/WordPress/gutenberg/pull/31878))
+    -   Editor:
+        -   Allow block attributes passed to block renderer by way of wp_nav_menu. ([31911](https://github.com/WordPress/gutenberg/pull/31911))
+        -   Hide sidebar when a menu isn't selected. ([32090](https://github.com/WordPress/gutenberg/pull/32090))
+        -   Fix the visible widget area toolbar. ([32262](https://github.com/WordPress/gutenberg/pull/32262))
+        -   Fix block toolbar position after scroll. ([32212](https://github.com/WordPress/gutenberg/pull/32212))
+        -   Move modal state to ManageLocations component. ([32078](https://github.com/WordPress/gutenberg/pull/32078))
+-   Site Editor:
+    -   Fix broken template part converter modal styles. ([32097](https://github.com/WordPress/gutenberg/pull/32097))
+    -   Remove title attribute from NavigationItem inside the site-editor. ([30744](https://github.com/WordPress/gutenberg/pull/30744))
 
 ### Documentation
 
-- Handbook:
-  - Fix broken contributors readme files. ([32272](https://github.com/WordPress/gutenberg/pull/32272))
-  - Fix misspelling in the Widgets Block Editor section. ([32242](https://github.com/WordPress/gutenberg/pull/32242))
-  - Mark all experimental components in the handbook. ([32147](https://github.com/WordPress/gutenberg/pull/32147))
-  - Update the create a block theme tutorial. ([31269](https://github.com/WordPress/gutenberg/pull/31269))
-  - Update iOS Simulator device command in React Native documentation. ([32383](https://github.com/WordPress/gutenberg/pull/32383))
-- Packages:
-  - Navigation Editor: Augment and improve Nav Editor (and block) documentation. ([31891](https://github.com/WordPress/gutenberg/pull/31891))
-  - Components: Fixed documentation for `units` attribute in Unit Control. ([31901](https://github.com/WordPress/gutenberg/pull/31901))
+-   Handbook:
+    -   Fix broken contributors readme files. ([32272](https://github.com/WordPress/gutenberg/pull/32272))
+    -   Fix misspelling in the Widgets Block Editor section. ([32242](https://github.com/WordPress/gutenberg/pull/32242))
+    -   Mark all experimental components in the handbook. ([32147](https://github.com/WordPress/gutenberg/pull/32147))
+    -   Update the create a block theme tutorial. ([31269](https://github.com/WordPress/gutenberg/pull/31269))
+    -   Update iOS Simulator device command in React Native documentation. ([32383](https://github.com/WordPress/gutenberg/pull/32383))
+-   Packages:
+    -   Navigation Editor: Augment and improve Nav Editor (and block) documentation. ([31891](https://github.com/WordPress/gutenberg/pull/31891))
+    -   Components: Fixed documentation for `units` attribute in Unit Control. ([31901](https://github.com/WordPress/gutenberg/pull/31901))
 
 ### Code Quality
 
-- Block Editor:
-  - Rich text:
-    - Contextual default shortcut removal. ([32327](https://github.com/WordPress/gutenberg/pull/32327))
-    - Remove inline display warning. ([32013](https://github.com/WordPress/gutenberg/pull/32013))
-  - Colors: Remove \_\_experimentalUseColors hook. ([31438](https://github.com/WordPress/gutenberg/pull/31438))
-  - Remove usages of `withState` from edit-post and editor. ([32349](https://github.com/WordPress/gutenberg/pull/32349))
-- Block Library:
-  - List View: Simplify the BlockNavigation component. ([31290](https://github.com/WordPress/gutenberg/pull/31290))
-  - Navigation: Simplify html selector in nav burger menu. ([32303](https://github.com/WordPress/gutenberg/pull/32303))
-  - Remove "class=" wrapper to already wrapped attributes. ([29214](https://github.com/WordPress/gutenberg/pull/29214))
-  - Query Block: Remove query context leftovers. ([32093](https://github.com/WordPress/gutenberg/pull/32093))
-- Blocks Package: Make getBlockSupport support any `lodash` path.. ([32322](https://github.com/WordPress/gutenberg/pull/32322))
-- Block Supports: Avoid a PHP Notice when `render_block()` is called without attributes. ([32135](https://github.com/WordPress/gutenberg/pull/32135))
-- Components:
-  - Button: Deprecate `isPrimary`, `isSecondary`, `isTertiary` and `isLink` props in favour of `variant` prop. ([31713](https://github.com/WordPress/gutenberg/pull/31713))
-  - Combobox: Remove duplicated ComboboxControl component. ([32397](https://github.com/WordPress/gutenberg/pull/32397))
-  - Dashicons: Add types to Icon . ([32219](https://github.com/WordPress/gutenberg/pull/32219))
-  - Disabled: Add types to Disabled components. ([32105](https://github.com/WordPress/gutenberg/pull/32105))
-  - Remove all `withNext` wrappers. ([32205](https://github.com/WordPress/gutenberg/pull/32205))
-  - Rename `ViewOwnProps` to `PolymorphicComponentProps`. ([32053](https://github.com/WordPress/gutenberg/pull/32053))
-  - Require explicit `children` prop for all components. ([31817](https://github.com/WordPress/gutenberg/pull/31817))
-  - UI Context: Delete unused types from `context`. ([32254](https://github.com/WordPress/gutenberg/pull/32254))
-  - UI Popover: Remove unused `content` property from types definitions. ([32049](https://github.com/WordPress/gutenberg/pull/32049))
-- Compose:
-  - Add types to useRefEffect and clipboard hooks. ([31603](https://github.com/WordPress/gutenberg/pull/31603))
-  - Add Types to `withGlobalEvents` as any. ([32290](https://github.com/WordPress/gutenberg/pull/32290))
-  - Add types to `useWarnOnChange`. ([32288](https://github.com/WordPress/gutenberg/pull/32288))
-  - Add types to `useViewportMatch`. ([32287](https://github.com/WordPress/gutenberg/pull/32287))
-  - Add types to `useDropZone`. ([32286](https://github.com/WordPress/gutenberg/pull/32286))
-  - Add types to `useDragging`. ([32285](https://github.com/WordPress/gutenberg/pull/32285))
-  - Add types to `useThrottle` and typecheck `useFocusOutside`. ([32170](https://github.com/WordPress/gutenberg/pull/32170))
-  - Add types to `useKeyboardShortcut`. ([32168](https://github.com/WordPress/gutenberg/pull/32168))
-  - Add types to `useResizeObserver` and type checking to `useIsomorphicLayoutEffect`. ([32111](https://github.com/WordPress/gutenberg/pull/32111))
-  - Add types to `useFocusReturn`. ([31949](https://github.com/WordPress/gutenberg/pull/31949))
-  - Add types to `usePrevious`. ([31944](https://github.com/WordPress/gutenberg/pull/31944))
-  - Add types to useReducedMotion and useMediaQuery. ([31941](https://github.com/WordPress/gutenberg/pull/31941))
-  - Add types to useMergeRefs. ([31939](https://github.com/WordPress/gutenberg/pull/31939))
-  - Add test to `useMergeRefs` for disabling refs + better documentation. ([32044](https://github.com/WordPress/gutenberg/pull/32044))
-  - Add types to `useDebounce`. ([32015](https://github.com/WordPress/gutenberg/pull/32015))
-  - Deprecate `withState` in favor of `useState`. ([32368](https://github.com/WordPress/gutenberg/pull/32368))
-  - Simplify `compose` function documentation and point to lodash documentation for it. ([32324](https://github.com/WordPress/gutenberg/pull/32324))
-- Global Styles:
-  - Avoid enqueuing global styles twice when running on WordPress 5.8. ([32372](https://github.com/WordPress/gutenberg/pull/32372))
-- Keyboard Shortcuts:
-  - Multi select: select all: Restore ref callback. ([32318](https://github.com/WordPress/gutenberg/pull/32318))
-- Linting:
-  - Fix eslint warnings in the core-data package. ([32198](https://github.com/WordPress/gutenberg/pull/32198))
-  - Fix eslint warnings in the edit-navigation package. ([32196](https://github.com/WordPress/gutenberg/pull/32196))
-  - Fix eslint warnings in the edit-post package. ([32195](https://github.com/WordPress/gutenberg/pull/32195))
-  - Fix eslint warnings in the edit-site package. ([32156](https://github.com/WordPress/gutenberg/pull/32156))
-  - Fix eslint warnings in the edit-widgets package. ([32155](https://github.com/WordPress/gutenberg/pull/32155))
-  - Fix eslint warnings in the editor package. ([32153](https://github.com/WordPress/gutenberg/pull/32153))
-  - Fix eslint warnings in the nux package. ([32145](https://github.com/WordPress/gutenberg/pull/32145))
-  - Fix eslint warnings in the rich-text package. ([32142](https://github.com/WordPress/gutenberg/pull/32142))
-  - Fix eslint warnings in the reusable-blocks package. ([32141](https://github.com/WordPress/gutenberg/pull/32141))
-- Navigation Editor:
-  - Fix React warning. ([32165](https://github.com/WordPress/gutenberg/pull/32165))
-
-### Tools
-
-- Babel presets: Prefix build with node command for Windows environments. (#32258). ([32329](https://github.com/WordPress/gutenberg/pull/32329))
-- Workflow:
-  - Limit when workflows run on forks. ([32114](https://github.com/WordPress/gutenberg/pull/32114))
-  - Only calculate the compressed size on pull requests when necessary. ([32161](https://github.com/WordPress/gutenberg/pull/32161))
-  - Performance Tests Workflow:
-    - Polish Bash script. ([32284](https://github.com/WordPress/gutenberg/pull/32284))
-    - Run suite atop latest stable major WordPress version. ([32244](https://github.com/WordPress/gutenberg/pull/32244))
-    - Use latest WP branch for release tests. ([32277](https://github.com/WordPress/gutenberg/pull/32277))
-- End to End Tests:
-  - Fix inserting cover block intermittent failure. ([32014](https://github.com/WordPress/gutenberg/pull/32014))
-  - Navigation Editor:
-    - Fix failing end-to-end tests. ([32043](https://github.com/WordPress/gutenberg/pull/32043))
-    - Skip "Change detection" tests. ([32151](https://github.com/WordPress/gutenberg/pull/32151))
-  - Move the Query and PostTitle end-to-end tests out of the experimental directory. ([31691](https://github.com/WordPress/gutenberg/pull/31691))
-  - Multi select: Add end-to-end test for gruadual select all. ([32304](https://github.com/WordPress/gutenberg/pull/32304))
-  - Remove redundant widget API endpoint tests. ([32298](https://github.com/WordPress/gutenberg/pull/32298))
-  - Skip tests that are failing with the latest WordPress core. ([32228](https://github.com/WordPress/gutenberg/pull/32228))
-- Eslint: Ignore some eslint rules in react-native folders. ([32143](https://github.com/WordPress/gutenberg/pull/32143))
-
-
-
-
-
+-   Block Editor:
+    -   Rich text:
+        -   Contextual default shortcut removal. ([32327](https://github.com/WordPress/gutenberg/pull/32327))
+        -   Remove inline display warning. ([32013](https://github.com/WordPress/gutenberg/pull/32013))
+    -   Colors: Remove \_\_experimentalUseColors hook. ([31438](https://github.com/WordPress/gutenberg/pull/31438))
+    -   Remove usages of `withState` from edit-post and editor. ([32349](https://github.com/WordPress/gutenberg/pull/32349))
+-   Block Library:
+    -   List View: Simplify the BlockNavigation component. ([31290](https://github.com/WordPress/gutenberg/pull/31290))
+    -   Navigation: Simplify html selector in nav burger menu. ([32303](https://github.com/WordPress/gutenberg/pull/32303))
+    -   Remove "class=" wrapper to already wrapped attributes. ([29214](https://github.com/WordPress/gutenberg/pull/29214))
+    -   Query Block: Remove query context leftovers. ([32093](https://github.com/WordPress/gutenberg/pull/32093))
+-   Blocks Package: Make getBlockSupport support any `lodash` path.. ([32322](https://github.com/WordPress/gutenberg/pull/32322))
+-   Block Supports: Avoid a PHP Notice when `render_block()` is called without attributes. ([32135](https://github.com/WordPress/gutenberg/pull/32135))
+-   Components:
+    -   Button: Deprecate `isPrimary`, `isSecondary`, `isTertiary` and `isLink` props in favour of `variant` prop. ([31713](https://github.com/WordPress/gutenberg/pull/31713))
+    -   Combobox: Remove duplicated ComboboxControl component. ([32397](https://github.com/WordPress/gutenberg/pull/32397))
+    -   Dashicons: Add types to Icon . ([32219](https://github.com/WordPress/gutenberg/pull/32219))
+    -   Disabled: Add types to Disabled components. ([32105](https://github.com/WordPress/gutenberg/pull/32105))
+    -   Remove all `withNext` wrappers. ([32205](https://github.com/WordPress/gutenberg/pull/32205))
+    -   Rename `ViewOwnProps` to `PolymorphicComponentProps`. ([32053](https://github.com/WordPress/gutenberg/pull/32053))
+    -   Require explicit `children` prop for all components. ([31817](https://github.com/WordPress/gutenberg/pull/31817))
+    -   UI Context: Delete unused types from `context`. ([32254](https://github.com/WordPress/gutenberg/pull/32254))
+    -   UI Popover: Remove unused `content` property from types definitions. ([32049](https://github.com/WordPress/gutenberg/pull/32049))
+-   Compose:
+    -   Add types to useRefEffect and clipboard hooks. ([31603](https://github.com/WordPress/gutenberg/pull/31603))
+    -   Add Types to `withGlobalEvents` as any. ([32290](https://github.com/WordPress/gutenberg/pull/32290))
+    -   Add types to `useWarnOnChange`. ([32288](https://github.com/WordPress/gutenberg/pull/32288))
+    -   Add types to `useViewportMatch`. ([32287](https://github.com/WordPress/gutenberg/pull/32287))
+    -   Add types to `useDropZone`. ([32286](https://github.com/WordPress/gutenberg/pull/32286))
+    -   Add types to `useDragging`. ([32285](https://github.com/WordPress/gutenberg/pull/32285))
+    -   Add types to `useThrottle` and typecheck `useFocusOutside`. ([32170](https://github.com/WordPress/gutenberg/pull/32170))
+    -   Add types to `useKeyboardShortcut`. ([32168](https://github.com/WordPress/gutenberg/pull/32168))
+    -   Add types to `useResizeObserver` and type checking to `useIsomorphicLayoutEffect`. ([32111](https://github.com/WordPress/gutenberg/pull/32111))
+    -   Add types to `useFocusReturn`. ([31949](https://github.com/WordPress/gutenberg/pull/31949))
+    -   Add types to `usePrevious`. ([31944](https://github.com/WordPress/gutenberg/pull/31944))
+    -   Add types to useReducedMotion and useMediaQuery. ([31941](https://github.com/WordPress/gutenberg/pull/31941))
+    -   Add types to useMergeRefs. ([31939](https://github.com/WordPress/gutenberg/pull/31939))
+    -   Add test to `useMergeRefs` for disabling refs + better documentation. ([32044](https://github.com/WordPress/gutenberg/pull/32044))
+    -   Add types to `useDebounce`. ([32015](https://github.com/WordPress/gutenberg/pull/32015))
+    -   Deprecate `withState` in favor of `useState`. ([32368](https://github.com/WordPress/gutenberg/pull/32368))
+    -   Simplify `compose` function documentation and point to lodash documentation for it. ([32324](https://github.com/WordPress/gutenberg/pull/32324))
+-   Global Styles:
+    -   Avoid enqueuing global styles twice when running on WordPress 5.8. ([32372](https://github.com/WordPress/gutenberg/pull/32372))
+-   Keyboard Shortcuts:
+    -   Multi select: select all: Restore ref callback. ([32318](https://github.com/WordPress/gutenberg/pull/32318))
+-   Linting:
+    -   Fix eslint warnings in the core-data package. ([32198](https://github.com/WordPress/gutenberg/pull/32198))
+    -   Fix eslint warnings in the edit-navigation package. ([32196](https://github.com/WordPress/gutenberg/pull/32196))
+    -   Fix eslint warnings in the edit-post package. ([32195](https://github.com/WordPress/gutenberg/pull/32195))
+    -   Fix eslint warnings in the edit-site package. ([32156](https://github.com/WordPress/gutenberg/pull/32156))
+    -   Fix eslint warnings in the edit-widgets package. ([32155](https://github.com/WordPress/gutenberg/pull/32155))
+    -   Fix eslint warnings in the editor package. ([32153](https://github.com/WordPress/gutenberg/pull/32153))
+    -   Fix eslint warnings in the nux package. ([32145](https://github.com/WordPress/gutenberg/pull/32145))
+    -   Fix eslint warnings in the rich-text package. ([32142](https://github.com/WordPress/gutenberg/pull/32142))
+    -   Fix eslint warnings in the reusable-blocks package. ([32141](https://github.com/WordPress/gutenberg/pull/32141))
+-   Navigation Editor:
+    -   Fix React warning. ([32165](https://github.com/WordPress/gutenberg/pull/32165))
 
+### Tools
 
+-   Babel presets: Prefix build with node command for Windows environments. (#32258). ([32329](https://github.com/WordPress/gutenberg/pull/32329))
+-   Workflow:
+    -   Limit when workflows run on forks. ([32114](https://github.com/WordPress/gutenberg/pull/32114))
+    -   Only calculate the compressed size on pull requests when necessary. ([32161](https://github.com/WordPress/gutenberg/pull/32161))
+    -   Performance Tests Workflow:
+        -   Polish Bash script. ([32284](https://github.com/WordPress/gutenberg/pull/32284))
+        -   Run suite atop latest stable major WordPress version. ([32244](https://github.com/WordPress/gutenberg/pull/32244))
+        -   Use latest WP branch for release tests. ([32277](https://github.com/WordPress/gutenberg/pull/32277))
+-   End to End Tests:
+    -   Fix inserting cover block intermittent failure. ([32014](https://github.com/WordPress/gutenberg/pull/32014))
+    -   Navigation Editor:
+        -   Fix failing end-to-end tests. ([32043](https://github.com/WordPress/gutenberg/pull/32043))
+        -   Skip "Change detection" tests. ([32151](https://github.com/WordPress/gutenberg/pull/32151))
+    -   Move the Query and PostTitle end-to-end tests out of the experimental directory. ([31691](https://github.com/WordPress/gutenberg/pull/31691))
+    -   Multi select: Add end-to-end test for gruadual select all. ([32304](https://github.com/WordPress/gutenberg/pull/32304))
+    -   Remove redundant widget API endpoint tests. ([32298](https://github.com/WordPress/gutenberg/pull/32298))
+    -   Skip tests that are failing with the latest WordPress core. ([32228](https://github.com/WordPress/gutenberg/pull/32228))
+-   Eslint: Ignore some eslint rules in react-native folders. ([32143](https://github.com/WordPress/gutenberg/pull/32143))
 
 = 10.7.4 =
 
-### Bug Fixes
+## Changelog
 
-- Site Logo block: Use option instead of theme-mod. ([32229](https://github.com/WordPress/gutenberg/pull/32229))
+### Bug Fixes
 
+-   Site Logo block: Use option instead of theme-mod. ([32229](https://github.com/WordPress/gutenberg/pull/32229))
 
 = 10.7.3 =
 
-### Bug Fixes
+## Changelog
 
-- Fix alligned blocks. ([32454](https://github.com/WordPress/gutenberg/pull/32454))
+### Bug Fixes
 
+-   Fix alligned blocks. ([32454](https://github.com/WordPress/gutenberg/pull/32454))
 
 = 10.7.2 =
 
-### Bug Fixes
+## Changelog
 
-- Fix Logic to enable custom colors, gradients, and font sizes. ([32200](https://github.com/WordPress/gutenberg/pull/32200))
+### Bug Fixes
 
+-   Fix Logic to enable custom colors, gradients, and font sizes. ([32200](https://github.com/WordPress/gutenberg/pull/32200))
 
 = 10.8.0-rc.1 =
 
-
+## Changelog
 
 ### Enhancements
 
-- BoxControl: Add allowReset option. ([32345](https://github.com/WordPress/gutenberg/pull/32345))
-- Add Convert to Regular Blocks button to ellipsis Dropdown. ([32310](https://github.com/WordPress/gutenberg/pull/32310))
-- Page list block: Add active page classes. ([32134](https://github.com/WordPress/gutenberg/pull/32134))
-- Template Mode: Don't display snackbar with the Welcome Guide. ([32076](https://github.com/WordPress/gutenberg/pull/32076))
-- Block Supports: Allow skipping spacing support serialization. ([31973](https://github.com/WordPress/gutenberg/pull/31973))
-
-### Bug Fixes
-
-- Fix image border radius. ([32393](https://github.com/WordPress/gutenberg/pull/32393))
-- Fix allowed patterns check. ([32376](https://github.com/WordPress/gutenberg/pull/32376))
-- Fix deselecting block when inspector is opened. ([32361](https://github.com/WordPress/gutenberg/pull/32361))
-- Generate classes from preset slugs in the same way (server & client). ([32352](https://github.com/WordPress/gutenberg/pull/32352))
-- Mobile - Gallery block - Fix gallery images caption text formatting. ([32351](https://github.com/WordPress/gutenberg/pull/32351))
-- File Block: Add an example preview. ([32350](https://github.com/WordPress/gutenberg/pull/32350))
-- Avoid duplicate skip-links in WP 5.8+. ([32346](https://github.com/WordPress/gutenberg/pull/32346))
-- SuggestionsList: Try to use a unique "key". ([32344](https://github.com/WordPress/gutenberg/pull/32344))
-- Fix `theme.json` styles for the `core/list` block. ([32343](https://github.com/WordPress/gutenberg/pull/32343))
-- Prevent saving the post before previewing in locked/read-only mode. ([32341](https://github.com/WordPress/gutenberg/pull/32341))
-- Audio Block: Add an example preview. ([32333](https://github.com/WordPress/gutenberg/pull/32333))
-- Try: Make focus style valid CSS. ([32305](https://github.com/WordPress/gutenberg/pull/32305))
-- Fix aspect ratio of welcome image. ([32302](https://github.com/WordPress/gutenberg/pull/32302))
-- Fix legacy widget block preview iframe. ([32300](https://github.com/WordPress/gutenberg/pull/32300))
-- Fix broken contributors readme files. ([32272](https://github.com/WordPress/gutenberg/pull/32272))
-- Center the welcome image in narrow viewport of widgets customizer. ([32264](https://github.com/WordPress/gutenberg/pull/32264))
-- Fix legacy widget previews. ([32260](https://github.com/WordPress/gutenberg/pull/32260))
-- Limit latest posts featured image width to 100%. ([32245](https://github.com/WordPress/gutenberg/pull/32245))
-- Fix mispelling in the Widgets Block Editor section. ([32242](https://github.com/WordPress/gutenberg/pull/32242))
-- Try: Fix notices below block toolbars. ([32238](https://github.com/WordPress/gutenberg/pull/32238))
-- Allow non-latin characters in slugs. ([32232](https://github.com/WordPress/gutenberg/pull/32232))
-- Fix escape key events in customizer closing the editor. ([32175](https://github.com/WordPress/gutenberg/pull/32175))
-- Update Dropdown’s close-on-blur logic to work inside dialogs. ([32133](https://github.com/WordPress/gutenberg/pull/32133))
-- components: Add missing Divider, Heading type reference in tsconfig. ([32104](https://github.com/WordPress/gutenberg/pull/32104))
-- Fix broken template part converter modal styles. ([32097](https://github.com/WordPress/gutenberg/pull/32097))
-- Fix some smaller styling issues and bugs in Widgets Customizer. ([32072](https://github.com/WordPress/gutenberg/pull/32072))
-- Iframed editor: Fix embed dimensions with missing wp-embed-responsive class. ([32057](https://github.com/WordPress/gutenberg/pull/32057))
-- Fix creating and replacing legacy widgets in customizer. ([32005](https://github.com/WordPress/gutenberg/pull/32005))
-- Block toolbar: Always close options menu after toggling sidebar. ([31921](https://github.com/WordPress/gutenberg/pull/31921))
-- UnitControl: Fixed documentation for `units` attribute. ([31901](https://github.com/WordPress/gutenberg/pull/31901))
-- Display wide widgets as popovers in Customizer. ([31736](https://github.com/WordPress/gutenberg/pull/31736))
-- compose: Add types to useRefEffect and clipboard hooks. ([31603](https://github.com/WordPress/gutenberg/pull/31603))
-- components: Fix Shortcut polymorphism. ([31555](https://github.com/WordPress/gutenberg/pull/31555))
+-   BoxControl: Add allowReset option. ([32345](https://github.com/WordPress/gutenberg/pull/32345))
+-   Add Convert to Regular Blocks button to ellipsis Dropdown. ([32310](https://github.com/WordPress/gutenberg/pull/32310))
+-   Page list block: Add active page classes. ([32134](https://github.com/WordPress/gutenberg/pull/32134))
+-   Template Mode: Don't display snackbar with the Welcome Guide. ([32076](https://github.com/WordPress/gutenberg/pull/32076))
+-   Block Supports: Allow skipping spacing support serialization. ([31973](https://github.com/WordPress/gutenberg/pull/31973))
+
+### Bug Fixes
+
+-   Fix image border radius. ([32393](https://github.com/WordPress/gutenberg/pull/32393))
+-   Fix allowed patterns check. ([32376](https://github.com/WordPress/gutenberg/pull/32376))
+-   Fix deselecting block when inspector is opened. ([32361](https://github.com/WordPress/gutenberg/pull/32361))
+-   Generate classes from preset slugs in the same way (server & client). ([32352](https://github.com/WordPress/gutenberg/pull/32352))
+-   Mobile - Gallery block - Fix gallery images caption text formatting. ([32351](https://github.com/WordPress/gutenberg/pull/32351))
+-   File Block: Add an example preview. ([32350](https://github.com/WordPress/gutenberg/pull/32350))
+-   Avoid duplicate skip-links in WP 5.8+. ([32346](https://github.com/WordPress/gutenberg/pull/32346))
+-   SuggestionsList: Try to use a unique "key". ([32344](https://github.com/WordPress/gutenberg/pull/32344))
+-   Fix `theme.json` styles for the `core/list` block. ([32343](https://github.com/WordPress/gutenberg/pull/32343))
+-   Prevent saving the post before previewing in locked/read-only mode. ([32341](https://github.com/WordPress/gutenberg/pull/32341))
+-   Audio Block: Add an example preview. ([32333](https://github.com/WordPress/gutenberg/pull/32333))
+-   Try: Make focus style valid CSS. ([32305](https://github.com/WordPress/gutenberg/pull/32305))
+-   Fix aspect ratio of welcome image. ([32302](https://github.com/WordPress/gutenberg/pull/32302))
+-   Fix legacy widget block preview iframe. ([32300](https://github.com/WordPress/gutenberg/pull/32300))
+-   Fix broken contributors readme files. ([32272](https://github.com/WordPress/gutenberg/pull/32272))
+-   Center the welcome image in narrow viewport of widgets customizer. ([32264](https://github.com/WordPress/gutenberg/pull/32264))
+-   Fix legacy widget previews. ([32260](https://github.com/WordPress/gutenberg/pull/32260))
+-   Limit latest posts featured image width to 100%. ([32245](https://github.com/WordPress/gutenberg/pull/32245))
+-   Fix mispelling in the Widgets Block Editor section. ([32242](https://github.com/WordPress/gutenberg/pull/32242))
+-   Try: Fix notices below block toolbars. ([32238](https://github.com/WordPress/gutenberg/pull/32238))
+-   Allow non-latin characters in slugs. ([32232](https://github.com/WordPress/gutenberg/pull/32232))
+-   Fix escape key events in customizer closing the editor. ([32175](https://github.com/WordPress/gutenberg/pull/32175))
+-   Update Dropdown’s close-on-blur logic to work inside dialogs. ([32133](https://github.com/WordPress/gutenberg/pull/32133))
+-   components: Add missing Divider, Heading type reference in tsconfig. ([32104](https://github.com/WordPress/gutenberg/pull/32104))
+-   Fix broken template part converter modal styles. ([32097](https://github.com/WordPress/gutenberg/pull/32097))
+-   Fix some smaller styling issues and bugs in Widgets Customizer. ([32072](https://github.com/WordPress/gutenberg/pull/32072))
+-   Iframed editor: Fix embed dimensions with missing wp-embed-responsive class. ([32057](https://github.com/WordPress/gutenberg/pull/32057))
+-   Fix creating and replacing legacy widgets in customizer. ([32005](https://github.com/WordPress/gutenberg/pull/32005))
+-   Block toolbar: Always close options menu after toggling sidebar. ([31921](https://github.com/WordPress/gutenberg/pull/31921))
+-   UnitControl: Fixed documentation for `units` attribute. ([31901](https://github.com/WordPress/gutenberg/pull/31901))
+-   Display wide widgets as popovers in Customizer. ([31736](https://github.com/WordPress/gutenberg/pull/31736))
+-   compose: Add types to useRefEffect and clipboard hooks. ([31603](https://github.com/WordPress/gutenberg/pull/31603))
+-   components: Fix Shortcut polymorphism. ([31555](https://github.com/WordPress/gutenberg/pull/31555))
 
 ### Performance
 
-- Experimental Layout: Pass the same object when no data changes. ([32380](https://github.com/WordPress/gutenberg/pull/32380))
-- Navigation: Avoid rerendering when placeholder does not change. ([32357](https://github.com/WordPress/gutenberg/pull/32357))
-- Buttons: Move options to constants to avoid unneeded renders. ([32356](https://github.com/WordPress/gutenberg/pull/32356))
-- Update Welcome Guides to use external image URLs. ([32026](https://github.com/WordPress/gutenberg/pull/32026))
+-   Experimental Layout: Pass the same object when no data changes. ([32380](https://github.com/WordPress/gutenberg/pull/32380))
+-   Navigation: Avoid rerendering when placeholder does not change. ([32357](https://github.com/WordPress/gutenberg/pull/32357))
+-   Buttons: Move options to constants to avoid unneeded renders. ([32356](https://github.com/WordPress/gutenberg/pull/32356))
+-   Update Welcome Guides to use external image URLs. ([32026](https://github.com/WordPress/gutenberg/pull/32026))
 
 ### Experiments
 
-- Page List: Fix css bleed from navigation. ([32384](https://github.com/WordPress/gutenberg/pull/32384))
-- Avoid enqueuing global styles twice when running on WordPress 5.8. ([32372](https://github.com/WordPress/gutenberg/pull/32372))
-- Widgets editor: Fix error when saving empty Legacy Widget block. ([32359](https://github.com/WordPress/gutenberg/pull/32359))
-- Simplify html selector in nav burger menu. ([32303](https://github.com/WordPress/gutenberg/pull/32303))
-- Link to widgets.php instead of themes.php?page=gutenberg-widgets. ([32299](https://github.com/WordPress/gutenberg/pull/32299))
-- Lock the document from scrolling when the modal is open. ([32269](https://github.com/WordPress/gutenberg/pull/32269))
-- Fix the visible widget area toolbar. ([32262](https://github.com/WordPress/gutenberg/pull/32262))
-- Add preferences menu group label to widgets and customize widget editor. ([32259](https://github.com/WordPress/gutenberg/pull/32259))
-- Group typographic block supports under a `typography` key. ([32252](https://github.com/WordPress/gutenberg/pull/32252))
-- Fix incorrect useCustomUnits import. ([32248](https://github.com/WordPress/gutenberg/pull/32248))
-- Alignment styles: Centre blocks using grid not margins. ([32231](https://github.com/WordPress/gutenberg/pull/32231))
-- site-logo block: Use option instead of theme-mod. ([32229](https://github.com/WordPress/gutenberg/pull/32229))
-- Widgets editor: Fix block toolbar position after scroll. ([32212](https://github.com/WordPress/gutenberg/pull/32212))
-- Fix: Logic to enable custom colors, gradients, and font sizes. ([32200](https://github.com/WordPress/gutenberg/pull/32200))
-- FSE: Remove now-obsolete get_template_hierarchy(). ([32116](https://github.com/WordPress/gutenberg/pull/32116))
-- Remove query context leftovers. ([32093](https://github.com/WordPress/gutenberg/pull/32093))
-- Navigation Screen: Hide sidebar when a menu isn't selected. ([32090](https://github.com/WordPress/gutenberg/pull/32090))
-- Navigation: Fix collapsing regression. ([32081](https://github.com/WordPress/gutenberg/pull/32081))
-- Templates: Remove now-obsolete `gutenberg_get_template_paths()`. ([32066](https://github.com/WordPress/gutenberg/pull/32066))
-- Fix toolbar alignment in widget block editor. ([31991](https://github.com/WordPress/gutenberg/pull/31991))
-- Allow block attributes passed to block renderer by way of wp_nav_menu. ([31911](https://github.com/WordPress/gutenberg/pull/31911))
-- Augment and improve Nav Editor (and block) documentation. ([31891](https://github.com/WordPress/gutenberg/pull/31891))
-- Refactor nav block paddings/margins to inherit global styles. ([31878](https://github.com/WordPress/gutenberg/pull/31878))
-- Align block hover and select styles across list view, site editor, select mode. ([31277](https://github.com/WordPress/gutenberg/pull/31277))
-- Add Letter-spacing and enable this for site title and site tagline. ([31118](https://github.com/WordPress/gutenberg/pull/31118))
-- Headings block: Add support for font weight. ([27639](https://github.com/WordPress/gutenberg/pull/27639))
+-   Page List: Fix css bleed from navigation. ([32384](https://github.com/WordPress/gutenberg/pull/32384))
+-   Avoid enqueuing global styles twice when running on WordPress 5.8. ([32372](https://github.com/WordPress/gutenberg/pull/32372))
+-   Widgets editor: Fix error when saving empty Legacy Widget block. ([32359](https://github.com/WordPress/gutenberg/pull/32359))
+-   Simplify html selector in nav burger menu. ([32303](https://github.com/WordPress/gutenberg/pull/32303))
+-   Link to widgets.php instead of themes.php?page=gutenberg-widgets. ([32299](https://github.com/WordPress/gutenberg/pull/32299))
+-   Lock the document from scrolling when the modal is open. ([32269](https://github.com/WordPress/gutenberg/pull/32269))
+-   Fix the visible widget area toolbar. ([32262](https://github.com/WordPress/gutenberg/pull/32262))
+-   Add preferences menu group label to widgets and customize widget editor. ([32259](https://github.com/WordPress/gutenberg/pull/32259))
+-   Group typographic block supports under a `typography` key. ([32252](https://github.com/WordPress/gutenberg/pull/32252))
+-   Fix incorrect useCustomUnits import. ([32248](https://github.com/WordPress/gutenberg/pull/32248))
+-   Alignment styles: Centre blocks using grid not margins. ([32231](https://github.com/WordPress/gutenberg/pull/32231))
+-   site-logo block: Use option instead of theme-mod. ([32229](https://github.com/WordPress/gutenberg/pull/32229))
+-   Widgets editor: Fix block toolbar position after scroll. ([32212](https://github.com/WordPress/gutenberg/pull/32212))
+-   Fix: Logic to enable custom colors, gradients, and font sizes. ([32200](https://github.com/WordPress/gutenberg/pull/32200))
+-   FSE: Remove now-obsolete get_template_hierarchy(). ([32116](https://github.com/WordPress/gutenberg/pull/32116))
+-   Remove query context leftovers. ([32093](https://github.com/WordPress/gutenberg/pull/32093))
+-   Navigation Screen: Hide sidebar when a menu isn't selected. ([32090](https://github.com/WordPress/gutenberg/pull/32090))
+-   Navigation: Fix collapsing regression. ([32081](https://github.com/WordPress/gutenberg/pull/32081))
+-   Templates: Remove now-obsolete `gutenberg_get_template_paths()`. ([32066](https://github.com/WordPress/gutenberg/pull/32066))
+-   Fix toolbar alignment in widget block editor. ([31991](https://github.com/WordPress/gutenberg/pull/31991))
+-   Allow block attributes passed to block renderer by way of wp_nav_menu. ([31911](https://github.com/WordPress/gutenberg/pull/31911))
+-   Augment and improve Nav Editor (and block) documentation. ([31891](https://github.com/WordPress/gutenberg/pull/31891))
+-   Refactor nav block paddings/margins to inherit global styles. ([31878](https://github.com/WordPress/gutenberg/pull/31878))
+-   Align block hover and select styles across list view, site editor, select mode. ([31277](https://github.com/WordPress/gutenberg/pull/31277))
+-   Add Letter-spacing and enable this for site title and site tagline. ([31118](https://github.com/WordPress/gutenberg/pull/31118))
+-   Headings block: Add support for font weight. ([27639](https://github.com/WordPress/gutenberg/pull/27639))
 
 ### Documentation
 
-- Components: Mark all experimental components in the handbook. ([32147](https://github.com/WordPress/gutenberg/pull/32147))
-- Update the create a block theme tutorial. ([31269](https://github.com/WordPress/gutenberg/pull/31269))
+-   Components: Mark all experimental components in the handbook. ([32147](https://github.com/WordPress/gutenberg/pull/32147))
+-   Update the create a block theme tutorial. ([31269](https://github.com/WordPress/gutenberg/pull/31269))
 
 ### Code Quality
 
-- Remove duplicated ComboboxControl component. ([32397](https://github.com/WordPress/gutenberg/pull/32397))
-- Remove usages of withState from edit-post and editor. ([32349](https://github.com/WordPress/gutenberg/pull/32349))
-- Rich text: Contextual default shortcut removal. ([32327](https://github.com/WordPress/gutenberg/pull/32327))
-- compose: Simplify `compose` fn documentation and point to lodash documentation for it. ([32324](https://github.com/WordPress/gutenberg/pull/32324))
-- Update: Make getBlockSupport support any lodash path.. ([32322](https://github.com/WordPress/gutenberg/pull/32322))
-- Multi select: select all: Restore ref callback. ([32318](https://github.com/WordPress/gutenberg/pull/32318))
-- compose: Type `withGlobalEvents` as any. ([32290](https://github.com/WordPress/gutenberg/pull/32290))
-- compose: Add types to `useWarnOnChange`. ([32288](https://github.com/WordPress/gutenberg/pull/32288))
-- compose: Add types to `useViewportMatch`. ([32287](https://github.com/WordPress/gutenberg/pull/32287))
-- compose: Add types to `useDropZone`. ([32286](https://github.com/WordPress/gutenberg/pull/32286))
-- compose: Add types to `useDragging`. ([32285](https://github.com/WordPress/gutenberg/pull/32285))
-- components: Delete unused types from `context`. ([32254](https://github.com/WordPress/gutenberg/pull/32254))
-- core-data: No-string-literals fix. ([32198](https://github.com/WordPress/gutenberg/pull/32198))
-- edit-navigation: No-string-literals fix. ([32196](https://github.com/WordPress/gutenberg/pull/32196))
-- edit-post: No-string-literals fix. ([32195](https://github.com/WordPress/gutenberg/pull/32195))
-- compose: Add types to `useThrottle` and typecheck `useFocusOutside`. ([32170](https://github.com/WordPress/gutenberg/pull/32170))
-- compose: Add types to `useKeyboardShortcut`. ([32168](https://github.com/WordPress/gutenberg/pull/32168))
-- Navigation Editor: Fix React warning. ([32165](https://github.com/WordPress/gutenberg/pull/32165))
-- edit-site: Fix no-string-literals warnings. ([32156](https://github.com/WordPress/gutenberg/pull/32156))
-- edit-widgets: Fix no-string-literal warnings. ([32155](https://github.com/WordPress/gutenberg/pull/32155))
-- Editor package: No-string-literals fix. ([32153](https://github.com/WordPress/gutenberg/pull/32153))
-- nux: No-string-literals fix. ([32145](https://github.com/WordPress/gutenberg/pull/32145))
-- rich-text: No-string-literals fix. ([32142](https://github.com/WordPress/gutenberg/pull/32142))
-- Reusable-block: No-string-literals fix. ([32141](https://github.com/WordPress/gutenberg/pull/32141))
-- Avoid a PHP Notice when `render_block()` is called without attributes. ([32135](https://github.com/WordPress/gutenberg/pull/32135))
-- compose: Add types to `useResizeObserver` and type checking to `useIsomorphicLayoutEffect`. ([32111](https://github.com/WordPress/gutenberg/pull/32111))
-- components: Add types to Disabled. ([32105](https://github.com/WordPress/gutenberg/pull/32105))
-- Components: Rename `ViewOwnProps` to `PolymorphicComponentProps`. ([32053](https://github.com/WordPress/gutenberg/pull/32053))
-- Popover: Remove unused `content` property from types definitions. ([32049](https://github.com/WordPress/gutenberg/pull/32049))
-- Compose: useMergeRefs: Add test for disabling refs + better documentation. ([32044](https://github.com/WordPress/gutenberg/pull/32044))
-- compose: Add types to `useFocusReturn`. ([31949](https://github.com/WordPress/gutenberg/pull/31949))
-- compose: Add types to `usePrevious`. ([31944](https://github.com/WordPress/gutenberg/pull/31944))
-- compose: Add types to useReducedMotion and useMediaQuery. ([31941](https://github.com/WordPress/gutenberg/pull/31941))
-- compose: Add types to useMergeRefs. ([31939](https://github.com/WordPress/gutenberg/pull/31939))
-- Components: Require explicit `children` prop for all components. ([31817](https://github.com/WordPress/gutenberg/pull/31817))
-- Button: Deprecate `isPrimary`, `isSecondary`, `isTertiary` and `isLink` props in favour of `variant` prop. ([31713](https://github.com/WordPress/gutenberg/pull/31713))
-- Remove: __experimentalUseColors hook. ([31438](https://github.com/WordPress/gutenberg/pull/31438))
-- List View: Simplify the BlockNavigation component. ([31290](https://github.com/WordPress/gutenberg/pull/31290))
+-   Remove duplicated ComboboxControl component. ([32397](https://github.com/WordPress/gutenberg/pull/32397))
+-   Remove usages of withState from edit-post and editor. ([32349](https://github.com/WordPress/gutenberg/pull/32349))
+-   Rich text: Contextual default shortcut removal. ([32327](https://github.com/WordPress/gutenberg/pull/32327))
+-   compose: Simplify `compose` fn documentation and point to lodash documentation for it. ([32324](https://github.com/WordPress/gutenberg/pull/32324))
+-   Update: Make getBlockSupport support any lodash path.. ([32322](https://github.com/WordPress/gutenberg/pull/32322))
+-   Multi select: select all: Restore ref callback. ([32318](https://github.com/WordPress/gutenberg/pull/32318))
+-   compose: Type `withGlobalEvents` as any. ([32290](https://github.com/WordPress/gutenberg/pull/32290))
+-   compose: Add types to `useWarnOnChange`. ([32288](https://github.com/WordPress/gutenberg/pull/32288))
+-   compose: Add types to `useViewportMatch`. ([32287](https://github.com/WordPress/gutenberg/pull/32287))
+-   compose: Add types to `useDropZone`. ([32286](https://github.com/WordPress/gutenberg/pull/32286))
+-   compose: Add types to `useDragging`. ([32285](https://github.com/WordPress/gutenberg/pull/32285))
+-   components: Delete unused types from `context`. ([32254](https://github.com/WordPress/gutenberg/pull/32254))
+-   core-data: No-string-literals fix. ([32198](https://github.com/WordPress/gutenberg/pull/32198))
+-   edit-navigation: No-string-literals fix. ([32196](https://github.com/WordPress/gutenberg/pull/32196))
+-   edit-post: No-string-literals fix. ([32195](https://github.com/WordPress/gutenberg/pull/32195))
+-   compose: Add types to `useThrottle` and typecheck `useFocusOutside`. ([32170](https://github.com/WordPress/gutenberg/pull/32170))
+-   compose: Add types to `useKeyboardShortcut`. ([32168](https://github.com/WordPress/gutenberg/pull/32168))
+-   Navigation Editor: Fix React warning. ([32165](https://github.com/WordPress/gutenberg/pull/32165))
+-   edit-site: Fix no-string-literals warnings. ([32156](https://github.com/WordPress/gutenberg/pull/32156))
+-   edit-widgets: Fix no-string-literal warnings. ([32155](https://github.com/WordPress/gutenberg/pull/32155))
+-   Editor package: No-string-literals fix. ([32153](https://github.com/WordPress/gutenberg/pull/32153))
+-   nux: No-string-literals fix. ([32145](https://github.com/WordPress/gutenberg/pull/32145))
+-   rich-text: No-string-literals fix. ([32142](https://github.com/WordPress/gutenberg/pull/32142))
+-   Reusable-block: No-string-literals fix. ([32141](https://github.com/WordPress/gutenberg/pull/32141))
+-   Avoid a PHP Notice when `render_block()` is called without attributes. ([32135](https://github.com/WordPress/gutenberg/pull/32135))
+-   compose: Add types to `useResizeObserver` and type checking to `useIsomorphicLayoutEffect`. ([32111](https://github.com/WordPress/gutenberg/pull/32111))
+-   components: Add types to Disabled. ([32105](https://github.com/WordPress/gutenberg/pull/32105))
+-   Components: Rename `ViewOwnProps` to `PolymorphicComponentProps`. ([32053](https://github.com/WordPress/gutenberg/pull/32053))
+-   Popover: Remove unused `content` property from types definitions. ([32049](https://github.com/WordPress/gutenberg/pull/32049))
+-   Compose: useMergeRefs: Add test for disabling refs + better documentation. ([32044](https://github.com/WordPress/gutenberg/pull/32044))
+-   compose: Add types to `useFocusReturn`. ([31949](https://github.com/WordPress/gutenberg/pull/31949))
+-   compose: Add types to `usePrevious`. ([31944](https://github.com/WordPress/gutenberg/pull/31944))
+-   compose: Add types to useReducedMotion and useMediaQuery. ([31941](https://github.com/WordPress/gutenberg/pull/31941))
+-   compose: Add types to useMergeRefs. ([31939](https://github.com/WordPress/gutenberg/pull/31939))
+-   Components: Require explicit `children` prop for all components. ([31817](https://github.com/WordPress/gutenberg/pull/31817))
+-   Button: Deprecate `isPrimary`, `isSecondary`, `isTertiary` and `isLink` props in favour of `variant` prop. ([31713](https://github.com/WordPress/gutenberg/pull/31713))
+-   Remove: \_\_experimentalUseColors hook. ([31438](https://github.com/WordPress/gutenberg/pull/31438))
+-   List View: Simplify the BlockNavigation component. ([31290](https://github.com/WordPress/gutenberg/pull/31290))
 
 ### Tools
 
-- Remove redundant widget API endpoint tests. ([32298](https://github.com/WordPress/gutenberg/pull/32298))
-- Performance Tests Workflow: Polish Bash script. ([32284](https://github.com/WordPress/gutenberg/pull/32284))
-- Performance Tests Workflow: Use latest WP branch for release tests. ([32277](https://github.com/WordPress/gutenberg/pull/32277))
-- Navigation Editor: Skip "Change detection" tests. ([32151](https://github.com/WordPress/gutenberg/pull/32151))
-- Ignore some eslint rules in react-native folders. ([32143](https://github.com/WordPress/gutenberg/pull/32143))
-- Navigation Editor: Fix failing end-to-end tests. ([32043](https://github.com/WordPress/gutenberg/pull/32043))
-- Move the Query and PostTitle end-to-end tests out of the experimental directory. ([31691](https://github.com/WordPress/gutenberg/pull/31691))
-- Fix Xcode 12.5 support. ([31632](https://github.com/WordPress/gutenberg/pull/31632))
+-   Remove redundant widget API endpoint tests. ([32298](https://github.com/WordPress/gutenberg/pull/32298))
+-   Performance Tests Workflow: Polish Bash script. ([32284](https://github.com/WordPress/gutenberg/pull/32284))
+-   Performance Tests Workflow: Use latest WP branch for release tests. ([32277](https://github.com/WordPress/gutenberg/pull/32277))
+-   Navigation Editor: Skip "Change detection" tests. ([32151](https://github.com/WordPress/gutenberg/pull/32151))
+-   Ignore some eslint rules in react-native folders. ([32143](https://github.com/WordPress/gutenberg/pull/32143))
+-   Navigation Editor: Fix failing end-to-end tests. ([32043](https://github.com/WordPress/gutenberg/pull/32043))
+-   Move the Query and PostTitle end-to-end tests out of the experimental directory. ([31691](https://github.com/WordPress/gutenberg/pull/31691))
+-   Fix Xcode 12.5 support. ([31632](https://github.com/WordPress/gutenberg/pull/31632))
 
 ### Various
 
-- Update iOS Simulator device command in React Native documentation. ([32383](https://github.com/WordPress/gutenberg/pull/32383))
-- Compose: Deprecate `withState` in favor of `useState`. ([32368](https://github.com/WordPress/gutenberg/pull/32368))
-- Search block : Fix vertical alignment of search button text. ([32340](https://github.com/WordPress/gutenberg/pull/32340))
-- Prefix build with node command for Windows environments. (#32258). ([32329](https://github.com/WordPress/gutenberg/pull/32329))
-- Remove metaboxes from template mode. ([32315](https://github.com/WordPress/gutenberg/pull/32315))
-- Revert "Alignment styles: Centre blocks using grid not margins". ([32312](https://github.com/WordPress/gutenberg/pull/32312))
-- Multi select: Add end-to-end test for gruadual select all. ([32304](https://github.com/WordPress/gutenberg/pull/32304))
-- Avoid unnecessary calculation or animation if tooltip is invisible. ([32289](https://github.com/WordPress/gutenberg/pull/32289))
-- Try: Remove opacity animation on canvas. ([32266](https://github.com/WordPress/gutenberg/pull/32266))
-- components: Add `BaseField`. ([32250](https://github.com/WordPress/gutenberg/pull/32250))
-- Workflows: Performance: Run suite atop latest stable major WordPress version. ([32244](https://github.com/WordPress/gutenberg/pull/32244))
-- Skip tests that are failing with latest WordPress core. ([32228](https://github.com/WordPress/gutenberg/pull/32228))
-- components: Add types to Icon. ([32219](https://github.com/WordPress/gutenberg/pull/32219))
-- components: Remove all `withNext` wrappers. ([32205](https://github.com/WordPress/gutenberg/pull/32205))
-- Only calculate the compressed size on pull requests when necessary. ([32161](https://github.com/WordPress/gutenberg/pull/32161))
-- Limit when workflows run on forks. ([32114](https://github.com/WordPress/gutenberg/pull/32114))
-- Navigation Editor: Move modal state to ManageLocations component. ([32078](https://github.com/WordPress/gutenberg/pull/32078))
-- Block Navigation: Try using CSS for indentation with known max indent instead of spacer divs. ([32063](https://github.com/WordPress/gutenberg/pull/32063))
-- Update the appearance of the template details popover. ([32042](https://github.com/WordPress/gutenberg/pull/32042))
-- Update the title area in the template editor. ([32037](https://github.com/WordPress/gutenberg/pull/32037))
-- compose: Add types to `useDebounce`. ([32015](https://github.com/WordPress/gutenberg/pull/32015))
-- Try fixing inserting cover block intermittent failure. ([32014](https://github.com/WordPress/gutenberg/pull/32014))
-- Rich text: Remove inline display warning. ([32013](https://github.com/WordPress/gutenberg/pull/32013))
-- Add native block inserter onboarding tooltip. ([32001](https://github.com/WordPress/gutenberg/pull/32001))
-- Improve parsing and retrieve additional data in REST url-details endpoint. ([31763](https://github.com/WordPress/gutenberg/pull/31763))
-- Update Modal styling. ([31639](https://github.com/WordPress/gutenberg/pull/31639))
-- components: Promote Elevation. ([31614](https://github.com/WordPress/gutenberg/pull/31614))
-- components: Add ZStack. ([31613](https://github.com/WordPress/gutenberg/pull/31613))
-- Remove title attribute from NavigationItem inside the site-editor. ([30744](https://github.com/WordPress/gutenberg/pull/30744))
-- Show the label for archives block dropdown. ([30527](https://github.com/WordPress/gutenberg/pull/30527))
-- Components: Add ItemGroup and Item. ([30097](https://github.com/WordPress/gutenberg/pull/30097))
-- Mobile - Slash inserter. ([29772](https://github.com/WordPress/gutenberg/pull/29772))
-- Remove class= wrapper to already wrapped attributes. Issue #29209. ([29214](https://github.com/WordPress/gutenberg/pull/29214))
-- List Block: Add font family to the list block. ([27510](https://github.com/WordPress/gutenberg/pull/27510))
-
-
-
+-   Update iOS Simulator device command in React Native documentation. ([32383](https://github.com/WordPress/gutenberg/pull/32383))
+-   Compose: Deprecate `withState` in favor of `useState`. ([32368](https://github.com/WordPress/gutenberg/pull/32368))
+-   Search block : Fix vertical alignment of search button text. ([32340](https://github.com/WordPress/gutenberg/pull/32340))
+-   Prefix build with node command for Windows environments. (#32258). ([32329](https://github.com/WordPress/gutenberg/pull/32329))
+-   Remove metaboxes from template mode. ([32315](https://github.com/WordPress/gutenberg/pull/32315))
+-   Revert "Alignment styles: Centre blocks using grid not margins". ([32312](https://github.com/WordPress/gutenberg/pull/32312))
+-   Multi select: Add end-to-end test for gruadual select all. ([32304](https://github.com/WordPress/gutenberg/pull/32304))
+-   Avoid unnecessary calculation or animation if tooltip is invisible. ([32289](https://github.com/WordPress/gutenberg/pull/32289))
+-   Try: Remove opacity animation on canvas. ([32266](https://github.com/WordPress/gutenberg/pull/32266))
+-   components: Add `BaseField`. ([32250](https://github.com/WordPress/gutenberg/pull/32250))
+-   Workflows: Performance: Run suite atop latest stable major WordPress version. ([32244](https://github.com/WordPress/gutenberg/pull/32244))
+-   Skip tests that are failing with latest WordPress core. ([32228](https://github.com/WordPress/gutenberg/pull/32228))
+-   components: Add types to Icon. ([32219](https://github.com/WordPress/gutenberg/pull/32219))
+-   components: Remove all `withNext` wrappers. ([32205](https://github.com/WordPress/gutenberg/pull/32205))
+-   Only calculate the compressed size on pull requests when necessary. ([32161](https://github.com/WordPress/gutenberg/pull/32161))
+-   Limit when workflows run on forks. ([32114](https://github.com/WordPress/gutenberg/pull/32114))
+-   Navigation Editor: Move modal state to ManageLocations component. ([32078](https://github.com/WordPress/gutenberg/pull/32078))
+-   Block Navigation: Try using CSS for indentation with known max indent instead of spacer divs. ([32063](https://github.com/WordPress/gutenberg/pull/32063))
+-   Update the appearance of the template details popover. ([32042](https://github.com/WordPress/gutenberg/pull/32042))
+-   Update the title area in the template editor. ([32037](https://github.com/WordPress/gutenberg/pull/32037))
+-   compose: Add types to `useDebounce`. ([32015](https://github.com/WordPress/gutenberg/pull/32015))
+-   Try fixing inserting cover block intermittent failure. ([32014](https://github.com/WordPress/gutenberg/pull/32014))
+-   Rich text: Remove inline display warning. ([32013](https://github.com/WordPress/gutenberg/pull/32013))
+-   Add native block inserter onboarding tooltip. ([32001](https://github.com/WordPress/gutenberg/pull/32001))
+-   Improve parsing and retrieve additional data in REST url-details endpoint. ([31763](https://github.com/WordPress/gutenberg/pull/31763))
+-   Update Modal styling. ([31639](https://github.com/WordPress/gutenberg/pull/31639))
+-   components: Promote Elevation. ([31614](https://github.com/WordPress/gutenberg/pull/31614))
+-   components: Add ZStack. ([31613](https://github.com/WordPress/gutenberg/pull/31613))
+-   Remove title attribute from NavigationItem inside the site-editor. ([30744](https://github.com/WordPress/gutenberg/pull/30744))
+-   Show the label for archives block dropdown. ([30527](https://github.com/WordPress/gutenberg/pull/30527))
+-   Components: Add ItemGroup and Item. ([30097](https://github.com/WordPress/gutenberg/pull/30097))
+-   Mobile - Slash inserter. ([29772](https://github.com/WordPress/gutenberg/pull/29772))
+-   Remove class= wrapper to already wrapped attributes. Issue #29209. ([29214](https://github.com/WordPress/gutenberg/pull/29214))
+-   List Block: Add font family to the list block. ([27510](https://github.com/WordPress/gutenberg/pull/27510))
 
 = 10.7.1 =
 
-
+## Changelog
 
 ### Bug Fixes
 
-- Latest Posts: Declare 'hasPosts' before 'inspectorControls'. ([32160](https://github.com/WordPress/gutenberg/pull/32160))
-- Fix image/cover transform duotone error. ([32006](https://github.com/WordPress/gutenberg/pull/32006))
+-   Latest Posts: Declare 'hasPosts' before 'inspectorControls'. ([32160](https://github.com/WordPress/gutenberg/pull/32160))
+-   Fix image/cover transform duotone error. ([32006](https://github.com/WordPress/gutenberg/pull/32006))
 
 ### Various
 
-- Block Patterns API: Update for core compatibility. ([32240](https://github.com/WordPress/gutenberg/pull/32240))
-- [Patterns]: Prepare GB bundled patterns for core back port. ([32086](https://github.com/WordPress/gutenberg/pull/32086))
-
-
-
+-   Block Patterns API: Update for core compatibility. ([32240](https://github.com/WordPress/gutenberg/pull/32240))
+-   [Patterns]: Prepare GB bundled patterns for core back port. ([32086](https://github.com/WordPress/gutenberg/pull/32086))
 
 = 10.7.0 =
 
+## Changelog
+
 ### Enhancements
 
-- Block Editor:
-    - Standardize block styles cursor on hover. ([31188](https://github.com/WordPress/gutenberg/pull/31188))
-    - Support scripts in iframed editors. ([31873](https://github.com/WordPress/gutenberg/pull/31873))
-- Block Library:
-    - Normalize theme block toolbars. ([31952](https://github.com/WordPress/gutenberg/pull/31952))
-    - Buttons: Use `column-gap` for styling. ([31386](https://github.com/WordPress/gutenberg/pull/31386))
-    - Column: Add color and padding support to individual column block. ([31778](https://github.com/WordPress/gutenberg/pull/31778))
-    - Cover: Allow transforming from group block. ([30890](https://github.com/WordPress/gutenberg/pull/30890))
-    - Media & Text: Add media width control. ([31002](https://github.com/WordPress/gutenberg/pull/31002))
-    - Post Comments: Add basic CSS to the block. ([30382](https://github.com/WordPress/gutenberg/pull/30382))
-    - Post Excerpt: Update `read more` placeholder text. ([30959](https://github.com/WordPress/gutenberg/pull/30959))
-    - Post Featured Image: Change wrapper element to `figure`. ([31595](https://github.com/WordPress/gutenberg/pull/31595))
-    - Query:
-        - Add `layout` and `color` support. ([31833](https://github.com/WordPress/gutenberg/pull/31833))
-        - Update bundled patterns to have `inherit:False`. ([31856](https://github.com/WordPress/gutenberg/pull/31856))
-        - Allow term addition from user case-insensitive input. ([31301](https://github.com/WordPress/gutenberg/pull/31301))
-    - Site Logo:
-        - Add link toggle option. ([31162](https://github.com/WordPress/gutenberg/pull/31162))
-        - Use `custom_logo` theme-mod instead of `site_logo` setting for the site-logo block. ([31994](https://github.com/WordPress/gutenberg/pull/31994))
-    - Site Tagline:
-        - Add margin block support. ([31809](https://github.com/WordPress/gutenberg/pull/31809))
-        - Expand the site tagline block description. ([31426](https://github.com/WordPress/gutenberg/pull/31426))
-    - Site Title:
-        - Add additional text formatting options. ([31734](https://github.com/WordPress/gutenberg/pull/31734))
-        - Add margin block support. ([31728](https://github.com/WordPress/gutenberg/pull/31728))
-    - Social Links: Add some padding to the "click plus to add". ([31927](https://github.com/WordPress/gutenberg/pull/31927))
-- Components
-    - Add Spacer. ([31509](https://github.com/WordPress/gutenberg/pull/31509))
-    - Improve display for multiple action buttons in notices. ([31799](https://github.com/WordPress/gutenberg/pull/31799))
-    - Polish the switcher for horizontal blocks. ([31645](https://github.com/WordPress/gutenberg/pull/31645))
-    - Promote Divider and use readable prop names. ([31556](https://github.com/WordPress/gutenberg/pull/31556))
-    - Promote Grid. ([31559](https://github.com/WordPress/gutenberg/pull/31559))
-    - Promote View. ([31542](https://github.com/WordPress/gutenberg/pull/31542))
-    - Promote VStack and HStack. ([31300](https://github.com/WordPress/gutenberg/pull/31300))
-    - UnitControl: Add support for unit step per unit type. ([30376](https://github.com/WordPress/gutenberg/pull/30376))
-- Design tools:
-    - Add margin block support with configurable sides. ([30608](https://github.com/WordPress/gutenberg/pull/30608))
-    - Add option to disable duotone. ([32002](https://github.com/WordPress/gutenberg/pull/32002))
-    - Add reset button to Layout controls. ([30828](https://github.com/WordPress/gutenberg/pull/30828))
-    - Add server-side support for margins. ([31808](https://github.com/WordPress/gutenberg/pull/31808))
-- Icons: Update icons. ([31533](https://github.com/WordPress/gutenberg/pull/31533))
-- List View:
-    - Display block anchor in List View when set. ([31992](https://github.com/WordPress/gutenberg/pull/31992))
-    - Enable persistent List View in the post editor. ([31047](https://github.com/WordPress/gutenberg/pull/31047))
-- Patterns: Load patterns from wordpress.org API. ([28800](https://github.com/WordPress/gutenberg/pull/28800))
-- Template Editing Mode:
-    - Add a welcome guide to the template editor. ([31330](https://github.com/WordPress/gutenberg/pull/31330)) ([32055](https://github.com/WordPress/gutenberg/pull/32055))
-    - Add a `Delete template` action. ([31678](https://github.com/WordPress/gutenberg/pull/31678))
-- Word count: Adjust to count numbers as words. ([27288](https://github.com/WordPress/gutenberg/pull/27288))
+-   Block Editor:
+    -   Standardize block styles cursor on hover. ([31188](https://github.com/WordPress/gutenberg/pull/31188))
+    -   Support scripts in iframed editors. ([31873](https://github.com/WordPress/gutenberg/pull/31873))
+-   Block Library:
+    -   Normalize theme block toolbars. ([31952](https://github.com/WordPress/gutenberg/pull/31952))
+    -   Buttons: Use `column-gap` for styling. ([31386](https://github.com/WordPress/gutenberg/pull/31386))
+    -   Column: Add color and padding support to individual column block. ([31778](https://github.com/WordPress/gutenberg/pull/31778))
+    -   Cover: Allow transforming from group block. ([30890](https://github.com/WordPress/gutenberg/pull/30890))
+    -   Media & Text: Add media width control. ([31002](https://github.com/WordPress/gutenberg/pull/31002))
+    -   Post Comments: Add basic CSS to the block. ([30382](https://github.com/WordPress/gutenberg/pull/30382))
+    -   Post Excerpt: Update `read more` placeholder text. ([30959](https://github.com/WordPress/gutenberg/pull/30959))
+    -   Post Featured Image: Change wrapper element to `figure`. ([31595](https://github.com/WordPress/gutenberg/pull/31595))
+    -   Query:
+        -   Add `layout` and `color` support. ([31833](https://github.com/WordPress/gutenberg/pull/31833))
+        -   Update bundled patterns to have `inherit:False`. ([31856](https://github.com/WordPress/gutenberg/pull/31856))
+        -   Allow term addition from user case-insensitive input. ([31301](https://github.com/WordPress/gutenberg/pull/31301))
+    -   Site Logo:
+        -   Add link toggle option. ([31162](https://github.com/WordPress/gutenberg/pull/31162))
+        -   Use `custom_logo` theme-mod instead of `site_logo` setting for the site-logo block. ([31994](https://github.com/WordPress/gutenberg/pull/31994))
+    -   Site Tagline:
+        -   Add margin block support. ([31809](https://github.com/WordPress/gutenberg/pull/31809))
+        -   Expand the site tagline block description. ([31426](https://github.com/WordPress/gutenberg/pull/31426))
+    -   Site Title:
+        -   Add additional text formatting options. ([31734](https://github.com/WordPress/gutenberg/pull/31734))
+        -   Add margin block support. ([31728](https://github.com/WordPress/gutenberg/pull/31728))
+    -   Social Links: Add some padding to the "click plus to add". ([31927](https://github.com/WordPress/gutenberg/pull/31927))
+-   Components
+    -   Add Spacer. ([31509](https://github.com/WordPress/gutenberg/pull/31509))
+    -   Improve display for multiple action buttons in notices. ([31799](https://github.com/WordPress/gutenberg/pull/31799))
+    -   Polish the switcher for horizontal blocks. ([31645](https://github.com/WordPress/gutenberg/pull/31645))
+    -   Promote Divider and use readable prop names. ([31556](https://github.com/WordPress/gutenberg/pull/31556))
+    -   Promote Grid. ([31559](https://github.com/WordPress/gutenberg/pull/31559))
+    -   Promote View. ([31542](https://github.com/WordPress/gutenberg/pull/31542))
+    -   Promote VStack and HStack. ([31300](https://github.com/WordPress/gutenberg/pull/31300))
+    -   UnitControl: Add support for unit step per unit type. ([30376](https://github.com/WordPress/gutenberg/pull/30376))
+-   Design tools:
+    -   Add margin block support with configurable sides. ([30608](https://github.com/WordPress/gutenberg/pull/30608))
+    -   Add option to disable duotone. ([32002](https://github.com/WordPress/gutenberg/pull/32002))
+    -   Add reset button to Layout controls. ([30828](https://github.com/WordPress/gutenberg/pull/30828))
+    -   Add server-side support for margins. ([31808](https://github.com/WordPress/gutenberg/pull/31808))
+-   Icons: Update icons. ([31533](https://github.com/WordPress/gutenberg/pull/31533))
+-   List View:
+    -   Display block anchor in List View when set. ([31992](https://github.com/WordPress/gutenberg/pull/31992))
+    -   Enable persistent List View in the post editor. ([31047](https://github.com/WordPress/gutenberg/pull/31047))
+-   Patterns: Load patterns from wordpress.org API. ([28800](https://github.com/WordPress/gutenberg/pull/28800))
+-   Template Editing Mode:
+    -   Add a welcome guide to the template editor. ([31330](https://github.com/WordPress/gutenberg/pull/31330)) ([32055](https://github.com/WordPress/gutenberg/pull/32055))
+    -   Add a `Delete template` action. ([31678](https://github.com/WordPress/gutenberg/pull/31678))
+-   Word count: Adjust to count numbers as words. ([27288](https://github.com/WordPress/gutenberg/pull/27288))
 
 ### New APIs
 
-- Babel Preset Default: Configure @babel/preset-env preset to respect a local Browserslist configuration. ([31898](https://github.com/WordPress/gutenberg/pull/31898))
-- Blocks: Deprecate `registerBlockTypeFromMetadata` in favor of `registerBlockType`. ([32030](https://github.com/WordPress/gutenberg/pull/32030))
-- Global Styles: Rename and stabilize `useEditorFeature` as `useSetting`. ([31587](https://github.com/WordPress/gutenberg/pull/31587))
-- Stacked/unified block toolbar. ([31134](https://github.com/WordPress/gutenberg/pull/31134))
-- Babel Preset Default: Add polyfill for WordPress built from core-js. ([31279](https://github.com/WordPress/gutenberg/pull/31279))
-
-### Bug Fixes
-
-- Block Library:
-    - Cover:
-        - Remove fixed background when previewed in patterns list. ([31640](https://github.com/WordPress/gutenberg/pull/31640))
-        - Show placeholder only if it has no inner blocks. ([31402](https://github.com/WordPress/gutenberg/pull/31402))
-    - Gallery:
-        - Fix focus caption prop for native. ([32029](https://github.com/WordPress/gutenberg/pull/32029))
-        - Fix identical images getting duplicated when moving. ([30555](https://github.com/WordPress/gutenberg/pull/30555))
-    - Image:
-        - Remove figure margins consistently in image blocks. ([31650](https://github.com/WordPress/gutenberg/pull/31650))
-        - Fix cover transform and excessive re-rendering. ([32102](https://github.com/WordPress/gutenberg/pull/32102))
-    - Post Content: Apply the_content filter even if content is empty. ([31997](https://github.com/WordPress/gutenberg/pull/31997))
-    - Post Comments Count: Fix attributes declaration. ([31976](https://github.com/WordPress/gutenberg/pull/31976))
-    - Post Comment Form:
-        - Fix stylesheet dependency. ([31528](https://github.com/WordPress/gutenberg/pull/31528))
-        - Fix to allow post comment button to inherit button & global styles automatically. ([31338](https://github.com/WordPress/gutenberg/pull/31338))
-    - Post Featured Image:
-        - Fix non-interactive placeholder when outside of a post context. ([31663](https://github.com/WordPress/gutenberg/pull/31663))
-        - Fix placeholder regression. ([31709](https://github.com/WordPress/gutenberg/pull/31709))
-        - Fix selection scroll into view. ([31835](https://github.com/WordPress/gutenberg/pull/31835))
-        - Fix image width for wide aligned Post featured image. ([32070](https://github.com/WordPress/gutenberg/pull/32070))
-    - Site Logo:
-        - Fix duplicate `supports` declaration. ([31544](https://github.com/WordPress/gutenberg/pull/31544))
-        - Return nothing if logo is not set. ([31513](https://github.com/WordPress/gutenberg/pull/31513))
-        - Only request media entity when a site logo has been chosen. ([31673](https://github.com/WordPress/gutenberg/pull/31673))
-    - Template Part:
-        - Don't show the currently used template part as an option in the 'replace' flow. ([31720](https://github.com/WordPress/gutenberg/pull/31720))
-        - Fix template part selection searches to use title/area instead of slug/theme. ([31520](https://github.com/WordPress/gutenberg/pull/31520))
-        - Use label and icon per variation when displaying placeholders. ([31721](https://github.com/WordPress/gutenberg/pull/31721))
-- Block Editor:
-    - Clear selection on iframe html element click, fix bottom click redirect. ([31385](https://github.com/WordPress/gutenberg/pull/31385))
-    - Fix block ref when multiple useBlockProps hooks are called. ([31906](https://github.com/WordPress/gutenberg/pull/31906))
-    - Fix moving animation for nested blocks. ([31945](https://github.com/WordPress/gutenberg/pull/31945))
-    - Fix selecting aligned blocks. ([31904](https://github.com/WordPress/gutenberg/pull/31904))
-    - Fix scrolling to the inserted block issue in the iFramed block editor. ([31448](https://github.com/WordPress/gutenberg/pull/31448))
-    - Prevent rendering self also when the wrapper block matches the inserted block. ([31592](https://github.com/WordPress/gutenberg/pull/31592))
-    - Toolbar:
-        - Fix showing toolbar when caret enters formatting (and extract as implementation detail for the block editor). ([31664](https://github.com/WordPress/gutenberg/pull/31664))
-        - Fix toolbar in device preview. ([31600](https://github.com/WordPress/gutenberg/pull/31600))
-- Design tools:
-    - BoxControl:
-        - Filter out unit only values when checking values defined. ([31779](https://github.com/WordPress/gutenberg/pull/31779))
-        - Fix tooltip display for unlinked box control inputs. ([31741](https://github.com/WordPress/gutenberg/pull/31741))
-    - Color picker:
-        - Fixes color picker segmented control rendering and scrolling issues. ([30994](https://github.com/WordPress/gutenberg/pull/30994))
-        - Fix text. ([30039](https://github.com/WordPress/gutenberg/pull/30039))
-    - Duotone:
-        - Fix duotone transform not transferring settings between blocks. ([31801](https://github.com/WordPress/gutenberg/pull/31801))
-        - Fix duotone padding crash. ([31780](https://github.com/WordPress/gutenberg/pull/31780))
-    - Font-family: Fix typo in font-family supports for dynamic blocks. ([31974](https://github.com/WordPress/gutenberg/pull/31974))
-    - Spacing Support:
-        - Properly hide UI for disabled properties. ([31726](https://github.com/WordPress/gutenberg/pull/31726))
-        - Fix custom units for margin. ([31776](https://github.com/WordPress/gutenberg/pull/31776))
-- Inserter: Hide patterns tab if no patterns are available. ([31687](https://github.com/WordPress/gutenberg/pull/31687))
-- Patterns:
-    - Check for allowed blocks recursively in patterns. ([30366](https://github.com/WordPress/gutenberg/pull/30366))
-    - Fix unregister_block_pattern notices. ([32025](https://github.com/WordPress/gutenberg/pull/32025))
-- Post Editor: Fix template name displaying incorrectly. ([32035](https://github.com/WordPress/gutenberg/pull/32035))
-- Server Side Rendering: Re-enable passing post_id query arg (#31786). ([31787](https://github.com/WordPress/gutenberg/pull/31787))
-- Template Editing Mode: Fix wrapper block name for template mode. ([31985](https://github.com/WordPress/gutenberg/pull/31985))
-- Writing flow, multi-selection:
-    - Fix caret placing when the target is out of view. ([31506](https://github.com/WordPress/gutenberg/pull/31506))
-    - Gradually 'select all' layers of nested blocks. ([31859](https://github.com/WordPress/gutenberg/pull/31859))
-- Fix errors caused by commits to WordPress core. ([32176](https://github.com/WordPress/gutenberg/pull/32176)) ([32183](https://github.com/WordPress/gutenberg/pull/32183)) ([32059](https://github.com/WordPress/gutenberg/pull/32059))
-- Components: Fix the list of package dependencies. ([32167](https://github.com/WordPress/gutenberg/pull/32167))
-- Fix issue with customizer title overlapping block toolbar. ([32140](https://github.com/WordPress/gutenberg/pull/32140))
-- Correctly read rawRequest for frontend ESM. ([31917](https://github.com/WordPress/gutenberg/pull/31917))
-- Fix generation of presets classes per block. ([32190](https://github.com/WordPress/gutenberg/pull/32190))
-- Widget Screen:
-    - Fix unsaved changes notification. ([31757](https://github.com/WordPress/gutenberg/pull/31757))
-    - Fix call to undefined __experimentalRegisterExperimentalCoreBlocks. ([32138](https://github.com/WordPress/gutenberg/pull/32138))
+-   Babel Preset Default: Configure @babel/preset-env preset to respect a local Browserslist configuration. ([31898](https://github.com/WordPress/gutenberg/pull/31898))
+-   Blocks: Deprecate `registerBlockTypeFromMetadata` in favor of `registerBlockType`. ([32030](https://github.com/WordPress/gutenberg/pull/32030))
+-   Global Styles: Rename and stabilize `useEditorFeature` as `useSetting`. ([31587](https://github.com/WordPress/gutenberg/pull/31587))
+-   Stacked/unified block toolbar. ([31134](https://github.com/WordPress/gutenberg/pull/31134))
+-   Babel Preset Default: Add polyfill for WordPress built from core-js. ([31279](https://github.com/WordPress/gutenberg/pull/31279))
+
+### Bug Fixes
+
+-   Block Library:
+    -   Cover:
+        -   Remove fixed background when previewed in patterns list. ([31640](https://github.com/WordPress/gutenberg/pull/31640))
+        -   Show placeholder only if it has no inner blocks. ([31402](https://github.com/WordPress/gutenberg/pull/31402))
+    -   Gallery:
+        -   Fix focus caption prop for native. ([32029](https://github.com/WordPress/gutenberg/pull/32029))
+        -   Fix identical images getting duplicated when moving. ([30555](https://github.com/WordPress/gutenberg/pull/30555))
+    -   Image:
+        -   Remove figure margins consistently in image blocks. ([31650](https://github.com/WordPress/gutenberg/pull/31650))
+        -   Fix cover transform and excessive re-rendering. ([32102](https://github.com/WordPress/gutenberg/pull/32102))
+    -   Post Content: Apply the_content filter even if content is empty. ([31997](https://github.com/WordPress/gutenberg/pull/31997))
+    -   Post Comments Count: Fix attributes declaration. ([31976](https://github.com/WordPress/gutenberg/pull/31976))
+    -   Post Comment Form:
+        -   Fix stylesheet dependency. ([31528](https://github.com/WordPress/gutenberg/pull/31528))
+        -   Fix to allow post comment button to inherit button & global styles automatically. ([31338](https://github.com/WordPress/gutenberg/pull/31338))
+    -   Post Featured Image:
+        -   Fix non-interactive placeholder when outside of a post context. ([31663](https://github.com/WordPress/gutenberg/pull/31663))
+        -   Fix placeholder regression. ([31709](https://github.com/WordPress/gutenberg/pull/31709))
+        -   Fix selection scroll into view. ([31835](https://github.com/WordPress/gutenberg/pull/31835))
+        -   Fix image width for wide aligned Post featured image. ([32070](https://github.com/WordPress/gutenberg/pull/32070))
+    -   Site Logo:
+        -   Fix duplicate `supports` declaration. ([31544](https://github.com/WordPress/gutenberg/pull/31544))
+        -   Return nothing if logo is not set. ([31513](https://github.com/WordPress/gutenberg/pull/31513))
+        -   Only request media entity when a site logo has been chosen. ([31673](https://github.com/WordPress/gutenberg/pull/31673))
+    -   Template Part:
+        -   Don't show the currently used template part as an option in the 'replace' flow. ([31720](https://github.com/WordPress/gutenberg/pull/31720))
+        -   Fix template part selection searches to use title/area instead of slug/theme. ([31520](https://github.com/WordPress/gutenberg/pull/31520))
+        -   Use label and icon per variation when displaying placeholders. ([31721](https://github.com/WordPress/gutenberg/pull/31721))
+-   Block Editor:
+    -   Clear selection on iframe html element click, fix bottom click redirect. ([31385](https://github.com/WordPress/gutenberg/pull/31385))
+    -   Fix block ref when multiple useBlockProps hooks are called. ([31906](https://github.com/WordPress/gutenberg/pull/31906))
+    -   Fix moving animation for nested blocks. ([31945](https://github.com/WordPress/gutenberg/pull/31945))
+    -   Fix selecting aligned blocks. ([31904](https://github.com/WordPress/gutenberg/pull/31904))
+    -   Fix scrolling to the inserted block issue in the iFramed block editor. ([31448](https://github.com/WordPress/gutenberg/pull/31448))
+    -   Prevent rendering self also when the wrapper block matches the inserted block. ([31592](https://github.com/WordPress/gutenberg/pull/31592))
+    -   Toolbar:
+        -   Fix showing toolbar when caret enters formatting (and extract as implementation detail for the block editor). ([31664](https://github.com/WordPress/gutenberg/pull/31664))
+        -   Fix toolbar in device preview. ([31600](https://github.com/WordPress/gutenberg/pull/31600))
+-   Design tools:
+    -   BoxControl:
+        -   Filter out unit only values when checking values defined. ([31779](https://github.com/WordPress/gutenberg/pull/31779))
+        -   Fix tooltip display for unlinked box control inputs. ([31741](https://github.com/WordPress/gutenberg/pull/31741))
+    -   Color picker:
+        -   Fixes color picker segmented control rendering and scrolling issues. ([30994](https://github.com/WordPress/gutenberg/pull/30994))
+        -   Fix text. ([30039](https://github.com/WordPress/gutenberg/pull/30039))
+    -   Duotone:
+        -   Fix duotone transform not transferring settings between blocks. ([31801](https://github.com/WordPress/gutenberg/pull/31801))
+        -   Fix duotone padding crash. ([31780](https://github.com/WordPress/gutenberg/pull/31780))
+    -   Font-family: Fix typo in font-family supports for dynamic blocks. ([31974](https://github.com/WordPress/gutenberg/pull/31974))
+    -   Spacing Support:
+        -   Properly hide UI for disabled properties. ([31726](https://github.com/WordPress/gutenberg/pull/31726))
+        -   Fix custom units for margin. ([31776](https://github.com/WordPress/gutenberg/pull/31776))
+-   Inserter: Hide patterns tab if no patterns are available. ([31687](https://github.com/WordPress/gutenberg/pull/31687))
+-   Patterns:
+    -   Check for allowed blocks recursively in patterns. ([30366](https://github.com/WordPress/gutenberg/pull/30366))
+    -   Fix unregister_block_pattern notices. ([32025](https://github.com/WordPress/gutenberg/pull/32025))
+-   Post Editor: Fix template name displaying incorrectly. ([32035](https://github.com/WordPress/gutenberg/pull/32035))
+-   Server Side Rendering: Re-enable passing post_id query arg (#31786). ([31787](https://github.com/WordPress/gutenberg/pull/31787))
+-   Template Editing Mode: Fix wrapper block name for template mode. ([31985](https://github.com/WordPress/gutenberg/pull/31985))
+-   Writing flow, multi-selection:
+    -   Fix caret placing when the target is out of view. ([31506](https://github.com/WordPress/gutenberg/pull/31506))
+    -   Gradually 'select all' layers of nested blocks. ([31859](https://github.com/WordPress/gutenberg/pull/31859))
+-   Fix errors caused by commits to WordPress core. ([32176](https://github.com/WordPress/gutenberg/pull/32176)) ([32183](https://github.com/WordPress/gutenberg/pull/32183)) ([32059](https://github.com/WordPress/gutenberg/pull/32059))
+-   Components: Fix the list of package dependencies. ([32167](https://github.com/WordPress/gutenberg/pull/32167))
+-   Fix issue with customizer title overlapping block toolbar. ([32140](https://github.com/WordPress/gutenberg/pull/32140))
+-   Correctly read rawRequest for frontend ESM. ([31917](https://github.com/WordPress/gutenberg/pull/31917))
+-   Fix generation of presets classes per block. ([32190](https://github.com/WordPress/gutenberg/pull/32190))
+-   Widget Screen:
+    -   Fix unsaved changes notification. ([31757](https://github.com/WordPress/gutenberg/pull/31757))
+    -   Fix call to undefined \_\_experimentalRegisterExperimentalCoreBlocks. ([32138](https://github.com/WordPress/gutenberg/pull/32138))
 
 ### Performance
 
-- Block editor styles: Memoize transform. ([31553](https://github.com/WordPress/gutenberg/pull/31553))
-- Block editor async mode: Enable only for blocks out of view. ([30995](https://github.com/WordPress/gutenberg/pull/30995))
-- Improve performance of term search. ([31703](https://github.com/WordPress/gutenberg/pull/31703))
-- Blocks package: Memoize getBlockVariations selector. ([32120](https://github.com/WordPress/gutenberg/pull/32120))
+-   Block editor styles: Memoize transform. ([31553](https://github.com/WordPress/gutenberg/pull/31553))
+-   Block editor async mode: Enable only for blocks out of view. ([30995](https://github.com/WordPress/gutenberg/pull/30995))
+-   Improve performance of term search. ([31703](https://github.com/WordPress/gutenberg/pull/31703))
+-   Blocks package: Memoize getBlockVariations selector. ([32120](https://github.com/WordPress/gutenberg/pull/32120))
 
 ### Experiments
 
-- Block Library: Hide the PostAuthor block behind the Gutenberg experimental flag. ([31983](https://github.com/WordPress/gutenberg/pull/31983))
-- Block-based Widgets:
-    - API:
-        - Improve `get_merged_data` API so it requires less knowledge from the consumer. ([31552](https://github.com/WordPress/gutenberg/pull/31552))
-    - Customizer:
-        - Add 'more' menu. ([31970](https://github.com/WordPress/gutenberg/pull/31970))
-        - Add undo redo to Widgets Customizer. ([31653](https://github.com/WordPress/gutenberg/pull/31653))
-        - Add Welcome messaging. ([31968](https://github.com/WordPress/gutenberg/pull/31968))
-        - Clear selected block when focusing on element outside the editor. ([31530](https://github.com/WordPress/gutenberg/pull/31530))
-        - Fix removing legacy widget not working in customizer. ([31535](https://github.com/WordPress/gutenberg/pull/31535))
-        - Implement mobile responsive block toolbar. ([31589](https://github.com/WordPress/gutenberg/pull/31589))
-        - Remove Widgets Customizer experimental flag. ([31876](https://github.com/WordPress/gutenberg/pull/31876))
-    - Widgets Editor:
-        - Add default notices support. ([31578](https://github.com/WordPress/gutenberg/pull/31578))
-        - Add more menu. ([31926](https://github.com/WordPress/gutenberg/pull/31926))
-        - Add Welcome Guide. ([31925](https://github.com/WordPress/gutenberg/pull/31925))
-        - Remove widget screen empty link in admin. ([31408](https://github.com/WordPress/gutenberg/pull/31408))
-        - Update toolbar and notice positioning. ([31582](https://github.com/WordPress/gutenberg/pull/31582))
-- Navigation Editor and Block:
-    - Add home link block. ([30926](https://github.com/WordPress/gutenberg/pull/30926))
-    - API:
-        - Add locations to the menu response. ([31656](https://github.com/WordPress/gutenberg/pull/31656))
-        - Change default to 100 menu items returned. ([21243](https://github.com/WordPress/gutenberg/pull/21243))
-    - Allow space between on page list. ([29771](https://github.com/WordPress/gutenberg/pull/29771))
-    - Bring implementations of convert nav menu items to blocks back into sync. ([31602](https://github.com/WordPress/gutenberg/pull/31602))
-    - Editor:
-        - "Add new pages" use menu entity. ([31643](https://github.com/WordPress/gutenberg/pull/31643))
-        - Add padding for navigation screen. ([31583](https://github.com/WordPress/gutenberg/pull/31583))
-        - Clear 'stub' navigation post edits on save. ([31735](https://github.com/WordPress/gutenberg/pull/31735))
-        - Fix menu location assignment. ([31594](https://github.com/WordPress/gutenberg/pull/31594))
-        - Fix editor margin. ([31493](https://github.com/WordPress/gutenberg/pull/31493))
-        - On mobile viewports, reveal the block inspector when clicking the menu name button. ([31220](https://github.com/WordPress/gutenberg/pull/31220))
-        - Update sidebar. ([31821](https://github.com/WordPress/gutenberg/pull/31821))
-        - Warn the user about unsaved changes. ([31197](https://github.com/WordPress/gutenberg/pull/31197))
-    - Enable justification for burger menu. ([31877](https://github.com/WordPress/gutenberg/pull/31877))
-    - Extract Navigation Block data fetching and management to hook(s). ([31825](https://github.com/WordPress/gutenberg/pull/31825))
-    - Fix nav block hover z index. ([31929](https://github.com/WordPress/gutenberg/pull/31929))
-    - Fix nav placeholder colors and height. ([31875](https://github.com/WordPress/gutenberg/pull/31875))
-    - Improve the navigation block setup state / placeholder. ([31371](https://github.com/WordPress/gutenberg/pull/31371))
-    - Introduce `useMenuEntityProp` hook. ([31132](https://github.com/WordPress/gutenberg/pull/31132))
-    - Normalize converting nav menu items to blocks between Editor and Block. ([31606](https://github.com/WordPress/gutenberg/pull/31606))
-    - Responsive Navigation. ([30047](https://github.com/WordPress/gutenberg/pull/30047))
-    - Submenus shouldn't take space unless they're actually open. ([31881](https://github.com/WordPress/gutenberg/pull/31881))
-- Global Styles
-    - Block Supports: Allow skipping serialization of typography attributes. ([30880](https://github.com/WordPress/gutenberg/pull/30880))
-    - Fix condition for global styles on mobile. ([31844](https://github.com/WordPress/gutenberg/pull/31844))
-    - Fix global styles settings retrieval for REST. ([31534](https://github.com/WordPress/gutenberg/pull/31534))
-    - Make core color classes and custom properties always available. ([31669](https://github.com/WordPress/gutenberg/pull/31669))
-    - Remove color.link from valid styles and alphabetize the rest. ([31516](https://github.com/WordPress/gutenberg/pull/31516))
-    - Return consolidated global styles in REST Request. ([31762](https://github.com/WordPress/gutenberg/pull/31762))
-    - Use elements mechanism for link color instead of a CSS variable. ([31524](https://github.com/WordPress/gutenberg/pull/31524))
-    - Use mobile context in settings request & global styles. ([31819](https://github.com/WordPress/gutenberg/pull/31819))
-    - Use wp_theme taxonomy for wp_global_styles cpt. ([31436](https://github.com/WordPress/gutenberg/pull/31436))
-    - Theme.json:
-        - Make the `theme.json` examples copy-pasteable. ([32040](https://github.com/WordPress/gutenberg/pull/32040))
-        - Replace hardcoded `CSS_UNITS` and inherit units from `theme.json`. ([31822](https://github.com/WordPress/gutenberg/pull/31822))
-- Full Site Editing:
-    - Template Loader: Make templates arg required. ([31671](https://github.com/WordPress/gutenberg/pull/31671))
-    - Simplify template loader logic. ([31604](https://github.com/WordPress/gutenberg/pull/31604))
+-   Block Library: Hide the PostAuthor block behind the Gutenberg experimental flag. ([31983](https://github.com/WordPress/gutenberg/pull/31983))
+-   Block-based Widgets:
+    -   API:
+        -   Improve `get_merged_data` API so it requires less knowledge from the consumer. ([31552](https://github.com/WordPress/gutenberg/pull/31552))
+    -   Customizer:
+        -   Add 'more' menu. ([31970](https://github.com/WordPress/gutenberg/pull/31970))
+        -   Add undo redo to Widgets Customizer. ([31653](https://github.com/WordPress/gutenberg/pull/31653))
+        -   Add Welcome messaging. ([31968](https://github.com/WordPress/gutenberg/pull/31968))
+        -   Clear selected block when focusing on element outside the editor. ([31530](https://github.com/WordPress/gutenberg/pull/31530))
+        -   Fix removing legacy widget not working in customizer. ([31535](https://github.com/WordPress/gutenberg/pull/31535))
+        -   Implement mobile responsive block toolbar. ([31589](https://github.com/WordPress/gutenberg/pull/31589))
+        -   Remove Widgets Customizer experimental flag. ([31876](https://github.com/WordPress/gutenberg/pull/31876))
+    -   Widgets Editor:
+        -   Add default notices support. ([31578](https://github.com/WordPress/gutenberg/pull/31578))
+        -   Add more menu. ([31926](https://github.com/WordPress/gutenberg/pull/31926))
+        -   Add Welcome Guide. ([31925](https://github.com/WordPress/gutenberg/pull/31925))
+        -   Remove widget screen empty link in admin. ([31408](https://github.com/WordPress/gutenberg/pull/31408))
+        -   Update toolbar and notice positioning. ([31582](https://github.com/WordPress/gutenberg/pull/31582))
+-   Navigation Editor and Block:
+    -   Add home link block. ([30926](https://github.com/WordPress/gutenberg/pull/30926))
+    -   API:
+        -   Add locations to the menu response. ([31656](https://github.com/WordPress/gutenberg/pull/31656))
+        -   Change default to 100 menu items returned. ([21243](https://github.com/WordPress/gutenberg/pull/21243))
+    -   Allow space between on page list. ([29771](https://github.com/WordPress/gutenberg/pull/29771))
+    -   Bring implementations of convert nav menu items to blocks back into sync. ([31602](https://github.com/WordPress/gutenberg/pull/31602))
+    -   Editor:
+        -   "Add new pages" use menu entity. ([31643](https://github.com/WordPress/gutenberg/pull/31643))
+        -   Add padding for navigation screen. ([31583](https://github.com/WordPress/gutenberg/pull/31583))
+        -   Clear 'stub' navigation post edits on save. ([31735](https://github.com/WordPress/gutenberg/pull/31735))
+        -   Fix menu location assignment. ([31594](https://github.com/WordPress/gutenberg/pull/31594))
+        -   Fix editor margin. ([31493](https://github.com/WordPress/gutenberg/pull/31493))
+        -   On mobile viewports, reveal the block inspector when clicking the menu name button. ([31220](https://github.com/WordPress/gutenberg/pull/31220))
+        -   Update sidebar. ([31821](https://github.com/WordPress/gutenberg/pull/31821))
+        -   Warn the user about unsaved changes. ([31197](https://github.com/WordPress/gutenberg/pull/31197))
+    -   Enable justification for burger menu. ([31877](https://github.com/WordPress/gutenberg/pull/31877))
+    -   Extract Navigation Block data fetching and management to hook(s). ([31825](https://github.com/WordPress/gutenberg/pull/31825))
+    -   Fix nav block hover z index. ([31929](https://github.com/WordPress/gutenberg/pull/31929))
+    -   Fix nav placeholder colors and height. ([31875](https://github.com/WordPress/gutenberg/pull/31875))
+    -   Improve the navigation block setup state / placeholder. ([31371](https://github.com/WordPress/gutenberg/pull/31371))
+    -   Introduce `useMenuEntityProp` hook. ([31132](https://github.com/WordPress/gutenberg/pull/31132))
+    -   Normalize converting nav menu items to blocks between Editor and Block. ([31606](https://github.com/WordPress/gutenberg/pull/31606))
+    -   Responsive Navigation. ([30047](https://github.com/WordPress/gutenberg/pull/30047))
+    -   Submenus shouldn't take space unless they're actually open. ([31881](https://github.com/WordPress/gutenberg/pull/31881))
+-   Global Styles
+    -   Block Supports: Allow skipping serialization of typography attributes. ([30880](https://github.com/WordPress/gutenberg/pull/30880))
+    -   Fix condition for global styles on mobile. ([31844](https://github.com/WordPress/gutenberg/pull/31844))
+    -   Fix global styles settings retrieval for REST. ([31534](https://github.com/WordPress/gutenberg/pull/31534))
+    -   Make core color classes and custom properties always available. ([31669](https://github.com/WordPress/gutenberg/pull/31669))
+    -   Remove color.link from valid styles and alphabetize the rest. ([31516](https://github.com/WordPress/gutenberg/pull/31516))
+    -   Return consolidated global styles in REST Request. ([31762](https://github.com/WordPress/gutenberg/pull/31762))
+    -   Use elements mechanism for link color instead of a CSS variable. ([31524](https://github.com/WordPress/gutenberg/pull/31524))
+    -   Use mobile context in settings request & global styles. ([31819](https://github.com/WordPress/gutenberg/pull/31819))
+    -   Use wp_theme taxonomy for wp_global_styles cpt. ([31436](https://github.com/WordPress/gutenberg/pull/31436))
+    -   Theme.json:
+        -   Make the `theme.json` examples copy-pasteable. ([32040](https://github.com/WordPress/gutenberg/pull/32040))
+        -   Replace hardcoded `CSS_UNITS` and inherit units from `theme.json`. ([31822](https://github.com/WordPress/gutenberg/pull/31822))
+-   Full Site Editing:
+    -   Template Loader: Make templates arg required. ([31671](https://github.com/WordPress/gutenberg/pull/31671))
+    -   Simplify template loader logic. ([31604](https://github.com/WordPress/gutenberg/pull/31604))
 
 ### Documentation
 
-- Handbook:
-    - Add dedicated Block Styles page under Block API directory. ([31055](https://github.com/WordPress/gutenberg/pull/31055))
-    - Add info on how to connect to the WP ENV MySQL database. ([31975](https://github.com/WordPress/gutenberg/pull/31975))
-    - Capitalize GitHub properly in contributors README. ([31549](https://github.com/WordPress/gutenberg/pull/31549))
-    - Clarify 'Applying styles from a stylesheet' how-to guide. ([31824](https://github.com/WordPress/gutenberg/pull/31824))
-    - First pass at the documentation for the Widgets Block Editor. ([31577](https://github.com/WordPress/gutenberg/pull/31577))
-    - Fix link to ESNext in callout. ([31512](https://github.com/WordPress/gutenberg/pull/31512))
-    - Update Glossary with more FSE terminology. ([31525](https://github.com/WordPress/gutenberg/pull/31525))
-- Packages:
-    - Add required “directory” prop to package.json template in packages documentation. ([31570](https://github.com/WordPress/gutenberg/pull/31570))
-    - Fix typo: "packages" -> "package". ([32036](https://github.com/WordPress/gutenberg/pull/32036))
-    - Improve packages documentation - document root package json and public API knowledge. ([31598](https://github.com/WordPress/gutenberg/pull/31598))
-    - Remove duplicate 1.52.0 changelog entry. ([31659](https://github.com/WordPress/gutenberg/pull/31659))
-    - Scripts: Fix the CHANGELOG for `@wordpress/scripts` package. ([31532](https://github.com/WordPress/gutenberg/pull/31532))
-    - Typo in edit-navigation layout translators note. ([31541](https://github.com/WordPress/gutenberg/pull/31541))
+-   Handbook:
+    -   Add dedicated Block Styles page under Block API directory. ([31055](https://github.com/WordPress/gutenberg/pull/31055))
+    -   Add info on how to connect to the WP ENV MySQL database. ([31975](https://github.com/WordPress/gutenberg/pull/31975))
+    -   Capitalize GitHub properly in contributors README. ([31549](https://github.com/WordPress/gutenberg/pull/31549))
+    -   Clarify 'Applying styles from a stylesheet' how-to guide. ([31824](https://github.com/WordPress/gutenberg/pull/31824))
+    -   First pass at the documentation for the Widgets Block Editor. ([31577](https://github.com/WordPress/gutenberg/pull/31577))
+    -   Fix link to ESNext in callout. ([31512](https://github.com/WordPress/gutenberg/pull/31512))
+    -   Update Glossary with more FSE terminology. ([31525](https://github.com/WordPress/gutenberg/pull/31525))
+-   Packages:
+    -   Add required “directory” prop to package.json template in packages documentation. ([31570](https://github.com/WordPress/gutenberg/pull/31570))
+    -   Fix typo: "packages" -> "package". ([32036](https://github.com/WordPress/gutenberg/pull/32036))
+    -   Improve packages documentation - document root package json and public API knowledge. ([31598](https://github.com/WordPress/gutenberg/pull/31598))
+    -   Remove duplicate 1.52.0 changelog entry. ([31659](https://github.com/WordPress/gutenberg/pull/31659))
+    -   Scripts: Fix the CHANGELOG for `@wordpress/scripts` package. ([31532](https://github.com/WordPress/gutenberg/pull/31532))
+    -   Typo in edit-navigation layout translators note. ([31541](https://github.com/WordPress/gutenberg/pull/31541))
 
 ### Code Quality
 
-- Block editor:
-    - Block popover: Move scroll handling to block tools. ([31611](https://github.com/WordPress/gutenberg/pull/31611))
-    - Log an error if styles are loaded through the compatibility layer. ([31870](https://github.com/WordPress/gutenberg/pull/31870))
-- Block Library:
-    - Post Comments: Make CSS less specific. ([31711](https://github.com/WordPress/gutenberg/pull/31711))
-    - Image/Gallery: Remove use of unstableOnFocus. ([31796](https://github.com/WordPress/gutenberg/pull/31796))
-- Linting:
-    - Fix PHP lint issues. ([32039](https://github.com/WordPress/gutenberg/pull/32039))
-    - Fix PHPCS warning for alignment. ([31931](https://github.com/WordPress/gutenberg/pull/31931))
-    - Fix lint issues. ([31790](https://github.com/WordPress/gutenberg/pull/31790))
-    - Ignore data-no-store-string-literals rule for native files. ([31936](https://github.com/WordPress/gutenberg/pull/31936))
-- Components:
-    - Add ToolbarDropdownMenu to render dropdown menus properly inside toolbars. ([31460](https://github.com/WordPress/gutenberg/pull/31460))
-    - Don't pass down index through context. ([31852](https://github.com/WordPress/gutenberg/pull/31852))
-    - Remove `color()` utility function, use values directly. ([31661](https://github.com/WordPress/gutenberg/pull/31661))
-    - Remove `config()` utility function, use values directly. ([31646](https://github.com/WordPress/gutenberg/pull/31646))
-- Compose:
-    - Add types to withInstanceId and corresponding hook. ([31341](https://github.com/WordPress/gutenberg/pull/31341))
-    - Add types useConstrainedTabbing. ([31548](https://github.com/WordPress/gutenberg/pull/31548))
-    - Add types useAsyncList. ([31523](https://github.com/WordPress/gutenberg/pull/31523))
-- Docgen:
-    - Replace assertions for `getIntermediateRepresentation` unit tests with snapshots. ([31547](https://github.com/WordPress/gutenberg/pull/31547))
-    - Split `getIntermediateRepresentation` unit tests in smaller tests. ([31468](https://github.com/WordPress/gutenberg/pull/31468))
-- Inserter: Mark the inserter slot as unstable. ([31417](https://github.com/WordPress/gutenberg/pull/31417))
-- Multi-select:
-    - Use ref callback for focus out, merge native selection hooks. ([31618](https://github.com/WordPress/gutenberg/pull/31618))
-    - Use writing flow container for focus. ([31572](https://github.com/WordPress/gutenberg/pull/31572))
-- Rich text:
-    - Build in isSelected check for children. ([31802](https://github.com/WordPress/gutenberg/pull/31802))
-    - Consolidate applying from props. ([31635](https://github.com/WordPress/gutenberg/pull/31635))
-    - Each hook should create its own ref. ([31477](https://github.com/WordPress/gutenberg/pull/31477))
-    - Extract implementation-specific undo handling of automatic changes. ([31676](https://github.com/WordPress/gutenberg/pull/31676))
-    - Extract internal delete handling. ([31637](https://github.com/WordPress/gutenberg/pull/31637))
-    - Extract persistent change marking. ([31760](https://github.com/WordPress/gutenberg/pull/31760))
-    - Extract splitValue to separate file. ([31803](https://github.com/WordPress/gutenberg/pull/31803))
-    - Extract input and selection. ([31631](https://github.com/WordPress/gutenberg/pull/31631))
-    - Extract indent list item on space. ([31628](https://github.com/WordPress/gutenberg/pull/31628))
-    - Extract select object. ([31627](https://github.com/WordPress/gutenberg/pull/31627))
-    - Extract paste handler. ([31619](https://github.com/WordPress/gutenberg/pull/31619))
-    - Fix props on DOM element warnings. ([31883](https://github.com/WordPress/gutenberg/pull/31883))
-    - Move autocomplete key handler to ref callback. ([31770](https://github.com/WordPress/gutenberg/pull/31770))
-    - Move implementation specific attributes. ([31674](https://github.com/WordPress/gutenberg/pull/31674))
-    - Move implementation specific delete and enter handling. ([31644](https://github.com/WordPress/gutenberg/pull/31644))
-    - Remove avoiding setting selection on mount. ([31788](https://github.com/WordPress/gutenberg/pull/31788))
-    - Remove dependency on block client ID. ([31752](https://github.com/WordPress/gutenberg/pull/31752))
-    - Remove duplicate active formats state. ([31771](https://github.com/WordPress/gutenberg/pull/31771))
-    - Remove old broken format prop. ([31767](https://github.com/WordPress/gutenberg/pull/31767))
-    - Remove tag name dependency. ([31679](https://github.com/WordPress/gutenberg/pull/31679))
-    - Simplify with hooks. ([31718](https://github.com/WordPress/gutenberg/pull/31718))
-- Rename `construct_wp_query_args` to `build_query_vars_from_query_block`. ([32041](https://github.com/WordPress/gutenberg/pull/32041))
-- Theme.json:
-    - Remove unused code. ([31666](https://github.com/WordPress/gutenberg/pull/31666))
-    - Remove declarations so API has coherence. ([31596](https://github.com/WordPress/gutenberg/pull/31596))
-    - Remove: Declarations parameter from compute_style_properties. ([31573](https://github.com/WordPress/gutenberg/pull/31573))
-- Writing flow:
-    - Extract and simplify "select all". ([31855](https://github.com/WordPress/gutenberg/pull/31855))
-    - Extract arrow nav. ([31851](https://github.com/WordPress/gutenberg/pull/31851))
-    - Extract tab behavior to hook. ([31834](https://github.com/WordPress/gutenberg/pull/31834))
-- REST API: Use batch endpoint included in Core. ([32174](https://github.com/WordPress/gutenberg/pull/32174))
-- Prepare for adding the Widgets block editor to Core. ([32136](https://github.com/WordPress/gutenberg/pull/32136))
-- Remove `gutenberg` domain from core blocks. ([32152](https://github.com/WordPress/gutenberg/pull/32152))
-- Remove filter_var from blocks. ([32046](https://github.com/WordPress/gutenberg/pull/32046))
-- Plugin: Update block editor settings to work with context. ([32159](https://github.com/WordPress/gutenberg/pull/32159))
+-   Block editor:
+    -   Block popover: Move scroll handling to block tools. ([31611](https://github.com/WordPress/gutenberg/pull/31611))
+    -   Log an error if styles are loaded through the compatibility layer. ([31870](https://github.com/WordPress/gutenberg/pull/31870))
+-   Block Library:
+    -   Post Comments: Make CSS less specific. ([31711](https://github.com/WordPress/gutenberg/pull/31711))
+    -   Image/Gallery: Remove use of unstableOnFocus. ([31796](https://github.com/WordPress/gutenberg/pull/31796))
+-   Linting:
+    -   Fix PHP lint issues. ([32039](https://github.com/WordPress/gutenberg/pull/32039))
+    -   Fix PHPCS warning for alignment. ([31931](https://github.com/WordPress/gutenberg/pull/31931))
+    -   Fix lint issues. ([31790](https://github.com/WordPress/gutenberg/pull/31790))
+    -   Ignore data-no-store-string-literals rule for native files. ([31936](https://github.com/WordPress/gutenberg/pull/31936))
+-   Components:
+    -   Add ToolbarDropdownMenu to render dropdown menus properly inside toolbars. ([31460](https://github.com/WordPress/gutenberg/pull/31460))
+    -   Don't pass down index through context. ([31852](https://github.com/WordPress/gutenberg/pull/31852))
+    -   Remove `color()` utility function, use values directly. ([31661](https://github.com/WordPress/gutenberg/pull/31661))
+    -   Remove `config()` utility function, use values directly. ([31646](https://github.com/WordPress/gutenberg/pull/31646))
+-   Compose:
+    -   Add types to withInstanceId and corresponding hook. ([31341](https://github.com/WordPress/gutenberg/pull/31341))
+    -   Add types useConstrainedTabbing. ([31548](https://github.com/WordPress/gutenberg/pull/31548))
+    -   Add types useAsyncList. ([31523](https://github.com/WordPress/gutenberg/pull/31523))
+-   Docgen:
+    -   Replace assertions for `getIntermediateRepresentation` unit tests with snapshots. ([31547](https://github.com/WordPress/gutenberg/pull/31547))
+    -   Split `getIntermediateRepresentation` unit tests in smaller tests. ([31468](https://github.com/WordPress/gutenberg/pull/31468))
+-   Inserter: Mark the inserter slot as unstable. ([31417](https://github.com/WordPress/gutenberg/pull/31417))
+-   Multi-select:
+    -   Use ref callback for focus out, merge native selection hooks. ([31618](https://github.com/WordPress/gutenberg/pull/31618))
+    -   Use writing flow container for focus. ([31572](https://github.com/WordPress/gutenberg/pull/31572))
+-   Rich text:
+    -   Build in isSelected check for children. ([31802](https://github.com/WordPress/gutenberg/pull/31802))
+    -   Consolidate applying from props. ([31635](https://github.com/WordPress/gutenberg/pull/31635))
+    -   Each hook should create its own ref. ([31477](https://github.com/WordPress/gutenberg/pull/31477))
+    -   Extract implementation-specific undo handling of automatic changes. ([31676](https://github.com/WordPress/gutenberg/pull/31676))
+    -   Extract internal delete handling. ([31637](https://github.com/WordPress/gutenberg/pull/31637))
+    -   Extract persistent change marking. ([31760](https://github.com/WordPress/gutenberg/pull/31760))
+    -   Extract splitValue to separate file. ([31803](https://github.com/WordPress/gutenberg/pull/31803))
+    -   Extract input and selection. ([31631](https://github.com/WordPress/gutenberg/pull/31631))
+    -   Extract indent list item on space. ([31628](https://github.com/WordPress/gutenberg/pull/31628))
+    -   Extract select object. ([31627](https://github.com/WordPress/gutenberg/pull/31627))
+    -   Extract paste handler. ([31619](https://github.com/WordPress/gutenberg/pull/31619))
+    -   Fix props on DOM element warnings. ([31883](https://github.com/WordPress/gutenberg/pull/31883))
+    -   Move autocomplete key handler to ref callback. ([31770](https://github.com/WordPress/gutenberg/pull/31770))
+    -   Move implementation specific attributes. ([31674](https://github.com/WordPress/gutenberg/pull/31674))
+    -   Move implementation specific delete and enter handling. ([31644](https://github.com/WordPress/gutenberg/pull/31644))
+    -   Remove avoiding setting selection on mount. ([31788](https://github.com/WordPress/gutenberg/pull/31788))
+    -   Remove dependency on block client ID. ([31752](https://github.com/WordPress/gutenberg/pull/31752))
+    -   Remove duplicate active formats state. ([31771](https://github.com/WordPress/gutenberg/pull/31771))
+    -   Remove old broken format prop. ([31767](https://github.com/WordPress/gutenberg/pull/31767))
+    -   Remove tag name dependency. ([31679](https://github.com/WordPress/gutenberg/pull/31679))
+    -   Simplify with hooks. ([31718](https://github.com/WordPress/gutenberg/pull/31718))
+-   Rename `construct_wp_query_args` to `build_query_vars_from_query_block`. ([32041](https://github.com/WordPress/gutenberg/pull/32041))
+-   Theme.json:
+    -   Remove unused code. ([31666](https://github.com/WordPress/gutenberg/pull/31666))
+    -   Remove declarations so API has coherence. ([31596](https://github.com/WordPress/gutenberg/pull/31596))
+    -   Remove: Declarations parameter from compute_style_properties. ([31573](https://github.com/WordPress/gutenberg/pull/31573))
+-   Writing flow:
+    -   Extract and simplify "select all". ([31855](https://github.com/WordPress/gutenberg/pull/31855))
+    -   Extract arrow nav. ([31851](https://github.com/WordPress/gutenberg/pull/31851))
+    -   Extract tab behavior to hook. ([31834](https://github.com/WordPress/gutenberg/pull/31834))
+-   REST API: Use batch endpoint included in Core. ([32174](https://github.com/WordPress/gutenberg/pull/32174))
+-   Prepare for adding the Widgets block editor to Core. ([32136](https://github.com/WordPress/gutenberg/pull/32136))
+-   Remove `gutenberg` domain from core blocks. ([32152](https://github.com/WordPress/gutenberg/pull/32152))
+-   Remove filter_var from blocks. ([32046](https://github.com/WordPress/gutenberg/pull/32046))
+-   Plugin: Update block editor settings to work with context. ([32159](https://github.com/WordPress/gutenberg/pull/32159))
 
 ### Tools
 
-- End-to-end tests:
-    - Add template loader unit tests. ([31498](https://github.com/WordPress/gutenberg/pull/31498))
-    - Fix end-to-end test inserting cover block. ([31866](https://github.com/WordPress/gutenberg/pull/31866))
-    - Fix flaky change detection tests causing intermittent failures. ([31861](https://github.com/WordPress/gutenberg/pull/31861))
-    - Fix intermittent embeds failure. ([31860](https://github.com/WordPress/gutenberg/pull/31860))
-    - Fix intermittent failure of rich text end-to-end test. ([31864](https://github.com/WordPress/gutenberg/pull/31864))
-    - Increase test coverage for pattern transforms. ([31689](https://github.com/WordPress/gutenberg/pull/31689))
-    - Navigation: Add unit tests for onChange handler and fix cases around custom links tags and post-format. ([31259](https://github.com/WordPress/gutenberg/pull/31259))
-    - Remove i18n filters performance test. ([32028](https://github.com/WordPress/gutenberg/pull/32028))
-    - Skip unstable end-to-end tests. ([32031](https://github.com/WordPress/gutenberg/pull/32031))
-    - Try stabilizing customize widgets end-to-end tests. ([32023](https://github.com/WordPress/gutenberg/pull/32023))
-    - Update skip failing template mode end to end test. ([32017](https://github.com/WordPress/gutenberg/pull/32017))
-    - Update tests for changes in core logic. ([31982](https://github.com/WordPress/gutenberg/pull/31982))
-- Gutenberg plugin: Update compatibility layer for loading separate core block assets. ([31894](https://github.com/WordPress/gutenberg/pull/31894))
-- Workflow:
-    - Replace the Cancel workflow with native GitHub Action functionality. ([32016](https://github.com/WordPress/gutenberg/pull/32016))
-    - Remove Custom Properties PostCSS plugin. ([31715](https://github.com/WordPress/gutenberg/pull/31715))
-
-
-
+-   End-to-end tests:
+    -   Add template loader unit tests. ([31498](https://github.com/WordPress/gutenberg/pull/31498))
+    -   Fix end-to-end test inserting cover block. ([31866](https://github.com/WordPress/gutenberg/pull/31866))
+    -   Fix flaky change detection tests causing intermittent failures. ([31861](https://github.com/WordPress/gutenberg/pull/31861))
+    -   Fix intermittent embeds failure. ([31860](https://github.com/WordPress/gutenberg/pull/31860))
+    -   Fix intermittent failure of rich text end-to-end test. ([31864](https://github.com/WordPress/gutenberg/pull/31864))
+    -   Increase test coverage for pattern transforms. ([31689](https://github.com/WordPress/gutenberg/pull/31689))
+    -   Navigation: Add unit tests for onChange handler and fix cases around custom links tags and post-format. ([31259](https://github.com/WordPress/gutenberg/pull/31259))
+    -   Remove i18n filters performance test. ([32028](https://github.com/WordPress/gutenberg/pull/32028))
+    -   Skip unstable end-to-end tests. ([32031](https://github.com/WordPress/gutenberg/pull/32031))
+    -   Try stabilizing customize widgets end-to-end tests. ([32023](https://github.com/WordPress/gutenberg/pull/32023))
+    -   Update skip failing template mode end to end test. ([32017](https://github.com/WordPress/gutenberg/pull/32017))
+    -   Update tests for changes in core logic. ([31982](https://github.com/WordPress/gutenberg/pull/31982))
+-   Gutenberg plugin: Update compatibility layer for loading separate core block assets. ([31894](https://github.com/WordPress/gutenberg/pull/31894))
+-   Workflow:
+    -   Replace the Cancel workflow with native GitHub Action functionality. ([32016](https://github.com/WordPress/gutenberg/pull/32016))
+    -   Remove Custom Properties PostCSS plugin. ([31715](https://github.com/WordPress/gutenberg/pull/31715))
 
 = 10.6.2 =
 
-
+## Changelog
 
 ### Bug Fixes
 
-- Workflows: Fix "Stable tag:" readme.txt field in SVN upload. ([31897](https://github.com/WordPress/gutenberg/pull/31897))
-- Gallery: Fix Image Size regression. ([31884](https://github.com/WordPress/gutenberg/pull/31884))
+-   Workflows: Fix "Stable tag:" readme.txt field in SVN upload. ([31897](https://github.com/WordPress/gutenberg/pull/31897))
+-   Gallery: Fix Image Size regression. ([31884](https://github.com/WordPress/gutenberg/pull/31884))
 
 ### Various
 
-- Plugin: Guard `construct_wp_query_args` with check if implemented in WordPress Core. ([32008](https://github.com/WordPress/gutenberg/pull/32008))
-
-
-
+-   Plugin: Guard `construct_wp_query_args` with check if implemented in WordPress Core. ([32008](https://github.com/WordPress/gutenberg/pull/32008))
 
 = 10.6.1 =
 
-### Bug Fixes
+## Changelog
 
-- Revert "components: Promote VisuallyHidden from ui into full components (#31244)". ([31882](https://github.com/WordPress/gutenberg/pull/31882))
-- Allow more complex contentWidth & wideWidth values. ([31740](https://github.com/WordPress/gutenberg/pull/31740))
-- Fix link color selector. ([31820](https://github.com/WordPress/gutenberg/pull/31820))
-- Register template part variations server side. ([31761](https://github.com/WordPress/gutenberg/pull/31761))
-- Do not provide a default value for the link color property. ([31755](https://github.com/WordPress/gutenberg/pull/31755))
-- Fixes FSE Navigation sub-menu item styling regression. ([31754](https://github.com/WordPress/gutenberg/pull/31754))
+### Bug Fixes
 
+-   Revert "components: Promote VisuallyHidden from ui into full components (#31244)". ([31882](https://github.com/WordPress/gutenberg/pull/31882))
+-   Allow more complex contentWidth & wideWidth values. ([31740](https://github.com/WordPress/gutenberg/pull/31740))
+-   Fix link color selector. ([31820](https://github.com/WordPress/gutenberg/pull/31820))
+-   Register template part variations server side. ([31761](https://github.com/WordPress/gutenberg/pull/31761))
+-   Do not provide a default value for the link color property. ([31755](https://github.com/WordPress/gutenberg/pull/31755))
+-   Fixes FSE Navigation sub-menu item styling regression. ([31754](https://github.com/WordPress/gutenberg/pull/31754))
 
 = 10.6.0 =
 
+## Changelog
+
 ### New Features
 
-- Block Editor: Add duotone block supports. ([26752](https://github.com/WordPress/gutenberg/pull/26752))
-- Block Library:
-  - Stabilize some theme blocks for WP 5.8 release. ([31423](https://github.com/WordPress/gutenberg/pull/31423))
-  - Mark Log In/Out block as stable for 5.8 release. ([31499](https://github.com/WordPress/gutenberg/pull/31499))
-- Editor: Display most used terms in term selector. ([30598](https://github.com/WordPress/gutenberg/pull/30598))
+-   Block Editor: Add duotone block supports. ([26752](https://github.com/WordPress/gutenberg/pull/26752))
+-   Block Library:
+    -   Stabilize some theme blocks for WP 5.8 release. ([31423](https://github.com/WordPress/gutenberg/pull/31423))
+    -   Mark Log In/Out block as stable for 5.8 release. ([31499](https://github.com/WordPress/gutenberg/pull/31499))
+-   Editor: Display most used terms in term selector. ([30598](https://github.com/WordPress/gutenberg/pull/30598))
 
 ### Enhancements
 
-- Block Editor:
-  - Add Block Border Support. ([31264](https://github.com/WordPress/gutenberg/pull/31264))
-  - Spacing Support: configurable sides for padding support. ([30607](https://github.com/WordPress/gutenberg/pull/30607))
-  - Simplify insertion point. ([30301](https://github.com/WordPress/gutenberg/pull/30301))
-- Block Library:
-  - Post date: Add link color option. ([30827](https://github.com/WordPress/gutenberg/pull/30827))
-  - Table:
-    - Add border block support. ([31265](https://github.com/WordPress/gutenberg/pull/31265))
-    - Add colors block support. ([30791](https://github.com/WordPress/gutenberg/pull/30791))
-  - Query Block:
-    - Add semantic wrapper element. ([31421](https://github.com/WordPress/gutenberg/pull/31421))
-    - Add wrapper and `align` support. ([30804](https://github.com/WordPress/gutenberg/pull/30804))
-    - Show a spinner instead of the Loading text message. ([31095](https://github.com/WordPress/gutenberg/pull/31095))
-  - Unify the post tags and post categories block under a unique post terms block. ([31458](https://github.com/WordPress/gutenberg/pull/31458))
-- Components:
-  - Add component system `context`. ([30877](https://github.com/WordPress/gutenberg/pull/30877))
-  - Use `UnitControl` for font-size. ([31314](https://github.com/WordPress/gutenberg/pull/31314))
-  - Use vanilla emotion for `view`. ([31099](https://github.com/WordPress/gutenberg/pull/31099))
-  - Promote Heading. ([31299](https://github.com/WordPress/gutenberg/pull/31299))
-  - Promote Text to full components export. ([31291](https://github.com/WordPress/gutenberg/pull/31291))
-  - Promote ui/Flex and deprecate `isReversed` prop. ([31297](https://github.com/WordPress/gutenberg/pull/31297))
-  - Promote VisuallyHidden from ui into full components. ([31244](https://github.com/WordPress/gutenberg/pull/31244))
-- Core Data: Add experimental util to allow fetch remote URL data from REST API. ([31085](https://github.com/WordPress/gutenberg/pull/31085))
-- General Interface:
-  - Rename "Modes" to "Tools" in the header. ([31430](https://github.com/WordPress/gutenberg/pull/31430))
-  - RTL support for redo/undo icons. ([31219](https://github.com/WordPress/gutenberg/pull/31219))
-  - Update "trash" icon. ([31463](https://github.com/WordPress/gutenberg/pull/31463))
-- Patterns: Suggest block patterns in block placeholder states. ([29602](https://github.com/WordPress/gutenberg/pull/29602))
-- Site Editor:
-  - Add show more settings to block toolbars. ([31305](https://github.com/WordPress/gutenberg/pull/31305))
-  - Check whether the data is loaded. If the data is loaded and the template is still unknown, give appropriate feedback. ([30664](https://github.com/WordPress/gutenberg/pull/30664))
-  - A11y: Constrain tabbing inside them multi-entity save panel. ([31136](https://github.com/WordPress/gutenberg/pull/31136))
-  - Iframe the template editor. ([31375](https://github.com/WordPress/gutenberg/pull/31375))
-  - Save panel - decouple Site Entity items for individual saving. ([30816](https://github.com/WordPress/gutenberg/pull/30816))
-  - Template part:
-    - Add patterns placeholder selection. ([31155](https://github.com/WordPress/gutenberg/pull/31155))
-    - Register block variations and area selection inputs from original area definitions. ([30821](https://github.com/WordPress/gutenberg/pull/30821))
-  - Site Tagline: Letter casing and padding. ([31042](https://github.com/WordPress/gutenberg/pull/31042))
-  - Site title: Add padding. ([31125](https://github.com/WordPress/gutenberg/pull/31125))
-  - Try: Blue parents. ([31196](https://github.com/WordPress/gutenberg/pull/31196))
-  - Verify if php template exists for a hybrid/universal theme with a block-based parent. ([31123](https://github.com/WordPress/gutenberg/pull/31123))
-- Template Editing Mode: Use a darker frame for template mode and previews. ([31044](https://github.com/WordPress/gutenberg/pull/31044))
+-   Block Editor:
+    -   Add Block Border Support. ([31264](https://github.com/WordPress/gutenberg/pull/31264))
+    -   Spacing Support: configurable sides for padding support. ([30607](https://github.com/WordPress/gutenberg/pull/30607))
+    -   Simplify insertion point. ([30301](https://github.com/WordPress/gutenberg/pull/30301))
+-   Block Library:
+    -   Post date: Add link color option. ([30827](https://github.com/WordPress/gutenberg/pull/30827))
+    -   Table:
+        -   Add border block support. ([31265](https://github.com/WordPress/gutenberg/pull/31265))
+        -   Add colors block support. ([30791](https://github.com/WordPress/gutenberg/pull/30791))
+    -   Query Block:
+        -   Add semantic wrapper element. ([31421](https://github.com/WordPress/gutenberg/pull/31421))
+        -   Add wrapper and `align` support. ([30804](https://github.com/WordPress/gutenberg/pull/30804))
+        -   Show a spinner instead of the Loading text message. ([31095](https://github.com/WordPress/gutenberg/pull/31095))
+    -   Unify the post tags and post categories block under a unique post terms block. ([31458](https://github.com/WordPress/gutenberg/pull/31458))
+-   Components:
+    -   Add component system `context`. ([30877](https://github.com/WordPress/gutenberg/pull/30877))
+    -   Use `UnitControl` for font-size. ([31314](https://github.com/WordPress/gutenberg/pull/31314))
+    -   Use vanilla emotion for `view`. ([31099](https://github.com/WordPress/gutenberg/pull/31099))
+    -   Promote Heading. ([31299](https://github.com/WordPress/gutenberg/pull/31299))
+    -   Promote Text to full components export. ([31291](https://github.com/WordPress/gutenberg/pull/31291))
+    -   Promote ui/Flex and deprecate `isReversed` prop. ([31297](https://github.com/WordPress/gutenberg/pull/31297))
+    -   Promote VisuallyHidden from ui into full components. ([31244](https://github.com/WordPress/gutenberg/pull/31244))
+-   Core Data: Add experimental util to allow fetch remote URL data from REST API. ([31085](https://github.com/WordPress/gutenberg/pull/31085))
+-   General Interface:
+    -   Rename "Modes" to "Tools" in the header. ([31430](https://github.com/WordPress/gutenberg/pull/31430))
+    -   RTL support for redo/undo icons. ([31219](https://github.com/WordPress/gutenberg/pull/31219))
+    -   Update "trash" icon. ([31463](https://github.com/WordPress/gutenberg/pull/31463))
+-   Patterns: Suggest block patterns in block placeholder states. ([29602](https://github.com/WordPress/gutenberg/pull/29602))
+-   Site Editor:
+    -   Add show more settings to block toolbars. ([31305](https://github.com/WordPress/gutenberg/pull/31305))
+    -   Check whether the data is loaded. If the data is loaded and the template is still unknown, give appropriate feedback. ([30664](https://github.com/WordPress/gutenberg/pull/30664))
+    -   A11y: Constrain tabbing inside them multi-entity save panel. ([31136](https://github.com/WordPress/gutenberg/pull/31136))
+    -   Iframe the template editor. ([31375](https://github.com/WordPress/gutenberg/pull/31375))
+    -   Save panel - decouple Site Entity items for individual saving. ([30816](https://github.com/WordPress/gutenberg/pull/30816))
+    -   Template part:
+        -   Add patterns placeholder selection. ([31155](https://github.com/WordPress/gutenberg/pull/31155))
+        -   Register block variations and area selection inputs from original area definitions. ([30821](https://github.com/WordPress/gutenberg/pull/30821))
+    -   Site Tagline: Letter casing and padding. ([31042](https://github.com/WordPress/gutenberg/pull/31042))
+    -   Site title: Add padding. ([31125](https://github.com/WordPress/gutenberg/pull/31125))
+    -   Try: Blue parents. ([31196](https://github.com/WordPress/gutenberg/pull/31196))
+    -   Verify if php template exists for a hybrid/universal theme with a block-based parent. ([31123](https://github.com/WordPress/gutenberg/pull/31123))
+-   Template Editing Mode: Use a darker frame for template mode and previews. ([31044](https://github.com/WordPress/gutenberg/pull/31044))
 
 ### New APIs
 
-- Core Data: Add batched variants for start and finish resolution actions. ([31005](https://github.com/WordPress/gutenberg/pull/31005))
-- Block API: Allow "array of attributes to be compared" for `isActive` property in block variations. ([30913](https://github.com/WordPress/gutenberg/pull/30913))
-- Blocks: Introduce `registerBlockTypeFromMetadata` API. ([30293](https://github.com/WordPress/gutenberg/pull/30293))
-
-### Bug Fixes
-
-- Block Editor:
-  - Block Support: Fix server-side border color support check. ([31020](https://github.com/WordPress/gutenberg/pull/31020))
-  - Create `useBlockRef` and `useBlockElement` for better access. ([29573](https://github.com/WordPress/gutenberg/pull/29573))
-  - Fix focus handler in Safari. ([31103](https://github.com/WordPress/gutenberg/pull/31103))
-  - Fix selection clearer ref passed to `motion.div`. ([31469](https://github.com/WordPress/gutenberg/pull/31469))
-  - Left-align query patterns in the carousel. ([31233](https://github.com/WordPress/gutenberg/pull/31233))
-  - Persistent List View: Fix the list stealing focus from the canvas on item mount. ([31058](https://github.com/WordPress/gutenberg/pull/31058))
-  - Try: Toolbar gap. ([30983](https://github.com/WordPress/gutenberg/pull/30983))
-- Block Library:
-  - Allow for group and columns blocks to specify an unlocked template. ([29916](https://github.com/WordPress/gutenberg/pull/29916))
-  - Button Block: fix 100% width buttons alignment with other buttons. ([29794](https://github.com/WordPress/gutenberg/pull/29794))
-  - Image Block: Hide controls while in upload state. ([30891](https://github.com/WordPress/gutenberg/pull/30891))
-  - Fix: Make media playable on video and audio block backend. ([31257](https://github.com/WordPress/gutenberg/pull/31257))
-  - Prevent `PostDate` as link to load inside an iframe. ([31350](https://github.com/WordPress/gutenberg/pull/31350))
-  - Post Content: Prevent infinite recursion. ([31455](https://github.com/WordPress/gutenberg/pull/31455))
-- Components:
-  - Fix bug with color picker input state for falsy values. ([30799](https://github.com/WordPress/gutenberg/pull/30799))
-  - Fixed imports that resulted in build failing. ([31106](https://github.com/WordPress/gutenberg/pull/31106))
-  - Stop auto-memo antipattern and remove senseless default values. ([31246](https://github.com/WordPress/gutenberg/pull/31246))
-- Compose: Fix parameter name typo in `useRefEffect`. ([30597](https://github.com/WordPress/gutenberg/pull/30597))
-- General Interface:
-  - Remove tools dropdown menu from medium viewport when text labels mode is active. ([31431](https://github.com/WordPress/gutenberg/pull/31431))
-- Plugin:
-  - Call deprecated hooks only when new filters not present. ([31027](https://github.com/WordPress/gutenberg/pull/31027))
-  - Fix core-block-patterns support on GB. ([31546](https://github.com/WordPress/gutenberg/pull/31546))
-  - Use `require_once` instead of `require` when registering blocks. ([31148](https://github.com/WordPress/gutenberg/pull/31148))
-- Site Editor:
-  - Fix popover/inspector scrolling. ([31395](https://github.com/WordPress/gutenberg/pull/31395))
-  - List view improvements. ([31092](https://github.com/WordPress/gutenberg/pull/31092))
-  - Render out HTML characters in post and category titles. ([30661](https://github.com/WordPress/gutenberg/pull/30661))
-  - Use EditorNotices component for notices. ([31303](https://github.com/WordPress/gutenberg/pull/31303))
-- Themes:
-  - Hook `maybe_inline_styles` in the footer. ([31072](https://github.com/WordPress/gutenberg/pull/31072))
-  - Inlined core block styles should not override user-added inline styles. ([31268](https://github.com/WordPress/gutenberg/pull/31268))
-- Writing flow:
-  - Fix edge detection in Chrome. ([31150](https://github.com/WordPress/gutenberg/pull/31150))
-  - Fix RTL issues. ([31159](https://github.com/WordPress/gutenberg/pull/31159))
+-   Core Data: Add batched variants for start and finish resolution actions. ([31005](https://github.com/WordPress/gutenberg/pull/31005))
+-   Block API: Allow "array of attributes to be compared" for `isActive` property in block variations. ([30913](https://github.com/WordPress/gutenberg/pull/30913))
+-   Blocks: Introduce `registerBlockTypeFromMetadata` API. ([30293](https://github.com/WordPress/gutenberg/pull/30293))
+
+### Bug Fixes
+
+-   Block Editor:
+    -   Block Support: Fix server-side border color support check. ([31020](https://github.com/WordPress/gutenberg/pull/31020))
+    -   Create `useBlockRef` and `useBlockElement` for better access. ([29573](https://github.com/WordPress/gutenberg/pull/29573))
+    -   Fix focus handler in Safari. ([31103](https://github.com/WordPress/gutenberg/pull/31103))
+    -   Fix selection clearer ref passed to `motion.div`. ([31469](https://github.com/WordPress/gutenberg/pull/31469))
+    -   Left-align query patterns in the carousel. ([31233](https://github.com/WordPress/gutenberg/pull/31233))
+    -   Persistent List View: Fix the list stealing focus from the canvas on item mount. ([31058](https://github.com/WordPress/gutenberg/pull/31058))
+    -   Try: Toolbar gap. ([30983](https://github.com/WordPress/gutenberg/pull/30983))
+-   Block Library:
+    -   Allow for group and columns blocks to specify an unlocked template. ([29916](https://github.com/WordPress/gutenberg/pull/29916))
+    -   Button Block: fix 100% width buttons alignment with other buttons. ([29794](https://github.com/WordPress/gutenberg/pull/29794))
+    -   Image Block: Hide controls while in upload state. ([30891](https://github.com/WordPress/gutenberg/pull/30891))
+    -   Fix: Make media playable on video and audio block backend. ([31257](https://github.com/WordPress/gutenberg/pull/31257))
+    -   Prevent `PostDate` as link to load inside an iframe. ([31350](https://github.com/WordPress/gutenberg/pull/31350))
+    -   Post Content: Prevent infinite recursion. ([31455](https://github.com/WordPress/gutenberg/pull/31455))
+-   Components:
+    -   Fix bug with color picker input state for falsy values. ([30799](https://github.com/WordPress/gutenberg/pull/30799))
+    -   Fixed imports that resulted in build failing. ([31106](https://github.com/WordPress/gutenberg/pull/31106))
+    -   Stop auto-memo antipattern and remove senseless default values. ([31246](https://github.com/WordPress/gutenberg/pull/31246))
+-   Compose: Fix parameter name typo in `useRefEffect`. ([30597](https://github.com/WordPress/gutenberg/pull/30597))
+-   General Interface:
+    -   Remove tools dropdown menu from medium viewport when text labels mode is active. ([31431](https://github.com/WordPress/gutenberg/pull/31431))
+-   Plugin:
+    -   Call deprecated hooks only when new filters not present. ([31027](https://github.com/WordPress/gutenberg/pull/31027))
+    -   Fix core-block-patterns support on GB. ([31546](https://github.com/WordPress/gutenberg/pull/31546))
+    -   Use `require_once` instead of `require` when registering blocks. ([31148](https://github.com/WordPress/gutenberg/pull/31148))
+-   Site Editor:
+    -   Fix popover/inspector scrolling. ([31395](https://github.com/WordPress/gutenberg/pull/31395))
+    -   List view improvements. ([31092](https://github.com/WordPress/gutenberg/pull/31092))
+    -   Render out HTML characters in post and category titles. ([30661](https://github.com/WordPress/gutenberg/pull/30661))
+    -   Use EditorNotices component for notices. ([31303](https://github.com/WordPress/gutenberg/pull/31303))
+-   Themes:
+    -   Hook `maybe_inline_styles` in the footer. ([31072](https://github.com/WordPress/gutenberg/pull/31072))
+    -   Inlined core block styles should not override user-added inline styles. ([31268](https://github.com/WordPress/gutenberg/pull/31268))
+-   Writing flow:
+    -   Fix edge detection in Chrome. ([31150](https://github.com/WordPress/gutenberg/pull/31150))
+    -   Fix RTL issues. ([31159](https://github.com/WordPress/gutenberg/pull/31159))
 
 ### Performance
 
-- Improve the typing performance by render hooks panels for selected blocks only. ([31381](https://github.com/WordPress/gutenberg/pull/31381))
+-   Improve the typing performance by render hooks panels for selected blocks only. ([31381](https://github.com/WordPress/gutenberg/pull/31381))
 
 ### Experiments
 
-- Block-based Widgets:
-  - API:
-    - Remove widget screen dead code. ([31411](https://github.com/WordPress/gutenberg/pull/31411))
-    - Set order of Widgets submenu item. ([31214](https://github.com/WordPress/gutenberg/pull/31214))
-    - Use `gutenberg_get_block_categories` for getting block categories. ([31486](https://github.com/WordPress/gutenberg/pull/31486))
-  - Customizer:
-    - Add white background. ([31487](https://github.com/WordPress/gutenberg/pull/31487))
-    - Fix adding new legacy widget. ([31490](https://github.com/WordPress/gutenberg/pull/31490))
-    - Fix Legacy Widget block. ([31405](https://github.com/WordPress/gutenberg/pull/31405))
-    - Fix toolbar so that it overlaps preview. ([31077](https://github.com/WordPress/gutenberg/pull/31077))
-    - Fix unable to publish edited legacy widgets. ([31484](https://github.com/WordPress/gutenberg/pull/31484))
-    - Fix unable to get block refs in widgets customizer. ([31262](https://github.com/WordPress/gutenberg/pull/31262))
-    - Focus control in widgets customizer. ([31308](https://github.com/WordPress/gutenberg/pull/31308))
-    - Make the entire sidebar have a white background. ([31492](https://github.com/WordPress/gutenberg/pull/31492))
-    - Show blocks from plugins. ([31406](https://github.com/WordPress/gutenberg/pull/31406))
-  - Legacy Widget:
-    - Add 'Convert to blocks' button for text widgets. ([31215](https://github.com/WordPress/gutenberg/pull/31215))
-    - Implement design iterations. ([30889](https://github.com/WordPress/gutenberg/pull/30889))
-    - Ensure the control form's IDs have a consistent number. ([31485](https://github.com/WordPress/gutenberg/pull/31485))
-    - Refactor Form to not use React. ([31444](https://github.com/WordPress/gutenberg/pull/31444))
-  - Widget Editor:
-    - Ensure _Hello Dolly_ plugin text doesn't overlap the widgets screen UI. ([30729](https://github.com/WordPress/gutenberg/pull/30729))
-    - Fix entity deletion in widgets screen. ([31404](https://github.com/WordPress/gutenberg/pull/31404))
-    - Fix _move to widget area_ item checkmark. ([31494](https://github.com/WordPress/gutenberg/pull/31494))
-    - Improve theme switching experience. ([31407](https://github.com/WordPress/gutenberg/pull/31407))
-    - _Move to widget area_ iterations and fixes. ([31445](https://github.com/WordPress/gutenberg/pull/31445))
-- Global Styles:
-  - Add a new endpoint that exposes block editor settings through the REST API. ([29969](https://github.com/WordPress/gutenberg/pull/29969))
-  - Add theme origin to `getStyle`. ([31267](https://github.com/WordPress/gutenberg/pull/31267))
-  - Block Supports: Allow skipping serialization of font size. ([30879](https://github.com/WordPress/gutenberg/pull/30879))
-  - Create block metadata for all blocks. ([31590](https://github.com/WordPress/gutenberg/pull/31590))
-  - Cover against a block being unregistered. ([31588](https://github.com/WordPress/gutenberg/pull/31588))
-  - Fix Possible CSS units not passed to `useCustomUnits`. ([31057](https://github.com/WordPress/gutenberg/pull/31057))
-  - Make the configuration resilient to changes to `safecss_filter_attr()`. ([30888](https://github.com/WordPress/gutenberg/pull/30888))
-  - Preset classes for site editor: Generate them like in the front-end. ([31218](https://github.com/WordPress/gutenberg/pull/31218))
-  - Remove specificify for link color. ([31497](https://github.com/WordPress/gutenberg/pull/31497))
-  - Remove tests and make utility methods private. ([31224](https://github.com/WordPress/gutenberg/pull/31224))
-  - Rename `experimental-theme.json` to `theme.json` and add a fallback for backwards-compatibility. ([29981](https://github.com/WordPress/gutenberg/pull/29981))
-  - Site Editor:
-    - Fix generation of preset class for border color. ([31217](https://github.com/WordPress/gutenberg/pull/31217))
-    - Fix preset class specificity. ([31204](https://github.com/WordPress/gutenberg/pull/31204))
-  - Target global styles to the `body` element instead of `:root`. ([31302](https://github.com/WordPress/gutenberg/pull/31302))
-  - Themes: only split block styles loading for block themes. ([31309](https://github.com/WordPress/gutenberg/pull/31309))
-  - Update shape of theme.json. ([30541](https://github.com/WordPress/gutenberg/pull/30541))
-- Navigation Editor and Block:
-  - Block placeholder: fix font inheritance. ([31410](https://github.com/WordPress/gutenberg/pull/31410))
-  - Correctly display menu used on location text. ([31500](https://github.com/WordPress/gutenberg/pull/31500))
-  - Fix issue with missing styles for `Page List` in navigation. ([31368](https://github.com/WordPress/gutenberg/pull/31368))
-  - Fix navigation screen collapsing regression. ([31228](https://github.com/WordPress/gutenberg/pull/31228))
-  - Fix navigation screen padding again. ([31372](https://github.com/WordPress/gutenberg/pull/31372))
-  - Fix nav color regression. ([31495](https://github.com/WordPress/gutenberg/pull/31495))
-  - Fix nav editor links to correctly persist new tab target attribute. ([30956](https://github.com/WordPress/gutenberg/pull/30956))
-  - Fix padding and cursor for nav menu item placeholder. ([31275](https://github.com/WordPress/gutenberg/pull/31275))
-  - Fix submenu direction justification regression. ([31414](https://github.com/WordPress/gutenberg/pull/31414))
-  - Fix submenu hover issue. ([31195](https://github.com/WordPress/gutenberg/pull/31195))
-  - Fix vertical alignment. ([31376](https://github.com/WordPress/gutenberg/pull/31376))
-  - Indicate unsaved changes. ([31119](https://github.com/WordPress/gutenberg/pull/31119))
-  - Move selected menu ID to the store. ([31320](https://github.com/WordPress/gutenberg/pull/31320))
-  - Move the delete menu button at the bottom. ([31026](https://github.com/WordPress/gutenberg/pull/31026))
-  - Standardise and fix parsing and serialization of blocks and nav menu items. ([31004](https://github.com/WordPress/gutenberg/pull/31004))
-  - Sync menu name updates. ([31093](https://github.com/WordPress/gutenberg/pull/31093))
-  - Try: Remove padding from menu items when no background. ([30805](https://github.com/WordPress/gutenberg/pull/30805))
-  - Use `ajaxurl` global in `batchSave` action. ([31028](https://github.com/WordPress/gutenberg/pull/31028))
+-   Block-based Widgets:
+    -   API:
+        -   Remove widget screen dead code. ([31411](https://github.com/WordPress/gutenberg/pull/31411))
+        -   Set order of Widgets submenu item. ([31214](https://github.com/WordPress/gutenberg/pull/31214))
+        -   Use `gutenberg_get_block_categories` for getting block categories. ([31486](https://github.com/WordPress/gutenberg/pull/31486))
+    -   Customizer:
+        -   Add white background. ([31487](https://github.com/WordPress/gutenberg/pull/31487))
+        -   Fix adding new legacy widget. ([31490](https://github.com/WordPress/gutenberg/pull/31490))
+        -   Fix Legacy Widget block. ([31405](https://github.com/WordPress/gutenberg/pull/31405))
+        -   Fix toolbar so that it overlaps preview. ([31077](https://github.com/WordPress/gutenberg/pull/31077))
+        -   Fix unable to publish edited legacy widgets. ([31484](https://github.com/WordPress/gutenberg/pull/31484))
+        -   Fix unable to get block refs in widgets customizer. ([31262](https://github.com/WordPress/gutenberg/pull/31262))
+        -   Focus control in widgets customizer. ([31308](https://github.com/WordPress/gutenberg/pull/31308))
+        -   Make the entire sidebar have a white background. ([31492](https://github.com/WordPress/gutenberg/pull/31492))
+        -   Show blocks from plugins. ([31406](https://github.com/WordPress/gutenberg/pull/31406))
+    -   Legacy Widget:
+        -   Add 'Convert to blocks' button for text widgets. ([31215](https://github.com/WordPress/gutenberg/pull/31215))
+        -   Implement design iterations. ([30889](https://github.com/WordPress/gutenberg/pull/30889))
+        -   Ensure the control form's IDs have a consistent number. ([31485](https://github.com/WordPress/gutenberg/pull/31485))
+        -   Refactor Form to not use React. ([31444](https://github.com/WordPress/gutenberg/pull/31444))
+    -   Widget Editor:
+        -   Ensure _Hello Dolly_ plugin text doesn't overlap the widgets screen UI. ([30729](https://github.com/WordPress/gutenberg/pull/30729))
+        -   Fix entity deletion in widgets screen. ([31404](https://github.com/WordPress/gutenberg/pull/31404))
+        -   Fix _move to widget area_ item checkmark. ([31494](https://github.com/WordPress/gutenberg/pull/31494))
+        -   Improve theme switching experience. ([31407](https://github.com/WordPress/gutenberg/pull/31407))
+        -   _Move to widget area_ iterations and fixes. ([31445](https://github.com/WordPress/gutenberg/pull/31445))
+-   Global Styles:
+    -   Add a new endpoint that exposes block editor settings through the REST API. ([29969](https://github.com/WordPress/gutenberg/pull/29969))
+    -   Add theme origin to `getStyle`. ([31267](https://github.com/WordPress/gutenberg/pull/31267))
+    -   Block Supports: Allow skipping serialization of font size. ([30879](https://github.com/WordPress/gutenberg/pull/30879))
+    -   Create block metadata for all blocks. ([31590](https://github.com/WordPress/gutenberg/pull/31590))
+    -   Cover against a block being unregistered. ([31588](https://github.com/WordPress/gutenberg/pull/31588))
+    -   Fix Possible CSS units not passed to `useCustomUnits`. ([31057](https://github.com/WordPress/gutenberg/pull/31057))
+    -   Make the configuration resilient to changes to `safecss_filter_attr()`. ([30888](https://github.com/WordPress/gutenberg/pull/30888))
+    -   Preset classes for site editor: Generate them like in the front-end. ([31218](https://github.com/WordPress/gutenberg/pull/31218))
+    -   Remove specificify for link color. ([31497](https://github.com/WordPress/gutenberg/pull/31497))
+    -   Remove tests and make utility methods private. ([31224](https://github.com/WordPress/gutenberg/pull/31224))
+    -   Rename `experimental-theme.json` to `theme.json` and add a fallback for backwards-compatibility. ([29981](https://github.com/WordPress/gutenberg/pull/29981))
+    -   Site Editor:
+        -   Fix generation of preset class for border color. ([31217](https://github.com/WordPress/gutenberg/pull/31217))
+        -   Fix preset class specificity. ([31204](https://github.com/WordPress/gutenberg/pull/31204))
+    -   Target global styles to the `body` element instead of `:root`. ([31302](https://github.com/WordPress/gutenberg/pull/31302))
+    -   Themes: only split block styles loading for block themes. ([31309](https://github.com/WordPress/gutenberg/pull/31309))
+    -   Update shape of theme.json. ([30541](https://github.com/WordPress/gutenberg/pull/30541))
+-   Navigation Editor and Block:
+    -   Block placeholder: fix font inheritance. ([31410](https://github.com/WordPress/gutenberg/pull/31410))
+    -   Correctly display menu used on location text. ([31500](https://github.com/WordPress/gutenberg/pull/31500))
+    -   Fix issue with missing styles for `Page List` in navigation. ([31368](https://github.com/WordPress/gutenberg/pull/31368))
+    -   Fix navigation screen collapsing regression. ([31228](https://github.com/WordPress/gutenberg/pull/31228))
+    -   Fix navigation screen padding again. ([31372](https://github.com/WordPress/gutenberg/pull/31372))
+    -   Fix nav color regression. ([31495](https://github.com/WordPress/gutenberg/pull/31495))
+    -   Fix nav editor links to correctly persist new tab target attribute. ([30956](https://github.com/WordPress/gutenberg/pull/30956))
+    -   Fix padding and cursor for nav menu item placeholder. ([31275](https://github.com/WordPress/gutenberg/pull/31275))
+    -   Fix submenu direction justification regression. ([31414](https://github.com/WordPress/gutenberg/pull/31414))
+    -   Fix submenu hover issue. ([31195](https://github.com/WordPress/gutenberg/pull/31195))
+    -   Fix vertical alignment. ([31376](https://github.com/WordPress/gutenberg/pull/31376))
+    -   Indicate unsaved changes. ([31119](https://github.com/WordPress/gutenberg/pull/31119))
+    -   Move selected menu ID to the store. ([31320](https://github.com/WordPress/gutenberg/pull/31320))
+    -   Move the delete menu button at the bottom. ([31026](https://github.com/WordPress/gutenberg/pull/31026))
+    -   Standardise and fix parsing and serialization of blocks and nav menu items. ([31004](https://github.com/WordPress/gutenberg/pull/31004))
+    -   Sync menu name updates. ([31093](https://github.com/WordPress/gutenberg/pull/31093))
+    -   Try: Remove padding from menu items when no background. ([30805](https://github.com/WordPress/gutenberg/pull/30805))
+    -   Use `ajaxurl` global in `batchSave` action. ([31028](https://github.com/WordPress/gutenberg/pull/31028))
 
 ### Documentation
 
-- Docs
-  - Add in more high level overviews of major FSE projects. ([31295](https://github.com/WordPress/gutenberg/pull/31295))
-  - Create a Full Site Editing overview document. ([31065](https://github.com/WordPress/gutenberg/pull/31065))
-  - Fix the broken links of register block type documentation. ([31285](https://github.com/WordPress/gutenberg/pull/31285))
-  - Global Styles: Update documentation for theme.json. ([31507](https://github.com/WordPress/gutenberg/pull/31507))
-  - Link to CSS that `wp-block-styles` include. ([30433](https://github.com/WordPress/gutenberg/pull/30433))
-  - Minor design updates using callout. ([31398](https://github.com/WordPress/gutenberg/pull/31398))
-  - Organize and update block theme documentation. ([31167](https://github.com/WordPress/gutenberg/pull/31167))
-  - Packages: Drop suppport for IE 11 and non-LTS Node.js versions. ([31270](https://github.com/WordPress/gutenberg/pull/31270))
-  - Remove broken links to gutenberg-core team. ([31161](https://github.com/WordPress/gutenberg/pull/31161))
-  - Update Versions in WordPress to include 5.7.1 & 5.8. ([31439](https://github.com/WordPress/gutenberg/pull/31439))
-  - Update contributing documentation with callout notice usage. ([31202](https://github.com/WordPress/gutenberg/pull/31202))
-- Handbook:
-  - Add a deprecation notice to meta block attribute sources. ([31389](https://github.com/WordPress/gutenberg/pull/31389))
-  - Block Patterns Doc Updates. ([31060](https://github.com/WordPress/gutenberg/pull/31060))
+-   Docs
+    -   Add in more high level overviews of major FSE projects. ([31295](https://github.com/WordPress/gutenberg/pull/31295))
+    -   Create a Full Site Editing overview document. ([31065](https://github.com/WordPress/gutenberg/pull/31065))
+    -   Fix the broken links of register block type documentation. ([31285](https://github.com/WordPress/gutenberg/pull/31285))
+    -   Global Styles: Update documentation for theme.json. ([31507](https://github.com/WordPress/gutenberg/pull/31507))
+    -   Link to CSS that `wp-block-styles` include. ([30433](https://github.com/WordPress/gutenberg/pull/30433))
+    -   Minor design updates using callout. ([31398](https://github.com/WordPress/gutenberg/pull/31398))
+    -   Organize and update block theme documentation. ([31167](https://github.com/WordPress/gutenberg/pull/31167))
+    -   Packages: Drop suppport for IE 11 and non-LTS Node.js versions. ([31270](https://github.com/WordPress/gutenberg/pull/31270))
+    -   Remove broken links to gutenberg-core team. ([31161](https://github.com/WordPress/gutenberg/pull/31161))
+    -   Update Versions in WordPress to include 5.7.1 & 5.8. ([31439](https://github.com/WordPress/gutenberg/pull/31439))
+    -   Update contributing documentation with callout notice usage. ([31202](https://github.com/WordPress/gutenberg/pull/31202))
+-   Handbook:
+    -   Add a deprecation notice to meta block attribute sources. ([31389](https://github.com/WordPress/gutenberg/pull/31389))
+    -   Block Patterns Doc Updates. ([31060](https://github.com/WordPress/gutenberg/pull/31060))
 
 ### Code Quality
 
-- Block Editor:
-  - BlockList: Normalise `useSelect` selectors for callbacks. ([31078](https://github.com/WordPress/gutenberg/pull/31078))
-  - Default appender: Try editable paragraph instead of text area. ([30986](https://github.com/WordPress/gutenberg/pull/30986))
-  - In-between inserter:
-    - Use `useRefCallback` and `showInsertionPoint`. ([30285](https://github.com/WordPress/gutenberg/pull/30285))
-    - On hover: Preserve original behaviour. ([31266](https://github.com/WordPress/gutenberg/pull/31266))
-  - Move block tools components and styles to separate folder. ([31313](https://github.com/WordPress/gutenberg/pull/31313))
-  - Multi-selection:
-    - Move `shift+click` logic to hook. ([31358](https://github.com/WordPress/gutenberg/pull/31358))
-    - Move handlers to block ref callback. ([31334](https://github.com/WordPress/gutenberg/pull/31334))
-  - Writing flow: Move selector calls to event handlers. ([31332](https://github.com/WordPress/gutenberg/pull/31332))
-- Block Library:
-  - Remove no longer necessary `render_callback` for Cover block. ([31503](https://github.com/WordPress/gutenberg/pull/31503))
-  - Move translatable fields to `block.json` files. ([31120](https://github.com/WordPress/gutenberg/pull/31120))
-- Components:
-  - Remove all remnants of wp-g2. ([31292](https://github.com/WordPress/gutenberg/pull/31292))
-  - Remove wp-g2 from scrollable. ([31207](https://github.com/WordPress/gutenberg/pull/31207))
-  - Remove G2 portal and refactor Popover to no longer use G2. ([31209](https://github.com/WordPress/gutenberg/pull/31209))
-  - Remove wp-g2 fontsize control. ([31287](https://github.com/WordPress/gutenberg/pull/31287))
-  - Remove wp-g2 from flex, vstack, hstack, spinner and contr…. ([31243](https://github.com/WordPress/gutenberg/pull/31243))
-  - Remove wp-g2 from surface. ([31238](https://github.com/WordPress/gutenberg/pull/31238))
-  - Remove wp-g2 from form-group and control-label. ([31234](https://github.com/WordPress/gutenberg/pull/31234))
-  - Remove wp-g2 from tooltip. ([31232](https://github.com/WordPress/gutenberg/pull/31232))
-  - Remove wp-g2 imports from elevation. ([31230](https://github.com/WordPress/gutenberg/pull/31230))
-  - Remove wp-g2 imports from shortcut. ([31229](https://github.com/WordPress/gutenberg/pull/31229))
-  - Remove wp-g2 imports from ui/divider. ([31212](https://github.com/WordPress/gutenberg/pull/31212))
-  - Remove wp-g2 imports from visually-hidden. ([31210](https://github.com/WordPress/gutenberg/pull/31210))
-  - Remove ui/button and ui/button-group. ([31205](https://github.com/WordPress/gutenberg/pull/31205))
-  - Deprecate the heading prop for the CheckboxControl component. ([30594](https://github.com/WordPress/gutenberg/pull/30594))
-- Compose: Add types to `createHigherOrderComponent`, `ifCondition` and `pure`. ([30881](https://github.com/WordPress/gutenberg/pull/30881))
-- Core Data: Specify context=edit only when needed. ([30482](https://github.com/WordPress/gutenberg/pull/30482))
-- Data: Update `redux` dependency to the latest version. ([31318](https://github.com/WordPress/gutenberg/pull/31318))
-- Mark the `__experimentalBlockSettingsMenuFirstItem` slot as unstable. ([31420](https://github.com/WordPress/gutenberg/pull/31420))
-- Remove the block wrapper component. ([31419](https://github.com/WordPress/gutenberg/pull/31419))
-- General Interface: Fix typo - toogle / toggle. ([31225](https://github.com/WordPress/gutenberg/pull/31225))
-- Packages:
-  - Fix linting warnings for `core/block-editor` store. ([31146](https://github.com/WordPress/gutenberg/pull/31146))
-  - Update lodash to the latest patch version. ([31686](https://github.com/WordPress/gutenberg/pull/31686))
-- Plugin:
-  - Add missing textdomains. ([31131](https://github.com/WordPress/gutenberg/pull/31131))
-  - Cleanup unused function parameters. ([31130](https://github.com/WordPress/gutenberg/pull/31130))
-- Rich text:
-  - Extract undo automatic change. ([31449](https://github.com/WordPress/gutenberg/pull/31449))
-  - Move format boundaries to ref callback and separate file. ([31409](https://github.com/WordPress/gutenberg/pull/31409))
+-   Block Editor:
+    -   BlockList: Normalise `useSelect` selectors for callbacks. ([31078](https://github.com/WordPress/gutenberg/pull/31078))
+    -   Default appender: Try editable paragraph instead of text area. ([30986](https://github.com/WordPress/gutenberg/pull/30986))
+    -   In-between inserter:
+        -   Use `useRefCallback` and `showInsertionPoint`. ([30285](https://github.com/WordPress/gutenberg/pull/30285))
+        -   On hover: Preserve original behaviour. ([31266](https://github.com/WordPress/gutenberg/pull/31266))
+    -   Move block tools components and styles to separate folder. ([31313](https://github.com/WordPress/gutenberg/pull/31313))
+    -   Multi-selection:
+        -   Move `shift+click` logic to hook. ([31358](https://github.com/WordPress/gutenberg/pull/31358))
+        -   Move handlers to block ref callback. ([31334](https://github.com/WordPress/gutenberg/pull/31334))
+    -   Writing flow: Move selector calls to event handlers. ([31332](https://github.com/WordPress/gutenberg/pull/31332))
+-   Block Library:
+    -   Remove no longer necessary `render_callback` for Cover block. ([31503](https://github.com/WordPress/gutenberg/pull/31503))
+    -   Move translatable fields to `block.json` files. ([31120](https://github.com/WordPress/gutenberg/pull/31120))
+-   Components:
+    -   Remove all remnants of wp-g2. ([31292](https://github.com/WordPress/gutenberg/pull/31292))
+    -   Remove wp-g2 from scrollable. ([31207](https://github.com/WordPress/gutenberg/pull/31207))
+    -   Remove G2 portal and refactor Popover to no longer use G2. ([31209](https://github.com/WordPress/gutenberg/pull/31209))
+    -   Remove wp-g2 fontsize control. ([31287](https://github.com/WordPress/gutenberg/pull/31287))
+    -   Remove wp-g2 from flex, vstack, hstack, spinner and contr…. ([31243](https://github.com/WordPress/gutenberg/pull/31243))
+    -   Remove wp-g2 from surface. ([31238](https://github.com/WordPress/gutenberg/pull/31238))
+    -   Remove wp-g2 from form-group and control-label. ([31234](https://github.com/WordPress/gutenberg/pull/31234))
+    -   Remove wp-g2 from tooltip. ([31232](https://github.com/WordPress/gutenberg/pull/31232))
+    -   Remove wp-g2 imports from elevation. ([31230](https://github.com/WordPress/gutenberg/pull/31230))
+    -   Remove wp-g2 imports from shortcut. ([31229](https://github.com/WordPress/gutenberg/pull/31229))
+    -   Remove wp-g2 imports from ui/divider. ([31212](https://github.com/WordPress/gutenberg/pull/31212))
+    -   Remove wp-g2 imports from visually-hidden. ([31210](https://github.com/WordPress/gutenberg/pull/31210))
+    -   Remove ui/button and ui/button-group. ([31205](https://github.com/WordPress/gutenberg/pull/31205))
+    -   Deprecate the heading prop for the CheckboxControl component. ([30594](https://github.com/WordPress/gutenberg/pull/30594))
+-   Compose: Add types to `createHigherOrderComponent`, `ifCondition` and `pure`. ([30881](https://github.com/WordPress/gutenberg/pull/30881))
+-   Core Data: Specify context=edit only when needed. ([30482](https://github.com/WordPress/gutenberg/pull/30482))
+-   Data: Update `redux` dependency to the latest version. ([31318](https://github.com/WordPress/gutenberg/pull/31318))
+-   Mark the `__experimentalBlockSettingsMenuFirstItem` slot as unstable. ([31420](https://github.com/WordPress/gutenberg/pull/31420))
+-   Remove the block wrapper component. ([31419](https://github.com/WordPress/gutenberg/pull/31419))
+-   General Interface: Fix typo - toogle / toggle. ([31225](https://github.com/WordPress/gutenberg/pull/31225))
+-   Packages:
+    -   Fix linting warnings for `core/block-editor` store. ([31146](https://github.com/WordPress/gutenberg/pull/31146))
+    -   Update lodash to the latest patch version. ([31686](https://github.com/WordPress/gutenberg/pull/31686))
+-   Plugin:
+    -   Add missing textdomains. ([31131](https://github.com/WordPress/gutenberg/pull/31131))
+    -   Cleanup unused function parameters. ([31130](https://github.com/WordPress/gutenberg/pull/31130))
+-   Rich text:
+    -   Extract undo automatic change. ([31449](https://github.com/WordPress/gutenberg/pull/31449))
+    -   Move format boundaries to ref callback and separate file. ([31409](https://github.com/WordPress/gutenberg/pull/31409))
 
 ### Tools
 
-- Build Tooling:
-  - Also rebuild block-specific styles in dev mode. ([31274](https://github.com/WordPress/gutenberg/pull/31274))
-  - Remove support for IE11. ([31110](https://github.com/WordPress/gutenberg/pull/31110))
-  - Fix recursive filewatching on linux. ([31102](https://github.com/WordPress/gutenberg/pull/31102))
-- Testing:
-  - end-to-end wpDataSelect: Explain why it returns undefined sometimes. ([31227](https://github.com/WordPress/gutenberg/pull/31227))
-  - end-to-end testing: Use JSON serialization for getAllBlocks. ([31199](https://github.com/WordPress/gutenberg/pull/31199))
-  - end-to-end tests for Widgets Customizer. ([31185](https://github.com/WordPress/gutenberg/pull/31185))
-  - end-to-end Site Editor: Evaluate getEditedPostContent on the page. ([31121](https://github.com/WordPress/gutenberg/pull/31121))
-  - Fix entity saving intermittent test failure. ([31157](https://github.com/WordPress/gutenberg/pull/31157))
-  - Fix tests failing on expected site tagline snapshot. ([31473](https://github.com/WordPress/gutenberg/pull/31473))
-  - Fix not getting correct `computedName` with labels in chromium 91. ([31175](https://github.com/WordPress/gutenberg/pull/31175))
-  - Fix snapshots broken in trunk. ([31247](https://github.com/WordPress/gutenberg/pull/31247))
-  - Fix undo end-to-end test. ([31160](https://github.com/WordPress/gutenberg/pull/31160))
-  - Stabilise typewriter end-to-end test. ([31472](https://github.com/WordPress/gutenberg/pull/31472))
-  - Use `puppeteer-testing-library` in end-to-end tests. ([28380](https://github.com/WordPress/gutenberg/pull/28380))
-  - Use `jest-circus` in unit tests. ([31178](https://github.com/WordPress/gutenberg/pull/31178))
-  - Upgrade `puppeteer-testing-library` version. ([31133](https://github.com/WordPress/gutenberg/pull/31133))
-- Scripts:
-  - Add `.prettierignore`, use in `format` script. ([30844](https://github.com/WordPress/gutenberg/pull/30844))
-  - Add `postcss` as a dependency to ensure a correct version is used. ([31364](https://github.com/WordPress/gutenberg/pull/31364))
-  - Update `puppeteer-core` to the latest version. ([31138](https://github.com/WordPress/gutenberg/pull/31138))
-  - Update PostCSS minimum version to ensure it is secure. ([31685](https://github.com/WordPress/gutenberg/pull/31685))
-- Workflows:
-  - Run tests on release branches. ([31354](https://github.com/WordPress/gutenberg/pull/31354))
-  - Adds reporter that shows JS test errors on GitHub. ([31041](https://github.com/WordPress/gutenberg/pull/31041))
-- wp-env: fix can't checkout git repositories of a specific tag. ([31271](https://github.com/WordPress/gutenberg/pull/31271))
-- Native:
-  - Moves hermes and react-native mirror to S3. ([31441](https://github.com/WordPress/gutenberg/pull/31441))
-  - Publish android artifacts to s3. ([30421](https://github.com/WordPress/gutenberg/pull/30421))
-- Storybook: Update `BoxControl` stories. ([31029](https://github.com/WordPress/gutenberg/pull/31029))
+-   Build Tooling:
+    -   Also rebuild block-specific styles in dev mode. ([31274](https://github.com/WordPress/gutenberg/pull/31274))
+    -   Remove support for IE11. ([31110](https://github.com/WordPress/gutenberg/pull/31110))
+    -   Fix recursive filewatching on linux. ([31102](https://github.com/WordPress/gutenberg/pull/31102))
+-   Testing:
+    -   end-to-end wpDataSelect: Explain why it returns undefined sometimes. ([31227](https://github.com/WordPress/gutenberg/pull/31227))
+    -   end-to-end testing: Use JSON serialization for getAllBlocks. ([31199](https://github.com/WordPress/gutenberg/pull/31199))
+    -   end-to-end tests for Widgets Customizer. ([31185](https://github.com/WordPress/gutenberg/pull/31185))
+    -   end-to-end Site Editor: Evaluate getEditedPostContent on the page. ([31121](https://github.com/WordPress/gutenberg/pull/31121))
+    -   Fix entity saving intermittent test failure. ([31157](https://github.com/WordPress/gutenberg/pull/31157))
+    -   Fix tests failing on expected site tagline snapshot. ([31473](https://github.com/WordPress/gutenberg/pull/31473))
+    -   Fix not getting correct `computedName` with labels in chromium 91. ([31175](https://github.com/WordPress/gutenberg/pull/31175))
+    -   Fix snapshots broken in trunk. ([31247](https://github.com/WordPress/gutenberg/pull/31247))
+    -   Fix undo end-to-end test. ([31160](https://github.com/WordPress/gutenberg/pull/31160))
+    -   Stabilise typewriter end-to-end test. ([31472](https://github.com/WordPress/gutenberg/pull/31472))
+    -   Use `puppeteer-testing-library` in end-to-end tests. ([28380](https://github.com/WordPress/gutenberg/pull/28380))
+    -   Use `jest-circus` in unit tests. ([31178](https://github.com/WordPress/gutenberg/pull/31178))
+    -   Upgrade `puppeteer-testing-library` version. ([31133](https://github.com/WordPress/gutenberg/pull/31133))
+-   Scripts:
+    -   Add `.prettierignore`, use in `format` script. ([30844](https://github.com/WordPress/gutenberg/pull/30844))
+    -   Add `postcss` as a dependency to ensure a correct version is used. ([31364](https://github.com/WordPress/gutenberg/pull/31364))
+    -   Update `puppeteer-core` to the latest version. ([31138](https://github.com/WordPress/gutenberg/pull/31138))
+    -   Update PostCSS minimum version to ensure it is secure. ([31685](https://github.com/WordPress/gutenberg/pull/31685))
+-   Workflows:
+    -   Run tests on release branches. ([31354](https://github.com/WordPress/gutenberg/pull/31354))
+    -   Adds reporter that shows JS test errors on GitHub. ([31041](https://github.com/WordPress/gutenberg/pull/31041))
+-   wp-env: fix can't checkout git repositories of a specific tag. ([31271](https://github.com/WordPress/gutenberg/pull/31271))
+-   Native:
+    -   Moves hermes and react-native mirror to S3. ([31441](https://github.com/WordPress/gutenberg/pull/31441))
+    -   Publish android artifacts to s3. ([30421](https://github.com/WordPress/gutenberg/pull/30421))
+-   Storybook: Update `BoxControl` stories. ([31029](https://github.com/WordPress/gutenberg/pull/31029))
 
 ### Various
 
-- Plugin: Tweaks to accommodate latest changes in core for styles loading. ([31702](https://github.com/WordPress/gutenberg/pull/31702))
-- Site Logo: Rename sitelogo to site_logo. ([31511](https://github.com/WordPress/gutenberg/pull/31511))
-
+-   Plugin: Tweaks to accommodate latest changes in core for styles loading. ([31702](https://github.com/WordPress/gutenberg/pull/31702))
+-   Site Logo: Rename sitelogo to site_logo. ([31511](https://github.com/WordPress/gutenberg/pull/31511))
 
 = 10.5.4 =
 
-### Bug Fixes
-
-- Fix for template order logic. ([31478](https://github.com/WordPress/gutenberg/pull/31478))  ([31336](https://github.com/WordPress/gutenberg/pull/31336))
-
+## Changelog
 
+### Bug Fixes
 
+-   Fix for template order logic. ([31478](https://github.com/WordPress/gutenberg/pull/31478)) ([31336](https://github.com/WordPress/gutenberg/pull/31336))
 
 = 10.5.3 =
 
-## Bug Fixes
+## Changelog
 
- - Fix the stylesheet loading order for non FSE themes.
+### Bug Fixes
 
+-   Fix the stylesheet loading order for non FSE themes.
 
 = 10.5.2 =
 
-## Bug Fixes
+## Changelog
 
- - Include new API for useSelect to prevent the global editor white screen.
+### Bug Fixes
 
+-   Include new API for useSelect to prevent the global editor white screen.
 
 = 10.5.1 =
 
-
+## Changelog
 
 ### Bug Fixes
 
-- Plugin: Fix "Undefined variable: $image_default_size". ([31324](https://github.com/WordPress/gutenberg/pull/31324))
-- Select mode: Fix navigate by pointer. ([31321](https://github.com/WordPress/gutenberg/pull/31321))
-- Fix Inserter Drag and Drop. ([31319](https://github.com/WordPress/gutenberg/pull/31319))
+-   Plugin: Fix "Undefined variable: $image_default_size". ([31324](https://github.com/WordPress/gutenberg/pull/31324))
+-   Select mode: Fix navigate by pointer. ([31321](https://github.com/WordPress/gutenberg/pull/31321))
+-   Fix Inserter Drag and Drop. ([31319](https://github.com/WordPress/gutenberg/pull/31319))
 
 ### Code Quality
 
-- Plugin: Unregister only registered block patterns. ([31325](https://github.com/WordPress/gutenberg/pull/31325))
+-   Plugin: Unregister only registered block patterns. ([31325](https://github.com/WordPress/gutenberg/pull/31325))
 
+= 10.5.0 =
 
+## Changelog
 
+### Enhancements
 
-= 10.5.0 =
+-   Block Library:
+    -   Buttons:
+        -   Add Typography support. ([30394](https://github.com/WordPress/gutenberg/pull/30394))
+        -   Explicitly add text-align-center to legacy buttons. ([30525](https://github.com/WordPress/gutenberg/pull/30525))
+        -   Update to use color support utils to retrieve classes and styles. ([30870](https://github.com/WordPress/gutenberg/pull/30870))
+    -   Columns: Add column count to the column block label. ([30248](https://github.com/WordPress/gutenberg/pull/30248))
+    -   File: Add support for embedding PDFs. ([30857](https://github.com/WordPress/gutenberg/pull/30857))
+    -   List: Add placeholder attribute. ([30958](https://github.com/WordPress/gutenberg/pull/30958))
+    -   Post Comments Link: New block added. ([29564](https://github.com/WordPress/gutenberg/pull/29564))
+    -   Site Logo:
+        -   Update the site logo description to be more illustrative. ([30909](https://github.com/WordPress/gutenberg/pull/30909))
+        -   Add an initial value to the Site Logo block. ([30907](https://github.com/WordPress/gutenberg/pull/30907))
+    -   Site Title:
+        -   Normalize the toolbar. ([30999](https://github.com/WordPress/gutenberg/pull/30999))
+        -   Normalize the toolbar (II). ([31032](https://github.com/WordPress/gutenberg/pull/31032))
+    -   Social Links:
+        -   Add text placeholder next to appender. ([29851](https://github.com/WordPress/gutenberg/pull/29851))
+        -   Remove obsolete hardcoded focus style from Social Links. ([30721](https://github.com/WordPress/gutenberg/pull/30721))
+    -   Template Part: Add active block variation information in Block Parent Selector. ([30731](https://github.com/WordPress/gutenberg/pull/30731))
+    -   Term Description: Don't output if there's no description. ([30564](https://github.com/WordPress/gutenberg/pull/30564))
+    -   Verse: Add support for custom colors. ([27736](https://github.com/WordPress/gutenberg/pull/27736))
+    -   Video: Add uploading state. ([30837](https://github.com/WordPress/gutenberg/pull/30837))
+-   Block Patterns:
+    -   Revisit the bundled block patterns. ([29973](https://github.com/WordPress/gutenberg/pull/29973))
+    -   Small adjustments to bundled block patterns. ([31105](https://github.com/WordPress/gutenberg/pull/31105))
+    -   Suggest block pattern transformations that are contextual to the currently selected 'simple' blocks (no InnerBlocks). ([30469](https://github.com/WordPress/gutenberg/pull/30469))
+    -   Query Patterns:
+        -   Try more opinionated query block patterns. ([30763](https://github.com/WordPress/gutenberg/pull/30763))
+        -   Add the small image and title pattern back in, fix excerpt length.. ([30817](https://github.com/WordPress/gutenberg/pull/30817))
+-   Components: Add create-styles. ([30509](https://github.com/WordPress/gutenberg/pull/30509))
+-   Design Tools:
+    -   Add border color, style and width support. ([30124](https://github.com/WordPress/gutenberg/pull/30124))
+    -   BoxControl: Allow configurable sides. ([30606](https://github.com/WordPress/gutenberg/pull/30606))
+    -   Color Block Support: Add utilities to retrieve color classes and styles. ([30869](https://github.com/WordPress/gutenberg/pull/30869))
+-   General Interface:
+    -   Animate the canvas transitions. ([30802](https://github.com/WordPress/gutenberg/pull/30802))
+    -   Include block title into block switcher label. ([30808](https://github.com/WordPress/gutenberg/pull/30808))
+    -   Inspector Controls: Rephrase, polish, and make consistent color labels. ([30075](https://github.com/WordPress/gutenberg/pull/30075))
+    -   Move the template mode edit and new links to a dedicated template panel. ([30900](https://github.com/WordPress/gutenberg/pull/30900))
+    -   Update design of the resize handles. ([30339](https://github.com/WordPress/gutenberg/pull/30339))
+-   Icons: Update icons for text overlay and crop. ([30673](https://github.com/WordPress/gutenberg/pull/30673))
+-   i18n: Add `resetLocaleData` method. ([30419](https://github.com/WordPress/gutenberg/pull/30419))
+-   Publishing Flow: Show post events in the post schedule calendar. ([29716](https://github.com/WordPress/gutenberg/pull/29716))
+-   Template Editing Mode:
+    -   Allow creating custom block templates in classic themes. ([30438](https://github.com/WordPress/gutenberg/pull/30438))
+    -   Replace the document tab with a template tab in template mode. ([30860](https://github.com/WordPress/gutenberg/pull/30860))
+    -   Unify saving flow between template mode and default mode. ([30793](https://github.com/WordPress/gutenberg/pull/30793))
+    -   Updates the template mode canvas padding and adds a backlink. ([30658](https://github.com/WordPress/gutenberg/pull/30658))
+-   Site Editor:
+    -   Add 'area' selection to convert to template part flow. ([30395](https://github.com/WordPress/gutenberg/pull/30395))
+    -   Add do_block_template_part function. ([30345](https://github.com/WordPress/gutenberg/pull/30345))
+    -   Add skip link to block templates. ([30336](https://github.com/WordPress/gutenberg/pull/30336))
+    -   Remove single-post from the default templates set. ([29668](https://github.com/WordPress/gutenberg/pull/29668))
+    -   Themes: Fix template-hierarchy fallbacks. ([30599](https://github.com/WordPress/gutenberg/pull/30599))
+-   Writing Flow: Scroll selected block only if it has no focus. ([30924](https://github.com/WordPress/gutenberg/pull/30924))
 
-### Enhancements
+### Bug Fixes
 
-- Block Library:
-  - Buttons:
-    - Add Typography support. ([30394](https://github.com/WordPress/gutenberg/pull/30394))
-    - Explicitly add text-align-center to legacy buttons. ([30525](https://github.com/WordPress/gutenberg/pull/30525))
-    - Update to use color support utils to retrieve classes and styles. ([30870](https://github.com/WordPress/gutenberg/pull/30870))
-  - Columns: Add column count to the column block label. ([30248](https://github.com/WordPress/gutenberg/pull/30248))
-  - File: Add support for embedding PDFs. ([30857](https://github.com/WordPress/gutenberg/pull/30857))
-  - List: Add placeholder attribute. ([30958](https://github.com/WordPress/gutenberg/pull/30958))
-  - Post Comments Link: New block added. ([29564](https://github.com/WordPress/gutenberg/pull/29564))
-  - Site Logo:
-    - Update the site logo description to be more illustrative. ([30909](https://github.com/WordPress/gutenberg/pull/30909))
-    - Add an initial value to the Site Logo block. ([30907](https://github.com/WordPress/gutenberg/pull/30907))
-  - Site Title:
-    - Normalize the toolbar. ([30999](https://github.com/WordPress/gutenberg/pull/30999))
-    - Normalize the toolbar (II). ([31032](https://github.com/WordPress/gutenberg/pull/31032))
-  - Social Links:
-    - Add text placeholder next to appender. ([29851](https://github.com/WordPress/gutenberg/pull/29851))
-    - Remove obsolete hardcoded focus style from Social Links. ([30721](https://github.com/WordPress/gutenberg/pull/30721))
-  - Template Part: Add active block variation information in Block Parent Selector. ([30731](https://github.com/WordPress/gutenberg/pull/30731))
-  - Term Description: Don't output if there's no description. ([30564](https://github.com/WordPress/gutenberg/pull/30564))
-  - Verse: Add support for custom colors. ([27736](https://github.com/WordPress/gutenberg/pull/27736))
-  - Video: Add uploading state. ([30837](https://github.com/WordPress/gutenberg/pull/30837))
-- Block Patterns:
-  - Revisit the bundled block patterns. ([29973](https://github.com/WordPress/gutenberg/pull/29973))
-  - Small adjustments to bundled block patterns. ([31105](https://github.com/WordPress/gutenberg/pull/31105))
-  - Suggest block pattern transformations that are contextual to the currently selected 'simple' blocks (no InnerBlocks). ([30469](https://github.com/WordPress/gutenberg/pull/30469))
-  - Query Patterns:
-    - Try more opinionated query block patterns. ([30763](https://github.com/WordPress/gutenberg/pull/30763))
-    - Add the small image and title pattern back in, fix excerpt length.. ([30817](https://github.com/WordPress/gutenberg/pull/30817))
-- Components: Add create-styles. ([30509](https://github.com/WordPress/gutenberg/pull/30509))
-- Design Tools:
-  - Add border color, style and width support. ([30124](https://github.com/WordPress/gutenberg/pull/30124))
-  - BoxControl: Allow configurable sides. ([30606](https://github.com/WordPress/gutenberg/pull/30606))
-  - Color Block Support: Add utilities to retrieve color classes and styles. ([30869](https://github.com/WordPress/gutenberg/pull/30869))
-- General Interface:
-  - Animate the canvas transitions. ([30802](https://github.com/WordPress/gutenberg/pull/30802))
-  - Include block title into block switcher label. ([30808](https://github.com/WordPress/gutenberg/pull/30808))
-  - Inspector Controls: Rephrase, polish, and make consistent color labels. ([30075](https://github.com/WordPress/gutenberg/pull/30075))
-  - Move the template mode edit and new links to a dedicated template panel. ([30900](https://github.com/WordPress/gutenberg/pull/30900))
-  - Update design of the resize handles. ([30339](https://github.com/WordPress/gutenberg/pull/30339))
-- Icons: Update icons for text overlay and crop. ([30673](https://github.com/WordPress/gutenberg/pull/30673))
-- i18n: Add `resetLocaleData` method. ([30419](https://github.com/WordPress/gutenberg/pull/30419))
-- Publishing Flow: Show post events in the post schedule calendar. ([29716](https://github.com/WordPress/gutenberg/pull/29716))
-- Template Editing Mode:
-  - Allow creating custom block templates in classic themes. ([30438](https://github.com/WordPress/gutenberg/pull/30438))
-  - Replace the document tab with a template tab in template mode. ([30860](https://github.com/WordPress/gutenberg/pull/30860))
-  - Unify saving flow between template mode and default mode. ([30793](https://github.com/WordPress/gutenberg/pull/30793))
-  - Updates the template mode canvas padding and adds a backlink. ([30658](https://github.com/WordPress/gutenberg/pull/30658))
-- Site Editor:
-  - Add 'area' selection to convert to template part flow. ([30395](https://github.com/WordPress/gutenberg/pull/30395))
-  - Add do_block_template_part function. ([30345](https://github.com/WordPress/gutenberg/pull/30345))
-  - Add skip link to block templates. ([30336](https://github.com/WordPress/gutenberg/pull/30336))
-  - Remove single-post from the default templates set. ([29668](https://github.com/WordPress/gutenberg/pull/29668))
-  - Themes: Fix template-hierarchy fallbacks. ([30599](https://github.com/WordPress/gutenberg/pull/30599))
-- Writing Flow: Scroll selected block only if it has no focus. ([30924](https://github.com/WordPress/gutenberg/pull/30924))
-
-
-### Bug Fixes
-
-- API Fetch: Make preloaded OPTIONS requests use `parse` setting. ([28862](https://github.com/WordPress/gutenberg/pull/28862))
-- Block Library:
-  - Duplicate media types to avoid bad imports. ([30973](https://github.com/WordPress/gutenberg/pull/30973))
-  - Image Block: Disable media buttons in the uploading state. ([30863](https://github.com/WordPress/gutenberg/pull/30863))
-  - Query: Fix max-height to query pattern preview. ([30757](https://github.com/WordPress/gutenberg/pull/30757))
-  - Post Title: Fix warnings for RichText in inline containers. ([30666](https://github.com/WordPress/gutenberg/pull/30666))
-  - Site Title Add default block after pressing enter at the end of Site Title. ([30996](https://github.com/WordPress/gutenberg/pull/30996))
-- Block Editor:
-  - Bring back imageDefaultSize shim for WP 5.7. ([30955](https://github.com/WordPress/gutenberg/pull/30955))
-  - Fix the position of vertical add a new block in RTL mode. ([31035](https://github.com/WordPress/gutenberg/pull/31035))
-  - Template part: Fix PHP notice for placeholder block. ([30928](https://github.com/WordPress/gutenberg/pull/30928))
-- Components:
-  - Add a StyleProvider to support CSS-in-JS components inside iframes. ([31010](https://github.com/WordPress/gutenberg/pull/31010))
-  - Apply a StyleProvider around fills that can be used inside the iframe. ([31073](https://github.com/WordPress/gutenberg/pull/31073))
-  - Fix "RadioControl: checked" style outside of Gutenberg. ([30670](https://github.com/WordPress/gutenberg/pull/30670))
-  - Fix Post Date component. ([30790](https://github.com/WordPress/gutenberg/pull/30790))
-  - Fix Post Publishing Popover moving when certain dates are clicked. ([30298](https://github.com/WordPress/gutenberg/pull/30298))
-  - Fix useForceUpdate Memory Leak: Only setState if the component is still mounted. ([30667](https://github.com/WordPress/gutenberg/pull/30667))
-- General Interface: Fix is-link style to take colors from wp-admin theme. ([30823](https://github.com/WordPress/gutenberg/pull/30823))
-- Inserter: Stop event propagation for the select element's onBlur to fix the behavior in iOS when selecting a pattern category. ([30717](https://github.com/WordPress/gutenberg/pull/30717))
-- Site Editor:
-  - Focus save button when entities save states panel is opened. ([30873](https://github.com/WordPress/gutenberg/pull/30873))
-  - Remove call to wpautop that unintentionally alters block markup in template parts. ([30552](https://github.com/WordPress/gutenberg/pull/30552))
-- Template Editing Mode: Hide the template selector and template mode from non-viewable post types. ([30861](https://github.com/WordPress/gutenberg/pull/30861))
+-   API Fetch: Make preloaded OPTIONS requests use `parse` setting. ([28862](https://github.com/WordPress/gutenberg/pull/28862))
+-   Block Library:
+    -   Duplicate media types to avoid bad imports. ([30973](https://github.com/WordPress/gutenberg/pull/30973))
+    -   Image Block: Disable media buttons in the uploading state. ([30863](https://github.com/WordPress/gutenberg/pull/30863))
+    -   Query: Fix max-height to query pattern preview. ([30757](https://github.com/WordPress/gutenberg/pull/30757))
+    -   Post Title: Fix warnings for RichText in inline containers. ([30666](https://github.com/WordPress/gutenberg/pull/30666))
+    -   Site Title Add default block after pressing enter at the end of Site Title. ([30996](https://github.com/WordPress/gutenberg/pull/30996))
+-   Block Editor:
+    -   Bring back imageDefaultSize shim for WP 5.7. ([30955](https://github.com/WordPress/gutenberg/pull/30955))
+    -   Fix the position of vertical add a new block in RTL mode. ([31035](https://github.com/WordPress/gutenberg/pull/31035))
+    -   Template part: Fix PHP notice for placeholder block. ([30928](https://github.com/WordPress/gutenberg/pull/30928))
+-   Components:
+    -   Add a StyleProvider to support CSS-in-JS components inside iframes. ([31010](https://github.com/WordPress/gutenberg/pull/31010))
+    -   Apply a StyleProvider around fills that can be used inside the iframe. ([31073](https://github.com/WordPress/gutenberg/pull/31073))
+    -   Fix "RadioControl: checked" style outside of Gutenberg. ([30670](https://github.com/WordPress/gutenberg/pull/30670))
+    -   Fix Post Date component. ([30790](https://github.com/WordPress/gutenberg/pull/30790))
+    -   Fix Post Publishing Popover moving when certain dates are clicked. ([30298](https://github.com/WordPress/gutenberg/pull/30298))
+    -   Fix useForceUpdate Memory Leak: Only setState if the component is still mounted. ([30667](https://github.com/WordPress/gutenberg/pull/30667))
+-   General Interface: Fix is-link style to take colors from wp-admin theme. ([30823](https://github.com/WordPress/gutenberg/pull/30823))
+-   Inserter: Stop event propagation for the select element's onBlur to fix the behavior in iOS when selecting a pattern category. ([30717](https://github.com/WordPress/gutenberg/pull/30717))
+-   Site Editor:
+    -   Focus save button when entities save states panel is opened. ([30873](https://github.com/WordPress/gutenberg/pull/30873))
+    -   Remove call to wpautop that unintentionally alters block markup in template parts. ([30552](https://github.com/WordPress/gutenberg/pull/30552))
+-   Template Editing Mode: Hide the template selector and template mode from non-viewable post types. ([30861](https://github.com/WordPress/gutenberg/pull/30861))
 
 ### Experiments
 
-- Block-based Widgets:
-  - API:
-    - Don't use deprecated widget_class property. ([30429](https://github.com/WordPress/gutenberg/pull/30429))
-    - Fix null instance property when instance settings are empty. ([30713](https://github.com/WordPress/gutenberg/pull/30713))
-    - Remove deprecated properties. ([30853](https://github.com/WordPress/gutenberg/pull/30853))
-  - Customizer Integration:
-    - Add media uploader capabilities to block-based widget customize screen. ([30954](https://github.com/WordPress/gutenberg/pull/30954))
-    - Add move to widget area dropdown in customizer. ([30896](https://github.com/WordPress/gutenberg/pull/30896))
-    - Add rich text formats. ([30952](https://github.com/WordPress/gutenberg/pull/30952))
-    - Fix editing performance in Widgets Customizer. ([30654](https://github.com/WordPress/gutenberg/pull/30654))
-    - Fix block-based widget customizer initializing too soon. ([30864](https://github.com/WordPress/gutenberg/pull/30864))
-    - Refactor the inspector in Widgets Customizer to use core's controls. ([30431](https://github.com/WordPress/gutenberg/pull/30431))
-  - Legacy Widget: Improve backwards compatibility. ([30709](https://github.com/WordPress/gutenberg/pull/30709))
-  - Widget editor:
-    - Add a toolbar button to move between widget areas. ([30826](https://github.com/WordPress/gutenberg/pull/30826))
-    - Fix the undo/redo buttons in the standalone block-based widgets editor. ([30989](https://github.com/WordPress/gutenberg/pull/30989))
-- Navigation Editor and Block:
-  - Fix navigation placeholder height issue. ([30824](https://github.com/WordPress/gutenberg/pull/30824))
-  - Fix alignment issue on the nav screen manage locations buttons. ([30441](https://github.com/WordPress/gutenberg/pull/30441))
-  - Limit navigation nesting depth to 5. ([30199](https://github.com/WordPress/gutenberg/pull/30199))
-  - Nav-created drafts should not render on the front end. ([29692](https://github.com/WordPress/gutenberg/pull/29692))
-  - Page List: Add ability to convert to navigation links. ([30390](https://github.com/WordPress/gutenberg/pull/30390))
-  - Show justification controls for vertical variant. ([30351](https://github.com/WordPress/gutenberg/pull/30351))
-  - Use theme locations description instead of the slug for navigation screen location labels. ([30797](https://github.com/WordPress/gutenberg/pull/30797))
-- Global Styles:
-  - Absorb editor settings transformation in WP_Theme_JSON. ([30610](https://github.com/WordPress/gutenberg/pull/30610))
-  - Clean cached data when switching themes. ([30830](https://github.com/WordPress/gutenberg/pull/30830))
-  - Extract sanitize method. ([30809](https://github.com/WordPress/gutenberg/pull/30809))
-  - Fix: CSS variable reference mechanism regression. ([31015](https://github.com/WordPress/gutenberg/pull/31015))
-  - Make the dependency of the star matcher explicit when translating `theme.json`. ([30604](https://github.com/WordPress/gutenberg/pull/30604))
-  - Only remove the default font family in the editor from themes with theme.json file. ([30895](https://github.com/WordPress/gutenberg/pull/30895))
-  - Refactor how we iterate over the tree. ([30801](https://github.com/WordPress/gutenberg/pull/30801))
-  - Remove no longer needed translations handled in PHP for settings. ([30605](https://github.com/WordPress/gutenberg/pull/30605))
-  - theme.json: Add util to transform from a v0 schema to the latest. ([30600](https://github.com/WordPress/gutenberg/pull/30600))
+-   Block-based Widgets:
+    -   API:
+        -   Don't use deprecated widget_class property. ([30429](https://github.com/WordPress/gutenberg/pull/30429))
+        -   Fix null instance property when instance settings are empty. ([30713](https://github.com/WordPress/gutenberg/pull/30713))
+        -   Remove deprecated properties. ([30853](https://github.com/WordPress/gutenberg/pull/30853))
+    -   Customizer Integration:
+        -   Add media uploader capabilities to block-based widget customize screen. ([30954](https://github.com/WordPress/gutenberg/pull/30954))
+        -   Add move to widget area dropdown in customizer. ([30896](https://github.com/WordPress/gutenberg/pull/30896))
+        -   Add rich text formats. ([30952](https://github.com/WordPress/gutenberg/pull/30952))
+        -   Fix editing performance in Widgets Customizer. ([30654](https://github.com/WordPress/gutenberg/pull/30654))
+        -   Fix block-based widget customizer initializing too soon. ([30864](https://github.com/WordPress/gutenberg/pull/30864))
+        -   Refactor the inspector in Widgets Customizer to use core's controls. ([30431](https://github.com/WordPress/gutenberg/pull/30431))
+    -   Legacy Widget: Improve backwards compatibility. ([30709](https://github.com/WordPress/gutenberg/pull/30709))
+    -   Widget editor:
+        -   Add a toolbar button to move between widget areas. ([30826](https://github.com/WordPress/gutenberg/pull/30826))
+        -   Fix the undo/redo buttons in the standalone block-based widgets editor. ([30989](https://github.com/WordPress/gutenberg/pull/30989))
+-   Navigation Editor and Block:
+    -   Fix navigation placeholder height issue. ([30824](https://github.com/WordPress/gutenberg/pull/30824))
+    -   Fix alignment issue on the nav screen manage locations buttons. ([30441](https://github.com/WordPress/gutenberg/pull/30441))
+    -   Limit navigation nesting depth to 5. ([30199](https://github.com/WordPress/gutenberg/pull/30199))
+    -   Nav-created drafts should not render on the front end. ([29692](https://github.com/WordPress/gutenberg/pull/29692))
+    -   Page List: Add ability to convert to navigation links. ([30390](https://github.com/WordPress/gutenberg/pull/30390))
+    -   Show justification controls for vertical variant. ([30351](https://github.com/WordPress/gutenberg/pull/30351))
+    -   Use theme locations description instead of the slug for navigation screen location labels. ([30797](https://github.com/WordPress/gutenberg/pull/30797))
+-   Global Styles:
+    -   Absorb editor settings transformation in WP_Theme_JSON. ([30610](https://github.com/WordPress/gutenberg/pull/30610))
+    -   Clean cached data when switching themes. ([30830](https://github.com/WordPress/gutenberg/pull/30830))
+    -   Extract sanitize method. ([30809](https://github.com/WordPress/gutenberg/pull/30809))
+    -   Fix: CSS variable reference mechanism regression. ([31015](https://github.com/WordPress/gutenberg/pull/31015))
+    -   Make the dependency of the star matcher explicit when translating `theme.json`. ([30604](https://github.com/WordPress/gutenberg/pull/30604))
+    -   Only remove the default font family in the editor from themes with theme.json file. ([30895](https://github.com/WordPress/gutenberg/pull/30895))
+    -   Refactor how we iterate over the tree. ([30801](https://github.com/WordPress/gutenberg/pull/30801))
+    -   Remove no longer needed translations handled in PHP for settings. ([30605](https://github.com/WordPress/gutenberg/pull/30605))
+    -   theme.json: Add util to transform from a v0 schema to the latest. ([30600](https://github.com/WordPress/gutenberg/pull/30600))
 
 ### Documentation
 
-- docgen:
-  - Add support for TS exported static non-function variables. ([30971](https://github.com/WordPress/gutenberg/pull/30971))
-  - Add support for assignment patterns. ([30681](https://github.com/WordPress/gutenberg/pull/30681))
-  - Add support for object-destructuring. ([30675](https://github.com/WordPress/gutenberg/pull/30675))
-  - Find parameters by index rather than name and handle array destructuring. ([29945](https://github.com/WordPress/gutenberg/pull/29945))
-- Handbook:
-  - Add documentation for border block supports. ([31039](https://github.com/WordPress/gutenberg/pull/31039))
-  - Add documentation for border styles. ([31040](https://github.com/WordPress/gutenberg/pull/31040))
-  - Add fix to suggested prefixes of the branch. ([30953](https://github.com/WordPress/gutenberg/pull/30953))
-  - Change references from Block Style Variations to Block Styles. ([30911](https://github.com/WordPress/gutenberg/pull/30911))
-  - Fix Block Editor Accessibility link. ([30569](https://github.com/WordPress/gutenberg/pull/30569))
-  - Fix more example for register_block_type - apiVersion to api_version. ([30819](https://github.com/WordPress/gutenberg/pull/30819))
-  - Fix PHP example for register_block_type - apiVersion to api_version. ([30818](https://github.com/WordPress/gutenberg/pull/30818))
-  - Fixed a type and made the whole explanation more clear. ([30487](https://github.com/WordPress/gutenberg/pull/30487))
-  - Fixes broken GitHub links to commonly used labels. ([30875](https://github.com/WordPress/gutenberg/pull/30875))
-  - Improve semantics in the block-based theme guide. ([30946](https://github.com/WordPress/gutenberg/pull/30946))
-  - Include a note about `is_default` property for `register_block_style`. ([30792](https://github.com/WordPress/gutenberg/pull/30792))
-  - Organize Block API Reference. ([30980](https://github.com/WordPress/gutenberg/pull/30980))
-  - Packages: Further clarify the npm publishing process. ([30733](https://github.com/WordPress/gutenberg/pull/30733))
-  - Update getting started with code. ([30447](https://github.com/WordPress/gutenberg/pull/30447))
-- Libs:
-  - Blocks: Fix PHPDocs of `gutenberg_block_has_support`. ([31050](https://github.com/WordPress/gutenberg/pull/31050))
-  - Query Utils: Fix return type of `construct_wp_query_args()`. ([30611](https://github.com/WordPress/gutenberg/pull/30611))
-- License: Interim dual license license of future contributions. ([30383](https://github.com/WordPress/gutenberg/pull/30383))
-- Packages:
-  - Block Library - Social Links: Update param type. ([30652](https://github.com/WordPress/gutenberg/pull/30652))
-  - Components: Add documentation for the text prop on the Button component. ([30796](https://github.com/WordPress/gutenberg/pull/30796))
-  - Core Data: Fixes return type for getEntitiesByKind. ([30639](https://github.com/WordPress/gutenberg/pull/30639))
-  - Block Editor: Update import statement of ImageSizeControl component. ([30704](https://github.com/WordPress/gutenberg/pull/30704))
-  - Hooks: Add namespace param clarification. ([30501](https://github.com/WordPress/gutenberg/pull/30501))
+-   docgen:
+    -   Add support for TS exported static non-function variables. ([30971](https://github.com/WordPress/gutenberg/pull/30971))
+    -   Add support for assignment patterns. ([30681](https://github.com/WordPress/gutenberg/pull/30681))
+    -   Add support for object-destructuring. ([30675](https://github.com/WordPress/gutenberg/pull/30675))
+    -   Find parameters by index rather than name and handle array destructuring. ([29945](https://github.com/WordPress/gutenberg/pull/29945))
+-   Handbook:
+    -   Add documentation for border block supports. ([31039](https://github.com/WordPress/gutenberg/pull/31039))
+    -   Add documentation for border styles. ([31040](https://github.com/WordPress/gutenberg/pull/31040))
+    -   Add fix to suggested prefixes of the branch. ([30953](https://github.com/WordPress/gutenberg/pull/30953))
+    -   Change references from Block Style Variations to Block Styles. ([30911](https://github.com/WordPress/gutenberg/pull/30911))
+    -   Fix Block Editor Accessibility link. ([30569](https://github.com/WordPress/gutenberg/pull/30569))
+    -   Fix more example for register_block_type - apiVersion to api_version. ([30819](https://github.com/WordPress/gutenberg/pull/30819))
+    -   Fix PHP example for register_block_type - apiVersion to api_version. ([30818](https://github.com/WordPress/gutenberg/pull/30818))
+    -   Fixed a type and made the whole explanation more clear. ([30487](https://github.com/WordPress/gutenberg/pull/30487))
+    -   Fixes broken GitHub links to commonly used labels. ([30875](https://github.com/WordPress/gutenberg/pull/30875))
+    -   Improve semantics in the block-based theme guide. ([30946](https://github.com/WordPress/gutenberg/pull/30946))
+    -   Include a note about `is_default` property for `register_block_style`. ([30792](https://github.com/WordPress/gutenberg/pull/30792))
+    -   Organize Block API Reference. ([30980](https://github.com/WordPress/gutenberg/pull/30980))
+    -   Packages: Further clarify the npm publishing process. ([30733](https://github.com/WordPress/gutenberg/pull/30733))
+    -   Update getting started with code. ([30447](https://github.com/WordPress/gutenberg/pull/30447))
+-   Libs:
+    -   Blocks: Fix PHPDocs of `gutenberg_block_has_support`. ([31050](https://github.com/WordPress/gutenberg/pull/31050))
+    -   Query Utils: Fix return type of `construct_wp_query_args()`. ([30611](https://github.com/WordPress/gutenberg/pull/30611))
+-   License: Interim dual license license of future contributions. ([30383](https://github.com/WordPress/gutenberg/pull/30383))
+-   Packages:
+    -   Block Library - Social Links: Update param type. ([30652](https://github.com/WordPress/gutenberg/pull/30652))
+    -   Components: Add documentation for the text prop on the Button component. ([30796](https://github.com/WordPress/gutenberg/pull/30796))
+    -   Core Data: Fixes return type for getEntitiesByKind. ([30639](https://github.com/WordPress/gutenberg/pull/30639))
+    -   Block Editor: Update import statement of ImageSizeControl component. ([30704](https://github.com/WordPress/gutenberg/pull/30704))
+    -   Hooks: Add namespace param clarification. ([30501](https://github.com/WordPress/gutenberg/pull/30501))
 
 ### Code Quality
 
-- Block Editor:
-  - Simplify focus capture. ([31036](https://github.com/WordPress/gutenberg/pull/31036))
-  - Standardize loading default block editor settings. ([30245](https://github.com/WordPress/gutenberg/pull/30245))
-- Block Library:
-  - Button Block: Use hook-based border support. ([30194](https://github.com/WordPress/gutenberg/pull/30194))
-  - Cover: Rename isBlogUrl to isUploadingMedia. ([30435](https://github.com/WordPress/gutenberg/pull/30435))
-  - Cover: Use ALLOWED_MEDIA_TYPES shared constant. ([30977](https://github.com/WordPress/gutenberg/pull/30977))
-- Block Patterns: Clean up bundled pattern titles & categories. ([30998](https://github.com/WordPress/gutenberg/pull/30998))
-- Components: Remove `create-styles` in favor of vanilla emotion. ([31048](https://github.com/WordPress/gutenberg/pull/31048))
-- dom:
-  - Add types to caret placement functions. ([30750](https://github.com/WordPress/gutenberg/pull/30750))
-  - Add types to document-has-selection. ([30386](https://github.com/WordPress/gutenberg/pull/30386))
-  - Add types to is-edge and dependencies. ([30546](https://github.com/WordPress/gutenberg/pull/30546))
-  - Add types to miscellaneous files. ([30774](https://github.com/WordPress/gutenberg/pull/30774))
-  - Add types to removeInvalidHTML and stripHTML. ([30752](https://github.com/WordPress/gutenberg/pull/30752))
-  - Only assert defined in development. ([30807](https://github.com/WordPress/gutenberg/pull/30807))
-  - Type the remaining files. ([30841](https://github.com/WordPress/gutenberg/pull/30841))
-- Drop zone: Rewrite without provider. ([30310](https://github.com/WordPress/gutenberg/pull/30310))
-- Gutenberg Plugin:
-  - Account for editor styles file removal on WP trunk. ([30894](https://github.com/WordPress/gutenberg/pull/30894))
-  - Format all markdown files using Prettier formatter. ([30715](https://github.com/WordPress/gutenberg/pull/30715))
-  - Format all JSON files using Prettier formatter. ([30714](https://github.com/WordPress/gutenberg/pull/30714))
-  - Updated `.editorconfig` files to work with automatic file formatting. ([30794](https://github.com/WordPress/gutenberg/pull/30794))
-  - Update WP compatibility check in `gutenberg_pre_init()`. ([29938](https://github.com/WordPress/gutenberg/pull/29938))
-- Improve get_merged_data() code. ([30612](https://github.com/WordPress/gutenberg/pull/30612))
-- Remove unnecessary semicolons in PHP. ([30780](https://github.com/WordPress/gutenberg/pull/30780))
-- Replace older-style PHP type conversion functions with typecasts. ([30531](https://github.com/WordPress/gutenberg/pull/30531))
+-   Block Editor:
+    -   Simplify focus capture. ([31036](https://github.com/WordPress/gutenberg/pull/31036))
+    -   Standardize loading default block editor settings. ([30245](https://github.com/WordPress/gutenberg/pull/30245))
+-   Block Library:
+    -   Button Block: Use hook-based border support. ([30194](https://github.com/WordPress/gutenberg/pull/30194))
+    -   Cover: Rename isBlogUrl to isUploadingMedia. ([30435](https://github.com/WordPress/gutenberg/pull/30435))
+    -   Cover: Use ALLOWED_MEDIA_TYPES shared constant. ([30977](https://github.com/WordPress/gutenberg/pull/30977))
+-   Block Patterns: Clean up bundled pattern titles & categories. ([30998](https://github.com/WordPress/gutenberg/pull/30998))
+-   Components: Remove `create-styles` in favor of vanilla emotion. ([31048](https://github.com/WordPress/gutenberg/pull/31048))
+-   dom:
+    -   Add types to caret placement functions. ([30750](https://github.com/WordPress/gutenberg/pull/30750))
+    -   Add types to document-has-selection. ([30386](https://github.com/WordPress/gutenberg/pull/30386))
+    -   Add types to is-edge and dependencies. ([30546](https://github.com/WordPress/gutenberg/pull/30546))
+    -   Add types to miscellaneous files. ([30774](https://github.com/WordPress/gutenberg/pull/30774))
+    -   Add types to removeInvalidHTML and stripHTML. ([30752](https://github.com/WordPress/gutenberg/pull/30752))
+    -   Only assert defined in development. ([30807](https://github.com/WordPress/gutenberg/pull/30807))
+    -   Type the remaining files. ([30841](https://github.com/WordPress/gutenberg/pull/30841))
+-   Drop zone: Rewrite without provider. ([30310](https://github.com/WordPress/gutenberg/pull/30310))
+-   Gutenberg Plugin:
+    -   Account for editor styles file removal on WP trunk. ([30894](https://github.com/WordPress/gutenberg/pull/30894))
+    -   Format all markdown files using Prettier formatter. ([30715](https://github.com/WordPress/gutenberg/pull/30715))
+    -   Format all JSON files using Prettier formatter. ([30714](https://github.com/WordPress/gutenberg/pull/30714))
+    -   Updated `.editorconfig` files to work with automatic file formatting. ([30794](https://github.com/WordPress/gutenberg/pull/30794))
+    -   Update WP compatibility check in `gutenberg_pre_init()`. ([29938](https://github.com/WordPress/gutenberg/pull/29938))
+-   Improve get_merged_data() code. ([30612](https://github.com/WordPress/gutenberg/pull/30612))
+-   Remove unnecessary semicolons in PHP. ([30780](https://github.com/WordPress/gutenberg/pull/30780))
+-   Replace older-style PHP type conversion functions with typecasts. ([30531](https://github.com/WordPress/gutenberg/pull/30531))
 
 ### Tools
 
-- Testing:
-  - Block Library - Cover Block:
-    - Add edit media integration tests. ([30270](https://github.com/WordPress/gutenberg/pull/30270))
-    - Replace media end-to-end test. ([30306](https://github.com/WordPress/gutenberg/pull/30306))
-  - Fix end-to-end test failure screenshots not capturing at the right time. ([28449](https://github.com/WordPress/gutenberg/pull/28449))
-  - Fixture regeneration: Infer tabs use from prettier configuration. ([30813](https://github.com/WordPress/gutenberg/pull/30813))
-  - Skip unstable template part end-to-end test. ([30748](https://github.com/WordPress/gutenberg/pull/30748))
-  - Trim block fixture HTML when generating other test fixture files. ([30981](https://github.com/WordPress/gutenberg/pull/30981))
-  - Wire PHP tests for block editor settings. ([30984](https://github.com/WordPress/gutenberg/pull/30984))
-- wp-env:
-  - Better errors when Docker is not started. ([30882](https://github.com/WordPress/gutenberg/pull/30882))
-  - Bump tt1-blocks dependency to v0.4.5. ([30045](https://github.com/WordPress/gutenberg/pull/30045))
-  - Disable Xdebug for php < 7.2. ([30651](https://github.com/WordPress/gutenberg/pull/30651))
-  - Fix chown cannot access 'wp-config.php'. ([30053](https://github.com/WordPress/gutenberg/pull/30053))
-  - Fix issue with unquoted paths in docker-compose call. ([30692](https://github.com/WordPress/gutenberg/pull/30692))
-  - Remove platform-specific destroy commands. ([30638](https://github.com/WordPress/gutenberg/pull/30638))
-  - Set default environment type to local. ([28808](https://github.com/WordPress/gutenberg/pull/28808))
-  - Update changelog and CI. ([30646](https://github.com/WordPress/gutenberg/pull/30646))
-- Build Tooling:
-  - Add comments to webpack entrypoint function. ([30629](https://github.com/WordPress/gutenberg/pull/30629))
-  - Create frontend entry points for block-library, outputting code loadable from the browser.. ([30341](https://github.com/WordPress/gutenberg/pull/30341))
-  - Perf Workflow: Trigger upon release publishing. ([30628](https://github.com/WordPress/gutenberg/pull/30628))
-  - Pull trunk before pushing. ([30615](https://github.com/WordPress/gutenberg/pull/30615))
-  - Remind about required cherry-picks after npm publishing. ([30868](https://github.com/WordPress/gutenberg/pull/30868))
-  - Update development tools to work with PostCSS (try 2). ([30347](https://github.com/WordPress/gutenberg/pull/30347))
-  - Use consistently latest keyword for npm publishing. ([30866](https://github.com/WordPress/gutenberg/pull/30866))
-- Scripts:
-  - Allow CSS modules in the build commands. ([29182](https://github.com/WordPress/gutenberg/pull/29182))
-  - Include YAML files in prettification. ([30240](https://github.com/WordPress/gutenberg/pull/30240))
-
+-   Testing:
+    -   Block Library - Cover Block:
+        -   Add edit media integration tests. ([30270](https://github.com/WordPress/gutenberg/pull/30270))
+        -   Replace media end-to-end test. ([30306](https://github.com/WordPress/gutenberg/pull/30306))
+    -   Fix end-to-end test failure screenshots not capturing at the right time. ([28449](https://github.com/WordPress/gutenberg/pull/28449))
+    -   Fixture regeneration: Infer tabs use from prettier configuration. ([30813](https://github.com/WordPress/gutenberg/pull/30813))
+    -   Skip unstable template part end-to-end test. ([30748](https://github.com/WordPress/gutenberg/pull/30748))
+    -   Trim block fixture HTML when generating other test fixture files. ([30981](https://github.com/WordPress/gutenberg/pull/30981))
+    -   Wire PHP tests for block editor settings. ([30984](https://github.com/WordPress/gutenberg/pull/30984))
+-   wp-env:
+    -   Better errors when Docker is not started. ([30882](https://github.com/WordPress/gutenberg/pull/30882))
+    -   Bump tt1-blocks dependency to v0.4.5. ([30045](https://github.com/WordPress/gutenberg/pull/30045))
+    -   Disable Xdebug for php < 7.2. ([30651](https://github.com/WordPress/gutenberg/pull/30651))
+    -   Fix chown cannot access 'wp-config.php'. ([30053](https://github.com/WordPress/gutenberg/pull/30053))
+    -   Fix issue with unquoted paths in docker-compose call. ([30692](https://github.com/WordPress/gutenberg/pull/30692))
+    -   Remove platform-specific destroy commands. ([30638](https://github.com/WordPress/gutenberg/pull/30638))
+    -   Set default environment type to local. ([28808](https://github.com/WordPress/gutenberg/pull/28808))
+    -   Update changelog and CI. ([30646](https://github.com/WordPress/gutenberg/pull/30646))
+-   Build Tooling:
+    -   Add comments to webpack entrypoint function. ([30629](https://github.com/WordPress/gutenberg/pull/30629))
+    -   Create frontend entry points for block-library, outputting code loadable from the browser.. ([30341](https://github.com/WordPress/gutenberg/pull/30341))
+    -   Perf Workflow: Trigger upon release publishing. ([30628](https://github.com/WordPress/gutenberg/pull/30628))
+    -   Pull trunk before pushing. ([30615](https://github.com/WordPress/gutenberg/pull/30615))
+    -   Remind about required cherry-picks after npm publishing. ([30868](https://github.com/WordPress/gutenberg/pull/30868))
+    -   Update development tools to work with PostCSS (try 2). ([30347](https://github.com/WordPress/gutenberg/pull/30347))
+    -   Use consistently latest keyword for npm publishing. ([30866](https://github.com/WordPress/gutenberg/pull/30866))
+-   Scripts:
+    -   Allow CSS modules in the build commands. ([29182](https://github.com/WordPress/gutenberg/pull/29182))
+    -   Include YAML files in prettification. ([30240](https://github.com/WordPress/gutenberg/pull/30240))
 
 = 10.4.1 =
 
-### Bug Fixes
+## Changelog
 
-- Editor: Handle case where unavailable siteData is causing WSOD. ([30812](https://github.com/WordPress/gutenberg/pull/30812))
-- Site Logo: Fix default size. ([30846](https://github.com/WordPress/gutenberg/pull/30846))
-- Latest posts block: Show error for password protected posts.
+### Bug Fixes
 
+-   Editor: Handle case where unavailable siteData is causing WSOD. ([30812](https://github.com/WordPress/gutenberg/pull/30812))
+-   Site Logo: Fix default size. ([30846](https://github.com/WordPress/gutenberg/pull/30846))
+-   Latest posts block: Show error for password protected posts.
 
 = 10.4.0 =
 
+## Changelog
+
 ### Enhancements
 
-- Ensure Frontend/Editor block styles parity:
-  - Archives. ([30141](https://github.com/WordPress/gutenberg/pull/30141))
-  - Latest Comments. ([30134](https://github.com/WordPress/gutenberg/pull/30134))
-  - Quote. ([30190](https://github.com/WordPress/gutenberg/pull/30190))
-  - Separator. ([30255](https://github.com/WordPress/gutenberg/pull/30255)) ([30235](https://github.com/WordPress/gutenberg/pull/30235))
-  - Make the default padding match the browser's default padding. ([30277](https://github.com/WordPress/gutenberg/pull/30277)) ([30520](https://github.com/WordPress/gutenberg/pull/30520))
-- Block Library:
-  - Latest Comments: Remove list padding and margin. ([29402](https://github.com/WordPress/gutenberg/pull/29402))
-  - Post Date: Add option to make it a link. ([30499](https://github.com/WordPress/gutenberg/pull/30499))
-  - Post Excerpt: Fix toolbar for post excerpt warning. ([30280](https://github.com/WordPress/gutenberg/pull/30280))
-  - Post Title: Fix "'length' of undefined" error. ([30208](https://github.com/WordPress/gutenberg/pull/30208))
-  - Preformatted: Add color controls. ([28396](https://github.com/WordPress/gutenberg/pull/28396))
-  - Query: Use a WordPress loop for the query block. ([30405](https://github.com/WordPress/gutenberg/pull/30405))
-  - Search: Add border radius support. ([30227](https://github.com/WordPress/gutenberg/pull/30227))
-  - Site Logo: Style polishing. ([30526](https://github.com/WordPress/gutenberg/pull/30526))
-  - Template Part: Add padding support to template parts. ([29779](https://github.com/WordPress/gutenberg/pull/29779))
-  - Update placeholder text across blocks. ([30404](https://github.com/WordPress/gutenberg/pull/30404))
-- RichText:
-  - Add min width to show caret for empty inline container. ([30224](https://github.com/WordPress/gutenberg/pull/30224))
-  - Always show placholder on focus. ([30393](https://github.com/WordPress/gutenberg/pull/30393))
-- General Interaface:
-  - Add site icon and name to the publish flow. ([30231](https://github.com/WordPress/gutenberg/pull/30231))
-  - Use a darker canvas color. ([30282](https://github.com/WordPress/gutenberg/pull/30282))
-  - Update the save button label in the site editor. ([30439](https://github.com/WordPress/gutenberg/pull/30439))
-- Icons:
-  - Polish media & text icons. ([30239](https://github.com/WordPress/gutenberg/pull/30239))
-  - Update "close small" icon so that its shape matches the "add" icon dimensionally. ([30014](https://github.com/WordPress/gutenberg/pull/30014))
-  - Update site-logo block icon. ([30211](https://github.com/WordPress/gutenberg/pull/30211))
-- Inserter: Clarify that when the Inserter is open clicking the + button in the top bar will close it again. ([29759](https://github.com/WordPress/gutenberg/pull/29759))
-- Writing Flow: Use a shorter writing prompt. ([29611](https://github.com/WordPress/gutenberg/pull/29611))
-- List View: Improve the spacing, colors and icons ([30455](https://github.com/WordPress/gutenberg/pull/30455)) ([30303](https://github.com/WordPress/gutenberg/pull/30303))
-- Block Themes: Clarify the empty block templates message. ([30145](https://github.com/WordPress/gutenberg/pull/30145))
-- Site Editor:
-  - Allow reverting custom templates to their original theme-provided files. ([28141](https://github.com/WordPress/gutenberg/pull/28141))
-  - Use "Custom Styles" label to signal there are global styles changes in the saving panel. ([30521](https://github.com/WordPress/gutenberg/pull/30521))
-
-
-### Bug Fixes
-- Inserter: Show only the patterns that use allowed blocks. ([30300](https://github.com/WordPress/gutenberg/pull/30300))
-- Block Library:
-  - Buttons: Prevent overlapping button blocks in the frontend. ([30253](https://github.com/WordPress/gutenberg/pull/30253))
-  - Columns: Prevent having a width > 100%. ([30229](https://github.com/WordPress/gutenberg/pull/30229))
-  - Cover: Add 'object-position' to allowed inline style attributes list. ([30243](https://github.com/WordPress/gutenberg/pull/30243))
-  - Gallery: Avoid adding all media items in galleries using external URLs. ([30122](https://github.com/WordPress/gutenberg/pull/30122))
-  - Image: Do not preserve custom sizes when replacing images. ([29919](https://github.com/WordPress/gutenberg/pull/29919))
-  - Query:
-    - Fix undo trap during creation. ([30203](https://github.com/WordPress/gutenberg/pull/30203))
-    - Pagination Numbers: Print nothing if content is empty. ([30554](https://github.com/WordPress/gutenberg/pull/30554))
-  - RichText: Fix arrow navigation around emoji. ([30206](https://github.com/WordPress/gutenberg/pull/30206))
-  - Search block: Fix alignment issues. ([30444](https://github.com/WordPress/gutenberg/pull/30444))
-  - Site Logo: Delete sitelogo option when custom logo does not exist or was removed. ([30427](https://github.com/WordPress/gutenberg/pull/30427))
-- Block List: Fix mover position in the docked toolbar. ([30242](https://github.com/WordPress/gutenberg/pull/30242))
-- Code Editor: Revert save editors value on change (#27717). ([30524](https://github.com/WordPress/gutenberg/pull/30524))
-- Post Editor:
-  - Avoid focus attempt on a non-existent post title in code editor. ([29922](https://github.com/WordPress/gutenberg/pull/29922))
-  - Fix the post author selector for contributor roles. ([30218](https://github.com/WordPress/gutenberg/pull/30218))
-- Gutenberg Plugin: Ensure that plugin does not error with older versions of WordPress. ([30230](https://github.com/WordPress/gutenberg/pull/30230))
-- Inner blocks: Memoize allowedBlocks to prevent needlessly updating settings. ([30311](https://github.com/WordPress/gutenberg/pull/30311))
-- Server side renderer: Fix errors in template part editor context. ([29246](https://github.com/WordPress/gutenberg/pull/29246))
-- Writing Flow:
-  - Fix copy pasting non textual blocks. ([30225](https://github.com/WordPress/gutenberg/pull/30225))
-  - Fix horizontal caret placing for empty editable with placeholder. ([30463](https://github.com/WordPress/gutenberg/pull/30463))
-  - Fix multi-selection copying in Safari. ([30202](https://github.com/WordPress/gutenberg/pull/30202))
-- Site Editor:
-  - Fix nested template parts. ([30416](https://github.com/WordPress/gutenberg/pull/30416))
-  - Fix media upload behaviour and error state. ([30436](https://github.com/WordPress/gutenberg/pull/30436))
-  - Select the block inspector top upon selection. ([30387](https://github.com/WordPress/gutenberg/pull/30387))
-- Components: Stop matching autocompleter upon mismatch. ([30649](https://github.com/WordPress/gutenberg/pull/30649))
+-   Ensure Frontend/Editor block styles parity:
+    -   Archives. ([30141](https://github.com/WordPress/gutenberg/pull/30141))
+    -   Latest Comments. ([30134](https://github.com/WordPress/gutenberg/pull/30134))
+    -   Quote. ([30190](https://github.com/WordPress/gutenberg/pull/30190))
+    -   Separator. ([30255](https://github.com/WordPress/gutenberg/pull/30255)) ([30235](https://github.com/WordPress/gutenberg/pull/30235))
+    -   Make the default padding match the browser's default padding. ([30277](https://github.com/WordPress/gutenberg/pull/30277)) ([30520](https://github.com/WordPress/gutenberg/pull/30520))
+-   Block Library:
+    -   Latest Comments: Remove list padding and margin. ([29402](https://github.com/WordPress/gutenberg/pull/29402))
+    -   Post Date: Add option to make it a link. ([30499](https://github.com/WordPress/gutenberg/pull/30499))
+    -   Post Excerpt: Fix toolbar for post excerpt warning. ([30280](https://github.com/WordPress/gutenberg/pull/30280))
+    -   Post Title: Fix "'length' of undefined" error. ([30208](https://github.com/WordPress/gutenberg/pull/30208))
+    -   Preformatted: Add color controls. ([28396](https://github.com/WordPress/gutenberg/pull/28396))
+    -   Query: Use a WordPress loop for the query block. ([30405](https://github.com/WordPress/gutenberg/pull/30405))
+    -   Search: Add border radius support. ([30227](https://github.com/WordPress/gutenberg/pull/30227))
+    -   Site Logo: Style polishing. ([30526](https://github.com/WordPress/gutenberg/pull/30526))
+    -   Template Part: Add padding support to template parts. ([29779](https://github.com/WordPress/gutenberg/pull/29779))
+    -   Update placeholder text across blocks. ([30404](https://github.com/WordPress/gutenberg/pull/30404))
+-   RichText:
+    -   Add min width to show caret for empty inline container. ([30224](https://github.com/WordPress/gutenberg/pull/30224))
+    -   Always show placholder on focus. ([30393](https://github.com/WordPress/gutenberg/pull/30393))
+-   General Interaface:
+    -   Add site icon and name to the publish flow. ([30231](https://github.com/WordPress/gutenberg/pull/30231))
+    -   Use a darker canvas color. ([30282](https://github.com/WordPress/gutenberg/pull/30282))
+    -   Update the save button label in the site editor. ([30439](https://github.com/WordPress/gutenberg/pull/30439))
+-   Icons:
+    -   Polish media & text icons. ([30239](https://github.com/WordPress/gutenberg/pull/30239))
+    -   Update "close small" icon so that its shape matches the "add" icon dimensionally. ([30014](https://github.com/WordPress/gutenberg/pull/30014))
+    -   Update site-logo block icon. ([30211](https://github.com/WordPress/gutenberg/pull/30211))
+-   Inserter: Clarify that when the Inserter is open clicking the + button in the top bar will close it again. ([29759](https://github.com/WordPress/gutenberg/pull/29759))
+-   Writing Flow: Use a shorter writing prompt. ([29611](https://github.com/WordPress/gutenberg/pull/29611))
+-   List View: Improve the spacing, colors and icons ([30455](https://github.com/WordPress/gutenberg/pull/30455)) ([30303](https://github.com/WordPress/gutenberg/pull/30303))
+-   Block Themes: Clarify the empty block templates message. ([30145](https://github.com/WordPress/gutenberg/pull/30145))
+-   Site Editor:
+    -   Allow reverting custom templates to their original theme-provided files. ([28141](https://github.com/WordPress/gutenberg/pull/28141))
+    -   Use "Custom Styles" label to signal there are global styles changes in the saving panel. ([30521](https://github.com/WordPress/gutenberg/pull/30521))
+
+### Bug Fixes
+
+-   Inserter: Show only the patterns that use allowed blocks. ([30300](https://github.com/WordPress/gutenberg/pull/30300))
+-   Block Library:
+    -   Buttons: Prevent overlapping button blocks in the frontend. ([30253](https://github.com/WordPress/gutenberg/pull/30253))
+    -   Columns: Prevent having a width > 100%. ([30229](https://github.com/WordPress/gutenberg/pull/30229))
+    -   Cover: Add 'object-position' to allowed inline style attributes list. ([30243](https://github.com/WordPress/gutenberg/pull/30243))
+    -   Gallery: Avoid adding all media items in galleries using external URLs. ([30122](https://github.com/WordPress/gutenberg/pull/30122))
+    -   Image: Do not preserve custom sizes when replacing images. ([29919](https://github.com/WordPress/gutenberg/pull/29919))
+    -   Query:
+        -   Fix undo trap during creation. ([30203](https://github.com/WordPress/gutenberg/pull/30203))
+        -   Pagination Numbers: Print nothing if content is empty. ([30554](https://github.com/WordPress/gutenberg/pull/30554))
+    -   RichText: Fix arrow navigation around emoji. ([30206](https://github.com/WordPress/gutenberg/pull/30206))
+    -   Search block: Fix alignment issues. ([30444](https://github.com/WordPress/gutenberg/pull/30444))
+    -   Site Logo: Delete sitelogo option when custom logo does not exist or was removed. ([30427](https://github.com/WordPress/gutenberg/pull/30427))
+-   Block List: Fix mover position in the docked toolbar. ([30242](https://github.com/WordPress/gutenberg/pull/30242))
+-   Code Editor: Revert save editors value on change (#27717). ([30524](https://github.com/WordPress/gutenberg/pull/30524))
+-   Post Editor:
+    -   Avoid focus attempt on a non-existent post title in code editor. ([29922](https://github.com/WordPress/gutenberg/pull/29922))
+    -   Fix the post author selector for contributor roles. ([30218](https://github.com/WordPress/gutenberg/pull/30218))
+-   Gutenberg Plugin: Ensure that plugin does not error with older versions of WordPress. ([30230](https://github.com/WordPress/gutenberg/pull/30230))
+-   Inner blocks: Memoize allowedBlocks to prevent needlessly updating settings. ([30311](https://github.com/WordPress/gutenberg/pull/30311))
+-   Server side renderer: Fix errors in template part editor context. ([29246](https://github.com/WordPress/gutenberg/pull/29246))
+-   Writing Flow:
+    -   Fix copy pasting non textual blocks. ([30225](https://github.com/WordPress/gutenberg/pull/30225))
+    -   Fix horizontal caret placing for empty editable with placeholder. ([30463](https://github.com/WordPress/gutenberg/pull/30463))
+    -   Fix multi-selection copying in Safari. ([30202](https://github.com/WordPress/gutenberg/pull/30202))
+-   Site Editor:
+    -   Fix nested template parts. ([30416](https://github.com/WordPress/gutenberg/pull/30416))
+    -   Fix media upload behaviour and error state. ([30436](https://github.com/WordPress/gutenberg/pull/30436))
+    -   Select the block inspector top upon selection. ([30387](https://github.com/WordPress/gutenberg/pull/30387))
+-   Components: Stop matching autocompleter upon mismatch. ([30649](https://github.com/WordPress/gutenberg/pull/30649))
 
 ### APIs:
 
-- Add padding server-side block support. ([30332](https://github.com/WordPress/gutenberg/pull/30332))
-- Remove small APIs deprecated in WordPress 5.2. ([30283](https://github.com/WordPress/gutenberg/pull/30283))
-- Block Patterns: Remove `scope` from Query patterns and introduce `blockTypes`. ([30471](https://github.com/WordPress/gutenberg/pull/30471))
+-   Add padding server-side block support. ([30332](https://github.com/WordPress/gutenberg/pull/30332))
+-   Remove small APIs deprecated in WordPress 5.2. ([30283](https://github.com/WordPress/gutenberg/pull/30283))
+-   Block Patterns: Remove `scope` from Query patterns and introduce `blockTypes`. ([30471](https://github.com/WordPress/gutenberg/pull/30471))
 
 ### Experiments
 
-- Customizer
-  - Add customize widgets inserter. ([29549](https://github.com/WordPress/gutenberg/pull/29549))
-  - Add Legacy Widget block. ([30321](https://github.com/WordPress/gutenberg/pull/30321))
-  - Fix adding blocks in the widgets customizer. ([30221](https://github.com/WordPress/gutenberg/pull/30221))
-- Navigation Editor and Block
-  - Apply mover tweaks to navigation and widgets. ([30284](https://github.com/WordPress/gutenberg/pull/30284))
-  - Add src/navigation-link/index to side effect whitelist. ([30200](https://github.com/WordPress/gutenberg/pull/30200))
-  - Add post format variation to navigation link block. ([30403](https://github.com/WordPress/gutenberg/pull/30403))
-  - Avoid creating a new array/object on every render. ([30374](https://github.com/WordPress/gutenberg/pull/30374))
-  - De-emphasize "Link" block. ([30172](https://github.com/WordPress/gutenberg/pull/30172))
-  - Fix arrow inheritance, polish. ([30287](https://github.com/WordPress/gutenberg/pull/30287))
-  - Fix hardcoded color in navigation submenu icon. ([30385](https://github.com/WordPress/gutenberg/pull/30385))
-  - Fix Navigation Link block constantly updating its inner block list settings. ([30274](https://github.com/WordPress/gutenberg/pull/30274))
-  - Fix navigation link block dragging error. ([30219](https://github.com/WordPress/gutenberg/pull/30219))
-  - Fix snackbar list component blocking clicks to UI it overlaps. ([30381](https://github.com/WordPress/gutenberg/pull/30381))
-  - Flip orientation of submenus that are towards the right of the viewport. ([30342](https://github.com/WordPress/gutenberg/pull/30342))
-  - Indicate when a menu is deleted and show the menu switcher afterwards. ([29201](https://github.com/WordPress/gutenberg/pull/29201))
-  - Make the navigation placeholder clearer. ([30281](https://github.com/WordPress/gutenberg/pull/30281))
-  - Polish navigation menu submenus. ([30335](https://github.com/WordPress/gutenberg/pull/30335))
-  - Replace arrow with chevron. ([30180](https://github.com/WordPress/gutenberg/pull/30180))
-  - Save theme location on button click. ([30340](https://github.com/WordPress/gutenberg/pull/30340))
-  - Use same default implementation of __experimentalFetchLinkSuggestions in post, site, navigation, widget editor. ([29993](https://github.com/WordPress/gutenberg/pull/29993))
-- Widgets Editor
-  - Add manage with live preview link. ([29839](https://github.com/WordPress/gutenberg/pull/29839))
-  - Handle when $instance is empty and use str_replace instead of sprintf in the Widget block. ([30217](https://github.com/WordPress/gutenberg/pull/30217))
-  - Iterate on Legacy Widget block. ([29960](https://github.com/WordPress/gutenberg/pull/29960))
+-   Customizer
+    -   Add customize widgets inserter. ([29549](https://github.com/WordPress/gutenberg/pull/29549))
+    -   Add Legacy Widget block. ([30321](https://github.com/WordPress/gutenberg/pull/30321))
+    -   Fix adding blocks in the widgets customizer. ([30221](https://github.com/WordPress/gutenberg/pull/30221))
+-   Navigation Editor and Block
+    -   Apply mover tweaks to navigation and widgets. ([30284](https://github.com/WordPress/gutenberg/pull/30284))
+    -   Add src/navigation-link/index to side effect whitelist. ([30200](https://github.com/WordPress/gutenberg/pull/30200))
+    -   Add post format variation to navigation link block. ([30403](https://github.com/WordPress/gutenberg/pull/30403))
+    -   Avoid creating a new array/object on every render. ([30374](https://github.com/WordPress/gutenberg/pull/30374))
+    -   De-emphasize "Link" block. ([30172](https://github.com/WordPress/gutenberg/pull/30172))
+    -   Fix arrow inheritance, polish. ([30287](https://github.com/WordPress/gutenberg/pull/30287))
+    -   Fix hardcoded color in navigation submenu icon. ([30385](https://github.com/WordPress/gutenberg/pull/30385))
+    -   Fix Navigation Link block constantly updating its inner block list settings. ([30274](https://github.com/WordPress/gutenberg/pull/30274))
+    -   Fix navigation link block dragging error. ([30219](https://github.com/WordPress/gutenberg/pull/30219))
+    -   Fix snackbar list component blocking clicks to UI it overlaps. ([30381](https://github.com/WordPress/gutenberg/pull/30381))
+    -   Flip orientation of submenus that are towards the right of the viewport. ([30342](https://github.com/WordPress/gutenberg/pull/30342))
+    -   Indicate when a menu is deleted and show the menu switcher afterwards. ([29201](https://github.com/WordPress/gutenberg/pull/29201))
+    -   Make the navigation placeholder clearer. ([30281](https://github.com/WordPress/gutenberg/pull/30281))
+    -   Polish navigation menu submenus. ([30335](https://github.com/WordPress/gutenberg/pull/30335))
+    -   Replace arrow with chevron. ([30180](https://github.com/WordPress/gutenberg/pull/30180))
+    -   Save theme location on button click. ([30340](https://github.com/WordPress/gutenberg/pull/30340))
+    -   Use same default implementation of \_\_experimentalFetchLinkSuggestions in post, site, navigation, widget editor. ([29993](https://github.com/WordPress/gutenberg/pull/29993))
+-   Widgets Editor
+    -   Add manage with live preview link. ([29839](https://github.com/WordPress/gutenberg/pull/29839))
+    -   Handle when $instance is empty and use str_replace instead of sprintf in the Widget block. ([30217](https://github.com/WordPress/gutenberg/pull/30217))
+    -   Iterate on Legacy Widget block. ([29960](https://github.com/WordPress/gutenberg/pull/29960))
 
 ### Documentation
 
-- Handbook:
-  - Add description for `templateParts` in theme json. ([30118](https://github.com/WordPress/gutenberg/pull/30118))
-  - Add instructions for finding attributes for use in templates. ([30258](https://github.com/WordPress/gutenberg/pull/30258))
-  - Added a practical example of adding a component to the sidebar. ([30379](https://github.com/WordPress/gutenberg/pull/30379))
-  - Clarify what is meant by "block wrapper". ([30315](https://github.com/WordPress/gutenberg/pull/30315))
-  - Fix broken links to typescript documentation. ([30188](https://github.com/WordPress/gutenberg/pull/30188))
-  - Fix code snippet for disabling the block directory. ([30365](https://github.com/WordPress/gutenberg/pull/30365))
-  - Fix formatting. ([30309](https://github.com/WordPress/gutenberg/pull/30309))
-  - Fix typos in block-controls-toolbar-and-sidebar.md. ([30513](https://github.com/WordPress/gutenberg/pull/30513))
-  - Rename, changed URL Link. ([30483](https://github.com/WordPress/gutenberg/pull/30483))
-  - Rich Text: Add section for disabling specific format types. ([29383](https://github.com/WordPress/gutenberg/pull/29383))
-  - Updated documentation to reflect the output created currently by npx @wordpress/create-block gutenpride. ([30353](https://github.com/WordPress/gutenberg/pull/30353))
-  - Update feature deprecation guide. ([30220](https://github.com/WordPress/gutenberg/pull/30220))
-- Packages:
-  - Api-fetch: Fix example code for apiFetch middlewares. ([30534](https://github.com/WordPress/gutenberg/pull/30534))
-  - Block supports: Fix typos in layout supports comment. ([30537](https://github.com/WordPress/gutenberg/pull/30537))
-  - Block Editor: Fix block-editor typo. ([30401](https://github.com/WordPress/gutenberg/pull/30401))
-  - Components:
-    - Remove references to __experimental* in the DateTimePicker component documentation. ([29322](https://github.com/WordPress/gutenberg/pull/29322))
-    - Update CustomSelectControl component README.md. ([29854](https://github.com/WordPress/gutenberg/pull/29854))
-- docgen:
-  - Components: Add types to Draggable. ([29792](https://github.com/WordPress/gutenberg/pull/29792))
-  - Add types to clean-node-list. ([30412](https://github.com/WordPress/gutenberg/pull/30412))
-  - Add types progressively to dom modules. ([30103](https://github.com/WordPress/gutenberg/pull/30103))
-  - Add types to phrasing-content. ([30102](https://github.com/WordPress/gutenberg/pull/30102))
-  - Export all types from api-fetch. ([30539](https://github.com/WordPress/gutenberg/pull/30539))
-  - Fix arrow functions and TS index module support. ([30028](https://github.com/WordPress/gutenberg/pull/30028))
-  - deprecated: Export DeprecatedOptions to align with DefinitelyTyped. ([30677](https://github.com/WordPress/gutenberg/pull/30677))
-  - api-fetch: Align exported type names with DefinitelyTyped types. ([30570](https://github.com/WordPress/gutenberg/pull/30570))
+-   Handbook:
+    -   Add description for `templateParts` in theme json. ([30118](https://github.com/WordPress/gutenberg/pull/30118))
+    -   Add instructions for finding attributes for use in templates. ([30258](https://github.com/WordPress/gutenberg/pull/30258))
+    -   Added a practical example of adding a component to the sidebar. ([30379](https://github.com/WordPress/gutenberg/pull/30379))
+    -   Clarify what is meant by "block wrapper". ([30315](https://github.com/WordPress/gutenberg/pull/30315))
+    -   Fix broken links to typescript documentation. ([30188](https://github.com/WordPress/gutenberg/pull/30188))
+    -   Fix code snippet for disabling the block directory. ([30365](https://github.com/WordPress/gutenberg/pull/30365))
+    -   Fix formatting. ([30309](https://github.com/WordPress/gutenberg/pull/30309))
+    -   Fix typos in block-controls-toolbar-and-sidebar.md. ([30513](https://github.com/WordPress/gutenberg/pull/30513))
+    -   Rename, changed URL Link. ([30483](https://github.com/WordPress/gutenberg/pull/30483))
+    -   Rich Text: Add section for disabling specific format types. ([29383](https://github.com/WordPress/gutenberg/pull/29383))
+    -   Updated documentation to reflect the output created currently by npx @wordpress/create-block gutenpride. ([30353](https://github.com/WordPress/gutenberg/pull/30353))
+    -   Update feature deprecation guide. ([30220](https://github.com/WordPress/gutenberg/pull/30220))
+-   Packages:
+    -   Api-fetch: Fix example code for apiFetch middlewares. ([30534](https://github.com/WordPress/gutenberg/pull/30534))
+    -   Block supports: Fix typos in layout supports comment. ([30537](https://github.com/WordPress/gutenberg/pull/30537))
+    -   Block Editor: Fix block-editor typo. ([30401](https://github.com/WordPress/gutenberg/pull/30401))
+    -   Components:
+        -   Remove references to \_\_experimental\* in the DateTimePicker component documentation. ([29322](https://github.com/WordPress/gutenberg/pull/29322))
+        -   Update CustomSelectControl component README.md. ([29854](https://github.com/WordPress/gutenberg/pull/29854))
+-   docgen:
+    -   Components: Add types to Draggable. ([29792](https://github.com/WordPress/gutenberg/pull/29792))
+    -   Add types to clean-node-list. ([30412](https://github.com/WordPress/gutenberg/pull/30412))
+    -   Add types progressively to dom modules. ([30103](https://github.com/WordPress/gutenberg/pull/30103))
+    -   Add types to phrasing-content. ([30102](https://github.com/WordPress/gutenberg/pull/30102))
+    -   Export all types from api-fetch. ([30539](https://github.com/WordPress/gutenberg/pull/30539))
+    -   Fix arrow functions and TS index module support. ([30028](https://github.com/WordPress/gutenberg/pull/30028))
+    -   deprecated: Export DeprecatedOptions to align with DefinitelyTyped. ([30677](https://github.com/WordPress/gutenberg/pull/30677))
+    -   api-fetch: Align exported type names with DefinitelyTyped types. ([30570](https://github.com/WordPress/gutenberg/pull/30570))
 
 ### Code Quality
 
-- Block Editor: Use proper insertion point for drop. ([29933](https://github.com/WordPress/gutenberg/pull/29933))
-- Block Library: Fix Post Excerpt warnings for RichText in inline containers. ([30498](https://github.com/WordPress/gutenberg/pull/30498))
-- Components: Simplify ScrollLock, adding types. ([29634](https://github.com/WordPress/gutenberg/pull/29634))
-- Gutenberg Plugin:
-  - Prettify YAML scripts. ([30409](https://github.com/WordPress/gutenberg/pull/30409))
-  - Remove deprecations planned for 10.3 release. ([30417](https://github.com/WordPress/gutenberg/pull/30417))
-  - Update the `objectFitPolyfill` vendor library. ([30507](https://github.com/WordPress/gutenberg/pull/30507))
-- PHP Coding Standards fixes. ([30346](https://github.com/WordPress/gutenberg/pull/30346))
+-   Block Editor: Use proper insertion point for drop. ([29933](https://github.com/WordPress/gutenberg/pull/29933))
+-   Block Library: Fix Post Excerpt warnings for RichText in inline containers. ([30498](https://github.com/WordPress/gutenberg/pull/30498))
+-   Components: Simplify ScrollLock, adding types. ([29634](https://github.com/WordPress/gutenberg/pull/29634))
+-   Gutenberg Plugin:
+    -   Prettify YAML scripts. ([30409](https://github.com/WordPress/gutenberg/pull/30409))
+    -   Remove deprecations planned for 10.3 release. ([30417](https://github.com/WordPress/gutenberg/pull/30417))
+    -   Update the `objectFitPolyfill` vendor library. ([30507](https://github.com/WordPress/gutenberg/pull/30507))
+-   PHP Coding Standards fixes. ([30346](https://github.com/WordPress/gutenberg/pull/30346))
 
 ### Tools
 
-- Add `/packages/stylelint-config` to `CODEOWNERS`. ([30264](https://github.com/WordPress/gutenberg/pull/30264))
-- Build: Ensure non-JS changes are processed in the watch mode. ([30343](https://github.com/WordPress/gutenberg/pull/30343))
-- Testing:
-  - Added end-to-end tests for navigation menu name editor. ([29774](https://github.com/WordPress/gutenberg/pull/29774))
-  - GHA workflow improvements when setting up NodeJS. ([29078](https://github.com/WordPress/gutenberg/pull/29078))
-  - Include NodeJS version in the cache key. ([30512](https://github.com/WordPress/gutenberg/pull/30512))
-  - Remove button from forbidden elements. ([30223](https://github.com/WordPress/gutenberg/pull/30223))
-  - Remove cache `restore-keys`. ([30510](https://github.com/WordPress/gutenberg/pull/30510))
-  - Skip flaky end-to-end tests. ([30344](https://github.com/WordPress/gutenberg/pull/30344))
-
+-   Add `/packages/stylelint-config` to `CODEOWNERS`. ([30264](https://github.com/WordPress/gutenberg/pull/30264))
+-   Build: Ensure non-JS changes are processed in the watch mode. ([30343](https://github.com/WordPress/gutenberg/pull/30343))
+-   Testing:
+    -   Added end-to-end tests for navigation menu name editor. ([29774](https://github.com/WordPress/gutenberg/pull/29774))
+    -   GHA workflow improvements when setting up NodeJS. ([29078](https://github.com/WordPress/gutenberg/pull/29078))
+    -   Include NodeJS version in the cache key. ([30512](https://github.com/WordPress/gutenberg/pull/30512))
+    -   Remove button from forbidden elements. ([30223](https://github.com/WordPress/gutenberg/pull/30223))
+    -   Remove cache `restore-keys`. ([30510](https://github.com/WordPress/gutenberg/pull/30510))
+    -   Skip flaky end-to-end tests. ([30344](https://github.com/WordPress/gutenberg/pull/30344))
 
 = 10.3.2 =
 
+## Changelog
+
 ### Enhancements
 
-- Remove the default block margins from themes with theme.json file. ([30375](https://github.com/WordPress/gutenberg/pull/30375))
+-   Remove the default block margins from themes with theme.json file. ([30375](https://github.com/WordPress/gutenberg/pull/30375))
 
 ### Bug Fixes
 
-- Site title block: Remove custom theme.json selector. ([30558](https://github.com/WordPress/gutenberg/pull/30558))
-- Components: Query autocomplete by the term from last trigger prefix character. ([30540](https://github.com/WordPress/gutenberg/pull/30540))
-- Bug fixes backported in WordPress minor release. ([30528](https://github.com/WordPress/gutenberg/pull/30528))
-- Rich Text: Fix multi-select copy. ([30197](https://github.com/WordPress/gutenberg/pull/30197))
-
-
-
+-   Site title block: Remove custom theme.json selector. ([30558](https://github.com/WordPress/gutenberg/pull/30558))
+-   Components: Query autocomplete by the term from last trigger prefix character. ([30540](https://github.com/WordPress/gutenberg/pull/30540))
+-   Bug fixes backported in WordPress minor release. ([30528](https://github.com/WordPress/gutenberg/pull/30528))
+-   Rich Text: Fix multi-select copy. ([30197](https://github.com/WordPress/gutenberg/pull/30197))
 
 = 10.3.1 =
 
-### Bug Fixes
+## Changelog
 
-- Restore color preset CSS variables for custom links for themes with the  `experimental-link-color` support flag enabled. ([30452](https://github.com/WordPress/gutenberg/pull/30452))
-- Restore the inner `<div />` of the Group block in the editor for classic themes. ([30453](https://github.com/WordPress/gutenberg/pull/30453))
-- Fix content loss for Group block when used with lots of nesting. ([30460](https://github.com/WordPress/gutenberg/pull/30460))
+### Bug Fixes
 
+-   Restore color preset CSS variables for custom links for themes with the `experimental-link-color` support flag enabled. ([30452](https://github.com/WordPress/gutenberg/pull/30452))
+-   Restore the inner `<div />` of the Group block in the editor for classic themes. ([30453](https://github.com/WordPress/gutenberg/pull/30453))
+-   Fix content loss for Group block when used with lots of nesting. ([30460](https://github.com/WordPress/gutenberg/pull/30460))
 
 = 10.3.0 =
 
+## Changelog
+
 ### Enhancements
 
 -   Add `since` versions to the deprecated features. ([30072](https://github.com/WordPress/gutenberg/pull/30072))
@@ -25273,623 +37270,634 @@ General Interface:
 -   Packages: Enforce version bump for production packages after WP major. ([29903](https://github.com/WordPress/gutenberg/pull/29903))
 -   Unit Testing: Allow TypeScript modules for transpiled packages. ([29873](https://github.com/WordPress/gutenberg/pull/29873))
 
-
 = 10.2.1 =
 
-### Bug Fixes
+## Changelog
 
-- Button: Restore gradients support. ([29980](https://github.com/WordPress/gutenberg/pull/29980))
+### Bug Fixes
 
+-   Button: Restore gradients support. ([29980](https://github.com/WordPress/gutenberg/pull/29980))
 
 = 10.2.0 =
 
+## Changelog
+
 ### Features
 
-- Template part block: Add category panel. ([29159](https://github.com/WordPress/gutenberg/pull/29159))
+-   Template part block: Add category panel. ([29159](https://github.com/WordPress/gutenberg/pull/29159))
 
 ### Enhancements
 
-- Add check for button text before rendering button block. ([29717](https://github.com/WordPress/gutenberg/pull/29717))
-- Skip CSS minification via PHP. ([29624](https://github.com/WordPress/gutenberg/pull/29624))
-- Restore the margins of blocks relying on the figure element. ([29517](https://github.com/WordPress/gutenberg/pull/29517))
-- Add Columns transform from Media & Text. ([29415](https://github.com/WordPress/gutenberg/pull/29415))
-- Fix: Invert gallery gravity. ([29367](https://github.com/WordPress/gutenberg/pull/29367))
-- Components: Try to make the order of fills stable in regular slots. ([29287](https://github.com/WordPress/gutenberg/pull/29287))
-- Add expandOnFocus, showHowTo and validateInput experimental props to FormTokenField. ([29110](https://github.com/WordPress/gutenberg/pull/29110))
-- Hide writing prompt from subsequent empty paragraphs. ([28275](https://github.com/WordPress/gutenberg/pull/28275))
+-   Add check for button text before rendering button block. ([29717](https://github.com/WordPress/gutenberg/pull/29717))
+-   Skip CSS minification via PHP. ([29624](https://github.com/WordPress/gutenberg/pull/29624))
+-   Restore the margins of blocks relying on the figure element. ([29517](https://github.com/WordPress/gutenberg/pull/29517))
+-   Add Columns transform from Media & Text. ([29415](https://github.com/WordPress/gutenberg/pull/29415))
+-   Fix: Invert gallery gravity. ([29367](https://github.com/WordPress/gutenberg/pull/29367))
+-   Components: Try to make the order of fills stable in regular slots. ([29287](https://github.com/WordPress/gutenberg/pull/29287))
+-   Add expandOnFocus, showHowTo and validateInput experimental props to FormTokenField. ([29110](https://github.com/WordPress/gutenberg/pull/29110))
+-   Hide writing prompt from subsequent empty paragraphs. ([28275](https://github.com/WordPress/gutenberg/pull/28275))
 
 ### New APIs
 
-- Plugins: Add scoping functionality to the Plugins API. ([27438](https://github.com/WordPress/gutenberg/pull/27438))
-
-### Bug Fixes
-
-- Reusable Blocks:
-  - Fix editor crash when converting block with visible styles to reusable (after a save and page reload). ([29059](https://github.com/WordPress/gutenberg/pull/29059))
-  - Fix reusable block crash when converting a just created reusable block to blocks. ([29292](https://github.com/WordPress/gutenberg/pull/29292))
-- Buttons Block:
-  - Buttons: Fix links inside links. ([29273](https://github.com/WordPress/gutenberg/pull/29273))
-  - Fix legacy button center alignments inside the buttons block. ([29281](https://github.com/WordPress/gutenberg/pull/29281))
-- Cover Block:
-  - Fix cover block content position not migrating correctly from deprecated version. ([29542](https://github.com/WordPress/gutenberg/pull/29542))
-  - Fix solid-color only cover has small gray border in the editor only. ([29499](https://github.com/WordPress/gutenberg/pull/29499))
-- Social Icons and Links:
-  - Fix social icons vertical spacing issue. ([29657](https://github.com/WordPress/gutenberg/pull/29657))
-  - Yelp: Fix foreground color, make background transparent. ([29660](https://github.com/WordPress/gutenberg/pull/29660))
-  - Social Links: Replace CSS variables with block context approach. ([29330](https://github.com/WordPress/gutenberg/pull/29330))
-- Table of Contents block:
-  - Fix links when in archive loop or when using "Plain" permalink structure. ([29394](https://github.com/WordPress/gutenberg/pull/29394))
-  - Fix class attribute. ([29317](https://github.com/WordPress/gutenberg/pull/29317))
-- Add theme styles in the site editor. ([29704](https://github.com/WordPress/gutenberg/pull/29704))
-- Fix broken links to the block editor developer handbook. ([29663](https://github.com/WordPress/gutenberg/pull/29663))
-- Fix in between inserter edge case. ([29625](https://github.com/WordPress/gutenberg/pull/29625))
-- Fix the button component styles when used with a dashicon. ([29614](https://github.com/WordPress/gutenberg/pull/29614))
-- Revert moving is-typing class. ([29608](https://github.com/WordPress/gutenberg/pull/29608))
-- Fix inline block styles minification issues with calc(). ([29554](https://github.com/WordPress/gutenberg/pull/29554))
-- Packages: Update the publishing command for npm with next dist tag. ([29379](https://github.com/WordPress/gutenberg/pull/29379))
-- Ignore build folders when native unit tests. ([29371](https://github.com/WordPress/gutenberg/pull/29371))
-- Fix mobile issue template label. ([29344](https://github.com/WordPress/gutenberg/pull/29344))
-- Interface: Fix React warnings triggered in ActionItem component. ([29340](https://github.com/WordPress/gutenberg/pull/29340))
-- Search block: Add missing space to provide valid HTML. ([29314](https://github.com/WordPress/gutenberg/pull/29314))
-- Blocks: Ensure that metadata registered on the server for core block is preserved on the client (try 2). ([29302](https://github.com/WordPress/gutenberg/pull/29302))
-- Fix off-center appender in some themes. ([29290](https://github.com/WordPress/gutenberg/pull/29290))
-- Add enableCustomSpacing to block editor settings. ([29277](https://github.com/WordPress/gutenberg/pull/29277))
-- Border Radius Support: Fix application of zero radius values. ([28998](https://github.com/WordPress/gutenberg/pull/28998))
-- Fix Document Outline mouse click. ([28589](https://github.com/WordPress/gutenberg/pull/28589))
-- Fix typos in template part area tags. ([29937](https://github.com/WordPress/gutenberg/pull/29937))
-- Gallery Block: Fix the crop images setting. ([29823](https://github.com/WordPress/gutenberg/pull/29823))
-- Fix Error: Could not process the 'wp-config.php' transformation. ([29800](https://github.com/WordPress/gutenberg/pull/29800))
+-   Plugins: Add scoping functionality to the Plugins API. ([27438](https://github.com/WordPress/gutenberg/pull/27438))
+
+### Bug Fixes
+
+-   Reusable Blocks:
+    -   Fix editor crash when converting block with visible styles to reusable (after a save and page reload). ([29059](https://github.com/WordPress/gutenberg/pull/29059))
+    -   Fix reusable block crash when converting a just created reusable block to blocks. ([29292](https://github.com/WordPress/gutenberg/pull/29292))
+-   Buttons Block:
+    -   Buttons: Fix links inside links. ([29273](https://github.com/WordPress/gutenberg/pull/29273))
+    -   Fix legacy button center alignments inside the buttons block. ([29281](https://github.com/WordPress/gutenberg/pull/29281))
+-   Cover Block:
+    -   Fix cover block content position not migrating correctly from deprecated version. ([29542](https://github.com/WordPress/gutenberg/pull/29542))
+    -   Fix solid-color only cover has small gray border in the editor only. ([29499](https://github.com/WordPress/gutenberg/pull/29499))
+-   Social Icons and Links:
+    -   Fix social icons vertical spacing issue. ([29657](https://github.com/WordPress/gutenberg/pull/29657))
+    -   Yelp: Fix foreground color, make background transparent. ([29660](https://github.com/WordPress/gutenberg/pull/29660))
+    -   Social Links: Replace CSS variables with block context approach. ([29330](https://github.com/WordPress/gutenberg/pull/29330))
+-   Table of Contents block:
+    -   Fix links when in archive loop or when using "Plain" permalink structure. ([29394](https://github.com/WordPress/gutenberg/pull/29394))
+    -   Fix class attribute. ([29317](https://github.com/WordPress/gutenberg/pull/29317))
+-   Add theme styles in the site editor. ([29704](https://github.com/WordPress/gutenberg/pull/29704))
+-   Fix broken links to the block editor developer handbook. ([29663](https://github.com/WordPress/gutenberg/pull/29663))
+-   Fix in between inserter edge case. ([29625](https://github.com/WordPress/gutenberg/pull/29625))
+-   Fix the button component styles when used with a dashicon. ([29614](https://github.com/WordPress/gutenberg/pull/29614))
+-   Revert moving is-typing class. ([29608](https://github.com/WordPress/gutenberg/pull/29608))
+-   Fix inline block styles minification issues with calc(). ([29554](https://github.com/WordPress/gutenberg/pull/29554))
+-   Packages: Update the publishing command for npm with next dist tag. ([29379](https://github.com/WordPress/gutenberg/pull/29379))
+-   Ignore build folders when native unit tests. ([29371](https://github.com/WordPress/gutenberg/pull/29371))
+-   Fix mobile issue template label. ([29344](https://github.com/WordPress/gutenberg/pull/29344))
+-   Interface: Fix React warnings triggered in ActionItem component. ([29340](https://github.com/WordPress/gutenberg/pull/29340))
+-   Search block: Add missing space to provide valid HTML. ([29314](https://github.com/WordPress/gutenberg/pull/29314))
+-   Blocks: Ensure that metadata registered on the server for core block is preserved on the client (try 2). ([29302](https://github.com/WordPress/gutenberg/pull/29302))
+-   Fix off-center appender in some themes. ([29290](https://github.com/WordPress/gutenberg/pull/29290))
+-   Add enableCustomSpacing to block editor settings. ([29277](https://github.com/WordPress/gutenberg/pull/29277))
+-   Border Radius Support: Fix application of zero radius values. ([28998](https://github.com/WordPress/gutenberg/pull/28998))
+-   Fix Document Outline mouse click. ([28589](https://github.com/WordPress/gutenberg/pull/28589))
+-   Fix typos in template part area tags. ([29937](https://github.com/WordPress/gutenberg/pull/29937))
+-   Gallery Block: Fix the crop images setting. ([29823](https://github.com/WordPress/gutenberg/pull/29823))
+-   Fix Error: Could not process the 'wp-config.php' transformation. ([29800](https://github.com/WordPress/gutenberg/pull/29800))
 
 ### Performance
 
-- Revert "Block edit: Avoid memoized block context in favour of useSelect". ([29621](https://github.com/WordPress/gutenberg/pull/29621))
+-   Revert "Block edit: Avoid memoized block context in favour of useSelect". ([29621](https://github.com/WordPress/gutenberg/pull/29621))
 
 ### Experiments
 
-- Global Styles:
-  - Do not add padding sub-properties if there's no values in theme.json. ([29712](https://github.com/WordPress/gutenberg/pull/29712))
-  - Fix specificity conflict of blocks with single classes as selectors. ([29378](https://github.com/WordPress/gutenberg/pull/29378))
-  - Fix specificity issue between theme and user styles. ([29533](https://github.com/WordPress/gutenberg/pull/29533))
-  - Custom Link Color: Do not apply to buttons. ([29557](https://github.com/WordPress/gutenberg/pull/29557))
-  - Implement skip serialization for color key in style att. ([29253](https://github.com/WordPress/gutenberg/pull/29253))
-- Full-Site Editing:
-  - Site Title: Add text decoration and text transform controls. ([29622](https://github.com/WordPress/gutenberg/pull/29622))
-  - Make border work on the site editor. ([29618](https://github.com/WordPress/gutenberg/pull/29618))
-  - Prevent clicking on tag and category links in the site editor. ([29583](https://github.com/WordPress/gutenberg/pull/29583))
-  - Print nothing in the front end if there are no results in Query block. ([29521](https://github.com/WordPress/gutenberg/pull/29521))
-  - [Query block] Remove exclusion of current page id. ([29432](https://github.com/WordPress/gutenberg/pull/29432))
-  - Handle missing categories/tags in Query block. ([29424](https://github.com/WordPress/gutenberg/pull/29424))
-  - Query block setup with block patterns integration. ([28891](https://github.com/WordPress/gutenberg/pull/28891))
-  - Update template descriptions for clarity and humanity. ([29531](https://github.com/WordPress/gutenberg/pull/29531))
-  - i18n: Fix the template area unassigned type string. ([29617](https://github.com/WordPress/gutenberg/pull/29617))
-  - Template Part: Prevent infinite recursion. ([28456](https://github.com/WordPress/gutenberg/pull/28456))
-  - Update title, description, and icon of Post Categories. ([29400](https://github.com/WordPress/gutenberg/pull/29400))
-  - Show Site Logo's block toolbar when selected, after the editor loads. ([29336](https://github.com/WordPress/gutenberg/pull/29336))
-  - Remove delete toolbar option from Site Logo. ([29331](https://github.com/WordPress/gutenberg/pull/29331))
-- Navigation Editor and Block:
-  - Allow very thin menus. ([29555](https://github.com/WordPress/gutenberg/pull/29555))
-  - Refactor and simplify navigation block CSS. ([29465](https://github.com/WordPress/gutenberg/pull/29465))
-  - Make navigation placeholder state visible in dark themes. ([29366](https://github.com/WordPress/gutenberg/pull/29366))
-  - Update navigation editor menu selection dropdown. ([29202](https://github.com/WordPress/gutenberg/pull/29202))
-  - Make Spacer block width adjustable and add it to Navigation block. ([29133](https://github.com/WordPress/gutenberg/pull/29133))
-  - Navigation: Try adding navigation link variants via server. ([29095](https://github.com/WordPress/gutenberg/pull/29095))
-  - Navigation Editor: Allow menu renaming. ([29012](https://github.com/WordPress/gutenberg/pull/29012))
-- Group Block: Add support for custom border settings. ([29591](https://github.com/WordPress/gutenberg/pull/29591))
-- Pass block settings to the client for all blocks. ([29474](https://github.com/WordPress/gutenberg/pull/29474))
-- Button block: Add color support via block.json. ([29382](https://github.com/WordPress/gutenberg/pull/29382))
-- Add/new nav link icon. ([29369](https://github.com/WordPress/gutenberg/pull/29369))
-- Temporary hack to render blocks in customizer. ([29365](https://github.com/WordPress/gutenberg/pull/29365))
-- Fix shortcode not showing in the widgets screen. ([29282](https://github.com/WordPress/gutenberg/pull/29282))
-- Fix: More resilient appender CSS. ([28908](https://github.com/WordPress/gutenberg/pull/28908))
+-   Global Styles:
+    -   Do not add padding sub-properties if there's no values in theme.json. ([29712](https://github.com/WordPress/gutenberg/pull/29712))
+    -   Fix specificity conflict of blocks with single classes as selectors. ([29378](https://github.com/WordPress/gutenberg/pull/29378))
+    -   Fix specificity issue between theme and user styles. ([29533](https://github.com/WordPress/gutenberg/pull/29533))
+    -   Custom Link Color: Do not apply to buttons. ([29557](https://github.com/WordPress/gutenberg/pull/29557))
+    -   Implement skip serialization for color key in style att. ([29253](https://github.com/WordPress/gutenberg/pull/29253))
+-   Full-Site Editing:
+    -   Site Title: Add text decoration and text transform controls. ([29622](https://github.com/WordPress/gutenberg/pull/29622))
+    -   Make border work on the site editor. ([29618](https://github.com/WordPress/gutenberg/pull/29618))
+    -   Prevent clicking on tag and category links in the site editor. ([29583](https://github.com/WordPress/gutenberg/pull/29583))
+    -   Print nothing in the front end if there are no results in Query block. ([29521](https://github.com/WordPress/gutenberg/pull/29521))
+    -   [Query block] Remove exclusion of current page id. ([29432](https://github.com/WordPress/gutenberg/pull/29432))
+    -   Handle missing categories/tags in Query block. ([29424](https://github.com/WordPress/gutenberg/pull/29424))
+    -   Query block setup with block patterns integration. ([28891](https://github.com/WordPress/gutenberg/pull/28891))
+    -   Update template descriptions for clarity and humanity. ([29531](https://github.com/WordPress/gutenberg/pull/29531))
+    -   i18n: Fix the template area unassigned type string. ([29617](https://github.com/WordPress/gutenberg/pull/29617))
+    -   Template Part: Prevent infinite recursion. ([28456](https://github.com/WordPress/gutenberg/pull/28456))
+    -   Update title, description, and icon of Post Categories. ([29400](https://github.com/WordPress/gutenberg/pull/29400))
+    -   Show Site Logo's block toolbar when selected, after the editor loads. ([29336](https://github.com/WordPress/gutenberg/pull/29336))
+    -   Remove delete toolbar option from Site Logo. ([29331](https://github.com/WordPress/gutenberg/pull/29331))
+-   Navigation Editor and Block:
+    -   Allow very thin menus. ([29555](https://github.com/WordPress/gutenberg/pull/29555))
+    -   Refactor and simplify navigation block CSS. ([29465](https://github.com/WordPress/gutenberg/pull/29465))
+    -   Make navigation placeholder state visible in dark themes. ([29366](https://github.com/WordPress/gutenberg/pull/29366))
+    -   Update navigation editor menu selection dropdown. ([29202](https://github.com/WordPress/gutenberg/pull/29202))
+    -   Make Spacer block width adjustable and add it to Navigation block. ([29133](https://github.com/WordPress/gutenberg/pull/29133))
+    -   Navigation: Try adding navigation link variants via server. ([29095](https://github.com/WordPress/gutenberg/pull/29095))
+    -   Navigation Editor: Allow menu renaming. ([29012](https://github.com/WordPress/gutenberg/pull/29012))
+-   Group Block: Add support for custom border settings. ([29591](https://github.com/WordPress/gutenberg/pull/29591))
+-   Pass block settings to the client for all blocks. ([29474](https://github.com/WordPress/gutenberg/pull/29474))
+-   Button block: Add color support via block.json. ([29382](https://github.com/WordPress/gutenberg/pull/29382))
+-   Add/new nav link icon. ([29369](https://github.com/WordPress/gutenberg/pull/29369))
+-   Temporary hack to render blocks in customizer. ([29365](https://github.com/WordPress/gutenberg/pull/29365))
+-   Fix shortcode not showing in the widgets screen. ([29282](https://github.com/WordPress/gutenberg/pull/29282))
+-   Fix: More resilient appender CSS. ([28908](https://github.com/WordPress/gutenberg/pull/28908))
 
 ### Documentation
 
-- Add block variations page to Block API summary. ([29725](https://github.com/WordPress/gutenberg/pull/29725))
-- Update Readme of Animate Component to remove todo comment. ([29702](https://github.com/WordPress/gutenberg/pull/29702))
-- Docs; Organize contributors section using READMEs. ([29688](https://github.com/WordPress/gutenberg/pull/29688))
-- Remove mid-paragraph newlines. ([29674](https://github.com/WordPress/gutenberg/pull/29674))
-- Update Versions in WordPress to include release notes. ([29532](https://github.com/WordPress/gutenberg/pull/29532))
-- Extract block variations API into its own handbook page. ([29515](https://github.com/WordPress/gutenberg/pull/29515))
-- Docs: Fix deprecation message to be clear. ([29451](https://github.com/WordPress/gutenberg/pull/29451))
-- Fix typo in block-based-themes.md. ([29410](https://github.com/WordPress/gutenberg/pull/29410))
-- Fix typo in modularity. ([29405](https://github.com/WordPress/gutenberg/pull/29405))
-- Fix typos in git workflow documentation. ([29324](https://github.com/WordPress/gutenberg/pull/29324))
-- Docs: Table of contents - fix typos. ([29319](https://github.com/WordPress/gutenberg/pull/29319))
-- Add NVDA instructions to the accessibility testing documentation. ([29312](https://github.com/WordPress/gutenberg/pull/29312))
-- Component Systems: Update references to external module. ([29233](https://github.com/WordPress/gutenberg/pull/29233))
-- Docs: Add info about npm release types and their schedule. ([29028](https://github.com/WordPress/gutenberg/pull/29028))
-- Docs: Update slug for block-based theme tutorial. ([25839](https://github.com/WordPress/gutenberg/pull/25839))
+-   Add block variations page to Block API summary. ([29725](https://github.com/WordPress/gutenberg/pull/29725))
+-   Update Readme of Animate Component to remove todo comment. ([29702](https://github.com/WordPress/gutenberg/pull/29702))
+-   Docs; Organize contributors section using READMEs. ([29688](https://github.com/WordPress/gutenberg/pull/29688))
+-   Remove mid-paragraph newlines. ([29674](https://github.com/WordPress/gutenberg/pull/29674))
+-   Update Versions in WordPress to include release notes. ([29532](https://github.com/WordPress/gutenberg/pull/29532))
+-   Extract block variations API into its own handbook page. ([29515](https://github.com/WordPress/gutenberg/pull/29515))
+-   Docs: Fix deprecation message to be clear. ([29451](https://github.com/WordPress/gutenberg/pull/29451))
+-   Fix typo in block-based-themes.md. ([29410](https://github.com/WordPress/gutenberg/pull/29410))
+-   Fix typo in modularity. ([29405](https://github.com/WordPress/gutenberg/pull/29405))
+-   Fix typos in git workflow documentation. ([29324](https://github.com/WordPress/gutenberg/pull/29324))
+-   Docs: Table of contents - fix typos. ([29319](https://github.com/WordPress/gutenberg/pull/29319))
+-   Add NVDA instructions to the accessibility testing documentation. ([29312](https://github.com/WordPress/gutenberg/pull/29312))
+-   Component Systems: Update references to external module. ([29233](https://github.com/WordPress/gutenberg/pull/29233))
+-   Docs: Add info about npm release types and their schedule. ([29028](https://github.com/WordPress/gutenberg/pull/29028))
+-   Docs: Update slug for block-based theme tutorial. ([25839](https://github.com/WordPress/gutenberg/pull/25839))
 
 ### Code Quality
 
-- Rename load_separate_block_styles to load_separate_block_assets. ([29703](https://github.com/WordPress/gutenberg/pull/29703))
-- Update the minimum WordPress version required by the gutenberg plugin too 5.6. ([29701](https://github.com/WordPress/gutenberg/pull/29701))
-- Components: Ensure that SlotFill does not use portals in React Native. ([29631](https://github.com/WordPress/gutenberg/pull/29631))
-- Remove the subheading block. ([29627](https://github.com/WordPress/gutenberg/pull/29627))
-- useFocusFirstElement: Include useRef. ([29435](https://github.com/WordPress/gutenberg/pull/29435))
-- Include PHP: Replace `dirname( __FILE__ )` with `__DIR__`. ([29404](https://github.com/WordPress/gutenberg/pull/29404))
-- Run phpcbf to fix PHP CS issues. ([29368](https://github.com/WordPress/gutenberg/pull/29368))
-- Register style attribute when any color property is supported. ([29349](https://github.com/WordPress/gutenberg/pull/29349))
-- Block context:
-  - Remove unused onFocus block context. ([29318](https://github.com/WordPress/gutenberg/pull/29318))
-  - Reduce memoized block context: Class names. ([29186](https://github.com/WordPress/gutenberg/pull/29186))
-  - Remove obsolete block context. ([29313](https://github.com/WordPress/gutenberg/pull/29313))
-  - Block edit: Avoid memoized block context in favour of useSelect. ([29333](https://github.com/WordPress/gutenberg/pull/29333))
+-   Rename load_separate_block_styles to load_separate_block_assets. ([29703](https://github.com/WordPress/gutenberg/pull/29703))
+-   Update the minimum WordPress version required by the gutenberg plugin too 5.6. ([29701](https://github.com/WordPress/gutenberg/pull/29701))
+-   Components: Ensure that SlotFill does not use portals in React Native. ([29631](https://github.com/WordPress/gutenberg/pull/29631))
+-   Remove the subheading block. ([29627](https://github.com/WordPress/gutenberg/pull/29627))
+-   useFocusFirstElement: Include useRef. ([29435](https://github.com/WordPress/gutenberg/pull/29435))
+-   Include PHP: Replace `dirname( __FILE__ )` with `__DIR__`. ([29404](https://github.com/WordPress/gutenberg/pull/29404))
+-   Run phpcbf to fix PHP CS issues. ([29368](https://github.com/WordPress/gutenberg/pull/29368))
+-   Register style attribute when any color property is supported. ([29349](https://github.com/WordPress/gutenberg/pull/29349))
+-   Block context:
+    -   Remove unused onFocus block context. ([29318](https://github.com/WordPress/gutenberg/pull/29318))
+    -   Reduce memoized block context: Class names. ([29186](https://github.com/WordPress/gutenberg/pull/29186))
+    -   Remove obsolete block context. ([29313](https://github.com/WordPress/gutenberg/pull/29313))
+    -   Block edit: Avoid memoized block context in favour of useSelect. ([29333](https://github.com/WordPress/gutenberg/pull/29333))
 
 ### Tools
 
-- Scripts:
-  - Fork jest-environment-puppeteer to use puppeteer-core directly. ([29418](https://github.com/WordPress/gutenberg/pull/29418))
-  - Add TypeScript support to linting command. ([27143](https://github.com/WordPress/gutenberg/pull/27143))
-- Needs Info / Stale bot
-  - Add stale issues bot to help triage efforts. ([29321](https://github.com/WordPress/gutenberg/pull/29321))
-  - Do not automatically close message, update stale message. ([29310](https://github.com/WordPress/gutenberg/pull/29310))
-- Tests:
-  - Temporary skip flaky test. ([29601](https://github.com/WordPress/gutenberg/pull/29601))
-  - Paragraph block: Add test to ensure unwrapped editable paragraph. ([29299](https://github.com/WordPress/gutenberg/pull/29299))
-  - Testing: Use snapshot-diff serializer to remove noise in snapshots. ([29270](https://github.com/WordPress/gutenberg/pull/29270))
-  - Inserter: Add end-to-end test to make sure last inserted block is being focused. ([29187](https://github.com/WordPress/gutenberg/pull/29187))
-- Blocks: Preprocess validation log with util.format instead of sprintf. ([29334](https://github.com/WordPress/gutenberg/pull/29334))
-- Docs: Update release.md. ([29091](https://github.com/WordPress/gutenberg/pull/29091))
-- Docs/Tools/CI: Update references from `master` to `trunk`. ([28433](https://github.com/WordPress/gutenberg/pull/28433))
+-   Scripts:
+    -   Fork jest-environment-puppeteer to use puppeteer-core directly. ([29418](https://github.com/WordPress/gutenberg/pull/29418))
+    -   Add TypeScript support to linting command. ([27143](https://github.com/WordPress/gutenberg/pull/27143))
+-   Needs Info / Stale bot
+    -   Add stale issues bot to help triage efforts. ([29321](https://github.com/WordPress/gutenberg/pull/29321))
+    -   Do not automatically close message, update stale message. ([29310](https://github.com/WordPress/gutenberg/pull/29310))
+-   Tests:
+    -   Temporary skip flaky test. ([29601](https://github.com/WordPress/gutenberg/pull/29601))
+    -   Paragraph block: Add test to ensure unwrapped editable paragraph. ([29299](https://github.com/WordPress/gutenberg/pull/29299))
+    -   Testing: Use snapshot-diff serializer to remove noise in snapshots. ([29270](https://github.com/WordPress/gutenberg/pull/29270))
+    -   Inserter: Add end-to-end test to make sure last inserted block is being focused. ([29187](https://github.com/WordPress/gutenberg/pull/29187))
+-   Blocks: Preprocess validation log with util.format instead of sprintf. ([29334](https://github.com/WordPress/gutenberg/pull/29334))
+-   Docs: Update release.md. ([29091](https://github.com/WordPress/gutenberg/pull/29091))
+-   Docs/Tools/CI: Update references from `master` to `trunk`. ([28433](https://github.com/WordPress/gutenberg/pull/28433))
 
 ### Various
 
-- Full-Site Editing
-  - Site Editor: Browsing sidebar templates menu restructure. ([28291](https://github.com/WordPress/gutenberg/pull/28291))
-  - Site Editor: Persistent List View. ([28637](https://github.com/WordPress/gutenberg/pull/28637))
-  - Template part block: Add variations based on areas. ([29122](https://github.com/WordPress/gutenberg/pull/29122))
-  - Template Part: Update switching trigger. ([29257](https://github.com/WordPress/gutenberg/pull/29257))
-  - Template part 'area' term - reword confusing 'type' terminology. ([29679](https://github.com/WordPress/gutenberg/pull/29679))
-  - Add i18n support for template part variations' descriptions. ([29612](https://github.com/WordPress/gutenberg/pull/29612))
-  - Multi entity save panel - remove dynamic copy. ([29637](https://github.com/WordPress/gutenberg/pull/29637))
-- Table of Contents block
-  - Add Table of Contents block (dynamic rendering + hooks version). ([21234](https://github.com/WordPress/gutenberg/pull/21234))
-  - Deregister TOC block until issues are resolved. ([29718](https://github.com/WordPress/gutenberg/pull/29718))
-- Components:
-  - Add next Button, ButtonGroup. ([29230](https://github.com/WordPress/gutenberg/pull/29230))
-  - Add Card. ([29350](https://github.com/WordPress/gutenberg/pull/29350))
-  - Add Divider. ([29433](https://github.com/WordPress/gutenberg/pull/29433))
-  - Add Popover. ([29084](https://github.com/WordPress/gutenberg/pull/29084))
-  - Add TooltipButton. ([29523](https://github.com/WordPress/gutenberg/pull/29523))
-  - Add Tooltip and Shortcut. ([29385](https://github.com/WordPress/gutenberg/pull/29385))
-  - Do not use ViewOwnProps for Portal. ([29345](https://github.com/WordPress/gutenberg/pull/29345))
-  - Update Elevation story. ([29454](https://github.com/WordPress/gutenberg/pull/29454))
-- Component System:
-  - Add basic tests for style system. ([29320](https://github.com/WordPress/gutenberg/pull/29320))
-  - Add tests for color utils. ([29301](https://github.com/WordPress/gutenberg/pull/29301))
-- Types
-  - api-fetch: Add incremental type checking. ([29685](https://github.com/WordPress/gutenberg/pull/29685))
-  - docgen: Add TypeScript support. ([29189](https://github.com/WordPress/gutenberg/pull/29189))
-  - docgen: Incrementally add types. ([29684](https://github.com/WordPress/gutenberg/pull/29684))
-  - Dom: Add type-checking to data-transfer. ([29682](https://github.com/WordPress/gutenberg/pull/29682))
-  - Components: Add types to Shortcut. ([29633](https://github.com/WordPress/gutenberg/pull/29633))
-- Button Block: Removes "Link settings" panel. ([29664](https://github.com/WordPress/gutenberg/pull/29664))
-- Add regression test for editor JS crash caused by rtlcss parsing exception, take 2. ([29598](https://github.com/WordPress/gutenberg/pull/29598))
-- Reset all WP Admin styles in the wrapper of the editor styles. ([29590](https://github.com/WordPress/gutenberg/pull/29590))
-- Revert "[Mobile] - Fix splitting/merging of Paragraph and Heading". ([29587](https://github.com/WordPress/gutenberg/pull/29587))
-- Try updating the minimum required WordPress version for the plugin. ([29579](https://github.com/WordPress/gutenberg/pull/29579))
-- Documents how the widgets editor works. ([29572](https://github.com/WordPress/gutenberg/pull/29572))
-- Drop zone: Fix media lib duplicate issue. ([29567](https://github.com/WordPress/gutenberg/pull/29567))
-- Update the category icons. ([29553](https://github.com/WordPress/gutenberg/pull/29553))
-- Try: Remove important on disabled switcher state. ([29552](https://github.com/WordPress/gutenberg/pull/29552))
-- Remove base control negative help text margin. ([29550](https://github.com/WordPress/gutenberg/pull/29550))
-- Navigation: Re-enable navigation block end-to-end tests. ([29543](https://github.com/WordPress/gutenberg/pull/29543))
-- Accessibility improvement on #29530 issue. ([29534](https://github.com/WordPress/gutenberg/pull/29534))
-- Pin SHA values as version numbers for 3rd party GHAs. ([29485](https://github.com/WordPress/gutenberg/pull/29485))
-- Update the visual design of the Sidebar Menu. ([29476](https://github.com/WordPress/gutenberg/pull/29476))
-- Focus on block selection: Skip inner blocks. ([29434](https://github.com/WordPress/gutenberg/pull/29434))
-- Use correct classname for nested Navigation Link container. ([29380](https://github.com/WordPress/gutenberg/pull/29380))
-- Integrate AztecEditor-iOS 1.19.4. ([29355](https://github.com/WordPress/gutenberg/pull/29355))
-- Block context: Separate native context. ([29315](https://github.com/WordPress/gutenberg/pull/29315))
-- Focus input when InputControl spinner arrows are pressed. ([29305](https://github.com/WordPress/gutenberg/pull/29305))
-- WP Block Styles: Only load in the editor if a theme opts in. ([29252](https://github.com/WordPress/gutenberg/pull/29252))
-- Add new overlay text icon, and use for image. ([29215](https://github.com/WordPress/gutenberg/pull/29215))
-- Add Missing URL state to Navigation Link Block. ([28861](https://github.com/WordPress/gutenberg/pull/28861))
-- Improve dropcap behavior. ([28685](https://github.com/WordPress/gutenberg/pull/28685))
-- Improve the block editor handbook table of content. ([28665](https://github.com/WordPress/gutenberg/pull/28665))
-- RN: Add Bottom Sheet Select Control component. ([28543](https://github.com/WordPress/gutenberg/pull/28543))
-- RichText: Bypass paste filters for internal paste. ([27967](https://github.com/WordPress/gutenberg/pull/27967))
-- Block Directory: Update search results list UI. ([25521](https://github.com/WordPress/gutenberg/pull/25521))
-
+-   Full-Site Editing
+    -   Site Editor: Browsing sidebar templates menu restructure. ([28291](https://github.com/WordPress/gutenberg/pull/28291))
+    -   Site Editor: Persistent List View. ([28637](https://github.com/WordPress/gutenberg/pull/28637))
+    -   Template part block: Add variations based on areas. ([29122](https://github.com/WordPress/gutenberg/pull/29122))
+    -   Template Part: Update switching trigger. ([29257](https://github.com/WordPress/gutenberg/pull/29257))
+    -   Template part 'area' term - reword confusing 'type' terminology. ([29679](https://github.com/WordPress/gutenberg/pull/29679))
+    -   Add i18n support for template part variations' descriptions. ([29612](https://github.com/WordPress/gutenberg/pull/29612))
+    -   Multi entity save panel - remove dynamic copy. ([29637](https://github.com/WordPress/gutenberg/pull/29637))
+-   Table of Contents block
+    -   Add Table of Contents block (dynamic rendering + hooks version). ([21234](https://github.com/WordPress/gutenberg/pull/21234))
+    -   Deregister TOC block until issues are resolved. ([29718](https://github.com/WordPress/gutenberg/pull/29718))
+-   Components:
+    -   Add next Button, ButtonGroup. ([29230](https://github.com/WordPress/gutenberg/pull/29230))
+    -   Add Card. ([29350](https://github.com/WordPress/gutenberg/pull/29350))
+    -   Add Divider. ([29433](https://github.com/WordPress/gutenberg/pull/29433))
+    -   Add Popover. ([29084](https://github.com/WordPress/gutenberg/pull/29084))
+    -   Add TooltipButton. ([29523](https://github.com/WordPress/gutenberg/pull/29523))
+    -   Add Tooltip and Shortcut. ([29385](https://github.com/WordPress/gutenberg/pull/29385))
+    -   Do not use ViewOwnProps for Portal. ([29345](https://github.com/WordPress/gutenberg/pull/29345))
+    -   Update Elevation story. ([29454](https://github.com/WordPress/gutenberg/pull/29454))
+-   Component System:
+    -   Add basic tests for style system. ([29320](https://github.com/WordPress/gutenberg/pull/29320))
+    -   Add tests for color utils. ([29301](https://github.com/WordPress/gutenberg/pull/29301))
+-   Types
+    -   api-fetch: Add incremental type checking. ([29685](https://github.com/WordPress/gutenberg/pull/29685))
+    -   docgen: Add TypeScript support. ([29189](https://github.com/WordPress/gutenberg/pull/29189))
+    -   docgen: Incrementally add types. ([29684](https://github.com/WordPress/gutenberg/pull/29684))
+    -   Dom: Add type-checking to data-transfer. ([29682](https://github.com/WordPress/gutenberg/pull/29682))
+    -   Components: Add types to Shortcut. ([29633](https://github.com/WordPress/gutenberg/pull/29633))
+-   Button Block: Removes "Link settings" panel. ([29664](https://github.com/WordPress/gutenberg/pull/29664))
+-   Add regression test for editor JS crash caused by rtlcss parsing exception, take 2. ([29598](https://github.com/WordPress/gutenberg/pull/29598))
+-   Reset all WP Admin styles in the wrapper of the editor styles. ([29590](https://github.com/WordPress/gutenberg/pull/29590))
+-   Revert "[Mobile] - Fix splitting/merging of Paragraph and Heading". ([29587](https://github.com/WordPress/gutenberg/pull/29587))
+-   Try updating the minimum required WordPress version for the plugin. ([29579](https://github.com/WordPress/gutenberg/pull/29579))
+-   Documents how the widgets editor works. ([29572](https://github.com/WordPress/gutenberg/pull/29572))
+-   Drop zone: Fix media lib duplicate issue. ([29567](https://github.com/WordPress/gutenberg/pull/29567))
+-   Update the category icons. ([29553](https://github.com/WordPress/gutenberg/pull/29553))
+-   Try: Remove important on disabled switcher state. ([29552](https://github.com/WordPress/gutenberg/pull/29552))
+-   Remove base control negative help text margin. ([29550](https://github.com/WordPress/gutenberg/pull/29550))
+-   Navigation: Re-enable navigation block end-to-end tests. ([29543](https://github.com/WordPress/gutenberg/pull/29543))
+-   Accessibility improvement on #29530 issue. ([29534](https://github.com/WordPress/gutenberg/pull/29534))
+-   Pin SHA values as version numbers for 3rd party GHAs. ([29485](https://github.com/WordPress/gutenberg/pull/29485))
+-   Update the visual design of the Sidebar Menu. ([29476](https://github.com/WordPress/gutenberg/pull/29476))
+-   Focus on block selection: Skip inner blocks. ([29434](https://github.com/WordPress/gutenberg/pull/29434))
+-   Use correct classname for nested Navigation Link container. ([29380](https://github.com/WordPress/gutenberg/pull/29380))
+-   Integrate AztecEditor-iOS 1.19.4. ([29355](https://github.com/WordPress/gutenberg/pull/29355))
+-   Block context: Separate native context. ([29315](https://github.com/WordPress/gutenberg/pull/29315))
+-   Focus input when InputControl spinner arrows are pressed. ([29305](https://github.com/WordPress/gutenberg/pull/29305))
+-   WP Block Styles: Only load in the editor if a theme opts in. ([29252](https://github.com/WordPress/gutenberg/pull/29252))
+-   Add new overlay text icon, and use for image. ([29215](https://github.com/WordPress/gutenberg/pull/29215))
+-   Add Missing URL state to Navigation Link Block. ([28861](https://github.com/WordPress/gutenberg/pull/28861))
+-   Improve dropcap behavior. ([28685](https://github.com/WordPress/gutenberg/pull/28685))
+-   Improve the block editor handbook table of content. ([28665](https://github.com/WordPress/gutenberg/pull/28665))
+-   RN: Add Bottom Sheet Select Control component. ([28543](https://github.com/WordPress/gutenberg/pull/28543))
+-   RichText: Bypass paste filters for internal paste. ([27967](https://github.com/WordPress/gutenberg/pull/27967))
+-   Block Directory: Update search results list UI. ([25521](https://github.com/WordPress/gutenberg/pull/25521))
 
 = 10.1.1 =
 
+## Changelog
+
 ### Bug Fixes
 
-- withNotices:  Ensure that the callback props are stable. ([29491](https://github.com/WordPress/gutenberg/pull/29491))
+-   withNotices: Ensure that the callback props are stable. ([29491](https://github.com/WordPress/gutenberg/pull/29491))
 
 ### Various
 
-- withNotices: Memoize the noticeOperations object. ([29582](https://github.com/WordPress/gutenberg/pull/29582))
-
+-   withNotices: Memoize the noticeOperations object. ([29582](https://github.com/WordPress/gutenberg/pull/29582))
 
 = 10.1.0 =
 
+## Changelog
+
 ### Features
-- Use a modal for the reusable blocks creation flow. ([29040](https://github.com/WordPress/gutenberg/pull/29040))
-- Normalize Image's block toolbar. ([29205](https://github.com/WordPress/gutenberg/pull/29205))
-- Add Items Justification to Social Links. ([28980](https://github.com/WordPress/gutenberg/pull/28980))
+
+-   Use a modal for the reusable blocks creation flow. ([29040](https://github.com/WordPress/gutenberg/pull/29040))
+-   Normalize Image's block toolbar. ([29205](https://github.com/WordPress/gutenberg/pull/29205))
+-   Add Items Justification to Social Links. ([28980](https://github.com/WordPress/gutenberg/pull/28980))
 
 ### Enhancements
 
-- Improve the sorting algorithm while searching parent pages. ([29143](https://github.com/WordPress/gutenberg/pull/29143))
-- Buttons: Add space-between justification controls. ([29160](https://github.com/WordPress/gutenberg/pull/29160))
-- Avoid focusing blocks when inserting them into the canvas. ([28191](https://github.com/WordPress/gutenberg/pull/28191))
-- Create Block: Use register_block_type_from_metadata to register blocks on the server. ([28883](https://github.com/WordPress/gutenberg/pull/28883))
-- Greatly improve dragging performance of the focal point picker. ([28676](https://github.com/WordPress/gutenberg/pull/28676))
-- Improve block search input's accessible name and placeholder. ([28393](https://github.com/WordPress/gutenberg/pull/28393))
+-   Improve the sorting algorithm while searching parent pages. ([29143](https://github.com/WordPress/gutenberg/pull/29143))
+-   Buttons: Add space-between justification controls. ([29160](https://github.com/WordPress/gutenberg/pull/29160))
+-   Avoid focusing blocks when inserting them into the canvas. ([28191](https://github.com/WordPress/gutenberg/pull/28191))
+-   Create Block: Use register_block_type_from_metadata to register blocks on the server. ([28883](https://github.com/WordPress/gutenberg/pull/28883))
+-   Greatly improve dragging performance of the focal point picker. ([28676](https://github.com/WordPress/gutenberg/pull/28676))
+-   Improve block search input's accessible name and placeholder. ([28393](https://github.com/WordPress/gutenberg/pull/28393))
 
 ### New APIs
-- Extend updateBlockAttributes to provide for different attribute changes for each block in the clientIds array. ([29099](https://github.com/WordPress/gutenberg/pull/29099))
-
-### Bug Fixes
-
-- Fix Slash Inserter position. ([29288](https://github.com/WordPress/gutenberg/pull/29288))
-- Fix issue with invisible reset template hover state. ([28912](https://github.com/WordPress/gutenberg/pull/28912))
-- InputControl: Fix labelPosition rendering with new ui/flex component. ([29226](https://github.com/WordPress/gutenberg/pull/29226))
-- Button sizing style fix. ([29208](https://github.com/WordPress/gutenberg/pull/29208))
-- Create Block: Fix the background color in esnext template. ([29223](https://github.com/WordPress/gutenberg/pull/29223))
-- Add border-collapse to default block styles in Table block. ([27628](https://github.com/WordPress/gutenberg/pull/27628))
-
-- Navigation Block:
-  - Fix Navigation Links when post type is not Page or Post. ([28892](https://github.com/WordPress/gutenberg/pull/28892))
-  - Fix inline style inheritance. ([28868](https://github.com/WordPress/gutenberg/pull/28868))
-  - Fix PHP notice shown when rendering a navigation link block. ([28999](https://github.com/WordPress/gutenberg/pull/28999))
-
-- Fix is-hovered event listener. ([28715](https://github.com/WordPress/gutenberg/pull/28715))
-- Fix function call in justify toolbar. ([28955](https://github.com/WordPress/gutenberg/pull/28955))
-- Fix footer icon color. ([29199](https://github.com/WordPress/gutenberg/pull/29199))
-- Show page titles special characters in the parent page selector. ([29104](https://github.com/WordPress/gutenberg/pull/29104))
-- Edit Post: Automatically connect a menu item with the pinnable sidebar plugin. ([29081](https://github.com/WordPress/gutenberg/pull/29081))
-- Make `Modal` component use the aria.labelledby prop. ([29020](https://github.com/WordPress/gutenberg/pull/29020))
-- Fix admin menu scroll on editor page. ([28959](https://github.com/WordPress/gutenberg/pull/28959))
-- Prioritize core blocks in the inserter. ([28945](https://github.com/WordPress/gutenberg/pull/28945))
-- Make the __experimentalCaptureToolbars option work reliably. ([28905](https://github.com/WordPress/gutenberg/pull/28905))
-- Ensure sticky tabs are in front of their panel’s descendants. ([28562](https://github.com/WordPress/gutenberg/pull/28562))
-- Navigation Component: Increase color and padding specificity. ([28619](https://github.com/WordPress/gutenberg/pull/28619))
-- Add note to indicate why priority queue callbacks may be undefined. ([28337](https://github.com/WordPress/gutenberg/pull/28337))
-- Keep initial formatting on paste for Preformatted and Verse components. ([27781](https://github.com/WordPress/gutenberg/pull/27781))
-- Rich text: Keep block ID on split. ([28505](https://github.com/WordPress/gutenberg/pull/28505))
-- Fix cursor on rich text blocks when outline mode is active. ([29106](https://github.com/WordPress/gutenberg/pull/29106))
 
+-   Extend updateBlockAttributes to provide for different attribute changes for each block in the clientIds array. ([29099](https://github.com/WordPress/gutenberg/pull/29099))
 
-### Experiments
+### Bug Fixes
 
-- Improve loading method for block styles. ([28358](https://github.com/WordPress/gutenberg/pull/28358))
-- Do not use __experimentalSelector to check the panel title. ([29264](https://github.com/WordPress/gutenberg/pull/29264))
-- Update documentation for social links & theme.json. ([29294](https://github.com/WordPress/gutenberg/pull/29294))
-- Navigation Screen:
-  - Add block deselection when clicking canvas background. ([28876](https://github.com/WordPress/gutenberg/pull/28876))
-  - Improve experience for user creating their first menu. ([28767](https://github.com/WordPress/gutenberg/pull/28767))
-  - Fix positioning of nested submenus. ([28934](https://github.com/WordPress/gutenberg/pull/28934))
-- Full Site Editing:
-  - Use a modal for the template part creation flow. ([29108](https://github.com/WordPress/gutenberg/pull/29108))
-  - Add an 'area' term for Template Parts. ([28410](https://github.com/WordPress/gutenberg/pull/28410))
-  - Add content menu items preview in Navigation. ([29225](https://github.com/WordPress/gutenberg/pull/29225))
-  - Replace locate_template method. ([28942](https://github.com/WordPress/gutenberg/pull/28942))
-  - Site Editor:
-    - Inject theme attribute into template parts too. ([29080](https://github.com/WordPress/gutenberg/pull/29080))
-    - Organise semantic template parts. ([29030](https://github.com/WordPress/gutenberg/pull/29030))
-	- Show contextual icon in the Inspector's template tab. ([29195](https://github.com/WordPress/gutenberg/pull/29195))
-    - Add template tab to sidebar. ([28633](https://github.com/WordPress/gutenberg/pull/28633))
-- Global Styles:
-  - Support skipping serialization in the color hook (block supports mechanism). ([29142](https://github.com/WordPress/gutenberg/pull/29142))
-  - Fix invalid font-family list. ([28960](https://github.com/WordPress/gutenberg/pull/28960))
-- Widgets:
-  - Use textarea for editing block widgets. ([24899](https://github.com/WordPress/gutenberg/pull/24899))
-  - Set container classname dynamically depending on Widget block. ([26375](https://github.com/WordPress/gutenberg/pull/26375))
-  - Add Widgets REST API changes from Core-51460. ([29242](https://github.com/WordPress/gutenberg/pull/29242))
-- UI Components:
-  - Add Surface Component. ([28596](https://github.com/WordPress/gutenberg/pull/28596))
-  - Add Elevation Component. ([28593](https://github.com/WordPress/gutenberg/pull/28593))
-  - Add FormGroup + ControlLabel components. ([28568](https://github.com/WordPress/gutenberg/pull/28568))
-  - Add spinner. ([29146](https://github.com/WordPress/gutenberg/pull/29146))
-  - Rename ui files to match simpler scheme. ([28948](https://github.com/WordPress/gutenberg/pull/28948))
-  - Add hooks based Scrollable component wrapper. ([28979](https://github.com/WordPress/gutenberg/pull/28979))
-  - Add createComponent unit tests. ([28949](https://github.com/WordPress/gutenberg/pull/28949))
-  - Add hooks based VisuallyHidden. ([28887](https://github.com/WordPress/gutenberg/pull/28887))
-  - Add ControlGroup. ([28982](https://github.com/WordPress/gutenberg/pull/28982))
-  - Add Portal. ([28981](https://github.com/WordPress/gutenberg/pull/28981))
-  - Update documentation (README + inline docs). ([29128](https://github.com/WordPress/gutenberg/pull/29128))
-  - Update color-picker snapshot tests to use diff matching. ([28925](https://github.com/WordPress/gutenberg/pull/28925))
-- Bugs:
-  - Fix Site Logo Styles. ([29227](https://github.com/WordPress/gutenberg/pull/29227))
-  - Template Part: Fallback to missing state if slug or theme is invalid. ([29041](https://github.com/WordPress/gutenberg/pull/29041))
-  - Site Editor:
-    - Fix misalignment with navigation toggle and header. ([29093](https://github.com/WordPress/gutenberg/pull/29093))
-    - Fix navigation editor block selection clearing. ([29293](https://github.com/WordPress/gutenberg/pull/29293))
-    - Fix navigate to link error. ([29239](https://github.com/WordPress/gutenberg/pull/29239))
-    - Fix position and style of "Dashboard" link. ([29034](https://github.com/WordPress/gutenberg/pull/29034))
-	- Fix end-to-end test errors introduced by template sidebar. ([28950](https://github.com/WordPress/gutenberg/pull/28950))
-  - Widgets:
-    - Fix widgets preview URL typo. ([29062](https://github.com/WordPress/gutenberg/pull/29062))
-    - Fix php error in the widget screen. ([29137](https://github.com/WordPress/gutenberg/pull/29137))
-    - Fix legacy widgets not previewing and widgets saving issue. ([29111](https://github.com/WordPress/gutenberg/pull/29111))
-    - Fix server rendered widget not previewing. ([29197](https://github.com/WordPress/gutenberg/pull/29197))
+-   Fix Slash Inserter position. ([29288](https://github.com/WordPress/gutenberg/pull/29288))
+-   Fix issue with invisible reset template hover state. ([28912](https://github.com/WordPress/gutenberg/pull/28912))
+-   InputControl: Fix labelPosition rendering with new ui/flex component. ([29226](https://github.com/WordPress/gutenberg/pull/29226))
+-   Button sizing style fix. ([29208](https://github.com/WordPress/gutenberg/pull/29208))
+-   Create Block: Fix the background color in esnext template. ([29223](https://github.com/WordPress/gutenberg/pull/29223))
+-   Add border-collapse to default block styles in Table block. ([27628](https://github.com/WordPress/gutenberg/pull/27628))
+
+-   Navigation Block:
+
+    -   Fix Navigation Links when post type is not Page or Post. ([28892](https://github.com/WordPress/gutenberg/pull/28892))
+    -   Fix inline style inheritance. ([28868](https://github.com/WordPress/gutenberg/pull/28868))
+    -   Fix PHP notice shown when rendering a navigation link block. ([28999](https://github.com/WordPress/gutenberg/pull/28999))
+
+-   Fix is-hovered event listener. ([28715](https://github.com/WordPress/gutenberg/pull/28715))
+-   Fix function call in justify toolbar. ([28955](https://github.com/WordPress/gutenberg/pull/28955))
+-   Fix footer icon color. ([29199](https://github.com/WordPress/gutenberg/pull/29199))
+-   Show page titles special characters in the parent page selector. ([29104](https://github.com/WordPress/gutenberg/pull/29104))
+-   Edit Post: Automatically connect a menu item with the pinnable sidebar plugin. ([29081](https://github.com/WordPress/gutenberg/pull/29081))
+-   Make `Modal` component use the aria.labelledby prop. ([29020](https://github.com/WordPress/gutenberg/pull/29020))
+-   Fix admin menu scroll on editor page. ([28959](https://github.com/WordPress/gutenberg/pull/28959))
+-   Prioritize core blocks in the inserter. ([28945](https://github.com/WordPress/gutenberg/pull/28945))
+-   Make the \_\_experimentalCaptureToolbars option work reliably. ([28905](https://github.com/WordPress/gutenberg/pull/28905))
+-   Ensure sticky tabs are in front of their panel’s descendants. ([28562](https://github.com/WordPress/gutenberg/pull/28562))
+-   Navigation Component: Increase color and padding specificity. ([28619](https://github.com/WordPress/gutenberg/pull/28619))
+-   Add note to indicate why priority queue callbacks may be undefined. ([28337](https://github.com/WordPress/gutenberg/pull/28337))
+-   Keep initial formatting on paste for Preformatted and Verse components. ([27781](https://github.com/WordPress/gutenberg/pull/27781))
+-   Rich text: Keep block ID on split. ([28505](https://github.com/WordPress/gutenberg/pull/28505))
+-   Fix cursor on rich text blocks when outline mode is active. ([29106](https://github.com/WordPress/gutenberg/pull/29106))
+
+### Experiments
 
+-   Improve loading method for block styles. ([28358](https://github.com/WordPress/gutenberg/pull/28358))
+-   Do not use \_\_experimentalSelector to check the panel title. ([29264](https://github.com/WordPress/gutenberg/pull/29264))
+-   Update documentation for social links & theme.json. ([29294](https://github.com/WordPress/gutenberg/pull/29294))
+-   Navigation Screen:
+    -   Add block deselection when clicking canvas background. ([28876](https://github.com/WordPress/gutenberg/pull/28876))
+    -   Improve experience for user creating their first menu. ([28767](https://github.com/WordPress/gutenberg/pull/28767))
+    -   Fix positioning of nested submenus. ([28934](https://github.com/WordPress/gutenberg/pull/28934))
+-   Full Site Editing:
+    -   Use a modal for the template part creation flow. ([29108](https://github.com/WordPress/gutenberg/pull/29108))
+    -   Add an 'area' term for Template Parts. ([28410](https://github.com/WordPress/gutenberg/pull/28410))
+    -   Add content menu items preview in Navigation. ([29225](https://github.com/WordPress/gutenberg/pull/29225))
+    -   Replace locate_template method. ([28942](https://github.com/WordPress/gutenberg/pull/28942))
+    -   Site Editor:
+        -   Inject theme attribute into template parts too. ([29080](https://github.com/WordPress/gutenberg/pull/29080))
+        -   Organise semantic template parts. ([29030](https://github.com/WordPress/gutenberg/pull/29030))
+    -   Show contextual icon in the Inspector's template tab. ([29195](https://github.com/WordPress/gutenberg/pull/29195))
+        -   Add template tab to sidebar. ([28633](https://github.com/WordPress/gutenberg/pull/28633))
+-   Global Styles:
+    -   Support skipping serialization in the color hook (block supports mechanism). ([29142](https://github.com/WordPress/gutenberg/pull/29142))
+    -   Fix invalid font-family list. ([28960](https://github.com/WordPress/gutenberg/pull/28960))
+-   Widgets:
+    -   Use textarea for editing block widgets. ([24899](https://github.com/WordPress/gutenberg/pull/24899))
+    -   Set container classname dynamically depending on Widget block. ([26375](https://github.com/WordPress/gutenberg/pull/26375))
+    -   Add Widgets REST API changes from Core-51460. ([29242](https://github.com/WordPress/gutenberg/pull/29242))
+-   UI Components:
+    -   Add Surface Component. ([28596](https://github.com/WordPress/gutenberg/pull/28596))
+    -   Add Elevation Component. ([28593](https://github.com/WordPress/gutenberg/pull/28593))
+    -   Add FormGroup + ControlLabel components. ([28568](https://github.com/WordPress/gutenberg/pull/28568))
+    -   Add spinner. ([29146](https://github.com/WordPress/gutenberg/pull/29146))
+    -   Rename ui files to match simpler scheme. ([28948](https://github.com/WordPress/gutenberg/pull/28948))
+    -   Add hooks based Scrollable component wrapper. ([28979](https://github.com/WordPress/gutenberg/pull/28979))
+    -   Add createComponent unit tests. ([28949](https://github.com/WordPress/gutenberg/pull/28949))
+    -   Add hooks based VisuallyHidden. ([28887](https://github.com/WordPress/gutenberg/pull/28887))
+    -   Add ControlGroup. ([28982](https://github.com/WordPress/gutenberg/pull/28982))
+    -   Add Portal. ([28981](https://github.com/WordPress/gutenberg/pull/28981))
+    -   Update documentation (README + inline docs). ([29128](https://github.com/WordPress/gutenberg/pull/29128))
+    -   Update color-picker snapshot tests to use diff matching. ([28925](https://github.com/WordPress/gutenberg/pull/28925))
+-   Bugs:
+    -   Fix Site Logo Styles. ([29227](https://github.com/WordPress/gutenberg/pull/29227))
+    -   Template Part: Fallback to missing state if slug or theme is invalid. ([29041](https://github.com/WordPress/gutenberg/pull/29041))
+    -   Site Editor:
+        -   Fix misalignment with navigation toggle and header. ([29093](https://github.com/WordPress/gutenberg/pull/29093))
+        -   Fix navigation editor block selection clearing. ([29293](https://github.com/WordPress/gutenberg/pull/29293))
+        -   Fix navigate to link error. ([29239](https://github.com/WordPress/gutenberg/pull/29239))
+        -   Fix position and style of "Dashboard" link. ([29034](https://github.com/WordPress/gutenberg/pull/29034))
+    -   Fix end-to-end test errors introduced by template sidebar. ([28950](https://github.com/WordPress/gutenberg/pull/28950))
+    -   Widgets:
+        -   Fix widgets preview URL typo. ([29062](https://github.com/WordPress/gutenberg/pull/29062))
+        -   Fix php error in the widget screen. ([29137](https://github.com/WordPress/gutenberg/pull/29137))
+        -   Fix legacy widgets not previewing and widgets saving issue. ([29111](https://github.com/WordPress/gutenberg/pull/29111))
+        -   Fix server rendered widget not previewing. ([29197](https://github.com/WordPress/gutenberg/pull/29197))
 
 ### Documentation
 
-- Add accessibility testing instructions. ([28947](https://github.com/WordPress/gutenberg/pull/28947))
-- Updates to Outreach Page. ([28929](https://github.com/WordPress/gutenberg/pull/28929))
-- Update Create a Block tutorial to use `block.json`. ([29027](https://github.com/WordPress/gutenberg/pull/29027))
-- Expose Block Directory references in the handbook. ([29025](https://github.com/WordPress/gutenberg/pull/29025))
-- Update "key concepts". ([28973](https://github.com/WordPress/gutenberg/pull/28973))
-- Remove Font style, weight, decoration, and transform presets from the theme.json documentation. ([29200](https://github.com/WordPress/gutenberg/pull/29200))
-- Combobox Control: Update API doc. ([28787](https://github.com/WordPress/gutenberg/pull/28787))
-- Add block variations to FAQ. ([29154](https://github.com/WordPress/gutenberg/pull/29154), [29170](https://github.com/WordPress/gutenberg/pull/29170))
-- Add templates and global styles to key concepts. ([29071](https://github.com/WordPress/gutenberg/pull/29071))
-- Update block metadata section to promote PHP API. ([29023](https://github.com/WordPress/gutenberg/pull/29023))
-- Fix the header links, add link to user documentation. ([28857](https://github.com/WordPress/gutenberg/pull/28857))
+-   Add accessibility testing instructions. ([28947](https://github.com/WordPress/gutenberg/pull/28947))
+-   Updates to Outreach Page. ([28929](https://github.com/WordPress/gutenberg/pull/28929))
+-   Update Create a Block tutorial to use `block.json`. ([29027](https://github.com/WordPress/gutenberg/pull/29027))
+-   Expose Block Directory references in the handbook. ([29025](https://github.com/WordPress/gutenberg/pull/29025))
+-   Update "key concepts". ([28973](https://github.com/WordPress/gutenberg/pull/28973))
+-   Remove Font style, weight, decoration, and transform presets from the theme.json documentation. ([29200](https://github.com/WordPress/gutenberg/pull/29200))
+-   Combobox Control: Update API doc. ([28787](https://github.com/WordPress/gutenberg/pull/28787))
+-   Add block variations to FAQ. ([29154](https://github.com/WordPress/gutenberg/pull/29154), [29170](https://github.com/WordPress/gutenberg/pull/29170))
+-   Add templates and global styles to key concepts. ([29071](https://github.com/WordPress/gutenberg/pull/29071))
+-   Update block metadata section to promote PHP API. ([29023](https://github.com/WordPress/gutenberg/pull/29023))
+-   Fix the header links, add link to user documentation. ([28857](https://github.com/WordPress/gutenberg/pull/28857))
 
 ### Code Quality
-- Replace store name literals in `block-library`. ([28975](https://github.com/WordPress/gutenberg/pull/28975))
-- Fix typos in PHP comments. ([29198](https://github.com/WordPress/gutenberg/pull/29198))
-
-- Format TS files according to coding styles. ([29064](https://github.com/WordPress/gutenberg/pull/29064))
-- WP_Theme_JSON_Resolver: Update translate terminology. ([28944](https://github.com/WordPress/gutenberg/pull/28944))
-- Improve code readability by not passing variables by reference. ([28943](https://github.com/WordPress/gutenberg/pull/28943))
-- Convert navigation link to use hooks and context. ([28996](https://github.com/WordPress/gutenberg/pull/28996))
-- Block props: Avoid memo (block mode). ([29139](https://github.com/WordPress/gutenberg/pull/29139))
-
-- Reduce memoized context:
-  - Block props. ([29183](https://github.com/WordPress/gutenberg/pull/29183))
-  - Block nodes. ([29163](https://github.com/WordPress/gutenberg/pull/29163))
-- Use ref callback:
-  - Iframe, selection clearer, typing observer. ([29114](https://github.com/WordPress/gutenberg/pull/29114))
-  - Canvas click redirect & typewriter hooks. ([29105](https://github.com/WordPress/gutenberg/pull/29105))
-  - Clipboard handler. ([29090](https://github.com/WordPress/gutenberg/pull/29090))
-  - Hover hook. ([29089](https://github.com/WordPress/gutenberg/pull/29089))
-  - useBlockProps. ([28917](https://github.com/WordPress/gutenberg/pull/28917))
-  - Block nodes. ([29153](https://github.com/WordPress/gutenberg/pull/29153))
 
+-   Replace store name literals in `block-library`. ([28975](https://github.com/WordPress/gutenberg/pull/28975))
+-   Fix typos in PHP comments. ([29198](https://github.com/WordPress/gutenberg/pull/29198))
+
+-   Format TS files according to coding styles. ([29064](https://github.com/WordPress/gutenberg/pull/29064))
+-   WP_Theme_JSON_Resolver: Update translate terminology. ([28944](https://github.com/WordPress/gutenberg/pull/28944))
+-   Improve code readability by not passing variables by reference. ([28943](https://github.com/WordPress/gutenberg/pull/28943))
+-   Convert navigation link to use hooks and context. ([28996](https://github.com/WordPress/gutenberg/pull/28996))
+-   Block props: Avoid memo (block mode). ([29139](https://github.com/WordPress/gutenberg/pull/29139))
+
+-   Reduce memoized context:
+    -   Block props. ([29183](https://github.com/WordPress/gutenberg/pull/29183))
+    -   Block nodes. ([29163](https://github.com/WordPress/gutenberg/pull/29163))
+-   Use ref callback:
+    -   Iframe, selection clearer, typing observer. ([29114](https://github.com/WordPress/gutenberg/pull/29114))
+    -   Canvas click redirect & typewriter hooks. ([29105](https://github.com/WordPress/gutenberg/pull/29105))
+    -   Clipboard handler. ([29090](https://github.com/WordPress/gutenberg/pull/29090))
+    -   Hover hook. ([29089](https://github.com/WordPress/gutenberg/pull/29089))
+    -   useBlockProps. ([28917](https://github.com/WordPress/gutenberg/pull/28917))
+    -   Block nodes. ([29153](https://github.com/WordPress/gutenberg/pull/29153))
 
 ### Tools
 
-- Add support for native TypeScript. ([28879](https://github.com/WordPress/gutenberg/pull/28879))
-- Limit the npm version to be 6. ([29204](https://github.com/WordPress/gutenberg/pull/29204))
-- Run CI jobs on wp prefix branches. ([29194](https://github.com/WordPress/gutenberg/pull/29194))
-- Eslint plugin: Add suggestions to "data-no-store-string-literals" rule. ([28974](https://github.com/WordPress/gutenberg/pull/28974))
-- Update codeowners. ([29280](https://github.com/WordPress/gutenberg/pull/29280))
-- Scripts:
-  - Coerce live reload port to integer. ([29196](https://github.com/WordPress/gutenberg/pull/29196))
-  - Add Python 2.0 to other OSS licenses in license checker. ([28968](https://github.com/WordPress/gutenberg/pull/28968))
-
-
-- Create Block: Fix issue with processing unrelated engines. ([29066](https://github.com/WordPress/gutenberg/pull/29066))
-
-
-- Fix spacing in new contributor welcome message. ([28958](https://github.com/WordPress/gutenberg/pull/28958))
-- Add react-i18n package with i18n React bindings. ([28465](https://github.com/WordPress/gutenberg/pull/28465))
-- babel-plugin-makepot: Don't transpile the package code. ([28911](https://github.com/WordPress/gutenberg/pull/28911))
-- docgen:
-  - Don't transpile the package code. ([28910](https://github.com/WordPress/gutenberg/pull/28910))
-  - Replace doctrine with comment-parser. ([28615](https://github.com/WordPress/gutenberg/pull/28615))
-- wp-env:
-  - Use Simple Git instead of NodeGit. ([28848](https://github.com/WordPress/gutenberg/pull/28848))
-  - Fix issue where mappings sources were not downloaded. ([28930](https://github.com/WordPress/gutenberg/pull/28930))
-- Changelog script: More fine-grained Changelogs for patch releases. ([28424](https://github.com/WordPress/gutenberg/pull/28424))
-- End 2 End Tests:
-  - end-to-end Tests: Add gallery caption coverage. ([29127](https://github.com/WordPress/gutenberg/pull/29127))
-  - Add basic block preview coverage for inserter. ([29117](https://github.com/WordPress/gutenberg/pull/29117))
-  - Make navigation editor end-to-end tests more robust. ([28936](https://github.com/WordPress/gutenberg/pull/28936))
-- Testing: Add snapshot-diff. ([28897](https://github.com/WordPress/gutenberg/pull/28897))
-
-### Various
+-   Add support for native TypeScript. ([28879](https://github.com/WordPress/gutenberg/pull/28879))
+-   Limit the npm version to be 6. ([29204](https://github.com/WordPress/gutenberg/pull/29204))
+-   Run CI jobs on wp prefix branches. ([29194](https://github.com/WordPress/gutenberg/pull/29194))
+-   Eslint plugin: Add suggestions to "data-no-store-string-literals" rule. ([28974](https://github.com/WordPress/gutenberg/pull/28974))
+-   Update codeowners. ([29280](https://github.com/WordPress/gutenberg/pull/29280))
+-   Scripts:
 
-- Add a custom post type icon. ([29232](https://github.com/WordPress/gutenberg/pull/29232))
-- Update text color icon. ([29212](https://github.com/WordPress/gutenberg/pull/29212))
-- Blocks: Map block type definitions that use PHP naming convention for keys. ([28953](https://github.com/WordPress/gutenberg/pull/28953))
-- Safe access to window/document when in node context:
-  - FocalPointPickerGrid. ([29070](https://github.com/WordPress/gutenberg/pull/29070))
-  - Keycodes. ([29069](https://github.com/WordPress/gutenberg/pull/29069))
-  - dom-ready. ([29068](https://github.com/WordPress/gutenberg/pull/29068))
-  - ResizableBox utils. ([29067](https://github.com/WordPress/gutenberg/pull/29067))
-  - ScrollLock. ([29038](https://github.com/WordPress/gutenberg/pull/29038))
+    -   Coerce live reload port to integer. ([29196](https://github.com/WordPress/gutenberg/pull/29196))
+    -   Add Python 2.0 to other OSS licenses in license checker. ([28968](https://github.com/WordPress/gutenberg/pull/28968))
+
+-   Create Block: Fix issue with processing unrelated engines. ([29066](https://github.com/WordPress/gutenberg/pull/29066))
+
+-   Fix spacing in new contributor welcome message. ([28958](https://github.com/WordPress/gutenberg/pull/28958))
+-   Add react-i18n package with i18n React bindings. ([28465](https://github.com/WordPress/gutenberg/pull/28465))
+-   babel-plugin-makepot: Don't transpile the package code. ([28911](https://github.com/WordPress/gutenberg/pull/28911))
+-   docgen:
+    -   Don't transpile the package code. ([28910](https://github.com/WordPress/gutenberg/pull/28910))
+    -   Replace doctrine with comment-parser. ([28615](https://github.com/WordPress/gutenberg/pull/28615))
+-   wp-env:
+    -   Use Simple Git instead of NodeGit. ([28848](https://github.com/WordPress/gutenberg/pull/28848))
+    -   Fix issue where mappings sources were not downloaded. ([28930](https://github.com/WordPress/gutenberg/pull/28930))
+-   Changelog script: More fine-grained Changelogs for patch releases. ([28424](https://github.com/WordPress/gutenberg/pull/28424))
+-   End 2 End Tests:
+    -   end-to-end Tests: Add gallery caption coverage. ([29127](https://github.com/WordPress/gutenberg/pull/29127))
+    -   Add basic block preview coverage for inserter. ([29117](https://github.com/WordPress/gutenberg/pull/29117))
+    -   Make navigation editor end-to-end tests more robust. ([28936](https://github.com/WordPress/gutenberg/pull/28936))
+-   Testing: Add snapshot-diff. ([28897](https://github.com/WordPress/gutenberg/pull/28897))
 
+### Various
 
+-   Add a custom post type icon. ([29232](https://github.com/WordPress/gutenberg/pull/29232))
+-   Update text color icon. ([29212](https://github.com/WordPress/gutenberg/pull/29212))
+-   Blocks: Map block type definitions that use PHP naming convention for keys. ([28953](https://github.com/WordPress/gutenberg/pull/28953))
+-   Safe access to window/document when in node context:
+    -   FocalPointPickerGrid. ([29070](https://github.com/WordPress/gutenberg/pull/29070))
+    -   Keycodes. ([29069](https://github.com/WordPress/gutenberg/pull/29069))
+    -   dom-ready. ([29068](https://github.com/WordPress/gutenberg/pull/29068))
+    -   ResizableBox utils. ([29067](https://github.com/WordPress/gutenberg/pull/29067))
+    -   ScrollLock. ([29038](https://github.com/WordPress/gutenberg/pull/29038))
 
 = 10.0.2 =
 
-### Bug Fixes
+## Changelog
 
-- Fix white screen on RTL languages. ([29256](https://github.com/WordPress/gutenberg/pull/29256))
-- Fix Button block borders for the solid style variation.
+### Bug Fixes
 
+-   Fix white screen on RTL languages. ([29256](https://github.com/WordPress/gutenberg/pull/29256))
+-   Fix Button block borders for the solid style variation.
 
 = 10.0.1 =
 
-### Bug Fixes
+## Changelog
 
- - CSS-in-JS: Fix inline comment for select-dropdown (external module)
+### Bug Fixes
 
+-   CSS-in-JS: Fix inline comment for select-dropdown (external module)
 
 = 10.0.0 =
 
+## Changelog
+
 ### Features
 
-- Add basic pages block. ([28265](https://github.com/WordPress/gutenberg/pull/28265))
+-   Add basic pages block. ([28265](https://github.com/WordPress/gutenberg/pull/28265))
 
 ### Enhancements
 
-- Make the parent block selector visible and offset in the block toolbar. ([28598](https://github.com/WordPress/gutenberg/pull/28598)) ([28721](https://github.com/WordPress/gutenberg/pull/28721))
-- Update the social empty state for dark themes. ([28838](https://github.com/WordPress/gutenberg/pull/28838))
-- Add the tag name selector to the advanced panel of the Group block. ([28576](https://github.com/WordPress/gutenberg/pull/28576))
-- Categories block: Display message instead of empty content. ([28697](https://github.com/WordPress/gutenberg/pull/28697))
-- Show block patterns in the inserter for non-root level insert position. ([28459](https://github.com/WordPress/gutenberg/pull/28459))
--  A11y: Improve the keyboard navigation in the block patterns inserter. ([28520](https://github.com/WordPress/gutenberg/pull/28520))
-- Allow transforming Paragraph blocks to Buttons block. ([28508](https://github.com/WordPress/gutenberg/pull/28508))
-- Better top toolbar arrow gap. ([28832](https://github.com/WordPress/gutenberg/pull/28832))
-- Update layout icon to use the new design language. ([28651](https://github.com/WordPress/gutenberg/pull/28651))
-- Update the buttons icons. ([28583](https://github.com/WordPress/gutenberg/pull/28583))
+-   Make the parent block selector visible and offset in the block toolbar. ([28598](https://github.com/WordPress/gutenberg/pull/28598)) ([28721](https://github.com/WordPress/gutenberg/pull/28721))
+-   Update the social empty state for dark themes. ([28838](https://github.com/WordPress/gutenberg/pull/28838))
+-   Add the tag name selector to the advanced panel of the Group block. ([28576](https://github.com/WordPress/gutenberg/pull/28576))
+-   Categories block: Display message instead of empty content. ([28697](https://github.com/WordPress/gutenberg/pull/28697))
+-   Show block patterns in the inserter for non-root level insert position. ([28459](https://github.com/WordPress/gutenberg/pull/28459))
+-   A11y: Improve the keyboard navigation in the block patterns inserter. ([28520](https://github.com/WordPress/gutenberg/pull/28520))
+-   Allow transforming Paragraph blocks to Buttons block. ([28508](https://github.com/WordPress/gutenberg/pull/28508))
+-   Better top toolbar arrow gap. ([28832](https://github.com/WordPress/gutenberg/pull/28832))
+-   Update layout icon to use the new design language. ([28651](https://github.com/WordPress/gutenberg/pull/28651))
+-   Update the buttons icons. ([28583](https://github.com/WordPress/gutenberg/pull/28583))
 
 ### New APIs
 
-- @wordpress/data: Graduate the __experimentalResolveSelect function to a stable status. ([28544](https://github.com/WordPress/gutenberg/pull/28544))
-- @wordpress/compose: Add useMergeRef React hook. ([27768](https://github.com/WordPress/gutenberg/pull/27768))
-- Components: Allow extra props for RadioControl component. ([28631](https://github.com/WordPress/gutenberg/pull/28631))
-- Add JustifyToolbar component to `@wordpress/block-editor`. ([28439](https://github.com/WordPress/gutenberg/pull/28439))
-- @wordpress/i18n: Add new APIs for React bindings. ([28784](https://github.com/WordPress/gutenberg/pull/28784)) ([28725](https://github.com/WordPress/gutenberg/pull/28725))
-
+-   @wordpress/data: Graduate the \_\_experimentalResolveSelect function to a stable status. ([28544](https://github.com/WordPress/gutenberg/pull/28544))
+-   @wordpress/compose: Add useMergeRef React hook. ([27768](https://github.com/WordPress/gutenberg/pull/27768))
+-   Components: Allow extra props for RadioControl component. ([28631](https://github.com/WordPress/gutenberg/pull/28631))
+-   Add JustifyToolbar component to `@wordpress/block-editor`. ([28439](https://github.com/WordPress/gutenberg/pull/28439))
+-   @wordpress/i18n: Add new APIs for React bindings. ([28784](https://github.com/WordPress/gutenberg/pull/28784)) ([28725](https://github.com/WordPress/gutenberg/pull/28725))
 
 ### Bug Fixes
 
-- Fix block insertion a11y string. ([28871](https://github.com/WordPress/gutenberg/pull/28871))
-- Fix npm 7 compatability. ([28824](https://github.com/WordPress/gutenberg/pull/28824))
-- RangeControl: Fix input / slider widths. ([28816](https://github.com/WordPress/gutenberg/pull/28816))
-- Fix post title icon color. ([28727](https://github.com/WordPress/gutenberg/pull/28727))
-- Fix most used blocks usage persistence. ([28694](https://github.com/WordPress/gutenberg/pull/28694))
-- Use consistent icon width for the block icon in the block inspector. ([28666](https://github.com/WordPress/gutenberg/pull/28666))
-- Fix for Latest Posts focus not selectable. ([28660](https://github.com/WordPress/gutenberg/pull/28660))
-- Fix issue where gallery block requests all attachments when empty. ([28621](https://github.com/WordPress/gutenberg/pull/28621))
-- Fix handling of custom unit theme setting. ([28603](https://github.com/WordPress/gutenberg/pull/28603))
-- Fix wrong space-between style in the Buttons block. ([28485](https://github.com/WordPress/gutenberg/pull/28485))
-- Calculate insertion usage for block variations properly. ([28663](https://github.com/WordPress/gutenberg/pull/28663))
-- Fix the default Buttons block radius, and size. ([28514](https://github.com/WordPress/gutenberg/pull/28514))
-- Fix the Cover block height. ([28455](https://github.com/WordPress/gutenberg/pull/28455))
+-   Fix block insertion a11y string. ([28871](https://github.com/WordPress/gutenberg/pull/28871))
+-   Fix npm 7 compatability. ([28824](https://github.com/WordPress/gutenberg/pull/28824))
+-   RangeControl: Fix input / slider widths. ([28816](https://github.com/WordPress/gutenberg/pull/28816))
+-   Fix post title icon color. ([28727](https://github.com/WordPress/gutenberg/pull/28727))
+-   Fix most used blocks usage persistence. ([28694](https://github.com/WordPress/gutenberg/pull/28694))
+-   Use consistent icon width for the block icon in the block inspector. ([28666](https://github.com/WordPress/gutenberg/pull/28666))
+-   Fix for Latest Posts focus not selectable. ([28660](https://github.com/WordPress/gutenberg/pull/28660))
+-   Fix issue where gallery block requests all attachments when empty. ([28621](https://github.com/WordPress/gutenberg/pull/28621))
+-   Fix handling of custom unit theme setting. ([28603](https://github.com/WordPress/gutenberg/pull/28603))
+-   Fix wrong space-between style in the Buttons block. ([28485](https://github.com/WordPress/gutenberg/pull/28485))
+-   Calculate insertion usage for block variations properly. ([28663](https://github.com/WordPress/gutenberg/pull/28663))
+-   Fix the default Buttons block radius, and size. ([28514](https://github.com/WordPress/gutenberg/pull/28514))
+-   Fix the Cover block height. ([28455](https://github.com/WordPress/gutenberg/pull/28455))
 
 ### Experiments
 
-- Site Editor:
-    - Fix empty content when creating a new template. ([28882](https://github.com/WordPress/gutenberg/pull/28882))
-    - Fix complementary area not opening. ([28732](https://github.com/WordPress/gutenberg/pull/28732))
-    - Fix inserter can't be closed. ([28590](https://github.com/WordPress/gutenberg/pull/28590))
-    - Fix gray screen on refresh when editing pages and posts. ([28413](https://github.com/WordPress/gutenberg/pull/28413))
-    - Show single post template in posts templates in the navigation sidebar. ([28229](https://github.com/WordPress/gutenberg/pull/28229))
-    - Allow searching pages, posts and categories in the navigation sidebar. ([27280](https://github.com/WordPress/gutenberg/pull/27280))
-- Full Site Editing Architecture:
-    - Iterate on the public API of WP_Theme_JSON_Resolver. ([28855](https://github.com/WordPress/gutenberg/pull/28855))
-    - Rename pageTemplates configuration to customTemplates in theme.json. ([28830](https://github.com/WordPress/gutenberg/pull/28830))
-    - Move theme.json support check to class. ([28788](https://github.com/WordPress/gutenberg/pull/28788))
-    - Improve performance on file access of `experimental-theme.json`. ([28786](https://github.com/WordPress/gutenberg/pull/28786))
-    - Load page templates via theme.json abstractions. ([28700](https://github.com/WordPress/gutenberg/pull/28700))
-- Full Site Editing blocks:
-    - Post Featured Image block: Render nothing if featured image doesn't exist. ([28625](https://github.com/WordPress/gutenberg/pull/28625))
-    - Add a description to the template part block. ([28839](https://github.com/WordPress/gutenberg/pull/28839))
-    - Move template part title field to the block inspector. ([28835](https://github.com/WordPress/gutenberg/pull/28835))
-    - Use display title for template part block type toolbar anchor. ([28691](https://github.com/WordPress/gutenberg/pull/28691))
-     - Allow the query block to work on singular pages when inheriting the global query. ([28351](https://github.com/WordPress/gutenberg/pull/28351))
-    - Query Pagination block: cleanup. ([28831](https://github.com/WordPress/gutenberg/pull/28831))
-    - Enqueue comment-reply script when post-comments-form block gets rendered. ([28826](https://github.com/WordPress/gutenberg/pull/28826))
-- Navigation Block:
-    - Fix transparent navigation block submenus. ([28904](https://github.com/WordPress/gutenberg/pull/28904))
-    - Polish social links when inside navigation. ([28836](https://github.com/WordPress/gutenberg/pull/28836)), ([28448](https://github.com/WordPress/gutenberg/pull/28448)).
-    - Add block variation matcher to display information from a found match. ([28626](https://github.com/WordPress/gutenberg/pull/28626))
-    - Add new Post Navigation Link block. ([28602](https://github.com/WordPress/gutenberg/pull/28602))
-- Navigation screen:
-    - Fix failing request for menu items. ([28764](https://github.com/WordPress/gutenberg/pull/28764))
-    - Design Iteration. ([28675](https://github.com/WordPress/gutenberg/pull/28675))
-    - Clear block selection in the navigation editor when clicking editor canvas. ([28382](https://github.com/WordPress/gutenberg/pull/28382))
-- Block-based widgets screen and customizer:
-    - Add experimental flag and enable widgets screen in customizer. ([28618](https://github.com/WordPress/gutenberg/pull/28618))
-- Global Styles:
-    - Use context when translating entries in theme.json. ([28246](https://github.com/WordPress/gutenberg/pull/28246))
-- REST API:
-    - Add URL Details endpoint to REST API to allow retrieval of info about a remote URL. ([18042](https://github.com/WordPress/gutenberg/pull/18042))
-    - Pattern Directory API: Return the block pattern value as content. ([28799](https://github.com/WordPress/gutenberg/pull/28799))
-    - Pattern Directory API: Add a `keyword` filter parameter. ([28794](https://github.com/WordPress/gutenberg/pull/28794))
-- UI Components:
-    - Group all experimental components in the `ui` folder. ([28624](https://github.com/WordPress/gutenberg/pull/28624))
-    - Fix types. ([28571](https://github.com/WordPress/gutenberg/pull/28571))
-    - Add VStack component. ([28798](https://github.com/WordPress/gutenberg/pull/28798))
-    - Add HStack component. ([28707](https://github.com/WordPress/gutenberg/pull/28707))
-    - Add Flex component. ([28609](https://github.com/WordPress/gutenberg/pull/28609))
+-   Site Editor:
+    -   Fix empty content when creating a new template. ([28882](https://github.com/WordPress/gutenberg/pull/28882))
+    -   Fix complementary area not opening. ([28732](https://github.com/WordPress/gutenberg/pull/28732))
+    -   Fix inserter can't be closed. ([28590](https://github.com/WordPress/gutenberg/pull/28590))
+    -   Fix gray screen on refresh when editing pages and posts. ([28413](https://github.com/WordPress/gutenberg/pull/28413))
+    -   Show single post template in posts templates in the navigation sidebar. ([28229](https://github.com/WordPress/gutenberg/pull/28229))
+    -   Allow searching pages, posts and categories in the navigation sidebar. ([27280](https://github.com/WordPress/gutenberg/pull/27280))
+-   Full Site Editing Architecture:
+    -   Iterate on the public API of WP_Theme_JSON_Resolver. ([28855](https://github.com/WordPress/gutenberg/pull/28855))
+    -   Rename pageTemplates configuration to customTemplates in theme.json. ([28830](https://github.com/WordPress/gutenberg/pull/28830))
+    -   Move theme.json support check to class. ([28788](https://github.com/WordPress/gutenberg/pull/28788))
+    -   Improve performance on file access of `experimental-theme.json`. ([28786](https://github.com/WordPress/gutenberg/pull/28786))
+    -   Load page templates via theme.json abstractions. ([28700](https://github.com/WordPress/gutenberg/pull/28700))
+-   Full Site Editing blocks:
+    -   Post Featured Image block: Render nothing if featured image doesn't exist. ([28625](https://github.com/WordPress/gutenberg/pull/28625))
+    -   Add a description to the template part block. ([28839](https://github.com/WordPress/gutenberg/pull/28839))
+    -   Move template part title field to the block inspector. ([28835](https://github.com/WordPress/gutenberg/pull/28835))
+    -   Use display title for template part block type toolbar anchor. ([28691](https://github.com/WordPress/gutenberg/pull/28691))
+    -   Allow the query block to work on singular pages when inheriting the global query. ([28351](https://github.com/WordPress/gutenberg/pull/28351))
+    -   Query Pagination block: cleanup. ([28831](https://github.com/WordPress/gutenberg/pull/28831))
+    -   Enqueue comment-reply script when post-comments-form block gets rendered. ([28826](https://github.com/WordPress/gutenberg/pull/28826))
+-   Navigation Block:
+    -   Fix transparent navigation block submenus. ([28904](https://github.com/WordPress/gutenberg/pull/28904))
+    -   Polish social links when inside navigation. ([28836](https://github.com/WordPress/gutenberg/pull/28836)), ([28448](https://github.com/WordPress/gutenberg/pull/28448)).
+    -   Add block variation matcher to display information from a found match. ([28626](https://github.com/WordPress/gutenberg/pull/28626))
+    -   Add new Post Navigation Link block. ([28602](https://github.com/WordPress/gutenberg/pull/28602))
+-   Navigation screen:
+    -   Fix failing request for menu items. ([28764](https://github.com/WordPress/gutenberg/pull/28764))
+    -   Design Iteration. ([28675](https://github.com/WordPress/gutenberg/pull/28675))
+    -   Clear block selection in the navigation editor when clicking editor canvas. ([28382](https://github.com/WordPress/gutenberg/pull/28382))
+-   Block-based widgets screen and customizer:
+    -   Add experimental flag and enable widgets screen in customizer. ([28618](https://github.com/WordPress/gutenberg/pull/28618))
+-   Global Styles:
+    -   Use context when translating entries in theme.json. ([28246](https://github.com/WordPress/gutenberg/pull/28246))
+-   REST API:
+    -   Add URL Details endpoint to REST API to allow retrieval of info about a remote URL. ([18042](https://github.com/WordPress/gutenberg/pull/18042))
+    -   Pattern Directory API: Return the block pattern value as content. ([28799](https://github.com/WordPress/gutenberg/pull/28799))
+    -   Pattern Directory API: Add a `keyword` filter parameter. ([28794](https://github.com/WordPress/gutenberg/pull/28794))
+-   UI Components:
+    -   Group all experimental components in the `ui` folder. ([28624](https://github.com/WordPress/gutenberg/pull/28624))
+    -   Fix types. ([28571](https://github.com/WordPress/gutenberg/pull/28571))
+    -   Add VStack component. ([28798](https://github.com/WordPress/gutenberg/pull/28798))
+    -   Add HStack component. ([28707](https://github.com/WordPress/gutenberg/pull/28707))
+    -   Add Flex component. ([28609](https://github.com/WordPress/gutenberg/pull/28609))
 
 ### Documentation
 
-- Theme.json Documentation: Clarify naming schema for CSS Custom Properties. ([28639](https://github.com/WordPress/gutenberg/pull/28639))
-- Update Versions in WordPress to include 5.6.1 & 5.7. ([28641](https://github.com/WordPress/gutenberg/pull/28641))
-- Typos and tweaks: ([28667](https://github.com/WordPress/gutenberg/pull/28667)), ([28657](https://github.com/WordPress/gutenberg/pull/28657)), ([28655](https://github.com/WordPress/gutenberg/pull/28655)), ([28898](https://github.com/WordPress/gutenberg/pull/28898)), ([28894](https://github.com/WordPress/gutenberg/pull/28894)), ([28762](https://github.com/WordPress/gutenberg/pull/28762)), ([28877](https://github.com/WordPress/gutenberg/pull/28877)).
+-   Theme.json Documentation: Clarify naming schema for CSS Custom Properties. ([28639](https://github.com/WordPress/gutenberg/pull/28639))
+-   Update Versions in WordPress to include 5.6.1 & 5.7. ([28641](https://github.com/WordPress/gutenberg/pull/28641))
+-   Typos and tweaks: ([28667](https://github.com/WordPress/gutenberg/pull/28667)), ([28657](https://github.com/WordPress/gutenberg/pull/28657)), ([28655](https://github.com/WordPress/gutenberg/pull/28655)), ([28898](https://github.com/WordPress/gutenberg/pull/28898)), ([28894](https://github.com/WordPress/gutenberg/pull/28894)), ([28762](https://github.com/WordPress/gutenberg/pull/28762)), ([28877](https://github.com/WordPress/gutenberg/pull/28877)).
 
 ### Code Quality
 
-- Improve ButtonBlockAppender styles. ([28464](https://github.com/WordPress/gutenberg/pull/28464))
-- Blocks: Move the logic for Template Part label to the block. ([28828](https://github.com/WordPress/gutenberg/pull/28828))
-- @wordpress/block-directory package: Replace string store names. ([28777](https://github.com/WordPress/gutenberg/pull/28777))
-- @wordpress/block-editor package: Replace string store names. ([28775](https://github.com/WordPress/gutenberg/pull/28775))
-- Site Editor: Replace core/edit-site store name with store object. ([28722](https://github.com/WordPress/gutenberg/pull/28722)), ([28695](https://github.com/WordPress/gutenberg/pull/28695))
-- Relax JSDoc validation for typed packages. ([28729](https://github.com/WordPress/gutenberg/pull/28729))
-- Change apt command to apt-get command. ([28840](https://github.com/WordPress/gutenberg/pull/28840))
-- Refactor Buttons block to use JustifyToolbar controls. ([28768](https://github.com/WordPress/gutenberg/pull/28768))
-- i18n hooks: Don't use typeof to check value falsiness. ([28733](https://github.com/WordPress/gutenberg/pull/28733))
-- Components: Set a default for the ComboboxControl onFilterValueChange. ([28492](https://github.com/WordPress/gutenberg/pull/28492))
+-   Improve ButtonBlockAppender styles. ([28464](https://github.com/WordPress/gutenberg/pull/28464))
+-   Blocks: Move the logic for Template Part label to the block. ([28828](https://github.com/WordPress/gutenberg/pull/28828))
+-   @wordpress/block-directory package: Replace string store names. ([28777](https://github.com/WordPress/gutenberg/pull/28777))
+-   @wordpress/block-editor package: Replace string store names. ([28775](https://github.com/WordPress/gutenberg/pull/28775))
+-   Site Editor: Replace core/edit-site store name with store object. ([28722](https://github.com/WordPress/gutenberg/pull/28722)), ([28695](https://github.com/WordPress/gutenberg/pull/28695))
+-   Relax JSDoc validation for typed packages. ([28729](https://github.com/WordPress/gutenberg/pull/28729))
+-   Change apt command to apt-get command. ([28840](https://github.com/WordPress/gutenberg/pull/28840))
+-   Refactor Buttons block to use JustifyToolbar controls. ([28768](https://github.com/WordPress/gutenberg/pull/28768))
+-   i18n hooks: Don't use typeof to check value falsiness. ([28733](https://github.com/WordPress/gutenberg/pull/28733))
+-   Components: Set a default for the ComboboxControl onFilterValueChange. ([28492](https://github.com/WordPress/gutenberg/pull/28492))
 
 ### Tools
 
-- List all dependencies when checking licenses in NPM 7. ([28909](https://github.com/WordPress/gutenberg/pull/28909))
-- Allow blank GitHub issues again. ([28866](https://github.com/WordPress/gutenberg/pull/28866))
-- wp-env.json: Pin tt1-blocks dependency to v0.4.3. ([28741](https://github.com/WordPress/gutenberg/pull/28741))
-- Add eslint rule for preventing string literals in select/dispatch/useDispatch. ([28726](https://github.com/WordPress/gutenberg/pull/28726))
-- build-worker: Extract the functions that build CSS and JS. ([28724](https://github.com/WordPress/gutenberg/pull/28724))
-- Unit Tests Workflow: Enable for documentation-only PRs. ([28696](https://github.com/WordPress/gutenberg/pull/28696))
-- Fix end-to-end failures on 'Front Page' template. ([28638](https://github.com/WordPress/gutenberg/pull/28638))
-- Fix lint issues (proper number of spaces). ([28629](https://github.com/WordPress/gutenberg/pull/28629))
-- Fix legacy settings tests for custom spacing. ([28628](https://github.com/WordPress/gutenberg/pull/28628))
-- end-to-end tests: Handle upgrade screen. ([28592](https://github.com/WordPress/gutenberg/pull/28592))
-- Add eslint rules to guard against unexpected imports/exports. ([28513](https://github.com/WordPress/gutenberg/pull/28513))
-- Add a welcome comment to first time contributor PRs. ([28118](https://github.com/WordPress/gutenberg/pull/28118))
-- end-to-end Tests: Document Settings. ([27715](https://github.com/WordPress/gutenberg/pull/27715))
-- Updating composer packages for php8 compatibility. ([28623](https://github.com/WordPress/gutenberg/pull/28623))
+-   List all dependencies when checking licenses in NPM 7. ([28909](https://github.com/WordPress/gutenberg/pull/28909))
+-   Allow blank GitHub issues again. ([28866](https://github.com/WordPress/gutenberg/pull/28866))
+-   wp-env.json: Pin tt1-blocks dependency to v0.4.3. ([28741](https://github.com/WordPress/gutenberg/pull/28741))
+-   Add eslint rule for preventing string literals in select/dispatch/useDispatch. ([28726](https://github.com/WordPress/gutenberg/pull/28726))
+-   build-worker: Extract the functions that build CSS and JS. ([28724](https://github.com/WordPress/gutenberg/pull/28724))
+-   Unit Tests Workflow: Enable for documentation-only PRs. ([28696](https://github.com/WordPress/gutenberg/pull/28696))
+-   Fix end-to-end failures on 'Front Page' template. ([28638](https://github.com/WordPress/gutenberg/pull/28638))
+-   Fix lint issues (proper number of spaces). ([28629](https://github.com/WordPress/gutenberg/pull/28629))
+-   Fix legacy settings tests for custom spacing. ([28628](https://github.com/WordPress/gutenberg/pull/28628))
+-   end-to-end tests: Handle upgrade screen. ([28592](https://github.com/WordPress/gutenberg/pull/28592))
+-   Add eslint rules to guard against unexpected imports/exports. ([28513](https://github.com/WordPress/gutenberg/pull/28513))
+-   Add a welcome comment to first-time contributor PRs. ([28118](https://github.com/WordPress/gutenberg/pull/28118))
+-   end-to-end Tests: Document Settings. ([27715](https://github.com/WordPress/gutenberg/pull/27715))
+-   Updating composer packages for php8 compatibility. ([28623](https://github.com/WordPress/gutenberg/pull/28623))
 
 ### Various
 
-- Adjust defaults for COMPONENT_SYSTEM_PHASE variable. ([28772](https://github.com/WordPress/gutenberg/pull/28772))
-- build-worker: Call callback with error when no task for extension. ([28723](https://github.com/WordPress/gutenberg/pull/28723))
+-   Adjust defaults for COMPONENT_SYSTEM_PHASE variable. ([28772](https://github.com/WordPress/gutenberg/pull/28772))
+-   build-worker: Call callback with error when no task for extension. ([28723](https://github.com/WordPress/gutenberg/pull/28723))
 
 = 9.9.3 =
 
-### Bug fixes
+## Changelog
 
-- Gallery Block: Add z-index to fig caption to make sure it is still selectable ([28992](https://github.com/WordPress/gutenberg/pull/28992)
-- Inserter: Prevent focused block from stealing focus when inserting a new block ([28962](https://github.com/WordPress/gutenberg/pull/28962))
+### Bug fixes
 
+-   Gallery Block: Add z-index to fig caption to make sure it is still selectable ([28992](https://github.com/WordPress/gutenberg/pull/28992)
+-   Inserter: Prevent focused block from stealing focus when inserting a new block ([28962](https://github.com/WordPress/gutenberg/pull/28962))
 
 = 9.9.2 =
 
+## Changelog
+
 ### Bug fixes
 
-- Remove duplication of editor styles ([28837](https://github.com/WordPress/gutenberg/pull/28837))
-- Add useMergeRefs hook ([27768](https://github.com/WordPress/gutenberg/pull/27768)) (dependency of 28837)
-- Cover: add missing align attr to deprecation ([28796](https://github.com/WordPress/gutenberg/pull/28796))
+-   Remove duplication of editor styles ([28837](https://github.com/WordPress/gutenberg/pull/28837))
+-   Add useMergeRefs hook ([27768](https://github.com/WordPress/gutenberg/pull/27768)) (dependency of 28837)
+-   Cover: add missing align attr to deprecation ([28796](https://github.com/WordPress/gutenberg/pull/28796))
 
 = 9.9.1 =
 
-### Bug fixes
+## Changelog
 
-- Global Styles: enqueue preset classes in the front-end.
-- Global Styles: load styles in iframed site editor.
+### Bug fixes
 
+-   Global Styles: enqueue preset classes in the front-end.
+-   Global Styles: load styles in iframed site editor.
 
 = 9.9.0 =
 
+## Changelog
+
 ### Enhancements
 
-- Try more muted sibling inserter. ([28550](https://github.com/WordPress/gutenberg/pull/28550))
-- Make sure toggleProps doesn't replace important props on ToolbarGroup. ([28401](https://github.com/WordPress/gutenberg/pull/28401))
-- Improve visual clarity of reusable block. ([28318](https://github.com/WordPress/gutenberg/pull/28318))
-- Dark Theme Support: Allow for theme modifications. ([28233](https://github.com/WordPress/gutenberg/pull/28233))
-- Add disabled support in ToggleControl and FormToggle. ([28228](https://github.com/WordPress/gutenberg/pull/28228))
-- Show the spacer block background on hover. ([28129](https://github.com/WordPress/gutenberg/pull/28129))
-- Social Icons: Add icon & background color options. ([28084](https://github.com/WordPress/gutenberg/pull/28084))
-- Support both horizontal and vertical in-between inserters. ([27860](https://github.com/WordPress/gutenberg/pull/27860))
-- Image Block: Add border radius support. ([27667](https://github.com/WordPress/gutenberg/pull/27667))
-- Overlay on disabled elements, to catch events and show tooltips. ([27529](https://github.com/WordPress/gutenberg/pull/27529))
-- Try: System font for vanilla editor styles. ([26822](https://github.com/WordPress/gutenberg/pull/26822))
-- Only consider legal block types for the block list when transforming files to blocks. ([26816](https://github.com/WordPress/gutenberg/pull/26816))
+-   Try more muted sibling inserter. ([28550](https://github.com/WordPress/gutenberg/pull/28550))
+-   Make sure toggleProps doesn't replace important props on ToolbarGroup. ([28401](https://github.com/WordPress/gutenberg/pull/28401))
+-   Improve visual clarity of reusable block. ([28318](https://github.com/WordPress/gutenberg/pull/28318))
+-   Dark Theme Support: Allow for theme modifications. ([28233](https://github.com/WordPress/gutenberg/pull/28233))
+-   Add disabled support in ToggleControl and FormToggle. ([28228](https://github.com/WordPress/gutenberg/pull/28228))
+-   Show the spacer block background on hover. ([28129](https://github.com/WordPress/gutenberg/pull/28129))
+-   Social Icons: Add icon & background color options. ([28084](https://github.com/WordPress/gutenberg/pull/28084))
+-   Support both horizontal and vertical in-between inserters. ([27860](https://github.com/WordPress/gutenberg/pull/27860))
+-   Image Block: Add border radius support. ([27667](https://github.com/WordPress/gutenberg/pull/27667))
+-   Overlay on disabled elements, to catch events and show tooltips. ([27529](https://github.com/WordPress/gutenberg/pull/27529))
+-   Try: System font for vanilla editor styles. ([26822](https://github.com/WordPress/gutenberg/pull/26822))
+-   Only consider legal block types for the block list when transforming files to blocks. ([26816](https://github.com/WordPress/gutenberg/pull/26816))
 
 ### New APIs
 
-- Block API: Allow overriding the category for block variations. ([28482](https://github.com/WordPress/gutenberg/pull/28482))
-- Create Block: Add optional support for wp-env. ([28234](https://github.com/WordPress/gutenberg/pull/28234))
-- Make i18n functions filter their return values. ([27966](https://github.com/WordPress/gutenberg/pull/27966))
+-   Block API: Allow overriding the category for block variations. ([28482](https://github.com/WordPress/gutenberg/pull/28482))
+-   Create Block: Add optional support for wp-env. ([28234](https://github.com/WordPress/gutenberg/pull/28234))
+-   Make i18n functions filter their return values. ([27966](https://github.com/WordPress/gutenberg/pull/27966))
 
 ### Breaking Change
 
 The [format](https://developer.wordpress.org/block-editor/developers/themes/theme-json/) of the `experimental-theme.json` has been updated as per
 
-- Split global block selector into root and defaults. ([28533](https://github.com/WordPress/gutenberg/pull/28533))
-- Make settings and style top-level keys. ([28110](https://github.com/WordPress/gutenberg/pull/28110))
+-   Split global block selector into root and defaults. ([28533](https://github.com/WordPress/gutenberg/pull/28533))
+-   Make settings and style top-level keys. ([28110](https://github.com/WordPress/gutenberg/pull/28110))
 
 Before:
 
@@ -25924,1167 +37932,1184 @@ After:
 
 ### Bug Fixes
 
-- Fix sibling inserter color. ([28579](https://github.com/WordPress/gutenberg/pull/28579))
-- Fix issues causing the cover block to black out with a fixed background. ([28565](https://github.com/WordPress/gutenberg/pull/28565))
-- Fix site editor pins. ([28547](https://github.com/WordPress/gutenberg/pull/28547))
-- Resolve issue where insertion point is in incorrect position after changing block selection. ([28542](https://github.com/WordPress/gutenberg/pull/28542))
-- Components: Fix truncate export. ([28527](https://github.com/WordPress/gutenberg/pull/28527))
-- Pinned items regression followup. ([28526](https://github.com/WordPress/gutenberg/pull/28526))
-- Fix regression with pinned plugin items on mobile. ([28521](https://github.com/WordPress/gutenberg/pull/28521))
-- Fix margins and width of 100%-width buttons. ([28467](https://github.com/WordPress/gutenberg/pull/28467))
-- Fix regression caused by #28395. ([28462](https://github.com/WordPress/gutenberg/pull/28462))
-- Fix aborted rendering of non-nested reusable blocks. ([28461](https://github.com/WordPress/gutenberg/pull/28461))
-- Show insertion point after the last block in a container. ([28418](https://github.com/WordPress/gutenberg/pull/28418))
-- Reusable blocks: Prevent infinite recursion. ([28405](https://github.com/WordPress/gutenberg/pull/28405))
-- Fix block inserter automatic reorder. ([28392](https://github.com/WordPress/gutenberg/pull/28392))
-- Create Block: Extract the package name from the template value. ([28383](https://github.com/WordPress/gutenberg/pull/28383))
-- Fix handling of raw transforms that return multiple blocks. ([28371](https://github.com/WordPress/gutenberg/pull/28371))
-- Fix repeated backgrounds with transparent images. ([28362](https://github.com/WordPress/gutenberg/pull/28362))
-- Ensure inline image width popover doesn't appear over media library modal. ([28333](https://github.com/WordPress/gutenberg/pull/28333))
-- Fix bad var name in BlockParentSelector. ([28325](https://github.com/WordPress/gutenberg/pull/28325))
-- Fix repeated backgrounds for cover srcset. ([28310](https://github.com/WordPress/gutenberg/pull/28310))
-- Simple wording fix. ([28288](https://github.com/WordPress/gutenberg/pull/28288))
-- Fix allowedFormats in RichText component. ([28282](https://github.com/WordPress/gutenberg/pull/28282))
-- Fix file formatting for end-to-end test plugin. ([28266](https://github.com/WordPress/gutenberg/pull/28266))
-- Fix backwards compatibility issue with Inline Image format. ([28223](https://github.com/WordPress/gutenberg/pull/28223))
-- Inserter: Fix left padding on Block Pattern Inserter dropdown. ([28150](https://github.com/WordPress/gutenberg/pull/28150))
-- Fix toolbar keyboard navigation after pressing alt+F10. ([28068](https://github.com/WordPress/gutenberg/pull/28068))
-- Image Block: Update linkDestination when editing image link URL. ([27801](https://github.com/WordPress/gutenberg/pull/27801))
-- Fix for: [Interface Skeleton] Limit the editor width to prevent some blocks to grow infinitely wide. ([27695](https://github.com/WordPress/gutenberg/pull/27695))
-- Button component: Add margin around the dash icon. ([27461](https://github.com/WordPress/gutenberg/pull/27461))
-- Fix issue where resetBlocks can result in an incorrect block selection. ([21598](https://github.com/WordPress/gutenberg/pull/21598))
-- Fix Cover block position. ([28653](https://github.com/WordPress/gutenberg/pull/28653))
-- Add minHeightUnit to latest core/cover deprecation. ([28627](https://github.com/WordPress/gutenberg/pull/28627))
+-   Fix sibling inserter color. ([28579](https://github.com/WordPress/gutenberg/pull/28579))
+-   Fix issues causing the cover block to black out with a fixed background. ([28565](https://github.com/WordPress/gutenberg/pull/28565))
+-   Fix site editor pins. ([28547](https://github.com/WordPress/gutenberg/pull/28547))
+-   Resolve issue where insertion point is in incorrect position after changing block selection. ([28542](https://github.com/WordPress/gutenberg/pull/28542))
+-   Components: Fix truncate export. ([28527](https://github.com/WordPress/gutenberg/pull/28527))
+-   Pinned items regression followup. ([28526](https://github.com/WordPress/gutenberg/pull/28526))
+-   Fix regression with pinned plugin items on mobile. ([28521](https://github.com/WordPress/gutenberg/pull/28521))
+-   Fix margins and width of 100%-width buttons. ([28467](https://github.com/WordPress/gutenberg/pull/28467))
+-   Fix regression caused by #28395. ([28462](https://github.com/WordPress/gutenberg/pull/28462))
+-   Fix aborted rendering of non-nested reusable blocks. ([28461](https://github.com/WordPress/gutenberg/pull/28461))
+-   Show insertion point after the last block in a container. ([28418](https://github.com/WordPress/gutenberg/pull/28418))
+-   Reusable blocks: Prevent infinite recursion. ([28405](https://github.com/WordPress/gutenberg/pull/28405))
+-   Fix block inserter automatic reorder. ([28392](https://github.com/WordPress/gutenberg/pull/28392))
+-   Create Block: Extract the package name from the template value. ([28383](https://github.com/WordPress/gutenberg/pull/28383))
+-   Fix handling of raw transforms that return multiple blocks. ([28371](https://github.com/WordPress/gutenberg/pull/28371))
+-   Fix repeated backgrounds with transparent images. ([28362](https://github.com/WordPress/gutenberg/pull/28362))
+-   Ensure inline image width popover doesn't appear over media library modal. ([28333](https://github.com/WordPress/gutenberg/pull/28333))
+-   Fix bad var name in BlockParentSelector. ([28325](https://github.com/WordPress/gutenberg/pull/28325))
+-   Fix repeated backgrounds for cover srcset. ([28310](https://github.com/WordPress/gutenberg/pull/28310))
+-   Simple wording fix. ([28288](https://github.com/WordPress/gutenberg/pull/28288))
+-   Fix allowedFormats in RichText component. ([28282](https://github.com/WordPress/gutenberg/pull/28282))
+-   Fix file formatting for end-to-end test plugin. ([28266](https://github.com/WordPress/gutenberg/pull/28266))
+-   Fix backwards compatibility issue with Inline Image format. ([28223](https://github.com/WordPress/gutenberg/pull/28223))
+-   Inserter: Fix left padding on Block Pattern Inserter dropdown. ([28150](https://github.com/WordPress/gutenberg/pull/28150))
+-   Fix toolbar keyboard navigation after pressing alt+F10. ([28068](https://github.com/WordPress/gutenberg/pull/28068))
+-   Image Block: Update linkDestination when editing image link URL. ([27801](https://github.com/WordPress/gutenberg/pull/27801))
+-   Fix for: [Interface Skeleton] Limit the editor width to prevent some blocks to grow infinitely wide. ([27695](https://github.com/WordPress/gutenberg/pull/27695))
+-   Button component: Add margin around the dash icon. ([27461](https://github.com/WordPress/gutenberg/pull/27461))
+-   Fix issue where resetBlocks can result in an incorrect block selection. ([21598](https://github.com/WordPress/gutenberg/pull/21598))
+-   Fix Cover block position. ([28653](https://github.com/WordPress/gutenberg/pull/28653))
+-   Add minHeightUnit to latest core/cover deprecation. ([28627](https://github.com/WordPress/gutenberg/pull/28627))
 
 ### Experiments
 
-- Try: Fix menu item word wrap. ([28516](https://github.com/WordPress/gutenberg/pull/28516))
-- Fix URL cutoff. ([28515](https://github.com/WordPress/gutenberg/pull/28515))
-- Mark Post Comments Warning as block. ([28511](https://github.com/WordPress/gutenberg/pull/28511))
-- Add widget id to blocks in the widgets screen. ([28379](https://github.com/WordPress/gutenberg/pull/28379))
-- Remove new navigation block features in the navigation editor. ([28378](https://github.com/WordPress/gutenberg/pull/28378))
-- Full Site Editing: Update theme attribute injection and removal. ([28368](https://github.com/WordPress/gutenberg/pull/28368))
-- Template Part - fix labels shown - use title instead of slug. ([28330](https://github.com/WordPress/gutenberg/pull/28330))
-- Root element & border radius. ([28320](https://github.com/WordPress/gutenberg/pull/28320))
-- FSE: Parse the template before <head> gets rendered. ([28319](https://github.com/WordPress/gutenberg/pull/28319))
-- Site Editor: Use correct title property in snackbar after inserting Template Part. ([28306](https://github.com/WordPress/gutenberg/pull/28306))
-- Edit Site: Fix templates export. ([28292](https://github.com/WordPress/gutenberg/pull/28292))
--  Hide query block toolbar settings if query is inherited. ([28290](https://github.com/WordPress/gutenberg/pull/28290))
-- Site Editor: Add template part missing state. ([28277](https://github.com/WordPress/gutenberg/pull/28277))
-- Site Editor: Hide resize handle. ([28272](https://github.com/WordPress/gutenberg/pull/28272))
-- Fix save, undo and redo keyboard shortcuts in navigation editor. ([28257](https://github.com/WordPress/gutenberg/pull/28257))
-- Fix template part border states. ([28241](https://github.com/WordPress/gutenberg/pull/28241))
-- Fix entity spotlight system. ([28239](https://github.com/WordPress/gutenberg/pull/28239))
-- Fix the nav menu justify controls menu style. ([28222](https://github.com/WordPress/gutenberg/pull/28222))
-- Polish the appender focus style. ([28219](https://github.com/WordPress/gutenberg/pull/28219))
-- Core Data: Add __experimentalBatch(). ([28210](https://github.com/WordPress/gutenberg/pull/28210))
-- Post Title block: Add placeholder state. ([28198](https://github.com/WordPress/gutenberg/pull/28198))
-- Fix navigation editor error. ([28190](https://github.com/WordPress/gutenberg/pull/28190))
-- Try: Allow space between on menu items. ([28169](https://github.com/WordPress/gutenberg/pull/28169))
-- Query pagination with InnerBlocks. ([28125](https://github.com/WordPress/gutenberg/pull/28125))
-- Template Parts: Fix loading issue. ([28088](https://github.com/WordPress/gutenberg/pull/28088))
-- Add support for border configuration via theme.json. ([28049](https://github.com/WordPress/gutenberg/pull/28049))
-- [Widgets screen] Fix categorization not showing in the global inserter. ([28036](https://github.com/WordPress/gutenberg/pull/28036))
-- Update the layout of the title in the top bar while template editing. ([27845](https://github.com/WordPress/gutenberg/pull/27845))
-- Expose group/ungroup buttons in site editor. ([27611](https://github.com/WordPress/gutenberg/pull/27611))
-- Disable alignment for innerBlocks of Nav Block. ([27365](https://github.com/WordPress/gutenberg/pull/27365))
-- Add thunk actions to replace rungen and controls. ([27276](https://github.com/WordPress/gutenberg/pull/27276))
-- Navigation Block: Placeholder empty state. ([26947](https://github.com/WordPress/gutenberg/pull/26947))
-- Open dropdown before focus on submenu item. ([25322](https://github.com/WordPress/gutenberg/pull/25322))
+-   Try: Fix menu item word wrap. ([28516](https://github.com/WordPress/gutenberg/pull/28516))
+-   Fix URL cutoff. ([28515](https://github.com/WordPress/gutenberg/pull/28515))
+-   Mark Post Comments Warning as block. ([28511](https://github.com/WordPress/gutenberg/pull/28511))
+-   Add widget id to blocks in the widgets screen. ([28379](https://github.com/WordPress/gutenberg/pull/28379))
+-   Remove new navigation block features in the navigation editor. ([28378](https://github.com/WordPress/gutenberg/pull/28378))
+-   Full Site Editing: Update theme attribute injection and removal. ([28368](https://github.com/WordPress/gutenberg/pull/28368))
+-   Template Part - fix labels shown - use title instead of slug. ([28330](https://github.com/WordPress/gutenberg/pull/28330))
+-   Root element & border radius. ([28320](https://github.com/WordPress/gutenberg/pull/28320))
+-   FSE: Parse the template before <head> gets rendered. ([28319](https://github.com/WordPress/gutenberg/pull/28319))
+-   Site Editor: Use correct title property in snackbar after inserting Template Part. ([28306](https://github.com/WordPress/gutenberg/pull/28306))
+-   Edit Site: Fix templates export. ([28292](https://github.com/WordPress/gutenberg/pull/28292))
+-   Hide query block toolbar settings if query is inherited. ([28290](https://github.com/WordPress/gutenberg/pull/28290))
+-   Site Editor: Add template part missing state. ([28277](https://github.com/WordPress/gutenberg/pull/28277))
+-   Site Editor: Hide resize handle. ([28272](https://github.com/WordPress/gutenberg/pull/28272))
+-   Fix save, undo and redo keyboard shortcuts in navigation editor. ([28257](https://github.com/WordPress/gutenberg/pull/28257))
+-   Fix template part border states. ([28241](https://github.com/WordPress/gutenberg/pull/28241))
+-   Fix entity spotlight system. ([28239](https://github.com/WordPress/gutenberg/pull/28239))
+-   Fix the nav menu justify controls menu style. ([28222](https://github.com/WordPress/gutenberg/pull/28222))
+-   Polish the appender focus style. ([28219](https://github.com/WordPress/gutenberg/pull/28219))
+-   Core Data: Add \_\_experimentalBatch(). ([28210](https://github.com/WordPress/gutenberg/pull/28210))
+-   Post Title block: Add placeholder state. ([28198](https://github.com/WordPress/gutenberg/pull/28198))
+-   Fix navigation editor error. ([28190](https://github.com/WordPress/gutenberg/pull/28190))
+-   Try: Allow space between on menu items. ([28169](https://github.com/WordPress/gutenberg/pull/28169))
+-   Query pagination with InnerBlocks. ([28125](https://github.com/WordPress/gutenberg/pull/28125))
+-   Template Parts: Fix loading issue. ([28088](https://github.com/WordPress/gutenberg/pull/28088))
+-   Add support for border configuration via theme.json. ([28049](https://github.com/WordPress/gutenberg/pull/28049))
+-   [Widgets screen] Fix categorization not showing in the global inserter. ([28036](https://github.com/WordPress/gutenberg/pull/28036))
+-   Update the layout of the title in the top bar while template editing. ([27845](https://github.com/WordPress/gutenberg/pull/27845))
+-   Expose group/ungroup buttons in site editor. ([27611](https://github.com/WordPress/gutenberg/pull/27611))
+-   Disable alignment for innerBlocks of Nav Block. ([27365](https://github.com/WordPress/gutenberg/pull/27365))
+-   Add thunk actions to replace rungen and controls. ([27276](https://github.com/WordPress/gutenberg/pull/27276))
+-   Navigation Block: Placeholder empty state. ([26947](https://github.com/WordPress/gutenberg/pull/26947))
+-   Open dropdown before focus on submenu item. ([25322](https://github.com/WordPress/gutenberg/pull/25322))
 
 ### Documentation
 
-- Docs: Add new page for i18n filters. ([28553](https://github.com/WordPress/gutenberg/pull/28553))
-- Docs: Update list of core block categories. ([28483](https://github.com/WordPress/gutenberg/pull/28483))
-- Fixed gramatical error. ([28452](https://github.com/WordPress/gutenberg/pull/28452))
-- Update the main readme with the current Gutenberg project phase. ([28359](https://github.com/WordPress/gutenberg/pull/28359))
-- Docs: Update links used in the developer portal. ([28354](https://github.com/WordPress/gutenberg/pull/28354))
-- Docs: Update links to reference HEAD instead of a specific branch. ([28331](https://github.com/WordPress/gutenberg/pull/28331))
-- Docs: Fix supports color gradient(s). ([28328](https://github.com/WordPress/gutenberg/pull/28328))
-- Chore: Add changelog for 28231. ([28232](https://github.com/WordPress/gutenberg/pull/28232))
-- Block Card: Update readme. ([28226](https://github.com/WordPress/gutenberg/pull/28226))
-- Improve the intro page of the Block Editor Handbook. ([28142](https://github.com/WordPress/gutenberg/pull/28142))
-- Update documentation to use allowedFormats instead of the deprecated formattingControls. ([25639](https://github.com/WordPress/gutenberg/pull/25639))
+-   Docs: Add new page for i18n filters. ([28553](https://github.com/WordPress/gutenberg/pull/28553))
+-   Docs: Update list of core block categories. ([28483](https://github.com/WordPress/gutenberg/pull/28483))
+-   Fixed gramatical error. ([28452](https://github.com/WordPress/gutenberg/pull/28452))
+-   Update the main readme with the current Gutenberg project phase. ([28359](https://github.com/WordPress/gutenberg/pull/28359))
+-   Docs: Update links used in the developer portal. ([28354](https://github.com/WordPress/gutenberg/pull/28354))
+-   Docs: Update links to reference HEAD instead of a specific branch. ([28331](https://github.com/WordPress/gutenberg/pull/28331))
+-   Docs: Fix supports color gradient(s). ([28328](https://github.com/WordPress/gutenberg/pull/28328))
+-   Chore: Add changelog for 28231. ([28232](https://github.com/WordPress/gutenberg/pull/28232))
+-   Block Card: Update readme. ([28226](https://github.com/WordPress/gutenberg/pull/28226))
+-   Improve the intro page of the Block Editor Handbook. ([28142](https://github.com/WordPress/gutenberg/pull/28142))
+-   Update documentation to use allowedFormats instead of the deprecated formattingControls. ([25639](https://github.com/WordPress/gutenberg/pull/25639))
 
 ### Code Quality
 
-- Try: Polish block menu and show only fills when available. ([28486](https://github.com/WordPress/gutenberg/pull/28486))
-- Rename some template part icons. ([28458](https://github.com/WordPress/gutenberg/pull/28458))
-- Block Editor: Add hook: UseNoRecursiveRenders. ([28428](https://github.com/WordPress/gutenberg/pull/28428))
-- Coding Standards: Fix PHPCS warnings. ([28343](https://github.com/WordPress/gutenberg/pull/28343))
-- Change the way RTL styles get enqueued. ([28274](https://github.com/WordPress/gutenberg/pull/28274))
-- Remove code no longer necessary. ([28188](https://github.com/WordPress/gutenberg/pull/28188))
-- Update/simplify case transforms. ([28171](https://github.com/WordPress/gutenberg/pull/28171))
-- Fix non static method WP_Block_Parser::Freeform called statically. ([28017](https://github.com/WordPress/gutenberg/pull/28017))
-- Refactor out CSS gradient from custom-gradient-bar. ([27936](https://github.com/WordPress/gutenberg/pull/27936))
+-   Try: Polish block menu and show only fills when available. ([28486](https://github.com/WordPress/gutenberg/pull/28486))
+-   Rename some template part icons. ([28458](https://github.com/WordPress/gutenberg/pull/28458))
+-   Block Editor: Add hook: UseNoRecursiveRenders. ([28428](https://github.com/WordPress/gutenberg/pull/28428))
+-   Coding Standards: Fix PHPCS warnings. ([28343](https://github.com/WordPress/gutenberg/pull/28343))
+-   Change the way RTL styles get enqueued. ([28274](https://github.com/WordPress/gutenberg/pull/28274))
+-   Remove code no longer necessary. ([28188](https://github.com/WordPress/gutenberg/pull/28188))
+-   Update/simplify case transforms. ([28171](https://github.com/WordPress/gutenberg/pull/28171))
+-   Fix non static method WP_Block_Parser::Freeform called statically. ([28017](https://github.com/WordPress/gutenberg/pull/28017))
+-   Refactor out CSS gradient from custom-gradient-bar. ([27936](https://github.com/WordPress/gutenberg/pull/27936))
 
 ### Tools
 
-- Dependencies: Upgrade TypeScript. ([28586](https://github.com/WordPress/gutenberg/pull/28586))
-- ESLint Plugin: Add missing eslint-plugin-import dependency. ([28545](https://github.com/WordPress/gutenberg/pull/28545))
-- Wp-env: Add MySQL port info to start logs. ([28441](https://github.com/WordPress/gutenberg/pull/28441))
-- Run the load time indicator computation multiple times. ([28419](https://github.com/WordPress/gutenberg/pull/28419))
-- Don't add default-custom-properties styles to all compiled files. ([28395](https://github.com/WordPress/gutenberg/pull/28395))
-- Fix typewriter test by using mouse.wheel and waiting for scroll. ([28376](https://github.com/WordPress/gutenberg/pull/28376))
-- Fix end-to-end tests in widgets screen. ([28375](https://github.com/WordPress/gutenberg/pull/28375))
-- Replace deprecated waitFor in end-to-end tests. ([28360](https://github.com/WordPress/gutenberg/pull/28360))
-- Improve robustness of nav screen test. ([28344](https://github.com/WordPress/gutenberg/pull/28344))
-- Preferences modal redesign. ([28329](https://github.com/WordPress/gutenberg/pull/28329))
-- Site Editor: Add end-to-end tests for templates export. ([28324](https://github.com/WordPress/gutenberg/pull/28324))
-- Site Editor: Add unit test for site templates export. ([28323](https://github.com/WordPress/gutenberg/pull/28323))
-- Fix widgets screen end-to-end tests. ([28264](https://github.com/WordPress/gutenberg/pull/28264))
-- Add more tests for processing theme.json logic. ([28202](https://github.com/WordPress/gutenberg/pull/28202))
-- Update nosolosw notifs. ([28189](https://github.com/WordPress/gutenberg/pull/28189))
-- Remove @talldan from some codeowners paths. ([28182](https://github.com/WordPress/gutenberg/pull/28182))
-- Add stale issue workflow for issues with need info requested. ([28179](https://github.com/WordPress/gutenberg/pull/28179))
-- Custom script distclean to remove node_modules of all packages. ([28177](https://github.com/WordPress/gutenberg/pull/28177))
-- Add some basic end-to-end tests for the widgets screen. ([28160](https://github.com/WordPress/gutenberg/pull/28160))
-- Testing: Add CI workflow covering Node.js 12. ([28139](https://github.com/WordPress/gutenberg/pull/28139))
-- wp-env: Fix upload directory conflict in phpunit service. ([28120](https://github.com/WordPress/gutenberg/pull/28120))
-- Update issue templates. ([27570](https://github.com/WordPress/gutenberg/pull/27570))
+-   Dependencies: Upgrade TypeScript. ([28586](https://github.com/WordPress/gutenberg/pull/28586))
+-   ESLint Plugin: Add missing eslint-plugin-import dependency. ([28545](https://github.com/WordPress/gutenberg/pull/28545))
+-   Wp-env: Add MySQL port info to start logs. ([28441](https://github.com/WordPress/gutenberg/pull/28441))
+-   Run the load time indicator computation multiple times. ([28419](https://github.com/WordPress/gutenberg/pull/28419))
+-   Don't add default-custom-properties styles to all compiled files. ([28395](https://github.com/WordPress/gutenberg/pull/28395))
+-   Fix typewriter test by using mouse.wheel and waiting for scroll. ([28376](https://github.com/WordPress/gutenberg/pull/28376))
+-   Fix end-to-end tests in widgets screen. ([28375](https://github.com/WordPress/gutenberg/pull/28375))
+-   Replace deprecated waitFor in end-to-end tests. ([28360](https://github.com/WordPress/gutenberg/pull/28360))
+-   Improve robustness of nav screen test. ([28344](https://github.com/WordPress/gutenberg/pull/28344))
+-   Preferences modal redesign. ([28329](https://github.com/WordPress/gutenberg/pull/28329))
+-   Site Editor: Add end-to-end tests for templates export. ([28324](https://github.com/WordPress/gutenberg/pull/28324))
+-   Site Editor: Add unit test for site templates export. ([28323](https://github.com/WordPress/gutenberg/pull/28323))
+-   Fix widgets screen end-to-end tests. ([28264](https://github.com/WordPress/gutenberg/pull/28264))
+-   Add more tests for processing theme.json logic. ([28202](https://github.com/WordPress/gutenberg/pull/28202))
+-   Update nosolosw notifs. ([28189](https://github.com/WordPress/gutenberg/pull/28189))
+-   Remove @talldan from some codeowners paths. ([28182](https://github.com/WordPress/gutenberg/pull/28182))
+-   Add stale issue workflow for issues with need info requested. ([28179](https://github.com/WordPress/gutenberg/pull/28179))
+-   Custom script distclean to remove node_modules of all packages. ([28177](https://github.com/WordPress/gutenberg/pull/28177))
+-   Add some basic end-to-end tests for the widgets screen. ([28160](https://github.com/WordPress/gutenberg/pull/28160))
+-   Testing: Add CI workflow covering Node.js 12. ([28139](https://github.com/WordPress/gutenberg/pull/28139))
+-   wp-env: Fix upload directory conflict in phpunit service. ([28120](https://github.com/WordPress/gutenberg/pull/28120))
+-   Update issue templates. ([27570](https://github.com/WordPress/gutenberg/pull/27570))
 
 ### Various
 
-- Make custom spacing work with core. ([28548](https://github.com/WordPress/gutenberg/pull/28548))
-- Component System: Add Grid Component. ([28531](https://github.com/WordPress/gutenberg/pull/28531))
-- Block Validation: Allow unitless zero CSS lengths. ([28501](https://github.com/WordPress/gutenberg/pull/28501))
-- Add check for zero to the FocalPointPicker mediaRef which prevents a division by zero error. ([28499](https://github.com/WordPress/gutenberg/pull/28499))
-- Social Link: Add a class to the anchor element. ([28494](https://github.com/WordPress/gutenberg/pull/28494))
-- Components: Integrate G2 Text component. ([28475](https://github.com/WordPress/gutenberg/pull/28475))
-- Block Mover wording: 'Move block position' to 'Change block position'. ([28454](https://github.com/WordPress/gutenberg/pull/28454))
-- [Documentation] : Fixing grammar. ([28447](https://github.com/WordPress/gutenberg/pull/28447))
-- Docs: Update tree and raw-content links to reference HEAD instead of a specific branch. ([28431](https://github.com/WordPress/gutenberg/pull/28431))
-- Image: Add flow for converting to cover block from toolbar. ([28414](https://github.com/WordPress/gutenberg/pull/28414))
-- Cover: Improve various states. ([28384](https://github.com/WordPress/gutenberg/pull/28384))
-- Update HTML Anchor description to refer to block instead of heading. ([28367](https://github.com/WordPress/gutenberg/pull/28367))
-- Packages: Use canary flag for npm releases with next dist tag. ([28357](https://github.com/WordPress/gutenberg/pull/28357))
-- Packages: Fully automate npm publishing with the latest and next tags. ([28335](https://github.com/WordPress/gutenberg/pull/28335))
-- CODEOWNERS: Tweak for ella. ([28326](https://github.com/WordPress/gutenberg/pull/28326))
-- Block Transform: Fix isMultiBlock property name. ([28321](https://github.com/WordPress/gutenberg/pull/28321))
-- Warning component: Remove extra margin. ([28316](https://github.com/WordPress/gutenberg/pull/28316))
-- Block Directory: Silently avoid re-installing local blocks. ([28304](https://github.com/WordPress/gutenberg/pull/28304))
-- Inserter: Add description to content used in search. ([28301](https://github.com/WordPress/gutenberg/pull/28301))
-- Try: Show reusable block parent border when child selected. ([28283](https://github.com/WordPress/gutenberg/pull/28283))
-- Components: Update dependencies shared with G2 components. ([28280](https://github.com/WordPress/gutenberg/pull/28280))
-- Try: Zero width space in empty paragraph. ([28268](https://github.com/WordPress/gutenberg/pull/28268))
-- Alow setting the crossOrigin attribute for the image transform's image using a filter. ([28255](https://github.com/WordPress/gutenberg/pull/28255))
-- Navigation component: Fix button outline. ([28230](https://github.com/WordPress/gutenberg/pull/28230))
-- Components: Add truncate. ([28176](https://github.com/WordPress/gutenberg/pull/28176))
-- Add panel button props. ([28147](https://github.com/WordPress/gutenberg/pull/28147))
-- Add "Show block breadcrumbs" preference. ([28133](https://github.com/WordPress/gutenberg/pull/28133))
-- NavigationMenu component: Add isSearchDebouncing prop. ([28102](https://github.com/WordPress/gutenberg/pull/28102))
-- Try: Make empty paragraphs take up the same space on the frontend, as in the editor. ([27995](https://github.com/WordPress/gutenberg/pull/27995))
-- Change the block editor inserter quick inserter border color. ([27866](https://github.com/WordPress/gutenberg/pull/27866))
-- Save editors value on change. ([27717](https://github.com/WordPress/gutenberg/pull/27717))
-- Component System: Upgrade FontSizePicker. ([27594](https://github.com/WordPress/gutenberg/pull/27594))
-- Adjust borders on gallery to prevent overlap. ([27312](https://github.com/WordPress/gutenberg/pull/27312))
-- Pattern Directory: Create endpoints to proxy api.w.org/patterns. ([26578](https://github.com/WordPress/gutenberg/pull/26578))
-- Show text labels in block toolbars when option is set. ([26135](https://github.com/WordPress/gutenberg/pull/26135))
-- Block Directory: Filter out disallowed blocks before showing available blocks. ([25926](https://github.com/WordPress/gutenberg/pull/25926))
+-   Make custom spacing work with core. ([28548](https://github.com/WordPress/gutenberg/pull/28548))
+-   Component System: Add Grid Component. ([28531](https://github.com/WordPress/gutenberg/pull/28531))
+-   Block Validation: Allow unitless zero CSS lengths. ([28501](https://github.com/WordPress/gutenberg/pull/28501))
+-   Add check for zero to the FocalPointPicker mediaRef which prevents a division by zero error. ([28499](https://github.com/WordPress/gutenberg/pull/28499))
+-   Social Link: Add a class to the anchor element. ([28494](https://github.com/WordPress/gutenberg/pull/28494))
+-   Components: Integrate G2 Text component. ([28475](https://github.com/WordPress/gutenberg/pull/28475))
+-   Block Mover wording: 'Move block position' to 'Change block position'. ([28454](https://github.com/WordPress/gutenberg/pull/28454))
+-   [Documentation] : Fixing grammar. ([28447](https://github.com/WordPress/gutenberg/pull/28447))
+-   Docs: Update tree and raw-content links to reference HEAD instead of a specific branch. ([28431](https://github.com/WordPress/gutenberg/pull/28431))
+-   Image: Add flow for converting to cover block from toolbar. ([28414](https://github.com/WordPress/gutenberg/pull/28414))
+-   Cover: Improve various states. ([28384](https://github.com/WordPress/gutenberg/pull/28384))
+-   Update HTML Anchor description to refer to block instead of heading. ([28367](https://github.com/WordPress/gutenberg/pull/28367))
+-   Packages: Use canary flag for npm releases with next dist tag. ([28357](https://github.com/WordPress/gutenberg/pull/28357))
+-   Packages: Fully automate npm publishing with the latest and next tags. ([28335](https://github.com/WordPress/gutenberg/pull/28335))
+-   CODEOWNERS: Tweak for ella. ([28326](https://github.com/WordPress/gutenberg/pull/28326))
+-   Block Transform: Fix isMultiBlock property name. ([28321](https://github.com/WordPress/gutenberg/pull/28321))
+-   Warning component: Remove extra margin. ([28316](https://github.com/WordPress/gutenberg/pull/28316))
+-   Block Directory: Silently avoid re-installing local blocks. ([28304](https://github.com/WordPress/gutenberg/pull/28304))
+-   Inserter: Add description to content used in search. ([28301](https://github.com/WordPress/gutenberg/pull/28301))
+-   Try: Show reusable block parent border when child selected. ([28283](https://github.com/WordPress/gutenberg/pull/28283))
+-   Components: Update dependencies shared with G2 components. ([28280](https://github.com/WordPress/gutenberg/pull/28280))
+-   Try: Zero width space in empty paragraph. ([28268](https://github.com/WordPress/gutenberg/pull/28268))
+-   Alow setting the crossOrigin attribute for the image transform's image using a filter. ([28255](https://github.com/WordPress/gutenberg/pull/28255))
+-   Navigation component: Fix button outline. ([28230](https://github.com/WordPress/gutenberg/pull/28230))
+-   Components: Add truncate. ([28176](https://github.com/WordPress/gutenberg/pull/28176))
+-   Add panel button props. ([28147](https://github.com/WordPress/gutenberg/pull/28147))
+-   Add "Show block breadcrumbs" preference. ([28133](https://github.com/WordPress/gutenberg/pull/28133))
+-   NavigationMenu component: Add isSearchDebouncing prop. ([28102](https://github.com/WordPress/gutenberg/pull/28102))
+-   Try: Make empty paragraphs take up the same space on the frontend, as in the editor. ([27995](https://github.com/WordPress/gutenberg/pull/27995))
+-   Change the block editor inserter quick inserter border color. ([27866](https://github.com/WordPress/gutenberg/pull/27866))
+-   Save editors value on change. ([27717](https://github.com/WordPress/gutenberg/pull/27717))
+-   Component System: Upgrade FontSizePicker. ([27594](https://github.com/WordPress/gutenberg/pull/27594))
+-   Adjust borders on gallery to prevent overlap. ([27312](https://github.com/WordPress/gutenberg/pull/27312))
+-   Pattern Directory: Create endpoints to proxy api.w.org/patterns. ([26578](https://github.com/WordPress/gutenberg/pull/26578))
+-   Show text labels in block toolbars when option is set. ([26135](https://github.com/WordPress/gutenberg/pull/26135))
+-   Block Directory: Filter out disallowed blocks before showing available blocks. ([25926](https://github.com/WordPress/gutenberg/pull/25926))
 
 = 9.8.4 =
 
-- Cover Block:
-  - Fix issues causing the cover block to black out with a fixed background ([28565](https://github.com/WordPress/gutenberg/pull/28565))
-  - Fix embed position ([28653](https://github.com/WordPress/gutenberg/pull/28653))
-- Pinned items:
-  - Fix regression with pinned plugin items on mobile ([28521](https://github.com/WordPress/gutenberg/pull/28521))
-  - Pinned items regression followup ([28526](https://github.com/WordPress/gutenberg/pull/28526))
+-   Cover Block:
+    -   Fix issues causing the cover block to black out with a fixed background ([28565](https://github.com/WordPress/gutenberg/pull/28565))
+    -   Fix embed position ([28653](https://github.com/WordPress/gutenberg/pull/28653))
+-   Pinned items:
+    -   Fix regression with pinned plugin items on mobile ([28521](https://github.com/WordPress/gutenberg/pull/28521))
+    -   Pinned items regression followup ([28526](https://github.com/WordPress/gutenberg/pull/28526))
 
 = 9.8.3 =
 
+## Changelog
+
 ### Bug Fixes
 
-- Cover Block: Add `minHeightUnit` to latest deprecation. ([28627](https://github.com/WordPress/gutenberg/pull/28627))
+-   Cover Block: Add `minHeightUnit` to latest deprecation. ([28627](https://github.com/WordPress/gutenberg/pull/28627))
 
 = 9.8.2 =
 
-### Bug Fixes
+## Changelog
 
-- Cover Block: Prevent division by zero in FocalPointPicker ([28499](https://github.com/WordPress/gutenberg/pull/28499))
-- Block Validation: Allow unitless zero CSS lengths ([28501](https://github.com/WordPress/gutenberg/pull/28501))
+### Bug Fixes
 
+-   Cover Block: Prevent division by zero in FocalPointPicker ([28499](https://github.com/WordPress/gutenberg/pull/28499))
+-   Block Validation: Allow unitless zero CSS lengths ([28501](https://github.com/WordPress/gutenberg/pull/28501))
 
 = 9.8.1 =
 
-### Bug Fixes
+## Changelog
 
-- Cover Block:
-  - Revert "Cover: Fix matrix alignment issue. (#28361)" ([28364](https://github.com/WordPress/gutenberg/pull/28364))
-  - Fix visual regression. ([28404](https://github.com/WordPress/gutenberg/pull/28404))
-- FSE: fix iframe error in Firefox. ([28212](https://github.com/WordPress/gutenberg/pull/28212))
+### Bug Fixes
 
+-   Cover Block:
+    -   Revert "Cover: Fix matrix alignment issue. (#28361)" ([28364](https://github.com/WordPress/gutenberg/pull/28364))
+    -   Fix visual regression. ([28404](https://github.com/WordPress/gutenberg/pull/28404))
+-   FSE: fix iframe error in Firefox. ([28212](https://github.com/WordPress/gutenberg/pull/28212))
 
 = 9.8.0 =
 
+## Changelog
+
 ### Enhancements
 
-- Use a semi transparent background for the spacer block when selected. ([28103](https://github.com/WordPress/gutenberg/pull/28103))
-- Display matching variation icon in Block Switcher. ([27903](https://github.com/WordPress/gutenberg/pull/27903))
+-   Use a semi transparent background for the spacer block when selected. ([28103](https://github.com/WordPress/gutenberg/pull/28103))
+-   Display matching variation icon in Block Switcher. ([27903](https://github.com/WordPress/gutenberg/pull/27903))
 
 ### New APIs
 
-- Create Block: Allow using locally installed packages with templates. ([28105](https://github.com/WordPress/gutenberg/pull/28105))
-- Create block: Add support for static assets. ([28038](https://github.com/WordPress/gutenberg/pull/28038))
-- Compose: Export useIsomorphicLayoutEffect and use it. ([28023](https://github.com/WordPress/gutenberg/pull/28023))
-
-### Bug Fixes
-
-- Reusable Blocks:
-  - Show an error message when a reusable block has gone missing. ([28126](https://github.com/WordPress/gutenberg/pull/28126))
-  - Fix dismiss notice after error. ([28015](https://github.com/WordPress/gutenberg/pull/28015))
-- Cover Block:
-  - Fix nested cover block bug. ([28114](https://github.com/WordPress/gutenberg/pull/28114))
-  - Fix invalid cover block transforms. ([28087](https://github.com/WordPress/gutenberg/pull/28087))
-  - Fix cover regression. ([28287](https://github.com/WordPress/gutenberg/pull/28287))
-  - Fix Cover focal point picker. ([28350](https://github.com/WordPress/gutenberg/pull/28350))
-  - Fix matrix alignment issue. ([28361](https://github.com/WordPress/gutenberg/pull/28361))
-- Fix block error when transforming blocks with Link Popover opened. ([28136](https://github.com/WordPress/gutenberg/pull/28136))
-- Fix PHP Notice in navigation-link. ([28134](https://github.com/WordPress/gutenberg/pull/28134))
-- Prevent link paste in RichText components in Button and Navigation blocks. ([28130](https://github.com/WordPress/gutenberg/pull/28130))
-- Fix floating date status inferred for posts where the status has been edited. ([28127](https://github.com/WordPress/gutenberg/pull/28127))
-- BlockSwitcher: Fix crash due to null reference. ([28122](https://github.com/WordPress/gutenberg/pull/28122))
-- Verse: Fix line-wrap rendering on front-end of site. ([28109](https://github.com/WordPress/gutenberg/pull/28109))
-- FocalPointPicker: Fix rendering and dragging experience. ([28096](https://github.com/WordPress/gutenberg/pull/28096))
-- Block Directory: Fix "missing" block when the block can be installed from the directory. ([28030](https://github.com/WordPress/gutenberg/pull/28030))
-- Fix locked template not updating when inner blocks template prop changes. ([28007](https://github.com/WordPress/gutenberg/pull/28007))
-- Fix editor crash when registering a block pattern without `categories`. ([27970](https://github.com/WordPress/gutenberg/pull/27970))
-- Fix the RTL editor styles and the theme styles option. ([27947](https://github.com/WordPress/gutenberg/pull/27947))
-- Don't close the block inserter when clicking the scrollbar or an empty area. ([27946](https://github.com/WordPress/gutenberg/pull/27946))
-- Fix AlignmentMatrixControl focus issue. ([27945](https://github.com/WordPress/gutenberg/pull/27945))
-- Fix unexpected autosave for published posts. ([27942](https://github.com/WordPress/gutenberg/pull/27942))
-- Fix RadioGroup to support zero as a Radio value. ([27906](https://github.com/WordPress/gutenberg/pull/27906))
-- Update embed block transforms to permit multiple links to be pasted in a paragraph (#27551). ([27746](https://github.com/WordPress/gutenberg/pull/27746))
-- Change the week header and left button style to meet the date spacing. ([27730](https://github.com/WordPress/gutenberg/pull/27730))
-- Add aria labels to box control component inputs/button. ([27727](https://github.com/WordPress/gutenberg/pull/27727))
-- Use clientWidth when no width is available for cropper. ([27687](https://github.com/WordPress/gutenberg/pull/27687))
-- Core Data: Normalize `_fields` value for use in `stableKey`. ([27526](https://github.com/WordPress/gutenberg/pull/27526))
-- Fix appender margins again. ([27392](https://github.com/WordPress/gutenberg/pull/27392))
+-   Create Block: Allow using locally installed packages with templates. ([28105](https://github.com/WordPress/gutenberg/pull/28105))
+-   Create block: Add support for static assets. ([28038](https://github.com/WordPress/gutenberg/pull/28038))
+-   Compose: Export useIsomorphicLayoutEffect and use it. ([28023](https://github.com/WordPress/gutenberg/pull/28023))
+
+### Bug Fixes
+
+-   Reusable Blocks:
+    -   Show an error message when a reusable block has gone missing. ([28126](https://github.com/WordPress/gutenberg/pull/28126))
+    -   Fix dismiss notice after error. ([28015](https://github.com/WordPress/gutenberg/pull/28015))
+-   Cover Block:
+    -   Fix nested cover block bug. ([28114](https://github.com/WordPress/gutenberg/pull/28114))
+    -   Fix invalid cover block transforms. ([28087](https://github.com/WordPress/gutenberg/pull/28087))
+    -   Fix cover regression. ([28287](https://github.com/WordPress/gutenberg/pull/28287))
+    -   Fix Cover focal point picker. ([28350](https://github.com/WordPress/gutenberg/pull/28350))
+    -   Fix matrix alignment issue. ([28361](https://github.com/WordPress/gutenberg/pull/28361))
+-   Fix block error when transforming blocks with Link Popover opened. ([28136](https://github.com/WordPress/gutenberg/pull/28136))
+-   Fix PHP Notice in navigation-link. ([28134](https://github.com/WordPress/gutenberg/pull/28134))
+-   Prevent link paste in RichText components in Button and Navigation blocks. ([28130](https://github.com/WordPress/gutenberg/pull/28130))
+-   Fix floating date status inferred for posts where the status has been edited. ([28127](https://github.com/WordPress/gutenberg/pull/28127))
+-   BlockSwitcher: Fix crash due to null reference. ([28122](https://github.com/WordPress/gutenberg/pull/28122))
+-   Verse: Fix line-wrap rendering on front-end of site. ([28109](https://github.com/WordPress/gutenberg/pull/28109))
+-   FocalPointPicker: Fix rendering and dragging experience. ([28096](https://github.com/WordPress/gutenberg/pull/28096))
+-   Block Directory: Fix "missing" block when the block can be installed from the directory. ([28030](https://github.com/WordPress/gutenberg/pull/28030))
+-   Fix locked template not updating when inner blocks template prop changes. ([28007](https://github.com/WordPress/gutenberg/pull/28007))
+-   Fix editor crash when registering a block pattern without `categories`. ([27970](https://github.com/WordPress/gutenberg/pull/27970))
+-   Fix the RTL editor styles and the theme styles option. ([27947](https://github.com/WordPress/gutenberg/pull/27947))
+-   Don't close the block inserter when clicking the scrollbar or an empty area. ([27946](https://github.com/WordPress/gutenberg/pull/27946))
+-   Fix AlignmentMatrixControl focus issue. ([27945](https://github.com/WordPress/gutenberg/pull/27945))
+-   Fix unexpected autosave for published posts. ([27942](https://github.com/WordPress/gutenberg/pull/27942))
+-   Fix RadioGroup to support zero as a Radio value. ([27906](https://github.com/WordPress/gutenberg/pull/27906))
+-   Update embed block transforms to permit multiple links to be pasted in a paragraph (#27551). ([27746](https://github.com/WordPress/gutenberg/pull/27746))
+-   Change the week header and left button style to meet the date spacing. ([27730](https://github.com/WordPress/gutenberg/pull/27730))
+-   Add aria labels to box control component inputs/button. ([27727](https://github.com/WordPress/gutenberg/pull/27727))
+-   Use clientWidth when no width is available for cropper. ([27687](https://github.com/WordPress/gutenberg/pull/27687))
+-   Core Data: Normalize `_fields` value for use in `stableKey`. ([27526](https://github.com/WordPress/gutenberg/pull/27526))
+-   Fix appender margins again. ([27392](https://github.com/WordPress/gutenberg/pull/27392))
 
 ### Performance
 
-- Components: Expose composite API from Reakit. ([28085](https://github.com/WordPress/gutenberg/pull/28085))
-- Improve Inserter block hover performance. ([26348](https://github.com/WordPress/gutenberg/pull/26348))
+-   Components: Expose composite API from Reakit. ([28085](https://github.com/WordPress/gutenberg/pull/28085))
+-   Improve Inserter block hover performance. ([26348](https://github.com/WordPress/gutenberg/pull/26348))
 
 ### Experiments
 
-- Full Site Editing Framework:
-  - Load content in iframe. ([25775](https://github.com/WordPress/gutenberg/pull/25775))
-  - Avoid using auto-drafts for theme templates and template parts. ([27910](https://github.com/WordPress/gutenberg/pull/27910))
-    - Delete unused options while upgrading the plugin. ([28164](https://github.com/WordPress/gutenberg/pull/28164))
-    - Fix _wp_file_based term deletion in migration. ([28300](https://github.com/WordPress/gutenberg/pull/28300))
-  - Fix the border radius in the site editor. ([27986](https://github.com/WordPress/gutenberg/pull/27986))
-- theme.json:
-  - Add border radius to the theme styles schema. ([27791](https://github.com/WordPress/gutenberg/pull/27791))
-  - Add theme.json i18n mechanism and JSON file specifying which theme.json paths are translatable. ([27380](https://github.com/WordPress/gutenberg/pull/27380))
-  - Add: Save time theme.json escaping. ([28061](https://github.com/WordPress/gutenberg/pull/28061))
-- Group Block: Add border radius. ([27665](https://github.com/WordPress/gutenberg/pull/27665))
-- Hide the theme without comments.php deprecation message. ([28128](https://github.com/WordPress/gutenberg/pull/28128))
-- Fix navigation editor. ([28080](https://github.com/WordPress/gutenberg/pull/28080))
-- Widgets: Temporary fix for saving widgets. ([28078](https://github.com/WordPress/gutenberg/pull/28078))
-- Decouple query from edit site. ([27972](https://github.com/WordPress/gutenberg/pull/27972))
-- Only enable the template mode for viewable post types. ([27948](https://github.com/WordPress/gutenberg/pull/27948))
-- Box control units: Ensure custom units are preserved. ([27800](https://github.com/WordPress/gutenberg/pull/27800))
-- Navigation Block: Use draft status when user creates a post and don't render unpublished posts in menus. ([27207](https://github.com/WordPress/gutenberg/pull/27207))
+-   Full Site Editing Framework:
+    -   Load content in iframe. ([25775](https://github.com/WordPress/gutenberg/pull/25775))
+    -   Avoid using auto-drafts for theme templates and template parts. ([27910](https://github.com/WordPress/gutenberg/pull/27910))
+        -   Delete unused options while upgrading the plugin. ([28164](https://github.com/WordPress/gutenberg/pull/28164))
+        -   Fix \_wp_file_based term deletion in migration. ([28300](https://github.com/WordPress/gutenberg/pull/28300))
+    -   Fix the border radius in the site editor. ([27986](https://github.com/WordPress/gutenberg/pull/27986))
+-   theme.json:
+    -   Add border radius to the theme styles schema. ([27791](https://github.com/WordPress/gutenberg/pull/27791))
+    -   Add theme.json i18n mechanism and JSON file specifying which theme.json paths are translatable. ([27380](https://github.com/WordPress/gutenberg/pull/27380))
+    -   Add: Save time theme.json escaping. ([28061](https://github.com/WordPress/gutenberg/pull/28061))
+-   Group Block: Add border radius. ([27665](https://github.com/WordPress/gutenberg/pull/27665))
+-   Hide the theme without comments.php deprecation message. ([28128](https://github.com/WordPress/gutenberg/pull/28128))
+-   Fix navigation editor. ([28080](https://github.com/WordPress/gutenberg/pull/28080))
+-   Widgets: Temporary fix for saving widgets. ([28078](https://github.com/WordPress/gutenberg/pull/28078))
+-   Decouple query from edit site. ([27972](https://github.com/WordPress/gutenberg/pull/27972))
+-   Only enable the template mode for viewable post types. ([27948](https://github.com/WordPress/gutenberg/pull/27948))
+-   Box control units: Ensure custom units are preserved. ([27800](https://github.com/WordPress/gutenberg/pull/27800))
+-   Navigation Block: Use draft status when user creates a post and don't render unpublished posts in menus. ([27207](https://github.com/WordPress/gutenberg/pull/27207))
 
 ### Documentation
 
-- Docs: Improve README file for `@wordpress/create-block`. ([28052](https://github.com/WordPress/gutenberg/pull/28052))
-- Create Block: Update the demo included in the README file. ([28037](https://github.com/WordPress/gutenberg/pull/28037))
-- Docs: Switch heading to Quick Start for consistency. ([28019](https://github.com/WordPress/gutenberg/pull/28019))
-- Docs: A wether, as it turns out, is a castrated ram. ([28008](https://github.com/WordPress/gutenberg/pull/28008))
-- Update Quickstart guide for the Development Environment documentation. ([28005](https://github.com/WordPress/gutenberg/pull/28005))
-- Update copyright year to 2021 in `license.md`. ([27951](https://github.com/WordPress/gutenberg/pull/27951))
-- Block API: Add more inline comments. ([20257](https://github.com/WordPress/gutenberg/pull/20257))
-- Changelog: Group entries for 9.8.0-rc.1. ([28332](https://github.com/WordPress/gutenberg/pull/28332))
+-   Docs: Improve README file for `@wordpress/create-block`. ([28052](https://github.com/WordPress/gutenberg/pull/28052))
+-   Create Block: Update the demo included in the README file. ([28037](https://github.com/WordPress/gutenberg/pull/28037))
+-   Docs: Switch heading to Quick Start for consistency. ([28019](https://github.com/WordPress/gutenberg/pull/28019))
+-   Docs: A wether, as it turns out, is a castrated ram. ([28008](https://github.com/WordPress/gutenberg/pull/28008))
+-   Update Quickstart guide for the Development Environment documentation. ([28005](https://github.com/WordPress/gutenberg/pull/28005))
+-   Update copyright year to 2021 in `license.md`. ([27951](https://github.com/WordPress/gutenberg/pull/27951))
+-   Block API: Add more inline comments. ([20257](https://github.com/WordPress/gutenberg/pull/20257))
+-   Changelog: Group entries for 9.8.0-rc.1. ([28332](https://github.com/WordPress/gutenberg/pull/28332))
 
 ### Code Quality
 
-- Remove effects test file and remove unused refx dependency. ([28162](https://github.com/WordPress/gutenberg/pull/28162))
-- Annotations: Replace store name string with exposed store definition. ([28156](https://github.com/WordPress/gutenberg/pull/28156))
-- Edit Widgets: Replace store name string with exposed store definition. ([28044](https://github.com/WordPress/gutenberg/pull/28044))
-- Interface: Replace store name string with exposed store definition. ([28041](https://github.com/WordPress/gutenberg/pull/28041))
-- Upgrade Reakit to version 1.3.4. ([28013](https://github.com/WordPress/gutenberg/pull/28013))
-- Fix PHPCS warning: Undefined variable $i. ([27955](https://github.com/WordPress/gutenberg/pull/27955))
-- Consolidate block editor initializations. ([27954](https://github.com/WordPress/gutenberg/pull/27954))
-- Fix create-block PHP template files according to WordPress standards. ([27949](https://github.com/WordPress/gutenberg/pull/27949))
-- block-directory: Simplify the LOAD_ASSETS flow by making it an async function. ([25956](https://github.com/WordPress/gutenberg/pull/25956))
+-   Remove effects test file and remove unused refx dependency. ([28162](https://github.com/WordPress/gutenberg/pull/28162))
+-   Annotations: Replace store name string with exposed store definition. ([28156](https://github.com/WordPress/gutenberg/pull/28156))
+-   Edit Widgets: Replace store name string with exposed store definition. ([28044](https://github.com/WordPress/gutenberg/pull/28044))
+-   Interface: Replace store name string with exposed store definition. ([28041](https://github.com/WordPress/gutenberg/pull/28041))
+-   Upgrade Reakit to version 1.3.4. ([28013](https://github.com/WordPress/gutenberg/pull/28013))
+-   Fix PHPCS warning: Undefined variable $i. ([27955](https://github.com/WordPress/gutenberg/pull/27955))
+-   Consolidate block editor initializations. ([27954](https://github.com/WordPress/gutenberg/pull/27954))
+-   Fix create-block PHP template files according to WordPress standards. ([27949](https://github.com/WordPress/gutenberg/pull/27949))
+-   block-directory: Simplify the LOAD_ASSETS flow by making it an async function. ([25956](https://github.com/WordPress/gutenberg/pull/25956))
 
 ### Tools
 
-- Workflows (i.e. GitHub Actions):
-  - Create Release Draft when tagging version. ([27488](https://github.com/WordPress/gutenberg/pull/27488))
-  - Add action to upload release to SVN repo. ([27591](https://github.com/WordPress/gutenberg/pull/27591))
-  - Compare Performance upon Release. ([28046](https://github.com/WordPress/gutenberg/pull/28046))
-  - Build Plugin Workflow: Bump node version to 14. ([28048](https://github.com/WordPress/gutenberg/pull/28048))
-- End-to-end tests:
-  - FSE: Fix intermittent errors in multi entity editing test. ([28107](https://github.com/WordPress/gutenberg/pull/28107))
-  - Fix randomly failing end-to-end test. ([28073](https://github.com/WordPress/gutenberg/pull/28073))
-  - Upgrade puppeteer to 5.5.0. ([28055](https://github.com/WordPress/gutenberg/pull/28055))
-  - Performance tests: Fix. ([28026](https://github.com/WordPress/gutenberg/pull/28026))
-- Scripts:
-  - Align default engines for `check-engines` with the package. ([28143](https://github.com/WordPress/gutenberg/pull/28143))
-  - Add support for static assets in build commands. ([28043](https://github.com/WordPress/gutenberg/pull/28043))
-  - Make it possible to transpile `.jsx` files with build command. ([28002](https://github.com/WordPress/gutenberg/pull/28002))
-  - ESLint minor version upgrade to 7.17.0. ([27965](https://github.com/WordPress/gutenberg/pull/27965))
-  - Upgrade Jest to the new major version (26.x). ([27956](https://github.com/WordPress/gutenberg/pull/27956))
-  - Use @wordpress/stylelint-config in @wordpress/scripts. ([27810](https://github.com/WordPress/gutenberg/pull/27810))
-- Linting:
-  - ESLint Plugin: Enable import rules used in Gutenberg. ([27387](https://github.com/WordPress/gutenberg/pull/27387))
-  - Add no-unsafe-wp-apis to recommended configuration. ([27327](https://github.com/WordPress/gutenberg/pull/27327))
-  - Remove /wordpress from test/linting ignore paths. ([20270](https://github.com/WordPress/gutenberg/pull/20270))
-  - Update changelog for stylelint-config. ([28074](https://github.com/WordPress/gutenberg/pull/28074))
-- Testing: Prevent a direct usage of Reakit. ([28095](https://github.com/WordPress/gutenberg/pull/28095))
-- Update the minimum Node.js version to 12. ([27934](https://github.com/WordPress/gutenberg/pull/27934))
-- wp-env: Ensure the environment is used with the logs command. ([27907](https://github.com/WordPress/gutenberg/pull/27907))
-- Packages: Fully automate npm publishing with the latest and next tags ([28335](https://github.com/WordPress/gutenberg/pull/28335))
-- Upgrade webpack to version 5. ([26382](https://github.com/WordPress/gutenberg/pull/26382))
-- Revert "Upgrade webpack to version 5". ([27974](https://github.com/WordPress/gutenberg/pull/27974))
+-   Workflows (i.e. GitHub Actions):
+    -   Create Release Draft when tagging version. ([27488](https://github.com/WordPress/gutenberg/pull/27488))
+    -   Add action to upload release to SVN repo. ([27591](https://github.com/WordPress/gutenberg/pull/27591))
+    -   Compare Performance upon Release. ([28046](https://github.com/WordPress/gutenberg/pull/28046))
+    -   Build Plugin Workflow: Bump node version to 14. ([28048](https://github.com/WordPress/gutenberg/pull/28048))
+-   End-to-end tests:
+    -   FSE: Fix intermittent errors in multi entity editing test. ([28107](https://github.com/WordPress/gutenberg/pull/28107))
+    -   Fix randomly failing end-to-end test. ([28073](https://github.com/WordPress/gutenberg/pull/28073))
+    -   Upgrade puppeteer to 5.5.0. ([28055](https://github.com/WordPress/gutenberg/pull/28055))
+    -   Performance tests: Fix. ([28026](https://github.com/WordPress/gutenberg/pull/28026))
+-   Scripts:
+    -   Align default engines for `check-engines` with the package. ([28143](https://github.com/WordPress/gutenberg/pull/28143))
+    -   Add support for static assets in build commands. ([28043](https://github.com/WordPress/gutenberg/pull/28043))
+    -   Make it possible to transpile `.jsx` files with build command. ([28002](https://github.com/WordPress/gutenberg/pull/28002))
+    -   ESLint minor version upgrade to 7.17.0. ([27965](https://github.com/WordPress/gutenberg/pull/27965))
+    -   Upgrade Jest to the new major version (26.x). ([27956](https://github.com/WordPress/gutenberg/pull/27956))
+    -   Use @wordpress/stylelint-config in @wordpress/scripts. ([27810](https://github.com/WordPress/gutenberg/pull/27810))
+-   Linting:
+    -   ESLint Plugin: Enable import rules used in Gutenberg. ([27387](https://github.com/WordPress/gutenberg/pull/27387))
+    -   Add no-unsafe-wp-apis to recommended configuration. ([27327](https://github.com/WordPress/gutenberg/pull/27327))
+    -   Remove /wordpress from test/linting ignore paths. ([20270](https://github.com/WordPress/gutenberg/pull/20270))
+    -   Update changelog for stylelint-config. ([28074](https://github.com/WordPress/gutenberg/pull/28074))
+-   Testing: Prevent a direct usage of Reakit. ([28095](https://github.com/WordPress/gutenberg/pull/28095))
+-   Update the minimum Node.js version to 12. ([27934](https://github.com/WordPress/gutenberg/pull/27934))
+-   wp-env: Ensure the environment is used with the logs command. ([27907](https://github.com/WordPress/gutenberg/pull/27907))
+-   Packages: Fully automate npm publishing with the latest and next tags ([28335](https://github.com/WordPress/gutenberg/pull/28335))
+-   Upgrade webpack to version 5. ([26382](https://github.com/WordPress/gutenberg/pull/26382))
+-   Revert "Upgrade webpack to version 5". ([27974](https://github.com/WordPress/gutenberg/pull/27974))
 
 ### Various
 
-- Gutenpride Template:
-  - New Package to use with the tutorial. ([27881](https://github.com/WordPress/gutenberg/pull/27881))
-  - Create Block: Enhancements to Gutenpride tutorial template. ([28215](https://github.com/WordPress/gutenberg/pull/28215))
-- URL: Remove redundant array coercion. ([28072](https://github.com/WordPress/gutenberg/pull/28072))
-- Visual editor: Remove focusable wrapper. ([28058](https://github.com/WordPress/gutenberg/pull/28058))
-- Readme: Increase tested Version up to WP 5.6. ([28050](https://github.com/WordPress/gutenberg/pull/28050))
-- Interface: Remove deprecated prop from InterfaceSkeleton. ([28034](https://github.com/WordPress/gutenberg/pull/28034))
-- List View: Reduce whitespace and always show nested blocks. ([28029](https://github.com/WordPress/gutenberg/pull/28029))
-- Making the sidebar inspector's tabs stick when scrolling. ([28003](https://github.com/WordPress/gutenberg/pull/28003))
-- Chore: Update Lerna dependency. ([27990](https://github.com/WordPress/gutenberg/pull/27990))
-- Try: Make focus width a CSS variable. ([27968](https://github.com/WordPress/gutenberg/pull/27968))
-- Add translation context to all block's titles. ([27933](https://github.com/WordPress/gutenberg/pull/27933))
-- Add primary destructive button style. ([27774](https://github.com/WordPress/gutenberg/pull/27774))
-- Modifies the widgets dashboard link to point to the new widgets editor. ([26880](https://github.com/WordPress/gutenberg/pull/26880))
-- Use standard select element for small number of authors. ([26426](https://github.com/WordPress/gutenberg/pull/26426))
-- Add srcset for cover image. ([25171](https://github.com/WordPress/gutenberg/pull/25171))
-
+-   Gutenpride Template:
+    -   New Package to use with the tutorial. ([27881](https://github.com/WordPress/gutenberg/pull/27881))
+    -   Create Block: Enhancements to Gutenpride tutorial template. ([28215](https://github.com/WordPress/gutenberg/pull/28215))
+-   URL: Remove redundant array coercion. ([28072](https://github.com/WordPress/gutenberg/pull/28072))
+-   Visual editor: Remove focusable wrapper. ([28058](https://github.com/WordPress/gutenberg/pull/28058))
+-   Readme: Increase tested Version up to WP 5.6. ([28050](https://github.com/WordPress/gutenberg/pull/28050))
+-   Interface: Remove deprecated prop from InterfaceSkeleton. ([28034](https://github.com/WordPress/gutenberg/pull/28034))
+-   List View: Reduce whitespace and always show nested blocks. ([28029](https://github.com/WordPress/gutenberg/pull/28029))
+-   Making the sidebar inspector's tabs stick when scrolling. ([28003](https://github.com/WordPress/gutenberg/pull/28003))
+-   Chore: Update Lerna dependency. ([27990](https://github.com/WordPress/gutenberg/pull/27990))
+-   Try: Make focus width a CSS variable. ([27968](https://github.com/WordPress/gutenberg/pull/27968))
+-   Add translation context to all block's titles. ([27933](https://github.com/WordPress/gutenberg/pull/27933))
+-   Add primary destructive button style. ([27774](https://github.com/WordPress/gutenberg/pull/27774))
+-   Modifies the widgets dashboard link to point to the new widgets editor. ([26880](https://github.com/WordPress/gutenberg/pull/26880))
+-   Use standard select element for small number of authors. ([26426](https://github.com/WordPress/gutenberg/pull/26426))
+-   Add srcset for cover image. ([25171](https://github.com/WordPress/gutenberg/pull/25171))
 
 = 9.7.4 =
 
-### Bug Fixes
+## Changelog
 
-- Fix isRTL check by loading the ltr string explicitely.
+### Bug Fixes
 
+-   Fix isRTL check by loading the ltr string explicitely.
 
 = 9.7.3 =
 
-### Bug Fixes
+## Changelog
 
-- Prevent mangle of translation functions to fix RTL locales.
+### Bug Fixes
 
+-   Prevent mangle of translation functions to fix RTL locales.
 
 = 9.7.2 =
 
+## Changelog
+
 ### Bug Fixes
 
-- Keep the inserter opened when clicking the scrollbar.
+-   Keep the inserter opened when clicking the scrollbar.
 
 ### Various
 
-- Updated the "tested up to" WordPress version.
-
+-   Updated the "tested up to" WordPress version.
 
 = 9.7.1 =
 
-### Bug Fixes
+## Changelog
 
- - Fix styling of the verse block.
+### Bug Fixes
 
+-   Fix styling of the verse block.
 
 = 9.7.0 =
 
+## Changelog
+
 ### Features
 
-- Support drag and dropping block patterns from the inserter. ([27927](https://github.com/WordPress/gutenberg/pull/27927))
+-   Support drag and dropping block patterns from the inserter. ([27927](https://github.com/WordPress/gutenberg/pull/27927))
 
 ### Enhancements
 
-- Improve the Reusable Blocks UI by relying on multi entity save flow. ([27887](https://github.com/WordPress/gutenberg/pull/27887)) ([27885](https://github.com/WordPress/gutenberg/pull/27885))
-- Show the insertion point indicator below the inbetween inserter. ([27842](https://github.com/WordPress/gutenberg/pull/27842))
-- Add block transforms previews. ([27861](https://github.com/WordPress/gutenberg/pull/27861))
-- URL: RemoveQueryArgs should remove the ? char after removing all args. ([27812](https://github.com/WordPress/gutenberg/pull/27812))
-- Deburr the input of the Post Author and Parent Page controls when filitering results. ([26611](https://github.com/WordPress/gutenberg/pull/26611))
-- Display block icon, description and name by matching block variations. ([27469](https://github.com/WordPress/gutenberg/pull/27469))
-- RSS Block: Add an explicit border-box CSS rule. ([27767](https://github.com/WordPress/gutenberg/pull/27767))
+-   Improve the Reusable Blocks UI by relying on multi entity save flow. ([27887](https://github.com/WordPress/gutenberg/pull/27887)) ([27885](https://github.com/WordPress/gutenberg/pull/27885))
+-   Show the insertion point indicator below the inbetween inserter. ([27842](https://github.com/WordPress/gutenberg/pull/27842))
+-   Add block transforms previews. ([27861](https://github.com/WordPress/gutenberg/pull/27861))
+-   URL: RemoveQueryArgs should remove the ? char after removing all args. ([27812](https://github.com/WordPress/gutenberg/pull/27812))
+-   Deburr the input of the Post Author and Parent Page controls when filitering results. ([26611](https://github.com/WordPress/gutenberg/pull/26611))
+-   Display block icon, description and name by matching block variations. ([27469](https://github.com/WordPress/gutenberg/pull/27469))
+-   RSS Block: Add an explicit border-box CSS rule. ([27767](https://github.com/WordPress/gutenberg/pull/27767))
 
 ### New APIs
 
-- Create block: Allow to list npm packages to be installed in the template. ([27880](https://github.com/WordPress/gutenberg/pull/27880))
-- @wordpress/url: Add a maxLength argument to filterURLForDisplay. ([27530](https://github.com/WordPress/gutenberg/pull/27530))
-- Add new package `@wordpress/stylelint config`. ([22777](https://github.com/WordPress/gutenberg/pull/22777))
+-   Create block: Allow to list npm packages to be installed in the template. ([27880](https://github.com/WordPress/gutenberg/pull/27880))
+-   @wordpress/url: Add a maxLength argument to filterURLForDisplay. ([27530](https://github.com/WordPress/gutenberg/pull/27530))
+-   Add new package `@wordpress/stylelint config`. ([22777](https://github.com/WordPress/gutenberg/pull/22777))
 
 ### Bug Fixes
 
-- Show all taxonomies in Tag Cloud block. ([27930](https://github.com/WordPress/gutenberg/pull/27930))
-- HTML Block: Fix editor styles. ([27627](https://github.com/WordPress/gutenberg/pull/27627))
-- Don't ignore extra edits made in the server when saving posts. ([27929](https://github.com/WordPress/gutenberg/pull/27929))
-- Remove  the animation of post publish button during autosaving. ([27874](https://github.com/WordPress/gutenberg/pull/27874))
-- Prevent the inserter from closing when switching the pattern category. ([27792](https://github.com/WordPress/gutenberg/pull/27792))
-- LinkControl: Fix horizontal scrollbar within block toolbar. ([27777](https://github.com/WordPress/gutenberg/pull/27777))
-- Create Block: Fix support for external templates. ([27776](https://github.com/WordPress/gutenberg/pull/27776)) ([27784](https://github.com/WordPress/gutenberg/pull/27784))
-- Fix text color dropdown not opening. ([27596](https://github.com/WordPress/gutenberg/pull/27596))
+-   Show all taxonomies in Tag Cloud block. ([27930](https://github.com/WordPress/gutenberg/pull/27930))
+-   HTML Block: Fix editor styles. ([27627](https://github.com/WordPress/gutenberg/pull/27627))
+-   Don't ignore extra edits made in the server when saving posts. ([27929](https://github.com/WordPress/gutenberg/pull/27929))
+-   Remove the animation of post publish button during autosaving. ([27874](https://github.com/WordPress/gutenberg/pull/27874))
+-   Prevent the inserter from closing when switching the pattern category. ([27792](https://github.com/WordPress/gutenberg/pull/27792))
+-   LinkControl: Fix horizontal scrollbar within block toolbar. ([27777](https://github.com/WordPress/gutenberg/pull/27777))
+-   Create Block: Fix support for external templates. ([27776](https://github.com/WordPress/gutenberg/pull/27776)) ([27784](https://github.com/WordPress/gutenberg/pull/27784))
+-   Fix text color dropdown not opening. ([27596](https://github.com/WordPress/gutenberg/pull/27596))
 
 ### Experiments
 
-- Full Site Editing Framework:
-  - Add support for custom templates in FSE themes. ([27778](https://github.com/WordPress/gutenberg/pull/27778))
-  - Refactor the edit-site store to clarify the purpose of templateId and templatePartId. ([27839](https://github.com/WordPress/gutenberg/pull/27839))
-- Full Site Editing Blocks:
-  - Site Logo: Remove duplicate link. ([27924](https://github.com/WordPress/gutenberg/pull/27924))
-  - Post excerpt block: Fix incorrect quotes for the class attribute in the wrapper. ([27895](https://github.com/WordPress/gutenberg/pull/27895))
-- Global Styles:
-  - Add padding control to the Global Styles sidebar. ([27154](https://github.com/WordPress/gutenberg/pull/27154))
-- Navigation block: Fix the text color for links in the navigation block. ([26698](https://github.com/WordPress/gutenberg/pull/26698))
+-   Full Site Editing Framework:
+    -   Add support for custom templates in FSE themes. ([27778](https://github.com/WordPress/gutenberg/pull/27778))
+    -   Refactor the edit-site store to clarify the purpose of templateId and templatePartId. ([27839](https://github.com/WordPress/gutenberg/pull/27839))
+-   Full Site Editing Blocks:
+    -   Site Logo: Remove duplicate link. ([27924](https://github.com/WordPress/gutenberg/pull/27924))
+    -   Post excerpt block: Fix incorrect quotes for the class attribute in the wrapper. ([27895](https://github.com/WordPress/gutenberg/pull/27895))
+-   Global Styles:
+    -   Add padding control to the Global Styles sidebar. ([27154](https://github.com/WordPress/gutenberg/pull/27154))
+-   Navigation block: Fix the text color for links in the navigation block. ([26698](https://github.com/WordPress/gutenberg/pull/26698))
 
 ### Documentation
 
-- Improve documentation for withNotices HOC in components package. ([27863](https://github.com/WordPress/gutenberg/pull/27863))
-- Add ContrastChecker component readme. ([25570](https://github.com/WordPress/gutenberg/pull/25570))
-- Remove default style information from the documentation. ([27811](https://github.com/WordPress/gutenberg/pull/27811))
-- Storybook: Fix broken import statements for DateTime component. ([27794](https://github.com/WordPress/gutenberg/pull/27794))
-- Add additional information about lock inheritance. ([27834](https://github.com/WordPress/gutenberg/pull/27834))
-- Typos andd tweaks: ([27909](https://github.com/WordPress/gutenberg/pull/27909)), ([27799](https://github.com/WordPress/gutenberg/pull/27799))
+-   Improve documentation for withNotices HOC in components package. ([27863](https://github.com/WordPress/gutenberg/pull/27863))
+-   Add ContrastChecker component readme. ([25570](https://github.com/WordPress/gutenberg/pull/25570))
+-   Remove default style information from the documentation. ([27811](https://github.com/WordPress/gutenberg/pull/27811))
+-   Storybook: Fix broken import statements for DateTime component. ([27794](https://github.com/WordPress/gutenberg/pull/27794))
+-   Add additional information about lock inheritance. ([27834](https://github.com/WordPress/gutenberg/pull/27834))
+-   Typos andd tweaks: ([27909](https://github.com/WordPress/gutenberg/pull/27909)), ([27799](https://github.com/WordPress/gutenberg/pull/27799))
 
 ### Code Quality
 
-- Use a consistent way to check isRTL. ([27838](https://github.com/WordPress/gutenberg/pull/27838))
-- Update the minimum required WordPress version to 5.5. ([27807](https://github.com/WordPress/gutenberg/pull/27807))
-- Remove unused redux-optimist dependency. ([27798](https://github.com/WordPress/gutenberg/pull/27798))
-- Storybook: Perform cleanup in the Storybook setup. ([27786](https://github.com/WordPress/gutenberg/pull/27786)) ([27813](https://github.com/WordPress/gutenberg/pull/27813))
-- Raw handling: Remove duplicate code. ([27758](https://github.com/WordPress/gutenberg/pull/27758))
-- Refactor BlockSwitcher as a functional component. ([27674](https://github.com/WordPress/gutenberg/pull/27674))
-- Rich Text: Replace store name string with exposed store definition. ([27820](https://github.com/WordPress/gutenberg/pull/27820))
+-   Use a consistent way to check isRTL. ([27838](https://github.com/WordPress/gutenberg/pull/27838))
+-   Update the minimum required WordPress version to 5.5. ([27807](https://github.com/WordPress/gutenberg/pull/27807))
+-   Remove unused redux-optimist dependency. ([27798](https://github.com/WordPress/gutenberg/pull/27798))
+-   Storybook: Perform cleanup in the Storybook setup. ([27786](https://github.com/WordPress/gutenberg/pull/27786)) ([27813](https://github.com/WordPress/gutenberg/pull/27813))
+-   Raw handling: Remove duplicate code. ([27758](https://github.com/WordPress/gutenberg/pull/27758))
+-   Refactor BlockSwitcher as a functional component. ([27674](https://github.com/WordPress/gutenberg/pull/27674))
+-   Rich Text: Replace store name string with exposed store definition. ([27820](https://github.com/WordPress/gutenberg/pull/27820))
 
 ### Tools
 
-- Remove overrides for JSDoc rules downgraded to warnings. ([27912](https://github.com/WordPress/gutenberg/pull/27912)) ([27879](https://github.com/WordPress/gutenberg/pull/27879))
-- Plugin release tool: Fix svn add/rm commands for release tool. ([27886](https://github.com/WordPress/gutenberg/pull/27886))
-- Add types to the @wordpress/keycodes package. ([19520](https://github.com/WordPress/gutenberg/pull/19520))
-- end to end tests:
-  - Make end to end tests do not rely on font size picker classes. ([27825](https://github.com/WordPress/gutenberg/pull/27825))
-  - Remove expect.assertions count from multi-entity-saving tests. ([27802](https://github.com/WordPress/gutenberg/pull/27802)) ([27818](https://github.com/WordPress/gutenberg/pull/27818))
-  - Testing: Remove axe verification executed after every test case. ([26626](https://github.com/WordPress/gutenberg/pull/26626))
-  - Improve font size end to end tests to work with input changes on blur. ([27871](https://github.com/WordPress/gutenberg/pull/27871))
-
-
+-   Remove overrides for JSDoc rules downgraded to warnings. ([27912](https://github.com/WordPress/gutenberg/pull/27912)) ([27879](https://github.com/WordPress/gutenberg/pull/27879))
+-   Plugin release tool: Fix svn add/rm commands for release tool. ([27886](https://github.com/WordPress/gutenberg/pull/27886))
+-   Add types to the @wordpress/keycodes package. ([19520](https://github.com/WordPress/gutenberg/pull/19520))
+-   end to end tests:
+    -   Make end to end tests do not rely on font size picker classes. ([27825](https://github.com/WordPress/gutenberg/pull/27825))
+    -   Remove expect.assertions count from multi-entity-saving tests. ([27802](https://github.com/WordPress/gutenberg/pull/27802)) ([27818](https://github.com/WordPress/gutenberg/pull/27818))
+    -   Testing: Remove axe verification executed after every test case. ([26626](https://github.com/WordPress/gutenberg/pull/26626))
+    -   Improve font size end to end tests to work with input changes on blur. ([27871](https://github.com/WordPress/gutenberg/pull/27871))
 
 = 9.6.2 =
 
-### Bug Fixes
+## Changelog
 
- - Fix toolbar controls in the widgets screen.
- - Fix the slash inserter in the widgets screen.
+### Bug Fixes
 
+-   Fix toolbar controls in the widgets screen.
+-   Fix the slash inserter in the widgets screen.
 
 = 9.6.1 =
 
-### Bugfixes
+## Changelog
 
-- Include block's CSS in the release for FSE themes ([27884](https://github.com/WordPress/gutenberg/pull/27884))
+### Bugfixes
 
+-   Include block's CSS in the release for FSE themes ([27884](https://github.com/WordPress/gutenberg/pull/27884))
 
 = 9.6.0 =
 
+## Changelog
 
 ### Features
 
-- Allow dragging blocks from the inserter into the canvas. ([27669](https://github.com/WordPress/gutenberg/pull/27669))
-- Buttons: Add variations for vertical layout. ([27297](https://github.com/WordPress/gutenberg/pull/27297))
+-   Allow dragging blocks from the inserter into the canvas. ([27669](https://github.com/WordPress/gutenberg/pull/27669))
+-   Buttons: Add variations for vertical layout. ([27297](https://github.com/WordPress/gutenberg/pull/27297))
 
 ### Enhancements
 
-- Buttons block: Change position of the link popover. ([27408](https://github.com/WordPress/gutenberg/pull/27408))
+-   Buttons block: Change position of the link popover. ([27408](https://github.com/WordPress/gutenberg/pull/27408))
 
 ### New APIs
 
-- Add a useFocusOnMount hook to the @wordpress/compose package. ([27574](https://github.com/WordPress/gutenberg/pull/27574))
-- Add a useFocusReturn hook. ([27572](https://github.com/WordPress/gutenberg/pull/27572))
-- Add a useConstrainedTabbing hook. ([27544](https://github.com/WordPress/gutenberg/pull/27544))
-- Components: Introduce a isDisabled prop to the Disabled component. ([26730](https://github.com/WordPress/gutenberg/pull/26730))
-- Create block:
-  - Use Block API version 2. ([26098](https://github.com/WordPress/gutenberg/pull/26098))
-  - Fix for supporting external templates. ([27784](https://github.com/WordPress/gutenberg/pull/27784)) ([27776](https://github.com/WordPress/gutenberg/pull/27776))
-
-### Bug Fixes
-
-- Widget screen: Fix block select on focus. ([27755](https://github.com/WordPress/gutenberg/pull/27755))
-- [Embed block]: Add html and reusable support back. ([27733](https://github.com/WordPress/gutenberg/pull/27733))
-- Add useCallbackRef to avoid calling the ref multiple times with the same node. ([27710](https://github.com/WordPress/gutenberg/pull/27710))
-- Correct getRedistributedColumnWidths and related tests. ([27681](https://github.com/WordPress/gutenberg/pull/27681))
-- Remove CSS Custom Property in code block. ([27672](https://github.com/WordPress/gutenberg/pull/27672))
-- Fix regression on code block for font-size property ([27862](https://github.com/WordPress/gutenberg/pull/27862))
-- Block crashes if font family is not found. ([27654](https://github.com/WordPress/gutenberg/pull/27654))
-- popover flickering on small screens. ([27648](https://github.com/WordPress/gutenberg/pull/27648))
-- Adding single use block from main inserter causes focus loss and menu to be stuck open. ([27641](https://github.com/WordPress/gutenberg/pull/27641))
-- Changelog for 9.5.2. ([27638](https://github.com/WordPress/gutenberg/pull/27638))
-- Uncaught error with a custom generic store without a unsubscribe function in useSelect. ([27634](https://github.com/WordPress/gutenberg/pull/27634))
-- Revert date changes from branch 'replace-moment'. ([27550](https://github.com/WordPress/gutenberg/pull/27550))
-- useMediaQuery: Make it safe for SSR environments without window. ([27542](https://github.com/WordPress/gutenberg/pull/27542))
-- Fixes the width on the circle color picker popover. ([27523](https://github.com/WordPress/gutenberg/pull/27523))
-- ComboboxControl/FormTokenField: Fix iOS zooming for input. ([27471](https://github.com/WordPress/gutenberg/pull/27471))
-- Fallback to regular subscribe if the store doesn't exist in useSelect. ([27466](https://github.com/WordPress/gutenberg/pull/27466))
-- Global Styles getPresetVariable uses a wrong variable; Remove GLOBAL_CONTEXT. ([27450](https://github.com/WordPress/gutenberg/pull/27450))
-- Popover: Fix issue with undefined getBoundingClientRect. ([27445](https://github.com/WordPress/gutenberg/pull/27445))
-- Try fixing combobox a11y issues. ([27431](https://github.com/WordPress/gutenberg/pull/27431))
-- Support gradients with omitted stop positions in CustomGradientPicker. ([27413](https://github.com/WordPress/gutenberg/pull/27413))
-- Fix combobox suggestion list closure when clicking scrollbar. ([27367](https://github.com/WordPress/gutenberg/pull/27367))
-- Video Block: Let the video fill the container. ([27328](https://github.com/WordPress/gutenberg/pull/27328))
-- Media & Text “crop image to fill” to work with linked media. ([27211](https://github.com/WordPress/gutenberg/pull/27211))
-- Give editable fields in blocks better aria-labels. ([26582](https://github.com/WordPress/gutenberg/pull/26582))
-- Replace function should handle empty string callback return in the shortcode parser. ([16358](https://github.com/WordPress/gutenberg/pull/16358))
+-   Add a useFocusOnMount hook to the @wordpress/compose package. ([27574](https://github.com/WordPress/gutenberg/pull/27574))
+-   Add a useFocusReturn hook. ([27572](https://github.com/WordPress/gutenberg/pull/27572))
+-   Add a useConstrainedTabbing hook. ([27544](https://github.com/WordPress/gutenberg/pull/27544))
+-   Components: Introduce a isDisabled prop to the Disabled component. ([26730](https://github.com/WordPress/gutenberg/pull/26730))
+-   Create block:
+    -   Use Block API version 2. ([26098](https://github.com/WordPress/gutenberg/pull/26098))
+    -   Fix for supporting external templates. ([27784](https://github.com/WordPress/gutenberg/pull/27784)) ([27776](https://github.com/WordPress/gutenberg/pull/27776))
+
+### Bug Fixes
+
+-   Widget screen: Fix block select on focus. ([27755](https://github.com/WordPress/gutenberg/pull/27755))
+-   [Embed block]: Add html and reusable support back. ([27733](https://github.com/WordPress/gutenberg/pull/27733))
+-   Add useCallbackRef to avoid calling the ref multiple times with the same node. ([27710](https://github.com/WordPress/gutenberg/pull/27710))
+-   Correct getRedistributedColumnWidths and related tests. ([27681](https://github.com/WordPress/gutenberg/pull/27681))
+-   Remove CSS Custom Property in code block. ([27672](https://github.com/WordPress/gutenberg/pull/27672))
+-   Fix regression on code block for font-size property ([27862](https://github.com/WordPress/gutenberg/pull/27862))
+-   Block crashes if font family is not found. ([27654](https://github.com/WordPress/gutenberg/pull/27654))
+-   popover flickering on small screens. ([27648](https://github.com/WordPress/gutenberg/pull/27648))
+-   Adding single use block from main inserter causes focus loss and menu to be stuck open. ([27641](https://github.com/WordPress/gutenberg/pull/27641))
+-   Changelog for 9.5.2. ([27638](https://github.com/WordPress/gutenberg/pull/27638))
+-   Uncaught error with a custom generic store without a unsubscribe function in useSelect. ([27634](https://github.com/WordPress/gutenberg/pull/27634))
+-   Revert date changes from branch 'replace-moment'. ([27550](https://github.com/WordPress/gutenberg/pull/27550))
+-   useMediaQuery: Make it safe for SSR environments without window. ([27542](https://github.com/WordPress/gutenberg/pull/27542))
+-   Fixes the width on the circle color picker popover. ([27523](https://github.com/WordPress/gutenberg/pull/27523))
+-   ComboboxControl/FormTokenField: Fix iOS zooming for input. ([27471](https://github.com/WordPress/gutenberg/pull/27471))
+-   Fallback to regular subscribe if the store doesn't exist in useSelect. ([27466](https://github.com/WordPress/gutenberg/pull/27466))
+-   Global Styles getPresetVariable uses a wrong variable; Remove GLOBAL_CONTEXT. ([27450](https://github.com/WordPress/gutenberg/pull/27450))
+-   Popover: Fix issue with undefined getBoundingClientRect. ([27445](https://github.com/WordPress/gutenberg/pull/27445))
+-   Try fixing combobox a11y issues. ([27431](https://github.com/WordPress/gutenberg/pull/27431))
+-   Support gradients with omitted stop positions in CustomGradientPicker. ([27413](https://github.com/WordPress/gutenberg/pull/27413))
+-   Fix combobox suggestion list closure when clicking scrollbar. ([27367](https://github.com/WordPress/gutenberg/pull/27367))
+-   Video Block: Let the video fill the container. ([27328](https://github.com/WordPress/gutenberg/pull/27328))
+-   Media & Text “crop image to fill” to work with linked media. ([27211](https://github.com/WordPress/gutenberg/pull/27211))
+-   Give editable fields in blocks better aria-labels. ([26582](https://github.com/WordPress/gutenberg/pull/26582))
+-   Replace function should handle empty string callback return in the shortcode parser. ([16358](https://github.com/WordPress/gutenberg/pull/16358))
 
 ### Performance
 
-- Split core blocks assets loading. ([25220](https://github.com/WordPress/gutenberg/pull/25220))
+-   Split core blocks assets loading. ([25220](https://github.com/WordPress/gutenberg/pull/25220))
 
 ### Experiments
 
-- Add a useDialog hook and replace the duplicated PopoverWrapper. ([27643](https://github.com/WordPress/gutenberg/pull/27643))
-- Refactor withFocusOutside to hook. ([27369](https://github.com/WordPress/gutenberg/pull/27369))
-- FSE: Block Navigation: update Navigation block placeholder. ([27018](https://github.com/WordPress/gutenberg/pull/27018))
-- FSE: Block Query
-  - Add new post link to Query. ([27732](https://github.com/WordPress/gutenberg/pull/27732))
-  - Allow Query Loop only inside Query block. ([27637](https://github.com/WordPress/gutenberg/pull/27637))
-  - Adjust mobile margins for the Query block's grid view. ([27619](https://github.com/WordPress/gutenberg/pull/27619))
-  - Query block: Allow inheriting the global query arguments. ([27128](https://github.com/WordPress/gutenberg/pull/27128))
-- FSE: Blocks
-  - Add comment-form block styles. ([27673](https://github.com/WordPress/gutenberg/pull/27673))
-  - Tag Cloud block: Adjust styles for the different block alignments. ([27342](https://github.com/WordPress/gutenberg/pull/27342))
-  - Site Logo:
-    - Remove line height. ([27623](https://github.com/WordPress/gutenberg/pull/27623))
-    - Add a rounded block style. ([27621](https://github.com/WordPress/gutenberg/pull/27621))
-- FSE: Infrastructure
-  - Apply hover class in outline mode. ([27714](https://github.com/WordPress/gutenberg/pull/27714))
-  - Update documentation to show how a theme can have FSE automatically enabled. ([27680](https://github.com/WordPress/gutenberg/pull/27680))
-  - Make the inserter in the site editor behave as a popover. ([27502](https://github.com/WordPress/gutenberg/pull/27502))
-  - Add an outline mode and use it both Site Editor and Template mode. ([27499](https://github.com/WordPress/gutenberg/pull/27499))
-  - Load the block patterns in the site editor. ([27497](https://github.com/WordPress/gutenberg/pull/27497))
-  - Move the templates prePersist logic to core-data. ([27464](https://github.com/WordPress/gutenberg/pull/27464))
-  - Expand the multi-entity saving panel by default. ([27437](https://github.com/WordPress/gutenberg/pull/27437))
-  - Reveal block boundaries on hover in the Site Editor. ([27271](https://github.com/WordPress/gutenberg/pull/27271))
-  - Site Editor - add query args for current context. ([27124](https://github.com/WordPress/gutenberg/pull/27124))
-  - Full Site Editing: Introduce a template editing mode inside the post editor. ([26355](https://github.com/WordPress/gutenberg/pull/26355))
-  - Remove optimistic updates to solve the template revert issue ([27797](https://github.com/WordPress/gutenberg/pull/27797))
-- FSE: Style System
-  - Fix: Font Weight and Style don't work independently on global styles. ([27659](https://github.com/WordPress/gutenberg/pull/27659))
-  - Add custom units in BoxControl. ([27626](https://github.com/WordPress/gutenberg/pull/27626))
-  - Remove Font style, weight, decoration, and transform presets. ([27555](https://github.com/WordPress/gutenberg/pull/27555))
-  - Make client preset metadata match server. ([27453](https://github.com/WordPress/gutenberg/pull/27453))
-  - Do not pass selectors and supports information to the client. ([27449](https://github.com/WordPress/gutenberg/pull/27449))
-  - Add border radius support. ([25791](https://github.com/WordPress/gutenberg/pull/25791))
-  - Update font-weight names. ([27718](https://github.com/WordPress/gutenberg/pull/27718))
-  - Update performance of global styles code ([27779](https://github.com/WordPress/gutenberg/pull/27779))
+-   Add a useDialog hook and replace the duplicated PopoverWrapper. ([27643](https://github.com/WordPress/gutenberg/pull/27643))
+-   Refactor withFocusOutside to hook. ([27369](https://github.com/WordPress/gutenberg/pull/27369))
+-   FSE: Block Navigation: update Navigation block placeholder. ([27018](https://github.com/WordPress/gutenberg/pull/27018))
+-   FSE: Block Query
+    -   Add new post link to Query. ([27732](https://github.com/WordPress/gutenberg/pull/27732))
+    -   Allow Query Loop only inside Query block. ([27637](https://github.com/WordPress/gutenberg/pull/27637))
+    -   Adjust mobile margins for the Query block's grid view. ([27619](https://github.com/WordPress/gutenberg/pull/27619))
+    -   Query block: Allow inheriting the global query arguments. ([27128](https://github.com/WordPress/gutenberg/pull/27128))
+-   FSE: Blocks
+    -   Add comment-form block styles. ([27673](https://github.com/WordPress/gutenberg/pull/27673))
+    -   Tag Cloud block: Adjust styles for the different block alignments. ([27342](https://github.com/WordPress/gutenberg/pull/27342))
+    -   Site Logo:
+        -   Remove line height. ([27623](https://github.com/WordPress/gutenberg/pull/27623))
+        -   Add a rounded block style. ([27621](https://github.com/WordPress/gutenberg/pull/27621))
+-   FSE: Infrastructure
+    -   Apply hover class in outline mode. ([27714](https://github.com/WordPress/gutenberg/pull/27714))
+    -   Update documentation to show how a theme can have FSE automatically enabled. ([27680](https://github.com/WordPress/gutenberg/pull/27680))
+    -   Make the inserter in the site editor behave as a popover. ([27502](https://github.com/WordPress/gutenberg/pull/27502))
+    -   Add an outline mode and use it both Site Editor and Template mode. ([27499](https://github.com/WordPress/gutenberg/pull/27499))
+    -   Load the block patterns in the site editor. ([27497](https://github.com/WordPress/gutenberg/pull/27497))
+    -   Move the templates prePersist logic to core-data. ([27464](https://github.com/WordPress/gutenberg/pull/27464))
+    -   Expand the multi-entity saving panel by default. ([27437](https://github.com/WordPress/gutenberg/pull/27437))
+    -   Reveal block boundaries on hover in the Site Editor. ([27271](https://github.com/WordPress/gutenberg/pull/27271))
+    -   Site Editor - add query args for current context. ([27124](https://github.com/WordPress/gutenberg/pull/27124))
+    -   Full Site Editing: Introduce a template editing mode inside the post editor. ([26355](https://github.com/WordPress/gutenberg/pull/26355))
+    -   Remove optimistic updates to solve the template revert issue ([27797](https://github.com/WordPress/gutenberg/pull/27797))
+-   FSE: Style System
+    -   Fix: Font Weight and Style don't work independently on global styles. ([27659](https://github.com/WordPress/gutenberg/pull/27659))
+    -   Add custom units in BoxControl. ([27626](https://github.com/WordPress/gutenberg/pull/27626))
+    -   Remove Font style, weight, decoration, and transform presets. ([27555](https://github.com/WordPress/gutenberg/pull/27555))
+    -   Make client preset metadata match server. ([27453](https://github.com/WordPress/gutenberg/pull/27453))
+    -   Do not pass selectors and supports information to the client. ([27449](https://github.com/WordPress/gutenberg/pull/27449))
+    -   Add border radius support. ([25791](https://github.com/WordPress/gutenberg/pull/25791))
+    -   Update font-weight names. ([27718](https://github.com/WordPress/gutenberg/pull/27718))
+    -   Update performance of global styles code ([27779](https://github.com/WordPress/gutenberg/pull/27779))
 
 ### Documentation
 
-- Add missing dependency to code example. ([27742](https://github.com/WordPress/gutenberg/pull/27742))
-- Precise that element ref returned by the hooks that return a ref can change between function or object. ([27610](https://github.com/WordPress/gutenberg/pull/27610))
-- Add escaping functions to code examples. ([27603](https://github.com/WordPress/gutenberg/pull/27603))
-- Add missing @wordpress/components/CHANGELOG.md entry. ([27576](https://github.com/WordPress/gutenberg/pull/27576))
-- Minor changes to release documentation for clarity. ([27571](https://github.com/WordPress/gutenberg/pull/27571))
-- Capitalize JavaScript in accordance with the word mark. ([27539](https://github.com/WordPress/gutenberg/pull/27539))
-- Fix typo in attributes.md. ([27440](https://github.com/WordPress/gutenberg/pull/27440))
-- Try: Update readme screenshot. ([27223](https://github.com/WordPress/gutenberg/pull/27223))
-- Document the useBlockWrapper hook in the block registration documentation. ([26592](https://github.com/WordPress/gutenberg/pull/26592))
-- Add a document explaining the different block API versions. ([26277](https://github.com/WordPress/gutenberg/pull/26277))
-- Update the registration examples to use apiVersion 2. ([26100](https://github.com/WordPress/gutenberg/pull/26100))
+-   Add missing dependency to code example. ([27742](https://github.com/WordPress/gutenberg/pull/27742))
+-   Precise that element ref returned by the hooks that return a ref can change between function or object. ([27610](https://github.com/WordPress/gutenberg/pull/27610))
+-   Add escaping functions to code examples. ([27603](https://github.com/WordPress/gutenberg/pull/27603))
+-   Add missing @wordpress/components/CHANGELOG.md entry. ([27576](https://github.com/WordPress/gutenberg/pull/27576))
+-   Minor changes to release documentation for clarity. ([27571](https://github.com/WordPress/gutenberg/pull/27571))
+-   Capitalize JavaScript in accordance with the word mark. ([27539](https://github.com/WordPress/gutenberg/pull/27539))
+-   Fix typo in attributes.md. ([27440](https://github.com/WordPress/gutenberg/pull/27440))
+-   Try: Update readme screenshot. ([27223](https://github.com/WordPress/gutenberg/pull/27223))
+-   Document the useBlockWrapper hook in the block registration documentation. ([26592](https://github.com/WordPress/gutenberg/pull/26592))
+-   Add a document explaining the different block API versions. ([26277](https://github.com/WordPress/gutenberg/pull/26277))
+-   Update the registration examples to use apiVersion 2. ([26100](https://github.com/WordPress/gutenberg/pull/26100))
 
 ### Code Quality
 
-- Remove: Missed unused weights and style translation code. ([27739](https://github.com/WordPress/gutenberg/pull/27739))
-- useDialog: Remove mousedown propagation stopping. ([27725](https://github.com/WordPress/gutenberg/pull/27725))
-- Try: Simplify focus return. ([27705](https://github.com/WordPress/gutenberg/pull/27705))
-- Popover/Modal: Remove and deprecate IsolatedEventContainer. ([27703](https://github.com/WordPress/gutenberg/pull/27703))
-- Popover: Use focus outside hook. ([27700](https://github.com/WordPress/gutenberg/pull/27700))
-- refactor: Tooltip component from classical to functional with hooks. ([27682](https://github.com/WordPress/gutenberg/pull/27682))
-- Template-part padding: Use variables. ([27679](https://github.com/WordPress/gutenberg/pull/27679))
-- Scope image block style variations to only the image block. ([27649](https://github.com/WordPress/gutenberg/pull/27649))
-- Refactor the EditorProvider component and extract hooks. ([27605](https://github.com/WordPress/gutenberg/pull/27605))
-- Use store definition instead of string for notices packages. ([27548](https://github.com/WordPress/gutenberg/pull/27548))
-- Merge RootContainer with BlockList. ([27531](https://github.com/WordPress/gutenberg/pull/27531))
-- Block wrapper: Isolate functionality into smaller hooks. ([27503](https://github.com/WordPress/gutenberg/pull/27503))
-- Writing flow: Consider events only from DOM descendents. ([27489](https://github.com/WordPress/gutenberg/pull/27489))
-- Writing flow: Isolate multi select focus element. ([27482](https://github.com/WordPress/gutenberg/pull/27482))
-- Multi selection: Move hook to WritingFlow with other multi selection logic. ([27479](https://github.com/WordPress/gutenberg/pull/27479))
-- Insertion indicator: Render after last block if none is specified. ([27472](https://github.com/WordPress/gutenberg/pull/27472))
-- Rewrite selection clearer in Block editor. ([27468](https://github.com/WordPress/gutenberg/pull/27468))
-- Move block focus listener to block props hook. ([27463](https://github.com/WordPress/gutenberg/pull/27463))
-- Block editor: Refactor effect.js to controls. ([27298](https://github.com/WordPress/gutenberg/pull/27298))
-- Animate: Type getAnimateClassName. ([27123](https://github.com/WordPress/gutenberg/pull/27123))
-- Refactor image block's image editing tools into separate components. ([27089](https://github.com/WordPress/gutenberg/pull/27089))
-- Drop zone provider: Option to avoid wrapper element. ([27079](https://github.com/WordPress/gutenberg/pull/27079))
-- Audit variables stylesheet. ([26827](https://github.com/WordPress/gutenberg/pull/26827))
-- group block padding: Use variables. ([27676](https://github.com/WordPress/gutenberg/pull/27676))
+-   Remove: Missed unused weights and style translation code. ([27739](https://github.com/WordPress/gutenberg/pull/27739))
+-   useDialog: Remove mousedown propagation stopping. ([27725](https://github.com/WordPress/gutenberg/pull/27725))
+-   Try: Simplify focus return. ([27705](https://github.com/WordPress/gutenberg/pull/27705))
+-   Popover/Modal: Remove and deprecate IsolatedEventContainer. ([27703](https://github.com/WordPress/gutenberg/pull/27703))
+-   Popover: Use focus outside hook. ([27700](https://github.com/WordPress/gutenberg/pull/27700))
+-   refactor: Tooltip component from classical to functional with hooks. ([27682](https://github.com/WordPress/gutenberg/pull/27682))
+-   Template-part padding: Use variables. ([27679](https://github.com/WordPress/gutenberg/pull/27679))
+-   Scope image block style variations to only the image block. ([27649](https://github.com/WordPress/gutenberg/pull/27649))
+-   Refactor the EditorProvider component and extract hooks. ([27605](https://github.com/WordPress/gutenberg/pull/27605))
+-   Use store definition instead of string for notices packages. ([27548](https://github.com/WordPress/gutenberg/pull/27548))
+-   Merge RootContainer with BlockList. ([27531](https://github.com/WordPress/gutenberg/pull/27531))
+-   Block wrapper: Isolate functionality into smaller hooks. ([27503](https://github.com/WordPress/gutenberg/pull/27503))
+-   Writing flow: Consider events only from DOM descendents. ([27489](https://github.com/WordPress/gutenberg/pull/27489))
+-   Writing flow: Isolate multi select focus element. ([27482](https://github.com/WordPress/gutenberg/pull/27482))
+-   Multi selection: Move hook to WritingFlow with other multi selection logic. ([27479](https://github.com/WordPress/gutenberg/pull/27479))
+-   Insertion indicator: Render after last block if none is specified. ([27472](https://github.com/WordPress/gutenberg/pull/27472))
+-   Rewrite selection clearer in Block editor. ([27468](https://github.com/WordPress/gutenberg/pull/27468))
+-   Move block focus listener to block props hook. ([27463](https://github.com/WordPress/gutenberg/pull/27463))
+-   Block editor: Refactor effect.js to controls. ([27298](https://github.com/WordPress/gutenberg/pull/27298))
+-   Animate: Type getAnimateClassName. ([27123](https://github.com/WordPress/gutenberg/pull/27123))
+-   Refactor image block's image editing tools into separate components. ([27089](https://github.com/WordPress/gutenberg/pull/27089))
+-   Drop zone provider: Option to avoid wrapper element. ([27079](https://github.com/WordPress/gutenberg/pull/27079))
+-   Audit variables stylesheet. ([26827](https://github.com/WordPress/gutenberg/pull/26827))
+-   group block padding: Use variables. ([27676](https://github.com/WordPress/gutenberg/pull/27676))
 
 ### Tools
 
-- Release script: Set draft status, and only remove after uploading asset. ([27713](https://github.com/WordPress/gutenberg/pull/27713))
-- CI: Run date test timezone and locale variations using bash script. ([27600](https://github.com/WordPress/gutenberg/pull/27600))
-- Upgrade Babel packages to 7.12.x. ([27553](https://github.com/WordPress/gutenberg/pull/27553))
-- CI: Run package/date unit tests in different timezones. ([27552](https://github.com/WordPress/gutenberg/pull/27552))
-- Avoid cancelling other end-to-end test jobs when one fails. ([27541](https://github.com/WordPress/gutenberg/pull/27541))
-- Add webpack 5 support to dependency-extraction-webpack-plugin. ([27533](https://github.com/WordPress/gutenberg/pull/27533))
-- Add GitHub support document. ([27524](https://github.com/WordPress/gutenberg/pull/27524))
-- Stabilize adding blocks end to end test. ([27493](https://github.com/WordPress/gutenberg/pull/27493))
-- GitHub Actions: Use a build matrix for the end-to-end tests GH action. ([27487](https://github.com/WordPress/gutenberg/pull/27487))
-- Packages: Make it possible to select minimum version bump for publishing. ([27459](https://github.com/WordPress/gutenberg/pull/27459))
-- Upgrade wp-prettier to 2.2.1. ([27441](https://github.com/WordPress/gutenberg/pull/27441))
-- Testing: Make image size test more stable. ([27439](https://github.com/WordPress/gutenberg/pull/27439))
-- Packages: Improve the script that automates version bumps. ([27436](https://github.com/WordPress/gutenberg/pull/27436))
-- CI: Update bundle size workflow to use the latest version. ([27435](https://github.com/WordPress/gutenberg/pull/27435))
-- wp-env: Xdebug support. ([27346](https://github.com/WordPress/gutenberg/pull/27346))
-- Make zip-based URL parsing more general. ([27019](https://github.com/WordPress/gutenberg/pull/27019))
-- Add inserter performance measures. ([26634](https://github.com/WordPress/gutenberg/pull/26634))
+-   Release script: Set draft status, and only remove after uploading asset. ([27713](https://github.com/WordPress/gutenberg/pull/27713))
+-   CI: Run date test timezone and locale variations using bash script. ([27600](https://github.com/WordPress/gutenberg/pull/27600))
+-   Upgrade Babel packages to 7.12.x. ([27553](https://github.com/WordPress/gutenberg/pull/27553))
+-   CI: Run package/date unit tests in different timezones. ([27552](https://github.com/WordPress/gutenberg/pull/27552))
+-   Avoid cancelling other end-to-end test jobs when one fails. ([27541](https://github.com/WordPress/gutenberg/pull/27541))
+-   Add webpack 5 support to dependency-extraction-webpack-plugin. ([27533](https://github.com/WordPress/gutenberg/pull/27533))
+-   Add GitHub support document. ([27524](https://github.com/WordPress/gutenberg/pull/27524))
+-   Stabilize adding blocks end to end test. ([27493](https://github.com/WordPress/gutenberg/pull/27493))
+-   GitHub Actions: Use a build matrix for the end-to-end tests GH action. ([27487](https://github.com/WordPress/gutenberg/pull/27487))
+-   Packages: Make it possible to select minimum version bump for publishing. ([27459](https://github.com/WordPress/gutenberg/pull/27459))
+-   Upgrade wp-prettier to 2.2.1. ([27441](https://github.com/WordPress/gutenberg/pull/27441))
+-   Testing: Make image size test more stable. ([27439](https://github.com/WordPress/gutenberg/pull/27439))
+-   Packages: Improve the script that automates version bumps. ([27436](https://github.com/WordPress/gutenberg/pull/27436))
+-   CI: Update bundle size workflow to use the latest version. ([27435](https://github.com/WordPress/gutenberg/pull/27435))
+-   wp-env: Xdebug support. ([27346](https://github.com/WordPress/gutenberg/pull/27346))
+-   Make zip-based URL parsing more general. ([27019](https://github.com/WordPress/gutenberg/pull/27019))
+-   Add inserter performance measures. ([26634](https://github.com/WordPress/gutenberg/pull/26634))
 
 ### Various
 
-- Verse Block:
-  - Add support for custom padding. ([27341](https://github.com/WordPress/gutenberg/pull/27341))
-  - Add support for font family. ([27332](https://github.com/WordPress/gutenberg/pull/27332))
-  - Add support for font size. ([27735](https://github.com/WordPress/gutenberg/pull/27735))
-  - Update CSS for frontend and editor. ([27734](https://github.com/WordPress/gutenberg/pull/27734))
-- Popover: Use a11y hooks instead of HoCs. ([27707](https://github.com/WordPress/gutenberg/pull/27707))
-- Refactor focus on mount. ([27699](https://github.com/WordPress/gutenberg/pull/27699))
-- Search block: Use em values for padding. ([27678](https://github.com/WordPress/gutenberg/pull/27678))
-- Button: Is-busy state candybar animation fixed. ([27592](https://github.com/WordPress/gutenberg/pull/27592))
-- Preformatted block: Add support for font sizes. ([27584](https://github.com/WordPress/gutenberg/pull/27584))
-- Remove autoFocus prop from URLInput and from the inserter search form. ([27578](https://github.com/WordPress/gutenberg/pull/27578))
-- Package lock: Update ws. ([27532](https://github.com/WordPress/gutenberg/pull/27532))
-- Update block-patterns.md. ([27520](https://github.com/WordPress/gutenberg/pull/27520))
-- Update wp-env codeowners. ([27491](https://github.com/WordPress/gutenberg/pull/27491))
-- Update the backup icon to better align with WordPress icon package dna. ([27465](https://github.com/WordPress/gutenberg/pull/27465))
-- Update the rich text control titles to sentence case structure. ([27447](https://github.com/WordPress/gutenberg/pull/27447))
-- Search Block: Remove the button only option from the UI. ([27379](https://github.com/WordPress/gutenberg/pull/27379))
-- Add icons for template parts. ([27378](https://github.com/WordPress/gutenberg/pull/27378))
-- Increase radio dimensions to match checkboxes. ([27377](https://github.com/WordPress/gutenberg/pull/27377))
-- Adjusts settings modal height to 90%. ([27362](https://github.com/WordPress/gutenberg/pull/27362))
-- Change the Labels of the Vertical Align options. ([27356](https://github.com/WordPress/gutenberg/pull/27356))
-- Add element selector to template-part block. ([27101](https://github.com/WordPress/gutenberg/pull/27101))
-- Add explicit dismiss button and on dismiss callback to snackbar. ([26952](https://github.com/WordPress/gutenberg/pull/26952))
-- Make social list block align right able on published page & preview. ([26861](https://github.com/WordPress/gutenberg/pull/26861))
-- Update media-text focalPoint conditional rendering. ([25968](https://github.com/WordPress/gutenberg/pull/25968))
-- Remove default icon from PluginBlockSettingsMenuItem. ([21392](https://github.com/WordPress/gutenberg/pull/21392))
-- Add example preview to video block. ([20703](https://github.com/WordPress/gutenberg/pull/20703))
-
+-   Verse Block:
+    -   Add support for custom padding. ([27341](https://github.com/WordPress/gutenberg/pull/27341))
+    -   Add support for font family. ([27332](https://github.com/WordPress/gutenberg/pull/27332))
+    -   Add support for font size. ([27735](https://github.com/WordPress/gutenberg/pull/27735))
+    -   Update CSS for frontend and editor. ([27734](https://github.com/WordPress/gutenberg/pull/27734))
+-   Popover: Use a11y hooks instead of HoCs. ([27707](https://github.com/WordPress/gutenberg/pull/27707))
+-   Refactor focus on mount. ([27699](https://github.com/WordPress/gutenberg/pull/27699))
+-   Search block: Use em values for padding. ([27678](https://github.com/WordPress/gutenberg/pull/27678))
+-   Button: Is-busy state candybar animation fixed. ([27592](https://github.com/WordPress/gutenberg/pull/27592))
+-   Preformatted block: Add support for font sizes. ([27584](https://github.com/WordPress/gutenberg/pull/27584))
+-   Remove autoFocus prop from URLInput and from the inserter search form. ([27578](https://github.com/WordPress/gutenberg/pull/27578))
+-   Package lock: Update ws. ([27532](https://github.com/WordPress/gutenberg/pull/27532))
+-   Update block-patterns.md. ([27520](https://github.com/WordPress/gutenberg/pull/27520))
+-   Update wp-env codeowners. ([27491](https://github.com/WordPress/gutenberg/pull/27491))
+-   Update the backup icon to better align with WordPress icon package dna. ([27465](https://github.com/WordPress/gutenberg/pull/27465))
+-   Update the rich text control titles to sentence case structure. ([27447](https://github.com/WordPress/gutenberg/pull/27447))
+-   Search Block: Remove the button only option from the UI. ([27379](https://github.com/WordPress/gutenberg/pull/27379))
+-   Add icons for template parts. ([27378](https://github.com/WordPress/gutenberg/pull/27378))
+-   Increase radio dimensions to match checkboxes. ([27377](https://github.com/WordPress/gutenberg/pull/27377))
+-   Adjusts settings modal height to 90%. ([27362](https://github.com/WordPress/gutenberg/pull/27362))
+-   Change the Labels of the Vertical Align options. ([27356](https://github.com/WordPress/gutenberg/pull/27356))
+-   Add element selector to template-part block. ([27101](https://github.com/WordPress/gutenberg/pull/27101))
+-   Add explicit dismiss button and on dismiss callback to snackbar. ([26952](https://github.com/WordPress/gutenberg/pull/26952))
+-   Make social list block align right able on published page & preview. ([26861](https://github.com/WordPress/gutenberg/pull/26861))
+-   Update media-text focalPoint conditional rendering. ([25968](https://github.com/WordPress/gutenberg/pull/25968))
+-   Remove default icon from PluginBlockSettingsMenuItem. ([21392](https://github.com/WordPress/gutenberg/pull/21392))
+-   Add example preview to video block. ([20703](https://github.com/WordPress/gutenberg/pull/20703))
 
 = 9.5.2 =
 
-### Bug Fixes:
+## Changelog
 
-- Fix uncaught error with a custom generic store without a unsubscribe function in useSelect.
+### Bug Fixes:
 
+-   Fix uncaught error with a custom generic store without a unsubscribe function in useSelect.
 
 = 9.5.1 =
 
-### Bug Fixes:
+## Changelog
 
- - Revert date changes from branch 'replace-moment.
- - Popover: Fix issue with undefined getBoundingClientRect.
- - Fallback to regular subscribe if the store doesn't exist in useSelect.
+### Bug Fixes:
 
+-   Revert date changes from branch 'replace-moment.
+-   Popover: Fix issue with undefined getBoundingClientRect.
+-   Fallback to regular subscribe if the store doesn't exist in useSelect.
 
 = 9.5.0 =
 
+## Changelog
+
 ### Features
-- Full Height Alignment control: Implementation and Cover block integration. ([26615](https://github.com/WordPress/gutenberg/pull/26615))
-- Code block: Add support for font sizes. ([27294](https://github.com/WordPress/gutenberg/pull/27294))
+
+-   Full Height Alignment control: Implementation and Cover block integration. ([26615](https://github.com/WordPress/gutenberg/pull/26615))
+-   Code block: Add support for font sizes. ([27294](https://github.com/WordPress/gutenberg/pull/27294))
 
 ### Enhancements
 
-- Improve block patterns preview in the Inserter. ([27204](https://github.com/WordPress/gutenberg/pull/27204))
-- Enhance social links placeholder to look more like the end result. ([26953](https://github.com/WordPress/gutenberg/pull/26953))
-- Add labels to image zoom control. ([24574](https://github.com/WordPress/gutenberg/pull/24574))
+-   Improve block patterns preview in the Inserter. ([27204](https://github.com/WordPress/gutenberg/pull/27204))
+-   Enhance social links placeholder to look more like the end result. ([26953](https://github.com/WordPress/gutenberg/pull/26953))
+-   Add labels to image zoom control. ([24574](https://github.com/WordPress/gutenberg/pull/24574))
 
 ### New APIs
 
-- Data: Use store instance as param for select and dispatch. ([26655](https://github.com/WordPress/gutenberg/pull/26655))
-- Adds instance URL to wp-env start. ([27282](https://github.com/WordPress/gutenberg/pull/27282))
-
-### Bug Fixes
-
-- Fix crash when null date passed to TimePicker. ([27316](https://github.com/WordPress/gutenberg/pull/27316))
-- Add backward compatibility support for lightBlockWrapper in getSaveElement. ([27189](https://github.com/WordPress/gutenberg/pull/27189))
-- Restore the gray background in Post Editor. ([27188](https://github.com/WordPress/gutenberg/pull/27188))
-- Font size picker bug that adds px units to empty string values. ([27111](https://github.com/WordPress/gutenberg/pull/27111))
-- Font size unit back-compatibility does not executes on post edit. ([27106](https://github.com/WordPress/gutenberg/pull/27106))
-- Drop zone: Fix infinite loop in some contexts. ([27090](https://github.com/WordPress/gutenberg/pull/27090))
-- Interface regions: Fix focus style (on click). ([27074](https://github.com/WordPress/gutenberg/pull/27074))
-- Fix Separator editor styles. ([27071](https://github.com/WordPress/gutenberg/pull/27071))
-- Fix custom spacing support. ([27045](https://github.com/WordPress/gutenberg/pull/27045))
-- Fix jest process hanging. ([27008](https://github.com/WordPress/gutenberg/pull/27008))
-- Fix combobox suggestion list closure when clicking scrollbar. ([27367](https://github.com/WordPress/gutenberg/pull/27367))
-- Constrain tabbing to the popover in media replace flow. ([26939](https://github.com/WordPress/gutenberg/pull/26939))
-- Fix RangeControl mark placement and cursor styles. ([26745](https://github.com/WordPress/gutenberg/pull/26745))
-- New authors dropdown breaks author selection for editors. ([26554](https://github.com/WordPress/gutenberg/pull/26554))
-- Hooks: Use own instance's `doAction` for built-in hooks. ([26498](https://github.com/WordPress/gutenberg/pull/26498))
-- Inserter: Show preview in search results. ([27193](https://github.com/WordPress/gutenberg/pull/27193))
-- Gallery block:
-  - Fix duplicate css class. ([27311](https://github.com/WordPress/gutenberg/pull/27311))
-  - Adds back in icon and title for gallery block. ([27293](https://github.com/WordPress/gutenberg/pull/27293))
-- Search block: Fix icon strokeWidth properties. ([27308](https://github.com/WordPress/gutenberg/pull/27308))
-- Image block:
-  - Fix the zoom slider width. ([27285](https://github.com/WordPress/gutenberg/pull/27285))
-  - Fix double paste from clipboard. ([27199](https://github.com/WordPress/gutenberg/pull/27199))
-  - Hide some controls on multi selection of Image blocks. ([27105](https://github.com/WordPress/gutenberg/pull/27105))
-- Columns: Align single half width column to left. ([27142](https://github.com/WordPress/gutenberg/pull/27142))
+-   Data: Use store instance as param for select and dispatch. ([26655](https://github.com/WordPress/gutenberg/pull/26655))
+-   Adds instance URL to wp-env start. ([27282](https://github.com/WordPress/gutenberg/pull/27282))
+
+### Bug Fixes
+
+-   Fix crash when null date passed to TimePicker. ([27316](https://github.com/WordPress/gutenberg/pull/27316))
+-   Add backward compatibility support for lightBlockWrapper in getSaveElement. ([27189](https://github.com/WordPress/gutenberg/pull/27189))
+-   Restore the gray background in Post Editor. ([27188](https://github.com/WordPress/gutenberg/pull/27188))
+-   Font size picker bug that adds px units to empty string values. ([27111](https://github.com/WordPress/gutenberg/pull/27111))
+-   Font size unit back-compatibility does not executes on post edit. ([27106](https://github.com/WordPress/gutenberg/pull/27106))
+-   Drop zone: Fix infinite loop in some contexts. ([27090](https://github.com/WordPress/gutenberg/pull/27090))
+-   Interface regions: Fix focus style (on click). ([27074](https://github.com/WordPress/gutenberg/pull/27074))
+-   Fix Separator editor styles. ([27071](https://github.com/WordPress/gutenberg/pull/27071))
+-   Fix custom spacing support. ([27045](https://github.com/WordPress/gutenberg/pull/27045))
+-   Fix jest process hanging. ([27008](https://github.com/WordPress/gutenberg/pull/27008))
+-   Fix combobox suggestion list closure when clicking scrollbar. ([27367](https://github.com/WordPress/gutenberg/pull/27367))
+-   Constrain tabbing to the popover in media replace flow. ([26939](https://github.com/WordPress/gutenberg/pull/26939))
+-   Fix RangeControl mark placement and cursor styles. ([26745](https://github.com/WordPress/gutenberg/pull/26745))
+-   New authors dropdown breaks author selection for editors. ([26554](https://github.com/WordPress/gutenberg/pull/26554))
+-   Hooks: Use own instance's `doAction` for built-in hooks. ([26498](https://github.com/WordPress/gutenberg/pull/26498))
+-   Inserter: Show preview in search results. ([27193](https://github.com/WordPress/gutenberg/pull/27193))
+-   Gallery block:
+    -   Fix duplicate css class. ([27311](https://github.com/WordPress/gutenberg/pull/27311))
+    -   Adds back in icon and title for gallery block. ([27293](https://github.com/WordPress/gutenberg/pull/27293))
+-   Search block: Fix icon strokeWidth properties. ([27308](https://github.com/WordPress/gutenberg/pull/27308))
+-   Image block:
+    -   Fix the zoom slider width. ([27285](https://github.com/WordPress/gutenberg/pull/27285))
+    -   Fix double paste from clipboard. ([27199](https://github.com/WordPress/gutenberg/pull/27199))
+    -   Hide some controls on multi selection of Image blocks. ([27105](https://github.com/WordPress/gutenberg/pull/27105))
+-   Columns: Align single half width column to left. ([27142](https://github.com/WordPress/gutenberg/pull/27142))
 
 ### Performance
 
-- Minimize the calls in useSelect by subscribing to only the stores needed. ([26724](https://github.com/WordPress/gutenberg/pull/26724))
-- Update prefer lang constructs to functions. ([27070](https://github.com/WordPress/gutenberg/pull/27070))
+-   Minimize the calls in useSelect by subscribing to only the stores needed. ([26724](https://github.com/WordPress/gutenberg/pull/26724))
+-   Update prefer lang constructs to functions. ([27070](https://github.com/WordPress/gutenberg/pull/27070))
 
 ### Experiments
 
-- Full Site Editing Framework:
-  - Fix template resolution priorities. ([27303](https://github.com/WordPress/gutenberg/pull/27303))
-  - Update default templates. ([26941](https://github.com/WordPress/gutenberg/pull/26941))
-  - Add Support for Templates Default and Custom Titles and Descriptions (JS side - [27038](https://github.com/WordPress/gutenberg/pull/27038), PHP side [27036](https://github.com/WordPress/gutenberg/pull/27036))
-  - Add theme taxonomy to templates and template parts. ([27016](https://github.com/WordPress/gutenberg/pull/27016))
-- Full Site Editing Blocks:
-  - Make the post title block editable. ([27240](https://github.com/WordPress/gutenberg/pull/27240))
-  - Post Comment: Update placeholder. ([27013](https://github.com/WordPress/gutenberg/pull/27013))
-  - Enable Post Featured Image to be set and replaced. ([27224](https://github.com/WordPress/gutenberg/pull/27224))
-  - Add alignment controls to Post Featured Image block. ([27076](https://github.com/WordPress/gutenberg/pull/27076))
-  - Query block:
-    - Add grid view. ([27067](https://github.com/WordPress/gutenberg/pull/27067))
-    - Add Posts List variation. ([26990](https://github.com/WordPress/gutenberg/pull/26990))
-    - New settings icon in block toolbar. ([27057](https://github.com/WordPress/gutenberg/pull/27057))
-    - Fetch all available post types (#27049). ([27056](https://github.com/WordPress/gutenberg/pull/27056))
-    - Update Query block's icon. ([27048](https://github.com/WordPress/gutenberg/pull/27048))
-    - Query and QueryLoop use useInnerBlocksProps. ([27014](https://github.com/WordPress/gutenberg/pull/27014))
-
-- Site Editor:
-  - Avoid throwing warnings if there are no terms for a template or template part. ([27210](https://github.com/WordPress/gutenberg/pull/27210))
-  - Replace adminbar customize link with site-editor in FSE themes. ([27135](https://github.com/WordPress/gutenberg/pull/27135))
-  - Update the new templates dropdown list. ([27235](https://github.com/WordPress/gutenberg/pull/27235))
-  - Remove .block-editor selector dependency. ([27063](https://github.com/WordPress/gutenberg/pull/27063))
-  - Remove unused FullscreenModeClose component. ([26997](https://github.com/WordPress/gutenberg/pull/26997))
-  - Navigation:
-    - Fix item color and padding. ([27096](https://github.com/WordPress/gutenberg/pull/27096))
-    - Hide empty menus. ([27141](https://github.com/WordPress/gutenberg/pull/27141))
-    - Add isText prop to NavigationItem. ([27003](https://github.com/WordPress/gutenberg/pull/27003))
-    - Handle the no search results state. ([27160](https://github.com/WordPress/gutenberg/pull/27160))
-    - Add search to templates and template parts. ([26665](https://github.com/WordPress/gutenberg/pull/26665))
-    - Hide navigation item if target menu is empty. ([25746](https://github.com/WordPress/gutenberg/pull/25746))
-- Global Styles:
-  - Sort Global Styles block panels by panel title. ([27163](https://github.com/WordPress/gutenberg/pull/27163))
-  - Font Appearance should be enabled globally. ([27150](https://github.com/WordPress/gutenberg/pull/27150))
-  - Restrict edition of theme colors by users. ([27250](https://github.com/WordPress/gutenberg/pull/27250))
-  - Update mechanism that resolves Global Styles data. ([27237](https://github.com/WordPress/gutenberg/pull/27237))
-  - Include px units on default font sizes defined on theme.json. ([27083](https://github.com/WordPress/gutenberg/pull/27083))
-  - Update stylesheet generation at edit site. ([27065](https://github.com/WordPress/gutenberg/pull/27065))
-  - Add button to reset color palette. ([26975](https://github.com/WordPress/gutenberg/pull/26975))
-  - Abstract preset variable retrieving and setting. ([26970](https://github.com/WordPress/gutenberg/pull/26970))
-  - Update metadata and add support for padding. ([27099](https://github.com/WordPress/gutenberg/pull/27099))
-- Templates and Template Parts wp-admin lists:
-  - Update the template parts admin list with new columns and views. ([27156](https://github.com/WordPress/gutenberg/pull/27156))
-  - Add the theme source to the templates wp-admin list. ([27108](https://github.com/WordPress/gutenberg/pull/27108))
-  - Extend the wp_template admin list with new views and columns. ([27034](https://github.com/WordPress/gutenberg/pull/27034))
-
-- Support registry inheritance with atomic stores. ([27162](https://github.com/WordPress/gutenberg/pull/27162))
-- Code block: Paste plain text. ([27236](https://github.com/WordPress/gutenberg/pull/27236))
-- Generalize the atom family concept as an atom selector concept instead. ([27147](https://github.com/WordPress/gutenberg/pull/27147))
-- Bugs:
-  - Query block: Fix dirtying post on load. ([27323](https://github.com/WordPress/gutenberg/pull/27323))
-  - Preserve 'Your homepage displays' settings when updating the 'general' settings. ([27206](https://github.com/WordPress/gutenberg/pull/27206))
-  - Make sure templates and parts queries filter by tax_query. ([27113](https://github.com/WordPress/gutenberg/pull/27113))
-  - Fix Template Part Not Found message on Windows server. ([26772](https://github.com/WordPress/gutenberg/pull/26772))
-  - Respect filtered settings when they're ported to theme.json format. ([27010](https://github.com/WordPress/gutenberg/pull/27010))
-  - Preset controls need the preset CSS variables in scope. ([27119](https://github.com/WordPress/gutenberg/pull/27119))
-  - Site Editor:
-    - Show document title on small screens with nav sidebar open. ([27051](https://github.com/WordPress/gutenberg/pull/27051))
-    - Fix block toolbar positioning. ([27266](https://github.com/WordPress/gutenberg/pull/27266))
-    - Fix app header on small-medium screens. ([27310](https://github.com/WordPress/gutenberg/pull/27310))
+-   Full Site Editing Framework:
+    -   Fix template resolution priorities. ([27303](https://github.com/WordPress/gutenberg/pull/27303))
+    -   Update default templates. ([26941](https://github.com/WordPress/gutenberg/pull/26941))
+    -   Add Support for Templates Default and Custom Titles and Descriptions (JS side - [27038](https://github.com/WordPress/gutenberg/pull/27038), PHP side [27036](https://github.com/WordPress/gutenberg/pull/27036))
+    -   Add theme taxonomy to templates and template parts. ([27016](https://github.com/WordPress/gutenberg/pull/27016))
+-   Full Site Editing Blocks:
+
+    -   Make the post title block editable. ([27240](https://github.com/WordPress/gutenberg/pull/27240))
+    -   Post Comment: Update placeholder. ([27013](https://github.com/WordPress/gutenberg/pull/27013))
+    -   Enable Post Featured Image to be set and replaced. ([27224](https://github.com/WordPress/gutenberg/pull/27224))
+    -   Add alignment controls to Post Featured Image block. ([27076](https://github.com/WordPress/gutenberg/pull/27076))
+    -   Query block:
+        -   Add grid view. ([27067](https://github.com/WordPress/gutenberg/pull/27067))
+        -   Add Posts List variation. ([26990](https://github.com/WordPress/gutenberg/pull/26990))
+        -   New settings icon in block toolbar. ([27057](https://github.com/WordPress/gutenberg/pull/27057))
+        -   Fetch all available post types (#27049). ([27056](https://github.com/WordPress/gutenberg/pull/27056))
+        -   Update Query block's icon. ([27048](https://github.com/WordPress/gutenberg/pull/27048))
+        -   Query and QueryLoop use useInnerBlocksProps. ([27014](https://github.com/WordPress/gutenberg/pull/27014))
+
+-   Site Editor:
+    -   Avoid throwing warnings if there are no terms for a template or template part. ([27210](https://github.com/WordPress/gutenberg/pull/27210))
+    -   Replace adminbar customize link with site-editor in FSE themes. ([27135](https://github.com/WordPress/gutenberg/pull/27135))
+    -   Update the new templates dropdown list. ([27235](https://github.com/WordPress/gutenberg/pull/27235))
+    -   Remove .block-editor selector dependency. ([27063](https://github.com/WordPress/gutenberg/pull/27063))
+    -   Remove unused FullscreenModeClose component. ([26997](https://github.com/WordPress/gutenberg/pull/26997))
+    -   Navigation:
+        -   Fix item color and padding. ([27096](https://github.com/WordPress/gutenberg/pull/27096))
+        -   Hide empty menus. ([27141](https://github.com/WordPress/gutenberg/pull/27141))
+        -   Add isText prop to NavigationItem. ([27003](https://github.com/WordPress/gutenberg/pull/27003))
+        -   Handle the no search results state. ([27160](https://github.com/WordPress/gutenberg/pull/27160))
+        -   Add search to templates and template parts. ([26665](https://github.com/WordPress/gutenberg/pull/26665))
+        -   Hide navigation item if target menu is empty. ([25746](https://github.com/WordPress/gutenberg/pull/25746))
+-   Global Styles:
+    -   Sort Global Styles block panels by panel title. ([27163](https://github.com/WordPress/gutenberg/pull/27163))
+    -   Font Appearance should be enabled globally. ([27150](https://github.com/WordPress/gutenberg/pull/27150))
+    -   Restrict edition of theme colors by users. ([27250](https://github.com/WordPress/gutenberg/pull/27250))
+    -   Update mechanism that resolves Global Styles data. ([27237](https://github.com/WordPress/gutenberg/pull/27237))
+    -   Include px units on default font sizes defined on theme.json. ([27083](https://github.com/WordPress/gutenberg/pull/27083))
+    -   Update stylesheet generation at edit site. ([27065](https://github.com/WordPress/gutenberg/pull/27065))
+    -   Add button to reset color palette. ([26975](https://github.com/WordPress/gutenberg/pull/26975))
+    -   Abstract preset variable retrieving and setting. ([26970](https://github.com/WordPress/gutenberg/pull/26970))
+    -   Update metadata and add support for padding. ([27099](https://github.com/WordPress/gutenberg/pull/27099))
+-   Templates and Template Parts wp-admin lists:
+
+    -   Update the template parts admin list with new columns and views. ([27156](https://github.com/WordPress/gutenberg/pull/27156))
+    -   Add the theme source to the templates wp-admin list. ([27108](https://github.com/WordPress/gutenberg/pull/27108))
+    -   Extend the wp_template admin list with new views and columns. ([27034](https://github.com/WordPress/gutenberg/pull/27034))
+
+-   Support registry inheritance with atomic stores. ([27162](https://github.com/WordPress/gutenberg/pull/27162))
+-   Code block: Paste plain text. ([27236](https://github.com/WordPress/gutenberg/pull/27236))
+-   Generalize the atom family concept as an atom selector concept instead. ([27147](https://github.com/WordPress/gutenberg/pull/27147))
+-   Bugs:
+    -   Query block: Fix dirtying post on load. ([27323](https://github.com/WordPress/gutenberg/pull/27323))
+    -   Preserve 'Your homepage displays' settings when updating the 'general' settings. ([27206](https://github.com/WordPress/gutenberg/pull/27206))
+    -   Make sure templates and parts queries filter by tax_query. ([27113](https://github.com/WordPress/gutenberg/pull/27113))
+    -   Fix Template Part Not Found message on Windows server. ([26772](https://github.com/WordPress/gutenberg/pull/26772))
+    -   Respect filtered settings when they're ported to theme.json format. ([27010](https://github.com/WordPress/gutenberg/pull/27010))
+    -   Preset controls need the preset CSS variables in scope. ([27119](https://github.com/WordPress/gutenberg/pull/27119))
+    -   Site Editor:
+        -   Show document title on small screens with nav sidebar open. ([27051](https://github.com/WordPress/gutenberg/pull/27051))
+        -   Fix block toolbar positioning. ([27266](https://github.com/WordPress/gutenberg/pull/27266))
+        -   Fix app header on small-medium screens. ([27310](https://github.com/WordPress/gutenberg/pull/27310))
 
 ### Documentation
 
-- Expand on the Deprecations documentation. ([27286](https://github.com/WordPress/gutenberg/pull/27286))
-- Publish MainDashboardButton documentation to handbook. ([27317](https://github.com/WordPress/gutenberg/pull/27317))
-- Update: Creating a block-based theme tutorial. ([27257](https://github.com/WordPress/gutenberg/pull/27257))
-- ESLint Plugin: Include a note about the minimum version required. ([27203](https://github.com/WordPress/gutenberg/pull/27203))
-- Docs: Update `@wordpress/data` README with API changes. ([27180](https://github.com/WordPress/gutenberg/pull/27180))
-- Data: Improve documentation for new API added around stores. ([27061](https://github.com/WordPress/gutenberg/pull/27061))
-- wp-env: Improve documentation for "run" command. ([27053](https://github.com/WordPress/gutenberg/pull/27053))
-- Code block: Update the documentation. ([27333](https://github.com/WordPress/gutenberg/pull/27333))
-- Add block toolbar component readme. ([25245](https://github.com/WordPress/gutenberg/pull/25245))
-- Add block patterns list component readme. ([24983](https://github.com/WordPress/gutenberg/pull/24983))
-- [Contributors docs] JS meetings were shifted to 15:00GMT. ([27047](https://github.com/WordPress/gutenberg/pull/27047))
-- Typos and tweaks: ([27120](https://github.com/WordPress/gutenberg/pull/27120), [27081](https://github.com/WordPress/gutenberg/pull/27081), [27062](https://github.com/WordPress/gutenberg/pull/27062), [27060](https://github.com/WordPress/gutenberg/pull/27060), [27039](https://github.com/WordPress/gutenberg/pull/27039), [27153](https://github.com/WordPress/gutenberg/pull/27153))
+-   Expand on the Deprecations documentation. ([27286](https://github.com/WordPress/gutenberg/pull/27286))
+-   Publish MainDashboardButton documentation to handbook. ([27317](https://github.com/WordPress/gutenberg/pull/27317))
+-   Update: Creating a block-based theme tutorial. ([27257](https://github.com/WordPress/gutenberg/pull/27257))
+-   ESLint Plugin: Include a note about the minimum version required. ([27203](https://github.com/WordPress/gutenberg/pull/27203))
+-   Docs: Update `@wordpress/data` README with API changes. ([27180](https://github.com/WordPress/gutenberg/pull/27180))
+-   Data: Improve documentation for new API added around stores. ([27061](https://github.com/WordPress/gutenberg/pull/27061))
+-   wp-env: Improve documentation for "run" command. ([27053](https://github.com/WordPress/gutenberg/pull/27053))
+-   Code block: Update the documentation. ([27333](https://github.com/WordPress/gutenberg/pull/27333))
+-   Add block toolbar component readme. ([25245](https://github.com/WordPress/gutenberg/pull/25245))
+-   Add block patterns list component readme. ([24983](https://github.com/WordPress/gutenberg/pull/24983))
+-   [Contributors docs] JS meetings were shifted to 15:00GMT. ([27047](https://github.com/WordPress/gutenberg/pull/27047))
+-   Typos and tweaks: ([27120](https://github.com/WordPress/gutenberg/pull/27120), [27081](https://github.com/WordPress/gutenberg/pull/27081), [27062](https://github.com/WordPress/gutenberg/pull/27062), [27060](https://github.com/WordPress/gutenberg/pull/27060), [27039](https://github.com/WordPress/gutenberg/pull/27039), [27153](https://github.com/WordPress/gutenberg/pull/27153))
 
 ### Code Quality
-- Replace store name string with exposed store definition:
-   - Edit Navigation ([27182](https://github.com/WordPress/gutenberg/pull/27182), [27281](https://github.com/WordPress/gutenberg/pull/27281))
-   - Blocks ([27336](https://github.com/WordPress/gutenberg/pull/27336))
-   - Reusable Blocks ([27094](https://github.com/WordPress/gutenberg/pull/27094))
-   - Block Directory ([27178](https://github.com/WordPress/gutenberg/pull/27178))
-   - Keyboard Shortcuts ([27355](https://github.com/WordPress/gutenberg/pull/27355))
-- Search block: Remove invalid prop which was causing a React warning. ([27306](https://github.com/WordPress/gutenberg/pull/27306))
-- Refactor click redirect to avoid trailing div. ([27253](https://github.com/WordPress/gutenberg/pull/27253))
-
-- Editor styles: Convert to hook. ([27080](https://github.com/WordPress/gutenberg/pull/27080))
-- Add: PHP util function equivalent to lodash set. ([27077](https://github.com/WordPress/gutenberg/pull/27077))
-- Interface: Remove regions wrapper div. ([27066](https://github.com/WordPress/gutenberg/pull/27066))
-- Refactor typing observer. ([27043](https://github.com/WordPress/gutenberg/pull/27043))
-- Visual editor: Remove 4 wrapper divs. ([27035](https://github.com/WordPress/gutenberg/pull/27035))
-- Insertion point: Avoid wrapper div. ([26994](https://github.com/WordPress/gutenberg/pull/26994))
-- Typewriter: Rewrite with hooks. ([26986](https://github.com/WordPress/gutenberg/pull/26986))
-- Deprecate the withGlobalEvents HoC. ([26749](https://github.com/WordPress/gutenberg/pull/26749))
-- Edit Post: Refactor effects to action generators. ([27069](https://github.com/WordPress/gutenberg/pull/27069))
+
+-   Replace store name string with exposed store definition:
+    -   Edit Navigation ([27182](https://github.com/WordPress/gutenberg/pull/27182), [27281](https://github.com/WordPress/gutenberg/pull/27281))
+    -   Blocks ([27336](https://github.com/WordPress/gutenberg/pull/27336))
+    -   Reusable Blocks ([27094](https://github.com/WordPress/gutenberg/pull/27094))
+    -   Block Directory ([27178](https://github.com/WordPress/gutenberg/pull/27178))
+    -   Keyboard Shortcuts ([27355](https://github.com/WordPress/gutenberg/pull/27355))
+-   Search block: Remove invalid prop which was causing a React warning. ([27306](https://github.com/WordPress/gutenberg/pull/27306))
+-   Refactor click redirect to avoid trailing div. ([27253](https://github.com/WordPress/gutenberg/pull/27253))
+
+-   Editor styles: Convert to hook. ([27080](https://github.com/WordPress/gutenberg/pull/27080))
+-   Add: PHP util function equivalent to lodash set. ([27077](https://github.com/WordPress/gutenberg/pull/27077))
+-   Interface: Remove regions wrapper div. ([27066](https://github.com/WordPress/gutenberg/pull/27066))
+-   Refactor typing observer. ([27043](https://github.com/WordPress/gutenberg/pull/27043))
+-   Visual editor: Remove 4 wrapper divs. ([27035](https://github.com/WordPress/gutenberg/pull/27035))
+-   Insertion point: Avoid wrapper div. ([26994](https://github.com/WordPress/gutenberg/pull/26994))
+-   Typewriter: Rewrite with hooks. ([26986](https://github.com/WordPress/gutenberg/pull/26986))
+-   Deprecate the withGlobalEvents HoC. ([26749](https://github.com/WordPress/gutenberg/pull/26749))
+-   Edit Post: Refactor effects to action generators. ([27069](https://github.com/WordPress/gutenberg/pull/27069))
 
 ### Build Tooling
 
-- Add eslint rule to prohibit unsafe APIs. ([27301](https://github.com/WordPress/gutenberg/pull/27301))
-- Update package lock to fix CI failures. ([27098](https://github.com/WordPress/gutenberg/pull/27098), [27102](https://github.com/WordPress/gutenberg/pull/27102))
-- GitHub Actions: Build Plugin zip, store as artifact on every PR. ([26746](https://github.com/WordPress/gutenberg/pull/26746))
-- Scripts: Unpin ignore-emit-webpack-plugin dependency. ([26739](https://github.com/WordPress/gutenberg/pull/26739))
-- Adds Support to wp-env for setting the PHP version. ([25268](https://github.com/WordPress/gutenberg/pull/25268))
-- Configure phpunit-watcher to improve devex. ([27058](https://github.com/WordPress/gutenberg/pull/27058))
-- Run phpunit even when phpcs fails. ([27024](https://github.com/WordPress/gutenberg/pull/27024))
-- Scripts: Auto format TypeScript files with format-js. ([27138](https://github.com/WordPress/gutenberg/pull/27138))
-- End 2 End Tests:
-  - Fix randomly failing end-to-end test. ([27358](https://github.com/WordPress/gutenberg/pull/27358))
-  - Fix multi entity editing test. ([27347](https://github.com/WordPress/gutenberg/pull/27347))
-  - Add end-to-end tests for image editing tools. ([27262](https://github.com/WordPress/gutenberg/pull/27262))
+-   Add eslint rule to prohibit unsafe APIs. ([27301](https://github.com/WordPress/gutenberg/pull/27301))
+-   Update package lock to fix CI failures. ([27098](https://github.com/WordPress/gutenberg/pull/27098), [27102](https://github.com/WordPress/gutenberg/pull/27102))
+-   GitHub Actions: Build Plugin zip, store as artifact on every PR. ([26746](https://github.com/WordPress/gutenberg/pull/26746))
+-   Scripts: Unpin ignore-emit-webpack-plugin dependency. ([26739](https://github.com/WordPress/gutenberg/pull/26739))
+-   Adds Support to wp-env for setting the PHP version. ([25268](https://github.com/WordPress/gutenberg/pull/25268))
+-   Configure phpunit-watcher to improve devex. ([27058](https://github.com/WordPress/gutenberg/pull/27058))
+-   Run phpunit even when phpcs fails. ([27024](https://github.com/WordPress/gutenberg/pull/27024))
+-   Scripts: Auto format TypeScript files with format-js. ([27138](https://github.com/WordPress/gutenberg/pull/27138))
+-   End 2 End Tests:
+    -   Fix randomly failing end-to-end test. ([27358](https://github.com/WordPress/gutenberg/pull/27358))
+    -   Fix multi entity editing test. ([27347](https://github.com/WordPress/gutenberg/pull/27347))
+    -   Add end-to-end tests for image editing tools. ([27262](https://github.com/WordPress/gutenberg/pull/27262))
 
 ### Various
 
-- Simplify CSS for the code block. ([27314](https://github.com/WordPress/gutenberg/pull/27314))
-- Update the block variation widths in the block placeholder. ([27255](https://github.com/WordPress/gutenberg/pull/27255))
-- Don’t split translatable strings in block templates. ([27361](https://github.com/WordPress/gutenberg/pull/27361))
-- Reduce margin on placeholder for media. ([27252](https://github.com/WordPress/gutenberg/pull/27252))
-- Interface package: Move MainDashboardButton slot. ([27213](https://github.com/WordPress/gutenberg/pull/27213))
-- Decrease scrim when in a modal overlay. ([27054](https://github.com/WordPress/gutenberg/pull/27054))
-- Replace 'Remove from Reusable blocks' with 'Manage Reusable blocks'. ([27026](https://github.com/WordPress/gutenberg/pull/27026))
-- Mark AWAIT_PROMISE as unstable API. ([26852](https://github.com/WordPress/gutenberg/pull/26852))
-- Block Support: Separate opt in for font style and weight options. ([26844](https://github.com/WordPress/gutenberg/pull/26844))
-- Latest Posts: Don't use `target="_blank"`. ([25730](https://github.com/WordPress/gutenberg/pull/25730))
-
+-   Simplify CSS for the code block. ([27314](https://github.com/WordPress/gutenberg/pull/27314))
+-   Update the block variation widths in the block placeholder. ([27255](https://github.com/WordPress/gutenberg/pull/27255))
+-   Don’t split translatable strings in block templates. ([27361](https://github.com/WordPress/gutenberg/pull/27361))
+-   Reduce margin on placeholder for media. ([27252](https://github.com/WordPress/gutenberg/pull/27252))
+-   Interface package: Move MainDashboardButton slot. ([27213](https://github.com/WordPress/gutenberg/pull/27213))
+-   Decrease scrim when in a modal overlay. ([27054](https://github.com/WordPress/gutenberg/pull/27054))
+-   Replace 'Remove from Reusable blocks' with 'Manage Reusable blocks'. ([27026](https://github.com/WordPress/gutenberg/pull/27026))
+-   Mark AWAIT_PROMISE as unstable API. ([26852](https://github.com/WordPress/gutenberg/pull/26852))
+-   Block Support: Separate opt in for font style and weight options. ([26844](https://github.com/WordPress/gutenberg/pull/26844))
+-   Latest Posts: Don't use `target="_blank"`. ([25730](https://github.com/WordPress/gutenberg/pull/25730))
 
 = 9.4.1 =
 
-
-
 = 9.4.0 =
 
+## Changelog
+
 ### Features
 
-- Add Keyboard Input inline format. ([26801](https://github.com/WordPress/gutenberg/pull/26801))
-- Add Block variations transformations. ([26687](https://github.com/WordPress/gutenberg/pull/26687))
-- Add width selector for button block. ([25999](https://github.com/WordPress/gutenberg/pull/25999)) ([26781](https://github.com/WordPress/gutenberg/pull/26781)).
-- Add font size support to the List block. ([26257](https://github.com/WordPress/gutenberg/pull/26257))
-- Social Links: Add ability to change social icon sizes. ([25921](https://github.com/WordPress/gutenberg/pull/25921))
+-   Add Keyboard Input inline format. ([26801](https://github.com/WordPress/gutenberg/pull/26801))
+-   Add Block variations transformations. ([26687](https://github.com/WordPress/gutenberg/pull/26687))
+-   Add width selector for button block. ([25999](https://github.com/WordPress/gutenberg/pull/25999)) ([26781](https://github.com/WordPress/gutenberg/pull/26781)).
+-   Add font size support to the List block. ([26257](https://github.com/WordPress/gutenberg/pull/26257))
+-   Social Links: Add ability to change social icon sizes. ([25921](https://github.com/WordPress/gutenberg/pull/25921))
 
 ### Enhancements
 
-- Unify the inserter search UI. ([26595](https://github.com/WordPress/gutenberg/pull/26595))
-- Polish custom select menu styles. ([26956](https://github.com/WordPress/gutenberg/pull/26956))
-- Polish menu item styles. ([26889](https://github.com/WordPress/gutenberg/pull/26889)) ([26720](https://github.com/WordPress/gutenberg/pull/26720)) ([25218](https://github.com/WordPress/gutenberg/pull/25218)) ([26572](https://github.com/WordPress/gutenberg/pull/26572))
-- Polish the link interface. ([26551](https://github.com/WordPress/gutenberg/pull/26551))
-- Code & Preformatted Blocks: Delete on backspace if empty. ([26605](https://github.com/WordPress/gutenberg/pull/26605))
-- File Block: Move the URL button to the Block toolbar. ([26602](https://github.com/WordPress/gutenberg/pull/26602))
-- Allow adding a header by typing /h1, /h2 etc. ([26597](https://github.com/WordPress/gutenberg/pull/26597))
-- Polish Shortcode block styling. ([26456](https://github.com/WordPress/gutenberg/pull/26456))
-- Polish Search block styling. ([26446](https://github.com/WordPress/gutenberg/pull/26446))
-- Use a wider canvas for themes that don't provide a custom width. ([26357](https://github.com/WordPress/gutenberg/pull/26357))
-- Show reduced UI on hover. ([26882](https://github.com/WordPress/gutenberg/pull/26882))
-- Update Legacy Widget toolbar button font to match UI when displayed in Widget Screen. ([26841](https://github.com/WordPress/gutenberg/pull/26841))
-- Update token field icon. ([26726](https://github.com/WordPress/gutenberg/pull/26726))
-- Windows 10 high contrast mode improvements. ([26567](https://github.com/WordPress/gutenberg/pull/26567))
+-   Unify the inserter search UI. ([26595](https://github.com/WordPress/gutenberg/pull/26595))
+-   Polish custom select menu styles. ([26956](https://github.com/WordPress/gutenberg/pull/26956))
+-   Polish menu item styles. ([26889](https://github.com/WordPress/gutenberg/pull/26889)) ([26720](https://github.com/WordPress/gutenberg/pull/26720)) ([25218](https://github.com/WordPress/gutenberg/pull/25218)) ([26572](https://github.com/WordPress/gutenberg/pull/26572))
+-   Polish the link interface. ([26551](https://github.com/WordPress/gutenberg/pull/26551))
+-   Code & Preformatted Blocks: Delete on backspace if empty. ([26605](https://github.com/WordPress/gutenberg/pull/26605))
+-   File Block: Move the URL button to the Block toolbar. ([26602](https://github.com/WordPress/gutenberg/pull/26602))
+-   Allow adding a header by typing /h1, /h2 etc. ([26597](https://github.com/WordPress/gutenberg/pull/26597))
+-   Polish Shortcode block styling. ([26456](https://github.com/WordPress/gutenberg/pull/26456))
+-   Polish Search block styling. ([26446](https://github.com/WordPress/gutenberg/pull/26446))
+-   Use a wider canvas for themes that don't provide a custom width. ([26357](https://github.com/WordPress/gutenberg/pull/26357))
+-   Show reduced UI on hover. ([26882](https://github.com/WordPress/gutenberg/pull/26882))
+-   Update Legacy Widget toolbar button font to match UI when displayed in Widget Screen. ([26841](https://github.com/WordPress/gutenberg/pull/26841))
+-   Update token field icon. ([26726](https://github.com/WordPress/gutenberg/pull/26726))
+-   Windows 10 high contrast mode improvements. ([26567](https://github.com/WordPress/gutenberg/pull/26567))
 
 ### New APIs
 
-- Create block: Add support for external templates installed from npm. ([23712](https://github.com/WordPress/gutenberg/pull/23712))
-- Add optional icon to snackbar notices. ([26907](https://github.com/WordPress/gutenberg/pull/26907))
-- @wordpress/env: Add support for custom WP_HOME port. ([26507](https://github.com/WordPress/gutenberg/pull/26507))
-- @wordpress/lazy-import: Allow importing local paths. ([23751](https://github.com/WordPress/gutenberg/pull/23751))
-- Format library: Introduce useAnchorRef. ([26782](https://github.com/WordPress/gutenberg/pull/26782))
-
-### Bug Fixes
-
-- Fix block context injection hook after Core change in block rendering. ([26998](https://github.com/WordPress/gutenberg/pull/26998)) ([27011](https://github.com/WordPress/gutenberg/pull/27011))
-- Fix Query block's Toolbar popover width. ([26992](https://github.com/WordPress/gutenberg/pull/26992))
-- Fix IE11 interface bugs. ([26944](https://github.com/WordPress/gutenberg/pull/26944))
-- Improve arrow navigation between blocks. ([26921](https://github.com/WordPress/gutenberg/pull/26921))
-- Fix block alignments when theme styles are disabled. ([26912](https://github.com/WordPress/gutenberg/pull/26912)) ([26680](https://github.com/WordPress/gutenberg/pull/26680)) ([26376](https://github.com/WordPress/gutenberg/pull/26376))
-- Fix padding of text-only buttons mode. ([26769](https://github.com/WordPress/gutenberg/pull/26769))
-- Fix horizontal mover icon position. ([26761](https://github.com/WordPress/gutenberg/pull/26761))
-- Fix column width units. ([26757](https://github.com/WordPress/gutenberg/pull/26757))
-- FormTokenField input position when typing. ([26741](https://github.com/WordPress/gutenberg/pull/26741))
-- Fix applying colors to outlined buttons. ([26707](https://github.com/WordPress/gutenberg/pull/26707)) ([24626](https://github.com/WordPress/gutenberg/pull/24626))
-- Render big font sizes properly in the font size picker. ([26705](https://github.com/WordPress/gutenberg/pull/26705))
-- Use currentColor in quote blocks to better support dark themes. ([26684](https://github.com/WordPress/gutenberg/pull/26684))
-- Fix "Browse All" in Quick Inserter for container blocks. ([26443](https://github.com/WordPress/gutenberg/pull/26443))
-- Fix responsive embeds in the widget screen. ([26263](https://github.com/WordPress/gutenberg/pull/26263))
-- Fix undefined index notice in Social Link Block. ([25663](https://github.com/WordPress/gutenberg/pull/25663))
-- Buttons block: Fix default alignment icon in toolbar to reflect the actual default alignment of buttons. ([26910](https://github.com/WordPress/gutenberg/pull/26910))
-- Block Support: Fix font size style when applying block support. ([26762](https://github.com/WordPress/gutenberg/pull/26762))
-- Do not invalidate the entity record cache during optimistic update in saveEntityRecord. ([26627](https://github.com/WordPress/gutenberg/pull/26627))
-- Provide a minimum of code wrapping for the code block. ([26623](https://github.com/WordPress/gutenberg/pull/26623))
+-   Create block: Add support for external templates installed from npm. ([23712](https://github.com/WordPress/gutenberg/pull/23712))
+-   Add optional icon to snackbar notices. ([26907](https://github.com/WordPress/gutenberg/pull/26907))
+-   @wordpress/env: Add support for custom WP_HOME port. ([26507](https://github.com/WordPress/gutenberg/pull/26507))
+-   @wordpress/lazy-import: Allow importing local paths. ([23751](https://github.com/WordPress/gutenberg/pull/23751))
+-   Format library: Introduce useAnchorRef. ([26782](https://github.com/WordPress/gutenberg/pull/26782))
 
-### Experiments
+### Bug Fixes
 
-- Full Site Editing Framework: Rework templates and template parts synchronization. ([26650](https://github.com/WordPress/gutenberg/pull/26650)) ([26383](https://github.com/WordPress/gutenberg/pull/26383))
-- Full Site Editing Blocks:
-  - Post Excerpt block: Allow editing of generated excerpts. ([26637](https://github.com/WordPress/gutenberg/pull/26637))
-  - Post Excerpt block: Add missing closing div tag. ([26806](https://github.com/WordPress/gutenberg/pull/26806))
-  - Add wide and full alignment options to the post/site title blocks. ([26601](https://github.com/WordPress/gutenberg/pull/26601))
-  - Template Part block: Render preview as div. ([26873](https://github.com/WordPress/gutenberg/pull/26873))
-  - Post Taxonomies: Fix PHP Fatal erroor for unregistered taxonomy (#26851). ([26854](https://github.com/WordPress/gutenberg/pull/26854))
-  - PostAuthor: Safeguard to wait for authors to load. ([26776](https://github.com/WordPress/gutenberg/pull/26776))
-  - Query block: Update the order of settings and filters in the sidebar. ([26647](https://github.com/WordPress/gutenberg/pull/26647))
-- Site Editor:
-  - Fix responsiveness. ([26021](https://github.com/WordPress/gutenberg/pull/26021))
-  - Fix alignment of the new template button. ([26934](https://github.com/WordPress/gutenberg/pull/26934))
-  - Add default block widths styles. ([26853](https://github.com/WordPress/gutenberg/pull/26853))
-  - Refactor menu creation code. ([26966](https://github.com/WordPress/gutenberg/pull/26966))
-  - Only show auto-draft template parts corresponding to current theme. ([26948](https://github.com/WordPress/gutenberg/pull/26948))
-  - Polish the template navigation menu. ([26933](https://github.com/WordPress/gutenberg/pull/26933)), ([26930](https://github.com/WordPress/gutenberg/pull/26930)).
-  - Add navigation panel back button slot. ([26846](https://github.com/WordPress/gutenberg/pull/26846))
-  - Remove dashboard button focus on mount. ([26845](https://github.com/WordPress/gutenberg/pull/26845))
-  - Saving flow: Use template and template parts entities titles. ([26708](https://github.com/WordPress/gutenberg/pull/26708)) ([26653](https://github.com/WordPress/gutenberg/pull/26653))
-  - Reorder template creation dropdown. ([26610](https://github.com/WordPress/gutenberg/pull/26610))
-- Global styles:
-  - Fallback to theme color pallete. ([26783](https://github.com/WordPress/gutenberg/pull/26783)) ([26786](https://github.com/WordPress/gutenberg/pull/26786))
-  - Hide Block panels without content. ([26609](https://github.com/WordPress/gutenberg/pull/26609))
-  - Update styles to rely on CSS variables for colors and gradients. ([26319](https://github.com/WordPress/gutenberg/pull/26319))
-  - Fix Table block global styles selector. ([26973](https://github.com/WordPress/gutenberg/pull/26973))
-  - Hide the line height panel if disabled in theme.json file. ([26778](https://github.com/WordPress/gutenberg/pull/26778))
-  - Cache generated styles. ([25680](https://github.com/WordPress/gutenberg/pull/25680))
-  - Add: Mechanism to detect if a block instance matches a global styles selector. ([26945](https://github.com/WordPress/gutenberg/pull/26945)) ([26991](https://github.com/WordPress/gutenberg/pull/26991))
-  - Extract theme json processor. ([26803](https://github.com/WordPress/gutenberg/pull/26803))
-  - Add support for line height at the global level. ([26767](https://github.com/WordPress/gutenberg/pull/26767))
-  - Add preset classes generation on the client side. ([26224](https://github.com/WordPress/gutenberg/pull/26224))
-- Navigation block: Fix color support declaration. ([26928](https://github.com/WordPress/gutenberg/pull/26928))
-- Popover: Add sticky boundary element prop. ([26728](https://github.com/WordPress/gutenberg/pull/26728))
-- Block Support:
-  - Add font style and weight options with combined UI. ([26444](https://github.com/WordPress/gutenberg/pull/26444)) ([26868](https://github.com/WordPress/gutenberg/pull/26868))
-  - Add text transform block support flag. ([26060](https://github.com/WordPress/gutenberg/pull/26060)) ([26059](https://github.com/WordPress/gutenberg/pull/26059))
-  - Add: Font Family picking mechanism. ([24868](https://github.com/WordPress/gutenberg/pull/24868)), ([26750](https://github.com/WordPress/gutenberg/pull/26750)), ([26759](https://github.com/WordPress/gutenberg/pull/26759)).
+-   Fix block context injection hook after Core change in block rendering. ([26998](https://github.com/WordPress/gutenberg/pull/26998)) ([27011](https://github.com/WordPress/gutenberg/pull/27011))
+-   Fix Query block's Toolbar popover width. ([26992](https://github.com/WordPress/gutenberg/pull/26992))
+-   Fix IE11 interface bugs. ([26944](https://github.com/WordPress/gutenberg/pull/26944))
+-   Improve arrow navigation between blocks. ([26921](https://github.com/WordPress/gutenberg/pull/26921))
+-   Fix block alignments when theme styles are disabled. ([26912](https://github.com/WordPress/gutenberg/pull/26912)) ([26680](https://github.com/WordPress/gutenberg/pull/26680)) ([26376](https://github.com/WordPress/gutenberg/pull/26376))
+-   Fix padding of text-only buttons mode. ([26769](https://github.com/WordPress/gutenberg/pull/26769))
+-   Fix horizontal mover icon position. ([26761](https://github.com/WordPress/gutenberg/pull/26761))
+-   Fix column width units. ([26757](https://github.com/WordPress/gutenberg/pull/26757))
+-   FormTokenField input position when typing. ([26741](https://github.com/WordPress/gutenberg/pull/26741))
+-   Fix applying colors to outlined buttons. ([26707](https://github.com/WordPress/gutenberg/pull/26707)) ([24626](https://github.com/WordPress/gutenberg/pull/24626))
+-   Render big font sizes properly in the font size picker. ([26705](https://github.com/WordPress/gutenberg/pull/26705))
+-   Use currentColor in quote blocks to better support dark themes. ([26684](https://github.com/WordPress/gutenberg/pull/26684))
+-   Fix "Browse All" in Quick Inserter for container blocks. ([26443](https://github.com/WordPress/gutenberg/pull/26443))
+-   Fix responsive embeds in the widget screen. ([26263](https://github.com/WordPress/gutenberg/pull/26263))
+-   Fix undefined index notice in Social Link Block. ([25663](https://github.com/WordPress/gutenberg/pull/25663))
+-   Buttons block: Fix default alignment icon in toolbar to reflect the actual default alignment of buttons. ([26910](https://github.com/WordPress/gutenberg/pull/26910))
+-   Block Support: Fix font size style when applying block support. ([26762](https://github.com/WordPress/gutenberg/pull/26762))
+-   Do not invalidate the entity record cache during optimistic update in saveEntityRecord. ([26627](https://github.com/WordPress/gutenberg/pull/26627))
+-   Provide a minimum of code wrapping for the code block. ([26623](https://github.com/WordPress/gutenberg/pull/26623))
 
+### Experiments
+
+-   Full Site Editing Framework: Rework templates and template parts synchronization. ([26650](https://github.com/WordPress/gutenberg/pull/26650)) ([26383](https://github.com/WordPress/gutenberg/pull/26383))
+-   Full Site Editing Blocks:
+    -   Post Excerpt block: Allow editing of generated excerpts. ([26637](https://github.com/WordPress/gutenberg/pull/26637))
+    -   Post Excerpt block: Add missing closing div tag. ([26806](https://github.com/WordPress/gutenberg/pull/26806))
+    -   Add wide and full alignment options to the post/site title blocks. ([26601](https://github.com/WordPress/gutenberg/pull/26601))
+    -   Template Part block: Render preview as div. ([26873](https://github.com/WordPress/gutenberg/pull/26873))
+    -   Post Taxonomies: Fix PHP Fatal erroor for unregistered taxonomy (#26851). ([26854](https://github.com/WordPress/gutenberg/pull/26854))
+    -   PostAuthor: Safeguard to wait for authors to load. ([26776](https://github.com/WordPress/gutenberg/pull/26776))
+    -   Query block: Update the order of settings and filters in the sidebar. ([26647](https://github.com/WordPress/gutenberg/pull/26647))
+-   Site Editor:
+    -   Fix responsiveness. ([26021](https://github.com/WordPress/gutenberg/pull/26021))
+    -   Fix alignment of the new template button. ([26934](https://github.com/WordPress/gutenberg/pull/26934))
+    -   Add default block widths styles. ([26853](https://github.com/WordPress/gutenberg/pull/26853))
+    -   Refactor menu creation code. ([26966](https://github.com/WordPress/gutenberg/pull/26966))
+    -   Only show auto-draft template parts corresponding to current theme. ([26948](https://github.com/WordPress/gutenberg/pull/26948))
+    -   Polish the template navigation menu. ([26933](https://github.com/WordPress/gutenberg/pull/26933)), ([26930](https://github.com/WordPress/gutenberg/pull/26930)).
+    -   Add navigation panel back button slot. ([26846](https://github.com/WordPress/gutenberg/pull/26846))
+    -   Remove dashboard button focus on mount. ([26845](https://github.com/WordPress/gutenberg/pull/26845))
+    -   Saving flow: Use template and template parts entities titles. ([26708](https://github.com/WordPress/gutenberg/pull/26708)) ([26653](https://github.com/WordPress/gutenberg/pull/26653))
+    -   Reorder template creation dropdown. ([26610](https://github.com/WordPress/gutenberg/pull/26610))
+-   Global styles:
+    -   Fallback to theme color pallete. ([26783](https://github.com/WordPress/gutenberg/pull/26783)) ([26786](https://github.com/WordPress/gutenberg/pull/26786))
+    -   Hide Block panels without content. ([26609](https://github.com/WordPress/gutenberg/pull/26609))
+    -   Update styles to rely on CSS variables for colors and gradients. ([26319](https://github.com/WordPress/gutenberg/pull/26319))
+    -   Fix Table block global styles selector. ([26973](https://github.com/WordPress/gutenberg/pull/26973))
+    -   Hide the line height panel if disabled in theme.json file. ([26778](https://github.com/WordPress/gutenberg/pull/26778))
+    -   Cache generated styles. ([25680](https://github.com/WordPress/gutenberg/pull/25680))
+    -   Add: Mechanism to detect if a block instance matches a global styles selector. ([26945](https://github.com/WordPress/gutenberg/pull/26945)) ([26991](https://github.com/WordPress/gutenberg/pull/26991))
+    -   Extract theme json processor. ([26803](https://github.com/WordPress/gutenberg/pull/26803))
+    -   Add support for line height at the global level. ([26767](https://github.com/WordPress/gutenberg/pull/26767))
+    -   Add preset classes generation on the client side. ([26224](https://github.com/WordPress/gutenberg/pull/26224))
+-   Navigation block: Fix color support declaration. ([26928](https://github.com/WordPress/gutenberg/pull/26928))
+-   Popover: Add sticky boundary element prop. ([26728](https://github.com/WordPress/gutenberg/pull/26728))
+-   Block Support:
+    -   Add font style and weight options with combined UI. ([26444](https://github.com/WordPress/gutenberg/pull/26444)) ([26868](https://github.com/WordPress/gutenberg/pull/26868))
+    -   Add text transform block support flag. ([26060](https://github.com/WordPress/gutenberg/pull/26060)) ([26059](https://github.com/WordPress/gutenberg/pull/26059))
+    -   Add: Font Family picking mechanism. ([24868](https://github.com/WordPress/gutenberg/pull/24868)), ([26750](https://github.com/WordPress/gutenberg/pull/26750)), ([26759](https://github.com/WordPress/gutenberg/pull/26759)).
 
 ### Performance
 
-- Use 2-pass terser compression. ([24821](https://github.com/WordPress/gutenberg/pull/24821))
-- Memoize getEntityRecords to prevent infinite re-renders. ([26447](https://github.com/WordPress/gutenberg/pull/26447))
-- Resolve per-entity resolvers after receiving a list of records. ([26575](https://github.com/WordPress/gutenberg/pull/26575))
+-   Use 2-pass terser compression. ([24821](https://github.com/WordPress/gutenberg/pull/24821))
+-   Memoize getEntityRecords to prevent infinite re-renders. ([26447](https://github.com/WordPress/gutenberg/pull/26447))
+-   Resolve per-entity resolvers after receiving a list of records. ([26575](https://github.com/WordPress/gutenberg/pull/26575))
 
 ### Documentation
 
-- Update theme.json documentation with new properties added. ([26891](https://github.com/WordPress/gutenberg/pull/26891))
-- Interface: Add deprecation logic for leftSidebar prop. ([26826](https://github.com/WordPress/gutenberg/pull/26826))
-- Document the block supports style properties. ([26771](https://github.com/WordPress/gutenberg/pull/26771)) ([26931](https://github.com/WordPress/gutenberg/pull/26931)) ([26859](https://github.com/WordPress/gutenberg/pull/26859))
-- Update testing documentation with info about React Testing Library. ([23015](https://github.com/WordPress/gutenberg/pull/23015))
-- Add documentation for AutosaveMonitor. ([26663](https://github.com/WordPress/gutenberg/pull/26663))
-- Typos and tweaks: ([26797](https://github.com/WordPress/gutenberg/pull/26797)), ([26796](https://github.com/WordPress/gutenberg/pull/26796)), ([26795](https://github.com/WordPress/gutenberg/pull/26795)), ([26794](https://github.com/WordPress/gutenberg/pull/26794)), ([26793](https://github.com/WordPress/gutenberg/pull/26793)), ([26792](https://github.com/WordPress/gutenberg/pull/26792)), ([26791](https://github.com/WordPress/gutenberg/pull/26791)), ([26790](https://github.com/WordPress/gutenberg/pull/26790)), ([21607](https://github.com/WordPress/gutenberg/pull/21607)), ([27017](https://github.com/WordPress/gutenberg/pull/27017)), ([26919](https://github.com/WordPress/gutenberg/pull/26919)), ([26863](https://github.com/WordPress/gutenberg/pull/26863)), ([26857](https://github.com/WordPress/gutenberg/pull/26857)), ([26618](https://github.com/WordPress/gutenberg/pull/26618)), ([26029](https://github.com/WordPress/gutenberg/pull/26029)), ([25349](https://github.com/WordPress/gutenberg/pull/25349)), ([17878](https://github.com/WordPress/gutenberg/pull/17878)), ([16090](https://github.com/WordPress/gutenberg/pull/16090)), ([26799](https://github.com/WordPress/gutenberg/pull/26799)), ([26765](https://github.com/WordPress/gutenberg/pull/26765)), ([26654](https://github.com/WordPress/gutenberg/pull/26654)).
+-   Update theme.json documentation with new properties added. ([26891](https://github.com/WordPress/gutenberg/pull/26891))
+-   Interface: Add deprecation logic for leftSidebar prop. ([26826](https://github.com/WordPress/gutenberg/pull/26826))
+-   Document the block supports style properties. ([26771](https://github.com/WordPress/gutenberg/pull/26771)) ([26931](https://github.com/WordPress/gutenberg/pull/26931)) ([26859](https://github.com/WordPress/gutenberg/pull/26859))
+-   Update testing documentation with info about React Testing Library. ([23015](https://github.com/WordPress/gutenberg/pull/23015))
+-   Add documentation for AutosaveMonitor. ([26663](https://github.com/WordPress/gutenberg/pull/26663))
+-   Typos and tweaks: ([26797](https://github.com/WordPress/gutenberg/pull/26797)), ([26796](https://github.com/WordPress/gutenberg/pull/26796)), ([26795](https://github.com/WordPress/gutenberg/pull/26795)), ([26794](https://github.com/WordPress/gutenberg/pull/26794)), ([26793](https://github.com/WordPress/gutenberg/pull/26793)), ([26792](https://github.com/WordPress/gutenberg/pull/26792)), ([26791](https://github.com/WordPress/gutenberg/pull/26791)), ([26790](https://github.com/WordPress/gutenberg/pull/26790)), ([21607](https://github.com/WordPress/gutenberg/pull/21607)), ([27017](https://github.com/WordPress/gutenberg/pull/27017)), ([26919](https://github.com/WordPress/gutenberg/pull/26919)), ([26863](https://github.com/WordPress/gutenberg/pull/26863)), ([26857](https://github.com/WordPress/gutenberg/pull/26857)), ([26618](https://github.com/WordPress/gutenberg/pull/26618)), ([26029](https://github.com/WordPress/gutenberg/pull/26029)), ([25349](https://github.com/WordPress/gutenberg/pull/25349)), ([17878](https://github.com/WordPress/gutenberg/pull/17878)), ([16090](https://github.com/WordPress/gutenberg/pull/16090)), ([26799](https://github.com/WordPress/gutenberg/pull/26799)), ([26765](https://github.com/WordPress/gutenberg/pull/26765)), ([26654](https://github.com/WordPress/gutenberg/pull/26654)).
 
 ### Code Quality
 
-- Use date-fns and date-fns-tz instead of moment. ([25782](https://github.com/WordPress/gutenberg/pull/25782)) ([27002](https://github.com/WordPress/gutenberg/pull/27002))
-- is-shallow-equal: Convert to ESM. ([26833](https://github.com/WordPress/gutenberg/pull/26833))
-- Minor code refactoring in template part previews. ([26949](https://github.com/WordPress/gutenberg/pull/26949))
-- Drop zone: Rewrite with hooks and simplify. ([26893](https://github.com/WordPress/gutenberg/pull/26893))
-- PostTitle: Rewrite with hooks (+ avoid globals). ([26820](https://github.com/WordPress/gutenberg/pull/26820))
-- Avoid relying on a the global document. ([26834](https://github.com/WordPress/gutenberg/pull/26834)) ([26814](https://github.com/WordPress/gutenberg/pull/26814)) ([26813](https://github.com/WordPress/gutenberg/pull/26813)) ([26657](https://github.com/WordPress/gutenberg/pull/26657))
-- Format library: Use hooks for all components. ([26779](https://github.com/WordPress/gutenberg/pull/26779))
-- Sandbox: Use hooks and avoid withGlobalEvents. ([26742](https://github.com/WordPress/gutenberg/pull/26742))
-- Draggable: Use hooks and prepare for iframe. ([26897](https://github.com/WordPress/gutenberg/pull/26897))
-- PostLockedModal: Use hooks and avoid withGlobalEvents. ([26743](https://github.com/WordPress/gutenberg/pull/26743))
-- WpEmbedPreview: Use hooks and avoid withGlobalEvents. ([26740](https://github.com/WordPress/gutenberg/pull/26740))
-- FocusableIframe: Use hooks and avoid withGlobalEvents. ([26737](https://github.com/WordPress/gutenberg/pull/26737))
-- Navigation Component: Update styles to reference grid spacing helper. ([26523](https://github.com/WordPress/gutenberg/pull/26523))
-- Hooks: Type package. ([26430](https://github.com/WordPress/gutenberg/pull/26430))
-- Deprecated: Type package. ([26429](https://github.com/WordPress/gutenberg/pull/26429))
-- Movers: Small positioning refactor. ([26353](https://github.com/WordPress/gutenberg/pull/26353))
-- Use useAnimate for all Animate component usage. ([26201](https://github.com/WordPress/gutenberg/pull/26201))
-- Gallery block: Use API v2. ([26145](https://github.com/WordPress/gutenberg/pull/26145))
-- Gallery: Remove obsolete deprecation entry. ([26736](https://github.com/WordPress/gutenberg/pull/26736))
-- Cleanup: ([24831](https://github.com/WordPress/gutenberg/pull/24831)), ([23598](https://github.com/WordPress/gutenberg/pull/23598)), ([27000](https://github.com/WordPress/gutenberg/pull/27000)).
-- Remove `useMemo` in Query inspector controls. ([26658](https://github.com/WordPress/gutenberg/pull/26658))
-
+-   Use date-fns and date-fns-tz instead of moment. ([25782](https://github.com/WordPress/gutenberg/pull/25782)) ([27002](https://github.com/WordPress/gutenberg/pull/27002))
+-   is-shallow-equal: Convert to ESM. ([26833](https://github.com/WordPress/gutenberg/pull/26833))
+-   Minor code refactoring in template part previews. ([26949](https://github.com/WordPress/gutenberg/pull/26949))
+-   Drop zone: Rewrite with hooks and simplify. ([26893](https://github.com/WordPress/gutenberg/pull/26893))
+-   PostTitle: Rewrite with hooks (+ avoid globals). ([26820](https://github.com/WordPress/gutenberg/pull/26820))
+-   Avoid relying on a the global document. ([26834](https://github.com/WordPress/gutenberg/pull/26834)) ([26814](https://github.com/WordPress/gutenberg/pull/26814)) ([26813](https://github.com/WordPress/gutenberg/pull/26813)) ([26657](https://github.com/WordPress/gutenberg/pull/26657))
+-   Format library: Use hooks for all components. ([26779](https://github.com/WordPress/gutenberg/pull/26779))
+-   Sandbox: Use hooks and avoid withGlobalEvents. ([26742](https://github.com/WordPress/gutenberg/pull/26742))
+-   Draggable: Use hooks and prepare for iframe. ([26897](https://github.com/WordPress/gutenberg/pull/26897))
+-   PostLockedModal: Use hooks and avoid withGlobalEvents. ([26743](https://github.com/WordPress/gutenberg/pull/26743))
+-   WpEmbedPreview: Use hooks and avoid withGlobalEvents. ([26740](https://github.com/WordPress/gutenberg/pull/26740))
+-   FocusableIframe: Use hooks and avoid withGlobalEvents. ([26737](https://github.com/WordPress/gutenberg/pull/26737))
+-   Navigation Component: Update styles to reference grid spacing helper. ([26523](https://github.com/WordPress/gutenberg/pull/26523))
+-   Hooks: Type package. ([26430](https://github.com/WordPress/gutenberg/pull/26430))
+-   Deprecated: Type package. ([26429](https://github.com/WordPress/gutenberg/pull/26429))
+-   Movers: Small positioning refactor. ([26353](https://github.com/WordPress/gutenberg/pull/26353))
+-   Use useAnimate for all Animate component usage. ([26201](https://github.com/WordPress/gutenberg/pull/26201))
+-   Gallery block: Use API v2. ([26145](https://github.com/WordPress/gutenberg/pull/26145))
+-   Gallery: Remove obsolete deprecation entry. ([26736](https://github.com/WordPress/gutenberg/pull/26736))
+-   Cleanup: ([24831](https://github.com/WordPress/gutenberg/pull/24831)), ([23598](https://github.com/WordPress/gutenberg/pull/23598)), ([27000](https://github.com/WordPress/gutenberg/pull/27000)).
+-   Remove `useMemo` in Query inspector controls. ([26658](https://github.com/WordPress/gutenberg/pull/26658))
 
 ### Build Tooling
 
-- Add eslint rule to warn against using globals for addEventListener. ([26810](https://github.com/WordPress/gutenberg/pull/26810))
-- Update workflows to use Node 14.x. ([26835](https://github.com/WordPress/gutenberg/pull/26835))
-- Add command to format PHP files. ([26850](https://github.com/WordPress/gutenberg/pull/26850))
--  Build Tooling: Rebuild stylesheets when imported styles are modified. ([26649](https://github.com/WordPress/gutenberg/pull/26649))
-- Fix GH actions "cancel" step. ([27025](https://github.com/WordPress/gutenberg/pull/27025))
-- Run assign fixed issues and first time contributor label tasks for PRs from forks. ([26876](https://github.com/WordPress/gutenberg/pull/26876))
-- Update .nvmrc to use latest LTS. ([26855](https://github.com/WordPress/gutenberg/pull/26855))
-- Update nodegit to 0.27.0 in @wordpress/env. ([26712](https://github.com/WordPress/gutenberg/pull/26712))
-- Tests: Add fixture for Column deprecation. ([26774](https://github.com/WordPress/gutenberg/pull/26774))
-- Store screenshots of CI end-to-end failures as CI artifacts. ([26664](https://github.com/WordPress/gutenberg/pull/26664)) ([26957](https://github.com/WordPress/gutenberg/pull/26957))
-- End 2 End Tests:
-  - Fix improper assertion in template-part.test. ([26709](https://github.com/WordPress/gutenberg/pull/26709))
-  - Fix RTL end-to-end tests. ([26508](https://github.com/WordPress/gutenberg/pull/26508))
-  - Add regresion end-to-end test for the empty reusable block causing WSODs issue. ([26913](https://github.com/WordPress/gutenberg/pull/26913))
-  - Add block drag and drop test. ([26869](https://github.com/WordPress/gutenberg/pull/26869)) ([26904](https://github.com/WordPress/gutenberg/pull/26904))
-  - Add Delete on backspace from empty code/preformatted blocks test. ([26972](https://github.com/WordPress/gutenberg/pull/26972))
-  - Merge end-to-end test relying on order into one. ([26883](https://github.com/WordPress/gutenberg/pull/26883))
-  - Add template part conversion end-to-end tests. ([26788](https://github.com/WordPress/gutenberg/pull/26788))
-  - Make the allowed blocks test more stable. ([26631](https://github.com/WordPress/gutenberg/pull/26631))
-  - Add end-to-end test utils to install and activate themes. ([23685](https://github.com/WordPress/gutenberg/pull/23685))
+-   Add eslint rule to warn against using globals for addEventListener. ([26810](https://github.com/WordPress/gutenberg/pull/26810))
+-   Update workflows to use Node 14.x. ([26835](https://github.com/WordPress/gutenberg/pull/26835))
+-   Add command to format PHP files. ([26850](https://github.com/WordPress/gutenberg/pull/26850))
+-   Build Tooling: Rebuild stylesheets when imported styles are modified. ([26649](https://github.com/WordPress/gutenberg/pull/26649))
+-   Fix GH actions "cancel" step. ([27025](https://github.com/WordPress/gutenberg/pull/27025))
+-   Run assign fixed issues and first-time contributor label tasks for PRs from forks. ([26876](https://github.com/WordPress/gutenberg/pull/26876))
+-   Update .nvmrc to use latest LTS. ([26855](https://github.com/WordPress/gutenberg/pull/26855))
+-   Update nodegit to 0.27.0 in @wordpress/env. ([26712](https://github.com/WordPress/gutenberg/pull/26712))
+-   Tests: Add fixture for Column deprecation. ([26774](https://github.com/WordPress/gutenberg/pull/26774))
+-   Store screenshots of CI end-to-end failures as CI artifacts. ([26664](https://github.com/WordPress/gutenberg/pull/26664)) ([26957](https://github.com/WordPress/gutenberg/pull/26957))
+-   End 2 End Tests:
+    -   Fix improper assertion in template-part.test. ([26709](https://github.com/WordPress/gutenberg/pull/26709))
+    -   Fix RTL end-to-end tests. ([26508](https://github.com/WordPress/gutenberg/pull/26508))
+    -   Add regresion end-to-end test for the empty reusable block causing WSODs issue. ([26913](https://github.com/WordPress/gutenberg/pull/26913))
+    -   Add block drag and drop test. ([26869](https://github.com/WordPress/gutenberg/pull/26869)) ([26904](https://github.com/WordPress/gutenberg/pull/26904))
+    -   Add Delete on backspace from empty code/preformatted blocks test. ([26972](https://github.com/WordPress/gutenberg/pull/26972))
+    -   Merge end-to-end test relying on order into one. ([26883](https://github.com/WordPress/gutenberg/pull/26883))
+    -   Add template part conversion end-to-end tests. ([26788](https://github.com/WordPress/gutenberg/pull/26788))
+    -   Make the allowed blocks test more stable. ([26631](https://github.com/WordPress/gutenberg/pull/26631))
+    -   Add end-to-end test utils to install and activate themes. ([23685](https://github.com/WordPress/gutenberg/pull/23685))
 
 ### Various
 
-- TextControl: Support forwarding refs. ([26209](https://github.com/WordPress/gutenberg/pull/26209))
-- Update gutenberg_is_fse_theme function to make it filterable. ([27021](https://github.com/WordPress/gutenberg/pull/27021))
-- Windows: Use wp-env instead of file location. ([26671](https://github.com/WordPress/gutenberg/pull/26671))
-- Site Editor: Rename left sidebar → secondary sidebar. ([26517](https://github.com/WordPress/gutenberg/pull/26517))
-- Add State locks for concurrency control to @wordpress/core-data. ([26389](https://github.com/WordPress/gutenberg/pull/26389)) ([26661](https://github.com/WordPress/gutenberg/pull/26661))
-- Avoid PHP warnings when Gutenberg plugin folder isn't writable. ([17671](https://github.com/WordPress/gutenberg/pull/17671))
-
-
+-   TextControl: Support forwarding refs. ([26209](https://github.com/WordPress/gutenberg/pull/26209))
+-   Update gutenberg_is_fse_theme function to make it filterable. ([27021](https://github.com/WordPress/gutenberg/pull/27021))
+-   Windows: Use wp-env instead of file location. ([26671](https://github.com/WordPress/gutenberg/pull/26671))
+-   Site Editor: Rename left sidebar → secondary sidebar. ([26517](https://github.com/WordPress/gutenberg/pull/26517))
+-   Add State locks for concurrency control to @wordpress/core-data. ([26389](https://github.com/WordPress/gutenberg/pull/26389)) ([26661](https://github.com/WordPress/gutenberg/pull/26661))
+-   Avoid PHP warnings when Gutenberg plugin folder isn't writable. ([17671](https://github.com/WordPress/gutenberg/pull/17671))
 
 = 9.3.0 =
 
+## Changelog
+
 ### Enhancements
 
-- Support for aall units in Font Size presets. ([26475](https://github.com/WordPress/gutenberg/pula/26475))
-- Sort post formats alphabetically by translated name. ([26305](https://github.com/WordPress/gutenberg/pull/26305))
-- Ensure Alignment options are always rendered in the same order. ([26269](https://github.com/WordPress/gutenberg/pull/26269))
-- Buttons block: Overhaul alignment and justification controls. ([23168](https://github.com/WordPress/gutenberg/pull/23168))
-- a11y: Retain focus position when tabbing back to the block toolbar. ([25760](https://github.com/WordPress/gutenberg/pull/25760))
-- Dark mode UI enhancements. ([26483](https://github.com/WordPress/gutenberg/pull/26483)) ([26510](https://github.com/WordPress/gutenberg/pull/26510))
-- Social Links: Add Patreon, Telegram, and Tiktok icons. ([26118](https://github.com/WordPress/gutenberg/pull/26118))
-
-### Bug Fixes
-
-- Fix Visual regression on the color palette editor. ([26614](https://github.com/WordPress/gutenberg/pull/26614))
-- @wordpress/scripts: Fix error in ignore-emit-webpack-plugin. ([26591](https://github.com/WordPress/gutenberg/pull/26591))
-- Cover block: Restore default overlay background. ([26569](https://github.com/WordPress/gutenberg/pull/26569)) ([26625](https://github.com/WordPress/gutenberg/pull/26625))
-- i18n: Fix incorrectly pluralised strings. ([26565](https://github.com/WordPress/gutenberg/pull/26565))
-- Limit the editor interface to max-width 100%. ([26552](https://github.com/WordPress/gutenberg/pull/26552))
-- Ensure editor footer remains at the bottom of the screen when navigating regions. ([26533](https://github.com/WordPress/gutenberg/pull/26533))
-- URLInput: Use debounce() instead of throttle(). ([26529](https://github.com/WordPress/gutenberg/pull/26529))
-- Heading Block: Fix double alignment controls in toolbar. ([26492](https://github.com/WordPress/gutenberg/pull/26492))
-- Fix Block preview vertical offset. ([26487](https://github.com/WordPress/gutenberg/pull/26487))
-- Reusable Blocks: Make the number retrieved from the API unlimited. ([26486](https://github.com/WordPress/gutenberg/pull/26486))
-- Fix editor error when an empty reusable block exist. ([26484](https://github.com/WordPress/gutenberg/pull/26484))
-- Latest Posts: Add missing classname. ([26477](https://github.com/WordPress/gutenberg/pull/26477))
-- Fix single column block display for smaller screens. ([26438](https://github.com/WordPress/gutenberg/pull/26438))
-- Turn off autocomplete for ComboboxControl components. ([26427](https://github.com/WordPress/gutenberg/pull/26427))
-- Fix parent post selector initial value and search. ([26397](https://github.com/WordPress/gutenberg/pull/26397))
-- Fix gallery block undo issue. ([26377](https://github.com/WordPress/gutenberg/pull/26377))
-- Fix spellings in Getting Started guide. ([26310](https://github.com/WordPress/gutenberg/pull/26310))
-- Fix embed blocks rendering in widget areas. ([26307](https://github.com/WordPress/gutenberg/pull/26307))
-- Fix design of color/gradient controls. ([26255](https://github.com/WordPress/gutenberg/pull/26255))
-- Fix drop zone indicators for non blocks. ([25986](https://github.com/WordPress/gutenberg/pull/25986))
-- Fix left and right alignments for video embeds. ([24847](https://github.com/WordPress/gutenberg/pull/24847))
-- Next Page block: Center text properly. ([26515](https://github.com/WordPress/gutenberg/pull/26515))
+-   Support for aall units in Font Size presets. ([26475](https://github.com/WordPress/gutenberg/pula/26475))
+-   Sort post formats alphabetically by translated name. ([26305](https://github.com/WordPress/gutenberg/pull/26305))
+-   Ensure Alignment options are always rendered in the same order. ([26269](https://github.com/WordPress/gutenberg/pull/26269))
+-   Buttons block: Overhaul alignment and justification controls. ([23168](https://github.com/WordPress/gutenberg/pull/23168))
+-   a11y: Retain focus position when tabbing back to the block toolbar. ([25760](https://github.com/WordPress/gutenberg/pull/25760))
+-   Dark mode UI enhancements. ([26483](https://github.com/WordPress/gutenberg/pull/26483)) ([26510](https://github.com/WordPress/gutenberg/pull/26510))
+-   Social Links: Add Patreon, Telegram, and Tiktok icons. ([26118](https://github.com/WordPress/gutenberg/pull/26118))
+
+### Bug Fixes
+
+-   Fix Visual regression on the color palette editor. ([26614](https://github.com/WordPress/gutenberg/pull/26614))
+-   @wordpress/scripts: Fix error in ignore-emit-webpack-plugin. ([26591](https://github.com/WordPress/gutenberg/pull/26591))
+-   Cover block: Restore default overlay background. ([26569](https://github.com/WordPress/gutenberg/pull/26569)) ([26625](https://github.com/WordPress/gutenberg/pull/26625))
+-   i18n: Fix incorrectly pluralised strings. ([26565](https://github.com/WordPress/gutenberg/pull/26565))
+-   Limit the editor interface to max-width 100%. ([26552](https://github.com/WordPress/gutenberg/pull/26552))
+-   Ensure editor footer remains at the bottom of the screen when navigating regions. ([26533](https://github.com/WordPress/gutenberg/pull/26533))
+-   URLInput: Use debounce() instead of throttle(). ([26529](https://github.com/WordPress/gutenberg/pull/26529))
+-   Heading Block: Fix double alignment controls in toolbar. ([26492](https://github.com/WordPress/gutenberg/pull/26492))
+-   Fix Block preview vertical offset. ([26487](https://github.com/WordPress/gutenberg/pull/26487))
+-   Reusable Blocks: Make the number retrieved from the API unlimited. ([26486](https://github.com/WordPress/gutenberg/pull/26486))
+-   Fix editor error when an empty reusable block exist. ([26484](https://github.com/WordPress/gutenberg/pull/26484))
+-   Latest Posts: Add missing classname. ([26477](https://github.com/WordPress/gutenberg/pull/26477))
+-   Fix single column block display for smaller screens. ([26438](https://github.com/WordPress/gutenberg/pull/26438))
+-   Turn off autocomplete for ComboboxControl components. ([26427](https://github.com/WordPress/gutenberg/pull/26427))
+-   Fix parent post selector initial value and search. ([26397](https://github.com/WordPress/gutenberg/pull/26397))
+-   Fix gallery block undo issue. ([26377](https://github.com/WordPress/gutenberg/pull/26377))
+-   Fix spellings in Getting Started guide. ([26310](https://github.com/WordPress/gutenberg/pull/26310))
+-   Fix embed blocks rendering in widget areas. ([26307](https://github.com/WordPress/gutenberg/pull/26307))
+-   Fix design of color/gradient controls. ([26255](https://github.com/WordPress/gutenberg/pull/26255))
+-   Fix drop zone indicators for non blocks. ([25986](https://github.com/WordPress/gutenberg/pull/25986))
+-   Fix left and right alignments for video embeds. ([24847](https://github.com/WordPress/gutenberg/pull/24847))
+-   Next Page block: Center text properly. ([26515](https://github.com/WordPress/gutenberg/pull/26515))
 
 ### New APIs
 
-- Allow text buttons in DropdownMenu. ([26425](https://github.com/WordPress/gutenberg/pull/26425))
-- Support custom viewportWidth in block previews (example). ([26346](https://github.com/WordPress/gutenberg/pull/26346))
-- Change updateSelection property to false for InnerBlocks. ([26312](https://github.com/WordPress/gutenberg/pull/26312))
+-   Allow text buttons in DropdownMenu. ([26425](https://github.com/WordPress/gutenberg/pull/26425))
+-   Support custom viewportWidth in block previews (example). ([26346](https://github.com/WordPress/gutenberg/pull/26346))
+-   Change updateSelection property to false for InnerBlocks. ([26312](https://github.com/WordPress/gutenberg/pull/26312))
 
 ### Experiments
 
-- Full Site Editing :
-  - Disable customizer and widgets screens. ([26594](https://github.com/WordPress/gutenberg/pull/26594))
-  - Automatically enable FSE experiment. ([26500](https://github.com/WordPress/gutenberg/pull/26500))
-  - Remove the demo templates. ([26419](https://github.com/WordPress/gutenberg/pull/26419))
-  - Strip post ids from template part blocks on export. ([26268](https://github.com/WordPress/gutenberg/pull/26268))
-  - Allow themes to live in a sub directory. ([26391](https://github.com/WordPress/gutenberg/pull/26391))
-- Introduce the layout prop to InnerBlocks. ([26380](https://github.com/WordPress/gutenberg/pull/26380))
-- Site Editor
-  - Add Dropdown to Create Generic Templates. ([26284](https://github.com/WordPress/gutenberg/pull/26284))
-  - Prevent inserter overscroll. ([26432](https://github.com/WordPress/gutenberg/pull/26432)) ([26583](https://github.com/WordPress/gutenberg/pull/26583))
-  - Fix dirty template and template parts on template creation. ([26560](https://github.com/WordPress/gutenberg/pull/26560))
-  - Fix composite role warnings triggered by template part previews. ([26406](https://github.com/WordPress/gutenberg/pull/26406))
-  - Reduce the Amount of Data Passed Through the Components Tree. ([26463](https://github.com/WordPress/gutenberg/pull/26463))
-  - Add the option to convert a template part to regular blocks. ([26488](https://github.com/WordPress/gutenberg/pull/26488))
-  - Fix Invisible Template Previews in the Sidebar. ([26424](https://github.com/WordPress/gutenberg/pull/26424))
-  - Add convert to template part flow. ([20445](https://github.com/WordPress/gutenberg/pull/20445))
-  - Fix custom template part theme meta. ([26587](https://github.com/WordPress/gutenberg/pull/26587))
-- Query block:
-  - Add initial variations. ([26378](https://github.com/WordPress/gutenberg/pull/26378))
-  - Add sticky support. ([26279](https://github.com/WordPress/gutenberg/pull/26279))
-- Global Styles:
-  - Use block settings on the block panels. ([26218](https://github.com/WordPress/gutenberg/pull/26218))
-  - Fix: Font size picker regression on edit site global styles. ([26603](https://github.com/WordPress/gutenberg/pull/26603))
-  - Process settings only once. ([26330](https://github.com/WordPress/gutenberg/pull/26330))
-- Navigation Component:
-  - Add Support for RTL Languages. ([26334](https://github.com/WordPress/gutenberg/pull/26334))
-  - Styling revisions. ([26338](https://github.com/WordPress/gutenberg/pull/26338))
-  - Fix focus behavior when opening the panel. ([26296](https://github.com/WordPress/gutenberg/pull/26296))
-  - Fix height of Navigation panel and make it scrollable. ([26187](https://github.com/WordPress/gutenberg/pull/26187))
-  - Search Control in Menu Titles. ([25315](https://github.com/WordPress/gutenberg/pull/25315))
-- Use a DropdownMenu for menu selection in the navigation screen. ([25390](https://github.com/WordPress/gutenberg/pull/25390))
+-   Full Site Editing :
+    -   Disable customizer and widgets screens. ([26594](https://github.com/WordPress/gutenberg/pull/26594))
+    -   Automatically enable FSE experiment. ([26500](https://github.com/WordPress/gutenberg/pull/26500))
+    -   Remove the demo templates. ([26419](https://github.com/WordPress/gutenberg/pull/26419))
+    -   Strip post ids from template part blocks on export. ([26268](https://github.com/WordPress/gutenberg/pull/26268))
+    -   Allow themes to live in a sub directory. ([26391](https://github.com/WordPress/gutenberg/pull/26391))
+-   Introduce the layout prop to InnerBlocks. ([26380](https://github.com/WordPress/gutenberg/pull/26380))
+-   Site Editor
+    -   Add Dropdown to Create Generic Templates. ([26284](https://github.com/WordPress/gutenberg/pull/26284))
+    -   Prevent inserter overscroll. ([26432](https://github.com/WordPress/gutenberg/pull/26432)) ([26583](https://github.com/WordPress/gutenberg/pull/26583))
+    -   Fix dirty template and template parts on template creation. ([26560](https://github.com/WordPress/gutenberg/pull/26560))
+    -   Fix composite role warnings triggered by template part previews. ([26406](https://github.com/WordPress/gutenberg/pull/26406))
+    -   Reduce the Amount of Data Passed Through the Components Tree. ([26463](https://github.com/WordPress/gutenberg/pull/26463))
+    -   Add the option to convert a template part to regular blocks. ([26488](https://github.com/WordPress/gutenberg/pull/26488))
+    -   Fix Invisible Template Previews in the Sidebar. ([26424](https://github.com/WordPress/gutenberg/pull/26424))
+    -   Add convert to template part flow. ([20445](https://github.com/WordPress/gutenberg/pull/20445))
+    -   Fix custom template part theme meta. ([26587](https://github.com/WordPress/gutenberg/pull/26587))
+-   Query block:
+    -   Add initial variations. ([26378](https://github.com/WordPress/gutenberg/pull/26378))
+    -   Add sticky support. ([26279](https://github.com/WordPress/gutenberg/pull/26279))
+-   Global Styles:
+    -   Use block settings on the block panels. ([26218](https://github.com/WordPress/gutenberg/pull/26218))
+    -   Fix: Font size picker regression on edit site global styles. ([26603](https://github.com/WordPress/gutenberg/pull/26603))
+    -   Process settings only once. ([26330](https://github.com/WordPress/gutenberg/pull/26330))
+-   Navigation Component:
+    -   Add Support for RTL Languages. ([26334](https://github.com/WordPress/gutenberg/pull/26334))
+    -   Styling revisions. ([26338](https://github.com/WordPress/gutenberg/pull/26338))
+    -   Fix focus behavior when opening the panel. ([26296](https://github.com/WordPress/gutenberg/pull/26296))
+    -   Fix height of Navigation panel and make it scrollable. ([26187](https://github.com/WordPress/gutenberg/pull/26187))
+    -   Search Control in Menu Titles. ([25315](https://github.com/WordPress/gutenberg/pull/25315))
+-   Use a DropdownMenu for menu selection in the navigation screen. ([25390](https://github.com/WordPress/gutenberg/pull/25390))
 
 ### Documentation
 
-- Update glossary to include more block based terminology. ([26478](https://github.com/WordPress/gutenberg/pull/26478))
-- Update triage documentation for clarity around closing issues and labels. ([26480](https://github.com/WordPress/gutenberg/pull/26480))
-- Update WordPress versions document to include 5.6. ([26365](https://github.com/WordPress/gutenberg/pull/26365))
-- Typos and tweaks: ([26491](https://github.com/WordPress/gutenberg/pull/26491)), ([26553](https://github.com/WordPress/gutenberg/pull/26553)), ([26437](https://github.com/WordPress/gutenberg/pull/26437)), ([26400](https://github.com/WordPress/gutenberg/pull/26400)), ([26566](https://github.com/WordPress/gutenberg/pull/26566)).
-- Storybook: Fix broken BlockDraggable story. ([26457](https://github.com/WordPress/gutenberg/pull/26457)) ([26431](https://github.com/WordPress/gutenberg/pull/26431))
+-   Update glossary to include more block based terminology. ([26478](https://github.com/WordPress/gutenberg/pull/26478))
+-   Update triage documentation for clarity around closing issues and labels. ([26480](https://github.com/WordPress/gutenberg/pull/26480))
+-   Update WordPress versions document to include 5.6. ([26365](https://github.com/WordPress/gutenberg/pull/26365))
+-   Typos and tweaks: ([26491](https://github.com/WordPress/gutenberg/pull/26491)), ([26553](https://github.com/WordPress/gutenberg/pull/26553)), ([26437](https://github.com/WordPress/gutenberg/pull/26437)), ([26400](https://github.com/WordPress/gutenberg/pull/26400)), ([26566](https://github.com/WordPress/gutenberg/pull/26566)).
+-   Storybook: Fix broken BlockDraggable story. ([26457](https://github.com/WordPress/gutenberg/pull/26457)) ([26431](https://github.com/WordPress/gutenberg/pull/26431))
 
 ### Code Quality
 
-- Remove anonymous components from global styles sidebar. ([26604](https://github.com/WordPress/gutenberg/pull/26604))
-- Add types to components:
-  - Tip. ([26173](https://github.com/WordPress/gutenberg/pull/26173))
-  - BaseControl and VisuallyHidden. ([26078](https://github.com/WordPress/gutenberg/pull/26078))
-- Improve @wordpress/I18n types. ([26171](https://github.com/WordPress/gutenberg/pull/26171))
-- Migrate to builtin data controls. ([25993](https://github.com/WordPress/gutenberg/pull/25993)) ([25949](https://github.com/WordPress/gutenberg/pull/25949)) ([25773](https://github.com/WordPress/gutenberg/pull/25773)) ([25990](https://github.com/WordPress/gutenberg/pull/25990)) ([26509](https://github.com/WordPress/gutenberg/pull/26509)) ([25772](https://github.com/WordPress/gutenberg/pull/25772))
-- Chore: Ensure WordPress packages share the same hoisted dependencies. ([26453](https://github.com/WordPress/gutenberg/pull/26453))
-- Use CSS-in-JS in @wordpress/components:
-  - Spinner. ([26433](https://github.com/WordPress/gutenberg/pull/26433))
-  - Disabled. ([25843](https://github.com/WordPress/gutenberg/pull/25843))
+-   Remove anonymous components from global styles sidebar. ([26604](https://github.com/WordPress/gutenberg/pull/26604))
+-   Add types to components:
+    -   Tip. ([26173](https://github.com/WordPress/gutenberg/pull/26173))
+    -   BaseControl and VisuallyHidden. ([26078](https://github.com/WordPress/gutenberg/pull/26078))
+-   Improve @wordpress/I18n types. ([26171](https://github.com/WordPress/gutenberg/pull/26171))
+-   Migrate to builtin data controls. ([25993](https://github.com/WordPress/gutenberg/pull/25993)) ([25949](https://github.com/WordPress/gutenberg/pull/25949)) ([25773](https://github.com/WordPress/gutenberg/pull/25773)) ([25990](https://github.com/WordPress/gutenberg/pull/25990)) ([26509](https://github.com/WordPress/gutenberg/pull/26509)) ([25772](https://github.com/WordPress/gutenberg/pull/25772))
+-   Chore: Ensure WordPress packages share the same hoisted dependencies. ([26453](https://github.com/WordPress/gutenberg/pull/26453))
+-   Use CSS-in-JS in @wordpress/components:
+    -   Spinner. ([26433](https://github.com/WordPress/gutenberg/pull/26433))
+    -   Disabled. ([25843](https://github.com/WordPress/gutenberg/pull/25843))
 
 ### Build Tooling
 
-- Components: Copy SCSS file from react-dates to components package. ([26534](https://github.com/WordPress/gutenberg/pull/26534))
-- webpack: Replace legacy namedChunks/namedModules options with chunkIds/moduleIds. ([26502](https://github.com/WordPress/gutenberg/pull/26502))
-- Rewrite sideEffects flags to use only positive patterns. ([26452](https://github.com/WordPress/gutenberg/pull/26452))
-- Load the Twenty Twenty-one theme by default in Gutenberg's local environement. ([26414](https://github.com/WordPress/gutenberg/pull/26414))
-- Build: Assign the library exports to window.wp rather than this.wp. ([26272](https://github.com/WordPress/gutenberg/pull/26272))
-- Move to Dart Sass compiler. ([25628](https://github.com/WordPress/gutenberg/pull/25628))
-- Fix composer test failures due to invalid lock. ([26472](https://github.com/WordPress/gutenberg/pull/26472))
-- Update node-watch to 0.7.0. ([26403](https://github.com/WordPress/gutenberg/pull/26403))
-- Release tool: Support multiple RCs. ([25971](https://github.com/WordPress/gutenberg/pull/25971))
-- jest-puppeteer-axe: Migrate to @axe-core/puppeteer. ([25659](https://github.com/WordPress/gutenberg/pull/25659))
-- Improve End-to-End tests stability:
-  - Fix autosave end-to-end tests. ([26416](https://github.com/WordPress/gutenberg/pull/26416))
-  - Fix 'Multi entity saving -> site editor' end-to-end failures. ([26371](https://github.com/WordPress/gutenberg/pull/26371))
-  - Fix Twenty Twenty One related end-to-end test failures. ([26341](https://github.com/WordPress/gutenberg/pull/26341))
-  - Fix demo test by disabling the welcome dialog. ([26314](https://github.com/WordPress/gutenberg/pull/26314))
-  - Disable BlockPreviews from axe-core tests. ([26527](https://github.com/WordPress/gutenberg/pull/26527))
-  - Site editor: Fix end-to-end tests navigation panel. ([26454](https://github.com/WordPress/gutenberg/pull/26454))
-  - Consolidate sequential multi-entity-saving tests. ([26373](https://github.com/WordPress/gutenberg/pull/26373))
-  - Make the adding patterns test stable. ([26345](https://github.com/WordPress/gutenberg/pull/26345))
-
+-   Components: Copy SCSS file from react-dates to components package. ([26534](https://github.com/WordPress/gutenberg/pull/26534))
+-   webpack: Replace legacy namedChunks/namedModules options with chunkIds/moduleIds. ([26502](https://github.com/WordPress/gutenberg/pull/26502))
+-   Rewrite sideEffects flags to use only positive patterns. ([26452](https://github.com/WordPress/gutenberg/pull/26452))
+-   Load the Twenty Twenty-one theme by default in Gutenberg's local environement. ([26414](https://github.com/WordPress/gutenberg/pull/26414))
+-   Build: Assign the library exports to window.wp rather than this.wp. ([26272](https://github.com/WordPress/gutenberg/pull/26272))
+-   Move to Dart Sass compiler. ([25628](https://github.com/WordPress/gutenberg/pull/25628))
+-   Fix composer test failures due to invalid lock. ([26472](https://github.com/WordPress/gutenberg/pull/26472))
+-   Update node-watch to 0.7.0. ([26403](https://github.com/WordPress/gutenberg/pull/26403))
+-   Release tool: Support multiple RCs. ([25971](https://github.com/WordPress/gutenberg/pull/25971))
+-   jest-puppeteer-axe: Migrate to @axe-core/puppeteer. ([25659](https://github.com/WordPress/gutenberg/pull/25659))
+-   Improve End-to-End tests stability:
+    -   Fix autosave end-to-end tests. ([26416](https://github.com/WordPress/gutenberg/pull/26416))
+    -   Fix 'Multi entity saving -> site editor' end-to-end failures. ([26371](https://github.com/WordPress/gutenberg/pull/26371))
+    -   Fix Twenty Twenty One related end-to-end test failures. ([26341](https://github.com/WordPress/gutenberg/pull/26341))
+    -   Fix demo test by disabling the welcome dialog. ([26314](https://github.com/WordPress/gutenberg/pull/26314))
+    -   Disable BlockPreviews from axe-core tests. ([26527](https://github.com/WordPress/gutenberg/pull/26527))
+    -   Site editor: Fix end-to-end tests navigation panel. ([26454](https://github.com/WordPress/gutenberg/pull/26454))
+    -   Consolidate sequential multi-entity-saving tests. ([26373](https://github.com/WordPress/gutenberg/pull/26373))
+    -   Make the adding patterns test stable. ([26345](https://github.com/WordPress/gutenberg/pull/26345))
 
 ### Various
 
-- Create Block: Update the list of categories to pick from. ([26448](https://github.com/WordPress/gutenberg/pull/26448))
-- Removes extra fullstop from preferences. ([26586](https://github.com/WordPress/gutenberg/pull/26586))
-- @wordpress/scripts: Configure all the tools to skip `vendor` folder. ([26450](https://github.com/WordPress/gutenberg/pull/26450))
-
+-   Create Block: Update the list of categories to pick from. ([26448](https://github.com/WordPress/gutenberg/pull/26448))
+-   Removes extra fullstop from preferences. ([26586](https://github.com/WordPress/gutenberg/pull/26586))
+-   @wordpress/scripts: Configure all the tools to skip `vendor` folder. ([26450](https://github.com/WordPress/gutenberg/pull/26450))
 
 = 9.2.2 =
 
+## Changelog
 
 ### Bug Fixes
 
-- Fix widget previews in the widget screen https://github.com/WordPress/gutenberg/pull/26356 https://github.com/WordPress/gutenberg/pull/26417
-
+-   Fix widget previews in the widget screen https://github.com/WordPress/gutenberg/pull/26356 https://github.com/WordPress/gutenberg/pull/26417
 
 = 9.2.1 =
 
-### Bug Fixes
+## Changelog
 
- - Code block: preserve indentation on paste
- - Fix block supports for inner blocks
- - Fix archives block render function
+### Bug Fixes
 
+-   Code block: preserve indentation on paste
+-   Fix block supports for inner blocks
+-   Fix archives block render function
 
 = 9.2.0 =
 
+## Changelog
+
 ### Features
 
 -   Add video tracks functionality. ([25861](https://github.com/WordPress/gutenberg/pull/25861))
@@ -27348,343 +39373,341 @@ After:
 -   Add a description to the Site Title block. ([23462](https://github.com/WordPress/gutenberg/pull/23462))
 -   Add storybook story for the FocusableIframe component. ([22324](https://github.com/WordPress/gutenberg/pull/22324))
 
-
 = 9.1.0 =
 
+## Changelog
+
 ### Features
 
-- Add "open in new tab" feature to Social Links Block. ([25468](https://github.com/WordPress/gutenberg/pull/25468))
-- Add Image Size control to the Media & Text block. ([24795](https://github.com/WordPress/gutenberg/pull/24795))
+-   Add "open in new tab" feature to Social Links Block. ([25468](https://github.com/WordPress/gutenberg/pull/25468))
+-   Add Image Size control to the Media & Text block. ([24795](https://github.com/WordPress/gutenberg/pull/24795))
 
 ### Enhancements
 
-- Inserter: Add block pattern category selection. ([24954](https://github.com/WordPress/gutenberg/pull/24954))
-- Reduce minimum height to 1px for the Spacer block. ([25528](https://github.com/WordPress/gutenberg/pull/25528))
-- Show the Fullscreen keyboard shortcut. ([25395](https://github.com/WordPress/gutenberg/pull/25395))
-- Improve the Audio block shortcode transform to account for all sources. ([25114](https://github.com/WordPress/gutenberg/pull/25114))
-- Code block: Allow HTML editing & rich text content. ([24689](https://github.com/WordPress/gutenberg/pull/24689))
-- Remove appender from unselected Buttons and Social Icons block. ([25518](https://github.com/WordPress/gutenberg/pull/25518))
-- Widgets Screen:
-  - Register legacy widgets as block variations. ([24905](https://github.com/WordPress/gutenberg/pull/24905))
-  - Use the default block list appender for the widget areas. ([25635](https://github.com/WordPress/gutenberg/pull/25635))
-  - Add titles to Legacy Widgets. ([25638](https://github.com/WordPress/gutenberg/pull/25638))
-- Buttons block: Lighten editor DOM. ([23222](https://github.com/WordPress/gutenberg/pull/23222))
-- Copy: Reword block settings menu item labels. ([22955](https://github.com/WordPress/gutenberg/pull/22955))
-- Add a tooltip to the Drag & Drop handle. ([25606](https://github.com/WordPress/gutenberg/pull/25606)) ([25614](https://github.com/WordPress/gutenberg/pull/25614))
-- A11y:
-  - Add aria-haspopup property to the BlockNavigation component. ([25605](https://github.com/WordPress/gutenberg/pull/25605))
-  - Add aria-haspopup property to the TableOfContents component. ([25603](https://github.com/WordPress/gutenberg/pull/25603))
-  - Add aria-haspopup to the ToolSelector. ([25600](https://github.com/WordPress/gutenberg/pull/25600))
-  - Add aria-haspopup to the MediaReplaceFlow button. ([25597](https://github.com/WordPress/gutenberg/pull/25597))
-  - Add aria-haspopup attribute to CustomGradientBar component. ([25571](https://github.com/WordPress/gutenberg/pull/25571))
-  - Add aria-haspopup to CircularOptionPicker component. ([25564](https://github.com/WordPress/gutenberg/pull/25564))
-  - Add aria-describedby to featured-image button. ([24888](https://github.com/WordPress/gutenberg/pull/24888))
-- Don't show heading ancestor blocks in Document Outline. ([25599](https://github.com/WordPress/gutenberg/pull/25599))
-- Support the default link config for the Gallery and Image blocks (`image_default_link_type`). ([25578](https://github.com/WordPress/gutenberg/pull/25578)) ([25582](https://github.com/WordPress/gutenberg/pull/25582))
-- Social Icons Block: Let icons wrap. ([25334](https://github.com/WordPress/gutenberg/pull/25334))
+-   Inserter: Add block pattern category selection. ([24954](https://github.com/WordPress/gutenberg/pull/24954))
+-   Reduce minimum height to 1px for the Spacer block. ([25528](https://github.com/WordPress/gutenberg/pull/25528))
+-   Show the Fullscreen keyboard shortcut. ([25395](https://github.com/WordPress/gutenberg/pull/25395))
+-   Improve the Audio block shortcode transform to account for all sources. ([25114](https://github.com/WordPress/gutenberg/pull/25114))
+-   Code block: Allow HTML editing & rich text content. ([24689](https://github.com/WordPress/gutenberg/pull/24689))
+-   Remove appender from unselected Buttons and Social Icons block. ([25518](https://github.com/WordPress/gutenberg/pull/25518))
+-   Widgets Screen:
+    -   Register legacy widgets as block variations. ([24905](https://github.com/WordPress/gutenberg/pull/24905))
+    -   Use the default block list appender for the widget areas. ([25635](https://github.com/WordPress/gutenberg/pull/25635))
+    -   Add titles to Legacy Widgets. ([25638](https://github.com/WordPress/gutenberg/pull/25638))
+-   Buttons block: Lighten editor DOM. ([23222](https://github.com/WordPress/gutenberg/pull/23222))
+-   Copy: Reword block settings menu item labels. ([22955](https://github.com/WordPress/gutenberg/pull/22955))
+-   Add a tooltip to the Drag & Drop handle. ([25606](https://github.com/WordPress/gutenberg/pull/25606)) ([25614](https://github.com/WordPress/gutenberg/pull/25614))
+-   A11y:
+    -   Add aria-haspopup property to the BlockNavigation component. ([25605](https://github.com/WordPress/gutenberg/pull/25605))
+    -   Add aria-haspopup property to the TableOfContents component. ([25603](https://github.com/WordPress/gutenberg/pull/25603))
+    -   Add aria-haspopup to the ToolSelector. ([25600](https://github.com/WordPress/gutenberg/pull/25600))
+    -   Add aria-haspopup to the MediaReplaceFlow button. ([25597](https://github.com/WordPress/gutenberg/pull/25597))
+    -   Add aria-haspopup attribute to CustomGradientBar component. ([25571](https://github.com/WordPress/gutenberg/pull/25571))
+    -   Add aria-haspopup to CircularOptionPicker component. ([25564](https://github.com/WordPress/gutenberg/pull/25564))
+    -   Add aria-describedby to featured-image button. ([24888](https://github.com/WordPress/gutenberg/pull/24888))
+-   Don't show heading ancestor blocks in Document Outline. ([25599](https://github.com/WordPress/gutenberg/pull/25599))
+-   Support the default link config for the Gallery and Image blocks (`image_default_link_type`). ([25578](https://github.com/WordPress/gutenberg/pull/25578)) ([25582](https://github.com/WordPress/gutenberg/pull/25582))
+-   Social Icons Block: Let icons wrap. ([25334](https://github.com/WordPress/gutenberg/pull/25334))
 
 ### New APIs
 
-- Add new ComboboxControl. ([25442](https://github.com/WordPress/gutenberg/pull/25442))
-- Data Controls: Add new syncSelect control. ([25336](https://github.com/WordPress/gutenberg/pull/25336))
-- DateTimePicker: Add support for highlighting days. ([22032](https://github.com/WordPress/gutenberg/pull/22032))
-
-### Bug Fixes
-
-- Widgets Screen:
-  - Auto expand the last selected widget area when opening the inserter. ([25669](https://github.com/WordPress/gutenberg/pull/25669))
-  - Ensure all widgets are properly initialized when they're added, do not unmount widgets once they're mounted. ([25645](https://github.com/WordPress/gutenberg/pull/25645))
-  - Fix Legacy widget block previews and use iFrames. ([25443](https://github.com/WordPress/gutenberg/pull/25443)) ([14643](https://github.com/WordPress/gutenberg/pull/14643))
-  - Report save errors. ([25408](https://github.com/WordPress/gutenberg/pull/25408))
-  - Fix global inserter. ([24908](https://github.com/WordPress/gutenberg/pull/24908))
-- Fix RangeControl direct entry in input field. ([25609](https://github.com/WordPress/gutenberg/pull/25609))
-- A11y:
-  - Fix the color contrast in the code editor. ([25593](https://github.com/WordPress/gutenberg/pull/25593))
-  - Fix Publish sidebar Cancel button not usable through screen readers. ([25441](https://github.com/WordPress/gutenberg/pull/25441))
-  - Fix keyboard navigation on the Image block toolbar. ([25127](https://github.com/WordPress/gutenberg/pull/25127))
-  - More block: Use an actual placeholder for input text. ([23836](https://github.com/WordPress/gutenberg/pull/23836))
-- Fix nested container smart margins. ([25527](https://github.com/WordPress/gutenberg/pull/25527))
-- Fix add_filter instead of apply_filters. ([25512](https://github.com/WordPress/gutenberg/pull/25512))
-- Fix the WordPress embed preview in the editor. ([25370](https://github.com/WordPress/gutenberg/pull/25370))
-- Remove Embed block aspect ratio classes on url change. ([25295](https://github.com/WordPress/gutenberg/pull/25295))
-- Remove duplicate help item. ([25283](https://github.com/WordPress/gutenberg/pull/25283))
-- Fix Block Directory author average rating formating. ([24732](https://github.com/WordPress/gutenberg/pull/24732))
-- @wordpress/api-fetch:
-  - Fix preloading middleware referencing stale data. ([25550](https://github.com/WordPress/gutenberg/pull/25550))
-  - Check nonce header value before skipping adding it. ([25458](https://github.com/WordPress/gutenberg/pull/25458))
-- Use esc_html instead of esc_attr in the Archives block. ([25476](https://github.com/WordPress/gutenberg/pull/25476))
-- Fix Canceling Drag and Drop using ESC key. ([25317](https://github.com/WordPress/gutenberg/pull/25317))
-- Cover block: Add explilcit box-sizing style. ([25115](https://github.com/WordPress/gutenberg/pull/25115))
-- Use a ComboboxControl for the post author selector to fix loading issues for sites with a big number of authors. ([23237](https://github.com/WordPress/gutenberg/pull/23237))
+-   Add new ComboboxControl. ([25442](https://github.com/WordPress/gutenberg/pull/25442))
+-   Data Controls: Add new syncSelect control. ([25336](https://github.com/WordPress/gutenberg/pull/25336))
+-   DateTimePicker: Add support for highlighting days. ([22032](https://github.com/WordPress/gutenberg/pull/22032))
+
+### Bug Fixes
+
+-   Widgets Screen:
+    -   Auto expand the last selected widget area when opening the inserter. ([25669](https://github.com/WordPress/gutenberg/pull/25669))
+    -   Ensure all widgets are properly initialized when they're added, do not unmount widgets once they're mounted. ([25645](https://github.com/WordPress/gutenberg/pull/25645))
+    -   Fix Legacy widget block previews and use iFrames. ([25443](https://github.com/WordPress/gutenberg/pull/25443)) ([14643](https://github.com/WordPress/gutenberg/pull/14643))
+    -   Report save errors. ([25408](https://github.com/WordPress/gutenberg/pull/25408))
+    -   Fix global inserter. ([24908](https://github.com/WordPress/gutenberg/pull/24908))
+-   Fix RangeControl direct entry in input field. ([25609](https://github.com/WordPress/gutenberg/pull/25609))
+-   A11y:
+    -   Fix the color contrast in the code editor. ([25593](https://github.com/WordPress/gutenberg/pull/25593))
+    -   Fix Publish sidebar Cancel button not usable through screen readers. ([25441](https://github.com/WordPress/gutenberg/pull/25441))
+    -   Fix keyboard navigation on the Image block toolbar. ([25127](https://github.com/WordPress/gutenberg/pull/25127))
+    -   More block: Use an actual placeholder for input text. ([23836](https://github.com/WordPress/gutenberg/pull/23836))
+-   Fix nested container smart margins. ([25527](https://github.com/WordPress/gutenberg/pull/25527))
+-   Fix add_filter instead of apply_filters. ([25512](https://github.com/WordPress/gutenberg/pull/25512))
+-   Fix the WordPress embed preview in the editor. ([25370](https://github.com/WordPress/gutenberg/pull/25370))
+-   Remove Embed block aspect ratio classes on url change. ([25295](https://github.com/WordPress/gutenberg/pull/25295))
+-   Remove duplicate help item. ([25283](https://github.com/WordPress/gutenberg/pull/25283))
+-   Fix Block Directory author average rating formating. ([24732](https://github.com/WordPress/gutenberg/pull/24732))
+-   @wordpress/api-fetch:
+    -   Fix preloading middleware referencing stale data. ([25550](https://github.com/WordPress/gutenberg/pull/25550))
+    -   Check nonce header value before skipping adding it. ([25458](https://github.com/WordPress/gutenberg/pull/25458))
+-   Use esc_html instead of esc_attr in the Archives block. ([25476](https://github.com/WordPress/gutenberg/pull/25476))
+-   Fix Canceling Drag and Drop using ESC key. ([25317](https://github.com/WordPress/gutenberg/pull/25317))
+-   Cover block: Add explilcit box-sizing style. ([25115](https://github.com/WordPress/gutenberg/pull/25115))
+-   Use a ComboboxControl for the post author selector to fix loading issues for sites with a big number of authors. ([23237](https://github.com/WordPress/gutenberg/pull/23237))
 
 ### Performance
 
-- Avoid relying on DOM events to measure the loading time. ([25288](https://github.com/WordPress/gutenberg/pull/25288))
+-   Avoid relying on DOM events to measure the loading time. ([25288](https://github.com/WordPress/gutenberg/pull/25288))
 
 ### Experiments
 
-- Site Editor Screen:
-  - Fix wrong close label in the block inspector. ([25424](https://github.com/WordPress/gutenberg/pull/25424))
-  - Add basic template information to editor header. ([25320](https://github.com/WordPress/gutenberg/pull/25320))
-  - Fix the footer styling. ([25152](https://github.com/WordPress/gutenberg/pull/25152))
-  - Add a reset button to global styles sidebar. ([25426](https://github.com/WordPress/gutenberg/pull/25426))
-  - Show document subtext if template part child is selected. ([25544](https://github.com/WordPress/gutenberg/pull/25544))
-  - Add navigation panel. ([25506](https://github.com/WordPress/gutenberg/pull/25506))
-  - Fix site base URL. ([25409](https://github.com/WordPress/gutenberg/pull/25409))
-- Post and Site Blocks:
-  - Add link option in PostTitle block. ([25341](https://github.com/WordPress/gutenberg/pull/25341)) ([25397](https://github.com/WordPress/gutenberg/pull/25397))
-  - Register the Site Logo block using `register_block_type_from_metadata`. ([25289](https://github.com/WordPress/gutenberg/pull/25289))
-- Themes and global styles:
-  - Support defining colors and gradients config from theme.json. ([25419](https://github.com/WordPress/gutenberg/pull/25419))
-  - Support defining font sizes config from theme.json. ([25516](https://github.com/WordPress/gutenberg/pull/25516))
-  - Support custom units on theme.json. ([25217](https://github.com/WordPress/gutenberg/pull/25217))
-  - Add separate support keys for color and background color. ([25314](https://github.com/WordPress/gutenberg/pull/25314))
-  - Allow themes to enqueue custom CSS variables via theme.json. ([25446](https://github.com/WordPress/gutenberg/pull/25446)) ([25619](https://github.com/WordPress/gutenberg/pull/25619))
-  - Refactor theme.json format. ([25301](https://github.com/WordPress/gutenberg/pull/25301)) ([25407](https://github.com/WordPress/gutenberg/pull/25407))
-  - Update theme json documentation to account for latest changes. ([25369](https://github.com/WordPress/gutenberg/pull/25369))
-- Block API: Introduce useBlockWrapperProps hook to use light block DOM in the editor. ([23034](https://github.com/WordPress/gutenberg/pull/23034)) ([25679](https://github.com/WordPress/gutenberg/pull/25679)) ([25554](https://github.com/WordPress/gutenberg/pull/25554)) ([25515](https://github.com/WordPress/gutenberg/pull/25515))
-- Navigation block and screen:
-  - Handle block menu items. ([24846](https://github.com/WordPress/gutenberg/pull/24846))
-  - Avoid auto-focusing Navigation block in Navigation screen. ([25592](https://github.com/WordPress/gutenberg/pull/25592))
-  - Change the block description. ([25531](https://github.com/WordPress/gutenberg/pull/25531)) ([25555](https://github.com/WordPress/gutenberg/pull/25555))
-  - Allow Social Links within Navigation Block. ([25357](https://github.com/WordPress/gutenberg/pull/25357))
-  - Wrap navigation editing features with filters. ([25329](https://github.com/WordPress/gutenberg/pull/25329))
-  - Add move markers to list view. ([25205](https://github.com/WordPress/gutenberg/pull/25205))
-- Iterating on the Navigation Component ([25608](https://github.com/WordPress/gutenberg/pull/25608)) ([25495](https://github.com/WordPress/gutenberg/pull/25495)) ([25572](https://github.com/WordPress/gutenberg/pull/25572)) ([25540](https://github.com/WordPress/gutenberg/pull/25540)) ([25520](https://github.com/WordPress/gutenberg/pull/25520)) ([25507](https://github.com/WordPress/gutenberg/pull/25507)) ([25367](https://github.com/WordPress/gutenberg/pull/25367)) ([25364](https://github.com/WordPress/gutenberg/pull/25364)) ([25340](https://github.com/WordPress/gutenberg/pull/25340)) ([25327](https://github.com/WordPress/gutenberg/pull/25327)) ([25281](https://github.com/WordPress/gutenberg/pull/25281)) ([25280](https://github.com/WordPress/gutenberg/pull/25280))
-
+-   Site Editor Screen:
+    -   Fix wrong close label in the block inspector. ([25424](https://github.com/WordPress/gutenberg/pull/25424))
+    -   Add basic template information to editor header. ([25320](https://github.com/WordPress/gutenberg/pull/25320))
+    -   Fix the footer styling. ([25152](https://github.com/WordPress/gutenberg/pull/25152))
+    -   Add a reset button to global styles sidebar. ([25426](https://github.com/WordPress/gutenberg/pull/25426))
+    -   Show document subtext if template part child is selected. ([25544](https://github.com/WordPress/gutenberg/pull/25544))
+    -   Add navigation panel. ([25506](https://github.com/WordPress/gutenberg/pull/25506))
+    -   Fix site base URL. ([25409](https://github.com/WordPress/gutenberg/pull/25409))
+-   Post and Site Blocks:
+    -   Add link option in PostTitle block. ([25341](https://github.com/WordPress/gutenberg/pull/25341)) ([25397](https://github.com/WordPress/gutenberg/pull/25397))
+    -   Register the Site Logo block using `register_block_type_from_metadata`. ([25289](https://github.com/WordPress/gutenberg/pull/25289))
+-   Themes and global styles:
+    -   Support defining colors and gradients config from theme.json. ([25419](https://github.com/WordPress/gutenberg/pull/25419))
+    -   Support defining font sizes config from theme.json. ([25516](https://github.com/WordPress/gutenberg/pull/25516))
+    -   Support custom units on theme.json. ([25217](https://github.com/WordPress/gutenberg/pull/25217))
+    -   Add separate support keys for color and background color. ([25314](https://github.com/WordPress/gutenberg/pull/25314))
+    -   Allow themes to enqueue custom CSS variables via theme.json. ([25446](https://github.com/WordPress/gutenberg/pull/25446)) ([25619](https://github.com/WordPress/gutenberg/pull/25619))
+    -   Refactor theme.json format. ([25301](https://github.com/WordPress/gutenberg/pull/25301)) ([25407](https://github.com/WordPress/gutenberg/pull/25407))
+    -   Update theme json documentation to account for latest changes. ([25369](https://github.com/WordPress/gutenberg/pull/25369))
+-   Block API: Introduce useBlockWrapperProps hook to use light block DOM in the editor. ([23034](https://github.com/WordPress/gutenberg/pull/23034)) ([25679](https://github.com/WordPress/gutenberg/pull/25679)) ([25554](https://github.com/WordPress/gutenberg/pull/25554)) ([25515](https://github.com/WordPress/gutenberg/pull/25515))
+-   Navigation block and screen:
+    -   Handle block menu items. ([24846](https://github.com/WordPress/gutenberg/pull/24846))
+    -   Avoid auto-focusing Navigation block in Navigation screen. ([25592](https://github.com/WordPress/gutenberg/pull/25592))
+    -   Change the block description. ([25531](https://github.com/WordPress/gutenberg/pull/25531)) ([25555](https://github.com/WordPress/gutenberg/pull/25555))
+    -   Allow Social Links within Navigation Block. ([25357](https://github.com/WordPress/gutenberg/pull/25357))
+    -   Wrap navigation editing features with filters. ([25329](https://github.com/WordPress/gutenberg/pull/25329))
+    -   Add move markers to list view. ([25205](https://github.com/WordPress/gutenberg/pull/25205))
+-   Iterating on the Navigation Component ([25608](https://github.com/WordPress/gutenberg/pull/25608)) ([25495](https://github.com/WordPress/gutenberg/pull/25495)) ([25572](https://github.com/WordPress/gutenberg/pull/25572)) ([25540](https://github.com/WordPress/gutenberg/pull/25540)) ([25520](https://github.com/WordPress/gutenberg/pull/25520)) ([25507](https://github.com/WordPress/gutenberg/pull/25507)) ([25367](https://github.com/WordPress/gutenberg/pull/25367)) ([25364](https://github.com/WordPress/gutenberg/pull/25364)) ([25340](https://github.com/WordPress/gutenberg/pull/25340)) ([25327](https://github.com/WordPress/gutenberg/pull/25327)) ([25281](https://github.com/WordPress/gutenberg/pull/25281)) ([25280](https://github.com/WordPress/gutenberg/pull/25280))
 
 ### Documentation
 
-- Add a data format and flow architecture document. ([25299](https://github.com/WordPress/gutenberg/pull/25299))
-- @wordpress/env: Add documentation for inspecting the docker compose file. ([25666](https://github.com/WordPress/gutenberg/pull/25666))
-- Add new block supports page to the handbook. ([25647](https://github.com/WordPress/gutenberg/pull/25647))
-- Block Directory: Add developer documentation. ([25591](https://github.com/WordPress/gutenberg/pull/25591))
-- Move custom-fields note to the 'Register Meta Field' documentation. ([25584](https://github.com/WordPress/gutenberg/pull/25584))
-- Add Block Editor Components documentation:
-  - Warning ([25574](https://github.com/WordPress/gutenberg/pull/25574))
-  - FontSizePicker ([25568](https://github.com/WordPress/gutenberg/pull/25568))
-  - UnitControl ([25565](https://github.com/WordPress/gutenberg/pull/25565))
-  - CopyHandler ([25342](https://github.com/WordPress/gutenberg/pull/25342))
-  - MultiSelection  ([25306](https://github.com/WordPress/gutenberg/pull/25306))
-  - LineHeightControl ([25303](https://github.com/WordPress/gutenberg/pull/25303))
-  - BlockAlignmentToolbar ([25212](https://github.com/WordPress/gutenberg/pull/25212))
-  - AlignmentToolbar ([25210](https://github.com/WordPress/gutenberg/pull/25210))
-  - BlockFormatControls ([25573](https://github.com/WordPress/gutenberg/pull/25573))
-- Add Caveats section for MAMP. ([25444](https://github.com/WordPress/gutenberg/pull/25444))
-- Add FormTokenField story. ([25439](https://github.com/WordPress/gutenberg/pull/25439))
-- Improve documentation for the data registry control and selector creators. ([25335](https://github.com/WordPress/gutenberg/pull/25335))
-- Update git workflow documentation. ([25164](https://github.com/WordPress/gutenberg/pull/25164))
-- Refresh the Getting Started guide. ([25090](https://github.com/WordPress/gutenberg/pull/25090))
-- Update JavaScript troubleshooting guide. ([24105](https://github.com/WordPress/gutenberg/pull/24105))
-- Enhance the Block Context documentation. ([25272](https://github.com/WordPress/gutenberg/pull/25272))
-- Typos: ([25359](https://github.com/WordPress/gutenberg/pull/25359)) ([25653](https://github.com/WordPress/gutenberg/pull/25653))
+-   Add a data format and flow architecture document. ([25299](https://github.com/WordPress/gutenberg/pull/25299))
+-   @wordpress/env: Add documentation for inspecting the docker compose file. ([25666](https://github.com/WordPress/gutenberg/pull/25666))
+-   Add new block supports page to the handbook. ([25647](https://github.com/WordPress/gutenberg/pull/25647))
+-   Block Directory: Add developer documentation. ([25591](https://github.com/WordPress/gutenberg/pull/25591))
+-   Move custom-fields note to the 'Register Meta Field' documentation. ([25584](https://github.com/WordPress/gutenberg/pull/25584))
+-   Add Block Editor Components documentation:
+    -   Warning ([25574](https://github.com/WordPress/gutenberg/pull/25574))
+    -   FontSizePicker ([25568](https://github.com/WordPress/gutenberg/pull/25568))
+    -   UnitControl ([25565](https://github.com/WordPress/gutenberg/pull/25565))
+    -   CopyHandler ([25342](https://github.com/WordPress/gutenberg/pull/25342))
+    -   MultiSelection ([25306](https://github.com/WordPress/gutenberg/pull/25306))
+    -   LineHeightControl ([25303](https://github.com/WordPress/gutenberg/pull/25303))
+    -   BlockAlignmentToolbar ([25212](https://github.com/WordPress/gutenberg/pull/25212))
+    -   AlignmentToolbar ([25210](https://github.com/WordPress/gutenberg/pull/25210))
+    -   BlockFormatControls ([25573](https://github.com/WordPress/gutenberg/pull/25573))
+-   Add Caveats section for MAMP. ([25444](https://github.com/WordPress/gutenberg/pull/25444))
+-   Add FormTokenField story. ([25439](https://github.com/WordPress/gutenberg/pull/25439))
+-   Improve documentation for the data registry control and selector creators. ([25335](https://github.com/WordPress/gutenberg/pull/25335))
+-   Update git workflow documentation. ([25164](https://github.com/WordPress/gutenberg/pull/25164))
+-   Refresh the Getting Started guide. ([25090](https://github.com/WordPress/gutenberg/pull/25090))
+-   Update JavaScript troubleshooting guide. ([24105](https://github.com/WordPress/gutenberg/pull/24105))
+-   Enhance the Block Context documentation. ([25272](https://github.com/WordPress/gutenberg/pull/25272))
+-   Typos: ([25359](https://github.com/WordPress/gutenberg/pull/25359)) ([25653](https://github.com/WordPress/gutenberg/pull/25653))
 
 ### Code Quality
 
-- Update the Dashicon component to rely on the font that ships with WordPress. ([20003](https://github.com/WordPress/gutenberg/pull/20003))
-- Add new $gray-200 SASS variable and use for skeleton borders. ([25491](https://github.com/WordPress/gutenberg/pull/25491))
-- Block Editor: Remove empty module focus-detector. ([25561](https://github.com/WordPress/gutenberg/pull/25561))
-- Image block: Avoid remounting to focus caption. ([25493](https://github.com/WordPress/gutenberg/pull/25493))
-- Add explicit boxSizing style to Placeholder component. ([25463](https://github.com/WordPress/gutenberg/pull/25463))
-- Remove classic block code used to support WP 4.9. ([25365](https://github.com/WordPress/gutenberg/pull/25365))
-- Add RichText value type definition. ([25363](https://github.com/WordPress/gutenberg/pull/25363))
-- Avoid global DOM dependencies. ([25332](https://github.com/WordPress/gutenberg/pull/25332))
-- Use controls from the Data Controls package instead of local ones. ([25235](https://github.com/WordPress/gutenberg/pull/25235))
-- RichText: Simplify withFormatTypes as hook. ([23145](https://github.com/WordPress/gutenberg/pull/23145))
-- Video block: Use hooks. ([25513](https://github.com/WordPress/gutenberg/pull/25513))
-- Remove wp_area custom post type. ([25497](https://github.com/WordPress/gutenberg/pull/25497))
-- Post Featured Image: Remove redundant condition. ([25490](https://github.com/WordPress/gutenberg/pull/25490))
-- Move legacy-widget block over to edit-widgets package. ([25371](https://github.com/WordPress/gutenberg/pull/25371)) ([25404](https://github.com/WordPress/gutenberg/pull/25404))
-- Don't use percent units for line-height. ([25398](https://github.com/WordPress/gutenberg/pull/25398))
-- Change wording and names to not include "whitelist". ([25396](https://github.com/WordPress/gutenberg/pull/25396))
-- Don't discard all promises results when one of them rejects. ([25302](https://github.com/WordPress/gutenberg/pull/25302))
-- Block Directory: Switch to `blocks.registerBlockType` filter. ([25264](https://github.com/WordPress/gutenberg/pull/25264))
-- Fix some javascript warnings. ([24996](https://github.com/WordPress/gutenberg/pull/24996))
+-   Update the Dashicon component to rely on the font that ships with WordPress. ([20003](https://github.com/WordPress/gutenberg/pull/20003))
+-   Add new $gray-200 SASS variable and use for skeleton borders. ([25491](https://github.com/WordPress/gutenberg/pull/25491))
+-   Block Editor: Remove empty module focus-detector. ([25561](https://github.com/WordPress/gutenberg/pull/25561))
+-   Image block: Avoid remounting to focus caption. ([25493](https://github.com/WordPress/gutenberg/pull/25493))
+-   Add explicit boxSizing style to Placeholder component. ([25463](https://github.com/WordPress/gutenberg/pull/25463))
+-   Remove classic block code used to support WP 4.9. ([25365](https://github.com/WordPress/gutenberg/pull/25365))
+-   Add RichText value type definition. ([25363](https://github.com/WordPress/gutenberg/pull/25363))
+-   Avoid global DOM dependencies. ([25332](https://github.com/WordPress/gutenberg/pull/25332))
+-   Use controls from the Data Controls package instead of local ones. ([25235](https://github.com/WordPress/gutenberg/pull/25235))
+-   RichText: Simplify withFormatTypes as hook. ([23145](https://github.com/WordPress/gutenberg/pull/23145))
+-   Video block: Use hooks. ([25513](https://github.com/WordPress/gutenberg/pull/25513))
+-   Remove wp_area custom post type. ([25497](https://github.com/WordPress/gutenberg/pull/25497))
+-   Post Featured Image: Remove redundant condition. ([25490](https://github.com/WordPress/gutenberg/pull/25490))
+-   Move legacy-widget block over to edit-widgets package. ([25371](https://github.com/WordPress/gutenberg/pull/25371)) ([25404](https://github.com/WordPress/gutenberg/pull/25404))
+-   Don't use percent units for line-height. ([25398](https://github.com/WordPress/gutenberg/pull/25398))
+-   Change wording and names to not include "whitelist". ([25396](https://github.com/WordPress/gutenberg/pull/25396))
+-   Don't discard all promises results when one of them rejects. ([25302](https://github.com/WordPress/gutenberg/pull/25302))
+-   Block Directory: Switch to `blocks.registerBlockType` filter. ([25264](https://github.com/WordPress/gutenberg/pull/25264))
+-   Fix some javascript warnings. ([24996](https://github.com/WordPress/gutenberg/pull/24996))
 
 ### Various
 
-- Remove the Block-based widgets editor from the customizer. ([25626](https://github.com/WordPress/gutenberg/pull/25626))
-- Cover block: Remove default position (center/center) className from rendering. ([25346](https://github.com/WordPress/gutenberg/pull/25346))
-- Fix the default label position in SelectControl. ([25427](https://github.com/WordPress/gutenberg/pull/25427))
-- DropdownMenu tooltip default to true. ([25391](https://github.com/WordPress/gutenberg/pull/25391))
-- Pass block pattern name when using replaceBlocks and insertBlocks. ([25165](https://github.com/WordPress/gutenberg/pull/25165)). ([25433](https://github.com/WordPress/gutenberg/pull/25433))
-- Babel Preset: Update Babel version to 7.11.x. ([25351](https://github.com/WordPress/gutenberg/pull/25351))
-- InputControl: Remove floating label variant. ([25308](https://github.com/WordPress/gutenberg/pull/25308))
-
+-   Remove the Block-based widgets editor from the customizer. ([25626](https://github.com/WordPress/gutenberg/pull/25626))
+-   Cover block: Remove default position (center/center) className from rendering. ([25346](https://github.com/WordPress/gutenberg/pull/25346))
+-   Fix the default label position in SelectControl. ([25427](https://github.com/WordPress/gutenberg/pull/25427))
+-   DropdownMenu tooltip default to true. ([25391](https://github.com/WordPress/gutenberg/pull/25391))
+-   Pass block pattern name when using replaceBlocks and insertBlocks. ([25165](https://github.com/WordPress/gutenberg/pull/25165)). ([25433](https://github.com/WordPress/gutenberg/pull/25433))
+-   Babel Preset: Update Babel version to 7.11.x. ([25351](https://github.com/WordPress/gutenberg/pull/25351))
+-   InputControl: Remove floating label variant. ([25308](https://github.com/WordPress/gutenberg/pull/25308))
 
 = 9.0.0 =
 
-### Features
+## Changelog
 
-- Query block:
-  - add search. ([25222](https://github.com/WordPress/gutenberg/pull/25222))
-  - add filtering by author support in Query block. ([25149](https://github.com/WordPress/gutenberg/pull/25149))
-  - add order and order by support. ([24691](https://github.com/WordPress/gutenberg/pull/24691))
-  - add tags support. ([25005](https://github.com/WordPress/gutenberg/pull/25005))
-- Navigation screen:
-  - add drag and drop to List View. ([23952](https://github.com/WordPress/gutenberg/pull/23952))
-  - implement redesign of screen. ([25178](https://github.com/WordPress/gutenberg/pull/25178))
-  - add support for advanced menu item properties. ([25062](https://github.com/WordPress/gutenberg/pull/25062))
+### Features
 
+-   Query block:
+    -   add search. ([25222](https://github.com/WordPress/gutenberg/pull/25222))
+    -   add filtering by author support in Query block. ([25149](https://github.com/WordPress/gutenberg/pull/25149))
+    -   add order and order by support. ([24691](https://github.com/WordPress/gutenberg/pull/24691))
+    -   add tags support. ([25005](https://github.com/WordPress/gutenberg/pull/25005))
+-   Navigation screen:
+    -   add drag and drop to List View. ([23952](https://github.com/WordPress/gutenberg/pull/23952))
+    -   implement redesign of screen. ([25178](https://github.com/WordPress/gutenberg/pull/25178))
+    -   add support for advanced menu item properties. ([25062](https://github.com/WordPress/gutenberg/pull/25062))
 
 ### Enhancements
 
-- Drag&Drop: add drag handle to block toolbar. ([24852](https://github.com/WordPress/gutenberg/pull/24852))
-- Drag&Drop: improve single block case. ([25107](https://github.com/WordPress/gutenberg/pull/25107))
-- Include the block variations on the inserter selector. ([25182](https://github.com/WordPress/gutenberg/pull/25182))
-- List view styling improvements. ([25143](https://github.com/WordPress/gutenberg/pull/25143))
-- Update pencil icon. ([25135](https://github.com/WordPress/gutenberg/pull/25135))
-- Refactor and make consistent post and site headers. ([25134](https://github.com/WordPress/gutenberg/pull/25134))
-- Limit the block slash inserter to 9 items and show most used by default. ([25113](https://github.com/WordPress/gutenberg/pull/25113))
-- Polish menu item icon locations. ([25106](https://github.com/WordPress/gutenberg/pull/25106))
-- Improve the block and patterns search algorithm. ([25105](https://github.com/WordPress/gutenberg/pull/25105))
-- Template part: attribute feature parity with group block. ([25029](https://github.com/WordPress/gutenberg/pull/25029))
-- Allow sharp gradients. ([24967](https://github.com/WordPress/gutenberg/pull/24967))
-- Post content: show placeholder if trying to render itself. ([24010](https://github.com/WordPress/gutenberg/pull/24010))
-- Add reusable block icon. ([23552](https://github.com/WordPress/gutenberg/pull/23552))
-- Let ID-less gallery shortcodes fall to Shortcode block. ([25144](https://github.com/WordPress/gutenberg/pull/25144))
-- Mirror WordPress plugin install text for blocks. ([25084](https://github.com/WordPress/gutenberg/pull/25084))
-- Allow inserting an h1 using # + space. ([25075](https://github.com/WordPress/gutenberg/pull/25075))
-- Widgets screen: add plugin area. ([25074](https://github.com/WordPress/gutenberg/pull/25074))
-- Add title attribute to Navigation Link block. ([24993](https://github.com/WordPress/gutenberg/pull/24993))
-- Add a way to change template parts. ([24990](https://github.com/WordPress/gutenberg/pull/24990))
-- Transform multiple heading blocks to list or paragraphs. ([24977](https://github.com/WordPress/gutenberg/pull/24977))
-- Remove redundant type badges in navigation link control. ([24885](https://github.com/WordPress/gutenberg/pull/24885))
-- Fix multiple trailing inserters for nested InnerBlocks. ([24836](https://github.com/WordPress/gutenberg/pull/24836))
-- Search Block: Add button, label, and width options. ([24666](https://github.com/WordPress/gutenberg/pull/24666))
-- Display labels instead of icons in top toolbar. ([24304](https://github.com/WordPress/gutenberg/pull/24304))
-- Add option to show icon labels. ([24234](https://github.com/WordPress/gutenberg/pull/24234))
-- Add a "reinstall" button when a block type is not found. ([22631](https://github.com/WordPress/gutenberg/pull/22631))
-
-
-### Bug Fixes
-
-- Template part: fix rename before customize bug. ([25206](https://github.com/WordPress/gutenberg/pull/25206))
-- Template part: fix auto-drafting to support sub-directories. ([25063](https://github.com/WordPress/gutenberg/pull/25063))
-- Template part: use cleaned slug to query. ([25030](https://github.com/WordPress/gutenberg/pull/25030))
-- Classic block: optional chain on possibly null editor. ([25163](https://github.com/WordPress/gutenberg/pull/25163))
-- Classic block: show contents on load. ([25162](https://github.com/WordPress/gutenberg/pull/25162))
-- Embed Block: Fix crash in isFromWordPress helper if preview.html is false. ([25140](https://github.com/WordPress/gutenberg/pull/25140))
-- Cover block: fix width regression. ([25103](https://github.com/WordPress/gutenberg/pull/25103))
-- Navigation block: reduce subnavigation arrow padding. ([24200](https://github.com/WordPress/gutenberg/pull/24200))
-- GlobalStyles: fix nested features algorithm. ([25215](https://github.com/WordPress/gutenberg/pull/25215))
-- GlobalStyles: fix settings name. ([25040](https://github.com/WordPress/gutenberg/pull/25040))
-- Widgets screen: convert the toolbar to ARIA toolbar. ([25111](https://github.com/WordPress/gutenberg/pull/25111))
-- Widgets screen: add labels for settings and close button. ([25101](https://github.com/WordPress/gutenberg/pull/25101))
-- Navigation screen: fix creating Navigation from pages or menu with HTML in title. ([24673](https://github.com/WordPress/gutenberg/pull/24673))
-- Element: add and upgrade @types/{react,react-dom} dependencies. ([25086](https://github.com/WordPress/gutenberg/pull/25086))
-- Add safeguard to AuthorSelect component until authors are fetched. ([25214](https://github.com/WordPress/gutenberg/pull/25214))
-- Fix PHP error when users don't have access to the Appearance menu. ([25073](https://github.com/WordPress/gutenberg/pull/25073))
-- Polish horizontal movers. ([25037](https://github.com/WordPress/gutenberg/pull/25037))
-- Fix PHP Notice: Check that the `query` arg exists before using it. ([25006](https://github.com/WordPress/gutenberg/pull/25006))
-- Fix gradient swatches stacking badly with scrollbar. ([25002](https://github.com/WordPress/gutenberg/pull/25002))
-- Fix unlinked padding controls JS error. ([25000](https://github.com/WordPress/gutenberg/pull/25000))
-- Show external icon on help button. ([24622](https://github.com/WordPress/gutenberg/pull/24622))
-- Check if block attributes exist before splitting. ([25229](https://github.com/WordPress/gutenberg/pull/25229))
-- Revert "InnerBlocks: Introduce prop to specify render callback for each block.". ([25196](https://github.com/WordPress/gutenberg/pull/25196))
-- Core Data: Bring back support for nested `_fields` values. ([25083](https://github.com/WordPress/gutenberg/pull/25083))
-- Prevent TypeError for projects without a local Prettier configuration. ([25068](https://github.com/WordPress/gutenberg/pull/25068))
-- Image Block: Properly show errors on drag n drop. ([25004](https://github.com/WordPress/gutenberg/pull/25004))
-- Add block inspector virtual bubbling option. ([24991](https://github.com/WordPress/gutenberg/pull/24991))
-- Remove extra slash from `$block_json_file`. ([24829](https://github.com/WordPress/gutenberg/pull/24829))
-- Inserter: Test to make sure the Inserter menu is closed. ([24610](https://github.com/WordPress/gutenberg/pull/24610))
-- Date: Update `moment-timezone` package to support string timezones. ([22866](https://github.com/WordPress/gutenberg/pull/22866))
-- Fix enqueue presets for global styles. ([25286](https://github.com/WordPress/gutenberg/pull/25286))
-- Fix stylesheet generation. ([25293](https://github.com/WordPress/gutenberg/pull/25293))
-
-### Experiments
-
-- Group block: add padding support. ([24966](https://github.com/WordPress/gutenberg/pull/24966))
-- Control the block editor via theme.json:
-  - support for custom link color. ([25148](https://github.com/WordPress/gutenberg/pull/25148))
-  - support for custom spacing. ([25141](https://github.com/WordPress/gutenberg/pull/25141))
-  - support for custom line heights. ([25043](https://github.com/WordPress/gutenberg/pull/25043))
-  - support for custom font sizes. ([25038](https://github.com/WordPress/gutenberg/pull/25038))
-  - support for custom gradients. ([24964](https://github.com/WordPress/gutenberg/pull/24964))
-- Navigation component: composition proposal. ([25057](https://github.com/WordPress/gutenberg/pull/25057))
-- Replace accessibilityLabel by label on RadioGroup. ([25128](https://github.com/WordPress/gutenberg/pull/25128))
-- Global styles:
-  - add sidebar at edit site screen. ([24250](https://github.com/WordPress/gutenberg/pull/24250))
-  - print minified css. ([24924](https://github.com/WordPress/gutenberg/pull/24924))
-  - centralize style & support mappings for blocks. ([25185](https://github.com/WordPress/gutenberg/pull/25185))
-  - centralize client side global styles mappings. ([25056](https://github.com/WordPress/gutenberg/pull/25056))
-  - set property to change one property accept all lodash paths. ([25159](https://github.com/WordPress/gutenberg/pull/25159))
+-   Drag&Drop: add drag handle to block toolbar. ([24852](https://github.com/WordPress/gutenberg/pull/24852))
+-   Drag&Drop: improve single block case. ([25107](https://github.com/WordPress/gutenberg/pull/25107))
+-   Include the block variations on the inserter selector. ([25182](https://github.com/WordPress/gutenberg/pull/25182))
+-   List view styling improvements. ([25143](https://github.com/WordPress/gutenberg/pull/25143))
+-   Update pencil icon. ([25135](https://github.com/WordPress/gutenberg/pull/25135))
+-   Refactor and make consistent post and site headers. ([25134](https://github.com/WordPress/gutenberg/pull/25134))
+-   Limit the block slash inserter to 9 items and show most used by default. ([25113](https://github.com/WordPress/gutenberg/pull/25113))
+-   Polish menu item icon locations. ([25106](https://github.com/WordPress/gutenberg/pull/25106))
+-   Improve the block and patterns search algorithm. ([25105](https://github.com/WordPress/gutenberg/pull/25105))
+-   Template part: attribute feature parity with group block. ([25029](https://github.com/WordPress/gutenberg/pull/25029))
+-   Allow sharp gradients. ([24967](https://github.com/WordPress/gutenberg/pull/24967))
+-   Post content: show placeholder if trying to render itself. ([24010](https://github.com/WordPress/gutenberg/pull/24010))
+-   Add reusable block icon. ([23552](https://github.com/WordPress/gutenberg/pull/23552))
+-   Let ID-less gallery shortcodes fall to Shortcode block. ([25144](https://github.com/WordPress/gutenberg/pull/25144))
+-   Mirror WordPress plugin install text for blocks. ([25084](https://github.com/WordPress/gutenberg/pull/25084))
+-   Allow inserting an h1 using # + space. ([25075](https://github.com/WordPress/gutenberg/pull/25075))
+-   Widgets screen: add plugin area. ([25074](https://github.com/WordPress/gutenberg/pull/25074))
+-   Add title attribute to Navigation Link block. ([24993](https://github.com/WordPress/gutenberg/pull/24993))
+-   Add a way to change template parts. ([24990](https://github.com/WordPress/gutenberg/pull/24990))
+-   Transform multiple heading blocks to list or paragraphs. ([24977](https://github.com/WordPress/gutenberg/pull/24977))
+-   Remove redundant type badges in navigation link control. ([24885](https://github.com/WordPress/gutenberg/pull/24885))
+-   Fix multiple trailing inserters for nested InnerBlocks. ([24836](https://github.com/WordPress/gutenberg/pull/24836))
+-   Search Block: Add button, label, and width options. ([24666](https://github.com/WordPress/gutenberg/pull/24666))
+-   Display labels instead of icons in top toolbar. ([24304](https://github.com/WordPress/gutenberg/pull/24304))
+-   Add option to show icon labels. ([24234](https://github.com/WordPress/gutenberg/pull/24234))
+-   Add a "reinstall" button when a block type is not found. ([22631](https://github.com/WordPress/gutenberg/pull/22631))
 
+### Bug Fixes
 
-### Documentation
+-   Template part: fix rename before customize bug. ([25206](https://github.com/WordPress/gutenberg/pull/25206))
+-   Template part: fix auto-drafting to support sub-directories. ([25063](https://github.com/WordPress/gutenberg/pull/25063))
+-   Template part: use cleaned slug to query. ([25030](https://github.com/WordPress/gutenberg/pull/25030))
+-   Classic block: optional chain on possibly null editor. ([25163](https://github.com/WordPress/gutenberg/pull/25163))
+-   Classic block: show contents on load. ([25162](https://github.com/WordPress/gutenberg/pull/25162))
+-   Embed Block: Fix crash in isFromWordPress helper if preview.html is false. ([25140](https://github.com/WordPress/gutenberg/pull/25140))
+-   Cover block: fix width regression. ([25103](https://github.com/WordPress/gutenberg/pull/25103))
+-   Navigation block: reduce subnavigation arrow padding. ([24200](https://github.com/WordPress/gutenberg/pull/24200))
+-   GlobalStyles: fix nested features algorithm. ([25215](https://github.com/WordPress/gutenberg/pull/25215))
+-   GlobalStyles: fix settings name. ([25040](https://github.com/WordPress/gutenberg/pull/25040))
+-   Widgets screen: convert the toolbar to ARIA toolbar. ([25111](https://github.com/WordPress/gutenberg/pull/25111))
+-   Widgets screen: add labels for settings and close button. ([25101](https://github.com/WordPress/gutenberg/pull/25101))
+-   Navigation screen: fix creating Navigation from pages or menu with HTML in title. ([24673](https://github.com/WordPress/gutenberg/pull/24673))
+-   Element: add and upgrade @types/{react,react-dom} dependencies. ([25086](https://github.com/WordPress/gutenberg/pull/25086))
+-   Add safeguard to AuthorSelect component until authors are fetched. ([25214](https://github.com/WordPress/gutenberg/pull/25214))
+-   Fix PHP error when users don't have access to the Appearance menu. ([25073](https://github.com/WordPress/gutenberg/pull/25073))
+-   Polish horizontal movers. ([25037](https://github.com/WordPress/gutenberg/pull/25037))
+-   Fix PHP Notice: Check that the `query` arg exists before using it. ([25006](https://github.com/WordPress/gutenberg/pull/25006))
+-   Fix gradient swatches stacking badly with scrollbar. ([25002](https://github.com/WordPress/gutenberg/pull/25002))
+-   Fix unlinked padding controls JS error. ([25000](https://github.com/WordPress/gutenberg/pull/25000))
+-   Show external icon on help button. ([24622](https://github.com/WordPress/gutenberg/pull/24622))
+-   Check if block attributes exist before splitting. ([25229](https://github.com/WordPress/gutenberg/pull/25229))
+-   Revert "InnerBlocks: Introduce prop to specify render callback for each block.". ([25196](https://github.com/WordPress/gutenberg/pull/25196))
+-   Core Data: Bring back support for nested `_fields` values. ([25083](https://github.com/WordPress/gutenberg/pull/25083))
+-   Prevent TypeError for projects without a local Prettier configuration. ([25068](https://github.com/WordPress/gutenberg/pull/25068))
+-   Image Block: Properly show errors on drag n drop. ([25004](https://github.com/WordPress/gutenberg/pull/25004))
+-   Add block inspector virtual bubbling option. ([24991](https://github.com/WordPress/gutenberg/pull/24991))
+-   Remove extra slash from `$block_json_file`. ([24829](https://github.com/WordPress/gutenberg/pull/24829))
+-   Inserter: Test to make sure the Inserter menu is closed. ([24610](https://github.com/WordPress/gutenberg/pull/24610))
+-   Date: Update `moment-timezone` package to support string timezones. ([22866](https://github.com/WordPress/gutenberg/pull/22866))
+-   Fix enqueue presets for global styles. ([25286](https://github.com/WordPress/gutenberg/pull/25286))
+-   Fix stylesheet generation. ([25293](https://github.com/WordPress/gutenberg/pull/25293))
 
-- Add readme for UngroupButton. ([25142](https://github.com/WordPress/gutenberg/pull/25142))
-- Fix typo in AlignmentMatrixControl readme. ([25125](https://github.com/WordPress/gutenberg/pull/25125))
-- Update AlignmentMatrixControl readme. ([25124](https://github.com/WordPress/gutenberg/pull/25124))
-- Add preview options component readme. ([25104](https://github.com/WordPress/gutenberg/pull/25104))
-- Add block types list component readme. ([25066](https://github.com/WordPress/gutenberg/pull/25066))
-- Fix typo in block base themes tutorial URL ([25024](https://github.com/WordPress/gutenberg/pull/25024))
-- Update block inspector component readme. ([24998](https://github.com/WordPress/gutenberg/pull/24998))
-- Add block variation picker component readme. ([24995](https://github.com/WordPress/gutenberg/pull/24995))
-- Update Versions in WordPress doc to include 5.5.1. ([24988](https://github.com/WordPress/gutenberg/pull/24988))
-- Add block parent selector component readme. ([24962](https://github.com/WordPress/gutenberg/pull/24962))
-- Add block icon component readme. ([24947](https://github.com/WordPress/gutenberg/pull/24947))
-- Update dev environment setup. ([24871](https://github.com/WordPress/gutenberg/pull/24871))
-- Correct @since version for block parser package. ([24819](https://github.com/WordPress/gutenberg/pull/24819))
-- Add BlockCard component readme. ([25150](https://github.com/WordPress/gutenberg/pull/25150))
-- Fix link to ubuntu docker notes. ([25060](https://github.com/WordPress/gutenberg/pull/25060))
-- Fix/block parent selector component readme. ([24997](https://github.com/WordPress/gutenberg/pull/24997))
-- Update Storybook URL from text to a real link. ([24974](https://github.com/WordPress/gutenberg/pull/24974))
-- Update triage doc to include pull request mentions. ([23105](https://github.com/WordPress/gutenberg/pull/23105))
+### Experiments
 
+-   Group block: add padding support. ([24966](https://github.com/WordPress/gutenberg/pull/24966))
+-   Control the block editor via theme.json:
+    -   support for custom link color. ([25148](https://github.com/WordPress/gutenberg/pull/25148))
+    -   support for custom spacing. ([25141](https://github.com/WordPress/gutenberg/pull/25141))
+    -   support for custom line heights. ([25043](https://github.com/WordPress/gutenberg/pull/25043))
+    -   support for custom font sizes. ([25038](https://github.com/WordPress/gutenberg/pull/25038))
+    -   support for custom gradients. ([24964](https://github.com/WordPress/gutenberg/pull/24964))
+-   Navigation component: composition proposal. ([25057](https://github.com/WordPress/gutenberg/pull/25057))
+-   Replace accessibilityLabel by label on RadioGroup. ([25128](https://github.com/WordPress/gutenberg/pull/25128))
+-   Global styles:
+    -   add sidebar at edit site screen. ([24250](https://github.com/WordPress/gutenberg/pull/24250))
+    -   print minified css. ([24924](https://github.com/WordPress/gutenberg/pull/24924))
+    -   centralize style & support mappings for blocks. ([25185](https://github.com/WordPress/gutenberg/pull/25185))
+    -   centralize client side global styles mappings. ([25056](https://github.com/WordPress/gutenberg/pull/25056))
+    -   set property to change one property accept all lodash paths. ([25159](https://github.com/WordPress/gutenberg/pull/25159))
 
+### Documentation
 
+-   Add readme for UngroupButton. ([25142](https://github.com/WordPress/gutenberg/pull/25142))
+-   Fix typo in AlignmentMatrixControl readme. ([25125](https://github.com/WordPress/gutenberg/pull/25125))
+-   Update AlignmentMatrixControl readme. ([25124](https://github.com/WordPress/gutenberg/pull/25124))
+-   Add preview options component readme. ([25104](https://github.com/WordPress/gutenberg/pull/25104))
+-   Add block types list component readme. ([25066](https://github.com/WordPress/gutenberg/pull/25066))
+-   Fix typo in block base themes tutorial URL ([25024](https://github.com/WordPress/gutenberg/pull/25024))
+-   Update block inspector component readme. ([24998](https://github.com/WordPress/gutenberg/pull/24998))
+-   Add block variation picker component readme. ([24995](https://github.com/WordPress/gutenberg/pull/24995))
+-   Update Versions in WordPress doc to include 5.5.1. ([24988](https://github.com/WordPress/gutenberg/pull/24988))
+-   Add block parent selector component readme. ([24962](https://github.com/WordPress/gutenberg/pull/24962))
+-   Add block icon component readme. ([24947](https://github.com/WordPress/gutenberg/pull/24947))
+-   Update dev environment setup. ([24871](https://github.com/WordPress/gutenberg/pull/24871))
+-   Correct @since version for block parser package. ([24819](https://github.com/WordPress/gutenberg/pull/24819))
+-   Add BlockCard component readme. ([25150](https://github.com/WordPress/gutenberg/pull/25150))
+-   Fix link to ubuntu docker notes. ([25060](https://github.com/WordPress/gutenberg/pull/25060))
+-   Fix/block parent selector component readme. ([24997](https://github.com/WordPress/gutenberg/pull/24997))
+-   Update Storybook URL from text to a real link. ([24974](https://github.com/WordPress/gutenberg/pull/24974))
+-   Update triage doc to include pull request mentions. ([23105](https://github.com/WordPress/gutenberg/pull/23105))
 
 ### Code Quality
 
-- Repo: Add .gitattributes to specify text=auto. ([25224](https://github.com/WordPress/gutenberg/pull/25224))
-- Block Directory: Use Array.filter to implement new/unused block selectors. ([25211](https://github.com/WordPress/gutenberg/pull/25211))
-- Data: Remove flowRight call from metadata reducer. ([25180](https://github.com/WordPress/gutenberg/pull/25180))
-- Data: Add a comment about why we normalize resolvers to objects with fulfill method. ([25102](https://github.com/WordPress/gutenberg/pull/25102))
-- Api-fetch: Remove redundant next parameter from middleware calls. ([25001](https://github.com/WordPress/gutenberg/pull/25001))
-- Api-fetch: Simplify the code that executes the handlers. ([24999](https://github.com/WordPress/gutenberg/pull/24999))
-- Block Supports: Ensure consistent output in different PHP versions. ([25240](https://github.com/WordPress/gutenberg/pull/25240))
-- Add regression end-to-end test for the classic block initialization issue. ([25169](https://github.com/WordPress/gutenberg/pull/25169))
-- Update or retire deprecated colors. ([25213](https://github.com/WordPress/gutenberg/pull/25213)
+-   Repo: Add .gitattributes to specify text=auto. ([25224](https://github.com/WordPress/gutenberg/pull/25224))
+-   Block Directory: Use Array.filter to implement new/unused block selectors. ([25211](https://github.com/WordPress/gutenberg/pull/25211))
+-   Data: Remove flowRight call from metadata reducer. ([25180](https://github.com/WordPress/gutenberg/pull/25180))
+-   Data: Add a comment about why we normalize resolvers to objects with fulfill method. ([25102](https://github.com/WordPress/gutenberg/pull/25102))
+-   Api-fetch: Remove redundant next parameter from middleware calls. ([25001](https://github.com/WordPress/gutenberg/pull/25001))
+-   Api-fetch: Simplify the code that executes the handlers. ([24999](https://github.com/WordPress/gutenberg/pull/24999))
+-   Block Supports: Ensure consistent output in different PHP versions. ([25240](https://github.com/WordPress/gutenberg/pull/25240))
+-   Add regression end-to-end test for the classic block initialization issue. ([25169](https://github.com/WordPress/gutenberg/pull/25169))
+-   Update or retire deprecated colors. ([25213](https://github.com/WordPress/gutenberg/pull/25213)
 
 ### Build Tooling
 
-- Env: Update docker volumes during wp-env start. ([24778](https://github.com/WordPress/gutenberg/pull/24778))
+-   Env: Update docker volumes during wp-env start. ([24778](https://github.com/WordPress/gutenberg/pull/24778))
 
 ### Various
 
-- Update package-lock.json. ([25223](https://github.com/WordPress/gutenberg/pull/25223))
-- Update gradle-node-plugin to use actively maintained fork. ([25208](https://github.com/WordPress/gutenberg/pull/25208))
-- Bump @storybook/react major version. ([25161](https://github.com/WordPress/gutenberg/pull/25161))
-- Use WordPress Menu API. ([25132](https://github.com/WordPress/gutenberg/pull/25132))
-- Update modularity.md. ([25007](https://github.com/WordPress/gutenberg/pull/25007))
-- Remove Embeds for Facebook and Instagram. ([24472](https://github.com/WordPress/gutenberg/pull/24472))
-
-
+-   Update package-lock.json. ([25223](https://github.com/WordPress/gutenberg/pull/25223))
+-   Update gradle-node-plugin to use actively maintained fork. ([25208](https://github.com/WordPress/gutenberg/pull/25208))
+-   Bump @storybook/react major version. ([25161](https://github.com/WordPress/gutenberg/pull/25161))
+-   Use WordPress Menu API. ([25132](https://github.com/WordPress/gutenberg/pull/25132))
+-   Update modularity.md. ([25007](https://github.com/WordPress/gutenberg/pull/25007))
+-   Remove Embeds for Facebook and Instagram. ([24472](https://github.com/WordPress/gutenberg/pull/24472))
 
 = 8.9.3 =
 
-### Bug fixes
+## Changelog
 
-- Show Classic block contents on load (#25162)
+### Bug fixes
 
+-   Show Classic block contents on load (#25162)
 
 = 8.9.2 =
 
-### Bug fixes
+## Changelog
 
-- Block supports: Fix block attribute (style and class) double-encoding (#25079)
-- Restore injection of build_dropdown_script_block_core_categories() (#25026)
-- Block supports: Restore root DOMDocument save (#25028)
+### Bug fixes
 
+-   Block supports: Fix block attribute (style and class) double-encoding (#25079)
+-   Restore injection of build_dropdown_script_block_core_categories() (#25026)
+-   Block supports: Restore root DOMDocument save (#25028)
 
 = 8.9.1 =
 
-### Bug Fixes
+## Changelog
 
+### Bug Fixes
 
 = 8.9.0 =
 
+## Changelog
+
 ### Features
 
 -   Enable the block-based widgets screen. ([24843](https://github.com/WordPress/gutenberg/pull/24843)), ([24087](https://github.com/WordPress/gutenberg/pull/24087))
@@ -27817,3119 +39840,3139 @@ After:
 
 = 8.8.0 =
 
+## Changelog
+
 ### Enhancements
 
-- Copy: Use “block patterns” strings consistently. ([24457](https://github.com/WordPress/gutenberg/pull/24457))
-- Remove hardcoded color from the Recent Comments block. ([24410](https://github.com/WordPress/gutenberg/pull/24410))
-- Remove hardcoded styles from the Separator block. ([24366](https://github.com/WordPress/gutenberg/pull/24366))
-- Block toolbar: Split switcher from mover and simplify styles. ([23971](https://github.com/WordPress/gutenberg/pull/23971))
-- Use the block label API for BlockTitle component. ([23847](https://github.com/WordPress/gutenberg/pull/23847))
-- i18n: Translate all strings inside the Large Header Button block pattern. ([24499](https://github.com/WordPress/gutenberg/pull/24499))
-- Block Movers: Use a bigger mobile touch target. ([23761](https://github.com/WordPress/gutenberg/pull/23761))
-- Block Movers: Use a bigger visible focus rectangle. ([23760](https://github.com/WordPress/gutenberg/pull/23760))
-- Update the top toolbar buttons color. ([24420](https://github.com/WordPress/gutenberg/pull/24420))
-- Remove editor styles from front-facing stylesheets. ([24439](https://github.com/WordPress/gutenberg/pull/24439))
-- Block Toolbar More Menu: Switch back to the vertical ellipsis icon. ([24426](https://github.com/WordPress/gutenberg/pull/24426))
-- Removes hardcoded body text color from some block patterns. ([24424](https://github.com/WordPress/gutenberg/pull/24424))
+-   Copy: Use “block patterns” strings consistently. ([24457](https://github.com/WordPress/gutenberg/pull/24457))
+-   Remove hardcoded color from the Recent Comments block. ([24410](https://github.com/WordPress/gutenberg/pull/24410))
+-   Remove hardcoded styles from the Separator block. ([24366](https://github.com/WordPress/gutenberg/pull/24366))
+-   Block toolbar: Split switcher from mover and simplify styles. ([23971](https://github.com/WordPress/gutenberg/pull/23971))
+-   Use the block label API for BlockTitle component. ([23847](https://github.com/WordPress/gutenberg/pull/23847))
+-   i18n: Translate all strings inside the Large Header Button block pattern. ([24499](https://github.com/WordPress/gutenberg/pull/24499))
+-   Block Movers: Use a bigger mobile touch target. ([23761](https://github.com/WordPress/gutenberg/pull/23761))
+-   Block Movers: Use a bigger visible focus rectangle. ([23760](https://github.com/WordPress/gutenberg/pull/23760))
+-   Update the top toolbar buttons color. ([24420](https://github.com/WordPress/gutenberg/pull/24420))
+-   Remove editor styles from front-facing stylesheets. ([24439](https://github.com/WordPress/gutenberg/pull/24439))
+-   Block Toolbar More Menu: Switch back to the vertical ellipsis icon. ([24426](https://github.com/WordPress/gutenberg/pull/24426))
+-   Removes hardcoded body text color from some block patterns. ([24424](https://github.com/WordPress/gutenberg/pull/24424))
 
 ### New APIs
 
-- Support the default block classnames in dynamic blocks. ([24546](https://github.com/WordPress/gutenberg/pull/24546))
-- Support the custom classnames hook in dynamic blocks. ([24483](https://github.com/WordPress/gutenberg/pull/24483))
-- Stabilize the accessible Toolbar component and deprecate the old usage. ([23316](https://github.com/WordPress/gutenberg/pull/23316))
-- Add store icon to Icons package. ([23867](https://github.com/WordPress/gutenberg/pull/23867))
-- Allow POST requests in <ServerSideRender>. ([21068](https://github.com/WordPress/gutenberg/pull/21068))
-
-### Bug Fixes
-
-- Fix inserter expecting experimental settings to exist in the context. ([24554](https://github.com/WordPress/gutenberg/pull/24554))
-- Fix Image block caption jumps on Safari. ([24540](https://github.com/WordPress/gutenberg/pull/24540))
-- Fix Media Text block: Always show images on top on mobile. ([24468](https://github.com/WordPress/gutenberg/pull/24468))
-- Hide Preview menu on small viewports. ([24537](https://github.com/WordPress/gutenberg/pull/24537))
-- Fix canInsertBlockType selector returning true for blocks that don’t allow inner blocks. ([24514](https://github.com/WordPress/gutenberg/pull/24514))
-- Fix the huge font size on the editor when using the default font sizes presets. ([24492](https://github.com/WordPress/gutenberg/pull/24492))
-- Fix Cover block: Impossible to reset the minimum height value. ([24490](https://github.com/WordPress/gutenberg/pull/24490))
-- Fix Post preview button only appearing on small screens. ([24487](https://github.com/WordPress/gutenberg/pull/24487))
-- Fix deduplication of style rules for server-side block support flags. ([24486](https://github.com/WordPress/gutenberg/pull/24486))
-- Fix the quick inserter results limit for block variations. ([24481](https://github.com/WordPress/gutenberg/pull/24481))
-- Fix tiny editor preview when using Mobile or Tablet options with metaboxes enabled. ([24478](https://github.com/WordPress/gutenberg/pull/24478))
-- Fix custom gradient picker unable to change predefined gradients with hex colors. ([24470](https://github.com/WordPress/gutenberg/pull/24470))
-- Fixing duplicated wp-block classes in block-list. ([24466](https://github.com/WordPress/gutenberg/pull/24466))
-- A11y:
-    - Make the inserter behave as a popover. ([24429](https://github.com/WordPress/gutenberg/pull/24429))
-    - Fix incorrect aria description in the Block List View. ([24533](https://github.com/WordPress/gutenberg/pull/24533))
-    - Add arrow navigation in Preview menu. ([24465](https://github.com/WordPress/gutenberg/pull/24465))
-    - Add arrow navigation to Warning dropdown menu. ([24333](https://github.com/WordPress/gutenberg/pull/24333))
-    - Add an example to the buttons block to avoid focus loss issue. ([24434](https://github.com/WordPress/gutenberg/pull/24434))
-- Fix rendering non-Latin characters on aligned Cover blocks. ([24447](https://github.com/WordPress/gutenberg/pull/24447))
-- Remove --wp-admin-theme-color reference from frontend styles. ([24436](https://github.com/WordPress/gutenberg/pull/24436))
-- Prevent links from being focusable inside the Disabled component. ([24397](https://github.com/WordPress/gutenberg/pull/24397))
-- Image Editing: Fix alignment of aspect-ratio button. ([24343](https://github.com/WordPress/gutenberg/pull/24343))
-- Fix retrying of post-processing of edited images. ([24081](https://github.com/WordPress/gutenberg/pull/24081))
-- Set error state when there is an upload error in during file upload. ([24017](https://github.com/WordPress/gutenberg/pull/24017))
-- Block Directory: Decode entities in block title & description. ([24172](https://github.com/WordPress/gutenberg/pull/24172))
-- Preview menu: Remove redundant “opens in a new tab” hidden text. ([24427](https://github.com/WordPress/gutenberg/pull/24427))
-- Fix uploading PDFs in the File block. ([24318](https://github.com/WordPress/gutenberg/pull/24318))
+-   Support the default block classnames in dynamic blocks. ([24546](https://github.com/WordPress/gutenberg/pull/24546))
+-   Support the custom classnames hook in dynamic blocks. ([24483](https://github.com/WordPress/gutenberg/pull/24483))
+-   Stabilize the accessible Toolbar component and deprecate the old usage. ([23316](https://github.com/WordPress/gutenberg/pull/23316))
+-   Add store icon to Icons package. ([23867](https://github.com/WordPress/gutenberg/pull/23867))
+-   Allow POST requests in <ServerSideRender>. ([21068](https://github.com/WordPress/gutenberg/pull/21068))
+
+### Bug Fixes
+
+-   Fix inserter expecting experimental settings to exist in the context. ([24554](https://github.com/WordPress/gutenberg/pull/24554))
+-   Fix Image block caption jumps on Safari. ([24540](https://github.com/WordPress/gutenberg/pull/24540))
+-   Fix Media Text block: Always show images on top on mobile. ([24468](https://github.com/WordPress/gutenberg/pull/24468))
+-   Hide Preview menu on small viewports. ([24537](https://github.com/WordPress/gutenberg/pull/24537))
+-   Fix canInsertBlockType selector returning true for blocks that don’t allow inner blocks. ([24514](https://github.com/WordPress/gutenberg/pull/24514))
+-   Fix the huge font size on the editor when using the default font sizes presets. ([24492](https://github.com/WordPress/gutenberg/pull/24492))
+-   Fix Cover block: Impossible to reset the minimum height value. ([24490](https://github.com/WordPress/gutenberg/pull/24490))
+-   Fix Post preview button only appearing on small screens. ([24487](https://github.com/WordPress/gutenberg/pull/24487))
+-   Fix deduplication of style rules for server-side block support flags. ([24486](https://github.com/WordPress/gutenberg/pull/24486))
+-   Fix the quick inserter results limit for block variations. ([24481](https://github.com/WordPress/gutenberg/pull/24481))
+-   Fix tiny editor preview when using Mobile or Tablet options with metaboxes enabled. ([24478](https://github.com/WordPress/gutenberg/pull/24478))
+-   Fix custom gradient picker unable to change predefined gradients with hex colors. ([24470](https://github.com/WordPress/gutenberg/pull/24470))
+-   Fixing duplicated wp-block classes in block-list. ([24466](https://github.com/WordPress/gutenberg/pull/24466))
+-   A11y:
+    -   Make the inserter behave as a popover. ([24429](https://github.com/WordPress/gutenberg/pull/24429))
+    -   Fix incorrect aria description in the Block List View. ([24533](https://github.com/WordPress/gutenberg/pull/24533))
+    -   Add arrow navigation in Preview menu. ([24465](https://github.com/WordPress/gutenberg/pull/24465))
+    -   Add arrow navigation to Warning dropdown menu. ([24333](https://github.com/WordPress/gutenberg/pull/24333))
+    -   Add an example to the buttons block to avoid focus loss issue. ([24434](https://github.com/WordPress/gutenberg/pull/24434))
+-   Fix rendering non-Latin characters on aligned Cover blocks. ([24447](https://github.com/WordPress/gutenberg/pull/24447))
+-   Remove --wp-admin-theme-color reference from frontend styles. ([24436](https://github.com/WordPress/gutenberg/pull/24436))
+-   Prevent links from being focusable inside the Disabled component. ([24397](https://github.com/WordPress/gutenberg/pull/24397))
+-   Image Editing: Fix alignment of aspect-ratio button. ([24343](https://github.com/WordPress/gutenberg/pull/24343))
+-   Fix retrying of post-processing of edited images. ([24081](https://github.com/WordPress/gutenberg/pull/24081))
+-   Set error state when there is an upload error in during file upload. ([24017](https://github.com/WordPress/gutenberg/pull/24017))
+-   Block Directory: Decode entities in block title & description. ([24172](https://github.com/WordPress/gutenberg/pull/24172))
+-   Preview menu: Remove redundant “opens in a new tab” hidden text. ([24427](https://github.com/WordPress/gutenberg/pull/24427))
+-   Fix uploading PDFs in the File block. ([24318](https://github.com/WordPress/gutenberg/pull/24318))
 
 ### Experiments
 
-- InnerBlocks: Introduce prop to specify render callback for each block. ([24232](https://github.com/WordPress/gutenberg/pull/24232))
-- Navigation:
-    - Display children of inner block controllers in the block navigator. ([24083](https://github.com/WordPress/gutenberg/pull/24083))
-    - Add font-size support to the the Navigation block. ([24531](https://github.com/WordPress/gutenberg/pull/24531))
-- Template Parts and saving flow:
-    - Move the title to the block toolbar. ([24450](https://github.com/WordPress/gutenberg/pull/24450))
-    - Fix Template Part renaming error. ([24500](https://github.com/WordPress/gutenberg/pull/24500))
-    - Fix Site Title Save Bug. ([24302](https://github.com/WordPress/gutenberg/pull/24302))
-- Post Blocks:
-    - Post Tags block: Fix bug where no tags are rendered. ([24082](https://github.com/WordPress/gutenberg/pull/24082))
-    - Post Tags block: Support color, font-size and line-height customization. ([24069](https://github.com/WordPress/gutenberg/pull/24069))
-- Full Site Editing:
-    - Load php files only if experiment is enabled. ([24182](https://github.com/WordPress/gutenberg/pull/24182))
-- Global Styles:
-    - Consider any user changes to global styles as publishable. ([24293](https://github.com/WordPress/gutenberg/pull/24293))
-    - Add support for more style properties in the global context. ([24298](https://github.com/WordPress/gutenberg/pull/24298))
-- Widgets screen:
-    - Refactor the widgets screen to rely on dedicated endpoints. ([24290](https://github.com/WordPress/gutenberg/pull/24290))
-    - Make the list of widgets excluded from the legacy widget block extensible via a filter. ([24271](https://github.com/WordPress/gutenberg/pull/24271))
+-   InnerBlocks: Introduce prop to specify render callback for each block. ([24232](https://github.com/WordPress/gutenberg/pull/24232))
+-   Navigation:
+    -   Display children of inner block controllers in the block navigator. ([24083](https://github.com/WordPress/gutenberg/pull/24083))
+    -   Add font-size support to the the Navigation block. ([24531](https://github.com/WordPress/gutenberg/pull/24531))
+-   Template Parts and saving flow:
+    -   Move the title to the block toolbar. ([24450](https://github.com/WordPress/gutenberg/pull/24450))
+    -   Fix Template Part renaming error. ([24500](https://github.com/WordPress/gutenberg/pull/24500))
+    -   Fix Site Title Save Bug. ([24302](https://github.com/WordPress/gutenberg/pull/24302))
+-   Post Blocks:
+    -   Post Tags block: Fix bug where no tags are rendered. ([24082](https://github.com/WordPress/gutenberg/pull/24082))
+    -   Post Tags block: Support color, font-size and line-height customization. ([24069](https://github.com/WordPress/gutenberg/pull/24069))
+-   Full Site Editing:
+    -   Load php files only if experiment is enabled. ([24182](https://github.com/WordPress/gutenberg/pull/24182))
+-   Global Styles:
+    -   Consider any user changes to global styles as publishable. ([24293](https://github.com/WordPress/gutenberg/pull/24293))
+    -   Add support for more style properties in the global context. ([24298](https://github.com/WordPress/gutenberg/pull/24298))
+-   Widgets screen:
+    -   Refactor the widgets screen to rely on dedicated endpoints. ([24290](https://github.com/WordPress/gutenberg/pull/24290))
+    -   Make the list of widgets excluded from the legacy widget block extensible via a filter. ([24271](https://github.com/WordPress/gutenberg/pull/24271))
 
 ### Documentation
 
-- Add undocumented global styles blocks & properties. ([24421](https://github.com/WordPress/gutenberg/pull/24421))
-- Remove “experimental” from title of editor filters. ([24382](https://github.com/WordPress/gutenberg/pull/24382))
-- Add instructions for disabling the Block Directory. ([24357](https://github.com/WordPress/gutenberg/pull/24357))
-- Remove duplicate questions in FAQ. ([24355](https://github.com/WordPress/gutenberg/pull/24355))
-- Indicate custom-fields support is required for registering meta. ([24325](https://github.com/WordPress/gutenberg/pull/24325))
-- Add block directory submission guidelines. ([23545](https://github.com/WordPress/gutenberg/pull/23545))
-- Typos and tweaks: ([24511](https://github.com/WordPress/gutenberg/pull/24511)) (24244) (24491) (24361) (24340)
-- Update the “Create a Block” Tutorial. ([24545](https://github.com/WordPress/gutenberg/pull/24545))
-- Getting started: Add a MAMP section. ([24241](https://github.com/WordPress/gutenberg/pull/24241))
+-   Add undocumented global styles blocks & properties. ([24421](https://github.com/WordPress/gutenberg/pull/24421))
+-   Remove “experimental” from title of editor filters. ([24382](https://github.com/WordPress/gutenberg/pull/24382))
+-   Add instructions for disabling the Block Directory. ([24357](https://github.com/WordPress/gutenberg/pull/24357))
+-   Remove duplicate questions in FAQ. ([24355](https://github.com/WordPress/gutenberg/pull/24355))
+-   Indicate custom-fields support is required for registering meta. ([24325](https://github.com/WordPress/gutenberg/pull/24325))
+-   Add block directory submission guidelines. ([23545](https://github.com/WordPress/gutenberg/pull/23545))
+-   Typos and tweaks: ([24511](https://github.com/WordPress/gutenberg/pull/24511)) (24244) (24491) (24361) (24340)
+-   Update the “Create a Block” Tutorial. ([24545](https://github.com/WordPress/gutenberg/pull/24545))
+-   Getting started: Add a MAMP section. ([24241](https://github.com/WordPress/gutenberg/pull/24241))
 
 ### Code Quality
 
-- Refactor embed block to single block with block variations. ([24090](https://github.com/WordPress/gutenberg/pull/24090))
-- Upgrade React version to 16.13.1. ([21289](https://github.com/WordPress/gutenberg/pull/21289))
-- Update lodash to 4.17.19. ([24401](https://github.com/WordPress/gutenberg/pull/24401))
-- Register the block attributes server-side for blocks with support flags. ([24400](https://github.com/WordPress/gutenberg/pull/24400))
-- Refactor components as functional components:
-    - TimePicker. ([24348](https://github.com/WordPress/gutenberg/pull/24348))
-    - PostTextEditor. ([23897](https://github.com/WordPress/gutenberg/pull/23897))
-    - CalendarEdit. ([23072](https://github.com/WordPress/gutenberg/pull/23072))
-- Remove unnecessary selector from the PostTitle block. ([24418](https://github.com/WordPress/gutenberg/pull/24418))
-- Remove unnecessary ad-hoc class application for dynamic blocks. ([24223](https://github.com/WordPress/gutenberg/pull/24223))
+-   Refactor embed block to single block with block variations. ([24090](https://github.com/WordPress/gutenberg/pull/24090))
+-   Upgrade React version to 16.13.1. ([21289](https://github.com/WordPress/gutenberg/pull/21289))
+-   Update lodash to 4.17.19. ([24401](https://github.com/WordPress/gutenberg/pull/24401))
+-   Register the block attributes server-side for blocks with support flags. ([24400](https://github.com/WordPress/gutenberg/pull/24400))
+-   Refactor components as functional components:
+    -   TimePicker. ([24348](https://github.com/WordPress/gutenberg/pull/24348))
+    -   PostTextEditor. ([23897](https://github.com/WordPress/gutenberg/pull/23897))
+    -   CalendarEdit. ([23072](https://github.com/WordPress/gutenberg/pull/23072))
+-   Remove unnecessary selector from the PostTitle block. ([24418](https://github.com/WordPress/gutenberg/pull/24418))
+-   Remove unnecessary ad-hoc class application for dynamic blocks. ([24223](https://github.com/WordPress/gutenberg/pull/24223))
 
 ### Build Tooling
 
-- Run wp-env start before PHP unit tests in package scripts. ([23797](https://github.com/WordPress/gutenberg/pull/23797))
-- Upgrade eslint-plugin-jsdoc to latest version. ([24586](https://github.com/WordPress/gutenberg/pull/24586))
-- Add full parameters for emulateNetworkConditions. ([24144](https://github.com/WordPress/gutenberg/pull/24144))
-- Add an end-to-end regression test for the “Browse All” inserter button. ([24396](https://github.com/WordPress/gutenberg/pull/24396))
-
+-   Run wp-env start before PHP unit tests in package scripts. ([23797](https://github.com/WordPress/gutenberg/pull/23797))
+-   Upgrade eslint-plugin-jsdoc to latest version. ([24586](https://github.com/WordPress/gutenberg/pull/24586))
+-   Add full parameters for emulateNetworkConditions. ([24144](https://github.com/WordPress/gutenberg/pull/24144))
+-   Add an end-to-end regression test for the “Browse All” inserter button. ([24396](https://github.com/WordPress/gutenberg/pull/24396))
 
 = 8.7.1 =
 
-###  Bug Fixes
+## Changelog
 
- - Block Supports: Add missing UTF-8 conversion.
- - File block: Fix upload pdf file using Upload button but can using Media Library link.
+### Bug Fixes
 
+-   Block Supports: Add missing UTF-8 conversion.
+-   File block: Fix upload pdf file using Upload button but can using Media Library link.
 
 = 8.7.0 =
 
+## Changelog
+
 ### Enhancements
 
-*   Make "Attempt Block Recovery" the default option of block invalidation. ([24263](https://github.com/WordPress/gutenberg/pull/24263))
-*   Add a block example to the Buttons block. ([24249](https://github.com/WordPress/gutenberg/pull/24249))
-*   Make the padding for the nav block inserter content the same for all sides. ([24084](https://github.com/WordPress/gutenberg/pull/24084))
-*   Improve margin within the media replace popover. ([24309](https://github.com/WordPress/gutenberg/pull/24309))
-*   Move "Convert to regular blocks" button to the reusable block toolbar. ([24066](https://github.com/WordPress/gutenberg/pull/24066))
-*   Consistently autosave edits. ([23962](https://github.com/WordPress/gutenberg/pull/23962))
-*   Use Post Type label for Document tab in Settings Header. ([17311](https://github.com/WordPress/gutenberg/pull/17311))
-*   Update the Group block description. ([24297](https://github.com/WordPress/gutenberg/pull/24297))
-*   Remove bottom margin of components dropdown menu item. ([24227](https://github.com/WordPress/gutenberg/pull/24227))
-*   Core Block Patterns improvements:
-    *   Adds "Heading and paragraph" pattern. ([24143](https://github.com/WordPress/gutenberg/pull/24143))
-    *   Updates "Large header and a paragraph" pattern. ([24142](https://github.com/WordPress/gutenberg/pull/24142))
-    *   Updates the "Large header" pattern. ([24141](https://github.com/WordPress/gutenberg/pull/24141))
-    *   Updates the "Quote" pattern. ([24140](https://github.com/WordPress/gutenberg/pull/24140))
-    *   Updates "Two images" pattern. ([24139](https://github.com/WordPress/gutenberg/pull/24139)) ([23856](https://github.com/WordPress/gutenberg/pull/23856))
-    *   Updates "Three columns of text with buttons" pattern. ([24138](https://github.com/WordPress/gutenberg/pull/24138))
-    *   Updates "Three buttons" pattern. ([24137](https://github.com/WordPress/gutenberg/pull/24137))
-    *   Updates "Two buttons" pattern. ([24136](https://github.com/WordPress/gutenberg/pull/24136))
-    *   Updates '"wo columns of text" pattern. ([24135](https://github.com/WordPress/gutenberg/pull/24135))
-    *   Update "Two columns of text with images" pattern. ([24134](https://github.com/WordPress/gutenberg/pull/24134))
-    *   Update the "Large header and button" block pattern. ([24177](https://github.com/WordPress/gutenberg/pull/24177))
-*   Block Directory: Use local assets with automatic asset detection. ([24117](https://github.com/WordPress/gutenberg/pull/24117))
+-   Make "Attempt Block Recovery" the default option of block invalidation. ([24263](https://github.com/WordPress/gutenberg/pull/24263))
+-   Add a block example to the Buttons block. ([24249](https://github.com/WordPress/gutenberg/pull/24249))
+-   Make the padding for the nav block inserter content the same for all sides. ([24084](https://github.com/WordPress/gutenberg/pull/24084))
+-   Improve margin within the media replace popover. ([24309](https://github.com/WordPress/gutenberg/pull/24309))
+-   Move "Convert to regular blocks" button to the reusable block toolbar. ([24066](https://github.com/WordPress/gutenberg/pull/24066))
+-   Consistently autosave edits. ([23962](https://github.com/WordPress/gutenberg/pull/23962))
+-   Use Post Type label for Document tab in Settings Header. ([17311](https://github.com/WordPress/gutenberg/pull/17311))
+-   Update the Group block description. ([24297](https://github.com/WordPress/gutenberg/pull/24297))
+-   Remove bottom margin of components dropdown menu item. ([24227](https://github.com/WordPress/gutenberg/pull/24227))
+-   Core Block Patterns improvements:
+    -   Adds "Heading and paragraph" pattern. ([24143](https://github.com/WordPress/gutenberg/pull/24143))
+    -   Updates "Large header and a paragraph" pattern. ([24142](https://github.com/WordPress/gutenberg/pull/24142))
+    -   Updates the "Large header" pattern. ([24141](https://github.com/WordPress/gutenberg/pull/24141))
+    -   Updates the "Quote" pattern. ([24140](https://github.com/WordPress/gutenberg/pull/24140))
+    -   Updates "Two images" pattern. ([24139](https://github.com/WordPress/gutenberg/pull/24139)) ([23856](https://github.com/WordPress/gutenberg/pull/23856))
+    -   Updates "Three columns of text with buttons" pattern. ([24138](https://github.com/WordPress/gutenberg/pull/24138))
+    -   Updates "Three buttons" pattern. ([24137](https://github.com/WordPress/gutenberg/pull/24137))
+    -   Updates "Two buttons" pattern. ([24136](https://github.com/WordPress/gutenberg/pull/24136))
+    -   Updates '"wo columns of text" pattern. ([24135](https://github.com/WordPress/gutenberg/pull/24135))
+    -   Update "Two columns of text with images" pattern. ([24134](https://github.com/WordPress/gutenberg/pull/24134))
+    -   Update the "Large header and button" block pattern. ([24177](https://github.com/WordPress/gutenberg/pull/24177))
+-   Block Directory: Use local assets with automatic asset detection. ([24117](https://github.com/WordPress/gutenberg/pull/24117))
 
 ### New APIs
 
-*   Add support for delete operations to `@wordpress/core-data` entities. ([21557](https://github.com/WordPress/gutenberg/pull/21557))
-*   Add server-side handling for the block 'align' supports flag. ([24122](https://github.com/WordPress/gutenberg/pull/24122))
-*   Add isDestructive style to Button. ([22921](https://github.com/WordPress/gutenberg/pull/22921))
-*   @wordpress/create-block: Enable loading translations for created blocks. ([24125](https://github.com/WordPress/gutenberg/pull/24125))
-
-### Bug Fixes
-
-*   Fix html mode for non light blocks. ([24335](https://github.com/WordPress/gutenberg/pull/24335))
-*   Fix block movers overlapping. ([24349](https://github.com/WordPress/gutenberg/pull/24349))
-*   Fix List RichText backward compatibility for multiline root tag. ([24324](https://github.com/WordPress/gutenberg/pull/24324))
-*   Block patterns: Fix translatable strings. ([24317](https://github.com/WordPress/gutenberg/pull/24317))
-*   Preserve the seconds when editing dates using the TimePicker component<span>. (</span>[24305](https://github.com/WordPress/gutenberg/pull/24305)<span>)</span>
-*   A11y:
-    *   Announce block selection changes manually on windows. ([24299](https://github.com/WordPress/gutenberg/pull/24299))
-    *   Fix arrow navigation in the LinkControl suggestions. ([24222](https://github.com/WordPress/gutenberg/pull/24222))
-    *   Avoid focus style from being cut on the categories panel. ([24197](https://github.com/WordPress/gutenberg/pull/24197))
-    *   Avoid focusing the block selection button on each render. ([24195](https://github.com/WordPress/gutenberg/pull/24195))
-    *   Avoid rendering the clipboard textarea inside the button. ([24194](https://github.com/WordPress/gutenberg/pull/24194))
-    *   Fix missing focus outline in Add New Tag. ([24187](https://github.com/WordPress/gutenberg/pull/24187))
-    *   Fix dropdown menu focus loss when using arrow keys with Safari and Voiceover. ([24186](https://github.com/WordPress/gutenberg/pull/24186))
-    *   Fix the gallery buttons focus style. ([24157](https://github.com/WordPress/gutenberg/pull/24157))
-    *   Update the editor landmark regions. ([24196](https://github.com/WordPress/gutenberg/pull/24196))
-    *   Mover control: Remove drag cursor. ([23759](https://github.com/WordPress/gutenberg/pull/23759))
-*   <span>Fix block insertion place after clicking Browse All in the inline inserter. (</span>[24285](https://github.com/WordPress/gutenberg/pull/24285)<span>)</span>
-*   Fix last.fm svg icon alignment. ([24278](https://github.com/WordPress/gutenberg/pull/24278))
-*   Cover: Fix padding controls showing null units. ([24251](https://github.com/WordPress/gutenberg/pull/24251))
-*   Consistently show the default style variation if none provided. ([24217](https://github.com/WordPress/gutenberg/pull/24217))
-*   Fix gradient RGBA/HSLA inputs' width. ([24214](https://github.com/WordPress/gutenberg/pull/24214))
-*   <span>Popover: Fix arrow color to match content border color. (</span>[24208](https://github.com/WordPress/gutenberg/pull/24208)<span>)</span>
-*   <span>Fix dragging multiple blocks dow</span>nw<span>ards resulted in blocks inserted in wrong position. (</span>[24183](https://github.com/WordPress/gutenberg/pull/24183)<span>)</span>
-*   <span>Fix Button block colors in the editor. (</span>[24153](https://github.com/WordPress/gutenberg/pull/24153)<span>)</span>
-*   Fix the save shortcut in the code editor. ([24151](https://github.com/WordPress/gutenberg/pull/24151))
-*   Fix PHP notices when a block hasn't declared 'supports'. ([24131](https://github.com/WordPress/gutenberg/pull/24131))
-*   Fix Block Directory icons<span>. (</span>[24086](https://github.com/WordPress/gutenberg/pull/24086)<span>)</span>
-*   Block Breadcrumb: Fix arrow direction in RTL. ([24074](https://github.com/WordPress/gutenberg/pull/24074))
-*   i18N:
-    *   Fix missing plural forms for block related strings. ([24071](https://github.com/WordPress/gutenberg/pull/24071))
-    *   Merge similar translation strings in the RSS block. ([24159](https://github.com/WordPress/gutenberg/pull/24159))
-    *   Merge similar translation strings - tables. ([24169](https://github.com/WordPress/gutenberg/pull/24169))
-*   <span>useBlockSync: Fix race condition when onChange callback changes. (</span>[24012](https://github.com/WordPress/gutenberg/pull/24012)<span>)</span>
-*   Allow enter to insert line breaks even if template is locked. ([23330](https://github.com/WordPress/gutenberg/pull/23330))
+-   Add support for delete operations to `@wordpress/core-data` entities. ([21557](https://github.com/WordPress/gutenberg/pull/21557))
+-   Add server-side handling for the block 'align' supports flag. ([24122](https://github.com/WordPress/gutenberg/pull/24122))
+-   Add isDestructive style to Button. ([22921](https://github.com/WordPress/gutenberg/pull/22921))
+-   @wordpress/create-block: Enable loading translations for created blocks. ([24125](https://github.com/WordPress/gutenberg/pull/24125))
+
+### Bug Fixes
+
+-   Fix html mode for non light blocks. ([24335](https://github.com/WordPress/gutenberg/pull/24335))
+-   Fix block movers overlapping. ([24349](https://github.com/WordPress/gutenberg/pull/24349))
+-   Fix List RichText backward compatibility for multiline root tag. ([24324](https://github.com/WordPress/gutenberg/pull/24324))
+-   Block patterns: Fix translatable strings. ([24317](https://github.com/WordPress/gutenberg/pull/24317))
+-   Preserve the seconds when editing dates using the TimePicker component<span>. (</span>[24305](https://github.com/WordPress/gutenberg/pull/24305)<span>)</span>
+-   A11y:
+    -   Announce block selection changes manually on windows. ([24299](https://github.com/WordPress/gutenberg/pull/24299))
+    -   Fix arrow navigation in the LinkControl suggestions. ([24222](https://github.com/WordPress/gutenberg/pull/24222))
+    -   Avoid focus style from being cut on the categories panel. ([24197](https://github.com/WordPress/gutenberg/pull/24197))
+    -   Avoid focusing the block selection button on each render. ([24195](https://github.com/WordPress/gutenberg/pull/24195))
+    -   Avoid rendering the clipboard textarea inside the button. ([24194](https://github.com/WordPress/gutenberg/pull/24194))
+    -   Fix missing focus outline in Add New Tag. ([24187](https://github.com/WordPress/gutenberg/pull/24187))
+    -   Fix dropdown menu focus loss when using arrow keys with Safari and Voiceover. ([24186](https://github.com/WordPress/gutenberg/pull/24186))
+    -   Fix the gallery buttons focus style. ([24157](https://github.com/WordPress/gutenberg/pull/24157))
+    -   Update the editor landmark regions. ([24196](https://github.com/WordPress/gutenberg/pull/24196))
+    -   Mover control: Remove drag cursor. ([23759](https://github.com/WordPress/gutenberg/pull/23759))
+-   <span>Fix block insertion place after clicking Browse All in the inline inserter. (</span>[24285](https://github.com/WordPress/gutenberg/pull/24285)<span>)</span>
+-   Fix last.fm svg icon alignment. ([24278](https://github.com/WordPress/gutenberg/pull/24278))
+-   Cover: Fix padding controls showing null units. ([24251](https://github.com/WordPress/gutenberg/pull/24251))
+-   Consistently show the default style variation if none provided. ([24217](https://github.com/WordPress/gutenberg/pull/24217))
+-   Fix gradient RGBA/HSLA inputs' width. ([24214](https://github.com/WordPress/gutenberg/pull/24214))
+-   <span>Popover: Fix arrow color to match content border color. (</span>[24208](https://github.com/WordPress/gutenberg/pull/24208)<span>)</span>
+-   <span>Fix dragging multiple blocks dow</span>nw<span>ards resulted in blocks inserted in wrong position. (</span>[24183](https://github.com/WordPress/gutenberg/pull/24183)<span>)</span>
+-   <span>Fix Button block colors in the editor. (</span>[24153](https://github.com/WordPress/gutenberg/pull/24153)<span>)</span>
+-   Fix the save shortcut in the code editor. ([24151](https://github.com/WordPress/gutenberg/pull/24151))
+-   Fix PHP notices when a block hasn't declared 'supports'. ([24131](https://github.com/WordPress/gutenberg/pull/24131))
+-   Fix Block Directory icons<span>. (</span>[24086](https://github.com/WordPress/gutenberg/pull/24086)<span>)</span>
+-   Block Breadcrumb: Fix arrow direction in RTL. ([24074](https://github.com/WordPress/gutenberg/pull/24074))
+-   i18N:
+    -   Fix missing plural forms for block related strings. ([24071](https://github.com/WordPress/gutenberg/pull/24071))
+    -   Merge similar translation strings in the RSS block. ([24159](https://github.com/WordPress/gutenberg/pull/24159))
+    -   Merge similar translation strings - tables. ([24169](https://github.com/WordPress/gutenberg/pull/24169))
+-   <span>useBlockSync: Fix race condition when onChange callback changes. (</span>[24012](https://github.com/WordPress/gutenberg/pull/24012)<span>)</span>
+-   Allow enter to insert line breaks even if template is locked. ([23330](https://github.com/WordPress/gutenberg/pull/23330))
 
 ### Experiments
 
-*   Full Site Editing and Site editor:
-    *   Add alignment support to post content block. ([24014](https://github.com/WordPress/gutenberg/pull/24014)) ([24077](https://github.com/WordPress/gutenberg/pull/24077))
-    *   Post Title Block: Add style attributes. ([24246](https://github.com/WordPress/gutenberg/pull/24246))
-    *   Remove more initial PHP state. ([23775](https://github.com/WordPress/gutenberg/pull/23775))
-    *   Template Part: Improve title editing interactions. ([23661](https://github.com/WordPress/gutenberg/pull/23661))
-    *   Update the Post author, Excerpt and Comment blocks to use lightBlockWrapper. ([24253](https://github.com/WordPress/gutenberg/pull/24253))
-    *   Query blocks: Support wide alignments in the editor. ([24229](https://github.com/WordPress/gutenberg/pull/24229))
-    *   Post Comments Block: add block alignment support. ([24226](https://github.com/WordPress/gutenberg/pull/24226))
-    *   Post Excerpt block: Added icon and description to Post Excerpt block. ([24203](https://github.com/WordPress/gutenberg/pull/24203))
-    *   Post Date block: Added Post Date icon and updated block with icon and desc. ([24178](https://github.com/WordPress/gutenberg/pull/24178)) ([24225](https://github.com/WordPress/gutenberg/pull/24225))
-    *   Post Author block: Added a description. ([24171](https://github.com/WordPress/gutenberg/pull/24171))
-    *   Post Comments Counts: Add style attributes. ([24167](https://github.com/WordPress/gutenberg/pull/24167))
-    *   Post Comments Form: Add style attributes. ([24162](https://github.com/WordPress/gutenberg/pull/24162))
-    *   Post Author and Post Excerpt: change editor selector class. ([24104](https://github.com/WordPress/gutenberg/pull/24104))
-    *   Post Comments block: add style supports for text and background settings. ([24080](https://github.com/WordPress/gutenberg/pull/24080))
-    *   Post excerpt block: Add color, fontSize, lineHeight, and text alignment. ([23945](https://github.com/WordPress/gutenberg/pull/23945))
-    *   Add Post Tags block description and icon. ([23496](https://github.com/WordPress/gutenberg/pull/23496))
-    *   Add a description to the Post Title block. ([23494](https://github.com/WordPress/gutenberg/pull/23494))
-    *   Update Post Author block to use __experimentalColor and __experimentalLineHeight. ([23044](https://github.com/WordPress/gutenberg/pull/23044))
-
-*   Global styles:
-    *   Fix link color style property name in global styles. ([24296](https://github.com/WordPress/gutenberg/pull/24296))
-    *   Fix merge algorithm. ([24294](https://github.com/WordPress/gutenberg/pull/24294))
-*   Navigation Block and screen:
-    *   Fix Navigation Block submenu being overlapped by Cover block overlay. ([24062](https://github.com/WordPress/gutenberg/pull/24062))
-*   APIs:
-    *   Add initial support for themes to control the editor. ([24275](https://github.com/WordPress/gutenberg/pull/24275))
-    *   Prefix useSimulatedMediaQuery __experimental. ([24279](https://github.com/WordPress/gutenberg/pull/24279))
-    *   URLInput Customizable control rendering. ([24115](https://github.com/WordPress/gutenberg/pull/24115))
+-   Full Site Editing and Site editor:
+
+    -   Add alignment support to post content block. ([24014](https://github.com/WordPress/gutenberg/pull/24014)) ([24077](https://github.com/WordPress/gutenberg/pull/24077))
+    -   Post Title Block: Add style attributes. ([24246](https://github.com/WordPress/gutenberg/pull/24246))
+    -   Remove more initial PHP state. ([23775](https://github.com/WordPress/gutenberg/pull/23775))
+    -   Template Part: Improve title editing interactions. ([23661](https://github.com/WordPress/gutenberg/pull/23661))
+    -   Update the Post author, Excerpt and Comment blocks to use lightBlockWrapper. ([24253](https://github.com/WordPress/gutenberg/pull/24253))
+    -   Query blocks: Support wide alignments in the editor. ([24229](https://github.com/WordPress/gutenberg/pull/24229))
+    -   Post Comments Block: add block alignment support. ([24226](https://github.com/WordPress/gutenberg/pull/24226))
+    -   Post Excerpt block: Added icon and description to Post Excerpt block. ([24203](https://github.com/WordPress/gutenberg/pull/24203))
+    -   Post Date block: Added Post Date icon and updated block with icon and desc. ([24178](https://github.com/WordPress/gutenberg/pull/24178)) ([24225](https://github.com/WordPress/gutenberg/pull/24225))
+    -   Post Author block: Added a description. ([24171](https://github.com/WordPress/gutenberg/pull/24171))
+    -   Post Comments Counts: Add style attributes. ([24167](https://github.com/WordPress/gutenberg/pull/24167))
+    -   Post Comments Form: Add style attributes. ([24162](https://github.com/WordPress/gutenberg/pull/24162))
+    -   Post Author and Post Excerpt: change editor selector class. ([24104](https://github.com/WordPress/gutenberg/pull/24104))
+    -   Post Comments block: add style supports for text and background settings. ([24080](https://github.com/WordPress/gutenberg/pull/24080))
+    -   Post excerpt block: Add color, fontSize, lineHeight, and text alignment. ([23945](https://github.com/WordPress/gutenberg/pull/23945))
+    -   Add Post Tags block description and icon. ([23496](https://github.com/WordPress/gutenberg/pull/23496))
+    -   Add a description to the Post Title block. ([23494](https://github.com/WordPress/gutenberg/pull/23494))
+    -   Update Post Author block to use **experimentalColor and **experimentalLineHeight. ([23044](https://github.com/WordPress/gutenberg/pull/23044))
+
+-   Global styles:
+    -   Fix link color style property name in global styles. ([24296](https://github.com/WordPress/gutenberg/pull/24296))
+    -   Fix merge algorithm. ([24294](https://github.com/WordPress/gutenberg/pull/24294))
+-   Navigation Block and screen:
+    -   Fix Navigation Block submenu being overlapped by Cover block overlay. ([24062](https://github.com/WordPress/gutenberg/pull/24062))
+-   APIs:
+    -   Add initial support for themes to control the editor. ([24275](https://github.com/WordPress/gutenberg/pull/24275))
+    -   Prefix useSimulatedMediaQuery \_\_experimental. ([24279](https://github.com/WordPress/gutenberg/pull/24279))
+    -   URLInput Customizable control rendering. ([24115](https://github.com/WordPress/gutenberg/pull/24115))
 
 ### Documentation
 
-*   Update Gutenberg FAQ with more recent information. ([24202](https://github.com/WordPress/gutenberg/pull/24202))
-*   Clarify custom link color documentation for themes. ([24056](https://github.com/WordPress/gutenberg/pull/24056))
-*   Add a link to the WordPress Data guide. ([24327](https://github.com/WordPress/gutenberg/pull/24327))
-*   Document the new block tools theme support and core block patterns. ([24265](https://github.com/WordPress/gutenberg/pull/24265))
-*   Replace the demo link of the Gutenberg Storybook in the documentation. ([24212](https://github.com/WordPress/gutenberg/pull/24212))
-*   Docs: Update default values for Popover props 'noArrow' and 'position'. ([24207](https://github.com/WordPress/gutenberg/pull/24207))
-*   Added missing documentation link for contributor handbook. ([24179](https://github.com/WordPress/gutenberg/pull/24179))
-*   Docs: Convert Block Registration RFC to the Block Metadata document. ([23832](https://github.com/WordPress/gutenberg/pull/23832))
-*   Typos and tweaks: ([23899](https://github.com/WordPress/gutenberg/pull/23899)) ([24057](https://github.com/WordPress/gutenberg/pull/24057)) ([24033](https://github.com/WordPress/gutenberg/pull/24033)) ([24211](https://github.com/WordPress/gutenberg/pull/24211)) ([24100](https://github.com/WordPress/gutenberg/pull/24100))
+-   Update Gutenberg FAQ with more recent information. ([24202](https://github.com/WordPress/gutenberg/pull/24202))
+-   Clarify custom link color documentation for themes. ([24056](https://github.com/WordPress/gutenberg/pull/24056))
+-   Add a link to the WordPress Data guide. ([24327](https://github.com/WordPress/gutenberg/pull/24327))
+-   Document the new block tools theme support and core block patterns. ([24265](https://github.com/WordPress/gutenberg/pull/24265))
+-   Replace the demo link of the Gutenberg Storybook in the documentation. ([24212](https://github.com/WordPress/gutenberg/pull/24212))
+-   Docs: Update default values for Popover props 'noArrow' and 'position'. ([24207](https://github.com/WordPress/gutenberg/pull/24207))
+-   Added missing documentation link for contributor handbook. ([24179](https://github.com/WordPress/gutenberg/pull/24179))
+-   Docs: Convert Block Registration RFC to the Block Metadata document. ([23832](https://github.com/WordPress/gutenberg/pull/23832))
+-   Typos and tweaks: ([23899](https://github.com/WordPress/gutenberg/pull/23899)) ([24057](https://github.com/WordPress/gutenberg/pull/24057)) ([24033](https://github.com/WordPress/gutenberg/pull/24033)) ([24211](https://github.com/WordPress/gutenberg/pull/24211)) ([24100](https://github.com/WordPress/gutenberg/pull/24100))
 
 ### Code Quality
 
-*   Improve rootClientId comparison in useBlockDropZone. ([24307](https://github.com/WordPress/gutenberg/pull/24307))
-*   Clarify wp.blocks.createBlock error message. ([24287](https://github.com/WordPress/gutenberg/pull/24287))
-*   Convert blocks to function component with hooks:
-    *   BlockInvalidWarning. ([24284](https://github.com/WordPress/gutenberg/pull/24284))
-    *   ReusableBlockConvertButton. ([24015](https://github.com/WordPress/gutenberg/pull/24015))
-*   Add missing prop to `WPBlockVariation` type definition. ([24110](https://github.com/WordPress/gutenberg/pull/24110))
-*   Remove deprecated blockType.context support. ([24155](https://github.com/WordPress/gutenberg/pull/24155))
-*   Wrap LinkControlSearchInput in forwardRef. ([24119](https://github.com/WordPress/gutenberg/pull/24119))
+-   Improve rootClientId comparison in useBlockDropZone. ([24307](https://github.com/WordPress/gutenberg/pull/24307))
+-   Clarify wp.blocks.createBlock error message. ([24287](https://github.com/WordPress/gutenberg/pull/24287))
+-   Convert blocks to function component with hooks:
+    -   BlockInvalidWarning. ([24284](https://github.com/WordPress/gutenberg/pull/24284))
+    -   ReusableBlockConvertButton. ([24015](https://github.com/WordPress/gutenberg/pull/24015))
+-   Add missing prop to `WPBlockVariation` type definition. ([24110](https://github.com/WordPress/gutenberg/pull/24110))
+-   Remove deprecated blockType.context support. ([24155](https://github.com/WordPress/gutenberg/pull/24155))
+-   Wrap LinkControlSearchInput in forwardRef. ([24119](https://github.com/WordPress/gutenberg/pull/24119))
 
 ### Build Tooling
 
-*   Perf Tests: Set up branch only once for all test suites. ([24123](https://github.com/WordPress/gutenberg/pull/24123))
-*   Revert "Build: Use `.min.js` suffix for bundled JavaScript". ([24239](https://github.com/WordPress/gutenberg/pull/24239))
-*   Add a Git Diff to the output of the static checks job on failure. ([24154](https://github.com/WordPress/gutenberg/pull/24154))
+-   Perf Tests: Set up branch only once for all test suites. ([24123](https://github.com/WordPress/gutenberg/pull/24123))
+-   Revert "Build: Use `.min.js` suffix for bundled JavaScript". ([24239](https://github.com/WordPress/gutenberg/pull/24239))
+-   Add a Git Diff to the output of the static checks job on failure. ([24154](https://github.com/WordPress/gutenberg/pull/24154))
 
 ### Various
 
-*   Fix intermittent Navigation block test failure. ([24146](https://github.com/WordPress/gutenberg/pull/24146))
-
+-   Fix intermittent Navigation block test failure. ([24146](https://github.com/WordPress/gutenberg/pull/24146))
 
 = 8.6.1 =
 
-### Bug Fixes:
+## Changelog
 
- - Fix the plugin translations.
+### Bug Fixes:
 
+-   Fix the plugin translations.
 
 = 8.6.0 =
 
+## Changelog
+
 ### Features
 
-*   Cover Block: Add video position controls. ([22531](https://github.com/WordPress/gutenberg/pull/22531))
-*   Block pattern updates: _Large header and paragraph,_ _Large header,_ _Text two columns,_ _Three buttons,_ _Two buttons,_ _Quote._ ([23858](https://github.com/WordPress/gutenberg/pull/23858)) ([23857](https://github.com/WordPress/gutenberg/pull/23857)) ([23853](https://github.com/WordPress/gutenberg/pull/23853)) ([23849](https://github.com/WordPress/gutenberg/pull/23849)) ([23848](https://github.com/WordPress/gutenberg/pull/23848)) ([23881](https://github.com/WordPress/gutenberg/pull/23881))
+-   Cover Block: Add video position controls. ([22531](https://github.com/WordPress/gutenberg/pull/22531))
+-   Block pattern updates: _Large header and paragraph,_ _Large header,_ _Text two columns,_ _Three buttons,_ _Two buttons,_ _Quote._ ([23858](https://github.com/WordPress/gutenberg/pull/23858)) ([23857](https://github.com/WordPress/gutenberg/pull/23857)) ([23853](https://github.com/WordPress/gutenberg/pull/23853)) ([23849](https://github.com/WordPress/gutenberg/pull/23849)) ([23848](https://github.com/WordPress/gutenberg/pull/23848)) ([23881](https://github.com/WordPress/gutenberg/pull/23881))
 
 ### Enhancements
 
-*   Editor: Display Site Icon (if one is set) in full-screen mode. ([22952](https://github.com/WordPress/gutenberg/pull/22952))
-*   Block Variations: Add support for finding variations using keywords. ([24040](https://github.com/WordPress/gutenberg/pull/24040))
-*   a11y: Fix radio control in Windows High Contrast mode. ([23706](https://github.com/WordPress/gutenberg/pull/23706))
-*   Classic Block: Move the "convert to blocks" option from menu to own toolbar button. ([23704](https://github.com/WordPress/gutenberg/pull/23704))
-*   a11y: Use composite pattern to improve keyboard navigation on the inserter. ([23610](https://github.com/WordPress/gutenberg/pull/23610))
-*   Date: Add timezone hint to post-scheduling UI. ([23400](https://github.com/WordPress/gutenberg/pull/23400))
-*   Panel: Improve scroll view handling when expanding. ([23327](https://github.com/WordPress/gutenberg/pull/23327)) ([24046](https://github.com/WordPress/gutenberg/pull/24046))
+-   Editor: Display Site Icon (if one is set) in full-screen mode. ([22952](https://github.com/WordPress/gutenberg/pull/22952))
+-   Block Variations: Add support for finding variations using keywords. ([24040](https://github.com/WordPress/gutenberg/pull/24040))
+-   a11y: Fix radio control in Windows High Contrast mode. ([23706](https://github.com/WordPress/gutenberg/pull/23706))
+-   Classic Block: Move the "convert to blocks" option from menu to own toolbar button. ([23704](https://github.com/WordPress/gutenberg/pull/23704))
+-   a11y: Use composite pattern to improve keyboard navigation on the inserter. ([23610](https://github.com/WordPress/gutenberg/pull/23610))
+-   Date: Add timezone hint to post-scheduling UI. ([23400](https://github.com/WordPress/gutenberg/pull/23400))
+-   Panel: Improve scroll view handling when expanding. ([23327](https://github.com/WordPress/gutenberg/pull/23327)) ([24046](https://github.com/WordPress/gutenberg/pull/24046))
 
 ### New APIs
 
-*   Support disabling core block patterns. ([24042](https://github.com/WordPress/gutenberg/pull/24042))
-*   Make the line height and custom units theme support flags consistent and opt-in. ([23964](https://github.com/WordPress/gutenberg/pull/23964)) ([23904](https://github.com/WordPress/gutenberg/pull/23904))
-*   Image: Add the ability for a plugin to disable Image Editor. ([23966](https://github.com/WordPress/gutenberg/pull/23966))
+-   Support disabling core block patterns. ([24042](https://github.com/WordPress/gutenberg/pull/24042))
+-   Make the line height and custom units theme support flags consistent and opt-in. ([23964](https://github.com/WordPress/gutenberg/pull/23964)) ([23904](https://github.com/WordPress/gutenberg/pull/23904))
+-   Image: Add the ability for a plugin to disable Image Editor. ([23966](https://github.com/WordPress/gutenberg/pull/23966))
 
 ### Experiments
 
-*   Site Builder:
-    *   Change references to section back to template part. ([23765](https://github.com/WordPress/gutenberg/pull/23765))
-    *   Post Date Block: Add style attributes and restructure the edit function. ([23931](https://github.com/WordPress/gutenberg/pull/23931))
-    *   Edit Site: Integrate quick inserter. ([23516](https://github.com/WordPress/gutenberg/pull/23516))
-*   Navigation screen and blocks:
-    *   Try: Customizable toolbar contents. ([23613](https://github.com/WordPress/gutenberg/pull/23613))
-    *   Navigation screen: Restore block movers for blocks with just one sibling. ([23680](https://github.com/WordPress/gutenberg/pull/23680))
-    *   Navigation screen: Add error boundary to experimental navigation screen. ([23679](https://github.com/WordPress/gutenberg/pull/23679))
-    *   Navigation screen: Show block appender by default. ([23676](https://github.com/WordPress/gutenberg/pull/23676))
-    *   Block Navigation: Use quick inserter. ([23737](https://github.com/WordPress/gutenberg/pull/23737))
-    *   Navigation <mark>screen: Add .editor-styles-wra</mark>pper. ([23736](https://github.com/WordPress/gutenberg/pull/23736))
-*   Fix Inserter on the widgets screen. ([24045](https://github.com/WordPress/gutenberg/pull/24045))
-
-### Bug Fixes
-
-*   Prevent JavaScript error when using arrow navigation in URLInput. ([24047](https://github.com/WordPress/gutenberg/pull/24047))
-*   a11y: Components: Fix Toolbar arrow key navigation in RTL contexts. ([24043](https://github.com/WordPress/gutenberg/pull/24043))
-*   RichText: Restore aria-multiline. ([24041](https://github.com/WordPress/gutenberg/pull/24041))
-*   a11y: Fix Copy block button focus loss and try to remove the visually hidden textarea. ([24022](https://github.com/WordPress/gutenberg/pull/24022))
-*   Block Patterns: Override patterns that were registered by Core. ([24004](https://github.com/WordPress/gutenberg/pull/24004))
-*   Fix block wrapper selector. ([23991](https://github.com/WordPress/gutenberg/pull/23991))
-*   Fix block icon mouse-out gesture issue. ([23980](https://github.com/WordPress/gutenberg/pull/23980))
-*   Fix components utils export for use-update-effect. ([23969](https://github.com/WordPress/gutenberg/pull/23969))
-*   a11y: Persist tooltips on hover. ([23959](https://github.com/WordPress/gutenberg/pull/23959))
-*   Fix blocks dropping to incorrect position in inner block lists. ([23950](https://github.com/WordPress/gutenberg/pull/23950))
-*   RangeControl: Adapt slider color to color scheme. ([23936](https://github.com/WordPress/gutenberg/pull/23936))
-    *   (JS) Color Values: Rename brand to theme. Add fallback values. ([24059](https://github.com/WordPress/gutenberg/pull/24059))
-*   Prevent content loss after refreshing an editor with unsaved auto-draft post. ([23928](https://github.com/WordPress/gutenberg/pull/23928))
-*   Fix edited Classic block's content deletion when switching to Code editor. ([23927](https://github.com/WordPress/gutenberg/pull/23927))
-*   Fix drag and drop to empty block lists. ([23923](https://github.com/WordPress/gutenberg/pull/23923))
-*   Fix drag and drop for aligned blocks. ([23916](https://github.com/WordPress/gutenberg/pull/23916))
-*   Fix comment capitalization/punctuation. ([23912](https://github.com/WordPress/gutenberg/pull/23912))
-*   Fix block merging regression. ([23901](https://github.com/WordPress/gutenberg/pull/23901))
-*   Inserter: Order quick inserter items by frecency. ([23900](https://github.com/WordPress/gutenberg/pull/23900))
-*   Inserter: Set quick inserter content width to 100% on screens below 782px. ([23896](https://github.com/WordPress/gutenberg/pull/23896))
-*   Autocomplete: Fix closing slash inserter with ESC. ([23859](https://github.com/WordPress/gutenberg/pull/23859))
-*   Inserter: Hide inserter's block preview when searching. ([23827](https://github.com/WordPress/gutenberg/pull/23827))
-*   apiFetch: Fix fetch-all preloading. ([23807](https://github.com/WordPress/gutenberg/pull/23807))
-*   Fix error triggered when a tab is removed from TabPanel component. ([23784](https://github.com/WordPress/gutenberg/pull/23784))
-*   Fix block movers in navigator on experimental navigation page displaying horizontally. ([23779](https://github.com/WordPress/gutenberg/pull/23779))
-*   Search: Fix attribute defaults. ([23777](https://github.com/WordPress/gutenberg/pull/23777))
-*   Apply the reset mixin to the inserter panel. ([23744](https://github.com/WordPress/gutenberg/pull/23744))
-*   Sidebar controls: Add more space for German and other locales. ([23738](https://github.com/WordPress/gutenberg/pull/23738))
-*   Block Library: Standardize post block placeholders. ([23690](https://github.com/WordPress/gutenberg/pull/23690))
-    *   i18n: Block Library: Translate post block placeholders. ([23774](https://github.com/WordPress/gutenberg/pull/23774))
-*   Fix issue where block inserted in wrong place when selection is in nested block list, but root appender is used. ([23668](https://github.com/WordPress/gutenberg/pull/23668))
-*   Fix an issue where dragging while the page has no scrollbar results in a console error. ([23666](https://github.com/WordPress/gutenberg/pull/23666))
-*   Updated styling to match the post editor. ([23525](https://github.com/WordPress/gutenberg/pull/23525))
-*   UnitControl: Fix internal unit parsing to handle incoming unit prop. ([23521](https://github.com/WordPress/gutenberg/pull/23521))
-*   Table block: Fix focus loss in between row/column insertions. ([23508](https://github.com/WordPress/gutenberg/pull/23508))
-*   Editor: Fix block highlight rendering after block is moved. ([23425](https://github.com/WordPress/gutenberg/pull/23425))
-*   Inserter: Fix line to show again. ([20792](https://github.com/WordPress/gutenberg/pull/20792))
-*   Button: Properly handle border radius reset. ([23887](https://github.com/WordPress/gutenberg/pull/23887))
-*   Block Directory: Remove "contact admin" messaging. ([23948](https://github.com/WordPress/gutenberg/pull/23948))
+-   Site Builder:
+    -   Change references to section back to template part. ([23765](https://github.com/WordPress/gutenberg/pull/23765))
+    -   Post Date Block: Add style attributes and restructure the edit function. ([23931](https://github.com/WordPress/gutenberg/pull/23931))
+    -   Edit Site: Integrate quick inserter. ([23516](https://github.com/WordPress/gutenberg/pull/23516))
+-   Navigation screen and blocks:
+    -   Try: Customizable toolbar contents. ([23613](https://github.com/WordPress/gutenberg/pull/23613))
+    -   Navigation screen: Restore block movers for blocks with just one sibling. ([23680](https://github.com/WordPress/gutenberg/pull/23680))
+    -   Navigation screen: Add error boundary to experimental navigation screen. ([23679](https://github.com/WordPress/gutenberg/pull/23679))
+    -   Navigation screen: Show block appender by default. ([23676](https://github.com/WordPress/gutenberg/pull/23676))
+    -   Block Navigation: Use quick inserter. ([23737](https://github.com/WordPress/gutenberg/pull/23737))
+    -   Navigation <mark>screen: Add .editor-styles-wra</mark>pper. ([23736](https://github.com/WordPress/gutenberg/pull/23736))
+-   Fix Inserter on the widgets screen. ([24045](https://github.com/WordPress/gutenberg/pull/24045))
+
+### Bug Fixes
+
+-   Prevent JavaScript error when using arrow navigation in URLInput. ([24047](https://github.com/WordPress/gutenberg/pull/24047))
+-   a11y: Components: Fix Toolbar arrow key navigation in RTL contexts. ([24043](https://github.com/WordPress/gutenberg/pull/24043))
+-   RichText: Restore aria-multiline. ([24041](https://github.com/WordPress/gutenberg/pull/24041))
+-   a11y: Fix Copy block button focus loss and try to remove the visually hidden textarea. ([24022](https://github.com/WordPress/gutenberg/pull/24022))
+-   Block Patterns: Override patterns that were registered by Core. ([24004](https://github.com/WordPress/gutenberg/pull/24004))
+-   Fix block wrapper selector. ([23991](https://github.com/WordPress/gutenberg/pull/23991))
+-   Fix block icon mouse-out gesture issue. ([23980](https://github.com/WordPress/gutenberg/pull/23980))
+-   Fix components utils export for use-update-effect. ([23969](https://github.com/WordPress/gutenberg/pull/23969))
+-   a11y: Persist tooltips on hover. ([23959](https://github.com/WordPress/gutenberg/pull/23959))
+-   Fix blocks dropping to incorrect position in inner block lists. ([23950](https://github.com/WordPress/gutenberg/pull/23950))
+-   RangeControl: Adapt slider color to color scheme. ([23936](https://github.com/WordPress/gutenberg/pull/23936))
+    -   (JS) Color Values: Rename brand to theme. Add fallback values. ([24059](https://github.com/WordPress/gutenberg/pull/24059))
+-   Prevent content loss after refreshing an editor with unsaved auto-draft post. ([23928](https://github.com/WordPress/gutenberg/pull/23928))
+-   Fix edited Classic block's content deletion when switching to Code editor. ([23927](https://github.com/WordPress/gutenberg/pull/23927))
+-   Fix drag and drop to empty block lists. ([23923](https://github.com/WordPress/gutenberg/pull/23923))
+-   Fix drag and drop for aligned blocks. ([23916](https://github.com/WordPress/gutenberg/pull/23916))
+-   Fix comment capitalization/punctuation. ([23912](https://github.com/WordPress/gutenberg/pull/23912))
+-   Fix block merging regression. ([23901](https://github.com/WordPress/gutenberg/pull/23901))
+-   Inserter: Order quick inserter items by frecency. ([23900](https://github.com/WordPress/gutenberg/pull/23900))
+-   Inserter: Set quick inserter content width to 100% on screens below 782px. ([23896](https://github.com/WordPress/gutenberg/pull/23896))
+-   Autocomplete: Fix closing slash inserter with ESC. ([23859](https://github.com/WordPress/gutenberg/pull/23859))
+-   Inserter: Hide inserter's block preview when searching. ([23827](https://github.com/WordPress/gutenberg/pull/23827))
+-   apiFetch: Fix fetch-all preloading. ([23807](https://github.com/WordPress/gutenberg/pull/23807))
+-   Fix error triggered when a tab is removed from TabPanel component. ([23784](https://github.com/WordPress/gutenberg/pull/23784))
+-   Fix block movers in navigator on experimental navigation page displaying horizontally. ([23779](https://github.com/WordPress/gutenberg/pull/23779))
+-   Search: Fix attribute defaults. ([23777](https://github.com/WordPress/gutenberg/pull/23777))
+-   Apply the reset mixin to the inserter panel. ([23744](https://github.com/WordPress/gutenberg/pull/23744))
+-   Sidebar controls: Add more space for German and other locales. ([23738](https://github.com/WordPress/gutenberg/pull/23738))
+-   Block Library: Standardize post block placeholders. ([23690](https://github.com/WordPress/gutenberg/pull/23690))
+    -   i18n: Block Library: Translate post block placeholders. ([23774](https://github.com/WordPress/gutenberg/pull/23774))
+-   Fix issue where block inserted in wrong place when selection is in nested block list, but root appender is used. ([23668](https://github.com/WordPress/gutenberg/pull/23668))
+-   Fix an issue where dragging while the page has no scrollbar results in a console error. ([23666](https://github.com/WordPress/gutenberg/pull/23666))
+-   Updated styling to match the post editor. ([23525](https://github.com/WordPress/gutenberg/pull/23525))
+-   UnitControl: Fix internal unit parsing to handle incoming unit prop. ([23521](https://github.com/WordPress/gutenberg/pull/23521))
+-   Table block: Fix focus loss in between row/column insertions. ([23508](https://github.com/WordPress/gutenberg/pull/23508))
+-   Editor: Fix block highlight rendering after block is moved. ([23425](https://github.com/WordPress/gutenberg/pull/23425))
+-   Inserter: Fix line to show again. ([20792](https://github.com/WordPress/gutenberg/pull/20792))
+-   Button: Properly handle border radius reset. ([23887](https://github.com/WordPress/gutenberg/pull/23887))
+-   Block Directory: Remove "contact admin" messaging. ([23948](https://github.com/WordPress/gutenberg/pull/23948))
 
 ### Performance
 
-*   Optimize more selector calls. ([23930](https://github.com/WordPress/gutenberg/pull/23930))
-*   Performance testing: Cover Site Editor loading time. ([23842](https://github.com/WordPress/gutenberg/pull/23842))
-*   Avoid re-rendering the PostSavedState component on each change. ([23829](https://github.com/WordPress/gutenberg/pull/23829))
-*   Small performance tweaks. ([23825](https://github.com/WordPress/gutenberg/pull/23825))
-*   Env: Only perform expensive install work when required. ([23809](https://github.com/WordPress/gutenberg/pull/23809))
-*   Env: Improve install performance. ([23806](https://github.com/WordPress/gutenberg/pull/23806))
+-   Optimize more selector calls. ([23930](https://github.com/WordPress/gutenberg/pull/23930))
+-   Performance testing: Cover Site Editor loading time. ([23842](https://github.com/WordPress/gutenberg/pull/23842))
+-   Avoid re-rendering the PostSavedState component on each change. ([23829](https://github.com/WordPress/gutenberg/pull/23829))
+-   Small performance tweaks. ([23825](https://github.com/WordPress/gutenberg/pull/23825))
+-   Env: Only perform expensive install work when required. ([23809](https://github.com/WordPress/gutenberg/pull/23809))
+-   Env: Improve install performance. ([23806](https://github.com/WordPress/gutenberg/pull/23806))
 
 ### Documentation
 
-*   Expand and update block-based themes documentation page. ([23750](https://github.com/WordPress/gutenberg/pull/23750))
-*   Docs/update button component props. ([24013](https://github.com/WordPress/gutenberg/pull/24013))
-*   Docs: Update plugin FAQ with versions link. ([24005](https://github.com/WordPress/gutenberg/pull/24005))
-*   Remove the experimental flag from the block patterns documentation. ([23954](https://github.com/WordPress/gutenberg/pull/23954))
-*   Docs: Add links for Create a Block Tutorial. ([23946](https://github.com/WordPress/gutenberg/pull/23946))
-*   Adds basic documentation for the ToolbarButton component. ([23909](https://github.com/WordPress/gutenberg/pull/23909))
-*   Docs: Title and markdown formatting for table. ([23850](https://github.com/WordPress/gutenberg/pull/23850))
-*   Update documentation contributors guide. ([23840](https://github.com/WordPress/gutenberg/pull/23840))
-*   Create new page listing Gutenberg releases in each WordPress version. ([23773](https://github.com/WordPress/gutenberg/pull/23773))
-*   Docs: Clarify the interactive mode for create-block. ([23752](https://github.com/WordPress/gutenberg/pull/23752))
-*   Docs: Add a tutorial on how to create a block-based theme. ([23732](https://github.com/WordPress/gutenberg/pull/23732))
-*   Docs: Move ESNext to JavaScript tutorial. ([23725](https://github.com/WordPress/gutenberg/pull/23725))
-*   Docs: Move DevEnv to own section for documentation. ([23593](https://github.com/WordPress/gutenberg/pull/23593))
-*   Added readme to matrix alignment toolbar. ([23341](https://github.com/WordPress/gutenberg/pull/23341))
-*   Update nested-blocks-inner-blocks.md. ([23935](https://github.com/WordPress/gutenberg/pull/23935))
-*   Update block-registration.md. ([23933](https://github.com/WordPress/gutenberg/pull/23933))
-*   Link to theme-experiments repo in block-based theme documentation. ([23748](https://github.com/WordPress/gutenberg/pull/23748))
-*   Docs: Update device-tests readme with monorepo commands. ([23630](https://github.com/WordPress/gutenberg/pull/23630))
+-   Expand and update block-based themes documentation page. ([23750](https://github.com/WordPress/gutenberg/pull/23750))
+-   Docs/update button component props. ([24013](https://github.com/WordPress/gutenberg/pull/24013))
+-   Docs: Update plugin FAQ with versions link. ([24005](https://github.com/WordPress/gutenberg/pull/24005))
+-   Remove the experimental flag from the block patterns documentation. ([23954](https://github.com/WordPress/gutenberg/pull/23954))
+-   Docs: Add links for Create a Block Tutorial. ([23946](https://github.com/WordPress/gutenberg/pull/23946))
+-   Adds basic documentation for the ToolbarButton component. ([23909](https://github.com/WordPress/gutenberg/pull/23909))
+-   Docs: Title and markdown formatting for table. ([23850](https://github.com/WordPress/gutenberg/pull/23850))
+-   Update documentation contributors guide. ([23840](https://github.com/WordPress/gutenberg/pull/23840))
+-   Create new page listing Gutenberg releases in each WordPress version. ([23773](https://github.com/WordPress/gutenberg/pull/23773))
+-   Docs: Clarify the interactive mode for create-block. ([23752](https://github.com/WordPress/gutenberg/pull/23752))
+-   Docs: Add a tutorial on how to create a block-based theme. ([23732](https://github.com/WordPress/gutenberg/pull/23732))
+-   Docs: Move ESNext to JavaScript tutorial. ([23725](https://github.com/WordPress/gutenberg/pull/23725))
+-   Docs: Move DevEnv to own section for documentation. ([23593](https://github.com/WordPress/gutenberg/pull/23593))
+-   Added readme to matrix alignment toolbar. ([23341](https://github.com/WordPress/gutenberg/pull/23341))
+-   Update nested-blocks-inner-blocks.md. ([23935](https://github.com/WordPress/gutenberg/pull/23935))
+-   Update block-registration.md. ([23933](https://github.com/WordPress/gutenberg/pull/23933))
+-   Link to theme-experiments repo in block-based theme documentation. ([23748](https://github.com/WordPress/gutenberg/pull/23748))
+-   Docs: Update device-tests readme with monorepo commands. ([23630](https://github.com/WordPress/gutenberg/pull/23630))
 
 ### Code Quality
 
-*   Refactor URLPopover to use React Hook. ([23918](https://github.com/WordPress/gutenberg/pull/23918))
-*   Refactor Disabled component to use React Hooks. ([23917](https://github.com/WordPress/gutenberg/pull/23917))
-*   Refactor More block. ([23758](https://github.com/WordPress/gutenberg/pull/23758))
-*   Remove navigation block styles. ([23678](https://github.com/WordPress/gutenberg/pull/23678))
-*   Refactor MediaPlaceholder to function component. ([23671](https://github.com/WordPress/gutenberg/pull/23671))
-*   Remove duplicate selectors. ([23466](https://github.com/WordPress/gutenberg/pull/23466))
-*   Refactor Tag Cloud block to use React Hooks. ([23426](https://github.com/WordPress/gutenberg/pull/23426))
-*   Convert PostSavedState to functional component. ([23038](https://github.com/WordPress/gutenberg/pull/23038))
-*   Types: Improve project setup. ([21581](https://github.com/WordPress/gutenberg/pull/21581))
-*   Refactor ReusableBlockEditPanel to use hooks (and add type info). ([21181](https://github.com/WordPress/gutenberg/pull/21181))
-*   Updates text, buttons colors and lab<mark>e</mark>ls. ([23855](https://github.com/WordPress/gutenberg/pull/23855))
+-   Refactor URLPopover to use React Hook. ([23918](https://github.com/WordPress/gutenberg/pull/23918))
+-   Refactor Disabled component to use React Hooks. ([23917](https://github.com/WordPress/gutenberg/pull/23917))
+-   Refactor More block. ([23758](https://github.com/WordPress/gutenberg/pull/23758))
+-   Remove navigation block styles. ([23678](https://github.com/WordPress/gutenberg/pull/23678))
+-   Refactor MediaPlaceholder to function component. ([23671](https://github.com/WordPress/gutenberg/pull/23671))
+-   Remove duplicate selectors. ([23466](https://github.com/WordPress/gutenberg/pull/23466))
+-   Refactor Tag Cloud block to use React Hooks. ([23426](https://github.com/WordPress/gutenberg/pull/23426))
+-   Convert PostSavedState to functional component. ([23038](https://github.com/WordPress/gutenberg/pull/23038))
+-   Types: Improve project setup. ([21581](https://github.com/WordPress/gutenberg/pull/21581))
+-   Refactor ReusableBlockEditPanel to use hooks (and add type info). ([21181](https://github.com/WordPress/gutenberg/pull/21181))
+-   Updates text, buttons colors and lab<mark>e</mark>ls. ([23855](https://github.com/WordPress/gutenberg/pull/23855))
 
 ### Build Tooling
 
-*   Env:
-    *   Allow wp-env to start without configuration. ([23913](https://github.com/WordPress/gutenberg/pull/23913))
-    *   Add support for different options in each environment. ([22568](https://github.com/WordPress/gutenberg/pull/22568))
-*   Build: Use `.min.js` suffix for bundled JavaScript. ([23926](https://github.com/WordPress/gutenberg/pull/23926))
+-   Env:
+    -   Allow wp-env to start without configuration. ([23913](https://github.com/WordPress/gutenberg/pull/23913))
+    -   Add support for different options in each environment. ([22568](https://github.com/WordPress/gutenberg/pull/22568))
+-   Build: Use `.min.js` suffix for bundled JavaScript. ([23926](https://github.com/WordPress/gutenberg/pull/23926))
 
-*   Try running the performance tests as a GitHub action. ([23818](https://github.com/WordPress/gutenberg/pull/23818))
-*   Improve the performance tests setup. ([23817](https://github.com/WordPress/gutenberg/pull/23817))
-*   Automation:
-    *   Limit tests to not run on documentation-only changes. ([23834](https://github.com/WordPress/gutenberg/pull/23834))
-    *   Add paths-ignore **.md for unit tests checks. ([23845](https://github.com/WordPress/gutenberg/pull/23845))
-    *   Switch workflows to use paths-ignore and **.md. ([23843](https://github.com/WordPress/gutenberg/pull/23843))
+-   Try running the performance tests as a GitHub action. ([23818](https://github.com/WordPress/gutenberg/pull/23818))
+-   Improve the performance tests setup. ([23817](https://github.com/WordPress/gutenberg/pull/23817))
+-   Automation:
+    -   Limit tests to not run on documentation-only changes. ([23834](https://github.com/WordPress/gutenberg/pull/23834))
+    -   Add paths-ignore \*\*.md for unit tests checks. ([23845](https://github.com/WordPress/gutenberg/pull/23845))
+    -   Switch workflows to use paths-ignore and \*\*.md. ([23843](https://github.com/WordPress/gutenberg/pull/23843))
 
 Fix action GitHub action workflow YAML syntax errors. ([23844](https://github.com/WordPress/gutenberg/pull/23844))
 
 ### Various
 
-*   Embeds: Remove unsupported core-embed/hulu block. ([23984](https://github.com/WordPress/gutenberg/pull/23984))
-*   E2E: Remove duplicate blocks in setup file. ([23981](https://github.com/WordPress/gutenberg/pull/23981))
-*   REST API: Check for WP5.5 and skip registering routes. ([23880](https://github.com/WordPress/gutenberg/pull/23880))
-*   LinkControl: Extract reusable parts. ([23869](https://github.com/WordPress/gutenberg/pull/23869))
-*   Updates image size to match columns width. ([23854](https://github.com/WordPress/gutenberg/pull/23854))
-*   InputControl: Add prefix prop. ([23824](https://github.com/WordPress/gutenberg/pull/23824))
-*   Block Navigation: Change the visible labels for "Block navigation" to "List view". ([23796](https://github.com/WordPress/gutenberg/pull/23796))
-*   Site Tagline Block. ([23788](https://github.com/WordPress/gutenberg/pull/23788))
-*   Image Editor: When editing, pass the edited image src. ([23703](https://github.com/WordPress/gutenberg/pull/23703))
-*   Replace SEO settings nofollow toggle with rel text widget. ([23682](https://github.com/WordPress/gutenberg/pull/23682))
-*   Use global registry on the experimental navigation screen. ([23675](https://github.com/WordPress/gutenberg/pull/23675))
-*   Env: Mark breaking change in changelog. ([23776](https://github.com/WordPress/gutenberg/pull/23776))
-*   Cancel previous running workflows when a new commit is made. ([23587](https://github.com/WordPress/gutenberg/pull/23587))
-*   Add title to image and video selection sheets. ([23083](https://github.com/WordPress/gutenberg/pull/23083))
-*   Site Title: Add support settings for colors, fonts, and line height. ([23007](https://github.com/WordPress/gutenberg/pull/23007))
-*   Add fix to make inputs of type email return true from isTextField. ([21162](https://github.com/WordPress/gutenberg/pull/21162))
-*   Full Site Editing: Add a Site Logo block. ([18811](https://github.com/WordPress/gutenberg/pull/18811))
-
+-   Embeds: Remove unsupported core-embed/hulu block. ([23984](https://github.com/WordPress/gutenberg/pull/23984))
+-   E2E: Remove duplicate blocks in setup file. ([23981](https://github.com/WordPress/gutenberg/pull/23981))
+-   REST API: Check for WP5.5 and skip registering routes. ([23880](https://github.com/WordPress/gutenberg/pull/23880))
+-   LinkControl: Extract reusable parts. ([23869](https://github.com/WordPress/gutenberg/pull/23869))
+-   Updates image size to match columns width. ([23854](https://github.com/WordPress/gutenberg/pull/23854))
+-   InputControl: Add prefix prop. ([23824](https://github.com/WordPress/gutenberg/pull/23824))
+-   Block Navigation: Change the visible labels for "Block navigation" to "List view". ([23796](https://github.com/WordPress/gutenberg/pull/23796))
+-   Site Tagline Block. ([23788](https://github.com/WordPress/gutenberg/pull/23788))
+-   Image Editor: When editing, pass the edited image src. ([23703](https://github.com/WordPress/gutenberg/pull/23703))
+-   Replace SEO settings nofollow toggle with rel text widget. ([23682](https://github.com/WordPress/gutenberg/pull/23682))
+-   Use global registry on the experimental navigation screen. ([23675](https://github.com/WordPress/gutenberg/pull/23675))
+-   Env: Mark breaking change in changelog. ([23776](https://github.com/WordPress/gutenberg/pull/23776))
+-   Cancel previous running workflows when a new commit is made. ([23587](https://github.com/WordPress/gutenberg/pull/23587))
+-   Add title to image and video selection sheets. ([23083](https://github.com/WordPress/gutenberg/pull/23083))
+-   Site Title: Add support settings for colors, fonts, and line height. ([23007](https://github.com/WordPress/gutenberg/pull/23007))
+-   Add fix to make inputs of type email return true from isTextField. ([21162](https://github.com/WordPress/gutenberg/pull/21162))
+-   Full Site Editing: Add a Site Logo block. ([18811](https://github.com/WordPress/gutenberg/pull/18811))
 
 = 8.5.1 =
 
-### Bug Fixes
+## Changelog
 
- - Improve the performance of the Site builder page.
- - Load external images if local images not present.
+### Bug Fixes
 
+-   Improve the performance of the Site builder page.
+-   Load external images if local images not present.
 
 = 8.5.0 =
 
+## Changelog
+
 ### Features
 
-*   A11y: Add an option to keep the caret inside blocks in edit mode. ([23546](https://github.com/WordPress/gutenberg/pull/23546))
-*   Add anchor/id support to all static blocks. ([23197](https://github.com/WordPress/gutenberg/pull/23197))
+-   A11y: Add an option to keep the caret inside blocks in edit mode. ([23546](https://github.com/WordPress/gutenberg/pull/23546))
+-   Add anchor/id support to all static blocks. ([23197](https://github.com/WordPress/gutenberg/pull/23197))
 
 ### Enhancements
 
-*   Add an edit button to the gallery images. ([23554](https://github.com/WordPress/gutenberg/pull/23554))
-*   Image block: Allow uploading external image if image host allows it. ([23565](https://github.com/WordPress/gutenberg/pull/23565))
-*   Drag And Drop:
-    *   Enable for multi selection. ([23477](https://github.com/WordPress/gutenberg/pull/23477))
-    *   Improve the drag and scroll behavior. ([23082](https://github.com/WordPress/gutenberg/pull/23082)) ([23448](https://github.com/WordPress/gutenberg/pull/23448))
-    *   Don't show a cloned block while dragging. ([23024](https://github.com/WordPress/gutenberg/pull/23024))
-    *   Polish the block drag chip. ([23609](https://github.com/WordPress/gutenberg/pull/23609))
-*   Image editing:
-    *   Move zoom control to toolbar dropdown. ([23677](https://github.com/WordPress/gutenberg/pull/23677))
-    *   Add original aspect to dropdown. ([23659](https://github.com/WordPress/gutenberg/pull/23659))
-    *   Add filter to REST API image edit. ([23539](https://github.com/WordPress/gutenberg/pull/23539))
-    *   Polish zoom slider. ([23418](https://github.com/WordPress/gutenberg/pull/23418))
-    *   Add permission checks to the endpoint. ([23423](https://github.com/WordPress/gutenberg/pull/23423))
-*   Block Directory:
-    *   Return inactive plugins in search results. ([23688](https://github.com/WordPress/gutenberg/pull/23688))
-    *   Use CDN for block directory assets. ([23499](https://github.com/WordPress/gutenberg/pull/23499))
-*   Add line height rule to the post title. ([23656](https://github.com/WordPress/gutenberg/pull/23656))
-*   Avoid ordering block types per frecency inside block categories. ([23643](https://github.com/WordPress/gutenberg/pull/23643))
-*   Polish the document sidebar controls. ([23578](https://github.com/WordPress/gutenberg/pull/23578))
-*   Add modern color scheme support. ([23558](https://github.com/WordPress/gutenberg/pull/23558))
-*   Use a consistent close icon across the UI. ([23551](https://github.com/WordPress/gutenberg/pull/23551))
-*   Redesign the transform menu. ([23028](https://github.com/WordPress/gutenberg/pull/23028)) ([23449](https://github.com/WordPress/gutenberg/pull/23449))
-*   Redesign the canvas inserter. ([22789](https://github.com/WordPress/gutenberg/pull/22789))
-*   Unify tooltip styles. ([23382](https://github.com/WordPress/gutenberg/pull/23382))
-*   Add block variations to the slash inserter. ([23364](https://github.com/WordPress/gutenberg/pull/23364))
-*   Hide the most used blocks by default and add an option to enable it. ([23358](https://github.com/WordPress/gutenberg/pull/23358))
-*   Add reusable block tab to inserter. ([23296](https://github.com/WordPress/gutenberg/pull/23296))
-*   Add keyboard shortcuts for moving blocks. ([23276](https://github.com/WordPress/gutenberg/pull/23276))
-*   Cover block: Don't show the matrix alignment button when no background set. ([23196](https://github.com/WordPress/gutenberg/pull/23196))
-*   Spacer: Show tooltip with height value on resize. ([23077](https://github.com/WordPress/gutenberg/pull/23077))
-*   Improve post publish buttons alignment. ([22390](https://github.com/WordPress/gutenberg/pull/22390)) ([23487](https://github.com/WordPress/gutenberg/pull/23487))
-*   Make Preview and Save Draft buttons use the same style. ([21192](https://github.com/WordPress/gutenberg/pull/21192))
-*   Add unlink URL to buttons block. ([23445](https://github.com/WordPress/gutenberg/pull/23445))
-*   Clean the patterns list to include in core. ([23608](https://github.com/WordPress/gutenberg/pull/23608))
-*   Add pullquote block tranformations. ([23562](https://github.com/WordPress/gutenberg/pull/23562))
-*   Remove block label from child block appender. ([23393](https://github.com/WordPress/gutenberg/pull/23393))
-*   A11y: Move blocks between levels using keyboard. ([22453](https://github.com/WordPress/gutenberg/pull/22453))
+-   Add an edit button to the gallery images. ([23554](https://github.com/WordPress/gutenberg/pull/23554))
+-   Image block: Allow uploading external image if image host allows it. ([23565](https://github.com/WordPress/gutenberg/pull/23565))
+-   Drag And Drop:
+    -   Enable for multi selection. ([23477](https://github.com/WordPress/gutenberg/pull/23477))
+    -   Improve the drag and scroll behavior. ([23082](https://github.com/WordPress/gutenberg/pull/23082)) ([23448](https://github.com/WordPress/gutenberg/pull/23448))
+    -   Don't show a cloned block while dragging. ([23024](https://github.com/WordPress/gutenberg/pull/23024))
+    -   Polish the block drag chip. ([23609](https://github.com/WordPress/gutenberg/pull/23609))
+-   Image editing:
+    -   Move zoom control to toolbar dropdown. ([23677](https://github.com/WordPress/gutenberg/pull/23677))
+    -   Add original aspect to dropdown. ([23659](https://github.com/WordPress/gutenberg/pull/23659))
+    -   Add filter to REST API image edit. ([23539](https://github.com/WordPress/gutenberg/pull/23539))
+    -   Polish zoom slider. ([23418](https://github.com/WordPress/gutenberg/pull/23418))
+    -   Add permission checks to the endpoint. ([23423](https://github.com/WordPress/gutenberg/pull/23423))
+-   Block Directory:
+    -   Return inactive plugins in search results. ([23688](https://github.com/WordPress/gutenberg/pull/23688))
+    -   Use CDN for block directory assets. ([23499](https://github.com/WordPress/gutenberg/pull/23499))
+-   Add line height rule to the post title. ([23656](https://github.com/WordPress/gutenberg/pull/23656))
+-   Avoid ordering block types per frecency inside block categories. ([23643](https://github.com/WordPress/gutenberg/pull/23643))
+-   Polish the document sidebar controls. ([23578](https://github.com/WordPress/gutenberg/pull/23578))
+-   Add modern color scheme support. ([23558](https://github.com/WordPress/gutenberg/pull/23558))
+-   Use a consistent close icon across the UI. ([23551](https://github.com/WordPress/gutenberg/pull/23551))
+-   Redesign the transform menu. ([23028](https://github.com/WordPress/gutenberg/pull/23028)) ([23449](https://github.com/WordPress/gutenberg/pull/23449))
+-   Redesign the canvas inserter. ([22789](https://github.com/WordPress/gutenberg/pull/22789))
+-   Unify tooltip styles. ([23382](https://github.com/WordPress/gutenberg/pull/23382))
+-   Add block variations to the slash inserter. ([23364](https://github.com/WordPress/gutenberg/pull/23364))
+-   Hide the most used blocks by default and add an option to enable it. ([23358](https://github.com/WordPress/gutenberg/pull/23358))
+-   Add reusable block tab to inserter. ([23296](https://github.com/WordPress/gutenberg/pull/23296))
+-   Add keyboard shortcuts for moving blocks. ([23276](https://github.com/WordPress/gutenberg/pull/23276))
+-   Cover block: Don't show the matrix alignment button when no background set. ([23196](https://github.com/WordPress/gutenberg/pull/23196))
+-   Spacer: Show tooltip with height value on resize. ([23077](https://github.com/WordPress/gutenberg/pull/23077))
+-   Improve post publish buttons alignment. ([22390](https://github.com/WordPress/gutenberg/pull/22390)) ([23487](https://github.com/WordPress/gutenberg/pull/23487))
+-   Make Preview and Save Draft buttons use the same style. ([21192](https://github.com/WordPress/gutenberg/pull/21192))
+-   Add unlink URL to buttons block. ([23445](https://github.com/WordPress/gutenberg/pull/23445))
+-   Clean the patterns list to include in core. ([23608](https://github.com/WordPress/gutenberg/pull/23608))
+-   Add pullquote block tranformations. ([23562](https://github.com/WordPress/gutenberg/pull/23562))
+-   Remove block label from child block appender. ([23393](https://github.com/WordPress/gutenberg/pull/23393))
+-   A11y: Move blocks between levels using keyboard. ([22453](https://github.com/WordPress/gutenberg/pull/22453))
 
 ### New APIs
 
-*   Support **orientation** prop in InnerBlocks. ([23416](https://github.com/WordPress/gutenberg/pull/23416))
-*   Support a flexible **useItems** API for the autocompleters API. ([22853](https://github.com/WordPress/gutenberg/pull/22853)) ([23385](https://github.com/WordPress/gutenberg/pull/23385))
-*   Stabilize the image editing REST API endpoint. ([23536](https://github.com/WordPress/gutenberg/pull/23536))
-*   Stabilize the block directory REST API endpoint. ([23528](https://github.com/WordPress/gutenberg/pull/23528))
-*   Add descriptions to Block patterns. ([23070](https://github.com/WordPress/gutenberg/pull/23070))
+-   Support **orientation** prop in InnerBlocks. ([23416](https://github.com/WordPress/gutenberg/pull/23416))
+-   Support a flexible **useItems** API for the autocompleters API. ([22853](https://github.com/WordPress/gutenberg/pull/22853)) ([23385](https://github.com/WordPress/gutenberg/pull/23385))
+-   Stabilize the image editing REST API endpoint. ([23536](https://github.com/WordPress/gutenberg/pull/23536))
+-   Stabilize the block directory REST API endpoint. ([23528](https://github.com/WordPress/gutenberg/pull/23528))
+-   Add descriptions to Block patterns. ([23070](https://github.com/WordPress/gutenberg/pull/23070))
 
 ### Experiments
 
-*   Site Builder:
-    *   Remove the button block appender. ([23436](https://github.com/WordPress/gutenberg/pull/23436))
-    *   Improve the template parts insertion flow. ([23295](https://github.com/WordPress/gutenberg/pull/23295))
-    *   Fix template part resolution for edited files. ([23591](https://github.com/WordPress/gutenberg/pull/23591))
-    *   Fix inspector panels buttons. ([23464](https://github.com/WordPress/gutenberg/pull/23464))
-    *   Add template part block keyword. ([23623](https://github.com/WordPress/gutenberg/pull/23623))
-    *   Allow wide alignment. ([23488](https://github.com/WordPress/gutenberg/pull/23488))
-    *   Remove templateIds state. ([22893](https://github.com/WordPress/gutenberg/pull/22893))
-*   Navigation screen and block:
-    *   Fix saving issues. ([23559](https://github.com/WordPress/gutenberg/pull/23559))
-    *   A11y: Improve keyboard navigation on the Navigation block toolbar. ([23281](https://github.com/WordPress/gutenberg/pull/23281))
-    *   Fix text size no longer overwritten. ([23360](https://github.com/WordPress/gutenberg/pull/23360))
-    *   Adjust Navigation block submenu padding and spacing. ([23380](https://github.com/WordPress/gutenberg/pull/23380))
-    *   Update placeholder label. ([23297](https://github.com/WordPress/gutenberg/pull/23297))
-    *   Hide the block toolbar on the navigation screen. ([23021](https://github.com/WordPress/gutenberg/pull/23021))
-    *   Allow setting up menus that auto add new pages. ([22697](https://github.com/WordPress/gutenberg/pull/22697))
-    *   Allow Search block to be added alongside links. ([22656](https://github.com/WordPress/gutenberg/pull/22656))
-
-### Bug Fixes
-
-*   Block Directory:
-    *   Support .svg extension for results icons. ([23442](https://github.com/WordPress/gutenberg/pull/23442))
-    *   Throw error if we have an issue registering blocks. ([23439](https://github.com/WordPress/gutenberg/pull/23439))
-    *   Remove the overflow on the Add button. ([23409](https://github.com/WordPress/gutenberg/pull/23409))
-    *   Fix double border in block list. ([23625](https://github.com/WordPress/gutenberg/pull/23625))
-*   Fix the upload icon size. ([23553](https://github.com/WordPress/gutenberg/pull/23553))
-*   Allow scrolling over Popovers. ([23696](https://github.com/WordPress/gutenberg/pull/23696))
-*   Fix quote left border color in dark mode. ([23692](https://github.com/WordPress/gutenberg/pull/23692))
-*   Fix empty block list appender visibility on aligned blocks. ([23672](https://github.com/WordPress/gutenberg/pull/23672))
-*   Fix horizontal Block Mover Layout. ([23640](https://github.com/WordPress/gutenberg/pull/23640))
-*   Fix invisible drop target indicator. ([23638](https://github.com/WordPress/gutenberg/pull/23638))
-*   Rich text: Fix soft line break in caption on enter. ([23622](https://github.com/WordPress/gutenberg/pull/23622))
-*   Fix clicking Gallery items buttons on Safari. ([23586](https://github.com/WordPress/gutenberg/pull/23586))
-*   Hide block list appender in a reusable block if it's not being edited. ([23584](https://github.com/WordPress/gutenberg/pull/23584))
-*   Revert "Remove the style CSS class when the default style variation is chosen". ([23548](https://github.com/WordPress/gutenberg/pull/23548))
-*   Classic block:
-    *   Add height: Auto to content wrapper. ([23547](https://github.com/WordPress/gutenberg/pull/23547))
-    *   Add scroll to last edit position. ([23544](https://github.com/WordPress/gutenberg/pull/23544))
-    *   Adjust placement of the toolbar. ([23438](https://github.com/WordPress/gutenberg/pull/23438))
-    *   Prevent content loss by regularly dispatching changes. ([23408](https://github.com/WordPress/gutenberg/pull/23408))
-    *   Fix undo keyboard shortcut. ([23376](https://github.com/WordPress/gutenberg/pull/23376))
-*   Fix the Gallery images buttons rendering. ([23471](https://github.com/WordPress/gutenberg/pull/23471))
-*   Fix Post title top margin. ([23447](https://github.com/WordPress/gutenberg/pull/23447))
-*   Fix file names generation for edited image files. ([23440](https://github.com/WordPress/gutenberg/pull/23440))
-*   Fix React warning when cropping imùges. ([23432](https://github.com/WordPress/gutenberg/pull/23432))
-*   Polish block moving animation. ([23401](https://github.com/WordPress/gutenberg/pull/23401)) ([22640](https://github.com/WordPress/gutenberg/pull/22640))
-*   Fix small RTL regression in Buttons block. ([23390](https://github.com/WordPress/gutenberg/pull/23390))
-*   Fix centered legacy button. ([23381](https://github.com/WordPress/gutenberg/pull/23381))
-*   Fix React warning while unmounting slots. ([23365](https://github.com/WordPress/gutenberg/pull/23365))
-*   Don't show the "Move to trash" action if the user is not allowed to delete posts. ([23174](https://github.com/WordPress/gutenberg/pull/23174))
-*   add inline font-sizes and colors to the editor for themes that don't enqueue the preset classes. ([22356](https://github.com/WordPress/gutenberg/pull/22356)) ([22668](https://github.com/WordPress/gutenberg/pull/22668)) ([23717](https://github.com/WordPress/gutenberg/pull/23717))
-*   Create Block: Fix missing `scripts` section in scaffolded `package.json`. ([23443](https://github.com/WordPress/gutenberg/pull/23443))
-*   Scripts: Fix build script with style.css files. ([23710](https://github.com/WordPress/gutenberg/pull/23710))
-*   Restore removed props and behavior back to Query Controls. ([23419](https://github.com/WordPress/gutenberg/pull/23419))
-*   Add support for hexadecimal colors in gradient presets. ([23363](https://github.com/WordPress/gutenberg/pull/23363))
+-   Site Builder:
+    -   Remove the button block appender. ([23436](https://github.com/WordPress/gutenberg/pull/23436))
+    -   Improve the template parts insertion flow. ([23295](https://github.com/WordPress/gutenberg/pull/23295))
+    -   Fix template part resolution for edited files. ([23591](https://github.com/WordPress/gutenberg/pull/23591))
+    -   Fix inspector panels buttons. ([23464](https://github.com/WordPress/gutenberg/pull/23464))
+    -   Add template part block keyword. ([23623](https://github.com/WordPress/gutenberg/pull/23623))
+    -   Allow wide alignment. ([23488](https://github.com/WordPress/gutenberg/pull/23488))
+    -   Remove templateIds state. ([22893](https://github.com/WordPress/gutenberg/pull/22893))
+-   Navigation screen and block:
+    -   Fix saving issues. ([23559](https://github.com/WordPress/gutenberg/pull/23559))
+    -   A11y: Improve keyboard navigation on the Navigation block toolbar. ([23281](https://github.com/WordPress/gutenberg/pull/23281))
+    -   Fix text size no longer overwritten. ([23360](https://github.com/WordPress/gutenberg/pull/23360))
+    -   Adjust Navigation block submenu padding and spacing. ([23380](https://github.com/WordPress/gutenberg/pull/23380))
+    -   Update placeholder label. ([23297](https://github.com/WordPress/gutenberg/pull/23297))
+    -   Hide the block toolbar on the navigation screen. ([23021](https://github.com/WordPress/gutenberg/pull/23021))
+    -   Allow setting up menus that auto add new pages. ([22697](https://github.com/WordPress/gutenberg/pull/22697))
+    -   Allow Search block to be added alongside links. ([22656](https://github.com/WordPress/gutenberg/pull/22656))
+
+### Bug Fixes
+
+-   Block Directory:
+    -   Support .svg extension for results icons. ([23442](https://github.com/WordPress/gutenberg/pull/23442))
+    -   Throw error if we have an issue registering blocks. ([23439](https://github.com/WordPress/gutenberg/pull/23439))
+    -   Remove the overflow on the Add button. ([23409](https://github.com/WordPress/gutenberg/pull/23409))
+    -   Fix double border in block list. ([23625](https://github.com/WordPress/gutenberg/pull/23625))
+-   Fix the upload icon size. ([23553](https://github.com/WordPress/gutenberg/pull/23553))
+-   Allow scrolling over Popovers. ([23696](https://github.com/WordPress/gutenberg/pull/23696))
+-   Fix quote left border color in dark mode. ([23692](https://github.com/WordPress/gutenberg/pull/23692))
+-   Fix empty block list appender visibility on aligned blocks. ([23672](https://github.com/WordPress/gutenberg/pull/23672))
+-   Fix horizontal Block Mover Layout. ([23640](https://github.com/WordPress/gutenberg/pull/23640))
+-   Fix invisible drop target indicator. ([23638](https://github.com/WordPress/gutenberg/pull/23638))
+-   Rich text: Fix soft line break in caption on enter. ([23622](https://github.com/WordPress/gutenberg/pull/23622))
+-   Fix clicking Gallery items buttons on Safari. ([23586](https://github.com/WordPress/gutenberg/pull/23586))
+-   Hide block list appender in a reusable block if it's not being edited. ([23584](https://github.com/WordPress/gutenberg/pull/23584))
+-   Revert "Remove the style CSS class when the default style variation is chosen". ([23548](https://github.com/WordPress/gutenberg/pull/23548))
+-   Classic block:
+    -   Add height: Auto to content wrapper. ([23547](https://github.com/WordPress/gutenberg/pull/23547))
+    -   Add scroll to last edit position. ([23544](https://github.com/WordPress/gutenberg/pull/23544))
+    -   Adjust placement of the toolbar. ([23438](https://github.com/WordPress/gutenberg/pull/23438))
+    -   Prevent content loss by regularly dispatching changes. ([23408](https://github.com/WordPress/gutenberg/pull/23408))
+    -   Fix undo keyboard shortcut. ([23376](https://github.com/WordPress/gutenberg/pull/23376))
+-   Fix the Gallery images buttons rendering. ([23471](https://github.com/WordPress/gutenberg/pull/23471))
+-   Fix Post title top margin. ([23447](https://github.com/WordPress/gutenberg/pull/23447))
+-   Fix file names generation for edited image files. ([23440](https://github.com/WordPress/gutenberg/pull/23440))
+-   Fix React warning when cropping imùges. ([23432](https://github.com/WordPress/gutenberg/pull/23432))
+-   Polish block moving animation. ([23401](https://github.com/WordPress/gutenberg/pull/23401)) ([22640](https://github.com/WordPress/gutenberg/pull/22640))
+-   Fix small RTL regression in Buttons block. ([23390](https://github.com/WordPress/gutenberg/pull/23390))
+-   Fix centered legacy button. ([23381](https://github.com/WordPress/gutenberg/pull/23381))
+-   Fix React warning while unmounting slots. ([23365](https://github.com/WordPress/gutenberg/pull/23365))
+-   Don't show the "Move to trash" action if the user is not allowed to delete posts. ([23174](https://github.com/WordPress/gutenberg/pull/23174))
+-   add inline font-sizes and colors to the editor for themes that don't enqueue the preset classes. ([22356](https://github.com/WordPress/gutenberg/pull/22356)) ([22668](https://github.com/WordPress/gutenberg/pull/22668)) ([23717](https://github.com/WordPress/gutenberg/pull/23717))
+-   Create Block: Fix missing `scripts` section in scaffolded `package.json`. ([23443](https://github.com/WordPress/gutenberg/pull/23443))
+-   Scripts: Fix build script with style.css files. ([23710](https://github.com/WordPress/gutenberg/pull/23710))
+-   Restore removed props and behavior back to Query Controls. ([23419](https://github.com/WordPress/gutenberg/pull/23419))
+-   Add support for hexadecimal colors in gradient presets. ([23363](https://github.com/WordPress/gutenberg/pull/23363))
 
 ### Performance
 
-*   Improve the performance of the keyboard shortcuts binding. ([23394](https://github.com/WordPress/gutenberg/pull/23394))
+-   Improve the performance of the keyboard shortcuts binding. ([23394](https://github.com/WordPress/gutenberg/pull/23394))
 
 ### Documentation
 
-*   Add a documentation page explaining how the repository is organized. ([23563](https://github.com/WordPress/gutenberg/pull/23563))
-*   Document the WordPress 5.5 backported code. ([23478](https://github.com/WordPress/gutenberg/pull/23478)) ([23708](https://github.com/WordPress/gutenberg/pull/23708))
-*   Add .markdownlint.json configuration extending scripts configuration. ([23655](https://github.com/WordPress/gutenberg/pull/23655))
-*   Add "Create a Block" tutorial Create a Block tutorial. ([22831](https://github.com/WordPress/gutenberg/pull/22831)) ([23654](https://github.com/WordPress/gutenberg/pull/23654))
-*   Update wp-env Ubuntu documentation. ([23650](https://github.com/WordPress/gutenberg/pull/23650))
-*   Add documentation for InnerBlocks orientation prop. ([23641](https://github.com/WordPress/gutenberg/pull/23641))
-*   Remove DropZone position argument from documentation to reflect removal in WordPress 5.4. ([23577](https://github.com/WordPress/gutenberg/pull/23577))
-*   Update categories in block registration documentation. ([23572](https://github.com/WordPress/gutenberg/pull/23572))
-*   Update ESNext usage in public API. ([23475](https://github.com/WordPress/gutenberg/pull/23475))
-*   Clarify the wp-block-styles documentation. ([23359](https://github.com/WordPress/gutenberg/pull/23359))
-*   Add documentation for setting up Prettier for markdown. ([23286](https://github.com/WordPress/gutenberg/pull/23286))
-*   Typos and tweaks: ([23542](https://github.com/WordPress/gutenberg/pull/23542)) ([23489](https://github.com/WordPress/gutenberg/pull/23489)) ([23590](https://github.com/WordPress/gutenberg/pull/23590)) ([23300](https://github.com/WordPress/gutenberg/pull/23300)) ([23534](https://github.com/WordPress/gutenberg/pull/23534)) ([23467](https://github.com/WordPress/gutenberg/pull/23467))
+-   Add a documentation page explaining how the repository is organized. ([23563](https://github.com/WordPress/gutenberg/pull/23563))
+-   Document the WordPress 5.5 backported code. ([23478](https://github.com/WordPress/gutenberg/pull/23478)) ([23708](https://github.com/WordPress/gutenberg/pull/23708))
+-   Add .markdownlint.json configuration extending scripts configuration. ([23655](https://github.com/WordPress/gutenberg/pull/23655))
+-   Add "Create a Block" tutorial Create a Block tutorial. ([22831](https://github.com/WordPress/gutenberg/pull/22831)) ([23654](https://github.com/WordPress/gutenberg/pull/23654))
+-   Update wp-env Ubuntu documentation. ([23650](https://github.com/WordPress/gutenberg/pull/23650))
+-   Add documentation for InnerBlocks orientation prop. ([23641](https://github.com/WordPress/gutenberg/pull/23641))
+-   Remove DropZone position argument from documentation to reflect removal in WordPress 5.4. ([23577](https://github.com/WordPress/gutenberg/pull/23577))
+-   Update categories in block registration documentation. ([23572](https://github.com/WordPress/gutenberg/pull/23572))
+-   Update ESNext usage in public API. ([23475](https://github.com/WordPress/gutenberg/pull/23475))
+-   Clarify the wp-block-styles documentation. ([23359](https://github.com/WordPress/gutenberg/pull/23359))
+-   Add documentation for setting up Prettier for markdown. ([23286](https://github.com/WordPress/gutenberg/pull/23286))
+-   Typos and tweaks: ([23542](https://github.com/WordPress/gutenberg/pull/23542)) ([23489](https://github.com/WordPress/gutenberg/pull/23489)) ([23590](https://github.com/WordPress/gutenberg/pull/23590)) ([23300](https://github.com/WordPress/gutenberg/pull/23300)) ([23534](https://github.com/WordPress/gutenberg/pull/23534)) ([23467](https://github.com/WordPress/gutenberg/pull/23467))
 
 ### Code Quality
 
-*   Optimize useSelect calls (dependencies) ([23255](https://github.com/WordPress/gutenberg/pull/23255)) ([23247](https://github.com/WordPress/gutenberg/pull/23247)) ([23245](https://github.com/WordPress/gutenberg/pull/23245)) ([23249](https://github.com/WordPress/gutenberg/pull/23249))
-*   Reduced the number of SASS color variables. ([23648](https://github.com/WordPress/gutenberg/pull/23648)) ([23454](https://github.com/WordPress/gutenberg/pull/23454))
-*   Remove unused getBlockIndex selector from useBlockDropZone hook. ([23634](https://github.com/WordPress/gutenberg/pull/23634))
-*   Scroll on drag: Remove blockNodes context dependency. ([23561](https://github.com/WordPress/gutenberg/pull/23561))
-*   Add missing notices dependency. ([23517](https://github.com/WordPress/gutenberg/pull/23517))
-*   Remove BlockPopover key prop and related code. ([23504](https://github.com/WordPress/gutenberg/pull/23504))
-*   Show a warning when SlotFillProvider is missing. ([23493](https://github.com/WordPress/gutenberg/pull/23493))
-*   Block toolbar: Remove data-align attribute. ([23468](https://github.com/WordPress/gutenberg/pull/23468))
-*   Extract block draggable scroll behaviour into React hook. ([23444](https://github.com/WordPress/gutenberg/pull/23444))
-*   Refactor Dropdown to use functional component. ([23142](https://github.com/WordPress/gutenberg/pull/23142))
-*   Refactor Embed Edit component: Class component to Function component. ([22846](https://github.com/WordPress/gutenberg/pull/22846))
-*   Extract navigation link rendering code from the navigation block. ([21075](https://github.com/WordPress/gutenberg/pull/21075))
-*   Block editor: Use vanilla JS instead of Lodash if possible. ([21063](https://github.com/WordPress/gutenberg/pull/21063)) ([23633](https://github.com/WordPress/gutenberg/pull/23633))
-*   Add "engines" to the package.json and "engine-strict = true" to the package.json. ([23600](https://github.com/WordPress/gutenberg/pull/23600))
-*   Block Directory: Remove custom permission check in favor of `canUser`. ([23624](https://github.com/WordPress/gutenberg/pull/23624))
-*   Remove REST\_WP\_REST\_Block\_Types\_Controller\_Test which now exists in WordPress Core. ([23500](https://github.com/WordPress/gutenberg/pull/23500))
-*   Editor: Remove unnecessary block directory dependency. ([23476](https://github.com/WordPress/gutenberg/pull/23476))
-*   Plugin Controller: Return the plugin without the extension. ([23395](https://github.com/WordPress/gutenberg/pull/23395))
-*   Clean up image editor REST route. ([23368](https://github.com/WordPress/gutenberg/pull/23368))
-*   Make slash inserter tests more stable. ([23367](https://github.com/WordPress/gutenberg/pull/23367))
-*   Post Author block: Fix end-to-end test fixture indentation. ([23209](https://github.com/WordPress/gutenberg/pull/23209))
+-   Optimize useSelect calls (dependencies) ([23255](https://github.com/WordPress/gutenberg/pull/23255)) ([23247](https://github.com/WordPress/gutenberg/pull/23247)) ([23245](https://github.com/WordPress/gutenberg/pull/23245)) ([23249](https://github.com/WordPress/gutenberg/pull/23249))
+-   Reduced the number of SASS color variables. ([23648](https://github.com/WordPress/gutenberg/pull/23648)) ([23454](https://github.com/WordPress/gutenberg/pull/23454))
+-   Remove unused getBlockIndex selector from useBlockDropZone hook. ([23634](https://github.com/WordPress/gutenberg/pull/23634))
+-   Scroll on drag: Remove blockNodes context dependency. ([23561](https://github.com/WordPress/gutenberg/pull/23561))
+-   Add missing notices dependency. ([23517](https://github.com/WordPress/gutenberg/pull/23517))
+-   Remove BlockPopover key prop and related code. ([23504](https://github.com/WordPress/gutenberg/pull/23504))
+-   Show a warning when SlotFillProvider is missing. ([23493](https://github.com/WordPress/gutenberg/pull/23493))
+-   Block toolbar: Remove data-align attribute. ([23468](https://github.com/WordPress/gutenberg/pull/23468))
+-   Extract block draggable scroll behaviour into React hook. ([23444](https://github.com/WordPress/gutenberg/pull/23444))
+-   Refactor Dropdown to use functional component. ([23142](https://github.com/WordPress/gutenberg/pull/23142))
+-   Refactor Embed Edit component: Class component to Function component. ([22846](https://github.com/WordPress/gutenberg/pull/22846))
+-   Extract navigation link rendering code from the navigation block. ([21075](https://github.com/WordPress/gutenberg/pull/21075))
+-   Block editor: Use vanilla JS instead of Lodash if possible. ([21063](https://github.com/WordPress/gutenberg/pull/21063)) ([23633](https://github.com/WordPress/gutenberg/pull/23633))
+-   Add "engines" to the package.json and "engine-strict = true" to the package.json. ([23600](https://github.com/WordPress/gutenberg/pull/23600))
+-   Block Directory: Remove custom permission check in favor of `canUser`. ([23624](https://github.com/WordPress/gutenberg/pull/23624))
+-   Remove REST_WP_REST_Block_Types_Controller_Test which now exists in WordPress Core. ([23500](https://github.com/WordPress/gutenberg/pull/23500))
+-   Editor: Remove unnecessary block directory dependency. ([23476](https://github.com/WordPress/gutenberg/pull/23476))
+-   Plugin Controller: Return the plugin without the extension. ([23395](https://github.com/WordPress/gutenberg/pull/23395))
+-   Clean up image editor REST route. ([23368](https://github.com/WordPress/gutenberg/pull/23368))
+-   Make slash inserter tests more stable. ([23367](https://github.com/WordPress/gutenberg/pull/23367))
+-   Post Author block: Fix end-to-end test fixture indentation. ([23209](https://github.com/WordPress/gutenberg/pull/23209))
 
 ### Build Tooling
 
-*   Add new command for pre-releasing npm packages. ([23357](https://github.com/WordPress/gutenberg/pull/23357))
-*   Move the CI setup from Travis to GitHub actions. ([23523](https://github.com/WordPress/gutenberg/pull/23523)) ([23520](https://github.com/WordPress/gutenberg/pull/23520)) ([23518](https://github.com/WordPress/gutenberg/pull/23518)) ([23470](https://github.com/WordPress/gutenberg/pull/23470)) ([23538](https://github.com/WordPress/gutenberg/pull/23538))
-*   Add npm cache to GitHub workflows and use checkout v2. ([23482](https://github.com/WordPress/gutenberg/pull/23482))
-*   Update bin/validate-package-lock.js error message. ([23435](https://github.com/WordPress/gutenberg/pull/23435))
-*   Minor improvements to the release tool and release documentation. ([23441](https://github.com/WordPress/gutenberg/pull/23441))
-*   Tools: Always append prerelease to version update in package.json when preparing npm release. ([23480](https://github.com/WordPress/gutenberg/pull/23480))
-*   Scripts: Add custom TerserPlugin configuration. ([22990](https://github.com/WordPress/gutenberg/pull/22990))
-*   Scripts: Exclude node\_modules from source map processing in start script. ([23711](https://github.com/WordPress/gutenberg/pull/23711))
-*   Fix rc version number added to the CHANGELOG. ([23433](https://github.com/WordPress/gutenberg/pull/23433))
-*   Tests: Jest - Add typeahead plugin. ([23366](https://github.com/WordPress/gutenberg/pull/23366))
-*   Tests: Run end-to-end tests only as an admin. ([23588](https://github.com/WordPress/gutenberg/pull/23588))
-*   End-2-end Tests: Add test for using block variation with the slash inserter. ([23585](https://github.com/WordPress/gutenberg/pull/23585))
+-   Add new command for pre-releasing npm packages. ([23357](https://github.com/WordPress/gutenberg/pull/23357))
+-   Move the CI setup from Travis to GitHub actions. ([23523](https://github.com/WordPress/gutenberg/pull/23523)) ([23520](https://github.com/WordPress/gutenberg/pull/23520)) ([23518](https://github.com/WordPress/gutenberg/pull/23518)) ([23470](https://github.com/WordPress/gutenberg/pull/23470)) ([23538](https://github.com/WordPress/gutenberg/pull/23538))
+-   Add npm cache to GitHub workflows and use checkout v2. ([23482](https://github.com/WordPress/gutenberg/pull/23482))
+-   Update bin/validate-package-lock.js error message. ([23435](https://github.com/WordPress/gutenberg/pull/23435))
+-   Minor improvements to the release tool and release documentation. ([23441](https://github.com/WordPress/gutenberg/pull/23441))
+-   Tools: Always append prerelease to version update in package.json when preparing npm release. ([23480](https://github.com/WordPress/gutenberg/pull/23480))
+-   Scripts: Add custom TerserPlugin configuration. ([22990](https://github.com/WordPress/gutenberg/pull/22990))
+-   Scripts: Exclude node_modules from source map processing in start script. ([23711](https://github.com/WordPress/gutenberg/pull/23711))
+-   Fix rc version number added to the CHANGELOG. ([23433](https://github.com/WordPress/gutenberg/pull/23433))
+-   Tests: Jest - Add typeahead plugin. ([23366](https://github.com/WordPress/gutenberg/pull/23366))
+-   Tests: Run end-to-end tests only as an admin. ([23588](https://github.com/WordPress/gutenberg/pull/23588))
+-   End-2-end Tests: Add test for using block variation with the slash inserter. ([23585](https://github.com/WordPress/gutenberg/pull/23585))
 
 ### Various
 
-*   RangeControl: Integrate NumberControl + update internal state flow. ([23006](https://github.com/WordPress/gutenberg/pull/23006))
-*   Create Block: Generate a block.json file. ([23399](https://github.com/WordPress/gutenberg/pull/23399))
-*   Sync Block Context changes from Core. ([23602](https://github.com/WordPress/gutenberg/pull/23602))
-*   Scripts: Remove default exclude rule for node\_modules for SVG, CSS and Sass files. ([23495](https://github.com/WordPress/gutenberg/pull/23495))
-*   REST API: Sync /themes endpoint with Core's. ([23321](https://github.com/WordPress/gutenberg/pull/23321))
-
+-   RangeControl: Integrate NumberControl + update internal state flow. ([23006](https://github.com/WordPress/gutenberg/pull/23006))
+-   Create Block: Generate a block.json file. ([23399](https://github.com/WordPress/gutenberg/pull/23399))
+-   Sync Block Context changes from Core. ([23602](https://github.com/WordPress/gutenberg/pull/23602))
+-   Scripts: Remove default exclude rule for node_modules for SVG, CSS and Sass files. ([23495](https://github.com/WordPress/gutenberg/pull/23495))
+-   REST API: Sync /themes endpoint with Core's. ([23321](https://github.com/WordPress/gutenberg/pull/23321))
 
 = 8.4.0 =
 
+## Changelog
+
 ### Features
 
-- Add image editing. ([23349](https://github.com/WordPress/gutenberg/pull/23349))
-- Enable block directory. ([23389](https://github.com/WordPress/gutenberg/pull/23389))
-- Allow block attributes to be modified while multiple blocks are selected. ([22470](https://github.com/WordPress/gutenberg/pull/22470))
+-   Add image editing. ([23349](https://github.com/WordPress/gutenberg/pull/23349))
+-   Enable block directory. ([23389](https://github.com/WordPress/gutenberg/pull/23389))
+-   Allow block attributes to be modified while multiple blocks are selected. ([22470](https://github.com/WordPress/gutenberg/pull/22470))
 
 ### Enhancements
 
-- Show movers next to block switcher. ([22673](https://github.com/WordPress/gutenberg/pull/22673))
-- Support drag and drop in blocks like Social Links and improve drop zone detection. ([23020](https://github.com/WordPress/gutenberg/pull/23020))
-- Improve the accessibliity of toolbars by implementing roving tab index.
-  - Embed block toolbar. ([23278](https://github.com/WordPress/gutenberg/pull/23278))
-  - Custom HTML block toolbar. ([23277](https://github.com/WordPress/gutenberg/pull/23277))
-  - Table block toolbar. ([23252](https://github.com/WordPress/gutenberg/pull/23252))
-  - Grouped blocks toolbars. ([23216](https://github.com/WordPress/gutenberg/pull/23216))
-  - Header toolbar. ([22354](https://github.com/WordPress/gutenberg/pull/22354))
-- Tweak colors of disabled buttons to match rest of WP Admin. ([23229](https://github.com/WordPress/gutenberg/pull/23229))
-- Unify style of subheadings. ([23192](https://github.com/WordPress/gutenberg/pull/23192))
-- Make Popover scrolling and position behavior adapt to the content changes. ([23159](https://github.com/WordPress/gutenberg/pull/23159))
-- Reduce block appender hover delay. ([23046](https://github.com/WordPress/gutenberg/pull/23046))
-- Improve the alignment of children in the CardHeader and CardFooter components. ([22916](https://github.com/WordPress/gutenberg/pull/22916))
-- Add ability to transform a Preformatted block into a Code block. ([22634](https://github.com/WordPress/gutenberg/pull/22634))
-- Add a border to blocks while hovering with the Select tool active. ([22508](https://github.com/WordPress/gutenberg/pull/22508))
-- Consolidate disparate "copy block" actions. ([23088](https://github.com/WordPress/gutenberg/pull/23088))
-- Remove margin from last button if buttons in Buttons block are centered. ([23319](https://github.com/WordPress/gutenberg/pull/23319))
-- Adapt the block switcher styles to the new Popover component. ([23232](https://github.com/WordPress/gutenberg/pull/23232))
-- Make UI more consistent. ([23202](https://github.com/WordPress/gutenberg/pull/23202))
-- Remove canvas padding. ([22213](https://github.com/WordPress/gutenberg/pull/22213))
-- Image Editing
-  - Update Rich Image Icons. ([22819](https://github.com/WordPress/gutenberg/pull/22819))
-  - Consolidate crop ratios. ([22817](https://github.com/WordPress/gutenberg/pull/22817))
-  - Use snackbar notifications. ([23029](https://github.com/WordPress/gutenberg/pull/23029))
-  - Batch editing in cropper component. ([23284](https://github.com/WordPress/gutenberg/pull/23284))
-  - Move to image block. ([23053](https://github.com/WordPress/gutenberg/pull/23053))
-  - Change Edit label to crop icon. ([23387](https://github.com/WordPress/gutenberg/pull/23387))
-  - Use percentage instead of multiplier. ([23362](https://github.com/WordPress/gutenberg/pull/23362))
+-   Show movers next to block switcher. ([22673](https://github.com/WordPress/gutenberg/pull/22673))
+-   Support drag and drop in blocks like Social Links and improve drop zone detection. ([23020](https://github.com/WordPress/gutenberg/pull/23020))
+-   Improve the accessibliity of toolbars by implementing roving tab index.
+    -   Embed block toolbar. ([23278](https://github.com/WordPress/gutenberg/pull/23278))
+    -   Custom HTML block toolbar. ([23277](https://github.com/WordPress/gutenberg/pull/23277))
+    -   Table block toolbar. ([23252](https://github.com/WordPress/gutenberg/pull/23252))
+    -   Grouped blocks toolbars. ([23216](https://github.com/WordPress/gutenberg/pull/23216))
+    -   Header toolbar. ([22354](https://github.com/WordPress/gutenberg/pull/22354))
+-   Tweak colors of disabled buttons to match rest of WP Admin. ([23229](https://github.com/WordPress/gutenberg/pull/23229))
+-   Unify style of subheadings. ([23192](https://github.com/WordPress/gutenberg/pull/23192))
+-   Make Popover scrolling and position behavior adapt to the content changes. ([23159](https://github.com/WordPress/gutenberg/pull/23159))
+-   Reduce block appender hover delay. ([23046](https://github.com/WordPress/gutenberg/pull/23046))
+-   Improve the alignment of children in the CardHeader and CardFooter components. ([22916](https://github.com/WordPress/gutenberg/pull/22916))
+-   Add ability to transform a Preformatted block into a Code block. ([22634](https://github.com/WordPress/gutenberg/pull/22634))
+-   Add a border to blocks while hovering with the Select tool active. ([22508](https://github.com/WordPress/gutenberg/pull/22508))
+-   Consolidate disparate "copy block" actions. ([23088](https://github.com/WordPress/gutenberg/pull/23088))
+-   Remove margin from last button if buttons in Buttons block are centered. ([23319](https://github.com/WordPress/gutenberg/pull/23319))
+-   Adapt the block switcher styles to the new Popover component. ([23232](https://github.com/WordPress/gutenberg/pull/23232))
+-   Make UI more consistent. ([23202](https://github.com/WordPress/gutenberg/pull/23202))
+-   Remove canvas padding. ([22213](https://github.com/WordPress/gutenberg/pull/22213))
+-   Image Editing
+    -   Update Rich Image Icons. ([22819](https://github.com/WordPress/gutenberg/pull/22819))
+    -   Consolidate crop ratios. ([22817](https://github.com/WordPress/gutenberg/pull/22817))
+    -   Use snackbar notifications. ([23029](https://github.com/WordPress/gutenberg/pull/23029))
+    -   Batch editing in cropper component. ([23284](https://github.com/WordPress/gutenberg/pull/23284))
+    -   Move to image block. ([23053](https://github.com/WordPress/gutenberg/pull/23053))
+    -   Change Edit label to crop icon. ([23387](https://github.com/WordPress/gutenberg/pull/23387))
+    -   Use percentage instead of multiplier. ([23362](https://github.com/WordPress/gutenberg/pull/23362))
 
 ### New APIs
 
-- Update the theme colors to rely on CSS variables. ([23048](https://github.com/WordPress/gutenberg/pull/23048))
-- Extend `register_block_type_from_metadata` to handle assets. ([22519](https://github.com/WordPress/gutenberg/pull/22519))
-- Enable custom classnames on `<CustomSelectControl>`. ([23045](https://github.com/WordPress/gutenberg/pull/23045))
-- Add `onFilesPreUpload` property to`MediaPlaceholder`. ([23003](https://github.com/WordPress/gutenberg/pull/23003))
-- Improve error customization in`MediaReplaceFlow`. ([22995](https://github.com/WordPress/gutenberg/pull/22995))
-- Add context properties to block types REST endpoint. ([22686](https://github.com/WordPress/gutenberg/pull/22686))
-
-### Bug Fixes
-
-- Fix pixel shift for toggles. ([23191](https://github.com/WordPress/gutenberg/pull/23191))
-- Fix `useBlockSync` race condition. ([23292](https://github.com/WordPress/gutenberg/pull/23292))
-- Avoid overriding popover content padding. ([23270](https://github.com/WordPress/gutenberg/pull/23270))
-- Fix block parent selector border radius. ([23250](https://github.com/WordPress/gutenberg/pull/23250))
-- Fix plus radius. ([23240](https://github.com/WordPress/gutenberg/pull/23240))
-- Fix Inserter's handling of child blocks. ([23231](https://github.com/WordPress/gutenberg/pull/23231))
-- Create Block: Fix errors reported by CSS linter in ESNext template. ([23188](https://github.com/WordPress/gutenberg/pull/23188))
-- Add context property mapping to block registration. ([23180](https://github.com/WordPress/gutenberg/pull/23180))
-- Remove `z-index` from placeholder fieldset. ([23152](https://github.com/WordPress/gutenberg/pull/23152))
-- Fix possibly outdated `onChange` in color palette's color picker. ([23136](https://github.com/WordPress/gutenberg/pull/23136))
-- Fix updateSlot missing from default`SlotFillContext`. ([23108](https://github.com/WordPress/gutenberg/pull/23108))
-- Add check theme support is an array before indexing. ([23104](https://github.com/WordPress/gutenberg/pull/23104))
-- Add i18n to padding 'reset' button. ([23099](https://github.com/WordPress/gutenberg/pull/23099))
-- Fix group block moving animation not working correctly. ([23084](https://github.com/WordPress/gutenberg/pull/23084))
-- Use a light block DOM for the Media & Text block. ([23062](https://github.com/WordPress/gutenberg/pull/23062))
-- Popover: Ensure popovers consider border width's in their positioning. ([23035](https://github.com/WordPress/gutenberg/pull/23035))
-- Remove child space in`Tooltip`. ([23019](https://github.com/WordPress/gutenberg/pull/23019))
-- Fix drag and drop for blocks that don't use `__experimentalTagName` for their inner blocks. ([23016](https://github.com/WordPress/gutenberg/pull/23016))
-- Fix am / pm i18n bug. ([22963](https://github.com/WordPress/gutenberg/pull/22963))
-- Fix plugin document setting panel name. ([22763](https://github.com/WordPress/gutenberg/pull/22763))
-- Fix plus icon. ([22704](https://github.com/WordPress/gutenberg/pull/22704))
-- Fix Typography panel rendering from style hooks. ([22605](https://github.com/WordPress/gutenberg/pull/22605))
-- Fix "Cannot read property 'end' of undefined" error on babel-plugin-makepot. ([22394](https://github.com/WordPress/gutenberg/pull/22394))
-- Fix "React does not recognize isSelected prop in ComplementaryAreaToggle" warning. ([22967](https://github.com/WordPress/gutenberg/pull/22967))
-- Cover padding: Fix reset and visualize on hover. ([23041](https://github.com/WordPress/gutenberg/pull/23041))
-- Fix color picker saturation bug. ([23272](https://github.com/WordPress/gutenberg/pull/23272))
-- Fix image size feature. ([23342](https://github.com/WordPress/gutenberg/pull/23342))
-- Remove block preview paddings. ([23386](https://github.com/WordPress/gutenberg/pull/23386))
-- Block Directory
-  - Fix "no result" UI flash. ([22783](https://github.com/WordPress/gutenberg/pull/22783))
-  - Uninstall unused block types. ([22918](https://github.com/WordPress/gutenberg/pull/22918))
-  - Fix installing blocks. ([23096](https://github.com/WordPress/gutenberg/pull/23096))
-  - Add plugins REST API endpoints. ([22454](https://github.com/WordPress/gutenberg/pull/22454))
-  - Use plugin API for installing & deleting block-plugins. ([23219](https://github.com/WordPress/gutenberg/pull/23219))
-  - Use a more specific `<script>` matching pattern. ([23407](https://github.com/WordPress/gutenberg/pull/23407))
-  - Fix missing padding. ([23346](https://github.com/WordPress/gutenberg/pull/23346))
-- Image Editing
-  - Fix image size on crop. ([23173](https://github.com/WordPress/gutenberg/pull/23173))
-  - Avoid re-render on select. ([23009](https://github.com/WordPress/gutenberg/pull/23009))
-  - Preserve crop position through rotations. ([23374](https://github.com/WordPress/gutenberg/pull/23374))
+-   Update the theme colors to rely on CSS variables. ([23048](https://github.com/WordPress/gutenberg/pull/23048))
+-   Extend `register_block_type_from_metadata` to handle assets. ([22519](https://github.com/WordPress/gutenberg/pull/22519))
+-   Enable custom classnames on `<CustomSelectControl>`. ([23045](https://github.com/WordPress/gutenberg/pull/23045))
+-   Add `onFilesPreUpload` property to`MediaPlaceholder`. ([23003](https://github.com/WordPress/gutenberg/pull/23003))
+-   Improve error customization in`MediaReplaceFlow`. ([22995](https://github.com/WordPress/gutenberg/pull/22995))
+-   Add context properties to block types REST endpoint. ([22686](https://github.com/WordPress/gutenberg/pull/22686))
+
+### Bug Fixes
+
+-   Fix pixel shift for toggles. ([23191](https://github.com/WordPress/gutenberg/pull/23191))
+-   Fix `useBlockSync` race condition. ([23292](https://github.com/WordPress/gutenberg/pull/23292))
+-   Avoid overriding popover content padding. ([23270](https://github.com/WordPress/gutenberg/pull/23270))
+-   Fix block parent selector border radius. ([23250](https://github.com/WordPress/gutenberg/pull/23250))
+-   Fix plus radius. ([23240](https://github.com/WordPress/gutenberg/pull/23240))
+-   Fix Inserter's handling of child blocks. ([23231](https://github.com/WordPress/gutenberg/pull/23231))
+-   Create Block: Fix errors reported by CSS linter in ESNext template. ([23188](https://github.com/WordPress/gutenberg/pull/23188))
+-   Add context property mapping to block registration. ([23180](https://github.com/WordPress/gutenberg/pull/23180))
+-   Remove `z-index` from placeholder fieldset. ([23152](https://github.com/WordPress/gutenberg/pull/23152))
+-   Fix possibly outdated `onChange` in color palette's color picker. ([23136](https://github.com/WordPress/gutenberg/pull/23136))
+-   Fix updateSlot missing from default`SlotFillContext`. ([23108](https://github.com/WordPress/gutenberg/pull/23108))
+-   Add check theme support is an array before indexing. ([23104](https://github.com/WordPress/gutenberg/pull/23104))
+-   Add i18n to padding 'reset' button. ([23099](https://github.com/WordPress/gutenberg/pull/23099))
+-   Fix group block moving animation not working correctly. ([23084](https://github.com/WordPress/gutenberg/pull/23084))
+-   Use a light block DOM for the Media & Text block. ([23062](https://github.com/WordPress/gutenberg/pull/23062))
+-   Popover: Ensure popovers consider border width's in their positioning. ([23035](https://github.com/WordPress/gutenberg/pull/23035))
+-   Remove child space in`Tooltip`. ([23019](https://github.com/WordPress/gutenberg/pull/23019))
+-   Fix drag and drop for blocks that don't use `__experimentalTagName` for their inner blocks. ([23016](https://github.com/WordPress/gutenberg/pull/23016))
+-   Fix am / pm i18n bug. ([22963](https://github.com/WordPress/gutenberg/pull/22963))
+-   Fix plugin document setting panel name. ([22763](https://github.com/WordPress/gutenberg/pull/22763))
+-   Fix plus icon. ([22704](https://github.com/WordPress/gutenberg/pull/22704))
+-   Fix Typography panel rendering from style hooks. ([22605](https://github.com/WordPress/gutenberg/pull/22605))
+-   Fix "Cannot read property 'end' of undefined" error on babel-plugin-makepot. ([22394](https://github.com/WordPress/gutenberg/pull/22394))
+-   Fix "React does not recognize isSelected prop in ComplementaryAreaToggle" warning. ([22967](https://github.com/WordPress/gutenberg/pull/22967))
+-   Cover padding: Fix reset and visualize on hover. ([23041](https://github.com/WordPress/gutenberg/pull/23041))
+-   Fix color picker saturation bug. ([23272](https://github.com/WordPress/gutenberg/pull/23272))
+-   Fix image size feature. ([23342](https://github.com/WordPress/gutenberg/pull/23342))
+-   Remove block preview paddings. ([23386](https://github.com/WordPress/gutenberg/pull/23386))
+-   Block Directory
+    -   Fix "no result" UI flash. ([22783](https://github.com/WordPress/gutenberg/pull/22783))
+    -   Uninstall unused block types. ([22918](https://github.com/WordPress/gutenberg/pull/22918))
+    -   Fix installing blocks. ([23096](https://github.com/WordPress/gutenberg/pull/23096))
+    -   Add plugins REST API endpoints. ([22454](https://github.com/WordPress/gutenberg/pull/22454))
+    -   Use plugin API for installing & deleting block-plugins. ([23219](https://github.com/WordPress/gutenberg/pull/23219))
+    -   Use a more specific `<script>` matching pattern. ([23407](https://github.com/WordPress/gutenberg/pull/23407))
+    -   Fix missing padding. ([23346](https://github.com/WordPress/gutenberg/pull/23346))
+-   Image Editing
+    -   Fix image size on crop. ([23173](https://github.com/WordPress/gutenberg/pull/23173))
+    -   Avoid re-render on select. ([23009](https://github.com/WordPress/gutenberg/pull/23009))
+    -   Preserve crop position through rotations. ([23374](https://github.com/WordPress/gutenberg/pull/23374))
 
 ### Performance
 
-- Memoize useSelect callbacks on the header toolbar items. ([23337](https://github.com/WordPress/gutenberg/pull/23337))
-- Enqueue assets for rendered blocks only. ([22754](https://github.com/WordPress/gutenberg/pull/22754))
-- Call `isMultiSelecting` and `isNavigationMode` selectors where needed. ([22135](https://github.com/WordPress/gutenberg/pull/22135))
+-   Memoize useSelect callbacks on the header toolbar items. ([23337](https://github.com/WordPress/gutenberg/pull/23337))
+-   Enqueue assets for rendered blocks only. ([22754](https://github.com/WordPress/gutenberg/pull/22754))
+-   Call `isMultiSelecting` and `isNavigationMode` selectors where needed. ([22135](https://github.com/WordPress/gutenberg/pull/22135))
 
 ### Experiments
 
-- Full Site Editing
-  - Move initial template fetch to client. ([23186](https://github.com/WordPress/gutenberg/pull/23186))
-  - Fix Template Part Auto-draft creation. ([23050](https://github.com/WordPress/gutenberg/pull/23050))
-  - Fix template part switching instability. ([23282](https://github.com/WordPress/gutenberg/pull/23282))
-  - Fix `$theme-color` error in Template Part block. ([23221](https://github.com/WordPress/gutenberg/pull/23221))
-  - Add auto-drafting for theme supplied template parts. ([23254](https://github.com/WordPress/gutenberg/pull/23254))
-  - Add template part previews to placeholder block. ([22760](https://github.com/WordPress/gutenberg/pull/22760))
-  - Fetch template parts in Template Switcher from REST API. ([21878](https://github.com/WordPress/gutenberg/pull/21878))
-  - Post Title block: Add alignment and heading level support. ([22872](https://github.com/WordPress/gutenberg/pull/22872))
-  - Post Author block: Update functionality and visual parity. ([22877](https://github.com/WordPress/gutenberg/pull/22877))
-  - Add theme exporter. ([22922](https://github.com/WordPress/gutenberg/pull/22922))
-- Navigation block & Navigation screen
-  - Visual improvements to the block navigator. ([22796](https://github.com/WordPress/gutenberg/pull/22796))
-  - Improve flow when creating from menu. ([23187](https://github.com/WordPress/gutenberg/pull/23187))
-  - Renamed Navigation Link to Link. ([23163](https://github.com/WordPress/gutenberg/pull/23163))
-  - Only show appender for the currently selected block. ([22998](https://github.com/WordPress/gutenberg/pull/22998))
-  - Fix navigation block dark style appender. ([23165](https://github.com/WordPress/gutenberg/pull/23165))
-  - Fix saving on navigation screen. ([23157](https://github.com/WordPress/gutenberg/pull/23157))
-  - Extract and refactor placeholder from navigation block edit function. ([23109](https://github.com/WordPress/gutenberg/pull/23109))
-  - Better README for the `edit-navigation` package. ([23018](https://github.com/WordPress/gutenberg/pull/23018))
-  - Remove navigator from the navigation block inspector. ([23022](https://github.com/WordPress/gutenberg/pull/23022))
-  - Separate block navigator focus from the editor focus. ([22996](https://github.com/WordPress/gutenberg/pull/22996))
-  - Change `MenuLocationsEditor` to use a card instead of a panel. ([23151](https://github.com/WordPress/gutenberg/pull/23151))
-  - Change Create Menu UI to use a `Card` instead of`Panel`. ([23150](https://github.com/WordPress/gutenberg/pull/23150))
-  - Enable creation from existing WP Menus. ([18869](https://github.com/WordPress/gutenberg/pull/18869))
-  - Don't announce external value changes in custom select control. ([22815](https://github.com/WordPress/gutenberg/pull/22815))
-  - Refactor Navigation screen to use `@wordpress/data`. ([23033](https://github.com/WordPress/gutenberg/pull/23033))
+-   Full Site Editing
+    -   Move initial template fetch to client. ([23186](https://github.com/WordPress/gutenberg/pull/23186))
+    -   Fix Template Part Auto-draft creation. ([23050](https://github.com/WordPress/gutenberg/pull/23050))
+    -   Fix template part switching instability. ([23282](https://github.com/WordPress/gutenberg/pull/23282))
+    -   Fix `$theme-color` error in Template Part block. ([23221](https://github.com/WordPress/gutenberg/pull/23221))
+    -   Add auto-drafting for theme supplied template parts. ([23254](https://github.com/WordPress/gutenberg/pull/23254))
+    -   Add template part previews to placeholder block. ([22760](https://github.com/WordPress/gutenberg/pull/22760))
+    -   Fetch template parts in Template Switcher from REST API. ([21878](https://github.com/WordPress/gutenberg/pull/21878))
+    -   Post Title block: Add alignment and heading level support. ([22872](https://github.com/WordPress/gutenberg/pull/22872))
+    -   Post Author block: Update functionality and visual parity. ([22877](https://github.com/WordPress/gutenberg/pull/22877))
+    -   Add theme exporter. ([22922](https://github.com/WordPress/gutenberg/pull/22922))
+-   Navigation block & Navigation screen
+    -   Visual improvements to the block navigator. ([22796](https://github.com/WordPress/gutenberg/pull/22796))
+    -   Improve flow when creating from menu. ([23187](https://github.com/WordPress/gutenberg/pull/23187))
+    -   Renamed Navigation Link to Link. ([23163](https://github.com/WordPress/gutenberg/pull/23163))
+    -   Only show appender for the currently selected block. ([22998](https://github.com/WordPress/gutenberg/pull/22998))
+    -   Fix navigation block dark style appender. ([23165](https://github.com/WordPress/gutenberg/pull/23165))
+    -   Fix saving on navigation screen. ([23157](https://github.com/WordPress/gutenberg/pull/23157))
+    -   Extract and refactor placeholder from navigation block edit function. ([23109](https://github.com/WordPress/gutenberg/pull/23109))
+    -   Better README for the `edit-navigation` package. ([23018](https://github.com/WordPress/gutenberg/pull/23018))
+    -   Remove navigator from the navigation block inspector. ([23022](https://github.com/WordPress/gutenberg/pull/23022))
+    -   Separate block navigator focus from the editor focus. ([22996](https://github.com/WordPress/gutenberg/pull/22996))
+    -   Change `MenuLocationsEditor` to use a card instead of a panel. ([23151](https://github.com/WordPress/gutenberg/pull/23151))
+    -   Change Create Menu UI to use a `Card` instead of`Panel`. ([23150](https://github.com/WordPress/gutenberg/pull/23150))
+    -   Enable creation from existing WP Menus. ([18869](https://github.com/WordPress/gutenberg/pull/18869))
+    -   Don't announce external value changes in custom select control. ([22815](https://github.com/WordPress/gutenberg/pull/22815))
+    -   Refactor Navigation screen to use `@wordpress/data`. ([23033](https://github.com/WordPress/gutenberg/pull/23033))
 
 ### Documentation
 
-- `@wordpress/env`: add login details to documentation. ([23343](https://github.com/WordPress/gutenberg/pull/23343))
-- Grammatical fixes in `modularity.md`. ([23336](https://github.com/WordPress/gutenberg/pull/23336))
-- Update `modularity.md`. ([23322](https://github.com/WordPress/gutenberg/pull/23322))
-- Use correct package for importing `useState` in `BoxControl` examples. ([23243](https://github.com/WordPress/gutenberg/pull/23243))
-- Rename architecture `index.md` to `readme.md`. ([23242](https://github.com/WordPress/gutenberg/pull/23242))
-- Scripts: Update changelog to move unreleased entries to Unreleased section. ([23178](https://github.com/WordPress/gutenberg/pull/23178))
-- Handbook: Udpate documentation for package release. ([23162](https://github.com/WordPress/gutenberg/pull/23162))
-- Use deny/allow list. ([23120](https://github.com/WordPress/gutenberg/pull/23120))
-- Move ESNext as default code example. ([23117](https://github.com/WordPress/gutenberg/pull/23117))
-- Handbook: Update release documentation. ([23002](https://github.com/WordPress/gutenberg/pull/23002))
-- Update `theme-support.md` for experimental supports. ([23310](https://github.com/WordPress/gutenberg/pull/23310))
-- RichText: Add missing param documentation for `getActiveFormats()`. ([23160](https://github.com/WordPress/gutenberg/pull/23160))
-- API description: Use a period at the end. ([23097](https://github.com/WordPress/gutenberg/pull/23097))
-- Improve JSDoc comment in ESNext template in edit.js file. ([23164](https://github.com/WordPress/gutenberg/pull/23164))
-- Blocks: Update block registration default values. ([23348](https://github.com/WordPress/gutenberg/pull/23348))
+-   `@wordpress/env`: add login details to documentation. ([23343](https://github.com/WordPress/gutenberg/pull/23343))
+-   Grammatical fixes in `modularity.md`. ([23336](https://github.com/WordPress/gutenberg/pull/23336))
+-   Update `modularity.md`. ([23322](https://github.com/WordPress/gutenberg/pull/23322))
+-   Use correct package for importing `useState` in `BoxControl` examples. ([23243](https://github.com/WordPress/gutenberg/pull/23243))
+-   Rename architecture `index.md` to `readme.md`. ([23242](https://github.com/WordPress/gutenberg/pull/23242))
+-   Scripts: Update changelog to move unreleased entries to Unreleased section. ([23178](https://github.com/WordPress/gutenberg/pull/23178))
+-   Handbook: Udpate documentation for package release. ([23162](https://github.com/WordPress/gutenberg/pull/23162))
+-   Use deny/allow list. ([23120](https://github.com/WordPress/gutenberg/pull/23120))
+-   Move ESNext as default code example. ([23117](https://github.com/WordPress/gutenberg/pull/23117))
+-   Handbook: Update release documentation. ([23002](https://github.com/WordPress/gutenberg/pull/23002))
+-   Update `theme-support.md` for experimental supports. ([23310](https://github.com/WordPress/gutenberg/pull/23310))
+-   RichText: Add missing param documentation for `getActiveFormats()`. ([23160](https://github.com/WordPress/gutenberg/pull/23160))
+-   API description: Use a period at the end. ([23097](https://github.com/WordPress/gutenberg/pull/23097))
+-   Improve JSDoc comment in ESNext template in edit.js file. ([23164](https://github.com/WordPress/gutenberg/pull/23164))
+-   Blocks: Update block registration default values. ([23348](https://github.com/WordPress/gutenberg/pull/23348))
 
 ### Code Quality
 
-- Refactor header toolbar items to use `@wordpress/data` hooks. ([23315](https://github.com/WordPress/gutenberg/pull/23315))
-- Use `useLayoutEffect` to compute the popover position. ([23312](https://github.com/WordPress/gutenberg/pull/23312))
-- Reduce unnecessary selector specificity for Button block. ([23246](https://github.com/WordPress/gutenberg/pull/23246))
-- `Button` component - remove `isLarge` prop. ([23239](https://github.com/WordPress/gutenberg/pull/23239))
-- Upgrade Reakit to version 1.1.0. ([23236](https://github.com/WordPress/gutenberg/pull/23236))
-- Refactor column block to use hooks. ([23143](https://github.com/WordPress/gutenberg/pull/23143))
-- `RichText`: Rewrite with hooks. ([23132](https://github.com/WordPress/gutenberg/pull/23132))
-- Refactor `ToggleControl` to use functional component. ([23116](https://github.com/WordPress/gutenberg/pull/23116))
-- Refactor Media & Text to use functional components. ([23102](https://github.com/WordPress/gutenberg/pull/23102))
-- Image block: Split huge component. ([23093](https://github.com/WordPress/gutenberg/pull/23093))
-- Simplify`useImageSizes`. ([23091](https://github.com/WordPress/gutenberg/pull/23091))
-- Block: Move align wrapper out of Block element. ([23089](https://github.com/WordPress/gutenberg/pull/23089))
-- Remove Gutenberg plugin's deprected APIs for version 8.3.0. ([23001](https://github.com/WordPress/gutenberg/pull/23001))
-- Block: Remove animation component so it is just a hook. ([22936](https://github.com/WordPress/gutenberg/pull/22936))
-- Remove asterisk icon. ([22855](https://github.com/WordPress/gutenberg/pull/22855))
-- Image Editing
-  - Use hooks. ([23008](https://github.com/WordPress/gutenberg/pull/23008))
-  - REST API Code Cleanup. (23037)
+-   Refactor header toolbar items to use `@wordpress/data` hooks. ([23315](https://github.com/WordPress/gutenberg/pull/23315))
+-   Use `useLayoutEffect` to compute the popover position. ([23312](https://github.com/WordPress/gutenberg/pull/23312))
+-   Reduce unnecessary selector specificity for Button block. ([23246](https://github.com/WordPress/gutenberg/pull/23246))
+-   `Button` component - remove `isLarge` prop. ([23239](https://github.com/WordPress/gutenberg/pull/23239))
+-   Upgrade Reakit to version 1.1.0. ([23236](https://github.com/WordPress/gutenberg/pull/23236))
+-   Refactor column block to use hooks. ([23143](https://github.com/WordPress/gutenberg/pull/23143))
+-   `RichText`: Rewrite with hooks. ([23132](https://github.com/WordPress/gutenberg/pull/23132))
+-   Refactor `ToggleControl` to use functional component. ([23116](https://github.com/WordPress/gutenberg/pull/23116))
+-   Refactor Media & Text to use functional components. ([23102](https://github.com/WordPress/gutenberg/pull/23102))
+-   Image block: Split huge component. ([23093](https://github.com/WordPress/gutenberg/pull/23093))
+-   Simplify`useImageSizes`. ([23091](https://github.com/WordPress/gutenberg/pull/23091))
+-   Block: Move align wrapper out of Block element. ([23089](https://github.com/WordPress/gutenberg/pull/23089))
+-   Remove Gutenberg plugin's deprected APIs for version 8.3.0. ([23001](https://github.com/WordPress/gutenberg/pull/23001))
+-   Block: Remove animation component so it is just a hook. ([22936](https://github.com/WordPress/gutenberg/pull/22936))
+-   Remove asterisk icon. ([22855](https://github.com/WordPress/gutenberg/pull/22855))
+-   Image Editing
+    -   Use hooks. ([23008](https://github.com/WordPress/gutenberg/pull/23008))
+    -   REST API Code Cleanup. (23037)
 
 ### Copy
 
-- Cover block: update copy for Opacity label. ([23287](https://github.com/WordPress/gutenberg/pull/23287))
+-   Cover block: update copy for Opacity label. ([23287](https://github.com/WordPress/gutenberg/pull/23287))
 
 ### Build Tooling
 
-- Packages: Fix the changelong updater for initial npm release. ([23166](https://github.com/WordPress/gutenberg/pull/23166))
-- Scripts: Fix `style.css` handling in the build and start commands. ([23127](https://github.com/WordPress/gutenberg/pull/23127))
-- Scripts: Clean up the build folder via `clean-webpack-plugin`. ([23135](https://github.com/WordPress/gutenberg/pull/23135))
-- Scripts: Update stylelint dependencies to latest versions. ([23114](https://github.com/WordPress/gutenberg/pull/23114))
-- Remove volumes and networks in `wp-env` destroy. ([23101](https://github.com/WordPress/gutenberg/pull/23101))
-- Build: Replace "release" with "build" in script for building a package. ([23063](https://github.com/WordPress/gutenberg/pull/23063))
-- Release tool: Fix bug on reporting message error. ([22994](https://github.com/WordPress/gutenberg/pull/22994))
-- Scripts: Remove temporary workaround in ESLint configuration. ([22915](https://github.com/WordPress/gutenberg/pull/22915))
-- ESLint plugin: Allow ESLint 7.x as peer dependency. ([23190](https://github.com/WordPress/gutenberg/pull/23190))
-- Packages: Add "gutenberg" to the list of keywords in `package.json`. ([23161](https://github.com/WordPress/gutenberg/pull/23161))
-- Update `package-lock.json`. ([23052](https://github.com/WordPress/gutenberg/pull/23052))
+-   Packages: Fix the changelong updater for initial npm release. ([23166](https://github.com/WordPress/gutenberg/pull/23166))
+-   Scripts: Fix `style.css` handling in the build and start commands. ([23127](https://github.com/WordPress/gutenberg/pull/23127))
+-   Scripts: Clean up the build folder via `clean-webpack-plugin`. ([23135](https://github.com/WordPress/gutenberg/pull/23135))
+-   Scripts: Update stylelint dependencies to latest versions. ([23114](https://github.com/WordPress/gutenberg/pull/23114))
+-   Remove volumes and networks in `wp-env` destroy. ([23101](https://github.com/WordPress/gutenberg/pull/23101))
+-   Build: Replace "release" with "build" in script for building a package. ([23063](https://github.com/WordPress/gutenberg/pull/23063))
+-   Release tool: Fix bug on reporting message error. ([22994](https://github.com/WordPress/gutenberg/pull/22994))
+-   Scripts: Remove temporary workaround in ESLint configuration. ([22915](https://github.com/WordPress/gutenberg/pull/22915))
+-   ESLint plugin: Allow ESLint 7.x as peer dependency. ([23190](https://github.com/WordPress/gutenberg/pull/23190))
+-   Packages: Add "gutenberg" to the list of keywords in `package.json`. ([23161](https://github.com/WordPress/gutenberg/pull/23161))
+-   Update `package-lock.json`. ([23052](https://github.com/WordPress/gutenberg/pull/23052))
 
 ### Various
 
-- Initialize the content size used in Popover computation. ([23279](https://github.com/WordPress/gutenberg/pull/23279))
-- Make the block grouping test more stable. ([23266](https://github.com/WordPress/gutenberg/pull/23266))
-- Try to improve heading custom color E2E test stability. ([23260](https://github.com/WordPress/gutenberg/pull/23260))
-- Attempt to fix RTL end-to-end test. ([23203](https://github.com/WordPress/gutenberg/pull/23203))
-- Add verification for Create Block to Continues Integration. ([23195](https://github.com/WordPress/gutenberg/pull/23195))
-- Remove padding inheritance on lists in editor-styles. ([23080](https://github.com/WordPress/gutenberg/pull/23080))
-- Change select parent button styles. ([23230](https://github.com/WordPress/gutenberg/pull/23230))
-- Make link color control opt-in. ([23049](https://github.com/WordPress/gutenberg/pull/23049))
-- Use showBlockToolbar consistently in e2e tests. ([23311](https://github.com/WordPress/gutenberg/pull/23311))
-
+-   Initialize the content size used in Popover computation. ([23279](https://github.com/WordPress/gutenberg/pull/23279))
+-   Make the block grouping test more stable. ([23266](https://github.com/WordPress/gutenberg/pull/23266))
+-   Try to improve heading custom color E2E test stability. ([23260](https://github.com/WordPress/gutenberg/pull/23260))
+-   Attempt to fix RTL end-to-end test. ([23203](https://github.com/WordPress/gutenberg/pull/23203))
+-   Add verification for Create Block to Continues Integration. ([23195](https://github.com/WordPress/gutenberg/pull/23195))
+-   Remove padding inheritance on lists in editor-styles. ([23080](https://github.com/WordPress/gutenberg/pull/23080))
+-   Change select parent button styles. ([23230](https://github.com/WordPress/gutenberg/pull/23230))
+-   Make link color control opt-in. ([23049](https://github.com/WordPress/gutenberg/pull/23049))
+-   Use showBlockToolbar consistently in e2e tests. ([23311](https://github.com/WordPress/gutenberg/pull/23311))
 
 = 8.3.0 =
 
-## Features
-
-- New padding control to cover block. ([21492](https://github.com/WordPress/gutenberg/pull/21492), [23014](https://github.com/WordPress/gutenberg/pull/23041))
-- New link color control to paragraph, heading, group, columns, and media-text blocks. ([22722](https://github.com/WordPress/gutenberg/pull/22722), [23025](https://github.com/WordPress/gutenberg/pull/23025), [23049](https://github.com/WordPress/gutenberg/pull/21492))
-- Updated default block categories. ([19279](https://github.com/WordPress/gutenberg/pull/19279))
-- New parent block selector to child blocks. ([21056](https://github.com/WordPress/gutenberg/pull/21056))
-
-## Enhancements
-
-- Blocks:
-  - SiteTitle: add alignment and tag level support. ([22843](https://github.com/WordPress/gutenberg/pull/22843))
-  - Heading: use toolbar for heading level control. ([20246](https://github.com/WordPress/gutenberg/pull/20246))
-  - LatestPost: add ability to filter by author. ([16169](https://github.com/WordPress/gutenberg/pull/16169))
-  - Add caption split at end to all caption blocks. ([22934](https://github.com/WordPress/gutenberg/pull/22934))
-  - Add transforms between the core widgets that have equivalent blocks. ([22644](https://github.com/WordPress/gutenberg/pull/22644))
-- Interface package:
-  - Add block areas tabbed sidebar to the widgets screen. ([22467](https://github.com/WordPress/gutenberg/pull/22467))
-  - Use isActiveByDefault prop and local storage to determine whether is active or not. ([22381](https://github.com/WordPress/gutenberg/pull/22381))
-  - Add mechanism to render them on edit site. ([21430](https://github.com/WordPress/gutenberg/pull/21430))
-  - Sidebar reacts to screen size and refactor to use interface package. ([22565](https://github.com/WordPress/gutenberg/pull/22565))
-- Add heading to the block inserter tips and to the block inserter groups ([22898](https://github.com/WordPress/gutenberg/pull/22898), [22903](https://github.com/WordPress/gutenberg/pull/22903))
-- Move between nesting levels with arrow keys in navigate mode. ([22614](https://github.com/WordPress/gutenberg/pull/22614))
-- Add icons for image tools, other, and update list icons. ([22593](https://github.com/WordPress/gutenberg/pull/22593))
-- Block Navigator: Use default block appender. ([22590](https://github.com/WordPress/gutenberg/pull/22590))
-- Adds a default text label to the block appender when it can only insert a single block type ([22293](https://github.com/WordPress/gutenberg/pull/22293))
-- Make ToolbarButton API consistent. ([22961](https://github.com/WordPress/gutenberg/pull/22961))
-- Implement roving tabindex on the Image block. ([22696](https://github.com/WordPress/gutenberg/pull/22696))
-- Block Editor: Allow control over drop cap feature with `useEditorFeature` helper. ([22291](https://github.com/WordPress/gutenberg/pull/22291))
-- REST API:
-  - Add block styles register mechanism. ([22680](https://github.com/WordPress/gutenberg/pull/22680))
-  - Update default values for fields in the block type schema. ([22695](https://github.com/WordPress/gutenberg/pull/22695))
-
-## New APIs
-
-- Add new package `@wordpress/lazy-import` for lazily installed packages. ([22684](https://github.com/WordPress/gutenberg/pull/22684))
-- Added `_experimental/block-types` endpoint to expose all registered blocks. (REST API [21065](https://github.com/WordPress/gutenberg/pull/21065), register core blocks in the server [22491](https://github.com/WordPress/gutenberg/pull/22491)).
-
-## Experimental
-
-- Added experimental version of rich image editing tools. ([21024](https://github.com/WordPress/gutenberg/pull/21024), [22870](https://github.com/WordPress/gutenberg/pull/22870))
-- Full Site Editing
-  - New template creation flow for EditSite. ([22586](https://github.com/WordPress/gutenberg/pull/22586))
-  - Edit Site: Avoid dirtying un-customized templates on first load. ([22876](https://github.com/WordPress/gutenberg/pull/22876))
-  - Edit Site: Refactor business logic into store. ([22844](https://github.com/WordPress/gutenberg/pull/22844))
-  - Global Styles: make theme.json shape consistent with local styles shape. ([22744](https://github.com/WordPress/gutenberg/pull/22744)) and take block supports from block.json. ([22698](https://github.com/WordPress/gutenberg/pull/22698))
-  - Edit Site: fixes to template lookup and template parts auto-drafts ([22954](https://github.com/WordPress/gutenberg/pull/22954), [23050](https://github.com/WordPress/gutenberg/pull/23050))
-- Navigation screen
-  - Use panel for navigation structure on small screens only. ([22828](https://github.com/WordPress/gutenberg/pull/22828))
-  - Disable the navigator toolbar button. ([22792](https://github.com/WordPress/gutenberg/pull/22792))
-  - Atomic save using customizer API endpoint. ([22603](https://github.com/WordPress/gutenberg/pull/22603))
-  - Retain block IDs on save. ([22739](https://github.com/WordPress/gutenberg/pull/22739))
-  - Separate concerns in useNavigationBlocks. ([22825](https://github.com/WordPress/gutenberg/pull/22825))
-  - Fetch all menus for display in select menu. ([22591](https://github.com/WordPress/gutenberg/pull/22591))
-  - Fix keyboard navigation in Navigation block. ([22885](https://github.com/WordPress/gutenberg/pull/22885))
-  - Rename EllipsisMenu to BlockNavigationBlockSettings. ([22630](https://github.com/WordPress/gutenberg/pull/22630))
-  - Remove BlockNavigationEditor from navigation-link/edit.js. ([22629](https://github.com/WordPress/gutenberg/pull/22629))
-- Block directory:
-  - Update the state to store the installing status per block id. ([22881](https://github.com/WordPress/gutenberg/pull/22881))
-  - Use semantic element for block directory download heading. ([22713](https://github.com/WordPress/gutenberg/pull/22713))
-  - Add list of installed blocks to pre-publish sidebar. ([22752](https://github.com/WordPress/gutenberg/pull/22752))
-  - Store refactor. ([22388](https://github.com/WordPress/gutenberg/pull/22388))
-
-## Bug Fixes
-
-- Blocks
-  - Skip null values returned from the server during registration. ([22849](https://github.com/WordPress/gutenberg/pull/22849))
-  - LatestPost: fix author display. ([22937](https://github.com/WordPress/gutenberg/pull/22937))
-  - Legacy Widgets: widgets with special chars on classname did not load. ([22841](https://github.com/WordPress/gutenberg/pull/22841))
-  - Group: clean up block padding rules. ([22746](https://github.com/WordPress/gutenberg/pull/22746))
-  - Gallery: fix initial creation via media library. ([22659](https://github.com/WordPress/gutenberg/pull/22659))
-  - Cover: fix height reset on unit change. ([22642](https://github.com/WordPress/gutenberg/pull/22642))
-  - Navigation: fix submenu keyboard a11y in IE. ([22546](https://github.com/WordPress/gutenberg/pull/22546))
-  - Buttons: fix invalid property value for margin-right. ([22211](https://github.com/WordPress/gutenberg/pull/22211))
-- CustomSelectControl:
-  - Use default cursor style ([22926](https://github.com/WordPress/gutenberg/pull/22926))
-  - Fix arrow spacing. ([22925](https://github.com/WordPress/gutenberg/pull/22925))
-- Fix Drag and Drop in Safari by upgrading Reakit. ([22960](https://github.com/WordPress/gutenberg/pull/22960))
-- Font size picker reset button: make it visible in all languages. ([22896](https://github.com/WordPress/gutenberg/pull/22896))
-- Components: ToolbarButton use forwardRef. ([22970](https://github.com/WordPress/gutenberg/pull/22970))
-- Remove aria-label from iframe resizers. ([22868](https://github.com/WordPress/gutenberg/pull/22868))
-- LinkControl: avoid showing "Recently updated" when there are no recently updated Pages from the API. ([22856](https://github.com/WordPress/gutenberg/pull/22856))
-- CopyHandler: Fix unintended Copy override when copying from input or textarea elements. ([22793](https://github.com/WordPress/gutenberg/pull/22793))
-- Customizer complementary area should not include the block areas. ([22756](https://github.com/WordPress/gutenberg/pull/22756))
-- Icons: Fix package references. ([22702](https://github.com/WordPress/gutenberg/pull/22702))
-- Fix missing parentheses in usePrevious hook. ([22608](https://github.com/WordPress/gutenberg/pull/22608))
-- Fix presets in themes that use the default color & gradient palettes. ([22526](https://github.com/WordPress/gutenberg/pull/22526))
-
-## Performance
-
-- Remove ifBlockEditSelected internal higher-order component. ([22905](https://github.com/WordPress/gutenberg/pull/22905))
-- Remove withBlockEditContext internal higher-order component. ([22942](https://github.com/WordPress/gutenberg/pull/22942))
-
-## Documentation
-
-- Handbook
-  - Fix links for dynamic blocks page. ([22945](https://github.com/WordPress/gutenberg/pull/22945))
-  - theme.json specification: document link color feature ([22929](https://github.com/WordPress/gutenberg/pull/22929)) and features integration. ([22622](https://github.com/WordPress/gutenberg/pull/22622))
-  - Block Registration: document use of innerBlocks in example property. ([22633](https://github.com/WordPress/gutenberg/pull/22633))
-  - Reusable blocks: initial improvement to documentation. ([21843](https://github.com/WordPress/gutenberg/pull/21843))
-  - Default to ESNext syntax in MetaBox & Block tutorials. ([22748](https://github.com/WordPress/gutenberg/pull/22748), [22973](https://github.com/WordPress/gutenberg/pull/22973))
-  - Block Tutorial: fixed typo in the wp_register_script function. ([22755](https://github.com/WordPress/gutenberg/pull/22755))
-- JSDoc comments:
-  - __experimentalAddAnnotation ([22794](https://github.com/WordPress/gutenberg/pull/22794))
-  - Block Editor ([22981](https://github.com/WordPress/gutenberg/pull/22981)) ([22976](https://github.com/WordPress/gutenberg/pull/22976)) ([22975](https://github.com/WordPress/gutenberg/pull/22975))
-  - Block Library ([22982](https://github.com/WordPress/gutenberg/pull/22982))
-  - Blocks ([22943](https://github.com/WordPress/gutenberg/pull/22943))
-  - Components ([22971](https://github.com/WordPress/gutenberg/pull/22971))
-  - Core Data ([22966](https://github.com/WordPress/gutenberg/pull/22966))
-  - Edit Post ([22944](https://github.com/WordPress/gutenberg/pull/22944))
-  - end-to-end test utils ([22948](https://github.com/WordPress/gutenberg/pull/22948))
-  - Env ([22911](https://github.com/WordPress/gutenberg/pull/22911)) ([20522](https://github.com/WordPress/gutenberg/pull/20522))
-  - Format library ([22913](https://github.com/WordPress/gutenberg/pull/22913))
-  - Interface ([22964](https://github.com/WordPress/gutenberg/pull/22964))
-- Contributor docs:
-  - Add code examples section. ([22974](https://github.com/WordPress/gutenberg/pull/22974))
-  - Update triage to include release instructions. ([22335](https://github.com/WordPress/gutenberg/pull/22335))
-  - Update repository management with proposed guidelines. ([22679](https://github.com/WordPress/gutenberg/pull/22679))
-- Env:
-  - Reference destroy command. ([22643](https://github.com/WordPress/gutenberg/pull/22643))
-  - Fix use of backticks. ([22980](https://github.com/WordPress/gutenberg/pull/22980))
-- Improve e2e-test README. ([22661](https://github.com/WordPress/gutenberg/pull/22661), [22654](https://github.com/WordPress/gutenberg/pull/22654))
-- Move BlockDropZone react hook and update documentation. ([22619](https://github.com/WordPress/gutenberg/pull/22619))
-- Update PULL_REQUEST_TEMPLATE.md to include PR documentation nudge. ([22681](https://github.com/WordPress/gutenberg/pull/22681))
-
-## Code Quality
-
-- Refactor some components to use hooks:
-  - BlockTitle ([22910](https://github.com/WordPress/gutenberg/pull/22910))
-  - BlockCompare ([22909](https://github.com/WordPress/gutenberg/pull/22909))
-  - TabPanel ([22906](https://github.com/WordPress/gutenberg/pull/22906))
-  - AudioEdit([22901](https://github.com/WordPress/gutenberg/pull/22901))
-  - ImageSizeControl ([22899](https://github.com/WordPress/gutenberg/pull/22899))
-  - FormFileUpload ([22894](https://github.com/WordPress/gutenberg/pull/22894))
-- Polish ImageSizeControl. ([22917](https://github.com/WordPress/gutenberg/pull/22917))
-- Latest Posts Block: add key to category select box. ([22904](https://github.com/WordPress/gutenberg/pull/22904))
-- Rename the navigation mode BlockBreadcrumb component to BlockSelectionButton. ([22882](https://github.com/WordPress/gutenberg/pull/22882))
-- Extract inserter state into reusable hooks. ([22710](https://github.com/WordPress/gutenberg/pull/22710))
-- Replace function expressions with named function or arrow expression. ([22647](https://github.com/WordPress/gutenberg/pull/22647))
-- Remove unused isDraggable prop from BlockList. ([22615](https://github.com/WordPress/gutenberg/pull/22615))
-- Remove form control resets and include the styles in the components. ([22596](https://github.com/WordPress/gutenberg/pull/22596))
-- Project Management Automation: reorganize folder structure. ([22574](https://github.com/WordPress/gutenberg/pull/22574))
-- Dependency Extraction Webpack Plugin: add types. ([22498](https://github.com/WordPress/gutenberg/pull/22498))
-- Blocks: Avoid separate host matching constant for embeds. ([13755](https://github.com/WordPress/gutenberg/pull/13755))
-
-## Breaking Change
-
-- Scripts: Remove legacy env command. ([22953](https://github.com/WordPress/gutenberg/pull/22953))
-- ESLint Plugin/Scripts: Update ESLint and related deps to 7.1.0. ([22771](https://github.com/WordPress/gutenberg/pull/22771))
-
-## Build Tooling
-
-- Env package:
-  - Add an interactive bash command. ([22611](https://github.com/WordPress/gutenberg/pull/22611))
-  - Ensure correct port setting on related wp-config params. ([22559](https://github.com/WordPress/gutenberg/pull/22559))
-  - Update Source type to WPSource. ([22785](https://github.com/WordPress/gutenberg/pull/22785))
-  - Fix ssh-auth nodegit + better snap pack detection. ([22649](https://github.com/WordPress/gutenberg/pull/22649))
-  - Correct multisite support. ([22613](https://github.com/WordPress/gutenberg/pull/22613))
-  - Update copy-dir dependency to version 1.3.0. ([22682](https://github.com/WordPress/gutenberg/pull/22682))
-- Create Block:
-  - Integrate CSS import in JS with esnext template. ([22727](https://github.com/WordPress/gutenberg/pull/22727))
-  - Enhancements for the upcoming npm release. ([22978](https://github.com/WordPress/gutenberg/pull/22978))
-- Scripts:
-  - Add support for postcss.config.js. ([22735](https://github.com/WordPress/gutenberg/pull/22735))
-  - Support split Jest configuration for test commands. ([22477](https://github.com/WordPress/gutenberg/pull/22477))
-  - Split webpack loader rules for CSS and Sass files. ([22786](https://github.com/WordPress/gutenberg/pull/22786))
-- Release tool: warn about open issues in milestone before starting release. ([22764](https://github.com/WordPress/gutenberg/pull/22764))
-- Changelog tool: Enhance entry normalizations. ([22601](https://github.com/WordPress/gutenberg/pull/22601))
-- Performance tool: fixes to run across branches. ([22676](https://github.com/WordPress/gutenberg/pull/22676))
-
-## Various
-
-- Use Card instead of Panel for the block editor. ([22827](https://github.com/WordPress/gutenberg/pull/22827))
-- Revert add selectionStart and selectionEnd to transientEdits. ([22933](https://github.com/WordPress/gutenberg/pull/22933))
-- BlockEditor: fix readme syntax. ([22809](https://github.com/WordPress/gutenberg/pull/22809))
-- Trigger additional widget setup actions. ([22807](https://github.com/WordPress/gutenberg/pull/22807))
-- Align navigator icon and buttons to top. ([22790](https://github.com/WordPress/gutenberg/pull/22790))
-- Set default selection to the root navigation block. ([22737](https://github.com/WordPress/gutenberg/pull/22737))
-- end-to-end tests:
-  - Disable inconsistent test for gallery. ([22726](https://github.com/WordPress/gutenberg/pull/22726))
-  - Specify icon for block context test blocks. ([22811](https://github.com/WordPress/gutenberg/pull/22811))
-  - Configure Axe to ignore media modal markup. ([22719](https://github.com/WordPress/gutenberg/pull/22719))
-  - Define end-to-end test experimental features utility as lifecycle helper. ([22712](https://github.com/WordPress/gutenberg/pull/22712))
-- CODEOWNERS updates. ([22725](https://github.com/WordPress/gutenberg/pull/22725))
-- Add data-handle to all script tags in the admin. ([22721](https://github.com/WordPress/gutenberg/pull/22721))
-- Add onDeleteBlock to the extra data to re-render when it has changes. ([22716](https://github.com/WordPress/gutenberg/pull/22716))
-- Add support for page=1 and perPage=-1 to getMergedItemIds. ([22707](https://github.com/WordPress/gutenberg/pull/22707))
-- Replace three experimental flags (ellipsis menu w/ min level, navigator slots) with just __experimentalFeatures. ([22670](https://github.com/WordPress/gutenberg/pull/22670))
-- Add require headers to plugin and readme (php 5.6). ([22669](https://github.com/WordPress/gutenberg/pull/22669))
-- Update package-lock.json so that CI tests pass. ([22667](https://github.com/WordPress/gutenberg/pull/22667))
-- Framework: Upgrade to wp-prettier@2.x. ([22610](https://github.com/WordPress/gutenberg/pull/22610))
-- Remove the multi-block type check to make __experimentalConvert more useful. ([22577](https://github.com/WordPress/gutenberg/pull/22577))
-- Mousetrap: Update to latest stable version. ([22548](https://github.com/WordPress/gutenberg/pull/22548))
+## Changelog
+
+### New Features
+
+-   New padding control to cover block. ([21492](https://github.com/WordPress/gutenberg/pull/21492), [23014](https://github.com/WordPress/gutenberg/pull/23041))
+-   New link color control to paragraph, heading, group, columns, and media-text blocks. ([22722](https://github.com/WordPress/gutenberg/pull/22722), [23025](https://github.com/WordPress/gutenberg/pull/23025), [23049](https://github.com/WordPress/gutenberg/pull/21492))
+-   Updated default block categories. ([19279](https://github.com/WordPress/gutenberg/pull/19279))
+-   New parent block selector to child blocks. ([21056](https://github.com/WordPress/gutenberg/pull/21056))
+
+### Enhancements
+
+-   Blocks:
+    -   SiteTitle: add alignment and tag level support. ([22843](https://github.com/WordPress/gutenberg/pull/22843))
+    -   Heading: use toolbar for heading level control. ([20246](https://github.com/WordPress/gutenberg/pull/20246))
+    -   LatestPost: add ability to filter by author. ([16169](https://github.com/WordPress/gutenberg/pull/16169))
+    -   Add caption split at end to all caption blocks. ([22934](https://github.com/WordPress/gutenberg/pull/22934))
+    -   Add transforms between the core widgets that have equivalent blocks. ([22644](https://github.com/WordPress/gutenberg/pull/22644))
+-   Interface package:
+    -   Add block areas tabbed sidebar to the widgets screen. ([22467](https://github.com/WordPress/gutenberg/pull/22467))
+    -   Use isActiveByDefault prop and local storage to determine whether is active or not. ([22381](https://github.com/WordPress/gutenberg/pull/22381))
+    -   Add mechanism to render them on edit site. ([21430](https://github.com/WordPress/gutenberg/pull/21430))
+    -   Sidebar reacts to screen size and refactor to use interface package. ([22565](https://github.com/WordPress/gutenberg/pull/22565))
+-   Add heading to the block inserter tips and to the block inserter groups ([22898](https://github.com/WordPress/gutenberg/pull/22898), [22903](https://github.com/WordPress/gutenberg/pull/22903))
+-   Move between nesting levels with arrow keys in navigate mode. ([22614](https://github.com/WordPress/gutenberg/pull/22614))
+-   Add icons for image tools, other, and update list icons. ([22593](https://github.com/WordPress/gutenberg/pull/22593))
+-   Block Navigator: Use default block appender. ([22590](https://github.com/WordPress/gutenberg/pull/22590))
+-   Adds a default text label to the block appender when it can only insert a single block type ([22293](https://github.com/WordPress/gutenberg/pull/22293))
+-   Make ToolbarButton API consistent. ([22961](https://github.com/WordPress/gutenberg/pull/22961))
+-   Implement roving tabindex on the Image block. ([22696](https://github.com/WordPress/gutenberg/pull/22696))
+-   Block Editor: Allow control over drop cap feature with `useEditorFeature` helper. ([22291](https://github.com/WordPress/gutenberg/pull/22291))
+-   REST API:
+    -   Add block styles register mechanism. ([22680](https://github.com/WordPress/gutenberg/pull/22680))
+    -   Update default values for fields in the block type schema. ([22695](https://github.com/WordPress/gutenberg/pull/22695))
+
+### New APIs
+
+-   Add new package `@wordpress/lazy-import` for lazily installed packages. ([22684](https://github.com/WordPress/gutenberg/pull/22684))
+-   Added `_experimental/block-types` endpoint to expose all registered blocks. (REST API [21065](https://github.com/WordPress/gutenberg/pull/21065), register core blocks in the server [22491](https://github.com/WordPress/gutenberg/pull/22491)).
+
+### Experimental
+
+-   Added experimental version of rich image editing tools. ([21024](https://github.com/WordPress/gutenberg/pull/21024), [22870](https://github.com/WordPress/gutenberg/pull/22870))
+-   Full Site Editing
+    -   New template creation flow for EditSite. ([22586](https://github.com/WordPress/gutenberg/pull/22586))
+    -   Edit Site: Avoid dirtying un-customized templates on first load. ([22876](https://github.com/WordPress/gutenberg/pull/22876))
+    -   Edit Site: Refactor business logic into store. ([22844](https://github.com/WordPress/gutenberg/pull/22844))
+    -   Global Styles: make theme.json shape consistent with local styles shape. ([22744](https://github.com/WordPress/gutenberg/pull/22744)) and take block supports from block.json. ([22698](https://github.com/WordPress/gutenberg/pull/22698))
+    -   Edit Site: fixes to template lookup and template parts auto-drafts ([22954](https://github.com/WordPress/gutenberg/pull/22954), [23050](https://github.com/WordPress/gutenberg/pull/23050))
+-   Navigation screen
+    -   Use panel for navigation structure on small screens only. ([22828](https://github.com/WordPress/gutenberg/pull/22828))
+    -   Disable the navigator toolbar button. ([22792](https://github.com/WordPress/gutenberg/pull/22792))
+    -   Atomic save using customizer API endpoint. ([22603](https://github.com/WordPress/gutenberg/pull/22603))
+    -   Retain block IDs on save. ([22739](https://github.com/WordPress/gutenberg/pull/22739))
+    -   Separate concerns in useNavigationBlocks. ([22825](https://github.com/WordPress/gutenberg/pull/22825))
+    -   Fetch all menus for display in select menu. ([22591](https://github.com/WordPress/gutenberg/pull/22591))
+    -   Fix keyboard navigation in Navigation block. ([22885](https://github.com/WordPress/gutenberg/pull/22885))
+    -   Rename EllipsisMenu to BlockNavigationBlockSettings. ([22630](https://github.com/WordPress/gutenberg/pull/22630))
+    -   Remove BlockNavigationEditor from navigation-link/edit.js. ([22629](https://github.com/WordPress/gutenberg/pull/22629))
+-   Block directory:
+    -   Update the state to store the installing status per block id. ([22881](https://github.com/WordPress/gutenberg/pull/22881))
+    -   Use semantic element for block directory download heading. ([22713](https://github.com/WordPress/gutenberg/pull/22713))
+    -   Add list of installed blocks to pre-publish sidebar. ([22752](https://github.com/WordPress/gutenberg/pull/22752))
+    -   Store refactor. ([22388](https://github.com/WordPress/gutenberg/pull/22388))
+
+### Bug Fixes
+
+-   Blocks
+    -   Skip null values returned from the server during registration. ([22849](https://github.com/WordPress/gutenberg/pull/22849))
+    -   LatestPost: fix author display. ([22937](https://github.com/WordPress/gutenberg/pull/22937))
+    -   Legacy Widgets: widgets with special chars on classname did not load. ([22841](https://github.com/WordPress/gutenberg/pull/22841))
+    -   Group: clean up block padding rules. ([22746](https://github.com/WordPress/gutenberg/pull/22746))
+    -   Gallery: fix initial creation via media library. ([22659](https://github.com/WordPress/gutenberg/pull/22659))
+    -   Cover: fix height reset on unit change. ([22642](https://github.com/WordPress/gutenberg/pull/22642))
+    -   Navigation: fix submenu keyboard a11y in IE. ([22546](https://github.com/WordPress/gutenberg/pull/22546))
+    -   Buttons: fix invalid property value for margin-right. ([22211](https://github.com/WordPress/gutenberg/pull/22211))
+-   CustomSelectControl:
+    -   Use default cursor style ([22926](https://github.com/WordPress/gutenberg/pull/22926))
+    -   Fix arrow spacing. ([22925](https://github.com/WordPress/gutenberg/pull/22925))
+-   Fix Drag and Drop in Safari by upgrading Reakit. ([22960](https://github.com/WordPress/gutenberg/pull/22960))
+-   Font size picker reset button: make it visible in all languages. ([22896](https://github.com/WordPress/gutenberg/pull/22896))
+-   Components: ToolbarButton use forwardRef. ([22970](https://github.com/WordPress/gutenberg/pull/22970))
+-   Remove aria-label from iframe resizers. ([22868](https://github.com/WordPress/gutenberg/pull/22868))
+-   LinkControl: avoid showing "Recently updated" when there are no recently updated Pages from the API. ([22856](https://github.com/WordPress/gutenberg/pull/22856))
+-   CopyHandler: Fix unintended Copy override when copying from input or textarea elements. ([22793](https://github.com/WordPress/gutenberg/pull/22793))
+-   Customizer complementary area should not include the block areas. ([22756](https://github.com/WordPress/gutenberg/pull/22756))
+-   Icons: Fix package references. ([22702](https://github.com/WordPress/gutenberg/pull/22702))
+-   Fix missing parentheses in usePrevious hook. ([22608](https://github.com/WordPress/gutenberg/pull/22608))
+-   Fix presets in themes that use the default color & gradient palettes. ([22526](https://github.com/WordPress/gutenberg/pull/22526))
+
+### Performance
+
+-   Remove ifBlockEditSelected internal higher-order component. ([22905](https://github.com/WordPress/gutenberg/pull/22905))
+-   Remove withBlockEditContext internal higher-order component. ([22942](https://github.com/WordPress/gutenberg/pull/22942))
+
+### Documentation
+
+-   Handbook
+    -   Fix links for dynamic blocks page. ([22945](https://github.com/WordPress/gutenberg/pull/22945))
+    -   theme.json specification: document link color feature ([22929](https://github.com/WordPress/gutenberg/pull/22929)) and features integration. ([22622](https://github.com/WordPress/gutenberg/pull/22622))
+    -   Block Registration: document use of innerBlocks in example property. ([22633](https://github.com/WordPress/gutenberg/pull/22633))
+    -   Reusable blocks: initial improvement to documentation. ([21843](https://github.com/WordPress/gutenberg/pull/21843))
+    -   Default to ESNext syntax in MetaBox & Block tutorials. ([22748](https://github.com/WordPress/gutenberg/pull/22748), [22973](https://github.com/WordPress/gutenberg/pull/22973))
+    -   Block Tutorial: fixed typo in the wp_register_script function. ([22755](https://github.com/WordPress/gutenberg/pull/22755))
+-   JSDoc comments:
+    -   \_\_experimentalAddAnnotation ([22794](https://github.com/WordPress/gutenberg/pull/22794))
+    -   Block Editor ([22981](https://github.com/WordPress/gutenberg/pull/22981)) ([22976](https://github.com/WordPress/gutenberg/pull/22976)) ([22975](https://github.com/WordPress/gutenberg/pull/22975))
+    -   Block Library ([22982](https://github.com/WordPress/gutenberg/pull/22982))
+    -   Blocks ([22943](https://github.com/WordPress/gutenberg/pull/22943))
+    -   Components ([22971](https://github.com/WordPress/gutenberg/pull/22971))
+    -   Core Data ([22966](https://github.com/WordPress/gutenberg/pull/22966))
+    -   Edit Post ([22944](https://github.com/WordPress/gutenberg/pull/22944))
+    -   end-to-end test utils ([22948](https://github.com/WordPress/gutenberg/pull/22948))
+    -   Env ([22911](https://github.com/WordPress/gutenberg/pull/22911)) ([20522](https://github.com/WordPress/gutenberg/pull/20522))
+    -   Format library ([22913](https://github.com/WordPress/gutenberg/pull/22913))
+    -   Interface ([22964](https://github.com/WordPress/gutenberg/pull/22964))
+-   Contributor docs:
+    -   Add code examples section. ([22974](https://github.com/WordPress/gutenberg/pull/22974))
+    -   Update triage to include release instructions. ([22335](https://github.com/WordPress/gutenberg/pull/22335))
+    -   Update repository management with proposed guidelines. ([22679](https://github.com/WordPress/gutenberg/pull/22679))
+-   Env:
+    -   Reference destroy command. ([22643](https://github.com/WordPress/gutenberg/pull/22643))
+    -   Fix use of backticks. ([22980](https://github.com/WordPress/gutenberg/pull/22980))
+-   Improve e2e-test README. ([22661](https://github.com/WordPress/gutenberg/pull/22661), [22654](https://github.com/WordPress/gutenberg/pull/22654))
+-   Move BlockDropZone react hook and update documentation. ([22619](https://github.com/WordPress/gutenberg/pull/22619))
+-   Update PULL_REQUEST_TEMPLATE.md to include PR documentation nudge. ([22681](https://github.com/WordPress/gutenberg/pull/22681))
+
+### Code Quality
 
+-   Refactor some components to use hooks:
+    -   BlockTitle ([22910](https://github.com/WordPress/gutenberg/pull/22910))
+    -   BlockCompare ([22909](https://github.com/WordPress/gutenberg/pull/22909))
+    -   TabPanel ([22906](https://github.com/WordPress/gutenberg/pull/22906))
+    -   AudioEdit([22901](https://github.com/WordPress/gutenberg/pull/22901))
+    -   ImageSizeControl ([22899](https://github.com/WordPress/gutenberg/pull/22899))
+    -   FormFileUpload ([22894](https://github.com/WordPress/gutenberg/pull/22894))
+-   Polish ImageSizeControl. ([22917](https://github.com/WordPress/gutenberg/pull/22917))
+-   Latest Posts Block: add key to category select box. ([22904](https://github.com/WordPress/gutenberg/pull/22904))
+-   Rename the navigation mode BlockBreadcrumb component to BlockSelectionButton. ([22882](https://github.com/WordPress/gutenberg/pull/22882))
+-   Extract inserter state into reusable hooks. ([22710](https://github.com/WordPress/gutenberg/pull/22710))
+-   Replace function expressions with named function or arrow expression. ([22647](https://github.com/WordPress/gutenberg/pull/22647))
+-   Remove unused isDraggable prop from BlockList. ([22615](https://github.com/WordPress/gutenberg/pull/22615))
+-   Remove form control resets and include the styles in the components. ([22596](https://github.com/WordPress/gutenberg/pull/22596))
+-   Project Management Automation: reorganize folder structure. ([22574](https://github.com/WordPress/gutenberg/pull/22574))
+-   Dependency Extraction Webpack Plugin: add types. ([22498](https://github.com/WordPress/gutenberg/pull/22498))
+-   Blocks: Avoid separate host matching constant for embeds. ([13755](https://github.com/WordPress/gutenberg/pull/13755))
+
+### Breaking Changes
+
+-   Scripts: Remove legacy env command. ([22953](https://github.com/WordPress/gutenberg/pull/22953))
+-   ESLint Plugin/Scripts: Update ESLint and related deps to 7.1.0. ([22771](https://github.com/WordPress/gutenberg/pull/22771))
 
+### Build Tooling
+
+-   Env package:
+    -   Add an interactive bash command. ([22611](https://github.com/WordPress/gutenberg/pull/22611))
+    -   Ensure correct port setting on related wp-config params. ([22559](https://github.com/WordPress/gutenberg/pull/22559))
+    -   Update Source type to WPSource. ([22785](https://github.com/WordPress/gutenberg/pull/22785))
+    -   Fix ssh-auth nodegit + better snap pack detection. ([22649](https://github.com/WordPress/gutenberg/pull/22649))
+    -   Correct multisite support. ([22613](https://github.com/WordPress/gutenberg/pull/22613))
+    -   Update copy-dir dependency to version 1.3.0. ([22682](https://github.com/WordPress/gutenberg/pull/22682))
+-   Create Block:
+    -   Integrate CSS import in JS with esnext template. ([22727](https://github.com/WordPress/gutenberg/pull/22727))
+    -   Enhancements for the upcoming npm release. ([22978](https://github.com/WordPress/gutenberg/pull/22978))
+-   Scripts:
+    -   Add support for postcss.config.js. ([22735](https://github.com/WordPress/gutenberg/pull/22735))
+    -   Support split Jest configuration for test commands. ([22477](https://github.com/WordPress/gutenberg/pull/22477))
+    -   Split webpack loader rules for CSS and Sass files. ([22786](https://github.com/WordPress/gutenberg/pull/22786))
+-   Release tool: warn about open issues in milestone before starting release. ([22764](https://github.com/WordPress/gutenberg/pull/22764))
+-   Changelog tool: Enhance entry normalizations. ([22601](https://github.com/WordPress/gutenberg/pull/22601))
+-   Performance tool: fixes to run across branches. ([22676](https://github.com/WordPress/gutenberg/pull/22676))
+
+### Various
 
+-   Use Card instead of Panel for the block editor. ([22827](https://github.com/WordPress/gutenberg/pull/22827))
+-   Revert add selectionStart and selectionEnd to transientEdits. ([22933](https://github.com/WordPress/gutenberg/pull/22933))
+-   BlockEditor: fix readme syntax. ([22809](https://github.com/WordPress/gutenberg/pull/22809))
+-   Trigger additional widget setup actions. ([22807](https://github.com/WordPress/gutenberg/pull/22807))
+-   Align navigator icon and buttons to top. ([22790](https://github.com/WordPress/gutenberg/pull/22790))
+-   Set default selection to the root navigation block. ([22737](https://github.com/WordPress/gutenberg/pull/22737))
+-   end-to-end tests:
+    -   Disable inconsistent test for gallery. ([22726](https://github.com/WordPress/gutenberg/pull/22726))
+    -   Specify icon for block context test blocks. ([22811](https://github.com/WordPress/gutenberg/pull/22811))
+    -   Configure Axe to ignore media modal markup. ([22719](https://github.com/WordPress/gutenberg/pull/22719))
+    -   Define end-to-end test experimental features utility as lifecycle helper. ([22712](https://github.com/WordPress/gutenberg/pull/22712))
+-   CODEOWNERS updates. ([22725](https://github.com/WordPress/gutenberg/pull/22725))
+-   Add data-handle to all script tags in the admin. ([22721](https://github.com/WordPress/gutenberg/pull/22721))
+-   Add onDeleteBlock to the extra data to re-render when it has changes. ([22716](https://github.com/WordPress/gutenberg/pull/22716))
+-   Add support for page=1 and perPage=-1 to getMergedItemIds. ([22707](https://github.com/WordPress/gutenberg/pull/22707))
+-   Replace three experimental flags (ellipsis menu w/ min level, navigator slots) with just \_\_experimentalFeatures. ([22670](https://github.com/WordPress/gutenberg/pull/22670))
+-   Add require headers to plugin and readme (php 5.6). ([22669](https://github.com/WordPress/gutenberg/pull/22669))
+-   Update package-lock.json so that CI tests pass. ([22667](https://github.com/WordPress/gutenberg/pull/22667))
+-   Framework: Upgrade to wp-prettier@2.x. ([22610](https://github.com/WordPress/gutenberg/pull/22610))
+-   Remove the multi-block type check to make \_\_experimentalConvert more useful. ([22577](https://github.com/WordPress/gutenberg/pull/22577))
+-   Mousetrap: Update to latest stable version. ([22548](https://github.com/WordPress/gutenberg/pull/22548))
 
 = 8.2.1 =
 
-### Changelog:
+## Changelog
 
-- Fix Image alignments.
-- Fix gallery block initial creation via media library
+### Bug Fixes
 
+-   Fix Image alignments.
+-   Fix gallery block initial creation via media library
 
 = 8.2.0 =
 
-### Features
+## Changelog
 
-- Cover block: Support customizing the content alignment. ([21091](https://github.com/WordPress/gutenberg/pull/21091)) ([22322](https://github.com/WordPress/gutenberg/pull/22322))
-- Add Block Pattern Categories Support. ([22164](https://github.com/WordPress/gutenberg/pull/22164)) ([22410](https://github.com/WordPress/gutenberg/pull/22410))
-- Copy the whole block if no text is selected. ([22186](https://github.com/WordPress/gutenberg/pull/22186))
+### Features
 
+-   Cover block: Support customizing the content alignment. ([21091](https://github.com/WordPress/gutenberg/pull/21091)) ([22322](https://github.com/WordPress/gutenberg/pull/22322))
+-   Add Block Pattern Categories Support. ([22164](https://github.com/WordPress/gutenberg/pull/22164)) ([22410](https://github.com/WordPress/gutenberg/pull/22410))
+-   Copy the whole block if no text is selected. ([22186](https://github.com/WordPress/gutenberg/pull/22186))
 
 ### Enhancements
 
-- Limit the most used blocks in the inserter to 6 elements. ([22521](https://github.com/WordPress/gutenberg/pull/22521))
-- Allow split out of caption on Enter. ([22290](https://github.com/WordPress/gutenberg/pull/22290))
-- Buttons block: Allow split and merge. ([22436](https://github.com/WordPress/gutenberg/pull/22436))
-- Improve video backgrounds for the Cover block in iOS. ([22346](https://github.com/WordPress/gutenberg/pull/22346))
-- Combine Calendar Help and Close buttons in the date and time picker. ([22176](https://github.com/WordPress/gutenberg/pull/22176))
-- @wordpress/env: Better run command errors. ([22475](https://github.com/WordPress/gutenberg/pull/22475))
-- Add support for named orientations and literal colors on custom gradients. ([22239](https://github.com/WordPress/gutenberg/pull/22239))
-- Use theme color as focus color. ([22261](https://github.com/WordPress/gutenberg/pull/22261))
-- Refine the specificity of the embed block styles. ([21599](https://github.com/WordPress/gutenberg/pull/21599))
-- Change inserter search placeholder text color. ([22444](https://github.com/WordPress/gutenberg/pull/22444))
-- Improve interactions and add unit parsing to the unit selector used in Cover block. ([22329](https://github.com/WordPress/gutenberg/pull/22329))
-- Use smaller spacer and cover block step values. ([22320](https://github.com/WordPress/gutenberg/pull/22320))
-- A11y: Add explanatory text before the a11y.speak aria-live regions. ([22112](https://github.com/WordPress/gutenberg/pull/22112))
-- Add Animoto, Dailymotion block embed icons. ([21882](https://github.com/WordPress/gutenberg/pull/21882))
-- Group block: Match frontend markup in the editor. ([21867](https://github.com/WordPress/gutenberg/pull/21867))
-- Iterations on the welcome guide. ([21847](https://github.com/WordPress/gutenberg/pull/21847))
-- Don't show protocol in link suggestions. ([20350](https://github.com/WordPress/gutenberg/pull/20350))
-- New Block Patterns:
-  - Hero and two columns. ([21130](https://github.com/WordPress/gutenberg/pull/21130))
-  - Features or Services. ([20898](https://github.com/WordPress/gutenberg/pull/20898))
-
+-   Limit the most used blocks in the inserter to 6 elements. ([22521](https://github.com/WordPress/gutenberg/pull/22521))
+-   Allow split out of caption on Enter. ([22290](https://github.com/WordPress/gutenberg/pull/22290))
+-   Buttons block: Allow split and merge. ([22436](https://github.com/WordPress/gutenberg/pull/22436))
+-   Improve video backgrounds for the Cover block in iOS. ([22346](https://github.com/WordPress/gutenberg/pull/22346))
+-   Combine Calendar Help and Close buttons in the date and time picker. ([22176](https://github.com/WordPress/gutenberg/pull/22176))
+-   @wordpress/env: Better run command errors. ([22475](https://github.com/WordPress/gutenberg/pull/22475))
+-   Add support for named orientations and literal colors on custom gradients. ([22239](https://github.com/WordPress/gutenberg/pull/22239))
+-   Use theme color as focus color. ([22261](https://github.com/WordPress/gutenberg/pull/22261))
+-   Refine the specificity of the embed block styles. ([21599](https://github.com/WordPress/gutenberg/pull/21599))
+-   Change inserter search placeholder text color. ([22444](https://github.com/WordPress/gutenberg/pull/22444))
+-   Improve interactions and add unit parsing to the unit selector used in Cover block. ([22329](https://github.com/WordPress/gutenberg/pull/22329))
+-   Use smaller spacer and cover block step values. ([22320](https://github.com/WordPress/gutenberg/pull/22320))
+-   A11y: Add explanatory text before the a11y.speak aria-live regions. ([22112](https://github.com/WordPress/gutenberg/pull/22112))
+-   Add Animoto, Dailymotion block embed icons. ([21882](https://github.com/WordPress/gutenberg/pull/21882))
+-   Group block: Match frontend markup in the editor. ([21867](https://github.com/WordPress/gutenberg/pull/21867))
+-   Iterations on the welcome guide. ([21847](https://github.com/WordPress/gutenberg/pull/21847))
+-   Don't show protocol in link suggestions. ([20350](https://github.com/WordPress/gutenberg/pull/20350))
+-   New Block Patterns:
+    -   Hero and two columns. ([21130](https://github.com/WordPress/gutenberg/pull/21130))
+    -   Features or Services. ([20898](https://github.com/WordPress/gutenberg/pull/20898))
 
 ### New APIs
 
-- React Hooks:
-  - Add new React hook UseCopyOnClick as an alternative to the ClipboardButton component. ([22224](https://github.com/WordPress/gutenberg/pull/22224))
-  - Add usePrevious hook to @wordpress/compose package. ([22540](https://github.com/WordPress/gutenberg/pull/22540)) ([22597](https://github.com/WordPress/gutenberg/pull/22597))
-- @wordpress/env:
-  - Granular volume mappings. ([22256](https://github.com/WordPress/gutenberg/pull/22256))
-  - Add command to display Docker container logs. ([21737](https://github.com/WordPress/gutenberg/pull/21737))
-  - Add a destroy command. ([21529](https://github.com/WordPress/gutenberg/pull/21529))
-- @wordpress/scripts:
-  - Add CSS support to start and build scripts. ([21730](https://github.com/WordPress/gutenberg/pull/21730))
-  - Support enabling/disabling dev tools, bundle analyzer and externals for build and start scripts. ([22310](https://github.com/WordPress/gutenberg/pull/22310)) [22426](https://github.com/WordPress/gutenberg/pull/22426)
-  - Add phpunit support. ([20090](https://github.com/WordPress/gutenberg/pull/20090))
-- Support preloading API requests using the `fetchAllMiddleware` middleware. ([22510](https://github.com/WordPress/gutenberg/pull/22510))
-- Support controlled InnerBlocks. ([21368](https://github.com/WordPress/gutenberg/pull/21368)) ([22366](https://github.com/WordPress/gutenberg/pull/22366))
-- Add Close button filter. ([22323](https://github.com/WordPress/gutenberg/pull/22323))
-- Block API: Allow block registration without category. ([22280](https://github.com/WordPress/gutenberg/pull/22280))
-- Support customizing the `viewportWidth` for block patterns. ([22216](https://github.com/WordPress/gutenberg/pull/22216))
-
-
-### Bug Fixes
-
-- Fix theme CSS bleed in the Button component. ([22460](https://github.com/WordPress/gutenberg/pull/22460)) ([22522](https://github.com/WordPress/gutenberg/pull/22522))
-- Fix CSS validation error on Button block styles. ([22583](https://github.com/WordPress/gutenberg/pull/22583))
-- Fix editor crash potentially happening when hovering style variations. ([22490](https://github.com/WordPress/gutenberg/pull/22490))
-- @wordpress/env: Start database service before running tasks. ([22486](https://github.com/WordPress/gutenberg/pull/22486))
-- Fix editor crash when zooming. ([22408](https://github.com/WordPress/gutenberg/pull/22408))
-- Fix Button border radius set as 0. ([22393](https://github.com/WordPress/gutenberg/pull/22393))
-- Fix Cover block resizing. ([22349](https://github.com/WordPress/gutenberg/pull/22349))
-- Writing Flow: Fix reverse block selection after block deletion from rich text. ([22292](https://github.com/WordPress/gutenberg/pull/22292))
-- A11y: Include reusable blocks in announced inserter search results. ([22279](https://github.com/WordPress/gutenberg/pull/22279))
-- Remove the previous style CSS class when the default style variation is chosen. ([22266](https://github.com/WordPress/gutenberg/pull/22266))
-- Show the global inserter in container blocks nested inside locked templates. ([22115](https://github.com/WordPress/gutenberg/pull/22115))
-- Prevent the Page Break block from showing up as the first block in the inserter. ([22523](https://github.com/WordPress/gutenberg/pull/22523))
-- Polish code editor and fix iOS scrolling issue. ([22021](https://github.com/WordPress/gutenberg/pull/22021))
-- `LinkControl` component: Fix search result focus state border. ([22553](https://github.com/WordPress/gutenberg/pull/22553))
-- Prevent contributors for accessing the Media Modal. ([22306](https://github.com/WordPress/gutenberg/pull/22306))
+-   React Hooks:
+    -   Add new React hook UseCopyOnClick as an alternative to the ClipboardButton component. ([22224](https://github.com/WordPress/gutenberg/pull/22224))
+    -   Add usePrevious hook to @wordpress/compose package. ([22540](https://github.com/WordPress/gutenberg/pull/22540)) ([22597](https://github.com/WordPress/gutenberg/pull/22597))
+-   @wordpress/env:
+    -   Granular volume mappings. ([22256](https://github.com/WordPress/gutenberg/pull/22256))
+    -   Add command to display Docker container logs. ([21737](https://github.com/WordPress/gutenberg/pull/21737))
+    -   Add a destroy command. ([21529](https://github.com/WordPress/gutenberg/pull/21529))
+-   @wordpress/scripts:
+    -   Add CSS support to start and build scripts. ([21730](https://github.com/WordPress/gutenberg/pull/21730))
+    -   Support enabling/disabling dev tools, bundle analyzer and externals for build and start scripts. ([22310](https://github.com/WordPress/gutenberg/pull/22310)) [22426](https://github.com/WordPress/gutenberg/pull/22426)
+    -   Add phpunit support. ([20090](https://github.com/WordPress/gutenberg/pull/20090))
+-   Support preloading API requests using the `fetchAllMiddleware` middleware. ([22510](https://github.com/WordPress/gutenberg/pull/22510))
+-   Support controlled InnerBlocks. ([21368](https://github.com/WordPress/gutenberg/pull/21368)) ([22366](https://github.com/WordPress/gutenberg/pull/22366))
+-   Add Close button filter. ([22323](https://github.com/WordPress/gutenberg/pull/22323))
+-   Block API: Allow block registration without category. ([22280](https://github.com/WordPress/gutenberg/pull/22280))
+-   Support customizing the `viewportWidth` for block patterns. ([22216](https://github.com/WordPress/gutenberg/pull/22216))
+
+### Bug Fixes
 
+-   Fix theme CSS bleed in the Button component. ([22460](https://github.com/WordPress/gutenberg/pull/22460)) ([22522](https://github.com/WordPress/gutenberg/pull/22522))
+-   Fix CSS validation error on Button block styles. ([22583](https://github.com/WordPress/gutenberg/pull/22583))
+-   Fix editor crash potentially happening when hovering style variations. ([22490](https://github.com/WordPress/gutenberg/pull/22490))
+-   @wordpress/env: Start database service before running tasks. ([22486](https://github.com/WordPress/gutenberg/pull/22486))
+-   Fix editor crash when zooming. ([22408](https://github.com/WordPress/gutenberg/pull/22408))
+-   Fix Button border radius set as 0. ([22393](https://github.com/WordPress/gutenberg/pull/22393))
+-   Fix Cover block resizing. ([22349](https://github.com/WordPress/gutenberg/pull/22349))
+-   Writing Flow: Fix reverse block selection after block deletion from rich text. ([22292](https://github.com/WordPress/gutenberg/pull/22292))
+-   A11y: Include reusable blocks in announced inserter search results. ([22279](https://github.com/WordPress/gutenberg/pull/22279))
+-   Remove the previous style CSS class when the default style variation is chosen. ([22266](https://github.com/WordPress/gutenberg/pull/22266))
+-   Show the global inserter in container blocks nested inside locked templates. ([22115](https://github.com/WordPress/gutenberg/pull/22115))
+-   Prevent the Page Break block from showing up as the first block in the inserter. ([22523](https://github.com/WordPress/gutenberg/pull/22523))
+-   Polish code editor and fix iOS scrolling issue. ([22021](https://github.com/WordPress/gutenberg/pull/22021))
+-   `LinkControl` component: Fix search result focus state border. ([22553](https://github.com/WordPress/gutenberg/pull/22553))
+-   Prevent contributors for accessing the Media Modal. ([22306](https://github.com/WordPress/gutenberg/pull/22306))
 
 ### Performance
 
-- Adds a command to run performance tests across branches. ([22418](https://github.com/WordPress/gutenberg/pull/22418))
-- useMovingAnimation: Avoid initial transform animation. ([22536](https://github.com/WordPress/gutenberg/pull/22536))
-- Optimize resizable preview hooks. ([22511](https://github.com/WordPress/gutenberg/pull/22511))
-- Short-circuit validation for identical markup. ([22506](https://github.com/WordPress/gutenberg/pull/22506))
-- More accurate dependency list for useGenericPreviewBlock hook. ([22355](https://github.com/WordPress/gutenberg/pull/22355))
-- Add missing side-effect declarations. ([22300](https://github.com/WordPress/gutenberg/pull/22300))
-
+-   Adds a command to run performance tests across branches. ([22418](https://github.com/WordPress/gutenberg/pull/22418))
+-   useMovingAnimation: Avoid initial transform animation. ([22536](https://github.com/WordPress/gutenberg/pull/22536))
+-   Optimize resizable preview hooks. ([22511](https://github.com/WordPress/gutenberg/pull/22511))
+-   Short-circuit validation for identical markup. ([22506](https://github.com/WordPress/gutenberg/pull/22506))
+-   More accurate dependency list for useGenericPreviewBlock hook. ([22355](https://github.com/WordPress/gutenberg/pull/22355))
+-   Add missing side-effect declarations. ([22300](https://github.com/WordPress/gutenberg/pull/22300))
 
 ### Experimental
 
-- Full Site Editing and Site Editor screen:
-  - Add page-based navigation. ([22368](https://github.com/WordPress/gutenberg/pull/22368))
-  - Page and Template switchers improvements. ([22449](https://github.com/WordPress/gutenberg/pull/22449))
-  - Add Query block. ([22199](https://github.com/WordPress/gutenberg/pull/22199)) ([22364](https://github.com/WordPress/gutenberg/pull/22364))
-  - Use the inserter panel. ([22413](https://github.com/WordPress/gutenberg/pull/22413))
-  - Add basic "tools" menu. ([22539](https://github.com/WordPress/gutenberg/pull/22539))
-  - Implement post switcher and integrate with "navigate to link". ([22543](https://github.com/WordPress/gutenberg/pull/22543))
-  - Add focus mode and top toolbar modes. ([22537](https://github.com/WordPress/gutenberg/pull/22537))
-  - Add entity editor to post content block. ([22473](https://github.com/WordPress/gutenberg/pull/22473))
-  - Add 'Review changes' button for multi entity saving flow. ([22450](https://github.com/WordPress/gutenberg/pull/22450))
-  - Fix Post Author block render issues. ([22397](https://github.com/WordPress/gutenberg/pull/22397))
-  - Refactor Post Author block to use block context. ([22359](https://github.com/WordPress/gutenberg/pull/22359))
-  - Templates Endpoint: Add `resolved` query arg to return only relevant templates. ([21981](https://github.com/WordPress/gutenberg/pull/21981))
-- Navigation Block and Screen:
-  - Add block movers to the block navigator. ([18014](https://github.com/WordPress/gutenberg/pull/18014))
-  - Add ellipsis menu to block navigator. ([22427](https://github.com/WordPress/gutenberg/pull/22427)) ([22517](https://github.com/WordPress/gutenberg/pull/22517))
-  - Add standard notices to nav menu page. ([22374](https://github.com/WordPress/gutenberg/pull/22374))
-  - Implement the creation of menus on the edit navigation screen. ([22309](https://github.com/WordPress/gutenberg/pull/22309))
-  - Add menu location management. ([21351](https://github.com/WordPress/gutenberg/pull/21351))
-  - Link block: Add RichText split-at-end/merge/remove behavior. ([21764](https://github.com/WordPress/gutenberg/pull/21764))
-  - Fix navigation block placeholder overlap. ([22407](https://github.com/WordPress/gutenberg/pull/22407))
-  - Adds orientation class on frontend for the navigation block. ([22272](https://github.com/WordPress/gutenberg/pull/22272))
-  - Refactor block navigation block contents. ([22487](https://github.com/WordPress/gutenberg/pull/22487))
-  - Fix navigation screen crash with no menu items. ([22342](https://github.com/WordPress/gutenberg/pull/22342))
-  - Adds save and failure notices to the navigation screen. ([22326](https://github.com/WordPress/gutenberg/pull/22326))
-  - Display the block appender only for the currently active menu. ([22311](https://github.com/WordPress/gutenberg/pull/22311))
-  - Allow editing of new menu items from the block inspector. ([22210](https://github.com/WordPress/gutenberg/pull/22210))
-  - Submenu nesting and saving new nested items. ([21671](https://github.com/WordPress/gutenberg/pull/21671))
-- Block-based Widgets screen and Customizer tab:
-  - Use interface package on widgets screen sidebar. ([22304](https://github.com/WordPress/gutenberg/pull/22304))
-  - Use single block editor in the widgets screen. ([22140](https://github.com/WordPress/gutenberg/pull/22140)) ([22459](https://github.com/WordPress/gutenberg/pull/22459))
-  - Use the mobile view for the Customizer. ([22533](https://github.com/WordPress/gutenberg/pull/22533))
-  - Add legacy widget to calendar transform. ([14586](https://github.com/WordPress/gutenberg/pull/14586))
-- Global Styles and theme.json:
-  - Implement Managed CSS for Global Styles. ([20290](https://github.com/WordPress/gutenberg/pull/20290))
-  - Support theme.json in Post editor. ([22520](https://github.com/WordPress/gutenberg/pull/22520))
-- Block Directory:
-  - Activate deactivated blocks if already installed . ([22286](https://github.com/WordPress/gutenberg/pull/22286))
-  - Only support an array of assets when injecting assets. ([22289](https://github.com/WordPress/gutenberg/pull/22289))
-  - Remove the author rating when none exist. ([22184](https://github.com/WordPress/gutenberg/pull/22184))
-  - Update layout for smaller inserter width. ([22124](https://github.com/WordPress/gutenberg/pull/22124))
-  - Add error messages inline. ([20001](https://github.com/WordPress/gutenberg/pull/20001))
-
+-   Full Site Editing and Site Editor screen:
+    -   Add page-based navigation. ([22368](https://github.com/WordPress/gutenberg/pull/22368))
+    -   Page and Template switchers improvements. ([22449](https://github.com/WordPress/gutenberg/pull/22449))
+    -   Add Query block. ([22199](https://github.com/WordPress/gutenberg/pull/22199)) ([22364](https://github.com/WordPress/gutenberg/pull/22364))
+    -   Use the inserter panel. ([22413](https://github.com/WordPress/gutenberg/pull/22413))
+    -   Add basic "tools" menu. ([22539](https://github.com/WordPress/gutenberg/pull/22539))
+    -   Implement post switcher and integrate with "navigate to link". ([22543](https://github.com/WordPress/gutenberg/pull/22543))
+    -   Add focus mode and top toolbar modes. ([22537](https://github.com/WordPress/gutenberg/pull/22537))
+    -   Add entity editor to post content block. ([22473](https://github.com/WordPress/gutenberg/pull/22473))
+    -   Add 'Review changes' button for multi entity saving flow. ([22450](https://github.com/WordPress/gutenberg/pull/22450))
+    -   Fix Post Author block render issues. ([22397](https://github.com/WordPress/gutenberg/pull/22397))
+    -   Refactor Post Author block to use block context. ([22359](https://github.com/WordPress/gutenberg/pull/22359))
+    -   Templates Endpoint: Add `resolved` query arg to return only relevant templates. ([21981](https://github.com/WordPress/gutenberg/pull/21981))
+-   Navigation Block and Screen:
+    -   Add block movers to the block navigator. ([18014](https://github.com/WordPress/gutenberg/pull/18014))
+    -   Add ellipsis menu to block navigator. ([22427](https://github.com/WordPress/gutenberg/pull/22427)) ([22517](https://github.com/WordPress/gutenberg/pull/22517))
+    -   Add standard notices to nav menu page. ([22374](https://github.com/WordPress/gutenberg/pull/22374))
+    -   Implement the creation of menus on the edit navigation screen. ([22309](https://github.com/WordPress/gutenberg/pull/22309))
+    -   Add menu location management. ([21351](https://github.com/WordPress/gutenberg/pull/21351))
+    -   Link block: Add RichText split-at-end/merge/remove behavior. ([21764](https://github.com/WordPress/gutenberg/pull/21764))
+    -   Fix navigation block placeholder overlap. ([22407](https://github.com/WordPress/gutenberg/pull/22407))
+    -   Adds orientation class on frontend for the navigation block. ([22272](https://github.com/WordPress/gutenberg/pull/22272))
+    -   Refactor block navigation block contents. ([22487](https://github.com/WordPress/gutenberg/pull/22487))
+    -   Fix navigation screen crash with no menu items. ([22342](https://github.com/WordPress/gutenberg/pull/22342))
+    -   Adds save and failure notices to the navigation screen. ([22326](https://github.com/WordPress/gutenberg/pull/22326))
+    -   Display the block appender only for the currently active menu. ([22311](https://github.com/WordPress/gutenberg/pull/22311))
+    -   Allow editing of new menu items from the block inspector. ([22210](https://github.com/WordPress/gutenberg/pull/22210))
+    -   Submenu nesting and saving new nested items. ([21671](https://github.com/WordPress/gutenberg/pull/21671))
+-   Block-based Widgets screen and Customizer tab:
+    -   Use interface package on widgets screen sidebar. ([22304](https://github.com/WordPress/gutenberg/pull/22304))
+    -   Use single block editor in the widgets screen. ([22140](https://github.com/WordPress/gutenberg/pull/22140)) ([22459](https://github.com/WordPress/gutenberg/pull/22459))
+    -   Use the mobile view for the Customizer. ([22533](https://github.com/WordPress/gutenberg/pull/22533))
+    -   Add legacy widget to calendar transform. ([14586](https://github.com/WordPress/gutenberg/pull/14586))
+-   Global Styles and theme.json:
+    -   Implement Managed CSS for Global Styles. ([20290](https://github.com/WordPress/gutenberg/pull/20290))
+    -   Support theme.json in Post editor. ([22520](https://github.com/WordPress/gutenberg/pull/22520))
+-   Block Directory:
+    -   Activate deactivated blocks if already installed . ([22286](https://github.com/WordPress/gutenberg/pull/22286))
+    -   Only support an array of assets when injecting assets. ([22289](https://github.com/WordPress/gutenberg/pull/22289))
+    -   Remove the author rating when none exist. ([22184](https://github.com/WordPress/gutenberg/pull/22184))
+    -   Update layout for smaller inserter width. ([22124](https://github.com/WordPress/gutenberg/pull/22124))
+    -   Add error messages inline. ([20001](https://github.com/WordPress/gutenberg/pull/20001))
 
 ### Documentation
 
-- Document experimental theme.json. ([22518](https://github.com/WordPress/gutenberg/pull/22518))
-- Fix duplicate grammar docs. ([22466](https://github.com/WordPress/gutenberg/pull/22466))
-- Document the performance testing commands. ([22464](https://github.com/WordPress/gutenberg/pull/22464))
-- Docs: Update note for extraProps filter. ([22419](https://github.com/WordPress/gutenberg/pull/22419))
-- Recommend adding an API docs section. ([22415](https://github.com/WordPress/gutenberg/pull/22415))
-- Add side effect documentation. ([22379](https://github.com/WordPress/gutenberg/pull/22379))
-- Update block editor docs to incorporate the block-toolbar Popover Slot. ([22308](https://github.com/WordPress/gutenberg/pull/22308))
-- Adds a README to `MediaReplaceFlow`. ([22268](https://github.com/WordPress/gutenberg/pull/22268))
-- Typos and tweaks: ([22254](https://github.com/WordPress/gutenberg/pull/22254)) ([21968](https://github.com/WordPress/gutenberg/pull/21968)) ([21695](https://github.com/WordPress/gutenberg/pull/21695)) ([22554](https://github.com/WordPress/gutenberg/pull/22554))
-
+-   Document experimental theme.json. ([22518](https://github.com/WordPress/gutenberg/pull/22518))
+-   Fix duplicate grammar docs. ([22466](https://github.com/WordPress/gutenberg/pull/22466))
+-   Document the performance testing commands. ([22464](https://github.com/WordPress/gutenberg/pull/22464))
+-   Docs: Update note for extraProps filter. ([22419](https://github.com/WordPress/gutenberg/pull/22419))
+-   Recommend adding an API docs section. ([22415](https://github.com/WordPress/gutenberg/pull/22415))
+-   Add side effect documentation. ([22379](https://github.com/WordPress/gutenberg/pull/22379))
+-   Update block editor docs to incorporate the block-toolbar Popover Slot. ([22308](https://github.com/WordPress/gutenberg/pull/22308))
+-   Adds a README to `MediaReplaceFlow`. ([22268](https://github.com/WordPress/gutenberg/pull/22268))
+-   Typos and tweaks: ([22254](https://github.com/WordPress/gutenberg/pull/22254)) ([21968](https://github.com/WordPress/gutenberg/pull/21968)) ([21695](https://github.com/WordPress/gutenberg/pull/21695)) ([22554](https://github.com/WordPress/gutenberg/pull/22554))
 
 ### Code Quality
 
-- Avoid circular dependency issue in `AutoBlockPreview`. ([22425](https://github.com/WordPress/gutenberg/pull/22425))
-- Remove opinionated label color from `CustomSelectControl` component. ([22594](https://github.com/WordPress/gutenberg/pull/22594))
-- Image block:
-  - Use hooks. ([22499](https://github.com/WordPress/gutenberg/pull/22499)) ([22277](https://github.com/WordPress/gutenberg/pull/22277))
-  - Remove extra div wrapper in the editor. ([22585](https://github.com/WordPress/gutenberg/pull/22585))
-- Remove redundant condition from setting default grouping. ([22563](https://github.com/WordPress/gutenberg/pull/22563))
-- Testing: Replace require.requireActual with jest.requireActual. ([22370](https://github.com/WordPress/gutenberg/pull/22370))
-- Use a light block DOM for the Cover block to map frontend markup. ([22348](https://github.com/WordPress/gutenberg/pull/22348))
-- Rename a complementary area component property. ([22336](https://github.com/WordPress/gutenberg/pull/22336))
-- Block API: WP_Block: Document attributes class property. ([22222](https://github.com/WordPress/gutenberg/pull/22222))
-- Polish block wrapper elements file. ([21304](https://github.com/WordPress/gutenberg/pull/21304))
-- Move `supports` to `block.json` files for core blocks. ([22422](https://github.com/WordPress/gutenberg/pull/22422))
-- Create Block: Simplify the process of defining a config for templates. ([22235](https://github.com/WordPress/gutenberg/pull/22235))
-- Block Edit: Use hooks. ([22433](https://github.com/WordPress/gutenberg/pull/22433))
-- Add BlockContext component to type-checking. ([22353](https://github.com/WordPress/gutenberg/pull/22353))
-
+-   Avoid circular dependency issue in `AutoBlockPreview`. ([22425](https://github.com/WordPress/gutenberg/pull/22425))
+-   Remove opinionated label color from `CustomSelectControl` component. ([22594](https://github.com/WordPress/gutenberg/pull/22594))
+-   Image block:
+    -   Use hooks. ([22499](https://github.com/WordPress/gutenberg/pull/22499)) ([22277](https://github.com/WordPress/gutenberg/pull/22277))
+    -   Remove extra div wrapper in the editor. ([22585](https://github.com/WordPress/gutenberg/pull/22585))
+-   Remove redundant condition from setting default grouping. ([22563](https://github.com/WordPress/gutenberg/pull/22563))
+-   Testing: Replace require.requireActual with jest.requireActual. ([22370](https://github.com/WordPress/gutenberg/pull/22370))
+-   Use a light block DOM for the Cover block to map frontend markup. ([22348](https://github.com/WordPress/gutenberg/pull/22348))
+-   Rename a complementary area component property. ([22336](https://github.com/WordPress/gutenberg/pull/22336))
+-   Block API: WP_Block: Document attributes class property. ([22222](https://github.com/WordPress/gutenberg/pull/22222))
+-   Polish block wrapper elements file. ([21304](https://github.com/WordPress/gutenberg/pull/21304))
+-   Move `supports` to `block.json` files for core blocks. ([22422](https://github.com/WordPress/gutenberg/pull/22422))
+-   Create Block: Simplify the process of defining a config for templates. ([22235](https://github.com/WordPress/gutenberg/pull/22235))
+-   Block Edit: Use hooks. ([22433](https://github.com/WordPress/gutenberg/pull/22433))
+-   Add BlockContext component to type-checking. ([22353](https://github.com/WordPress/gutenberg/pull/22353))
 
 ### Build Tooling
 
-- ESLint Plugin: Fix dependency group checking for CommonJS. ([22230](https://github.com/WordPress/gutenberg/pull/22230))
--  Restore Playground GitHub Pages deploy. ([22443](https://github.com/WordPress/gutenberg/pull/22443))
-- Fix API Docs generation for filenames with spaces. ([22513](https://github.com/WordPress/gutenberg/pull/22513))
-- Fix check-latest-npm.js failure on Windows. ([22485](https://github.com/WordPress/gutenberg/pull/22485))
-- Refactor the changelog script as a release tool command. ([22380](https://github.com/WordPress/gutenberg/pull/22380))
-- Enable import/no-unresolved ESLint rule for Gutenberg. ([20905](https://github.com/WordPress/gutenberg/pull/20905))
-- Only allow ECMAScript stage 4 features. ([22083](https://github.com/WordPress/gutenberg/pull/22083))
-- Storybook: Use a consistent port number. ([22552](https://github.com/WordPress/gutenberg/pull/22552))
-- Add 0BSD to GPLv2 compatible licenses. ([22391](https://github.com/WordPress/gutenberg/pull/22391))
-- Refactor the release tool and split it into several command files. ([22003](https://github.com/WordPress/gutenberg/pull/22003))
-- Replace wp-scripts env usage with wp-env in CI. ([20280](https://github.com/WordPress/gutenberg/pull/20280))
-
+-   ESLint Plugin: Fix dependency group checking for CommonJS. ([22230](https://github.com/WordPress/gutenberg/pull/22230))
+-   Restore Playground GitHub Pages deploy. ([22443](https://github.com/WordPress/gutenberg/pull/22443))
+-   Fix API Docs generation for filenames with spaces. ([22513](https://github.com/WordPress/gutenberg/pull/22513))
+-   Fix check-latest-npm.js failure on Windows. ([22485](https://github.com/WordPress/gutenberg/pull/22485))
+-   Refactor the changelog script as a release tool command. ([22380](https://github.com/WordPress/gutenberg/pull/22380))
+-   Enable import/no-unresolved ESLint rule for Gutenberg. ([20905](https://github.com/WordPress/gutenberg/pull/20905))
+-   Only allow ECMAScript stage 4 features. ([22083](https://github.com/WordPress/gutenberg/pull/22083))
+-   Storybook: Use a consistent port number. ([22552](https://github.com/WordPress/gutenberg/pull/22552))
+-   Add 0BSD to GPLv2 compatible licenses. ([22391](https://github.com/WordPress/gutenberg/pull/22391))
+-   Refactor the release tool and split it into several command files. ([22003](https://github.com/WordPress/gutenberg/pull/22003))
+-   Replace wp-scripts env usage with wp-env in CI. ([20280](https://github.com/WordPress/gutenberg/pull/20280))
 
 ### Various
 
-- Update: ResizableBox make showHandle true by default. ([22360](https://github.com/WordPress/gutenberg/pull/22360))
-- Fix dirty state end-to-end test intermittent failuire. ([22532](https://github.com/WordPress/gutenberg/pull/22532))
-- Fix dirty state end-to-end test. ([22448](https://github.com/WordPress/gutenberg/pull/22448))
-- Add a simple block patterns end-to-end tests and a test utility. ([22414](https://github.com/WordPress/gutenberg/pull/22414)) ([22495](https://github.com/WordPress/gutenberg/pull/22495))
-- Remove insert block delay from end-to-end tests. ([22377](https://github.com/WordPress/gutenberg/pull/22377))
-- Add an end to end test to verify cover can be resized with drag & drop. ([22369](https://github.com/WordPress/gutenberg/pull/22369))
-- Upgrade Reakit to stable v1.0.0. ([22352](https://github.com/WordPress/gutenberg/pull/22352))
-- Use alternate display for the popover in alignment matrix. ([22351](https://github.com/WordPress/gutenberg/pull/22351))
-- Fix deprecated version used for register_pattern. ([22341](https://github.com/WordPress/gutenberg/pull/22341))
-- API Fetch: Remove deprecated useApiFetch. ([22333](https://github.com/WordPress/gutenberg/pull/22333))
-- Framework: Pin nvmrc to specific current LTS. ([22236](https://github.com/WordPress/gutenberg/pull/22236))
-
-
+-   Update: ResizableBox make showHandle true by default. ([22360](https://github.com/WordPress/gutenberg/pull/22360))
+-   Fix dirty state end-to-end test intermittent failuire. ([22532](https://github.com/WordPress/gutenberg/pull/22532))
+-   Fix dirty state end-to-end test. ([22448](https://github.com/WordPress/gutenberg/pull/22448))
+-   Add a simple block patterns end-to-end tests and a test utility. ([22414](https://github.com/WordPress/gutenberg/pull/22414)) ([22495](https://github.com/WordPress/gutenberg/pull/22495))
+-   Remove insert block delay from end-to-end tests. ([22377](https://github.com/WordPress/gutenberg/pull/22377))
+-   Add an end to end test to verify cover can be resized with drag & drop. ([22369](https://github.com/WordPress/gutenberg/pull/22369))
+-   Upgrade Reakit to stable v1.0.0. ([22352](https://github.com/WordPress/gutenberg/pull/22352))
+-   Use alternate display for the popover in alignment matrix. ([22351](https://github.com/WordPress/gutenberg/pull/22351))
+-   Fix deprecated version used for register_pattern. ([22341](https://github.com/WordPress/gutenberg/pull/22341))
+-   API Fetch: Remove deprecated useApiFetch. ([22333](https://github.com/WordPress/gutenberg/pull/22333))
+-   Framework: Pin nvmrc to specific current LTS. ([22236](https://github.com/WordPress/gutenberg/pull/22236))
 
 = 8.1.0 =
 
-### New features
+## Changelog
 
-- Pattern search ([21944](https://github.com/WordPress/gutenberg/pull/21944))
-- Testimonials block pattern. ([20894](https://github.com/WordPress/gutenberg/pull/20894))
-- New Transforms:
-    - Embed blocks into Paragraph blocks. ([17413](https://github.com/WordPress/gutenberg/pull/17413))
-    - Code to HTML block and the opposite. ([21779](https://github.com/WordPress/gutenberg/pull/21779))
-- Add copy action to the blocks. ([22214](https://github.com/WordPress/gutenberg/pull/22214))
+### New features
 
+-   Pattern search ([21944](https://github.com/WordPress/gutenberg/pull/21944))
+-   Testimonials block pattern. ([20894](https://github.com/WordPress/gutenberg/pull/20894))
+-   New Transforms:
+    -   Embed blocks into Paragraph blocks. ([17413](https://github.com/WordPress/gutenberg/pull/17413))
+    -   Code to HTML block and the opposite. ([21779](https://github.com/WordPress/gutenberg/pull/21779))
+-   Add copy action to the blocks. ([22214](https://github.com/WordPress/gutenberg/pull/22214))
 
 ### Enhancements
 
-- Implement Block Navigator selection on Nav Menus page. ([22017](https://github.com/WordPress/gutenberg/pull/22017))
-- Write block patterns in PHP to allow i18n. ([21946](https://github.com/WordPress/gutenberg/pull/21946))
-- Post title: handle paste as blocks. ([21758](https://github.com/WordPress/gutenberg/pull/21758))
-- Clear Publish Date Button. ([20914](https://github.com/WordPress/gutenberg/pull/20914))
-- Add gap between nested submenus. ([22227](https://github.com/WordPress/gutenberg/pull/22227))
-- Block Library: enhance the author's block. ([19894](https://github.com/WordPress/gutenberg/pull/19894))
-- Add "black" and "white" color options to default color palette. ([22082](https://github.com/WordPress/gutenberg/pull/22082))
-- Light blocks: social links. ([22078](https://github.com/WordPress/gutenberg/pull/22078))
-- CustomSelectControl: set aria-hidden to empty option list. ([21298](https://github.com/WordPress/gutenberg/pull/21298))
-- Add some more g2 icons. ([21825](https://github.com/WordPress/gutenberg/pull/21825))
-- Allow the column block in the inserter. ([20502](https://github.com/WordPress/gutenberg/pull/20502))
-- Delete menus in nav menus experimental screen. ([21486](https://github.com/WordPress/gutenberg/pull/21486))
-- Visual and experience improvements to existing sub-navigation flow. ([22107](https://github.com/WordPress/gutenberg/pull/22107))
-- Reduce font-size and line-height of "it's time". ([21627](https://github.com/WordPress/gutenberg/pull/21627))
-- Template Loader: Introduce get_template_hierarchy(), drop gutenberg_template_include_filter(). ([21980](https://github.com/WordPress/gutenberg/pull/21980))
-- Make parts of the BlockNavigationList overridable using slots. ([21948](https://github.com/WordPress/gutenberg/pull/21948))
-- Change the color alpha input step to match the slider step. ([21953](https://github.com/WordPress/gutenberg/pull/21953))
-- Navigation: fallback for undefined orientation. ([22057](https://github.com/WordPress/gutenberg/pull/22057))
-- Remove subscription button from blog template. ([22129](https://github.com/WordPress/gutenberg/pull/22129))
-- Move the Entities Saved States from Modal to Sidebar. ([21522](https://github.com/WordPress/gutenberg/pull/21522))
+-   Implement Block Navigator selection on Nav Menus page. ([22017](https://github.com/WordPress/gutenberg/pull/22017))
+-   Write block patterns in PHP to allow i18n. ([21946](https://github.com/WordPress/gutenberg/pull/21946))
+-   Post title: handle paste as blocks. ([21758](https://github.com/WordPress/gutenberg/pull/21758))
+-   Clear Publish Date Button. ([20914](https://github.com/WordPress/gutenberg/pull/20914))
+-   Add gap between nested submenus. ([22227](https://github.com/WordPress/gutenberg/pull/22227))
+-   Block Library: enhance the author's block. ([19894](https://github.com/WordPress/gutenberg/pull/19894))
+-   Add "black" and "white" color options to default color palette. ([22082](https://github.com/WordPress/gutenberg/pull/22082))
+-   Light blocks: social links. ([22078](https://github.com/WordPress/gutenberg/pull/22078))
+-   CustomSelectControl: set aria-hidden to empty option list. ([21298](https://github.com/WordPress/gutenberg/pull/21298))
+-   Add some more g2 icons. ([21825](https://github.com/WordPress/gutenberg/pull/21825))
+-   Allow the column block in the inserter. ([20502](https://github.com/WordPress/gutenberg/pull/20502))
+-   Delete menus in nav menus experimental screen. ([21486](https://github.com/WordPress/gutenberg/pull/21486))
+-   Visual and experience improvements to existing sub-navigation flow. ([22107](https://github.com/WordPress/gutenberg/pull/22107))
+-   Reduce font-size and line-height of "it's time". ([21627](https://github.com/WordPress/gutenberg/pull/21627))
+-   Template Loader: Introduce get_template_hierarchy(), drop gutenberg_template_include_filter(). ([21980](https://github.com/WordPress/gutenberg/pull/21980))
+-   Make parts of the BlockNavigationList overridable using slots. ([21948](https://github.com/WordPress/gutenberg/pull/21948))
+-   Change the color alpha input step to match the slider step. ([21953](https://github.com/WordPress/gutenberg/pull/21953))
+-   Navigation: fallback for undefined orientation. ([22057](https://github.com/WordPress/gutenberg/pull/22057))
+-   Remove subscription button from blog template. ([22129](https://github.com/WordPress/gutenberg/pull/22129))
+-   Move the Entities Saved States from Modal to Sidebar. ([21522](https://github.com/WordPress/gutenberg/pull/21522))
 
 ### API Changes
 
-- Update the Patterns API to avoid ambiguity. ([21970](https://github.com/WordPress/gutenberg/pull/21970))
-- Expose the registered pattern slugs in get_all_registered. ([21619](https://github.com/WordPress/gutenberg/pull/21619))
-- Fix doc-building pre-commit API hook issue. ([22116](https://github.com/WordPress/gutenberg/pull/22116))
-- REST API: Block directory - Typecast author_block_count as integer. ([17594](https://github.com/WordPress/gutenberg/pull/17594))
-- Block API: Block Context: Filter content, prepare attributes at render, pass a block to render. ([21925](https://github.com/WordPress/gutenberg/pull/21925))
+-   Update the Patterns API to avoid ambiguity. ([21970](https://github.com/WordPress/gutenberg/pull/21970))
+-   Expose the registered pattern slugs in get_all_registered. ([21619](https://github.com/WordPress/gutenberg/pull/21619))
+-   Fix doc-building pre-commit API hook issue. ([22116](https://github.com/WordPress/gutenberg/pull/22116))
+-   REST API: Block directory - Typecast author_block_count as integer. ([17594](https://github.com/WordPress/gutenberg/pull/17594))
+-   Block API: Block Context: Filter content, prepare attributes at render, pass a block to render. ([21925](https://github.com/WordPress/gutenberg/pull/21925))
 
 ### Experimental
 
-- Add undo-redo UI to edit-site and edit-widgets. ([21955](https://github.com/WordPress/gutenberg/pull/21955))
-- Light blocks: site title. ([22069](https://github.com/WordPress/gutenberg/pull/22069))
-- Update: Use EntityProvider on the widget area. ([22008](https://github.com/WordPress/gutenberg/pull/22008))
-- Site editor:
-    - Extract gutenberg_find_template_post helper. ([21959](https://github.com/WordPress/gutenberg/pull/21959))
-    - Fix default editor background. ([22182](https://github.com/WordPress/gutenberg/pull/22182))
-    - Refactor close button slot. ([22179](https://github.com/WordPress/gutenberg/pull/22179))
-    - Make close button replaceable. ([22001](https://github.com/WordPress/gutenberg/pull/22001))
-    - Add home icon to template switcher. ([22004](https://github.com/WordPress/gutenberg/pull/22004))
-    - Updated template content. ([22044](https://github.com/WordPress/gutenberg/pull/22044))
-    - Fix spelling mistake. ([21991](https://github.com/WordPress/gutenberg/pull/21991))
+-   Add undo-redo UI to edit-site and edit-widgets. ([21955](https://github.com/WordPress/gutenberg/pull/21955))
+-   Light blocks: site title. ([22069](https://github.com/WordPress/gutenberg/pull/22069))
+-   Update: Use EntityProvider on the widget area. ([22008](https://github.com/WordPress/gutenberg/pull/22008))
+-   Site editor:
+    -   Extract gutenberg_find_template_post helper. ([21959](https://github.com/WordPress/gutenberg/pull/21959))
+    -   Fix default editor background. ([22182](https://github.com/WordPress/gutenberg/pull/22182))
+    -   Refactor close button slot. ([22179](https://github.com/WordPress/gutenberg/pull/22179))
+    -   Make close button replaceable. ([22001](https://github.com/WordPress/gutenberg/pull/22001))
+    -   Add home icon to template switcher. ([22004](https://github.com/WordPress/gutenberg/pull/22004))
+    -   Updated template content. ([22044](https://github.com/WordPress/gutenberg/pull/22044))
+    -   Fix spelling mistake. ([21991](https://github.com/WordPress/gutenberg/pull/21991))
 
 ### Performance
 
-- Reduce re-renders from block nodes context. ([22134](https://github.com/WordPress/gutenberg/pull/22134))
-- Move memo() from BlockStyles to BlockPreview. ([21993](https://github.com/WordPress/gutenberg/pull/21993))
-- Avoid rerenders of the entire BlockInspector when block attributes change. ([21990](https://github.com/WordPress/gutenberg/pull/21990))
-- Optimize BlockStyles by using hooks and React.memo (instead of HOCs). ([21973](https://github.com/WordPress/gutenberg/pull/21973))
-
-### Bug Fixes
-
-- Popover: Fix closest().parentNode null error. ([22264](https://github.com/WordPress/gutenberg/pull/22264))
-- Correct color palette in color settings. ([22138](https://github.com/WordPress/gutenberg/pull/22138))
-- Remove import of inexistant component. ([22130](https://github.com/WordPress/gutenberg/pull/22130))
-- Build Tooling: Run packages build before lint. ([22088](https://github.com/WordPress/gutenberg/pull/22088))
-- RangeControl: Fix number input change interaction. ([22084](https://github.com/WordPress/gutenberg/pull/22084))
-- Fix entity selection through save panel. ([22011](https://github.com/WordPress/gutenberg/pull/22011))
-- ESLint Plugin: Relax check for i18n-text-domain rule. ([21928](https://github.com/WordPress/gutenberg/pull/21928))
-- Block Library: Fix React does not recognize isSelected prop in Spacer block. ([21924](https://github.com/WordPress/gutenberg/pull/21924))
-- Reinitialize the iframe after the parent block is moved around. ([21916](https://github.com/WordPress/gutenberg/pull/21916))
-- Configure the navigation editor with correct __experimentalFetchLinkSuggestions. ([21873](https://github.com/WordPress/gutenberg/pull/21873))
-- Create the proper shortcode on paste. ([21864](https://github.com/WordPress/gutenberg/pull/21864))
-- Refactor FontSizePicker component. Fix bug on undo. ([21757](https://github.com/WordPress/gutenberg/pull/21757))
-- Move caret to the end of pasted content. ([21755](https://github.com/WordPress/gutenberg/pull/21755))
-- Embed: use the same SmugMug URL regex as the core. ([21744](https://github.com/WordPress/gutenberg/pull/21744))
-- Navigation block: use new icon in placeholder. ([21713](https://github.com/WordPress/gutenberg/pull/21713))
-- Fix Template Part placeholder preview. ([21623](https://github.com/WordPress/gutenberg/pull/21623))
-- Restore the missing background color on the nested submenus. ([22228](https://github.com/WordPress/gutenberg/pull/22228))
-- fix: [#21777] Prevent focusing of FireFox address bar. ([22215](https://github.com/WordPress/gutenberg/pull/22215))
-- Fix flaky test in rich text. ([22202](https://github.com/WordPress/gutenberg/pull/22202))
-- Fix flaky test: <a> tag "target" attribute. ([22200](https://github.com/WordPress/gutenberg/pull/22200))
-- Fix extra tab stop on Modal component. ([22063](https://github.com/WordPress/gutenberg/pull/22063))
-- Writing flow: fix vertical arrow nav in table (and generally grid). ([22105](https://github.com/WordPress/gutenberg/pull/22105))
-- Gallery block / media-placeholder - Preserve changes made while upload in progress. ([19134](https://github.com/WordPress/gutenberg/pull/19134))
-- Add missing dependency. ([22086](https://github.com/WordPress/gutenberg/pull/22086))
+-   Reduce re-renders from block nodes context. ([22134](https://github.com/WordPress/gutenberg/pull/22134))
+-   Move memo() from BlockStyles to BlockPreview. ([21993](https://github.com/WordPress/gutenberg/pull/21993))
+-   Avoid rerenders of the entire BlockInspector when block attributes change. ([21990](https://github.com/WordPress/gutenberg/pull/21990))
+-   Optimize BlockStyles by using hooks and React.memo (instead of HOCs). ([21973](https://github.com/WordPress/gutenberg/pull/21973))
+
+### Bug Fixes
 
+-   Popover: Fix closest().parentNode null error. ([22264](https://github.com/WordPress/gutenberg/pull/22264))
+-   Correct color palette in color settings. ([22138](https://github.com/WordPress/gutenberg/pull/22138))
+-   Remove import of inexistant component. ([22130](https://github.com/WordPress/gutenberg/pull/22130))
+-   Build Tooling: Run packages build before lint. ([22088](https://github.com/WordPress/gutenberg/pull/22088))
+-   RangeControl: Fix number input change interaction. ([22084](https://github.com/WordPress/gutenberg/pull/22084))
+-   Fix entity selection through save panel. ([22011](https://github.com/WordPress/gutenberg/pull/22011))
+-   ESLint Plugin: Relax check for i18n-text-domain rule. ([21928](https://github.com/WordPress/gutenberg/pull/21928))
+-   Block Library: Fix React does not recognize isSelected prop in Spacer block. ([21924](https://github.com/WordPress/gutenberg/pull/21924))
+-   Reinitialize the iframe after the parent block is moved around. ([21916](https://github.com/WordPress/gutenberg/pull/21916))
+-   Configure the navigation editor with correct \_\_experimentalFetchLinkSuggestions. ([21873](https://github.com/WordPress/gutenberg/pull/21873))
+-   Create the proper shortcode on paste. ([21864](https://github.com/WordPress/gutenberg/pull/21864))
+-   Refactor FontSizePicker component. Fix bug on undo. ([21757](https://github.com/WordPress/gutenberg/pull/21757))
+-   Move caret to the end of pasted content. ([21755](https://github.com/WordPress/gutenberg/pull/21755))
+-   Embed: use the same SmugMug URL regex as the core. ([21744](https://github.com/WordPress/gutenberg/pull/21744))
+-   Navigation block: use new icon in placeholder. ([21713](https://github.com/WordPress/gutenberg/pull/21713))
+-   Fix Template Part placeholder preview. ([21623](https://github.com/WordPress/gutenberg/pull/21623))
+-   Restore the missing background color on the nested submenus. ([22228](https://github.com/WordPress/gutenberg/pull/22228))
+-   fix: [#21777] Prevent focusing of FireFox address bar. ([22215](https://github.com/WordPress/gutenberg/pull/22215))
+-   Fix flaky test in rich text. ([22202](https://github.com/WordPress/gutenberg/pull/22202))
+-   Fix flaky test: <a> tag "target" attribute. ([22200](https://github.com/WordPress/gutenberg/pull/22200))
+-   Fix extra tab stop on Modal component. ([22063](https://github.com/WordPress/gutenberg/pull/22063))
+-   Writing flow: fix vertical arrow nav in table (and generally grid). ([22105](https://github.com/WordPress/gutenberg/pull/22105))
+-   Gallery block / media-placeholder - Preserve changes made while upload in progress. ([19134](https://github.com/WordPress/gutenberg/pull/19134))
+-   Add missing dependency. ([22086](https://github.com/WordPress/gutenberg/pull/22086))
 
 ### Tooling
 
-- Build Tools: Validate package-lock.json for "resolved" errors. ([22237](https://github.com/WordPress/gutenberg/pull/22237))
-- Build Tools: Disable ESLint `no-console` for bin directory. ([22033](https://github.com/WordPress/gutenberg/pull/22033))
-- Build Tools: Changelog: Normalize entry to end with period. ([22010](https://github.com/WordPress/gutenberg/pull/22010))
-- Add `analyze-bundles` script. ([21827](https://github.com/WordPress/gutenberg/pull/21827))
-- Add changelog generator script. ([19866](https://github.com/WordPress/gutenberg/pull/19866))
-- Add a method for publishing patches to the lerna scripts. ([21844](https://github.com/WordPress/gutenberg/pull/21844))
-- Add additional e2e debugging option. ([21845](https://github.com/WordPress/gutenberg/pull/21845))
-- Replace espree with babel. ([21853](https://github.com/WordPress/gutenberg/pull/21853))
-- Update diff to 4.0.2 and work around tree-shaking issues. ([21994](https://github.com/WordPress/gutenberg/pull/21994))
-- Increase the severity of `jsdoc/no-undefined-types`. . ([21942](https://github.com/WordPress/gutenberg/pull/21942))
-
+-   Build Tools: Validate package-lock.json for "resolved" errors. ([22237](https://github.com/WordPress/gutenberg/pull/22237))
+-   Build Tools: Disable ESLint `no-console` for bin directory. ([22033](https://github.com/WordPress/gutenberg/pull/22033))
+-   Build Tools: Changelog: Normalize entry to end with period. ([22010](https://github.com/WordPress/gutenberg/pull/22010))
+-   Add `analyze-bundles` script. ([21827](https://github.com/WordPress/gutenberg/pull/21827))
+-   Add changelog generator script. ([19866](https://github.com/WordPress/gutenberg/pull/19866))
+-   Add a method for publishing patches to the lerna scripts. ([21844](https://github.com/WordPress/gutenberg/pull/21844))
+-   Add additional e2e debugging option. ([21845](https://github.com/WordPress/gutenberg/pull/21845))
+-   Replace espree with babel. ([21853](https://github.com/WordPress/gutenberg/pull/21853))
+-   Update diff to 4.0.2 and work around tree-shaking issues. ([21994](https://github.com/WordPress/gutenberg/pull/21994))
+-   Increase the severity of `jsdoc/no-undefined-types`. . ([21942](https://github.com/WordPress/gutenberg/pull/21942))
 
 ### Code Quality
 
-- Block: move new props to hook. ([22212](https://github.com/WordPress/gutenberg/pull/22212))
-- Block: avoid useLayoutEffect. ([22108](https://github.com/WordPress/gutenberg/pull/22108))
-- Try: Reduced specificity base block margins. ([22051](https://github.com/WordPress/gutenberg/pull/22051))
-- Update the audio and video blocks to use a light wrapper in the editor. ([22028](https://github.com/WordPress/gutenberg/pull/22028))
-- Remove unused animation lingering in paragraph file. ([22020](https://github.com/WordPress/gutenberg/pull/22020))
-- Columns. Remove top and bottom margin from individual column blocks. ([22018](https://github.com/WordPress/gutenberg/pull/22018))
-- Try better inserter toggle styling. ([22016](https://github.com/WordPress/gutenberg/pull/22016))
-- Block Editor: Rename block context in BlockListBlock. ([21922](https://github.com/WordPress/gutenberg/pull/21922))
-- Remove duplicate CopyHanddler. ([21817](https://github.com/WordPress/gutenberg/pull/21817))
-- Types: Restore element, icons, primitives types. ([21781](https://github.com/WordPress/gutenberg/pull/21781))
-- Convert core toolbar buttons into ToolbarButton. ([20008](https://github.com/WordPress/gutenberg/pull/20008))
-- Block Directory: Add end 2 end tests. ([20023](https://github.com/WordPress/gutenberg/pull/20023))
-- ClipboardButton: use hooks. ([22220](https://github.com/WordPress/gutenberg/pull/22220))
-- ClipboardButton: remove wrapper span. ([22218](https://github.com/WordPress/gutenberg/pull/22218))
-- Block Library: Update FSE blocks to use block context. ([21696](https://github.com/WordPress/gutenberg/pull/21696))
-- Group: Zero out the intrinsic margin set to every block in the editor. ([22209](https://github.com/WordPress/gutenberg/pull/22209))
-- Unset the inherit for links. ([22160](https://github.com/WordPress/gutenberg/pull/22160))
-- Template Loader: Get rid of _wp_current_template_part_ids globals. ([22143](https://github.com/WordPress/gutenberg/pull/22143))
-- Block Library: Post Author: Reference attributes by argument. ([22114](https://github.com/WordPress/gutenberg/pull/22114))
-- Remove pass by reference of the `$scripts` and `$styles` attributes in client-assets.php. ([21987](https://github.com/WordPress/gutenberg/pull/21987))
-- Use optional chaining, optional catch binding. ([21967](https://github.com/WordPress/gutenberg/pull/21967))
-- Extract block mover buttons so that they can be individually imported. ([22122](https://github.com/WordPress/gutenberg/pull/22122))sss
+-   Block: move new props to hook. ([22212](https://github.com/WordPress/gutenberg/pull/22212))
+-   Block: avoid useLayoutEffect. ([22108](https://github.com/WordPress/gutenberg/pull/22108))
+-   Try: Reduced specificity base block margins. ([22051](https://github.com/WordPress/gutenberg/pull/22051))
+-   Update the audio and video blocks to use a light wrapper in the editor. ([22028](https://github.com/WordPress/gutenberg/pull/22028))
+-   Remove unused animation lingering in paragraph file. ([22020](https://github.com/WordPress/gutenberg/pull/22020))
+-   Columns. Remove top and bottom margin from individual column blocks. ([22018](https://github.com/WordPress/gutenberg/pull/22018))
+-   Try better inserter toggle styling. ([22016](https://github.com/WordPress/gutenberg/pull/22016))
+-   Block Editor: Rename block context in BlockListBlock. ([21922](https://github.com/WordPress/gutenberg/pull/21922))
+-   Remove duplicate CopyHanddler. ([21817](https://github.com/WordPress/gutenberg/pull/21817))
+-   Types: Restore element, icons, primitives types. ([21781](https://github.com/WordPress/gutenberg/pull/21781))
+-   Convert core toolbar buttons into ToolbarButton. ([20008](https://github.com/WordPress/gutenberg/pull/20008))
+-   Block Directory: Add end 2 end tests. ([20023](https://github.com/WordPress/gutenberg/pull/20023))
+-   ClipboardButton: use hooks. ([22220](https://github.com/WordPress/gutenberg/pull/22220))
+-   ClipboardButton: remove wrapper span. ([22218](https://github.com/WordPress/gutenberg/pull/22218))
+-   Block Library: Update FSE blocks to use block context. ([21696](https://github.com/WordPress/gutenberg/pull/21696))
+-   Group: Zero out the intrinsic margin set to every block in the editor. ([22209](https://github.com/WordPress/gutenberg/pull/22209))
+-   Unset the inherit for links. ([22160](https://github.com/WordPress/gutenberg/pull/22160))
+-   Template Loader: Get rid of \_wp_current_template_part_ids globals. ([22143](https://github.com/WordPress/gutenberg/pull/22143))
+-   Block Library: Post Author: Reference attributes by argument. ([22114](https://github.com/WordPress/gutenberg/pull/22114))
+-   Remove pass by reference of the `$scripts` and `$styles` attributes in client-assets.php. ([21987](https://github.com/WordPress/gutenberg/pull/21987))
+-   Use optional chaining, optional catch binding. ([21967](https://github.com/WordPress/gutenberg/pull/21967))
+-   Extract block mover buttons so that they can be individually imported. ([22122](https://github.com/WordPress/gutenberg/pull/22122))sss
 
 ### Documentation
 
-- Scripts: Mark `env` script as deprecated. ([22158](https://github.com/WordPress/gutenberg/pull/22158))
-- Docs: Use InspectorControls from @wordpress/block-editor. ([22153](https://github.com/WordPress/gutenberg/pull/22153))
-- Fix bundle analysis change location in changelog. ([22136](https://github.com/WordPress/gutenberg/pull/22136))
-- Documentation: Improve the way CHANGELOG files are maintained. ([22126](https://github.com/WordPress/gutenberg/pull/22126))
-- ESLint Plugin: Add missing rules to root README. ([22042](https://github.com/WordPress/gutenberg/pull/22042))
-- Fix props, in example code for Edit Post module. ([21976](https://github.com/WordPress/gutenberg/pull/21976))
-- Document e2e test command options. ([21962](https://github.com/WordPress/gutenberg/pull/21962))
-- Add an example for how to choose a style variation for a block variation. ([21927](https://github.com/WordPress/gutenberg/pull/21927))
-- Add documentation for onSelectURL property. ([20799](https://github.com/WordPress/gutenberg/pull/20799))
-- Document the old patterns API deprecation. ([22177](https://github.com/WordPress/gutenberg/pull/22177))
-- Coding Guidelines:
-  - Document JavaScript language support commitment. ([22030](https://github.com/WordPress/gutenberg/pull/22030))
-  - Add "gotchas" section about ES2020 optional chaining. ([22029](https://github.com/WordPress/gutenberg/pull/22029))
-  - Recommend function components. ([22090](https://github.com/WordPress/gutenberg/pull/22090))
+-   Scripts: Mark `env` script as deprecated. ([22158](https://github.com/WordPress/gutenberg/pull/22158))
+-   Docs: Use InspectorControls from @wordpress/block-editor. ([22153](https://github.com/WordPress/gutenberg/pull/22153))
+-   Fix bundle analysis change location in changelog. ([22136](https://github.com/WordPress/gutenberg/pull/22136))
+-   Documentation: Improve the way CHANGELOG files are maintained. ([22126](https://github.com/WordPress/gutenberg/pull/22126))
+-   ESLint Plugin: Add missing rules to root README. ([22042](https://github.com/WordPress/gutenberg/pull/22042))
+-   Fix props, in example code for Edit Post module. ([21976](https://github.com/WordPress/gutenberg/pull/21976))
+-   Document e2e test command options. ([21962](https://github.com/WordPress/gutenberg/pull/21962))
+-   Add an example for how to choose a style variation for a block variation. ([21927](https://github.com/WordPress/gutenberg/pull/21927))
+-   Add documentation for onSelectURL property. ([20799](https://github.com/WordPress/gutenberg/pull/20799))
+-   Document the old patterns API deprecation. ([22177](https://github.com/WordPress/gutenberg/pull/22177))
+-   Coding Guidelines:
+    -   Document JavaScript language support commitment. ([22030](https://github.com/WordPress/gutenberg/pull/22030))
+    -   Add "gotchas" section about ES2020 optional chaining. ([22029](https://github.com/WordPress/gutenberg/pull/22029))
+    -   Recommend function components. ([22090](https://github.com/WordPress/gutenberg/pull/22090))
 
 ### Various
 
-- Expose presets declared via add_theme_support in global styles. ([22076](https://github.com/WordPress/gutenberg/pull/22076))
-- Update is-promise package to the latest version. ([21940](https://github.com/WordPress/gutenberg/pull/21940))
-- Blocks: Register FSE blocks if experiment is enabled. ([21536](https://github.com/WordPress/gutenberg/pull/21536))
+-   Expose presets declared via add_theme_support in global styles. ([22076](https://github.com/WordPress/gutenberg/pull/22076))
+-   Update is-promise package to the latest version. ([21940](https://github.com/WordPress/gutenberg/pull/21940))
+-   Blocks: Register FSE blocks if experiment is enabled. ([21536](https://github.com/WordPress/gutenberg/pull/21536))
 
 ### Mobile App
 
-- Add missing RTL support for some mobile components. ([21502](https://github.com/WordPress/gutenberg/pull/21502))
-- Remove separatorType prop from TextControl, RangeControl... ([21365](https://github.com/WordPress/gutenberg/pull/21365))
-- Color settings. ([21326](https://github.com/WordPress/gutenberg/pull/21326))
-- Global styles provider. ([21637](https://github.com/WordPress/gutenberg/pull/21637))
-- Update existing templates to use new blocks. ([21857](https://github.com/WordPress/gutenberg/pull/21857))
-- Enable pullquote block. ([21930](https://github.com/WordPress/gutenberg/pull/21930))
-- Merge release branch back to trunk for v1.27.1. ([22234](https://github.com/WordPress/gutenberg/pull/22234))
-- Wrap button blocks with buttons blocks in page templates. ([21939](https://github.com/WordPress/gutenberg/pull/21939))
-- Components: Create a separate .native entry for ToolbarItem. ([22229](https://github.com/WordPress/gutenberg/pull/22229))
+-   Add missing RTL support for some mobile components. ([21502](https://github.com/WordPress/gutenberg/pull/21502))
+-   Remove separatorType prop from TextControl, RangeControl... ([21365](https://github.com/WordPress/gutenberg/pull/21365))
+-   Color settings. ([21326](https://github.com/WordPress/gutenberg/pull/21326))
+-   Global styles provider. ([21637](https://github.com/WordPress/gutenberg/pull/21637))
+-   Update existing templates to use new blocks. ([21857](https://github.com/WordPress/gutenberg/pull/21857))
+-   Enable pullquote block. ([21930](https://github.com/WordPress/gutenberg/pull/21930))
+-   Merge release branch back to trunk for v1.27.1. ([22234](https://github.com/WordPress/gutenberg/pull/22234))
+-   Wrap button blocks with buttons blocks in page templates. ([21939](https://github.com/WordPress/gutenberg/pull/21939))
+-   Components: Create a separate .native entry for ToolbarItem. ([22229](https://github.com/WordPress/gutenberg/pull/22229))
 
 = 8.0.0 =
 
+## Changelog
+
 ### Features
 
-- Add subscript and superscript formatting options. ([21819](https://github.com/WordPress/gutenberg/pull/21819))
-- Move the Block Patterns UI to the inserter. ([20951](https://github.com/WordPress/gutenberg/pull/20951))
-- Improve layout and usability of code editor. ([21643](https://github.com/WordPress/gutenberg/pull/21643))
+-   Add subscript and superscript formatting options. ([21819](https://github.com/WordPress/gutenberg/pull/21819))
+-   Move the Block Patterns UI to the inserter. ([20951](https://github.com/WordPress/gutenberg/pull/20951))
+-   Improve layout and usability of code editor. ([21643](https://github.com/WordPress/gutenberg/pull/21643))
 
 ### Enhancements
 
-- Add inserter previews to more blocks. ([21740](https://github.com/WordPress/gutenberg/pull/21740))
-- Performance improvements:
-  - Import from individual react-dates component. ([21914](https://github.com/WordPress/gutenberg/pull/21914))
-  - Upgrade showdown Markdown processor library. ([21862](https://github.com/WordPress/gutenberg/pull/21862))
-- Allow title and button-based appender to inherit styles. ([21749](https://github.com/WordPress/gutenberg/pull/21749))
-- Output float clearing for all centered blocks. ([21608](https://github.com/WordPress/gutenberg/pull/21608))
-- Update 'Welcome Guide' illustrations. ([21515](https://github.com/WordPress/gutenberg/pull/21515))
+-   Add inserter previews to more blocks. ([21740](https://github.com/WordPress/gutenberg/pull/21740))
+-   Performance improvements:
+    -   Import from individual react-dates component. ([21914](https://github.com/WordPress/gutenberg/pull/21914))
+    -   Upgrade showdown Markdown processor library. ([21862](https://github.com/WordPress/gutenberg/pull/21862))
+-   Allow title and button-based appender to inherit styles. ([21749](https://github.com/WordPress/gutenberg/pull/21749))
+-   Output float clearing for all centered blocks. ([21608](https://github.com/WordPress/gutenberg/pull/21608))
+-   Update 'Welcome Guide' illustrations. ([21515](https://github.com/WordPress/gutenberg/pull/21515))
 
 ### New APIs
 
-- A new [Block Context API](https://github.com/WordPress/gutenberg/blob/HEAD/docs/designers-developers/developers/block-api/block-context.md) has been partially implemented, currently limited to block settings and editor APIs. PHP APIs will be implemented in the next plugin releases. ([21467](https://github.com/WordPress/gutenberg/pull/21467), [21868](https://github.com/WordPress/gutenberg/pull/21868), [21921](https://github.com/WordPress/gutenberg/pull/21921))
-- Add new "G2"-styled icons to the Icons package. ([21209](https://github.com/WordPress/gutenberg/pull/21209))
-
-### Bug Fixes
-
-- Change `wp_make_content_images_responsive` to `wp_filter_content_tags` to resolve warnings in WordPress 5.5-alpha. ([21514](https://github.com/WordPress/gutenberg/pull/21514))
-- Collapse selection to end after link insertion. ([17126](https://github.com/WordPress/gutenberg/pull/17126))
-- Fix selected category on existing Latest Posts blocks. ([21359](https://github.com/WordPress/gutenberg/pull/21359))
-- Fix overlapping column contents for embeds. ([21570](https://github.com/WordPress/gutenberg/pull/21570))
-- Fix focus styling for date picker calendar days. ([21600](https://github.com/WordPress/gutenberg/pull/21600))
-- NPM Packages
-  - Fix "Cannot find module '../utils'" error. ([21609](https://github.com/WordPress/gutenberg/pull/21609))
-  - Types: Hide element, primitives, icons declarations. ([21613](https://github.com/WordPress/gutenberg/pull/21613), [21784](https://github.com/WordPress/gutenberg/pull/21784))
-- Inherit font styles in block appender placeholder. ([21725](https://github.com/WordPress/gutenberg/pull/21725))
-- Allow default pasting behavior in FontSizePicker. ([21812](https://github.com/WordPress/gutenberg/pull/21812))
-- Prevent negative custom text sizes. ([21815](https://github.com/WordPress/gutenberg/pull/21815))
-- Fix image center alignment behavior. ([21911](https://github.com/WordPress/gutenberg/pull/21911))
-- Fix centered buttons margins. ([21947](https://github.com/WordPress/gutenberg/pull/21947))
-- Revert the button block to the previous markup. ([21923](https://github.com/WordPress/gutenberg/pull/21923))
-- Avoid using inline RichText element for Link. ([21856](https://github.com/WordPress/gutenberg/pull/21856))
-- Ensure `resetEditorBlocks` is synchronous. ([21839](https://github.com/WordPress/gutenberg/pull/21839))
-- Fix the button outline style for the old button markup. ([21816](https://github.com/WordPress/gutenberg/pull/21816))
-- Fix default attribute on audio preload. ([21735](https://github.com/WordPress/gutenberg/pull/21735))
-- Fix gradient picker double-click bug. ([21732](https://github.com/WordPress/gutenberg/pull/21732))
-- Fix broken links in handbook. ([21686](https://github.com/WordPress/gutenberg/pull/21686))
-- Make `useMediaQuery` return the correct value on the first render. ([21682](https://github.com/WordPress/gutenberg/pull/21682))
-- Fix visual issue on windows with 782px. ([21661](https://github.com/WordPress/gutenberg/pull/21661))
-- Allow wrapping for Navigation block links. ([21632](https://github.com/WordPress/gutenberg/pull/21632))
-- Remove redundant margins from the columns block. ([21615](https://github.com/WordPress/gutenberg/pull/21615))
-- Fix media Text padding on inner blocks. ([21612](https://github.com/WordPress/gutenberg/pull/21612))
-- Restore floated image margins. ([21500](https://github.com/WordPress/gutenberg/pull/21500))
-- Fix URL display for scheduled posts. ([21410](https://github.com/WordPress/gutenberg/pull/21410))
-- Test keycode modifiers for keyboard event as exclusive set. ([20733](https://github.com/WordPress/gutenberg/pull/20733))
-- Fix focus loss for Guide "Finish" button in Internet Explorer. ([20599](https://github.com/WordPress/gutenberg/pull/20599))
-- Replace incorrect Snackbar `label` attribute with `aria-label`. ([20540](https://github.com/WordPress/gutenberg/pull/20540))
+-   A new [Block Context API](https://github.com/WordPress/gutenberg/blob/HEAD/docs/designers-developers/developers/block-api/block-context.md) has been partially implemented, currently limited to block settings and editor APIs. PHP APIs will be implemented in the next plugin releases. ([21467](https://github.com/WordPress/gutenberg/pull/21467), [21868](https://github.com/WordPress/gutenberg/pull/21868), [21921](https://github.com/WordPress/gutenberg/pull/21921))
+-   Add new "G2"-styled icons to the Icons package. ([21209](https://github.com/WordPress/gutenberg/pull/21209))
+
+### Bug Fixes
+
+-   Change `wp_make_content_images_responsive` to `wp_filter_content_tags` to resolve warnings in WordPress 5.5-alpha. ([21514](https://github.com/WordPress/gutenberg/pull/21514))
+-   Collapse selection to end after link insertion. ([17126](https://github.com/WordPress/gutenberg/pull/17126))
+-   Fix selected category on existing Latest Posts blocks. ([21359](https://github.com/WordPress/gutenberg/pull/21359))
+-   Fix overlapping column contents for embeds. ([21570](https://github.com/WordPress/gutenberg/pull/21570))
+-   Fix focus styling for date picker calendar days. ([21600](https://github.com/WordPress/gutenberg/pull/21600))
+-   NPM Packages
+    -   Fix "Cannot find module '../utils'" error. ([21609](https://github.com/WordPress/gutenberg/pull/21609))
+    -   Types: Hide element, primitives, icons declarations. ([21613](https://github.com/WordPress/gutenberg/pull/21613), [21784](https://github.com/WordPress/gutenberg/pull/21784))
+-   Inherit font styles in block appender placeholder. ([21725](https://github.com/WordPress/gutenberg/pull/21725))
+-   Allow default pasting behavior in FontSizePicker. ([21812](https://github.com/WordPress/gutenberg/pull/21812))
+-   Prevent negative custom text sizes. ([21815](https://github.com/WordPress/gutenberg/pull/21815))
+-   Fix image center alignment behavior. ([21911](https://github.com/WordPress/gutenberg/pull/21911))
+-   Fix centered buttons margins. ([21947](https://github.com/WordPress/gutenberg/pull/21947))
+-   Revert the button block to the previous markup. ([21923](https://github.com/WordPress/gutenberg/pull/21923))
+-   Avoid using inline RichText element for Link. ([21856](https://github.com/WordPress/gutenberg/pull/21856))
+-   Ensure `resetEditorBlocks` is synchronous. ([21839](https://github.com/WordPress/gutenberg/pull/21839))
+-   Fix the button outline style for the old button markup. ([21816](https://github.com/WordPress/gutenberg/pull/21816))
+-   Fix default attribute on audio preload. ([21735](https://github.com/WordPress/gutenberg/pull/21735))
+-   Fix gradient picker double-click bug. ([21732](https://github.com/WordPress/gutenberg/pull/21732))
+-   Fix broken links in handbook. ([21686](https://github.com/WordPress/gutenberg/pull/21686))
+-   Make `useMediaQuery` return the correct value on the first render. ([21682](https://github.com/WordPress/gutenberg/pull/21682))
+-   Fix visual issue on windows with 782px. ([21661](https://github.com/WordPress/gutenberg/pull/21661))
+-   Allow wrapping for Navigation block links. ([21632](https://github.com/WordPress/gutenberg/pull/21632))
+-   Remove redundant margins from the columns block. ([21615](https://github.com/WordPress/gutenberg/pull/21615))
+-   Fix media Text padding on inner blocks. ([21612](https://github.com/WordPress/gutenberg/pull/21612))
+-   Restore floated image margins. ([21500](https://github.com/WordPress/gutenberg/pull/21500))
+-   Fix URL display for scheduled posts. ([21410](https://github.com/WordPress/gutenberg/pull/21410))
+-   Test keycode modifiers for keyboard event as exclusive set. ([20733](https://github.com/WordPress/gutenberg/pull/20733))
+-   Fix focus loss for Guide "Finish" button in Internet Explorer. ([20599](https://github.com/WordPress/gutenberg/pull/20599))
+-   Replace incorrect Snackbar `label` attribute with `aria-label`. ([20540](https://github.com/WordPress/gutenberg/pull/20540))
 
 ### Experiments
 
-- Add experimental `useEditorFeature` hook to simplify access to editor features. ([21646](https://github.com/WordPress/gutenberg/pull/21646))
-- Navigation menu page:
-  - Try a fixed toolbar in the navigation page. ([21340](https://github.com/WordPress/gutenberg/pull/21340))
-  - Fix panel collapsing in navigation page. ([21633](https://github.com/WordPress/gutenberg/pull/21633))
-  - Fix mobile layout for navigation menu page. ([21638](https://github.com/WordPress/gutenberg/pull/21638))
-  - Delete empty spaces in menu REST API endpoint strings. ([21453](https://github.com/WordPress/gutenberg/pull/21453))
-- Edit site:
-  - Add current theme to template switcher. ([21578](https://github.com/WordPress/gutenberg/pull/21578), [21768](https://github.com/WordPress/gutenberg/pull/21768))
-  - Declare attributes for Template Part block in `block.json`. ([21796](https://github.com/WordPress/gutenberg/pull/21796))
-  - Update end-to-end test for multi-entity saving in site editor. ([21363](https://github.com/WordPress/gutenberg/pull/21363))
-  - Add preview options component. ([21309](https://github.com/WordPress/gutenberg/pull/21309))
-  - Improve template parts resolution and saving behavior. ([21766](https://github.com/WordPress/gutenberg/pull/21766))
-  - Support REST API meta queries. ([21851](https://github.com/WordPress/gutenberg/pull/21851))
-  - Add extra validation when loading template parts. ([21636](https://github.com/WordPress/gutenberg/pull/21636))
-- Block directory:
-  - Add InserterPanel around block directory results. ([21748](https://github.com/WordPress/gutenberg/pull/21748))
-- Widgets:
-  - Fix legacy widgets z-index issue. ([21586](https://github.com/WordPress/gutenberg/pull/21586))
-  - Fix legacy widgets visual issues. ([21585](https://github.com/WordPress/gutenberg/pull/21585))
+-   Add experimental `useEditorFeature` hook to simplify access to editor features. ([21646](https://github.com/WordPress/gutenberg/pull/21646))
+-   Navigation menu page:
+    -   Try a fixed toolbar in the navigation page. ([21340](https://github.com/WordPress/gutenberg/pull/21340))
+    -   Fix panel collapsing in navigation page. ([21633](https://github.com/WordPress/gutenberg/pull/21633))
+    -   Fix mobile layout for navigation menu page. ([21638](https://github.com/WordPress/gutenberg/pull/21638))
+    -   Delete empty spaces in menu REST API endpoint strings. ([21453](https://github.com/WordPress/gutenberg/pull/21453))
+-   Edit site:
+    -   Add current theme to template switcher. ([21578](https://github.com/WordPress/gutenberg/pull/21578), [21768](https://github.com/WordPress/gutenberg/pull/21768))
+    -   Declare attributes for Template Part block in `block.json`. ([21796](https://github.com/WordPress/gutenberg/pull/21796))
+    -   Update end-to-end test for multi-entity saving in site editor. ([21363](https://github.com/WordPress/gutenberg/pull/21363))
+    -   Add preview options component. ([21309](https://github.com/WordPress/gutenberg/pull/21309))
+    -   Improve template parts resolution and saving behavior. ([21766](https://github.com/WordPress/gutenberg/pull/21766))
+    -   Support REST API meta queries. ([21851](https://github.com/WordPress/gutenberg/pull/21851))
+    -   Add extra validation when loading template parts. ([21636](https://github.com/WordPress/gutenberg/pull/21636))
+-   Block directory:
+    -   Add InserterPanel around block directory results. ([21748](https://github.com/WordPress/gutenberg/pull/21748))
+-   Widgets:
+    -   Fix legacy widgets z-index issue. ([21586](https://github.com/WordPress/gutenberg/pull/21586))
+    -   Fix legacy widgets visual issues. ([21585](https://github.com/WordPress/gutenberg/pull/21585))
 
 ### Deprecations
 
-- Add deprecation notice to `useApiFetch` hook. ([21723](https://github.com/WordPress/gutenberg/pull/21723))
+-   Add deprecation notice to `useApiFetch` hook. ([21723](https://github.com/WordPress/gutenberg/pull/21723))
 
 ### Code Quality
 
-- Remove nested breakpoint in fullscreen mode CSS. ([21496](https://github.com/WordPress/gutenberg/pull/21496))
-- Update npm-package-json-lint from 4.0.3 to 5.0.0. ([21597](https://github.com/WordPress/gutenberg/pull/21597))
-- Update npm dependencies that warn. ([21596](https://github.com/WordPress/gutenberg/pull/21596))
-- Fix license check script to ignore sub-dependencies of ignored packages. ([21606](https://github.com/WordPress/gutenberg/pull/21606))
-- Package TypeScript types improvements:
-  - Mark addQueryArgs arguments parameter as optional. ([21926](https://github.com/WordPress/gutenberg/pull/21926))
-  - Relax i18n sprintf arguments type. ([21919](https://github.com/WordPress/gutenberg/pull/21919))
-- Update PHPCS to latest version. ([21680](https://github.com/WordPress/gutenberg/pull/21680))
-- Unify how editor alignments are applied across blocks. ([21822](https://github.com/WordPress/gutenberg/pull/21822))
-- Remove obsolete editor alignment classes. ([21906](https://github.com/WordPress/gutenberg/pull/21906))
-- Remove old icons. ([21821](https://github.com/WordPress/gutenberg/pull/21821))
-- Implement `block.json` for blocks. ([21794](https://github.com/WordPress/gutenberg/pull/21794), [21783](https://github.com/WordPress/gutenberg/pull/21783), [21782](https://github.com/WordPress/gutenberg/pull/21782), [21775](https://github.com/WordPress/gutenberg/pull/21775), [21787](https://github.com/WordPress/gutenberg/pull/21787), [21774](https://github.com/WordPress/gutenberg/pull/21774), [21792](https://github.com/WordPress/gutenberg/pull/21792))
-- Use `register_block_type_from_metadata` in Latest Posts block. ([21788](https://github.com/WordPress/gutenberg/pull/21788))
-- Polish RSS block code. ([21773](https://github.com/WordPress/gutenberg/pull/21773))
-- Move `camelCaseDash` to the package where it is consumed. ([21736](https://github.com/WordPress/gutenberg/pull/21736))
-- Improve URLPopover code from review comments. ([21621](https://github.com/WordPress/gutenberg/pull/21621))
+-   Remove nested breakpoint in fullscreen mode CSS. ([21496](https://github.com/WordPress/gutenberg/pull/21496))
+-   Update npm-package-json-lint from 4.0.3 to 5.0.0. ([21597](https://github.com/WordPress/gutenberg/pull/21597))
+-   Update npm dependencies that warn. ([21596](https://github.com/WordPress/gutenberg/pull/21596))
+-   Fix license check script to ignore sub-dependencies of ignored packages. ([21606](https://github.com/WordPress/gutenberg/pull/21606))
+-   Package TypeScript types improvements:
+    -   Mark addQueryArgs arguments parameter as optional. ([21926](https://github.com/WordPress/gutenberg/pull/21926))
+    -   Relax i18n sprintf arguments type. ([21919](https://github.com/WordPress/gutenberg/pull/21919))
+-   Update PHPCS to latest version. ([21680](https://github.com/WordPress/gutenberg/pull/21680))
+-   Unify how editor alignments are applied across blocks. ([21822](https://github.com/WordPress/gutenberg/pull/21822))
+-   Remove obsolete editor alignment classes. ([21906](https://github.com/WordPress/gutenberg/pull/21906))
+-   Remove old icons. ([21821](https://github.com/WordPress/gutenberg/pull/21821))
+-   Implement `block.json` for blocks. ([21794](https://github.com/WordPress/gutenberg/pull/21794), [21783](https://github.com/WordPress/gutenberg/pull/21783), [21782](https://github.com/WordPress/gutenberg/pull/21782), [21775](https://github.com/WordPress/gutenberg/pull/21775), [21787](https://github.com/WordPress/gutenberg/pull/21787), [21774](https://github.com/WordPress/gutenberg/pull/21774), [21792](https://github.com/WordPress/gutenberg/pull/21792))
+-   Use `register_block_type_from_metadata` in Latest Posts block. ([21788](https://github.com/WordPress/gutenberg/pull/21788))
+-   Polish RSS block code. ([21773](https://github.com/WordPress/gutenberg/pull/21773))
+-   Move `camelCaseDash` to the package where it is consumed. ([21736](https://github.com/WordPress/gutenberg/pull/21736))
+-   Improve URLPopover code from review comments. ([21621](https://github.com/WordPress/gutenberg/pull/21621))
 
 ### Documentation
 
-- Remove duplicate sentence in glossary documentation. ([21565](https://github.com/WordPress/gutenberg/pull/21565))
-- Update `wp-env` docs to reflect current functionality of package. ([21809](https://github.com/WordPress/gutenberg/pull/21809))
-- Extract Block Transforms into its own handbook page. ([21734](https://github.com/WordPress/gutenberg/pull/21734))
-- Update the index of Block API to reflect current contents. ([21726](https://github.com/WordPress/gutenberg/pull/21726))
-- Clarify attribute type documentation. ([21694](https://github.com/WordPress/gutenberg/pull/21694))
-- Add location for components `style.css`. ([21654](https://github.com/WordPress/gutenberg/pull/21654))
-- Fix the JSDoc return type for `getEntityRecords`. ([21630](https://github.com/WordPress/gutenberg/pull/21630))
-- Update triage links to new document. ([21629](https://github.com/WordPress/gutenberg/pull/21629))
-- Update Getting Started instructions for remote server. ([21625](https://github.com/WordPress/gutenberg/pull/21625))
-- Update the "patterns" to reflect "user interface" instead. ([21562](https://github.com/WordPress/gutenberg/pull/21562))
-- Create document for contributing with triage. ([21350](https://github.com/WordPress/gutenberg/pull/21350))
-- Update triage.md to add more clarity and relevant links. ([21802](https://github.com/WordPress/gutenberg/pull/21802))
+-   Remove duplicate sentence in glossary documentation. ([21565](https://github.com/WordPress/gutenberg/pull/21565))
+-   Update `wp-env` docs to reflect current functionality of package. ([21809](https://github.com/WordPress/gutenberg/pull/21809))
+-   Extract Block Transforms into its own handbook page. ([21734](https://github.com/WordPress/gutenberg/pull/21734))
+-   Update the index of Block API to reflect current contents. ([21726](https://github.com/WordPress/gutenberg/pull/21726))
+-   Clarify attribute type documentation. ([21694](https://github.com/WordPress/gutenberg/pull/21694))
+-   Add location for components `style.css`. ([21654](https://github.com/WordPress/gutenberg/pull/21654))
+-   Fix the JSDoc return type for `getEntityRecords`. ([21630](https://github.com/WordPress/gutenberg/pull/21630))
+-   Update triage links to new document. ([21629](https://github.com/WordPress/gutenberg/pull/21629))
+-   Update Getting Started instructions for remote server. ([21625](https://github.com/WordPress/gutenberg/pull/21625))
+-   Update the "patterns" to reflect "user interface" instead. ([21562](https://github.com/WordPress/gutenberg/pull/21562))
+-   Create document for contributing with triage. ([21350](https://github.com/WordPress/gutenberg/pull/21350))
+-   Update triage.md to add more clarity and relevant links. ([21802](https://github.com/WordPress/gutenberg/pull/21802))
 
 ### Project Management
 
-- Update bug report template to help identify the editor version. ([21564](https://github.com/WordPress/gutenberg/pull/21564))
+-   Update bug report template to help identify the editor version. ([21564](https://github.com/WordPress/gutenberg/pull/21564))
 
 ### Various
 
-- End-to-end tests:
-  - Add test for template part block creation and insertion. ([21849](https://github.com/WordPress/gutenberg/pull/21849))
-  - Add test that template part block customizations are loaded from slug and theme attributes. ([21852](https://github.com/WordPress/gutenberg/pull/21852))
-  - Fix tests by removing unnecessary assertions and properly install dependencies in `@wordpress/api-fetch`. ([21780](https://github.com/WordPress/gutenberg/pull/21780))
-  - Add end-to-end test for pinned sidebar items. ([21652](https://github.com/WordPress/gutenberg/pull/21652))
-  - Add test which verifies reusable block after refresh. ([20605](https://github.com/WordPress/gutenberg/pull/20605))
-- Update cleanForSlug() to remove additional non-word characters. ([21007](https://github.com/WordPress/gutenberg/pull/21007))
-- `@wordpress/scripts`:
-  - Support debugging with `test-unit-js`. ([21631](https://github.com/WordPress/gutenberg/pull/21631), [21861](https://github.com/WordPress/gutenberg/pull/21861))
-  - Install Chromium on demand together with `test-e2e` script. ([20215](https://github.com/WordPress/gutenberg/pull/20215))
-- `@wordpress/create-block` block scaffold tool:
-  - Make it easier to provide most popular CLI options. ([21751](https://github.com/WordPress/gutenberg/pull/21751))
-  - Split JavaScript source files into parts for ESNext template. ([21750](https://github.com/WordPress/gutenberg/pull/21750))
-- `@wordpress/env` development environment:
-  - Expose port 3306 of MySQL container. ([21545](https://github.com/WordPress/gutenberg/pull/21545))
-- `@wordpress/eslint-plugin`:
-  - Add the recommended Prettier config to enforce WP coding styles. ([21602](https://github.com/WordPress/gutenberg/pull/21602))
-  - Fix `no-unused-vars-before-return` JSX identifier reference. ([21358](https://github.com/WordPress/gutenberg/pull/21358))
-- Navigation block:
-  - Revert changes to data fetching mechanics. ([21721](https://github.com/WordPress/gutenberg/pull/21721))
-- Bundle the block autocompleter in the block-editor package. ([21534](https://github.com/WordPress/gutenberg/pull/21534))
-- Storybook:
-  - Add FormToggle component. ([18085](https://github.com/WordPress/gutenberg/pull/18085))
-- Simplify Reusable Block description. ([21470](https://github.com/WordPress/gutenberg/pull/21470))
-- Build tooling:
-  - Install Composer dependencies as pre-lint step. ([21537](https://github.com/WordPress/gutenberg/pull/21537))
-  - Configure Webpack to watch only build files. ([21489](https://github.com/WordPress/gutenberg/pull/21489))
-  - Exit with non-zero status on docgen failed parse. ([21690](https://github.com/WordPress/gutenberg/pull/21690))
-
+-   End-to-end tests:
+    -   Add test for template part block creation and insertion. ([21849](https://github.com/WordPress/gutenberg/pull/21849))
+    -   Add test that template part block customizations are loaded from slug and theme attributes. ([21852](https://github.com/WordPress/gutenberg/pull/21852))
+    -   Fix tests by removing unnecessary assertions and properly install dependencies in `@wordpress/api-fetch`. ([21780](https://github.com/WordPress/gutenberg/pull/21780))
+    -   Add end-to-end test for pinned sidebar items. ([21652](https://github.com/WordPress/gutenberg/pull/21652))
+    -   Add test which verifies reusable block after refresh. ([20605](https://github.com/WordPress/gutenberg/pull/20605))
+-   Update cleanForSlug() to remove additional non-word characters. ([21007](https://github.com/WordPress/gutenberg/pull/21007))
+-   `@wordpress/scripts`:
+    -   Support debugging with `test-unit-js`. ([21631](https://github.com/WordPress/gutenberg/pull/21631), [21861](https://github.com/WordPress/gutenberg/pull/21861))
+    -   Install Chromium on demand together with `test-e2e` script. ([20215](https://github.com/WordPress/gutenberg/pull/20215))
+-   `@wordpress/create-block` block scaffold tool:
+    -   Make it easier to provide most popular CLI options. ([21751](https://github.com/WordPress/gutenberg/pull/21751))
+    -   Split JavaScript source files into parts for ESNext template. ([21750](https://github.com/WordPress/gutenberg/pull/21750))
+-   `@wordpress/env` development environment:
+    -   Expose port 3306 of MySQL container. ([21545](https://github.com/WordPress/gutenberg/pull/21545))
+-   `@wordpress/eslint-plugin`:
+    -   Add the recommended Prettier config to enforce WP coding styles. ([21602](https://github.com/WordPress/gutenberg/pull/21602))
+    -   Fix `no-unused-vars-before-return` JSX identifier reference. ([21358](https://github.com/WordPress/gutenberg/pull/21358))
+-   Navigation block:
+    -   Revert changes to data fetching mechanics. ([21721](https://github.com/WordPress/gutenberg/pull/21721))
+-   Bundle the block autocompleter in the block-editor package. ([21534](https://github.com/WordPress/gutenberg/pull/21534))
+-   Storybook:
+    -   Add FormToggle component. ([18085](https://github.com/WordPress/gutenberg/pull/18085))
+-   Simplify Reusable Block description. ([21470](https://github.com/WordPress/gutenberg/pull/21470))
+-   Build tooling:
+    -   Install Composer dependencies as pre-lint step. ([21537](https://github.com/WordPress/gutenberg/pull/21537))
+    -   Configure Webpack to watch only build files. ([21489](https://github.com/WordPress/gutenberg/pull/21489))
+    -   Exit with non-zero status on docgen failed parse. ([21690](https://github.com/WordPress/gutenberg/pull/21690))
 
 = 7.9.1 =
 
-### Bug Fixes
+## Changelog
 
- - Make sidebar plugins pinned by default.
- - Fix the button styles for old content.
+### Bug Fixes
 
+-   Make sidebar plugins pinned by default.
+-   Fix the button styles for old content.
 
 = 7.9.0 =
 
+## Changelog
+
 ### Features
 
-- Add gradients support to Group, Columns and Media & Text blocks. [21375](https://github.com/WordPress/gutenberg/pull/21375)
-- Add line height support to the Paragraph block. [20775](https://github.com/WordPress/gutenberg/pull/20775)
-- Add font size support to the Heading block. [21431](https://github.com/WordPress/gutenberg/pull/21431)
-- Add line height support to the Heading block. [21215](https://github.com/WordPress/gutenberg/pull/21215)
-- Add custom height unit support to the Cover block. [20888](https://github.com/WordPress/gutenberg/pull/20888)
+-   Add gradients support to Group, Columns and Media & Text blocks. [21375](https://github.com/WordPress/gutenberg/pull/21375)
+-   Add line height support to the Paragraph block. [20775](https://github.com/WordPress/gutenberg/pull/20775)
+-   Add font size support to the Heading block. [21431](https://github.com/WordPress/gutenberg/pull/21431)
+-   Add line height support to the Heading block. [21215](https://github.com/WordPress/gutenberg/pull/21215)
+-   Add custom height unit support to the Cover block. [20888](https://github.com/WordPress/gutenberg/pull/20888)
 
 ### Enhancements
 
-- New Patterns:
-  - Hero Two Columns [21128](https://github.com/WordPress/gutenberg/pull/21128)
-  - Numbered Features [21131](https://github.com/WordPress/gutenberg/pull/21131)
-  - It's Time [21132](https://github.com/WordPress/gutenberg/pull/21132)
-- Add a new keyboard shortcut to toggle Fullscreen Mode. [21436](https://github.com/WordPress/gutenberg/pull/21436)
-- Insert post title instead of URL, when adding a link to an existing post [21240](https://github.com/WordPress/gutenberg/pull/21240)
-- Social links block:
-  - Update tumblr icon [21329](https://github.com/WordPress/gutenberg/pull/21329)
-  - Update and massage social links colors. [21474](https://github.com/WordPress/gutenberg/pull/21474)
-- Allow reusable block top and bottom paddings to collapse. [21472](https://github.com/WordPress/gutenberg/pull/21472)
-- Update all block previews to use the auto-height behavior. [21014](https://github.com/WordPress/gutenberg/pull/21014)
-- Disable autocomplete for custom class name inputs. [21110](https://github.com/WordPress/gutenberg/pull/21110)
-- Several small tweaks to the new Block UI. [21476](https://github.com/WordPress/gutenberg/pull/21476)
-- Unify the focus styles across the UI. [21141](https://github.com/WordPress/gutenberg/pull/21141)
-- Improve block focus style. [21498](https://github.com/WordPress/gutenberg/pull/21498)
-- Remove the post permalink UI from the post title. [21099](https://github.com/WordPress/gutenberg/pull/21099)
-- Style the default toolbar buttons. [21252](https://github.com/WordPress/gutenberg/pull/21252)
-- Style tweaks to the patterns library sidebar. [21263](https://github.com/WordPress/gutenberg/pull/21263)
-- Smaller space between toolbar and block. [21166](https://github.com/WordPress/gutenberg/pull/21166)
+-   New Patterns:
+    -   Hero Two Columns [21128](https://github.com/WordPress/gutenberg/pull/21128)
+    -   Numbered Features [21131](https://github.com/WordPress/gutenberg/pull/21131)
+    -   It's Time [21132](https://github.com/WordPress/gutenberg/pull/21132)
+-   Add a new keyboard shortcut to toggle Fullscreen Mode. [21436](https://github.com/WordPress/gutenberg/pull/21436)
+-   Insert post title instead of URL, when adding a link to an existing post [21240](https://github.com/WordPress/gutenberg/pull/21240)
+-   Social links block:
+    -   Update tumblr icon [21329](https://github.com/WordPress/gutenberg/pull/21329)
+    -   Update and massage social links colors. [21474](https://github.com/WordPress/gutenberg/pull/21474)
+-   Allow reusable block top and bottom paddings to collapse. [21472](https://github.com/WordPress/gutenberg/pull/21472)
+-   Update all block previews to use the auto-height behavior. [21014](https://github.com/WordPress/gutenberg/pull/21014)
+-   Disable autocomplete for custom class name inputs. [21110](https://github.com/WordPress/gutenberg/pull/21110)
+-   Several small tweaks to the new Block UI. [21476](https://github.com/WordPress/gutenberg/pull/21476)
+-   Unify the focus styles across the UI. [21141](https://github.com/WordPress/gutenberg/pull/21141)
+-   Improve block focus style. [21498](https://github.com/WordPress/gutenberg/pull/21498)
+-   Remove the post permalink UI from the post title. [21099](https://github.com/WordPress/gutenberg/pull/21099)
+-   Style the default toolbar buttons. [21252](https://github.com/WordPress/gutenberg/pull/21252)
+-   Style tweaks to the patterns library sidebar. [21263](https://github.com/WordPress/gutenberg/pull/21263)
+-   Smaller space between toolbar and block. [21166](https://github.com/WordPress/gutenberg/pull/21166)
 
 ### Performance
 
-- Add block selection performance test. [21230](https://github.com/WordPress/gutenberg/pull/21230)
-- Improve the performance of the block moving animation. [21231](https://github.com/WordPress/gutenberg/pull/21231)
-- Render the patterns list asynchronously. [21322](https://github.com/WordPress/gutenberg/pull/21322)
-
-### Bug Fixes
-
-- Improve WordPress logo rendering for non-retina displays. [21217](https://github.com/WordPress/gutenberg/pull/21217)
-- Fix inserter popover direction. [21556](https://github.com/WordPress/gutenberg/pull/21556)
-- Fix Snackbar notice bottom margin. [18858](https://github.com/WordPress/gutenberg/pull/18858)
-- Fix YouTube Embed block from flickering and crashing on Safari. [21225](https://github.com/WordPress/gutenberg/pull/21225)
-- Fix sibling inserter being unclickable. [21232](https://github.com/WordPress/gutenberg/pull/21232)
-- Fix block duplication using keyboard shortcut [21317](https://github.com/WordPress/gutenberg/pull/21317)
-- Avoid creating an empty paragraph when selecting the parent's group block [21318](https://github.com/WordPress/gutenberg/pull/21318)
-- Fix the Buttons block margins. [21376](https://github.com/WordPress/gutenberg/pull/21376)
-- Prevent typing on a Popover from closing the block toolbar [21421](https://github.com/WordPress/gutenberg/pull/21421)
-- Prevent copy/paste on number inputs from copying the post content. [21457](https://github.com/WordPress/gutenberg/pull/21457)
-- Prevent scroll jumps when focusing long blocks. [21460](https://github.com/WordPress/gutenberg/pull/21460)
-- Fix Separator block RTL styles. [21525](https://github.com/WordPress/gutenberg/pull/21525)
-- Make dateI18n returns be affected by `gmt` parameter. [18982](https://github.com/WordPress/gutenberg/pull/18982)
-- Fixes the read more link added by themes in the Latest Posts block. [20541](https://github.com/WordPress/gutenberg/pull/20541)
-- Fix the Latest Posts block when `imageDimensions` is empty [21070](https://github.com/WordPress/gutenberg/pull/21070)
-- Fix transparent images used as Cover block backgrounds. [20904](https://github.com/WordPress/gutenberg/pull/20904)
-- IE11: fix focus on backspace. [21092](https://github.com/WordPress/gutenberg/pull/21092)
-- Fix IE11 breakage when hitting Enter. [21361](https://github.com/WordPress/gutenberg/pull/21361) [21366](https://github.com/WordPress/gutenberg/pull/21366)
-- Fix block movers on full-wide blocks. [21097](https://github.com/WordPress/gutenberg/pull/21097)
-- Fix Annotations classNames. [21184](https://github.com/WordPress/gutenberg/pull/21184)
-- RangeControl: Fix zero value handling with number input. [21187](https://github.com/WordPress/gutenberg/pull/21187)
-- Fix reusable block horizontal padding regression. [21312](https://github.com/WordPress/gutenberg/pull/21312)
-- Fix fullwide margins regression. [21201](https://github.com/WordPress/gutenberg/pull/21201)
-- Prevent the Cover block from overriding the children blocks colors [21254](https://github.com/WordPress/gutenberg/pull/21254)
-- Fix overly verbose aria-label in Social Link block [21369](https://github.com/WordPress/gutenberg/pull/21369)
-- Fix container block appenders and sibling inserters. [21149](https://github.com/WordPress/gutenberg/pull/21149) [21142](https://github.com/WordPress/gutenberg/pull/21142) [21143](https://github.com/WordPress/gutenberg/pull/21143)
+-   Add block selection performance test. [21230](https://github.com/WordPress/gutenberg/pull/21230)
+-   Improve the performance of the block moving animation. [21231](https://github.com/WordPress/gutenberg/pull/21231)
+-   Render the patterns list asynchronously. [21322](https://github.com/WordPress/gutenberg/pull/21322)
+
+### Bug Fixes
+
+-   Improve WordPress logo rendering for non-retina displays. [21217](https://github.com/WordPress/gutenberg/pull/21217)
+-   Fix inserter popover direction. [21556](https://github.com/WordPress/gutenberg/pull/21556)
+-   Fix Snackbar notice bottom margin. [18858](https://github.com/WordPress/gutenberg/pull/18858)
+-   Fix YouTube Embed block from flickering and crashing on Safari. [21225](https://github.com/WordPress/gutenberg/pull/21225)
+-   Fix sibling inserter being unclickable. [21232](https://github.com/WordPress/gutenberg/pull/21232)
+-   Fix block duplication using keyboard shortcut [21317](https://github.com/WordPress/gutenberg/pull/21317)
+-   Avoid creating an empty paragraph when selecting the parent's group block [21318](https://github.com/WordPress/gutenberg/pull/21318)
+-   Fix the Buttons block margins. [21376](https://github.com/WordPress/gutenberg/pull/21376)
+-   Prevent typing on a Popover from closing the block toolbar [21421](https://github.com/WordPress/gutenberg/pull/21421)
+-   Prevent copy/paste on number inputs from copying the post content. [21457](https://github.com/WordPress/gutenberg/pull/21457)
+-   Prevent scroll jumps when focusing long blocks. [21460](https://github.com/WordPress/gutenberg/pull/21460)
+-   Fix Separator block RTL styles. [21525](https://github.com/WordPress/gutenberg/pull/21525)
+-   Make dateI18n returns be affected by `gmt` parameter. [18982](https://github.com/WordPress/gutenberg/pull/18982)
+-   Fixes the read more link added by themes in the Latest Posts block. [20541](https://github.com/WordPress/gutenberg/pull/20541)
+-   Fix the Latest Posts block when `imageDimensions` is empty [21070](https://github.com/WordPress/gutenberg/pull/21070)
+-   Fix transparent images used as Cover block backgrounds. [20904](https://github.com/WordPress/gutenberg/pull/20904)
+-   IE11: fix focus on backspace. [21092](https://github.com/WordPress/gutenberg/pull/21092)
+-   Fix IE11 breakage when hitting Enter. [21361](https://github.com/WordPress/gutenberg/pull/21361) [21366](https://github.com/WordPress/gutenberg/pull/21366)
+-   Fix block movers on full-wide blocks. [21097](https://github.com/WordPress/gutenberg/pull/21097)
+-   Fix Annotations classNames. [21184](https://github.com/WordPress/gutenberg/pull/21184)
+-   RangeControl: Fix zero value handling with number input. [21187](https://github.com/WordPress/gutenberg/pull/21187)
+-   Fix reusable block horizontal padding regression. [21312](https://github.com/WordPress/gutenberg/pull/21312)
+-   Fix fullwide margins regression. [21201](https://github.com/WordPress/gutenberg/pull/21201)
+-   Prevent the Cover block from overriding the children blocks colors [21254](https://github.com/WordPress/gutenberg/pull/21254)
+-   Fix overly verbose aria-label in Social Link block [21369](https://github.com/WordPress/gutenberg/pull/21369)
+-   Fix container block appenders and sibling inserters. [21149](https://github.com/WordPress/gutenberg/pull/21149) [21142](https://github.com/WordPress/gutenberg/pull/21142) [21143](https://github.com/WordPress/gutenberg/pull/21143)
 
 ### New APIs
 
-- @wordpress/i18n: Add create-i18n function. [21182](https://github.com/WordPress/gutenberg/pull/21182)
-- @wordpress/interface:
-  - Add screen sidebar extensibility APIs. [20698](https://github.com/WordPress/gutenberg/pull/20698) [21260](https://github.com/WordPress/gutenberg/pull/21260)
-  - Prepare for npm release. [21417](https://github.com/WordPress/gutenberg/pull/21417)
-  - Add Fullscreen mode component. [21334](https://github.com/WordPress/gutenberg/pull/21334)
-  - Add InterfaceSkeleton component. [21335](https://github.com/WordPress/gutenberg/pull/21335)
-- @wordpress/icons: Add new icons: tablet, mobile, desktop, font, share... [21261](https://github.com/WordPress/gutenberg/pull/21261) [21278](https://github.com/WordPress/gutenberg/pull/21278)
-- Support changing the Group block's DOM element. [20218](https://github.com/WordPress/gutenberg/pull/20218)
-- Block API: Add new utility to register block types from metadata in PHP [20794](https://github.com/WordPress/gutenberg/pull/20794)
-- Add radio option to the ButtonGroup component. [20805](https://github.com/WordPress/gutenberg/pull/20805)
+-   @wordpress/i18n: Add create-i18n function. [21182](https://github.com/WordPress/gutenberg/pull/21182)
+-   @wordpress/interface:
+    -   Add screen sidebar extensibility APIs. [20698](https://github.com/WordPress/gutenberg/pull/20698) [21260](https://github.com/WordPress/gutenberg/pull/21260)
+    -   Prepare for npm release. [21417](https://github.com/WordPress/gutenberg/pull/21417)
+    -   Add Fullscreen mode component. [21334](https://github.com/WordPress/gutenberg/pull/21334)
+    -   Add InterfaceSkeleton component. [21335](https://github.com/WordPress/gutenberg/pull/21335)
+-   @wordpress/icons: Add new icons: tablet, mobile, desktop, font, share... [21261](https://github.com/WordPress/gutenberg/pull/21261) [21278](https://github.com/WordPress/gutenberg/pull/21278)
+-   Support changing the Group block's DOM element. [20218](https://github.com/WordPress/gutenberg/pull/20218)
+-   Block API: Add new utility to register block types from metadata in PHP [20794](https://github.com/WordPress/gutenberg/pull/20794)
+-   Add radio option to the ButtonGroup component. [20805](https://github.com/WordPress/gutenberg/pull/20805)
 
 ### Experiments
 
-- Full site editing and Site Editor screen:
-  - Use the default post comments template for the Post Comments block. [21012](https://github.com/WordPress/gutenberg/pull/21012)
-  - Use slug as template part display label.[21161](https://github.com/WordPress/gutenberg/pull/21161)
-  - Remove duplicate queries fetching template parts [18878](https://github.com/WordPress/gutenberg/pull/18878)
-  - Preload the edited template to avoid the white page effect. [21214](https://github.com/WordPress/gutenberg/pull/21214)
-  - Move the menu item to the top level. [21273](https://github.com/WordPress/gutenberg/pull/21273)
-  - Add block breadcrumb; [21274](https://github.com/WordPress/gutenberg/pull/21274)
-  - Prevent template switcher jumpiness. [21280](https://github.com/WordPress/gutenberg/pull/21280)
-  - Increase the viewport width used for template previews. [21287](https://github.com/WordPress/gutenberg/pull/21287)
-  - Add top level inserter. [21328](https://github.com/WordPress/gutenberg/pull/21328)
-  - Apply the editor styles. [20982](https://github.com/WordPress/gutenberg/pull/20982)
-  - Update the multi-entity saving flow UI. [21159](https://github.com/WordPress/gutenberg/pull/21159)
-  - Small updates to template selector. [21202](https://github.com/WordPress/gutenberg/pull/21202)
-- New navigation screen:
-  - Bootstrap the screen. [21036](https://github.com/WordPress/gutenberg/pull/21036)
-  - Implement the initial styling. [21314](https://github.com/WordPress/gutenberg/pull/21314)
-  - Add save shortcut. [21342](https://github.com/WordPress/gutenberg/pull/21342)
-  - Fix editor shortcuts. [21338](https://github.com/WordPress/gutenberg/pull/21338)
-  - Basic responsive styles. [21414](https://github.com/WordPress/gutenberg/pull/21414)
-- Navigation block:
-  - Make the submenus usable on mobile. [21471](https://github.com/WordPress/gutenberg/pull/21471)
-  - Fix block for contributor users [18669](https://github.com/WordPress/gutenberg/pull/18669)
-  - Fix submenus being overlapped by wrapping top-level nav links. [21140](https://github.com/WordPress/gutenberg/pull/21140)
-  - Add vertical variation. [21296](https://github.com/WordPress/gutenberg/pull/21296)
-  - Show color controls in toolbar only. [20884](https://github.com/WordPress/gutenberg/pull/20884)
-  - Add capture toolbars prop to inner blocks. [21095](https://github.com/WordPress/gutenberg/pull/21095)
-- Block API Support flags:
-  - Introduce a support key for support global style colors in blocks. [21021](https://github.com/WordPress/gutenberg/pull/21021) [21428](https://github.com/WordPress/gutenberg/pull/21428)
-  - Add the possibility to support gradients using the experimental color support flag; [21481](https://github.com/WordPress/gutenberg/pull/21481)
-  - Add a block support flag for font size. [21153](https://github.com/WordPress/gutenberg/pull/21153)
-- Remove experimentalUIParts API. [20979](https://github.com/WordPress/gutenberg/pull/20979)
-- Add experimental Text component. [21088](https://github.com/WordPress/gutenberg/pull/21088)
+-   Full site editing and Site Editor screen:
+    -   Use the default post comments template for the Post Comments block. [21012](https://github.com/WordPress/gutenberg/pull/21012)
+    -   Use slug as template part display label.[21161](https://github.com/WordPress/gutenberg/pull/21161)
+    -   Remove duplicate queries fetching template parts [18878](https://github.com/WordPress/gutenberg/pull/18878)
+    -   Preload the edited template to avoid the white page effect. [21214](https://github.com/WordPress/gutenberg/pull/21214)
+    -   Move the menu item to the top level. [21273](https://github.com/WordPress/gutenberg/pull/21273)
+    -   Add block breadcrumb; [21274](https://github.com/WordPress/gutenberg/pull/21274)
+    -   Prevent template switcher jumpiness. [21280](https://github.com/WordPress/gutenberg/pull/21280)
+    -   Increase the viewport width used for template previews. [21287](https://github.com/WordPress/gutenberg/pull/21287)
+    -   Add top level inserter. [21328](https://github.com/WordPress/gutenberg/pull/21328)
+    -   Apply the editor styles. [20982](https://github.com/WordPress/gutenberg/pull/20982)
+    -   Update the multi-entity saving flow UI. [21159](https://github.com/WordPress/gutenberg/pull/21159)
+    -   Small updates to template selector. [21202](https://github.com/WordPress/gutenberg/pull/21202)
+-   New navigation screen:
+    -   Bootstrap the screen. [21036](https://github.com/WordPress/gutenberg/pull/21036)
+    -   Implement the initial styling. [21314](https://github.com/WordPress/gutenberg/pull/21314)
+    -   Add save shortcut. [21342](https://github.com/WordPress/gutenberg/pull/21342)
+    -   Fix editor shortcuts. [21338](https://github.com/WordPress/gutenberg/pull/21338)
+    -   Basic responsive styles. [21414](https://github.com/WordPress/gutenberg/pull/21414)
+-   Navigation block:
+    -   Make the submenus usable on mobile. [21471](https://github.com/WordPress/gutenberg/pull/21471)
+    -   Fix block for contributor users [18669](https://github.com/WordPress/gutenberg/pull/18669)
+    -   Fix submenus being overlapped by wrapping top-level nav links. [21140](https://github.com/WordPress/gutenberg/pull/21140)
+    -   Add vertical variation. [21296](https://github.com/WordPress/gutenberg/pull/21296)
+    -   Show color controls in toolbar only. [20884](https://github.com/WordPress/gutenberg/pull/20884)
+    -   Add capture toolbars prop to inner blocks. [21095](https://github.com/WordPress/gutenberg/pull/21095)
+-   Block API Support flags:
+    -   Introduce a support key for support global style colors in blocks. [21021](https://github.com/WordPress/gutenberg/pull/21021) [21428](https://github.com/WordPress/gutenberg/pull/21428)
+    -   Add the possibility to support gradients using the experimental color support flag; [21481](https://github.com/WordPress/gutenberg/pull/21481)
+    -   Add a block support flag for font size. [21153](https://github.com/WordPress/gutenberg/pull/21153)
+-   Remove experimentalUIParts API. [20979](https://github.com/WordPress/gutenberg/pull/20979)
+-   Add experimental Text component. [21088](https://github.com/WordPress/gutenberg/pull/21088)
 
 ### Documentation
 
-- Docs: Describe tools used in E2E testing. [21295](https://github.com/WordPress/gutenberg/pull/21295)
-- WP-env: Add reference to docker log command to show error logs in terminal. [21308](https://github.com/WordPress/gutenberg/pull/21308)
-- Docs: Add section in block RFC about register_block_type_from_metadata. [21501](https://github.com/WordPress/gutenberg/pull/21501)
-- Update serverSideRender docs to include how to use from the wp global. [18722](https://github.com/WordPress/gutenberg/pull/18722)
-- Prescribe latest NPM for development environment. [21017](https://github.com/WordPress/gutenberg/pull/21017)
-- Update Documentation on how to update post meta values from a block. [21155](https://github.com/WordPress/gutenberg/pull/21155)
-- Document getAnchorRect prop for Popover component. [17709](https://github.com/WordPress/gutenberg/pull/17709)
-- Typos and tweaks: [21228](https://github.com/WordPress/gutenberg/pull/21228), [21364](https://github.com/WordPress/gutenberg/pull/21364), [21405](https://github.com/WordPress/gutenberg/pull/21405), [20660](https://github.com/WordPress/gutenberg/pull/20660), [21297](https://github.com/WordPress/gutenberg/pull/21297).
+-   Docs: Describe tools used in E2E testing. [21295](https://github.com/WordPress/gutenberg/pull/21295)
+-   WP-env: Add reference to docker log command to show error logs in terminal. [21308](https://github.com/WordPress/gutenberg/pull/21308)
+-   Docs: Add section in block RFC about register_block_type_from_metadata. [21501](https://github.com/WordPress/gutenberg/pull/21501)
+-   Update serverSideRender docs to include how to use from the wp global. [18722](https://github.com/WordPress/gutenberg/pull/18722)
+-   Prescribe latest NPM for development environment. [21017](https://github.com/WordPress/gutenberg/pull/21017)
+-   Update Documentation on how to update post meta values from a block. [21155](https://github.com/WordPress/gutenberg/pull/21155)
+-   Document getAnchorRect prop for Popover component. [17709](https://github.com/WordPress/gutenberg/pull/17709)
+-   Typos and tweaks: [21228](https://github.com/WordPress/gutenberg/pull/21228), [21364](https://github.com/WordPress/gutenberg/pull/21364), [21405](https://github.com/WordPress/gutenberg/pull/21405), [20660](https://github.com/WordPress/gutenberg/pull/20660), [21297](https://github.com/WordPress/gutenberg/pull/21297).
 
 ### Code Quality
 
-- Add types to WordPress packages:
-  - @wordpress/element [21248](https://github.com/WordPress/gutenberg/pull/21248)
-  - @wordpress/primitives [21482](https://github.com/WordPress/gutenberg/pull/21482)
-  - @wordpress/icons [21487](https://github.com/WordPress/gutenberg/pull/21487)
-  - @wordpress/autop, @wordpress/escape-html and @wordpress/html-entities [20669](https://github.com/WordPress/gutenberg/pull/20669)
-  - @wordpress/i18n [21224](https://github.com/WordPress/gutenberg/pull/21224)
-  - @wordpress/prettier-config [21381](https://github.com/WordPress/gutenberg/pull/21381) [21053](https://github.com/WordPress/gutenberg/pull/21053)
-  - @wordpress/block-editor DOM utils. [21362](https://github.com/WordPress/gutenberg/pull/21362)
-- Update the Buttons block to use the new color support flag. [21266](https://github.com/WordPress/gutenberg/pull/21266)
-- Update the Paragraph block to use the colors support flag. [21037](https://github.com/WordPress/gutenberg/pull/21037)
-- Update the Columns block to use the colors support flag. [21038](https://github.com/WordPress/gutenberg/pull/21038)
-- Update the Heading block to use the colors support flag. [21039](https://github.com/WordPress/gutenberg/pull/21039)
-- Update the Media & Text block to use the colors support flag. [21169](https://github.com/WordPress/gutenberg/pull/21169)
-- Refactor env commands into separate files .[21353](https://github.com/WordPress/gutenberg/pull/21353)
-- Remove the deprecated `request` dependency. [21398](https://github.com/WordPress/gutenberg/pull/21398)
-- Move default styles to editor normalisation stylesheet. [19837](https://github.com/WordPress/gutenberg/pull/19837)
-- Replace lodash.assign with vanilla JS. [21054](https://github.com/WordPress/gutenberg/pull/21054)
-- Remove the old block preview implementation. [21096](https://github.com/WordPress/gutenberg/pull/21096)
-- Make RichText window/document agnostic. [21105](https://github.com/WordPress/gutenberg/pull/21105)
-- Polish a11y package. [21148](https://github.com/WordPress/gutenberg/pull/21148)
-- Fix two typos in lib rest menu controller. [21418](https://github.com/WordPress/gutenberg/pull/21418)
-- Global tips: Add period at the end of sentence. [20601](https://github.com/WordPress/gutenberg/pull/20601)
-- Lighter block DOM:
-  - Verse block [20752](https://github.com/WordPress/gutenberg/pull/20752)
-  - Code block [21079](https://github.com/WordPress/gutenberg/pull/21079)
-  - Preformatted block [21146](https://github.com/WordPress/gutenberg/pull/21146)
-- Update the padding values on the Card component to align with proposed spacing system. [21111](https://github.com/WordPress/gutenberg/pull/21111)
-- Disable scroll in PlainText component. [21115](https://github.com/WordPress/gutenberg/pull/21115)
-- Simplify inserter hasItems check. [21138](https://github.com/WordPress/gutenberg/pull/21138)
-- Avoid string concatenation for the Latest Post block read more link. [21170](https://github.com/WordPress/gutenberg/pull/21170)
+-   Add types to WordPress packages:
+    -   @wordpress/element [21248](https://github.com/WordPress/gutenberg/pull/21248)
+    -   @wordpress/primitives [21482](https://github.com/WordPress/gutenberg/pull/21482)
+    -   @wordpress/icons [21487](https://github.com/WordPress/gutenberg/pull/21487)
+    -   @wordpress/autop, @wordpress/escape-html and @wordpress/html-entities [20669](https://github.com/WordPress/gutenberg/pull/20669)
+    -   @wordpress/i18n [21224](https://github.com/WordPress/gutenberg/pull/21224)
+    -   @wordpress/prettier-config [21381](https://github.com/WordPress/gutenberg/pull/21381) [21053](https://github.com/WordPress/gutenberg/pull/21053)
+    -   @wordpress/block-editor DOM utils. [21362](https://github.com/WordPress/gutenberg/pull/21362)
+-   Update the Buttons block to use the new color support flag. [21266](https://github.com/WordPress/gutenberg/pull/21266)
+-   Update the Paragraph block to use the colors support flag. [21037](https://github.com/WordPress/gutenberg/pull/21037)
+-   Update the Columns block to use the colors support flag. [21038](https://github.com/WordPress/gutenberg/pull/21038)
+-   Update the Heading block to use the colors support flag. [21039](https://github.com/WordPress/gutenberg/pull/21039)
+-   Update the Media & Text block to use the colors support flag. [21169](https://github.com/WordPress/gutenberg/pull/21169)
+-   Refactor env commands into separate files .[21353](https://github.com/WordPress/gutenberg/pull/21353)
+-   Remove the deprecated `request` dependency. [21398](https://github.com/WordPress/gutenberg/pull/21398)
+-   Move default styles to editor normalisation stylesheet. [19837](https://github.com/WordPress/gutenberg/pull/19837)
+-   Replace lodash.assign with vanilla JS. [21054](https://github.com/WordPress/gutenberg/pull/21054)
+-   Remove the old block preview implementation. [21096](https://github.com/WordPress/gutenberg/pull/21096)
+-   Make RichText window/document agnostic. [21105](https://github.com/WordPress/gutenberg/pull/21105)
+-   Polish a11y package. [21148](https://github.com/WordPress/gutenberg/pull/21148)
+-   Fix two typos in lib rest menu controller. [21418](https://github.com/WordPress/gutenberg/pull/21418)
+-   Global tips: Add period at the end of sentence. [20601](https://github.com/WordPress/gutenberg/pull/20601)
+-   Lighter block DOM:
+    -   Verse block [20752](https://github.com/WordPress/gutenberg/pull/20752)
+    -   Code block [21079](https://github.com/WordPress/gutenberg/pull/21079)
+    -   Preformatted block [21146](https://github.com/WordPress/gutenberg/pull/21146)
+-   Update the padding values on the Card component to align with proposed spacing system. [21111](https://github.com/WordPress/gutenberg/pull/21111)
+-   Disable scroll in PlainText component. [21115](https://github.com/WordPress/gutenberg/pull/21115)
+-   Simplify inserter hasItems check. [21138](https://github.com/WordPress/gutenberg/pull/21138)
+-   Avoid string concatenation for the Latest Post block read more link. [21170](https://github.com/WordPress/gutenberg/pull/21170)
 
 ### Various
 
-- Plugin: Bump tested up to info to WP 5.4 [21400](https://github.com/WordPress/gutenberg/pull/21400)
-- Output package type declarations. [18942](https://github.com/WordPress/gutenberg/pull/18942)
-- Exclude native files from type checking. [21491](https://github.com/WordPress/gutenberg/pull/21491)
-- docgen: Optimize README update script. [18840](https://github.com/WordPress/gutenberg/pull/18840)
-- Check Latest NPM on npm install. [21521](https://github.com/WordPress/gutenberg/pull/21521)
-- E2E Tests:
-  - Improve stability of image block test [21174](https://github.com/WordPress/gutenberg/pull/21174)
-  - Improve Allowed Inner Blocks test stability [21175](https://github.com/WordPress/gutenberg/pull/21175)
-  - Use waitForSelector to wait for sidebar presence [21180](https://github.com/WordPress/gutenberg/pull/21180)
-- Unit Tests:
-  - Fix @wordpress/env testPortNumberValidation unit test. [21394](https://github.com/WordPress/gutenberg/pull/21394)
-  - Introduce react-testing-library to some existing unit tests. [20428](https://github.com/WordPress/gutenberg/pull/20428)
-  - Components: Add SlotFill test. [21226](https://github.com/WordPress/gutenberg/pull/21226)
-  - Fail E2E when page displays warning notices [13452](https://github.com/WordPress/gutenberg/pull/13452)
-- Project Management: Prompt user to link GitHub account to WordPress.org profile [21221](https://github.com/WordPress/gutenberg/pull/21221) [21384](https://github.com/WordPress/gutenberg/pull/21384)
-- @wordpress/env: Bind "core" files to tests environment [21195](https://github.com/WordPress/gutenberg/pull/21195)
-- ESLint Plugin: Continue considering unused variables after encountering exception [21354](https://github.com/WordPress/gutenberg/pull/21354)
-- Enable prettier for JSX files [21151](https://github.com/WordPress/gutenberg/pull/21151)
-- Increase severity of JSDoc linting to error. [20427](https://github.com/WordPress/gutenberg/pull/20427)
-- Add I18N specific ESLint rules. [20555](https://github.com/WordPress/gutenberg/pull/20555) [20574](https://github.com/WordPress/gutenberg/pull/20574)
-- Update uuid to v7.0.2. [21258](https://github.com/WordPress/gutenberg/pull/21258)
-- Upgrade Reakit to version 1.0.0-rc.0; [21300](https://github.com/WordPress/gutenberg/pull/21300)
-- Framework: Add package-lock precommit check for latest NPM. [21306](https://github.com/WordPress/gutenberg/pull/21306)
-- Babel Preset: Update Babel version to 7.9.x. [21419](https://github.com/WordPress/gutenberg/pull/21419)
-- ESLint Plugin: Update ESLint and related dependencies to 6.8.x. [21424](https://github.com/WordPress/gutenberg/pull/21424)
-- Framework: Configure ESLint JSDoc plugin to target TypeScript mode. [18998](https://github.com/WordPress/gutenberg/pull/18998)
-- Major version upgrade for Jest in all packages. [20766](https://github.com/WordPress/gutenberg/pull/20766)
-- Storybook:
-  - Add TreeSelect component. [20496](https://github.com/WordPress/gutenberg/pull/20496)
-  - Update AnglePickerControl title. [21089](https://github.com/WordPress/gutenberg/pull/21089)
-- Automated Testing: composer non-interactive flag for Travis. [21118](https://github.com/WordPress/gutenberg/pull/21118)
-- REST API error message: Remove unnecessary space. [21178](https://github.com/WordPress/gutenberg/pull/21178)
-- SlotFill: Guard property access to possibly-undefined slot. [21205](https://github.com/WordPress/gutenberg/pull/21205)
-- Build: Add TypeScript version validation [21208](https://github.com/WordPress/gutenberg/pull/21208)
+-   Plugin: Bump tested up to info to WP 5.4 [21400](https://github.com/WordPress/gutenberg/pull/21400)
+-   Output package type declarations. [18942](https://github.com/WordPress/gutenberg/pull/18942)
+-   Exclude native files from type checking. [21491](https://github.com/WordPress/gutenberg/pull/21491)
+-   docgen: Optimize README update script. [18840](https://github.com/WordPress/gutenberg/pull/18840)
+-   Check Latest NPM on npm install. [21521](https://github.com/WordPress/gutenberg/pull/21521)
+-   E2E Tests:
+    -   Improve stability of image block test [21174](https://github.com/WordPress/gutenberg/pull/21174)
+    -   Improve Allowed Inner Blocks test stability [21175](https://github.com/WordPress/gutenberg/pull/21175)
+    -   Use waitForSelector to wait for sidebar presence [21180](https://github.com/WordPress/gutenberg/pull/21180)
+-   Unit Tests:
+    -   Fix @wordpress/env testPortNumberValidation unit test. [21394](https://github.com/WordPress/gutenberg/pull/21394)
+    -   Introduce react-testing-library to some existing unit tests. [20428](https://github.com/WordPress/gutenberg/pull/20428)
+    -   Components: Add SlotFill test. [21226](https://github.com/WordPress/gutenberg/pull/21226)
+    -   Fail E2E when page displays warning notices [13452](https://github.com/WordPress/gutenberg/pull/13452)
+-   Project Management: Prompt user to link GitHub account to WordPress.org profile [21221](https://github.com/WordPress/gutenberg/pull/21221) [21384](https://github.com/WordPress/gutenberg/pull/21384)
+-   @wordpress/env: Bind "core" files to tests environment [21195](https://github.com/WordPress/gutenberg/pull/21195)
+-   ESLint Plugin: Continue considering unused variables after encountering exception [21354](https://github.com/WordPress/gutenberg/pull/21354)
+-   Enable prettier for JSX files [21151](https://github.com/WordPress/gutenberg/pull/21151)
+-   Increase severity of JSDoc linting to error. [20427](https://github.com/WordPress/gutenberg/pull/20427)
+-   Add I18N specific ESLint rules. [20555](https://github.com/WordPress/gutenberg/pull/20555) [20574](https://github.com/WordPress/gutenberg/pull/20574)
+-   Update uuid to v7.0.2. [21258](https://github.com/WordPress/gutenberg/pull/21258)
+-   Upgrade Reakit to version 1.0.0-rc.0; [21300](https://github.com/WordPress/gutenberg/pull/21300)
+-   Framework: Add package-lock precommit check for latest NPM. [21306](https://github.com/WordPress/gutenberg/pull/21306)
+-   Babel Preset: Update Babel version to 7.9.x. [21419](https://github.com/WordPress/gutenberg/pull/21419)
+-   ESLint Plugin: Update ESLint and related dependencies to 6.8.x. [21424](https://github.com/WordPress/gutenberg/pull/21424)
+-   Framework: Configure ESLint JSDoc plugin to target TypeScript mode. [18998](https://github.com/WordPress/gutenberg/pull/18998)
+-   Major version upgrade for Jest in all packages. [20766](https://github.com/WordPress/gutenberg/pull/20766)
+-   Storybook:
+    -   Add TreeSelect component. [20496](https://github.com/WordPress/gutenberg/pull/20496)
+    -   Update AnglePickerControl title. [21089](https://github.com/WordPress/gutenberg/pull/21089)
+-   Automated Testing: composer non-interactive flag for Travis. [21118](https://github.com/WordPress/gutenberg/pull/21118)
+-   REST API error message: Remove unnecessary space. [21178](https://github.com/WordPress/gutenberg/pull/21178)
+-   SlotFill: Guard property access to possibly-undefined slot. [21205](https://github.com/WordPress/gutenberg/pull/21205)
+-   Build: Add TypeScript version validation [21208](https://github.com/WordPress/gutenberg/pull/21208)
 
+= 7.8.1 =
 
+= 7.8.0 =
 
-= 7.8.1 =
+## Changelog
 
+### Enhancements
 
+-   Add visible labels to BlockPatternPicker pattern selection buttons [19789](https://github.com/WordPress/gutenberg/pull/19789)
+-   Adds always on display of media URL [19504](https://github.com/WordPress/gutenberg/pull/19504)
+-   Adds current menu class to navigation block [20076](https://github.com/WordPress/gutenberg/pull/20076)
+-   Block: Outline when interacting with Toolbar Block Type/Movers [20938](https://github.com/WordPress/gutenberg/pull/20938)
+-   Create block: Improve how prompts and values provided are handled [20756](https://github.com/WordPress/gutenberg/pull/20756)
+-   Expand create block options and add readme.txt template [20694](https://github.com/WordPress/gutenberg/pull/20694)
+-   Patterns: Make adding patterns easier [20854](https://github.com/WordPress/gutenberg/pull/20854)
+-   Polish a few icons [20980](https://github.com/WordPress/gutenberg/pull/20980)
+-   Polish date-picker component [20824](https://github.com/WordPress/gutenberg/pull/20824)
+-   Improve permalink editing [12009](https://github.com/WordPress/gutenberg/pull/12009)
+-   Nicer block footprint for social links [20978](https://github.com/WordPress/gutenberg/pull/20978)
+-   Show inserter only when block selected for nesting contexts [20753](https://github.com/WordPress/gutenberg/pull/20753)
+-   URL: Use test data from web-platform-tests for isURL spec conformance [20537](https://github.com/WordPress/gutenberg/pull/20537)
+-   Adds multi-select to categories on Latest Posts [20781](https://github.com/WordPress/gutenberg/pull/20781)
+-   Add basic nav block example for inserter and styles previews [21011](https://github.com/WordPress/gutenberg/pull/21011)
 
-= 7.8.0 =
+### Bug Fixes
 
-## Enhancements
-​
-- Add visible labels to BlockPatternPicker pattern selection buttons [19789](https://github.com/WordPress/gutenberg/pull/19789)
-- Adds always on display of media URL [19504](https://github.com/WordPress/gutenberg/pull/19504)
-- Adds current menu class to navigation block [20076](https://github.com/WordPress/gutenberg/pull/20076)
-- Block: Outline when interacting with Toolbar Block Type/Movers [20938](https://github.com/WordPress/gutenberg/pull/20938)
-- Create block: Improve how prompts and values provided are handled [20756](https://github.com/WordPress/gutenberg/pull/20756)
-- Expand create block options and add readme.txt template [20694](https://github.com/WordPress/gutenberg/pull/20694)
-- Patterns: Make adding patterns easier [20854](https://github.com/WordPress/gutenberg/pull/20854)
-- Polish a few icons [20980](https://github.com/WordPress/gutenberg/pull/20980)
-- Polish date-picker component [20824](https://github.com/WordPress/gutenberg/pull/20824)
-- Improve permalink editing [12009](https://github.com/WordPress/gutenberg/pull/12009)
-- Nicer block footprint for social links [20978](https://github.com/WordPress/gutenberg/pull/20978)
-- Show inserter only when block selected for nesting contexts [20753](https://github.com/WordPress/gutenberg/pull/20753)
-- URL: Use test data from web-platform-tests for isURL spec conformance [20537](https://github.com/WordPress/gutenberg/pull/20537)
-- Adds multi-select to categories on Latest Posts [20781](https://github.com/WordPress/gutenberg/pull/20781)
-- Add basic nav block example for inserter and styles previews [21011](https://github.com/WordPress/gutenberg/pull/21011)
-​
-## Bug Fixes
-​
-- Allow media library in gallery mode to be reset [20675](https://github.com/WordPress/gutenberg/pull/20675)
-- Autocomplete: Add support for results with long titles [20962](https://github.com/WordPress/gutenberg/pull/20962)
-- Compat: Conditionally filter editor settings for image dimensions [20939](https://github.com/WordPress/gutenberg/pull/20939)
-- Compat: Use core-js-url-browser for URL polyfill [20225](https://github.com/WordPress/gutenberg/pull/20225)
-- Data: Migrate post editor persistence with fullscreenMode false [21082](https://github.com/WordPress/gutenberg/pull/21082)
-- Edit Post: Make sidebar header focusable for button focus normalization [21031](https://github.com/WordPress/gutenberg/pull/21031)
-- Fix auto-hiding appender regression [20780](https://github.com/WordPress/gutenberg/pull/20780)
-- Fix fullscreen mode device preview [21010](https://github.com/WordPress/gutenberg/pull/21010)
-- Fix link control search results spacing. [21003](https://github.com/WordPress/gutenberg/pull/21003)
-- Fix snackbar container block portion of UI while present [21000](https://github.com/WordPress/gutenberg/pull/21000)
-- Make the inner button block not allowed as a reusable block or editable as HTML [20948](https://github.com/WordPress/gutenberg/pull/20948)
-- URL: Fix getQueryString incorrect handling of hash fragment [20738](https://github.com/WordPress/gutenberg/pull/20738)
-- Update social links block to output a custom class on each individual link [20998](https://github.com/WordPress/gutenberg/pull/20998)
-- Update the inserter's block preview to use the AutoHeightPreview [20817](https://github.com/WordPress/gutenberg/pull/20817)
-- Latest Posts:
-	- Fix link for read more markup [20917](https://github.com/WordPress/gutenberg/pull/20917)
-	- Fixes the categories selector crash when category does not exist [20960](https://github.com/WordPress/gutenberg/pull/20960)
-- Fix input rules [20964](https://github.com/WordPress/gutenberg/pull/20964)
-- Trim input value in navigation search input field [19832](https://github.com/WordPress/gutenberg/pull/19832)
-- Fix mobile header [20946](https://github.com/WordPress/gutenberg/pull/20946)
-- Fix visually hidden classnames [20649](https://github.com/WordPress/gutenberg/pull/20649)
-- Fix/screen reader text [20607](https://github.com/WordPress/gutenberg/pull/20607)
-- Fix SelectControl example code synax highlight [19803](https://github.com/WordPress/gutenberg/pull/19803)
-​
-## New APIs
-​
-- Add initial API to register patterns from themes and plugins [21074](https://github.com/WordPress/gutenberg/pull/21074)
-- Convert \__experimentalCreateInterpolateElement to a stable API [20699](https://github.com/WordPress/gutenberg/pull/20699)
-​
-## Experiments
-​
-- Site Editor:
-	- Add Fullscreen mode [20691](https://github.com/WordPress/gutenberg/pull/20691)
-	- Add fullscreen close button [20989](https://github.com/WordPress/gutenberg/pull/20989)
-	- Add more menu and fullscreen toggle [21006](https://github.com/WordPress/gutenberg/pull/21006)
-	- Style resets for top level page [20886](https://github.com/WordPress/gutenberg/pull/20886)
-	- Get current template part correctly for auto drafts [20438](https://github.com/WordPress/gutenberg/pull/20438)
-	- Add template preview to the edit site template switcher [20958](https://github.com/WordPress/gutenberg/pull/20958)
-	- Add things required to load custom blocks to Site Editor page [20549](https://github.com/WordPress/gutenberg/pull/20549)
-	- Avoid page templates overwriting page title [20865](https://github.com/WordPress/gutenberg/pull/20865)
-- Lighter block DOM:
-	- Group [20586](https://github.com/WordPress/gutenberg/pull/20586)
-	- Navigation [20729](https://github.com/WordPress/gutenberg/pull/20729)
-- Navigation Block:
-	- Fix dynamic rendering recursive function name typo [21078](https://github.com/WordPress/gutenberg/pull/21078)
-	- Avoid hiding submenu when adding a link [21035](https://github.com/WordPress/gutenberg/pull/21035)
-	- Fix toolbar overlap on Links [21033](https://github.com/WordPress/gutenberg/pull/21033)
-- PlainText v2 [21076](https://github.com/WordPress/gutenberg/pull/21076)
-	- Editable Component [18361](https://github.com/WordPress/gutenberg/pull/18361)
-​
-## Documentation
-​
-- Add ESNext example for unregisterBlockType [20784](https://github.com/WordPress/gutenberg/pull/20784)
-- Docs/SlotFills: Small update for consistency [20767](https://github.com/WordPress/gutenberg/pull/20767)
-- Correct 2nd param of useViewportMatch() usage [20911](https://github.com/WordPress/gutenberg/pull/20911)
-- Include `npm run dev` guidance in "Getting Started" [21015](https://github.com/WordPress/gutenberg/pull/21015)
-- Document default login credentials and `wp-env run` command [20678](https://github.com/WordPress/gutenberg/pull/20678)
-- Fixes docblock for useViewportMatch [20919](https://github.com/WordPress/gutenberg/pull/20919)
-- Lowercase visual editor and code editor to match block editor and classic editor [20968](https://github.com/WordPress/gutenberg/pull/20968)
-- Update README.md [20913](https://github.com/WordPress/gutenberg/pull/20913)
-- Add Custom Block Editor to TOC and Manifest [20749](https://github.com/WordPress/gutenberg/pull/20749)
-- Add tutorial link to Table of Contents for Custom Block Editor [20750](https://github.com/WordPress/gutenberg/pull/20750)
-​
-## Code Quality
-​
-- Block Editor: Use useResizeObserver in place of direct react-resize-aware dependency [20889](https://github.com/WordPress/gutenberg/pull/20889)
-- E2E Test Utils: Improve durability of embedding matcher [20811](https://github.com/WordPress/gutenberg/pull/20811)
-- Framework: Migrate/remove temporary compatibility script initialization [19178](https://github.com/WordPress/gutenberg/pull/19178)
-- Framework: Use WHATWG URL in place of legacy url module [19823](https://github.com/WordPress/gutenberg/pull/19823)
-- Nav Block: Remove 'frontend' from style comments [21034](https://github.com/WordPress/gutenberg/pull/21034)
-- Project Management Automation: Add TypeScript type-checking [20850](https://github.com/WordPress/gutenberg/pull/20850)
-- Refactor the inserter menu component and split into multiple smaller components [20880](https://github.com/WordPress/gutenberg/pull/20880)
-- Remove iframe from content elements [20976](https://github.com/WordPress/gutenberg/pull/20976)
-- Update Search/RSS block render method [20977](https://github.com/WordPress/gutenberg/pull/20977)
-​
-## Various
-​
-- Update glossary [20934](https://github.com/WordPress/gutenberg/pull/20934)
-- Improve performance testing [20802](https://github.com/WordPress/gutenberg/pull/20802)
-- Edit Post: Register block patterns as separate plugin [20871](https://github.com/WordPress/gutenberg/pull/20871)
-- Accessibility: updated headings to reflect semantic relationship between html tag and it's content. [16444](https://github.com/WordPress/gutenberg/pull/16444)
-- Add Prettier shared config package [20026](https://github.com/WordPress/gutenberg/pull/20026)
-- Add default styles to the TabPanel component [20872](https://github.com/WordPress/gutenberg/pull/20872)
-- Add isFileURL method and use it on all native media upload checks. [20985](https://github.com/WordPress/gutenberg/pull/20985)
-- Add menus endpoints. [20292](https://github.com/WordPress/gutenberg/pull/20292)
-- Block Patterns: Update text-two-columns.json [20890](https://github.com/WordPress/gutenberg/pull/20890)
-- Block Styles: Remove the block margin in the style selector [19983](https://github.com/WordPress/gutenberg/pull/19983)
-- Block patterns: improve success notice [21005](https://github.com/WordPress/gutenberg/pull/21005)
-- Blocks: Allow the Default Style selector to be hidden. [20620](https://github.com/WordPress/gutenberg/pull/20620)
-- E2E Tests: Mock Embed response for InnerBlocks locking test [20481](https://github.com/WordPress/gutenberg/pull/20481)
-- ESLint Plugin: Relax `prefer-const` for destructuring assignment [20737](https://github.com/WordPress/gutenberg/pull/20737)
-- Gallery: Update UI of controls [20776](https://github.com/WordPress/gutenberg/pull/20776)
-- Improves RTL style conversion [20503](https://github.com/WordPress/gutenberg/pull/20503)
-- Minor change to switch Help link target to _blank, add rels [20800](https://github.com/WordPress/gutenberg/pull/20800)
-- Mobile: Add accessibility label to Block List Footer [20633](https://github.com/WordPress/gutenberg/pull/20633)
-- Moves category multi select from LatestPosts to QueryControls [20832](https://github.com/WordPress/gutenberg/pull/20832)
-- Paste: replace iframes with url [20983](https://github.com/WordPress/gutenberg/pull/20983)
-- Polish poster image button arrangement. [20754](https://github.com/WordPress/gutenberg/pull/20754)
-- Preview Button: Remove the separator and border, and reduce the size of the icon. [20683](https://github.com/WordPress/gutenberg/pull/20683)
-- RangeControl: Improve disabled rendering and interactions [20723](https://github.com/WordPress/gutenberg/pull/20723)
-- Reduce gap between block library and preview [20777](https://github.com/WordPress/gutenberg/pull/20777)
-- Remove aria-expanded from close button in Publish panel [20993](https://github.com/WordPress/gutenberg/pull/20993)
-- Remove feature flag for mobile page templates [20718](https://github.com/WordPress/gutenberg/pull/20718)
-- Remove inaccurate message from image block [20909](https://github.com/WordPress/gutenberg/pull/20909)
-- Removed the textarea width restriction for the Shortcode block [20624](https://github.com/WordPress/gutenberg/pull/20624)
-- Revert "Framework: Travis: Avoid skipping Puppeteer download" [20828](https://github.com/WordPress/gutenberg/pull/20828)
-- Show errors in the media replace control [19244](https://github.com/WordPress/gutenberg/pull/19244)
-- Styles Panel: Don't force it to be closed by default. [20617](https://github.com/WordPress/gutenberg/pull/20617)
-- Update Navigation Menu Item icon [20763](https://github.com/WordPress/gutenberg/pull/20763)
-- Update page template picker after design review [20883](https://github.com/WordPress/gutenberg/pull/20883)
-- Latest Posts: Testing larger margins [20563](https://github.com/WordPress/gutenberg/pull/20563)
-- Add codeowners for env package [20667](https://github.com/WordPress/gutenberg/pull/20667)
-- Scripts: Update all webpack related dependencies [20916](https://github.com/WordPress/gutenberg/pull/20916)
-- Dependencies webpack plugin: Let the output file be specified when output is combined [20844](https://github.com/WordPress/gutenberg/pull/20844)
+-   Allow media library in gallery mode to be reset [20675](https://github.com/WordPress/gutenberg/pull/20675)
+-   Autocomplete: Add support for results with long titles [20962](https://github.com/WordPress/gutenberg/pull/20962)
+-   Compat: Conditionally filter editor settings for image dimensions [20939](https://github.com/WordPress/gutenberg/pull/20939)
+-   Compat: Use core-js-url-browser for URL polyfill [20225](https://github.com/WordPress/gutenberg/pull/20225)
+-   Data: Migrate post editor persistence with fullscreenMode false [21082](https://github.com/WordPress/gutenberg/pull/21082)
+-   Edit Post: Make sidebar header focusable for button focus normalization [21031](https://github.com/WordPress/gutenberg/pull/21031)
+-   Fix auto-hiding appender regression [20780](https://github.com/WordPress/gutenberg/pull/20780)
+-   Fix fullscreen mode device preview [21010](https://github.com/WordPress/gutenberg/pull/21010)
+-   Fix link control search results spacing. [21003](https://github.com/WordPress/gutenberg/pull/21003)
+-   Fix snackbar container block portion of UI while present [21000](https://github.com/WordPress/gutenberg/pull/21000)
+-   Make the inner button block not allowed as a reusable block or editable as HTML [20948](https://github.com/WordPress/gutenberg/pull/20948)
+-   URL: Fix getQueryString incorrect handling of hash fragment [20738](https://github.com/WordPress/gutenberg/pull/20738)
+-   Update social links block to output a custom class on each individual link [20998](https://github.com/WordPress/gutenberg/pull/20998)
+-   Update the inserter's block preview to use the AutoHeightPreview [20817](https://github.com/WordPress/gutenberg/pull/20817)
+-   Latest Posts:
+    -   Fix link for read more markup [20917](https://github.com/WordPress/gutenberg/pull/20917)
+    -   Fixes the categories selector crash when category does not exist [20960](https://github.com/WordPress/gutenberg/pull/20960)
+-   Fix input rules [20964](https://github.com/WordPress/gutenberg/pull/20964)
+-   Trim input value in navigation search input field [19832](https://github.com/WordPress/gutenberg/pull/19832)
+-   Fix mobile header [20946](https://github.com/WordPress/gutenberg/pull/20946)
+-   Fix visually hidden classnames [20649](https://github.com/WordPress/gutenberg/pull/20649)
+-   Fix/screen reader text [20607](https://github.com/WordPress/gutenberg/pull/20607)
+-   Fix SelectControl example code synax highlight [19803](https://github.com/WordPress/gutenberg/pull/19803)
+
+### New APIs
+
+-   Add initial API to register patterns from themes and plugins [21074](https://github.com/WordPress/gutenberg/pull/21074)
+-   Convert \_\_experimentalCreateInterpolateElement to a stable API [20699](https://github.com/WordPress/gutenberg/pull/20699)
+
+### Experiments
+
+-   Site Editor:
+    -   Add Fullscreen mode [20691](https://github.com/WordPress/gutenberg/pull/20691)
+    -   Add fullscreen close button [20989](https://github.com/WordPress/gutenberg/pull/20989)
+    -   Add more menu and fullscreen toggle [21006](https://github.com/WordPress/gutenberg/pull/21006)
+    -   Style resets for top level page [20886](https://github.com/WordPress/gutenberg/pull/20886)
+    -   Get current template part correctly for auto drafts [20438](https://github.com/WordPress/gutenberg/pull/20438)
+    -   Add template preview to the edit site template switcher [20958](https://github.com/WordPress/gutenberg/pull/20958)
+    -   Add things required to load custom blocks to Site Editor page [20549](https://github.com/WordPress/gutenberg/pull/20549)
+    -   Avoid page templates overwriting page title [20865](https://github.com/WordPress/gutenberg/pull/20865)
+-   Lighter block DOM:
+    -   Group [20586](https://github.com/WordPress/gutenberg/pull/20586)
+    -   Navigation [20729](https://github.com/WordPress/gutenberg/pull/20729)
+-   Navigation Block:
+    -   Fix dynamic rendering recursive function name typo [21078](https://github.com/WordPress/gutenberg/pull/21078)
+    -   Avoid hiding submenu when adding a link [21035](https://github.com/WordPress/gutenberg/pull/21035)
+    -   Fix toolbar overlap on Links [21033](https://github.com/WordPress/gutenberg/pull/21033)
+-   PlainText v2 [21076](https://github.com/WordPress/gutenberg/pull/21076)
+    -   Editable Component [18361](https://github.com/WordPress/gutenberg/pull/18361)
+
+### Documentation
+
+-   Add ESNext example for unregisterBlockType [20784](https://github.com/WordPress/gutenberg/pull/20784)
+-   Docs/SlotFills: Small update for consistency [20767](https://github.com/WordPress/gutenberg/pull/20767)
+-   Correct 2nd param of useViewportMatch() usage [20911](https://github.com/WordPress/gutenberg/pull/20911)
+-   Include `npm run dev` guidance in "Getting Started" [21015](https://github.com/WordPress/gutenberg/pull/21015)
+-   Document default login credentials and `wp-env run` command [20678](https://github.com/WordPress/gutenberg/pull/20678)
+-   Fixes docblock for useViewportMatch [20919](https://github.com/WordPress/gutenberg/pull/20919)
+-   Lowercase visual editor and code editor to match block editor and classic editor [20968](https://github.com/WordPress/gutenberg/pull/20968)
+-   Update README.md [20913](https://github.com/WordPress/gutenberg/pull/20913)
+-   Add Custom Block Editor to TOC and Manifest [20749](https://github.com/WordPress/gutenberg/pull/20749)
+-   Add tutorial link to Table of Contents for Custom Block Editor [20750](https://github.com/WordPress/gutenberg/pull/20750)
+
+### Code Quality
+
+-   Block Editor: Use useResizeObserver in place of direct react-resize-aware dependency [20889](https://github.com/WordPress/gutenberg/pull/20889)
+-   E2E Test Utils: Improve durability of embedding matcher [20811](https://github.com/WordPress/gutenberg/pull/20811)
+-   Framework: Migrate/remove temporary compatibility script initialization [19178](https://github.com/WordPress/gutenberg/pull/19178)
+-   Framework: Use WHATWG URL in place of legacy url module [19823](https://github.com/WordPress/gutenberg/pull/19823)
+-   Nav Block: Remove 'frontend' from style comments [21034](https://github.com/WordPress/gutenberg/pull/21034)
+-   Project Management Automation: Add TypeScript type-checking [20850](https://github.com/WordPress/gutenberg/pull/20850)
+-   Refactor the inserter menu component and split into multiple smaller components [20880](https://github.com/WordPress/gutenberg/pull/20880)
+-   Remove iframe from content elements [20976](https://github.com/WordPress/gutenberg/pull/20976)
+-   Update Search/RSS block render method [20977](https://github.com/WordPress/gutenberg/pull/20977)
+
+### Various
+
+-   Update glossary [20934](https://github.com/WordPress/gutenberg/pull/20934)
+-   Improve performance testing [20802](https://github.com/WordPress/gutenberg/pull/20802)
+-   Edit Post: Register block patterns as separate plugin [20871](https://github.com/WordPress/gutenberg/pull/20871)
+-   Accessibility: updated headings to reflect semantic relationship between html tag and it's content. [16444](https://github.com/WordPress/gutenberg/pull/16444)
+-   Add Prettier shared config package [20026](https://github.com/WordPress/gutenberg/pull/20026)
+-   Add default styles to the TabPanel component [20872](https://github.com/WordPress/gutenberg/pull/20872)
+-   Add isFileURL method and use it on all native media upload checks. [20985](https://github.com/WordPress/gutenberg/pull/20985)
+-   Add menus endpoints. [20292](https://github.com/WordPress/gutenberg/pull/20292)
+-   Block Patterns: Update text-two-columns.json [20890](https://github.com/WordPress/gutenberg/pull/20890)
+-   Block Styles: Remove the block margin in the style selector [19983](https://github.com/WordPress/gutenberg/pull/19983)
+-   Block patterns: improve success notice [21005](https://github.com/WordPress/gutenberg/pull/21005)
+-   Blocks: Allow the Default Style selector to be hidden. [20620](https://github.com/WordPress/gutenberg/pull/20620)
+-   E2E Tests: Mock Embed response for InnerBlocks locking test [20481](https://github.com/WordPress/gutenberg/pull/20481)
+-   ESLint Plugin: Relax `prefer-const` for destructuring assignment [20737](https://github.com/WordPress/gutenberg/pull/20737)
+-   Gallery: Update UI of controls [20776](https://github.com/WordPress/gutenberg/pull/20776)
+-   Improves RTL style conversion [20503](https://github.com/WordPress/gutenberg/pull/20503)
+-   Minor change to switch Help link target to \_blank, add rels [20800](https://github.com/WordPress/gutenberg/pull/20800)
+-   Mobile: Add accessibility label to Block List Footer [20633](https://github.com/WordPress/gutenberg/pull/20633)
+-   Moves category multi select from LatestPosts to QueryControls [20832](https://github.com/WordPress/gutenberg/pull/20832)
+-   Paste: replace iframes with url [20983](https://github.com/WordPress/gutenberg/pull/20983)
+-   Polish poster image button arrangement. [20754](https://github.com/WordPress/gutenberg/pull/20754)
+-   Preview Button: Remove the separator and border, and reduce the size of the icon. [20683](https://github.com/WordPress/gutenberg/pull/20683)
+-   RangeControl: Improve disabled rendering and interactions [20723](https://github.com/WordPress/gutenberg/pull/20723)
+-   Reduce gap between block library and preview [20777](https://github.com/WordPress/gutenberg/pull/20777)
+-   Remove aria-expanded from close button in Publish panel [20993](https://github.com/WordPress/gutenberg/pull/20993)
+-   Remove feature flag for mobile page templates [20718](https://github.com/WordPress/gutenberg/pull/20718)
+-   Remove inaccurate message from image block [20909](https://github.com/WordPress/gutenberg/pull/20909)
+-   Removed the textarea width restriction for the Shortcode block [20624](https://github.com/WordPress/gutenberg/pull/20624)
+-   Revert "Framework: Travis: Avoid skipping Puppeteer download" [20828](https://github.com/WordPress/gutenberg/pull/20828)
+-   Show errors in the media replace control [19244](https://github.com/WordPress/gutenberg/pull/19244)
+-   Styles Panel: Don't force it to be closed by default. [20617](https://github.com/WordPress/gutenberg/pull/20617)
+-   Update Navigation Menu Item icon [20763](https://github.com/WordPress/gutenberg/pull/20763)
+-   Update page template picker after design review [20883](https://github.com/WordPress/gutenberg/pull/20883)
+-   Latest Posts: Testing larger margins [20563](https://github.com/WordPress/gutenberg/pull/20563)
+-   Add codeowners for env package [20667](https://github.com/WordPress/gutenberg/pull/20667)
+-   Scripts: Update all webpack related dependencies [20916](https://github.com/WordPress/gutenberg/pull/20916)
+-   Dependencies webpack plugin: Let the output file be specified when output is combined [20844](https://github.com/WordPress/gutenberg/pull/20844)
 
 = 7.7.1 =
 
-### Bug Fixes
+## Changelog
 
-- Fix Drag and Drop into the columns block.
-- Fix the columns block selection.
-- Fix applying colors and backgrounds to the columns block.
-- Fix the RangeControl controlled behavior.
+### Bug Fixes
 
+-   Fix Drag and Drop into the columns block.
+-   Fix the columns block selection.
+-   Fix applying colors and backgrounds to the columns block.
+-   Fix the RangeControl controlled behavior.
 
 = 7.7.0 =
 
+## Changelog
+
 ### Features
 
-- Add the initial version of the Patterns UI as a sidebar plugin (This is not the final interface and work is in progress to integrate with the main block inserter). [20354](https://github.com/WordPress/gutenberg/pull/20354), [20715](https://github.com/WordPress/gutenberg/pull/20715).
-  - Add an initial set of patterns [20724](https://github.com/WordPress/gutenberg/pull/20724).
+-   Add the initial version of the Patterns UI as a sidebar plugin (This is not the final interface and work is in progress to integrate with the main block inserter). [20354](https://github.com/WordPress/gutenberg/pull/20354), [20715](https://github.com/WordPress/gutenberg/pull/20715).
+    -   Add an initial set of patterns [20724](https://github.com/WordPress/gutenberg/pull/20724).
 
 ### Enhancements
 
-- Update the Block and editor UI. [19344](https://github.com/WordPress/gutenberg/pull/19344)
-  - New icons. [20464](https://github.com/WordPress/gutenberg/pull/20464)
-  - Avoid empty menu groups. [20495](https://github.com/WordPress/gutenberg/pull/20495)
-  - Block Placeholders. [20441](https://github.com/WordPress/gutenberg/pull/20441), [20676](https://github.com/WordPress/gutenberg/pull/20676).
-  - Various tweaks [20679](https://github.com/WordPress/gutenberg/pull/20679), [20578](https://github.com/WordPress/gutenberg/pull/20578).
-- Improve the Back to WP Admin button in Fullscreen Mode. [20603](https://github.com/WordPress/gutenberg/pull/20603)
-- Make the editor Fullscreen by default. [20611](https://github.com/WordPress/gutenberg/pull/20611)
-- Remove template locking from the columns block [20465](https://github.com/WordPress/gutenberg/pull/20465)
-- Make the inserter full height. [20526](https://github.com/WordPress/gutenberg/pull/20526)
-
-### Bug Fixes
-
-- A11y:
-  - Deselect first/last gallery images on blur. [14930](https://github.com/WordPress/gutenberg/pull/14930)
-  - Revert top toolbar tab order [20571](https://github.com/WordPress/gutenberg/pull/20571)
-- Add an overlay to the html block preview to fix block selection in Firefox. [20425](https://github.com/WordPress/gutenberg/pull/20425)
-- Add missing accessibility attributes in the SVG icons. [20538](https://github.com/WordPress/gutenberg/pull/20538)
-- Fix invalid syntax error on Safari 12. [20507](https://github.com/WordPress/gutenberg/pull/20507)
-- Use a consistent width for the link suggetions. [20448](https://github.com/WordPress/gutenberg/pull/20448)
-- Use full labels for directional block movers. [20664](https://github.com/WordPress/gutenberg/pull/20664)
-- Columns block: Force 50% column width at mid-range viewport. [20597](https://github.com/WordPress/gutenberg/pull/20597)
-- Media & Text block: Fix frontend styles when "Crop image to fill" is selected [20539](https://github.com/WordPress/gutenberg/pull/20539)
-- Latest Post block:
-  - Fix the excerpt length. [20313](https://github.com/WordPress/gutenberg/pull/20313)
-  - Don't trim manual exerptts [20432](https://github.com/WordPress/gutenberg/pull/20432)
-- Fix sidebar scroll issue on small viewports. [20491](https://github.com/WordPress/gutenberg/pull/20491)
-- Social Link block:
-  - Escape generated class name. [20479](https://github.com/WordPress/gutenberg/pull/20479)
-  - Fix label attribute type as string. [20468](https://github.com/WordPress/gutenberg/pull/20468)
-  - i18n: Use placeholder for the default label [20475](https://github.com/WordPress/gutenberg/pull/20475)
-- Simulated Queries (Device previews):
-  - Check for match in stylesheet host and protocol to prevent Chrome breakage. [20673](https://github.com/WordPress/gutenberg/pull/20673)
-  - Fix IE11 editor breakage. [20226](https://github.com/WordPress/gutenberg/pull/20226)
-  - Fix incorrectly displayed preview option for private post types. [20604](https://github.com/WordPress/gutenberg/pull/20604)
-  - Focus preview button after opening preview. [20570](https://github.com/WordPress/gutenberg/pull/20570)
-- Fix isURL regex to take account file urls. [20435](https://github.com/WordPress/gutenberg/pull/20435)
-- Fix error when deleting empty paragraphs in IE11. [20594](https://github.com/WordPress/gutenberg/pull/20594)
-- Fix hidden inserter toggle behind the popover. [20663](https://github.com/WordPress/gutenberg/pull/20663)
-- Fix block registration shared defaults reuse across blocks. [20565](https://github.com/WordPress/gutenberg/pull/20565)
-- Shim meta attributes for early block registrations. [20544](https://github.com/WordPress/gutenberg/pull/20544)
-- Fix bouncing Custom color formatter. [20612](https://github.com/WordPress/gutenberg/pull/20612)
-- Fix Gallery block styles in Edge causing editor breakage. [20690](https://github.com/WordPress/gutenberg/pull/20690)
+-   Update the Block and editor UI. [19344](https://github.com/WordPress/gutenberg/pull/19344)
+    -   New icons. [20464](https://github.com/WordPress/gutenberg/pull/20464)
+    -   Avoid empty menu groups. [20495](https://github.com/WordPress/gutenberg/pull/20495)
+    -   Block Placeholders. [20441](https://github.com/WordPress/gutenberg/pull/20441), [20676](https://github.com/WordPress/gutenberg/pull/20676).
+    -   Various tweaks [20679](https://github.com/WordPress/gutenberg/pull/20679), [20578](https://github.com/WordPress/gutenberg/pull/20578).
+-   Improve the Back to WP Admin button in Fullscreen Mode. [20603](https://github.com/WordPress/gutenberg/pull/20603)
+-   Make the editor Fullscreen by default. [20611](https://github.com/WordPress/gutenberg/pull/20611)
+-   Remove template locking from the columns block [20465](https://github.com/WordPress/gutenberg/pull/20465)
+-   Make the inserter full height. [20526](https://github.com/WordPress/gutenberg/pull/20526)
+
+### Bug Fixes
+
+-   A11y:
+    -   Deselect first/last gallery images on blur. [14930](https://github.com/WordPress/gutenberg/pull/14930)
+    -   Revert top toolbar tab order [20571](https://github.com/WordPress/gutenberg/pull/20571)
+-   Add an overlay to the html block preview to fix block selection in Firefox. [20425](https://github.com/WordPress/gutenberg/pull/20425)
+-   Add missing accessibility attributes in the SVG icons. [20538](https://github.com/WordPress/gutenberg/pull/20538)
+-   Fix invalid syntax error on Safari 12. [20507](https://github.com/WordPress/gutenberg/pull/20507)
+-   Use a consistent width for the link suggetions. [20448](https://github.com/WordPress/gutenberg/pull/20448)
+-   Use full labels for directional block movers. [20664](https://github.com/WordPress/gutenberg/pull/20664)
+-   Columns block: Force 50% column width at mid-range viewport. [20597](https://github.com/WordPress/gutenberg/pull/20597)
+-   Media & Text block: Fix frontend styles when "Crop image to fill" is selected [20539](https://github.com/WordPress/gutenberg/pull/20539)
+-   Latest Post block:
+    -   Fix the excerpt length. [20313](https://github.com/WordPress/gutenberg/pull/20313)
+    -   Don't trim manual exerptts [20432](https://github.com/WordPress/gutenberg/pull/20432)
+-   Fix sidebar scroll issue on small viewports. [20491](https://github.com/WordPress/gutenberg/pull/20491)
+-   Social Link block:
+    -   Escape generated class name. [20479](https://github.com/WordPress/gutenberg/pull/20479)
+    -   Fix label attribute type as string. [20468](https://github.com/WordPress/gutenberg/pull/20468)
+    -   i18n: Use placeholder for the default label [20475](https://github.com/WordPress/gutenberg/pull/20475)
+-   Simulated Queries (Device previews):
+    -   Check for match in stylesheet host and protocol to prevent Chrome breakage. [20673](https://github.com/WordPress/gutenberg/pull/20673)
+    -   Fix IE11 editor breakage. [20226](https://github.com/WordPress/gutenberg/pull/20226)
+    -   Fix incorrectly displayed preview option for private post types. [20604](https://github.com/WordPress/gutenberg/pull/20604)
+    -   Focus preview button after opening preview. [20570](https://github.com/WordPress/gutenberg/pull/20570)
+-   Fix isURL regex to take account file urls. [20435](https://github.com/WordPress/gutenberg/pull/20435)
+-   Fix error when deleting empty paragraphs in IE11. [20594](https://github.com/WordPress/gutenberg/pull/20594)
+-   Fix hidden inserter toggle behind the popover. [20663](https://github.com/WordPress/gutenberg/pull/20663)
+-   Fix block registration shared defaults reuse across blocks. [20565](https://github.com/WordPress/gutenberg/pull/20565)
+-   Shim meta attributes for early block registrations. [20544](https://github.com/WordPress/gutenberg/pull/20544)
+-   Fix bouncing Custom color formatter. [20612](https://github.com/WordPress/gutenberg/pull/20612)
+-   Fix Gallery block styles in Edge causing editor breakage. [20690](https://github.com/WordPress/gutenberg/pull/20690)
 
 ### New APIs:
 
-- @wordpress/env: Add support for ZIP URL sources. [20426](https://github.com/WordPress/gutenberg/pull/20426)
+-   @wordpress/env: Add support for ZIP URL sources. [20426](https://github.com/WordPress/gutenberg/pull/20426)
 
 ### Experiments
 
-- Lighter Block DOM: allow block types to render their own wrapper [19701](https://github.com/WordPress/gutenberg/pull/19701)
-  - Lighter InnerBlocks. [19910](https://github.com/WordPress/gutenberg/pull/19910)
-  - Automatically add block class. [20658](https://github.com/WordPress/gutenberg/pull/20658)
--  BlockPreview: Add __experimentalOnReady prop. [17242](https://github.com/WordPress/gutenberg/pull/17242)
-- Edit Site:
-  - Update template navigation to use new link control. [20366](https://github.com/WordPress/gutenberg/pull/20366)
-  - Update the edit site save modal UI. [20608](https://github.com/WordPress/gutenberg/pull/20608)
-- Fix the block toolbar in the Widgets and Site Edit screens. [20458](https://github.com/WordPress/gutenberg/pull/20458)
-- Fix widgets screen inserter [20680](https://github.com/WordPress/gutenberg/pull/20680)
+-   Lighter Block DOM: allow block types to render their own wrapper [19701](https://github.com/WordPress/gutenberg/pull/19701)
+    -   Lighter InnerBlocks. [19910](https://github.com/WordPress/gutenberg/pull/19910)
+    -   Automatically add block class. [20658](https://github.com/WordPress/gutenberg/pull/20658)
+-   BlockPreview: Add \_\_experimentalOnReady prop. [17242](https://github.com/WordPress/gutenberg/pull/17242)
+-   Edit Site:
+    -   Update template navigation to use new link control. [20366](https://github.com/WordPress/gutenberg/pull/20366)
+    -   Update the edit site save modal UI. [20608](https://github.com/WordPress/gutenberg/pull/20608)
+-   Fix the block toolbar in the Widgets and Site Edit screens. [20458](https://github.com/WordPress/gutenberg/pull/20458)
+-   Fix widgets screen inserter [20680](https://github.com/WordPress/gutenberg/pull/20680)
 
 ### Documentation
 
-- Add tutorial for creating a custom block editor instance. [20410](https://github.com/WordPress/gutenberg/pull/20410)
-- Create a new "Gutenberg as a Platform" page. [20666](https://github.com/WordPress/gutenberg/pull/20666)
-- Typos and tweaks: [20382](https://github.com/WordPress/gutenberg/pull/20382), [20386](https://github.com/WordPress/gutenberg/pull/20386), [20517](https://github.com/WordPress/gutenberg/pull/20517), [20662](https://github.com/WordPress/gutenberg/pull/20662), [20454](https://github.com/WordPress/gutenberg/pull/20454), [20659](https://github.com/WordPress/gutenberg/pull/20659).
+-   Add tutorial for creating a custom block editor instance. [20410](https://github.com/WordPress/gutenberg/pull/20410)
+-   Create a new "Gutenberg as a Platform" page. [20666](https://github.com/WordPress/gutenberg/pull/20666)
+-   Typos and tweaks: [20382](https://github.com/WordPress/gutenberg/pull/20382), [20386](https://github.com/WordPress/gutenberg/pull/20386), [20517](https://github.com/WordPress/gutenberg/pull/20517), [20662](https://github.com/WordPress/gutenberg/pull/20662), [20454](https://github.com/WordPress/gutenberg/pull/20454), [20659](https://github.com/WordPress/gutenberg/pull/20659).
 
 ### Code Quality
 
-- Refactoring to existing blocks to use a lighter DOM:
-  - List block. [20498](https://github.com/WordPress/gutenberg/pull/20498)
-  - Image block. [20576](https://github.com/WordPress/gutenberg/pull/20576)
-  - Heading. [20493](https://github.com/WordPress/gutenberg/pull/20493)
-- Consistent block focus behaviour on mount. [20577](https://github.com/WordPress/gutenberg/pull/20577)
-- Cleanup CSS variables. [20529](https://github.com/WordPress/gutenberg/pull/20529)
-- Use the EditorSkeleton component in the widgets and Edit Site pages. [20440](https://github.com/WordPress/gutenberg/pull/20440), [20431](https://github.com/WordPress/gutenberg/pull/20431).
-- Refactor SlotFill components. [19242](https://github.com/WordPress/gutenberg/pull/19242)
-- Remove useless style override for floats. [20501](https://github.com/WordPress/gutenberg/pull/20501)
-- Block popover: remove data-type. [20531](https://github.com/WordPress/gutenberg/pull/20531)
-- Resizable editor improvements. [20259](https://github.com/WordPress/gutenberg/pull/20259)
+-   Refactoring to existing blocks to use a lighter DOM:
+    -   List block. [20498](https://github.com/WordPress/gutenberg/pull/20498)
+    -   Image block. [20576](https://github.com/WordPress/gutenberg/pull/20576)
+    -   Heading. [20493](https://github.com/WordPress/gutenberg/pull/20493)
+-   Consistent block focus behaviour on mount. [20577](https://github.com/WordPress/gutenberg/pull/20577)
+-   Cleanup CSS variables. [20529](https://github.com/WordPress/gutenberg/pull/20529)
+-   Use the EditorSkeleton component in the widgets and Edit Site pages. [20440](https://github.com/WordPress/gutenberg/pull/20440), [20431](https://github.com/WordPress/gutenberg/pull/20431).
+-   Refactor SlotFill components. [19242](https://github.com/WordPress/gutenberg/pull/19242)
+-   Remove useless style override for floats. [20501](https://github.com/WordPress/gutenberg/pull/20501)
+-   Block popover: remove data-type. [20531](https://github.com/WordPress/gutenberg/pull/20531)
+-   Resizable editor improvements. [20259](https://github.com/WordPress/gutenberg/pull/20259)
 
 ### Various
 
-- @wordpress/env:
-  - Save the database as a volume. [20648](https://github.com/WordPress/gutenberg/pull/20648)
-  - Fix accidental quotes in Site Title. [20520](https://github.com/WordPress/gutenberg/pull/20520)
-  - Set owner of wp-content to www-data. [20406](https://github.com/WordPress/gutenberg/pull/20406)
-- @wordpress/create-block:
-  - Fix system requirements checks. [20461](https://github.com/WordPress/gutenberg/pull/20461) [20456](https://github.com/WordPress/gutenberg/pull/20456)
-- Fix React warning triggered by the BlockToolbar component. [20546](https://github.com/WordPress/gutenberg/pull/20546)
-- Skip the Type Writer effect component in IE 11. [20485](https://github.com/WordPress/gutenberg/pull/20485)
-- Update browserslist to fix out-of-date caniuse-lite messages [20709](https://github.com/WordPress/gutenberg/pull/20709)
-- Add storybook stories:
-  - TextControl [20467](https://github.com/WordPress/gutenberg/pull/20467)
-  - TextAreaControl [20472](https://github.com/WordPress/gutenberg/pull/20472)
-  - SelectControl [20482](https://github.com/WordPress/gutenberg/pull/20482)
-  - Tooltip [20322](https://github.com/WordPress/gutenberg/pull/20322)
-- E2E Tests:
-  - Add test for the Image block. [20622](https://github.com/WordPress/gutenberg/pull/20622)
-  - More stable embed test. [20668](https://github.com/WordPress/gutenberg/pull/20668)
-  - Fix intermittent RichText e2e test failure. [20457](https://github.com/WordPress/gutenberg/pull/20457)
-- Travis: Avoid skipping Puppeteer download. [20547](https://github.com/WordPress/gutenberg/pull/20547)
-- Plugin: Bump minimum WordPress version to 5.3 [20628](https://github.com/WordPress/gutenberg/pull/20628)
-- @wordrpess/priority-queue: Fix for environments that don't have `window` defined. [20486](https://github.com/WordPress/gutenberg/pull/20486)
-- Update jest configuration to only ignore tests from /wordpress/ as a subdirectory [20420](https://github.com/WordPress/gutenberg/pull/20420)
+-   @wordpress/env:
+    -   Save the database as a volume. [20648](https://github.com/WordPress/gutenberg/pull/20648)
+    -   Fix accidental quotes in Site Title. [20520](https://github.com/WordPress/gutenberg/pull/20520)
+    -   Set owner of wp-content to www-data. [20406](https://github.com/WordPress/gutenberg/pull/20406)
+-   @wordpress/create-block:
+    -   Fix system requirements checks. [20461](https://github.com/WordPress/gutenberg/pull/20461) [20456](https://github.com/WordPress/gutenberg/pull/20456)
+-   Fix React warning triggered by the BlockToolbar component. [20546](https://github.com/WordPress/gutenberg/pull/20546)
+-   Skip the Type Writer effect component in IE 11. [20485](https://github.com/WordPress/gutenberg/pull/20485)
+-   Update browserslist to fix out-of-date caniuse-lite messages [20709](https://github.com/WordPress/gutenberg/pull/20709)
+-   Add storybook stories:
+    -   TextControl [20467](https://github.com/WordPress/gutenberg/pull/20467)
+    -   TextAreaControl [20472](https://github.com/WordPress/gutenberg/pull/20472)
+    -   SelectControl [20482](https://github.com/WordPress/gutenberg/pull/20482)
+    -   Tooltip [20322](https://github.com/WordPress/gutenberg/pull/20322)
+-   E2E Tests:
+    -   Add test for the Image block. [20622](https://github.com/WordPress/gutenberg/pull/20622)
+    -   More stable embed test. [20668](https://github.com/WordPress/gutenberg/pull/20668)
+    -   Fix intermittent RichText e2e test failure. [20457](https://github.com/WordPress/gutenberg/pull/20457)
+-   Travis: Avoid skipping Puppeteer download. [20547](https://github.com/WordPress/gutenberg/pull/20547)
+-   Plugin: Bump minimum WordPress version to 5.3 [20628](https://github.com/WordPress/gutenberg/pull/20628)
+-   @wordrpess/priority-queue: Fix for environments that don't have `window` defined. [20486](https://github.com/WordPress/gutenberg/pull/20486)
+-   Update jest configuration to only ignore tests from /wordpress/ as a subdirectory [20420](https://github.com/WordPress/gutenberg/pull/20420)
 
+= 7.6.0 =
 
+## Changelog
 
-= 7.6.0 =
+### Features
+
+-   Add a rotating list of tips to the inserter help panel [20163](https://github.com/WordPress/gutenberg/pull/20163)
+
+### Enhancements
 
-## Features
-- Add a rotating list of tips to the inserter help panel [20163](https://github.com/WordPress/gutenberg/pull/20163)
-
-## Enhancements
-- Improve find-ability for social/video embeds [20224](https://github.com/WordPress/gutenberg/pull/20224)
-
-## New APIs
-- Ensure packages-update wp-scripts command works with missing dependencies [20408](https://github.com/WordPress/gutenberg/pull/20408)
-- Add new option in dependencies webpack plugin to combine assets files into one file [20330](https://github.com/WordPress/gutenberg/pull/20330)
-- Environment:
-    - Add custom port numbers to .wp-env.json [20158](https://github.com/WordPress/gutenberg/pull/20158)
-    - Add support for local override files. [20341](https://github.com/WordPress/gutenberg/pull/20341)
-    - Add debug mode. [20348](https://github.com/WordPress/gutenberg/pull/20348)
-
-## Experimental
-- New blocks:
-    - Post Featured Image. [19875](https://github.com/WordPress/gutenberg/pull/19875)
-    - Comments Count block. [19953](https://github.com/WordPress/gutenberg/pull/19953)
-    - Comments Form block. [19954](https://github.com/WordPress/gutenberg/pull/19954)
-    - Post Tags block. [19580](https://github.com/WordPress/gutenberg/pull/19580)
-- Add new features to the Post Excerpt block. [19715](https://github.com/WordPress/gutenberg/pull/19715)
-- Allow changing Site Title block heading level. [20361](https://github.com/WordPress/gutenberg/pull/20361)
-- Render the post comments form properly [20279](https://github.com/WordPress/gutenberg/pull/20279)
-- Add new features to the Post Date block. [19857](https://github.com/WordPress/gutenberg/pull/19857)
-- Add multiple template loading [19141](https://github.com/WordPress/gutenberg/pull/19141)
-- Show error when resolved block template is empty [20239](https://github.com/WordPress/gutenberg/pull/20239)
-
-## Bug Fixes
-- Overflowing `LinkControl` block editor component. [20154](https://github.com/WordPress/gutenberg/pull/20154)
-- Broken gallery to image transform and inconsistent types used in the gallery block [20084](https://github.com/WordPress/gutenberg/pull/20084)
-- Missing label on heading toolbar. [20248](https://github.com/WordPress/gutenberg/pull/20248)
-- Sidebar jumpiness. [20355](https://github.com/WordPress/gutenberg/pull/20355)
-- Fix wrong imports in PluginBlockSettingsMenuItem [20356](https://github.com/WordPress/gutenberg/pull/20356)
-- Color formatter appears when color choosing is not possible [20222](https://github.com/WordPress/gutenberg/pull/20222)
-- Crash when updating a post with the latest post block [20289](https://github.com/WordPress/gutenberg/pull/20289)
-- Inconsistency on Import from JSON button look [20416](https://github.com/WordPress/gutenberg/pull/20416)
-- Inline image width pop-up 'wanders' down page [20232](https://github.com/WordPress/gutenberg/pull/20232)
-- Styling problem on vertically aligned blocks [20368](https://github.com/WordPress/gutenberg/pull/20368)
-- Remove unnecessary aria-label from link formatter [18742](https://github.com/WordPress/gutenberg/pull/18742)
-- Make navigation button expand to fit longer nav link text [20230](https://github.com/WordPress/gutenberg/pull/20230)
-- Flow for gallery creation and editing [20287](https://github.com/WordPress/gutenberg/pull/20287)
-- Fix background color for dark themes on the spacer block [20296](https://github.com/WordPress/gutenberg/pull/20296)
-- Show metaboxes peeking in even on tiny screens. [20262](https://github.com/WordPress/gutenberg/pull/20262)
-- Add an edit state to media frames to fix an issue when opening a new tab. [17642](https://github.com/WordPress/gutenberg/pull/17642)
-
-## Documentation
-- Add a basic storybook story listing all the @wordpress/icons [20266](https://github.com/WordPress/gutenberg/pull/20266)
-- Add docs for variations in the block registration section [20145](https://github.com/WordPress/gutenberg/pull/20145)
-- Improve README for `<LinkControl />` component. [19677](https://github.com/WordPress/gutenberg/pull/19677)
-- Remove the devhub manifest file [20175](https://github.com/WordPress/gutenberg/pull/20175)
-- Several documentation improvements and typo fixes: [20385](https://github.com/WordPress/gutenberg/pull/20385), [20378](https://github.com/WordPress/gutenberg/pull/20378), [20392](https://github.com/WordPress/gutenberg/pull/20392), [20381](https://github.com/WordPress/gutenberg/pull/20381), [20388](https://github.com/WordPress/gutenberg/pull/20388), [20371](https://github.com/WordPress/gutenberg/pull/20371), [20380](https://github.com/WordPress/gutenberg/pull/20380), [20384](https://github.com/WordPress/gutenberg/pull/20384), [20379](https://github.com/WordPress/gutenberg/pull/20379), [20391](https://github.com/WordPress/gutenberg/pull/20391), [20251](https://github.com/WordPress/gutenberg/pull/20251)
-
-## Various
-- Create block: Add support for `format:js` to ESNext template [20335](https://github.com/WordPress/gutenberg/pull/20335)
-- Add check for minimum system requirements on create block [20398](https://github.com/WordPress/gutenberg/pull/20398)
-- Conditionally apply Editor Skeleton html element styles [20245](https://github.com/WordPress/gutenberg/pull/20245)
-- Environment:
-    - Check for legacy installs and provide the option to delete them. [20340](https://github.com/WordPress/gutenberg/pull/20340)
-    - Fix testsPath on local sources [20353](https://github.com/WordPress/gutenberg/pull/20353)
-    - Use user with UID=33 to run WP CLI commands [20403](https://github.com/WordPress/gutenberg/pull/20403)
-    - Fix issue where docker & wp had different URLs [20228](https://github.com/WordPress/gutenberg/pull/20228)
-    - No longer show error message twice [20157](https://github.com/WordPress/gutenberg/pull/20157)
-    - Support wp-config.php overrides. [20352](https://github.com/WordPress/gutenberg/pull/20352)
-    - Support overwriting generated file directory with an environment variable [20253](https://github.com/WordPress/gutenberg/pull/20253)
+-   Improve find-ability for social/video embeds [20224](https://github.com/WordPress/gutenberg/pull/20224)
+
+### New APIs
+
+-   Ensure packages-update wp-scripts command works with missing dependencies [20408](https://github.com/WordPress/gutenberg/pull/20408)
+-   Add new option in dependencies webpack plugin to combine assets files into one file [20330](https://github.com/WordPress/gutenberg/pull/20330)
+-   Environment:
+    -   Add custom port numbers to .wp-env.json [20158](https://github.com/WordPress/gutenberg/pull/20158)
+    -   Add support for local override files. [20341](https://github.com/WordPress/gutenberg/pull/20341)
+    -   Add debug mode. [20348](https://github.com/WordPress/gutenberg/pull/20348)
+
+### Experimental
+
+-   New blocks:
+    -   Post Featured Image. [19875](https://github.com/WordPress/gutenberg/pull/19875)
+    -   Comments Count block. [19953](https://github.com/WordPress/gutenberg/pull/19953)
+    -   Comments Form block. [19954](https://github.com/WordPress/gutenberg/pull/19954)
+    -   Post Tags block. [19580](https://github.com/WordPress/gutenberg/pull/19580)
+-   Add new features to the Post Excerpt block. [19715](https://github.com/WordPress/gutenberg/pull/19715)
+-   Allow changing Site Title block heading level. [20361](https://github.com/WordPress/gutenberg/pull/20361)
+-   Render the post comments form properly [20279](https://github.com/WordPress/gutenberg/pull/20279)
+-   Add new features to the Post Date block. [19857](https://github.com/WordPress/gutenberg/pull/19857)
+-   Add multiple template loading [19141](https://github.com/WordPress/gutenberg/pull/19141)
+-   Show error when resolved block template is empty [20239](https://github.com/WordPress/gutenberg/pull/20239)
+
+### Bug Fixes
+
+-   Overflowing `LinkControl` block editor component. [20154](https://github.com/WordPress/gutenberg/pull/20154)
+-   Broken gallery to image transform and inconsistent types used in the gallery block [20084](https://github.com/WordPress/gutenberg/pull/20084)
+-   Missing label on heading toolbar. [20248](https://github.com/WordPress/gutenberg/pull/20248)
+-   Sidebar jumpiness. [20355](https://github.com/WordPress/gutenberg/pull/20355)
+-   Fix wrong imports in PluginBlockSettingsMenuItem [20356](https://github.com/WordPress/gutenberg/pull/20356)
+-   Color formatter appears when color choosing is not possible [20222](https://github.com/WordPress/gutenberg/pull/20222)
+-   Crash when updating a post with the latest post block [20289](https://github.com/WordPress/gutenberg/pull/20289)
+-   Inconsistency on Import from JSON button look [20416](https://github.com/WordPress/gutenberg/pull/20416)
+-   Inline image width pop-up 'wanders' down page [20232](https://github.com/WordPress/gutenberg/pull/20232)
+-   Styling problem on vertically aligned blocks [20368](https://github.com/WordPress/gutenberg/pull/20368)
+-   Remove unnecessary aria-label from link formatter [18742](https://github.com/WordPress/gutenberg/pull/18742)
+-   Make navigation button expand to fit longer nav link text [20230](https://github.com/WordPress/gutenberg/pull/20230)
+-   Flow for gallery creation and editing [20287](https://github.com/WordPress/gutenberg/pull/20287)
+-   Fix background color for dark themes on the spacer block [20296](https://github.com/WordPress/gutenberg/pull/20296)
+-   Show metaboxes peeking in even on tiny screens. [20262](https://github.com/WordPress/gutenberg/pull/20262)
+-   Add an edit state to media frames to fix an issue when opening a new tab. [17642](https://github.com/WordPress/gutenberg/pull/17642)
+
+### Documentation
+
+-   Add a basic storybook story listing all the @wordpress/icons [20266](https://github.com/WordPress/gutenberg/pull/20266)
+-   Add docs for variations in the block registration section [20145](https://github.com/WordPress/gutenberg/pull/20145)
+-   Improve README for `<LinkControl />` component. [19677](https://github.com/WordPress/gutenberg/pull/19677)
+-   Remove the devhub manifest file [20175](https://github.com/WordPress/gutenberg/pull/20175)
+-   Several documentation improvements and typo fixes: [20385](https://github.com/WordPress/gutenberg/pull/20385), [20378](https://github.com/WordPress/gutenberg/pull/20378), [20392](https://github.com/WordPress/gutenberg/pull/20392), [20381](https://github.com/WordPress/gutenberg/pull/20381), [20388](https://github.com/WordPress/gutenberg/pull/20388), [20371](https://github.com/WordPress/gutenberg/pull/20371), [20380](https://github.com/WordPress/gutenberg/pull/20380), [20384](https://github.com/WordPress/gutenberg/pull/20384), [20379](https://github.com/WordPress/gutenberg/pull/20379), [20391](https://github.com/WordPress/gutenberg/pull/20391), [20251](https://github.com/WordPress/gutenberg/pull/20251)
+
+### Various
+
+-   Create block: Add support for `format:js` to ESNext template [20335](https://github.com/WordPress/gutenberg/pull/20335)
+-   Add check for minimum system requirements on create block [20398](https://github.com/WordPress/gutenberg/pull/20398)
+-   Conditionally apply Editor Skeleton html element styles [20245](https://github.com/WordPress/gutenberg/pull/20245)
+-   Environment:
+    -   Check for legacy installs and provide the option to delete them. [20340](https://github.com/WordPress/gutenberg/pull/20340)
+    -   Fix testsPath on local sources [20353](https://github.com/WordPress/gutenberg/pull/20353)
+    -   Use user with UID=33 to run WP CLI commands [20403](https://github.com/WordPress/gutenberg/pull/20403)
+    -   Fix issue where docker & wp had different URLs [20228](https://github.com/WordPress/gutenberg/pull/20228)
+    -   No longer show error message twice [20157](https://github.com/WordPress/gutenberg/pull/20157)
+    -   Support wp-config.php overrides. [20352](https://github.com/WordPress/gutenberg/pull/20352)
+    -   Support overwriting generated file directory with an environment variable [20253](https://github.com/WordPress/gutenberg/pull/20253)
 
 = 7.5.0 =
 
-## Features
-
-- Mark the Social Links block as a stable block [20134](https://github.com/WordPress/gutenberg/pull/20134) [19887](https://github.com/WordPress/gutenberg/pull/19887) [20074](https://github.com/WordPress/gutenberg/pull/20074) [20150](https://github.com/WordPress/gutenberg/pull/20150) [20101](https://github.com/WordPress/gutenberg/pull/20101)
-- Support aadding featured images to Latest Posts block [17151](https://github.com/WordPress/gutenberg/pull/17151)
-- Add support for TikTok video Embeds [19345](https://github.com/WordPress/gutenberg/pull/19345)
-- Add inline text color support [16014](https://github.com/WordPress/gutenberg/pull/16014)
-- Add text color support to Columns block [20016](https://github.com/WordPress/gutenberg/pull/20016)
-
-## Enhancements
-
-- Add type and angle picking to the custom gradient component [19582](https://github.com/WordPress/gutenberg/pull/19582)
-- Add transform for button to buttons block [20063](https://github.com/WordPress/gutenberg/pull/20063)
-- Navigation block:
-	- Implement new design for sub-menus [19681](https://github.com/WordPress/gutenberg/pull/19681)
-	- Set inherit color to anchor elements [20038](https://github.com/WordPress/gutenberg/pull/20038)
-	- Fix getting Navigation parent block [20032](https://github.com/WordPress/gutenberg/pull/20032) [20057](https://github.com/WordPress/gutenberg/pull/20057)
-	- Set width in order to show caret [20075](https://github.com/WordPress/gutenberg/pull/20075)
-    - Improve colors handling [20022](https://github.com/WordPress/gutenberg/pull/20022)
-    - Rename background color CSS class [20018](https://github.com/WordPress/gutenberg/pull/20018)
-- Block Library: Avoid column width auto-adjustment when sibling width changes [19515](https://github.com/WordPress/gutenberg/pull/19515) [20169](https://github.com/WordPress/gutenberg/pull/20169)
-- A11y:
-    - Incorporate settings in the edit state of the LinkControl component [20052](https://github.com/WordPress/gutenberg/pull/20052)
-    - Announce all Notice components messages [15745](https://github.com/WordPress/gutenberg/pull/15745)
-    - Button block: Remove title attribute [19735](https://github.com/WordPress/gutenberg/pull/19735)
-    - Navigation block: Remove title attribute [19990](https://github.com/WordPress/gutenberg/pull/19990)
-- Image block: Keep existing caption if the stored one is empty [19641](https://github.com/WordPress/gutenberg/pull/19641)
-- Enhance the custom gradient picker UI [20099](https://github.com/WordPress/gutenberg/pull/20099)
-
-## New APIs
-
-- Allow third-party keyboard shortcuts registration in the keyboard shortcuts modal [19965](https://github.com/WordPress/gutenberg/pull/19965)
-- Stabilize the AnglePickerControl component [20118](https://github.com/WordPress/gutenberg/pull/20118)
-- Add .wp-env.json config file support to @wordpress/env [20002](https://github.com/WordPress/gutenberg/pull/20002)
-- Blocks: Promote block variations to stable API [20068](https://github.com/WordPress/gutenberg/pull/20068)
-- Mark the gradients theme API as stable [20107](https://github.com/WordPress/gutenberg/pull/20107)
-
-## Experimental
-
-- Add ability to disable the block popover through __experimentalUIParts.hasPopover option [19922](https://github.com/WordPress/gutenberg/pull/19922)
-- Add the __experimentalEditorSkeleton component to the block-editor package [20050](https://github.com/WordPress/gutenberg/pull/20050) [20132](https://github.com/WordPress/gutenberg/pull/20132)
-
-## Bug Fixes
-
-- A11y: Show open button when the sidebar is closed and tabbing out of the content [19726](https://github.com/WordPress/gutenberg/pull/19726)
-- IE11 Compatibility: Add DOMRect polyfill [20110](https://github.com/WordPress/gutenberg/pull/20110)
-- Block Editor: Fix warning when rendering InnerBlocks [20082](https://github.com/WordPress/gutenberg/pull/20082)
-- Featured image appears cropped [20128](https://github.com/WordPress/gutenberg/pull/20128)
-- Fix predefined text colors used in the Group block on the frontend [20119](https://github.com/WordPress/gutenberg/pull/20119)
-- Use array form for contrast checkers. [20143](https://github.com/WordPress/gutenberg/pull/20143)
-- i18n: make experimentalUseColors labels translatable [20112](https://github.com/WordPress/gutenberg/pull/20112)
-- Multi select: remove inserter between selected blocks [20096](https://github.com/WordPress/gutenberg/pull/20096)
-- Remove alignment options from nested Button blocks [19824](https://github.com/WordPress/gutenberg/pull/19824)
-- URL: Conform to URL Living Standard definition of valid URL [19871](https://github.com/WordPress/gutenberg/pull/19871)
-- Select the correct media in the media modal when replacing existing media [20100](https://github.com/WordPress/gutenberg/pull/20100)
-- Avoid resizing the editor canvas when opening the publish panel [19843](https://github.com/WordPress/gutenberg/pull/19843)
-- Fix Media & Text block styling when media is set to show on the right [20125](https://github.com/WordPress/gutenberg/pull/20125)
-- Fix excerpt rendering in the Latest posts block [19669](https://github.com/WordPress/gutenberg/pull/19669)
-
-## Documentation
-
-- Docs: Contributor Guide update subpages [19939](https://github.com/WordPress/gutenberg/pull/19939)
-- Prettier: Update format-js to use default config, and update editor docs usage [20036](https://github.com/WordPress/gutenberg/pull/20036)
-- Target docs to manifest.json [15639](https://github.com/WordPress/gutenberg/pull/15639)
-- Update main project README [19743](https://github.com/WordPress/gutenberg/pull/19743)
-- Update the Getting Started Docs to use `wp-env` [20044](https://github.com/WordPress/gutenberg/pull/20044)
-- Typos and tweaks: [20055](https://github.com/WordPress/gutenberg/pull/20055) [20077](https://github.com/WordPress/gutenberg/pull/20077) [20025](https://github.com/WordPress/gutenberg/pull/20025) [20060](https://github.com/WordPress/gutenberg/pull/20060) [19470](https://github.com/WordPress/gutenberg/pull/19470)
-
-## Various
-
-- Block Editor: Update BEM syntax to CSS modifer guidelines [19738](https://github.com/WordPress/gutenberg/pull/19738)
-- Block Library: Standardize PHP function names used [20085](https://github.com/WordPress/gutenberg/pull/20085) [20039](https://github.com/WordPress/gutenberg/pull/20039)
-- Project Management Automation:
-	- Log skipped tasks and retain wrapped task names. [20034](https://github.com/WordPress/gutenberg/pull/20034)
-	- Support adding milestones for fork PRs. [20058](https://github.com/WordPress/gutenberg/pull/20058)
-	- Avoid gracefully handling error [20009](https://github.com/WordPress/gutenberg/pull/20009)
-	- Avoid milestone task for forks [20049](https://github.com/WordPress/gutenberg/pull/20049)
-	- Call core setFailed with error message [20012](https://github.com/WordPress/gutenberg/pull/20012)
-	- Check error object for parsed errors [20014](https://github.com/WordPress/gutenberg/pull/20014)
-	- Guard against non-matching commits in `addMilestone`. [20147](https://github.com/WordPress/gutenberg/pull/20147)
-	- Tolerate duplicate milestone [20011](https://github.com/WordPress/gutenberg/pull/20011)
-    - Pull Request Automation: Avoid automation tasks for forked repository [20021](https://github.com/WordPress/gutenberg/pull/20021)
-- @wordpress/env:
-	- Fix GitHub source pattern [20131](https://github.com/WordPress/gutenberg/pull/20131)
-	- Fix syntax error where spread operator could fail [20113](https://github.com/WordPress/gutenberg/pull/20113)
-- Move existing icons to the @wordpress/icons package [20091](https://github.com/WordPress/gutenberg/pull/20091) [20072](https://github.com/WordPress/gutenberg/pull/20072) [19959](https://github.com/WordPress/gutenberg/pull/19959) [20094](https://github.com/WordPress/gutenberg/pull/20094) [20087](https://github.com/WordPress/gutenberg/pull/20087)
-- Ensure the default Prettier config is used with `lint-js` when needed [20071](https://github.com/WordPress/gutenberg/pull/20071)
-- Data: Log first-pass `useSelect` errors [20122](https://github.com/WordPress/gutenberg/pull/20122)
-- Compat: Social Links: Remove legacy renderers from packages [20098](https://github.com/WordPress/gutenberg/pull/20098)
-- Core Data: Mark the `getEntityRecordNoResolver` selector as experimental. [20053](https://github.com/WordPress/gutenberg/pull/20053)
-- Core Data: Remove unused `__experimentalUseEntitySaving` hook. [20148](https://github.com/WordPress/gutenberg/pull/20148)
-- Hide the navigation block behind feature flag [20133](https://github.com/WordPress/gutenberg/pull/20133)
-- Fix Intermitent e2e test failures [20065](https://github.com/WordPress/gutenberg/pull/20065)
-- Move the e2e tests to the right folders [20135](https://github.com/WordPress/gutenberg/pull/20135)
-- Switch social link icons to import svg parts from primitives [19877](https://github.com/WordPress/gutenberg/pull/19877)
+## Changelog
+
+### Features
+
+-   Mark the Social Links block as a stable block [20134](https://github.com/WordPress/gutenberg/pull/20134) [19887](https://github.com/WordPress/gutenberg/pull/19887) [20074](https://github.com/WordPress/gutenberg/pull/20074) [20150](https://github.com/WordPress/gutenberg/pull/20150) [20101](https://github.com/WordPress/gutenberg/pull/20101)
+-   Support aadding featured images to Latest Posts block [17151](https://github.com/WordPress/gutenberg/pull/17151)
+-   Add support for TikTok video Embeds [19345](https://github.com/WordPress/gutenberg/pull/19345)
+-   Add inline text color support [16014](https://github.com/WordPress/gutenberg/pull/16014)
+-   Add text color support to Columns block [20016](https://github.com/WordPress/gutenberg/pull/20016)
+
+### Enhancements
+
+-   Add type and angle picking to the custom gradient component [19582](https://github.com/WordPress/gutenberg/pull/19582)
+-   Add transform for button to buttons block [20063](https://github.com/WordPress/gutenberg/pull/20063)
+-   Navigation block:
+    -   Implement new design for sub-menus [19681](https://github.com/WordPress/gutenberg/pull/19681)
+    -   Set inherit color to anchor elements [20038](https://github.com/WordPress/gutenberg/pull/20038)
+    -   Fix getting Navigation parent block [20032](https://github.com/WordPress/gutenberg/pull/20032) [20057](https://github.com/WordPress/gutenberg/pull/20057)
+    -   Set width in order to show caret [20075](https://github.com/WordPress/gutenberg/pull/20075)
+        -   Improve colors handling [20022](https://github.com/WordPress/gutenberg/pull/20022)
+        -   Rename background color CSS class [20018](https://github.com/WordPress/gutenberg/pull/20018)
+-   Block Library: Avoid column width auto-adjustment when sibling width changes [19515](https://github.com/WordPress/gutenberg/pull/19515) [20169](https://github.com/WordPress/gutenberg/pull/20169)
+-   A11y:
+    -   Incorporate settings in the edit state of the LinkControl component [20052](https://github.com/WordPress/gutenberg/pull/20052)
+    -   Announce all Notice components messages [15745](https://github.com/WordPress/gutenberg/pull/15745)
+    -   Button block: Remove title attribute [19735](https://github.com/WordPress/gutenberg/pull/19735)
+    -   Navigation block: Remove title attribute [19990](https://github.com/WordPress/gutenberg/pull/19990)
+-   Image block: Keep existing caption if the stored one is empty [19641](https://github.com/WordPress/gutenberg/pull/19641)
+-   Enhance the custom gradient picker UI [20099](https://github.com/WordPress/gutenberg/pull/20099)
+
+### New APIs
+
+-   Allow third-party keyboard shortcuts registration in the keyboard shortcuts modal [19965](https://github.com/WordPress/gutenberg/pull/19965)
+-   Stabilize the AnglePickerControl component [20118](https://github.com/WordPress/gutenberg/pull/20118)
+-   Add .wp-env.json config file support to @wordpress/env [20002](https://github.com/WordPress/gutenberg/pull/20002)
+-   Blocks: Promote block variations to stable API [20068](https://github.com/WordPress/gutenberg/pull/20068)
+-   Mark the gradients theme API as stable [20107](https://github.com/WordPress/gutenberg/pull/20107)
+
+### Experimental
+
+-   Add ability to disable the block popover through \_\_experimentalUIParts.hasPopover option [19922](https://github.com/WordPress/gutenberg/pull/19922)
+-   Add the \_\_experimentalEditorSkeleton component to the block-editor package [20050](https://github.com/WordPress/gutenberg/pull/20050) [20132](https://github.com/WordPress/gutenberg/pull/20132)
+
+### Bug Fixes
+
+-   A11y: Show open button when the sidebar is closed and tabbing out of the content [19726](https://github.com/WordPress/gutenberg/pull/19726)
+-   IE11 Compatibility: Add DOMRect polyfill [20110](https://github.com/WordPress/gutenberg/pull/20110)
+-   Block Editor: Fix warning when rendering InnerBlocks [20082](https://github.com/WordPress/gutenberg/pull/20082)
+-   Featured image appears cropped [20128](https://github.com/WordPress/gutenberg/pull/20128)
+-   Fix predefined text colors used in the Group block on the frontend [20119](https://github.com/WordPress/gutenberg/pull/20119)
+-   Use array form for contrast checkers. [20143](https://github.com/WordPress/gutenberg/pull/20143)
+-   i18n: make experimentalUseColors labels translatable [20112](https://github.com/WordPress/gutenberg/pull/20112)
+-   Multi select: remove inserter between selected blocks [20096](https://github.com/WordPress/gutenberg/pull/20096)
+-   Remove alignment options from nested Button blocks [19824](https://github.com/WordPress/gutenberg/pull/19824)
+-   URL: Conform to URL Living Standard definition of valid URL [19871](https://github.com/WordPress/gutenberg/pull/19871)
+-   Select the correct media in the media modal when replacing existing media [20100](https://github.com/WordPress/gutenberg/pull/20100)
+-   Avoid resizing the editor canvas when opening the publish panel [19843](https://github.com/WordPress/gutenberg/pull/19843)
+-   Fix Media & Text block styling when media is set to show on the right [20125](https://github.com/WordPress/gutenberg/pull/20125)
+-   Fix excerpt rendering in the Latest posts block [19669](https://github.com/WordPress/gutenberg/pull/19669)
+
+### Documentation
+
+-   Docs: Contributor Guide update subpages [19939](https://github.com/WordPress/gutenberg/pull/19939)
+-   Prettier: Update format-js to use default config, and update editor docs usage [20036](https://github.com/WordPress/gutenberg/pull/20036)
+-   Target docs to manifest.json [15639](https://github.com/WordPress/gutenberg/pull/15639)
+-   Update main project README [19743](https://github.com/WordPress/gutenberg/pull/19743)
+-   Update the Getting Started Docs to use `wp-env` [20044](https://github.com/WordPress/gutenberg/pull/20044)
+-   Typos and tweaks: [20055](https://github.com/WordPress/gutenberg/pull/20055) [20077](https://github.com/WordPress/gutenberg/pull/20077) [20025](https://github.com/WordPress/gutenberg/pull/20025) [20060](https://github.com/WordPress/gutenberg/pull/20060) [19470](https://github.com/WordPress/gutenberg/pull/19470)
+
+### Various
 
+-   Block Editor: Update BEM syntax to CSS modifer guidelines [19738](https://github.com/WordPress/gutenberg/pull/19738)
+-   Block Library: Standardize PHP function names used [20085](https://github.com/WordPress/gutenberg/pull/20085) [20039](https://github.com/WordPress/gutenberg/pull/20039)
+-   Project Management Automation:
+    -   Log skipped tasks and retain wrapped task names. [20034](https://github.com/WordPress/gutenberg/pull/20034)
+    -   Support adding milestones for fork PRs. [20058](https://github.com/WordPress/gutenberg/pull/20058)
+    -   Avoid gracefully handling error [20009](https://github.com/WordPress/gutenberg/pull/20009)
+    -   Avoid milestone task for forks [20049](https://github.com/WordPress/gutenberg/pull/20049)
+    -   Call core setFailed with error message [20012](https://github.com/WordPress/gutenberg/pull/20012)
+    -   Check error object for parsed errors [20014](https://github.com/WordPress/gutenberg/pull/20014)
+    -   Guard against non-matching commits in `addMilestone`. [20147](https://github.com/WordPress/gutenberg/pull/20147)
+    -   Tolerate duplicate milestone [20011](https://github.com/WordPress/gutenberg/pull/20011)
+        -   Pull Request Automation: Avoid automation tasks for forked repository [20021](https://github.com/WordPress/gutenberg/pull/20021)
+-   @wordpress/env:
+    -   Fix GitHub source pattern [20131](https://github.com/WordPress/gutenberg/pull/20131)
+    -   Fix syntax error where spread operator could fail [20113](https://github.com/WordPress/gutenberg/pull/20113)
+-   Move existing icons to the @wordpress/icons package [20091](https://github.com/WordPress/gutenberg/pull/20091) [20072](https://github.com/WordPress/gutenberg/pull/20072) [19959](https://github.com/WordPress/gutenberg/pull/19959) [20094](https://github.com/WordPress/gutenberg/pull/20094) [20087](https://github.com/WordPress/gutenberg/pull/20087)
+-   Ensure the default Prettier config is used with `lint-js` when needed [20071](https://github.com/WordPress/gutenberg/pull/20071)
+-   Data: Log first-pass `useSelect` errors [20122](https://github.com/WordPress/gutenberg/pull/20122)
+-   Compat: Social Links: Remove legacy renderers from packages [20098](https://github.com/WordPress/gutenberg/pull/20098)
+-   Core Data: Mark the `getEntityRecordNoResolver` selector as experimental. [20053](https://github.com/WordPress/gutenberg/pull/20053)
+-   Core Data: Remove unused `__experimentalUseEntitySaving` hook. [20148](https://github.com/WordPress/gutenberg/pull/20148)
+-   Hide the navigation block behind feature flag [20133](https://github.com/WordPress/gutenberg/pull/20133)
+-   Fix Intermitent e2e test failures [20065](https://github.com/WordPress/gutenberg/pull/20065)
+-   Move the e2e tests to the right folders [20135](https://github.com/WordPress/gutenberg/pull/20135)
+-   Switch social link icons to import svg parts from primitives [19877](https://github.com/WordPress/gutenberg/pull/19877)
 
 = 7.4.0 =
 
+## Changelog
+
 ### Features
 
-*   Add background color support to the Columns block. [17813](https://github.com/WordPress/gutenberg/pull/17813)
-*   Add text color support for the Group block. [19181](https://github.com/WordPress/gutenberg/pull/19181)
+-   Add background color support to the Columns block. [17813](https://github.com/WordPress/gutenberg/pull/17813)
+-   Add text color support for the Group block. [19181](https://github.com/WordPress/gutenberg/pull/19181)
 
 ### Enhancements
 
-*   Navigation Block:
-    *   Add submenu chevron indication setting. [19601](https://github.com/WordPress/gutenberg/pull/19601)
-    *   Save the ID to the destination entity. [18641](https://github.com/WordPress/gutenberg/pull/18641)
-    *   Select Parent Navigation Block after clicking "Create from all top-level pages". [19817](https://github.com/WordPress/gutenberg/pull/19817)
-    *   Update Appender visibility. [19598](https://github.com/WordPress/gutenberg/pull/19598) [19846](https://github.com/WordPress/gutenberg/pull/19846)
-    *   Move the Link Settings panel. [19917](https://github.com/WordPress/gutenberg/pull/19917)
-    *   Improve the UX to add links. [19686](https://github.com/WordPress/gutenberg/pull/19686)
-*   Multi-selection: don't focus first selected block. [19762](https://github.com/WordPress/gutenberg/pull/19762)
-*   Use the new link control component in the RichText link format. [19462](https://github.com/WordPress/gutenberg/pull/19462)
-*   Copy: Apply sentence case formatting to panel titles. [19901](https://github.com/WordPress/gutenberg/pull/19901)
-*   A11y: Add conditions and new translation strings for the BlockMover. [19757](https://github.com/WordPress/gutenberg/pull/19757)
+-   Navigation Block:
+    -   Add submenu chevron indication setting. [19601](https://github.com/WordPress/gutenberg/pull/19601)
+    -   Save the ID to the destination entity. [18641](https://github.com/WordPress/gutenberg/pull/18641)
+    -   Select Parent Navigation Block after clicking "Create from all top-level pages". [19817](https://github.com/WordPress/gutenberg/pull/19817)
+    -   Update Appender visibility. [19598](https://github.com/WordPress/gutenberg/pull/19598) [19846](https://github.com/WordPress/gutenberg/pull/19846)
+    -   Move the Link Settings panel. [19917](https://github.com/WordPress/gutenberg/pull/19917)
+    -   Improve the UX to add links. [19686](https://github.com/WordPress/gutenberg/pull/19686)
+-   Multi-selection: don't focus first selected block. [19762](https://github.com/WordPress/gutenberg/pull/19762)
+-   Use the new link control component in the RichText link format. [19462](https://github.com/WordPress/gutenberg/pull/19462)
+-   Copy: Apply sentence case formatting to panel titles. [19901](https://github.com/WordPress/gutenberg/pull/19901)
+-   A11y: Add conditions and new translation strings for the BlockMover. [19757](https://github.com/WordPress/gutenberg/pull/19757)
 
 ### New APIs
 
-*   Add a new @wordpress/create-block package for block scaffolding. [19773](https://github.com/WordPress/gutenberg/pull/19773) [19867](https://github.com/WordPress/gutenberg/pull/19867)
-*   Add a new @wordpress/icons package:
-    *   Introduce the package. [17055](https://github.com/WordPress/gutenberg/pull/17055)
-    *   Make it a package that is always embedded to avoid loading all the icons at once. [19809](https://github.com/WordPress/gutenberg/pull/19809)
-    *   Move icons used in the project to the package. [19944](https://github.com/WordPress/gutenberg/pull/19944) [19808](https://github.com/WordPress/gutenberg/pull/19808) [19834](https://github.com/WordPress/gutenberg/pull/19834) [19862](https://github.com/WordPress/gutenberg/pull/19862) [19838](https://github.com/WordPress/gutenberg/pull/19838) [19943](https://github.com/WordPress/gutenberg/pull/19943) [19926](https://github.com/WordPress/gutenberg/pull/19926)
-*   Add a new @wordpress/primitives package. [19781](https://github.com/WordPress/gutenberg/pull/19781) [19876](https://github.com/WordPress/gutenberg/pull/19876)
-
-### Bug Fixes
-
-*   Prevent gallery images from creating undo levels as they load. [19937](https://github.com/WordPress/gutenberg/pull/19937)
-*   FontSizePicker: Adjust Select Button size. [19479](https://github.com/WordPress/gutenberg/pull/19479)
-*   Remove post title escaping. [19955](https://github.com/WordPress/gutenberg/pull/19955)
-*   Fix Failure message styling in placeholders. [19673](https://github.com/WordPress/gutenberg/pull/19673)
-*   Fix RTL styles for the Media Text block. [18764](https://github.com/WordPress/gutenberg/pull/18764)
-*   Fix panel header styles. [19842](https://github.com/WordPress/gutenberg/pull/19842)
-*   Fix the editor fixed position at the 960px breakpoint. [19970](https://github.com/WordPress/gutenberg/pull/19970)
-*   Allow disabling color selection but keeping gradient support. [19925](https://github.com/WordPress/gutenberg/pull/19925)
-*   Prevent crash when creating a hierarchical post without a title. [19936](https://github.com/WordPress/gutenberg/pull/19936)
-*   Media & Text block: "Crop image to fill entire column" setting resets on image change. [19765](https://github.com/WordPress/gutenberg/pull/19765)
-*   Prevent Alt+F10 from scrolling to the top. [19896](https://github.com/WordPress/gutenberg/pull/19896)
-*   Fix clearing multi-selection with side click. [19787](https://github.com/WordPress/gutenberg/pull/19787)
-*   Update hover and focus selectors for "Move to Trash" to ensure the link is always red [19974](https://github.com/WordPress/gutenberg/pull/19974).
-*   Popover component:
-    *   clean up requestAnimationFrame. [19771](https://github.com/WordPress/gutenberg/pull/19771)
-    *   fix typo causing the mobile inserter to go out of view. [19978](https://github.com/WordPress/gutenberg/pull/19978)
-*   Fix bug in block multi-selection causing Rich text editing to be disabled. [19839](https://github.com/WordPress/gutenberg/pull/19839)
-*   Fix useSelect React hook timing and rerendering issues. [19286](https://github.com/WordPress/gutenberg/pull/19286)
-*   Core-data: do not publish outdated state to subscribers during updates. [19752](https://github.com/WordPress/gutenberg/pull/19752)
-*   LinkControl component (Navigation and buttons blocks):
-    *   Initialize inputValue state from value prop. [19737](https://github.com/WordPress/gutenberg/pull/19737)
-    *   Handle submission via form handler. [19651](https://github.com/WordPress/gutenberg/pull/19651)
-    *   Use URL as a link when title empty. [19739](https://github.com/WordPress/gutenberg/pull/19739)
-    *   Prevent focus loss in edit mode toggle. [19931](https://github.com/WordPress/gutenberg/pull/19931)
-    *   Resolve error when value is undefined. [19856](https://github.com/WordPress/gutenberg/pull/19856)
-    *   Handle Popover onClose for LinkControl. [19885](https://github.com/WordPress/gutenberg/pull/19885)
+-   Add a new @wordpress/create-block package for block scaffolding. [19773](https://github.com/WordPress/gutenberg/pull/19773) [19867](https://github.com/WordPress/gutenberg/pull/19867)
+-   Add a new @wordpress/icons package:
+    -   Introduce the package. [17055](https://github.com/WordPress/gutenberg/pull/17055)
+    -   Make it a package that is always embedded to avoid loading all the icons at once. [19809](https://github.com/WordPress/gutenberg/pull/19809)
+    -   Move icons used in the project to the package. [19944](https://github.com/WordPress/gutenberg/pull/19944) [19808](https://github.com/WordPress/gutenberg/pull/19808) [19834](https://github.com/WordPress/gutenberg/pull/19834) [19862](https://github.com/WordPress/gutenberg/pull/19862) [19838](https://github.com/WordPress/gutenberg/pull/19838) [19943](https://github.com/WordPress/gutenberg/pull/19943) [19926](https://github.com/WordPress/gutenberg/pull/19926)
+-   Add a new @wordpress/primitives package. [19781](https://github.com/WordPress/gutenberg/pull/19781) [19876](https://github.com/WordPress/gutenberg/pull/19876)
+
+### Bug Fixes
+
+-   Prevent gallery images from creating undo levels as they load. [19937](https://github.com/WordPress/gutenberg/pull/19937)
+-   FontSizePicker: Adjust Select Button size. [19479](https://github.com/WordPress/gutenberg/pull/19479)
+-   Remove post title escaping. [19955](https://github.com/WordPress/gutenberg/pull/19955)
+-   Fix Failure message styling in placeholders. [19673](https://github.com/WordPress/gutenberg/pull/19673)
+-   Fix RTL styles for the Media Text block. [18764](https://github.com/WordPress/gutenberg/pull/18764)
+-   Fix panel header styles. [19842](https://github.com/WordPress/gutenberg/pull/19842)
+-   Fix the editor fixed position at the 960px breakpoint. [19970](https://github.com/WordPress/gutenberg/pull/19970)
+-   Allow disabling color selection but keeping gradient support. [19925](https://github.com/WordPress/gutenberg/pull/19925)
+-   Prevent crash when creating a hierarchical post without a title. [19936](https://github.com/WordPress/gutenberg/pull/19936)
+-   Media & Text block: "Crop image to fill entire column" setting resets on image change. [19765](https://github.com/WordPress/gutenberg/pull/19765)
+-   Prevent Alt+F10 from scrolling to the top. [19896](https://github.com/WordPress/gutenberg/pull/19896)
+-   Fix clearing multi-selection with side click. [19787](https://github.com/WordPress/gutenberg/pull/19787)
+-   Update hover and focus selectors for "Move to Trash" to ensure the link is always red [19974](https://github.com/WordPress/gutenberg/pull/19974).
+-   Popover component:
+    -   clean up requestAnimationFrame. [19771](https://github.com/WordPress/gutenberg/pull/19771)
+    -   fix typo causing the mobile inserter to go out of view. [19978](https://github.com/WordPress/gutenberg/pull/19978)
+-   Fix bug in block multi-selection causing Rich text editing to be disabled. [19839](https://github.com/WordPress/gutenberg/pull/19839)
+-   Fix useSelect React hook timing and rerendering issues. [19286](https://github.com/WordPress/gutenberg/pull/19286)
+-   Core-data: do not publish outdated state to subscribers during updates. [19752](https://github.com/WordPress/gutenberg/pull/19752)
+-   LinkControl component (Navigation and buttons blocks):
+    -   Initialize inputValue state from value prop. [19737](https://github.com/WordPress/gutenberg/pull/19737)
+    -   Handle submission via form handler. [19651](https://github.com/WordPress/gutenberg/pull/19651)
+    -   Use URL as a link when title empty. [19739](https://github.com/WordPress/gutenberg/pull/19739)
+    -   Prevent focus loss in edit mode toggle. [19931](https://github.com/WordPress/gutenberg/pull/19931)
+    -   Resolve error when value is undefined. [19856](https://github.com/WordPress/gutenberg/pull/19856)
+    -   Handle Popover onClose for LinkControl. [19885](https://github.com/WordPress/gutenberg/pull/19885)
 
 ### Experiments
 
-*   Add AnglePicker Component and useDragging hook. [19637](https://github.com/WordPress/gutenberg/pull/19637)
-*   Add Global styles CSS variables generation mechanism. [19883](https://github.com/WordPress/gutenberg/pull/19883)
-*   Allow blocks to register variations that shows-up in the inserter. [19243](https://github.com/WordPress/gutenberg/pull/19243)
-*   Block Directory: Refactor the reducer by breaking out the block management actions into their own reducer. [19330](https://github.com/WordPress/gutenberg/pull/19330)
+-   Add AnglePicker Component and useDragging hook. [19637](https://github.com/WordPress/gutenberg/pull/19637)
+-   Add Global styles CSS variables generation mechanism. [19883](https://github.com/WordPress/gutenberg/pull/19883)
+-   Allow blocks to register variations that shows-up in the inserter. [19243](https://github.com/WordPress/gutenberg/pull/19243)
+-   Block Directory: Refactor the reducer by breaking out the block management actions into their own reducer. [19330](https://github.com/WordPress/gutenberg/pull/19330)
 
 ### Documentation
 
-*   Add docs for LocalAutosaveMonitor and __experimentalUpdateLocalAutosaveInterval. [19915](https://github.com/WordPress/gutenberg/pull/19915)
-*   Add markdownlint script to lint docs markup. [19855](https://github.com/WordPress/gutenberg/pull/19855)
-*   Add format-js detailed documentaation to @wordpress/scripts package. [19946](https://github.com/WordPress/gutenberg/pull/19946)
-*   Reorganize the Contributors Guide. [19853](https://github.com/WordPress/gutenberg/pull/19853)
-*   Clarify when isEligible function is called. [19899](https://github.com/WordPress/gutenberg/pull/19899)
-*   Typos and tweaks: [19833](https://github.com/WordPress/gutenberg/pull/19833), [19914](https://github.com/WordPress/gutenberg/pull/19914), [19736](https://github.com/WordPress/gutenberg/pull/19736), [19759](https://github.com/WordPress/gutenberg/pull/19759), [19869](https://github.com/WordPress/gutenberg/pull/19869), [19802](https://github.com/WordPress/gutenberg/pull/19802), [19813](https://github.com/WordPress/gutenberg/pull/19813).
+-   Add docs for LocalAutosaveMonitor and \_\_experimentalUpdateLocalAutosaveInterval. [19915](https://github.com/WordPress/gutenberg/pull/19915)
+-   Add markdownlint script to lint docs markup. [19855](https://github.com/WordPress/gutenberg/pull/19855)
+-   Add format-js detailed documentaation to @wordpress/scripts package. [19946](https://github.com/WordPress/gutenberg/pull/19946)
+-   Reorganize the Contributors Guide. [19853](https://github.com/WordPress/gutenberg/pull/19853)
+-   Clarify when isEligible function is called. [19899](https://github.com/WordPress/gutenberg/pull/19899)
+-   Typos and tweaks: [19833](https://github.com/WordPress/gutenberg/pull/19833), [19914](https://github.com/WordPress/gutenberg/pull/19914), [19736](https://github.com/WordPress/gutenberg/pull/19736), [19759](https://github.com/WordPress/gutenberg/pull/19759), [19869](https://github.com/WordPress/gutenberg/pull/19869), [19802](https://github.com/WordPress/gutenberg/pull/19802), [19813](https://github.com/WordPress/gutenberg/pull/19813).
 
 ### Various
 
-*   Introduce Prettier Formatting:
-    *   Add the formatting script. [18048](https://github.com/WordPress/gutenberg/pull/18048) [19994](https://github.com/WordPress/gutenberg/pull/19994)
-    *   Format the codebase. [19963](https://github.com/WordPress/gutenberg/pull/19963)
-    *   Set a consistent line width. [19992](https://github.com/WordPress/gutenberg/pull/19992)
-*   Automation:
-    *   Fix pull request merge automation errors. [19768](https://github.com/WordPress/gutenberg/pull/19768)
-    *   Run pull request automation on closed. [19742](https://github.com/WordPress/gutenberg/pull/19742)
-    *   Add a step that updates CHANGELOG files before npm releases. [19764](https://github.com/WordPress/gutenberg/pull/19764)
-*   Allow Babel Stage 4 features. [19831](https://github.com/WordPress/gutenberg/pull/19831) [19065](https://github.com/WordPress/gutenberg/pull/19065)
-*   Use a Link to the changelog instead of adding it inline in the plugin README. [19761](https://github.com/WordPress/gutenberg/pull/19761)
-*   Use require.resolve() in @wordpress/jest-preset-default config [19957](https://github.com/WordPress/gutenberg/pull/19957).
-*   Fix multi-selection intermittent e2e failure. [19865](https://github.com/WordPress/gutenberg/pull/19865)
-*   Add Placeholder component to Storybook. [19734](https://github.com/WordPress/gutenberg/pull/19734)
-*   Include block.json files in the plugin build output. [19786](https://github.com/WordPress/gutenberg/pull/19786)
-*   Rename patterns to variations in the Block API. [19966](https://github.com/WordPress/gutenberg/pull/19966)
-*   Paragraph block:
-    *   remove min-height. [19835](https://github.com/WordPress/gutenberg/pull/19835)
-    *   remove unnecessary CSS after shortcuts removal. [19821](https://github.com/WordPress/gutenberg/pull/19821)
-*   Refactor ObserveTyping as function component. [19881](https://github.com/WordPress/gutenberg/pull/19881)
-*   Move the is-navigate-mode classname to the WritingFlow component. 19868
-*   Block: use React context to provide the selected element. [19782](https://github.com/WordPress/gutenberg/pull/19782)
-*   Remove dead is-hovered selectors. [19870](https://github.com/WordPress/gutenberg/pull/19870)
-*   Remove the editor dependency from the block library. [16160](https://github.com/WordPress/gutenberg/pull/16160)
-*   Remove an unnecessary import from the playground. [19893](https://github.com/WordPress/gutenberg/pull/19893)
-*   Refactor the RichText wrapper to use React hooks for wrapper component. [19095](https://github.com/WordPress/gutenberg/pull/19095)
-*   RichText API: Limit "prefix" transformations to Paragraph blocks. [19727](https://github.com/WordPress/gutenberg/pull/19727)
-*   Apply width-based modifier classes to Placeholder only when the width is known. [19825](https://github.com/WordPress/gutenberg/pull/19825)
-*   Various:
-*   Refactor the server-side rendering of the Navigation block. [19989](https://github.com/WordPress/gutenberg/pull/19989) [19991](https://github.com/WordPress/gutenberg/pull/19991)
-*   Fix server-registered fixtures script. [19884](https://github.com/WordPress/gutenberg/pull/19884)
-*   Remove the RichText is-selected class. [19822](https://github.com/WordPress/gutenberg/pull/19822)
-*   Testing: Use deterministic selectors for incremented IDs. [19844](https://github.com/WordPress/gutenberg/pull/19844)
-
+-   Introduce Prettier Formatting:
+    -   Add the formatting script. [18048](https://github.com/WordPress/gutenberg/pull/18048) [19994](https://github.com/WordPress/gutenberg/pull/19994)
+    -   Format the codebase. [19963](https://github.com/WordPress/gutenberg/pull/19963)
+    -   Set a consistent line width. [19992](https://github.com/WordPress/gutenberg/pull/19992)
+-   Automation:
+    -   Fix pull request merge automation errors. [19768](https://github.com/WordPress/gutenberg/pull/19768)
+    -   Run pull request automation on closed. [19742](https://github.com/WordPress/gutenberg/pull/19742)
+    -   Add a step that updates CHANGELOG files before npm releases. [19764](https://github.com/WordPress/gutenberg/pull/19764)
+-   Allow Babel Stage 4 features. [19831](https://github.com/WordPress/gutenberg/pull/19831) [19065](https://github.com/WordPress/gutenberg/pull/19065)
+-   Use a Link to the changelog instead of adding it inline in the plugin README. [19761](https://github.com/WordPress/gutenberg/pull/19761)
+-   Use require.resolve() in @wordpress/jest-preset-default config [19957](https://github.com/WordPress/gutenberg/pull/19957).
+-   Fix multi-selection intermittent e2e failure. [19865](https://github.com/WordPress/gutenberg/pull/19865)
+-   Add Placeholder component to Storybook. [19734](https://github.com/WordPress/gutenberg/pull/19734)
+-   Include block.json files in the plugin build output. [19786](https://github.com/WordPress/gutenberg/pull/19786)
+-   Rename patterns to variations in the Block API. [19966](https://github.com/WordPress/gutenberg/pull/19966)
+-   Paragraph block:
+    -   remove min-height. [19835](https://github.com/WordPress/gutenberg/pull/19835)
+    -   remove unnecessary CSS after shortcuts removal. [19821](https://github.com/WordPress/gutenberg/pull/19821)
+-   Refactor ObserveTyping as function component. [19881](https://github.com/WordPress/gutenberg/pull/19881)
+-   Move the is-navigate-mode classname to the WritingFlow component. 19868
+-   Block: use React context to provide the selected element. [19782](https://github.com/WordPress/gutenberg/pull/19782)
+-   Remove dead is-hovered selectors. [19870](https://github.com/WordPress/gutenberg/pull/19870)
+-   Remove the editor dependency from the block library. [16160](https://github.com/WordPress/gutenberg/pull/16160)
+-   Remove an unnecessary import from the playground. [19893](https://github.com/WordPress/gutenberg/pull/19893)
+-   Refactor the RichText wrapper to use React hooks for wrapper component. [19095](https://github.com/WordPress/gutenberg/pull/19095)
+-   RichText API: Limit "prefix" transformations to Paragraph blocks. [19727](https://github.com/WordPress/gutenberg/pull/19727)
+-   Apply width-based modifier classes to Placeholder only when the width is known. [19825](https://github.com/WordPress/gutenberg/pull/19825)
+-   Various:
+-   Refactor the server-side rendering of the Navigation block. [19989](https://github.com/WordPress/gutenberg/pull/19989) [19991](https://github.com/WordPress/gutenberg/pull/19991)
+-   Fix server-registered fixtures script. [19884](https://github.com/WordPress/gutenberg/pull/19884)
+-   Remove the RichText is-selected class. [19822](https://github.com/WordPress/gutenberg/pull/19822)
+-   Testing: Use deterministic selectors for incremented IDs. [19844](https://github.com/WordPress/gutenberg/pull/19844)
 
 = 7.3.0 =
 
+## Changelog
+
+### Enhancements
+
+-   Add border to table header & footer [19450](https://github.com/WordPress/gutenberg/pull/19450)
+-   Add the new replace flow to the cover [19583](https://github.com/WordPress/gutenberg/pull/19583), media text [19198](https://github.com/WordPress/gutenberg/pull/19198), file [19174](https://github.com/WordPress/gutenberg/pull/19174), audio [19158](https://github.com/WordPress/gutenberg/pull/19158) and video [19162](https://github.com/WordPress/gutenberg/pull/19162) block.
+-   Components: improve ToolbarButton [18931](https://github.com/WordPress/gutenberg/pull/18931)
+-   Sibling inserter: fix dead zone between blocks [19719](https://github.com/WordPress/gutenberg/pull/19719) [19729](https://github.com/WordPress/gutenberg/pull/19729)
+-   Top toolbar: adjust tab order [19623](https://github.com/WordPress/gutenberg/pull/19623)
+-   Regions: position publish region after sidebar [19427](https://github.com/WordPress/gutenberg/pull/19427)
+-   Better accessibility labels for blocks [18132](https://github.com/WordPress/gutenberg/pull/18132)
+-   Breadcrumb: add accessibility label [19597](https://github.com/WordPress/gutenberg/pull/19597)
+-   Navigation: add background color [19108](https://github.com/WordPress/gutenberg/pull/19108)
+
+### Performance
+
+-   Lighter block DOM:
+    -   Put sibling inserter in popover [19456](https://github.com/WordPress/gutenberg/pull/19456)
+    -   Remove extra div wrapper [19010](https://github.com/WordPress/gutenberg/pull/19010)
+    -   Remove inner div wrapper [19593](https://github.com/WordPress/gutenberg/pull/19593)
+    -   Split out toolbar rendering [19564](https://github.com/WordPress/gutenberg/pull/19564)
+    -   Put side inserter in Popover [19406](https://github.com/WordPress/gutenberg/pull/19406)
+    -   Rewrite drop zone with hooks (useDropZone) [19514](https://github.com/WordPress/gutenberg/pull/19514)
+    -   Merge effects [19617](https://github.com/WordPress/gutenberg/pull/19617)
+    -   Fix alignments [19704](https://github.com/WordPress/gutenberg/pull/19704)
+    -   Clean up after control removal [19618](https://github.com/WordPress/gutenberg/pull/19618)
+    -   Reposition tabbable inserter [19596](https://github.com/WordPress/gutenberg/pull/19596)
+-   Avoid rerendering every block when caret moves in and out of formatting [19524](https://github.com/WordPress/gutenberg/pull/19524)
+
+### Bug Fixes
+
+-   Navigation:
+    -   Format the allowed styles [19477](https://github.com/WordPress/gutenberg/pull/19477)
+    -   Show recent pages as default suggestions when creating Nav Links [19458](https://github.com/WordPress/gutenberg/pull/19458)
+    -   Define allowedFormats option for NavigationLink [19507](https://github.com/WordPress/gutenberg/pull/19507)
+    -   Rename the LinkControl's edit button title [19505](https://github.com/WordPress/gutenberg/pull/19505)
+    -   Use underline instead of bottom border for nav links [19538](https://github.com/WordPress/gutenberg/pull/19538)
+    -   Do not output Links with empty labels [19652](https://github.com/WordPress/gutenberg/pull/19652)
+    -   Remove draggable from all navigation-link blocks [19648](https://github.com/WordPress/gutenberg/pull/19648)
+    -   Remove duplicate CSS from Navigation that is aleady in Link CSS [19540](https://github.com/WordPress/gutenberg/pull/19540)
+    -   Remove the text color button double border on the navigation block toolbar [19567](https://github.com/WordPress/gutenberg/pull/19567)
+    -   Replace, on editing a Link, the current label with the title of page or post [19461](https://github.com/WordPress/gutenberg/pull/19461)
+    -   Add description for the Link Settings Description in the Link Block settings [19508](https://github.com/WordPress/gutenberg/pull/19508)
+    -   Fix Link url escaping [19679](https://github.com/WordPress/gutenberg/pull/19679)
+    -   Fix alignment on left border between menu navigation controls and menu item [19511](https://github.com/WordPress/gutenberg/pull/19511)
+    -   Styling fixes after navigation feature merge [19455](https://github.com/WordPress/gutenberg/pull/19455)
+-   Add support for align wide to deprecated versions of gallery block [19522](https://github.com/WordPress/gutenberg/pull/19522)
+-   Block top toolbar: fix mover direction [19574](https://github.com/WordPress/gutenberg/pull/19574)
+-   Editor keyboard shortcuts: fix Toggle Sidebar [19605](https://github.com/WordPress/gutenberg/pull/19605)
+-   Editor: Fix Block Embed Input size [19438](https://github.com/WordPress/gutenberg/pull/19438)
+-   Fix ServerSideRender component showing className [19555](https://github.com/WordPress/gutenberg/pull/19555)
+-   Fix writing flow focus capturing [19621](https://github.com/WordPress/gutenberg/pull/19621)
+-   Fix small visual select glitch [19590](https://github.com/WordPress/gutenberg/pull/19590)
+-   Fix the height of the tags tokens [19592](https://github.com/WordPress/gutenberg/pull/19592)
+-   Fix buttons block Link shortcut not working with multiple buttons [19492](https://github.com/WordPress/gutenberg/pull/19492)
+-   Disable HTML on Link [19483](https://github.com/WordPress/gutenberg/pull/19483)
+-   Fix managing page break in the block manager [19303](https://github.com/WordPress/gutenberg/pull/19303)
+-   Show predefined colors in the navigation block [19493](https://github.com/WordPress/gutenberg/pull/19493)
+-   Update CSS rule on the widgets screen required for drag & drop [19428](https://github.com/WordPress/gutenberg/pull/19428)
+-   Multi block selection: fix tabbing [19700](https://github.com/WordPress/gutenberg/pull/19700)
+-   Multi block selection: set focus back after attempt [19720](https://github.com/WordPress/gutenberg/pull/19720)
+-   RichText: don't set focus when applying format [19536](https://github.com/WordPress/gutenberg/pull/19536)
+-   Writing Flow: fix list selection [19721](https://github.com/WordPress/gutenberg/pull/19721)
+-   Fix Color Picker Format Toggle placement [19607](https://github.com/WordPress/gutenberg/pull/19607)
+-   Fix Columns block pattern picker item margin. [19494](https://github.com/WordPress/gutenberg/pull/19494)
+-   Fix block styles for More block [19745](https://github.com/WordPress/gutenberg/pull/19745)
+-   Block: fix hasMovers BlockList setting for top toolbar [19619](https://github.com/WordPress/gutenberg/pull/19619)
+
+### New APIs
+
+-   Components: add ImageSizeControl component [17148](https://github.com/WordPress/gutenberg/pull/17148)
+-   Add block collections [17609](https://github.com/WordPress/gutenberg/pull/17609)
+-   Add `Text` component [18495](https://github.com/WordPress/gutenberg/pull/18495)
+-   Add warning package [19317](https://github.com/WordPress/gutenberg/pull/19317)
+-   Components: add isFocusable state to Button [19337](https://github.com/WordPress/gutenberg/pull/19337)
+
+### Experiments
+
+-   Edit Site:
+    -   Add a Post Author block [19576](https://github.com/WordPress/gutenberg/pull/19576)
+    -   Add a Post Date block [19578](https://github.com/WordPress/gutenberg/pull/19578)
+    -   Add a Post Excerpt block [19579](https://github.com/WordPress/gutenberg/pull/19579)
+    -   Implement Template Part block editing 2 [19203](https://github.com/WordPress/gutenberg/pull/19203)
+    -   Add template loading [19081](https://github.com/WordPress/gutenberg/pull/19081)
+-   Block Directory:
+    -   Change 'update' icon to text to be more communicative [19451](https://github.com/WordPress/gutenberg/pull/19451)
+    -   Update the action button label to read 'Add block' [19412](https://github.com/WordPress/gutenberg/pull/19412)
+-   useColors:
+    -   Fix contrast check [19500](https://github.com/WordPress/gutenberg/pull/19500)
+    -   Directly pass ref for color detecting [19474](https://github.com/WordPress/gutenberg/pull/19474)
+-   InnerBlocks: Fix toolbar capturing [19530](https://github.com/WordPress/gutenberg/pull/19530)
 
-## Enhancements
-
-- Add border to table header & footer [19450](https://github.com/WordPress/gutenberg/pull/19450)
-- Add the new replace flow to the cover [19583](https://github.com/WordPress/gutenberg/pull/19583), media text [19198](https://github.com/WordPress/gutenberg/pull/19198), file [19174](https://github.com/WordPress/gutenberg/pull/19174), audio [19158](https://github.com/WordPress/gutenberg/pull/19158) and video [19162](https://github.com/WordPress/gutenberg/pull/19162) block.
-- Components: improve ToolbarButton [18931](https://github.com/WordPress/gutenberg/pull/18931)
-- Sibling inserter: fix dead zone between blocks [19719](https://github.com/WordPress/gutenberg/pull/19719) [19729](https://github.com/WordPress/gutenberg/pull/19729)
-- Top toolbar: adjust tab order [19623](https://github.com/WordPress/gutenberg/pull/19623)
-- Regions: position publish region after sidebar [19427](https://github.com/WordPress/gutenberg/pull/19427)
-- Better accessibility labels for blocks [18132](https://github.com/WordPress/gutenberg/pull/18132)
-- Breadcrumb: add accessibility label [19597](https://github.com/WordPress/gutenberg/pull/19597)
-- Navigation: add background color [19108](https://github.com/WordPress/gutenberg/pull/19108)
-
-## Performance
-
-- Lighter block DOM:
-	- Put sibling inserter in popover [19456](https://github.com/WordPress/gutenberg/pull/19456)
-	- Remove extra div wrapper [19010](https://github.com/WordPress/gutenberg/pull/19010)
-	- Remove inner div wrapper [19593](https://github.com/WordPress/gutenberg/pull/19593)
-	- Split out toolbar rendering [19564](https://github.com/WordPress/gutenberg/pull/19564)
-	- Put side inserter in Popover [19406](https://github.com/WordPress/gutenberg/pull/19406)
-	- Rewrite drop zone with hooks (useDropZone) [19514](https://github.com/WordPress/gutenberg/pull/19514)
-	- Merge effects [19617](https://github.com/WordPress/gutenberg/pull/19617)
-	- Fix alignments [19704](https://github.com/WordPress/gutenberg/pull/19704)
-	- Clean up after control removal [19618](https://github.com/WordPress/gutenberg/pull/19618)
-	- Reposition tabbable inserter [19596](https://github.com/WordPress/gutenberg/pull/19596)
-- Avoid rerendering every block when caret moves in and out of formatting [19524](https://github.com/WordPress/gutenberg/pull/19524)
-
-## Bug Fixes
-
-- Navigation:
-	- Format the allowed styles [19477](https://github.com/WordPress/gutenberg/pull/19477)
-	- Show recent pages as default suggestions when creating Nav Links [19458](https://github.com/WordPress/gutenberg/pull/19458)
-	- Define allowedFormats option for NavigationLink [19507](https://github.com/WordPress/gutenberg/pull/19507)
-	- Rename the LinkControl's edit button title [19505](https://github.com/WordPress/gutenberg/pull/19505)
-	- Use underline instead of bottom border for nav links [19538](https://github.com/WordPress/gutenberg/pull/19538)
-	- Do not output Links with empty labels [19652](https://github.com/WordPress/gutenberg/pull/19652)
-	- Remove draggable from all navigation-link blocks [19648](https://github.com/WordPress/gutenberg/pull/19648)
-	- Remove duplicate CSS from Navigation that is aleady in Link CSS [19540](https://github.com/WordPress/gutenberg/pull/19540)
-	- Remove the text color button double border on the navigation block toolbar [19567](https://github.com/WordPress/gutenberg/pull/19567)
-	- Replace, on editing a Link, the current label with the title of page or post [19461](https://github.com/WordPress/gutenberg/pull/19461)
-	- Add description for the Link Settings Description in the Link Block settings [19508](https://github.com/WordPress/gutenberg/pull/19508)
-	- Fix Link url escaping [19679](https://github.com/WordPress/gutenberg/pull/19679)
-	- Fix alignment on left border between menu navigation controls and menu item [19511](https://github.com/WordPress/gutenberg/pull/19511)
-	- Styling fixes after navigation feature merge [19455](https://github.com/WordPress/gutenberg/pull/19455)
-- Add support for align wide to deprecated versions of gallery block [19522](https://github.com/WordPress/gutenberg/pull/19522)
-- Block top toolbar: fix mover direction [19574](https://github.com/WordPress/gutenberg/pull/19574)
-- Editor keyboard shortcuts: fix Toggle Sidebar [19605](https://github.com/WordPress/gutenberg/pull/19605)
-- Editor: Fix Block Embed Input size [19438](https://github.com/WordPress/gutenberg/pull/19438)
-- Fix ServerSideRender component showing className [19555](https://github.com/WordPress/gutenberg/pull/19555)
-- Fix writing flow focus capturing [19621](https://github.com/WordPress/gutenberg/pull/19621)
-- Fix small visual select glitch [19590](https://github.com/WordPress/gutenberg/pull/19590)
-- Fix the height of the tags tokens [19592](https://github.com/WordPress/gutenberg/pull/19592)
-- Fix buttons block Link shortcut not working with multiple buttons [19492](https://github.com/WordPress/gutenberg/pull/19492)
-- Disable HTML on Link [19483](https://github.com/WordPress/gutenberg/pull/19483)
-- Fix managing page break in the block manager [19303](https://github.com/WordPress/gutenberg/pull/19303)
-- Show predefined colors in the navigation block [19493](https://github.com/WordPress/gutenberg/pull/19493)
-- Update CSS rule on the widgets screen required for drag & drop [19428](https://github.com/WordPress/gutenberg/pull/19428)
-- Multi block selection: fix tabbing [19700](https://github.com/WordPress/gutenberg/pull/19700)
-- Multi block selection: set focus back after attempt [19720](https://github.com/WordPress/gutenberg/pull/19720)
-- RichText: don't set focus when applying format [19536](https://github.com/WordPress/gutenberg/pull/19536)
-- Writing Flow: fix list selection [19721](https://github.com/WordPress/gutenberg/pull/19721)
-- Fix Color Picker Format Toggle placement [19607](https://github.com/WordPress/gutenberg/pull/19607)
-- Fix Columns block pattern picker item margin. [19494](https://github.com/WordPress/gutenberg/pull/19494)
-- Fix block styles for More block [19745](https://github.com/WordPress/gutenberg/pull/19745)
-- Block: fix hasMovers BlockList setting for top toolbar [19619](https://github.com/WordPress/gutenberg/pull/19619)
-
-## New APIs
-
-- Components: add ImageSizeControl component [17148](https://github.com/WordPress/gutenberg/pull/17148)
-- Add block collections [17609](https://github.com/WordPress/gutenberg/pull/17609)
-- Add `Text` component [18495](https://github.com/WordPress/gutenberg/pull/18495)
-- Add warning package [19317](https://github.com/WordPress/gutenberg/pull/19317)
-- Components: add isFocusable state to Button [19337](https://github.com/WordPress/gutenberg/pull/19337)
-
-## Experiments
-
-- Edit Site:
-	- Add a Post Author block [19576](https://github.com/WordPress/gutenberg/pull/19576)
-	- Add a Post Date block [19578](https://github.com/WordPress/gutenberg/pull/19578)
-	- Add a Post Excerpt block [19579](https://github.com/WordPress/gutenberg/pull/19579)
-	- Implement Template Part block editing 2 [19203](https://github.com/WordPress/gutenberg/pull/19203)
-	- Add template loading [19081](https://github.com/WordPress/gutenberg/pull/19081)
-- Block Directory:
-	- Change 'update' icon to text to be more communicative [19451](https://github.com/WordPress/gutenberg/pull/19451)
-	- Update the action button label to read 'Add block' [19412](https://github.com/WordPress/gutenberg/pull/19412)
-- useColors:
-	- Fix contrast check [19500](https://github.com/WordPress/gutenberg/pull/19500)
-	- Directly pass ref for color detecting [19474](https://github.com/WordPress/gutenberg/pull/19474)
-- InnerBlocks: Fix toolbar capturing [19530](https://github.com/WordPress/gutenberg/pull/19530)
-
-## Documentation
-
-- Add js syntax highlighting to documentation [19467](https://github.com/WordPress/gutenberg/pull/19467)
-- Add lint-md section to scripts readme [19716](https://github.com/WordPress/gutenberg/pull/19716)
-- Add linting of source in markdown files [19518](https://github.com/WordPress/gutenberg/pull/19518)
-- Document packages-update wp-scripts command [19711](https://github.com/WordPress/gutenberg/pull/19711)
-- Linting Documentation [19543](https://github.com/WordPress/gutenberg/pull/19543)
-- More visibility to the theme opt-in styles documentation [19463](https://github.com/WordPress/gutenberg/pull/19463)
-- Remove spaces in title for consistency with other components and docs [19466](https://github.com/WordPress/gutenberg/pull/19466) [19464](https://github.com/WordPress/gutenberg/pull/19464)
-- Update block-filters.md [19595](https://github.com/WordPress/gutenberg/pull/19595) [19684](https://github.com/WordPress/gutenberg/pull/19684)
-- Update contributors guide with docker-compose info [19362](https://github.com/WordPress/gutenberg/pull/19362)
-- Add js syntax highlighting to documentation [19465](https://github.com/WordPress/gutenberg/pull/19465)
-- Use import statement instead of deconstruction in docs [19469](https://github.com/WordPress/gutenberg/pull/19469) [19471](https://github.com/WordPress/gutenberg/pull/19471)
-- Fix Navigable Container component usage code [19615](https://github.com/WordPress/gutenberg/pull/19615)
-
-## Various
-
-- Block Editor: Remove (more) legacy "editor-" class name compatibility [19489](https://github.com/WordPress/gutenberg/pull/19489)
-- Block toolbar: rewrite toolbar forcing [19527](https://github.com/WordPress/gutenberg/pull/19527)
-- Breadcrumb: isolate logic [19573](https://github.com/WordPress/gutenberg/pull/19573)
-- Contain selection logic in useMultiSelection [19529](https://github.com/WordPress/gutenberg/pull/19529)
-- Move navigation and selection logic to WritingFlow [19397](https://github.com/WordPress/gutenberg/pull/19397)
-- LinkControl
-	- Refactor LinkControl API [19396](https://github.com/WordPress/gutenberg/pull/19396)
-	- Remove Popover from LinkControl component [19638](https://github.com/WordPress/gutenberg/pull/19638)
-	- Add search results label for initial suggestions [19665](https://github.com/WordPress/gutenberg/pull/19665)
-	- Prevent space being reserved for scrollbar when items fit box [19633](https://github.com/WordPress/gutenberg/pull/19633)
-	- Remove non-public fetchSearchSuggestions from LinkControl documentation [19710](https://github.com/WordPress/gutenberg/pull/19710)
-	- Update Nav Block to use new showInitialSuggestions prop on LinkControl [19667](https://github.com/WordPress/gutenberg/pull/19667)
-	- Flatten LinkControl components by mocking useSelect for tests [19705](https://github.com/WordPress/gutenberg/pull/19705)
-- Remove core editor usage from block editor rich text [18789](https://github.com/WordPress/gutenberg/pull/18789)
-- Add script to automatically update core packages [19448](https://github.com/WordPress/gutenberg/pull/19448)
-- Adds tests for horizontal mover descriptions [19549](https://github.com/WordPress/gutenberg/pull/19549)
-- Remove: Gradient Picker from cover block placeholder [19712](https://github.com/WordPress/gutenberg/pull/19712)
-- Add SVGR support to wp-scripts [18243](https://github.com/WordPress/gutenberg/pull/18243)
-- Add storybook for Panel component [18541](https://github.com/WordPress/gutenberg/pull/18541)
-- Add supports html: false to new website blocks. [19646](https://github.com/WordPress/gutenberg/pull/19646)
-- Add: Block editor keyboard shortcuts on the widgets screen [19432](https://github.com/WordPress/gutenberg/pull/19432)
-- Added 8px padding to search input block. [19452](https://github.com/WordPress/gutenberg/pull/19452)
-- Adds a "(no title)" label to links to pages or posts with no title [19528](https://github.com/WordPress/gutenberg/pull/19528)
-- Array type attribute source query comma missing [19717](https://github.com/WordPress/gutenberg/pull/19717)
-- Block Editor: Make initial inner blocks non-dirtying. [19521](https://github.com/WordPress/gutenberg/pull/19521)
-- Block Popover: editor canvas as boundary [19322](https://github.com/WordPress/gutenberg/pull/19322)
-- Check for existing of avatar_urls array before trying to return the avatar img part of user autocomplete fragment [18259](https://github.com/WordPress/gutenberg/pull/18259)
-- Update downshift dependency to v4.0.5 [19661](https://github.com/WordPress/gutenberg/pull/19661)
-- Components: replace console.warn with @wordpress/warning [19687](https://github.com/WordPress/gutenberg/pull/19687)
-- DOM: Mark stripHTML as unstable [19725](https://github.com/WordPress/gutenberg/pull/19725)
-- Decode HTML entities for publish link [19517](https://github.com/WordPress/gutenberg/pull/19517)
-- Expose custom gradient picker [19480](https://github.com/WordPress/gutenberg/pull/19480)
-- Gallerys ids are saved as numbers [19163](https://github.com/WordPress/gutenberg/pull/19163)
-- Media & Text: Remove "Insert from URL" from the replacement flow. [19606](https://github.com/WordPress/gutenberg/pull/19606)
-- Page template previews [19106](https://github.com/WordPress/gutenberg/pull/19106)
-- Post-Author: Move HTML tags outside of the translatable string [19675](https://github.com/WordPress/gutenberg/pull/19675)
-- Priority Queue: Invoke callback when flushing queue [19282](https://github.com/WordPress/gutenberg/pull/19282)
-- RichText: split out inline warning [19545](https://github.com/WordPress/gutenberg/pull/19545)
-- Storybook: Update to latest 5.3 [19599](https://github.com/WordPress/gutenberg/pull/19599)
-- Update `npm-package-json-lint-config` docs [19584](https://github.com/WordPress/gutenberg/pull/19584)
-- Update the float on the Spinner to `none` [19338](https://github.com/WordPress/gutenberg/pull/19338)
-- Wrap color palette in fieldset with label inside of a legend [19546](https://github.com/WordPress/gutenberg/pull/19546)
-- Check Symbol.iterator not Symbol.toStringTag (redux-routine) [19666](https://github.com/WordPress/gutenberg/pull/19666)
-- Skip intermittent end to end test on the button block [19653](https://github.com/WordPress/gutenberg/pull/19653)
-- Fix e2e test failures via console log exception to handle temp `wpnonce` error [19532](https://github.com/WordPress/gutenberg/pull/19532)
-- Packages: Mark build-styles as side-effectful [19535](https://github.com/WordPress/gutenberg/pull/19535)
-- docgen: Omit unknown type tag from Markdown format output [19571](https://github.com/WordPress/gutenberg/pull/19571)
-- Build Tooling: Skip package for build if package.json unreadable [19439](https://github.com/WordPress/gutenberg/pull/19439)
+### Documentation
 
+-   Add js syntax highlighting to documentation [19467](https://github.com/WordPress/gutenberg/pull/19467)
+-   Add lint-md section to scripts readme [19716](https://github.com/WordPress/gutenberg/pull/19716)
+-   Add linting of source in markdown files [19518](https://github.com/WordPress/gutenberg/pull/19518)
+-   Document packages-update wp-scripts command [19711](https://github.com/WordPress/gutenberg/pull/19711)
+-   Linting Documentation [19543](https://github.com/WordPress/gutenberg/pull/19543)
+-   More visibility to the theme opt-in styles documentation [19463](https://github.com/WordPress/gutenberg/pull/19463)
+-   Remove spaces in title for consistency with other components and docs [19466](https://github.com/WordPress/gutenberg/pull/19466) [19464](https://github.com/WordPress/gutenberg/pull/19464)
+-   Update block-filters.md [19595](https://github.com/WordPress/gutenberg/pull/19595) [19684](https://github.com/WordPress/gutenberg/pull/19684)
+-   Update contributors guide with docker-compose info [19362](https://github.com/WordPress/gutenberg/pull/19362)
+-   Add js syntax highlighting to documentation [19465](https://github.com/WordPress/gutenberg/pull/19465)
+-   Use import statement instead of deconstruction in docs [19469](https://github.com/WordPress/gutenberg/pull/19469) [19471](https://github.com/WordPress/gutenberg/pull/19471)
+-   Fix Navigable Container component usage code [19615](https://github.com/WordPress/gutenberg/pull/19615)
 
+### Various
 
+-   Block Editor: Remove (more) legacy "editor-" class name compatibility [19489](https://github.com/WordPress/gutenberg/pull/19489)
+-   Block toolbar: rewrite toolbar forcing [19527](https://github.com/WordPress/gutenberg/pull/19527)
+-   Breadcrumb: isolate logic [19573](https://github.com/WordPress/gutenberg/pull/19573)
+-   Contain selection logic in useMultiSelection [19529](https://github.com/WordPress/gutenberg/pull/19529)
+-   Move navigation and selection logic to WritingFlow [19397](https://github.com/WordPress/gutenberg/pull/19397)
+-   LinkControl
+    -   Refactor LinkControl API [19396](https://github.com/WordPress/gutenberg/pull/19396)
+    -   Remove Popover from LinkControl component [19638](https://github.com/WordPress/gutenberg/pull/19638)
+    -   Add search results label for initial suggestions [19665](https://github.com/WordPress/gutenberg/pull/19665)
+    -   Prevent space being reserved for scrollbar when items fit box [19633](https://github.com/WordPress/gutenberg/pull/19633)
+    -   Remove non-public fetchSearchSuggestions from LinkControl documentation [19710](https://github.com/WordPress/gutenberg/pull/19710)
+    -   Update Nav Block to use new showInitialSuggestions prop on LinkControl [19667](https://github.com/WordPress/gutenberg/pull/19667)
+    -   Flatten LinkControl components by mocking useSelect for tests [19705](https://github.com/WordPress/gutenberg/pull/19705)
+-   Remove core editor usage from block editor rich text [18789](https://github.com/WordPress/gutenberg/pull/18789)
+-   Add script to automatically update core packages [19448](https://github.com/WordPress/gutenberg/pull/19448)
+-   Adds tests for horizontal mover descriptions [19549](https://github.com/WordPress/gutenberg/pull/19549)
+-   Remove: Gradient Picker from cover block placeholder [19712](https://github.com/WordPress/gutenberg/pull/19712)
+-   Add SVGR support to wp-scripts [18243](https://github.com/WordPress/gutenberg/pull/18243)
+-   Add storybook for Panel component [18541](https://github.com/WordPress/gutenberg/pull/18541)
+-   Add supports html: false to new website blocks. [19646](https://github.com/WordPress/gutenberg/pull/19646)
+-   Add: Block editor keyboard shortcuts on the widgets screen [19432](https://github.com/WordPress/gutenberg/pull/19432)
+-   Added 8px padding to search input block. [19452](https://github.com/WordPress/gutenberg/pull/19452)
+-   Adds a "(no title)" label to links to pages or posts with no title [19528](https://github.com/WordPress/gutenberg/pull/19528)
+-   Array type attribute source query comma missing [19717](https://github.com/WordPress/gutenberg/pull/19717)
+-   Block Editor: Make initial inner blocks non-dirtying. [19521](https://github.com/WordPress/gutenberg/pull/19521)
+-   Block Popover: editor canvas as boundary [19322](https://github.com/WordPress/gutenberg/pull/19322)
+-   Check for existing of avatar_urls array before trying to return the avatar img part of user autocomplete fragment [18259](https://github.com/WordPress/gutenberg/pull/18259)
+-   Update downshift dependency to v4.0.5 [19661](https://github.com/WordPress/gutenberg/pull/19661)
+-   Components: replace console.warn with @wordpress/warning [19687](https://github.com/WordPress/gutenberg/pull/19687)
+-   DOM: Mark stripHTML as unstable [19725](https://github.com/WordPress/gutenberg/pull/19725)
+-   Decode HTML entities for publish link [19517](https://github.com/WordPress/gutenberg/pull/19517)
+-   Expose custom gradient picker [19480](https://github.com/WordPress/gutenberg/pull/19480)
+-   Gallerys ids are saved as numbers [19163](https://github.com/WordPress/gutenberg/pull/19163)
+-   Media & Text: Remove "Insert from URL" from the replacement flow. [19606](https://github.com/WordPress/gutenberg/pull/19606)
+-   Page template previews [19106](https://github.com/WordPress/gutenberg/pull/19106)
+-   Post-Author: Move HTML tags outside of the translatable string [19675](https://github.com/WordPress/gutenberg/pull/19675)
+-   Priority Queue: Invoke callback when flushing queue [19282](https://github.com/WordPress/gutenberg/pull/19282)
+-   RichText: split out inline warning [19545](https://github.com/WordPress/gutenberg/pull/19545)
+-   Storybook: Update to latest 5.3 [19599](https://github.com/WordPress/gutenberg/pull/19599)
+-   Update `npm-package-json-lint-config` docs [19584](https://github.com/WordPress/gutenberg/pull/19584)
+-   Update the float on the Spinner to `none` [19338](https://github.com/WordPress/gutenberg/pull/19338)
+-   Wrap color palette in fieldset with label inside of a legend [19546](https://github.com/WordPress/gutenberg/pull/19546)
+-   Check Symbol.iterator not Symbol.toStringTag (redux-routine) [19666](https://github.com/WordPress/gutenberg/pull/19666)
+-   Skip intermittent end to end test on the button block [19653](https://github.com/WordPress/gutenberg/pull/19653)
+-   Fix e2e test failures via console log exception to handle temp `wpnonce` error [19532](https://github.com/WordPress/gutenberg/pull/19532)
+-   Packages: Mark build-styles as side-effectful [19535](https://github.com/WordPress/gutenberg/pull/19535)
+-   docgen: Omit unknown type tag from Markdown format output [19571](https://github.com/WordPress/gutenberg/pull/19571)
+-   Build Tooling: Skip package for build if package.json unreadable [19439](https://github.com/WordPress/gutenberg/pull/19439)
 
 = 7.2.0 =
 
+## Changelog
+
 ### New Features
 
-- Add a new Buttons block. [#17352](https://github.com/wordpress/gutenberg/pull/17352)
-- Support adding links to Media & Text block image. [#18139](https://github.com/wordpress/gutenberg/pull/18139)
-- Navigation block: Support changing the font size. [#19127](https://github.com/wordpress/gutenberg/pull/19127)
-- Gallery block: Add images size selector. [#18581](https://github.com/wordpress/gutenberg/pull/18581)
+-   Add a new Buttons block. [#17352](https://github.com/wordpress/gutenberg/pull/17352)
+-   Support adding links to Media & Text block image. [#18139](https://github.com/wordpress/gutenberg/pull/18139)
+-   Navigation block: Support changing the font size. [#19127](https://github.com/wordpress/gutenberg/pull/19127)
+-   Gallery block: Add images size selector. [#18581](https://github.com/wordpress/gutenberg/pull/18581)
 
 ### Enhancements
 
-- Improve the block inserter search algorithm. [#19122](https://github.com/wordpress/gutenberg/pull/19122)
-- Improve the block placeholders design and responsiveness. [#18745](https://github.com/wordpress/gutenberg/pull/18745)
-- Navigation mode: Auto-enable when tabbing to the block list with an existing block selection. [#19238](https://github.com/wordpress/gutenberg/pull/19238) [#19298](https://github.com/wordpress/gutenberg/pull/19298)
-- Use tabs for gradient and color. [#19133](https://github.com/wordpress/gutenberg/pull/19133)
-- Add "download" keyword to the File block. [#18995](https://github.com/wordpress/gutenberg/pull/18995)
-- Add "poem" keyword to the Verse block. [#19355](https://github.com/wordpress/gutenberg/pull/19355)
-- Convert to blocks:
-    - preserve text alignment. [#19097](https://github.com/wordpress/gutenberg/pull/19097)
-    - Skip shortcode if not on its own line. [#19059](https://github.com/wordpress/gutenberg/pull/19059)
-- Writing flow: Improve tabbing for Edit mode. [#19235](https://github.com/wordpress/gutenberg/pull/19235)
-- Use Popover for the block toolbar. [#18779](https://github.com/wordpress/gutenberg/pull/18779)
-- Improve the block multi-selection styles. [#19094](https://github.com/wordpress/gutenberg/pull/19094) [#19121](https://github.com/wordpress/gutenberg/pull/19121)
-- Support reduced-motion for Social Links transitions. [#18750](https://github.com/wordpress/gutenberg/pull/18750)
-- Use the default cursor for Select Tool [#19157](https://github.com/wordpress/gutenberg/pull/19157)
-- Round position attributes on cover focal point save. [#19183](https://github.com/wordpress/gutenberg/pull/19183)
-- Remove block inserter shortcuts. [#19045](https://github.com/wordpress/gutenberg/pull/19045)
-- Navigation block:
-    - Clarify the placeholder label. [#19105](https://github.com/wordpress/gutenberg/pull/19105)
-    - Removes the reusable block option from the items. [#19250](https://github.com/wordpress/gutenberg/pull/19250)
-    - Sub-items white background adjustment. [#18976](https://github.com/wordpress/gutenberg/pull/18976)
-- Adjustments to the welcome guide. [#19195](https://github.com/wordpress/gutenberg/pull/19195)
-- Audio block: Don't render an empty audio tag. [#18850](https://github.com/wordpress/gutenberg/pull/18850)
-- Make validation of block html tags and attributes case insensitive [#19207](https://github.com/wordpress/gutenberg/pull/19207)
-- Block examples: concatenate strings and add translators notes. [#19048](https://github.com/wordpress/gutenberg/pull/19048)
-- Show the trash button as a link. [#19131](https://github.com/wordpress/gutenberg/pull/19131)
-- Removed the bottom-margin for the RadioControl component. [#19340](https://github.com/wordpress/gutenberg/pull/19340)
-- Copy:
-    - Capitalize "Manager" in Block Manager. [#19375](https://github.com/wordpress/gutenberg/pull/19375)
-    - Expand on sentence case usage. [#18758](https://github.com/wordpress/gutenberg/pull/18758) [#19377](https://github.com/wordpress/gutenberg/pull/19377)
-    - Update the copy of the Experiments page [#18233](https://github.com/wordpress/gutenberg/pull/18233)
-    - Removes title case from alignments for text and image. [#18757](https://github.com/wordpress/gutenberg/pull/18757)
-    - Unify not capitalizing the heading for each of the attributes. [#19374](https://github.com/wordpress/gutenberg/pull/19374)
-    - Updates description of the navigation block. [#19098](https://github.com/wordpress/gutenberg/pull/19098)
+-   Improve the block inserter search algorithm. [#19122](https://github.com/wordpress/gutenberg/pull/19122)
+-   Improve the block placeholders design and responsiveness. [#18745](https://github.com/wordpress/gutenberg/pull/18745)
+-   Navigation mode: Auto-enable when tabbing to the block list with an existing block selection. [#19238](https://github.com/wordpress/gutenberg/pull/19238) [#19298](https://github.com/wordpress/gutenberg/pull/19298)
+-   Use tabs for gradient and color. [#19133](https://github.com/wordpress/gutenberg/pull/19133)
+-   Add "download" keyword to the File block. [#18995](https://github.com/wordpress/gutenberg/pull/18995)
+-   Add "poem" keyword to the Verse block. [#19355](https://github.com/wordpress/gutenberg/pull/19355)
+-   Convert to blocks:
+    -   preserve text alignment. [#19097](https://github.com/wordpress/gutenberg/pull/19097)
+    -   Skip shortcode if not on its own line. [#19059](https://github.com/wordpress/gutenberg/pull/19059)
+-   Writing flow: Improve tabbing for Edit mode. [#19235](https://github.com/wordpress/gutenberg/pull/19235)
+-   Use Popover for the block toolbar. [#18779](https://github.com/wordpress/gutenberg/pull/18779)
+-   Improve the block multi-selection styles. [#19094](https://github.com/wordpress/gutenberg/pull/19094) [#19121](https://github.com/wordpress/gutenberg/pull/19121)
+-   Support reduced-motion for Social Links transitions. [#18750](https://github.com/wordpress/gutenberg/pull/18750)
+-   Use the default cursor for Select Tool [#19157](https://github.com/wordpress/gutenberg/pull/19157)
+-   Round position attributes on cover focal point save. [#19183](https://github.com/wordpress/gutenberg/pull/19183)
+-   Remove block inserter shortcuts. [#19045](https://github.com/wordpress/gutenberg/pull/19045)
+-   Navigation block:
+    -   Clarify the placeholder label. [#19105](https://github.com/wordpress/gutenberg/pull/19105)
+    -   Removes the reusable block option from the items. [#19250](https://github.com/wordpress/gutenberg/pull/19250)
+    -   Sub-items white background adjustment. [#18976](https://github.com/wordpress/gutenberg/pull/18976)
+-   Adjustments to the welcome guide. [#19195](https://github.com/wordpress/gutenberg/pull/19195)
+-   Audio block: Don't render an empty audio tag. [#18850](https://github.com/wordpress/gutenberg/pull/18850)
+-   Make validation of block html tags and attributes case insensitive [#19207](https://github.com/wordpress/gutenberg/pull/19207)
+-   Block examples: concatenate strings and add translators notes. [#19048](https://github.com/wordpress/gutenberg/pull/19048)
+-   Show the trash button as a link. [#19131](https://github.com/wordpress/gutenberg/pull/19131)
+-   Removed the bottom-margin for the RadioControl component. [#19340](https://github.com/wordpress/gutenberg/pull/19340)
+-   Copy:
+    -   Capitalize "Manager" in Block Manager. [#19375](https://github.com/wordpress/gutenberg/pull/19375)
+    -   Expand on sentence case usage. [#18758](https://github.com/wordpress/gutenberg/pull/18758) [#19377](https://github.com/wordpress/gutenberg/pull/19377)
+    -   Update the copy of the Experiments page [#18233](https://github.com/wordpress/gutenberg/pull/18233)
+    -   Removes title case from alignments for text and image. [#18757](https://github.com/wordpress/gutenberg/pull/18757)
+    -   Unify not capitalizing the heading for each of the attributes. [#19374](https://github.com/wordpress/gutenberg/pull/19374)
+    -   Updates description of the navigation block. [#19098](https://github.com/wordpress/gutenberg/pull/19098)
 
 ### Performance:
 
-- Remove the BlockAsyncRenderProvider and render parents asynchronously [#19343](https://github.com/wordpress/gutenberg/pull/19343)
-
-###  Bugs:
-
-- A11y:
-    - Make text alignment items radio menu items. [#19233](https://github.com/wordpress/gutenberg/pull/19233)
-    - Add group role to the  block wrapper element. [#19213](https://github.com/wordpress/gutenberg/pull/19213)
-    - Prevent tabbing to the block drag handle. [#19211](https://github.com/wordpress/gutenberg/pull/19211)
-    - Add a label attribute to the Social Icons block. [#18651](https://github.com/wordpress/gutenberg/pull/18651)
-    - Improve Welcome guide and modal component. [#19261](https://github.com/wordpress/gutenberg/pull/19261) [#19290](https://github.com/wordpress/gutenberg/pull/19290)
-- Pasting:
-    - Content that results in a new block shouldn't be treated as inline content. [#19084](https://github.com/wordpress/gutenberg/pull/19084)
-    - Preserve inline images. [#19064](https://github.com/wordpress/gutenberg/pull/19064)
-    - Remove trailing br elements. [#19035](https://github.com/wordpress/gutenberg/pull/19035)
-    - Remove windows paste markers. [#19040](https://github.com/wordpress/gutenberg/pull/19040)
-    - Strip HTML formatting space for inline text. [#19043](https://github.com/wordpress/gutenberg/pull/19043)
-    - Apply active formats when pasting inline. [#14815](https://github.com/wordpress/gutenberg/pull/14815)
-- Rich Text:
-    - Fix applying a format across 2 other formats. [#19053](https://github.com/wordpress/gutenberg/pull/19053)
-    - Fix using composed characters on Safari. [#19171](https://github.com/wordpress/gutenberg/pull/19171)
-- Fix block navigation using the up arrow key. [#19135](https://github.com/wordpress/gutenberg/pull/19135)
-- Fix Welcome Guide modal display for Internet Explorer. [#19201](https://github.com/wordpress/gutenberg/pull/19201)
-- Fix Gallery block crashing on the contributor role. [#19060](https://github.com/wordpress/gutenberg/pull/19060)
-- Only show available image sizes for Image and Gallery blocks. [#19301](https://github.com/wordpress/gutenberg/pull/19301)
-- Remove the circle mask style from the Image block, and add a "rounded" style instead. [#19028](https://github.com/wordpress/gutenberg/pull/19028)
-- Fix the Jest Preset Default package: Update preset file extension for inclusion in NPM deployments. [#19306](https://github.com/wordpress/gutenberg/pull/19306)
-- Fix the Base Styles package: Import colors into variables. [#19159](https://github.com/wordpress/gutenberg/pull/19159)
-- Limit the Next Page (Page Break) block to root level only. [#18260](https://github.com/wordpress/gutenberg/pull/18260)
-- Navigation mode: fix reverse tabbing to the post title. [#19305](https://github.com/wordpress/gutenberg/pull/19305)
-- Reposition Popovers on click. [#19268](https://github.com/wordpress/gutenberg/pull/19268)
-- Fix RangeControl initialPosition prop to accept 0 as a value. [#18611](https://github.com/wordpress/gutenberg/pull/18611) [#19202](https://github.com/wordpress/gutenberg/pull/19202)
-- CustomSelectControl: Use items width instead of 100%. [#19150](https://github.com/wordpress/gutenberg/pull/19150)
-- Verse block: fix white space. [#19173](https://github.com/wordpress/gutenberg/pull/19173)
-- Add missing i18n to the Latest Posts block settings strings [#19032](https://github.com/wordpress/gutenberg/pull/19032)
-- Fix ColorPicker alpha value normalization. [#18991](https://github.com/wordpress/gutenberg/pull/18991)
-- Fix Post title encoding. [#19187](https://github.com/wordpress/gutenberg/pull/19187)
-- Fix dates alignments in the picker. [#19294](https://github.com/wordpress/gutenberg/pull/19294)
-- Media Replace Flow: Don't show the URL option unless there is a handler. [#19063](https://github.com/wordpress/gutenberg/pull/19063)
-- Popover: don't render fallback anchor if anchorRef is defined. [#19308](https://github.com/wordpress/gutenberg/pull/19308)
-- Fix cursor position when splitting blocks with IME keyboard. [#19055](https://github.com/wordpress/gutenberg/pull/19055)
-- URLInput: Avoid showing the suggestions loader when disabled. [#18979](https://github.com/wordpress/gutenberg/pull/18979)
-- Translate block example strings. [#18162](https://github.com/wordpress/gutenberg/pull/18162)
-- Writing flow: simplify & fix tabbing out of block. [#19312](https://github.com/wordpress/gutenberg/pull/19312)
+-   Remove the BlockAsyncRenderProvider and render parents asynchronously [#19343](https://github.com/wordpress/gutenberg/pull/19343)
+
+### Bugs:
+
+-   A11y:
+    -   Make text alignment items radio menu items. [#19233](https://github.com/wordpress/gutenberg/pull/19233)
+    -   Add group role to the block wrapper element. [#19213](https://github.com/wordpress/gutenberg/pull/19213)
+    -   Prevent tabbing to the block drag handle. [#19211](https://github.com/wordpress/gutenberg/pull/19211)
+    -   Add a label attribute to the Social Icons block. [#18651](https://github.com/wordpress/gutenberg/pull/18651)
+    -   Improve Welcome guide and modal component. [#19261](https://github.com/wordpress/gutenberg/pull/19261) [#19290](https://github.com/wordpress/gutenberg/pull/19290)
+-   Pasting:
+    -   Content that results in a new block shouldn't be treated as inline content. [#19084](https://github.com/wordpress/gutenberg/pull/19084)
+    -   Preserve inline images. [#19064](https://github.com/wordpress/gutenberg/pull/19064)
+    -   Remove trailing br elements. [#19035](https://github.com/wordpress/gutenberg/pull/19035)
+    -   Remove windows paste markers. [#19040](https://github.com/wordpress/gutenberg/pull/19040)
+    -   Strip HTML formatting space for inline text. [#19043](https://github.com/wordpress/gutenberg/pull/19043)
+    -   Apply active formats when pasting inline. [#14815](https://github.com/wordpress/gutenberg/pull/14815)
+-   Rich Text:
+    -   Fix applying a format across 2 other formats. [#19053](https://github.com/wordpress/gutenberg/pull/19053)
+    -   Fix using composed characters on Safari. [#19171](https://github.com/wordpress/gutenberg/pull/19171)
+-   Fix block navigation using the up arrow key. [#19135](https://github.com/wordpress/gutenberg/pull/19135)
+-   Fix Welcome Guide modal display for Internet Explorer. [#19201](https://github.com/wordpress/gutenberg/pull/19201)
+-   Fix Gallery block crashing on the contributor role. [#19060](https://github.com/wordpress/gutenberg/pull/19060)
+-   Only show available image sizes for Image and Gallery blocks. [#19301](https://github.com/wordpress/gutenberg/pull/19301)
+-   Remove the circle mask style from the Image block, and add a "rounded" style instead. [#19028](https://github.com/wordpress/gutenberg/pull/19028)
+-   Fix the Jest Preset Default package: Update preset file extension for inclusion in NPM deployments. [#19306](https://github.com/wordpress/gutenberg/pull/19306)
+-   Fix the Base Styles package: Import colors into variables. [#19159](https://github.com/wordpress/gutenberg/pull/19159)
+-   Limit the Next Page (Page Break) block to root level only. [#18260](https://github.com/wordpress/gutenberg/pull/18260)
+-   Navigation mode: fix reverse tabbing to the post title. [#19305](https://github.com/wordpress/gutenberg/pull/19305)
+-   Reposition Popovers on click. [#19268](https://github.com/wordpress/gutenberg/pull/19268)
+-   Fix RangeControl initialPosition prop to accept 0 as a value. [#18611](https://github.com/wordpress/gutenberg/pull/18611) [#19202](https://github.com/wordpress/gutenberg/pull/19202)
+-   CustomSelectControl: Use items width instead of 100%. [#19150](https://github.com/wordpress/gutenberg/pull/19150)
+-   Verse block: fix white space. [#19173](https://github.com/wordpress/gutenberg/pull/19173)
+-   Add missing i18n to the Latest Posts block settings strings [#19032](https://github.com/wordpress/gutenberg/pull/19032)
+-   Fix ColorPicker alpha value normalization. [#18991](https://github.com/wordpress/gutenberg/pull/18991)
+-   Fix Post title encoding. [#19187](https://github.com/wordpress/gutenberg/pull/19187)
+-   Fix dates alignments in the picker. [#19294](https://github.com/wordpress/gutenberg/pull/19294)
+-   Media Replace Flow: Don't show the URL option unless there is a handler. [#19063](https://github.com/wordpress/gutenberg/pull/19063)
+-   Popover: don't render fallback anchor if anchorRef is defined. [#19308](https://github.com/wordpress/gutenberg/pull/19308)
+-   Fix cursor position when splitting blocks with IME keyboard. [#19055](https://github.com/wordpress/gutenberg/pull/19055)
+-   URLInput: Avoid showing the suggestions loader when disabled. [#18979](https://github.com/wordpress/gutenberg/pull/18979)
+-   Translate block example strings. [#18162](https://github.com/wordpress/gutenberg/pull/18162)
+-   Writing flow: simplify & fix tabbing out of block. [#19312](https://github.com/wordpress/gutenberg/pull/19312)
 
 ### New APIs:
 
-- Button component:
-    - Support the icon prop and use a consistent button height. [#19193](https://github.com/wordpress/gutenberg/pull/19193) [#19366](https://github.com/wordpress/gutenberg/pull/19366) [#19123](https://github.com/wordpress/gutenberg/pull/19123) [#19058](https://github.com/wordpress/gutenberg/pull/19058)
-    - Deprecate IconButton and replace its usage with Button. [#19299](https://github.com/wordpress/gutenberg/pull/19299) [#19241](https://github.com/wordpress/gutenberg/pull/19241)
-    - Support isPressed prop in Button and SVG components. [#17748](https://github.com/wordpress/gutenberg/pull/17748)
-- New the @wordpress/keyboard-shortcuts package:
-    - Add the package. [#19100](https://github.com/wordpress/gutenberg/pull/19100)
-    - Optimize useShortcut performance. [#19341](https://github.com/wordpress/gutenberg/pull/19341)
-    - Refactor KeyboardShortcuts component to rely on useKeyboardShortcut hook. [#19325](https://github.com/wordpress/gutenberg/pull/19325)
-    - Refactor existing editor shortcuts to rely on the package. [#19320](https://github.com/wordpress/gutenberg/pull/19320) [#19327](https://github.com/wordpress/gutenberg/pull/19327) [#19332](https://github.com/wordpress/gutenberg/pull/19332) [#19318](https://github.com/wordpress/gutenberg/pull/19318) [#19334](https://github.com/wordpress/gutenberg/pull/19334) [#19385](https://github.com/wordpress/gutenberg/pull/19385) [#19395](https://github.com/wordpress/gutenberg/pull/19395)
-- New React hook: useInstanceId. [#19091](https://github.com/wordpress/gutenberg/pull/19091)
-- Support running arbitrary commands on the @wordpress/env containers and use it for linting and server registered fixtures. [#18986](https://github.com/wordpress/gutenberg/pull/18986)
-- Font Size Picker: Add default size [#18273](https://github.com/wordpress/gutenberg/pull/18273)
-
+-   Button component:
+    -   Support the icon prop and use a consistent button height. [#19193](https://github.com/wordpress/gutenberg/pull/19193) [#19366](https://github.com/wordpress/gutenberg/pull/19366) [#19123](https://github.com/wordpress/gutenberg/pull/19123) [#19058](https://github.com/wordpress/gutenberg/pull/19058)
+    -   Deprecate IconButton and replace its usage with Button. [#19299](https://github.com/wordpress/gutenberg/pull/19299) [#19241](https://github.com/wordpress/gutenberg/pull/19241)
+    -   Support isPressed prop in Button and SVG components. [#17748](https://github.com/wordpress/gutenberg/pull/17748)
+-   New the @wordpress/keyboard-shortcuts package:
+    -   Add the package. [#19100](https://github.com/wordpress/gutenberg/pull/19100)
+    -   Optimize useShortcut performance. [#19341](https://github.com/wordpress/gutenberg/pull/19341)
+    -   Refactor KeyboardShortcuts component to rely on useKeyboardShortcut hook. [#19325](https://github.com/wordpress/gutenberg/pull/19325)
+    -   Refactor existing editor shortcuts to rely on the package. [#19320](https://github.com/wordpress/gutenberg/pull/19320) [#19327](https://github.com/wordpress/gutenberg/pull/19327) [#19332](https://github.com/wordpress/gutenberg/pull/19332) [#19318](https://github.com/wordpress/gutenberg/pull/19318) [#19334](https://github.com/wordpress/gutenberg/pull/19334) [#19385](https://github.com/wordpress/gutenberg/pull/19385) [#19395](https://github.com/wordpress/gutenberg/pull/19395)
+-   New React hook: useInstanceId. [#19091](https://github.com/wordpress/gutenberg/pull/19091)
+-   Support running arbitrary commands on the @wordpress/env containers and use it for linting and server registered fixtures. [#18986](https://github.com/wordpress/gutenberg/pull/18986)
+-   Font Size Picker: Add default size [#18273](https://github.com/wordpress/gutenberg/pull/18273)
 
 ### Experiments
 
-- Full Site Editing:
-    - Add package with barebones site editor screen. [#19054](https://github.com/wordpress/gutenberg/pull/19054)
-    - Add Multi-Entity Saving flow. [#18029](https://github.com/wordpress/gutenberg/pull/18029) [#19155](https://github.com/wordpress/gutenberg/pull/19155)
-- Widgets screen & customizer:
-    - Fix Customiser block editor crash. [#19023](https://github.com/wordpress/gutenberg/pull/19023)
-    - Fix Drag & Drop not working on the widgets screen. [#19029](https://github.com/wordpress/gutenberg/pull/19029)
-- Allow parent Block to consume child Block's toolbar. [#18440](https://github.com/wordpress/gutenberg/pull/18440)
-- Allow disabling the Block UI. [#18173](https://github.com/wordpress/gutenberg/pull/18173)
-- Block Directory:
-    - Update the regular expression that determines whether the plugin is using an img URL or an icon slug. [#19316](https://github.com/wordpress/gutenberg/pull/19316)
-    - Use the block's title for alt text on block directory plugin items. [#19263](https://github.com/wordpress/gutenberg/pull/19263)
+-   Full Site Editing:
+    -   Add package with barebones site editor screen. [#19054](https://github.com/wordpress/gutenberg/pull/19054)
+    -   Add Multi-Entity Saving flow. [#18029](https://github.com/wordpress/gutenberg/pull/18029) [#19155](https://github.com/wordpress/gutenberg/pull/19155)
+-   Widgets screen & customizer:
+    -   Fix Customiser block editor crash. [#19023](https://github.com/wordpress/gutenberg/pull/19023)
+    -   Fix Drag & Drop not working on the widgets screen. [#19029](https://github.com/wordpress/gutenberg/pull/19029)
+-   Allow parent Block to consume child Block's toolbar. [#18440](https://github.com/wordpress/gutenberg/pull/18440)
+-   Allow disabling the Block UI. [#18173](https://github.com/wordpress/gutenberg/pull/18173)
+-   Block Directory:
+    -   Update the regular expression that determines whether the plugin is using an img URL or an icon slug. [#19316](https://github.com/wordpress/gutenberg/pull/19316)
+    -   Use the block's title for alt text on block directory plugin items. [#19263](https://github.com/wordpress/gutenberg/pull/19263)
 
 ### Documentation
 
-- Add types documention:
-    - @wordpress/a11y [#19096](https://github.com/wordpress/gutenberg/pull/19096)
-    - @wordpress/blob [#19092](https://github.com/wordpress/gutenberg/pull/19092)
-    - @wordpress/dom-ready [#19089](https://github.com/wordpress/gutenberg/pull/19089)
-    - @wordpress/is-shallow-equal [#19090](https://github.com/wordpress/gutenberg/pull/19090)
-    - @wordpress/priority-queue [#18997](https://github.com/wordpress/gutenberg/pull/18997)
-    - @wordpress/i18n [#19099](https://github.com/wordpress/gutenberg/pull/19099)
-- Document the CustomSelectControl component. [#19026](https://github.com/wordpress/gutenberg/pull/19026)
-- Document the WritingFlow component. [#19314](https://github.com/wordpress/gutenberg/pull/19314)
-- Link to the User Support Documentation. [#19361](https://github.com/wordpress/gutenberg/pull/19361)
-- Add more documentation for @wordpress/env. [#19194](https://github.com/wordpress/gutenberg/pull/19194)
-- Add nested block / InnerBlocks tutorial. [#17559](https://github.com/wordpress/gutenberg/pull/17559)
-- Add Developer Tools setup in Getting Started. [#19074](https://github.com/wordpress/gutenberg/pull/19074)
-- Use ESNext as default code example format. [#17873](https://github.com/wordpress/gutenberg/pull/17873)
-- Add standalone npm package release docs [#19381](https://github.com/wordpress/gutenberg/pull/19381)
-- Typos and tweaks: [#19280](https://github.com/wordpress/gutenberg/pull/19280) [#19236](https://github.com/wordpress/gutenberg/pull/19236) [#19376](https://github.com/wordpress/gutenberg/pull/19376) [#19146](https://github.com/wordpress/gutenberg/pull/19146) [#19022](https://github.com/wordpress/gutenberg/pull/19022) [#19005](https://github.com/wordpress/gutenberg/pull/19005) [#18423](https://github.com/wordpress/gutenberg/pull/18423) [#19347](https://github.com/wordpress/gutenberg/pull/19347)
-
+-   Add types documention:
+    -   @wordpress/a11y [#19096](https://github.com/wordpress/gutenberg/pull/19096)
+    -   @wordpress/blob [#19092](https://github.com/wordpress/gutenberg/pull/19092)
+    -   @wordpress/dom-ready [#19089](https://github.com/wordpress/gutenberg/pull/19089)
+    -   @wordpress/is-shallow-equal [#19090](https://github.com/wordpress/gutenberg/pull/19090)
+    -   @wordpress/priority-queue [#18997](https://github.com/wordpress/gutenberg/pull/18997)
+    -   @wordpress/i18n [#19099](https://github.com/wordpress/gutenberg/pull/19099)
+-   Document the CustomSelectControl component. [#19026](https://github.com/wordpress/gutenberg/pull/19026)
+-   Document the WritingFlow component. [#19314](https://github.com/wordpress/gutenberg/pull/19314)
+-   Link to the User Support Documentation. [#19361](https://github.com/wordpress/gutenberg/pull/19361)
+-   Add more documentation for @wordpress/env. [#19194](https://github.com/wordpress/gutenberg/pull/19194)
+-   Add nested block / InnerBlocks tutorial. [#17559](https://github.com/wordpress/gutenberg/pull/17559)
+-   Add Developer Tools setup in Getting Started. [#19074](https://github.com/wordpress/gutenberg/pull/19074)
+-   Use ESNext as default code example format. [#17873](https://github.com/wordpress/gutenberg/pull/17873)
+-   Add standalone npm package release docs [#19381](https://github.com/wordpress/gutenberg/pull/19381)
+-   Typos and tweaks: [#19280](https://github.com/wordpress/gutenberg/pull/19280) [#19236](https://github.com/wordpress/gutenberg/pull/19236) [#19376](https://github.com/wordpress/gutenberg/pull/19376) [#19146](https://github.com/wordpress/gutenberg/pull/19146) [#19022](https://github.com/wordpress/gutenberg/pull/19022) [#19005](https://github.com/wordpress/gutenberg/pull/19005) [#18423](https://github.com/wordpress/gutenberg/pull/18423) [#19347](https://github.com/wordpress/gutenberg/pull/19347)
 
 ### Various
 
-- Block Editor: Remove legacy "editor-" class name compatibility. [#19050](https://github.com/wordpress/gutenberg/pull/19050)(https://github.com/wordpress/gutenberg/pull/19046)
-- Block Editor: Test ContrastChecker notices by string comparison. [#19169](https://github.com/wordpress/gutenberg/pull/19169)
-- Fix useColors crashes on storybook. [#19046]
-- Data: Remove unused forceRender argument [#19206](https://github.com/wordpress/gutenberg/pull/19206)
-- Define useSelect dependencies properly. [#19044](https://github.com/wordpress/gutenberg/pull/19044)
-- Deprecate @wordpress/nux package. [#18981](https://github.com/wordpress/gutenberg/pull/18981)
-- E2E Test Utils: Remove empty, unused KeyboardMode file. [#19166](https://github.com/wordpress/gutenberg/pull/19166)
-- Popover: remove buffer options [#19283](https://github.com/wordpress/gutenberg/pull/19283)
-- Refactor the MediaReplaceFlow component to use Dropdown. [#19126](https://github.com/wordpress/gutenberg/pull/19126)
-- Remove unused is-hovered class from the block wrapper. [#19390](https://github.com/wordpress/gutenberg/pull/19390)
-- RichText:
-    - Rewrite withFilters with hooks. [#19117](https://github.com/wordpress/gutenberg/pull/19117)
-    - split out boundary style calculation. [#19319](https://github.com/wordpress/gutenberg/pull/19319)
-- WritingFlow: rewrite with hooks. [#19393](https://github.com/wordpress/gutenberg/pull/19393)
-- Project management: Add prepublish packages command for npm releases. [#19214](https://github.com/wordpress/gutenberg/pull/19214)
-- Remove unused blocks-font-size classname. [#19208](https://github.com/wordpress/gutenberg/pull/19208)
-- Add a pre-commit hook to check whether API docs are updated. [#18820](https://github.com/wordpress/gutenberg/pull/18820)
-- Add mechanism to set a width on withViewportMatch. [#17085](https://github.com/wordpress/gutenberg/pull/17085)
-- Add minimum and maximum values to the Gallery columns attribute. [#16314](https://github.com/wordpress/gutenberg/pull/16314)
-- Include demo block templates in build ZIP. [#19072](https://github.com/wordpress/gutenberg/pull/19072)
-- Fix CSS Coding Standards issue. [#19272](https://github.com/wordpress/gutenberg/pull/19272)
-- Resolve WordPress package type imports. [#18927](https://github.com/wordpress/gutenberg/pull/18927)
-- Add e2e tests:
-    - Splitting and merging text. [#19049](https://github.com/wordpress/gutenberg/pull/19049)
-    - InnerBlocks renderAppender. [#14996](https://github.com/wordpress/gutenberg/pull/14996)
-    - Navigation block. [#19189](https://github.com/wordpress/gutenberg/pull/19189)
-    - Validate embed rendering before proceeding to next [#19042](https://github.com/wordpress/gutenberg/pull/19042)
-- Add unit tests to the useViewportMatch and useMediaQuery React hooks. [#19019](https://github.com/wordpress/gutenberg/pull/19019)
-
-
+-   Block Editor: Remove legacy "editor-" class name compatibility. [#19050](https://github.com/wordpress/gutenberg/pull/19050)(https://github.com/wordpress/gutenberg/pull/19046)
+-   Block Editor: Test ContrastChecker notices by string comparison. [#19169](https://github.com/wordpress/gutenberg/pull/19169)
+-   Fix useColors crashes on storybook. [#19046]
+-   Data: Remove unused forceRender argument [#19206](https://github.com/wordpress/gutenberg/pull/19206)
+-   Define useSelect dependencies properly. [#19044](https://github.com/wordpress/gutenberg/pull/19044)
+-   Deprecate @wordpress/nux package. [#18981](https://github.com/wordpress/gutenberg/pull/18981)
+-   E2E Test Utils: Remove empty, unused KeyboardMode file. [#19166](https://github.com/wordpress/gutenberg/pull/19166)
+-   Popover: remove buffer options [#19283](https://github.com/wordpress/gutenberg/pull/19283)
+-   Refactor the MediaReplaceFlow component to use Dropdown. [#19126](https://github.com/wordpress/gutenberg/pull/19126)
+-   Remove unused is-hovered class from the block wrapper. [#19390](https://github.com/wordpress/gutenberg/pull/19390)
+-   RichText:
+    -   Rewrite withFilters with hooks. [#19117](https://github.com/wordpress/gutenberg/pull/19117)
+    -   split out boundary style calculation. [#19319](https://github.com/wordpress/gutenberg/pull/19319)
+-   WritingFlow: rewrite with hooks. [#19393](https://github.com/wordpress/gutenberg/pull/19393)
+-   Project management: Add prepublish packages command for npm releases. [#19214](https://github.com/wordpress/gutenberg/pull/19214)
+-   Remove unused blocks-font-size classname. [#19208](https://github.com/wordpress/gutenberg/pull/19208)
+-   Add a pre-commit hook to check whether API docs are updated. [#18820](https://github.com/wordpress/gutenberg/pull/18820)
+-   Add mechanism to set a width on withViewportMatch. [#17085](https://github.com/wordpress/gutenberg/pull/17085)
+-   Add minimum and maximum values to the Gallery columns attribute. [#16314](https://github.com/wordpress/gutenberg/pull/16314)
+-   Include demo block templates in build ZIP. [#19072](https://github.com/wordpress/gutenberg/pull/19072)
+-   Fix CSS Coding Standards issue. [#19272](https://github.com/wordpress/gutenberg/pull/19272)
+-   Resolve WordPress package type imports. [#18927](https://github.com/wordpress/gutenberg/pull/18927)
+-   Add e2e tests:
+    -   Splitting and merging text. [#19049](https://github.com/wordpress/gutenberg/pull/19049)
+    -   InnerBlocks renderAppender. [#14996](https://github.com/wordpress/gutenberg/pull/14996)
+    -   Navigation block. [#19189](https://github.com/wordpress/gutenberg/pull/19189)
+    -   Validate embed rendering before proceeding to next [#19042](https://github.com/wordpress/gutenberg/pull/19042)
+-   Add unit tests to the useViewportMatch and useMediaQuery React hooks. [#19019](https://github.com/wordpress/gutenberg/pull/19019)
 
 = 7.1.0 =
 
+## Changelog
+
 ### Features
 
-* Adding a menu to visually [switch between edit and](https://github.com/WordPress/gutenberg/pull/18624) [navigation](https://github.com/WordPress/gutenberg/pull/18829) [modes](https://github.com/WordPress/gutenberg/pull/18805) and announce the mode changes to screen reader users.
-* Support adding [a caption to the Table block](https://github.com/WordPress/gutenberg/pull/15554).
-* Implement a [Welcome Guide](https://github.com/WordPress/gutenberg/pull/18041) modal.
+-   Adding a menu to visually [switch between edit and](https://github.com/WordPress/gutenberg/pull/18624) [navigation](https://github.com/WordPress/gutenberg/pull/18829) [modes](https://github.com/WordPress/gutenberg/pull/18805) and announce the mode changes to screen reader users.
+-   Support adding [a caption to the Table block](https://github.com/WordPress/gutenberg/pull/15554).
+-   Implement a [Welcome Guide](https://github.com/WordPress/gutenberg/pull/18041) modal.
 
 ### Enhancements
 
-* Use a [Fixed Block](https://github.com/WordPress/gutenberg/pull/18686) [Toolbar](https://github.com/WordPress/gutenberg/pull/18945https://github.com/WordPress/gutenberg/pull/18945) [on](https://github.com/WordPress/gutenberg/pull/19014) Mobile Web.
-* Block UI:
-    * [Remove the parent block from the block title](https://github.com/WordPress/gutenberg/pull/18795) component.
-    * [Remove dashed](https://github.com/WordPress/gutenberg/pull/18105) [outlines](https://github.com/WordPress/gutenberg/pull/18865) for child and parent blocks.
-    * Remove [hover](https://github.com/WordPress/gutenberg/pull/18862) [styles](https://github.com/WordPress/gutenberg/pull/18904).
-* Navigation block:
-    * Keep a single place to trigger the “[Open in a new tab](https://github.com/WordPress/gutenberg/pull/18532)” option.
-    * Fix overflow by allowing [wrapping of menu items](https://github.com/WordPress/gutenberg/pull/18431).
-    * Fix [double click to open the appender](https://github.com/WordPress/gutenberg/pull/18379).
-    * Add a **type=submit** to the [search suggestion buttons](https://github.com/WordPress/gutenberg/pull/18933).
-    * Support [justifying the menu items](https://github.com/WordPress/gutenberg/pull/18909).
-    * Use [correct classnames](https://github.com/WordPress/gutenberg/pull/18926) for Link block save output.
-    * Remove the [inspector controls](https://github.com/WordPress/gutenberg/pull/18948).
-* Improve the block multi-selection:
-    * A11y: [Use the browser’s selection](https://github.com/WordPress/gutenberg/pull/16835) default color. 
-    * Polish the [styles](https://github.com/WordPress/gutenberg/pull/18867).
-    * [Responsive](https://github.com/WordPress/gutenberg/pull/18915) multi-selection.
-    * [Allow pasting](https://github.com/WordPress/gutenberg/pull/18746) on multi-selection.
-* Improve the [Image blocks replacement flow/UI](https://github.com/WordPress/gutenberg/pull/16200).
-* Disable the [HTML mode in the Cover block](https://github.com/WordPress/gutenberg/pull/18730).
-* Add [friendly offline error messages](https://github.com/WordPress/gutenberg/pull/17961) on Rest API request failures.
-* [Round the focal point](https://github.com/WordPress/gutenberg/pull/18765) coordinates.
-* Popover & Dropdowns: Consistently and [smoothly](https://github.com/WordPress/gutenberg/pull/18813) [adjust](https://github.com/WordPress/gutenberg/pull/18936) the [position on scroll](https://github.com/WordPress/gutenberg/pull/17867).
-* Remove [clearing the block selection](https://github.com/WordPress/gutenberg/pull/18621) on sidebar tab switch.
-* [Separate editor notices](https://github.com/WordPress/gutenberg/pull/18871) by border instead of margin.
-* Allow [drag and dropping images into the featured image](https://github.com/WordPress/gutenberg/pull/17486https://github.com/WordPress/gutenberg/pull/17486) box.
-
-### Bug Fixes
-
-* Prevent [resized Image blocks](https://github.com/WordPress/gutenberg/pull/18728) from overlapping the boundaries of the block.
-* Fix [wrong link to attachment page](https://github.com/WordPress/gutenberg/pull/18731) after replacing images.
-* Fix Media & Text block: "[Crop image to fill entire column](https://github.com/WordPress/gutenberg/pull/18729)" reset on image change.
-* Fix the [Snackbar notices position](https://github.com/WordPress/gutenberg/pull/18801).
-* Save the [Verse block line breaks](https://github.com/WordPress/gutenberg/pull/18372) as single characters.
-* [Remove has-background-dim-NaN classname](https://github.com/WordPress/gutenberg/pull/18011) from the Cover block.
-* Normalize the keys of the [apiFetch preloaded data](https://github.com/WordPress/gutenberg/pull/18724) to avoid unnecessary Rest API calls.
-* Fix [CSS styles of the ColorPicker](https://github.com/WordPress/gutenberg/pull/18448) component.
-* Update the Inspector slots to use the bubblesVirtually slots Fixing [RichText usage in Inspector controls](https://github.com/WordPress/gutenberg/pull/16807).
-* Move the [Modals and Popovers](https://github.com/WordPress/gutenberg/pull/18775) to the right position in the DOM.
-* Fix [alignment of date picker days](https://github.com/WordPress/gutenberg/pull/18856) when used in block.
-* Fix alignment of [ToggleControl label](https://github.com/WordPress/gutenberg/pull/18815).
-* Fix [the toggled state](https://github.com/WordPress/gutenberg/pull/18868) in the block toolbar buttons.
-* Fix the [multi-select inspector padding](https://github.com/WordPress/gutenberg/pull/18847).
-* Fix the behavior that allows writing by [clicking anywhere in the canvas](https://github.com/WordPress/gutenberg/pull/18732).
-* Prevent [private posts with a future date](https://github.com/WordPress/gutenberg/pull/18834) from becoming public on update.
-* Fix [useColors crashes if contrast checkers](https://github.com/WordPress/gutenberg/pull/18884) are not specified.
-* Render [metaboxes as a single seemless unit](https://github.com/WordPress/gutenberg/pull/18873) to fix styling issues for themes with colored backgrounds.
-* Fix the [FontSizePicker custom option](https://github.com/WordPress/gutenberg/pull/18842).
-* Fix [reusable blocks](https://github.com/WordPress/gutenberg/pull/18902) showing up as too tall.
-* Fix [Drop Cap + alignment](https://github.com/WordPress/gutenberg/pull/18831) producing a gap between paragraphs.
-* Fix [Cover to Image block transform](https://github.com/WordPress/gutenberg/pull/18023) when no image is used in the Cover block.
-* Ensure [empty classname is not output](https://github.com/WordPress/gutenberg/pull/18861) onto table element.
-* Fix [scrolling the sidebar on mobile](https://github.com/WordPress/gutenberg/pull/18937).
-* I18: Fix the [Code block](https://github.com/WordPress/gutenberg/pull/18964) [example](https://github.com/WordPress/gutenberg/pull/18993) [string](https://github.com/WordPress/gutenberg/pull/18973).
+-   Use a [Fixed Block](https://github.com/WordPress/gutenberg/pull/18686) [Toolbar](https://github.com/WordPress/gutenberg/pull/18945https://github.com/WordPress/gutenberg/pull/18945) [on](https://github.com/WordPress/gutenberg/pull/19014) Mobile Web.
+-   Block UI:
+    -   [Remove the parent block from the block title](https://github.com/WordPress/gutenberg/pull/18795) component.
+    -   [Remove dashed](https://github.com/WordPress/gutenberg/pull/18105) [outlines](https://github.com/WordPress/gutenberg/pull/18865) for child and parent blocks.
+    -   Remove [hover](https://github.com/WordPress/gutenberg/pull/18862) [styles](https://github.com/WordPress/gutenberg/pull/18904).
+-   Navigation block:
+    -   Keep a single place to trigger the “[Open in a new tab](https://github.com/WordPress/gutenberg/pull/18532)” option.
+    -   Fix overflow by allowing [wrapping of menu items](https://github.com/WordPress/gutenberg/pull/18431).
+    -   Fix [double click to open the appender](https://github.com/WordPress/gutenberg/pull/18379).
+    -   Add a **type=submit** to the [search suggestion buttons](https://github.com/WordPress/gutenberg/pull/18933).
+    -   Support [justifying the menu items](https://github.com/WordPress/gutenberg/pull/18909).
+    -   Use [correct classnames](https://github.com/WordPress/gutenberg/pull/18926) for Link block save output.
+    -   Remove the [inspector controls](https://github.com/WordPress/gutenberg/pull/18948).
+-   Improve the block multi-selection:
+    -   A11y: [Use the browser’s selection](https://github.com/WordPress/gutenberg/pull/16835) default color.
+    -   Polish the [styles](https://github.com/WordPress/gutenberg/pull/18867).
+    -   [Responsive](https://github.com/WordPress/gutenberg/pull/18915) multi-selection.
+    -   [Allow pasting](https://github.com/WordPress/gutenberg/pull/18746) on multi-selection.
+-   Improve the [Image blocks replacement flow/UI](https://github.com/WordPress/gutenberg/pull/16200).
+-   Disable the [HTML mode in the Cover block](https://github.com/WordPress/gutenberg/pull/18730).
+-   Add [friendly offline error messages](https://github.com/WordPress/gutenberg/pull/17961) on Rest API request failures.
+-   [Round the focal point](https://github.com/WordPress/gutenberg/pull/18765) coordinates.
+-   Popover & Dropdowns: Consistently and [smoothly](https://github.com/WordPress/gutenberg/pull/18813) [adjust](https://github.com/WordPress/gutenberg/pull/18936) the [position on scroll](https://github.com/WordPress/gutenberg/pull/17867).
+-   Remove [clearing the block selection](https://github.com/WordPress/gutenberg/pull/18621) on sidebar tab switch.
+-   [Separate editor notices](https://github.com/WordPress/gutenberg/pull/18871) by border instead of margin.
+-   Allow [drag and dropping images into the featured image](https://github.com/WordPress/gutenberg/pull/17486https://github.com/WordPress/gutenberg/pull/17486) box.
+
+### Bug Fixes
+
+-   Prevent [resized Image blocks](https://github.com/WordPress/gutenberg/pull/18728) from overlapping the boundaries of the block.
+-   Fix [wrong link to attachment page](https://github.com/WordPress/gutenberg/pull/18731) after replacing images.
+-   Fix Media & Text block: "[Crop image to fill entire column](https://github.com/WordPress/gutenberg/pull/18729)" reset on image change.
+-   Fix the [Snackbar notices position](https://github.com/WordPress/gutenberg/pull/18801).
+-   Save the [Verse block line breaks](https://github.com/WordPress/gutenberg/pull/18372) as single characters.
+-   [Remove has-background-dim-NaN classname](https://github.com/WordPress/gutenberg/pull/18011) from the Cover block.
+-   Normalize the keys of the [apiFetch preloaded data](https://github.com/WordPress/gutenberg/pull/18724) to avoid unnecessary Rest API calls.
+-   Fix [CSS styles of the ColorPicker](https://github.com/WordPress/gutenberg/pull/18448) component.
+-   Update the Inspector slots to use the bubblesVirtually slots Fixing [RichText usage in Inspector controls](https://github.com/WordPress/gutenberg/pull/16807).
+-   Move the [Modals and Popovers](https://github.com/WordPress/gutenberg/pull/18775) to the right position in the DOM.
+-   Fix [alignment of date picker days](https://github.com/WordPress/gutenberg/pull/18856) when used in block.
+-   Fix alignment of [ToggleControl label](https://github.com/WordPress/gutenberg/pull/18815).
+-   Fix [the toggled state](https://github.com/WordPress/gutenberg/pull/18868) in the block toolbar buttons.
+-   Fix the [multi-select inspector padding](https://github.com/WordPress/gutenberg/pull/18847).
+-   Fix the behavior that allows writing by [clicking anywhere in the canvas](https://github.com/WordPress/gutenberg/pull/18732).
+-   Prevent [private posts with a future date](https://github.com/WordPress/gutenberg/pull/18834) from becoming public on update.
+-   Fix [useColors crashes if contrast checkers](https://github.com/WordPress/gutenberg/pull/18884) are not specified.
+-   Render [metaboxes as a single seemless unit](https://github.com/WordPress/gutenberg/pull/18873) to fix styling issues for themes with colored backgrounds.
+-   Fix the [FontSizePicker custom option](https://github.com/WordPress/gutenberg/pull/18842).
+-   Fix [reusable blocks](https://github.com/WordPress/gutenberg/pull/18902) showing up as too tall.
+-   Fix [Drop Cap + alignment](https://github.com/WordPress/gutenberg/pull/18831) producing a gap between paragraphs.
+-   Fix [Cover to Image block transform](https://github.com/WordPress/gutenberg/pull/18023) when no image is used in the Cover block.
+-   Ensure [empty classname is not output](https://github.com/WordPress/gutenberg/pull/18861) onto table element.
+-   Fix [scrolling the sidebar on mobile](https://github.com/WordPress/gutenberg/pull/18937).
+-   I18: Fix the [Code block](https://github.com/WordPress/gutenberg/pull/18964) [example](https://github.com/WordPress/gutenberg/pull/18993) [string](https://github.com/WordPress/gutenberg/pull/18973).
 
 ### APIs
 
-* Support a [**disabled** prop in the RichText](https://github.com/WordPress/gutenberg/pull/18792) component.
-* Add a [new](https://github.com/WordPress/gutenberg/pull/18827) [CustomSelectControl](https://github.com/WordPress/gutenberg/pull/17926) [component](https://github.com/WordPress/gutenberg/pull/18944).
-* Add a new [TextHighlight](https://github.com/WordPress/gutenberg/pull/18609) component.
-* Add a new [CustomGradientPicker](https://github.com/WordPress/gutenberg/pull/17603) component.
-* Add [useViewportMatch](https://github.com/WordPress/gutenberg/pull/18816) [React hook](https://github.com/WordPress/gutenberg/pull/18950) to the @wordpress/compose package.
-* Allowing [changing the aXe config](https://github.com/WordPress/gutenberg/pull/18712) in the @wordpress/just-puppeteer-axe package.
+-   Support a [**disabled** prop in the RichText](https://github.com/WordPress/gutenberg/pull/18792) component.
+-   Add a [new](https://github.com/WordPress/gutenberg/pull/18827) [CustomSelectControl](https://github.com/WordPress/gutenberg/pull/17926) [component](https://github.com/WordPress/gutenberg/pull/18944).
+-   Add a new [TextHighlight](https://github.com/WordPress/gutenberg/pull/18609) component.
+-   Add a new [CustomGradientPicker](https://github.com/WordPress/gutenberg/pull/17603) component.
+-   Add [useViewportMatch](https://github.com/WordPress/gutenberg/pull/18816) [React hook](https://github.com/WordPress/gutenberg/pull/18950) to the @wordpress/compose package.
+-   Allowing [changing the aXe config](https://github.com/WordPress/gutenberg/pull/18712) in the @wordpress/just-puppeteer-axe package.
 
 ### Experiments
 
-* Block Content Areas:
-    * Add a [demo templates](https://github.com/WordPress/gutenberg/pull/18554) directory. 
-    * Add the [Template Part](https://github.com/WordPress/gutenberg/pull/18736) block.
-    * Add [documentation](https://github.com/WordPress/gutenberg/pull/18890) for the current state of the experiment.
-* Widgets screen:
-    * Clear the block selection when [clicking outside the widget areas](https://github.com/WordPress/gutenberg/pull/17851).
-* APIs:
-    * Add a new [\_\_experimentalResolveSelect](https://github.com/WordPress/gutenberg/pull/17558https://github.com/WordPress/gutenberg/pull/17558) API to the data package.
-    * Add [color detection and contrast checks support](https://github.com/WordPress/gutenberg/pull/18547) to the useColors hook.
+-   Block Content Areas:
+    -   Add a [demo templates](https://github.com/WordPress/gutenberg/pull/18554) directory.
+    -   Add the [Template Part](https://github.com/WordPress/gutenberg/pull/18736) block.
+    -   Add [documentation](https://github.com/WordPress/gutenberg/pull/18890) for the current state of the experiment.
+-   Widgets screen:
+    -   Clear the block selection when [clicking outside the widget areas](https://github.com/WordPress/gutenberg/pull/17851).
+-   APIs:
+    -   Add a new [\_\_experimentalResolveSelect](https://github.com/WordPress/gutenberg/pull/17558https://github.com/WordPress/gutenberg/pull/17558) API to the data package.
+    -   Add [color detection and contrast checks support](https://github.com/WordPress/gutenberg/pull/18547) to the useColors hook.
 
 ### Documentation
 
-* Improvements to the [Getting Started](https://github.com/WordPress/gutenberg/pull/18769) documentation.
-* Include [TypeScript type checking](https://github.com/WordPress/gutenberg/pull/18879) in Testing Overview.
-* Add [JSDoc recommendations](https://github.com/WordPress/gutenberg/pull/18920).
-* Reintroduce [NodeJS LTS](https://github.com/WordPress/gutenberg/pull/18923) support commitment.
-* Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/18752), [2](https://github.com/WordPress/gutenberg/pull/18882), [3](https://github.com/WordPress/gutenberg/pull/18882), [4](https://github.com/WordPress/gutenberg/pull/18916), [5](https://github.com/WordPress/gutenberg/pull/18961), [6](https://github.com/WordPress/gutenberg/pull/19012).
+-   Improvements to the [Getting Started](https://github.com/WordPress/gutenberg/pull/18769) documentation.
+-   Include [TypeScript type checking](https://github.com/WordPress/gutenberg/pull/18879) in Testing Overview.
+-   Add [JSDoc recommendations](https://github.com/WordPress/gutenberg/pull/18920).
+-   Reintroduce [NodeJS LTS](https://github.com/WordPress/gutenberg/pull/18923) support commitment.
+-   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/18752), [2](https://github.com/WordPress/gutenberg/pull/18882), [3](https://github.com/WordPress/gutenberg/pull/18882), [4](https://github.com/WordPress/gutenberg/pull/18916), [5](https://github.com/WordPress/gutenberg/pull/18961), [6](https://github.com/WordPress/gutenberg/pull/19012).
 
 ### Performance
 
-* Avoid [rerendering the EditorRegions component](https://github.com/WordPress/gutenberg/pull/18776) on each click.
-* Flatten and simplify the [align hook](https://github.com/WordPress/gutenberg/pull/18963) [rendering](https://github.com/WordPress/gutenberg/pull/19008).
-* Shim the [meta attribute source](https://github.com/WordPress/gutenberg/pull/18960) on block registration.
+-   Avoid [rerendering the EditorRegions component](https://github.com/WordPress/gutenberg/pull/18776) on each click.
+-   Flatten and simplify the [align hook](https://github.com/WordPress/gutenberg/pull/18963) [rendering](https://github.com/WordPress/gutenberg/pull/19008).
+-   Shim the [meta attribute source](https://github.com/WordPress/gutenberg/pull/18960) on block registration.
 
 ### Various
 
-* Storybook: Add [StoryShots integration](https://github.com/WordPress/gutenberg/pull/18031) to generate unit tests.
-* Work on the stability of e2e tests: [1](https://github.com/WordPress/gutenberg/pull/18662), [2](https://github.com/WordPress/gutenberg/pull/18754), [3](https://github.com/WordPress/gutenberg/pull/18753), [4](https://github.com/WordPress/gutenberg/pull/18773), [5](https://github.com/WordPress/gutenberg/pull/18771).
-* Use [consistent theme colors and font sizes](https://github.com/WordPress/gutenberg/pull/18761) in e2e tests.
-* Travis: [Skip the deploy stage](https://github.com/WordPress/gutenberg/pull/18788) on PRs.
-* And a Travis job to check the [IE11 compatibility of the produced JavaScript builds](https://github.com/WordPress/gutenberg/pull/18774).
-* Avoid usage of [editor store on block editor](https://github.com/WordPress/gutenberg/pull/18784) reusable blocks inserter.
-* Replace the [fs-extra dependency with rimraf](https://github.com/WordPress/gutenberg/pull/18790).
-* RSS block: Remove [PHP 5.2 compatibility code](https://github.com/WordPress/gutenberg/pull/15806).
-* Update the [Columns block to use the Patterns API](https://github.com/WordPress/gutenberg/pull/18283).
-* Refactor the [BlockToolbar component](https://github.com/WordPress/gutenberg/pull/18843) to use React hooks.
-* Refactor the [BlockDraggable](https://github.com/WordPress/gutenberg/pull/18756) component for a simpler React tree.
-* Refactor the [BlockHTML](https://github.com/WordPress/gutenberg/pull/18968) component to use React hooks.
-* Refactor the [BlockList](https://github.com/WordPress/gutenberg/pull/18821) component to use React hooks.
-* Refactor the [BlockInsertionPoint](https://github.com/WordPress/gutenberg/pull/18821) component to use React hooks.
-* [Split @wordpress/urls into multiple modules](https://github.com/WordPress/gutenberg/pull/18689https://github.com/WordPress/gutenberg/pull/18689)/files to allow better tree-shaking.
-* Improve the Storybook setup to allow [updates on style changes](https://github.com/WordPress/gutenberg/pull/18676).
-* Enforce consistent usage of [Button and ToolbarGroup](https://github.com/WordPress/gutenberg/pull/18817) components.
-* Use the [colors hook in the Paragraph block](https://github.com/WordPress/gutenberg/pull/18148).
-* Add missing actions and tests for [lockPostAutosaving, unlockPostAutosaving](https://github.com/WordPress/gutenberg/pull/18854).
-* [Collapse passed](https://github.com/WordPress/gutenberg/pull/16755) [tests](https://github.com/WordPress/gutenberg/pull/18896) in Travis jobs.
-* Add [side effects property to the @wordpress/components package](https://github.com/WordPress/gutenberg/pull/18911) to allow tree-shaking.
-* Add a [script to perform patch releases](https://github.com/WordPress/gutenberg/pull/18938) for old npm package versions.
-* Reuse the [URLInput component in the Social Links](https://github.com/WordPress/gutenberg/pull/18905) block and [disable suggestions](https://github.com/WordPress/gutenberg/pull/18946).
-* Improve and simplify [reusable block](https://github.com/WordPress/gutenberg/pull/18903) [styles](https://github.com/WordPress/gutenberg/pull/18958).
-* Refactor the [Gallery edit component](https://github.com/WordPress/gutenberg/pull/18265) to be semi-cross-platform.
-* Run tests using the same [environment](https://github.com/WordPress/gutenberg/pull/18703) version used for development.
-* Add [CPU/Network slowdown configuration](https://github.com/WordPress/gutenberg/pull/18770) options to the e2e tests setup.
-* Enable [Type checking for the @wordpress/token-list](https://github.com/WordPress/gutenberg/pull/18839) package.
-* Move the [changelog.txt and readme.txt files](https://github.com/WordPress/gutenberg/pull/18828) to the GitHub repository.
+-   Storybook: Add [StoryShots integration](https://github.com/WordPress/gutenberg/pull/18031) to generate unit tests.
+-   Work on the stability of e2e tests: [1](https://github.com/WordPress/gutenberg/pull/18662), [2](https://github.com/WordPress/gutenberg/pull/18754), [3](https://github.com/WordPress/gutenberg/pull/18753), [4](https://github.com/WordPress/gutenberg/pull/18773), [5](https://github.com/WordPress/gutenberg/pull/18771).
+-   Use [consistent theme colors and font sizes](https://github.com/WordPress/gutenberg/pull/18761) in e2e tests.
+-   Travis: [Skip the deploy stage](https://github.com/WordPress/gutenberg/pull/18788) on PRs.
+-   And a Travis job to check the [IE11 compatibility of the produced JavaScript builds](https://github.com/WordPress/gutenberg/pull/18774).
+-   Avoid usage of [editor store on block editor](https://github.com/WordPress/gutenberg/pull/18784) reusable blocks inserter.
+-   Replace the [fs-extra dependency with rimraf](https://github.com/WordPress/gutenberg/pull/18790).
+-   RSS block: Remove [PHP 5.2 compatibility code](https://github.com/WordPress/gutenberg/pull/15806).
+-   Update the [Columns block to use the Patterns API](https://github.com/WordPress/gutenberg/pull/18283).
+-   Refactor the [BlockToolbar component](https://github.com/WordPress/gutenberg/pull/18843) to use React hooks.
+-   Refactor the [BlockDraggable](https://github.com/WordPress/gutenberg/pull/18756) component for a simpler React tree.
+-   Refactor the [BlockHTML](https://github.com/WordPress/gutenberg/pull/18968) component to use React hooks.
+-   Refactor the [BlockList](https://github.com/WordPress/gutenberg/pull/18821) component to use React hooks.
+-   Refactor the [BlockInsertionPoint](https://github.com/WordPress/gutenberg/pull/18821) component to use React hooks.
+-   [Split @wordpress/urls into multiple modules](https://github.com/WordPress/gutenberg/pull/18689https://github.com/WordPress/gutenberg/pull/18689)/files to allow better tree-shaking.
+-   Improve the Storybook setup to allow [updates on style changes](https://github.com/WordPress/gutenberg/pull/18676).
+-   Enforce consistent usage of [Button and ToolbarGroup](https://github.com/WordPress/gutenberg/pull/18817) components.
+-   Use the [colors hook in the Paragraph block](https://github.com/WordPress/gutenberg/pull/18148).
+-   Add missing actions and tests for [lockPostAutosaving, unlockPostAutosaving](https://github.com/WordPress/gutenberg/pull/18854).
+-   [Collapse passed](https://github.com/WordPress/gutenberg/pull/16755) [tests](https://github.com/WordPress/gutenberg/pull/18896) in Travis jobs.
+-   Add [side effects property to the @wordpress/components package](https://github.com/WordPress/gutenberg/pull/18911) to allow tree-shaking.
+-   Add a [script to perform patch releases](https://github.com/WordPress/gutenberg/pull/18938) for old npm package versions.
+-   Reuse the [URLInput component in the Social Links](https://github.com/WordPress/gutenberg/pull/18905) block and [disable suggestions](https://github.com/WordPress/gutenberg/pull/18946).
+-   Improve and simplify [reusable block](https://github.com/WordPress/gutenberg/pull/18903) [styles](https://github.com/WordPress/gutenberg/pull/18958).
+-   Refactor the [Gallery edit component](https://github.com/WordPress/gutenberg/pull/18265) to be semi-cross-platform.
+-   Run tests using the same [environment](https://github.com/WordPress/gutenberg/pull/18703) version used for development.
+-   Add [CPU/Network slowdown configuration](https://github.com/WordPress/gutenberg/pull/18770) options to the e2e tests setup.
+-   Enable [Type checking for the @wordpress/token-list](https://github.com/WordPress/gutenberg/pull/18839) package.
+-   Move the [changelog.txt and readme.txt files](https://github.com/WordPress/gutenberg/pull/18828) to the GitHub repository.
 
 = 7.0.0 =
 
+## Changelog
+
 ### Features
 
-*   Add a new Navigation block (previously available as an experiment)
-    *   [Highlight menu items](https://github.com/WordPress/gutenberg/pull/18435) without defined URL.
-    *   Prevent [error in Firefox](https://github.com/WordPress/gutenberg/pull/18455) when removing the block.
-    *   [Remove background color](https://github.com/WordPress/gutenberg/pull/18407) from the Navigation block and rely on the Group block.
-    *   Remove the [background shadow](https://github.com/WordPress/gutenberg/pull/18485) for the submenus dropdown.
-    *   [Rename "Navigation Menu Item"](https://github.com/WordPress/gutenberg/pull/18422https://github.com/WordPress/gutenberg/pull/18422) block to "Link".
-    *   Remove [unnecessary color attributes](https://github.com/WordPress/gutenberg/pull/18540).
-    *   Allow [addition CSS](https://github.com/WordPress/gutenberg/pull/18466) [classes](https://github.com/WordPress/gutenberg/pull/18629).
-    *   Drop the [“menu” suffix from the block name](https://github.com/WordPress/gutenberg/pull/18551).
-    *   [Escape special](https://github.com/WordPress/gutenberg/pull/18607) [characters](https://github.com/WordPress/gutenberg/pull/18617) in the frontend.
-    *   Remove from [experimental features](https://github.com/WordPress/gutenberg/pull/18594).
-    *   Add [style variations](https://github.com/WordPress/gutenberg/pull/18553).
+-   Add a new Navigation block (previously available as an experiment)
+    -   [Highlight menu items](https://github.com/WordPress/gutenberg/pull/18435) without defined URL.
+    -   Prevent [error in Firefox](https://github.com/WordPress/gutenberg/pull/18455) when removing the block.
+    -   [Remove background color](https://github.com/WordPress/gutenberg/pull/18407) from the Navigation block and rely on the Group block.
+    -   Remove the [background shadow](https://github.com/WordPress/gutenberg/pull/18485) for the submenus dropdown.
+    -   [Rename "Navigation Menu Item"](https://github.com/WordPress/gutenberg/pull/18422https://github.com/WordPress/gutenberg/pull/18422) block to "Link".
+    -   Remove [unnecessary color attributes](https://github.com/WordPress/gutenberg/pull/18540).
+    -   Allow [addition CSS](https://github.com/WordPress/gutenberg/pull/18466) [classes](https://github.com/WordPress/gutenberg/pull/18629).
+    -   Drop the [“menu” suffix from the block name](https://github.com/WordPress/gutenberg/pull/18551).
+    -   [Escape special](https://github.com/WordPress/gutenberg/pull/18607) [characters](https://github.com/WordPress/gutenberg/pull/18617) in the frontend.
+    -   Remove from [experimental features](https://github.com/WordPress/gutenberg/pull/18594).
+    -   Add [style variations](https://github.com/WordPress/gutenberg/pull/18553).
 
 ### Enhancements
 
-*   Use [gradient classnames](https://github.com/WordPress/gutenberg/pull/18590) instead of inline styles for the Cover block.
-*   Inserter: Add [keyboard shortcut styling](https://github.com/WordPress/gutenberg/pull/18623) to "/" in the default tip.
-*   [Restore the caret position](https://github.com/WordPress/gutenberg/pull/17824) properly on undo.
-*   Add keywords to improve the [discoverability of the Audio block](https://github.com/WordPress/gutenberg/pull/18673).
-*   Show [video preview on Cover block](https://github.com/WordPress/gutenberg/pull/18009) inspector panel.
-
-### Bug Fixes
-
-*   Fix [hidden nested images](https://github.com/WordPress/gutenberg/pull/18347) in the content column.
-*   Fix [double border issue](https://github.com/WordPress/gutenberg/pull/18358) in the keyboard shortcuts modal.
-*   Fix [off-centered publish button](https://github.com/WordPress/gutenberg/pull/17726).
-*   Fix [error when isRTL config is not provided](https://github.com/WordPress/gutenberg/pull/18526) in the block editor settings.
-*   Fix [full width Table block](https://github.com/WordPress/gutenberg/pull/18469) mobile regression.
-*   A11y: Add a screen reader text [label for the Search block](https://github.com/WordPress/gutenberg/pull/17983).
-*   Fix [text patterns undo](https://github.com/WordPress/gutenberg/pull/18533) after mouse move.
-*   Fix block [drag and drop for the  contributor role](https://github.com/WordPress/gutenberg/pull/15054).
-*   [Update the link when switching the image used](https://github.com/WordPress/gutenberg/pull/17226) in the Image block.
-*   Fix php [error triggered when **gutenberg_register_packages_scripts**](https://github.com/WordPress/gutenberg/pull/18599) is run more than once.
-*   Fix special characters [escaping for the post title](https://github.com/WordPress/gutenberg/pull/18616).
-*   Fix [JavaScript errors triggered when selectors are called](https://github.com/WordPress/gutenberg/pull/18559) before the editor being initialized.
-*   Fix [BaseControl component label](https://github.com/WordPress/gutenberg/pull/18646) when no id is passed.
-*   [Preserve whitespace](https://github.com/WordPress/gutenberg/pull/18656) when converting blocks Preformatted and Paragraph blocks.
-*   Fix [multiple paste issues](https://github.com/WordPress/gutenberg/pull/17470) creating unnecessary empty spaces.
+-   Use [gradient classnames](https://github.com/WordPress/gutenberg/pull/18590) instead of inline styles for the Cover block.
+-   Inserter: Add [keyboard shortcut styling](https://github.com/WordPress/gutenberg/pull/18623) to "/" in the default tip.
+-   [Restore the caret position](https://github.com/WordPress/gutenberg/pull/17824) properly on undo.
+-   Add keywords to improve the [discoverability of the Audio block](https://github.com/WordPress/gutenberg/pull/18673).
+-   Show [video preview on Cover block](https://github.com/WordPress/gutenberg/pull/18009) inspector panel.
+
+### Bug Fixes
+
+-   Fix [hidden nested images](https://github.com/WordPress/gutenberg/pull/18347) in the content column.
+-   Fix [double border issue](https://github.com/WordPress/gutenberg/pull/18358) in the keyboard shortcuts modal.
+-   Fix [off-centered publish button](https://github.com/WordPress/gutenberg/pull/17726).
+-   Fix [error when isRTL config is not provided](https://github.com/WordPress/gutenberg/pull/18526) in the block editor settings.
+-   Fix [full width Table block](https://github.com/WordPress/gutenberg/pull/18469) mobile regression.
+-   A11y: Add a screen reader text [label for the Search block](https://github.com/WordPress/gutenberg/pull/17983).
+-   Fix [text patterns undo](https://github.com/WordPress/gutenberg/pull/18533) after mouse move.
+-   Fix block [drag and drop for the  contributor role](https://github.com/WordPress/gutenberg/pull/15054).
+-   [Update the link when switching the image used](https://github.com/WordPress/gutenberg/pull/17226) in the Image block.
+-   Fix php [error triggered when **gutenberg_register_packages_scripts**](https://github.com/WordPress/gutenberg/pull/18599) is run more than once.
+-   Fix special characters [escaping for the post title](https://github.com/WordPress/gutenberg/pull/18616).
+-   Fix [JavaScript errors triggered when selectors are called](https://github.com/WordPress/gutenberg/pull/18559) before the editor being initialized.
+-   Fix [BaseControl component label](https://github.com/WordPress/gutenberg/pull/18646) when no id is passed.
+-   [Preserve whitespace](https://github.com/WordPress/gutenberg/pull/18656) when converting blocks Preformatted and Paragraph blocks.
+-   Fix [multiple paste issues](https://github.com/WordPress/gutenberg/pull/17470) creating unnecessary empty spaces.
 
 ### New APIs
 
-*   Add a new [Card component](https://github.com/WordPress/gutenberg/pull/17963) [to](https://github.com/WordPress/gutenberg/pull/18681) @wordpress/components.
-*   Add [label support for the URLInput](https://github.com/WordPress/gutenberg/pull/15669) [component](https://github.com/WordPress/gutenberg/pull/18488).
-*   Support the [isMatch option for the shorcode transforms](https://github.com/WordPress/gutenberg/pull/18459).
+-   Add a new [Card component](https://github.com/WordPress/gutenberg/pull/17963) [to](https://github.com/WordPress/gutenberg/pull/18681) @wordpress/components.
+-   Add [label support for the URLInput](https://github.com/WordPress/gutenberg/pull/15669) [component](https://github.com/WordPress/gutenberg/pull/18488).
+-   Support the [isMatch option for the shorcode transforms](https://github.com/WordPress/gutenberg/pull/18459).
 
 ### Experiments
 
-*   Block Content areas:
-    *   Add [Post Title and Post Content](https://github.com/WordPress/gutenberg/pull/18461) [blocks](https://github.com/WordPress/gutenberg/pull/18543).
-    *   Add [template parts](https://github.com/WordPress/gutenberg/pull/18339) CPT and the theme resolution logic.
-*   Widgets Screen:
-    *   [Refactor the legacy widgets block](https://github.com/WordPress/gutenberg/pull/15801) to support all blocks.
-    *   Fix [widget areas margins](https://github.com/WordPress/gutenberg/pull/18528).
-    *   Add [isRTL setting](https://github.com/WordPress/gutenberg/pull/18545).
-*   APIs
-    *   **useColors** hook: Enhance the [contrast checking API](https://github.com/WordPress/gutenberg/pull/18237) and provide [access to the color value](https://github.com/WordPress/gutenberg/pull/18544).
-    *   Introduce [createInterpolateElement](https://github.com/WordPress/gutenberg/pull/17376) to allow translation of complex strings with HTML content.
-    *   A11y: Refactor the [accessibility behavior of the Toolbar](https://github.com/WordPress/gutenberg/pull/18534) component.
-*   Social Links:
-    *   [Capitalize LinkedIn](https://github.com/WordPress/gutenberg/pull/18638) and [GitHub](https://github.com/WordPress/gutenberg/pull/18714) properly.
-    *   Fix frontend [styling](https://github.com/WordPress/gutenberg/pull/18410).
+-   Block Content areas:
+    -   Add [Post Title and Post Content](https://github.com/WordPress/gutenberg/pull/18461) [blocks](https://github.com/WordPress/gutenberg/pull/18543).
+    -   Add [template parts](https://github.com/WordPress/gutenberg/pull/18339) CPT and the theme resolution logic.
+-   Widgets Screen:
+    -   [Refactor the legacy widgets block](https://github.com/WordPress/gutenberg/pull/15801) to support all blocks.
+    -   Fix [widget areas margins](https://github.com/WordPress/gutenberg/pull/18528).
+    -   Add [isRTL setting](https://github.com/WordPress/gutenberg/pull/18545).
+-   APIs
+    -   **useColors** hook: Enhance the [contrast checking API](https://github.com/WordPress/gutenberg/pull/18237) and provide [access to the color value](https://github.com/WordPress/gutenberg/pull/18544).
+    -   Introduce [createInterpolateElement](https://github.com/WordPress/gutenberg/pull/17376) to allow translation of complex strings with HTML content.
+    -   A11y: Refactor the [accessibility behavior of the Toolbar](https://github.com/WordPress/gutenberg/pull/18534) component.
+-   Social Links:
+    -   [Capitalize LinkedIn](https://github.com/WordPress/gutenberg/pull/18638) and [GitHub](https://github.com/WordPress/gutenberg/pull/18714) properly.
+    -   Fix frontend [styling](https://github.com/WordPress/gutenberg/pull/18410).
 
 ### Documentation
 
-*   Add a [Backward Compatibility policy](https://github.com/WordPress/gutenberg/pull/18499) document.
-*   Clarify the [npm packages release](https://github.com/WordPress/gutenberg/pull/18516) documentation.
-*   Add documentation for the [@wordpress/env wp-env.json config file](https://github.com/WordPress/gutenberg/pull/18643).
-*   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/18400), [2](https://github.com/WordPress/gutenberg/pull/18404), [3](https://github.com/WordPress/gutenberg/pull/18449), [4](https://github.com/WordPress/gutenberg/pull/18403), [5](https://github.com/WordPress/gutenberg/pull/18452), [6](https://github.com/WordPress/gutenberg/pull/18460), [7](https://github.com/WordPress/gutenberg/pull/18475), [8](https://github.com/WordPress/gutenberg/pull/18507), [9](https://github.com/WordPress/gutenberg/pull/18059), [10](https://github.com/WordPress/gutenberg/pull/17911), [11](https://github.com/WordPress/gutenberg/pull/18558), [12](https://github.com/WordPress/gutenberg/pull/18277), [13](https://github.com/WordPress/gutenberg/pull/18572), [14](https://github.com/WordPress/gutenberg/pull/18587), [15](https://github.com/WordPress/gutenberg/pull/18592), [16](https://github.com/WordPress/gutenberg/pull/18436), [17](https://github.com/WordPress/gutenberg/pull/18446), [18](https://github.com/WordPress/gutenberg/pull/18707), [19](https://github.com/WordPress/gutenberg/pull/18450), [20](https://github.com/WordPress/gutenberg/pull/18713).
+-   Add a [Backward Compatibility policy](https://github.com/WordPress/gutenberg/pull/18499) document.
+-   Clarify the [npm packages release](https://github.com/WordPress/gutenberg/pull/18516) documentation.
+-   Add documentation for the [@wordpress/env wp-env.json config file](https://github.com/WordPress/gutenberg/pull/18643).
+-   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/18400), [2](https://github.com/WordPress/gutenberg/pull/18404), [3](https://github.com/WordPress/gutenberg/pull/18449), [4](https://github.com/WordPress/gutenberg/pull/18403), [5](https://github.com/WordPress/gutenberg/pull/18452), [6](https://github.com/WordPress/gutenberg/pull/18460), [7](https://github.com/WordPress/gutenberg/pull/18475), [8](https://github.com/WordPress/gutenberg/pull/18507), [9](https://github.com/WordPress/gutenberg/pull/18059), [10](https://github.com/WordPress/gutenberg/pull/17911), [11](https://github.com/WordPress/gutenberg/pull/18558), [12](https://github.com/WordPress/gutenberg/pull/18277), [13](https://github.com/WordPress/gutenberg/pull/18572), [14](https://github.com/WordPress/gutenberg/pull/18587), [15](https://github.com/WordPress/gutenberg/pull/18592), [16](https://github.com/WordPress/gutenberg/pull/18436), [17](https://github.com/WordPress/gutenberg/pull/18446), [18](https://github.com/WordPress/gutenberg/pull/18707), [19](https://github.com/WordPress/gutenberg/pull/18450), [20](https://github.com/WordPress/gutenberg/pull/18713).
 
 ### Various
 
-*   Refactor the [RichText component](https://github.com/WordPress/gutenberg/pull/17779): Remove the inner Editable component.
-*   Integrate [the](https://github.com/WordPress/gutenberg/pull/18514) [Gutenberg Playground](https://github.com/WordPress/gutenberg/pull/18191) into Storybook.
-*   Increase [WordPress minimum supported](https://github.com/WordPress/gutenberg/pull/15809) by the plugin to 5.2.0.
-*   Refactor the [Paragraph block edit function](https://github.com/WordPress/gutenberg/pull/18125) as a functional component.
-*   Refactor the [Cover block edit function](https://github.com/WordPress/gutenberg/pull/18116) as a functional component.
-*   Add new components to Storybook.
-    *   [RadioControl](https://github.com/WordPress/gutenberg/pull/18474) component.
-    *   [TabPanel](https://github.com/WordPress/gutenberg/pull/18402) component.
-    *   [Popover](https://github.com/WordPress/gutenberg/pull/18096) component.
-    *   [BaseControl](https://github.com/WordPress/gutenberg/pull/18648) component.
-    *   [Tip](https://github.com/WordPress/gutenberg/pull/18542) component.
-*   Include [WordPress eslint plugin](https://github.com/WordPress/gutenberg/pull/18457) in React eslint ruleset in @wordpress/eslint-plugin.
-*   [Block PRs  on mobile unit test failures](https://github.com/WordPress/gutenberg/pull/18454) in Travis.
-*   Polish the [PostSchedule popover styling](https://github.com/WordPress/gutenberg/pull/18235).
-*   Fix the [API documentation generation tool](https://github.com/WordPress/gutenberg/pull/18253) when spaces are used in folder names.
-*   Add [missing @babel/runtime dependency](https://github.com/WordPress/gutenberg/pull/18626) to the @wordpress/jest-puppeteer-axe.
-*   [Refactor the Layout component](https://github.com/WordPress/gutenberg/pull/18044) [to](https://github.com/WordPress/gutenberg/pull/18658) [separate](https://github.com/WordPress/gutenberg/pull/18683) the UI from the content.
-*   Align [Dropdown and DropdownMenu](https://github.com/WordPress/gutenberg/pull/18631) components styling.
-*   Remove [max-width style from the Image block](https://github.com/WordPress/gutenberg/pull/14911).
-*   Remove the [CollegeHumor embed](https://github.com/WordPress/gutenberg/pull/18591) block.
-*   Add unit tests: 
-    *   Ensure [consecutive edits](https://github.com/WordPress/gutenberg/pull/17917) to the same attribute are considered persistent.
-    *   Test the [core-data undo reducer](https://github.com/WordPress/gutenberg/pull/18642).
+-   Refactor the [RichText component](https://github.com/WordPress/gutenberg/pull/17779): Remove the inner Editable component.
+-   Integrate [the](https://github.com/WordPress/gutenberg/pull/18514) [Gutenberg Playground](https://github.com/WordPress/gutenberg/pull/18191) into Storybook.
+-   Increase [WordPress minimum supported](https://github.com/WordPress/gutenberg/pull/15809) by the plugin to 5.2.0.
+-   Refactor the [Paragraph block edit function](https://github.com/WordPress/gutenberg/pull/18125) as a functional component.
+-   Refactor the [Cover block edit function](https://github.com/WordPress/gutenberg/pull/18116) as a functional component.
+-   Add new components to Storybook.
+    -   [RadioControl](https://github.com/WordPress/gutenberg/pull/18474) component.
+    -   [TabPanel](https://github.com/WordPress/gutenberg/pull/18402) component.
+    -   [Popover](https://github.com/WordPress/gutenberg/pull/18096) component.
+    -   [BaseControl](https://github.com/WordPress/gutenberg/pull/18648) component.
+    -   [Tip](https://github.com/WordPress/gutenberg/pull/18542) component.
+-   Include [WordPress eslint plugin](https://github.com/WordPress/gutenberg/pull/18457) in React eslint ruleset in @wordpress/eslint-plugin.
+-   [Block PRs  on mobile unit test failures](https://github.com/WordPress/gutenberg/pull/18454) in Travis.
+-   Polish the [PostSchedule popover styling](https://github.com/WordPress/gutenberg/pull/18235).
+-   Fix the [API documentation generation tool](https://github.com/WordPress/gutenberg/pull/18253) when spaces are used in folder names.
+-   Add [missing @babel/runtime dependency](https://github.com/WordPress/gutenberg/pull/18626) to the @wordpress/jest-puppeteer-axe.
+-   [Refactor the Layout component](https://github.com/WordPress/gutenberg/pull/18044) [to](https://github.com/WordPress/gutenberg/pull/18658) [separate](https://github.com/WordPress/gutenberg/pull/18683) the UI from the content.
+-   Align [Dropdown and DropdownMenu](https://github.com/WordPress/gutenberg/pull/18631) components styling.
+-   Remove [max-width style from the Image block](https://github.com/WordPress/gutenberg/pull/14911).
+-   Remove the [CollegeHumor embed](https://github.com/WordPress/gutenberg/pull/18591) block.
+-   Add unit tests:
+    -   Ensure [consecutive edits](https://github.com/WordPress/gutenberg/pull/17917) to the same attribute are considered persistent.
+    -   Test the [core-data undo reducer](https://github.com/WordPress/gutenberg/pull/18642).
 
 = 6.9.0 =
 
+## Changelog
+
 ### Features
 
-* Support changing the [image title attribute](https://github.com/WordPress/gutenberg/pull/11070) in the Image block.
+-   Support changing the [image title attribute](https://github.com/WordPress/gutenberg/pull/11070) in the Image block.
 
 ### Bugs
 
-* Fix  [invalid Pullquote blocks](https://github.com/WordPress/gutenberg/pull/18194) when setting a color from the palette presets.
-* Fix the columns left/right [full-width margins](https://github.com/WordPress/gutenberg/pull/18021).
-* Prevent [fast consecutive updates](https://github.com/WordPress/gutenberg/pull/18219) from triggering blocks reset.
-* Fix block [movers for floated blocks](https://github.com/WordPress/gutenberg/pull/18230).
-* Fix [Radio buttons styling](https://github.com/WordPress/gutenberg/pull/18183) in meta boxes.
-* Fix the [default image sizes used for featured images](https://github.com/WordPress/gutenberg/pull/15844) displayed in the editor.
-* Prevent the unsaved changes warning from popping-up when [deleting posts](https://github.com/WordPress/gutenberg/pull/18275).
-* Revert [img and iframe styles](https://github.com/WordPress/gutenberg/pull/18287) to block editor container scope.
-* Block Merge: guard for [undefined attribute definition](https://github.com/WordPress/gutenberg/pull/17937).
+-   Fix  [invalid Pullquote blocks](https://github.com/WordPress/gutenberg/pull/18194) when setting a color from the palette presets.
+-   Fix the columns left/right [full-width margins](https://github.com/WordPress/gutenberg/pull/18021).
+-   Prevent [fast consecutive updates](https://github.com/WordPress/gutenberg/pull/18219) from triggering blocks reset.
+-   Fix block [movers for floated blocks](https://github.com/WordPress/gutenberg/pull/18230).
+-   Fix [Radio buttons styling](https://github.com/WordPress/gutenberg/pull/18183) in meta boxes.
+-   Fix the [default image sizes used for featured images](https://github.com/WordPress/gutenberg/pull/15844) displayed in the editor.
+-   Prevent the unsaved changes warning from popping-up when [deleting posts](https://github.com/WordPress/gutenberg/pull/18275).
+-   Revert [img and iframe styles](https://github.com/WordPress/gutenberg/pull/18287) to block editor container scope.
+-   Block Merge: guard for [undefined attribute definition](https://github.com/WordPress/gutenberg/pull/17937).
 
 ### Enhancements
 
-* Inserter: [Immediately insert block](https://github.com/WordPress/gutenberg/pull/16708) when only one block type is allowed.
-* Update the list of the [default available gradients](https://github.com/WordPress/gutenberg/pull/18214).
-* [Disable indent/outdent buttons](https://github.com/WordPress/gutenberg/pull/17819) when necessary in the List block.
+-   Inserter: [Immediately insert block](https://github.com/WordPress/gutenberg/pull/16708) when only one block type is allowed.
+-   Update the list of the [default available gradients](https://github.com/WordPress/gutenberg/pull/18214).
+-   [Disable indent/outdent buttons](https://github.com/WordPress/gutenberg/pull/17819) when necessary in the List block.
 
 ### New APIs
 
-* Add theme support API to define [custom gradients presets](https://github.com/WordPress/gutenberg/pull/17841).
-* Mark the [AsyncMode](https://github.com/WordPress/gutenberg/pull/18154) data module API as stable.
-* Mark the [mediaUpload @wordpress/block-editor setting](https://github.com/WordPress/gutenberg/pull/18156) as stable.
-* Add a **wpenv.json** [config file support for](https://github.com/WordPress/gutenberg/pull/18121) [@wordpress/env](https://github.com/WordPress/gutenberg/pull/18294).
+-   Add theme support API to define [custom gradients presets](https://github.com/WordPress/gutenberg/pull/17841).
+-   Mark the [AsyncMode](https://github.com/WordPress/gutenberg/pull/18154) data module API as stable.
+-   Mark the [mediaUpload @wordpress/block-editor setting](https://github.com/WordPress/gutenberg/pull/18156) as stable.
+-   Add a **wpenv.json** [config file support for](https://github.com/WordPress/gutenberg/pull/18121) [@wordpress/env](https://github.com/WordPress/gutenberg/pull/18294).
 
 ### Various
 
-* Refactor the way [HTML is escaped by the RichText](https://github.com/WordPress/gutenberg/pull/17994) component.
-* Refactor and [simplify the block margins CSS](https://github.com/WordPress/gutenberg/pull/18346) in the editor.
-* Use [HTTPS git clone](https://github.com/WordPress/gutenberg/pull/18136) in the Gutenberg release tool for more stability.
-* Update [ExternalLink](https://github.com/WordPress/gutenberg/pull/18142), [BaseControl and FormTokenField](https://github.com/WordPress/gutenberg/pull/18165) components to use the VisuallyHidden component for the screen reader text.
-* Add several components to Storybook: 
-  * [Spinner](https://github.com/WordPress/gutenberg/pull/18145),
-  * [Draggable](https://github.com/WordPress/gutenberg/pull/18070),
-  * [RangeControl](https://github.com/WordPress/gutenberg/pull/17846),
-  * [FontSizePicker](https://github.com/WordPress/gutenberg/pull/18149),
-  * [Modal](https://github.com/WordPress/gutenberg/pull/18083),
-  * [Snackbar](https://github.com/WordPress/gutenberg/pull/18386),
-  * [ToggleControl](https://github.com/WordPress/gutenberg/pull/18388),
-  * [ResizableBox](https://github.com/WordPress/gutenberg/pull/18097/files).
-* Refactor the [block-directory search to insert](https://github.com/WordPress/gutenberg/pull/17576) as an Inserter plugin.
-* Improve the experimental [useColors React](https://github.com/WordPress/gutenberg/pull/18147) [hook](https://github.com/WordPress/gutenberg/pull/18286).
-* Upgrade [Puppeteer](https://github.com/WordPress/gutenberg/pull/18205) to the last version.
-* Update to the [last version of npm-package-json-lint](https://github.com/WordPress/gutenberg/pull/18160).
-* **i18n**: Fix string concatenation in the [Verse block example](https://github.com/WordPress/gutenberg/pull/18365) and add `translators` string.
-* Change Detection: Add an [e2e test case for post trashing](https://github.com/WordPress/gutenberg/pull/18290).
-* Fix the [e2e tests watch command](https://github.com/WordPress/gutenberg/pull/18391).
+-   Refactor the way [HTML is escaped by the RichText](https://github.com/WordPress/gutenberg/pull/17994) component.
+-   Refactor and [simplify the block margins CSS](https://github.com/WordPress/gutenberg/pull/18346) in the editor.
+-   Use [HTTPS git clone](https://github.com/WordPress/gutenberg/pull/18136) in the Gutenberg release tool for more stability.
+-   Update [ExternalLink](https://github.com/WordPress/gutenberg/pull/18142), [BaseControl and FormTokenField](https://github.com/WordPress/gutenberg/pull/18165) components to use the VisuallyHidden component for the screen reader text.
+-   Add several components to Storybook:
+    -   [Spinner](https://github.com/WordPress/gutenberg/pull/18145),
+    -   [Draggable](https://github.com/WordPress/gutenberg/pull/18070),
+    -   [RangeControl](https://github.com/WordPress/gutenberg/pull/17846),
+    -   [FontSizePicker](https://github.com/WordPress/gutenberg/pull/18149),
+    -   [Modal](https://github.com/WordPress/gutenberg/pull/18083),
+    -   [Snackbar](https://github.com/WordPress/gutenberg/pull/18386),
+    -   [ToggleControl](https://github.com/WordPress/gutenberg/pull/18388),
+    -   [ResizableBox](https://github.com/WordPress/gutenberg/pull/18097/files).
+-   Refactor the [block-directory search to insert](https://github.com/WordPress/gutenberg/pull/17576) as an Inserter plugin.
+-   Improve the experimental [useColors React](https://github.com/WordPress/gutenberg/pull/18147) [hook](https://github.com/WordPress/gutenberg/pull/18286).
+-   Upgrade [Puppeteer](https://github.com/WordPress/gutenberg/pull/18205) to the last version.
+-   Update to the [last version of npm-package-json-lint](https://github.com/WordPress/gutenberg/pull/18160).
+-   **i18n**: Fix string concatenation in the [Verse block example](https://github.com/WordPress/gutenberg/pull/18365) and add `translators` string.
+-   Change Detection: Add an [e2e test case for post trashing](https://github.com/WordPress/gutenberg/pull/18290).
+-   Fix the [e2e tests watch command](https://github.com/WordPress/gutenberg/pull/18391).
 
 ### Experimental
 
-* Block Content Areas:
-  * Support [loading block templates](https://github.com/WordPress/gutenberg/pull/18247) from themes.
-* Navigation block:
-  * Add [default frontend styles](https://github.com/WordPress/gutenberg/pull/18094) for the Navigation block.
-  * Use [RichText for navigation menu item](https://github.com/WordPress/gutenberg/pull/18182) instead of TextControl.
-  * Add [block navigator](https://github.com/WordPress/gutenberg/pull/18202) to the inspector panel.
-  * Use an [SVG icon](https://github.com/WordPress/gutenberg/pull/18222) for the color selector.
-  * Add a new API for [horizontal movers](https://github.com/WordPress/gutenberg/pull/16615) and [use](https://github.com/WordPress/gutenberg/pull/18234) it for the navigation block.
-  * Add a new [Link creation](https://github.com/WordPress/gutenberg/pull/17846) [and](https://github.com/WordPress/gutenberg/pull/18405) [edition](https://github.com/WordPress/gutenberg/pull/18225) [UI](https://github.com/WordPress/gutenberg/pull/18285) and [use](https://github.com/WordPress/gutenberg/pull/18062) it for the navigation block.
-  * Add an [appender](https://github.com/WordPress/gutenberg/pull/18100) to the block navigator.
-  * Add a block [placeholder](https://github.com/WordPress/gutenberg/pull/18363).
-  * Various fixes and refactorings: [1](https://github.com/WordPress/gutenberg/pull/18189), [2](https://github.com/WordPress/gutenberg/pull/18178), [3](https://github.com/WordPress/gutenberg/pull/18188), [4](https://github.com/WordPress/gutenberg/pull/18153), [5](https://github.com/WordPress/gutenberg/pull/18221), [6](https://github.com/WordPress/gutenberg/pull/18278), [7](https://github.com/WordPress/gutenberg/pull/18172), [8](https://github.com/WordPress/gutenberg/pull/18346), [9](https://github.com/WordPress/gutenberg/pull/18376), [10](https://github.com/WordPress/gutenberg/pull/18150), [11](https://github.com/WordPress/gutenberg/pull/18292), [12](https://github.com/WordPress/gutenberg/pull/18374), [13](https://github.com/WordPress/gutenberg/pull/18367), [14](https://github.com/WordPress/gutenberg/pull/18350), [15](https://github.com/WordPress/gutenberg/pull/18412).
-* Add [ResponsiveBlockControl](https://github.com/WordPress/gutenberg/pull/16790) component.
-* Add initial [API for block patterns](https://github.com/WordPress/gutenberg/pull/18270).
+-   Block Content Areas:
+    -   Support [loading block templates](https://github.com/WordPress/gutenberg/pull/18247) from themes.
+-   Navigation block:
+    -   Add [default frontend styles](https://github.com/WordPress/gutenberg/pull/18094) for the Navigation block.
+    -   Use [RichText for navigation menu item](https://github.com/WordPress/gutenberg/pull/18182) instead of TextControl.
+    -   Add [block navigator](https://github.com/WordPress/gutenberg/pull/18202) to the inspector panel.
+    -   Use an [SVG icon](https://github.com/WordPress/gutenberg/pull/18222) for the color selector.
+    -   Add a new API for [horizontal movers](https://github.com/WordPress/gutenberg/pull/16615) and [use](https://github.com/WordPress/gutenberg/pull/18234) it for the navigation block.
+    -   Add a new [Link creation](https://github.com/WordPress/gutenberg/pull/17846) [and](https://github.com/WordPress/gutenberg/pull/18405) [edition](https://github.com/WordPress/gutenberg/pull/18225) [UI](https://github.com/WordPress/gutenberg/pull/18285) and [use](https://github.com/WordPress/gutenberg/pull/18062) it for the navigation block.
+    -   Add an [appender](https://github.com/WordPress/gutenberg/pull/18100) to the block navigator.
+    -   Add a block [placeholder](https://github.com/WordPress/gutenberg/pull/18363).
+    -   Various fixes and refactorings: [1](https://github.com/WordPress/gutenberg/pull/18189), [2](https://github.com/WordPress/gutenberg/pull/18178), [3](https://github.com/WordPress/gutenberg/pull/18188), [4](https://github.com/WordPress/gutenberg/pull/18153), [5](https://github.com/WordPress/gutenberg/pull/18221), [6](https://github.com/WordPress/gutenberg/pull/18278), [7](https://github.com/WordPress/gutenberg/pull/18172), [8](https://github.com/WordPress/gutenberg/pull/18346), [9](https://github.com/WordPress/gutenberg/pull/18376), [10](https://github.com/WordPress/gutenberg/pull/18150), [11](https://github.com/WordPress/gutenberg/pull/18292), [12](https://github.com/WordPress/gutenberg/pull/18374), [13](https://github.com/WordPress/gutenberg/pull/18367), [14](https://github.com/WordPress/gutenberg/pull/18350), [15](https://github.com/WordPress/gutenberg/pull/18412).
+-   Add [ResponsiveBlockControl](https://github.com/WordPress/gutenberg/pull/16790) component.
+-   Add initial [API for block patterns](https://github.com/WordPress/gutenberg/pull/18270).
 
 ### Documentation
 
-* Add an introduction [README for Storybook](https://github.com/WordPress/gutenberg/pull/18245).
-* Typos and fixes: [1](https://github.com/WordPress/gutenberg/pull/18187), [2](https://github.com/WordPress/gutenberg/pull/18198), [3](https://github.com/WordPress/gutenberg/pull/18204https://github.com/WordPress/gutenberg/pull/18204), [4](https://github.com/WordPress/gutenberg/pull/18218), [5](https://github.com/WordPress/gutenberg/pull/18221), [6](https://github.com/WordPress/gutenberg/pull/18226).
-
+-   Add an introduction [README for Storybook](https://github.com/WordPress/gutenberg/pull/18245).
+-   Typos and fixes: [1](https://github.com/WordPress/gutenberg/pull/18187), [2](https://github.com/WordPress/gutenberg/pull/18198), [3](https://github.com/WordPress/gutenberg/pull/18204https://github.com/WordPress/gutenberg/pull/18204), [4](https://github.com/WordPress/gutenberg/pull/18218), [5](https://github.com/WordPress/gutenberg/pull/18221), [6](https://github.com/WordPress/gutenberg/pull/18226).
 
 = 6.8.0 =
 
+## Changelog
+
 ### Features
 
-*   [Support gradients](https://github.com/WordPress/gutenberg/pull/18001) in Cover block.
-*   Add a breadcrumb bar to support [block hierarchy selection](https://github.com/WordPress/gutenberg/pull/17838).
+-   [Support gradients](https://github.com/WordPress/gutenberg/pull/18001) in Cover block.
+-   Add a breadcrumb bar to support [block hierarchy selection](https://github.com/WordPress/gutenberg/pull/17838).
 
 ### Enhancements
 
-*   Cover block: change the [minimum height input step size](https://github.com/WordPress/gutenberg/pull/17927) to one.
-*   Allow setting a [display name for blocks](https://github.com/WordPress/gutenberg/pull/17519) based on their content in the BlockNavigator.
-*   [Hide the gradients panel](https://github.com/WordPress/gutenberg/pull/18091) if an empty set of gradients is explicitly defined.
-*   [Do not transform list items into paragraphs](https://github.com/WordPress/gutenberg/pull/18032) when deleting first list item and list is not empty.
-*   Replace inline styles with [classnames for the gradient palette](https://github.com/WordPress/gutenberg/pull/18008).
-*   [Preserve list attributes](https://github.com/WordPress/gutenberg/pull/17144) (start, type and reversed) when pasting or converting HTML to blocks. 
+-   Cover block: change the [minimum height input step size](https://github.com/WordPress/gutenberg/pull/17927) to one.
+-   Allow setting a [display name for blocks](https://github.com/WordPress/gutenberg/pull/17519) based on their content in the BlockNavigator.
+-   [Hide the gradients panel](https://github.com/WordPress/gutenberg/pull/18091) if an empty set of gradients is explicitly defined.
+-   [Do not transform list items into paragraphs](https://github.com/WordPress/gutenberg/pull/18032) when deleting first list item and list is not empty.
+-   Replace inline styles with [classnames for the gradient palette](https://github.com/WordPress/gutenberg/pull/18008).
+-   [Preserve list attributes](https://github.com/WordPress/gutenberg/pull/17144) (start, type and reversed) when pasting or converting HTML to blocks.
 
-### Bugs
+### Bug Fixes
+
+-   [Clear local autosaves](https://github.com/WordPress/gutenberg/pull/18051) after successful saves.
+-   Fix the [columns block](https://github.com/WordPress/gutenberg/pull/17968) width overflow issue when using more than two columns.
+-   Fix the [Link Rel input](https://github.com/WordPress/gutenberg/pull/17398) not showing the saved value of the link rel attribute.
+-   Fix JavaScript errors triggered when using [links without href](https://github.com/WordPress/gutenberg/pull/17928) in HTML mode.
+-   Move the [default list styles](https://github.com/WordPress/gutenberg/pull/17958) to the theme editor styles.
+-   Fix [Invalid import](https://github.com/WordPress/gutenberg/pull/17969) statement for deprecated call in the Modal component.
+-   Fix a small visual glitch in the [Publish button](https://github.com/WordPress/gutenberg/pull/18016).
+-   Prevent blank page when using the [Media Modal Edit Image "back"](https://github.com/WordPress/gutenberg/pull/18007) button.
+-   Allow the [shortcode transform](https://github.com/WordPress/gutenberg/pull/17925) to apply to all the provided shortcode aliases.
+-   Fix JavaScript error triggered when using arrows on an [empty URLInput](https://github.com/WordPress/gutenberg/pull/18088).
+-   Fix [extra margins added to Gallery blocks](https://github.com/WordPress/gutenberg/pull/18019) by list editor styles.
+-   Fix [custom button background color](https://github.com/WordPress/gutenberg/pull/18037) not reflected on reload.
+-   [Preserve List block attributes](https://github.com/WordPress/gutenberg/pull/18102) when splitting into multiple lists.
+-   Fix [checkbox styles](https://github.com/WordPress/gutenberg/pull/18108) when used in metaboxes.
+-   Make the [FontSizePicker style](https://github.com/WordPress/gutenberg/pull/18078) independent from WordPress core styles.
+-   Fix overlapping controls in the [Inline Image formatting toolbar](https://github.com/WordPress/gutenberg/pull/18090).
+-   Fix [strikethrough formatting](https://github.com/WordPress/gutenberg/pull/17187) when copy/pasting from Google Docs in Safari.
+-   Allow [media upload post processing](https://github.com/WordPress/gutenberg/pull/18106) for all 5xx REST API responses.
+
+### Experiments
 
-*   [Clear local autosaves](https://github.com/WordPress/gutenberg/pull/18051) after successful saves.
-*   Fix the [columns block](https://github.com/WordPress/gutenberg/pull/17968) width overflow issue when using more than two columns.
-*   Fix the [Link Rel input](https://github.com/WordPress/gutenberg/pull/17398) not showing the saved value of the link rel attribute.
-*   Fix JavaScript errors triggered when using [links without href](https://github.com/WordPress/gutenberg/pull/17928) in HTML mode.
-*   Move the [default list styles](https://github.com/WordPress/gutenberg/pull/17958) to the theme editor styles.
-*   Fix [Invalid import](https://github.com/WordPress/gutenberg/pull/17969) statement for deprecated call in the Modal component.
-*   Fix a small visual glitch in the [Publish button](https://github.com/WordPress/gutenberg/pull/18016).
-*   Prevent blank page when using the [Media Modal Edit Image "back"](https://github.com/WordPress/gutenberg/pull/18007) button.
-*   Allow the [shortcode transform](https://github.com/WordPress/gutenberg/pull/17925) to apply to all the provided shortcode aliases. 
-*   Fix JavaScript error triggered when using arrows on an [empty URLInput](https://github.com/WordPress/gutenberg/pull/18088).
-*   Fix [extra margins added to Gallery blocks](https://github.com/WordPress/gutenberg/pull/18019) by list editor styles.
-*   Fix [custom button background color](https://github.com/WordPress/gutenberg/pull/18037) not reflected on reload.
-*   [Preserve List block attributes](https://github.com/WordPress/gutenberg/pull/18102) when splitting into multiple lists. 
-*   Fix [checkbox styles](https://github.com/WordPress/gutenberg/pull/18108) when used in metaboxes.
-*   Make the [FontSizePicker style](https://github.com/WordPress/gutenberg/pull/18078) independent from WordPress core styles.
-*   Fix overlapping controls in the [Inline Image formatting toolbar](https://github.com/WordPress/gutenberg/pull/18090).
-*   Fix [strikethrough formatting](https://github.com/WordPress/gutenberg/pull/17187) when copy/pasting from Google Docs in Safari.
-*   Allow [media upload post processing](https://github.com/WordPress/gutenberg/pull/18106) for all 5xx REST API responses.
-
-## Experiments
-
-*   Navigation block:
-    *   Support [color customization](https://github.com/WordPress/gutenberg/pull/17832).
-    *   Improve the [Link edition UI](https://github.com/WordPress/gutenberg/pull/17986).
-*   Block Content Areas:
-    *   Implement a frontend [template loader](https://github.com/WordPress/gutenberg/pull/17626) based on the  **wp_template** CPT.
-    *   Add a temporary [UI to edit **wp_template**](https://github.com/WordPress/gutenberg/pull/17625) CPT posts.
-    *   Add a [Site title block](https://github.com/WordPress/gutenberg/pull/17207).
+-   Navigation block:
+    -   Support [color customization](https://github.com/WordPress/gutenberg/pull/17832).
+    -   Improve the [Link edition UI](https://github.com/WordPress/gutenberg/pull/17986).
+-   Block Content Areas:
+    -   Implement a frontend [template loader](https://github.com/WordPress/gutenberg/pull/17626) based on the  **wp_template** CPT.
+    -   Add a temporary [UI to edit **wp_template**](https://github.com/WordPress/gutenberg/pull/17625) CPT posts.
+    -   Add a [Site title block](https://github.com/WordPress/gutenberg/pull/17207).
 
 ### New APIs
 
-*   Add [VisuallyHidden](https://github.com/WordPress/gutenberg/pull/18022) component.
-*   Add [**@wordpress/base-styles**](https://github.com/WordPress/gutenberg/pull/17883) package to share the common variables/mixins used by the WordPress packages.
-*   Add [Platform component](https://github.com/WordPress/gutenberg/pull/18058) to allow writing platform (web, mobile) specific logic.
-*   Add isInvalidDate prop to [DatePicker](https://github.com/WordPress/gutenberg/pull/17498).
-*   @wordpress/env improvements:
-    *   Support [custom ports](https://github.com/WordPress/gutenberg/pull/17697).
-    *   Support using it for [themes](https://github.com/WordPress/gutenberg/pull/17732).
-*   Add a new experimental React  hook to [support colors in blocks](https://github.com/WordPress/gutenberg/pull/16781).
-*   Add a new experimental [DimentionControl](https://github.com/WordPress/gutenberg/pull/16791) component.
+-   Add [VisuallyHidden](https://github.com/WordPress/gutenberg/pull/18022) component.
+-   Add [**@wordpress/base-styles**](https://github.com/WordPress/gutenberg/pull/17883) package to share the common variables/mixins used by the WordPress packages.
+-   Add [Platform component](https://github.com/WordPress/gutenberg/pull/18058) to allow writing platform (web, mobile) specific logic.
+-   Add isInvalidDate prop to [DatePicker](https://github.com/WordPress/gutenberg/pull/17498).
+-   @wordpress/env improvements:
+    -   Support [custom ports](https://github.com/WordPress/gutenberg/pull/17697).
+    -   Support using it for [themes](https://github.com/WordPress/gutenberg/pull/17732).
+-   Add a new experimental React  hook to [support colors in blocks](https://github.com/WordPress/gutenberg/pull/16781).
+-   Add a new experimental [DimentionControl](https://github.com/WordPress/gutenberg/pull/16791) component.
 
 ### Various
 
-*   Storybook:
-    *   Add a story for the [CheckboxControl](https://github.com/WordPress/gutenberg/pull/17891) component.
-    *   Add a story for the [Dashicon](https://github.com/WordPress/gutenberg/pull/18027) component.
-    *   Add a story for the [ColorPalette](https://github.com/WordPress/gutenberg/pull/17997) component.
-    *   Add a story for the [ColorPicker](https://github.com/WordPress/gutenberg/pull/18013) component.
-    *   Add a story for the [ExternalLink](https://github.com/WordPress/gutenberg/pull/18084) component.
+-   Storybook:
+    -   Add a story for the [CheckboxControl](https://github.com/WordPress/gutenberg/pull/17891) component.
+    -   Add a story for the [Dashicon](https://github.com/WordPress/gutenberg/pull/18027) component.
+    -   Add a story for the [ColorPalette](https://github.com/WordPress/gutenberg/pull/17997) component.
+    -   Add a story for the [ColorPicker](https://github.com/WordPress/gutenberg/pull/18013) component.
+    -   Add a story for the [ExternalLink](https://github.com/WordPress/gutenberg/pull/18084) component.
 
 Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/pull/18015).
 
-*   Several other [enhancements to existing stories](https://github.com/WordPress/gutenberg/pull/18030).
-*   [Linting fixes](https://github.com/WordPress/gutenberg/pull/17981) for Storybook config.
-*   Fix Lint warnings triggered by [JSDoc definitions](https://github.com/WordPress/gutenberg/pull/18025).
-*   [Reorganize e2e tests](https://github.com/WordPress/gutenberg/pull/17990) [specs](https://github.com/WordPress/gutenberg/pull/18020) into three folders: editor, experimental and plugin.
-*   Cleanup [skipped e2e tests](https://github.com/WordPress/gutenberg/pull/18003).
-*   Add a [link to Storybook](https://github.com/WordPress/gutenberg/pull/17982) from the Gutenberg playground.
-*   Optimize the **@wordpress/compose** package to [support tree-shaking](https://github.com/WordPress/gutenberg/pull/17945).
-*   Code Quality:
-    *   Refactor the [Button block edit function](https://github.com/WordPress/gutenberg/pull/18006) to use a functional component.
-    *   Change the name of the [accumulated variables](https://github.com/WordPress/gutenberg/pull/17893) in reduce functions.
-    *   Remove wrapper around the [Table block cells](https://github.com/WordPress/gutenberg/pull/17711).
-*   Fix several issues related to [Node 12](https://github.com/WordPress/gutenberg/pull/18054) [becoming](https://github.com/WordPress/gutenberg/pull/18057) LTS.
-*   Add the [Block Inspector](https://github.com/WordPress/gutenberg/pull/18077) to the Gutenberg playground.
+-   Several other [enhancements to existing stories](https://github.com/WordPress/gutenberg/pull/18030).
+-   [Linting fixes](https://github.com/WordPress/gutenberg/pull/17981) for Storybook config.
+-   Fix Lint warnings triggered by [JSDoc definitions](https://github.com/WordPress/gutenberg/pull/18025).
+-   [Reorganize e2e tests](https://github.com/WordPress/gutenberg/pull/17990) [specs](https://github.com/WordPress/gutenberg/pull/18020) into three folders: editor, experimental and plugin.
+-   Cleanup [skipped e2e tests](https://github.com/WordPress/gutenberg/pull/18003).
+-   Add a [link to Storybook](https://github.com/WordPress/gutenberg/pull/17982) from the Gutenberg playground.
+-   Optimize the **@wordpress/compose** package to [support tree-shaking](https://github.com/WordPress/gutenberg/pull/17945).
+-   Code Quality:
+    -   Refactor the [Button block edit function](https://github.com/WordPress/gutenberg/pull/18006) to use a functional component.
+    -   Change the name of the [accumulated variables](https://github.com/WordPress/gutenberg/pull/17893) in reduce functions.
+    -   Remove wrapper around the [Table block cells](https://github.com/WordPress/gutenberg/pull/17711).
+-   Fix several issues related to [Node 12](https://github.com/WordPress/gutenberg/pull/18054) [becoming](https://github.com/WordPress/gutenberg/pull/18057) LTS.
+-   Add the [Block Inspector](https://github.com/WordPress/gutenberg/pull/18077) to the Gutenberg playground.
 
 ### Documentation
 
-*   Enhance the [Git workflow](https://github.com/WordPress/gutenberg/pull/17662) documentation.
-*   Clarify [block naming conventions](https://github.com/WordPress/gutenberg/pull/18117).
-*   Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/17980), [2](https://github.com/WordPress/gutenberg/pull/18039).
+-   Enhance the [Git workflow](https://github.com/WordPress/gutenberg/pull/17662) documentation.
+-   Clarify [block naming conventions](https://github.com/WordPress/gutenberg/pull/18117).
+-   Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/17980), [2](https://github.com/WordPress/gutenberg/pull/18039).
 
 = 6.7.0 =
 
+## Changelog
+
 ### Features
 
-*   Add [gradient backgrounds support](https://github.com/WordPress/gutenberg/pull/17169) to the Button block.
-
-### Bug Fixes
-
-*   i18n : Include the plural version of the “[remove block](https://github.com/WordPress/gutenberg/pull/17665)” string.
-*   Update dropdown menu items to match [hover](https://github.com/WordPress/gutenberg/pull/17621) [style](https://github.com/WordPress/gutenberg/pull/17581) in other places.
-*   Smoothly [reposition Popovers on scroll](https://github.com/WordPress/gutenberg/pull/17699).
-*   Fix [margin styles for Gallery](https://github.com/WordPress/gutenberg/pull/17694) and Social links blocks.
-*   Fix [popovers hidden on mobile](https://github.com/WordPress/gutenberg/pull/17696).
-*   Ensure [sidebar plugins do not get auto-closed](https://github.com/WordPress/gutenberg/pull/17712) when opened on small screens.
-*   Fix the design of the [Checkbox component in IE11](https://github.com/WordPress/gutenberg/pull/17714).
-*   Add [has-text-color](https://github.com/WordPress/gutenberg/pull/17742) classname to heading block.
-*   Prevent [figure margin reset CSS](https://github.com/WordPress/gutenberg/pull/17737) from being included in the frontend.
-*   Fix the [scaling of the pinned plugins menu icons](https://github.com/WordPress/gutenberg/pull/17752).
-*   Fix [Heading and paragraph colors](https://github.com/WordPress/gutenberg/pull/17728) not applied inside the cover block.
-*   [Close Nux tips](https://github.com/WordPress/gutenberg/pull/17663) when clicking outside the tip.
-*   Fix [meta attribute source](https://github.com/WordPress/gutenberg/pull/17820) for post types other than post.
-*   Fix ”[Open in New Tab](https://github.com/WordPress/gutenberg/pull/17794)” not being persisted.
-*   Fix [redo](https://github.com/WordPress/gutenberg/pull/17827) [behavior](https://github.com/WordPress/gutenberg/pull/17861) and expand test coverage.
-*   I18n: Fix missing translation for the [“All content copied” string](https://github.com/WordPress/gutenberg/pull/17828).
-*   Fix the [block preview padding](https://github.com/WordPress/gutenberg/pull/17807) in themes with custom backgrounds.
-*   Fix [merging list blocks](https://github.com/WordPress/gutenberg/pull/17845) with indented list items.
-*   Fix [inline image controls](https://github.com/WordPress/gutenberg/pull/17750) display condition.
-*   Fix clicking the [redirect element](https://github.com/WordPress/gutenberg/pull/17798) focuses the inserted paragraph.
-*   Fix [editing meta attributes](https://github.com/WordPress/gutenberg/pull/17850) with multiple set to true.
-*   Add [No Preview Available](https://github.com/WordPress/gutenberg/pull/17848) text to the inserter preview panel.
-*   [Prevent block controls from disappearing](https://github.com/WordPress/gutenberg/pull/17876) when switching the List block type.
-*   Avoid [trailing space](https://github.com/WordPress/gutenberg/pull/17842) at the end of a translatable string.
-*   Fix [left aligned nested blocks](https://github.com/WordPress/gutenberg/pull/17804).
-*   Fix the top margin of the [RadioControl help text](https://github.com/WordPress/gutenberg/pull/17677).
-*   Fix [invalid HTML](https://github.com/WordPress/gutenberg/pull/17754) used in the Featured Image panel.
-*   Make sure that all [edits after saving](https://github.com/WordPress/gutenberg/pull/17888) are considered persistent by default.
-*   Ensure that [sidebar is closed on the first visit](https://github.com/WordPress/gutenberg/pull/17902) on small screens.
-*   Update the [columns block example](https://github.com/WordPress/gutenberg/pull/17904) to avoid overlapping issues.
-*   Remove unnecessary default styles for [H2 heading inside Cover blocks](https://github.com/WordPress/gutenberg/pull/17815).
-*   Fix [Media & Text block alignment](https://github.com/WordPress/gutenberg/pull/10812) in IE11.
-*   Remove [unnecessary padding](https://github.com/WordPress/gutenberg/pull/17907https://github.com/WordPress/gutenberg/pull/17907) in the Columns block.
-*   Fix the [Columns block height](https://github.com/WordPress/gutenberg/pull/17901) in IE11.
-*   Correctly update [RichText value after undo](https://github.com/WordPress/gutenberg/pull/17840).
-*   Prevent the [snackbar link components](https://github.com/WordPress/gutenberg/pull/17887) from hiding on focus.
-*   Fix [block toolbar position](https://github.com/WordPress/gutenberg/pull/17894) in IE11.
-*   Retry [uploading images](https://github.com/WordPress/gutenberg/pull/17858) on failures.
+-   Add [gradient backgrounds support](https://github.com/WordPress/gutenberg/pull/17169) to the Button block.
+
+### Bug Fixes
+
+-   i18n : Include the plural version of the “[remove block](https://github.com/WordPress/gutenberg/pull/17665)” string.
+-   Update dropdown menu items to match [hover](https://github.com/WordPress/gutenberg/pull/17621) [style](https://github.com/WordPress/gutenberg/pull/17581) in other places.
+-   Smoothly [reposition Popovers on scroll](https://github.com/WordPress/gutenberg/pull/17699).
+-   Fix [margin styles for Gallery](https://github.com/WordPress/gutenberg/pull/17694) and Social links blocks.
+-   Fix [popovers hidden on mobile](https://github.com/WordPress/gutenberg/pull/17696).
+-   Ensure [sidebar plugins do not get auto-closed](https://github.com/WordPress/gutenberg/pull/17712) when opened on small screens.
+-   Fix the design of the [Checkbox component in IE11](https://github.com/WordPress/gutenberg/pull/17714).
+-   Add [has-text-color](https://github.com/WordPress/gutenberg/pull/17742) classname to heading block.
+-   Prevent [figure margin reset CSS](https://github.com/WordPress/gutenberg/pull/17737) from being included in the frontend.
+-   Fix the [scaling of the pinned plugins menu icons](https://github.com/WordPress/gutenberg/pull/17752).
+-   Fix [Heading and paragraph colors](https://github.com/WordPress/gutenberg/pull/17728) not applied inside the cover block.
+-   [Close Nux tips](https://github.com/WordPress/gutenberg/pull/17663) when clicking outside the tip.
+-   Fix [meta attribute source](https://github.com/WordPress/gutenberg/pull/17820) for post types other than post.
+-   Fix ”[Open in New Tab](https://github.com/WordPress/gutenberg/pull/17794)” not being persisted.
+-   Fix [redo](https://github.com/WordPress/gutenberg/pull/17827) [behavior](https://github.com/WordPress/gutenberg/pull/17861) and expand test coverage.
+-   I18n: Fix missing translation for the [“All content copied” string](https://github.com/WordPress/gutenberg/pull/17828).
+-   Fix the [block preview padding](https://github.com/WordPress/gutenberg/pull/17807) in themes with custom backgrounds.
+-   Fix [merging list blocks](https://github.com/WordPress/gutenberg/pull/17845) with indented list items.
+-   Fix [inline image controls](https://github.com/WordPress/gutenberg/pull/17750) display condition.
+-   Fix clicking the [redirect element](https://github.com/WordPress/gutenberg/pull/17798) focuses the inserted paragraph.
+-   Fix [editing meta attributes](https://github.com/WordPress/gutenberg/pull/17850) with multiple set to true.
+-   Add [No Preview Available](https://github.com/WordPress/gutenberg/pull/17848) text to the inserter preview panel.
+-   [Prevent block controls from disappearing](https://github.com/WordPress/gutenberg/pull/17876) when switching the List block type.
+-   Avoid [trailing space](https://github.com/WordPress/gutenberg/pull/17842) at the end of a translatable string.
+-   Fix [left aligned nested blocks](https://github.com/WordPress/gutenberg/pull/17804).
+-   Fix the top margin of the [RadioControl help text](https://github.com/WordPress/gutenberg/pull/17677).
+-   Fix [invalid HTML](https://github.com/WordPress/gutenberg/pull/17754) used in the Featured Image panel.
+-   Make sure that all [edits after saving](https://github.com/WordPress/gutenberg/pull/17888) are considered persistent by default.
+-   Ensure that [sidebar is closed on the first visit](https://github.com/WordPress/gutenberg/pull/17902) on small screens.
+-   Update the [columns block example](https://github.com/WordPress/gutenberg/pull/17904) to avoid overlapping issues.
+-   Remove unnecessary default styles for [H2 heading inside Cover blocks](https://github.com/WordPress/gutenberg/pull/17815).
+-   Fix [Media & Text block alignment](https://github.com/WordPress/gutenberg/pull/10812) in IE11.
+-   Remove [unnecessary padding](https://github.com/WordPress/gutenberg/pull/17907https://github.com/WordPress/gutenberg/pull/17907) in the Columns block.
+-   Fix the [Columns block height](https://github.com/WordPress/gutenberg/pull/17901) in IE11.
+-   Correctly update [RichText value after undo](https://github.com/WordPress/gutenberg/pull/17840).
+-   Prevent the [snackbar link components](https://github.com/WordPress/gutenberg/pull/17887) from hiding on focus.
+-   Fix [block toolbar position](https://github.com/WordPress/gutenberg/pull/17894) in IE11.
+-   Retry [uploading images](https://github.com/WordPress/gutenberg/pull/17858) on failures.
 
 ### Performance
 
-*   Avoid [continuously reset browser selection](https://github.com/WordPress/gutenberg/pull/17869) (improve typing performance in iOS).
+-   Avoid [continuously reset browser selection](https://github.com/WordPress/gutenberg/pull/17869) (improve typing performance in iOS).
 
 ### Enhancements
 
-*   Polish [FontSize Picker design](https://github.com/WordPress/gutenberg/pull/17647).
-*   Use body color for the [post publish panel](https://github.com/WordPress/gutenberg/pull/17731).
-*   Limit the width and height of the [pinnable plugins icons](https://github.com/WordPress/gutenberg/pull/17722).
-*   Add a [max width to the Search block](https://github.com/WordPress/gutenberg/pull/17648) input.
+-   Polish [FontSize Picker design](https://github.com/WordPress/gutenberg/pull/17647).
+-   Use body color for the [post publish panel](https://github.com/WordPress/gutenberg/pull/17731).
+-   Limit the width and height of the [pinnable plugins icons](https://github.com/WordPress/gutenberg/pull/17722).
+-   Add a [max width to the Search block](https://github.com/WordPress/gutenberg/pull/17648) input.
 
 ### Experiments
 
-*   Menu Navigation block:
-*   Implement initial state containing [top level pages](https://github.com/WordPress/gutenberg/pull/17637).
-*   Fix [menu alignment](https://github.com/WordPress/gutenberg/pull/17630).
-*   Fix the [classname](https://github.com/WordPress/gutenberg/pull/17853) in frontend.
-*   Block Directory
-*   Change the [relative time string](https://github.com/WordPress/gutenberg/pull/17535).
-*   Widgets Screen
-*   Fix the [styling of the inspector panel](https://github.com/WordPress/gutenberg/pull/17880).
+-   Menu Navigation block:
+-   Implement initial state containing [top level pages](https://github.com/WordPress/gutenberg/pull/17637).
+-   Fix [menu alignment](https://github.com/WordPress/gutenberg/pull/17630).
+-   Fix the [classname](https://github.com/WordPress/gutenberg/pull/17853) in frontend.
+-   Block Directory
+-   Change the [relative time string](https://github.com/WordPress/gutenberg/pull/17535).
+-   Widgets Screen
+-   Fix the [styling of the inspector panel](https://github.com/WordPress/gutenberg/pull/17880).
 
 ### Documentation
 
-*   Fix [@wordpress/data-controls examples](https://github.com/WordPress/gutenberg/pull/17773).
-*   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/17821), [2](https://github.com/WordPress/gutenberg/pull/17909).
+-   Fix [@wordpress/data-controls examples](https://github.com/WordPress/gutenberg/pull/17773).
+-   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/17821), [2](https://github.com/WordPress/gutenberg/pull/17909).
 
 ### Various
 
-*   Introduce the [@wordpress/env](https://github.com/WordPress/gutenberg/pull/17668) package, A zero-config, self-contained local WordPress environment for development and testing.
-*   Add [Storybook](https://github.com/WordPress/gutenberg/pull/17475) [to](https://github.com/WordPress/gutenberg/pull/17762) develop and showcase UI components:
-*   [Add](https://github.com/WordPress/gutenberg/pull/17910) [ButtonGroup](https://github.com/WordPress/gutenberg/pull/17884) component.
-*   Add [ScrollLock](https://github.com/WordPress/gutenberg/pull/17886) component.
-*   Add [Animate](https://github.com/WordPress/gutenberg/pull/17890https://github.com/WordPress/gutenberg/pull/17890) component.
-*   Add [Icon and IconButton](https://github.com/WordPress/gutenberg/pull/17868) components.
-*   Add [ClipboardButton](https://github.com/WordPress/gutenberg/pull/17913) component.
-*   Add [ColorIndicator](https://github.com/WordPress/gutenberg/pull/17924) component.
-*   [Remove RichText](https://github.com/WordPress/gutenberg/pull/17607) [wrapper](https://github.com/WordPress/gutenberg/pull/17713) and use Popover for the inline toolbar.
-*   Improve the way the [lock file](https://github.com/WordPress/gutenberg/pull/17705) handles local dependencies.
-*   Refactor [ColorPalette](https://github.com/WordPress/gutenberg/pull/17154) by extracting its design.
-*   Improve [E2E test reliability](https://github.com/WordPress/gutenberg/pull/17679) by consuming synchronous data and bailing on save failure.
-*   Replace the [isDismissable prop with isDismissible](https://github.com/WordPress/gutenberg/pull/17689) in the Modal component.
-*   Add eslint-plugin-jest to the default @wordpress/scripts [linting config](https://github.com/WordPress/gutenberg/pull/17744).
-*   Update @wordpress/scripts to use the [latest version of webpack](https://github.com/WordPress/gutenberg/pull/17753) for build and start commands.
-*   Cleanup [Dashicon component](https://github.com/WordPress/gutenberg/pull/17741).
-*   Update the [Excerpt help link](https://github.com/WordPress/gutenberg/pull/17753).
-*   [Release tool](https://github.com/WordPress/gutenberg/pull/17717): fix wrong package.json used when bumping the stable released version.
-*   Fix several [typos](https://github.com/WordPress/gutenberg/pull/17666) in [code](https://github.com/WordPress/gutenberg/pull/17800) and [files](https://github.com/WordPress/gutenberg/pull/17782).
-*   Update [E2E tests](https://github.com/WordPress/gutenberg/pull/17859) to accommodate WP 5.3 Beta 3 changes.
-*   Define the “[sideEffects](https://github.com/WordPress/gutenberg/pull/17862)” property for @wordpress packages.
-*   Add [nested embed e2e test](https://github.com/WordPress/gutenberg/pull/15909).
-*   I18N: Always return the [translation file](https://github.com/WordPress/gutenberg/pull/17900) prefixed with `gutenberg-`.
-*   Use [wp.org CDN for images](https://github.com/WordPress/gutenberg/pull/17935) used in block preview.
+-   Introduce the [@wordpress/env](https://github.com/WordPress/gutenberg/pull/17668) package, A zero-config, self-contained local WordPress environment for development and testing.
+-   Add [Storybook](https://github.com/WordPress/gutenberg/pull/17475) [to](https://github.com/WordPress/gutenberg/pull/17762) develop and showcase UI components:
+-   [Add](https://github.com/WordPress/gutenberg/pull/17910) [ButtonGroup](https://github.com/WordPress/gutenberg/pull/17884) component.
+-   Add [ScrollLock](https://github.com/WordPress/gutenberg/pull/17886) component.
+-   Add [Animate](https://github.com/WordPress/gutenberg/pull/17890https://github.com/WordPress/gutenberg/pull/17890) component.
+-   Add [Icon and IconButton](https://github.com/WordPress/gutenberg/pull/17868) components.
+-   Add [ClipboardButton](https://github.com/WordPress/gutenberg/pull/17913) component.
+-   Add [ColorIndicator](https://github.com/WordPress/gutenberg/pull/17924) component.
+-   [Remove RichText](https://github.com/WordPress/gutenberg/pull/17607) [wrapper](https://github.com/WordPress/gutenberg/pull/17713) and use Popover for the inline toolbar.
+-   Improve the way the [lock file](https://github.com/WordPress/gutenberg/pull/17705) handles local dependencies.
+-   Refactor [ColorPalette](https://github.com/WordPress/gutenberg/pull/17154) by extracting its design.
+-   Improve [E2E test reliability](https://github.com/WordPress/gutenberg/pull/17679) by consuming synchronous data and bailing on save failure.
+-   Replace the [isDismissable prop with isDismissible](https://github.com/WordPress/gutenberg/pull/17689) in the Modal component.
+-   Add eslint-plugin-jest to the default @wordpress/scripts [linting config](https://github.com/WordPress/gutenberg/pull/17744).
+-   Update @wordpress/scripts to use the [latest version of webpack](https://github.com/WordPress/gutenberg/pull/17753) for build and start commands.
+-   Cleanup [Dashicon component](https://github.com/WordPress/gutenberg/pull/17741).
+-   Update the [Excerpt help link](https://github.com/WordPress/gutenberg/pull/17753).
+-   [Release tool](https://github.com/WordPress/gutenberg/pull/17717): fix wrong package.json used when bumping the stable released version.
+-   Fix several [typos](https://github.com/WordPress/gutenberg/pull/17666) in [code](https://github.com/WordPress/gutenberg/pull/17800) and [files](https://github.com/WordPress/gutenberg/pull/17782).
+-   Update [E2E tests](https://github.com/WordPress/gutenberg/pull/17859) to accommodate WP 5.3 Beta 3 changes.
+-   Define the “[sideEffects](https://github.com/WordPress/gutenberg/pull/17862)” property for @wordpress packages.
+-   Add [nested embed e2e test](https://github.com/WordPress/gutenberg/pull/15909).
+-   I18N: Always return the [translation file](https://github.com/WordPress/gutenberg/pull/17900) prefixed with `gutenberg-`.
+-   Use [wp.org CDN for images](https://github.com/WordPress/gutenberg/pull/17935) used in block preview.
 
 = 6.6.0 =
 
+## Changelog
+
 ### Enhancements
 
 -   Turn [Stack on mobile toggle on by default](https://github.com/WordPress/gutenberg/pull/14364) in the Media & Text block.
 -   Only show the Inserter [help panel in the topbar inserter](https://github.com/WordPress/gutenberg/pull/17545).
 -   Use minimum height instead of height for [Cover height control label](https://github.com/WordPress/gutenberg/pull/17634).
--   Update the [buttons](https://github.com/WordPress/gutenberg/pull/17645)  [styling](https://github.com/WordPress/gutenberg/pull/17651) to match core.
+-   Update the [buttons](https://github.com/WordPress/gutenberg/pull/17645) [styling](https://github.com/WordPress/gutenberg/pull/17651) to match core.
 -   Add [preview examples](https://github.com/WordPress/gutenberg/pull/17493) for multiple core blocks.
 
 ### New APIs
@@ -30952,7 +42995,7 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 -   Gallery block: [Don't show the caption gradient overlay](https://github.com/WordPress/gutenberg/pull/17561) unless image is selected or a caption is set.
 -   Gallery block: Fix [custom alignment layouts](https://github.com/WordPress/gutenberg/pull/17586)
 -   Fix [dirtiness detection when server-side saving filters](https://github.com/WordPress/gutenberg/pull/17532) are used.
--   Remove [wrong i18n](https://github.com/WordPress/gutenberg/pull/17546)  [domain](https://github.com/WordPress/gutenberg/pull/17591).
+-   Remove [wrong i18n](https://github.com/WordPress/gutenberg/pull/17546) [domain](https://github.com/WordPress/gutenberg/pull/17591).
 -   Fix [invalid block warning](https://github.com/WordPress/gutenberg/pull/17572) panel.
 -   Fix various issues in related to the [BlockDirectory inserter](https://github.com/WordPress/gutenberg/pull/17517).
 -   Cover block: [Show Height control](https://github.com/WordPress/gutenberg/pull/17371) only if an image background is selected.
@@ -30977,7 +43020,7 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 ### Various
 
 -   [Replace registered social links blocks](https://github.com/WordPress/gutenberg/pull/17494) if already registered in Core.
--   More stable [List block e2e](https://github.com/WordPress/gutenberg/pull/17482)  [tests](https://github.com/WordPress/gutenberg/pull/17599).
+-   More stable [List block e2e](https://github.com/WordPress/gutenberg/pull/17482) [tests](https://github.com/WordPress/gutenberg/pull/17599).
 -   Add e2e tests to validate the [date picker UI](https://github.com/WordPress/gutenberg/pull/17490) behavior.
 -   Add e2e tests to validate the [local auto-save](https://github.com/WordPress/gutenberg/pull/17503) behavior.
 -   Mark the [social links block as experimental](https://github.com/WordPress/gutenberg/pull/17526).
@@ -31002,105 +43045,123 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 
 = 6.5.0 =
 
+## Changelog
+
 ### Features
-*   Add a [new](https://github.com/WordPress/gutenberg/pull/17402) [Social links](https://github.com/WordPress/gutenberg/pull/16897) [block](https://github.com/WordPress/gutenberg/pull/17380).
-*   Support [border radius changes](https://github.com/WordPress/gutenberg/pull/17253) in the Button block.
-*   Support [adding a caption to the Gallery block](https://github.com/WordPress/gutenberg/pull/17101).
-*   Support [local autosaves](https://github.com/WordPress/gutenberg/pull/16490).
+
+-   Add a [new](https://github.com/WordPress/gutenberg/pull/17402) [Social links](https://github.com/WordPress/gutenberg/pull/16897) [block](https://github.com/WordPress/gutenberg/pull/17380).
+-   Support [border radius changes](https://github.com/WordPress/gutenberg/pull/17253) in the Button block.
+-   Support [adding a caption to the Gallery block](https://github.com/WordPress/gutenberg/pull/17101).
+-   Support [local autosaves](https://github.com/WordPress/gutenberg/pull/16490).
+
 ### Enhancements
-*   [Disable the click-through](https://github.com/WordPress/gutenberg/pull/17239) behavior in desktop.
-*   Update the [labels width](https://github.com/WordPress/gutenberg/pull/14478) to fit their content.
-*   Avoid displaying console warnings when [blocks are upgraded using deprecated versions](https://github.com/WordPress/gutenberg/pull/16862).
-*   Reduce the [padding around the in-between block inserter](https://github.com/WordPress/gutenberg/pull/17136).
-*   Improve the design of [the](https://github.com/WordPress/gutenberg/pull/17315) [block movers](https://github.com/WordPress/gutenberg/pull/17216).
-*   Align the [Gallery block image](https://github.com/WordPress/gutenberg/pull/17316) [controls](https://github.com/WordPress/gutenberg/pull/17374) with the block movers design.
-*   [Remove child blocks](https://github.com/WordPress/gutenberg/pull/17128) from the block manager.
-*   [Remove duplicated "Enable" label](https://github.com/WordPress/gutenberg/pull/17375) from the options panel.
-*   Use [sentence case](https://github.com/WordPress/gutenberg/pull/17336) for all tooltips.
-*   [Remove the forced gray scale](https://github.com/WordPress/gutenberg/pull/17415) from the category icons.
-*   Move the [alignment controls to toolbar of the Heading](https://github.com/WordPress/gutenberg/pull/17419) block.
-*   Use the [featured image frame](https://github.com/WordPress/gutenberg/pull/17410) in the Media modal.
-### Bug Fixes
-*   Update the [Post Schedule label](https://github.com/WordPress/gutenberg/pull/15757) to correctly reflect the date and time display settings.
-*   Clean up the [block toolbar position](https://github.com/WordPress/gutenberg/pull/17197) for wide full blocks.
-*   Fix the [cropped focus indicator](https://github.com/WordPress/gutenberg/pull/17215) in the block inserter.
-*   Browser incompatibilities:
-    *   [Fallback to setTimeout in RichText](https://github.com/WordPress/gutenberg/pull/17213) if no requestIdleCallback is not supported.
-    *   [Block toolbar fixes](https://github.com/WordPress/gutenberg/pull/17214) for IE11.
-    *   Fix [Backspace usage in RichText](https://github.com/WordPress/gutenberg/pull/17256) for IE11.
-*   Prevent clicking the [next/previous month in the Post Schedule](https://github.com/WordPress/gutenberg/pull/17201) popover from closing it.
-*   Prevent the [private posts from triggering the unsaved changes](https://github.com/WordPress/gutenberg/pull/17210) [warnings](https://github.com/WordPress/gutenberg/pull/17257) after saving.
-*   Fix the usage of the [useReducedMotion hook in Node.js](https://github.com/WordPress/gutenberg/pull/17165) context.
-*   A11y:
-    *   Use [darker form field borders](https://github.com/WordPress/gutenberg/pull/17218).
-    *   Fix the [modal escape key propagation](https://github.com/WordPress/gutenberg/pull/17297).
-    *   [Move focus back from the Modal to the More Menu](https://github.com/WordPress/gutenberg/pull/16964) when it was used to open the Modal.
-*   [Trim leading and trailing whitespaces](https://github.com/WordPress/gutenberg/pull/17320) when inserting links.
-*   Prevent using the paragraph block when [pasting unformatted text into RichText](https://github.com/WordPress/gutenberg/pull/17140).
-*   Fix styling of [classic block's block controls](https://github.com/WordPress/gutenberg/pull/17323).
-*   Fix the [showing/hiding logic of the **Group** menu item](https://github.com/WordPress/gutenberg/pull/17353) in the block settings menu.
-*   Fix [invalid HTML nesting](https://github.com/WordPress/gutenberg/pull/17342) of buttons.
-*   Fix [React warning when using withFocusReturn](https://github.com/WordPress/gutenberg/pull/17354) Higher-order component.
-*   Fix [lengthy content cuts](https://github.com/WordPress/gutenberg/pull/17365) in the Cover block.
-*   Disable [multi-selection when resizing](https://github.com/WordPress/gutenberg/pull/17359).
-*   Fix the [permalink UI in RTL](https://github.com/WordPress/gutenberg/pull/13919) languages.
-*   Fix multiple issues related to the [reusable blocks](https://github.com/WordPress/gutenberg/pull/14367) editing/previewing UI.
-*   Remove filter that [unsets auto-draft titles](https://github.com/WordPress/gutenberg/pull/17317).
-*   Fix the [Move to trash](https://github.com/WordPress/gutenberg/pull/17427) button redirection.
-*   Prevent [undo/redo history cleaning on autosaves](https://github.com/WordPress/gutenberg/pull/17420).
-*   Add i18n support for title [Content Blocks string](https://github.com/WordPress/gutenberg/pull/17435).
-*   Add missing extra [classnames to the Column block](https://github.com/WordPress/gutenberg/pull/17422).
-*   Fix  JavaScript error triggered when using a [multi-line RichText](https://github.com/WordPress/gutenberg/pull/17447).
-*   Fix [RichText](https://github.com/WordPress/gutenberg/pull/17451) [focus](https://github.com/WordPress/gutenberg/pull/17450) related issues.
-*   Fix [undo levels](https://github.com/WordPress/gutenberg/pull/17259) [inconsistencies](https://github.com/WordPress/gutenberg/pull/17452).
-*   Fix [multiple post meta fields edits](https://github.com/WordPress/gutenberg/pull/17455).
-*   Fix [selecting custom colors](https://github.com/WordPress/gutenberg/pull/17381) in RTL languages.
+
+-   [Disable the click-through](https://github.com/WordPress/gutenberg/pull/17239) behavior in desktop.
+-   Update the [labels width](https://github.com/WordPress/gutenberg/pull/14478) to fit their content.
+-   Avoid displaying console warnings when [blocks are upgraded using deprecated versions](https://github.com/WordPress/gutenberg/pull/16862).
+-   Reduce the [padding around the in-between block inserter](https://github.com/WordPress/gutenberg/pull/17136).
+-   Improve the design of [the](https://github.com/WordPress/gutenberg/pull/17315) [block movers](https://github.com/WordPress/gutenberg/pull/17216).
+-   Align the [Gallery block image](https://github.com/WordPress/gutenberg/pull/17316) [controls](https://github.com/WordPress/gutenberg/pull/17374) with the block movers design.
+-   [Remove child blocks](https://github.com/WordPress/gutenberg/pull/17128) from the block manager.
+-   [Remove duplicated "Enable" label](https://github.com/WordPress/gutenberg/pull/17375) from the options panel.
+-   Use [sentence case](https://github.com/WordPress/gutenberg/pull/17336) for all tooltips.
+-   [Remove the forced gray scale](https://github.com/WordPress/gutenberg/pull/17415) from the category icons.
+-   Move the [alignment controls to toolbar of the Heading](https://github.com/WordPress/gutenberg/pull/17419) block.
+-   Use the [featured image frame](https://github.com/WordPress/gutenberg/pull/17410) in the Media modal.
+
+### Bug Fixes
+
+-   Update the [Post Schedule label](https://github.com/WordPress/gutenberg/pull/15757) to correctly reflect the date and time display settings.
+-   Clean up the [block toolbar position](https://github.com/WordPress/gutenberg/pull/17197) for wide full blocks.
+-   Fix the [cropped focus indicator](https://github.com/WordPress/gutenberg/pull/17215) in the block inserter.
+-   Browser incompatibilities:
+    -   [Fallback to setTimeout in RichText](https://github.com/WordPress/gutenberg/pull/17213) if no requestIdleCallback is not supported.
+    -   [Block toolbar fixes](https://github.com/WordPress/gutenberg/pull/17214) for IE11.
+    -   Fix [Backspace usage in RichText](https://github.com/WordPress/gutenberg/pull/17256) for IE11.
+-   Prevent clicking the [next/previous month in the Post Schedule](https://github.com/WordPress/gutenberg/pull/17201) popover from closing it.
+-   Prevent the [private posts from triggering the unsaved changes](https://github.com/WordPress/gutenberg/pull/17210) [warnings](https://github.com/WordPress/gutenberg/pull/17257) after saving.
+-   Fix the usage of the [useReducedMotion hook in Node.js](https://github.com/WordPress/gutenberg/pull/17165) context.
+-   A11y:
+    -   Use [darker form field borders](https://github.com/WordPress/gutenberg/pull/17218).
+    -   Fix the [modal escape key propagation](https://github.com/WordPress/gutenberg/pull/17297).
+    -   [Move focus back from the Modal to the More Menu](https://github.com/WordPress/gutenberg/pull/16964) when it was used to open the Modal.
+-   [Trim leading and trailing whitespaces](https://github.com/WordPress/gutenberg/pull/17320) when inserting links.
+-   Prevent using the paragraph block when [pasting unformatted text into RichText](https://github.com/WordPress/gutenberg/pull/17140).
+-   Fix styling of [classic block's block controls](https://github.com/WordPress/gutenberg/pull/17323).
+-   Fix the [showing/hiding logic of the **Group** menu item](https://github.com/WordPress/gutenberg/pull/17353) in the block settings menu.
+-   Fix [invalid HTML nesting](https://github.com/WordPress/gutenberg/pull/17342) of buttons.
+-   Fix [React warning when using withFocusReturn](https://github.com/WordPress/gutenberg/pull/17354) Higher-order component.
+-   Fix [lengthy content cuts](https://github.com/WordPress/gutenberg/pull/17365) in the Cover block.
+-   Disable [multi-selection when resizing](https://github.com/WordPress/gutenberg/pull/17359).
+-   Fix the [permalink UI in RTL](https://github.com/WordPress/gutenberg/pull/13919) languages.
+-   Fix multiple issues related to the [reusable blocks](https://github.com/WordPress/gutenberg/pull/14367) editing/previewing UI.
+-   Remove filter that [unsets auto-draft titles](https://github.com/WordPress/gutenberg/pull/17317).
+-   Fix the [Move to trash](https://github.com/WordPress/gutenberg/pull/17427) button redirection.
+-   Prevent [undo/redo history cleaning on autosaves](https://github.com/WordPress/gutenberg/pull/17420).
+-   Add i18n support for title [Content Blocks string](https://github.com/WordPress/gutenberg/pull/17435).
+-   Add missing extra [classnames to the Column block](https://github.com/WordPress/gutenberg/pull/17422).
+-   Fix JavaScript error triggered when using a [multi-line RichText](https://github.com/WordPress/gutenberg/pull/17447).
+-   Fix [RichText](https://github.com/WordPress/gutenberg/pull/17451) [focus](https://github.com/WordPress/gutenberg/pull/17450) related issues.
+-   Fix [undo levels](https://github.com/WordPress/gutenberg/pull/17259) [inconsistencies](https://github.com/WordPress/gutenberg/pull/17452).
+-   Fix [multiple post meta fields edits](https://github.com/WordPress/gutenberg/pull/17455).
+-   Fix [selecting custom colors](https://github.com/WordPress/gutenberg/pull/17381) in RTL languages.
+
 ### Experiments
-*   Add [one-click search and install blocks](https://github.com/WordPress/gutenberg/pull/17431) from the block directory to the inserter.
-*   Refactor the [Navigation block](https://github.com/WordPress/gutenberg/pull/16796) [to](https://github.com/WordPress/gutenberg/pull/17343) [be](https://github.com/WordPress/gutenberg/pull/17328) a dynamic block.
-*   Add a [block navigator to the Navigation](https://github.com/WordPress/gutenberg/pull/17265) [block](https://github.com/WordPress/gutenberg/pull/17446).
-*   Only show the [customizer block based widgets](https://github.com/WordPress/gutenberg/pull/16956) if the experimental widget screen is enabled.
+
+-   Add [one-click search and install blocks](https://github.com/WordPress/gutenberg/pull/17431) from the block directory to the inserter.
+-   Refactor the [Navigation block](https://github.com/WordPress/gutenberg/pull/16796) [to](https://github.com/WordPress/gutenberg/pull/17343) [be](https://github.com/WordPress/gutenberg/pull/17328) a dynamic block.
+-   Add a [block navigator to the Navigation](https://github.com/WordPress/gutenberg/pull/17265) [block](https://github.com/WordPress/gutenberg/pull/17446).
+-   Only show the [customizer block based widgets](https://github.com/WordPress/gutenberg/pull/16956) if the experimental widget screen is enabled.
+
 ### APIs
-*   Add a [disableDropZone prop for MediaPlaceholder](https://github.com/WordPress/gutenberg/pull/17077) component.
-*   Add [post autosave locking](https://github.com/WordPress/gutenberg/pull/16249).
-*   [PluginPrePublishPanel](https://github.com/WordPress/gutenberg/pull/16378) and [PluginPostPublishPanel](https://github.com/WordPress/gutenberg/pull/16383) support icon prop and inherits from registerPlugin.
-*   Allow [disabling the Post Status](https://github.com/WordPress/gutenberg/pull/17117) settings panel.
-*   Restore the [keepPlaceholderOnFocus](https://github.com/WordPress/gutenberg/pull/17439) [RichText](https://github.com/WordPress/gutenberg/pull/17445) prop.
+
+-   Add a [disableDropZone prop for MediaPlaceholder](https://github.com/WordPress/gutenberg/pull/17077) component.
+-   Add [post autosave locking](https://github.com/WordPress/gutenberg/pull/16249).
+-   [PluginPrePublishPanel](https://github.com/WordPress/gutenberg/pull/16378) and [PluginPostPublishPanel](https://github.com/WordPress/gutenberg/pull/16383) support icon prop and inherits from registerPlugin.
+-   Allow [disabling the Post Status](https://github.com/WordPress/gutenberg/pull/17117) settings panel.
+-   Restore the [keepPlaceholderOnFocus](https://github.com/WordPress/gutenberg/pull/17439) [RichText](https://github.com/WordPress/gutenberg/pull/17445) prop.
+
 ### Various
-*   Upgrade [React and React DOM](https://github.com/WordPress/gutenberg/pull/16982) to 16.9.0.
-*   Add [TypeScript JSDoc linting](https://github.com/WordPress/gutenberg/pull/17014) to the @wordpress/url package.
-*   Run [npm audit](https://github.com/WordPress/gutenberg/pull/17192) to fix the reported vulnerabilities.
-*   Switch the local environment to an [environment based on the](https://github.com/WordPress/gutenberg/pull/17004) [Core setup](https://github.com/WordPress/gutenberg/pull/17296).
-*   Set a constant namespace for [module sourcemaps](https://github.com/WordPress/gutenberg/pull/17024).
-*   [Refactor the loading animation](https://github.com/WordPress/gutenberg/pull/17106) to rely on the Animate component.
-*   Code improvements to [block PHP files](https://github.com/WordPress/gutenberg/pull/17288).
-*   Enable the [duplicate style property](https://github.com/WordPress/gutenberg/pull/17287) linting rule.
-*   Update [Husky & Lint-staged](https://github.com/WordPress/gutenberg/pull/17310) to the latest versions.
-*   Restore the usage of the [latest npm version](https://github.com/WordPress/gutenberg/pull/17171) in CI.
-*   Add [ESLint as peer dependency to eslint-plugin](https://github.com/WordPress/gutenberg/pull/17417).
-*   [Conditionally include the block styles](https://github.com/WordPress/gutenberg/pull/17429) functionality to avoid conflicts with Core.
-*   Add missing [deprecated setFocusedElement prop](https://github.com/WordPress/gutenberg/pull/17421) to the RichText component.
-*   Support [generating assets in PHP format](https://github.com/WordPress/gutenberg/pull/17298) in the webpack dependency extraction plugin.
+
+-   Upgrade [React and React DOM](https://github.com/WordPress/gutenberg/pull/16982) to 16.9.0.
+-   Add [TypeScript JSDoc linting](https://github.com/WordPress/gutenberg/pull/17014) to the @wordpress/url package.
+-   Run [npm audit](https://github.com/WordPress/gutenberg/pull/17192) to fix the reported vulnerabilities.
+-   Switch the local environment to an [environment based on the](https://github.com/WordPress/gutenberg/pull/17004) [Core setup](https://github.com/WordPress/gutenberg/pull/17296).
+-   Set a constant namespace for [module sourcemaps](https://github.com/WordPress/gutenberg/pull/17024).
+-   [Refactor the loading animation](https://github.com/WordPress/gutenberg/pull/17106) to rely on the Animate component.
+-   Code improvements to [block PHP files](https://github.com/WordPress/gutenberg/pull/17288).
+-   Enable the [duplicate style property](https://github.com/WordPress/gutenberg/pull/17287) linting rule.
+-   Update [Husky & Lint-staged](https://github.com/WordPress/gutenberg/pull/17310) to the latest versions.
+-   Restore the usage of the [latest npm version](https://github.com/WordPress/gutenberg/pull/17171) in CI.
+-   Add [ESLint as peer dependency to eslint-plugin](https://github.com/WordPress/gutenberg/pull/17417).
+-   [Conditionally include the block styles](https://github.com/WordPress/gutenberg/pull/17429) functionality to avoid conflicts with Core.
+-   Add missing [deprecated setFocusedElement prop](https://github.com/WordPress/gutenberg/pull/17421) to the RichText component.
+-   Support [generating assets in PHP format](https://github.com/WordPress/gutenberg/pull/17298) in the webpack dependency extraction plugin.
+
 ### Documentation
-*   Update the [reviews and merging documentation](https://github.com/WordPress/gutenberg/pull/16915).
-*   Fix [type docs](https://github.com/WordPress/gutenberg/pull/17206) for the Notices package.
-*   Add a link to the [fixtures tests document](https://github.com/WordPress/gutenberg/pull/17283) in the Testing Overview.
-*   Adds documentation for the [onClose prop of MediaUpload](https://github.com/WordPress/gutenberg/pull/17403).
-*   Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/17097), [2](https://github.com/WordPress/gutenberg/pull/17285), [3](https://github.com/WordPress/gutenberg/pull/17292), [4](https://github.com/WordPress/gutenberg/pull/17286), [5](https://github.com/WordPress/gutenberg/pull/17304), [6](https://github.com/WordPress/gutenberg/pull/17349), [7](https://github.com/WordPress/gutenberg/pull/17377), [8](https://github.com/WordPress/gutenberg/pull/17436).
 
+-   Update the [reviews and merging documentation](https://github.com/WordPress/gutenberg/pull/16915).
+-   Fix [type docs](https://github.com/WordPress/gutenberg/pull/17206) for the Notices package.
+-   Add a link to the [fixtures tests document](https://github.com/WordPress/gutenberg/pull/17283) in the Testing Overview.
+-   Adds documentation for the [onClose prop of MediaUpload](https://github.com/WordPress/gutenberg/pull/17403).
+-   Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/17097), [2](https://github.com/WordPress/gutenberg/pull/17285), [3](https://github.com/WordPress/gutenberg/pull/17292), [4](https://github.com/WordPress/gutenberg/pull/17286), [5](https://github.com/WordPress/gutenberg/pull/17304), [6](https://github.com/WordPress/gutenberg/pull/17349), [7](https://github.com/WordPress/gutenberg/pull/17377), [8](https://github.com/WordPress/gutenberg/pull/17436).
 
 = 6.4.0 =
 
+## Changelog
+
 ### Features
-- Add the option to [select the style that is automatically applied](https://github.com/WordPress/gutenberg/pull/16465).
-- Add the option to [resize Cover Block ](https://github.com/WordPress/gutenberg/pull/17143).
-- Allow directly setting a [solid background color on Cover](https://github.com/WordPress/gutenberg/pull/17041) block.
-- Add [list start, reversed settings](https://github.com/WordPress/gutenberg/pull/15113).
-- Add a [help panel to the inserter available in all blocks](https://github.com/WordPress/gutenberg/pull/16813).
-- [Typewriter experience](https://github.com/WordPress/gutenberg/pull/16460).
-- Add [circle-crop variation](https://github.com/WordPress/gutenberg/pull/16475) to Image block.
+
+-   Add the option to [select the style that is automatically applied](https://github.com/WordPress/gutenberg/pull/16465).
+-   Add the option to [resize Cover Block ](https://github.com/WordPress/gutenberg/pull/17143).
+-   Allow directly setting a [solid background color on Cover](https://github.com/WordPress/gutenberg/pull/17041) block.
+-   Add [list start, reversed settings](https://github.com/WordPress/gutenberg/pull/15113).
+-   Add a [help panel to the inserter available in all blocks](https://github.com/WordPress/gutenberg/pull/16813).
+-   [Typewriter experience](https://github.com/WordPress/gutenberg/pull/16460).
+-   Add [circle-crop variation](https://github.com/WordPress/gutenberg/pull/16475) to Image block.
 
 ### Enhancements
+
 -   Add [overflow support inside block switcher](https://github.com/WordPress/gutenberg/pull/16984).
 -   Update [GitHub action exit codes.](https://github.com/WordPress/gutenberg/pull/17002)
 -   Core Data: [return updated record in saveEntityRecord](https://github.com/WordPress/gutenberg/pull/17030).
@@ -31108,37 +43169,39 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 -   [Remove borders around inserter items for blocks with children blocks](https://github.com/WordPress/gutenberg/pull/17083).
 -   Add [disabled block count](https://github.com/WordPress/gutenberg/pull/17103) in the block manager.
 -   Writing Flow:
-	-   Add [splitting in the quote block](https://github.com/WordPress/gutenberg/pull/17121).
-	-   Allow [undoing of patterns with BACKSPACE and ESC.](https://github.com/WordPress/gutenberg/pull/14776)
+    -   Add [splitting in the quote block](https://github.com/WordPress/gutenberg/pull/17121).
+    -   Allow [undoing of patterns with BACKSPACE and ESC.](https://github.com/WordPress/gutenberg/pull/14776)
 
 ### Experiments
+
 -   Widgets Screen:
-	-   Fix: [Blocks are too close together](https://github.com/WordPress/gutenberg/issues/16992).
-	-   Add [Button block appender](https://github.com/WordPress/gutenberg/pull/16971).
+    -   Fix: [Blocks are too close together](https://github.com/WordPress/gutenberg/issues/16992).
+    -   Add [Button block appender](https://github.com/WordPress/gutenberg/pull/16971).
 
 ### New APIs
-- Add [callbacks to ServerSideRenderer](https://github.com/WordPress/gutenberg/pull/16512) to handle failures with custom renderers.
-- Add the [block example API](https://github.com/WordPress/gutenberg/pull/17124) and use it for inserter and switcher previews.
-- Enable an [optional namespace parameter for hasAction & hasFilter ](https://github.com/WordPress/gutenberg/pull/15362).
-
-
-### Bug Fixes
-- The [duplicate button appears even if the block is not allowed](https://github.com/WordPress/gutenberg/pull/17007).
-- [Double scrollbar appearing](https://github.com/WordPress/gutenberg/pull/17031) in full-screen mode.
-- RichText: [ignore selection changes during composition](https://github.com/WordPress/gutenberg/pull/16960)
-- Missing [default functions as props in BlockEditorProvider](https://github.com/WordPress/gutenberg/pull/17036).
-- [Button block does not center](https://github.com/WordPress/gutenberg/pull/17063)  on the editor.
-- Guard [block component against zombie state](https://github.com/WordPress/gutenberg/pull/17092) bug.
-- Add [truthy check for the Popover component](https://github.com/WordPress/gutenberg/pull/17100) onClose prop before calling it.
-- Make InnerBlocks [only force the template on directly set lockings](https://github.com/WordPress/gutenberg/pull/16973).
-- Check to [ensure focus has intentionally left the wrapped component in withFocusOutside](https://github.com/WordPress/gutenberg/pull/17051) HOC.
-- Correctly [transform images with external sources](https://github.com/WordPress/gutenberg/pull/16548) into a gallery.
-- [Block toolbar appears above sidebar](https://github.com/WordPress/gutenberg/pull/17108) on medium viewports.
-- [Basecontrol name undefined](https://github.com/WordPress/gutenberg/pull/17044/files) triggring eslint-plugin TypeError.
-- [Image flickering & focus lose](https://github.com/WordPress/gutenberg/pull/17175) on resizing.
-- Add [get_item_schema function to WP_REST_Widget_Areas_Controller ](https://github.com/WordPress/gutenberg/pull/15981).
-- [Empty Classic Editor inside innerBlock fatal error](https://github.com/WordPress/gutenberg/pull/17164).
-- [Changing month in post publish date closes the popover](https://github.com/WordPress/gutenberg/pull/17164).
+
+-   Add [callbacks to ServerSideRenderer](https://github.com/WordPress/gutenberg/pull/16512) to handle failures with custom renderers.
+-   Add the [block example API](https://github.com/WordPress/gutenberg/pull/17124) and use it for inserter and switcher previews.
+-   Enable an [optional namespace parameter for hasAction & hasFilter ](https://github.com/WordPress/gutenberg/pull/15362).
+
+### Bug Fixes
+
+-   The [duplicate button appears even if the block is not allowed](https://github.com/WordPress/gutenberg/pull/17007).
+-   [Double scrollbar appearing](https://github.com/WordPress/gutenberg/pull/17031) in full-screen mode.
+-   RichText: [ignore selection changes during composition](https://github.com/WordPress/gutenberg/pull/16960)
+-   Missing [default functions as props in BlockEditorProvider](https://github.com/WordPress/gutenberg/pull/17036).
+-   [Button block does not center](https://github.com/WordPress/gutenberg/pull/17063) on the editor.
+-   Guard [block component against zombie state](https://github.com/WordPress/gutenberg/pull/17092) bug.
+-   Add [truthy check for the Popover component](https://github.com/WordPress/gutenberg/pull/17100) onClose prop before calling it.
+-   Make InnerBlocks [only force the template on directly set lockings](https://github.com/WordPress/gutenberg/pull/16973).
+-   Check to [ensure focus has intentionally left the wrapped component in withFocusOutside](https://github.com/WordPress/gutenberg/pull/17051) HOC.
+-   Correctly [transform images with external sources](https://github.com/WordPress/gutenberg/pull/16548) into a gallery.
+-   [Block toolbar appears above sidebar](https://github.com/WordPress/gutenberg/pull/17108) on medium viewports.
+-   [Basecontrol name undefined](https://github.com/WordPress/gutenberg/pull/17044/files) triggring eslint-plugin TypeError.
+-   [Image flickering & focus lose](https://github.com/WordPress/gutenberg/pull/17175) on resizing.
+-   Add [get_item_schema function to WP_REST_Widget_Areas_Controller ](https://github.com/WordPress/gutenberg/pull/15981).
+-   [Empty Classic Editor inside innerBlock fatal error](https://github.com/WordPress/gutenberg/pull/17164).
+-   [Changing month in post publish date closes the popover](https://github.com/WordPress/gutenberg/pull/17164).
 
 ### Various
 
@@ -31147,35 +43210,38 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 -   [Fix performance tests with the introduction of the navigation mode](https://github.com/WordPress/gutenberg/pull/17034)
 -   RichText code improvements: [#16905](https://github.com/WordPress/gutenberg/pull/16905), [#16962](https://github.com/WordPress/gutenberg/pull/16962).
 -   Scripts:
-	- Improve the way [test files are discovered](https://github.com/WordPress/gutenberg/pull/17033).
-	- Improve [recommended settings](https://github.com/WordPress/gutenberg/pull/17027) included in the package.
-	- Use [the SCSS shared stylelint-config-wordpress config](https://github.com/WordPress/gutenberg/pull/17060).
+    -   Improve the way [test files are discovered](https://github.com/WordPress/gutenberg/pull/17033).
+    -   Improve [recommended settings](https://github.com/WordPress/gutenberg/pull/17027) included in the package.
+    -   Use [the SCSS shared stylelint-config-wordpress config](https://github.com/WordPress/gutenberg/pull/17060).
 -   [Ignore the WordPress directory](https://github.com/WordPress/gutenberg/pull/16243) in stylelint.
 -   Fix: [edit post sets some default block appender styles](https://github.com/WordPress/gutenberg/pull/16943).
 -   Build: [remove global install of latest npm](https://github.com/WordPress/gutenberg/pull/17134).
 -   Project automation:
-    - Rewrite [actions using JavaScript](https://github.com/WordPress/gutenberg/pull/17080).
-    - Fix: [Add first-time contributor label](https://github.com/WordPress/gutenberg/pull/17156).
-    - Fix: [Add milestone](https://github.com/WordPress/gutenberg/pull/17157).
+    -   Rewrite [actions using JavaScript](https://github.com/WordPress/gutenberg/pull/17080).
+    -   Fix: [Add first-time contributor label](https://github.com/WordPress/gutenberg/pull/17156).
+    -   Fix: [Add milestone](https://github.com/WordPress/gutenberg/pull/17157).
 -   Remove [unused CSS from ColorPalette](https://github.com/WordPress/gutenberg/pull/17152) component.
 
-
 ### Documentation
+
 -   Add [examples for the lockPostSaving and unlockPostSaving](https://github.com/WordPress/gutenberg/pull/16713)actions.
 -   Add guidance for [adding/proposing/suggesting new components](https://github.com/WordPress/gutenberg/pull/16845) to the wordpress/components npm package.
 -   Add section about [updating package after new releases](https://github.com/WordPress/gutenberg/pull/17026).
 -   Add [ESNext examples to format API](https://github.com/WordPress/gutenberg/pull/16804) tutorial.
 -   Document [server-side functions that allow registering block styles](https://github.com/WordPress/gutenberg/pull/16997).
 
-
 ### Mobile
+
 -   [Reset toolbar scroll on content change](https://github.com/WordPress/gutenberg/pull/16945).
 -   [Extract caption component](https://github.com/WordPress/gutenberg/pull/16825).
 -   [Not use ListEdit](https://github.com/WordPress/gutenberg/pull/17070).
 -   [Hide replaceable blocks when adding blocks](https://github.com/WordPress/gutenberg/pull/16931).
 -   Make [tapping at the end of post always insert at the end of the post.](https://github.com/WordPress/gutenberg/pull/16934)
+
 = 6.3.0 =
 
+## Changelog
+
 ### Features
 
 -   A11y: Support [Navigation and Edit modes](https://github.com/WordPress/gutenberg/pull/16500) to ease navigating between blocks.
@@ -31185,18 +43251,18 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 ### Enhancements
 
 -   Improvements to the BlockPreview component:
-	-   Support [previewing a multiple blocks](https://github.com/WordPress/gutenberg/pull/16033) (a template).
-	-   [Unify BlockPreview and BlockPreviewContent](https://github.com/WordPress/gutenberg/pull/16801) into a unique component.
-	-   Hide [block appenders](https://github.com/WordPress/gutenberg/pull/16887).
-	-   [Expose the component](https://github.com/WordPress/gutenberg/pull/16834) in the block-editor module.
-	-   [Scale the preview content](https://github.com/WordPress/gutenberg/pull/16873) according to the width of the preview container.
+    -   Support [previewing a multiple blocks](https://github.com/WordPress/gutenberg/pull/16033) (a template).
+    -   [Unify BlockPreview and BlockPreviewContent](https://github.com/WordPress/gutenberg/pull/16801) into a unique component.
+    -   Hide [block appenders](https://github.com/WordPress/gutenberg/pull/16887).
+    -   [Expose the component](https://github.com/WordPress/gutenberg/pull/16834) in the block-editor module.
+    -   [Scale the preview content](https://github.com/WordPress/gutenberg/pull/16873) according to the width of the preview container.
 -   Improvements to the Modal component design:
-	-   Increase the [padding of the Modal component](https://github.com/WordPress/gutenberg/pull/16690).
-	-   Correct the [position of the close button](https://github.com/WordPress/gutenberg/pull/16883).
+    -   Increase the [padding of the Modal component](https://github.com/WordPress/gutenberg/pull/16690).
+    -   Correct the [position of the close button](https://github.com/WordPress/gutenberg/pull/16883).
 -   Use classnames instead of inline styles for text alignments in:
-	-   [Verse block](https://github.com/WordPress/gutenberg/pull/16777).
-	-   [Quote block](https://github.com/WordPress/gutenberg/pull/16779).
-	-   [Paragraph block](https://github.com/WordPress/gutenberg/pull/16794).
+    -   [Verse block](https://github.com/WordPress/gutenberg/pull/16777).
+    -   [Quote block](https://github.com/WordPress/gutenberg/pull/16779).
+    -   [Paragraph block](https://github.com/WordPress/gutenberg/pull/16794).
 -   Add a [purple color option](https://github.com/WordPress/gutenberg/pull/16833) to the default color palette.
 -   A11y: Visible [focus and active styles for Windows high contrast mode](https://github.com/WordPress/gutenberg/pull/16554).
 -   Improve the design of the [inline image controls](https://github.com/WordPress/gutenberg/pull/16793) in the Gallery block.
@@ -31211,15 +43277,15 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 ### Experiments
 
 -   Add a settings page to the plugin to [enable/disable experimental features](https://github.com/WordPress/gutenberg/pull/16626).
--   Add [padding when interacting with](https://github.com/WordPress/gutenberg/pull/14961)  [nested blocks](https://github.com/WordPress/gutenberg/pull/16820) to ease parent block selections.
+-   Add [padding when interacting with](https://github.com/WordPress/gutenberg/pull/14961) [nested blocks](https://github.com/WordPress/gutenberg/pull/16820) to ease parent block selections.
 -   Widgets Screen:
-	-   Prevent the [block toolbar from overlapping](https://github.com/WordPress/gutenberg/pull/16765) the widget area header.
-	-   Add the [BlockEditorKeyboardShortcuts](https://github.com/WordPress/gutenberg/pull/16972) component.
-	-   Fixed [block paddings](https://github.com/WordPress/gutenberg/pull/16944).
+    -   Prevent the [block toolbar from overlapping](https://github.com/WordPress/gutenberg/pull/16765) the widget area header.
+    -   Add the [BlockEditorKeyboardShortcuts](https://github.com/WordPress/gutenberg/pull/16972) component.
+    -   Fixed [block paddings](https://github.com/WordPress/gutenberg/pull/16944).
 
 ### New APIs
 
--   Support [Entities](https://github.com/WordPress/gutenberg/pull/16823)  [Local Edits](https://github.com/WordPress/gutenberg/pull/16867) in the Core Data Module.
+-   Support [Entities](https://github.com/WordPress/gutenberg/pull/16823) [Local Edits](https://github.com/WordPress/gutenberg/pull/16867) in the Core Data Module.
 -   Support [autosaving entities](https://github.com/WordPress/gutenberg/pull/16903) in the Core Data Module.
 -   Add support for [disabled dropdown items](https://github.com/WordPress/gutenberg/pull/15976) in SelectControl.
 -   Add [onFocusOutside](https://github.com/WordPress/gutenberg/pull/14851) prop as a replacement to Popover onClickOutside.
@@ -31242,7 +43308,7 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 -   [Link to the full size images](https://github.com/WordPress/gutenberg/pull/16011) in the Gallery block.
 -   Avoid leaking CSS transforms when [disabling block animations](https://github.com/WordPress/gutenberg/pull/16893).
 -   A11y: Avoid focusing the PostTitle component when [switching between code and visual editor](https://github.com/WordPress/gutenberg/pull/16874).
--   A11y: Add a [confirmation step to enable the Custom Fields](https://github.com/WordPress/gutenberg/pull/15688)  [option](https://github.com/WordPress/gutenberg/pull/16918).
+-   A11y: Add a [confirmation step to enable the Custom Fields](https://github.com/WordPress/gutenberg/pull/15688) [option](https://github.com/WordPress/gutenberg/pull/16918).
 -   [Disable block insertion buttons](https://github.com/WordPress/gutenberg/pull/15024) and [prevent moving blocks](https://github.com/WordPress/gutenberg/pull/14924) depending on the contextual restrictions (template locking and default block availability).
 -   Fix [Block manager not honoring the allowed_block_types](https://github.com/WordPress/gutenberg/pull/16586) hook.
 -   [Keep the Image block alt and caption attributes](https://github.com/WordPress/gutenberg/pull/16051) while uploading a new image.
@@ -31252,21 +43318,22 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 -   Make API Fetch [refresh nonces as soon as they expired](https://github.com/WordPress/gutenberg/pull/16683).
 
 ### Various
+
 -   GitHub actions:
-	-   [Automatically assign issues](https://github.com/WordPress/gutenberg/pull/16700) to PR authors.
-	-   Automatically assign the [First-time Contributor label](https://github.com/WordPress/gutenberg/pull/16762).
+    -   [Automatically assign issues](https://github.com/WordPress/gutenberg/pull/16700) to PR authors.
+    -   Automatically assign the [First-time Contributor label](https://github.com/WordPress/gutenberg/pull/16762).
 -   Avoid [unguarded getRangeAt usage](https://github.com/WordPress/gutenberg/pull/16212) and add eslint rule.
 -   Make the [e2e transforms tests](https://github.com/WordPress/gutenberg/pull/16739) more stable.
 -   [ESLint no-unused-vars-before-return rule](https://github.com/WordPress/gutenberg/pull/16799): Exempt destructuring only if to multiple properties.
 -   Output an [informational message for deprecations](https://github.com/WordPress/gutenberg/pull/16774) when no version provided.
 -   Refactor [registry selectors](https://github.com/WordPress/gutenberg/pull/16692) to allow calling them from other regular selectors.
 -   Bail early in the [deactivatePlugin e2e test utility](https://github.com/WordPress/gutenberg/pull/16816) if plugin is already inactive.
--   Fix the [CheckboxControl](https://github.com/WordPress/gutenberg/pull/16551)  [styles](https://github.com/WordPress/gutenberg/pull/16863) in a WordPress agnostic context.
+-   Fix the [CheckboxControl](https://github.com/WordPress/gutenberg/pull/16551) [styles](https://github.com/WordPress/gutenberg/pull/16863) in a WordPress agnostic context.
 -   Move the [auto-draft status and default title handling](https://github.com/WordPress/gutenberg/pull/16814) to the server.
 -   Code quality tweaks to the [Table block e2e tests](https://github.com/WordPress/gutenberg/pull/16872).
 -   [Fix JSDocs errors](https://github.com/WordPress/gutenberg/pull/16870) across the entire repository.
 -   [Upgrade Lerna](https://github.com/WordPress/gutenberg/pull/16919) to the latest version (3.16.4).
--   [Upgrade](https://github.com/WordPress/gutenberg/pull/16875)  [Puppeteer](https://github.com/WordPress/gutenberg/pull/16937) to the latest version (1.19.0).
+-   [Upgrade](https://github.com/WordPress/gutenberg/pull/16875) [Puppeteer](https://github.com/WordPress/gutenberg/pull/16937) to the latest version (1.19.0).
 -   [Upgrade ESLint](https://github.com/WordPress/gutenberg/pull/16921) to the latest version (6.1.0).
 -   Run [npm audit fix](https://github.com/WordPress/gutenberg/pull/16963) to fix dependency vulnerabilities.
 -   Audit and fix all [missing or obsolete package dependencies](https://github.com/WordPress/gutenberg/pull/16969).
@@ -31280,5076 +43347,5154 @@ Add knobs to the [ColorIndicator Story](https://github.com/WordPress/gutenberg/p
 ### Documentation
 
 -   Enhance the components Design Documentation and guidelines:
-	-   [DateTime](https://github.com/WordPress/gutenberg/pull/16757) component.
-	-   [Spinner](https://github.com/WordPress/gutenberg/pull/16760) component.
-	-   [ClipboardButton](https://github.com/WordPress/gutenberg/pull/16758) component.
--   Add section about adding [new dependencies to WordPress](https://github.com/WordPress/gutenberg/pull/16876)  [packages](https://github.com/WordPress/gutenberg/pull/16923).
+    -   [DateTime](https://github.com/WordPress/gutenberg/pull/16757) component.
+    -   [Spinner](https://github.com/WordPress/gutenberg/pull/16760) component.
+    -   [ClipboardButton](https://github.com/WordPress/gutenberg/pull/16758) component.
+-   Add section about adding [new dependencies to WordPress](https://github.com/WordPress/gutenberg/pull/16876) [packages](https://github.com/WordPress/gutenberg/pull/16923).
 -   Add [Figma ressources](https://github.com/WordPress/gutenberg/pull/16892) to the Design documentation.
 -   Document [URL inputs reusable components](https://github.com/WordPress/gutenberg/pull/16566).
 -   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/16852), [2](https://github.com/WordPress/gutenberg/pull/16832), [3](https://github.com/WordPress/gutenberg/pull/16908).
 
 ### Mobile
 
--   Refactor [BlockToolbar out of](https://github.com/WordPress/gutenberg/pull/16677)  [BlockList](https://github.com/WordPress/gutenberg/pull/16906).
+-   Refactor [BlockToolbar out of](https://github.com/WordPress/gutenberg/pull/16677) [BlockList](https://github.com/WordPress/gutenberg/pull/16906).
 -   Fix [toolbar bottom inset for iPhone X](https://github.com/WordPress/gutenberg/pull/16961) devices.
 
 = 6.2.0 =
 
+## Changelog
+
 ### Enhancements
-- Introduce [Link Target](https://github.com/WordPress/gutenberg/pull/10128)  [support](https://github.com/WordPress/gutenberg/pull/16497) in Button block.
-- Limit the [maximum height of the HTML block](https://github.com/WordPress/gutenberg/pull/16187).
-- Show the [preview button on mobile viewports](http://update/show-post-preview-button-on-mobile).
-- [Remove nested block restrictions](https://github.com/WordPress/gutenberg/pull/16751) from the Cover and Media & Text blocks.
-- A11y: Improving and standardize the [block styles focus and active states](https://github.com/WordPress/gutenberg/pull/16545).
-- Always [collapse block alignment toolbars](https://github.com/WordPress/gutenberg/pull/16557).
-
-### Bug Fixes
-- Fix using the [Classic block in nested contexts](https://github.com/WordPress/gutenberg/pull/16477).
-- Fix [lost nested blocks](https://github.com/WordPress/gutenberg/pull/14443) if the container block is missing.
-- Fix [pasting content into nested blocks](https://github.com/WordPress/gutenberg/pull/16717).
-- Fix [race condition in the block moving animation](https://github.com/WordPress/gutenberg/pull/16750) causing blocks to overlap.
-- A11y: Make the [Table block accessible](https://github.com/WordPress/gutenberg/pull/16324) at high zoom levels.
-- A11y: Change the [font size picker markup](https://github.com/WordPress/gutenberg/pull/16148) to use select.
-- A11y: Match the [primary button disabled](https://github.com/WordPress/gutenberg/pull/16103)  [state](https://github.com/WordPress/gutenberg/pull/16769) to Core's color contrast.
-- Fix the [z-index of the block toolbars](https://github.com/WordPress/gutenberg/pull/16530) for blocks following wide aligned blocks.
-- [Hide the columns count control](https://github.com/WordPress/gutenberg/pull/16476) when the columns block placeholder is shown.
-- [Prevent the block movers from disappearing](https://github.com/WordPress/gutenberg/pull/16579) on middle breakpoints for full/wide blocks.
-- [Slimmer top/bottom spacing inside notices](https://github.com/WordPress/gutenberg/pull/16589) shown outside the editor canvas.
-- Fix [converting video shortcode into video blocks](https://github.com/WordPress/gutenberg/pull/16588) when file type sources are used.
-- [Localize the read more link](https://github.com/WordPress/gutenberg/pull/16665) in the latest posts block.
-- Fix issue with [inconsistent nesting appender](https://github.com/WordPress/gutenberg/pull/16453).
-- Fix styling of [IconButton used in ButtonGroup](https://github.com/WordPress/gutenberg/pull/16686) components.
-- [Remove Change Permalinks button](https://github.com/WordPress/gutenberg/pull/16395) when permalink is not editable.
-- Fix [aspect ratio typo and recalculate padding](https://github.com/WordPress/gutenberg/pull/16573) in embed block.
-- Ensure [hour/minute fields are always shown left to right](https://github.com/WordPress/gutenberg/pull/16375) in RTL languages.
-- Refactor the empty line padding in the RichText component. This fixes [padding issues in the list block in Firefox](https://github.com/WordPress/gutenberg/pull/14846).
-- Improve the stability of the [RichText placeholder](https://github.com/WordPress/gutenberg/pull/16733).
-- Add [custom placeholder support](https://github.com/WordPress/gutenberg/pull/16783) for the button block.
-- Show the [image size labels on the block-based widget screen](https://github.com/WordPress/gutenberg/pull/16763).
+
+-   Introduce [Link Target](https://github.com/WordPress/gutenberg/pull/10128) [support](https://github.com/WordPress/gutenberg/pull/16497) in Button block.
+-   Limit the [maximum height of the HTML block](https://github.com/WordPress/gutenberg/pull/16187).
+-   Show the [preview button on mobile viewports](http://update/show-post-preview-button-on-mobile).
+-   [Remove nested block restrictions](https://github.com/WordPress/gutenberg/pull/16751) from the Cover and Media & Text blocks.
+-   A11y: Improving and standardize the [block styles focus and active states](https://github.com/WordPress/gutenberg/pull/16545).
+-   Always [collapse block alignment toolbars](https://github.com/WordPress/gutenberg/pull/16557).
+
+### Bug Fixes
+
+-   Fix using the [Classic block in nested contexts](https://github.com/WordPress/gutenberg/pull/16477).
+-   Fix [lost nested blocks](https://github.com/WordPress/gutenberg/pull/14443) if the container block is missing.
+-   Fix [pasting content into nested blocks](https://github.com/WordPress/gutenberg/pull/16717).
+-   Fix [race condition in the block moving animation](https://github.com/WordPress/gutenberg/pull/16750) causing blocks to overlap.
+-   A11y: Make the [Table block accessible](https://github.com/WordPress/gutenberg/pull/16324) at high zoom levels.
+-   A11y: Change the [font size picker markup](https://github.com/WordPress/gutenberg/pull/16148) to use select.
+-   A11y: Match the [primary button disabled](https://github.com/WordPress/gutenberg/pull/16103) [state](https://github.com/WordPress/gutenberg/pull/16769) to Core's color contrast.
+-   Fix the [z-index of the block toolbars](https://github.com/WordPress/gutenberg/pull/16530) for blocks following wide aligned blocks.
+-   [Hide the columns count control](https://github.com/WordPress/gutenberg/pull/16476) when the columns block placeholder is shown.
+-   [Prevent the block movers from disappearing](https://github.com/WordPress/gutenberg/pull/16579) on middle breakpoints for full/wide blocks.
+-   [Slimmer top/bottom spacing inside notices](https://github.com/WordPress/gutenberg/pull/16589) shown outside the editor canvas.
+-   Fix [converting video shortcode into video blocks](https://github.com/WordPress/gutenberg/pull/16588) when file type sources are used.
+-   [Localize the read more link](https://github.com/WordPress/gutenberg/pull/16665) in the latest posts block.
+-   Fix issue with [inconsistent nesting appender](https://github.com/WordPress/gutenberg/pull/16453).
+-   Fix styling of [IconButton used in ButtonGroup](https://github.com/WordPress/gutenberg/pull/16686) components.
+-   [Remove Change Permalinks button](https://github.com/WordPress/gutenberg/pull/16395) when permalink is not editable.
+-   Fix [aspect ratio typo and recalculate padding](https://github.com/WordPress/gutenberg/pull/16573) in embed block.
+-   Ensure [hour/minute fields are always shown left to right](https://github.com/WordPress/gutenberg/pull/16375) in RTL languages.
+-   Refactor the empty line padding in the RichText component. This fixes [padding issues in the list block in Firefox](https://github.com/WordPress/gutenberg/pull/14846).
+-   Improve the stability of the [RichText placeholder](https://github.com/WordPress/gutenberg/pull/16733).
+-   Add [custom placeholder support](https://github.com/WordPress/gutenberg/pull/16783) for the button block.
+-   Show the [image size labels on the block-based widget screen](https://github.com/WordPress/gutenberg/pull/16763).
 
 ### Documentation
-- Clarify the [block title and description conventions](https://github.com/WordPress/gutenberg/pull/16458).
-- Add [RichText component documentation](https://github.com/WordPress/gutenberg/pull/15956) to the Block Editor Handbook.
-- Improve the [repository triage docs](https://github.com/WordPress/gutenberg/pull/16234).
-- Adds documentation for the [PluginDocumentSettingPanel SlotFill](https://github.com/WordPress/gutenberg/pull/16620).
-- Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/16438), [2](https://github.com/WordPress/gutenberg/pull/16455), [3](https://github.com/WordPress/gutenberg/pull/16468), [4](https://github.com/WordPress/gutenberg/pull/16456), [5](https://github.com/WordPress/gutenberg/pull/16470), [6](https://github.com/WordPress/gutenberg/pull/16469), [7](https://github.com/WordPress/gutenberg/pull/16526), [8](https://github.com/WordPress/gutenberg/pull/16531), [9](https://github.com/WordPress/gutenberg/pull/16528), [10](https://github.com/WordPress/gutenberg/pull/16610), [11](https://github.com/WordPress/gutenberg/pull/16450), [12](https://github.com/WordPress/gutenberg/pull/16756) , [13](https://github.com/WordPress/gutenberg/pull/16693), [14](https://github.com/WordPress/gutenberg/pull/16787).
+
+-   Clarify the [block title and description conventions](https://github.com/WordPress/gutenberg/pull/16458).
+-   Add [RichText component documentation](https://github.com/WordPress/gutenberg/pull/15956) to the Block Editor Handbook.
+-   Improve the [repository triage docs](https://github.com/WordPress/gutenberg/pull/16234).
+-   Adds documentation for the [PluginDocumentSettingPanel SlotFill](https://github.com/WordPress/gutenberg/pull/16620).
+-   Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/16438), [2](https://github.com/WordPress/gutenberg/pull/16455), [3](https://github.com/WordPress/gutenberg/pull/16468), [4](https://github.com/WordPress/gutenberg/pull/16456), [5](https://github.com/WordPress/gutenberg/pull/16470), [6](https://github.com/WordPress/gutenberg/pull/16469), [7](https://github.com/WordPress/gutenberg/pull/16526), [8](https://github.com/WordPress/gutenberg/pull/16531), [9](https://github.com/WordPress/gutenberg/pull/16528), [10](https://github.com/WordPress/gutenberg/pull/16610), [11](https://github.com/WordPress/gutenberg/pull/16450), [12](https://github.com/WordPress/gutenberg/pull/16756) , [13](https://github.com/WordPress/gutenberg/pull/16693), [14](https://github.com/WordPress/gutenberg/pull/16787).
 
 ### Divers
-- Add a [simple API to register block style variations](https://github.com/WordPress/gutenberg/pull/16356) on the server.
-- Allow alternative blocks to be used to handle [Grouping interactions](https://github.com/WordPress/gutenberg/pull/16278).
-- Fix Travis instability by [waiting for MySQL availability](https://github.com/WordPress/gutenberg/pull/16461) before install the plugin.
-- Continue the [generic RichText component](https://github.com/WordPress/gutenberg/pull/16309) refactoring.
-- Remove the [usage of the editor store](https://github.com/WordPress/gutenberg/pull/16184) from the block editor module.
-- Update the [MilestoneIt GitHub action](https://github.com/WordPress/gutenberg/pull/16511) to read the plugin version from trunk.
-- Refactor the post meta block attributes to use a generic [custom sources mechanism](https://github.com/WordPress/gutenberg/pull/16402).
-- Expose [position prop in DotTip](https://github.com/WordPress/gutenberg/pull/14972) component.
-- Avoid docker [containers automatic restart](https://github.com/WordPress/gutenberg/pull/16547).
-- Bump [Lodash dependencies to 4.17.14](https://github.com/WordPress/gutenberg/pull/16567).
-- Fix the [build command on Windows](https://github.com/WordPress/gutenberg/pull/16029) environments.
-- Add allowedFormats and withoutInteractiveFormats props to the RichText component to [control the available formats per RichText](https://github.com/WordPress/gutenberg/pull/14542).
-- Remove [inappropriate executable permissions](https://github.com/WordPress/gutenberg/pull/16687) from core-data package files.
-- ESLint Plugin: [Exempt React hooks from no-unused-vars-before-return](https://github.com/WordPress/gutenberg/pull/16737).
-- Use React [Portal based slots for the block toolbar](https://github.com/WordPress/gutenberg/pull/16421).
-- Use [combineReducers utility from the data module](https://github.com/WordPress/gutenberg/pull/16752) instead of redux.
-- Support [hideLabelFromVision prop](https://github.com/WordPress/gutenberg/pull/16701) in all control components.
-- Adds missing [babel-jest and core-js](https://github.com/WordPress/gutenberg/pull/16259) dependencies to the scripts package.
+
+-   Add a [simple API to register block style variations](https://github.com/WordPress/gutenberg/pull/16356) on the server.
+-   Allow alternative blocks to be used to handle [Grouping interactions](https://github.com/WordPress/gutenberg/pull/16278).
+-   Fix Travis instability by [waiting for MySQL availability](https://github.com/WordPress/gutenberg/pull/16461) before install the plugin.
+-   Continue the [generic RichText component](https://github.com/WordPress/gutenberg/pull/16309) refactoring.
+-   Remove the [usage of the editor store](https://github.com/WordPress/gutenberg/pull/16184) from the block editor module.
+-   Update the [MilestoneIt GitHub action](https://github.com/WordPress/gutenberg/pull/16511) to read the plugin version from trunk.
+-   Refactor the post meta block attributes to use a generic [custom sources mechanism](https://github.com/WordPress/gutenberg/pull/16402).
+-   Expose [position prop in DotTip](https://github.com/WordPress/gutenberg/pull/14972) component.
+-   Avoid docker [containers automatic restart](https://github.com/WordPress/gutenberg/pull/16547).
+-   Bump [Lodash dependencies to 4.17.14](https://github.com/WordPress/gutenberg/pull/16567).
+-   Fix the [build command on Windows](https://github.com/WordPress/gutenberg/pull/16029) environments.
+-   Add allowedFormats and withoutInteractiveFormats props to the RichText component to [control the available formats per RichText](https://github.com/WordPress/gutenberg/pull/14542).
+-   Remove [inappropriate executable permissions](https://github.com/WordPress/gutenberg/pull/16687) from core-data package files.
+-   ESLint Plugin: [Exempt React hooks from no-unused-vars-before-return](https://github.com/WordPress/gutenberg/pull/16737).
+-   Use React [Portal based slots for the block toolbar](https://github.com/WordPress/gutenberg/pull/16421).
+-   Use [combineReducers utility from the data module](https://github.com/WordPress/gutenberg/pull/16752) instead of redux.
+-   Support [hideLabelFromVision prop](https://github.com/WordPress/gutenberg/pull/16701) in all control components.
+-   Adds missing [babel-jest and core-js](https://github.com/WordPress/gutenberg/pull/16259) dependencies to the scripts package.
 
 ### Mobile
-- [Tapping on an empty editor](https://github.com/WordPress/gutenberg/pull/16439) area creates a new paragraph block.
-- [Fix video uploads](https://github.com/WordPress/gutenberg/pull/16331) when the connection is lost and restored.
-- Track [unsupported block list](https://github.com/WordPress/gutenberg/pull/16434).
-- Insert [new block below the post title](https://github.com/WordPress/gutenberg/pull/16440) if the post title is selected.
-- Run the [mobile tests in the Gutenberg CI](https://github.com/WordPress/gutenberg/pull/16404) server.
-- Replace use of [deprecated componentWillReceiveProps](https://github.com/WordPress/gutenberg/pull/16577) in ImageEdit.
-- Show placeholder when [adding block from the post title](https://github.com/WordPress/gutenberg/pull/16539).
-- [Blur post title](https://github.com/WordPress/gutenberg/pull/16642) any time another block is selected.
-- Inserting block from the post title [replaces empty blocks](https://github.com/WordPress/gutenberg/pull/16574).
-- [Update Video caption placeholder color](https://github.com/WordPress/gutenberg/pull/16716) to match other placeholder text styles.
-- Move the [post title selection state](https://github.com/WordPress/gutenberg/pull/16704) to the store.
 
+-   [Tapping on an empty editor](https://github.com/WordPress/gutenberg/pull/16439) area creates a new paragraph block.
+-   [Fix video uploads](https://github.com/WordPress/gutenberg/pull/16331) when the connection is lost and restored.
+-   Track [unsupported block list](https://github.com/WordPress/gutenberg/pull/16434).
+-   Insert [new block below the post title](https://github.com/WordPress/gutenberg/pull/16440) if the post title is selected.
+-   Run the [mobile tests in the Gutenberg CI](https://github.com/WordPress/gutenberg/pull/16404) server.
+-   Replace use of [deprecated componentWillReceiveProps](https://github.com/WordPress/gutenberg/pull/16577) in ImageEdit.
+-   Show placeholder when [adding block from the post title](https://github.com/WordPress/gutenberg/pull/16539).
+-   [Blur post title](https://github.com/WordPress/gutenberg/pull/16642) any time another block is selected.
+-   Inserting block from the post title [replaces empty blocks](https://github.com/WordPress/gutenberg/pull/16574).
+-   [Update Video caption placeholder color](https://github.com/WordPress/gutenberg/pull/16716) to match other placeholder text styles.
+-   Move the [post title selection state](https://github.com/WordPress/gutenberg/pull/16704) to the store.
 
 = 6.1.1 =
 
+## Changelog
+
 ### Bug Fixes
 
-- Prevent automatic conversion of widgets to blocks when using the customizer.
-- Fix missing block properties on block registration filters used for the deprecated versions.
+-   Prevent automatic conversion of widgets to blocks when using the customizer.
+-   Fix missing block properties on block registration filters used for the deprecated versions.
 
 = 6.1.0 =
 
+## Changelog
+
 ### Enhancements
 
-*   [Introduce motion](https://github.com/WordPress/gutenberg/pull/16065)/animation when reordering/adding/removing blocks.
-*   Improve the [Image block link settings](https://github.com/WordPress/gutenberg/pull/15570) and move it to the block toolbar.
-*   Use a snackbar notice when clicking “[Copy all content](https://github.com/WordPress/gutenberg/pull/16265)”.
-*   Show [REST API error messages](https://github.com/WordPress/gutenberg/pull/15657) as notices.
-*   Clarify the wording of the view link in the [Permalink panel](https://github.com/WordPress/gutenberg/pull/16041).
-*   [Hide the “Copy all content”](https://github.com/WordPress/gutenberg/pull/16286) button if the post is empty.
-*   [Hide the ungroup action](https://github.com/WordPress/gutenberg/pull/16332) when there are no inner blocks.
-*   Use admin schemes dependent [focus state for primary buttons](https://github.com/WordPress/gutenberg/pull/16275).
-*   Add support for the [table cells scope attribute](https://github.com/WordPress/gutenberg/pull/16154) when pasting.
+-   [Introduce motion](https://github.com/WordPress/gutenberg/pull/16065)/animation when reordering/adding/removing blocks.
+-   Improve the [Image block link settings](https://github.com/WordPress/gutenberg/pull/15570) and move it to the block toolbar.
+-   Use a snackbar notice when clicking “[Copy all content](https://github.com/WordPress/gutenberg/pull/16265)”.
+-   Show [REST API error messages](https://github.com/WordPress/gutenberg/pull/15657) as notices.
+-   Clarify the wording of the view link in the [Permalink panel](https://github.com/WordPress/gutenberg/pull/16041).
+-   [Hide the “Copy all content”](https://github.com/WordPress/gutenberg/pull/16286) button if the post is empty.
+-   [Hide the ungroup action](https://github.com/WordPress/gutenberg/pull/16332) when there are no inner blocks.
+-   Use admin schemes dependent [focus state for primary buttons](https://github.com/WordPress/gutenberg/pull/16275).
+-   Add support for the [table cells scope attribute](https://github.com/WordPress/gutenberg/pull/16154) when pasting.
 
 ### Experiments
 
-*   Introduce a new [Customizer Panel](https://github.com/WordPress/gutenberg/pull/16204) to edit block-based widget areas.
-*   Add the [block inspector](https://github.com/WordPress/gutenberg/pull/16203) to the widgets screen.
-*   Add a [global inserter](http://add/inserter-widget-areas) to the widgets screen.
-
-### Bug Fixes
-
-*   Show the [pre-publish panel for contributors](https://github.com/WordPress/gutenberg/pull/16424).
-*   Fix the [save in progress state](https://github.com/WordPress/gutenberg/pull/16303) of the Publish/Update Button.
-*   Fix [adding/removing columns from the table block](https://github.com/WordPress/gutenberg/pull/16410) when using header/footer sections.
-*   Fix Image block not [preserving custom dimensions](https://github.com/WordPress/gutenberg/pull/16125) when opening the media library.
-*   [Resize Image blocks](https://github.com/WordPress/gutenberg/pull/16398) properly when changing the width from the inspector.
-*   Fix php error that can potentially be triggered by [gutenberg_is_block_editor](https://github.com/WordPress/gutenberg/pull/16201).
-*   Fix error when using the [“tag” block attribute source type](https://github.com/WordPress/gutenberg/pull/16290).
-*   Fix [chrome rendering bug](https://github.com/WordPress/gutenberg/pull/16325) happening when resizing images.
-*   Fix the [data-block style selector](https://github.com/WordPress/gutenberg/pull/16207) to avoid affecting third-party components.
-*   Allow the [columns layout options](https://github.com/WordPress/gutenberg/pull/16371) to wrap on small screens.
-*   Fix [isShallowEqual](https://github.com/WordPress/gutenberg/pull/16329) edge case when the second argument is undefined.
-*   Prevent the [disabled block switcher icon](https://github.com/WordPress/gutenberg/pull/16390) from becoming unreadable.
-*   Fix [Group Block deprecation](https://github.com/WordPress/gutenberg/pull/16348) and any deprecation relying on hooks.
-*   A11y:
-    *   Make the [top toolbar wrap](https://github.com/WordPress/gutenberg/pull/16250) at high zoom levels.
-    *   Fix the [sticky notices](https://github.com/WordPress/gutenberg/pull/16255) at high zoom levels.
+-   Introduce a new [Customizer Panel](https://github.com/WordPress/gutenberg/pull/16204) to edit block-based widget areas.
+-   Add the [block inspector](https://github.com/WordPress/gutenberg/pull/16203) to the widgets screen.
+-   Add a [global inserter](http://add/inserter-widget-areas) to the widgets screen.
+
+### Bug Fixes
+
+-   Show the [pre-publish panel for contributors](https://github.com/WordPress/gutenberg/pull/16424).
+-   Fix the [save in progress state](https://github.com/WordPress/gutenberg/pull/16303) of the Publish/Update Button.
+-   Fix [adding/removing columns from the table block](https://github.com/WordPress/gutenberg/pull/16410) when using header/footer sections.
+-   Fix Image block not [preserving custom dimensions](https://github.com/WordPress/gutenberg/pull/16125) when opening the media library.
+-   [Resize Image blocks](https://github.com/WordPress/gutenberg/pull/16398) properly when changing the width from the inspector.
+-   Fix php error that can potentially be triggered by [gutenberg_is_block_editor](https://github.com/WordPress/gutenberg/pull/16201).
+-   Fix error when using the [“tag” block attribute source type](https://github.com/WordPress/gutenberg/pull/16290).
+-   Fix [chrome rendering bug](https://github.com/WordPress/gutenberg/pull/16325) happening when resizing images.
+-   Fix the [data-block style selector](https://github.com/WordPress/gutenberg/pull/16207) to avoid affecting third-party components.
+-   Allow the [columns layout options](https://github.com/WordPress/gutenberg/pull/16371) to wrap on small screens.
+-   Fix [isShallowEqual](https://github.com/WordPress/gutenberg/pull/16329) edge case when the second argument is undefined.
+-   Prevent the [disabled block switcher icon](https://github.com/WordPress/gutenberg/pull/16390) from becoming unreadable.
+-   Fix [Group Block deprecation](https://github.com/WordPress/gutenberg/pull/16348) and any deprecation relying on hooks.
+-   A11y:
+    -   Make the [top toolbar wrap](https://github.com/WordPress/gutenberg/pull/16250) at high zoom levels.
+    -   Fix the [sticky notices](https://github.com/WordPress/gutenberg/pull/16255) at high zoom levels.
 
 ### Performance
 
-*   Improve the performance of the [i18n Tannin library](https://github.com/WordPress/gutenberg/pull/16337).
-*   Track the [block parent](https://github.com/WordPress/gutenberg/pull/16392) in the state to optimize hierarchy selectors.
-*   Add a [cache key](https://github.com/WordPress/gutenberg/pull/16407) tracked in state to optimize the getBlock selector.
+-   Improve the performance of the [i18n Tannin library](https://github.com/WordPress/gutenberg/pull/16337).
+-   Track the [block parent](https://github.com/WordPress/gutenberg/pull/16392) in the state to optimize hierarchy selectors.
+-   Add a [cache key](https://github.com/WordPress/gutenberg/pull/16407) tracked in state to optimize the getBlock selector.
 
 ### Documentation
 
-*   Document the [plugin release tool](https://github.com/WordPress/gutenberg/pull/16366).
-*   Document the use-cases of the [dynamic blocks](https://github.com/WordPress/gutenberg/pull/16228).
-*   Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/16267), [2](https://github.com/WordPress/gutenberg/pull/16153), [3](https://github.com/WordPress/gutenberg/pull/16170), [4](https://github.com/WordPress/gutenberg/pull/16312), [5](https://github.com/WordPress/gutenberg/pull/16320), [6](https://github.com/WordPress/gutenberg/pull/16138).
+-   Document the [plugin release tool](https://github.com/WordPress/gutenberg/pull/16366).
+-   Document the use-cases of the [dynamic blocks](https://github.com/WordPress/gutenberg/pull/16228).
+-   Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/16267), [2](https://github.com/WordPress/gutenberg/pull/16153), [3](https://github.com/WordPress/gutenberg/pull/16170), [4](https://github.com/WordPress/gutenberg/pull/16312), [5](https://github.com/WordPress/gutenberg/pull/16320), [6](https://github.com/WordPress/gutenberg/pull/16138).
 
 ### Various
 
-*   Introduce a [PluginDocumentSettingPanel](https://github.com/WordPress/gutenberg/pull/13361) slot to allow third-party plugins to add panels to the document sidebar tab.
-*   [Deploy the playground](https://github.com/WordPress/gutenberg/pull/16345) automatically to GitHub Pages. [https://wordpress.github.io/gutenberg/](https://wordpress.github.io/gutenberg/)
-*   Extract a [generic RichText](http://try/move-rich-text) [component](https://github.com/WordPress/gutenberg/pull/16299) to the @wordpress/rich-text package.
-*   Refactor the [editor initialization](https://github.com/WordPress/gutenberg/pull/15444) to rely on a component.
-*   Remove unused internal [asType utility](https://github.com/WordPress/gutenberg/pull/16291).
-*   Fix [react-no-unsafe-timeout ESlint rule](https://github.com/WordPress/gutenberg/pull/16292) when using variable assignment.
-*   Add support for [watching block.json files](https://github.com/WordPress/gutenberg/pull/16150) when running “npm run dev”.
-*   Remove: experimental status from [blockEditor.transformStyles](https://github.com/WordPress/gutenberg/pull/16126).
-*   Upgrade [PHPCS composer dependencies](https://github.com/WordPress/gutenberg/pull/16387) and use [strict comparisons](https://github.com/WordPress/gutenberg/pull/16381) to align with the PHPCS guidelines.
-*   Fix a small console warning when running [performance tests](https://github.com/WordPress/gutenberg/pull/16409).
+-   Introduce a [PluginDocumentSettingPanel](https://github.com/WordPress/gutenberg/pull/13361) slot to allow third-party plugins to add panels to the document sidebar tab.
+-   [Deploy the playground](https://github.com/WordPress/gutenberg/pull/16345) automatically to GitHub Pages. [https://wordpress.github.io/gutenberg/](https://wordpress.github.io/gutenberg/)
+-   Extract a [generic RichText](http://try/move-rich-text) [component](https://github.com/WordPress/gutenberg/pull/16299) to the @wordpress/rich-text package.
+-   Refactor the [editor initialization](https://github.com/WordPress/gutenberg/pull/15444) to rely on a component.
+-   Remove unused internal [asType utility](https://github.com/WordPress/gutenberg/pull/16291).
+-   Fix [react-no-unsafe-timeout ESlint rule](https://github.com/WordPress/gutenberg/pull/16292) when using variable assignment.
+-   Add support for [watching block.json files](https://github.com/WordPress/gutenberg/pull/16150) when running “npm run dev”.
+-   Remove: experimental status from [blockEditor.transformStyles](https://github.com/WordPress/gutenberg/pull/16126).
+-   Upgrade [PHPCS composer dependencies](https://github.com/WordPress/gutenberg/pull/16387) and use [strict comparisons](https://github.com/WordPress/gutenberg/pull/16381) to align with the PHPCS guidelines.
+-   Fix a small console warning when running [performance tests](https://github.com/WordPress/gutenberg/pull/16409).
 
 ### Mobile
 
-*   Correct the position of the [block insertion indicator](https://github.com/WordPress/gutenberg/pull/16272).
-*   Unify [Editor and Layout](https://github.com/WordPress/gutenberg/pull/16260) components with the web component hierarchy.
-
+-   Correct the position of the [block insertion indicator](https://github.com/WordPress/gutenberg/pull/16272).
+-   Unify [Editor and Layout](https://github.com/WordPress/gutenberg/pull/16260) components with the web component hierarchy.
 
 = 6.0.0 =
 
+## Changelog
+
 ### Features
 
-* Support choosing a [pre-defined layout for the Columns block](https://github.com/WordPress/gutenberg/pull/16129). 
+-   Support choosing a [pre-defined layout for the Columns block](https://github.com/WordPress/gutenberg/pull/16129).
 
 ### Enhancements
 
-* Add [Snackbar notices](https://github.com/WordPress/gutenberg/pull/16020) support to the widgets screen.
-* Add an [inner container to the Group](https://github.com/WordPress/gutenberg/pull/15210) [block](https://github.com/WordPress/gutenberg/pull/16202) to simplify theme styling.
-* Avoid stacking successive [MediaPlaceholder errors](https://github.com/WordPress/gutenberg/pull/14721).
-* Adjust the [DatePicker margins](https://github.com/WordPress/gutenberg/pull/16097).
-* Update the [Tag Cloud block](https://github.com/WordPress/gutenberg/pull/16098) [copy](https://github.com/WordPress/gutenberg/pull/16107) when no terms are found.
-* Add descriptive text and a link to [documentation in embed blocks](https://github.com/WordPress/gutenberg/pull/16101).
-* Improve placeholder text [phrasing for media blocks](https://github.com/WordPress/gutenberg/pull/16135).
-* Use classnames for the [text alignments in the heading block](https://github.com/WordPress/gutenberg/pull/16035).
-* Make the [inserter category icons grayscale](https://github.com/WordPress/gutenberg/pull/16163).
-* A11y: Make the [modal overlay scrim darker](https://github.com/WordPress/gutenberg/pull/15974).
-
-### Bug Fixes
-
-* Fix [warning messages triggered by the Group block](https://github.com/WordPress/gutenberg/pull/16096) icons.
-* Fix [horizontal scrollbar on full-wide blocks](https://github.com/WordPress/gutenberg/pull/16085) with nesting.
-* A11y: 
-  * Re-enable the [menu item hover state](https://github.com/WordPress/gutenberg/pull/16168) on small screens.
-  * Correct text zoom issue in the [Content Structure popover](https://github.com/WordPress/gutenberg/pull/15984).
-* Fix the [Popovers position](https://github.com/WordPress/gutenberg/pull/15949) in the widgets screen.
-* Fix the behavior of the [block toolbars in the widgets screen](https://github.com/WordPress/gutenberg/pull/15470).
-* Fix the editor in IE11 (use the [CJS version of react-spring](https://github.com/WordPress/gutenberg/pull/16196)).
-* Fix formatting of the [validation error messages](https://github.com/WordPress/gutenberg/pull/16173) in the console.
-* Fix breakage when the [CPT doesn’t support title](https://github.com/WordPress/gutenberg/pull/16236).
+-   Add [Snackbar notices](https://github.com/WordPress/gutenberg/pull/16020) support to the widgets screen.
+-   Add an [inner container to the Group](https://github.com/WordPress/gutenberg/pull/15210) [block](https://github.com/WordPress/gutenberg/pull/16202) to simplify theme styling.
+-   Avoid stacking successive [MediaPlaceholder errors](https://github.com/WordPress/gutenberg/pull/14721).
+-   Adjust the [DatePicker margins](https://github.com/WordPress/gutenberg/pull/16097).
+-   Update the [Tag Cloud block](https://github.com/WordPress/gutenberg/pull/16098) [copy](https://github.com/WordPress/gutenberg/pull/16107) when no terms are found.
+-   Add descriptive text and a link to [documentation in embed blocks](https://github.com/WordPress/gutenberg/pull/16101).
+-   Improve placeholder text [phrasing for media blocks](https://github.com/WordPress/gutenberg/pull/16135).
+-   Use classnames for the [text alignments in the heading block](https://github.com/WordPress/gutenberg/pull/16035).
+-   Make the [inserter category icons grayscale](https://github.com/WordPress/gutenberg/pull/16163).
+-   A11y: Make the [modal overlay scrim darker](https://github.com/WordPress/gutenberg/pull/15974).
+
+### Bug Fixes
+
+-   Fix [warning messages triggered by the Group block](https://github.com/WordPress/gutenberg/pull/16096) icons.
+-   Fix [horizontal scrollbar on full-wide blocks](https://github.com/WordPress/gutenberg/pull/16085) with nesting.
+-   A11y:
+    -   Re-enable the [menu item hover state](https://github.com/WordPress/gutenberg/pull/16168) on small screens.
+    -   Correct text zoom issue in the [Content Structure popover](https://github.com/WordPress/gutenberg/pull/15984).
+-   Fix the [Popovers position](https://github.com/WordPress/gutenberg/pull/15949) in the widgets screen.
+-   Fix the behavior of the [block toolbars in the widgets screen](https://github.com/WordPress/gutenberg/pull/15470).
+-   Fix the editor in IE11 (use the [CJS version of react-spring](https://github.com/WordPress/gutenberg/pull/16196)).
+-   Fix formatting of the [validation error messages](https://github.com/WordPress/gutenberg/pull/16173) in the console.
+-   Fix breakage when the [CPT doesn’t support title](https://github.com/WordPress/gutenberg/pull/16236).
 
 ### Various
 
-* Document and simplify the [multi-entrypoints support](https://github.com/WordPress/gutenberg/pull/15982) in the @wordpress/scripts package. 
-* Create sub-registry automatically when using [EditorProvider](https://github.com/WordPress/gutenberg/pull/15989).
-* Use classnames utility instead of concatenating [classnames in the TabPanel](https://github.com/WordPress/gutenberg/pull/16081) component.
-* Remove the default value for the [required onRequestClose prop](https://github.com/WordPress/gutenberg/pull/16074) in the Modal component.
-* Remove the [editor package dependency](https://github.com/WordPress/gutenberg/pull/15548) from the media blocks.
-* Fix the [playground build](https://github.com/WordPress/gutenberg/pull/15947) script.
-* Fix the [GitHub action assigning milestones](https://github.com/WordPress/gutenberg/pull/16084).
-* Fix [naming conventions](https://github.com/WordPress/gutenberg/pull/16091) for function containing CLI keyword.
-* Fix the [Travis build artifacts job](http://update/build-artifacts-npm-install) to use a full npm install while building.
-* Make [Calendar block resilient](https://github.com/WordPress/gutenberg/pull/16161) to the editor module not being present.
-* Ensure the Snackbar component is only used with a [single action button](https://github.com/WordPress/gutenberg/pull/16095).
-* Remove [SlotFillProvider and DropZoneProvider](https://github.com/WordPress/gutenberg/pull/15988) from the BlockEditorProvider.
-* Add the initial version of the [Block Registration RFC](https://github.com/WordPress/gutenberg/pull/13693).
-* Add [popoverProps prop to the Dropdown](https://github.com/WordPress/gutenberg/pull/14867) component.
-* Update [Image Block's image classes](https://github.com/WordPress/gutenberg/pull/15464) with dimensions.
-* Support registering [custom grouping blocks](https://github.com/WordPress/gutenberg/pull/15774).
-* Fix h1 heading typo so [h1 is same size as title](https://github.com/WordPress/gutenberg/pull/16253).
-* Remove the [custom class support from the legacy widget](https://github.com/WordPress/gutenberg/pull/16231) block.
+-   Document and simplify the [multi-entrypoints support](https://github.com/WordPress/gutenberg/pull/15982) in the @wordpress/scripts package.
+-   Create sub-registry automatically when using [EditorProvider](https://github.com/WordPress/gutenberg/pull/15989).
+-   Use classnames utility instead of concatenating [classnames in the TabPanel](https://github.com/WordPress/gutenberg/pull/16081) component.
+-   Remove the default value for the [required onRequestClose prop](https://github.com/WordPress/gutenberg/pull/16074) in the Modal component.
+-   Remove the [editor package dependency](https://github.com/WordPress/gutenberg/pull/15548) from the media blocks.
+-   Fix the [playground build](https://github.com/WordPress/gutenberg/pull/15947) script.
+-   Fix the [GitHub action assigning milestones](https://github.com/WordPress/gutenberg/pull/16084).
+-   Fix [naming conventions](https://github.com/WordPress/gutenberg/pull/16091) for function containing CLI keyword.
+-   Fix the [Travis build artifacts job](http://update/build-artifacts-npm-install) to use a full npm install while building.
+-   Make [Calendar block resilient](https://github.com/WordPress/gutenberg/pull/16161) to the editor module not being present.
+-   Ensure the Snackbar component is only used with a [single action button](https://github.com/WordPress/gutenberg/pull/16095).
+-   Remove [SlotFillProvider and DropZoneProvider](https://github.com/WordPress/gutenberg/pull/15988) from the BlockEditorProvider.
+-   Add the initial version of the [Block Registration RFC](https://github.com/WordPress/gutenberg/pull/13693).
+-   Add [popoverProps prop to the Dropdown](https://github.com/WordPress/gutenberg/pull/14867) component.
+-   Update [Image Block's image classes](https://github.com/WordPress/gutenberg/pull/15464) with dimensions.
+-   Support registering [custom grouping blocks](https://github.com/WordPress/gutenberg/pull/15774).
+-   Fix h1 heading typo so [h1 is same size as title](https://github.com/WordPress/gutenberg/pull/16253).
+-   Remove the [custom class support from the legacy widget](https://github.com/WordPress/gutenberg/pull/16231) block.
 
 ### Documentation
 
-* Prefer [register\_post\_meta](https://github.com/WordPress/gutenberg/pull/16032) over register\_meta.
-* Add [mention of Figma](https://github.com/WordPress/gutenberg/pull/16140) to the design contributing docs.
-* Add [supported attribute types](https://github.com/WordPress/gutenberg/pull/16220) for the Blocks API.
-* Enhance the [Annotations API](https://github.com/WordPress/gutenberg/pull/16233) documentation.
-* Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/16083), [2](https://github.com/WordPress/gutenberg/pull/16073), [3](https://github.com/WordPress/gutenberg/pull/16087), [4](https://github.com/WordPress/gutenberg/pull/16102), [5](https://github.com/WordPress/gutenberg/pull/16145), [6](https://github.com/WordPress/gutenberg/pull/16143), [7](https://github.com/WordPress/gutenberg/pull/16144), [8](https://github.com/WordPress/gutenberg/pull/16232), [9](https://github.com/WordPress/gutenberg/pull/16121), [10](https://github.com/WordPress/gutenberg/pull/16235), [11](https://github.com/WordPress/gutenberg/pull/15394).
+-   Prefer [register_post_meta](https://github.com/WordPress/gutenberg/pull/16032) over register_meta.
+-   Add [mention of Figma](https://github.com/WordPress/gutenberg/pull/16140) to the design contributing docs.
+-   Add [supported attribute types](https://github.com/WordPress/gutenberg/pull/16220) for the Blocks API.
+-   Enhance the [Annotations API](https://github.com/WordPress/gutenberg/pull/16233) documentation.
+-   Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/16083), [2](https://github.com/WordPress/gutenberg/pull/16073), [3](https://github.com/WordPress/gutenberg/pull/16087), [4](https://github.com/WordPress/gutenberg/pull/16102), [5](https://github.com/WordPress/gutenberg/pull/16145), [6](https://github.com/WordPress/gutenberg/pull/16143), [7](https://github.com/WordPress/gutenberg/pull/16144), [8](https://github.com/WordPress/gutenberg/pull/16232), [9](https://github.com/WordPress/gutenberg/pull/16121), [10](https://github.com/WordPress/gutenberg/pull/16235), [11](https://github.com/WordPress/gutenberg/pull/15394).
 
 ### Mobile
 
-* Fix [multiline Image block captions](https://github.com/WordPress/gutenberg/pull/16071) in iOS.
-* Avoid unnecessary [div elements in the content of Quote](https://github.com/WordPress/gutenberg/pull/16072) blocks.
-* Update the default [colors used in the RichText](https://github.com/WordPress/gutenberg/pull/16016) component.
-* Fix [pasting text on Post Title](https://github.com/WordPress/gutenberg/pull/16116).
-* Unify the web and mobile components hierarchy:
-  * [BlockPicker and Inserter](https://github.com/WordPress/gutenberg/pull/16114).
-  * [BlockToolbar](https://github.com/WordPress/gutenberg/pull/16213).
-  * [BlockMobileToolbar](https://github.com/WordPress/gutenberg/pull/16177).
-  * [BlockListBlock](https://github.com/WordPress/gutenberg/pull/16223).
-  * [BlockList](https://github.com/WordPress/gutenberg/pull/16239).
-* Add native component [HTMLTextInput](https://github.com/WordPress/gutenberg/pull/16226).
-* Update the video player to [open the URL by browser](https://github.com/WordPress/gutenberg/pull/16089) on Android.
-* Re-enable the [Video block on Android](https://github.com/WordPress/gutenberg/pull/16215).
+-   Fix [multiline Image block captions](https://github.com/WordPress/gutenberg/pull/16071) in iOS.
+-   Avoid unnecessary [div elements in the content of Quote](https://github.com/WordPress/gutenberg/pull/16072) blocks.
+-   Update the default [colors used in the RichText](https://github.com/WordPress/gutenberg/pull/16016) component.
+-   Fix [pasting text on Post Title](https://github.com/WordPress/gutenberg/pull/16116).
+-   Unify the web and mobile components hierarchy:
+    -   [BlockPicker and Inserter](https://github.com/WordPress/gutenberg/pull/16114).
+    -   [BlockToolbar](https://github.com/WordPress/gutenberg/pull/16213).
+    -   [BlockMobileToolbar](https://github.com/WordPress/gutenberg/pull/16177).
+    -   [BlockListBlock](https://github.com/WordPress/gutenberg/pull/16223).
+    -   [BlockList](https://github.com/WordPress/gutenberg/pull/16239).
+-   Add native component [HTMLTextInput](https://github.com/WordPress/gutenberg/pull/16226).
+-   Update the video player to [open the URL by browser](https://github.com/WordPress/gutenberg/pull/16089) on Android.
+-   Re-enable the [Video block on Android](https://github.com/WordPress/gutenberg/pull/16215).
 
 = 5.9.2 =
 
+## Changelog
+
 ### Bug Fixes
 
- - Fix Regression for blocks using InnerBlocks.Content from the editor package (support forwardRef components in the block serializer).
+-   Fix Regression for blocks using InnerBlocks.Content from the editor package (support forwardRef components in the block serializer).
 
 = 5.9.1 =
 
+## Changelog
+
 ### Bug Fixes
 
-* Fix the issue where [statics for deprecated components were not hoisted](https://github.com/WordPress/gutenberg/pull/16152)
+-   Fix the issue where [statics for deprecated components were not hoisted](https://github.com/WordPress/gutenberg/pull/16152)
 
 = 5.9.0 =
 
+## Changelog
+
 ### Features
 
-*   Allow [grouping/ungrouping blocks](https://github.com/WordPress/gutenberg/pull/14908) using the Group block.
+-   Allow [grouping/ungrouping blocks](https://github.com/WordPress/gutenberg/pull/14908) using the Group block.
 
 ### Enhancements
 
-*   Improve the selection of inner blocks: [Clickthrough selection](https://github.com/WordPress/gutenberg/pull/15537).
-*   Introduce the [snackbar notices](https://github.com/WordPress/gutenberg/pull/15594) and use them for the save success notices.
-*   Use [consistent colors in the different menus](https://github.com/WordPress/gutenberg/pull/15531) items.
-*   [Consolidate the different dropdown menus](https://github.com/WordPress/gutenberg/pull/14843) to use the DropdownMenu component.
-*   Expand the [**prefered-reduced-motion** support](https://github.com/WordPress/gutenberg/pull/15850) to all the animations.
-*   Add a subtle [animation to the snackbar](https://github.com/WordPress/gutenberg/pull/15908) notices and provide new React hooks for media queries.
-*   Redesign the [Table block placeholder](https://github.com/WordPress/gutenberg/pull/15903).
-*   [Always show the side inserter](https://github.com/WordPress/gutenberg/pull/15864) on the last empty paragraph block.
-*   Widgets Screen:
-    *   Add the [in progress state](https://github.com/WordPress/gutenberg/pull/16019) to the save button.
-    *   Add the RichText [Format Library](https://github.com/WordPress/gutenberg/pull/15948).
-*   Improve the [Group and Ungroup icons](https://github.com/WordPress/gutenberg/pull/16001).
-*   The [Spacer block clears all](https://github.com/WordPress/gutenberg/pull/15874) the previous floated blocks.
-
-### Bug Fixes
-
-*   [Focus the Button block’s input](https://github.com/WordPress/gutenberg/pull/15951) upon creation.
-*   Prevent [Embed block crashes](https://github.com/WordPress/gutenberg/pull/15866) when used inside locked containers.
-*   Properly [center the default appender placeholder](https://github.com/WordPress/gutenberg/pull/15868).
-*   Correct [default appender icon transition jump](https://github.com/WordPress/gutenberg/pull/15892) in Safari.
-*   Only apply [appender margins](https://github.com/WordPress/gutenberg/pull/15888) when the appender is inside of a block.
-*   Avoid loading [reusable blocks editor styles](https://github.com/WordPress/gutenberg/pull/14607) in the frontend.
-*   Correct [position of the "Remove Featured Image" button](https://github.com/WordPress/gutenberg/pull/15928) on small screens.
-*   Allow the [legacy widget block to render core widgets](https://github.com/WordPress/gutenberg/pull/15396).
-*   A11y:
-    *   Fix [wrong tab order in the data picker](https://github.com/WordPress/gutenberg/pull/15936) component.
-    *   Remove the [access keyboard shortcuts](https://github.com/WordPress/gutenberg/pull/15191) from the Format Library.
-*   Bail early in [createUpgradedEmbedBlock](https://github.com/WordPress/gutenberg/pull/15885) for invalid block types.
-*   Fix [DateTimePicker styles](https://github.com/WordPress/gutenberg/pull/15389) when used outside the WordPress context.
-*   Prevent the [Spacer block from being deselected](https://github.com/WordPress/gutenberg/pull/15884) when resized.
-*   Remove the [word breaking from the Media & Text](https://github.com/WordPress/gutenberg/pull/15871) block.
-*   [Keep the seconds value untouched](https://github.com/WordPress/gutenberg/pull/15495) when editing dates using the DateTimePicker component.
-*   Fix [tooltips styles](https://github.com/WordPress/gutenberg/pull/16043) specificity.
-*   Fix php errors happening when [calling get_current_screen](https://github.com/WordPress/gutenberg/pull/15983).
+-   Improve the selection of inner blocks: [Clickthrough selection](https://github.com/WordPress/gutenberg/pull/15537).
+-   Introduce the [snackbar notices](https://github.com/WordPress/gutenberg/pull/15594) and use them for the save success notices.
+-   Use [consistent colors in the different menus](https://github.com/WordPress/gutenberg/pull/15531) items.
+-   [Consolidate the different dropdown menus](https://github.com/WordPress/gutenberg/pull/14843) to use the DropdownMenu component.
+-   Expand the [**prefered-reduced-motion** support](https://github.com/WordPress/gutenberg/pull/15850) to all the animations.
+-   Add a subtle [animation to the snackbar](https://github.com/WordPress/gutenberg/pull/15908) notices and provide new React hooks for media queries.
+-   Redesign the [Table block placeholder](https://github.com/WordPress/gutenberg/pull/15903).
+-   [Always show the side inserter](https://github.com/WordPress/gutenberg/pull/15864) on the last empty paragraph block.
+-   Widgets Screen:
+    -   Add the [in progress state](https://github.com/WordPress/gutenberg/pull/16019) to the save button.
+    -   Add the RichText [Format Library](https://github.com/WordPress/gutenberg/pull/15948).
+-   Improve the [Group and Ungroup icons](https://github.com/WordPress/gutenberg/pull/16001).
+-   The [Spacer block clears all](https://github.com/WordPress/gutenberg/pull/15874) the previous floated blocks.
+
+### Bug Fixes
+
+-   [Focus the Button block’s input](https://github.com/WordPress/gutenberg/pull/15951) upon creation.
+-   Prevent [Embed block crashes](https://github.com/WordPress/gutenberg/pull/15866) when used inside locked containers.
+-   Properly [center the default appender placeholder](https://github.com/WordPress/gutenberg/pull/15868).
+-   Correct [default appender icon transition jump](https://github.com/WordPress/gutenberg/pull/15892) in Safari.
+-   Only apply [appender margins](https://github.com/WordPress/gutenberg/pull/15888) when the appender is inside of a block.
+-   Avoid loading [reusable blocks editor styles](https://github.com/WordPress/gutenberg/pull/14607) in the frontend.
+-   Correct [position of the "Remove Featured Image" button](https://github.com/WordPress/gutenberg/pull/15928) on small screens.
+-   Allow the [legacy widget block to render core widgets](https://github.com/WordPress/gutenberg/pull/15396).
+-   A11y:
+    -   Fix [wrong tab order in the data picker](https://github.com/WordPress/gutenberg/pull/15936) component.
+    -   Remove the [access keyboard shortcuts](https://github.com/WordPress/gutenberg/pull/15191) from the Format Library.
+-   Bail early in [createUpgradedEmbedBlock](https://github.com/WordPress/gutenberg/pull/15885) for invalid block types.
+-   Fix [DateTimePicker styles](https://github.com/WordPress/gutenberg/pull/15389) when used outside the WordPress context.
+-   Prevent the [Spacer block from being deselected](https://github.com/WordPress/gutenberg/pull/15884) when resized.
+-   Remove the [word breaking from the Media & Text](https://github.com/WordPress/gutenberg/pull/15871) block.
+-   [Keep the seconds value untouched](https://github.com/WordPress/gutenberg/pull/15495) when editing dates using the DateTimePicker component.
+-   Fix [tooltips styles](https://github.com/WordPress/gutenberg/pull/16043) specificity.
+-   Fix php errors happening when [calling get_current_screen](https://github.com/WordPress/gutenberg/pull/15983).
 
 ### Various
 
-*   Introduce [useSelect](https://github.com/WordPress/gutenberg/pull/15737) and [useDispatch](https://github.com/WordPress/gutenberg/pull/15896) hooks to the data module.
-*   Adding embedded [performance tests](https://github.com/WordPress/gutenberg/pull/14506) to the repository.
-*   Support the [full plugin release process](https://github.com/WordPress/gutenberg/pull/15848) in the automated release tool.
-*   Speed up the [packages build](https://github.com/WordPress/gutenberg/pull/15230) [tool](https://github.com/WordPress/gutenberg/pull/15920) script and the [Gutenberg plugin build](https://github.com/WordPress/gutenberg/pull/15226) config.
-*   Extract media upload logic part into a new [@wordpress/media-utils package](https://github.com/WordPress/gutenberg/pull/15521).
-*   Introduce [**Milestone-It** GitHub Action](https://github.com/WordPress/gutenberg/pull/15826) to auto-assign milestones to merged PRs.
-*   Move the [transformStyles function](https://github.com/WordPress/gutenberg/pull/15572) to the block-editor package to use in the widgets screen.
-*   Allow plugin authors to [override the default anchor attribute](https://github.com/WordPress/gutenberg/pull/15959) definition.
-*   Add [overlayColor classname to cover blocks](https://github.com/WordPress/gutenberg/pull/15939) editor markup.
-*   [Skip downloading chromium](https://github.com/WordPress/gutenberg/pull/15886) when building the plugin zip.
-*   Add an [e2e test to check the heading colors](https://github.com/WordPress/gutenberg/pull/15784) [feature](https://github.com/WordPress/gutenberg/pull/15917).
-*   [Lint the ESlint config file](https://github.com/WordPress/gutenberg/pull/15887) (meta).
-*   Fix [i18n ESlint rules](https://github.com/WordPress/gutenberg/pull/15839) and use them in the [Gutenberg setup](https://github.com/WordPress/gutenberg/pull/15877).
-*   Fix error in the [plugin release tool](https://github.com/WordPress/gutenberg/pull/15840) when switching branches.
-*   Remove [unused stylesheet file](https://github.com/WordPress/gutenberg/pull/15845).
-*   Improve the setup of the WordPress packages [package.json files](https://github.com/WordPress/gutenberg/pull/15879).
-*   Remove the use of [popular plugins in e2e tests](https://github.com/WordPress/gutenberg/pull/15940).
-*   Ignore [linting files located in build](https://github.com/WordPress/gutenberg/pull/15977) folders by default.
-*   Add [default file patterns for the lint command](https://github.com/WordPress/gutenberg/pull/15890) of @wordpress/scripts.
-*   Extract the [ServerSideRender](https://github.com/WordPress/gutenberg/pull/15635) component to an independent package.
-*   Refactor the [HoverArea component as a React Hook](https://github.com/WordPress/gutenberg/pull/15038) instead.
-*   Remove [useless dependency](https://github.com/WordPress/gutenberg/pull/16034) from the @wordpress/edit-post package.
-*   [Deprecate components/selectors and actions](https://github.com/WordPress/gutenberg/pull/15770) moved to the editor package.
-*   Update [browserslist](https://github.com/WordPress/gutenberg/pull/16066) dependency.
+-   Introduce [useSelect](https://github.com/WordPress/gutenberg/pull/15737) and [useDispatch](https://github.com/WordPress/gutenberg/pull/15896) hooks to the data module.
+-   Adding embedded [performance tests](https://github.com/WordPress/gutenberg/pull/14506) to the repository.
+-   Support the [full plugin release process](https://github.com/WordPress/gutenberg/pull/15848) in the automated release tool.
+-   Speed up the [packages build](https://github.com/WordPress/gutenberg/pull/15230) [tool](https://github.com/WordPress/gutenberg/pull/15920) script and the [Gutenberg plugin build](https://github.com/WordPress/gutenberg/pull/15226) config.
+-   Extract media upload logic part into a new [@wordpress/media-utils package](https://github.com/WordPress/gutenberg/pull/15521).
+-   Introduce [**Milestone-It** GitHub Action](https://github.com/WordPress/gutenberg/pull/15826) to auto-assign milestones to merged PRs.
+-   Move the [transformStyles function](https://github.com/WordPress/gutenberg/pull/15572) to the block-editor package to use in the widgets screen.
+-   Allow plugin authors to [override the default anchor attribute](https://github.com/WordPress/gutenberg/pull/15959) definition.
+-   Add [overlayColor classname to cover blocks](https://github.com/WordPress/gutenberg/pull/15939) editor markup.
+-   [Skip downloading chromium](https://github.com/WordPress/gutenberg/pull/15886) when building the plugin zip.
+-   Add an [e2e test to check the heading colors](https://github.com/WordPress/gutenberg/pull/15784) [feature](https://github.com/WordPress/gutenberg/pull/15917).
+-   [Lint the ESlint config file](https://github.com/WordPress/gutenberg/pull/15887) (meta).
+-   Fix [i18n ESlint rules](https://github.com/WordPress/gutenberg/pull/15839) and use them in the [Gutenberg setup](https://github.com/WordPress/gutenberg/pull/15877).
+-   Fix error in the [plugin release tool](https://github.com/WordPress/gutenberg/pull/15840) when switching branches.
+-   Remove [unused stylesheet file](https://github.com/WordPress/gutenberg/pull/15845).
+-   Improve the setup of the WordPress packages [package.json files](https://github.com/WordPress/gutenberg/pull/15879).
+-   Remove the use of [popular plugins in e2e tests](https://github.com/WordPress/gutenberg/pull/15940).
+-   Ignore [linting files located in build](https://github.com/WordPress/gutenberg/pull/15977) folders by default.
+-   Add [default file patterns for the lint command](https://github.com/WordPress/gutenberg/pull/15890) of @wordpress/scripts.
+-   Extract the [ServerSideRender](https://github.com/WordPress/gutenberg/pull/15635) component to an independent package.
+-   Refactor the [HoverArea component as a React Hook](https://github.com/WordPress/gutenberg/pull/15038) instead.
+-   Remove [useless dependency](https://github.com/WordPress/gutenberg/pull/16034) from the @wordpress/edit-post package.
+-   [Deprecate components/selectors and actions](https://github.com/WordPress/gutenberg/pull/15770) moved to the editor package.
+-   Update [browserslist](https://github.com/WordPress/gutenberg/pull/16066) dependency.
 
 ### Documentation
 
-*   Document the [remaining APIs](https://github.com/WordPress/gutenberg/pull/15176) of the data module.
-*   Add an [ESNext example](https://github.com/WordPress/gutenberg/pull/15828) to the i18n docs.
-*   Fix inline docs and add tests for [color utils](https://github.com/WordPress/gutenberg/pull/15861).
-*   Document missing [MenuItem prop](https://github.com/WordPress/gutenberg/pull/16061).
-*   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/15835), [2](https://github.com/WordPress/gutenberg/pull/15836), [3](https://github.com/WordPress/gutenberg/pull/15831), [4](https://github.com/WordPress/gutenberg/pull/15697), [5](https://github.com/WordPress/gutenberg/pull/14841), [6](https://github.com/WordPress/gutenberg/pull/15717), [7](https://github.com/WordPress/gutenberg/pull/15942), [8](https://github.com/WordPress/gutenberg/pull/15950), [9](https://github.com/WordPress/gutenberg/pull/16059).
+-   Document the [remaining APIs](https://github.com/WordPress/gutenberg/pull/15176) of the data module.
+-   Add an [ESNext example](https://github.com/WordPress/gutenberg/pull/15828) to the i18n docs.
+-   Fix inline docs and add tests for [color utils](https://github.com/WordPress/gutenberg/pull/15861).
+-   Document missing [MenuItem prop](https://github.com/WordPress/gutenberg/pull/16061).
+-   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/15835), [2](https://github.com/WordPress/gutenberg/pull/15836), [3](https://github.com/WordPress/gutenberg/pull/15831), [4](https://github.com/WordPress/gutenberg/pull/15697), [5](https://github.com/WordPress/gutenberg/pull/14841), [6](https://github.com/WordPress/gutenberg/pull/15717), [7](https://github.com/WordPress/gutenberg/pull/15942), [8](https://github.com/WordPress/gutenberg/pull/15950), [9](https://github.com/WordPress/gutenberg/pull/16059).
 
 ### Mobile
 
-*   Fix [caret position](https://github.com/WordPress/gutenberg/pull/15833) when splitting text blocks.
-*   Fix the initial value of the [“Open in New Tab” toggle](https://github.com/WordPress/gutenberg/pull/15812).
-*   Fix [Video block crash](https://github.com/WordPress/gutenberg/pull/15857) on drawing on Android.
-*   Fix caret position after [inline paste](https://github.com/WordPress/gutenberg/pull/15701).
-*   [Focus the RichText component](https://github.com/WordPress/gutenberg/pull/15878) on block mount.
-*   Port [KeyboardAvoidingView, KeyboardAwareFlatList and ReadableContentView](https://github.com/WordPress/gutenberg/pull/15913) to the @wordpress/components package.
-*   Fix [press of Enter on post title](https://github.com/WordPress/gutenberg/pull/15944).
-*   Move the [native unit tests](https://github.com/WordPress/gutenberg/pull/15589) to the Gutenberg repository.
-*   Improve the [styling of the Quote block](https://github.com/WordPress/gutenberg/pull/15990).
-*   Share [RichText line separator logic](https://github.com/WordPress/gutenberg/pull/15946) between web and native implementations.
-*   Fix [Video block showing a black background](https://github.com/WordPress/gutenberg/pull/15991) when upload is in progress or upload has failed.
-*   Allow passing a [style prop to the Icon](https://github.com/WordPress/gutenberg/pull/15778) component.
-*   Enable [sound on the Video block](https://github.com/WordPress/gutenberg/pull/15997).
-*   [Start playback immediately](https://github.com/WordPress/gutenberg/pull/15998) after video goes full screen.
-*   Fix [mobile quotes](https://github.com/WordPress/gutenberg/pull/16013) insertion and removal of empty lines.
-*   Move [unselected block accessibility handling](https://github.com/WordPress/gutenberg/pull/15225) to block-holder.
-*   Make the [More block ready-only](https://github.com/WordPress/gutenberg/pull/16005).
-*   Fix crash when [deleting all content of RichText](https://github.com/WordPress/gutenberg/pull/16018) based block.
-*   Fix for [extra BR tag on Title field](https://github.com/WordPress/gutenberg/pull/16021) on Android.
-*   Open [Video, Quote and More blocks](https://github.com/WordPress/gutenberg/pull/16031) to public.
+-   Fix [caret position](https://github.com/WordPress/gutenberg/pull/15833) when splitting text blocks.
+-   Fix the initial value of the [“Open in New Tab” toggle](https://github.com/WordPress/gutenberg/pull/15812).
+-   Fix [Video block crash](https://github.com/WordPress/gutenberg/pull/15857) on drawing on Android.
+-   Fix caret position after [inline paste](https://github.com/WordPress/gutenberg/pull/15701).
+-   [Focus the RichText component](https://github.com/WordPress/gutenberg/pull/15878) on block mount.
+-   Port [KeyboardAvoidingView, KeyboardAwareFlatList and ReadableContentView](https://github.com/WordPress/gutenberg/pull/15913) to the @wordpress/components package.
+-   Fix [press of Enter on post title](https://github.com/WordPress/gutenberg/pull/15944).
+-   Move the [native unit tests](https://github.com/WordPress/gutenberg/pull/15589) to the Gutenberg repository.
+-   Improve the [styling of the Quote block](https://github.com/WordPress/gutenberg/pull/15990).
+-   Share [RichText line separator logic](https://github.com/WordPress/gutenberg/pull/15946) between web and native implementations.
+-   Fix [Video block showing a black background](https://github.com/WordPress/gutenberg/pull/15991) when upload is in progress or upload has failed.
+-   Allow passing a [style prop to the Icon](https://github.com/WordPress/gutenberg/pull/15778) component.
+-   Enable [sound on the Video block](https://github.com/WordPress/gutenberg/pull/15997).
+-   [Start playback immediately](https://github.com/WordPress/gutenberg/pull/15998) after video goes full screen.
+-   Fix [mobile quotes](https://github.com/WordPress/gutenberg/pull/16013) insertion and removal of empty lines.
+-   Move [unselected block accessibility handling](https://github.com/WordPress/gutenberg/pull/15225) to block-holder.
+-   Make the [More block ready-only](https://github.com/WordPress/gutenberg/pull/16005).
+-   Fix crash when [deleting all content of RichText](https://github.com/WordPress/gutenberg/pull/16018) based block.
+-   Fix for [extra BR tag on Title field](https://github.com/WordPress/gutenberg/pull/16021) on Android.
+-   Open [Video, Quote and More blocks](https://github.com/WordPress/gutenberg/pull/16031) to public.
 
 = 5.8.0 =
 
-# Features
-
-- Support changing the text color in the Heading block.
-- Support reordering gallery images.
-- Complete the initial version of the widgets screen POC
-  - Add an experimental endpoint to fetch the block-based widget areas.
-  - Connect the screen to the widget areas endpoint.
-  - Load the widget scripts.
-  - Load colors, font sizes and file upload settings in the widgets screen.
-  - Render the block based widget areas in the frontend.
-
-# Enhancements
-
-- Clarify the label of the custom classname inspector panel.
-- Update Calendar block icon for better alignment with the Archives block icon.
-- Add width constraints to the Media & Text block.
-- Allow dropping blocks into container blocks using the new block appender.
-- Provide default margins for the Latest Posts block excerpts.
-
-# Bug Fixes
-
-- Support block style variations for container blocks.
-- A11y
-  - Use semantic markup for the document outline.
-  - Fix the reading order of the keyboard shortcuts modal.
-  - Add a visible help text to the tags input.
-  - Update the icon of the Heading block.
-  - Move the View Posts anchor out of the toolbar section in the header.
-  - Close the block settings menu after removing the block.
-- Fix the blurriness of the disabled block switcher icons.
-- Fix missing template validation warning.
-- Fix several content spitting issues and make the onSplit prop stable.
-- Allow the Shortcode block field to expand automatically.
-- Left pad the DateTimePicker minutes input.
-- Fix the frontend classname used for the Latest Posts block excerpts.
-- Fix error happening when deleting the last block if the paragraph block is unregistered.
-- Fix focus jumps when typing in meta block fields.
-
-# Documentation
-
-- Improve the Slot/Fill documentation.
-- Document the GitHub teams used in the repository.
-- Document the icon prop for the MediaPlaceholder component.
-- Update the changelogs maintenance documentation.
-- Clarify the save function documentation to discourage side effects.
-- Clarify the block attributes documentation.
-- Replace @link with @see in JSDocs.
-- Fixes and tweaks to the API docs generation tool.
-- Typos and tweaks: 1, 2, 3, 4, 5, 6, 7, 8.
-
-# Various
-
-- Add a new editor setting to allow disabling the code editor.
-- Add a new @wordpress/data-controls package.
-- Add an automation tool to simplify the Gutenberg release process.
-- Support the all hook in non-production environments.
-- Expose hasResolver property on the data module selectors.
-- Support multiple pattern replacement for the custom-templated-path-webpack-plugin package.
-- Update node-sass dependency to support the latest Node.js version.
-- Fix React warning showing when loading the editor (Fill component).
-- Fix React warning message when using the Image block.
-- Refactor the popover component using React Hooks.
-- Remove WebpackRTLPlugin usage.
-- Remove an outdated chrome fix for iframes drag and drop.
-- Skip Chromium download in Travis by default.
-- Rewrite Node.js packages to use CommonJS exports.
-- Speed up Docker and e2e tests setup Travis.
-- Extracted the deprecated block version declarations to their own files.
-- Add missing file from the published @wordpress/dependency-extraction-webpack-plugin-files package.
-- Upgrade package dependencies: Lerna and Webpack Bundle Analyzer.
-
-# Mobile
-
-- Add the Quote block.
-- Make the Video block publicly available.
-- Fix bug when merging blocks.
-- Improve the UI/UX of the different media blocks.
-- Support nested lists.
-- Fix Image block with an undefined url.
-- Support rich captions in the Image block.
-- Improve screen reader support on BottomSheet’s cells.
-- Fix several focus related bugs.
-- Fix undo related issue.
-- Update onSplit method on the native RichText component to the latest version.
-- Move the BottomSheet component to the @wordpress/components package.
-- Handle the iOS z-gesture to exit modals and block selection.
-- Implement the invalid block content UI.
+## Changelog
+
+### Features
+
+-   Support changing the text color in the Heading block.
+-   Support reordering gallery images.
+-   Complete the initial version of the widgets screen POC
+    -   Add an experimental endpoint to fetch the block-based widget areas.
+    -   Connect the screen to the widget areas endpoint.
+    -   Load the widget scripts.
+    -   Load colors, font sizes and file upload settings in the widgets screen.
+    -   Render the block based widget areas in the frontend.
+
+### Enhancements
+
+-   Clarify the label of the custom classname inspector panel.
+-   Update Calendar block icon for better alignment with the Archives block icon.
+-   Add width constraints to the Media & Text block.
+-   Allow dropping blocks into container blocks using the new block appender.
+-   Provide default margins for the Latest Posts block excerpts.
+
+### Bug Fixes
+
+-   Support block style variations for container blocks.
+-   A11y
+    -   Use semantic markup for the document outline.
+    -   Fix the reading order of the keyboard shortcuts modal.
+    -   Add a visible help text to the tags input.
+    -   Update the icon of the Heading block.
+    -   Move the View Posts anchor out of the toolbar section in the header.
+    -   Close the block settings menu after removing the block.
+-   Fix the blurriness of the disabled block switcher icons.
+-   Fix missing template validation warning.
+-   Fix several content spitting issues and make the onSplit prop stable.
+-   Allow the Shortcode block field to expand automatically.
+-   Left pad the DateTimePicker minutes input.
+-   Fix the frontend classname used for the Latest Posts block excerpts.
+-   Fix error happening when deleting the last block if the paragraph block is unregistered.
+-   Fix focus jumps when typing in meta block fields.
+
+### Documentation
+
+-   Improve the Slot/Fill documentation.
+-   Document the GitHub teams used in the repository.
+-   Document the icon prop for the MediaPlaceholder component.
+-   Update the changelogs maintenance documentation.
+-   Clarify the save function documentation to discourage side effects.
+-   Clarify the block attributes documentation.
+-   Replace @link with @see in JSDocs.
+-   Fixes and tweaks to the API docs generation tool.
+-   Typos and tweaks: 1, 2, 3, 4, 5, 6, 7, 8.
+
+### Various
+
+-   Add a new editor setting to allow disabling the code editor.
+-   Add a new @wordpress/data-controls package.
+-   Add an automation tool to simplify the Gutenberg release process.
+-   Support the all hook in non-production environments.
+-   Expose hasResolver property on the data module selectors.
+-   Support multiple pattern replacement for the custom-templated-path-webpack-plugin package.
+-   Update node-sass dependency to support the latest Node.js version.
+-   Fix React warning showing when loading the editor (Fill component).
+-   Fix React warning message when using the Image block.
+-   Refactor the popover component using React Hooks.
+-   Remove WebpackRTLPlugin usage.
+-   Remove an outdated chrome fix for iframes drag and drop.
+-   Skip Chromium download in Travis by default.
+-   Rewrite Node.js packages to use CommonJS exports.
+-   Speed up Docker and e2e tests setup Travis.
+-   Extracted the deprecated block version declarations to their own files.
+-   Add missing file from the published @wordpress/dependency-extraction-webpack-plugin-files package.
+-   Upgrade package dependencies: Lerna and Webpack Bundle Analyzer.
+
+### Mobile
+
+-   Add the Quote block.
+-   Make the Video block publicly available.
+-   Fix bug when merging blocks.
+-   Improve the UI/UX of the different media blocks.
+-   Support nested lists.
+-   Fix Image block with an undefined url.
+-   Support rich captions in the Image block.
+-   Improve screen reader support on BottomSheet’s cells.
+-   Fix several focus related bugs.
+-   Fix undo related issue.
+-   Update onSplit method on the native RichText component to the latest version.
+-   Move the BottomSheet component to the @wordpress/components package.
+-   Handle the iOS z-gesture to exit modals and block selection.
+-   Implement the invalid block content UI.
 
 = 5.7.0 =
 
-## Features
-
-*   Support setting a [width to the column block](https://github.com/WordPress/gutenberg/pull/15499).
-*   Support showing [Post Content or excerpt in the Latest Posts](https://github.com/WordPress/gutenberg/pull/14627) [block](https://github.com/WordPress/gutenberg/pull/15453).
-*   Support [headers and footers in the Table block](https://github.com/WordPress/gutenberg/pull/15409).
-
-## Enhancement
-
-*   Improve the UX of the Group block by using the [individual block appender](https://github.com/WordPress/gutenberg/pull/14943).
-*   Support [updating images using Drag & Drop](https://github.com/WordPress/gutenberg/pull/14983).
-*   Clarify the name of the [inline code format](https://github.com/WordPress/gutenberg/pull/15199).
-*   Add a usability [warning when audio/video autoplay](https://github.com/WordPress/gutenberg/pull/15575) is applied.
-*   Replace the [Page Break block icon](https://github.com/WordPress/gutenberg/pull/15627) with Material version.
-
-## Bug Fixes
-
-*   A11y:
-    *   Fix [focal point picker input labels](https://github.com/WordPress/gutenberg/pull/15255).
-    *   Add role to the [copy all content menu item](https://github.com/WordPress/gutenberg/pull/15383).
-    *   Add [focus style to the document outline](https://github.com/WordPress/gutenberg/pull/15479) panel.
-    *   Update the [save indicator contrast](https://github.com/WordPress/gutenberg/pull/15514) to pass AA.
-    *   Fix The [tabbing order in the Gallery Block](https://github.com/WordPress/gutenberg/pull/15540).
-    *   Improve the [contrast of the button focus styles](https://github.com/WordPress/gutenberg/pull/15544).
-    *   Fixed [focus state of pressed AM/PM buttons](https://github.com/WordPress/gutenberg/pull/15582).
-    *   Fix the [URLInput aria properties](https://github.com/WordPress/gutenberg/pull/15564).
-    *   Avoid showing [pre-publish panel buttons](https://github.com/WordPress/gutenberg/pull/15460) as links.
-    *   Fix the [focus state of the links shown as buttons](https://github.com/WordPress/gutenberg/pull/15601).
-*   Fix [RTL keyboard interactions](https://github.com/WordPress/gutenberg/pull/15496).
-*   Fix [updates to RichText formats not being reflected in the UI](https://github.com/WordPress/gutenberg/pull/15573) synchronously.
-*   Fix extra line breaks added when [pasting from Google Docs](https://github.com/WordPress/gutenberg/pull/15557).
-*   Fix [copy, paste JavaScript errors](https://github.com/WordPress/gutenberg/pull/14712) in paragraph blocks with locking enabled.
-*   Fix [format buttons incorrectly toggled](https://github.com/WordPress/gutenberg/pull/15466) on RichText blur.
-*   Preserve the [caret’s horizontal position](https://github.com/WordPress/gutenberg/pull/15624) when navigating blocks.
-*   [Case-insensitive search](https://github.com/WordPress/gutenberg/pull/14786) for existing categories.
-*   Prevent the [Code block from rendering embeds](https://github.com/WordPress/gutenberg/pull/13996) or shortcodes.
-*   Fix the [SandBox component usage outside the WP-admin](https://github.com/WordPress/gutenberg/pull/15415) context.
-*   Fix the  [Cover block’s deprecated version](https://github.com/WordPress/gutenberg/pull/15449) attributes.
-*   Fix the [webpack dependency plugin](https://github.com/WordPress/gutenberg/pull/15430): filename function handling.
-*   Support [watching block.json changes](https://github.com/WordPress/gutenberg/pull/15455) in our build tool.
-*   Fix [ServerSideRender remaining in loading state](https://github.com/WordPress/gutenberg/pull/15412) when nothing is rendered.
-*   Fix the [server-side registered blocks](https://github.com/WordPress/gutenberg/pull/15414) in the widgets screen.
-*   Show the [block movers in the widgets](https://github.com/WordPress/gutenberg/pull/15076) screen.
-*   Decode the [HTML entities in the post author selector](https://github.com/WordPress/gutenberg/pull/15090).
-*   Fix [inconsistent heading sizes](https://github.com/WordPress/gutenberg/pull/15393) between the classic and the heading blocks.
-*   Add [check for author in post data before meta boxes save](https://github.com/WordPress/gutenberg/pull/15375) request submission.
-*   [Allow blocks drag & drop](https://github.com/WordPress/gutenberg/pull/14521) if locking is set to "insert".
-*   Fix [Youtube embed styles](https://github.com/WordPress/gutenberg/pull/14748) when used multiple times in a post.
-*   [Proxy the code/block-editor replaceBlock](https://github.com/WordPress/gutenberg/pull/15528) action in the core/editor package.
-*   Use [block-editor instead of editor in cover block](https://github.com/WordPress/gutenberg/pull/15547).
-*   Fix [block showing an error in Safari](https://github.com/WordPress/gutenberg/pull/15576) when focused.
-*   Fix small visual error in the [active state of the formatting buttons](https://github.com/WordPress/gutenberg/pull/15592).
-*   Fix the pinned [plugins buttons styles](https://github.com/WordPress/gutenberg/pull/15609) when toggled.
-*   Set caret position correctly when [merging blocks using the Delete key](https://github.com/WordPress/gutenberg/pull/15599).
-
-## Documentation
-
-*   Clarify [best practices pertaining to Color Palette](https://github.com/WordPress/gutenberg/pull/15006) values.
-*   Use [Block Editor instead of Gutenberg](https://github.com/WordPress/gutenberg/pull/15411) when appropriate in the Handbook.
-*   [Omit docblocks with private tag](https://github.com/WordPress/gutenberg/pull/15173) in the API Docs generation.
-*   Update docs for [selectors & actions moved to block-editor](https://github.com/WordPress/gutenberg/pull/15424).
-*   Update i18n docs to use [make-json command](https://github.com/WordPress/gutenberg/pull/15303) from wp-cli.
-*   Consolidate [doc generation tools](https://github.com/WordPress/gutenberg/pull/15421).
-*   Fix [next/previous links issue](https://github.com/WordPress/gutenberg/pull/15456).
-*   Webpack dependency plugin: Document [unsupported multiple instances](https://github.com/WordPress/gutenberg/pull/15451).
-*   Add a [DevHub manifest file](https://github.com/WordPress/gutenberg/pull/15254) to allow synchronizing the documentation to the DevHub.
-*   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/15251), [2](https://github.com/WordPress/gutenberg/pull/15204), [3](https://github.com/WordPress/gutenberg/pull/15260), [4](https://github.com/WordPress/gutenberg/pull/15262), [5](https://github.com/WordPress/gutenberg/pull/15170), [6](https://github.com/WordPress/gutenberg/pull/15386), [7](https://github.com/WordPress/gutenberg/pull/15423), [8](https://github.com/WordPress/gutenberg/pull/15448), [9](https://github.com/WordPress/gutenberg/pull/15454), [10](https://github.com/WordPress/gutenberg/pull/15494), [11](https://github.com/WordPress/gutenberg/pull/15506), [12](https://github.com/WordPress/gutenberg/pull/15527), [13](https://github.com/WordPress/gutenberg/pull/15508), [14](https://github.com/WordPress/gutenberg/pull/15505), [15](https://github.com/WordPress/gutenberg/pull/15612).
-
-## Various
-
-*   Support and use the [shorthand Fragment](https://github.com/WordPress/gutenberg/pull/15120) [syntax](https://github.com/WordPress/gutenberg/pull/15261).
-*   Update to [Babel 7.4 and core-js 3](https://github.com/WordPress/gutenberg/pull/15139).
-*   Upgrade [simple-html-tokenizer](https://github.com/WordPress/gutenberg/pull/15246) dependency.
-*   Pass individual files as arguments from watch to [build script](https://github.com/WordPress/gutenberg/pull/15219).
-*   Automate the [scripts dependencies](https://github.com/WordPress/gutenberg/pull/15124) generation.
-*   [Clean DropZone](https://github.com/WordPress/gutenberg/pull/15224) component’s unused state.
-*   remove [\_\_unstablePositionedAtSelection](https://github.com/WordPress/gutenberg/pull/15035) component.
-*   Refactor core/edit-post [INIT effect to use action-generators](https://github.com/WordPress/gutenberg/pull/14740) and controls.
-*   Improve [eslint disable comments](https://github.com/WordPress/gutenberg/pull/15384).
-*   Fix NaN [warning when initializing the FocalPointPicker](https://github.com/WordPress/gutenberg/pull/15400) component.
-*   [Export React.memo](https://github.com/WordPress/gutenberg/pull/15385) in the @wordpress/element package.
-*   Improve the [specificity of the custom colors styles](https://github.com/WordPress/gutenberg/pull/15167).
-*   [Preload the autosaves endpoint](https://github.com/WordPress/gutenberg/pull/15067) to avoid request when loading the editor.
-*   A11y: Add support for [Axe verification in e2e tests](https://github.com/WordPress/gutenberg/pull/15018).
-*   Refactor the [File block to use the block.json](https://github.com/WordPress/gutenberg/pull/14862) syntax.
-*   Remove [redundant duplicated reducers](https://github.com/WordPress/gutenberg/pull/15142).
-*   Add [integration tests for blocks with deprecations](https://github.com/WordPress/gutenberg/pull/15268).
-*   Allow [non-production env in wp-scripts build](https://github.com/WordPress/gutenberg/pull/15480).
-*   Use [React Hooks in the BlockListBlock component](https://github.com/WordPress/gutenberg/pull/14985).
-*   Add an [e2e test for custom taxonomies](https://github.com/WordPress/gutenberg/pull/15151).
-*   Fix [intermittent failures on block transforms](https://github.com/WordPress/gutenberg/pull/15485) tests.
-*   Remove [componentWillReceiveProps usage from ColorPicker](https://github.com/WordPress/gutenberg/pull/11772).
-*   Add an [experimental](https://github.com/WordPress/gutenberg/pull/15563) [CPT to be used in the block based widgets screen](https://github.com/WordPress/gutenberg/pull/15014).
-*   Split [JavaScript CI tasks to individual jobs](https://github.com/WordPress/gutenberg/pull/15229).
-*   Remove [unnecessary aria-label from the block inserter](https://github.com/WordPress/gutenberg/pull/15382) list items.
-
-## Mobile
-
-*   Add a first version of the [video block](https://github.com/WordPress/gutenberg/pull/14912).
-*   Fix the [Auto-scroll behavior on List](https://github.com/WordPress/gutenberg/pull/15048) block.
-*   Fix the [list handling on Android](https://github.com/WordPress/gutenberg/pull/15168).
-*   Improve [accessibility of the missing block](https://github.com/WordPress/gutenberg/pull/15457).
+## Changelog
+
+### Features
+
+-   Support setting a [width to the column block](https://github.com/WordPress/gutenberg/pull/15499).
+-   Support showing [Post Content or excerpt in the Latest Posts](https://github.com/WordPress/gutenberg/pull/14627) [block](https://github.com/WordPress/gutenberg/pull/15453).
+-   Support [headers and footers in the Table block](https://github.com/WordPress/gutenberg/pull/15409).
+
+### Enhancement
+
+-   Improve the UX of the Group block by using the [individual block appender](https://github.com/WordPress/gutenberg/pull/14943).
+-   Support [updating images using Drag & Drop](https://github.com/WordPress/gutenberg/pull/14983).
+-   Clarify the name of the [inline code format](https://github.com/WordPress/gutenberg/pull/15199).
+-   Add a usability [warning when audio/video autoplay](https://github.com/WordPress/gutenberg/pull/15575) is applied.
+-   Replace the [Page Break block icon](https://github.com/WordPress/gutenberg/pull/15627) with Material version.
+
+### Bug Fixes
+
+-   A11y:
+    -   Fix [focal point picker input labels](https://github.com/WordPress/gutenberg/pull/15255).
+    -   Add role to the [copy all content menu item](https://github.com/WordPress/gutenberg/pull/15383).
+    -   Add [focus style to the document outline](https://github.com/WordPress/gutenberg/pull/15479) panel.
+    -   Update the [save indicator contrast](https://github.com/WordPress/gutenberg/pull/15514) to pass AA.
+    -   Fix The [tabbing order in the Gallery Block](https://github.com/WordPress/gutenberg/pull/15540).
+    -   Improve the [contrast of the button focus styles](https://github.com/WordPress/gutenberg/pull/15544).
+    -   Fixed [focus state of pressed AM/PM buttons](https://github.com/WordPress/gutenberg/pull/15582).
+    -   Fix the [URLInput aria properties](https://github.com/WordPress/gutenberg/pull/15564).
+    -   Avoid showing [pre-publish panel buttons](https://github.com/WordPress/gutenberg/pull/15460) as links.
+    -   Fix the [focus state of the links shown as buttons](https://github.com/WordPress/gutenberg/pull/15601).
+-   Fix [RTL keyboard interactions](https://github.com/WordPress/gutenberg/pull/15496).
+-   Fix [updates to RichText formats not being reflected in the UI](https://github.com/WordPress/gutenberg/pull/15573) synchronously.
+-   Fix extra line breaks added when [pasting from Google Docs](https://github.com/WordPress/gutenberg/pull/15557).
+-   Fix [copy, paste JavaScript errors](https://github.com/WordPress/gutenberg/pull/14712) in paragraph blocks with locking enabled.
+-   Fix [format buttons incorrectly toggled](https://github.com/WordPress/gutenberg/pull/15466) on RichText blur.
+-   Preserve the [caret’s horizontal position](https://github.com/WordPress/gutenberg/pull/15624) when navigating blocks.
+-   [Case-insensitive search](https://github.com/WordPress/gutenberg/pull/14786) for existing categories.
+-   Prevent the [Code block from rendering embeds](https://github.com/WordPress/gutenberg/pull/13996) or shortcodes.
+-   Fix the [SandBox component usage outside the WP-admin](https://github.com/WordPress/gutenberg/pull/15415) context.
+-   Fix the  [Cover block’s deprecated version](https://github.com/WordPress/gutenberg/pull/15449) attributes.
+-   Fix the [webpack dependency plugin](https://github.com/WordPress/gutenberg/pull/15430): filename function handling.
+-   Support [watching block.json changes](https://github.com/WordPress/gutenberg/pull/15455) in our build tool.
+-   Fix [ServerSideRender remaining in loading state](https://github.com/WordPress/gutenberg/pull/15412) when nothing is rendered.
+-   Fix the [server-side registered blocks](https://github.com/WordPress/gutenberg/pull/15414) in the widgets screen.
+-   Show the [block movers in the widgets](https://github.com/WordPress/gutenberg/pull/15076) screen.
+-   Decode the [HTML entities in the post author selector](https://github.com/WordPress/gutenberg/pull/15090).
+-   Fix [inconsistent heading sizes](https://github.com/WordPress/gutenberg/pull/15393) between the classic and the heading blocks.
+-   Add [check for author in post data before meta boxes save](https://github.com/WordPress/gutenberg/pull/15375) request submission.
+-   [Allow blocks drag & drop](https://github.com/WordPress/gutenberg/pull/14521) if locking is set to "insert".
+-   Fix [Youtube embed styles](https://github.com/WordPress/gutenberg/pull/14748) when used multiple times in a post.
+-   [Proxy the code/block-editor replaceBlock](https://github.com/WordPress/gutenberg/pull/15528) action in the core/editor package.
+-   Use [block-editor instead of editor in cover block](https://github.com/WordPress/gutenberg/pull/15547).
+-   Fix [block showing an error in Safari](https://github.com/WordPress/gutenberg/pull/15576) when focused.
+-   Fix small visual error in the [active state of the formatting buttons](https://github.com/WordPress/gutenberg/pull/15592).
+-   Fix the pinned [plugins buttons styles](https://github.com/WordPress/gutenberg/pull/15609) when toggled.
+-   Set caret position correctly when [merging blocks using the Delete key](https://github.com/WordPress/gutenberg/pull/15599).
+
+### Documentation
+
+-   Clarify [best practices pertaining to Color Palette](https://github.com/WordPress/gutenberg/pull/15006) values.
+-   Use [Block Editor instead of Gutenberg](https://github.com/WordPress/gutenberg/pull/15411) when appropriate in the Handbook.
+-   [Omit docblocks with private tag](https://github.com/WordPress/gutenberg/pull/15173) in the API Docs generation.
+-   Update docs for [selectors & actions moved to block-editor](https://github.com/WordPress/gutenberg/pull/15424).
+-   Update i18n docs to use [make-json command](https://github.com/WordPress/gutenberg/pull/15303) from wp-cli.
+-   Consolidate [doc generation tools](https://github.com/WordPress/gutenberg/pull/15421).
+-   Fix [next/previous links issue](https://github.com/WordPress/gutenberg/pull/15456).
+-   Webpack dependency plugin: Document [unsupported multiple instances](https://github.com/WordPress/gutenberg/pull/15451).
+-   Add a [DevHub manifest file](https://github.com/WordPress/gutenberg/pull/15254) to allow synchronizing the documentation to the DevHub.
+-   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/15251), [2](https://github.com/WordPress/gutenberg/pull/15204), [3](https://github.com/WordPress/gutenberg/pull/15260), [4](https://github.com/WordPress/gutenberg/pull/15262), [5](https://github.com/WordPress/gutenberg/pull/15170), [6](https://github.com/WordPress/gutenberg/pull/15386), [7](https://github.com/WordPress/gutenberg/pull/15423), [8](https://github.com/WordPress/gutenberg/pull/15448), [9](https://github.com/WordPress/gutenberg/pull/15454), [10](https://github.com/WordPress/gutenberg/pull/15494), [11](https://github.com/WordPress/gutenberg/pull/15506), [12](https://github.com/WordPress/gutenberg/pull/15527), [13](https://github.com/WordPress/gutenberg/pull/15508), [14](https://github.com/WordPress/gutenberg/pull/15505), [15](https://github.com/WordPress/gutenberg/pull/15612).
+
+### Various
+
+-   Support and use the [shorthand Fragment](https://github.com/WordPress/gutenberg/pull/15120) [syntax](https://github.com/WordPress/gutenberg/pull/15261).
+-   Update to [Babel 7.4 and core-js 3](https://github.com/WordPress/gutenberg/pull/15139).
+-   Upgrade [simple-html-tokenizer](https://github.com/WordPress/gutenberg/pull/15246) dependency.
+-   Pass individual files as arguments from watch to [build script](https://github.com/WordPress/gutenberg/pull/15219).
+-   Automate the [scripts dependencies](https://github.com/WordPress/gutenberg/pull/15124) generation.
+-   [Clean DropZone](https://github.com/WordPress/gutenberg/pull/15224) component’s unused state.
+-   remove [\_\_unstablePositionedAtSelection](https://github.com/WordPress/gutenberg/pull/15035) component.
+-   Refactor core/edit-post [INIT effect to use action-generators](https://github.com/WordPress/gutenberg/pull/14740) and controls.
+-   Improve [eslint disable comments](https://github.com/WordPress/gutenberg/pull/15384).
+-   Fix NaN [warning when initializing the FocalPointPicker](https://github.com/WordPress/gutenberg/pull/15400) component.
+-   [Export React.memo](https://github.com/WordPress/gutenberg/pull/15385) in the @wordpress/element package.
+-   Improve the [specificity of the custom colors styles](https://github.com/WordPress/gutenberg/pull/15167).
+-   [Preload the autosaves endpoint](https://github.com/WordPress/gutenberg/pull/15067) to avoid request when loading the editor.
+-   A11y: Add support for [Axe verification in e2e tests](https://github.com/WordPress/gutenberg/pull/15018).
+-   Refactor the [File block to use the block.json](https://github.com/WordPress/gutenberg/pull/14862) syntax.
+-   Remove [redundant duplicated reducers](https://github.com/WordPress/gutenberg/pull/15142).
+-   Add [integration tests for blocks with deprecations](https://github.com/WordPress/gutenberg/pull/15268).
+-   Allow [non-production env in wp-scripts build](https://github.com/WordPress/gutenberg/pull/15480).
+-   Use [React Hooks in the BlockListBlock component](https://github.com/WordPress/gutenberg/pull/14985).
+-   Add an [e2e test for custom taxonomies](https://github.com/WordPress/gutenberg/pull/15151).
+-   Fix [intermittent failures on block transforms](https://github.com/WordPress/gutenberg/pull/15485) tests.
+-   Remove [componentWillReceiveProps usage from ColorPicker](https://github.com/WordPress/gutenberg/pull/11772).
+-   Add an [experimental](https://github.com/WordPress/gutenberg/pull/15563) [CPT to be used in the block based widgets screen](https://github.com/WordPress/gutenberg/pull/15014).
+-   Split [JavaScript CI tasks to individual jobs](https://github.com/WordPress/gutenberg/pull/15229).
+-   Remove [unnecessary aria-label from the block inserter](https://github.com/WordPress/gutenberg/pull/15382) list items.
+
+### Mobile
+
+-   Add a first version of the [video block](https://github.com/WordPress/gutenberg/pull/14912).
+-   Fix the [Auto-scroll behavior on List](https://github.com/WordPress/gutenberg/pull/15048) block.
+-   Fix the [list handling on Android](https://github.com/WordPress/gutenberg/pull/15168).
+-   Improve [accessibility of the missing block](https://github.com/WordPress/gutenberg/pull/15457).
 
 = 5.6.1 =
 
-## Miscellaneous
+## Changelog
+
+### Miscellaneous
 
-- Republish Gutenberg 5.6.0.
+-   Republish Gutenberg 5.6.0.
 
 = 5.6.0 =
 
-## Enhancements
-
-- Improve [focus state for button block](https://github.com/WordPress/gutenberg/pull/15058).
-- [Reduce specificity of block styles](https://github.com/WordPress/gutenberg/pull/14407) to make it easier for themes to style the editor.
-- Optimize data subscribers to [avoid unnecessary work](https://github.com/WordPress/gutenberg/pull/15041) on each editor change.
-- Avoid [overlapping block breadcrumb](https://github.com/WordPress/gutenberg/pull/15112) when block movers are visible for full- and wide-aligned blocks.
-- Preload [user permissions for reusable blocks](https://github.com/WordPress/gutenberg/pull/15061) to avoid UI flickering for block settings menu options.
-- Remove [unnecessary bottom padding](https://github.com/WordPress/gutenberg/pull/15158) for nested lists.
-- Restore [block movers to focus mode](https://github.com/WordPress/gutenberg/pull/15109).
-- Improve display of [categories list panel](https://github.com/WordPress/gutenberg/pull/15075).
-
-## Bug Fixes
-
-- [Restore block movers](https://github.com/WordPress/gutenberg/pull/15022) to full- and wide-aligned blocks.
-- Always show [drag handles](https://github.com/WordPress/gutenberg/pull/15025) for nested blocks, even when only a single block exists.
-- Improve [HTML output for formatted text](https://github.com/WordPress/gutenberg/pull/14555).
-- Fix an [error preventing registerFormatType to be called](https://github.com/WordPress/gutenberg/pull/15072) wrongly indicated as duplicate.
-- Resolve problematic [post lock release behavior](https://github.com/WordPress/gutenberg/pull/14994) when leaving the editor when using newer versions of Chrome.
-- Resolve an issue to [detect autosave presence at editor load](https://github.com/WordPress/gutenberg/pull/7945) in considering saveability.
-- Resolve a typo which could interfere with [audio shortcode transforms](https://github.com/WordPress/gutenberg/pull/15118).
-- [Apply RichText attributes correctly](https://github.com/WordPress/gutenberg/pull/15070) to resolve an issue with registerFormatType.
-- [Preserve attributes](https://github.com/WordPress/gutenberg/pull/15128) of a multi-line classic block paragraph.
-- Resolve an issue for Windows and Linux development mode due to a [access key safeguard](https://github.com/WordPress/gutenberg/pull/15044).
-
-## Various
-
-- Refactor a number of core blocks toward better interoperability with the Blocks RFC: [[1]](https://github.com/WordPress/gutenberg/pull/14979), [[2]](https://github.com/WordPress/gutenberg/pull/14902), [[3]](https://github.com/WordPress/gutenberg/pull/14903), [[4]](https://github.com/WordPress/gutenberg/pull/14899).
-- [Move selection state](https://github.com/WordPress/gutenberg/pull/14640) for RichText components to the block editor store, to enable future work to resolve or improve selection behavior.
-- Change the behavior of reusable blocks autocomplete to [fetch upon input](https://github.com/WordPress/gutenberg/pull/14915), improving reliability of tests and avoiding unnecessary network requests.
-- Allow [development mode constant](https://github.com/WordPress/gutenberg/pull/14165) to be redefined by plugins.
-- Improve reliability of e2e tests: [[1]](https://github.com/WordPress/gutenberg/pull/13161), [[2]](https://github.com/WordPress/gutenberg/pull/15046), [[3]](https://github.com/WordPress/gutenberg/pull/15063).
-- Avoid running [files contained in the git subfolder](https://github.com/WordPress/gutenberg/pull/14997) as tests.
-- Resolve an [issue with e2e errors](https://github.com/WordPress/gutenberg/pull/14998) related to dependencies updates.
-- Add a new ESLint rule to [enforce accessible use of BaseControl](https://github.com/WordPress/gutenberg/pull/14151).
-- Remove [redundant CSS styles](https://github.com/WordPress/gutenberg/pull/14520).
-- Add e2e tests for [dynamic allowed blocks](https://github.com/WordPress/gutenberg/pull/14992), [transforms from media to embed block](https://github.com/WordPress/gutenberg/pull/13997), [explicit persistence undo regression](https://github.com/WordPress/gutenberg/pull/15049).
-- Add a new [`wpDataSelect` e2e test utility](https://github.com/WordPress/gutenberg/pull/15052).
-- Include a [React hooks ESLint configuration](https://github.com/WordPress/gutenberg/pull/14995).
-- Add a [new Webpack plugin](https://github.com/WordPress/gutenberg/pull/14869) to help externalize and extract script dependencies (not yet published).
-
-## Documentation
-
-- Include auto-generated documentation for [core data module actions and selectors](https://github.com/WordPress/gutenberg/pull/15200).
-- Update [contributing documentation](https://github.com/WordPress/gutenberg/pull/15187) to extract detailed sections to their own documents.
-- Document the [withGlobalEvents](https://github.com/WordPress/gutenberg/pull/15175) higher-order component creator.
-- Add [related resources](https://github.com/WordPress/gutenberg/pull/15194) for BlockEditor components.
-- Clarify [requirements for e2e-test-utils](https://github.com/WordPress/gutenberg/pull/15171) package.
-- [Exclude private, experimental, and unstable APIs](https://github.com/WordPress/gutenberg/pull/15188) from auto-generated data documentation.
-- Include [missing DropZone component props](https://github.com/WordPress/gutenberg/pull/15223) in documentation.
-- Mention [component stylesheets](https://github.com/WordPress/gutenberg/pull/15241) in usage instructions.
-- Update [copy/paste support list](https://github.com/WordPress/gutenberg/pull/15149) to reflect paste support of images from Microsoft Word and Libre/Open Office.
-- Add [missing "Code is Poetry" footers](https://github.com/WordPress/gutenberg/pull/15140).
-- Improve [wording of JavaScript Tutorial](https://github.com/WordPress/gutenberg/pull/14838) document.
-- Improve [Travis build performance](https://github.com/WordPress/gutenberg/pull/15228) by expanding containers for e2e tests.
-
-## Mobile
-
-- [Refine transitions](https://github.com/WordPress/gutenberg/pull/14831) for bottom sheets.
-- Extract a [HorizontalRule component](https://github.com/WordPress/gutenberg/pull/14361) for use in a cross-platform separator block.
-- Fix an [error with changing list types](https://github.com/WordPress/gutenberg/pull/15010).
-- [Avoid setting caret](https://github.com/WordPress/gutenberg/pull/15021) when rich-text text will be trimmed.
-- Fix [title not focusing](https://github.com/WordPress/gutenberg/pull/15069).
-- Improve [post title accessibility](https://github.com/WordPress/gutenberg/pull/15106).
-- Improve image block accessibility for [deselected](https://github.com/WordPress/gutenberg/pull/14713), and [selected](https://github.com/WordPress/gutenberg/pull/15122) states.
-- Add [accessibility label for unselected paragraph](https://github.com/WordPress/gutenberg/pull/15126).
-- Fix [history stack when not empty](https://github.com/WordPress/gutenberg/pull/15055) on a fresh start of the editor.
-- Improve [Heading block accessibility](https://github.com/WordPress/gutenberg/pull/15144).
-- Make [accessibility string properly localizable](https://github.com/WordPress/gutenberg/pull/15161).
-- [Update string concatenation](https://github.com/WordPress/gutenberg/pull/15181) for accessibility labels.
+## Changelog
+
+### Enhancements
+
+-   Improve [focus state for button block](https://github.com/WordPress/gutenberg/pull/15058).
+-   [Reduce specificity of block styles](https://github.com/WordPress/gutenberg/pull/14407) to make it easier for themes to style the editor.
+-   Optimize data subscribers to [avoid unnecessary work](https://github.com/WordPress/gutenberg/pull/15041) on each editor change.
+-   Avoid [overlapping block breadcrumb](https://github.com/WordPress/gutenberg/pull/15112) when block movers are visible for full- and wide-aligned blocks.
+-   Preload [user permissions for reusable blocks](https://github.com/WordPress/gutenberg/pull/15061) to avoid UI flickering for block settings menu options.
+-   Remove [unnecessary bottom padding](https://github.com/WordPress/gutenberg/pull/15158) for nested lists.
+-   Restore [block movers to focus mode](https://github.com/WordPress/gutenberg/pull/15109).
+-   Improve display of [categories list panel](https://github.com/WordPress/gutenberg/pull/15075).
+
+### Bug Fixes
+
+-   [Restore block movers](https://github.com/WordPress/gutenberg/pull/15022) to full- and wide-aligned blocks.
+-   Always show [drag handles](https://github.com/WordPress/gutenberg/pull/15025) for nested blocks, even when only a single block exists.
+-   Improve [HTML output for formatted text](https://github.com/WordPress/gutenberg/pull/14555).
+-   Fix an [error preventing registerFormatType to be called](https://github.com/WordPress/gutenberg/pull/15072) wrongly indicated as duplicate.
+-   Resolve problematic [post lock release behavior](https://github.com/WordPress/gutenberg/pull/14994) when leaving the editor when using newer versions of Chrome.
+-   Resolve an issue to [detect autosave presence at editor load](https://github.com/WordPress/gutenberg/pull/7945) in considering saveability.
+-   Resolve a typo which could interfere with [audio shortcode transforms](https://github.com/WordPress/gutenberg/pull/15118).
+-   [Apply RichText attributes correctly](https://github.com/WordPress/gutenberg/pull/15070) to resolve an issue with registerFormatType.
+-   [Preserve attributes](https://github.com/WordPress/gutenberg/pull/15128) of a multi-line classic block paragraph.
+-   Resolve an issue for Windows and Linux development mode due to a [access key safeguard](https://github.com/WordPress/gutenberg/pull/15044).
+
+### Various
+
+-   Refactor a number of core blocks toward better interoperability with the Blocks RFC: [[1]](https://github.com/WordPress/gutenberg/pull/14979), [[2]](https://github.com/WordPress/gutenberg/pull/14902), [[3]](https://github.com/WordPress/gutenberg/pull/14903), [[4]](https://github.com/WordPress/gutenberg/pull/14899).
+-   [Move selection state](https://github.com/WordPress/gutenberg/pull/14640) for RichText components to the block editor store, to enable future work to resolve or improve selection behavior.
+-   Change the behavior of reusable blocks autocomplete to [fetch upon input](https://github.com/WordPress/gutenberg/pull/14915), improving reliability of tests and avoiding unnecessary network requests.
+-   Allow [development mode constant](https://github.com/WordPress/gutenberg/pull/14165) to be redefined by plugins.
+-   Improve reliability of e2e tests: [[1]](https://github.com/WordPress/gutenberg/pull/13161), [[2]](https://github.com/WordPress/gutenberg/pull/15046), [[3]](https://github.com/WordPress/gutenberg/pull/15063).
+-   Avoid running [files contained in the git subfolder](https://github.com/WordPress/gutenberg/pull/14997) as tests.
+-   Resolve an [issue with e2e errors](https://github.com/WordPress/gutenberg/pull/14998) related to dependencies updates.
+-   Add a new ESLint rule to [enforce accessible use of BaseControl](https://github.com/WordPress/gutenberg/pull/14151).
+-   Remove [redundant CSS styles](https://github.com/WordPress/gutenberg/pull/14520).
+-   Add e2e tests for [dynamic allowed blocks](https://github.com/WordPress/gutenberg/pull/14992), [transforms from media to embed block](https://github.com/WordPress/gutenberg/pull/13997), [explicit persistence undo regression](https://github.com/WordPress/gutenberg/pull/15049).
+-   Add a new [`wpDataSelect` e2e test utility](https://github.com/WordPress/gutenberg/pull/15052).
+-   Include a [React hooks ESLint configuration](https://github.com/WordPress/gutenberg/pull/14995).
+-   Add a [new Webpack plugin](https://github.com/WordPress/gutenberg/pull/14869) to help externalize and extract script dependencies (not yet published).
+
+### Documentation
+
+-   Include auto-generated documentation for [core data module actions and selectors](https://github.com/WordPress/gutenberg/pull/15200).
+-   Update [contributing documentation](https://github.com/WordPress/gutenberg/pull/15187) to extract detailed sections to their own documents.
+-   Document the [withGlobalEvents](https://github.com/WordPress/gutenberg/pull/15175) higher-order component creator.
+-   Add [related resources](https://github.com/WordPress/gutenberg/pull/15194) for BlockEditor components.
+-   Clarify [requirements for e2e-test-utils](https://github.com/WordPress/gutenberg/pull/15171) package.
+-   [Exclude private, experimental, and unstable APIs](https://github.com/WordPress/gutenberg/pull/15188) from auto-generated data documentation.
+-   Include [missing DropZone component props](https://github.com/WordPress/gutenberg/pull/15223) in documentation.
+-   Mention [component stylesheets](https://github.com/WordPress/gutenberg/pull/15241) in usage instructions.
+-   Update [copy/paste support list](https://github.com/WordPress/gutenberg/pull/15149) to reflect paste support of images from Microsoft Word and Libre/Open Office.
+-   Add [missing "Code is Poetry" footers](https://github.com/WordPress/gutenberg/pull/15140).
+-   Improve [wording of JavaScript Tutorial](https://github.com/WordPress/gutenberg/pull/14838) document.
+-   Improve [Travis build performance](https://github.com/WordPress/gutenberg/pull/15228) by expanding containers for e2e tests.
+
+### Mobile
+
+-   [Refine transitions](https://github.com/WordPress/gutenberg/pull/14831) for bottom sheets.
+-   Extract a [HorizontalRule component](https://github.com/WordPress/gutenberg/pull/14361) for use in a cross-platform separator block.
+-   Fix an [error with changing list types](https://github.com/WordPress/gutenberg/pull/15010).
+-   [Avoid setting caret](https://github.com/WordPress/gutenberg/pull/15021) when rich-text text will be trimmed.
+-   Fix [title not focusing](https://github.com/WordPress/gutenberg/pull/15069).
+-   Improve [post title accessibility](https://github.com/WordPress/gutenberg/pull/15106).
+-   Improve image block accessibility for [deselected](https://github.com/WordPress/gutenberg/pull/14713), and [selected](https://github.com/WordPress/gutenberg/pull/15122) states.
+-   Add [accessibility label for unselected paragraph](https://github.com/WordPress/gutenberg/pull/15126).
+-   Fix [history stack when not empty](https://github.com/WordPress/gutenberg/pull/15055) on a fresh start of the editor.
+-   Improve [Heading block accessibility](https://github.com/WordPress/gutenberg/pull/15144).
+-   Make [accessibility string properly localizable](https://github.com/WordPress/gutenberg/pull/15161).
+-   [Update string concatenation](https://github.com/WordPress/gutenberg/pull/15181) for accessibility labels.
 
 = 5.5.0 =
 
-## Features
-
-- Add a new [Group](https://github.com/WordPress/gutenberg/pull/13964) [block](https://github.com/WordPress/gutenberg/pull/14920).
-- Add [vertical alignment](https://github.com/WordPress/gutenberg/pull/13989) support to the Media & Text block.
-- Add [the image fill option](https://github.com/WordPress/gutenberg/pull/14445) to the Media & Text block.
-
-## Enhancements
-
-- Improvements to the [Image Block](https://github.com/WordPress/gutenberg/pull/14142) [flows](https://github.com/WordPress/gutenberg/pull/14807).
-- Automatically [add `mailto:` to email addresses](https://github.com/WordPress/gutenberg/pull/14857) when linking.
-- Add [visual handles for side resizers](https://github.com/WordPress/gutenberg/pull/14543) for various blocks.
-- Improve the [performance of the](https://github.com/WordPress/gutenberg/pull/14664) [annotations](https://github.com/WordPress/gutenberg/pull/14808) by avoiding excessive memoization.
-- Announce the [color accessibility issues](https://github.com/WordPress/gutenberg/pull/14649) to screen readers.
-- Add [enum block attributes validation](https://github.com/WordPress/gutenberg/pull/14810) to browser block parser.
-- Use a [consistent grey background](https://github.com/WordPress/gutenberg/pull/14719) in the Shortcode block.
-- Improve accessibility of video block [select poster image](https://github.com/WordPress/gutenberg/pull/14752).
-- Respect [prefers-reduced-motion for fixed backgrounds](https://github.com/WordPress/gutenberg/pull/14848) in Cover block.
-- Prevent ArrowLeft key press in multi-line selection from [prematurely triggering multi-selection](https://github.com/WordPress/gutenberg/pull/14906).
-
-## Bug Fixes
-
-- Avoid keeping the [RichText value in cache](https://github.com/WordPress/gutenberg/pull/14750) indefinitely.
-- Fix the [post title input borders](https://github.com/WordPress/gutenberg/pull/14771) in the code editor.
-- Fix the [block restrictions](https://github.com/WordPress/gutenberg/pull/14003) to insert, replace or move blocks.
-- [Select gallery images](https://github.com/WordPress/gutenberg/pull/14813) on focus.
-- Fix [removing gallery images](https://github.com/WordPress/gutenberg/pull/14822) on delete/backspace key press.
-- Fix small visual regression in the [block autocompete popover](https://github.com/WordPress/gutenberg/pull/14772).
-- Fix the data module[ resolver resolution status](https://github.com/WordPress/gutenberg/pull/14711).
-- Avoid [saving metaboxes when previewing](https://github.com/WordPress/gutenberg/pull/14877) [changes](https://github.com/WordPress/gutenberg/pull/14894).
-- Fix [selecting the separator block](https://github.com/WordPress/gutenberg/pull/14854).
-- Fix displaying the [color palette](https://github.com/WordPress/gutenberg/pull/14693) [tooltips](https://github.com/WordPress/gutenberg/pull/14944) on hover.
-- Fix Firefox/NVDA bug not [announcing the toggle settings](https://github.com/WordPress/gutenberg/pull/14475) button.
-- Fix [arrow navigation in paragraph](https://github.com/WordPress/gutenberg/pull/14804) blocks with backgrounds.
-- Fix the [columns block click to select](https://github.com/WordPress/gutenberg/pull/14876).
-- Fix [post dirtiness](https://github.com/WordPress/gutenberg/pull/14916) after fetching reusable blocks.
-- Fix the hover and focus styles for [buttons with the isBusy](https://github.com/WordPress/gutenberg/pull/14469) prop.
-- Remove the box [shadow from the side inserter](https://github.com/WordPress/gutenberg/pull/14936) button.
-- Changing the [region navigation shortcuts](https://github.com/WordPress/gutenberg/pull/14681) to avoid conflicts.
-- Fix [space insertion in the Button block](https://github.com/WordPress/gutenberg/pull/14925) in Firefox.
-- Prevent the [link popover from animating constantly](https://github.com/WordPress/gutenberg/pull/14938) as we type. 
-- Fix the warning triggered by [clearing the height of the spacer block](https://github.com/WordPress/gutenberg/pull/14785).
-- Fix [undo behavior](https://github.com/WordPress/gutenberg/pull/14955) after fresh post loading.
-
-## Documentation
-
-- Add design documentation to the [Modal component](https://github.com/WordPress/gutenberg/pull/14757).
-- Clarify the [CSS naming coding guidelines](https://github.com/WordPress/gutenberg/pull/14556).
-- Add [InspectorControls usage example](https://github.com/WordPress/gutenberg/pull/11736).
-- Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/14736), [2](https://github.com/WordPress/gutenberg/pull/14737), [3](https://github.com/WordPress/gutenberg/pull/14762), [4](https://github.com/WordPress/gutenberg/pull/14741), [5](https://github.com/WordPress/gutenberg/pull/14756), [6](https://github.com/WordPress/gutenberg/pull/14778), [7](https://github.com/WordPress/gutenberg/pull/14827), [8](https://github.com/WordPress/gutenberg/pull/14895), [9](https://github.com/WordPress/gutenberg/pull/14909), [10](https://github.com/WordPress/gutenberg/pull/14917), [11](https://github.com/WordPress/gutenberg/pull/14940), [12](https://github.com/WordPress/gutenberg/pull/14941), [13](https://github.com/WordPress/gutenberg/pull/14964).
-
-## Various
-
-- Bootstrap the design of the [new widgets screen](https://github.com/WordPress/gutenberg/pull/14612) (non functional yet).
-- Reorganization of the block-library code base:
-    - Use a babel plugin to [load block.json files](https://github.com/WordPress/gutenberg/pull/14551).
-    - Introduce [block.json metadata](https://github.com/WordPress/gutenberg/pull/14770) [for](https://github.com/WordPress/gutenberg/pull/14863) all client side blocks.
-    - Move [the edit functions and the icons](https://github.com/WordPress/gutenberg/pull/14743) to separate files.
-    - Move the [transforms and save functions](https://github.com/WordPress/gutenberg/pull/14882) to separate files.
-- Add [forwardRef support to the PlainText](https://github.com/WordPress/gutenberg/pull/14866) component.
-- Support [Button Block Appender](https://github.com/WordPress/gutenberg/pull/14241) in the InnerBlocks component.
-- [Unset the focal point attributes](https://github.com/WordPress/gutenberg/pull/14746) from the Cover block if not needed.
-- [Consistently return promises](https://github.com/WordPress/gutenberg/pull/14830) from the data module action calls.
-- Remove obsolete [CSS currentColor](https://github.com/WordPress/gutenberg/pull/14119) usage.
-- Improve the [e2e test CLI arguments](https://github.com/WordPress/gutenberg/pull/14717) and docs.
-- Improve the [e2e test login stability](https://github.com/WordPress/gutenberg/pull/14243) on MacOS.
-- Remove [is-plain-obj package](https://github.com/WordPress/gutenberg/pull/14751) dependency.
-- Remove invalid urls and ids from [media test](https://github.com/WordPress/gutenberg/pull/14625/files) [fixtures](https://github.com/WordPress/gutenberg/pull/14790).
-- Remove the [deprecated Gutenberg plugin functions](https://github.com/WordPress/gutenberg/pull/14806) slated for 5.4 and 5.5.
-- remove or rename [undocumented RichText package functions](https://github.com/WordPress/gutenberg/pull/14239) and constants.
-- Adjust [paragraph block spacing](https://github.com/WordPress/gutenberg/pull/14679) to use standardised variables.
-- Allow [spaces in file paths](https://github.com/WordPress/gutenberg/pull/14789) for package build process. 
-- Update pre-commit to [check modified files only](https://github.com/WordPress/gutenberg/pull/14971).
-- Improve the [performance of the webpack build](https://github.com/WordPress/gutenberg/pull/14860) configuration.
-- [Update dependencies](https://github.com/WordPress/gutenberg/pull/14978) with known vulnerabilities.
-- Fix [typo in variable names](https://github.com/WordPress/gutenberg/pull/14970).
-
-## Mobile
-
-- [Accessibility improvements to the Button](https://github.com/WordPress/gutenberg/pull/14697) component.
-- Enhance the [unsupported block type](https://github.com/WordPress/gutenberg/pull/14577). 
-- Fix [image upload progress](https://github.com/WordPress/gutenberg/pull/14799) not being displayed consistently.
-- Support [copy/pasting images](https://github.com/WordPress/gutenberg/pull/14802).
-- Add [the](https://github.com/WordPress/gutenberg/pull/14865) [list block](https://github.com/WordPress/gutenberg/pull/14636).
-- Visual [refinements for the native nextpage](https://github.com/WordPress/gutenberg/pull/14826) block.
-- Fix [importing the column](https://github.com/WordPress/gutenberg/pull/14880) block.
-- Remove DOM logic from the [list block toolbar](https://github.com/WordPress/gutenberg/pull/14840).
-- Put the caret at the end of the text field after [merging blocks](https://github.com/WordPress/gutenberg/pull/14820).
-- Fix caret position [after](https://github.com/WordPress/gutenberg/pull/14957) [inline paste](https://github.com/WordPress/gutenberg/pull/14893).
+## Changelog
+
+### Features
+
+-   Add a new [Group](https://github.com/WordPress/gutenberg/pull/13964) [block](https://github.com/WordPress/gutenberg/pull/14920).
+-   Add [vertical alignment](https://github.com/WordPress/gutenberg/pull/13989) support to the Media & Text block.
+-   Add [the image fill option](https://github.com/WordPress/gutenberg/pull/14445) to the Media & Text block.
+
+### Enhancements
+
+-   Improvements to the [Image Block](https://github.com/WordPress/gutenberg/pull/14142) [flows](https://github.com/WordPress/gutenberg/pull/14807).
+-   Automatically [add `mailto:` to email addresses](https://github.com/WordPress/gutenberg/pull/14857) when linking.
+-   Add [visual handles for side resizers](https://github.com/WordPress/gutenberg/pull/14543) for various blocks.
+-   Improve the [performance of the](https://github.com/WordPress/gutenberg/pull/14664) [annotations](https://github.com/WordPress/gutenberg/pull/14808) by avoiding excessive memoization.
+-   Announce the [color accessibility issues](https://github.com/WordPress/gutenberg/pull/14649) to screen readers.
+-   Add [enum block attributes validation](https://github.com/WordPress/gutenberg/pull/14810) to browser block parser.
+-   Use a [consistent grey background](https://github.com/WordPress/gutenberg/pull/14719) in the Shortcode block.
+-   Improve accessibility of video block [select poster image](https://github.com/WordPress/gutenberg/pull/14752).
+-   Respect [prefers-reduced-motion for fixed backgrounds](https://github.com/WordPress/gutenberg/pull/14848) in Cover block.
+-   Prevent ArrowLeft key press in multi-line selection from [prematurely triggering multi-selection](https://github.com/WordPress/gutenberg/pull/14906).
+
+### Bug Fixes
+
+-   Avoid keeping the [RichText value in cache](https://github.com/WordPress/gutenberg/pull/14750) indefinitely.
+-   Fix the [post title input borders](https://github.com/WordPress/gutenberg/pull/14771) in the code editor.
+-   Fix the [block restrictions](https://github.com/WordPress/gutenberg/pull/14003) to insert, replace or move blocks.
+-   [Select gallery images](https://github.com/WordPress/gutenberg/pull/14813) on focus.
+-   Fix [removing gallery images](https://github.com/WordPress/gutenberg/pull/14822) on delete/backspace key press.
+-   Fix small visual regression in the [block autocompete popover](https://github.com/WordPress/gutenberg/pull/14772).
+-   Fix the data module[ resolver resolution status](https://github.com/WordPress/gutenberg/pull/14711).
+-   Avoid [saving metaboxes when previewing](https://github.com/WordPress/gutenberg/pull/14877) [changes](https://github.com/WordPress/gutenberg/pull/14894).
+-   Fix [selecting the separator block](https://github.com/WordPress/gutenberg/pull/14854).
+-   Fix displaying the [color palette](https://github.com/WordPress/gutenberg/pull/14693) [tooltips](https://github.com/WordPress/gutenberg/pull/14944) on hover.
+-   Fix Firefox/NVDA bug not [announcing the toggle settings](https://github.com/WordPress/gutenberg/pull/14475) button.
+-   Fix [arrow navigation in paragraph](https://github.com/WordPress/gutenberg/pull/14804) blocks with backgrounds.
+-   Fix the [columns block click to select](https://github.com/WordPress/gutenberg/pull/14876).
+-   Fix [post dirtiness](https://github.com/WordPress/gutenberg/pull/14916) after fetching reusable blocks.
+-   Fix the hover and focus styles for [buttons with the isBusy](https://github.com/WordPress/gutenberg/pull/14469) prop.
+-   Remove the box [shadow from the side inserter](https://github.com/WordPress/gutenberg/pull/14936) button.
+-   Changing the [region navigation shortcuts](https://github.com/WordPress/gutenberg/pull/14681) to avoid conflicts.
+-   Fix [space insertion in the Button block](https://github.com/WordPress/gutenberg/pull/14925) in Firefox.
+-   Prevent the [link popover from animating constantly](https://github.com/WordPress/gutenberg/pull/14938) as we type.
+-   Fix the warning triggered by [clearing the height of the spacer block](https://github.com/WordPress/gutenberg/pull/14785).
+-   Fix [undo behavior](https://github.com/WordPress/gutenberg/pull/14955) after fresh post loading.
+
+### Documentation
+
+-   Add design documentation to the [Modal component](https://github.com/WordPress/gutenberg/pull/14757).
+-   Clarify the [CSS naming coding guidelines](https://github.com/WordPress/gutenberg/pull/14556).
+-   Add [InspectorControls usage example](https://github.com/WordPress/gutenberg/pull/11736).
+-   Tweaks and typos: [1](https://github.com/WordPress/gutenberg/pull/14736), [2](https://github.com/WordPress/gutenberg/pull/14737), [3](https://github.com/WordPress/gutenberg/pull/14762), [4](https://github.com/WordPress/gutenberg/pull/14741), [5](https://github.com/WordPress/gutenberg/pull/14756), [6](https://github.com/WordPress/gutenberg/pull/14778), [7](https://github.com/WordPress/gutenberg/pull/14827), [8](https://github.com/WordPress/gutenberg/pull/14895), [9](https://github.com/WordPress/gutenberg/pull/14909), [10](https://github.com/WordPress/gutenberg/pull/14917), [11](https://github.com/WordPress/gutenberg/pull/14940), [12](https://github.com/WordPress/gutenberg/pull/14941), [13](https://github.com/WordPress/gutenberg/pull/14964).
+
+### Various
+
+-   Bootstrap the design of the [new widgets screen](https://github.com/WordPress/gutenberg/pull/14612) (non functional yet).
+-   Reorganization of the block-library code base:
+    -   Use a babel plugin to [load block.json files](https://github.com/WordPress/gutenberg/pull/14551).
+    -   Introduce [block.json metadata](https://github.com/WordPress/gutenberg/pull/14770) [for](https://github.com/WordPress/gutenberg/pull/14863) all client side blocks.
+    -   Move [the edit functions and the icons](https://github.com/WordPress/gutenberg/pull/14743) to separate files.
+    -   Move the [transforms and save functions](https://github.com/WordPress/gutenberg/pull/14882) to separate files.
+-   Add [forwardRef support to the PlainText](https://github.com/WordPress/gutenberg/pull/14866) component.
+-   Support [Button Block Appender](https://github.com/WordPress/gutenberg/pull/14241) in the InnerBlocks component.
+-   [Unset the focal point attributes](https://github.com/WordPress/gutenberg/pull/14746) from the Cover block if not needed.
+-   [Consistently return promises](https://github.com/WordPress/gutenberg/pull/14830) from the data module action calls.
+-   Remove obsolete [CSS currentColor](https://github.com/WordPress/gutenberg/pull/14119) usage.
+-   Improve the [e2e test CLI arguments](https://github.com/WordPress/gutenberg/pull/14717) and docs.
+-   Improve the [e2e test login stability](https://github.com/WordPress/gutenberg/pull/14243) on MacOS.
+-   Remove [is-plain-obj package](https://github.com/WordPress/gutenberg/pull/14751) dependency.
+-   Remove invalid urls and ids from [media test](https://github.com/WordPress/gutenberg/pull/14625/files) [fixtures](https://github.com/WordPress/gutenberg/pull/14790).
+-   Remove the [deprecated Gutenberg plugin functions](https://github.com/WordPress/gutenberg/pull/14806) slated for 5.4 and 5.5.
+-   remove or rename [undocumented RichText package functions](https://github.com/WordPress/gutenberg/pull/14239) and constants.
+-   Adjust [paragraph block spacing](https://github.com/WordPress/gutenberg/pull/14679) to use standardised variables.
+-   Allow [spaces in file paths](https://github.com/WordPress/gutenberg/pull/14789) for package build process.
+-   Update pre-commit to [check modified files only](https://github.com/WordPress/gutenberg/pull/14971).
+-   Improve the [performance of the webpack build](https://github.com/WordPress/gutenberg/pull/14860) configuration.
+-   [Update dependencies](https://github.com/WordPress/gutenberg/pull/14978) with known vulnerabilities.
+-   Fix [typo in variable names](https://github.com/WordPress/gutenberg/pull/14970).
+
+### Mobile
+
+-   [Accessibility improvements to the Button](https://github.com/WordPress/gutenberg/pull/14697) component.
+-   Enhance the [unsupported block type](https://github.com/WordPress/gutenberg/pull/14577).
+-   Fix [image upload progress](https://github.com/WordPress/gutenberg/pull/14799) not being displayed consistently.
+-   Support [copy/pasting images](https://github.com/WordPress/gutenberg/pull/14802).
+-   Add [the](https://github.com/WordPress/gutenberg/pull/14865) [list block](https://github.com/WordPress/gutenberg/pull/14636).
+-   Visual [refinements for the native nextpage](https://github.com/WordPress/gutenberg/pull/14826) block.
+-   Fix [importing the column](https://github.com/WordPress/gutenberg/pull/14880) block.
+-   Remove DOM logic from the [list block toolbar](https://github.com/WordPress/gutenberg/pull/14840).
+-   Put the caret at the end of the text field after [merging blocks](https://github.com/WordPress/gutenberg/pull/14820).
+-   Fix caret position [after](https://github.com/WordPress/gutenberg/pull/14957) [inline paste](https://github.com/WordPress/gutenberg/pull/14893).
 
 = 5.4.0 =
 
+## Changelog
+
 ### Features
 
-- Add [vertical alignment support for the columns](https://github.com/WordPress/gutenberg/pull/13899) [block](https://github.com/WordPress/gutenberg/pull/14614).
-- Add [playsinline support](https://github.com/WordPress/gutenberg/pull/14500) for the video block.
+-   Add [vertical alignment support for the columns](https://github.com/WordPress/gutenberg/pull/13899) [block](https://github.com/WordPress/gutenberg/pull/14614).
+-   Add [playsinline support](https://github.com/WordPress/gutenberg/pull/14500) for the video block.
 
 ### Enhancements
 
-- Add the [Media Library button](https://github.com/WordPress/gutenberg/issues/8309) to the gallery block appender.
-- Improve appearance of the block [hover state on colored backgrounds](https://github.com/WordPress/gutenberg/pull/14501).
-- Move the [color and font size caption styles](https://github.com/WordPress/gutenberg/pull/14366) into theme styles.
-- Replace the [verse block icon](https://github.com/WordPress/gutenberg/pull/14622).
-- Standardize [align and className attributes](https://github.com/WordPress/gutenberg/pull/14533) for dynamic blocks.
-- Remove the [title from mobile inserters](https://github.com/WordPress/gutenberg/pull/14493).
-- Capitalize [button labels](https://github.com/WordPress/gutenberg/pull/14591).
-- [Remove menu toggling](https://github.com/WordPress/gutenberg/pull/14456) on checkbox, radio buttons clicks.
-- Make the [invisible image resize handlers](https://github.com/WordPress/gutenberg/pull/14481) bigger.
-- Improve the [alt text field description](https://github.com/WordPress/gutenberg/pull/14668).
-
-### Bug Fixes
-
-- Improve the [format boundary styles](https://github.com/WordPress/gutenberg/pull/14519).
-- [Convert void blocks properly](https://github.com/WordPress/gutenberg/pull/14536) when converting or pasting content.
-- Fix the [ClipboardButton](https://github.com/WordPress/gutenberg/pull/7106) component behavior in Safari.
-- Fix [expanding the text selection](https://github.com/WordPress/gutenberg/pull/14487) when using shift + vertical arrows.
-- Fix the alignment of the [third-party block settings items](https://github.com/WordPress/gutenberg/pull/14569).
-- Fix [invalid HTML](https://github.com/WordPress/gutenberg/pull/14423) [in](https://github.com/WordPress/gutenberg/pull/14599) some more menu items.
-- Fix [JavaScript error in the columns](https://github.com/WordPress/gutenberg/pull/14605) block.
-- Fix [radio button](https://github.com/WordPress/gutenberg/pull/14624) [appearance](https://github.com/WordPress/gutenberg/pull/14684) on small screens.
-- Save [line breaks in the preformatted](https://github.com/WordPress/gutenberg/pull/14653) block.
-- Fix edge case in the [is_gutenberg_page](https://github.com/WordPress/gutenberg/pull/14558) plugin function.
-- Fix [toolbar position](https://github.com/WordPress/gutenberg/pull/14669) in full size aligned blocks on small screens.
-- Fix [double scrollbar issue](https://github.com/WordPress/gutenberg/pull/14677) in Full Screen mode.
-- Fix JavaScript error when [downgrading to an old Gutenberg version](https://github.com/WordPress/gutenberg/pull/14691).
-- Fix the [WordPress embed block](https://github.com/WordPress/gutenberg/pull/14658) resolution.
-- Fix embedding [links with trailing slashes](https://github.com/WordPress/gutenberg/pull/14705).
-- Fix the [preloading apiFetch middleware](https://github.com/WordPress/gutenberg/pull/14714) when initialized empty.
-- Fix php notice when using [widgets without](https://github.com/WordPress/gutenberg/pull/14587) [description](https://github.com/WordPress/gutenberg/pull/14615).
-- Better [horizontal edge detection](https://github.com/WordPress/gutenberg/pull/14462) to fix the arrow key navigation in the table block.
-- Fix error in [API Fetch initialization](https://github.com/WordPress/gutenberg/pull/14714).
-- Fix [unwanted margin](https://github.com/WordPress/gutenberg/pull/14614) in Column block.
-- Fixes [issue where emoji would be destroyed](https://github.com/WordPress/gutenberg/pull/14411).
+-   Add the [Media Library button](https://github.com/WordPress/gutenberg/issues/8309) to the gallery block appender.
+-   Improve appearance of the block [hover state on colored backgrounds](https://github.com/WordPress/gutenberg/pull/14501).
+-   Move the [color and font size caption styles](https://github.com/WordPress/gutenberg/pull/14366) into theme styles.
+-   Replace the [verse block icon](https://github.com/WordPress/gutenberg/pull/14622).
+-   Standardize [align and className attributes](https://github.com/WordPress/gutenberg/pull/14533) for dynamic blocks.
+-   Remove the [title from mobile inserters](https://github.com/WordPress/gutenberg/pull/14493).
+-   Capitalize [button labels](https://github.com/WordPress/gutenberg/pull/14591).
+-   [Remove menu toggling](https://github.com/WordPress/gutenberg/pull/14456) on checkbox, radio buttons clicks.
+-   Make the [invisible image resize handlers](https://github.com/WordPress/gutenberg/pull/14481) bigger.
+-   Improve the [alt text field description](https://github.com/WordPress/gutenberg/pull/14668).
+
+### Bug Fixes
+
+-   Improve the [format boundary styles](https://github.com/WordPress/gutenberg/pull/14519).
+-   [Convert void blocks properly](https://github.com/WordPress/gutenberg/pull/14536) when converting or pasting content.
+-   Fix the [ClipboardButton](https://github.com/WordPress/gutenberg/pull/7106) component behavior in Safari.
+-   Fix [expanding the text selection](https://github.com/WordPress/gutenberg/pull/14487) when using shift + vertical arrows.
+-   Fix the alignment of the [third-party block settings items](https://github.com/WordPress/gutenberg/pull/14569).
+-   Fix [invalid HTML](https://github.com/WordPress/gutenberg/pull/14423) [in](https://github.com/WordPress/gutenberg/pull/14599) some more menu items.
+-   Fix [JavaScript error in the columns](https://github.com/WordPress/gutenberg/pull/14605) block.
+-   Fix [radio button](https://github.com/WordPress/gutenberg/pull/14624) [appearance](https://github.com/WordPress/gutenberg/pull/14684) on small screens.
+-   Save [line breaks in the preformatted](https://github.com/WordPress/gutenberg/pull/14653) block.
+-   Fix edge case in the [is_gutenberg_page](https://github.com/WordPress/gutenberg/pull/14558) plugin function.
+-   Fix [toolbar position](https://github.com/WordPress/gutenberg/pull/14669) in full size aligned blocks on small screens.
+-   Fix [double scrollbar issue](https://github.com/WordPress/gutenberg/pull/14677) in Full Screen mode.
+-   Fix JavaScript error when [downgrading to an old Gutenberg version](https://github.com/WordPress/gutenberg/pull/14691).
+-   Fix the [WordPress embed block](https://github.com/WordPress/gutenberg/pull/14658) resolution.
+-   Fix embedding [links with trailing slashes](https://github.com/WordPress/gutenberg/pull/14705).
+-   Fix the [preloading apiFetch middleware](https://github.com/WordPress/gutenberg/pull/14714) when initialized empty.
+-   Fix php notice when using [widgets without](https://github.com/WordPress/gutenberg/pull/14587) [description](https://github.com/WordPress/gutenberg/pull/14615).
+-   Better [horizontal edge detection](https://github.com/WordPress/gutenberg/pull/14462) to fix the arrow key navigation in the table block.
+-   Fix error in [API Fetch initialization](https://github.com/WordPress/gutenberg/pull/14714).
+-   Fix [unwanted margin](https://github.com/WordPress/gutenberg/pull/14614) in Column block.
+-   Fixes [issue where emoji would be destroyed](https://github.com/WordPress/gutenberg/pull/14411).
 
 ### Documentation
 
-- Document the [block editor module](https://github.com/WordPress/gutenberg/pull/14566).
-- Add design documentation for the [Panel](https://github.com/WordPress/gutenberg/pull/14504) component.
-- Document [webpack config extensibility](https://github.com/WordPress/gutenberg/pull/14590).
-- Clarify [experimental and unstable API](https://github.com/WordPress/gutenberg/pull/14557) guidelines.
-- Setup automatic [API documentation for the data](https://github.com/WordPress/gutenberg/pull/14277) module.
-- Improve the [automatic](https://github.com/WordPress/gutenberg/pull/14549) [API](https://github.com/WordPress/gutenberg/pull/14656) documentation tool.
-- Enhance the components documentation:
-  - [FormFileUpload](https://github.com/WordPress/gutenberg/pull/14661) component.
-  - [MediaPlaceholder](https://github.com/WordPress/gutenberg/pull/14645) component.
-  - [Notice](https://github.com/WordPress/gutenberg/pull/14514) component.
-  - [TextControl](https://github.com/WordPress/gutenberg/pull/14710) component.
-- Updates the [blocks creation tutorial](https://github.com/WordPress/gutenberg/pull/14584).
-- Typos & tweaks: [1](https://github.com/WordPress/gutenberg/pull/14490), [2](https://github.com/WordPress/gutenberg/pull/14516), [3](https://github.com/WordPress/gutenberg/pull/14530), [4](https://github.com/WordPress/gutenberg/pull/14565), [5](https://github.com/WordPress/gutenberg/pull/14597), [6](https://github.com/WordPress/gutenberg/pull/14368), [7](https://github.com/WordPress/gutenberg/pull/14666), [8](https://github.com/WordPress/gutenberg/pull/14686), [9](https://github.com/WordPress/gutenberg/pull/14690).
+-   Document the [block editor module](https://github.com/WordPress/gutenberg/pull/14566).
+-   Add design documentation for the [Panel](https://github.com/WordPress/gutenberg/pull/14504) component.
+-   Document [webpack config extensibility](https://github.com/WordPress/gutenberg/pull/14590).
+-   Clarify [experimental and unstable API](https://github.com/WordPress/gutenberg/pull/14557) guidelines.
+-   Setup automatic [API documentation for the data](https://github.com/WordPress/gutenberg/pull/14277) module.
+-   Improve the [automatic](https://github.com/WordPress/gutenberg/pull/14549) [API](https://github.com/WordPress/gutenberg/pull/14656) documentation tool.
+-   Enhance the components documentation:
+    -   [FormFileUpload](https://github.com/WordPress/gutenberg/pull/14661) component.
+    -   [MediaPlaceholder](https://github.com/WordPress/gutenberg/pull/14645) component.
+    -   [Notice](https://github.com/WordPress/gutenberg/pull/14514) component.
+    -   [TextControl](https://github.com/WordPress/gutenberg/pull/14710) component.
+-   Updates the [blocks creation tutorial](https://github.com/WordPress/gutenberg/pull/14584).
+-   Typos & tweaks: [1](https://github.com/WordPress/gutenberg/pull/14490), [2](https://github.com/WordPress/gutenberg/pull/14516), [3](https://github.com/WordPress/gutenberg/pull/14530), [4](https://github.com/WordPress/gutenberg/pull/14565), [5](https://github.com/WordPress/gutenberg/pull/14597), [6](https://github.com/WordPress/gutenberg/pull/14368), [7](https://github.com/WordPress/gutenberg/pull/14666), [8](https://github.com/WordPress/gutenberg/pull/14686), [9](https://github.com/WordPress/gutenberg/pull/14690).
 
 ### Various
 
-- Implement a built-in static [Gutenberg Playground](https://github.com/WordPress/gutenberg/pull/14497).
-- [Override core block server-side code](https://github.com/WordPress/gutenberg/pull/13521) when using the plugin.
-- Make the [block](https://github.com/WordPress/gutenberg/pull/14527) [editor](https://github.com/WordPress/gutenberg/pull/14387) [module](https://github.com/WordPress/gutenberg/pull/14548) [more](https://github.com/WordPress/gutenberg/pull/14678) reusable.
-- Expose the [lazy and Suspence](https://github.com/WordPress/gutenberg/pull/14412) React features in the element package.
-- Avoid assuming persisted [preferences state shape](https://github.com/WordPress/gutenberg/pull/14692).
-- Remove dead code from the [calendar block renderer](https://github.com/WordPress/gutenberg/pull/14546).
-- Extract [global CSS resets](https://github.com/WordPress/gutenberg/pull/14509) [into](https://github.com/WordPress/gutenberg/pull/14572) reusable mixins.
-- Replace [image urls by base 64 encoded images](https://github.com/WordPress/gutenberg/pull/14544) in reusable CSS files.
-- Add default empty implementation for the [block types save](https://github.com/WordPress/gutenberg/pull/14510) [function](https://github.com/WordPress/gutenberg/pull/14529).
-- Add a new data action to [replace the inner blocks](https://github.com/WordPress/gutenberg/pull/14291).
-- Support [parent data registry inheritance](https://github.com/WordPress/gutenberg/pull/14369) in the data module.
-- Add [extra props support for the Dashicon](https://github.com/WordPress/gutenberg/pull/14631) component.
-- Add a [BaseControl.VisualLabel](https://github.com/WordPress/gutenberg/pull/14179) component for purely visual labels.
-- Refactor [setupEditor effects to actions](https://github.com/WordPress/gutenberg/pull/14513).
-- Refactor the [core/data store](https://github.com/WordPress/gutenberg/pull/14634) to be independent from the registry object.
-- Remove [componentWillMount](https://github.com/WordPress/gutenberg/pull/14637) usage from LatestPostEdit component.
-- Add a generic [e2e test for block transforms](https://github.com/WordPress/gutenberg/pull/12336) and work on its [stability](https://github.com/WordPress/gutenberg/pull/14632).
-- Allow e2e test failures for [php versions lower than 5.6](https://github.com/WordPress/gutenberg/pull/14541).
-- Add eslint rule to prevent [incorrect truthy length property](https://github.com/WordPress/gutenberg/pull/14579/) checks.
-- Add eslint rule to [prevent unsafe setTimeout usage](https://github.com/WordPress/gutenberg/pull/14650) in components.
-- Run the local gutenberg environment in [debug mode](https://github.com/WordPress/gutenberg/pull/14371).
-- Disable [debug mode in local e2e tests](https://github.com/WordPress/gutenberg/pull/14638).
-- [Exclude test files](https://github.com/WordPress/gutenberg/pull/14468) while rebuilding packages.
-- [Make E2E tests resilient](https://github.com/WordPress/gutenberg/pull/14632) against transforms added by plugins.
-- Add [LGPL](https://github.com/WordPress/gutenberg/pull/14734) as an OSS license.
+-   Implement a built-in static [Gutenberg Playground](https://github.com/WordPress/gutenberg/pull/14497).
+-   [Override core block server-side code](https://github.com/WordPress/gutenberg/pull/13521) when using the plugin.
+-   Make the [block](https://github.com/WordPress/gutenberg/pull/14527) [editor](https://github.com/WordPress/gutenberg/pull/14387) [module](https://github.com/WordPress/gutenberg/pull/14548) [more](https://github.com/WordPress/gutenberg/pull/14678) reusable.
+-   Expose the [lazy and Suspence](https://github.com/WordPress/gutenberg/pull/14412) React features in the element package.
+-   Avoid assuming persisted [preferences state shape](https://github.com/WordPress/gutenberg/pull/14692).
+-   Remove dead code from the [calendar block renderer](https://github.com/WordPress/gutenberg/pull/14546).
+-   Extract [global CSS resets](https://github.com/WordPress/gutenberg/pull/14509) [into](https://github.com/WordPress/gutenberg/pull/14572) reusable mixins.
+-   Replace [image urls by base 64 encoded images](https://github.com/WordPress/gutenberg/pull/14544) in reusable CSS files.
+-   Add default empty implementation for the [block types save](https://github.com/WordPress/gutenberg/pull/14510) [function](https://github.com/WordPress/gutenberg/pull/14529).
+-   Add a new data action to [replace the inner blocks](https://github.com/WordPress/gutenberg/pull/14291).
+-   Support [parent data registry inheritance](https://github.com/WordPress/gutenberg/pull/14369) in the data module.
+-   Add [extra props support for the Dashicon](https://github.com/WordPress/gutenberg/pull/14631) component.
+-   Add a [BaseControl.VisualLabel](https://github.com/WordPress/gutenberg/pull/14179) component for purely visual labels.
+-   Refactor [setupEditor effects to actions](https://github.com/WordPress/gutenberg/pull/14513).
+-   Refactor the [core/data store](https://github.com/WordPress/gutenberg/pull/14634) to be independent from the registry object.
+-   Remove [componentWillMount](https://github.com/WordPress/gutenberg/pull/14637) usage from LatestPostEdit component.
+-   Add a generic [e2e test for block transforms](https://github.com/WordPress/gutenberg/pull/12336) and work on its [stability](https://github.com/WordPress/gutenberg/pull/14632).
+-   Allow e2e test failures for [php versions lower than 5.6](https://github.com/WordPress/gutenberg/pull/14541).
+-   Add eslint rule to prevent [incorrect truthy length property](https://github.com/WordPress/gutenberg/pull/14579/) checks.
+-   Add eslint rule to [prevent unsafe setTimeout usage](https://github.com/WordPress/gutenberg/pull/14650) in components.
+-   Run the local gutenberg environment in [debug mode](https://github.com/WordPress/gutenberg/pull/14371).
+-   Disable [debug mode in local e2e tests](https://github.com/WordPress/gutenberg/pull/14638).
+-   [Exclude test files](https://github.com/WordPress/gutenberg/pull/14468) while rebuilding packages.
+-   [Make E2E tests resilient](https://github.com/WordPress/gutenberg/pull/14632) against transforms added by plugins.
+-   Add [LGPL](https://github.com/WordPress/gutenberg/pull/14734) as an OSS license.
 
 = 5.3.0 =
 
+## Changelog
+
 ### Features
 
- - Add the [block management modal](https://github.com/WordPress/gutenberg/pull/14224): Ability to hide/show blocks in the inserter.
- - Support [nested blocks for the Cover Block](https://github.com/WordPress/gutenberg/pull/13822).
- - Add an experimental [Legacy Widget Block](https://github.com/WordPress/gutenberg/pull/13511) (enabled only in the plugin for the moment).
+-   Add the [block management modal](https://github.com/WordPress/gutenberg/pull/14224): Ability to hide/show blocks in the inserter.
+-   Support [nested blocks for the Cover Block](https://github.com/WordPress/gutenberg/pull/13822).
+-   Add an experimental [Legacy Widget Block](https://github.com/WordPress/gutenberg/pull/13511) (enabled only in the plugin for the moment).
 
 ### Enhancements
 
- - Update the [block outlines](https://github.com/WordPress/gutenberg/pull/14145) for the hover and selected states.
- - Allow [undoing automatic pattern block transformations](https://github.com/WordPress/gutenberg/pull/13917).
- - Add a [RichText collapsed format toolbar](https://github.com/WordPress/gutenberg/pull/14233) for code, inline image and strikethrough formats.
- - Allow [collapsing inserter panels](https://github.com/WordPress/gutenberg/pull/13884) when searching.
- - Add ability to transform [video shortcodes to video blocks](https://github.com/WordPress/gutenberg/pull/14042).
- - Add ability to transform [audio shortcodes to audio blocks](https://github.com/WordPress/gutenberg/pull/14045).
- - Add new @wordpress/data actions to [invalidate the resolvers cache](https://github.com/WordPress/gutenberg/pull/14225).
- - Support [custom classNames in the ToggleControl](https://github.com/WordPress/gutenberg/pull/13804) component.
- - Clarify the [button to exit the post lock](https://github.com/WordPress/gutenberg/pull/14347) modal.
- - Improve the [block validation error message](https://github.com/WordPress/gutenberg/pull/13499).
- - [Automatically use the WordPress](https://github.com/WordPress/gutenberg/pull/13877)  [babel config](https://github.com/WordPress/gutenberg/pull/14168) when using @wordpress/scripts CLI.
- - Add keyboard [shortcuts to indent/outdent](https://github.com/WordPress/gutenberg/pull/14343) list items.
- - Use [links instead of buttons](https://github.com/WordPress/gutenberg/pull/10815) in the document outline.
- - Use [`<s>` for strikethrough](https://github.com/WordPress/gutenberg/pull/14389), [not `<del>`](https://github.com/WordPress/gutenberg/pull/14430).
- - Center the [tooltips content](https://github.com/WordPress/gutenberg/pull/14473).
- - Update wording of the [block switcher tooltip](https://github.com/WordPress/gutenberg/pull/14470).
- - Add [support for the reduced motion](https://github.com/WordPress/gutenberg/pull/14021) browser mode.
-
-### Bug Fixes
-
- - Always show the [current month in the Calendar](https://github.com/WordPress/gutenberg/pull/13873) block for All CPTs but post.
- - In the Latest posts block, [avoid full line clickable titles](https://github.com/WordPress/gutenberg/pull/14109).
- - Avoid relying on DOM nodes to add the [empty line in RichText](https://github.com/WordPress/gutenberg/pull/13850)  [component](https://github.com/WordPress/gutenberg/pull/14315). This fixes a number of lingering empty lines.
- - Fix the [MediaPlaceholder icon color](https://github.com/WordPress/gutenberg/pull/14257) on dark backgrounds.
- - Fix the [Classic block toolbar in RTL](https://github.com/WordPress/gutenberg/pull/14088) languages.
- - Fix the [more tag in the Classic block](https://github.com/WordPress/gutenberg/pull/14173).
- - Fix the [quote to heading](https://github.com/WordPress/gutenberg/pull/14348) block transformation.
- - Fix “null” appearing when [merging empty headings](https://github.com/WordPress/gutenberg/pull/13981) and paragraphs.
- - Fix the [block insertion restrictions](https://github.com/WordPress/gutenberg/pull/14020) in the global inserter.
- - Fix the [prepareEditableTree](https://github.com/WordPress/gutenberg/pull/14284) custom RichText Format API.
- - [Changes to the internal RichText format](https://github.com/WordPress/gutenberg/pull/14380) representation to separate objects (inline image..) from formats (bold…). This fixes a number of RichText issues.
- - Fix the [Spinner component styling](https://github.com/WordPress/gutenberg/pull/14418) in RTL languages.
- - Fix [focus loss when using the Set Featured Image](https://github.com/WordPress/gutenberg/pull/14415) buttons.
- - Fix [template lock](https://github.com/WordPress/gutenberg/pull/14390) not being taken into consideration.
- - Fix [composed characters](https://github.com/WordPress/gutenberg/pull/14449) at the beginning of RichText.
- - Fix several [block multi-selection](https://github.com/WordPress/gutenberg/pull/14448)  [bugs](https://github.com/WordPress/gutenberg/pull/14453).
- - Allow using a [float number as a step](https://github.com/WordPress/gutenberg/pull/14322) when using the RangeControl component.
- - Fix error when pasting a [caption shortcode without an image](https://github.com/WordPress/gutenberg/pull/14365) tag.
- - Fix [focus loss](https://github.com/WordPress/gutenberg/pull/14444) when combining sidebars and modals (or popovers).
- - Escape the [greater than character](https://github.com/WordPress/gutenberg/pull/9963) when serializing the blocks content into HTML.
- - Fix [pasting links into the classic block](https://github.com/WordPress/gutenberg/pull/14485).
- - Include missing [CSS in the classic block](https://github.com/WordPress/gutenberg/pull/12441).
+-   Update the [block outlines](https://github.com/WordPress/gutenberg/pull/14145) for the hover and selected states.
+-   Allow [undoing automatic pattern block transformations](https://github.com/WordPress/gutenberg/pull/13917).
+-   Add a [RichText collapsed format toolbar](https://github.com/WordPress/gutenberg/pull/14233) for code, inline image and strikethrough formats.
+-   Allow [collapsing inserter panels](https://github.com/WordPress/gutenberg/pull/13884) when searching.
+-   Add ability to transform [video shortcodes to video blocks](https://github.com/WordPress/gutenberg/pull/14042).
+-   Add ability to transform [audio shortcodes to audio blocks](https://github.com/WordPress/gutenberg/pull/14045).
+-   Add new @wordpress/data actions to [invalidate the resolvers cache](https://github.com/WordPress/gutenberg/pull/14225).
+-   Support [custom classNames in the ToggleControl](https://github.com/WordPress/gutenberg/pull/13804) component.
+-   Clarify the [button to exit the post lock](https://github.com/WordPress/gutenberg/pull/14347) modal.
+-   Improve the [block validation error message](https://github.com/WordPress/gutenberg/pull/13499).
+-   [Automatically use the WordPress](https://github.com/WordPress/gutenberg/pull/13877) [babel config](https://github.com/WordPress/gutenberg/pull/14168) when using @wordpress/scripts CLI.
+-   Add keyboard [shortcuts to indent/outdent](https://github.com/WordPress/gutenberg/pull/14343) list items.
+-   Use [links instead of buttons](https://github.com/WordPress/gutenberg/pull/10815) in the document outline.
+-   Use [`<s>` for strikethrough](https://github.com/WordPress/gutenberg/pull/14389), [not `<del>`](https://github.com/WordPress/gutenberg/pull/14430).
+-   Center the [tooltips content](https://github.com/WordPress/gutenberg/pull/14473).
+-   Update wording of the [block switcher tooltip](https://github.com/WordPress/gutenberg/pull/14470).
+-   Add [support for the reduced motion](https://github.com/WordPress/gutenberg/pull/14021) browser mode.
+
+### Bug Fixes
+
+-   Always show the [current month in the Calendar](https://github.com/WordPress/gutenberg/pull/13873) block for All CPTs but post.
+-   In the Latest posts block, [avoid full line clickable titles](https://github.com/WordPress/gutenberg/pull/14109).
+-   Avoid relying on DOM nodes to add the [empty line in RichText](https://github.com/WordPress/gutenberg/pull/13850) [component](https://github.com/WordPress/gutenberg/pull/14315). This fixes a number of lingering empty lines.
+-   Fix the [MediaPlaceholder icon color](https://github.com/WordPress/gutenberg/pull/14257) on dark backgrounds.
+-   Fix the [Classic block toolbar in RTL](https://github.com/WordPress/gutenberg/pull/14088) languages.
+-   Fix the [more tag in the Classic block](https://github.com/WordPress/gutenberg/pull/14173).
+-   Fix the [quote to heading](https://github.com/WordPress/gutenberg/pull/14348) block transformation.
+-   Fix “null” appearing when [merging empty headings](https://github.com/WordPress/gutenberg/pull/13981) and paragraphs.
+-   Fix the [block insertion restrictions](https://github.com/WordPress/gutenberg/pull/14020) in the global inserter.
+-   Fix the [prepareEditableTree](https://github.com/WordPress/gutenberg/pull/14284) custom RichText Format API.
+-   [Changes to the internal RichText format](https://github.com/WordPress/gutenberg/pull/14380) representation to separate objects (inline image..) from formats (bold…). This fixes a number of RichText issues.
+-   Fix the [Spinner component styling](https://github.com/WordPress/gutenberg/pull/14418) in RTL languages.
+-   Fix [focus loss when using the Set Featured Image](https://github.com/WordPress/gutenberg/pull/14415) buttons.
+-   Fix [template lock](https://github.com/WordPress/gutenberg/pull/14390) not being taken into consideration.
+-   Fix [composed characters](https://github.com/WordPress/gutenberg/pull/14449) at the beginning of RichText.
+-   Fix several [block multi-selection](https://github.com/WordPress/gutenberg/pull/14448) [bugs](https://github.com/WordPress/gutenberg/pull/14453).
+-   Allow using a [float number as a step](https://github.com/WordPress/gutenberg/pull/14322) when using the RangeControl component.
+-   Fix error when pasting a [caption shortcode without an image](https://github.com/WordPress/gutenberg/pull/14365) tag.
+-   Fix [focus loss](https://github.com/WordPress/gutenberg/pull/14444) when combining sidebars and modals (or popovers).
+-   Escape the [greater than character](https://github.com/WordPress/gutenberg/pull/9963) when serializing the blocks content into HTML.
+-   Fix [pasting links into the classic block](https://github.com/WordPress/gutenberg/pull/14485).
+-   Include missing [CSS in the classic block](https://github.com/WordPress/gutenberg/pull/12441).
 
 ### Documentation
 
- - Enhance the [i18n process documentation](https://github.com/WordPress/gutenberg/pull/13909) with a complete example.
- - Add design guidelines to several components:
- - The [Button](https://github.com/WordPress/gutenberg/pull/14194) component
- - The [CheckboxControl](https://github.com/WordPress/gutenberg/pull/14153) component
- - The [MenuItemsChoice](https://github.com/WordPress/gutenberg/pull/14465) component.
- - The [MenuGroup](https://github.com/WordPress/gutenberg/pull/14466) component.
- - Update the [JavaScript setup tutorial](https://github.com/WordPress/gutenberg/pull/14440) to rely on the @wordpress/scripts package.
- - Lowercase [block editor](https://github.com/WordPress/gutenberg/pull/14205) and [classic editor](https://github.com/WordPress/gutenberg/pull/14203) terms to conform to the copy guidelines.
- - Use [a central script](https://github.com/WordPress/gutenberg/pull/14216) to generate the JavaScript API documentation and run [in parallel](https://github.com/WordPress/gutenberg/pull/14295).
- - Update the [packages release](https://github.com/WordPress/gutenberg/pull/14136)  [process](https://github.com/WordPress/gutenberg/pull/14260).
- - Update the plugin release docs to rely on a [lighter SVN checkout](https://github.com/WordPress/gutenberg/pull/14259).
- - Add automatic generation of JavaScript API documentation for:
-   - [@wordpress/element](https://github.com/WordPress/gutenberg/pull/14269)
-   - [@wordpress/escape-html](https://github.com/WordPress/gutenberg/pull/14268)
-   - [@wordpress/html-entities](https://github.com/WordPress/gutenberg/pull/14267)
-   - [@wordpress/keycodes](https://github.com/WordPress/gutenberg/pull/14265)
-   - [@wordpress/a11y](https://github.com/WordPress/gutenberg/pull/14288)
-   - [@wordpress/blob](https://github.com/WordPress/gutenberg/pull/14286)
-   - [@wordpress/block-library](https://github.com/WordPress/gutenberg/pull/14282)
-   - [@wordpress/compose](https://github.com/WordPress/gutenberg/pull/14278)
-   - [@wordpress/dom](https://github.com/WordPress/gutenberg/pull/14273)
-   - [@wordpress/i18n](https://github.com/WordPress/gutenberg/pull/14266)
-   - [@wordpress/autop](https://github.com/WordPress/gutenberg/pull/14287)
-   - [@wordpress/dom-ready](https://github.com/WordPress/gutenberg/pull/14272)
-   - [@wordpress/block-editor](https://github.com/WordPress/gutenberg/pull/14285)
-   - [@wordpress/rich-text](https://github.com/WordPress/gutenberg/pull/14220)
-   - [@wordpress/blocks](https://github.com/WordPress/gutenberg/pull/14279)
-   - [@wordpress/deprecated](https://github.com/WordPress/gutenberg/pull/14275)
-   - [@wordpress/priority-queue](https://github.com/WordPress/gutenberg/pull/14262)
-   - [@wordpress/shortcode](https://github.com/WordPress/gutenberg/pull/14218)
-   - [@wordpress/viewport](https://github.com/WordPress/gutenberg/pull/14214)
-   - [@wordpress/url](https://github.com/WordPress/gutenberg/pull/14217)
-   - [@wordpress/redux-routine](https://github.com/WordPress/gutenberg/pull/14228)
-   - [@wordpress/date](https://github.com/WordPress/gutenberg/pull/14276)
-   - [@wordpress/block-serialization-default-parser](https://github.com/WordPress/gutenberg/pull/14280)
-   - [@wordpress/plugins](https://github.com/WordPress/gutenberg/pull/14263)
-   - [@wordpress/wordcount](https://github.com/WordPress/gutenberg/pull/14213)
-   - [@wordpress/edit-post](https://github.com/WordPress/gutenberg/pull/14271)
- - Link to the [editor user documentation](https://github.com/WordPress/gutenberg/pull/14316) and remove the user documentation [markdown file](https://github.com/WordPress/gutenberg/pull/14318/files).
- - Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/14321), [2](https://github.com/WordPress/gutenberg/pull/14355), [3](https://github.com/WordPress/gutenberg/pull/14382), [4](https://github.com/WordPress/gutenberg/pull/14439), [5](https://github.com/WordPress/gutenberg/pull/14471).
+-   Enhance the [i18n process documentation](https://github.com/WordPress/gutenberg/pull/13909) with a complete example.
+-   Add design guidelines to several components:
+-   The [Button](https://github.com/WordPress/gutenberg/pull/14194) component
+-   The [CheckboxControl](https://github.com/WordPress/gutenberg/pull/14153) component
+-   The [MenuItemsChoice](https://github.com/WordPress/gutenberg/pull/14465) component.
+-   The [MenuGroup](https://github.com/WordPress/gutenberg/pull/14466) component.
+-   Update the [JavaScript setup tutorial](https://github.com/WordPress/gutenberg/pull/14440) to rely on the @wordpress/scripts package.
+-   Lowercase [block editor](https://github.com/WordPress/gutenberg/pull/14205) and [classic editor](https://github.com/WordPress/gutenberg/pull/14203) terms to conform to the copy guidelines.
+-   Use [a central script](https://github.com/WordPress/gutenberg/pull/14216) to generate the JavaScript API documentation and run [in parallel](https://github.com/WordPress/gutenberg/pull/14295).
+-   Update the [packages release](https://github.com/WordPress/gutenberg/pull/14136) [process](https://github.com/WordPress/gutenberg/pull/14260).
+-   Update the plugin release docs to rely on a [lighter SVN checkout](https://github.com/WordPress/gutenberg/pull/14259).
+-   Add automatic generation of JavaScript API documentation for:
+    -   [@wordpress/element](https://github.com/WordPress/gutenberg/pull/14269)
+    -   [@wordpress/escape-html](https://github.com/WordPress/gutenberg/pull/14268)
+    -   [@wordpress/html-entities](https://github.com/WordPress/gutenberg/pull/14267)
+    -   [@wordpress/keycodes](https://github.com/WordPress/gutenberg/pull/14265)
+    -   [@wordpress/a11y](https://github.com/WordPress/gutenberg/pull/14288)
+    -   [@wordpress/blob](https://github.com/WordPress/gutenberg/pull/14286)
+    -   [@wordpress/block-library](https://github.com/WordPress/gutenberg/pull/14282)
+    -   [@wordpress/compose](https://github.com/WordPress/gutenberg/pull/14278)
+    -   [@wordpress/dom](https://github.com/WordPress/gutenberg/pull/14273)
+    -   [@wordpress/i18n](https://github.com/WordPress/gutenberg/pull/14266)
+    -   [@wordpress/autop](https://github.com/WordPress/gutenberg/pull/14287)
+    -   [@wordpress/dom-ready](https://github.com/WordPress/gutenberg/pull/14272)
+    -   [@wordpress/block-editor](https://github.com/WordPress/gutenberg/pull/14285)
+    -   [@wordpress/rich-text](https://github.com/WordPress/gutenberg/pull/14220)
+    -   [@wordpress/blocks](https://github.com/WordPress/gutenberg/pull/14279)
+    -   [@wordpress/deprecated](https://github.com/WordPress/gutenberg/pull/14275)
+    -   [@wordpress/priority-queue](https://github.com/WordPress/gutenberg/pull/14262)
+    -   [@wordpress/shortcode](https://github.com/WordPress/gutenberg/pull/14218)
+    -   [@wordpress/viewport](https://github.com/WordPress/gutenberg/pull/14214)
+    -   [@wordpress/url](https://github.com/WordPress/gutenberg/pull/14217)
+    -   [@wordpress/redux-routine](https://github.com/WordPress/gutenberg/pull/14228)
+    -   [@wordpress/date](https://github.com/WordPress/gutenberg/pull/14276)
+    -   [@wordpress/block-serialization-default-parser](https://github.com/WordPress/gutenberg/pull/14280)
+    -   [@wordpress/plugins](https://github.com/WordPress/gutenberg/pull/14263)
+    -   [@wordpress/wordcount](https://github.com/WordPress/gutenberg/pull/14213)
+    -   [@wordpress/edit-post](https://github.com/WordPress/gutenberg/pull/14271)
+-   Link to the [editor user documentation](https://github.com/WordPress/gutenberg/pull/14316) and remove the user documentation [markdown file](https://github.com/WordPress/gutenberg/pull/14318/files).
+-   Typos and tweaks: [1](https://github.com/WordPress/gutenberg/pull/14321), [2](https://github.com/WordPress/gutenberg/pull/14355), [3](https://github.com/WordPress/gutenberg/pull/14382), [4](https://github.com/WordPress/gutenberg/pull/14439), [5](https://github.com/WordPress/gutenberg/pull/14471).
 
 ### Various
 
- - Upgrade to [React 16.8.4](https://github.com/WordPress/gutenberg/pull/14400) ([React Hooks](https://github.com/WordPress/gutenberg/pull/14425)).
- - Fix the [dependencies of the e2e-tests](https://github.com/WordPress/gutenberg/pull/14212) and the [e2e-test-utils](https://github.com/WordPress/gutenberg/pull/14374) npm packages.
- - Avoid disabling [regeneratorRuntime in the babel config](https://github.com/WordPress/gutenberg/pull/14130) to avoid globals in npm packages.
- - [Work](https://github.com/WordPress/gutenberg/pull/14244)  [on](https://github.com/WordPress/gutenberg/pull/14247)  [various](https://github.com/WordPress/gutenberg/pull/14340)  [e2e tests](https://github.com/WordPress/gutenberg/pull/14219)  [stability](https://github.com/WordPress/gutenberg/pull/14230) improvements.
- - Regenerate RSS/Search block [test fixtures](https://github.com/WordPress/gutenberg/pull/14122).
- - [Move to travis.com](https://github.com/WordPress/gutenberg/pull/14250) as a CI server.
- - Add [clickBlockToolbarButton](https://github.com/WordPress/gutenberg/pull/14254) e2e test utility.
- - Add e2e tests:
-   - to check the [keyboard navigation](https://github.com/WordPress/gutenberg/pull/13455) through blocks.
-   - to verify that [the default block is selected](https://github.com/WordPress/gutenberg/pull/14191) after removing all the blocks.
-   - to check the InnerBlocks [allowed blocks restrictions](https://github.com/WordPress/gutenberg/pull/14054).
- - Add unit tests [for the isKeyboardEvent](https://github.com/WordPress/gutenberg/pull/14073) utility.
- - Remove [CC-BY-3.0](https://github.com/WordPress/gutenberg/pull/14329) from the GPLv2 compatible licenses.
- - Polish the @wordpress/block-editor module:
-   - Move the [block specific components](https://github.com/WordPress/gutenberg/pull/14112) to the package.
-   - [Update the classnames](https://github.com/WordPress/gutenberg/pull/14420) to follow the CSS guidelines.
- - Update [eslint rules npm](https://github.com/WordPress/gutenberg/pull/14077)  [packages](https://github.com/WordPress/gutenberg/pull/14339).
- - Simplify the [hierarchical term selector strings](https://github.com/WordPress/gutenberg/pull/13938).
- - Update the [Latest comments block to use the “align support config”](https://github.com/WordPress/gutenberg/pull/11411) instead of a custom implementation.
- - Remove the [block snapshots tests](https://github.com/WordPress/gutenberg/pull/14349).
- - Remove [post install scripts](https://github.com/WordPress/gutenberg/pull/14353) and only run these in CI to improve test performance.
- - Tweak the plugin build zip script to [avoid prompting](https://github.com/WordPress/gutenberg/pull/14352) when the build environment is clean.
- - Add [withRegistry](https://github.com/WordPress/gutenberg/pull/14370) higher-order component to the @wordpress/data module.
- - Add missing [module entry point to the notices](https://github.com/WordPress/gutenberg/pull/14388) package.json.
- - Remove the Gutenberg [5.3 deprecated functions](https://github.com/WordPress/gutenberg/pull/14380).
- - Ensure [sourcemaps published to npm](https://github.com/WordPress/gutenberg/pull/14409) contain safe relative paths.
- - Remove the [replace_block filter usage](https://github.com/WordPress/gutenberg/pull/13569) and extend core editor settings instead.
- - Improve handling of [transpiled packages in unit tests](https://github.com/WordPress/gutenberg/pull/14432).
- - Add CLI arguments to launch [e2e tests in interactive mode](https://github.com/WordPress/gutenberg/pull/14129) more easily.
- -  Select a [unique radio input](https://github.com/WordPress/gutenberg/pull/14128) in a group when using the tabbables utility.
+-   Upgrade to [React 16.8.4](https://github.com/WordPress/gutenberg/pull/14400) ([React Hooks](https://github.com/WordPress/gutenberg/pull/14425)).
+-   Fix the [dependencies of the e2e-tests](https://github.com/WordPress/gutenberg/pull/14212) and the [e2e-test-utils](https://github.com/WordPress/gutenberg/pull/14374) npm packages.
+-   Avoid disabling [regeneratorRuntime in the babel config](https://github.com/WordPress/gutenberg/pull/14130) to avoid globals in npm packages.
+-   [Work](https://github.com/WordPress/gutenberg/pull/14244) [on](https://github.com/WordPress/gutenberg/pull/14247) [various](https://github.com/WordPress/gutenberg/pull/14340) [e2e tests](https://github.com/WordPress/gutenberg/pull/14219) [stability](https://github.com/WordPress/gutenberg/pull/14230) improvements.
+-   Regenerate RSS/Search block [test fixtures](https://github.com/WordPress/gutenberg/pull/14122).
+-   [Move to travis.com](https://github.com/WordPress/gutenberg/pull/14250) as a CI server.
+-   Add [clickBlockToolbarButton](https://github.com/WordPress/gutenberg/pull/14254) e2e test utility.
+-   Add e2e tests:
+    -   to check the [keyboard navigation](https://github.com/WordPress/gutenberg/pull/13455) through blocks.
+    -   to verify that [the default block is selected](https://github.com/WordPress/gutenberg/pull/14191) after removing all the blocks.
+    -   to check the InnerBlocks [allowed blocks restrictions](https://github.com/WordPress/gutenberg/pull/14054).
+-   Add unit tests [for the isKeyboardEvent](https://github.com/WordPress/gutenberg/pull/14073) utility.
+-   Remove [CC-BY-3.0](https://github.com/WordPress/gutenberg/pull/14329) from the GPLv2 compatible licenses.
+-   Polish the @wordpress/block-editor module:
+    -   Move the [block specific components](https://github.com/WordPress/gutenberg/pull/14112) to the package.
+    -   [Update the classnames](https://github.com/WordPress/gutenberg/pull/14420) to follow the CSS guidelines.
+-   Update [eslint rules npm](https://github.com/WordPress/gutenberg/pull/14077) [packages](https://github.com/WordPress/gutenberg/pull/14339).
+-   Simplify the [hierarchical term selector strings](https://github.com/WordPress/gutenberg/pull/13938).
+-   Update the [Latest comments block to use the “align support config”](https://github.com/WordPress/gutenberg/pull/11411) instead of a custom implementation.
+-   Remove the [block snapshots tests](https://github.com/WordPress/gutenberg/pull/14349).
+-   Remove [post install scripts](https://github.com/WordPress/gutenberg/pull/14353) and only run these in CI to improve test performance.
+-   Tweak the plugin build zip script to [avoid prompting](https://github.com/WordPress/gutenberg/pull/14352) when the build environment is clean.
+-   Add [withRegistry](https://github.com/WordPress/gutenberg/pull/14370) higher-order component to the @wordpress/data module.
+-   Add missing [module entry point to the notices](https://github.com/WordPress/gutenberg/pull/14388) package.json.
+-   Remove the Gutenberg [5.3 deprecated functions](https://github.com/WordPress/gutenberg/pull/14380).
+-   Ensure [sourcemaps published to npm](https://github.com/WordPress/gutenberg/pull/14409) contain safe relative paths.
+-   Remove the [replace_block filter usage](https://github.com/WordPress/gutenberg/pull/13569) and extend core editor settings instead.
+-   Improve handling of [transpiled packages in unit tests](https://github.com/WordPress/gutenberg/pull/14432).
+-   Add CLI arguments to launch [e2e tests in interactive mode](https://github.com/WordPress/gutenberg/pull/14129) more easily.
+-   Select a [unique radio input](https://github.com/WordPress/gutenberg/pull/14128) in a group when using the tabbables utility.
 
 = 5.2.0 =
 
+## Changelog
+
 ### Enhancements
 
-- Update the [button block description](https://github.com/WordPress/gutenberg/pull/13933) wording.
-- Design and a11y [improvements for the custom color picker](https://github.com/WordPress/gutenberg/pull/13708).
-- Tweak the [FontSizePicker height](https://github.com/WordPress/gutenberg/pull/11555) to match regular select elements.
-- Improvements to the [local state persistence](https://github.com/WordPress/gutenberg/pull/13951) behavior.
-- Improvements to the [URL input popove](https://github.com/WordPress/gutenberg/pull/13973) [design](https://github.com/WordPress/gutenberg/pull/14015).
-- Disable [block navigation and document outline items](https://github.com/WordPress/gutenberg/pull/14081) in text mode.
-- Improve the [quote block icons](https://github.com/WordPress/gutenberg/pull/14091).
-- Animate the [sidebar tabs switching](https://github.com/WordPress/gutenberg/pull/13956).
-
-### Bug Fixes
-
-- Select [the last block](https://github.com/WordPress/gutenberg/pull/13294) when pasting content.
-- Fix the block validation when the [default attribute value](https://github.com/WordPress/gutenberg/pull/12757) of a block is changed.
-- Forces the [min/max value validation](https://github.com/WordPress/gutenberg/pull/12952) in the RangeControl component.
-- Display HTML properly in [the post titles](https://github.com/WordPress/gutenberg/pull/13622) of the latest posts block.
-- Fix drag and [dropping a column](https://github.com/WordPress/gutenberg/pull/13941) block on itself.
-- Fix [new lines](https://github.com/WordPress/gutenberg/pull/13799) in the preformatted block.
-- Fix [text underline shortcut](https://github.com/WordPress/gutenberg/pull/14008).
-- Fix calling [gutenberg plugin functions in the frontend](https://github.com/WordPress/gutenberg/pull/14096) context.
-- Fix [pasting a single line](https://github.com/WordPress/gutenberg/pull/14138) from Google Docs (ignoring the strong element).
-- Fix FocalPointPicker rendering [unlabelled input fields](https://github.com/WordPress/gutenberg/pull/14152).
-- Show the [images uploaded in the gallery block](https://github.com/WordPress/gutenberg/pull/12435) in the media modal.
-- Fix [wordwise selection](https://github.com/WordPress/gutenberg/pull/14184) on Windows.
-- [Preserve empty table cells](https://github.com/WordPress/gutenberg/pull/14137) when pasting content.
-- Fix [focus loss](https://github.com/WordPress/gutenberg/pull/14189) when deleting the last block.
+-   Update the [button block description](https://github.com/WordPress/gutenberg/pull/13933) wording.
+-   Design and a11y [improvements for the custom color picker](https://github.com/WordPress/gutenberg/pull/13708).
+-   Tweak the [FontSizePicker height](https://github.com/WordPress/gutenberg/pull/11555) to match regular select elements.
+-   Improvements to the [local state persistence](https://github.com/WordPress/gutenberg/pull/13951) behavior.
+-   Improvements to the [URL input popove](https://github.com/WordPress/gutenberg/pull/13973) [design](https://github.com/WordPress/gutenberg/pull/14015).
+-   Disable [block navigation and document outline items](https://github.com/WordPress/gutenberg/pull/14081) in text mode.
+-   Improve the [quote block icons](https://github.com/WordPress/gutenberg/pull/14091).
+-   Animate the [sidebar tabs switching](https://github.com/WordPress/gutenberg/pull/13956).
+
+### Bug Fixes
+
+-   Select [the last block](https://github.com/WordPress/gutenberg/pull/13294) when pasting content.
+-   Fix the block validation when the [default attribute value](https://github.com/WordPress/gutenberg/pull/12757) of a block is changed.
+-   Forces the [min/max value validation](https://github.com/WordPress/gutenberg/pull/12952) in the RangeControl component.
+-   Display HTML properly in [the post titles](https://github.com/WordPress/gutenberg/pull/13622) of the latest posts block.
+-   Fix drag and [dropping a column](https://github.com/WordPress/gutenberg/pull/13941) block on itself.
+-   Fix [new lines](https://github.com/WordPress/gutenberg/pull/13799) in the preformatted block.
+-   Fix [text underline shortcut](https://github.com/WordPress/gutenberg/pull/14008).
+-   Fix calling [gutenberg plugin functions in the frontend](https://github.com/WordPress/gutenberg/pull/14096) context.
+-   Fix [pasting a single line](https://github.com/WordPress/gutenberg/pull/14138) from Google Docs (ignoring the strong element).
+-   Fix FocalPointPicker rendering [unlabelled input fields](https://github.com/WordPress/gutenberg/pull/14152).
+-   Show the [images uploaded in the gallery block](https://github.com/WordPress/gutenberg/pull/12435) in the media modal.
+-   Fix [wordwise selection](https://github.com/WordPress/gutenberg/pull/14184) on Windows.
+-   [Preserve empty table cells](https://github.com/WordPress/gutenberg/pull/14137) when pasting content.
+-   Fix [focus loss](https://github.com/WordPress/gutenberg/pull/14189) when deleting the last block.
 
 ### Documentation
 
-- Add [the Block specific toolbar button](https://github.com/WordPress/gutenberg/pull/14113) sample to the format api tutorial.
-- Introduce a package to automatically generate the [API documentation](https://github.com/WordPress/gutenberg/pull/13329).
-- Tweaks: [1](https://github.com/WordPress/gutenberg/pull/13906), [2](https://github.com/WordPress/gutenberg/pull/13920), [3](https://github.com/WordPress/gutenberg/pull/13940), [4](https://github.com/WordPress/gutenberg/pull/13954), [5](https://github.com/WordPress/gutenberg/pull/13993), [6](https://github.com/WordPress/gutenberg/pull/13995), [7](https://github.com/WordPress/gutenberg/pull/14083), [8](https://github.com/WordPress/gutenberg/pull/14099), [9](https://github.com/WordPress/gutenberg/pull/14089), [10](https://github.com/WordPress/gutenberg/pull/14177).
+-   Add [the Block specific toolbar button](https://github.com/WordPress/gutenberg/pull/14113) sample to the format api tutorial.
+-   Introduce a package to automatically generate the [API documentation](https://github.com/WordPress/gutenberg/pull/13329).
+-   Tweaks: [1](https://github.com/WordPress/gutenberg/pull/13906), [2](https://github.com/WordPress/gutenberg/pull/13920), [3](https://github.com/WordPress/gutenberg/pull/13940), [4](https://github.com/WordPress/gutenberg/pull/13954), [5](https://github.com/WordPress/gutenberg/pull/13993), [6](https://github.com/WordPress/gutenberg/pull/13995), [7](https://github.com/WordPress/gutenberg/pull/14083), [8](https://github.com/WordPress/gutenberg/pull/14099), [9](https://github.com/WordPress/gutenberg/pull/14089), [10](https://github.com/WordPress/gutenberg/pull/14177).
 
 ### Various
 
-- Introduce [a](https://github.com/WordPress/gutenberg/pull/14082) [generic](https://github.com/WordPress/gutenberg/pull/13088) [block](https://github.com/WordPress/gutenberg/pull/13105) [editor](https://github.com/WordPress/gutenberg/pull/14116) [module](https://github.com/WordPress/gutenberg/pull/14161).
-- Creates [an empty page](https://github.com/WordPress/gutenberg/pull/13912) that will contain the future widget screen explorations.
-- Fix [emoji in the demo content](https://github.com/WordPress/gutenberg/pull/13969).
-- Warn when the user is using an [inline element as a RichText container](https://github.com/WordPress/gutenberg/pull/13921).
-- Make Babel [import JSX pragma plugin](https://github.com/WordPress/gutenberg/pull/13809/) [aware](https://github.com/WordPress/gutenberg/pull/14106) of the createElement usage.
-- [Include the JSX pragma plugin](https://github.com/WordPress/gutenberg/pull/13540) into the default WordPress babel config.
-- Update the [non-embeddable URLs](https://github.com/WordPress/gutenberg/pull/13715) wording.
+-   Introduce [a](https://github.com/WordPress/gutenberg/pull/14082) [generic](https://github.com/WordPress/gutenberg/pull/13088) [block](https://github.com/WordPress/gutenberg/pull/13105) [editor](https://github.com/WordPress/gutenberg/pull/14116) [module](https://github.com/WordPress/gutenberg/pull/14161).
+-   Creates [an empty page](https://github.com/WordPress/gutenberg/pull/13912) that will contain the future widget screen explorations.
+-   Fix [emoji in the demo content](https://github.com/WordPress/gutenberg/pull/13969).
+-   Warn when the user is using an [inline element as a RichText container](https://github.com/WordPress/gutenberg/pull/13921).
+-   Make Babel [import JSX pragma plugin](https://github.com/WordPress/gutenberg/pull/13809/) [aware](https://github.com/WordPress/gutenberg/pull/14106) of the createElement usage.
+-   [Include the JSX pragma plugin](https://github.com/WordPress/gutenberg/pull/13540) into the default WordPress babel config.
+-   Update the [non-embeddable URLs](https://github.com/WordPress/gutenberg/pull/13715) wording.
 
 ### Chore
 
-- Refactoring of the [block fixtures tests](https://github.com/WordPress/gutenberg/pull/13658).
-- Refactoring the eslint [custom import lint rule](https://github.com/WordPress/gutenberg/pull/13937).
-- Refactoring the selection of [previous/next blocks actions](https://github.com/WordPress/gutenberg/pull/13924).
-- Refactoring the [post editor effects](https://github.com/WordPress/gutenberg/pull/13716) to use actions and resolvers instead.
-- Use [forEach instead of map](https://github.com/WordPress/gutenberg/pull/13953) when appropriate and enforce it with an [eslint rule](https://github.com/WordPress/gutenberg/pull/14154).
-- Remove [TinyMCE external dependency](https://github.com/WordPress/gutenberg/pull/13971) mapping.
-- Extract [webpack config](https://github.com/WordPress/gutenberg/pull/13814) into the scripts package.
-- Improve [e2e](https://github.com/WordPress/gutenberg/pull/14048) [tests](https://github.com/WordPress/gutenberg/pull/14108) stability.t
-- Avoid mutating [webpack imported config](https://github.com/WordPress/gutenberg/pull/14039).
-- [Upgrade Jest](https://github.com/WordPress/gutenberg/pull/13922) to version 24.
-- Add [repository.directory field](https://github.com/WordPress/gutenberg/pull/14059) to the npm packages and an [linting rule](https://github.com/WordPress/gutenberg/pull/14200) to enforce it.
-- Update [server blocks script to use core](https://github.com/WordPress/gutenberg/pull/14097) equivalent function.
-- Remove the [vendor scripts registration](https://github.com/WordPress/gutenberg/pull/13573).
-- Use the editor settings to pass a [mediaUpload handler](https://github.com/WordPress/gutenberg/pull/14115).
-- Remove [deprecated Gutenberg plugin functions](https://github.com/WordPress/gutenberg/pull/14090) and [features](https://github.com/WordPress/gutenberg/pull/14144) moved to core.
-- Remove unnecessary [Enzyme React 16 workarounds](https://github.com/WordPress/gutenberg/pull/14156) from the unit tests.
-- Remove [wp-editor-font stylesheet override](https://github.com/WordPress/gutenberg/pull/14176).
-- [Preserve inline scripts](https://github.com/WordPress/gutenberg/pull/13581) when overriding core scripts.
-- Support [referencing the IconButton](https://github.com/WordPress/gutenberg/pull/14163) component.
-- Refactor the [i18n setup](https://github.com/WordPress/gutenberg/pull/12559) of the Gutenberg plugin.
+-   Refactoring of the [block fixtures tests](https://github.com/WordPress/gutenberg/pull/13658).
+-   Refactoring the eslint [custom import lint rule](https://github.com/WordPress/gutenberg/pull/13937).
+-   Refactoring the selection of [previous/next blocks actions](https://github.com/WordPress/gutenberg/pull/13924).
+-   Refactoring the [post editor effects](https://github.com/WordPress/gutenberg/pull/13716) to use actions and resolvers instead.
+-   Use [forEach instead of map](https://github.com/WordPress/gutenberg/pull/13953) when appropriate and enforce it with an [eslint rule](https://github.com/WordPress/gutenberg/pull/14154).
+-   Remove [TinyMCE external dependency](https://github.com/WordPress/gutenberg/pull/13971) mapping.
+-   Extract [webpack config](https://github.com/WordPress/gutenberg/pull/13814) into the scripts package.
+-   Improve [e2e](https://github.com/WordPress/gutenberg/pull/14048) [tests](https://github.com/WordPress/gutenberg/pull/14108) stability.t
+-   Avoid mutating [webpack imported config](https://github.com/WordPress/gutenberg/pull/14039).
+-   [Upgrade Jest](https://github.com/WordPress/gutenberg/pull/13922) to version 24.
+-   Add [repository.directory field](https://github.com/WordPress/gutenberg/pull/14059) to the npm packages and an [linting rule](https://github.com/WordPress/gutenberg/pull/14200) to enforce it.
+-   Update [server blocks script to use core](https://github.com/WordPress/gutenberg/pull/14097) equivalent function.
+-   Remove the [vendor scripts registration](https://github.com/WordPress/gutenberg/pull/13573).
+-   Use the editor settings to pass a [mediaUpload handler](https://github.com/WordPress/gutenberg/pull/14115).
+-   Remove [deprecated Gutenberg plugin functions](https://github.com/WordPress/gutenberg/pull/14090) and [features](https://github.com/WordPress/gutenberg/pull/14144) moved to core.
+-   Remove unnecessary [Enzyme React 16 workarounds](https://github.com/WordPress/gutenberg/pull/14156) from the unit tests.
+-   Remove [wp-editor-font stylesheet override](https://github.com/WordPress/gutenberg/pull/14176).
+-   [Preserve inline scripts](https://github.com/WordPress/gutenberg/pull/13581) when overriding core scripts.
+-   Support [referencing the IconButton](https://github.com/WordPress/gutenberg/pull/14163) component.
+-   Refactor the [i18n setup](https://github.com/WordPress/gutenberg/pull/12559) of the Gutenberg plugin.
 
 ### Mobile
 
-- Add an [image placeholder](https://github.com/WordPress/gutenberg/pull/13777) when the size is being computed.
-- Update the [image thumbnail](https://github.com/WordPress/gutenberg/pull/13764) when the image is being uploaded.
-- Support the [Format Library](https://github.com/WordPress/gutenberg/pull/12249).
-- Bottom Sheet [design](https://github.com/WordPress/gutenberg/pull/13855) [improvements](https://github.com/WordPress/gutenberg/pull/13882).
-- Update the default [block appender placehoder](https://github.com/WordPress/gutenberg/pull/13880).
-- Support [pasting content](https://github.com/WordPress/gutenberg/pull/13841) using the Gutenberg paste handler.
-- Fix [alignment issues](https://github.com/WordPress/gutenberg/pull/13945) for the appender and paragraph block placeholders.
+-   Add an [image placeholder](https://github.com/WordPress/gutenberg/pull/13777) when the size is being computed.
+-   Update the [image thumbnail](https://github.com/WordPress/gutenberg/pull/13764) when the image is being uploaded.
+-   Support the [Format Library](https://github.com/WordPress/gutenberg/pull/12249).
+-   Bottom Sheet [design](https://github.com/WordPress/gutenberg/pull/13855) [improvements](https://github.com/WordPress/gutenberg/pull/13882).
+-   Update the default [block appender placehoder](https://github.com/WordPress/gutenberg/pull/13880).
+-   Support [pasting content](https://github.com/WordPress/gutenberg/pull/13841) using the Gutenberg paste handler.
+-   Fix [alignment issues](https://github.com/WordPress/gutenberg/pull/13945) for the appender and paragraph block placeholders.
 
 = 5.1.1 =
 
-## Bug Fixes
+## Changelog
+
+### Bug Fixes
 
-- Fixes a [Firefox regression](https://github.com/WordPress/gutenberg/pull/13986) causing block content to be deleted.
+-   Fixes a [Firefox regression](https://github.com/WordPress/gutenberg/pull/13986) causing block content to be deleted.
 
 = 5.1.0 =
 
-## Features
-
-*   Add a new [Search block](https://github.com/WordPress/gutenberg/pull/13583).
-*   Add a new [Calendar](https://github.com/WordPress/gutenberg/pull/13772) block.
-*   Add a new [Tag Cloud](https://github.com/WordPress/gutenberg/pull/7875) block.
-
-## Enhancements
-
-*   Add micro-animations to the editor UI:
-    *   Opening [Popovers](https://github.com/WordPress/gutenberg/pull/13617).
-    *   Opening [Sidebars](https://github.com/WordPress/gutenberg/pull/13635).
-*   [Restore the block movers](https://github.com/WordPress/gutenberg/pull/12758) for the floated blocks.
-*   [Consistency in alignment options](https://github.com/WordPress/gutenberg/pull/9469) between archives and categories blocks.
-*   Set the minimum size for [form fields on mobile](https://github.com/WordPress/gutenberg/pull/13639).
-*   [Disable the block navigation](https://github.com/WordPress/gutenberg/pull/12185) in the code editor mode.
-*   Consistency for the [modal styles](https://github.com/WordPress/gutenberg/pull/13669).
-*   Improve the [FormToggle](https://github.com/WordPress/gutenberg/pull/12385) styling when used outside of WordPress context.
-*   Use the block [icons in the media placeholders](https://github.com/WordPress/gutenberg/pull/11788).
-*   Fix [rounded corners](https://github.com/WordPress/gutenberg/pull/13659) for the block svg icons.
-*   Improve the [CSS specificity](https://github.com/WordPress/gutenberg/pull/13025) [of the paragraph](https://github.com/WordPress/gutenberg/pull/12998) block [styles](https://github.com/WordPress/gutenberg/pull/13821).
-*   Require an initial [click on embed previews](https://github.com/WordPress/gutenberg/pull/12981) before being interactive.
-*   Improve the [disabled block switcher](https://github.com/WordPress/gutenberg/pull/13721) styles.
-*   [Do not split paragraph line breaks](https://github.com/WordPress/gutenberg/pull/13832) when transforming multiple paragraphs to a list.
-*   Enhance the Quote block styling for [different text alignments](https://github.com/WordPress/gutenberg/pull/13248).
-*   Remove the [left padding from the Quote](https://github.com/WordPress/gutenberg/pull/13846) block when it’s centered.
-*   A11y:
-    *   Improve the [permalink field label](https://github.com/WordPress/gutenberg/pull/12959).
-    *   Improve the [region navigation](https://github.com/WordPress/gutenberg/pull/8554) styling.
-*   Remove the [3 keywords limit](https://github.com/WordPress/gutenberg/pull/13848) for the block registration.
-*   Add consistent background colors to the [hovered menu items](https://github.com/WordPress/gutenberg/pull/13732).
-*   Allow the [editor notices to push down](https://github.com/WordPress/gutenberg/pull/13614) the content.
-*   Rename the [default block styles](https://github.com/WordPress/gutenberg/pull/13670).
-
-## Bug Fixes
-
-*   Fix a number of formatting issues:
-    *   [Multiple formats](https://github.com/WordPress/gutenberg/issues/12973).
-    *   [Flashing backgrounds](https://github.com/WordPress/gutenberg/issues/12978) when typing.
-    *   [Highlighted format](https://github.com/WordPress/gutenberg/issues/11091) buttons.
-    *   [Inline code](https://github.com/WordPress/gutenberg/pull/13807) with [backticks](https://github.com/WordPress/gutenberg/issues/11276).
-    *   [Spaces deleted](https://github.com/WordPress/gutenberg/issues/12529) after formats.
-    *   Inline [boundaries styling](https://github.com/WordPress/gutenberg/issues/11423) issues.
-    *   [Touch Bar](https://github.com/WordPress/gutenberg/pull/13833) format buttons.
-*   Fix a number of list block writing flow issues:
-    *   Allow [line breaks](https://github.com/WordPress/gutenberg/pull/13546) in list items.
-    *   [Empty items](https://github.com/WordPress/gutenberg/issues/13864) not being removed.
-    *   Backspace [merging list items](https://github.com/WordPress/gutenberg/issues/12398).
-    *   [Selecting formats](https://github.com/WordPress/gutenberg/issues/11741) at the beginning of list items.
-*   Fix the [color picker styling](https://github.com/WordPress/gutenberg/pull/12747).
-*   Set default values for the [image dimensions inputs](https://github.com/WordPress/gutenberg/pull/7687).
-*   Fix [sidebar panels spacing](https://github.com/WordPress/gutenberg/pull/13181).
-*   Fix [wording of the nux tip](https://github.com/WordPress/gutenberg/pull/12911) nudging about the sidebar settings.
-*   Fix [the translator comments](https://github.com/WordPress/gutenberg/pull/9440) pot extraction.
-*   Fix the [plugins icons](https://github.com/WordPress/gutenberg/pull/13719) color overriding.
-*   Fix [conflicting notices styles](https://github.com/WordPress/gutenberg/pull/13817) when using editor styles.
-*   Fix [controls recursion](https://github.com/WordPress/gutenberg/pull/13818) in the redux-routine package.
-*   Fix the generic embed block when using [Giphy as provider](https://github.com/WordPress/gutenberg/pull/13825).
-*   Fix the [i18n message](https://github.com/WordPress/gutenberg/pull/13830) used in the Gallery block edit button.
-*   Fix the [icon size](https://github.com/WordPress/gutenberg/pull/13767) of the block switcher menu.
-*   Fix the [loading state](https://github.com/WordPress/gutenberg/pull/13758) of the FlatTermSelector (tags selector).
-*   Fix the [embed placeholders](https://github.com/WordPress/gutenberg/pull/13590) styling.
-*   Fix incorrectly triggered [auto-saves for published posts](https://github.com/WordPress/gutenberg/pull/12624).
-*   Fix [missing classname](https://github.com/WordPress/gutenberg/pull/13834) in the Latest comments block.
-*   Fix [HTML in shortcodes](https://github.com/WordPress/gutenberg/pull/13609) breaking block validation.
-*   Fix JavaScript errors when [typing quickly](https://github.com/WordPress/gutenberg/pull/11209) and creating undo levels.
-*   Fix issue with [mover colors](https://github.com/WordPress/gutenberg/pull/13869) in dark themes.
-*   Fix [internationalisation issue](https://github.com/WordPress/gutenberg/pull/13551) with permalink slugs.
-
-## Various
-
-*   Implement the [inline format boundaries](https://github.com/WordPress/gutenberg/pull/13697) without relying on the DOM.
-*   Introduce the [Registry Selectors](https://github.com/WordPress/gutenberg/pull/13662) in the data module.
-*   Introduce the [Registry Controls](https://github.com/WordPress/gutenberg/pull/13722) in the data module.
-*   Allow extending the [latest posts block query](https://github.com/WordPress/gutenberg/pull/11984) by using get_posts.
-*   Extend the [range of allowed years](https://github.com/WordPress/gutenberg/pull/13602) in the DateTime component.
-*   Allow [null values](https://github.com/WordPress/gutenberg/pull/12963) for the DateTime component.
-*   Do not render the [FontSizePicker](https://github.com/WordPress/gutenberg/pull/13782) if [no sizes](https://github.com/WordPress/gutenberg/pull/13824) [defined](https://github.com/WordPress/gutenberg/pull/13844).
-*   Add className prop support to the [UrlInput](https://github.com/WordPress/gutenberg/pull/13800) component.
-*   Add [inline image resizing UI](https://github.com/WordPress/gutenberg/pull/13737).
-
-## Chore
-
-*   Update [lodash](https://github.com/WordPress/gutenberg/pull/13651) and [deasync](https://github.com/WordPress/gutenberg/pull/13839) [dependencies](https://github.com/WordPress/gutenberg/pull/13876).
-*   Use [addQueryArgs](https://github.com/WordPress/gutenberg/pull/13653) consistently to generate WordPress links.
-*   Remove merged PHP code:
-    *   jQuery to Hooks [heartbeat proxyfying](https://github.com/WordPress/gutenberg/pull/13576).
-    *   References to the [classic editor](https://github.com/WordPress/gutenberg/pull/13544).
-    *   [gutenberg_can_edit_post](https://github.com/WordPress/gutenberg/pull/13470) function.
-*   [Disable CSS](https://github.com/WordPress/gutenberg/pull/13769) [animations](https://github.com/WordPress/gutenberg/pull/13779) in e2e tests.
-*   ESLint
-    *   Add a rule to ensure the [consistency](https://github.com/WordPress/gutenberg/pull/13785) [of the import groups](https://github.com/WordPress/gutenberg/pull/13757).
-    *   Add a rule to protect against [invalid sprintf use](https://github.com/WordPress/gutenberg/pull/13756).
-*   Remove [obsolete](https://github.com/WordPress/gutenberg/pull/13871) [CSS](https://github.com/WordPress/gutenberg/pull/13867) rules.
-*   Add e2e tests for [tags creation](https://github.com/WordPress/gutenberg/pull/13129).
-*   Add the [feature flags](https://github.com/WordPress/gutenberg/pull/13324) setup.
-*   Implement [block editor styles](https://github.com/WordPress/gutenberg/pull/13625) using a filter.
-
-## Documentation
-
-*   Add a new [tutorial about the editor notices](https://github.com/WordPress/gutenberg/pull/13703).
-*   Add JavaScript [build tools](https://github.com/WordPress/gutenberg/pull/13629) [documentation](https://github.com/WordPress/gutenberg/pull/13853).
-*   Enhance the block’s [edit/save documentation](https://github.com/WordPress/gutenberg/pull/13578) and code examples.
-*   Use [Title Case](https://github.com/WordPress/gutenberg/pull/13714) consistently.
-*   Add [e2e test utils](https://github.com/WordPress/gutenberg/pull/13856) documentation.
-*   Small enhancements and typos: [1](https://github.com/WordPress/gutenberg/pull/13593), [2](https://github.com/WordPress/gutenberg/pull/13671), [3](https://github.com/WordPress/gutenberg/pull/13711), [4](https://github.com/WordPress/gutenberg/pull/13746), [5](https://github.com/WordPress/gutenberg/pull/13742), [6](https://github.com/WordPress/gutenberg/pull/13733), [7](https://github.com/WordPress/gutenberg/pull/13744), [8](https://github.com/WordPress/gutenberg/pull/13752), [9](https://github.com/WordPress/gutenberg/pull/13574), [10](https://github.com/WordPress/gutenberg/pull/13745), [11](https://github.com/WordPress/gutenberg/pull/13781), [12](https://github.com/WordPress/gutenberg/pull/13694), [13](https://github.com/WordPress/gutenberg/pull/13810), [14](https://github.com/WordPress/gutenberg/pull/13891).
-
-## Mobile
-
-*   Add bottom sheet settings for the image block:
-    *   [alt description](https://github.com/WordPress/gutenberg/pull/13631).
-    *   [Links](https://github.com/WordPress/gutenberg/pull/13654).
-*   Implement [the media upload options](https://github.com/WordPress/gutenberg/pull/13656) sheet.
-*   Implementing [Clear All Settings](https://github.com/WordPress/gutenberg/pull/13753) button on Image Settings.
-*   [Avoid hard-coded font family](https://github.com/WordPress/gutenberg/pull/13677) styling for the image blocks.
-*   Improve [the post title](https://github.com/WordPress/gutenberg/pull/13548) [component](https://github.com/WordPress/gutenberg/pull/13874).
-*   Fix the bottom sheet [styling for RTL](https://github.com/WordPress/gutenberg/pull/13815) layouts.
-*   Support the [placeholder](https://github.com/WordPress/gutenberg/pull/13699) [prop](https://github.com/WordPress/gutenberg/pull/13738) in the RichText component.
+## Changelog
+
+### Features
+
+-   Add a new [Search block](https://github.com/WordPress/gutenberg/pull/13583).
+-   Add a new [Calendar](https://github.com/WordPress/gutenberg/pull/13772) block.
+-   Add a new [Tag Cloud](https://github.com/WordPress/gutenberg/pull/7875) block.
+
+### Enhancements
+
+-   Add micro-animations to the editor UI:
+    -   Opening [Popovers](https://github.com/WordPress/gutenberg/pull/13617).
+    -   Opening [Sidebars](https://github.com/WordPress/gutenberg/pull/13635).
+-   [Restore the block movers](https://github.com/WordPress/gutenberg/pull/12758) for the floated blocks.
+-   [Consistency in alignment options](https://github.com/WordPress/gutenberg/pull/9469) between archives and categories blocks.
+-   Set the minimum size for [form fields on mobile](https://github.com/WordPress/gutenberg/pull/13639).
+-   [Disable the block navigation](https://github.com/WordPress/gutenberg/pull/12185) in the code editor mode.
+-   Consistency for the [modal styles](https://github.com/WordPress/gutenberg/pull/13669).
+-   Improve the [FormToggle](https://github.com/WordPress/gutenberg/pull/12385) styling when used outside of WordPress context.
+-   Use the block [icons in the media placeholders](https://github.com/WordPress/gutenberg/pull/11788).
+-   Fix [rounded corners](https://github.com/WordPress/gutenberg/pull/13659) for the block svg icons.
+-   Improve the [CSS specificity](https://github.com/WordPress/gutenberg/pull/13025) [of the paragraph](https://github.com/WordPress/gutenberg/pull/12998) block [styles](https://github.com/WordPress/gutenberg/pull/13821).
+-   Require an initial [click on embed previews](https://github.com/WordPress/gutenberg/pull/12981) before being interactive.
+-   Improve the [disabled block switcher](https://github.com/WordPress/gutenberg/pull/13721) styles.
+-   [Do not split paragraph line breaks](https://github.com/WordPress/gutenberg/pull/13832) when transforming multiple paragraphs to a list.
+-   Enhance the Quote block styling for [different text alignments](https://github.com/WordPress/gutenberg/pull/13248).
+-   Remove the [left padding from the Quote](https://github.com/WordPress/gutenberg/pull/13846) block when it’s centered.
+-   A11y:
+    -   Improve the [permalink field label](https://github.com/WordPress/gutenberg/pull/12959).
+    -   Improve the [region navigation](https://github.com/WordPress/gutenberg/pull/8554) styling.
+-   Remove the [3 keywords limit](https://github.com/WordPress/gutenberg/pull/13848) for the block registration.
+-   Add consistent background colors to the [hovered menu items](https://github.com/WordPress/gutenberg/pull/13732).
+-   Allow the [editor notices to push down](https://github.com/WordPress/gutenberg/pull/13614) the content.
+-   Rename the [default block styles](https://github.com/WordPress/gutenberg/pull/13670).
+
+### Bug Fixes
+
+-   Fix a number of formatting issues:
+    -   [Multiple formats](https://github.com/WordPress/gutenberg/issues/12973).
+    -   [Flashing backgrounds](https://github.com/WordPress/gutenberg/issues/12978) when typing.
+    -   [Highlighted format](https://github.com/WordPress/gutenberg/issues/11091) buttons.
+    -   [Inline code](https://github.com/WordPress/gutenberg/pull/13807) with [backticks](https://github.com/WordPress/gutenberg/issues/11276).
+    -   [Spaces deleted](https://github.com/WordPress/gutenberg/issues/12529) after formats.
+    -   Inline [boundaries styling](https://github.com/WordPress/gutenberg/issues/11423) issues.
+    -   [Touch Bar](https://github.com/WordPress/gutenberg/pull/13833) format buttons.
+-   Fix a number of list block writing flow issues:
+    -   Allow [line breaks](https://github.com/WordPress/gutenberg/pull/13546) in list items.
+    -   [Empty items](https://github.com/WordPress/gutenberg/issues/13864) not being removed.
+    -   Backspace [merging list items](https://github.com/WordPress/gutenberg/issues/12398).
+    -   [Selecting formats](https://github.com/WordPress/gutenberg/issues/11741) at the beginning of list items.
+-   Fix the [color picker styling](https://github.com/WordPress/gutenberg/pull/12747).
+-   Set default values for the [image dimensions inputs](https://github.com/WordPress/gutenberg/pull/7687).
+-   Fix [sidebar panels spacing](https://github.com/WordPress/gutenberg/pull/13181).
+-   Fix [wording of the nux tip](https://github.com/WordPress/gutenberg/pull/12911) nudging about the sidebar settings.
+-   Fix [the translator comments](https://github.com/WordPress/gutenberg/pull/9440) pot extraction.
+-   Fix the [plugins icons](https://github.com/WordPress/gutenberg/pull/13719) color overriding.
+-   Fix [conflicting notices styles](https://github.com/WordPress/gutenberg/pull/13817) when using editor styles.
+-   Fix [controls recursion](https://github.com/WordPress/gutenberg/pull/13818) in the redux-routine package.
+-   Fix the generic embed block when using [Giphy as provider](https://github.com/WordPress/gutenberg/pull/13825).
+-   Fix the [i18n message](https://github.com/WordPress/gutenberg/pull/13830) used in the Gallery block edit button.
+-   Fix the [icon size](https://github.com/WordPress/gutenberg/pull/13767) of the block switcher menu.
+-   Fix the [loading state](https://github.com/WordPress/gutenberg/pull/13758) of the FlatTermSelector (tags selector).
+-   Fix the [embed placeholders](https://github.com/WordPress/gutenberg/pull/13590) styling.
+-   Fix incorrectly triggered [auto-saves for published posts](https://github.com/WordPress/gutenberg/pull/12624).
+-   Fix [missing classname](https://github.com/WordPress/gutenberg/pull/13834) in the Latest comments block.
+-   Fix [HTML in shortcodes](https://github.com/WordPress/gutenberg/pull/13609) breaking block validation.
+-   Fix JavaScript errors when [typing quickly](https://github.com/WordPress/gutenberg/pull/11209) and creating undo levels.
+-   Fix issue with [mover colors](https://github.com/WordPress/gutenberg/pull/13869) in dark themes.
+-   Fix [internationalisation issue](https://github.com/WordPress/gutenberg/pull/13551) with permalink slugs.
+
+### Various
+
+-   Implement the [inline format boundaries](https://github.com/WordPress/gutenberg/pull/13697) without relying on the DOM.
+-   Introduce the [Registry Selectors](https://github.com/WordPress/gutenberg/pull/13662) in the data module.
+-   Introduce the [Registry Controls](https://github.com/WordPress/gutenberg/pull/13722) in the data module.
+-   Allow extending the [latest posts block query](https://github.com/WordPress/gutenberg/pull/11984) by using get_posts.
+-   Extend the [range of allowed years](https://github.com/WordPress/gutenberg/pull/13602) in the DateTime component.
+-   Allow [null values](https://github.com/WordPress/gutenberg/pull/12963) for the DateTime component.
+-   Do not render the [FontSizePicker](https://github.com/WordPress/gutenberg/pull/13782) if [no sizes](https://github.com/WordPress/gutenberg/pull/13824) [defined](https://github.com/WordPress/gutenberg/pull/13844).
+-   Add className prop support to the [UrlInput](https://github.com/WordPress/gutenberg/pull/13800) component.
+-   Add [inline image resizing UI](https://github.com/WordPress/gutenberg/pull/13737).
+
+### Chore
+
+-   Update [lodash](https://github.com/WordPress/gutenberg/pull/13651) and [deasync](https://github.com/WordPress/gutenberg/pull/13839) [dependencies](https://github.com/WordPress/gutenberg/pull/13876).
+-   Use [addQueryArgs](https://github.com/WordPress/gutenberg/pull/13653) consistently to generate WordPress links.
+-   Remove merged PHP code:
+    -   jQuery to Hooks [heartbeat proxyfying](https://github.com/WordPress/gutenberg/pull/13576).
+    -   References to the [classic editor](https://github.com/WordPress/gutenberg/pull/13544).
+    -   [gutenberg_can_edit_post](https://github.com/WordPress/gutenberg/pull/13470) function.
+-   [Disable CSS](https://github.com/WordPress/gutenberg/pull/13769) [animations](https://github.com/WordPress/gutenberg/pull/13779) in e2e tests.
+-   ESLint
+    -   Add a rule to ensure the [consistency](https://github.com/WordPress/gutenberg/pull/13785) [of the import groups](https://github.com/WordPress/gutenberg/pull/13757).
+    -   Add a rule to protect against [invalid sprintf use](https://github.com/WordPress/gutenberg/pull/13756).
+-   Remove [obsolete](https://github.com/WordPress/gutenberg/pull/13871) [CSS](https://github.com/WordPress/gutenberg/pull/13867) rules.
+-   Add e2e tests for [tags creation](https://github.com/WordPress/gutenberg/pull/13129).
+-   Add the [feature flags](https://github.com/WordPress/gutenberg/pull/13324) setup.
+-   Implement [block editor styles](https://github.com/WordPress/gutenberg/pull/13625) using a filter.
+
+### Documentation
+
+-   Add a new [tutorial about the editor notices](https://github.com/WordPress/gutenberg/pull/13703).
+-   Add JavaScript [build tools](https://github.com/WordPress/gutenberg/pull/13629) [documentation](https://github.com/WordPress/gutenberg/pull/13853).
+-   Enhance the block’s [edit/save documentation](https://github.com/WordPress/gutenberg/pull/13578) and code examples.
+-   Use [Title Case](https://github.com/WordPress/gutenberg/pull/13714) consistently.
+-   Add [e2e test utils](https://github.com/WordPress/gutenberg/pull/13856) documentation.
+-   Small enhancements and typos: [1](https://github.com/WordPress/gutenberg/pull/13593), [2](https://github.com/WordPress/gutenberg/pull/13671), [3](https://github.com/WordPress/gutenberg/pull/13711), [4](https://github.com/WordPress/gutenberg/pull/13746), [5](https://github.com/WordPress/gutenberg/pull/13742), [6](https://github.com/WordPress/gutenberg/pull/13733), [7](https://github.com/WordPress/gutenberg/pull/13744), [8](https://github.com/WordPress/gutenberg/pull/13752), [9](https://github.com/WordPress/gutenberg/pull/13574), [10](https://github.com/WordPress/gutenberg/pull/13745), [11](https://github.com/WordPress/gutenberg/pull/13781), [12](https://github.com/WordPress/gutenberg/pull/13694), [13](https://github.com/WordPress/gutenberg/pull/13810), [14](https://github.com/WordPress/gutenberg/pull/13891).
+
+### Mobile
+
+-   Add bottom sheet settings for the image block:
+    -   [alt description](https://github.com/WordPress/gutenberg/pull/13631).
+    -   [Links](https://github.com/WordPress/gutenberg/pull/13654).
+-   Implement [the media upload options](https://github.com/WordPress/gutenberg/pull/13656) sheet.
+-   Implementing [Clear All Settings](https://github.com/WordPress/gutenberg/pull/13753) button on Image Settings.
+-   [Avoid hard-coded font family](https://github.com/WordPress/gutenberg/pull/13677) styling for the image blocks.
+-   Improve [the post title](https://github.com/WordPress/gutenberg/pull/13548) [component](https://github.com/WordPress/gutenberg/pull/13874).
+-   Fix the bottom sheet [styling for RTL](https://github.com/WordPress/gutenberg/pull/13815) layouts.
+-   Support the [placeholder](https://github.com/WordPress/gutenberg/pull/13699) [prop](https://github.com/WordPress/gutenberg/pull/13738) in the RichText component.
 
 = 5.0.0 =
 
+## Changelog
+
 ### Features
-- Add a new [RSS block](https://github.com/WordPress/gutenberg/pull/7966) and follow-up improvements: [1](https://github.com/WordPress/gutenberg/pull/13501), [2](https://github.com/WordPress/gutenberg/pull/13502).
-- Add a new [Amazon Kindle embed block](https://github.com/WordPress/gutenberg/pull/13510).
-- Add a new [FocalPointPicker](https://github.com/WordPress/gutenberg/pull/10925) component and use it to define the focal point of the Cover block background.
+
+-   Add a new [RSS block](https://github.com/WordPress/gutenberg/pull/7966) and follow-up improvements: [1](https://github.com/WordPress/gutenberg/pull/13501), [2](https://github.com/WordPress/gutenberg/pull/13502).
+-   Add a new [Amazon Kindle embed block](https://github.com/WordPress/gutenberg/pull/13510).
+-   Add a new [FocalPointPicker](https://github.com/WordPress/gutenberg/pull/10925) component and use it to define the focal point of the Cover block background.
 
 ### Enhancements
-- Optimize the re-rendering performance when [inserting/removing blocks](https://github.com/WordPress/gutenberg/pull/13067).
-- Improve the [Reusable Blocks UX](https://github.com/WordPress/gutenberg/pull/12378) for contributor users.
-- Disable [embed previews](https://github.com/WordPress/gutenberg/pull/12961) for the smugmug provider.
-- Make [the fullscreen mode](https://github.com/WordPress/gutenberg/pull/13425) a desktop-only feature.
-- Accessibility: Add [speak messages](https://github.com/WordPress/gutenberg/pull/13385) when using the FeatureToggle component.
-- Accessibility:  Change the inserter [search result message](https://github.com/WordPress/gutenberg/pull/13388) from assertive to polite.
-- Accessibility:  Remove [duplicate aria label](https://github.com/WordPress/gutenberg/pull/12955) from menu items.
-- Remove the "[Show Download Button](https://github.com/WordPress/gutenberg/pull/13485)" toggle help text in the File block.
-- Render [the block switcher as disabled](https://github.com/WordPress/gutenberg/pull/13431) if not available in a multi-selection.
-- Use a back arrow icon to clarify the [Fullscreen mode exit button](https://github.com/WordPress/gutenberg/pull/13403).
-- Limit the [Gallery block columns count](https://github.com/WordPress/gutenberg/pull/13488) to the images count.
-- Automatically set a [default block style](https://github.com/WordPress/gutenberg/pull/12519) if missing.
-- Hide [empty categories](https://github.com/WordPress/gutenberg/pull/13549) from the Categories block in the editor.
-- Increase the padding of [the gallery captions](https://github.com/WordPress/gutenberg/pull/13623).
-- Add [left/right alignments](https://github.com/WordPress/gutenberg/pull/8814) to the latest posts block.
-- Improve the [columns margins](https://github.com/WordPress/gutenberg/pull/12199).
-- Add a [help text for the hide teaser toggle](https://github.com/WordPress/gutenberg/pull/13630) in the More block.
-- Improve the wording of the [embed block messages](https://github.com/WordPress/gutenberg/pull/13644).
-
-### Bug Fixes
-- Accessibility: Fix [the tab order](https://github.com/WordPress/gutenberg/pull/11863) of the date picker component.
-- Support [non hierarchical taxonomies](https://github.com/WordPress/gutenberg/pull/13076) in the category selector component.
-- Fix blocks [marked invalid incorrectly](https://github.com/WordPress/gutenberg/pull/13512) due to special HTML characters.
-- Fix the [Notice component styling](https://github.com/WordPress/gutenberg/pull/13371).
-- Fix the [:root selector](https://github.com/WordPress/gutenberg/pull/13325) in the editor styles.
-- Fix [duplicate block](https://github.com/WordPress/gutenberg/pull/12882) toolbars.
-- Fix [warning message](https://github.com/WordPress/gutenberg/pull/12933) when using the DateTimePicker component.
-- Fix the [File block](https://github.com/WordPress/gutenberg/pull/13432) and [Categories block](https://github.com/WordPress/gutenberg/pull/13439) style when applying custom classnames.
-- Fix the [Gallery block styling](https://github.com/WordPress/gutenberg/pull/13326) in Microsoft Edge.
-- Fix the [Button block styling](https://github.com/WordPress/gutenberg/pull/12183) when links are visited.
-- Fix Block Style [preview not dismissed](https://github.com/WordPress/gutenberg/pull/12317) after selection.
-- Fix [TabPanel buttons](https://github.com/WordPress/gutenberg/pull/11944) incorrectly submitting forms.
-- Fix [hierarchical dropdown](https://github.com/WordPress/gutenberg/pull/13567) in the Categories block.
-- Fix [wording](https://github.com/WordPress/gutenberg/pull/13479) for the color picker saturation.
-- Fix the [save keyboard shortcut](https://github.com/WordPress/gutenberg/pull/13159) while in the code editor mode.
-- Fix the [Google Docs table](https://github.com/WordPress/gutenberg/pull/13543) pasting.
-- Fix [jumps when indenting/outdenting](https://github.com/WordPress/gutenberg/pull/12941) list items.
-- Fix [FontSizePicker max width](https://github.com/WordPress/gutenberg/pull/13264) on mobile.
-- Fix PHP 5.2.2 [Parser issue](https://github.com/WordPress/gutenberg/pull/13369).
-- Fix [plural messages](https://github.com/WordPress/gutenberg/pull/13577) POT generation.
+
+-   Optimize the re-rendering performance when [inserting/removing blocks](https://github.com/WordPress/gutenberg/pull/13067).
+-   Improve the [Reusable Blocks UX](https://github.com/WordPress/gutenberg/pull/12378) for contributor users.
+-   Disable [embed previews](https://github.com/WordPress/gutenberg/pull/12961) for the smugmug provider.
+-   Make [the fullscreen mode](https://github.com/WordPress/gutenberg/pull/13425) a desktop-only feature.
+-   Accessibility: Add [speak messages](https://github.com/WordPress/gutenberg/pull/13385) when using the FeatureToggle component.
+-   Accessibility: Change the inserter [search result message](https://github.com/WordPress/gutenberg/pull/13388) from assertive to polite.
+-   Accessibility: Remove [duplicate aria label](https://github.com/WordPress/gutenberg/pull/12955) from menu items.
+-   Remove the "[Show Download Button](https://github.com/WordPress/gutenberg/pull/13485)" toggle help text in the File block.
+-   Render [the block switcher as disabled](https://github.com/WordPress/gutenberg/pull/13431) if not available in a multi-selection.
+-   Use a back arrow icon to clarify the [Fullscreen mode exit button](https://github.com/WordPress/gutenberg/pull/13403).
+-   Limit the [Gallery block columns count](https://github.com/WordPress/gutenberg/pull/13488) to the images count.
+-   Automatically set a [default block style](https://github.com/WordPress/gutenberg/pull/12519) if missing.
+-   Hide [empty categories](https://github.com/WordPress/gutenberg/pull/13549) from the Categories block in the editor.
+-   Increase the padding of [the gallery captions](https://github.com/WordPress/gutenberg/pull/13623).
+-   Add [left/right alignments](https://github.com/WordPress/gutenberg/pull/8814) to the latest posts block.
+-   Improve the [columns margins](https://github.com/WordPress/gutenberg/pull/12199).
+-   Add a [help text for the hide teaser toggle](https://github.com/WordPress/gutenberg/pull/13630) in the More block.
+-   Improve the wording of the [embed block messages](https://github.com/WordPress/gutenberg/pull/13644).
+
+### Bug Fixes
+
+-   Accessibility: Fix [the tab order](https://github.com/WordPress/gutenberg/pull/11863) of the date picker component.
+-   Support [non hierarchical taxonomies](https://github.com/WordPress/gutenberg/pull/13076) in the category selector component.
+-   Fix blocks [marked invalid incorrectly](https://github.com/WordPress/gutenberg/pull/13512) due to special HTML characters.
+-   Fix the [Notice component styling](https://github.com/WordPress/gutenberg/pull/13371).
+-   Fix the [:root selector](https://github.com/WordPress/gutenberg/pull/13325) in the editor styles.
+-   Fix [duplicate block](https://github.com/WordPress/gutenberg/pull/12882) toolbars.
+-   Fix [warning message](https://github.com/WordPress/gutenberg/pull/12933) when using the DateTimePicker component.
+-   Fix the [File block](https://github.com/WordPress/gutenberg/pull/13432) and [Categories block](https://github.com/WordPress/gutenberg/pull/13439) style when applying custom classnames.
+-   Fix the [Gallery block styling](https://github.com/WordPress/gutenberg/pull/13326) in Microsoft Edge.
+-   Fix the [Button block styling](https://github.com/WordPress/gutenberg/pull/12183) when links are visited.
+-   Fix Block Style [preview not dismissed](https://github.com/WordPress/gutenberg/pull/12317) after selection.
+-   Fix [TabPanel buttons](https://github.com/WordPress/gutenberg/pull/11944) incorrectly submitting forms.
+-   Fix [hierarchical dropdown](https://github.com/WordPress/gutenberg/pull/13567) in the Categories block.
+-   Fix [wording](https://github.com/WordPress/gutenberg/pull/13479) for the color picker saturation.
+-   Fix the [save keyboard shortcut](https://github.com/WordPress/gutenberg/pull/13159) while in the code editor mode.
+-   Fix the [Google Docs table](https://github.com/WordPress/gutenberg/pull/13543) pasting.
+-   Fix [jumps when indenting/outdenting](https://github.com/WordPress/gutenberg/pull/12941) list items.
+-   Fix [FontSizePicker max width](https://github.com/WordPress/gutenberg/pull/13264) on mobile.
+-   Fix PHP 5.2.2 [Parser issue](https://github.com/WordPress/gutenberg/pull/13369).
+-   Fix [plural messages](https://github.com/WordPress/gutenberg/pull/13577) POT generation.
 
 ### Various
-- Add [ESnext build setup](https://github.com/WordPress/gutenberg/pull/12837) and commands to the @wordpress/scripts package.
-- Add "[focus on mount](https://github.com/WordPress/gutenberg/pull/12855)" config to the DropDown component.
-- Improve [the error handling](https://github.com/WordPress/gutenberg/pull/13315) in the data module resulting in clearer messages displayed in the console.
-- Support [marking days as invalid](https://github.com/WordPress/gutenberg/pull/12962) in the DatePicker component.
-- Support [block transforms](https://github.com/WordPress/gutenberg/pull/11979) with inner blocks.
-- Improve the styles of the [editor notices with actions](https://github.com/WordPress/gutenberg/pull/13116).
-- Replace Polldaddy embed block with [Crowdsignal](https://github.com/WordPress/gutenberg/pull/12854).
-- Avoid [setting the generic Edit Post](https://github.com/WordPress/gutenberg/pull/13552) Title on load.
-- Deprecate [window._wpLoadGutenbergEditor](https://github.com/WordPress/gutenberg/pull/13547).
-- [Avoid an empty classname](https://github.com/WordPress/gutenberg/pull/11831) when deleting custom classnames.
-- Add [className prop support](https://github.com/WordPress/gutenberg/pull/13568) to the ServerSideRender component.
+
+-   Add [ESnext build setup](https://github.com/WordPress/gutenberg/pull/12837) and commands to the @wordpress/scripts package.
+-   Add "[focus on mount](https://github.com/WordPress/gutenberg/pull/12855)" config to the DropDown component.
+-   Improve [the error handling](https://github.com/WordPress/gutenberg/pull/13315) in the data module resulting in clearer messages displayed in the console.
+-   Support [marking days as invalid](https://github.com/WordPress/gutenberg/pull/12962) in the DatePicker component.
+-   Support [block transforms](https://github.com/WordPress/gutenberg/pull/11979) with inner blocks.
+-   Improve the styles of the [editor notices with actions](https://github.com/WordPress/gutenberg/pull/13116).
+-   Replace Polldaddy embed block with [Crowdsignal](https://github.com/WordPress/gutenberg/pull/12854).
+-   Avoid [setting the generic Edit Post](https://github.com/WordPress/gutenberg/pull/13552) Title on load.
+-   Deprecate [window.\_wpLoadGutenbergEditor](https://github.com/WordPress/gutenberg/pull/13547).
+-   [Avoid an empty classname](https://github.com/WordPress/gutenberg/pull/11831) when deleting custom classnames.
+-   Add [className prop support](https://github.com/WordPress/gutenberg/pull/13568) to the ServerSideRender component.
 
 ### Documentation
-- Improve the components README files DropdownMenu & RangeControl.
-- Add code example of the [MediaPlaceholder](https://github.com/WordPress/gutenberg/pull/13389) component.
-- Add a [accessibility dedicated](https://github.com/WordPress/gutenberg/pull/13169) page.
-- Add a [Git workflow](https://github.com/WordPress/gutenberg/pull/13534) documentation page.
-- Reorganize [the contributors guide](https://github.com/WordPress/gutenberg/pull/13352).
-- Mention [the dark theme support](https://github.com/WordPress/gutenberg/pull/13375) in the design docs.
-- Enhance [the compose package](https://github.com/WordPress/gutenberg/pull/13496)  [documentation](https://github.com/WordPress/gutenberg/pull/13504).
-- Expand [the block templates](https://github.com/WordPress/gutenberg/pull/13494/) code examples.
-- Fix [unregisterBlockType](https://github.com/WordPress/gutenberg/pull/13273) code examples.
-- Clarify the block styles [isDefault property](https://github.com/WordPress/gutenberg/pull/11478).
-- Move the [npm packages management](https://github.com/WordPress/gutenberg/pull/13418/) documentation to a dedicated page.
-- Add a section explaining [the links usage](https://github.com/WordPress/gutenberg/pull/13422) in the documentation.
-- Add a note about the [wp-editor dependency](https://github.com/WordPress/gutenberg/pull/12731) when using RichText.
-- Update the [isShallowEqual package](https://github.com/WordPress/gutenberg/pull/13526) documentation and tests.
-- Refresh the [repository management](https://github.com/WordPress/gutenberg/pull/13495) doc.
-- Typos: [1](https://github.com/WordPress/gutenberg/pull/13409), [2](https://github.com/WordPress/gutenberg/pull/13302), [3](https://github.com/WordPress/gutenberg/pull/13541), [4](https://github.com/WordPress/gutenberg/pull/13524), [5](https://github.com/WordPress/gutenberg/pull/13531), [6](https://github.com/WordPress/gutenberg/pull/13582), [7](https://github.com/WordPress/gutenberg/pull/13595).
+
+-   Improve the components README files DropdownMenu & RangeControl.
+-   Add code example of the [MediaPlaceholder](https://github.com/WordPress/gutenberg/pull/13389) component.
+-   Add a [accessibility dedicated](https://github.com/WordPress/gutenberg/pull/13169) page.
+-   Add a [Git workflow](https://github.com/WordPress/gutenberg/pull/13534) documentation page.
+-   Reorganize [the contributors guide](https://github.com/WordPress/gutenberg/pull/13352).
+-   Mention [the dark theme support](https://github.com/WordPress/gutenberg/pull/13375) in the design docs.
+-   Enhance [the compose package](https://github.com/WordPress/gutenberg/pull/13496) [documentation](https://github.com/WordPress/gutenberg/pull/13504).
+-   Expand [the block templates](https://github.com/WordPress/gutenberg/pull/13494/) code examples.
+-   Fix [unregisterBlockType](https://github.com/WordPress/gutenberg/pull/13273) code examples.
+-   Clarify the block styles [isDefault property](https://github.com/WordPress/gutenberg/pull/11478).
+-   Move the [npm packages management](https://github.com/WordPress/gutenberg/pull/13418/) documentation to a dedicated page.
+-   Add a section explaining [the links usage](https://github.com/WordPress/gutenberg/pull/13422) in the documentation.
+-   Add a note about the [wp-editor dependency](https://github.com/WordPress/gutenberg/pull/12731) when using RichText.
+-   Update the [isShallowEqual package](https://github.com/WordPress/gutenberg/pull/13526) documentation and tests.
+-   Refresh the [repository management](https://github.com/WordPress/gutenberg/pull/13495) doc.
+-   Typos: [1](https://github.com/WordPress/gutenberg/pull/13409), [2](https://github.com/WordPress/gutenberg/pull/13302), [3](https://github.com/WordPress/gutenberg/pull/13541), [4](https://github.com/WordPress/gutenberg/pull/13524), [5](https://github.com/WordPress/gutenberg/pull/13531), [6](https://github.com/WordPress/gutenberg/pull/13582), [7](https://github.com/WordPress/gutenberg/pull/13595).
 
 ### Chore
-- Remove PHP Code maintained in Core and bump [minimum WordPress version](https://github.com/WordPress/gutenberg/pull/13370):
-  - [Block registration](https://github.com/WordPress/gutenberg/pull/13412).
-  - [REST API](https://github.com/WordPress/gutenberg/pull/13408) Endpoints.
-  - [Markdown](https://github.com/WordPress/gutenberg/pull/13473) support fix.
-  - Gutenberg [body classname](https://github.com/WordPress/gutenberg/pull/13572) and [responsive classname](https://github.com/WordPress/gutenberg/pull/13461).
-  - [Preloading](https://github.com/WordPress/gutenberg/pull/13453) API calls.
-  - [Block detection utilities](https://github.com/WordPress/gutenberg/pull/13467).
-  - [List screen](https://github.com/WordPress/gutenberg/pull/13459)  [integration](https://github.com/WordPress/gutenberg/pull/13471).
-  - [Block content version](https://github.com/WordPress/gutenberg/pull/13469).
-  - [Block categories](https://github.com/WordPress/gutenberg/pull/13454) hook.
-  - [TinyMCE scripts](https://github.com/WordPress/gutenberg/pull/13466) registration.
-  - [Reusable blocks post type](https://github.com/WordPress/gutenberg/pull/13468)  [labels](https://github.com/WordPress/gutenberg/pull/13472) and [listing page](https://github.com/WordPress/gutenberg/pull/13456).
-  - [Block Types Initialization](https://github.com/WordPress/gutenberg/pull/13457).
-  - [PHP Unit tests](https://github.com/WordPress/gutenberg/pull/13513).
-  - [Compatibility](https://github.com/WordPress/gutenberg/pull/13442) script.
-  - [Meta boxes](https://github.com/WordPress/gutenberg/pull/13449) support.
-  - [Polyfills](https://github.com/WordPress/gutenberg/pull/13536).
-  - [oEmbed Proxy](https://github.com/WordPress/gutenberg/pull/13575) Endpoint filter.
-  - [Visual Editing](https://github.com/WordPress/gutenberg/pull/13608) Disabling.
-- Update [browserlist dependency](https://github.com/WordPress/gutenberg/pull/13395).
-- New E2E tests: [Date floating for pending posts](https://github.com/WordPress/gutenberg/pull/13281).
-- New ESlint rules:
-  - Enforce ES6 [object shorthand](https://github.com/WordPress/gutenberg/pull/13400) syntax.
-  - [Declare variables](https://github.com/WordPress/gutenberg/pull/12828) only when used.
-- Use [ES5 eslint config](https://github.com/WordPress/gutenberg/pull/13428) for the is-shallow-equal package.
-- Mark the eslint config as [a root config](https://github.com/WordPress/gutenberg/pull/13483).
-- Remove [the feedback form](https://github.com/WordPress/gutenberg/pull/10705) from the plugin.
-- I18n:
-  - Use [a placeholder](https://github.com/WordPress/gutenberg/pull/13487) for the WordPress minimum version.
-  - Use [Sentence case](https://github.com/WordPress/gutenberg/pull/12239) in toolbar tooltips.
-- Add [the FontAwesome licenses](https://github.com/WordPress/gutenberg/pull/12929) to the GPL 2 compatible licenses.
-- Move the [generated spec parser](https://github.com/WordPress/gutenberg/pull/13493) to the corresponding package.
-- Refactor the [nonce  apiFetch middleware](https://github.com/WordPress/gutenberg/pull/13451).
-- Refactor the list block [indent/outdent buttons](https://github.com/WordPress/gutenberg/pull/12667).
-- Fix [watching file changes](https://github.com/WordPress/gutenberg/pull/13448) on Linux.
-- Update [the question issue template](https://github.com/WordPress/gutenberg/pull/13351) in GitHub to redirect help requests.
-- Fix [wp-settings permissions](https://github.com/WordPress/gutenberg/pull/13539) in the local development environment.
-- Use a filter to [populate the demo content](https://github.com/WordPress/gutenberg/pull/13553).
+
+-   Remove PHP Code maintained in Core and bump [minimum WordPress version](https://github.com/WordPress/gutenberg/pull/13370):
+    -   [Block registration](https://github.com/WordPress/gutenberg/pull/13412).
+    -   [REST API](https://github.com/WordPress/gutenberg/pull/13408) Endpoints.
+    -   [Markdown](https://github.com/WordPress/gutenberg/pull/13473) support fix.
+    -   Gutenberg [body classname](https://github.com/WordPress/gutenberg/pull/13572) and [responsive classname](https://github.com/WordPress/gutenberg/pull/13461).
+    -   [Preloading](https://github.com/WordPress/gutenberg/pull/13453) API calls.
+    -   [Block detection utilities](https://github.com/WordPress/gutenberg/pull/13467).
+    -   [List screen](https://github.com/WordPress/gutenberg/pull/13459) [integration](https://github.com/WordPress/gutenberg/pull/13471).
+    -   [Block content version](https://github.com/WordPress/gutenberg/pull/13469).
+    -   [Block categories](https://github.com/WordPress/gutenberg/pull/13454) hook.
+    -   [TinyMCE scripts](https://github.com/WordPress/gutenberg/pull/13466) registration.
+    -   [Reusable blocks post type](https://github.com/WordPress/gutenberg/pull/13468) [labels](https://github.com/WordPress/gutenberg/pull/13472) and [listing page](https://github.com/WordPress/gutenberg/pull/13456).
+    -   [Block Types Initialization](https://github.com/WordPress/gutenberg/pull/13457).
+    -   [PHP Unit tests](https://github.com/WordPress/gutenberg/pull/13513).
+    -   [Compatibility](https://github.com/WordPress/gutenberg/pull/13442) script.
+    -   [Meta boxes](https://github.com/WordPress/gutenberg/pull/13449) support.
+    -   [Polyfills](https://github.com/WordPress/gutenberg/pull/13536).
+    -   [oEmbed Proxy](https://github.com/WordPress/gutenberg/pull/13575) Endpoint filter.
+    -   [Visual Editing](https://github.com/WordPress/gutenberg/pull/13608) Disabling.
+-   Update [browserlist dependency](https://github.com/WordPress/gutenberg/pull/13395).
+-   New E2E tests: [Date floating for pending posts](https://github.com/WordPress/gutenberg/pull/13281).
+-   New ESlint rules:
+    -   Enforce ES6 [object shorthand](https://github.com/WordPress/gutenberg/pull/13400) syntax.
+    -   [Declare variables](https://github.com/WordPress/gutenberg/pull/12828) only when used.
+-   Use [ES5 eslint config](https://github.com/WordPress/gutenberg/pull/13428) for the is-shallow-equal package.
+-   Mark the eslint config as [a root config](https://github.com/WordPress/gutenberg/pull/13483).
+-   Remove [the feedback form](https://github.com/WordPress/gutenberg/pull/10705) from the plugin.
+-   I18n:
+    -   Use [a placeholder](https://github.com/WordPress/gutenberg/pull/13487) for the WordPress minimum version.
+    -   Use [Sentence case](https://github.com/WordPress/gutenberg/pull/12239) in toolbar tooltips.
+-   Add [the FontAwesome licenses](https://github.com/WordPress/gutenberg/pull/12929) to the GPL 2 compatible licenses.
+-   Move the [generated spec parser](https://github.com/WordPress/gutenberg/pull/13493) to the corresponding package.
+-   Refactor the [nonce apiFetch middleware](https://github.com/WordPress/gutenberg/pull/13451).
+-   Refactor the list block [indent/outdent buttons](https://github.com/WordPress/gutenberg/pull/12667).
+-   Fix [watching file changes](https://github.com/WordPress/gutenberg/pull/13448) on Linux.
+-   Update [the question issue template](https://github.com/WordPress/gutenberg/pull/13351) in GitHub to redirect help requests.
+-   Fix [wp-settings permissions](https://github.com/WordPress/gutenberg/pull/13539) in the local development environment.
+-   Use a filter to [populate the demo content](https://github.com/WordPress/gutenberg/pull/13553).
 
 ### Mobile
-- Improve the [hide keyboard](https://github.com/WordPress/gutenberg/pull/13415) button.
-- Add the [PostTitle](https://github.com/WordPress/gutenberg/pull/13199) component support.
-- Support [Enter key press](https://github.com/WordPress/gutenberg/pull/13500) in the post title.
-- Support [native Media Upload](https://github.com/WordPress/gutenberg/pull/13128).
-- Support [undo/redo](https://github.com/WordPress/gutenberg/pull/13514) in the post title.
-- Make the [InspectorControls](https://github.com/WordPress/gutenberg/pull/13597) available for mobile blocks.
-- Add [failed media upload](https://github.com/WordPress/gutenberg/pull/13615) support and cancel buttons.
-- Introduce the [BottomSheet](https://github.com/WordPress/gutenberg/pull/13612)  [component](https://github.com/WordPress/gutenberg/pull/13633).
+
+-   Improve the [hide keyboard](https://github.com/WordPress/gutenberg/pull/13415) button.
+-   Add the [PostTitle](https://github.com/WordPress/gutenberg/pull/13199) component support.
+-   Support [Enter key press](https://github.com/WordPress/gutenberg/pull/13500) in the post title.
+-   Support [native Media Upload](https://github.com/WordPress/gutenberg/pull/13128).
+-   Support [undo/redo](https://github.com/WordPress/gutenberg/pull/13514) in the post title.
+-   Make the [InspectorControls](https://github.com/WordPress/gutenberg/pull/13597) available for mobile blocks.
+-   Add [failed media upload](https://github.com/WordPress/gutenberg/pull/13615) support and cancel buttons.
+-   Introduce the [BottomSheet](https://github.com/WordPress/gutenberg/pull/13612) [component](https://github.com/WordPress/gutenberg/pull/13633).
 
 = 4.9.0 =
 
+## Changelog
+
 ### Performance
-- Implement an async rendering mode for the data module updates.
-- Avoid rerendering the block components when selecting a block.
-- Improve the performance of isEditorEmptyPost selector (13% typing performance improvement).
-- Data Module: Avoid persisting unchanged values.
-- Update withSelect to use type-optimized isShallowEqual.
-- Move data selection to event handlers (called only when necessary).
-- Improve the initial rendering time by optimizing the withFilters Higher-order component.
-
-### Bug Fixes
-- Fix RichText toolbar when using multiline=”li”.
-- Correct the margin of the block icons in the inserter.
-- Fix ampersand in post tags causing editor crash.
-- Remove alignundefined class from gallery block edit markup.
-- Disable the button to open the publish sidebar if locked.
-- Correct the default margin for buttons with icons.
-- Keep the date floating when for posts with "pending" status.
-- Fix using the EXIF title when uploading images.
-- Fix font size picker on mobile.
-- Fix z-index of the Reusable Block Inserter button.
-- Fix autop behavior when a text is followed by a div.
-- Fix warning when returning null from a data module generator.
-- Announce the screen reader messages in the correct order in Safari.
-- Check Post Type support in the options modal.
+
+-   Implement an async rendering mode for the data module updates.
+-   Avoid rerendering the block components when selecting a block.
+-   Improve the performance of isEditorEmptyPost selector (13% typing performance improvement).
+-   Data Module: Avoid persisting unchanged values.
+-   Update withSelect to use type-optimized isShallowEqual.
+-   Move data selection to event handlers (called only when necessary).
+-   Improve the initial rendering time by optimizing the withFilters Higher-order component.
+
+### Bug Fixes
+
+-   Fix RichText toolbar when using multiline=”li”.
+-   Correct the margin of the block icons in the inserter.
+-   Fix ampersand in post tags causing editor crash.
+-   Remove alignundefined class from gallery block edit markup.
+-   Disable the button to open the publish sidebar if locked.
+-   Correct the default margin for buttons with icons.
+-   Keep the date floating when for posts with "pending" status.
+-   Fix using the EXIF title when uploading images.
+-   Fix font size picker on mobile.
+-   Fix z-index of the Reusable Block Inserter button.
+-   Fix autop behavior when a text is followed by a div.
+-   Fix warning when returning null from a data module generator.
+-   Announce the screen reader messages in the correct order in Safari.
+-   Check Post Type support in the options modal.
 
 ### Enhancements
-- Support customizing the table background colors.
-- Support underlining text using the keyboard shortcut ctrl+U.
-- Apply the editor styles to the HTML Block Preview.
-- Improve the color swatch selection indicator.
-- Improve scrolling behavior in Fullscreen Mode in Edge.
-- Remove deprecated embed providers.
-- Refactor the alignements support in the Cover Block and the Categories Block.
-- Code quality improvement to getBlockContentSchema
-- Internationalize the excerpt documentation link.
-- Improve pasting of quotes with citations.
-- A11y
-   - Add a tooltip to the block list appender.
-   - Improve the color contrast of the inserter shortcuts.
-   - Remove the label from the Warning component’s menu.
-- Add an option to overwrite the block in the Warning component.
+
+-   Support customizing the table background colors.
+-   Support underlining text using the keyboard shortcut ctrl+U.
+-   Apply the editor styles to the HTML Block Preview.
+-   Improve the color swatch selection indicator.
+-   Improve scrolling behavior in Fullscreen Mode in Edge.
+-   Remove deprecated embed providers.
+-   Refactor the alignements support in the Cover Block and the Categories Block.
+-   Code quality improvement to getBlockContentSchema
+-   Internationalize the excerpt documentation link.
+-   Improve pasting of quotes with citations.
+-   A11y
+    -   Add a tooltip to the block list appender.
+    -   Improve the color contrast of the inserter shortcuts.
+    -   Remove the label from the Warning component’s menu.
+-   Add an option to overwrite the block in the Warning component.
 
 ### Extensibility
-- Support custom fetch handlers for wp.apiFetch.
-- Support additional data passed to the mediaUpload utility.
-- Add filter for the preview interstitial markup.
-- Avoid appending empty query string in wp.url.addQueryArgs.
-- Dispatch heartbeat events as hook actions to avoid the jQuery dependency.
-- Support adding classnames to the plugins sidebar panels.
-- Add a className to the parent page selector.
+
+-   Support custom fetch handlers for wp.apiFetch.
+-   Support additional data passed to the mediaUpload utility.
+-   Add filter for the preview interstitial markup.
+-   Avoid appending empty query string in wp.url.addQueryArgs.
+-   Dispatch heartbeat events as hook actions to avoid the jQuery dependency.
+-   Support adding classnames to the plugins sidebar panels.
+-   Add a className to the parent page selector.
 
 ### Documentation
-- Add tutorials for
-   - Creating sidebar plugins.
-   - Using the Format API.
-   - Creating meta blocks.
-- Reorganize the tutorials page.
-- Improve the UI component documentation:
-   - The ButtonGroup component.
-   - The IconButton component.
-   - The SelectControl component.
-   - The TextareaControl component.
-   - The TabPanel component.
-   - The Toolbar component.
-   - The FormToggle component.
-- Update the Gutenberg Release and the Repository Management docs.
-- Add new section on scoping JS code.
-- Use Block Editor instead of Gutenberg in the docs.
-- Mention the Advanced Controls Panel in the design guidelines.
-- Clarify the unregisterBlockStyle documentation.
-- Clarify the difference between the button block and the button component.
-- Scope JavaScript ES5 code example.
-- Fix incorrect code example.
-- Clarify the deprecated APIs.
-- Fix typos 1 2 3 4 5 6 7.
+
+-   Add tutorials for
+    -   Creating sidebar plugins.
+    -   Using the Format API.
+    -   Creating meta blocks.
+-   Reorganize the tutorials page.
+-   Improve the UI component documentation:
+    -   The ButtonGroup component.
+    -   The IconButton component.
+    -   The SelectControl component.
+    -   The TextareaControl component.
+    -   The TabPanel component.
+    -   The Toolbar component.
+    -   The FormToggle component.
+-   Update the Gutenberg Release and the Repository Management docs.
+-   Add new section on scoping JS code.
+-   Use Block Editor instead of Gutenberg in the docs.
+-   Mention the Advanced Controls Panel in the design guidelines.
+-   Clarify the unregisterBlockStyle documentation.
+-   Clarify the difference between the button block and the button component.
+-   Scope JavaScript ES5 code example.
+-   Fix incorrect code example.
+-   Clarify the deprecated APIs.
+-   Fix typos 1 2 3 4 5 6 7.
 
 ### Chore
-- Improve CI build times.
-- Extract error messages from console logging in E2E tests.
-- Reorganization of the E2E tests setup and expose it as npm packages.
-- Add aXe accessibility E2E tests support.
-- Add E2E tests for the excerpt meta box plugin.
+
+-   Improve CI build times.
+-   Extract error messages from console logging in E2E tests.
+-   Reorganization of the E2E tests setup and expose it as npm packages.
+-   Add aXe accessibility E2E tests support.
+-   Add E2E tests for the excerpt meta box plugin.
 
 ### Mobile
-- Fix the Image Size implementation.
-- Fix scrolling long text content.
+
+-   Fix the Image Size implementation.
+-   Fix scrolling long text content.
 
 = 4.8.0 =
 
+## Changelog
+
 ### Performance
 
- - Improve page initialization time by optimizing the addHook function and the viewport state initialization.
- - Improve typing performance by splitting the state tree.
- - Optimize partial application of runSelector.
- - Move selector calls to the event handles to avoid useless component rerenders.
- - Render DropZone children only when dragging elements over it.
- - Initialize variables only when needed.
+-   Improve page initialization time by optimizing the addHook function and the viewport state initialization.
+-   Improve typing performance by splitting the state tree.
+-   Optimize partial application of runSelector.
+-   Move selector calls to the event handles to avoid useless component rerenders.
+-   Render DropZone children only when dragging elements over it.
+-   Initialize variables only when needed.
 
 ### Enhancements
 
- - Add error messages to the image block on upload failures.
- - Merge similar i18n strings.
- - Disable clipboard button in file block during upload.
- - Persist alignment when transforming a gallery to an image and vice-versa.
- - Copy enhancement to the embed block help text.
- - Improve the scrolling of the WordPress navigation menu.
+-   Add error messages to the image block on upload failures.
+-   Merge similar i18n strings.
+-   Disable clipboard button in file block during upload.
+-   Persist alignment when transforming a gallery to an image and vice-versa.
+-   Copy enhancement to the embed block help text.
+-   Improve the scrolling of the WordPress navigation menu.
 
 ### Bug Fixes
 
- - Fix RTL support for the DatePicker component.
- - Change the header level in the BlockCompare component.
- - Show all the taxonomies in the sidebar.
- - Fix the latest posts date className.
- - Fix the “align center” button in Latest Posts block in the backend.
- - Fix block height when DropCap is used.
- - Fix converting caption shortcode with link.
- - Fix edge case in addQueryArgs function.
- - Don’t return the permalink if the CPT is not publicly viewable.
- - Fix error when saving non public CPTs.
- - Properly disable the Publish button when saving is disabled.
+-   Fix RTL support for the DatePicker component.
+-   Change the header level in the BlockCompare component.
+-   Show all the taxonomies in the sidebar.
+-   Fix the latest posts date className.
+-   Fix the “align center” button in Latest Posts block in the backend.
+-   Fix block height when DropCap is used.
+-   Fix converting caption shortcode with link.
+-   Fix edge case in addQueryArgs function.
+-   Don’t return the permalink if the CPT is not publicly viewable.
+-   Fix error when saving non public CPTs.
+-   Properly disable the Publish button when saving is disabled.
 
 ### Various
 
- - Show a message in the browser’s console when in Quirks Mode.
- - Improvements to the @wordpress/scripts package: A new a check-engines command, a lint-style command and an update to lint-js.
+-   Show a message in the browser’s console when in Quirks Mode.
+-   Improvements to the @wordpress/scripts package: A new a check-engines command, a lint-style command and an update to lint-js.
 
 ### Documentation
 
- - Add a getting started with JavaScript tutorial.
- - Document the blocks’ setup states in the design guidelines.
- - Add content to Contributors index page.
- - Improve the components documentation:
-    - The MenuItem component.
-    - The RadioControl component.
-    - The ServerSideRender component.
- - Organise the documentation assets in a dedicated folder.
- - Clarify immutability of the block attributes.
- - Fix the metabox back compat code example.
- - Fix incorrect data module example.
- - Improve the plugin release docs.
- - Remove useless property from the colors code example.
- - Improve the contributing documentation.
- - Fix npm README links.
- - Update the design resources link.
- - Typo fixes.
+-   Add a getting started with JavaScript tutorial.
+-   Document the blocks’ setup states in the design guidelines.
+-   Add content to Contributors index page.
+-   Improve the components documentation:
+    -   The MenuItem component.
+    -   The RadioControl component.
+    -   The ServerSideRender component.
+-   Organise the documentation assets in a dedicated folder.
+-   Clarify immutability of the block attributes.
+-   Fix the metabox back compat code example.
+-   Fix incorrect data module example.
+-   Improve the plugin release docs.
+-   Remove useless property from the colors code example.
+-   Improve the contributing documentation.
+-   Fix npm README links.
+-   Update the design resources link.
+-   Typo fixes.
 
 ### Chore
 
- - Run e2e tests with popular plugins enabled.
- - Add new e2e tests:
-    - The permalink panel.
-    - The categories panel.
-    - Blocks with meta attributes.
- - Update node-sass to fix Node 11 support.
- - Move the dev dependencies to the root package.json.
- - Improve the Pull Request Template.
- - More logs to the CI jobs.
- - Code style fixes and expand the phpcs coverage.
- - Disable fragile e2e tests.
- - Avoid PHP notices when running the e2e tests in debug mode.
+-   Run e2e tests with popular plugins enabled.
+-   Add new e2e tests:
+    -   The permalink panel.
+    -   The categories panel.
+    -   Blocks with meta attributes.
+-   Update node-sass to fix Node 11 support.
+-   Move the dev dependencies to the root package.json.
+-   Improve the Pull Request Template.
+-   More logs to the CI jobs.
+-   Code style fixes and expand the phpcs coverage.
+-   Disable fragile e2e tests.
+-   Avoid PHP notices when running the e2e tests in debug mode.
 
 ### Mobile
 
- - Make a simple version of DefaultBlockAppender.
- - Stop using classname-to-style autotransform in react native.
- - Fix SVG styles.
- - Implement Enter press to add a default block.
- - Hide keyboard when non textual block is selected.
- - Fix undo/redo on new blocks.
- - Pass the blockType prop to RNAztecView.
- - Expose unregisterBlockType.
+-   Make a simple version of DefaultBlockAppender.
+-   Stop using classname-to-style autotransform in react native.
+-   Fix SVG styles.
+-   Implement Enter press to add a default block.
+-   Hide keyboard when non textual block is selected.
+-   Fix undo/redo on new blocks.
+-   Pass the blockType prop to RNAztecView.
+-   Expose unregisterBlockType.
 
 = 4.7.1 =
 
-### Bug fix
+## Changelog
+
+### Bug fixes
 
-* Editor: Restore the block prop in the BlockListBlock filter
+-   Editor: Restore the block prop in the BlockListBlock filter
 
 = 4.7.0 =
 
+## Changelog
+
 ### Performance improvements
 
-* Optimize isViewportMatch
-* Performance: BlockListAppender: 1.7x increase on key press
-* Date: Optimize the usage of moment-timezone to save some kilobytes
-* RichText: selectionChange: bind on focus, unbind on blur
-* RichText: only replace range and nodes if different
-* Cache createBlock call in isUnmodifiedDefaultBlock
-* Edit Post: Select blocks only once multiple verified
-* RichText: Do not run valueToEditableHTML on every render
-* RichText: Reuse DOM document across calls to createEmpty
-* Only initialise TinyMCE once per instance
-* Optimize the insertion point component
-* Avoid rerending the current block if the previous block change
-* Avoid getBlock in block-list/block
-* Pass the registry argument to withDispatch to allow selectors to be used
+-   Optimize isViewportMatch
+-   Performance: BlockListAppender: 1.7x increase on key press
+-   Date: Optimize the usage of moment-timezone to save some kilobytes
+-   RichText: selectionChange: bind on focus, unbind on blur
+-   RichText: only replace range and nodes if different
+-   Cache createBlock call in isUnmodifiedDefaultBlock
+-   Edit Post: Select blocks only once multiple verified
+-   RichText: Do not run valueToEditableHTML on every render
+-   RichText: Reuse DOM document across calls to createEmpty
+-   Only initialise TinyMCE once per instance
+-   Optimize the insertion point component
+-   Avoid rerending the current block if the previous block change
+-   Avoid getBlock in block-list/block
+-   Pass the registry argument to withDispatch to allow selectors to be used
 
 ### Bug fixes
 
-* Annotations: Apply annotation className as string
-* RichText: Ensure instance is selected before setting back selection
-* Meta Boxes: Don’t hide disabled meta boxes by modifying DOM
-* Fix: Problems on Media & Text block resizing; Load wp-block-library styles before wp-edit-blocks
-* When a post is saved, check for tinymce and save any editors.
-* Fix: Undoing Image Selection from Media Library in Image Block breaks it
-* Add an end-to-end test for the HTML block
-* Fix regression when copying or cutting content in the editor
-* Fix issue where default appender has icons overlaying the text
-* Set document title for preview loading interstitial
-* Fix: Upload permissions error on end-to-end inline tokens test
-* Ensure classic block caret is in correct position after blur
-* Fix tab navigation sometimes skipping block UI
-* Improve font size picker accessibility: Use a menuitemradio role and better labels
-* Don’t show trashed reusable blocks in the editor or frontend
-* Rename functions, removing gutenberg_ prefix
-* Add block switcher end-to-end tests
-* Allow links in plugin group in the editor more menu
-* Introduce searching of block categories from slash inserter
-* Convert HTML formatting whitespace to spaces
-* Label link format with selected text, not full text
-* Ensure permalink panel is only displayed when a permalink is allowed
-* Allow the user to convert unembeddable URLs to links and try embedding again
-* Improve the top bar tools interaction and consistency
-* Fix overflowing content in the facebook embed preview screen
-* Add an action to set a category icon and correct block categories documentation
-* Fix: pasting a tag that is part of a transform and not matched ignores the content.
-* Packages: Extract Eslint config package
-* Add end-to-end test to catch revert of title during a preview after saving a draft
-* Avoid react warnings when merging two adjacent paragraphs
-* Avoid PHP notice in the recent comments block
+-   Annotations: Apply annotation className as string
+-   RichText: Ensure instance is selected before setting back selection
+-   Meta Boxes: Don’t hide disabled meta boxes by modifying DOM
+-   Fix: Problems on Media & Text block resizing; Load wp-block-library styles before wp-edit-blocks
+-   When a post is saved, check for tinymce and save any editors.
+-   Fix: Undoing Image Selection from Media Library in Image Block breaks it
+-   Add an end-to-end test for the HTML block
+-   Fix regression when copying or cutting content in the editor
+-   Fix issue where default appender has icons overlaying the text
+-   Set document title for preview loading interstitial
+-   Fix: Upload permissions error on end-to-end inline tokens test
+-   Ensure classic block caret is in correct position after blur
+-   Fix tab navigation sometimes skipping block UI
+-   Improve font size picker accessibility: Use a menuitemradio role and better labels
+-   Don’t show trashed reusable blocks in the editor or frontend
+-   Rename functions, removing gutenberg\_ prefix
+-   Add block switcher end-to-end tests
+-   Allow links in plugin group in the editor more menu
+-   Introduce searching of block categories from slash inserter
+-   Convert HTML formatting whitespace to spaces
+-   Label link format with selected text, not full text
+-   Ensure permalink panel is only displayed when a permalink is allowed
+-   Allow the user to convert unembeddable URLs to links and try embedding again
+-   Improve the top bar tools interaction and consistency
+-   Fix overflowing content in the facebook embed preview screen
+-   Add an action to set a category icon and correct block categories documentation
+-   Fix: pasting a tag that is part of a transform and not matched ignores the content.
+-   Packages: Extract Eslint config package
+-   Add end-to-end test to catch revert of title during a preview after saving a draft
+-   Avoid react warnings when merging two adjacent paragraphs
+-   Avoid PHP notice in the recent comments block
 
 = 4.6.1 =
 
-* Parser: Make attribute parsing possessive (Fix High CPU usage).
+-   Parser: Make attribute parsing possessive (Fix High CPU usage).
 
 = 4.6.0 =
 
-* Fix issue with drag-and-drop in columns.
-* Fix TinyMCE list plugin registration.
-* Fix IE11 flexbox alignment when min-width is set.
-* Fix IE11 focus loss after TinyMCE init. Add IE check.
-* Fix getSelectedBlockClientId selector.
-* Fix issue where unregistering a block type would cause blocks that convert to it to break.
-* Fix Classic block not showing galleries on a grid.
-* Fix visual issues with Button block text wrap.
-* Fix modals in Edge.
-* Fix Categories block filter effect on the front-end.
-* Fix an issue where the block toolbar would cause an image to jump downwards when the wide or full - alignments were activated.
-* Apply IE11 input fix only when mounting TinyMCE.
-* Improve block preview styling.
-* Make the Image Link URL field readonly.
-* Disable HTML edit from Media & Text block.
-* Avoid loading theme editor styles if not existing (RTL languages).
-* Improve scoping of nested paragraph right-padding CSS rule.
-* Add e2e tests for the format API.
-* Merge similar text strings for i18n.
-* Move editor specific styles from style.scss to editor.scss in Cover block.
-* Simplify sidebar tabs aria-labels.
-* Remove onSplit from RichText docs.
-* Remove textdomain from the block library.
-* Avoid rendering AdminNotices compatibility component.
-* Avoid changing default wpautop priority.
-* Change @package names to WordPress.
-* Update published packages changelogs.
+-   Fix issue with drag-and-drop in columns.
+-   Fix TinyMCE list plugin registration.
+-   Fix IE11 flexbox alignment when min-width is set.
+-   Fix IE11 focus loss after TinyMCE init. Add IE check.
+-   Fix getSelectedBlockClientId selector.
+-   Fix issue where unregistering a block type would cause blocks that convert to it to break.
+-   Fix Classic block not showing galleries on a grid.
+-   Fix visual issues with Button block text wrap.
+-   Fix modals in Edge.
+-   Fix Categories block filter effect on the front-end.
+-   Fix an issue where the block toolbar would cause an image to jump downwards when the wide or full - alignments were activated.
+-   Apply IE11 input fix only when mounting TinyMCE.
+-   Improve block preview styling.
+-   Make the Image Link URL field readonly.
+-   Disable HTML edit from Media & Text block.
+-   Avoid loading theme editor styles if not existing (RTL languages).
+-   Improve scoping of nested paragraph right-padding CSS rule.
+-   Add e2e tests for the format API.
+-   Merge similar text strings for i18n.
+-   Move editor specific styles from style.scss to editor.scss in Cover block.
+-   Simplify sidebar tabs aria-labels.
+-   Remove onSplit from RichText docs.
+-   Remove textdomain from the block library.
+-   Avoid rendering AdminNotices compatibility component.
+-   Avoid changing default wpautop priority.
+-   Change @package names to WordPress.
+-   Update published packages changelogs.
 
 = 4.5.1 =
 
-* Raw Handling: fix consecutive lists with one item
-* Avoid showing draft revert message on autosaves
-* Honor the Disable Visual Editor setting in the Gutenberg editor page
-* Docs: Fix dead links in CONTRIBUTING.md
-* Fix undefined index warnings in Latest Comments & Latest Posts
-* Add `react-native` module property to html-entities package.json
-* RichText: List: Sync DOM after editor command
-* Fix RichText infinte rerendering
-* Fix keycodes package missing i18n dependencies
+-   Raw Handling: fix consecutive lists with one item
+-   Avoid showing draft revert message on autosaves
+-   Honor the Disable Visual Editor setting in the Gutenberg editor page
+-   Docs: Fix dead links in CONTRIBUTING.md
+-   Fix undefined index warnings in Latest Comments & Latest Posts
+-   Add `react-native` module property to html-entities package.json
+-   RichText: List: Sync DOM after editor command
+-   Fix RichText infinte rerendering
+-   Fix keycodes package missing i18n dependencies
 
 = 4.5.0 =
 
-* Add relevant attribute data from images to be used server side to handle things like theme specific responsive media.
-* In order to be able to use srcset and sizes on the front end, wp-image-### CSS class has been added to the media and text block.
-* Add minimal multi-selection block panel to replace “Coming Soon” message. It shows word and block count for the selection.
-* Exclude reusable blocks from the global block count in Document Outline.
-* Upgrade admin notices to use Notices module at runtime. It attempts to seamlessly upgrade notices output via an admin_notices or all_admin_notices action server-side.
-* Adjust the prefix transforms so that they only execute when they match text right at the caret so that they are undoable. Also makes it faster by checking if the previous character is a space.
-* Add ability to specify a different default editor font per locale.
-* Add link rel and link class settings to Image block inspector.
-* Transform an Image and Audio block to an Embed block if the URL matches an embed.
-* Respect the “Disable Visual Editor” setting per user.
-* Make it easy to access image IDs server-side on the Gallery block.
-* Recursively step through edits to track individually changed post meta in Block API. This prevents saving the default value for each registered meta when only one of them is changed.
-* Perform a complete draft save on preview.
-* Save all meta-boxes when clicking the preview button. Set preview URL only after saving is complete.
-* Disable hover interaction on mobile to improve scrolling.
-* Update the displayed permalink when the slug is cleared.
-* When converting to blocks, place unhandled HTML within an HTML block.
-* Ensure content that cannot be handled in quotes is preserved within an HTML block.
-* Localize the DateTimePicker Component.
-* Fixes the behavior of link validation including properly handling URL fragments, validating forward slashes in HTTP URLs, more strictness to match getProtocol, addressing false positives in E2E tests.
-* Fix issue where existing reusable blocks on a post would not render if the user was an author or a contributor. This happens because requests to fetch a single block or post are blocked when ?context=edit is passed and the current user is not an editor.
-* Make sure the media library collection is refreshed when a user uploads media outside of the Media Library workflow (i.e. file drops, file uploads, etc).
-* Update the editor reducer so that RESET_BLOCKS will only remove blocks that are actually in the post.
-* It used to be possible to add a reusable block inside the same reusable block in the UI, e.g. someone could create a column block inside another column block. Now it is not.
-* Deleting after certain types of selection was causing the caret to appear in the wrong place, now that it fixed, along with unexpected behavior of Ctrl+A after other kinds of selection, and the associated E2E tests updated.
-* Remove permalink-based features from non-public CPTs.
-* Address various issues with post locking modal.
-* Fix issue with duplicating blocks and undo on Top Toolbar mode.
-* Visual fix of margin on icons that are not dashicons in placeholders.
-* Visual fix for centre-aligned text on coverblocks.
-* Visual fix for embeds that are wider than the mobile breakpoint, cropping them to fit within the screen.
-* Adds MediaUploadCheck before some MediaUpload components where it was not being checked in time, creating a confusing experience for users in the “contributor” role.
-* Fix undefined variable warning in gutenberg.php.
-* Add missing stringifier and iterator in TokenList component.
-* Address i18n issue in MultiSelectionInspector.
-* Fix small visual regression with button variation preview.
-* Fix interaction regression with Sibling Inserter.
-* Fix issue with the Privacy Policy help notice.
-* Fix post visibility popover not appearing on mobile.
-* Fix issue with toolbar in IE11.
-* Fix small gap in style variation button.
-* Fix popovers position in RTL languages.
-* Fix double border issue with disabled toggle control.
-* Fix the TinyMCE init array.
-* RichText content that comes from headings content attribute should use the RichText.Content instead of rendering it directly.
-* Makes the escape key consistently exit the inline link popover – previously this could behave unexpectedly depending on focus.
-* Improve accessibility of permalink sidebar panel using external link component.
-* Display selected block outlines on Top Toolbar mode.
-* Avoid responding to componentDidUpdate in withDispatch.
-* Allow previewing changes to the post featured image.
-* Preserve unknown attributes and respect null in server attributes preparation
-* Adds missing periods to notification that another user has control of the post.
-* Restore the help modal in the Classic block.
-* Reduce specificity in core button styles to reduce conflicts with theme styles.
-* Update name of “Unified Toolbar” to “Top Toolbar” for extra clarity.
-* Make it possible to have an editor-only annotation format that stays in
-* position when typing inside RichText.
-* Adds missing periods to notification that the user does not have permission to read the blocks of the post.
-* Only add data-align for wide/full aligns if editor/theme supports them.
-* Updates jest to latest version to address vulnerabilities.
-* Removes redundant code now that TinyMCE is not being used to handle paste events.
-* Remove the gutenberg text-domain from dynamic blocks.
-* Remove redundant word from media and text block description.
-* Makes the URL for the classic editor translatable, so that the appropriate translated version can be linked to.
-* Update More block description.
-* Avoid .default on browser global assignments.
-* Mirror packages dependencies registration with core.
-* Remove absolute positions in the link popover E2E test.
-* Improve keyboard mappings in E2E tests, replacing custom utils with modifiers from the keycodes package.
-* Add missing imports on some E2E test utilities.
-* Update API Fetch documentation – removes unnecessary wp-json.
-* Remove iOS scroll adjusting now that enter behavior is more smooth.
-* Register the paragraph block as the default block.
-* Handle isSelected in plain text blocks (currently Code and More blocks).
+-   Add relevant attribute data from images to be used server side to handle things like theme specific responsive media.
+-   In order to be able to use srcset and sizes on the front end, wp-image-### CSS class has been added to the media and text block.
+-   Add minimal multi-selection block panel to replace “Coming Soon” message. It shows word and block count for the selection.
+-   Exclude reusable blocks from the global block count in Document Outline.
+-   Upgrade admin notices to use Notices module at runtime. It attempts to seamlessly upgrade notices output via an admin_notices or all_admin_notices action server-side.
+-   Adjust the prefix transforms so that they only execute when they match text right at the caret so that they are undoable. Also makes it faster by checking if the previous character is a space.
+-   Add ability to specify a different default editor font per locale.
+-   Add link rel and link class settings to Image block inspector.
+-   Transform an Image and Audio block to an Embed block if the URL matches an embed.
+-   Respect the “Disable Visual Editor” setting per user.
+-   Make it easy to access image IDs server-side on the Gallery block.
+-   Recursively step through edits to track individually changed post meta in Block API. This prevents saving the default value for each registered meta when only one of them is changed.
+-   Perform a complete draft save on preview.
+-   Save all meta-boxes when clicking the preview button. Set preview URL only after saving is complete.
+-   Disable hover interaction on mobile to improve scrolling.
+-   Update the displayed permalink when the slug is cleared.
+-   When converting to blocks, place unhandled HTML within an HTML block.
+-   Ensure content that cannot be handled in quotes is preserved within an HTML block.
+-   Localize the DateTimePicker Component.
+-   Fixes the behavior of link validation including properly handling URL fragments, validating forward slashes in HTTP URLs, more strictness to match getProtocol, addressing false positives in E2E tests.
+-   Fix issue where existing reusable blocks on a post would not render if the user was an author or a contributor. This happens because requests to fetch a single block or post are blocked when ?context=edit is passed and the current user is not an editor.
+-   Make sure the media library collection is refreshed when a user uploads media outside of the Media Library workflow (i.e. file drops, file uploads, etc).
+-   Update the editor reducer so that RESET_BLOCKS will only remove blocks that are actually in the post.
+-   It used to be possible to add a reusable block inside the same reusable block in the UI, e.g. someone could create a column block inside another column block. Now it is not.
+-   Deleting after certain types of selection was causing the caret to appear in the wrong place, now that it fixed, along with unexpected behavior of Ctrl+A after other kinds of selection, and the associated E2E tests updated.
+-   Remove permalink-based features from non-public CPTs.
+-   Address various issues with post locking modal.
+-   Fix issue with duplicating blocks and undo on Top Toolbar mode.
+-   Visual fix of margin on icons that are not dashicons in placeholders.
+-   Visual fix for centre-aligned text on coverblocks.
+-   Visual fix for embeds that are wider than the mobile breakpoint, cropping them to fit within the screen.
+-   Adds MediaUploadCheck before some MediaUpload components where it was not being checked in time, creating a confusing experience for users in the “contributor” role.
+-   Fix undefined variable warning in gutenberg.php.
+-   Add missing stringifier and iterator in TokenList component.
+-   Address i18n issue in MultiSelectionInspector.
+-   Fix small visual regression with button variation preview.
+-   Fix interaction regression with Sibling Inserter.
+-   Fix issue with the Privacy Policy help notice.
+-   Fix post visibility popover not appearing on mobile.
+-   Fix issue with toolbar in IE11.
+-   Fix small gap in style variation button.
+-   Fix popovers position in RTL languages.
+-   Fix double border issue with disabled toggle control.
+-   Fix the TinyMCE init array.
+-   RichText content that comes from headings content attribute should use the RichText.Content instead of rendering it directly.
+-   Makes the escape key consistently exit the inline link popover – previously this could behave unexpectedly depending on focus.
+-   Improve accessibility of permalink sidebar panel using external link component.
+-   Display selected block outlines on Top Toolbar mode.
+-   Avoid responding to componentDidUpdate in withDispatch.
+-   Allow previewing changes to the post featured image.
+-   Preserve unknown attributes and respect null in server attributes preparation
+-   Adds missing periods to notification that another user has control of the post.
+-   Restore the help modal in the Classic block.
+-   Reduce specificity in core button styles to reduce conflicts with theme styles.
+-   Update name of “Unified Toolbar” to “Top Toolbar” for extra clarity.
+-   Make it possible to have an editor-only annotation format that stays in
+-   position when typing inside RichText.
+-   Adds missing periods to notification that the user does not have permission to read the blocks of the post.
+-   Only add data-align for wide/full aligns if editor/theme supports them.
+-   Updates jest to latest version to address vulnerabilities.
+-   Removes redundant code now that TinyMCE is not being used to handle paste events.
+-   Remove the gutenberg text-domain from dynamic blocks.
+-   Remove redundant word from media and text block description.
+-   Makes the URL for the classic editor translatable, so that the appropriate translated version can be linked to.
+-   Update More block description.
+-   Avoid .default on browser global assignments.
+-   Mirror packages dependencies registration with core.
+-   Remove absolute positions in the link popover E2E test.
+-   Improve keyboard mappings in E2E tests, replacing custom utils with modifiers from the keycodes package.
+-   Add missing imports on some E2E test utilities.
+-   Update API Fetch documentation – removes unnecessary wp-json.
+-   Remove iOS scroll adjusting now that enter behavior is more smooth.
+-   Register the paragraph block as the default block.
+-   Handle isSelected in plain text blocks (currently Code and More blocks).
 
 = 4.4.0 =
 
-* Improves discoverability of permalinks by adding permalink panel to the document sidebar.
-* Improves margins, column child block, and mobile display of columns.
-* Allow for programmatically removing editor document panels.
-* Replaces the uploading indicator of images and galleries with a spinner and faded out image.
-* Toolbar for floats was a little offset beyond the mobile breakpoint, now fixed.
-* Text and code editing blocks did not have width set, now set to fill the space.
-* Correctly align URL input autocomplete.
-* Improve animations: new, consistent naming convention, adds editor prefix, and moves keyframe animations (which don’t work well with mixins) into the edit post style.
-* Hover styles were showing on mobile, where hover is not available – now disabled.
-* Click and drag was incorrectly triggering a selection event in the block list under the popover, resulting in the popover dismissing. This was causing blocks to be selected when trying to set links to open in a new tab, for example. Fixed by preventing the mouse down event from propagating.
-* Adds some padding to the block inserter so that it never overlaps text in nested contexts or mobile views.
-* Better handle images larger than the editor by allowing a 2.5x buffer. Allows images inserted in TwentyNineteen and other themes that have a wider than 580px editor width, to look as expected, but prevents infinite resizing of images.
-* Stop mousedown event propagating through the toolbar, fixing problem of unexpectedly selecting blocks.
-* Improve the way that long words are broken on multiple lines, using word-break: keep-all;
-* Preserve the ratio of video backgrounds in cover blocks, videos may be cropped to fit but will keep their original ratio.
-* It was not possible to scroll a long menu on first load of Gutenberg, fixed by removing sticky-menu.
-* Properly check for allowed types of Media in Media Placeholder components.
-* “Resolve” and “Convert to HTML” buttons were not clickable (regression), now resolved.
-* Exclude HTML editing from Columns and Column blocks.
-* Better handle links without href, which were showing as `undefined`.
-* Renders block appender after the template is processed, to prevent incorrectly inserting new paragraphs.
-* Parent pages were being lost when draft pages were autosaved, fixed by removing parent pages from autosave requests and refactoring to stop using “parent” as the path argument name.
-* Adding line breaks in formatted content in quote blocks were not working correctly, fixed by persisting formats when new lines are added.
-* Prevent users in the contributor role from using blocks that require upload privileges.
-* Fix block selection in removing blocks, correct typo in comparison.
-* Japanese text (double byte characters) was not usable in the list block, fixed by changing handling of composition events.
-* Better handles different text encodings (e.g. emoji) within a block in block validation.
-* Use a query argument instead of data to prevent error being thrown on post refresh.
-* Keyboard navigation was not working as expected in Firefox, added extra key binding.
-* Adds missing alt values to images when editing.
-* Better communicate block nesting level by using unordered lists.
-* Fix sidebar icons being incorrectly announced in NVDA by adding a span with `aria-hidden=”true”`.
-* Fixes block toolbar aria label to announce “block tools toolbar” rather than “block toolbar (a11y).
-* Adjusts focus on media and text blocks to select the overall block, not the child paragraph block.
-* Refactors i18n module to replaces Jed with Tannin for significant performance improvements.
-* Replace `getSelectedBlock` and `getMultiSelectedBlocks` with more performant `getSelectedBlockClientId` and a `getBlocks` selectors in copy handler.
-* Replace `getBlock` selector in favor of the more performant `getBlockName`.
-* Replace `getSelectedBlock` with more performant `getSelectedBlockClientId` and new `isBlockValid` selectors in the BlockToolbar.
-* Replace `getSelectedBlock` with more performant `getSelectedBlockClientId` and new `isBlockValid` selectors in the Block Inspector.
-* Replaces `getInserterItems` with a new `hasInserterItems` selector which is more performant, and makes some adjustments to memorization.
-* Avoid using the `getSelectedBlock` selector in autocompleters.
-* Remove use of `getBlock` selector in the DefaultBlockAppender and EditorKeyboardShortcuts components.
-* Move undo handling out of TinyMCE and into the RichText component.
-* `is_gutenberg_page` incorrectly assumes `get_current_screen` exists, add check.
-* Brings code inline with CSS standards by switching font weight to numeric values.
-* Wrapped component would not the most up-to-date store values if it incurred a store state change during its own mount (e.g. dispatching during its own constructor), resolved by rerunning selection.
-* Display an error message if Javascript is disabled.
-* Update to React 16.6.3.
-* Adds missing components dependency for RichText.
-* Refactors list block to remove previously exposed RichText/TinyMCE logic.
-* Removes `focusOnMount` prop from NavigableToolbar components, which was generating a warning.
-* Refactor checks for upload permissions, removing unnecessary checks for store permissions.
-* Use the large image size when inserting images in both galleries and image blocks.
-* Fixes dependency of `wp-polyfill` which needs to be registered before React and React-Dom when plugins (like Yoast) rely on Gutenberg’s React.
-* Mark `onSplit` as unstable as it is pending refactor.
-* Remove 4.4 deprecated features.
-* Fix SCSS syntax error.
-* Remove export of previously removed function.
-* Add an E2E test for unsupported blocks.
-* Refactor E2E utility functions.
-* Formatting updates to copy guidelines.
-* Makes headings consistent in the dropdown documentation.
-* Removes outdated documentation referring to function support in `registerBlockType`.
-* Fixes some typos and line breaks in block design documentation.
-* Fixes some typos and improves readability of README.
-* Adds toolbar to the editing block, and edit button.
-* Passes the `isSelected` prop down to the implementation of RichText components to make them respond properly to focus changes.
+-   Improves discoverability of permalinks by adding permalink panel to the document sidebar.
+-   Improves margins, column child block, and mobile display of columns.
+-   Allow for programmatically removing editor document panels.
+-   Replaces the uploading indicator of images and galleries with a spinner and faded out image.
+-   Toolbar for floats was a little offset beyond the mobile breakpoint, now fixed.
+-   Text and code editing blocks did not have width set, now set to fill the space.
+-   Correctly align URL input autocomplete.
+-   Improve animations: new, consistent naming convention, adds editor prefix, and moves keyframe animations (which don’t work well with mixins) into the edit post style.
+-   Hover styles were showing on mobile, where hover is not available – now disabled.
+-   Click and drag was incorrectly triggering a selection event in the block list under the popover, resulting in the popover dismissing. This was causing blocks to be selected when trying to set links to open in a new tab, for example. Fixed by preventing the mouse down event from propagating.
+-   Adds some padding to the block inserter so that it never overlaps text in nested contexts or mobile views.
+-   Better handle images larger than the editor by allowing a 2.5x buffer. Allows images inserted in TwentyNineteen and other themes that have a wider than 580px editor width, to look as expected, but prevents infinite resizing of images.
+-   Stop mousedown event propagating through the toolbar, fixing problem of unexpectedly selecting blocks.
+-   Improve the way that long words are broken on multiple lines, using word-break: keep-all;
+-   Preserve the ratio of video backgrounds in cover blocks, videos may be cropped to fit but will keep their original ratio.
+-   It was not possible to scroll a long menu on first load of Gutenberg, fixed by removing sticky-menu.
+-   Properly check for allowed types of Media in Media Placeholder components.
+-   “Resolve” and “Convert to HTML” buttons were not clickable (regression), now resolved.
+-   Exclude HTML editing from Columns and Column blocks.
+-   Better handle links without href, which were showing as `undefined`.
+-   Renders block appender after the template is processed, to prevent incorrectly inserting new paragraphs.
+-   Parent pages were being lost when draft pages were autosaved, fixed by removing parent pages from autosave requests and refactoring to stop using “parent” as the path argument name.
+-   Adding line breaks in formatted content in quote blocks were not working correctly, fixed by persisting formats when new lines are added.
+-   Prevent users in the contributor role from using blocks that require upload privileges.
+-   Fix block selection in removing blocks, correct typo in comparison.
+-   Japanese text (double byte characters) was not usable in the list block, fixed by changing handling of composition events.
+-   Better handles different text encodings (e.g. emoji) within a block in block validation.
+-   Use a query argument instead of data to prevent error being thrown on post refresh.
+-   Keyboard navigation was not working as expected in Firefox, added extra key binding.
+-   Adds missing alt values to images when editing.
+-   Better communicate block nesting level by using unordered lists.
+-   Fix sidebar icons being incorrectly announced in NVDA by adding a span with `aria-hidden=”true”`.
+-   Fixes block toolbar aria label to announce “block tools toolbar” rather than “block toolbar (a11y).
+-   Adjusts focus on media and text blocks to select the overall block, not the child paragraph block.
+-   Refactors i18n module to replaces Jed with Tannin for significant performance improvements.
+-   Replace `getSelectedBlock` and `getMultiSelectedBlocks` with more performant `getSelectedBlockClientId` and a `getBlocks` selectors in copy handler.
+-   Replace `getBlock` selector in favor of the more performant `getBlockName`.
+-   Replace `getSelectedBlock` with more performant `getSelectedBlockClientId` and new `isBlockValid` selectors in the BlockToolbar.
+-   Replace `getSelectedBlock` with more performant `getSelectedBlockClientId` and new `isBlockValid` selectors in the Block Inspector.
+-   Replaces `getInserterItems` with a new `hasInserterItems` selector which is more performant, and makes some adjustments to memorization.
+-   Avoid using the `getSelectedBlock` selector in autocompleters.
+-   Remove use of `getBlock` selector in the DefaultBlockAppender and EditorKeyboardShortcuts components.
+-   Move undo handling out of TinyMCE and into the RichText component.
+-   `is_gutenberg_page` incorrectly assumes `get_current_screen` exists, add check.
+-   Brings code inline with CSS standards by switching font weight to numeric values.
+-   Wrapped component would not the most up-to-date store values if it incurred a store state change during its own mount (e.g. dispatching during its own constructor), resolved by rerunning selection.
+-   Display an error message if JavaScript is disabled.
+-   Update to React 16.6.3.
+-   Adds missing components dependency for RichText.
+-   Refactors list block to remove previously exposed RichText/TinyMCE logic.
+-   Removes `focusOnMount` prop from NavigableToolbar components, which was generating a warning.
+-   Refactor checks for upload permissions, removing unnecessary checks for store permissions.
+-   Use the large image size when inserting images in both galleries and image blocks.
+-   Fixes dependency of `wp-polyfill` which needs to be registered before React and React-Dom when plugins (like Yoast) rely on Gutenberg’s React.
+-   Mark `onSplit` as unstable as it is pending refactor.
+-   Remove 4.4 deprecated features.
+-   Fix SCSS syntax error.
+-   Remove export of previously removed function.
+-   Add an E2E test for unsupported blocks.
+-   Refactor E2E utility functions.
+-   Formatting updates to copy guidelines.
+-   Makes headings consistent in the dropdown documentation.
+-   Removes outdated documentation referring to function support in `registerBlockType`.
+-   Fixes some typos and line breaks in block design documentation.
+-   Fixes some typos and improves readability of README.
+-   Adds toolbar to the editing block, and edit button.
+-   Passes the `isSelected` prop down to the implementation of RichText components to make them respond properly to focus changes.
 
 = 4.3.0 =
 
-* Allow toggling the core custom fields meta box.
-* Introduce Annotations API across Block and Formatting.
-* Allow using a YouTube URL (or other sources) in the Video block and transparently convert it to Embed.
-* Allow Alt+F10 keyboard shortcut to navigate to block toolbar regardless of the toolbar visibility (isTyping, etc).
-* Return focus to element that opened the post publish panel after it is closed.
-* Avoid unnecessary re-renders when navigating between blocks.
-* Improve interactions around Columns block.
-* Improve keyboard navigation through the Gallery block.
-* Use full parser in do_blocks with nested block support. This switch will allow dynamic blocks which contain nested blocks inside of them and it will pave the way for a filtering API to structurally process blocks.
-* Refactor contextual toolbar to work better with floats.
-* Auto-refresh Popovers position but only refresh if the anchor position changes.
-* Add min-width to audio block.
-* Avoid auto-saving with empty post content.
-* Display correct Taxonomy labels.
-* Fix incorrect import name.
-* Fix styling issue with checkboxes.
-* Add full set of reusable block post type labels (addresses “no blocks found” state).
-* Fix right to left block alignment.
-* Fix “updating failed” notices showing on long-open tabs.
-* Fix default PHP parser to cast inner blocks as arrays.
-* Fix JS/PHP inconsistencies with empty attributes on parsing.
-* Link to the source image in the media block.
-* Fix select all keyboard shortcut for Safari and Firefox.
-* Create multiple blocks when multiple files are drag and dropped.
-* Fixes potential theme syle.css clash.
-* Makes preview button a link (a11y).
-* Stop re-rendering all blocks on arrow navigation.
-* Add constraint tabbing to post publish panel (a11y).
-* Fix image uploading bug (incorrect JSON in apiFetch).
-* Fix taxonomy visibility for contributors.
-* Adds aria labels to images in gallery blocks during editing (a11y).
-* Formatting fix for blockquotes.
-* Hide custom fields when meta box is disabled.
-* Limits blockquote color auto-selection to solid color blocks for readability.
-* Fixes announcement on multi-selection of blocks (a11y).
-* Display upload errors in the image block.
-* Fixes selection of embed type blocks.
-* Fixes JSON attribute parsing.
-* Fixes post publish focus (a11y).
-* Resolve macOS Firefox / Safari sibling inserter behavior.
-* Fix visibility of sibling inserter on tab focus.
-* Fix issue with pasting from Word where an image would be created instead of text.
-* Fix multi-selection for float elements.
-* Fetch all tag terms, not just first 100.
-* Correctly displays media on the right.
-* Only show named image sizes.
-* Improves handling of paste action.
-* Updates displayed permalink after permalink is edited.
-* Adjust font size for contrast warning (a11y).
-* Better handles formatting – nested and Google Docs.
-* Fixes suggestion list scrolling when using keyboard (a11y).
-* Fixes block and menu navigation a11y.
-* Click to close dropdown popover.
-* Fix save lock control.
-* Timezone handling fix.
-* Improve a11y of empty text blocks.
-* Fix states for publish buttons.
-* Fix backspace behavior.
-* Change aria labels for paragraph blocks (a11y).
-* Add support for prepare RichText tree.
-* With this change we force the browser to treat the textarea for the
-* code editor as auto when handling direction for its display to preserve the ability to interact with the block delimiters.
-* Rename parentClientId to rootClientId.
-* Remove deprecated findDOMNode call from Tooltip component.
-* Remove unused ref assignment to RichText.
-* Remove redundant onClickOutside handler from Dropdown.
-* Refactor block state.
-* Remove Cloudflare warning for blocked API calls.
-* Remove _wpGutenbergCodeEditorSettings (dead code).
-* Adds periods to block a11y descriptions.
-* Refactor embed block.
-* Handle metabox warning exceptions.
-* Refactor RichText to update formatting bar on format availability changes.
-* Rename wp-polyfill-ecmascript.
-* Update translator comments for quote and pullquote.
-* Remove findDOMNode useage from NavigableToolbar.
-* Changes handling of dates to properly handling scheduling.
-* Remove findDomNode from withHoverAreas.
-* Fixes missing translator comments.
-* Refactor to import Format API components.
-* Refactor of change detection: initial edits.
-* Adds better translation comments to “resolve” and “resolve block”.
-* Adds option for blocks with child blocks to change selection behavior.
-* Allows blocks to disable being converted to reusable blocks.
-* Improve undo/redo states.
-* Updates parsing to better handle nested content.
-* Remove undefined className argument from save().
-* Use different tooltips for different alignment buttons.
-* Improve performance and handling of autosave.
-* Improve gallery upload for multiple images: load one by one.
-* Adds context variable to RichText component.
-* Avoid calling missing get_current_screen function.
-* Make cssnano remove all style comments.
-* Refactor normalizeBlockType.
-* Shows icon in block toolbar.
-* Makes kitchensink button removable from plugins.
-* Fix popover sizing on screen change (autorefresh)
-* Improvement to Columns block.
-* Update block description for consistency.
-* Refactor block styles registration.
-* Use apostrophe instead of single-quote character in strings.
-* Add transformations between video and media and text block.
-* Version update for NPM packages.
-* Update Lerna to latest version.
-* Validates link format in RichText.
-* Refactor contextual toolbar to work better with floats.
-* Move wp-polyfill-ecmascript override to scripts registration.
-* Improves consistency of parser tests.
-* Remove code coverage.
-* Adds mocking helpers for E2E tests.
-* Runs E2E tests with the user in author role.
-* Adds tests for Format API.
-* Adds E2E test for rapid enter presses.
-* Fix typo in documentation.
-* Fix typos in block API documentation.
-* Improved documentation and examples for withFilters.
-* Fix some broken links in documentation.
-* Fix typo and quote consistency.
-* Remove duplicated word.
-* Adds custom block icon instructions.
-* Update documentation on keyboard shortcuts.
-* Updates isSelectionEnabledDocumentation.
-* Update FontSizePicker component documentation.
-* Export `switchToBlockType` function.
-* Remove mobile RN test suite (temporary measure).
-* Improve styling of next page block.
-* Removes fixed cover on iOS (unsupported in mobile Safari).
-* Adds support for native media picker.
-* Remove onChange delay.
-* Exposes slot/fill pattern to mobile.
-* Expose @wordpress/editor to mobile.
-* Refreshes native post block merge.
-* Properly handle cancel on the media picker.
+-   Allow toggling the core custom fields meta box.
+-   Introduce Annotations API across Block and Formatting.
+-   Allow using a YouTube URL (or other sources) in the Video block and transparently convert it to Embed.
+-   Allow Alt+F10 keyboard shortcut to navigate to block toolbar regardless of the toolbar visibility (isTyping, etc).
+-   Return focus to element that opened the post publish panel after it is closed.
+-   Avoid unnecessary re-renders when navigating between blocks.
+-   Improve interactions around Columns block.
+-   Improve keyboard navigation through the Gallery block.
+-   Use full parser in do_blocks with nested block support. This switch will allow dynamic blocks which contain nested blocks inside of them and it will pave the way for a filtering API to structurally process blocks.
+-   Refactor contextual toolbar to work better with floats.
+-   Auto-refresh Popovers position but only refresh if the anchor position changes.
+-   Add min-width to audio block.
+-   Avoid auto-saving with empty post content.
+-   Display correct Taxonomy labels.
+-   Fix incorrect import name.
+-   Fix styling issue with checkboxes.
+-   Add full set of reusable block post type labels (addresses “no blocks found” state).
+-   Fix right to left block alignment.
+-   Fix “updating failed” notices showing on long-open tabs.
+-   Fix default PHP parser to cast inner blocks as arrays.
+-   Fix JS/PHP inconsistencies with empty attributes on parsing.
+-   Link to the source image in the media block.
+-   Fix select all keyboard shortcut for Safari and Firefox.
+-   Create multiple blocks when multiple files are drag and dropped.
+-   Fixes potential theme syle.css clash.
+-   Makes preview button a link (a11y).
+-   Stop re-rendering all blocks on arrow navigation.
+-   Add constraint tabbing to post publish panel (a11y).
+-   Fix image uploading bug (incorrect JSON in apiFetch).
+-   Fix taxonomy visibility for contributors.
+-   Adds aria labels to images in gallery blocks during editing (a11y).
+-   Formatting fix for blockquotes.
+-   Hide custom fields when meta box is disabled.
+-   Limits blockquote color auto-selection to solid color blocks for readability.
+-   Fixes announcement on multi-selection of blocks (a11y).
+-   Display upload errors in the image block.
+-   Fixes selection of embed type blocks.
+-   Fixes JSON attribute parsing.
+-   Fixes post publish focus (a11y).
+-   Resolve macOS Firefox / Safari sibling inserter behavior.
+-   Fix visibility of sibling inserter on tab focus.
+-   Fix issue with pasting from Word where an image would be created instead of text.
+-   Fix multi-selection for float elements.
+-   Fetch all tag terms, not just first 100.
+-   Correctly displays media on the right.
+-   Only show named image sizes.
+-   Improves handling of paste action.
+-   Updates displayed permalink after permalink is edited.
+-   Adjust font size for contrast warning (a11y).
+-   Better handles formatting – nested and Google Docs.
+-   Fixes suggestion list scrolling when using keyboard (a11y).
+-   Fixes block and menu navigation a11y.
+-   Click to close dropdown popover.
+-   Fix save lock control.
+-   Timezone handling fix.
+-   Improve a11y of empty text blocks.
+-   Fix states for publish buttons.
+-   Fix backspace behavior.
+-   Change aria labels for paragraph blocks (a11y).
+-   Add support for prepare RichText tree.
+-   With this change we force the browser to treat the textarea for the
+-   code editor as auto when handling direction for its display to preserve the ability to interact with the block delimiters.
+-   Rename parentClientId to rootClientId.
+-   Remove deprecated findDOMNode call from Tooltip component.
+-   Remove unused ref assignment to RichText.
+-   Remove redundant onClickOutside handler from Dropdown.
+-   Refactor block state.
+-   Remove Cloudflare warning for blocked API calls.
+-   Remove \_wpGutenbergCodeEditorSettings (dead code).
+-   Adds periods to block a11y descriptions.
+-   Refactor embed block.
+-   Handle metabox warning exceptions.
+-   Refactor RichText to update formatting bar on format availability changes.
+-   Rename wp-polyfill-ecmascript.
+-   Update translator comments for quote and pullquote.
+-   Remove findDOMNode useage from NavigableToolbar.
+-   Changes handling of dates to properly handling scheduling.
+-   Remove findDomNode from withHoverAreas.
+-   Fixes missing translator comments.
+-   Refactor to import Format API components.
+-   Refactor of change detection: initial edits.
+-   Adds better translation comments to “resolve” and “resolve block”.
+-   Adds option for blocks with child blocks to change selection behavior.
+-   Allows blocks to disable being converted to reusable blocks.
+-   Improve undo/redo states.
+-   Updates parsing to better handle nested content.
+-   Remove undefined className argument from save().
+-   Use different tooltips for different alignment buttons.
+-   Improve performance and handling of autosave.
+-   Improve gallery upload for multiple images: load one by one.
+-   Adds context variable to RichText component.
+-   Avoid calling missing get_current_screen function.
+-   Make cssnano remove all style comments.
+-   Refactor normalizeBlockType.
+-   Shows icon in block toolbar.
+-   Makes kitchensink button removable from plugins.
+-   Fix popover sizing on screen change (autorefresh)
+-   Improvement to Columns block.
+-   Update block description for consistency.
+-   Refactor block styles registration.
+-   Use apostrophe instead of single-quote character in strings.
+-   Add transformations between video and media and text block.
+-   Version update for NPM packages.
+-   Update Lerna to latest version.
+-   Validates link format in RichText.
+-   Refactor contextual toolbar to work better with floats.
+-   Move wp-polyfill-ecmascript override to scripts registration.
+-   Improves consistency of parser tests.
+-   Remove code coverage.
+-   Adds mocking helpers for E2E tests.
+-   Runs E2E tests with the user in author role.
+-   Adds tests for Format API.
+-   Adds E2E test for rapid enter presses.
+-   Fix typo in documentation.
+-   Fix typos in block API documentation.
+-   Improved documentation and examples for withFilters.
+-   Fix some broken links in documentation.
+-   Fix typo and quote consistency.
+-   Remove duplicated word.
+-   Adds custom block icon instructions.
+-   Update documentation on keyboard shortcuts.
+-   Updates isSelectionEnabledDocumentation.
+-   Update FontSizePicker component documentation.
+-   Export `switchToBlockType` function.
+-   Remove mobile RN test suite (temporary measure).
+-   Improve styling of next page block.
+-   Removes fixed cover on iOS (unsupported in mobile Safari).
+-   Adds support for native media picker.
+-   Remove onChange delay.
+-   Exposes slot/fill pattern to mobile.
+-   Expose @wordpress/editor to mobile.
+-   Refreshes native post block merge.
+-   Properly handle cancel on the media picker.
 
 = 4.2.0 =
 
-* Introduce the Formatting API for extending RichText.
-* Use default Inserter for sibling block insertion.
-* Support adding and updating entities in data module.
-* Update block descriptions for added clarity and consistency.
-* Add support for displaying icons in new block categories.
-* Append registered toolbar buttons in RichText.
-* Optimize SlotFill rendering to avoid props destructuring.
-* Optimize Inserter props generation and reconciliation.
-* Improve writing flow by unsetting typing flag if Escape pressed.
-* Add support for non-Latin inputs in slash autocomplete block inserter.
-* Use an animated WP logo for preview screen.
-* Add “img” as a keyword for the Image block.
-* Delay TinyMCE initialisation to focus.
-* Announce number of filtered results from block inserter to screen readers.
-* Add audible feedback for link editing.
-* Avoid focus loss on active tab change within the Sidebar.
-* Add Alt + F10 (navigate to the nearest toolbar) to the shortcut docs and modal.
-* Add some more URL helpers to the url package.
-* Add has-dates class to Latest Posts block if applicable.
-* Improve mobile display of “options” modal.
-* Add “link target” option in Image block.
-* Use currentcolor as border-color for outline button style.
-* Introduce a new middleware to the api-fetch package which adds ?_locale=user to every REST API request.
-* Refactor and optimize withSelect, withDispatch handling of registry change.
-* Refactor and update DropZone context API.
-* Rephrase description of responsive toggle.
-* Ensure buttons on end of row in media-placeholder have no margin on the right.
-* Include implicit core styles in SelectControl.
-* Use better help text for ALT text input.
-* Flatten Inserter mapSelectToProps to optimize rendering.
-* Cleanup Embed code and add better test coverage.
-* Add space above exit code editor button.
-* Return 0 in WordCount if text is empty.
-* Avoid setting a value on the File block download attribute.
-* Set download attribute on File block as empty.
-* Remove Cover block ‘strong’ style.
-* Reduce frequency of actions updating isCaretWithinFormattedText.
-* Add a function to unregister a block style variation.
-* Add lodash deburr to autocomplete so that is works with diacritics.
-* Avoid making WordPress post embeds responsive.
-* Improve handling of centered 1-column galleries with small images.
-* Make pre-publish prompts more generic.
-* Improve the style variation control aria-label.
-* Improve preloading request code.
-* Add missing context to various i18n strings.
-* Add post saving lock APIs so plugins can add and remove locks.
-* Take the viewport size into account when it comes to decide whether to show the button or toggle logic for “submit for review”.
-* Improve accessibility of settings sidebar tabs.
-* Improve the header toolbar aria-label.
-* Add styles to stop Classic block buttons from inheriting italics from themes.
-* Add aria-label to links that open in new windows.
-* Add more descriptive aria-labels for the open and closed states of sidebar settings.
-* Add key event handler to activate block styles with keyboard.
-* Add field that allows changing image alt text from the sidebar in Media & Text.
-* Add aria-label to describe action of featured image update button.
-* Restore displaying formatting shortcuts in toolbar.
-* Add i18n context to “Resolve” button for invalid blocks.
-* Update the editor styles wrapper to avoid specificity issues.
-* Fix converting a reusable block with nested blocks into a static block.
-* Fix regression with mobile toolbar spacing.
-* Fix size regression in block icon.
-* Fix multi-selected warning block highlight.
-* Fix: Show resizer on “Media & Text” block on unified toolbar mode
-* Fix some RichText shortcuts and add e2e tests.
-* Fix issue with tertiary button hit areas.
-* Fix issue with unified toolbar not always fitting in smaller viewports.
-* Fix issue with “remove tag” button in long tag names.
-* Fix rich text value for nested lists.
-* Use color function for defining the background in DateTimePicker.
-* Fix usage of preg_quote() in block parsing.
-* Fix flow of scheduling and then publishing.
-* Fix focus issue on Gallery remove button.
-* Fix keyboard interaction (up/down arrow keys) causing focus to transfer out of the default block’s insertion menu.
-* Fix regression causing dynamic blocks not rendering in the frontend.
-* Fix vertical alignment issue on Media & Text block.
-* Fix some linter errors in trunk branch.
-* Fix dash line in More/Next-Page blocks.
-* Fix missing Categories block label.
-* Fix embedding and demo tests.
-* Fix issue with vanilla stylesheet.
-* Fix documentation for openModal() and closeModal().
-* Fix blocks navigation menu SVG icon size.
-* Fix link popover keyboard accessibility.
-* Fix issue with multiselect using shift + arrow.
-* Fix issue with format placeholder.
-* Fix Safari issue where hover outlines sometimes linger.
-* Resolve an issue where the “Copy Post Text” button in the error boundary would not actually copy post text, since it used a legacy retrieval method for post content.
-* Make preview placeholder text translatable.
-* Load translations in the reusable block listing page.
-* Avoid adding isDirty prop to DOM.
-* Improve translation string and replace placeholder handling for MediaPlaceholder instructions.
-* Refactor rich text package to avoid using blocks packages as a dependency.
-* Handle 204 response code in API Fetch.
-* Remove HTML source string normalization.
-* Normalize function arguments in Block API.
-* Remove unused code path.
-* Deprecate layout attribute.
-* Add class for -dropdown/-list in Archives block.
-* Update registration method signature of RichText.
-* Add filter for preloading API paths.
-* Add missing @return tag to gutenberg_meta_box_save_redirect() function.
-* Rename id attribute to tipId in DotTip.
-* Only silence REST errors if the REST server is present
-* Use consistent help text in DatePicker.
-* Export both the DropZone and MediaPlaceholder editor components with the withFilters HOC.
-* Remove “half” keyword from Media & Text block.
-* Remove redundant hooks initialization.
-* Mark getSettings in Date package as experimental.
-* Remove unused variable fallbacks in RichText.
-* Improve the Toggle Control elements DOM order for better accessibility.
-* Mark Reusable blocks API as experimental pending future refactor.
-* Set correct media type for video poster image and manage focus properly.
-* Avoid PHP notices due to non-available meta boxes.
-* Implement fetchAllMiddleware to handle per_page=-1 through pagination in wp.apiFetch.
-* Add do’s and don’ts to block design documentation.
-* Update creating-dynamic-blocks.md.
-* Update editor package changelog.
-* Add notices package.
-* Add styles property to block-api.md.
-* Add documentation for responsive-embeds theme option.
-* Add missing e2e tests for Plugins API.
-* Add an eslint rule to use cross-environment SVG primitives.
-* Use turbo-combine-reducers in place of Redux
-* Update react-click-outside to 3.0.
-* Update @wordpress/hooks README to include namespace mention.
-* Fix Heading blocks validation errors after block splitting
-* Expose setUnregisteredTypeHandlerName / getUnregisteredTypeHandlerName for mobile.
-* Fix a refresh issue with iOS when splitting blocks.
-* Simplify onEnter handling.
-* Hook onBackSpace in RichText component.
-* Introduce the ability to merge two blocks together on Backspace.
-* Properly refresh blocks when merging them under iOS.
-* Port nextpage block to the ReactNative mobile app.
-* RichText: fix buggy enter/delete behaviour (Extra br elements).
-* Fix showing categories for contributors.
+-   Introduce the Formatting API for extending RichText.
+-   Use default Inserter for sibling block insertion.
+-   Support adding and updating entities in data module.
+-   Update block descriptions for added clarity and consistency.
+-   Add support for displaying icons in new block categories.
+-   Append registered toolbar buttons in RichText.
+-   Optimize SlotFill rendering to avoid props destructuring.
+-   Optimize Inserter props generation and reconciliation.
+-   Improve writing flow by unsetting typing flag if Escape pressed.
+-   Add support for non-Latin inputs in slash autocomplete block inserter.
+-   Use an animated WP logo for preview screen.
+-   Add “img” as a keyword for the Image block.
+-   Delay TinyMCE initialisation to focus.
+-   Announce number of filtered results from block inserter to screen readers.
+-   Add audible feedback for link editing.
+-   Avoid focus loss on active tab change within the Sidebar.
+-   Add Alt + F10 (navigate to the nearest toolbar) to the shortcut docs and modal.
+-   Add some more URL helpers to the url package.
+-   Add has-dates class to Latest Posts block if applicable.
+-   Improve mobile display of “options” modal.
+-   Add “link target” option in Image block.
+-   Use currentcolor as border-color for outline button style.
+-   Introduce a new middleware to the api-fetch package which adds ?\_locale=user to every REST API request.
+-   Refactor and optimize withSelect, withDispatch handling of registry change.
+-   Refactor and update DropZone context API.
+-   Rephrase description of responsive toggle.
+-   Ensure buttons on end of row in media-placeholder have no margin on the right.
+-   Include implicit core styles in SelectControl.
+-   Use better help text for ALT text input.
+-   Flatten Inserter mapSelectToProps to optimize rendering.
+-   Cleanup Embed code and add better test coverage.
+-   Add space above exit code editor button.
+-   Return 0 in WordCount if text is empty.
+-   Avoid setting a value on the File block download attribute.
+-   Set download attribute on File block as empty.
+-   Remove Cover block ‘strong’ style.
+-   Reduce frequency of actions updating isCaretWithinFormattedText.
+-   Add a function to unregister a block style variation.
+-   Add lodash deburr to autocomplete so that is works with diacritics.
+-   Avoid making WordPress post embeds responsive.
+-   Improve handling of centered 1-column galleries with small images.
+-   Make pre-publish prompts more generic.
+-   Improve the style variation control aria-label.
+-   Improve preloading request code.
+-   Add missing context to various i18n strings.
+-   Add post saving lock APIs so plugins can add and remove locks.
+-   Take the viewport size into account when it comes to decide whether to show the button or toggle logic for “submit for review”.
+-   Improve accessibility of settings sidebar tabs.
+-   Improve the header toolbar aria-label.
+-   Add styles to stop Classic block buttons from inheriting italics from themes.
+-   Add aria-label to links that open in new windows.
+-   Add more descriptive aria-labels for the open and closed states of sidebar settings.
+-   Add key event handler to activate block styles with keyboard.
+-   Add field that allows changing image alt text from the sidebar in Media & Text.
+-   Add aria-label to describe action of featured image update button.
+-   Restore displaying formatting shortcuts in toolbar.
+-   Add i18n context to “Resolve” button for invalid blocks.
+-   Update the editor styles wrapper to avoid specificity issues.
+-   Fix converting a reusable block with nested blocks into a static block.
+-   Fix regression with mobile toolbar spacing.
+-   Fix size regression in block icon.
+-   Fix multi-selected warning block highlight.
+-   Fix: Show resizer on “Media & Text” block on unified toolbar mode
+-   Fix some RichText shortcuts and add e2e tests.
+-   Fix issue with tertiary button hit areas.
+-   Fix issue with unified toolbar not always fitting in smaller viewports.
+-   Fix issue with “remove tag” button in long tag names.
+-   Fix rich text value for nested lists.
+-   Use color function for defining the background in DateTimePicker.
+-   Fix usage of preg_quote() in block parsing.
+-   Fix flow of scheduling and then publishing.
+-   Fix focus issue on Gallery remove button.
+-   Fix keyboard interaction (up/down arrow keys) causing focus to transfer out of the default block’s insertion menu.
+-   Fix regression causing dynamic blocks not rendering in the frontend.
+-   Fix vertical alignment issue on Media & Text block.
+-   Fix some linter errors in trunk branch.
+-   Fix dash line in More/Next-Page blocks.
+-   Fix missing Categories block label.
+-   Fix embedding and demo tests.
+-   Fix issue with vanilla stylesheet.
+-   Fix documentation for openModal() and closeModal().
+-   Fix blocks navigation menu SVG icon size.
+-   Fix link popover keyboard accessibility.
+-   Fix issue with multiselect using shift + arrow.
+-   Fix issue with format placeholder.
+-   Fix Safari issue where hover outlines sometimes linger.
+-   Resolve an issue where the “Copy Post Text” button in the error boundary would not actually copy post text, since it used a legacy retrieval method for post content.
+-   Make preview placeholder text translatable.
+-   Load translations in the reusable block listing page.
+-   Avoid adding isDirty prop to DOM.
+-   Improve translation string and replace placeholder handling for MediaPlaceholder instructions.
+-   Refactor rich text package to avoid using blocks packages as a dependency.
+-   Handle 204 response code in API Fetch.
+-   Remove HTML source string normalization.
+-   Normalize function arguments in Block API.
+-   Remove unused code path.
+-   Deprecate layout attribute.
+-   Add class for -dropdown/-list in Archives block.
+-   Update registration method signature of RichText.
+-   Add filter for preloading API paths.
+-   Add missing @return tag to gutenberg_meta_box_save_redirect() function.
+-   Rename id attribute to tipId in DotTip.
+-   Only silence REST errors if the REST server is present
+-   Use consistent help text in DatePicker.
+-   Export both the DropZone and MediaPlaceholder editor components with the withFilters HOC.
+-   Remove “half” keyword from Media & Text block.
+-   Remove redundant hooks initialization.
+-   Mark getSettings in Date package as experimental.
+-   Remove unused variable fallbacks in RichText.
+-   Improve the Toggle Control elements DOM order for better accessibility.
+-   Mark Reusable blocks API as experimental pending future refactor.
+-   Set correct media type for video poster image and manage focus properly.
+-   Avoid PHP notices due to non-available meta boxes.
+-   Implement fetchAllMiddleware to handle per_page=-1 through pagination in wp.apiFetch.
+-   Add do’s and don’ts to block design documentation.
+-   Update creating-dynamic-blocks.md.
+-   Update editor package changelog.
+-   Add notices package.
+-   Add styles property to block-api.md.
+-   Add documentation for responsive-embeds theme option.
+-   Add missing e2e tests for Plugins API.
+-   Add an eslint rule to use cross-environment SVG primitives.
+-   Use turbo-combine-reducers in place of Redux
+-   Update react-click-outside to 3.0.
+-   Update @wordpress/hooks README to include namespace mention.
+-   Fix Heading blocks validation errors after block splitting
+-   Expose setUnregisteredTypeHandlerName / getUnregisteredTypeHandlerName for mobile.
+-   Fix a refresh issue with iOS when splitting blocks.
+-   Simplify onEnter handling.
+-   Hook onBackSpace in RichText component.
+-   Introduce the ability to merge two blocks together on Backspace.
+-   Properly refresh blocks when merging them under iOS.
+-   Port nextpage block to the ReactNative mobile app.
+-   RichText: fix buggy enter/delete behaviour (Extra br elements).
+-   Fix showing categories for contributors.
 
 = 4.1.1 =
 
-* Fix dynamic blocks not rendering in the frontend when meta-boxes present.
+-   Fix dynamic blocks not rendering in the frontend when meta-boxes present.
 
 = 4.1.0 =
 
-* Implement a block navigation system that allows selecting child or parent blocks within nested blocks (like folder path traversal) as well as functioning as a general fast navigation system when a root block is selected.
-* Add a Media & Text block that can facilitate the creation of split column content and allows the split to be resizable.
-* Show block style selector in the block inspector.
-* Rename Cover Image to just Cover and add support for video backgrounds.
-* Add a new accessible Date Picker. This was months in the works.
-* Reimplement the Color Picker component to greatly improve keyboard navigation and screenreader operations.
-* Add style variation for Table block with stripe design.
-* Add “Options” modal to toggle on/off the different document panels.
-* Allow toggling visibility of registered meta-boxes from the “Options” modal.
-* Handle cases where a block is on the page but the block is not registered by showing a dialog with the available options.
-* Ensure compatibility with WordPress 5.0.
-* When pasting single lines of text, treat them as inline text.
-* Add ability to insert images from URL directly in the Image block.
-* Make Columns block responsive.
-* Make responsive embeds a theme option.
-* Add direction attribute / LTR button to the Paragraph block.
-* Display accurate updated and publish notices based on post type.
-* Update buttons in the editor header area to improve consistency (save, revert to draft, etc).
-* Avoid horizontal writing flow navigation in native inputs.
-* Move toggle buttons to the left of their control handle.
-* Add explicit bottom margin to figure elements (like image and embed).
-* Allow transforming a Pullquote to a Quote and viceversa.
-* Allow block inserter to search for blocks by typing their category.
-* Add a label to the URL field in the Publishing Flow panel.
-* Use the stored date format in settings for the LatestPosts block.
-* Remove the placeholder text and use visible label instead in TokenField.
-* Add translator comment for “View” menu label.
-* Make YouTube embed classes consistent between front-end and back-end.
-* Take into account citation when transforming a Quote to a Paragraph.
-* Restore ⌘A’s “select all blocks” behaviour.
-* Allow themes to disable custom font size functionality.
-* Make missing custom font sizes labels translatable.
-* Ensure cite is string when merging quote.
-* Defer fetching non-hierarchical terms in FlatTermSelector.
-* Move the theme support data previously exposed at the REST API index into a read-only theme controller for the active theme.
-* Detect oEmbed responses where the oEmbed provider is missing.
-* Use “Save as Pending” when the Pending checkbox is active.
-* Use the post type’s REST controller class as autosave parent controller.
-* Use post type labels in PostFeaturedImage component.
-* Enforce text color within inline boundaries to ensure contrast and legibility.
-* Add self-closing tag support (like path element) when comparing HTML.
-* Make sure autocomplete triggers are regex safe.
-* Silence PHP errors on REST API responses.
-* Show permalink label as bold text.
-* Change the block renderer controller endpoint and namespace from /gutenberg/v1/block-renderer/ to /wp/v2/block-renderer/.
-* Hide “edit image” toolbar buttons when no image is selected.
-* Hide “Add to Reusable Blocks” action when ‘core/block’ is disabled.
-* Handle blocks passing null as RichText value.
-* Improve validation for attribute names in rich-text toHTMLString.
-* Allow to globally overwrite defined colors in PanelColorSettings.
-* Fix regressions with Button block preview display.
-* Fix issue with color picker not appearing on mobile.
-* Fix publish buttons with long text.
-* Fix link to manifest file in contributing file.
-* Fix demo content crash on malformed URL.
-* Fix issue in docs manifest.
-* Fix media caption processing with the new RichText structure.
-* Fix problem with Gallery losing assigned columns when alignments are applied.
-* Fix an issue where the Categories block would always use the center class alignment regardless of what was set.
-* Fix scroll issue on small viewports.
-* Fix formatting in getEditorSettings docs and update getTokenSettings docs.
-* Fix padding in block validation modal.
-* Fix extra instances of old rich text value source.
-* Fix issue with adding links from the auto-completer.
-* Fix outdated docs for RichText.
-* Fix pre-publish panel overflow issue.
-* Fix missing styles for medium and huge font size classes.
-* Fix autocomplete keyboard navigation in link popover.
-* Fix a text selection exception in Safari.
-* Fix WordPress embed URL resolution and embeds as reusable blocks.
-* Avoid triggering a redirect when creating a new Table block.
-* Only use rich text value internally to the RichText component.
-* Ensure multiline prop is either “p” or “li” in RichText.
-* Do not use dangerouslySetInnerHTML with i18n string.
-* Account for null value in redux-routine createRuntime.
-* Extract link container from RichText.
-* Allow default_title, default_content, and default_excerpt filters to function as expected.
-* Replace gutenberg in classNames with block-editor.
-* Restore the order of actions usually fired in edit-form-advanced.php.
-* Update REST Search controller to use ‘wp/v2’ namespace.
-* Improve keyboard shortcuts section in FAQ.
-* Change all occurrences of ‘new window’ to ‘new tab’.
-* Conditionally load PHP classes in preparation for inclusion in core.
-* Update rich-text source mentions in docs.
-* Deprecate PanelColor components.
-* Use mock response for demo test if Vimeo is down.
-* Adding a bit more verbosity to the install script instructions.
-* Document isDefault option for block styles.
-* Update docs for new REST API namespace.
-* Update shortcut docs with new block navigation menu shortcut.
-* Further improve Release docs.
-* Updated custom icon documentation links.
-* Add all available script handles to documentation.
-* Add wp-polyfill to scripts.md.
-* Add e2e tests for List and Quote transformations.
-* Fail CI build if local changes exist.
-* Attempt to always use the latest version of nvm.
-* Add bare handling for lint-js script.
-* Add support for Webpack bundle analyzer.
-* Improve setup of Lerna.
-* Update clipboard dependency to at least 2.0.1.
-* Recreate the demo content post as an e2e test using keyboard commands.
-* Add mobile SVG compatibility for SVG block icons.
-* Fix className style in SVG primitive.
-* Split Paragraph and Heading blocks on enter.KEY. Refactor block splitting code on paragraph and heading blocks.
-* Add caption support for image block.
-* Rename PHP functions to prevent conflict with core
-* Fix some typos
-* Improve the Toggle Control elements DOM order for better accessibility
-* Set correct media type for video poster image and manage focus properly.
-* Implement fetchAllMiddleware to handle per_page=-1 through pagination in wp.apiFetch
-* Fix Slash autocomplete: Support non-Latin inputs
-* Add WordPress logo animation for preview
+-   Implement a block navigation system that allows selecting child or parent blocks within nested blocks (like folder path traversal) as well as functioning as a general fast navigation system when a root block is selected.
+-   Add a Media & Text block that can facilitate the creation of split column content and allows the split to be resizable.
+-   Show block style selector in the block inspector.
+-   Rename Cover Image to just Cover and add support for video backgrounds.
+-   Add a new accessible Date Picker. This was months in the works.
+-   Reimplement the Color Picker component to greatly improve keyboard navigation and screenreader operations.
+-   Add style variation for Table block with stripe design.
+-   Add “Options” modal to toggle on/off the different document panels.
+-   Allow toggling visibility of registered meta-boxes from the “Options” modal.
+-   Handle cases where a block is on the page but the block is not registered by showing a dialog with the available options.
+-   Ensure compatibility with WordPress 5.0.
+-   When pasting single lines of text, treat them as inline text.
+-   Add ability to insert images from URL directly in the Image block.
+-   Make Columns block responsive.
+-   Make responsive embeds a theme option.
+-   Add direction attribute / LTR button to the Paragraph block.
+-   Display accurate updated and publish notices based on post type.
+-   Update buttons in the editor header area to improve consistency (save, revert to draft, etc).
+-   Avoid horizontal writing flow navigation in native inputs.
+-   Move toggle buttons to the left of their control handle.
+-   Add explicit bottom margin to figure elements (like image and embed).
+-   Allow transforming a Pullquote to a Quote and viceversa.
+-   Allow block inserter to search for blocks by typing their category.
+-   Add a label to the URL field in the Publishing Flow panel.
+-   Use the stored date format in settings for the LatestPosts block.
+-   Remove the placeholder text and use visible label instead in TokenField.
+-   Add translator comment for “View” menu label.
+-   Make YouTube embed classes consistent between front-end and back-end.
+-   Take into account citation when transforming a Quote to a Paragraph.
+-   Restore ⌘A’s “select all blocks” behaviour.
+-   Allow themes to disable custom font size functionality.
+-   Make missing custom font sizes labels translatable.
+-   Ensure cite is string when merging quote.
+-   Defer fetching non-hierarchical terms in FlatTermSelector.
+-   Move the theme support data previously exposed at the REST API index into a read-only theme controller for the active theme.
+-   Detect oEmbed responses where the oEmbed provider is missing.
+-   Use “Save as Pending” when the Pending checkbox is active.
+-   Use the post type’s REST controller class as autosave parent controller.
+-   Use post type labels in PostFeaturedImage component.
+-   Enforce text color within inline boundaries to ensure contrast and legibility.
+-   Add self-closing tag support (like path element) when comparing HTML.
+-   Make sure autocomplete triggers are regex safe.
+-   Silence PHP errors on REST API responses.
+-   Show permalink label as bold text.
+-   Change the block renderer controller endpoint and namespace from /gutenberg/v1/block-renderer/ to /wp/v2/block-renderer/.
+-   Hide “edit image” toolbar buttons when no image is selected.
+-   Hide “Add to Reusable Blocks” action when ‘core/block’ is disabled.
+-   Handle blocks passing null as RichText value.
+-   Improve validation for attribute names in rich-text toHTMLString.
+-   Allow to globally overwrite defined colors in PanelColorSettings.
+-   Fix regressions with Button block preview display.
+-   Fix issue with color picker not appearing on mobile.
+-   Fix publish buttons with long text.
+-   Fix link to manifest file in contributing file.
+-   Fix demo content crash on malformed URL.
+-   Fix issue in docs manifest.
+-   Fix media caption processing with the new RichText structure.
+-   Fix problem with Gallery losing assigned columns when alignments are applied.
+-   Fix an issue where the Categories block would always use the center class alignment regardless of what was set.
+-   Fix scroll issue on small viewports.
+-   Fix formatting in getEditorSettings docs and update getTokenSettings docs.
+-   Fix padding in block validation modal.
+-   Fix extra instances of old rich text value source.
+-   Fix issue with adding links from the auto-completer.
+-   Fix outdated docs for RichText.
+-   Fix pre-publish panel overflow issue.
+-   Fix missing styles for medium and huge font size classes.
+-   Fix autocomplete keyboard navigation in link popover.
+-   Fix a text selection exception in Safari.
+-   Fix WordPress embed URL resolution and embeds as reusable blocks.
+-   Avoid triggering a redirect when creating a new Table block.
+-   Only use rich text value internally to the RichText component.
+-   Ensure multiline prop is either “p” or “li” in RichText.
+-   Do not use dangerouslySetInnerHTML with i18n string.
+-   Account for null value in redux-routine createRuntime.
+-   Extract link container from RichText.
+-   Allow default_title, default_content, and default_excerpt filters to function as expected.
+-   Replace gutenberg in classNames with block-editor.
+-   Restore the order of actions usually fired in edit-form-advanced.php.
+-   Update REST Search controller to use ‘wp/v2’ namespace.
+-   Improve keyboard shortcuts section in FAQ.
+-   Change all occurrences of ‘new window’ to ‘new tab’.
+-   Conditionally load PHP classes in preparation for inclusion in core.
+-   Update rich-text source mentions in docs.
+-   Deprecate PanelColor components.
+-   Use mock response for demo test if Vimeo is down.
+-   Adding a bit more verbosity to the install script instructions.
+-   Document isDefault option for block styles.
+-   Update docs for new REST API namespace.
+-   Update shortcut docs with new block navigation menu shortcut.
+-   Further improve Release docs.
+-   Updated custom icon documentation links.
+-   Add all available script handles to documentation.
+-   Add wp-polyfill to scripts.md.
+-   Add e2e tests for List and Quote transformations.
+-   Fail CI build if local changes exist.
+-   Attempt to always use the latest version of nvm.
+-   Add bare handling for lint-js script.
+-   Add support for Webpack bundle analyzer.
+-   Improve setup of Lerna.
+-   Update clipboard dependency to at least 2.0.1.
+-   Recreate the demo content post as an e2e test using keyboard commands.
+-   Add mobile SVG compatibility for SVG block icons.
+-   Fix className style in SVG primitive.
+-   Split Paragraph and Heading blocks on enter.KEY. Refactor block splitting code on paragraph and heading blocks.
+-   Add caption support for image block.
+-   Rename PHP functions to prevent conflict with core
+-   Fix some typos
+-   Improve the Toggle Control elements DOM order for better accessibility
+-   Set correct media type for video poster image and manage focus properly.
+-   Implement fetchAllMiddleware to handle per_page=-1 through pagination in wp.apiFetch
+-   Fix Slash autocomplete: Support non-Latin inputs
+-   Add WordPress logo animation for preview
 
 = 4.0.0 =
 
+## Changelog
+
 ### New Features
-* Add ability to change overlay color in Cover Image.
-* Introduce new Font Size Picker with clear labels and size comparison.
-* Introduce new RichText data structure to allow better manipulation of inline content.
-* Add Pullquote style variation and color palette support.
-* Add support for post locking when multiple authors interact with the editor.
-* Add an alternative block appender when the container doesn’t support the default block (paragraph).
-* Improve the UI and interactions around floats.
-* Add option to skip PublishSidebar on publishing.
-* Add support for shortcode embeds that enqueue scripts.
-* Add a button to exit the Code Editor.
-* Introduce a reusable ResizableBox component.
-* Style nested `<ul>`s with circles instead of normal bullets.
-* Show hierarchical terms sorted by name and allow them to be filterable through search. Hide the filter box if there are fewer than 8 terms.
-* Improve messaging around invalid block detection.
-* Use text color for links when a paragraph has a color applied.
-* Allow extended usage of the controls API in resolvers within data layer.
-* Ensure that a default block is inserted (and selected) when all other blocks are removed.
-* Enhance the block parser to support multiple type, in accordance with JSON schema.
-* Add a larger target area for resize drag handles.
-* Add media button to classic block.
-* Add control to toggle responsive mechanism on embed blocks.
-* Update sidebar design to have a lighter feeling.
-* Update resolvers in data layer to rely on controls instead of async generators.
-* Set template validity on block reset.
-* Remove dirty detection from Meta Boxes to reduce false positives of “unsaved changes”.
-* Show “Publish: Immediately” for new drafts by inferring floating date.
-* Add a slight transition to Full Screen mode.
-* Improve spacing setup in Gallery Block.
-* Remove additional side padding from blocks.
-* Improve the reusable blocks “Export as JSON” link.
-* Enforce a default block icon size to allow flex alignment and fix unaligned labels.
-* Consider single unmodified default block as empty content.
-* Only display URL input field when “Link To” is set for Image Block.
-* Make backspace behavior consistent among Quote, Verse and Preformatted.
-* Expose refresh method from Dropdown component.
-* Omit style tags when pasting.
-* Use best fitting embed aspect ratio if exact match doesn’t exist.
-* Avoid dispatching undefined results in promise middleware.
-* Change keyboard shortcut for removing a block to access + z.
-* Replace the Full Screen mode “x” icon with a back arrow.
-* Make drag handle visible on hover while in nested contexts.
-* Pass the tab title to the TabPanel component for situations where it may need to be highlighted.
-* Allow setting no alignment when a default alignment exists.
-* Improve title and appender margin fix.
-* Avoid focusing on the close button on modal and try a modal appear animation.
-* Change the URL Input label to match Classic.
-* Adjust media upload source for RichText.
-* Handle edge cases in with-constrained-tabbing and add tests.
-* Set a consistent input field width in media placeholders.
-* Add a hover state to sidebar panel headers.
-* Change settings title from “Writing” to “View”.
-* Convert the “tools” menu group into internal plugin.
-* Normalize data types and fix default implementation in parser.
-* Cleanup CSS specificity issues on Button component for portability.
-* Display error when attempting to embed URLs that can’t be embedded and don’t generate a fallback.
-* Update some edit and save button labels and styles for consistency.
-* Make “Manage Reusable Blocks” a link instead of an icon button.
-
-### Bug Fixes
-* Fix issue with Enter and the Read More block.
-* Fix menu item hover colors.
-* Fix issue with editor styles and fullscreen mode.
-* Fix popover link repositioning.
-* Fix Space Block layout issues on small screens.
-* Fix custom classNames for dynamic blocks.
-* Fix spacing of post-publish close button in other languages.
-* Fix Async Generator resolvers resolution.
-* Fix issue with Spacer Block not being resizable when using unified toolbar and spotlight mode.
-* Fix grammar.md manifest entry and update data docs.
-* Fix issue with region focus on the header area on IE11.
-* Fix reusable block broken button dimensions on IE11.
-* Fix issues with dropping blocks after dragging when calculating new block index.
-* Fix InnerBlock templates sync conditions to avoid a forced locking.
-* Fix typo in @wordpress/api-fetch README.md.
-* Fix regression with Button Block placeholder text.
-* Fix dropzone issue in Edge (event.dataTransfer.types not being an array).
-* Fix documentation for registerBlockStyle arguments and clarify getSaveElement filter.
-* Fix raw transforms not working in Edge when pasting content.
-* Fix a regression where wide images would cause horizontal scrollbars.
-* Fix issue with gallery margin while typing a caption.
-* Fix Block alignment CSS rules affecting nested blocks.
-* Fix CSS issue with nested paragraph placeholder.
-* Fix links in docs and add documentation for isPublishSidebarEnabled.
-* Fix shortcode package dependencies.
-* Fix overscroll issues locking scroll up on long pages.
-* Fix reference to SVG component in docs.
-* Fix Table Block header and body column misalignment.
-* Fix an issue where inserting like breaks would throw an error.
-* Fix regressions with placeholder text color (Cover Image, captions).
-* Fix Editor Styles regression.
-* Fix faulty Jed state after setLocaleData.
-* Fix small line-height issue in editor style.
-* Fix Pullquote margin regressions.
-* Fix issues with File Block and new RichText structures.
-* Fix Writing Flow E2E test.
-* Fix issues with “tips” popup margins.
-* Fix issue with mentions after rich text value merge.
-* Fix clipping issue with Instagram embed.
-* Fix ESNext example code.
-* Fix usage of tabs / spaces in parser code.
-* Fix Classic Block toolbar regression.
-* Fix issues with Table Block alignments.
-* Fix inserter misalignment regression.
+
+-   Add ability to change overlay color in Cover Image.
+-   Introduce new Font Size Picker with clear labels and size comparison.
+-   Introduce new RichText data structure to allow better manipulation of inline content.
+-   Add Pullquote style variation and color palette support.
+-   Add support for post locking when multiple authors interact with the editor.
+-   Add an alternative block appender when the container doesn’t support the default block (paragraph).
+-   Improve the UI and interactions around floats.
+-   Add option to skip PublishSidebar on publishing.
+-   Add support for shortcode embeds that enqueue scripts.
+-   Add a button to exit the Code Editor.
+-   Introduce a reusable ResizableBox component.
+-   Style nested `<ul>`s with circles instead of normal bullets.
+-   Show hierarchical terms sorted by name and allow them to be filterable through search. Hide the filter box if there are fewer than 8 terms.
+-   Improve messaging around invalid block detection.
+-   Use text color for links when a paragraph has a color applied.
+-   Allow extended usage of the controls API in resolvers within data layer.
+-   Ensure that a default block is inserted (and selected) when all other blocks are removed.
+-   Enhance the block parser to support multiple type, in accordance with JSON schema.
+-   Add a larger target area for resize drag handles.
+-   Add media button to classic block.
+-   Add control to toggle responsive mechanism on embed blocks.
+-   Update sidebar design to have a lighter feeling.
+-   Update resolvers in data layer to rely on controls instead of async generators.
+-   Set template validity on block reset.
+-   Remove dirty detection from Meta Boxes to reduce false positives of “unsaved changes”.
+-   Show “Publish: Immediately” for new drafts by inferring floating date.
+-   Add a slight transition to Full Screen mode.
+-   Improve spacing setup in Gallery Block.
+-   Remove additional side padding from blocks.
+-   Improve the reusable blocks “Export as JSON” link.
+-   Enforce a default block icon size to allow flex alignment and fix unaligned labels.
+-   Consider single unmodified default block as empty content.
+-   Only display URL input field when “Link To” is set for Image Block.
+-   Make backspace behavior consistent among Quote, Verse and Preformatted.
+-   Expose refresh method from Dropdown component.
+-   Omit style tags when pasting.
+-   Use best fitting embed aspect ratio if exact match doesn’t exist.
+-   Avoid dispatching undefined results in promise middleware.
+-   Change keyboard shortcut for removing a block to access + z.
+-   Replace the Full Screen mode “x” icon with a back arrow.
+-   Make drag handle visible on hover while in nested contexts.
+-   Pass the tab title to the TabPanel component for situations where it may need to be highlighted.
+-   Allow setting no alignment when a default alignment exists.
+-   Improve title and appender margin fix.
+-   Avoid focusing on the close button on modal and try a modal appear animation.
+-   Change the URL Input label to match Classic.
+-   Adjust media upload source for RichText.
+-   Handle edge cases in with-constrained-tabbing and add tests.
+-   Set a consistent input field width in media placeholders.
+-   Add a hover state to sidebar panel headers.
+-   Change settings title from “Writing” to “View”.
+-   Convert the “tools” menu group into internal plugin.
+-   Normalize data types and fix default implementation in parser.
+-   Cleanup CSS specificity issues on Button component for portability.
+-   Display error when attempting to embed URLs that can’t be embedded and don’t generate a fallback.
+-   Update some edit and save button labels and styles for consistency.
+-   Make “Manage Reusable Blocks” a link instead of an icon button.
+
+### Bug Fixes
+
+-   Fix issue with Enter and the Read More block.
+-   Fix menu item hover colors.
+-   Fix issue with editor styles and fullscreen mode.
+-   Fix popover link repositioning.
+-   Fix Space Block layout issues on small screens.
+-   Fix custom classNames for dynamic blocks.
+-   Fix spacing of post-publish close button in other languages.
+-   Fix Async Generator resolvers resolution.
+-   Fix issue with Spacer Block not being resizable when using unified toolbar and spotlight mode.
+-   Fix grammar.md manifest entry and update data docs.
+-   Fix issue with region focus on the header area on IE11.
+-   Fix reusable block broken button dimensions on IE11.
+-   Fix issues with dropping blocks after dragging when calculating new block index.
+-   Fix InnerBlock templates sync conditions to avoid a forced locking.
+-   Fix typo in @wordpress/api-fetch README.md.
+-   Fix regression with Button Block placeholder text.
+-   Fix dropzone issue in Edge (event.dataTransfer.types not being an array).
+-   Fix documentation for registerBlockStyle arguments and clarify getSaveElement filter.
+-   Fix raw transforms not working in Edge when pasting content.
+-   Fix a regression where wide images would cause horizontal scrollbars.
+-   Fix issue with gallery margin while typing a caption.
+-   Fix Block alignment CSS rules affecting nested blocks.
+-   Fix CSS issue with nested paragraph placeholder.
+-   Fix links in docs and add documentation for isPublishSidebarEnabled.
+-   Fix shortcode package dependencies.
+-   Fix overscroll issues locking scroll up on long pages.
+-   Fix reference to SVG component in docs.
+-   Fix Table Block header and body column misalignment.
+-   Fix an issue where inserting like breaks would throw an error.
+-   Fix regressions with placeholder text color (Cover Image, captions).
+-   Fix Editor Styles regression.
+-   Fix faulty Jed state after setLocaleData.
+-   Fix small line-height issue in editor style.
+-   Fix Pullquote margin regressions.
+-   Fix issues with File Block and new RichText structures.
+-   Fix Writing Flow E2E test.
+-   Fix issues with “tips” popup margins.
+-   Fix issue with mentions after rich text value merge.
+-   Fix clipping issue with Instagram embed.
+-   Fix ESNext example code.
+-   Fix usage of tabs / spaces in parser code.
+-   Fix Classic Block toolbar regression.
+-   Fix issues with Table Block alignments.
+-   Fix inserter misalignment regression.
 
 ### Other Changes
-* Minor i18n fixes after deprecations were removed.
-* Rename parameter from mapStateToProps to mapSelectToProps in withSelect.
-* Rename AccessibleSVG to SVG and make it work with React Native.
-* Change createObjectUrl to createBlobURL.
-* Clean up Sass variables, comments, reduce complexity.
-* Move Classic Block to packages.
-* Move HTML Block into the blocks library package.
-* Move embed scripts into the body in preview documents.
-* Ensure that the return value of apiFetch is always a valid Promise object in Firefox.
-* Allow negative numbers in order field for Page Attributes.
-* Make sure the demo page loads without marking itself as having changes.
-* Refactor MediaUpload, MediaPlaceholder, and mediaUpload to support arrays with multiple supported types.
-* Add new icons to dashicons package.
-* Add link to “add_theme_support” docs.
-* Remove glob and just include necessary files.
-* Remove unused isButton prop.
-* Remove Vine embed.
-* Replace length check with RichText.isEmpty in Image Block.
-* Replace TinyMCE function to decode entities with existing Gutenberg package.
-* Extract the edit-post module as a reusable package.
-* Pass editor initial settings as direct argument.
-* Pass feature image ID to media upload component.
-* Pass all available properties in the media object.
-* Replace element-closest with registered vendor script.
-* Add new handbook introduction and docs about “blocks as the interface”.
-* Add utils to the wp-data script dependencies.
-* Disable alternate diff drivers in setup script.
-* Clarify RichText.Content readme docs.
-* Document `isDefault` option for block styles.
-* Update Panel component documentation.
-* Update full post content test fixtures.
-* Add ESLint rule about not allowing string literals in IDs.
-* Add a test for the new Code → Preformatted transform and use snapshots.
-* Add E2E test to visit demo page and verify errors.
-* Add E2E tests for list creation.
-* Update Redux to the latest version.
+
+-   Minor i18n fixes after deprecations were removed.
+-   Rename parameter from mapStateToProps to mapSelectToProps in withSelect.
+-   Rename AccessibleSVG to SVG and make it work with React Native.
+-   Change createObjectUrl to createBlobURL.
+-   Clean up Sass variables, comments, reduce complexity.
+-   Move Classic Block to packages.
+-   Move HTML Block into the blocks library package.
+-   Move embed scripts into the body in preview documents.
+-   Ensure that the return value of apiFetch is always a valid Promise object in Firefox.
+-   Allow negative numbers in order field for Page Attributes.
+-   Make sure the demo page loads without marking itself as having changes.
+-   Refactor MediaUpload, MediaPlaceholder, and mediaUpload to support arrays with multiple supported types.
+-   Add new icons to dashicons package.
+-   Add link to “add_theme_support” docs.
+-   Remove glob and just include necessary files.
+-   Remove unused isButton prop.
+-   Remove Vine embed.
+-   Replace length check with RichText.isEmpty in Image Block.
+-   Replace TinyMCE function to decode entities with existing Gutenberg package.
+-   Extract the edit-post module as a reusable package.
+-   Pass editor initial settings as direct argument.
+-   Pass feature image ID to media upload component.
+-   Pass all available properties in the media object.
+-   Replace element-closest with registered vendor script.
+-   Add new handbook introduction and docs about “blocks as the interface”.
+-   Add utils to the wp-data script dependencies.
+-   Disable alternate diff drivers in setup script.
+-   Clarify RichText.Content readme docs.
+-   Document `isDefault` option for block styles.
+-   Update Panel component documentation.
+-   Update full post content test fixtures.
+-   Add ESLint rule about not allowing string literals in IDs.
+-   Add a test for the new Code → Preformatted transform and use snapshots.
+-   Add E2E test to visit demo page and verify errors.
+-   Add E2E tests for list creation.
+-   Update Redux to the latest version.
 
 ### Mobile
-* Add the React Native entry point to more packages.
-* Need to define isRichTextValueEmpty for mobile.
-* Have Travis run mobile tests that use the parent code.
-* Wire onEnter to requestHTMLWithCursor command in RichText.
+
+-   Add the React Native entry point to more packages.
+-   Need to define isRichTextValueEmpty for mobile.
+-   Have Travis run mobile tests that use the parent code.
+-   Wire onEnter to requestHTMLWithCursor command in RichText.
 
 = 3.9.0 =
 
-* 🏗 Add support for creating reusable blocks out of multi-selected groups of blocks not just individual blocks. This means the ability to easily save templates out of an existing set of blocks.
-* 🚀 Add support for importing and exporting reusable blocks (using a JSON file transport). Note that locality of resources can be a problem if importing on a separate WordPress site.
-* 🔍 Allow to visually show differences between conversion options when a block is detected as invalid.
-* Add a clear drag handle next to the block arrow controls to drag and move a block. Also further polishes the drag and drop experience.
-* Instrument collapsible groups for the block toolbar. It allows to display groups of options as a dropdown and reduce the length and imposition of the toolbar as a whole.
-* Allow conversion from Cover Image to Image and back, using caption if it exists as the main text.
-* Move the reusable block UI options to the top of the block or block group.
-* Focus the title when loading the editor if it’s empty.
-* Adjust margin rules for nested blocks.
-* Preserve aspect ratio on embedded content at different alignments and widths.
-* Unselect blocks and disable inserter when switching to Code Editor.
-* Add new default block icon (used when no icon is defined).
-* Avoid showing stacked icon group on parent blocks if all of its children are meant to be hidden from the inserter.
-* Add dark editor style support.
-* Add a figure wrapper to Pullquote block.
-* Add needed attributes to kses allowed tags for the Gallery block.
-* Improve visual display of Classic block toolbar.
-* Adjust unified block toolbar padding at medium breakpoints.
-* Better align the close, chevrons, and ellipsis icons in the sidebar panel.
-* Improve cropping of galleries in IE11.
-* Adjust gallery caption flex alignment.
-* Include Caption Styles in Video Block.
-* Update RichText usage to avoid inline elements.
-* Add shortcut aria label for unreadable shortcuts.
-* Avoid triggering invalid block mechanisms on empty HTML content.
-* Rename the Speaker block to Speaker Deck.
-* Disable inserter on Column block and avoid showing stacked icon on columns.
-* Send post_id to the REST API in the ServerSideRender component within the editor. This ensures the global $post object is set properly.
-* Use pseudo element to prevent inspector tab width from changing when selected.
-* Apply consistent spacing on the post visibility menu.
-* Fix notice styling regression.
-* Fix ability to select small table cells.
-* Fix issue with drag and drop in Chrome when the document has iframes.
-* Fix HTML validation issues.
-* Fix margin style regression with block appender.
-* Fix link source for outreach/articles.
-* Fix Archives block alignment and issue with custom classes.
-* Fix error when a taxonomy has no attached post type.
-* Fix invalid block scrim overflowing toolbar on mobile.
-* Fix block settings menu appearance in non wp-admin contexts.
-* Fix incorrect unlink shortcut.
-* Fix placeholder text contrast.
-* Fix issue with shortcut inserter on invalid paragraphs.
-* Fix camelCase and cross-component class name.
-* Fix qs dependency typo.
-* Pluralize “kind” to fix typo.
-* Remove isButton prop.
-* Remove wrapper div from Categories block.
-* Remove prop-type-like check in Popover component.
-* Remove unnecessary duplicated class from Embed placeholder.
-* Flatten BlockListLayout into base BlockList.
-* Add isEmptyElement utility function under wp.Element.
-* Use HTML Document for finding iframe in embed previews.
-* Add wp-polyfill as central polyfill.
-* Update docke-compose setup order to create MySQL container before WordPress container.
-* Improve comments in transforms object of Quote block.
-* Do not assume that singular form in _n() is used just for single item.
-* Update examples for components to look according to guidelines.
-* Update release docs to include process for RC.
-* Add simplified block grammar spec to the handbook.
-* Add lint rule for path on Lodash property functions.
-* Add user for cli image in docker-compose.
-* Show lint errors when there are lint problems.
-* Minor updates and improvements to documents and code references.
-* Improve docs build to consider memoized selectors.
-* Add Heading toolbar for changing heading sizes.
-* Save level to heading block attributes for parsing.
-* Add onEnter callback and function placeholder to RichText implementation.
-* Add Image block placeholder.
-* Avoid propagating eventCount to components.
-* Parser: Output freeform content before void blocks.
-* Fix export block as JSON in IE11 and Firefox.
-* Update demo content to avoid invalidations or automated post updates.
+-   🏗 Add support for creating reusable blocks out of multi-selected groups of blocks not just individual blocks. This means the ability to easily save templates out of an existing set of blocks.
+-   🚀 Add support for importing and exporting reusable blocks (using a JSON file transport). Note that locality of resources can be a problem if importing on a separate WordPress site.
+-   🔍 Allow to visually show differences between conversion options when a block is detected as invalid.
+-   Add a clear drag handle next to the block arrow controls to drag and move a block. Also further polishes the drag and drop experience.
+-   Instrument collapsible groups for the block toolbar. It allows to display groups of options as a dropdown and reduce the length and imposition of the toolbar as a whole.
+-   Allow conversion from Cover Image to Image and back, using caption if it exists as the main text.
+-   Move the reusable block UI options to the top of the block or block group.
+-   Focus the title when loading the editor if it’s empty.
+-   Adjust margin rules for nested blocks.
+-   Preserve aspect ratio on embedded content at different alignments and widths.
+-   Unselect blocks and disable inserter when switching to Code Editor.
+-   Add new default block icon (used when no icon is defined).
+-   Avoid showing stacked icon group on parent blocks if all of its children are meant to be hidden from the inserter.
+-   Add dark editor style support.
+-   Add a figure wrapper to Pullquote block.
+-   Add needed attributes to kses allowed tags for the Gallery block.
+-   Improve visual display of Classic block toolbar.
+-   Adjust unified block toolbar padding at medium breakpoints.
+-   Better align the close, chevrons, and ellipsis icons in the sidebar panel.
+-   Improve cropping of galleries in IE11.
+-   Adjust gallery caption flex alignment.
+-   Include Caption Styles in Video Block.
+-   Update RichText usage to avoid inline elements.
+-   Add shortcut aria label for unreadable shortcuts.
+-   Avoid triggering invalid block mechanisms on empty HTML content.
+-   Rename the Speaker block to Speaker Deck.
+-   Disable inserter on Column block and avoid showing stacked icon on columns.
+-   Send post_id to the REST API in the ServerSideRender component within the editor. This ensures the global $post object is set properly.
+-   Use pseudo element to prevent inspector tab width from changing when selected.
+-   Apply consistent spacing on the post visibility menu.
+-   Fix notice styling regression.
+-   Fix ability to select small table cells.
+-   Fix issue with drag and drop in Chrome when the document has iframes.
+-   Fix HTML validation issues.
+-   Fix margin style regression with block appender.
+-   Fix link source for outreach/articles.
+-   Fix Archives block alignment and issue with custom classes.
+-   Fix error when a taxonomy has no attached post type.
+-   Fix invalid block scrim overflowing toolbar on mobile.
+-   Fix block settings menu appearance in non wp-admin contexts.
+-   Fix incorrect unlink shortcut.
+-   Fix placeholder text contrast.
+-   Fix issue with shortcut inserter on invalid paragraphs.
+-   Fix camelCase and cross-component class name.
+-   Fix qs dependency typo.
+-   Pluralize “kind” to fix typo.
+-   Remove isButton prop.
+-   Remove wrapper div from Categories block.
+-   Remove prop-type-like check in Popover component.
+-   Remove unnecessary duplicated class from Embed placeholder.
+-   Flatten BlockListLayout into base BlockList.
+-   Add isEmptyElement utility function under wp.Element.
+-   Use HTML Document for finding iframe in embed previews.
+-   Add wp-polyfill as central polyfill.
+-   Update docke-compose setup order to create MySQL container before WordPress container.
+-   Improve comments in transforms object of Quote block.
+-   Do not assume that singular form in \_n() is used just for single item.
+-   Update examples for components to look according to guidelines.
+-   Update release docs to include process for RC.
+-   Add simplified block grammar spec to the handbook.
+-   Add lint rule for path on Lodash property functions.
+-   Add user for cli image in docker-compose.
+-   Show lint errors when there are lint problems.
+-   Minor updates and improvements to documents and code references.
+-   Improve docs build to consider memoized selectors.
+-   Add Heading toolbar for changing heading sizes.
+-   Save level to heading block attributes for parsing.
+-   Add onEnter callback and function placeholder to RichText implementation.
+-   Add Image block placeholder.
+-   Avoid propagating eventCount to components.
+-   Parser: Output freeform content before void blocks.
+-   Fix export block as JSON in IE11 and Firefox.
+-   Update demo content to avoid invalidations or automated post updates.
 
 = 3.8.0 =
 
-* Add Full Screen mode. 📺
-* Add UI for bulk managing reusable blocks.
-* Implement a more sophisticated Editor Styles mechanism. 🖍 It allows themes to register editor styles for blocks by targeting the blocks themselves without having to fight CSS specificity, and without having to know the internal DOM structure for the editor.
-* Move the block settings menu to the block toolbar, further consolidating the UI elements.
-* Switch to a new hand-coded default block parser implementation and expand documentation.
-* - Implemented in both PHP and JS.
-* - Brings great performance improvements in both time and memory.
-* - Makes server-side parsing in PHP viable for accessing blocks as a tree.
-* Use flex-box to render the block inserter layout to address different issues with spacing.
-* Show a warning when a disallowed filetype is dropped on a MediaUpload.
-* Show "no archives to show" message on Archives Block.
-* Add AccessibleSVG component and use consistently for block icons.
-* Improve Classic editor and Cloudflare notification modals.
-* Refactor Draggable component to decouple the drag handle from the DOM node being dragged.
-* Move video caption styles to style.scss.
-* Treat Verse lines consistently on the front-end.
-* Make sure all available taxonomies are loaded in the editor.
-* Improve empty elements filters in Slot implementation.
-* Fix case with PostTextEditor where intended state value is not always reflected in the rendered textarea when empty.
-* Fix background clashing with some themes in Separator alternative styles.
-* Fix case where hasSelectedInnerBlock did not account for multi-selected innerBlocks. This caused an edge case in Spotlight mode where multiple blocks selected inside a column would appear unfocused.
-* Fix regression with margins around image captions.
-* Fix issue with author select overflowing on IE11.
-* Fix the publish panel top position in FullScreen mode.
-* Fix radio button alignment in post visibility menu.
-* Fix issues with centering of images.
-* Fix BlockIcon usage in embed placeholder when resource cannot be previewed.
-* Fix font size regression in PostTitle.
-* Fix codetabs block in extensibility documentation.
-* Fix import source of RangeControl in Readme file.
-* Fix broken link in documentation inside element/README.md.
-* Deprecate usage of RichText provider component.
-* Deprecate getI18n, dcnpgettext.
-* Remove deprecated selectors from docs.
-* Revert shortcut change in block-deletion e2e test.
-* Pin fetch polyfill to 3.0 UMD distributable to resolve an issue where it was no longer usable in IE11.
-* Ensure Gutenberg repository is clean after install.
-* Include block serialization default parser in plugin.
-* Change how required built-ins are polyfilled with Babel 7.
+-   Add Full Screen mode. 📺
+-   Add UI for bulk managing reusable blocks.
+-   Implement a more sophisticated Editor Styles mechanism. 🖍 It allows themes to register editor styles for blocks by targeting the blocks themselves without having to fight CSS specificity, and without having to know the internal DOM structure for the editor.
+-   Move the block settings menu to the block toolbar, further consolidating the UI elements.
+-   Switch to a new hand-coded default block parser implementation and expand documentation.
+-   -   Implemented in both PHP and JS.
+-   -   Brings great performance improvements in both time and memory.
+-   -   Makes server-side parsing in PHP viable for accessing blocks as a tree.
+-   Use flex-box to render the block inserter layout to address different issues with spacing.
+-   Show a warning when a disallowed filetype is dropped on a MediaUpload.
+-   Show "no archives to show" message on Archives Block.
+-   Add AccessibleSVG component and use consistently for block icons.
+-   Improve Classic editor and Cloudflare notification modals.
+-   Refactor Draggable component to decouple the drag handle from the DOM node being dragged.
+-   Move video caption styles to style.scss.
+-   Treat Verse lines consistently on the front-end.
+-   Make sure all available taxonomies are loaded in the editor.
+-   Improve empty elements filters in Slot implementation.
+-   Fix case with PostTextEditor where intended state value is not always reflected in the rendered textarea when empty.
+-   Fix background clashing with some themes in Separator alternative styles.
+-   Fix case where hasSelectedInnerBlock did not account for multi-selected innerBlocks. This caused an edge case in Spotlight mode where multiple blocks selected inside a column would appear unfocused.
+-   Fix regression with margins around image captions.
+-   Fix issue with author select overflowing on IE11.
+-   Fix the publish panel top position in FullScreen mode.
+-   Fix radio button alignment in post visibility menu.
+-   Fix issues with centering of images.
+-   Fix BlockIcon usage in embed placeholder when resource cannot be previewed.
+-   Fix font size regression in PostTitle.
+-   Fix codetabs block in extensibility documentation.
+-   Fix import source of RangeControl in Readme file.
+-   Fix broken link in documentation inside element/README.md.
+-   Deprecate usage of RichText provider component.
+-   Deprecate getI18n, dcnpgettext.
+-   Remove deprecated selectors from docs.
+-   Revert shortcut change in block-deletion e2e test.
+-   Pin fetch polyfill to 3.0 UMD distributable to resolve an issue where it was no longer usable in IE11.
+-   Ensure Gutenberg repository is clean after install.
+-   Include block serialization default parser in plugin.
+-   Change how required built-ins are polyfilled with Babel 7.
 
 = 3.7.0 =
 
-* New “Spotlight Mode” that focuses on a single block at a time and an updated “Unified Toolbar” design. Both can be combined.
-* Refactor to how image floats are handled.
-* Improve visual clarity of block switcher menu.
-* Add a delay to the block type label when hovering.
-* Allow converting a multiline-paragraph into a list with corresponding items.
-* Position caret at end of previous block for any type of block removal.
-* Automatically create an Audio block when drag-and-dropping an audio file.
-* Update icons used for Paragraph, Heading, and Subheading blocks for added clarity.
-* Adhere to OS guidelines when showing keyboard shortcuts (icons for Mac).
-* Improve link insertion by continuing to show highlighted text when URL input is toggled.
-* Automatically create a link when selected text is a URL.
-* Expand on capabilities of invalid block actions by adding an ellipsis menu and an option to convert to classic block.
-* Ignore leading slash when searching blocks in the inserter.
-* Pass the title attribute when uploading an image.
-* Allow blocks which support alignments to have a default option.
-* Add poster image support for Video Block.
-* Add support for preload attribute in Video Block.
-* Add description for Reusable Blocks, show in the inspector.
-* Update Heading Block description for clarity.
-* Small design update to the editor fixed toolbar.
-* Improve visual display of post visibility settings.
-* Apply enhancements to the coloring mechanism and the exposed components (withColors).
-* Only show transforms for blocks that can be inserted on the root block. Also orders them by frequency / use.
-* Remove margin-bottom from the last element on panel body.
-* Store and restore the global post object around dynamic block callbacks to allow for loops.
-* Move first editor tip about inserter to the toolbar.
-* Use double quotes in all NUX tips.
-* Use sentence case for text in Tooltips.
-* Only request embed preview if there is a URL.
-* Change keyboard shortcut for remove block to Cmd+Shift+X / Ctrl+Shift+X.
-* Reset value of RangeControl when setting it to empty.
-* Add Text Columns → Columns transform.
-* Add Code → Preformatted transform.
-* Add “blockquote” as a keyword for the Quote block.
-* Clear the floating element for clearing color values. Update the appearance so that it’s consistent with other button settings.
-* Rewrite Table Block to use a simpler RichText value.
-* Add RichText.isEmpty API.
-* Allow disabling Google Fonts URL by translators.
-* Refactor post format block implementation to assign as template setting.
-* Improve settings consistency of blocks under widget category.
-* Fix issue where pasting malformed HTML into a block the HTML tokenizer could break by wrapping it with an exception handler.
-* Restore option to add links within a Verse Block.
-* Fix excess whitespace in block style class name.
-* Fix issue where hit-area for the inserter between blocks was not perfectly centered.
-* Fix incorrect example code for withSelect higher-order component.
-* Fix flex-box issue on IE11 for keyboard shortcuts help panel.
-* Fix lint issues found in block-serialization-spec-parser packages.
-* Fix malformed SVGs for Facebook.
-* Fix small alignment issue with the inserter arrow.
-* Fix issue with recent blocks showing on mobile.
-* Fix another issue with page publishing.
-* Fix issue with string that was not showing up for translation.
-* Fix left margin of Archives Block.
-* Fix styling issue with block inserter.
-* Fix regression with missing SVG roles and attributes.
-* Fix script registration of TinyMCE to account for compression.
-* Fix embed block pattern mismatch.
-* Fix issue with tooltips not being shown on IconButtons with DotTip children.
-* Fix some regressions with Table Block and make sure it behaves responsibly.
-* Fix regression with textbox spacing and a focus issue.
-* Resolve an issue where removing all blocks from a post with a template assigned would reintroduce the template blocks after saving and reloading the editor.
-* Switch order of operations so that post content is parsed first regardless of the presence of a template.
-* Add doAction when a deprecated feature is encountered.
-* Deprecate Subheading block.
-* Change title and description of Text Columns to include deprecation notice.
-* Remove extra classNames from integration test.
-* Make sure property for gallery=multiple is only set when type of media is image.
-* Avoid changing the public API of the warning component to avoid potential backwards compatibility issues.
-* Check for window in data registry.
-* Update FocusableIframe component URL example.
-* Drop explicit window reference from withSafeTimeout in compose.
-* Prevent case where early editor checks might bail out preventing hidden meta-boxes from being actually hidden.
-* Use “post” instead of “page” in the warning when the post contains blocks.
-* Make alt text for image in example post translatable.
-* Remove TinyMCE paste plugin as it’s absorbed in raw handling modules.
-* Extract LinkContainer from FormatToolbar.
-* Document how to add block style variations.
-* Add mention of Material Design icons to the design docs.
-* Update documentation for block controls.
-* Extend guidelines for managing packages and publishing them to npm.
-* Update contributing guidelines to include local wp dev instructions.
-* Update FAQ doc with info about keyboard shortcuts.
-* Update package-lock.json to expected values.
-* Deprecate onSetup and getSettings as unstable APIs from RichText.
-* Some general updates to handbook documents.
-* Add documentation about floats.
-* Add e2e test for font size mechanism.
-* Make usage of core-data explicit.
-* Create new spec-parser package.
-* Restores the test URL we should be using for e2e tests.
-* Upgrade WP Coding Standards to 1.0.0.
-* Update npm-package-json-lint lock to 3.3.1.
-* Update stylelint to 9.5.0 and stylelint-config-wordpress to 13.1.0.
-* Update lint-staged and docs/manifest.js.
-* Mobile Native
-* - Initial implementation of Toolbar.
-* - Add basic text toolbar actions.
-* - Update on the event interface for contentSizeChange on Aztec component.
-* - Fix toolbar status when pressing buttons on Android (and iOS).
+-   New “Spotlight Mode” that focuses on a single block at a time and an updated “Unified Toolbar” design. Both can be combined.
+-   Refactor to how image floats are handled.
+-   Improve visual clarity of block switcher menu.
+-   Add a delay to the block type label when hovering.
+-   Allow converting a multiline-paragraph into a list with corresponding items.
+-   Position caret at end of previous block for any type of block removal.
+-   Automatically create an Audio block when drag-and-dropping an audio file.
+-   Update icons used for Paragraph, Heading, and Subheading blocks for added clarity.
+-   Adhere to OS guidelines when showing keyboard shortcuts (icons for Mac).
+-   Improve link insertion by continuing to show highlighted text when URL input is toggled.
+-   Automatically create a link when selected text is a URL.
+-   Expand on capabilities of invalid block actions by adding an ellipsis menu and an option to convert to classic block.
+-   Ignore leading slash when searching blocks in the inserter.
+-   Pass the title attribute when uploading an image.
+-   Allow blocks which support alignments to have a default option.
+-   Add poster image support for Video Block.
+-   Add support for preload attribute in Video Block.
+-   Add description for Reusable Blocks, show in the inspector.
+-   Update Heading Block description for clarity.
+-   Small design update to the editor fixed toolbar.
+-   Improve visual display of post visibility settings.
+-   Apply enhancements to the coloring mechanism and the exposed components (withColors).
+-   Only show transforms for blocks that can be inserted on the root block. Also orders them by frequency / use.
+-   Remove margin-bottom from the last element on panel body.
+-   Store and restore the global post object around dynamic block callbacks to allow for loops.
+-   Move first editor tip about inserter to the toolbar.
+-   Use double quotes in all NUX tips.
+-   Use sentence case for text in Tooltips.
+-   Only request embed preview if there is a URL.
+-   Change keyboard shortcut for remove block to Cmd+Shift+X / Ctrl+Shift+X.
+-   Reset value of RangeControl when setting it to empty.
+-   Add Text Columns → Columns transform.
+-   Add Code → Preformatted transform.
+-   Add “blockquote” as a keyword for the Quote block.
+-   Clear the floating element for clearing color values. Update the appearance so that it’s consistent with other button settings.
+-   Rewrite Table Block to use a simpler RichText value.
+-   Add RichText.isEmpty API.
+-   Allow disabling Google Fonts URL by translators.
+-   Refactor post format block implementation to assign as template setting.
+-   Improve settings consistency of blocks under widget category.
+-   Fix issue where pasting malformed HTML into a block the HTML tokenizer could break by wrapping it with an exception handler.
+-   Restore option to add links within a Verse Block.
+-   Fix excess whitespace in block style class name.
+-   Fix issue where hit-area for the inserter between blocks was not perfectly centered.
+-   Fix incorrect example code for withSelect higher-order component.
+-   Fix flex-box issue on IE11 for keyboard shortcuts help panel.
+-   Fix lint issues found in block-serialization-spec-parser packages.
+-   Fix malformed SVGs for Facebook.
+-   Fix small alignment issue with the inserter arrow.
+-   Fix issue with recent blocks showing on mobile.
+-   Fix another issue with page publishing.
+-   Fix issue with string that was not showing up for translation.
+-   Fix left margin of Archives Block.
+-   Fix styling issue with block inserter.
+-   Fix regression with missing SVG roles and attributes.
+-   Fix script registration of TinyMCE to account for compression.
+-   Fix embed block pattern mismatch.
+-   Fix issue with tooltips not being shown on IconButtons with DotTip children.
+-   Fix some regressions with Table Block and make sure it behaves responsibly.
+-   Fix regression with textbox spacing and a focus issue.
+-   Resolve an issue where removing all blocks from a post with a template assigned would reintroduce the template blocks after saving and reloading the editor.
+-   Switch order of operations so that post content is parsed first regardless of the presence of a template.
+-   Add doAction when a deprecated feature is encountered.
+-   Deprecate Subheading block.
+-   Change title and description of Text Columns to include deprecation notice.
+-   Remove extra classNames from integration test.
+-   Make sure property for gallery=multiple is only set when type of media is image.
+-   Avoid changing the public API of the warning component to avoid potential backwards compatibility issues.
+-   Check for window in data registry.
+-   Update FocusableIframe component URL example.
+-   Drop explicit window reference from withSafeTimeout in compose.
+-   Prevent case where early editor checks might bail out preventing hidden meta-boxes from being actually hidden.
+-   Use “post” instead of “page” in the warning when the post contains blocks.
+-   Make alt text for image in example post translatable.
+-   Remove TinyMCE paste plugin as it’s absorbed in raw handling modules.
+-   Extract LinkContainer from FormatToolbar.
+-   Document how to add block style variations.
+-   Add mention of Material Design icons to the design docs.
+-   Update documentation for block controls.
+-   Extend guidelines for managing packages and publishing them to npm.
+-   Update contributing guidelines to include local wp dev instructions.
+-   Update FAQ doc with info about keyboard shortcuts.
+-   Update package-lock.json to expected values.
+-   Deprecate onSetup and getSettings as unstable APIs from RichText.
+-   Some general updates to handbook documents.
+-   Add documentation about floats.
+-   Add e2e test for font size mechanism.
+-   Make usage of core-data explicit.
+-   Create new spec-parser package.
+-   Restores the test URL we should be using for e2e tests.
+-   Upgrade WP Coding Standards to 1.0.0.
+-   Update npm-package-json-lint lock to 3.3.1.
+-   Update stylelint to 9.5.0 and stylelint-config-wordpress to 13.1.0.
+-   Update lint-staged and docs/manifest.js.
+-   Mobile Native
+-   -   Initial implementation of Toolbar.
+-   -   Add basic text toolbar actions.
+-   -   Update on the event interface for contentSizeChange on Aztec component.
+-   -   Fix toolbar status when pressing buttons on Android (and iOS).
 
 = 3.6.2 =
 
-* Restore min-width to popover.
-* Fix wide toolbar regression
-* Add e2e test for publishing a page
-* Fix typo for removing excerpt block stripping
+-   Restore min-width to popover.
+-   Fix wide toolbar regression
+-   Add e2e test for publishing a page
+-   Fix typo for removing excerpt block stripping
 
 = 3.6.1 =
 
-* Fixed an issue that caused page publishing to fail.
-* Fixed an issue with the block options menu appearing too narrow.
+-   Fixed an issue that caused page publishing to fail.
+-   Fixed an issue with the block options menu appearing too narrow.
 
 = 3.6.0 =
 
-* Updated block inserter and library with new icons for all core blocks.
-* Allow showing the sidebar and inspector controls when editing a block in HTML mode.
-* Add new block keyboard shortcuts and consolidate their display in menus:
-* * Insert Before / After block.
-* * Duplicating block.
-* * Toggling the inspector.
-* * Remove block keyboard shortcut.
-* Updated block inserter and library with new icons for all core blocks.
-* Allow showing the sidebar and inspector controls when editing a block in HTML mode.
-* Add new block keyboard shortcuts and consolidate their display in menus:
-* Insert Before / After block.
-* Duplicating block.
-* Toggling the inspector.
-* Remove block keyboard shortcut.
-* Add new keyboard shortcuts help modal documenting available shortcuts.
-* Hide keyboard shortcuts on mobile screens.
-* Open new window if prior preview window has been closed.
-* Bring the preview tab to the front when clicking the preview button.
-* Avoid changing the label of the “publish” button if an auto-save is being performed.
-* Update the Block Inserter to allow searching for terms that contain diacritics.
-* Take into account children blocks when handling disabled blocks.
-* Offer chance to add and revise Tags and Post Format during pre-publish flow.
-* Let menus grow based on the length of its elements.
-* Add visual padding to menus.
-* Avoid scrollbars on Audio block when shown full-width.
-* Improve permalink UI and make it responsive.
-* Change color of links in gallery block caption.
-* Simplify the styling of the “Toggle publish panel” aria-region to avoid content jumps.
-* Make active pill button look pressed.
-* Make sure Latest Posts alignment class behaviour is consistent.
-* Show drop-zone background when file is dragged.
-* Reset active sidebar tab on initial load.
-* Apply new checkbox CSS to radio buttons and fix border radius.
-* Add a couple new dashicons for insert before / after block.
-* Add styles for Spinner component (was relying on core before).
-* Add styles for Notice component.
-* Refactor template select field to use SelectControl.
-* Correctly handle per_page=-1 in the queried data state.
-* Create dummy context components for type switch.
-* Add RegistryConsumer export to data module.
-* Add has_blocks function to the repertoire.
-* Add has_block function and unit tests.
-* Add has_block function and unit tests for it.
-* Introduce strip_dynamic_blocks() for excerpts.
-* Fix issue with default appender placeholder on IE11.
-* Fix issue with shortcode block UI on IE11.
-* Fix tag input interface on IE11.
-* Fix issue with custom element serializer on IE11.
-* Fix issue with meta boxes overlapping the content on IE11.
-* Fix invalidation case of custom block classes.
-* Fix unhandled error dialog styling issue.
-* Fix paragraph splits on react native implementation.
-* Fix code block style regression.
-* Fix issue with code font-size on heading contexts.
-* Fix case where crashed block would overlap with surrounding blocks.
-* Fix issue with block styles on IE11.
-* Fix the heading level buttons on IE11.
-* Fix issues with drag and drop over text.
-* Fix small bug with recent blocks hover style.
-* Use argument swapping instead of named arguments for string placeholders.
-* Pass the the search result object to props.onChange on UrlInput.
-* Add localization context to occurrences of “More” string.
-* Add a Heading block implementation for mobile app.
-* Add the react-native entrypoint to all runtime packages.
-* Move MoreMenu specific styling away from Popover CSS.
-* Ensure meta box functions are available in editor context.
-* Ensure the full content integration test is run.
-* Remove client-side document title updates.
-* Remove TinyMCE shim that was removed in WP 4.9.7.
-* Remove the workaround for intermittent multiple-tab preview test failure.
-* Remove Promise.resolve call that’s already handled by the JS runtime.
-* Remove redundant event handlers from default block appender.
-* Deprecate withContext HOC and remove its usage.
-* Some localization & spelling fixes.
-* Update docs for templateLock’s insert option.
-* Extract Core Blocks to a block-library npm package.
-* Add a license checker script.
-* Allow access to the WordPress installation if DOCKER_ENV=localwpdev.
-* Bring the handbook design up to date.
+-   Updated block inserter and library with new icons for all core blocks.
+-   Allow showing the sidebar and inspector controls when editing a block in HTML mode.
+-   Add new block keyboard shortcuts and consolidate their display in menus:
+-   -   Insert Before / After block.
+-   -   Duplicating block.
+-   -   Toggling the inspector.
+-   -   Remove block keyboard shortcut.
+-   Updated block inserter and library with new icons for all core blocks.
+-   Allow showing the sidebar and inspector controls when editing a block in HTML mode.
+-   Add new block keyboard shortcuts and consolidate their display in menus:
+-   Insert Before / After block.
+-   Duplicating block.
+-   Toggling the inspector.
+-   Remove block keyboard shortcut.
+-   Add new keyboard shortcuts help modal documenting available shortcuts.
+-   Hide keyboard shortcuts on mobile screens.
+-   Open new window if prior preview window has been closed.
+-   Bring the preview tab to the front when clicking the preview button.
+-   Avoid changing the label of the “publish” button if an auto-save is being performed.
+-   Update the Block Inserter to allow searching for terms that contain diacritics.
+-   Take into account children blocks when handling disabled blocks.
+-   Offer chance to add and revise Tags and Post Format during pre-publish flow.
+-   Let menus grow based on the length of its elements.
+-   Add visual padding to menus.
+-   Avoid scrollbars on Audio block when shown full-width.
+-   Improve permalink UI and make it responsive.
+-   Change color of links in gallery block caption.
+-   Simplify the styling of the “Toggle publish panel” aria-region to avoid content jumps.
+-   Make active pill button look pressed.
+-   Make sure Latest Posts alignment class behaviour is consistent.
+-   Show drop-zone background when file is dragged.
+-   Reset active sidebar tab on initial load.
+-   Apply new checkbox CSS to radio buttons and fix border radius.
+-   Add a couple new dashicons for insert before / after block.
+-   Add styles for Spinner component (was relying on core before).
+-   Add styles for Notice component.
+-   Refactor template select field to use SelectControl.
+-   Correctly handle per_page=-1 in the queried data state.
+-   Create dummy context components for type switch.
+-   Add RegistryConsumer export to data module.
+-   Add has_blocks function to the repertoire.
+-   Add has_block function and unit tests.
+-   Add has_block function and unit tests for it.
+-   Introduce strip_dynamic_blocks() for excerpts.
+-   Fix issue with default appender placeholder on IE11.
+-   Fix issue with shortcode block UI on IE11.
+-   Fix tag input interface on IE11.
+-   Fix issue with custom element serializer on IE11.
+-   Fix issue with meta boxes overlapping the content on IE11.
+-   Fix invalidation case of custom block classes.
+-   Fix unhandled error dialog styling issue.
+-   Fix paragraph splits on react native implementation.
+-   Fix code block style regression.
+-   Fix issue with code font-size on heading contexts.
+-   Fix case where crashed block would overlap with surrounding blocks.
+-   Fix issue with block styles on IE11.
+-   Fix the heading level buttons on IE11.
+-   Fix issues with drag and drop over text.
+-   Fix small bug with recent blocks hover style.
+-   Use argument swapping instead of named arguments for string placeholders.
+-   Pass the the search result object to props.onChange on UrlInput.
+-   Add localization context to occurrences of “More” string.
+-   Add a Heading block implementation for mobile app.
+-   Add the react-native entrypoint to all runtime packages.
+-   Move MoreMenu specific styling away from Popover CSS.
+-   Ensure meta box functions are available in editor context.
+-   Ensure the full content integration test is run.
+-   Remove client-side document title updates.
+-   Remove TinyMCE shim that was removed in WP 4.9.7.
+-   Remove the workaround for intermittent multiple-tab preview test failure.
+-   Remove Promise.resolve call that’s already handled by the JS runtime.
+-   Remove redundant event handlers from default block appender.
+-   Deprecate withContext HOC and remove its usage.
+-   Some localization & spelling fixes.
+-   Update docs for templateLock’s insert option.
+-   Extract Core Blocks to a block-library npm package.
+-   Add a license checker script.
+-   Allow access to the WordPress installation if DOCKER_ENV=localwpdev.
+-   Bring the handbook design up to date.
 
 = 3.5.0 =
 
-* Add an edit button to embed blocks to modify the source.
-* Improve margin collapse within column blocks.
-* De-emphasize inline tokens within the inserter for a better user experience.
-* Polish focus and active styles around buttons and inputs.
-* Polish styles for checkbox component, update usages of toggle to checkbox where appropriate. Update documentation.
-* Improve pre-publish panel styling and textual copy.
-* Prevent duplicate DotTips from appearing.
-* Integrate "queries data" into the entities abstraction for data module.
-* Hide block movers if there are no blocks before and after.
-* Initial improvements for responsive image handling in galleries.
-* Use correct color for primary button bottom border.
-* Allow transitioning post status from scheduled to draft.
-* Improvements for auto-completer keyboard interactions.
-* Place strikethrough formatting button after link as it's less important.
-* Resolve issue with preview sometimes opening redundant tabs.
-* Align timepicker with calendar on pre-publish panel.
-* Expand date filter select box width within media library.
-* Constrain media blocks to content area width in front-end.
-* Reapply box-sizing to slider thumbs.
-* Avoid showing line separator in block settings menu when it's the last item.
-* Introduce additional keyboard shortcuts to navigate through the navigateRegions component.
-* shift+alt+n to go to the next region.
-* shift+alt+p to go to the previous region.
-* Replace all withAPIData usage and deprecate the higher-order component.
-* Add persistence via data plugin interface.
-* Introduce new redux-routine package for synchronous generator in data module.
-* Move embed API call out of block and into data module.
-* Remove no longer needed workaround targeted at resolving a TinyMCE error.
-* Abort selection range set on unset range target. Resolves an issue when merging two empty paragraph blocks created while at the end of an inline boundary.
-* Removing or merging RichText should only trigger if the selection is collapsed:
-* Fix issue with backspace not working as expected when deleting text content from the first block.
-* Fix case where paragraph content could move to previous paragraph when deleted.
-* Remove provisional block behaviour to improve reliability of various interactions.
-* Restore horizontal edge traversal implementation to address issue where pressing Backspace may not place the caret in the correct position if within or after a RichText field.
-* Ensure Gutenberg is disabled when editing the assigned blog posts page.
-* Initialize the Autosaves controller even if revisions are disabled. Fixes several bugs around saving with revisions turned off.
-* Display warning when Cloudflare blocks REST API requests.
-* Improve validation for attribute names in serializer.
-* Add Slot to block menu settings for extensibility.
-* Fix File Block center align behavior.
-* Fix behaviours when deleting on an empty RichText field.
-* Fix parent-dropdown missing for custom post-types.
-* Fix import style statements in ColorIndicator.
-* Fix height of used-once block warning.
-* Fix link for innerBlocks docs.
-* Fix link to server-side-render component.
-* Fix race condition with DomReady.
-* Fix awkward capitalisation in demo post content.
-* Fix warning for unrecognised forwardedRef prop.
-* Fix regression with URL input focus box.
-* Fix error in custom HTML preview when block is empty.
-* Fix colspan bug in table block for tables with thead tags.
-* Fix issue with image inspector controls disappearing once an image block is set to wide/full alignment.
-* Fix issue when image size remains blurry if manually set to a smaller size (i.e., medium) and then changed alignment to wide/full.
-* Fix issue with meta boxes being absent when script enqueued in head depends on wp-edit-post.
-* Resolve an issue where removing all text from a Button block by backspace would cause subsequent text changes to not be accurately reflected. Broader issue with TinyMCE inline elements as containers.
-* Avoid using remove() because it's unavailable in IE11.
-* Address further feedback on duplicated DotTips implementation.
-* Update re-resizable to version 4.7.1 — fix image & spacer blocks resizing on IE.
-* Use a unique querystring package instead of three different ones.
-* Introduce filters to allow developers the ability to customize the Taxonomy Selector UI for custom taxonomies.
-* Introduce RichText component for mobile native and implement the Paragraph Block with it.
-* Use standard label for Alt Text input.
-* Consolidate similar i18n strings.
-* Remove title attributes from the Classic Editor warning.
-* Remove unused code in taxonomies panel.
-* Remove oEmbed fixture files.
-* Remove jQuery dependency from @wordpress/api-fetch.
-* Remove filler spaces from empty constructs.
-* Remove REST API shims for code introduced in WP 4.9.8.
-* Remove unused terms, taxonomies, and categories code.
-* Replace the apiRequest module with api-fetch module.
-* Add inline comment that explains a stopPropagation() within tips implementation.
-* Add gutenberg_can_edit_post filter.
-* Add watch support for stylesheets in packages.
-* Add JSDoc comment to Popover's focus() method.
-* Add readme docs for all components.
-* Autogenerate documentation from readme files.
-* Add doc note about automatically applied attributes in save.
-* Add test for block mover.
-* Allow demo content to be translatable.
-* Update CSS selectors from :before to ::before.
-* Export the description for server-registered blocks.
-* Export getBlockTypes on react native interface.
-* Expose redux-routine to react native.
-* Expose unknown-type handler methods for mobile.
-* Specify missing wp-url dependencies.
-* Improve JS packages descriptions.
-* Downgrade Docker image version for WordPress for test validation.
-* Move CI back to latest WordPress version and bump minimum version to 4.9.8
-* Use @wordpress/compose instead of @wordpress/components.
-* Update docs for Button component.
-* Update package-lock.json.
-* Updated dependencies: jest, npm-package-json-lint and read-pkg-up.
-* Add Babel runtime dependency to redux routine.
-* Prevent Travis from running when changes are only made to .md files.
-* Add stylelint for SCSS linting.
-* Set babel dependencies to fixed version and add core-js2 support.
-* Trigger E2E test failure on console logging.
-* Update doc links to resources moved to packages folder.
-* Update api-fetch package documentation.
-* Update Lerna to 3.0.0-rc.0.
-* Generate source maps and read those from the webpack build.
-* Rewrite e2e tests using jest-puppeter preset.
-* Introduce a new Extending Editor document specific to editor filters.
-* Improve test configuration and mocking strategy.
+-   Add an edit button to embed blocks to modify the source.
+-   Improve margin collapse within column blocks.
+-   De-emphasize inline tokens within the inserter for a better user experience.
+-   Polish focus and active styles around buttons and inputs.
+-   Polish styles for checkbox component, update usages of toggle to checkbox where appropriate. Update documentation.
+-   Improve pre-publish panel styling and textual copy.
+-   Prevent duplicate DotTips from appearing.
+-   Integrate "queries data" into the entities abstraction for data module.
+-   Hide block movers if there are no blocks before and after.
+-   Initial improvements for responsive image handling in galleries.
+-   Use correct color for primary button bottom border.
+-   Allow transitioning post status from scheduled to draft.
+-   Improvements for auto-completer keyboard interactions.
+-   Place strikethrough formatting button after link as it's less important.
+-   Resolve issue with preview sometimes opening redundant tabs.
+-   Align timepicker with calendar on pre-publish panel.
+-   Expand date filter select box width within media library.
+-   Constrain media blocks to content area width in front-end.
+-   Reapply box-sizing to slider thumbs.
+-   Avoid showing line separator in block settings menu when it's the last item.
+-   Introduce additional keyboard shortcuts to navigate through the navigateRegions component.
+-   shift+alt+n to go to the next region.
+-   shift+alt+p to go to the previous region.
+-   Replace all withAPIData usage and deprecate the higher-order component.
+-   Add persistence via data plugin interface.
+-   Introduce new redux-routine package for synchronous generator in data module.
+-   Move embed API call out of block and into data module.
+-   Remove no longer needed workaround targeted at resolving a TinyMCE error.
+-   Abort selection range set on unset range target. Resolves an issue when merging two empty paragraph blocks created while at the end of an inline boundary.
+-   Removing or merging RichText should only trigger if the selection is collapsed:
+-   Fix issue with backspace not working as expected when deleting text content from the first block.
+-   Fix case where paragraph content could move to previous paragraph when deleted.
+-   Remove provisional block behaviour to improve reliability of various interactions.
+-   Restore horizontal edge traversal implementation to address issue where pressing Backspace may not place the caret in the correct position if within or after a RichText field.
+-   Ensure Gutenberg is disabled when editing the assigned blog posts page.
+-   Initialize the Autosaves controller even if revisions are disabled. Fixes several bugs around saving with revisions turned off.
+-   Display warning when Cloudflare blocks REST API requests.
+-   Improve validation for attribute names in serializer.
+-   Add Slot to block menu settings for extensibility.
+-   Fix File Block center align behavior.
+-   Fix behaviours when deleting on an empty RichText field.
+-   Fix parent-dropdown missing for custom post-types.
+-   Fix import style statements in ColorIndicator.
+-   Fix height of used-once block warning.
+-   Fix link for innerBlocks docs.
+-   Fix link to server-side-render component.
+-   Fix race condition with DomReady.
+-   Fix awkward capitalisation in demo post content.
+-   Fix warning for unrecognised forwardedRef prop.
+-   Fix regression with URL input focus box.
+-   Fix error in custom HTML preview when block is empty.
+-   Fix colspan bug in table block for tables with thead tags.
+-   Fix issue with image inspector controls disappearing once an image block is set to wide/full alignment.
+-   Fix issue when image size remains blurry if manually set to a smaller size (i.e., medium) and then changed alignment to wide/full.
+-   Fix issue with meta boxes being absent when script enqueued in head depends on wp-edit-post.
+-   Resolve an issue where removing all text from a Button block by backspace would cause subsequent text changes to not be accurately reflected. Broader issue with TinyMCE inline elements as containers.
+-   Avoid using remove() because it's unavailable in IE11.
+-   Address further feedback on duplicated DotTips implementation.
+-   Update re-resizable to version 4.7.1 — fix image & spacer blocks resizing on IE.
+-   Use a unique querystring package instead of three different ones.
+-   Introduce filters to allow developers the ability to customize the Taxonomy Selector UI for custom taxonomies.
+-   Introduce RichText component for mobile native and implement the Paragraph Block with it.
+-   Use standard label for Alt Text input.
+-   Consolidate similar i18n strings.
+-   Remove title attributes from the Classic Editor warning.
+-   Remove unused code in taxonomies panel.
+-   Remove oEmbed fixture files.
+-   Remove jQuery dependency from @wordpress/api-fetch.
+-   Remove filler spaces from empty constructs.
+-   Remove REST API shims for code introduced in WP 4.9.8.
+-   Remove unused terms, taxonomies, and categories code.
+-   Replace the apiRequest module with api-fetch module.
+-   Add inline comment that explains a stopPropagation() within tips implementation.
+-   Add gutenberg_can_edit_post filter.
+-   Add watch support for stylesheets in packages.
+-   Add JSDoc comment to Popover's focus() method.
+-   Add readme docs for all components.
+-   Autogenerate documentation from readme files.
+-   Add doc note about automatically applied attributes in save.
+-   Add test for block mover.
+-   Allow demo content to be translatable.
+-   Update CSS selectors from :before to ::before.
+-   Export the description for server-registered blocks.
+-   Export getBlockTypes on react native interface.
+-   Expose redux-routine to react native.
+-   Expose unknown-type handler methods for mobile.
+-   Specify missing wp-url dependencies.
+-   Improve JS packages descriptions.
+-   Downgrade Docker image version for WordPress for test validation.
+-   Move CI back to latest WordPress version and bump minimum version to 4.9.8
+-   Use @wordpress/compose instead of @wordpress/components.
+-   Update docs for Button component.
+-   Update package-lock.json.
+-   Updated dependencies: jest, npm-package-json-lint and read-pkg-up.
+-   Add Babel runtime dependency to redux routine.
+-   Prevent Travis from running when changes are only made to .md files.
+-   Add stylelint for SCSS linting.
+-   Set babel dependencies to fixed version and add core-js2 support.
+-   Trigger E2E test failure on console logging.
+-   Update doc links to resources moved to packages folder.
+-   Update api-fetch package documentation.
+-   Update Lerna to 3.0.0-rc.0.
+-   Generate source maps and read those from the webpack build.
+-   Rewrite e2e tests using jest-puppeter preset.
+-   Introduce a new Extending Editor document specific to editor filters.
+-   Improve test configuration and mocking strategy.
 
 = 3.4.0 =
 
-* Add the Inline Blocks API.
-* Rename Shared Blocks to Reusable Blocks.
-* Add a Modal component.
-* Add a REST API Search controller.
-* Add a warning in the classic editor when attempting to edit a post that contains blocks.
-* Add ability for themes to configure font sizes.
-* Add RTL CSS to all packages.
-* Add an edit button to embed blocks.
-* Remove all wp.api usage from the editor package.
-* Add error handling for file block drag-and-drop.
-* Add registerBlockStyleVariation, for registering block style variations.
-* Add a border between panels in the block sidebar.
-* Add a editor.PostFeaturedImage.imageSize filter for the Featured Image.
-* Create a video block when dropping a video on an insertion point.
-* Expose a custom class name hook for mobile.
-* Add a React Native entrypoint for mobile.
-* Only disable wpautop on the main classic editor instance.
-* Retain the id attribute when converting heading tags to heading blocks.
-* Retain target="_blank" on links in converted paragraphs.
-* Improve the handling of imported shortcode blocks.
-* Replace the File block’s filename editor with a RichText.
-* Tweak the block warning style.
-* Add a max-height to the table of contents.
-* Remove the inset shadow from the table of contents.
-* Fix the tag placeholder text for long translations.
-* Fix the table of contents sometimes causing JavaScript errors.
-* Fix the link suggestion dropdown not allowing the first suggestion to be selected by keyboard.
-* Make tooltips persist when hovering them.
-* Add missing aria-labels to the audio and video block UIs.
-* Add an icon and accessibility text to links that open in a new tab.
-* Fixed shared blocks adding unnecessary rewrite rules.
-* Fix a regression in the colour picker width.
-* Fix the colour picker focus border being off-centre.
-* Combine ColorPalettes into a single panel for Button and Paragraph blocks.
-* Fix the ColorIndicator style import.
-* Fix auto-linking a URL pasted on top of another URL.
-* Add persistent store support to the data module.
-* Fix the Latest Comments block using admin imports.
-* Fix a warning when adding an image block.
-* Fix the classic block toolbar alignment.
-* Fix a warning in the block menu.
-* Change all blocks to use supports: align, instead of the align attribute.
-* Improve the ContrastChecker logic for large font sizes.
-* Update the is-shallow-equal package to use ES5 code.
-* Deprecate getMimeTypesArray, mediaUpload, and preloadImage.
-* Deprecate wideAlign in favour of alignWide.
-* Document Node version switching in the testing documentation.
-* Document examples of the registerBlockType hook.
-* Document an example of the block transforms property.
-* Document Gutenberg’s camelCase coding style.
-* Improved all of the package descriptions.
-* Update coding standards to allow double quoted strings to avoid escaping single quotes.
-* Standardise the package descriptions and titles.
-* Extract the editor package.
-* Isolate and reset e2e tests every run.
-* Improve test configuration and mocking strategy.
-* Fix test coverage configuration.
-* Fix the block icons e2e tests.
-* Bump the Puppeteer version.
-* Use simpler jest.fn() mocks for api-fetch calls in unit tests.
+-   Add the Inline Blocks API.
+-   Rename Shared Blocks to Reusable Blocks.
+-   Add a Modal component.
+-   Add a REST API Search controller.
+-   Add a warning in the classic editor when attempting to edit a post that contains blocks.
+-   Add ability for themes to configure font sizes.
+-   Add RTL CSS to all packages.
+-   Add an edit button to embed blocks.
+-   Remove all wp.api usage from the editor package.
+-   Add error handling for file block drag-and-drop.
+-   Add registerBlockStyleVariation, for registering block style variations.
+-   Add a border between panels in the block sidebar.
+-   Add a editor.PostFeaturedImage.imageSize filter for the Featured Image.
+-   Create a video block when dropping a video on an insertion point.
+-   Expose a custom class name hook for mobile.
+-   Add a React Native entrypoint for mobile.
+-   Only disable wpautop on the main classic editor instance.
+-   Retain the id attribute when converting heading tags to heading blocks.
+-   Retain target="\_blank" on links in converted paragraphs.
+-   Improve the handling of imported shortcode blocks.
+-   Replace the File block’s filename editor with a RichText.
+-   Tweak the block warning style.
+-   Add a max-height to the table of contents.
+-   Remove the inset shadow from the table of contents.
+-   Fix the tag placeholder text for long translations.
+-   Fix the table of contents sometimes causing JavaScript errors.
+-   Fix the link suggestion dropdown not allowing the first suggestion to be selected by keyboard.
+-   Make tooltips persist when hovering them.
+-   Add missing aria-labels to the audio and video block UIs.
+-   Add an icon and accessibility text to links that open in a new tab.
+-   Fixed shared blocks adding unnecessary rewrite rules.
+-   Fix a regression in the colour picker width.
+-   Fix the colour picker focus border being off-centre.
+-   Combine ColorPalettes into a single panel for Button and Paragraph blocks.
+-   Fix the ColorIndicator style import.
+-   Fix auto-linking a URL pasted on top of another URL.
+-   Add persistent store support to the data module.
+-   Fix the Latest Comments block using admin imports.
+-   Fix a warning when adding an image block.
+-   Fix the classic block toolbar alignment.
+-   Fix a warning in the block menu.
+-   Change all blocks to use supports: align, instead of the align attribute.
+-   Improve the ContrastChecker logic for large font sizes.
+-   Update the is-shallow-equal package to use ES5 code.
+-   Deprecate getMimeTypesArray, mediaUpload, and preloadImage.
+-   Deprecate wideAlign in favour of alignWide.
+-   Document Node version switching in the testing documentation.
+-   Document examples of the registerBlockType hook.
+-   Document an example of the block transforms property.
+-   Document Gutenberg’s camelCase coding style.
+-   Improved all of the package descriptions.
+-   Update coding standards to allow double quoted strings to avoid escaping single quotes.
+-   Standardise the package descriptions and titles.
+-   Extract the editor package.
+-   Isolate and reset e2e tests every run.
+-   Improve test configuration and mocking strategy.
+-   Fix test coverage configuration.
+-   Fix the block icons e2e tests.
+-   Bump the Puppeteer version.
+-   Use simpler jest.fn() mocks for api-fetch calls in unit tests.
 
 = 3.3.0 =
 
-* Add new Archives block for displaying site archives.
-* Add new Latest Comments block to widgets category.
-* Add “Convert to blocks” option in HTML block.
-* Correct caret placement when merging to inline boundary.
-* Move block switcher from header to multi-block toolbar for multiselection.
-* Add video block attributes for Autoplay, Controls, Loop, Muted.
-* Remove HTML beautification and preserve whitespace on save.
-* Formalize RichText children value abstraction.
-* Allow transformation of image block to file block and vice-versa.
-* Support preload attribute for Audio Block.
-* Avoid popover refresh on Tip mount.
-* Introduce “registry” concept to the Data Module.
-* Convert successive shortcodes properly.
-* Hide “Convert to Shared Block” button on Classic blocks.
-* Update spacing in pre-publish panel titles.
-* Use do_blocks to render core blocks content.
-* Remove restoreContentAndSplit in RichText.
-* Hide insertion point when it is not possible to insert the default block.
-* Refactor block converters to share common UI functionality.
-* Replace the apiRequest module with api-fetch module.
-* Add audio/video settings title to settings panel.
-* Normalize the behavior of BlockListBlock’s “Enter” key handling to insert the default block.
-* Rename baseUrl entities property as baseURL in entities.
-* Rename UrlInput component as URLInput.
-* Give File block a low files transform priority.
-* Make tooltips persist when hovering them.
-* Optimise design of heading line heights.
-* Add a filter(‘editor.FeaturedImage’) for the FeaturedImage component.
-* Fix vertical arrow navigation skips in writing flow.
-* Fix incorrect polyfill script handles.
-* Fix template example so that it is correct.
-* Fix exception error when saving a new shared block.
-* Fix getInserterItems caching bug and add new test case.
-* Fix issue with spacer block resizing and sibling inserter.
-* Fix files configuration entry in package.json for wordpress/babel-preset-default.
-* Fix config and regenerate updated docs.
-* Fix dependency mistake in api-fetch.
-* Fix metaboxes save request (parse: false).
-* Fix issue with name field not being focused when a shared block is created.
-* Fix box sizing for pseudo elements.
-* Fix an error which occurs when assigning the URL of a Button block.
-* Improve usage and documentation of the landmark region labels.
-* Substitute the remaining uses of unfiltered_html capability and withAPIData.
-* Remove the “Extended Settings” meta box wrapper.
-* Remove NewBlock event handling from RichText.
-* Remove legacy context API child context from Block API.
-* Remove Text Columns block from insertion menus in preparation for Try outreach.
-* Remove unused autocompleter backcompat case.
-* Change label in Cover Image block for background opacity.
-* Change the text label on Image block from “Source Type” to “Image Size”.
-* Backup and restore global $post when preloading API data.
-* Move packages repository into Gutenberg with its history.
-* Enhance the deprecated module to log a message only once per session.
-* Switch tests away from using enzyme (enzyme.shallow, enzyme.mount, etc).
-* Unblock tests from being skipped.
-* Add basic test for shortcode transformation.
-* Add e2e test for block icons.
-* Add e2e tests for the NUX tips.
-* Add e2e tests for shared blocks.
-* Remove data-test attribute from UrlInputButton output.
-* Deprecate id prop in favor of clientId.
-* Rename MediaPlaceholder onSelectUrl prop as onSelectURL.
-* Remove unnecessary default prop from test.
-* Point the package entry to src directly for native mobile.
-* Use clearer filenames for saved vendor scripts.
-* Update local install instructions and add add more verbose instructions when node versions don’t match.
-* Reorder package.json devDependencies alphabetically.
-* Coding Guidelines: Prescribe specific camelCasing behaviors.
-* Regenerate docs using docs:build command.
-* Add documentation for ALLOWED_BLOCKS in Columns.
-* Add link to support forum in plugin menu.
-* Deprecate buildTermTree function in utilities.
-* Deprecate property source in Block API.
-* Deprecate uid in favor of clientId.
-* Deprecate grouped inner blocks layouts.
-* Improve eslint checks for deep imports.
-* Improve IntelliSense support when using VS Code.
-* Move the components module partially to the packages folder.
-* Add the blocks module to the packages folder.
-* Add wp-deprecated dependency to wp-element.
-* Add @babel/runtime as a dependency to wordpress/components.
-* Add @babel/runtime as a dependency for packages.
-* Add a new compose package.
-* Extract entities package.
-* Extract viewport package.
-* Extract @wordpress/nux package.
-* Create new spec-parser package.
-* Update Dashicons to latest build.
-* Update test for babel-preset-default.
-* Update code to work with Babel 7.
-* Update package-lock.json with eslint-scope version 3.7.3.
-* Update node-sass.
+-   Add new Archives block for displaying site archives.
+-   Add new Latest Comments block to widgets category.
+-   Add “Convert to blocks” option in HTML block.
+-   Correct caret placement when merging to inline boundary.
+-   Move block switcher from header to multi-block toolbar for multiselection.
+-   Add video block attributes for Autoplay, Controls, Loop, Muted.
+-   Remove HTML beautification and preserve whitespace on save.
+-   Formalize RichText children value abstraction.
+-   Allow transformation of image block to file block and vice-versa.
+-   Support preload attribute for Audio Block.
+-   Avoid popover refresh on Tip mount.
+-   Introduce “registry” concept to the Data Module.
+-   Convert successive shortcodes properly.
+-   Hide “Convert to Shared Block” button on Classic blocks.
+-   Update spacing in pre-publish panel titles.
+-   Use do_blocks to render core blocks content.
+-   Remove restoreContentAndSplit in RichText.
+-   Hide insertion point when it is not possible to insert the default block.
+-   Refactor block converters to share common UI functionality.
+-   Replace the apiRequest module with api-fetch module.
+-   Add audio/video settings title to settings panel.
+-   Normalize the behavior of BlockListBlock’s “Enter” key handling to insert the default block.
+-   Rename baseUrl entities property as baseURL in entities.
+-   Rename UrlInput component as URLInput.
+-   Give File block a low files transform priority.
+-   Make tooltips persist when hovering them.
+-   Optimise design of heading line heights.
+-   Add a filter(‘editor.FeaturedImage’) for the FeaturedImage component.
+-   Fix vertical arrow navigation skips in writing flow.
+-   Fix incorrect polyfill script handles.
+-   Fix template example so that it is correct.
+-   Fix exception error when saving a new shared block.
+-   Fix getInserterItems caching bug and add new test case.
+-   Fix issue with spacer block resizing and sibling inserter.
+-   Fix files configuration entry in package.json for wordpress/babel-preset-default.
+-   Fix config and regenerate updated docs.
+-   Fix dependency mistake in api-fetch.
+-   Fix metaboxes save request (parse: false).
+-   Fix issue with name field not being focused when a shared block is created.
+-   Fix box sizing for pseudo elements.
+-   Fix an error which occurs when assigning the URL of a Button block.
+-   Improve usage and documentation of the landmark region labels.
+-   Substitute the remaining uses of unfiltered_html capability and withAPIData.
+-   Remove the “Extended Settings” meta box wrapper.
+-   Remove NewBlock event handling from RichText.
+-   Remove legacy context API child context from Block API.
+-   Remove Text Columns block from insertion menus in preparation for Try outreach.
+-   Remove unused autocompleter backcompat case.
+-   Change label in Cover Image block for background opacity.
+-   Change the text label on Image block from “Source Type” to “Image Size”.
+-   Backup and restore global $post when preloading API data.
+-   Move packages repository into Gutenberg with its history.
+-   Enhance the deprecated module to log a message only once per session.
+-   Switch tests away from using enzyme (enzyme.shallow, enzyme.mount, etc).
+-   Unblock tests from being skipped.
+-   Add basic test for shortcode transformation.
+-   Add e2e test for block icons.
+-   Add e2e tests for the NUX tips.
+-   Add e2e tests for shared blocks.
+-   Remove data-test attribute from UrlInputButton output.
+-   Deprecate id prop in favor of clientId.
+-   Rename MediaPlaceholder onSelectUrl prop as onSelectURL.
+-   Remove unnecessary default prop from test.
+-   Point the package entry to src directly for native mobile.
+-   Use clearer filenames for saved vendor scripts.
+-   Update local install instructions and add add more verbose instructions when node versions don’t match.
+-   Reorder package.json devDependencies alphabetically.
+-   Coding Guidelines: Prescribe specific camelCasing behaviors.
+-   Regenerate docs using docs:build command.
+-   Add documentation for ALLOWED_BLOCKS in Columns.
+-   Add link to support forum in plugin menu.
+-   Deprecate buildTermTree function in utilities.
+-   Deprecate property source in Block API.
+-   Deprecate uid in favor of clientId.
+-   Deprecate grouped inner blocks layouts.
+-   Improve eslint checks for deep imports.
+-   Improve IntelliSense support when using VS Code.
+-   Move the components module partially to the packages folder.
+-   Add the blocks module to the packages folder.
+-   Add wp-deprecated dependency to wp-element.
+-   Add @babel/runtime as a dependency to wordpress/components.
+-   Add @babel/runtime as a dependency for packages.
+-   Add a new compose package.
+-   Extract entities package.
+-   Extract viewport package.
+-   Extract @wordpress/nux package.
+-   Create new spec-parser package.
+-   Update Dashicons to latest build.
+-   Update test for babel-preset-default.
+-   Update code to work with Babel 7.
+-   Update package-lock.json with eslint-scope version 3.7.3.
+-   Update node-sass.
 
 = 3.2.0 =
 
-* Add block styles variations to the Block API.
-* Add support for Inline Images and Inline Blocks API.
-* Convert Columns to a set of parent and child blocks, including a wrapper element and more reliable front-end presentation.
-* Allow registering new block categories.
-* Add support for locking Inner Block areas.
-* Add File Block for uploading and listing documents, with drag and drop support.
-* Introduce Modal component to expand the extensibility suite of UI components.
-* Redesign block transformation menu.
-* Improve style display of region focus areas.
-* Prevent blocks from being draggable if a template lock exists.
-* Parse superfluous classes as custom classes preventing a block being considered invalid for such cases.
-* Support “Autoplay” and “Loop” in Audio Block “Playback Controls”.
-* Always show “new gallery item” below the gallery.
-* When dragging images to create a gallery, immediately show the images while uploading is happening.
-* Optimize withSelect to avoid generating merge props on equal props.
-* Remove the “scroll shadow” at the bottom of the inserter library.
-* Remove the bottom border on the last collapsible panel.
-* Remove wrapping div from paragraph block (in the editor) for performance audit.
-* Add Image Block ‘Link to’ setting.
-* Allow margins to collapse & refactor block toolbar.
-* Keep NUX tips open when the user clicks outside.
-* Add initialTabName prop to Tab Panel component.
-* Add higher order component to constrain Tab keyboard navigation.
-* Display server error message on media upload when one exists.
-* Improve “add block” text in NUX onboarding.
-* Improve experience of using image resize handles — placing them at the middle of the edges instead of the corners.
-* Update color of the Shared panel icon to be the same as all other icons.
-* Verify if block icon background and foreground colors are readable. Warn in the console otherwise.
-* Address various design details on Plugin API icon treatment in header and popover.
-* Include all image sizes on the media upload object when they exist.
-* Move the delete block action to the ellipsis menu for the block. Introduce separator in the menu.
-* Make the inserter results panel focusable and improve accessibility.
-* Improve publish panel accessibility and add new publish landmark region.
-* Open preview to previewLink if not autosaveable.
-* Make sure autocompleted values make it into the block’s saved content.
-* Avoid setAttributes on end-of-paragraph seeking to resolve unnecessary performance degradations.
-* Avoid re-render and subsequent action dispatch by adopting module constant.
-* Avoid focusing link in new NUX tooltip
-* Avoid showing hover effect if the ancestor of a block is multi-selected.
-* Schedule render by store update via setState. Fixes condition where appender would insert two copies of a block.
-* Inner Blocks refactor:
-* * Update deprecated componentWillReceiveProps to equivalent componentDidUpdate.
-* * Avoid deep equality check on flat allowedBlocks prop shape.
-* * Avoid handling unexpected case where UPDATE_BLOCK_LIST_SETTINGS is not passed an id.
-* * Avoid creating new references for blockListSettings when settings not set, but the id never existed in state anyways.
-* * Avoid switch fallthrough on case where previous updateIsRequired condition would be false, which could have introduced future maintainability issues if additional case statements were added.
-* * Add test to verify state reference is not changed when no update is needed.
-* * Consistently name allowedBlocks (previously also referred to as supportedBlocks).
-* Consider horizontal handled by stopPropagation in RichText. Fixes edge case with inline boundaries at the end of lines. With further improvements.
-* Ensure ellipsis icon button is visible when block settings menu is open.
-* Simplify RichText to have a single function for setting content vs. the current updateContent and setContent, by removing updateContent.
-* Optimize RichText by removing the creation of undo levels at split and merge steps.
-* Simplify the RichText component’s getContent function to remove a call to TinyMCE’s isEmpty function, which incurs a DOM walk to determine emptiness.
-* Optimize the RichText component to avoid needing to keep a focusPosition state.
-* Reenable pointer events on insertion point hover for Firefox.
-* Introduce colors slugs in color palette definitions to ensure localization.
-* Respect inner blocks locking when displaying default block appender.
-* Use color styles on the editor even if the classes were not set.
-* Move “opinionated” Gutenberg block styles to theme.scss.
-* Don’t allow negative values in image dimensions.
-* Fix IE11 formatting toolbar visibility.
-* Fix issues with gallery block in IE11.
-* Fix import statement for InnerBlocks.
-* Fix broken links in documentation.
-* Fix text wrapping issues in Firefox.
-* Fix showing the permalink edit box on the title element.
-* Fix focus logic error in Tips and tidy up docs.
-* Fix instance of keycode package import.
-* Fix case where an explicit string value assigned as an attribute would be wrongly interpreted as false when assigned as a boolean attribute type in the parser.
-* Fix the data module docs by moving them to the root level of the handbook.
-* Fix specificity issue with button group selector.
-* Fix CSS property serialization.
-* Fix left / right alignments of blocks.
-* Fix CSS vendor-prefixed property serialization.
-* Fix arrows navigation in the block more options menu.
-* Let ⌘A’s select all blocks again.
-* Check for forwardedRef in withGlobalEvents.
-* Address issues with left / right align improvements in RTL.
-* Different approach for fixing sibling inserter in Firefox.
-* Correctly handle case where ‘post-thumbnails’ is array of post types.
-* Remove blocks/index.native as the default is compatible with React Native app.
-* Allow editor color palette to be empty.
-* Support setup with single array argument in Color Palette registration.
-* Only save metaboxes when it’s not an autosave.
-* Force the display of hidden meta boxes.
-* Implement core style of including revisions data on Post response.
-* Remove post type ‘viewable’ compatibility shim.
-* Remove unused block-transformations component.
-* Use withSafeTimeout in NUX tips to handle cases where plugins modify the $post global.
-* Update HOCs to use createHigherOrderComponent.
-* Deprecate property source in Block API.
-* Documentation: fix rich-text markdown source.
-* Tweak release docs and improve release build script.
-* Add focusOnMount change to deprecations.
-* Add e2e test for sidebar behaviours on mobile and desktop.
-* Add e2e test for PluginPostStatusInfo.
-* Add snapshot update script.
-* Update import from @wordpress/deprecated.
-* Extract “keycodes” into its own package and rework the Readme file.
-* Add shortcode package instead of global.
-* Add package: @wordpress/babel-plugin-import-jsx-pragma.
-* Update nested templates to new columns format.
-* Generate the manifest dynamically to include the data module docs in the handbook.
-* Expose the grammar parser to the mobile app.
-* Drop the .js extension from @wordpress/element’s package.json entry-point so when used in the mobile RN app the correct module (index.native.js) can be resolved by Metro.
-* Add packages Readme files to the handbook.
-* Add link in documentation to supported browsers.
-* Add initial document on copy guidelines.
-* Add missing documentation for InnerBlocks props.
-* Regenerate package-lock.json to address unintentional changes.
-* Use cross-env for plugin build scripts to address issues on Windows machines.
-* Invert JSX pragma application condition.
-* Ignore non-JS file events in packages.
-* Drop deprecations slated for 3.2 removal.
-* Publish multiple new versions of packages.
+-   Add block styles variations to the Block API.
+-   Add support for Inline Images and Inline Blocks API.
+-   Convert Columns to a set of parent and child blocks, including a wrapper element and more reliable front-end presentation.
+-   Allow registering new block categories.
+-   Add support for locking Inner Block areas.
+-   Add File Block for uploading and listing documents, with drag and drop support.
+-   Introduce Modal component to expand the extensibility suite of UI components.
+-   Redesign block transformation menu.
+-   Improve style display of region focus areas.
+-   Prevent blocks from being draggable if a template lock exists.
+-   Parse superfluous classes as custom classes preventing a block being considered invalid for such cases.
+-   Support “Autoplay” and “Loop” in Audio Block “Playback Controls”.
+-   Always show “new gallery item” below the gallery.
+-   When dragging images to create a gallery, immediately show the images while uploading is happening.
+-   Optimize withSelect to avoid generating merge props on equal props.
+-   Remove the “scroll shadow” at the bottom of the inserter library.
+-   Remove the bottom border on the last collapsible panel.
+-   Remove wrapping div from paragraph block (in the editor) for performance audit.
+-   Add Image Block ‘Link to’ setting.
+-   Allow margins to collapse & refactor block toolbar.
+-   Keep NUX tips open when the user clicks outside.
+-   Add initialTabName prop to Tab Panel component.
+-   Add higher order component to constrain Tab keyboard navigation.
+-   Display server error message on media upload when one exists.
+-   Improve “add block” text in NUX onboarding.
+-   Improve experience of using image resize handles — placing them at the middle of the edges instead of the corners.
+-   Update color of the Shared panel icon to be the same as all other icons.
+-   Verify if block icon background and foreground colors are readable. Warn in the console otherwise.
+-   Address various design details on Plugin API icon treatment in header and popover.
+-   Include all image sizes on the media upload object when they exist.
+-   Move the delete block action to the ellipsis menu for the block. Introduce separator in the menu.
+-   Make the inserter results panel focusable and improve accessibility.
+-   Improve publish panel accessibility and add new publish landmark region.
+-   Open preview to previewLink if not autosaveable.
+-   Make sure autocompleted values make it into the block’s saved content.
+-   Avoid setAttributes on end-of-paragraph seeking to resolve unnecessary performance degradations.
+-   Avoid re-render and subsequent action dispatch by adopting module constant.
+-   Avoid focusing link in new NUX tooltip
+-   Avoid showing hover effect if the ancestor of a block is multi-selected.
+-   Schedule render by store update via setState. Fixes condition where appender would insert two copies of a block.
+-   Inner Blocks refactor:
+-   -   Update deprecated componentWillReceiveProps to equivalent componentDidUpdate.
+-   -   Avoid deep equality check on flat allowedBlocks prop shape.
+-   -   Avoid handling unexpected case where UPDATE_BLOCK_LIST_SETTINGS is not passed an id.
+-   -   Avoid creating new references for blockListSettings when settings not set, but the id never existed in state anyways.
+-   -   Avoid switch fallthrough on case where previous updateIsRequired condition would be false, which could have introduced future maintainability issues if additional case statements were added.
+-   -   Add test to verify state reference is not changed when no update is needed.
+-   -   Consistently name allowedBlocks (previously also referred to as supportedBlocks).
+-   Consider horizontal handled by stopPropagation in RichText. Fixes edge case with inline boundaries at the end of lines. With further improvements.
+-   Ensure ellipsis icon button is visible when block settings menu is open.
+-   Simplify RichText to have a single function for setting content vs. the current updateContent and setContent, by removing updateContent.
+-   Optimize RichText by removing the creation of undo levels at split and merge steps.
+-   Simplify the RichText component’s getContent function to remove a call to TinyMCE’s isEmpty function, which incurs a DOM walk to determine emptiness.
+-   Optimize the RichText component to avoid needing to keep a focusPosition state.
+-   Reenable pointer events on insertion point hover for Firefox.
+-   Introduce colors slugs in color palette definitions to ensure localization.
+-   Respect inner blocks locking when displaying default block appender.
+-   Use color styles on the editor even if the classes were not set.
+-   Move “opinionated” Gutenberg block styles to theme.scss.
+-   Don’t allow negative values in image dimensions.
+-   Fix IE11 formatting toolbar visibility.
+-   Fix issues with gallery block in IE11.
+-   Fix import statement for InnerBlocks.
+-   Fix broken links in documentation.
+-   Fix text wrapping issues in Firefox.
+-   Fix showing the permalink edit box on the title element.
+-   Fix focus logic error in Tips and tidy up docs.
+-   Fix instance of keycode package import.
+-   Fix case where an explicit string value assigned as an attribute would be wrongly interpreted as false when assigned as a boolean attribute type in the parser.
+-   Fix the data module docs by moving them to the root level of the handbook.
+-   Fix specificity issue with button group selector.
+-   Fix CSS property serialization.
+-   Fix left / right alignments of blocks.
+-   Fix CSS vendor-prefixed property serialization.
+-   Fix arrows navigation in the block more options menu.
+-   Let ⌘A’s select all blocks again.
+-   Check for forwardedRef in withGlobalEvents.
+-   Address issues with left / right align improvements in RTL.
+-   Different approach for fixing sibling inserter in Firefox.
+-   Correctly handle case where ‘post-thumbnails’ is array of post types.
+-   Remove blocks/index.native as the default is compatible with React Native app.
+-   Allow editor color palette to be empty.
+-   Support setup with single array argument in Color Palette registration.
+-   Only save metaboxes when it’s not an autosave.
+-   Force the display of hidden meta boxes.
+-   Implement core style of including revisions data on Post response.
+-   Remove post type ‘viewable’ compatibility shim.
+-   Remove unused block-transformations component.
+-   Use withSafeTimeout in NUX tips to handle cases where plugins modify the $post global.
+-   Update HOCs to use createHigherOrderComponent.
+-   Deprecate property source in Block API.
+-   Documentation: fix rich-text markdown source.
+-   Tweak release docs and improve release build script.
+-   Add focusOnMount change to deprecations.
+-   Add e2e test for sidebar behaviours on mobile and desktop.
+-   Add e2e test for PluginPostStatusInfo.
+-   Add snapshot update script.
+-   Update import from @wordpress/deprecated.
+-   Extract “keycodes” into its own package and rework the Readme file.
+-   Add shortcode package instead of global.
+-   Add package: @wordpress/babel-plugin-import-jsx-pragma.
+-   Update nested templates to new columns format.
+-   Generate the manifest dynamically to include the data module docs in the handbook.
+-   Expose the grammar parser to the mobile app.
+-   Drop the .js extension from @wordpress/element’s package.json entry-point so when used in the mobile RN app the correct module (index.native.js) can be resolved by Metro.
+-   Add packages Readme files to the handbook.
+-   Add link in documentation to supported browsers.
+-   Add initial document on copy guidelines.
+-   Add missing documentation for InnerBlocks props.
+-   Regenerate package-lock.json to address unintentional changes.
+-   Use cross-env for plugin build scripts to address issues on Windows machines.
+-   Invert JSX pragma application condition.
+-   Ignore non-JS file events in packages.
+-   Drop deprecations slated for 3.2 removal.
+-   Publish multiple new versions of packages.
 
 = 3.1.1 =
 
-* Fix permalink editor not appearing.
-* Fix sibling block inserter not working in Firefox and Safari.
+-   Fix permalink editor not appearing.
+-   Fix sibling block inserter not working in Firefox and Safari.
 
 = 3.1.0 =
 
-* Implement Tips Interface to guide a user in the new editor interface.
-* New design version of sibling inserter (the ability to insert blocks between other blocks).
-* Allow users to re-enable Tips.
-* Allow the user to preview changes to a published post without first updating the post.
-* Show the preview mode for HTML blocks converted into shared blocks. This streamlines the process of creating straightforward HTML blocks and letting users insert them visually.
-* Exclude the currently focused block from the block completer options. (i.e. don’t show paragraph as an option if already on a paragraph)
-* Trigger autosave as standard save for draft by current user.
-* Add mime type checking to the pre-upload error messaging system when uploading media.
-* Allow block hover outlines to draw color from admin theme.
-* Allow transforming multiple paragraph blocks into a single quote block.
-* Block API: move useOnce block configuration to supports.multiple = false.
-* Add strikethrough support for Markdown conversion when pasting.
-* Add yAxis=middle support to Popover to allow showing arrows vertically centered for NUX tips.
-* Add BlockIconWithColors component and use it for the block header with description in the inspector.
-* Add error notices mechanism directly to media placeholder.
-* Refactor the initialization of the editor to only require a post ID.
-* Optimize the default column width for character length and use the same width for the text editor.
-* Incremental improvements and polish to the mobile block toolbar.
-* Visually compensate nested blocks for block padding.
-* Prevent slash autocompleter from letting users insert two cases of a useOnce block.
-* Let screen readers announce the block aria label.
-* Improve the accessibility of featured images.
-* Make aria-multiline true by default in RichText so the content field is properly announced.
-* Add back role textbox to the List block and improve aria-multiline usage.
-* Replace the renderBlockMenu prop with Slot/Fill.
-* Hide disabled blocks from shortcut inserter.
-* Avoid deprecated React Lifecycle hooks in withAPIData.
-* Improve the element serializer to avoid double ampersand encoding of valid character references.
-* Update drop-cap design to better balance line length.
-* Describe expanded state of “more options” panel.
-* Improve DotTip positioning fix.
-* Implement Button component as assigning ref via forwardRef (new React API).
-* Improve serialising JSON to PHP-compatible query strings.
-* Introduce rendererPathWithAttributes() for ServerSideRender.
-* Refactor the getPostEdits selector to avoid relying on Lodash’s _.get.
-* Refactor withSelect to use getDerivedStateFromProps.
-* Replace JSON-escaped quotation mark with unicode escape sequence in Block API. Fixes PlainText component not properly escaping attributes under some specific user roles.
-* Fix regression in Columns block’s front-end style.
-* Fix regression in SVG support for block icons.
-* Fix PHP 5.2 notice by ensuring $memo is always an array.
-* Fix margins of embed block content.
-* Fix autocomplete behaviour in IE11.
-* Fix regression with formatting toolbar not showing divider between some block controls.
-* Fix issue where pasting an inline shortcode would produce a separate shortcode block.
-* Fix issue when copy pasting images in Chrome.
-* Fix typos in code comments.
-* Fix consistency of hover styles in toolbars.
-* Fix option for linking to attachment page on gallery block.
-* Fix Classic Editor adding paragraphs from block boundaries.
-* Fix post publish panel showing incorrect UX for contributors who don’t have publishing capability.
-* Fix issues with floats and the side UI on wide and full-wide.
-* Fix issue where server side upload errors disappear automatically.
-* Fix block inserter popover in RTL mode.
-* Fix mp3 uploads on chrome.
-* Fix getMimeTypesArray return documentation.
-* Avoid showing error if autosave runs and there are no changes to save.
-* Prevent any disabled button from changing the cursor to pointer.
-* Remove ‘who’=>’authors’ compatibility shim as it’s part of WP 4.9.6.
-* Remove confusing “wrap text” from Button settings.
-* Remove the usage of the componentWillMount lifecycle.
-* Remove the componentWillReceiveProps lifecycle usage.
-* Remove createInnerBlockList utility / context. This should be a simplification of block context, potentially with some performance and/or memory improvements, as an intermediary component is no longer created.
-* Improve translatable strings containing “%s” to have a translator comment.
-* Move trash post URL change to the BrowserUrl component. Consolidates all browser navigation (url changes and actual navigation).
-* Simplify the withColors HOC so we can avoid the usage of memoize while still having a correct implementation without unnecessary rerenders.
-* Refactor Higher-order components in data module to avoid the use of componentWillMount.
-* Use mdash for block description in cover image.
-* Ensure that only the latest promise updates the autocompleter state for more predictable behaviour.
-* Wrap PluginPostStatusInfo with PanelRow rather than Slot. Fix issue with hard to style divs.
-* Update demo content to avoid dirtying embed.
-* Allow using ServerSideRender component without defined attributes.
-* Avoid loading Gutenberg assets in other admin pages.
-* Add a new @wordpress/api-request package. Instead of relying on globals to set the nonce/rootURL, it users configurable middlewares. Preloading support is also built as a middleware.
-* Move the Core Data Module to packages.
-* Move Plugins module to packages.
-* Rename all the hooks moved from blocks to editor.
-* Add NUX e2e tests.
-* Add e2e tests for Plugins API.
-* Add es5 samples to edit-post and plugins.
-* Add e2e test to blocks.BlockEdit filter.
-* Add snapshot test for MoreMenu component.
-* Fix broken links in readme files.
-* Build tooling: add linting for package.json files.
-* Further explanation for why .normalize() is optional in raw-handling.
-* Update icon color readme example.
-* Generate docs for the data module.
-* Enable Strict-Mode of React.
-* Publish new versions of WP packages.
-* Regenerate integrity checks to sha512.
-* Drop deprecations slated for 3.1 removal.
-* Upgrade React 16.3.2 to React 16.4.1.
+-   Implement Tips Interface to guide a user in the new editor interface.
+-   New design version of sibling inserter (the ability to insert blocks between other blocks).
+-   Allow users to re-enable Tips.
+-   Allow the user to preview changes to a published post without first updating the post.
+-   Show the preview mode for HTML blocks converted into shared blocks. This streamlines the process of creating straightforward HTML blocks and letting users insert them visually.
+-   Exclude the currently focused block from the block completer options. (i.e. don’t show paragraph as an option if already on a paragraph)
+-   Trigger autosave as standard save for draft by current user.
+-   Add mime type checking to the pre-upload error messaging system when uploading media.
+-   Allow block hover outlines to draw color from admin theme.
+-   Allow transforming multiple paragraph blocks into a single quote block.
+-   Block API: move useOnce block configuration to supports.multiple = false.
+-   Add strikethrough support for Markdown conversion when pasting.
+-   Add yAxis=middle support to Popover to allow showing arrows vertically centered for NUX tips.
+-   Add BlockIconWithColors component and use it for the block header with description in the inspector.
+-   Add error notices mechanism directly to media placeholder.
+-   Refactor the initialization of the editor to only require a post ID.
+-   Optimize the default column width for character length and use the same width for the text editor.
+-   Incremental improvements and polish to the mobile block toolbar.
+-   Visually compensate nested blocks for block padding.
+-   Prevent slash autocompleter from letting users insert two cases of a useOnce block.
+-   Let screen readers announce the block aria label.
+-   Improve the accessibility of featured images.
+-   Make aria-multiline true by default in RichText so the content field is properly announced.
+-   Add back role textbox to the List block and improve aria-multiline usage.
+-   Replace the renderBlockMenu prop with Slot/Fill.
+-   Hide disabled blocks from shortcut inserter.
+-   Avoid deprecated React Lifecycle hooks in withAPIData.
+-   Improve the element serializer to avoid double ampersand encoding of valid character references.
+-   Update drop-cap design to better balance line length.
+-   Describe expanded state of “more options” panel.
+-   Improve DotTip positioning fix.
+-   Implement Button component as assigning ref via forwardRef (new React API).
+-   Improve serialising JSON to PHP-compatible query strings.
+-   Introduce rendererPathWithAttributes() for ServerSideRender.
+-   Refactor the getPostEdits selector to avoid relying on Lodash’s \_.get.
+-   Refactor withSelect to use getDerivedStateFromProps.
+-   Replace JSON-escaped quotation mark with unicode escape sequence in Block API. Fixes PlainText component not properly escaping attributes under some specific user roles.
+-   Fix regression in Columns block’s front-end style.
+-   Fix regression in SVG support for block icons.
+-   Fix PHP 5.2 notice by ensuring $memo is always an array.
+-   Fix margins of embed block content.
+-   Fix autocomplete behaviour in IE11.
+-   Fix regression with formatting toolbar not showing divider between some block controls.
+-   Fix issue where pasting an inline shortcode would produce a separate shortcode block.
+-   Fix issue when copy pasting images in Chrome.
+-   Fix typos in code comments.
+-   Fix consistency of hover styles in toolbars.
+-   Fix option for linking to attachment page on gallery block.
+-   Fix Classic Editor adding paragraphs from block boundaries.
+-   Fix post publish panel showing incorrect UX for contributors who don’t have publishing capability.
+-   Fix issues with floats and the side UI on wide and full-wide.
+-   Fix issue where server side upload errors disappear automatically.
+-   Fix block inserter popover in RTL mode.
+-   Fix mp3 uploads on chrome.
+-   Fix getMimeTypesArray return documentation.
+-   Avoid showing error if autosave runs and there are no changes to save.
+-   Prevent any disabled button from changing the cursor to pointer.
+-   Remove ‘who’=>’authors’ compatibility shim as it’s part of WP 4.9.6.
+-   Remove confusing “wrap text” from Button settings.
+-   Remove the usage of the componentWillMount lifecycle.
+-   Remove the componentWillReceiveProps lifecycle usage.
+-   Remove createInnerBlockList utility / context. This should be a simplification of block context, potentially with some performance and/or memory improvements, as an intermediary component is no longer created.
+-   Improve translatable strings containing “%s” to have a translator comment.
+-   Move trash post URL change to the BrowserUrl component. Consolidates all browser navigation (url changes and actual navigation).
+-   Simplify the withColors HOC so we can avoid the usage of memoize while still having a correct implementation without unnecessary rerenders.
+-   Refactor Higher-order components in data module to avoid the use of componentWillMount.
+-   Use mdash for block description in cover image.
+-   Ensure that only the latest promise updates the autocompleter state for more predictable behaviour.
+-   Wrap PluginPostStatusInfo with PanelRow rather than Slot. Fix issue with hard to style divs.
+-   Update demo content to avoid dirtying embed.
+-   Allow using ServerSideRender component without defined attributes.
+-   Avoid loading Gutenberg assets in other admin pages.
+-   Add a new @wordpress/api-request package. Instead of relying on globals to set the nonce/rootURL, it users configurable middlewares. Preloading support is also built as a middleware.
+-   Move the Core Data Module to packages.
+-   Move Plugins module to packages.
+-   Rename all the hooks moved from blocks to editor.
+-   Add NUX e2e tests.
+-   Add e2e tests for Plugins API.
+-   Add es5 samples to edit-post and plugins.
+-   Add e2e test to blocks.BlockEdit filter.
+-   Add snapshot test for MoreMenu component.
+-   Fix broken links in readme files.
+-   Build tooling: add linting for package.json files.
+-   Further explanation for why .normalize() is optional in raw-handling.
+-   Update icon color readme example.
+-   Generate docs for the data module.
+-   Enable Strict-Mode of React.
+-   Publish new versions of WP packages.
+-   Regenerate integrity checks to sha512.
+-   Drop deprecations slated for 3.1 removal.
+-   Upgrade React 16.3.2 to React 16.4.1.
 
 = 3.0.1 =
 
-* Fix regression in Columns block's front-end style
-* Fix regression in SVG support for block icons
-* Build tooling: Add linting for package.json files
+-   Fix regression in Columns block's front-end style
+-   Fix regression in SVG support for block icons
+-   Build tooling: Add linting for package.json files
 
 = 3.0.0 =
 
-* Redesign the inserter with collapsible panels.
-* Add support for Child Blocks. These create a relationship between blocks and updates the inserter to show blocks based on context.
-* Implement a new block hover and select approach to improve nested block selection and clarity.
-* Allow expanding selection on consecutive Meta+A presses.
-* Add shared blocks to the blocks autocompleter.
-* Iterate on behaviour of the “between blocks inserter”.
-* Multiple longstanding fixes to the UrlInput box by using Popover component instead of custom positioning.
-* Allow themes to opt-in to the visual styles provided by core blocks.
-* Allow custom colors in block icons.
-* When focused on a parent with InnerBlocks set, show available child blocks clearly at the top. Blocks with children are marked visually in the root inserter.
-* Add publish panels support for plugins.
-* Scroll the inserter menu to the relevant position when opening a panel.
-* Expand matching categories when searching the block library.
-* Introduce a dedicated autosaves endpoint for handling autosave behavior. Improves general handling of revisions through REST API saves.
-* Show autosave notice when autosave exists.
-* Send all fields when transmitting an autosave, fixing missing titles.
-* Allow clicking the block’s input fields.
-* Move “Saved” blocks to the bottom and show distinct icon on the panel name.
-* Improve max-upload size error message.
-* Normalize unicode in raw handling.
-* Allow inserting a link with no text selected.
-* Center the background of the cover image block.
-* Make the Classic block toolbar sticky while scrolling.
-* Make Button component styles independent from Core Styles.
-* Use new "theme" style mechanism to restore Quote styles on the front.
-* Make various greys less dull when used with opacity.
-* Set the correct min-width for the ChromePicker popover.
-* Unify all the media blocks placeholders under a unique component.
-* Address focus style regression in menu and improve display of keyboard shortcut.
-* Refactor popover to clarify computations and address multiple cases of overflow issues.
-* Avoid URL redirect for published post autosave.
-* Refactor URL redirect as BrowserURL component and ensure redirect for new posts.
-* Avoid superfluous changes in RichText.
-* Improve performance for PublishPanel and extensions.
-* Unselect blocks when opening the document settings.
-* Add text alignment options to verse block toolbar.
-* Make sure the Title element uses the same max-width as blocks.
-* Improve title component so it works with and without editor styles.
-* Properly associate the spacer height input label.
-* Further visual polish to new inserter design.
-* Simplify inserter accessibility.
-* Fix block icon alignment in block inspector.
-* Fix issue with excerpt textarea height overflow.
-* Fix typo in withRehydration function call.
-* Fix Post Formats UI not showing.
-* Fix regressions with Button component after PostCSS.
-* Fix issue with applied formats being lost.
-* Fix unset background-color on sidebar headings.
-* Fix case where inbetweenserter would linger if you clicked to insert and then clicked away.
-* Fix issue with rich text toolbar being gone in captions.
-* Fix padding and outline style for expander panel.
-* Fix CodeEditor component not loading when WordPress is installed in a subfolder.
-* Fix regression with sticky toolbar border.
-* Fix some intermittent E2E test failures.
-* Fix “no results” message within inserter.
-* Fix visual issue with normal buttons with icons.
-* Fix issue where the sidebar would remain open on mobile when the page loaded if it was opened before.
-* Fix fileName not being respected when the image is uploaded via drag & drop.
-* Fix regression in spacer block.
-* Fix getInserterItems cache.
-* Fix intermittent adding-blocks E2E test failure.
-* Fix issue with shared block preview being rendered hidden.
-* Fix alignment issue with hover label on wide and full-wide.
-* Fix Windows-unfriendly theme.scss loader rule.
-* Fix issue where pasting would fail in IE11.
-* Fix issue with editing paragraph blocks in shared blocks.
-* Address small code style fixes on the core-data module.
-* Add support for getEntityRecords selectors/resolvers to the core data module to avoid duplication across the different entities.
-* Remove drag handle from block breadcrumb.
-* Improve Child Blocks code footprint.
-* Address package issues with npm audit fix.
-* Use Core’s TinyMCE version to avoid conflicts.
-* Scope the rule adding a white background to the html element.
-* Remove onFocus from core blocks’ RichText usage.
-* Remove post type capabilities from the user object.
-* Remove the dependency on the editor module code from blocks tests.
-* Expose preview_link through the REST API and use within client.
-* Only load Gutenberg Polyfill in editor pages.
-* Refine code statement of image classes.
-* Add support for the default_page_template_title filter in page-attributes meta-box.
-* Add additional condition to “Available templates” meta-box logic.
-* Ensure the wp-editor script is also enqueued soon using the enqueue_block_assets hook.
-* Cleanup shared block tests.
-* Provide cross-browser node containment checking.
-* Add unit tests for core-blocks/more/edit.js components.
-* Add documentation about ServerSideRender.
-* Auto-generate human-readable version of Gutenberg block grammar.
-* Doc Block cleanup for rich-text component.
-* Address multiple typos in code comments.
-* Skip test files when generating build folders for packages.
-* Fail E2E tests when uncaught page error occurs.
-* Extract new blob package out of utils module.
-* Update the wait function name to discourage its use in E2E tests.
-* Introduce new module with deprecation utility.
-* Introduce insertBlock() utility for E2E tests.
-* Move data module to the package maintained by Lerna.
-* Avoid using spread for objects to work with all node 8x versions.
-* Add lint rule to check that memize() is used.
-* Add global guard against ZWSP in E2E content retrieval.
-* Add building/watching support to Gutenberg packages.
-* Add further explanation for why .normalize() is optional.
-* Add new webpack plugin to handle library default export.
-* Reload the page after webpack watch compile.
-* Publish numerous WP packages updates from repository.
-* Drop deprecations slated for 3.0 removal.
-* Always publish main and module distributions in packages.
-* Upgrade mousetrap to 1.6.2.
-* Update all WordPress packages to the latest version.
-* Bump WordPress requirements to 4.9.6.
+-   Redesign the inserter with collapsible panels.
+-   Add support for Child Blocks. These create a relationship between blocks and updates the inserter to show blocks based on context.
+-   Implement a new block hover and select approach to improve nested block selection and clarity.
+-   Allow expanding selection on consecutive Meta+A presses.
+-   Add shared blocks to the blocks autocompleter.
+-   Iterate on behaviour of the “between blocks inserter”.
+-   Multiple longstanding fixes to the UrlInput box by using Popover component instead of custom positioning.
+-   Allow themes to opt-in to the visual styles provided by core blocks.
+-   Allow custom colors in block icons.
+-   When focused on a parent with InnerBlocks set, show available child blocks clearly at the top. Blocks with children are marked visually in the root inserter.
+-   Add publish panels support for plugins.
+-   Scroll the inserter menu to the relevant position when opening a panel.
+-   Expand matching categories when searching the block library.
+-   Introduce a dedicated autosaves endpoint for handling autosave behavior. Improves general handling of revisions through REST API saves.
+-   Show autosave notice when autosave exists.
+-   Send all fields when transmitting an autosave, fixing missing titles.
+-   Allow clicking the block’s input fields.
+-   Move “Saved” blocks to the bottom and show distinct icon on the panel name.
+-   Improve max-upload size error message.
+-   Normalize unicode in raw handling.
+-   Allow inserting a link with no text selected.
+-   Center the background of the cover image block.
+-   Make the Classic block toolbar sticky while scrolling.
+-   Make Button component styles independent from Core Styles.
+-   Use new "theme" style mechanism to restore Quote styles on the front.
+-   Make various greys less dull when used with opacity.
+-   Set the correct min-width for the ChromePicker popover.
+-   Unify all the media blocks placeholders under a unique component.
+-   Address focus style regression in menu and improve display of keyboard shortcut.
+-   Refactor popover to clarify computations and address multiple cases of overflow issues.
+-   Avoid URL redirect for published post autosave.
+-   Refactor URL redirect as BrowserURL component and ensure redirect for new posts.
+-   Avoid superfluous changes in RichText.
+-   Improve performance for PublishPanel and extensions.
+-   Unselect blocks when opening the document settings.
+-   Add text alignment options to verse block toolbar.
+-   Make sure the Title element uses the same max-width as blocks.
+-   Improve title component so it works with and without editor styles.
+-   Properly associate the spacer height input label.
+-   Further visual polish to new inserter design.
+-   Simplify inserter accessibility.
+-   Fix block icon alignment in block inspector.
+-   Fix issue with excerpt textarea height overflow.
+-   Fix typo in withRehydration function call.
+-   Fix Post Formats UI not showing.
+-   Fix regressions with Button component after PostCSS.
+-   Fix issue with applied formats being lost.
+-   Fix unset background-color on sidebar headings.
+-   Fix case where inbetweenserter would linger if you clicked to insert and then clicked away.
+-   Fix issue with rich text toolbar being gone in captions.
+-   Fix padding and outline style for expander panel.
+-   Fix CodeEditor component not loading when WordPress is installed in a subfolder.
+-   Fix regression with sticky toolbar border.
+-   Fix some intermittent E2E test failures.
+-   Fix “no results” message within inserter.
+-   Fix visual issue with normal buttons with icons.
+-   Fix issue where the sidebar would remain open on mobile when the page loaded if it was opened before.
+-   Fix fileName not being respected when the image is uploaded via drag & drop.
+-   Fix regression in spacer block.
+-   Fix getInserterItems cache.
+-   Fix intermittent adding-blocks E2E test failure.
+-   Fix issue with shared block preview being rendered hidden.
+-   Fix alignment issue with hover label on wide and full-wide.
+-   Fix Windows-unfriendly theme.scss loader rule.
+-   Fix issue where pasting would fail in IE11.
+-   Fix issue with editing paragraph blocks in shared blocks.
+-   Address small code style fixes on the core-data module.
+-   Add support for getEntityRecords selectors/resolvers to the core data module to avoid duplication across the different entities.
+-   Remove drag handle from block breadcrumb.
+-   Improve Child Blocks code footprint.
+-   Address package issues with npm audit fix.
+-   Use Core’s TinyMCE version to avoid conflicts.
+-   Scope the rule adding a white background to the html element.
+-   Remove onFocus from core blocks’ RichText usage.
+-   Remove post type capabilities from the user object.
+-   Remove the dependency on the editor module code from blocks tests.
+-   Expose preview_link through the REST API and use within client.
+-   Only load Gutenberg Polyfill in editor pages.
+-   Refine code statement of image classes.
+-   Add support for the default_page_template_title filter in page-attributes meta-box.
+-   Add additional condition to “Available templates” meta-box logic.
+-   Ensure the wp-editor script is also enqueued soon using the enqueue_block_assets hook.
+-   Cleanup shared block tests.
+-   Provide cross-browser node containment checking.
+-   Add unit tests for core-blocks/more/edit.js components.
+-   Add documentation about ServerSideRender.
+-   Auto-generate human-readable version of Gutenberg block grammar.
+-   Doc Block cleanup for rich-text component.
+-   Address multiple typos in code comments.
+-   Skip test files when generating build folders for packages.
+-   Fail E2E tests when uncaught page error occurs.
+-   Extract new blob package out of utils module.
+-   Update the wait function name to discourage its use in E2E tests.
+-   Introduce new module with deprecation utility.
+-   Introduce insertBlock() utility for E2E tests.
+-   Move data module to the package maintained by Lerna.
+-   Avoid using spread for objects to work with all node 8x versions.
+-   Add lint rule to check that memize() is used.
+-   Add global guard against ZWSP in E2E content retrieval.
+-   Add building/watching support to Gutenberg packages.
+-   Add further explanation for why .normalize() is optional.
+-   Add new webpack plugin to handle library default export.
+-   Reload the page after webpack watch compile.
+-   Publish numerous WP packages updates from repository.
+-   Drop deprecations slated for 3.0 removal.
+-   Always publish main and module distributions in packages.
+-   Upgrade mousetrap to 1.6.2.
+-   Update all WordPress packages to the latest version.
+-   Bump WordPress requirements to 4.9.6.
 
 = 2.9.2 =
 
-* Ensure the Title uses the same max-width as blocks
-* Center the background of the cover image block
-* Fix formatting controls regression
-* Fix classic editor visual mode regression
+-   Ensure the Title uses the same max-width as blocks
+-   Center the background of the cover image block
+-   Fix formatting controls regression
+-   Fix classic editor visual mode regression
 
 = 2.9.1 =
 
-* Ensure the wp-editor script is also enqueued soon using the `enqueue_block_assets` hook
-* Allow clicking the block's input fields (regression fix)
-* Remove post type capabilities from the user object
+-   Ensure the wp-editor script is also enqueued soon using the `enqueue_block_assets` hook
+-   Allow clicking the block's input fields (regression fix)
+-   Remove post type capabilities from the user object
 
 = 2.9.0 =
 
-* Add support for pinning plugin items in the main editor header. This is an important part of the editor Plugin API seeking to both grant plugins high visibility while offering users a consistent and flexible UI that can scale better.
-* Add shortcut tooltips for main toolbar.
-* Add remaining RichText shortcuts for formatting toolbar. Display them in tooltips.
-* Display the block toolbar and controls below the block on mobile.
-* Add automatic handling of focus for RichText component.
-* New reusable component: FontSizePicker. Example use in paragraph block.
-* Query for all authors with an unbounded per_page=-1 request. Makes sure no users appear missing.
-* Make the editor canvas friendly towards colored backgrounds. Improves support of nested structures over backgrounds as well.
-* Remove block alignment from paragraph block with deprecation handling.
-* Ensure contributors can create tags and manage categories.
-* Exclude private blocks from the slash autocompleter.
-* Close the post publish panel only when the post becomes dirty.
-* Add toggle to set fixed widths in Table block.
-* Surface and style the resizing tool in Table block.
-* Iterate on table block front-end styles.
-* Transform into the correct embed block based on URL patterns.
-* Allow resetting the permalink by saving it as empty.
-* Add text alignment options to Subhead block.
-* Move Heading block alignment options from the inspector to the toolbar.
-* Writing Flow: consider tabbable edge if no adjacent tabbable.
-* Implement Button as assigning ref via forwardRef.
-* Avoid adding terms when tabbing away from the tag selector field.
-* Add a max-height to Table of Contents menu.
-* Make any iframe embed responsive in the editor.
-* Update PostExcerpt component to use TextareaControl.
-* Show block remove button on empty paragraph blocks.
-* Introduce wp:action-publish and update corresponding UI to reference it. Use wp:action-publish to determine whether to display publish UI.
-* Use wp:action-assign-author to indicate if user can assign authors. Fixes issues with author selector not appearing under certain circumstances.
-* Permit unbounded per_page=-1 requests for Pages and Shared Blocks. Removes limit on how many items are retrieved.
-* Permit unbounded per_page=-1 requests for Categories and Tags.
-* Improve written descriptions of core blocks.
-* Show caption and description settings in featured image modal.
-* Make sidebar toggle button open the block inspector if a block is selected.
-* Avoid setting font-style when using dropcap.
-* Preserve image ID in raw handling.
-* Add a data store to manage the block/categories registration.
-* Avoid change in RichText when possible. It prevents unnecessary history records.
-* Stop unnecessary re-renders caused by withColors. Also solve memoize problems.
-* Move components from the blocks to the editor module.
-* Move editorMediaUpload to the editor module.
-* Move the editor settings into the editor’s store.
-* Change subhead block to subheading.
-* Add cache to getUserQueryResults and avoid authors rerender on every key press.
-* Rename isPrivate → supports.inserter in Block API.
-* Fix multi selection with arrows + shift.
-* Fix caretRangeFromPoint for Firefox.
-* Fix a PHP Notice in REST API responses.
-* Fix broken example in withAPIData README.
-* Fix issue with UrlInput autofocus when used in a custom block.
-* Fix issue with high contrast indicator in Edge.
-* Fix and update block fixture regeneration.
-* Fix gallery width to match width of other elements.
-* Fix Fragment render error on empty children.
-* Fix ServerSideRender bug with Columns block.
-* Fix block icon alignment.
-* Fix absent editor styles in Classic block.
-* Fix state variable name in core-data.
-* Fix generating admin schemes styles.
-* Fix captions on resized images.
-* Fix case where link modal would hide on rerender.
-* Fix paste with selection/caret at start or end.
-* Fix appender height to match paragraph block.
-* Use core-blocks prefix for class names.
-* Prevent classname override when passing className as argument.
-* Remove document outline from the sidebar.
-* Framework work to support React Native mobile app explorations:
-* Refactor the Code block .
-* Refactor “More” block.
-* Extract edit to their own file (part 1, part 2).
-* Use targetSchema of JSON Hyper Schema to communicate sticky action.
-* Tweak targetSchema Response for sticky posts.
-* Load additional REST API files if controller is defined.
-* Restore the wp-blocks stylesheet for backwards compatibility concerns.
-* Add documentation for title and modalClass props in MediaUpload.
-* Copy edits to theme extensibility.
-* Add a lint rule for enforcing ellipsis use.
-* Use a postcss plugin to generate the admin-schemes styles.
-* Move date module to packages maintained by Lerna. Move element to packages maintained by Lerna.
-* Extract dom package and make it maintained with Lerna.
-* Move blocks raw handling tests to test/integration folder.
-* Remove skipped tests which fail, enable those that pass.
-* Add missing unit test for received entity records.
-* Update Notice README.
-* Update wordcount package to prevent crash.
-* Update dom-react to 2.2.1.
-* Update React to 16.3.2.
-* Update packages to pass npm audit.
-* Upgrade rememo dependency to 3.0.0.
-* Updates the minimum required version of npm to version 6.0.0 or greater.
-* Update testing-overview document.
-* Update package-lock.json for fsevents.
-* Avoid tail-ing the PHP 5.2/3 build logs.
-* Remove Docker compose deprecated parallel option.
-* Remove fsevents from optionalDependencies.
-* Remove %s from Lerna publish message.
-* Deprecate isExtraSmall utility function.
-* Add npm update to build script.
-* Make lerna a dependency rather than a devDependency.
-* Support adding a human-readable deprecation hint.
-* Drop features slated for 2.9 removal.
-* Introduce the common build folder to be used by all modules.
+-   Add support for pinning plugin items in the main editor header. This is an important part of the editor Plugin API seeking to both grant plugins high visibility while offering users a consistent and flexible UI that can scale better.
+-   Add shortcut tooltips for main toolbar.
+-   Add remaining RichText shortcuts for formatting toolbar. Display them in tooltips.
+-   Display the block toolbar and controls below the block on mobile.
+-   Add automatic handling of focus for RichText component.
+-   New reusable component: FontSizePicker. Example use in paragraph block.
+-   Query for all authors with an unbounded per_page=-1 request. Makes sure no users appear missing.
+-   Make the editor canvas friendly towards colored backgrounds. Improves support of nested structures over backgrounds as well.
+-   Remove block alignment from paragraph block with deprecation handling.
+-   Ensure contributors can create tags and manage categories.
+-   Exclude private blocks from the slash autocompleter.
+-   Close the post publish panel only when the post becomes dirty.
+-   Add toggle to set fixed widths in Table block.
+-   Surface and style the resizing tool in Table block.
+-   Iterate on table block front-end styles.
+-   Transform into the correct embed block based on URL patterns.
+-   Allow resetting the permalink by saving it as empty.
+-   Add text alignment options to Subhead block.
+-   Move Heading block alignment options from the inspector to the toolbar.
+-   Writing Flow: consider tabbable edge if no adjacent tabbable.
+-   Implement Button as assigning ref via forwardRef.
+-   Avoid adding terms when tabbing away from the tag selector field.
+-   Add a max-height to Table of Contents menu.
+-   Make any iframe embed responsive in the editor.
+-   Update PostExcerpt component to use TextareaControl.
+-   Show block remove button on empty paragraph blocks.
+-   Introduce wp:action-publish and update corresponding UI to reference it. Use wp:action-publish to determine whether to display publish UI.
+-   Use wp:action-assign-author to indicate if user can assign authors. Fixes issues with author selector not appearing under certain circumstances.
+-   Permit unbounded per_page=-1 requests for Pages and Shared Blocks. Removes limit on how many items are retrieved.
+-   Permit unbounded per_page=-1 requests for Categories and Tags.
+-   Improve written descriptions of core blocks.
+-   Show caption and description settings in featured image modal.
+-   Make sidebar toggle button open the block inspector if a block is selected.
+-   Avoid setting font-style when using dropcap.
+-   Preserve image ID in raw handling.
+-   Add a data store to manage the block/categories registration.
+-   Avoid change in RichText when possible. It prevents unnecessary history records.
+-   Stop unnecessary re-renders caused by withColors. Also solve memoize problems.
+-   Move components from the blocks to the editor module.
+-   Move editorMediaUpload to the editor module.
+-   Move the editor settings into the editor’s store.
+-   Change subhead block to subheading.
+-   Add cache to getUserQueryResults and avoid authors rerender on every key press.
+-   Rename isPrivate → supports.inserter in Block API.
+-   Fix multi selection with arrows + shift.
+-   Fix caretRangeFromPoint for Firefox.
+-   Fix a PHP Notice in REST API responses.
+-   Fix broken example in withAPIData README.
+-   Fix issue with UrlInput autofocus when used in a custom block.
+-   Fix issue with high contrast indicator in Edge.
+-   Fix and update block fixture regeneration.
+-   Fix gallery width to match width of other elements.
+-   Fix Fragment render error on empty children.
+-   Fix ServerSideRender bug with Columns block.
+-   Fix block icon alignment.
+-   Fix absent editor styles in Classic block.
+-   Fix state variable name in core-data.
+-   Fix generating admin schemes styles.
+-   Fix captions on resized images.
+-   Fix case where link modal would hide on rerender.
+-   Fix paste with selection/caret at start or end.
+-   Fix appender height to match paragraph block.
+-   Use core-blocks prefix for class names.
+-   Prevent classname override when passing className as argument.
+-   Remove document outline from the sidebar.
+-   Framework work to support React Native mobile app explorations:
+-   Refactor the Code block .
+-   Refactor “More” block.
+-   Extract edit to their own file (part 1, part 2).
+-   Use targetSchema of JSON Hyper Schema to communicate sticky action.
+-   Tweak targetSchema Response for sticky posts.
+-   Load additional REST API files if controller is defined.
+-   Restore the wp-blocks stylesheet for backwards compatibility concerns.
+-   Add documentation for title and modalClass props in MediaUpload.
+-   Copy edits to theme extensibility.
+-   Add a lint rule for enforcing ellipsis use.
+-   Use a postcss plugin to generate the admin-schemes styles.
+-   Move date module to packages maintained by Lerna. Move element to packages maintained by Lerna.
+-   Extract dom package and make it maintained with Lerna.
+-   Move blocks raw handling tests to test/integration folder.
+-   Remove skipped tests which fail, enable those that pass.
+-   Add missing unit test for received entity records.
+-   Update Notice README.
+-   Update wordcount package to prevent crash.
+-   Update dom-react to 2.2.1.
+-   Update React to 16.3.2.
+-   Update packages to pass npm audit.
+-   Upgrade rememo dependency to 3.0.0.
+-   Updates the minimum required version of npm to version 6.0.0 or greater.
+-   Update testing-overview document.
+-   Update package-lock.json for fsevents.
+-   Avoid tail-ing the PHP 5.2/3 build logs.
+-   Remove Docker compose deprecated parallel option.
+-   Remove fsevents from optionalDependencies.
+-   Remove %s from Lerna publish message.
+-   Deprecate isExtraSmall utility function.
+-   Add npm update to build script.
+-   Make lerna a dependency rather than a devDependency.
+-   Support adding a human-readable deprecation hint.
+-   Drop features slated for 2.9 removal.
+-   Introduce the common build folder to be used by all modules.
 
 = 2.8.0 =
 
-* Add a pasting schema in raw content handling. It simplifies allowed tags and reduces the amount of filters run. Should improve reliability, clarity, markdown conversion, and usage in blocks.
-* Add “Spacer” block to create empty areas.
-* Add Server Side Render component.
-* Expand public InnerBlocks API with support for template configuration and allowedBlocks logic.
-* ColorPalette improvements:
-	* Implement mechanism to use classes for configured colors instead of inline styles. Use it in Button block as well.
-	* Use color name in ColorPalette aria-label for making color selection more accessible.
-	* Improve accessibility of PanelColor by announcing currently set color by name.
-	* Hide color pickers in paragraph and button if no colors are available.
-* Add a format prop to allow HTML string values to be used in RichText component. This should be a useful API addition for plugin developers.
-* Improve the make gallery modal and allow it to use the correct mode when editing.
-* Improve performance by avoiding creating a new uids prop on each block rerender.
-* Make sure createInnerBlockList never updates when passed using context.
-* Introduce initial “entities” data model abstraction to automatically build state selectors.
-* Hide the movers and the block menu when typing.
-* Optimize the shouldComponentUpdate path of withSelect.
-* Use support: align API in Columns block, fixes issue with alignment.
-* Filter the PostFormat list to those supported by the theme.
-* Used fallback styles to compute font size slider initial position.
-* Indent serialized block output with tabs as part of Block API.
-* Add a RichText.Content component to be used in conjunction with RichText.
-* Determine emptiness by value in RichText.
-* Call resolver isFulfilled once per argument set in data modules.
-* Extend BlockEdit context with name and use it for autocompleters.
-* Improve order of block shortcuts within inline inserter.
-* Improve terms token feedback and accessibility.
-* Introduce theme_supports with formats to REST API index.
-* Switch post-author component to use /wp/v2/users/?who=authors. Related #42202.
-* Further harden who=authors check by author support for post type.
-* Disable link suggestions when value is URL.
-* Make CodeEditor component more extensible.
-* Allow the new “block remove” button appear on focus.
-* Add new “pure” higher order component to wp/element.
-* Add Embed Preview support for classic embed providers. This handled legacy embeds.
-* Add missing label and focus style to the code editor textarea.
-* Introduce editorMediaUpload wrapper and fix issue with images not being attached to a post.
-* Used editorMediaUpload in Gallery files transform (images drag&drop).
-* Make URL creation mechanism smarter around relative links.
-* Add a type attribute to input elements.
-* Add missing custom class in latest posts & categories block.
-* Add visible label to shared block name input.
-* Add ref="noreferrer noopener" for target="_blank" links.
-* Add drop cap help text in paragraph block.
-* Remove the text alignment from the block inspector in Cover Image.
-* Make sure aria-disabled buttons (movers) stay disabled on focus.
-* Simplify the BlockBreadcrumb component and its semantics.
-* Only display featured image UI when theme supports it.
-* Improve display of URL input.
-* Improve consistency in how + icon is shown on the inserters.
-* Extract block library to separate module.
-* Improve handling of admin theme colors.
-* Avoid calculating the closest positioned parent by binding the RichText wrapper div.
-* Use IconButton on breadcrumbs to increase consistency and accessibility.
-* Reset change detection on post update, resolving an issue where changes made while a post is saving are not accurately reflected in change detection.
-* Hide inspector controls if no image is selected in Cover Image.
-* Minor improvements for the permalink “Copy to clipboard” button.
-* Fix scrolling issues with very long and multi-line captions.
-* Fix problem with front-end output of LatestsPosts block.
-* Fix issue with using zero min value in RangeControl.
-* Fix Markdown paste containing HTML.
-* Fix permalink linking to preview URL instead of live.
-* Fix issue with update button becoming invisible on mobile on already published posts.
-* Fix showing/hiding the right block side UI on RTL languages.
-* Fix Classic block regression after extraction of the blocks into a separate script.
-* Fix issue where when creating a new post would default to the block sidebar if it was opened before.
-* Fix issue when pasting content with inline shortcodes would produce a separate block.
-* Fix BlockEdit hooks not working properly with context.
-* Fix regression with select box.
-* Fix translation strings in embed block.
-* Fix regression with formatting button hover/focus style.
-* Fix arrow navigation in the shared block more options menu.
-* Fix orderby typo in latest posts block.
-* Fix the clipboard button as IconButton usage.
-* Restore hiding drop cap on focus to prevent bugs with contenteditable.
-* Restore priority on embed block for raw transforming.
-* Remove no longer mandatory use of isSelected in block edit.
-* Remove permalink_structure from REST API index as per #42465.
-* Remove old solution for focus after deprecation period.
-* Refactor withColors HOC to allow configuring the mapping when instantiating the component.
-* Refactor PanelColor to avoid the need for the colorName prop.
-* Use a “users” reducer combined with a “queries” sub state to map authors to users.
-* Make sure block assets are always registered before wp-edit-post script.
-* Expose Gutenberg Data Format version in the REST API response.
-* Split loading of API actions and filters to its own file.
-* Switch to rest_get_server() for compatibility with trunk.
-* Pre-load REST API index data to avoid flash of missing data.
-* Deprecate event proxying in RichText.
-* Avoid duplicate save request in shared block which could cause race conditions.
-* Update docs folder structure and make all internal handbook links relative.
-* Update theme extensibility documentation to include editor widths.
-* Add section about translating the plugin to the contributing doc.
-* Improve documentation and clarity of the Toolbar component.
-* Add documentation for undefined attribute source.
-* Add isDebounced prop in autocompleter doc.
-* Add arrow-spacing rule to eslint config.
-* Add arrow-parens rule to eslint config.
-* Enforce array as Lodash path argument.
-* Upgrade react-datepicker to 1.4.1.
-* Upgrade showdown to 1.8.6.
-* Drop deprecations slated for 2.8 removal.
-* Use the @wordpress/word-count package.
-* Use @wordpress/is-shallow-equal for shallow equality.
-* Build Tools: Fix the package plugin script.
-* Improve the G in Gutenberg ASCII
+-   Add a pasting schema in raw content handling. It simplifies allowed tags and reduces the amount of filters run. Should improve reliability, clarity, markdown conversion, and usage in blocks.
+-   Add “Spacer” block to create empty areas.
+-   Add Server Side Render component.
+-   Expand public InnerBlocks API with support for template configuration and allowedBlocks logic.
+-   ColorPalette improvements:
+    -   Implement mechanism to use classes for configured colors instead of inline styles. Use it in Button block as well.
+    -   Use color name in ColorPalette aria-label for making color selection more accessible.
+    -   Improve accessibility of PanelColor by announcing currently set color by name.
+    -   Hide color pickers in paragraph and button if no colors are available.
+-   Add a format prop to allow HTML string values to be used in RichText component. This should be a useful API addition for plugin developers.
+-   Improve the make gallery modal and allow it to use the correct mode when editing.
+-   Improve performance by avoiding creating a new uids prop on each block rerender.
+-   Make sure createInnerBlockList never updates when passed using context.
+-   Introduce initial “entities” data model abstraction to automatically build state selectors.
+-   Hide the movers and the block menu when typing.
+-   Optimize the shouldComponentUpdate path of withSelect.
+-   Use support: align API in Columns block, fixes issue with alignment.
+-   Filter the PostFormat list to those supported by the theme.
+-   Used fallback styles to compute font size slider initial position.
+-   Indent serialized block output with tabs as part of Block API.
+-   Add a RichText.Content component to be used in conjunction with RichText.
+-   Determine emptiness by value in RichText.
+-   Call resolver isFulfilled once per argument set in data modules.
+-   Extend BlockEdit context with name and use it for autocompleters.
+-   Improve order of block shortcuts within inline inserter.
+-   Improve terms token feedback and accessibility.
+-   Introduce theme_supports with formats to REST API index.
+-   Switch post-author component to use /wp/v2/users/?who=authors. Related #42202.
+-   Further harden who=authors check by author support for post type.
+-   Disable link suggestions when value is URL.
+-   Make CodeEditor component more extensible.
+-   Allow the new “block remove” button appear on focus.
+-   Add new “pure” higher order component to wp/element.
+-   Add Embed Preview support for classic embed providers. This handled legacy embeds.
+-   Add missing label and focus style to the code editor textarea.
+-   Introduce editorMediaUpload wrapper and fix issue with images not being attached to a post.
+-   Used editorMediaUpload in Gallery files transform (images drag&drop).
+-   Make URL creation mechanism smarter around relative links.
+-   Add a type attribute to input elements.
+-   Add missing custom class in latest posts & categories block.
+-   Add visible label to shared block name input.
+-   Add ref="noreferrer noopener" for target="\_blank" links.
+-   Add drop cap help text in paragraph block.
+-   Remove the text alignment from the block inspector in Cover Image.
+-   Make sure aria-disabled buttons (movers) stay disabled on focus.
+-   Simplify the BlockBreadcrumb component and its semantics.
+-   Only display featured image UI when theme supports it.
+-   Improve display of URL input.
+-   Improve consistency in how + icon is shown on the inserters.
+-   Extract block library to separate module.
+-   Improve handling of admin theme colors.
+-   Avoid calculating the closest positioned parent by binding the RichText wrapper div.
+-   Use IconButton on breadcrumbs to increase consistency and accessibility.
+-   Reset change detection on post update, resolving an issue where changes made while a post is saving are not accurately reflected in change detection.
+-   Hide inspector controls if no image is selected in Cover Image.
+-   Minor improvements for the permalink “Copy to clipboard” button.
+-   Fix scrolling issues with very long and multi-line captions.
+-   Fix problem with front-end output of LatestsPosts block.
+-   Fix issue with using zero min value in RangeControl.
+-   Fix Markdown paste containing HTML.
+-   Fix permalink linking to preview URL instead of live.
+-   Fix issue with update button becoming invisible on mobile on already published posts.
+-   Fix showing/hiding the right block side UI on RTL languages.
+-   Fix Classic block regression after extraction of the blocks into a separate script.
+-   Fix issue where when creating a new post would default to the block sidebar if it was opened before.
+-   Fix issue when pasting content with inline shortcodes would produce a separate block.
+-   Fix BlockEdit hooks not working properly with context.
+-   Fix regression with select box.
+-   Fix translation strings in embed block.
+-   Fix regression with formatting button hover/focus style.
+-   Fix arrow navigation in the shared block more options menu.
+-   Fix orderby typo in latest posts block.
+-   Fix the clipboard button as IconButton usage.
+-   Restore hiding drop cap on focus to prevent bugs with contenteditable.
+-   Restore priority on embed block for raw transforming.
+-   Remove no longer mandatory use of isSelected in block edit.
+-   Remove permalink_structure from REST API index as per #42465.
+-   Remove old solution for focus after deprecation period.
+-   Refactor withColors HOC to allow configuring the mapping when instantiating the component.
+-   Refactor PanelColor to avoid the need for the colorName prop.
+-   Use a “users” reducer combined with a “queries” sub state to map authors to users.
+-   Make sure block assets are always registered before wp-edit-post script.
+-   Expose Gutenberg Data Format version in the REST API response.
+-   Split loading of API actions and filters to its own file.
+-   Switch to rest_get_server() for compatibility with trunk.
+-   Pre-load REST API index data to avoid flash of missing data.
+-   Deprecate event proxying in RichText.
+-   Avoid duplicate save request in shared block which could cause race conditions.
+-   Update docs folder structure and make all internal handbook links relative.
+-   Update theme extensibility documentation to include editor widths.
+-   Add section about translating the plugin to the contributing doc.
+-   Improve documentation and clarity of the Toolbar component.
+-   Add documentation for undefined attribute source.
+-   Add isDebounced prop in autocompleter doc.
+-   Add arrow-spacing rule to eslint config.
+-   Add arrow-parens rule to eslint config.
+-   Enforce array as Lodash path argument.
+-   Upgrade react-datepicker to 1.4.1.
+-   Upgrade showdown to 1.8.6.
+-   Drop deprecations slated for 2.8 removal.
+-   Use the @wordpress/word-count package.
+-   Use @wordpress/is-shallow-equal for shallow equality.
+-   Build Tools: Fix the package plugin script.
+-   Improve the G in Gutenberg ASCII
 
 = 2.7.0 =
 
-* Add pagination block (handles page breaks core functionality).
-* Add left/right block hover areas for displaying contextual block tools. This aims to reduce the visual UI and make it more aware of intention when hovering around blocks.
-* Improve emulated caret positioning in writing flow, which places caret at the right position when clicking below the editor.
-* Several updates to link insertion interface:
-  * Restore the "Open in new window" setting.
-  * Remove the Unlink button. Instead, links can be removed by toggling off the Link button in the formatting toolbar.
-  * Move link settings to the left.
-  * Update suggested links dropdown design.
-  * Allow UI to expand to fit long URLs when not in editing mode.
-  * Improve visibility of insertion UI when selecting a link
-* Rework Classic block visual display to show old style toolbar. This aims to help clarify when you have content being displayed through a Classic block.
-* Add ability to edit post permalinks from the post title area.
-* Improve display of image placeholder buttons to accommodate i18n and smaller screens.
-* Add nesting support to document outline feature.
-* Refactor and expose PluginSidebar as final API.
-* Refactor and expose SidebarMoreMenuItem as part of Plugins API.
-* Simplify block development by leveraging context API to let block controls render on their own when a block is selected.
-* Add ability to manage innerBlocks while migrating deprecated blocks.
-* Add a "Skip link" to jump back from the inspector to the selected block.
-* Add preloading support to wp.apiRequest.
-* Add isFulfilled API for advanced resolver use cases in data module.
-* Add support for custom icon in Placeholder component.
-* Disable Drag & Drop into empty placeholders.
-* Refine the UI of the sides of a block.
-* Assure the "saved" message is shown for at least a second when meta-boxes are present.
-* Make sure block controls don't show over the sidebar on small viewport.
-* Add ability to manually set image dimensions.
-* Make Popover initial focus work with screen readers.
-* Improve Disabled component (disabled attribute, tabindex removal, pointer-events).
-* Improve visual display of captions within galleries.
-* Remove default font weight from Pullquote block.
-* Keep "advanced" block settings panel closed by default.
-* Use fallback styles to compute font size slider initial value.
-* Allow filtering of allowed_block_types based on post object.
-* Allow really long captions to scroll in galleries.
-* Redesign toggle switch UI component to add clarity.
-* Improve handling of empty containers in DOM utilities.
-* Filter out private taxonomies from sidebar UI.
-* Make input styles consistent.
-* Update inline "code" background color when part of multi-selection.
-* Replace TextControl with TextareaControl for image alt attribute.
-* Allow mod+shift+alt+m (toggle between Visual and Code modes) keyboard shortcut to work regardless of focus area and context.
-* Allow ctrl+backtick and ctrl+shift+backtick (navigate across regions) keyboard shortcuts to work regardless of focus area and context.
-* Improve Classic block accessibility by supporting keyboard (alt+f10 and arrows) navigation.
-* Apply wrapper div for RawHTML with non-children props.
-* Improve and clarify allowedBlockTypes in inserter.
-* Improve handling of block hover areas.
-* Improve figure widths and floats in imagery blocks, improving theming experience.
-* Eliminate obsolete call to onChange when RichText componentWillUnmount.
-* Unify styling of Read More and Pagination blocks.
-* Replace instances of smaller font with default font size.
-* Fix styling issue with nested blocks ghost.
-* Fix CSS bug that made it impossible to close the sidebar on mobile with meta-boxes present.
-* Fix disappearing input when adding link to image.
-* Fix issue with publish button text occasionally showing HTML entity.
-* Fix issue with side UI not showing as expected on selected blocks.
-* Fix sticky post saving when using meta-boxes.
-* Fix nested blocks' contextual toolbar not being fixed to top when requested.
-* Fix centered image caption toolbar on IE11.
-* Fix issue with meta-box saving case by only attempt apiRequest preload if path is set. Also improve tests for meta-boxes.
-* Fix JS error when wp.apiRequest has no preload data.
-* Fix regression with image link UI, and another.
-* Fix regression with columns appender.
-* Avoid focus losses in Shared block form.
-* Fix ability to select Embed blocks via clicking.
-* Fix handling of long strings in permalink container.
-* Fix resizing behavior of Image block upon browser resize.
-* Show Image block with external image URL and support resizing.
-* Fix hiding of update/publish confirmation notices under WP-Admin sidebar.
-* Fix ID and key generation in SelectControl and RadioControl components.
-* Fix z-index of link UI.
-* Fix default width of embeds in the editor.
-* Revert unintended changes in default font size handling on Paragraph.
-* Disable the Preview button when post type isn't viewable.
-* Remove unused variable.
-* Rename "advanced settings" in block menu to "block settings". Update labels and docs accordingly.
-* Improve description of embed blocks.
-* Default to empty object for previous defined wp-utils.
-* Finalize renaming of reusable blocks to shared blocks.
-* Update 20 components from the editor module to use wp.data's withSelect and withDispatch instead of react-redux's connect.
-* Update another batch of components from the editor module to use wp.data's tools.
-* Replace remaining uses of react-redux in the editor module.
-* Update a batch of core blocks to drop explicit management of isSelected thanks to new context API.
-* Attempt to avoid triggering modsec rules.
-* Use wp-components script handle to pass locale data to wp.i18n.
-* Reference lodash as an external module. This also reduces bundle size.
-* Use border-box on input and textarea within meta-boxes to restore radio buttons to normal appearance.
-* Clarify demo instructions on wide image support.
-* Update docs to address broken sketch file links.
-* Reduce and rename rules in Gutenberg block grammar for clarity.
-* Add test confirming that withFilters does not rerender.
-* Allow E2E tests to work in a larger variety of environments.
-* Add mention of JSON workaround to including structured data in attributes.
-* Document use of GitHub projects in Repository Management.
-* Fix some documentation links.
-* Add accessibility standards checkbox and reference to the project's pull request template.
-* Remove emoji script as it causes different issues. Pending resolution on how to introduce it back.
-* Avoid needing navigation timeout in Puppeteer.
-* Disable login screen autofocus in Puppeteer tests.
-* Allow developers to opt out from some devtool settings to speed up incremental builds.
-* Use the WordPress i18n package and remove the built-in implementation. Update to 1.1.0.
-* Remove deprecated function `getWrapperDisplayName`.
+-   Add pagination block (handles page breaks core functionality).
+-   Add left/right block hover areas for displaying contextual block tools. This aims to reduce the visual UI and make it more aware of intention when hovering around blocks.
+-   Improve emulated caret positioning in writing flow, which places caret at the right position when clicking below the editor.
+-   Several updates to link insertion interface:
+    -   Restore the "Open in new window" setting.
+    -   Remove the Unlink button. Instead, links can be removed by toggling off the Link button in the formatting toolbar.
+    -   Move link settings to the left.
+    -   Update suggested links dropdown design.
+    -   Allow UI to expand to fit long URLs when not in editing mode.
+    -   Improve visibility of insertion UI when selecting a link
+-   Rework Classic block visual display to show old style toolbar. This aims to help clarify when you have content being displayed through a Classic block.
+-   Add ability to edit post permalinks from the post title area.
+-   Improve display of image placeholder buttons to accommodate i18n and smaller screens.
+-   Add nesting support to document outline feature.
+-   Refactor and expose PluginSidebar as final API.
+-   Refactor and expose SidebarMoreMenuItem as part of Plugins API.
+-   Simplify block development by leveraging context API to let block controls render on their own when a block is selected.
+-   Add ability to manage innerBlocks while migrating deprecated blocks.
+-   Add a "Skip link" to jump back from the inspector to the selected block.
+-   Add preloading support to wp.apiRequest.
+-   Add isFulfilled API for advanced resolver use cases in data module.
+-   Add support for custom icon in Placeholder component.
+-   Disable Drag & Drop into empty placeholders.
+-   Refine the UI of the sides of a block.
+-   Assure the "saved" message is shown for at least a second when meta-boxes are present.
+-   Make sure block controls don't show over the sidebar on small viewport.
+-   Add ability to manually set image dimensions.
+-   Make Popover initial focus work with screen readers.
+-   Improve Disabled component (disabled attribute, tabindex removal, pointer-events).
+-   Improve visual display of captions within galleries.
+-   Remove default font weight from Pullquote block.
+-   Keep "advanced" block settings panel closed by default.
+-   Use fallback styles to compute font size slider initial value.
+-   Allow filtering of allowed_block_types based on post object.
+-   Allow really long captions to scroll in galleries.
+-   Redesign toggle switch UI component to add clarity.
+-   Improve handling of empty containers in DOM utilities.
+-   Filter out private taxonomies from sidebar UI.
+-   Make input styles consistent.
+-   Update inline "code" background color when part of multi-selection.
+-   Replace TextControl with TextareaControl for image alt attribute.
+-   Allow mod+shift+alt+m (toggle between Visual and Code modes) keyboard shortcut to work regardless of focus area and context.
+-   Allow ctrl+backtick and ctrl+shift+backtick (navigate across regions) keyboard shortcuts to work regardless of focus area and context.
+-   Improve Classic block accessibility by supporting keyboard (alt+f10 and arrows) navigation.
+-   Apply wrapper div for RawHTML with non-children props.
+-   Improve and clarify allowedBlockTypes in inserter.
+-   Improve handling of block hover areas.
+-   Improve figure widths and floats in imagery blocks, improving theming experience.
+-   Eliminate obsolete call to onChange when RichText componentWillUnmount.
+-   Unify styling of Read More and Pagination blocks.
+-   Replace instances of smaller font with default font size.
+-   Fix styling issue with nested blocks ghost.
+-   Fix CSS bug that made it impossible to close the sidebar on mobile with meta-boxes present.
+-   Fix disappearing input when adding link to image.
+-   Fix issue with publish button text occasionally showing HTML entity.
+-   Fix issue with side UI not showing as expected on selected blocks.
+-   Fix sticky post saving when using meta-boxes.
+-   Fix nested blocks' contextual toolbar not being fixed to top when requested.
+-   Fix centered image caption toolbar on IE11.
+-   Fix issue with meta-box saving case by only attempt apiRequest preload if path is set. Also improve tests for meta-boxes.
+-   Fix JS error when wp.apiRequest has no preload data.
+-   Fix regression with image link UI, and another.
+-   Fix regression with columns appender.
+-   Avoid focus losses in Shared block form.
+-   Fix ability to select Embed blocks via clicking.
+-   Fix handling of long strings in permalink container.
+-   Fix resizing behavior of Image block upon browser resize.
+-   Show Image block with external image URL and support resizing.
+-   Fix hiding of update/publish confirmation notices under WP-Admin sidebar.
+-   Fix ID and key generation in SelectControl and RadioControl components.
+-   Fix z-index of link UI.
+-   Fix default width of embeds in the editor.
+-   Revert unintended changes in default font size handling on Paragraph.
+-   Disable the Preview button when post type isn't viewable.
+-   Remove unused variable.
+-   Rename "advanced settings" in block menu to "block settings". Update labels and docs accordingly.
+-   Improve description of embed blocks.
+-   Default to empty object for previous defined wp-utils.
+-   Finalize renaming of reusable blocks to shared blocks.
+-   Update 20 components from the editor module to use wp.data's withSelect and withDispatch instead of react-redux's connect.
+-   Update another batch of components from the editor module to use wp.data's tools.
+-   Replace remaining uses of react-redux in the editor module.
+-   Update a batch of core blocks to drop explicit management of isSelected thanks to new context API.
+-   Attempt to avoid triggering modsec rules.
+-   Use wp-components script handle to pass locale data to wp.i18n.
+-   Reference lodash as an external module. This also reduces bundle size.
+-   Use border-box on input and textarea within meta-boxes to restore radio buttons to normal appearance.
+-   Clarify demo instructions on wide image support.
+-   Update docs to address broken sketch file links.
+-   Reduce and rename rules in Gutenberg block grammar for clarity.
+-   Add test confirming that withFilters does not rerender.
+-   Allow E2E tests to work in a larger variety of environments.
+-   Add mention of JSON workaround to including structured data in attributes.
+-   Document use of GitHub projects in Repository Management.
+-   Fix some documentation links.
+-   Add accessibility standards checkbox and reference to the project's pull request template.
+-   Remove emoji script as it causes different issues. Pending resolution on how to introduce it back.
+-   Avoid needing navigation timeout in Puppeteer.
+-   Disable login screen autofocus in Puppeteer tests.
+-   Allow developers to opt out from some devtool settings to speed up incremental builds.
+-   Use the WordPress i18n package and remove the built-in implementation. Update to 1.1.0.
+-   Remove deprecated function `getWrapperDisplayName`.
 
 = 2.6.0 =
 
-* Add drag and drop functionality to reorder blocks (in addition to arrow movers).
-* Improve side UI around nested groups and introduce a block name label on hover.
-* Focus the block inspector automatically when a block is selected.
-* Allow extending auto-completers via filters — this also exposes the "user" auto-complete to all RichText component instances, making it much easier to leverage for external blocks.
-* Use debounced search request in user auto-complete mechanism improving the experience of mentioning in sites with more than 100 users.
-* Use custom serializer for texturize compatibility. This removes dependency on react-dom/server and integrates better with wptexturize expectations.
-* Group advanced block settings (class name and anchor) in a panel.
-* Move Post Types Data Fetching to the core-data module.
-* Refactor DocumentOutline to use the data module.
-* Improve performance of drag and drop by avoiding excessive re-rendering.
-* Various UI improvements to controls and components in Block Inspector.
-* Remove react-redux usage from the edit-post module, replacing it with the data module. Also improves performance on some block operations.
-* Add role=menuitem to the More Options menu items.
-* Renamed "Frequent" to "Suggested" in block inserter tab.
-* Invert speak messages in block inspector button.
-* Include only known terms in rendered Terms selector, fixing issue with occasional empty tags.
-* Apply centering style to the theme style output.
-* Avoid term request if term set is empty array.
-* Provide createHigherOrderComponent helper to Element abstraction.
-* Reset block selection when replacing with empty set.
-* Prevent unnecessary state updates to edit-post preferences.
-* Update Sidebar and Menu Item implementations to use React 16.3 context API.
-* Generalise and comment on DOMRect calculation and storage.
-* Reopen sidebar when going to viewport sizes larger than medium.
-* Widen dropzone indicator to match block width.
-* Reset margin and padding values for gallery.
-* More defensive checks when accessing capabilities and terms.
-* Fix autosave condition while editing a post using the Text Mode editor.
-* Fix block movers aria-label info on multi-select groups.
-* Fix centered multiline labels in the block settings menu.
-* Fix issue with Publish button caused by moment timezone configuration.
-* Fix arrow movement inside search input in Inserter.
-* Fix broken translation in FormTokenField placeholder.
-* Fix issue with invalid string value passed to caption in Image block.
-* Fix findDOMNode lint warning.
-* Fix error when DOCKER is not defined.
-* Fix Safari flashing a white screen just before the editor is loaded.
-* Fix problem with meta-boxes toggling.
-* Fix WordCounter error when loading meta boxes.
-* Fix clone function to allow cloning nested blocks.
-* Fix issue with meta-boxes and file inputs.
-* Fix issue with block more button when multi selected.
-* Handle post ID and WP_Post objects passed to gutenberg_can_edit_post().
-* Clear attribute and reset text back to default when cleared in the "More" block.
-* Remove an invalid test case from isCurrentPostScheduled.
-* Remove code transform for uppercase text in Tooltip component.
-* Remove unused PrismJS dependency.
-* Remove redundant z-index in block mover.
-* Remove background color from paragraph and fixed contrast checker on transparent colors.
-* Make block preview title translatable.
-* Make the click-redirector responsive (handles clicking on the bottom area of the editor to focus on last field).
-* Replace cases of bold font weight with weight 600.
-* Various Sass code improvements.
-* Add E2E test for splitting/merging paragraph blocks with Enter/Backspace.
-* Add test to check CPT templates initialization in E2E tests.
-* Add helpers to install/activate/deactivate and remove plugins in E2E tests.
-* Re-incorporate Webpack devtool into development build for improved debugging.
-* Add $HOME/.npm to Travis cache after addition of Puppeteer library.
-* Improve MediaUpload docs.
-* Rework all the extensibility related docs to add structure and clarity.
-* Remove deprecations slated for 2.6.
-* Upgrade React to version 16.3.0.
-* Migrate to Webpack 4.
+-   Add drag and drop functionality to reorder blocks (in addition to arrow movers).
+-   Improve side UI around nested groups and introduce a block name label on hover.
+-   Focus the block inspector automatically when a block is selected.
+-   Allow extending auto-completers via filters — this also exposes the "user" auto-complete to all RichText component instances, making it much easier to leverage for external blocks.
+-   Use debounced search request in user auto-complete mechanism improving the experience of mentioning in sites with more than 100 users.
+-   Use custom serializer for texturize compatibility. This removes dependency on react-dom/server and integrates better with wptexturize expectations.
+-   Group advanced block settings (class name and anchor) in a panel.
+-   Move Post Types Data Fetching to the core-data module.
+-   Refactor DocumentOutline to use the data module.
+-   Improve performance of drag and drop by avoiding excessive re-rendering.
+-   Various UI improvements to controls and components in Block Inspector.
+-   Remove react-redux usage from the edit-post module, replacing it with the data module. Also improves performance on some block operations.
+-   Add role=menuitem to the More Options menu items.
+-   Renamed "Frequent" to "Suggested" in block inserter tab.
+-   Invert speak messages in block inspector button.
+-   Include only known terms in rendered Terms selector, fixing issue with occasional empty tags.
+-   Apply centering style to the theme style output.
+-   Avoid term request if term set is empty array.
+-   Provide createHigherOrderComponent helper to Element abstraction.
+-   Reset block selection when replacing with empty set.
+-   Prevent unnecessary state updates to edit-post preferences.
+-   Update Sidebar and Menu Item implementations to use React 16.3 context API.
+-   Generalise and comment on DOMRect calculation and storage.
+-   Reopen sidebar when going to viewport sizes larger than medium.
+-   Widen dropzone indicator to match block width.
+-   Reset margin and padding values for gallery.
+-   More defensive checks when accessing capabilities and terms.
+-   Fix autosave condition while editing a post using the Text Mode editor.
+-   Fix block movers aria-label info on multi-select groups.
+-   Fix centered multiline labels in the block settings menu.
+-   Fix issue with Publish button caused by moment timezone configuration.
+-   Fix arrow movement inside search input in Inserter.
+-   Fix broken translation in FormTokenField placeholder.
+-   Fix issue with invalid string value passed to caption in Image block.
+-   Fix findDOMNode lint warning.
+-   Fix error when DOCKER is not defined.
+-   Fix Safari flashing a white screen just before the editor is loaded.
+-   Fix problem with meta-boxes toggling.
+-   Fix WordCounter error when loading meta boxes.
+-   Fix clone function to allow cloning nested blocks.
+-   Fix issue with meta-boxes and file inputs.
+-   Fix issue with block more button when multi selected.
+-   Handle post ID and WP_Post objects passed to gutenberg_can_edit_post().
+-   Clear attribute and reset text back to default when cleared in the "More" block.
+-   Remove an invalid test case from isCurrentPostScheduled.
+-   Remove code transform for uppercase text in Tooltip component.
+-   Remove unused PrismJS dependency.
+-   Remove redundant z-index in block mover.
+-   Remove background color from paragraph and fixed contrast checker on transparent colors.
+-   Make block preview title translatable.
+-   Make the click-redirector responsive (handles clicking on the bottom area of the editor to focus on last field).
+-   Replace cases of bold font weight with weight 600.
+-   Various Sass code improvements.
+-   Add E2E test for splitting/merging paragraph blocks with Enter/Backspace.
+-   Add test to check CPT templates initialization in E2E tests.
+-   Add helpers to install/activate/deactivate and remove plugins in E2E tests.
+-   Re-incorporate Webpack devtool into development build for improved debugging.
+-   Add $HOME/.npm to Travis cache after addition of Puppeteer library.
+-   Improve MediaUpload docs.
+-   Rework all the extensibility related docs to add structure and clarity.
+-   Remove deprecations slated for 2.6.
+-   Upgrade React to version 16.3.0.
+-   Migrate to Webpack 4.
 
 = 2.5.0 =
 
-* Add support for sharing nested blocks.
-* Introduce a declarative approach to handling display of sidebar content to the Plugin API with PluginSidebar component and portals.
-* Introduce menu item and related components to handle entry point for editor plugin operations, further extending capabilities and available tools in the Plugin API.
-* Add block template validation and ability to reset a template.
-* Add new abstracted data querying interface that provides better handling of declarative data needs and side effects. Introduces registerResolvers enhanced by withSelect.
-* Add predefined sets of font sizes and corresponding UI controls.
-* Improve block margin implementation in order to simplify work needed for nesting blocks.
-* Don't show insertion point between blocks when a template is locked.
-* Update shared block UI to better indicate that a block is reusable.
-* Add support for transforms prioritization to the block API.
-* Improve initial focus allocation within content structure popover for accessibility.
-* Add visibile text to gallery "add item" button for accessibility.
-* Update post taxonomies wp.apiRequest to not depend on ajax specific implementation.
-* Some visual refinements to the main block library inserter.
-* Include custom classes in the block markup within the editor, matching the final render on the front-end.
-* Improve display of block transformation options.
-* Fine-tune the pre- and post-publish flows depending on post status and user role.
-* Improve the accessibility of the MenuItemsToggle buttons and add a speak message for screen reader users to confirm when they switch editor mode.
-* Improve the accessibility of RichText elements by providing textbox roles and aria-multiline attributes.
-* Improve the accessibility of inserter items by providing aria-label attributes.
-* Clear selected block on canvas focus only if it is selected.
-* Avoid styling meta-boxes inputs to look like Gutenberg UI.
-* Use "perfect fourth" rule of typographic scale for heading display.
-* Inherit color styling on meta-boxes area.
-* Increase width of meta-boxes area.
-* Default to content-box box-sizing for the meta-box area.
-* Improve handling of transformations (backticks for Code and dashes for Separator) when pressing enter.
-* Expose combineReducer helper in data module.
-* Make it possible to override the default class name generation logic.
-* Remove edit-post styles from editor components.
-* Ignore mid-word underscores when pasting markdown text.
-* Add label element to the post title.
-* Improve block mover labels for speech recognition software.
-* Correct onChange handler in SelectControl component to support multi-value changes.
-* Make MediaUpload component extensible.
-* Improve display of color palette items (like white) by adding a subtle transparent inset shadow.
-* Ignore "Disable visual editor" setting to address case where Classic block would not load for the user.
-* Improve display of sidebar heights on mobile.
-* Update blockSelection reducer to clear selection when removing the selected block.
-* Show "no title" placeholder on the mobile sidebar when post title is empty.
-* Address case where cancelling edits on a shared block not discarding unsaved changes that have been made to that block.
-* Introduce new MenuGroup and MenuItem components and refactor for clarity.
-* Improve the block inserter UI on mobile by displaying the post title in a header above the search bar. Extends as optional support for all popovers.
-* Refactor media fetching to use the core data module. Shields from REST API specific nomenclature.
-* Add a label and a role to the block appender to make it discoverable by text readers.
-* Use up and down arrow icons for the meta boxes panels.
-* Hide reusable block indicator from the inserter preview.
-* Fix issue with embed placeholder breaking on reload.
-* Fix error when collapsing categories panel.
-* Fix case where inserting a block after removal inserts it at the top of the post.
-* Fix issue with Button block text wrap.
-* Fix bug with meta-boxes data collection that occasionally prevented them from showing.
-* Fix meta-box configuration persistence to be per postType.
-* Fix issue with multiple previews in Firefox by unsetting popup window upon close.
-* Fix scroll bleed when displaying modal UI on mobile.
-* Fix z-index issue with admin bar quick links and content structure tooltip.
-* Fix image href attribute matcher to not interfere with anchors inside the caption.
-* Fix help text position on toggle control and range control.
-* Fix centering of small videos.
-* Fix timezone conflicts when setting global moment default timezone.
-* Fix issue with getDocumentTitle and undefined titles.
-* Fix missing rerender of plugin area upon registration or unregistration.
-* Remove title from Table of Contents and warn user if theme doesn't support titles.
-* Prevent potential fatal error when registering shared block post type if a specific core user role has been removed.
-* Avoid collecting meta-box information on non-Gutenberg screens.
-* Update contrast checker to respect recent changes on Notice component.
-* Rename isProvisionalBlock action property to selectPrevious in removeBlock and removeBlocks functions.
-* Address issue with heartbeat dependency (only use when available).
-* Allow calling functions passed as props in the Fill.
-* Improve style handling and specificity of dashicon SVGs.
-* Unify "citation" translatable strings for quotes and pullquotes.
-* Clean up nomenclature inconsistencies in blocks and components modules.
-* Correct documentation example for withDispatch.
-* Update documentation on extending the editor via PluginSidebar and PluginMoreMenuItem.
-* Dynamically pick JS/CSS build files for plugin ZIP generation.
-* Copy improvements to documentation.
-* Attempt to avoid cases where hosts block certain HTTP verbs on wp-api.js requests. This is part of similar issues being exposed by Gutenberg being the first Core WordPress feature that makes significant use of the REST API.
-* Add a shim to override wp.apiRequest, allowing HTTP/1.0 emulation.
-* Update react-autosize-textarea package.
-* Update @wordpress/hooks to v1.1.6.
-* Use CustomTemplatedPathPlugin which was extracted and updated for Webpack 4.
-* Use wordpress/es6 ESLint config.
-* Add Gutenberg Hub to the resources.
-* Properly detect NVM path on macOS using homebrew.
-* Remove Cypress for E2E testing in favor of Puppeteer. Refactor all existing tests and integrations.
-* Remove deprecations slated for 2.5.0 removal.
+-   Add support for sharing nested blocks.
+-   Introduce a declarative approach to handling display of sidebar content to the Plugin API with PluginSidebar component and portals.
+-   Introduce menu item and related components to handle entry point for editor plugin operations, further extending capabilities and available tools in the Plugin API.
+-   Add block template validation and ability to reset a template.
+-   Add new abstracted data querying interface that provides better handling of declarative data needs and side effects. Introduces registerResolvers enhanced by withSelect.
+-   Add predefined sets of font sizes and corresponding UI controls.
+-   Improve block margin implementation in order to simplify work needed for nesting blocks.
+-   Don't show insertion point between blocks when a template is locked.
+-   Update shared block UI to better indicate that a block is reusable.
+-   Add support for transforms prioritization to the block API.
+-   Improve initial focus allocation within content structure popover for accessibility.
+-   Add visibile text to gallery "add item" button for accessibility.
+-   Update post taxonomies wp.apiRequest to not depend on ajax specific implementation.
+-   Some visual refinements to the main block library inserter.
+-   Include custom classes in the block markup within the editor, matching the final render on the front-end.
+-   Improve display of block transformation options.
+-   Fine-tune the pre- and post-publish flows depending on post status and user role.
+-   Improve the accessibility of the MenuItemsToggle buttons and add a speak message for screen reader users to confirm when they switch editor mode.
+-   Improve the accessibility of RichText elements by providing textbox roles and aria-multiline attributes.
+-   Improve the accessibility of inserter items by providing aria-label attributes.
+-   Clear selected block on canvas focus only if it is selected.
+-   Avoid styling meta-boxes inputs to look like Gutenberg UI.
+-   Use "perfect fourth" rule of typographic scale for heading display.
+-   Inherit color styling on meta-boxes area.
+-   Increase width of meta-boxes area.
+-   Default to content-box box-sizing for the meta-box area.
+-   Improve handling of transformations (backticks for Code and dashes for Separator) when pressing enter.
+-   Expose combineReducer helper in data module.
+-   Make it possible to override the default class name generation logic.
+-   Remove edit-post styles from editor components.
+-   Ignore mid-word underscores when pasting markdown text.
+-   Add label element to the post title.
+-   Improve block mover labels for speech recognition software.
+-   Correct onChange handler in SelectControl component to support multi-value changes.
+-   Make MediaUpload component extensible.
+-   Improve display of color palette items (like white) by adding a subtle transparent inset shadow.
+-   Ignore "Disable visual editor" setting to address case where Classic block would not load for the user.
+-   Improve display of sidebar heights on mobile.
+-   Update blockSelection reducer to clear selection when removing the selected block.
+-   Show "no title" placeholder on the mobile sidebar when post title is empty.
+-   Address case where cancelling edits on a shared block not discarding unsaved changes that have been made to that block.
+-   Introduce new MenuGroup and MenuItem components and refactor for clarity.
+-   Improve the block inserter UI on mobile by displaying the post title in a header above the search bar. Extends as optional support for all popovers.
+-   Refactor media fetching to use the core data module. Shields from REST API specific nomenclature.
+-   Add a label and a role to the block appender to make it discoverable by text readers.
+-   Use up and down arrow icons for the meta boxes panels.
+-   Hide reusable block indicator from the inserter preview.
+-   Fix issue with embed placeholder breaking on reload.
+-   Fix error when collapsing categories panel.
+-   Fix case where inserting a block after removal inserts it at the top of the post.
+-   Fix issue with Button block text wrap.
+-   Fix bug with meta-boxes data collection that occasionally prevented them from showing.
+-   Fix meta-box configuration persistence to be per postType.
+-   Fix issue with multiple previews in Firefox by unsetting popup window upon close.
+-   Fix scroll bleed when displaying modal UI on mobile.
+-   Fix z-index issue with admin bar quick links and content structure tooltip.
+-   Fix image href attribute matcher to not interfere with anchors inside the caption.
+-   Fix help text position on toggle control and range control.
+-   Fix centering of small videos.
+-   Fix timezone conflicts when setting global moment default timezone.
+-   Fix issue with getDocumentTitle and undefined titles.
+-   Fix missing rerender of plugin area upon registration or unregistration.
+-   Remove title from Table of Contents and warn user if theme doesn't support titles.
+-   Prevent potential fatal error when registering shared block post type if a specific core user role has been removed.
+-   Avoid collecting meta-box information on non-Gutenberg screens.
+-   Update contrast checker to respect recent changes on Notice component.
+-   Rename isProvisionalBlock action property to selectPrevious in removeBlock and removeBlocks functions.
+-   Address issue with heartbeat dependency (only use when available).
+-   Allow calling functions passed as props in the Fill.
+-   Improve style handling and specificity of dashicon SVGs.
+-   Unify "citation" translatable strings for quotes and pullquotes.
+-   Clean up nomenclature inconsistencies in blocks and components modules.
+-   Correct documentation example for withDispatch.
+-   Update documentation on extending the editor via PluginSidebar and PluginMoreMenuItem.
+-   Dynamically pick JS/CSS build files for plugin ZIP generation.
+-   Copy improvements to documentation.
+-   Attempt to avoid cases where hosts block certain HTTP verbs on wp-api.js requests. This is part of similar issues being exposed by Gutenberg being the first Core WordPress feature that makes significant use of the REST API.
+-   Add a shim to override wp.apiRequest, allowing HTTP/1.0 emulation.
+-   Update react-autosize-textarea package.
+-   Update @wordpress/hooks to v1.1.6.
+-   Use CustomTemplatedPathPlugin which was extracted and updated for Webpack 4.
+-   Use wordpress/es6 ESLint config.
+-   Add Gutenberg Hub to the resources.
+-   Properly detect NVM path on macOS using homebrew.
+-   Remove Cypress for E2E testing in favor of Puppeteer. Refactor all existing tests and integrations.
+-   Remove deprecations slated for 2.5.0 removal.
 
 = 2.4.0 =
 
-* Show the full block inserter (+ button) to the left of empty paragraphs and the default appender. Quick block options (based on compound frequency and recency) remain on the right.
-* Insert default block as provisional — this reduces the proliferation of empty blocks as the editor removes these provisional blocks when unfocusing.
-* When pressing enter from post title, insert initial block as provisional.
-* Fade out the side inserter when typing on the newly created block.
-* Group common block definition on inserters. Use 'frecency' to sort items on top of it.
-* Improve the visual focus style for inbetween inserter.
-* Move isTyping behaviour to a separate component.
-* Inserting a block should only shift focus to a text field, otherwise focusing the block's "focus stop".
-* Example: Inserting an image should focus the top-level placeholder.
-* Pressing backspace or enter from the block's focus stop should respectively delete or insert a subsequent paragraph block.
-* Example: Pressing enter or delete on an image placeholder.
-* Pressing down arrow from a non-text-field should proceed with a tab transition as expected.
-* Multi-selection at the last text field in a block now accounts for non-contenteditable text fields.
-* Better internal identification of text fields for writing flow transitions. Previously, if a block contained a checkbox, radio, or other non-text input tags, they would be erroneously included in the writing flow sequence.
-* Inserting paragraph block (quote, etc; those with text fields) via autocomplete should move focus to the cursor.
-* Shift-arrow from a text field engages multi-selection, but not if there are other text fields in the intended direction in the same block.
-* Cancel isTyping state when focusing non text field.
-* Improve reliability of the block click-to-clear behavior.
-* When clicking below the editor move focus to last text field — this includes creating a new provisional block if last block is not text. This is equivalent to the default block appender spanning the entire viewport height of the editable canvas.
-* Introduce same undo buffering for general text to the post title (and other post properties).
-* Allow breaking out of List block upon Enter on last empty line.
-* Address conflicts between WritingFlow's selection transitioning and nested blocks by moving selection to the block's focus handler.
-* Improve reusable block creation flow by focusing the title field and allowing the user to name their block immediately.
-* Avoid calling callbacks on DropZone component if a file is dropped on another dropzone.
-* Improve settings UI on mobile devices.
-* Allow text to wrap within Button block.
-* Restrict Popover focusOnMount to keyboard interaction. This seeks to improve the experience of interacting with popovers and popover menus based on usability and accessibility concerns.
-* Optimize the behavior of subscribe to avoid calling a listener except in the case that state has in-fact changed.
-* Move the behaviors to transition focus to a newly selected block from the WritingFlow component to the BlockListBlock component.
-* Extract scroll preservation from BlockList as non-visual component
-* Add Upload button to audio and video blocks.
-* Refactor image uploads and added auto-filled captions using the image metadata.
-* Limit CSS rules for lists to the visual editor area.
-* Add aria-label to the post title.
-* Add new distinctive icon for Cover Image block.
-* Refactor PostTitle for easier select, deselect.
-* Use ifViewportMatches HoC to render BlockMobileToolbar as appropriate.
-* Introduce a new reusable Disabled component which intends to manage all field disabling automatically.
-* Expand editor canvas as flex region improving deselect behaviour.
-* Bump minimum font-size to 13px.
-* Allow emojis to be displayed in permalink visual component.
-* Respect HTML when readding paragraph-tags.
-* Allow undefined return from withSelect mapSelectToProps.
-* Update datepicker styling to inherit font-family/colour scheme.
-* Move QueryControls and expose them for general use under components module.
-* Address design issues with block dialog warnings on blocks that are too tall.
-* Preserve "More" order during block conversion.
-* Add capabilities handling for reusable blocks mapping to default roles.
-* Add a "Write your story" filter.
-* Return focus from Toolbar to selection when escape is pressed.
-* Improve keyboard interaction on inserter tab panels.
-* Simplify state management for the sidebar to make it easier to maintain.
-* Update cover image markup and CSS.
-* Fix sent parameter in onChange function of CheckboxControl.
-* Fix errors in some localized strings.
-* Fix problem with arrow navigation within Block Menu buttons.
-* Fix issue with demo page being marked immediately as unsaved (and the subsequent autosave).
-* Fix issue with a Reusable Blocks being keyboard navigable even when it is not supposed to be edited.
-* Fix focusable matching elements with "contenteditable=false".
-* Fix issue with empty paragraphs appearing after images when the images are inside an anchor.
-* Fix issue when a block cannot be removed after being transformed into another block type.
-* Fix issue with updating the author on published posts.
-* Fix edgecases in Windows high contrast mode.
-* Fix regression with inserter tabs colors.
-* Fix handling of HTML captions on gallery and image.
-* Fix heading subscript regression.
-* Resolve a performance regression caused by a bailout condition in our chosen shallow-equality library.
-* Handle calculateFrequency edge case on upgrading.
-* Use lodash includes in NavigableMenu to address IE11 issue.
-* Refer to reusable blocks as 'Shared Blocks'.
-* Add domain argument to localization functions. Allow setting locale data by domain.
-* Update localization functions to absorb errors from Jed.
-* Make UrlInput a controlled component.
-* Decode HTML entities in placeholders.
-* Only allow whitespace around URL when attempting to transform pasted Embeds.
-* Make preferences reducer deterministic.
-* Remove max-width for meta boxes area inputs.
-* Default to content-box box-sizing for the metabox area.
-* Adjust inside padding of meta boxes to better accommodate plugins.
-* Remove !important clauses from button styles.
-* Keep update button enabled when there are metaboxes present.
-* Clarify some inner workings of Block API functionality with comments.
-* Rewrite data document as a walkthrough of wordpress/data.
-* Revert the eslint --fix Git precommit hook.
-* Extract shared eslint config.
-* Add tests for the BlockSwitcher component.
-* Add test cases for REQUEST_POST_UPDATE_FAILURE effect.
-* Fail the build via ESLint error when deprecations marked for removal in a given version change are not removed.
-* Update redux-optmist to 1.0.0.
-* Update package-lock.json.
-* Remove Deprecated Features planned for this release and start documenting them in a deprecated document.
+-   Show the full block inserter (+ button) to the left of empty paragraphs and the default appender. Quick block options (based on compound frequency and recency) remain on the right.
+-   Insert default block as provisional — this reduces the proliferation of empty blocks as the editor removes these provisional blocks when unfocusing.
+-   When pressing enter from post title, insert initial block as provisional.
+-   Fade out the side inserter when typing on the newly created block.
+-   Group common block definition on inserters. Use 'frecency' to sort items on top of it.
+-   Improve the visual focus style for inbetween inserter.
+-   Move isTyping behaviour to a separate component.
+-   Inserting a block should only shift focus to a text field, otherwise focusing the block's "focus stop".
+-   Example: Inserting an image should focus the top-level placeholder.
+-   Pressing backspace or enter from the block's focus stop should respectively delete or insert a subsequent paragraph block.
+-   Example: Pressing enter or delete on an image placeholder.
+-   Pressing down arrow from a non-text-field should proceed with a tab transition as expected.
+-   Multi-selection at the last text field in a block now accounts for non-contenteditable text fields.
+-   Better internal identification of text fields for writing flow transitions. Previously, if a block contained a checkbox, radio, or other non-text input tags, they would be erroneously included in the writing flow sequence.
+-   Inserting paragraph block (quote, etc; those with text fields) via autocomplete should move focus to the cursor.
+-   Shift-arrow from a text field engages multi-selection, but not if there are other text fields in the intended direction in the same block.
+-   Cancel isTyping state when focusing non text field.
+-   Improve reliability of the block click-to-clear behavior.
+-   When clicking below the editor move focus to last text field — this includes creating a new provisional block if last block is not text. This is equivalent to the default block appender spanning the entire viewport height of the editable canvas.
+-   Introduce same undo buffering for general text to the post title (and other post properties).
+-   Allow breaking out of List block upon Enter on last empty line.
+-   Address conflicts between WritingFlow's selection transitioning and nested blocks by moving selection to the block's focus handler.
+-   Improve reusable block creation flow by focusing the title field and allowing the user to name their block immediately.
+-   Avoid calling callbacks on DropZone component if a file is dropped on another dropzone.
+-   Improve settings UI on mobile devices.
+-   Allow text to wrap within Button block.
+-   Restrict Popover focusOnMount to keyboard interaction. This seeks to improve the experience of interacting with popovers and popover menus based on usability and accessibility concerns.
+-   Optimize the behavior of subscribe to avoid calling a listener except in the case that state has in-fact changed.
+-   Move the behaviors to transition focus to a newly selected block from the WritingFlow component to the BlockListBlock component.
+-   Extract scroll preservation from BlockList as non-visual component
+-   Add Upload button to audio and video blocks.
+-   Refactor image uploads and added auto-filled captions using the image metadata.
+-   Limit CSS rules for lists to the visual editor area.
+-   Add aria-label to the post title.
+-   Add new distinctive icon for Cover Image block.
+-   Refactor PostTitle for easier select, deselect.
+-   Use ifViewportMatches HoC to render BlockMobileToolbar as appropriate.
+-   Introduce a new reusable Disabled component which intends to manage all field disabling automatically.
+-   Expand editor canvas as flex region improving deselect behaviour.
+-   Bump minimum font-size to 13px.
+-   Allow emojis to be displayed in permalink visual component.
+-   Respect HTML when readding paragraph-tags.
+-   Allow undefined return from withSelect mapSelectToProps.
+-   Update datepicker styling to inherit font-family/colour scheme.
+-   Move QueryControls and expose them for general use under components module.
+-   Address design issues with block dialog warnings on blocks that are too tall.
+-   Preserve "More" order during block conversion.
+-   Add capabilities handling for reusable blocks mapping to default roles.
+-   Add a "Write your story" filter.
+-   Return focus from Toolbar to selection when escape is pressed.
+-   Improve keyboard interaction on inserter tab panels.
+-   Simplify state management for the sidebar to make it easier to maintain.
+-   Update cover image markup and CSS.
+-   Fix sent parameter in onChange function of CheckboxControl.
+-   Fix errors in some localized strings.
+-   Fix problem with arrow navigation within Block Menu buttons.
+-   Fix issue with demo page being marked immediately as unsaved (and the subsequent autosave).
+-   Fix issue with a Reusable Blocks being keyboard navigable even when it is not supposed to be edited.
+-   Fix focusable matching elements with "contenteditable=false".
+-   Fix issue with empty paragraphs appearing after images when the images are inside an anchor.
+-   Fix issue when a block cannot be removed after being transformed into another block type.
+-   Fix issue with updating the author on published posts.
+-   Fix edgecases in Windows high contrast mode.
+-   Fix regression with inserter tabs colors.
+-   Fix handling of HTML captions on gallery and image.
+-   Fix heading subscript regression.
+-   Resolve a performance regression caused by a bailout condition in our chosen shallow-equality library.
+-   Handle calculateFrequency edge case on upgrading.
+-   Use lodash includes in NavigableMenu to address IE11 issue.
+-   Refer to reusable blocks as 'Shared Blocks'.
+-   Add domain argument to localization functions. Allow setting locale data by domain.
+-   Update localization functions to absorb errors from Jed.
+-   Make UrlInput a controlled component.
+-   Decode HTML entities in placeholders.
+-   Only allow whitespace around URL when attempting to transform pasted Embeds.
+-   Make preferences reducer deterministic.
+-   Remove max-width for meta boxes area inputs.
+-   Default to content-box box-sizing for the metabox area.
+-   Adjust inside padding of meta boxes to better accommodate plugins.
+-   Remove !important clauses from button styles.
+-   Keep update button enabled when there are metaboxes present.
+-   Clarify some inner workings of Block API functionality with comments.
+-   Rewrite data document as a walkthrough of wordpress/data.
+-   Revert the eslint --fix Git precommit hook.
+-   Extract shared eslint config.
+-   Add tests for the BlockSwitcher component.
+-   Add test cases for REQUEST_POST_UPDATE_FAILURE effect.
+-   Fail the build via ESLint error when deprecations marked for removal in a given version change are not removed.
+-   Update redux-optmist to 1.0.0.
+-   Update package-lock.json.
+-   Remove Deprecated Features planned for this release and start documenting them in a deprecated document.
 
 = 2.3.0 =
 
-* Continue editing flow iterations by adding a line between blocks to insert new content — it also works within nested groups.
-* Add support for nested templates.
-* Allow duplicating a block through a menu button.
-* Automatically set a matching block as the default when a post format is set and the post is empty. This continues the path of matching blocks with post formats.
-* Add CodeMirror (core library) to the HTML block for syntax highlighting.
-* Simplify design presentation of editor header area for better consistency. (Add label for "Preview" action.)
-* Introduce new API for allowing plugins to register sidebars. ⭐  It allows plugins to further extend Gutenberg natively with non-content functionality. Note: the public facing functions are marked as experimental as they are being iterated in the context of the major extensibility work going on outside of blocks.
-* Improve the "invalid block" dialog by reducing the options and adding a new convert to blocks feature as we have solidified the transformations.
-* Allow adding images to a gallery without going through the media library.
-* Show the block appender even if the last block is non empty paragraph.
-* Show the side inserter on empty paragraphs within nested blocks.
-* Add a script that creates a PHP file based on a POT to make the plugin translatable.
-* Refactor float alignment to avoid margin calculations and simplify rendering.
-* Support registering and invoking actions in the data module.
-* Add hook to validate useOnce blocks.
-* Add viewport module. (Showing explorations with data module.)
-* Provide a fix for apiRequest in sites configured to use plain permalinks. (Reported several times!)
-* Remove specific grammar support for more tag as we consolidate the syntax and reduce weight.
-* Move filter for registering block types before validation happens.
-* Allow removing the selected image in a gallery block using backspace/delete keys.
-* Make saved blocks preview available to keyboard users.
-* Refactor reducer enhancers as higher-order reducer creators.
-* Refactor query HOC usage with withSelect.
-* Refactor API calls in Gutenberg to always use wp.apiRequest.
-* Register core blocks on init hook.
-* Removed DefaultBlockAppender when a template Lock exits.
-* Reduce and simplify float code.
-* Refactor and cleanup for the Ellipsis and More Menu components.
-* Add focus styles for Windows High Contrast mode.
-* Move meta boxes out of the generic editor module.
-* Make the "more" tag visible in the Classic block.
-* Expose ImagePlaceholder component in wp.blocks.
-* Rename TermTreeSelect to TreeSelect and move it to components.
-* Reuse isHorizontalEdge for RichText component and remove duplication.
-* Improve CSS for gallery caption and avoid UI shifts.
-* Use TreeSelect in HierarchicalTermSelector.
-* Flatten components modes directory organization.
-* Mutate editor store reference in middlewares application.
-* Consider term names as case insensitive.
-* Resolve an issue where removing a block which had contained inner blocks would not clear those inner blocks from state.
-* Make sure block usage is incremented (for calculating frequency and recency) when adding blocks with the side inserter.
-* Hide non editor specific notices, pending further improvements.
-* Update shortcode block icon.
-* Disable post format input if the theme does not support post formats.
-* Remove margin from initial insertion point and fix misalignment.
-* Polish header for mobile and accommodate other more languages.
-* Show taxonomies in the document inspector separately, uncoupling Categories & Tags.
-* Improve handling of block toolbar on mobile.
-* Fix issue with gallery images not cropping within link wrappers.
-* Fix bug in paragraph blocks affecting input behaviour when block is positioned on left or right.
-* Fix minor inconsistency with block margins and the default appender.
-* Fix description typo in freeform block.
-* Fix issue with focus transfering between citation and content.
-* Fix issue with floated block toolbar on adjacent floats.
-* Fix duplicate upload of media on drag.
-* Fix issue that prevented adding new rows or columns in Table block.
-* Fix issues with z-index and the sidebar.
-* Fix accessibility issues with mover icons.
-* Fix issue with default block replace resulting in incorrect order.
-* Fix sidebar tab padding.
-* Fix certain conflicts with markdown plugins.
-* Fix IconButton indent regression.
-* Fix issue with self embedding WP posts and the processing of the embed markup.
-* Fix extraction of _nx translation function.
-* Fix wp.data.query backwards compatibility with props.
-* Fix problem with delete key in empty contentEditables.
-* Resolve an issue with the data module's unsubscribe behavior which can result in a listener callback being invoked even after its been unsubscribed.
-* Remove the api-request JavaScript shim which had existed while WordPress 4.9 was in pre-release.
-* Remove explicit handling of "bottom reached" within writing flow as redundant.
-* Remove invalid reference to WeakMap polyfill.
-* Remove unused wpautop fixture files.
-* Remove non-functional custom taxonomies meta boxes.
-* Remove is- prefix from embed alignment class.
-* Switch get_locale() to get_user_locale().
-* Remove unnecessary $current_screen code.
-* Reduce duplication in 'No saved blocks' and 'No blocks found' component messages.
-* Include string extraction in production build.
-* Add deprecation helper functions for consistent messaging.
-* Improve string cast render test.
-* Add Gutenberg svg to docs.
-* Add documentation describing block transforms.
-* Add documentation for nested template definitions.
-* Add documentation for registering sidebar APIs. Move them to extensibility docs.
-* Update WordPress packages to the latest versions.
+-   Continue editing flow iterations by adding a line between blocks to insert new content — it also works within nested groups.
+-   Add support for nested templates.
+-   Allow duplicating a block through a menu button.
+-   Automatically set a matching block as the default when a post format is set and the post is empty. This continues the path of matching blocks with post formats.
+-   Add CodeMirror (core library) to the HTML block for syntax highlighting.
+-   Simplify design presentation of editor header area for better consistency. (Add label for "Preview" action.)
+-   Introduce new API for allowing plugins to register sidebars. ⭐ It allows plugins to further extend Gutenberg natively with non-content functionality. Note: the public facing functions are marked as experimental as they are being iterated in the context of the major extensibility work going on outside of blocks.
+-   Improve the "invalid block" dialog by reducing the options and adding a new convert to blocks feature as we have solidified the transformations.
+-   Allow adding images to a gallery without going through the media library.
+-   Show the block appender even if the last block is non empty paragraph.
+-   Show the side inserter on empty paragraphs within nested blocks.
+-   Add a script that creates a PHP file based on a POT to make the plugin translatable.
+-   Refactor float alignment to avoid margin calculations and simplify rendering.
+-   Support registering and invoking actions in the data module.
+-   Add hook to validate useOnce blocks.
+-   Add viewport module. (Showing explorations with data module.)
+-   Provide a fix for apiRequest in sites configured to use plain permalinks. (Reported several times!)
+-   Remove specific grammar support for more tag as we consolidate the syntax and reduce weight.
+-   Move filter for registering block types before validation happens.
+-   Allow removing the selected image in a gallery block using backspace/delete keys.
+-   Make saved blocks preview available to keyboard users.
+-   Refactor reducer enhancers as higher-order reducer creators.
+-   Refactor query HOC usage with withSelect.
+-   Refactor API calls in Gutenberg to always use wp.apiRequest.
+-   Register core blocks on init hook.
+-   Removed DefaultBlockAppender when a template Lock exits.
+-   Reduce and simplify float code.
+-   Refactor and cleanup for the Ellipsis and More Menu components.
+-   Add focus styles for Windows High Contrast mode.
+-   Move meta boxes out of the generic editor module.
+-   Make the "more" tag visible in the Classic block.
+-   Expose ImagePlaceholder component in wp.blocks.
+-   Rename TermTreeSelect to TreeSelect and move it to components.
+-   Reuse isHorizontalEdge for RichText component and remove duplication.
+-   Improve CSS for gallery caption and avoid UI shifts.
+-   Use TreeSelect in HierarchicalTermSelector.
+-   Flatten components modes directory organization.
+-   Mutate editor store reference in middlewares application.
+-   Consider term names as case insensitive.
+-   Resolve an issue where removing a block which had contained inner blocks would not clear those inner blocks from state.
+-   Make sure block usage is incremented (for calculating frequency and recency) when adding blocks with the side inserter.
+-   Hide non editor specific notices, pending further improvements.
+-   Update shortcode block icon.
+-   Disable post format input if the theme does not support post formats.
+-   Remove margin from initial insertion point and fix misalignment.
+-   Polish header for mobile and accommodate other more languages.
+-   Show taxonomies in the document inspector separately, uncoupling Categories & Tags.
+-   Improve handling of block toolbar on mobile.
+-   Fix issue with gallery images not cropping within link wrappers.
+-   Fix bug in paragraph blocks affecting input behaviour when block is positioned on left or right.
+-   Fix minor inconsistency with block margins and the default appender.
+-   Fix description typo in freeform block.
+-   Fix issue with focus transfering between citation and content.
+-   Fix issue with floated block toolbar on adjacent floats.
+-   Fix duplicate upload of media on drag.
+-   Fix issue that prevented adding new rows or columns in Table block.
+-   Fix issues with z-index and the sidebar.
+-   Fix accessibility issues with mover icons.
+-   Fix issue with default block replace resulting in incorrect order.
+-   Fix sidebar tab padding.
+-   Fix certain conflicts with markdown plugins.
+-   Fix IconButton indent regression.
+-   Fix issue with self embedding WP posts and the processing of the embed markup.
+-   Fix extraction of \_nx translation function.
+-   Fix wp.data.query backwards compatibility with props.
+-   Fix problem with delete key in empty contentEditables.
+-   Resolve an issue with the data module's unsubscribe behavior which can result in a listener callback being invoked even after its been unsubscribed.
+-   Remove the api-request JavaScript shim which had existed while WordPress 4.9 was in pre-release.
+-   Remove explicit handling of "bottom reached" within writing flow as redundant.
+-   Remove invalid reference to WeakMap polyfill.
+-   Remove unused wpautop fixture files.
+-   Remove non-functional custom taxonomies meta boxes.
+-   Remove is- prefix from embed alignment class.
+-   Switch get_locale() to get_user_locale().
+-   Remove unnecessary $current_screen code.
+-   Reduce duplication in 'No saved blocks' and 'No blocks found' component messages.
+-   Include string extraction in production build.
+-   Add deprecation helper functions for consistent messaging.
+-   Improve string cast render test.
+-   Add Gutenberg svg to docs.
+-   Add documentation describing block transforms.
+-   Add documentation for nested template definitions.
+-   Add documentation for registering sidebar APIs. Move them to extensibility docs.
+-   Update WordPress packages to the latest versions.
 
 = 2.2.0 =
 
-* Block Nesting is live! It comes with an experimental Columns block. (Note: converting a nested block into a reusable block is disabled on this first version.) Furthermore, this is not a specific implementation for columns alone — any block author can take advantage of defining nested areas.
-* Refined block insertion experience:
-* Introduce block shortcuts on every empty paragraph block. This also temporarily disables the sibling inserter as we work on refining this interaction.
-* Add trailing text area at the bottom of a post to continue writing.
-* Preview saved blocks while hovering on the inserter. Allows users to quickly see what they are inserting before inserting.
-* Enable triggering onChange events within RichText component on every keystroke. This was an enforced limitation that prevented saved post checks from being faithful.
-* Rework undo levels to use history "buffer" and leverage the mechanism to aid in continuous syncing of RichText history records.
-* Collapse the publish sidebar when making edits to a published post automatically.
-* Improve writing flow by triggering isTyping mode as soon as the user clicks on the default text appender.
-* Hide hover effects when typing.
-* Add a confirmation message before reverting a published post to draft.
-* When using the inserter, replace the selected block if it's empty.
-* Display reusable blocks in the "recent blocks" tab.
-* Make sure blue line indicators appear consistently when using dropzones.
-* Ensure that hitting enter at the end of a paragraph creates an empty paragraph when using RichText.
-* Ensure the block settings menu and the block movers are shown when the default block is selected and user is not typing.
-* Deselect individual gallery images when clicking outside the block or selecting another image.
-* Add support for setting a page template.
-* Add support for individual image captions in galleries.
-* Add support for saving a post with Cmd/Ctrl+S shortcuts. This is possible after these RichText changes.
-* Support unwrapped paragraph text via native block deprecation mechanism. (Ensures paragraphs without p tags are correctly interpreted.) Also readdresses code that was applying autop selectively on the server for posts made with gutenberg as it is handled at the block level when needed.
-* Add raw handling (pasting mechanism) for iframes (e.g. Google Maps).
-* Allow WP to make images responsive via class.
-* Drop focus/setFocus props in favor of isSelected prop.
-* New PlainText component for raw content that is styled as editable text. Renamed Editable to RichText for extra clarity and separation.
-* Add RawHTML component, drop support for HTML string block save.
-* Absorb multiple-image uploads in generic image placeholder component and reuse it for galleries.
-* Refactor Default Colors and the ColorPalette component. Moves the default colors to the frontend making the Editor script more reusable without the need of the server-side bootstraping.
-* Reimplement block alignment as a common extension.
-* Use block API functions in reusable block effects.
-* Check for duplication in addGeneratedClassName.
-* Assign default for all allowed blockTypes.
-* Update ToggleControl to pass boolean onChange.
-* Add withSafeTimeout higher-order component.
-* Expose getEditedPostAttribute selector.
-* Move selected block focus to BlockListBlock.
-* Allow themes to disable custom color functionality across blocks.
-* Added slug selector to data modules collection.
-* Defer registration of all core blocks until editor loads. Generally useful for extensibility hooks.
-* Add a subscribe function to the editor data module. Also, separate reducers into multiple stores to avoid unallowed access to the actions.
-* Support multiple stores in data module for the redux dev tools.
-* Expose registered selectors as functions.
-* Remove Popover isOpen prop, render by presence.
-* Fix issue with store persistence and switching to fixed toolbar.
-* Fix issue with formatting toolbar hover.
-* Fix block menu render when multi-selecting.
-* Fix TinyMCE custom buttons width in Classic block.
-* Fix sidebar tab admin theme regression.
-* Fix center alignment on resized images.
-* Fix some float issues.
-* Fix type error when merging blocks.
-* Fix regression when converting gallery from shortcode.
-* Fix unset variable in meta-boxes functions.
-* Fix code error in blocks-control.md.
-* Fix loss of focus when navigating from multi-selection.
-* Fix scrollbars on blank preview loading screen.
-* Fix broken nested lists and Evernote test in pasting functionality.
-* Fix lingering dropzone placeholder at the end of the editor.
-* Fix Button block line break presentation.
-* Fix lingering visual editor classes.
-* Fix codepen embeds width.
-* Fix merging blocks after nested blocks refactoring.
-* Fix Cypress path checks to allow sub-directory.
-* Fix error when pasting image inside caption.
-* Fix some issues when pasting from Word.
-* Fix bug when pasting content with custom styles in a paragraph block.
-* Fix image caption select behaviour.
-* Fix broken nested content caused by overly aggressive cache.
-* Fix issue with comments and pingbacks being set to off on new posts.
-* Fix regression with RichText placeholder whitespace.
-* Fix incorrect directory to load text domain.
-* Fix issue with quote to heading transformation.
-* Fix focus transfer between citation and content.
-* Fix gallery link attribute selector.
-* Attempt to correct Slack's Markdown code block variant.
-* Disable customClassName support on Classic block.
-* Avoid autofocus behavior for blocks without focusable elements.
-* Ignore focus if explicitOriginalTarget is not node (Firefox issue).
-* Extract "edit-post" to its own module — this is preparation work for the eventual template editor in v2 onwards.
-* Remove redundant handling of inserter position, simplifying the implementation for nesting.
-* Prioritize specific block handling over generic shortcode catch-all transform.
-* Avoid running a full-parse when rendering a post, instead only intercepting dynamic blocks to handle their callbacks.
-* Ensure string return value from render_callback.
-* Avoid parameters in memoized selectors getDependants.
-* Guard against falsey block container in WritingFlow.
-* Refactor BlockList to use minimal block UIDs array.
-* Pass selection start as UID in BlockList to prevent unnecessary rerenders.
-* Refactor TableOfContents panel to separate component for performance improvements.
-* Restore new post setup as non-dirtying change. This resolves an issue where saving a new post which has an empty title will set the title as "Auto Draft".
-* Center spinner when images are loading in the gallery block.
-* Use isTypingInBlock to avoid unnecessary block rerenders.
-* Add the i18n messages to the built plugin.
-* General design improvements to the full-post code editor. Also removes the dummy quicktag buttons that were non-functional.
-* Only start multi selection from inside the content.
-* Cache columns layouts configurations.
-* General polish to the Classic block and some quote block style errors.
-* Remove wrapper from image raw transform and added tests.
-* Make sure reusable blocks models exist before initializing.
-* Persist withFocusOutside event for async usage.
-* Pass selected block UID as string on WritingFlow.
-* Add label to range control.
-* Remove throttling inputs on RichText.
-* Replace global hover state with local component state. This reduces excesive dispatching of mouse events.
-* Simplify Editor State initialization using a single action to fix undo/redo initialization.
-* Access state paths directly in selector dependants for getBlock.
-* Refactor insertion point to include rootUID and layout.
-* Set new post status to draft in initialization.
-* Strip comment demarcations in content filtering for the front-end after refactoring work.
-* Improve presentation of List block.
-* Optimize getMultiSelectedBlocks by returning shared array reference in empty multi-selection.
-* Increase maximum number of recent blocks to nine in order to accommodate the current design.
-* Avoid cases of rerendering when the previous or next block updates.
-* Restore missing selectionStart props in BlockList.
-* Improve edit and insert link label display.
-* Extract copy and scroll-into-view logic to separate non-visual components in BlockList.
-* Make sure that styles do not contain duplicates in development mode.
-* Use trivial block count check to determine emptiness.
-* Use proper labels provided by the rest API on taxonomies.
-* Use menu order to order pages in the parent page dropdown.
-* Persist link attribute to fix invalid galleries.
-* Update the Dashicons component with new icons.
-* Use correct label on Featured Image Panel.
-* Small improvement to the meta-box partial page file.
-* Delete unused global import in gutenberg_menu function.
-* Improve serialize persistence action name.
-* Improve logic around replacing the editor in PHP.
-* Improve consistency of tooltips text.
-* Improve sandbox component readme.
-* Improve gutenberg_intercept_* functions.
-* Improve "Add New" button logic.
-* Revert updates giving Meta Boxes' #poststuff div a broader scope.
-* Simplify "New Post" button logic.
-* Simplify scripts registration.
-* Replace focus with isSelected verification on hooks.
-* Automate memoized selector setup clear.
-* Consolidate module build JS, CSS, map inclusion.
-* Remove unused code after WP 4.9.
-* Update deprecated BlockDescription in Subhead.
-* Add doc explaining the deprecated block API. (Handbook.)
-* Add doc for Editable component (now RichText).
-* Document block validation, clarify extensibility validation.
-* JSDoc: prefer @return over @retuns.
-* Integrate dependencies from WordPress packages. Brings wp-scriptsinto gutenberg.
-* Move components in wp.blocks.InspectorControls to wp.components.
-* Add lint:fix ESLint "fix" npm script.
-* Add an eslint --fix Git precommit hook.
-* Add reusable block render tests.
-* Add tests for ContrastChecker component.
-* Add more details about unit testing JavaScript code.
-* Add mention to create-guten-block repo.
-* Add partial test coverage to RichText component.
-* Add first version of repository management doc.
-* Assign preferred JSDoc tags and types.
-* Assign edit-post global as wp.editPost.
-* Assign explicit user for Docker WordPress install in tests.
-* Mention installing docker-compose in local dev setup.
-* Update refx to version 3.x.
-* Update memize and rememo dependencies.
-* Code is Poetry footer to main readme.
+-   Block Nesting is live! It comes with an experimental Columns block. (Note: converting a nested block into a reusable block is disabled on this first version.) Furthermore, this is not a specific implementation for columns alone — any block author can take advantage of defining nested areas.
+-   Refined block insertion experience:
+-   Introduce block shortcuts on every empty paragraph block. This also temporarily disables the sibling inserter as we work on refining this interaction.
+-   Add trailing text area at the bottom of a post to continue writing.
+-   Preview saved blocks while hovering on the inserter. Allows users to quickly see what they are inserting before inserting.
+-   Enable triggering onChange events within RichText component on every keystroke. This was an enforced limitation that prevented saved post checks from being faithful.
+-   Rework undo levels to use history "buffer" and leverage the mechanism to aid in continuous syncing of RichText history records.
+-   Collapse the publish sidebar when making edits to a published post automatically.
+-   Improve writing flow by triggering isTyping mode as soon as the user clicks on the default text appender.
+-   Hide hover effects when typing.
+-   Add a confirmation message before reverting a published post to draft.
+-   When using the inserter, replace the selected block if it's empty.
+-   Display reusable blocks in the "recent blocks" tab.
+-   Make sure blue line indicators appear consistently when using dropzones.
+-   Ensure that hitting enter at the end of a paragraph creates an empty paragraph when using RichText.
+-   Ensure the block settings menu and the block movers are shown when the default block is selected and user is not typing.
+-   Deselect individual gallery images when clicking outside the block or selecting another image.
+-   Add support for setting a page template.
+-   Add support for individual image captions in galleries.
+-   Add support for saving a post with Cmd/Ctrl+S shortcuts. This is possible after these RichText changes.
+-   Support unwrapped paragraph text via native block deprecation mechanism. (Ensures paragraphs without p tags are correctly interpreted.) Also readdresses code that was applying autop selectively on the server for posts made with gutenberg as it is handled at the block level when needed.
+-   Add raw handling (pasting mechanism) for iframes (e.g. Google Maps).
+-   Allow WP to make images responsive via class.
+-   Drop focus/setFocus props in favor of isSelected prop.
+-   New PlainText component for raw content that is styled as editable text. Renamed Editable to RichText for extra clarity and separation.
+-   Add RawHTML component, drop support for HTML string block save.
+-   Absorb multiple-image uploads in generic image placeholder component and reuse it for galleries.
+-   Refactor Default Colors and the ColorPalette component. Moves the default colors to the frontend making the Editor script more reusable without the need of the server-side bootstraping.
+-   Reimplement block alignment as a common extension.
+-   Use block API functions in reusable block effects.
+-   Check for duplication in addGeneratedClassName.
+-   Assign default for all allowed blockTypes.
+-   Update ToggleControl to pass boolean onChange.
+-   Add withSafeTimeout higher-order component.
+-   Expose getEditedPostAttribute selector.
+-   Move selected block focus to BlockListBlock.
+-   Allow themes to disable custom color functionality across blocks.
+-   Added slug selector to data modules collection.
+-   Defer registration of all core blocks until editor loads. Generally useful for extensibility hooks.
+-   Add a subscribe function to the editor data module. Also, separate reducers into multiple stores to avoid unallowed access to the actions.
+-   Support multiple stores in data module for the redux dev tools.
+-   Expose registered selectors as functions.
+-   Remove Popover isOpen prop, render by presence.
+-   Fix issue with store persistence and switching to fixed toolbar.
+-   Fix issue with formatting toolbar hover.
+-   Fix block menu render when multi-selecting.
+-   Fix TinyMCE custom buttons width in Classic block.
+-   Fix sidebar tab admin theme regression.
+-   Fix center alignment on resized images.
+-   Fix some float issues.
+-   Fix type error when merging blocks.
+-   Fix regression when converting gallery from shortcode.
+-   Fix unset variable in meta-boxes functions.
+-   Fix code error in blocks-control.md.
+-   Fix loss of focus when navigating from multi-selection.
+-   Fix scrollbars on blank preview loading screen.
+-   Fix broken nested lists and Evernote test in pasting functionality.
+-   Fix lingering dropzone placeholder at the end of the editor.
+-   Fix Button block line break presentation.
+-   Fix lingering visual editor classes.
+-   Fix codepen embeds width.
+-   Fix merging blocks after nested blocks refactoring.
+-   Fix Cypress path checks to allow sub-directory.
+-   Fix error when pasting image inside caption.
+-   Fix some issues when pasting from Word.
+-   Fix bug when pasting content with custom styles in a paragraph block.
+-   Fix image caption select behaviour.
+-   Fix broken nested content caused by overly aggressive cache.
+-   Fix issue with comments and pingbacks being set to off on new posts.
+-   Fix regression with RichText placeholder whitespace.
+-   Fix incorrect directory to load text domain.
+-   Fix issue with quote to heading transformation.
+-   Fix focus transfer between citation and content.
+-   Fix gallery link attribute selector.
+-   Attempt to correct Slack's Markdown code block variant.
+-   Disable customClassName support on Classic block.
+-   Avoid autofocus behavior for blocks without focusable elements.
+-   Ignore focus if explicitOriginalTarget is not node (Firefox issue).
+-   Extract "edit-post" to its own module — this is preparation work for the eventual template editor in v2 onwards.
+-   Remove redundant handling of inserter position, simplifying the implementation for nesting.
+-   Prioritize specific block handling over generic shortcode catch-all transform.
+-   Avoid running a full-parse when rendering a post, instead only intercepting dynamic blocks to handle their callbacks.
+-   Ensure string return value from render_callback.
+-   Avoid parameters in memoized selectors getDependants.
+-   Guard against falsey block container in WritingFlow.
+-   Refactor BlockList to use minimal block UIDs array.
+-   Pass selection start as UID in BlockList to prevent unnecessary rerenders.
+-   Refactor TableOfContents panel to separate component for performance improvements.
+-   Restore new post setup as non-dirtying change. This resolves an issue where saving a new post which has an empty title will set the title as "Auto Draft".
+-   Center spinner when images are loading in the gallery block.
+-   Use isTypingInBlock to avoid unnecessary block rerenders.
+-   Add the i18n messages to the built plugin.
+-   General design improvements to the full-post code editor. Also removes the dummy quicktag buttons that were non-functional.
+-   Only start multi selection from inside the content.
+-   Cache columns layouts configurations.
+-   General polish to the Classic block and some quote block style errors.
+-   Remove wrapper from image raw transform and added tests.
+-   Make sure reusable blocks models exist before initializing.
+-   Persist withFocusOutside event for async usage.
+-   Pass selected block UID as string on WritingFlow.
+-   Add label to range control.
+-   Remove throttling inputs on RichText.
+-   Replace global hover state with local component state. This reduces excesive dispatching of mouse events.
+-   Simplify Editor State initialization using a single action to fix undo/redo initialization.
+-   Access state paths directly in selector dependants for getBlock.
+-   Refactor insertion point to include rootUID and layout.
+-   Set new post status to draft in initialization.
+-   Strip comment demarcations in content filtering for the front-end after refactoring work.
+-   Improve presentation of List block.
+-   Optimize getMultiSelectedBlocks by returning shared array reference in empty multi-selection.
+-   Increase maximum number of recent blocks to nine in order to accommodate the current design.
+-   Avoid cases of rerendering when the previous or next block updates.
+-   Restore missing selectionStart props in BlockList.
+-   Improve edit and insert link label display.
+-   Extract copy and scroll-into-view logic to separate non-visual components in BlockList.
+-   Make sure that styles do not contain duplicates in development mode.
+-   Use trivial block count check to determine emptiness.
+-   Use proper labels provided by the rest API on taxonomies.
+-   Use menu order to order pages in the parent page dropdown.
+-   Persist link attribute to fix invalid galleries.
+-   Update the Dashicons component with new icons.
+-   Use correct label on Featured Image Panel.
+-   Small improvement to the meta-box partial page file.
+-   Delete unused global import in gutenberg_menu function.
+-   Improve serialize persistence action name.
+-   Improve logic around replacing the editor in PHP.
+-   Improve consistency of tooltips text.
+-   Improve sandbox component readme.
+-   Improve gutenberg*intercept*\* functions.
+-   Improve "Add New" button logic.
+-   Revert updates giving Meta Boxes' #poststuff div a broader scope.
+-   Simplify "New Post" button logic.
+-   Simplify scripts registration.
+-   Replace focus with isSelected verification on hooks.
+-   Automate memoized selector setup clear.
+-   Consolidate module build JS, CSS, map inclusion.
+-   Remove unused code after WP 4.9.
+-   Update deprecated BlockDescription in Subhead.
+-   Add doc explaining the deprecated block API. (Handbook.)
+-   Add doc for Editable component (now RichText).
+-   Document block validation, clarify extensibility validation.
+-   JSDoc: prefer @return over @retuns.
+-   Integrate dependencies from WordPress packages. Brings wp-scriptsinto gutenberg.
+-   Move components in wp.blocks.InspectorControls to wp.components.
+-   Add lint:fix ESLint "fix" npm script.
+-   Add an eslint --fix Git precommit hook.
+-   Add reusable block render tests.
+-   Add tests for ContrastChecker component.
+-   Add more details about unit testing JavaScript code.
+-   Add mention to create-guten-block repo.
+-   Add partial test coverage to RichText component.
+-   Add first version of repository management doc.
+-   Assign preferred JSDoc tags and types.
+-   Assign edit-post global as wp.editPost.
+-   Assign explicit user for Docker WordPress install in tests.
+-   Mention installing docker-compose in local dev setup.
+-   Update refx to version 3.x.
+-   Update memize and rememo dependencies.
+-   Code is Poetry footer to main readme.
 
 = 2.1.0 =
 
-* Iterate on the design of up/down arrows and how focus is managed. This seeks to further reduce the visual and cognitive weight of the up/down movers.
-* Show immediate visual feedback when dragging and dropping images into the editor. (Expands on the previous release work.)
-* Expose state through data module using selectors. This is an important piece of the extensibility puzzle.
-* New button outline and focus styles.
-* Show original block icon after converting to reusable block. Also hides the generic reusable block from inserters. This moves data logic out of the inserter.
-* Introduce a migration function for block versioning.
-* Add HTML handler to dropzone. Allows drag and dropping images from other web pages directly.
-* Trigger typing mode when ENTER or BACKSPACE are pressed. This improves the writing flow but engaging the UI-less mode more frequently.
-* Added ability to align the text content of a cover image to the right, left, or center of the image.
-* Refactor CopyContentButton as a core extension to illustrate how to add functionality to the editor outside of blocks.
-* Allow collapsing/sorting meta-boxes panels.
-* Remove dirty-checking from meta-boxes state, fixes issues with default values and updating certain text fields.
-* Defer registration of all core blocks until editor loads. Improves ability to hook into registerBlockType.
-* Only trigger select block action when block is unselected.
-* Try new markup for Galleries using lists.
-* Try new subheading editorial block.
-* Reduce sibling inserter initial height.
-* Force an update when a new filter is added or removed while using withFilters higher-order component. This improves the rendering flow of filters.
-* Refactor the MediaUploadButton to be agnostic to its rendered UI.
-* Change "size" label to "level" in Heading block settings.
-* Remove breaking spaces logic on List block.
-* Update progress button color state based on theme used.
-* Update Video block description.
-* Refactor the multi-selection behavior to dispatch the multi-selection start action only after the cursor begins to move after a mousedown event.
-* Avoid persisting mobile and publish sidebars.
-* Move drag handling to instance-bound handler.
-* Remove "Open in new window" link option.
-* Use username slug instead of name and remove ephemeral link from it.
-* Ensure isLoading set to false after request error.
-* Allow copying individual text from a block that is not purely text without copying the whole block.
-* Match consistency of tooltip text with Classic Editor.
-* Fix issue with Lists having additional lines when used in a reusable block.
-* Fix errors when adding duplicate tags.
-* Fix inconsistency with applyOrUnset().
-* Fix incorrect display when loading a saved block with no content.
-* Fix issue where black rectangle would briefly blink on new paragraphs.
-* Fix cursor jumps in link-editing dialog.
-* Fix post content validation.
-* Fix scrolling issues around nav menus.
-* Remove Vine embed support as it's no longer supported.
-* Ensure editor still exists after timeout.
-* Add regression check for block edit interface using snapshots.
-* Add missing alt attributes to image (and gallery) blocks when alt returns an empty value.
-* Better build tools with Docker.
-* Register Gutenberg scripts & styles before enqueuing.
-* Force wp-api.js to use HTTP/1.0 for better compatibility.
-* Avoid the deprecated (from 5.0 to 5.2) is_a() function.
-* Remove unused dependency.
-* Update contributing instructions with steps.
-* Consistency cleanup in doc return statements.
-* Include how to assign a template to a default Post Type in the documentation. Also add more context to the code.
-* Improve incremental development build performance by only minimizing -rtl files for production builds.
-* More JSDoc fixes.
-* Remove warning from plugin header.
-* Add new page explaining how to create a block using WP-CLI.
-* Add security reporting instructions.
-* Improve useOnce documentation.
-* Bump copyright year to 2018 in license.md.
-* Disable Travis branch builds except for trunk.
+-   Iterate on the design of up/down arrows and how focus is managed. This seeks to further reduce the visual and cognitive weight of the up/down movers.
+-   Show immediate visual feedback when dragging and dropping images into the editor. (Expands on the previous release work.)
+-   Expose state through data module using selectors. This is an important piece of the extensibility puzzle.
+-   New button outline and focus styles.
+-   Show original block icon after converting to reusable block. Also hides the generic reusable block from inserters. This moves data logic out of the inserter.
+-   Introduce a migration function for block versioning.
+-   Add HTML handler to dropzone. Allows drag and dropping images from other web pages directly.
+-   Trigger typing mode when ENTER or BACKSPACE are pressed. This improves the writing flow but engaging the UI-less mode more frequently.
+-   Added ability to align the text content of a cover image to the right, left, or center of the image.
+-   Refactor CopyContentButton as a core extension to illustrate how to add functionality to the editor outside of blocks.
+-   Allow collapsing/sorting meta-boxes panels.
+-   Remove dirty-checking from meta-boxes state, fixes issues with default values and updating certain text fields.
+-   Defer registration of all core blocks until editor loads. Improves ability to hook into registerBlockType.
+-   Only trigger select block action when block is unselected.
+-   Try new markup for Galleries using lists.
+-   Try new subheading editorial block.
+-   Reduce sibling inserter initial height.
+-   Force an update when a new filter is added or removed while using withFilters higher-order component. This improves the rendering flow of filters.
+-   Refactor the MediaUploadButton to be agnostic to its rendered UI.
+-   Change "size" label to "level" in Heading block settings.
+-   Remove breaking spaces logic on List block.
+-   Update progress button color state based on theme used.
+-   Update Video block description.
+-   Refactor the multi-selection behavior to dispatch the multi-selection start action only after the cursor begins to move after a mousedown event.
+-   Avoid persisting mobile and publish sidebars.
+-   Move drag handling to instance-bound handler.
+-   Remove "Open in new window" link option.
+-   Use username slug instead of name and remove ephemeral link from it.
+-   Ensure isLoading set to false after request error.
+-   Allow copying individual text from a block that is not purely text without copying the whole block.
+-   Match consistency of tooltip text with Classic Editor.
+-   Fix issue with Lists having additional lines when used in a reusable block.
+-   Fix errors when adding duplicate tags.
+-   Fix inconsistency with applyOrUnset().
+-   Fix incorrect display when loading a saved block with no content.
+-   Fix issue where black rectangle would briefly blink on new paragraphs.
+-   Fix cursor jumps in link-editing dialog.
+-   Fix post content validation.
+-   Fix scrolling issues around nav menus.
+-   Remove Vine embed support as it's no longer supported.
+-   Ensure editor still exists after timeout.
+-   Add regression check for block edit interface using snapshots.
+-   Add missing alt attributes to image (and gallery) blocks when alt returns an empty value.
+-   Better build tools with Docker.
+-   Register Gutenberg scripts & styles before enqueuing.
+-   Force wp-api.js to use HTTP/1.0 for better compatibility.
+-   Avoid the deprecated (from 5.0 to 5.2) is_a() function.
+-   Remove unused dependency.
+-   Update contributing instructions with steps.
+-   Consistency cleanup in doc return statements.
+-   Include how to assign a template to a default Post Type in the documentation. Also add more context to the code.
+-   Improve incremental development build performance by only minimizing -rtl files for production builds.
+-   More JSDoc fixes.
+-   Remove warning from plugin header.
+-   Add new page explaining how to create a block using WP-CLI.
+-   Add security reporting instructions.
+-   Improve useOnce documentation.
+-   Bump copyright year to 2018 in license.md.
+-   Disable Travis branch builds except for trunk.
 
 = 2.0.0 =
 
-* Replace publish dropdown menu with a sidebar panel.
-* Expand latest post blocks with more querying options — order by and category.
-* Allow dragging multiple images to create a gallery.
-* Improve markdown pasting (allows lists to be interpreted).
-* Allow pasting copied images directly.
-* Pasting within lists and headings.
-* Improve handling of inline spans.
-* Allow copying a single block.
-* Make sure inline pasting mechanism does not take place if pasting shortcodes.
-* Preserve alignment classes during raw transformations (like pasting an old WordPress post).
-* Support shortcode synonyms.
-* Allow continued writing when pressing down arrow at the end of a post.
-* Mobile design: move block controls to the bottom of a block.
-* Allow deleting reusable blocks globally.
-* Display description and type on the sidebar. (Also replace BlockDescription component with a property.)
-* New table of contents and document counts design.
-* Add button to copy the full document quickly.
-* Expand inserter to three columns and a wider container.
-* Allow using down-arrow keys directly to navigate when searching a block in the inserter.
-* Deselect images in Gallery block when losing focus.
-* Include post title in document outline feature.
-* Rework display of notices and address various issues with overlaps.
-* Added keyboard shortcut to toggle editor mode. Also displays the relevant keyboard combination next to the menu item.
-* Improve deleting empty paragraphs when backspacing into a block that has no merge function (example, deleting a paragraph after an image).
-* Improve the way scroll-position is updated when moving a block.
-* Show block transformations in ellipsis menu.
-* Add drag and drop support for cover image.
-* Allow transforming operations between Heading and Cover Image blocks.
-* Add focus outline for blocks that don't have focusable fields.
-* Allow both navigation orientations in NavigableContainer.
-* Improve the behavior of focusing embed blocks.
-* Unify UI of audio and video blocks.
-* Show message on the inserter when no blocks are found.
-* Show message when no saved blocks are available.
-* Do not show the publish panel when updating / scheduling / submitting a post.
-* Update quote style in front-end.
-* Convert text columns to a div using grid layout.
-* Update button block CSS and add class to link.
-* Allow text in Button block to wrap.
-* Prevent useOnce blocks from being inserted using the convenient blocks shortcut menu.
-* Show correct symbol (⌘ or Ctrl) depending on system context.
-* Rename "insert" to "add" in the UI.
-* Clear block selection when opening sibling or bottom inserter.
-* Always show the insertion point when the inserter is opened.
-* Increase padding on "more options" block toggle.
-* Rename "Classic Text" to "Classic".
-* Improve display of dotted outline around reusable blocks.
-* Updated messages around reusable blocks interactions.
-* Align both the quote and the citation in the visual editor.
-* Exit edit mode when unfocusing a reusable block.
-* Set floated image width (when unresized) in % value.
-* Add withState higher-order component.
-* Initial introduction of wp.data module.
-* Restrict the state access to the module registering the reducer only.
-* Refactor PostSchedule to make Calendar and Clock available as reusable components.
-* Allow overwriting colors (defaults and theme provided) when consuming ColorPalette component.
-* Switch orientation of popover component only if there is more space for the new position.
-* New ImagePlaceholder reusable component that handles upload buttons and draggable areas for the block author.
-* Add speak message when a category is added.
-* Announce notices to assertive technologies with speak.
-* Add aria-labels to Code and HTML blocks.
-* Warn if multiple h1 headings are being used.
-* Add speak message and make "block settings" button label dynamic.
-* Make excerpt functionality more accessible.
-* Add various headings around editor areas for screen-readers.
-* Improve accessibility of menu items in the main ellipsis menu.
-* Add missing tooltips to icon buttons.
-* Render toolbar always by the block on mobile.
-* Improve performance of responsive calculations using matchMedia.
-* Avoid shifts around toolbar and scrolling issues on mobile.
-* Improve how the fixed-to-block toolbar looks on mobile. Change how the fixed position toolbars behave, making them sticky.
-* Prevent Mobile Safari from zooming the entire page when you open the inserter.
-* Initial explorations to migrate to server-registered blocks as part of raising awareness of available blocks.
-* Move supportHTML property into the general "support" object.
-* Replace getLatestPosts usage with withAPIData HOC.
-* Convert all filters for components to behave like HOCs (withFilters).
-* Replace flowRight usage with compose for HOCs.
-* Apply filters without function wrappers.
-* Improve Tags/Categories response size by limiting the requested fields.
-* Limit requested fields in category feature of "latest posts".
-* Request only required post fields in latest posts.
-* Replace getCategories usage with withAPIData component.
-* Don't show fields that are not used in media modal when adding a featured image.
-* Polish inserter tabs so the focus style isn't clipped.
-* Make inspector controls available when categories are loading.
-* Improve overlay over meta-boxes during save operations.
-* Hide excerpts panel if not supported by the CPT.
-* Hide Taxonomies panel if no taxonomy is available for the current CPT.
-* Hide several other panels when the CPT doesn't support them.
-* Use _.includes to find available taxonomies. Mitigates non-schema-conforming taxonomy registrations.
-* Defer applying filters for component until it is about to be mounted.
-* Prevent "Add New" dropdown from overriding other plugin functionality.
-* Improve paragraph block description.
-* Refactor to simplify block toolbar rendering.
-* Add missing aligment classes to cover image.
-* Add parent page dropdown to page attributes panel.
-* Allow pressing ENTER to change Reusable Block name.
-* Disable HTML mode for reusable blocks.
-* Add support for the "advanced" meta-box location.
-* Make sure super admins can publish in any site of the network.
-* Rename theme support for wide images to align-wide.
-* Move selectors and actions files to the store folder.
-* Center arrows of popovers relative to their parent.
-* Use fainter disabled state.
-* Add breakpoint grid to latest posts block and update color of date.
-* Move logic for auto-generating the block class name to BlockEdit.
-* Respect the "enter_title_here" hook.
-* Prevent meta-box hooks from running multiple times.
-* Don't set font-family on pullquotes.
-* Remove superfluous parentheses from include statements.
-* Remove redundant CSS property updates.
-* Use "columns-x" class only for grid layout in latest posts.
-* Use flatMap for mapping toolbar controls for a small performance gain.
-* Introduce jest matchers for console object.
-* Updated various npm packages; update Jest. Update node-sass. Update WordPress packages.
-* Switch TinyMCE to unpkg.
-* Reorganize handbook docs navigation.
-* Added FAQ section for meta-boxes compatibility.
-* Added initial "templates" document.
-* Add documentation about dynamic blocks.
-* Updated "outreach" docs.
-* Improve block-controls document.
-* Display a hint that files need to be built.
-* Add WordPress JSDoc ESLint configuration.
-* Update licenses in package.json & composer.json to adhere to SPDX v3.0 specification.
-* Add tests to cover REQUEST_POST_UPDATE_SUCCESS effect.
-* Add tests for color palette component.
-* Add tests for Editable.getSettings and adaptFormatter.
-* Use newly published jest-console package in test setup.
-* Update info about test fixtures generation.
-* Also style footer in quote blocks to ensure backwards compatibility.
-* Add a PHPUnit Docker Container.
-* Fix wrong "return to editor" link when comparing revisions.
-* Fix error when pressing enter from a heading block.
-* Fix error with merging lists into paragraphs.
-* Fix revisions button target area.
-* Remove duplicated styles.
-* Fix z-index rebase issues.
-* Fix tag name warning ordering in validation.
-* Fix text encoding of titles in url-input.
-* Fix endless loop in reusable blocks code.
-* Fix edit button in Audio block using invalid buttonProps attribute.
-* Fix block creation with falsey default attribute.
-* Fix radio control checked property.
-* Fix styling issues of blocks when they are used as part of a reusable block.
-* Fix list wrapping issues.
-* Fix problem when converting shortcodes due to sorting.
-* Fix issue with time-picker not working.
-* Fix hide advanced settings interaction in block menu.
-* Fix issue with url input on images.
-* Fix style regression in textual placeholder on cover image.
-* Fix return type hint in gutenberg_get_rest_link().
-* Fix bug when changing number of Latests Posts rapidly was leading to some numbers being defunct.
-* Fix isInputField check and add tests.
-* Fix unsetting block alignment flagging block as invalid.
-* Fix CSS bleed from admin-specific gallery styles.
-* Fix image handlers at the top from being unclickable.
-* Fix unexpected keyboard navigations behaviour on some nodes.
-* Fix inserter position for floated blocks.
-* Fix bug on empty cover image placeholder used on a saved block.
-* Fix errors when adding duplicate categories.
-* Fix broken custom color bubble in ColorPalette.
+-   Replace publish dropdown menu with a sidebar panel.
+-   Expand latest post blocks with more querying options — order by and category.
+-   Allow dragging multiple images to create a gallery.
+-   Improve markdown pasting (allows lists to be interpreted).
+-   Allow pasting copied images directly.
+-   Pasting within lists and headings.
+-   Improve handling of inline spans.
+-   Allow copying a single block.
+-   Make sure inline pasting mechanism does not take place if pasting shortcodes.
+-   Preserve alignment classes during raw transformations (like pasting an old WordPress post).
+-   Support shortcode synonyms.
+-   Allow continued writing when pressing down arrow at the end of a post.
+-   Mobile design: move block controls to the bottom of a block.
+-   Allow deleting reusable blocks globally.
+-   Display description and type on the sidebar. (Also replace BlockDescription component with a property.)
+-   New table of contents and document counts design.
+-   Add button to copy the full document quickly.
+-   Expand inserter to three columns and a wider container.
+-   Allow using down-arrow keys directly to navigate when searching a block in the inserter.
+-   Deselect images in Gallery block when losing focus.
+-   Include post title in document outline feature.
+-   Rework display of notices and address various issues with overlaps.
+-   Added keyboard shortcut to toggle editor mode. Also displays the relevant keyboard combination next to the menu item.
+-   Improve deleting empty paragraphs when backspacing into a block that has no merge function (example, deleting a paragraph after an image).
+-   Improve the way scroll-position is updated when moving a block.
+-   Show block transformations in ellipsis menu.
+-   Add drag and drop support for cover image.
+-   Allow transforming operations between Heading and Cover Image blocks.
+-   Add focus outline for blocks that don't have focusable fields.
+-   Allow both navigation orientations in NavigableContainer.
+-   Improve the behavior of focusing embed blocks.
+-   Unify UI of audio and video blocks.
+-   Show message on the inserter when no blocks are found.
+-   Show message when no saved blocks are available.
+-   Do not show the publish panel when updating / scheduling / submitting a post.
+-   Update quote style in front-end.
+-   Convert text columns to a div using grid layout.
+-   Update button block CSS and add class to link.
+-   Allow text in Button block to wrap.
+-   Prevent useOnce blocks from being inserted using the convenient blocks shortcut menu.
+-   Show correct symbol (⌘ or Ctrl) depending on system context.
+-   Rename "insert" to "add" in the UI.
+-   Clear block selection when opening sibling or bottom inserter.
+-   Always show the insertion point when the inserter is opened.
+-   Increase padding on "more options" block toggle.
+-   Rename "Classic Text" to "Classic".
+-   Improve display of dotted outline around reusable blocks.
+-   Updated messages around reusable blocks interactions.
+-   Align both the quote and the citation in the visual editor.
+-   Exit edit mode when unfocusing a reusable block.
+-   Set floated image width (when unresized) in % value.
+-   Add withState higher-order component.
+-   Initial introduction of wp.data module.
+-   Restrict the state access to the module registering the reducer only.
+-   Refactor PostSchedule to make Calendar and Clock available as reusable components.
+-   Allow overwriting colors (defaults and theme provided) when consuming ColorPalette component.
+-   Switch orientation of popover component only if there is more space for the new position.
+-   New ImagePlaceholder reusable component that handles upload buttons and draggable areas for the block author.
+-   Add speak message when a category is added.
+-   Announce notices to assertive technologies with speak.
+-   Add aria-labels to Code and HTML blocks.
+-   Warn if multiple h1 headings are being used.
+-   Add speak message and make "block settings" button label dynamic.
+-   Make excerpt functionality more accessible.
+-   Add various headings around editor areas for screen-readers.
+-   Improve accessibility of menu items in the main ellipsis menu.
+-   Add missing tooltips to icon buttons.
+-   Render toolbar always by the block on mobile.
+-   Improve performance of responsive calculations using matchMedia.
+-   Avoid shifts around toolbar and scrolling issues on mobile.
+-   Improve how the fixed-to-block toolbar looks on mobile. Change how the fixed position toolbars behave, making them sticky.
+-   Prevent Mobile Safari from zooming the entire page when you open the inserter.
+-   Initial explorations to migrate to server-registered blocks as part of raising awareness of available blocks.
+-   Move supportHTML property into the general "support" object.
+-   Replace getLatestPosts usage with withAPIData HOC.
+-   Convert all filters for components to behave like HOCs (withFilters).
+-   Replace flowRight usage with compose for HOCs.
+-   Apply filters without function wrappers.
+-   Improve Tags/Categories response size by limiting the requested fields.
+-   Limit requested fields in category feature of "latest posts".
+-   Request only required post fields in latest posts.
+-   Replace getCategories usage with withAPIData component.
+-   Don't show fields that are not used in media modal when adding a featured image.
+-   Polish inserter tabs so the focus style isn't clipped.
+-   Make inspector controls available when categories are loading.
+-   Improve overlay over meta-boxes during save operations.
+-   Hide excerpts panel if not supported by the CPT.
+-   Hide Taxonomies panel if no taxonomy is available for the current CPT.
+-   Hide several other panels when the CPT doesn't support them.
+-   Use \_.includes to find available taxonomies. Mitigates non-schema-conforming taxonomy registrations.
+-   Defer applying filters for component until it is about to be mounted.
+-   Prevent "Add New" dropdown from overriding other plugin functionality.
+-   Improve paragraph block description.
+-   Refactor to simplify block toolbar rendering.
+-   Add missing aligment classes to cover image.
+-   Add parent page dropdown to page attributes panel.
+-   Allow pressing ENTER to change Reusable Block name.
+-   Disable HTML mode for reusable blocks.
+-   Add support for the "advanced" meta-box location.
+-   Make sure super admins can publish in any site of the network.
+-   Rename theme support for wide images to align-wide.
+-   Move selectors and actions files to the store folder.
+-   Center arrows of popovers relative to their parent.
+-   Use fainter disabled state.
+-   Add breakpoint grid to latest posts block and update color of date.
+-   Move logic for auto-generating the block class name to BlockEdit.
+-   Respect the "enter_title_here" hook.
+-   Prevent meta-box hooks from running multiple times.
+-   Don't set font-family on pullquotes.
+-   Remove superfluous parentheses from include statements.
+-   Remove redundant CSS property updates.
+-   Use "columns-x" class only for grid layout in latest posts.
+-   Use flatMap for mapping toolbar controls for a small performance gain.
+-   Introduce jest matchers for console object.
+-   Updated various npm packages; update Jest. Update node-sass. Update WordPress packages.
+-   Switch TinyMCE to unpkg.
+-   Reorganize handbook docs navigation.
+-   Added FAQ section for meta-boxes compatibility.
+-   Added initial "templates" document.
+-   Add documentation about dynamic blocks.
+-   Updated "outreach" docs.
+-   Improve block-controls document.
+-   Display a hint that files need to be built.
+-   Add WordPress JSDoc ESLint configuration.
+-   Update licenses in package.json & composer.json to adhere to SPDX v3.0 specification.
+-   Add tests to cover REQUEST_POST_UPDATE_SUCCESS effect.
+-   Add tests for color palette component.
+-   Add tests for Editable.getSettings and adaptFormatter.
+-   Use newly published jest-console package in test setup.
+-   Update info about test fixtures generation.
+-   Also style footer in quote blocks to ensure backwards compatibility.
+-   Add a PHPUnit Docker Container.
+-   Fix wrong "return to editor" link when comparing revisions.
+-   Fix error when pressing enter from a heading block.
+-   Fix error with merging lists into paragraphs.
+-   Fix revisions button target area.
+-   Remove duplicated styles.
+-   Fix z-index rebase issues.
+-   Fix tag name warning ordering in validation.
+-   Fix text encoding of titles in url-input.
+-   Fix endless loop in reusable blocks code.
+-   Fix edit button in Audio block using invalid buttonProps attribute.
+-   Fix block creation with falsey default attribute.
+-   Fix radio control checked property.
+-   Fix styling issues of blocks when they are used as part of a reusable block.
+-   Fix list wrapping issues.
+-   Fix problem when converting shortcodes due to sorting.
+-   Fix issue with time-picker not working.
+-   Fix hide advanced settings interaction in block menu.
+-   Fix issue with url input on images.
+-   Fix style regression in textual placeholder on cover image.
+-   Fix return type hint in gutenberg_get_rest_link().
+-   Fix bug when changing number of Latests Posts rapidly was leading to some numbers being defunct.
+-   Fix isInputField check and add tests.
+-   Fix unsetting block alignment flagging block as invalid.
+-   Fix CSS bleed from admin-specific gallery styles.
+-   Fix image handlers at the top from being unclickable.
+-   Fix unexpected keyboard navigations behaviour on some nodes.
+-   Fix inserter position for floated blocks.
+-   Fix bug on empty cover image placeholder used on a saved block.
+-   Fix errors when adding duplicate categories.
+-   Fix broken custom color bubble in ColorPalette.
 
 = 1.9.1 =
 
-* Fix error in Safari when loading Gutenberg with meta boxes present.
-* Fix error / incompatibility with Yoast SEO Premium terms display.
-* Resolve incorrect modal and tooltip layering.
-* Remove unintended commas from Page Options content.
+-   Fix error in Safari when loading Gutenberg with meta boxes present.
+-   Fix error / incompatibility with Yoast SEO Premium terms display.
+-   Resolve incorrect modal and tooltip layering.
+-   Remove unintended commas from Page Options content.
 
 = 1.9.0 =
 
-* Introducing reusable global blocks. (Stored in a wp_blocks post type.)
-* Add ability to lock down the editor when using templates so edits can happen but blocks can't be removed, moved, nor added.
-* Handle and upgrade deprecated blocks. This allows to migrate attributes without invalidating blocks and an important part of the block API.
-* Drag and drop upload support to gallery block.
-* Extensibility:
-* Expose packages/hooks public API under wp.hooks.
-* Introduces withFilters higher-order component to make component filtering easier.
-* Introduces getWrapperDisplayName helper function to make debugging React tree easier.
-* Introduces compose function to unify composing higher-order components.
-* Exposes hook for Block component.
-* Updated demo post with a nicer presentation for people to test with.
-* Added automated RTL support.
-* Convert unknown shortcodes to Shortcode block when pasting.
-* Avoid splitting blocks during rich text pasting.
-* Disable block selection when resizing image.
-* Prefetch meta-boxes and don't reload them on save.
-* Support for all admin color schemes.
-* Close sidebar when resizing from non mobile breakpoints to mobile sizes.
-* Apply content autop disabling filter before do_blocks. Also fixes case where server-side rendered blocks produce extraneous whitespace in output.
-* Use cite element instead of footer for quote and pull-quote source markup.
-* Respect recency order when displaying Recent blocks.
-* Update the behavior of notices reducer to respect ID as a unique identifier, removing duplicate entries.
-* Improve quote to paragraph transformations. Fixes cases where quote would be split into two.
-* Use two flex rows instead of one wrapped row in Url modal for cleaner and more consistent display.
-* Avoid restricting endpoints to /wp/v2 in withApiData.
-* Remove duplicated and simplify inserter between blocks styles.
-* Remove unnecessary padding on top of editor when fixed toolbar is off.
-* Avoid intercepting rendering of removed meta boxes.
-* Replace redux-responsive with a simpler custom alternative, fixing a bug with IE11.
-* Fix issues with bullet-point positioning affecting block display.
-* Fix meta attributes selector not returning the correct value if edited.
-* Fix inconsistent animation on settings button.
-* Fix style issues on Custom HTML block's toolbar.
-* Fix broken styles in "edit as HTML" mode.
-* Fix image block description when no image is set.
-* Fix horizontal overflow for selects with long names in sidebar.
-* Fix case where link modal closes upon typing into UrlInput when toolbar is docked to the paragraph.
-* Fix webpack config issue on Node 6.
-* Fix issue with vertical arrow keys leaking to horizontal menu when toolbar is fixed to block.
-* Fix keyboard trap in the form token component and improve accessibility.
-* Fix React warning when saving reusable blocks.
-* Fix issue with horizontal arrow key closing link dialog in fixed toolbar mode.
-* Fix image resize handlers in RTL mode.
-* Prevent "Add New" dropdown from overriding other plugin functionality.
-* Split Sass variables file into multiple files.
-* Updated blue links for better contrast.
-* Resolve notice when template variable is not set.
-* Added unit tests for row panel, color panel (snapshot), and warning components.
-* Add unit tests for editor actions (with further cleanup).
-* Added snapshots tests for BlockControls.
-* Added documentation for Editable component.
-* Avoid caching vendor directory in Travis.
-* Add document on snapshot testing.
-* Add node and npm version check before build gets started.
-* Update cypress and use the newly introduced Cypress.platform functionality.
-* Improve composer.json setup.
-* Improve testing overview document.
+-   Introducing reusable global blocks. (Stored in a wp_blocks post type.)
+-   Add ability to lock down the editor when using templates so edits can happen but blocks can't be removed, moved, nor added.
+-   Handle and upgrade deprecated blocks. This allows to migrate attributes without invalidating blocks and an important part of the block API.
+-   Drag and drop upload support to gallery block.
+-   Extensibility:
+-   Expose packages/hooks public API under wp.hooks.
+-   Introduces withFilters higher-order component to make component filtering easier.
+-   Introduces getWrapperDisplayName helper function to make debugging React tree easier.
+-   Introduces compose function to unify composing higher-order components.
+-   Exposes hook for Block component.
+-   Updated demo post with a nicer presentation for people to test with.
+-   Added automated RTL support.
+-   Convert unknown shortcodes to Shortcode block when pasting.
+-   Avoid splitting blocks during rich text pasting.
+-   Disable block selection when resizing image.
+-   Prefetch meta-boxes and don't reload them on save.
+-   Support for all admin color schemes.
+-   Close sidebar when resizing from non mobile breakpoints to mobile sizes.
+-   Apply content autop disabling filter before do_blocks. Also fixes case where server-side rendered blocks produce extraneous whitespace in output.
+-   Use cite element instead of footer for quote and pull-quote source markup.
+-   Respect recency order when displaying Recent blocks.
+-   Update the behavior of notices reducer to respect ID as a unique identifier, removing duplicate entries.
+-   Improve quote to paragraph transformations. Fixes cases where quote would be split into two.
+-   Use two flex rows instead of one wrapped row in Url modal for cleaner and more consistent display.
+-   Avoid restricting endpoints to /wp/v2 in withApiData.
+-   Remove duplicated and simplify inserter between blocks styles.
+-   Remove unnecessary padding on top of editor when fixed toolbar is off.
+-   Avoid intercepting rendering of removed meta boxes.
+-   Replace redux-responsive with a simpler custom alternative, fixing a bug with IE11.
+-   Fix issues with bullet-point positioning affecting block display.
+-   Fix meta attributes selector not returning the correct value if edited.
+-   Fix inconsistent animation on settings button.
+-   Fix style issues on Custom HTML block's toolbar.
+-   Fix broken styles in "edit as HTML" mode.
+-   Fix image block description when no image is set.
+-   Fix horizontal overflow for selects with long names in sidebar.
+-   Fix case where link modal closes upon typing into UrlInput when toolbar is docked to the paragraph.
+-   Fix webpack config issue on Node 6.
+-   Fix issue with vertical arrow keys leaking to horizontal menu when toolbar is fixed to block.
+-   Fix keyboard trap in the form token component and improve accessibility.
+-   Fix React warning when saving reusable blocks.
+-   Fix issue with horizontal arrow key closing link dialog in fixed toolbar mode.
+-   Fix image resize handlers in RTL mode.
+-   Prevent "Add New" dropdown from overriding other plugin functionality.
+-   Split Sass variables file into multiple files.
+-   Updated blue links for better contrast.
+-   Resolve notice when template variable is not set.
+-   Added unit tests for row panel, color panel (snapshot), and warning components.
+-   Add unit tests for editor actions (with further cleanup).
+-   Added snapshots tests for BlockControls.
+-   Added documentation for Editable component.
+-   Avoid caching vendor directory in Travis.
+-   Add document on snapshot testing.
+-   Add node and npm version check before build gets started.
+-   Update cypress and use the newly introduced Cypress.platform functionality.
+-   Improve composer.json setup.
+-   Improve testing overview document.
 
 = 1.8.1 =
 
-* Add ability to switch published post back to draft.
-* Fix issue with when changing column count in "text columns" block.
-* Prioritize common items in the autocomplete inserter.
-* Avoid changing publish/update button label when saving draft.
-* Add bottom padding to the editor container to improve experience of writing long posts.
-* Adjust the Classic block toolbar so it's doesn't jump.
-* Colorize the little arrow on the left of the admin menu to white to match body content.
-* Abort focus update when editor is not yet initialized.
-* Update autocomplete suggestions colors to have a sufficient color contrast ratio.
+-   Add ability to switch published post back to draft.
+-   Fix issue with when changing column count in "text columns" block.
+-   Prioritize common items in the autocomplete inserter.
+-   Avoid changing publish/update button label when saving draft.
+-   Add bottom padding to the editor container to improve experience of writing long posts.
+-   Adjust the Classic block toolbar so it's doesn't jump.
+-   Colorize the little arrow on the left of the admin menu to white to match body content.
+-   Abort focus update when editor is not yet initialized.
+-   Update autocomplete suggestions colors to have a sufficient color contrast ratio.
 
 = 1.8.0 =
 
-* Introduce block-templates as a list of blocks specification. Allows a custom post type to define a pre-configured set of blocks to be render upon creation of a new item.
-* New tools menu design, preparing the way for more extensibility options.
-* Block API change: use simpler JS object notation for declaring attribute sources.
-* Add function to allow filtering allowed block types.
-* Show popovers full screen on mobile, improving several mobile interactions.
-* Began work on publishing flow improvements with an indication of publishing (or updating a published post) action by introducing a button state and label updates.
-* Made docked-toolbar the default after different rounds of feedback and testing. Both options are still present.
-* Provide mechanism for plugin authors to fallback to classic editor when registering meta-boxes. Also includes the ability to disable a specific meta-box in the context of Gutenberg alone.
-* Updated color pickers with color indications and collapsible panels.
-* Update icon and tooltip for table of contents menu.
-* Added contrast checker for paragraph color options.
-* Improve pasting plaintext and shortcode data.
-* Convert unknown shortcode into shortcode block when pasting.
-* Updated notices design and positioning.
-* Move the URL handler when pasting to the raw handler mechanism.
-* Define custom classNames support for blocks using the new extensibility hooks with opt-out behaviour.
-* Add reusable blocks state effects.
-* Remove sibling inserter from inside multi-selection blocks.
-* Image block alt text enhancements.
-* Increase minimum width and height of resized images.
-* Allow using escape key to deselect a multi-selection.
-* Preserve settings when rebooting from crash.
-* Improve structure of store persist mechanism.
-* Extract reusable BlockList component to allow nesting compositions.
-* Extract BlockToolbar, BlockMover, BlockSwitcher, PostTitle, WritingFlow, TableOfContents, Undo/Redo Buttons, MultiBlockSwitcher, PostPublishWithDropdown, KeyboardShortcuts, DocumentOutlineCheck, PostTrashCheck, Notices,  as reusable components.
-* Consolidate block naming requirements.
-* Avoid persisting sidebar state on mobile devices.
-* Ensure backwards compatibility to matchers syntax.
-* Show untitled posts as (no title) in url auto-complete.
-* Extract fixedToolbar as a prop of BlockList.
-* Restore insertion point blue line.
-* Display outline tree even if only one heading is used.
-* Allow media upload button to specify a custom title (and fix grammar issue).
-* Fix issue with block mover showing on top of url input.
-* Fix case where tooltips would get stuck on buttons.
-* Fix transformations between quote and list blocks.
-* Fix issue with converting empty classic text to multiple blocks.
-* Fix issue with audio block not updating the toolbar area.
-* Fix contrast issues in button block.
-* Fix change detection to maintain multiple instances of state.
-* Fix text columns focus style.
-* Fix embed category example in docs.
-* Fix button link modal not closing.
-* Fix styling issue with sibling inserter.
-* Fix alignment of block toolbar in wide and full-width.
-* Fix issue when inserting image with empty caption.
-* Fix issue with sibling inserter not appearing in IE11.
-* Fix issue when inserting pullquotes.
-* Fix horizontal scrollbar when floating images to the left.
-* Fix alignment issue with embed videos.
-* Drop withContext optional mapSettingsToProps and fix issue when inserting new image.
-* Require @wordpress import path for application entry points.
-* Resolve errors in IE11 when using the inserter.
-* Added tests for Notice and UrlInput components.
-* Added tests for DefaultBlockAppender.
-* Log debugging messages for invalid blocks.
-* Reduce build size significantly by fixing import statements.
-* Update re-resizeable dependency.
-* Initial document page for extensibility purposes.
-* Added documentation for Editable component.
-* Move all components related to the specific post-edit page into its own folder.
-* Introduce snapshots for testing.
+-   Introduce block-templates as a list of blocks specification. Allows a custom post type to define a pre-configured set of blocks to be render upon creation of a new item.
+-   New tools menu design, preparing the way for more extensibility options.
+-   Block API change: use simpler JS object notation for declaring attribute sources.
+-   Add function to allow filtering allowed block types.
+-   Show popovers full screen on mobile, improving several mobile interactions.
+-   Began work on publishing flow improvements with an indication of publishing (or updating a published post) action by introducing a button state and label updates.
+-   Made docked-toolbar the default after different rounds of feedback and testing. Both options are still present.
+-   Provide mechanism for plugin authors to fallback to classic editor when registering meta-boxes. Also includes the ability to disable a specific meta-box in the context of Gutenberg alone.
+-   Updated color pickers with color indications and collapsible panels.
+-   Update icon and tooltip for table of contents menu.
+-   Added contrast checker for paragraph color options.
+-   Improve pasting plaintext and shortcode data.
+-   Convert unknown shortcode into shortcode block when pasting.
+-   Updated notices design and positioning.
+-   Move the URL handler when pasting to the raw handler mechanism.
+-   Define custom classNames support for blocks using the new extensibility hooks with opt-out behaviour.
+-   Add reusable blocks state effects.
+-   Remove sibling inserter from inside multi-selection blocks.
+-   Image block alt text enhancements.
+-   Increase minimum width and height of resized images.
+-   Allow using escape key to deselect a multi-selection.
+-   Preserve settings when rebooting from crash.
+-   Improve structure of store persist mechanism.
+-   Extract reusable BlockList component to allow nesting compositions.
+-   Extract BlockToolbar, BlockMover, BlockSwitcher, PostTitle, WritingFlow, TableOfContents, Undo/Redo Buttons, MultiBlockSwitcher, PostPublishWithDropdown, KeyboardShortcuts, DocumentOutlineCheck, PostTrashCheck, Notices, as reusable components.
+-   Consolidate block naming requirements.
+-   Avoid persisting sidebar state on mobile devices.
+-   Ensure backwards compatibility to matchers syntax.
+-   Show untitled posts as (no title) in url auto-complete.
+-   Extract fixedToolbar as a prop of BlockList.
+-   Restore insertion point blue line.
+-   Display outline tree even if only one heading is used.
+-   Allow media upload button to specify a custom title (and fix grammar issue).
+-   Fix issue with block mover showing on top of url input.
+-   Fix case where tooltips would get stuck on buttons.
+-   Fix transformations between quote and list blocks.
+-   Fix issue with converting empty classic text to multiple blocks.
+-   Fix issue with audio block not updating the toolbar area.
+-   Fix contrast issues in button block.
+-   Fix change detection to maintain multiple instances of state.
+-   Fix text columns focus style.
+-   Fix embed category example in docs.
+-   Fix button link modal not closing.
+-   Fix styling issue with sibling inserter.
+-   Fix alignment of block toolbar in wide and full-width.
+-   Fix issue when inserting image with empty caption.
+-   Fix issue with sibling inserter not appearing in IE11.
+-   Fix issue when inserting pullquotes.
+-   Fix horizontal scrollbar when floating images to the left.
+-   Fix alignment issue with embed videos.
+-   Drop withContext optional mapSettingsToProps and fix issue when inserting new image.
+-   Require @wordpress import path for application entry points.
+-   Resolve errors in IE11 when using the inserter.
+-   Added tests for Notice and UrlInput components.
+-   Added tests for DefaultBlockAppender.
+-   Log debugging messages for invalid blocks.
+-   Reduce build size significantly by fixing import statements.
+-   Update re-resizeable dependency.
+-   Initial document page for extensibility purposes.
+-   Added documentation for Editable component.
+-   Move all components related to the specific post-edit page into its own folder.
+-   Introduce snapshots for testing.
 
 = 1.7.0 =
 
-* Add toggle to switch between top-level toolbar and toolbars attached to each block. We have gotten great feedback on the benefits of both approaches and want to expand testing of each.
-* Ability to transform multiple-selected blocks at once — multiple images into a gallery, multiple paragraphs into lists.
-* Add @-mention autocomplete for users in a site.
-* Add data layer for reusable blocks and wp_blocks post type name.
-* Allow pasting standalone images and uploading them (also supports pasting base64 encoded images).
-* Allow block nesting from a parser point of view. This is the foundation for handling nested blocks in the UI.
-* Full design update to focus styles around the UI.
-* Block Extensibility (Hooks): filters may inspect and mutate block settings before the block is registered using hooks available at wp.blocks.addFilter. Testing with internal functionality first.
-* Moved docs to https://wordpress.org/gutenberg/handbook/
-* Refactor "changed post" functionality into higher order component and fix issue with wrongly reporting unsaved changes.
-* Refactor meta-boxes to render inline, without iframes.
-* Disable auto-p for block based posts, solving various issues around conflicting paragraph structures, freeform content, and text blocks.
-* Placed "table of contents" button in the header area and disable when there are no blocks in the content.
-* Redesigned the button block with inline URL field.
-* Improve performance by refactoring block-multi-controls out of VisualEditorBlock.
-* Replace react-slot-fill with our own first-party implementation. Part one, and part two for better handling of event bubbling within portals.
-* Improve autocomplete behaviour by using focus outside utility. This solves an issue with selecting items on mobile.
-* Capture and recover from application errors, offering the option to copy the existing contents to the clipboard.
-* Expose editor reusable components. These will allow editor variations to be constructed with more ease.
-* Add polyfill for permalink_structure option to wp-json. (Corresponding trac ticket.) Several REST API compat issues are going to be addressed like this. This allows Gutenberg to implement permalink editing.
-* Unslash post content before parsing during save, fixing bugs with block attributes.
-* Keyboard navigation overhaul of the inserter with accessibility improvements (accessing tabs, etc).
-* Add paragraph count to table of contents element.
-* General Navigable family of components.
-* Add contrast checker message when color combinations are hard to read.
-* Add "no posts found" message to latest posts block.
-* Improve color highlight selection and browser consistency.
-* Add aria-expanded attribute to settings button.
-* Add loading message to preview window.
-* Extract PostFeaturedImage, PostLastRevision, PostComments, PostTaxonomies, PageAttributes, PostTextEditor, BlockInspector, into reusable modules.
-* Collapse advanced block controls by default.
-* Update max number of columns when removing an image from a gallery.
-* Prevent the post schedule component from having invalid dates.
-* Make sure the inspector for a gallery block is shown when it has just one image.
-* Accessibility improvements for inline autocomplete components.
-* Update caption color for contrast.
-* Update visual display of the "remove x" button on gallery-items.
-* Improve classic block toolbar display and behaviour.
-* Dismiss tooltip when clicking a button or when wrapper node becomes disabled.
-* Restore block movers on floated items.
-* Add spacing around date and label.
-* Adjust raw handler "mode" option for readability.
-* Improve e2e testing performance.
-* Add fixture for undelimited freeform block.
-* Hold jQuery ready only when there are metaboxes and ignore advanced ones.
-* Make sure image size values are integers.
-* Fix floated gallery styles in the front-end.
-* Fix issue with image block not loading properly.
-* Fix issue with missing function in IE11.
-* Fix transformation of empty images into gallery and back.
-* Fix overflow issues on mobile.
-* Fix accidental block hover on iOS.
-* Fix toolbar state issue with slot-fill utility.
-* Fix case of too many undo levels building up.
-* Fix stylesheet load ordering issue.
-* Prevent input events from URLInput from being captured by Editable.
-* Force onChange to be updated with TinyMCE content before merge.
-* Polish heading toolbar buttons.
-* Remove image resizing on mobile.
-* Remove findDOMNode usage from Autocomplete component.
-* Rename references of rawContent as innerHTML.
-* Add tests and handle empty fills in slot-fill.
-* Add tests for block mover.
-* Add multi-select e2e test and fix issue with escape key.
-* Bump node version to active LTS.
-* Update TinyMCE to 4.7.2, fixing several bugs like toolbar flickering, visible placeholders when there is text, navigation breaks when encountering format boundaries, typing in FF after starting a bullet-list.
+-   Add toggle to switch between top-level toolbar and toolbars attached to each block. We have gotten great feedback on the benefits of both approaches and want to expand testing of each.
+-   Ability to transform multiple-selected blocks at once — multiple images into a gallery, multiple paragraphs into lists.
+-   Add @-mention autocomplete for users in a site.
+-   Add data layer for reusable blocks and wp_blocks post type name.
+-   Allow pasting standalone images and uploading them (also supports pasting base64 encoded images).
+-   Allow block nesting from a parser point of view. This is the foundation for handling nested blocks in the UI.
+-   Full design update to focus styles around the UI.
+-   Block Extensibility (Hooks): filters may inspect and mutate block settings before the block is registered using hooks available at wp.blocks.addFilter. Testing with internal functionality first.
+-   Moved docs to https://wordpress.org/gutenberg/handbook/
+-   Refactor "changed post" functionality into higher order component and fix issue with wrongly reporting unsaved changes.
+-   Refactor meta-boxes to render inline, without iframes.
+-   Disable auto-p for block based posts, solving various issues around conflicting paragraph structures, freeform content, and text blocks.
+-   Placed "table of contents" button in the header area and disable when there are no blocks in the content.
+-   Redesigned the button block with inline URL field.
+-   Improve performance by refactoring block-multi-controls out of VisualEditorBlock.
+-   Replace react-slot-fill with our own first-party implementation. Part one, and part two for better handling of event bubbling within portals.
+-   Improve autocomplete behaviour by using focus outside utility. This solves an issue with selecting items on mobile.
+-   Capture and recover from application errors, offering the option to copy the existing contents to the clipboard.
+-   Expose editor reusable components. These will allow editor variations to be constructed with more ease.
+-   Add polyfill for permalink_structure option to wp-json. (Corresponding trac ticket.) Several REST API compat issues are going to be addressed like this. This allows Gutenberg to implement permalink editing.
+-   Unslash post content before parsing during save, fixing bugs with block attributes.
+-   Keyboard navigation overhaul of the inserter with accessibility improvements (accessing tabs, etc).
+-   Add paragraph count to table of contents element.
+-   General Navigable family of components.
+-   Add contrast checker message when color combinations are hard to read.
+-   Add "no posts found" message to latest posts block.
+-   Improve color highlight selection and browser consistency.
+-   Add aria-expanded attribute to settings button.
+-   Add loading message to preview window.
+-   Extract PostFeaturedImage, PostLastRevision, PostComments, PostTaxonomies, PageAttributes, PostTextEditor, BlockInspector, into reusable modules.
+-   Collapse advanced block controls by default.
+-   Update max number of columns when removing an image from a gallery.
+-   Prevent the post schedule component from having invalid dates.
+-   Make sure the inspector for a gallery block is shown when it has just one image.
+-   Accessibility improvements for inline autocomplete components.
+-   Update caption color for contrast.
+-   Update visual display of the "remove x" button on gallery-items.
+-   Improve classic block toolbar display and behaviour.
+-   Dismiss tooltip when clicking a button or when wrapper node becomes disabled.
+-   Restore block movers on floated items.
+-   Add spacing around date and label.
+-   Adjust raw handler "mode" option for readability.
+-   Improve e2e testing performance.
+-   Add fixture for undelimited freeform block.
+-   Hold jQuery ready only when there are metaboxes and ignore advanced ones.
+-   Make sure image size values are integers.
+-   Fix floated gallery styles in the front-end.
+-   Fix issue with image block not loading properly.
+-   Fix issue with missing function in IE11.
+-   Fix transformation of empty images into gallery and back.
+-   Fix overflow issues on mobile.
+-   Fix accidental block hover on iOS.
+-   Fix toolbar state issue with slot-fill utility.
+-   Fix case of too many undo levels building up.
+-   Fix stylesheet load ordering issue.
+-   Prevent input events from URLInput from being captured by Editable.
+-   Force onChange to be updated with TinyMCE content before merge.
+-   Polish heading toolbar buttons.
+-   Remove image resizing on mobile.
+-   Remove findDOMNode usage from Autocomplete component.
+-   Rename references of rawContent as innerHTML.
+-   Add tests and handle empty fills in slot-fill.
+-   Add tests for block mover.
+-   Add multi-select e2e test and fix issue with escape key.
+-   Bump node version to active LTS.
+-   Update TinyMCE to 4.7.2, fixing several bugs like toolbar flickering, visible placeholders when there is text, navigation breaks when encountering format boundaries, typing in FF after starting a bullet-list.
 
 = 1.6.1 =
 
-* Handle pasting shortcodes and converting to blocks.
-* Show loading message when opening preview.
-* Fix inline pasting (auto-link feature).
-* Fix undoing multi-selection delete operation.
-* Remove focus state after a selection is finished during multi-select.
-* Remove the "command" shortcut to navigate to the editor toolbar.
+-   Handle pasting shortcodes and converting to blocks.
+-   Show loading message when opening preview.
+-   Fix inline pasting (auto-link feature).
+-   Fix undoing multi-selection delete operation.
+-   Remove focus state after a selection is finished during multi-select.
+-   Remove the "command" shortcut to navigate to the editor toolbar.
 
 = 1.6.0 =
 
-* Move the block toolbar to the editor's top header. This experiment seeks to reduce the presence of UI obscuring content.
-* Alternate style for block boundaries and multi-selection. Also engages "edit" mode when using arrow keys (hides UI).
-* Complete rework of arrow keys navigation between blocks—faster, clearer, and respects caret position while traversing text blocks.
-* Added keyboard shortcuts to navigate regions.
-* Implement multi-selection mode using just arrow with shift keys and support horizontal arrows.
-* Suggest a post format for additional blocks (embeds, gallery, audio, video) and expand on the heuristics to include case of one format-block at the top plus a paragraph of text below as valid.
-* Allow converting a classic block (post) into several Gutenblocks.
-* Several performance improvements 🎉
-* * Avoid re-rendering all blocks on selection changes.
-* * Add memoization for multi-select selectors.
-* * Rework implementation of blockRef to avoid render cascade from block list.
-* * Use flatMap when allocating the block list for rendering.
-* * Reorganize logic to determine when a post can be saved to be less expensive.
-* Refactor handling of revisions to avoid loading them up-front, significantly reducing load time on long posts with many revisions.
-* Further memoization on selectors based on specific state keys.
-* Render meta-boxes as part of the main column, not as a collapsible box.
-* Improve handling of undo action stack by resetting only on setup. This makes undo a lot more usable in general.
-* Changes to block inserter design positioning tabs at the top. (1.5.1)
-* Remove multi-select buffer zone and throttle delay for a faster response.
-* API for handling custom formats/tokens in Editable.
-* Improve withApiData component to be able to serve cached data (if available) during an initial render.
-* Show block toolbar in HTML mode for mobile.
-* Update Shortcode block to use a textarea instead of single line input.
-* Increase width of invalid block message.
-* Avoid redirecting to Gutenberg when saving on classic editor. (1.5.2)
-* Don't show "edit as HTML" for the Code and Shortcode blocks.
-* Refactor notices state reducer as array optimizing performance.
-* Disable front-end styles for basic quote block.
-* Reorganize the meta-boxes components for code clarity.
-* Extract reusable PostSticky, PostFormat, PostPendingStatus, PostAuthor, PostTrash, PostExcerpt components.
-* Resolve issue with having to tab twice on the toolbar due to focusReturn utility interfering with button tooltips.
-* Reset min-width of Tooltip component.
-* Avoid function instantiation in render of WritingFlow component.
-* Add the gutenberg_can_edit_post_type filter for plugins to add or remove support for custom post types.
-* Update header toolbar keyboard navigation to include undo and redo buttons.
-* Don't show the classic editor dropdown on unsupported post types.
-* Drop resizable-box in favor of re-resizable to use in the image block resize handlers.
-* Correct placement of link-dialog after moving toolbar to the top.
-* Adjust revisions logic to link to latest entry.
-* Allow editable to accept aria attributes.
-* Add generic focus effect to popovers.
-* Remove unused focus prop from Button component.
-* Remove core namespace from demo content.
-* Enable iOS smooth scrolling within scroll containers.
-* Make sure link menu appears above sibling inserter.
-* Improve layout paneling for short-height viewports.
-* Fix problem with multi-select not working again after a group of blocks has been moved.
-* Fix problem with deleting a block in HTML mode.
-* Fix issue with keyboard navigation entering textareas (non contentEditable) and losing caret position.
-* Fix issue where clicking on an item within autocomplete would dismiss the popover and not select anything.
-* Fix visual issue with the document info popover. (1.5.2)
-* Fix bug with deleting featured image on a post.
-* Fix error with removing a block placeholder.
-* Fix problem with FF and meta-boxes.
-* Fix issue with Classic Text description showing all the time.
-* Fix issue with the color picker width.
-* Fix quick inserter display of custom block icons.
-* Fix missing node check when blurring a paragraph block.
-* Warn about misuses of z-index mappings.
-* Make use of the "build stages" feature in the travis config file.
-* Upgrade ESLint dependencies.
-* Move test configuration files to test/unit.
-* Add easy local environment setup and Cypress e2e tests.
+-   Move the block toolbar to the editor's top header. This experiment seeks to reduce the presence of UI obscuring content.
+-   Alternate style for block boundaries and multi-selection. Also engages "edit" mode when using arrow keys (hides UI).
+-   Complete rework of arrow keys navigation between blocks—faster, clearer, and respects caret position while traversing text blocks.
+-   Added keyboard shortcuts to navigate regions.
+-   Implement multi-selection mode using just arrow with shift keys and support horizontal arrows.
+-   Suggest a post format for additional blocks (embeds, gallery, audio, video) and expand on the heuristics to include case of one format-block at the top plus a paragraph of text below as valid.
+-   Allow converting a classic block (post) into several Gutenblocks.
+-   Several performance improvements 🎉
+-   -   Avoid re-rendering all blocks on selection changes.
+-   -   Add memoization for multi-select selectors.
+-   -   Rework implementation of blockRef to avoid render cascade from block list.
+-   -   Use flatMap when allocating the block list for rendering.
+-   -   Reorganize logic to determine when a post can be saved to be less expensive.
+-   Refactor handling of revisions to avoid loading them up-front, significantly reducing load time on long posts with many revisions.
+-   Further memoization on selectors based on specific state keys.
+-   Render meta-boxes as part of the main column, not as a collapsible box.
+-   Improve handling of undo action stack by resetting only on setup. This makes undo a lot more usable in general.
+-   Changes to block inserter design positioning tabs at the top. (1.5.1)
+-   Remove multi-select buffer zone and throttle delay for a faster response.
+-   API for handling custom formats/tokens in Editable.
+-   Improve withApiData component to be able to serve cached data (if available) during an initial render.
+-   Show block toolbar in HTML mode for mobile.
+-   Update Shortcode block to use a textarea instead of single line input.
+-   Increase width of invalid block message.
+-   Avoid redirecting to Gutenberg when saving on classic editor. (1.5.2)
+-   Don't show "edit as HTML" for the Code and Shortcode blocks.
+-   Refactor notices state reducer as array optimizing performance.
+-   Disable front-end styles for basic quote block.
+-   Reorganize the meta-boxes components for code clarity.
+-   Extract reusable PostSticky, PostFormat, PostPendingStatus, PostAuthor, PostTrash, PostExcerpt components.
+-   Resolve issue with having to tab twice on the toolbar due to focusReturn utility interfering with button tooltips.
+-   Reset min-width of Tooltip component.
+-   Avoid function instantiation in render of WritingFlow component.
+-   Add the gutenberg_can_edit_post_type filter for plugins to add or remove support for custom post types.
+-   Update header toolbar keyboard navigation to include undo and redo buttons.
+-   Don't show the classic editor dropdown on unsupported post types.
+-   Drop resizable-box in favor of re-resizable to use in the image block resize handlers.
+-   Correct placement of link-dialog after moving toolbar to the top.
+-   Adjust revisions logic to link to latest entry.
+-   Allow editable to accept aria attributes.
+-   Add generic focus effect to popovers.
+-   Remove unused focus prop from Button component.
+-   Remove core namespace from demo content.
+-   Enable iOS smooth scrolling within scroll containers.
+-   Make sure link menu appears above sibling inserter.
+-   Improve layout paneling for short-height viewports.
+-   Fix problem with multi-select not working again after a group of blocks has been moved.
+-   Fix problem with deleting a block in HTML mode.
+-   Fix issue with keyboard navigation entering textareas (non contentEditable) and losing caret position.
+-   Fix issue where clicking on an item within autocomplete would dismiss the popover and not select anything.
+-   Fix visual issue with the document info popover. (1.5.2)
+-   Fix bug with deleting featured image on a post.
+-   Fix error with removing a block placeholder.
+-   Fix problem with FF and meta-boxes.
+-   Fix issue with Classic Text description showing all the time.
+-   Fix issue with the color picker width.
+-   Fix quick inserter display of custom block icons.
+-   Fix missing node check when blurring a paragraph block.
+-   Warn about misuses of z-index mappings.
+-   Make use of the "build stages" feature in the travis config file.
+-   Upgrade ESLint dependencies.
+-   Move test configuration files to test/unit.
+-   Add easy local environment setup and Cypress e2e tests.
 
 = 1.5.2 =
 
-* Add the `gutenberg_can_edit_post_type` filter for plugins to add or remove support for custom post types.
-* Fix Classic Editor redirecting to Gutenberg when saving a post.
-* Fix Classic Editor dropdown showing on post types that don't support Gutenberg.
-* Fix Classic Editor dropdown hiding behind notices.
-* Fix an issue with collapsing popover content.
+-   Add the `gutenberg_can_edit_post_type` filter for plugins to add or remove support for custom post types.
+-   Fix Classic Editor redirecting to Gutenberg when saving a post.
+-   Fix Classic Editor dropdown showing on post types that don't support Gutenberg.
+-   Fix Classic Editor dropdown hiding behind notices.
+-   Fix an issue with collapsing popover content.
 
 = 1.5.1 =
 
-* New design for the inserter with tabs at the top and more space for text.
-* Fix problem with Firefox and the meta-boxes resize script.
-* Fix issue with Classic Text description showing without focus.
+-   New design for the inserter with tabs at the top and more space for text.
+-   Fix problem with Firefox and the meta-boxes resize script.
+-   Fix issue with Classic Text description showing without focus.
 
 = 1.5.0 =
 
-* Set Gutenberg as the default editor (still allow creating new posts in Classic Editor).
-* Add metabox support—this is an initial pass at supporting existing meta-boxes without intervention.
-* Display inserter button between blocks.
-* Improve block navigation performance.
-* Hide core namespace in comment serialization. wp:core/gallery becomes wp:gallery.
-* Implement a dropdown for Publish flow.
-* Allow multiselect to work on shift-click.
-* Insert new block from title on enter.
-* Use a dropdown for the block menu (settings, delete, edit as HTML).
-* Add expandable panel for post visibility.
-* Add expandable panel for post scheduling.
-* Implement more inline formatting boundaries.
-* Better clearing of block selection.
-* Show placeholder hint for slash autocomplete on new text blocks.
-* Remove multi-selection header in favor of default block controls (mover and menu).
-* Allow blocks to disable HTML edit mode.
-* Adjust transition and delay of inserter between blocks.
-* Added text color option for button block.
-* Hide extended settings if sidebar is closed.
-* New embed icons.
-* Move the store initialization to a dedicated component.
-* Improve scroll position of scrollable elements.
-* Drop undefined blocks from recent blocks.
-* Update HTML block description.
-* Update embed block description.
-* Add description for classic block.
-* PHPCS-specific improvements.
-* Add a default block icon.
-* Adjust line height of classic text to match paragraph blocks.
-* Adjust filter order in classic block so plugins that extend it can work properly.
-* Set textarea value as prop and not children.
-* Fix mobile issues with block setting menu.
-* Fix undefined colors warning.
-* Fix broken upload button on image placeholder.
-* Fix post edit URL when saving a post/page/CPT.
-* Fix conflict with new TinyMCE version and heading blocks.
-* Tweak block sibling element for better target surface.
-* Avoid loading Gutenberg assets on non-Gutenberg pages.
-* Adjust Jest configuration.
-* Document supportAnchor in block API.
-* Updated TinyMCE to latest.
-* Document block name usage in serialization and add example of serialized block.
-* Updated FAQ section.
-* Upgrade React and Enzyme dependencies.
+-   Set Gutenberg as the default editor (still allow creating new posts in Classic Editor).
+-   Add metabox support—this is an initial pass at supporting existing meta-boxes without intervention.
+-   Display inserter button between blocks.
+-   Improve block navigation performance.
+-   Hide core namespace in comment serialization. wp:core/gallery becomes wp:gallery.
+-   Implement a dropdown for Publish flow.
+-   Allow multiselect to work on shift-click.
+-   Insert new block from title on enter.
+-   Use a dropdown for the block menu (settings, delete, edit as HTML).
+-   Add expandable panel for post visibility.
+-   Add expandable panel for post scheduling.
+-   Implement more inline formatting boundaries.
+-   Better clearing of block selection.
+-   Show placeholder hint for slash autocomplete on new text blocks.
+-   Remove multi-selection header in favor of default block controls (mover and menu).
+-   Allow blocks to disable HTML edit mode.
+-   Adjust transition and delay of inserter between blocks.
+-   Added text color option for button block.
+-   Hide extended settings if sidebar is closed.
+-   New embed icons.
+-   Move the store initialization to a dedicated component.
+-   Improve scroll position of scrollable elements.
+-   Drop undefined blocks from recent blocks.
+-   Update HTML block description.
+-   Update embed block description.
+-   Add description for classic block.
+-   PHPCS-specific improvements.
+-   Add a default block icon.
+-   Adjust line height of classic text to match paragraph blocks.
+-   Adjust filter order in classic block so plugins that extend it can work properly.
+-   Set textarea value as prop and not children.
+-   Fix mobile issues with block setting menu.
+-   Fix undefined colors warning.
+-   Fix broken upload button on image placeholder.
+-   Fix post edit URL when saving a post/page/CPT.
+-   Fix conflict with new TinyMCE version and heading blocks.
+-   Tweak block sibling element for better target surface.
+-   Avoid loading Gutenberg assets on non-Gutenberg pages.
+-   Adjust Jest configuration.
+-   Document supportAnchor in block API.
+-   Updated TinyMCE to latest.
+-   Document block name usage in serialization and add example of serialized block.
+-   Updated FAQ section.
+-   Upgrade React and Enzyme dependencies.
 
 = 1.4.0 =
 
-* Redesigned the header area of the editor for clarity—groups content actions in the left, and post action in the right.
-* Initial REST API infrastructure for reusable global blocks.
-* Group block settings (delete, inspector, edit HTML) on an ellipsis button.
-* Added new reusable Dropdown component.
-* Show frequently used blocks in the inserter shortcuts (at the bottom of the post).
-* Offer option for the button block to clear content.
-* Refactor block toolbar component in preparation for some iterations (docked toolbar, for example).
-* Allow partial URLs in link input.
-* Avoid using state for tracking arrow key navigation in WritingFlow to prevent re-renders.
-* Improve mobile header after design cleanup.
-* Add focusReturn for Dropdown component.
-* Updated Audio block markup to use figure element.
-* Removed transition on multi-select affecting the perception of speed of the interaction.
-* Show Gallery block description even if there are no images.
-* Persist custom class names.
-* Merge initialization actions into a single action.
-* Fix scroll position when reordering blocks.
-* Fix case where the responsive treatment of the header area was hiding valuable actions.
-* Fix focus styles on the inserter.
-* Fix submenu visibility issue for certain users.
-* Cleanup no longer used code.
-* Document useOnce block API feature.
+-   Redesigned the header area of the editor for clarity—groups content actions in the left, and post action in the right.
+-   Initial REST API infrastructure for reusable global blocks.
+-   Group block settings (delete, inspector, edit HTML) on an ellipsis button.
+-   Added new reusable Dropdown component.
+-   Show frequently used blocks in the inserter shortcuts (at the bottom of the post).
+-   Offer option for the button block to clear content.
+-   Refactor block toolbar component in preparation for some iterations (docked toolbar, for example).
+-   Allow partial URLs in link input.
+-   Avoid using state for tracking arrow key navigation in WritingFlow to prevent re-renders.
+-   Improve mobile header after design cleanup.
+-   Add focusReturn for Dropdown component.
+-   Updated Audio block markup to use figure element.
+-   Removed transition on multi-select affecting the perception of speed of the interaction.
+-   Show Gallery block description even if there are no images.
+-   Persist custom class names.
+-   Merge initialization actions into a single action.
+-   Fix scroll position when reordering blocks.
+-   Fix case where the responsive treatment of the header area was hiding valuable actions.
+-   Fix focus styles on the inserter.
+-   Fix submenu visibility issue for certain users.
+-   Cleanup no longer used code.
+-   Document useOnce block API feature.
 
 = 1.3.0 =
 
-* Add an opacity range slider to the cover image block.
-* Offer the option to convert a single block to an HTML block when conflicting content is detected.
-* Persist recently used blocks through sessions.
-* Added support for pasting plain text markdown content and converting to blocks.
-* The block inspector groups features and settings in expandable panels.
-* Accessibility improvements to the color palette component.
-* Added a “feedback” link in the Gutenberg side menu.
-* Use expandable panels for advanced block features (class name and anchor).
-* Removed touch listeners from multi select.
-* Added block descriptions to blocks that didn’t have them.
-* Allow stored values to be updated with new defaults.
-* Refactor image block to use withApiData and fix issues with .tiff images.
-* Clean up non inline elements when pasting inline content.
-* Remove unused code in BlockList component.
-* Added “transform into” text to block switcher.
-* Fixed sidebar overflow causing extra scrollbars.
-* Fixed multi-select inside new scroll container.
-* Fixed image block error with .tiff image.
-* Fixed the content overflowing outside the verse block container.
-* Fixed issues with sticky quick toolbar position.
-* Fixed hitting enter when a block is selected creating a default block after selected block.
-* Fixed teaser markup in demo content.
-* Clean working directory before packaging plugin.
-* Updated Webpack dependencies.
-* Updated Jest and React.
+-   Add an opacity range slider to the cover image block.
+-   Offer the option to convert a single block to an HTML block when conflicting content is detected.
+-   Persist recently used blocks through sessions.
+-   Added support for pasting plain text markdown content and converting to blocks.
+-   The block inspector groups features and settings in expandable panels.
+-   Accessibility improvements to the color palette component.
+-   Added a “feedback” link in the Gutenberg side menu.
+-   Use expandable panels for advanced block features (class name and anchor).
+-   Removed touch listeners from multi select.
+-   Added block descriptions to blocks that didn’t have them.
+-   Allow stored values to be updated with new defaults.
+-   Refactor image block to use withApiData and fix issues with .tiff images.
+-   Clean up non inline elements when pasting inline content.
+-   Remove unused code in BlockList component.
+-   Added “transform into” text to block switcher.
+-   Fixed sidebar overflow causing extra scrollbars.
+-   Fixed multi-select inside new scroll container.
+-   Fixed image block error with .tiff image.
+-   Fixed the content overflowing outside the verse block container.
+-   Fixed issues with sticky quick toolbar position.
+-   Fixed hitting enter when a block is selected creating a default block after selected block.
+-   Fixed teaser markup in demo content.
+-   Clean working directory before packaging plugin.
+-   Updated Webpack dependencies.
+-   Updated Jest and React.
 
 = 1.2.1 =
 
-* Fix issue where invalid block resolution options were not clickable.
+-   Fix issue where invalid block resolution options were not clickable.
 
 = 1.2.0 =
 
-* Resolve block conflicts when editing a block post in the classic editor. Gutenberg's strict content validation has helped identify formatting incompatibilities, and continued improvements are planned for future releases.
-* Add word and block count to table of contents.
-* Add support for meta attributes (custom fields) in block attributes. This allows block authors to specify attributes to live outside of post_content entirely.
-* Allow Gutenberg to be the default editor for posts with blocks and add links to classic editor.
-* Accessibility: add landmark regions.
-* Add metabox placeholder shell.
-* Add crash recovery for blocks which error while saving.
-* Hide Sidebar panels if the user doesn't have the right capabilities.
-* Refactor PostTaxonomies to use 'withApiData'.
-* Create 'withApiData' higher order component for managing API data.
-* Make casing consistent.
-* Allow toolbar wrapper to be clicked through.
-* Support and bootstrap server-registered block attribute schemas.
-* Shift focus into popover when opened.
-* Reuse the tabbable utility to retrieve the tabbables elements in WritingFlow.
-* Change placeholder text on button.
-* Persist the sate of the sidebar across refresh.
-* Use a small multiselect buffer zone, improving multiple block selection.
-* Close popover by escape keypress.
-* Improve dropzone contrast ratio.
-* Improve search message to add context.
-* Improve string extraction for localized strings.
-* Fixed z-index issue of gallery image inline menu.
-* Fixed image block resizing to set the figure wrapper.
-* Fixed column widths in gallery block.
-* Fixed parsing in do_blocks() and rendering of blocks on frontend in the_content.
-* Fixed position of upload svg on mobile.
+-   Resolve block conflicts when editing a block post in the classic editor. Gutenberg's strict content validation has helped identify formatting incompatibilities, and continued improvements are planned for future releases.
+-   Add word and block count to table of contents.
+-   Add support for meta attributes (custom fields) in block attributes. This allows block authors to specify attributes to live outside of post_content entirely.
+-   Allow Gutenberg to be the default editor for posts with blocks and add links to classic editor.
+-   Accessibility: add landmark regions.
+-   Add metabox placeholder shell.
+-   Add crash recovery for blocks which error while saving.
+-   Hide Sidebar panels if the user doesn't have the right capabilities.
+-   Refactor PostTaxonomies to use 'withApiData'.
+-   Create 'withApiData' higher order component for managing API data.
+-   Make casing consistent.
+-   Allow toolbar wrapper to be clicked through.
+-   Support and bootstrap server-registered block attribute schemas.
+-   Shift focus into popover when opened.
+-   Reuse the tabbable utility to retrieve the tabbables elements in WritingFlow.
+-   Change placeholder text on button.
+-   Persist the sate of the sidebar across refresh.
+-   Use a small multiselect buffer zone, improving multiple block selection.
+-   Close popover by escape keypress.
+-   Improve dropzone contrast ratio.
+-   Improve search message to add context.
+-   Improve string extraction for localized strings.
+-   Fixed z-index issue of gallery image inline menu.
+-   Fixed image block resizing to set the figure wrapper.
+-   Fixed column widths in gallery block.
+-   Fixed parsing in do_blocks() and rendering of blocks on frontend in the_content.
+-   Fixed position of upload svg on mobile.
 
 = 1.1.0 =
 
-* Add blocks "slash" autocomplete—shortcut to continue adding new block without leaving the keyboard.
-* Add ability to remove an image from a gallery from within the block (selecting image).
-* Add option to open a created link in a new window.
-* Support and bootstrap server-registered block attribute schemas.
-* Improve accessibility of add-new-category form.
-* Documentation gets an updated design and content improvements.
-* Adjust column width calculation in gallery block to properly respect column count.
-* Move pending review control together with sticky toggle at the bottom.
-* Add caption styling for video block.
-* Allow removing a "classic text" block with backspaces.
-* Allow Button block to show placeholder text.
-* Drop the deprecated button-secondary class name.
-* Fix link dialog not showing in Safari when caret is in the middle of the word.
-* Fix adding new categories and position newly added term at the top.
-* Fix the resetting of drop-zone states after dropping a file.
-* Fix embed saving "undefined" text when URL is not set.
-* Fix placeholder styling on Text when background color is set.
-* Update Composer + PHPCS.
-* Rename default block handlers.
-* Update code syntax tabs in docutron.
-* Link to plugin download and github repo from docutron.
-* Added block API document.
-* Add "Edit and Save" document.
+-   Add blocks "slash" autocomplete—shortcut to continue adding new block without leaving the keyboard.
+-   Add ability to remove an image from a gallery from within the block (selecting image).
+-   Add option to open a created link in a new window.
+-   Support and bootstrap server-registered block attribute schemas.
+-   Improve accessibility of add-new-category form.
+-   Documentation gets an updated design and content improvements.
+-   Adjust column width calculation in gallery block to properly respect column count.
+-   Move pending review control together with sticky toggle at the bottom.
+-   Add caption styling for video block.
+-   Allow removing a "classic text" block with backspaces.
+-   Allow Button block to show placeholder text.
+-   Drop the deprecated button-secondary class name.
+-   Fix link dialog not showing in Safari when caret is in the middle of the word.
+-   Fix adding new categories and position newly added term at the top.
+-   Fix the resetting of drop-zone states after dropping a file.
+-   Fix embed saving "undefined" text when URL is not set.
+-   Fix placeholder styling on Text when background color is set.
+-   Update Composer + PHPCS.
+-   Rename default block handlers.
+-   Update code syntax tabs in docutron.
+-   Link to plugin download and github repo from docutron.
+-   Added block API document.
+-   Add "Edit and Save" document.
 
 = 1.0.0 =
-* Restored keyboard navigation with more robust implementation, addressing previous browser issues.
-* Added drag and drop for media with pointer to create new blocks.
-* Merged paragraph and cover text blocks (includes the colors and font size options).
-* Reworked color palette picker with a "clear" and a "custom color" option.
-* Further improvements to inline pasting and fixing errant empty blocks.
-* Added thumbnail size selector to image blocks.
-* Added support for url input and align and edit buttons to audio block.
-* Persist the state of the sidebar across page refresh.
-* Persist state of sidebar panels on page refresh.
-* Persist editor mode on page refresh.
-* New withAPIData higher-order component for making it easier to manage data needs.
-* Preserve unknown block and remove "freeform" comment delimiters (unrecognized HTML is handled without comment delimiters).
-* Show "add new term" in hierarchical taxonomies (including categories).
-* Show tooltip only after mouseover delay.
-* Show post formats only if the post type supports them.
-* Added align and edit buttons to video block.
-* Preload data in withApiData to improve perceived performance.
-* Improve accessibility of sidebar modes.
-* Allow changing cover-image settings before uploading an image.
-* Improve validation leniency around non-meaningful differences.
-* Take into account capabilities for publishing action.
-* Update author selector to show only users capable of authoring posts.
-* Normalize pasted blockquote contents.
-* Refactored featured image, page attributes to use withApiData
-* Added a fix to avoid cloning nodes by passing pasted HTML string.
-* Added a fix to avoid re-encoding on encoded posts.
-* Fixed resetting the focus config when block already selected.
-* Allowing adding of plain text after insert link at the end of a paragraph.
-* Update to latest TinyMCE version.
-* Show only users capable of authoring posts.
-* Add submit for review to publish for contributor.
-* Delete or backspace in an empty "classic text" block now removes it.
-* Check for type in block transformations logic.
-* Fixed drop-down menu issue on classic text.
-* Added filter to allow post types to disable "edit in gutenberg" links.
-* Made UrlInput and UrlInputButton available as reusable components.
-* Use wordpress/a11y package instead of global.
-* Added npm5 package-lock.
-* We welcome all your feedback and contributions on the project repository, or ping us in #core-editor. Follow the "gutenberg" tag for past updates.
+
+-   Restored keyboard navigation with more robust implementation, addressing previous browser issues.
+-   Added drag and drop for media with pointer to create new blocks.
+-   Merged paragraph and cover text blocks (includes the colors and font size options).
+-   Reworked color palette picker with a "clear" and a "custom color" option.
+-   Further improvements to inline pasting and fixing errant empty blocks.
+-   Added thumbnail size selector to image blocks.
+-   Added support for url input and align and edit buttons to audio block.
+-   Persist the state of the sidebar across page refresh.
+-   Persist state of sidebar panels on page refresh.
+-   Persist editor mode on page refresh.
+-   New withAPIData higher-order component for making it easier to manage data needs.
+-   Preserve unknown block and remove "freeform" comment delimiters (unrecognized HTML is handled without comment delimiters).
+-   Show "add new term" in hierarchical taxonomies (including categories).
+-   Show tooltip only after mouseover delay.
+-   Show post formats only if the post type supports them.
+-   Added align and edit buttons to video block.
+-   Preload data in withApiData to improve perceived performance.
+-   Improve accessibility of sidebar modes.
+-   Allow changing cover-image settings before uploading an image.
+-   Improve validation leniency around non-meaningful differences.
+-   Take into account capabilities for publishing action.
+-   Update author selector to show only users capable of authoring posts.
+-   Normalize pasted blockquote contents.
+-   Refactored featured image, page attributes to use withApiData
+-   Added a fix to avoid cloning nodes by passing pasted HTML string.
+-   Added a fix to avoid re-encoding on encoded posts.
+-   Fixed resetting the focus config when block already selected.
+-   Allowing adding of plain text after insert link at the end of a paragraph.
+-   Update to latest TinyMCE version.
+-   Show only users capable of authoring posts.
+-   Add submit for review to publish for contributor.
+-   Delete or backspace in an empty "classic text" block now removes it.
+-   Check for type in block transformations logic.
+-   Fixed drop-down menu issue on classic text.
+-   Added filter to allow post types to disable "edit in gutenberg" links.
+-   Made UrlInput and UrlInputButton available as reusable components.
+-   Use wordpress/a11y package instead of global.
+-   Added npm5 package-lock.
+-   We welcome all your feedback and contributions on the project repository, or ping us in #core-editor. Follow the "gutenberg" tag for past updates.
 
 = 0.9.0 =
-* Added ability to change font-size in cover text using slider and number input.
-* Added support for custom anchors (ids) on blocks, allowing to link directly to a section of the post.
-* Updated pull-quote design.
-* Created custom color palette component with "clear" option and "custom color" option. (And better markup and accessibility.)
-* Improve pasting: recognizing more elements, adding tests, stripping non-semantic markup, etc.
-* Improve gallery visual design and fix cropping in Safari.
-* Allow selecting a heading block from the table-of-contents panel directly.
-* Make toolbar slide horizontally for mobile.
-* Improve range-input control with a number input.
-* Fix pasting problems (handling of block attributes).
-* More stripping of unhandled elements during paste.
-* Show post format selector only for posts.
-* Display nicer URLs when editing links.
-* More compact save indicator.
-* Disabled arrow key navigation between blocks as we refine implementation.
-* Removed blank target from "view post" in notices.
-* Fix empty links still rendering ont he front-end.
-* Fix shadow on inline toolbars.
-* Fix problem with inserting pull-quotes.
-* Fix drag and drop on image block.
-* Removed warning when publishing.
-* Don't provide version for vendor scripts.
-* Clean category code in block registration.
-* Added history and resources docs.
+
+-   Added ability to change font-size in cover text using slider and number input.
+-   Added support for custom anchors (ids) on blocks, allowing to link directly to a section of the post.
+-   Updated pull-quote design.
+-   Created custom color palette component with "clear" option and "custom color" option. (And better markup and accessibility.)
+-   Improve pasting: recognizing more elements, adding tests, stripping non-semantic markup, etc.
+-   Improve gallery visual design and fix cropping in Safari.
+-   Allow selecting a heading block from the table-of-contents panel directly.
+-   Make toolbar slide horizontally for mobile.
+-   Improve range-input control with a number input.
+-   Fix pasting problems (handling of block attributes).
+-   More stripping of unhandled elements during paste.
+-   Show post format selector only for posts.
+-   Display nicer URLs when editing links.
+-   More compact save indicator.
+-   Disabled arrow key navigation between blocks as we refine implementation.
+-   Removed blank target from "view post" in notices.
+-   Fix empty links still rendering ont he front-end.
+-   Fix shadow on inline toolbars.
+-   Fix problem with inserting pull-quotes.
+-   Fix drag and drop on image block.
+-   Removed warning when publishing.
+-   Don't provide version for vendor scripts.
+-   Clean category code in block registration.
+-   Added history and resources docs.
 
 = 0.8.0 =
-* New Categories Block (based on existing widget).
-* New Text Columns Block (initial exploration of text-only multiple columns).
-* New Video Block.
-* New Shortcode Block.
-* New Audio Block.
-* Added resizing handlers to Image Block.
-* Added direct image upload button to Image Block and Gallery Block.
-* Give option to transform a block to Classic when it encounters problems.
-* Give option to Overwrite changes on a block detected as invalid.
-* Added "link to" option in galleries.
-* Added support for custom taxonomies.
-* Added post formats selector to post settings.
-* Added keywords support (aliases) to various blocks to improve search discovery.
-* Significant improvements to the way attributes are specified in the Block API and its clarity (handles defaults and types).
-* Added Tooltip component displaying aria-labels from buttons.
-* Removed stats tracking code.
-* Updated design document.
-* Capture and recover from block rendering runtime errors.
-* Handle enter when focusing on outer boundary of a block.
-* Reduce galleries json attributes data to a minimum.
-* Added caption styles to the front-end for images and embeds.
-* Added missing front-end alignment classes for table and cover-text blocks.
-* Only reset blocks on initial load to prevent state fluctuations.
-* Improve calculation of dirty state by making a diff against saved post.
-* Improve visual weight of toolbar by reducing its silhouette.
-* Improve rendering of galleries on the front-end.
-* Improve Cover Image placeholder visual presentation.
-* Improve front-end display of quotes.
-* Improve responsive design of galleries on the front-end.
-* Allow previewing new posts that are yet to be saved.
-* Reset scrolling position within inserter when switching tabs.
-* Refactor popover to render at root of document.
-* Refactor withFocusReturn to handle accessibility better in more contexts.
-* Prevent overlap between multi-selection and within-block selection.
-* Clear save notices when triggering a new save.
-* Disable "preview" button if post is not saveable.
-* Renamed blocks.query to blocks.source for clarity and updated documentation.
-* Rearrange block stylesheets to reflect display and editor styles.
-* Use @wordpress dependencies consistently.
-* Added validation checks for specifying a block's category.
-* Fix problems with quote initialization and list transformation.
-* Fix issue where Cover Image was being considered invalid after edits.
-* Fix errors in editable coming from Table block commands.
-* Fix error in latest posts block when date is not set for a post.
-* Fix issue with active color in ColorPalette component.
-* Prevent class=false serialization issue in covert-text.
-* Treat range control value as numeric.
-* Added warning when using Editable and passing non-array values.
-* Show block switcher above link input.
-* Updated rememo dependency.
-* Start consuming from separate @wordpress dependencies.
-* Fix problem with inserting new galleries.
-* Fix issue with embeds and missing captions.
-* Added outreach section to docs.
+
+-   New Categories Block (based on existing widget).
+-   New Text Columns Block (initial exploration of text-only multiple columns).
+-   New Video Block.
+-   New Shortcode Block.
+-   New Audio Block.
+-   Added resizing handlers to Image Block.
+-   Added direct image upload button to Image Block and Gallery Block.
+-   Give option to transform a block to Classic when it encounters problems.
+-   Give option to Overwrite changes on a block detected as invalid.
+-   Added "link to" option in galleries.
+-   Added support for custom taxonomies.
+-   Added post formats selector to post settings.
+-   Added keywords support (aliases) to various blocks to improve search discovery.
+-   Significant improvements to the way attributes are specified in the Block API and its clarity (handles defaults and types).
+-   Added Tooltip component displaying aria-labels from buttons.
+-   Removed stats tracking code.
+-   Updated design document.
+-   Capture and recover from block rendering runtime errors.
+-   Handle enter when focusing on outer boundary of a block.
+-   Reduce galleries json attributes data to a minimum.
+-   Added caption styles to the front-end for images and embeds.
+-   Added missing front-end alignment classes for table and cover-text blocks.
+-   Only reset blocks on initial load to prevent state fluctuations.
+-   Improve calculation of dirty state by making a diff against saved post.
+-   Improve visual weight of toolbar by reducing its silhouette.
+-   Improve rendering of galleries on the front-end.
+-   Improve Cover Image placeholder visual presentation.
+-   Improve front-end display of quotes.
+-   Improve responsive design of galleries on the front-end.
+-   Allow previewing new posts that are yet to be saved.
+-   Reset scrolling position within inserter when switching tabs.
+-   Refactor popover to render at root of document.
+-   Refactor withFocusReturn to handle accessibility better in more contexts.
+-   Prevent overlap between multi-selection and within-block selection.
+-   Clear save notices when triggering a new save.
+-   Disable "preview" button if post is not saveable.
+-   Renamed blocks.query to blocks.source for clarity and updated documentation.
+-   Rearrange block stylesheets to reflect display and editor styles.
+-   Use @wordpress dependencies consistently.
+-   Added validation checks for specifying a block's category.
+-   Fix problems with quote initialization and list transformation.
+-   Fix issue where Cover Image was being considered invalid after edits.
+-   Fix errors in editable coming from Table block commands.
+-   Fix error in latest posts block when date is not set for a post.
+-   Fix issue with active color in ColorPalette component.
+-   Prevent class=false serialization issue in covert-text.
+-   Treat range control value as numeric.
+-   Added warning when using Editable and passing non-array values.
+-   Show block switcher above link input.
+-   Updated rememo dependency.
+-   Start consuming from separate @wordpress dependencies.
+-   Fix problem with inserting new galleries.
+-   Fix issue with embeds and missing captions.
+-   Added outreach section to docs.
 
 = 0.7.1 =
-* Address problem with the freeform block and Jetpack's contact form.
+
+-   Address problem with the freeform block and Jetpack's contact form.
 
 = 0.7.0 =
-* Hide placeholders on focus—reduces visual distractions while writing.
-* Add PostAuthor dropdown to the UI.
-* Add theme support for customized color palettes and a shared component (applies to cover text and button blocks).
-* Add theme support for wide images.
-* Report on missing headings in the document outline feature.
-* Update block validation to make it less prone to over-eagerness with trivial changes (like whitespace and new lines).
-* Attempt to create an embed block automatically when pasting URL on a single line.
-* Save post before previewing.
-* Improve operations with "lists", enter on empty item creates new paragraph block, handling backspace, etc.
-* Don't serialize attributes that match default attributes.
-* Order link suggestions by relevance.
-* Order embeds for easier discoverability.
-* Added "keywords" property for searching blocks with aliases.
-* Added responsive styles for Table block in the front end.
-* Set default list type to be unordered list.
-* Improve accessibility of UrlInput component.
-* Improve accessibility and keyboard interaction of DropdownMenu.
-* Improve Popover component and use for PostVisibility.
-* Added higher order component for managing spoken messages.
-* Localize schema for WP API, avoiding initialization delay if schema is present.
-* Do not expose editor.settings to block authors.
-* Do not remove tables on pasting.
-* Consolidate block server-side files with client ones in the same directory.
-* Removed array of paragraphs structure from text block.
-* Trim whitespace when searching for blocks.
-* Document, test, and refactor DropdownMenu component.
-* Use separate mousetrap instance per component instance.
-* Add npm organization scope to WordPress dependencies.
-* Expand utilities around fixture regeneration.
-* Renamed "Text" to "Paragraph".
-* Fix multi-selection "delete" functionality.
-* Fix text color inline style.
-* Fix issue caused by changes with React build process.
-* Fix splitting editable without child nodes.
-* Use addQueryArgs in oEmbed proxy url.
-* Update dashicons with new icons.
-* Clarify enqueuing block assets functions.
-* Added code coverage information to docs.
-* Document how to create new docs.
-* Add example of add_theme_support in docs.
-* Added opt-in mechanism for learning what blocks are being added to the content.
+
+-   Hide placeholders on focus—reduces visual distractions while writing.
+-   Add PostAuthor dropdown to the UI.
+-   Add theme support for customized color palettes and a shared component (applies to cover text and button blocks).
+-   Add theme support for wide images.
+-   Report on missing headings in the document outline feature.
+-   Update block validation to make it less prone to over-eagerness with trivial changes (like whitespace and new lines).
+-   Attempt to create an embed block automatically when pasting URL on a single line.
+-   Save post before previewing.
+-   Improve operations with "lists", enter on empty item creates new paragraph block, handling backspace, etc.
+-   Don't serialize attributes that match default attributes.
+-   Order link suggestions by relevance.
+-   Order embeds for easier discoverability.
+-   Added "keywords" property for searching blocks with aliases.
+-   Added responsive styles for Table block in the front end.
+-   Set default list type to be unordered list.
+-   Improve accessibility of UrlInput component.
+-   Improve accessibility and keyboard interaction of DropdownMenu.
+-   Improve Popover component and use for PostVisibility.
+-   Added higher order component for managing spoken messages.
+-   Localize schema for WP API, avoiding initialization delay if schema is present.
+-   Do not expose editor.settings to block authors.
+-   Do not remove tables on pasting.
+-   Consolidate block server-side files with client ones in the same directory.
+-   Removed array of paragraphs structure from text block.
+-   Trim whitespace when searching for blocks.
+-   Document, test, and refactor DropdownMenu component.
+-   Use separate mousetrap instance per component instance.
+-   Add npm organization scope to WordPress dependencies.
+-   Expand utilities around fixture regeneration.
+-   Renamed "Text" to "Paragraph".
+-   Fix multi-selection "delete" functionality.
+-   Fix text color inline style.
+-   Fix issue caused by changes with React build process.
+-   Fix splitting editable without child nodes.
+-   Use addQueryArgs in oEmbed proxy url.
+-   Update dashicons with new icons.
+-   Clarify enqueuing block assets functions.
+-   Added code coverage information to docs.
+-   Document how to create new docs.
+-   Add example of add_theme_support in docs.
+-   Added opt-in mechanism for learning what blocks are being added to the content.
 
 = 0.6.0 =
-* Split paragraphs on enter—we have been exploring different behaviours here.
-* Added grid layout option for latest posts with columns slider control.
-* Show internal posts / pages results when creating links.
-* Added "Cover Text" block with background, text color, and full-width options.
-* Autosaving drafts.
-* Added "Read More" block.
-* Added color options to the button block.
-* Added mechanism for validating and protecting blocks that may have suffered unrecognized edits.
-* Add patterns plugin for text formatting shortcuts: create lists by adding * at the beginning of a text line, use # to create headings, and backticks for code.
-* Implement initial support for Cmd/Ctrl+Z (undo) and Cmd/Ctrl+Shift+Z (redo).
-* Improve pasting experience from outside editors by transforming content before converting to blocks.
-* Improve gallery creation flow by opening into "gallery" mode from placeholder.
-* Added page attributes with menu order setting.
-* Use two distinct icons for quote style variations.
-* Created KeyboardShortcuts component to handle keyboard events.
-* Add support for custom icons (non dashicons) on blocks.
-* Initialize new posts with auto-draft to match behaviour of existing editor.
-* Don't display "save" button for published posts.
-* Added ability to set a block as "use once" only (example: "read more" block).
-* Hide gallery display settings in media modal.
-* Simplify "cover image" markup and resolve conflict state in demo.
-* Introduce PHP classes for interacting with block types.
-* Announce block search results to assistive technologies.
-* Reveal "continue writing" shortcuts on focus.
-* Update document.title when the post title changes.
-* Added focus styles to several elements in the UI.
-* Added external-link component to handle links opening in new tabs or windows.
-* Improve responsive video on embed previews.
-* Improve "speak" messages for tag suggestions.
-* Make sure newly created blocks are marked as valid.
-* Preserve valid state during transformations.
-* Allow tabbing away from table.
-* Improve display of focused panel titles.
-* Adjust padding and margins across various design elements for consistency and normalization.
-* Fix pasting freeform content.
-* Fix proper propagation of updated block attributes.
-* Fix parsing and serialization of multi-paragraph pullquotes.
-* Fix a case where toggling pending preview would consider post as saved.
-* Fix positioning of block mover on full-width blocks.
-* Fix line height regression in quote styles.
-* Fix IE11 with polyfill for fetch method.
-* Fix case where blocks are created with isTyping and it never clears.
-* Fix block warning display in IE11.
-* Polish inspector visual design.
-* Prevent unhandled actions from returning new state reference.
-* Prevent unintentionally clearing link input value.
-* Added focus styles to switch toggle components.
-* Avoid navigating outside the editor with arrow keys.
-* Add short description to Verse block.
-* Initialize demo content only for new demo posts.
-* Improve insert link accessibility.
-* Improve version compare checks for plugin compatibility.
-* Clean up obsolete poststoshowattribute in LatestPosts block.
-* Consolidate addQueryArgs usage.
-* Add unit tests to inserter.
-* Update fixtures with latest modifications and ensure all end in newlines.
-* Added codecov for code coverage.
-* Clean up JSDoc comments.
-* Link to new docs within main readme.
+
+-   Split paragraphs on enter—we have been exploring different behaviours here.
+-   Added grid layout option for latest posts with columns slider control.
+-   Show internal posts / pages results when creating links.
+-   Added "Cover Text" block with background, text color, and full-width options.
+-   Autosaving drafts.
+-   Added "Read More" block.
+-   Added color options to the button block.
+-   Added mechanism for validating and protecting blocks that may have suffered unrecognized edits.
+-   Add patterns plugin for text formatting shortcuts: create lists by adding \* at the beginning of a text line, use # to create headings, and backticks for code.
+-   Implement initial support for Cmd/Ctrl+Z (undo) and Cmd/Ctrl+Shift+Z (redo).
+-   Improve pasting experience from outside editors by transforming content before converting to blocks.
+-   Improve gallery creation flow by opening into "gallery" mode from placeholder.
+-   Added page attributes with menu order setting.
+-   Use two distinct icons for quote style variations.
+-   Created KeyboardShortcuts component to handle keyboard events.
+-   Add support for custom icons (non dashicons) on blocks.
+-   Initialize new posts with auto-draft to match behaviour of existing editor.
+-   Don't display "save" button for published posts.
+-   Added ability to set a block as "use once" only (example: "read more" block).
+-   Hide gallery display settings in media modal.
+-   Simplify "cover image" markup and resolve conflict state in demo.
+-   Introduce PHP classes for interacting with block types.
+-   Announce block search results to assistive technologies.
+-   Reveal "continue writing" shortcuts on focus.
+-   Update document.title when the post title changes.
+-   Added focus styles to several elements in the UI.
+-   Added external-link component to handle links opening in new tabs or windows.
+-   Improve responsive video on embed previews.
+-   Improve "speak" messages for tag suggestions.
+-   Make sure newly created blocks are marked as valid.
+-   Preserve valid state during transformations.
+-   Allow tabbing away from table.
+-   Improve display of focused panel titles.
+-   Adjust padding and margins across various design elements for consistency and normalization.
+-   Fix pasting freeform content.
+-   Fix proper propagation of updated block attributes.
+-   Fix parsing and serialization of multi-paragraph pullquotes.
+-   Fix a case where toggling pending preview would consider post as saved.
+-   Fix positioning of block mover on full-width blocks.
+-   Fix line height regression in quote styles.
+-   Fix IE11 with polyfill for fetch method.
+-   Fix case where blocks are created with isTyping and it never clears.
+-   Fix block warning display in IE11.
+-   Polish inspector visual design.
+-   Prevent unhandled actions from returning new state reference.
+-   Prevent unintentionally clearing link input value.
+-   Added focus styles to switch toggle components.
+-   Avoid navigating outside the editor with arrow keys.
+-   Add short description to Verse block.
+-   Initialize demo content only for new demo posts.
+-   Improve insert link accessibility.
+-   Improve version compare checks for plugin compatibility.
+-   Clean up obsolete poststoshowattribute in LatestPosts block.
+-   Consolidate addQueryArgs usage.
+-   Add unit tests to inserter.
+-   Update fixtures with latest modifications and ensure all end in newlines.
+-   Added codecov for code coverage.
+-   Clean up JSDoc comments.
+-   Link to new docs within main readme.
 
 = 0.5.0 =
-* New tabs mode for the sidebar to switch between post settings and block inspector.
-* Implement recent blocks display.
-* Mobile implementation of block mover, settings, and delete actions.
-* Search through all tabs on the inserter and hide tabs.
-* New documentation app to serve all tutorials, faqs, docs, etc.
-* Enable ability to add custom classes to blocks (via inspector).
-* Add ability to drag-and-drop on image block placeholders to upload images.
-* Add "table of contents" document outline for headings (with empty heading validation).
-* Refactor tests to use Jest API.
-* New block: Verse (intended for poetry, respecting whitespace).
-* Avoid showing UI when typing and starting a new paragraph (text block).
-* Display warning message when navigating away from the editor with unsaved changes.
-* Use old editor as "freeform".
-* Improve PHP parser compatibility with different server configurations ("mbstring" extension and PCRE settings).
-* Improve PostVisibility markup and accessibility.
-* Add shortcuts to manage indents and levels in List block.
-* Add alignment options to latest posts block.
-* Add focus styles for quick tags buttons in text mode.
-* Add way to report PHP parsing performance.
-* Add labels and roles to UrlInput.
-* Add ability to set custom placeholders for text and headings as attributes.
-* Show error message when trashing action fails.
-* Pass content to dynamic block render functions in PHP.
-* Fix various z-index issues and clarify reasonings.
-* Fix DropdownMenu arrows navigation and add missing aria-label.
-* Update sandboxed iframe size calculations.
-* Export inspector controls component under wp.blocks.
-* Adjust Travis JS builds to improve task allocation.
-* Fix warnings during tests.
-* Fix caret jumping when switching formatting in Editable.
-* Explicitly define prop-types as dependency.
-* Update list of supported browsers for consistency with core.
+
+-   New tabs mode for the sidebar to switch between post settings and block inspector.
+-   Implement recent blocks display.
+-   Mobile implementation of block mover, settings, and delete actions.
+-   Search through all tabs on the inserter and hide tabs.
+-   New documentation app to serve all tutorials, faqs, docs, etc.
+-   Enable ability to add custom classes to blocks (via inspector).
+-   Add ability to drag-and-drop on image block placeholders to upload images.
+-   Add "table of contents" document outline for headings (with empty heading validation).
+-   Refactor tests to use Jest API.
+-   New block: Verse (intended for poetry, respecting whitespace).
+-   Avoid showing UI when typing and starting a new paragraph (text block).
+-   Display warning message when navigating away from the editor with unsaved changes.
+-   Use old editor as "freeform".
+-   Improve PHP parser compatibility with different server configurations ("mbstring" extension and PCRE settings).
+-   Improve PostVisibility markup and accessibility.
+-   Add shortcuts to manage indents and levels in List block.
+-   Add alignment options to latest posts block.
+-   Add focus styles for quick tags buttons in text mode.
+-   Add way to report PHP parsing performance.
+-   Add labels and roles to UrlInput.
+-   Add ability to set custom placeholders for text and headings as attributes.
+-   Show error message when trashing action fails.
+-   Pass content to dynamic block render functions in PHP.
+-   Fix various z-index issues and clarify reasonings.
+-   Fix DropdownMenu arrows navigation and add missing aria-label.
+-   Update sandboxed iframe size calculations.
+-   Export inspector controls component under wp.blocks.
+-   Adjust Travis JS builds to improve task allocation.
+-   Fix warnings during tests.
+-   Fix caret jumping when switching formatting in Editable.
+-   Explicitly define prop-types as dependency.
+-   Update list of supported browsers for consistency with core.
 
 = 0.4.0 =
-* Initial FAQ (in progress).
-* API for handling pasted content. (Aim is to have specific handling for converting Word, Markdown, Google Docs to native WordPress blocks.)
-* Added support for linking to a url on image blocks.
-* Navigation between blocks using arrow keys.
-* Added alternate Table block with TinyMCE functionality for adding/removing rows/cells, etc. Retired previous one.
-* Parse more/noteaser comment tokens from core.
-* Re-engineer the approach for rendering embed frames.
-* First pass at adding aria-labels to blocks list.
-* Setting up Jest for better testing environment.
-* Improve performance of server-side parsing.
-* Update blocks documentation with latest API functions and clearer examples.
-* Use fixed position for notices.
-* Make inline mode the default for Editable.
-* Add actions for plugins to register frontend and editor assets.
-* Supress gallery settings sidebar on media library when editing gallery.
-* Validate save and edit render when registering a block.
-* Prevent media library modal from opening when loading placeholders.
-* Update to sidebar design and behaviour on mobile.
-* Improve font-size in inserter and latest posts block.
-* Improve rendering of button block in the front end.
-* Add aria-label to edit image button.
-* Add aria-label to embed input url input.
-* Use pointer cursor for tabs in inserter.
-* Update design docs with regard to selected/unselected states.
-* Improve generation of wp-block-* classes for consistency.
-* Select first cell of table block when initializing.
-* Fix wide and full alignment on the front-end when images have no caption.
-* Fix initial state of freeform block.
-* Fix ability to navigate to resource on link viewer.
-* Fix clearing floats on inserter.
-* Fix loading of images in library.
-* Fix auto-focusing on table block being too agressive.
-* Clean double reference to pegjs in dependencies.
-* Include messages to ease debugging parser.
-* Check for exact match for serialized content in parser tests.
-* Add allow-presentation to fix issue with sandboxed iframe in Chrome.
-* Declare use of classnames module consistently.
-* Add translation to embed title.
-* Add missing text domains and adjust PHPCS to warn about them.
-* Added template for creating new issues including mentions of version number.
+
+-   Initial FAQ (in progress).
+-   API for handling pasted content. (Aim is to have specific handling for converting Word, Markdown, Google Docs to native WordPress blocks.)
+-   Added support for linking to a url on image blocks.
+-   Navigation between blocks using arrow keys.
+-   Added alternate Table block with TinyMCE functionality for adding/removing rows/cells, etc. Retired previous one.
+-   Parse more/noteaser comment tokens from core.
+-   Re-engineer the approach for rendering embed frames.
+-   First pass at adding aria-labels to blocks list.
+-   Setting up Jest for better testing environment.
+-   Improve performance of server-side parsing.
+-   Update blocks documentation with latest API functions and clearer examples.
+-   Use fixed position for notices.
+-   Make inline mode the default for Editable.
+-   Add actions for plugins to register frontend and editor assets.
+-   Supress gallery settings sidebar on media library when editing gallery.
+-   Validate save and edit render when registering a block.
+-   Prevent media library modal from opening when loading placeholders.
+-   Update to sidebar design and behaviour on mobile.
+-   Improve font-size in inserter and latest posts block.
+-   Improve rendering of button block in the front end.
+-   Add aria-label to edit image button.
+-   Add aria-label to embed input url input.
+-   Use pointer cursor for tabs in inserter.
+-   Update design docs with regard to selected/unselected states.
+-   Improve generation of wp-block-\* classes for consistency.
+-   Select first cell of table block when initializing.
+-   Fix wide and full alignment on the front-end when images have no caption.
+-   Fix initial state of freeform block.
+-   Fix ability to navigate to resource on link viewer.
+-   Fix clearing floats on inserter.
+-   Fix loading of images in library.
+-   Fix auto-focusing on table block being too agressive.
+-   Clean double reference to pegjs in dependencies.
+-   Include messages to ease debugging parser.
+-   Check for exact match for serialized content in parser tests.
+-   Add allow-presentation to fix issue with sandboxed iframe in Chrome.
+-   Declare use of classnames module consistently.
+-   Add translation to embed title.
+-   Add missing text domains and adjust PHPCS to warn about them.
+-   Added template for creating new issues including mentions of version number.
 
 = 0.3.0 =
-* Added framework for notices and implemented publishing and saving ones.
-* Implemented tabs on the inserter.
-* Added text and image quick inserts next to inserter icon at the end of the post.
-* Generate front-end styles for core blocks and enqueue them.
-* Include generated block classname in edit environment.
-* Added "edit image" button to image and cover image blocks.
-* Added option to visually crop images in galleries for nicer alignment.
-* Added option to disable dimming the background in cover images.
-* Added buffer for multi-select flows.
-* Added option to display date and to configure number of posts in LatestPosts block.
-* Added PHP parser based on PEG.js to unify grammars.
-* Split block styles for display so they can be loaded on the theme.
-* Auto-focusing for inserter search field.
-* Added text formatting to CoverImage block.
-* Added toggle option for fixed background in CoverImage.
-* Switched to store attributes in unescaped JSON format within the comments.
-* Added placeholder for all text blocks.
-* Added placeholder text for headings, quotes, etc.
-* Added BlockDescription component and applied it to several blocks.
-* Implemented sandboxing iframe for embeds.
-* Include alignment classes on embeds with wrappers.
-* Changed the block name declaration for embeds to be "core-embed/name-of-embed".
-* Simplified and made more robust the rendering of embeds.
-* Different fixes for quote blocks (parsing and transformations).
-* Improve display of text within cover image.
-* Fixed placeholder positioning in several blocks.
-* Fixed parsing of HTML block.
-* Fixed toolbar calculations on blocks without toolbars.
-* Added heading alignments and levels to inspector.
-* Added sticky post setting and toggle.
-* Added focus styles to inserter search.
-* Add design blueprints and principles to the storybook.
-* Enhance FormTokenField with accessibility improvements.
-* Load word-count module.
-* Updated icons for trash button, and Custom HTML.
-* Design tweaks for inserter, placeholders, and responsiveness.
-* Improvements to sidebar headings and gallery margins.
-* Allow deleting selected blocks with "delete" key.
-* Return more than 10 categories/tags in post settings.
-* Accessibility improvements with FormToggle.
-* Fix media button in gallery placeholder.
-* Fix sidebar breadcrumb.
-* Fix for block-mover when blocks are floated.
-* Fixed inserting Freeform block (now classic text).
-* Fixed missing keys on inserter.
-* Updated drop-cap class implementation.
-* Showcasing full-width cover image in demo content.
-* Copy fixes on demo content.
-* Hide meta-boxes icons for screen readers.
-* Handle null values in link attributes.
+
+-   Added framework for notices and implemented publishing and saving ones.
+-   Implemented tabs on the inserter.
+-   Added text and image quick inserts next to inserter icon at the end of the post.
+-   Generate front-end styles for core blocks and enqueue them.
+-   Include generated block classname in edit environment.
+-   Added "edit image" button to image and cover image blocks.
+-   Added option to visually crop images in galleries for nicer alignment.
+-   Added option to disable dimming the background in cover images.
+-   Added buffer for multi-select flows.
+-   Added option to display date and to configure number of posts in LatestPosts block.
+-   Added PHP parser based on PEG.js to unify grammars.
+-   Split block styles for display so they can be loaded on the theme.
+-   Auto-focusing for inserter search field.
+-   Added text formatting to CoverImage block.
+-   Added toggle option for fixed background in CoverImage.
+-   Switched to store attributes in unescaped JSON format within the comments.
+-   Added placeholder for all text blocks.
+-   Added placeholder text for headings, quotes, etc.
+-   Added BlockDescription component and applied it to several blocks.
+-   Implemented sandboxing iframe for embeds.
+-   Include alignment classes on embeds with wrappers.
+-   Changed the block name declaration for embeds to be "core-embed/name-of-embed".
+-   Simplified and made more robust the rendering of embeds.
+-   Different fixes for quote blocks (parsing and transformations).
+-   Improve display of text within cover image.
+-   Fixed placeholder positioning in several blocks.
+-   Fixed parsing of HTML block.
+-   Fixed toolbar calculations on blocks without toolbars.
+-   Added heading alignments and levels to inspector.
+-   Added sticky post setting and toggle.
+-   Added focus styles to inserter search.
+-   Add design blueprints and principles to the storybook.
+-   Enhance FormTokenField with accessibility improvements.
+-   Load word-count module.
+-   Updated icons for trash button, and Custom HTML.
+-   Design tweaks for inserter, placeholders, and responsiveness.
+-   Improvements to sidebar headings and gallery margins.
+-   Allow deleting selected blocks with "delete" key.
+-   Return more than 10 categories/tags in post settings.
+-   Accessibility improvements with FormToggle.
+-   Fix media button in gallery placeholder.
+-   Fix sidebar breadcrumb.
+-   Fix for block-mover when blocks are floated.
+-   Fixed inserting Freeform block (now classic text).
+-   Fixed missing keys on inserter.
+-   Updated drop-cap class implementation.
+-   Showcasing full-width cover image in demo content.
+-   Copy fixes on demo content.
+-   Hide meta-boxes icons for screen readers.
+-   Handle null values in link attributes.
 
 = 0.2.0 =
-* Include "paste" as default plugin in Editable.
-* Extract block alignment controls as a reusable component.
-* Added button to delete a block.
-* Added button to open block settings in the inspector.
-* New block: Custom HTML (to write your own HTML and preview it).
-* New block: Cover Image (with text over image support).
-* Rename "Freeform" block to "Classic Text".
-* Added support for pages and custom post types.
-* Improve display of "saving" label while saving.
-* Drop usage of controls property in favor of components in render.
-* Add ability to select all blocks with ctrl/command+A.
-* Automatically generate wrapper class for styling blocks.
-* Avoid triggering multi-select on right click.
-* Improve target of post previewing.
-* Use imports instead of accessing the wp global.
-* Add block alignment and proper placeholders to pullquote block.
-* Wait for wp.api before loading the editor. (Interim solution.)
-* Adding several reusable inspector controls.
-* Design improvements to floats, switcher, and headings.
-* Add width classes on figure wrapper when using captions in images.
-* Add image alt attributes.
-* Added html generation for photo type embeds.
-* Make sure plugin is run on WP 4.8.
-* Update revisions button to only show when there are revisions.
-* Parsing fixes on do_blocks.
-* Avoid being keyboard trapped on editor content.
-* Don't show block toolbars when pressing modifier keys.
-* Fix overlapping controls in Button block.
-* Fix post-title line height.
-* Fix parsing void blocks.
-* Fix splitting inline Editable instances with shift+enter.
-* Fix transformation between text and list, and quote and list.
-* Fix saving new posts by making post-type mandatory.
-* Render popovers above all elements.
-* Improvements to block deletion using backspace.
-* Changing the way block outlines are rendered on hover.
-* Updated PHP parser to handle shorthand block syntax, and fix newlines.
-* Ability to cancel adding a link from link menu.
+
+-   Include "paste" as default plugin in Editable.
+-   Extract block alignment controls as a reusable component.
+-   Added button to delete a block.
+-   Added button to open block settings in the inspector.
+-   New block: Custom HTML (to write your own HTML and preview it).
+-   New block: Cover Image (with text over image support).
+-   Rename "Freeform" block to "Classic Text".
+-   Added support for pages and custom post types.
+-   Improve display of "saving" label while saving.
+-   Drop usage of controls property in favor of components in render.
+-   Add ability to select all blocks with ctrl/command+A.
+-   Automatically generate wrapper class for styling blocks.
+-   Avoid triggering multi-select on right click.
+-   Improve target of post previewing.
+-   Use imports instead of accessing the wp global.
+-   Add block alignment and proper placeholders to pullquote block.
+-   Wait for wp.api before loading the editor. (Interim solution.)
+-   Adding several reusable inspector controls.
+-   Design improvements to floats, switcher, and headings.
+-   Add width classes on figure wrapper when using captions in images.
+-   Add image alt attributes.
+-   Added html generation for photo type embeds.
+-   Make sure plugin is run on WP 4.8.
+-   Update revisions button to only show when there are revisions.
+-   Parsing fixes on do_blocks.
+-   Avoid being keyboard trapped on editor content.
+-   Don't show block toolbars when pressing modifier keys.
+-   Fix overlapping controls in Button block.
+-   Fix post-title line height.
+-   Fix parsing void blocks.
+-   Fix splitting inline Editable instances with shift+enter.
+-   Fix transformation between text and list, and quote and list.
+-   Fix saving new posts by making post-type mandatory.
+-   Render popovers above all elements.
+-   Improvements to block deletion using backspace.
+-   Changing the way block outlines are rendered on hover.
+-   Updated PHP parser to handle shorthand block syntax, and fix newlines.
+-   Ability to cancel adding a link from link menu.
 
 = 0.1.0 =
-* First release of the plugin.
+
+-   First release of the plugin.
diff --git a/composer.json b/composer.json
index 3571377bd58bd7..982a71a975223d 100644
--- a/composer.json
+++ b/composer.json
@@ -23,14 +23,15 @@
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true,
 			"composer/installers": true
-		}
+		},
+		"lock": false
 	},
 	"require-dev": {
 		"phpcompatibility/phpcompatibility-wp": "^2.1.3",
 		"wp-coding-standards/wpcs": "^3.0",
 		"sirbrillig/phpcs-variable-analysis": "^2.8",
 		"spatie/phpunit-watcher": "^1.23",
-		"yoast/phpunit-polyfills": "^1.0",
+		"yoast/phpunit-polyfills": "^1.1.0",
 		"gutenberg/gutenberg-coding-standards": "@dev"
 	},
 	"repositories": [
@@ -43,7 +44,7 @@
 		}
 	],
 	"require": {
-		"composer/installers": "~1.0"
+		"composer/installers": "^1.0 || ^2.0"
 	},
 	"scripts": {
 		"format": "phpcbf --standard=phpcs.xml.dist --report-summary --report-source",
diff --git a/docs/README.md b/docs/README.md
index 222b54209c7d62..31471a9928b2cf 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,63 +1,58 @@
 # Block Editor Handbook
 
-👋 Welcome to the Block Editor Handbook.
+Welcome to the Block Editor Handbook.
 
-The [**Block Editor**](https://wordpress.org/gutenberg/) is a modern and up-to-date paradigm for WordPress site building and publishing. It uses a modular system of **Blocks** to compose and format content and is designed to create rich and flexible layouts for websites and digital products.
+The [**Block Editor**](https://wordpress.org/gutenberg/) is a modern paradigm for WordPress site building and publishing. It uses a modular system of **blocks** to compose and format content and is designed to create rich and flexible layouts for websites and digital products.
 
-The editor consists of several primary elements, as shown in the following figure:
+The Block Editor consists of several primary elements, as shown in the following figure:
 
-![Quick view of the block editor](https://raw.githubusercontent.com/WordPress/gutenberg/trunk/docs/assets/overview-block-editor-2023.png)
+![Quick view of the Block Editor](https://raw.githubusercontent.com/WordPress/gutenberg/trunk/docs/assets/overview-block-editor-2023.png)
 
-The elements highlighted in the figure are:
+The elements highlighted are:
 
-1. **Inserter**: A panel for inserting blocks into the content canvas
-2. **Content canvas**: The content editor, which holds content created with blocks
-3. **Settings Sidebar**: A sidebar panel for configuring a block’s settings (among other things)
+1. **Inserter:** A panel for inserting blocks into the content canvas
+2. **Content canvas:** The content editor, which holds content created with blocks
+3. **Settings Panel** A panel for configuring a block’s settings when selected or the settings of the post
 
-Through the Block editor, you create content modularly using Blocks. There are many [core blocks](https://developer.wordpress.org/block-editor/reference-guides/core-blocks/) ready to be used, and you can also [create your own custom block](https://developer.wordpress.org/block-editor/getting-started/create-block/).
+Through the Block Editor, you create content modularly using blocks. Many [blocks](https://developer.wordpress.org/block-editor/reference-guides/core-blocks/) are available in WordPress by default, and you can also [create your own](https://developer.wordpress.org/block-editor/getting-started/create-block/).
 
-A [Block](https://developer.wordpress.org/block-editor/explanations/architecture/key-concepts/#blocks) is a discrete element such as a Paragraph, Heading, Media, or Embed. Each block is treated as a separate element with individual editing and format controls. When all these components are pieced together, they make up the content that is then [stored in the WordPress database](https://developer.wordpress.org/block-editor/explanations/architecture/data-flow/#serialization-and-parsing).
+A [block](https://developer.wordpress.org/block-editor/explanations/architecture/key-concepts/#blocks) is a discrete element such as a Paragraph, Heading, Media, or Embed. Each block is treated as a separate element with individual editing and format controls. When all these components are pieced together, they make up the content of the page or post, which is then [stored in the WordPress database](https://developer.wordpress.org/block-editor/explanations/architecture/data-flow/#serialization-and-parsing).
 
 The Block Editor is the result of the work done on the [**Gutenberg project**](https://developer.wordpress.org/block-editor/getting-started/faq/#what-is-gutenberg), which aims to revolutionize the WordPress editing experience.
 
-Besides offering an [enhanced editing experience](https://wordpress.org/gutenberg/) through visual content creation tools, the Block Editor is also a powerful developer platform with a [rich feature set of APIs](https://developer.wordpress.org/block-editor/reference-guides/) that allow it to be manipulated and extended many different ways.
+Besides offering an [enhanced editing experience](https://wordpress.org/gutenberg/) through visual content creation tools, the Block Editor is also a powerful developer platform with a [rich feature set of APIs](https://developer.wordpress.org/block-editor/reference-guides/) that allow it to be manipulated and extended in countless ways.
 
 ## Navigating this handbook
 
-This handbook is focused on block development and is divided into five sections, each serving a different purpose.
+This handbook is focused on block development and is divided into five major sections.
 
+- **[Getting Started](https://developer.wordpress.org/block-editor/getting-started/):** For those just starting out with block development, this is where you can get set up with a [development environment](https://developer.wordpress.org/block-editor/getting-started/devenv/) and learn the [fundamentals of block development](https://developer.wordpress.org/block-editor/getting-started/fundamentals/). Its [Quick Start Guide](https://developer.wordpress.org/block-editor/getting-started/quick-start-guide/) and [Tutorial: Build your first block](https://developer.wordpress.org/block-editor/getting-started/tutorial/) are great places to start learning block development.
 
-- [**Getting Started**](https://developer.wordpress.org/block-editor/getting-started/) - For those just starting out with block development, this is where you can get set up with a [development environment](https://developer.wordpress.org/block-editor/getting-started/devenv/) and learn the [fundamentals of block development](https://developer.wordpress.org/block-editor/getting-started/create-block/). Its [Glossary of terms](https://developer.wordpress.org/block-editor/getting-started/glossary/) and [FAQs](https://developer.wordpress.org/block-editor/getting-started/faq/) should answer any outstanding questions you may have.
+- **[How-to Guides](https://developer.wordpress.org/block-editor/how-to-guides/):** Here, you can build on what you learned in the Getting Started section and learn how to solve particular problems. You will also find tutorials and example code to reuse in your own projects, such as [working with WordPress data](https://developer.wordpress.org/block-editor/how-to-guides/data-basics/) or [Curating the Editor Experience](https://developer.wordpress.org/block-editor/how-to-guides/curating-the-editor-experience/).
 
+- **[Reference Guides](https://developer.wordpress.org/block-editor/reference-guides/):** This section is the heart of the handbook and is where you can get down to the nitty-gritty and look up the details of the particular API you’re working with or need information on. Among other things, the [Block API Reference](https://developer.wordpress.org/block-editor/reference-guides/block-api/) covers most of what you will want to do with a block, and each [component](https://developer.wordpress.org/block-editor/reference-guides/components/) and [package](https://developer.wordpress.org/block-editor/reference-guides/packages/) is also documented here. _Components are also documented via [Storybook](https://wordpress.github.io/gutenberg/?path=/story/docs-introduction--page)._
 
-- [**How-to Guides**](https://developer.wordpress.org/block-editor/how-to-guides/) - Here, you can build on what you learned in the Getting Started section and learn how to solve particular problems you might encounter. You can also get tutorials and example code that you can reuse for projects such as [building a full-featured block](https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/) or [working with WordPress’ data](https://developer.wordpress.org/block-editor/how-to-guides/data-basics/). In addition, you can learn [How to use JavaScript with the Block Editor](https://developer.wordpress.org/block-editor/how-to-guides/javascript/).
-
-
-- [**Reference Guides**](https://developer.wordpress.org/block-editor/reference-guides/) - This section is the heart of the handbook and is where you can get down to the nitty-gritty and look up the details of the particular API you’re working with or need information on. Among other things, the [Block API Reference](https://developer.wordpress.org/block-editor/reference-guides/block-api/) covers most of what you will want to do with a block, and each [component](https://developer.wordpress.org/block-editor/reference-guides/components/) and [package](https://developer.wordpress.org/block-editor/reference-guides/packages/) is also documented here. _Components are also documented via [Storybook](https://wordpress.github.io/gutenberg/?path=/story/docs-introduction--page)._
-
-
-- [**Explanations**](https://developer.wordpress.org/block-editor/explanations/) - This section enables you to go deeper and reinforce your practical knowledge with a theoretical understanding of the [Architecture](https://developer.wordpress.org/block-editor/explanations/architecture/) of the block editor.
-
-- [**Contributor Guide**](https://developer.wordpress.org/block-editor/contributors/) - Gutenberg is open source software, and anyone is welcome to contribute to the project. This section details how to contribute and can help you choose in which way you want to contribute, whether with [code](https://developer.wordpress.org/block-editor/contributors/code/), [design](https://developer.wordpress.org/block-editor/contributors/design/), [documentation](https://developer.wordpress.org/block-editor/contributors/documentation/), or in some other way.
+- **[Explanations](https://developer.wordpress.org/block-editor/explanations/):** This section enables you to go deeper and reinforce your practical knowledge with a theoretical understanding of the [Architecture](https://developer.wordpress.org/block-editor/explanations/architecture/) of the Block Editor.
 
+- **[Contributor Guide](https://developer.wordpress.org/block-editor/contributors/):** Gutenberg is open-source software, and everyone is welcome to contribute to the project. This section details how to contribute, whether with [code](https://developer.wordpress.org/block-editor/contributors/code/), [design](https://developer.wordpress.org/block-editor/contributors/design/), [documentation](https://developer.wordpress.org/block-editor/contributors/documentation/), or in some other way.
 
 ## Further resources
 
 This handbook should be considered the canonical resource for all things related to block development. However, there are other resources that can help you.
 
-- [**WordPress Developer Blog**](https://developer.wordpress.org/news/) - An ever-growing resource of technical articles covering specific topics related to block development and a wide variety of use cases. The blog is also an excellent way to [keep up with the latest developments in WordPress](https://developer.wordpress.org/news/tag/roundup/).
-- [**Learn WordPress**](https://learn.wordpress.org/) - The WordPress hub for learning resources where you can find courses like [Introduction to Block Development: Build your first custom block](https://learn.wordpress.org/course/introduction-to-block-development-build-your-first-custom-block/), [Converting a Shortcode to a Block](https://learn.wordpress.org/course/converting-a-shortcode-to-a-block/) or [Using the WordPress Data Layer](https://learn.wordpress.org/course/using-the-wordpress-data-layer/)
-- [**WordPress.tv**](https://wordpress.tv/) - A hub of WordPress-related videos (from talks at WordCamps to recordings of online workshops) curated and moderated by the WordPress.org community. You’re sure to find something to aid your learning about [block development](https://wordpress.tv/?s=block%20development&sort=newest) or the [Block Editor](https://wordpress.tv/?s=block%20editor&sort=relevance) here.
-- [**Gutenberg repository**](https://github.com/WordPress/gutenberg/) - Development of the block editor project is carried out in this GitHub repository. It contains the code of interesting packages such as [`block-library`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src) (core blocks) or [`components`](https://github.com/WordPress/gutenberg/tree/trunk/packages/components) (common UI elements). _The [gutenberg-examples](https://github.com/WordPress/gutenberg-examples) repository is another useful reference._
-- [**End User Documentation**](https://wordpress.org/documentation/) - This documentation site is targeted to the end user (not developers), where you can also find documentation about the [Block Editor](https://wordpress.org/documentation/category/block-editor/) and [working with blocks](https://wordpress.org/documentation/article/work-with-blocks/).
+- **[WordPress Developer Blog](https://developer.wordpress.org/news/):** An ever-growing resource of technical articles covering specific topics related to block development and a wide variety of use cases. The blog is also an excellent way to [keep up with the latest developments in WordPress](https://developer.wordpress.org/news/tag/roundup/).
+- **[Learn WordPress](https://learn.wordpress.org/):** The WordPress hub for learning resources where you can find courses like [Introduction to Block Development: Build your first custom block](https://learn.wordpress.org/course/introduction-to-block-development-build-your-first-custom-block/), [Converting a Shortcode to a Block](https://learn.wordpress.org/course/converting-a-shortcode-to-a-block/), or [Using the WordPress Data Layer](https://learn.wordpress.org/course/using-the-wordpress-data-layer/)
+- **[WordPress.tv](https://wordpress.tv/):** A hub of WordPress-related videos (from talks at WordCamps to recordings of online workshops) curated and moderated by the WordPress community. You’re sure to find something to aid your learning about [block development](https://wordpress.tv/?s=block%20development&sort=newest) or the [Block Editor](https://wordpress.tv/?s=block%20editor&sort=relevance) here.
+- **[Gutenberg repository](https://github.com/WordPress/gutenberg/):** Development of the Block Editor takes place on GitHub. The repository contains the code of interesting packages such as [`block-library`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src) (core blocks) or [`components`](https://github.com/WordPress/gutenberg/tree/trunk/packages/components) (common UI elements). _The [block-development-examples](https://github.com/WordPress/block-development-examples) repository is another useful reference._
+- **[End User Documentation](https://wordpress.org/documentation/):** This documentation site is targeted to the end user (not developers), where you can also find documentation about the [Block Editor](https://wordpress.org/documentation/category/block-editor/) and [working with blocks](https://wordpress.org/documentation/article/work-with-blocks/).
 
 ## Are you in the right place?
 
-[This handbook](https://developer.wordpress.org/block-editor) is targeted at those seeking to develop for the block editor, but several other handbooks exist for WordPress developers under [developer.wordpress.org](http://developer.wordpress.org/):
+The Block Editor Handbook is designed for those looking to create and develop for the Block Editor. However, it's important to note that there are multiple other handbooks available within the [Developer Resources](http://developer.wordpress.org/) that you may find beneficial:
 
-- [/themes](https://developer.wordpress.org/themes) - Theme Handbook
-- [/plugins](https://developer.wordpress.org/plugins) - Plugin Handbook
-- [/apis](https://developer.wordpress.org/apis) - Common APIs Handbook
-- [/advanced-administration](https://developer.wordpress.org/advanced-administration) - WP Advanced Administration Handbook
-- [/rest-api](https://developer.wordpress.org/rest-api/) - REST API Handbook
-- [/coding-standards](https://developer.wordpress.org/coding-standards) - Best practices for WordPress developers
+- [Theme Handbook](https://developer.wordpress.org/themes)
+- [Plugin Handbook](https://developer.wordpress.org/plugins)
+- [Common APIs Handbook](https://developer.wordpress.org/apis)
+- [Advanced Administration Handbook](https://developer.wordpress.org/advanced-administration)
+- [REST API Handbook](https://developer.wordpress.org/rest-api/)
+- [Coding Standards Handbook](https://developer.wordpress.org/coding-standards)
diff --git a/docs/assets/plugin-sidebar-closed-state.png b/docs/assets/plugin-sidebar-closed-state.png
deleted file mode 100644
index 025da900ffcdd5..00000000000000
Binary files a/docs/assets/plugin-sidebar-closed-state.png and /dev/null differ
diff --git a/docs/assets/plugin-sidebar-open-state.png b/docs/assets/plugin-sidebar-open-state.png
index f1c3781a500f00..a114f7119020ab 100644
Binary files a/docs/assets/plugin-sidebar-open-state.png and b/docs/assets/plugin-sidebar-open-state.png differ
diff --git a/docs/assets/text-decoration-component.png b/docs/assets/text-decoration-component.png
new file mode 100644
index 00000000000000..4626f953cf9c13
Binary files /dev/null and b/docs/assets/text-decoration-component.png differ
diff --git a/docs/contributors/README.md b/docs/contributors/README.md
index 33255d778526f6..ccf56119917329 100644
--- a/docs/contributors/README.md
+++ b/docs/contributors/README.md
@@ -18,7 +18,7 @@ Find the section below based on what you are looking to contribute:
 
 -   **Internationalization?** See the [localizing and translating section](/docs/contributors/localizing.md)
 
-### Repository Management
+### Repository management
 
 The Gutenberg project uses GitHub for managing code and tracking issues. Please see the following sections for the project methodologies using GitHub.
 
diff --git a/docs/contributors/accessibility-testing.md b/docs/contributors/accessibility-testing.md
index 8012b5214764c2..ded036e19cb5a5 100644
--- a/docs/contributors/accessibility-testing.md
+++ b/docs/contributors/accessibility-testing.md
@@ -2,11 +2,11 @@
 
 This is a guide on how to test accessibility on Gutenberg. This is a living document that can be improved over time with new approaches and techniques.
 
-## Getting Started
+## Getting started
 
 Make sure you have set up your local environment following the instructions on [Getting Started](/docs/contributors/code/getting-started-with-code-contribution.md).
 
-## Keyboard Testing
+## Keyboard testing
 
 In addition to mouse, make sure the interface is fully accessible for keyboard-only users. Try to interact with your changes using only the keyboard:
 
@@ -18,7 +18,7 @@ If the elements can be focused using arrow keys, but not <kbd>Tab</kbd> or <kbd>
 
 If the interaction is complex or confusing to you, consider that it's also going to impact keyboard-only users.
 
-## Screen Reader Testing
+## Screen reader testing
 
 According to the [WebAIM: Screen Reader User Survey #8 Results](https://webaim.org/projects/screenreadersurvey8/#usage), these are the most common screen reader and browser combinations:
 
diff --git a/docs/contributors/code/README.md b/docs/contributors/code/README.md
index caaa9221f240fe..4c965e69dbcefa 100644
--- a/docs/contributors/code/README.md
+++ b/docs/contributors/code/README.md
@@ -4,17 +4,17 @@ A guide on how to get started contributing code to the Gutenberg project.
 
 ## Discussions
 
-The [Make WordPress Core blog](https://make.wordpress.org/core/) is the primary spot for the latest information around WordPress development: including announcements, product goals, meeting notes, meeting agendas, and more.
+The [Make WordPress Core blog](https://make.wordpress.org/core/) is the primary spot for the latest information around WordPress development, including announcements, product goals, meeting notes, meeting agendas, and more.
 
-Real-time discussions for development take place in `#core-editor` and `#core-js` channels in [Make WordPress Slack](https://make.wordpress.org/chat) (registration required). Weekly meetings for the editor component are on Wednesdays at 14:00UTC, and for the JavaScript component on Tuesday at 15:00UTC, in their respective Slack channels.
+Development discussions take place in real-time in the `#core-editor` and `#core-js` channels in [Make WordPress Slack](https://make.wordpress.org/chat) (registration required).
 
 ## Development Hub
 
-The Gutenberg project uses GitHub for managing code and tracking issues. The main repository is at: [https://github.com/WordPress/gutenberg](https://github.com/WordPress/gutenberg).
+The Gutenberg project uses GitHub to manage code and track issues. The main repository is at: [https://github.com/WordPress/gutenberg](https://github.com/WordPress/gutenberg).
 
 Browse [the issues list](https://github.com/wordpress/gutenberg/issues) to find issues to work on. The [good first issue](https://github.com/wordpress/gutenberg/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+First+Issue%22) and [good first review](https://github.com/WordPress/gutenberg/pulls?q=is%3Aopen+is%3Apr+label%3A%22Good+First+Review%22) labels are good starting points.
 
-## Contributor Resources
+## Contributor resources
 
 -   [Getting Started](/docs/contributors/code/getting-started-with-code-contribution.md) documents getting your development environment setup, this includes your test site and developer tools suggestions.
 -   [Git Workflow](/docs/contributors/code/git-workflow.md) documents the git process for deploying changes using pull requests.
diff --git a/docs/contributors/code/back-merging-to-wp-core.md b/docs/contributors/code/back-merging-to-wp-core.md
new file mode 100644
index 00000000000000..2ae1efb1727415
--- /dev/null
+++ b/docs/contributors/code/back-merging-to-wp-core.md
@@ -0,0 +1,38 @@
+# Back-merging code to WordPress Core
+
+For major releases of the WordPress software, Gutenberg features need to be merged into WordPress Core. Typically this involves taking changes made in `.php` files within the Gutenberg repository and making the equivalent updates in the WP Core codebase.
+
+## Criteria
+
+### Files/Directories
+
+Changes to files within the following files/directories will typically require back-merging to WP Core:
+
+-   `lib/`
+-   `phpunit/`
+
+### Ignored directories/files
+
+The following directories/files do _not_ require back-merging to WP Core:
+
+-   `lib/load.php` - Plugin specific code.
+-   `lib/experiments-page.php` - experiments are Plugin specific.
+-   `packages/block-library` - this is handled automatically during the packages sync process.
+-   `packages/e2e-tests/plugins` - PHP files related to e2e tests only. Mostly fixture data generators.
+-   `phpunit/blocks` - the code is maintained in Gutenberg so the test should be as well.
+
+Please note this list is not exhaustive.
+
+### Pull Request Criteria
+
+In general, all PHP code committed to the Gutenberg repository since the date of the final Gutenberg release that was included in [the _last_ stable WP Core release](https://developer.wordpress.org/block-editor/contributors/versions-in-wordpress/) should be considered for back merging to WP Core.
+
+There are however certain exceptions to that rule. PRs with the following criteria do _not_ require back-merging to WP Core:
+
+-   Does not contain changes to PHP code.
+-   Has label `Backport from WordPress Core` - this code is already in WP Core and is being synchronized back to Gutenberg.
+-   Has label `Backported to WordPress Core` - this code has already been synchronized to WP Core.
+
+## Further Reading
+
+Please see also additional documentation regarding [Gutenberg PHP code](/lib/README.md).
diff --git a/docs/contributors/code/backward-compatibility.md b/docs/contributors/code/backward-compatibility.md
index 96615fe793a505..ce0f58a079c759 100644
--- a/docs/contributors/code/backward-compatibility.md
+++ b/docs/contributors/code/backward-compatibility.md
@@ -61,7 +61,7 @@ deprecated( 'wp.components.ClipboardButton', {
 } );
 ```
 
-## Dev Notes
+## Dev notes
 
 Dev notes are [posts published on the make/core site](https://make.wordpress.org/core/tag/dev-notes/) prior to WordPress releases to inform third-party developers about important changes to the developer APIs, these changes can include:
 
@@ -70,7 +70,7 @@ Dev notes are [posts published on the make/core site](https://make.wordpress.org
 -   Unavoidable backward compatibility breakage, with reasoning and migration flows.
 -   Important deprecations (even without breakage), with reasoning and migration flows.
 
-### Dev Note Workflow
+### Dev note workflow
 
 -   When working on a pull request and the need for a dev note is discovered, add the **Needs Dev Note** label to the PR.
 -   If possible, add a comment to the PR explaining why the dev note is needed.
diff --git a/docs/contributors/code/coding-guidelines.md b/docs/contributors/code/coding-guidelines.md
index 53f0a0f8d10002..d8a5220c70ca24 100644
--- a/docs/contributors/code/coding-guidelines.md
+++ b/docs/contributors/code/coding-guidelines.md
@@ -39,13 +39,13 @@ Components may be assigned with class names that indicate states (for example, a
 
 **Example:**
 
-Consider again the Notices example. We may want to apply specific styling for dismissible notices. The [`classnames` package](https://www.npmjs.com/package/classnames) can be a helpful utility for conditionally applying modifier class names.
+Consider again the Notices example. We may want to apply specific styling for dismissible notices. The [`clsx` package](https://www.npmjs.com/package/clsx) can be a helpful utility for conditionally applying modifier class names.
 
 ```jsx
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 export default function Notice( { children, onRemove, isDismissible } ) {
-	const classes = classnames( 'components-notice', {
+	const classes = clsx( 'components-notice', {
 		'is-dismissible': isDismissible,
 	} );
 
@@ -55,7 +55,7 @@ export default function Notice( { children, onRemove, isDismissible } ) {
 
 A component's class name should **never** be used outside its own folder (with rare exceptions such as [`_z-index.scss`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/base-styles/_z-index.scss)). If you need to inherit styles of another component in your own components, you should render an instance of that other component. At worst, you should duplicate the styles within your own component's stylesheet. This is intended to improve maintainability by isolating shared components as a reusable interface, reducing the surface area of similar UI elements by adapting a limited set of common components to support a varied set of use-cases.
 
-#### SCSS File Naming Conventions for Blocks
+#### SCSS file naming conventions for blocks
 
 The build process will split SCSS from within the blocks library directory into two separate CSS files when Webpack runs.
 
@@ -65,7 +65,7 @@ Examples of styles that appear in both the theme and the editor include gallery
 
 ## JavaScript
 
-JavaScript in Gutenberg uses modern language features of the [ECMAScript language specification](https://www.ecma-international.org/ecma-262/) as well as the [JSX language syntax extension](https://reactjs.org/docs/introducing-jsx.html). These are enabled through a combination of preset configurations, notably [`@wordpress/babel-preset-default`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/babel-preset-default) which is used as a preset in the project's [Babel](https://babeljs.io/) configuration.
+JavaScript in Gutenberg uses modern language features of the [ECMAScript language specification](https://www.ecma-international.org/ecma-262/) as well as the [JSX language syntax extension](https://react.dev/learn/writing-markup-with-jsx). These are enabled through a combination of preset configurations, notably [`@wordpress/babel-preset-default`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/babel-preset-default) which is used as a preset in the project's [Babel](https://babeljs.io/) configuration.
 
 While the [staged process](https://tc39.es/process-document/) for introducing a new JavaScript language feature offers an opportunity to use new features before they are considered complete, **the Gutenberg project and the `@wordpress/babel-preset-default` configuration will only target support for proposals which have reached Stage 4 ("Finished")**.
 
@@ -75,7 +75,7 @@ In the Gutenberg project, we use [the ES2015 import syntax](https://developer.mo
 
 These separations are identified by multi-line comments at the top of a file which imports code from another file or source.
 
-#### External Dependencies
+#### External dependencies
 
 An external dependency is third-party code that is not maintained by WordPress contributors, but instead [included in WordPress as a default script](https://developer.wordpress.org/reference/functions/wp_enqueue_script/#default-scripts-included-and-registered-by-wordpress) or referenced from an outside package manager like [npm](https://www.npmjs.com/).
 
@@ -88,7 +88,7 @@ Example:
 import moment from 'moment';
 ```
 
-#### WordPress Dependencies
+#### WordPress dependencies
 
 To encourage reusability between features, our JavaScript is split into domain-specific modules which [`export`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/export) one or more functions or objects. In the Gutenberg project, we've distinguished these modules under top-level directories. Each module serve an independent purpose, and often code is shared between them. For example, in order to localize its text, editor code will need to include functions from the `i18n` module.
 
@@ -101,7 +101,7 @@ Example:
 import { __ } from '@wordpress/i18n';
 ```
 
-#### Internal Dependencies
+#### Internal dependencies
 
 Within a specific feature, code is organized into separate files and folders. As is the case with external and WordPress dependencies, you can bring this code into scope by using the `import` keyword. The main distinction here is that when importing internal files, you should use relative paths specific to top-level directory you're working in.
 
@@ -114,9 +114,9 @@ Example:
 import VisualEditor from '../visual-editor';
 ```
 
-### Legacy Experimental APIs, Plugin-only APIs, and Private APIs
+### Legacy experimental APIs, plugin-only APIs, and private APIs
 
-#### Legacy Experimental APIs
+#### Legacy experimental APIs
 
 Historically, Gutenberg has used the `__experimental` and `__unstable` prefixes to indicate that a given API is not yet stable and may be subject to change. This is a legacy convention which should be avoided in favor of the plugin-only API pattern or a private API pattern described below.
 
@@ -141,9 +141,9 @@ An **plugin-only API** is one which is planned for eventual public availability,
 Plugin-only APIs are excluded from WordPress Core and only available in the Gutenberg Plugin:
 
 ```js
-// Using process.env.IS_GUTENBERG_PLUGIN allows Webpack to exclude this
+// Using globalThis.IS_GUTENBERG_PLUGIN allows Webpack to exclude this
 // export from WordPress core:
-if ( process.env.IS_GUTENBERG_PLUGIN ) {
+if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 	export { doSomethingExciting } from './api';
 }
 ```
@@ -162,7 +162,7 @@ do so by opting-in to `@wordpress/private-apis`:
 import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/block-editor' // Name of the package calling __dangerousOptInToUnstableAPIsOnlyForCoreModules,
 		// (not the name of the package whose APIs you want to access)
 	);
@@ -352,7 +352,7 @@ const { privateValidateBlocks } = unlock( package1PrivateApis );
 privateValidateBlocks( blocks, true );
 ```
 
-#### Private React Component properties
+#### Private React component properties
 
 To add an private argument to a stable component you'll need
 to prepare a stable and an private version of that component.
@@ -448,8 +448,8 @@ lock( privateApis, { privateEverywhere, privateInCorePublicInPlugin } );
 
 // The privateInCorePublicInPlugin function is explicitly exported,
 // but this export will not be merged into WordPress core thanks to
-// the process.env.IS_GUTENBERG_PLUGIN check.
-if ( process.env.IS_GUTENBERG_PLUGIN ) {
+// the globalThis.IS_GUTENBERG_PLUGIN check.
+if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 	export const privateInCorePublicInPlugin =
 		unlock( privateApis ).privateInCorePublicInPlugin;
 }
@@ -517,7 +517,7 @@ alert( 'My name is ' + name + '.' );
 alert( `My name is ${ name }.` );
 ```
 
-### Optional Chaining
+### Optional chaining
 
 [Optional chaining](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Optional_chaining) is a new language feature introduced in version 2020 of the ECMAScript specification. While the feature can be very convenient for property access on objects which are potentially null-ish (`null` or `undefined`), there are a number of common pitfalls to be aware of when using optional chaining. These may be issues that linting and/or type-checking can help protect against at some point in the future. In the meantime, you will want to be cautious of the following items:
 
@@ -529,11 +529,11 @@ alert( `My name is ${ name }.` );
     -   Example: `document.body.classList.toggle( 'has-focus', nodeRef.current?.contains( document.activeElement ) );` may wrongly _add_ the class, since [the second argument is optional](https://developer.mozilla.org/en-US/docs/Web/API/DOMTokenList/toggle). If `undefined` is passed, it would not unset the class as it would when `false` is passed.
     -   Example: `<input value={ state.selected?.value.trim() } />` may inadvertently cause warnings in React by toggling between [controlled and uncontrolled inputs](https://reactjs.org/docs/uncontrolled-components.html). This is an easy trap to fall into when eagerly assuming that a result of `trim()` will always return a string value, overlooking the fact the optional chaining may have caused evaluation to abort earlier with a value of `undefined`.
 
-### React Components
+### React components
 
-It is preferred to implement all components as [function components](https://reactjs.org/docs/components-and-props.html), using [hooks](https://reactjs.org/docs/hooks-reference.html) to manage component state and lifecycle. With the exception of [error boundaries](https://reactjs.org/docs/error-boundaries.html), you should never encounter a situation where you must use a class component. Note that the [WordPress guidance on Code Refactoring](https://make.wordpress.org/core/handbook/contribute/code-refactoring/) applies here: There needn't be a concentrated effort to update class components in bulk. Instead, consider it as a good refactoring opportunity in combination with some other change.
+It is preferred to implement all components as [function components](https://react.dev/learn/your-first-component), using [hooks](https://react.dev/reference/react/hooks) to manage component state and lifecycle. With the exception of [error boundaries](https://react.dev/reference/react/Component#catching-rendering-errors-with-an-error-boundary), you should never encounter a situation where you must use a class component. Note that the [WordPress guidance on Code Refactoring](https://make.wordpress.org/core/handbook/contribute/code-refactoring/) applies here: There needn't be a concentrated effort to update class components in bulk. Instead, consider it as a good refactoring opportunity in combination with some other change.
 
-## JavaScript Documentation using JSDoc
+## JavaScript documentation using JSDoc
 
 Gutenberg follows the [WordPress JavaScript Documentation Standards](https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/javascript/), with additional guidelines relevant for its distinct use of [import semantics](/docs/contributors/code/coding-guidelines.md#imports) in organizing files, the [use of TypeScript tooling](/docs/contributors/code/testing-overview.md#javascript-testing) for types validation, and automated documentation generation using [`@wordpress/docgen`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/docgen).
 
@@ -542,7 +542,7 @@ For additional guidance, consult the following resources:
 -   [JSDoc Official Documentation](https://jsdoc.app/index.html)
 -   [TypeScript Supported JSDoc](https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html)
 
-### Custom Types
+### Custom types
 
 Define custom types using the [JSDoc `@typedef` tag](https://jsdoc.app/tags-typedef.html).
 
@@ -577,7 +577,7 @@ Custom types can also be used to describe a set of predefined options. While the
 
 Note the use of quotes when defining a set of string literals. As in the [JavaScript Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/javascript/), single quotes should be used when assigning a string literal either as the type or as a [default function parameter](#nullable-undefined-and-void-types), or when [specifying the path](#importing-and-exporting-types) of an imported type.
 
-### Importing and Exporting Types
+### Importing and exporting types
 
 Use the [TypeScript `import` function](https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html#import-types) to import type declarations from other files or third-party dependencies.
 
@@ -599,7 +599,7 @@ When considering which types should be made available from a WordPress package,
 
 In this snippet, the `@typedef` will support the usage of the previous example's `import('@wordpress/data')`.
 
-#### External Dependencies
+#### External dependencies
 
 Many third-party dependencies will distribute their own TypeScript typings. For these, the `import` semantics should "just work".
 
@@ -609,7 +609,7 @@ If you use a [TypeScript integration](https://github.com/Microsoft/TypeScript/wi
 
 For packages which do not distribute their own TypeScript types, you are welcomed to install and use the [DefinitelyTyped](http://definitelytyped.org/) community-maintained types definitions, if one exists.
 
-### Generic Types
+### Generic types
 
 When documenting a generic type such as `Object`, `Function`, `Promise`, etc., always include details about the expected record types.
 
@@ -659,7 +659,7 @@ Similar to the "Custom Types" advice concerning type unions and with literal val
 const BREAKPOINTS = { huge: 1440 /* , ... */ };
 ```
 
-### Nullable, Undefined, and Void Types
+### Nullable, undefined, and void types
 
 You can express a nullable type using a leading `?`. Use the nullable form of a type only if you're describing either the type or an explicit `null` value. Do not use the nullable form as an indicator of an optional parameter.
 
@@ -720,7 +720,7 @@ function getConfigurationValue( key ) {
 }
 ```
 
-When documenting a [function type](https://github.com/WordPress/gutenberg/blob/add/typescript-jsdoc-guidelines/docs/contributors/coding-guidelines.md#record-types), you must always include the `void` return value type, as otherwise the function is inferred to return a mixed ("any") value, not a void result.
+When documenting a [function type](#generic-types), you must always include the `void` return value type, as otherwise the function is inferred to return a mixed ("any") value, not a void result.
 
 ```js
 /**
@@ -731,7 +731,7 @@ When documenting a [function type](https://github.com/WordPress/gutenberg/blob/a
  */
 ```
 
-### Documenting Examples
+### Documenting examples
 
 Because the documentation generated using the `@wordpress/docgen` tool will include `@example` tags if they are defined, it is considered a best practice to include usage examples for functions and components. This is especially important for documented members of a package's public API.
 
@@ -756,9 +756,9 @@ When documenting an example, use the markdown <code>\`\`\`</code> code block to
  */
 ````
 
-### Documenting React Components
+### Documenting React components
 
-When possible, all components should be implemented as [function components](https://reactjs.org/docs/components-and-props.html#function-and-class-components), using [hooks](https://reactjs.org/docs/hooks-intro.html) for managing component lifecycle and state.
+When possible, all components should be implemented as [function components](https://react.dev/learn/your-first-component), using [hooks](https://react.dev/reference/react/hooks) for managing component lifecycle and state.
 
 Documenting a function component should be treated the same as any other function. The primary caveat in documenting a component is being aware that the function typically accepts only a single argument (the "props"), which may include many property members. Use the [dot syntax for parameter properties](https://jsdoc.app/tags-param.html#parameters-with-properties) to document individual prop types.
 
diff --git a/docs/contributors/code/deprecations.md b/docs/contributors/code/deprecations.md
index 7463a99b319d5c..51f0165c409da0 100644
--- a/docs/contributors/code/deprecations.md
+++ b/docs/contributors/code/deprecations.md
@@ -183,7 +183,7 @@ For features included in the Gutenberg plugin, the deprecation policy is intende
 
 ## 3.8.0
 
--   `wp.components.withContext` has been removed. Please use `wp.element.createContext` instead. See: https://reactjs.org/docs/context.html.
+-   `wp.components.withContext` has been removed. Please use `wp.element.createContext` instead. See: https://react.dev/reference/react/createContext.
 -   `wp.coreBlocks.registerCoreBlocks` has been removed. Please use `wp.blockLibrary.registerCoreBlocks` instead.
 -   `wp.editor.DocumentTitle` component has been removed.
 -   `getDocumentTitle` selector (`core/editor`) has been removed.
diff --git a/docs/contributors/code/e2e/README.md b/docs/contributors/code/e2e/README.md
index 9394e3cddd5501..3a123cc2988b7a 100644
--- a/docs/contributors/code/e2e/README.md
+++ b/docs/contributors/code/e2e/README.md
@@ -12,30 +12,31 @@ See the dedicated guide if you're working with the previous Jest + Puppeteer fra
 
 ```bash
 # Run all available tests.
-npm run test:e2e:playwright
+npm run test:e2e
 
 # Run in headed mode.
-npm run test:e2e:playwright -- --headed
+npm run test:e2e -- --headed
 
 # Run tests with specific browsers (`chromium`, `firefox`, or `webkit`).
-npm run test:e2e:playwright -- --project=webkit --project=firefox
+npm run test:e2e -- --project=webkit --project=firefox
 
 # Run a single test file.
-npm run test:e2e:playwright -- <path_to_test_file> # E.g., npm run test:e2e:playwright -- site-editor/title.spec.js
+npm run test:e2e -- <path_to_test_file> # E.g., npm run test:e2e -- site-editor/title.spec.js
 
 # Debugging.
-npm run test:e2e:playwright -- --debug
+npm run test:e2e -- --debug
 ```
 
 If you're developing in Linux, it currently requires testing Webkit browsers in headed mode. If you don't want to or can't run it with the GUI (e.g. if you don't have a graphic interface), prepend the command with [`xvfb-run`](https://manpages.ubuntu.com/manpages/xenial/man1/xvfb-run.1.html) to run it in a virtual environment.
 
 ```bash
 # Run all available tests.
-xvfb-run npm run test:e2e:playwright
+xvfb-run npm run test:e2e
 
 # Only run webkit tests.
-xvfb-run -- npm run test:e2e:playwright -- --project=webkit
+xvfb-run -- npm run test:e2e -- --project=webkit
 ```
+If you're already editing in VS Code, you may find the [Playwright extension](https://playwright.dev/docs/getting-started-vscode) helpful for running, writing and debugging tests.
 
 ## Best practices
 
diff --git a/docs/contributors/code/getting-started-with-code-contribution.md b/docs/contributors/code/getting-started-with-code-contribution.md
index 3de83d50268d8e..df6b305f35983e 100644
--- a/docs/contributors/code/getting-started-with-code-contribution.md
+++ b/docs/contributors/code/getting-started-with-code-contribution.md
@@ -5,7 +5,7 @@ The following guide is for setting up your local environment to contribute to th
 ## Prerequisites
 
 -   Node.js
-    Gutenberg is a JavaScript project and requires [Node.js](https://nodejs.org/). The project is built using Node.js v16, and npm v8. See the [LTS release schedule](https://github.com/nodejs/Release#release-schedule) for details.
+    Gutenberg is a JavaScript project that requires [Node.js](https://nodejs.org/). The project is currently built using Node.js v20 and npm v10. Though best efforts are made to always use the Active LTS version of Node.js, this will not always be the case. For more details, please refer to the [Node.js release schedule](https://github.com/nodejs/Release#release-schedule).
 
 We recommend using the [Node Version Manager](https://github.com/nvm-sh/nvm) (nvm) since it is the easiest way to install and manage node for macOS, Linux, and Windows 10 using WSL2. See [our Development Tools guide](/docs/getting-started/devenv/README.md#development-tools) or the Nodejs site for additional installation instructions.
 
@@ -16,7 +16,7 @@ We recommend using the [Node Version Manager](https://github.com/nvm-sh/nvm) (nv
     We recommend using the [wp-env package](/packages/env/README.md) for setting WordPress environment locally. You'll need to install Docker to use `wp-env`. See the [Development Environment tutorial for additional details](/docs/getting-started/devenv/README.md).
     > Note: To install Docker on Windows 10 Home Edition, follow the [install instructions from Docker for Windows with WSL2](https://docs.docker.com/docker-for-windows/wsl/).
 
-As an alternative to Docker setup, you can use [Local](https://localwp.com/), [WampServer](http://www.wampserver.com/en/), or [MAMP](https://www.mamp.info/), or even use a remote server.
+As an alternative to Docker setup, you can use [Local](https://localwp.com/), [WampServer](https://wampserver.aviatechno.net/), or [MAMP](https://www.mamp.info/), or even use a remote server.
 
 -   GitHub CLI
     Although not a requirement, the [GitHub CLI](https://cli.github.com/) can be very useful in helping you checkout pull requests locally. Both from the Gutenberg repo and forked repos. This can be a major time saver while code reviewing and testing pull requests.
@@ -126,7 +126,7 @@ Port: {MYSQL_PORT_NUMBER}
 
 **Please note**: the MySQL port number will change each time `wp-env` restarts. If you find you can no longer access your database, simply repeat the steps above to find the new port number and restore your connection.
 
-**Tip**: [Sequel Ace](https://sequel-ace.com/) is a useful GUI tool for accessing a MySQL database. Other tools are available and documented in this [article on accessing the WordPress database](https://wordpress.org/documentation/article/creating-database-for-wordpress/).
+**Tip**: [Sequel Ace](https://sequel-ace.com/) is a useful GUI tool for accessing a MySQL database. Other tools are available and documented in this [article on accessing the WordPress database](https://developer.wordpress.org/advanced-administration/before-install/creating-database/).
 
 #### Troubleshooting
 
@@ -134,7 +134,7 @@ If you run into an issue, check the [troubleshooting section in `wp-env` documen
 
 ### Using Local or MAMP
 
-As an alternative to Docker and `wp-env`, you can also use [Local](https://localwp.com/), [WampServer](http://www.wampserver.com/en/), or [MAMP](https://www.mamp.info/) to run a local WordPress environment. To do so clone and install Gutenberg as a regular plugin in your installation by creating a symlink or copying the directory to the proper `wp-content/plugins` directory.
+As an alternative to Docker and `wp-env`, you can also use [Local](https://localwp.com/), [WampServer](https://wampserver.aviatechno.net/), or [MAMP](https://www.mamp.info/) to run a local WordPress environment. To do so clone and install Gutenberg as a regular plugin in your installation by creating a symlink or copying the directory to the proper `wp-content/plugins` directory.
 
 You will also need some extra configuration to be able to run the e2e tests.
 
@@ -183,7 +183,7 @@ If so, you need to instruct Apache to allow following such links:
 
 Tools like MAMP tend to configure MySQL to use ports other than the default 3306, often preferring 8889. This may throw off WP-CLI, which will fail after trying to connect to the database. To remedy this, edit `wp-config.php` and change the `DB_HOST` constant from `define( 'DB_HOST', 'localhost' )` to `define( 'DB_HOST', '127.0.0.1:8889' )`.
 
-### On A Remote Server
+### On a remote server
 
 You can use a remote server in development by building locally and then uploading the built files as a plugin to the remote server.
 
@@ -203,7 +203,7 @@ You can launch Storybook by running `npm run storybook:dev` locally. It will ope
 
 You can also test Storybook for the current `trunk` branch on GitHub Pages: [https://wordpress.github.io/gutenberg/](https://wordpress.github.io/gutenberg/)
 
-## Developer Tools
+## Developer tools
 
 We recommend configuring your editor to automatically check for syntax and lint errors. This will help you save time as you develop by automatically fixing minor formatting issues. Here are some directions for setting up Visual Studio Code, a popular editor used by many of the core developers, these tools are also available for other editors.
 
diff --git a/docs/contributors/code/git-workflow.md b/docs/contributors/code/git-workflow.md
index eeeb68282c1cdf..f2ad1345355deb 100644
--- a/docs/contributors/code/git-workflow.md
+++ b/docs/contributors/code/git-workflow.md
@@ -73,7 +73,7 @@ Do not make a new pull request for updates; by pushing your change to your repos
 
 That’s it! Once approved and merged, your change will be incorporated into the main repository. 🎉
 
-## Branch Naming
+## Branch naming
 
 You should name your branches using a prefixes and short description, like this: `[type]/[change]`.
 
@@ -87,7 +87,7 @@ Suggested prefixes:
 
 For example, `add/gallery-block` means you're working on adding a new gallery block.
 
-## Keeping Your Branch Up To Date
+## Keeping your branch up to date
 
 When many different people are working on a project simultaneously, pull requests can go stale quickly. A "stale" pull request is one that is no longer up to date with the main line of development, and it needs to be updated before it can be merged into the project.
 
@@ -105,7 +105,7 @@ git rebase trunk
 git push --force-with-lease origin your-branch-name
 ```
 
-## Keeping Your Fork Up To Date
+## Keeping your fork up to date
 
 Working on pull request starts with forking the Gutenberg repository, your separate working copy. Which can easily go out of sync as new pull requests are merged into the main repository. Here your working repository is a `fork` and the main Gutenberg repository is `upstream`. When working on new pull request you should always update your fork before you do `git checkout -b my-new-branch` to work on a feature or fix.
 
@@ -138,7 +138,7 @@ The above commands will update your `trunk` branch from _upstream_. To update an
 
 ## Miscellaneous
 
-### Git Archeology
+### Git archeology
 
 When looking for a commit that introduced a specific change, it might be helpful to ignore revisions that only contain styling or formatting changes.
 
diff --git a/docs/contributors/code/managing-packages.md b/docs/contributors/code/managing-packages.md
index bfea8fed81242b..8ad0266b1482bf 100644
--- a/docs/contributors/code/managing-packages.md
+++ b/docs/contributors/code/managing-packages.md
@@ -1,11 +1,7 @@
 # Managing Packages
 
-This repository uses [monorepo] to manage WordPress modules and publish them with [lerna] as packages to [npm]. This enforces certain steps in the workflow which are described in details in [packages](https://github.com/WordPress/gutenberg/blob/HEAD/packages/README.md) documentation.
+This repository uses [npm workspaces](https://docs.npmjs.com/cli/v10/using-npm/workspaces) to manage WordPress packages and [lerna](https://lerna.js.org/) to publish them to [npm](https://www.npmjs.com/). This enforces certain steps in the workflow which are described in details in [packages](https://github.com/WordPress/gutenberg/blob/HEAD/packages/README.md) documentation.
 
 Maintaining dozens of npm packages is difficult—it can be tough to keep track of changes. That's why we use `CHANGELOG.md` files for each package to simplify the release process. As a contributor, you should add an entry to the aforementioned file each time you contribute adding production code as described in [Maintaining Changelogs](https://github.com/WordPress/gutenberg/blob/HEAD/packages/README.md#maintaining-changelogs) section.
 
 Publishing WordPress packages to npm is automated by synchronizing it with the bi-weekly Gutenberg plugin RC1 release. You can learn more about this process and other ways to publish new versions of npm packages in the [Gutenberg Release Process document](/docs/contributors/code/release.md#packages-releases-to-npm-and-wordpress-core-updates).
-
-[lerna]: https://lerna.js.org/
-[monorepo]: https://monorepo.tools
-[npm]: https://www.npmjs.com/
diff --git a/docs/contributors/code/react-native/README.md b/docs/contributors/code/react-native/README.md
index 10df7268ddddb6..dd6afc2e8bd561 100644
--- a/docs/contributors/code/react-native/README.md
+++ b/docs/contributors/code/react-native/README.md
@@ -1,6 +1,6 @@
 # React Native mobile editor
 
-The Gutenberg repository includes the source for the [React Native](https://facebook.github.io/react-native/) based editor for mobile.
+The Gutenberg repository includes the source for the [React Native](https://reactnative.dev/) based editor for mobile.
 
 ## Mind the mobile
 
diff --git a/docs/contributors/code/react-native/getting-started-react-native.md b/docs/contributors/code/react-native/getting-started-react-native.md
index 7b4dcca98027d0..48dc0e81f260eb 100644
--- a/docs/contributors/code/react-native/getting-started-react-native.md
+++ b/docs/contributors/code/react-native/getting-started-react-native.md
@@ -55,7 +55,7 @@ npm run native ios
 
 which will attempt to open your app in the iOS Simulator if you're on a Mac and have it installed.
 
-### Running on Other iOS Device Simulators
+### Running on other iOS device simulators
 
 To compile and run the app using a different device simulator, use the following, noting the double sets of `--` to pass the simulator option down to the `react-native` CLI.
 
@@ -71,7 +71,7 @@ npm run native ios -- -- --simulator="iPhone Xs Max"
 
 To see a list of all of your available iOS devices, use `xcrun simctl list devices`.
 
-### Customizing the Demo Editor
+### Customizing the demo Editor
 
 By default, the Demo editor renders most of the supported core blocks. This is helpful to showcase the editor's capabilities, but can be distracting when focusing on a specific block or feature. One can customize the editor's initial state by leveraging the `native.block_editor_props` hook in a `packages/react-native-editor/src/setup-local.js` file.
 
@@ -119,7 +119,7 @@ When you first open the project in Visual Studio, you will be prompted to instal
 
 One of the extensions we are using is the [React Native Tools](https://marketplace.visualstudio.com/items?itemName=vsmobile.vscode-react-native). This allows you to run the packager from VSCode or launch the application on iOS or Android. It also adds some debug configurations so you can set breakpoints and debug the application directly from VSCode. Take a look at the [extension documentation](https://marketplace.visualstudio.com/items?itemName=vsmobile.vscode-react-native) for more details.
 
-## Unit Tests
+## Unit tests
 
 Use the following command to run the test suite:
 
@@ -137,11 +137,11 @@ npm run test:native:debug
 
 Then, open `chrome://inspect` in Chrome to attach the debugger (look into the "Remote Target" section). While testing/developing, feel free to sprinkle `debugger` statements anywhere in the code that you'd like the debugger to break.
 
-## Writing and Running Unit Tests
+## Writing and running unit tests
 
 This project is set up to use [jest](https://jestjs.io/) for tests. You can configure whatever testing strategy you like, but jest works out of the box. Create test files in directories called `__tests__` or with the `.test.js` extension to have the files loaded by jest. See an example test [here](https://github.com/WordPress/gutenberg/blob/HEAD/packages/react-native-editor/src/test/api-fetch-setup.test.js). The [jest documentation](https://jestjs.io/docs/getting-started) is also a wonderful resource, as is the [React Native testing tutorial](https://jestjs.io/docs/tutorial-react-native).
 
-## End-to-End Tests
+## End-to-end tests
 
 In addition to unit tests, the Mobile Gutenberg (MG) project relies upon end-to-end (E2E) tests to automate testing critical flows in an environment similar to that of an end user. We generally prefer unit tests due to their speed and ease of maintenance. However, assertions that require OS-level features (e.g. complex gestures, text selection) or visual regression testing (e.g. dark mode, contrast levels) we use E2E tests.
 
diff --git a/docs/contributors/code/release.md b/docs/contributors/code/release.md
index d19be240f4870f..ec3af0d7bd4cb2 100644
--- a/docs/contributors/code/release.md
+++ b/docs/contributors/code/release.md
@@ -10,37 +10,6 @@ Before you begin, there are some requirements that must be met in order to succe
 
 Similar requirements apply to releasing WordPress's [npm packages](https://developer.wordpress.org/block-editor/contributors/code/release/#packages-releases-to-npm-and-wordpress-core-updates).
 
-**Table of contents**
-
--   **[Gutenberg plugin releases](#gutenberg-plugin-releases)**
-    -   [Release schedule](#release-schedule)
-    -   [Release management](#release-management)
-    -   [Preparing a release](#preparing-a-release)
-        -   [Organizing and labeling milestone PRs](#organizing-and-labeling-milestone-prs)
-        -   [Running the release workflow](#running-the-release-workflow)
-        -   [Publishing the @wordpress packages to NPM](#publishing-the-wordpress-packages-to-npm)
-        -   [Viewing the release draft](#viewing-the-release-draft)
-        -   [Curating the release changelog](#curating-the-release-changelog)
-        -   [Creating release candidate patches (cherry-picking)](#creating-release-candidate-patches-cherry-picking)
-            -   [Automated cherry-picking](#automated-cherry-picking)
-            -   [Manual cherry-picking](#manual-cherry-picking)
-        -   [Publishing the release](#publishing-the-release)
-        -   [Troubleshooting the release](#troubleshooting-the-release)
-    -   [Documenting the release](#documenting-the-release)
-        -   [Selecting the release highlights](#selecting-the-release-highlights)
-        -   [Requesting release assets](#requesting-release-assets)
-        -   [Drafting the release post](#drafting-the-release-post)
-        -   [Publishing the release post](#publishing-the-release-post)
-    -   [Creating minor releases](#creating-minor-releases)
-        -   [Updating the release branch](#updating-the-release-branch)
-        -   [Running the minor release](#running-the-minor-release)
-        -   [Creating a minor release for previous stable releases](#creating-a-minor-release-for-previous-stable-releases)
-        -   [Troubleshooting](#troubleshooting)
--   [Packages releases to NPM and WordPress Core updates](#packages-releases-to-npm-and-wordpress-core-updates)
-    -   [Synchronizing the Gutenberg plugin](#synchronizing-the-gutenberg-plugin)
-    -   [WordPress releases](#wordpress-releases)
-    -   [Development releases](#development-releases)
-
 ## Gutenberg plugin releases
 
 The first step in releasing a stable version of the Gutenberg plugin is to [create an issue](https://github.com/WordPress/gutenberg/issues/new?assignees=&labels=&projects=&template=New_release.md) in the Gutenberg repository. The issue template is called "Gutenberg Release," and it contains a checklist for the complete release process, from release candidate to changelog curation to cherry-picking, stable release, and release post. The issue for [Gutenberg 15.7](https://github.com/WordPress/gutenberg/issues/50092) is a good example.
@@ -254,11 +223,11 @@ Once approved, the new Gutenberg version will be available to WordPress users al
 
 The final step is to write a release post on [make.wordpress.org/core](https://make.wordpress.org/core/). You can find some tips on that below.
 
-#### Troubleshooting the release
+### Troubleshooting the release
 
 > The plugin was published to the WordPress.org plugin directory but the workflow failed.
 
-This has happened ocassionally, see [this one](https://github.com/WordPress/gutenberg/actions/runs/6955409957/job/18924124118) for example.
+This has happened occasionally, see [this one](https://github.com/WordPress/gutenberg/actions/runs/6955409957/job/18924124118) for example.
 
 It's important to check that:
 
@@ -351,13 +320,13 @@ If an RC already exists for a new version, you _need_ to cherry-pick the same co
 
 The cherry-picking process can be automated with the [`npm run cherry-pick`](/docs/contributors/code/auto-cherry-picking.md) script, but be sure to use the `Backport to Gutenberg Minor Release` label when running the script.
 
-You must also ensure that all PRs being included are assigned to the Github Milestone on which the minor release is based. Bear in mind, that when PRs are _merged_ they are automatically assigned a milestone for the next _stable_ release. Therefore you will need to go back through each PR in Github and re-assign the Milestone.
+You must also ensure that all PRs being included are assigned to the GitHub Milestone on which the minor release is based. Bear in mind, that when PRs are _merged_ they are automatically assigned a milestone for the next _stable_ release. Therefore you will need to go back through each PR in GitHub and re-assign the Milestone.
 
 For example, if you are releasing version `12.5.4`, then all PRs picked for that release must be unassigned from the `12.6` Milestone and instead assigned to the `12.5` Milestone.
 
 Once cherry picking is complete, you can also remove the `Backport to Gutenberg Minor Release` label from the PRs.
 
-Once you have the stable release branch in order and the correct Milestone assigned to your PRs you can _push the branch to Github_ and continue with the release process using the Github website GUI.
+Once you have the stable release branch in order and the correct Milestone assigned to your PRs you can _push the branch to GitHub_ and continue with the release process using the GitHub website GUI.
 
 #### Running the minor release
 
diff --git a/docs/contributors/code/scripts.md b/docs/contributors/code/scripts.md
index 1483a409a4d08f..bcbbdbabc15a1e 100644
--- a/docs/contributors/code/scripts.md
+++ b/docs/contributors/code/scripts.md
@@ -64,7 +64,7 @@ It is recommended to use the main `wp-polyfill` script handle which takes care o
 | [Fetch Polyfill](https://www.npmjs.com/package/whatwg-fetch)              | wp-polyfill-fetch           | Polyfill that implements a subset of the standard Fetch specification                                |
 | [Promise Polyfill](https://www.npmjs.com/package/promise-polyfill)        | wp-polyfill-promise         | Lightweight ES6 Promise polyfill for the browser and node                                            |
 | [Formdata Polyfill](https://www.npmjs.com/package/formdata-polyfill)      | wp-polyfill-formdata        | Polyfill conditionally replaces the native implementation                                            |
-| [Node Contains Polyfill](https://polyfill.io)                             | wp-polyfill-node-contains   | Polyfill for Node.contains                                                                           |
+| [Node Contains Polyfill](https://www.npmjs.com/package/polyfill-library)  | wp-polyfill-node-contains   | Polyfill for Node.contains                                                                           |
 | [Element Closest Polyfill](https://www.npmjs.com/package/element-closest) | wp-polyfill-element-closest | Return the closest element matching a selector up the DOM tree                                       |
 
 ## Bundling and code sharing
diff --git a/docs/contributors/code/testing-overview.md b/docs/contributors/code/testing-overview.md
index 8a2f6079b2419c..6afa5aed865b7d 100644
--- a/docs/contributors/code/testing-overview.md
+++ b/docs/contributors/code/testing-overview.md
@@ -17,7 +17,7 @@ When writing tests consider the following:
 -   Does the test test what we think it is testing? Or are we introducing false positives/negatives?
 -   Is it readable? Will other contributors be able to understand how our code behaves by looking at its corresponding test?
 
-## JavaScript Testing
+## JavaScript testing
 
 Tests for JavaScript use [Jest](https://jestjs.io/) as the test runner and its API for [globals](https://jestjs.io/docs/en/api.html) (`describe`, `test`, `beforeEach` and so on) [assertions](https://jestjs.io/docs/en/expect.html), [mocks](https://jestjs.io/docs/en/mock-functions.html), [spies](https://jestjs.io/docs/en/jest-object.html#jestspyonobject-methodname) and [mock functions](https://jestjs.io/docs/en/mock-function-api.html). If needed, you can also use [React Testing Library](https://testing-library.com/docs/react-testing-library/intro) for React component testing.
 
@@ -90,7 +90,7 @@ describe( 'CheckboxWithLabel', () => {
 } );
 ```
 
-### Setup and Teardown methods
+### Setup and teardown methods
 
 The Jest API includes some nifty [setup and teardown methods](https://jestjs.io/docs/en/setup-teardown.html) that allow you to perform tasks _before_ and _after_ each or all of your tests, or tests within a specific `describe` block.
 
@@ -327,10 +327,7 @@ However, if the change was intentional, follow these steps to update the snapsho
 npm run test:unit -- --updateSnapshot --testPathPattern path/to/tests
 
 # Update snapshot for e2e tests
-npm run test:e2e -- --updateSnapshot --testPathPattern path/to/e2e-tests
-
-# Update snapshot for Playwright
-npm run test:e2e:playwright -- --update-snapshots path/to/spec
+npm run test:e2e -- --update-snapshots path/to/spec
 ```
 
 1. Review the diff and ensure the changes are expected and intentional.
@@ -507,7 +504,7 @@ Contributors to Gutenberg will note that PRs include continuous integration E2E
 
 There is an ongoing effort to add integration tests to the native mobile project using the [`react-native-testing-library`](https://testing-library.com/docs/react-native-testing-library/intro/) library. A guide to writing integration tests can be found [here](/docs/contributors/code/react-native/integration-test-guide.md).
 
-## End-to-end Testing
+## End-to-end testing
 
 Most existing End-to-end tests currently use [Puppeteer](https://github.com/puppeteer/puppeteer) as a headless Chromium driver to run the tests in `packages/e2e-tests`, and are otherwise still run by a [Jest](https://jestjs.io/) test runner.
 
@@ -559,7 +556,7 @@ Then to run the tests, specify the base URL, username, and passwords for your si
 WP_BASE_URL=http://wp.test npm run test:e2e -- --wordpress-username=admin --wordpress-password=password
 ```
 
-### Scenario Testing
+### Scenario testing
 
 If you find that end-to-end tests pass when run locally, but fail in GitHub Actions, you may be able to isolate a CPU- or network-bound race condition by simulating a slow CPU or network:
 
@@ -587,15 +584,15 @@ OFFLINE=true npm run test:e2e
 
 See [Chrome docs: emulateNetworkConditions](https://chromedevtools.github.io/devtools-protocol/tot/Network#method-emulateNetworkConditions)
 
-### Core Block Testing
+### Core block testing
 
 Every core block is required to have at least one set of fixture files for its main save function and one for each deprecation. These fixtures test the parsing and serialization of the block. See [the integration tests fixtures readme](https://github.com/wordpress/gutenberg/blob/HEAD/test/integration/fixtures/blocks/README.md) for more information and instructions.
 
-### Flaky Tests
+### Flaky tests
 
 A test is considered to be **flaky** when it can pass and fail across multiple retry attempts without any code changes. We auto retry failed tests at most **twice** on CI to detect and report them to GitHub issues automatically under the [`[Type] Flaky Test`](https://github.com/WordPress/gutenberg/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22%5BType%5D+Flaky+Test%22) label via [`report-flaky-tests`](https://github.com/WordPress/gutenberg/tree/trunk/packages/report-flaky-tests) GitHub action. Note that a test that failed three times in a row is not counted as a flaky test and will not be reported to an issue.
 
-## PHP Testing
+## PHP testing
 
 Tests for PHP use [PHPUnit](https://phpunit.de/) as the testing framework. If you're using the built-in [local environment](/docs/contributors/code/getting-started-with-code-contribution.md#local-environment), you can run the PHP tests locally using this command:
 
@@ -620,9 +617,9 @@ To run unit tests only, without the linter, use `npm run test:unit:php` instead.
 [snapshot testing]: https://jestjs.io/docs/en/snapshot-testing.html
 [update snapshots]: https://jestjs.io/docs/en/snapshot-testing.html#updating-snapshots
 
-## Performance Testing
+## Performance testing
 
-To ensure that the editor stays performant as we add features, we monitor the impact pull requests and releases can have on some key metrics:
+To ensure that the editor stays performant as we add features, we monitor the impact pull requests and releases can have on some key metrics including:
 
 -   The time it takes to load the editor.
 -   The time it takes for the browser to respond when typing.
diff --git a/docs/contributors/design/README.md b/docs/contributors/design/README.md
index de390937244ed2..abc077b8fdc072 100644
--- a/docs/contributors/design/README.md
+++ b/docs/contributors/design/README.md
@@ -8,7 +8,7 @@ The [Make WordPress Design blog](https://make.wordpress.org/design/) is the prim
 
 Real-time discussions for design take place in the `#design` channel in [Make WordPress Slack](https://make.wordpress.org/chat) (registration required). Weekly meetings for the Design team are on Wednesdays at 19:00UTC.
 
-## How Can Designers Contribute?
+## How can designers contribute?
 
 The Gutenberg project uses GitHub for managing code and tracking issues. The main repository is at: [https://github.com/WordPress/gutenberg](https://github.com/WordPress/gutenberg).
 
diff --git a/docs/contributors/design/the-block.md b/docs/contributors/design/the-block.md
index f35e17d0195928..463d3eb9b9e1a0 100644
--- a/docs/contributors/design/the-block.md
+++ b/docs/contributors/design/the-block.md
@@ -11,7 +11,7 @@ So, for example, a user can add an image, write its caption, change its width an
 -   Users only need to learn one interface — the block — to add and edit everything on their site. Users shouldn’t have to write shortcodes, custom HTML, or understand hidden mechanisms to embed content.
 -   Gutenberg makes core features more discoverable, reducing hard-to-find “Mystery meat.” WordPress supports a large number of blocks and 30+ embeds. Let’s increase their visibility.
 
-## Building Blocks
+## Building blocks
 
 What does this mean for designers and developers? The block structure plus the principle of direct manipulation mean thinking differently about how to design and develop WordPress components. Let’s take another look at the architecture of a block:
 
diff --git a/docs/contributors/documentation/README.md b/docs/contributors/documentation/README.md
index 397e7ad1e140c9..ec8013cd99a21c 100644
--- a/docs/contributors/documentation/README.md
+++ b/docs/contributors/documentation/README.md
@@ -4,7 +4,7 @@ A guide on how to get started contributing documentation to the Gutenberg projec
 
 ## Discussions
 
-The [Make WordPress Docs blog](https://make.wordpress.org/docs/) is the primary spot for the latest information around WordPress documentation: including announcements, product goals, meeting notes, meeting agendas, and more.
+The [Make WordPress Docs blog](https://make.wordpress.org/docs/) is the primary spot for the latest information around WordPress documentation, including announcements, product goals, meeting notes, meeting agendas, and more.
 
 Real-time discussions for documentation take place in the `#docs` channel in [Make WordPress Slack](https://make.wordpress.org/chat) (registration required). Weekly meetings for the Documentation team are on Tuesdays at 14:00UTC.
 
@@ -14,7 +14,7 @@ The Gutenberg project uses GitHub for managing code and tracking issues. The mai
 
 There are two major sets of documentation for the Gutenberg project:
 
-1. [User documentation](https://wordpress.org/documentation/article/wordpress-block-editor/) is information on how to use the Editor as an author publishing posts. For contributing to user docs, follow the docs blog, or ask in the #docs Slack channel, to understand the current priorities.
+1. [User documentation](https://wordpress.org/documentation/article/wordpress-block-editor/) is information on how to use the Editor as an author publishing posts. For contributing to user docs, follow the docs blog or ask in the #docs Slack channel to understand the current priorities.
 2. [Block editor handbook](https://developer.wordpress.org/block-editor/) is everything related to the Gutenberg project including: developing, extending, and—what you are reading right now—contributing specific to Gutenberg.
 
 The rest of this document covers contributing to the block editor handbook.
@@ -29,24 +29,24 @@ See [the Git Workflow](/docs/contributors/code/git-workflow.md) documentation fo
 
 ### Handbook structure
 
-The handbook is organized into four sections based on the functional types of documents. [The Documentation System](https://documentation.divio.com/) does a great job explaining the needs and functions of each type, but in short they are:
+The handbook is organized into four sections based on the functional types of documents. [The Documentation System](https://documentation.divio.com/) does a great job explaining the needs and functions of each type, but in short, they are:
 
--   **Getting started tutorials** - full lessons that take learners step by step to complete an objective, for example the [create a block tutorial](/docs/getting-started/create-block/README.md).
--   **How to guides** - short lessons specific to completing a small specific task, for example [how to add a button to the block toolbar](/docs/how-to-guides/format-api.md).
+-   **Getting started tutorials** - full lessons that take learners step by step to complete an objective, for example the [create a block tutorial](/docs/getting-started/devenv/get-started-with-create-block.md).
+-   **How-to guides** - short lessons specific to completing a small specific task, for example [how to add a button to the block toolbar](/docs/how-to-guides/format-api.md).
 -   **Reference guides** - API documentation, purely functional descriptions,
 -   **Explanations** - longer documentation focused on learning, not a specific task.
 
 ### Templates
 
-A [how to guide template](https://raw.githubusercontent.com/WordPress/gutenberg/trunk/docs/contributors/documentation/how-to-guide-template.md) is available to provide a common structure to guides. If starting a new how to guide, copy the markdown from the template to get started.
+A [how-to guide template](https://raw.githubusercontent.com/WordPress/gutenberg/trunk/docs/contributors/documentation/how-to-guide-template.md) is available to provide a common structure to guides. If starting a new how-to guide, copy the markdown from the template to get started.
 
-The template is based on examples from The Good Docs Project, see their [template repository for additional examples](https://github.com/thegooddocsproject/templates) to help you create quality documentation.
+The template is based on examples from The Good Docs Project. See their [template repository](https://github.com/thegooddocsproject/templates) for additional examples to help you create quality documentation.
 
 ### Update a document
 
 To update an existing page:
 
-1. Check out the gutenberg repository.
+1. Check out the Gutenberg repository.
 2. Create a branch to work, for example `docs/update-contrib-guide`.
 3. Make the necessary changes to the existing document.
 4. Commit your changes.
@@ -57,16 +57,16 @@ To update an existing page:
 To add a new document requires a working JavaScript development environment to build the documentation, see the [JavaScript build setup documentation](/docs/how-to-guides/javascript/js-build-setup.md):
 
 1. Create a Markdown file in the [docs](https://github.com/WordPress/gutenberg/tree/HEAD/docs) folder, use lower-case, no spaces, if needed a dash separator, and `.md` extension.
-2. Add content, all documents require one and only H1 tag, using markdown notation.
-3. Add document entry to the [toc.json](https://github.com/WordPress/gutenberg/blob/HEAD/docs/toc.json) hierarchy, see existing entries for format.
+2. Add content using markdown notation. All documents require one and only `h1` tag.
+3. Add document entry to the [toc.json](https://github.com/WordPress/gutenberg/blob/HEAD/docs/toc.json) hierarchy. See existing entries for format.
 4. Run `npm run docs:build` to update `manifest.json`.
 5. Commit `manifest.json` with other files updated.
 
-If you forget to run, `npm run docs:build` your PR will fail the static analysis check, since the `manifest.json` file is an uncommitted local change that must be committed.
+If you forget to run, `npm run docs:build` your PR will fail the static analysis check since the `manifest.json` file is an uncommitted local change that must be committed.
 
-### Documenting Packages
+### Documenting packages
 
-Package documentation is generated automatically by the documentation tool by pulling the contents of the README.md file located in the root of the package. Sometimes however, it is preferable to split the contents of the README out into smaller, easier to read portions.
+Package documentation is generated automatically by the documentation tool by pulling the contents of the README.md file located in the root of the package. Sometimes, however, it is preferable to split the contents of the README into smaller, easier-to-read portions.
 
 This can be accomplished by creating a `docs` directory in the package and adding `toc.json` file that contains references other markdown files also contained in the `docs` directory. The `toc.json` file should contain an array of pages to be added as sub-pages of the main README file. The formatting follows the [`manifest.json`](https://github.com/WordPress/gutenberg/blob/HEAD/docs/manifest.json) file that is generated automatically.
 
@@ -85,7 +85,7 @@ In order for these pages to be nested under the main package name, be sure to se
 
 ### Using links
 
-It's likely at some point you'll want to link to other internal documentation pages. It's worth emphasizing all documents can be browsed in different contexts:
+It's likely at some point, you'll want to link to other internal documentation pages. It's worth emphasizing all documents can be browsed in different contexts:
 
 -   Block editor handbook
 -   GitHub website
@@ -97,9 +97,9 @@ To create links that work in all contexts, you must use absolute path links with
 -   `/packages/*/README.md`
 -   `/packages/components/src/**/README.md`
 
-This way they will be properly handled in all three aforementioned contexts.
+This way, they will be properly handled in all three aforementioned contexts.
 
-Use the full directory and filename from the Gutenberg repository, not the published path; the Block Editor Handbook creates short URLs—you can see this in the tutorials section. Likewise, the `readme.md` portion is dropped in the handbook, but should be included in links.
+Use the full directory and filename from the Gutenberg repository, not the published path; the Block Editor Handbook creates short URLs—you can see this in the tutorials section. Likewise, the `readme.md` portion is dropped in the handbook but should be included in the links.
 
 An example, the link to this page is: `/docs/contributors/documentation/README.md`
 
@@ -111,7 +111,7 @@ An example, the link to this page is: `/docs/contributors/documentation/README.m
 
 The code example in markdown should be wrapped in three tick marks \`\`\` and should additionally include a language specifier. See this [GitHub documentation around fenced code blocks](https://help.github.com/en/github/writing-on-github/creating-and-highlighting-code-blocks).
 
-A unique feature to the Gutenberg documentation is the `codetabs` toggle, this allows two versions of code to be shown at once. This is used for showing both `JSX` and `Plain` code samples. For example, [on this block tutorial page](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md).
+A unique feature to the Gutenberg documentation is the `codetabs` toggle, this allows two versions of code to be shown at once. This is used for showing both `JSX` and `Plain` code samples.
 
 Here is an example `codetabs` section:
 
@@ -128,7 +128,7 @@ Here is an example `codetabs` section:
     \{\% end \%\}
 ````
 
-The preferred format for code examples is JSX, this should be the default view. The example placed first in source will be shown as the default.
+The preferred format for code examples is JSX. This should be the default view. The example placed first in source will be shown as the default.
 
 **Note:** It is not required to include plain JavaScript code examples for every guide. The recommendation is to include plain code for beginner tutorials or short examples, but the majority of code in Gutenberg packages and across the larger React and JavaScript ecosystem are in JSX that requires a build process.
 
@@ -136,7 +136,7 @@ The preferred format for code examples is JSX, this should be the default view.
 
 The Block Editor handbook supports the same [notice styles as other WordPress handbooks](https://make.wordpress.org/docs/handbook/documentation-team-handbook/handbooks-style-and-formatting-guide/#formatting). However, the shortcode implementation is not ideal with the different locations the block editor handbook documentation is published (npm, GitHub).
 
-The recommended way to implement in markdown is to use the raw HTML and`callout callout-LEVEL` classes. For example:
+The recommended way to implement in markdown is to use the raw HTML and `callout callout-LEVEL` classes. For example:
 
 ```html
 <div class="callout callout-info">This is an **info** callout.</div>
@@ -163,8 +163,8 @@ This is a **warning** callout.
 <div class="callout callout-warning">
 Note: In callout notices, links also need to be HTML `&lt;a href>&lt;/a>` notations. 
 The usual link transformation is not applied to links in callouts.
-For instance, to reach the Getting started > Create Block page the URL in GitHub is
-https://developer.wordpress.org/docs/getting-started/create-block/README.md
+For instance, to reach the Getting started > Create Block page, the URL in GitHub is
+https://developer.wordpress.org/docs/getting-started/devenv/get-started-with-create-block.md
 and will have to be hardcoded for the endpoint in the Block Editor Handbook as 
 <a href="https://developer.wordpress.org/block-editor/getting-started/create-block/">https://developer.wordpress.org/block-editor/getting-started/create-block/</a> to link correctly in the handbook. 
 </div>
@@ -181,12 +181,32 @@ An example config for using Visual Studio Code and the Prettier extensions:
 },
 ```
 
- <div class="callout callout-info">
- Note: depending on where you are viewing this document, the brackets may show as double, the proper format is just a single bracket.
+<div class="callout callout-info">
+Depending on where you are viewing this document, the brackets may show as double. The proper format is just a single bracket.
+</div>
+
+### Video embeds
+
+Videos in the Block Editor Handbook need to be hosted on the [WordPress YouTube channel](https://www.youtube.com/@WordPress) as unlisted videos. This process requires additional permissions. Reach out in the #marketing Slack channel for assistance.
+
+Once the video has been uploaded to YouTube, retrieve the video embed link. It should look something like this: 
+
+```
+https://www.youtube.com/embed/nrut8SfXA44?si=YxvmHmAoYx-BDCog
+```
+
+Then, place the following code where you want the video to be embedded in the documentation. Update the embed link and video title accordingly.
+
+```html
+<iframe width="960" height="540" src="[Video embed link]" title="[Video title]" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen="true"></iframe>
+```
+
+<div class="callout callout-info">
+Videos should have an aspect ratio of <code>16:9</code> and be filmed at the highest resolution possible.
 </div>
 
 ## Resources
 
--   [Copy Guidelines](/docs/contributors/documentation/copy-guide.md) for writing instructions, documentations, or other contributions to Gutenberg project.
+-   [Copy Guidelines](/docs/contributors/documentation/copy-guide.md) for writing instructions, documentation, or other contributions to the Gutenberg project.
 
 -   [Tone and Voice Guide](https://make.wordpress.org/docs/handbook/documentation-team-handbook/tone-and-voice-guide/) from WordPress Documentation.
diff --git a/docs/contributors/folder-structure.md b/docs/contributors/folder-structure.md
index 9cee302794cdab..e20ba81708a064 100644
--- a/docs/contributors/folder-structure.md
+++ b/docs/contributors/folder-structure.md
@@ -7,7 +7,6 @@ The following snippet explains how the Gutenberg repository is structured omitti
     ├── README.md
     ├── SECURITY.md
     ├── CONTRIBUTING.md
-    ├── CODE_OF_CONDUCT.md
     │
     ├── .editorconfig
     ├── .eslintignore
@@ -76,9 +75,19 @@ The following snippet explains how the Gutenberg repository is structured omitti
     ├── docs/*.md
     │   Set of documentation pages composing the [Block editor handbook](https://developer.wordpress.org/block-editor/).
     │
+    ├── platform-docs
+    │   Documentation website targeted to non WordPress developers 
+    │   using Gutenberg in their own applications. 
+    │   Deployed on [https://wordpress.org/gutenberg-framework/](https://wordpress.org/gutenberg-framework/).
+    │
+    │
     ├── lib
     │   PHP Source code of the Gutenberg plugin.
     │
+    ├── lib/compact/wordpress-x.x
+    │   PHP code that was include in WordPress ont the WordPrexx X.X version.
+    │   It is kept to ensure plugin compatibility with older WordPress versions.
+    │
     ├── packages
     │   Source code of the WordPress packages.
     │   Packages can be:
@@ -108,10 +117,6 @@ The following snippet explains how the Gutenberg repository is structured omitti
     ├── packages/{packageName}/src/**/{ComponentName}/stories/*.js
     │   Component Stories to load on the Gutenberg storybook.
     │
-    ├── packages/e2e-tests
-    │   End-2-end tests of the Gutenberg plugin.
-    │   Distributed as a package for potential reuse in Core and other plugins.
-    │
     ├── phpunit
     │   Unit tests for the PHP code of the Gutenberg plugin.
     │
@@ -124,11 +129,17 @@ The following snippet explains how the Gutenberg repository is structured omitti
     ├── test/native
     │   Configuration for the Gutenberg Mobile unit tests.
     │
-    └── test/unit
+    ├── test/unit
     │   Configuration for the Packages unit tests.
     │
-    └── tools/eslint
+    ├── test/e2e
+    │   End-2-end tests of the Gutenberg plugin.
+    │
+    ├── test/performance
+    │   Performance metrics. Results are tracked on the [Gutenberg performance dashboard](https://codevitals.run/project/gutenberg).
+    │
+    ├── tools/eslint
     │   Configuration files for the ESLint linter.
     │
-    └── tools/webpack
+    ├── tools/webpack
     │   Configuration files for the webpack build.
diff --git a/docs/contributors/repository-management.md b/docs/contributors/repository-management.md
index 9bce2d06fd1566..e57f762a605394 100644
--- a/docs/contributors/repository-management.md
+++ b/docs/contributors/repository-management.md
@@ -55,7 +55,7 @@ Here are some milestones you might see:
 -   [X.Y (Gutenberg)](https://github.com/WordPress/gutenberg/milestone/85): PRs targeted for the Gutenberg Plugin X.Y release.
 -   [Future](https://github.com/WordPress/gutenberg/milestone/35): this is something that is confirmed by everyone as a good thing but doesn’t fall into other criteria.
 
-### Triaging Issues
+### Triaging issues
 
 To keep the issue list healthy, it needs to be triaged regularly. _Triage_ is the practice of reviewing existing issues to make sure they’re relevant, actionable, and have all the information they need.
 
@@ -63,7 +63,7 @@ Anyone can help triage, although you’ll need contributor permission on the Gut
 
 See the [Triage Contributors guide](/docs/contributors/triage.md) for details.
 
-## Pull Requests
+## Pull requests
 
 Gutenberg follows a feature branch pull request workflow for all code and documentation changes. At a high-level, the process looks like this:
 
@@ -86,7 +86,7 @@ Along with this process, there are a few important points to mention:
 -   To make it far easier to merge your code, each pull request should only contain one conceptual change. Keeping contributions atomic keeps the pull request discussion focused on one topic and makes it possible to approve changes on a case-by-case basis.
 -   Separate pull requests can address different items or todos from their linked issue, there’s no need for a single pull request to cover a single issue if the issue is non-trivial.
 
-### Code Review
+### Code review
 
 Every pull request goes through a manual code review, in addition to automated tests. The objectives for the code review are best thought of as:
 
@@ -106,7 +106,7 @@ If you are not yet comfortable leaving a full review, try commenting on a PR. Qu
 
 If you struggle with getting a review, see: [How To Get Your Pull Request Reviewed?](/docs/contributors/code/how-to-get-your-pull-request-reviewed.md)
 
-### Design Review
+### Design review
 
 If your pull request impacts the design/UI, you need to label appropriately to alert design. To request a design review, add the [Needs Design Feedback](https://github.com/WordPress/gutenberg/labels/Needs%20Design%20Feedback) label to your PR. If there are any PRs that require an update to the design/UI, please use the [Figma Library Update](https://github.com/WordPress/gutenberg/labels/Figma%20Library%20Update) label.
 
@@ -116,7 +116,7 @@ As a guide, changes that should be reviewed:
 -   Anything that changes something visually.
 -   If you just want design feedback on an idea or exploration.
 
-### Merging Pull Requests
+### Merging pull requests
 
 A pull request can generally be merged once it is:
 
@@ -134,7 +134,7 @@ All members of the WordPress organization on GitHub have the ability to review a
 
 Most pull requests will be automatically assigned a release milestone, but please make sure your merged pull request was assigned one. Doing so creates the historical legacy of what code landed when, and makes it possible for all project contributors (even non-technical ones) to access this information.
 
-### Closing Pull Requests
+### Closing pull requests
 
 Sometimes, a pull request may not be mergeable, no matter how much additional effort is applied to it (e.g. out of scope). In these cases, it’s best to communicate with the contributor graciously while describing why the pull request was closed, this encourages productive future involvement.
 
diff --git a/docs/contributors/triage.md b/docs/contributors/triage.md
index 477c7d7dc81703..33275b8d3df014 100644
--- a/docs/contributors/triage.md
+++ b/docs/contributors/triage.md
@@ -48,7 +48,7 @@ When triaging, either one of the lists above or issues in general, work through
     - Check if the issue is missing some detail and see if you can fill in those details. For instance, if a bug report is missing visual detail, it’s helpful to reproduce the issue locally and upload a screenshot or GIF.
     - Consider adding the Good First Issue label if you believe this is a relatively easy issue for a first-time contributor to try to solve.
 
-**Commonly Used Labels**
+**Commonly used labels**
 
 Generally speaking, the following labels are very useful for triaging issues and will likely be the ones you use the most consistently. You can view all possible labels [here](https://github.com/WordPress/gutenberg/labels).
 
@@ -61,7 +61,7 @@ Generally speaking, the following labels are very useful for triaging issues and
 | `Needs More Info`          | When it’s not clear what the issue is or it would help to provide additional details.     |
 | `Needs Testing`            | When a new issue needs to be confirmed or old bugs seem like they are no longer relevant. |
 
-**Determining Priority Labels**
+**Determining priority labels**
 
 If you have enough knowledge about the report at hand and feel confident in doing so, you can consider adding priority. Note that it’s on purpose that no priority label infers a normal level.
 
@@ -81,7 +81,7 @@ Issues are closed for the following reasons:
 -   An issue that needs more information that the author of the issue hasn't responded to for 2+ weeks.
 -   An item that is determined as unable to be fixed or is working as intended.
 
-## Specific Triages
+## Specific triages
 
 ### Release specific triage
 
diff --git a/docs/contributors/versions-in-wordpress.md b/docs/contributors/versions-in-wordpress.md
index 4449f13996c629..62347f2d644a61 100644
--- a/docs/contributors/versions-in-wordpress.md
+++ b/docs/contributors/versions-in-wordpress.md
@@ -6,40 +6,167 @@ If anything looks incorrect here, please bring it up in #core-editor in [WordPre
 
 | Gutenberg Versions | WordPress Version |
 | ------------------ | ----------------- |
+| 18.6-19.3          | 6.7               |
+| 17.8-18.5          | 6.6.1             |
+| 17.8-18.5          | 6.6               |
+| 16.8-17.7          | 6.5.5             |
+| 16.8-17.7          | 6.5.4             |
+| 16.8-17.7          | 6.5.3             |
+| 16.8-17.7          | 6.5.2             |
+| 16.8-17.7          | 6.5               |
+| 16.2-16.7          | 6.4.4             |
+| 16.2-16.7          | 6.4.5             |
+| 16.2-16.7          | 6.4.3             |
+| 16.2-16.7          | 6.4.2             |
 | 16.2-16.7          | 6.4.1             |
 | 16.2-16.7          | 6.4               |
+| 15.2-16.1          | 6.3.5             |
+| 15.2-16.1          | 6.3.4             |
+| 15.2-16.1          | 6.3.3             |
+| 15.2-16.1          | 6.3.2             |
 | 15.2-16.1          | 6.3.1             |
 | 15.2-16.1          | 6.3               |
+| 14.2-15.1          | 6.2.6             |
+| 14.2-15.1          | 6.2.5             |
+| 14.2-15.1          | 6.2.4             |
+| 14.2-15.1          | 6.2.3             |
+| 14.2-15.1          | 6.2.2             |
+| 14.2-15.1          | 6.2.1             |
 | 14.2-15.1          | 6.2               |
+| 13.1-14.1          | 6.1.7             |
+| 13.1-14.1          | 6.1.6             |
+| 13.1-14.1          | 6.1.5             |
+| 13.1-14.1          | 6.1.4             |
+| 13.1-14.1          | 6.1.3             |
+| 13.1-14.1          | 6.1.2             |
 | 13.1-14.1          | 6.1.1             |
 | 13.1-14.1          | 6.1               |
+| 12.0-13.0          | 6.0.9             |
+| 12.0-13.0          | 6.0.8             |
+| 12.0-13.0          | 6.0.7             |
+| 12.0-13.0          | 6.0.6             |
+| 12.0-13.0          | 6.0.5             |
+| 12.0-13.0          | 6.0.4             |
 | 12.0-13.0          | 6.0.3             |
 | 12.0-13.0          | 6.0.2             |
 | 12.0-13.0          | 6.0.1             |
 | 12.0-13.0          | 6.0               |
+| 10.8-11.9          | 5.9.10            |
+| 10.8-11.9          | 5.9.9             |
+| 10.8-11.9          | 5.9.8             |
+| 10.8-11.9          | 5.9.7             |
+| 10.8-11.9          | 5.9.6             |
+| 10.8-11.9          | 5.9.5             |
+| 10.8-11.9          | 5.9.4             |
 | 10.8-11.9          | 5.9.3             |
 | 10.8-11.9          | 5.9.2             |
 | 10.8-11.9          | 5.9.1             |
 | 10.8-11.9          | 5.9               |
+| 10.0-10.7          | 5.8.10            |
+| 10.0-10.7          | 5.8.9             |
+| 10.0-10.7          | 5.8.8             |
+| 10.0-10.7          | 5.8.7             |
+| 10.0-10.7          | 5.8.6             |
+| 10.0-10.7          | 5.8.5             |
+| 10.0-10.7          | 5.8.4             |
 | 10.0-10.7          | 5.8.3             |
 | 10.0-10.7          | 5.8.2             |
 | 10.0-10.7          | 5.8.1             |
 | 10.0-10.7          | 5.8               |
+| 9.3-9.9            | 5.7.12            |
+| 9.3-9.9            | 5.7.11            |
+| 9.3-9.9            | 5.7.10            |
+| 9.3-9.9            | 5.7.9             |
+| 9.3-9.9            | 5.7.8             |
+| 9.3-9.9            | 5.7.7             |
+| 9.3-9.9            | 5.7.6             |
+| 9.3-9.9            | 5.7.5             |
+| 9.3-9.9            | 5.7.4             |
+| 9.3-9.9            | 5.7.3             |
+| 9.3-9.9            | 5.7.2             |
 | 9.3-9.9            | 5.7.1             |
 | 9.3-9.9            | 5.7               |
+| 8.6-9.2            | 5.6.14            |
+| 8.6-9.2            | 5.6.13            |
+| 8.6-9.2            | 5.6.12            |
+| 8.6-9.2            | 5.6.11            |
+| 8.6-9.2            | 5.6.10            |
+| 8.6-9.2            | 5.6.9             |
+| 8.6-9.2            | 5.6.8             |
+| 8.6-9.2            | 5.6.7             |
+| 8.6-9.2            | 5.6.6             |
+| 8.6-9.2            | 5.6.5             |
+| 8.6-9.2            | 5.6.4             |
+| 8.6-9.2            | 5.6.3             |
+| 8.6-9.2            | 5.6.2             |
 | 8.6-9.2            | 5.6.1             |
 | 8.6-9.2            | 5.6               |
+| 7.6-8.5            | 5.5.15            |
+| 7.6-8.5            | 5.5.14            |
+| 7.6-8.5            | 5.5.13            |
+| 7.6-8.5            | 5.5.12            |
+| 7.6-8.5            | 5.5.11            |
+| 7.6-8.5            | 5.5.10            |
+| 7.6-8.5            | 5.5.9             |
+| 7.6-8.5            | 5.5.8             |
+| 7.6-8.5            | 5.5.7             |
+| 7.6-8.5            | 5.5.6             |
+| 7.6-8.5            | 5.5.5             |
+| 7.6-8.5            | 5.5.4             |
 | 7.6-8.5            | 5.5.3             |
 | 7.6-8.5            | 5.5.2             |
 | 7.6-8.5            | 5.5.1             |
 | 7.6-8.5            | 5.5               |
+| 6.6-7.5            | 5.4.16            |
+| 6.6-7.5            | 5.4.15            |
+| 6.6-7.5            | 5.4.14            |
+| 6.6-7.5            | 5.4.13            |
+| 6.6-7.5            | 5.4.12            |
+| 6.6-7.5            | 5.4.11            |
+| 6.6-7.5            | 5.4.10            |
+| 6.6-7.5            | 5.4.9             |
+| 6.6-7.5            | 5.4.8             |
+| 6.6-7.5            | 5.4.7             |
+| 6.6-7.5            | 5.4.6             |
+| 6.6-7.5            | 5.4.5             |
+| 6.6-7.5            | 5.4.4             |
+| 6.6-7.5            | 5.4.3             |
 | 6.6-7.5            | 5.4.2             |
-| 6.6-7.5            | 5.4.0             |
+| 6.6-7.5            | 5.4.1             |
+| 6.6-7.5            | 5.4               |
+| 5.5-6.5            | 5.3.18            |
+| 5.5-6.5            | 5.3.17            |
+| 5.5-6.5            | 5.3.16            |
+| 5.5-6.5            | 5.3.15            |
+| 5.5-6.5            | 5.3.14            |
+| 5.5-6.5            | 5.3.13            |
+| 5.5-6.5            | 5.3.12            |
+| 5.5-6.5            | 5.3.11            |
+| 5.5-6.5            | 5.3.10            |
+| 5.5-6.5            | 5.3.9             |
+| 5.5-6.5            | 5.3.8             |
+| 5.5-6.5            | 5.3.7             |
+| 5.5-6.5            | 5.3.6             |
+| 5.5-6.5            | 5.3.5             |
 | 5.5-6.5            | 5.3.4             |
 | 5.5-6.5            | 5.3.3             |
 | 5.5-6.5            | 5.3.2             |
 | 5.5-6.5            | 5.3.1             |
-| 5.5-6.5            | 5.3.0             |
+| 5.5-6.5            | 5.3               |
+| 4.9-5.4            | 5.2.21            |
+| 4.9-5.4            | 5.2.20            |
+| 4.9-5.4            | 5.2.19            |
+| 4.9-5.4            | 5.2.18            |
+| 4.9-5.4            | 5.2.17            |
+| 4.9-5.4            | 5.2.16            |
+| 4.9-5.4            | 5.2.15            |
+| 4.9-5.4            | 5.2.14            |
+| 4.9-5.4            | 5.2.13            |
+| 4.9-5.4            | 5.2.12            |
+| 4.9-5.4            | 5.2.11            |
+| 4.9-5.4            | 5.2.10            |
+| 4.9-5.4            | 5.2.9             |
+| 4.9-5.4            | 5.2.8             |
 | 4.9-5.4            | 5.2.7             |
 | 4.9-5.4            | 5.2.6             |
 | 4.9-5.4            | 5.2.5             |
@@ -47,14 +174,39 @@ If anything looks incorrect here, please bring it up in #core-editor in [WordPre
 | 4.9-5.4            | 5.2.3             |
 | 4.9-5.4            | 5.2.2             |
 | 4.9-5.4            | 5.2.1             |
-| 4.9-5.4            | 5.2.0             |
+| 4.9-5.4            | 5.2               |
+| 4.8                | 5.1.19            |
+| 4.8                | 5.1.18            |
+| 4.8                | 5.1.17            |
+| 4.8                | 5.1.16            |
+| 4.8                | 5.1.15            |
+| 4.8                | 5.1.14            |
+| 4.8                | 5.1.13            |
+| 4.8                | 5.1.12            |
+| 4.8                | 5.1.11            |
+| 4.8                | 5.1.10            |
+| 4.8                | 5.1.9             |
+| 4.8                | 5.1.8             |
+| 4.8                | 5.1.7             |
 | 4.8                | 5.1.6             |
 | 4.8                | 5.1.5             |
 | 4.8                | 5.1.4             |
 | 4.8                | 5.1.3             |
 | 4.8                | 5.1.2             |
 | 4.8                | 5.1.1             |
-| 4.8                | 5.1.0             |
+| 4.8                | 5.1               |
+| 4.7.1              | 5.0.22            |
+| 4.7.1              | 5.0.21            |
+| 4.7.1              | 5.0.20            |
+| 4.7.1              | 5.0.19            |
+| 4.7.1              | 5.0.18            |
+| 4.7.1              | 5.0.17            |
+| 4.7.1              | 5.0.16            |
+| 4.7.1              | 5.0.15            |
+| 4.7.1              | 5.0.14            |
+| 4.7.1              | 5.0.13            |
+| 4.7.1              | 5.0.12            |
+| 4.7.1              | 5.0.11            |
 | 4.7.1              | 5.0.10            |
 | 4.7.1              | 5.0.9             |
 | 4.7.1              | 5.0.8             |
@@ -65,4 +217,4 @@ If anything looks incorrect here, please bring it up in #core-editor in [WordPre
 | 4.7.1              | 5.0.3             |
 | 4.7.0              | 5.0.2             |
 | 4.6.1              | 5.0.1             |
-| 4.6.1              | 5.0.0             |
+| 4.6.1              | 5.0               |
diff --git a/docs/explanations/README.md b/docs/explanations/README.md
index 04d9f8e9e15b52..2d0da6cabdf67c 100644
--- a/docs/explanations/README.md
+++ b/docs/explanations/README.md
@@ -8,5 +8,5 @@
 -   [Block Editor Performance](/docs/explanations/architecture/performance.md).
 -   What are the decision decisions behind the Data Module?
 -   [Why is Puppeteer the tool of choice for end-to-end tests?](/docs/explanations/architecture/automated-testing.md)
--   [What’s the difference between the different editor packages? What’s the purpose of each package?](/docs/explanations/architecture/modularity.md/#whats-the-difference-between-the-different-editor-packages-whats-the-purpose-of-each-package)
+-   [What’s the difference between the different editor packages? What’s the purpose of each package?](/docs/explanations/architecture/modularity.md#whats-the-difference-between-the-different-editor-packages-whats-the-purpose-of-each-package)
 -   [Template and template parts flows](/docs/explanations/architecture/full-site-editing-templates.md)
diff --git a/docs/explanations/architecture/README.md b/docs/explanations/architecture/README.md
index 2cecdfd70e2d6f..ec49318bb38cfa 100644
--- a/docs/explanations/architecture/README.md
+++ b/docs/explanations/architecture/README.md
@@ -11,7 +11,7 @@ Let’s look at the big picture and the architectural and UX principles of the b
 -   [Styles in the editor](/docs/explanations/architecture/styles.md).
 -   [Performance](/docs/explanations/architecture/performance.md).
 
-## Gutenberg Repository
+## Gutenberg repository
 
 -   [Modularity and WordPress Packages](/docs/explanations/architecture/modularity.md).
 -   [Understand the repository folder structure](/docs/contributors/folder-structure.md).
diff --git a/docs/explanations/architecture/data-flow.md b/docs/explanations/architecture/data-flow.md
index e000cd33b46317..c594ceda704431 100644
--- a/docs/explanations/architecture/data-flow.md
+++ b/docs/explanations/architecture/data-flow.md
@@ -74,7 +74,7 @@ const columnsBlock = {
 };
 ```
 
-## Serialization and Parsing
+## Serialization and parsing
 
 ![Diagram](https://docs.google.com/drawings/d/1iuownt5etcih7rMMvPvh0Mny8zUA1Z28saxjxaWmfJ0/pub?w=1234&h=453)
 
@@ -88,7 +88,7 @@ This is one end of the process. The other is how to recreate the collection of b
 
 They just happen, incidentally, to be stored inside of `post_content` in a way in which they require no transformation in order to be viewable by any legacy system. It's true that loading the stored HTML into a browser without the corresponding machinery might degrade the experience, and if it included dynamic blocks of content, the dynamic elements may not load, server-generated content may not appear, and interactive content may remain static. However, it at least protects against not being able to view block editor posts on themes and installations that are blocks-unaware, and it provides the most accessible way to the content. In other words, the post remains mostly intact even if the saved HTML is rendered as is.
 
-### Delimiters and Parsing Expression Grammar
+### Delimiters and parsing expression grammar
 
 We chose instead to try to find a way to keep the formality, explicitness, and unambiguity in the existing HTML syntax. Within the HTML there were a number of options.
 
@@ -102,7 +102,7 @@ This has dramatic implications for how simple and performant we can make our par
 
 _N.B.:_ The defining aspects of blocks are their semantics and the isolation mechanism they provide: in other words, their identity. On the other hand, where their data is stored is a more liberal aspect. Blocks support more than just static local data (via JSON literals inside the HTML comment or within the block's HTML), and more mechanisms (_e.g._, global blocks or otherwise resorting to storage in complementary `WP_Post` objects) are expected. See [attributes](/docs/reference-guides/block-api/block-attributes.md) for details.
 
-### The Anatomy of a Serialized Block
+### The anatomy of a serialized block
 
 When blocks are saved to the content after the editing session, its attributes—depending on the nature of the block—are serialized to these explicit comment delimiters.
 
@@ -118,7 +118,7 @@ A purely dynamic block that is to be server-rendered before display could look l
 <!-- wp:latest-posts {"postsToShow":4,"displayPostDate":true} /-->
 ```
 
-## The Data Lifecycle
+## The data lifecycle
 
 In summary, the block editor workflow parses the saved document to an in-memory tree of blocks, using token delimiters to help. During editing, all manipulations happen within the block tree. The process ends by serializing the blocks back to the `post_content`.
 
diff --git a/docs/explanations/architecture/entities.md b/docs/explanations/architecture/entities.md
index ca6609ba1b9c91..7f2df3cc2bcadc 100644
--- a/docs/explanations/architecture/entities.md
+++ b/docs/explanations/architecture/entities.md
@@ -1,11 +1,12 @@
-# Entities and Undo/Redo.
+# Entities and Undo/Redo
 
-The WordPress editors, whether it's the post or site editor, manipulate what we call entity records. These are objects that represent a post, a page, a user, a term, a template, etc. They are the data that is stored in the database and that is manipulated by the editor. Each editor can fetch, edit and save multiple entity records at the same time. 
+The WordPress editors, whether it's the Post or Site Editor, manipulate what we call entity records. These are objects that represent a post, a page, a user, a term, a template, etc. They are the data that is stored in the database, and that is manipulated by the editor. Each editor can fetch, edit, and save multiple entity records at the same time. 
 
-For instance, when opening a page in the site editor:
- - you can edit properties of the page itself (title, content...)
- - you can edit properties of the template of the page (content of the template, design...)
- - you can edit properties of template parts (header, footer) used with the template.
+For instance, when opening a page in the Site Editor:
+
+ - You can edit properties of the page itself (title, content, etc.)
+ - You can edit properties of the template of the page (content of the template, design, etc.)
+ - You can edit properties of template parts (header, footer) used with the template.
 
 The editor keeps track of all these modifications and orchestrates the saving of all these modified records. This happens within the `@wordpress/core-data` package.
 
@@ -18,13 +19,14 @@ To be able to edit an entity, you need to first fetch it and load it into the `c
 wp.data.select( 'core' ).getEntityRecord( 'postType', 'post', 1 );
 ````
 
-Once the entity is loaded, you can edit it. For example, the following code sets the title of the post to "Hello World". For each fetched entity record, the `core-data` store keeps track of:
- - the "persisted" record: The last state of the record as it was fetched from the backend.
- - A list of "edits": Unsaved local modifications for one or several properties of the record. 
+Once the entity is loaded, you can edit it. For example, the following code sets the title of the post to "Hello World". For each fetched entity record, the `core-data` store keeps track of the following:
+
+ - **The "persisted" record:** The last state of the record as it was fetched from the backend.
+ - **A list of "edits":** Unsaved local modifications for one or several properties of the record. 
  
 The package also exposes a set of actions to manipulate the fetched entity records.
 
-To edit an entity record, you can call `editEntityRecord`, which takes the entity type, the entity ID and the new entity record as parameters. The following example sets the title of the post with ID 1 to "Hello World".
+To edit an entity record, you can call `editEntityRecord`, which takes the entity type, the entity ID, and the new entity record as parameters. The following example sets the title of the post with ID 1 to "Hello World".
 
 ````js
 wp.data.dispatch( 'core' ).editEntityRecord( 'postType', 'post', 1, { title: 'Hello World' } );
@@ -42,11 +44,11 @@ Since the WordPress editors allow multiple entity records to be edited at the sa
 
 And to be able to perform both undo and redo operations properly, each modification in the list of edits contains the following information:
 
- - Entity kind and name: Each entity in core-data is identified by the pair _(kind, name)_. This corresponds to the identifier of the modified entity. 
- - Entity Record ID: The ID of the modified record.
- - Property: The name of the modified property.
- - From: The previous value of the property (needed to apply the undo operation).
- - To: The new value of the property (needed to apply the redo operation).
+ - **Entity kind and name:** Each entity in core-data is identified by the pair _(kind, name)_. This corresponds to the identifier of the modified entity. 
+ - **Entity Record ID:** The ID of the modified record.
+ - **Property:** The name of the modified property.
+ - **From:** The previous value of the property (needed to apply the undo operation).
+ - **To:** The new value of the property (needed to apply the redo operation).
  
 For example, let's say a user edits the title of a post, followed by a modification to the post slug, and then a modification of the title of a reusable block used with the post. The following information is stored in the undo/redo stack:
 
@@ -54,15 +56,15 @@ For example, let's say a user edits the title of a post, followed by a modificat
  - `[ { kind: 'postType', name: 'post', id: 1, property: 'slug', from: 'Previous slug', to: 'This is the slug of the hello world post' } ]`
  - `[ { kind: 'postType', name: 'wp_block', id: 2, property: 'title', from: 'Reusable Block', to: 'Awesome Reusable Block' } ]`
 
-The store also keep tracks of a "pointer" to the current "undo/redo" step. By default, the pointer always points to the last item in the stack. This pointer is updated when the user performs an undo or redo operation.
+The store also keeps track of a "pointer" to the current "undo/redo" step. By default, the pointer always points to the last item in the stack. This pointer is updated when the user performs an undo or redo operation.
 
 ### Cached changes
 
 The undo/redo core behavior also supports what we call "cached modifications". These are modifications that are not stored in the undo/redo stack right away. For instance, when a user starts typing in a text field, the value of the field is modified in the store, but this modification is not stored in the undo/redo stack until after the user moves to the next word or after a few milliseconds. This is done to avoid creating a new undo/redo step for each character typed by the user.
 
-Cached changes are kept outside the undo/redo stack in what is called a "cache" of modifications and these modifications are only stored in the undo/redo stack when we explicitely call `__unstableCreateUndoLevel` or when the next modification is not a cached one.
+Cached changes are kept outside the undo/redo stack in what is called a "cache" of modifications, and these modifications are only stored in the undo/redo stack when we explicitly call `__unstableCreateUndoLevel` or when the next modification is not a cached one.
 
-By default all calls to `editEntityRecord` are considered "non-cached" unless the `isCached` option is passed as true. Example:
+By default, all calls to `editEntityRecord` are considered "non-cached" unless the `isCached` option is passed as true. Example:
 
 ```js
 wp.data.dispatch( 'core' ).editEntityRecord( 'postType', 'post', 1, { title: 'Hello World' }, { isCached: true } );
diff --git a/docs/explanations/architecture/key-concepts.md b/docs/explanations/architecture/key-concepts.md
index 3af2d6d87a077d..30318d29422d37 100644
--- a/docs/explanations/architecture/key-concepts.md
+++ b/docs/explanations/architecture/key-concepts.md
@@ -12,7 +12,7 @@ The settings and content of a block can be customized in three main places: the
 
 Blocks are meant to be combined in different ways. Blocks are hierarchical in that a block can be nested within another block. Nested blocks and its container are also called _children_ and _parent_ respectively. For example, a _Columns_ block can be the parent block to multiple child blocks in each of its columns. The API that governs child block usage is named `InnerBlocks`.
 
-### Data & Attributes
+### Data and attributes
 
 Blocks understand content as attributes and are serializable to HTML. To this point, there is a new Block Grammar. Distilled, the block grammar is an HTML comment, either a self-closing tag or with a beginning tag and ending tag. In the main tag, depending on the block type and user customizations, there can be a JSON object. This raw form of the block is referred to as serialized.
 
@@ -28,20 +28,20 @@ Each block contains Attributes or configuration settings, which can be sourced f
 
 More on [Data format and data flow](/docs/explanations/architecture/data-flow.md).
 
-### Block Transforms
+### Block transforms
 
 Blocks have the ability to be transformed into other block types. This allows basic operations like converting a paragraph into a heading, but also more intricate ones like multiple images becoming a gallery. Block transforms work for single blocks and for multi-block selections. Internal block variations are also possible transformation targets.
 
-### Block Variations
+### Block variations
 
 Given a block type, a block variation is a predefined set of its initial attributes. This API allows creating a single block from which multiple configurations are possible. Variations provide different possible interfaces, including showing up as entirely new blocks in the library, or as presets when inserting a new block. Read [the API documentation](/docs/reference-guides/block-api/block-registration.md#variations-optional) for more details.
 
-**More on Blocks**
+**More on blocks**
 
 -   **[Block API](/docs/reference-guides/block-api/README.md)**
--   **[Tutorial: Building A Custom Block](/docs/getting-started/create-block/README.md)**
+-   **[Tutorial: Building A Custom Block](/docs/getting-started/devenv/get-started-with-create-block.md)**
 
-## Reusable Blocks
+## Reusable blocks
 
 A reusable blocks is **an instance** of a block (or multiple blocks) that can be inserted and edited in multiples places, remaining in sync everywhere. If a reusable block is edited in one place, those changes are reflected across all posts and pages that block is used. Examples of reusable blocks include a block consisting of a heading whose content and a custom color that would be appear on multiple pages of the site and sidebar widgets that would appear on every page.
 
@@ -65,6 +65,6 @@ More on [Site editing templates](/docs/explanations/architecture/full-site-editi
 
 ## Styles
 
-Styles, formerly known as Global Styles and as such referenced in the code, is both an interface that users access through the editor and a configuration system done through [a `theme.json` file](/docs/how-to-guides/themes/theme-json.md). This file absorbs most of the configuration aspects usually scattered through various `add_theme_support` calls to simplify communicating with the editor. It thus aims to improve declaring what settings should be enabled, what specific tools a theme offers (like a custom color palette), the available design tools present, and an infrastructure that allows to coordinate the styles coming from WordPress, the active theme, and the user.
+Styles, formerly known as Global Styles and as such referenced in the code, is both an interface that users access through the editor and a configuration system done through [a `theme.json` file](/docs/how-to-guides/themes/global-settings-and-styles.md). This file absorbs most of the configuration aspects usually scattered through various `add_theme_support` calls to simplify communicating with the editor. It thus aims to improve declaring what settings should be enabled, what specific tools a theme offers (like a custom color palette), the available design tools present, and an infrastructure that allows to coordinate the styles coming from WordPress, the active theme, and the user.
 
 Learn more about [Global Styles](/docs/explanations/architecture/styles.md#global-styles).
diff --git a/docs/explanations/architecture/modularity.md b/docs/explanations/architecture/modularity.md
index dc815d92174dde..ff619ccbfdf5b7 100644
--- a/docs/explanations/architecture/modularity.md
+++ b/docs/explanations/architecture/modularity.md
@@ -42,7 +42,7 @@ function MyApp() {
 
 ```php
 // myplugin.php
-// Example of script registration dependending on the "components" and "element packages.
+// Example of script registration depending on the "components" and "element packages.
 wp_register_script( 'myscript', 'pathtomyscript.js', array ('wp-components', "react" ) );
 ```
 
@@ -76,7 +76,7 @@ If you're using one of these stores to access and manipulate WordPress data in y
 
 These are packages used in development mode to help developers with daily tasks to develop, build and ship JavaScript applications, WordPress plugins and themes. They include tools for linting your codebase, building it, testing it...
 
-## Editor Packages
+## Editor packages
 
 ![Post Editor Modules Architecture](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/explanations/architecture/assets/modules.png)
 
diff --git a/docs/explanations/architecture/performance.md b/docs/explanations/architecture/performance.md
index b57a2bba1db615..4c8b6386b9263b 100644
--- a/docs/explanations/architecture/performance.md
+++ b/docs/explanations/architecture/performance.md
@@ -6,11 +6,13 @@ Performance is a key feature for editor applications and the Block editor is not
 
 To ensure the block editor stays performant across releases and development, we monitor some key metrics using [performance benchmark job](#the-performance-benchmark-job).
 
-- **Loading Time:** The time it takes to load an editor page. This includes time the server takes to respond, times to first paint, first contentful paint, DOM content load complete, load complete and first block render.
+Some of the main important metrics are:
+
+- **Loading Time:** The time it takes to load an editor page. This includes time the server takes to respond, times to first paint, first contentful paint, DOM content load complete, load complete and first block render (both in post and site).
 - **Typing Time:** The time it takes for the browser to respond while typing on the editor.
 - **Block Selection Time:** The time it takes for the browser to respond after a user selects block. (Inserting a block is also equivalent to selecting a block. Monitoring the selection is sufficient to cover both metrics).
 
-## Key Performance Decisions and Solutions
+## Key performance decisions and solutions
 
 **Data Module Async Mode**
 
@@ -57,11 +59,33 @@ Once the directory above is in place, the performance command loop over the perf
 2. Run the performance test for the current suite
 3. Stop the environment for `branch1`
 4. Repeat the first 3 steps for all other branches
-5. Repeat the previous 4 steps 3 times.
-6. Compute medians for all the performance metrics of the current suite.
+5. Compute medians for all the performance metrics of the current suite.
 
 Once all the test suites are executed, a summary report is printed.
 
+## Tracking performance using CodeVitals.
+
+The performance results for each commit are pushed to codevitals and can be seen on the [Gutenberg dashboard there](https://www.codevitals.run/project/gutenberg). The graphs allow us to track the evolution of a given metric over time.
+
+It's thus very important to ensure that the metric being computed is stable. Meaning, if you run the same test twice with the same code and environment, you'll get results that are close.
+
+Our performance job runs GitHub CI which means that we can't trust the consistency of the numbers that we get between two similar job runs. GitHub CI may allocate different CPU and memory resources for us over time for instance. To alleviate this problem, each time we run the performance job on the trunk branch, we compare the current commit's performance to a fixed reference commit hash, which allows us to track the relative difference between the current commit and the reference commit consistently regardless of environment changes.
+
+### Update the reference commit
+
+Gutenberg supports only two WP versions, this impacts the performance job in two ways:
+
+ - The base WP version used to run the performance job needs to be updated, when the minimum version supported by Gutenberg changes. In order to do that, we rely on the `Tested up to` flag of the plugin's `readme.txt` file. So each time that flag is changed, the version used for the performance job is changed as well.
+
+ - Updating the WP version used for performance jobs means that there's a high chance that the reference commit used for performance test stability becomes incompatible with the WP version that is used. So every time, the `Tested up to` flag is updated in the `readme.txt` is changed, we also have to update the reference commit that is used in `.github/workflows/performance.yml`.
+
+The new reference commit hash that is chosen needs to meet the following requirements:
+
+ - Be compatible with the new WP version used in the "Tested up to" flag.
+ - Is already tracked on "codevitals.run" for all existing metrics.
+
+**A simple way to choose commit is to pick a very recent commit on trunk with a passing performance job.**
+
 ## Going further
 
 -   [Journey towards a performant editor](https://riad.blog/2020/02/14/a-journey-towards-a-performant-web-editor/)
diff --git a/docs/explanations/architecture/styles.md b/docs/explanations/architecture/styles.md
index a8a5af72fec76b..68f09f04d21d32 100644
--- a/docs/explanations/architecture/styles.md
+++ b/docs/explanations/architecture/styles.md
@@ -1,30 +1,8 @@
-## Styles in the editor
+# Styles in the Editor
 
 This document introduces the main concepts related to styles that affect the user content in the block editor. It points to the relevant reference guides and tutorials for readers to dig deeper into each one of the ideas presented. It's aimed to block authors and people working in the block editor project.
 
-1. [HTML and CSS](#html-and-css)
-2. [Block styles](#block-styles)
-
--   [From UI controls to HTML markup](#from-ui-controls-to-html-markup)
--   [Block Supports API](#block-supports-api)
--   [Current limitations of the Block Supports API](#current-limitations-of-the-block-supports-api)
-
-3. [Global styles](#global-styles)
-
--   [Gather data](#gather-data)
--   [Consolidate data](#consolidate-data)
--   [From data to styles](#from-data-to-styles)
--   [Current limitations of the Global Styles API](#current-limitations-of-the-global-styles-api)
-
-4. [Layout styles](#layout-styles)
-
--   [Base layout styles](#base-layout-styles)
--   [Individual layout styles](#individual-layout-styles)
--   [Available layout types](#available-layout-types)
--   [Targeting layout or container blocks from themes](#targeting-layout-or-container-blocks-from-themes)
--   [Opting out of generated layout styles](#opting-out-of-generated-layout-styles)
-
-### HTML and CSS
+## HTML and CSS
 
 By creating a post in the block editor the user is creating a number of artifacts: a HTML document plus a number of CSS stylesheets, either embedded in the document or external.
 
@@ -37,12 +15,12 @@ The final HTML document is the result of a few things:
 The stylesheets loaded in the front end include:
 
 -   **Blocks**. The stylesheets that come with the block. In the front end, you can find a single stylesheet with all block styles defined by WordPress (`wp-block-library-*` ) or separate stylesheets per block in use (as in `wp-block-group-*`, `wp-block-columns-*`, etc). See [this note](https://make.wordpress.org/core/2021/07/01/block-styles-loading-enhancements-in-wordpress-5-8/) for the full details.
--   **Global styles**. These styles are generated on the fly by using data coming from a theme.json file: see [note](https://make.wordpress.org/core/2021/06/25/introducing-theme-json-in-wordpress-5-8/), [reference](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/), and [how to guide](https://developer.wordpress.org/block-editor/how-to-guides/themes/theme-json/). Specifically, it merges the contents of the theme.json from WordPress, the theme.json from the theme (if it has one), and the user data provided via the global styles sidebar in the site editor. The result of processing this data is an embedded stylesheet whose id is `global-styles-inline-css`.
+-   **Global styles**. These styles are generated on the fly by using data coming from a theme.json file: see [note](https://make.wordpress.org/core/2021/06/25/introducing-theme-json-in-wordpress-5-8/), [reference](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/), and [how to guide](https://developer.wordpress.org/block-editor/how-to-guides/themes/global-settings-and-styles/). Specifically, it merges the contents of the theme.json from WordPress, the theme.json from the theme (if it has one), and the user data provided via the global styles sidebar in the site editor. The result of processing this data is an embedded stylesheet whose id is `global-styles-inline-css`.
 -   **Theme**. Historically, themes have enqueued their own stylesheets, where the id is based on the theme name, as in `twentytwentytwo-style-css`. In addition to having their own stylesheets they can now declare a theme.json file containing styles that will be part of the stylesheet generated by global styles.
 -   **User**. Some of the user actions in the editor will generate style content. This is the case for features such as duotone, layout, or link color.
 -   **Other**. WordPress and plugins can also enqueue stylesheets.
 
-### Block styles
+## Block styles
 
 Since the introduction of the block editor in WordPress 5.0, there were tools for the users to "add styles" to specific blocks. By using these tools, the user would attach new classes or inline styles to the blocks, modifying their visual aspect.
 
@@ -67,7 +45,7 @@ This is what we refer to as "user-provided block styles", also know as "local st
 
 The ability to modify a block state coupled with the fact that a block can live within any other block (think of a paragraph within a group), creates a vast amount of potential states and style possibilities.
 
-#### From UI controls to HTML markup
+### From UI controls to HTML markup
 
 If you follow the [block tutorial](https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/) you can learn up about the different parts of the [block API](https://developer.wordpress.org/block-editor/reference-guides/block-api/) presented here in more detail and also build your own block. This is an introduction to the general concepts of how a block can let users edit its state.
 
@@ -80,7 +58,7 @@ To build an experience like the one described above a block author needs a few p
 
 In essence, these are the essential mechanics a block author needs to care about for their block to be able to be styled by the user. While this can be done completely manually, there's an API that automates this process for common style needs: block supports.
 
-#### Block Supports API
+### Block Supports API
 
 [Block Supports](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/) is an API that allows a block to declare what features it supports. By adding some info to their [block.json file](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/), the block tells the system what kind of actions a user can do to it.
 
@@ -100,7 +78,7 @@ For example:
 
 The paragraph declares support for font size in its `block.json`. This means the block will show a UI control for users to tweak its font size, unless it's disabled by the theme (learn more about how themes can disable UI controls in [the `theme.json` reference](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/)). The system will also take care of setting up the UI control data (the font size of the block if it has one already assigned, the list of available font sizes to show), and will serialize the block data into HTML markup upon user changes (attach classes and inline styles appropriately).
 
-By using the block supports mechanism via `block.json`, the block author is able to create the same experience as before just by writing a couple of lines. Check the tutorials for adding block supports to [static](/docs/how-to-guides/block-tutorial/block-supports-in-static-blocks.md) and [dynamic](/docs/how-to-guides/block-tutorial/block-supports-in-dynamic-blocks.md) blocks.
+By using the block supports mechanism via `block.json`, the block author is able to create the same experience as before just by writing a couple of lines. Check the [block supports api](/docs/reference-guides/block-api/block-supports.md) for adding block supports to static or dynamic blocks.
 
 Besides the benefit of having to do less work to achieve the same results, there's a few other advantages:
 
@@ -108,7 +86,7 @@ Besides the benefit of having to do less work to achieve the same results, there
 -   the block will use the UI controls other blocks use for the same styles, creating a more coherent user experience
 -   the UI controls in use by the block will be automatically updated as they are improved, without the block author having to do anything
 
-#### Current limitations of the Block Supports API
+### Current limitations of the Block Supports API
 
 While the Block Supports API provides value, it also comes with some limitations a block author needs to be aware of. To better visualize what they are, let's run with the following example of a table block:
 
@@ -182,7 +160,7 @@ To enable for a _single_ property only, you may use an array to declare which pr
 
 Support for this feature was [added in this PR](https://github.com/WordPress/gutenberg/pull/36293).
 
-### Global styles
+## Global styles
 
 Global Styles refers to a mechanism that generates site-wide styles. Unlike the block styles described in the previous section, these are not serialized into the post content and are not attached to the block HTML. Instead, the output of this system is a new stylesheet with id `global-styles-inline-css`.
 
@@ -198,19 +176,19 @@ The process of generating the stylesheet has, in essence, three steps:
 2. Consolidate data: the structured information from different origins -WordPress defaults, theme, and user- is normalized and merged into a single structure.
 3. Convert data into a stylesheet: convert the internal representation into CSS style rules and enqueue them as a stylesheet.
 
-#### Gather data
+### Gather data
 
 The data can come from three different origins: WordPress defaults, the active theme, or the user. All three of them use the same [`theme.json` format](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/).
 
 Data from WordPress and the active theme is retrieved from the corresponding `theme.json` file. Data from the user is pulled from the database, where it's stored after the user saves the changes they did via the global styles sidebar in the site editor.
 
-#### Consolidate data
+### Consolidate data
 
 The goal of this phase is to build a consolidated structure.
 
 There are two important processes going on in this phase. First, the system needs to normalize all the incoming data, as different origins may be using different versions of the `theme.json` format. For example, a theme may be using [v1](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-v1/) while the WordPress base is using [the latest version](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-living/). Second, the system needs to decide how to merge the input into a single structure. This will be the focus of the following sections.
 
-##### Styles
+#### Styles
 
 Different parts of the incoming `theme.json` structure are treated differently. The data present in the `styles` section is blended together following this logic: user data overrides theme data, and theme data overrides WordPress data.
 
@@ -266,7 +244,7 @@ The result after the consolidation would be:
 }
 ```
 
-##### Settings
+#### Settings
 
 The `settings` section works differently than styles. Most of the settings are only used to configure the editor and have no effect on the global styles. Only a few of them are part of the resulting stylesheet: the presets.
 
@@ -332,11 +310,11 @@ The result after the consolidation would be:
 }
 ```
 
-#### From data to styles
+### From data to styles
 
 The last phase of generating the stylesheet is converting the consolidated data into CSS style rules.
 
-##### Styles to CSS rules
+#### Styles to CSS rules
 
 The `styles` section can be thought of as a structured representation of CSS rules, each chunk representing a CSS rule:
 
@@ -405,7 +383,7 @@ p {
 }
 ```
 
-##### Settings to CSS rules
+#### Settings to CSS rules
 
 From the `settings` section, all the values of any given presets will be converted to a CSS Custom Property that follows this naming structure: `--wp--preset--<category>-<slug>`. The selectors follow the same rules described in the styles section above.
 
@@ -483,29 +461,29 @@ In addition to the CSS Custom Properties, all presets but duotone generate CSS c
 .wp-block-site-title .has-foreground-border-color { border-color: var(--wp--preset--color--foreground) !important; }
 ```
 
-#### Current limitations of the Global Styles API
+### Current limitations of the Global Styles API
 
-##### 1. **Setting a different CSS selector for blocks requires server-registration**
+#### 1. **Setting a different CSS selector for blocks requires server-registration**
 
 By default, the selector assigned to a block is `.wp-block-<block-name>`. However, blocks can change this should they need. They can provide a CSS selector via the `__experimentalSelector` property in its `block.json`.
 
 If blocks do this, they need to be registered in the server using the `block.json`, otherwise, the global styles code doesn't have access to that information and will use the default CSS selector for the block.
 
-##### 2. **Can't target different HTML nodes for different styles**
+#### 2. **Can't target different HTML nodes for different styles**
 
 Every chunk of styles can only use a single selector.
 
 This is particularly relevant if the block is using `__experimentalSkipSerialization` to serialize the different style properties to different nodes other than the wrapper. See "Current limitations of blocks supports" for more.
 
-##### 3. **Only a single property per block**
+#### 3. **Only a single property per block**
 
 Similarly to block supports, there can be only one instance of any style in use by the block. For example, the block can only have a single font size. See related "Current limitations of block supports".
 
-##### 4. **Only blocks using block supports are shown in the Global Styles UI**
+#### 4. **Only blocks using block supports are shown in the Global Styles UI**
 
 The global styles UI in the site editor has a screen for per-block styles. The list of blocks is generated dynamically using the block supports from the `block.json` of blocks. If a block wants to be listed there, it needs to use the block supports mechanism.
 
-### Layout styles
+## Layout styles
 
 In addition to styles at the individual block level and in global styles, there is the concept of layout styles that are output for both blocks-based and classic themes.
 
@@ -513,7 +491,7 @@ The layout block support outputs common layout styles that are shared between bl
 
 There are two primary places where Layout styles are output:
 
-#### Base layout styles
+### Base layout styles
 
 Base layout styles are those styles that are common to all blocks that opt in to a particular layout type. Examples of common base layout styling include setting `display: flex` for blocks that use the Flex layout type (such as Buttons and Social Icons), and providing default max-width for constrained layouts.
 
@@ -521,25 +499,25 @@ Base layout styles are output from within [the main PHP class](https://github.co
 
 Common layout definitions are stored in [the core layout block support file](https://github.com/WordPress/wordpress-develop/blob/trunk/src/wp-includes/block-supports/layout.php).
 
-#### Individual layout styles
+### Individual layout styles
 
 When a block that opts in to layout support is rendered, two things are processed and added to the output via [`layout.php`](https://github.com/WordPress/wordpress-develop/blob/trunk/src/wp-includes/block-supports/layout.php):
 
 -   Semantic class names are added to the block markup to indicate which layout settings are in use. For example, `is-layout-flow` is for blocks (such as Group) that use the default/flow layout, and `is-content-justification-right` is added when a user sets a block to use right justification.
 -   Individual styles are generated for non-default layout values that are set on the individual block being rendered. These styles are attached to the block via a container class name using the form `wp-container-$id` where the `$id` is a [unique number](https://developer.wordpress.org/reference/functions/wp_unique_id/).
 
-#### Available layout types
+### Available layout types
 
 There are currently four layout types in use:
 
--   Default/Flow: Items are stacked vertically. The parent container block is set to `display: flow` and the spacing between children is handled via vertical margins.
+-   Default/Flow: Items are stacked vertically. The parent container block's display value isn't specified, so that it may use the default value for that HTML element. For most elements that will usually be `block`. The spacing between children is handled via vertical margins.
 -   Constrained: Items are stacked vertically, using the same spacing logic as the Flow layout. Features constrained widths for child content, outputting widths for standard content size and wide size. Defaults to using global `contentSize` and `wideSize` values set in `settings.layout` in the `theme.json`.
 -   Flex: Items are displayed using a Flexbox layout. Defaults to a horizontal orientation. Spacing between children is handled via the `gap` CSS property.
 -   Grid: Items are displayed using a Grid layout. Defaults to an `auto-fill` approach to column generation but can also be set to a fixed number of columns. Spacing between children is handled via the `gap` CSS property.
 
-For controlling spacing between blocks, and enabling block spacing controls see: [What is blockGap and how can I use it?](https://developer.wordpress.org/block-editor/how-to-guides/themes/theme-json/#what-is-blockgap-and-how-can-i-use-it).
+For controlling spacing between blocks, and enabling block spacing controls see: [What is blockGap and how can I use it?](https://developer.wordpress.org/block-editor/how-to-guides/themes/global-settings-and-styles/#what-is-blockgap-and-how-can-i-use-it).
 
-#### Targeting layout or container blocks from themes
+### Targeting layout or container blocks from themes
 
 The layout block support is designed to enable control over layout features from within the block and site editors. Where possible, try to use the features of the blocks to determine particular layout requirements rather than relying upon additional stylesheets.
 
@@ -547,7 +525,7 @@ For themes that wish to target container blocks in order to add or adjust partic
 
 For targeting a block that uses a particular layout type, avoid targeting `wp-container-` as container classes may not always be present in the rendered markup.
 
-##### Semantic class names
+#### Semantic class names
 
 Work is currently underway to expand stable semantic classnames in Layout block support output. The task is being discussed in [this issue](https://github.com/WordPress/gutenberg/issues/38719).
 
@@ -566,6 +544,6 @@ The current semantic class names that can be output by the Layout block support
 -   `is-content-justification-space-between`: When a block explicitly sets `justifyContent` to `space-between`.
 -   `is-nowrap`: When a block explicitly sets `flexWrap` to `nowrap`.
 
-#### Opting out of generated layout styles
+### Opting out of generated layout styles
 
 Layout styles output is switched on by default because the styles are required by core structural blocks. However, themes can opt out of generated block layout styles while retaining semantic class name output by using the `disable-layout-styles` block support. Such themes will be responsible for providing all their own layout styles. See [the entry under Theme Support](https://developer.wordpress.org/block-editor/how-to-guides/themes/theme-support/#disabling-base-layout-styles).
diff --git a/docs/explanations/user-interface/block-design.md b/docs/explanations/user-interface/block-design.md
index 5df99b5398867f..66411744fa5663 100644
--- a/docs/explanations/user-interface/block-design.md
+++ b/docs/explanations/user-interface/block-design.md
@@ -64,7 +64,7 @@ Group toolbar controls in logical segments. Don't add a segment for each.
 
 ![A screenshot comparing a block toolbar with good vs. bad toolbar segment groupings.](https://make.wordpress.org/design/files/2021/03/docs__block-toolbar-do-dont.png)
 
-### Block Identification
+### Block identification
 
 A block should have a straightforward, short name so users can easily find it in the block library. A block named "YouTube" is easy to find and understand. The same block, named "Embedded Video (YouTube)", would be less clear and harder to find in the block library.
 
@@ -74,7 +74,7 @@ When referring to a block in documentation or UI, use title case for the block t
 -   Latest Posts block
 -   Media & Text block
 
-Blocks should have an identifying icon, ideally using a single color. Try to avoid using the same icon used by an existing block. The core block icons are based on [Material Design Icons](https://material.io/tools/icons/). Look to that icon set, or to [Dashicons](https://developer.wordpress.org/resource/dashicons/) for style inspiration.
+Blocks should have an identifying icon, ideally using a single color. Try to avoid using the same icon used by an existing block. The core block icons are based on [Material Design Icons](https://fonts.google.com/icons). Look to that icon set, or to [Dashicons](https://developer.wordpress.org/resource/dashicons/) for style inspiration.
 
 ![A screenshot of the block library with concise block names](https://developer.wordpress.org/files/2022/01/blocks-do.png)
 **Do:**
@@ -84,7 +84,7 @@ Use concise block names.
 **Don't:**
 Avoid long, multi-line block names.
 
-### Block Description
+### Block description
 
 Every block should include a description that clearly explains the block's function. The description will display in the Settings Sidebar.
 
@@ -116,7 +116,7 @@ Provide an instructive placeholder state.
 **Don't:**
 Avoid branding and relying on the title alone to convey instructions.
 
-### Selected and Unselected States
+### Selected and unselected states
 
 When unselected, your block should preview its content as closely to the front-end output as possible.
 
@@ -130,7 +130,7 @@ For controls that are essential for the operation of the block, provide them dir
 **Don't:**
 Do not put controls that are essential to the block in the sidebar, otherwise the block will appear non-functional to mobile users or desktop users who have dismissed the sidebar.
 
-### Advanced Block Settings
+### Advanced block settings
 
 The “Block” tab of the Settings Sidebar can contain additional block options and configuration. Keep in mind that a user can dismiss the sidebar and never use it. You should not put critical options in the Sidebar.
 
@@ -156,11 +156,11 @@ The most basic unit of the editor. The Paragraph block is a simple input field.
 
 ![Paragraph block](https://cldup.com/HVJe5bGZ8H-3000x3000.png)
 
-### Placeholder:
+#### Placeholder
 
 -   Simple placeholder text that reads “Type / to choose a block”. The placeholder disappears when the block is selected.
 
-### Selected state:
+#### Selected state
 
 -   Block Toolbar: Has a switcher to perform transformations to headings, etc.
 -   Block Toolbar: Has basic text alignments
@@ -172,11 +172,11 @@ Basic image block.
 
 ![Image block placeholder](https://cldup.com/w6FNywNsj1-3000x3000.png)
 
-### Placeholder:
+#### Placeholder
 
 -   A generic gray placeholder block with options to upload an image, drag and drop an image directly on it, or pick an image from the media library.
 
-### Selected state:
+#### Selected state
 
 -   Block Toolbar: Alignments, including wide and full-width if the theme supports it.
 -   Block Toolbar: Edit Image, to open the Media Library
@@ -185,7 +185,7 @@ Basic image block.
 
 ![Image Block](https://cldup.com/6YYXstl_xX-3000x3000.png)
 
-### Block settings:
+#### Block settings
 
 -   Has description: “They're worth 1,000 words! Insert a single image.”
 -   Has options for changing or adding alt text and adding additional custom CSS classes.
@@ -196,18 +196,18 @@ _Future improvements to the Image block could include getting rid of the media m
 
 ![Latest Post Block](https://cldup.com/8lyAByDpy_-3000x3000.png)
 
-### Placeholder:
+#### Placeholder
 
 Has no placeholder as it works immediately upon insertion. The default inserted state shows the last 5 posts.
 
-### Selected state:
+#### Selected state
 
 -   Block Toolbar: Alignments
 -   Block Toolbar: Options for picking list view or grid view
 
 _Note that the Block Toolbar does not include the Block Chip in this case, since there are no similar blocks to switch to._
 
-### Block settings:
+#### Block settings
 
 -   Has description: “Display a list of your most recent posts.”
 -   Has options for post order, narrowing the list by category, changing the default number of posts to show, and showing the post date.
diff --git a/docs/explanations/user-interface/design-resources.md b/docs/explanations/user-interface/design-resources.md
index 235951e4839e98..4a2a78f6822a5d 100644
--- a/docs/explanations/user-interface/design-resources.md
+++ b/docs/explanations/user-interface/design-resources.md
@@ -2,7 +2,7 @@
 
 ## Figma
 
-The [WordPress Design team](https://make.wordpress.org/design/) uses [Figma](https://www.figma.com/) to collaborate and share work. If you'd like to contribute, join the [#design channel](https://app.slack.com/client/T024MFP4J/C02S78ZAL) in [Slack](https://make.wordpress.org/chat/) and ask the team to set you up with a free Figma account. This will give you access to a helpful library of components used in WordPress. They are stable, fully supported, up to date, and ready for use in designs and prototypes.
+The [WordPress Design team](https://make.wordpress.org/design/) uses [Figma](https://www.figma.com/) to collaborate and share work. If you'd like to contribute, you can use [the WordPress Figma design library](https://make.wordpress.org/design/handbook/get-involved/tools-figma/) to make mockups. You can also join the [#design channel](https://app.slack.com/client/T024MFP4J/C02S78ZAL) in [Slack](https://make.wordpress.org/chat/) and if you'd like to ask for advice or otherwise. Figma accounts are free, and with one you can use components from the shared libraries, or duplicate files to your draft if you need to make edits. Full edit access to the WordPress libraries is paid and reserved for the design team.
 
 ### How to contribute
 
diff --git a/docs/getting-started/README.md b/docs/getting-started/README.md
index 136caa5607e487..f1b5999ae31472 100644
--- a/docs/getting-started/README.md
+++ b/docs/getting-started/README.md
@@ -1,23 +1,37 @@
 # Getting Started
 
-Welcome! Let's get started building with blocks. Blocks are at the core of extending WordPress. You can create custom blocks, your own block patterns, or combine them together to build a block theme. At a high level, here are a few ways to begin your journey but read on to explore more:
+Welcome to the Getting Started documentation. From setting up your development environment and building your first block to understanding the fundamentals, this section is the perfect starting point if you are new to block development or want to improve your skills.
 
-- Learn more about where this work is going by [reviewing the long term roadmap](https://wordpress.org/about/roadmap/).
-- Explore the [GitHub repo](https://github.com/WordPress/gutenberg/) to see the latest issues and PRs folks are working on, especially [Good First Issues](https://github.com/WordPress/gutenberg/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+First+Issue%22).
-- Join the [Slack community](https://make.wordpress.org/chat/) to join meetings, ongoing conversations, and more. 
-- Take courses on how to use the block editor and more on [Learn WordPress](https://learn.wordpress.org/). 
-- Expand your knowledge by reviewing more developer docs at the overall [developer.wordpress.org resource](https://developer.wordpress.org/).
-- Subscribe to [updates on Make Core](https://make.wordpress.org/core/), the main site where ongoing project updates happen.
+## Navigating this chapter
 
-## Tutorials
+Use the following links to locate a topic within this chapter. If you have never built a block before, consider reading through the documentation in the order listed.
 
-[Development Environment](/docs/getting-started/devenv/README.md) - A guide to setup your local environment for JavaScript development for creating plugins, themes, and the tools you will need to extend WordPress or contribute to the block editor.
+- **[Block Development Environment](https://developer.wordpress.org/block-editor/getting-started/devenv/):** Set up the right development environment to create blocks and get introduced to basic tools for block development such as [`wp-env`](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-env/), [`create-block`](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-create-block/), and [`wp-scripts`](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-create-block/)
+- **[Quick Start Guide](https://developer.wordpress.org/block-editor/getting-started/quick-start-guide/):** Get a custom block up and running in less than one minute.
+- **[Tutorial: Build your first block](https://developer.wordpress.org/block-editor/getting-started/tutorial/):** Learn how to build a fully functional custom block from the ground up.
+- **[Fundamentals of Block Development](https://developer.wordpress.org/block-editor/getting-started/fundamentals/):** Learn the most relevant concepts in block development.
+- **[Glossary](https://developer.wordpress.org/block-editor/getting-started/glossary/):** A glossary of common terms you will encounter when working with the Block Editor.
+- **[Frequently Asked Questions](https://developer.wordpress.org/block-editor/getting-started/faq/):** Common questions (and answers) that have come up from the last few years of Gutenberg's development. 
 
-[Create a Block Tutorial](/docs/getting-started/create-block/README.md) - Learn how to create your first block for the WordPress block editor.
+## Keeping up with the WordPress project
 
-## Learn WordPress Courses
+Once you have finished reviewing this chapter, you will have a solid understanding of blocks and how to develop for the Block Editor, but what's next? 
 
-At [Learn WordPress](https://learn.wordpress.org/), you can find [tutorials](https://learn.wordpress.org/tutorials/), [courses](https://learn.wordpress.org/courses/), and [online workshops](https://learn.wordpress.org/online-workshops/) to learn more about developing for the Block Editor. Here is a selection of current offerings.
+The WordPress project, and Gutenberg in particular, iterates quickly. Staying up-to-date on all the changes can be challenging. So, here are a few essential developer resources you should be aware of. Each person will have their own unique needs in keeping up with a project of this scale, so choose what's right for you.
+
+- **[WordPress Roadmap](https://wordpress.org/about/roadmap/):** The high-level roadmap for WordPress and Gutenberg.
+- **[Make Core](https://make.wordpress.org/core/):** The primary blog for WordPress Core where all major project updates are posted.
+- **[WordPress Slack](https://make.wordpress.org/chat/):** The official Slack community for all WordPress contributors is the hub for team meetings, ongoing conversations, and more. Make sure to join the `#core` and `#core-editor` channels.
+- **[Gutenberg GitHub repository](https://github.com/WordPress/gutenberg/):** This is where all Block Editor development happens. Keeping a close eye on the repository will give you a real-time understanding of what’s being worked on by fellow contributors.
+- **[Keeping up with Gutenberg](https://make.wordpress.org/core/handbook/references/keeping-up-with-gutenberg-index/):** A compilation of Gutenberg-related posts from the many [Make teams](https://make.wordpress.org/), including Core, Design, Meta, and Themes.
+- **["What's new in Gutenberg?"](https://make.wordpress.org/core/tag/gutenberg-new/):** Biweekly posts published on Make Core with each Gutenberg release. They are a great way to review the most relevant new features and the full changelog.
+- **["What's new for developers?"](https://developer.wordpress.org/news/):** Monthly posts on the WordPress Developer Blog that showcase the most important developer-related changes that happened in WordPress the previous month.
+
+## Additional resources
+
+For more resources on block development and extending the Block Editor, review the additional sections here in the Block Editor Handbook. Further practical examples are also available in the [block-development-examples](https://github.com/wptrainingteam/block-development-examples) GitHub repository.
+
+If you are looking for more educational content, check out [Learn WordPress](https://learn.wordpress.org/), where you can find [tutorials](https://learn.wordpress.org/tutorials/), [courses](https://learn.wordpress.org/courses/), and [online workshops](https://learn.wordpress.org/online-workshops/). Here is a selection of current offerings:
 
 -   [Intro to Block Development: Build Your First Custom Block](https://learn.wordpress.org/course/introduction-to-block-development-build-your-first-custom-block/)
 -   [Converting a Shortcode to a Block](https://learn.wordpress.org/course/converting-a-shortcode-to-a-block/)
@@ -25,40 +39,3 @@ At [Learn WordPress](https://learn.wordpress.org/), you can find [tutorials](htt
 -   [Registering Block Patterns](https://learn.wordpress.org/workshop/registering-block-patterns/)
 -   [Intro to Gutenberg Block Development](https://learn.wordpress.org/workshop/intro-to-gutenberg-block-development/)
 -   [Intro to Publishing with the Block Editor](https://learn.wordpress.org/workshop/intro-to-publishing-with-the-block-editor/)
-
-## Ways to Stay Informed
-
-New features and changes are important to keep up to date on as the Gutenberg project continues. Each person will have their own unique needs in keeping up with a project of this scale. What follows is more of a catalogue of ways to keep up rather than a recommendation for how to do so. 
-
-**Yearly:**
-
-The [WordPress.org Roadmap](https://wordpress.org/about/roadmap/) with Four Phases of Gutenberg updated by project leadership. This is the highest level overview of the changes coming to WordPress.
-
-**Quarterly:**
-
-[Quarterly Updates](https://make.wordpress.org/updates/tag/quarterly-updates/) from Contribution Teams. These updates give an overview on what each team is working on, struggling with, and how to get involved.
-
-**Monthly:**
-
-[“What’s Next In Gutenberg?” posts](https://make.wordpress.org/core/tag/gutenberg-next/). These updates are wrangled by the Core Editor team and highlight areas of work aligned with the Gutenberg roadmap for contributors to help, how to get involved, and more. 
-
-[Block Based Themes Meeting](https://make.wordpress.org/themes/tags/block-based-meeting/). These meetings are currently wrangled in the #themereview Slack channel and are dedicated to sharing FSE changes that will specifically impact themes. Agendas and summaries are shared on the [Make Themes blog](https://make.wordpress.org/themes/). 
-
-**Biweekly:**
-
-[“What’s New In Gutenberg?” release posts](https://make.wordpress.org/core/tag/gutenberg-new/). These updates are wrangled by the Core Editor team and focus on what’s been released in each biweekly Gutenberg release. They include the most relevant features released and a full changelog.
-
-**Weekly:**
-
-[Core Editor meetings](https://make.wordpress.org/core/tag/core-editor-summary/). These meetings are wrangled by volunteer members in the #core-editor Slack channel. [Agendas](https://make.wordpress.org/core/tag/core-editor-summary/) and [summaries](https://make.wordpress.org/core/tag/core-editor-summary/) are shared on the [Make Core blog](https://make.wordpress.org/core/). They focus on task coordination and relevant discussions around Gutenberg releases. There is an Open Floor period in each chat where people can suggest topics to discuss.
-
-[Weekly Theme Related Gutenberg Updates](https://make.wordpress.org/themes/tags/gutenberg-themes-roundup/). These posts are focused on themes, including everything from current discussions to recent changes, as well as helpful resources for theme authors. 
-
-**Daily:**
-
-Checking in on [issues](https://github.com/WordPress/gutenberg/issues) and [PRs](https://github.com/WordPress/gutenberg/pulls) on GitHub. This will give you a nearly real-time understanding of what’s being worked on by the developers and designers. 
-
--   [Glossary](/docs/getting-started/glossary.md)
--   [Frequently Asked Questions](/docs/getting-started/faq.md)
--   [Project History](/docs/explanations/history.md)
--   [Gutenberg related Make posts](https://make.wordpress.org/core/handbook/references/keeping-up-with-gutenberg-index/)
\ No newline at end of file
diff --git a/docs/getting-started/create-block/README.md b/docs/getting-started/create-block/README.md
deleted file mode 100644
index 22a28560c76a81..00000000000000
--- a/docs/getting-started/create-block/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Create a Block Tutorial
-
-Let's get you started creating your first block for the WordPress Block Editor. We will create a simple block that allows the user to type a message and style it.
-
-The tutorial includes setting up your development environment, tools, and getting comfortable with the new development model. If you are already comfortable, try the quick start below, otherwise step through whatever part of the tutorial you need.
-
-## Prerequisites
-
-The first thing you need is a development environment and tools. This includes setting up your WordPress environment, Node, NPM, and your code editor. If you need help, see the [setting up your development environment documentation](/docs/getting-started/devenv/README.md).
-
-## Table of Contents
-
-The create a block tutorials breaks down to the following sections.
-
-1. [WordPress Plugin](/docs/getting-started/create-block/wp-plugin.md)
-2. [Anatomy of a Gutenberg Block ](/docs/getting-started/create-block/block-anatomy.md)
-3. [Block Attributes](/docs/getting-started/create-block/attributes.md)
-4. [Code Implementation](/docs/getting-started/create-block/block-code.md)
-5. [Authoring Experience](/docs/getting-started/create-block/author-experience.md)
-6. [Finishing Touches](/docs/getting-started/create-block/finishing.md)
-7. [Share your Block with the World](/docs/getting-started/create-block/submitting-to-block-directory.md)
diff --git a/docs/getting-started/create-block/attributes.md b/docs/getting-started/create-block/attributes.md
deleted file mode 100644
index 02a55f380dcee1..00000000000000
--- a/docs/getting-started/create-block/attributes.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Block Attributes
-
-Attributes are the way a block stores data, they define how a block is parsed to extract data from the saved content.
-
-For this block tutorial, we want to allow the user to type in a message that we will display stylized in the published post. So, we need to add a **message** attribute that will hold the user message. The following code defines a **message** attribute; the attribute type is a string; the source is the text from the selector which is a `div` tag.
-
-```json
-"attributes": {
-	"message": {
-		"type": "string",
-		"source": "text",
-		"selector": "div",
-		"default": ""
-	}
-},
-```
-
-Add this to the `src/block.json` file. The `attributes` are at the same level as the _name_ and _title_ fields.
-
-When the block loads it will look at the saved content for the block, look for the div tag, take the text portion, and store the content in an `attributes.message` variable.
-
-Note: The text portion is equivalent to `innerText` attribute of a DOM element. For more details and other examples see the [Block Attributes documentation](/docs/reference-guides/block-api/block-attributes.md).
-
-## Edit and Save
-
-The **attributes** are passed to both the `edit` and `save` functions. The **setAttributes** function is also passed, but only to the `edit` function. The **setAttributes** function is used to set the values. Additional parameters are also passed in to the `edit` and `save` functions, see [the edit/save documentation](/docs/reference-guides/block-api/block-edit-save.md) for more details.
-
-The `attributes` is a JavaScript object containing the values of each attribute, or default values if defined. The `setAttributes` is a function to update an attribute.
-
-```js
-export default function Edit( { attributes, setAttributes } ) {
-	// ...
-}
-```
-
-## TextControl Component
-
-For our example block, the component we are going to use is the **TextControl** component, it is similar to an HTML text input field. You can see [documentation for TextControl component](/packages/components/src/text-control/README.md). You can browse an [interactive set of components in this Storybook](https://wordpress.github.io/gutenberg/).
-
-The component is added similar to an HTML tag, setting a label, the `value` is set to the `attributes.message` and the `onChange` function uses the `setAttributes` to update the message attribute value.
-
-The save function will simply write the `attributes.message` as a div tag since that is how we defined it to be parsed.
-
-OPTIONAL: For IDE support (code completion and hints), you can install the `@wordpress/components` module which is where the TextControl component is imported from. This install command is optional since the build process automatically detects `@wordpress/*` imports and specifies as dependencies in the assets file.
-
-```shell
-npm install @wordpress/components --save
-```
-
-Update the edit.js and save.js files to the following, replacing the existing functions.
-
-**edit.js** file:
-
-```js
-import { __ } from '@wordpress/i18n';
-import { useBlockProps } from '@wordpress/block-editor';
-import { TextControl } from '@wordpress/components';
-import './editor.scss';
-
-export default function Edit( { attributes, setAttributes } ) {
-	return (
-		<div { ...useBlockProps() }>
-			<TextControl
-				label={ __( 'Message', 'gutenpride' ) }
-				value={ attributes.message }
-				onChange={ ( val ) => setAttributes( { message: val } ) }
-			/>
-		</div>
-	);
-}
-```
-
-**save.js** file:
-
-```jsx
-import { useBlockProps } from '@wordpress/block-editor';
-
-export default function save( { attributes } ) {
-	const blockProps = useBlockProps.save();
-	return <div { ...blockProps }>{ attributes.message }</div>;
-}
-```
-
-If you have previously run `npm run start`, and the script is still running, you can reload the editor now and add the block to test.
-Otherwise rebuild the block using `npm run build`, reload the editor and add the block. Type a message in the editor, save, and view it in the post.
-
-Next Section: [Code Implementation](/docs/getting-started/create-block/block-code.md)
diff --git a/docs/getting-started/create-block/author-experience.md b/docs/getting-started/create-block/author-experience.md
deleted file mode 100644
index a52ea808f69658..00000000000000
--- a/docs/getting-started/create-block/author-experience.md
+++ /dev/null
@@ -1,147 +0,0 @@
-# Authoring Experience
-
-## Background
-
-One of the primary tenets of Gutenberg as a WYSIWYG editor is that what you see in the editor should be as close as possible to what you get when published. Keep this in mind when building blocks.
-
-## Placeholder
-
-The state when a block has been inserted, but no data has been entered yet, is called a placeholder. There is a `Placeholder` component built that gives us a standard look. You can see example placeholders in use with the image and embed blocks.
-
-To use the Placeholder, wrap the `<TextControl>` component so it becomes a child element of the `<Placeholder>` component. Try it out in your code. After updating, you might have something like:
-
-```jsx
-import { useBlockProps } from '@wordpress/block-editor';
-import { Placeholder, TextControl } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-export default function Edit( { attributes, className, setAttributes } ) {
-	return (
-		<div { ...useBlockProps() }>
-			<Placeholder
-				label={ __( 'Gutenpride Block', 'gutenpride' ) }
-				instructions={ __( 'Add your message', 'gutenpride' ) }
-			>
-				<TextControl
-					value={ attributes.message }
-					onChange={ ( val ) => setAttributes( { message: val } ) }
-				/>
-			</Placeholder>
-		</div>
-	);
-}
-```
-
-## isSelected Ternary Function
-
-The placeholder looks ok, for a simple text message it may or may not be what you are looking for. However, the placeholder can be useful if you are replacing the block after what is typed in, similar to the embed blocks.
-
-For this we can use a ternary function, to display content based on a value being set or not. A ternary function is an inline if-else statement, using the syntax:
-
-```js
-clause ? doIfTrue : doIfFalse;
-```
-
-This can be used inside a block to control what shows when a parameter is set or not. A simple case that displays a `message` if set, otherwise show the form element:
-
-```jsx
-return (
-	<div { ...useBlockProps() }>
-		{ attributes.message ? (
-			<div>Message: { attributes.message }</div>
-		) : (
-			<div>
-				<p>No Message.</p>
-				<TextControl
-					value={ attributes.message }
-					onChange={ ( val ) => setAttributes( { message: val } ) }
-				/>
-			</div>
-		) }
-	</div>
-);
-```
-
-There is a problem with the above, if we only use the `attributes.message` check, as soon as we type in the text field it would disappear since the message would then be set to a value. So we need to pair with an additional `isSelected` parameter.
-
-The `isSelected` parameter is passed in to the `edit` function and is set to true if the block is selected in the editor (currently editing) otherwise set to false (editing elsewhere).
-
-Using that parameter, we can use the logic:
-
-```js
-attributes.message && ! isSelected;
-```
-
-If the message is set and `!isSelected`, meaning we are not editing the block, the focus is elsewhere, then display the message not the text field.
-
-All of this combined together, here's what the edit function looks like:
-
-```jsx
-import { Placeholder, TextControl } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useBlockProps } from "@wordpress/block-editor";
-
-export default function Edit( { attributes, isSelected, setAttributes } ) {
-	return (
-		<div { ...useBlockProps() }>
-			{ attributes.message && ! isSelected ? (
-				<div>{ attributes.message }</div>
-			) : (
-				<Placeholder
-					label="Gutenpride Block"
-					instructions="Add your message"
-				>
-					<TextControl
-						value={ attributes.message }
-						onChange={ ( val ) =>
-							setAttributes( { message: val } )
-						}
-					/>
-				</Placeholder>
-			) }
-		</div>
-	);
-}
-```
-
-With that in place, rebuild and reload and when you are not editing the message is displayed as it would be for the view, when you click into the block you see the text field.
-
-## A Better Solution
-
-The switching between a Placeholder and input control works well with a visual element like an image or video, but for the text example in this block we can do better.
-
-The simpler and better solution is to modify the `src/editor.scss` to include the proper stylized text while typing.
-
-Update `src/editor.scss` to:
-
-```scss
-.wp-block-create-block-gutenpride input[type='text'] {
-	font-family: Gilbert, sans-serif;
-	font-size: 64px;
-	color: inherit;
-	background: inherit;
-	border: 0;
-}
-```
-
-The edit function can simply be:
-
-```jsx
-import { TextControl } from '@wordpress/components';
-import { useBlockProps } from '@wordpress/block-editor';
-
-import './editor.scss';
-
-export default function Edit( { attributes, setAttributes } ) {
-	const blockProps = useBlockProps();
-	return (
-		<TextControl
-			{ ...blockProps }
-			value={ attributes.message }
-			onChange={ ( val ) => setAttributes( { message: val } ) }
-		/>
-	);
-}
-```
-
-Next Section: [Finishing Touches](/docs/getting-started/create-block/finishing.md)
diff --git a/docs/getting-started/create-block/block-anatomy.md b/docs/getting-started/create-block/block-anatomy.md
deleted file mode 100644
index edd8b5200ae8f7..00000000000000
--- a/docs/getting-started/create-block/block-anatomy.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# Anatomy of a Block
-
-At its simplest, a block in the WordPress block editor is a JSON object with a specific set of properties.
-
-<div class="callout callout-info">
-<strong>Note:</strong> Block development uses ESNext syntax, this refers to the latest JavaScript standard. If this is unfamiliar, review the <a href="https://developer.wordpress.org/block-editor/how-to-guides/javascript/esnext-js/">ESNext syntax documentation</a> to familiarize yourself with the newer syntax.
-</div>
-
-The javascript part is done in the `src/index.js` file.
-
-```js
-import { registerBlockType } from '@wordpress/blocks';
-
-import './style.scss';
-
-import Edit from './edit';
-import save from './save';
-import metadata from './block.json';
-
-registerBlockType( metadata.name, {
-	/**
-	 * @see ./edit.js
-	 */
-	edit: Edit,
-	/**
-	 * @see ./save.js
-	 */
-	save,
-} );
-```
-
-The first parameter in the **registerBlockType** function is the block name, this should match exactly to the `name` property in the `block.json` file. By importing the metadata from `block.json` and referencing the `name` property in the first parameter we ensure that they will match, and continue to match even if the name is subsequently changed in `block.json`.
-
-The second parameter to the function is the block object. See the [block registration documentation](/docs/reference-guides/block-api/block-registration.md) for full details.
-
-Two common object properties are **edit** and **save**, these are the key parts of a block. Both properties are functions that are included via the import above.
-
-The results of the edit function is what the editor will render to the editor page when the block is inserted.
-
-The results of the save function is what the editor will insert into the **post_content** field when the post is saved. The post_content field is the field in the **wp_posts** table in the WordPress database that is used to store the content of the post.
-
-Most of the properties are set in the `src/block.json` file.
-
-```json
-{
-	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 3,
-	"name": "create-block/gutenpride",
-	"version": "0.1.0",
-	"title": "Gutenpride",
-	"category": "text",
-	"icon": "flag",
-	"description": "A Gutenberg block to show your pride! This block enables you to type text and style it with the color font Gilbert from Type with Pride.",
-	"supports": {
-		"html": false
-	},
-	"textdomain": "gutenpride",
-	"editorScript": "file:./index.js",
-	"editorStyle": "file:./index.css",
-	"style": "file:./style-index.css"
-}
-```
-
-The **title** is the title of the block shown in the Inserter and in other areas of the editor.
-
-The **icon** is the icon shown in the Inserter. The icon property expects any Dashicon name as a string, see [list of available icons](https://developer.wordpress.org/resource/dashicons/). You can also provide an SVG object, but for now it's easiest to just pick a Dashicon name.
-
-The **category** specified is a string and must be one of: "text, media, design, widgets, theme, or embed". You can create your own custom category name, [see documentation for details](/docs/reference-guides/filters/block-filters.md#managing-block-categories).
-
-## Internationalization
-
-If you look at the generated `src/save.js` file, the block title and description are wrapped in a function that looks like this:
-
-```js
-__( 'Gutenpride – hello from the saved content!', 'gutenpride' );
-```
-
-This is an internationalization wrapper that allows for the string "Gutenpride" to be translated. The second parameter, "gutenpride" is called the text domain and gives context for where the string is from. The JavaScript internationalization, often abbreviated i18n, matches the core WordPress internationalization process. See the [Internationalization in Plugin Developer Handbook](https://developer.wordpress.org/plugins/internationalization/) for more details.
-
-Next Section: [Block Attributes](/docs/getting-started/create-block/attributes.md)
diff --git a/docs/getting-started/create-block/block-code.md b/docs/getting-started/create-block/block-code.md
deleted file mode 100644
index 11f478772c6dfe..00000000000000
--- a/docs/getting-started/create-block/block-code.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Code Implementation
-
-The basic block is in place, the next step is to add styles to the block. Feel free to style and adjust for your own preference, the main lesson is showing how to create and load external resources. For this example we're going to load the colorized gilbert font from [Type with Pride](https://www.typewithpride.com/).
-
-Note: The color may not work with all browsers until they support the proper color font properly, but the font itself still loads and styles. See [colorfonts.wtf](https://www.colorfonts.wtf/) for browser support and details on color fonts.
-
-## Load Font File
-
-Download and extract the font from the Type with Pride site, and copy it in the `assets` directory of your plugin naming it `gilbert-color.otf`. To load the font file, we need to add CSS using standard WordPress enqueue, [see Including CSS & JavaScript documentation](https://developer.wordpress.org/themes/basics/including-css-javascript/).
-
-In the `gutenpride.php` file, the enqueue process is already setup from the generated script, so `build/index.css` and `build/style-index.css` files are loaded using:
-
-```php
-function create_block_gutenpride_block_init() {
-	register_block_type( __DIR__ . '/build' );
-}
-add_action( 'init', 'create_block_gutenpride_block_init' );
-```
-
-This function checks the `build/block.json` file for JS and CSS files, and will pass them on to [enqueue](https://developer.wordpress.org/themes/basics/including-css-javascript/) these files, so they are loaded on the appropriate pages.
-
-The `build/index.css` is compiled from `src/editor.scss` and loads only within the editor, and after the `style-index.css`.
-The `build/style-index.css` is compiled from `src/style.scss` and loads in both the editor and front-end — published post view.
-
-## Add CSS Style for Block
-
-We only need to add the style to `build/style-index.css` since it will show while editing and viewing the post. Edit the `src/style.scss` to add the following.
-
-Note: the block classname is prefixed with `wp-block`. The `create-block/gutenpride` is converted to the classname `.wp-block-create-block-gutenpride`.
-
-```scss
-@font-face {
-	font-family: Gilbert;
-	src: url( ../assets/gilbert-color.otf );
-	font-weight: 700;
-}
-
-.wp-block-create-block-gutenpride {
-	font-family: Gilbert, sans-serif;
-	font-size: 64px;
-}
-```
-
-After updating, rebuild the block using `npm run build` then reload the post and refresh the browser. If you are using a browser that supports color fonts (Firefox) then you will see it styled.
-
-Next Section: [Authoring Experience](/docs/getting-started/create-block/author-experience.md)
diff --git a/docs/getting-started/create-block/finishing.md b/docs/getting-started/create-block/finishing.md
deleted file mode 100644
index cd619a69207ca2..00000000000000
--- a/docs/getting-started/create-block/finishing.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Finishing Touches
-
-This tutorial covers general concepts and structure for creating basic blocks.
-
-## Additional Components
-
-The block editor provides a [components package](/packages/components/README.md) which contains numerous prebuilt components you can use to build your block.
-
-You can visually browse the components and what their implementation looks like using the Storybook tool published at [https://wordpress.github.io/gutenberg](https://wordpress.github.io/gutenberg).
-
-## Additional Tutorials
-
-The **RichText component** allows for creating a richer input besides plain text, allowing for bold, italic, links, and other inline formatting. See the [RichText Reference](/docs/reference-guides/richtext.md) for documentation using this component.
-
-The InspectorPanel (the settings on the right for a block) and Block Controls (toolbar controls) have a standard way to be implemented. See the [Block controls tutorial](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md) for additional information.
-
-The [Sidebar tutorial](/docs/how-to-guides/plugin-sidebar-0.md) is a good resource on how to create a sidebar for your plugin.
-
-Nested blocks, a block that contains additional blocks, is a common pattern used by various blocks such as Columns, Cover, and Social Links. The **InnerBlocks component** enables this functionality, see the [Using InnerBlocks documentation](/docs/how-to-guides/block-tutorial/nested-blocks-inner-blocks.md).
-
-## How did they do that
-
-One of the best sources for information and reference is the Block Editor itself, all the core blocks are built the same way. A good way to learn how things are done is to find a core block code that does something close to what you are interested in and then using the same approach for your own block.
-
-All core blocks source are in the [block library package on GitHub](https://github.com/WordPress/gutenberg/tree/HEAD/packages/block-library/src).
-
-Next Section: [Share your Block with the World](/docs/getting-started/create-block/submitting-to-block-directory.md)
diff --git a/docs/getting-started/create-block/submitting-to-block-directory.md b/docs/getting-started/create-block/submitting-to-block-directory.md
deleted file mode 100644
index f898a9d52caaa0..00000000000000
--- a/docs/getting-started/create-block/submitting-to-block-directory.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Share your Block with the World
-
-So you've created an awesome block? Care to share?
-
-**Contents**:
-
-1. Help users understand your block
-2. Analyze your plugin
-3. Zip & Submit
-
-## Step 1: Help users understand your block
-
-It is important to the Block Directory and our end users to provide easy to understand information on how your block was created.
-
-**Guidelines**:
-
--   Name your block based on what it does
--   Clearly describe your block
--   Add Keywords for all contexts
--   Choose the right category
-
-### Name your block based on what it does
-
-Users typically search the Block Directory within the Block Editor and do so in the context of a task. For example, when building their post, a user may search the Block Directory for an “image gallery”. Naming your block accordingly will help the Block Directory surface it when it's needed.
-
-**Not So Good**: WebTeam5 Image Works
-**Good**: Responsive Image Slider by WebTeam5
-
-**Question: What happens when there are multiple blocks with similar names?**
-Try your best to make your block's name functional and unique to make it stand out. Look for applicable synonyms or include a prefix if necessary.
-
-### Clearly describe your block
-
-The description really helps to communicate what your block does.The quicker a user understands how your block will help them, the more likely it is a user will use your block. Users will be reading your block's description within the Block Editor where space can be limited. Try to keep it short and concise.
-
-**Not So Good**: The best way to show images on your website using jQuery and CSS.
-**Good**: A responsive image gallery block.
-
-**Tip**: It’s not about marketing your block, in fact we want to avoid marketing in blocks. You can read more about it in the [plugin guidelines]. Stick to being as clear as you can. The Block Directory will provide metrics to let users know how awesome your block is!
-
-### Add Keywords for broader context
-
-Keywords add extra context to your block and make it more likely to be found in the inserter.
-
-Examples for an Image Slider block:
-
--   slider
--   carousel
--   gallery
-
-[Read more about keywords.](/docs/reference-guides/block-api/block-metadata.md#keywords)
-
-### Choose the right category
-
-The Block Editor allows you to indicate the category your block belongs in, making it easier for users to locate your block in the menu.
-
-**Possible Values**:
-
--   text
--   media
--   design
--   widgets
--   theme
--   embed
-
-[Read more about categories.](/docs/reference-guides/block-api/block-metadata.md#category)
-
-Wondering where to input all this information? Read the next section :)
-
-## Step 2: Analyze your plugin
-
-Each block in your plugin should have a corresponding `block.json` file with the [block metadata](/docs/reference-guides/block-api/block-metadata.md). This file provides the Block Directory important information about your block. Along with being the place to store contextual information about your block like the: `name`, `description`, `keywords` and `category`, the `block.json` file stores the location of your block’s files.
-
-Block plugins submitted to the Block Directory can contain multiple blocks only if they are children of a single parent/ancestor. There should only be one main block. For example, a list block can contain list-item blocks. Children blocks must set the `parent` property in their `block.json` file.
-
-Double check that the following is true for your block:
-
--   `editorScript` is pointing to the JavaScript bundle that includes all the code used in the **editor**.
--   `editorStyle` is pointing to the CSS bundle that includes all the css used in the **editor**.
--   `script` is pointing to the JavaScript bundle that includes all the code used on the **website**.
--   `style` is pointing to the CSS bundle that includes all the code used on the **website**.
-
-We encourage the separation of code by using both editorScript/editorStyle and script/style files listed in your block.json to keep the backend and frontend interfaces running smoothly. Even though only one file is required.
-
-Here is an example of a basic block.json file.
-
-```json
-{
-	"name": "plugin-slug/image-slider",
-	"title": "Responsive Image Slider",
-	"description": "A responsive and easy to use image gallery block.",
-	"keywords": [ "slider", "carousel", "gallery" ],
-	"category": "media",
-	"editorScript": "file:./dist/editor.js"
-}
-```
-
-The `block.json` file also contains other important properties. Take a look at an [example block.json](/docs/reference-guides/block-api/block-metadata.md) for additional properties to be included in the block.json file.
-
-## Step 3: Zip & Submit
-
-The community is thankful for your contribution. It is time to submit your plugin.
-
-Go through [the block guidelines](https://github.com/WordPress/wporg-plugin-guidelines/blob/block-guidelines/blocks.md). Create a zip file of your block and go to the [block plugin validator](https://wordpress.org/plugins/developers/block-plugin-validator/) and upload your plugin.
diff --git a/docs/getting-started/create-block/wp-plugin.md b/docs/getting-started/create-block/wp-plugin.md
deleted file mode 100644
index 8d6e618dad40ca..00000000000000
--- a/docs/getting-started/create-block/wp-plugin.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# WordPress Plugin
-
-A block is added to the block editor using a WordPress plugin. You can create your own plugin, and after installing and activating the plugin use the block. Let's first look at what makes up a WordPress plugin.
-
-## Plugin Details
-
-A WordPress plugin is a set of files within the site's `wp-content/plugins` directory. For our tutorial, we will use the `@wordpress/create-block` package to generate the necessary plugin files.
-
-### Switch to Working Directory
-
-(1A) If you do not plan to use `wp-env`, change to your local WordPress plugin directory. For example in Local it is: `~\Local Sites\mywp\app\public\wp-content\plugins`
-
--or-
-
-(1B) If using `wp-env start`, you can work from any directory for your project; `wp-env` will map it as a plugin directory for your site.
-
-### Generate Plugin Files
-
-(2) Once in the right directory for your environment, the next step is to run the following command to generate plugin files:
-
-```sh
-npx @wordpress/create-block gutenpride
-cd gutenpride
-```
-
-A new directory `gutenpride` is created with all the necessary plugin files. This tutorial will walk through and explain the plugin files, please explore and become familiar with them also.
-
-The main plugin file created is the PHP file `gutenpride.php`, at the top of this file is the Plugin Header comment block that defines the plugin.
-
-```php
-/**
- * Plugin Name:       Gutenpride
- * Description:       Example static block scaffolded with Create Block tool.
- * Requires at least: 5.8
- * Requires PHP:      7.0
- * Version:           0.1.0
- * Author:            The WordPress Contributors
- * License:           GPL-2.0-or-later
- * License URI:       https://www.gnu.org/licenses/gpl-2.0.html
- * Text Domain:       gutenpride
- *
- * @package           create-block
- */
-```
-
-### Start WordPress
-
-Let's confirm the plugin is loaded and working.
-
-(3A) If you are using Local, or other environment confirm your WordPress site is started.
-
--or-
-
-(3B) If you are using `wp-env`, see [Development Environment setup](/docs/getting-started/devenv/README.md), then you should now run from inside the `gutenpride` directory:
-
-```sh
-wp-env start
-```
-
-This will start your local WordPress site and use the current directory as your plugin directory. In your browser, go to http://localhost:8888/wp-admin/ and login, the default username is "admin" and password is "password", no quotes.
-
-### Confirm Plugin Installed
-
-The generated plugin should now be listed on the Plugins admin page in your WordPress install. Switch WordPress to the plugins page and activate.
-
-For more on creating a WordPress plugin see [Plugin Basics](https://developer.wordpress.org/plugins/plugin-basics/), and [Plugin Header requirements](https://developer.wordpress.org/plugins/plugin-basics/header-requirements/) for explanation and additional fields you can include in your plugin header.
-
-## package.json
-
-The `package.json` file defines the JavaScript properties for your project. This is a standard file used by NPM for defining properties and scripts it can run, the file and process is not specific to WordPress.
-
-A `package.json` file was created with the create script, this defines the dependencies and scripts needed. You can install dependencies. The only initial dependency is the `@wordpress/scripts` package that bundles the tools and configurations needed to build blocks.
-
-In `package.json`, there is a `scripts` property that defines what command to run when using `npm run (cmd)`. In our generated `package.json` file, the two main scripts point to the commands in the `wp-scripts` package:
-
-```json
-  "scripts": {
-    "build": "wp-scripts build",
-    "start": "wp-scripts start"
-  },
-```
-
-These scripts are run by using: `npm run build` or `npm run start`.
-
-Use `npm run build` for running once to create a "production" build. This compresses the code down so it downloads faster, but makes it harder to read using browser tools—good for final deployment but not while developing.
-
-Use `npm run start` for creating a "development" build, this does not compress the code so it is easier to read using browser tools, plus [source maps](https://developer.mozilla.org/en-US/docs/Tools/Debugger/How_to/Use_a_source_map) that make debugging easier. Additionally, development build will start a watch process that waits and watches for changes to the file and will rebuild each time it is saved; so you don't have to run the command for each change.
-
-By default, the build scripts looks for `src/index.js` for the JavaScript file to build and will save the built file to `build/index.js`. In the upcoming sections, we will look closer at that script, but first let's make sure it is loaded in WordPress.
-
-## Plugin to Load Script
-
-To load the built script, so it is run within the editor, you need to tell WordPress about the script. This is done in the init action in the `gutenpride.php` file.
-
-```php
-function create_block_gutenpride_block_init() {
-	register_block_type( __DIR__ . '/build' );
-}
-add_action( 'init', 'create_block_gutenpride_block_init' );
-```
-
-The `register_block_type` function registers the block we are going to create and specifies the editor script handle registered from the metadata provided in `build/block.json` file with the `editorScript` field. So now when the editor loads it will load this script. The source metadata file `src/block.json` is copied during the build process:
-
-```json
-{
-	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 3,
-	"name": "create-block/gutenpride",
-	"version": "0.1.0",
-	"title": "Gutenpride",
-	"category": "widgets",
-	"icon": "smiley",
-	"description": "Example static block scaffolded with Create Block tool.",
-	"supports": {
-		"html": false
-	},
-	"textdomain": "gutenpride",
-	"editorScript": "file:./index.js",
-	"editorStyle": "file:./index.css",
-	"style": "file:./style-index.css"
-}
-```
-
-For the `editorScript` provided in the block metadata, the build process creates a secondary asset file that contains the list of dependencies and a file version based on the timestamp, this is the `build/index.asset.php` file.
-
-The `wp_register_script` function used internally registers a name, called the handle, and relates that name to the script file. The dependencies are used to specify if the script requires including other libraries. The version is specified so the browser will reload if the file is changed.
-
-The `wp_set_script_translations` function tells WordPress to load translations for this script, if they exist. See more about [translations & internationalization.](/docs/how-to-guides/internationalization.md)
-
-With the above in place, create a new post to load the editor and check your plugin is in the inserter. You can use `/` to search, or click the box with the [+] and search for "Gutenpride" to find the block.
-
-## Troubleshooting
-
-It is a good skill to learn and get comfortable using the web console. This is where JavaScript errors are shown and a nice way to test out snippets of JavaScript. See [Firefox Developer Tools documentation](https://developer.mozilla.org/en-US/docs/Tools).
-
-To open the developer tools in Firefox, use the menu selecting Web Developer : Toggle Tools, on Chrome, select More Tools -> Developers Tools. For both browsers, the keyboard shortcut on Windows is Ctrl+Shift+I, or on Mac Cmd+Shift+I. On Windows & Linux, the F12 key also works. You can then click Console to view logs.
-
-Try running `npm run start` that will start the watch process for automatic rebuilds. If you then make an update to `src/index.js` file, you will see the build run, and if you reload the WordPress editor you'll see the change.
-
-For more info, see the build section of the [Getting Started with JavaScript tutorial](/docs/how-to-guides/javascript/js-build-setup.md) in the Block Editor Handbook.
-
-## Summary
-
-Hopefully, at this point, you have your plugin created and activated. We have the `package.json` with the `@wordpress/scripts` dependency, that defines the build and start scripts. The basic block is in place and can be added to the editor.
-
-Next Section: [Anatomy of a Block](/docs/getting-started/create-block/block-anatomy.md)
diff --git a/docs/getting-started/devenv/README.md b/docs/getting-started/devenv/README.md
index 7d7323d9c7b0f2..4539dacbdf5047 100644
--- a/docs/getting-started/devenv/README.md
+++ b/docs/getting-started/devenv/README.md
@@ -2,19 +2,21 @@
 
 This guide will help you set up the right development environment to create blocks and other plugins that extend and modify the Block Editor in WordPress.
 
-To contribute to the Gutenberg project itself, refer to the additional documentation in the [code contribution guide](/docs/contributors/code/getting-started-with-code-contribution.md).`
-
 A block development environment includes the tools you need on your computer to successfully develop for the Block Editor. The three essential requirements are:
 
 1.  [Code editor](#code-editor)
 2.  [Node.js development tools](#node-js-development-tools)
 3.  [Local WordPress environment (site)](#local-wordpress-environment)
 
+<div class="callout callout-info">
+    To contribute to the Gutenberg project itself, refer to the additional documentation in the <a href="https://developer.wordpress.org/block-editor/contributors/code/getting-started-with-code-contribution">code contribution guide</a>.
+</div>
+
 ## Code editor
 
-A code editor is used to write code, and you can use whichever editor you're most comfortable with. The key is having a way to open, edit, and save text files.
+A code editor is used to write code. You can use whichever editor you're most comfortable with. The key is having a way to open, edit, and save text files.
 
-If you do not already have a preferred code editor, [Visual Studio Code](https://code.visualstudio.com/) (VS Code) is a popular choice for JavaScript development among Core contributors. It works well across the three major platforms (Windows, Linux, and Mac) and is open-source and actively maintained by Microsoft. VS Code also has a vibrant community providing plugins and extensions, including many for WordPress development.
+If you do not already have a preferred code editor, [Visual Studio Code](https://code.visualstudio.com/) (VS Code) is a popular choice for JavaScript development among Core contributors. It works well across the three major platforms (Windows, Linux, and Mac), is open-source, and is actively maintained by Microsoft. VS Code also has a vibrant community providing plugins and extensions, including many for WordPress development.
 
 ## Node.js development tools
 
@@ -30,21 +32,29 @@ Node.js and its accompanying development tools allow you to:
 
 The list goes on. While modern JavaScript development can be challenging, WordPress provides several tools, like [`wp-scripts`](/docs/getting-started/devenv/get-started-with-wp-scripts.md) and [`create-block`](/docs/getting-started/devenv/get-started-with-create-block.md), that streamline the process and are made possible by Node.js development tools.
 
-**The recommended Node.js version for block development is [Active LTS](https://nodejs.dev/en/about/releases/) (Long Term Support)**. However, there are times when you  need to to use different versions. A Node.js version manager tool like `nvm` is strongly recommended and allows you to easily change your `node` version when required. You will also need Node Package Manager (`npm`) and the Node Package eXecute (`npx`) to work with some WordPress packages. Both are installed automatically with Node.js.
+**The recommended Node.js version for block development is [Active LTS](https://nodejs.org/en/about/previous-releases) (Long Term Support)**. However, there are times when you need to use different versions. A Node.js version manager tool like `nvm` is strongly recommended and allows you to change your `node` version when required. You will also need Node Package Manager (`npm`) and the Node Package eXecute (`npx`) to work with some WordPress packages. Both are installed automatically with Node.js.
 
-To be able to use the Node.js tools and [packages provided by WordPress](https://github.com/WordPress/gutenberg/tree/trunk/packages) for block development, you'll need to set a proper Node.js runtime environment on your machine.. To learn more about how to do this, refer to the links below.
+To be able to use the Node.js tools and [packages provided by WordPress](https://github.com/WordPress/gutenberg/tree/trunk/packages) for block development, you'll need to set a proper Node.js runtime environment on your machine. To learn more about how to do this, refer to the links below.
 
 -   [Install Node.js for Mac and Linux](/docs/getting-started/devenv/nodejs-development-environment.md#node-js-installation-on-mac-and-linux-with-nvm)
 -   [Install Node.js for Windows](/docs/getting-started/devenv/nodejs-development-environment.md#node-js-installation-on-windows-and-others)
 
 ## Local WordPress environment
 
-A local WordPress environment (site) provides a controlled, efficient, and secure space for development, allowing you to build and test your code before deploying it to a production site. The [same requirements](https://en-gb.wordpress.org/about/requirements/) for WordPress apply to local sites.
+A local WordPress environment (site) provides a controlled, efficient, and secure space for development, allowing you to build and test your code before deploying it to a production site. The same [requirements](https://en-gb.wordpress.org/about/requirements/) for WordPress apply to local sites.
 
-In the boarder WordPress community, there are many available tools for setting up a local WordPress environment on your computer. The Block Editor Handbook covers `wp-env`, which is open-source and maintained by the WordPress project itself. It's also the recommended tool for Gutenberg development. 
+In the broader WordPress community, many tools are available for setting up a local WordPress environment on your computer. The Block Editor Handbook covers `wp-env`, which is open-source and maintained by the WordPress project itself. It's also the recommended tool for Gutenberg development. 
 
 Refer to the [Get started with `wp-env`](/docs/getting-started/devenv/get-started-with-wp-env.md) guide for setup instructions.
 
 <div class="callout callout-info">
     Throughout the Handbook, you may also see references to <code><a href="https://github.com/WordPress/playground-tools/tree/trunk/packages/wp-now">wp-now</a></code>. This is a lightweight tool powered by <a hre="https://developer.wordpress.org/playground/">WordPress Playground</a> that streamlines setting up a simple local WordPress environment. While still experimental, this tool is great for quickly testing WordPress releases, plugins, and themes. 
 </div>
+
+This list is not exhaustive, but here are several additional options to choose from if you prefer not to use `wp-env`:
+
+- [Local](https://localwp.com/)
+- [WP Studio](https://developer.wordpress.com/studio/)
+- [XAMPP](https://www.apachefriends.org/)
+- [MAMP](https://www.mamp.info/en/mamp/mac/)
+- [Varying Vagrant Vagrants](https://varyingvagrantvagrants.org/) (VVV)
diff --git a/docs/getting-started/devenv/get-started-with-create-block.md b/docs/getting-started/devenv/get-started-with-create-block.md
index 3a2c6607b82cff..2d46dd18cffe55 100644
--- a/docs/getting-started/devenv/get-started-with-create-block.md
+++ b/docs/getting-started/devenv/get-started-with-create-block.md
@@ -4,7 +4,7 @@ Custom blocks for the Block Editor in WordPress are typically registered using p
 
 The package is designed to help developers quickly set up a block development environment following WordPress best practices.
 
-## Quick Start
+## Quick start
 
 ### Installation
 
diff --git a/docs/getting-started/devenv/get-started-with-wp-scripts.md b/docs/getting-started/devenv/get-started-with-wp-scripts.md
index 6416adc081e70a..16f1bbc6015b5b 100644
--- a/docs/getting-started/devenv/get-started-with-wp-scripts.md
+++ b/docs/getting-started/devenv/get-started-with-wp-scripts.md
@@ -4,7 +4,7 @@ The [`@wordpress/scripts`](https://developer.wordpress.org/block-editor/referenc
 
 A JavaScript build step refers to the process of transforming, bundling, and optimizing JavaScript source code and related assets into a format suitable for production environments. These build steps often take modern JavaScript (ESNext and JSX) and convert it to a version compatible with most browsers. They can also bundle multiple files into one, minify the code to reduce file size and perform various other tasks to optimize the code.
 
-You will typically be working with ESNext and JSX when building for the Block Editor, and most examples in the Block Editor Handbook are written in these syntaxes. Learning how to set up a build step is essential. However, configuring the necessary tools like [webpack](https://webpack.js.org/), [Babel](https://babeljs.io/), and [ESLint](https://eslint.org/) can become complex. This is where `wp-scripts` comes in. 
+You will typically be working with ESNext and JSX when building for the Block Editor, and all examples in the Block Editor Handbook are written in these syntaxes. Learning how to set up a build step is essential. However, configuring the necessary tools like [webpack](https://webpack.js.org/), [Babel](https://babeljs.io/), and [ESLint](https://eslint.org/) can become complex. This is where `wp-scripts` comes in.
 
 Here are a few things that `wp-scripts` can do: 
 
@@ -123,7 +123,7 @@ To help developers improve the quality of their code, `wp-scripts` comes pre-con
 
 Regularly linting and formatting your code ensures it's functional, clear, and maintainable for yourself and other developers.
 
-### Running Tests
+### Running tests
 
 Beyond just writing code, verifying its functionality is crucial. `wp-scripts` includes [Jest](https://jestjs.io/), a JavaScript testing framework, and both end-to-end and unit testing scripts:
 
diff --git a/docs/getting-started/devenv/nodejs-development-environment.md b/docs/getting-started/devenv/nodejs-development-environment.md
index 6e1d3638f5f03c..8eb72bd88268da 100644
--- a/docs/getting-started/devenv/nodejs-development-environment.md
+++ b/docs/getting-started/devenv/nodejs-development-environment.md
@@ -22,7 +22,7 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
 ```
 
 2. Quit and restart the terminal.
-3. Run `nvm install --lts` in the terminal to install the latest [LTS](https://nodejs.dev/en/about/releases/) (Long Term Support) version of Node.js.
+3. Run `nvm install --lts` in the terminal to install the latest [LTS](https://nodejs.org/en/about/previous-releases) (Long Term Support) version of Node.js.
 4. Run `node -v` and `npm -v` in the terminal to verify the installed `node` and `npm` versions.
 
 If needed, you can also install specific versions of `node`. For example, install version 18 by running `nvm install 18`, and switch between different versions by running `nvm use [version-number]`. See the `nvm` [usage guide](https://github.com/nvm-sh/nvm#usage) for more details.
diff --git a/docs/getting-started/faq.md b/docs/getting-started/faq.md
index a780be3fa940fa..8ac489e3c154a2 100644
--- a/docs/getting-started/faq.md
+++ b/docs/getting-started/faq.md
@@ -2,60 +2,9 @@
 
 What follows is a set of questions that have come up from the last few years of Gutenberg development. If you have any questions you’d like to have answered and included here, [just open up a GitHub issue](https://github.com/WordPress/gutenberg/issues) with your question. We’d love the chance to answer and provide clarity to questions we might not have thought to answer. For a look back historically, please see Matt's November 2018 post [WordPress 5.0: A Gutenberg FAQ](https://ma.tt/2018/11/a-gutenberg-faq/).
 
+## The Gutenberg Project
 
-## Table of Contents
-
-### The Gutenberg Project
-- [What is Gutenberg?](#what-is-gutenberg)
-- [What’s on the roadmap long term?](#whats-on-the-roadmap-long-term)
-- [When was Gutenberg started?](#when-was-gutenberg-started)
-- [When was Gutenberg merged into WordPress?](#when-was-gutenberg-merged-into-wordpress)
-- [WordPress is already the world's most popular publishing platform. Why change the editor at all?](#wordpress-is-already-the-worlds-most-popular-publishing-platform-why-change-the-editor-at-all)
-
-
-### The Editing Experience
-- [What are “blocks” and why are we using them?](#what-are-blocks-and-why-are-we-using-them)
-- [What is the writing experience like?](#what-is-the-writing-experience-like)
-- [Is Gutenberg built on top of TinyMCE?](#is-gutenberg-built-on-top-of-tinymce)
-- [Are there Keyboard Shortcuts for Gutenberg?](#are-there-keyboard-shortcuts-for-gutenberg)
-  * [Editor shortcuts](#editor-shortcuts)
-  * [Selection shortcuts](#selection-shortcuts)
-  * [Block shortcuts](#block-shortcuts)
-  * [Text formatting](#text-formatting)
-- [Does Gutenberg support columns?](#does-gutenberg-support-columns)
-- [Does Gutenberg support nested blocks?](#does-gutenberg-support-nested-blocks)
-- [Does drag and drop work for rearranging blocks?](#does-drag-and-drop-work-for-rearranging-blocks)
-
-### The Development Experience
-- [How do I make my own block?](#how-do-i-make-my-own-block)
-- [Does Gutenberg involve editing posts/pages in the front-end?](#does-gutenberg-involve-editing-posts-pages-in-the-front-end)
-- [Given Gutenberg is built in JavaScript, how do old meta boxes (PHP) work?](#given-gutenberg-is-built-in-javascript-how-do-old-meta-boxes-php-work)
-- [How can plugins extend the Gutenberg UI?](#how-can-plugins-extend-the-gutenberg-ui)
-- [Are Custom Post Types still supported?](#are-custom-post-types-still-supported)
-
-### Styles
-- [Can themes _style_ blocks?](#can-themes-_style_-blocks)
-- [How do block styles work in both the front-end and back-end?](#how-do-block-styles-work-in-both-the-front-end-and-back-end)
-- [What are block variations? Are they the same as block styles?](#what-are-block-variations-are-they-the-same-as-block-styles)
-- [How do editor styles work?](#how-do-editor-styles-work)
-
-### Compatibility
-- [What browsers does Gutenberg support?](#what-browsers-does-gutenberg-support)
-- [Should I be concerned that Gutenberg will make my plugin obsolete?](#should-i-be-concerned-that-gutenberg-will-make-my-plugin-obsolete)
-- [Is it possible to opt out of Gutenberg for my site?](#is-it-possible-to-opt-out-of-gutenberg-for-my-site)
-- [How do custom TinyMCE buttons work in Gutenberg?](#how-do-custom-tinymce-buttons-work-in-gutenberg)
-- [How do shortcodes work in Gutenberg?](#how-do-shortcodes-work-in-gutenberg)
-- [Should I move shortcodes to content blocks?](#should-i-move-shortcodes-to-content-blocks)
-
-### Miscellaneous
-- [Is Gutenberg made to be properly accessible?](#is-gutenberg-made-to-be-properly-accessible)
-- [How is data stored? I've seen HTML comments, what is their purpose?](#how-is-data-stored-ive-seen-html-comments-what-is-their-purpose)
-- [How can I parse the post content back out into blocks in PHP or JS?](#how-can-i-parse-the-post-content-back-out-into-blocks-in-php-or-js)
-
-----
-
-## What is Gutenberg?
-
+### What is Gutenberg?
 
 “Gutenberg” is the name of the project to create a new editor experience for WordPress — contributors have been working on it since January 2017 and it’s one of the most significant changes to WordPress in years. It’s built on the idea of using “blocks” to write and design posts and pages. This will serve as the foundation for future improvements to WordPress, including blocks as a way not just to design posts and pages, but also entire sites. The overall goal is to simplify the first-time user experience of WordPress — for those who are writing, editing, publishing, and designing web pages. The editing experience is intended to give users a better visual representation of what their post or page will look like when they hit publish. Originally, this was the kickoff goal:
 
@@ -69,7 +18,7 @@ Key takeaways include the following points:
 
 Gutenberg is developed on [GitHub](https://github.com/WordPress/gutenberg) under the WordPress organization. The block editor has been available in core WordPress since 5.0. If you want to test upcoming features from Gutenberg project, it is [available in the plugin repository](https://wordpress.org/plugins/gutenberg/).
 
-## What’s on the roadmap long term?
+### What’s on the roadmap long term?
 
 There are four phases of Gutenberg which you can see on the [official WordPress roadmap](https://wordpress.org/about/roadmap/). As of writing this, we’re currently in phase 2:
 
@@ -78,19 +27,21 @@ There are four phases of Gutenberg which you can see on the [official WordPress
 3. Collaboration — A more intuitive way to co-author content
 4. Multi-lingual — Core implementation for Multi-lingual sites
 
-## When was Gutenberg started?
+### When was Gutenberg started?
 
 The editor focus started in early 2017 with the first three months spent designing, planning, prototyping, and testing prototypes, to help us inform how to approach this project. The first plugin was launched during WordCamp Europe in June 2017.
 
-## When was Gutenberg merged into WordPress?
+### When was Gutenberg merged into WordPress?
 
 Gutenberg was first merged into [WordPress 5.0](https://wordpress.org/news/2018/12/bebo/) in December 2018. See [the versions in WordPress page](https://developer.wordpress.org/block-editor/principles/versions-in-wordpress/) for a complete list of Gutenberg plugin versions merged into WordPress core releases.
 
-## WordPress is already the world's most popular publishing platform. Why change the editor at all?
+### WordPress is already the world's most popular publishing platform. Why change the editor at all?
 
 The Editor is where most of the action happens in WordPress’s daily use, and it was a place where we could polish and perfect the block experience in a contained environment. Further, as an open-source project, we believe that it is critical for WordPress to continue to innovate and keep working to make the core experience intuitive and enjoyable for all users. As a community project, Gutenberg has the potential to do just that, and we’re excited to pursue this goal together. If you’d like to test, contribute, or offer feedback, we welcome you to [share what you find on GitHub](https://github.com/WordPress/gutenberg/issues).
 
-## What are “blocks” and why are we using them?
+## The Editing Experience
+
+### What are “blocks” and why are we using them?
 
 The classic WordPress editor is an open text window—it’s always been a wonderful blank canvas for writing, but when it comes to building posts and pages with images, multimedia, embedded content from social media, polls, and other elements, it required a mix of different approaches that were not always intuitive:
 
@@ -103,289 +54,80 @@ The classic WordPress editor is an open text window—it’s always been a wonde
 
 As we thought about these uses and how to make them obvious and consistent, we began to embrace the concept of “blocks.” All of the above items could be blocks: easy to search and understand, and easy to dynamically shift around the page. The block concept is very powerful, and when designed thoughtfully, can offer an outstanding editing and publishing experience. Ultimately, the idea with blocks is to create a new common language across WordPress, a new way to connect users to plugins, and replace a number of older content types — things like shortcodes and widgets — that one usually has to be well-versed in the idiosyncrasies of WordPress to understand.
 
-## What is the writing experience like?
+### What is the writing experience like?
 
 Our goal with Gutenberg is not just to create a seamless post- and page-building experience. We also want to ensure that it provides a seamless writing experience. To test this out yourself, [head to this demo and give it a try](https://wordpress.org/gutenberg/)!
 
-## Is Gutenberg built on top of TinyMCE?
+### Is Gutenberg built on top of TinyMCE?
 
 No. [TinyMCE](https://www.tinymce.com/) is only used for the "Classic" block.
 
-## Are there Keyboard Shortcuts for Gutenberg?
+### Are there Keyboard Shortcuts for Gutenberg?
 
 Yes. There are a lot! There is a help modal showing all available keyboard shortcuts.
 
 You can see the whole list going to the top right corner menu of the new editor and clicking on “Keyboard Shortcuts” (or by using the keyboard shortcut <kbd>Shift</kbd>+<kbd>Alt</kbd>+<kbd>H</kbd> on Linux/Windows and <kbd>⌃</kbd><kbd>⌥</kbd><kbd>H</kbd> on macOS).
 
-This is the canonical list of keyboard shortcuts:
-
-### Editor shortcuts
-
-<table>
-	<thead>
-		<tr>
-			<th>Shortcut description</th>
-			<th>Linux/Windows shortcut</th>
-			<th>macOS shortcut</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>Display keyboard shortcuts.</td>
-			<td><kbd>Shift</kbd>+<kbd>Alt</kbd>+<kbd>H</kbd></td>
-			<td><kbd>⌃</kbd><kbd>⌥</kbd><kbd>H</kbd></td>
-		</tr>
-		<tr>
-			<td>Save your changes.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>S</kbd></td>
-			<td><kbd>⌘</kbd><kbd>S</kbd></td>
-		</tr>
-		<tr>
-			<td>Undo your last changes.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Z</kbd></td>
-			<td><kbd>⌘</kbd><kbd>Z</kbd></td>
-		</tr>
-		<tr>
-			<td>Redo your last undo.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>Z</kbd></td>
-			<td><kbd>⇧</kbd><kbd>⌘</kbd><kbd>Z</kbd></td>
-		</tr>
-		<tr>
-			<td>Show or hide the Settings sidebar.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>,</kbd></td>
-			<td><kbd>⇧</kbd><kbd>⌘</kbd><kbd>,</kbd></td>
-		</tr>
-		<tr>
-			<td>Open the list view menu.</td>
-			<td><kbd>Shift</kbd>+<kbd>Alt</kbd>+<kbd>O</kbd></td>
-			<td><kbd>⌃</kbd><kbd>⌥</kbd><kbd>O</kbd></td>
-		</tr>
-		<tr>
-			<td>Navigate to the next part of the editor.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>`</kbd></td>
-			<td><kbd>⌃</kbd><kbd>`</kbd></td>
-		</tr>
-		<tr>
-			<td>Navigate to the previous part of the editor.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>`</kbd></td>
-			<td><kbd>⌃</kbd><kbd>⇧</kbd><kbd>`</kbd></td>
-		</tr>
-		<tr>
-			<td>Navigate to the next part of the editor (alternative).</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>N</kbd></td>
-			<td><kbd>⌃</kbd><kbd>⌥</kbd><kbd>N</kbd></td>
-		</tr>
-		<tr>
-			<td>Navigate to the previous part of the editor (alternative).</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>P</kbd></td>
-			<td><kbd>⌃</kbd><kbd>⌥</kbd><kbd>P</kbd></td>
-		</tr>
-		<tr>
-			<td>Navigate to the nearest toolbar.</td>
-			<td><kbd>Alt</kbd>+<kbd>F10</kbd></td>
-			<td><kbd>⌥</kbd><kbd>F10</kbd></td>
-		</tr>
-		<tr>
-			<td>Switch between visual editor and code editor.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>Alt</kbd>+<kbd>M</kbd></td>
-			<td><kbd>⇧</kbd><kbd>⌥</kbd><kbd>⌘</kbd><kbd>M</kbd></td>
-		</tr>
-		<tr>
-			<td>Toggle fullscreen mode.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd></td>
-			<td><kbd>⇧</kbd><kbd>⌥</kbd><kbd>⌘</kbd><kbd>F</kbd></td>
-		</tr>
-	</tbody>
-</table>
-
-### Selection shortcuts
-
-<table>
-	<thead>
-		<tr>
-			<th>Shortcut description</th>
-			<th>Linux/Windows shortcut</th>
-			<th>macOS shortcut</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>Select all text when typing. Press again to select all blocks.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>A</kbd></td>
-			<td><kbd>⌘</kbd><kbd>A</kbd></td>
-		</tr>
-		<tr>
-			<td>Clear selection.</td>
-			<td><kbd>Esc</kbd></td>
-			<td><kbd>Esc</kbd></td>
-		</tr>
-		<tr>
-			<td>Select text across multiple blocks.</td>
-			<td><kbd>Shift</kbd>+<kbd>Arrow (⇦, ⇧, ⇨, ⇩)</kbd></td>
-			<td><kbd>Shift</kbd>+<kbd>Arrow (⇦, ⇧, ⇨, ⇩)</kbd></td>
-		</tr>
-	</tbody>
-</table>
-
-### Block shortcuts
-
-<table>
-	<thead>
-		<tr>
-			<th>Shortcut description</th>
-			<th>Linux/Windows shortcut</th>
-			<th>macOS shortcut</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>Duplicate the selected block(s).</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>D</kbd></td>
-			<td><kbd>⇧</kbd><kbd>⌘</kbd><kbd>D</kbd></td>
-		</tr>
-		<tr>
-			<td>Remove the selected block(s).</td>
-			<td><kbd>Shift</kbd>+<kbd>Alt</kbd>+<kbd>Z</kbd></td>
-			<td><kbd>⌃</kbd><kbd>⌥</kbd><kbd>Z</kbd></td>
-		</tr>
-		<tr>
-			<td>Insert a new block before the selected block(s).</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>T</kbd></td>
-			<td><kbd>⌥</kbd><kbd>⌘</kbd><kbd>T</kbd></td>
-		</tr>
-		<tr>
-			<td>Insert a new block after the selected block(s).</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>Y</kbd></td>
-			<td><kbd>⌥</kbd><kbd>⌘</kbd><kbd>Y</kbd></td>
-		</tr>
-		<tr>
-			<td>Move the selected block(s) up.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd></td>
-			<td><kbd>⌥</kbd><kbd>⌘</kbd><kbd>⇧</kbd><kbd>T</kbd></td>
-		</tr>
-		<tr>
-			<td>Move the selected block(s) down.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>Shift</kbd>+<kbd>Y</kbd></td>
-			<td><kbd>⌥</kbd><kbd>⌘</kbd><kbd>⇧</kbd><kbd>Y</kbd></td>
-		</tr>
-		<tr>
-			<td>Change the block type after adding a new paragraph.</td>
-			<td><kbd>/</kbd></td>
-			<td><kbd>/</kbd></td>
-		</tr>
-		<tr>
-			<td>Remove multiple selected blocks.</td>
-			<td><kbd>del</kbd><kbd>backspace</kbd></td>
-			<td><kbd>del</kbd><kbd>backspace</kbd></td>
-		</tr>
-	</tbody>
-</table>
-
-### Text formatting
-
-<table>
-	<thead>
-		<tr>
-			<th>Shortcut description</th>
-			<th>Linux/Windows shortcut</th>
-			<th>macOS shortcut</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>Make the selected text bold.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>B</kbd></td>
-			<td><kbd>⌘</kbd><kbd>B</kbd></td>
-		</tr>
-		<tr>
-			<td>Make the selected text italic.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>I</kbd></td>
-			<td><kbd>⌘</kbd><kbd>I</kbd></td>
-		</tr>
-		<tr>
-			<td>Underline the selected text.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>U</kbd></td>
-			<td><kbd>⌘</kbd><kbd>U</kbd></td>
-		</tr>
-		<tr>
-			<td>Convert the selected text into a link.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>K</kbd></td>
-			<td><kbd>⌘</kbd><kbd>K</kbd></td>
-		</tr>
-		<tr>
-			<td>Remove a link.</td>
-			<td><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>K</kbd></td>
-			<td><kbd>⇧</kbd><kbd>⌘</kbd><kbd>K</kbd></td>
-		</tr>
-		<tr>
-			<td>Add a strikethrough to the selected text.</td>
-			<td><kbd>Shift</kbd>+<kbd>Alt</kbd>+<kbd>D</kbd></td>
-			<td><kbd>⌃</kbd><kbd>⌥</kbd><kbd>D</kbd></td>
-		</tr>
-		<tr>
-			<td>Display the selected text in a monospaced font.</td>
-			<td><kbd>Shift</kbd>+<kbd>Alt</kbd>+<kbd>X</kbd></td>
-			<td><kbd>⌃</kbd><kbd>⌥</kbd><kbd>X</kbd></td>
-		</tr>
-	</tbody>
-</table>
-
 Here is a brief animation illustrating how to find and use the keyboard shortcuts:
 
 ![GIF showing how to access keyboard shortcuts](https://make.wordpress.org/core/files/2020/07/keyboard-shortcuts.gif)
 
-## Does Gutenberg support columns?
+### Does Gutenberg support columns?
 
 Yes, a columns block is available in Gutenberg.
 
-## Does Gutenberg support nested blocks?
+### Does Gutenberg support nested blocks?
 
 Yes, it is supported. You can have multiple levels of nesting – blocks within blocks within blocks. See the [Nested Block Tutorial](https://developer.wordpress.org/block-editor/tutorials/block-tutorial/nested-blocks-inner-blocks/) for more information.
 
-## Does drag and drop work for rearranging blocks?
+### Does drag and drop work for rearranging blocks?
 
 Yes, you can drag and drop blocks to rearrange their order.
 
 
-## How do I make my own block?
+## The Development Experience
+
+### How do I make my own block?
 
 The best place to start is the [Create a Block Tutorial](https://developer.wordpress.org/block-editor/getting-started/create-block/).
 
-## Does Gutenberg involve editing posts/pages in the front-end?
+### Does Gutenberg involve editing posts/pages in the front end?
 
 No, we are designing Gutenberg primarily as a replacement for the post and page editing screens. That said, front-end editing is often confused with an editor that looks exactly like the front end. And that is something that Gutenberg will allow as themes customize individual blocks and provide those styles to the editor. Since content is designed to be distributed across so many different experiences—from desktop and mobile to full-text feeds and syndicated article platforms—we believe it's not ideal to create or design posts from just one front-end experience.
 
-## Given Gutenberg is built in JavaScript, how do old meta boxes (PHP) work?
+### Given Gutenberg is built in JavaScript, how do old meta boxes (PHP) work?
 
 See the [Meta Box Tutorial](https://developer.wordpress.org/block-editor/how-to-guides/metabox/) for more information on using Meta boxes with the new block editor.
 
-## How can plugins extend the Gutenberg UI?
+### How can plugins extend the Gutenberg UI?
 
-The main extension point we want to emphasize is creating new blocks. Blocks are added to the block editor using plugins, see the [Create a Block Tutorial](https://developer.wordpress.org/block-editor/getting-stared/create-block/) to get started.
+The main extension point we want to emphasize is creating new blocks. Blocks are added to the block editor using plugins, see the [Build your first block Tutorial](https://developer.wordpress.org/block-editor/getting-started/tutorial/) to get started.
 
-## Are Custom Post Types still supported?
+### Are Custom Post Types still supported?
 
 Indeed. There are multiple ways in which custom post types can leverage Gutenberg. The plan is to allow them to specify the blocks they support, as well as defining a default block for the post type. It's not currently the case, but if a post type disables the content field, the “advanced” section at the bottom would fill the page.
 
-## Can themes _style_ blocks?
+## Styles
+
+### Can themes _style_ blocks?
 
 Yes. Blocks can provide their own styles, which themes can add to or override, or they can provide no styles at all and rely fully on what the theme provides.
 
-## How do block styles work in both the front-end and back-end?
+### How do block styles work in both the front-end and back-end?
 
 Blocks are able to provide base structural CSS styles, and themes can add styles on top of this. Some blocks, like a Separator (`<hr/>`), likely don't need any front-end styles, while others, like a Gallery, need a few.
 
-Other features, like the new _wide_ and _full-wide_ alignment options, are simply CSS classes applied to blocks that offer this alignment. We are looking at how a theme can opt in to this feature, for example using `add_theme_support`.
+Other features, like the new _wide_ and _full-wide_ alignment options, are simply CSS classes applied to blocks that offer this alignment. We are looking at how a theme can opt into this feature, for example using `add_theme_support`.
 
 This is currently a work in progress and we recommend reviewing the [block based theme documentation](https://developer.wordpress.org/themes/block-themes/) to learn more.
 
-## What are block variations? Are they the same as block styles?
+### What are block variations? Are they the same as block styles?
 
-No, [block variations](/docs/reference-guides/block-api/block-variations.md) are different versions of a single base block, sharing a similar functionality, but with slight differences in their implementation, or settings (attributes, InnerBlocks,etc). Block variations are transparent for users, and once there is a registered block variation, it will appear as a new block. For example, the `embed` block registers different block variations to embed content from specific providers.
+No, [block variations](/docs/reference-guides/block-api/block-variations.md) are different versions of a single base block, sharing a similar functionality but with slight differences in their implementation or settings (attributes, InnerBlocks, etc.). Block variations are transparent for users, and once there is a registered block variation, it will appear as a new block. For example, the `embed` block registers different block variations to embed content from specific providers.
 
-Meanwhile, [block styles](/docs/reference-guides/filters/block-filters.md#block-style-variations) allow you to provide alternative styles to existing blocks, and they work by adding a className to the block’s wrapper. Once a block has registered block styles, a block style selector will appear in its sidebar so that users can choose among the different registered styles.
+Meanwhile, [block styles](/docs/reference-guides/filters/block-filters.md#block-style-variations) allow you to provide alternative styles to existing blocks, and they work by adding a `className` to the block’s wrapper. Once a block has registered block styles, a block style selector will appear in its sidebar so that users can choose among the different registered styles.
 
-## How do editor styles work?
+### How do editor styles work?
 
 Regular editor styles are opt-in and work as is in most cases. Themes can also load extra stylesheets by using the following hook:
 
@@ -398,7 +140,9 @@ add_action( 'enqueue_block_editor_assets', 'gutenbergtheme_editor_styles' );
 
 _See:_ [Editor Styles](/docs/how-to-guides/themes/theme-support.md#editor-styles)
 
-## What browsers does Gutenberg support?
+## Compatibility
+
+### What browsers does Gutenberg support?
 
 Gutenberg works in modern browsers.
 
@@ -406,7 +150,7 @@ The [list of supported browsers can be found in the Make WordPress handbook](htt
 
 Since WordPress 5.8, Gutenberg no longer supports any version of Internet Explorer.
 
-## Should I be concerned that Gutenberg will make my plugin obsolete?
+### Should I be concerned that Gutenberg will make my plugin obsolete?
 
 The goal of Gutenberg is not to put anyone out of business. It's to evolve WordPress so there's more business to be had in the future, for everyone.
 
@@ -414,49 +158,51 @@ Aside from enabling a rich post and page building experience, a meta goal is to
 
 We realize it's a big change. We also think there will be many new opportunities for plugins. WordPress is likely to ship with a range of basic blocks, but there will be plenty of room for highly tailored premium plugins to augment existing blocks or add new blocks to the mix.
 
-## Is it possible to opt out of Gutenberg for my site?
+### Is it possible to opt out of Gutenberg for my site?
 
 There is a “Classic” block, which is virtually the same as the current editor, except in block form.
 
 There is also the [Classic Editor plugin](https://wordpress.org/plugins/classic-editor/) which restores the previous editor, see the plugin for more information. The WordPress Core team has committed to supporting the Classic Editor plugin [until December 2021](https://make.wordpress.org/core/2018/11/07/classic-editor-plugin-support-window/).
 
-## How do custom TinyMCE buttons work in Gutenberg?
+### How do custom TinyMCE buttons work in Gutenberg?
 
 Custom TinyMCE buttons still work in the “Classic” block, which is a block version of the classic editor you know today.
 
 Gutenberg comes with a new universal inserter tool, which gives you access to every block available, searchable, sorted by recency and categories. This inserter tool levels the playing field for every plugin that adds content to the editor, and provides a single interface to learn how to use.
 
-## How do shortcodes work in Gutenberg?
+### How do shortcodes work in Gutenberg?
 
 Shortcodes continue to work as they do now.
 
 However we see the block as an evolution of the `[shortcode]`. Instead of having to type out code, you can use the universal inserter tray to pick a block and get a richer interface for both configuring the block and previewing it. We would recommend people eventually upgrade their shortcodes to be blocks.
 
-## Should I move shortcodes to content blocks?
+### Should I move shortcodes to content blocks?
 
 We think so for a variety of reasons including but not limited to:
 
 -   Blocks have visual editing built-in which creates a more rich, dynamic experience for building your site.
--   Blocks are simply html and don’t persist things the browser doesn't understand on the frontend. In comparison, if you disable a plugin that powers a shortcode, you end up with strange visuals on the frontend (often just showing the shortcode in plain text).
+-   Blocks are simply html and don’t persist things the browser doesn't understand on the front-end. In comparison, if you disable a plugin that powers a shortcode, you end up with strange visuals on the front-end (often just showing the shortcode in plain text).
 -   Blocks will be discovered more readily with the launch of the block directory in a way shortcodes never could be allowing for more people to get more functionality.
 
 Ultimately, Blocks are designed to be visually representative of the final look, and, with the launch of the Block Directory in 5.5, they will become the expected way in which users will discover and insert content in WordPress.
 
-## Is Gutenberg made to be properly accessible?
+## Miscellaneous
+
+### Is Gutenberg made to be properly accessible?
 
 Accessibility is not an afterthought. Not every aspect of Gutenberg is accessible at the moment. You can check logged issues [here](https://github.com/WordPress/gutenberg/labels/Accessibility%20%28a11y%29). We understand that WordPress is for everyone, and that accessibility is about inclusion. This is a key value for us.
 
 If you would like to contribute to the accessibility of Gutenberg, we can always use more people to test and contribute.
 
-## How is data stored? I've seen HTML comments, what is their purpose?
+### How is data stored? I've seen HTML comments. What is their purpose?
 
 Our approach—as outlined in [the technical overview introduction](https://make.wordpress.org/core/2017/01/17/editor-technical-overview/)—is to augment the existing data format in a way that doesn’t break the decade-and-a-half-fabric of content WordPress provides. In other terms, this optimizes for a format that prioritizes human readability (the HTML document of the web) and easy-to-render-anywhere over a machine convenient file (JSON in post-meta) that benefits the editing context primarily.
 
 This also [gives us the flexibility](https://github.com/WordPress/gutenberg/issues/1516) to store those blocks that are inherently separate from the content stream (reusable pieces like widgets or small post type elements) elsewhere, and just keep token references for their placement.
 
-We suggest you look at the [Gutenberg key concepts](/docs/getting-started/architecture/key-concepts.md) to learn more about how this aspect of the project works.
+We suggest you look at the [Gutenberg key concepts](/docs/explanations/architecture/key-concepts.md) to learn more about how this aspect of the project works.
 
-## How can I parse the post content back out into blocks in PHP or JS?
+### How can I parse the post content back out into blocks in PHP or JS?
 
 In JS:
 
diff --git a/docs/getting-started/fundamentals/README.md b/docs/getting-started/fundamentals/README.md
index 26fc88981348b8..42dbace9d7ba3f 100644
--- a/docs/getting-started/fundamentals/README.md
+++ b/docs/getting-started/fundamentals/README.md
@@ -1,11 +1,12 @@
 # Fundamentals of Block Development
 
-This section provides an introduction to the most relevant concepts in Block Development.
+This section provides an introduction to the most relevant concepts in block development. Use the following links to learn more:
 
-In this section, you will learn:
-
-1. [**File structure of a block**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/file-structure-of-a-block) - The purpose of each one of the types of files available for a block, the relationships between them, and their role in the output of the block.
-1. [**`block.json`**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json) - How a block is defined using its `block.json` metadata and some relevant properties of this file.
-1. [**Registration of a block**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block) - How a block is registered in both the server and the client.
-1. [**Block wrapper**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-wrapper) - How to set proper attributes to the block's markup wrapper.
-1. [**Javascript in the Block Editor**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/javascript-in-the-block-editor) - How to work with Javascript for the Block Editor.
\ No newline at end of file
+1. **[File structure of a block](https://developer.wordpress.org/block-editor/getting-started/fundamentals/file-structure-of-a-block):** The purpose of each file that composes a block plugin, the relationships between them, and their role in the block output.
+1. **[`block.json`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json):** How a block is defined using its `block.json` metadata and some relevant properties of this file (such as `attributes` and `supports`).
+1. **[Registration of a block](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block):** How a block is registered on both the server and in the client.
+1. **[Block wrapper](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-wrapper):** How to apply the proper attributes to the block's markup wrapper.
+1. **[The block in the Editor](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-in-the-editor):** How a block, as a React component, is loaded in the Block Editor and an overview of its structure.
+1. **[Markup representation of a block](https://developer.wordpress.org/block-editor/getting-started/fundamentals/markup-representation-block):** How blocks are represented in the database, theme templates, and patterns.
+1. **[Static or Dynamic rendering of a block](https://developer.wordpress.org/block-editor/getting-started/fundamentals/static-dynamic-rendering):** How blocks generate their front-end output either dynamically or statically.
+1. **[JavaScript in the Block Editor](https://developer.wordpress.org/block-editor/getting-started/fundamentals/javascript-in-the-block-editor):** How to work with modern JavaScript when developing for the Block Editor.
diff --git a/docs/getting-started/fundamentals/block-in-the-editor.md b/docs/getting-started/fundamentals/block-in-the-editor.md
new file mode 100644
index 00000000000000..d1f2a25063e6c6
--- /dev/null
+++ b/docs/getting-started/fundamentals/block-in-the-editor.md
@@ -0,0 +1,167 @@
+# The block in the Editor
+
+The Block Editor is a React Single Page Application (SPA). Every block in the Editor is displayed through a React component defined in the `edit` property of the settings object used to [register the block](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registering-a-block-with-javascript-client-side) on the client. 
+
+The `props` object received by the block's `Edit` React component includes:
+
+- **[`attributes`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#attributes):** An object of all the block's attributes.
+- **[`setAttributes`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#setattributes):** A method to update the attributes object.
+- **[`isSelected`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#isselected):** A boolean value that communicates whether the block is currently selected
+
+WordPress provides many built-in standard components that can be used to define the block interface in the Editor. These built-in components are available via packages such as [`@wordpress/components`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-components/) and [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/).
+
+<div class="callout">
+	The WordPress Gutenberg project uses <a href="https://wordpress.github.io/gutenberg/?path=/docs/docs-introduction--page">Storybook</a> to document the user interface components that are available in WordPress packages.
+</div>
+
+Custom settings controls for the block in the Block Toolbar or the Settings Sidebar can also be defined through this `Edit` React component via built-in components such as:
+
+- [`InspectorControls`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/inspector-controls/README.md) 
+- [`BlockControls`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-editor/src/components/block-controls) 
+
+## Built-in components
+
+The package [`@wordpress/components`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-components/) includes a library of generic WordPress components to create common UI elements for the Block Editor and the WordPress dashboard. Some of the  most commonly used components from this package are:
+
+- [`TextControl`](https://wordpress.github.io/gutenberg/?path=/docs/components-textcontrol--docs) 
+- [`Panel`](https://wordpress.github.io/gutenberg/?path=/docs/components-panel--docs)
+- [`ToggleControl`](https://wordpress.github.io/gutenberg/?path=/docs/components-togglecontrol--docs)
+- [`ExternalLink`](https://wordpress.github.io/gutenberg/?path=/docs/components-externallink--docs)
+
+The package [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/) includes a library of components and hooks for the Block Editor, including those to define custom settings controls for the block. Some of the components most commonly used from this package are:
+
+- [`RichText`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/rich-text/README.md)
+- [`BlockControls`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-editor/src/components/block-controls)
+- [`InspectorControls`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/inspector-controls/README.md)
+- [`InnerBlocks`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/inner-blocks/README.md)
+
+<div class="callout callout-info">
+	The package <a href="https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/"><code>@wordpress/block-editor</code></a> also provides the tools to create and use standalone block editors.
+</div>
+
+A good workflow when using a component for the Block Editor is:
+
+- Import the component from a WordPress package.
+- Add the corresponding code for the component to your project in JSX format.
+- Most built-in components will be used to set [block attributes](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#using-attributes-to-store-block-data), so define any necessary attributes in `block.json` and create event handlers to update those attributes with `setAttributes` in your component.
+- Adapt the code to be serialized and stored in the database if needed.
+
+## Block Controls: Block Toolbar and Settings Sidebar
+
+To simplify block customization and ensure a consistent user experience, there are several built-in UI patterns to help generate the Editor preview of a block. 
+
+The image below details the Block Toolbar and the Settings Sidebar of a selected Paragraph block.
+
+![Diagram showing the Block Toolbar and the Settings Sidebar when a Paragraph block is selected](https://developer.wordpress.org/files/2023/12/block-toolbar-settings-sidebar.png)
+
+### Block Toolbar
+
+When the user selects a block, a number of control buttons may be shown in a toolbar above the selected block. Some of these block-level controls may be included automatically, but you can also customize the toolbar to include controls specific to your block type. If the return value of your block type's `Edit` function includes a `BlockControls` element, those controls will be shown in the selected block's toolbar.
+
+```jsx
+export default function Edit( { className, attributes: attr, setAttributes } ) {
+
+	const onChangeContent = ( newContent ) => {
+		setAttributes( { content: newContent } );
+	};
+
+	const onChangeAlignment = ( newAlignment ) => {
+		setAttributes( {
+			alignment: newAlignment === undefined ? 'none' : newAlignment,
+		} );
+	};
+
+	return (
+		<div { ...useBlockProps() }>
+			<BlockControls>
+				<ToolbarGroup>
+					<AlignmentToolbar
+						value={ attr.alignment }
+						onChange={ onChangeAlignment }
+					/>
+				</ToolbarGroup>
+			</BlockControls>
+
+			<RichText
+				className={ className }
+				style={ { textAlign: attr.alignment } }
+				tagName="p"
+				onChange={ onChangeContent }
+				value={ attr.content }
+			/>
+		</div>
+	);
+}
+```
+
+_See the [full block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/block-toolbar-ab967f) of the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/block-toolbar-ab967f/src/edit.js)._
+
+Note that `BlockControls` is only visible when the block is currently selected and in visual editing mode. `BlockControls` are not shown when editing a block in HTML editing mode.
+
+### Settings Sidebar
+
+The Settings Sidebar is used to display less-often-used settings or those that require more screen space. The Settings Sidebar should be used for **block-level settings only** and is shown when a block is selected.
+
+If a setting only affects selected content inside a block, such as "bolding" text, **do not place the setting inside the Settings Sidebar**. Use a toolbar instead. The Settings Sidebar is displayed even when editing a block in HTML mode, so it should only contain block-level settings.
+
+Similar to rendering a toolbar, if you include an `InspectorControls` component in the `return` value of your block type's `Edit` function, those controls will be shown in the Settings Sidebar region.
+
+```jsx
+export default function Edit( { attributes, setAttributes } ) {
+	const onChangeBGColor = ( hexColor ) => {
+		setAttributes( { bg_color: hexColor } );
+	};
+
+	const onChangeTextColor = ( hexColor ) => {
+		setAttributes( { text_color: hexColor } );
+	};
+
+	return (
+		<div { ...useBlockProps() }>
+			<InspectorControls key="setting">
+				<div>
+					<fieldset>
+						<legend className="blocks-base-control__label">
+							{ __( 'Background color', 'block-development-examples' ) }
+						</legend>
+						<ColorPalette // Element Tag for Gutenberg standard color selector
+							onChange={ onChangeBGColor } // onChange event callback
+						/>
+					</fieldset>
+					<fieldset>
+						<legend className="blocks-base-control__label">
+							{ __( 'Text color', 'block-development-examples' ) }
+						</legend>
+						<ColorPalette
+							onChange={ onChangeTextColor }
+						/>
+					</fieldset>
+				</div>
+			</InspectorControls>
+			<TextControl
+				value={ attributes.message }
+				onChange={ ( val ) => setAttributes( { message: val } ) }
+				style={ {
+					backgroundColor: attributes.bg_color,
+					color: attributes.text_color,
+				} }
+			/>
+		</div>
+	);
+}
+```
+_See the [full block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/settings-sidebar-82c525) of the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/settings-sidebar-82c525/src/edit.js)._
+
+Block controls rendered in both the toolbar and sidebar will also be available when multiple blocks of the same type are selected.
+
+<div class="callout callout-note">
+	For common customization settings, including color, border, spacing, and more, you can rely on <a href="https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#enable-ui-settings-panels-for-the-block-with-supports">block supports</a> instead of a custom solution. Block supports provide a consistent UI with the same functionality as other Core blocks.
+</div>
+
+## Additional resources
+
+- [Storybook for WordPress components](https://wordpress.github.io/gutenberg/?path=/docs/docs-introduction--page)
+- [@wordpress/block-editor](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/)
+- [@wordpress/components](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-components/)
+- [`InspectorControls`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/inspector-controls/README.md)
+- [`BlockControls`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-editor/src/components/block-controls)
diff --git a/docs/getting-started/fundamentals/block-json.md b/docs/getting-started/fundamentals/block-json.md
index 5959547804290a..a0e81a84a5f751 100644
--- a/docs/getting-started/fundamentals/block-json.md
+++ b/docs/getting-started/fundamentals/block-json.md
@@ -1,52 +1,59 @@
 # block.json
 
-The `block.json` file simplifies the processs of defining and registering a block by using the same block's definition in JSON format to register the block in both the server and the client.
+The `block.json` file simplifies the process of defining and registering a block by using the same block's definition in JSON format to register the block on both the server and the client (Block Editor).
 
-[![Open block.json diagram in excalidraw](https://developer.wordpress.org/files/2023/11/block-json.png)](https://excalidraw.com/#json=v1GrIkGsYGKv8P14irBy6,Yy0vl8q7DTTL2VsH5Ww27A "Open block.json diagram in excalidraw")
+The diagram below details the basic structure of the `block.json` file.
 
-<div class="callout callout-tip">
-Click <a href="https://github.com/WordPress/block-development-examples/tree/trunk/plugins/block-supports-6aa4dd">here</a> to see a full block example and check <a href="https://github.com/WordPress/block-development-examples/blob/trunk/plugins/block-supports-6aa4dd/src/block.json">its <code>block.json</code></a>
+[![Open block.json diagram image](https://developer.wordpress.org/files/2023/11/block-json.png)](https://developer.wordpress.org/files/2023/11/block-json.png "Open block.json diagram image")
+
+<div class="callout callout-info">
+	To view a complete block example and its associated <a href="https://github.com/WordPress/block-development-examples/blob/trunk/plugins/block-supports-6aa4dd/src/block.json"><code>block.json</code></a> file, visit the <a href="https://github.com/WordPress/block-development-examples/tree/trunk/plugins/block-supports-6aa4dd">Block Development Examples</a> GitHub repository.
 </div>
 
-Besides simplifying a block's registration, using a `block.json` has [several benefits](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#benefits-using-the-metadata-file), including improved performance and development.
+Besides simplifying a block's registration, using a `block.json` has [several benefits](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#benefits-using-the-metadata-file), including improved performance.
 
-At [**Metadata in block.json**](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/) you can find a detailed explanation of all the properties you can set in a `block.json` for a block. With these properties you can define things such as:
+The [Metadata in block.json](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/) documentation has a comprehensive guide on all the properties you can use in a `block.json` file for a block. This article will cover the most common options, which allow you to specify:
 
-- Basic metadata of the block
-- Files for the block's behavior, style, or output
-- Data Storage in the Block
-- Setting UI panels for the block
+- The block's basic metadata.
+- The files that dictate the block's functionality, appearance, and output.
+- How data is stored within the block.
+- The block's setting panels within the user interface.
 
-## Basic metadata of the block
+## Basic metadata of a block
 
-Through properties of the `block.json`, we can define how the block will be uniquely identified, how it can be found, and the info displayed for the block in the Block Editor. Some of these properties are:
+Using `block.json` properties, you can define how the block will be uniquely identified and what information is displayed in the Block Editor. These properties include:
 
-- [`apiVersion`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#api-version): the version of [the API](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-api-versions/) used by the block (current version is 2).
-- [`name`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#name):  a unique identifier for a block, including a namespace.
-- [`title`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#title):  a display title for a block.
-- [`category`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#category):  a block category for the block in the Inserter panel.
-- [`icon`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#icon):  a [Dashicon](https://developer.wordpress.org/resource/dashicons) slug or a custom SVG icon.
-- [`description`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#description):  a short description visible in the block inspector.
-- [`keywords`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#keywords): to locate the block in the inserter.
-- [`textdomain`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#text-domain): the plugin text-domain (important for things such as translations).
+- **[`apiVersion`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#api-version):** Specifies the [API](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-api-versions/) version the block uses. Use the latest version unless you have specific requirements.
+- **[`name`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#name):**  The unique name of the block, including namespace (e.g., `my-plugin/my-custom-block`).
+- **[`title`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#title):** The display title for the block, shown in the Inserter.
+- **[`category`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#category):** The category under which the block appears in the Inserter. Common categories include `text`, `media`, `design`, `widgets`, and `theme`.
+- **[`icon`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#icon):**  An icon representing the block in the Inserter. This can be a [Dashicon](https://developer.wordpress.org/resource/dashicons) slug or a custom SVG icon.
+- **[`description`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#description):**  A short description of the block, providing more context than the title.
+- **[`keywords`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#keywords):** An array of keywords to help users find the block when searching.
+- **[`textdomain`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#text-domain):** The text domain for the block, used for internationalization.
 
 ## Files for the block's behavior, output, or style 
 
-The [`editorScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-script) and [`editorStyle`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-style) properties allow defining Javascript and CSS files to be enqueued and loaded **only in the editor**.
+The `block.json` file also allows you to specify the essential files for a block's functionality:
 
-The [`script`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#script) and [`style`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#style) properties allow the definition of Javascript and CSS files to be enqueued and loaded **in both the editor and the front end**.
+- **[`editorScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-script):** A JavaScript file or files for use only in the Block Editor.
+- **[`editorStyle`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-style):** A CSS file or files for styling within the Block Editor.
+- **[`script`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#script):** A JavaScript file or files loaded in both the Block Editor and the front end.
+- **[`style`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#style):** A CSS file or files applied in both the Block Editor and the front end.
+- **[`viewScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#view-script):** A JavaScript file or files intended solely for the front end.
 
-The [`viewScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#view-script) property allow us to define the Javascript file or files to be enqueued and loaded **only in the front end**.
+For all these properties, you can provide a [file path](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#wpdefinedpath) (starting with `file:`), a [handle](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#wpdefinedasset) that has been registered using `wp_register_script` or `wp_register_style`, or an array combining both options.
 
-All these properties (`editorScript`, `editorStyle`, `script` `style`,`viewScript`) accept as a value a [path for the file](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#wpdefinedpath) (prefixed with `file:`), a [handle registered with `wp_register_script` or `wp_register_style`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#wpdefinedasset), or an array with a mix of both.
+Additionally, the [`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) property, [introduced on WordPress 6.1](https://make.wordpress.org/core/2022/10/12/block-api-changes-in-wordpress-6-1/), specifies the path to a PHP template file responsible for generating a [dynamically rendered](/docs/getting-started/fundamentals/static-dynamic-rendering.md) block's front-end markup. This approach is used if a `$render_callback` function is not provided to the `register_block_type()` function.
 
-The [`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) property ([introduced on WordPress 6.1](https://make.wordpress.org/core/2022/10/12/block-api-changes-in-wordpress-6-1/)) sets the path of a `.php` template file that will render the markup returned to the front end. This only method will be used to return the markup for the block on request only if `$render_callback` function has not been passed to the `register_block_type` function.
+## Using block `attributes` to store data
 
-## Data Storage in the Block with `attributes`
+Block [attributes](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#attributes) are settings or data assigned to blocks. They can determine various aspects of a block, such as its content, layout, style, and any other specific information you need to store along with your block's structure. If the user changes a block, such as modifying the font size, you need a way to persist these changes. Attributes are the solution. 
 
-The [`attributes` property](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#attributes) allows a block to declare "variables" that store data or content for the block.
+When registering a new block type, the `attributes` property of `block.json` describes the custom data the block requires and how they're stored in the database. This allows the Block Editor to parse these values correctly and pass the `attributes` to the block's `Edit` component and `save` function.
+
+Here's an example of three attributes defined in `block.json`:
 
-_Example: Attributes as defined in block.json_
 ```json
 "attributes": {
 	"fallbackCurrentYear": {
@@ -60,33 +67,42 @@ _Example: Attributes as defined in block.json_
 	}
 },
 ```
-By default `attributes` are serialized and stored in the block's delimiter but this [can be configured](https://developer.wordpress.org/news/2023/09/understanding-block-attributes/).
 
-_Example: Atributes stored in the Markup representation of the block_
+Blocks are "delimited" using HTML-style comment tags that contain specific JSON-like attributes. These delimiters make it possible to recognize block boundaries and parse block attributes when rendering post content or editing a post in the Block Editor. 
+
+The code example below demonstrates the attributes defined in the block delimiter. 
+
 ```html
 <!-- wp:block-development-examples/copyright-date-block-09aac3 {"fallbackCurrentYear":"2023","showStartingYear":true,"startingYear":"2020"} -->
 <p class="wp-block-block-development-examples-copyright-date-block-09aac3">© 2020–2023</p>
-<!-- /wp:block-development-examples/copyright-date-block-09aac3 -->x
+<!-- /wp:block-development-examples/copyright-date-block-09aac3 -->
 ```
+ 
+All attributes are serialized and stored in the block's delimiter by default, but this can be configured to suit your needs. Check out the [Understanding Block Attributes](https://developer.wordpress.org/news/2023/09/understanding-block-attributes/) article to learn more.
 
-These [`attributes`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#attributes) are passed to the React component `Edit`(to display in the Block Editor) and the `save` function (to return the markup saved to the DB) of the block, and to any server-side render definition for the block (see `render` prop above). 
+### Reading and updating attributes 
 
-The `Edit` component receives exclusively the capability of updating the attributes via the [`setAttributes`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#setattributes) function.
+These [attributes](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#attributes) are passed to the block's `Edit` React component for display in the Block Editor, to the `save` function for generating the markup that gets stored in the database, and to any server-side rendering definition for the block.
 
-_See how the attributes are passed to the [`Edit` component](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/copyright-date-block-09aac3/src/edit.js), [the `save` function](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/copyright-date-block-09aac3/src/save.js) and [the `render.php`](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/copyright-date-block-09aac3/src/render.php) in this [full block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/copyright-date-block-09aac3) of the  code above_
+The `Edit` component uniquely possesses the ability to modify these attributes through the [`setAttributes`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#setattributes) function.
 
-<div class="callout callout-info">
-Check the <a href="https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/"> <code>attributes</code> </a> reference page for full info about the Attributes API. 
-</div>
+The following diagram details how attributes are stored, read, and updated in a typical block.
+
+[![Open Attributes diagram image](https://developer.wordpress.org/files/2023/11/attributes.png)](https://developer.wordpress.org/files/2023/11/attributes.png "Open Attributes diagram image")
 
-[![Open Attributes diagram in excalidraw](https://developer.wordpress.org/files/2023/11/attributes.png)](https://excalidraw.com/#json=pSgCZy8q9GbH7r0oz2fL1,MFCLd6ddQHqi_UqNp5ZSgg "Open Attributes diagram in excalidraw")
+_See how the attributes are passed to the [`Edit`](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/copyright-date-block-09aac3/src/edit.js) component, the [`save`](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/copyright-date-block-09aac3/src/save.js) function, and [`render.php`](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/copyright-date-block-09aac3/src/render.php) in this [complete block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/copyright-date-block-09aac3)._
 
+For more information about attributes and how to use them in your custom blocks, visit the [Attributes API](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/) reference page. 
 
-## Enable UI settings panels for the block with `supports`
+## Using block supports to enable settings and styles
 
-The [`supports`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#supports) property allows a block to declare support for certain features, enabling users to customize specific settings (like colors or margins) from the Settings Sidebar.
+Many blocks, including Core blocks, offer similar customization options, such as background color, text color, and padding adjustments.
 
-_Example: Supports as defined in block.json_
+The [`supports`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#supports) property in `block.json` allows a block to declare support for a set of these common customization options. When enabled, users of the block can then adjust things like color or padding directly from the Settings Sidebar.
+
+Leveraging these predefined block supports helps ensure your block behaves consistently with Core blocks, eliminating the need to recreate similar functionalities from scratch.
+
+Here's an example of color supports defined in `block.json`:
 
 ```json
 "supports": {
@@ -98,9 +114,9 @@ _Example: Supports as defined in block.json_
 }
 ```
 
-The use of `supports` generates a set of properties that need to be manually added to the wrapping element of the block so they're properly stored as part of the block data.
+The use of block supports generates a set of properties that need to be manually added to the [wrapping element of the block](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-wrapper/). This ensures they're properly stored as part of the block data and taken into account when generating the markup of the block that will be delivered to the front end.
 
-_Example: Supports custom settings stored in the Markup representation of the block_
+The following code demonstrates how the attributes and CSS classes generated by enabling block supports are stored in the markup representation of the block.
 
 ```html
 <!-- wp:block-development-examples/block-supports-6aa4dd {"backgroundColor":"contrast","textColor":"accent-4"} -->
@@ -108,8 +124,12 @@ _Example: Supports custom settings stored in the Markup representation of the bl
 <!-- /wp:block-development-examples/block-supports-6aa4dd -->
 ```
 
-_See the [full block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/block-supports-6aa4dd) of the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/block-supports-6aa4dd/src/block.json)_
+_See the [complete block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/block-supports-6aa4dd) of the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/block-supports-6aa4dd/src/block.json)._
 
-<div class="callout callout-info">
-Check the <a href="https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/"> <code>supports</code> </a> reference page for full info about the Supports API. 
-</div>
+For more information about supports and how to use them in your custom blocks, visit the [Supports API](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/) reference page. 
+
+
+## Additional resources
+
+- [block.json diagram](https://excalidraw.com/#json=v1GrIkGsYGKv8P14irBy6,Yy0vl8q7DTTL2VsH5Ww27A)
+- [Attributes diagram](https://excalidraw.com/#json=pSgCZy8q9GbH7r0oz2fL1,MFCLd6ddQHqi_UqNp5ZSgg)
\ No newline at end of file
diff --git a/docs/getting-started/fundamentals/block-wrapper.md b/docs/getting-started/fundamentals/block-wrapper.md
index 6ecebbe8303864..98c435f6ebe2f7 100644
--- a/docs/getting-started/fundamentals/block-wrapper.md
+++ b/docs/getting-started/fundamentals/block-wrapper.md
@@ -1,36 +1,30 @@
 # The block wrapper
 
-Each block's markup is wrapped by a container HTML tag that needs to have the proper attributes to fully work in the Block Editor and to reflect the proper block's style settings when rendered in the Block Editor and the front end. As developers, we have full control over the block's markup, and WordPress provides the tools to add the attributes that need to exist on the wrapper to our block's markup.
+Every block in the Block Editor is contained within an HTML wrapper, which must have specific attributes to function correctly both in the Editor and on the front end. As developers, we can directly manipulate this markup, and WordPress offers tools like `useBlockProps()` to modify the attributes added to a block's wrapper.
 
-Ensuring proper attributes to the block wrapper is especially important when using custom styling or features like `supports`. 
+Ensuring proper attributes to the block wrapper is especially important when using custom styling or features like [block supports](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/).
 
-<div class="callout callout-info">
-The use of <code>supports</code> generates a set of properties that need to be manually added to the wrapping element of the block so they're properly stored as part of the block data
-</div>
+A block in WordPress can be defined with three distinct types of markup, each serving a unique role:
 
-A block can have three sets of markup defined, each one of them with a specific target and purpose:
+- **Editor Markup:** This is the visual representation of the block within the Block Editor. It's defined using an `Edit` React component when the block is registered on the client side via [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#registerblocktype).
+- **Save Markup:** This markup is what gets saved to the database when the block's content is saved. It's specified through a `save` function, also provided to `registerBlockType` during block registration. If the block doesn't utilize dynamic rendering, this saved markup is what will be displayed on the front end.
+- **Dynamic Render Markup:** When a block's content needs to be generated dynamically, this markup comes into play. It's defined server-side, either through a `render_callback` function in [`register_block_type`](https://developer.wordpress.org/reference/functions/register_block_type/) or a [`render.php`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) file specified in `block.json`. If present, this markup overrides any saved markup and is used for the block's front-end display.
 
-- The one for the **Block Editor**, defined through a `edit` React component passed to [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#registerblocktype) when registering the block in the client. 
-- The one used to **save the block in the DB**, defined through a `save` function passed to `registerBlockType` when registering the block in the client. 
-    - This markup will be returned to the front end on request if no dynamic render has been defined for the block.
-- The one used to **dynamically render the markup of the block** returned to the front end on request, defined through the `render_callback` on [`register_block_type`](https://developer.wordpress.org/reference/functions/register_block_type/) or the [`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) PHP file in `block.json`
-    - If defined, this server-side generated markup will be returned to the front end, ignoring the markup stored in DB.
+For both the [`Edit` component and the `save` function](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/), it's important to use a wrapper element that's a standard DOM element (like a `<div>`) or a React component that passes all additional props to native DOM elements. Using React Fragments (`<Fragment>`) or the `<ServerSideRender>` component won't work for these wrappers.
 
-For the [`edit` React component and the `save` function](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/), the block wrapper element should be a native DOM element (like `<div>`) or a React component that forwards any additional props to native DOM elements. Using a <Fragment> or <ServerSideRender> component, for instance, would be invalid.
+## Editor markup
 
+The [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/#useblockprops) hook, provided by the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor) package, is used to define the outer markup of a block in the `Edit` component.
 
-## The Edit component's markup
+This hook simplifies several tasks, including:
 
-The [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/#useblockprops) hook available on the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor) allows passing the required attributes for the Block Editor to the `edit` block's outer wrapper. 
+- Assigning a unique `id` to the block's HTML structure.
+- Adding various accessibility and `data-` attributes for enhanced functionality and information.
+- Incorporating classes and inline styles that reflect the block's custom settings. By default, this includes:
+    - The `wp-block` class for general block styling.
+    - A block-specific class that combines the block's namespace and name, ensuring unique and targeted styling capabilities.
 
-Among other things, the `useBlockProps()` hook takes care of including in this wrapper:
-- An `id` for the block's markup 
-- Some accesibility and `data-` attributes
-- Classes and inline styles reflecting custom settings, which include by default:
-    - The `wp-block` class 
-    - A class that contains the name of the block with its namespace
-
-For example, for the following piece of code of a block's registration in the client...
+In the following example, the Editor markup of the block is defined in the `Edit` component using the `useBlockProps()` hook.
 
 ```js
 const Edit = () => <p { ...useBlockProps() }>Hello World - Block Editor</p>;
@@ -39,35 +33,38 @@ registerBlockType( ..., {
 	edit: Edit
 } );
 ```
-_(see the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/minimal-block-ca6eda/src/index.js) in [an example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/minimal-block-ca6eda))_
 
-...the markup of the block in the Block Editor could look like this:
+_See the [full block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/minimal-block-ca6eda) of the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/minimal-block-ca6eda/src/index.js)._
+
+The markup of the block in the Block Editor could look like this, where the classes and attributes are applied automatically:
+
 ```html
-<p 
-    tabindex="0" 
-    id="block-4462939a-b918-44bb-9b7c-35a0db5ab8fe" 
-    role="document" 
-    aria-label="Block: Minimal Gutenberg Block ca6eda" 
-    data-block="4462939a-b918-44bb-9b7c-35a0db5ab8fe" 
-    data-type="block-development-examples/minimal-block-ca6eda" 
-    data-title="Minimal Gutenberg Block ca6eda" 
+<p
+    tabindex="0"
+    id="block-4462939a-b918-44bb-9b7c-35a0db5ab8fe"
+    role="document"
+    aria-label="Block: Minimal Gutenberg Block ca6eda"
+    data-block="4462939a-b918-44bb-9b7c-35a0db5ab8fe"
+    data-type="block-development-examples/minimal-block-ca6eda"
+    data-title="Minimal Gutenberg Block ca6eda"
     class="
-        block-editor-block-list__block 
-        wp-block 
-        is-selected 
+        block-editor-block-list__block
+        wp-block
+        is-selected
         wp-block-block-development-examples-minimal-block-ca6eda
     "
 >Hello World - Block Editor</p>
 ```
 
-Any additional classes and attributes for the `Edit` component of the block should be passed as an argument of `useBlockProps` (see [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/edit.js)). When you add `support` for any feature, they get added to the object returned by the `useBlockProps` hook.
+In a block's `Edit` component, use the `useBlockProps()` hook to include additional classes and attributes by passing them as arguments. (See [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/edit.js))
 
+When you enable features using the `supports` property, any corresponding classes or attributes are included in the object returned by `useBlockProps` automatically.
 
-## The Save component's markup
+## Save markup
 
-When saving the markup in the DB, it’s important to add the block props returned by `useBlockProps.save()` to the wrapper element of your block. `useBlockProps.save()` ensures that the block class name is rendered properly in addition to any HTML attribute injected by the block supports API.
+When saving the markup in the database, it’s important to add the props returned by `useBlockProps.save()` to the wrapper element of your block. `useBlockProps.save()` ensures that the block class name is rendered correctly in addition to any HTML attributes injected by the block supports API.
 
-For example, for the following piece of code of a block's registration in the client that defines the markup desired for the DB (and returned to the front end by default)...
+Consider the following code that registers a block in the client. Notice how it defines the markup that should be used when editing the block and when the block is saved in the database.
 
 ```js
 const Edit = () => <p { ...useBlockProps() }>Hello World - Block Editor</p>;
@@ -79,36 +76,36 @@ registerBlockType( ..., {
 } );
 ```
 
-_(see the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/minimal-block-ca6eda/src/index.js) in [an example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/minimal-block-ca6eda))_
+_See the [full block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/minimal-block-ca6eda) of the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/minimal-block-ca6eda/src/index.js)._
 
+The markup of the block on the front end could look like this, where the class is applied automatically:
 
-...the markup of the block in the front end could look like this:
 ```html
 <p class="wp-block-block-development-examples-minimal-block-ca6eda">Hello World – Frontend</p>
 ```
 
-Any additional classes and attributes for the `save` function of the block should be passed as an argument of `useBlockProps.save()` (see [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/save.js)). 
+If you want to add any additional classes or attributes to the `save` function of the block, they should be passed as an argument of `useBlockProps.save()`. (See [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/save.js))
 
-When you add `support` for any feature, the proper classes get added to the object returned by the `useBlockProps.save()` hook.
+When you add `supports` for any feature, the proper classes get added to the object returned by the `useBlockProps.save()` hook. Text and background color classes have been added to the Paragraph block in the example below.
 
 ```html
 <p class="
-    wp-block-block-development-examples-block-supports-6aa4dd 
-    has-accent-4-color 
-    has-contrast-background-color 
-    has-text-color 
+    wp-block-block-development-examples-block-supports-6aa4dd
+    has-accent-4-color
+    has-contrast-background-color
+    has-text-color
     has-background
 ">Hello World</p>
 ```
 
-_(check the [example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/block-supports-6aa4dd) that generated the HTML above in the front end)_
+The [example block](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/block-supports-6aa4dd) that generated this HTML is available in the [Block Development Examples](https://github.com/WordPress/block-development-examples) repository.
 
-## The server-side render markup
+## Dynamic render markup
 
-Any markup in the server-side render definition for the block can use the [`get_block_wrapper_attributes()`](https://developer.wordpress.org/reference/functions/get_block_wrapper_attributes/) function to generate the string of attributes required to reflect the block settings (see [example](https://github.com/WordPress/block-development-examples/blob/f68640f42d993f0866d1879f67c73910285ca114/plugins/block-dynamic-rendering-64756b/src/render.php#L11)). 
+In dynamic blocks, where the front-end markup is rendered server-side, you can utilize the [`get_block_wrapper_attributes()`](https://developer.wordpress.org/reference/functions/get_block_wrapper_attributes/) function to output the necessary classes and attributes just like you would use `useBlockProps.save()` in the `save` function. (See [example](https://github.com/WordPress/block-development-examples/blob/f68640f42d993f0866d1879f67c73910285ca114/plugins/block-dynamic-rendering-64756b/src/render.php#L11))
 
 ```php
 <p <?php echo get_block_wrapper_attributes(); ?>>
 	<?php esc_html_e( 'Block with Dynamic Rendering – hello!!!', 'block-development-examples' ); ?>
 </p>
-```
\ No newline at end of file
+```
diff --git a/docs/getting-started/fundamentals/file-structure-of-a-block.md b/docs/getting-started/fundamentals/file-structure-of-a-block.md
index 660c7aa8aff8b8..24972b219e0b60 100644
--- a/docs/getting-started/fundamentals/file-structure-of-a-block.md
+++ b/docs/getting-started/fundamentals/file-structure-of-a-block.md
@@ -1,86 +1,90 @@
 # File structure of a block
 
-It is recommended to **register blocks within plugins** to ensure they stay available when a theme gets switched. With the [`create-block` tool](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-create-block/) you can quickly scaffold the structure of the files required to create a plugin that registers a block. 
+When developing custom blocks for WordPress, it's best practice to register them within plugins rather than themes. This strategy guarantees that your blocks stay accessible, even when users switch themes. While there might be situations where embedding blocks directly into a theme could be appropriate, this guide focuses on blocks housed within a plugin. Specifically, it details the file structure as produced by the [`create-block`](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-create-block/) tool.
 
-The files generated by `create-block` are a good reference of the files that can be involved in the definition and registration of a block.
+Adhering to the `create-block` tool's structure is not mandatory, but it serves as a reliable reference. The files it generates encompass everything needed for a block's definition and registration. Following this structure can help maintain consistency and ensure your blocks are well-organized and easy to maintain.
 
-[![Open File Structure of a Block Diagram in excalidraw](https://developer.wordpress.org/files/2023/11/file-structure-block.png)](https://excalidraw.com/#json=YYpeR-kY1ZMhFKVZxGhMi,mVZewfwNAh_oL-7bj4gmdw "Open File Structure of a Block Diagram in excalidraw")
+[![Open File Structure of a Block diagram image](https://developer.wordpress.org/files/2023/11/file-structure-block.png)](https://developer.wordpress.org/files/2023/11/file-structure-block.png "Open File Structure of a Block diagram image")
 
-### `<plugin-file>.php`
+## `<plugin-file>.php`
 
-A block is usually added to the block editor using a WordPress plugin. In the main PHP file of the plugin the block is usually registered on the server side.
+
+When creating a block in a WordPress plugin, you usually register the block on the server in the main PHP file of the plugin. This is done using the [`register_block_type()`](https://developer.wordpress.org/reference/functions/register_block_type/) function. 
 
 <div class="callout callout-info">
-For more on creating a WordPress plugin see <a href="https://developer.wordpress.org/plugins/plugin-basics/">Plugin Basics</a>, and <a href="https://developer.wordpress.org/plugins/plugin-basics/header-requirements/">Plugin Header requirements</a> for explanation and additional fields you can include in your plugin header.
+    For more on creating a WordPress plugin, refer to the documentation on <a href="https://developer.wordpress.org/plugins/plugin-basics/">Plugin Basics</a> and the <a href="https://developer.wordpress.org/plugins/plugin-basics/header-requirements/"> Header Requirements</a> for the main PHP file.
 </div>
 
-### `package.json`
+## `package.json`
+
+The `package.json` file is used to configure a Node.js project, which is technically what a block plugin is. In this file, you define the `npm` dependencies of the block and the scripts used for local development.
 
-[`package.json`](https://docs.npmjs.com/cli/v10/configuring-npm/package-json) is a configuration file for a Node.js project. In this file you define the NPM dependencies of the block and the scripts used for local work.
+## `src` folder
 
-### `src` folder
+In a standard project, the `src` (source) folder contains the raw, uncompiled code, including JavaScript, CSS, and other assets necessary for developing the block. This is where you write and edit your block's source code, utilizing modern JavaScript features and JSX for React components.
 
-In a standard project you'll place your block files in the `src` folder. By default, [the build process with `wp-scripts`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/javascript-in-the-block-editor/#javascript-build-process) will take files from this folder and will generate the bundled files in the `build` folder. 
+The [build process](docs/block-editor/getting-started/fundamentals/javascript-in-the-block-editor/#javascript-build-process.md) provided by `wp-scripts` will then take the files from this folder and generate the production-ready files in the project's `build` folder. 
 
 ### `block.json`
 
-This file contains the [metadata of the block](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/), and it's used to simplify the definition and registration of the block both in the client and on the server. 
+The `block.json` file contains the [block's metadata](docs/block-editor/reference-guides/block-api/block-metadata/), streamlining its definition and registration across client-side and server-side environments. 
+
+This file includes the block name, description, [attributes](docs/block-editor/reference-guides/block-api/block-attributes/), [supports](docs/block-editor/reference-guides/block-api/block-supports/), and more, as well as the locations of essential files responsible for the block's functionality, appearance, and styling. 
+
+When a build process is applied, the `block.json` file and the other generated files are moved to a designated folder, often the `build` folder. Consequently, the file paths specified within `block.json` point to these processed, bundled versions of the files. 
 
-Among other data it provides properties to define the paths of the files involved in the block's behaviour, output and style. If there's a build process involved, this `block.json` along with the generated files are placed into a destination folder (usually the `build` folder) so the paths provided target to the bundled versions of these files.
+A few of the most important properties that can be defined in a `block.json` are:
 
-The most relevant properties that can be defined in a `block.json` to set the files involved in the block's behaviour, output or style are:
-- The [`editorScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-script) property, usually set with the path of a bundled `index.js` file (output build from `src/index.js`).
-- The [`style`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#style) property, usually set with the path of a bundled `style-index.css` file (output build from `src/style.(css|scss|sass)`).
-- The [`editorStyle`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-style) property, usually set with the path of a bundled `index.css` (output build from `src/editor.(css|scss|sass)`).
-- The [`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) property, usually set with the path of a bundled `render.php` (output copied from `src/render.php`).
-- The [`viewScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#view-script) property, usually set with the path of a bundled `view.js` (output copied from `src/view.php`).
+- **[`editorScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-script):** Usually set with the path of a bundled `index.js` file that was built from `src/index.js`.
+- **[`style`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#style):** Usually set with the path of a bundled `style-index.css` file that was built from `src/style.(css|scss|sass)`.
+- **[`editorStyle`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-style):** Usually set with the path of a bundled `index.css` that was built from `src/editor.(css|scss|sass)`.
+- **[`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render):** Usually set with the path of a bundled `render.php` that was copied from `src/render.php`.
+- **[`viewScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#view-script):** Usually set with the path of a bundled `view.js` that was built from `src/view.js`.
 
 [![Open Build Output Diagram in excalidraw](https://developer.wordpress.org/files/2023/11/file-structure-build-output.png)](https://excalidraw.com/#json=c22LROgcG4JkD-7SkuE-N,rQW_ViJBq0Yk3qhCgqD6zQ "Open Build Output Diagram in excalidraw")
 
 ### `index.js`
 
-The `index.js` file (or any other file defined in the `editorScript` property of `block.json`) is the entry point file for javascript that should only get loaded in the editor. It is responsible for calling the `registerBlockType` function to register the block on the client. In a standard structure it imports the `edit.js` and `save.js` files to get functions required in block registration.
+The `index.js` file (or any other file defined in the `editorScript` property of `block.json`) is the entry point file for JavaScript that should only get loaded in the Block Editor. It's responsible for calling the `registerBlockType` function to register the block on the client and typically imports the `edit.js` and `save.js` files to get the functions required for block registration.
 
 ### `edit.js`
 
-The `edit.js` commonly gets used to contain the React component that gets used in the editor for our block. It usually exports a single component that then gets passed to the [`edit` property of the `registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#edit) function in the `index.js` file.
+The `edit.js` file contains the React component responsible for rendering the block's editing user interface, allowing users to interact with and customize the block's content and settings in the Block Editor. This component gets passed to the [`edit`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#edit) property of the `registerBlockType` function in the `index.js` file.
 
 ### `save.js`
 
-The `save.js` exports the function that returns the static HTML markup that gets saved to the Database and that is passed to the [`save` property of the `registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#save) function in the `index.js` file.
+The `save.js` exports the function that returns the static HTML markup that gets saved to the WordPress database. This function gets passed to the [`save`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#save) property of the `registerBlockType` function in the `index.js` file.
 
 ### `style.(css|scss|sass)`
 
-A `style` file with any of the extensions `.css`, `.scss` or `.sass`, contains the styles of the block that will be loaded in both the editor and the frontend. In the build process this file is converted into `style-index.css` which is usually defined at [`style`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#style) property in `block.json`
+A `style` file with extensions `.css`, `.scss`, or `.sass` contains the styles of the block that will be loaded in both the Block Editor and on the front end. In the build process, this file is converted into `style-index.css`, which is usually defined using the [`style`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#style) property in `block.json`
 
 <div class="callout callout-info">
-    The webpack config used internally by <code>wp-scripts</code> includes a <a href="https://webpack.js.org/loaders/css-loader/">css-loader</a> chained with <a herf="https://webpack.js.org/loaders/postcss-loader/">postcss-loader</a> and <a href="https://webpack.js.org/loaders/sass-loader/">sass-loader</a> that allows it to process CSS, SASS or SCSS files. Check <a href="https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#default-webpack-config">Default webpack config</a> for more info
+    The webpack configuration used internally by <code>wp-scripts</code> includes a <a href="https://webpack.js.org/loaders/css-loader/">css-loader</a> chained with <a herf="https://webpack.js.org/loaders/postcss-loader/">postcss-loader</a> and <a href="https://webpack.js.org/loaders/sass-loader/">sass-loader</a> that allows it to process CSS, SASS or SCSS files. Check <a href="https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#default-webpack-config">Default webpack config</a> for more info
 </div>
 
-
 ### `editor.(css|scss|sass)`
 
-An `editor` file with any of the extensions `.css`, `.scss` or `.sass`, contains the additional styles applied to the block only in the editor’s context. In the build process this file is converted into `index.css` which is usually defined at [`editorStyle`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-style) property in `block.json`
+An `editor` file with extensions `.css`, `.scss`, or `.sass` contains the additional styles applied to the block in the Block Editor. You will often use this file for styles specific to the block's user interface. This file is converted to `index.css` during the build process, usually defined using the `editorStyle` property in `block.json`.
 
 ### `render.php`
 
-The `render.php` file (or any other file defined in the [`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) property of `block.json`) defines the server side process that returns the markup for the block when there is a request from the frontend. If this file is defined, it will take precedence over any other ways to render the block's markup for the frontend.
+The `render.php` file (or any other file defined in the [`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) property of `block.json`) defines the server-side process that returns the markup for the block when there is a request from the front end. If defined, this file will take precedence over other ways to render the block's markup on the front end.
 
 ### `view.js`
 
-The `view.js` file (or any other file defined in the [`viewScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#view-script) property of `block.json`) will be loaded in the front-end when the block is displayed.
+The `view.js` file (or any other file defined in the [`viewScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#view-script) property of `block.json`) will be loaded in the front end when the block is displayed.
+
+## `build` folder
 
-### `build` folder
+The `build` folder contains the compiled and optimized versions of the code from the `src` folder. These files are generated from the [build process](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/#the-build-process-with-wp-scripts), triggered by the `build` or `start` commands of `wp-scripts`.
 
-In a standard project, the `build` folder contains the generated files in [the build process triggered by the `build` or `start` commands of `wp-scripts`](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/#the-build-process-with-wp-scripts). 
+This transformation process includes minification, transpilation from modern JavaScript to a version compatible with a wider range of browsers, and bundling of assets for efficient loading. WordPress ultimately enqueues and uses the `build` folder's contents to render the block in the Block Editor and on the front end.
 
-<div class="callout callout-tip">
-    You can use <code>webpack-src-dir</code> and <code>output-path</code> option of <code>wp-scripts</code> build commands to <a href="https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#automatic-block-json-detection-and-the-source-code-directory">customize the entry and output points</a>
+<div class="callout callout-info">
+    You can use <code>webpack-src-dir</code> and <code>output-path</code> option of <code>wp-scripts</code> build commands to <a href="https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#automatic-block-json-detection-and-the-source-code-directory">customize the entry and output points</a>.
 </div>
 
 ## Additional resources
 
-- [Metadata in block.json](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/)
-- [`wp-scripts build`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#build)
-- [`wp-scripts start`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#start)
-- [How webpack and WordPress packages interact](https://developer.wordpress.org/news/2023/04/how-webpack-and-wordpress-packages-interact/) | Developer Blog
+- [Diagram featuring the file structure of a block](https://excalidraw.com/#json=YYpeR-kY1ZMhFKVZxGhMi,mVZewfwNAh_oL-7bj4gmdw)
diff --git a/docs/getting-started/fundamentals/javascript-in-the-block-editor.md b/docs/getting-started/fundamentals/javascript-in-the-block-editor.md
index 73c6a6c56e6328..348b95ba88da3c 100644
--- a/docs/getting-started/fundamentals/javascript-in-the-block-editor.md
+++ b/docs/getting-started/fundamentals/javascript-in-the-block-editor.md
@@ -1,51 +1,94 @@
-# Working with Javascript for the Block Editor
+# Working with JavaScript for the Block Editor
 
-A JavaScript Build Process is recommended for most cases when working with Javascript for the Block Editor. With a build process, you'll be able to work with ESNext and JSX (among others) syntaxes and features in your code while producing code ready for the majority of the browsers.
+Developing blocks for the Block Editor often involves using modern JavaScript (ESNext and JSX), and most examples here in the Block Editor Handbook are written in these syntaxes.
 
-## JavaScript Build Process
+However, this form of JavaScript must be transformed into a browser-compatible format, necessitating a build step. This process transforms, bundles, and optimizes JavaScript source code and related assets into a format suitable for production environments.
 
-["ESNext"](https://developer.mozilla.org/en-US/docs/Web/JavaScript/JavaScript_technologies_overview#standardization_process) is a dynamic name that refers to Javascript's latest syntax and features. ["JSX"](https://react.dev/learn/writing-markup-with-jsx) is a custom syntax extension to JavaScript, created by React project, that allows you to write JavaScript using a familiar HTML tag-like syntax.
+## JavaScript with a build process
 
-Browsers cannot interpret or run ESNext and JSX syntaxes, so a transformation step is needed to convert these syntaxes to code that browsers can understand.
+Using a build process for block development unlocks the full potential of modern JavaScript, facilitating the use of ESNext and JSX.
 
-["webpack"](https://webpack.js.org/concepts/why-webpack/) is a pluggable tool that processes JavaScript and creates a compiled bundle that runs in a browser. ["babel"](https://babeljs.io/) transforms JavaScript from one format to another. Babel is a webpack plugin to transform ESNext and JSX to production-ready JavaScript.
+[ESNext](https://developer.mozilla.org/en-US/docs/Web/JavaScript/JavaScript_technologies_overview#standardization_process) refers to JavaScript's most recent syntax and features. [JSX](https://react.dev/learn/writing-markup-with-jsx) is a syntax extension developed by the React project that enables you to write JavaScript that resembles HTML.
 
-[`@wordpress/scripts`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/) package abstracts these libraries away to standardize and simplify development, so you won’t need to handle the details for configuring webpack or babel. Check the [Get started with wp-scripts](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/) intro guide.
+Since browsers cannot directly execute ESNext and JSX, these syntaxes must be transformed into browser-compatible JavaScript.
 
+[webpack](https://webpack.js.org/concepts/why-webpack/) is a pluggable tool that processes and bundles JavaScript for browser compatibility. [Babel](https://babeljs.io/), a plugin for webpack, converts ESNext and JSX into standard JavaScript.
 
-Among other things, with `wp-scripts` package you can use Javascript modules to distribute your code among different files and get a few bundled files at the end of the build process (see [example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/data-basics-59c8f8)).
+Configuring webpack and Babel can be challenging, so it's recommended that you use the [`@wordpress/scripts`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/) package. This tool simplifies development by preconfiguring both, so you rarely need to write custom webpack or Babel configurations.
 
-[![Build Process Diagram](https://developer.wordpress.org/files/2023/11/build-process.png)](https://excalidraw.com/#json=4aNG9JUti3pMnsfoga35b,ihEAI8p5dwkpjWr6gQmjuw "Open Build Process Diagram in Excalidraw")
+For an introduction, refer to the [Get started with wp-scripts](/docs/getting-started/devenv/get-started-with-wp-scripts.md) guide.
 
-With the [proper `package.json` scripts](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/#basic-usage) you can launch the build process with `wp-scripts` in production and development mode:
+### An overview of `wp-scripts`
 
-- **`npm run build` for "production" mode build** - This process [minifies the code](https://developer.mozilla.org/en-US/docs/Glossary/Minification) so it downloads faster in the browser. 
-- **`npm run start` for "development" mode build**  - This process does not minify the code of the bundled files, provides [source maps files](https://firefox-source-docs.mozilla.org/devtools-user/debugger/how_to/use_a_source_map/index.html) for them, and additionally continues a running process to watch the source file for more changes and rebuilds as you develop.
+The diagram below provides an overview of the build process when using the `wp-scripts` package. It's designed to work out of the box with [standard configurations](/docs/getting-started/devenv/get-started-with-wp-scripts.md#basic-usage) for development and production environments.
+
+[![Open Build Process diagram image](https://developer.wordpress.org/files/2023/11/build-process.png)](https://developer.wordpress.org/files/2023/11/build-process.png "Open Build Process diagram image")
+
+- **Production Mode (`npm run build`):** In this mode, `wp-scripts` compiles your JavaScript, minifying the output to reduce file size and improve loading times in the browser. This is ideal for deploying your code to a live site.
+
+- **Development Mode (`npm run start`):** This mode is tailored for active development. It skips minification for easier debugging, generates source maps for better error tracking, and watches your source files for changes. When a change is detected, it automatically rebuilds the affected files, allowing you to see updates in real-time.
+
+The `wp-scripts` package also facilitates the use of JavaScript modules, allowing code distribution across multiple files and resulting in a streamlined bundle after the build process. The [block-development-example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/data-basics-59c8f8) GitHub repository provides some good examples.
 
 <div class="callout callout-tip">
-    You can <a href="https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#provide-your-own-webpack-config">provide your own custom <code>webpack.config.js</code></a> to <code>wp-scripts</code> to customize the build process to suit your needs 
+    In most situations, no customization will be needed, but you can provide a <a href="https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#provide-your-own-webpack-config"><code>webpack.config.js</code></a> when using <code>wp-scripts</code> to modify the build process to suit your needs.
 </div>
 
-## Javascript without a build process
+## JavaScript without a build process
+
+Integrating JavaScript into your WordPress projects without a build process can be the most straightforward approach in specific scenarios. This is particularly true for projects that don't leverage JSX or other advanced JavaScript features requiring compilation.
+
+When you opt out of a build process, you interact directly with WordPress's [JavaScript APIs](/docs/reference-guides/packages/) through the global `wp` object. This means that all the methods and packages provided by WordPress are readily available, but with one caveat: you must manually manage script dependencies. This is done by adding [the handle](/docs/contributors/code/scripts.md) of each corresponding package to the dependency array of your enqueued JavaScript file.
 
-Using Javascript without a build process may be another good option for code developments with few requirements (especially those not requiring JSX). 
+For example, suppose you're creating a script that registers a new block [variation](/docs/reference-guides/block-api/block-variations.md) using the `registerBlockVariation` function from the [`blocks`](/docs/reference-guides/packages/packages-blocks.md) package. You must include `wp-blocks` in your script's dependency array. This guarantees that the `wp.blocks.registerBlockVariation` method is available and defined by the time your script executes.
 
-Without a build process, you access the methods directly from the `wp` global object and must enqueue the script manually. [WordPress Javascript packages](https://developer.wordpress.org/block-editor/reference-guides/packages/) can be accessed through the `wp` [global variable](https://developer.mozilla.org/en-US/docs/Glossary/Global_variable) but every script that wants to use them through this `wp` object is responsible for adding [the handle of that package](https://developer.wordpress.org/block-editor/contributors/code/scripts/) to the dependency array when registered.
+In the following example, the `wp-blocks` dependency is defined when enqueuing the `variations.js` file.
 
-So, for example if a script wants to register a block variation using the `registerBlockVariation` method out of the ["blocks" package](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-blocks/), the `wp-blocks` handle would need to get added to the dependency array to ensure that `wp.blocks.registerBlockVariation` is defined when the script tries to access it (see [example](https://github.com/wptrainingteam/block-theme-examples/blob/master/example-block-variation/functions.php)). 
+```php
+function example_enqueue_block_variations() {
+	wp_enqueue_script(
+		'example-enqueue-block-variations',
+		get_template_directory_uri() . '/assets/js/variations.js',
+		array( 'wp-blocks' ),
+		wp_get_theme()->get( 'Version' ),
+		false
+	);
+}
+add_action( 'enqueue_block_editor_assets', 'example_enqueue_block_variations' );
+```
+
+Then in the `variations.js` file, you can register a new variation for the Media & Text block like so:
+
+```js
+wp.blocks.registerBlockVariation(
+	'core/media-text',
+	{
+		name: 'media-text-custom',
+		title: 'Media & Text Custom',
+		attributes: {
+			align: 'wide',
+			backgroundColor: 'tertiary'
+		},
+	}
+);
+```
+
+For scripts that need to run in the Block Editor, make sure you use the [`enqueue_block_editor_assets`](https://developer.wordpress.org/reference/hooks/enqueue_block_editor_assets/) hook coupled with the standard [`wp_enqueue_script`](https://developer.wordpress.org/reference/functions/wp_enqueue_script/) function.
+
+Refer to [Enqueueing assets in the Editor](/docs/how-to-guides/enqueueing-assets-in-the-editor.md) for more information. You can also visit the [block-development-example](https://github.com/wptrainingteam/block-theme-examples/blob/master/example-block-variation/functions.php) GitHub repository for more practical examples.
 
 <div class="callout callout-tip">
-    Try running <code>wp.data.select('core/editor').getBlocks())</code> in your browser's dev tools while editing a post or a site. The entire editor is available from the console.
+    Open your browser's dev tools and try running <code>wp.data.select('core/editor').getBlocks()</code> in the console when editing a post or when using the Site Editor. This command will return all available blocks.
 </div>
 
-Use [`enqueue_block_editor_assets`](https://developer.wordpress.org/reference/hooks/enqueue_block_editor_assets/) hook coupled with the standard [`wp_enqueue_script`](https://developer.wordpress.org/reference/functions/wp_enqueue_script/) (and [`wp_register_script`](https://developer.wordpress.org/reference/functions/wp_register_script/)) to enqueue javascript assets for the Editor with access to these packages via `wp` (see [example](https://github.com/wptrainingteam/block-theme-examples/tree/master/example-block-variation)). Refer to [Enqueueing assets in the Editor](https://developer.wordpress.org/block-editor/how-to-guides/enqueueing-assets-in-the-editor/) for more info.
-
 ## Additional resources
 
-- [Get started with wp-scripts](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/) 
-- [Enqueueing assets in the Editor](https://developer.wordpress.org/block-editor/how-to-guides/enqueueing-assets-in-the-editor/) 
-- [Wordpress Packages handles](https://developer.wordpress.org/block-editor/contributors/code/scripts/) 
-- [Javascript Reference](https://developer.mozilla.org/en-US/docs/Web/JavaScript) | MDN Web Docs
+- [Package reference](/docs/reference-guides/packages.md)
+- [Get started with wp-scripts](/docs/getting-started/devenv/get-started-with-wp-scripts.md)
+- [Enqueueing assets in the Editor](/docs/how-to-guides/enqueueing-assets-in-the-editor.md)
+- [WordPress package handles](/docs/contributors/code/scripts.md)
+- [JavaScript reference](https://developer.mozilla.org/en-US/docs/Web/JavaScript) | MDN Web Docs
 - [block-development-examples](https://github.com/WordPress/block-development-examples) | GitHub repository
 - [block-theme-examples](https://github.com/wptrainingteam/block-theme-examples) | GitHub repository
 - [How webpack and WordPress packages interact](https://developer.wordpress.org/news/2023/04/how-webpack-and-wordpress-packages-interact/) | Developer Blog
+- [Build process diagram](https://excalidraw.com/#json=4aNG9JUti3pMnsfoga35b,ihEAI8p5dwkpjWr6gQmjuw)
diff --git a/docs/getting-started/fundamentals/markup-representation-block.md b/docs/getting-started/fundamentals/markup-representation-block.md
new file mode 100644
index 00000000000000..b9cbb528b49db8
--- /dev/null
+++ b/docs/getting-started/fundamentals/markup-representation-block.md
@@ -0,0 +1,51 @@
+# Markup representation of a block
+
+Blocks are stored in the database or within HTML templates using a unique [HTML-based syntax](https://developer.wordpress.org/block-editor/explanations/architecture/key-concepts/#data-and-attributes), distinguished by HTML comments that serve as clear block delimiters. This ensures that block markup is technically valid HTML.
+
+Here are a few guidelines for the markup that defines a block:
+
+- Core blocks begin with the `wp:` prefix, followed by the block name (e.g., `wp:image`). Notably, the `core` namespace is omitted.
+- Custom blocks begin with the `wp:` prefix, followed by the block namespace and name (e.g., `wp:namespace/name`).
+- The comment can be a single line, self-closing, or wrapper for HTML content.
+- Block settings and attributes are stored as a JSON object inside the block comment.
+
+The following is the simplified markup representation of an Image block:
+
+```html
+<!-- wp:image {"sizeSlug":"large"} -->
+<figure class="wp-block-image size-large">
+    <img src="source.jpg" alt="" />
+</figure>
+<!-- /wp:image -->
+```
+
+The markup for a block is crucial both in the Block Editor and for displaying the block on the front end:
+
+- WordPress analyzes the block's markup within the Editor to extract its data and present the editable version to the user.
+- On the front end, WordPress again parses the markup to extract data and render the final HTML output.
+
+<div class="callout callout-tip">
+    Refer to the <a href="https://developer.wordpress.org/block-editor/explanations/architecture/data-flow/">Data Flow</a> article for a more in-depth look at how block data is parsed in WordPress.
+</div>
+
+When a block is saved, the `save` function—defined when the [block is registered in the client](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-javascript-client-side)—is executed to generate the markup stored in the database, wrapped in block delimiter comments. For dynamically rendered blocks, which typically set `save` to `null`, only a placeholder comment with block attributes is saved.
+
+Here is the markup representation of a dynamically rendered block (`save` = `null`). Notice there is no HTML markup besides the comment.
+
+```html
+<!-- wp:latest-posts {"postsToShow":4,"displayPostDate":true} /-->
+```
+
+When a block has a `save` function, the Block Editor checks that the markup created by the `save` function is identical to the block's markup saved to the database:
+
+- Discrepancies will trigger a [validation error](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#validation), often due to changes in the `save` function's output.
+- Developers can address potential validation issues by implementing [block deprecations](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-deprecation/) to account for changes.
+
+As the example above shows, the stored markup is minimal for dynamically rendered blocks. Generally, this is just a delimiter comment containing block attributes, which is not subject to the Block Editor's validation. This approach reflects the dynamic nature of these blocks, where the actual HTML is generated server-side and is not stored in the database.
+
+## Additional resources
+
+- [Data Flow and Data Format](https://developer.wordpress.org/block-editor/explanations/architecture/data-flow/)
+- [Static vs. dynamic blocks: What’s the difference?](https://developer.wordpress.org/news/2023/02/27/static-vs-dynamic-blocks-whats-the-difference/) | Developer Blog
+- [Block deprecation – a tutorial](https://developer.wordpress.org/news/2023/03/10/block-deprecation-a-tutorial/) | Developer Blog
+- [Introduction to Templates > Block markup](https://developer.wordpress.org/themes/templates/introduction-to-templates/#block-markup) | Theme Handbook 
\ No newline at end of file
diff --git a/docs/getting-started/fundamentals/registration-of-a-block.md b/docs/getting-started/fundamentals/registration-of-a-block.md
index a330d46e676d5c..5c80422f6f8574 100644
--- a/docs/getting-started/fundamentals/registration-of-a-block.md
+++ b/docs/getting-started/fundamentals/registration-of-a-block.md
@@ -1,80 +1,79 @@
 # Registration of a block
 
-A block is usually registered through a plugin on both the server and client-side using its `block.json` metadata. 
+Blocks in WordPress are typically bundled in a plugin and registered on both the server and client-side using `block.json` metadata.
 
-Although technically, blocks could be registered only in the client, **registering blocks on both the server and in the client is a strong recommendation**. Some server-side features like Dynamic Rendering, Block Supports, Block Hooks, or Block style variations require the block to "exist" on the server, and they won't work properly without server registration of the block.
+While it's possible to register blocks solely on the client-side, best practices strongly advise registering them on both the server and client. This dual registration is crucial for enabling server-side features such as Dynamic Rendering, Block Supports, Block Hooks, and Style Variations. Without server-side registration, these functionalities will not operate correctly.
 
-For example, to allow a block [to be styled via `theme.json`](https://developer.wordpress.org/themes/global-settings-and-styles/settings/blocks/), it needs to be registered on the server, otherwise, any styles assigned to it in `theme.json` will be ignored. 
+For instance, if you want a block [to be styled via `theme.json`](https://developer.wordpress.org/themes/global-settings-and-styles/settings/blocks/), it must be registered on the server. Otherwise, the block won't recognize or apply any styles assigned to it in `theme.json`.
 
-[![Open Block Registration diagram in excalidraw](https://developer.wordpress.org/files/2023/11/block-registration-e1700493399839.png)](https://excalidraw.com/#json=PUQu7jpvbKsUHYfpHWn7s,61QnhpZtjykp3s44lbUN_g "Open Block Registration diagram in excalidraw")
+The following diagram details the registration process for a block.
 
-### Registration of the block with PHP (server-side)
+[![Open Block Registration diagram image](https://developer.wordpress.org/files/2023/11/block-registration-e1700493399839.png)](https://developer.wordpress.org/files/2023/11/block-registration-e1700493399839.png "Open Block Registration diagram image")
 
-Block registration on the server usually takes place in the main plugin PHP file with the `register_block_type` function called on the [init hook](https://developer.wordpress.org/reference/hooks/init/).
+## Registering a block with PHP (server-side)
 
-The [`register_block_type`](https://developer.wordpress.org/reference/functions/register_block_type/) function aims to simplify block type registration on the server by reading metadata stored in the `block.json` file.
+Block registration on the server usually takes place in the main plugin PHP file with the [`register_block_type()`](https://developer.wordpress.org/reference/functions/register_block_type/) function called on the [`init`](https://developer.wordpress.org/reference/hooks/init/) hook. This function simplifies block type registration by reading metadata stored in a `block.json` file.
 
-This function takes two params relevant in this context (`$block_type` accepts more types and variants):
+This function is designed to register block types and primarily uses two parameters in this context, although it can accommodate more variations:
 
--   `$block_type` (`string`) – path to the folder where the `block.json` file is located or full path to the metadata file if named differently.
--   `$args` (`array`) – an optional array of block type arguments. Default value: `[]`. Any arguments may be defined. However, the one described below is supported by default:
-    -   `$render_callback` (`callable`) – callback used to render blocks of this block type, it's an alternative to the `render` field in `block.json`.
+- **`$block_type` (`string`):** This can either be the path to the directory containing the `block.json` file or the complete path to the metadata file if it has a different name. This parameter tells WordPress where to find the block's configuration.
 
-As part of the build process, the `block.json` file is usually copied from the `src` folder to the `build` folder, so the path to the `block.json` of your registered block should refer to the `build` folder.
+- **`$args` (`array`):** This is an optional parameter where you can specify additional arguments for the block type. By default, this is an empty array, but it can include various options, one of which is the `$render_callback`. This callback is used to render blocks on the front end and is an alternative to the `render` property in `block.json`.
 
-`register_block_type` returns the registered block type (`WP_Block_Type`) on success or `false` on failure.
+During the development process, the `block.json` file is typically moved from the `src` (source) directory to the `build` directory as part of compiling your code. Therefore, when registering your block, ensure the `$block_type` path points to the `block.json` file within the `build` directory.
+
+The `register_block_type()` function returns the registered block type (`WP_Block_Type`) on success or `false` on failure. Here is a simple example using the `render_callback`.
 
-**Example:**
 ```php
 register_block_type(
-	__DIR__ . '/notice',
+	__DIR__ . '/build',
 	array(
 		'render_callback' => 'render_block_core_notice',
 	)
 );
 ```
 
-**Example:**
+Here is a more complete example, including the `init` hook.
+
 ```php
 function minimal_block_ca6eda___register_block() {
 	register_block_type( __DIR__ . '/build' );
 }
-
 add_action( 'init', 'minimal_block_ca6eda___register_block' );
 ```
-_See the [full block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/minimal-block-ca6eda) of the  [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/minimal-block-ca6eda/index.php)_
 
-### Registration of the block with JavaScript (client-side)
+_See the [full block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/minimal-block-ca6eda) of the  [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/minimal-block-ca6eda/index.php)_
 
-When the block is registered on the server, you only need to register the client-side settings on the client using the same block’s name.
+## Registering a block with JavaScript (client-side)
 
-**Example:**
+When the block has already been registered on the server, you only need to register the client-side settings in JavaScript using the [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-blocks/#registerblocktype) method from the `@wordpress/blocks` package. You just need to make sure you use the same block name as defined in the block's `block.json` file. Here's an example:
 
 ```js
+import { registerBlockType } from '@wordpress/blocks';
+
 registerBlockType( 'my-plugin/notice', {
 	edit: Edit,
 	// ...other client-side settings
 } );
 ```
 
-Although registering the block also on the server with PHP is still recommended for the reasons mentioned at ["Benefits using the metadata file"](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#benefits-using-the-metadata-file), if you want to register it only client-side you can use [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-blocks/#registerblocktype) method from `@wordpress/blocks` package to register a block type using the metadata loaded from `block.json` file.
+While it's generally advised to register blocks on the server using PHP for the benefits outlined in the ["Benefits using the metadata file"](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#benefits-using-the-metadata-file) section, you can opt to register a block solely on the client-side. The `registerBlockType` method allows you to register a block type using metadata.
 
-The function takes two params:
+The function accepts two parameters:
 
--   `$blockNameOrMetadata` (`string`|`Object`) – block type name or the metadata object loaded from the `block.json`
--   `$settings` (`Object`) – client-side block settings.
+- **`blockNameOrMetadata` (`string`|`Object`):** This can either be the block type's name as a string or an object containing the block's metadata, which is typically loaded from the `block.json` file.
+- **`settings` (`Object`):** This is an object containing the block's client-side settings.
 
 <div class="callout callout-tip">
-The content of <code>block.json</code> (or any other <code>.json</code> file) can be imported directly into Javascript files when using <a href="https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/#the-build-process-with-wp-scripts">a build process like the one available with <code>wp-scripts</code></a>
+	You can import the contents of the <code>block.json</code> file (or any other <code>.json</code> file) directly into your JavaScript files if you're using a build process, such as the one provided by <a href="https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/#the-build-process-with-wp-scripts"><code>wp-scripts</code></a>.
 </div>
 
-The client-side block settings object passed as a second parameter includes two especially relevant properties:
-- `edit`: The React component that gets used in the editor for our block.
-- `save`: The function that returns the static HTML markup that gets saved to the Database. 
+The `settings` object passed as the second parameter includes many properties, but these are the two most important ones:
 
-`registerBlockType` returns the registered block type (`WPBlock`) on success or `undefined` on failure.
+- **`edit`:** The React component that gets used in the Editor for our block.
+- **`save`:** The function that returns the static HTML markup that gets saved to the database.
 
-**Example:**
+The `registerBlockType()` function returns the registered block type (`WPBlock`) on success or `undefined` on failure. Here's an example:
 
 ```js
 import { registerBlockType } from '@wordpress/blocks';
@@ -89,10 +88,12 @@ registerBlockType( metadata.name, {
 	save,
 } );
 ```
-_See the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/minimal-block-ca6eda/src/index.js) in [an example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/minimal-block-ca6eda)_
+
+_See the [full block example](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/minimal-block-ca6eda) of the [code above](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/minimal-block-ca6eda/src/index.js)_
 
 ## Additional resources
 
 - [`register_block_type` PHP function](https://developer.wordpress.org/reference/functions/register_block_type/)
 - [`registerBlockType` JS function](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-blocks/#registerblocktype)
 - [Why a block needs to be registered in both the server and the client?](https://github.com/WordPress/gutenberg/discussions/55884) | GitHub Discussion
+- [Block Registration diagram](https://excalidraw.com/#json=PUQu7jpvbKsUHYfpHWn7s,61QnhpZtjykp3s44lbUN_g)
diff --git a/docs/getting-started/fundamentals/static-dynamic-rendering.md b/docs/getting-started/fundamentals/static-dynamic-rendering.md
new file mode 100644
index 00000000000000..dfb6a7123b44b3
--- /dev/null
+++ b/docs/getting-started/fundamentals/static-dynamic-rendering.md
@@ -0,0 +1,179 @@
+# Static or Dynamic rendering of a block
+
+A block's front-end markup can either be dynamically generated server-side upon request (dynamic blocks) or statically generated during the save process in the Block Editor (static blocks). This article explores each method.
+
+<div class="callout callout-tip">
+The post <a href="https://developer.wordpress.org/news/2023/02/27/static-vs-dynamic-blocks-whats-the-difference/">Static vs. dynamic blocks: What’s the difference?</a> provides a great introduction to this topic.
+</div>
+
+## Static rendering
+
+Blocks with "static rendering" produce front-end output that is fixed and stored in the database upon saving. These blocks rely solely on their `save` function to define their [HTML markup](https://developer.wordpress.org/block-editor/getting-started/fundamentals/markup-representation-block/), which remains unchanged unless manually edited in the Block Editor.
+
+If a block does not use a dynamic rendering method—meaning it doesn't generate content on the fly via PHP when the page loads—it's considered a "static block."
+
+The diagram below illustrates how static block content is saved in the database and then retrieved and rendered as HTML on the front end.
+
+![Blocks with static rendering diagram](https://developer.wordpress.org/files/2024/01/static-rendering.png)
+
+### How to define static rendering for a block
+
+The `save` function, which can be defined when [registering a block on the client](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-javascript-client-side), specifies the block's HTML structure that gets saved in the database whenever you save the block in the Editor. This saved HTML is then used to display the block on the front end.
+
+Blocks in WordPress are encapsulated within special comment tags that serve as unique [block delimiters](https://developer.wordpress.org/block-editor/getting-started/fundamentals/markup-representation-block/). However, only the HTML defined in the static block's `save` function—excluding these delimiters—is rendered.
+
+<details><summary><strong>View an example of static rendering in the Preformatted block</strong></summary>
+<br/>
+The following <a href="https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/preformatted/save.js"><code>save</code> function</a> for the <a href="https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/preformatted">Preformatted</a> core block looks like this:
+
+```js
+import { RichText, useBlockProps } from '@wordpress/block-editor';
+
+export default function save( { attributes } ) {
+	const { content } = attributes;
+
+	return (
+		<pre { ...useBlockProps.save() }>
+			<RichText.Content value={ content } />
+		</pre>
+	);
+}
+```
+
+The function generates the following markup representation of the block when `attributes.content` has the value `"This is some preformatted text"`:
+
+```html
+<!-- wp:preformatted -->
+<pre class="wp-block-preformatted">This is some preformatted text</pre>
+<!-- /wp:preformatted -->
+```
+
+On the front end, the block will return the following markup. Notice how the delimiters are no longer present.
+
+```html
+<pre class="wp-block-preformatted">This is some preformatted text</pre>
+```
+</details>
+<br/>
+
+Dynamic blocks, which we'll explore in the following section, can specify an initial HTML structure through a `save` function, similar to static blocks. However, dynamic blocks primarily rely on server-side rendering to generate their content. If, for any reason, the dynamic rendering isn't available—perhaps due to the block's plugin being deactivated—the system will fall back to using the HTML structure saved in the database to display the block on the front end.
+
+For a practical demonstration of how this works, refer to the [Building your first block](/docs/getting-started/tutorial.md) tutorial. Specifically, the [Adding static rendering](/docs/getting-started/tutorial.md#adding-static-rendering) section illustrates how a block can have both a saved HTML structure and dynamic rendering capabilities.
+
+<div class="callout callout-info">
+WordPress provides mechanisms like the <a href="https://developer.wordpress.org/reference/functions/render_block/"><code>render_block</code></a> and the <a href="https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/creating-dynamic-blocks/"><code>render_callback</code></a> function to alter the saved HTML of a block before it appears on the front end. These tools offer developers the capability to customize block output dynamically, catering to complex and interactive user experiences.
+</div>
+
+Additional examples of WordPress blocks that use static rendering, meaning their output is fixed at the time of saving and doesn't rely on server-side processing, include:
+
+- [Separator](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/separator/save.js)
+- [Spacer](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/spacer/save.js)
+- [Button](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/button/save.js)
+
+
+## Dynamic rendering
+
+Blocks with "dynamic rendering" are designed to generate their content and structure in real-time when requested on the front end. Unlike static blocks, which have a fixed HTML structure saved in the database, "dynamic blocks" rely on server-side processing to construct their output dynamically, making them highly versatile and suitable for content that needs to be updated frequently or is dependent on external data.
+
+The diagram below illustrates how the representation of a dynamic block is saved in the database and then retrieved and dynamically rendered as HTML on the front end.
+
+![Blocks with dynamic rendering diagram](https://developer.wordpress.org/files/2024/01/dynamic-rendering.png)
+
+There are some common use cases for dynamic blocks:
+
+1. **Blocks where content should change even if a post has not been updated:** An example is the [Latest Posts](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/latest-posts) block, which will automatically update whenever a new post is published.
+2. **Blocks where updates to the markup should be immediately shown on the front end:** If you update the structure of a block by adding a new class, adding an HTML element, or changing the layout in any other way, using a dynamic block ensures those changes are applied immediately on all occurrences of that block across the site. Without dynamic blocks, similar updates could trigger [validation errors](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#validation) in the Block Editor.
+
+### How to define dynamic rendering for a block
+
+A block can define dynamic rendering in two main ways:
+
+1. Using the `render_callback` argument that can be passed to the [`register_block_type()`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-php-server-side) function.
+2. Using a separate PHP file usually named `render.php`. This file's path should be defined using the [`render`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#files-for-the-blocks-behavior-output-or-style) property in the `block.json` file.
+
+Both of these methods receive the following data:
+
+ - `$attributes`: The array of attributes for the block.
+ - `$content`: The markup of the block as stored in the database, if any.
+ - `$block`: The instance of the [WP_Block](https://developer.wordpress.org/reference/classes/wp_block/) class that represents the rendered block ([metadata of the block](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/)).
+
+<details><summary><strong>View an example of dynamic rendering in the Site Title block</strong></summary>
+<br/>
+
+The [Site Title](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/site-title) block uses the following [`render_callback`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/site-title/index.php):
+
+```php
+function render_block_core_site_title( $attributes ) {
+	$site_title = get_bloginfo( 'name' );
+	if ( ! $site_title ) {
+		return;
+	}
+
+	$tag_name = 'h1';
+	$classes  = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes .= ' has-link-color';
+	}
+
+	if ( isset( $attributes['level'] ) ) {
+		$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . (int) $attributes['level'];
+	}
+
+	if ( $attributes['isLink'] ) {
+		$aria_current = is_home() || ( is_front_page() && 'page' === get_option( 'show_on_front' ) ) ? ' aria-current="page"' : '';
+		$link_target  = ! empty( $attributes['linkTarget'] ) ? $attributes['linkTarget'] : '_self';
+
+		$site_title = sprintf(
+			'<a href="%1$s" target="%2$s" rel="home"%3$s>%4$s</a>',
+			esc_url( home_url() ),
+			esc_attr( $link_target ),
+			$aria_current,
+			esc_html( $site_title )
+		);
+	}
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classes ) ) );
+
+	return sprintf(
+		'<%1$s %2$s>%3$s</%1$s>',
+		$tag_name,
+		$wrapper_attributes,
+		// already pre-escaped if it is a link.
+		$attributes['isLink'] ? $site_title : esc_html( $site_title )
+	);
+}
+```
+
+However, there is no `save` function defined for this block, as you can see from its [`index.js`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/site-title/index.js) file, which means the markup representation of the block in the database looks like this:
+
+```html
+<!-- wp:site-title /-->
+```
+
+On the front end, the `render_callback` is used to dynamically render the markup for the block depending on the specific values on the server at the time the block is requested. These values include the current site title, URL, link target, etc.
+
+```
+<h1 class="wp-block-site-title"><a href="https://www.wp.org" target="_self" rel="home">My WordPress Website</a></h1>
+```
+
+</details>
+<br/>
+
+### HTML representation of dynamic blocks in the database (`save`)
+
+For dynamic blocks, the `save` callback function can return just `null`, which tells the editor to save only the block delimiter comment (along with any existing [block attributes](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/)) to the database. These attributes are then passed into the server-side rendering callback, which will determine how to display the block on the front end of your site.
+
+When `save` is `null`, the Block Editor will skip the [block markup validation process](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#validation), avoiding issues with frequently changing markup.
+
+Blocks with dynamic rendering can also save an HTML representation of the block as a backup. If you provide a server-side rendering callback, the HTML representing the block in the database will be replaced with the output of your callback but will be rendered if your block is deactivated (the plugin that registers the block is uninstalled), or your render callback is removed.
+
+In some cases, the block saves an HTML representation of the block and uses a dynamic rendering to fine-tune this markup if some conditions are met. Some examples of core blocks using this approach are:
+
+- The [Cover](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/cover) block [saves](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/cover/save.js) a full HTML representation of the block in the database. This markup is processed via a [`render_callback`](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/cover/index.php#L74), which [dynamically injects](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/cover/index.php#L16) the featured image if the "Use featured image" setting is enabled.
+- The [Image](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/image) block also [saves](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/image/save.js) its HTML representation in the database. This markup is processed via a [`render_callback`](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/image/index.php#L363), which [adds additional attributes](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/image/index.php#L18) to the markup if specific conditions are met.
+
+If you are using [InnerBlocks](https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/nested-blocks-inner-blocks/) in a dynamic block, you will need to save the `InnerBlocks` in the `save` callback function using `<InnerBlocks.Content/>`.
+
+## Additional resources
+
+- [Static vs. dynamic blocks: What’s the difference?](https://developer.wordpress.org/news/2023/02/27/static-vs-dynamic-blocks-whats-the-difference/) | Developer Blog
+- [Block deprecation – a tutorial](https://developer.wordpress.org/news/2023/03/10/block-deprecation-a-tutorial/) | Developer Blog
diff --git a/docs/getting-started/glossary.md b/docs/getting-started/glossary.md
index bff8925e4619e1..3c7ba7f722c445 100644
--- a/docs/getting-started/glossary.md
+++ b/docs/getting-started/glossary.md
@@ -70,7 +70,7 @@ This refers to a collection of features that ultimately allows users to edit the
 
 The CSS styles generated by WordPress and enqueued as an embedded stylesheet in the front end of the site. The stylesheet ID is `global-styles-inline-css`. The contents of this stylesheet come from the default `theme.json` of WordPress, the theme's `theme.json`, and the styles provided by the user via the global styles sidebar in the site editor.
 
-See [theme.json reference docs](/docs/reference-guides/theme-json-reference.md)</a>, the [how to guide](/docs/how-to-guides/themes/theme-json.md), and an introduction to [styles in the block editor](/docs/explanations/architecture/styles.md).
+See [theme.json reference docs](/docs/reference-guides/theme-json-reference/README.md)</a>, the [how to guide](/docs/how-to-guides/themes/global-settings-and-styles.md), and an introduction to [styles in the block editor](/docs/explanations/architecture/styles.md).
 
 Compare to <a href="#block-styles">block styles</a>.
 
diff --git a/docs/getting-started/quick-start-guide.md b/docs/getting-started/quick-start-guide.md
index e978b250ab8aff..d218d0ee806070 100644
--- a/docs/getting-started/quick-start-guide.md
+++ b/docs/getting-started/quick-start-guide.md
@@ -1,6 +1,8 @@
 # Quick Start Guide
 
-This guide is designed to demonstrate the basic principles of block development in WordPress using a hands-on approach. Following the steps below, you will create a custom block plugin that uses modern JavaScript (ESNext and JSX) in a matter of minutes. The example block displays the copyright symbol (©) and the current year, the perfect addition to any website's footer.
+This guide is designed to demonstrate the basic principles of block development in WordPress using a hands-on approach. Following the steps below, you will create a custom block plugin that uses modern JavaScript (ESNext and JSX) in a matter of minutes. The example block displays the copyright symbol (©) and the current year, the perfect addition to any website's footer. You can see these steps in action through this short video demonstration.
+
+<iframe width="960" height="540" src="https://www.youtube.com/embed/nrut8SfXA44?si=YxvmHmAoYx-BDCog" title="WordPress Block Development: Quick Start Guide Video" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen="true"></iframe>
 
 ## Scaffold the block plugin
 
@@ -25,7 +27,7 @@ Navigate to the Plugins page of your local WordPress installation and activate t
 
 ## Basic usage
 
-With the plugin activated, you can  explore how the block works. Use the following command to move into the newly created plugin folder and start the development process.
+With the plugin activated, you can explore how the block works. Use the following command to move into the newly created plugin folder and start the development process.
 
 ```sh
 cd copyright-date-block && npm start
@@ -37,6 +39,14 @@ The `npm start` command will start a development server and watch for changes in
 
 When you are finished making changes, run the `npm run build` command. This optimizes the block code and makes it production-ready.
 
+## View the block in action
+
+You can use any local WordPress development environment to test your new block, but the scaffolded plugin includes configuration for `wp-env`. You must have [Docker](https://www.docker.com/products/docker-desktop) already installed and running on your machine, but if you do, run the `npx wp-env start` command. 
+
+Once the script finishes running, you can access the local environment at: <code>http://localhost:8888</code>. Log into the WordPress dashboard using username `admin` and password `password`. The plugin will already be installed and activated. Open the Editor or Site Editor, and insert the Copyright Date Block as you would any other block.
+
+Visit the [Getting started](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-env/) guide to learn more about `wp-env`.
+
 ## Additional resources
 
 - [Get started with create-block](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-create-block/)
diff --git a/docs/getting-started/tutorial.md b/docs/getting-started/tutorial.md
new file mode 100644
index 00000000000000..4e43241f63fb16
--- /dev/null
+++ b/docs/getting-started/tutorial.md
@@ -0,0 +1,1010 @@
+# Tutorial: Build your first block
+
+In this tutorial, you will build a "Copyright Date Block"—a basic yet practical block that displays the copyright symbol (©), the current year, and an optional starting year. This type of content is commonly used in website footers.
+
+The tutorial will guide you through the complete process, from scaffolding the block plugin using the [`create-block`](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-create-block/) package to modifying each file. While previous WordPress development experience is beneficial, it's not a prerequisite for this tutorial.
+
+By the end of this guide, you will have a clear understanding of block development fundamentals and the necessary skills to create your own WordPress blocks.
+
+## What you're going to build
+
+Here's a quick look at what you're going to build.
+
+![What you're going to build](https://developer.wordpress.org/files/2023/12/block-tutorial-1.png)
+
+You can also interact with the finished project in [WordPress Playground](https://playground.wordpress.net/?blueprint-url=https://raw.githubusercontent.com/WordPress/block-development-examples/trunk/plugins/copyright-date-block-09aac3/_playground/blueprint.json) or use the [Quick Start Guide](https://developer.wordpress.org/block-editor/getting-started/quick-start-guide/) to install the complete block plugin in your local WordPress environment.
+
+## Prerequisites
+
+To complete this tutorial, you will need:
+
+1. Code editor
+2. Node.js development tools
+3. Local WordPress environment
+
+If you don't have one or more of these items, the [Block Development Environment](https://developer.wordpress.org/block-editor/getting-started/devenv/) documentation will help you get started. Come back here once you are all set up.
+
+<div class="callout callout-info">
+	This tutorial uses <a href="https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-env/"><code>wp-env</code></a> to create a local WordPress development environment. However, feel free to use any development environment that meets the abovementioned prerequisites.
+</div>
+
+## Scaffolding the block
+
+The first step in creating the Copyright Date Block is to scaffold the initial block structure using the [`@wordpress/create-block`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-create-block/) package.
+
+<div class="callout callout-info">
+	Review the <a href="https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-create-block/">Get started with create-block</a> documentation for an introduction to using this package.
+</div>
+
+You can use `create-block` from just about any directory (folder) on your computer and then use `wp-env` to create a local WordPress development environment with your new block plugin installed and activated.
+
+Therefore, choose a directory to place the block plugin or optionally create a new folder called "Block Tutorial". Open your terminal and `cd` to this directory. Then run the following command.
+
+<div class="callout callout-info">
+	If you are not using <code>wp-env</code>, instead, navigate to the <code>plugins/</code> folder in your local WordPress installation using the terminal and run the following command.
+</div>
+
+```bash
+npx @wordpress/create-block@latest copyright-date-block --variant=dynamic
+cd copyright-date-block
+```
+
+After executing this command, you'll find a new directory named `copyright-date-block` in the plugins folder. This directory contains all the initial files needed to start customizing your block.
+
+This command also sets up the basic structure of your block, with `copyright-date-block` as its slug. This slug uniquely identifies your block within WordPress.
+
+<div class="callout callout-info">
+	You might have noticed that the command uses the <code>--variant=dynamic</code> flag. This tells <code>create-block</code> you want to scaffold a dynamically rendered block. Later in this tutorial, you will learn about dynamic and static rendering and add static rendering to this block.
+</div>
+
+Navigate to the Plugins page in the WordPress admin and confirm that the plugin is active. Then, create a new page or post and ensure you can insert the Copyright Date Block. It should look like this once inserted.
+
+![The scaffolded block in the Editor](https://developer.wordpress.org/files/2023/12/block-tutorial-2.png)
+
+## Reviewing the files
+Before we begin modifying the scaffolded block, it's important to review the plugin's file structure. Open the plugin folder in your code editor.
+
+![The files that make up the block plugin](https://developer.wordpress.org/files/2023/12/block-tutorial-3.png)
+
+Next, look at the [File structure of a block](https://developer.wordpress.org/block-editor/getting-started/fundamentals/file-structure-of-a-block/) documentation for a thorough overview of what each file does. Don't worry if this is overwhelming right now. You will learn how to use each file throughout this tutorial.
+
+<div class="callout callout-info">
+	Since you scaffolded a dynamic block, you will not see a <code>save.js</code> file. Later in the tutorial, you will add this file to the plugin to enable static rendering, so stay tuned.
+</div>
+
+## Initial setup
+
+Let's start by creating the simplest Copyright Date Block possible, which will be a dynamically rendered block that simply displays the copyright symbol (©) and the current year. We'll also add a few controls allowing the user to modify font size and text color.
+
+Before proceeding to the following steps, run `npm run start` in the terminal from within the plugin directory. This command will watch each file in the `/src` folder for changes. The block's build files will be updated each time you save a file.
+
+Check out the [Working with JavaScript for the Block Editor](https://developer.wordpress.org/block-editor/getting-started/fundamentals/javascript-in-the-block-editor/) documentation to learn more.
+
+### Updating block.json
+
+Open the `block.json` file in the `/src` folder.
+
+```json
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
+	"name": "create-block/copyright-date-block",
+	"version": "0.1.0",
+	"title": "Copyright Date Block",
+	"category": "widgets",
+	"icon": "smiley",
+	"description": "Example block scaffolded with Create Block tool.",
+	"example": {},
+	"supports": {
+		"html": false
+	},
+	"textdomain": "copyright-date-block",
+	"editorScript": "file:./index.js",
+	"editorStyle": "file:./index.css",
+	"style": "file:./style-index.css",
+	"render": "file:./render.php",
+	"viewScript": "file:./view.js"
+}
+```
+
+<div class="callout callout-info">
+	Review the <a href="https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/">block.json</a> documentation for an introduction to this file.
+</div>
+
+Since this scaffolding process created this file, it requires some updating to suit the needs of the Copyright Date Block.
+
+#### Modifying the block identity
+
+Begin by removing the icon and adding a more appropriate description. You will add a custom icon later.
+
+1. Remove the line for `icon`
+2. Update the description to "Display your site's copyright date."
+3. Save the file
+
+After you refresh the Editor, you should now see that the block no longer has the smiley face icon, and its description has been updated.
+
+![The block in the Editor with updated information](https://developer.wordpress.org/files/2023/12/block-tutorial-4.png)
+
+#### Adding block supports
+
+Next, let's add a few [block supports](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/) so that the user can control the font size and text color of the block.
+
+<div class="callout callout-tip">
+	You should always try to use native block supports before building custom functionality. This approach provides users with a consistent editing experience across blocks, and your block benefits from Core functionality with only a few lines of code.
+</div>
+
+Update the [`supports`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#enable-ui-settings-panels-for-the-block-with-supports) section of the `block.json` file to look like this.
+
+```json
+"supports": {
+	"color": {
+		"background": false,
+		"text": true
+	},
+	"html": false,
+	"typography": {
+		"fontSize": true
+	}
+},
+```
+
+Note that when you enable text color support with `"text": true`, the background color is also enabled by default. You are welcome to keep it enabled, but it's not required for this tutorial, so you can manually set `"background": false`.
+
+Save the file and select the block in the Editor. You will now see both Color and Typography panels in the Settings Sidebar. Try modifying the settings and see what happens.
+
+![The block in the Editor with block supports](https://developer.wordpress.org/files/2023/12/block-tutorial-5.png)
+
+#### Removing unnecessary code
+
+For simplicity, the styling for the Copyright Date Block will be controlled entirely by the color and typography block supports. This block also does not have any front-end JavaScript. Therefore, you don't need to specify stylesheets or a `viewScript` in the `block.json` file.
+
+1. Remove the line for `editorStyle`
+2. Remove the line for `style`
+3. Remove the line for `viewScript`
+4. Save the file
+
+Refresh the Editor, and you will see that the block styling now matches your current theme.
+
+![The block in the Editor without default styling](https://developer.wordpress.org/files/2023/12/block-tutorial-6.png)
+
+#### Putting it all together
+
+Your final `block.json` file should look like this:
+
+```json
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
+	"name": "create-block/copyright-date-block",
+	"version": "0.1.0",
+	"title": "Copyright Date Block",
+	"category": "widgets",
+	"description": "Display your site's copyright date.",
+	"example": {},
+	"supports": {
+		"color": {
+			"background": false,
+			"text": true
+		},
+		"html": false,
+		"typography": {
+			"fontSize": true
+		}
+	},
+	"textdomain": "copyright-date-block",
+	"editorScript": "file:./index.js",
+	"render": "file:./render.php"
+}
+```
+
+### Updating index.js
+
+Before you start building the functionality of the block itself, let's do a bit more cleanup and add a custom icon to the block.
+
+Open the [`index.js`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/file-structure-of-a-block/#index-js) file. This is the main JavaScript file of the block and is used to register it on the client. You can learn more about client-side and server-side registration in the [Registration of a block](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/) documentation.
+
+Start by looking at the [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/) function. This function accepts the name of the block, which we are getting from the imported `block.json` file, and the block configuration object.
+
+```js
+import Edit from './edit';
+import metadata from './block.json';
+
+registerBlockType( metadata.name, {
+	edit: Edit,
+} );
+```
+
+By default, the object just includes the `edit` property, but you can add many more, including `icon`. While most of these properties are already defined in `block.json`, you need to specify the icon here to use a custom SVG.
+
+#### Adding a custom icon
+
+Using the calendar icon from the [Gutenberg Storybook](https://wordpress.github.io/gutenberg/?path=/story/icons-icon--library), add the SVG to the function like so:
+
+```js
+const calendarIcon = (
+	<svg
+		viewBox="0 0 24 24"
+		xmlns="http://www.w3.org/2000/svg"
+		aria-hidden="true"
+		focusable="false"
+	>
+		<path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm.5 16c0 .3-.2.5-.5.5H5c-.3 0-.5-.2-.5-.5V7h15v12zM9 10H7v2h2v-2zm0 4H7v2h2v-2zm4-4h-2v2h2v-2zm4 0h-2v2h2v-2zm-4 4h-2v2h2v-2zm4 0h-2v2h2v-2z"></path>
+	</svg>
+);
+
+registerBlockType( metadata.name, {
+	icon: calendarIcon,
+	edit: Edit
+} );
+```
+
+<div class="callout callout-tip">
+	All block icons should be 24 pixels square. Note the <code>viewBox</code> parameter above.
+</div>
+
+Save the `index.js` file and refresh the Editor. You will now see the calendar icon instead of the default.
+
+![The block in the Editor a custom icon](https://developer.wordpress.org/files/2023/12/block-tutorial-7.png)
+
+At this point, the block's icon and description are correct, and block supports allow you to change the font size and text color. Now, it's time to move on to the actual functionality of the block.
+
+### Updating edit.js
+
+The [`edit.js`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/file-structure-of-a-block/#edit-js) file controls how the block functions and appears in the Editor. Right now, the user sees the message "Copyright Date Block – hello from the editor!". Let's change that.
+
+Open the file and see that the `Edit()` function returns a paragraph tag with the default message.
+
+```js
+export default function Edit() {
+	return (
+		<p { ...useBlockProps() }>
+			{ __(
+				'Copyright Date Block – hello from the editor!',
+				'copyright-date-block-demo'
+			) }
+		</p>
+	);
+}
+```
+
+It looks a bit more complicated than it is.
+
+- [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#block-wrapper-props) outputs all the necessary CSS classes and styles in the [block's wrapper](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-wrapper/#the-edit-components-markup) needed by the Editor, which includes the style provided by the block supports you added earlier
+- [`__()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-i18n/) is used for the internationalization of text strings
+
+<div class="callout callout-info">
+	Review the <a href="https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-wrapper/">block wrapper</a> documentation for an introductory guide on how to ensure the block's markup wrapper has the proper attributes.
+</div>
+
+As a reminder, the main purpose of this block is to display the copyright symbol (©) and the current year. So, you first need to get the current year in string form, which can be done with the following code.
+
+```js
+const currentYear = new Date().getFullYear().toString();
+```
+
+Next, update the function to display the correct information.
+
+```js
+export default function Edit() {
+	const currentYear = new Date().getFullYear().toString();
+
+	return (
+		<p { ...useBlockProps() }>© { currentYear }</p>
+	);
+}
+```
+
+Save the `edit.js` file and refresh the Editor. You will now see the copyright symbol (©) followed by the current year.
+
+![The block in the Editor displays the correct content](https://developer.wordpress.org/files/2023/12/block-tutorial-8.png)
+
+### Updating render.php
+
+While the block is working properly in the Editor, the default block message is still being displayed on the front end. To fix this, open the [`render.php`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/file-structure-of-a-block/#render-php) file, and you will see the following.
+
+```php
+<?php
+...
+?>
+<p <?php echo get_block_wrapper_attributes(); ?>>
+	<?php esc_html_e( 'Copyright Date Block – hello from a dynamic block!', 'copyright-date-block' ); ?>
+</p>
+
+```
+
+Similar to the `useBlockProps()` function in the Editor, [`get_block_wrapper_attributes()`](https://developer.wordpress.org/reference/functions/get_block_wrapper_attributes/) outputs all the necessary CSS classes and styles in the [block's wrapper](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-wrapper/#the-server-side-render-markup). Only the content needs to be updated.
+
+You can use `date( "Y" )` to get the current year in PHP, and your `render.php` should look like this.
+
+```php
+<?php
+...
+?>
+<p <?php echo get_block_wrapper_attributes(); ?>>© <?php echo date( "Y" ); ?></p>
+```
+
+Save the file and confirm that the block appears correctly in the Editor and on the front end.
+
+### Cleaning up
+
+When you use the `create-block` package to scaffold a block, it might include files that you don't need. In the case of this tutorial, the block doesn't use stylesheets or front end JavaScript. Clean up the plugin's `src/` folder with the following actions.
+
+1. In the `edit.js` file, remove the lines that import `editor.scss`
+2. In the `index.js` file, remove the lines that import `style.scss`
+3. Delete the editor.scss, style.scss, and view.js files
+
+Finally, make sure that there are no unsaved changes and then terminate the `npm run start` command. Run `npm run build` to optimize your code and make it production-ready.
+
+You have built a fully functional WordPress block, but let's not stop here. In the next sections, we'll add functionality and enable static rendering.
+
+## Adding block attributes
+
+The Copyright Date Block you have built shows the current year, but what if you wanted to display a starting year as well?
+
+![What you're going to build](https://developer.wordpress.org/files/2023/12/block-tutorial-1.png)
+
+This functionality would require users to enter their starting year somewhere on the block. They should also have the ability to toggle it on or off.
+
+You could implement this in different ways, but all would require [block attributes](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/). Attributes allow you to store custom data for the block that can then be used to modify the block's markup.
+
+To enable this starting year functionality, you will need one attribute to store the starting year and another that will be used to tell WordPress whether the starting year should be displayed or not.
+
+### Updating block.json
+
+Block attributes are generally specified in the [`block.json`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#data-storage-in-the-block-with-attributes) file. So open up the file and add the following section after the `example` property.
+
+```json
+"example": {},
+"attributes": {
+	"showStartingYear": {
+		"type": "boolean"
+	},
+	"startingYear": {
+		"type": "string"
+	}
+},
+```
+
+You must indicate the `type` when defining attributes. In this case, the `showStartingYear` should be true or false, so it's set to `boolean`. The `startingYear` is just a string.
+
+Save the file, and you can now move on to the Editor.
+
+### Updating edit.js
+
+Open the `edit.js` file. You will need to accomplish two tasks.
+
+- Add a user interface that allows the user to enter a starting year, toggle the functionality on or off, and store these settings as attributes.
+- Update the block to display the correct content depending on the defined attributes.
+
+#### Adding the user interface
+
+Earlier in this tutorial, you added block supports that automatically created Color and Typography panels in the Settings Sidebar of the block. You can create your own custom panels using the `InspectorControls` component.
+
+##### Inspector controls
+
+The `InspectorControls` belongs to the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/) package, so you can import it into the `edit.js` file by adding the component name on line 14. The result should look like this.
+
+```js
+import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
+```
+
+Next, update the Edit function to return the current block content and an `InspectorControls` component that includes the text "Testing." You can wrap everything in a [Fragment](https://react.dev/reference/react/Fragment) (`<></>`) to ensure proper JSX syntax. The result should look like this.
+
+```js
+export default function Edit() {
+	const currentYear = new Date().getFullYear().toString();
+
+	return (
+		<>
+			<InspectorControls>
+				Testing
+			</InspectorControls>
+			<p { ...useBlockProps() }>© { currentYear }</p>
+		</>
+	);
+}
+```
+Save the file and refresh the Editor. When selecting the block, you should see the "Testing" message in the Settings Sidebar.
+
+![The Setting Sidebar now displays the message](https://developer.wordpress.org/files/2023/12/block-tutorial-9.png)
+
+##### Components and panels
+
+Now, let's use a few more Core components to add a custom panel and the user interface for the starting year functionality. You will want to import [`PanelBody`](https://developer.wordpress.org/block-editor/reference-guides/components/panel/#panelbody), [`TextControl`](https://developer.wordpress.org/block-editor/reference-guides/components/text-control/), and [`ToggleControl`](https://developer.wordpress.org/block-editor/reference-guides/components/toggle-control/) from the [`@wordpress/components`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-components/) package.
+
+Add the following line below the other imports in the `edit.js` file.
+
+```js
+import { PanelBody, TextControl, ToggleControl } from '@wordpress/components';
+```
+
+Then wrap the "Testing" message in the `PanelBody` component and set the `title` parameter to "Settings". Refer to the [component documentation](https://developer.wordpress.org/block-editor/reference-guides/components/panel/#panelbody) for additional parameter options.
+
+```js
+export default function Edit() {
+	const currentYear = new Date().getFullYear().toString();
+
+	return (
+		<>
+			<InspectorControls>
+				<PanelBody title={ __( 'Settings', 'copyright-date-block' ) }>
+					Testing
+				</PanelBody>
+			</InspectorControls>
+			<p { ...useBlockProps() }>© { currentYear }</p>
+		</>
+	);
+}
+```
+
+Save the file and refresh the Editor. You should now see the new Settings panel.
+
+![The Setting Sidebar now displays a custom panel](https://developer.wordpress.org/files/2023/12/block-tutorial-10.png)
+
+##### Text control
+
+The next step is to replace the "Testing" message with a `TextControl` component that allows the user to set the `startingYear` attribute. However, you must include two parameters in the `Edit()` function before doing so.
+
+- `attributes` is an object that contains all the attributes for the block
+- `setAttributes` is a function that allows you to update the value of an attribute
+
+With these parameters included, you can fetch the `showStartingYear` and `startingYear` attributes.
+
+Update the top of the `Edit()` function to look like this.
+
+```js
+export default function Edit( { attributes, setAttributes } ) {
+	const { showStartingYear, startingYear } = attributes;
+	...
+```
+
+<div class="callout callout-tip">
+	To see all the attributes associated with the Copyright Date Block, add <code>console.log( attributes );</code> at the top of the <code>Edit()</code> function. This can be useful when building and testing a custom block.
+</div>
+
+Now, you can remove the "Testing" message and add a `TextControl`. It should include:
+
+1. A `label` property set to "Starting year"
+2. A `value` property set to the attribute `startingYear`
+3. An `onChange` property that updates the `startingYear` attribute whenever the value changes
+
+Putting it all together, the `Edit()` function should look like the following.
+
+```js
+export default function Edit( { attributes, setAttributes } ) {
+	const { showStartingYear, startingYear } = attributes;
+	const currentYear = new Date().getFullYear().toString();
+
+	return (
+		<>
+			<InspectorControls>
+				<PanelBody title={ __( 'Settings', 'copyright-date-block' ) }>
+					<TextControl
+						label={ __(
+							'Starting year',
+							'copyright-date-block'
+						) }
+						value={ startingYear || '' }
+						onChange={ ( value ) =>
+							setAttributes( { startingYear: value } )
+						}
+					/>
+				</PanelBody>
+			</InspectorControls>
+			<p { ...useBlockProps() }>© { currentYear }</p>
+		</>
+	);
+}
+```
+
+<div class="callout callout-tip">
+	You may have noticed that the <code>value</code> property has a value of <code>startingYear || ''</code>. The symbol <code>||</code> is called the <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Logical_OR">Logical OR</a> (logical disjunction) operator. This prevents warnings in React when the <code>startingYear</code> is empty. See <a href="https://react.dev/learn/sharing-state-between-components#controlled-and-uncontrolled-components">Controlled and uncontrolled components</a> for details.
+</div>
+
+Save the file and refresh the Editor. Confirm that a text field now exists in the Settings panel. Add a starting year and confirm that when you update the page, the value is saved.
+
+![A live look at editing the new Starting Year field in the Settings Sidebar](https://developer.wordpress.org/files/2023/12/block-tutorial-11.gif)
+
+##### Toggle control
+
+Next, let's add a toggle that will turn the starting year functionality on or off. You can do this with a `ToggleControl` component that sets the `showStartingYear` attribute. It should include:
+
+1. A `label` property set to "Show starting year"
+2. A `checked` property set to the attribute `showStartingYear`
+3. An `onChange` property that updates the `showStartingYear` attribute whenever the toggle is checked or unchecked
+
+You can also update the "Starting year" text input so it's only displayed when `showStartingYear` is `true`, which can be done using the `&&` logical operator.
+
+The `Edit()` function should look like the following.
+
+```js
+export default function Edit( { attributes, setAttributes } ) {
+	const { showStartingYear, startingYear } = attributes;
+	const currentYear = new Date().getFullYear().toString();
+
+	return (
+		<>
+			<InspectorControls>
+				<PanelBody title={ __( 'Settings', 'copyright-date-block' ) }>
+					<ToggleControl
+						checked={ !! showStartingYear }
+						label={ __(
+							'Show starting year',
+							'copyright-date-block'
+						) }
+						onChange={ () =>
+							setAttributes( {
+								showStartingYear: ! showStartingYear,
+							} )
+						}
+					/>
+					{ showStartingYear && (
+						<TextControl
+							label={ __(
+								'Starting year',
+								'copyright-date-block'
+							) }
+							value={ startingYear || '' }
+							onChange={ ( value ) =>
+								setAttributes( { startingYear: value } )
+							}
+						/>
+					) }
+				</PanelBody>
+			</InspectorControls>
+			<p { ...useBlockProps() }>© { currentYear }</p>
+		</>
+	);
+}
+```
+
+Save the file and refresh the Editor. Confirm that clicking the toggle displays the text input, and when you update the page, the toggle remains active.
+
+![A live look at editing the new Show Starting Year toggle in the Settings Sidebar](https://developer.wordpress.org/files/2023/12/block-tutorial-12.gif)
+
+#### Updating the block content
+
+So far, you have created the user interface for adding a starting year and updating the associated block attributes. Now you need to actually update the block content in the Editor.
+
+Let's create a new variable called `displayDate`. When `showStartingYear` is `true` and the user has provided a `startingYear`, the `displayDate` should include the `startingYear` and the `currentYear` separated by an em dash. Otherwise, just display the `currentYear`.
+
+The code should look something like this.
+
+```js
+let displayDate;
+
+if ( showStartingYear && startingYear ) {
+	displayDate = startingYear + '–' + currentYear;
+} else {
+	displayDate = currentYear;
+}
+```
+
+<div class="callout callout-tip">
+	When you declare a variable with <code>let</code>, it means that the variable may be reassigned later. Declaring a variable with <code>const</code> means that the variable will never change. You could rewrite this code using <code>const</code>. It's just a matter of personal preference.
+</div>
+
+Next, you just need to update the block content to use the `displayDate` instead of the `currentYear` variable.
+
+The `Edit()` function should look like the following.
+
+```js
+export default function Edit( { attributes, setAttributes } ) {
+	const { showStartingYear, startingYear } = attributes;
+	const currentYear = new Date().getFullYear().toString();
+
+	let displayDate;
+
+	if ( showStartingYear && startingYear ) {
+			displayDate = startingYear + '–' + currentYear;
+	} else {
+		displayDate = currentYear;
+	}
+
+	return (
+		<>
+			<InspectorControls>
+				<PanelBody title={ __( 'Settings', 'copyright-date-block' ) }>
+					<ToggleControl
+						checked={ !! showStartingYear }
+						label={ __(
+							'Show starting year',
+							'copyright-date-block'
+						) }
+						onChange={ () =>
+							setAttributes( {
+								showStartingYear: ! showStartingYear,
+							} )
+						}
+					/>
+					{ showStartingYear && (
+						<TextControl
+							label={ __(
+								'Starting year',
+								'copyright-date-block'
+							) }
+							value={ startingYear || '' }
+							onChange={ ( value ) =>
+								setAttributes( { startingYear: value } )
+							}
+						/>
+					) }
+				</PanelBody>
+			</InspectorControls>
+			<p { ...useBlockProps() }>© { displayDate }</p>
+		</>
+	);
+}
+```
+
+Save the file and refresh the Editor. Confirm that the block content updates correctly when you make changes in the Settings panel.
+
+![A live look at the block content being updated by the new fields in the Setting Sidebar](https://developer.wordpress.org/files/2023/12/block-tutorial-13.gif)
+
+### Updating render.php
+
+While the Editor looks great, the starting year functionality has yet to be added to the front end. Let's fix that by updating the `render.php` file.
+
+Start by adding a variable called `$display_date` and replicate what you did in the `Edit()` function above.
+
+This variable should display the value of the `startingYear` attribute and the `$current_year` variable separated by an em dash, or just the `$current_year` if the `showStartingYear` attribute is `false`.
+
+<div class="callout callout-tip">
+	<p>Three variables are exposed in <code>render.php</code>, which you can use to customize the block's output:</p>
+	<ul>
+		<li><code>$attributes</code> (array): The block attributes.</li>
+		<li><code>$content</code> (string): The block default content.</li>
+		<li><code>$block</code> (WP_Block): The block instance.</li>
+	</ul>
+</div>
+
+The code should look something like this.
+
+```php
+if ( ! empty( $attributes['startingYear'] ) && ! empty( $attributes['showStartingYear'] ) ) {
+	$display_date = $attributes['startingYear'] . '–' . $current_year;
+} else {
+	$display_date = $current_year;
+}
+```
+
+Next, you just need to update the block content to use the `$display_date` instead of the `$current_year` variable.
+
+Your final `render.php` file should look like this.
+
+```php
+<?php
+$current_year = date( "Y" );
+
+if ( ! empty( $attributes['startingYear'] ) && ! empty( $attributes['showStartingYear'] ) ) {
+	$display_date = $attributes['startingYear'] . '–' . $current_year;
+} else {
+	$display_date = $current_year;
+}
+?>
+<p <?php echo get_block_wrapper_attributes(); ?>>
+    © <?php echo esc_html( $display_date ); ?>
+</p>
+```
+
+Save the file and confirm that the correct block content is now appearing on the front end of your site.
+
+You have now successfully built a dynamically rendered custom block that utilizes block supports, core WordPress components, and custom attributes. In many situations, this is as far as you would need to go for a block displaying the copyright date with some additional functionality.
+
+In the next section, however, you will add static rendering to the block. This exercise will illustrate how block data is stored in WordPress and provide a fallback should this plugin ever be inadvertently disabled.
+
+## Adding static rendering
+
+A block can utilize dynamic rendering, static rendering, or both. The block you have built so far is dynamically rendered. Its block markup and associated attributes are stored in the database, but its HTML output is not.
+
+Statically rendered blocks will always store the block markup, attributes, and output in the database. Blocks can also store static output in the database while being further enhanced dynamically on the front end, a combination of both methods.
+
+You will see the following if you switch to the Code editor from within the Editor.
+
+```html
+<!-- wp:create-block/copyright-date-block {"showStartingYear":true,"startingYear":"2017"} /-->
+```
+
+Compare this to a statically rendered block like the Paragraph block.
+
+```html
+<!-- wp:paragraph -->
+<p>This is a test.</p>
+<!-- /wp:paragraph -->
+```
+
+The HTML of the paragraph is stored in post content and saved in the database.
+
+You can learn more about dynamic and static rendering in the [Fundamentals documentation](https://developer.wordpress.org/block-editor/getting-started/fundamentals/static-dynamic-rendering/). While most blocks are either dynamically or statically rendered, you can build a block that utilizes both methods.
+
+### Why add static rendering?
+
+When you add static rendering to a dynamically rendered block, the `render.php` file will still control the output on the front end, but the block's HTML content will be saved in the database. This means that the content will remain if the plugin is ever removed from the site. In the case of this Copyright Date Block, the content will revert to a Custom HTML block that you can easily convert to a Paragraph block.
+
+![An error message in the Editor when a block type no longer exists](https://developer.wordpress.org/files/2023/12/block-tutorial-14.png)
+
+While not necessary in all situations, adding static rendering to a dynamically rendered block can provide a helpful fallback should the plugin ever be disabled unintentionally.
+
+Also, consider a situation where the block markup is included in a block pattern or theme template. If a user installs that theme or uses the pattern without the Copyright Date Block installed, they will get a notice that the block is not available, but the content will still be displayed.
+
+Adding static rendering is also a good exploration of how block content is stored and rendered in WordPress.
+
+### Adding a save function
+
+Start by adding a new file named `save.js` to the `src/` folder. In this file, add the following.
+
+```js
+import { useBlockProps } from '@wordpress/block-editor';
+
+export default function save() {
+	return (
+		<p { ...useBlockProps.save() }>
+			{ 'Copyright Date Block – hello from the saved content!' }
+		</p>
+	);
+}
+```
+
+This should look similar to the original `edit.js` file, and you can refer to the [block wrapper](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-wrapper/#the-save-components-markup) documentation for additional information.
+
+Next, in the `index.js` file, import this `save()` function and add a save property to the `registerBlockType()` function. Here's a simplified view of the updated file.
+
+```js
+import save from './save';
+
+...
+
+registerBlockType( metadata.name, {
+	icon: calendarIcon,
+	edit: Edit,
+	save
+} );
+```
+
+<div class="callout callout-tip">
+	When defining properties of an object, if the property name and the variable name are the same, you can use shorthand property names. This is why the code above uses <code>save</code> instead of <code>save: save</code>.
+</div>
+
+Save both `save.js` and `index.js` files and refresh the Editor. It should look like this.
+
+![A block validation error message in the Editor](https://developer.wordpress.org/files/2023/12/block-tutorial-15.png)
+
+Don't worry, the error is expected. If you open the inspector in your browser, you should see the following message.
+
+![A block validation error message in the console](https://developer.wordpress.org/files/2023/12/block-tutorial-16.png)
+
+This block validation error occurs because the `save()` function returns block content, but no HTML is stored in the block markup since the previously saved block was dynamic. Remember that this is what the markup currently looks like.
+
+```html
+<!-- wp:create-block/copyright-date-block {"showStartingYear":true,"startingYear":"2017"} /-->
+```
+
+You will see more of these errors as you update the `save()` function in subsequent steps. Just click "Attempt Block Recovery" and update the page.
+
+After performing block recovery, open the Code editor and you will see the markup now looks like this.
+
+```html
+<!-- wp:create-block/copyright-date-block {"showStartingYear":true,"startingYear":"2017"} -->
+<p class="wp-block-create-block-copyright-date-block">Copyright Date Block – hello from the saved content!</p>
+<!-- /wp:create-block/copyright-date-block -->
+```
+
+You will often encounter block validation errors when building a block with static rendering, and that's ok. The output of the `save()` function must match the HTML in the post content exactly, which may end up out of sync as you add functionality. So long as there are no validation errors when you're completely finished building the block, you will be all set.
+
+### Updating save.js
+
+Next, let's update the output of the `save()` function to display the correct content. Start by copying the same approach used in `edit.js`.
+
+1. Add the `attributes` parameter to the function
+2. Define the `showStartingYear` and `startingYear` variables
+3. Define a `currentYear` variable
+4. Define a `displayDate` variable depending on the values of `currentYear`, `showStartingYear`, and `startingYear`
+
+The result should look like this.
+
+```js
+export default function save( { attributes } ) {
+	const { showStartingYear, startingYear } = attributes;
+	const currentYear = new Date().getFullYear().toString();
+
+	let displayDate;
+
+	if ( showStartingYear && startingYear ) {
+		displayDate = startingYear + '–' + currentYear;
+	} else {
+		displayDate = currentYear;
+	}
+
+	return (
+		<p { ...useBlockProps.save() }>© { displayDate }</p>
+	);
+}
+```
+
+Save the file and refresh the Editor. Click "Attempt Block Recovery" and update the page. Check the Code editor, and the block markup should now look something like this.
+
+```html
+<!-- wp:create-block/copyright-date-block {"showStartingYear":true,"startingYear":"2017"} -->
+<p class="wp-block-create-block-copyright-date-block">© 2017–2023</p>
+<!-- /wp:create-block/copyright-date-block -->
+```
+
+At this point, it might look like you're done. The block content is now saved as HTML in the database and the output on the front end is dynamically rendered. However, there are still a few things that need to be addressed.
+
+Consider the situation where the user added the block to a page in 2023 and then went back to edit the page in 2024. The front end will update as expected, but in the Editor, there will be a block validation error. The `save()` function knows that it's 2024, but the block content saved in the database still says 2023.
+
+Let's fix this in the next section.
+
+### Handling dynamic content in statically rendered blocks
+
+Generally, you want to avoid dynamic content in statically rendered blocks. This is part of the reason why the term "dynamic" is used when referring to dynamic rendering.
+
+That said, in this tutorial, you are combining both rendering methods, and you just need a bit more code to avoid any block validation errors when the year changes.
+
+The root of the issue is that the `currentYear` variable is set dynamically in the `save()` function. Instead, this should be a static variable within the function, which can be solved with an additional attribute.
+
+#### Adding a new attribute
+
+Open the `block.json` file and add a new attribute called `fallbackCurrentYear` with the type `string`. The `attributes` section of the file should now look like this.
+
+```json
+"attributes": {
+    "fallbackCurrentYear": {
+		"type": "string"
+    },
+    "showStartingYear": {
+		"type": "boolean"
+    },
+    "startingYear": {
+		"type": "string"
+	}
+},
+```
+
+Next, open the `save.js` file and use the new `fallbackCurrentYear` attribute in place of `currentYear`. Your updated `save()` function should look like this.
+
+```js
+export default function save( { attributes } ) {
+	const { fallbackCurrentYear, showStartingYear, startingYear } = attributes;
+
+	let displayDate;
+
+	if ( showStartingYear && startingYear ) {
+		displayDate = startingYear + '–' + fallbackCurrentYear;
+	} else {
+		displayDate = fallbackCurrentYear;
+	}
+
+	return (
+		<p { ...useBlockProps.save() }>© { displayDate }</p>
+	);
+}
+```
+
+Now, what happens if the `fallbackCurrentYear` is undefined?
+
+Before the `currentYear` was defined within the function, so the `save()` function always had content to return, even if `showStartingYear` and `startingYear` were undefined.
+
+Instead of returning just the copyright symbol, let's add a condition that if `fallbackCurrentYear` is not set, return `null`. It's generally better to save no HTML in the database than incomplete data.
+
+The final `save()` function should look like this.
+
+```js
+export default function save( { attributes } ) {
+	const { fallbackCurrentYear, showStartingYear, startingYear } = attributes;
+
+	if ( ! fallbackCurrentYear ) {
+		return null;
+	}
+
+	let displayDate;
+
+	if ( showStartingYear && startingYear ) {
+		displayDate = startingYear + '–' + fallbackCurrentYear;
+	} else {
+		displayDate = fallbackCurrentYear;
+	}
+
+	return (
+		<p { ...useBlockProps.save() }>© { displayDate }</p>
+	);
+}
+```
+
+Save both the `block.json` and `save.js` files; you won't need to make any more changes.
+
+#### Setting the attribute in edit.js
+
+The `save()` function now uses the new `fallbackCurrentYear`, so it needs to be set somewhere. Let's use the `Edit()` function.
+
+Open the `edit.js` file and start by defining the `fallbackCurrentYear` variable at the top of the `Edit()` functional alongside the other attributes. Next, review what's happening in the function.
+
+When the block loads in the Editor, the `currentYear` variable is defined. The function then uses this variable to set the content of the block.
+
+Now, let's set the `fallbackCurrentYear` attribute to the `currentYear` when the block loads if the attribute is not already set.
+
+```js
+if ( currentYear !== fallbackCurrentYear ) {
+	setAttributes( { fallbackCurrentYear: currentYear } );
+}
+```
+
+This will work but can be improved by ensuring this code only runs once when the block is initialized. To do so, you can use the [`useEffect`](https://react.dev/reference/react/useEffect) React hook. Refer to the React documentation for more information about how to use this hook.
+
+First, import `useEffect` with the following code.
+
+```js
+import { useEffect } from 'react';
+```
+
+Then wrap the `setAttribute()` code above in a `useEffect` and place this code after the `currentYear` definition in the `Edit()` function. The result should look like this.
+
+```js
+export default function Edit( { attributes, setAttributes } ) {
+	const { fallbackCurrentYear, showStartingYear, startingYear } = attributes;
+
+	// Get the current year and make sure it's a string.
+	const currentYear = new Date().getFullYear().toString();
+
+	// When the block loads, set the fallbackCurrentYear attribute to the
+	// current year if it's not already set.
+	useEffect( () => {
+		if ( currentYear !== fallbackCurrentYear ) {
+			setAttributes( { fallbackCurrentYear: currentYear } );
+		}
+	}, [ currentYear, fallbackCurrentYear, setAttributes ] );
+
+	...
+```
+
+When the block is initialized in the Editor, the `fallbackCurrentYear` attribute will be immediately set. This value will then be available to the `save()` function, and the correct block content will be displayed without block validation errors.
+
+The one caveat is when the year changes. If a Copyright Date Block was added to a page in 2023 and then edited in 2024, the `fallbackCurrentYear` attribute will no longer equal the `currentYear`, and the attribute will be automatically updated to `2024`. This will update the HTML returned by the `save()` function.
+
+You will not get any block validation errors, but the Editor will detect that changes have been made to the page and prompt you to update.
+
+#### Optimizing render.php
+
+The final step is to optimize the `render.php` file. If the `currentYear` and the `fallbackCurrentYear` attribute are the same, then there is no need to dynamically create the block content. It is already saved in the database and is available in the  `render.php` file via the `$content` variable.
+
+Therefore, update the file to render the generated content if `currentYear` and `fallbackCurrentYear` do not match.
+
+```php
+$current_year = date( "Y" );
+
+// Determine which content to display.
+if ( isset( $attributes['fallbackCurrentYear'] ) && $attributes['fallbackCurrentYear'] === $current_year ) {
+
+	// The current year is the same as the fallback, so use the block content saved in the database (by the save.js function).
+	$block_content = $content;
+} else {
+
+	// The current year is different from the fallback, so render the updated block content.
+	if ( ! empty( $attributes['startingYear'] ) && ! empty( $attributes['showStartingYear'] ) ) {
+		$display_date = $attributes['startingYear'] . '–' . $current_year;
+	} else {
+		$display_date = $current_year;
+	}
+
+	$block_content = '<p ' . get_block_wrapper_attributes() . '>© ' . esc_html( $display_date ) . '</p>';
+}
+
+echo wp_kses_post( $block_content );
+```
+
+That's it! You now have a block that utilizes both dynamic and static rendering.
+
+## Wrapping up
+
+Congratulations on completing this tutorial and building your very own Copyright Date Block. Throughout this journey, you have gained a solid foundation in WordPress block development and are now ready to start building your own blocks.
+
+For final reference, the complete code for this tutorial is available in the [Block Development Examples](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/copyright-date-block-09aac3) repository on GitHub.
+
+Now, whether you're now looking to refine your skills, tackle more advanced projects, or stay updated with the latest WordPress trends, the following resources will help you improve your block development skills:
+
+- [Block Development Environment](https://developer.wordpress.org/block-editor/getting-started/devenv/)
+- [Fundamentals of Block Development](https://developer.wordpress.org/block-editor/getting-started/fundamentals/)
+- [WordPress Developer Blog](https://developer.wordpress.org/news/)
+- [Block Development Examples](https://github.com/WordPress/block-development-examples) | GitHub repository
+
+Remember, every expert was once a beginner. Keep learning, experimenting, and, most importantly, have fun building with WordPress.
diff --git a/docs/how-to-guides/README.md b/docs/how-to-guides/README.md
index c0a2bd7f1fe6f8..c57dcad7a35289 100644
--- a/docs/how-to-guides/README.md
+++ b/docs/how-to-guides/README.md
@@ -2,13 +2,13 @@
 
 The new editor is highly flexible, like most of WordPress. You can build custom blocks, modify the editor's appearance, add special plugins, and much more.
 
-## Creating Blocks
+## Creating blocks
 
 The editor is about blocks, and the main extensibility API is the Block API. It allows you to create your own static blocks, [Dynamic Blocks](/docs/how-to-guides/block-tutorial/creating-dynamic-blocks.md) ( rendered on the server ) and also blocks capable of saving data to Post Meta for more structured content.
 
-If you want to learn more about block creation, see the [Create a Block tutorial](/docs/getting-started/create-block/README.md) for the best place to start.
+If you want to learn more about block creation, see the [Create a Block tutorial](/docs/getting-started/devenv/get-started-with-create-block.md) for the best place to start.
 
-## Extending Blocks
+## Extending blocks
 
 It is also possible to modify the behavior of existing blocks or even remove them completely using filters.
 
@@ -24,11 +24,11 @@ Refer to the [Plugins](/packages/plugins/README.md) and [Edit Post](/packages/ed
 
 You can also filter certain aspects of the editor; this is documented on the [Editor Filters](/docs/reference-guides/filters/editor-filters.md) page.
 
-## Meta Boxes
+## Meta boxes
 
 Porting PHP meta boxes to blocks or sidebar plugins is highly encouraged, learn how in the [meta box](/docs/how-to-guides/metabox.md) and [sidebar plugin](/docs/how-to-guides/plugin-sidebar-0.md) guides.
 
-## Theme Support
+## Theme support
 
 By default, blocks provide their styles to enable basic support for blocks in themes without any change. Themes can add/override these styles, or rely on defaults.
 
@@ -38,7 +38,7 @@ There are some advanced block features which require opt-in support in the theme
 
 Autocompleters within blocks may be extended and overridden. Learn more about the [autocomplete](/docs/reference-guides/filters/autocomplete-filters.md) filters.
 
-## Block Parsing and Serialization
+## Block parsing and serialization
 
 Posts in the editor move through a couple of different stages between being stored in `post_content` and appearing in the editor. Since the blocks themselves are data structures that live in memory it takes a parsing and serialization step to transform out from and into the stored format in the database.
 
diff --git a/docs/how-to-guides/accessibility.md b/docs/how-to-guides/accessibility.md
index 75458d6690cab4..bdf9c977b5cf44 100644
--- a/docs/how-to-guides/accessibility.md
+++ b/docs/how-to-guides/accessibility.md
@@ -4,7 +4,7 @@ Accessibility documentation for developers working on the Gutenberg Project.
 
 For more information on accessibility and WordPress see the [Make WordPress Accessibility Handbook](https://make.wordpress.org/accessibility/handbook/) and the [Accessibility Team section](https://make.wordpress.org/accessibility/).
 
-## Landmark Regions
+## Landmark regions
 
 It is a best practice to include ALL content on the page in landmarks, so that screen reader users who rely on them to navigate from section to section do not lose track of content.
 
diff --git a/docs/how-to-guides/block-tutorial/applying-styles-with-stylesheets.md b/docs/how-to-guides/block-tutorial/applying-styles-with-stylesheets.md
index 697984c9456e02..85ac956ff74ba6 100644
--- a/docs/how-to-guides/block-tutorial/applying-styles-with-stylesheets.md
+++ b/docs/how-to-guides/block-tutorial/applying-styles-with-stylesheets.md
@@ -6,7 +6,7 @@ A block typically inserts markup (HTML) into post content that you want to style
 
 ## Before you start
 
-You will need a basic block and WordPress development environment to implement the examples shown in this guide. See the [create a basic block](/docs/how-to-guides/block-tutorial/writing-your-first-block-type.md) or [block tutorial](/docs/getting-started/create-block/README.md) to get setup.
+You will need a basic block and WordPress development environment to implement the examples shown in this guide. See the [Quick Start Guide](/docs/getting-started/quick-start-guide.md) or [block tutorial](/docs/getting-started/tutorial.md) to get set up.
 
 ## Methods to add style
 
@@ -95,11 +95,9 @@ npm run build
 
 Like scripts, you can enqueue your block's styles using the `block.json` file.
 
-Use the `editorStyle` property to a CSS file you want to load in the editor view, and use the `style` property for a CSS file you want to load on the frontend when the block is used.
+Use the `editorStyle` property to a CSS file you want to load in the editor view only, use the `style` property for a CSS file you want to load both in the editor view and on the frontend when the block is used, and use the `viewStyle` property for a CSS file you want to load only on the frontend when the block is used.
 
-It is worth noting that, if the editor content is iframed, both of these will
-load in the iframe. `editorStyle` will also load outside the iframe, so it can
-be used for editor content as well as UI.
+It is worth noting that, if the editor content is iframed, both the `style` and `editorStyle` will load in the iframe. `editorStyle` will also load outside the iframe, so it can be used for editor content as well as UI.
 
 For example:
 
@@ -140,6 +138,17 @@ And a `style.css` file to load on the frontend:
 
 The files will automatically be enqueued when specified in the block.json.
 
+<div class="callout callout-info">
+
+If you are using `@wordpress/scripts` you will need to import your stylesheet within your corresponding JavaScript file in order for `@wordpress/scripts` to process the stylesheet.
+
+Example:
+
+- In `edit.js` you would place `import './editor.scss';`
+- In `index.js` you would place `import './style.scss';`
+- In `view.js` you would place `import './view.scss';` (interactive block template)
+</div>
+
 **Note:** If you have multiple files to include, you can use standard `wp_enqueue_style` functions like any other plugin or theme. You will want to use the following hooks for the block editor:
 
 -   `enqueue_block_editor_assets` - to load only in editor view
diff --git a/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md b/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md
deleted file mode 100644
index 4436696b552619..00000000000000
--- a/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md
+++ /dev/null
@@ -1,191 +0,0 @@
-# Block Controls: Block Toolbar and Settings Sidebar
-
-To simplify block customization and ensure a consistent experience for users, there are a number of built-in UI patterns to help generate the editor preview. Like with the `RichText` component covered in the previous chapter, the `wp.editor` global includes a few other common components to render editing interfaces. In this chapter, we'll explore toolbars and the block inspector.
-
-## Block Toolbar
-
-![Screenshot of the rich text toolbar applied to a Paragraph block inside the block editor](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/toolbar-text.png)
-
-When the user selects a block, a number of control buttons may be shown in a toolbar above the selected block. Some of these block-level controls are included automatically if the editor is able to transform the block to another type, or if the focused element is a RichText component.
-
-You can also customize the toolbar to include controls specific to your block type. If the return value of your block type's `edit` function includes a `BlockControls` element, those controls will be shown in the selected block's toolbar.
-
-```jsx
-import { registerBlockType } from '@wordpress/blocks';
-
-import {
-	useBlockProps,
-	RichText,
-	AlignmentToolbar,
-	BlockControls,
-} from '@wordpress/block-editor';
-
-registerBlockType( 'gutenberg-examples/example-04-controls-esnext', {
-	apiVersion: 3,
-	title: 'Example: Controls (esnext)',
-	icon: 'universal-access-alt',
-	category: 'design',
-	attributes: {
-		content: {
-			type: 'string',
-			source: 'html',
-			selector: 'p',
-		},
-		alignment: {
-			type: 'string',
-			default: 'none',
-		},
-	},
-	example: {
-		attributes: {
-			content: 'Hello World',
-			alignment: 'right',
-		},
-	},
-	edit: ( { attributes, setAttributes } ) => {
-		const onChangeContent = ( newContent ) => {
-			setAttributes( { content: newContent } );
-		};
-
-		const onChangeAlignment = ( newAlignment ) => {
-			setAttributes( {
-				alignment: newAlignment === undefined ? 'none' : newAlignment,
-			} );
-		};
-
-		return (
-			<div { ...useBlockProps() }>
-				{
-					<BlockControls>
-						<AlignmentToolbar
-							value={ attributes.alignment }
-							onChange={ onChangeAlignment }
-						/>
-					</BlockControls>
-				}
-				<RichText
-					className={ attributes.className }
-					style={ { textAlign: attributes.alignment } }
-					tagName="p"
-					onChange={ onChangeContent }
-					value={ attributes.content }
-				/>
-			</div>
-		);
-	},
-	save: ( props ) => {
-		const blockProps = useBlockProps.save();
-
-		return (
-			<div { ...blockProps }>
-				<RichText.Content
-					className={ `gutenberg-examples-align-${ props.attributes.alignment }` }
-					tagName="p"
-					value={ props.attributes.content }
-				/>
-			</div>
-		);
-	},
-} );
-```
-
-Note that `BlockControls` is only visible when the block is currently selected and in visual editing mode. `BlockControls` are not shown when editing a block in HTML editing mode.
-
-## Settings Sidebar
-
-![Screenshot of the inspector panel focused on the settings for a Paragraph block](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/inspector.png)
-
-The Settings Sidebar is used to display less-often-used settings or settings that require more screen space. The Settings Sidebar should be used for **block-level settings only**.
-
-If you have settings that affects only selected content inside a block (example: the "bold" setting for selected text inside a paragraph): **do not place it inside the Settings Sidebar**. The Settings Sidebar is displayed even when editing a block in HTML mode, so it should only contain block-level settings.
-
-The Block Tab is shown in place of the Document Tab when a block is selected.
-
-Similar to rendering a toolbar, if you include an `InspectorControls` element in the return value of your block type's `edit` function, those controls will be shown in the Settings Sidebar region.
-The following example adds 2 color palettes to the sidebar, one for the text color and one for the background color.
-
-```jsx
-import { registerBlockType } from '@wordpress/blocks';
-import { __ } from '@wordpress/i18n';
-import { TextControl } from '@wordpress/components';
-
-import {
-	useBlockProps,
-	ColorPalette,
-	InspectorControls,
-} from '@wordpress/block-editor';
-
-registerBlockType( 'create-block/gutenpride', {
-	apiVersion: 3,
-	attributes: {
-		message: {
-			type: 'string',
-			source: 'text',
-			selector: 'div',
-			default: '', // empty default
-		},
-		bg_color: { type: 'string', default: '#000000' },
-		text_color: { type: 'string', default: '#ffffff' },
-	},
-	edit: ( { attributes, setAttributes } ) => {
-		const onChangeBGColor = ( hexColor ) => {
-			setAttributes( { bg_color: hexColor } );
-		};
-
-		const onChangeTextColor = ( hexColor ) => {
-			setAttributes( { text_color: hexColor } );
-		};
-
-		return (
-			<div { ...useBlockProps() }>
-				<InspectorControls key="setting">
-					<div id="gutenpride-controls">
-						<fieldset>
-							<legend className="blocks-base-control__label">
-								{ __( 'Background color', 'gutenpride' ) }
-							</legend>
-							<ColorPalette // Element Tag for Gutenberg standard colour selector
-								onChange={ onChangeBGColor } // onChange event callback
-							/>
-						</fieldset>
-						<fieldset>
-							<legend className="blocks-base-control__label">
-								{ __( 'Text color', 'gutenpride' ) }
-							</legend>
-							<ColorPalette // Element Tag for Gutenberg standard colour selector
-								onChange={ onChangeTextColor } // onChange event callback
-							/>
-						</fieldset>
-					</div>
-				</InspectorControls>
-				<TextControl
-					value={ attributes.message }
-					onChange={ ( val ) => setAttributes( { message: val } ) }
-					style={ {
-						backgroundColor: attributes.bg_color,
-						color: attributes.text_color,
-					} }
-				/>
-			</div>
-		);
-	},
-	save: ( { attributes } ) => {
-		return (
-			<div
-				{ ...useBlockProps.save() }
-				style={ {
-					backgroundColor: attributes.bg_color,
-					color: attributes.text_color,
-				} }
-			>
-				{ attributes.message }
-			</div>
-		);
-	},
-} );
-```
-
-Block controls rendered in both the toolbar and sidebar will also be used when
-multiple blocks of the same type are selected.
-
-**Note :** In the example above, we added text and background color customization support to our block to demonstrate the use of `InspectorControls` to add custom controls to the sidebar. That said, for common customization settings including color, border, spacing customization and more, we will see on the [next chapter](/docs/how-to-guides/block-tutorial/block-supports-in-static-blocks.md) that you can rely on block supports to provide the same functionality in a more efficient way.
diff --git a/docs/how-to-guides/block-tutorial/block-supports-in-dynamic-blocks.md b/docs/how-to-guides/block-tutorial/block-supports-in-dynamic-blocks.md
deleted file mode 100644
index 2d852d04d28754..00000000000000
--- a/docs/how-to-guides/block-tutorial/block-supports-in-dynamic-blocks.md
+++ /dev/null
@@ -1,218 +0,0 @@
-# Block Supports in dynamic blocks
-
-Dynamic blocks are blocks that build their structure and content on the fly when the block is rendered on the front end.
-
-**Note :** All the details about the creation of dynamic blocks are documented [here](/docs/how-to-guides/block-tutorial/creating-dynamic-blocks.md). The below examples demonstrate the usage of `block supports` in dynamic blocks.
-
-A lot of blocks, including core blocks, offer similar customization options. Whether that is to change the background color, text color, or to add padding, margin customization options...
-
-Let's examine the scenario to enable a user to change the background color and text color of a block.
-
-### Without using block supports
-
-```jsx
-import { registerBlockType } from '@wordpress/blocks';
-import { useSelect } from '@wordpress/data';
-import {
-	useBlockProps,
-	ColorPalette,
-	InspectorControls,
-} from '@wordpress/block-editor';
-import { __ } from '@wordpress/i18n';
-
-registerBlockType( 'gutenberg-examples/example-dynamic', {
-	apiVersion: 3,
-	title: 'Example: last post title',
-	icon: 'megaphone',
-	category: 'widgets',
-	attributes: {
-		bgColor: { type: 'string' },
-		textColor: { type: 'string' },
-	},
-	edit: function BlockEdit( {
-		attributes: { bgColor, textColor },
-		setAttributes,
-	} ) {
-		const blockProps = useBlockProps();
-		const posts = useSelect( ( select ) => {
-			return select( 'core' ).getEntityRecords( 'postType', 'post', {
-				per_page: 1,
-			} );
-		}, [] );
-		const onChangeBGColor = ( hexColor ) => {
-			setAttributes( { bgColor: hexColor } );
-		};
-		const onChangeTextColor = ( newColor ) => {
-			setAttributes( { textColor: newColor } );
-		};
-		if ( ! posts ) {
-			return null;
-		}
-		return (
-			<div { ...blockProps }>
-				<InspectorControls key="setting">
-					<fieldset>
-						<legend className="blocks-base-control__label">
-							{ __( 'Background color' ) }
-						</legend>
-						<ColorPalette // Element Tag for Gutenberg standard colour selector
-							onChange={ onChangeBGColor } // onChange event callback
-						/>
-					</fieldset>
-					<fieldset>
-						<legend className="blocks-base-control__label">
-							{ __( 'Text color' ) }
-						</legend>
-						<ColorPalette // Element Tag for Gutenberg standard colour selector
-							onChange={ onChangeTextColor } // onChange event callback
-						/>
-					</fieldset>
-				</InspectorControls>
-				{ !! posts.length && (
-					<h3
-						style={ {
-							backgroundColor: bgColor,
-							color: textColor,
-						} }
-					>
-						{ posts[ 0 ].title.rendered }
-					</h3>
-				) }
-			</div>
-		);
-	},
-} );
-```
-
-Because it is a dynamic block it doesn't need to override the default `save` implementation on the client. Instead, it needs a server component. The contents in the front of your site depend on the function called by the `render_callback` property of `register_block_type`.
-
-```php
-<?php
-
-function gutenberg_examples_dynamic_render_callback( $block_attributes, $content ) {
-	$recent_posts = wp_get_recent_posts( array(
-		'numberposts' => 1,
-		'post_status' => 'publish',
-	) );
-	if ( count( $recent_posts ) === 0 ) {
-		return 'No posts';
-	}
-	$post    = $recent_posts[ 0 ];
-	$post_id = $post['ID'];
-	$styles  = '';
-	if ( ! empty( $block_attributes['bgColor'] ) ) {
-		$styles .= "background-color:{$block_attributes['bgColor']};";
-	}
-	if ( ! empty( $block_attributes['textColor'] ) ) {
-		$styles .= "color:{$block_attributes['textColor']};";
-	}
-	$wrapper_attributes = get_block_wrapper_attributes();
-	return sprintf(
-		'<h3 %1$s href="%2$s" style="%3$s">%4$s<h3>',
-		$wrapper_attributes,
-		esc_url( get_permalink( $post_id ) ),
-		esc_attr( $styles ),
-		esc_html( get_the_title( $post_id ) )
-	);
-}
-
-function gutenberg_examples_dynamic() {
-	register_block_type(
-		'gutenberg-examples/example-dynamic',
-		array(
-			'api_version'       => 3,
-			'category'          => 'widgets',
-			'attributes'        => array(
-				'bgColor'   => array( 'type' => 'string' ),
-				'textColor' => array( 'type' => 'string' ),
-			),
-			'render_callback'   => 'gutenberg_examples_dynamic_render_callback',
-			'skip_inner_blocks' => true,
-		)
-	);
-}
-add_action( 'init', 'gutenberg_examples_dynamic' );
-
-```
-
-### With block supports
-
-Let's see how we can achieve the same functionality, but by using `block supports`.
-
-```jsx
-import { registerBlockType } from '@wordpress/blocks';
-import { useSelect } from '@wordpress/data';
-import { useBlockProps } from '@wordpress/block-editor';
-
-registerBlockType( 'gutenberg-examples/example-dynamic-block-supports', {
-	apiVersion: 3,
-	title: 'Example: last post title(block supports)',
-	icon: 'megaphone',
-	category: 'widgets',
-	edit: function BlockEdit() {
-		const blockProps = useBlockProps();
-		const posts = useSelect( ( select ) => {
-			return select( 'core' ).getEntityRecords( 'postType', 'post', {
-				per_page: 1,
-			} );
-		}, [] );
-		if ( ! posts ) {
-			return null;
-		}
-		return (
-			<div { ...blockProps }>
-				{ !! posts.length && <h3>{ posts[ 0 ].title.rendered }</h3> }
-			</div>
-		);
-	},
-	supports: { color: true },
-} );
-```
-
-And the server side part becomes:
-
-```php
-<?php
-function gutenberg_examples_dynamic_block_supports_render_callback( $block_attributes, $content ) {
-	$recent_posts = wp_get_recent_posts( array(
-		'numberposts' => 1,
-		'post_status' => 'publish',
-	) );
-	if ( count( $recent_posts ) === 0 ) {
-		return 'No posts';
-	}
-	$post    = $recent_posts[ 0 ];
-	$post_id = $post['ID'];
-	$wrapper_attributes = get_block_wrapper_attributes();
-	return sprintf(
-		'<h3 %1$s href="%2$s">%3$s<h3>',
-		$wrapper_attributes,
-		esc_url( get_permalink( $post_id ) ),
-		esc_html( get_the_title( $post_id ) )
-	);
-}
-
-function gutenberg_examples_dynamic_block_supports() {
-	register_block_type(
-		'gutenberg-examples/example-dynamic-block-supports',
-		array(
-			'api_version'       => 3,
-			'category'          => 'widgets',
-			'supports'          => array( 'color' => true ),
-			'render_callback'   => 'gutenberg_examples_dynamic_block_supports_render_callback',
-			'skip_inner_blocks' => true,
-		)
-	);
-}
-add_action( 'init', 'gutenberg_examples_dynamic_block_supports' );
-
-```
-
-And that's it, the addition of the "supports" key above, will automatically make the following changes to the block:
-
--   Add a `style` attribute to the block to store the link, text and background colors.
--   Add a "Colors" panel to the sidebar of the block editor to allow users to tweak the text, link and background colors.
--   Automatically use the `theme.json` config: allow disabling colors, inherit palettes...
--   Automatically inject the right styles and apply them to the block wrapper when the user make changes to the colors.
-
-To learn more about the block supports and see all the available properties that you can enable for your own blocks, please refer to [the supports documentation](/docs/reference-guides/block-api/block-supports.md).
diff --git a/docs/how-to-guides/block-tutorial/block-supports-in-static-blocks.md b/docs/how-to-guides/block-tutorial/block-supports-in-static-blocks.md
deleted file mode 100644
index 47fa3a86b75eb9..00000000000000
--- a/docs/how-to-guides/block-tutorial/block-supports-in-static-blocks.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Block Supports
-
-A lot of blocks, including core blocks, offer similar customization options. Whether that is to change the background color, text color, or to add padding, margin customization options...
-
-To avoid duplicating the same logic over and over in your blocks and to align the behavior of your block with core blocks, you can make use of the different `supports` properties.
-
-Let's take the block we wrote in the previous chapter (example 3) and with just a single line of code, add support for text, link and background color customizations.
-
-Here's the exact same code we used to register the block previously.
-
-
-```jsx
-import { registerBlockType } from '@wordpress/blocks';
-import { useBlockProps, RichText } from '@wordpress/block-editor';
-
-registerBlockType( 'gutenberg-examples/example-03-editable-esnext', {
-	apiVersion: 3,
-	title: 'Example: Basic with block supports',
-	icon: 'universal-access-alt',
-	category: 'design',
-	attributes: {
-		content: {
-			type: 'string',
-			source: 'html',
-			selector: 'p',
-		},
-	},
-	example: {
-		attributes: {
-			content: 'Hello World',
-		},
-	},
-	edit: ( props ) => {
-		const {
-			attributes: { content },
-			setAttributes,
-			className,
-		} = props;
-		const blockProps = useBlockProps();
-		const onChangeContent = ( newContent ) => {
-			setAttributes( { content: newContent } );
-		};
-		return (
-			<RichText
-				{ ...blockProps }
-				tagName="p"
-				onChange={ onChangeContent }
-				value={ content }
-			/>
-		);
-	},
-	save: ( props ) => {
-		const blockProps = useBlockProps.save();
-		return (
-			<RichText.Content
-				{ ...blockProps }
-				tagName="p"
-				value={ props.attributes.content }
-			/>
-		);
-	},
-} );
-```
-
-Now, let's alter the block.json file for that block, and add the supports key. (If you're not using a block.json file, you can also add the key to the `registerBlockType` function call)
-
-```json
-{
-	"apiVersion": 3,
-	"name": "gutenberg-examples/example-03-editable-esnext",
-	"title": "Example: Basic with block supports",
-	"icon": "universal-access-alt",
-	"category": "layout",
-	"editorScript": "file:./build/index.js",
-	"supports": {
-		"color": {
-			"text": true,
-			"background": true,
-			"link": true
-		}
-	}
-}
-```
-
-And that's it, the addition of the "supports" key above, will automatically make the following changes to the block:
-
- - Add a `style` attribute to the block to store the link, text and background colors.
- - Add a "Colors" panel to the sidebar of the block editor to allow users to tweak the text, link and background colors.
- - Automatically use the `theme.json` config: allow disabling colors, inherit palettes...
- - Automatically inject the right styles and apply them to the block wrapper when the user make changes to the colors.
-
-To learn more about the block supports and see all the available properties that you can enable for your own blocks, please refer to [the supports documentation](/docs/reference-guides/block-api/block-supports.md).
diff --git a/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md b/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md
index 9be4f3a993d203..d4134749891ca1 100644
--- a/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md
+++ b/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md
@@ -12,9 +12,14 @@ By registering your own block variation with some specific Query Loop block sett
 
 With the block variations API you can provide the default settings that make the most sense for your use-case.
 
+In order to have a Query Loop variation properly working, we'll need to:
+- Register the block variation for the `core/query` block with some default values
+- Define a layout for the block variation
+- Use the `namespace` attribute in the `isActive` block variation property
+
 Let's go on a journey, for example, of setting up a variation for a plugin which registers a `book` [custom post type](https://developer.wordpress.org/plugins/post-types/).
 
-### Offer sensible defaults
+### 1. Offer sensible defaults
 
 Your first step would be to create a variation which will be set up in such a way to provide a block variation which will display by default a list of books instead of blog posts. The full variation code will look something like this:
 
@@ -91,7 +96,9 @@ In this way, your block will show up just like any other block while the user is
 
 At this point, your custom variation will be virtually indistinguishable from a stand-alone block. Completely branded to your plugin, easy to discover and directly available to the user as a drop in.
 
-### Customize your variation layout
+However, your query loop variation won't work just yet — we still need to define a layout so that it can render properly.
+
+### 2. Customize your variation layout
 
 Please note that the Query Loop block supports `'block'` as a string in the `scope` property. In theory, that's to allow the variation to be picked up after inserting the block itself. Read more about the Block Variation Picker [here](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/block-variation-picker/README.md).
 
@@ -125,7 +132,7 @@ In order for a variation to be connected to another Query Loop variation we need
 
 For example, if we have a Query Loop variation exposed to the inserter(`scope: ['inserter']`) with the name `products`, we can connect a scoped `block` variation by setting its `namespace` attribute to `['products']`. If the user selects this variation after having clicked `Start blank`, the namespace attribute will be overridden by the main inserter variation.
 
-### Making Gutenberg recognize your variation
+### 3. Making Gutenberg recognize your variation
 
 There is one slight problem you might have realized after implementing this variation: while it is transparent to the user as they are inserting it, Gutenberg will still recognize the variation as a Query Loop block at its core and so, after its insertion, it will show up as a Query Loop block in the tree view of the editor, for instance.
 
@@ -178,7 +185,7 @@ As of Gutenberg version 14.2, the following controls are available:
 -   `sticky` - Shows a dropdown to select how to handle sticky posts.
 -   `taxQuery` - Shows available taxonomies filters for the currently selected post type.
 -   `author` - Shows an input field to filter the query by author.
--   `search` - Shows an input filed to filter the query by keywords.
+-   `search` - Shows an input field to filter the query by keywords.
 
 In our case, the property would look like this:
 
@@ -208,13 +215,13 @@ export const withBookQueryControls = ( BlockEdit ) => ( props ) => {
 	// function to handle that.
 	return isMyBooksVariation( props ) ? (
 		<>
-			<BlockEdit { ...props } />
+			<BlockEdit key="edit" { ...props } />
 			<InspectorControls>
 				<BookAuthorSelector /> { /** Our custom component */ }
 			</InspectorControls>
 		</>
 	) : (
-		<BlockEdit { ...props } />
+		<BlockEdit key="edit" { ...props } />
 	);
 };
 
diff --git a/docs/how-to-guides/block-tutorial/generate-blocks-with-wp-cli.md b/docs/how-to-guides/block-tutorial/generate-blocks-with-wp-cli.md
deleted file mode 100644
index 891f8e7d4e1b80..00000000000000
--- a/docs/how-to-guides/block-tutorial/generate-blocks-with-wp-cli.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generate Blocks with WP-CLI
-
-## WARNING
-
-**Deprecated:** It is no longer recommended to use WP-CLI or create-guten-block to generate block scaffolding.
-
-The official script to generate a block is the new [@wordpress/create-block](/packages/create-block/README.md) package. This package follows the new block directory guidelines, and creates the proper block, environment, and standards set by the project. See the new [Create a Block tutorial](/docs/getting-started/create-block/README.md) for a complete walk-through.
diff --git a/docs/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields.md b/docs/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields.md
deleted file mode 100644
index 3d8e10cae7ab2a..00000000000000
--- a/docs/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# Introducing Attributes and Editable Fields
-
-The example blocks so far are still not very interesting because they lack options to customize the appearance of the message. In this section, we will implement a RichText field allowing the user to specify their own message. Before doing so, it's important to understand how the state of a block (its "attributes") is maintained and changed over time.
-
-## Attributes
-
-Until now, the `edit` and `save` functions have returned a simple representation of a paragraph element. We also learned how these functions are responsible for _describing_ the structure of the block's appearance. If the user changes a block, this structure may need to change. To achieve this, the state of a block is maintained throughout the editing session as a plain JavaScript object, and when an update occurs, the `edit` function is invoked again. Put another way: **the output of a block is a function of its attributes**.
-
-One challenge of maintaining the representation of a block as a JavaScript object is that we must be able to extract this object again from the saved content of a post. This is achieved with the block type's `attributes` property:
-
-```js
-	attributes: {
-		content: {
-			type: 'string',
-			source: 'html',
-			selector: 'p',
-		},
-	},
-```
-
-When registering a new block type, the `attributes` property describes the shape of the attributes object you'd like to receive in the `edit` and `save` functions. Each value is a [source function](/docs/reference-guides/block-api/block-attributes.md) to find the desired value from the markup of the block.
-
-In the code snippet above, when loading the editor, the `content` value will be extracted from the HTML of the paragraph element in the saved post's markup.
-
-## Components and the `RichText` Component
-
-Earlier examples used the `createElement` function to create DOM nodes, but it's also possible to encapsulate this behavior into "components". This abstraction helps you share common behaviors and hide complexity in self-contained units.
-
-There are a number of [components available](/docs/reference-guides/packages/packages-editor.md#components) to use in implementing your blocks. You can see one such component in the code below: the [`RichText` component](/docs/reference-guides/richtext.md) is part of the `wp-block-editor` package.
-
-The `RichText` component can be considered as a super-powered `textarea` element, enabling rich content editing including bold, italics, hyperlinks, etc.
-
-To use the `RichText` component, and using ES5 code, remember to add `wp-block-editor` to the dependency array of registered script handles when calling `wp_register_script`.
-
-```php
-// automatically load dependencies and version
-$asset_file = include( plugin_dir_path( __FILE__ ) . 'build/index.asset.php');
-
-wp_register_script(
-	'gutenberg-examples-03-esnext',
-	plugins_url( 'build/index.js', __FILE__ ),
-	$asset_file['dependencies'],
-	$asset_file['version']
-);
-```
-
-Do not forget to also update the `editor_script` handle in `register_block_type` to `gutenberg-examples-03-esnext`.
-
-Implementing this behavior as a component enables you as the block implementer to be much more granular about editable fields. Your block may not need `RichText` at all, or it may need many independent `RichText` elements, each operating on a subset of the overall block state.
-
-Because `RichText` allows for nested nodes, you'll most often use it in conjunction with the `html` attribute source when extracting the value from saved content. You'll also use `RichText.Content` in the `save` function to output RichText values.
-
-Here is the complete block definition for Example 03.
-
-
-```jsx
-import { registerBlockType } from '@wordpress/blocks';
-import { useBlockProps, RichText } from '@wordpress/block-editor';
-
-registerBlockType( 'gutenberg-examples/example-03-editable-esnext', {
-	apiVersion: 3,
-	title: 'Example: Editable (esnext)',
-	icon: 'universal-access-alt',
-	category: 'design',
-	attributes: {
-		content: {
-			type: 'string',
-			source: 'html',
-			selector: 'p',
-		},
-	},
-	example: {
-		attributes: {
-			content: 'Hello World',
-		},
-	},
-	edit: ( props ) => {
-		const {
-			attributes: { content },
-			setAttributes,
-			className,
-		} = props;
-		const blockProps = useBlockProps();
-		const onChangeContent = ( newContent ) => {
-			setAttributes( { content: newContent } );
-		};
-		return (
-			<RichText
-				{ ...blockProps }
-				tagName="p"
-				onChange={ onChangeContent }
-				value={ content }
-			/>
-		);
-	},
-	save: ( props ) => {
-		const blockProps = useBlockProps.save();
-		return (
-			<RichText.Content
-				{ ...blockProps }
-				tagName="p"
-				value={ props.attributes.content }
-			/>
-		);
-	},
-} );
-```
diff --git a/docs/how-to-guides/block-tutorial/nested-blocks-inner-blocks.md b/docs/how-to-guides/block-tutorial/nested-blocks-inner-blocks.md
index 9dc7f1f324743f..b90b4668530797 100644
--- a/docs/how-to-guides/block-tutorial/nested-blocks-inner-blocks.md
+++ b/docs/how-to-guides/block-tutorial/nested-blocks-inner-blocks.md
@@ -36,16 +36,18 @@ registerBlockType( 'gutenberg-examples/example-06', {
 } );
 ```
 
-## Allowed Blocks
+## Allowed blocks
 
-Using the `allowedBlocks` property, you can define the set of blocks allowed in your InnerBlock. This restricts the blocks that can be included only to those listed, all other blocks will not show in the inserter.
+Using the `allowedBlocks` prop, you can further limit, in addition to the `allowedBlocks` field in `block.json`, which blocks can be inserted as direct descendants of this block. It is useful to determine the list of allowed blocks dynamically, individually for each block. For example, determined by a block attribute:
 
 ```js
-const ALLOWED_BLOCKS = [ 'core/image', 'core/paragraph' ];
+const { allowedBlocks } = attributes;
 //...
-<InnerBlocks allowedBlocks={ ALLOWED_BLOCKS } />;
+<InnerBlocks allowedBlocks={ allowedBlocks } />;
 ```
 
+If the list of allowed blocks is always the same, prefer the [`allowedBlocks` block setting](#defining-a-children-block-relationship) instead.
+
 ## Orientation
 
 By default, `InnerBlocks` expects its blocks to be shown in a vertical list. A valid use-case is to style inner blocks to appear horizontally, for instance by adding CSS flex or grid properties to the inner blocks wrapper. When blocks are styled in such a way, the `orientation` prop can be set to indicate that a horizontal layout is being used:
@@ -56,7 +58,7 @@ By default, `InnerBlocks` expects its blocks to be shown in a vertical list. A v
 
 Specifying this prop does not affect the layout of the inner blocks, but results in the block mover icons in the child blocks being displayed horizontally, and also ensures that drag and drop works correctly.
 
-## Default Block
+## Default block
 
 By default `InnerBlocks` opens a list of permitted blocks via `allowedBlocks` when the block appender is clicked. You can modify the default block and its attributes that are inserted when the initial block appender is clicked by using the `defaultBlock` property. For example:
 
@@ -93,7 +95,7 @@ const MY_TEMPLATE = [
 
 Use the `templateLock` property to lock down the template. Using `all` locks the template completely so no changes can be made. Using `insert` prevents additional blocks from being inserted, but existing blocks can be reordered. See [templateLock documentation](https://github.com/WordPress/gutenberg/tree/HEAD/packages/block-editor/src/components/inner-blocks/README.md#templatelock) for additional information.
 
-### Post Template
+### Post template
 
 Unrelated to `InnerBlocks` but worth mentioning here, you can create a [post template](https://developer.wordpress.org/block-editor/developers/block-api/block-templates/) by post type, that preloads the block editor with a set of blocks.
 
@@ -109,16 +111,17 @@ add_action( 'init', function() {
 } );
 ```
 
-## Using Parent and Ancestor Relationships in Blocks
+## Using parent, ancestor and children relationships in blocks
 
-A common pattern for using InnerBlocks is to create a custom block that will be only be available if its parent block is inserted. This allows builders to establish a relationship between blocks, while limiting a nested block's discoverability. Currently, there are two relationships builders can use: `parent` and `ancestor`. The differences are:
+A common pattern for using InnerBlocks is to create a custom block that will only be available if its parent block is inserted. This allows builders to establish a relationship between blocks, while limiting a nested block's discoverability. There are three relationships that builders can use: `parent`, `ancestor` and `allowedBlocks`. The differences are:
 
 - If you assign a `parent` then you’re stating that the nested block can only be used and inserted as a __direct descendant of the parent__.
 - If you assign an `ancestor` then you’re stating that the nested block can only be used and inserted as a __descendent of the parent__.
+- If you assign the `allowedBlocks` then you’re stating a relationship in the opposite direction, i.e., which blocks can be used and inserted as __direct descendants of this block__.
 
 The key difference between `parent` and `ancestor` is `parent` has finer specificity, while an `ancestor` has greater flexibility in its nested hierarchy.
 
-### Defining Parent Block Relationship
+### Defining parent block relationship
 
 An example of this is the Column block, which is assigned the `parent` block setting. This allows the Column block to only be available as a nested direct descendant in its parent Columns block. Otherwise, the Column block will not be available as an option within the block inserter. See [Column code for reference](https://github.com/WordPress/gutenberg/tree/HEAD/packages/block-library/src/column).
 
@@ -133,7 +136,7 @@ When defining a direct descendent block, use the `parent` block setting to defin
 }
 ```
 
-### Defining Ancestor Block Relationship
+### Defining an ancestor block relationship
 
 An example of this is the Comment Author Name block, which is assigned the `ancestor` block setting. This allows the Comment Author Name block to only be available as a nested descendant in its ancestral Comment Template block. Otherwise, the Comment Author Name block will not be available as an option within the block inserter. See [Comment Author Name code for reference](https://github.com/WordPress/gutenberg/tree/HEAD/packages/block-library/src/comment-author-name).
 
@@ -150,7 +153,24 @@ When defining a descendent block, use the `ancestor` block setting. This prevent
 }
 ```
 
-## Using a React Hook
+### Defining a children block relationship
+
+An example of this is the Navigation block, which is assigned the `allowedBlocks` block setting. This makes only a certain subset of block types to be available as direct descendants of the Navigation block. See [Navigation code for reference](https://github.com/WordPress/gutenberg/tree/HEAD/packages/block-library/src/navigation).
+
+The `allowedBlocks` setting can be extended by builders of custom blocks. The custom block can hook into the `blocks.registerBlockType` filter and add itself to the available children of the Navigation.
+
+When defining a set of possible descendant blocks, use the `allowedBlocks` block setting. This limits what blocks are showing in the inserter when inserting a new child block.
+
+```json
+{
+	"title": "Navigation",
+	"name": "core/navigation",
+	"allowedBlocks": [ "core/navigation-link", "core/search", "core/social-links", "core/page-list", "core/spacer" ],
+	// ...
+}
+```
+
+## Using a React hook
 
 You can use a react hook called `useInnerBlocksProps` instead of the `InnerBlocks` component. This hook allows you to take more control over the markup of inner blocks areas.
 
diff --git a/docs/how-to-guides/block-tutorial/writing-your-first-block-type.md b/docs/how-to-guides/block-tutorial/writing-your-first-block-type.md
deleted file mode 100644
index 4a690984011e0f..00000000000000
--- a/docs/how-to-guides/block-tutorial/writing-your-first-block-type.md
+++ /dev/null
@@ -1,174 +0,0 @@
-# Create a basic block
-
-This guide takes you through creating a basic block to display a message in a post. This message will be fixed, we won't allow the user to edit the message, the goal of the guide is to show how to register and load a block.
-
-## Overview
-
-There are two main types of blocks: static and dynamic, this guide focuses on static blocks. A static block is used to insert HTML content into the post and save it with the post. A dynamic block builds the content on the fly when rendered on the front end, see the [dynamic blocks guide](/docs/how-to-guides/block-tutorial/creating-dynamic-blocks.md).
-
-<div class="callout callout-alert">
-This guide focuses on just the block, see the <a href="https://developer.wordpress.org/block-editor/getting-started/create-block/">Create a Block tutorial</a> for a complete setup.
-</div>
-
-## Before you start
-
-Static blocks are implemented in JavaScript, so a basic level of JavaScript is helpful, see the [Getting Started with JavaScript](/docs/how-to-guides/javascript/README.md) for a refresher.
-
-Blocks are added to WordPress using plugins, so you will need a WordPress development environment - see the [setup guide](/docs/getting-started/devenv/README.md).
-
-This tutorial demonstrates the creation of a block in two ways, using JSX and using plain JavaScript. JSX requires a build step, so if you choose to follow the JSX path you will need JavaScript build tools (node/npm). See Step 0 below for details on getting set up.
-
-## Step-by-step guide
-
-### Step 0: Set up your project
-
-_**Note:** this step is only needed if you are going to use the JSX examples in the following steps. If you intend to work with the plain JavaScript examples these will run without a build step so you can proceed straight to 'Step 1: Configure block.json' below._
-
-Before starting with the JSX examples you will need to set up your project. In your project directory run:
-
-```bash
-npm init
-```
-
-This will create a `package.json` file.
-
-You will then need to add `@wordpress/scripts` as a development dependency to `package.json`. You can do this with:
-
-```bash
-npm install @wordpress/scripts --save-dev
-```
-
-Next, add the following two lines to the `scripts` property in `package.json`:
-
-```json
-"start": "wp-scripts start",
-"build": "wp-scripts build"
-```
-
-You're all set!
-
-### Step 1: Configure block.json
-
-The functions of a static block are defined in JavaScript, however the settings and other metadata should be defined in a block.json file.
-
-Here are the basic settings:
-
--   `apiVersion`: Block API version
--   `title`: Block title shown in inserter
--   `name`: Unique name defines your block
--   `category`: Category in inserter (text, media, design, widgets, theme, embed)
--   `icon`: Dashicon icon displayed for block
--   `editorScript`: JavaScript file to load for block
-
-The `block.json` file should be added to your plugin. To start a new plugin, create a directory in `/wp-content/plugins/` in your WordPress.
-
-Create a basic `block.json` file there:
-
-
-```json
-{
-	"apiVersion": 3,
-	"title": "Example: Basic (ESNext)",
-	"name": "gutenberg-examples/example-01-basic-esnext",
-	"category": "layout",
-	"icon": "universal-access-alt",
-	"editorScript": "file:./build/index.js"
-}
-```
-### Step 2: Register block in plugin
-
-With the `block.json` in place, the registration for the block is a single function call in PHP, this will setup the block and JavaScript file specified in the `editorScript` property to load in the editor.
-
-Create a full plugin file, `index.php` like the following, the same PHP code works for both JSX and Plain code.
-
-```php
-<?php
-/**
- * Plugin Name: Gutenberg examples 01
- */
-function gutenberg_examples_01_register_block() {
-	register_block_type( __DIR__ );
-}
-add_action( 'init', 'gutenberg_examples_01_register_block' );
-```
-
-### Step 3: Block edit and save functions
-
-The `editorScript` entry is enqueued automatically in the block editor. This file contains the JavaScript portion of the block registration and defines two important functions for the block, the `edit` and `save` functions.
-
-The `edit` function is a component that is shown in the editor when the block is inserted.
-
-The `save` function is a component that defines the final markup returned by the block and saved in `post_content`.
-
-
-Add the following in `src/index.js`
-
-```jsx
-/**
- * WordPress dependencies
- */
-import { registerBlockType } from '@wordpress/blocks';
-
-// Register the block
-registerBlockType( 'gutenberg-examples/example-01-basic-esnext', {
-	edit: function () {
-		return <p> Hello world (from the editor)</p>;
-	},
-	save: function () {
-		return <p> Hola mundo (from the frontend) </p>;
-	},
-} );
-```
-
-
-### Step 4: Build or add dependency
-
-In order to register the block, an asset php file is required in the same directory as the directory used in `register_block_type()` and must begin with the script's filename.
-
-
-
-Build the scripts and asset file which is used to keep track of dependencies and the build version.
-
-```bash
-npm run build
-```
-
-
-### Step 5: Confirm
-
-Open your editor and try adding your new block. It will show in the inserter using the `title`.
-When inserted you will see the `Hello World (from the editor)` message.
-
-When you save the post and view it published, you will see the `Hola mundo (from the frontend)` message.
-
-**Troubleshooting** - If you run into any issues, here are a few things to try:
-
--   Check the filenames are correct and loading properly,
--   Check the developer console in your browser for errors,
--   If using JSX remember to build after each change
-
-## Conclusion
-
-This shows the most basic static block. The [block-development-examples](https://github.com/WordPress/block-development-examples) repository has complete examples for both.
-
--   [Basic Example with JSX build](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/basic-esnext-a2ab62)
-
--   [Basic Example Plain JavaScript](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/minimal-block-no-build-e621a6),
-
-**NOTE:** The examples include a more complete block setup with translation features included, it is recommended to follow those examples for a production block. The internationalization features were left out of this guide for simplicity and focusing on the very basics of a block.
-
-### Additional
-
-A couple of things to note when creating your blocks:
-
--   A block name must be prefixed with a namespace specific to your plugin. This helps prevent conflicts when more than one plugin registers a block with the same name. In this example, the namespace is `block-development-examples`.
-
--   Block names _must_ include only lowercase alphanumeric characters or dashes and start with a letter. Example: `my-plugin/my-custom-block`.
-
-### Resources
-
--   block.json [metadata reference](/docs/reference-guides/block-api/block-metadata.md) documentation
-
--   Block [edit and save function reference](/docs/reference-guides/block-api/block-edit-save.md)
-
--   [Dashicons icon set](https://developer.wordpress.org/resource/dashicons/)
diff --git a/docs/how-to-guides/curating-the-editor-experience.md b/docs/how-to-guides/curating-the-editor-experience.md
deleted file mode 100644
index 1d14918df7eb5b..00000000000000
--- a/docs/how-to-guides/curating-the-editor-experience.md
+++ /dev/null
@@ -1,459 +0,0 @@
-# Curating the Editor Experience
-
-The purpose of this guide is to offer various ways one can lock down and curate the experience of using WordPress, especially with the introduction of more design tools and full site editing functionality. 
-
-For information around adding functionality to a theme, rather than curating and locking, please review this guide on [Converting a classic theme to a block theme](https://developer.wordpress.org/themes/block-themes/converting-a-classic-theme-to-a-block-theme/).
-
-## Locking APIs
-
-**Lock the ability to move or remove specific blocks**
-
-Users have the ability to lock and unlock blocks via the editor. The locking UI has options for preventing blocks from being moved within the content canvas or removed:
-
-![Image of locking interface](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/Locking%20interface.png?raw=true)
-
-Keep in mind that you can apply locking options to blocks nested inside of a containing block by turning on the "Apply to all blocks inside" option. However, you cannot mass lock blocks otherwise.
-
-**Lock the ability to edit certain blocks**
-
-Alongside the ability to lock moving or removing blocks, the [Navigation Block](https://github.com/WordPress/gutenberg/pull/44739) and [Reusable block](https://github.com/WordPress/gutenberg/pull/39950) have an additional capability: lock the ability to edit the contents of the block. This locks the ability to make changes to any blocks inside of either block type. 
-
-**Apply block locking to patterns or templates**
-
-When building patterns or templates, theme authors can use these same UI tools to set the default locked state of blocks. For example, a theme author could lock various pieces of a header. Keep in mind that by default, users with editing access can unlock these blocks. [Here’s an example of a pattern](https://gist.github.com/annezazu/acee30f8b6e8995e1b1a52796e6ef805) with various blocks locked in different ways and here’s more context on [creating a template with locked blocks](https://make.wordpress.org/core/2022/02/09/core-editor-improvement-curated-experiences-with-locking-apis-theme-json/). You can build these patterns in the editor itself, including adding locking options, before following the [documentation to register them](/docs/reference-guides/block-api/block-patterns.md).
-
-**Apply content only editing in patterns or templates**
-
-This functionality was introduced in WordPress 6.1. In contrast to block locking, which disables the ability to move or remove blocks, content only editing is both designed for use at the pattern or template level and hides all design tools, while still allowing for the ability to edit the content of the blocks. This provides a great way to simplify the interface for users and preserve a design. When this option is added, the following changes occur:  
-
-- Non-content child blocks (containers, spacers, columns, etc) are hidden from list view, un-clickable on the canvas, and entirely un-editable.
-- The Inspector will display a list of all child 'content' blocks. Clicking a block in this list reveals its settings panel. 
-- The main List View only shows content blocks, all at the same level regardless of actual nesting.
-- Children blocks within the overall content locked container are automatically move / remove locked.
-- Additional child blocks cannot be inserted, further preserving the design and layout.
-- There is a link in the block toolbar to ‘Modify’ that a user can toggle on/off to have access to the broader design tools. Currently, it's not possibly to programmatically remove this option.
-
-This option can be applied to Columns, Cover, and Group blocks as well as third-party blocks that have the templateLock attribute in its block.json. To adopt this functionality, you need to use `"templateLock":"contentOnly"`. [Here's an example of a pattern](https://gist.github.com/annezazu/d62acd2514cea558be6cea97fe28ff3c) with this functionality in place. For more information, please [review the relevant documentation](/docs/reference-guides/block-api/block-templates.md#locking). 
-
-Note: There is no UI in place to manage content locking and it must be managed at the code level. 
-
-**Change permissions to control locking ability**
-
-Agencies and plugin authors can offer an even more curated experience by limiting which users have [permission to lock and unlock blocks](https://make.wordpress.org/core/2022/05/05/block-locking-settings-in-wordpress-6-0/). By default, anyone who is an administrator will have access to lock and unlock blocks. 
-
-Developers can add a filter to the [block_editor_settings_all](https://developer.wordpress.org/reference/hooks/block_editor_settings_all/) hook to configure permissions around locking blocks.  The hook passes two parameters to the callback function:
-
-- `$settings` - An array of configurable settings for the editor.
-
-- `$context` - An instance of WP_Block_Editor_Context, an object that contains information about the current editor.
-
-Specifically, developers can alter the `$settings['canLockBlocks']` value by setting it to `true` or `false`, typically by running through one or more conditional checks. 
-
-The following example disables block locking permissions for all users when editing a page:
-
-```php
-add_filter( 'block_editor_settings_all', function( $settings, $context ) {
-	if ( $context->post && 'page' === $context->post->post_type ) {
-		$settings['canLockBlocks'] = false;
-	}
-
-	return $settings;
-}, 10, 2 );
-```
-
-Another common use case may be to only allow users who can edit the visual design of the site (theme editing) to lock or unlock blocks.  The best option would be to test against the `edit_theme_options` capability, as shown in the following code snippet:
-
-```php
-add_filter( 'block_editor_settings_all', function( $settings ) {
-	$settings['canLockBlocks'] = current_user_can( 'edit_theme_options' );
-
-	return $settings;
-} );
-```
-
-Developers may use any type of conditional check to determine who can lock/unlock blocks. This is merely a small sampling of what is possible via the filter hook.
-
-
-## Providing default controls/options
-
-**Define default options**
-
-Since theme.json acts as a configuration tool, there are numerous ways to define at a granular level what options are available. This section will use duotone as an example since it showcases a feature that cuts across a few blocks and allows for varying levels of access.   
-
-*Duotone with Core options and customization available for each image related block:*
-
-```json
-{
-"version": 2,
-	"settings": {
-		"color": {
-			"customDuotone": true,
-			"duotone": [
-			]
-		}
-	}
-}
-```
-
-*Duotone with theme defined color options, Core options, and customization available for each image related block:*
-```json
-{
-	"version": 2,
-	"settings": {
-		"color": {
-			"duotone": [
-				{
-					"colors": [ "#000000", "#ffffff" ],
-					"slug": "foreground-and-background",
-					"name": "Foreground and background"
-				},
-				{
-					"colors": [ "#000000", "#ff0200" ],
-					"slug": "foreground-and-secondary",
-					"name": "Foreground and secondary"
-				},
-				{
-					"colors": [ "#000000", "#7f5dee" ],
-					"slug": "foreground-and-tertiary",
-					"name": "Foreground and tertiary"
-				},
-			]
-		}
-	}
-}
-```
-
-*Duotone with defined default options and all customization available for the Post Featured Image block:*
-
-```json
-{
-	"schema": "https://schemas.wp.org/trunk/theme.json",
-	"version": 2,
-	"settings": {
-		"color": {
-			"custom": true,
-			"customDuotone": true
-		},
-		"blocks": {
-			"core/post-featured-image": {
-				"color": {
-					"duotone": [
-						{
-							"colors": [ "#282828", "#ff5837" ],
-							"slug": "black-and-orange",
-							"name": "Black and Orange"
-						},
-						{
-							"colors": [ "#282828", "#0288d1" ],
-							"slug": "black-and-blue", 
-							"name": "Black and Blue"
-						}
-					],
-					"customDuotone": true,
-					"custom": true
-				}
-			}
-		}
-	}
-}
-```
-
-*Duotone with only defined default options and core options available for the Post Featured Image block (no customization):*
-
-```json
-{
-	"schema": "https://schemas.wp.org/trunk/theme.json",
-	"version": 2,
-	"settings": {
-		"color": {
-			"custom": true,
-			"customDuotone": true
-		},	
-		"blocks": {
-			"core/post-featured-image": {
-				"color": {
-					"duotone": [
-						{
-							"colors": [ "#282828", "#ff5837" ],
-							"slug": "black-and-orange",
-							"name": "Black and Orange"
-						},
-						{
-							"colors": [ "#282828", "#0288d1" ],
-							"slug": "black-and-blue",
-							"name": "Black and Blue"
-						}
-					],
-					"customDuotone": false,
-					"custom": false
-				}
-			}
-		} 
-	}
-}
-```
-
-## Limiting interface options with theme.json
-
-**Limit options on a per block basis**
-
-Beyond defining default values, using theme.json allows you to also remove options entirely and instead rely on what the theme has set in place. Below is a visual showing two extremes with the same paragraph block: 
-
-![Image of restricted interface](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/Locking%20comparison%20visual.png?raw=true)
-
-Continuing the examples with duotone, this means you could allow full access to all Duotone functionality for Image blocks and only limit the Post Featured Image block like so:
-
-```json
-{
-	"schema": "https://schemas.wp.org/trunk/theme.json",
-	"version": 2,
-	"settings": {
-		"color": {
-			"custom": true,
-			"customDuotone": true
-		},
-		"blocks": {
-			"core/image": {
-				"color": {
-					"duotone": [],
-					"customDuotone": true,
-					"custom": true
-				}
-			},
-			"core/post-featured-image": {
-				"color": {
-					"duotone": [],
-					"customDuotone": false,
-					"custom": false
-				}
-			}
-		}
-	}
-}
-```
-
-You can read more about how best to [turn on/off options with theme.json here](/docs/how-to-guides/themes/theme-json.md). 
-
-**Disable inherit default layout**
-
-To disable the “Inherit default layout” setting for container blocks like the Group block, remove the following section: 
-
-```json
-"layout": {
-	"contentSize": null,
-	"wideSize": null
-},
-```
-
-**Limit options globally**
-
-When using theme.json in a block or classic theme, these settings will stop the default color and typography controls from being enabled globally, greatly limiting what’s possible:
-
-```json
-{
-	"$schema": "http://schemas.wp.org/trunk/theme.json",
-	"version": 2,
-	"settings": {
-		"layout": {
-			"contentSize": "750px"
-		},
-		"color": {
-			"background": false,
-			"custom": false,
-			"customDuotone": false,
-			"customGradient": false,
-			"defaultGradients": false,
-			"defaultPalette": false,
-			"text": false
-		},
-		"typography": {
-			"customFontSize": false,
-			"dropCap": false,
-			"fontStyle": false,
-			"fontWeight": false,
-			"letterSpacing": false,
-			"lineHeight": false,
-			"textDecoration": false,
-			"textTransform": false
-		}
-	}
-}
-```
-
-To enable something from the above, just set whatever value you want to change to `true` for more granularity.
-
-## Limiting interface options with theme.json filters
-
-The theme.json file is a great way to control interface options, but it only allows for global or block-level modifications, which can be limiting in some scenarios.
-
-For instance, in the previous section, color and typography controls were disabled globally using theme.json. But let's say you want to enable color settings for users who are Administrators. 
-
-To provide more flexibility, WordPress 6.1 introduced server-side filters allowing you to customize theme.json data at four different data layers.
-
-- [`wp_theme_json_data_default`](https://developer.wordpress.org/reference/hooks/wp_theme_json_data_default/) - Hooks into the default data provided by WordPress
-- [`wp_theme_json_data_blocks`](https://developer.wordpress.org/reference/hooks/wp_theme_json_data_blocks/) - Hooks into the data provided by blocks.
-- [`wp_theme_json_data_theme`](https://developer.wordpress.org/reference/hooks/wp_theme_json_data_theme/) - Hooks into the data provided by the current theme.
-- [`wp_theme_json_data_user`](https://developer.wordpress.org/reference/hooks/wp_theme_json_data_user/) - Hooks into the data provided by the user.
-
-In the following example, the data from the current theme's theme.json file is updated using the `wp_theme_json_data_theme` filter. Color controls are restored if the current user is an Administrator.
-
-```php
-// Disable color controls for all users except Administrators.
-function example_filter_theme_json_data_theme( $theme_json ){
-    $is_administrator = current_user_can( 'edit_theme_options' );
-
-    if ( $is_administrator ) {
-        $new_data = array(
-            'version'  => 2,
-            'settings' => array(
-                'color' => array(
-                    'background'       => true,
-                    'custom'           => true,
-                    'customDuotone'    => true,
-                    'customGradient'   => true,
-                    'defaultGradients' => true,
-                    'defaultPalette'   => true,
-                    'text'             => true,
-                ),
-            ),
-        );
-    }
-
-	return $theme_json->update_with( $new_data );
-}
-add_filter( 'wp_theme_json_data_theme', 'example_filter_theme_json_data_theme' );
-```
-
-The filter receives an instance of the `WP_Theme_JSON_Data class` with the data for the respective layer. Then, you pass new data in a valid theme.json-like structure to the `update_with( $new_data )` method. A theme.json version number is required in `$new_data`. 
-
-
-## Limiting interface options with client-side filters
-
-WordPress 6.2 introduced a new client-side filter allowing you to modify block-level [theme.json settings](/docs/reference-guides/theme-json-reference/theme-json-living.md#settings) before the editor is rendered.
-
-The filter is called `blockEditor.useSetting.before` and can be used in the JavaScript code as follows:
-
-```js
-import { addFilter } from '@wordpress/hooks';
-
-/**
- * Limit the Column block's spacing options to pixels.
- */
-addFilter(
-	'blockEditor.useSetting.before',
-	'example/useSetting.before',
-	( settingValue, settingName, clientId, blockName ) => {
-		if ( blockName === 'core/column' && settingName === 'spacing.units' ) {
-			return [ 'px' ];
-		}
-		return settingValue;
-	}
-);
-```
-
-This example will restrict the available spacing units for the Column block to just pixels. As discussed above, a similar restriction could be applied using theme.json filters or directly in a theme’s theme.json file using block-level settings.
-
-However, the `blockEditor.useSetting.before` filter is unique because it allows you to modify settings according to the block’s location, neighboring blocks, the current user’s role, and more. The possibilities for customization are extensive.
-
-In the following example, text color controls are disabled for the Heading block whenever the block is placed inside of a Media & Text block.
-
-```js
-import { select } from  '@wordpress/data';
-import { addFilter } from '@wordpress/hooks';
-
-/**
- * Disable text color controls on Heading blocks when placed inside of Media & Text blocks.
- */
-addFilter(
-	'blockEditor.useSetting.before',
-	'example/useSetting.before',
-	( settingValue, settingName, clientId, blockName ) => {
-		if ( blockName === 'core/heading' ) {
-			const { getBlockParents, getBlockName } = select( 'core/block-editor' );
-			const blockParents = getBlockParents( clientId, true );
-			const inMediaText = blockParents.some( ( ancestorId ) => getBlockName( ancestorId ) === 'core/media-text' );
-
-			if ( inMediaText && settingName === 'color.text' ) {
-			    return false;
-			}
-		}
-
-		return settingValue;
-	}
-);
-```
-
-## Remove access to functionality
-
-**Remove access to the template editor**
-
-Whether you’re using [theme.json in a Classic Theme](https://developer.wordpress.org/themes/block-themes/converting-a-classic-theme-to-a-block-theme/#adding-theme-json-in-classic-themes) or Block Theme, you can add the following to your functions.php file to remove access to the Template Editor that is available when editing posts or pages:
-
-`remove_theme_support( 'block-templates');`
-
-This prevents both the ability to both create new block templates or edit them from within the Post Editor. 
-
-**Create an allow or disallow list to limit block options**
-
-There might be times when you don’t want access to a block at all to be available for users. To control what’s available in the inserter, you can take two approaches: [an allow list](/docs/reference-guides/filters/block-filters.md#using-an-allow-list) that disables all blocks except those on the list or a [deny list that unregisters specific blocks](/docs/reference-guides/filters/block-filters.md#using-a-deny-list). 
-
-**Disable pattern directory**
-
-To fully remove patterns bundled with WordPress core from being accessed in the Inserter, the following can be added to your functions.php file: 
-
-`remove_theme_support( 'core-block-patterns' );`
-
-## Utilizing patterns
-
-**Prioritize starter patterns for any post type**
-
-When a user creates new content, regardless of post type, they are met with an empty canvas. However, that experience can be improved thanks to the option to have patterns from a specific type prioritized upon creation of a new piece of content. The modal appears each time the user creates a new item when there are patterns on their website that declare support for the `core/post-content` block types. By default, WordPress does not include any of these patterns, so the modal will not appear without at least two of these post content patterns being added. 
-
-To opt into this, include `core/post-content` in the Block Types for your pattern. From there you can control which post types the pattern should show up for via the Post Types option. [Here's an example of a pattern](https://gist.github.com/annezazu/ead4c4965345251ec999b716c0c84f32) that would appear when creating a new post. 
-
-Read more about this functionality in the [Page creation patterns in WordPress 6.0 dev note](https://make.wordpress.org/core/2022/05/03/page-creation-patterns-in-wordpress-6-0/) and [note that WordPress 6.1 brought this functionality to all post types](https://make.wordpress.org/core/2022/10/10/miscellaneous-editor-changes-for-wordpress-6-1/#start-content-patterns-for-all-post-types).  
-
-**Prioritize starter patterns for template creation**
-
-In the same way patterns can be prioritized for new posts or pages, the same experience can be added to the template creation process. When patterns declare support for the 'templateTypes' property, the patterns will appear anytime a template that matches the designation is created, along with the options to start from a blank state or use the current fallback of the template. By default, WordPress does not include any of these patterns. 
-
-To opt into this, a pattern needs to specify a property called `templateTypes`, which is an array containing the templates where the patterns can be used as the full content. Here's an example of a pattern that would appear when creating a 404 template:
-
-```
-register_block_pattern(
-  'wp-my-theme/404-template-pattern',
-  array(
-     'title'      => __( '404 Only template pattern', 'wp-my-theme' ),
-     'templateTypes' => array( '404' ),
-     'content'    => '<!-- wp:paragraph {"align":"center","fontSize":"x-large"} --><p class="has-text-align-center has-x-large-font-size">404 pattern</p><!-- /wp:paragraph -->',
-  )
-);
-```
-
-Read more about this functionality in the [Patterns on the create a new template modal in the WordPress 6.3 dev note](https://make.wordpress.org/core/2023/07/18/miscellaneous-editor-changes-in-wordpress-6-3/#patterns-on-the-create-a-new-template-modal).
-
-**Lock patterns**
-
-As mentioned in the prior section on Locking APIs, aspects of patterns themselves can be locked so that the important aspects of the design can be preserved. [Here’s an example of a pattern](https://gist.github.com/annezazu/acee30f8b6e8995e1b1a52796e6ef805) with various blocks locked in different ways. You can build these patterns in the editor itself, including adding locking options, before [following the documentation to register them](/docs/reference-guides/block-api/block-patterns.md). 
-
-**Prioritize specific patterns from the Pattern Directory**
-
-With WordPress 6.0 themes can register patterns from [Pattern Directory](https://wordpress.org/patterns/) through theme.json. To accomplish this, themes should use the new patterns top level key in theme.json. Within this field, themes can list patterns to register from the Pattern Directory. The patterns field is an array of pattern slugs from the Pattern Directory. Pattern slugs can be extracted by the url in a single pattern view at the Pattern Directory. Example: This url https://wordpress.org/patterns/pattern/partner-logos the slug is partner-logos.
-```json
-{
-    "version": 2,
-    "patterns": [ "short-text-surrounded-by-round-images", "partner-logos" ]
-}
-```
-
-Note that this field requires using [version 2 of theme.json](/docs/reference-guides/theme-json-reference/theme-json-living.md). The content creator will then find the respective Pattern in the inserter “Patterns” tab in the categories that match the categories from the Pattern Directory.
-
-## Combining approaches
-
-Keep in mind that the above approaches can be combined as you see fit. For example, you can provide custom patterns to use when creating a new page while also limiting the amount of customization that can be done to aspects of them, like only allowing certain preset colors to be used for the background of a Cover block or locking down what blocks can be deleted. When considering the approaches to take, think about the specific ways you might want to both open up the experience and curate it. 
-
-## Additional Resources
-
-- [Builder Basics – Working with Templates in Full Site Editing (Part 3)](https://wordpress.tv/2022/05/24/nick-diego-builder-basics-working-with-templates-in-full-site-editing-part-3/)
-- [Core Editor Improvement: Curated experiences with locking APIs & theme.json](https://make.wordpress.org/core/2022/02/09/core-editor-improvement-curated-experiences-with-locking-apis-theme-json/)
-- [Learn WordPress session on Curating the Editor Experience](https://wordpress.tv/2022/07/22/nick-diego-curating-the-editor-experience/)
diff --git a/docs/how-to-guides/curating-the-editor-experience/README.md b/docs/how-to-guides/curating-the-editor-experience/README.md
new file mode 100644
index 00000000000000..3b348d67dee26d
--- /dev/null
+++ b/docs/how-to-guides/curating-the-editor-experience/README.md
@@ -0,0 +1,25 @@
+# Curating the Editor Experience
+
+Curating the editing experience in WordPress is important because it allows you to streamline the editing process, ensuring consistency and alignment with the site's style and branding guidelines. It also makes it easier for users to create and manage content effectively without accidental modifications or layout changes. This leads to a more efficient and personalized experience.
+
+The purpose of this guide is to offer various ways you can lock down and curate the experience of using WordPress, especially with the introduction of more design tools and the Site Editor. 
+
+In this section, you will learn:
+
+1. [**Block locking**](https://developer.wordpress.org/block-editor/how-to-guides/curating-the-editor-experience/block-locking): how to restrict user interactions with specific blocks in the Editor for better content control
+1. [**Patterns**](https://developer.wordpress.org/block-editor/how-to-guides/curating-the-editor-experience/patterns): about creating and implementing predefined block layouts to ensure design and content uniformity
+1. [**theme.json**](https://developer.wordpress.org/block-editor/how-to-guides/curating-the-editor-experience/theme-json): to configure global styles and settings for your theme using the theme.json file
+1. [**Filters and hooks**](https://developer.wordpress.org/block-editor/how-to-guides/curating-the-editor-experience/filters-and-hooks): about the essential filters and hooks used to modify the Editor
+1. [**Disabling Editor functionality**](https://developer.wordpress.org/block-editor/how-to-guides/curating-the-editor-experience/disable-editor-functionality): about additional ways to selectively disable features or components in the Editor to streamline the user experience
+
+## Combining approaches
+
+Remember that the approaches provided in the documentation above can be combined as you see fit. For example, you can provide custom patterns to use when creating a new page while also limiting the amount of customization that can be done to aspects of them, like only allowing specific preset colors to be used for the background of a Cover block or locking down what blocks can be deleted. 
+
+When considering the approaches to take, think about the specific ways you might want to both open up the experience and curate it. 
+
+## Additional resources
+
+- [Builder Basics – Working with Templates in Full Site Editing (Part 3)](https://wordpress.tv/2022/05/24/nick-diego-builder-basics-working-with-templates-in-full-site-editing-part-3/)
+- [Core Editor Improvement: Curated experiences with locking APIs & theme.json](https://make.wordpress.org/core/2022/02/09/core-editor-improvement-curated-experiences-with-locking-apis-theme-json/)
+- [Learn WordPress session on Curating the Editor Experience](https://wordpress.tv/2022/07/22/nick-diego-curating-the-editor-experience/)
diff --git a/docs/how-to-guides/curating-the-editor-experience/block-locking.md b/docs/how-to-guides/curating-the-editor-experience/block-locking.md
new file mode 100644
index 00000000000000..83f26ea87a479e
--- /dev/null
+++ b/docs/how-to-guides/curating-the-editor-experience/block-locking.md
@@ -0,0 +1,69 @@
+# Block Locking API
+
+The Block Locking API allows you to restrict actions on specific blocks within the Editor. This API can be used to prevent users from moving, removing, or editing certain blocks, ensuring layout consistency and content integrity.
+
+## Lock the ability to move or remove specific blocks
+
+Users can lock and unlock blocks via the Editor. The locking UI has options for preventing blocks from being moved within the content canvas or removed:
+
+![Image of locking interface](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/Locking%20interface.png?raw=true)
+
+Keep in mind that you can apply locking options to blocks nested inside of a containing block by turning on the "Apply to all blocks inside" option. However, you cannot mass lock blocks otherwise.
+
+## Lock the ability to edit certain blocks
+
+Alongside the ability to lock moving or removing blocks, the [Navigation Block](https://github.com/WordPress/gutenberg/pull/44739) and [Reusable block](https://github.com/WordPress/gutenberg/pull/39950) have an additional capability: lock the ability to edit the contents of the block. This locks the ability to make changes to any blocks inside of either block type. 
+
+## Apply block locking to patterns or templates
+
+When building patterns or templates, theme authors can use these same UI tools to set the default locked state of blocks. For example, a theme author could lock various pieces of a header. Keep in mind that by default, users with editing access can unlock these blocks. [Here’s an example of a pattern](https://gist.github.com/annezazu/acee30f8b6e8995e1b1a52796e6ef805) with various blocks locked in different ways and here’s more context on [creating a template with locked blocks](https://make.wordpress.org/core/2022/02/09/core-editor-improvement-curated-experiences-with-locking-apis-theme-json/). You can build these patterns in the Editor itself, including adding locking options, before following the [documentation to register them](/docs/reference-guides/block-api/block-patterns.md).
+
+## Apply content-only editing in patterns or templates
+
+This functionality was introduced in WordPress 6.1. In contrast to block locking, which disables the ability to move or remove blocks, content-only editing is both designed for use at the pattern or template level and hides all design tools, while still allowing for the ability to edit the content of the blocks. This provides a great way to simplify the interface for users and preserve a design. When this option is added, the following changes occur:  
+
+- Non-content child blocks (containers, spacers, columns, etc) are hidden from list view, un-clickable on the canvas, and entirely un-editable.
+- The Inspector will display a list of all child 'content' blocks. Clicking a block in this list reveals its settings panel. 
+- The main List View only shows content blocks, all at the same level regardless of actual nesting.
+- Children blocks within the overall content locked container are automatically move / remove locked.
+- Additional child blocks cannot be inserted, further preserving the design and layout.
+- There is a link in the block toolbar to ‘Modify’ that a user can toggle on/off to have access to the broader design tools. Currently, it's not possibly to programmatically remove this option.
+
+This option can be applied to Columns, Cover, and Group blocks as well as third-party blocks that have the templateLock attribute in its block.json. To adopt this functionality, you need to use `"templateLock":"contentOnly"`. [Here's an example of a pattern](https://gist.github.com/annezazu/d62acd2514cea558be6cea97fe28ff3c) with this functionality in place. For more information, please [review the relevant documentation](/docs/reference-guides/block-api/block-templates.md#locking). 
+
+Note: There is no UI in place to manage content locking and it must be managed at the code level. 
+
+## Change permissions to control locking ability
+
+Agencies and plugin authors can offer an even more curated experience by limiting which users have [permission to lock and unlock blocks](https://make.wordpress.org/core/2022/05/05/block-locking-settings-in-wordpress-6-0/). By default, anyone who is an administrator will have access to lock and unlock blocks. 
+
+Developers can add a filter to the [block_editor_settings_all](https://developer.wordpress.org/reference/hooks/block_editor_settings_all/) hook to configure permissions around locking blocks.  The hook passes two parameters to the callback function:
+
+- `$settings` - An array of configurable settings for the Editor.
+- `$context` - An instance of WP_Block_Editor_Context, an object that contains information about the current Editor.
+
+Specifically, developers can alter the `$settings['canLockBlocks']` value by setting it to `true` or `false`, typically by running through one or more conditional checks. 
+
+The following example disables block locking permissions for all users when editing a page:
+
+```php
+add_filter( 'block_editor_settings_all', function( $settings, $context ) {
+	if ( $context->post && 'page' === $context->post->post_type ) {
+		$settings['canLockBlocks'] = false;
+	}
+
+	return $settings;
+}, 10, 2 );
+```
+
+Another common use case may be to only allow users who can edit the visual design of the site (theme editing) to lock or unlock blocks. Now, the best option would be to test against the `edit_theme_options` capability, as shown in the following code snippet:
+
+```php
+add_filter( 'block_editor_settings_all', function( $settings ) {
+	$settings['canLockBlocks'] = current_user_can( 'edit_theme_options' );
+
+	return $settings;
+} );
+```
+
+Developers may use any type of conditional check to determine who can lock/unlock blocks. This is merely a small sampling of what is possible via the filter hook.
\ No newline at end of file
diff --git a/docs/how-to-guides/curating-the-editor-experience/disable-editor-functionality.md b/docs/how-to-guides/curating-the-editor-experience/disable-editor-functionality.md
new file mode 100644
index 00000000000000..a20d2cf9d8b8a7
--- /dev/null
+++ b/docs/how-to-guides/curating-the-editor-experience/disable-editor-functionality.md
@@ -0,0 +1,138 @@
+# Disable Editor functionality
+
+This page is dedicated to the many ways you can disable specific functionality in the Post Editor and Site Editor that are not covered in other areas of the curation documentation.
+
+## Restrict block options
+
+There might be times when you don’t want access to a block at all to be available for users. To control what’s available in the inserter, you can take two approaches: [an allow list](/docs/reference-guides/filters/block-filters.md#using-an-allow-list) that disables all blocks except those on the list or a [deny list that unregisters specific blocks](/docs/reference-guides/filters/block-filters.md#using-a-deny-list).
+
+## Curate heading levels
+
+Core WordPress blocks with a heading level dropdown include support for the `levelOptions` attribute. This applies to the Heading, Site Title, Site Tagline, Query Title, Post Title, and Comments Title blocks. The `levelOptions` attribute accepts an array of numbers corresponding to heading levels, where `1` represents H1, `2` represents H2, and so on.
+
+This attribute allows you to specify which heading levels should appear in the dropdown UI, providing a lightweight curation method that does not require block deprecations. Any existing heading levels are preserved in the markup, while `levelOptions` only affects the UI display.
+
+You can apply this attribute directly in the block markup, a technique that will be commonly used in block templates, template parts, and patterns. For example, the following markup disables H1, H2, and H6 in the Heading block by setting `"levelOptions":[3,4,5]`.
+
+```html
+<!-- wp:heading {"level":3,"levelOptions":[3,4,5],"className":"wp-block-heading"} -->
+<h3 class="wp-block-heading">Markup example</h3>
+<!-- /wp:heading -->
+```
+
+You can also use [block filters](/docs/reference-guides/filters/block-filters.md) to set the default value of this attribute globally or for specific blocks. The example below disables H1, H2, and H6 for all Heading blocks. You can further customize this by restricting certain heading levels based on conditions like user capabilities.
+
+```php
+function example_modify_heading_levels_globally( $args, $block_type ) {
+	
+	if ( 'core/heading' !== $block_type ) {
+		return $args;
+	}
+
+	// Remove H1, H2, and H6.
+	$args['attributes']['levelOptions']['default'] = [ 3, 4, 5 ];
+	
+	return $args;
+}
+add_filter( 'register_block_type_args', 'example_modify_heading_levels_globally', 10, 2 );
+```
+
+## Disable the Pattern Directory
+
+To fully remove patterns bundled with WordPress core from being accessed in the Inserter, the following can be added to your `functions.php` file:
+
+```php
+function example_theme_support() {
+	remove_theme_support( 'core-block-patterns' );
+}
+add_action( 'after_setup_theme', 'example_theme_support' );
+```
+
+## Disable block variations
+
+Some Core blocks are actually [block variations](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-variations/). A great example is the Row and Stack blocks, which are actually variations of the Group block. If you want to disable these "blocks", you actually need to disable the respective variations.
+
+Block variations are registered using JavaScript and need to be disabled with JavaScript. The code below will disable the Row variation.
+
+```js
+wp.domReady( () => {
+	wp.blocks.unregisterBlockVariation( 'core/group', 'group-row' );
+});
+```
+
+Assuming the code was placed in a `disable-variations.js` file located in the root of your theme folder, you can enqueue this file in the theme's `functions.php` using the code below.
+
+```php
+function example_disable_variations_script() {
+	wp_enqueue_script(
+		'example-disable-variations-script',
+		get_template_directory_uri() . '/disable-variations.js',
+       	array( 'wp-dom-ready' ),
+		wp_get_theme()->get( 'Version' ),
+		true
+	);
+}
+add_action( 'enqueue_block_editor_assets', 'example_disable_variations_script' );
+```
+
+## Disable block styles
+
+There are a few Core blocks that include their own [block styles](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-styles/). An example is the Image block, which includes a block style for rounded images called "Rounded". You many not want your users to round images, or you might prefer to use the border-radius control instead of the block style. Either way, it's easy to disable any unwanted block styles.
+
+Unlike block variations, you can register styles in either JavaScript or PHP. If a style was registered in JavaScript, it must be disabled with JavaScript. If registered using PHP, the style can be disabled with either. All Core block styles are registered in JavaScript.
+
+So, you would use the following code to disable the "Rounded" block style for the Image block.
+
+```js
+wp.domReady( () => {
+	wp.blocks.unregisterBlockStyle( 'core/image', 'rounded' );
+});
+```
+
+This JavaScript should be enqueued much like the block variation example above. Refer to the [block styles](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-styles/) documentation for how to register and unregister styles using PHP.
+
+## Disable access to the Template Editor
+
+Whether you’re using theme.json in a Classic or Block theme, you can add the following to your `functions.php` file to remove access to the Template Editor that is available when editing posts or pages:
+
+```php
+function example_theme_support() {
+	remove_theme_support( 'block-templates');
+}
+add_action( 'after_setup_theme', 'example_theme_support' );
+```
+
+This prevents both the ability to create new block templates or edit them from within the Post Editor.
+
+## Disable access to the Code Editor
+
+The Code Editor allows you to view the underlying block markup for a page or post. While this view is handy for experienced users, you can inadvertently break block markup by editing content. Add the following to your `functions.php` file to restrict access.
+
+```php
+function example_restrict_code_editor_access( $settings, $context ) {
+    $settings[ 'codeEditingEnabled' ] = false;
+
+	return $settings;
+}
+add_filter( 'block_editor_settings_all', 'example_restrict_code_editor_access', 10, 2 );
+```
+
+This code prevents all users from accessing the Code Editor. You could also add [capability](https://wordpress.org/documentation/article/roles-and-capabilities/) checks to disable access for specific users.
+
+## Disable formatting options for RichText blocks
+
+Blocks that support [RichText](https://developer.wordpress.org/block-editor/reference-guides/richtext/) come with the default formatting options provided by WordPress.
+
+Formatting options need to be disabled with JavaScript using `unregisterFormatType`. The code below will globally disable the Inline Image, Language, Keyboard Input, Subscript, and Superscript options.
+
+```js
+wp.domReady( () => {
+	wp.richText.unregisterFormatType( 'core/image' );
+	wp.richText.unregisterFormatType( 'core/language' );
+	wp.richText.unregisterFormatType( 'core/keyboard' );
+	wp.richText.unregisterFormatType( 'core/subscript' );
+	wp.richText.unregisterFormatType( 'core/superscript' );
+});
+```
+
+This JavaScript should be enqueued much like the block variation example above.
\ No newline at end of file
diff --git a/docs/how-to-guides/curating-the-editor-experience/filters-and-hooks.md b/docs/how-to-guides/curating-the-editor-experience/filters-and-hooks.md
new file mode 100644
index 00000000000000..b28fdf7d9e5db1
--- /dev/null
+++ b/docs/how-to-guides/curating-the-editor-experience/filters-and-hooks.md
@@ -0,0 +1,179 @@
+# Filters and hooks
+
+The Editor provides numerous filters and hooks that allow you to modify the editing experience. Here are a few.
+
+## Editor settings
+
+One of the most common ways to modify the Editor is through the [`block_editor_settings_all`](https://developer.wordpress.org/reference/hooks/block_editor_settings_all/) PHP filter, which is applied before settings are sent to the initialized Editor. 
+
+The `block_editor_settings_all` hook passes two parameters to the callback function:
+
+- `$settings` – An array of [configurable settings](https://developer.wordpress.org/block-editor/reference-guides/filters/editor-filters/#editor-settings) for the Editor.
+- `$context` – An instance of [`WP_Block_Editor_Context`](https://developer.wordpress.org/reference/classes/wp_block_editor_context/), an object that contains information about the current Editor.
+
+The following example disables the Code Editor for users who cannot activate plugins (Administrators). Add this to a plugin or your theme's `functions.php` file to test it.
+
+```php
+add_filter( 'block_editor_settings_all', 'example_restrict_code_editor' );
+
+function example_restrict_code_editor( $settings ) {
+	$can_active_plugins = current_user_can( 'activate_plugins' );
+
+	// Disable the Code Editor for users that cannot activate plugins (Administrators).
+	if ( ! $can_active_plugins ) {
+		$settings[ 'codeEditingEnabled' ] = false;
+	}
+
+	return $settings;
+}
+```
+
+For more examples, check out the [Editor Hooks](https://developer.wordpress.org/block-editor/reference-guides/filters/editor-filters/) documentation that includes the following use cases: 
+
+- [Set a default image size](https://developer.wordpress.org/block-editor/reference-guides/filters/editor-filters/#set-a-default-image-size)
+- [Disable Openverse](https://developer.wordpress.org/block-editor/reference-guides/filters/editor-filters/#disable-openverse)
+- [Disable the Font Library](https://developer.wordpress.org/block-editor/reference-guides/filters/editor-filters/#disable-the-font-library)
+- [Disable block inspector tabs](https://developer.wordpress.org/block-editor/reference-guides/filters/editor-filters/#disable-block-inspector-tabs)
+
+## Server-side theme.json filters
+
+The theme.json file is a great way to control interface options, but it only allows for global or block-level modifications, which can be limiting in some scenarios.
+
+For instance, in the previous section, color and typography controls were disabled globally using theme.json. But let's say you want to enable color settings for users who are Administrators. 
+
+To provide more flexibility, WordPress 6.1 introduced server-side filters allowing you to customize theme.json data at four different data layers.
+
+- [`wp_theme_json_data_default`](https://developer.wordpress.org/reference/hooks/wp_theme_json_data_default/) - Hooks into the default data provided by WordPress
+- [`wp_theme_json_data_blocks`](https://developer.wordpress.org/reference/hooks/wp_theme_json_data_blocks/) - Hooks into the data provided by blocks.
+- [`wp_theme_json_data_theme`](https://developer.wordpress.org/reference/hooks/wp_theme_json_data_theme/) - Hooks into the data provided by the current theme.
+- [`wp_theme_json_data_user`](https://developer.wordpress.org/reference/hooks/wp_theme_json_data_user/) - Hooks into the data provided by the user.
+
+In the following example, the data from the current theme's theme.json file is updated using the `wp_theme_json_data_theme` filter. Color controls are restored if the current user is an Administrator.
+
+```php
+// Disable color controls for all users except Administrators.
+function example_filter_theme_json_data_theme( $theme_json ){
+    $is_administrator = current_user_can( 'edit_theme_options' );
+
+    if ( $is_administrator ) {
+        $new_data = array(
+            'version'  => 2,
+            'settings' => array(
+                'color' => array(
+                    'background'       => true,
+                    'custom'           => true,
+                    'customDuotone'    => true,
+                    'customGradient'   => true,
+                    'defaultGradients' => true,
+                    'defaultPalette'   => true,
+                    'text'             => true,
+                ),
+            ),
+        );
+    }
+
+	return $theme_json->update_with( $new_data );
+}
+add_filter( 'wp_theme_json_data_theme', 'example_filter_theme_json_data_theme' );
+```
+
+The filter receives an instance of the `WP_Theme_JSON_Data class` with the data for the respective layer. Then, you pass new data in a valid theme.json-like structure to the `update_with( $new_data )` method. A theme.json version number is required in `$new_data`. 
+
+
+## Client-side (Editor) filters
+
+WordPress 6.2 introduced a new client-side filter allowing you to modify block-level [theme.json settings](/docs/reference-guides/theme-json-reference/theme-json-living.md#settings) before the Editor is rendered.
+
+The filter is called `blockEditor.useSetting.before` and can be used in the JavaScript code as follows:
+
+```js
+import { addFilter } from '@wordpress/hooks';
+
+/**
+ * Limit the Column block's spacing options to pixels.
+ */
+addFilter(
+	'blockEditor.useSetting.before',
+	'example/useSetting.before',
+	( settingValue, settingName, clientId, blockName ) => {
+		if ( blockName === 'core/column' && settingName === 'spacing.units' ) {
+			return [ 'px' ];
+		}
+		return settingValue;
+	}
+);
+```
+
+This example will restrict the available spacing units for the Column block to just pixels. As discussed above, a similar restriction could be applied using theme.json filters or directly in a theme’s theme.json file using block-level settings.
+
+However, the `blockEditor.useSetting.before` filter is unique because it allows you to modify settings according to the block’s location, neighboring blocks, the current user’s role, and more. The possibilities for customization are extensive.
+
+In the following example, text color controls are disabled for the Heading block whenever the block is placed inside of a Media & Text block.
+
+```js
+import { select } from  '@wordpress/data';
+import { addFilter } from '@wordpress/hooks';
+
+/**
+ * Disable text color controls on Heading blocks when placed inside of Media & Text blocks.
+ */
+addFilter(
+	'blockEditor.useSetting.before',
+	'example/useSetting.before',
+	( settingValue, settingName, clientId, blockName ) => {
+		if ( blockName === 'core/heading' ) {
+			const { getBlockParents, getBlockName } = select( 'core/block-editor' );
+			const blockParents = getBlockParents( clientId, true );
+			const inMediaText = blockParents.some( ( ancestorId ) => getBlockName( ancestorId ) === 'core/media-text' );
+
+			if ( inMediaText && settingName === 'color.text' ) {
+			    return false;
+			}
+		}
+
+		return settingValue;
+	}
+);
+```
+
+## Block Filters
+
+Beyond curating the Editor itself, there are many ways that you can modify individual blocks. Perhaps you want to disable particular block supports like background color or define which settings should be displayed by default on specific blocks.
+
+One of the most commonly used filters is [`block_type_metadata`](https://developer.wordpress.org/reference/hooks/block_type_metadata/). It allows you to filter the raw metadata loaded from a block's `block.json` file when a block type is registered on the server with PHP. 
+
+The filter takes one parameter:
+
+- `$metadata` (`array`) – metadata loaded from `block.json` for registering a block type.
+
+The `$metadata` array contains everything you might want to know about a block, from its description and [attributes](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/) to block [supports](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/). 
+
+In the following example, background color and gradient support are disabled for Heading blocks.
+
+```php
+function example_disable_heading_background_color_and_gradients( $metadata ) {
+
+    // Only apply the filter to Heading blocks.
+    if ( ! isset( $metadata['name'] ) || 'core/heading' !== $metadata['name'] ) {
+        return $metadata;
+    }
+
+    // Check if 'supports' key exists.
+    if ( isset( $metadata['supports'] ) && isset( $metadata['supports']['color'] ) ) {
+
+        // Remove Background color and Gradients support.
+        $metadata['supports']['color']['background'] = false;
+        $metadata['supports']['color']['gradients']  = false;
+    }
+
+    return $metadata;
+}
+add_filter( 'block_type_metadata', 'example_disable_heading_background_color_and_gradients' );
+```
+
+You can learn more about the available block filters in the [Block Filters](https://developer.wordpress.org/block-editor/reference-guides/filters/block-filters/) documentation.
+
+## Additional resources
+
+- [How to modify theme.json data using server-side filters](https://developer.wordpress.org/news/2023/07/05/how-to-modify-theme-json-data-using-server-side-filters/) (WordPress Developer Blog)
+- [Curating the Editor experience with client-side filters](https://developer.wordpress.org/news/2023/05/24/curating-the-editor-experience-with-client-side-filters/) (WordPress Developer Blog)
\ No newline at end of file
diff --git a/docs/how-to-guides/curating-the-editor-experience/patterns.md b/docs/how-to-guides/curating-the-editor-experience/patterns.md
new file mode 100644
index 00000000000000..abb7d131041dfb
--- /dev/null
+++ b/docs/how-to-guides/curating-the-editor-experience/patterns.md
@@ -0,0 +1,90 @@
+# Patterns
+
+Block [patterns](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-patterns/) are one of the best ways to provide users with unique and curated editing experiences. 
+
+## Prioritize starter patterns for any post type
+
+When a user creates new content, regardless of post type, they are met with an empty canvas. However, that experience can be improved thanks to the option to have patterns from a specific type prioritized upon creation of a new piece of content. The modal appears each time the user creates a new item when there are patterns on their website that declare support for the `core/post-content` block types. By default, WordPress does not include any of these patterns, so the modal will not appear without at least two of these post content patterns being added. 
+
+To opt into this, include `core/post-content` in the Block Types for your pattern. From there, you can control which post types the pattern should show up for via the Post Types option. Here's an example of a pattern that would appear when creating a new post. 
+
+```php
+<?php
+ /**
+  * Title: New Event Announcement
+  * Slug: twentytwentytwo/new-event-announcement
+  * Block Types: core/post-content
+  * Post Types: post
+  * Categories: featured, text
+  */
+?>
+
+<!-- wp:heading {"lock":{"move":false,"remove":true}} -->
+<h2>Details</h2>
+<!-- /wp:heading -->
+
+<!-- wp:heading {"lock":{"move":false,"remove":true}} -->
+<h2>Directions</h2>
+<!-- /wp:heading -->
+
+<!-- wp:heading {"lock":{"move":false,"remove":true}} -->
+<h2>RSVP</h2>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph {"lock":{"move":true,"remove":true}} -->
+<p>To RSVP, please join the #fse-outreach-experiment in Make Slack. </p>
+<!-- /wp:paragraph -->
+
+<!-- wp:buttons -->
+<div class="wp-block-buttons"><!-- wp:button {"lock":{"move":true,"remove":false}} -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button">Learn more</a></div>
+<!-- /wp:button --></div>
+<!-- /wp:buttons -->
+
+<!-- wp:cover {"useFeaturedImage":true,"dimRatio":80,"overlayColor":"primary","contentPosition":"center center","align":"full"} -->
+<div class="wp-block-cover alignfull"><span aria-hidden="true" class="wp-block-cover__background has-primary-background-color has-background-dim-80 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"Write titleā€¦","fontSize":"large"} -->
+<p class="has-text-align-center has-large-font-size">We hope to see you there!</p>
+<!-- /wp:paragraph --></div></div>
+<!-- /wp:cover -->
+```
+
+Read more about this functionality in the [Page creation patterns in WordPress 6.0 dev note](https://make.wordpress.org/core/2022/05/03/page-creation-patterns-in-wordpress-6-0/) and [note that WordPress 6.1 brought this functionality to all post types](https://make.wordpress.org/core/2022/10/10/miscellaneous-editor-changes-for-wordpress-6-1/#start-content-patterns-for-all-post-types).  
+
+## Prioritize starter patterns for template creation
+
+In the same way patterns can be prioritized for new posts or pages, the same experience can be added to the template creation process. When patterns declare support for the 'templateTypes' property, the patterns will appear anytime a template that matches the designation is created, along with the options to start from a blank state or use the current fallback of the template. By default, WordPress does not include any of these patterns. 
+
+To opt into this, a pattern needs to specify a property called `templateTypes`, which is an array containing the templates where the patterns can be used as the full content. Here's an example of a pattern that would appear when creating a 404 template:
+
+```php
+register_block_pattern(
+  'wp-my-theme/404-template-pattern',
+  array(
+      'title'         => __( '404 Only template pattern', 'wp-my-theme' ),
+      'templateTypes' => array( '404' ),
+      'content'       => '<!-- wp:paragraph {"align":"center","fontSize":"x-large"} --><p class="has-text-align-center has-x-large-font-size">404 pattern</p><!-- /wp:paragraph -->',
+  )
+);
+```
+
+Read more about this functionality in the [Patterns on the create a new template modal in the WordPress 6.3 dev note](https://make.wordpress.org/core/2023/07/18/miscellaneous-editor-changes-in-wordpress-6-3/#patterns-on-the-create-a-new-template-modal).
+
+## Lock patterns
+
+As mentioned in the prior section on Locking APIs, aspects of patterns themselves can be locked so that the important aspects of the design can be preserved. [Here’s an example of a pattern](https://gist.github.com/annezazu/acee30f8b6e8995e1b1a52796e6ef805) with various blocks locked in different ways. You can build these patterns in the editor itself, including adding locking options, before [following the documentation to register them](/docs/reference-guides/block-api/block-patterns.md). 
+
+## Prioritize specific patterns from the Pattern Directory
+
+With WordPress 6.0 themes can register patterns from [Pattern Directory](https://wordpress.org/patterns/) through theme.json. To accomplish this, themes should use the new patterns top level key in theme.json. Within this field, themes can list patterns to register from the Pattern Directory. The patterns field is an array of pattern slugs from the Pattern Directory. Pattern slugs can be extracted by the url in a single pattern view at the Pattern Directory. Example: This url https://wordpress.org/patterns/pattern/partner-logos the slug is partner-logos.
+
+```json
+{
+    "patterns": [ "short-text-surrounded-by-round-images", "partner-logos" ]
+}
+```
+
+The content creator will then find the respective Pattern in the inserter “Patterns” tab in the categories that match the categories from the Pattern Directory.
+
+## Additional resources
+
+- [Using template patterns to build multiple homepage designs](https://developer.wordpress.org/news/2023/04/13/using-template-patterns-to-build-multiple-homepage-designs/) (WordPress Developer Blog)
\ No newline at end of file
diff --git a/docs/how-to-guides/curating-the-editor-experience/theme-json.md b/docs/how-to-guides/curating-the-editor-experience/theme-json.md
new file mode 100644
index 00000000000000..d14f29e0a76f3e
--- /dev/null
+++ b/docs/how-to-guides/curating-the-editor-experience/theme-json.md
@@ -0,0 +1,206 @@
+# theme.json
+
+A theme's theme.json file is one of the best ways to curate the Editor experience and will likely be the first tool you use before reaching for more sophisticated solutions. 
+
+## Providing default controls/options
+
+Since theme.json acts as a configuration tool, there are numerous ways to define at a granular level what options are available. This section will use duotone as an example since it showcases a feature that cuts across a few blocks and allows for varying levels of access.   
+
+*Duotone with Core options and customization available for each image related block:*
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"color": {
+			"customDuotone": true,
+			"duotone": [
+			]
+		}
+	}
+}
+```
+
+*Duotone with theme defined color options, Core options, and customization available for each image related block:*
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"color": {
+			"duotone": [
+				{
+					"colors": [ "#000000", "#ffffff" ],
+					"slug": "foreground-and-background",
+					"name": "Foreground and background"
+				},
+				{
+					"colors": [ "#000000", "#ff0200" ],
+					"slug": "foreground-and-secondary",
+					"name": "Foreground and secondary"
+				},
+				{
+					"colors": [ "#000000", "#7f5dee" ],
+					"slug": "foreground-and-tertiary",
+					"name": "Foreground and tertiary"
+				},
+			]
+		}
+	}
+}
+```
+
+*Duotone with defined default options and all customization available for the Post Featured Image block:*
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"color": {
+			"custom": true,
+			"customDuotone": true
+		},
+		"blocks": {
+			"core/post-featured-image": {
+				"color": {
+					"duotone": [
+						{
+							"colors": [ "#282828", "#ff5837" ],
+							"slug": "black-and-orange",
+							"name": "Black and Orange"
+						},
+						{
+							"colors": [ "#282828", "#0288d1" ],
+							"slug": "black-and-blue", 
+							"name": "Black and Blue"
+						}
+					],
+					"customDuotone": true,
+					"custom": true
+				}
+			}
+		}
+	}
+}
+```
+
+*Duotone with only defined default options and core options available for the Post Featured Image block (no customization):*
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"color": {
+			"custom": true,
+			"customDuotone": true
+		},	
+		"blocks": {
+			"core/post-featured-image": {
+				"color": {
+					"duotone": [
+						{
+							"colors": [ "#282828", "#ff5837" ],
+							"slug": "black-and-orange",
+							"name": "Black and Orange"
+						},
+						{
+							"colors": [ "#282828", "#0288d1" ],
+							"slug": "black-and-blue",
+							"name": "Black and Blue"
+						}
+					],
+					"customDuotone": false,
+					"custom": false
+				}
+			}
+		} 
+	}
+}
+```
+
+## Limiting interface options with theme.json
+
+### Limit options on a per-block basis
+
+Beyond defining default values, using theme.json allows you to also remove options entirely and instead rely on what the theme has set in place. Below is a visual showing two extremes with the same paragraph block: 
+
+![Image of restricted interface](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/Locking%20comparison%20visual.png?raw=true)
+
+Continuing the examples with duotone, this means you could allow full access to all Duotone functionality for Image blocks and only limit the Post Featured Image block like so:
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"color": {
+			"custom": true,
+			"customDuotone": true
+		},
+		"blocks": {
+			"core/image": {
+				"color": {
+					"duotone": [],
+					"customDuotone": true,
+					"custom": true
+				}
+			},
+			"core/post-featured-image": {
+				"color": {
+					"duotone": [],
+					"customDuotone": false,
+					"custom": false
+				}
+			}
+		}
+	}
+}
+```
+
+You can read more about how best to [turn on/off options with theme.json here](/docs/how-to-guides/themes/global-settings-and-styles.md). 
+
+### Disable inherit default layout
+
+To disable the “Inherit default layout” setting for container blocks like the Group block, remove the following section: 
+
+```json
+"layout": {
+	"contentSize": null,
+	"wideSize": null
+},
+```
+
+### Limit options globally
+
+When using theme.json in a block or classic theme, these settings will stop the default color and typography controls from being enabled globally, greatly limiting what’s possible:
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"layout": {
+			"contentSize": "750px"
+		},
+		"color": {
+			"background": false,
+			"custom": false,
+			"customDuotone": false,
+			"customGradient": false,
+			"defaultGradients": false,
+			"defaultPalette": false,
+			"text": false
+		},
+		"typography": {
+			"customFontSize": false,
+			"dropCap": false,
+			"fontStyle": false,
+			"fontWeight": false,
+			"letterSpacing": false,
+			"lineHeight": false,
+			"textDecoration": false,
+			"textTransform": false
+		}
+	}
+}
+```
+
+To enable something from the above, just set whatever value you want to change to `true` for more granularity.
\ No newline at end of file
diff --git a/docs/how-to-guides/data-basics/1-data-basics-setup.md b/docs/how-to-guides/data-basics/1-data-basics-setup.md
index e61db83c4ecbd5..d3208ceb352b4b 100644
--- a/docs/how-to-guides/data-basics/1-data-basics-setup.md
+++ b/docs/how-to-guides/data-basics/1-data-basics-setup.md
@@ -10,7 +10,7 @@ We'll do all the development inside of a WordPress plugin. Let's start by creati
 
 -   my-first-gutenberg-app.php – to create a new admin page
 -   src/index.js – for our JavaScript application
--   style.css – for the minimal stylesheet
+-   src/style.css – for the minimal stylesheet
 -   package.json – for the build process
 
 Go ahead and create these files using the following snippets:
@@ -36,7 +36,7 @@ window.addEventListener(
 );
 ```
 
-**style.css:**
+**src/style.css:**
 
 ```css
 .toplevel_page_my-first-gutenberg-app #wpcontent {
@@ -149,7 +149,7 @@ function load_custom_wp_admin_scripts( $hook ) {
 	// Load our style.css.
 	wp_register_style(
 		'my-first-gutenberg-app',
-		plugins_url( 'style.css', __FILE__ ),
+		plugins_url( 'build/style-index.css', __FILE__ ),
 		array(),
 		$asset_file['version']
 	);
diff --git a/docs/how-to-guides/data-basics/2-building-a-list-of-pages.md b/docs/how-to-guides/data-basics/2-building-a-list-of-pages.md
index 8a0d172e45f453..955bc1f869ad85 100644
--- a/docs/how-to-guides/data-basics/2-building-a-list-of-pages.md
+++ b/docs/how-to-guides/data-basics/2-building-a-list-of-pages.md
@@ -172,7 +172,7 @@ Note that instead of using an `input` tag, we took advantage of the [SearchContr
 
 ![](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/how-to-guides/data-basics/media/list-of-pages/filter-field.jpg)
 
-The field starts empty, and the contents are stored in the `searchTerm` state value. If you aren’t familiar with the [useState](https://reactjs.org/docs/hooks-state.html) hook, you can learn more in [React’s documentation](https://reactjs.org/docs/hooks-state.html).
+The field starts empty, and the contents are stored in the `searchTerm` state value. If you aren’t familiar with the [useState](https://react.dev/reference/react/useState) hook, you can learn more in [React’s documentation](https://react.dev/reference/react/useState).
 
 We can now request only the pages matching the `searchTerm`.
 
diff --git a/docs/how-to-guides/data-basics/3-building-an-edit-form.md b/docs/how-to-guides/data-basics/3-building-an-edit-form.md
index 68c87381701515..5f4e30357798d5 100644
--- a/docs/how-to-guides/data-basics/3-building-an-edit-form.md
+++ b/docs/how-to-guides/data-basics/3-building-an-edit-form.md
@@ -120,7 +120,7 @@ Great! We now have a basic user interface to work with.
 
 We want the `EditPageForm` to display the title of the currently edited page. You may have noticed that it doesn't receive a `page` prop, only `pageId`. That's okay. Gutenberg Data allows us to easily access entity records from any component.
 
-In this case, we need to use the [`getEntityRecord`](/docs/reference-guides/data/data-core/#getentityrecord) selector. The list of records is already available thanks to the `getEntityRecords` call in `MyFirstApp`, so there won't even be any additional HTTP requests involved – we'll get the cached record right away.
+In this case, we need to use the [`getEntityRecord`](/docs/reference-guides/data/data-core.md#getentityrecord) selector. The list of records is already available thanks to the `getEntityRecords` call in `MyFirstApp`, so there won't even be any additional HTTP requests involved – we'll get the cached record right away.
 
 Here's how you can try it in your browser's dev tools:
 
@@ -215,7 +215,7 @@ As you can see, the `title` of an Entity Record is an object, but the `title` of
 
 This is no accident. Fields like `title`, `excerpt`, and `content` may contain [shortcodes](https://developer.wordpress.org/apis/handbook/shortcode/) or [dynamic blocks](/docs/how-to-guides/block-tutorial/creating-dynamic-blocks.md), which means they can only be rendered on the server. For such fields, the REST API exposes both the `raw` markup _and_ the `rendered` string. For example, in the block editor, `content.rendered` could used as a visual preview, and `content.raw` could be used to populate the code editor.
 
-So why is the `content` of an Edited Entity Record a string? Since Javascript is not be able to properly render arbitrary block markup, it stores only the `raw` markup without the `rendered` part. And since that's a string, the entire field becomes a string.
+So why is the `content` of an Edited Entity Record a string? Since JavaScript is not be able to properly render arbitrary block markup, it stores only the `raw` markup without the `rendered` part. And since that's a string, the entire field becomes a string.
 
 We can now update `EditPageForm` accordingly. We can access the actions using the [`useDispatch`](/packages/data/README.md#usedispatch) hook similarly to how we use `useSelect` to access selectors:
 
@@ -539,5 +539,5 @@ function EditPageForm( { pageId, onCancel, onSaveFinished } ) {
 ## What's next?
 
 * **Previous part:** [Building a list of pages](/docs/how-to-guides/data-basics/2-building-a-list-of-pages.md)
-* **Next part:** Building a *New Page* form (coming soon)
+* **Next part:** [Building a Create Page form](/docs/how-to-guides/data-basics/4-building-a-create-page-form.md)
 * (optional) Review the [finished app](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/data-basics-59c8f8) in the block-development-examples repository
diff --git a/docs/how-to-guides/data-basics/4-building-a-create-page-form.md b/docs/how-to-guides/data-basics/4-building-a-create-page-form.md
index 33c6e9a5ccff5b..9011596e0feddd 100644
--- a/docs/how-to-guides/data-basics/4-building-a-create-page-form.md
+++ b/docs/how-to-guides/data-basics/4-building-a-create-page-form.md
@@ -1,4 +1,4 @@
-# Part 4: Building a Create page form
+# Building a Create page form
 
 In the [previous part](/docs/how-to-guides/data-basics/3-building-an-edit-form.md) we created an *Edit page* feature, and in this part we will add a *Create page* feature. Here's a glimpse of what we're going to build:
 
diff --git a/docs/how-to-guides/enqueueing-assets-in-the-editor.md b/docs/how-to-guides/enqueueing-assets-in-the-editor.md
index bfce9334320232..fb0efb88e67967 100644
--- a/docs/how-to-guides/enqueueing-assets-in-the-editor.md
+++ b/docs/how-to-guides/enqueueing-assets-in-the-editor.md
@@ -18,7 +18,7 @@ There are different hooks to use depending on the answers to these questions, an
 
 Whenever you need to enqueue assets for the Editor itself (i.e. not the user-generated content), you should use the [`enqueue_block_editor_assets`](https://developer.wordpress.org/reference/hooks/enqueue_block_editor_assets/) hook coupled with the standard [`wp_enqueue_script`](https://developer.wordpress.org/reference/functions/wp_enqueue_script/) and [`wp_enqueue_style`](https://developer.wordpress.org/reference/functions/wp_enqueue_style/) functions.
 
-Examples might be adding custom inspector or toolbar controls, registering block styles and variations in Javascript, registering Editor plugins, etc.
+Examples might be adding custom inspector or toolbar controls, registering block styles and variations in JavaScript, registering Editor plugins, etc.
 
 ```php
 /**
@@ -31,7 +31,7 @@ function example_enqueue_editor_assets() {
     );
     wp_enqueue_style(
         'example-editor-styles',
-        plugins_url( 'editor-styles.css', __FILE__ ) 
+        plugins_url( 'editor-styles.css', __FILE__ )
     );
 }
 add_action( 'enqueue_block_editor_assets', 'example_enqueue_editor_assets' );
@@ -55,11 +55,11 @@ function example_enqueue_editor_content_assets() {
     if ( is_admin() ) {
         wp_enqueue_script(
             'example-editor-content-scripts',
-            plugins_url( 'constent-scripts.css', __FILE__ )
+            plugins_url( 'content-scripts.js', __FILE__ )
         );
         wp_enqueue_style(
             'example-editor-content-styles',
-            plugins_url( 'constent-styles.css', __FILE__ )
+            plugins_url( 'content-styles.css', __FILE__ )
         );
     }
 }
diff --git a/docs/how-to-guides/feature-flags.md b/docs/how-to-guides/feature-flags.md
index 49fb8ba487edf5..11c5ae881337dd 100644
--- a/docs/how-to-guides/feature-flags.md
+++ b/docs/how-to-guides/feature-flags.md
@@ -2,13 +2,13 @@
 
 'Feature flags' are variables that allow you to prevent specific code in the Gutenberg project from being shipped to WordPress core, and to run certain experimental features only in the plugin.
 
-## Introducing `process.env.IS_GUTENBERG_PLUGIN`
+## Introducing `globalThis.IS_GUTENBERG_PLUGIN`
 
-The `process.env.IS_GUTENBERG_PLUGIN` is an environment variable whose value 'flags' whether code is running within the Gutenberg plugin. 
+The `globalThis.IS_GUTENBERG_PLUGIN` is an environment variable whose value 'flags' whether code is running within the Gutenberg plugin.
 
 When the codebase is built for the plugin, this variable will be set to `true`. When building for WordPress core, it will be set to `false` or `undefined`.
 
-## Basic Use
+## Basic usage
 
 ### Exporting features
 
@@ -19,8 +19,9 @@ function myPluginOnlyFeature() {
 	// implementation
 }
 
-export const pluginOnlyFeature =
-	process.env.IS_GUTENBERG_PLUGIN ? myPluginOnlyFeature : undefined;
+export const pluginOnlyFeature = globalThis.IS_GUTENBERG_PLUGIN
+	? myPluginOnlyFeature
+	: undefined;
 ```
 
 In the above example, the `pluginOnlyFeature` export will be `undefined` in non-plugin environments such as WordPress core.
@@ -32,44 +33,46 @@ If you're attempting to import and call a plugin-only feature, be sure to wrap t
 ```js
 import { pluginOnlyFeature } from '@wordpress/foo';
 
-if ( process.env.IS_GUTENBERG_PLUGIN ) {
+if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 	pluginOnlyFeature();
 }
 ```
 
 ## How it works
 
-During the webpack build, instances of `process.env.IS_GUTENBERG_PLUGIN` will be replaced using webpack's [define plugin](https://webpack.js.org/plugins/define-plugin/).
+During the webpack build, instances of `globalThis.IS_GUTENBERG_PLUGIN` will be replaced using webpack's [define plugin](https://webpack.js.org/plugins/define-plugin/).
 
 For example, in the following code –
 
 ```js
-if ( process.env.IS_GUTENBERG_PLUGIN ) {
+if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 	pluginOnlyFeature();
 }
 ```
 
-– the variable `process.env.IS_GUTENBERG_PLUGIN` will be replaced with the boolean `true` during the plugin-only build:
+– the variable `globalThis.IS_GUTENBERG_PLUGIN` will be replaced with the boolean `true` during the plugin-only build:
 
 ```js
-if ( true ) { // Wepack has replaced `process.env.IS_GUTENBERG_PLUGIN` with `true`
+if ( true ) {
+	// Wepack has replaced `globalThis.IS_GUTENBERG_PLUGIN` with `true`
 	pluginOnlyFeature();
 }
 ```
 
 This ensures that code within the body of the `if` statement will always be executed.
 
-In WordPress core, the `process.env.IS_GUTENBERG_PLUGIN` variable is replaced with `undefined`. The built code looks like this:
+In WordPress core, the `globalThis.IS_GUTENBERG_PLUGIN` variable is replaced with `undefined`. The built code looks like this:
 
 ```js
-if ( undefined ) { // Wepack has replaced `process.env.IS_GUTENBERG_PLUGIN` with `undefined`
+if ( undefined ) {
+	// Webpack has replaced `globalThis.IS_GUTENBERG_PLUGIN` with `undefined`
 	pluginOnlyFeature();
 }
 ```
 
 `undefined` evaluates to `false` so the plugin-only feature will not be executed.
 
-### Dead Code Elimination
+### Dead code elimination
 
 For production builds, webpack ['minifies'](https://en.wikipedia.org/wiki/Minification_(programming)) the code, removing as much unnecessary JavaScript as it can. 
 
@@ -97,8 +100,8 @@ if ( undefined ) {
 
 In this case, the minification process will remove the entire `if` statement including the body, ensuring plugin-only code is not included in WordPress core build.
 
-## FAQ
+## Frequently asked questions
 
-#### Why shouldn't I assign the result of an expression involving `IS_GUTENBERG_PLUGIN` to a variable, e.g. `const isMyFeatureActive = process.env.IS_GUTENBERG_PLUGIN === 2`?
+### Why shouldn't I assign the result of an expression involving `IS_GUTENBERG_PLUGIN` to a variable, e.g. `const isMyFeatureActive = ! Object.is( undefined, globalThis.IS_GUTENBERG_PLUGIN )`?
 
 Introducing complexity may prevent webpack's minifier from identifying and therefore eliminating dead code. Therefore it is recommended to use the examples in this document to ensure your feature flag functions as intended. For further details, see the [Dead Code Elimination](#dead-code-elimination) section.
diff --git a/docs/how-to-guides/format-api.md b/docs/how-to-guides/format-api.md
index 00e1b82675c006..188bc1725c3633 100644
--- a/docs/how-to-guides/format-api.md
+++ b/docs/how-to-guides/format-api.md
@@ -10,7 +10,7 @@ In WordPress lingo, a _format_ is a [HTML tag with text-level semantics](https:/
 
 ## Before you start
 
-This guide assumes you are already familiar with WordPress plugins and loading JavaScript with them, see the [Plugin Handbook](https://developer.wordpress.org/plugins/) or [JavaScript Tutorial](/docs/how-to-guides/javascript/README.md) to brush up.
+This guide assumes you are already familiar with WordPress plugins and loading JavaScript with them, see the [Plugin Handbook](https://developer.wordpress.org/plugins/) or [JavaScript Tutorial](/docs/getting-started/fundamentals/javascript-in-the-block-editor.md) to brush up.
 
 You will need:
 
@@ -173,7 +173,7 @@ registerFormatType( 'my-custom-format/sample-output', {
 } );
 ```
 
-### Step5: Add a button outside of the dropdown (Optional)
+### Step 5: Add a button outside of the dropdown (Optional)
 
 Using the `RichTextToolbarButton` component, the button is added to the default dropdown menu. You can add the button directly to the toolbar by using the `BlockControls` component.
 
@@ -220,7 +220,7 @@ If you run into errors:
 -   Confirm the JavaScript is loading in the editor.
 -   Check for any console error messages.
 
-## Additional Resources
+## Additional resources
 
 Reference documentation used in this guide:
 
diff --git a/docs/how-to-guides/internationalization.md b/docs/how-to-guides/internationalization.md
index 08ce46edb3f581..cd341f1b9c6c5d 100644
--- a/docs/how-to-guides/internationalization.md
+++ b/docs/how-to-guides/internationalization.md
@@ -1,6 +1,6 @@
 # Internationalization
 
-## What is Internationalization?
+## What is internationalization?
 
 Internationalization is the process to provide multiple language support to software, in this case WordPress. Internationalization is often abbreviated as **i18n**, where 18 stands for the number of letters between the first _i_ and the last _n_.
 
@@ -87,11 +87,11 @@ This is all you need to make your plugin JavaScript code translatable.
 
 When you set script translations for a handle WordPress will automatically figure out if a translations file exists on translate.wordpress.org, and if so ensure that it's loaded into `wp.i18n` before your script runs. With translate.wordpress.org, plugin authors also do not need to worry about setting up their own infrastructure for translations and can rely on a global community with dozens of active locales. Read more about [WordPress Translations](https://make.wordpress.org/meta/handbook/documentation/translations/).
 
-## Provide Your Own Translations
+## Provide your own translations
 
 You can create and ship your own translations with your plugin, if you have sufficient knowledge of the language(s) you can ensure the translations are available.
 
-### Create Translation File
+### Create the translation file
 
 The translation files must be in the JED 1.x JSON format.
 
@@ -204,7 +204,7 @@ This will generate the JSON file `myguten-eo-[md5].json` with the contents:
 }
 ```
 
-### Load Translation File
+### Load the translation file
 
 The final part is to tell WordPress where it can look to find the translation file. The `wp_set_script_translations` function accepts an optional third argument that is the path it will first check for translations. For example:
 
@@ -220,12 +220,12 @@ WordPress will check for a file in that path with the format `${domain}-${locale
 
 Using `make-json` automatically names the file with the md5 hash, so it is ready as-is. You could rename the file to use the handle instead, in which case the file name would be `myguten-eo-myguten-script.json`.
 
-### Test Translations
+### Test translations
 
 You will need to set your WordPress installation to Esperanto language. Go to Settings > General and change your site language to Esperanto.
 
 With the language set, create a new post, add the block, and you will see the translations used.
 
-### Filtering Translations
+### Filtering translations
 
 The outputs of the translation functions (`__()`, `_x()`, `_n()`, and `_nx()`) are filterable, see [i18n Filters](/docs/reference-guides/filters/i18n-filters.md) for full information.
diff --git a/docs/how-to-guides/javascript/README.md b/docs/how-to-guides/javascript/README.md
deleted file mode 100644
index 4b2d123c8ab136..00000000000000
--- a/docs/how-to-guides/javascript/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# How to use JavaScript with the Block Editor
-
-The Block Editor Handbook contains information on the APIs available for working with this new setup. The goal of this tutorial is to get you comfortable using the API reference and snippets of code found within.
-
-### What is JavaScript
-
-JavaScript is a programming language which is loaded and executed in your web browser; compared to PHP which is run by a web server with the results sent to the browser, typically as HTML.
-
-The block editor introduced in WordPress 5.0 is written in JavaScript, with the code run in the browser, and not on the server, this allows for a richer and more dynamic user experience. It also requires you to learn how to use JavaScript to extend and enhance the block editor.
-
-### Table of Contents
-
-1. [Plugins Background](/docs/how-to-guides/javascript/plugins-background.md)
-2. [Loading JavaScript](/docs/how-to-guides/javascript/loading-javascript.md)
-3. [Extending the Block Editor](/docs/how-to-guides/javascript/extending-the-block-editor.md)
-4. [Troubleshooting](/docs/how-to-guides/javascript/troubleshooting.md)
-5. [JavaScript Versions and Building](/docs/how-to-guides/javascript/versions-and-building.md)
-6. [Scope your code](/docs/how-to-guides/javascript/scope-your-code.md)
-7. [JavaScript Build Step](/docs/how-to-guides/javascript/js-build-setup.md)
-8. [ESNext Syntax](/docs/how-to-guides/javascript/esnext-js.md)
diff --git a/docs/how-to-guides/javascript/esnext-js.md b/docs/how-to-guides/javascript/esnext-js.md
deleted file mode 100644
index f478d1fd596eaa..00000000000000
--- a/docs/how-to-guides/javascript/esnext-js.md
+++ /dev/null
@@ -1,123 +0,0 @@
-# ESNext Syntax
-
-The JavaScript language continues to evolve, the syntax used to write JavaScript code is not fixed but changes over time. [Ecma International](https://en.wikipedia.org/wiki/Ecma_International) is the organization that sets the standard for the language, officially called [ECMAScript](https://en.wikipedia.org/wiki/ECMAScript). A new standard for JavaScript is published each year, the 6th edition published in 2015 is often referred to as ES6. Our usage would more appropriately be **ESNext** referring to the latest standard. The build step is what converts this latest syntax of JavaScript to a version understood by browsers.
-
-Here are some common ESNext syntax patterns used throughout the Gutenberg project.
-
-## Destructuring Assignments
-
-The [destructuring assignment](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment) syntax allows you to pull apart arrays, or properties from objects into their own variable.
-
-For the object `const obj = { foo: "bar" }`
-
-Creating and assigning a new variable `foo` can be done in a single step: `const { foo } = obj;`
-
-The curly brackets on the left side tells JavaScript to inspect the object `obj` for the property `foo` and assign its value to the new variable of the same name.
-
-## Arrow Functions
-
-Arrow functions provide a shorter syntax for defining a function; this is such a common task in JavaScript that having a syntax a bit shorter is quite helpful.
-
-Before you might define a function like:
-
-```js
-const f = function ( param ) {
-	console.log( param );
-};
-```
-
-Using arrow function, you can define the same using:
-
-```js
-const g = ( param ) => {
-	console.log( param );
-};
-```
-
-Or even shorter, if the function is only a single-line you can omit the
-curly braces:
-
-```js
-const g2 = ( param ) => console.log( param );
-```
-
-In the examples above, using `console.log` we aren't too concerned about the return values. However, when using arrow functions in this way, the return value is set whatever the line returns.
-
-For example, our save function could be shortened from:
-
-```js
-save: ( { attributes } ) => {
-	return <div className="theurl">{ attributes.url }</div>;
-};
-```
-
-To:
-
-```js
-save: ( { attributes } ) => <div className="theurl">{ attributes.url }</div>;
-```
-
-There are even more ways to shorten code, but you don't want to take it too far and make it harder to read what is going on.
-
-## Imports
-
-The [import statement](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import) is used to import variables or functions from an exported file. You can use destructuring on imports, for example:
-
-```js
-import { TextControl } from '@wordpress/components';
-```
-
-This will look in the `@wordpress/components` package for the exported `TextControl` variable.
-
-A package or file can also set a `default` export, this is imported without using the curly brackets. For example
-
-```js
-const edit = ( { attributes, setAttributes } ) => {
-    return (
-        <div>
-            <TextControl
-                label="URL"
-                value={ attributes.url }
-                onChange={ ... }
-            />
-        </div>
-    );
-};
-
-export default edit;
-```
-
-To import, you would use:
-
-```js
-import edit from './edit';
-
-registerBlockType( 'mkaz/qrcode-block', {
-	title: 'QRCode Block',
-	icon: 'visibility',
-	category: 'widgets',
-	attributes: {
-		url: {
-			type: 'string',
-			source: 'text',
-			selector: '.theurl',
-		},
-	},
-	edit,
-	save: ( { attributes } ) => {
-		return <div> ... </div>;
-	},
-} );
-```
-
-Note, you can also shorten `edit: edit` to just `edit` as shown above. JavaScript will automatically assign the property `edit` to the value of `edit`. This is another form of destructuring.
-
-## Summary
-
-It helps to become familiar with the ESNext syntax and the common shorter forms. It will give you a greater understanding of reading code examples and what is going on.
-
-Here are a few more resources that may help
-
--   [ES5 vs ES6 with example code](https://medium.com/recraftrelic/es5-vs-es6-with-example-code-9901fa0136fc)
--   [Top 10 ES6 Features by Example](https://blog.pragmatists.com/top-10-es6-features-by-example-80ac878794bb)
--   [ES6 Syntax and Feature Overview](https://www.taniarascia.com/es6-syntax-and-feature-overview/)
diff --git a/docs/how-to-guides/javascript/extending-the-block-editor.md b/docs/how-to-guides/javascript/extending-the-block-editor.md
deleted file mode 100644
index 5944b9208407f5..00000000000000
--- a/docs/how-to-guides/javascript/extending-the-block-editor.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# Extending the Block Editor
-
-Let's look at using the [Block Style example](/docs/reference-guides/block-api/block-styles.md) to extend the editor. This example allows you to add your own custom CSS class name to any core block type.
-
-Replace the existing `console.log()` code in your `myguten.js` file with:
-
-```js
-wp.blocks.registerBlockStyle( 'core/quote', {
-	name: 'fancy-quote',
-	label: 'Fancy Quote',
-} );
-```
-
-**Important:** Notice that you are using a function from `wp.blocks` package. This means you must specify it as a dependency when you enqueue the script. Update the `myguten-plugin.php` file to:
-
-```php
-<?php
-/*
-Plugin Name: Fancy Quote
-*/
-
-function myguten_enqueue() {
-	wp_enqueue_script( 'myguten-script',
-		plugins_url( 'myguten.js', __FILE__ ),
-		array( 'wp-blocks' )
-	);
-}
-add_action( 'enqueue_block_editor_assets', 'myguten_enqueue' );
-```
-
-The last argument in the `wp_enqueue_script()` function is an array of dependencies. WordPress makes packages available under the `wp` namespace. In the example, you use `wp.blocks` to access the items that the blocks package exports (in this case the `registerBlockStyle()` function).
-
-See [Packages](/docs/reference-guides/packages.md) for list of available packages and what objects they export.
-
-After you have updated both JavaScript and PHP files, go to the block editor and create a new post.
-
-Add a quote block, and in the right sidebar under Styles, you will see your new Fancy Quote style listed.
-
-Click the Fancy Quote to select and apply that style to your quote block:
-
-![Fancy Quote Style in Inspector](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/fancy-quote-in-inspector.png)
-
-Even if you Preview or Publish the post you will not see a visible change. However, if you look at the source, you will see the `is-style-fancy-quote` class name is now attached to your quote block.
-
-Let's add some style. In your plugin folder, create a `style.css` file with:
-
-```css
-.is-style-fancy-quote {
-	color: tomato;
-}
-```
-
-You enqueue the CSS file by adding the following to your `myguten-plugin.php`:
-
-```php
-function myguten_stylesheet() {
-	wp_enqueue_style( 'myguten-style', plugins_url( 'style.css', __FILE__ ) );
-}
-add_action( 'enqueue_block_assets', 'myguten_stylesheet' );
-```
-
-Now when you view in the editor and publish, you will see your Fancy Quote style, a delicious tomato color text:
-
-![Fancy Quote with Style](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/fancy-quote-with-style.png)
diff --git a/docs/how-to-guides/javascript/js-build-setup.md b/docs/how-to-guides/javascript/js-build-setup.md
deleted file mode 100644
index cf49154b590a96..00000000000000
--- a/docs/how-to-guides/javascript/js-build-setup.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# JavaScript Build Setup
-
-ESNext is JavaScript written using syntax and features only available in a version newer than browser support—the support browser versions is referred to as ECMAScript 5 (ES5). [JSX](https://reactjs.org/docs/introducing-jsx.html) is a custom syntax extension to JavaScript, created by React project, that allows you to write JavaScript using a familiar HTML tag-like syntax.
-
-See the [ESNext syntax documentation](/docs/how-to-guides/javascript/esnext-js.md) for explanation and examples about common code differences between standard JavaScript and ESNext.
-
-Let's set up your development environment to use these syntaxes, we'll cover development for your plugin to work with the Gutenberg project (ie: the block editor). If you want to develop on Gutenberg itself, see the [Getting Started](/docs/contributors/code/getting-started-with-code-contribution.md) documentation.
-
-Browsers cannot interpret or run ESNext and JSX syntaxes, so we must use a transformation step to convert these syntaxes to code that browsers can understand.
-
-There are a few reasons to use ESNext and this extra step of transformation:
-
--   It makes for simpler code that is easier to read and write.
--   Using a transformation step allows for tools to optimize the code to work on the widest variety of browsers.
--   By using a build step you can organize your code into smaller modules and files that can be bundled together into a single download.
-
-There are different tools that can perform this transformation or build step; WordPress uses webpack and Babel.
-
-[webpack](https://webpack.js.org/) is a pluggable tool that processes JavaScript and creates a compiled bundle that runs in a browser. [Babel](https://babeljs.io/) transforms JavaScript from one format to another. You use Babel as a plugin to webpack to transform both ESNext and JSX to JavaScript.
-
-The [@wordpress/scripts](https://www.npmjs.com/package/@wordpress/scripts) package abstracts these libraries away to standardize and simplify development, so you won't need to handle the details for configuring webpack or babel. See the [@wordpress/scripts package documentation](https://developer.wordpress.org/block-editor/packages/packages-scripts/) for configuration details.
-
-## Quick Start
-
-If you prefer a quick start, you can use one of the examples from the [Block Development Examples repository](https://github.com/wordpress/block-development-examples/) and skip below. Each one of the `-esnext` directories in the examples repository contain the necessary files for working with ESNext and JSX.
-
-## Setup
-
-Both webpack and Babel are tools written in JavaScript and run using [Node.js](https://nodejs.org/) (node). Node.js is a runtime environment for JavaScript outside of a browser. Simply put, node allows you to run JavaScript code on the command-line.
-
-First, you need to set up Node.js for your development environment. The steps required depend on your operating system, if you have a package manager installed, setup can be as straightforward as:
-
--   Ubuntu: `apt install nodejs npm`
--   macOS: `brew install node`
--   Windows: `choco install node`
-
-If you are not using a package manager, see the [developer environment setup documentation](/docs/getting-started/devenv/README.md) for setting up Node using nvm, or see the official [Node.js download page](https://nodejs.org/en/download/) for installers and binaries.
-
-**Note:** The build tools and process occur on the command-line, so basic familiarity using a terminal application is required. Some text editors have a terminal built-in that is fine to use; Visual Studio Code and PhpStorm are two popular options.
-
-### Node Package Manager (npm)
-
-The Node Package Manager (npm) is a tool included with node. npm allows you to install and manage JavaScript packages. npm can also generate and process a special file called `package.json`, that contains information about your project and the packages your project uses.
-
-To start a new node project, first create a directory to work in:
-
-```sh
-mkdir myguten-block
-cd myguten-block
-```
-
-You create a new package.json running `npm init` in your terminal. This will walk you through creating your package.json file:
-
-```sh
-npm init
-
-package name: (myguten-block) myguten-block
-version: (1.0.0)
-description: Test block
-entry point: (index.js) build/index.js
-test command:
-git repository:
-keywords:
-author: mkaz
-license: (ISC) GPL-2.0-only
-About to write to /home/mkaz/src/wp/scratch/package.json:
-
-{
-  "name": "myguten-block",
-  "version": "1.0.0",
-  "description": "Test block",
-  "main": "block.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "mkaz",
-  "license": "GPL-2.0-only"
-}
-
-
-Is this OK? (yes) yes
-```
-
-### Using npm to install packages
-
-The next step is to install the packages required. You can install packages using the npm command `npm install`. If you pass the `--save-dev` parameter, npm will write the package as a dev dependency in the package.json file. The `--save-exact` parameter instructs npm to save an exact version of a dependency, not a range of valid versions. See [npm install documentation](https://docs.npmjs.com/cli/install) for more details.
-
-Run `npm install --save-dev --save-exact @wordpress/scripts`
-
-After installing, a `node_modules` directory is created with the modules and their dependencies.
-
-Also, if you look at package.json file it will include a new section:
-
-```json
-"devDependencies": {
-  "@wordpress/scripts": "6.0.0"
-}
-```
-
-## Setting Up wp-scripts build
-
-The `@wordpress/scripts` package handles the dependencies and default configuration for webpack and Babel. The scripts package expects the source file to compile to be found at `src/index.js`, and will save the compiled output to `build/index.js`.
-
-With that in mind, let's set up a basic block. Create a file at `src/index.js` with the following content:
-
-```js
-import { registerBlockType } from '@wordpress/blocks';
-
-registerBlockType( 'myguten/test-block', {
-	title: 'Basic Example',
-	icon: 'smiley',
-	category: 'design',
-	edit: () => <div>Hola, mundo!</div>,
-	save: () => <div>Hola, mundo!</div>,
-} );
-```
-
-To configure npm to run a script, you use the scripts section in `package.json` webpack:
-
-```json
-  "scripts": {
-    "build": "wp-scripts build"
-  },
-```
-
-You can then run the build using: `npm run build`.
-
-After the build finishes, you will see the built file created at `build/index.js`. Enqueue this file in the admin screen as you would any JavaScript in WordPress, see [loading JavaScript step in this tutorial](/docs/how-to-guides/javascript/loading-javascript.md), and the block will load in the editor.
-
-## Development Mode
-
-The **build** command in `@wordpress/scripts` runs in "production" mode. This shrinks the code down so it downloads faster, but makes it difficult to read in the process. You can use the **start** command which runs in development mode that does not shrink the code, and additionally continues a running process to watch the source file for more changes and rebuilds as you develop.
-
-The start command can be added to the same scripts section of `package.json`:
-
-```json
-  "scripts": {
-    "start": "wp-scripts start",
-    "build": "wp-scripts build"
-  },
-```
-
-Now, when you run `npm start` a watcher will run in the terminal. You can then edit away in your text editor; after each save, it will automatically build. You can then use the familiar edit/save/reload development process.
-
-**Note:** keep an eye on your terminal for any errors. If you make a typo or syntax error, the build will fail and the error will be in the terminal.
-
-## Source Control
-
-Because a typical `node_modules` folder will contain thousands of files that change with every software update, you should exclude `node_modules/` from your source control. If you ever start from a fresh clone, simply run `npm install` in the same folder your `package.json` is located to pull your required packages.
-
-Likewise, you do not need to include `node_modules` or any of the above configuration files in your plugin because they will be bundled inside the file that webpack builds. **Be sure to enqueue the `build/index.js` file** in your plugin PHP. This is the main JavaScript file needed for your block to run.
-
-## Dependency Management
-
-Using `wp-scripts` ver 5.0.0+ build step will also produce an `index.asset.php` file that contains an array of dependencies and a version number for your block. For our simple example above, it is something like:
-`array('dependencies' => array('react', 'wp-polyfill'), 'version' => 'fc93c4a9675c108725227db345898bcc');`
-
-Here is how to use this asset file to automatically set the dependency list for enqueuing the script. This prevents having to manually update the dependencies, it will be created based on the package imports used within your block.
-
-```php
-$asset_file = include( plugin_dir_path( __FILE__ ) . 'build/index.asset.php');
-
-wp_register_script(
-	'myguten-block',
-	plugins_url( 'build/index.js', __FILE__ ),
-	$asset_file['dependencies'],
-	$asset_file['version']
-);
-```
-
-See [blocks in the block-development-examples repo](https://github.com/WordPress/block-development-examples) for full examples.
-
-## Summary
-
-Yes, the initial setup is a bit more involved, but the additional features and benefits are usually worth the trade off in setup time.
-
-With a setup in place, the standard workflow is:
-
-1. Install dependencies: `npm install`
-2. Start development builds: `npm start`
-3. Develop. Test. Repeat.
-4. Create production build: `npm run build`
diff --git a/docs/how-to-guides/javascript/loading-javascript.md b/docs/how-to-guides/javascript/loading-javascript.md
deleted file mode 100644
index 80150f14445a1d..00000000000000
--- a/docs/how-to-guides/javascript/loading-javascript.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Loading JavaScript
-
-With the plugin in place, you can add the code that loads the JavaScript. This methodology follows the standard WordPress procedure of enqueuing scripts, see [enqueuing section of the Plugin Handbook](https://developer.wordpress.org/plugins/javascript/enqueuing/).
-
-Add the following code to your `myguten-plugin.php` file:
-
-```php
-function myguten_enqueue() {
-	wp_enqueue_script(
-		'myguten-script',
-		plugins_url( 'myguten.js', __FILE__ )
-	);
-}
-add_action( 'enqueue_block_editor_assets', 'myguten_enqueue' );
-```
-
-The `enqueue_block_editor_assets` hook is used, which is called when the block editor loads, and will enqueue the JavaScript file `myguten.js`.
-
-Create a file called `myguten.js` and add:
-
-```js
-console.log( "I'm loaded!" );
-```
-
-Next, create a new post in the block editor.
-
-We'll check the JavaScript console in your browser's Developer Tools, to see if the message is displayed. If you're not sure what developer tools are, Mozilla's ["What are browser developer tools?"](https://developer.mozilla.org/en-US/docs/Learn/Common_questions/What_are_browser_developer_tools) documentation provides more information, including more background on the [JavaScript console](https://developer.mozilla.org/en-US/docs/Learn/Common_questions/What_are_browser_developer_tools#The_JavaScript_console).
-
-If your code is registered and enqueued correctly, you should see a message in your console:
-
-![Console Log Message Success](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/js-tutorial-console-log-success.png)
-
-**Note for Theme Developers:** The above method of enqueuing is used for plugins. If you are extending the block editor for your theme there is a minor difference, you will use the `get_template_directory_uri()` function instead of `plugins_url()`. So for a theme, the enqueue example is:
-
-```php
-function myguten_enqueue() {
-	wp_enqueue_script(
-		'myguten-script',
-		get_template_directory_uri() . '/myguten.js'
-	);
-}
-add_action( 'enqueue_block_editor_assets', 'myguten_enqueue' );
-```
-
-### Recap
-
-At this point, you have a plugin in the directory `wp-content/plugins/myguten-plugin` with two files: the PHP server-side code in `myguten-plugin.php`, and the JavaScript which runs in the browser in `myguten.js`.
-
-This puts all the initial pieces in place for you to start extending the block editor.
diff --git a/docs/how-to-guides/javascript/plugins-background.md b/docs/how-to-guides/javascript/plugins-background.md
deleted file mode 100644
index 617cbe64e05ede..00000000000000
--- a/docs/how-to-guides/javascript/plugins-background.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Plugins Background
-
-The primary means of extending WordPress is the plugin. The WordPress [Plugin Basics](https://developer.wordpress.org/plugins/plugin-basics/) documentation provides details on building a plugin.
-
-The quickest way to start is to create a new directory in `wp-content/plugins/` to contain your plugin code. For this example, call it `myguten-plugin`.
-
-Inside this new directory, create a file called `myguten-plugin.php`. This is the server-side code that runs when your plugin is active.
-
-For now, add the following code in the file:
-
-```php
-<?php
-/*
-Plugin Name: Fancy Quote
-*/
-```
-
-To summarize, you should have a directory `wp-content/plugins/myguten-plugin/` which has the single file `myguten-plugin.php`.
-
-Once that is in place, go to your plugins list in `wp-admin` and you should see your plugin listed.
-
-Click **Activate** and your plugin will load with WordPress.
diff --git a/docs/how-to-guides/javascript/scope-your-code.md b/docs/how-to-guides/javascript/scope-your-code.md
deleted file mode 100644
index 39d52cd6ab934b..00000000000000
--- a/docs/how-to-guides/javascript/scope-your-code.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Scope Your Code
-
-Historically, JavaScript files loaded in a web page share the same scope. This means that a global variable declared in one file will be seen by the code in other files.
-
-To see how this works, create a web page that loads three JavaScript files. The `first.js` file will be:
-
-```js
-var pluginName = 'MyPlugin';
-console.log( 'Plugin name is ', pluginName );
-```
-
-Let's create `second.js` as:
-
-```js
-var pluginName = 'DifferentPlugin';
-console.log( 'Plugin name is ', pluginName );
-```
-
-And, finally, `third.js`:
-
-```js
-console.log( 'Plugin name is ', pluginName );
-```
-
-When loaded on the same page, `first.js` and `second.js` will output the plugin name declared within itself. They will override the value of the global `pluginName` variable if one was already declared. It's not known what gets printed in the console when `third.js` is executed, though - it depends on the value of the global `pluginName` variable when `third.js` is executed, which will depend on the order the files are loaded.
-
-This behavior can be problematic, and is the reason we need to scope the code. By scoping the code—ensuring each file is isolated from each other—we can prevent values unexpectedly changing.
-
-## Scoping Code Within a Function
-
-In JavaScript, you can scope your code by writing it within a function. Functions have "local scope", or a scope that is specific only to that function. Additionally, in JavaScript you can write anonymous functions, functions without a name, which will also prevent your function name from being overridden in the global scope.
-
-Taking advantage of these two JavaScript features, `first.js` could be scoped as:
-
-```js
-function() {
-	var pluginName = 'MyPlugin';
-	console.log( 'Plugin name is ', pluginName );
-}
-```
-
-`second.js` as:
-
-```js
-function() {
-	var pluginName = 'DifferentPlugin';
-	console.log( 'Plugin name is ', pluginName );
-}
-```
-
-And `third.js`:
-
-```js
-function() {
-	console.log( 'Plugin name is ', pluginName );
-}
-```
-
-With this trick, the different files won't override each other's variables. Unfortunately, they also won't work as expected, because these functions are being called by no one. We've only _defined_ the functions; we haven't _executed_ them yet.
-
-## Automatically Execute Anonymous Functions
-
-It turns out there are a few ways to execute anonymous functions in JavaScript, but the most popular is this:
-
-```js
-( function () {
-	// your code goes here
-} )();
-```
-
-You wrap your function between parentheses, and then call it like any other named function. This pattern is known as [Immediately-Invoked Function Expression](http://benalman.com/news/2010/11/immediately-invoked-function-expression/), or IIFE for short.
-
-This is `first.js` written as an IIFE:
-
-```js
-( function () {
-	var pluginName = 'MyPlugin';
-	console.log( 'Plugin name is ', pluginName );
-} )();
-```
-
-And this is `second.js`:
-
-```js
-( function () {
-	var pluginName = 'DifferentPlugin';
-	console.log( 'Plugin name is ', pluginName );
-} )();
-```
-
-And this is `third.js`:
-
-```js
-( function () {
-	console.log( 'Plugin name is ', pluginName );
-} )();
-```
-
-The code in `first.js` and `second.js` is unaffected by other variables in the global scope, so it's safe and deterministic.
-
-On the other hand, `third.js` doesn't declare a `pluginName` variable, but needs to be provided one. IIFEs still allow you to take a variable from the global scope and pass it into your function. Provided that there was a global `window.pluginName` variable, we could rewrite `third.js` as:
-
-```js
-( function ( name ) {
-	console.log( 'Plugin name is ', name );
-} )( window.pluginName );
-```
-
-## Future Changes
-
-At the beginning we mentioned that:
-
-> Historically, JavaScript files loaded in a web page share the same scope.
-
-Notice the _historically_.
-
-JavaScript has evolved quite a bit since its creation. As of 2015, the language supports modules, also known as _ES6 modules_, that introduce separate scope per file: a global variable in `first.js` wouldn't be exposed to `second.js`. This feature is already [supported by modern browsers](https://caniuse.com/#feat=es6-module), but not all of them do. If your code needs to run in browsers that don't support modules, your last resort is using IIFEs.
diff --git a/docs/how-to-guides/javascript/troubleshooting.md b/docs/how-to-guides/javascript/troubleshooting.md
deleted file mode 100644
index 99484054d7b012..00000000000000
--- a/docs/how-to-guides/javascript/troubleshooting.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Troubleshooting
-
-If you're having trouble getting your JavaScript code to work, here are a few tips on how to find errors to help you troubleshoot.
-
-## Console Log
-
-The console log is a JavaScript developer's best friend. It is a good practice to work with it open, as it displays errors and notices in one place. See Mozilla's [JavaScript console](https://developer.mozilla.org/en-US/docs/Learn/Common_questions/What_are_browser_developer_tools#The_JavaScript_console) documentation for more.
-
-To open the JavaScript console, find the correct key combination for your browser and OS:
-
-| Browser | Windows      | Linux        | Mac       |
-| ------- | ------------ | ------------ | --------- |
-| Firefox | Ctrl+Shift+K | Ctrl+Shift+K | Cmd+Opt+K |
-| Chrome  | Ctrl+Shift+J | Ctrl+Shift+J | Cmd+Opt+J |
-| Edge    | Ctrl+Shift+J | Ctrl+Shift+J | Cmd+Opt+J |
-| Safari  |              |              | Cmd+Opt+C |
-
-### First Step
-
-Your first step in debugging should be to check the JavaScript console for any errors. Here is an example, which shows a syntax error on line 6:
-
-![console error](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/js-tutorial-console-log-error.png)
-
-### Display your message in console log
-
-You can also write directly to the console from your JavaScript code for debugging and checking variable values. Use the `console.log` function like so:
-
-```js
-console.log( 'My message' );
-```
-
-Or if you want to include a message and variable, in this case display the contents of settings variable:
-
-```js
-console.log( 'Settings value:', settings );
-```
-
-### Using console log
-
-You can also write JavaScript directly in the console if you want to test a short command. The commands you run apply to the open browser window. Try this example with the [wp.data package](/packages/data/README.md) to count how many blocks are in the editor. Play with it and also try to use the console to browse available functions.
-
-```js
-wp.data.select( 'core/block-editor' ).getBlockCount();
-```
-
-![JavaScript example command](https://developer.wordpress.org/files/2020/07/js-console-cmd.gif)
-
-### Using the `debugger` statement
-
-If you would like to pause code execution at a certain line of code, you can write `debugger;` anywhere in your code. Once the browser sees the statement `debugger;`, it will pause execution of your code. This allows you to inspect all variables around the `debugger` statement, which is very useful. [See this MDN page for more information](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/debugger).
-
-## Confirm JavaScript is loading
-
-If you are not seeing your changes, and no errors, check that your JavaScript file is being enqueued. Open the page source in your browser's web inspector (some browsers may allow you to view the page source by right clicking on the page and selecting "View Page Source"), and look for the `<script>` tag that loads your file. In the JavaScript tutorial example, you would search for `myguten.js` and confirm it is being loaded.
-
-If you do not see the file being loaded, double check the enqueue function is correct. You can also check your server logs to see if there is an error messages.
-
-Add a test message to confirm your JavaScript is loading, add a `console.log("Here");` at the top of your code, and confirm the message is shown. If not, it is likely the file is not loading properly, [review the loading JavaScript page](/docs/how-to-guides/javascript/loading-javascript.md) for details on enqueuing JavaScript properly.
-
-## Confirm all dependencies are loading
-
-The console log will show an error if a dependency your JavaScript code uses has not been declared and loaded in the browser. In the JavaScript tutorial example, if `myguten.js` script is enqueued without declaring the `wp-blocks` dependency, the console log will show:
-
-<img src="https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/js-tutorial-error-blocks-undefined.png" width=448 title="error wp.blocks is undefined"/>
-
-You can correct by checking your `wp_enqueue_script` function includes all packages listed that are used:
-
-```js
-wp_enqueue_script(
-	'myguten-script',
-	plugins_url( 'myguten.js', __FILE__ ),
-	array( 'wp-blocks' )
-);
-```
-
-For automated dependency management, it is recommended to [use wp-scripts to build step your JavaScript](/docs/how-to-guides/javascript/js-build-setup.md#dependency-management).
diff --git a/docs/how-to-guides/javascript/versions-and-building.md b/docs/how-to-guides/javascript/versions-and-building.md
deleted file mode 100644
index ec9f98368ff024..00000000000000
--- a/docs/how-to-guides/javascript/versions-and-building.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# JavaScript Versions and Build Step
-
-The Block Editor Handbook shows JavaScript examples in two syntaxes: JSX and Plain.
-
-Plain refers to JavaScript code compatible with WordPress's minimum [target for browser support](https://make.wordpress.org/core/handbook/best-practices/browser-support/) without requiring a transpilation step. This step is commonly referred to as a build process.
-
-"JSX" doesn't refer to a specific version of JavaScript, but refers to the latest language definition plus [JSX syntax](https://reactjs.org/docs/introducing-jsx.html), a syntax that blends HTML and JavaScript. JSX makes it easier to read and write markup code, but does require a build step to transpile into code compatible with browsers. Webpack and babel are the tools that perform this transpilation step.
-
-For simplicity, the JavaScript tutorial uses the Plain definition, without JSX. This code can run straight in your browser and does not require an additional build step. In many cases, it is perfectly fine to follow the same approach for simple plugins or experimenting. As your codebase grows in complexity it might be a good idea to switch to JSX. You will find the majority of code and documentation across the block editor uses JSX.
-
-See the [JavaScript Build Setup documentation](/docs/how-to-guides/javascript/js-build-setup.md) for setting up a development environment using JSX syntax.
-
-See the [ESNext syntax documentation](/docs/how-to-guides/javascript/esnext-js.md) for explanation and examples about common code differences between standard JavaScript and more modern approaches.
diff --git a/docs/how-to-guides/metabox.md b/docs/how-to-guides/metabox.md
index e0402b1180c1c3..da37b8fba3b7c1 100644
--- a/docs/how-to-guides/metabox.md
+++ b/docs/how-to-guides/metabox.md
@@ -8,7 +8,7 @@ The block editor does support most existing meta boxes, see [the backward compat
 
 If you are interested in working with the post meta outside the editor, check out the [Sidebar Tutorial](/docs/how-to-guides/sidebar-tutorial/plugin-sidebar-0.md).
 
-### Use Blocks to Store Meta
+### Use blocks to store meta
 
 Typically, blocks store attribute values in the serialized block HTML. However, you can also create a block that saves its attribute values as post meta, that can be accessed programmatically anywhere in your template.
 
@@ -16,9 +16,9 @@ This guide shows how to create a block that prompts a user for a single value, a
 
 ## Before you start
 
-This guide assumes you are already familiar with WordPress plugins, post meta, and basic JavaScript. Review the [Getting started with JavaScript tutorial](/docs/how-to-guides/javascript/README.md) for an introduction.
+This guide assumes you are already familiar with WordPress plugins, post meta, and basic JavaScript. Review the [Getting started with JavaScript tutorial](/docs/getting-started/fundamentals/javascript-in-the-block-editor.md) for an introduction.
 
-The guide will walk through creating a basic block, but recommended to go through the [Create Block tutorial](/docs/getting-started/create-block/README.md) for a deeper understanding of creating custom blocks.
+The guide will walk through creating a basic block, but recommended to go through the [Create Block tutorial](/docs/getting-started/tutorial.md) for a deeper understanding of creating custom blocks.
 
 You will need:
 
@@ -35,7 +35,7 @@ A [complete meta-block example](https://github.com/WordPress/block-development-e
 3. [Use Post Meta Data](#step-3-use-post-meta-data)
 4. [Finishing Touches](#step-4-use-block-templates-optional)
 
-### Step 1: Register Meta Field
+### Step 1: Register meta field
 
 A post meta field is a WordPress object used to store extra data about a post. You need to first register a new meta field prior to use. See Managing [Post Metadata](https://developer.wordpress.org/plugins/metadata/managing-post-metadata/) to learn more about post meta.
 
@@ -58,7 +58,7 @@ function myguten_register_post_meta() {
 add_action( 'init', 'myguten_register_post_meta' );
 ```
 
-### Step 2: Add Meta Block
+### Step 2: Add meta block
 
 With the meta field registered in the previous step, next create a new block to display the field value to the user.
 
@@ -107,18 +107,17 @@ registerBlockType( 'myguten/meta-block', {
 } );
 ```
 
-Confirm this works by creating a post and add the Meta Block. You will see your field that you can type a value in. When you save the post, either as a draft or published, the post meta value will be saved too. You can verify by
-saving and reloading your draft, the form will still be filled in on reload.
+Confirm this works by creating a post and add the Meta Block. You will see your field that you can type a value in. When you save the post, either as a draft or published, the post meta value will be saved too. You can verify by saving and reloading your draft, the form will still be filled in on reload.
 
 You could also confirm the data is saved by checking the database table `wp_postmeta` and confirm the new post id contains the new field data.
 
 **Troubleshooting**: Be sure to build your code between changes, you updated the PHP code from Step 1, and JavaScript files are enqueued. Check the build output and developer console for errors.
 
-### Step 3: Use Post Meta Data
+### Step 3: Use post meta data
 
 You can use the post meta data stored in the last step in multiple ways.
 
-#### Use Post Meta in PHP
+#### Use post meta in PHP
 
 The first example uses the value from the post meta field and appends it to the end of the post content wrapped in a `H4` tag.
 
@@ -134,7 +133,7 @@ function myguten_content_filter( $content ) {
 add_filter( 'the_content', 'myguten_content_filter' );
 ```
 
-#### Use Post Meta in Block
+#### Use post meta in a block
 
 You can also use the post meta data in other blocks. For this example the data is loaded at the end of every Paragraph block when it is rendered, ie. shown to the user. You can replace this for any core or custom block types as needed.
 
@@ -157,7 +156,7 @@ register_block_type( 'core/paragraph', array(
 ) );
 ```
 
-### Step 4: Use Block Templates (optional)
+### Step 4: Use block templates (optional)
 
 One problem using a meta block is the block is easy for an author to forget, since it requires being added to each post. You solve this by using [block templates](/docs/reference-guides/block-api/block-templates.md). A block template is a predefined list of block items per post type. Templates allow you to specify a default initial state for a post type.
 
@@ -181,9 +180,9 @@ You can also add other block types in the array, including placeholders, or even
 
 This guide showed how using blocks you can read and write to post meta. See the section below for backward compatibility with existing meta boxes.
 
-## Backward Compatibility
+## Backward compatibility
 
-### Testing, Converting, and Maintaining Existing Meta Boxes
+### Testing, converting, and maintaining existing meta boxes
 
 Before converting meta boxes to blocks, it may be easier to test if a meta box works with the block editor, and explicitly mark it as such.
 
@@ -213,7 +212,7 @@ add_meta_box( 'my-meta-box', 'My Meta Box', 'my_meta_box_callback',
 
 When the block editor is used, this meta box will no longer be displayed in the meta box area, as it now only exists for backward compatibility purposes. It will display as before in the classic editor.
 
-### Meta Box Data Collection
+### Meta box data collection
 
 On each block editor page load, we register an action that collects the meta box data to determine if an area is empty. The original global state is reset upon collection of meta box data.
 
@@ -227,14 +226,14 @@ Then each location for this particular type of meta box is checked for whether i
 
 Ideally, this could be done at instantiation of the editor and help simplify this flow. However, it is not possible to know the meta box state before `admin_enqueue_scripts`, where we are calling `initializeEditor()`. This will have to do, unless we want to move `initializeEditor()` to fire in the footer or at some point after `admin_head`. With recent changes to editor bootstrapping this might now be possible. Test with ACF to make sure.
 
-### Redux and React Meta Box Management
+### Redux and React meta box management
 
 When rendering the block editor, the meta boxes are rendered to a hidden div `#metaboxes`.
 
 _The Redux store will hold all meta boxes as inactive by default_. When
 `INITIALIZE_META_BOX_STATE` comes in, the store will update any active meta box areas by setting the `isActive` flag to `true`. Once this happens React will check for the new props sent in by Redux on the `MetaBox` component. If that `MetaBox` is now active, instead of rendering null, a `MetaBoxArea` component will be rendered. The `MetaBox` component is the container component that mediates between the `MetaBoxArea` and the Redux Store. _If no meta boxes are active, nothing happens. This will be the default behavior, as all core meta boxes have been stripped._
 
-#### MetaBoxArea Component
+#### MetaBoxArea component
 
 When the component renders it will store a reference to the meta boxes container and retrieve the meta boxes HTML from the prefetch location.
 
@@ -244,13 +243,13 @@ When the meta box area is saving, we display an updating overlay, to prevent use
 
 An example save url would look like:
 
-`mysite.com/wp-admin/post.php?post=1&action=edit&meta-box-loader=1`
+`example.org/wp-admin/post.php?post=1&action=edit&meta-box-loader=1`
 
 This url is automatically passed into React via a `_wpMetaBoxUrl` global variable.
 
 This page mimics the `post.php` post form, so when it is submitted it will fire all of the normal hooks and actions, and have the proper global state to correctly fire any PHP meta box mumbo jumbo without needing to modify any existing code. On successful submission, React will signal a `handleMetaBoxReload` to remove the updating overlay.
 
-### Common Compatibility Issues
+### Common compatibility issues
 
 Most PHP meta boxes should continue to work in the block editor, but some meta boxes that include advanced functionality could break. Here are some common reasons why meta boxes might not work as expected in the block editor:
 
@@ -259,3 +258,7 @@ Most PHP meta boxes should continue to work in the block editor, but some meta b
 -   Plugins making updates to their DOM on "submit" or on "save".
 
 Please also note that if your plugin triggers a PHP warning or notice to be output on the page, this will cause the HTML document type (`<!DOCTYPE html>`) to be output incorrectly. This will cause the browser to render using "Quirks Mode", which is a compatibility layer that gets enabled when the browser doesn't know what type of document it is parsing. The block editor is not meant to work in this mode, but it can _appear_ to be working just fine. If you encounter issues such as _meta boxes overlaying the editor_ or other layout issues, please check the raw page source of your document to see that the document type definition is the first thing output on the page. There will also be a warning in the JavaScript console, noting the issue.
+
+## Additional resources
+
+- [Creating a custom block that stores post meta](https://developer.wordpress.org/news/2023/03/03/creating-a-custom-block-that-stores-post-meta/)
diff --git a/docs/how-to-guides/notices/README.md b/docs/how-to-guides/notices/README.md
index 4b9a32c664a96c..15895e2bd32131 100644
--- a/docs/how-to-guides/notices/README.md
+++ b/docs/how-to-guides/notices/README.md
@@ -71,9 +71,9 @@ To better understand the specific code example above:
 -   `wp.data.dispatch('core/notices')` accesses functionality registered to the block editor data store by the Notices package.
 -   `createNotice()` is a function offered by the Notices package to register a new notice. The block editor reads from the notice data store in order to know which notices to display.
 
-Check out the [_Loading JavaScript_](/docs/how-to-guides/javascript/loading-javascript.md) tutorial for a primer on how to load your custom JavaScript into the block editor.
+Check out the [_Enqueueing assets in the Editor_](/docs/how-to-guides/enqueueing-assets-in-the-editor.md) tutorial for a primer on how to load your custom JavaScript into the block editor.
 
-## Learn More
+## Learn more
 
 The block editor offers a complete API for generating notices. The official documentation is a great place to review what's possible.
 
diff --git a/docs/how-to-guides/platform/README.md b/docs/how-to-guides/platform/README.md
index f63f8b6a5cbb1c..731ae26a1ead58 100644
--- a/docs/how-to-guides/platform/README.md
+++ b/docs/how-to-guides/platform/README.md
@@ -2,7 +2,7 @@
 
 The Gutenberg Project is not only building a better editor for WordPress, but also creating a platform to build upon. This platform consists of a set of JavaScript packages and tools that you can use in your web application. [View the list of packages available on npm](https://www.npmjs.com/org/wordpress).
 
-## UI Components
+## UI components
 
 The [WordPress Components package](/packages/components/README.md) contains a set of UI components you can use in your project. See the [WordPress Storybook site](https://wordpress.github.io/gutenberg/) for an interactive guide to the available components and settings.
 
@@ -26,7 +26,7 @@ function MyApp() {
 
 Many components include CSS to add style, you will need to include for the components to appear correctly. The component stylesheet can be found in `node_modules/@wordpress/components/build-style/style.css`, you can link directly or copy and include it in your project.
 
-## Development Scripts
+## Development scripts
 
 The [`@wordpress/scripts` package](/packages/scripts/README.md) is a collection of reusable scripts for JavaScript development — includes scripts for building, linting, and testing — all with no additional configuration files.
 
@@ -57,4 +57,5 @@ For more info, see the [Getting Started with JavaScript tutorial](/docs/how-to-g
 
 The [`@wordpress/block-editor` package](https://developer.wordpress.org/block-editor/packages/packages-block-editor/) allows you to create and use standalone block editors.
 
-You can learn more by reading the [tutorial "Building a custom block editor"](/docs/how-to-guides/platform/custom-block-editor/README.md).
+You can learn more by reading the [tutorial "Building a custom block editor"](/docs/how-to-guides/platform/custom-block-editor.md).
+
diff --git a/docs/how-to-guides/platform/custom-block-editor.md b/docs/how-to-guides/platform/custom-block-editor.md
index 94f942fd5e05f6..e100820ea0e8b6 100644
--- a/docs/how-to-guides/platform/custom-block-editor.md
+++ b/docs/how-to-guides/platform/custom-block-editor.md
@@ -10,21 +10,6 @@ This flexibility and interoperability makes blocks a powerful tool for building
 
 This guide covers the basics of creating your first custom block editor.
 
-## Table of contents
-
--   [Introduction](#introduction)
-- 	[Code Syntax](#code-syntax)
--   [What you're going to be building](#what-youre-going-to-be-building)
--   [Plugin setup and organization](#plugin-setup-and-organization)
--   [The "Core" of the editor](#the-core-of-the-editor)
--   [Creating the custom "Block Editor" page](#creating-the-custom-block-editor-page)
--   [Registering and rendering the custom block editor](#registering-and-rendering-the-custom-block-editor)
--   [Reviewing the `<Editor>` component](#reviewing-the-editor-component)
--   [The custom `<BlockEditor>`](#the-custom-blockeditor)
--   [Reviewing the sidebar](#reviewing-the-sidebar)
--   [Block persistence](#block-persistence)
--   [Wrapping up](#wrapping-up)
-
 ## Introduction
 
 With its many packages and components, the Gutenberg codebase can be daunting at first. But at its core, it's all about managing and editing blocks. So if you want to work on the editor, it's essential to understand how block editing works at a fundamental level.
@@ -39,7 +24,7 @@ By the end of this article, you will have a solid understanding of the block edi
 
 ## Code syntax
 
-The code snippets in this guide use JSX syntax. However, you could use plain JavaScript if you prefer. However, once familiar with JSX, many developers find it easier to read and write, so most code examples in the Block Editor Handbook use this syntax.
+The code snippets in this guide use JSX syntax. However, you could use plain JavaScript if you prefer. However, once familiar with JSX, many developers find it easier to read and write, so all code examples in the Block Editor Handbook use this syntax.
 
 ## What you're going to be building
 
@@ -292,7 +277,7 @@ function Editor( { settings } ) {
 }
 ```
 
-In this process, the core of the editor's layout is being scaffolded, along with a few specialized [context providers](https://reactjs.org/docs/context.html#contextprovider) that make specific functionality available throughout the component hierarchy.
+In this process, the core of the editor's layout is being scaffolded, along with a few specialized [context providers](https://react.dev/reference/react/createContext#provider) that make specific functionality available throughout the component hierarchy.
 
 Let's examine these in more detail:
 
diff --git a/docs/how-to-guides/plugin-sidebar-0.md b/docs/how-to-guides/plugin-sidebar-0.md
index bf084680c3d1b7..76ef54bb9d3082 100644
--- a/docs/how-to-guides/plugin-sidebar-0.md
+++ b/docs/how-to-guides/plugin-sidebar-0.md
@@ -6,17 +6,17 @@ How to add a sidebar to your plugin. A sidebar is the region to the far right of
 
 ![Example sidebar](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/sidebar-up-and-running.png)
 
-_Note: this tutorial covers a custom sidebar, if you are looking to add controls to the sidebar see the [Block Toolbar and Settings Sidebar](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md)_
+_Note: this tutorial covers a custom sidebar, if you are looking to add controls to the sidebar see the [Block Toolbar and Settings Sidebar](/docs/getting-started/fundamentals/block-in-the-editor.md)_
 
 ## Before you start
 
-The tutorial assumes you have an existing plugin setup and are ready to add PHP and JavaScript code. Please, refer to [Getting started with JavaScript](/docs/how-to-guides/javascript/README.md) tutorial for an introduction to WordPress plugins and how to use JavaScript to extend the block editor.
+The tutorial assumes you have an existing plugin setup and are ready to add PHP and JavaScript code. Please, refer to [Getting started with JavaScript](/docs/getting-started/fundamentals/javascript-in-the-block-editor.md) tutorial for an introduction to WordPress plugins and how to use JavaScript to extend the block editor.
 
 ## Step-by-step guide
 
-### Step 1: Get a Sidebar up and Running
+### Step 1: Get a sidebar up and running
 
-The first step is to tell the editor that there is a new plugin that will have its own sidebar. Use the [registerPlugin](/packages/plugins/README.md), [PluginSidebar](/packages/edit-post/README.md#pluginsidebar), and [createElement](/packages/element/README.md) utilities provided by the `@wordpress/plugins`, `@wordpress/edit-post`, and `react` packages, respectively.
+The first step is to tell the editor that there is a new plugin that will have its own sidebar. Use the [registerPlugin](/packages/plugins/README.md), [PluginSidebar](/packages/editor/README.md#pluginsidebar), and [createElement](/packages/element/README.md) utilities provided by the `@wordpress/plugins`, `@wordpress/editor`, and `react` packages, respectively.
 
 Add the following code to a JavaScript file called `plugin-sidebar.js` and save it within your plugin's directory:
 
@@ -24,7 +24,7 @@ Add the following code to a JavaScript file called `plugin-sidebar.js` and save
 ( function ( wp, React ) {
 	var el = React.createElement;
 	var registerPlugin = wp.plugins.registerPlugin;
-	var PluginSidebar = wp.editPost.PluginSidebar;
+	var PluginSidebar = wp.editor.PluginSidebar;
 
 	registerPlugin( 'my-plugin-sidebar', {
 		render: function () {
@@ -57,7 +57,7 @@ function sidebar_plugin_register() {
 	wp_register_script(
 		'plugin-sidebar-js',
 		plugins_url( 'plugin-sidebar.js', __FILE__ ),
-		array( 'wp-plugins', 'wp-edit-post', 'react' )
+		array( 'wp-plugins', 'wp-editor', 'react' )
 	);
 }
 add_action( 'init', 'sidebar_plugin_register' );
@@ -82,7 +82,7 @@ To visualize and edit the meta field value you'll use an input component. The `@
 ( function ( wp ) {
 	var el = React.createElement;
 	var registerPlugin = wp.plugins.registerPlugin;
-	var PluginSidebar = wp.editPost.PluginSidebar;
+	var PluginSidebar = wp.editor.PluginSidebar;
 	var TextControl = wp.components.TextControl;
 
 	registerPlugin( 'my-plugin-sidebar', {
@@ -144,7 +144,7 @@ function sidebar_plugin_register() {
 		array(
 			'react',
 			'wp-plugins',
-			'wp-edit-post',
+			'wp-editor',
 			'wp-components'
 		)
 	);
@@ -168,7 +168,7 @@ Reload the editor and open the sidebar:
 
 This code doesn't let users store or retrieve data just yet, so the next steps will focus on how to connect it to the meta block field.
 
-### Step 3: Register the Meta Field
+### Step 3: Register the meta field
 
 To work with fields in the `post_meta` table, use the [register_post_meta](https://developer.wordpress.org/reference/functions/register_post_meta/). function to create a new field called `sidebar_plugin_meta_block_field`.
 
@@ -194,7 +194,7 @@ The function will return an object containing the registered meta field you regi
 
 If the code returns `undefined` make sure your post type supports `custom-fields`. Either when [registering the post](https://developer.wordpress.org/reference/functions/register_post_type/#supports) or with [add_post_type_support function](https://developer.wordpress.org/reference/functions/add_post_type_support/).
 
-### Step 4: Initialize the Input Control
+### Step 4: Initialize the input control
 
 With the field available in the editor store, it can now be surfaced to the UI. We extract the input control to a function to keep the code clean as we add functionality.
 
@@ -202,7 +202,7 @@ With the field available in the editor store, it can now be surfaced to the UI.
 ( function ( wp ) {
 	var el = React.createElement;
 	var registerPlugin = wp.plugins.registerPlugin;
-	var PluginSidebar = wp.editPost.PluginSidebar;
+	var PluginSidebar = wp.editor.PluginSidebar;
 	var TextControl = wp.components.TextControl;
 
 	var MetaBlockField = function () {
@@ -243,7 +243,7 @@ The `useSelect` function is used to fetch data when the component loads and will
 ( function ( wp ) {
 	var el = React.createElement;
 	var registerPlugin = wp.plugins.registerPlugin;
-	var PluginSidebar = wp.editPost.PluginSidebar;
+	var PluginSidebar = wp.editor.PluginSidebar;
 	var Text = wp.components.TextControl;
 	var useSelect = wp.data.useSelect;
 
@@ -297,7 +297,7 @@ wp.data
 
 You can observe the content changing in the input component.
 
-### Step 5: Update the Meta Field When the Input's Content Changes
+### Step 5: Update the meta field when the input's content changes
 
 The last step is to update the meta field when the input content changes.
 The `useDispatch` function takes a store name as its only argument and returns methods that you can use to update the store, in this case we'll use `editPost`
@@ -306,7 +306,7 @@ The `useDispatch` function takes a store name as its only argument and returns m
 ( function ( wp ) {
 	var el = React.createElement;
 	var registerPlugin = wp.plugins.registerPlugin;
-	var PluginSidebar = wp.editPost.PluginSidebar;
+	var PluginSidebar = wp.editor.PluginSidebar;
 	var TextControl = wp.components.TextControl;
 	var useSelect = wp.data.useSelect;
 	var useDispatch = wp.data.useDispatch;
diff --git a/docs/how-to-guides/propagating-updates.md b/docs/how-to-guides/propagating-updates.md
index ae5cb5f3b2a9ac..8079048a47a89c 100644
--- a/docs/how-to-guides/propagating-updates.md
+++ b/docs/how-to-guides/propagating-updates.md
@@ -36,11 +36,11 @@ If needed, one potential workaround for patterns with custom styles is to add a
 
 It is not fool-proof because users can modify the class via the editor UI.  However, because this setting is under the "Advanced" panel it is likely to stay intact in most instances. This gives theme authors some CSS control for some pattern types, allowing them to update existing uses. However, it does not prevent users from making massive alterations that cannot be updated.
 
-### Reusable blocks
+### Synced Patterns
 
-As the name suggests, these blocks are inherently synced across your site. Keep in mind that there are currently limitations with relying on reusable blocks to handle certain updates since content, HTML structure, and styles will all stay in sync when updates happen. If you require more nuance than that, this is a key element to factor in and a dynamic block might be a better approach.
+As the name suggests, these patterns are inherently synced across your site. Keep in mind that there are currently limitations with relying on synced patterns to handle certain updates since content, HTML structure, and styles will all stay in sync when updates happen. If you require more nuance than that, this is a key element to factor in and a dynamic block might be a better approach.
 
-### Template Parts and Templates
+### Template parts and templates
 
 Because block themes allow users to directly edit templates and template parts, how changes are managed need to be adjusted in light of the greater access given to users. For context, when templates or template parts are changed by the user, the updated templates from the theme update don’t show for the user. Only new users of the theme or users who have not yet edited a template are experiencing the updated template. If users haven’t modified the files then the changes you make on the file system will be reflected on the user’s sites – you just need to update the files and they’ll get the changes. However if they have made changes to their templates then the only way you can update their templates is to:
 
diff --git a/docs/how-to-guides/themes/README.md b/docs/how-to-guides/themes/README.md
index 708ecba03d264d..1510b20c30047f 100644
--- a/docs/how-to-guides/themes/README.md
+++ b/docs/how-to-guides/themes/README.md
@@ -6,7 +6,7 @@ The block editor provides a number of options for theme designers and developers
 
 ### Classic theme
 
-In terms of block editor terminology this is any theme that defines its templates in the traditional `.php` file format, and that doesn't have an `index.html` format template in the `/block-templates` or `/templates` folders. A `Classic` theme has the ability to provide configuration and styling options to the block editor, and block content, via [Theme Supports](/docs/how-to-guides/themes/theme-support.md), or by including a [theme.json](/docs/how-to-guides/themes/theme-json.md) file. A theme does not have to be a `Block` theme in order to take advantage of some of the flexibility provided by the use of a `theme.json` file.
+In terms of block editor terminology this is any theme that defines its templates in the traditional `.php` file format, and that doesn't have an `index.html` format template in the `/block-templates` or `/templates` folders. A `Classic` theme has the ability to provide configuration and styling options to the block editor, and block content, via [Theme Supports](/docs/how-to-guides/themes/theme-support.md), or by including a [theme.json](/docs/how-to-guides/themes/global-settings-and-styles.md) file. A theme does not have to be a `Block` theme in order to take advantage of some of the flexibility provided by the use of a `theme.json` file.
 
 ### Block theme
 
@@ -18,5 +18,5 @@ There isn't an FSE specific theme type. In WordPress > 5.9 FSE is enabled for an
 
 **Contents**
 
-- [Global Settings (theme.json)](/docs/how-to-guides/themes/theme-json.md)
+- [Global Settings (theme.json)](/docs/how-to-guides/themes/global-settings-and-styles.md)
 - [Theme Support](/docs/how-to-guides/themes/theme-support.md)
diff --git a/docs/how-to-guides/themes/global-settings-and-styles.md b/docs/how-to-guides/themes/global-settings-and-styles.md
new file mode 100644
index 00000000000000..f71bd67bfaf2ec
--- /dev/null
+++ b/docs/how-to-guides/themes/global-settings-and-styles.md
@@ -0,0 +1,1332 @@
+# Global Settings & Styles (theme.json)
+
+WordPress 5.8 comes with [a new mechanism](https://make.wordpress.org/core/2021/06/25/introducing-theme-json-in-wordpress-5-8/) to configure the editor that enables a finer-grained control and introduces the first step in managing styles for future WordPress releases: the `theme.json` file.
+
+## Rationale
+
+The Block Editor API has evolved at different velocities and there are some growing pains, specially in areas that affect themes. Examples of this are: the ability to [control the editor programmatically](https://make.wordpress.org/core/2020/01/23/controlling-the-block-editor/), or [a block style system](https://github.com/WordPress/gutenberg/issues/9534) that facilitates user, theme, and core style preferences.
+
+This describes the current efforts to consolidate the various APIs related to styles into a single point – a `theme.json` file that should be located inside the root of the theme directory.
+
+### Settings for the block editor
+
+Instead of the proliferation of theme support flags or alternative methods, the `theme.json` files provides a canonical way to define the settings of the block editor. These settings includes things like:
+
+-   What customization options should be made available or hidden from the user.
+-   What are the default colors, font sizes... available to the user.
+-   Defines the default layout of the editor (widths and available alignments).
+
+### Settings can be controlled per block
+
+For more granularity, these settings also work at the block level in `theme.json`.
+
+Examples of what can be achieved are:
+
+-   Use a particular preset for a block (e.g.: table) but the common one for the rest of blocks.
+-   Enable font size UI controls for all blocks but the headings block.
+-   etc.
+
+### Styles are managed
+
+By using the `theme.json` file to set style properties in a structured way, the Block Editor can "manage" the CSS that comes from different origins (user, theme, and core CSS). For example, if a theme and a user set the font size for paragraphs, we only enqueue the style coming from the user and not the theme's.
+
+Some of the advantages are:
+
+- Reduce the amount of CSS enqueued.
+- Prevent specificity wars.
+
+### CSS Custom Properties: presets & custom
+
+There are some areas of styling that would benefit from having shared values that can change across a site.
+
+To address this need, we've started to experiment with CSS Custom Properties, aka CSS Variables, in some places:
+
+- **Presets**: [color palettes](/docs/how-to-guides/themes/theme-support.md#block-color-palettes), [font sizes](/docs/how-to-guides/themes/theme-support.md#block-font-sizes), or [gradients](/docs/how-to-guides/themes/theme-support.md#block-gradient-presets) declared by the theme are converted to CSS Custom Properties and enqueued both the front-end and the editors.
+
+{% codetabs %}
+{% Input %}
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"color": {
+			"palette": [
+				{
+					"name": "Black",
+					"slug": "black",
+					"color": "#000000"
+				},
+				{
+					"name": "White",
+					"slug": "white",
+					"color": "#ffffff"
+				}
+			]
+		}
+	}
+}
+```
+
+{% Output %}
+
+```css
+body {
+	--wp--preset--color--black: #000000;
+	--wp--preset--color--white: #ffffff;
+}
+```
+
+{% end %}
+
+-   **Custom properties**: there's also a mechanism to create your own CSS Custom Properties.
+
+{% codetabs %}
+{% Input %}
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"custom": {
+			"line-height": {
+				"body": 1.7,
+				"heading": 1.3
+			}
+		}
+	}
+}
+```
+
+{% Output %}
+
+```css
+body {
+	--wp--custom--line-height--body: 1.7;
+	--wp--custom--line-height--heading: 1.3;
+}
+```
+
+{% end %}
+
+## Specification
+
+This specification is the same for the three different origins that use this format: core, themes, and users. Themes can override core's defaults by creating a file called `theme.json`. Users, via the site editor, will also be able to override theme's or core's preferences via an user interface that is being worked on.
+
+```json
+{
+	"version": 3,
+	"settings": {},
+	"styles": {},
+	"customTemplates": {},
+	"templateParts": {}
+}
+```
+
+### Version
+
+This field describes the format of the `theme.json` file. The latest version is [version 3](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-living/) introduced in WordPress 6.6.
+
+New versions are introduced when a breaking change needs to be made. This allows theme authors to choose when to opt-in to the breaking changes and migrate their theme.json files to the new format.
+
+Older versions of `theme.json` are backwards-compatible and will continue to work with newer versions of WordPress and the Gutenberg plugin. However new features will be developed on the latest version.
+
+Follow the instructions in [migrating to newer versions](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-migrations/) for details on updating to the latest version.
+
+### Settings
+
+<div class="callout callout-alert">
+The Gutenberg plugin extends the settings available from WordPress 5.8, so they can be used with other WordPress versions and they go through a maturation process before being ported to core.
+
+The tabs below show WordPress 5.8 supported settings and the ones supported by the Gutenberg plugin.
+</div>
+
+The settings section has the following structure:
+
+{% codetabs %}
+{% WordPress %}
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"border": {
+			"radius": false,
+			"color": false,
+			"style": false,
+			"width": false
+		},
+		"color": {
+			"custom": true,
+			"customDuotone": true,
+			"customGradient": true,
+			"duotone": [],
+			"gradients": [],
+			"link": false,
+			"palette": [],
+			"text": true,
+			"background": true,
+			"defaultGradients": true,
+			"defaultPalette": true
+		},
+		"custom": {},
+		"layout": {
+			"contentSize": "800px",
+			"wideSize": "1000px"
+		},
+		"spacing": {
+			"margin": false,
+			"padding": false,
+			"blockGap": null,
+			"units": [ "px", "em", "rem", "vh", "vw" ]
+		},
+		"typography": {
+			"customFontSize": true,
+			"lineHeight": false,
+			"dropCap": true,
+			"fluid": false,
+			"fontStyle": true,
+			"fontWeight": true,
+			"letterSpacing": true,
+			"textDecoration": true,
+			"textTransform": true,
+			"fontSizes": [],
+			"fontFamilies": []
+		},
+		"blocks": {
+			"core/paragraph": {
+				"color": {},
+				"custom": {},
+				"layout": {},
+				"spacing": {},
+				"typography": {}
+			},
+			"core/heading": {},
+			"etc": {}
+		}
+	}
+}
+```
+
+{% Gutenberg %}
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"appearanceTools": false,
+		"border": {
+			"color": false,
+			"radius": false,
+			"style": false,
+			"width": false
+		},
+		"color": {
+			"background": true,
+			"custom": true,
+			"customDuotone": true,
+			"customGradient": true,
+			"defaultGradients": true,
+			"defaultPalette": true,
+			"duotone": [],
+			"gradients": [],
+			"link": false,
+			"palette": [],
+			"text": true
+		},
+		"custom": {},
+		"dimensions": {
+			"aspectRatio": false,
+			"minHeight": false,
+		},
+		"layout": {
+			"contentSize": "800px",
+			"wideSize": "1000px"
+		},
+		"spacing": {
+			"blockGap": null,
+			"margin": false,
+			"padding": false,
+			"customSpacingSize": true,
+			"units": [ "px", "em", "rem", "vh", "vw" ],
+			"spacingScale": {
+				"operator": "*",
+				"increment": 1.5,
+				"steps": 7,
+				"mediumStep": 1.5,
+				"unit": "rem"
+			},
+			"spacingSizes": []
+		},
+		"typography": {
+			"customFontSize": true,
+			"dropCap": true,
+			"fluid": false,
+			"fontFamilies": [],
+			"fontSizes": [],
+			"fontStyle": true,
+			"fontWeight": true,
+			"letterSpacing": true,
+			"lineHeight": false,
+			"textAlign": true,
+			"textColumns": false,
+			"textDecoration": true,
+			"textTransform": true
+		},
+		"blocks": {
+			"core/paragraph": {
+				"border": {},
+				"color": {},
+				"custom": {},
+				"layout": {},
+				"spacing": {},
+				"typography": {}
+			},
+			"core/heading": {},
+			"etc": {}
+		}
+	}
+}
+```
+{% end %}
+
+Each block can configure any of these settings separately, providing a more fine-grained control over what exists via `add_theme_support`. The settings declared at the top-level affect to all blocks, unless a particular block overwrites it. It's a way to provide inheritance and configure all blocks at once.
+
+Note, however, that not all settings are relevant for all blocks. The settings section provides an opt-in/opt-out mechanism for themes, but it's the block's responsibility to add support for the features that are relevant to it. For example, if a block doesn't implement the `dropCap` feature, a theme can't enable it for such a block through `theme.json`.
+
+### Opt-in into UI controls
+
+There's one special setting property, `appearanceTools`, which is a boolean and its default value is false. Themes can use this setting to enable the following ones:
+
+- background: backgroundImage, backgroundSize
+- border: color, radius, style, width
+- color: link
+- dimensions: aspectRatio, minHeight
+- position: sticky
+- spacing: blockGap, margin, padding
+- typography: lineHeight
+
+#### Backward compatibility with add_theme_support
+
+To retain backward compatibility, the existing `add_theme_support` declarations that configure the block editor are retrofit in the proper categories for the top-level section. For example, if a theme uses `add_theme_support('disable-custom-colors')`, it'll be the same as setting `settings.color.custom` to `false`. If the `theme.json` contains any settings, these will take precedence over the values declared via `add_theme_support`. This is the complete list of equivalences:
+
+| add_theme_support           | theme.json setting                                            |
+| --------------------------- | ------------------------------------------------------------- |
+| `custom-line-height`        | Set `typography.lineHeight` to `true`.                        |
+| `custom-spacing`            | Set `spacing.padding` to `true`.                              |
+| `custom-units`              | Provide the list of units via `spacing.units`.                |
+| `disable-custom-colors`     | Set `color.custom` to `false`.                                |
+| `disable-custom-font-sizes` | Set `typography.customFontSize` to `false`.                   |
+| `disable-custom-gradients`  | Set `color.customGradient` to `false`.                        |
+| `editor-color-palette`      | Provide the list of colors via `color.palette`.               |
+| `editor-font-sizes`         | Provide the list of font size via `typography.fontSizes`.     |
+| `editor-gradient-presets`   | Provide the list of gradients via `color.gradients`.          |
+| `editor-spacing-sizes`      | Provide the list of spacing sizes via `spacing.spacingSizes`. |
+| `appearance-tools`          | Set `appearanceTools` to `true`.                              |
+| `border`                    | Set `border: color, radius, style, width` to `true`.          |
+| `link-color `               | Set `color.link` to `true`.                                   |
+
+#### Presets
+
+Presets are part of the settings section. They are values that are shown to the user via some UI controls. By defining them via `theme.json` the engine can do more for themes, such as automatically translate the preset name or enqueue the corresponding CSS classes and custom properties.
+
+The following presets can be defined via `theme.json`:
+
+- `color.duotone`: doesn't generate classes or custom properties.
+- `color.gradients`: generates a single class and custom property per preset value.
+- `color.palette`:
+    - generates 3 classes per preset value: color, background-color, and border-color.
+    - generates a single custom property per preset value.
+- `spacing.spacingSizes`/`spacing.spacingScale`: generates a single custom property per preset value.
+- `typography.fontSizes`: generates a single class and custom property per preset value.
+- `typography.fontFamilies`: generates a single custom property per preset value.
+
+The naming schema for the classes and the custom properties is as follows:
+
+- Custom Properties: `--wp--preset--{preset-category}--{preset-slug}` such as `--wp--preset--color--black`
+- Classes: `.has-{preset-slug}-{preset-category}` such as `.has-black-color`.
+
+
+{% codetabs %}
+{% Input %}
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"color": {
+			"duotone": [
+				{
+					"colors": [ "#000", "#FFF" ],
+					"slug": "black-and-white",
+					"name": "Black and White"
+				}
+			],
+			"gradients": [
+				{
+					"slug": "blush-bordeaux",
+					"gradient": "linear-gradient(135deg,rgb(254,205,165) 0%,rgb(254,45,45) 50%,rgb(107,0,62) 100%)",
+					"name": "Blush bordeaux"
+				},
+				{
+					"slug": "blush-light-purple",
+					"gradient": "linear-gradient(135deg,rgb(255,206,236) 0%,rgb(152,150,240) 100%)",
+					"name": "Blush light purple"
+				}
+			],
+			"palette": [
+				{
+					"slug": "strong-magenta",
+					"color": "#a156b4",
+					"name": "Strong magenta"
+				},
+				{
+					"slug": "very-dark-grey",
+					"color": "rgb(131, 12, 8)",
+					"name": "Very dark grey"
+				}
+			]
+		},
+		"typography": {
+			"fontFamilies": [
+				{
+					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell, \"Helvetica Neue\",sans-serif",
+					"slug": "system-font",
+					"name": "System Font"
+				},
+				{
+					"fontFamily": "Helvetica Neue, Helvetica, Arial, sans-serif",
+					"slug": "helvetica-arial",
+					"name": "Helvetica or Arial"
+				}
+			],
+			"fontSizes": [
+				{
+					"slug": "big",
+					"size": 32,
+					"name": "Big"
+				},
+				{
+					"slug": "x-large",
+					"size": 46,
+					"name": "Large"
+				}
+			]
+		},
+		"spacing": {
+			"spacingScale": {
+				"operator": "*",
+				"increment": 1.5,
+				"steps": 7,
+				"mediumStep": 1.5,
+				"unit": "rem"
+			},
+			"spacingSizes": [
+				{
+					"slug": "40",
+					"size": "1rem",
+					"name": "Small"
+				},
+				{
+					"slug": "50",
+					"size": "1.5rem",
+					"name": "Medium"
+				},
+				{
+					"slug": "60",
+					"size": "2rem",
+					"name": "Large"
+				}
+			]
+		},
+		"blocks": {
+			"core/group": {
+				"color": {
+					"palette": [
+						{
+							"slug": "black",
+							"color": "#000000",
+							"name": "Black"
+						},
+						{
+							"slug": "white",
+							"color": "#ffffff",
+							"name": "White"
+						}
+					]
+				}
+			}
+		}
+	}
+}
+```
+
+{% Output %}
+
+```css
+/* Top-level custom properties */
+body {
+	--wp--preset--color--strong-magenta: #a156b4;
+	--wp--preset--color--very-dark-grey: #444;
+	--wp--preset--gradient--blush-bordeaux: linear-gradient( 135deg, rgb( 254, 205, 165 ) 0%, rgb( 254, 45, 45 ) 50%, rgb( 107, 0, 62 ) 100% );
+	--wp--preset--gradient--blush-light-purple: linear-gradient( 135deg, rgb( 255, 206, 236 ) 0%, rgb( 152, 150, 240 ) 100% );
+	--wp--preset--font-size--x-large: 46;
+	--wp--preset--font-size--big: 32;
+	--wp--preset--font-family--helvetica-arial: Helvetica Neue, Helvetica, Arial, sans-serif;
+	--wp--preset--font-family--system: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell, \"Helvetica Neue\",sans-serif;
+	--wp--preset--spacing--20: 0.44rem;
+	--wp--preset--spacing--30: 0.67rem;
+	--wp--preset--spacing--40: 1rem;
+	--wp--preset--spacing--50: 1.5rem;
+	--wp--preset--spacing--60: 2.25rem;
+	--wp--preset--spacing--70: 3.38rem;
+	--wp--preset--spacing--80: 5.06rem;
+}
+
+/* Block-level custom properties (bounded to the group block) */
+.wp-block-group {
+	--wp--preset--color--black: #000000;
+	--wp--preset--color--white: #ffffff;
+}
+
+/* Top-level classes */
+.has-strong-magenta-color { color: #a156b4 !important; }
+.has-strong-magenta-background-color { background-color: #a156b4 !important; }
+.has-strong-magenta-border-color { border-color: #a156b4 !important; }
+.has-very-dark-grey-color { color: #444 !important; }
+.has-very-dark-grey-background-color { background-color: #444 !important; }
+.has-very-dark-grey-border-color { border-color: #444 !important; }
+.has-blush-bordeaux-background { background: linear-gradient( 135deg, rgb( 254, 205, 165 ) 0%, rgb( 254, 45, 45 ) 50%, rgb( 107, 0, 62 ) 100% ) !important; }
+.has-blush-light-purple-background { background: linear-gradient( 135deg, rgb( 255, 206, 236 ) 0%, rgb( 152, 150, 240 ) 100% ) !important; }
+.has-big-font-size { font-size: 32; }
+.has-normal-font-size { font-size: 16; }
+
+/* Block-level classes (bounded to the group block) */
+.wp-block-group.has-black-color { color: #a156b4 !important; }
+.wp-block-group.has-black-background-color { background-color: #a156b4 !important; }
+.wp-block-group.has-black-border-color { border-color: #a156b4 !important; }
+.wp-block-group.has-white-color { color: #444 !important; }
+.wp-block-group.has-white-background-color { background-color: #444 !important; }
+.wp-block-group.has-white-border-color { border-color: #444 !important; }
+
+```
+{% end %}
+
+To maintain backward compatibility, the presets declared via `add_theme_support` will also generate the CSS Custom Properties. If the `theme.json` contains any presets, these will take precedence over the ones declared via `add_theme_support`.
+
+Preset classes are attached to the content of a post by some user action. That's why the engine will add `!important` to these, because user styles should take precedence over theme styles.
+
+#### Custom
+
+In addition to create CSS Custom Properties for the presets, the `theme.json` also allows for themes to create their own, so they don't have to be enqueued separately. Any values declared within the `custom` field will be transformed to CSS Custom Properties following this naming schema: `--wp--custom--<variable-name>`.
+
+For example:
+
+{% codetabs %}
+{% Input %}
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"custom": {
+			"baseFont": 16,
+			"lineHeight": {
+				"small": 1.2,
+				"medium": 1.4,
+				"large": 1.8
+			}
+		},
+		"blocks": {
+			"core/group": {
+				"custom": {
+					"baseFont": 32
+				}
+			}
+		}
+	}
+}
+```
+
+{% Output %}
+
+```css
+body {
+	--wp--custom--base-font: 16;
+	--wp--custom--line-height--small: 1.2;
+	--wp--custom--line-height--medium: 1.4;
+	--wp--custom--line-height--large: 1.8;
+}
+.wp-block-group {
+	--wp--custom--base-font: 32;
+}
+```
+
+{% end %}
+
+Note that the name of the variable is created by adding `--` in between each nesting level and `camelCase` fields are transformed to `kebab-case`.
+
+#### Settings examples
+
+- Enable custom colors only for the paragraph block:
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"color": {
+			"custom": false
+		},
+		"blocks": {
+			"core/paragraph": {
+				"color": {
+					"custom": true
+				}
+			}
+		}
+	}
+}
+```
+
+- Disable border radius for the button block:
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"blocks": {
+			"core/button": {
+				"border": {
+					"radius": false
+				}
+			}
+		}
+	}
+}
+```
+
+- Provide the group block a different palette than the rest:
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"color": {
+			"palette": [
+				{
+					"slug": "black",
+					"color": "#000000",
+					"name": "Black"
+				},
+				{
+					"slug": "white",
+					"color": "#FFFFFF",
+					"name": "White"
+				},
+				{
+					"slug": "red",
+					"color": "#FF0000",
+					"name": "Red"
+				},
+				{
+					"slug": "green",
+					"color": "#00FF00",
+					"name": "Green"
+				},
+				{
+					"slug": "blue",
+					"color": "#0000FF",
+					"name": "Blue"
+				}
+			]
+		},
+		"blocks": {
+			"core/group": {
+				"color": {
+					"palette": [
+						{
+							"slug": "black",
+							"color": "#000000",
+							"name": "Black"
+						},
+						{
+							"slug": "white",
+							"color": "#FFF",
+							"name": "White"
+						}
+					]
+				}
+			}
+		}
+	}
+}
+```
+
+### Styles
+
+<div class="callout callout-alert">
+The Gutenberg plugin extends the styles available from WordPress 5.8, so they can be used with other WordPress versions and they go through a maturation process before being ported to core.
+
+The tabs below show WordPress 5.8 supported styles and the ones supported by the Gutenberg plugin.
+</div>
+
+Each block declares which style properties it exposes via the [block supports mechanism](/docs/reference-guides/block-api/block-supports.md). The support declarations are used to automatically generate the UI controls for the block in the editor. Themes can use any style property via the `theme.json` for any block ― it's the theme's responsibility to verify that it works properly according to the block markup, etc.
+
+{% codetabs %}
+{% WordPress %}
+
+```json
+{
+	"version": 3,
+	"styles": {
+		"border": {
+			"radius": "value",
+			"color": "value",
+			"style": "value",
+			"width": "value"
+		},
+		"filter": {
+			"duotone": "value"
+		},
+		"color": {
+			"background": "value",
+			"gradient": "value",
+			"text": "value"
+		},
+		"spacing": {
+			"blockGap": "value",
+			"margin": {
+				"top": "value",
+				"right": "value",
+				"bottom": "value",
+				"left": "value",
+			},
+			"padding": {
+				"top": "value",
+				"right": "value",
+				"bottom": "value",
+				"left": "value"
+			}
+		},
+		"typography": {
+			"fontSize": "value",
+			"fontStyle": "value",
+			"fontWeight": "value",
+			"letterSpacing": "value",
+			"lineHeight": "value",
+			"textDecoration": "value",
+			"textTransform": "value"
+		},
+		"elements": {
+			"link": {
+				"border": {},
+				"color": {},
+				"spacing": {},
+				"typography": {}
+			},
+			"h1": {},
+			"h2": {},
+			"h3": {},
+			"h4": {},
+			"h5": {},
+			"h6": {}
+		},
+		"blocks": {
+			"core/group": {
+				"border": {},
+				"color": {},
+				"spacing": {},
+				"typography": {},
+				"elements": {
+					"link": {},
+					"h1": {},
+					"h2": {},
+					"h3": {},
+					"h4": {},
+					"h5": {},
+					"h6": {}
+				}
+			},
+			"etc": {}
+		}
+	}
+}
+```
+{% Gutenberg %}
+
+```json
+{
+	"version": 3,
+	"styles": {
+		"border": {
+			"color": "value",
+			"radius": "value",
+			"style": "value",
+			"width": "value"
+		},
+		"color": {
+			"background": "value",
+			"gradient": "value",
+			"text": "value"
+		},
+		"dimensions": {
+			"aspectRatio": "value",
+			"minHeight": "value"
+		},
+		"filter": {
+			"duotone": "value"
+		},
+		"spacing": {
+			"blockGap": "value",
+			"margin": {
+				"top": "value",
+				"right": "value",
+				"bottom": "value",
+				"left": "value"
+			},
+			"padding": {
+				"top": "value",
+				"right": "value",
+				"bottom": "value",
+				"left": "value"
+			}
+		},
+		"typography": {
+			"fontFamily": "value",
+			"fontSize": "value",
+			"fontStyle": "value",
+			"fontWeight": "value",
+			"letterSpacing": "value",
+			"lineHeight": "value",
+			"textColumns": "value",
+			"textDecoration": "value",
+			"textTransform": "value"
+		},
+		"elements": {
+			"link": {
+				"border": {},
+				"color": {},
+				"spacing": {},
+				"typography": {}
+			},
+			"h1": {},
+			"h2": {},
+			"h3": {},
+			"h4": {},
+			"h5": {},
+			"h6": {},
+			"heading": {},
+			"button": {},
+			"caption": {}
+		},
+		"blocks": {
+			"core/group": {
+				"border": {},
+				"color": {},
+				"dimensions": {},
+				"spacing": {},
+				"typography": {},
+				"elements": {
+					"link": {},
+					"h1": {},
+					"h2": {},
+					"h3": {},
+					"h4": {},
+					"h5": {},
+					"h6": {}
+				}
+			},
+			"etc": {}
+		}
+	}
+}
+```
+{% end %}
+### Top-level styles
+
+Styles found at the top-level will be enqueued using the `body` selector.
+
+{% codetabs %}
+{% Input %}
+
+```json
+{
+	"version": 3,
+	"styles": {
+		"color": {
+			"text": "var(--wp--preset--color--primary)"
+		}
+	}
+}
+```
+
+{% Output %}
+
+```css
+body {
+	color: var( --wp--preset--color--primary );
+}
+```
+
+{% end %}
+### Block styles
+
+Styles found within a block will be enqueued using the block selector.
+
+By default, the block selector is generated based on its name such as `.wp-block-<blockname-without-namespace>`. For example, `.wp-block-group` for the `core/group` block. There are some blocks that want to opt-out from this default behavior. They can do so by explicitly telling the system which selector to use for them via the `__experimentalSelector` key within the `supports` section of its `block.json` file. Note that the block needs to be registered server-side for the `__experimentalSelector` field to be available to the style engine.
+
+{% codetabs %}
+{% Input %}
+
+```json
+{
+	"version": 3,
+	"styles": {
+		"color": {
+			"text": "var(--wp--preset--color--primary)"
+		},
+		"blocks": {
+			"core/paragraph": {
+				"color": {
+					"text": "var(--wp--preset--color--secondary)"
+				}
+			},
+			"core/group": {
+				"color": {
+					"text": "var(--wp--preset--color--tertiary)"
+				}
+			}
+		}
+	}
+}
+```
+
+{% Output %}
+
+```css
+body {
+	color: var( --wp--preset--color--primary );
+}
+p { /* The core/paragraph opts out from the default behaviour and uses p as a selector. */
+	color: var( --wp--preset--color--secondary );
+}
+.wp-block-group {
+	color: var( --wp--preset--color--tertiary );
+}
+```
+{% end %}
+
+#### Referencing a style
+
+A block can be styled using a reference to a root level style. This feature is supported by Gutenberg.
+If you register a background color for the root using styles.color.background:
+
+```JSON
+"styles": {
+		"color": {
+			"background": "var(--wp--preset--color--primary)"
+		}
+	}
+```
+
+You can use `ref: "styles.color.background"`  to re-use the style for a block:
+
+```JSON
+{
+	"color": {
+		"text": { "ref": "styles.color.background" }
+	}
+}
+```
+
+#### Element styles
+
+In addition to top-level and block-level styles, there's the concept of elements that can be used in both places. There's a closed set of them:
+
+Supported by Gutenberg:
+
+- `button`: maps to the `wp-element-button` CSS class. Also maps to `wp-block-button__link` for backwards compatibility.
+- `caption`: maps to the `.wp-element-caption, .wp-block-audio figcaption, .wp-block-embed figcaption, .wp-block-gallery figcaption, .wp-block-image figcaption, .wp-block-table figcaption, .wp-block-video figcaption` CSS classes.
+- `heading`: maps to all headings, the `h1 to h6` CSS selectors.
+
+Supported by WordPress:
+
+- `h1`: maps to the `h1` CSS selector.
+- `h2`: maps to the `h2` CSS selector.
+- `h3`: maps to the `h3` CSS selector.
+- `h4`: maps to the `h4` CSS selector.
+- `h5`: maps to the `h5` CSS selector.
+- `h6`: maps to the `h6` CSS selector.
+- `link`: maps to the `a` CSS selector.
+
+If they're found in the top-level the element selector will be used. If they're found within a block, the selector to be used will be the element's appended to the corresponding block.
+
+
+{% codetabs %}
+{% Input %}
+
+```json
+{
+	"version": 3,
+	"styles": {
+		"typography": {
+			"fontSize": "var(--wp--preset--font-size--normal)"
+		},
+		"elements": {
+			"h1": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--huge)"
+				}
+			},
+			"h2": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--big)"
+				}
+			},
+			"h3": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--medium)"
+				}
+			}
+		},
+		"blocks": {
+			"core/group": {
+				"elements": {
+					"h2": {
+						"typography": {
+							"fontSize": "var(--wp--preset--font-size--small)"
+						}
+					},
+					"h3": {
+						"typography": {
+							"fontSize": "var(--wp--preset--font-size--smaller)"
+						}
+					}
+				}
+			}
+		}
+	}
+}
+```
+
+{% Output %}
+
+```css
+body {
+	font-size: var( --wp--preset--font-size--normal );
+}
+h1 {
+	font-size: var( --wp--preset--font-size--huge );
+}
+h2 {
+	font-size: var( --wp--preset--font-size--big );
+}
+h3 {
+	font-size: var( --wp--preset--font-size--medium );
+}
+.wp-block-group h2 {
+	font-size: var( --wp--preset--font-size--small );
+}
+.wp-block-group h3 {
+	font-size: var( --wp--preset--font-size--smaller );
+}
+```
+{% end %}
+##### Element pseudo selectors
+
+Pseudo selectors `:hover`, `:focus`, `:visited`, `:active`, `:link`, `:any-link` are supported by Gutenberg.
+
+```json
+"elements": {
+		"link": {
+			"color": {
+				"text": "green"
+			},
+			":hover": {
+				"color": {
+					"text": "hotpink"
+				}
+			}
+		}
+	}
+```
+
+#### Variations
+
+A block can have a "style variation", as defined per the [block.json specification](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#styles-optional). Theme authors can define the style attributes for an existing style variation using the theme.json file. Styles for unregistered style variations will be ignored.
+
+Note that variations are a "block concept", they only exist bound to blocks. The `theme.json` specification respects that distinction by only allowing `variations` at the block-level but not at the top-level. It's also worth highlighting that only variations defined in the `block.json` file of the block are considered "registered": so far, the style variations added via `register_block_style` or in the client are ignored, see [this issue](https://github.com/WordPress/gutenberg/issues/49602) for more information.
+
+For example, this is how to provide styles for the existing `plain` variation for the `core/quote` block:
+
+```json
+{
+	"version": 3,
+	"styles":{
+		"blocks": {
+			"core/quote": {
+				"variations": {
+					"plain": {
+						"color": {
+							"background": "red"
+						}
+					}
+				}
+			}
+		}
+	}
+}
+```
+
+The resulting CSS output is this:
+
+```css
+.wp-block-quote.is-style-plain {
+	background-color: red;
+}
+```
+
+### customTemplates
+
+<div class="callout callout-alert">Supported in WordPress from version 5.9.</div>
+
+Within this field themes can list the custom templates present in the `templates` folder. For example, for a custom template named `my-custom-template.html`, the `theme.json` can declare what post types can use it and what's the title to show the user:
+
+- name: mandatory.
+- title: mandatory, translatable.
+- postTypes: optional, only applies to the `page` by default.
+
+```json
+{
+    "version": 3,
+	"customTemplates": [
+		{
+			"name": "my-custom-template",
+			"title": "The template title",
+			"postTypes": [
+				"page",
+				"post",
+				"my-cpt"
+			]
+		}
+	]
+}
+```
+
+### templateParts
+
+<div class="callout callout-alert">Supported in WordPress from version 5.9.</div>
+
+Within this field themes can list the template parts present in the `parts` folder. For example, for a template part named `my-template-part.html`, the `theme.json` can declare the area term for the template part entity which is responsible for rendering the corresponding block variation (Header block, Footer block, etc.) in the editor. Defining this area term in the json will allow the setting to persist across all uses of that template part entity, as opposed to a block attribute that would only affect one block. Defining area as a block attribute is not recommended as this is only used 'behind the scenes' to aid in bridging the gap between placeholder flows and entity creation.
+
+Currently block variations exist for "header" and "footer" values of the area term, any other values and template parts not defined in the json will default to the general template part block. Variations will be denoted by specific icons within the editor's interface, will default to the corresponding semantic HTML element for the wrapper (this can also be overridden by the `tagName` attribute set on the template part block), and will contextualize the template part allowing more custom flows in future editor improvements.
+
+- name: mandatory.
+- title: optional, translatable.
+- area: optional, will be set to `uncategorized` by default and trigger no block variation.
+
+```json
+{
+    "version": 3,
+	"templateParts": [
+		{
+			"name": "my-template-part",
+			"title": "Header",
+			"area": "header"
+		}
+	]
+}
+```
+
+### patterns
+
+<div class="callout callout-alert">Supported in WordPress from version 6.0.</div>
+
+Within this field themes can list patterns to register from [Pattern Directory](https://wordpress.org/patterns/). The `patterns` field is an array of pattern `slugs` from the Pattern Directory. Pattern slugs can be extracted by the `url` in single pattern view at the Pattern Directory. For example in this url `https://wordpress.org/patterns/pattern/partner-logos` the slug is `partner-logos`.
+
+```json
+{
+	"version": 3,
+	"patterns": [ "short-text-surrounded-by-round-images", "partner-logos" ]
+}
+```
+
+## Developing with theme.json
+
+It can be difficult to remember the theme.json settings and properties and which versions of WordPress support which settings while you develop, so it can be helpful to use the provided JSON schema for theme.json.
+
+Many code editors support JSON schema and can provide help like tooltips, autocomplete, or schema validation right in your editor.
+
+Theme.json schemas for each WordPress version are available at `https://schemas.wp.org/wp/{{version}}/theme.json`. For example a schema for WordPress 5.8 is available at `https://schemas.wp.org/wp/5.8/theme.json`. To ensure that you're only using features available to your users, it's best to use the oldest version that your theme supports.
+
+The latest schema including all the latest changes from the Gutenberg plugin is available at `https://schemas.wp.org/trunk/theme.json`.
+
+Check your editor's documentation for JSON schema support. In Visual Studio Code, for example, you need to add `"$schema": "https://schemas.wp.org/wp/x.x/theme.json"` as a top-level property of your theme.json file, but other editors may be configured differently.
+
+![Example using validation with schema](https://developer.wordpress.org/files/2021/11/theme-json-schema-updated.gif)
+
+
+## Frequently Asked Questions
+
+### The naming schema of CSS Custom Properties
+
+One thing you may have noticed is the naming schema used for the CSS Custom Properties the system creates, including the use of double hyphen, `--`, to separate the different "concepts". Take the following examples.
+
+**Presets** such as `--wp--preset--color--black` can be divided into the following chunks:
+
+- `--wp`: prefix to namespace the CSS variable.
+- `preset `: indicates is a CSS variable that belongs to the presets.
+- `color`: indicates which preset category the variable belongs to. It can be `color`, `font-size`, `gradients`.
+- `black`: the `slug` of the particular preset value.
+
+**Custom** properties such as `--wp--custom--line-height--body`, which can be divided into the following chunks:
+
+- `--wp`: prefix to namespace the CSS variable.
+- `custom`: indicates is a "free-form" CSS variable created by the theme.
+- `line-height--body`: the result of converting the "custom" object keys into a string.
+
+The `--` as a separator has two functions:
+
+- Readability, for human understanding. It can be thought as similar to the BEM naming schema, it separates "categories".
+- Parsability, for machine understanding. Using a defined structure allows machines to understand the meaning of the property `--wp--preset--color--black`: it's a value bounded to the color preset whose slug is "black", which then gives us room to do more things with them.
+
+### Why using `--` as a separator?
+
+We could have used any other separator, such as a single `-`.
+
+However, that'd have been problematic, as it'd have been impossible to tell how `--wp-custom-line-height-template-header` should be converted back into an object, unless we force theme authors not to use `-` in their variable names.
+
+By reserving `--` as a category separator and let theme authors use `-` for word-boundaries, the naming is clearer: `--wp--custom--line-height--template-header`.
+
+### How settings under "custom" create new CSS Custom Properties
+
+The algorithm to create CSS Variables out of the settings under the "custom" key works this way:
+
+This is for clarity, but also because we want a mechanism to parse back a variable name such `--wp--custom--line-height--body` to its object form in theme.json. We use the same separation for presets.
+
+For example:
+
+{% codetabs %}
+{% Input %}
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"custom": {
+			"lineHeight": {
+				"body": 1.7
+			},
+			"font-primary": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif"
+		}
+	}
+}
+```
+
+{% Output %}
+
+```css
+body {
+	--wp--custom--line-height--body: 1.7;
+	--wp--custom--font-primary: "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif";
+}
+```
+{% end %}
+
+A few notes about this process:
+
+- `camelCased` keys are transformed into its `kebab-case` form, as to follow the CSS property naming schema. Example: `lineHeight` is transformed into `line-height`.
+- Keys at different depth levels are separated by `--`. That's why `line-height` and `body` are separated by `--`.
+- You shouldn't use `--` in the names of the keys within the `custom` object. Example, **don't do** this:
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"custom": {
+			"line--height": { // DO NOT DO THIS
+				"body": 1.7
+			}
+		}
+	}
+}
+```
+
+### Global Stylesheet
+
+In WordPress 5.8, the CSS for some of the presets defined by WordPress (font sizes, colors, and gradients) was loaded twice for most themes: in the block-library stylesheet plus in the global stylesheet. Additionally, there were slight differences in the CSS in both places.
+
+In WordPress 5.9 release, CSS of presets are consolidated into the global stylesheet, that is now loaded for all themes. Each preset value generates a single CSS Custom Property and a class, as in:
+
+```css
+/* CSS Custom Properties for the preset values */
+body {
+  --wp--preset--<PRESET_TYPE>--<PRESET_SLUG>: <DEFAULT_VALUE>;
+  --wp--preset--color--pale-pink: #f78da7;
+  --wp--preset--font-size--large: 36px;
+  /* etc. */
+}
+
+/* CSS classes for the preset values */
+.has-<PRESET_SLUG>-<PRESET_TYPE> { ... }
+.has-pale-pink-color { color: var(--wp--preset--color--pale-pink) !important; }
+.has-large-font-size { font-size: var(--wp--preset--font-size--large) !important; }
+```
+
+For themes to override the default values they can use the `theme.json` and provide the same slug. Themes that do not use a `theme.json` can still override the default values by enqueuing some CSS that sets the corresponding CSS Custom Property.
+
+`Example` (sets a new value for the default large font size):
+
+```css
+body {
+ --wp--preset--font-size--large: <NEW_VALUE>;
+}
+```
+
+### Specificity for link colors provided by the user
+
+In WordPress 5.8, when a user selected a link color for a specific block we attached a class to that block in the form of `.wp-element-<ID>` and then enqueued the following style:
+
+```css
+.wp-element-<ID> a { color: <USER_COLOR_VALUE> !important; }
+```
+
+While this preserved user preferences at all times, the specificity was too strong and conflicted with some blocks with legit uses of an HTML element that shouldn’t be considered links. To [address this issue](https://github.com/WordPress/gutenberg/pull/34689), in WordPress 5.9 release, the `!important` was removed and updated the corresponding blocks to style the a elements with a specificity higher than the user link color, which now is:
+
+```css
+.wp-element-<ID> a { color: <USER_COLOR_VALUE>; }
+```
+
+As a result of this change, it’s now the block author and theme author’s responsibility to make sure the user choices are respected at all times and that the link color provided by the user (specificity 011) is not overridden.
+
+### What is blockGap and how can I use it?
+
+For blocks that contain inner blocks, such as Group, Columns, Buttons, and Social Icons, `blockGap` controls the spacing between inner blocks. For `blockGap` to work, the block must also opt in to the [`layout` block support](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/#layout), which provides layout styles that can be adjusted via the block spacing controls. Depending on the layout of the block, the `blockGap` value will be output as either a vertical margin or a `gap` value. In the editor, the control for the `blockGap` value is called _Block spacing_, located in the Dimensions panel.
+
+```json
+{
+	"version": 3,
+	"settings": {
+		"spacing": {
+			"blockGap": true,
+		}
+	},
+	"styles": {
+		"spacing": {
+			"blockGap": "1.5rem"
+		}
+	}
+}
+```
+
+The setting for `blockGap` is either a boolean or `null` value and is `null` by default. This allows an extra level of control over style output. The `settings.spacing.blockGap` setting in a `theme.json` file accepts the following values:
+
+- `true`: Opt into displaying _Block spacing_ controls in the editor UI and output `blockGap` styles.
+- `false`: Opt out of displaying _Block spacing_ controls in the editor UI, with `blockGap` styles stored in `theme.json` still being rendered. This allows themes to use `blockGap` values without allowing users to make changes within the editor.
+- `null` (default): Opt out of displaying _Block spacing_ controls, _and_ prevent the output of `blockGap` styles.
+
+The value defined for the root `styles.spacing.blockGap` style is also output as a CSS property, named `--wp--style--block-gap`.
+
+### Why does it take so long to update the styles in the browser?
+
+When you are actively developing with theme.json you may notice it takes 30+ seconds for your changes to show up in the browser, this is because `theme.json` is cached. To remove this caching issue, set either [`WP_DEBUG`](https://developer.wordpress.org/advanced-administration/debug/debug-wordpress/#wp_debug) or [`SCRIPT_DEBUG`](https://developer.wordpress.org/advanced-administration/debug/debug-wordpress/#script_debug) to 'true' in your [`wp-config.php`](https://developer.wordpress.org/advanced-administration/wordpress/wp-config/). This tells WordPress to skip the cache and always use fresh data.
diff --git a/docs/how-to-guides/themes/theme-json.md b/docs/how-to-guides/themes/theme-json.md
deleted file mode 100644
index 1f7480649f6ab1..00000000000000
--- a/docs/how-to-guides/themes/theme-json.md
+++ /dev/null
@@ -1,1354 +0,0 @@
-# Global Settings & Styles (theme.json)
-
-WordPress 5.8 comes with [a new mechanism](https://make.wordpress.org/core/2021/06/25/introducing-theme-json-in-wordpress-5-8/) to configure the editor that enables a finer-grained control and introduces the first step in managing styles for future WordPress releases: the `theme.json` file. Then `theme.json` [evolved to a v2](https://make.wordpress.org/core/2022/01/08/updates-for-settings-styles-and-theme-json/) with WordPress 5.9 release. This page documents its format.
-
-- Rationale
-    - Settings for the block editor
-    - Settings can be controlled per block
-    - Styles are managed
-    - CSS Custom Properties: presets & custom
-- Specification
-    - version
-    - settings
-        - Backward compatibility with add_theme_support
-        - Presets
-        - Custom
-        - Setting examples
-    - styles
-        - Top-level
-        - Block-level
-        - Elements
-        - Variations
-    - customTemplates
-    - templateParts
-    - patterns
-- FAQ
-    - The naming schema of CSS Custom Properties
-    - Why using -- as a separator?
-    - How settings under "custom" create new CSS Custom Properties
-    - Why does it take so long to update the styles in the browser?
-
-## Rationale
-
-The Block Editor API has evolved at different velocities and there are some growing pains, specially in areas that affect themes. Examples of this are: the ability to [control the editor programmatically](https://make.wordpress.org/core/2020/01/23/controlling-the-block-editor/), or [a block style system](https://github.com/WordPress/gutenberg/issues/9534) that facilitates user, theme, and core style preferences.
-
-This describes the current efforts to consolidate the various APIs related to styles into a single point – a `theme.json` file that should be located inside the root of the theme directory.
-
-### Settings for the block editor
-
-Instead of the proliferation of theme support flags or alternative methods, the `theme.json` files provides a canonical way to define the settings of the block editor. These settings includes things like:
-
--   What customization options should be made available or hidden from the user.
--   What are the default colors, font sizes... available to the user.
--   Defines the default layout of the editor (widths and available alignments).
-
-### Settings can be controlled per block
-
-For more granularity, these settings also work at the block level in `theme.json`.
-
-Examples of what can be achieved are:
-
--   Use a particular preset for a block (e.g.: table) but the common one for the rest of blocks.
--   Enable font size UI controls for all blocks but the headings block.
--   etc.
-
-### Styles are managed
-
-By using the `theme.json` file to set style properties in a structured way, the Block Editor can "manage" the CSS that comes from different origins (user, theme, and core CSS). For example, if a theme and a user set the font size for paragraphs, we only enqueue the style coming from the user and not the theme's.
-
-Some of the advantages are:
-
-- Reduce the amount of CSS enqueued.
-- Prevent specificity wars.
-
-### CSS Custom Properties: presets & custom
-
-There are some areas of styling that would benefit from having shared values that can change across a site.
-
-To address this need, we've started to experiment with CSS Custom Properties, aka CSS Variables, in some places:
-
-- **Presets**: [color palettes](/docs/how-to-guides/themes/theme-support.md#block-color-palettes), [font sizes](/docs/how-to-guides/themes/theme-support.md#block-font-sizes), or [gradients](/docs/how-to-guides/themes/theme-support.md#block-gradient-presets) declared by the theme are converted to CSS Custom Properties and enqueued both the front-end and the editors.
-
-{% codetabs %}
-{% Input %}
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"color": {
-			"palette": [
-				{
-					"name": "Black",
-					"slug": "black",
-					"color": "#000000"
-				},
-				{
-					"name": "White",
-					"slug": "white",
-					"color": "#ffffff"
-				}
-			]
-		}
-	}
-}
-```
-
-{% Output %}
-
-```css
-body {
-	--wp--preset--color--black: #000000;
-	--wp--preset--color--white: #ffffff;
-}
-```
-
-{% end %}
-
--   **Custom properties**: there's also a mechanism to create your own CSS Custom Properties.
-
-{% codetabs %}
-{% Input %}
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"custom": {
-			"line-height": {
-				"body": 1.7,
-				"heading": 1.3
-			}
-		}
-	}
-}
-```
-
-{% Output %}
-
-```css
-body {
-	--wp--custom--line-height--body: 1.7;
-	--wp--custom--line-height--heading: 1.3;
-}
-```
-
-{% end %}
-
-## Specification
-
-This specification is the same for the three different origins that use this format: core, themes, and users. Themes can override core's defaults by creating a file called `theme.json`. Users, via the site editor, will also be able to override theme's or core's preferences via an user interface that is being worked on.
-
-```json
-{
-	"version": 2,
-	"settings": {},
-	"styles": {},
-	"customTemplates": {},
-	"templateParts": {}
-}
-```
-
-### Version
-
-This field describes the format of the `theme.json` file. The current version is [v2](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-living/), [introduced in WordPress 5.9](https://make.wordpress.org/core/2022/01/08/updates-for-settings-styles-and-theme-json/). It also works with the current Gutenberg plugin.
-
-If you have used [v1](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-v1/) previously, you don’t need to update the version in the v1 file to v2, as it’ll be [migrated](https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-migrations/) into v2 at runtime for you.
-
-
-### Settings
-
-<div class="callout callout-alert">
-The Gutenberg plugin extends the settings available from WordPress 5.8, so they can be used with other WordPress versions and they go through a maturation process before being ported to core.
-
-The tabs below show WordPress 5.8 supported settings and the ones supported by the Gutenberg plugin.
-</div>
-
-The settings section has the following structure:
-
-{% codetabs %}
-{% WordPress %}
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"border": {
-			"radius": false,
-			"color": false,
-			"style": false,
-			"width": false
-		},
-		"color": {
-			"custom": true,
-			"customDuotone": true,
-			"customGradient": true,
-			"duotone": [],
-			"gradients": [],
-			"link": false,
-			"palette": [],
-			"text": true,
-			"background": true,
-			"defaultGradients": true,
-			"defaultPalette": true
-		},
-		"custom": {},
-		"layout": {
-			"contentSize": "800px",
-			"wideSize": "1000px"
-		},
-		"spacing": {
-			"margin": false,
-			"padding": false,
-			"blockGap": null,
-			"units": [ "px", "em", "rem", "vh", "vw" ]
-		},
-		"typography": {
-			"customFontSize": true,
-			"lineHeight": false,
-			"dropCap": true,
-			"fluid": false,
-			"fontStyle": true,
-			"fontWeight": true,
-			"letterSpacing": true,
-			"textDecoration": true,
-			"textTransform": true,
-			"fontSizes": [],
-			"fontFamilies": []
-		},
-		"blocks": {
-			"core/paragraph": {
-				"color": {},
-				"custom": {},
-				"layout": {},
-				"spacing": {},
-				"typography": {}
-			},
-			"core/heading": {},
-			"etc": {}
-		}
-	}
-}
-```
-
-{% Gutenberg %}
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"appearanceTools": false,
-		"border": {
-			"color": false,
-			"radius": false,
-			"style": false,
-			"width": false
-		},
-		"color": {
-			"background": true,
-			"custom": true,
-			"customDuotone": true,
-			"customGradient": true,
-			"defaultGradients": true,
-			"defaultPalette": true,
-			"duotone": [],
-			"gradients": [],
-			"link": false,
-			"palette": [],
-			"text": true
-		},
-		"custom": {},
-		"dimensions": {
-			"minHeight": false,
-		},
-		"layout": {
-			"contentSize": "800px",
-			"wideSize": "1000px"
-		},
-		"spacing": {
-			"blockGap": null,
-			"margin": false,
-			"padding": false,
-			"customSpacingSize": true,
-			"units": [ "px", "em", "rem", "vh", "vw" ],
-			"spacingScale": {
-				"operator": "*",
-				"increment": 1.5,
-				"steps": 7,
-				"mediumStep": 1.5,
-				"unit": "rem"
-			},
-			"spacingSizes": []
-		},
-		"typography": {
-			"customFontSize": true,
-			"dropCap": true,
-			"fluid": false,
-			"fontFamilies": [],
-			"fontSizes": [],
-			"fontStyle": true,
-			"fontWeight": true,
-			"letterSpacing": true,
-			"lineHeight": false,
-			"textColumns": false,
-			"textDecoration": true,
-			"textTransform": true
-		},
-		"blocks": {
-			"core/paragraph": {
-				"border": {},
-				"color": {},
-				"custom": {},
-				"layout": {},
-				"spacing": {},
-				"typography": {}
-			},
-			"core/heading": {},
-			"etc": {}
-		}
-	}
-}
-```
-{% end %}
-
-Each block can configure any of these settings separately, providing a more fine-grained control over what exists via `add_theme_support`. The settings declared at the top-level affect to all blocks, unless a particular block overwrites it. It's a way to provide inheritance and configure all blocks at once.
-
-Note, however, that not all settings are relevant for all blocks. The settings section provides an opt-in/opt-out mechanism for themes, but it's the block's responsibility to add support for the features that are relevant to it. For example, if a block doesn't implement the `dropCap` feature, a theme can't enable it for such a block through `theme.json`.
-
-### Opt-in into UI controls
-
-There's one special setting property, `appearanceTools`, which is a boolean and its default value is false. Themes can use this setting to enable the following ones:
-
-- background: backgroundImage
-- border: color, radius, style, width
-- color: link
-- dimensions: minHeight
-- position: sticky
-- spacing: blockGap, margin, padding
-- typography: lineHeight
-
-#### Backward compatibility with add_theme_support
-
-To retain backward compatibility, the existing `add_theme_support` declarations that configure the block editor are retrofit in the proper categories for the top-level section. For example, if a theme uses `add_theme_support('disable-custom-colors')`, it'll be the same as setting `settings.color.custom` to `false`. If the `theme.json` contains any settings, these will take precedence over the values declared via `add_theme_support`. This is the complete list of equivalences:
-
-| add_theme_support           | theme.json setting                                        |
-| --------------------------- | --------------------------------------------------------- |
-| `custom-line-height`        | Set `typography.lineHeight` to `true`.              |
-| `custom-spacing`            | Set `spacing.padding` to `true`.                    |
-| `custom-units`              | Provide the list of units via `spacing.units`.            |
-| `disable-custom-colors`     | Set `color.custom` to `false`.                            |
-| `disable-custom-font-sizes` | Set `typography.customFontSize` to `false`.               |
-| `disable-custom-gradients`  | Set `color.customGradient` to `false`.                    |
-| `editor-color-palette`      | Provide the list of colors via `color.palette`.           |
-| `editor-font-sizes`         | Provide the list of font size via `typography.fontSizes`. |
-| `editor-gradient-presets`   | Provide the list of gradients via `color.gradients`.      |
-| `appearance-tools`          | Set `appearanceTools` to `true`.                          |
-| `border`                    | Set `border: color, radius, style, width` to `true`.      |
-| `link-color `               | Set `color.link` to `true`.                               |
-
-#### Presets
-
-Presets are part of the settings section. They are values that are shown to the user via some UI controls. By defining them via `theme.json` the engine can do more for themes, such as automatically translate the preset name or enqueue the corresponding CSS classes and custom properties.
-
-The following presets can be defined via `theme.json`:
-
-- `color.duotone`: doesn't generate classes or custom properties.
-- `color.gradients`: generates a single class and custom property per preset value.
-- `color.palette`:
-    - generates 3 classes per preset value: color, background-color, and border-color.
-    - generates a single custom property per preset value.
-- `spacing.spacingScale`: used to generate an array of spacing preset sizes for use with padding, margin, and gap settings.
-    - `operator`: specifies how to calculate the steps with either `*` for multiplier, or `+` for sum.
-    - `increment`: the amount to increment each step by. Core by default uses a 'perfect 5th' multiplier of `1.5`.
-    - `steps`: the number of steps to generate in the spacing scale. The default is 7. To prevent the generation of the spacing presets, and to disable the related UI, this can be set to `0`.
-    - `mediumStep`: the steps in the scale are generated descending and ascending from a medium step, so this should be the size value of the medium space, without the unit. The default medium step is `1.5rem` so the mediumStep value is `1.5`.
-    - `unit`: the unit the scale uses, eg. `px, rem, em, %`. The default is `rem`.
-- `spacing.spacingSizes`: themes can choose to include a static `spacing.spacingSizes` array of spacing preset sizes if they have a sequence of sizes that can't be generated via an increment or multiplier.
-    - `name`: a human readable name for the size, eg. `Small, Medium, Large`.
-    - `slug`: the machine readable name. In order to provide the best cross site/theme compatibility the slugs should be in the format, "10","20","30","40","50","60", with "50" representing the `Medium` size value.
-    - `size`: the size, including the unit, eg. `1.5rem`. It is possible to include fluid values like `clamp(2rem, 10vw, 20rem)`.
-- `typography.fontSizes`: generates a single class and custom property per preset value.
-- `typography.fontFamilies`: generates a single custom property per preset value.
-
-The naming schema for the classes and the custom properties is as follows:
-
-- Custom Properties: `--wp--preset--{preset-category}--{preset-slug}` such as `--wp--preset--color--black`
-- Classes: `.has-{preset-slug}-{preset-category}` such as `.has-black-color`.
-
-
-{% codetabs %}
-{% Input %}
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"color": {
-			"duotone": [
-				{
-					"colors": [ "#000", "#FFF" ],
-					"slug": "black-and-white",
-					"name": "Black and White"
-				}
-			],
-			"gradients": [
-				{
-					"slug": "blush-bordeaux",
-					"gradient": "linear-gradient(135deg,rgb(254,205,165) 0%,rgb(254,45,45) 50%,rgb(107,0,62) 100%)",
-					"name": "Blush bordeaux"
-				},
-				{
-					"slug": "blush-light-purple",
-					"gradient": "linear-gradient(135deg,rgb(255,206,236) 0%,rgb(152,150,240) 100%)",
-					"name": "Blush light purple"
-				}
-			],
-			"palette": [
-				{
-					"slug": "strong-magenta",
-					"color": "#a156b4",
-					"name": "Strong magenta"
-				},
-				{
-					"slug": "very-dark-grey",
-					"color": "rgb(131, 12, 8)",
-					"name": "Very dark grey"
-				}
-			]
-		},
-		"typography": {
-			"fontFamilies": [
-				{
-					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell, \"Helvetica Neue\",sans-serif",
-					"slug": "system-font",
-					"name": "System Font"
-				},
-				{
-					"fontFamily": "Helvetica Neue, Helvetica, Arial, sans-serif",
-					"slug": "helvetica-arial",
-					"name": "Helvetica or Arial"
-				}
-			],
-			"fontSizes": [
-				{
-					"slug": "big",
-					"size": 32,
-					"name": "Big"
-				},
-				{
-					"slug": "x-large",
-					"size": 46,
-					"name": "Large"
-				}
-			]
-		},
-		"spacing": {
-			"spacingScale": {
-				"operator": "*",
-				"increment": 1.5,
-				"steps": 7,
-				"mediumStep": 1.5,
-				"unit": "rem"
-			},
-			"spacingSizes": [
-				{
-					"slug": "40",
-					"size": "1rem",
-					"name": "Small"
-				},
-				{
-					"slug": "50",
-					"size": "1.5rem",
-					"name": "Medium"
-				},
-				{
-					"slug": "60",
-					"size": "2rem",
-					"name": "Large"
-				}
-			]
-		},
-		"blocks": {
-			"core/group": {
-				"color": {
-					"palette": [
-						{
-							"slug": "black",
-							"color": "#000000",
-							"name": "Black"
-						},
-						{
-							"slug": "white",
-							"color": "#ffffff",
-							"name": "White"
-						}
-					]
-				}
-			}
-		}
-	}
-}
-```
-
-{% Output %}
-
-```css
-/* Top-level custom properties */
-body {
-	--wp--preset--color--strong-magenta: #a156b4;
-	--wp--preset--color--very-dark-grey: #444;
-	--wp--preset--gradient--blush-bordeaux: linear-gradient( 135deg, rgb( 254, 205, 165 ) 0%, rgb( 254, 45, 45 ) 50%, rgb( 107, 0, 62 ) 100% );
-	--wp--preset--gradient--blush-light-purple: linear-gradient( 135deg, rgb( 255, 206, 236 ) 0%, rgb( 152, 150, 240 ) 100% );
-	--wp--preset--font-size--x-large: 46;
-	--wp--preset--font-size--big: 32;
-	--wp--preset--font-family--helvetica-arial: Helvetica Neue, Helvetica, Arial, sans-serif;
-	--wp--preset--font-family--system: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell, \"Helvetica Neue\",sans-serif;
-	--wp--preset--spacing--20: 0.44rem;
-	--wp--preset--spacing--30: 0.67rem;
-	--wp--preset--spacing--40: 1rem;
-	--wp--preset--spacing--50: 1.5rem;
-	--wp--preset--spacing--60: 2.25rem;
-	--wp--preset--spacing--70: 3.38rem;
-	--wp--preset--spacing--80: 5.06rem;
-}
-
-/* Block-level custom properties (bounded to the group block) */
-.wp-block-group {
-	--wp--preset--color--black: #000000;
-	--wp--preset--color--white: #ffffff;
-}
-
-/* Top-level classes */
-.has-strong-magenta-color { color: #a156b4 !important; }
-.has-strong-magenta-background-color { background-color: #a156b4 !important; }
-.has-strong-magenta-border-color { border-color: #a156b4 !important; }
-.has-very-dark-grey-color { color: #444 !important; }
-.has-very-dark-grey-background-color { background-color: #444 !important; }
-.has-very-dark-grey-border-color { border-color: #444 !important; }
-.has-blush-bordeaux-background { background: linear-gradient( 135deg, rgb( 254, 205, 165 ) 0%, rgb( 254, 45, 45 ) 50%, rgb( 107, 0, 62 ) 100% ) !important; }
-.has-blush-light-purple-background { background: linear-gradient( 135deg, rgb( 255, 206, 236 ) 0%, rgb( 152, 150, 240 ) 100% ) !important; }
-.has-big-font-size { font-size: 32; }
-.has-normal-font-size { font-size: 16; }
-
-/* Block-level classes (bounded to the group block) */
-.wp-block-group.has-black-color { color: #a156b4 !important; }
-.wp-block-group.has-black-background-color { background-color: #a156b4 !important; }
-.wp-block-group.has-black-border-color { border-color: #a156b4 !important; }
-.wp-block-group.has-white-color { color: #444 !important; }
-.wp-block-group.has-white-background-color { background-color: #444 !important; }
-.wp-block-group.has-white-border-color { border-color: #444 !important; }
-
-```
-{% end %}
-
-To maintain backward compatibility, the presets declared via `add_theme_support` will also generate the CSS Custom Properties. If the `theme.json` contains any presets, these will take precedence over the ones declared via `add_theme_support`.
-
-Preset classes are attached to the content of a post by some user action. That's why the engine will add `!important` to these, because user styles should take precedence over theme styles.
-
-#### Custom
-
-In addition to create CSS Custom Properties for the presets, the `theme.json` also allows for themes to create their own, so they don't have to be enqueued separately. Any values declared within the `custom` field will be transformed to CSS Custom Properties following this naming schema: `--wp--custom--<variable-name>`.
-
-For example:
-
-{% codetabs %}
-{% Input %}
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"custom": {
-			"baseFont": 16,
-			"lineHeight": {
-				"small": 1.2,
-				"medium": 1.4,
-				"large": 1.8
-			}
-		},
-		"blocks": {
-			"core/group": {
-				"custom": {
-					"baseFont": 32
-				}
-			}
-		}
-	}
-}
-```
-
-{% Output %}
-
-```css
-body {
-	--wp--custom--base-font: 16;
-	--wp--custom--line-height--small: 1.2;
-	--wp--custom--line-height--medium: 1.4;
-	--wp--custom--line-height--large: 1.8;
-}
-.wp-block-group {
-	--wp--custom--base-font: 32;
-}
-```
-
-{% end %}
-
-Note that the name of the variable is created by adding `--` in between each nesting level and `camelCase` fields are transformed to `kebab-case`.
-
-#### Settings examples
-
-- Enable custom colors only for the paragraph block:
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"color": {
-			"custom": false
-		},
-		"blocks": {
-			"core/paragraph": {
-				"color": {
-					"custom": true
-				}
-			}
-		}
-	}
-}
-```
-
-- Disable border radius for the button block:
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"blocks": {
-			"core/button": {
-				"border": {
-					"radius": false
-				}
-			}
-		}
-	}
-}
-```
-
-- Provide the group block a different palette than the rest:
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"color": {
-			"palette": [
-				{
-					"slug": "black",
-					"color": "#000000",
-					"name": "Black"
-				},
-				{
-					"slug": "white",
-					"color": "#FFFFFF",
-					"name": "White"
-				},
-				{
-					"slug": "red",
-					"color": "#FF0000",
-					"name": "Red"
-				},
-				{
-					"slug": "green",
-					"color": "#00FF00",
-					"name": "Green"
-				},
-				{
-					"slug": "blue",
-					"color": "#0000FF",
-					"name": "Blue"
-				}
-			]
-		},
-		"blocks": {
-			"core/group": {
-				"color": {
-					"palette": [
-						{
-							"slug": "black",
-							"color": "#000000",
-							"name": "Black"
-						},
-						{
-							"slug": "white",
-							"color": "#FFF",
-							"name": "White"
-						}
-					]
-				}
-			}
-		}
-	}
-}
-```
-
-### Styles
-
-<div class="callout callout-alert">
-The Gutenberg plugin extends the styles available from WordPress 5.8, so they can be used with other WordPress versions and they go through a maturation process before being ported to core.
-
-The tabs below show WordPress 5.8 supported styles and the ones supported by the Gutenberg plugin.
-</div>
-
-Each block declares which style properties it exposes via the [block supports mechanism](/docs/reference-guides/block-api/block-supports.md). The support declarations are used to automatically generate the UI controls for the block in the editor. Themes can use any style property via the `theme.json` for any block ― it's the theme's responsibility to verify that it works properly according to the block markup, etc.
-
-{% codetabs %}
-{% WordPress %}
-
-```json
-{
-	"version": 2,
-	"styles": {
-		"border": {
-			"radius": "value",
-			"color": "value",
-			"style": "value",
-			"width": "value"
-		},
-		"filter": {
-			"duotone": "value"
-		},
-		"color": {
-			"background": "value",
-			"gradient": "value",
-			"text": "value"
-		},
-		"spacing": {
-			"blockGap": "value",
-			"margin": {
-				"top": "value",
-				"right": "value",
-				"bottom": "value",
-				"left": "value",
-			},
-			"padding": {
-				"top": "value",
-				"right": "value",
-				"bottom": "value",
-				"left": "value"
-			}
-		},
-		"typography": {
-			"fontSize": "value",
-			"fontStyle": "value",
-			"fontWeight": "value",
-			"letterSpacing": "value",
-			"lineHeight": "value",
-			"textDecoration": "value",
-			"textTransform": "value"
-		},
-		"elements": {
-			"link": {
-				"border": {},
-				"color": {},
-				"spacing": {},
-				"typography": {}
-			},
-			"h1": {},
-			"h2": {},
-			"h3": {},
-			"h4": {},
-			"h5": {},
-			"h6": {}
-		},
-		"blocks": {
-			"core/group": {
-				"border": {},
-				"color": {},
-				"spacing": {},
-				"typography": {},
-				"elements": {
-					"link": {},
-					"h1": {},
-					"h2": {},
-					"h3": {},
-					"h4": {},
-					"h5": {},
-					"h6": {}
-				}
-			},
-			"etc": {}
-		}
-	}
-}
-```
-{% Gutenberg %}
-
-```json
-{
-	"version": 2,
-	"styles": {
-		"border": {
-			"color": "value",
-			"radius": "value",
-			"style": "value",
-			"width": "value"
-		},
-		"color": {
-			"background": "value",
-			"gradient": "value",
-			"text": "value"
-		},
-		"dimensions": {
-			"minHeight": "value"
-		},
-		"filter": {
-			"duotone": "value"
-		},
-		"spacing": {
-			"blockGap": "value",
-			"margin": {
-				"top": "value",
-				"right": "value",
-				"bottom": "value",
-				"left": "value"
-			},
-			"padding": {
-				"top": "value",
-				"right": "value",
-				"bottom": "value",
-				"left": "value"
-			}
-		},
-		"typography": {
-			"fontFamily": "value",
-			"fontSize": "value",
-			"fontStyle": "value",
-			"fontWeight": "value",
-			"letterSpacing": "value",
-			"lineHeight": "value",
-			"textColumns": "value",
-			"textDecoration": "value",
-			"textTransform": "value"
-		},
-		"elements": {
-			"link": {
-				"border": {},
-				"color": {},
-				"spacing": {},
-				"typography": {}
-			},
-			"h1": {},
-			"h2": {},
-			"h3": {},
-			"h4": {},
-			"h5": {},
-			"h6": {},
-			"heading": {},
-			"button": {},
-			"caption": {}
-		},
-		"blocks": {
-			"core/group": {
-				"border": {},
-				"color": {},
-				"dimensions": {},
-				"spacing": {},
-				"typography": {},
-				"elements": {
-					"link": {},
-					"h1": {},
-					"h2": {},
-					"h3": {},
-					"h4": {},
-					"h5": {},
-					"h6": {}
-				}
-			},
-			"etc": {}
-		}
-	}
-}
-```
-{% end %}
-### Top-level styles
-
-Styles found at the top-level will be enqueued using the `body` selector.
-
-{% codetabs %}
-{% Input %}
-
-```json
-{
-	"version": 1,
-	"styles": {
-		"color": {
-			"text": "var(--wp--preset--color--primary)"
-		}
-	}
-}
-```
-
-{% Output %}
-
-```css
-body {
-	color: var( --wp--preset--color--primary );
-}
-```
-
-{% end %}
-### Block styles
-
-Styles found within a block will be enqueued using the block selector.
-
-By default, the block selector is generated based on its name such as `.wp-block-<blockname-without-namespace>`. For example, `.wp-block-group` for the `core/group` block. There are some blocks that want to opt-out from this default behavior. They can do so by explicitly telling the system which selector to use for them via the `__experimentalSelector` key within the `supports` section of its `block.json` file. Note that the block needs to be registered server-side for the `__experimentalSelector` field to be available to the style engine.
-
-{% codetabs %}
-{% Input %}
-
-```json
-{
-	"version": 1,
-	"styles": {
-		"color": {
-			"text": "var(--wp--preset--color--primary)"
-		},
-		"blocks": {
-			"core/paragraph": {
-				"color": {
-					"text": "var(--wp--preset--color--secondary)"
-				}
-			},
-			"core/group": {
-				"color": {
-					"text": "var(--wp--preset--color--tertiary)"
-				}
-			}
-		}
-	}
-}
-```
-
-{% Output %}
-
-```css
-body {
-	color: var( --wp--preset--color--primary );
-}
-p { /* The core/paragraph opts out from the default behaviour and uses p as a selector. */
-	color: var( --wp--preset--color--secondary );
-}
-.wp-block-group {
-	color: var( --wp--preset--color--tertiary );
-}
-```
-{% end %}
-
-#### Referencing a style
-
-A block can be styled using a reference to a root level style. This feature is supported by Gutenberg.
-If you register a background color for the root using styles.color.background:
-
-```JSON
-"styles": {
-		"color": {
-			"background": "var(--wp--preset--color--primary)"
-		}
-	}
-```
-
-You can use `ref: "styles.color.background"`  to re-use the style for a block:
-
-```JSON
-{
-	"color": {
-		"text": { "ref": "styles.color.background" }
-	}
-}
-```
-
-#### Element styles
-
-In addition to top-level and block-level styles, there's the concept of elements that can be used in both places. There's a closed set of them:
-
-Supported by Gutenberg:
-
-- `button`: maps to the `wp-element-button` CSS class. Also maps to `wp-block-button__link` for backwards compatibility.
-- `caption`: maps to the `.wp-element-caption, .wp-block-audio figcaption, .wp-block-embed figcaption, .wp-block-gallery figcaption, .wp-block-image figcaption, .wp-block-table figcaption, .wp-block-video figcaption` CSS classes.
-- `heading`: maps to all headings, the `h1 to h6` CSS selectors.
-
-Supported by WordPress:
-
-- `h1`: maps to the `h1` CSS selector.
-- `h2`: maps to the `h2` CSS selector.
-- `h3`: maps to the `h3` CSS selector.
-- `h4`: maps to the `h4` CSS selector.
-- `h5`: maps to the `h5` CSS selector.
-- `h6`: maps to the `h6` CSS selector.
-- `link`: maps to the `a` CSS selector.
-
-If they're found in the top-level the element selector will be used. If they're found within a block, the selector to be used will be the element's appended to the corresponding block.
-
-
-{% codetabs %}
-{% Input %}
-
-```json
-{
-	"version": 1,
-	"styles": {
-		"typography": {
-			"fontSize": "var(--wp--preset--font-size--normal)"
-		},
-		"elements": {
-			"h1": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--huge)"
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--big)"
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
-				}
-			}
-		},
-		"blocks": {
-			"core/group": {
-				"elements": {
-					"h2": {
-						"typography": {
-							"fontSize": "var(--wp--preset--font-size--small)"
-						}
-					},
-					"h3": {
-						"typography": {
-							"fontSize": "var(--wp--preset--font-size--smaller)"
-						}
-					}
-				}
-			}
-		}
-	}
-}
-```
-
-{% Output %}
-
-```css
-body {
-	font-size: var( --wp--preset--font-size--normal );
-}
-h1 {
-	font-size: var( --wp--preset--font-size--huge );
-}
-h2 {
-	font-size: var( --wp--preset--font-size--big );
-}
-h3 {
-	font-size: var( --wp--preset--font-size--medium );
-}
-.wp-block-group h2 {
-	font-size: var( --wp--preset--font-size--small );
-}
-.wp-block-group h3 {
-	font-size: var( --wp--preset--font-size--smaller );
-}
-```
-{% end %}
-##### Element pseudo selectors
-
-Pseudo selectors `:hover`, `:focus`, `:visited`, `:active`, `:link`, `:any-link` are supported by Gutenberg.
-
-```json
-"elements": {
-		"link": {
-			"color": {
-				"text": "green"
-			},
-			":hover": {
-				"color": {
-					"text": "hotpink"
-				}
-			}
-		}
-	}
-```
-
-#### Variations
-
-A block can have a "style variation", as defined per the [block.json specification](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#styles-optional). Theme authors can define the style attributes for an existing style variation using the theme.json file. Styles for unregistered style variations will be ignored.
-
-Note that variations are a "block concept", they only exist bound to blocks. The `theme.json` specification respects that distinction by only allowing `variations` at the block-level but not at the top-level. It's also worth highlighting that only variations defined in the `block.json` file of the block are considered "registered": so far, the style variations added via `register_block_style` or in the client are ignored, see [this issue](https://github.com/WordPress/gutenberg/issues/49602) for more information.
-
-For example, this is how to provide styles for the existing `plain` variation for the `core/quote` block:
-
-```json
-{
-	"version": 2,
-	"styles":{
-		"blocks": {
-			"core/quote": {
-				"variations": {
-					"plain": {
-						"color": {
-							"background": "red"
-						}
-					}
-				}
-			}
-		}
-	}
-}
-```
-
-The resulting CSS output is this:
-
-```css
-.wp-block-quote.is-style-plain {
-	background-color: red;
-}
-```
-
-### customTemplates
-
-<div class="callout callout-alert">Supported in WordPress from version 5.9.</div>
-
-Within this field themes can list the custom templates present in the `templates` folder. For example, for a custom template named `my-custom-template.html`, the `theme.json` can declare what post types can use it and what's the title to show the user:
-
-- name: mandatory.
-- title: mandatory, translatable.
-- postTypes: optional, only applies to the `page` by default.
-
-```json
-{
-    "version": 2,
-	"customTemplates": [
-		{
-			"name": "my-custom-template",
-			"title": "The template title",
-			"postTypes": [
-				"page",
-				"post",
-				"my-cpt"
-			]
-		}
-	]
-}
-```
-
-### templateParts
-
-<div class="callout callout-alert">Supported in WordPress from version 5.9.</div>
-
-Within this field themes can list the template parts present in the `parts` folder. For example, for a template part named `my-template-part.html`, the `theme.json` can declare the area term for the template part entity which is responsible for rendering the corresponding block variation (Header block, Footer block, etc.) in the editor. Defining this area term in the json will allow the setting to persist across all uses of that template part entity, as opposed to a block attribute that would only affect one block. Defining area as a block attribute is not recommended as this is only used 'behind the scenes' to aid in bridging the gap between placeholder flows and entity creation.
-
-Currently block variations exist for "header" and "footer" values of the area term, any other values and template parts not defined in the json will default to the general template part block. Variations will be denoted by specific icons within the editor's interface, will default to the corresponding semantic HTML element for the wrapper (this can also be overridden by the `tagName` attribute set on the template part block), and will contextualize the template part allowing more custom flows in future editor improvements.
-
-- name: mandatory.
-- title: optional, translatable.
-- area: optional, will be set to `uncategorized` by default and trigger no block variation.
-
-```json
-{
-    "version": 2,
-	"templateParts": [
-		{
-			"name": "my-template-part",
-			"title": "Header",
-			"area": "header"
-		}
-	]
-}
-```
-
-### patterns
-
-<div class="callout callout-alert">Supported in WordPress from version 6.0 using <a href="https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-living/">version 2</a> of <code>theme.json</code>.</div>
-
-Within this field themes can list patterns to register from [Pattern Directory](https://wordpress.org/patterns/). The `patterns` field is an array of pattern `slugs` from the Pattern Directory. Pattern slugs can be extracted by the `url` in single pattern view at the Pattern Directory. For example in this url `https://wordpress.org/patterns/pattern/partner-logos` the slug is `partner-logos`.
-
-```json
-{
-	"version": 2,
-	"patterns": [ "short-text-surrounded-by-round-images", "partner-logos" ]
-}
-```
-
-## Developing with theme.json
-
-It can be difficult to remember the theme.json settings and properties while you develop, so a JSON scheme was created to help. The schema is available at https://schemas.wp.org/trunk/theme.json
-
-Code editors can pick up the schema and can provide help like tooltips, autocomplete, or schema validation in the editor. To use the schema in Visual Studio Code, add `"$schema": "https://schemas.wp.org/trunk/theme.json"` to the beginning of your theme.json file.
-
-![Example using validation with schema](https://developer.wordpress.org/files/2021/11/theme-json-schema-updated.gif)
-
-
-## Frequently Asked Questions
-
-### The naming schema of CSS Custom Properties
-
-One thing you may have noticed is the naming schema used for the CSS Custom Properties the system creates, including the use of double hyphen, `--`, to separate the different "concepts". Take the following examples.
-
-**Presets** such as `--wp--preset--color--black` can be divided into the following chunks:
-
-- `--wp`: prefix to namespace the CSS variable.
-- `preset `: indicates is a CSS variable that belongs to the presets.
-- `color`: indicates which preset category the variable belongs to. It can be `color`, `font-size`, `gradients`.
-- `black`: the `slug` of the particular preset value.
-
-**Custom** properties such as `--wp--custom--line-height--body`, which can be divided into the following chunks:
-
-- `--wp`: prefix to namespace the CSS variable.
-- `custom`: indicates is a "free-form" CSS variable created by the theme.
-- `line-height--body`: the result of converting the "custom" object keys into a string.
-
-The `--` as a separator has two functions:
-
-- Readability, for human understanding. It can be thought as similar to the BEM naming schema, it separates "categories".
-- Parsability, for machine understanding. Using a defined structure allows machines to understand the meaning of the property `--wp--preset--color--black`: it's a value bounded to the color preset whose slug is "black", which then gives us room to do more things with them.
-
-### Why using `--` as a separator?
-
-We could have used any other separator, such as a single `-`.
-
-However, that'd have been problematic, as it'd have been impossible to tell how `--wp-custom-line-height-template-header` should be converted back into an object, unless we force theme authors not to use `-` in their variable names.
-
-By reserving `--` as a category separator and let theme authors use `-` for word-boundaries, the naming is clearer: `--wp--custom--line-height--template-header`.
-
-### How settings under "custom" create new CSS Custom Properties
-
-The algorithm to create CSS Variables out of the settings under the "custom" key works this way:
-
-This is for clarity, but also because we want a mechanism to parse back a variable name such `--wp--custom--line-height--body` to its object form in theme.json. We use the same separation for presets.
-
-For example:
-
-{% codetabs %}
-{% Input %}
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"custom": {
-			"lineHeight": {
-				"body": 1.7
-			},
-			"font-primary": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif"
-		}
-	}
-}
-```
-
-{% Output %}
-
-```css
-body {
-	--wp--custom--line-height--body: 1.7;
-	--wp--custom--font-primary: "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif";
-}
-```
-{% end %}
-
-A few notes about this process:
-
-- `camelCased` keys are transformed into its `kebab-case` form, as to follow the CSS property naming schema. Example: `lineHeight` is transformed into `line-height`.
-- Keys at different depth levels are separated by `--`. That's why `line-height` and `body` are separated by `--`.
-- You shouldn't use `--` in the names of the keys within the `custom` object. Example, **don't do** this:
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"custom": {
-			"line--height": { // DO NOT DO THIS
-				"body": 1.7
-			}
-		}
-	}
-}
-```
-
-### Global Stylesheet
-
-In WordPress 5.8, the CSS for some of the presets defined by WordPress (font sizes, colors, and gradients) was loaded twice for most themes: in the block-library stylesheet plus in the global stylesheet. Additionally, there were slight differences in the CSS in both places.
-
-In WordPress 5.9 release, CSS of presets are consolidated into the global stylesheet, that is now loaded for all themes. Each preset value generates a single CSS Custom Property and a class, as in:
-
-```css
-/* CSS Custom Properties for the preset values */
-body {
-  --wp--preset--<PRESET_TYPE>--<PRESET_SLUG>: <DEFAULT_VALUE>;
-  --wp--preset--color--pale-pink: #f78da7;
-  --wp--preset--font-size--large: 36px;
-  /* etc. */
-}
-
-/* CSS classes for the preset values */
-.has-<PRESET_SLUG>-<PRESET_TYPE> { ... }
-.has-pale-pink-color { color: var(--wp--preset--color--pale-pink) !important; }
-.has-large-font-size { font-size: var(--wp--preset--font-size--large) !important; }
-```
-
-For themes to override the default values they can use the `theme.json` and provide the same slug. Themes that do not use a `theme.json` can still override the default values by enqueuing some CSS that sets the corresponding CSS Custom Property.
-
-`Example` (sets a new value for the default large font size):
-
-```css
-body {
- --wp--preset--font-size--large: <NEW_VALUE>;
-}
-```
-
-### Specificity for link colors provided by the user
-
-In v1, when a user selected a link color for a specific block we attached a class to that block in the form of `.wp-element-<ID>` and then enqueued the following style:
-
-```css
-.wp-element-<ID> a { color: <USER_COLOR_VALUE> !important; }
-```
-
-While this preserved user preferences at all times, the specificity was too strong and conflicted with some blocks with legit uses of an HTML element that shouldn’t be considered links. To [address this issue](https://github.com/WordPress/gutenberg/pull/34689), in WordPress 5.9 release, the `!important` was removed and updated the corresponding blocks to style the a elements with a specificity higher than the user link color, which now is:
-
-```css
-.wp-element-<ID> a { color: <USER_COLOR_VALUE>; }
-```
-
-As a result of this change, it’s now the block author and theme author’s responsibility to make sure the user choices are respected at all times and that the link color provided by the user (specificity 011) is not overridden.
-
-### What is blockGap and how can I use it?
-
-For blocks that contain inner blocks, such as Group, Columns, Buttons, and Social Icons, `blockGap` controls the spacing between inner blocks. For `blockGap` to work, the block must also opt in to the [`layout` block support](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/#layout), which provides layout styles that can be adjusted via the block spacing controls. Depending on the layout of the block, the `blockGap` value will be output as either a vertical margin or a `gap` value. In the editor, the control for the `blockGap` value is called _Block spacing_, located in the Dimensions panel.
-
-```json
-{
-	"version": 2,
-	"settings": {
-		"spacing": {
-			"blockGap": true,
-		}
-	},
-	"styles": {
-		"spacing": {
-			"blockGap": "1.5rem"
-		}
-	}
-}
-```
-
-The setting for `blockGap` is either a boolean or `null` value and is `null` by default. This allows an extra level of control over style output. The `settings.spacing.blockGap` setting in a `theme.json` file accepts the following values:
-
-- `true`: Opt into displaying _Block spacing_ controls in the editor UI and output `blockGap` styles.
-- `false`: Opt out of displaying _Block spacing_ controls in the editor UI, with `blockGap` styles stored in `theme.json` still being rendered. This allows themes to use `blockGap` values without allowing users to make changes within the editor.
-- `null` (default): Opt out of displaying _Block spacing_ controls, _and_ prevent the output of `blockGap` styles.
-
-The value defined for the root `styles.spacing.blockGap` style is also output as a CSS property, named `--wp--style--block-gap`.
-
-### Why does it take so long to update the styles in the browser?
-
-When you are actively developing with theme.json you may notice it takes 30+ seconds for your changes to show up in the browser, this is because `theme.json` is cached. To remove this caching issue, set either [`WP_DEBUG`](https://wordpress.org/documentation/article/debugging-in-wordpress/#wp_debug) or [`SCRIPT_DEBUG`](https://wordpress.org/documentation/article/debugging-in-wordpress/#script_debug) to 'true' in your [`wp-config.php`](https://wordpress.org/documentation/article/editing-wp-config-php/). This tells WordPress to skip the cache and always use fresh data.
diff --git a/docs/how-to-guides/themes/theme-support.md b/docs/how-to-guides/themes/theme-support.md
index b978ede928b83d..e5d6c34e4081ce 100644
--- a/docs/how-to-guides/themes/theme-support.md
+++ b/docs/how-to-guides/themes/theme-support.md
@@ -52,7 +52,9 @@ add_action( 'after_setup_theme', 'mytheme_setup_theme_supported_features' );
 
 Core blocks include default structural styles. These are loaded in both the editor and the front end by default. An example of these styles is the CSS that powers the columns block. Without these rules, the block would result in a broken layout containing no columns at all.
 
-The block editor allows themes to opt-in to slightly more opinionated styles for the front end. An example of these styles is the default color bar to the left of blockquotes. If you'd like to use these opinionated styles in your theme, add theme support for `wp-block-styles`:
+### Opinionated block styles
+
+The block editor allows themes to opt in to slightly more opinionated styles for the front end. An example of these styles is the default color bar to the left of blockquotes. If you'd like to use these opinionated styles in a classic theme, add theme support for `wp-block-styles`:
 
 ```php
 add_theme_support( 'wp-block-styles' );
@@ -60,6 +62,8 @@ add_theme_support( 'wp-block-styles' );
 
 You can see the CSS that will be included in the [block library theme file](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/theme.scss).
 
+For block themes or themes providing a `theme.json` file, it is not recommended to use this theme support. Instead, to ensure there is no styling conflict between global styles rules and block styles, add the desired block styles to the theme's `theme.json` file.
+
 ### Wide Alignment:
 
 Some blocks such as the image block have the possibility to define a "wide" or "full" alignment by adding the corresponding classname to the block's wrapper ( `alignwide` or `alignfull` ). A theme can opt-in for this feature by calling:
@@ -315,7 +319,7 @@ Themes can opt out of generated block layout styles that provide default structu
 add_theme_support( 'disable-layout-styles' );
 ```
 
-For themes looking to customize `blockGap` styles or block spacing, see [the developer docs on Global Settings & Styles](/docs/how-to-guides/themes/theme-json/#what-is-blockgap-and-how-can-i-use-it).
+For themes looking to customize `blockGap` styles or block spacing, see [the developer docs on Global Settings & Styles](/docs/how-to-guides/themes/global-settings-and-styles.md#what-is-blockgap-and-how-can-i-use-it).
 
 ### Supporting custom line heights
 
@@ -434,11 +438,10 @@ add_theme_support( 'custom-spacing' );
 
 ## Link color control
 
-Link support has been made stable as part of WordPress 5.8. It's `false` by default and themes can enable it via the [theme.json file](./theme-json.md):
+Link support has been made stable as part of WordPress 5.8. It's `false` by default and themes can enable it via the [theme.json file](/docs/how-to-guides/curating-the-editor-experience/theme-json.md):
 
 ```json
 {
-	"version": 1,
 	"settings": {
 		"color": {
 			"link": true
@@ -472,7 +475,7 @@ Use this setting to enable the following Global Styles settings:
 - color: link
 - spacing: blockGap, margin, padding
 - typography: lineHeight
-- dimensions: minHeight
+- dimensions: aspectRatio, minHeight
 - position: sticky
 
 ```php
diff --git a/docs/manifest.json b/docs/manifest.json
index b8939951d71837..5e94c6b83b70d2 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -48,53 +48,11 @@
 		"parent": "getting-started"
 	},
 	{
-		"title": "Create a Block Tutorial",
-		"slug": "create-block",
-		"markdown_source": "../docs/getting-started/create-block/README.md",
+		"title": "Tutorial: Build your first block",
+		"slug": "tutorial",
+		"markdown_source": "../docs/getting-started/tutorial.md",
 		"parent": "getting-started"
 	},
-	{
-		"title": "WordPress Plugin",
-		"slug": "wp-plugin",
-		"markdown_source": "../docs/getting-started/create-block/wp-plugin.md",
-		"parent": "create-block"
-	},
-	{
-		"title": "Anatomy of a Block",
-		"slug": "block-anatomy",
-		"markdown_source": "../docs/getting-started/create-block/block-anatomy.md",
-		"parent": "create-block"
-	},
-	{
-		"title": "Block Attributes",
-		"slug": "attributes",
-		"markdown_source": "../docs/getting-started/create-block/attributes.md",
-		"parent": "create-block"
-	},
-	{
-		"title": "Code Implementation",
-		"slug": "block-code",
-		"markdown_source": "../docs/getting-started/create-block/block-code.md",
-		"parent": "create-block"
-	},
-	{
-		"title": "Authoring Experience",
-		"slug": "author-experience",
-		"markdown_source": "../docs/getting-started/create-block/author-experience.md",
-		"parent": "create-block"
-	},
-	{
-		"title": "Finishing Touches",
-		"slug": "finishing",
-		"markdown_source": "../docs/getting-started/create-block/finishing.md",
-		"parent": "create-block"
-	},
-	{
-		"title": "Share your Block with the World",
-		"slug": "submitting-to-block-directory",
-		"markdown_source": "../docs/getting-started/create-block/submitting-to-block-directory.md",
-		"parent": "create-block"
-	},
 	{
 		"title": "Fundamentals of Block Development",
 		"slug": "fundamentals",
@@ -126,7 +84,25 @@
 		"parent": "fundamentals"
 	},
 	{
-		"title": "Working with Javascript for the Block Editor",
+		"title": "The block in the Editor",
+		"slug": "block-in-the-editor",
+		"markdown_source": "../docs/getting-started/fundamentals/block-in-the-editor.md",
+		"parent": "fundamentals"
+	},
+	{
+		"title": "Markup representation of a block",
+		"slug": "markup-representation-block",
+		"markdown_source": "../docs/getting-started/fundamentals/markup-representation-block.md",
+		"parent": "fundamentals"
+	},
+	{
+		"title": "Static or Dynamic rendering of a block",
+		"slug": "static-dynamic-rendering",
+		"markdown_source": "../docs/getting-started/fundamentals/static-dynamic-rendering.md",
+		"parent": "fundamentals"
+	},
+	{
+		"title": "Working with JavaScript for the Block Editor",
 		"slug": "javascript-in-the-block-editor",
 		"markdown_source": "../docs/getting-started/fundamentals/javascript-in-the-block-editor.md",
 		"parent": "fundamentals"
@@ -161,54 +137,18 @@
 		"markdown_source": "../docs/how-to-guides/block-tutorial/README.md",
 		"parent": "how-to-guides"
 	},
-	{
-		"title": "Create a basic block",
-		"slug": "writing-your-first-block-type",
-		"markdown_source": "../docs/how-to-guides/block-tutorial/writing-your-first-block-type.md",
-		"parent": "block-tutorial"
-	},
 	{
 		"title": "Use styles and stylesheets",
 		"slug": "applying-styles-with-stylesheets",
 		"markdown_source": "../docs/how-to-guides/block-tutorial/applying-styles-with-stylesheets.md",
 		"parent": "block-tutorial"
 	},
-	{
-		"title": "Introducing Attributes and Editable Fields",
-		"slug": "introducing-attributes-and-editable-fields",
-		"markdown_source": "../docs/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields.md",
-		"parent": "block-tutorial"
-	},
-	{
-		"title": "Block Controls: Block Toolbar and Settings Sidebar",
-		"slug": "block-controls-toolbar-and-sidebar",
-		"markdown_source": "../docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md",
-		"parent": "block-tutorial"
-	},
-	{
-		"title": "Block Supports",
-		"slug": "block-supports-in-static-blocks",
-		"markdown_source": "../docs/how-to-guides/block-tutorial/block-supports-in-static-blocks.md",
-		"parent": "block-tutorial"
-	},
 	{
 		"title": "Creating dynamic blocks",
 		"slug": "creating-dynamic-blocks",
 		"markdown_source": "../docs/how-to-guides/block-tutorial/creating-dynamic-blocks.md",
 		"parent": "block-tutorial"
 	},
-	{
-		"title": "Block Supports in dynamic blocks",
-		"slug": "block-supports-in-dynamic-blocks",
-		"markdown_source": "../docs/how-to-guides/block-tutorial/block-supports-in-dynamic-blocks.md",
-		"parent": "block-tutorial"
-	},
-	{
-		"title": "Generate Blocks with WP-CLI",
-		"slug": "generate-blocks-with-wp-cli",
-		"markdown_source": "../docs/how-to-guides/block-tutorial/generate-blocks-with-wp-cli.md",
-		"parent": "block-tutorial"
-	},
 	{
 		"title": "Nested Blocks: Using InnerBlocks",
 		"slug": "nested-blocks-inner-blocks",
@@ -258,7 +198,7 @@
 		"parent": "data-basics"
 	},
 	{
-		"title": "Part 4: Building a Create page form",
+		"title": "Building a Create page form",
 		"slug": "4-building-a-create-page-form",
 		"markdown_source": "../docs/how-to-guides/data-basics/4-building-a-create-page-form.md",
 		"parent": "data-basics"
@@ -272,9 +212,39 @@
 	{
 		"title": "Curating the Editor Experience",
 		"slug": "curating-the-editor-experience",
-		"markdown_source": "../docs/how-to-guides/curating-the-editor-experience.md",
+		"markdown_source": "../docs/how-to-guides/curating-the-editor-experience/README.md",
 		"parent": "how-to-guides"
 	},
+	{
+		"title": "Block Locking API",
+		"slug": "block-locking",
+		"markdown_source": "../docs/how-to-guides/curating-the-editor-experience/block-locking.md",
+		"parent": "curating-the-editor-experience"
+	},
+	{
+		"title": "Patterns",
+		"slug": "patterns",
+		"markdown_source": "../docs/how-to-guides/curating-the-editor-experience/patterns.md",
+		"parent": "curating-the-editor-experience"
+	},
+	{
+		"title": "theme.json",
+		"slug": "theme-json",
+		"markdown_source": "../docs/how-to-guides/curating-the-editor-experience/theme-json.md",
+		"parent": "curating-the-editor-experience"
+	},
+	{
+		"title": "Filters and hooks",
+		"slug": "filters-and-hooks",
+		"markdown_source": "../docs/how-to-guides/curating-the-editor-experience/filters-and-hooks.md",
+		"parent": "curating-the-editor-experience"
+	},
+	{
+		"title": "Disable Editor functionality",
+		"slug": "disable-editor-functionality",
+		"markdown_source": "../docs/how-to-guides/curating-the-editor-experience/disable-editor-functionality.md",
+		"parent": "curating-the-editor-experience"
+	},
 	{
 		"title": "Enqueueing assets in the Editor",
 		"slug": "enqueueing-assets-in-the-editor",
@@ -293,60 +263,6 @@
 		"markdown_source": "../docs/how-to-guides/format-api.md",
 		"parent": "how-to-guides"
 	},
-	{
-		"title": "How to use JavaScript with the Block Editor",
-		"slug": "javascript",
-		"markdown_source": "../docs/how-to-guides/javascript/README.md",
-		"parent": "how-to-guides"
-	},
-	{
-		"title": "Plugins Background",
-		"slug": "plugins-background",
-		"markdown_source": "../docs/how-to-guides/javascript/plugins-background.md",
-		"parent": "javascript"
-	},
-	{
-		"title": "Loading JavaScript",
-		"slug": "loading-javascript",
-		"markdown_source": "../docs/how-to-guides/javascript/loading-javascript.md",
-		"parent": "javascript"
-	},
-	{
-		"title": "Extending the Block Editor",
-		"slug": "extending-the-block-editor",
-		"markdown_source": "../docs/how-to-guides/javascript/extending-the-block-editor.md",
-		"parent": "javascript"
-	},
-	{
-		"title": "Troubleshooting",
-		"slug": "troubleshooting",
-		"markdown_source": "../docs/how-to-guides/javascript/troubleshooting.md",
-		"parent": "javascript"
-	},
-	{
-		"title": "JavaScript Versions and Build Step",
-		"slug": "versions-and-building",
-		"markdown_source": "../docs/how-to-guides/javascript/versions-and-building.md",
-		"parent": "javascript"
-	},
-	{
-		"title": "Scope Your Code",
-		"slug": "scope-your-code",
-		"markdown_source": "../docs/how-to-guides/javascript/scope-your-code.md",
-		"parent": "javascript"
-	},
-	{
-		"title": "JavaScript Build Setup",
-		"slug": "js-build-setup",
-		"markdown_source": "../docs/how-to-guides/javascript/js-build-setup.md",
-		"parent": "javascript"
-	},
-	{
-		"title": "ESNext Syntax",
-		"slug": "esnext-js",
-		"markdown_source": "../docs/how-to-guides/javascript/esnext-js.md",
-		"parent": "javascript"
-	},
 	{
 		"title": "Internationalization",
 		"slug": "internationalization",
@@ -385,8 +301,8 @@
 	},
 	{
 		"title": "Global Settings & Styles (theme.json)",
-		"slug": "theme-json",
-		"markdown_source": "../docs/how-to-guides/themes/theme-json.md",
+		"slug": "global-settings-and-styles",
+		"markdown_source": "../docs/how-to-guides/themes/global-settings-and-styles.md",
 		"parent": "themes"
 	},
 	{
@@ -575,6 +491,66 @@
 		"markdown_source": "../docs/reference-guides/filters/global-styles-filters.md",
 		"parent": "filters"
 	},
+	{
+		"title": "Interactivity API Reference",
+		"slug": "interactivity-api",
+		"markdown_source": "../docs/reference-guides/interactivity-api/README.md",
+		"parent": "reference-guides"
+	},
+	{
+		"title": "Core Concepts",
+		"slug": "core-concepts",
+		"markdown_source": "../docs/reference-guides/interactivity-api/core-concepts/README.md",
+		"parent": "interactivity-api"
+	},
+	{
+		"title": "The Reactive and Declarative mindset",
+		"slug": "the-reactive-and-declarative-mindset",
+		"markdown_source": "../docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md",
+		"parent": "core-concepts"
+	},
+	{
+		"title": "Understanding global state, local context and derived state",
+		"slug": "undestanding-global-state-local-context-and-derived-state",
+		"markdown_source": "../docs/reference-guides/interactivity-api/core-concepts/undestanding-global-state-local-context-and-derived-state.md",
+		"parent": "core-concepts"
+	},
+	{
+		"title": "Server-side rendering: Processing directives on the server",
+		"slug": "server-side-rendering",
+		"markdown_source": "../docs/reference-guides/interactivity-api/core-concepts/server-side-rendering.md",
+		"parent": "core-concepts"
+	},
+	{
+		"title": "Using TypeScript",
+		"slug": "using-typescript",
+		"markdown_source": "../docs/reference-guides/interactivity-api/core-concepts/using-typescript.md",
+		"parent": "core-concepts"
+	},
+	{
+		"title": "Quick start guide",
+		"slug": "iapi-quick-start-guide",
+		"markdown_source": "../docs/reference-guides/interactivity-api/iapi-quick-start-guide.md",
+		"parent": "interactivity-api"
+	},
+	{
+		"title": "API Reference",
+		"slug": "api-reference",
+		"markdown_source": "../docs/reference-guides/interactivity-api/api-reference.md",
+		"parent": "interactivity-api"
+	},
+	{
+		"title": "About the Interactivity API",
+		"slug": "iapi-about",
+		"markdown_source": "../docs/reference-guides/interactivity-api/iapi-about.md",
+		"parent": "interactivity-api"
+	},
+	{
+		"title": "Frequently Asked Questions",
+		"slug": "iapi-faq",
+		"markdown_source": "../docs/reference-guides/interactivity-api/iapi-faq.md",
+		"parent": "interactivity-api"
+	},
 	{
 		"title": "SlotFills Reference",
 		"slug": "slotfills",
@@ -648,7 +624,7 @@
 		"parent": "reference-guides"
 	},
 	{
-		"title": "Theme.json Version 2",
+		"title": "Theme.json Version 3 Reference (latest)",
 		"slug": "theme-json-living",
 		"markdown_source": "../docs/reference-guides/theme-json-reference/theme-json-living.md",
 		"parent": "theme-json-reference"
@@ -660,7 +636,13 @@
 		"parent": "theme-json-reference"
 	},
 	{
-		"title": "Migrating to Newer Versions",
+		"title": "Theme.json Version 2 Reference",
+		"slug": "theme-json-v2",
+		"markdown_source": "../docs/reference-guides/theme-json-reference/theme-json-v2.md",
+		"parent": "theme-json-reference"
+	},
+	{
+		"title": "Migrating Theme.json to Newer Versions",
 		"slug": "theme-json-migrations",
 		"markdown_source": "../docs/reference-guides/theme-json-reference/theme-json-migrations.md",
 		"parent": "theme-json-reference"
@@ -816,15 +798,15 @@
 		"parent": "components"
 	},
 	{
-		"title": "ConfirmDialog",
-		"slug": "confirm-dialog",
-		"markdown_source": "../packages/components/src/confirm-dialog/README.md",
+		"title": "Composite",
+		"slug": "composite",
+		"markdown_source": "../packages/components/src/composite/README.md",
 		"parent": "components"
 	},
 	{
-		"title": "CustomSelectControlV2",
-		"slug": "custom-select-control-v2",
-		"markdown_source": "../packages/components/src/custom-select-control-v2/README.md",
+		"title": "ConfirmDialog",
+		"slug": "confirm-dialog",
+		"markdown_source": "../packages/components/src/confirm-dialog/README.md",
 		"parent": "components"
 	},
 	{
@@ -875,12 +857,6 @@
 		"markdown_source": "../packages/components/src/drop-zone/README.md",
 		"parent": "components"
 	},
-	{
-		"title": "DropdownMenuV2Ariakit",
-		"slug": "dropdown-menu-v2-ariakit",
-		"markdown_source": "../packages/components/src/dropdown-menu-v2-ariakit/README.md",
-		"parent": "components"
-	},
 	{
 		"title": "DropdownMenu",
 		"slug": "dropdown-menu",
@@ -1122,33 +1098,9 @@
 		"parent": "components"
 	},
 	{
-		"title": "NavigatorBackButton",
-		"slug": "navigator-back-button",
-		"markdown_source": "../packages/components/src/navigator/navigator-back-button/README.md",
-		"parent": "components"
-	},
-	{
-		"title": "NavigatorButton",
-		"slug": "navigator-button",
-		"markdown_source": "../packages/components/src/navigator/navigator-button/README.md",
-		"parent": "components"
-	},
-	{
-		"title": "NavigatorProvider",
-		"slug": "navigator-provider",
-		"markdown_source": "../packages/components/src/navigator/navigator-provider/README.md",
-		"parent": "components"
-	},
-	{
-		"title": "NavigatorScreen",
-		"slug": "navigator-screen",
-		"markdown_source": "../packages/components/src/navigator/navigator-screen/README.md",
-		"parent": "components"
-	},
-	{
-		"title": "NavigatorToParentButton",
-		"slug": "navigator-to-parent-button",
-		"markdown_source": "../packages/components/src/navigator/navigator-to-parent-button/README.md",
+		"title": "Navigator",
+		"slug": "navigator",
+		"markdown_source": "../packages/components/src/navigator/README.md",
 		"parent": "components"
 	},
 	{
@@ -1181,6 +1133,12 @@
 		"markdown_source": "../packages/components/src/popover/README.md",
 		"parent": "components"
 	},
+	{
+		"title": "ProgressBar",
+		"slug": "progress-bar",
+		"markdown_source": "../packages/components/src/progress-bar/README.md",
+		"parent": "components"
+	},
 	{
 		"title": "QueryControls",
 		"slug": "query-controls",
@@ -1289,12 +1247,6 @@
 		"markdown_source": "../packages/components/src/tab-panel/README.md",
 		"parent": "components"
 	},
-	{
-		"title": "Tabs",
-		"slug": "tabs",
-		"markdown_source": "../packages/components/src/tabs/README.md",
-		"parent": "components"
-	},
 	{
 		"title": "TextControl",
 		"slug": "text-control",
@@ -1727,6 +1679,12 @@
 		"markdown_source": "../packages/eslint-plugin/README.md",
 		"parent": "packages"
 	},
+	{
+		"title": "@wordpress/fields",
+		"slug": "packages-fields",
+		"markdown_source": "../packages/fields/README.md",
+		"parent": "packages"
+	},
 	{
 		"title": "@wordpress/format-library",
 		"slug": "packages-format-library",
@@ -1757,6 +1715,12 @@
 		"markdown_source": "../packages/icons/README.md",
 		"parent": "packages"
 	},
+	{
+		"title": "@wordpress/interactivity-router",
+		"slug": "packages-interactivity-router",
+		"markdown_source": "../packages/interactivity-router/README.md",
+		"parent": "packages"
+	},
 	{
 		"title": "@wordpress/interactivity",
 		"slug": "packages-interactivity",
@@ -2166,7 +2130,7 @@
 		"parent": "architecture"
 	},
 	{
-		"title": "Entities and Undo/Redo.",
+		"title": "Entities and Undo/Redo",
 		"slug": "entities",
 		"markdown_source": "../docs/explanations/architecture/entities.md",
 		"parent": "architecture"
@@ -2196,7 +2160,7 @@
 		"parent": "architecture"
 	},
 	{
-		"title": "Styles",
+		"title": "Styles in the Editor",
 		"slug": "styles",
 		"markdown_source": "../docs/explanations/architecture/styles.md",
 		"parent": "architecture"
diff --git a/docs/reference-guides/README.md b/docs/reference-guides/README.md
index b9725af66f0804..cc30aa87526058 100644
--- a/docs/reference-guides/README.md
+++ b/docs/reference-guides/README.md
@@ -39,7 +39,8 @@
 
 ## [Theme.json Reference](/docs/reference-guides/theme-json-reference/README.md)
 
--   [Version 2 (living reference)](/docs/reference-guides/theme-json-reference/theme-json-living.md)
+-   [Version 3 (latest)](/docs/reference-guides/theme-json-reference/theme-json-living.md)
+-   [Version 2](/docs/reference-guides/theme-json-reference/theme-json-v2.md)
 -   [Version 1](/docs/reference-guides/theme-json-reference/theme-json-v1.md)
 -   [Migrating to Newer Versions](/docs/reference-guides/theme-json-reference/theme-json-migrations.md)
 
diff --git a/docs/reference-guides/block-api/block-api-versions.md b/docs/reference-guides/block-api/block-api-versions.md
index b4b11e7c23c7cc..d89362777ca58c 100644
--- a/docs/reference-guides/block-api/block-api-versions.md
+++ b/docs/reference-guides/block-api/block-api-versions.md
@@ -3,7 +3,7 @@
 This document lists the changes made between the different API versions.
 
 ## Version 3 (>= WordPress 6.3)
-- The post editor will be iframed if all registered blocks have a Block API version 3 or higher and the editor has no classic meta boxes below the blocks. Adding version 3 support means that the block should work inside an iframe, though the block may still be rendered outside the iframe if not all blocks support version 3.
+- The post editor will be iframed if all registered blocks have a Block API version 3 or higher. Adding version 3 support means that the block should work inside an iframe, though the block may still be rendered outside the iframe if not all blocks support version 3.
 
 ## Version 2 (>= WordPress 5.6)
 
diff --git a/docs/reference-guides/block-api/block-attributes.md b/docs/reference-guides/block-api/block-attributes.md
index 35ec1c1e7c64e4..544f35593106f1 100644
--- a/docs/reference-guides/block-api/block-attributes.md
+++ b/docs/reference-guides/block-api/block-attributes.md
@@ -1,6 +1,6 @@
 # Attributes
 
-Block attributes provide information about the data stored by a block. For example, rich content, a list of image URLs, a background colour, or a button title.
+Block attributes provide information about the data stored by a block. For example, rich content, a list of image URLs, a background color, or a button title.
 
 A block can contain any number of attributes, and these are specified by the `attributes` field - an object where each key is the name of the attribute, and the value is the attribute definition.
 
@@ -66,9 +66,9 @@ The saved HTML will contain the `title` and `size` in the comment delimiter, and
 <!-- /block:your-block -->
 ```
 
-If an attributes change over time then a [block deprecation](/docs/reference-guides/block-api/block-deprecation.md) can help migrate from an older attribute, or remove it entirely.
+If an attribute changes over time then a [block deprecation](/docs/reference-guides/block-api/block-deprecation.md) can help migrate from an older attribute, or remove it entirely.
 
-## Type Validation
+## Type validation
 
 The `type` indicates the type of data that is stored by the attribute. It does not indicate where the data is stored, which is defined by the `source` field.
 
@@ -86,7 +86,7 @@ The `type` field MUST be one of the following:
 
 Note that the validity of an `object` is determined by your `source`. For an example, see the `query` details below.
 
-## Enum Validation
+## Enum validation
 
 An attribute can be defined as one of a fixed set of values. This is specified by an `enum`, which contains an array of allowed values:
 
@@ -100,7 +100,7 @@ _Example_: Example `enum`.
 }
 ```
 
-## Value Source
+## Value source
 
 Attribute sources are used to define how the attribute values are extracted from saved post content. They provide a mechanism to map from the saved markup to a JavaScript representation of a block.
 
@@ -375,9 +375,6 @@ Attribute definition:
 
 From here, meta attributes can be read and written by a block using the same interface as any attribute:
 
-
-{% JSX %}
-
 ```js
 edit( { attributes, setAttributes } ) {
 	function onChange( event ) {
@@ -430,7 +427,7 @@ function onChange( event ) {
 }
 ```
 
-## Default Value
+## Default value
 
 A block attribute can contain a default value, which will be used if the `type` and `source` do not match anything within the block content.
 
diff --git a/docs/reference-guides/block-api/block-context.md b/docs/reference-guides/block-api/block-context.md
index 3ab3175a0d1b23..09c33dfb71b7c3 100644
--- a/docs/reference-guides/block-api/block-context.md
+++ b/docs/reference-guides/block-api/block-context.md
@@ -4,15 +4,15 @@ Block context is a feature which enables ancestor blocks to provide values which
 
 This is especially useful in full-site editing where, for example, the contents of a block may depend on the context of the post in which it is displayed. A blogroll template may show excerpts of many different posts. Using block context, there can still be one single "Post Excerpt" block which displays the contents of the post based on an inherited post ID.
 
-If you are familiar with [React Context](https://reactjs.org/docs/context.html), block context adopts many of the same ideas. In fact, the client-side block editor implementation of block context is a very simple application of React Context. Block context is also supported in server-side `render_callback` implementations, demonstrated in the examples below.
+If you are familiar with [React Context](https://react.dev/learn/passing-data-deeply-with-context), block context adopts many of the same ideas. In fact, the client-side block editor implementation of block context is a very simple application of React Context. Block context is also supported in server-side `render_callback` implementations, demonstrated in the examples below.
 
-## Defining Block Context
+## Defining block context
 
 Block context is defined in the registered settings of a block. A block can provide a context value, or consume a value it seeks to inherit.
 
-### Providing Block Context
+### Providing block context
 
-A block can provide a context value by assigning a `providesContext` property in its registered settings. This is an object which maps a context name to one of the block's own attribute. The value corresponding to that attribute value is made available to descendent blocks and can be referenced by the same context name. Currently, block context only supports values derived from the block's own attributes. This could be enhanced in the future to support additional sources of context values.
+A block can provide a context value by assigning a `providesContext` property in its registered settings. This is an object which maps a context name to one of the block's own attributes. The value corresponding to that attribute value is made available to descendent blocks and can be referenced by the same context name. Currently, block context only supports values derived from the block's own attributes. This could be enhanced in the future to support additional sources of context values.
 
 ```js
 	attributes: {
@@ -26,13 +26,13 @@ A block can provide a context value by assigning a `providesContext` property in
 	},
 ```
 
-For complete example, refer to the section below.
+For a complete example, refer to the section below.
 
 #### Include a namespace
 
 As seen in the above example, it is recommended that you include a namespace as part of the name of the context key so as to avoid potential conflicts with other plugins or default context values provided by WordPress. The context namespace should be specific to your plugin, and in most cases can be the same as used in the name of the block itself.
 
-### Consuming Block Context
+### Consuming block context
 
 A block can inherit a context value from an ancestor provider by assigning a `usesContext` property in its registered settings. This should be assigned as an array of the context names the block seeks to inherit.
 
@@ -45,7 +45,7 @@ registerBlockType('my-plugin/record-title', {
 
 ```
 
-## Using Block Context
+## Using block context
 
 Once a block has defined the context it seeks to inherit, this can be accessed in the implementation of `edit` (JavaScript) and `render_callback` (PHP). It is provided as an object (JavaScript) or associative array (PHP) of the context values which have been defined for the block. Note that a context value will only be made available if the block explicitly defines a desire to inherit that value.
 
@@ -76,14 +76,14 @@ register_block_type( 'my-plugin/record-title', array(
 
 ## Example
 
-1. Create `record` block.
+1. Create a `record` block.
 
 ```
 npm init @wordpress/block --namespace my-plugin record
 cd record
 ```
 
-2. Edit `src/index.js`. Insert `recordId` attribute and `providesContext` property in `registerBlockType` function and add registration of `record-title` block at the bottom.
+2. Edit `src/index.js`. Insert the `recordId` attribute and `providesContext` property in the `registerBlockType` function and add the registration of the `record-title` block at the bottom:
 
 ```js
 registerBlockType( 'my-plugin/record', {
@@ -126,7 +126,7 @@ registerBlockType( 'my-plugin/record-title', {
 } );
 ```
 
-3. Edit `src/edit.js` for the `record` block. Replace `Edit` function by following code.
+3. Edit `src/edit.js` for the `record` block. Replace the `Edit` function with the following code:
 
 ```js
 import { TextControl } from '@wordpress/components';
@@ -141,7 +141,7 @@ export default function Edit( props ) {
 	return (
 		<div>
 			<TextControl
-				label={ __( 'Record ID:' ) }
+				label={ __( 'Record ID' ) }
 				value={ recordId }
 				onChange={ ( val ) =>
 					setAttributes( { recordId: Number( val ) } )
@@ -153,7 +153,7 @@ export default function Edit( props ) {
 }
 ```
 
-4. Edit `src/save.js` for the `record` block. Replace `save` function by following code.
+4. Edit `src/save.js` for the `record` block. Replace the `save` function with the following code:
 
 ```js
 export default function save( props ) {
@@ -161,6 +161,6 @@ export default function save( props ) {
 }
 ```
 
-5. Create new post and add the `record` block. If you type a number in the text box, you'll see the same number is shown in the `record-title` block below it.
+5. Create a new post and add the `record` block. If you type a number in the text box, you'll see the same number is shown in the `record-title` block below it.
 
 ![Block Context Example](https://user-images.githubusercontent.com/8876600/93000215-c8570380-f561-11ea-9bd0-0b2bd0ca1752.png)
diff --git a/docs/reference-guides/block-api/block-deprecation.md b/docs/reference-guides/block-api/block-deprecation.md
index 4d69d9d46843cd..0da85ee02d1ec0 100644
--- a/docs/reference-guides/block-api/block-deprecation.md
+++ b/docs/reference-guides/block-api/block-deprecation.md
@@ -23,7 +23,7 @@ It is also important to note that if a deprecation's `save` method imports addit
 
 For blocks with multiple deprecations, it may be easier to save each deprecation to a constant with the version of the block it applies to, and then add each of these to the block's `deprecated` array. The deprecations in the array should be in reverse chronological order. This allows the block editor to attempt to apply the most recent and likely deprecations first, avoiding unnecessary and expensive processing.
 
-### Example:
+**Example**
 
 ```js
 const v1 = {};
@@ -59,7 +59,7 @@ Deprecations are defined on a block type as its `deprecated` property, an array
 It's important to note that <code>attributes</code>, <code>supports</code>, and <code>save</code> are not automatically inherited from the current version, since they can impact parsing and serialization of a block, so they must be defined on the deprecated object in order to be processed during a migration.
 </div>
 
-### Example:
+**Example**
 
 ```js
 const { registerBlockType } = wp.blocks;
@@ -104,7 +104,7 @@ In the example above we updated the markup of the block to use a `div` instead o
 
 Sometimes, you need to update the attributes set to rename or modify old attributes.
 
-### Example:
+**Example**
 
 
 ```js
@@ -155,7 +155,7 @@ In the example above we updated the markup of the block to use a `div` instead o
 Situations may exist where when migrating the block we may need to add or remove innerBlocks.
 E.g: a block wants to migrate a title attribute to a paragraph innerBlock.
 
-### Example:
+**Example**
 
 ```js
 const { registerBlockType } = wp.blocks;
diff --git a/docs/reference-guides/block-api/block-edit-save.md b/docs/reference-guides/block-api/block-edit-save.md
index a8b6f9171bdef3..9e4dd3d1a916bd 100644
--- a/docs/reference-guides/block-api/block-edit-save.md
+++ b/docs/reference-guides/block-api/block-edit-save.md
@@ -24,7 +24,7 @@ const blockSettings = {
 };
 ```
 
-### block wrapper props
+### Block wrapper props
 
 The first thing to notice here is the use of the `useBlockProps` React hook on the block wrapper element. In the example above, the block wrapper renders a "div" in the editor, but in order for the Gutenberg editor to know how to manipulate the block, add any extra classNames that are needed for the block... the block wrapper element should apply props retrieved from the `useBlockProps` react hook call. The block wrapper element should be a native DOM element, like `<div>` and `<table>`, or a React component that forwards any additional props to native DOM elements. Using a `<Fragment>` or `<ServerSideRender>` component, for instance, would be invalid.
 
@@ -73,7 +73,7 @@ The value of `attributes.content` will be displayed inside the `div` when insert
 
 ### isSelected
 
-The isSelected property is an boolean that communicates whether the block is currently selected.
+The isSelected property is a boolean that communicates whether the block is currently selected.
 
 
 ```jsx
@@ -188,7 +188,7 @@ When saving your block, you want to save the attributes in the same format speci
 
 ## Examples
 
-Here are a couple examples of using attributes, edit, and save all together. For a full working example, see the [Introducing Attributes and Editable Fields](/docs/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields.md) section of the Block Tutorial.
+Here are a couple examples of using attributes, edit, and save all together.
 
 ### Saving Attributes to Child Elements
 
@@ -269,14 +269,14 @@ If a block is detected to be invalid, the user will be prompted to choose how to
 
 ![Invalid block prompt](https://user-images.githubusercontent.com/7753001/88754471-4cf7e900-d191-11ea-9123-3cee20719d10.png)
 
-Clicking **Attempt Block Recovery** button will attempt recovery action as much as possible.
+Clicking the **Attempt Block Recovery** button will attempt a recovery action as much as possible.
 
 Clicking the "3-dot" menu on the side of the block displays three options:
 
 -   **Resolve**: Open Resolve Block dialog box with two buttons:
-    -   **Convert to HTML**: Protects the original markup from the saved post content and convert the block from its original type to the HTML block type, enabling the user to modify the HTML markup directly.
-    -   **Convert to Blocks**: Protects the original markup from the saved post content and convert the block from its original type to the validated block type.
--   **Convert to HTML**: Protects the original markup from the saved post content and convert the block from its original type to the HTML block type, enabling the user to modify the HTML markup directly.
+    -   **Convert to HTML**: Protects the original markup from the saved post content and converts the block from its original type to the HTML block type, enabling the user to modify the HTML markup directly.
+    -   **Convert to Blocks**: Protects the original markup from the saved post content and converts the block from its original type to the validated block type.
+-   **Convert to HTML**: Protects the original markup from the saved post content and converts the block from its original type to the HTML block type, enabling the user to modify the HTML markup directly.
 -   **Convert to Classic Block**: Protects the original markup from the saved post content as correct. Since the block will be converted from its original type to the Classic block type, it will no longer be possible to edit the content using controls available for the original block type.
 
 ### Validation FAQ
diff --git a/docs/reference-guides/block-api/block-metadata.md b/docs/reference-guides/block-api/block-metadata.md
index edc61d138128e6..d79f1cdb6c56b1 100644
--- a/docs/reference-guides/block-api/block-metadata.md
+++ b/docs/reference-guides/block-api/block-metadata.md
@@ -1,6 +1,6 @@
 # Metadata in block.json
 
-Starting in WordPress 5.8 release, we recommend using the `block.json` metadata file as the canonical way to register block types with both PHP (server-side) and JavaScript (client-side). Here is an example `block.json` file that would define the metadata for a plugin create a notice block.
+Starting with the WordPress 5.8 release, we recommend using the `block.json` metadata file as the canonical way to register block types with both PHP (server-side) and JavaScript (client-side). Here is an example `block.json` file that would define the metadata for a plugin create a notice block.
 
 **Example:**
 
@@ -57,11 +57,12 @@ Starting in WordPress 5.8 release, we recommend using the `block.json` metadata
 	"viewScript": [ "file:./view.js", "example-shared-view-script" ],
 	"editorStyle": "file:./index.css",
 	"style": [ "file:./style.css", "example-shared-style" ],
+	"viewStyle": [ "file:./view.css", "example-view-style" ],
 	"render": "file:./render.php"
 }
 ```
 
-## Benefits using the metadata file
+## Benefits of using the metadata file
 
 The block definition allows code sharing between JavaScript, PHP, and other languages when processing block types stored as JSON, and registering blocks with the `block.json` metadata file provides multiple benefits on top of it.
 
@@ -69,7 +70,7 @@ From a performance perspective, when themes support lazy loading assets, blocks
 
 Furthermore, because the [Block Type REST API Endpoint](https://developer.wordpress.org/rest-api/reference/block-types/) can only list blocks registered on the server, registering blocks server-side is recommended; using the `block.json` file simplifies this registration.
 
-The [WordPress Plugins Directory](https://wordpress.org/plugins/) can detect `block.json` files, highlight blocks included in plugins, and extract their metadata. If you wish to [submit your block(s) to the Block Directory](/docs/getting-started/create-block/submitting-to-block-directory.md), all blocks contained in your plugin must have a `block.json` file for the Block Directory to recognize them.
+The [WordPress Plugins Directory](https://wordpress.org/plugins/) can detect `block.json` files, highlight blocks included in plugins, and extract their metadata. If you wish to submit your block(s) to the Block Directory all blocks contained in your plugin must have a `block.json` file for the Block Directory to recognize them.
 
 Development is improved by using a defined schema definition file. Supported editors can provide help like tooltips, autocomplete, and schema validation. To use the schema, add the following to the top of the `block.json`.
 
@@ -85,7 +86,7 @@ Check <a href="https://developer.wordpress.org/block-editor/getting-started/fund
 
 This section describes all the properties that can be added to the `block.json` file to define the behavior and metadata of block types.
 
-### API Version
+### API version
 
 -   Type: `number`
 -   Optional
@@ -99,7 +100,7 @@ This section describes all the properties that can be added to the `block.json`
 
 The version of the Block API used by the block. The most recent version is `3` and it was introduced in WordPress 6.3.
 
-See the [the API versions documentation](/docs/reference-guides/block-api/block-api-versions.md) for more details.
+See [the API versions documentation](/docs/reference-guides/block-api/block-api-versions.md) for more details.
 
 ### Name
 
@@ -186,6 +187,20 @@ Setting `parent` lets a block require that it is only available when nested with
 
 The `ancestor` property makes a block available inside the specified block types at any position of the ancestor block subtree. That allows, for example, to place a ‘Comment Content’ block inside a ‘Column’ block, as long as ‘Column’ is somewhere within a ‘Comment Template’ block. In comparison to the `parent` property blocks that specify their `ancestor` can be placed anywhere in the subtree whilst blocks with a specified `parent` need to be direct children.
 
+### Allowed Blocks
+
+-   Type: `string[]`
+-   Optional
+-   Localized: No
+-   Property: `allowedBlocks`
+-   Since: `WordPress 6.5.0`
+
+```json
+{ "allowedBlocks": [ "my-block/product" ] }
+```
+
+The `allowedBlocks` specifies which block types can be the direct children of the block. For example, a ‘List’ block can allow only ‘List Item’ blocks as children.
+
 ### Icon
 
 -   Type: `string`
@@ -197,9 +212,9 @@ The `ancestor` property makes a block available inside the specified block types
 { "icon": "smile" }
 ```
 
-An icon property should be specified to make it easier to identify a block. These can be any of WordPress' Dashicons (slug serving also as a fallback in non-js contexts).
+An icon property should be specified to make it easier to identify a block. These can be any of [WordPress' Dashicons](https://developer.wordpress.org/resource/dashicons/) (slug serving also as a fallback in non-js contexts).
 
-**Note:** It's also possible to override this property on the client-side with the source of the SVG element. In addition, this property can be defined with JavaScript as an object containing background and foreground colors. This colors will appear with the icon when they are applicable e.g.: in the inserter. Custom SVG icons are automatically wrapped in the [wp.primitives.SVG](/packages/primitives/README.md) component to add accessibility attributes (aria-hidden, role, and focusable).
+**Note:** It's also possible to override this property on the client-side with the source of the SVG element. In addition, this property can be defined with JavaScript as an object containing background and foreground colors. These colors will appear with the icon when they are applicable e.g.: in the inserter. Custom SVG icons are automatically wrapped in the [wp.primitives.SVG](/packages/primitives/README.md) component to add accessibility attributes (aria-hidden, role, and focusable).
 
 ### Description
 
@@ -286,7 +301,7 @@ The [gettext](https://www.gnu.org/software/gettext/) text domain of the plugin/b
 
 Attributes provide the structured data needs of a block. They can exist in different forms when they are serialized, but they are declared together under a common interface.
 
-See the [the attributes documentation](/docs/reference-guides/block-api/block-attributes.md) for more details.
+See [the attributes documentation](/docs/reference-guides/block-api/block-attributes.md) for more details.
 
 ### Provides Context
 
@@ -296,7 +311,7 @@ See the [the attributes documentation](/docs/reference-guides/block-api/block-at
 -   Property: `providesContext`
 -   Default: `{}`
 
-Context provided for available access by descendants of blocks of this type, in the form of an object which maps a context name to one of the block's own attribute.
+Context provided for available access by descendants of blocks of this type, in the form of an object which maps a context name to one of the block's own attributes.
 
 See [the block context documentation](/docs/reference-guides/block-api/block-context.md) for more details.
 
@@ -341,7 +356,7 @@ Providing custom selectors allows more fine grained control over which styles
 apply to what block elements, e.g. applying typography styles only to an inner
 heading while colors are still applied on the outer block wrapper etc.
 
-See the [the selectors documentation](/docs/reference-guides/block-api/block-selectors.md) for more details.
+See [the selectors documentation](/docs/reference-guides/block-api/block-selectors.md) for more details.
 
 ```json
 {
@@ -366,7 +381,7 @@ See the [the selectors documentation](/docs/reference-guides/block-api/block-sel
 -   Property: `supports`
 -   Default: `{}`
 
-It contains as set of options to control features used in the editor. See the [the supports documentation](/docs/reference-guides/block-api/block-supports.md) for more details.
+It contains a set of options to control features used in the editor. See [the supports documentation](/docs/reference-guides/block-api/block-supports.md) for more details.
 
 ### Block Styles
 
@@ -387,7 +402,7 @@ It contains as set of options to control features used in the editor. See the [t
 
 Block styles can be used to provide alternative styles to block. It works by adding a class name to the block's wrapper. Using CSS, a theme developer can target the class name for the block style if it is selected.
 
-Plugins and Themes can also register [custom block style](/docs/reference-guides/block-api/block-styles.md) for existing blocks.
+Plugins and Themes can also register [custom block styles](/docs/reference-guides/block-api/block-styles.md) for existing blocks.
 
 ### Example
 
@@ -412,7 +427,7 @@ See the [Example documentation](/docs/reference-guides/block-api/block-registrat
 
 ### Variations
 
--   Type: `object[]`
+-   Type: `object[]|WPDefinedPath` ([learn more](#wpdefinedpath))
 -   Optional
 -   Localized: Yes (`title`, `description`, and `keywords` of each variation only)
 -   Property: `variations`
@@ -439,7 +454,49 @@ Block Variations is the API that allows a block to have similar versions of it,
 
 _Note: In JavaScript you can provide a function for the `isActive` property, and a React element for the `icon`. In the `block.json` file both only support strings_
 
-See the [the variations documentation](/docs/reference-guides/block-api/block-variations.md) for more details.
+Starting with version 6.7, it is possible to specify a PHP file in `block.json` that generates the list of block variations on the server side:
+
+```json
+{ "variations": "file:./variations.php" }
+```
+
+That PHP file is expected to `return` an array that contains the block variations. Strings found in the variations returned from the PHP file will not be localized automatically; instead, use the `__()` function as usual.
+
+For example:
+
+```php
+<?php
+// Generate variations for a Social Icon kind of block.
+
+return array(
+	array(
+		'isDefault'  => true,
+		'name'       => 'wordpress',
+		'title'      => 'WordPress',
+		'icon'       => 'wordpress',
+		'attributes' => array(
+			'service' => 'wordpress',
+		),
+		'isActive'   => array( 'service' )
+	),
+	array(
+		'name'       => 'mail',
+		'title'      => __( 'Mail' ),
+		'keywords'   => array(
+			__( 'email' ),
+			__( 'e-mail' )
+		),
+		'icon'       => 'mail',
+		'attributes' => array(
+			'service' => 'mail',
+		),
+		'isActive'   => array( 'mail' )
+	),
+);
+
+```
+
+See [the variations documentation](/docs/reference-guides/block-api/block-variations.md) for more details.
 
 ### Block Hooks
 
@@ -460,7 +517,7 @@ Block Hooks is an API that allows a block to automatically insert itself next to
 
 The key is the name of the block (`string`) to hook into, and the value is the position to hook into (`string`). Take a look at the [Block Hooks documentation](/docs/reference-guides/block-api/block-registration.md#block-hooks-optional) for more info about available configurations.
 
-### Editor Script
+### Editor script
 
 -   Type: `WPDefinedAsset`|`WPDefinedAsset[]` ([learn more](#wpdefinedasset))
 -   Optional
@@ -494,7 +551,7 @@ It's possible to pass a script handle registered with the [`wp_register_script`]
 
 _Note: An option to pass also an array of scripts exists since WordPress `6.1.0`._
 
-### View Script
+### View script
 
 -   Type: `WPDefinedAsset`|`WPDefinedAsset[]` ([learn more](#wpdefinedasset))
 -   Optional
@@ -512,7 +569,27 @@ It's possible to pass a script handle registered with the [`wp_register_script`]
 
 _Note: An option to pass also an array of view scripts exists since WordPress `6.1.0`._
 
-### Editor Style
+### View script module
+
+-   Type: `WPDefinedAsset`|`WPDefinedAsset[]` ([learn more](#wpdefinedasset))
+-   Optional
+-   Localized: No
+-   Property: `viewScriptModule`
+-   Since: `WordPress 6.5.0`
+
+```json
+{ "viewScriptModule": [ "file:./view.js", "example-shared-script-module-id" ] }
+```
+
+Block type frontend script module definition. They will be enqueued only when viewing the content on the front of the site.
+
+It's possible to pass a script module ID registered with the [`wp_register_script_module`](https://developer.wordpress.org/reference/functions/wp_register_script_module/) function, a path to a JavaScript module relative to the `block.json` file, or a list with a mix of both ([learn more](#wpdefinedasset)).
+
+WordPress scripts and WordPress script modules are not compatible at the moment. If frontend view assets depend on WordPress scripts, `viewScript` should be used. If they depend on WordPress script modules —the Interactivity API at this time— `viewScriptModule` should be used. [More functionality](https://core.trac.wordpress.org/ticket/60647) will gradually become available to Script Modules.
+
+_Note: Available since WordPress `6.5.0`._
+
+### Editor style
 
 -   Type: `WPDefinedAsset`|`WPDefinedAsset[]` ([learn more](#wpdefinedasset))
 -   Optional
@@ -546,6 +623,24 @@ It's possible to pass a style handle registered with the [`wp_register_style`](h
 
 _Note: An option to pass also an array of styles exists since WordPress `5.9.0`._
 
+### View Style
+
+-   Type: `WPDefinedAsset`|`WPDefinedAsset[]` ([learn more](#wpdefinedasset))
+-   Optional
+-   Localized: No
+-   Property: `viewStyle`
+-   Since: `WordPress 6.5.0`
+
+```json
+{ "viewStyle": [ "file:./view.css", "example-view-style" ] }
+```
+
+Block type frontend styles definition. They will be enqueued only when viewing the content on the front of the site.
+
+It's possible to pass a style handle registered with the [`wp_register_style`](https://developer.wordpress.org/reference/functions/wp_register_style/) function, a path to a CSS file relative to the `block.json` file, or a list with a mix of both ([learn more](#wpdefinedasset)).
+
+Frontend-only styles are especially useful for interactive blocks, to style parts that will only be visible after a user performs some action and where those styles will never be needed in the editor. You can start with using the `style` property to put all your common styles in one stylesheet. Only when you need editor-specific styling or frontend-specific styling, you can expand to `editorStyle` and `viewStyle`, but still keep the common part of your styling in the main stylesheet.
+
 ### Render
 
 -   Type: `WPDefinedPath` ([learn more](#wpdefinedpath))
@@ -578,7 +673,7 @@ _Note: This file loads for every instance of the block type when rendering the p
 
 ### `WPDefinedPath`
 
-The `WPDefinedPath` type is a subtype of string, where the value represents a path to a JavaScript, CSS or PHP file relative to where `block.json` file is located. The path provided must be prefixed with `file:`. This approach is based on how npm handles [local paths](https://docs.npmjs.com/files/package.json#local-paths) for packages.
+The `WPDefinedPath` type is a subtype of string, where the value represents a path to a JavaScript, CSS or PHP file relative to where the `block.json` file is located. The path provided must be prefixed with `file:`. This approach is based on how npm handles [local paths](https://docs.npmjs.com/files/package.json#local-paths) for packages.
 
 **Example:**
 
@@ -592,7 +687,7 @@ In `block.json`:
 
 ### `WPDefinedAsset`
 
-It extends `WPDefinedPath` for JavaScript and CSS files. An alternative to the file path would be a script or style handle name referencing an already registered asset using WordPress helpers.
+It extends `WPDefinedPath` for JavaScript and CSS files. An alternative to the file path would be a script handle, script module ID, or style handle referencing an already registered asset using WordPress helpers.
 
 **Example:**
 
@@ -602,23 +697,27 @@ In `block.json`:
 {
 	"editorScript": "file:./index.js",
 	"script": "file:./script.js",
-	"viewScript": [ "file:./view.js", "example-shared-view-script" ],
+	"viewScriptModule": [
+		"file:./view.js",
+		"example-registered-script-module-id"
+	],
 	"editorStyle": "file:./index.css",
-	"style": [ "file:./style.css", "example-shared-style" ]
+	"style": [ "file:./style.css", "example-shared-style" ],
+	"viewStyle": [ "file:./view.css", "example-view-style" ]
 }
 ```
 
-In the context of WordPress, when a block is registered with PHP, it will automatically register all scripts and styles that are found in the `block.json` file and use file paths rather than asset handles.
+In the context of WordPress, when a block is registered with PHP, it will automatically register all scripts, script modules, and styles that are found in the `block.json` file and use file paths rather than asset handles.
 
-That's why, the `WPDefinedAsset` type has to offer a way to mirror also the shape of params necessary to register scripts and styles using [`wp_register_script`](https://developer.wordpress.org/reference/functions/wp_register_script/) and [`wp_register_style`](https://developer.wordpress.org/reference/functions/wp_register_style/), and then assign these as handles associated with your block using the `script`, `style`, `editor_script`, and `editor_style` block type registration settings.
+That's why the `WPDefinedAsset` type has to offer a way to mirror the parameters necessary to register scripts, script modules, and styles using [`wp_register_script`](https://developer.wordpress.org/reference/functions/wp_register_script/), [`wp_register_script_module`](https://developer.wordpress.org/reference/functions/wp_register_script_module/), and [`wp_register_style`](https://developer.wordpress.org/reference/functions/wp_register_style/), and then assign these as handles or script module IDs associated with the block.
 
 It's possible to provide an object which takes the following shape:
 
 -   `handle` (`string`) - the name of the script. If omitted, it will be auto-generated.
--   `dependencies` (`string[]`) - an array of registered script handles this script depends on. Default value: `[]`.
--   `version` (`string`|`false`|`null`) - string specifying the script version number, if it has one, which is added to the URL as a query string for cache busting purposes. If the version is set to `false`, a version number is automatically added equal to current installed WordPress version. If set to `null`, no version is added. Default value: `false`.
+-   `dependencies` (`string[]`|`{ id: string, import?: 'dynamic'|'static' }[]`) - an array of registered script handles this script depends on. Script modules may use a simple string for static dependencies or the object form to indicate a dynamic dependency. Dynamic dependencies are dependencies that may or may not be used at runtime and are typically used with the dynamic `import('module-id')` syntax. Default value: `[]`.
+-   `version` (`string`|`false`|`null`) - string specifying the script version number, if it has one, which is added to the URL as a query string for cache busting purposes. If the version is set to `false`, a version number is automatically added equal to the currently installed WordPress version. If set to `null`, no version is added. Default value: `false`.
 
-The definition is stored inside separate PHP file which ends with `.asset.php` and is located next to the JS/CSS file listed in `block.json`. WordPress will automatically detect this file through pattern matching. This option is the preferred one as it is expected it will become an option to auto-generate those asset files with `@wordpress/scripts` package.
+The definition is stored inside a separate PHP file which ends with `.asset.php` and is located next to the JS/CSS file listed in `block.json`. WordPress will automatically detect this file through pattern matching. This option is the preferred one as it is expected it will become an option to auto-generate those asset files with `@wordpress/scripts` package.
 
 **Example:**
 
@@ -649,13 +748,14 @@ return array(
 );
 ```
 
-### Frontend Enqueueing
+### Frontend enqueueing
 
 Starting in the WordPress 5.8 release, it is possible to instruct WordPress to enqueue scripts and styles for a block type only when rendered on the frontend. It applies to the following asset fields in the `block.json` file:
 
 -   `script`
 -   `viewScript`
 -   `style`
+-   `viewStyle` (Added in WordPress 6.5.0)
 
 ## Internationalization
 
@@ -687,7 +787,7 @@ $metadata = array(
 );
 ```
 
-Implementation follows the existing [get_plugin_data](https://codex.wordpress.org/Function_Reference/get_plugin_data) function which parses the plugin contents to retrieve the plugin’s metadata, and it applies translations dynamically.
+Implementation follows the existing [get_plugin_data](https://developer.wordpress.org/reference/functions/get_plugin_data) function which parses the plugin contents to retrieve the plugin’s metadata, and it applies translations dynamically.
 
 ### JavaScript
 
@@ -706,7 +806,7 @@ registerBlockType( metadata, {
 } );
 ```
 
-## Backward Compatibility
+## Backward compatibility
 
 The existing registration mechanism (both server side and frontend) will continue to work, it will serve as low-level implementation detail for the `block.json` based registration.
 
@@ -739,4 +839,4 @@ registerBlockType( 'my-plugin/block-name', {
 } );
 ```
 
-In the case of [dynamic blocks](/docs/how-to-guides/block-tutorial/creating-dynamic-blocks.md) supported by WordPress, it should be still possible to register `render_callback` property using both [`register_block_type`](https://developer.wordpress.org/reference/functions/register_block_type/) function on the server.
+In the case of [dynamic blocks](/docs/how-to-guides/block-tutorial/creating-dynamic-blocks.md) supported by WordPress, it should still be possible to register the `render_callback` property using both [`register_block_type`](https://developer.wordpress.org/reference/functions/register_block_type/) functions on the server.
diff --git a/docs/reference-guides/block-api/block-patterns.md b/docs/reference-guides/block-api/block-patterns.md
index a1da09d63a6c99..b0096e24791de8 100644
--- a/docs/reference-guides/block-api/block-patterns.md
+++ b/docs/reference-guides/block-api/block-patterns.md
@@ -1,20 +1,8 @@
 # Patterns
 
-Block Patterns are predefined block layouts, available from the patterns tab of the block inserter. Once inserted into content, the blocks are ready for additional or modified content and configuration.
-
-In this Document:
-- [Patterns](#patterns)
-	- [Block Patterns](#block-patterns)
-		- [register_block_pattern](#register_block_pattern)
-	- [Unregistering Block Patterns](#unregistering-block-patterns)
-		- [unregister_block_pattern](#unregister_block_pattern)
-	- [Block Pattern Categories](#block-pattern-categories)
-		- [register_block_pattern_category](#register_block_pattern_category)
-		- [unregister_block_pattern_category](#unregister_block_pattern_category)
-	- [Block patterns contextual to block types and pattern transformations](#block-patterns-contextual-to-block-types-and-pattern-transformations)
-	- [Semantic block patterns](#semantic-block-patterns)
-
-## Block Patterns
+Block Patterns are predefined block layouts available from the patterns tab of the block inserter. Once inserted into content, the blocks are ready for additional or modified content and configuration.
+
+## Block patterns
 
 ### register_block_pattern
 
@@ -33,12 +21,12 @@ The properties available for block patterns are:
 -   `keywords` (optional): An array of aliases or keywords that help users discover the pattern while searching.
 -   `viewportWidth` (optional): An integer specifying the intended width of the pattern to allow for a scaled preview of the pattern in the inserter.
 -   `blockTypes` (optional): An array of block types that the pattern is intended to be used with. Each value needs to be the declared block's `name`.
--   `postTypes` (optional): An array of post types that the pattern is restricted to be used with. The pattern will only be available when editing one of the post types passed on the array, for all the other post types the pattern is not available at all.
--   `templateTypes` (optional): An array of template types where the pattern makes sense e.g: '404' if the pattern is for a 404 page, single-post if the pattern is for showing a single post.
+-   `postTypes` (optional): An array of post types that the pattern is restricted to be used with. The pattern will only be available when editing one of the post types passed on the array. For all the other post types, the pattern is not available at all.
+-   `templateTypes` (optional): An array of template types where the pattern makes sense, for example, `404` if the pattern is for a 404 page, `single-post` if the pattern is for showing a single post.
 -   `inserter` (optional): By default, all patterns will appear in the inserter. To hide a pattern so that it can only be inserted programmatically, set the `inserter` to `false`.
--   `source` (optional): A string that denotes the source of the pattern. For a plugin registering a pattern, pass the string 'plugin'. For a theme, pass the string 'theme'.
+-   `source` (optional): A string that denotes the source of the pattern. For a plugin registering a pattern, pass the string `plugin`. For a theme, pass the string `theme`.
 
-The following code sample registers a block pattern named 'my-plugin/my-awesome-pattern':
+The following code sample registers a block pattern named `my-plugin/my-awesome-pattern`:
 
 ```php
 register_block_pattern(
@@ -51,9 +39,7 @@ register_block_pattern(
 );
 ```
 
-_Note:_
-
-`register_block_pattern()` should be called from a handler attached to the init hook.
+Note that `register_block_pattern()` should be called from a handler attached to the `init` hook.
 
 ```php
 function my_plugin_register_my_patterns() {
@@ -63,14 +49,15 @@ function my_plugin_register_my_patterns() {
 add_action( 'init', 'my_plugin_register_my_patterns' );
 ```
 
-## Unregistering Block Patterns
+## Unregistering block patterns
 
 ### unregister_block_pattern
 
-The `unregister_block_pattern` helper function allows for a previously registered block pattern to be unregistered from a theme or plugin and receives one argument.
+The `unregister_block_pattern` helper function allows a previously registered block pattern to be unregistered from a theme or plugin and receives one argument.
+
 -   `title`: The name of the block pattern to be unregistered.
 
-The following code sample unregisters the block pattern named 'my-plugin/my-awesome-pattern':
+The following code sample unregisters the block pattern named `my-plugin/my-awesome-pattern`:
 
 ```php
 unregister_block_pattern( 'my-plugin/my-awesome-pattern' );
@@ -88,13 +75,14 @@ function my_plugin_unregister_my_patterns() {
 add_action( 'init', 'my_plugin_unregister_my_patterns' );
 ```
 
-## Block Pattern Categories
+## Block pattern categories
 
 Block patterns can be grouped using categories. The block editor comes with bundled categories you can use on your custom block patterns. You can also register your own block pattern categories.
 
 ### register_block_pattern_category
 
 The `register_block_pattern_category` helper function receives two arguments.
+
 -   `title`: A machine-readable title for the block pattern category.
 -	`properties`: An array describing properties of the pattern category.
 
@@ -102,7 +90,7 @@ The properties of the pattern categories include:
 
 -   `label` (required): A human-readable label for the pattern category.
 
-The following code sample registers the category named 'hero':
+The following code sample registers the category named `hero`:
 
 ```php
 register_block_pattern_category(
@@ -127,12 +115,11 @@ add_action( 'init', 'my_plugin_register_my_pattern_categories' );
 
 ### unregister_block_pattern_category
 
-`unregister_block_pattern_category` allows unregistering a pattern category.
-
 The `unregister_block_pattern_category` helper function allows for a previously registered block pattern category to be unregistered from a theme or plugin and receives one argument.
+
 -   `title`: The name of the block pattern category to be unregistered.
 
-The following code sample unregisters the category named 'hero':
+The following code sample unregisters the category named `hero`:
 
 ```php
 unregister_block_pattern_category( 'hero' );
@@ -154,7 +141,7 @@ add_action( 'init', 'my_plugin_unregister_my_pattern_categories' );
 
 It is possible to attach a block pattern to one or more block types. This adds the block pattern as an available transform for that block type.
 
-Currently these transformations are available only to simple blocks (blocks without inner blocks). In order for a pattern to be suggested, **every selected block must be present in the block pattern**.
+Currently, these transformations are available only to simple blocks (blocks without inner blocks). In order for a pattern to be suggested, **every selected block must be present in the block pattern**.
 
 For instance:
 
@@ -171,9 +158,9 @@ register_block_pattern(
 );
 ```
 
-The above code registers a block pattern named 'my-plugin/powered-by-wordpress' and also shows the pattern in the "transform menu" of paragraph blocks. The transformation result will be keeping the paragraph's existing content and also apply the other attributes - in this case the background and text color.
+The above code registers a block pattern named `my-plugin/powered-by-wordpress` and shows the pattern in the "transform menu" of paragraph blocks. The transformation result will keep the paragraph's existing content and apply the other attributes - in this case, the background and text color.
 
-As mentioned above pattern transformations for simple blocks can also work if we have selected multiple blocks and there are matching contextual patterns to these blocks. Let's see an example of a pattern where two block types are attached.
+As mentioned above, pattern transformations for simple blocks can also work if we have selected multiple blocks and there are matching contextual patterns to these blocks. Let's see an example of a pattern where two block types are attached.
 
 ```php
 register_block_pattern(
@@ -194,7 +181,7 @@ register_block_pattern(
 );
 ```
 
-In the above example if we select **one of the two** block types, either a paragraph or a heading block, this pattern will be suggested by transforming the selected block using its content and will also add the remaining blocks from the pattern. If on the other hand we multi select one paragraph and one heading block, both blocks will be transformed.
+In the above example, if we select **one of the two** block types, either a paragraph or a heading block, this pattern will be suggested by transforming the selected block using its content and will also add the remaining blocks from the pattern. If, on the other hand, we multi-select one paragraph and one heading block, both blocks will be transformed.
 
 Blocks can also use these contextual block patterns in other places. For instance, when inserting a new Query Loop block, the user is provided with a list of all patterns attached to the block.
 
diff --git a/docs/reference-guides/block-api/block-registration.md b/docs/reference-guides/block-api/block-registration.md
index d2ff5f429c2675..92be19ee48c9fa 100644
--- a/docs/reference-guides/block-api/block-registration.md
+++ b/docs/reference-guides/block-api/block-registration.md
@@ -29,7 +29,7 @@ _Note:_ A block name can only contain lowercase alphanumeric characters and dash
 
 _Note:_ This name is used on the comment delimiters as `<!-- wp:my-plugin/book -->`. Those blocks provided by core don't include a namespace when serialized.
 
-### Block Configuration
+### Block configuration
 
 -   **Type:** `Object` [ `{ key: value }` ]
 
@@ -98,7 +98,7 @@ icon: <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="no
 
 An object can also be passed as icon, in this case, icon, as specified above, should be included in the src property.
 
-Besides src the object can contain background and foreground colors, this colors will appear with the icon when they are applicable e.g.: in the inserter.
+Besides src the object can contain background and foreground colors, these colors will appear with the icon when they are applicable e.g.: in the inserter.
 
 ```js
 icon: {
@@ -149,7 +149,7 @@ styles: [
 ],
 ```
 
-Plugins and Themes can also register [custom block style](/docs/reference-guides/block-api/block-styles.md) for existing blocks.
+Plugins and Themes can also register [custom block styles](/docs/reference-guides/block-api/block-styles.md) for existing blocks.
 
 #### attributes (optional)
 
@@ -275,7 +275,19 @@ The `ancestor` property makes a block available inside the specified block types
 ancestor: [ 'core/columns' ],
 ```
 
-#### Block Hooks (optional)
+#### allowedBlocks (optional)
+
+-   **Type:** `Array`
+-   **Since**: `WordPress 6.5.0`
+
+Setting the `allowedBlocks` property will limit which block types can be nested as direct children of the block.
+
+```js
+// Only allow the Columns block to be nested as direct child of this block
+allowedBlocks: [ 'core/columns' ],
+```
+
+#### blockHooks (optional)
 
 -   **Type:** `Object`
 -   **Since**: `WordPress 6.4.0`
@@ -292,7 +304,7 @@ The key is the name of the block (`string`) to hook into, and the value is the p
 ```js
 {
 	blockHooks: {
-		'core/verse': 'before'
+		'core/verse': 'before',
 		'core/spacer': 'after',
 		'core/column': 'firstChild',
 		'core/group': 'lastChild',
@@ -304,7 +316,7 @@ It’s crucial to emphasize that the Block Hooks feature is only designed to wor
 
 Block Hooks will not work with post content or patterns crafted by the user, such as synced patterns, or theme templates and template parts that have been modified by the user.
 
-## Block Collections
+## Block collections
 
 ## `registerBlockCollection`
 
diff --git a/docs/reference-guides/block-api/block-selectors.md b/docs/reference-guides/block-api/block-selectors.md
index 1771e54c33708b..ab810c32bb8f30 100644
--- a/docs/reference-guides/block-api/block-selectors.md
+++ b/docs/reference-guides/block-api/block-selectors.md
@@ -1,18 +1,12 @@
 # Selectors
 
-<div class="callout callout-alert">
-	This API was stabilized in Gutenberg 15.5 and is planned for core release
-	in WordPress 6.3. To use this prior to WordPress 6.3, you will need to
-	install and activate Gutenberg >= 15.5.
-</div>
-
 Block Selectors is the API that allows blocks to customize the CSS selector used
 when their styles are generated.
 
 A block may customize its CSS selectors at three levels: root, feature, and
 subfeature.
 
-## Root Selector
+## Root selector
 
 The root selector is the block's primary CSS selector.
 
@@ -31,7 +25,7 @@ default is generated in the form of `.wp-block-<name>`.
 }
 ```
 
-## Feature Selectors
+## Feature selectors
 
 Feature selectors relate to styles for a block support, e.g. border, color,
 typography, etc.
@@ -53,7 +47,7 @@ but applying the typography styles to an inner heading only.
 }
 ```
 
-## Subfeature Selectors
+## Subfeature selectors
 
 These selectors relate to individual styles provided by a block support e.g.
 `background-color`
diff --git a/docs/reference-guides/block-api/block-styles.md b/docs/reference-guides/block-api/block-styles.md
index 90b6c06d18f59d..b47b1a76a71f68 100644
--- a/docs/reference-guides/block-api/block-styles.md
+++ b/docs/reference-guides/block-api/block-styles.md
@@ -1,6 +1,6 @@
 # Styles
 
-Block Styles allow alternative styles to be applied to existing blocks. They work by adding a className to the block's wrapper. This className can be used to provide an alternative styling for the block if the block style is selected. See the [Getting Started with JavaScript tutorial](/docs/how-to-guides/javascript/) for a full example.
+Block Styles allow alternative styles to be applied to existing blocks. They work by adding a className to the block's wrapper. This className can be used to provide an alternative styling for the block if the block style is selected. See the [Use styles and stylesheets](/docs/how-to-guides/block-tutorial/applying-styles-with-stylesheets.md) for a full example on how to apply styles to a block.
 
 _Example:_
 
diff --git a/docs/reference-guides/block-api/block-supports.md b/docs/reference-guides/block-api/block-supports.md
index 7fd0e68c9bd8c0..a15191c19ffb73 100644
--- a/docs/reference-guides/block-api/block-supports.md
+++ b/docs/reference-guides/block-api/block-supports.md
@@ -7,30 +7,29 @@ Opting into any of these features will register additional attributes on the blo
 In order for the attribute to get applied to the block the generated properties get added to the wrapping element of the block. They get added to the object you get returned from the `useBlockProps` hook.
 
 `BlockEdit` function:
+
 ```js
 function BlockEdit() {
 	const blockProps = useBlockProps();
 
-	return (
-		<div {...blockProps}>Hello World!</div>
-	);
+	return <div { ...blockProps }>Hello World!</div>;
 }
 ```
 
 `save` function:
+
 ```js
 function BlockEdit() {
 	const blockProps = useBlockProps.save();
 
-	return (
-		<div {...blockProps}>Hello World!</div>
-	);
+	return <div { ...blockProps }>Hello World!</div>;
 }
 ```
 
 For dynamic blocks that get rendered via a `render_callback` in PHP you can use the `get_block_wrapper_attributes()` function. It returns a string containing all the generated properties and needs to get output in the opening tag of the wrapping block element.
 
 `render_callback` function:
+
 ```php
 function render_block() {
 	$wrapper_attributes = get_block_wrapper_attributes();
@@ -62,7 +61,7 @@ supports: {
 -   Type: `boolean` or `array`
 -   Default value: `false`
 
-This property adds block controls which allow to change block's alignment.
+This property adds block controls, which enable changes to a block's alignment.
 
 ```js
 supports: {
@@ -80,7 +79,7 @@ supports: {
 }
 ```
 
-When the block declares support for `align`, the attributes definition is extended to include an align attribute with a `string` type. By default, no alignment is assigned. The block can apply a default alignment by specifying its own `align` attribute with a default e.g.:
+When the block declares support for `align`, the attributes definition is extended to include an align attribute with a `string` type. By default, no alignment is assigned. The block can apply a default alignment by specifying its own `align` attribute with a default. For example:
 
 ```js
 attributes: {
@@ -107,24 +106,80 @@ supports: {
 
 ## ariaLabel
 
-- Type: `boolean`
-- Default value: `false`
+-   Type: `boolean`
+-   Default value: `false`
 
 ARIA-labels let you define an accessible label for elements. This property allows enabling the definition of an aria-label for the block, without exposing a UI field.
 
 ```js
 supports: {
-	// Add the support for aria label.
+	// Add support for an aria label.
 	ariaLabel: true
 }
 ```
 
+## background
+
+_**Note:** Since WordPress 6.5._
+
+-   Type: `Object`
+-   Default value: `null`
+-   Subproperties
+    -   `backgroundImage`: type `boolean`, default value `false`
+    -   `backgroundSize`: type `boolean`, default value `false`
+
+This value signals that a block supports some of the CSS style properties related to background. When it does, the block editor will show UI controls for the user to set their values if [the theme declares support](/docs/how-to-guides/themes/global-settings-and-styles.md#opt-in-into-ui-controls).
+
+`backgroundImage` adds UI controls which allow the user to select a background image.
+`backgroundSize` adds the FocalPointPicker to pick the position of the background image and allow the user to select the background size (cover, contain, fixed).
+
+```js
+supports: {
+	background: {
+		backgroundImage: true // Enable background image control.
+		backgroundSize: true // Enable background image + size control.
+	}
+}
+```
+
+When a block declares support for a specific background property, its attributes definition is extended to include the `style` attribute.
+
+When a background image is selected, the image data is stored in the `style.background.backgroundImage`.
+
+When a background images is selected and its position or size are changed, the background-position is stored in the `style.background.backgroundPosition` and its background-size in `style.background.backgroundSize` attribute.
+
+-   `style`: an attribute of `object` type with no default assigned. This is added when `backgroundImage` or `backgroundSize` support is declared. It stores the custom values set by the user.
+    -   `background`: an attribute of `object` type.
+        - `backgroundImage`: an attribute of `object` type, containing information about the selected image
+            - `url`: type `string`, URL to the image
+            - `id`: type `int`, media attachment ID
+            - `source`: type `string`, at the moment the only value is `file`
+            - `title`: type `string`, title of the media attachment
+        - `backgroundPosition`: an attribute of `string` type, defining the background images position, selected by FocalPointPicker and used in CSS as the [`background-position`](https://developer.mozilla.org/en-US/docs/Web/CSS/background-position) value.
+        - `backgroundSize`: an attribute of `string` type. defining the CSS [`background-size`](https://developer.mozilla.org/en-US/docs/Web/CSS/background-size) value.
+
+The block can apply a default background image, position and size by specifying its own attribute with a default. For example:
+
+```js
+attributes: {
+    style: {
+        background: {
+            backgroundImage: {
+				"url":"IMAGE_URL"
+			}
+			backgroundPosition:"50% 50%",
+            backgroundSize: "cover"
+        }
+    }
+}
+```
+
 ## className
 
 -   Type: `boolean`
 -   Default value: `true`
 
-By default, the class `.wp-block-your-block-name` is added to the root element of your saved markup. This helps having a consistent mechanism for styling blocks that themes and plugins can rely on. If, for whatever reason, a class is not desired on the markup, this functionality can be disabled.
+By default, the class `.wp-block-your-block-name` is added to the root element of your saved markup. This helps by providing a consistent mechanism for styling blocks that themes and plugins can rely on. If, for whatever reason, a class is not desired on the markup, this functionality can be disabled.
 
 ```js
 supports: {
@@ -139,19 +194,22 @@ supports: {
 -   Default value: null
 -   Subproperties:
     -   `background`: type `boolean`, default value `true`
+    -   `button`: type `boolean`, default value `false`
+    -   `enableContrastChecker`: type `boolean`, default value `true`
     -   `gradients`: type `boolean`, default value `false`
+    -   `heading`: type `boolean`, default value `false`
     -   `link`: type `boolean`, default value `false`
     -   `text`: type `boolean`, default value `true`
 
-This value signals that a block supports some of the properties related to color. When it does, the block editor will show UI controls for the user to set their values.
+This value signals that a block supports some of the properties related to color. When this value is present, the block editor will show UI controls for the user to set their values.
 
-Note that the `background` and `text` keys have a default value of `true`, so if the `color` property is present they'll also be considered enabled:
+Note that the `background` and `text` keys have a default value of `true`, so if the `color` property is present they will also be considered enabled:
 
 ```js
 supports: {
 	color: {
 		// This also enables text and background UI controls.
-		gradients: true // Enable gradients UI control.
+		gradients: true // Enables the gradients UI control.
 	}
 }
 ```
@@ -161,8 +219,8 @@ It's possible to disable them individually:
 ```js
 supports: {
     color: { // Text UI control is enabled.
-        background: false, // Disable background UI control.
-        gradients: true // Enable gradients UI control.
+        background: false, // Disables the background UI control.
+        gradients: true // Enables the gradients UI control.
     }
 }
 ```
@@ -175,7 +233,7 @@ When color support is declared, this property is enabled by default (along with
 
 ```js
 supports: {
-    color: true // Enables background and text
+    color: true // Enables background and text color support.
 }
 ```
 
@@ -184,7 +242,7 @@ To disable background support while keeping other color supports enabled, set to
 ```js
 supports: {
     color: {
-        // Disable background support. Text color support is still enabled.
+        // Disables background support. Text color support is still enabled.
         background: false
     }
 }
@@ -192,43 +250,103 @@ supports: {
 
 When the block declares support for `color.background`, the attributes definition is extended to include two new attributes: `backgroundColor` and `style`:
 
-- `backgroundColor`: attribute of `string` type with no default assigned.
+-   `backgroundColor`: an attribute of `string` type with no default assigned.
+
+    When a user chooses from the list of preset background colors, the preset slug is stored in the `backgroundColor` attribute.
+
+    Background color presets are sourced from the `editor-color-palette` [theme support](/docs/how-to-guides/themes/theme-support.md#block-color-palettes).
+
+    The block can apply a default preset background color by specifying its own attribute with a default. For example:
+
+    ```js
+    attributes: {
+        backgroundColor: {
+            type: 'string',
+            default: 'some-preset-background-slug',
+        }
+    }
+    ```
+
+-   `style`: attribute of `object` type with no default assigned.
+
+    When a custom background color is selected (i.e. using the custom color picker), the custom color value is stored in the `style.color.background` attribute.
+
+    The block can apply a default custom background color by specifying its own attribute with a default. For example:
+
+    ```js
+    attributes: {
+        style: {
+            type: 'object',
+            default: {
+                color: {
+                    background: '#aabbcc',
+                }
+            }
+        }
+    }
+    ```
+
+### color.button
 
-  When a user chooses from the list of preset background colors, the preset slug is stored in the `backgroundColor` attribute.
+_**Note:** Since WordPress 6.5._
 
-  Background color presets are sourced from the `editor-color-palette` [theme support](/docs/how-to-guides/themes/theme-support.md#block-color-palettes).
+This property adds block controls which allow the user to set button colors (text, background) in a block. Button colors are disabled by default.
 
-  The block can apply a default preset background color by specifying its own attribute with a default e.g.:
+To enable button color support, set `color.button` to `true`.
+
+```js
+supports: {
+	color: {
+		button: true
+	}
+}
+```
+
+Button color presets are sourced from the `editor-color-palette` [theme support](/docs/how-to-guides/themes/theme-support.md#block-color-palettes).
+
+When the block declares support for `color.button`, the attributes definition is extended to include the `style` attribute:
+
+-   `style`: an attribute of `object` type with no default assigned.
+
+    When a button color is selected, the color value is stored in the `style.elements.button.color.text` and `style.elements.button.color.background` attribute.
+
+    The block can apply a default button colors by specifying its own attribute with a default. For example:
+
+    ```js
+    attributes: {
+        style: {
+            type: 'object',
+            default: {
+                elements: {
+                    button: {
+                        color: {
+                            text: 'var:preset|color|contrast',
+    					    background: '#000000',
+                        }
+                    }
+                }
+            }
+        }
+    }
+    ```
 
-  ```js
-  attributes: {
-      backgroundColor: {
-          type: 'string',
-          default: 'some-preset-background-slug',
-      }
-  }
-  ```
+### color.enableContrastChecker
 
-- `style`: attribute of `object` type with no default assigned.
+_**Note:** Since WordPress 6.5._
 
-  When a custom background color is selected (i.e. using the custom color picker), the custom color value is stored in the `style.color.background` attribute.
+Determines whether the contrast checker widget displays in the block editor UI.
 
-  The block can apply a default custom background color by specifying its own attribute with a default e.g.:
+The contrast checker appears only if the block declares support for color. It tests the readability of color combinations and warns if there is a potential issue. The property is enabled by default. Set to `false` to explicitly disable:
 
-  ```js
-  attributes: {
-      style: {
-          type: 'object',
-          default: {
-              color: {
-                  background: '#aabbcc',
-              }
-          }
-      }
-  }
-  ```
+```js
+supports: {
+	color: {
+		enableContrastChecker: false
+	}
+}
+```
 
-### color.__experimentalDuotone
+### color.\_\_experimentalDuotone
 
 _**Note:** Deprecated since WordPress 6.3._
 
@@ -242,8 +360,7 @@ This property adds UI controls which allow the user to apply a gradient backgrou
 supports: {
     color: {
         gradients: true,
-
-        // Default values must be disabled if you don't want to use them with gradient.
+        // Default values must be disabled if you don't want to use them with gradients.
         background: false,
         text: false
     }
@@ -252,91 +369,132 @@ supports: {
 
 Gradient presets are sourced from `editor-gradient-presets` [theme support](/docs/how-to-guides/themes/theme-support.md#block-gradient-presets).
 
-
 When the block declares support for `color.gradient`, the attributes definition is extended to include two new attributes: `gradient` and `style`:
 
-- `gradient`: attribute of `string` type with no default assigned.
+-   `gradient`: an attribute of `string` type with no default assigned.
+
+    When a user chooses from the list of preset gradients, the preset slug is stored in the `gradient` attribute.
 
-  When a user chooses from the list of preset gradients, the preset slug is stored in the `gradient` attribute.
+    The block can apply a default preset gradient by specifying its own attribute with a default. For example:
 
-  The block can apply a default preset gradient by specifying its own attribute with a default e.g.:
+    ```js
+    attributes: {
+        gradient: {
+            type: 'string',
+            default: 'some-preset-gradient-slug',
+        }
+    }
+    ```
 
-  ```js
-  attributes: {
-      gradient: {
-          type: 'string',
-          default: 'some-preset-gradient-slug',
-      }
-  }
-  ```
+-   `style`: an attribute of `object` type with no default assigned.
 
-- `style`: attribute of `object` type with no default assigned.
+    When a custom gradient is selected (i.e. using the custom gradient picker), the custom gradient value is stored in the `style.color.gradient` attribute.
 
-  When a custom gradient is selected (i.e. using the custom gradient picker), the custom gradient value is stored in the `style.color.gradient` attribute.
+    The block can apply a default custom gradient by specifying its own attribute with a default. For example:
 
-  The block can apply a default custom gradient by specifying its own attribute with a default e.g.:
+    ```js
+    attributes: {
+        style: {
+            type: 'object',
+            default: {
+                color: {
+                    gradient: 'linear-gradient(135deg,rgb(170,187,204) 0%,rgb(17,34,51) 100%)',
+                }
+            }
+        }
+    }
+    ```
 
-  ```js
-  attributes: {
-      style: {
-          type: 'object',
-          default: {
-              color: {
-                  gradient: 'linear-gradient(135deg,rgb(170,187,204) 0%,rgb(17,34,51) 100%)',
-              }
-          }
-      }
-  }
-  ```
+### color.heading
 
-### color.link
+_**Note:** Since WordPress 6.5._
 
-This property adds block controls which allow the user to set link color in a block, link color is disabled by default.
+This property adds block controls which allow the user to set heading colors in a block. Heading colors are disabled by default.
 
+To enable heading color support, set `color.heading` to `true`.
 
 ```js
 supports: {
-    color: true // Enables only background and text
+	color: {
+		// Enable heading color support.
+		heading: true
+	}
 }
 ```
 
-To enable link color support, set to `true`.
+Heading color presets are sourced from the `editor-color-palette` [theme support](/docs/how-to-guides/themes/theme-support.md#block-color-palettes).
+
+When the block declares support for `color.heading`, the attributes definition is extended to include the `style` attribute:
+
+-   `style`: an attribute of `object` type with no default assigned.
+
+    When a heading color is selected, the color value is stored in the `style.elements.heading.color.text` and `style.elements.heading.color.background` attribute.
+
+    The block can apply default heading colors by specifying its own attribute with a default. For example:
+
+    ```js
+    attributes: {
+        style: {
+            type: 'object',
+            default: {
+                elements: {
+                    heading: {
+                        color: {
+                            text: 'var:preset|color|contrast',
+    					    background: '#000000',
+                        }
+                    }
+                }
+            }
+        }
+    }
+    ```
+
+### color.link
+
+This property adds block controls which allow the user to set link colors in a block. Link colors are disabled by default.
+
+To enable link color support, set `color.link` to `true`.
 
 ```js
 supports: {
-    color: {
-        link: true
-    }
+	color: {
+		link: true
+	}
 }
 ```
 
 Link color presets are sourced from the `editor-color-palette` [theme support](/docs/how-to-guides/themes/theme-support.md#block-color-palettes).
 
-
 When the block declares support for `color.link`, the attributes definition is extended to include the `style` attribute:
 
-- `style`: attribute of `object` type with no default assigned.
-
-  When a link color is selected, the color value is stored in the `style.elements.link.color.text` attribute.
-
-  The block can apply a default link color by specifying its own attribute with a default e.g.:
-
-  ```js
-  attributes: {
-      style: {
-          type: 'object',
-          default: {
-              elements: {
-                  link: {
-                      color: {
-                          text: '#ff0000',
-                      }
-                  }
-              }
-          }
-      }
-  }
-  ```
+-   `style`: an attribute of `object` type with no default assigned.
+
+    When a link color is selected, the color value is stored in the `style.elements.link.color.text` and `style.elements.link.:hover.color.text` attribute.
+
+    The block can apply default link colors by specifying its own attribute with a default. For example:
+
+    ```js
+    attributes: {
+        style: {
+            type: 'object',
+            default: {
+                elements: {
+                    link: {
+                        color: {
+                            text: 'var:preset|color|contrast',
+                        },
+						":hover": {
+							color: {
+								text: "#000000"
+							}
+						}
+                    }
+                }
+            }
+        }
+    }
+    ```
 
 ### color.text
 
@@ -346,59 +504,58 @@ When color support is declared, this property is enabled by default (along with
 
 ```js
 supports: {
-    color: true // Enables background and text, but not link.
+	color: true // Enables background and text, but not link.
 }
 ```
 
-To disable text color support while keeping other color supports enabled, set to `false`.
+To disable text color support while keeping other color supports enabled, set `color.text` to `false`.
 
 ```js
 supports: {
-    color: {
-        // Disable text color support.
-        text: false
-    }
+	color: {
+		// Disable text color support.
+		text: false
+	}
 }
 ```
 
 Text color presets are sourced from the `editor-color-palette` [theme support](/docs/how-to-guides/themes/theme-support.md#block-color-palettes).
 
-
 When the block declares support for `color.text`, the attributes definition is extended to include two new attributes: `textColor` and `style`:
 
-- `textColor`: attribute of `string` type with no default assigned.
+-   `textColor`: an attribute of `string` type with no default assigned.
 
-  When a user chooses from the list of preset text colors, the preset slug is stored in the `textColor` attribute.
+    When a user chooses from the list of preset text colors, the preset slug is stored in the `textColor` attribute.
 
-  The block can apply a default preset text color by specifying its own attribute with a default e.g.:
+    The block can apply a default preset text color by specifying its own attribute with a default. For example:
 
-  ```js
-  attributes: {
-      textColor: {
-          type: 'string',
-          default: 'some-preset-text-color-slug',
-      }
-  }
-  ```
+    ```js
+    attributes: {
+        textColor: {
+            type: 'string',
+            default: 'some-preset-text-color-slug',
+        }
+    }
+    ```
 
-- `style`: attribute of `object` type with no default assigned.
+-   `style`: an attribute of `object` type with no default assigned.
 
-  When a custom text color is selected (i.e. using the custom color picker), the custom color value is stored in the `style.color.text` attribute.
+    When a custom text color is selected (i.e. using the custom color picker), the custom color value is stored in the `style.color.text` attribute.
 
-  The block can apply a default custom text color by specifying its own attribute with a default e.g.:
+    The block can apply a default custom text color by specifying its own attribute with a default. For example:
 
-  ```js
-  attributes: {
-      style: {
-          type: 'object',
-          default: {
-              color: {
-                  text: '#aabbcc',
-              }
-          }
-      }
-  }
-  ```
+    ```js
+    attributes: {
+        style: {
+            type: 'object',
+            default: {
+                color: {
+                    text: '#aabbcc',
+                }
+            }
+        }
+    }
+    ```
 
 ## customClassName
 
@@ -414,20 +571,6 @@ supports: {
 }
 ```
 
-## defaultStylePicker
-
--   Type: `boolean`
--   Default value: `true`
-
-When the style picker is shown, the user can set a default style for a block type based on the block's currently active style. If you prefer not to make this option available, set this property to `false`.
-
-```js
-supports: {
-	// Remove the Default Style picker.
-	defaultStylePicker: false
-}
-```
-
 ## dimensions
 
 _**Note:** Since WordPress 6.2._
@@ -437,24 +580,26 @@ _**Note:** Since WordPress 6.2._
 -   Subproperties:
     -   `minHeight`: type `boolean`, default value `false`
 
-This value signals that a block supports some of the CSS style properties related to dimensions. When it does, the block editor will show UI controls for the user to set their values if [the theme declares support](/docs/how-to-guides/themes/theme-json/#opt-in-into-ui-controls).
+This value signals that a block supports some of the CSS style properties related to dimensions. When it does, the block editor will show UI controls for the user to set their values if [the theme declares support](/docs/how-to-guides/themes/global-settings-and-styles.md#opt-in-into-ui-controls).
 
 ```js
 supports: {
-    dimensions: {
-        minHeight: true // Enable min height control.
-    }
+	dimensions: {
+		aspectRatio: true // Enable aspect ratio control.
+		minHeight: true // Enable min height control.
+	}
 }
 ```
 
 When a block declares support for a specific dimensions property, its attributes definition is extended to include the `style` attribute.
 
-- `style`: attribute of `object` type with no default assigned. This is added when `minHeight` support is declared. It stores the custom values set by the user, e.g.:
+-   `style`: an attribute of `object` type with no default assigned. This is added when `aspectRatio` or `minHeight` support is declared. It stores the custom values set by the user. For example:
 
 ```js
 attributes: {
     style: {
         dimensions: {
+            aspectRatio: "16/9",
             minHeight: "50vh"
         }
     }
@@ -462,6 +607,7 @@ attributes: {
 ```
 
 ## filter
+
 -   Type: `Object`
 -   Default value: null
 -   Subproperties:
@@ -491,29 +637,29 @@ selectors: {
 
 The filter can be applied to an element inside the block by setting the `selectors.filter.duotone` selector.
 
-Duotone presets are sourced from `color.duotone` in [theme.json](/docs/how-to-guides/themes/theme-json.md).
+Duotone presets are sourced from `color.duotone` in [theme.json](/docs/how-to-guides/themes/global-settings-and-styles.md).
 
 When the block declares support for `filter.duotone`, the attributes definition is extended to include the attribute `style`:
 
-- `style`: attribute of `object` type with no default assigned.
-
-  The block can apply a default duotone color by specifying its own attribute with a default e.g.:
-
-  ```js
-  attributes: {
-      style: {
-          type: 'object',
-          default: {
-              color: {
-                  duotone: [
-                      '#FFF',
-                      '#000'
-                  ]
-              }
-          }
-      }
-  }
-  ```
+-   `style`: an attribute of `object` type with no default assigned.
+
+    The block can apply a default duotone color by specifying its own attribute with a default. For example:
+
+    ```js
+    attributes: {
+        style: {
+            type: 'object',
+            default: {
+                color: {
+                    duotone: [
+                        '#FFF',
+                        '#000'
+                    ]
+                }
+            }
+        }
+    }
+    ```
 
 ## html
 
@@ -543,6 +689,21 @@ supports: {
 }
 ```
 
+## interactivity
+
+-   Type: `boolean` or `object`
+-   Default value: `false`
+-   Subproperties:
+    -   `clientNavigation`: type `boolean`, default value `false`
+    -   `interactive`: type `boolean`, default value `false`
+
+Indicates if the block is using Interactivity API features.
+
+The `clientNavigation` sub-property indicates whether a block is compatible with the Interactivity API client-side navigation.
+Set it to true only if the block is not interactive or if it is interactive using the Interactivity API. Set it to false if the block is interactive but uses vanilla JS, jQuery or another JS framework/library other than the Interactivity API.
+
+The `interactive` sub-property indicates whether the block is using the Interactivity API directives.
+
 ## layout
 
 -   Type: `boolean` or `Object`
@@ -565,7 +726,7 @@ This value only applies to blocks that are containers for inner blocks. If set t
 -   Type: `Object`
 -   Default value: null
 
-Allows setting the `type` property to define what layout type is default for the block, and also default values for any properties inherent to that layout type, e.g., for a `flex` layout, a default value can be set for `flexWrap`.
+Allows setting the `type` property to define what layout type is default for the block, and also default values for any properties inherent to that layout type. For example, for a `flex` layout, a default value can be set for `flexWrap`.
 
 ### layout.allowSwitching
 
@@ -623,46 +784,31 @@ For the `flex` layout type only, determines display of the orientation control i
 
 For the `constrained` layout type only, determines display of the custom content and wide size controls in the block sidebar.
 
-
-## multiple
-
--   Type: `boolean`
--   Default value: `true`
-
-A non-multiple block can be inserted into each post, one time only. For example, the built-in 'More' block cannot be inserted again if it already exists in the post being edited. A non-multiple block's icon is automatically dimmed (unclickable) to prevent multiple instances.
-
-```js
-supports: {
-	// Use the block just once per post
-	multiple: false
-}
-```
-
-## reusable
+## lock
 
 -   Type: `boolean`
 -   Default value: `true`
 
-A block may want to disable the ability of being converted into a reusable block. By default all blocks can be converted to a reusable block. If supports reusable is set to false, the option to convert the block into a reusable block will not appear.
+A block may want to disable the ability to toggle the lock state. It can be locked/unlocked by a user from the block "Options" dropdown by default. To disable this behavior, set `lock` to `false`.
 
 ```js
 supports: {
-	// Don't allow the block to be converted into a reusable block.
-	reusable: false,
+	// Remove support for locking UI.
+	lock: false
 }
 ```
 
-## lock
+## multiple
 
 -   Type: `boolean`
 -   Default value: `true`
 
-A block may want to disable the ability to toggle the lock state. It can be locked/unlocked by a user from the block "Options" dropdown by default. To disable this behavior, set `lock` to `false`.
+A non-multiple block can be inserted into each post, one time only. For example, the built-in 'More' block cannot be inserted again if it already exists in the post being edited. A non-multiple block's icon is automatically dimmed (unclickable) to prevent multiple instances.
 
 ```js
 supports: {
-	// Remove support for locking UI.
-	lock: false
+	// Use the block just once per post
+	multiple: false
 }
 ```
 
@@ -675,21 +821,21 @@ _**Note:** Since WordPress 6.2._
 -   Subproperties:
     -   `sticky`: type `boolean`, default value `false`
 
-This value signals that a block supports some of the CSS style properties related to position. When it does, the block editor will show UI controls for the user to set their values if [the theme declares support](/docs/how-to-guides/themes/theme-json/#opt-in-into-ui-controls).
+This value signals that a block supports some of the CSS style properties related to position. When it does, the block editor will show UI controls for the user to set their values if [the theme declares support](/docs/how-to-guides/themes/global-settings-and-styles.md#opt-in-into-ui-controls).
 
 Note that sticky position controls are currently only available for blocks set at the root level of the document. Setting a block to the `sticky` position will stick the block to its most immediate parent when the user scrolls the page.
 
 ```js
 supports: {
-    position: {
-        sticky: true // Enable selecting sticky position.
-    }
+	position: {
+		sticky: true // Enable selecting sticky position.
+	}
 }
 ```
 
 When the block declares support for a specific position property, its attributes definition is extended to include the `style` attribute.
 
-- `style`: attribute of `object` type with no default assigned. This is added when `sticky` support is declared. It stores the custom values set by the user, e.g.:
+-   `style`: an attribute of `object` type with no default assigned. This is added when `sticky` support is declared. It stores the custom values set by the user. For example:
 
 ```js
 attributes: {
@@ -702,6 +848,72 @@ attributes: {
 }
 ```
 
+## renaming
+
+_**Note:** Since WordPress 6.5._
+
+-   Type: `boolean`
+-   Default value: `true`
+
+By default, a block can be renamed by a user from the block 'Options' dropdown or the 'Advanced' panel. To disable this behavior, set renaming to false.
+
+```js
+supports: {
+	// Don't allow the block to be renamed in the editor.
+	renaming: false,
+}
+```
+
+## reusable
+
+-   Type: `boolean`
+-   Default value: `true`
+
+A block may want to disable the ability of being converted into a reusable block. By default all blocks can be converted to a reusable block. If supports reusable is set to false, the option to convert the block into a reusable block will not appear.
+
+```js
+supports: {
+	// Don't allow the block to be converted into a reusable block.
+	reusable: false,
+}
+```
+
+## shadow
+
+_**Note:** Since WordPress 6.5._
+
+-   Type: `boolean`
+-   Default value: `false`
+
+This property adds block controls which allow the user to set a box shadow for a block. Shadows are disabled by default.
+
+```js
+supports: {
+	shadow: true // Enable the box-shadow picker.
+}
+```
+
+Shadow presets are sourced from the shadow presets defined in `theme.json`.
+
+When the block declares support for `shadow`, the attributes definition is extended to include the `style` attribute:
+
+-   `style`: an attribute of `object` type with no default assigned.
+
+    When a shadow is selected, the color value is stored in the `style.shadow`.
+
+    The block can apply a default shadow by specifying its own attribute with a default. For example:
+
+    ```js
+    attributes: {
+        style: {
+            type: 'object',
+            default: {
+    			shadow: "var:preset|shadow|deep"
+            }
+        }
+    }
+    ```
+
 ## spacing
 
 -   Type: `Object`
@@ -725,7 +937,7 @@ supports: {
 
 When the block declares support for a specific spacing property, its attributes definition is extended to include the `style` attribute.
 
-- `style`: attribute of `object` type with no default assigned. This is added when `margin` or `padding` support is declared. It stores the custom values set by the user, e.g.:
+-   `style`: an attribute of `object` type with no default assigned. This is added when `margin` or `padding` support is declared. It stores the custom values set by the user. For example:
 
 ```js
 attributes: {
@@ -759,8 +971,9 @@ supports: {
 -   Type: `Object`
 -   Default value: `null`
 -   Subproperties:
-    - `fontSize`: type `boolean`, default value `false`
-    - `lineHeight`: type `boolean`, default value `false`
+    -   `fontSize`: type `boolean`, default value `false`
+    -   `lineHeight`: type `boolean`, default value `false`
+    -   `textAlign`: type `boolean` or `array`, default value `false`
 
 The presence of this object signals that a block supports some typography related properties. When it does, the block editor will show a typography UI allowing the user to control their values.
 
@@ -771,11 +984,14 @@ supports: {
         fontSize: true,
         // Enable support and UI control for line-height.
         lineHeight: true,
+        // Enable support and UI control for text alignment.
+        textAlign: true,
     },
 }
 ```
 
 ### typography.fontSize
+
 -   Type: `boolean`
 -   Default value: `false`
 
@@ -794,7 +1010,7 @@ supports: {
 
 When the block declares support for `fontSize`, the attributes definition is extended to include two new attributes: `fontSize` and `style`:
 
--   `fontSize`: attribute of `string` type with no default assigned. It stores any preset value selected by the user. The block can apply a default fontSize by specifying its own `fontSize` attribute with a default e.g.:
+-   `fontSize`: an attribute of `string` type with no default assigned. It stores any preset value selected by the user. The block can apply a default fontSize by specifying its own `fontSize` attribute with a default. For example:
 
 ```js
 attributes: {
@@ -805,7 +1021,7 @@ attributes: {
 }
 ```
 
--   `style`: attribute of `object` type with no default assigned. It stores the custom values set by the user and is shared with other block supports such as color. The block can apply a default style by specifying its own `style` attribute with a default e.g.:
+-   `style`: an attribute of `object` type with no default assigned. It stores the custom values set by the user and is shared with other block supports such as color. The block can apply a default style by specifying its own `style` attribute with a default. For example:
 
 ```js
 attributes: {
@@ -836,7 +1052,7 @@ supports: {
 }
 ```
 
-When the block declares support for `lineHeight`, the attributes definition is extended to include a new attribute `style` of `object` type with no default assigned. It stores the custom value set by the user. The block can apply a default style by specifying its own `style` attribute with a default e.g.:
+When the block declares support for `lineHeight`, the attributes definition is extended to include a new attribute `style` of `object` type with no default assigned. It stores the custom value set by the user. The block can apply a default style by specifying its own `style` attribute with a default. For example:
 
 ```js
 attributes: {
@@ -850,3 +1066,55 @@ attributes: {
     }
 }
 ```
+
+### typography.textAlign
+
+_**Note:** Since WordPress 6.6._
+
+-   Type: `boolean` or `array`
+-   Default value: `false`
+
+This property adds block toolbar controls which allow to change block's text alignment.
+
+```js
+supports: {
+    typography: {
+        // Declare support for block's text alignment.
+        // This adds support for all the options:
+        // left, center, right.
+        textAlign: true
+    }
+}
+```
+
+```js
+supports: {
+    typography: {
+        // Declare support for specific text alignment options.
+        textAlign: [ 'left', 'right' ]
+    }
+}
+```
+
+When the block declares support for `textAlign`, the attributes definition is extended to include a new attribute `style` of `object` type with no default assigned. It stores the custom value set by the user. The block can apply a default style by specifying its own `style` attribute with a default. For example:
+
+```js
+attributes: {
+    style: {
+        type: 'object',
+        default: {
+            typography: {
+                textAlign: 'value'
+            }
+        }
+    }
+}
+```
+
+## splitting
+
+When set to `true`, `Enter` will split the block into two blocks. Note that this
+is only meant for simple text blocks such as paragraphs and headings with a
+single `RichText` field. RichText in the `edit` function _must_ have an
+`identifier` prop that matches the attribute key of the text, so that it updates
+the selection correctly and we know where to split.
diff --git a/docs/reference-guides/block-api/block-templates.md b/docs/reference-guides/block-api/block-templates.md
index 494a99bf73af73..b664867eb5b67f 100644
--- a/docs/reference-guides/block-api/block-templates.md
+++ b/docs/reference-guides/block-api/block-templates.md
@@ -61,7 +61,7 @@ registerBlockType( 'myplugin/template', {
 
 See the [Meta Block Tutorial](/docs/how-to-guides/metabox.md#step-4-finishing-touches) for a full example of a template in use.
 
-## Block Attributes
+## Block attributes
 
 To find a comprehensive list of all block attributes that you can define in a template, consult the block's `block.json` file, and look at the `attributes` and `supports` values.
 
@@ -69,7 +69,7 @@ For example, [packages/block-library/src/heading/block.json](https://github.com/
 
 If you don't have the Gutenberg plugin installed, you can find `block.json` files inside `wp-includes/blocks/heading/block.json`.
 
-## Custom Post types
+## Custom post types
 
 A custom post type can register its own template during registration:
 
@@ -161,7 +161,7 @@ $template = array(
 );
 ```
 
-## Nested Templates
+## Nested templates
 
 Container blocks like the columns blocks also support templates. This is achieved by assigning a nested template to the block.
 
diff --git a/docs/reference-guides/block-api/block-transforms.md b/docs/reference-guides/block-api/block-transforms.md
index a91444981b76fb..c2c5ed49d1b19c 100644
--- a/docs/reference-guides/block-api/block-transforms.md
+++ b/docs/reference-guides/block-api/block-transforms.md
@@ -22,7 +22,7 @@ export const settings = {
 };
 ```
 
-## Transformations Types
+## Transformations types
 
 This section goes through the existing types of transformations blocks support:
 
diff --git a/docs/reference-guides/block-api/block-variations.md b/docs/reference-guides/block-api/block-variations.md
index 96930dc6b9b625..8a0c6b1dd5bd6c 100644
--- a/docs/reference-guides/block-api/block-variations.md
+++ b/docs/reference-guides/block-api/block-variations.md
@@ -1,12 +1,11 @@
 # Variations
 
-The Block Variations API  allows you to define multiple versions (variations) of a block. A block variation differs from the original block by a set of initial attributes or inner blocks. When you insert the block variation into the Editor, these attributes and/or inner blocks are applied. 
+The Block Variations API allows you to define multiple versions (variations) of a block. A block variation differs from the original block by a set of initial attributes or inner blocks. When you insert the block variation into the Editor, these attributes and/or inner blocks are applied.
 
 Variations are an excellent way to create iterations of existing blocks without building entirely new blocks from scratch.
 
 To better understand this API, consider the Embed block. This block contains numerous variations for each type of embeddable content (WordPress, Youtube, etc.). Each Embed block variation shares the same underlying functionality for editing, saving, and so on. Besides the name and descriptive information, the main difference is the `providerNameSlug` attribute. Below is a simplified example of the variations in the Embed block. View the [source code](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/embed/variations.js) for the complete specification.
 
-
 ```js
 variations: [
 	{
@@ -38,7 +37,7 @@ A block variation is defined by an object that can contain the following fields:
 -   `innerBlocks` (optional, type `Array[]`) – Initial configuration of nested blocks.
 -   `example` (optional, type `Object`) – Provides structured data for the block preview. Set to `undefined` to disable the preview. See the [Block Registration API](/docs/reference-guides/block-api/block-registration.md#example-optional) for more details.
 -   `scope` (optional, type `WPBlockVariationScope[]`) - Defaults to `block` and `inserter`. The list of scopes where the variation is applicable. Available options include:
-	- `block` - Used by blocks to filter specific block variations. `Columns` and `Query` blocks have such variations, which are passed to the [experimental BlockVariationPicker](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/block-variation-picker/README.md) component. This component handles displaying the variations and allows users to choose one of them.
+    -   `block` - Used by blocks to filter specific block variations. `Columns` and `Query` blocks have such variations, which are passed to the [experimental BlockVariationPicker](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/block-variation-picker/README.md) component. This component handles displaying the variations and allows users to choose one of them.
     -   `inserter` - Block variation is shown on the inserter.
     -   `transform` - Block variation is shown in the component for variation transformations.
 -   `isDefault` (optional, type `boolean`) – Defaults to `false`. Indicates whether the current variation is the default one (details below).
@@ -55,18 +54,15 @@ Block variations can be declared during a block's registration by providing the
 To create a variation for an existing block, such as a Core block, use `wp.blocks.registerBlockVariation()`. This function accepts the name of the block and the object defining the variation.
 
 ```js
-wp.blocks.registerBlockVariation( 
-	'core/embed', 
-	{
-		name: 'custom-embed',
-		attributes: { providerNameSlug: 'custom' },
-	}
-);
+wp.blocks.registerBlockVariation( 'core/embed', {
+	name: 'custom-embed',
+	attributes: { providerNameSlug: 'custom' },
+} );
 ```
 
 ## Removing a block variation
 
-Block variations can also be easily removed. To do so, use `wp.blocks.unregisterBlockVariation()`. This function accepts the name of the block and the `name` of the variation that should be unregistered. 
+Block variations can also be easily removed. To do so, use `wp.blocks.unregisterBlockVariation()`. This function accepts the name of the block and the `name` of the variation that should be unregistered.
 
 ```js
 wp.blocks.unregisterBlockVariation( 'core/embed', 'youtube' );
@@ -84,9 +80,9 @@ variations: [
 		name: 'blue',
 		title: __( 'Blue Quote' ),
 		isDefault: true,
-		attributes: { 
-			color: 'blue', 
-			className: 'is-style-blue-quote' 
+		attributes: {
+			color: 'blue',
+			className: 'is-style-blue-quote'
 		},
 		icon: 'format-quote',
 		isActive: ( blockAttributes, variationAttributes ) =>
@@ -99,20 +95,17 @@ variations: [
 
 By default, all variations will show up in the Inserter in addition to the original block type item. However, setting the `isDefault` flag for any variations listed will override the regular block type in the Inserter. This is a great tool for curating the Editor experience to your specific needs.
 
-For example, if you want Media & Text block to display the image on the right by default, you could create a variation like this: 
+For example, if you want Media & Text block to display the image on the right by default, you could create a variation like this:
 
 ```js
- wp.blocks.registerBlockVariation(
-	'core/media-text', 
-	{
-		name: 'media-text-media-right',
-		title: __( 'Media & Text' ),
-		isDefault: true,
-		attributes: { 
-			mediaPosition: 'right'
-		}
-	}
-)
+wp.blocks.registerBlockVariation( 'core/media-text', {
+	name: 'media-text-media-right',
+	title: __( 'Media & Text' ),
+	isDefault: true,
+	attributes: {
+		mediaPosition: 'right',
+	},
+} );
 ```
 
 ### Caveats to using `isDefault`
@@ -125,54 +118,93 @@ The solution is to unregister the other variation before registering your variat
 
 ## Using `isActive`
 
-While the `isActive` property is optional, you will often want to use it to display information about the block variation after the block has been inserted. For example, this API is used in `useBlockDisplayInformation` hook to fetch and display proper information in places like the `BlockCard` or `Breadcrumbs` components.
+While the `isActive` property is optional, it's recommended. This API is used by the block editor to check which variation is active, and display the correct variation's title, icon and description when an instance of the variation is selected in the editor.
 
-If `isActive` is not set, the Editor cannot distinguish between the original block and your variation, so the original block information will be displayed. 
+If `isActive` is not set, the Editor cannot distinguish between an instance of the original block and your variation, so the original block information will be displayed.
 
-The property can use either a function or an array of strings (`string[]`). The function accepts `blockAttributes` and `variationAttributes`, which can be used to determine if a variation is active. In the Embed block, the primary differentiator is the `providerNameSlug` attribute, so if you wanted to determine if the YouTube Embed variation was active, you could do something like this: 
+The property can be set to either an array of strings (`string[]`), or a function. It is recommended to use the string array version whenever possible.
 
-```
-isActive: ( blockAttributes, variationAttributes ) =>
-	blockAttributes.providerNameSlug === variationAttributes.providerNameSlug,
+The `string[]` version is used to declare which of the block instance's attributes should be compared to the given variation's. Each attribute will be checked and the variation will be active if all of them match.
+
+As an example, in the core Embed block, the `providerNameSlug` attribute is used to determine the embed provider (e.g. 'youtube' or 'twitter'). The variations may be declared like this:
+
+```js
+const variations = [
+	{
+		name: 'twitter',
+		title: 'Twitter',
+		icon: embedTwitterIcon,
+		keywords: [ 'tweet', __( 'social' ) ],
+		description: __( 'Embed a tweet.' ),
+		patterns: [ /^https?:\/\/(www\.)?twitter\.com\/.+/i ],
+		attributes: { providerNameSlug: 'twitter', responsive: true },
+	},
+	{
+		name: 'youtube',
+		title: 'YouTube',
+		icon: embedYouTubeIcon,
+		keywords: [ __( 'music' ), __( 'video' ) ],
+		description: __( 'Embed a YouTube video.' ),
+		patterns: [
+			/^https?:\/\/((m|www)\.)?youtube\.com\/.+/i,
+			/^https?:\/\/youtu\.be\/.+/i,
+		],
+		attributes: { providerNameSlug: 'youtube', responsive: true },
+	},
+	// ...
+];
 ```
 
-You can also use a `string[]` to tell which attributes should be compared as a shorthand. Each attribute will be checked and the variation will be active if all of them match. Using the same example of the YouTube Embed variation, the string version would look like this:
+The `isActive` property would then look like this:
 
+```js
+isActive: [ 'providerNameSlug' ];
 ```
-isActive: [ 'providerNameSlug' ]
+
+This will cause the block instance value for `providerNameSlug` to be compared to the value declared in the variation's declaration (the values in the code snippet above) to determine which embed variation is active.
+
+Nested object paths are also supported since WordPress `6.6.0`. For example, consider a block variation that has a `query` object as an attribute. It is possible to determine if the variation is active solely based on that object's `postType` property (while ignoring all its other properties):
+
+```js
+isActive: [ 'query.postType' ];
 ```
 
-### Caveats to using `isActive`
+The function version of this property accepts a block instance's `blockAttributes` as the first argument, and the `variationAttributes` declared for a variation as the second argument. These arguments can be used to determine if a variation is active by comparing them and returning a `true` or `false` (indicating whether this variation is inactive for this block instance).
 
-The `isActive` property can return false positives if multiple variations exist for a specific block and the `isActive` checks are not specific enough. To demonstrate this, consider the following example:
+Using the same example for the embed block, the function version would look like this:
 
 ```js
-wp.blocks.registerBlockVariation(
-	'core/paragraph',
-	{
-		name: 'paragraph-red',
-		title: 'Red Paragraph',
-		attributes: {
-			textColor: 'vivid-red',
-		},
-		isActive: [ 'textColor' ],
-	}
-);
+isActive: ( blockAttributes, variationAttributes ) =>
+	blockAttributes.providerNameSlug === variationAttributes.providerNameSlug,
+```
 
-wp.blocks.registerBlockVariation(
-	'core/paragraph',
-	{
-		name: 'paragraph-red-grey',
-		title: 'Red/Grey Paragraph',
-		attributes: {
-			textColor: 'vivid-red',
-			backgroundColor: 'cyan-bluish-gray'
-		},
-		isActive: [ 'textColor', 'backgroundColor' ]
-	}
-);
+### Specificity of `isActive` matches
+
+_Note: Improved handling since WordPress `6.6.0`._
+
+If there are multiple variations whose `isActive` check matches a given block instance, and all of them are string arrays, then the variation with the highest _specificity_ will be chosen. Consider the following example:
+
+```js
+wp.blocks.registerBlockVariation( 'core/paragraph', {
+	name: 'paragraph-red',
+	title: 'Red Paragraph',
+	attributes: {
+		textColor: 'vivid-red',
+	},
+	isActive: [ 'textColor' ],
+} );
+
+wp.blocks.registerBlockVariation( 'core/paragraph', {
+	name: 'paragraph-red-grey',
+	title: 'Red/Grey Paragraph',
+	attributes: {
+		textColor: 'vivid-red',
+		backgroundColor: 'cyan-bluish-gray',
+	},
+	isActive: [ 'textColor', 'backgroundColor' ],
+} );
 ```
 
-The `isActive` check on both variations tests the `textColor`, but each variations uses `vivid-red`. Since the `paragraph-red` variation is registered first, once the `paragraph-red-grey` variation is inserted into the Editor, it will have the title `Red Paragraph` instead of `Red/Grey Paragraph`. As soon as the Editor finds a match, it stops checking.
+If a block instance has attributes `textColor: vivid-red` and `backgroundColor: cyan-bluish-gray`, both variations' `isActive` criterion will match that block instance. In this case, the more _specific_ match will be determined to be the active variation, where specificity is calculated as the length of each `isActive` array. This means that the `Red/Grey Paragraph` will be shown as the active variation.
 
-There have been [discussions](https://github.com/WordPress/gutenberg/issues/41303#issuecomment-1526193087) around how the API can be improved, but as of WordPress 6.3, this remains an issue to watch out for.
\ No newline at end of file
+Note that specificity cannot be determined for a matching variation if its `isActive` property is a function rather than a `string[]`. In this case, the first matching variation will be determined to be the active variation. For this reason, it is generally recommended to use a `string[]` rather than a `function` for the `isActive` property.
diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index c68bb419467f36..dd49d156857249 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -14,7 +14,7 @@ Display a date archive of your posts. ([Source](https://github.com/WordPress/gut
 
 -	**Name:** core/archives
 -	**Category:** widgets
--	**Supports:** align, spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align, interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** displayAsDropdown, showLabel, showPostCounts, type
 
 ## Audio
@@ -23,8 +23,8 @@ Embed a simple audio player. ([Source](https://github.com/WordPress/gutenberg/tr
 
 -	**Name:** core/audio
 -	**Category:** media
--	**Supports:** align, anchor, spacing (margin, padding)
--	**Attributes:** autoplay, caption, id, loop, preload, src
+-	**Supports:** align, anchor, interactivity (clientNavigation), spacing (margin, padding)
+-	**Attributes:** autoplay, blob, caption, id, loop, preload, src
 
 ## Avatar
 
@@ -32,17 +32,17 @@ Add a user’s avatar. ([Source](https://github.com/WordPress/gutenberg/tree/tru
 
 -	**Name:** core/avatar
 -	**Category:** theme
--	**Supports:** align, color (~~background~~, ~~text~~), spacing (margin, padding), ~~alignWide~~, ~~html~~
+-	**Supports:** align, color (~~background~~, ~~text~~), interactivity (clientNavigation), spacing (margin, padding), ~~alignWide~~, ~~html~~
 -	**Attributes:** isLink, linkTarget, size, userId
 
 ## Pattern
 
-Create and save content to reuse across your site. Update the pattern, and the changes apply everywhere it’s used. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/block))
+Reuse this design across your site. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/block))
 
 -	**Name:** core/block
 -	**Category:** reusable
--	**Supports:** ~~customClassName~~, ~~html~~, ~~inserter~~, ~~renaming~~
--	**Attributes:** ref
+-	**Supports:** interactivity (clientNavigation), ~~customClassName~~, ~~html~~, ~~inserter~~, ~~renaming~~
+-	**Attributes:** content, ref
 
 ## Button
 
@@ -51,7 +51,7 @@ Prompt visitors to take action with a button-style link. ([Source](https://githu
 -	**Name:** core/button
 -	**Category:** design
 -	**Parent:** core/buttons
--	**Supports:** anchor, color (background, gradients, text), shadow, spacing (padding), typography (fontSize, lineHeight), ~~alignWide~~, ~~align~~, ~~reusable~~
+-	**Supports:** anchor, color (background, gradients, text), interactivity (clientNavigation), shadow (), spacing (padding), splitting, typography (fontSize, lineHeight), ~~alignWide~~, ~~align~~, ~~reusable~~
 -	**Attributes:** backgroundColor, gradient, linkTarget, placeholder, rel, tagName, text, textAlign, textColor, title, type, url, width
 
 ## Buttons
@@ -60,8 +60,8 @@ Prompt visitors to take action with a group of button-style links. ([Source](htt
 
 -	**Name:** core/buttons
 -	**Category:** design
--	**Supports:** align (full, wide), anchor, layout (default, ~~allowInheriting~~, ~~allowSwitching~~), spacing (blockGap, margin), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** 
+-	**Allowed Blocks:** core/button
+-	**Supports:** align (full, wide), anchor, color (background, gradients, ~~text~~), interactivity (clientNavigation), layout (default, ~~allowInheriting~~, ~~allowSwitching~~), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
 
 ## Calendar
 
@@ -69,17 +69,17 @@ A calendar of your site’s posts. ([Source](https://github.com/WordPress/gutenb
 
 -	**Name:** core/calendar
 -	**Category:** widgets
--	**Supports:** align, color (background, link, text), typography (fontSize, lineHeight)
+-	**Supports:** align, color (background, link, text), interactivity (clientNavigation), typography (fontSize, lineHeight)
 -	**Attributes:** month, year
 
-## Categories List
+## Terms List
 
-Display a list of all categories. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/categories))
+Display a list of all terms of a given taxonomy. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/categories))
 
 -	**Name:** core/categories
 -	**Category:** widgets
--	**Supports:** align, spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** displayAsDropdown, showEmpty, showHierarchy, showOnlyTopLevel, showPostCounts
+-	**Supports:** align, interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Attributes:** displayAsDropdown, label, showEmpty, showHierarchy, showLabel, showOnlyTopLevel, showPostCounts, taxonomy
 
 ## Code
 
@@ -87,7 +87,7 @@ Display code snippets that respect your spacing and tabs. ([Source](https://gith
 
 -	**Name:** core/code
 -	**Category:** text
--	**Supports:** align (wide), anchor, color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight)
+-	**Supports:** align (wide), anchor, color (background, gradients, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** content
 
 ## Column
@@ -97,7 +97,7 @@ A single column within a columns block. ([Source](https://github.com/WordPress/g
 -	**Name:** core/column
 -	**Category:** design
 -	**Parent:** core/columns
--	**Supports:** anchor, color (background, button, gradients, heading, link, text), layout, spacing (blockGap, padding), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Supports:** anchor, color (background, button, gradients, heading, link, text), interactivity (clientNavigation), layout, shadow, spacing (blockGap, padding), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** allowedBlocks, templateLock, verticalAlignment, width
 
 ## Columns
@@ -106,7 +106,8 @@ Display content in multiple columns, with blocks added to each column. ([Source]
 
 -	**Name:** core/columns
 -	**Category:** design
--	**Supports:** align (full, wide), anchor, color (background, button, gradients, heading, link, text), layout (default, ~~allowEditing~~, ~~allowInheriting~~, ~~allowSwitching~~), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Allowed Blocks:** core/column
+-	**Supports:** align (full, wide), anchor, color (background, button, gradients, heading, link, text), interactivity (clientNavigation), layout (default, ~~allowEditing~~, ~~allowInheriting~~, ~~allowSwitching~~), shadow, spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** isStackedOnMobile, templateLock, verticalAlignment
 
 ## Comment Author Avatar (deprecated)
@@ -116,7 +117,8 @@ This block is deprecated. Please use the Avatar block instead. ([Source](https:/
 -	**Name:** core/comment-author-avatar
 -	**Experimental:** fse
 -	**Category:** theme
--	**Supports:** color (background, ~~text~~), spacing (margin, padding), ~~html~~, ~~inserter~~
+-	**Ancestor:** core/comment-template
+-	**Supports:** color (background, ~~text~~), interactivity (clientNavigation), spacing (margin, padding), ~~html~~, ~~inserter~~
 -	**Attributes:** height, width
 
 ## Comment Author Name
@@ -125,7 +127,8 @@ Displays the name of the author of the comment. ([Source](https://github.com/Wor
 
 -	**Name:** core/comment-author-name
 -	**Category:** theme
--	**Supports:** color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Ancestor:** core/comment-template
+-	**Supports:** color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** isLink, linkTarget, textAlign
 
 ## Comment Content
@@ -134,6 +137,7 @@ Displays the contents of a comment. ([Source](https://github.com/WordPress/guten
 
 -	**Name:** core/comment-content
 -	**Category:** theme
+-	**Ancestor:** core/comment-template
 -	**Supports:** color (background, gradients, link, text), spacing (padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** textAlign
 
@@ -143,7 +147,8 @@ Displays the date on which the comment was posted. ([Source](https://github.com/
 
 -	**Name:** core/comment-date
 -	**Category:** theme
--	**Supports:** color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Ancestor:** core/comment-template
+-	**Supports:** color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** format, isLink
 
 ## Comment Edit Link
@@ -152,7 +157,8 @@ Displays a link to edit the comment in the WordPress Dashboard. This link is onl
 
 -	**Name:** core/comment-edit-link
 -	**Category:** theme
--	**Supports:** color (background, gradients, link, ~~text~~), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Ancestor:** core/comment-template
+-	**Supports:** color (background, gradients, link, ~~text~~), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** linkTarget, textAlign
 
 ## Comment Reply Link
@@ -161,6 +167,7 @@ Displays a link to reply to a comment. ([Source](https://github.com/WordPress/gu
 
 -	**Name:** core/comment-reply-link
 -	**Category:** theme
+-	**Ancestor:** core/comment-template
 -	**Supports:** color (background, gradients, link, ~~text~~), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** textAlign
 
@@ -171,8 +178,7 @@ Contains the block elements used to display a comment, like the title, date, aut
 -	**Name:** core/comment-template
 -	**Category:** design
 -	**Parent:** core/comments
--	**Supports:** align, spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
--	**Attributes:** 
+-	**Supports:** align, interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 
 ## Comments
 
@@ -190,7 +196,8 @@ Displays a paginated navigation to next/previous set of comments, when applicabl
 -	**Name:** core/comments-pagination
 -	**Category:** theme
 -	**Parent:** core/comments
--	**Supports:** align, color (background, gradients, link, text), layout (default, ~~allowInheriting~~, ~~allowSwitching~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Allowed Blocks:** core/comments-pagination-previous, core/comments-pagination-numbers, core/comments-pagination-next
+-	**Supports:** align, color (background, gradients, link, text), interactivity (clientNavigation), layout (default, ~~allowInheriting~~, ~~allowSwitching~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** paginationArrow
 
 ## Comments Next Page
@@ -200,7 +207,7 @@ Displays the next comment's page link. ([Source](https://github.com/WordPress/gu
 -	**Name:** core/comments-pagination-next
 -	**Category:** theme
 -	**Parent:** core/comments-pagination
--	**Supports:** color (background, gradients, ~~text~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Supports:** color (background, gradients, ~~text~~), interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** label
 
 ## Comments Page Numbers
@@ -210,8 +217,7 @@ Displays a list of page numbers for comments pagination. ([Source](https://githu
 -	**Name:** core/comments-pagination-numbers
 -	**Category:** theme
 -	**Parent:** core/comments-pagination
--	**Supports:** color (background, gradients, ~~text~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
--	**Attributes:** 
+-	**Supports:** color (background, gradients, ~~text~~), interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 
 ## Comments Previous Page
 
@@ -220,17 +226,18 @@ Displays the previous comment's page link. ([Source](https://github.com/WordPres
 -	**Name:** core/comments-pagination-previous
 -	**Category:** theme
 -	**Parent:** core/comments-pagination
--	**Supports:** color (background, gradients, ~~text~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Supports:** color (background, gradients, ~~text~~), interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** label
 
 ## Comments Title
 
-Displays a title with the number of comments ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/comments-title))
+Displays a title with the number of comments. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/comments-title))
 
 -	**Name:** core/comments-title
 -	**Category:** theme
--	**Supports:** align, color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~anchor~~, ~~html~~
--	**Attributes:** level, showCommentsCount, showPostTitle, textAlign
+-	**Ancestor:** core/comments
+-	**Supports:** align, color (background, gradients, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~anchor~~, ~~html~~
+-	**Attributes:** level, levelOptions, showCommentsCount, showPostTitle, textAlign
 
 ## Cover
 
@@ -238,8 +245,8 @@ Add an image or video with a text overlay. ([Source](https://github.com/WordPres
 
 -	**Name:** core/cover
 -	**Category:** media
--	**Supports:** align, anchor, color (heading, text, ~~background~~, ~~enableContrastChecker~~), layout (~~allowJustification~~), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** allowedBlocks, alt, backgroundType, contentPosition, customGradient, customOverlayColor, dimRatio, focalPoint, gradient, hasParallax, id, isDark, isRepeated, isUserOverlayColor, minHeight, minHeightUnit, overlayColor, tagName, templateLock, url, useFeaturedImage
+-	**Supports:** align, anchor, color (heading, text, ~~background~~, ~~enableContrastChecker~~), dimensions (aspectRatio), interactivity (clientNavigation), layout (~~allowJustification~~), shadow, spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Attributes:** allowedBlocks, alt, backgroundType, contentPosition, customGradient, customOverlayColor, dimRatio, focalPoint, gradient, hasParallax, id, isDark, isRepeated, isUserOverlayColor, minHeight, minHeightUnit, overlayColor, sizeSlug, tagName, templateLock, url, useFeaturedImage
 
 ## Details
 
@@ -247,7 +254,7 @@ Hide and show additional content. ([Source](https://github.com/WordPress/gutenbe
 
 -	**Name:** core/details
 -	**Category:** text
--	**Supports:** align (full, wide), color (background, gradients, link, text), layout (~~allowEditing~~), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align (full, wide), color (background, gradients, link, text), interactivity (clientNavigation), layout (~~allowEditing~~), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** showContent, summary
 
 ## Embed
@@ -256,7 +263,7 @@ Add a block that displays content pulled from other sites, like Twitter or YouTu
 
 -	**Name:** core/embed
 -	**Category:** embed
--	**Supports:** align, spacing (margin)
+-	**Supports:** align, interactivity (clientNavigation), spacing (margin)
 -	**Attributes:** allowResponsive, caption, previewable, providerNameSlug, responsive, type, url
 
 ## File
@@ -266,7 +273,7 @@ Add a link to a downloadable file. ([Source](https://github.com/WordPress/gutenb
 -	**Name:** core/file
 -	**Category:** media
 -	**Supports:** align, anchor, color (background, gradients, link, ~~text~~), interactivity, spacing (margin, padding)
--	**Attributes:** displayPreview, downloadButtonText, fileId, fileName, href, id, previewHeight, showDownloadButton, textLinkHref, textLinkTarget
+-	**Attributes:** blob, displayPreview, downloadButtonText, fileId, fileName, href, id, previewHeight, showDownloadButton, textLinkHref, textLinkTarget
 
 ## Footnotes
 
@@ -274,8 +281,7 @@ Display footnotes added to the page. ([Source](https://github.com/WordPress/gute
 
 -	**Name:** core/footnotes
 -	**Category:** text
--	**Supports:** color (background, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~, ~~inserter~~, ~~multiple~~, ~~reusable~~
--	**Attributes:** 
+-	**Supports:** color (background, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~, ~~inserter~~, ~~multiple~~, ~~reusable~~
 
 ## Form
 
@@ -284,6 +290,7 @@ A form. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/blo
 -	**Name:** core/form
 -	**Experimental:** true
 -	**Category:** common
+-	**Allowed Blocks:** core/paragraph, core/heading, core/form-input, core/form-submit-button, core/form-submission-notification, core/group, core/columns
 -	**Supports:** anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
 -	**Attributes:** action, email, method, submissionMethod
 
@@ -294,6 +301,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Name:** core/form-input
 -	**Experimental:** true
 -	**Category:** common
+-	**Ancestor:** core/form
 -	**Supports:** anchor, spacing (margin), ~~reusable~~
 -	**Attributes:** inlineLabel, label, name, placeholder, required, type, value, visibilityPermissions
 
@@ -304,7 +312,7 @@ Provide a notification message after the form has been submitted. ([Source](http
 -	**Name:** core/form-submission-notification
 -	**Experimental:** true
 -	**Category:** common
--	**Supports:** 
+-	**Ancestor:** core/form
 -	**Attributes:** type
 
 ## Form Submit Button
@@ -314,8 +322,8 @@ A submission button for forms. ([Source](https://github.com/WordPress/gutenberg/
 -	**Name:** core/form-submit-button
 -	**Experimental:** true
 -	**Category:** common
--	**Supports:** 
--	**Attributes:** 
+-	**Ancestor:** core/form
+-	**Allowed Blocks:** core/buttons, core/button
 
 ## Classic
 
@@ -332,8 +340,9 @@ Display multiple images in a rich gallery. ([Source](https://github.com/WordPres
 
 -	**Name:** core/gallery
 -	**Category:** media
--	**Supports:** align, anchor, color (background, gradients, ~~text~~), layout (default, ~~allowEditing~~, ~~allowInheriting~~, ~~allowSwitching~~), spacing (blockGap, margin, padding), units (em, px, rem, vh, vw), ~~html~~
--	**Attributes:** allowResize, caption, columns, fixedHeight, ids, imageCrop, images, linkTarget, linkTo, shortCodeTransforms, sizeSlug
+-	**Allowed Blocks:** core/image
+-	**Supports:** align, anchor, color (background, gradients, ~~text~~), interactivity (clientNavigation), layout (default, ~~allowEditing~~, ~~allowInheriting~~, ~~allowSwitching~~), spacing (blockGap, margin, padding), units (em, px, rem, vh, vw), ~~html~~
+-	**Attributes:** allowResize, caption, columns, fixedHeight, ids, imageCrop, images, linkTarget, linkTo, randomOrder, shortCodeTransforms, sizeSlug
 
 ## Group
 
@@ -341,7 +350,7 @@ Gather blocks in a layout container. ([Source](https://github.com/WordPress/gute
 
 -	**Name:** core/group
 -	**Category:** design
--	**Supports:** align (full, wide), anchor, ariaLabel, background (backgroundImage), color (background, button, gradients, heading, link, text), dimensions (minHeight), layout (allowSizingOnChildren), position (sticky), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align (full, wide), anchor, ariaLabel, background (backgroundImage, backgroundSize), color (background, button, gradients, heading, link, text), dimensions (minHeight), interactivity (clientNavigation), layout (allowSizingOnChildren), position (sticky), shadow, spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** allowedBlocks, tagName, templateLock
 
 ## Heading
@@ -350,8 +359,8 @@ Introduce new sections and organize content to help visitors (and search engines
 
 -	**Name:** core/heading
 -	**Category:** text
--	**Supports:** __unstablePasteTextInline, align (full, wide), anchor, className, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight)
--	**Attributes:** content, level, placeholder, textAlign
+-	**Supports:** __unstablePasteTextInline, align (full, wide), anchor, className, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), splitting, typography (fontSize, lineHeight)
+-	**Attributes:** content, level, levelOptions, placeholder, textAlign
 
 ## Home Link
 
@@ -360,7 +369,7 @@ Create a link that always points to the homepage of the site. Usually not necess
 -	**Name:** core/home-link
 -	**Category:** design
 -	**Parent:** core/navigation
--	**Supports:** typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Supports:** interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** label
 
 ## Custom HTML
@@ -369,7 +378,7 @@ Add custom HTML code and preview it as you edit. ([Source](https://github.com/Wo
 
 -	**Name:** core/html
 -	**Category:** widgets
--	**Supports:** ~~className~~, ~~customClassName~~, ~~html~~
+-	**Supports:** interactivity (clientNavigation), ~~className~~, ~~customClassName~~, ~~html~~
 -	**Attributes:** content
 
 ## Image
@@ -378,8 +387,8 @@ Insert an image to make a visual statement. ([Source](https://github.com/WordPre
 
 -	**Name:** core/image
 -	**Category:** media
--	**Supports:** align (center, full, left, right, wide), anchor, color (~~background~~, ~~text~~), filter (duotone), interactivity
--	**Attributes:** alt, aspectRatio, caption, height, href, id, lightbox, linkClass, linkDestination, linkTarget, rel, scale, sizeSlug, title, url, width
+-	**Supports:** align (center, full, left, right, wide), anchor, color (~~background~~, ~~text~~), filter (duotone), interactivity, shadow (), spacing (margin)
+-	**Attributes:** alt, aspectRatio, blob, caption, height, href, id, lightbox, linkClass, linkDestination, linkTarget, rel, scale, sizeSlug, title, url, width
 
 ## Latest Comments
 
@@ -387,7 +396,7 @@ Display a list of your most recent comments. ([Source](https://github.com/WordPr
 
 -	**Name:** core/latest-comments
 -	**Category:** widgets
--	**Supports:** align, spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** commentsToShow, displayAvatar, displayDate, displayExcerpt
 
 ## Latest Posts
@@ -396,26 +405,28 @@ Display a list of your most recent posts. ([Source](https://github.com/WordPress
 
 -	**Name:** core/latest-posts
 -	**Category:** widgets
--	**Supports:** align, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** addLinkToFeaturedImage, categories, columns, displayAuthor, displayFeaturedImage, displayPostContent, displayPostContentRadio, displayPostDate, excerptLength, featuredImageAlign, featuredImageSizeHeight, featuredImageSizeSlug, featuredImageSizeWidth, order, orderBy, postLayout, postsToShow, selectedAuthor
 
 ## List
 
-Create a bulleted or numbered list. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/list))
+An organized collection of items displayed in a specific order. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/list))
 
 -	**Name:** core/list
 -	**Category:** text
--	**Supports:** __unstablePasteTextInline, anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
+-	**Allowed Blocks:** core/list-item
+-	**Supports:** __unstablePasteTextInline, anchor, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** ordered, placeholder, reversed, start, type, values
 
 ## List item
 
-Create a list item. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/list-item))
+An individual item within a list. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/list-item))
 
 -	**Name:** core/list-item
 -	**Category:** text
 -	**Parent:** core/list
--	**Supports:** spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
+-	**Allowed Blocks:** core/list
+-	**Supports:** anchor, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), splitting, typography (fontSize, lineHeight), ~~className~~
 -	**Attributes:** content, placeholder
 
 ## Login/out
@@ -424,7 +435,7 @@ Show login & logout links. ([Source](https://github.com/WordPress/gutenberg/tree
 
 -	**Name:** core/loginout
 -	**Category:** theme
--	**Supports:** className, spacing (margin, padding), typography (fontSize, lineHeight)
+-	**Supports:** className, color (background, gradients, link, ~~text~~), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** displayLoginAsForm, redirectToCurrent
 
 ## Media & Text
@@ -433,8 +444,8 @@ Set media and words side-by-side for a richer layout. ([Source](https://github.c
 
 -	**Name:** core/media-text
 -	**Category:** media
--	**Supports:** align (full, wide), anchor, color (background, gradients, heading, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** align, allowedBlocks, focalPoint, href, imageFill, isStackedOnMobile, linkClass, linkDestination, linkTarget, mediaAlt, mediaId, mediaLink, mediaPosition, mediaSizeSlug, mediaType, mediaUrl, mediaWidth, rel, verticalAlignment
+-	**Supports:** align (full, wide), anchor, color (background, gradients, heading, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Attributes:** align, allowedBlocks, focalPoint, href, imageFill, isStackedOnMobile, linkClass, linkDestination, linkTarget, mediaAlt, mediaId, mediaLink, mediaPosition, mediaSizeSlug, mediaType, mediaUrl, mediaWidth, rel, useFeaturedImage, verticalAlignment
 
 ## Unsupported
 
@@ -442,7 +453,7 @@ Your site doesn’t include support for this block. ([Source](https://github.com
 
 -	**Name:** core/missing
 -	**Category:** text
--	**Supports:** ~~className~~, ~~customClassName~~, ~~html~~, ~~inserter~~, ~~reusable~~
+-	**Supports:** interactivity (clientNavigation), ~~className~~, ~~customClassName~~, ~~html~~, ~~inserter~~, ~~reusable~~
 -	**Attributes:** originalContent, originalName, originalUndelimitedContent
 
 ## More
@@ -451,7 +462,7 @@ Content before this block will be shown in the excerpt on your archives page. ([
 
 -	**Name:** core/more
 -	**Category:** design
--	**Supports:** ~~className~~, ~~customClassName~~, ~~html~~, ~~multiple~~
+-	**Supports:** interactivity (clientNavigation), ~~className~~, ~~customClassName~~, ~~html~~, ~~multiple~~
 -	**Attributes:** customText, noTeaser
 
 ## Navigation
@@ -460,6 +471,7 @@ A collection of blocks that allow visitors to get around your site. ([Source](ht
 
 -	**Name:** core/navigation
 -	**Category:** theme
+-	**Allowed Blocks:** core/navigation-link, core/search, core/social-links, core/page-list, core/spacer, core/home-link, core/site-title, core/site-logo, core/navigation-submenu, core/loginout, core/buttons
 -	**Supports:** align (full, wide), ariaLabel, inserter, interactivity, layout (allowSizingOnChildren, default, ~~allowInheriting~~, ~~allowSwitching~~, ~~allowVerticalAlignment~~), spacing (blockGap, units), typography (fontSize, lineHeight), ~~html~~, ~~renaming~~
 -	**Attributes:** __unstableLocation, backgroundColor, customBackgroundColor, customOverlayBackgroundColor, customOverlayTextColor, customTextColor, hasIcon, icon, maxNestingLevel, openSubmenusOnClick, overlayBackgroundColor, overlayMenu, overlayTextColor, ref, rgbBackgroundColor, rgbTextColor, showSubmenuIcon, templateLock, textColor
 
@@ -470,7 +482,8 @@ Add a page, link, or another item to your navigation. ([Source](https://github.c
 -	**Name:** core/navigation-link
 -	**Category:** design
 -	**Parent:** core/navigation
--	**Supports:** typography (fontSize, lineHeight), ~~html~~, ~~renaming~~, ~~reusable~~
+-	**Allowed Blocks:** core/navigation-link, core/navigation-submenu, core/page-list
+-	**Supports:** interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~renaming~~, ~~reusable~~
 -	**Attributes:** description, id, isTopLevelLink, kind, label, opensInNewTab, rel, title, type, url
 
 ## Submenu
@@ -480,7 +493,7 @@ Add a submenu to your navigation. ([Source](https://github.com/WordPress/gutenbe
 -	**Name:** core/navigation-submenu
 -	**Category:** design
 -	**Parent:** core/navigation
--	**Supports:** ~~html~~, ~~reusable~~
+-	**Supports:** interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** description, id, isTopLevelItem, kind, label, opensInNewTab, rel, title, type, url
 
 ## Page Break
@@ -490,8 +503,7 @@ Separate your content into a multi-page experience. ([Source](https://github.com
 -	**Name:** core/nextpage
 -	**Category:** design
 -	**Parent:** core/post-content
--	**Supports:** ~~className~~, ~~customClassName~~, ~~html~~
--	**Attributes:** 
+-	**Supports:** interactivity (clientNavigation), ~~className~~, ~~customClassName~~, ~~html~~
 
 ## Page List
 
@@ -499,7 +511,8 @@ Display a list of all pages. ([Source](https://github.com/WordPress/gutenberg/tr
 
 -	**Name:** core/page-list
 -	**Category:** widgets
--	**Supports:** typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Allowed Blocks:** core/page-list-item
+-	**Supports:** interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** isNested, parentPageID
 
 ## Page List Item
@@ -509,7 +522,7 @@ Displays a page inside a list of all pages. ([Source](https://github.com/WordPre
 -	**Name:** core/page-list-item
 -	**Category:** widgets
 -	**Parent:** core/page-list
--	**Supports:** ~~html~~, ~~inserter~~, ~~lock~~, ~~reusable~~
+-	**Supports:** interactivity (clientNavigation), ~~html~~, ~~inserter~~, ~~lock~~, ~~reusable~~
 -	**Attributes:** hasChildren, id, label, link, title
 
 ## Paragraph
@@ -518,7 +531,7 @@ Start with the basic building block of all narrative. ([Source](https://github.c
 
 -	**Name:** core/paragraph
 -	**Category:** text
--	**Supports:** __unstablePasteTextInline, anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
+-	**Supports:** __unstablePasteTextInline, anchor, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), splitting, typography (fontSize, lineHeight), ~~className~~
 -	**Attributes:** align, content, direction, dropCap, placeholder
 
 ## Pattern placeholder
@@ -527,7 +540,7 @@ Show a block pattern. ([Source](https://github.com/WordPress/gutenberg/tree/trun
 
 -	**Name:** core/pattern
 -	**Category:** theme
--	**Supports:** ~~html~~, ~~inserter~~, ~~renaming~~
+-	**Supports:** interactivity (clientNavigation), ~~html~~, ~~inserter~~, ~~renaming~~
 -	**Attributes:** slug
 
 ## Author
@@ -536,7 +549,7 @@ Display post author details such as name, avatar, and bio. ([Source](https://git
 
 -	**Name:** core/post-author
 -	**Category:** theme
--	**Supports:** color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** avatarSize, byline, isLink, linkTarget, showAvatar, showBio, textAlign
 
 ## Author Biography
@@ -545,7 +558,7 @@ The author biography. ([Source](https://github.com/WordPress/gutenberg/tree/trun
 
 -	**Name:** core/post-author-biography
 -	**Category:** theme
--	**Supports:** color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight)
+-	**Supports:** color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** textAlign
 
 ## Author Name
@@ -554,7 +567,7 @@ The author name. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/pac
 
 -	**Name:** core/post-author-name
 -	**Category:** theme
--	**Supports:** color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** isLink, linkTarget, textAlign
 
 ## Comment (deprecated)
@@ -564,7 +577,8 @@ This block is deprecated. Please use the Comments block instead. ([Source](https
 -	**Name:** core/post-comment
 -	**Experimental:** fse
 -	**Category:** theme
--	**Supports:** ~~html~~, ~~inserter~~
+-	**Allowed Blocks:** core/avatar, core/comment-author-name, core/comment-content, core/comment-date, core/comment-edit-link, core/comment-reply-link
+-	**Supports:** interactivity (clientNavigation), ~~html~~, ~~inserter~~
 -	**Attributes:** commentId
 
 ## Comments Count
@@ -574,7 +588,7 @@ Display a post's comments count. ([Source](https://github.com/WordPress/gutenber
 -	**Name:** core/post-comments-count
 -	**Experimental:** fse
 -	**Category:** theme
--	**Supports:** color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** color (background, gradients, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** textAlign
 
 ## Comments Form
@@ -593,7 +607,7 @@ Displays the link to the current post comments. ([Source](https://github.com/Wor
 -	**Name:** core/post-comments-link
 -	**Experimental:** fse
 -	**Category:** theme
--	**Supports:** color (background, link, ~~text~~), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** color (background, link, ~~text~~), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** textAlign
 
 ## Content
@@ -602,8 +616,7 @@ Displays the contents of a post or page. ([Source](https://github.com/WordPress/
 
 -	**Name:** core/post-content
 -	**Category:** theme
--	**Supports:** align (full, wide), color (background, gradients, link, text), dimensions (minHeight), layout, spacing (blockGap), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** 
+-	**Supports:** align (full, wide), background (backgroundImage, backgroundSize), color (background, gradients, link, text), dimensions (minHeight), layout, spacing (blockGap, padding), typography (fontSize, lineHeight), ~~html~~
 
 ## Date
 
@@ -611,7 +624,7 @@ Display the publish date for an entry such as a post or page. ([Source](https://
 
 -	**Name:** core/post-date
 -	**Category:** theme
--	**Supports:** color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** displayType, format, isLink, textAlign
 
 ## Excerpt
@@ -620,7 +633,7 @@ Display the excerpt. ([Source](https://github.com/WordPress/gutenberg/tree/trunk
 
 -	**Name:** core/post-excerpt
 -	**Category:** theme
--	**Supports:** color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** excerptLength, moreText, showMoreOnNewLine, textAlign
 
 ## Featured Image
@@ -629,8 +642,8 @@ Display a post's featured image. ([Source](https://github.com/WordPress/gutenber
 
 -	**Name:** core/post-featured-image
 -	**Category:** theme
--	**Supports:** align (center, full, left, right, wide), color (~~background~~, ~~text~~), spacing (margin, padding), ~~html~~
--	**Attributes:** aspectRatio, customGradient, customOverlayColor, dimRatio, gradient, height, isLink, linkTarget, overlayColor, rel, scale, sizeSlug, width
+-	**Supports:** align (center, full, left, right, wide), color (~~background~~, ~~text~~), filter (duotone), interactivity (clientNavigation), shadow (), spacing (margin, padding), ~~html~~
+-	**Attributes:** aspectRatio, customGradient, customOverlayColor, dimRatio, gradient, height, isLink, linkTarget, overlayColor, rel, scale, sizeSlug, useFirstImageFromPost, width
 
 ## Post Navigation Link
 
@@ -638,8 +651,8 @@ Displays the next or previous post link that is adjacent to the current post. ([
 
 -	**Name:** core/post-navigation-link
 -	**Category:** theme
--	**Supports:** color (background, link, text), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
--	**Attributes:** arrow, label, linkLabel, showTitle, textAlign, type
+-	**Supports:** color (background, link, text), interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Attributes:** arrow, label, linkLabel, showTitle, taxonomy, textAlign, type
 
 ## Post Template
 
@@ -648,8 +661,7 @@ Contains the block elements used to render a post, like the title, date, feature
 -	**Name:** core/post-template
 -	**Category:** theme
 -	**Parent:** core/query
--	**Supports:** align (full, wide), color (background, gradients, link, text), layout, spacing (blockGap), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
--	**Attributes:** 
+-	**Supports:** align (full, wide), color (background, gradients, link, text), interactivity (clientNavigation), layout, spacing (blockGap), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 
 ## Post Terms
 
@@ -657,7 +669,7 @@ Post terms. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages
 
 -	**Name:** core/post-terms
 -	**Category:** theme
--	**Supports:** color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** prefix, separator, suffix, term, textAlign
 
 ## Time To Read
@@ -667,7 +679,7 @@ Show minutes required to finish reading the post. ([Source](https://github.com/W
 -	**Name:** core/post-time-to-read
 -	**Experimental:** true
 -	**Category:** theme
--	**Supports:** color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** color (background, gradients, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** textAlign
 
 ## Title
@@ -676,8 +688,8 @@ Displays the title of a post, page, or any other content-type. ([Source](https:/
 
 -	**Name:** core/post-title
 -	**Category:** theme
--	**Supports:** align (full, wide), color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** isLink, level, linkTarget, rel, textAlign
+-	**Supports:** align (full, wide), color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Attributes:** isLink, level, levelOptions, linkTarget, rel, textAlign
 
 ## Preformatted
 
@@ -685,7 +697,7 @@ Add text that respects your spacing and tabs, and also allows styling. ([Source]
 
 -	**Name:** core/preformatted
 -	**Category:** text
--	**Supports:** anchor, color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight)
+-	**Supports:** anchor, color (background, gradients, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** content
 
 ## Pullquote
@@ -694,7 +706,7 @@ Give special visual emphasis to a quote from your text. ([Source](https://github
 
 -	**Name:** core/pullquote
 -	**Category:** text
--	**Supports:** align (full, left, right, wide), anchor, color (background, gradients, link, text), typography (fontSize, lineHeight)
+-	**Supports:** align (full, left, right, wide), anchor, background (backgroundImage, backgroundSize), color (background, gradients, link, text), dimensions (minHeight), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** citation, textAlign, value
 
 ## Query Loop
@@ -703,7 +715,7 @@ An advanced block that allows displaying post types based on different query par
 
 -	**Name:** core/query
 -	**Category:** theme
--	**Supports:** align (full, wide), layout, ~~html~~
+-	**Supports:** align (full, wide), interactivity, layout, ~~html~~
 -	**Attributes:** enhancedPagination, namespace, query, queryId, tagName
 
 ## No results
@@ -713,8 +725,7 @@ Contains the block elements used to render content when no query results are fou
 -	**Name:** core/query-no-results
 -	**Category:** theme
 -	**Parent:** core/query
--	**Supports:** align, color (background, gradients, link, text), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
--	**Attributes:** 
+-	**Supports:** align, color (background, gradients, link, text), interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 
 ## Pagination
 
@@ -722,8 +733,9 @@ Displays a paginated navigation to next/previous set of posts, when applicable.
 
 -	**Name:** core/query-pagination
 -	**Category:** theme
--	**Parent:** core/query
--	**Supports:** align, color (background, gradients, link, text), layout (default, ~~allowInheriting~~, ~~allowSwitching~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Ancestor:** core/query
+-	**Allowed Blocks:** core/query-pagination-previous, core/query-pagination-numbers, core/query-pagination-next
+-	**Supports:** align, color (background, gradients, link, text), interactivity (clientNavigation), layout (default, ~~allowInheriting~~, ~~allowSwitching~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** paginationArrow, showLabel
 
 ## Next Page
@@ -733,17 +745,17 @@ Displays the next posts page link. ([Source](https://github.com/WordPress/gutenb
 -	**Name:** core/query-pagination-next
 -	**Category:** theme
 -	**Parent:** core/query-pagination
--	**Supports:** color (background, gradients, ~~text~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Supports:** color (background, gradients, ~~text~~), interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** label
 
 ## Page Numbers
 
-Displays a list of page numbers for pagination ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/query-pagination-numbers))
+Displays a list of page numbers for pagination. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/query-pagination-numbers))
 
 -	**Name:** core/query-pagination-numbers
 -	**Category:** theme
 -	**Parent:** core/query-pagination
--	**Supports:** color (background, gradients, ~~text~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Supports:** color (background, gradients, ~~text~~), interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** midSize
 
 ## Previous Page
@@ -753,7 +765,7 @@ Displays the previous posts page link. ([Source](https://github.com/WordPress/gu
 -	**Name:** core/query-pagination-previous
 -	**Category:** theme
 -	**Parent:** core/query-pagination
--	**Supports:** color (background, gradients, ~~text~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
+-	**Supports:** color (background, gradients, ~~text~~), interactivity (clientNavigation), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
 -	**Attributes:** label
 
 ## Query Title
@@ -762,8 +774,8 @@ Display the query title. ([Source](https://github.com/WordPress/gutenberg/tree/t
 
 -	**Name:** core/query-title
 -	**Category:** theme
--	**Supports:** align (full, wide), color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** level, showPrefix, showSearchTerm, textAlign, type
+-	**Supports:** align (full, wide), color (background, gradients, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Attributes:** level, levelOptions, showPrefix, showSearchTerm, textAlign, type
 
 ## Quote
 
@@ -771,8 +783,8 @@ Give quoted text visual emphasis. "In quoting others, we cite ourselves." — Ju
 
 -	**Name:** core/quote
 -	**Category:** text
--	**Supports:** anchor, color (background, gradients, heading, link, text), layout (~~allowEditing~~), spacing (blockGap), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** align, citation, value
+-	**Supports:** align (full, left, right, wide), anchor, background (backgroundImage, backgroundSize), color (background, gradients, heading, link, text), dimensions (minHeight), interactivity (clientNavigation), layout (~~allowEditing~~), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Attributes:** citation, textAlign, value
 
 ## Read More
 
@@ -780,7 +792,7 @@ Displays the link of a post, page, or any other content-type. ([Source](https://
 
 -	**Name:** core/read-more
 -	**Category:** theme
--	**Supports:** color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** color (background, gradients, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** content, linkTarget
 
 ## RSS
@@ -789,7 +801,7 @@ Display entries from any RSS or Atom feed. ([Source](https://github.com/WordPres
 
 -	**Name:** core/rss
 -	**Category:** widgets
--	**Supports:** align, ~~html~~
+-	**Supports:** align, interactivity (clientNavigation), ~~html~~
 -	**Attributes:** blockLayout, columns, displayAuthor, displayDate, displayExcerpt, excerptLength, feedURL, itemsToShow
 
 ## Search
@@ -798,8 +810,8 @@ Help visitors find your content. ([Source](https://github.com/WordPress/gutenber
 
 -	**Name:** core/search
 -	**Category:** widgets
--	**Supports:** align (center, left, right), color (background, gradients, text), interactivity, typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** buttonBehavior, buttonPosition, buttonText, buttonUseIcon, isSearchFieldHidden, label, placeholder, query, showLabel, width, widthUnit
+-	**Supports:** align (center, left, right), color (background, gradients, text), interactivity, spacing (margin), typography (fontSize, lineHeight), ~~html~~
+-	**Attributes:** buttonPosition, buttonText, buttonUseIcon, isSearchFieldHidden, label, placeholder, query, showLabel, width, widthUnit
 
 ## Separator
 
@@ -807,7 +819,7 @@ Create a break between ideas or sections with a horizontal separator. ([Source](
 
 -	**Name:** core/separator
 -	**Category:** design
--	**Supports:** align (center, full, wide), anchor, color (background, gradients, ~~enableContrastChecker~~, ~~text~~), spacing (margin)
+-	**Supports:** align (center, full, wide), anchor, color (background, gradients, ~~enableContrastChecker~~, ~~text~~), interactivity (clientNavigation), spacing (margin)
 -	**Attributes:** opacity
 
 ## Shortcode
@@ -825,7 +837,7 @@ Display an image to represent this site. Update this block and the changes apply
 
 -	**Name:** core/site-logo
 -	**Category:** theme
--	**Supports:** align, color (~~background~~, ~~text~~), spacing (margin, padding), ~~alignWide~~, ~~html~~
+-	**Supports:** align, color (~~background~~, ~~text~~), interactivity (clientNavigation), spacing (margin, padding), ~~alignWide~~, ~~html~~
 -	**Attributes:** isLink, linkTarget, shouldSyncIcon, width
 
 ## Site Tagline
@@ -834,8 +846,8 @@ Describe in a few words what the site is about. The tagline can be used in searc
 
 -	**Name:** core/site-tagline
 -	**Category:** theme
--	**Supports:** align (full, wide), color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** textAlign
+-	**Supports:** align (full, wide), color (background, gradients, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Attributes:** level, levelOptions, textAlign
 
 ## Site Title
 
@@ -843,26 +855,27 @@ Displays the name of this site. Update the block, and the changes apply everywhe
 
 -	**Name:** core/site-title
 -	**Category:** theme
--	**Supports:** align (full, wide), color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
--	**Attributes:** isLink, level, linkTarget, textAlign
+-	**Supports:** align (full, wide), color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Attributes:** isLink, level, levelOptions, linkTarget, textAlign
 
 ## Social Icon
 
-Display an icon linking to a social media profile or site. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/social-link))
+Display an icon linking to a social profile or site. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/social-link))
 
 -	**Name:** core/social-link
 -	**Category:** widgets
 -	**Parent:** core/social-links
--	**Supports:** ~~html~~, ~~reusable~~
+-	**Supports:** interactivity (clientNavigation), ~~html~~, ~~reusable~~
 -	**Attributes:** label, rel, service, url
 
 ## Social Icons
 
-Display icons linking to your social media profiles or sites. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/social-links))
+Display icons linking to your social profiles or sites. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/social-links))
 
 -	**Name:** core/social-links
 -	**Category:** widgets
--	**Supports:** align (center, left, right), anchor, color (background, gradients, ~~enableContrastChecker~~, ~~text~~), layout (default, ~~allowInheriting~~, ~~allowSwitching~~, ~~allowVerticalAlignment~~), spacing (blockGap, margin, padding, units)
+-	**Allowed Blocks:** core/social-link
+-	**Supports:** align (center, left, right), anchor, color (background, gradients, ~~enableContrastChecker~~, ~~text~~), interactivity (clientNavigation), layout (default, ~~allowInheriting~~, ~~allowSwitching~~, ~~allowVerticalAlignment~~), spacing (blockGap, margin, padding, units)
 -	**Attributes:** customIconBackgroundColor, customIconColor, iconBackgroundColor, iconBackgroundColorValue, iconColor, iconColorValue, openInNewTab, showLabels, size
 
 ## Spacer
@@ -871,7 +884,7 @@ Add white space between blocks and customize its height. ([Source](https://githu
 
 -	**Name:** core/spacer
 -	**Category:** design
--	**Supports:** anchor, spacing (margin)
+-	**Supports:** anchor, interactivity (clientNavigation), spacing (margin)
 -	**Attributes:** height, width
 
 ## Table
@@ -880,7 +893,7 @@ Create structured content in rows and columns to display information. ([Source](
 
 -	**Name:** core/table
 -	**Category:** text
--	**Supports:** align, anchor, color (background, gradients, text), spacing (margin, padding), typography (fontSize, lineHeight)
+-	**Supports:** align, anchor, color (background, gradients, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** body, caption, foot, hasFixedLayout, head
 
 ## Table of Contents
@@ -889,17 +902,17 @@ Summarize your post with a list of headings. Add HTML anchors to Heading blocks
 
 -	**Name:** core/table-of-contents
 -	**Experimental:** true
--	**Category:** layout
--	**Supports:** color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Category:** design
+-	**Supports:** color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** headings, onlyIncludeCurrentPage
 
 ## Tag Cloud
 
-A cloud of your most used tags. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/tag-cloud))
+A cloud of popular keywords, each sized by how often it appears. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/tag-cloud))
 
 -	**Name:** core/tag-cloud
 -	**Category:** widgets
--	**Supports:** align, spacing (margin, padding), typography (lineHeight), ~~html~~
+-	**Supports:** align, interactivity (clientNavigation), spacing (margin, padding), typography (lineHeight), ~~html~~
 -	**Attributes:** largestFontSize, numberOfTags, showTagCounts, smallestFontSize, taxonomy
 
 ## Template Part
@@ -908,7 +921,7 @@ Edit the different global regions of your site, like the header, footer, sidebar
 
 -	**Name:** core/template-part
 -	**Category:** theme
--	**Supports:** align, ~~html~~, ~~renaming~~, ~~reusable~~
+-	**Supports:** align, interactivity (clientNavigation), ~~html~~, ~~renaming~~, ~~reusable~~
 -	**Attributes:** area, slug, tagName, theme
 
 ## Term Description
@@ -917,7 +930,7 @@ Display the description of categories, tags and custom taxonomies when viewing a
 
 -	**Name:** core/term-description
 -	**Category:** theme
--	**Supports:** align (full, wide), color (background, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align (full, wide), color (background, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** textAlign
 
 ## Text Columns (deprecated)
@@ -926,7 +939,7 @@ This block is deprecated. Please use the Columns block instead. ([Source](https:
 
 -	**Name:** core/text-columns
 -	**Category:** design
--	**Supports:** ~~inserter~~
+-	**Supports:** interactivity (clientNavigation), ~~inserter~~
 -	**Attributes:** columns, content, width
 
 ## Verse
@@ -935,7 +948,7 @@ Insert poetry. Use special spacing formats. Or quote song lyrics. ([Source](http
 
 -	**Name:** core/verse
 -	**Category:** text
--	**Supports:** anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight)
+-	**Supports:** anchor, background (backgroundImage, backgroundSize), color (background, gradients, link, text), dimensions (minHeight), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** content, textAlign
 
 ## Video
@@ -944,7 +957,7 @@ Embed a video from your media library or upload a new one. ([Source](https://git
 
 -	**Name:** core/video
 -	**Category:** media
--	**Supports:** align, anchor, spacing (margin, padding)
--	**Attributes:** autoplay, caption, controls, id, loop, muted, playsInline, poster, preload, src, tracks
+-	**Supports:** align, anchor, interactivity (clientNavigation), spacing (margin, padding)
+-	**Attributes:** autoplay, blob, caption, controls, id, loop, muted, playsInline, poster, preload, src, tracks
 
 <!-- END TOKEN Autogenerated - DO NOT EDIT -->
diff --git a/docs/reference-guides/data/data-core-block-editor.md b/docs/reference-guides/data/data-core-block-editor.md
index 38a93552bcbef2..437f7be20f7705 100644
--- a/docs/reference-guides/data/data-core-block-editor.md
+++ b/docs/reference-guides/data/data-core-block-editor.md
@@ -81,11 +81,10 @@ _Parameters_
 
 -   _state_ `Object`: Editor state.
 -   _clientId_ `string`: The block client Id.
--   _rootClientId_ `?string`: Optional root client ID of block list.
 
 _Returns_
 
--   `boolean | undefined`: Whether the given block is allowed to be moved.
+-   `boolean`: Whether the given block is allowed to be moved.
 
 ### canMoveBlocks
 
@@ -95,7 +94,6 @@ _Parameters_
 
 -   _state_ `Object`: Editor state.
 -   _clientIds_ `string`: The block client IDs to be moved.
--   _rootClientId_ `?string`: Optional root client ID of block list.
 
 _Returns_
 
@@ -109,7 +107,6 @@ _Parameters_
 
 -   _state_ `Object`: Editor state.
 -   _clientId_ `string`: The block client Id.
--   _rootClientId_ `?string`: Optional root client ID of block list.
 
 _Returns_
 
@@ -123,7 +120,6 @@ _Parameters_
 
 -   _state_ `Object`: Editor state.
 -   _clientIds_ `string`: The block client IDs to be removed.
--   _rootClientId_ `?string`: Optional root client ID of block list.
 
 _Returns_
 
@@ -266,7 +262,7 @@ _Returns_
 
 ### getBlockInsertionPoint
 
-Returns the insertion point, the index at which the new inserted block would be placed. Defaults to the last index.
+Returns the location of the insertion cue. Defaults to the last index.
 
 _Parameters_
 
@@ -409,6 +405,19 @@ _Returns_
 
 -   `WPBlock[]`: Block objects.
 
+### getBlocksByName
+
+Returns all blocks that match a blockName. Results include nested blocks.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+-   _blockName_ `string[]`: Block name(s) for which clientIds are to be returned.
+
+_Returns_
+
+-   `Array`: Array of clientIds of blocks with name equal to blockName.
+
 ### getBlockSelectionEnd
 
 Returns the current block selection end. This value may be null, and it may represent either a singular block selection or multi-selection end. A selection is singular if its start and end match.
@@ -473,7 +482,7 @@ Returns an array containing the clientIds of all descendants of the blocks given
 _Parameters_
 
 -   _state_ `Object`: Global application state.
--   _clientIds_ `string|string[]`: Client ID(s) for which descendant blocks are to be returned.
+-   _rootIds_ `string|string[]`: Client ID(s) for which descendant blocks are to be returned.
 
 _Returns_
 
@@ -502,7 +511,7 @@ _Parameters_
 
 _Returns_
 
--   `?WPDirectInsertBlock`: The block type to be directly inserted.
+-   `WPDirectInsertBlock|undefined`: The block type to be directly inserted.
 
 _Type Definition_
 
@@ -553,6 +562,18 @@ _Returns_
 
 -   `number`: Number of blocks in the post, or number of blocks with name equal to blockName.
 
+### getHoveredBlockClientId
+
+Returns the currently hovered block.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+
+_Returns_
+
+-   `Object`: Client Id of the hovered block.
+
 ### getInserterItems
 
 Determines the items that appear in the inserter. Includes both static items (e.g. a regular block type) and dynamic items (e.g. a reusable block).
@@ -588,18 +609,6 @@ _Properties_
 -   _isDisabled_ `boolean`: Whether or not the user should be prevented from inserting this item.
 -   _frecency_ `number`: Heuristic that combines frequency and recency.
 
-### getLastFocus
-
-Returns the element of the last element that had focus when focus left the editor canvas.
-
-_Parameters_
-
--   _state_ `Object`: Block editor state.
-
-_Returns_
-
--   `Object`: Element.
-
 ### getLastMultiSelectedBlockClientId
 
 Returns the client ID of the last block in the multi-selection set, or null if there is no multi-selection.
@@ -729,6 +738,39 @@ _Returns_
 
 Returns the currently selected block, or null if there is no selected block.
 
+_Usage_
+
+```js
+import { select } from '@wordpress/data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+// Set initial active block client ID
+let activeBlockClientId = null;
+
+const getActiveBlockData = () => {
+	const activeBlock = select( blockEditorStore ).getSelectedBlock();
+
+	if ( activeBlock && activeBlock.clientId !== activeBlockClientId ) {
+		activeBlockClientId = activeBlock.clientId;
+
+		// Get active block name and attributes
+		const activeBlockName = activeBlock.name;
+		const activeBlockAttributes = activeBlock.attributes;
+
+		// Log active block name and attributes
+		console.log( activeBlockName, activeBlockAttributes );
+	}
+};
+
+// Subscribe to changes in the editor
+// wp.data.subscribe(() => {
+// getActiveBlockData()
+// })
+
+// Update active block data on click
+// onclick="getActiveBlockData()"
+```
+
 _Parameters_
 
 -   _state_ `Object`: Global application state.
@@ -848,15 +890,9 @@ _Returns_
 
 ### hasBlockMovingClientId
 
-Returns whether block moving mode is enabled.
-
-_Parameters_
-
--   _state_ `Object`: Editor state.
-
-_Returns_
+> **Deprecated**
 
--   `string`: Client Id of moving block.
+Returns whether block moving mode is enabled.
 
 ### hasDraggedInnerBlock
 
@@ -979,7 +1015,7 @@ _Returns_
 
 ### isBlockInsertionPointVisible
 
-Returns true if we should show the block insertion point.
+Returns true if the block insertion point is visible.
 
 _Parameters_
 
@@ -1260,9 +1296,21 @@ _Parameters_
 
 Action that hides the insertion point.
 
+### hoverBlock
+
+Returns an action object used in signalling that the block with the specified client ID has been hovered.
+
+_Parameters_
+
+-   _clientId_ `string`: Block client ID.
+
+_Returns_
+
+-   `Object`: Action object.
+
 ### insertAfterBlock
 
-Action that inserts an empty block after a given block.
+Action that inserts a default block after a given block.
 
 _Parameters_
 
@@ -1270,7 +1318,7 @@ _Parameters_
 
 ### insertBeforeBlock
 
-Action that inserts an empty block before a given block.
+Action that inserts a default block before a given block.
 
 _Parameters_
 
@@ -1438,7 +1486,7 @@ wp.data.dispatch( 'core/block-editor' ).registerInserterMediaCategory( {
 			per_page: 'page_size',
 			search: 'q',
 		};
-		const url = new URL( 'https://api.openverse.engineering/v1/images/' );
+		const url = new URL( 'https://api.openverse.org/v1/images/' );
 		Object.entries( finalQuery ).forEach( ( [ key, value ] ) => {
 			const queryKey = mapFromInserterMediaRequest[ key ] || key;
 			url.searchParams.set( queryKey, value );
@@ -1640,11 +1688,13 @@ _Returns_
 
 ### setBlockMovingClientId
 
-Action that enables or disables the block moving mode.
+> **Deprecated**
 
-_Parameters_
+Set the block moving client ID.
 
--   _hasBlockMovingClientId_ `string|null`: Enable/Disable block moving mode.
+_Returns_
+
+-   `Object`: Action object.
 
 ### setBlockVisibility
 
@@ -1663,18 +1713,6 @@ _Parameters_
 -   _clientId_ `string`: The block's clientId.
 -   _hasControlledInnerBlocks_ `boolean`: True if the block's inner blocks are controlled.
 
-### setLastFocus
-
-Action that sets the element that had focus when focus leaves the editor canvas.
-
-_Parameters_
-
--   _lastFocus_ `Object`: The last focused element.
-
-_Returns_
-
--   `Object`: Action object.
-
 ### setNavigationMode
 
 Action that enables or disables the navigation mode.
@@ -1852,11 +1890,11 @@ _Returns_
 
 ### updateBlockListSettings
 
-Action that changes the nested settings of a given block.
+Action that changes the nested settings of the given block(s).
 
 _Parameters_
 
--   _clientId_ `string`: Client ID of the block whose nested setting are being received.
+-   _clientId_ `string | SettingsByClientId`: Client ID of the block whose nested setting are being received, or object of settings by client ID.
 -   _settings_ `Object`: Object with the new settings for the nested block.
 
 _Returns_
diff --git a/docs/reference-guides/data/data-core-edit-post.md b/docs/reference-guides/data/data-core-edit-post.md
index e09cf0caaec515..e3fb22a1a7afe0 100644
--- a/docs/reference-guides/data/data-core-edit-post.md
+++ b/docs/reference-guides/data/data-core-edit-post.md
@@ -144,6 +144,8 @@ Returns true if the template editing mode is enabled.
 
 ### isEditorPanelEnabled
 
+> **Deprecated**
+
 Returns true if the given panel is enabled, or false otherwise. Panels are enabled by default.
 
 _Parameters_
@@ -157,6 +159,8 @@ _Returns_
 
 ### isEditorPanelOpened
 
+> **Deprecated**
+
 Returns true if the given panel is open, or false otherwise. Panels are closed by default.
 
 _Parameters_
@@ -170,6 +174,8 @@ _Returns_
 
 ### isEditorPanelRemoved
 
+> **Deprecated**
+
 Returns true if the given panel was programmatically removed, or false otherwise. All panels are not removed by default.
 
 _Parameters_
@@ -208,6 +214,8 @@ _Returns_
 
 ### isInserterOpened
 
+> **Deprecated**
+
 Returns true if the inserter is opened.
 
 _Parameters_
@@ -298,6 +306,8 @@ _Returns_
 
 ### isPublishSidebarOpened
 
+> **Deprecated**
+
 Returns true if the publish sidebar is opened.
 
 _Parameters_
@@ -342,6 +352,8 @@ _Returns_
 
 ### closePublishSidebar
 
+> **Deprecated**
+
 Returns an action object used in signalling that the user closed the publish sidebar.
 
 _Returns_
@@ -400,6 +412,8 @@ _Returns_
 
 ### openPublishSidebar
 
+> **Deprecated**
+
 Returns an action object used in signalling that the user opened the publish sidebar.
 
 _Returns_
@@ -408,6 +422,8 @@ _Returns_
 
 ### removeEditorPanel
 
+> **Deprecated**
+
 Returns an action object used to remove a panel from the editor.
 
 _Parameters_
@@ -438,30 +454,24 @@ Returns an action object used to switch to template editing.
 
 ### setIsInserterOpened
 
+> **Deprecated**
+
 Returns an action object used to open/close the inserter.
 
 _Parameters_
 
--   _value_ `boolean|Object`: Whether the inserter should be opened (true) or closed (false). To specify an insertion point, use an object.
--   _value.rootClientId_ `string`: The root client ID to insert at.
--   _value.insertionIndex_ `number`: The index to insert at.
-
-_Returns_
-
--   `Object`: Action object.
+-   _value_ `boolean|Object`: Whether the inserter should be opened (true) or closed (false).
 
 ### setIsListViewOpened
 
+> **Deprecated**
+
 Returns an action object used to open/close the list view.
 
 _Parameters_
 
 -   _isOpen_ `boolean`: A boolean representing whether the list view should be opened or closed.
 
-_Returns_
-
--   `Object`: Action object.
-
 ### showBlockTypes
 
 Update the provided block types to be visible.
@@ -472,6 +482,8 @@ _Parameters_
 
 ### switchEditorMode
 
+> **Deprecated**
+
 Triggers an action used to switch editor mode.
 
 _Parameters_
@@ -480,10 +492,14 @@ _Parameters_
 
 ### toggleDistractionFree
 
+> **Deprecated**
+
 Action that toggles Distraction free mode. Distraction free mode expects there are no sidebars, as due to the z-index values set, you can't close sidebars.
 
 ### toggleEditorPanelEnabled
 
+> **Deprecated**
+
 Returns an action object used to enable or disable a panel in the editor.
 
 _Parameters_
@@ -496,6 +512,8 @@ _Returns_
 
 ### toggleEditorPanelOpened
 
+> **Deprecated**
+
 Opens a closed panel and closes an open panel.
 
 _Parameters_
@@ -520,6 +538,8 @@ _Parameters_
 
 ### togglePublishSidebar
 
+> **Deprecated**
+
 Returns an action object used in signalling that the user toggles the publish sidebar.
 
 _Returns_
@@ -528,11 +548,8 @@ _Returns_
 
 ### updatePreferredStyleVariations
 
-Returns an action object used in signaling that a style should be auto-applied when a block is created.
-
-_Parameters_
+> **Deprecated**
 
--   _blockName_ `string`: Name of the block.
--   _blockStyle_ `?string`: Name of the style that should be auto applied. If undefined, the "auto apply" setting of the block is removed.
+Returns an action object used in signaling that a style should be auto-applied when a block is created.
 
 <!-- END TOKEN(Autogenerated actions|../../../packages/edit-post/src/store/actions.js) -->
diff --git a/docs/reference-guides/data/data-core-edit-site.md b/docs/reference-guides/data/data-core-edit-site.md
index 7a0d67f9db0be0..775dd66a821ef0 100644
--- a/docs/reference-guides/data/data-core-edit-site.md
+++ b/docs/reference-guides/data/data-core-edit-site.md
@@ -24,6 +24,8 @@ _Returns_
 
 ### getCurrentTemplateTemplateParts
 
+> **Deprecated**
+
 Returns the template parts and their blocks for the current edited template.
 
 _Parameters_
@@ -58,7 +60,7 @@ _Parameters_
 
 _Returns_
 
--   `string?`: Post ID.
+-   `?string`: Post ID.
 
 ### getEditedPostType
 
@@ -70,7 +72,7 @@ _Parameters_
 
 _Returns_
 
--   `TemplateType?`: Template type.
+-   `?TemplateType`: Template type.
 
 ### getEditorMode
 
@@ -157,7 +159,9 @@ _Returns_
 
 ### isInserterOpened
 
-Returns the current opened/closed state of the inserter panel.
+> **Deprecated**
+
+Returns true if the inserter is opened.
 
 _Parameters_
 
@@ -165,11 +169,11 @@ _Parameters_
 
 _Returns_
 
--   `boolean`: True if the inserter panel should be open; false if closed.
+-   `boolean`: Whether the inserter is opened.
 
 ### isListViewOpened
 
-Returns the current opened/closed state of the list view panel.
+Returns true if the list view is opened.
 
 _Parameters_
 
@@ -177,7 +181,7 @@ _Parameters_
 
 _Returns_
 
--   `boolean`: True if the list view panel should be open; false if closed.
+-   `boolean`: Whether the list view is opened.
 
 ### isNavigationOpened
 
@@ -307,25 +311,23 @@ _Parameters_
 
 ### setIsInserterOpened
 
-Opens or closes the inserter.
-
-_Parameters_
+> **Deprecated**
 
--   _value_ `boolean|Object`: Whether the inserter should be opened (true) or closed (false). To specify an insertion point, use an object.
--   _value.rootClientId_ `string`: The root client ID to insert at.
--   _value.insertionIndex_ `number`: The index to insert at.
+Returns an action object used to open/close the inserter.
 
-_Returns_
+_Parameters_
 
--   `Object`: Action object.
+-   _value_ `boolean|Object`: Whether the inserter should be opened (true) or closed (false).
 
 ### setIsListViewOpened
 
-Sets whether the list view panel should be open.
+> **Deprecated**
+
+Returns an action object used to open/close the list view.
 
 _Parameters_
 
--   _isOpen_ `boolean`: If true, opens the list view. If false, closes it. It does not toggle the state, but sets it directly.
+-   _isOpen_ `boolean`: A boolean representing whether the list view should be opened or closed.
 
 ### setIsNavigationPanelOpened
 
@@ -371,7 +373,7 @@ Resolves the template for a page and displays both. If no path is given, attempt
 
 _Returns_
 
--   `number`: The resolved template ID for the page route.
+-   `Object`: Action object.
 
 ### setTemplate
 
@@ -395,10 +397,18 @@ _Returns_
 
 ### switchEditorMode
 
-Undocumented declaration.
+> **Deprecated**
+
+Triggers an action used to switch editor mode.
+
+_Parameters_
+
+-   _mode_ `string`: The editor mode.
 
 ### toggleDistractionFree
 
+> **Deprecated**
+
 Action that toggles Distraction free mode. Distraction free mode expects there are no sidebars, as due to the z-index values set, you can't close sidebars.
 
 ### toggleFeature
diff --git a/docs/reference-guides/data/data-core-editor.md b/docs/reference-guides/data/data-core-editor.md
index fae5b8a78e2cfc..ac3413e694877b 100644
--- a/docs/reference-guides/data/data-core-editor.md
+++ b/docs/reference-guides/data/data-core-editor.md
@@ -248,6 +248,12 @@ _Returns_
 
 Returns the post type of the post currently being edited.
 
+_Usage_
+
+```js
+const currentPostType = wp.data.select( 'core/editor' ).getCurrentPostType();
+```
+
 _Parameters_
 
 -   _state_ `Object`: Global application state.
@@ -268,10 +274,40 @@ _Returns_
 
 -   `string?`: Template ID.
 
+### getDeviceType
+
+Returns the current editing canvas device type.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+
+_Returns_
+
+-   `string`: Device type.
+
 ### getEditedPostAttribute
 
 Returns a single attribute of the post being edited, preferring the unsaved edit if one exists, but falling back to the attribute for the last known saved state of the post.
 
+_Usage_
+
+```js
+// Get specific media size based on the featured media ID
+// Note: change sizes?.large for any registered size
+const getFeaturedMediaUrl = useSelect( ( select ) => {
+	const getFeaturedMediaId =
+		select( 'core/editor' ).getEditedPostAttribute( 'featured_media' );
+	const getMedia = select( 'core' ).getMedia( getFeaturedMediaId );
+
+	return (
+		getMedia?.media_details?.sizes?.large?.source_url ||
+		getMedia?.source_url ||
+		''
+	);
+}, [] );
+```
+
 _Parameters_
 
 -   _state_ `Object`: Global application state.
@@ -341,6 +377,18 @@ _Returns_
 
 -   `Array`: Block list.
 
+### getEditorMode
+
+Returns the current editing mode.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+
+_Returns_
+
+-   `string`: Editing mode.
+
 ### getEditorSelection
 
 Returns the current selection.
@@ -461,7 +509,7 @@ _Returns_
 
 ### getPermalinkParts
 
-Returns the permalink for a post, split into it's three parts: the prefix, the postName, and the suffix.
+Returns the permalink for a post, split into its three parts: the prefix, the postName, and the suffix.
 
 _Parameters_
 
@@ -867,12 +915,75 @@ _Returns_
 
 -   `boolean`: Whether the post can be saved.
 
+### isEditorPanelEnabled
+
+Returns true if the given panel is enabled, or false otherwise. Panels are enabled by default.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+-   _panelName_ `string`: A string that identifies the panel.
+
+_Returns_
+
+-   `boolean`: Whether or not the panel is enabled.
+
+### isEditorPanelOpened
+
+Returns true if the given panel is open, or false otherwise. Panels are closed by default.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+-   _panelName_ `string`: A string that identifies the panel.
+
+_Returns_
+
+-   `boolean`: Whether or not the panel is open.
+
+### isEditorPanelRemoved
+
+Returns true if the given panel was programmatically removed, or false otherwise. All panels are not removed by default.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+-   _panelName_ `string`: A string that identifies the panel.
+
+_Returns_
+
+-   `boolean`: Whether or not the panel is removed.
+
 ### isFirstMultiSelectedBlock
 
 _Related_
 
 -   isFirstMultiSelectedBlock in core/block-editor store.
 
+### isInserterOpened
+
+Returns true if the inserter is opened.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+
+_Returns_
+
+-   `boolean`: Whether the inserter is opened.
+
+### isListViewOpened
+
+Returns true if the list view is opened.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+
+_Returns_
+
+-   `boolean`: Whether the list view is opened.
+
 ### isMultiSelecting
 
 _Related_
@@ -971,6 +1082,18 @@ _Returns_
 
 -   `boolean`: Whether the pre-publish panel should be shown or not.
 
+### isPublishSidebarOpened
+
+Returns true if the publish sidebar is opened.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state
+
+_Returns_
+
+-   `boolean`: Whether the publish sidebar is open.
+
 ### isSavingNonPostEntityChanges
 
 Returns true if non-post entities are currently being saved, or false otherwise.
@@ -1033,6 +1156,14 @@ _Related_
 
 -   clearSelectedBlock in core/block-editor store.
 
+### closePublishSidebar
+
+Returns an action object used in signalling that the user closed the publish sidebar.
+
+_Returns_
+
+-   `Object`: Action object.
+
 ### createUndoLevel
 
 > **Deprecated** Since WordPress 6.0
@@ -1047,11 +1178,38 @@ Disables the publish sidebar.
 
 Returns an action object used in signalling that attributes of the post have been edited.
 
+_Usage_
+
+```js
+// Update the post title
+wp.data.dispatch( 'core/editor' ).editPost( { title: `${ newTitle }` } );
+```
+
+```js
+// Get specific media size based on the featured media ID
+// Note: change sizes?.large for any registered size
+const getFeaturedMediaUrl = useSelect( ( select ) => {
+	const getFeaturedMediaId =
+		select( 'core/editor' ).getEditedPostAttribute( 'featured_media' );
+	const getMedia = select( 'core' ).getMedia( getFeaturedMediaId );
+
+	return (
+		getMedia?.media_details?.sizes?.large?.source_url ||
+		getMedia?.source_url ||
+		''
+	);
+}, [] );
+```
+
 _Parameters_
 
 -   _edits_ `Object`: Post attributes to edit.
 -   _options_ `Object`: Options for the edit.
 
+_Returns_
+
+-   `Object`: Action object
+
 ### enablePublishSidebar
 
 Enable the publish sidebar.
@@ -1186,6 +1344,14 @@ _Related_
 
 -   multiSelect in core/block-editor store.
 
+### openPublishSidebar
+
+Returns an action object used in signalling that the user opened the publish sidebar.
+
+_Returns_
+
+-   `Object`: Action object
+
 ### receiveBlocks
 
 _Related_
@@ -1214,6 +1380,18 @@ _Related_
 
 -   removeBlocks in core/block-editor store.
 
+### removeEditorPanel
+
+Returns an action object used to remove a panel from the editor.
+
+_Parameters_
+
+-   _panelName_ `string`: A string that identifies the panel to remove.
+
+_Returns_
+
+-   `Object`: Action object.
+
 ### replaceBlock
 
 _Related_
@@ -1261,18 +1439,71 @@ _Related_
 
 -   selectBlock in core/block-editor store.
 
+### setDeviceType
+
+Action that changes the width of the editing canvas.
+
+_Parameters_
+
+-   _deviceType_ `string`:
+
+_Returns_
+
+-   `Object`: Action object.
+
+### setEditedPost
+
+Returns an action that sets the current post Type and post ID.
+
+_Parameters_
+
+-   _postType_ `string`: Post Type.
+-   _postId_ `string`: Post ID.
+
+_Returns_
+
+-   `Object`: Action object.
+
+### setIsInserterOpened
+
+Returns an action object used to open/close the inserter.
+
+_Parameters_
+
+-   _value_ `boolean|Object`: Whether the inserter should be opened (true) or closed (false). To specify an insertion point, use an object.
+-   _value.rootClientId_ `string`: The root client ID to insert at.
+-   _value.insertionIndex_ `number`: The index to insert at.
+-   _value.filterValue_ `string`: A query to filter the inserter results.
+-   _value.onSelect_ `Function`: A callback when an item is selected.
+-   _value.tab_ `string`: The tab to open in the inserter.
+-   _value.category_ `string`: The category to initialize in the inserter.
+
+_Returns_
+
+-   `Object`: Action object.
+
+### setIsListViewOpened
+
+Returns an action object used to open/close the list view.
+
+_Parameters_
+
+-   _isOpen_ `boolean`: A boolean representing whether the list view should be opened or closed.
+
+_Returns_
+
+-   `Object`: Action object.
+
 ### setRenderingMode
 
 Returns an action used to set the rendering mode of the post editor. We support multiple rendering modes:
 
--   `all`: This is the default mode. It renders the post editor with all the features available. If a template is provided, it's preferred over the post.
--   `template-only`: This mode renders the editor with only the template blocks visible.
 -   `post-only`: This mode extracts the post blocks from the template and renders only those. The idea is to allow the user to edit the post/page in isolation without the wrapping template.
 -   `template-locked`: This mode renders both the template and the post blocks but the template blocks are locked and can't be edited. The post blocks are editable.
 
 _Parameters_
 
--   _mode_ `string`: Mode (one of 'template-only', 'post-only', 'template-locked' or 'all').
+-   _mode_ `string`: Mode (one of 'post-only' or 'template-locked').
 
 ### setTemplateValidity
 
@@ -1292,16 +1523,14 @@ _Parameters_
 
 ### setupEditorState
 
-Returns an action object used to setup the editor state when first opening an editor.
+> **Deprecated**
+
+Setup the editor state.
 
 _Parameters_
 
 -   _post_ `Object`: Post object.
 
-_Returns_
-
--   `Object`: Action object.
-
 ### showInsertionPoint
 
 _Related_
@@ -1332,6 +1561,14 @@ _Related_
 
 -   stopTyping in core/block-editor store.
 
+### switchEditorMode
+
+Triggers an action used to switch editor mode.
+
+_Parameters_
+
+-   _mode_ `string`: The editor mode.
+
 ### synchronizeTemplate
 
 _Related_
@@ -1344,6 +1581,38 @@ _Related_
 
 -   toggleBlockMode in core/block-editor store.
 
+### toggleDistractionFree
+
+Action that toggles Distraction free mode. Distraction free mode expects there are no sidebars, as due to the z-index values set, you can't close sidebars.
+
+### toggleEditorPanelEnabled
+
+Returns an action object used to enable or disable a panel in the editor.
+
+_Parameters_
+
+-   _panelName_ `string`: A string that identifies the panel to enable or disable.
+
+_Returns_
+
+-   `Object`: Action object.
+
+### toggleEditorPanelOpened
+
+Opens a closed panel and closes an open panel.
+
+_Parameters_
+
+-   _panelName_ `string`: A string that identifies the panel to open or close.
+
+### togglePublishSidebar
+
+Returns an action object used in signalling that the user toggles the publish sidebar.
+
+_Returns_
+
+-   `Object`: Action object
+
 ### toggleSelection
 
 _Related_
diff --git a/docs/reference-guides/data/data-core-keyboard-shortcuts.md b/docs/reference-guides/data/data-core-keyboard-shortcuts.md
index 613c5e009e8b07..d7d5cf853f7865 100644
--- a/docs/reference-guides/data/data-core-keyboard-shortcuts.md
+++ b/docs/reference-guides/data/data-core-keyboard-shortcuts.md
@@ -22,7 +22,7 @@ const ExampleComponent = () => {
 	const allShortcutKeyCombinations = useSelect(
 		( select ) =>
 			select( keyboardShortcutsStore ).getAllShortcutKeyCombinations(
-				'core/edit-post/next-region'
+				'core/editor/next-region'
 			),
 		[]
 	);
@@ -77,7 +77,7 @@ const ExampleComponent = () => {
 	const allShortcutRawKeyCombinations = useSelect(
 		( select ) =>
 			select( keyboardShortcutsStore ).getAllShortcutRawKeyCombinations(
-				'core/edit-post/next-region'
+				'core/editor/next-region'
 			),
 		[]
 	);
@@ -168,7 +168,7 @@ const ExampleComponent = () => {
 	const shortcutAliases = useSelect(
 		( select ) =>
 			select( keyboardShortcutsStore ).getShortcutAliases(
-				'core/edit-post/next-region'
+				'core/editor/next-region'
 			),
 		[]
 	);
@@ -219,7 +219,7 @@ const ExampleComponent = () => {
 	const shortcutDescription = useSelect(
 		( select ) =>
 			select( keyboardShortcutsStore ).getShortcutDescription(
-				'core/edit-post/next-region'
+				'core/editor/next-region'
 			),
 		[]
 	);
@@ -256,7 +256,7 @@ const ExampleComponent = () => {
 	const { character, modifier } = useSelect(
 		( select ) =>
 			select( keyboardShortcutsStore ).getShortcutKeyCombination(
-				'core/edit-post/next-region'
+				'core/editor/next-region'
 			),
 		[]
 	);
@@ -302,16 +302,16 @@ const ExampleComponent = () => {
 	const { display, raw, ariaLabel } = useSelect( ( select ) => {
 		return {
 			display: select( keyboardShortcutsStore ).getShortcutRepresentation(
-				'core/edit-post/next-region'
+				'core/editor/next-region'
 			),
 			raw: select( keyboardShortcutsStore ).getShortcutRepresentation(
-				'core/edit-post/next-region',
+				'core/editor/next-region',
 				'raw'
 			),
 			ariaLabel: select(
 				keyboardShortcutsStore
 			).getShortcutRepresentation(
-				'core/edit-post/next-region',
+				'core/editor/next-region',
 				'ariaLabel'
 			),
 		};
@@ -410,13 +410,13 @@ const ExampleComponent = () => {
 	const { unregisterShortcut } = useDispatch( keyboardShortcutsStore );
 
 	useEffect( () => {
-		unregisterShortcut( 'core/edit-post/next-region' );
+		unregisterShortcut( 'core/editor/next-region' );
 	}, [] );
 
 	const shortcut = useSelect(
 		( select ) =>
 			select( keyboardShortcutsStore ).getShortcutKeyCombination(
-				'core/edit-post/next-region'
+				'core/editor/next-region'
 			),
 		[]
 	);
diff --git a/docs/reference-guides/data/data-core-notices.md b/docs/reference-guides/data/data-core-notices.md
index e11e6f226169f9..d36098429811dd 100644
--- a/docs/reference-guides/data/data-core-notices.md
+++ b/docs/reference-guides/data/data-core-notices.md
@@ -277,7 +277,7 @@ export const ExampleComponent = () => {
 	const notices = useSelect( ( select ) =>
 		select( noticesStore ).getNotices()
 	);
-	const { removeNotices } = useDispatch( noticesStore );
+	const { removeAllNotices } = useDispatch( noticesStore );
 	return (
 		<>
 			<ul>
diff --git a/docs/reference-guides/data/data-core.md b/docs/reference-guides/data/data-core.md
index b80703dcc67b18..474207aa20460f 100644
--- a/docs/reference-guides/data/data-core.md
+++ b/docs/reference-guides/data/data-core.md
@@ -2,7 +2,106 @@
 
 Namespace: `core`.
 
-## Selectors
+## Dynamically generated selectors
+
+There are a number of user-friendly selectors that are wrappers of the more generic `getEntityRecord` and `getEntityRecords` that can be used to retrieve information for the various entities.
+
+### getPostType
+
+Returns the information for a given post type.
+
+_Usage_
+
+    import { useSelect } from '@wordpress/data';
+    import { store as coreDataStore } from '@wordpress/core-data';
+
+    const postType = useSelect(
+    	( select ) => select( coreDataStore ).getPostType( 'post' )
+
+    	// Equivalent to: select( coreDataStore ).getEntityRecord( 'root', 'postType', 'post' )
+    );
+
+_Parameters_
+
+-   postType `string`
+
+_Returns_
+
+-   `EntityRecord | undefined`: Record.
+
+### getPostTypes
+
+Returns the information for post types.
+
+_Usage_
+
+    import { useSelect } from '@wordpress/data';
+    import { store as coreDataStore } from '@wordpress/core-data';
+
+    const postTypes = useSelect( ( select ) => {
+    	return select( coreDataStore ).getPostTypes( { per_page: 4 } );
+
+    	// Equivalent to:
+    	// select( coreDataStore ).getEntityRecords( 'root', 'postType', { per_page: 4 } );
+    } );
+
+_Parameters_
+
+-   _query_ `GetRecordsHttpQuery`: Optional terms query. If requesting specific fields, fields must always include the ID. For valid query parameters see the [Reference](https://developer.wordpress.org/rest-api/reference/) in the REST API Handbook and select the entity kind. Then see the arguments available for "List [Entity kind]s".
+
+_Returns_
+
+-   `EntityRecord[] | null`: Records.
+
+### getTaxonomy
+
+Returns information for a given taxonomy.
+
+_Usage_
+
+    import { useSelect } from '@wordpress/data';
+    import { store as coreDataStore } from '@wordpress/core-data';
+
+    const taxonomy = useSelect( ( select ) => {
+    	return select( coreDataStore ).getTaxonomy( 'category' );
+
+    	// Equivalent to:
+    	// select( coreDataStore ).getEntityRecord( 'root', 'taxonomy', 'category' );
+    } );
+
+_Parameters_
+
+-   taxonomy `string`
+
+_Returns_
+
+-   `EntityRecord | undefined`: Record.
+
+### getTaxonomies
+
+Returns information for taxonomies.
+
+_Usage_
+
+    import { useSelect } from '@wordpress/data';
+    import { store as coreDataStore } from '@wordpress/core-data';
+
+    const taxonomies = useSelect( ( select ) => {
+    	return select( coreDataStore ).getTaxonomies( { type: 'post' } );
+
+    	// Equivalent to:
+    	// select( coreDataStore ).getEntityRecords( 'root', 'taxonomy', { type: 'post' } );
+    } );
+
+_Parameters_
+
+-   _query_ `GetRecordsHttpQuery`: Optional terms query. If requesting specific fields, fields must always include the ID. For valid query parameters see the [Reference](https://developer.wordpress.org/rest-api/reference/) in the REST API Handbook and select the entity kind. Then see the arguments available for "List [Entity kind]s".
+
+_Returns_
+
+-   `EntityRecord[] | null`: Records.
+
+## Other Selectors
 
 <!-- START TOKEN(Autogenerated selectors|../../../packages/core-data/src/selectors.ts) -->
 
@@ -18,7 +117,7 @@ _Parameters_
 
 -   _state_ `State`: Data state.
 -   _action_ `string`: Action to check. One of: 'create', 'read', 'update', 'delete'.
--   _resource_ `string`: REST resource to check, e.g. 'media' or 'posts'.
+-   _resource_ `string | EntityResource`: Entity resource to check. Accepts entity object `{ kind: 'root', name: 'media', id: 1 }` or REST base as a string - `media`.
 -   _id_ `EntityRecordKey`: Optional ID of the rest resource to check.
 
 _Returns_
@@ -150,7 +249,7 @@ _Parameters_
 
 _Returns_
 
--   `undefined< 'edit' >`: Current user object.
+-   `ET.User< 'edit' >`: Current user object.
 
 ### getDefaultTemplateId
 
@@ -178,7 +277,7 @@ _Parameters_
 
 _Returns_
 
--   `undefined< EntityRecord > | undefined`: The entity record, merged with its edits.
+-   `ET.Updatable< EntityRecord > | false`: The entity record, merged with its edits.
 
 ### getEmbedPreview
 
@@ -504,7 +603,7 @@ _Parameters_
 
 _Returns_
 
--   `undefined< 'edit' >[]`: Users list.
+-   `ET.User< 'edit' >[]`: Users list.
 
 ### hasEditsForEntityRecord
 
@@ -673,7 +772,7 @@ _Parameters_
 
 -   _kind_ `string`: Kind of the deleted entity.
 -   _name_ `string`: Name of the deleted entity.
--   _recordId_ `string`: Record ID of the deleted entity.
+-   _recordId_ `number|string`: Record ID of the deleted entity.
 -   _query_ `?Object`: Special query parameters for the DELETE API call.
 -   _options_ `[Object]`: Delete options.
 -   _options.\_\_unstableFetch_ `[Function]`: Internal use only. Function to call instead of `apiFetch()`. Must return a promise.
@@ -755,7 +854,7 @@ _Parameters_
 
 ### receiveThemeSupports
 
-> **Deprecated** since WP 5.9, this is not useful anymore, use the selector direclty.
+> **Deprecated** since WP 5.9, this is not useful anymore, use the selector directly.
 
 Returns an action object used in signalling that the index has been received.
 
@@ -790,7 +889,7 @@ _Parameters_
 -   _kind_ `string`: Kind of the entity.
 -   _name_ `string`: Name of the entity.
 -   _recordId_ `Object`: ID of the record.
--   _options_ `Object`: Saving options.
+-   _options_ `Object=`: Saving options.
 
 ### saveEntityRecord
 
diff --git a/docs/reference-guides/filters/README.md b/docs/reference-guides/filters/README.md
index 66cac472ecaa79..676850a5501595 100644
--- a/docs/reference-guides/filters/README.md
+++ b/docs/reference-guides/filters/README.md
@@ -4,4 +4,4 @@
 
 There are two types of hooks: [Actions](https://developer.wordpress.org/plugins/hooks/actions/) and [Filters](https://developer.wordpress.org/plugins/hooks/filters/). In addition to PHP actions and filters, WordPress also provides a mechanism for registering and executing hooks in JavaScript. This functionality is also available on npm as the [@wordpress/hooks](https://www.npmjs.com/package/@wordpress/hooks) package, for general purpose use.
 
-You can also learn more about both APIs: [PHP](https://codex.wordpress.org/Plugin_API/) and [JavaScript](/packages/hooks/README.md).
+You can also learn more about both APIs: [PHP](https://developer.wordpress.org/reference/) and [JavaScript](/packages/hooks/README.md).
diff --git a/docs/reference-guides/filters/block-filters.md b/docs/reference-guides/filters/block-filters.md
index e269ba9ef19917..f1952ef9bf86f8 100644
--- a/docs/reference-guides/filters/block-filters.md
+++ b/docs/reference-guides/filters/block-filters.md
@@ -1,61 +1,115 @@
 # Block Filters
 
-To modify the behavior of existing blocks, WordPress exposes several APIs.
+WordPress exposes several APIs that allow you to modify the behavior of existing blocks.
 
 ## Registration
 
-The following filters are available to extend the settings for blocks during their registration.
+Blocks in WordPress are typically registered on both the server and client side using `block.json`` metadata. You can use the following filters to modify or extend block settings during their registration on the server with PHP and on the client with JavaScript. To learn more, refer to the [block registration](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/) guide.
 
 ### `block_type_metadata`
 
-Filters the raw metadata loaded from the `block.json` file when registering a block type on the server with PHP. It allows applying modifications before the metadata gets processed.
+Filters the raw metadata loaded from the `block.json` file when registering a block type on the server with PHP. It allows modifications to be applied before the metadata gets processed.
 
-The filter takes one param:
+The callback function for this filter receives one parameter:
 
--   `$metadata` (`array`) – metadata loaded from `block.json` for registering a block type.
+- `$metadata` (`array`): Metadata loaded from `block.json` for registering a block type.
 
-_Example_:
+The following example sets the `apiVersion` of all blocks to `2`.
 
 ```php
-<?php
-
-function filter_metadata_registration( $metadata ) {
-	$metadata['apiVersion'] = 1;
+function example_filter_metadata_registration( $metadata ) {
+	$metadata['apiVersion'] = 2;
 	return $metadata;
 };
-add_filter( 'block_type_metadata', 'filter_metadata_registration' );
+add_filter( 'block_type_metadata', 'example_filter_metadata_registration' );
+```
 
-register_block_type( __DIR__ );
+Here's a more robust example that disables background color and gradient support for Heading blocks. The `block_type_metadata` filter is excellent for [curating the Editor experience](https://developer.wordpress.org/block-editor/how-to-guides/curating-the-editor-experience/). 
+
+```php
+function example_disable_heading_background_color_and_gradients( $metadata ) {
+	
+	// Only apply the filter to Heading blocks.
+	if ( ! isset( $metadata['name'] ) || 'core/heading' !== $metadata['name'] ) {
+		return $metadata;
+	}
+
+	// Check if 'supports' key exists.
+	if ( isset( $metadata['supports'] ) && isset( $metadata['supports']['color'] ) ) {
+		
+		// Remove Background color and Gradients support.
+		$metadata['supports']['color']['background'] = false;
+		$metadata['supports']['color']['gradients']  = false;
+	}
+
+	return $metadata;
+}
+add_filter( 'block_type_metadata', 'example_disable_heading_background_color_and_gradients' );
 ```
 
 ### `block_type_metadata_settings`
 
-Filters the settings determined from the processed block type metadata. It makes it possible to apply custom modifications using the block metadata that isn’t handled by default.
+Filters the settings determined from the processed block type metadata. It makes it possible to apply custom modifications using the block metadata that isn't handled by default.
 
-The filter takes two params:
+The callback function for this filter receives two parameters:
 
--   `$settings` (`array`) – Array of determined settings for registering a block type.
--   `$metadata` (`array`) – Metadata loaded from the `block.json` file.
+-   `$settings` (`array`): Array of determined settings for registering a block type.
+-   `$metadata` (`array`): Metadata loaded from the `block.json` file.
 
-_Example:_
+The following example increases the `apiVersion` for all blocks by `1`.
 
 ```php
-function filter_metadata_registration( $settings, $metadata ) {
+function example_filter_metadata_registration( $settings, $metadata ) {
 	$settings['api_version'] = $metadata['apiVersion'] + 1;
 	return $settings;
 };
-add_filter( 'block_type_metadata_settings', 'filter_metadata_registration', 10, 2 );
+add_filter( 'block_type_metadata_settings', 'example_filter_metadata_registration', 10, 2 );
+```
+
+### `register_block_type_args`
+
+Filters a block's arguments array (`$args`) right before the block type is officially registered on the server.
+
+The callback function for this filter receives two parameters:
+
+- `$args` (`array`): Array of arguments for registering a block type.
+- `$block_type` (`string`): Block type name including namespace.
 
-register_block_type( __DIR__ );
+`register_block_type_args` is the most low-level PHP filter available, and it will work for every block registered on the server. All settings defined on the server are propagated to the client with higher priority than those set in the client.
+
+The following code will disable the color controls for Paragraph, Heading, List, and List Item blocks.
+
+```php
+function example_disable_color_for_specific_blocks( $args, $block_type ) {
+
+	// List of block types to modify.
+	$block_types_to_modify = [
+		'core/paragraph',
+		'core/heading',
+		'core/list',
+		'core/list-item'
+	];
+
+	// Check if the current block type is in the list.
+	if ( in_array( $block_type, $block_types_to_modify, true ) ) {
+		// Disable color controls.
+		$args['supports']['color'] = array(
+			'text'       => false,
+			'background' => false,
+			'link'       => false,
+		);
+	}
+
+	return $args;
+}
+add_filter( 'register_block_type_args', 'example_disable_color_for_specific_blocks', 10, 2 );
 ```
 
 ### `blocks.registerBlockType`
 
 Used to filter the block settings when registering the block on the client with JavaScript. It receives the block settings, the name of the registered block, and either null or the deprecated block settings (when applied to a registered deprecation) as arguments. This filter is also applied to each of a block's deprecated settings.
 
-_Example:_
-
-Ensure that List blocks are saved with the canonical generated class name (`wp-block-list`):
+The following example ensures that List blocks are saved with the canonical generated class name (`wp-block-list`):
 
 ```js
 function addListBlockClassName( settings, name ) {
@@ -79,33 +133,100 @@ wp.hooks.addFilter(
 );
 ```
 
-## Block Editor
+## Front end
+
+The following PHP filters are available to change the output of a block on the front end.
+
+### `render_block`
+
+Filters the front-end content of any block. This filter has no impact on the behavior of blocks in the Editor. 
+
+The callback function for this filter receives three parameters:
+
+- `$block_content` (`string`): The block content.
+- `$block` (`array`): The full block, including name and attributes.
+- `$instance` (`WP_Block`): The block instance.
+
+In the following example, the class `example-class` is added to all Paragraph blocks on the front end. Here the [HTML API](https://make.wordpress.org/core/2023/03/07/introducing-the-html-api-in-wordpress-6-2/) is used to easily add the class instead of relying on regex.
+
+```php
+function example_add_custom_class_to_paragraph_block( $block_content, $block ) {
+	
+	// Check if the block is a Paragraph block.
+	if ( 'core/paragraph' === $block['blockName'] ) {
+	   
+		// Add the custom class to the block content using the HTML API.
+		$processor = new WP_HTML_Tag_Processor( $block_content );
+		
+		if ( $processor->next_tag( 'p' ) ) {
+			$processor->add_class( 'example-class' );
+		}
+
+		return $processor->get_updated_html();
+	}
+
+	return $block_content;
+}
+add_filter( 'render_block', 'example_add_custom_class_to_paragraph_block', 10, 2 );
+```
+
+### `render_block_{namespace/block}`
+
+Filters the front-end content of the defined block. This is just a simpler form of `render_block` when you only need to modify a specific block type.
+
+The callback function for this filter receives three parameters:
+
+- `$block_content` (`string`): The block content.
+- `$block` (`array`): The full block, including name and attributes.
+- `$instance` (`WP_Block`): The block instance.
+
+In the following example, the class `example-class` is added to all Paragraph blocks on the front end. Notice that compared to the `render_block` example above, you no longer need to check the block type before modifying the content. Again, the [HTML API](https://make.wordpress.org/core/2023/03/07/introducing-the-html-api-in-wordpress-6-2/) is used instead of regex.
+
+```php
+function example_add_custom_class_to_paragraph_block( $block_content, $block ) {
+	   
+	// Add the custom class to the block content using the HTML API.
+	$processor = new WP_HTML_Tag_Processor( $block_content );
+	
+	if ( $processor->next_tag( 'p' ) ) {
+		$processor->add_class( 'example-class' );
+	}
+
+	return $processor->get_updated_html();
+}
+add_filter( 'render_block_core/paragraph', 'example_add_custom_class_to_paragraph_block', 10, 2 );
+```
+
+## Editor
 
-The following filters are available to change the behavior of blocks while editing in the block editor.
+The following JavaScript filters are available to change the behavior of blocks while editing in the Editor.
 
 ### `blocks.getSaveElement`
 
-A filter that applies to the result of a block's `save` function. This filter is used to replace or extend the element, for example using `React.cloneElement` to modify the element's props or replace its children, or returning an entirely new element.
+A filter that applies to the result of a block's `save` function. This filter is used to replace or extend the element, for example using `React.cloneElement` to modify the element's props, replace its children, or return an entirely new element.
 
-The filter's callback receives an element, a block type definition object and the block attributes as arguments. It should return an element.
+The callback function for this filter receives three parameters:
 
-_Example:_
+- `element` (`Object`): The element to be modified and returned.
+- `blockType` (`Object`): A block-type definition object. 
+- `attributes` (`Object`): The block's attributes. 
 
-Wraps a cover block into an outer container.
+The following example wraps a Cover block in an outer container `div`.
 
 ```js
 function wrapCoverBlockInContainer( element, blockType, attributes ) {
-	// skip if element is undefined
+	
+	// Skip if element is undefined.
 	if ( ! element ) {
 		return;
 	}
 
-	// only apply to cover blocks
+	// Only apply to Cover blocks.
 	if ( blockType.name !== 'core/cover' ) {
 		return element;
 	}
 
-	// return the element wrapped in a div
+	// Return the element wrapped in a div.
 	return <div className="cover-block-wrapper">{ element }</div>;
 }
 
@@ -116,15 +237,17 @@ wp.hooks.addFilter(
 );
 ```
 
-#### `blocks.getSaveContent.extraProps`
+### `blocks.getSaveContent.extraProps`
 
-A filter that applies to all blocks returning a WP Element in the `save` function. This filter is used to add extra props to the root element of the `save` function. For example: to add a className, an id, or any valid prop for this element.
+A filter that applies to all blocks returning a WP Element in the `save` function. This filter is used to add extra props to the root element of the `save` function. For example, you could add a className, an id, or any valid prop for this element.
 
-The filter receives the current `save` element's props, a block type and the block attributes as arguments. It should return a props object.
+The callback function for this filter receives three parameters:
 
-_Example:_
+- `props` (`Object`): The current `save` element's props to be modified and returned.
+- `blockType` (`Object`): A block-type definition object. 
+- `attributes` (`Object`): The block's attributes. 
 
-Adding a background by default to all blocks.
+The following example adds a red background by default to all blocks.
 
 ```js
 function addBackgroundColorStyle( props ) {
@@ -141,7 +264,7 @@ wp.hooks.addFilter(
 );
 ```
 
-_Note:_ A [block validation](/docs/reference-guides/block-api/block-edit-save.md#validation) error will occur if this filter modifies existing content the next time the post is edited. The editor verifies that the content stored in the post matches the content output by the `save()` function.
+_Note:_ A [block validation](/docs/reference-guides/block-api/block-edit-save.md#validation) error will occur if this filter modifies existing content the next time the post is edited. The Editor verifies that the content stored in the post matches the content output by the `save()` function.
 
 To avoid this validation error, use `render_block` server-side to modify existing post content instead of this filter. See [render_block documentation](https://developer.wordpress.org/reference/hooks/render_block/).
 
@@ -149,15 +272,13 @@ To avoid this validation error, use `render_block` server-side to modify existin
 
 Generated HTML classes for blocks follow the `wp-block-{name}` nomenclature. This filter allows to provide an alternative class name.
 
-_Example:_
-
 ```js
-// Our filter function
+// Our filter function.
 function setBlockCustomClassName( className, blockName ) {
 	return blockName === 'core/code' ? 'my-plugin-code' : className;
 }
 
-// Adding the filter
+// Adding the filter.
 wp.hooks.addFilter(
 	'blocks.getBlockDefaultClassName',
 	'my-plugin/set-block-custom-class-name',
@@ -173,12 +294,36 @@ Used to filter an individual transform result from block transformation. All of
 
 Called immediately after the default parsing of a block's attributes and before validation to allow a plugin to manipulate attribute values in time for validation and/or the initial values rendering of the block in the editor.
 
+The callback function for this filter accepts 4 parameters:
+- `blockAttributes` (`Object`): All block attributes.
+- `blockType` (`Object`): The block type.
+- `innerHTML` (`string`): Raw block content.
+- `attributes` (`object`): Known block attributes (from delimiters).
+
+In the example below, we use the `blocks.getBlockAttributes` filter to lock the position of all paragraph blocks on a page.
+
+```js
+// Our filter function
+function lockParagraphs( blockAttributes, blockType, innerHTML, attributes  ) {
+    if('core/paragraph' === blockType.name) {
+        blockAttributes['lock'] = {move: true}
+    }
+    return blockAttributes;
+}
+
+// Add the filter
+wp.hooks.addFilter(
+    'blocks.getBlockAttributes',
+    'my-plugin/lock-paragraphs',
+    lockParagraphs
+);
+```
+
 ### `editor.BlockEdit`
 
 Used to modify the block's `edit` component. It receives the original block `BlockEdit` component and returns a new wrapped component.
 
-_Example:_
-
+The following example adds a new Inspector panel for all blocks.
 
 ```js
 const { createHigherOrderComponent } = wp.compose;
@@ -189,7 +334,7 @@ const withMyPluginControls = createHigherOrderComponent( ( BlockEdit ) => {
 	return ( props ) => {
 		return (
 			<>
-				<BlockEdit { ...props } />
+				<BlockEdit key="edit" { ...props } />
 				<InspectorControls>
 					<PanelBody>My custom control</PanelBody>
 				</InspectorControls>
@@ -205,12 +350,13 @@ wp.hooks.addFilter(
 );
 ```
 
-
-Note that as this hook is run for _all blocks_, consuming it has potential for performance regressions particularly around block selection metrics.
+Note that as this hook is run for _all blocks_, consuming it has the potential for performance regressions, particularly around block selection metrics.
 
 To mitigate this, consider whether any work you perform can be altered to run only under certain conditions.
 
-For example, if you are adding components that only need to render when the block is _selected_, then you can use the block's "selected" state (`props.isSelected`) to conditionalize your rendering.
+For example, suppose you are adding components that only need to render when the block is _selected_. In that case, you can use the block's "selected" state (`props.isSelected`) to conditionalize your rendering.
+
+The following example adds a new Inspector panel for all blocks, but only when a block is selected.
 
 ```js
 const withMyPluginControls = createHigherOrderComponent( ( BlockEdit ) => {
@@ -218,22 +364,22 @@ const withMyPluginControls = createHigherOrderComponent( ( BlockEdit ) => {
 		return (
 			<>
 				<BlockEdit { ...props } />
-				{ props.isSelected && {
+				{ props.isSelected && (
 					<InspectorControls>
 						<PanelBody>My custom control</PanelBody>
 					</InspectorControls>
-				}}
+				) }
 			</>
 		);
 	};
 }, 'withMyPluginControls' );
 ```
 
-#### `editor.BlockListBlock`
+### `editor.BlockListBlock`
 
 Used to modify the block's wrapper component containing the block's `edit` component and all toolbars. It receives the original `BlockListBlock` component and returns a new wrapped component.
 
-_Example:_
+The following example adds a unique class name to all blocks.
 
 ```js
 const { createHigherOrderComponent } = wp.compose;
@@ -259,10 +405,7 @@ wp.hooks.addFilter(
 );
 ```
 
-Adding new properties to the block's wrapper component can be achieved by adding them to the `wrapperProps` property of the returned component.
-
-_Example:_
-
+You can add new properties to the block's wrapper component using the `wrapperProps` property of the returned component as shown in the following example.
 
 ```js
 const { createHigherOrderComponent } = wp.compose;
@@ -275,6 +418,7 @@ const withMyWrapperProp = createHigherOrderComponent( ( BlockListBlock ) => {
 		return <BlockListBlock { ...props } wrapperProps={ wrapperProps } />;
 	};
 }, 'withMyWrapperProp' );
+
 wp.hooks.addFilter(
 	'editor.BlockListBlock',
 	'my-plugin/with-my-wrapper-prop',
@@ -282,13 +426,31 @@ wp.hooks.addFilter(
 );
 ```
 
+### `editor.postContentBlockTypes`
+
+Used to modify the list of blocks that should be enabled even when used inside a locked template. Any block that saves data to a post should be added here. An example of this is the Post Featured Image block. Often used in templates, this block should still allow selecting the image even when the template is locked.
+
+The following example enables the fictitious block `namespace/example`.
+
+```js
+const addExampleBlockToPostContentBlockTypes = ( blockTypes ) => {
+	return [ ...blockTypes, 'namespace/example' ];
+};
+
+wp.hooks.addFilter(
+	'editor.postContentBlockTypes',
+	'my-plugin/post-content-block-types',
+	addExampleBlockToPostContentBlockTypes
+);
+```
 
 ## Removing Blocks
 
 ### Using a deny list
 
-Adding blocks is easy enough, removing them is as easy. Plugin or theme authors have the possibility to "unregister" blocks.
+Adding blocks is easy enough, and removing them is as easy. Plugin or theme authors can "unregister" blocks using a deny list in JavaScript.
 
+Place the following code in a `my-plugin.js` file.
 
 ```js
 // my-plugin.js
@@ -300,8 +462,7 @@ domReady( function () {
 } );
 ```
 
-
-and load this script in the Editor
+Then, load this script in the Editor using the following function.
 
 ```php
 <?php
@@ -317,7 +478,9 @@ function my_plugin_deny_list_blocks() {
 add_action( 'enqueue_block_editor_assets', 'my_plugin_deny_list_blocks' );
 ```
 
-**Important:** When unregistering a block, there can be a [race condition](https://en.wikipedia.org/wiki/Race_condition) on which code runs first: registering the block, or unregistering the block. You want your unregister code to run last. The way to do that is specify the component that is registering the block as a dependency, in this case `wp-edit-post`. Additionally, using `wp.domReady()` ensures the unregister code runs once the dom is loaded.
+<div class="callout callout-warning">
+	When unregistering a block, there can be a <a href="https://en.wikipedia.org/wiki/Race_condition">race condition</a> on which code runs first: registering the block or unregistering the block. You want your unregister code to run last. To do this, you must specify the component that is registering the block as a dependency, in this case, <code>wp-edit-post</code>. Additionally, using <code>wp.domReady()</code> ensures the unregister code runs once the dom is loaded.
+</div>
 
 ### Using an allow list
 
@@ -344,37 +507,37 @@ wp.blocks.getBlockTypes().forEach( function ( blockType ) {
 
 ### `allowed_block_types_all`
 
-_**Note:** Before WordPress 5.8 known as `allowed_block_types`. In the case when you want to support older versions of WordPress you might need a way to detect which filter should be used – the deprecated one vs the new one. The recommended way to proceed is to check if the `WP_Block_Editor_Context` class exists._
+<div class="callout callout-warning">
+	Before WordPress 5.8, this hook was known as <code>allowed_block_types</code>, which is now deprecated. If you need to support older versions of WordPress, you might need a way to detect which filter should be used. You can check if <code>allowed_block_types</code> is safe to use by seeing if the <code>WP_Block_Editor_Context</code> class exists, which was introduced in 5.8.
+</div>
 
-On the server, you can filter the list of blocks shown in the inserter using the `allowed_block_types_all` filter. You can return either true (all block types supported), false (no block types supported), or an array of block type names to allow. You can also use the second provided param `$editor_context` to filter block types based on its content.
+On the server, you can filter the list of blocks shown in the inserter using the `allowed_block_types_all` filter. You can return either true (all block types supported), false (no block types supported), or an array of block type names to allow. You can also use the second provided parameter `$editor_context` to filter block types based on their content.
 
 ```php
 <?php
 // my-plugin.php
-
-function filter_allowed_block_types_when_post_provided( $allowed_block_types, $editor_context ) {
+function example_filter_allowed_block_types_when_post_provided( $allowed_block_types, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		return array( 'core/paragraph', 'core/heading' );
 	}
 	return $allowed_block_types;
 }
-
-add_filter( 'allowed_block_types_all', 'filter_allowed_block_types_when_post_provided', 10, 2 );
+add_filter( 'allowed_block_types_all', 'example_filter_allowed_block_types_when_post_provided', 10, 2 );
 ```
 
 ## Managing block categories
 
 ### `block_categories_all`
 
-_**Note:** Before WordPress 5.8 known as `block_categories`. In the case when you want to support older versions of WordPress you might need a way to detect which filter should be used – the deprecated one vs the new one. The recommended way to proceed is to check if the `WP_Block_Editor_Context` class exists._
+<div class="callout callout-warning">
+	Before WordPress 5.8, this hook was known as <code>block_categories</code>, which is now deprecated. If you need to support older versions of WordPress, you might need a way to detect which filter should be used. You can check if <code>block_categories</code> is safe to use by seeing if the <code>WP_Block_Editor_Context</code> class exists, which was introduced in 5.8.
+</div>
 
-It is possible to filter the list of default block categories using the `block_categories_all` filter. You can do it on the server by implementing a function which returns a list of categories. It is going to be used during blocks registration and to group blocks in the inserter. You can also use the second provided param `$editor_context` to filter the based on its content.
+It is possible to filter the list of default block categories using the `block_categories_all` filter. You can do it on the server by implementing a function which returns a list of categories. It is going to be used during block registration and to group blocks in the inserter. You can also use the second provided parameter `$editor_context` to filter the based on its content.
 
 ```php
-<?php
 // my-plugin.php
-
-function filter_block_categories_when_post_provided( $block_categories, $editor_context ) {
+function example_filter_block_categories_when_post_provided( $block_categories, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		array_push(
 			$block_categories,
@@ -387,8 +550,7 @@ function filter_block_categories_when_post_provided( $block_categories, $editor_
 	}
 	return $block_categories;
 }
-
-add_filter( 'block_categories_all', 'filter_block_categories_when_post_provided', 10, 2 );
+add_filter( 'block_categories_all', 'example_filter_block_categories_when_post_provided', 10, 2 );
 ```
 
 ### `wp.blocks.updateCategory`
@@ -397,7 +559,7 @@ You can also display an icon with your block category by setting an `icon` attri
 
 You can also set a custom icon in SVG format. To do so, the icon should be rendered and set on the frontend, so it can make use of WordPress SVG, allowing mobile compatibility and making the icon more accessible.
 
-To set an SVG icon for the category shown in the previous example, add the following example JavaScript code to the editor calling `wp.blocks.updateCategory` e.g:
+To set an SVG icon for the category shown in the previous example, add the following example JavaScript code to the Editor calling `wp.blocks.updateCategory` e.g:
 
 ```js
 ( function () {
diff --git a/docs/reference-guides/filters/editor-filters.md b/docs/reference-guides/filters/editor-filters.md
index 59f6d7ef8213f3..08d1c5ddb8a33c 100644
--- a/docs/reference-guides/filters/editor-filters.md
+++ b/docs/reference-guides/filters/editor-filters.md
@@ -1,23 +1,166 @@
 # Editor Hooks
 
-To modify the behavior of the editor experience, WordPress exposes several APIs.
+WordPress exposes several APIs that allow you to modify the editor experience.
+
+## Editor settings
+
+One of the most common ways to modify the Editor is through the [`block_editor_settings_all`](https://developer.wordpress.org/reference/hooks/block_editor_settings_all/) PHP filter, which is applied before settings are sent to the initialized Editor. This filter allows plugin and theme authors extensive control over how the Editor behaves.
+
+<div class="callout callout-warning">
+	Before WordPress 5.8, this hook was known as <code>block_editor_settings</code>, which is now deprecated. If you need to support older versions of WordPress, you might need a way to detect which filter should be used. You can check if <code>block_editor_settings</code> is safe to use by seeing if the <code>WP_Block_Editor_Context</code> class exists, which was introduced in 5.8.
+</div>
+
+The `block_editor_settings_all` hook passes two parameters to the callback function:
+
+- `$settings` – An array of configurable settings for the Editor.
+- `$context` – An instance of [`WP_Block_Editor_Context`](https://developer.wordpress.org/reference/classes/wp_block_editor_context/), an object that contains information about the current Editor.
+
+The following example modifies the maximum upload file size. Add this to a plugin or your theme's `functions.php` file to test it.
+
+```php
+add_filter( 'block_editor_settings_all', 'example_filter_block_editor_settings_when_post_provided', 10, 2 );
+
+function example_filter_block_editor_settings_when_post_provided( $editor_settings, $editor_context ) {
+	if ( ! empty( $editor_context->post ) ) {
+		$editor_settings['maxUploadFileSize'] = 12345;
+	}
+	return $editor_settings;
+}
+```
+
+There are dozens of editor settings, too many to list in this documentation article, but here are a few examples of what you can do with the `block_editor_settings_all` filter.
+
+<div class="callout callout-info">
+	To view all available settings, open the Editor and then open the console in your browser's <a href="https://developer.wordpress.org/advanced-administration/debug/debug-javascript/#open-the-developer-tools">Developer Tools</a>. Enter the command <code>wp.data.select( 'core/block-editor' ).getSettings()</code> to display the current values for all Editor settings.
+</div>
+
+### Restrict code editor access
+
+The `codeEditingEnabled`, which defaults to `true`, controls whether the user can access the code editor **in addition** to the visual editor. There may be instances where you don't want certain users to be able to access this view.
+
+If this setting is set to `false`, the user will not be able to switch between visual and code editor. The option in the settings menu will not be available, and the keyboard shortcut for switching editor types will not fire. Here's an example:
+
+```php
+add_filter( 'block_editor_settings_all', 'example_restrict_code_editor' );
+
+function example_restrict_code_editor( $settings ) {
+	$can_active_plugins = current_user_can( 'activate_plugins' );
+
+	// Disable the Code Editor for users that cannot activate plugins (Administrators).
+	if ( ! $can_active_plugins ) {
+		$settings[ 'codeEditingEnabled' ] = false;
+	}
+
+	return $settings;
+}
+```
+
+### Restrict visual editor access
+
+Similar to the `codeEditingEnabled` setting, `richEditingEnabled` allows you to control who can access the visual editor. If `true`, the user can edit the content using the visual editor.
+
+The setting defaults to the returned value of the [`user_can_richedit`](https://developer.wordpress.org/reference/functions/user_can_richedit/) function. It checks whether the user can access the visual editor and whether the user's browser supports it.
+
+### Set a default image size
+
+Images are set to the `large` image size by default in the Editor. You can modify this using the `imageDefaultSize` setting, which is especially useful if you have configured your own custom image sizes. The following example changes the default image size to `medium`.
+
+```php
+add_filter( 'block_editor_settings_all', 'example_set_default_image_size' );
+
+function example_set_default_image_size( $settings ) {
+	$settings['imageDefaultSize'] = 'medium';
+	return $settings;
+}
+```
+
+### Disable Openverse
+
+The [Openverse](https://openverse.org/) integration is enabled for all WordPress sites by default and is controlled by the `enableOpenverseMediaCategory` setting. To disable Openverse, apply the following filter:
+
+```php
+add_filter( 'block_editor_settings_all', 'example_disable_openverse' );
+
+function example_disable_openverse( $settings ) {
+	$settings['enableOpenverseMediaCategory'] = false;
+	return $settings;
+}
+```
+
+### Disable the Font Library
+
+The Font Library allows users to install new fonts on their site, which is enabled by default and is controlled by the `fontLibraryEnabled` setting. To disable the Font Library, apply the following filter:
+
+```php
+add_filter( 'block_editor_settings_all', 'example_disable_font_library' );
+
+function example_disable_font_library( $settings ) {
+	$settings['fontLibraryEnabled'] = false;
+	return $settings;
+}
+```
+
+### Disable block inspector tabs
+
+Most blocks display [two tabs](https://make.wordpress.org/core/2023/03/07/introduction-of-block-inspector-tabs/) in the Inspector, one for Settings and another for Styles. You can disable these tabs using the `blockInspectorTabs` setting.
+
+```php
+add_filter( 'block_editor_settings_all', 'example_disable_inspector_tabs_by_default' );
+
+function example_disable_inspector_tabs_by_default( $settings ) {
+	$settings['blockInspectorTabs'] = array( 'default' => false );
+	return $settings;
+}
+```
+
+You can also modify which blocks have inspector tabs. Here's an example that disables tabs for a specific block.
+
+```php
+add_filter( 'block_editor_settings_all', 'example_disable_tabs_for_my_custom_block' );
+
+function example_disable_tabs_for_my_custom_block( $settings ) {
+	$current_tab_settings = _wp_array_get( $settings, array( 'blockInspectorTabs' ), array() );
+	$settings['blockInspectorTabs'] = array_merge(
+		$current_tab_settings,
+		array( 'my-plugin/my-custom-block' => false )
+	);
+
+	return $settings;
+}
+```
+
+## Block Directory
+
+The Block Directory allows users to install new block plugins directly in the Editor from the WordPress.org [Plugin Directory](https://wordpress.org/plugins/browse/block/). You can disable this functionality by removing the action that enqueues it, which is `wp_enqueue_editor_block_directory_assets`. To do so, use [`remove_action`](https://developer.wordpress.org/reference/functions/remove_action/) like this:
+
+```php
+remove_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
+```
+
+## Block patterns
+
+Remote patterns, such as those from the WordPress.org [Pattern Directory](https://wordpress.org/patterns/), are available to users by default in the Editor. This functionality is controlled by `should_load_remote_block_patterns`, which defaults to `true`. You can disable remote patterns by setting the filter to false (`__return_false`).
+
+```php
+add_filter( 'should_load_remote_block_patterns', '__return_false' );
+```
 
 ## Editor features
 
-The following filters are available to extend the editor features.
+The following filters are available to extend features in the Editor.
 
 ### `editor.PostFeaturedImage.imageSize`
 
-Used to modify the image size displayed in the Post Featured Image component. It defaults to `'post-thumbnail'`, and will fail back to the `full` image size when the specified image size doesn't exist in the media object. It's modeled after the `admin_post_thumbnail_size` filter in the classic editor.
-
-_Example:_
+You can use this filter to modify the image size displayed in the Post Featured Image component. It defaults to `'post-thumbnail'` and will fail back to the `full` image size when the specified image size doesn't exist in the media object. It's modeled after the `admin_post_thumbnail_size` filter in the Classic Editor.
 
 ```js
-var withImageSize = function ( size, mediaId, postId ) {
+import { addFilter } from '@wordpress/hooks';
+
+const withImageSize = function ( size, mediaId, postId ) {
 	return 'large';
 };
 
-wp.hooks.addFilter(
+addFilter(
 	'editor.PostFeaturedImage.imageSize',
 	'my-plugin/with-image-size',
 	withImageSize
@@ -26,16 +169,16 @@ wp.hooks.addFilter(
 
 ### `editor.PostPreview.interstitialMarkup`
 
-Filters the interstitial message shown when generating previews.
-
-_Example:_
+You can also filter the interstitial message shown when generating previews. Here's an example:
 
 ```js
-var customPreviewMessage = function () {
+import { addFilter } from '@wordpress/hooks';
+
+const customPreviewMessage = function () {
 	return '<b>Post preview is being generated!</b>';
 };
 
-wp.hooks.addFilter(
+addFilter(
 	'editor.PostPreview.interstitialMarkup',
 	'my-plugin/custom-preview-message',
 	customPreviewMessage
@@ -44,13 +187,13 @@ wp.hooks.addFilter(
 
 ### `media.crossOrigin`
 
-Used to set or modify the `crossOrigin` attribute for foreign-origin media elements (i.e `<audio>` , `<img>` , `<link>` , `<script>`, `<video>`). See this [article](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/crossorigin) for more information the `crossOrigin` attribute, its values and how it applies to each element.
-
-One example of it in action is in the Image block's transform feature to allow cross-origin images to be used in a `<canvas>`.
+This filter is used to set or modify the `crossOrigin` attribute for foreign-origin media elements (i.e., `<audio>`, `<img>`, `<link>`, `<script>`, `<video>`). See this [article](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/crossorigin) for more information on the `crossOrigin` attribute, its values, and how it applies to each element.
 
-_Example:_
+One example of it in action is in the Image block's transform feature to allow cross-origin images to be used in a `<canvas>`. Here's an example:
 
 ```js
+import { addFilter } from '@wordpress/hooks';
+
 addFilter(
 	'media.crossOrigin',
 	'my-plugin/with-cors-media',
@@ -66,112 +209,39 @@ addFilter(
 );
 ```
 
-## Editor settings
-
-### `block_editor_settings_all`
-
-_**Note:** Before WordPress 5.8 known as `block_editor_settings`. In the case when you want to support older versions of WordPress you might need a way to detect which filter should be used – the deprecated one vs the new one. The recommended way to proceed is to check if the `WP_Block_Editor_Context` class exists._
-
-This is a PHP filter which is applied before sending settings to the WordPress block editor.
-
-You may find details about this filter [on its WordPress Code Reference page](https://developer.wordpress.org/reference/hooks/block_editor_settings_all/).
-
-The filter will send any setting to the initialized Editor, which means any editor setting that is used to configure the editor at initialization can be filtered by a PHP WordPress plugin before being sent.
+## Editor REST API preload paths
 
-_Example:_
+You can use [`block_editor_rest_api_preload_paths`](https://developer.wordpress.org/reference/hooks/block_editor_rest_api_preload_paths/) to filter the array of REST API paths that will be used to preload common data to use with the block editor. Here's an example:
 
 ```php
-<?php
-// my-plugin.php
+add_filter( 'block_editor_rest_api_preload_paths', 'example_filter_block_editor_rest_api_preload_paths_when_post_provided', 10, 2 );
 
-function filter_block_editor_settings_when_post_provided( $editor_settings, $editor_context ) {
-	if ( ! empty( $editor_context->post ) ) {
-		$editor_settings['maxUploadFileSize'] = 12345;
-	}
-	return $editor_settings;
-}
-
-add_filter( 'block_editor_settings_all', 'filter_block_editor_settings_when_post_provided', 10, 2 );
-```
-
-#### `block_editor_rest_api_preload_paths`
-
-Filters the array of REST API paths that will be used to preloaded common data to use with the block editor.
-
-_Example:_
-
-```php
-<?php
-// my-plugin.php
-
-function filter_block_editor_rest_api_preload_paths_when_post_provided( $preload_paths, $editor_context ) {
+function example_filter_block_editor_rest_api_preload_paths_when_post_provided( $preload_paths, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		array_push( $preload_paths, array( '/wp/v2/blocks', 'OPTIONS' ) );
 	}
 	return $preload_paths;
 }
-
-add_filter( 'block_editor_rest_api_preload_paths', 'filter_block_editor_rest_api_preload_paths_when_post_provided', 10, 2 );
 ```
 
-### Available default editor settings
-
-#### `richEditingEnabled`
-
-If it is `true` the user can edit the content using the visual editor.
-
-It is set by default to the return value of the [`user_can_richedit`](https://developer.wordpress.org/reference/functions/user_can_richedit/) function. It checks if the user can access the visual editor and whether it’s supported by the user’s browser.
-
-#### `codeEditingEnabled`
-
-Default `true`. Indicates whether the user can access the code editor **in addition** to the visual editor.
-
-If set to false the user will not be able to switch between visual and code editor. The option in the settings menu will not be available and the keyboard shortcut for switching editor types will not fire.
-
 ## Logging errors
 
-_**Note:** Since WordPress 6.1._
+A JavaScript error in a part of the UI shouldn't break the whole app. To solve this problem for users, React library uses the concept of an ["error boundary"](https://react.dev/reference/react/Component#catching-rendering-errors-with-an-error-boundary). Error boundaries are React components that catch JavaScript errors anywhere in their child component tree and display a fallback UI instead of the component tree that crashed.
 
-A JavaScript error in a part of the UI shouldn’t break the whole app. To solve this problem for users, React library uses a concept of an [“error boundary”](https://reactjs.org/docs/error-boundaries.html). Error boundaries are React components that catch JavaScript errors anywhere in their child component tree, and display a fallback UI instead of the component tree that crashed.
+The `editor.ErrorBoundary.errorLogged` action allows you to hook into the [Error Boundaries](https://react.dev/reference/react/Component#catching-rendering-errors-with-an-error-boundary) and gives you access to the error object.
 
-### `editor.ErrorBoundary.errorLogged`
-
-Allows you to hook into the [Error Boundaries](https://reactjs.org/docs/error-boundaries.html) and gives you access to the error object.
-
-You can use this action if you want to get hold of the error object that's handled by the boundaries, i.e to send them to an external error tracking tool.
-
-_Example_:
+You can use this action to get hold of the error object handled by the boundaries. For example, you may want to send them to an external error-tracking tool. Here's an example:
 
 ```js
+import { addAction } from '@wordpress/hooks';
+
 addAction(
 	'editor.ErrorBoundary.errorLogged',
 	'mu-plugin/error-capture-setup',
 	( error ) => {
-		// error is the exception's error object
-		ErrorCaptureTool.captureError( error );
+		// Error is the exception's error object. 
+		// You can console.log it or send it to an external error-tracking tool.
+		console.log ( error );
 	}
 );
 ```
-
-## Block Directory
-
-The Block Directory enables installing new block plugins from [WordPress.org.](https://wordpress.org/plugins/browse/block/) It can be disabled by removing the actions that enqueue it. In WordPress core, the function is `wp_enqueue_editor_block_directory_assets`. To remove the feature, use [`remove_action`,](https://developer.wordpress.org/reference/functions/remove_action/) like this:
-
-```php
-<?php
-// my-plugin.php
-
-remove_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
-```
-
-## Block Patterns
-
-### `should_load_remote_block_patterns`
-
-Default `true`. The filter is checked when registering remote block patterns, set to false to disable.
-
-For example, to disable use:
-
-```
-add_filter( 'should_load_remote_block_patterns', '__return_false' );
-```
diff --git a/docs/reference-guides/filters/global-styles-filters.md b/docs/reference-guides/filters/global-styles-filters.md
index 7d3b6be95768b9..59bbbfcd5921dd 100644
--- a/docs/reference-guides/filters/global-styles-filters.md
+++ b/docs/reference-guides/filters/global-styles-filters.md
@@ -14,7 +14,7 @@ _Example:_
 This is how to pass a new color palette for the theme and disable the text color UI:
 
 ```php
-function filter_theme_json_theme( $theme_json ){
+function wpdocs_filter_theme_json_theme( $theme_json ){
 	$new_data = array(
 		'version'  => 2,
 		'settings' => array(
@@ -38,5 +38,5 @@ function filter_theme_json_theme( $theme_json ){
 
 	return $theme_json->update_with( $new_data );
 }
-add_filter( 'wp_theme_json_data_theme', 'filter_theme_json_theme' );
+add_filter( 'wp_theme_json_data_theme', 'wpdocs_filter_theme_json_theme' );
 ```
diff --git a/docs/reference-guides/filters/parser-filters.md b/docs/reference-guides/filters/parser-filters.md
index 3acfb2489182db..7adc68cc0bf7e7 100644
--- a/docs/reference-guides/filters/parser-filters.md
+++ b/docs/reference-guides/filters/parser-filters.md
@@ -26,11 +26,11 @@ class EmptyParser {
   }
 }
 
-function my_plugin_select_empty_parser( $prev_parser_class ) {
+function wpdocs_select_empty_parser( $prev_parser_class ) {
     return 'EmptyParser';
 }
 
-add_filter( 'block_parser_class', 'my_plugin_select_empty_parser', 10, 1 );
+add_filter( 'block_parser_class', 'wpdocs_select_empty_parser', 10, 1 );
 ```
 
 > **Note**: At the present time it's not possible to replace the client-side parser.
diff --git a/docs/reference-guides/interactivity-api/README.md b/docs/reference-guides/interactivity-api/README.md
new file mode 100644
index 00000000000000..3a5bbb84ff159c
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/README.md
@@ -0,0 +1,124 @@
+# Interactivity API Reference
+
+The Interactivity API, [introduced in WordPress 6.5](https://make.wordpress.org/core/2024/02/19/merge-announcement-interactivity-api/), provides a standard way for developers to add interactions to the front end of their blocks. The API is also used in many Core WordPress blocks, including Search, Query, Navigation, and File.
+
+This standard makes it easier for developers to create rich, interactive user experiences, from simple counters or pop-ups to more complex features like instant page navigation, instant search, shopping carts, or checkouts.
+
+Blocks can share data, actions, and callbacks between them. This makes communication between blocks simpler and less error-prone. For example, clicking on an “add to cart” block can seamlessly update a separate “cart” block.
+
+For more information about the genesis of the Interactivity API, check out the [original proposal](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/). You can also review the [merge announcement](https://make.wordpress.org/core/2024/02/19/merge-announcement-interactivity-api/), the [status update post](https://make.wordpress.org/core/2023/08/15/status-update-on-the-interactivity-api/), and the official [Trac ticket](https://core.trac.wordpress.org/ticket/60356).
+
+<div class="callout callout-info">
+    The Interactivity API is supported by the package <a href="https://developer.wordpress.org/block-editor/reference-guides/packages/packages-interactivity/"><code>@wordpress/interactivity</code></a> which is bundled in WordPress Core from v6.5
+</div>
+
+## Navigating the Interactivity API docs
+
+Use the following links to locate the topic you're interested in. If you have never worked with the Interactivity API before, consider reading through the following resources in the order listed.
+
+-   **[Requirements](#requirements-of-the-interactivity-api):** Check this section before you start creating your interactive blocks with the Interactivity API.
+-   **[Quick Start Guide](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/iapi-quick-start-guide/):** Get a custom block using the Interactivity API up and running in less than one minute.
+-   **[Tutorial: A first look at the Interactivity API](https://developer.wordpress.org/news/2024/04/11/a-first-look-at-the-interactivity-api/)** This article from the [WordPress Developer Blog](https://developer.wordpress.org/news/) is a great way to get introduced to the Interactivity API.
+-   **[Core Concepts](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/core-concepts/)** Gain a better understanding of concepts and mental models related to Interactivity API development from this section.
+-   **[API Reference](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/api-reference/):** To take a deep dive into how the API works internally, the list of Directives, and how the Store works.
+-   **[Docs and Examples](#docs-examples):** Additional resources to learn/read more about the Interactivity API.
+
+To get a deeper understanding of what the Interactivity API is or find answers to questions you may have about this standard, check the following resources:
+
+-   **[About the Interactivity API](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/iapi-about/):** To learn more about the API Goals and the reasoning behind the use of a standard to add interactivity to blocks.
+-   **[Frequently Asked Questions](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/iapi-faq/):** To find responses to some frequently asked questions about the technology behind and alternatives.
+
+## Requirements of the Interactivity API
+
+Interactivity API is included in Core in WordPress 6.5. For versions below, you'll need Gutenberg 17.5 or higher installed and activated in your WordPress installation.
+
+It’s also important to highlight that the block creation workflow doesn’t change, and all the [prerequisites](https://developer.wordpress.org/block-editor/getting-started/devenv/) remain the same. These include:
+
+-   [Code Editor](https://developer.wordpress.org/block-editor/getting-started/devenv/#code-editor)
+-   [Node.js development tools](https://developer.wordpress.org/block-editor/getting-started/devenv/#node-js-development-tools)
+-   [Local WordPress environment (site)](https://developer.wordpress.org/block-editor/getting-started/devenv/#local-wordpress-environment)
+
+You can start creating interactions once you set up a block development environment and run WordPress 6.5+ (or Gutenberg 17.5+).
+
+### Code requirements
+
+#### Add `interactivity` to your project
+
+Install the Interactivity API to your project with the following command:
+
+```bash
+npm install @wordpress/interactivity --save
+```
+
+Import the store into your `view.js`. Refer to the [store documentation](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/api-reference/#the-store) for more information.
+
+```js
+import { store } from '@wordpress/interactivity';
+```
+
+#### Add `interactivity` support to `block.json`
+
+To indicate that the block [supports](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/) the Interactivity API features, add `"interactivity": true` to the `supports` attribute of the block's `block.json` file.
+
+```json
+// block.json
+"supports": {
+    "interactivity": true
+},
+```
+
+Refer to the [`interactivity` support property docs](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/#interactivity) to get a more detailed description of this property.
+
+#### Load Interactivity API JavaScript code with `viewScriptModule`
+
+The Interactivity API provides the `@wordpress/interactivity` Script Module. JavaScript using the Interactivity API should be implemented as Script Modules so they can depend on `@wordpress/interactivity`. [Script Modules have been available since WordPress 6.5](https://make.wordpress.org/core/2024/03/04/script-modules-in-6-5/). Blocks can use [`viewScriptModule` block metadata](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#view-script-module) to enqueue their Script Modules easily:
+
+```json
+// block.json
+{
+   ...
+   "viewScriptModule": "file:./view.js"
+}
+```
+
+The use of `viewScriptModule` also requires the `--experimental-modules` flag for both the [`build`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#build) and [`start`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#start) scripts of `wp-scripts` to ensure a proper build of the Script Modules.
+
+```json
+// package.json
+{
+    "scripts": {
+        ...
+		"build": "wp-scripts build --experimental-modules",
+		"start": "wp-scripts start --experimental-modules"
+	}
+```
+
+#### Add `wp-interactive` directive to a DOM element
+
+To "activate" the Interactivity API in a DOM element (and its children), add the [`wp-interactive`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-interactivity/packages-interactivity-api-reference/#wp-interactive) directive to the DOM element in the block's `render.php` or `save.js` files.
+
+```html
+<div data-wp-interactive="myPlugin">
+	<!-- Interactivity API zone -->
+</div>
+```
+
+Refer to the [`wp-interactive` documentation](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/api-reference/#wp-interactive) for a more detailed description of this directive.
+
+## Docs & Examples
+
+Here you have some more resources to learn/read more about the Interactivity API:
+
+-   [WordPress 6.5 Dev Note](https://make.wordpress.org/core/2024/03/04/interactivity-api-dev-note/)
+-   [Merge announcement](https://make.wordpress.org/core/2024/02/19/merge-announcement-interactivity-api/)
+-   [Proposal: The Interactivity API – A better developer experience in building interactive blocks](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/)
+-   [Interactivity API Discussions](https://github.com/WordPress/gutenberg/discussions/52882), especially the [showcase](https://github.com/WordPress/gutenberg/discussions/55642#discussioncomment-9667164) discussions.
+-   [wpmovies.dev](http://wpmovies.dev/) demo and its [wp-movies-demo](https://github.com/WordPress/wp-movies-demo) repo
+-   Examples using the Interactivity API at [block-development-examples](https://github.com/WordPress/block-development-examples):
+    -   [`interactivity-api-block-833d15`](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/interactivity-api-block-833d15)
+    -   [`interactivity-api-countdown-3cd73e`](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/interactivity-api-countdown-3cd73e)
+    -   [`interactivity-api-quiz-1835fa`](https://github.com/WordPress/block-development-examples/tree/trunk/plugins/interactivity-api-quiz-1835fa)
+
+<div class="callout">
+    There's a Tracking Issue opened to ease the coordination of the work related to the Interactivity API Docs: <a href="https://github.com/WordPress/gutenberg/issues/53296">Documentation for the Interactivity API - Tracking Issue #53296</a>
+</div>
diff --git a/docs/reference-guides/interactivity-api/api-reference.md b/docs/reference-guides/interactivity-api/api-reference.md
new file mode 100644
index 00000000000000..bbbb565684c578
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/api-reference.md
@@ -0,0 +1,1376 @@
+# API Reference
+
+<div class="callout callout-alert">
+Interactivity API is only available for WordPress 6.5 and above.
+</div>
+
+To add interactions to blocks using the Interactivity API, developers can use:
+
+-   **Directives:** Added to the markup to add specific behavior to the DOM elements of the block
+-   **Store:** Contains the logic and data (state, actions, side effects, etc.) needed for the behavior
+
+DOM elements are connected to data stored in the state and context through directives. If data in the state or context change directives will react to those changes, updating the DOM accordingly (see [diagram](https://excalidraw.com/#json=T4meh6lltJh6TCX51NTIu,DmIhxYSGFTL_ywZFbsmuSw)).
+
+![State & Directives](https://make.wordpress.org/core/files/2024/02/interactivity-state-directives.png)
+
+## What are directives?
+
+Directives are custom attributes that are added to the markup of your block to add behavior to its DOM elements. This can be done in the `render.php` file (for dynamic blocks) or the `save.js` file (for static blocks).
+
+Interactivity API directives use the `data-` prefix. Here's an example of directives used in HTML markup.
+
+```html
+<div
+	data-wp-interactive="myPlugin"
+	data-wp-context='{ "isOpen": false }'
+	data-wp-watch="callbacks.logIsOpen"
+>
+	<button
+		data-wp-on--click="actions.toggle"
+		data-wp-bind--aria-expanded="context.isOpen"
+		aria-controls="p-1"
+	>
+		Toggle
+	</button>
+
+	<p id="p-1" data-wp-bind--hidden="!context.isOpen">
+		This element is now visible!
+	</p>
+</div>
+```
+
+Directives can also be injected dynamically using the [HTML Tag Processor](https://make.wordpress.org/core/2023/03/07/introducing-the-html-api-in-wordpress-6-2).
+
+With directives, you can directly manage interactions such as side effects, state, event handlers, attributes, or content.
+
+## List of Directives
+
+### `wp-interactive`
+
+The `wp-interactive` directive "activates" the interactivity for the DOM element and its children through the Interactivity API (directives and store). The directive includes a namespace to reference a specific store, that can be set as a `string` or an `object`.
+
+```html
+<!-- Let's make this element and its children interactive and set the namespace -->
+<div
+	data-wp-interactive="myPlugin"
+	data-wp-context='{ "myColor" : "red", "myBgColor": "yellow" }'
+>
+	<p>
+		I'm interactive now,
+		<span data-wp-style--background-color="context.myBgColor"
+			>and I can use directives!</span
+		>
+	</p>
+	<div>
+		<p>
+			I'm also interactive,
+			<span data-wp-style--color="context.myColor"
+				>and I can also use directives!</span
+			>
+		</p>
+	</div>
+</div>
+
+<!-- This is also valid -->
+<div
+	data-wp-interactive='{ "namespace": "myPlugin" }'
+	data-wp-context='{ "myColor" : "red", "myBgColor": "yellow" }'
+>
+	<p>
+		I'm interactive now,
+		<span data-wp-style--background-color="context.myBgColor"
+			>and I can use directives!</span
+		>
+	</p>
+	<div>
+		<p>
+			I'm also interactive,
+			<span data-wp-style--color="context.myColor"
+				>and I can also use directives!</span
+			>
+		</p>
+	</div>
+</div>
+```
+
+<div class="callout callout-info">
+  The use of <code>data-wp-interactive</code> is a requirement for the Interactivity API "engine" to work. In the following examples the <code>data-wp-interactive</code> has not been added for the sake of simplicity. Also, the <code>data-wp-interactive</code> directive will be injected automatically in the future.
+</div>
+
+### `wp-context`
+
+It provides a **local** state available to a specific HTML node and its children.
+
+The `wp-context` directive accepts a stringified JSON as a value.
+
+```php
+// render.php
+<div data-wp-context='{ "post": { "id": <?php echo $post->ID; ?> } }' >
+  <button data-wp-on--click="actions.logId" >
+    Click Me!
+  </button>
+</div>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+store( 'myPlugin', {
+	actions: {
+		logId: () => {
+			const { post } = getContext();
+			console.log( post.id );
+		},
+	},
+} );
+```
+
+</details>
+
+Different contexts can be defined at different levels, and deeper levels will merge their own context with any parent one:
+
+```html
+<div data-wp-context='{ "foo": "bar" }'>
+	<span data-wp-text="context.foo"><!-- Will output: "bar" --></span>
+
+	<div data-wp-context='{ "bar": "baz" }'>
+		<span data-wp-text="context.foo"><!-- Will output: "bar" --></span>
+
+		<div data-wp-context='{ "foo": "bob" }'>
+			<span data-wp-text="context.foo"><!-- Will output: "bob" --></span>
+		</div>
+	</div>
+</div>
+```
+
+### `wp-bind`
+
+This directive allows setting HTML attributes on elements based on a boolean or string value. It follows the syntax `data-wp-bind--attribute`.
+
+```html
+<li data-wp-context='{ "isMenuOpen": false }'>
+	<button
+		data-wp-on--click="actions.toggleMenu"
+		data-wp-bind--aria-expanded="context.isMenuOpen"
+	>
+		Toggle
+	</button>
+	<div data-wp-bind--hidden="!context.isMenuOpen">
+		<span>Title</span>
+		<ul>
+			SUBMENU ITEMS
+		</ul>
+	</div>
+</li>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+store( 'myPlugin', {
+	actions: {
+		toggleMenu: () => {
+			const context = getContext();
+			context.isMenuOpen = ! context.isMenuOpen;
+		},
+	},
+} );
+```
+
+</details>
+
+The `wp-bind` directive is executed:
+
+-   When the element is created
+-   Each time there's a change on any of the properties of the `state` or `context` involved in getting the final value of the directive (inside the callback or the expression passed as reference)
+
+When `wp-bind` directive references a callback to get its final value:
+
+-   The `wp-bind` directive will be executed each time there's a change on any of the properties of the `state` or `context` used inside this callback.
+-   The returned value in the callback function is used to change the value of the associated attribute.
+
+The `wp-bind` will do different things when the DOM element is applied, depending on its value:
+
+-   If the value is `true`, the attribute is added: `<div attribute>`
+-   If the value is `false`, the attribute is removed: `<div>`
+-   If the value is a string, the attribute is added with its value assigned: `<div attribute="value"`
+-   If the attribute name starts with `aria-` or `data-` and the value is boolean (either `true` or `false`), the attribute is added to the DOM with the boolean value assigned as a string: `<div aria-attribute="true">`
+
+### `wp-class`
+
+This directive adds or removes a class to an HTML element, depending on a boolean value. It follows the syntax `data-wp-class--classname`.
+
+```html
+<div>
+	<li
+		data-wp-context='{ "isSelected": false }'
+		data-wp-on--click="actions.toggleSelection"
+		data-wp-class--selected="context.isSelected"
+	>
+		Option 1
+	</li>
+	<li
+		data-wp-context='{ "isSelected": false }'
+		data-wp-on--click="actions.toggleSelection"
+		data-wp-class--selected="context.isSelected"
+	>
+		Option 2
+	</li>
+</div>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+store( 'myPlugin', {
+	actions: {
+		toggleSelection: () => {
+			const context = getContext();
+			context.isSelected = ! context.isSelected;
+		},
+	},
+} );
+```
+
+</details>
+
+The `wp-class` directive is executed:
+
+-   When the element is created
+-   Each time there's a change on any of the properties of the `state` or `context` involved in getting the final value of the directive (inside the callback or the expression passed as reference)
+
+The boolean value received by the directive is used to toggle (add when `true` or remove when `false`) the associated class name from the `class` attribute.
+
+It's important to note that when using the `wp-class` directive, it's recommended to use kebab-case for class names instead of camelCase. This is because HTML attributes are not case-sensitive, and HTML will treat `data-wp-class--isDark` the same as `data-wp-class--isdark` or `DATA-WP-CLASS--ISDARK`.
+
+So, for example, use the class name `is-dark` instead of `isDark` and `data-wp-class--is-dark` instead of `data-wp-class--isDark`:
+
+```html
+<!-- Recommended -->
+<div data-wp-class--is-dark="context.isDarkMode">
+	<!-- ... -->
+</div>
+
+<!-- Not recommended -->
+<div data-wp-class--isDark="context.isDarkMode">
+	<!-- ... -->
+</div>
+```
+
+```css
+/* Recommended */
+.is-dark {
+	/* ... */
+}
+
+/* Not recommended */
+.isDark {
+	/* ... */
+}
+```
+
+### `wp-style`
+
+This directive adds or removes inline style to an HTML element, depending on its value. It follows the syntax `data-wp-style--css-property`.
+
+```html
+<div data-wp-context='{ "color": "red" }'>
+	<button data-wp-on--click="actions.toggleContextColor">
+		Toggle Color Text
+	</button>
+	<p data-wp-style--color="context.color">Hello World!</p>
+</div>
+>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+store( 'myPlugin', {
+	actions: {
+		toggleContextColor: () => {
+			const context = getContext();
+			context.color = context.color === 'red' ? 'blue' : 'red';
+		},
+	},
+} );
+```
+
+</details>
+
+The `wp-style` directive is executed:
+
+-   When the element is created
+-   Each time there's a change on any of the properties of the `state` or `context` involved in getting the final value of the directive (inside the callback or the expression passed as reference)
+
+The value received by the directive is used to add or remove the style attribute with the associated CSS property:
+
+-   If the value is `false`, the style attribute is removed: `<div>`
+-   If the value is a string, the attribute is added with its value assigned: `<div style="css-property: value;">`
+
+### `wp-text`
+
+It sets the inner text of an HTML element.
+
+```html
+<div data-wp-context='{ "text": "Text 1" }'>
+	<span data-wp-text="context.text"></span>
+	<button data-wp-on--click="actions.toggleContextText">
+		Toggle Context Text
+	</button>
+</div>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+store( 'myPlugin', {
+	actions: {
+		toggleContextText: () => {
+			const context = getContext();
+			context.text = context.text === 'Text 1' ? 'Text 2' : 'Text 1';
+		},
+	},
+} );
+```
+
+</details>
+
+The `wp-text` directive is executed:
+
+-   When the element is created
+-   Each time there's a change on any of the properties of the `state` or `context` involved in getting the final value of the directive (inside the callback or the expression passed as reference)
+
+The returned value is used to change the inner content of the element: `<div>value</div>`.
+
+### `wp-on`
+
+<div class="callout callout-info">
+  Consider using the more performant <a href="#wp-on-async"><code>wp-on-async</code></a> instead if your directive code does not need synchronous access to the event object. If synchronous access is required, consider implementing an <a href="#async-actions"><code>async action</code></a> which yields to the main thread after calling the synchronous API.
+</div>
+
+This directive runs code on dispatched DOM events like `click` or `keyup`. The syntax is `data-wp-on--[event]` (like `data-wp-on--click` or `data-wp-on--keyup`).
+
+```php
+<button data-wp-on--click="actions.logTime" >
+  Click Me!
+</button>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+store( 'myPlugin', {
+	actions: {
+		logTime: ( event ) => {
+			console.log( new Date() );
+		},
+	},
+} );
+```
+
+</details>
+
+The `wp-on` directive is executed each time the associated event is triggered.
+
+The callback passed as the reference receives [the event](https://developer.mozilla.org/en-US/docs/Web/API/Event) (`event`), and the returned value by this callback is ignored.
+
+### `wp-on-async`
+
+This directive is a more performant approach for `wp-on`. It immediately yields to main to avoid contributing to a long task, allowing other interactions that otherwise would be waiting on the main thread to run sooner. Use this async version whenever there is no need for synchronous access to the `event` object, in particular the methods `event.preventDefault()`, `event.stopPropagation()`, and `event.stopImmediatePropagation()`.
+
+### `wp-on-window`
+
+<div class="callout callout-info">
+  Consider using the more performant <a href="#wp-on-async-window"><code>wp-on-async-window</code></a> instead if your directive code does not need synchronous access to the event object. If synchronous access is required, consider implementing an <a href="#async-actions"><code>async action</code></a> which yields to the main thread after calling the synchronous API.
+</div>
+
+This directive allows you to attach global window events like `resize`, `copy`, and `focus` and then execute a defined callback when those happen.
+
+[List of supported window events.](https://developer.mozilla.org/en-US/docs/Web/API/Window#events)
+
+The syntax of this directive is `data-wp-on-window--[window-event]` (like `data-wp-on-window--resize` or `data-wp-on-window--languagechange`).
+
+```php
+<div data-wp-on-window--resize="callbacks.logWidth"></div>
+```
+
+<details>
+	<summary><em>See store used with the directive above</em></summary>
+
+```js
+store( 'myPlugin', {
+	callbacks: {
+		logWidth() {
+			console.log( 'Window width: ', window.innerWidth );
+		},
+	},
+} );
+```
+
+</details>
+
+The callback passed as the reference receives [the event](https://developer.mozilla.org/en-US/docs/Web/API/Event) (`event`), and the returned value by this callback is ignored. When the element is removed from the DOM, the event listener is also removed.
+
+### `wp-on-async-window`
+
+Similar to `wp-on-async`, this is an optimized version of `wp-on-window` that immediately yields to main to avoid contributing to a long task. Use this async version whenever there is no need for synchronous access to the `event` object, in particular the methods `event.preventDefault()`, `event.stopPropagation()`, and `event.stopImmediatePropagation()`. This event listener is also added as [`passive`](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#passive).
+
+### `wp-on-document`
+
+<div class="callout callout-info">
+  Consider using the more performant <a href="#wp-on-async-document"><code>wp-on-async-document</code></a> instead if your directive code does not need synchronous access to the event object. If synchronous access is required, consider implementing an <a href="#async-actions"><code>async action</code></a> which yields to the main thread after calling the synchronous API.
+</div>
+
+This directive allows you to attach global document events like `scroll`, `mousemove`, and `keydown` and then execute a defined callback when those happen.
+
+[List of supported document events.](https://developer.mozilla.org/en-US/docs/Web/API/Document#events)
+
+The syntax of this directive is `data-wp-on-document--[document-event]` (like `data-wp-on-document--keydown` or `data-wp-on-document--selectionchange`).
+
+```php
+<div data-wp-on-document--keydown="callbacks.logKeydown"></div>
+```
+
+<details>
+	<summary><em>See store used with the directive above</em></summary>
+
+```js
+store( 'myPlugin', {
+	callbacks: {
+		logKeydown( event ) {
+			console.log( 'Key pressed: ', event.key );
+		},
+	},
+} );
+```
+
+</details>
+
+The callback passed as the reference receives [the event](https://developer.mozilla.org/en-US/docs/Web/API/Event) (`event`), and the returned value by this callback is ignored. When the element is removed from the DOM, the event listener is also removed.
+
+### `wp-on-async-document`
+
+Similar to `wp-on-async`, this is an optimized version of `wp-on-document` that immediately yields to main to avoid contributing to a long task. Use this async version whenever there is no need for synchronous access to the `event` object, in particular the methods `event.preventDefault()`, `event.stopPropagation()`, and `event.stopImmediatePropagation()`. This event listener is also added as [`passive`](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#passive).
+
+### `wp-watch`
+
+It runs a callback **when the node is created and runs it again when the state or context changes**.
+
+You can attach several side effects to the same DOM element by using the syntax `data-wp-watch--[unique-id]`.
+
+The `unique-id` doesn't need to be unique globally. It just needs to be different from the other unique IDs of the `wp-watch` directives of that DOM element.
+
+```html
+<div data-wp-context='{ "counter": 0 }' data-wp-watch="callbacks.logCounter">
+	<p>Counter: <span data-wp-text="context.counter"></span></p>
+	<button data-wp-on--click="actions.increaseCounter">+</button>
+	<button data-wp-on--click="actions.decreaseCounter">-</button>
+</div>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+store( 'myPlugin', {
+	actions: {
+		increaseCounter: () => {
+			const context = getContext();
+			context.counter++;
+		},
+		decreaseCounter: () => {
+			const context = getContext();
+			context.counter--;
+		},
+	},
+	callbacks: {
+		logCounter: () => {
+			const { counter } = getContext();
+			console.log( 'Counter is ' + counter + ' at ' + new Date() );
+		},
+	},
+} );
+```
+
+</details>
+
+The `wp-watch` directive is executed:
+
+-   When the element is created
+-   Each time that any of the properties of the `state` or `context` used inside the callback changes
+
+The `wp-watch` directive can return a function. If it does, the returned function is used as cleanup logic, i.e., it will run just before the callback runs again, and it will run again when the element is removed from the DOM.
+
+As a reference, some use cases for this directive may be:
+
+-   Logging
+-   Changing the title of the page
+-   Setting the focus on an element with `.focus()`.
+-   Changing the state or context when certain conditions are met
+
+### `wp-init`
+
+This directive runs a callback **only when the node is created**.
+
+You can attach several `wp-init` to the same DOM element by using the syntax `data-wp-init--[unique-id]`.
+
+The `unique-id` doesn't need to be unique globally. It just needs to be different from the other unique IDs of the `wp-init` directives of that DOM element.
+
+```html
+<div data-wp-init="callbacks.logTimeInit">
+	<p>Hi!</p>
+</div>
+```
+
+Here's another example with several `wp-init` directives on the same DOM element.
+
+```html
+<form
+	data-wp-init--log="callbacks.logTimeInit"
+	data-wp-init--focus="callbacks.focusFirstElement"
+>
+	<input type="text" />
+</form>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+import { store, getElement } from '@wordpress/interactivity';
+
+store( "myPlugin", {
+  callbacks: {
+    logTimeInit: () => console.log( `Init at ` + new Date() ),
+    focusFirstElement: () => {
+      const { ref } = getElement();
+      ref.querySelector( 'input:first-child' ).focus(),
+    },
+  },
+} );
+```
+
+</details>
+
+The `wp-init` can return a function. If it does, the returned function will run when the element is removed from the DOM.
+
+### `wp-run`
+
+This directive runs the passed callback **during the node's render execution**.
+
+You can use and compose hooks like `useState`, `useWatch`, or `useEffect` inside the passed callback and create your own logic, providing more flexibility than previous directives.
+
+You can attach several `wp-run` to the same DOM element by using the syntax `data-wp-run--[unique-id]`.
+
+The `unique-id` doesn't need to be unique globally. It just needs to be different from the other unique IDs of the `wp-run` directives of that DOM element.
+
+```html
+<div data-wp-run="callbacks.logInView">
+	<p>Hi!</p>
+</div>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+import {
+	getElement,
+	store,
+	useState,
+	useEffect,
+} from '@wordpress/interactivity';
+
+// Unlike `data-wp-init` and `data-wp-watch`, you can use any hooks inside
+// `data-wp-run` callbacks.
+const useInView = () => {
+	const [ inView, setInView ] = useState( false );
+	useEffect( () => {
+		const { ref } = getElement();
+		const observer = new IntersectionObserver( ( [ entry ] ) => {
+			setInView( entry.isIntersecting );
+		} );
+		observer.observe( ref );
+		return () => ref && observer.unobserve( ref );
+	}, [] );
+	return inView;
+};
+
+store( 'myPlugin', {
+	callbacks: {
+		logInView: () => {
+			const isInView = useInView();
+			useEffect( () => {
+				if ( isInView ) {
+					console.log( 'Inside' );
+				} else {
+					console.log( 'Outside' );
+				}
+			} );
+		},
+	},
+} );
+```
+
+</details>
+
+It's important to note that, similar to (P)React components, the `ref` from `getElement()` is `null` during the first render. To properly access the DOM element reference, you typically need to use an effect-like hook such as `useEffect`, `useInit`, or `useWatch`. This ensures that the `getElement()` runs after the component has been mounted and the `ref` is available.
+
+### `wp-key`
+
+The `wp-key` directive assigns a unique key to an element to help the Interactivity API identify it when iterating through arrays of elements. This becomes important if your array elements can move (e.g., due to sorting), get inserted, or get deleted. A well-chosen key value helps the Interactivity API infer what exactly has changed in the array, allowing it to make the correct updates to the DOM.
+
+The key should be a string that uniquely identifies the element among its siblings. Typically, it is used on repeated elements like list items. For example:
+
+```html
+<ul>
+	<li data-wp-key="unique-id-1">Item 1</li>
+	<li data-wp-key="unique-id-2">Item 2</li>
+</ul>
+```
+
+But it can also be used on other elements:
+
+```html
+<div>
+	<a data-wp-key="previous-page" ...>Previous page</a>
+	<a data-wp-key="next-page" ...>Next page</a>
+</div>
+```
+
+When the list is re-rendered, the Interactivity API will match elements by their keys to determine if an item was added/removed/reordered. Elements without keys might be recreated unnecessarily.
+
+### `wp-each`
+
+The `wp-each` directive is intended to render a list of elements. The directive can be used in `<template>` tags, being the value a path to an array stored in the global state or the context. The content inside the `<template>` tag is the template used to render each of the items.
+
+Each item is included in the context under the `item` name by default, so directives inside the template can access the current item.
+
+For example, let's consider the following HTML.
+
+```html
+<ul data-wp-context='{ "list": [ "hello", "hola", "olá" ] }'>
+	<template data-wp-each="context.list">
+		<li data-wp-text="context.item"></li>
+	</template>
+</ul>
+```
+
+It would generate the following output:
+
+```html
+<ul data-wp-context='{ "list": [ "hello", "hola", "olá" ] }'>
+	<li data-wp-text="context.item">hello</li>
+	<li data-wp-text="context.item">hola</li>
+	<li data-wp-text="context.item">olá</li>
+</ul>
+```
+
+The prop that holds the item in the context can be changed by passing a suffix to the directive name. In the following example, the default prop changes from `item` to `greeting`.
+
+```html
+<ul data-wp-context='{ "list": [ "hello", "hola", "olá" ] }'>
+	<template data-wp-each--greeting="context.list">
+		<li data-wp-text="context.greeting"></li>
+	</template>
+</ul>
+```
+
+By default, it uses each element as the key for the rendered nodes, but you can also specify a path to retrieve the key if necessary, e.g., when the list contains objects.
+
+For that, you must use `data-wp-each-key` in the `<template>` tag and not `data-wp-key` inside the template content. This is because `data-wp-each` creates a context provider wrapper around each rendered item, and those wrappers are the ones that need the `key` property.
+
+```html
+<ul
+	data-wp-context='{
+  "list": [
+    { "id": "en", "value": "hello" },
+    { "id": "es", "value": "hola" },
+    { "id": "pt", "value": "olá" }
+  ]
+}'
+>
+	<template
+		data-wp-each--greeting="context.list"
+		data-wp-each-key="context.greeting.id"
+	>
+		<li data-wp-text="context.greeting.value"></li>
+	</template>
+</ul>
+```
+
+### `wp-each-child`
+
+For server-side rendered lists, another directive called `data-wp-each-child` ensures hydration works as expected. This directive is added automatically when the directive is processed on the server.
+
+```html
+<ul data-wp-context='{ "list": [ "hello", "hola", "olá" ] }'>
+	<template data-wp-each--greeting="context.list">
+		<li data-wp-text="context.greeting"></li>
+	</template>
+	<li data-wp-each-child>hello</li>
+	<li data-wp-each-child>hola</li>
+	<li data-wp-each-child>olá</li>
+</ul>
+```
+
+## Values of directives are references to store properties
+
+The value assigned to a directive is a string pointing to a specific state, action, or side effect.
+
+In the following example, a getter is used to define the `state.isPlaying` derived value.
+
+```js
+const { state } = store( 'myPlugin', {
+	state: {
+		currentVideo: '',
+		get isPlaying() {
+			return state.currentVideo !== '';
+		},
+	},
+} );
+```
+
+And then, the string value `"state.isPlaying"` is used to assign the result of this selector to `data-wp-bind--hidden`.
+
+```html
+<div data-wp-bind--hidden="!state.isPlaying" ...>
+	<iframe ...></iframe>
+</div>
+```
+
+These values assigned to directives are **references** to a particular property in the store. They are wired to the directives automatically so that each directive “knows” what store element refers to, without any additional configuration.
+
+Note that, by default, references point to properties in the current namespace, which is the one specified by the closest ancestor with a `data-wp-interactive` attribute. If you need to access a property from a different namespace, you can explicitly set the namespace where the property accessed is defined. The syntax is `namespace::reference`, replacing `namespace` with the appropriate value.
+
+The example below is getting `state.isPlaying` from `otherPlugin` instead of `myPlugin`:
+
+```html
+<div data-wp-interactive="myPlugin">
+	<div data-wp-bind--hidden="otherPlugin::!state.isPlaying" ...>
+		<iframe ...></iframe>
+	</div>
+</div>
+```
+
+## The store
+
+The store is used to create the logic (actions, side effects, etc.) linked to the directives and the data used inside that logic (state, derived state, etc.).
+
+**The store is usually created in the `view.js` file of each block**, although the state can be initialized from the `render.php` of the block.
+
+### Elements of the store
+
+#### State
+
+It defines data available to the HTML nodes of the page. It is important to differentiate between two ways to define the data:
+
+-   **Global state**: It is defined using the `store()` function with the `state` property, and the data is available to all the HTML nodes of the page.
+-   **Context/Local State**: It is defined using the `data-wp-context` directive in an HTML node, and the data is available to that HTML node and its children. It can be accessed using the `getContext` function inside of an action, derived state or side effect.
+
+```html
+<div data-wp-context='{ "someText": "Hello World!" }'>
+	<!-- Access global state -->
+	<span data-wp-text="state.someText"></span>
+
+	<!-- Access local state (context) -->
+	<span data-wp-text="context.someText"></span>
+</div>
+```
+
+```js
+const { state } = store( 'myPlugin', {
+	state: {
+		someText: 'Hello Universe!',
+	},
+	actions: {
+		someAction: () => {
+			state.someText; // Access or modify global state - "Hello Universe!"
+
+			const context = getContext();
+			context.someText; // Access or modify local state (context) - "Hello World!"
+		},
+	},
+} );
+```
+
+#### Actions
+
+Actions are just regular JavaScript functions. Usually triggered by the `data-wp-on` directive (using event listeners) or other actions.
+
+```ts
+const { state, actions } = store( 'myPlugin', {
+	actions: {
+		selectItem: ( id ) => {
+			const context = getContext();
+			// `id` is optional here, so this action can be used in a directive.
+			state.selected = id || context.id;
+		},
+		otherAction: () => {
+			// but it can also be called from other actions.
+			actions.selectItem( 123 ); // it works and type is correct
+		},
+	},
+} );
+```
+
+<h5 id="async-actions">Async actions</h5>
+
+Async actions should use generators instead of async/await.
+
+In async functions, the control is passed to the function itself. The caller of the function has no way to know if the function is awaiting, and more importantly, if the await is resolved and the function has resumed execution. We need that information to be able to restore the scope.
+
+Imagine a block that has two buttons. One lives inside a context that has `isOpen: true` and the other `isOpen: false`:
+
+```html
+<div data-wp-context='{ "isOpen": true }'>
+	<button data-wp-on--click="actions.someAction">Click</button>
+</div>
+
+<div data-wp-context='{ "isOpen": false }'>
+	<button data-wp-on--click="actions.someAction">Click</button>
+</div>
+```
+
+If the action is async and needs to await a long delay.
+
+-   The user clicks the first button.
+-   The scope points to the first context, where `isOpen: true`.
+-   The first access to `state.isOpen` is correct because `getContext` returns the current scope.
+-   The action starts awaiting a long delay.
+-   Before the action resumes, the user clicks the second button.
+-   The scope is changed to the second context, where `isOpen: false`.
+-   The first access to `state.isOpen` is correct because `getContext` returns the current scope.
+-   The second action starts awaiting a long delay.
+-   The first action finishes awaiting and resumes its execution.
+-   The second access to `state.isOpen` of the first action is incorrect, because `getContext` now returns the wrong scope.
+
+We need to be able to know when async actions start awaiting and resume operations, so we can restore the proper scope, and that's what generators do.
+
+The store will work fine if it is written like this:
+
+```js
+const { state } = store( 'myPlugin', {
+	state: {
+		get isOpen() {
+			return getContext().isOpen;
+		},
+	},
+	actions: {
+		someAction: function* () {
+			state.isOpen; // This context is correct because it's synchronous.
+			yield longDelay(); // With generators, the caller controls when to resume this function.
+			state.isOpen; // This context is correct because we restored the proper scope before we resumed the function.
+		},
+	},
+} );
+```
+
+As mentioned above with [`wp-on`](#wp-on), [`wp-on-window`](#wp-on-window), and [`wp-on-document`](#wp-on-document), an async action should be used whenever the `async` versions of the aforementioned directives cannot be used due to the action requiring synchronous access to the `event` object. Synchronous access is required whenever the action needs to call `event.preventDefault()`, `event.stopPropagation()`, or `event.stopImmediatePropagation()`. To ensure that the action code does not contribute to a long task, you may manually yield to the main thread after calling the synchronous event API. For example:
+
+```js
+// Note: In WordPress 6.6 this splitTask function is exported by @wordpress/interactivity.
+function splitTask() {
+	return new Promise( ( resolve ) => {
+		setTimeout( resolve, 0 );
+	} );
+}
+
+store( 'myPlugin', {
+	actions: {
+		handleClick: function* ( event ) {
+			event.preventDefault();
+			yield splitTask();
+			doTheWork();
+		},
+	},
+} );
+```
+
+You may want to add multiple such `yield` points in your action if it is doing a lot of work.
+
+#### Side Effects
+
+Automatically react to state changes. Usually triggered by `data-wp-watch` or `data-wp-init` directives.
+
+#### Derived state
+
+They return a computed version of the state. They can access both `state` and `context`.
+
+```js
+// view.js
+const { state } = store( 'myPlugin', {
+	state: {
+		amount: 34,
+		defaultCurrency: 'EUR',
+		currencyExchange: {
+			USD: 1.1,
+			GBP: 0.85,
+		},
+		get amountInUSD() {
+			return state.currencyExchange[ 'USD' ] * state.amount;
+		},
+		get amountInGBP() {
+			return state.currencyExchange[ 'GBP' ] * state.amount;
+		},
+	},
+} );
+```
+
+### Accessing data in callbacks
+
+The **`store`** contains all the store properties, like `state`, `actions` or `callbacks`. They are returned by the `store()` call, so you can access them by destructuring it:
+
+```js
+const { state, actions } = store( 'myPlugin', {
+	// ...
+} );
+```
+
+The `store()` function can be called multiple times and all the store parts will be merged together:
+
+```js
+store( 'myPlugin', {
+	state: {
+		someValue: 1,
+	},
+} );
+
+const { state } = store( 'myPlugin', {
+	actions: {
+		someAction() {
+			state.someValue; // = 1
+		},
+	},
+} );
+```
+
+<div class="callout callout-info">
+  All <code>store()</code> calls with the same namespace return the same references, i.e., the same <code>state</code>, <code>actions</code>, etc., containing the result of merging all the store parts passed.
+</div>
+
+-   To access the context inside an action, derived state, or side effect, you can use the `getContext` function.
+-   To access the reference, you can use the `getElement` function.
+
+```js
+const { state } = store( 'myPlugin', {
+	state: {
+		get someDerivedValue() {
+			const context = getContext();
+			const { ref } = getElement();
+			// ...
+		},
+	},
+	actions: {
+		someAction() {
+			const context = getContext();
+			const { ref } = getElement();
+			// ...
+		},
+	},
+	callbacks: {
+		someEffect() {
+			const context = getContext();
+			const { ref } = getElement();
+			// ...
+		},
+	},
+} );
+```
+
+This approach enables some functionalities that make directives flexible and powerful:
+
+-   Actions and side effects can read and modify the state and the context.
+-   Actions and state in blocks can be accessed by other blocks.
+-   Actions and side effects can do anything a regular JavaScript function can do, like access the DOM or make API requests.
+-   Side effects automatically react to state changes.
+
+### Setting the store
+
+#### On the client side
+
+_In the `view.js` file of each block_ the developer can define both the state and the elements of the store referencing functions like actions, side effects or derived state.
+
+The `store` method used to set the store in JavaScript can be imported from `@wordpress/interactivity`.
+
+```js
+// store
+import { store, getContext } from '@wordpress/interactivity';
+
+store( 'myPlugin', {
+	actions: {
+		toggle: () => {
+			const context = getContext();
+			context.isOpen = ! context.isOpen;
+		},
+	},
+	callbacks: {
+		logIsOpen: () => {
+			const { isOpen } = getContext();
+			// Log the value of `isOpen` each time it changes.
+			console.log( `Is open: ${ isOpen }` );
+		},
+	},
+} );
+```
+
+#### On the server side
+
+The state can also be initialized on the server using the `wp_interactivity_state()` function. You would typically do this in the `render.php` file of your block (the `render.php` templates were [introduced](https://make.wordpress.org/core/2022/10/12/block-api-changes-in-wordpress-6-1/) in WordPress 6.1).
+
+The state defined on the server with `wp_interactivity_state()` gets merged with the stores defined in the view.js files.
+
+The `wp_interactivity_state` function receives two arguments, a `string` with the namespace that will be used as a reference and an [associative array](https://www.php.net/manual/en/language.types.array.php) containing the values.
+
+_Example of store initialized from the server with a `state` = `{ someValue: 123 }`_
+
+```php
+// render.php
+wp_interactivity_state( 'myPlugin', array (
+	'someValue' => get_some_value()
+));
+```
+
+Initializing the state in the server also allows you to use any WordPress API. For example, you could use the Core Translation API to translate part of your state:
+
+```php
+// render.php
+wp_interactivity_state( 'favoriteMovies', array(
+      "1" => array(
+        "id" => "123-abc",
+        "movieName" => __("someMovieName", "textdomain")
+      ),
+) );
+```
+
+### Private stores
+
+A given store namespace can be marked as private, thus preventing its content to be accessed from other namespaces. The mechanism to do so is by adding a `lock` option to the `store()` call, as shown in the example below. This way, further executions of `store()` with the same locked namespace will throw an error, meaning that the namespace can only be accessed where its reference was returned from the first `store()` call. This is especially useful for developers who want to hide part of their plugin stores so it doesn't become accessible for extenders.
+
+```js
+const { state } = store(
+	'myPlugin/private',
+	{ state: { messages: [ 'private message' ] } },
+	{ lock: true }
+);
+
+// The following call throws an Error!
+store( 'myPlugin/private', {
+	/* store part */
+} );
+```
+
+There is also a way to unlock private stores: instead of passing a boolean, you can use a string as the `lock` value. Such a string can then be used in subsequent `store()` calls to the same namespace to unlock its content. Only the code knowing the string lock will be able to unlock the protected store namespaced. This is useful for complex stores defined in multiple JS modules.
+
+```js
+const { state } = store(
+	'myPlugin/private',
+	{ state: { messages: [ 'private message' ] } },
+	{ lock: PRIVATE_LOCK }
+);
+
+// The following call works as expected.
+store(
+	'myPlugin/private',
+	{
+		/* store part */
+	},
+	{ lock: PRIVATE_LOCK }
+);
+```
+
+### Store client methods
+
+Apart from the store function, there are also some methods that allows the developer to access data on their store functions.
+
+-   getContext()
+    -   getServerContext()
+    -   getServerState()
+-   getElement()
+
+#### getContext()
+
+Retrieves the context inherited by the element evaluating a function from the store. The returned value depends on the element and the namespace where the function calling `getContext()` exists. It can also take an optional namespace argument to retrieve the context of a specific interactive region.
+
+```js
+const context = getContext( 'namespace' );
+```
+
+-   `namespace` (optional): A string that matches the namespace of an interactive region. If not provided, it retrieves the context of the current interactive region.
+
+```php
+// render.php
+<div data-wp-interactive="myPlugin" data-wp-context='{ "isOpen": false }'>
+	<button data-wp-on--click="actions.log">Log</button>
+</div>
+```
+
+```js
+// store
+import { store, getContext } from '@wordpress/interactivity';
+
+store( 'myPlugin', {
+	actions: {
+		log: () => {
+			const context = getContext();
+			// Logs "false"
+			console.log( 'context => ', context.isOpen );
+
+			// With namespace argument.
+			const myPluginContext = getContext( 'myPlugin' );
+			// Logs "false"
+			console.log( 'myPlugin isOpen => ', myPluginContext.isOpen );
+		},
+	},
+} );
+```
+
+#### getServerContext()
+
+This function is analogous to `getContext()`, but with 2 key differences:
+
+1. Whenever [`actions.navigate()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-interactivity-router/#actions) from [`@wordpress/interactivity-router`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-interactivity-router/) is called, the object returned by `getServerContext()` is updated. This is useful when you want to update the context of a block based on **new** context coming from the page loaded via `actions.navigate()`. This new context is embedded in the HTML of the page loaded via `actions.navigate()`.
+2. The object returned by `getServerContext()` is read-only.
+
+The server context cannot be directly used in directives, but you can use callbacks to subscribe to its changes.
+
+```js
+const serverContext = getServerContext( 'namespace' );
+```
+
+-   `namespace` (optional): A string that matches the namespace of an interactive region. If not provided, it retrieves the server context of the current interactive region.
+
+Example usage:
+
+```js
+store( 'myPlugin', {
+	callbacks: {
+		updateServerContext() {
+			const context = getContext();
+			const serverContext = getServerContext();
+			// Override some property with the new value that came from the server.
+			context.overridableProp = serverContext.overridableProp;
+		},
+	},
+} );
+```
+
+#### getServerState()
+
+Retrieves the server state an interactive region.
+
+This function is serves the same purpose as `getServerContext()`, but it returns the **state** instead of the **context**.
+
+The object returned is read-only, and includes the state defined in PHP with `wp_interactivity_state()`. When using [`actions.navigate()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-interactivity-router/#actions) from [`@wordpress/interactivity-router`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-interactivity-router/), the object returned by `getServerState()` is updated to reflect the changes in its properties, without affecting the state returned by `store()`. Directives can subscribe to those changes to update the state if needed.
+
+```js
+const serverState = getServerState( 'namespace' );
+```
+
+-   `namespace` (optional): A string that matches the namespace of an interactive region. If not provided, it retrieves the server state of the current interactive region.
+
+Example usage:
+
+```js
+const { state } = store( 'myStore', {
+	callbacks: {
+		updateServerState() {
+			const serverState = getServerState();
+			// Override some property with the new value that came from the server.
+			state.overridableProp = serverState.overridableProp;
+		},
+	},
+} );
+```
+
+#### getElement()
+
+Retrieves a representation of the element that the action is bound to or called from. Such representation is read-only, and contains a reference to the DOM element, its props and a local reactive state.
+It returns an object with two keys:
+
+##### ref
+
+`ref` is the reference to the DOM element as an [HTMLElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement). It is equivalent to `useRef` in Preact or React, so it can be `null` when `ref` has not been attached to the actual DOM element yet, i.e., when it is being hydrated or mounted.
+
+##### attributes
+
+`attributes` contains a [Proxy](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy), which adds a getter that allows to reference other store namespaces. Feel free to check the getter in the code. [Link](https://github.com/WordPress/gutenberg/blob/8cb23964d58f3ce5cf6ae1b6f967a4b8d4939a8e/packages/interactivity/src/store.ts#L70)
+
+Those attributes will contain the directives of that element. In the button example:
+
+```js
+// store
+import { store, getElement } from '@wordpress/interactivity';
+
+store( 'myPlugin', {
+	actions: {
+		log: () => {
+			const element = getElement();
+			// Logs attributes
+			console.log( 'element attributes => ', element.attributes );
+		},
+	},
+} );
+```
+
+The code will log:
+
+```json
+{
+	"data-wp-on--click": 'actions.log',
+	"children": ['Log'],
+	"onclick": event => { evaluate(entry, event); }
+}
+```
+
+### withScope()
+
+Actions can depend on the scope when they are called, e.g., when you call `getContext()` or `getElement()`.
+
+When the Interactivity API runtime execute callbacks, the scope is set automatically. However, if you call an action from a callback that is not executed by the runtime, like in a `setInterval()` callback, you need to ensure that the scope is properly set. Use the `withScope()` function to ensure the scope is properly set in these cases.
+
+An example, where `actions.nextImage` would trigger an undefined error without the wrapper:
+
+```js
+store( 'mySliderPlugin', {
+	callbacks: {
+		initSlideShow: () => {
+			setInterval(
+				withScope( () => {
+					actions.nextImage();
+				} ),
+				3_000
+			);
+		},
+	},
+} );
+```
+
+## Server functions
+
+The Interactivity API comes with handy functions that allow you to initialize and reference configuration options on the server. This is necessary to feed the initial data that the Server Directive Processing will use to modify the HTML markup before it's send to the browser. It is also a great way to leverage many of WordPress's APIs, like nonces, AJAX, and translations.
+
+### wp_interactivity_config
+
+`wp_interactivity_config` allows to set or get a configuration array, referenced to a store namespace.
+The configuration is also available on the client, but it is static information.
+
+Consider it a global setting for interactions of a site, that won't be updated on user interactions.
+
+An example of setting:
+
+```php
+	wp_interactivity_config( 'myPlugin', array( 'showLikeButton' => is_user_logged_in() ) );
+```
+
+An example of getting:
+
+```php
+  wp_interactivity_config( 'myPlugin' );
+```
+
+This config can be retrieved on the client:
+
+```js
+// view.js
+
+const { showLikeButton } = getConfig();
+```
+
+### wp_interactivity_state
+
+`wp_interactivity_state` allows the initialization of the global state on the server, which will be used to process the directives on the server and then will be merged with any global state defined in the client.
+
+Initializing the global state on the server also allows you to use many critical WordPress APIs, including [AJAX](https://developer.wordpress.org/plugins/javascript/ajax/), or [nonces](https://developer.wordpress.org/plugins/javascript/enqueuing/#nonce).
+
+The `wp_interactivity_state` function receives two arguments, a string with the namespace that will be used as a reference and an associative array containing the values.
+
+Here is an example of passing the WP Admin AJAX endpoint with a nonce.
+
+```php
+// render.php
+
+wp_interactivity_state(
+	'myPlugin',
+	array(
+		'ajaxUrl' => admin_url( 'admin-ajax.php' ),
+		'nonce'   => wp_create_nonce( 'myPlugin_nonce' ),
+	),
+);
+```
+
+```js
+// view.js
+
+const { state } = store( 'myPlugin', {
+	actions: {
+		*doSomething() {
+			try {
+				const formData = new FormData();
+				formData.append( 'action', 'do_something' );
+				formData.append( '_ajax_nonce', state.nonce );
+
+				const data = yield fetch( state.ajaxUrl, {
+					method: 'POST',
+					body: formData,
+				} ).then( ( response ) => response.json() );
+				console.log( 'Server data!', data );
+			} catch ( e ) {
+				// Something went wrong!
+			}
+		},
+	},
+} );
+```
+
+### wp_interactivity_process_directives
+
+`wp_interactivity_process_directives` returns the updated HTML after the directives have been processed.
+
+It is the Core function of the Interactivity API server side rendering part, and is public so any HTML can be processed, whether is a block or not.
+
+This code
+
+```php
+wp_interactivity_state( 'myPlugin', array( 'greeting' => 'Hello, World!' ) );
+$html_content = '<div data-wp-text="myPlugin::state.greeting"></div>';
+$processed_html = wp_interactivity_process_directives( $html_content );
+echo $processed_html;
+```
+
+will output:
+
+```html
+<div data-wp-text="myPlugin::state.greeting">Hello, World!</div>
+```
+
+### wp_interactivity_data_wp_context
+
+`wp_interactivity_data_wp_context` returns a stringified JSON of a context directive.
+This function is the recommended way to print the `data-wp-context` attribute in the server side rendered markup.
+
+```php
+
+$my_context = array(
+	'counter' => 0,
+	'isOpen'  => true,
+);
+?>
+<div
+ <?php echo wp_interactivity_data_wp_context( $my_context ); ?>
+>
+</div>
+```
+
+will output:
+
+```html
+<div data-wp-context='{"counter":0,"isOpen":true}'></div>
+```
diff --git a/docs/reference-guides/interactivity-api/core-concepts/README.md b/docs/reference-guides/interactivity-api/core-concepts/README.md
new file mode 100644
index 00000000000000..695a4d622f6c52
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/core-concepts/README.md
@@ -0,0 +1,11 @@
+# Core Concepts
+
+This section provides some guides on important concepts and mental models related to Interactivity API development. Use the following links to learn more:
+
+1. **[The Reactive and Declarative mindset](/docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md):** This guide covers core concepts of reactivity and declarativeness, providing a foundation for effective use of the Interactivity API.
+
+2. **[Understanding global state, local context and derived state](/docs/reference-guides/interactivity-api/core-concepts/undestanding-global-state-local-context-and-derived-state.md):** The guide explains how to effectively use global state, local context, and derived state within the Interactivity API emphasizing the importance of choosing the appropriate state management technique based on the scope and requirements of your data.
+
+3. **[Server-side rendering: Processing directives on the server](/docs/reference-guides/interactivity-api/core-concepts/server-side-rendering.md):** The Interactivity API allows WordPress to use server-side rendering to create interactive and state-aware HTML, smoothly connected with client-side features while maintaining performance and SEO benefits.
+
+4. **[Using TypeScript](/docs/reference-guides/interactivity-api/core-concepts/using-typescript.md):** This guide will walk you through the process of using TypeScript with Interactivity API stores, covering everything from basic type definitions to advanced techniques for handling complex store structures.
diff --git a/docs/reference-guides/interactivity-api/core-concepts/server-side-rendering.md b/docs/reference-guides/interactivity-api/core-concepts/server-side-rendering.md
new file mode 100644
index 00000000000000..075c2cb977bdfd
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/core-concepts/server-side-rendering.md
@@ -0,0 +1,491 @@
+# Server-side rendering: Processing directives on the server
+
+WordPress has always been built on the foundation of server-side rendering. Traditionally, when a user requests a WordPress page, the server processes the PHP code, queries the database, and generates the HTML markup that is sent to the browser.
+
+In recent years, modern JavaScript frameworks like Vue, React, or Svelte have revolutionized the way we build web applications. These frameworks provide reactive and declarative programming models that enable developers to create dynamic, interactive user interfaces with ease.
+
+However, when it comes to server-side rendering, these frameworks require a JavaScript-based server, such as NodeJS, to execute their code and generate the initial HTML. This means that PHP-based servers, like WordPress, cannot directly utilize these frameworks without sacrificing their native PHP rendering capabilities. This limitation poses a challenge for WordPress developers who want to leverage the power of reactive and declarative programming while still benefiting from WordPress's traditional server-side rendering strengths. The Interactivity API bridges this gap by bringing [reactive and declarative programming principles](/docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md) to WordPress without compromising its server-side rendering foundation.
+
+In this guide, we'll explore how the Interactivity API processes directives on the server, enabling WordPress to deliver interactive, state-aware HTML from the initial page load, while setting the stage for seamless client-side interactivity.
+
+## Processing the directives on the server
+
+The Interactivity API's Server Directive Processing capabilities enable WordPress to generate the initial HTML with the correct interactive state, providing a faster initial render. After the initial server-side render, the Interactivity API's client-side JavaScript takes over, enabling dynamic updates and interactions without requiring full page reloads. This approach combines the best of both worlds: the SEO and performance benefits of traditional WordPress server-side rendering, and the dynamic, reactive user interfaces offered by modern JavaScript frameworks.
+
+To understand how the Server Directive Processing works, let's start with an example where a list of fruits is rendered using the `data-wp-each` directive.
+
+The following are the necessary steps to ensure that the directives are correctly processed by the Server Directive Processing of the Interactivity API during the server-side rendering of WordPress.
+
+-   **1. Mark the block as interactive**
+
+    First, to enable the server processing of the interactive block's directives, you must add `supports.interactivity` to the `block.json`:
+
+    ```json
+    {
+    	"supports": {
+    		"interactivity": true
+    	}
+    }
+    ```
+
+-   **2. Initialize the global state or local context**
+
+    Then, you must initialize either the global state or the local context that will be used during the server-side rendering of the page.
+
+    If you are using global state, you must use the `wp_interactivity_state` function:
+
+    ```php
+    wp_interactivity_state( 'myFruitPlugin', array(
+      'fruits' => array( 'Apple', 'Banana', 'Cherry' )
+    ));
+    ```
+
+    If you are using local context, the initial values are defined with the `data-wp-context` directive itself, either by:
+
+    -   Adding it directly to the HTML.
+
+        ```html
+        <ul data-wp-context='{ "fruits": ["Apple", "Banana", "Cherry"] }'>
+        	...
+        </ul>
+        ```
+
+    -   Using the `wp_interactivity_data_wp_context` helper.
+
+        ```php
+        <?php
+        $context = array( 'fruits' => array( 'Apple', 'Banana', 'Cherry' ) );
+        ?>
+
+        <ul <?php echo wp_interactivity_data_wp_context( $context ); ?>>
+          ...
+        </ul>
+        ```
+
+-   **3. Define the interactive elements using directives**
+
+    Next, you need to add the necessary directives to the HTML markup.
+
+    ```html
+    <ul data-wp-interactive="myFruitPlugin">
+    	<template data-wp-each="state.fruits">
+    		<li data-wp-text="context.item"></li>
+    	</template>
+    </ul>
+    ```
+
+    In this example:
+
+    -   The `data-wp-interactive` directive activates the interactivity for the DOM element and its children.
+    -   The `data-wp-each` directive is used to render a list of elements. The directive can be used in `<template>` tags, with the value being a reference path to an array stored in the global state or the local context.
+    -   The `data-wp-text` directive sets the inner text of an HTML element. Here, it points to `context.item`, which is where the `data-wp-each` directive stores each item of the array.
+
+    The exact same directives can also be used when using local context instead of global state. The only difference is that `data-wp-each` points to `context.fruits` instead of `state.fruits`:
+
+    ```html
+    <ul
+    	data-wp-interactive="myFruitPlugin"
+    	data-wp-context='{ "fruits": [ "Apple", "Banana", "Cherry" ] }'
+    >
+    	<template data-wp-each="context.fruits">
+    		<li data-wp-text="context.item"></li>
+    	</template>
+    </ul>
+    ```
+
+That's it! Once you've set up your interactive block with `supports.interactivity`, initialized your global state or local context, and added the directives to the HTML markup, the Interactivity API will take care of the rest. There's no additional code required from the developer to process these directives on the server side.
+
+Behind the scenes, WordPress uses the `wp_interactivity_process_directives` function to find and process the directives in the HTML markup of your block. This function uses the HTML API to make the necessary changes to the markup, based on the found directives and the initial global state and/or local context.
+
+As a result, the HTML markup sent to the browser is already in its final form, with all directives correctly processed. This means that when the page first loads in the browser, it already contains the correct initial state of all interactive elements, without needing any JavaScript to modify it.
+
+This is how the final HTML markup of the fruit list example would look like (directives omitted):
+
+```html
+<ul>
+	<li>Apple</li>
+	<li>Banana</li>
+	<li>Cherry</li>
+</ul>
+```
+
+As you can see, the `data-wp-each` directive has generated a `<li>` element for each fruit in the array, and the `data-wp-text` directive has been processed, populating each `<li>` with the correct fruit name.
+
+## Manipulating the global state and local context in the client
+
+One of the key strengths of the Interactivity API is how it bridges the gap between server-side rendering and client-side interactivity. To do so, the global state and local context initialized on the server are also serialized and made available to the Interactivity API stores in the client, allowing the application to continue functioning and manipulating the DOM dynamically.
+
+Let's extend this example to include a button that the user can click to add a new fruit to the list:
+
+```html
+<button data-wp-on-async--click="actions.addMango">Add Mango</button>
+```
+
+This new button has a `data-wp-on-async--click` directive that references `actions.addMango`, which is defined in our JavaScript store:
+
+```javascript
+const { state } = store( 'myFruitPlugin', {
+	actions: {
+		addMango() {
+			state.fruits.push( 'Mango' );
+		},
+	},
+} );
+```
+
+The same example would also work if you were using local context:
+
+```javascript
+store( 'myFruitPlugin', {
+	actions: {
+		addMango() {
+			const context = getContext();
+			context.fruits.push( 'Mango' );
+		},
+	},
+} );
+```
+
+Now, when the user clicks the "Add Mango" button:
+
+1.  The `addMango` action is triggered.
+2.  The `'Mango'` item is added to the `state.fruits` (or `context.fruits`) array.
+3.  The Interactivity API automatically updates the DOM, adding a new `<li>` element for the new fruit.
+
+```html
+<ul>
+	<li>Apple</li>
+	<li>Banana</li>
+	<li>Cherry</li>
+	<li>Mango</li>
+</ul>
+```
+
+Remember: initializing the state on the client is not necessary when it has already been done on the server.
+
+```javascript
+store( 'myFruitPlugin', {
+	state: {
+		fruits: [ 'Apple', 'Banana', 'Cherry' ], // This is not necessary!
+	},
+} );
+```
+
+## Initializing the derived state in the server
+
+The derived state, regardless of whether it derives from the global state, local context, or both, can also be processed on the server by the Server Directive Processing.
+
+_Please, visit the [Understanding global state, local context and derived state](./undestanding-global-state-local-context-and-derived-state.md) guide to learn more about how derived state works in the Interactivity API._
+
+### Derived state that can be defined statically
+
+Let's imagine adding a button that can delete all fruits:
+
+```html
+<button data-wp-on-async--click="actions.deleteFruits">
+	Delete all fruits
+</button>
+```
+
+```javascript
+const { state } = store( 'myFruitPlugin', {
+	actions: {
+		// ...
+		deleteFruits() {
+			state.fruits = [];
+		},
+	},
+} );
+```
+
+Now, let's display a special message when there is no fruit. To do this, let's use a `data-wp-bind--hidden` directive that references a derived state called `state.hasFruits` to show/hide the message.
+
+```html
+<div data-wp-interactive="myFruitPlugin">
+	<ul data-wp-bind--hidden="!state.hasFruits">
+		<template data-wp-each="state.fruits">
+			<li data-wp-text="context.item"></li>
+		</template>
+	</ul>
+	<div data-wp-bind--hidden="state.hasFruits">No fruits, sorry!</div>
+</div>
+```
+
+The derived state `state.hasFruits` is defined on the client using a getter:
+
+```javascript
+const { state } = store( 'myFruitPlugin', {
+	state: {
+		get hasFruits() {
+			return state.fruits.length > 0;
+		},
+	},
+	// ...
+} );
+```
+
+Up to this point, everything is fine in the client, and when we press the "Delete all fruits" button, the "No fruits, sorry!" message will be displayed. The problem is that since `state.hasFruits` is not defined on the server, the `hidden` attribute will not be part of the initial HTML, which means it will also be showing the message until JavaScript loads, causing not only confusion to the visitor, but also a layout shift when JavaScript finally loads and the message is hidden.
+
+To fix this, you must define the initial value of the derived state in the server using `wp_interactivity_state`.
+
+-   When the initial value is known and static, it can be defined directly:
+
+    ```php
+    wp_interactivity_state( 'myFruitPlugin', array(
+      'fruits'    => array( 'Apple', 'Banana', 'Cherry' ),
+      'hasFruits' => true
+    ));
+    ```
+
+-   Or it can be defined by doing the necessary computations:
+
+    ```php
+    $fruits    = array( 'Apple', 'Banana', 'Cherry' );
+    $hasFruits = count( $fruits ) > 0;
+
+    wp_interactivity_state( 'myFruitPlugin', array(
+      'fruits'    => $fruits,
+      'hasFruits' => $hasFruits,
+    ));
+    ```
+
+Regardless of the approach, the key point is that the initial value of `state.hasFruits` is now defined on the server. This allows the Server Directive Processing to handle the `data-wp-bind--hidden` directive and modify the HTML markup, adding the `hidden` attribute when needed.
+
+### Derived state that needs to be defined dynamically
+
+In most cases, the initial derived state can be defined statically, as in the previous example. But sometimes, the value depends on dynamic values that also change in the server, and the derived logic needs to be replicated in PHP.
+
+To see an example of this, let's continue by adding a shopping cart emoji (🛒) for each fruit, depending on whether it is on a shopping list or not.
+
+First, let's add an array that represents the shopping list. _Remember that even though these arrays are static for simplicity sake, usually you will work with dynamic information, for example, information coming from the database._
+
+```php
+wp_interactivity_state( 'myFruitPlugin', array(
+  'fruits'        => array( 'Apple', 'Banana', 'Cherry' ),
+  'shoppingList'  => array( 'Apple', 'Cherry' ),
+));
+```
+
+Now, let's add a derived state on the client that checks if each fruit is on the shopping list or not and returns the emoji.
+
+```javascript
+store( 'myFruitPlugin', {
+	state: {
+		get onShoppingList() {
+			const context = getContext();
+			return state.shoppingList.includes( context.item ) ? '🛒' : '';
+		},
+	},
+	// ...
+} );
+```
+
+And let's use that derived state to show the appropriate emoji for each fruit.
+
+```html
+<ul data-wp-interactive="myFruitPlugin">
+	<template data-wp-each="state.fruits">
+		<li>
+			<span data-wp-text="context.item"></span>
+			<span data-wp-text="state.onShoppingList"></span>
+		</li>
+	</template>
+</ul>
+```
+
+Again, up to this point, everything is fine on the client side and the visitor will see the correct emoji displayed for the fruits they have on their shopping list. However, since `state.onShoppingList` is not defined on the server, the emoji will not be part of the initial HTML, and it will not be shown until JavaScript loads.
+
+Let's fix that by adding the initial derived state using `wp_interactivity_state`. Remember that this time, the value depends on `context.item` that comes from the `data-wp-each` directive, which makes the derived value dynamic, so let's replicate the JavaScript logic in PHP:
+
+```php
+wp_interactivity_state( 'myFruitPlugin', array(
+  // ...
+  'onShoppingList' => function() {
+    $state   = wp_interactivity_state();
+    $context = wp_interactivity_get_context();
+    return in_array( $context['item'], $state['shoppingList'] ) ? '🛒' : '';
+  }
+));
+```
+
+That's it! Now, our server can compute the derived state and know which fruits are on the shopping list and which are not. This allows the Server Directive Processing to populate the initial HTML with the correct values, ensuring that the user sees the correct information immediately, even before the JavaScript runtime loads.
+
+## Serializing other processed values to be consumed on the client
+
+The `wp_interactivity_state` function is also valuable for sending processed values from the server to the client so they can be consumed later on. This feature is useful in many situations, such as managing translations.
+
+Let's add translations to our example to see how this would work.
+
+```php
+<?php
+wp_interactivity_state( 'myFruitPlugin', array(
+  'fruits'         => array( __( 'Apple' ), __( 'Banana' ), __( 'Cherry' ) ),
+  'shoppingList'   => array( __( 'Apple' ), __( 'Cherry' ) ),
+  // ...
+?>
+
+<div data-wp-interactive="myFruitPlugin">
+  <button data-wp-on-async--click="actions.deleteFruits">
+    <?php echo __( 'Delete all fruits' ); ?>
+  </button>
+  <button data-wp-on-async--click="actions.addMango">
+    <?php echo __( 'Add Mango' ); ?>
+  </button>
+  <ul data-wp-bind--hidden="!state.hasFruits">
+    <template data-wp-each="state.fruits">
+      <li>
+        <span data-wp-text="context.item"></span>
+        <span data-wp-text="state.onShoppingList"></span>
+      </li>
+    </template>
+  </ul>
+  <div data-wp-bind--hidden="state.hasFruits">
+    <?php echo __( 'No fruits, sorry!' ); ?>
+  </div>
+</div>
+```
+
+That's it! Since the Interactivity API works in PHP, you can add translations directly to the global state, the local context and the HTML markup.
+
+But wait, what happens with our `addMango` action? Remember, this action is defined only on JavaScript:
+
+```javascript
+const { state } = store( 'myFruitPlugin', {
+	actions: {
+		addMango() {
+			state.fruits.push( 'Mango' ); // Not translated!
+		},
+	},
+} );
+```
+
+To fix this issue, you can use the `wp_interactivity_state` function to serialize the translated mango string and then access that value in your action.
+
+```php
+wp_interactivity_state( 'myFruitPlugin', array(
+  'fruits' => array( __( 'Apple' ), __( 'Banana' ), __( 'Cherry' ) ),
+  'mango'  => __( 'Mango' ),
+));
+```
+
+```javascript
+const { state } = store( 'myFruitPlugin', {
+	actions: {
+		addMango() {
+			// `state.mango` contains the 'Mango' string already translated.
+			state.fruits.push( state.mango );
+		},
+	},
+} );
+```
+
+Take into account that if your application is more dynamic, you could serialize an array with all the fruit translations and just work with _fruit keywords_ in your actions. For example:
+
+```php
+wp_interactivity_state( 'myFruitPlugin', array(
+  'fruits'           => array( 'apple', 'banana', 'cherry' ),
+  'translatedFruits' => array(
+    'apple'  => __( 'Apple' ),
+    'banana' => __( 'Banana' ),
+    'cherry' => __( 'Cherry' ),
+    'mango'  => __( 'Mango' ),
+  ),
+  'translatedFruit'  => function() {
+    $state   = wp_interactivity_state();
+    $context = wp_interactivity_get_context();
+    return $state['translatedFruits'][ $context['item'] ];
+  }
+));
+```
+
+```javascript
+const { state } = store( 'myFruitPlugin', {
+  state: {
+    get translatedFruit() {
+      const context = getContext();
+      return state.translatedFruits[ context.item ];
+    }
+  }
+  actions: {
+    addMango() {
+      state.fruits.push( 'mango' );
+    },
+  },
+} );
+```
+
+```html
+<template data-wp-each="state.fruits">
+	<li data-wp-text="state.translatedFruit"></li>
+</template>
+```
+
+Serializing information from the server can also be useful in other scenarios, such as passing Ajax/REST-API URLs and nonces.
+
+```php
+wp_interactivity_state( 'myPlugin', array(
+  'ajaxUrl' => admin_url( 'admin-ajax.php' ),
+  'nonce'   => wp_create_nonce( 'myPlugin_nonce' ),
+));
+```
+
+```js
+const { state } = store( 'myPlugin', {
+	actions: {
+		*doSomething() {
+			const formData = new FormData();
+			formData.append( 'action', 'do_something' );
+			formData.append( '_ajax_nonce', state.nonce );
+
+			const data = yield fetch( state.ajaxUrl, {
+				method: 'POST',
+				body: formData,
+			} ).then( ( response ) => response.json() );
+
+			console.log( 'Server data', data );
+		},
+	},
+} );
+```
+
+## Processing directives in classic themes
+
+Server Directive Processing happens automatically in your interactive blocks as soon as you add `supports.interactivity` to your `block.json` file. But what about classic themes?
+
+Classic themes can also use the Interactivity API, and if they want to take advantage of the Server Directive Processing (which they should), they can do so through the `wp_interactivity_process_directives` function. This function receives the HTML markup with unprocessed directives and returns the HTML markup modified according to the initial values of the global state, local context, and derived state.
+
+```php
+// Initializes the global and derived state…
+wp_interactivity_state( '...', /* ... */ );
+
+// The interactive HTML markup that contains the directives.
+$html = '<div data-wp-...>...</div>';
+
+// Processes the directives so they are ready to be sent to the client.
+$processed_html = wp_interactivity_process_directives( $html );
+```
+
+That's it! There's nothing else you need to do.
+
+If you want to use `wp_interactivity_process_directives` in a template file, you can use `ob_start` and `ob_get_clean` to capture the HTML output and process it before rendering.
+
+```php
+<?php
+wp_interactivity_state( 'myClassicTheme', /* ... */ );
+ob_start();
+?>
+
+<div data-wp-interactive="myClassicTheme">
+  ...
+</div>
+
+<?php
+$html = ob_get_clean();
+echo wp_interactivity_process_directives( $html );
+```
+
+**Important:** You only need to process the directives once. If you're including an inner template file within another template, ensure that `wp_interactivity_process_directives` is only called in the outermost template file to avoid redundant processing.
+
+## Conclusion
+
+The Interactivity API ensures a smooth and transparent transition from server-rendered content to client-side interactivity. The directives you define on the server, the initial global state or local context, and the client-side behavior all form part of the same ecosystem. This unified approach simplifies development, improves maintainability, and provides a better developer experience when creating interactive WordPress blocks.
diff --git a/docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md b/docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md
new file mode 100644
index 00000000000000..3760fdf3867802
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md
@@ -0,0 +1,300 @@
+# The Reactive and Declarative mindset
+
+The Interactivity API is a reactive and declarative framework, similar to other modern frameworks like React, Vue, Svelte, or Alpine. When working with the Interactivity API, adopting the right mindset is crucial for maximizing its potential. This guide will explain the core concepts of reactivity and declarativeness, providing a foundation for effective use of the Interactivity API.
+
+## Declarative vs. imperative
+
+**Declarative Programming** describes _what_ a program should accomplish. It focuses on the desired outcome without explicitly listing commands or steps to achieve that result. In contrast, **imperative programming** specifies _how_ to accomplish tasks by explicitly stating each step to manipulate the program’s state.
+
+### The imperative approach
+
+In the early days of web development, the imperative approach was predominant. This method involves manually updating the DOM with JavaScript to reflect changes.
+
+Take, for example, this interactive block with two buttons and a paragraph:
+
+-   **The show/hide button**: Toggles paragraph visibility and enables/disables the "Activate" button.
+-   **The activate/deactivate button**: Toggles the paragraph's text and color between "active" (green) and "inactive" (red).
+
+```html
+<div id="my-interactive-plugin">
+	<button
+		id="show-hide-btn"
+		aria-expanded="false"
+		aria-controls="status-paragraph"
+	>
+		show
+	</button>
+	<button id="activate-btn" disabled>activate</button>
+	<p id="status-paragraph" class="inactive" hidden>this is inactive</p>
+</div>
+
+<script>
+	const showHideBtn = document.getElementById( 'show-hide-btn' );
+	const activateBtn = document.getElementById( 'activate-btn' );
+	const statusParagraph = document.getElementById( 'status-paragraph' );
+
+	showHideBtn.addEventListener( 'click', () => {
+		if ( statusParagraph.hasAttribute( 'hidden' ) ) {
+			statusParagraph.removeAttribute( 'hidden' );
+			showHideBtn.textContent = 'hide';
+			showHideBtn.setAttribute( 'aria-expanded', 'true' );
+			activateBtn.removeAttribute( 'disabled' );
+		} else {
+			if ( statusParagraph.classList.contains( 'active' ) ) {
+				statusParagraph.textContent = 'this is inactive';
+				statusParagraph.classList.remove( 'active' );
+				activateBtn.textContent = 'activate';
+			}
+			statusParagraph.setAttribute( 'hidden', true );
+			showHideBtn.textContent = 'show';
+			showHideBtn.setAttribute( 'aria-expanded', 'false' );
+			activateBtn.setAttribute( 'disabled', true );
+		}
+	} );
+
+	activateBtn.addEventListener( 'click', () => {
+		if ( activateBtn.textContent === 'activate' ) {
+			statusParagraph.textContent = 'this is active';
+			statusParagraph.classList.remove( 'inactive' );
+			statusParagraph.classList.add( 'active' );
+			activateBtn.textContent = 'deactivate';
+		} else {
+			statusParagraph.textContent = 'this is inactive';
+			statusParagraph.classList.remove( 'active' );
+			statusParagraph.classList.add( 'inactive' );
+			activateBtn.textContent = 'activate';
+		}
+	} );
+</script>
+```
+
+As you can see, for each condition, you have to use JavaScript to modify everything in the DOM that has changed, taking into account the previous state.
+
+### The declarative approach
+
+The declarative approach simplifies the process by focusing on _what_ should happen. The UI updates automatically in response to changes in state. Here is a similar example using the Interactivity API's declarative approach:
+
+```html
+<div id="my-interactive-plugin" data-wp-interactive="myInteractivePlugin">
+	<button
+		data-wp-on--click="actions.toggleVisibility"
+		data-wp-bind--aria-expanded="state.isVisible"
+		data-wp-text="state.visibilityText"
+		aria-controls="status-paragraph"
+	>
+		show
+	</button>
+	<button
+		data-wp-on--click="actions.toggleActivation"
+		data-wp-bind--disabled="!state.isVisible"
+		data-wp-text="state.activationText"
+	>
+		activate
+	</button>
+	<p
+		id="status-paragraph"
+		data-wp-bind--hidden="!state.isVisible"
+		data-wp-class--active="state.isActive"
+		data-wp-class--inactive="!state.isActive"
+		data-wp-text="state.paragraphText"
+	>
+		this is inactive
+	</p>
+</div>
+```
+
+```js
+import { store } from '@wordpress/interactivity';
+
+const { state } = store( 'myInteractivePlugin', {
+	state: {
+		isVisible: false,
+		isActive: false,
+		get visibilityText() {
+			return state.isVisible ? 'hide' : 'show';
+		},
+		get activationText() {
+			return state.isActive ? 'deactivate' : 'activate';
+		},
+		get paragraphText() {
+			return state.isActive ? 'this is active' : 'this is inactive';
+		},
+	},
+	actions: {
+		toggleVisibility() {
+			state.isVisible = ! state.isVisible;
+			if ( ! state.isVisible ) state.isActive = false;
+		},
+		toggleActivation() {
+			state.isActive = ! state.isActive;
+		},
+	},
+} );
+```
+
+In this declarative example, the UI automatically updates based on the current state. All you have to do as developers is to declare the necessary state, any derived state, the actions that modify the state, and which parts of the DOM depend on which parts of the state. The framework takes care of making all the necessary updates to the DOM so that it is always in sync with the current state. The logic remains simple and maintainable regardless of the number of elements controlled by the framework.
+
+### Can you spot the bug?
+
+In the imperative example, a bug has been intentionally introduced for didactical purposes. Can you find it? It's not easy!
+
+<details>
+<summary>Show me the answer!</summary>
+
+In the case that the Show button is pressed first, then the Activate button, and finally the Hide button, it doesn't add the `inactive` class using `statusParagraph.classList.add('inactive');`. Therefore, the next time the user presses Show, the paragraph will not appear in red.
+
+</details>
+
+These types of bugs are very common in imperative code because you have to manually control all the conditions. On the other hand, they do not exist in declarative code because the framework takes care of updating the DOM and never forgets about anything.
+
+### Benefits of the declarative approach
+
+As demonstrated, the imperative approach requires detailed steps and direct manipulation of the DOM, which can quickly become complex and hard to maintain as the interactivity complexity grows. The more possible states and elements there are, the more conditional logic needs to be added, making the code exponentially more complicated. The declarative approach, on the other hand, simplifies the process by managing the state and letting the framework handle the DOM updates. This leads to more readable, maintainable, and scalable code.
+
+## Reactivity
+
+The Interactivity API is a declarative framework thanks to its leverage of reactivity. In a reactive system, changes to the data automatically trigger updates in the user interface, ensuring that the view always reflects the current state of the application.
+
+### How reactivity works
+
+The Interactivity API uses a fine-grained reactivity system. Here's how it works:
+
+1. **Reactive State**: In the Interactivity API, both the global state and the local context are reactive. This means that when either of these data sources changes, any parts of the UI that depend on them will automatically update.
+
+    - **Global state**: This is global data that can be accessed throughout your interactive blocks.
+    - **Local context**: This is local data that is specific to a particular element and its children.
+    - **Derived State**: In addition to basic state properties, you can define computed properties that automatically update when their dependencies change.
+
+    _Please, visit the [Understanding global state, local context and derived state](/docs/reference-guides/interactivity-api/core-concepts/undestanding-global-state-local-context-and-derived-state.md) guide to learn more about how to work with the different types of reactive state in the Interactivity API._
+
+2. **Actions**: These are functions, usually triggered by event handlers, that mutate the global state or local context.
+
+3. **Reactive Bindings**: HTML elements are bound to reactive state values using special attributes like `data-wp-bind`, `data-wp-text`, or `data-wp-class`.
+
+4. **Automatic Updates**: When the actions mutate the global state or local context, the Interactivity API automatically updates all the parts of the DOM that depend on that state (either directly or through the derived state).
+
+Let's break down these concepts by reviewing the previous example:
+
+```javascript
+const { state } = store( 'myInteractivePlugin', {
+	state: {
+		isVisible: false,
+		isActive: false,
+		get visibilityText() {
+			return state.isVisible ? 'hide' : 'show';
+		},
+		// ... other derived state
+	},
+	actions: {
+		toggleVisibility() {
+			state.isVisible = ! state.isVisible;
+		},
+		// ... other actions
+	},
+} );
+```
+
+In this code:
+
+-   `isVisible` and `isActive` are basic state properties.
+-   `visibilityText` is a derived state that automatically updates when `isVisible` changes.
+-   `toggleVisibility` is an action that modifies the state.
+
+The HTML bindings look like this:
+
+```html
+<button
+	data-wp-on--click="actions.toggleVisibility"
+	data-wp-text="state.visibilityText"
+	data-wp-bind--aria-expanded="state.isVisible"
+>
+	show
+</button>
+```
+
+Here's how reactivity works in practice:
+
+1. When the button is clicked, it triggers the `toggleVisibility` action.
+2. This action updates `state.isVisible`.
+3. The Interactivity API detects this change and automatically:
+    - Updates the button's text content (because of `data-wp-text="state.visibilityText"`).
+    - Changes the `aria-expanded` attribute (due to `data-wp-bind--aria-expanded="state.isVisible"`).
+    - Updates any other parts of the DOM that depend on `isVisible` or `visibilityText`.
+
+### Mutability vs immutability
+
+Unlike many other reactive frameworks, **the Interactivity API does not require the use of immutability** when updating the global state or the local context. You can directly mutate objects and arrays, and the reactivity system will still work as expected. This can lead to more intuitive and straightforward code in many cases.
+
+For example, you can push a new item to an array like this:
+
+```javascript
+const { state } = store( 'myArrayPlugin', {
+	state: {
+		list: [ 'item 1', 'item 2' ],
+	},
+	actions: {
+		addItem() {
+			// Right:
+			state.list.push( 'new item' );
+
+			// Wrong:
+			state.list = [ ...state.list, 'new item' ]; // Don't do this!
+		},
+	},
+} );
+```
+
+There's no need to create a new array or use the spread operator as you might in other frameworks. The Interactivity API will detect this change and update any parts of the UI that depend on `state.list`.
+
+### Reactive side effects
+
+In addition to automatically updating the UI, the Interactivity API allows you to perform side effects when reactive data changes using directives like `data-wp-watch`. Side effects are useful for tasks like logging, making API calls, or updating other parts of your application that aren't directly tied to the UI.
+
+Here's an example of how you might use `data-wp-watch`:
+
+```html
+<div
+	data-wp-interactive="myCounterPlugin"
+	data-wp-context='{ "counter": 0 }'
+	data-wp-watch="callbacks.logCounter"
+>
+	<p>Counter: <span data-wp-text="context.counter"></span></p>
+	<button data-wp-on--click="actions.increment">Increment</button>
+</div>
+```
+
+```javascript
+store( 'myCounterPlugin', {
+	actions: {
+		increment() {
+			const context = getContext();
+			context.counter += 1;
+		},
+	},
+	callbacks: {
+		logCounter: () => {
+			const context = getContext();
+			console.log( `The counter is now: ${ context.counter }` );
+		},
+	},
+} );
+```
+
+In this example:
+
+1. The `data-wp-context` directive adds a local context with a property `counter` whose value is `0`.
+2. The `data-wp-watch` directive is set to `callbacks.logCounter`.
+3. Every time `context.counter` changes, the `logCounter` callback will be executed.
+4. The `logCounter` callback logs the current counter to the console.
+
+This allows you to create declarative side effects that automatically run in response to data changes. Some other use cases for `data-wp-watch` might include:
+
+-   Saving data to `localStorage` when the data changes.
+-   Sending analytics events.
+-   Changing the focus for accessibility purposes.
+-   Updating the page title, meta tags, or `<body>` attributes.
+-   Triggering animations.
+
+## Conclusion
+
+As you continue to work with the Interactivity API, remember to think in terms of state, actions, and side effects. Define your data, describe how it should change, and let the Interactivity API handle the rest. This mental shift may take some time, especially if you're used to more imperative programming styles, but by embracing it, you'll unlock the full potential of the Interactivity API to create truly dynamic and interactive WordPress blocks that delight your users.
diff --git a/docs/reference-guides/interactivity-api/core-concepts/undestanding-global-state-local-context-and-derived-state.md b/docs/reference-guides/interactivity-api/core-concepts/undestanding-global-state-local-context-and-derived-state.md
new file mode 100644
index 00000000000000..f4fcbdf576c1cf
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/core-concepts/undestanding-global-state-local-context-and-derived-state.md
@@ -0,0 +1,842 @@
+# Understanding global state, local context and derived state
+
+The Interactivity API offers a powerful framework for creating interactive blocks. To make the most of its capabilities, it's crucial to understand when to use global state, local context, or derived state. This guide will clarify these concepts and provide practical examples to help you decide when to use each one.
+
+Let's start with a brief definition of global state, local context and derived state.
+
+-   **Global state:** Global data that can be accessed and modified by any interactive block on the page, allowing different parts of your interactive blocks to stay in sync.
+-   **Local context:** Local data defined within a specific element in the HTML structure, accessible only to that element and its children, providing independent state for individual blocks.
+-   **Derived state:** Computed values based on global state or local context, dynamically calculated on-demand to ensure consistent data representation without storing redundant data.
+
+Let's now dive into each of these concepts to study them in more detail and provide some examples.
+
+## Global state
+
+**Global state** in the Interactivity API refers to global data that can be accessed and modified by any interactive block on the page. It serves as a shared information hub, allowing different parts of your blocks to communicate and stay in sync. Global state is the ideal mechanism for exchanging information between interactive blocks, regardless of their position in the DOM tree.
+
+You should use global state when:
+
+-   You need to share data between multiple interactive blocks that are not directly related in the DOM hierarchy.
+-   You want to maintain a single source of truth for certain data across all your interactive blocks.
+-   You're dealing with data that affects multiple parts of your UI simultaneously.
+-   You want to implement features that are global for the page.
+
+### Working with global state
+
+-   **Initializing the global state**
+
+    Typically, the initial global state values should be defined on the server using the `wp_interactivity_state` function:
+
+    ```php
+    // Populates the initial global state values.
+    wp_interactivity_state( 'myPlugin', array(
+      'isDarkTheme' => true,
+      'show'        => false,
+      'helloText'   => __( 'world' ),
+    ));
+    ```
+
+    These initial global state values will be used during the rendering of the page in PHP to populate the HTML markup that is sent to the browser.
+
+    -   HTML markup written in the PHP file by the developer:
+
+        ```html
+        <div
+        	data-wp-interactive="myPlugin"
+        	data-wp-class--is-dark-theme="state.isDarkTheme"
+        	class="my-plugin"
+        >
+        	<div data-wp-bind--hidden="!state.show">
+        		Hello <span data-wp-text="state.helloText"></span>
+        	</div>
+        	<button data-wp-on-async--click="actions.toggle">Toggle</button>
+        </div>
+        ```
+
+    -   HTML markup after the directives have been processed and it is ready to be sent to the browser:
+
+        ```html
+        <div
+        	data-wp-interactive="myPlugin"
+        	data-wp-class--is-dark-theme="state.isDarkTheme"
+        	class="my-plugin is-dark-theme"
+        >
+        	<div hidden data-wp-bind--hidden="!state.show">
+        		Hello <span data-wp-text="state.helloText">world</span>
+        	</div>
+        	<button data-wp-on-async--click="actions.toggle">Toggle</button>
+        </div>
+        ```
+
+    _Please, visit [the Server-side Rendering guide](/docs/reference-guides/interactivity-api/core-concepts/server-side-rendering.md) to learn more about how directives are processed on the server._
+
+    In cases where the global state is not used during the rendering of the page in PHP, it can also be defined directly on the client.
+
+    ```js
+    const { state } = store( 'myPlugin', {
+    	state: {
+    		isLoading: false,
+    	},
+    	actions: {
+    		*loadSomething() {
+    			state.isLoading = true;
+    			// ...
+    		},
+    	},
+    } );
+    ```
+
+    _Please note that, although this works, in general it is a good practice to define all the global state on the server._
+
+-   **Accessing the global state**
+
+    In the HTML markup, you can access the global state values directly by referencing `state` in the directive attribute values:
+
+    ```html
+    <div data-wp-bind--hidden="!state.show">
+    	<span data-wp-text="state.helloText"></span>
+    </div>
+    ```
+
+    In JavaScript, the `store` function from the package at `@wordpress/interactivity` works both as a setter and a getter, returning the store of the selected namespace.
+
+    To access the global state in your actions and callbacks, you can use the `state` property of the object returned by the `store` function:
+
+    ```js
+    const myPluginStore = store( 'myPlugin' );
+
+    myPluginStore.state; // This is the state of the 'myPlugin' namespace.
+    ```
+
+    You can also destructure the object returned by `store`:
+
+    ```js
+    const { state } = store( 'myPlugin' );
+    ```
+
+    And you can do the same even if you are defining the store at that moment, which is the most common scenario:
+
+    ```js
+    const { state } = store( 'myPlugin', {
+    	state: {
+    		// ...
+    	},
+    	actions: {
+    		toggle() {
+    			state.show = ! state.show;
+    		},
+    	},
+    } );
+    ```
+
+    The global state initialized on the server using the `wp_interactivity_state` function is also included in that object because it is automatically serialized from the server to the client:
+
+    ```php
+    wp_interactivity_state( 'myPlugin', array(
+      'someValue' => 1,
+    ));
+    ```
+
+    ```js
+    const { state } = store( 'myPlugin', {
+    	state: {
+    		otherValue: 2,
+    	},
+    	actions: {
+    		readGlobalState() {
+    			state.someValue; // It exists and its initial value is 1.
+    			state.otherValue; // It exists and its initial value is 2.
+    		},
+    	},
+    } );
+    ```
+
+    Lastly, all calls to the `store` function with the same namespace are merged together:
+
+    ```js
+    store( 'myPlugin', { state: { someValue: 1 } } );
+
+    store( 'myPlugin', { state: { otherValue: 2 } } );
+
+    /* All calls to `store` return a stable reference to the same object, so you
+     * can get a reference to `state` from any of them. */
+    const { state } = store( 'myPlugin' );
+
+    store( 'myPlugin', {
+    	actions: {
+    		readValues() {
+    			state.someValue; // It exists and its initial value is 1.
+    			state.otherValue; // It exists and its initial value is 2.
+    		},
+    	},
+    } );
+    ```
+
+-   **Updating the global state**
+
+    To update the global state, all you need to do is mutate the `state` object once you have obtained it from the `store` function:
+
+    ```js
+    const { state } = store( 'myPlugin', {
+    	actions: {
+    		updateValues() {
+    			state.someValue = 3;
+    			state.otherValue = 4;
+    		},
+    	},
+    } );
+    ```
+
+    Changes to the global state will automatically trigger updates in any directives that depend on the modified values.
+
+    _Please, visit [The Reactive and Declarative mindset](/docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md) guide to learn more about how reactivity works in the Interactivity API._
+
+### Example: Two interactive blocks using global state to communicate
+
+In this example, there are two independent interactive blocks. One displays a counter, and the other a button to increment that counter. These blocks can be positioned anywhere on the page, regardless of the HTML structure. In other words, one does not need to be an inner block of the other.
+
+-   **Counter Block**
+
+    ```php
+    <?php
+    wp_interactivity_state( 'myCounterPlugin', array(
+      'counter' => 0
+    ));
+    ?>
+
+    <div
+      data-wp-interactive="myCounterPlugin"
+      <?php echo get_block_wrapper_attributes(); ?>
+    >
+      Counter: <span data-wp-text="state.counter"></span>
+    </div>
+    ```
+
+-   **Increment Block**
+
+    ```php
+    <div
+      data-wp-interactive="myCounterPlugin"
+      <?php echo get_block_wrapper_attributes(); ?>
+    >
+      <button data-wp-on-async--click="actions.increment">
+        Increment
+      </button>
+    </div>
+    ```
+
+    ```js
+    const { state } = store( 'myCounterPlugin', {
+    	actions: {
+    		increment() {
+    			state.counter += 1;
+    		},
+    	},
+    } );
+    ```
+
+In this example:
+
+1. The global state is initialized on the server using `wp_interactivity_state`, setting an initial `counter` of 0.
+2. The Counter Block displays the current counter using `data-wp-text="state.counter"`, which reads from the global state.
+3. The Increment Block contains a button that triggers the `increment` action when clicked, using `data-wp-on-async--click="actions.increment"`.
+4. In JavaScript, the `increment` action directly modifies the global state by incrementing `state.counter`.
+
+Both blocks are independent and can be placed anywhere on the page. They don't need to be nested or directly related in the DOM structure. Multiple instances of these interactive blocks can be added to the page, and they will all share and update the same global counter value.
+
+## Local context
+
+**Local context** in the Interactivity API refers to local data defined within a specific element in the HTML structure. Unlike global state, local context is only accessible to the element where it's defined and its child elements.
+
+The local context is particularly useful when you need independent state for individual interactive blocks, ensuring that each instance of a block can maintain its own unique data without interfering with others.
+
+You should use local context when:
+
+-   You need to maintain separate state for multiple instances of the same interactive block.
+-   You want to encapsulate data that's only relevant to a specific interactive block and its children.
+-   You need to implement features that are isolated to a specific part of your UI.
+
+### Working with local context
+
+-   **Initializing the local context**
+
+    The local context is initialized directly within the HTML structure using the `data-wp-context` directive. This directive accepts a JSON string that defines the initial values for that piece of context.
+
+    ```html
+    <div data-wp-context='{ "counter": 0 }'>
+    	<!-- Child elements will have access to `context.counter` -->
+    </div>
+    ```
+
+    You can also initialize the local context on the server using the `wp_interactivity_data_wp_context` PHP helper, which ensures proper escaping and formatting of the stringified values:
+
+    ```php
+    <?php
+    $context = array( 'counter' => 0 );
+    ?>
+
+    <div <?php echo wp_interactivity_data_wp_context( $context ); ?>>
+      <!-- Child elements will have access to `context.counter` -->
+    </div>
+    ```
+
+-   **Accessing the local context**
+
+    In the HTML markup, you can access the local context values directly by referencing `context` in the directive values:
+
+    ```html
+    <div data-wp-bind--hidden="!context.isOpen">
+    	<span data-wp-text="context.counter"></span>
+    </div>
+    ```
+
+    In JavaScript, you can access the local context values using the `getContext` function:
+
+    ```js
+    store( 'myPlugin', {
+    	actions: {
+    		sendAnalyticsEvent() {
+    			const { counter } = getContext();
+    			myAnalyticsLibrary.sendEvent( 'updated counter', counter );
+    		},
+    	},
+    	callbacks: {
+    		logCounter() {
+    			const { counter } = getContext();
+    			console.log( `Current counter: ${ counter }` );
+    		},
+    	},
+    } );
+    ```
+
+    The `getContext` function returns the local context of the element that triggered the action/callback execution.
+
+-   **Updating the local context**
+
+    To update the local context values in JavaScript, you can modify the object returned by `getContext`:
+
+    ```js
+    store( 'myPlugin', {
+    	actions: {
+    		increment() {
+    			const context = getContext();
+    			context.counter += 1;
+    		},
+    		updateName( event ) {
+    			const context = getContext();
+    			context.name = event.target.value;
+    		},
+    	},
+    } );
+    ```
+
+    Changes to the local context will automatically trigger updates in any directives that depend on the modified values.
+
+    _Please, visit [The Reactive and Declarative mindset](/docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md) guide to learn more about how reactivity works in the Interactivity API._
+
+-   **Nesting local contexts**
+
+    Local contexts can be nested, with child contexts inheriting and potentially overriding values from parent contexts:
+
+    ```html
+    <div data-wp-context='{ "theme": "light", "counter": 0 }'>
+    	<p>Theme: <span data-wp-text="context.theme"></span></p>
+    	<p>Counter: <span data-wp-text="context.counter"></span></p>
+
+    	<div data-wp-context='{ "theme": "dark" }'>
+    		<p>Theme: <span data-wp-text="context.theme"></span></p>
+    		<p>Counter: <span data-wp-text="context.counter"></span></p>
+    	</div>
+    </div>
+    ```
+
+    In this example, the inner `div` will have a `theme` value of `"dark"`, but will inherit the `counter` value `0` from its parent context.
+
+### Example: One interactive block using local context to have independent state
+
+In this example, there is a single interactive block that shows a counter and can increment it. By using local context, each instance of this block will have its own independent counter, even if multiple blocks are added to the page.
+
+```php
+<div
+  data-wp-interactive="myCounterPlugin"
+  <?php echo get_block_wrapper_attributes(); ?>
+  data-wp-context='{ "counter": 0 }'
+>
+  <p>Counter: <span data-wp-text="context.counter"></span></p>
+  <button data-wp-on-async--click="actions.increment">Increment</button>
+</div>
+```
+
+```js
+store( 'myCounterPlugin', {
+	actions: {
+		increment() {
+			const context = getContext();
+			context.counter += 1;
+		},
+	},
+} );
+```
+
+In this example:
+
+1. A local context with an initial `counter` value of `0` is defined using the `data-wp-context` directive.
+2. The counter is displayed using `data-wp-text="context.counter"`, which reads from the local context.
+3. The increment button uses `data-wp-on-async--click="actions.increment"` to trigger the increment action.
+4. In JavaScript, the `getContext` function is used to access and modify the local context for each block instance.
+
+A user will be able to add multiple instances of this block to a page, and each will maintain its own independent counter. Clicking the "Increment" button on one block will only affect that specific block's counter and not the others.
+
+## Derived state
+
+**Derived state** in the Interactivity API refers to a value that is computed from other parts of the global state or local context. It's calculated on demand rather than stored. It ensures consistency, reduces redundancies, and enhances the declarative nature of your code.
+
+Derived state is a fundamental concept in modern state management, not unique to the Interactivity API. It's also used in other popular state management systems like Redux, where it's called `selectors`, or Preact Signals, where it's known as `computed` values.
+
+Derived state offers several key benefits that make it an essential part of a well-designed application state, including:
+
+1. **Single source of truth:** Derived state encourages you to store only the essential, raw data in your state. Any values that can be calculated from this core data become derived state. This approach reduces the risk of inconsistencies in your interactive blocks.
+
+2. **Automatic updates:** When you use derived state, values are recalculated automatically whenever the underlying data changes. This ensures that all parts of your interactive blocks always have access to the most up-to-date information without manual intervention.
+
+3. **Simplified state management:** By computing values on-demand rather than storing and updating them manually, you reduce the complexity of your state management logic. This leads to cleaner, more maintainable code.
+
+4. **Improved performance:** In many cases, derived state can be optimized to recalculate only when necessary, potentially improving your interactive blocks' performance.
+
+5. **Easier debugging:** With derived state, it's clearer where data originates and how it's transformed. This can make it easier to track down issues in your interactive blocks.
+
+In essence, derived state allows you to express relationships between different pieces of data in your interactive blocks declaratively, instead of imperatively updating related values whenever something changes.
+
+_Please, visit [The Reactive and Declarative mindset](/docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md) guide to learn more about how to leverage declarative coding in the Interactivity API._
+
+You should use derived state:
+
+-   When a part of your global state or local context can be computed from other state values.
+-   To avoid redundant data that needs to be manually kept in sync.
+-   To ensure consistency across your interactive blocks by automatically updating derived values.
+-   To simplify your actions by removing the need to update multiple related state properties.
+
+### Working with derived state
+
+-   **Initializing the derived state**
+
+    Typically, the derived state should be initialized on the server using the `wp_interactivity_state` function in the exact same way as the global state.
+
+    -   When the initial value is known and static, it can be defined directly:
+
+        ```php
+        wp_interactivity_state( 'myCounterPlugin', array(
+          'counter' => 1, // This is global state.
+          'double'  => 2, // This is derived state.
+        ));
+        ```
+
+    -   Or it can be defined by doing the necessary computations:
+
+        ```php
+        $counter = 1;
+        $double  = $counter * 2;
+
+        wp_interactivity_state( 'myCounterPlugin', array(
+          'counter' => $counter, // This is global state.
+          'double'  => $double,  // This is derived state.
+        ));
+        ```
+
+    Regardless of the approach, the initial derived state values will be used during the rendering of the page in PHP, and the HTML can be populated with the correct values.
+
+    _Please, visit [the Server-side Rendering guide](/docs/reference-guides/interactivity-api/core-concepts/server-side-rendering.md) to learn more about how directives are processed on the server._
+
+    The same mechanism applies even when the derived state property depends on the local context.
+
+    ```php
+    <?php
+    $counter = 1;
+
+    // This is the local context.
+    $context = array( 'counter' => $counter );
+
+    wp_interactivity_state( 'myCounterPlugin', array(
+      'double' => $counter * 2, // This is derived state.
+    ));
+    ?>
+
+    <div
+      data-wp-interactive="myCounterPlugin"
+      <?php echo wp_interactivity_data_wp_context( $context ); ?>
+    >
+      <div>
+        Counter: <span data-wp-text="context.counter"></span>
+      </div>
+      <div>
+        Double: <span data-wp-text="state.double"></span>
+      </div>
+    </div>
+    ```
+
+    In JavaScript, the derived state is defined using getters:
+
+    ```js
+    const { state } = store( 'myCounterPlugin', {
+    	state: {
+    		get double() {
+    			return state.counter * 2;
+    		},
+    	},
+    } );
+    ```
+
+    Derived state can depend on local context, or local context and global state at the same time.
+
+    ```js
+    const { state } = store( 'myCounterPlugin', {
+    	state: {
+    		get double() {
+    			const { counter } = getContext();
+    			// Depends on local context.
+    			return counter * 2;
+    		},
+    		get product() {
+    			const { counter } = getContext();
+    			// Depends on local context and global state.
+    			return counter * state.factor;
+    		},
+    	},
+    } );
+    ```
+
+    In some cases, when the derived state depends on the local context and the local context can change dynamically in the server, instead of the initial derived state, you can use a function (Closure) that calculates it dynamically.
+
+    ```php
+    <?php
+    wp_interactivity_state( 'myProductPlugin', array(
+      'list'    => array( 1, 2, 3 ),
+      'factor'  => 3,
+      'product' => function() {
+        $state   = wp_interactivity_state();
+        $context = wp_interactivity_get_context();
+        return $context['item'] * $state['factor'];
+      }
+    ));
+    ?>
+
+    <template
+      data-wp-interactive="myProductPlugin"
+      data-wp-each="state.list"
+    >
+      <span data-wp-text="state.product"></span>
+    </template>
+    ```
+
+    This `data-wp-each` template will render this HTML (directives omitted):
+
+    ```html
+    <span>3</span>
+    <span>6</span>
+    <span>9</span>
+    ```
+
+-   **Accessing the derived state**
+
+    In the HTML markup, the syntax for the derived state is the same as the one for the global state, just by referencing `state` in the directive attribute values.
+
+    ```html
+    <span data-wp-text="state.double"></span>
+    ```
+
+    The same happens in JavaScript. Both global state and derived state can be consumed through the `state` property of the store:
+
+    ```js
+    const { state } = store( 'myCounterPlugin', {
+    	// ...
+    	actions: {
+    		readValues() {
+    			state.counter; // Regular state, returns 1.
+    			state.double; // Derived state, returns 2.
+    		},
+    	},
+    } );
+    ```
+
+    This lack of distinction is intentional, allowing developers to consume both derived and global state uniformly, and making them interchangeable in practice.
+
+    You can also access the derived state from another derived state and, thus, create multiple levels of computed values.
+
+    ```js
+    const { state } = store( 'myPlugin', {
+    	state: {
+    		get double() {
+    			return state.counter * 2;
+    		},
+    		get doublePlusOne() {
+    			return state.double + 1;
+    		},
+    	},
+    } );
+    ```
+
+-   **Updating the derived state**
+
+    The derived state cannot be updated directly. To update its values, you need to update the global state or local context on which that derived state depends.
+
+    ```js
+    const { state } = store( 'myCounterPlugin', {
+    	// ...
+    	actions: {
+    		updateValues() {
+    			state.counter; // Regular state, returns 1.
+    			state.double; // Derived state, returns 2.
+
+    			state.counter = 2;
+
+    			state.counter; // Regular state, returns 2.
+    			state.double; // Derived state, returns 4.
+    		},
+    	},
+    } );
+    ```
+
+### Example: Not using derived state vs using derived state
+
+Let's consider a scenario where there is a counter and the double value needs to be displayed, and let's compare two approaches: one without derived state and one with derived state.
+
+-   **Not using derived state**
+
+    ```js
+    const { state } = store( 'myCounterPlugin', {
+    	state: {
+    		counter: 1,
+    		double: 2,
+    	},
+    	actions: {
+    		increment() {
+    			state.counter += 1;
+    			state.double = state.counter * 2;
+    		},
+    	},
+    } );
+    ```
+
+    In this approach, both the `state.counter` and `state.double` values are manually updated in the `increment` action. While this works, it has several drawbacks:
+
+    -   It's less declarative.
+    -   It can lead to bugs if `state.counter` is updated from multiple places and developers forget to keep `state.double` in sync.
+    -   It requires more cognitive load to remember to update related values.
+
+-   **Using derived state**
+
+    ```js
+    const { state } = store( 'myCounterPlugin', {
+    	state: {
+    		counter: 1,
+    		get double() {
+    			return state.counter * 2;
+    		},
+    	},
+    	actions: {
+    		increment() {
+    			state.counter += 1;
+    		},
+    	},
+    } );
+    ```
+
+    In this improved version:
+
+    -   `state.double` is defined as a getter, automatically deriving its value from `state.counter`.
+    -   The `increment` action only needs to update `state.counter`.
+    -   `state.double` is always guaranteed to have the correct value, regardless of how or where `state.counter` is updated.
+
+### Example: Using derived state with local context
+
+Let's now consider a scenario where there is a local context that initializes a counter.
+
+```js
+store( 'myCounterPlugin', {
+	state: {
+		get double() {
+			const { counter } = getContext();
+			return counter * 2;
+		},
+	},
+	actions: {
+		increment() {
+			const context = getContext();
+			context.counter += 1;
+		},
+	},
+} );
+```
+
+```html
+<div data-wp-interactive="myCounterPlugin">
+	<!-- This will render "Double: 2" -->
+	<div data-wp-context='{ "counter": 1 }'>
+		Double: <span data-wp-text="state.double"></span>
+
+		<!-- This button will increment the local counter. -->
+		<button data-wp-on-async--click="actions.increment">Increment</button>
+	</div>
+
+	<!-- This will render "Double: 4" -->
+	<div data-wp-context='{ "counter": 2 }'>
+		Double: <span data-wp-text="state.double"></span>
+
+		<!-- This button will increment the local counter. -->
+		<button data-wp-on-async--click="actions.increment">Increment</button>
+	</div>
+</div>
+```
+
+In this example, the derived state `state.double` reads from the local context present in each element and returns the correct value for each instance where it is used.
+
+### Example: Using derived state with both local context and global state
+
+Let's now consider a scenario where there is a global tax rate and local product prices and calculate the final price, including tax.
+
+```html
+<div
+	data-wp-interactive="myProductPlugin"
+	data-wp-context='{ "priceWithoutTax": 100 }'
+>
+	<p>Product Price: $<span data-wp-text="context.priceWithoutTax"></span></p>
+	<p>Tax Rate: <span data-wp-text="state.taxRatePercentage"></span></p>
+	<p>Price (inc. tax): $<span data-wp-text="state.priceWithTax"></span></p>
+</div>
+```
+
+```js
+const { state } = store( 'myProductPlugin', {
+	state: {
+		taxRate: 0.21,
+		get taxRatePercentage() {
+			return `${ state.taxRate * 100 }%`;
+		},
+		get priceWithTax() {
+			const { priceWithoutTax } = getContext();
+			return price * ( 1 + state.taxRate );
+		},
+	},
+	actions: {
+		updateTaxRate( event ) {
+			// Updates the global tax rate.
+			state.taxRate = event.target.value;
+		},
+		updatePrice( event ) {
+			// Updates the local product price.
+			const context = getContext();
+			context.priceWithoutTax = event.target.value;
+		},
+	},
+} );
+```
+
+In this example, `priceWithTax` is derived from both the global `taxRate` and the local `priceWithoutTax`. Every time you update the global state or local context through the `updateTaxRate` or `updatePrice` actions, the Interactivity API recomputes the derived state and updates the necessary parts of the DOM.
+
+By using derived state, you create a more maintainable and less error-prone codebase. It ensures that related state values are always in sync, reduces the complexity of your actions, and makes your code more declarative and easier to reason about.
+
+## Subscribing to Server State and Context
+
+Interactivity API offers a region-based navigation feature that dynamically replaces a part of the page without a full page reload. The [Query block](/docs/reference-guides/core-blocks.md#query-loop) natively supports this feature when the `Force page reload` toggle is disabled. Developers can use the same functionality in custom blocks by calling [`actions.navigate()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-interactivity-router/#actions) from the [`@wordpress/interactivity-router`](https://github.com/WordPress/gutenberg/tree/trunk/packages/interactivity-router) script module.
+
+When using region-based navigation, it's crucial to ensure that your interactive blocks stay in sync with the server-provided global state and local context. By default, the Interactivity API will never overwrite the global state or local context with the server-provided values. The Interactivity API provides two functions to help manage this synchronization: [`getServerState()`](/docs/reference-guides/interactivity-api/api-reference.md#getserverstate) and [`getServerContext()`](/docs/reference-guides/interactivity-api/api-reference.md#getservercontext).
+
+### `getServerState()`
+
+`getServerState()` allows you to subscribe to changes in the **global state** that occur during client-side navigation. This function is analogous to `getServerContext()`, but it works with the global state instead of the local context.
+
+Let's consider a quiz that has multiple questions. Each question is a separate page. When the user navigates to a new question, the server provides the new question and the time left to answer all the questions.
+
+```php
+<?php
+wp_interactivity_state( 'myPlugin', array(
+	'question' => get_question_for_page( get_the_ID() ),
+	'timeLeft' => 5 * 60, // Time to answer all the questions.
+) );
+?>
+```
+
+```javascript
+import { store, getServerState } from '@wordpress/interactivity';
+
+store( 'myPlugin', {
+	actions: {
+		// This action would be triggered by a directive, like:
+		// <button data-wp-on-click="actions.nextQuestion">Next Question</button>
+		*nextQuestion() {
+			event.preventDefault( event );
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			actions.navigate( '/question-2' );
+		},
+	},
+	callbacks: {
+		// This callback would be triggered by a directive, like:
+		// <div data-wp-watch="callbacks.updateQuestion"></div>
+		updateQuestion() {
+			const serverState = getServerState();
+
+			// Update with the new value coming from the server.
+			// We DON'T want to update `timeLeft` because it represents the time left to answer ALL the questions.
+			state.question = serverState.question;
+		},
+	},
+} );
+```
+
+### `getServerContext()`
+
+`getServerContext()` allows you to subscribe to changes in the **local context** that occur during client-side navigation. This function is analogous to `getServerState()`, but it works with the local context instead of the global state.
+
+Consider a quiz that has multiple questions. Each question is a separate page. When the user navigates to a new question, the server provides the new question and the time left to answer all the questions.
+
+```php
+<?php
+wp_interactivity_context( 'myPlugin', array(
+	'currentQuestion' => get_question_for_page( get_the_ID() ),
+) );
+?>
+```
+
+```javascript
+import { store, getServerContext } from '@wordpress/interactivity';
+
+store( 'myPlugin', {
+	actions: {
+		// This action would be triggered by a directive, like:
+		// <button data-wp-on-click="actions.nextQuestion">Next Question</button>
+		*nextQuestion() {
+			event.preventDefault( event );
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			actions.navigate( '/question-2' );
+		},
+	},
+	callbacks: {
+		// This callback would be triggered by a directive, like:
+		// <div data-wp-watch="callbacks.updateQuestion"></div>
+		updateQuestion() {
+			const serverContext = getServerContext();
+			const context = getContext();
+
+			// Update with the new value coming from the server.
+			context.currentQuestion = serverContext.currentQuestion;
+		},
+	},
+} );
+```
+
+### When to Use
+
+Whenever you have interactive blocks that rely on global state that may change due to navigation events, ensuring consistency across different parts of your application.
+
+### Best Practices for using `getServerState()` and `getServerContext()`
+
+-   **Read-Only References:** Both `getServerState()` and `getServerContext()` return read-only objects. You can use those objects to update the global state or local context.
+-   **Callback Integration:** Incorporate these functions within your store [callbacks](/docs/reference-guides/interactivity-api/api-reference.md#accessing-data-in-callbacks) to react to state and context changes.
+
+## Conclusion
+
+Remember, the key to effective state management is to keep your state minimal and avoid redundancy. Use derived state to compute values dynamically, and choose between global state and local context based on the scope and requirements of your data. This will lead to a cleaner, more robust architecture that is easier to debug and maintain. Finally, if you need to synchronize the state or context with the server, you can use `getServerState()` and `getServerContext()` to achieve this.
diff --git a/docs/reference-guides/interactivity-api/core-concepts/using-typescript.md b/docs/reference-guides/interactivity-api/core-concepts/using-typescript.md
new file mode 100644
index 00000000000000..ed0bdd88211d11
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/core-concepts/using-typescript.md
@@ -0,0 +1,746 @@
+# Using TypeScript
+
+The Interactivity API provides robust support for TypeScript, enabling developers to build type-safe stores to enhance the development experience with static type checking, improved code completion, and simplified refactoring. This guide will walk you through the process of using TypeScript with Interactivity API stores, covering everything from basic type definitions to advanced techniques for handling complex store structures.
+
+These are the core principles of TypeScript's interaction with the Interactivity API:
+
+-   **Inferred client types**: When you create a store using the `store` function, TypeScript automatically infers the types of the store's properties (`state`, `actions`, etc.). This means that you can often get away with just writing plain JavaScript objects, and TypeScript will figure out the types for you.
+-   **Explicit server types**: When dealing with data defined on the server, like local context or the initial values of the global state, you can explicitly define its types to ensure that everything is correctly typed.
+-   **Mutiple store parts**: Even if your store is split into multiple parts, you can define or infer the types of each part of the store and then merge them into a single type that represents the entire store.
+-   **Typed external stores**: You can import typed stores from external namespaces, allowing you to use other plugins' functionality with type safety.
+
+## Installing `@wordpress/interactivity` locally
+
+If you haven't done so already, you need to install the package `@wordpress/interactivity` locally so TypeScript can use its types in your IDE. You can do this using the following command:
+
+`npm install @wordpress/interactivity`
+
+It is also a good practice to keep that package updated.
+
+## Scaffolding a new typed interactive block
+
+If you want to explore an example of an interactive block using TypeScript in your local environment, you can use the `@wordpress/create-block-interactive-template`.
+
+Start by ensuring you have Node.js and `npm` installed on your computer. Review the [Node.js development environment](https://developer.wordpress.org/block-editor/getting-started/devenv/nodejs-development-environment/) guide if not.
+
+Next, use the [`@wordpress/create-block`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-create-block/) package and the [`@wordpress/create-block-interactive-template`](https://www.npmjs.com/package/@wordpress/create-block-interactive-template) template to scaffold the block.
+
+Choose the folder where you want to create the plugin, execute the following command in the terminal from within that folder, and choose the `typescript` variant when asked.
+
+```
+npx @wordpress/create-block@latest --template @wordpress/create-block-interactive-template
+```
+
+**Important**: Do not provide a slug in the terminal. Otherwise, `create-block` will not ask you which variant you want to choose and it will select the default non-TypeScript variant by default.
+
+Finally, you can keep following the instructions in the [Getting Started Guide](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/iapi-quick-start-guide/) as the rest of the instructions remain the same.
+
+## Typing the store
+
+Depending on the structure of your store and your preference, there are three options you can choose from to generate your store's types:
+
+1.  Infer the types from your client store definition.
+2.  Manually type the server state, but infer the rest from your client store definition.
+3.  Manually write all the types.
+
+### 1. Infer the types from your client store definition
+
+When you create a store using the `store` function, TypeScript automatically infers the types of the store's properties (`state`, `actions`, `callbacks`, etc.). This means that you can often get away with just writing plain JavaScript objects, and TypeScript will figure out the correct types for you.
+
+Let's start with a basic example of a counter block. We will define the store in the `view.ts` file of the block, which contains the initial global state, an action and a callback.
+
+```ts
+// view.ts
+const myStore = store( 'myCounterPlugin', {
+	state: {
+		counter: 0,
+	},
+	actions: {
+		increment() {
+			myStore.state.counter += 1;
+		},
+	},
+	callbacks: {
+		log() {
+			console.log( `counter: ${ myStore.state.counter }` );
+		},
+	},
+} );
+```
+
+If you inspect the types of `myStore` using TypeScript, you will see that TypeScript has been able to infer the types correctly.
+
+```ts
+const myStore: {
+	state: {
+		counter: number;
+	};
+	actions: {
+		increment(): void;
+	};
+	callbacks: {
+		log(): void;
+	};
+};
+```
+
+You can also destructure the `state`, `actions` and `callbacks` properties, and the types will still work correctly.
+
+```ts
+const { state } = store( 'myCounterPlugin', {
+	state: {
+		counter: 0,
+	},
+	actions: {
+		increment() {
+			state.counter += 1;
+		},
+	},
+	callbacks: {
+		log() {
+			console.log( `counter: ${ state.counter }` );
+		},
+	},
+} );
+```
+
+In conclusion, inferring the types is useful when you have a simple store defined in a single call to the `store` function and you do not need to type any state that has been initialized on the server.
+
+### 2. Manually type the server state, but infer the rest from your client store definition
+
+The global state that is initialized on the server with the `wp_interactivity_state` function doesn't exist on your client store definition and, therefore, needs to be manually typed. But if you don't want to define all the types of your store, you can infer the types of your client store definition and merge them with the types of your server initialized state.
+
+_Please, visit [the Server-side Rendering guide](/docs/reference-guides/interactivity-api/core-concepts/server-side-rendering.md) to learn more about `wp_interactivity_state` and how directives are processed on the server._
+
+Following our previous example, let's move our `counter` state initialization to the server.
+
+```php
+wp_interactivity_state( 'myCounterPlugin', array(
+	'counter' => 1,
+));
+```
+
+Now, let's define the server state types and merge it with the types inferred from the client store definition.
+
+```ts
+// Types the server state.
+type ServerState = {
+	state: {
+		counter: number;
+	};
+};
+
+// Defines the store in a variable to be able to extract its type later.
+const storeDef = {
+	actions: {
+		increment() {
+			state.counter += 1;
+		},
+	},
+	callbacks: {
+		log() {
+			console.log( `counter: ${ state.counter }` );
+		},
+	},
+};
+
+// Merges the types of the server state and the client store definition.
+type Store = ServerState & typeof storeDef;
+
+// Injects the final types when calling the `store` function.
+const { state } = store< Store >( 'myCounterPlugin', storeDef );
+```
+
+Alternatively, if you don't mind typing the entire state including both the values defined on the server and the values defined on the client, you can cast the `state` property and let TypeScript infer the rest of the store.
+
+Let's imagine you have an additional property in the client global state called `product`.
+
+```ts
+type State = {
+	counter: number; // The server state.
+	product: number; // The client state.
+};
+
+const { state } = store( 'myCounterPlugin', {
+	state: {
+		product: 2,
+	} as State, // Casts the entire state manually.
+	actions: {
+		increment() {
+			state.counter * state.product;
+		},
+	},
+} );
+```
+
+That's it. Now, TypeScript will infer the types of the `actions` and `callbacks` properties from the store definition, but it will use the type `State` for the `state` property so it contains the correct types from both the client and server definitions.
+
+In conclusion, this approach is useful when you have a server state that needs to be manually typed, but you still want to infer the types of the rest of the store.
+
+### 3. Manually write all the types
+
+If you prefer to define all the types of the store manually instead of letting TypeScript infer them from your client store definition, you can do that too. You simply need to pass them to the `store` function.
+
+```ts
+// Defines the store types.
+interface Store {
+	state: {
+		counter: number; // Initial server state
+	};
+	actions: {
+		increment(): void;
+	};
+	callbacks: {
+		log(): void;
+	};
+}
+
+// Pass the types when calling the `store` function.
+const { state } = store< Store >( 'myCounterPlugin', {
+	actions: {
+		increment() {
+			state.counter += 1;
+		},
+	},
+	callbacks: {
+		log() {
+			console.log( `counter: ${ state.counter }` );
+		},
+	},
+} );
+```
+
+That's it! In conclusion, this approach is useful when you want to control all the types of your store and you don't mind writing them by hand.
+
+## Typing the local context
+
+The initial local context is defined on the server using the `data-wp-context` directive.
+
+```html
+<div data-wp-context='{ "counter": 0 }'>...</div>
+```
+
+For that reason, you need to define its type manually and pass it to the `getContext` function to ensure the returned properties are correctly typed.
+
+```ts
+// Defines the types of your context.
+type MyContext = {
+	counter: number;
+};
+
+store( 'myCounterPlugin', {
+	actions: {
+		increment() {
+			// Passes it to the getContext function.
+			const context = getContext< MyContext >();
+			// Now `context` is properly typed.
+			context.counter += 1;
+		},
+	},
+} );
+```
+
+To avoid having to pass the context types over and over, you can also define a typed function and use that function instead of `getContext`.
+
+```ts
+// Defines the types of your context.
+type MyContext = {
+	counter: number;
+};
+
+// Defines a typed function. You only have to do this once.
+const getMyContext = getContext< MyContext >;
+
+store( 'myCounterPlugin', {
+	actions: {
+		increment() {
+			// Use your typed function.
+			const context = getMyContext();
+			// Now `context` is properly typed.
+			context.counter += 1;
+		},
+	},
+} );
+```
+
+That's it! Now you can access the context properties with the correct types.
+
+## Typing the derived state
+
+The derived state is data that is calculated based on the global state or local context. In the client store definition, it is defined using a getter in the `state` object.
+
+_Please, visit the [Understanding global state, local context and derived state](./undestanding-global-state-local-context-and-derived-state.md) guide to learn more about how derived state works in the Interactivity API._
+
+Following our previous example, let's create a derived state that is the double of our counter.
+
+```ts
+type MyContext = {
+	counter: number;
+};
+
+const myStore = store( 'myCounterPlugin', {
+	state: {
+		get double() {
+			const { counter } = getContext< MyContext >();
+			return counter * 2;
+		},
+	},
+	actions: {
+		increment() {
+			state.counter += 1; // This type is number.
+		},
+	},
+} );
+```
+
+Normally, when the derived state depends on the local context, TypeScript will be able to infer the correct types:
+
+```ts
+const myStore: {
+	state: {
+		readonly double: number;
+	};
+	actions: {
+		increment(): void;
+	};
+};
+```
+
+But when the return value of the derived state depends directly on some part of the global state, TypeScript will not be able to infer the types because it will claim that it has a circular reference.
+
+For example, in this case, TypeScript cannot infer the type of `state.double` because it depends on `state.counter`, and the type of `state` is not completed until the type of `state.double` is defined, creating a circular reference.
+
+```ts
+const { state } = store( 'myCounterPlugin', {
+	state: {
+		counter: 0,
+		get double() {
+			// TypeScript can't infer this return type because it depends on `state`.
+			return state.counter * 2;
+		},
+	},
+	actions: {
+		increment() {
+			state.counter += 1; // This type is now unknown.
+		},
+	},
+} );
+```
+
+In this case, depending on your TypeScript configuration, TypeScript will either warn you about a circular reference or simply add the `any` type to the `state` property.
+
+However, solving this problem is easy; we simply need to manually provide TypeScript with the return type of that getter. Once we do that, the circular reference disappears, and TypeScript can once again infer all the `state` types.
+
+```ts
+const { state } = store( 'myCounterPlugin', {
+	state: {
+		counter: 1,
+		get double(): number {
+			return state.counter * 2;
+		},
+	},
+	actions: {
+		increment() {
+			state.counter += 1; // Correctly inferred!
+		},
+	},
+} );
+```
+
+These are now the correct inferred types for the previous store.
+
+```ts
+const myStore: {
+	state: {
+		counter: number;
+		readonly double: number;
+	};
+	actions: {
+		increment(): void;
+	};
+};
+```
+
+When using `wp_interactivity_state` in the server, remember that you also need to define the initial value of your derived state, like this:
+
+```php
+wp_interactivity_state( 'myCounterPlugin', array(
+	'counter' => 1,
+	'double'  => 2,
+));
+```
+
+But if you are inferring the types, you don't need to manually define the type of the derived state because it already exists in your client's store definition.
+
+```ts
+// You don't need to type `state.double` here.
+type ServerState = {
+	state: {
+		counter: number;
+	};
+};
+
+// The `state.double` type is inferred from here.
+const storeDef = {
+	state: {
+		get double(): number {
+			return state.counter * 2;
+		},
+	},
+	actions: {
+		increment() {
+			state.counter += 1;
+		},
+	},
+};
+
+// Merges the types of the server state and the client store definition.
+type Store = ServerState & typeof storeDef;
+
+// Injects the final types when calling the `store` function.
+const { state } = store< Store >( 'myCounterPlugin', storeDef );
+```
+
+That's it! Now you can access the derived state properties with the correct types.
+
+## Typing asynchronous actions
+
+Another thing to keep in mind when using TypeScript with the Interactivity API is that asynchronous actions must be defined with generators instead of async functions.
+
+The reason for using generators in the Interactivity API's asynchronous actions is to be able to restore the scope from the initially triggered action once the asynchronous action continues its execution after yielding. But this is a syntax change only, otherwise, **these functions operate just like regular async functions**, and the inferred types from the `store` function reflect this.
+
+Following our previous example, let's add an asynchronous action to the store.
+
+```ts
+const { state } = store( 'myCounterPlugin', {
+	state: {
+		counter: 0,
+		get double(): number {
+			return state.counter * 2;
+		},
+	},
+	actions: {
+		increment() {
+			state.counter += 1;
+		},
+		*delayedIncrement() {
+			yield new Promise( ( r ) => setTimeout( r, 1000 ) );
+			state.counter += 1;
+		},
+	},
+} );
+```
+
+The inferred types for this store are:
+
+```ts
+const myStore: {
+	state: {
+		counter: number;
+		readonly double: number;
+	};
+	actions: {
+		increment(): void;
+		// This behaves like a regular async function.
+		delayedIncrement(): Promise< void >;
+	};
+};
+```
+
+This also means that you can use your async actions in external functions, and TypeScript will correctly use the async function types.
+
+```ts
+const someAsyncFunction = async () => {
+	// This works fine and it's correctly typed.
+	await actions.delayedIncrement( 2000 );
+};
+```
+
+When you are not inferring types but manually writing the types for your entire store, you can use async function types for your async actions.
+
+```ts
+type Store = {
+	state: {
+		counter: number;
+		readonly double: number;
+	};
+	actions: {
+		increment(): void;
+		delayedIncrement(): Promise< void >; // You can use async functions here.
+	};
+};
+```
+
+There's something to keep in mind when when using asynchronous actions. Just like with the derived state, if the asynchronous action needs to return a value and this value directly depends on some part of the global state, TypeScript will not be able to infer the type due to a circular reference.
+
+    ```ts
+    const { state, actions } = store( 'myCounterPlugin', {
+    	state: {
+    		counter: 0,
+    	},
+    	actions: {
+    		*delayedReturn() {
+    			yield new Promise( ( r ) => setTimeout( r, 1000 ) );
+    			return state.counter; // TypeScript can't infer this return type.
+    		},
+    	},
+    } );
+    ```
+
+    In this case, just as we did with the derived state, we must manually type the return value of the generator.
+
+    ```ts
+    const { state, actions } = store( 'myCounterPlugin', {
+    	state: {
+    		counter: 0,
+    	},
+    	actions: {
+    		*delayedReturn(): Generator< uknown, number, uknown > {
+    			yield new Promise( ( r ) => setTimeout( r, 1000 ) );
+    			return state.counter; // Now this is correctly inferred.
+    		},
+    	},
+    } );
+    ```
+
+    That's it! Remember that the return type of a Generator is the second generic argument: `Generator< unknown, ReturnType, unknown >`.
+
+## Typing stores that are divided into multiple parts
+
+Sometimes, stores can be divided into different files. This can happen when different blocks share the same namespace, with each block loading the part of the store it needs.
+
+Let's look at an example of two blocks:
+
+-   `todo-list`: A block that displays a list of todos.
+-   `add-post-to-todo`: A block that shows a button to add a new todo item to the list with the text "Read {$post_title}".
+
+First, let's initialize the global and derived state of the `todo-list` block on the server.
+
+```php
+<?php
+// todo-list-block/render.php
+$todos = array( 'Buy milk', 'Walk the dog' );
+wp_interactivity_state( 'myTodoPlugin', array(
+  'todos'         => $todos,
+  'filter'        => 'all',
+  'filteredTodos' => $todos,
+));
+?>
+
+<!-- HTML markup... -->
+```
+
+Now, let's type the server state and add the client store definition. Remember, `filteredTodos` is derived state, so you don't need to type it manually.
+
+```ts
+// todo-list-block/view.ts
+type ServerState = {
+	state: {
+		todos: string[];
+		filter: 'all' | 'completed';
+	};
+};
+
+const todoList = {
+	state: {
+		get filteredTodos(): string[] {
+			return state.filter === 'completed'
+				? state.todos.filter( ( todo ) => todo.includes( '✅' ) )
+				: state.todos;
+		},
+	},
+	actions: {
+		addTodo( todo: string ) {
+			state.todos.push( todo );
+		},
+	},
+};
+
+// Merges the inferred types with the server state types.
+export type TodoList = ServerState & typeof todoList;
+
+// Injects the final types when calling the `store` function.
+const { state } = store< TodoList >( 'myTodoPlugin', todoList );
+```
+
+So far, so good. Now let's create our `add-post-to-todo` block.
+
+First, let's add the current post title to the server state.
+
+```php
+<?php
+// add-post-to-todo-block/render.php
+wp_interactivity_state( 'myTodoPlugin', array(
+  'postTitle' => get_the_title(),
+));
+?>
+
+<!-- HTML markup... -->
+```
+
+Now, let's type that server state and add the client store definition.
+
+```ts
+// add-post-to-todo-block/view.ts
+type ServerState = {
+	state: {
+		postTitle: string;
+	};
+};
+
+const addPostToTodo = {
+	actions: {
+		addPostToTodo() {
+			const todo = `Read: ${ state.postTitle }`.trim();
+			if ( ! state.todos.includes( todo ) ) {
+				actions.addTodo( todo );
+			}
+		},
+	},
+};
+
+// Merges the inferred types with the server state types.
+type Store = ServerState & typeof addPostToTodo;
+
+// Injects the final types when calling the `store` function.
+const { state, actions } = store< Store >( 'myTodoPlugin', addPostToTodo );
+```
+
+This works fine in the browser, but TypeScript will complain that, in this block, `state` and `actions` do not include `state.todos` and `actions.addtodo`.
+
+To fix this, we need to import the `TodoList` type from the `todo-list` block and merge it with the other types.
+
+```ts
+import type { TodoList } from '../todo-list-block/view';
+
+// ...
+
+// Merges the inferred types inferred the server state types.
+type Store = TodoList & ServerState & typeof addPostToTodo;
+```
+
+That's it! Now TypeScript will know that `state.todos` and `actions.addTodo` are available in the `add-post-to-todo` block.
+
+This approach allows the `add-post-to-todo` block to interact with the existing todo list while maintaining type safety and adding its own functionality to the shared store.
+
+If you need to use the `add-post-to-todo` types in the `todo-list` block, you simply have to export its types and import them in the other `view.ts` file.
+
+Finally, if you prefer to define all types manually instead of inferring them, you can define them in a separate file and import that definition into each of your store parts. Here's how you could do that for our todo list example:
+
+```ts
+// types.ts
+interface Store {
+	state: {
+		todos: string[];
+		filter: 'all' | 'completed';
+		filtered: string[];
+		postTitle: string;
+	};
+	actions: {
+		addTodo( todo: string ): void;
+		addPostToTodo(): void;
+	};
+}
+
+export default Store;
+```
+
+```ts
+// todo-list-block/view.ts
+import type Store from '../types';
+
+const { state } = store< Store >( 'myTodoPlugin', {
+	// Everything is correctly typed here
+} );
+```
+
+```ts
+// add-post-to-todo-block/view.ts
+import type Store from '../types';
+
+const { state, actions } = store< Store >( 'myTodoPlugin', {
+	// Everything is correctly typed here
+} );
+```
+
+This approach allows you to have full control over your types and ensures consistency across all parts of your store. It's particularly useful when you have a complex store structure or when you want to enforce a specific interface across multiple blocks or components.
+
+## Importing and exporting typed stores
+
+In the Interactivity API, stores from other namespaces can be accessed using the `store` function.
+
+Let's go back to our `todo-list` block example, but this time, let's imagine that the `add-post-to-todo` block belongs to a different plugin and therefore will use a different namespace.
+
+```ts
+// Import the store of the `todo-list` block.
+const myTodoPlugin = store( 'myTodoPlugin' );
+
+store( 'myAddPostToTodoPlugin', {
+	actions: {
+		addPostToTodo() {
+			const todo = `Read: ${ state.postTitle }`.trim();
+			if ( ! myTodoPlugin.state.todos.includes( todo ) ) {
+				myTodoPlugin.actions.addTodo( todo );
+			}
+		},
+	},
+} );
+```
+
+This works fine in the browser, but TypeScript will complain that `myTodoPlugin.state` and `myTodoPlugin.actions` are not typed.
+
+To fix that, the `myTodoPlugin` plugin can export the result of calling the `store` function with the correct types, and make that available using a script module.
+
+```ts
+// Export the already typed state and actions.
+export const { state, actions } = store< TodoList >( 'myTodoPlugin', {
+	// ...
+} );
+```
+
+Now, the `add-post-to-todo` block can import the typed store from the `myTodoPlugin` script module, and it not only ensures that the store will be loaded, but that it also contains the correct types.
+
+```ts
+import { store } from '@wordpress/interactivity';
+import {
+	state as todoState,
+	actions as todoActions,
+} from 'my-todo-plugin-module';
+
+store( 'myAddPostToTodoPlugin', {
+	actions: {
+		addPostToTodo() {
+			const todo = `Read: ${ state.postTitle }`.trim();
+			if ( ! todoState.todos.includes( todo ) ) {
+				todoActions.addTodo( todo );
+			}
+		},
+	},
+} );
+```
+
+Remember that you will need to declare the `my-todo-plugin-module` script module as a dependency.
+
+If the other store is optional and you don't want to load it eagerly, a dynamic import can be used instead of a static import.
+
+```ts
+import { store } from '@wordpress/interactivity';
+
+store( 'myAddPostToTodoPlugin', {
+	actions: {
+		*addPostToTodo() {
+			const todoPlugin = yield import( 'my-todo-plugin-module' );
+			const todo = `Read: ${ state.postTitle }`.trim();
+			if ( ! todoPlugin.state.todos.includes( todo ) ) {
+				todoPlugin.actions.addTodo( todo );
+			}
+		},
+	},
+} );
+```
+
+## Conclusion
+
+In this guide, we explored different approaches to typing the Interactivity API stores, from inferring types automatically to manually defining them. We also covered how to handle server-initialized state, local context, and derived state, as well as how to type asynchronous actions.
+
+Remember that the choice between inferring types and manually defining them depends on your specific needs and the complexity of your store. Whichever approach you choose, TypeScript will help you build better and more reliable interactive blocks.
diff --git a/docs/reference-guides/interactivity-api/iapi-about.md b/docs/reference-guides/interactivity-api/iapi-about.md
new file mode 100644
index 00000000000000..08689be03aa383
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/iapi-about.md
@@ -0,0 +1,195 @@
+# About the Interactivity API
+
+The Interactivity API is **a [standard](#why-a-standard) system of [directives](#why-directives), based on declarative code, for [adding frontend interactivity to blocks](#api-goals)**.
+
+**Directives extend HTML with special attributes** that tell the Interactivity API to attach a specified behavior to a DOM element or even to transform it. For those familiar with [Alpine.js](https://alpinejs.dev/), it’s a similar approach but explicitly designed to work seamlessly with WordPress.
+
+## API Goals 
+
+The main goal of the Interactivity API is to **provide a standard and simple way to handle the frontend interactivity of Gutenberg blocks**.
+
+A standard makes it **easier for developers to create rich, interactive user experiences**, from simple cases like counters or popups to more complex features like instant page navigation, instant search, or carts and checkouts.
+
+All these user experiences are technically possible right now without the Interactivity API. However, the more complex the user experience and the more blocks interact with each other, the harder it becomes for developers to build and maintain sites. There are a lot of challenges they have to figure out themselves. The API aims to provide out-of-the-box means for supporting these kinds of interactions.
+
+To address this challenge the following requirements/goals for the Interactivity API were defined:
+
+- **Block-first and PHP-first**: The API must work well with PHP and the current block system, including dynamic blocks, widely extended in WordPress. It must support server-side rendering. Server-rendered HTML and client-hydrated HTML must be exactly the same. This is important for SEO and the user experience.
+- **Backward compatible**: The API must be compatible with WordPress hooks, which could, for example, modify server-rendered HTML. It must also be compatible with internationalization and existing JS libraries on the site (such as jQuery).
+- **Optional and gradual adoption**: Related to the previous point, the API must remain optional. It should be possible to adopt it gradually, meaning that interactive blocks not using this API can coexist with those using it.
+- **Declarative and reactive**: The API must use declarative code, listen to changes in the data, and update only the parts of the DOM that depend on that data.
+- **Performant**: The runtime must be fast and lightweight to ensure the best user experience.
+- **Extensible**: In the same way WordPress focuses on extensibility, this new system must provide extensibility patterns to cover most use cases.
+- **Atomic and composable**: Having small reusable parts that can be combined to create more complex systems is required to create flexible and scalable solutions.
+- **Compatible with the existing block development tooling**: The API must be integrated with the existing block-building tools without requiring additional tooling or configuration by the developer.
+
+Apart from all these requirements, integrating **client-side navigation** on top of any solution should be easy and performant. Client-side navigation is the process of navigating between site pages without reloading the entire page, which is one of the most impressive user experiences demanded by web developers. For that reason, this functionality should be compatible with this new system.
+
+## Why directives?
+
+Directives are the result of deep [research into different possibilities and approaches](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/iapi-faq/#what-approaches-have-been-considered-instead-of-using-directives). We’ve found that this design covers the requirements most effectively.
+
+### Block-first and PHP-friendly
+
+The API is designed for the world of blocks and takes WordPress history of being closely attached to web standards to heart.
+
+As directives are HTML attributes, they are perfect for dynamic blocks and PHP.
+
+_Dynamic block example_
+```html
+<div
+  data-wp-interactive='wpmovies'
+  <?php echo wp_interactivity_data_wp_context( array( 'isOpen' => false ) ); ?>
+  data-wp-watch="callbacks.logIsOpen"
+>
+  <button
+    data-wp-on--click="actions.toggle"
+    data-wp-bind--aria-expanded="context.isOpen"
+    aria-controls="p-1"
+  >
+    Toggle
+  </button>
+ 
+  <p id="p-1" data-wp-bind--hidden="!context.isOpen">
+    This element is now visible!
+  </p>
+</div>
+```
+
+As you can see, directives like [`data-wp-on--click`](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/api-reference/#wp-on) or [`data-wp-bind--hidden`](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/api-reference/#wp-bind) are added as custom HTML attributes. WordPress can process this HTML on the server, handling the directives’ logic and creating the appropriate markup.
+
+### Backward compatible
+
+As the Interactivity API works perfectly with server-side rendering, you can use all the WordPress APIs, including:
+
+- **WordPress filters and actions**: You can keep using WordPress hooks to modify the HTML or even to modify directives. Additionally, existing hooks will keep working as expected.
+- **Core Translation API**: e.g. `__()` and `_e()`. You can use it to translate the text in the HTML (as you normally would) and even use those APIs on the server side of your directives. 
+
+### Optional and gradual adoption
+
+The Interactivity API pipeline promotes **progressive enhancement** by building on top of WordPress’s solid foundation and patterns.
+
+For example, blocks with directives can coexist with other (interactive or non-interactive) blocks. This means that if there are other blocks on the page using other frameworks like jQuery, everything will work as expected.
+
+<div class="callout callout-warning">
+  Full-page client-side navigation with the Interactivity API will be an exception to this compatibility with other libraries rule. See <a href="#client-side-navigation">Client-side navigation</a> for more details.
+</div>
+
+### Declarative and reactive
+
+The Interactivity API follows an approach similar to other popular JS frameworks by separating state, actions, and callbacks and defining them declaratively. Why declaratively?
+
+Declarative code describes **what** a program should do, while imperative code describes **how** the program should do it. Using a declarative approach, the UI automatically updates in response to changes in the underlying data. With an imperative approach, you must manually update the UI whenever the data changes. Compare the two code examples:
+
+_Imperative code_
+
+```html
+<button id="toggle-button">Toggle Element</button>
+<p>This element is now visible!</p>
+<script>
+  const button = document.getElementById("toggle-button");
+ 
+  button.addEventListener("click", () => {
+    const element = document.getElementById("element");
+    if(element) {
+      element.remove();
+    } else {
+      const newElement = document.createElement("p");
+      newElement.textContent = "This element is visible";
+      document.body.appendChild(newElement);
+    }
+});
+</script>
+```
+
+_Declarative code_
+
+This is the same use case shared above but serves as an example of declarative code using this new system. The JavaScript logic is defined in the `view.js` file of the block, and add the directives to the markup in the `render.php`.
+
+```js
+// view.js file
+ 
+import { store, getContext } from "@wordpress/interactivity";
+ 
+store( 'wpmovies', {
+  actions: {
+    toggle: () => {
+      const context = getContext();
+      context.isOpen = !context.isOpen;
+    },
+  },
+});
+```
+
+```php
+<!-- Render.php file -->
+ 
+<div
+  data-wp-interactive='wpmovies'
+  <?php echo wp_interactivity_data_wp_context( array( 'isOpen' => true ) ); ?>
+>
+  <button
+    data-wp-on--click="actions.toggle"
+    data-wp-bind--aria-expanded="context.isOpen"
+    aria-controls="p-1"
+  >
+    Toggle
+  </button>
+ 
+  <p id="p-1" data-wp-bind--hidden="!context.isOpen">
+    This element is now visible!
+  </p>
+</div>
+```
+
+Using imperative code may be easier when creating simple user experiences, but it becomes much more difficult as applications become more complex. The Interactivity API must cover all use cases, from the simplest to the most challenging. That’s why a declarative approach using directives better fits the Interactivity API.
+
+### Performant
+
+The API has been designed to be as performant as possible:
+
+- **The runtime code needed for the directives is just ~10 KB**, and it only needs to be loaded once for all the blocks.
+- **The scripts will load without blocking the page rendering**.
+
+### Extensible
+
+Directives can be added, removed, or modified directly from the HTML. For example, users could use the [`render_block` filter](https://developer.wordpress.org/reference/hooks/render_block/) to modify the HTML and its behavior.
+
+### Atomic and composable
+
+Each directive controls a small part of the DOM, and you can combine multiple directives to create rich, interactive user experiences.
+
+### Compatible with the existing block development tooling
+
+The API works out of the box with standard block-building tools like [`wp-scripts`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/). The only requirement for `wp-scripts` to properly build the [Script Modules](https://make.wordpress.org/core/2024/03/04/script-modules-in-6-5/) using the Interactivity API is the use of the --experimental-modules flag for both [`build`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#build) and [`start`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/#start) scripts.
+
+### Client-side navigation
+
+The Interactivity API comes with built-in primitives for adding client-side navigation to your site. This functionality is completely optional, but it opens the possibility to create these user experiences without having to opt out of the WordPress rendering system.
+
+<div class="callout callout-info">
+  Full-page client-side navigation with the Interactivity API is still a work in progress (see <a href="https://github.com/WordPress/gutenberg/issues/60951">#60951</a>). Still, it is expected that all the interactive blocks will have to use the Interactivity API to enable full-page client-side navigation with the Interactivity API. Only in this case, the Interactivity API won't be fully compatible with other libraries (such as jQuery). 
+</div>
+
+It also pairs very well with the [View Transitions API](https://developer.chrome.com/docs/web-platform/view-transitions/) allowing developers to animate page transitions easily.
+
+## Why a standard?
+
+Blocks using the Interactivity API and interactive blocks using other approaches like jQuery can coexist, and everything will work as expected. However, the Interactivity API comes with some benefits for your interactive blocks:
+
+- **Blocks can communicate with each other easily**. With a standard, this communication is handled by default. When different blocks use different approaches to frontend interactivity, inter-block communication becomes more complex and almost impossible when different developers create blocks.
+- **Composability and compatibility**: You can combine interactive blocks, and nest them in structures with defined behaviors. Thanks to following the same standard, they are fully cross-compatible. If each block used a different approach to interactivity, they would likely break.
+- **Fewer KBs will be sent to the browser**. If each plugin author uses a different JS framework, more code will be loaded in the front end. If all the blocks use the same one, the code is reused.
+- If all the blocks on a page use this standard, **site-wide features like client-side navigation can be enabled**.
+
+Additionally, with a standard, **WordPress can absorb the maximum amount of complexity from the developer** because it will handle most of what’s needed to create an interactive block.
+
+_Complexities absorbed by the standard_
+
+<img alt="Two columns table comparing some aspects with and without a standard. Without a standard, block developers have to take care of everything, while having a standard. Totally handled by the standard: Tooling, hydration, integrating it with WordPress, SSR of the interactive parts, inter-block communication, and frontend performance. Partially handled: Security, accessibility, and best practices. Developer responsibility: Block logic. In the without a standard column, everything is under the developer responsability." width=60% src="https://make.wordpress.org/core/files/2023/03/standard-graph.png">
+
+
+With this absorption, less knowledge is required to create interactive blocks, and developers have fewer decisions to worry about.
+
+By adopting a standard, learning from other interactive blocks is simpler, and fosters collaboration and code reusability. As a result, the development process is leanier and friendlier to less experienced developers.
+
diff --git a/docs/reference-guides/interactivity-api/iapi-faq.md b/docs/reference-guides/interactivity-api/iapi-faq.md
new file mode 100644
index 00000000000000..dea7bc1d4367be
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/iapi-faq.md
@@ -0,0 +1,136 @@
+# Frequently Asked Questions
+
+## How does the Interactivity API work under the hood?
+
+Its three main components are:
+
+- [Preact](https://preactjs.com/) combined with [Preact Signals](https://preactjs.com/guide/v10/signals/) for hydration, client logic, and client-side navigation.
+- HTML Directives that can be understood by both the client and server.
+- Server-side logic, handled by the [HTML_Tag_Processor](https://make.wordpress.org/core/2023/03/07/introducing-the-html-api-in-wordpress-6-2/).
+
+## Why Preact to build the directives system? Why not React or another JavaScript framework?
+
+Preact has a number of advantages over React and other JavaScript frameworks like Vue, Svelte, or Solid in the context of the frontend (which is the focus of the Interactivity API):
+
+- It’s small: 8kB, including [hooks](https://preactjs.com/guide/v10/hooks/) and [signals](https://preactjs.com/blog/introducing-signals/).
+- It gives us DOM diffing out of the box.
+- It’s extremely extensible through their Option Hooks. They use that extensibility for the hooks (preact/hooks), compatibility with React (preact/compat) and their signals (@preact/signals). Basically, everything but the DOM diffing algorithm.
+- Its core team has been great and very helpful. They are also interested in enhancing this “island-based” usage of Preact.
+
+## Is Gutenberg going to move from React to Preact since the Interactivity API uses it?
+
+No. At the moment, there are no plans to make that transition. The requirements and advantages of the editor, as a fully interactive application, are quite different. Preact does have a [`@preact/compat`](https://preactjs.com/guide/v10/switching-to-preact/) package that enables full compatibility with the React ecosystem, and many large web applications use it. However, using Preact in the block editor would not offer advantages like it does on the frontend in the Interactivity API.
+
+## What approaches have been considered instead of using directives?
+
+Many alternative approaches were considered. Here’s a brief summary of some of them:
+
+### React and other JavaScript frameworks
+
+React was considered first because Gutenberg developers are familiar with it. Other popular JS frameworks like Svelte, Vue.js, or Angular were also considered, but none of them (including React) are PHP-friendly or compatible with WordPress hooks or internationalization.
+
+### Alpine.js
+
+Alpine.js is a great framework, and it inspired a lot of functionality in the Interactivity API. However, it doesn’t support server-side rendering of its [directives](https://github.com/alpinejs/alpine/tree/d7f9d641f7a763c56c598d118bd189a406a22383/packages/docs/src/en/directives), and having a similar system tailored for WordPress blocks has many benefits.
+
+Preact was chosen instead of Alpine.js for numerous reasons, such as its smaller size, its better performance (especially with the addition of [signals](https://preactjs.com/guide/v10/signals/)), the fact that custom directives are written with Preact’s declarative syntax and tooling (hooks, signals), it’s more battle-tested and has a larger community than Alpine.js. It’s also compatible with React (for sharing client-side rendered components from the Editor), and it provides to the Interactivity API the fastest DOM diffing algorithm out of the box, including UI state preservation.
+
+Furthermore, with Preact operating in the background, the Interactivity API manages "the final layer" so it can be better adapted to WordPress requirements. For example, JavaScript expressions are not allowed inside directives to avoid security risks and ensure compliance with strict security policies, and all WordPress directives are spec-compliant HTML attributes.
+
+<div class="callout callout-info">
+  Have a look at the conversation at <a href="https://github.com/WordPress/gutenberg/discussions/53022#discussioncomment-4696611">"Why Preact instead of Alpine?"</a> to learn more about this.
+</div>
+
+
+### Plain JavaScript
+
+See the answer below. 
+
+### Template DSL
+
+The possibility of creating a [DSL](https://en.wikipedia.org/wiki/Domain-specific_language) for writing interactive templates was also researched. The code written in that Template DSL would then be compiled into both JavaScript and PHP. However, creating a production-grade Template compiler is complex and would be a large and risky investment of effort. This approach is still being considered for the future, with the directives serving as a compilation target.
+
+## Why should I, as a block developer, use the Interactivity API rather than React?
+
+Using React on the frontend doesn’t work smoothly with server rendering in PHP. Every approach that uses React to render blocks has to load content using client-side JavaScript. If you only render your blocks on the client, it typically results in a poor user experience because the user stares at empty placeholders and spinners while waiting for content to load. 
+
+Using JS in PHP extensions (like v8js) is also possible, but unfortunately PHP extensions are not backward compatible and can only be used when there's a PHP fallback.
+
+Now, it’s possible to server-render a block in PHP **and** use React to render the same block on the frontend. However, this results in a poor developer experience because the logic has to be duplicated across the PHP and React parts. Not only that, but you have now exposed yourself to subtle bugs caused by WordPress hooks!
+
+Imagine installing a third-party plugin with a hook (filter) that modifies the server-rendered HTML. Let’s say this filter adds a single CSS class to your block’s HTML. That CSS class will be present in the server-rendered markup. On the frontend, your block will render again in React, but now the content will not include that CSS class because there is no way to apply WordPress hooks to React-rendered content!
+
+On the other hand, the Interactivity API is designed to work perfectly with WordPress hooks because directives enhance the server-rendered HTML with behaviors. This also means it works out of the box with WordPress backend APIs like i18n.
+
+To summarize, using the Interactivity API rather than just using React comes with these benefits:
+
+- If you use React, your interactive blocks must generate the same markup on the client as they do on the server in PHP. Using the Interactivity API, there is no such requirement as directives are added to server-rendered HTML.
+- The Interactivity API is PHP-friendlier. It works out of the box with WordPress hooks or other server functionalities such as internationalization. For example, with React, you can’t know which hooks are applied on the server, and their modifications would be overwritten after hydration.
+- All the benefits of [using a standard](/docs/reference-guides/interactivity-api/iapi-about.md#why-a-standard).
+
+
+## What are the benefits of Interactivity API over just using jQuery or vanilla JavaScript?
+
+The main difference is that the Interactivity API is **declarative and reactive**, so writing and maintaining complex interactive experiences should become way easier. Additionally, it has been **specially designed to work with blocks**, providing a standard that comes with the benefits mentioned above, like inter-block communication, compatibility, or site-wide features such as client-side navigation.
+
+Finally, comparing it with jQuery, **the Interactivity API runtime is ~10kb**, which is much more lightweight. Actually, there is an ongoing effort to remove heavy frameworks like jQuery across the WordPress ecosystem, and this would help in this regard.
+
+## Do I need to know React, PHP, and this Interactivity API?
+
+If you want to add frontend interactivity to your blocks using this API, the short answer is yes. If your block is not interactive, the block creation workflow will remain exactly the same.
+
+The Interactivity API introduces a new standard method to facilitate the integration of interactive behaviors into the frontend part of WordPress. This means that you still need to use React to handle the editor part of your blocks.
+
+On the other hand, if you want to create an interactive block, with the Interactivity API you don’t have to deal with complex topics like tooling, integration with WordPress, inter-block communication, or the server-side rendering of the interactive parts.
+
+## Can the Interactivity API be used beyond a block?
+
+Absolutely, yes, it is not limited to blocks. You'll see a lot of mentions of how the Interactivity API provides a standard for creating interactive blocks, but that's only because that's the most common use case. More generally speaking, the Interactivity API standard can be used to add "interactive behaviors" to the front end of any part of WordPress.
+
+See the [`wp_interactivity_process_directives` function](https://developer.wordpress.org/reference/functions/wp_interactivity_process_directives/) for details on using the Interactivity API outside of blocks with arbitrary HTML.
+
+## Does this mean I must migrate all my interactive blocks to use this API?
+
+No. Blocks outside the Interactivity API can coexist with blocks using it. However, as explained above, keep in mind that there are some benefits for blocks that use the API:
+
+- **Blocks can communicate with each other easily**. With a standard, this communication is handled by default. When different blocks use different approaches to frontend interactivity, inter-block communication becomes more complex and gets almost impossible when separate developers create blocks.
+- **Composability and compatibility**: You can combine interactive blocks, nest them in structures with defined behaviors, and, thanks to following the same standard, they are fully cross-compatible. If each block were to use a different approach to interactivity, they would likely break.
+- **Fewer KBs will be sent to the browser**. If each plugin author uses a different JS framework, more code will be loaded in the frontend. If all the blocks use the same one, the code is reused.
+- If all the blocks on a page use this standard, site-wide features like client-side navigation can be enabled.
+
+## What are the performance implications of using this API? Is it worth loading the Interactivity API for very simple use cases?
+
+The API has been designed with performance in mind, so it shouldn’t be a problem:
+
+- **The runtime code needed for the directives is just ~10 KB**, and it only needs to be loaded once for all the blocks.
+- **All the script modules that belong to the Interactivity API (including the `view.js` files) will load without blocking the page rendering.**
+- There are [ongoing explorations](https://github.com/WordPress/gutenberg/discussions/52723) about the possibility of **delaying the scripts loading once the block is in the viewport**. This way, the initial load would be optimized without affecting the user experience.
+
+## Does it work with the Core Translation API?
+
+As the Interactivity API works perfectly with server-side rendering, you can use all the WordPress APIs including [`__()`](https://developer.wordpress.org/reference/functions/__/) and [`_e()`](https://developer.wordpress.org/reference/functions/_e/). You can use it to translate the text in the HTML (as you normally would) and even use it inside the store when [using `wp_interactivity_state()` on the server side](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/api-reference/#setting-the-store). It might look something like this:
+
+```php
+// render.php
+wp_interactivity_state( 'favoriteMovies', array(
+      "1" => array(
+        "id" => "123-abc",
+        "movieName" => __("someMovieName", "textdomain")
+      ),
+) );
+```
+
+A translation API compatible with script modules (needed for the Interactivity API) is currently being worked on. Check [#60234](https://core.trac.wordpress.org/ticket/60234) to follow the progress on this work.
+
+## I’m concerned about XSS; can JavaScript be injected into directives?
+
+No. The Interactivity API only allows for [References](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/api-reference/#values-of-directives-are-references-to-store-properties) to be passed as values to the directives. This way, there is no need to eval() full JavaScript expressions, so it’s not possible to perform XSS attacks.
+
+## Does this work with Custom Security Policies?
+
+Yes. The Interactivity API does not use [`eval()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/eval) or the [`Function()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/Function) constructor, so it doesn’t violate the [`unsafe-eval`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy#unsafe_keyword_values) content security policy. It is also designed to work with any [custom content security policy](https://developer.wordpress.org/apis/security/).
+
+## Can you use directives to make AJAX/REST-API requests?
+
+Sure. Actions and callbacks called by directives can do anything a JavaScript function can, including making API requests.
+
diff --git a/docs/reference-guides/interactivity-api/iapi-quick-start-guide.md b/docs/reference-guides/interactivity-api/iapi-quick-start-guide.md
new file mode 100644
index 00000000000000..628d3be7e7b49f
--- /dev/null
+++ b/docs/reference-guides/interactivity-api/iapi-quick-start-guide.md
@@ -0,0 +1,53 @@
+# Quick start guide
+
+This guide will help you build a basic block that demonstrates the Interactivity API in WordPress.
+
+## Scaffold an interactive block
+
+Start by ensuring you have Node.js and `npm` installed on your computer. Review the [Node.js development environment](https://developer.wordpress.org/block-editor/getting-started/devenv/nodejs-development-environment/) guide if not.
+
+Next, use the [`@wordpress/create-block`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-create-block/) package and the [`@wordpress/create-block-interactive-template`](https://www.npmjs.com/package/@wordpress/create-block-interactive-template) template to scaffold the complete “My First Interactive Block” plugin.
+
+Choose the folder where you want to create the plugin, and then execute the following command in the terminal from within that folder:
+
+```
+npx @wordpress/create-block@latest my-first-interactive-block --template @wordpress/create-block-interactive-template
+```
+
+The slug provided (`my-first-interactive-block`) defines the folder name for the scaffolded plugin and the internal block name.
+
+## Basic usage
+
+With the plugin activated, you can explore how the block works. Use the following command to move into the newly created plugin folder and start the development process.
+
+```
+cd my-first-interactive-block && npm start
+```
+
+When `create-block` scaffolds the block, it installs `wp-scripts` and adds the most common scripts to the block’s `package.json` file. Refer to the [Get started with wp-scripts](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/) article for an introduction to this package.
+
+The `npm start` command will start a development server and watch for changes in the block’s code, rebuilding the block whenever modifications are made.
+
+When you are finished making changes, run the `npm run build` command. This optimizes the block code and makes it production-ready.
+
+## View the block in action
+
+If you have a local WordPress installation already running, you can launch the commands above inside the `plugins` folder of that installation. If not, you can use [`wp-now`](https://github.com/WordPress/playground-tools/tree/trunk/packages/wp-now) to launch a WordPress site with the plugin installed by executing the following command from the plugin's folder (`my-first-interactive-block`).
+
+```
+npx @wp-now/wp-now start
+```
+
+You should be able to insert the "My First Interactive Block" block into any post and see how it behaves in the front end when published.
+
+<div class="callout callout-info">
+    <p>To get more advanced examples of using the Interactivity API you can check the following resources:</p>
+    <ul>
+      <li><a href="https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/#docs-examples">Docs & Examples</a></li>
+      <li><a href="https://github.com/WordPress/gutenberg/discussions/52894">Getting Started - and other learning resources</a></li>
+      <li><a href="https://github.com/WordPress/gutenberg/discussions/55642#">Interactivity API showcase</a></li>
+    </ul>
+</div>
+
+
+
diff --git a/docs/reference-guides/packages.md b/docs/reference-guides/packages.md
index 7dbe06769c42e9..ce9c4b7950c29e 100644
--- a/docs/reference-guides/packages.md
+++ b/docs/reference-guides/packages.md
@@ -2,7 +2,7 @@
 
 WordPress exposes a list of JavaScript packages and tools for WordPress development.
 
-## Using the Packages via WordPress Global
+## Using the packages via WordPress global
 
 JavaScript packages are available as a registered script in WordPress and can be accessed using the `wp` global variable.
 
@@ -22,7 +22,7 @@ After the dependency is declared, you can access the module in your JavaScript c
 const { PlainText } = wp.blockEditor;
 ```
 
-## Using the Packages via npm
+## Using the packages via npm
 
 All the packages are also available on [npm](https://www.npmjs.com/org/wordpress) if you want to bundle them in your code.
 
diff --git a/docs/reference-guides/richtext.md b/docs/reference-guides/richtext.md
index 1a4509318b72b7..ec484ac829c1ce 100644
--- a/docs/reference-guides/richtext.md
+++ b/docs/reference-guides/richtext.md
@@ -10,11 +10,11 @@ The RichText component is extremely powerful because it provides built-in functi
 
 Unlike other components that exist in the [Component Reference](/packages/components/README.md) section, RichText lives separately because it only makes sense within the block editor, and not within other areas of WordPress.
 
-## Property Reference
+## Property reference
 
 For a list of the possible properties to pass your RichText component, [check out the component documentation on GitHub](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/rich-text/README.md).
 
-## Core Blocks Using the RichText Component
+## Core blocks using the RichText component
 
 There are a number of core blocks using the RichText component. The JavaScript edit function linked below for each block can be used as a best practice reference while creating your own blocks.
 
@@ -65,15 +65,15 @@ registerBlockType( /* ... */, {
 } );
 ```
 
-## Common Issues & Solutions
+## Common issues and solutions
 
 While using the RichText component a number of common issues tend to appear.
 
-### HTML Formatting Tags Display in the Content
+### HTML formatting tags display in the content
 
 If the HTML tags from text formatting such as `<strong>` or `<em>` are being escaped and displayed on the frontend of the site, this is likely due to an issue in your save function. Make sure your code looks something like `<RichText.Content tagName="h2" value={ heading } />` (JSX) within your save function instead of simply outputting the value with `<h2>{ heading }</h2>`.
 
-### Unwanted Formatting Options Still Display
+### Unwanted formatting options still display
 
 Before moving forward, consider if using the RichText component makes sense at all. Would it be better to use a basic `input` or `textarea` element? If you don't think any formatting should be possible, these HTML tags may make more sense.
 
@@ -81,7 +81,7 @@ If you'd still like to use RichText, you can eliminate all of the formatting opt
 
 If you want to limit the formats allowed, you can specify using `allowedFormats` property in your code, see the example above or [the component documentation](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/rich-text/README.md#allowedformats-array) for details.
 
-### Disable Specific Format Types in Editor
+### Disable specific format types in Editor
 
 The RichText component uses formats to display inline elements, for example images within the paragraph block. If you just want to disable a format from the editor, you can use the `unregisterFormatType` function. For example to disable inline images, use:
 
diff --git a/docs/reference-guides/slotfills/README.md b/docs/reference-guides/slotfills/README.md
index c41e6da0d8eb9f..874a3a69096b81 100644
--- a/docs/reference-guides/slotfills/README.md
+++ b/docs/reference-guides/slotfills/README.md
@@ -9,16 +9,16 @@ In order to use them, we must leverage the [@wordpress/plugins](/packages/plugin
 
 In order to access the SlotFills, we need to do four things:
 
-1. Import the `registerPlugin` method from `wp.plugins`.
-2. Import the SlotFill we want from `wp.editPost`.
-3. Define a method to render our changes. Our changes/additions will be wrapped in the SlotFill component we imported.
+1. Import the `registerPlugin` method from the `@wordpress/plugins` package.
+2. Import the SlotFill we want from the `@wordpress/editor'` package.
+3. Define a component to render our changes. Our changes/additions will be wrapped in the SlotFill component we imported.
 4. Register the plugin.
 
 Here is an example using the `PluginPostStatusInfo` slotFill:
 
 ```js
 import { registerPlugin } from '@wordpress/plugins';
-import { PluginPostStatusInfo } from '@wordpress/edit-post';
+import { PluginPostStatusInfo } from '@wordpress/editor';
 
 const PluginPostStatusInfoTest = () => (
 	<PluginPostStatusInfo>
@@ -29,11 +29,244 @@ const PluginPostStatusInfoTest = () => (
 registerPlugin( 'post-status-info-test', { render: PluginPostStatusInfoTest } );
 ```
 
+## Conditionally rendering SlotFill content
+
+With the exception of [MainDashboardButton](/docs/reference-guides/slotfills/main-dashboard-button.md), every available SlotFill is exposed in both the Post Editor and Site Editor and any Fill that is registered will be rendered in both contexts. There are a number of approaches that can be implemented to conditionally render Fills.
+
+### Restricting fills to the Post Editor
+
+A fill can be restricted to the Post Editor by checking to see if the current post type object property `viewable` is set to `true`. Any post type not set to `viewable`, does not have an associated edit post screen and is a good indicator that the user is not in the Post Editor. The example below will render its content on the edit post screen for any registered post type.
+
+```js
+/**
+ * WordPress dependencies
+ */
+import { registerPlugin } from '@wordpress/plugins';
+import {
+	PluginDocumentSettingPanel,
+	store as editorStore,
+} from '@wordpress/editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * The component to be rendered  as part of the plugin.
+ */
+const EditPostDocumentSettingPanel = () => {
+	// Retrieve information about the current post type.
+	const isViewable = useSelect( ( select ) => {
+		const postTypeName = select( editorStore ).getCurrentPostType();
+		const postTypeObject = select( coreStore ).getPostType( postTypeName );
+		return postTypeObject?.viewable;
+	}, [] );
+
+	// If the post type is not viewable, then do not render my the fill.
+	if ( ! isViewable ) {
+		return null;
+	}
+
+	return (
+		<PluginDocumentSettingPanel
+			name="custom-panel"
+			title={ __( 'Post Editor Example' ) }
+			className="custom-panel"
+		>
+			<p>{ __( 'Only appears in the Edit Post screen' ) }</p>
+		</PluginDocumentSettingPanel>
+	);
+};
+
+registerPlugin( 'example-post-edit-only', {
+	render: EditPostDocumentSettingPanel,
+} );
+```
+
+### Restricting fills to certain post types.
+
+The following example expands on the example above by creating an allow list of post types where the fill should be rendered. In this case, the fill is only rendered when editing pages.
+
+```js
+/**
+ * WordPress dependencies
+ */
+import { registerPlugin } from '@wordpress/plugins';
+import {
+	PluginDocumentSettingPanel,
+	store as editorStore,
+} from '@wordpress/editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * The component to be rendered  as part of the plugin.
+ */
+const RestrictPostTypes = () => {
+	// Retrieve information about the current post type.
+	const { isViewable, postTypeName } = useSelect( ( select ) => {
+		const postType = select( editorStore ).getCurrentPostType();
+		const postTypeObject = select( coreStore ).getPostType( postType );
+		return {
+			isViewable: postTypeObject?.viewable,
+			postTypeName: postType,
+		};
+	}, [] );
+
+	// The list of post types that are allowed to render the plugin.
+	const allowedPostTypes = [ 'page' ];
+
+	// If the post type is not viewable or not in the allowed list, do not render the plugin.
+	if ( ! isViewable || ! allowedPostTypes.includes( postTypeName ) ) {
+		return null;
+	}
+
+	return (
+		<PluginDocumentSettingPanel
+			name="custom-panel"
+			title={ __( 'Restrict Post Types Example' ) }
+			className="custom-panel"
+		>
+			<p>
+				{ sprintf(
+					__(
+						'Only appears on Post Types that are in the allowed list. %s'
+					),
+					allowedPostTypes.join( ', ' )
+				) }
+			</p>
+		</PluginDocumentSettingPanel>
+	);
+};
+
+registerPlugin( 'example-restrict-post-types', {
+	render: RestrictPostTypes,
+} );
+```
+
+### Restricting fills to the Side Editor
+
+To restrict fills to the Site Editor, the reverse logic is true. If the post type object's `viewable` property is set to `true`, then the fill should not be rendered. The example below will render its content on any Site Editor screen.
+
+```js
+/**
+ * WordPress dependencies
+ */
+import { registerPlugin } from '@wordpress/plugins';
+import {
+	PluginDocumentSettingPanel,
+	store as editorStore,
+} from '@wordpress/editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * The component to be rendered  as part of the plugin.
+ */
+const SiteEditorDocumentSettingPanel = () => {
+	// Retrieve information about the current post type.
+	const isViewable = useSelect( ( select ) => {
+		const postTypeName = select( editorStore ).getCurrentPostType();
+		const postTypeObject = select( coreStore ).getPostType( postTypeName );
+
+		// A viewable post type is one than can be viewed in the WordPress admin. Internal ones are not set to viewable.
+		return postTypeObject?.viewable;
+	}, [] );
+
+	// If the post type is viewable, do not render my fill
+	if ( isViewable ) {
+		return null;
+	}
+
+	return (
+		<PluginDocumentSettingPanel
+			name="custom-panel"
+			title={ __( 'Site Editor Example' ) }
+			className="custom-panel"
+		>
+			<p>{ __( 'Only appears in the Site Editor' ) }</p>
+		</PluginDocumentSettingPanel>
+	);
+};
+
+registerPlugin( 'example-site-editor', {
+	render: SiteEditorDocumentSettingPanel,
+} );
+```
+
+### Restricting fills to certain screens in the Site Editor.
+
+This example builds on the example above by providing an allow list to control which screens a fill can be rendered within the Site Editor.
+
+```js
+/**
+ * WordPress dependencies
+ */
+import { registerPlugin } from '@wordpress/plugins';
+import {
+	PluginDocumentSettingPanel,
+	store as editorStore,
+} from '@wordpress/editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * The component to be rendered  as part of the plugin.
+ */
+const SiteEditorDocumentSettingPanel = () => {
+	// Allowed areas in the Site Editor.
+	const allowedSiteEditorScreens = [
+		'wp_template', // Templates
+		'wp_block', // Patterns
+		'wp_template_part', // Template Parts
+	];
+
+	const { isViewable, postType } = useSelect( ( select ) => {
+		const postTypeName = select( editorStore ).getCurrentPostType();
+		const postTypeObject = select( coreStore ).getPostType( postTypeName );
+
+		return {
+			// A viewable post type is one than can be viewed in the WordPress admin. Internal ones are not set to viewable.
+			isViewable: postTypeObject?.viewable,
+			postType: postTypeName,
+		};
+	}, [] );
+
+	// If the post type is viewable, do not render my plugin.
+	if ( isViewable || ! allowedSiteEditorScreens.includes( postType ) ) {
+		return null;
+	}
+
+	return (
+		<PluginDocumentSettingPanel
+			name="custom-panel"
+			title={ __( 'Restricted to Site Editor screens' ) }
+			className="custom-panel"
+		>
+			<p>
+				{ sprintf(
+					__(
+						'Only appears on Editor Screens that are in the allowed list. %s'
+					),
+					allowedSiteEditorScreens.join( ', ' )
+				) }
+			</p>
+		</PluginDocumentSettingPanel>
+	);
+};
+
+registerPlugin( 'example-site-editor-only', {
+	render: SiteEditorDocumentSettingPanel,
+} );
+```
+
 ## How do they work?
 
 SlotFills are created using `createSlotFill`. This creates two components, `Slot` and `Fill` which are then used to create a new component that is exported on the `wp.plugins` global.
 
-**Definition of the `PluginPostStatusInfo` SlotFill** ([see core code](https://github.com/WordPress/gutenberg/blob/HEAD/packages/edit-post/src/components/sidebar/plugin-post-status-info/index.js#L54))
+**Definition of the `PluginPostStatusInfo` SlotFill** ([see core code](https://github.com/WordPress/gutenberg/blob/HEAD/packages/editor/src/components/plugin-post-status-info/index.js#L55))
 
 ```js
 /**
@@ -61,39 +294,69 @@ export default PluginPostStatusInfo;
 This new Slot is then exposed in the editor. The example below is from core and represents the Summary panel.
 
 As we can see, the `<PluginPostStatusInfo.Slot>` is wrapping all of the items that will appear in the panel.
-Any items that have been added via the SlotFill ( see the example above ), will be included in the `fills` parameter and be displayed between the `<PostAuthor/>` and `<PostTrash/>` components.
+Any items that have been added via the SlotFill ( see the example above ), will be included in the `fills` parameter and be displayed in the end of the component.
 
-See [core code](https://github.com/WordPress/gutenberg/tree/HEAD/packages/edit-post/src/components/sidebar/post-status/index.js#L26).
+See [core code](https://github.com/WordPress/gutenberg/tree/HEAD/packages/editor/src/components/sidebar/post-summary.js#L39).
 
 ```js
-const PostStatus = ( { isOpened, onTogglePanel } ) => (
-	<PanelBody
-		className="edit-post-post-status"
-		title={ __( 'Summary' ) }
-		opened={ isOpened }
-		onToggle={ onTogglePanel }
-	>
-		<PluginPostStatusInfo.Slot>
-			{ ( fills ) => (
-				<>
-					<PostVisibility />
-					<PostSchedule />
-					<PostFormat />
-					<PostSticky />
-					<PostPendingStatus />
-					<PostAuthor />
-					{ fills }
-					<PostTrash />
-				</>
-			) }
-		</PluginPostStatusInfo.Slot>
-	</PanelBody>
-);
+export default function PostSummary( { onActionPerformed } ) {
+	const { isRemovedPostStatusPanel } = useSelect( ( select ) => {
+		// We use isEditorPanelRemoved to hide the panel if it was programmatically removed. We do
+		// not use isEditorPanelEnabled since this panel should not be disabled through the UI.
+		const { isEditorPanelRemoved } = select( editorStore );
+		return {
+			isRemovedPostStatusPanel: isEditorPanelRemoved( PANEL_NAME ),
+		};
+	}, [] );
+
+	return (
+		<PostPanelSection className="editor-post-summary">
+			<PluginPostStatusInfo.Slot>
+				{ ( fills ) => (
+					<>
+						<VStack spacing={ 4 }>
+							<PostCardPanel
+								onActionPerformed={ onActionPerformed }
+							/>
+							<PostFeaturedImagePanel withPanelBody={ false } />
+							<PostExcerptPanel />
+							<VStack spacing={ 1 }>
+								<PostContentInformation />
+								<PostLastEditedPanel />
+							</VStack>
+							{ ! isRemovedPostStatusPanel && (
+								<VStack spacing={ 2 }>
+									<VStack spacing={ 1 }>
+										<PostStatusPanel />
+										<PostSchedulePanel />
+										<PostURLPanel />
+										<PostAuthorPanel />
+										<PostTemplatePanel />
+										<PostDiscussionPanel />
+										<PageAttributesPanel />
+										<PostSyncStatus />
+										<BlogTitle />
+										<PostsPerPage />
+										<SiteDiscussion />
+										<PostFormatPanel />
+										<PostStickyPanel />
+									</VStack>
+									<TemplateAreas />
+									{ fills }
+								</VStack>
+							) }
+						</VStack>
+					</>
+				) }
+			</PluginPostStatusInfo.Slot>
+		</PostPanelSection>
+	);
+}
 ```
 
 ## Currently available SlotFills and examples
 
-The following SlotFills are available in the `edit-post` package. Please refer to the individual items below for usage and example details:
+The following SlotFills are available in the `edit-post` or `editor` packages. Please refer to the individual items below for usage and example details:
 
 -   [MainDashboardButton](/docs/reference-guides/slotfills/main-dashboard-button.md)
 -   [PluginBlockSettingsMenuItem](/docs/reference-guides/slotfills/plugin-block-settings-menu-item.md)
diff --git a/docs/reference-guides/slotfills/main-dashboard-button.md b/docs/reference-guides/slotfills/main-dashboard-button.md
index a333b0f39a4e16..b55ed50648db15 100644
--- a/docs/reference-guides/slotfills/main-dashboard-button.md
+++ b/docs/reference-guides/slotfills/main-dashboard-button.md
@@ -1,21 +1,26 @@
 # MainDashboardButton
 
-This slot allows replacing the default main dashboard button in the post editor and site editor.
+This slot allows replacing the default main dashboard button in the post editor. It is no longer available in the site editor as of WordPress 6.2.
 It's used for returning back to main wp-admin dashboard when editor is in fullscreen mode.
 
+<div class="callout callout-warning">
+	Please note that this SlotFill is still considered experimental and may change
+</div>
+
 ## Examples
 
-### Post editor example
+### Change the icon
 
-This will override the W icon button in the header.
+This will replace the W icon button in the header with a close icon.
 
 ```js
 import { registerPlugin } from '@wordpress/plugins';
 import { __experimentalMainDashboardButton as MainDashboardButton } from '@wordpress/edit-post';
+import { close } from '@wordpress/icons';
 
 const MainDashboardButtonTest = () => (
 	<MainDashboardButton>
-		Custom main dashboard button content
+		<FullscreenModeClose icon={ close } />
 	</MainDashboardButton>
 );
 
@@ -24,8 +29,11 @@ registerPlugin( 'main-dashboard-button-test', {
 } );
 ```
 
-If your goal is just to replace the icon of the existing button in
-the post editor, that can be achieved in the following way:
+![The edit post screen in fullscreen mode displaying a close icon instead of the default W](https://developer.wordpress.org/files/2024/08/main-dashboard-button-close-icon-example.png 'Replace the W icon button in the header with a close icon')
+
+### Change the icon and link
+
+This example will change the icon in the header to indicate an external link that will take the user to http://wordpress.org when clicked.
 
 ```js
 import { registerPlugin } from '@wordpress/plugins';
@@ -33,11 +41,11 @@ import {
 	__experimentalFullscreenModeClose as FullscreenModeClose,
 	__experimentalMainDashboardButton as MainDashboardButton,
 } from '@wordpress/edit-post';
-import { close } from '@wordpress/icons';
+import { external } from '@wordpress/icons';
 
 const MainDashboardButtonIconTest = () => (
 	<MainDashboardButton>
-		<FullscreenModeClose icon={ close } href="http://wordpress.org" />
+		<FullscreenModeClose icon={ external } href="http://wordpress.org" />
 	</MainDashboardButton>
 );
 
@@ -46,26 +54,4 @@ registerPlugin( 'main-dashboard-button-icon-test', {
 } );
 ```
 
-### Site editor example
-
-In the site editor this slot refers to the "back to dashboard" button in the navigation sidebar.
-
-```js
-import { registerPlugin } from '@wordpress/plugins';
-import { __experimentalMainDashboardButton as MainDashboardButton } from '@wordpress/edit-site';
-import { __experimentalNavigationBackButton as NavigationBackButton } from '@wordpress/components';
-
-const MainDashboardButtonIconTest = () => (
-	<MainDashboardButton>
-		<NavigationBackButton
-			backButtonLabel={ __( 'Back to dashboard' ) }
-			className="edit-site-navigation-panel__back-to-dashboard"
-			href="index.php"
-		/>
-	</MainDashboardButton>
-);
-
-registerPlugin( 'main-dashboard-button-icon-test', {
-	render: MainDashboardButtonIconTest,
-} );
-```
+![The edit post screen in fullscreen mode displaying an external link icon instead of the default W](https://developer.wordpress.org/files/2024/08/main-dashboard-button-external-link-example.png 'Change the icon in the header to indicate an external link that will take the user to http://wordpress.org when clicked')
diff --git a/docs/reference-guides/slotfills/plugin-block-settings-menu-item.md b/docs/reference-guides/slotfills/plugin-block-settings-menu-item.md
index 8e17893b546421..aa1eecb293261c 100644
--- a/docs/reference-guides/slotfills/plugin-block-settings-menu-item.md
+++ b/docs/reference-guides/slotfills/plugin-block-settings-menu-item.md
@@ -7,7 +7,7 @@ This will either appear in the controls for each block or at the Top Toolbar dep
 
 ```js
 import { registerPlugin } from '@wordpress/plugins';
-import { PluginBlockSettingsMenuItem } from '@wordpress/edit-post';
+import { PluginBlockSettingsMenuItem } from '@wordpress/editor';
 
 const PluginBlockSettingsMenuGroupTest = () => (
 	<PluginBlockSettingsMenuItem
diff --git a/docs/reference-guides/slotfills/plugin-document-setting-panel.md b/docs/reference-guides/slotfills/plugin-document-setting-panel.md
index 76e077056abd63..aa3e55abe2f7ee 100644
--- a/docs/reference-guides/slotfills/plugin-document-setting-panel.md
+++ b/docs/reference-guides/slotfills/plugin-document-setting-panel.md
@@ -13,7 +13,7 @@ This SlotFill allows registering a UI to edit Document settings.
 
 ```js
 import { registerPlugin } from '@wordpress/plugins';
-import { PluginDocumentSettingPanel } from '@wordpress/edit-post';
+import { PluginDocumentSettingPanel } from '@wordpress/editor';
 
 const PluginDocumentSettingPanelDemo = () => (
 	<PluginDocumentSettingPanel
@@ -33,7 +33,7 @@ registerPlugin( 'plugin-document-setting-panel-demo', {
 
 ## Accessing a panel programmatically
 
-Core and custom panels can be access programmatically using their panel name. The core panel names are:
+Core and custom panels can be accessed programmatically using their panel name. The core panel names are:
 
 -   Summary Panel: `post-status`
 -   Categories Panel: `taxonomy-panel-category`
@@ -49,10 +49,10 @@ To programmatically toggle panels, use the following:
 
 ```js
 import { useDispatch } from '@wordpress/data';
-import { store as editPostStore } from '@wordpress/edit-post';
+import { store as editorStore } from '@wordpress/editor';
 
 const Example = () => {
-	const { toggleEditorPanelOpened } = useDispatch( editPostStore );
+	const { toggleEditorPanelOpened } = useDispatch( editorStore );
 	return (
 		<Button
 			variant="primary"
@@ -76,10 +76,10 @@ It is also possible to remove panels from the admin using the `removeEditorPanel
 
 ```js
 import { useDispatch } from '@wordpress/data';
-import { store as editPostStore } from '@wordpress/edit-post';
+import { store as editorStore } from '@wordpress/editor';
 
 const Example = () => {
-	const { removeEditorPanel } = useDispatch( editPostStore );
+	const { removeEditorPanel } = useDispatch( editorStore );
 	return (
 		<Button
 			variant="primary"
diff --git a/docs/reference-guides/slotfills/plugin-more-menu-item.md b/docs/reference-guides/slotfills/plugin-more-menu-item.md
index 6a53c029b10dda..b5dd211b60f3e1 100644
--- a/docs/reference-guides/slotfills/plugin-more-menu-item.md
+++ b/docs/reference-guides/slotfills/plugin-more-menu-item.md
@@ -6,7 +6,7 @@ This slot will add a new item to the More Tools & Options section.
 
 ```js
 import { registerPlugin } from '@wordpress/plugins';
-import { PluginMoreMenuItem } from '@wordpress/edit-post';
+import { PluginMoreMenuItem } from '@wordpress/editor';
 import { image } from '@wordpress/icons';
 
 const MyButtonMoreMenuItemTest = () => (
diff --git a/docs/reference-guides/slotfills/plugin-post-publish-panel.md b/docs/reference-guides/slotfills/plugin-post-publish-panel.md
index 59972af3505ec9..c7457c2eeb4ebb 100644
--- a/docs/reference-guides/slotfills/plugin-post-publish-panel.md
+++ b/docs/reference-guides/slotfills/plugin-post-publish-panel.md
@@ -6,7 +6,7 @@ This slot allows for injecting items into the bottom of the post-publish panel t
 
 ```js
 import { registerPlugin } from '@wordpress/plugins';
-import { PluginPostPublishPanel } from '@wordpress/edit-post';
+import { PluginPostPublishPanel } from '@wordpress/editor';
 
 const PluginPostPublishPanelTest = () => (
 	<PluginPostPublishPanel>
diff --git a/docs/reference-guides/slotfills/plugin-post-status-info.md b/docs/reference-guides/slotfills/plugin-post-status-info.md
index 2fc0d50050ee7a..03e6d3bfe3a17a 100644
--- a/docs/reference-guides/slotfills/plugin-post-status-info.md
+++ b/docs/reference-guides/slotfills/plugin-post-status-info.md
@@ -6,7 +6,7 @@ This slots allows for the insertion of items in the Summary panel of the documen
 
 ```js
 import { registerPlugin } from '@wordpress/plugins';
-import { PluginPostStatusInfo } from '@wordpress/edit-post';
+import { PluginPostStatusInfo } from '@wordpress/editor';
 
 const PluginPostStatusInfoTest = () => (
 	<PluginPostStatusInfo>
diff --git a/docs/reference-guides/slotfills/plugin-pre-publish-panel.md b/docs/reference-guides/slotfills/plugin-pre-publish-panel.md
index d15e39bf09f4ce..ac9fa13a882f41 100644
--- a/docs/reference-guides/slotfills/plugin-pre-publish-panel.md
+++ b/docs/reference-guides/slotfills/plugin-pre-publish-panel.md
@@ -6,7 +6,7 @@ This slot allows for injecting items into the bottom of the pre-publish panel th
 
 ```js
 import { registerPlugin } from '@wordpress/plugins';
-import { PluginPrePublishPanel } from '@wordpress/edit-post';
+import { PluginPrePublishPanel } from '@wordpress/editor';
 
 const PluginPrePublishPanelTest = () => (
 	<PluginPrePublishPanel>
diff --git a/docs/reference-guides/slotfills/plugin-sidebar-more-menu-item.md b/docs/reference-guides/slotfills/plugin-sidebar-more-menu-item.md
index 4d32d754578cc4..4a4ff98697b5f3 100644
--- a/docs/reference-guides/slotfills/plugin-sidebar-more-menu-item.md
+++ b/docs/reference-guides/slotfills/plugin-sidebar-more-menu-item.md
@@ -1,31 +1,78 @@
 # PluginSidebarMoreMenuItem
 
-This slot allows the creation of a `<PluginSidebar>` with a menu item that when clicked will expand the sidebar to the appropriate Plugin section.
-This is done by setting the `target` on `<PluginSidebarMoreMenuItem>` to match the `name` on the `<PluginSidebar>`
+This slot is used to allow the opening of a `<PluginSidebar />` panel from the Options dropdown.
+When a `<PluginSidebar />` is registered, a `<PluginSidebarMoreMenuItem />` is automatically registered using the title prop from the `<PluginSidebar />` and so it's not required to use this slot to create the menu item.
 
 ## Example
 
+This example shows how customize the text for the menu item instead of using the default text provided by the `<PluginSidebar />` title.
+
 ```js
+import { __ } from '@wordpress/i18n';
+import { PluginSidebar, PluginSidebarMoreMenuItem } from '@wordpress/editor';
+import {
+	PanelBody,
+	Button,
+	TextControl,
+	SelectControl,
+} from '@wordpress/components';
 import { registerPlugin } from '@wordpress/plugins';
-import { PluginSidebar, PluginSidebarMoreMenuItem } from '@wordpress/edit-post';
+import { useState } from '@wordpress/element';
 import { image } from '@wordpress/icons';
 
-const PluginSidebarMoreMenuItemTest = () => (
-	<>
-		<PluginSidebarMoreMenuItem target="sidebar-name" icon={ image }>
-			Expanded Sidebar - More item
-		</PluginSidebarMoreMenuItem>
-		<PluginSidebar name="sidebar-name" icon={ image } title="My Sidebar">
-			Content of the sidebar
-		</PluginSidebar>
-	</>
-);
-
-registerPlugin( 'plugin-sidebar-expanded-test', {
+const PluginSidebarMoreMenuItemTest = () => {
+	const [ text, setText ] = useState( '' );
+	const [ select, setSelect ] = useState( 'a' );
+	return (
+		<>
+			<PluginSidebarMoreMenuItem target="sidebar-name" icon={ image }>
+				{ __( 'Custom Menu Item Text' ) }
+			</PluginSidebarMoreMenuItem>
+			<PluginSidebar
+				name="sidebar-name"
+				icon={ image }
+				title="My Sidebar"
+			>
+				<PanelBody>
+					<h2>
+						{ __(
+							'This is a heading for the PluginSidebar example.'
+						) }
+					</h2>
+					<p>
+						{ __(
+							'This is some example text for the PluginSidebar example.'
+						) }
+					</p>
+					<TextControl
+						label={ __( 'Text Control' ) }
+						value={ text }
+						onChange={ ( newText ) => setText( newText ) }
+					/>
+					<SelectControl
+						label={ __( 'Select Control' ) }
+						value={ select }
+						options={ [
+							{ value: 'a', label: __( 'Option A' ) },
+							{ value: 'b', label: __( 'Option B' ) },
+							{ value: 'c', label: __( 'Option C' ) },
+						] }
+						onChange={ ( newSelect ) => setSelect( newSelect ) }
+					/>
+					<Button variant="primary">
+						{ __( 'Primary Button' ) }{ ' ' }
+					</Button>
+				</PanelBody>
+			</PluginSidebar>
+		</>
+	);
+};
+
+registerPlugin( 'plugin-sidebar-more-menu-item-example', {
 	render: PluginSidebarMoreMenuItemTest,
 } );
 ```
 
 ## Location
 
-![Interaction](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/plugin-sidebar-more-menu-item.gif?raw=true)
+![Interaction](https://developer.wordpress.org/files/2024/08/pluginsidebar-more-menu-item-1.gif)
diff --git a/docs/reference-guides/slotfills/plugin-sidebar.md b/docs/reference-guides/slotfills/plugin-sidebar.md
index 56d87ea1fc1be4..9bf911b3bb13f2 100644
--- a/docs/reference-guides/slotfills/plugin-sidebar.md
+++ b/docs/reference-guides/slotfills/plugin-sidebar.md
@@ -1,30 +1,67 @@
 # PluginSidebar
 
-This slot allows for adding items into the Gutenberg Toolbar.
-Using this slot will add an icon to the bar that, when clicked, will open a sidebar with the content of the items wrapped in the `<PluginSidebar />` component.
+This slot allows adding items to the tool bar of either the Post or Site editor screens.
+Using this slot will add an icon to the toolbar that, when clicked, opens a panel with containing the items wrapped in the `<PluginSidebar />` component.
+Additionally, it will also create a `<PluginSidebarMoreMenuItem />` that will allow opening the panel from Options panel when clicked.
 
 ## Example
 
-```js
+```jsx
+import { __ } from '@wordpress/i18n';
+import { PluginSidebar } from '@wordpress/editor';
+import {
+	PanelBody,
+	Button,
+	TextControl,
+	SelectControl,
+} from '@wordpress/components';
 import { registerPlugin } from '@wordpress/plugins';
-import { PluginSidebar } from '@wordpress/edit-post';
-import { image } from '@wordpress/icons';
+import { useState } from '@wordpress/element';
 
-const PluginSidebarTest = () => (
-	<PluginSidebar name="plugin-sidebar-test" title="My Plugin" icon={ image }>
-		<p>Plugin Sidebar</p>
-	</PluginSidebar>
-);
+const PluginSidebarExample = () => {
+	const [ text, setText ] = useState( '' );
+	const [ select, setSelect ] = useState( 'a' );
 
-registerPlugin( 'plugin-sidebar-test', { render: PluginSidebarTest } );
+	return (
+		<PluginSidebar
+			name="plugin-sidebar-example"
+			title={ __( 'My PluginSidebar' ) }
+			icon={ 'smiley' }
+		>
+			<PanelBody>
+				<h2>
+					{ __( 'This is a heading for the PluginSidebar example.' ) }
+				</h2>
+				<p>
+					{ __(
+						'This is some example text for the PluginSidebar example.'
+					) }
+				</p>
+				<TextControl
+					label={ __( 'Text Control' ) }
+					value={ text }
+					onChange={ ( newText ) => setText( newText ) }
+				/>
+				<SelectControl
+					label={ __( 'Select Control' ) }
+					value={ select }
+					options={ [
+						{ value: 'a', label: 'Option A' },
+						{ value: 'b', label: 'Option B' },
+						{ value: 'c', label: 'Option C' },
+					] }
+					onChange={ ( newSelect ) => setSelect( newSelect ) }
+				/>
+				<Button variant="primary">{ __( 'Primary Button' ) } </Button>
+			</PanelBody>
+		</PluginSidebar>
+	);
+};
+
+// Register the plugin.
+registerPlugin( 'plugin-sidebar-example', { render: PluginSidebarExample } );
 ```
 
 ## Location
 
-### Closed State
-
-![Closed State](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/plugin-sidebar-closed-state.png?raw=true)
-
-### Open State
-
-![Open State](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/plugin-sidebar-open-state.png?raw=true)
+![PluginSidebar example expanded](https://developer.wordpress.org/files/2024/08/plugin-sidebar-example.png)
diff --git a/docs/reference-guides/theme-json-reference/README.md b/docs/reference-guides/theme-json-reference/README.md
index 819e7d561cda00..9f53a09a97e662 100644
--- a/docs/reference-guides/theme-json-reference/README.md
+++ b/docs/reference-guides/theme-json-reference/README.md
@@ -1,10 +1,11 @@
 # Theme.json Reference
 
-This reference guide lists the settings and style properties defined in the theme.json schema. See the [theme.json how to guide](/docs/how-to-guides/themes/theme-json.md) for examples and guide on how to use the theme.json file in your theme.
+This reference guide lists the settings and style properties defined in the theme.json schema. See the [theme.json how to guide](/docs/how-to-guides/themes/global-settings-and-styles.md) for examples and guide on how to use the theme.json file in your theme.
 
--   [Version 2 (living reference)](/docs/reference-guides/theme-json-reference/theme-json-living.md)
+-   [Version 3 (latest)](/docs/reference-guides/theme-json-reference/theme-json-living.md)
 
-## Older Versions
+## Older versions
 
 -   [Migrating to Newer Theme.json Versions](/docs/reference-guides/theme-json-reference/theme-json-migrations.md)
 -   [Version 1](/docs/reference-guides/theme-json-reference/theme-json-v1.md)
+-   [Version 2](/docs/reference-guides/theme-json-reference/theme-json-v2.md)
diff --git a/docs/reference-guides/theme-json-reference/styles-versions.md b/docs/reference-guides/theme-json-reference/styles-versions.md
index 734c59c3d159ce..0cbffdc6ebfe07 100644
--- a/docs/reference-guides/theme-json-reference/styles-versions.md
+++ b/docs/reference-guides/theme-json-reference/styles-versions.md
@@ -2,7 +2,7 @@
 
 New styles options are integrated into theme.json on a regular basis. Knowing the style options available through theme.json or the styles editor at any given time can be challenging. To clarify, the table below indicates the WordPress version when each theme.json styles option became available and when a corresponding control was added to the user interface to allow management of the style from the Styles editor.
 
-## Styles Keys
+## Styles keys
 
 | Key | theme.json Since| Style Editor Since |
 | --- | :---: | :---: |
diff --git a/docs/reference-guides/theme-json-reference/theme-json-living.md b/docs/reference-guides/theme-json-reference/theme-json-living.md
index 627fee6071816f..95f2e047dd0e31 100644
--- a/docs/reference-guides/theme-json-reference/theme-json-living.md
+++ b/docs/reference-guides/theme-json-reference/theme-json-living.md
@@ -1,55 +1,66 @@
-# Theme.json Version 2
+# Theme.json Version 3 Reference (latest)
 
-> This is the living specification for  **version 2** of `theme.json`. This version works with WordPress 5.9 or later, and the latest Gutenberg plugin.
+> This is the living specification for  **version 3** of `theme.json`. This version works with WordPress 6.6 or later, and the latest Gutenberg plugin.
 >
 > There are some related documents that you may be interested in: 
-> - the [theme.json v1](/docs/reference-guides/theme-json-reference/theme-json-v1.md) specification, and 
-> - the [reference to migrate from theme.json v1 to v2](/docs/reference-guides/theme-json-reference/theme-json-migrations.md).
+> - the [theme.json v1](/docs/reference-guides/theme-json-reference/theme-json-v1.md) specification,
+> - the [theme.json v2](/docs/reference-guides/theme-json-reference/theme-json-v2.md) specification, and
+> - the [reference to migrate from older theme.json versions](/docs/reference-guides/theme-json-reference/theme-json-migrations.md).
 
-This reference guide lists the settings and style properties defined in the `theme.json` schema. See the [theme.json how to guide](/docs/how-to-guides/themes/theme-json.md) for examples and guidance on how to use the `theme.json` file in your theme.
+This reference guide lists the settings and style properties defined in the `theme.json` schema. See the [theme.json how to guide](/docs/how-to-guides/themes/global-settings-and-styles.md) for examples and guidance on how to use the `theme.json` file in your theme.
 
-## Schema
+## JSON Schema
 
-Remembering the `theme.json` settings and properties while you develop can be difficult, so a [JSON schema](https://schemas.wp.org/trunk/theme.json) was created to help.
+This documentation was generated from the JSON schema for theme.json.
 
-Code editors can pick up the schema and can provide helpful hints and suggestions such as tooltips, autocomplete, or schema validation in the editor. To use the schema in Visual Studio Code, add `$schema`: "https://schemas.wp.org/trunk/theme.json" to the beginning of your theme.json file together with a `version` corresponding to the version you wish to use, e.g.:
+The latest schema for version 3, including all the latest changes from the Gutenberg plugin, is available at <code>https://schemas.wp.org/trunk/theme.json</code>.
 
-```
-{
-  "$schema": "https://schemas.wp.org/trunk/theme.json",
-  "version": 2,
-  ...
-}
-```
+Theme.json schemas for each WordPress version are available at <code>https://schemas.wp.org/wp/{{version}}/theme.json</code>.  
+For example, a schema for WordPress 5.8 is available at <code>https://schemas.wp.org/wp/5.8/theme.json</code>.
 
+See [Developing with theme.json](/docs/how-to-guides/themes/global-settings-and-styles.md#developing-with-themejson) for how to use the JSON schema in your editor.
 
 <!-- START TOKEN Autogenerated - DO NOT EDIT -->
-## Settings
+## settings
 
+Settings for the block editor and individual blocks. These include things like:
+- Which customization options should be available to the user. 
+- The default colors, font sizes... available to the user. 
+- CSS custom properties and class names used in styles.
+- And the default layout of the editor (widths and available alignments).
+
+### useRootPaddingAwareAlignments
+
+Enables root padding (the values from `styles.spacing.padding`) to be applied to the contents of full-width blocks instead of the root block.
+
+Please note that when using this setting, `styles.spacing.padding` should always be set as an object with `top`, `right`, `bottom`, `left` values declared separately.
+
+**Note:** Top-level only property. Not available in blocks.
+
+---
 
 ### appearanceTools
 
 Setting that enables the following UI tools:
 
-- background: backgroundImage
+- background: backgroundImage, backgroundSize
 - border: color, radius, style, width
-- color: link
-- dimensions: minHeight
+- color: link, heading, button, caption
+- dimensions: aspectRatio, minHeight
 - position: sticky
 - spacing: blockGap, margin, padding
 - typography: lineHeight
 
-
 ---
 
-### useRootPaddingAwareAlignments
-
-_**Note:** Since WordPress 6.1._
-
-Enables root padding (the values from `styles.spacing.padding`) to be applied to the contents of full-width blocks instead of the root block.
+### background
 
-Please note that when using this setting, `styles.spacing.padding` should always be set as an object with `top`, `right`, `bottom`, `left` values declared separately.
+Settings related to background.
 
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| backgroundImage | Allow users to set a background image. | `boolean` | `false` |
+| backgroundSize | Allow users to set values related to the size of a background image, including size, position, and repeat controls. | `boolean` | `false` |
 
 ---
 
@@ -57,23 +68,12 @@ Please note that when using this setting, `styles.spacing.padding` should always
 
 Settings related to borders.
 
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| color | boolean | false |  |
-| radius | boolean | false |  |
-| style | boolean | false |  |
-| width | boolean | false |  |
-
----
-
-### shadow
-
-Settings related to shadows.
-
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| defaultPresets | boolean | true |  |
-| presets | array |  | name, shadow, slug |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| color | Allow users to set custom border colors. | `boolean` | `false` |
+| radius | Allow users to set custom border radius. | `boolean` | `false` |
+| style | Allow users to set custom border styles. | `boolean` | `false` |
+| width | Allow users to set custom border widths. | `boolean` | `false` |
 
 ---
 
@@ -81,32 +81,23 @@ Settings related to shadows.
 
 Settings related to colors.
 
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| background | boolean | true |  |
-| custom | boolean | true |  |
-| customDuotone | boolean | true |  |
-| customGradient | boolean | true |  |
-| defaultDuotone | boolean | true |  |
-| defaultGradients | boolean | true |  |
-| defaultPalette | boolean | true |  |
-| duotone | array |  | colors, name, slug |
-| gradients | array |  | gradient, name, slug |
-| link | boolean | false |  |
-| palette | array |  | color, name, slug |
-| text | boolean | true |  |
-| heading | boolean | true |  |
-| button | boolean | true |  |
-
----
-
-### background
-
-Settings related to background.
-
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| backgroundImage | boolean | false |  |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| background | Allow users to set background colors. | `boolean` | `true` |
+| custom | Allow users to select custom colors. | `boolean` | `true` |
+| customDuotone | Allow users to create custom duotone filters. | `boolean` | `true` |
+| customGradient | Allow users to create custom gradients. | `boolean` | `true` |
+| defaultDuotone | Allow users to choose filters from the default duotone filter presets. | `boolean` | `true` |
+| defaultGradients | Allow users to choose colors from the default gradients. | `boolean` | `true` |
+| defaultPalette | Allow users to choose colors from the default palette. | `boolean` | `true` |
+| duotone | Duotone presets for the duotone picker. | `[ { name, slug, colors } ]` |  |
+| gradients | Gradient presets for the gradient picker. | `[ { name, slug, gradient } ]` |  |
+| link | Allow users to set link colors in a block. | `boolean` | `false` |
+| palette | Color palette presets for the color picker. | `[ { name, slug, color } ]` |  |
+| text | Allow users to set text colors in a block. | `boolean` | `true` |
+| heading | Allow users to set heading colors in a block. | `boolean` | `true` |
+| button | Allow users to set button colors in a block. | `boolean` | `true` |
+| caption | Allow users to set caption colors in a block. | `boolean` | `true` |
 
 ---
 
@@ -114,9 +105,12 @@ Settings related to background.
 
 Settings related to dimensions.
 
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| minHeight | boolean | false |  |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| aspectRatio | Allow users to set an aspect ratio. | `boolean` | `false` |
+| defaultAspectRatios | Allow users to choose aspect ratios from the default set of aspect ratios. | `boolean` | `true` |
+| aspectRatios | Allow users to define aspect ratios for some blocks. | `[ { name, slug, ratio } ]` |  |
+| minHeight | Allow users to set custom minimum height. | `boolean` | `false` |
 
 ---
 
@@ -124,12 +118,12 @@ Settings related to dimensions.
 
 Settings related to layout.
 
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| contentSize | string |  |  |
-| wideSize | string |  |  |
-| allowEditing | boolean | true |  |
-| allowCustomContentAndWideSize | boolean | true |  |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| contentSize | Sets the max-width of the content. | `string` |  |
+| wideSize | Sets the max-width of wide (`.alignwide`) content. Also used as the maximum viewport when calculating fluid font sizes | `string` |  |
+| allowEditing | Disable the layout UI controls. | `boolean` | `true` |
+| allowCustomContentAndWideSize | Enable or disable the custom content and wide size controls. | `boolean` | `true` |
 
 ---
 
@@ -137,10 +131,10 @@ Settings related to layout.
 
 Settings related to the lightbox.
 
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| enabled | boolean |  |  |
-| allowEditing | boolean |  |  |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| enabled | Defines whether the lightbox is enabled or not. | `boolean` |  |
+| allowEditing | Defines whether to show the Lightbox UI in the block editor. If set to `false`, the user won't be able to change the lightbox settings in the block editor. | `boolean` |  |
 
 ---
 
@@ -148,9 +142,20 @@ Settings related to the lightbox.
 
 Settings related to position.
 
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| sticky | boolean | false |  |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| sticky | Allow users to set sticky position. | `boolean` | `false` |
+
+---
+
+### shadow
+
+Settings related to shadows.
+
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| defaultPresets | Allow users to choose shadows from the default shadow presets. | `boolean` | `true` |
+| presets | Shadow presets for the shadow picker. | `[ { name, slug, shadow } ]` |  |
 
 ---
 
@@ -158,15 +163,16 @@ Settings related to position.
 
 Settings related to spacing.
 
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| blockGap | undefined | null |  |
-| margin | boolean | false |  |
-| padding | boolean | false |  |
-| units | array | px,em,rem,vh,vw,% |  |
-| customSpacingSize | boolean | true |  |
-| spacingSizes | array |  | name, size, slug |
-| spacingScale | object |  |  |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| blockGap | Enables `--wp--style--block-gap` to be generated from styles.spacing.blockGap. | `boolean`, `null` | `null` |
+| margin | Allow users to set a custom margin. | `boolean` | `false` |
+| padding | Allow users to set a custom padding. | `boolean` | `false` |
+| units | List of units the user can use for spacing values. | `[ string ]` | `["px","em","rem","vh","vw","%"]` |
+| customSpacingSize | Allow users to set custom space sizes. | `boolean` | `true` |
+| defaultSpacingSizes | Allow users to choose space sizes from the default space size presets. | `boolean` | `true` |
+| spacingSizes | Space size presets for the space size selector. | `[ { name, slug, size } ]` |  |
+| spacingScale | Settings to auto-generate space size presets for the space size selector. | `{ operator, increment, steps, mediumStep, unit }` |  |
 
 ---
 
@@ -174,21 +180,23 @@ Settings related to spacing.
 
 Settings related to typography.
 
-| Property  | Type   | Default | Props  |
-| ---       | ---    | ---    |---   |
-| customFontSize | boolean | true |  |
-| fontStyle | boolean | true |  |
-| fontWeight | boolean | true |  |
-| fluid | undefined | false |  |
-| letterSpacing | boolean | true |  |
-| lineHeight | boolean | false |  |
-| textColumns | boolean | false |  |
-| textDecoration | boolean | true |  |
-| writingMode | boolean | false |  |
-| textTransform | boolean | true |  |
-| dropCap | boolean | true |  |
-| fontSizes | array |  | fluid, name, size, slug |
-| fontFamilies | array |  | fontFace, fontFamily, name, preview, slug |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| defaultFontSizes | Allow users to choose font sizes from the default font size presets. | `boolean` | `true` |
+| customFontSize | Allow users to set custom font sizes. | `boolean` | `true` |
+| fontStyle | Allow users to set custom font styles. | `boolean` | `true` |
+| fontWeight | Allow users to set custom font weights. | `boolean` | `true` |
+| fluid | Enables fluid typography and allows users to set global fluid typography parameters. | `boolean`, `{ minFontSize, maxViewportWidth, minViewportWidth }` | `false` |
+| letterSpacing | Allow users to set custom letter spacing. | `boolean` | `true` |
+| lineHeight | Allow users to set custom line height. | `boolean` | `false` |
+| textAlign | Allow users to set the text align. | `boolean` | `true` |
+| textColumns | Allow users to set the number of text columns. | `boolean` | `false` |
+| textDecoration | Allow users to set custom text decorations. | `boolean` | `true` |
+| writingMode | Allow users to set the writing mode. | `boolean` | `false` |
+| textTransform | Allow users to set custom text transforms. | `boolean` | `true` |
+| dropCap | Enable drop cap. | `boolean` | `true` |
+| fontSizes | Font size presets for the font size selector. | `[ { name, slug, size, fluid } ]` |  |
+| fontFamilies | Font family presets for the font family selector. | `[ { name, slug, fontFamily, fontFace } ]` |  |
 
 ---
 
@@ -196,25 +204,40 @@ Settings related to typography.
 
 Generate custom CSS custom properties of the form `--wp--custom--{key}--{nested-key}: {value};`. `camelCased` keys are transformed to `kebab-case` as to follow the CSS property naming schema. Keys at different depth levels are separated by `--`, so keys should not include `--` in the name.
 
-
 ---
-## Styles
 
+## styles
+
+Organized way to set CSS properties. Styles in the top-level will be added in the `body` selector.
+
+### background
+
+Background styles.
+
+| Property | Description | Type |
+| -------- | ----------- | ---- |
+| backgroundImage | Sets the `background-image` CSS property. | `string`, `{ ref }`, `{ url }` |
+| backgroundPosition | Sets the `background-position` CSS property. | `string`, `{ ref }` |
+| backgroundRepeat | Sets the `background-repeat` CSS property. | `string`, `{ ref }` |
+| backgroundSize | Sets the `background-size` CSS property. | `string`, `{ ref }` |
+| backgroundAttachment | Sets the `background-attachment` CSS property. | `string`, `{ ref }` |
+
+---
 
 ### border
 
 Border styles.
 
-| Property  | Type   |  Props  |
-| ---       | ---    |---   |
-| color | string, object |  |
-| radius | string, object |  |
-| style | string, object |  |
-| width | string, object |  |
-| top | object | color, style, width |
-| right | object | color, style, width |
-| bottom | object | color, style, width |
-| left | object | color, style, width |
+| Property | Description | Type |
+| -------- | ----------- | ---- |
+| color | Sets the `border-color` CSS property. | `string`, `{ ref }` |
+| radius | Sets the `border-radius` CSS property. | `string`, `{ ref }`, `{ topLeft, topRight, bottomLeft, bottomRight }` |
+| style | Sets the `border-style` CSS property. | `string`, `{ ref }` |
+| width | Sets the `border-width` CSS property. | `string`, `{ ref }` |
+| top |  | `{ color, style, width }` |
+| right |  | `{ color, style, width }` |
+| bottom |  | `{ color, style, width }` |
+| left |  | `{ color, style, width }` |
 
 ---
 
@@ -222,62 +245,51 @@ Border styles.
 
 Color styles.
 
-| Property  | Type   |  Props  |
-| ---       | ---    |---   |
-| background | string, object |  |
-| gradient | string, object |  |
-| text | string, object |  |
+| Property | Description | Type |
+| -------- | ----------- | ---- |
+| background | Sets the `background-color` CSS property. | `string`, `{ ref }` |
+| gradient | Sets the `background` CSS property. | `string`, `{ ref }` |
+| text | Sets the `color` CSS property. | `string`, `{ ref }` |
 
 ---
 
-### dimensions
-
-Dimensions styles
+### css
 
-| Property  | Type   |  Props  |
-| ---       | ---    |---   |
-| minHeight | string, object |  |
+Sets custom CSS to apply styling not covered by other theme.json properties.
 
 ---
 
-### spacing
+### dimensions
 
-Spacing styles.
+Dimensions styles.
 
-| Property  | Type   |  Props  |
-| ---       | ---    |---   |
-| blockGap | string, object |  |
-| margin | object | bottom, left, right, top |
-| padding | object | bottom, left, right, top |
+| Property | Description | Type |
+| -------- | ----------- | ---- |
+| aspectRatio | Sets the `aspect-ratio` CSS property. | `string`, `{ ref }` |
+| minHeight | Sets the `min-height` CSS property. | `string`, `{ ref }` |
 
 ---
 
-### typography
+### filter
 
-Typography styles.
+CSS and SVG filter styles.
 
-| Property  | Type   |  Props  |
-| ---       | ---    |---   |
-| fontFamily | string, object |  |
-| fontSize | string, object |  |
-| fontStyle | string, object |  |
-| fontWeight | string, object |  |
-| letterSpacing | string, object |  |
-| lineHeight | string, object |  |
-| textColumns | string |  |
-| textDecoration | string, object |  |
-| writingMode | string, object |  |
-| textTransform | string, object |  |
+| Property | Description | Type |
+| -------- | ----------- | ---- |
+| duotone | Sets the duotone filter. | `string`, `{ ref }` |
 
 ---
 
-### filter
+### outline
 
-CSS and SVG filter styles.
+Outline styles.
 
-| Property  | Type   |  Props  |
-| ---       | ---    |---   |
-| duotone | string, object |  |
+| Property | Description | Type |
+| -------- | ----------- | ---- |
+| color | Sets the `outline-color` CSS property. | `string`, `{ ref }` |
+| offset | Sets the `outline-offset` CSS property. | `string`, `{ ref }` |
+| style | Sets the `outline-style` CSS property. | `string`, `{ ref }` |
+| width | Sets the `outline-width` CSS property. | `string`, `{ ref }` |
 
 ---
 
@@ -285,58 +297,64 @@ CSS and SVG filter styles.
 
 Box shadow styles.
 
-
 ---
 
-### outline
+### spacing
 
-Outline styles.
+Spacing styles.
 
-| Property  | Type   |  Props  |
-| ---       | ---    |---   |
-| color | string, object |  |
-| offset | string, object |  |
-| style | string, object |  |
-| width | string, object |  |
+| Property | Description | Type |
+| -------- | ----------- | ---- |
+| blockGap | Sets the `--wp--style--block-gap` CSS custom property when settings.spacing.blockGap is true. | `string`, `{ ref }` |
+| margin | Margin styles. | `{ top, right, bottom, left }` |
+| padding | Padding styles. | `{ top, right, bottom, left }` |
 
 ---
 
-### css
+### typography
 
-Sets custom CSS to apply styling not covered by other theme.json properties.
+Typography styles.
 
+| Property | Description | Type |
+| -------- | ----------- | ---- |
+| fontFamily | Sets the `font-family` CSS property. | `string`, `{ ref }` |
+| fontSize | Sets the `font-size` CSS property. | `string`, `{ ref }` |
+| fontStyle | Sets the `font-style` CSS property. | `string`, `{ ref }` |
+| fontWeight | Sets the `font-weight` CSS property. | `string`, `{ ref }` |
+| letterSpacing | Sets the `letter-spacing` CSS property. | `string`, `{ ref }` |
+| lineHeight | Sets the `line-height` CSS property. | `string`, `{ ref }` |
+| textAlign | Sets the `text-align` CSS property. | `string`, `{ ref }` |
+| textColumns | Sets the `column-count` CSS property. | `string`, `{ ref }` |
+| textDecoration | Sets the `text-decoration` CSS property. | `string`, `{ ref }` |
+| writingMode | Sets the `writing-mode` CSS property. | `string`, `{ ref }` |
+| textTransform | Sets the `text-transform` CSS property. | `string`, `{ ref }` |
 
 ---
+
 ## customTemplates
 
 Additional metadata for custom templates defined in the templates folder.
 
-Type: `object`.
-
 | Property | Description | Type |
-| ---      | ---         | ---  |
-| name | Filename, without extension, of the template in the templates folder. | string |
-| title | Title of the template, translatable. | string |
-| postTypes | List of post types that can use this custom template. | array |
-
+| -------- | ----------- | ---- |
+| name | Filename, without extension, of the template in the templates folder. | `string` |
+| title | Title of the template, translatable. | `string` |
+| postTypes | List of post types that can use this custom template. | `[ string ]` |
 
 ## templateParts
 
 Additional metadata for template parts defined in the parts folder.
 
-Type: `object`.
-
 | Property | Description | Type |
-| ---      | ---         | ---  |
-| name | Filename, without extension, of the template in the parts folder. | string |
-| title | Title of the template, translatable. | string |
-| area | The area the template part is used for. Block variations for `header` and `footer` values exist and will be used when the area is set to one of those. | string |
-
+| -------- | ----------- | ---- |
+| name | Filename, without extension, of the template in the parts folder. | `string` |
+| title | Title of the template, translatable. | `string` |
+| area | The area the template part is used for. Block variations for `header` and `footer` values exist and will be used when the area is set to one of those. | `string` |
 
-## Patterns
+## patterns
 
 An array of pattern slugs to be registered from the Pattern Directory.
-Type: `array`.
 
+Type: `[ string ]`.
 
 <!-- END TOKEN Autogenerated - DO NOT EDIT -->
diff --git a/docs/reference-guides/theme-json-reference/theme-json-migrations.md b/docs/reference-guides/theme-json-reference/theme-json-migrations.md
index b043ca1fba52ac..8e9d56ed054e68 100644
--- a/docs/reference-guides/theme-json-reference/theme-json-migrations.md
+++ b/docs/reference-guides/theme-json-reference/theme-json-migrations.md
@@ -1,4 +1,4 @@
-# Migrating to Newer Versions
+# Migrating Theme.json to Newer Versions
 
 This guide documents the changes between different `theme.json` versions and how to upgrade. Using older versions will continue to be supported. Upgrading is recommended because new development will continue in the newer versions.
 
@@ -6,7 +6,7 @@ This guide documents the changes between different `theme.json` versions and how
 
 Upgrading to v2 enables some new features and adjusts the naming of some old features to be more consistent with one another.
 
-How to migrate from v1 to v2:
+### How to migrate from v1 to v2:
 
 1. Update `version` to `2`.
 2. Rename the properties that were updated (see below) if you're using them.
@@ -63,3 +63,52 @@ Additions to styles:
 ### Changes to property values
 
 The default font sizes provided by core (`settings.typography.fontSizes`) have been updated. The Normal and Huge sizes (with `normal` and `huge` slugs) have been removed from the list, and Extra Large (`x-large` slug) has been added. When the UI controls show the default values provided by core, Normal and Huge will no longer be present. However, their CSS classes and CSS Custom Properties are still enqueued to make sure existing content that uses them still works as expected.
+
+## Migrating from v2 to v3
+
+Upgrading to v3 adjusts preset defaults to be more consistent with one another.
+
+### How to migrate from v2 to v3:
+
+1. Update `version` to `3`.
+2. Configure the changed defaults (see below).
+
+### Changed defaults
+
+#### `settings.typography.defaultFontSizes`
+
+In theme.json v2, the default font sizes were only shown when theme sizes were not defined. A theme providing font sizes with the same slugs as the defaults would always override them.
+
+The default `fontSizes` slugs are: `small`, `medium`, `large`, `x-large`, and `xx-large`.
+
+The new `defaultFontSizes` option gives control over showing default font sizes and preventing those defaults from being overridden.
+
+- When set to `true` it will show the default font sizes and prevent them from being overridden by the theme.
+- When set to `false` it will hide the default font sizes and allow the theme to use the default slugs.
+
+It is `true` by default when switching to v3. This is to be consistent with how other `default*` options work such as `settings.color.defaultPalette`, but differs from the behavior in v2.
+
+To keep behavior similar to v2 with a v3 theme.json:
+* If you do not have any `fontSizes` defined, `defaultFontSizes` can be left out or set to `true`.
+* If you have some `fontSizes` defined, set `defaultFontSizes` to `false`.
+
+#### `settings.spacing.defaultSpacingSizes`
+
+In theme.json v2, there are two settings that could be used to set theme level spacing sizes: `settings.spacing.spacingSizes` and `settings.spacing.spacingScale`. Setting both `spacingSizes` _and_ `spacingScale` would only use the values from `spacingSizes`. And setting either of them would always replace the entire set of default spacing sizes provided by WordPress.
+
+The default `spacingSizes` slugs provided by WordPress are: `20`, `30`, `40`, `50`, `60`, `70`, and `80`.
+
+The new `defaultSpacingSizes` option gives control over showing default spacing sizes and preventing those defaults from being overridden.
+
+- When set to `true` it will show the default spacing sizes and prevent them from being overridden by the theme.
+- When set to `false` it will hide the default spacing sizes and allow the theme to use the default slugs.
+
+`defaultSpacingSizes` is `true` by default when switching to v3. This is to be consistent with how other `default*` options work such as `settings.color.defaultPalette`, but differs from the behavior in v2.
+
+Additionally, in v3 both `spacingSizes` and `spacingScale` can be set at the same time. Presets defined in `spacingSizes` with slugs matching the generated presets from `spacingSizes` will override the generated ones.
+
+To keep behavior similar to v2 with a v3 theme.json:
+* If you do not have any `spacingSizes` presets or `spacingScale` config defined, `defaultSpacingSizes` can be left out or set to `true`.
+* If you disabled default spacing sizes by setting `spacingScale` to `{ "steps": 0 }`, remove the `spacingScale` config and set `defaultSpacingSizes` to `false`.
+* If you defined only one of either `spacingScale` or `spacingSizes` for your presets, set `defaultSpacingSizes` to `false`.
+* If you defined both `spacingScale` and `spacingSizes`, remove the `spacingSizes` config _and_ set `defaultSpacingSizes` to `false`.
diff --git a/docs/reference-guides/theme-json-reference/theme-json-v1.md b/docs/reference-guides/theme-json-reference/theme-json-v1.md
index 3e7096ee420ef6..d7c98961b053ad 100644
--- a/docs/reference-guides/theme-json-reference/theme-json-v1.md
+++ b/docs/reference-guides/theme-json-reference/theme-json-v1.md
@@ -1,6 +1,24 @@
 # Theme.json Version 1 Reference
 
-Theme.json version 2 has been released, see the [theme.json migration guide](/docs/reference-guides/theme-json-reference/theme-json-migrations.md#migrating-from-v1-to-v2) for updating to the latest version.
+> This is the specification for  **version 1** of `theme.json`. This version works with WordPress 5.8 or later.
+
+<div class="callout callout-alert">
+
+Theme.json version 2 has been released with WordPress 5.9. WordPress will continue to support theme.json version 1. However new features will only be added to [new versions](/docs/reference-guides/theme-json-reference/theme-json-living.md).
+
+When you are ready to upgrade, see the [theme.json migration guide](/docs/reference-guides/theme-json-reference/theme-json-migrations.md#migrating-from-v1-to-v2) for details on updating to the latest version.
+
+</div>
+
+This reference guide lists the settings and style properties defined in the `theme.json` schema. See the [theme.json how to guide](/docs/how-to-guides/themes/global-settings-and-styles.md) for examples and guidance on how to use the `theme.json` file in your theme.
+
+## JSON Schema
+
+The last schema for version 1 is available at `https://schemas.wp.org/wp/5.8/theme.json`.
+
+Theme.json schemas for each WordPress version are available at `https://schemas.wp.org/wp/{{version}}/theme.json`. For example a schema for WordPress 5.8 is available at `https://schemas.wp.org/wp/5.8/theme.json`.
+
+See [Developing with theme.json](/docs/how-to-guides/themes/global-settings-and-styles.md#developing-with-themejson) for how to use the JSON schema in your editor.
 
 ## Settings
 
diff --git a/docs/reference-guides/theme-json-reference/theme-json-v2.md b/docs/reference-guides/theme-json-reference/theme-json-v2.md
new file mode 100644
index 00000000000000..6c6e3b28948332
--- /dev/null
+++ b/docs/reference-guides/theme-json-reference/theme-json-v2.md
@@ -0,0 +1,330 @@
+# Theme.json Version 2 Reference
+
+> This is the specification for  **version 2** of `theme.json`. This version works with WordPress 5.9 or later.
+
+<div class="callout callout-alert">
+
+Theme.json version 3 has been released with WordPress 6.6. WordPress will continue to support theme.json version 2. However new features will only be added to [new versions](/docs/reference-guides/theme-json-reference/theme-json-living.md).
+
+When you are ready to upgrade, see the [theme.json migration guide](/docs/reference-guides/theme-json-reference/theme-json-migrations.md#migrating-from-v2-to-v3) for details on updating to the latest version.
+
+</div>
+
+This reference guide lists the settings and style properties defined in the `theme.json` schema. See the [theme.json how to guide](/docs/how-to-guides/themes/global-settings-and-styles.md) for examples and guidance on how to use the `theme.json` file in your theme.
+
+## JSON Schema
+
+This documentation was generated from the JSON schema for theme.json.
+
+The last schema for version 2 is available at `https://schemas.wp.org/wp/6.5/theme.json`.
+
+Theme.json schemas for each WordPress version are available at `https://schemas.wp.org/wp/{{version}}/theme.json`. For example a schema for WordPress 5.9 is available at `https://schemas.wp.org/wp/5.9/theme.json`.
+
+See [Developing with theme.json](/docs/how-to-guides/themes/global-settings-and-styles.md#developing-with-themejson) for how to use the JSON schema in your editor.
+
+## Settings
+
+### appearanceTools
+
+Setting that enables the following UI tools:
+
+- background: backgroundImage, backgroundSize
+- border: color, radius, style, width
+- color: link
+- dimensions: aspectRatio, minHeight
+- position: sticky
+- spacing: blockGap, margin, padding
+- typography: lineHeight
+
+---
+
+### useRootPaddingAwareAlignments
+
+Enables root padding (the values from `styles.spacing.padding`) to be applied to the contents of full-width blocks instead of the root block.
+
+Please note that when using this setting, `styles.spacing.padding` should always be set as an object with `top`, `right`, `bottom`, `left` values declared separately.
+
+---
+
+### border
+
+Settings related to borders.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| color | boolean | false |  |
+| radius | boolean | false |  |
+| style | boolean | false |  |
+| width | boolean | false |  |
+
+---
+
+### shadow
+
+Settings related to shadows.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| defaultPresets | boolean | true |  |
+| presets | array |  | name, shadow, slug |
+
+---
+
+### color
+
+Settings related to colors.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| background | boolean | true |  |
+| custom | boolean | true |  |
+| customDuotone | boolean | true |  |
+| customGradient | boolean | true |  |
+| defaultDuotone | boolean | true |  |
+| defaultGradients | boolean | true |  |
+| defaultPalette | boolean | true |  |
+| duotone | array |  | colors, name, slug |
+| gradients | array |  | gradient, name, slug |
+| link | boolean | false |  |
+| palette | array |  | color, name, slug |
+| text | boolean | true |  |
+| heading | boolean | true |  |
+| button | boolean | true |  |
+
+---
+
+### background
+
+Settings related to background.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| backgroundImage | boolean | false |  |
+
+---
+
+### dimensions
+
+Settings related to dimensions.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| aspectRatio | boolean | false |  |
+| minHeight | boolean | false |  |
+
+---
+
+### layout
+
+Settings related to layout.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| contentSize | string |  |  |
+| wideSize | string |  |  |
+| allowEditing | boolean | true |  |
+| allowCustomContentAndWideSize | boolean | true |  |
+
+---
+
+### lightbox
+
+Settings related to the lightbox.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| enabled | boolean |  |  |
+| allowEditing | boolean |  |  |
+
+---
+
+### position
+
+Settings related to position.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| sticky | boolean | false |  |
+
+---
+
+### spacing
+
+Settings related to spacing.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| blockGap | boolean, null | null |   |
+| margin | boolean | false |  |
+| padding | boolean | false |  |
+| units | array | px,em,rem,vh,vw,% |  |
+| customSpacingSize | boolean | true |  |
+| spacingSizes | array |  | name, size, slug |
+| spacingScale | object |  |  |
+
+---
+
+### typography
+
+Settings related to typography.
+
+| Property  | Type   | Default | Props  |
+| ---    | ---    | ---    |---   |
+| customFontSize | boolean | true |  |
+| fontStyle | boolean | true |  |
+| fontWeight | boolean | true |  |
+| fluid | object, boolean | false | _{maxViewportWidth, minFontSize, minViewportWidth}_  |
+| letterSpacing | boolean | true |  |
+| lineHeight | boolean | false |  |
+| textColumns | boolean | false |  |
+| textDecoration | boolean | true |  |
+| writingMode | boolean | false |  |
+| textTransform | boolean | true |  |
+| dropCap | boolean | true |  |
+| fontSizes | array |  | fluid, name, size, slug |
+| fontFamilies | array |  | fontFace, fontFamily, name, slug |
+
+---
+
+### custom
+
+Generate custom CSS custom properties of the form `--wp--custom--{key}--{nested-key}: {value};`. `camelCased` keys are transformed to `kebab-case` as to follow the CSS property naming schema. Keys at different depth levels are separated by `--`, so keys should not include `--` in the name.
+
+---
+
+## Styles
+
+### border
+
+Border styles.
+
+| Property  | Type   |  Props  |
+| ---       | ---    |---   |
+| color | string, object |  |
+| radius | string, object |  |
+| style | string, object |  |
+| width | string, object |  |
+| top | object | color, style, width |
+| right | object | color, style, width |
+| bottom | object | color, style, width |
+| left | object | color, style, width |
+
+---
+
+### color
+
+Color styles.
+
+| Property  | Type   |  Props  |
+| ---       | ---    |---   |
+| background | string, object |  |
+| gradient | string, object |  |
+| text | string, object |  |
+
+---
+
+### dimensions
+
+Dimensions styles
+
+| Property  | Type   |  Props  |
+| ---       | ---    |---   |
+| aspectRatio | string, object |  |
+| minHeight | string, object |  |
+
+---
+
+### spacing
+
+Spacing styles.
+
+| Property  | Type   |  Props  |
+| ---       | ---    |---   |
+| blockGap | string, object |  |
+| margin | object | bottom, left, right, top |
+| padding | object | bottom, left, right, top |
+
+---
+
+### typography
+
+Typography styles.
+
+| Property  | Type   |  Props  |
+| ---       | ---    |---   |
+| fontFamily | string, object |  |
+| fontSize | string, object |  |
+| fontStyle | string, object |  |
+| fontWeight | string, object |  |
+| letterSpacing | string, object |  |
+| lineHeight | string, object |  |
+| textColumns | string |  |
+| textDecoration | string, object |  |
+| writingMode | string, object |  |
+| textTransform | string, object |  |
+
+---
+
+### filter
+
+CSS and SVG filter styles.
+
+| Property  | Type   |  Props  |
+| ---       | ---    |---   |
+| duotone | string, object |  |
+
+---
+
+### shadow
+
+Box shadow styles.
+
+---
+
+### outline
+
+Outline styles.
+
+| Property  | Type   |  Props  |
+| ---       | ---    |---   |
+| color | string, object |  |
+| offset | string, object |  |
+| style | string, object |  |
+| width | string, object |  |
+
+---
+
+### css
+
+Sets custom CSS to apply styling not covered by other theme.json properties.
+
+---
+
+## customTemplates
+
+Additional metadata for custom templates defined in the templates folder.
+
+Type: `object`.
+
+| Property | Description | Type |
+| ---      | ---         | ---  |
+| name | Filename, without extension, of the template in the templates folder. | string |
+| title | Title of the template, translatable. | string |
+| postTypes | List of post types that can use this custom template. | array |
+
+## templateParts
+
+Additional metadata for template parts defined in the parts folder.
+
+Type: `object`.
+
+| Property | Description | Type |
+| ---      | ---         | ---  |
+| name | Filename, without extension, of the template in the parts folder. | string |
+| title | Title of the template, translatable. | string |
+| area | The area the template part is used for. Block variations for `header` and `footer` values exist and will be used when the area is set to one of those. | string |
+
+## Patterns
+
+An array of pattern slugs to be registered from the Pattern Directory.
+Type: `array`.
diff --git a/docs/toc.json b/docs/toc.json
index 91017ce69643c3..0d4689811b26ec 100644
--- a/docs/toc.json
+++ b/docs/toc.json
@@ -21,44 +21,29 @@
 				]
 			},
 			{ "docs/getting-started/quick-start-guide.md": [] },
+			{ "docs/getting-started/tutorial.md": [] },
 			{
-				"docs/getting-started/create-block/README.md": [
-					{
-						"docs/getting-started/create-block/wp-plugin.md": []
-					},
-					{
-						"docs/getting-started/create-block/block-anatomy.md": []
-					},
-					{
-						"docs/getting-started/create-block/attributes.md": []
-					},
+				"docs/getting-started/fundamentals/README.md": [
 					{
-						"docs/getting-started/create-block/block-code.md": []
+						"docs/getting-started/fundamentals/file-structure-of-a-block.md": []
 					},
 					{
-						"docs/getting-started/create-block/author-experience.md": []
+						"docs/getting-started/fundamentals/block-json.md": []
 					},
 					{
-						"docs/getting-started/create-block/finishing.md": []
+						"docs/getting-started/fundamentals/registration-of-a-block.md": []
 					},
 					{
-						"docs/getting-started/create-block/submitting-to-block-directory.md": []
-					}
-				]
-			},
-			{
-				"docs/getting-started/fundamentals/README.md": [
-					{
-						"docs/getting-started/fundamentals/file-structure-of-a-block.md": []
+						"docs/getting-started/fundamentals/block-wrapper.md": []
 					},
 					{
-						"docs/getting-started/fundamentals/block-json.md": []
+						"docs/getting-started/fundamentals/block-in-the-editor.md": []
 					},
 					{
-						"docs/getting-started/fundamentals/registration-of-a-block.md": []
+						"docs/getting-started/fundamentals/markup-representation-block.md": []
 					},
 					{
-						"docs/getting-started/fundamentals/block-wrapper.md": []
+						"docs/getting-started/fundamentals/static-dynamic-rendering.md": []
 					},
 					{
 						"docs/getting-started/fundamentals/javascript-in-the-block-editor.md": []
@@ -74,30 +59,12 @@
 			{ "docs/how-to-guides/accessibility.md": [] },
 			{
 				"docs/how-to-guides/block-tutorial/README.md": [
-					{
-						"docs/how-to-guides/block-tutorial/writing-your-first-block-type.md": []
-					},
 					{
 						"docs/how-to-guides/block-tutorial/applying-styles-with-stylesheets.md": []
 					},
-					{
-						"docs/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields.md": []
-					},
-					{
-						"docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md": []
-					},
-					{
-						"docs/how-to-guides/block-tutorial/block-supports-in-static-blocks.md": []
-					},
 					{
 						"docs/how-to-guides/block-tutorial/creating-dynamic-blocks.md": []
 					},
-					{
-						"docs/how-to-guides/block-tutorial/block-supports-in-dynamic-blocks.md": []
-					},
-					{
-						"docs/how-to-guides/block-tutorial/generate-blocks-with-wp-cli.md": []
-					},
 					{
 						"docs/how-to-guides/block-tutorial/nested-blocks-inner-blocks.md": []
 					},
@@ -132,30 +99,28 @@
 					}
 				]
 			},
-			{ "docs/how-to-guides/curating-the-editor-experience.md": [] },
-			{ "docs/how-to-guides/enqueueing-assets-in-the-editor.md": [] },
-			{ "docs/how-to-guides/feature-flags.md": [] },
-			{ "docs/how-to-guides/format-api.md": [] },
 			{
-				"docs/how-to-guides/javascript/README.md": [
+				"docs/how-to-guides/curating-the-editor-experience/README.md": [
 					{
-						"docs/how-to-guides/javascript/plugins-background.md": []
+						"docs/how-to-guides/curating-the-editor-experience/block-locking.md": []
 					},
 					{
-						"docs/how-to-guides/javascript/loading-javascript.md": []
+						"docs/how-to-guides/curating-the-editor-experience/patterns.md": []
 					},
 					{
-						"docs/how-to-guides/javascript/extending-the-block-editor.md": []
+						"docs/how-to-guides/curating-the-editor-experience/theme-json.md": []
 					},
-					{ "docs/how-to-guides/javascript/troubleshooting.md": [] },
 					{
-						"docs/how-to-guides/javascript/versions-and-building.md": []
+						"docs/how-to-guides/curating-the-editor-experience/filters-and-hooks.md": []
 					},
-					{ "docs/how-to-guides/javascript/scope-your-code.md": [] },
-					{ "docs/how-to-guides/javascript/js-build-setup.md": [] },
-					{ "docs/how-to-guides/javascript/esnext-js.md": [] }
+					{
+						"docs/how-to-guides/curating-the-editor-experience/disable-editor-functionality.md": []
+					}
 				]
 			},
+			{ "docs/how-to-guides/enqueueing-assets-in-the-editor.md": [] },
+			{ "docs/how-to-guides/feature-flags.md": [] },
+			{ "docs/how-to-guides/format-api.md": [] },
 			{ "docs/how-to-guides/internationalization.md": [] },
 			{
 				"docs/how-to-guides/metabox.md": []
@@ -165,7 +130,9 @@
 			{ "docs/how-to-guides/propagating-updates.md": [] },
 			{
 				"docs/how-to-guides/themes/README.md": [
-					{ "docs/how-to-guides/themes/theme-json.md": [] },
+					{
+						"docs/how-to-guides/themes/global-settings-and-styles.md": []
+					},
 					{ "docs/how-to-guides/themes/theme-support.md": [] }
 				]
 			},
@@ -235,6 +202,38 @@
 					}
 				]
 			},
+			{
+				"docs/reference-guides/interactivity-api/README.md": [
+					{
+						"docs/reference-guides/interactivity-api/core-concepts/README.md": [
+							{
+								"docs/reference-guides/interactivity-api/core-concepts/the-reactive-and-declarative-mindset.md": []
+							},
+							{
+								"docs/reference-guides/interactivity-api/core-concepts/undestanding-global-state-local-context-and-derived-state.md": []
+							},
+							{
+								"docs/reference-guides/interactivity-api/core-concepts/server-side-rendering.md": []
+							},
+							{
+								"docs/reference-guides/interactivity-api/core-concepts/using-typescript.md": []
+							}
+						]
+					},
+					{
+						"docs/reference-guides/interactivity-api/iapi-quick-start-guide.md": []
+					},
+					{
+						"docs/reference-guides/interactivity-api/api-reference.md": []
+					},
+					{
+						"docs/reference-guides/interactivity-api/iapi-about.md": []
+					},
+					{
+						"docs/reference-guides/interactivity-api/iapi-faq.md": []
+					}
+				]
+			},
 			{
 				"docs/reference-guides/slotfills/README.md": [
 					{
@@ -273,6 +272,9 @@
 					{
 						"docs/reference-guides/theme-json-reference/theme-json-v1.md": []
 					},
+					{
+						"docs/reference-guides/theme-json-reference/theme-json-v2.md": []
+					},
 					{
 						"docs/reference-guides/theme-json-reference/theme-json-migrations.md": []
 					},
diff --git a/docs/tool/manifest.js b/docs/tool/manifest.js
index ced8866edd5a4e..3c1f0fee2090ff 100644
--- a/docs/tool/manifest.js
+++ b/docs/tool/manifest.js
@@ -1,3 +1,5 @@
+/* eslint no-console: [ 'error', { allow: [ 'error' ] } ] */
+
 /**
  * External dependencies
  */
@@ -8,13 +10,14 @@ const { join } = require( 'path' );
 
 const baseRepoUrl = '..';
 const componentPaths = glob( 'packages/components/src/*/**/README.md', {
-	// Don't expose documentation for mobile only and G2 components just yet.
+	// Don't expose documentation for mobile only and private components just yet.
 	ignore: [
 		'**/src/mobile/**/README.md',
 		'packages/components/src/theme/README.md',
 		'packages/components/src/view/README.md',
 		'packages/components/src/dropdown-menu-v2/README.md',
-		'packages/components/src/progress-bar/README.md',
+		'packages/components/src/tabs/README.md',
+		'packages/components/src/custom-select-control-v2/README.md',
 	],
 } );
 const packagePaths = glob( 'packages/*/package.json' )
@@ -122,6 +125,29 @@ function generateRootManifestFromTOCItems( items, parent = null ) {
 			pageItems = pageItems.concat( getPackageManifest( packagePaths ) );
 		}
 	} );
+
+	const slugs = pageItems.map( ( { slug } ) => slug );
+	const duplicatedSlugs = slugs.filter(
+		( item, idx ) => idx !== slugs.indexOf( item )
+	);
+
+	const FgRed = '\x1b[31m';
+	const Reset = '\x1b[0m';
+
+	if ( duplicatedSlugs.length > 0 ) {
+		console.error(
+			`${ FgRed } The handbook generation setup creates pages based on their slug, so each slug has to be unique. ${ Reset }`
+		);
+		console.error(
+			`${ FgRed } More info at https://github.com/WordPress/gutenberg/issues/61206#issuecomment-2085361154 ${ Reset }\n`
+		);
+		throw new Error(
+			`${ FgRed } Duplicate slugs found in the TOC: ${ duplicatedSlugs.join(
+				', '
+			) } ${ Reset }`
+		);
+	}
+
 	return pageItems;
 }
 
diff --git a/gutenberg.php b/gutenberg.php
index 2526aac3770548..c1ee01c8415522 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -3,9 +3,9 @@
  * Plugin Name: Gutenberg
  * Plugin URI: https://github.com/WordPress/gutenberg
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
- * Requires at least: 6.3
- * Requires PHP: 7.0
- * Version: 17.2.0-rc.1
+ * Requires at least: 6.5
+ * Requires PHP: 7.2
+ * Version: 19.5.0
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
@@ -15,6 +15,8 @@
 ### BEGIN AUTO-GENERATED DEFINES
 defined( 'GUTENBERG_DEVELOPMENT_MODE' ) or define( 'GUTENBERG_DEVELOPMENT_MODE', true );
 ### END AUTO-GENERATED DEFINES
+defined( 'GUTENBERG_MINIMUM_WP_VERSION' ) or define( 'GUTENBERG_MINIMUM_WP_VERSION', '6.5' );
+
 
 gutenberg_pre_init();
 
@@ -26,7 +28,7 @@
 function gutenberg_wordpress_version_notice() {
 	echo '<div class="error"><p>';
 	/* translators: %s: Minimum required version */
-	printf( __( 'Gutenberg requires WordPress %s or later to function properly. Please upgrade WordPress before activating Gutenberg.', 'gutenberg' ), '5.9' );
+	printf( __( 'Gutenberg requires WordPress %s or later to function properly. Please upgrade WordPress before activating Gutenberg.', 'gutenberg' ), GUTENBERG_MINIMUM_WP_VERSION );
 	echo '</p></div>';
 
 	deactivate_plugins( array( 'gutenberg/gutenberg.php' ) );
@@ -47,6 +49,9 @@ function gutenberg_build_files_notice() {
  * Verify that we can initialize the Gutenberg editor , then load it.
  *
  * @since 1.5.0
+ *
+ * @global string $wp_version             The WordPress version string.
+ *
  */
 function gutenberg_pre_init() {
 	global $wp_version;
@@ -64,7 +69,7 @@ function gutenberg_pre_init() {
 	// Compare against major release versions (X.Y) rather than minor (X.Y.Z)
 	// unless a minor release is the actual minimum requirement. WordPress reports
 	// X.Y for its major releases.
-	if ( version_compare( $version, '5.9', '<' ) ) {
+	if ( version_compare( $version, GUTENBERG_MINIMUM_WP_VERSION, '<' ) ) {
 		add_action( 'admin_notices', 'gutenberg_wordpress_version_notice' );
 		return;
 	}
diff --git a/lib/README.md b/lib/README.md
index 0e8c4263a49910..9ee05efccffe98 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -6,7 +6,7 @@ The Gutenberg plugin is continuously enhancing existing features and creating ne
 
 During a WordPress release, new features, bugfixes and other changes are "synced" between the Gutenberg plugin and WordPress Core. Consistent naming and directory structures make this process easier by preventing naming conflicts and compartmentalizing release-specific code.
 
-The following documentation is intended to act as a guide only. If you're unsure about naming or where to place new PHP files, please don't hesitate to ping other contributors on Github or ask in the #core-editor channel on [WordPress Slack](https://make.wordpress.org/chat/).
+The following documentation is intended to act as a guide only. If you're unsure about naming or where to place new PHP files, please don't hesitate to ping other contributors on GitHub or ask in the #core-editor channel on [WordPress Slack](https://make.wordpress.org/chat/).
 
 ## File structure
 
@@ -60,6 +60,8 @@ function wp_get_something_useful() {
 
 Plugin code that is stable and expected to be merged "as-is" into Core in the near future can use the `wp_` prefix for functions or a `WP_` prefix for classes.
 
+#### Avoiding duplicate declarations
+
 When doing so, care must be taken to ensure that no duplicate declarations to create functions or classes exist between Gutenberg and WordPress core code. A quick codebase search will also help you know if your new names are unique.
 
 Wrapping such code in `class_exists()` and `function_exists()` checks should be used to ensure it executes in the plugin up until it is merged to Core, or when running the plugin on older versions of WordPress.
@@ -86,20 +88,27 @@ Or for classes:
  * @package WordPress
  * @since 6.3.0
  */
-if ( class_exists( 'WP_A_Stable_Class' ) ) {
-	return;
+if ( ! class_exists( 'WP_A_Stable_Class' ) ) {
+	// Do not invert this pattern with an early `return`.
+	// See below for details...
+	class WP_A_Stable_Class { ... }
 }
+```
 
+Wrapping code in `class_exists()` and `function_exists()` is usually inappropriate for evergreen code, or any plugin code that we expect to undergo constant change between WordPress releases, because it would prevent the latest versions of the code from being used. For example, the statement `class_exists( 'WP_Theme_JSON' )` would return `true` because the class already exists in Core.
+
+The `return` operator is considered an anti-pattern in the context provided below because it [does not halt](https://www.php.net/manual/en/function.return.php#112515) the parsing of the PHP script and can cause [unexpected side effects](https://github.com/WordPress/gutenberg/pull/58429#issuecomment-1916670097):
+```php
 /**
- * A very stable class that does something.
+ * ANTI-PATTERN
+ * DO NOT COPY!
  *
- * @since 6.3.0
  */
-class WP_A_Stable_Class { ... }
+if ( class_exists( 'WP_A_Stable_Class' ) ) {
+	return; // do not do this.
+}
 ```
 
-Wrapping code in `class_exists()` and `function_exists()` is usually inappropriate for evergreen code, or any plugin code that we expect to undergo constant change between WordPress releases, because it would prevent the latest versions of the code from being used. For example, the statement `class_exists( 'WP_Theme_JSON' )` would return `true` because the class already exists in Core.
-
 When to use which prefix is a judgement call, but the general rule is that if you're unsure, use the `gutenberg` prefix because it will less likely give rise to naming conflicts.
 
 #### When not to use plugin-specific prefixes/suffixes
@@ -176,18 +185,19 @@ add_action( 'init', 'wp_register_navigation_cpt' );
 ```
 
 ### Requiring files in lib/load.php
+
 Should the load order allow it, try to group imports according to WordPress release, then feature. It'll help everyone to quickly recognise the files that belong to specific WordPress releases.
 
 Existing comments in `lib/load.php` should act as a guide.
 
 ## When to sync changes to Gutenberg PHP with Core and vice versa
 
-If you've changed or added PHP files to the Gutenberg plugin, you'll need to confirm whether the changes are to be synced to WordPress Core, and therefore featured in the next release of WordPress.
+On open Gutenberg PRs, changes to certain files are flagged as requiring syncing (also called "backporting") to WordPress Core, for example, PHP files in `/lib` and PHP unit tests.
 
-The Gutenberg Github pull request in question should be labeled with the `Needs PHP backport` label if the changes are to be synced to Core.
+The CI checks will indicate whether you need to create a Core PR. If you do, you'll need to create a corresponding markdown file and place it within the appropriate release subdirectory in the [Core backport changelog](https://github.com/WordPress/gutenberg/tree/trunk/backport-changelog/).
 
-If so, it is recommended to create a [new Trac ticket](https://core.trac.wordpress.org/newticket) and submit a pull request to the [WordPress Core Github repository](https://github.com/WordPress/wordpress-develop) soon after your pull request is merged.
+For more information, please refer to the [Core backport changelog documentation](https://github.com/WordPress/gutenberg/tree/trunk/backport-changelog/readme.md).
 
-So too, if you've made changes in WordPress Core to code that also lives in the Gutenberg plugin, these changes will need to be synced (often called "backporting") to Gutenberg. The relevant Gutenberg Github pull request should be labeled with the `Backport from WordPress Core` label.
+So too, if you've made changes in WordPress Core to code that also lives in the Gutenberg plugin, these changes will need to be synced to Gutenberg. The relevant Gutenberg GitHub pull request should be labeled with the `Backport from WordPress Core` label.
 
 If you're unsure, you can always ask for help in the #core-editor channel in [WordPress Slack](https://make.wordpress.org/chat/).
diff --git a/lib/block-editor-settings.php b/lib/block-editor-settings.php
index 53668e114e04cb..defd7cd391b16b 100644
--- a/lib/block-editor-settings.php
+++ b/lib/block-editor-settings.php
@@ -58,7 +58,7 @@ function gutenberg_get_block_editor_settings( $settings ) {
 		 * entered by users does not break other global styles.
 		 */
 		$global_styles[] = array(
-			'css'            => gutenberg_get_global_styles_custom_css(),
+			'css'            => gutenberg_get_global_stylesheet( array( 'custom-css' ) ),
 			'__unstableType' => 'user',
 			'isGlobalStyles' => true,
 		);
diff --git a/lib/block-supports/background.php b/lib/block-supports/background.php
index b4779b1a150e46..a1d99133c1fc09 100644
--- a/lib/block-supports/background.php
+++ b/lib/block-supports/background.php
@@ -46,29 +46,27 @@ function gutenberg_render_background_support( $block_content, $block ) {
 
 	if (
 		! $has_background_image_support ||
-		wp_should_skip_block_supports_serialization( $block_type, 'background', 'backgroundImage' )
+		wp_should_skip_block_supports_serialization( $block_type, 'background', 'backgroundImage' ) ||
+		! isset( $block_attributes['style']['background'] )
 	) {
 		return $block_content;
 	}
 
-	$background_image_source = $block_attributes['style']['background']['backgroundImage']['source'] ?? null;
-	$background_image_url    = $block_attributes['style']['background']['backgroundImage']['url'] ?? null;
-	$background_size         = $block_attributes['style']['background']['backgroundSize'] ?? 'cover';
-
-	$background_block_styles = array();
-
-	if (
-		'file' === $background_image_source &&
-		$background_image_url
-	) {
-		// Set file based background URL.
-		// TODO: In a follow-up, similar logic could be added to inject a featured image url.
-		$background_block_styles['backgroundImage']['url'] = $background_image_url;
-		// Only output the background size when an image url is set.
-		$background_block_styles['backgroundSize'] = $background_size;
+	$background_styles                         = array();
+	$background_styles['backgroundImage']      = $block_attributes['style']['background']['backgroundImage'] ?? null;
+	$background_styles['backgroundSize']       = $block_attributes['style']['background']['backgroundSize'] ?? null;
+	$background_styles['backgroundPosition']   = $block_attributes['style']['background']['backgroundPosition'] ?? null;
+	$background_styles['backgroundRepeat']     = $block_attributes['style']['background']['backgroundRepeat'] ?? null;
+	$background_styles['backgroundAttachment'] = $block_attributes['style']['background']['backgroundAttachment'] ?? null;
+	if ( ! empty( $background_styles['backgroundImage'] ) ) {
+		$background_styles['backgroundSize'] = $background_styles['backgroundSize'] ?? 'cover';
+		// If the background size is set to `contain` and no position is set, set the position to `center`.
+		if ( 'contain' === $background_styles['backgroundSize'] && ! $background_styles['backgroundPosition'] ) {
+			$background_styles['backgroundPosition'] = '50% 50%';
+		}
 	}
 
-	$styles = gutenberg_style_engine_get_styles( array( 'background' => $background_block_styles ) );
+	$styles = gutenberg_style_engine_get_styles( array( 'background' => $background_styles ) );
 
 	if ( ! empty( $styles['css'] ) ) {
 		// Inject background styles to the first element, presuming it's the wrapper, if it exists.
@@ -87,6 +85,7 @@ function gutenberg_render_background_support( $block_content, $block ) {
 
 			$updated_style .= $styles['css'];
 			$tags->set_attribute( 'style', $updated_style );
+			$tags->add_class( 'has-background' );
 		}
 
 		return $tags->get_updated_html();
@@ -103,4 +102,7 @@ function gutenberg_render_background_support( $block_content, $block ) {
 	)
 );
 
+if ( function_exists( 'wp_render_background_support' ) ) {
+	remove_filter( 'render_block', 'wp_render_background_support' );
+}
 add_filter( 'render_block', 'gutenberg_render_background_support', 10, 2 );
diff --git a/lib/block-supports/behaviors.php b/lib/block-supports/behaviors.php
deleted file mode 100644
index 383f4b4e6f9279..00000000000000
--- a/lib/block-supports/behaviors.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * Behaviors block support flag.
- *
- * This file will NOT be backported to Core. It exists to provide a
- * migration path for theme.json files that used the deprecated "behaviors".
- * This file will be removed from Gutenberg in version 17.0.0.
- *
- * @package gutenberg
- */
-
-/**
- * Registers the behaviors block attribute for block types that support it.
- * And add the needed hooks to add those behaviors.
- *
- * @param WP_Block_Type $block_type Block Type.
- */
-function gutenberg_register_behaviors_support( $block_type ) {
-	$has_behaviors_support = block_has_support( $block_type, array( 'behaviors' ), false );
-	if ( ! $has_behaviors_support ) {
-		return;
-	}
-
-	if ( ! $block_type->attributes ) {
-		$block_type->attributes = array();
-	}
-
-	$block_type->attributes['behaviors'] = array(
-		'type' => 'object',
-	);
-
-	// If it supports the lightbox behavior, add the hook to that block.
-	// In the future, this should be a loop with all the behaviors.
-	$has_lightbox_support = block_has_support( $block_type, array( 'behaviors', 'lightbox' ), false );
-	if ( $has_lightbox_support ) {
-		// Use priority 15 to run this hook after other hooks/plugins.
-		// They could use the `render_block_{$this->name}` filter to modify the markup.
-		add_filter( 'render_block_' . $block_type->name, 'gutenberg_render_behaviors_support_lightbox', 15, 2 );
-	}
-}
-
-/**
- * Add the directives and layout needed for the lightbox behavior.
- *
- * @param  string $block_content Rendered block content.
- * @param  array  $block         Block object.
- * @return string                Filtered block content.
- */
-function gutenberg_render_behaviors_support_lightbox( $block_content, $block ) {
-
-	// We've deprecated the lightbox implementation via behaviors.
-	// While we may continue to explore behaviors in the future, the lightbox
-	// logic seems very specific to the image and will likely never be a part
-	// of behaviors, even in the future. With that in mind, we've rewritten the lightbox
-	// to be a feature of the image block and will also soon remove the block_supports.
-	// *Note: This logic for generating the lightbox markup has been duplicated and moved
-	// to the image block's index.php.*
-	// See https://github.com/WordPress/gutenberg/issues/53403.
-	_deprecated_function( 'gutenberg_render_behaviors_support_lightbox', 'Gutenberg 17.0.0', '' );
-
-	$link_destination = isset( $block['attrs']['linkDestination'] ) ? $block['attrs']['linkDestination'] : 'none';
-	// Get the lightbox setting from the block attributes.
-	if ( isset( $block['attrs']['behaviors']['lightbox'] ) ) {
-		$lightbox_settings = $block['attrs']['behaviors']['lightbox'];
-		// If the lightbox setting is not set in the block attributes, get it from the theme.json file.
-	} else {
-		$theme_data = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()->get_data();
-		if ( isset( $theme_data['behaviors']['blocks'][ $block['blockName'] ]['lightbox'] ) ) {
-			$lightbox_settings = $theme_data['behaviors']['blocks'][ $block['blockName'] ]['lightbox'];
-		} else {
-			$lightbox_settings = null;
-		}
-	}
-
-	if ( isset( $lightbox_settings['enabled'] ) && false === $lightbox_settings['enabled'] ) {
-		return $block_content;
-	}
-
-	if ( ! $lightbox_settings || 'none' !== $link_destination ) {
-		return $block_content;
-	}
-
-	$processor = new WP_HTML_Tag_Processor( $block_content );
-
-	$aria_label = __( 'Enlarge image', 'gutenberg' );
-
-	$processor->next_tag( 'img' );
-	$alt_attribute = $processor->get_attribute( 'alt' );
-
-	// An empty alt attribute `alt=""` is valid for decorative images.
-	if ( is_string( $alt_attribute ) ) {
-		$alt_attribute = trim( $alt_attribute );
-	}
-
-	// It only makes sense to append the alt text to the button aria-label when the alt text is non-empty.
-	if ( $alt_attribute ) {
-		/* translators: %s: Image alt text. */
-		$aria_label = sprintf( __( 'Enlarge image: %s', 'gutenberg' ), $alt_attribute );
-	}
-
-	// If we don't set a default, it won't work if Lightbox is set to enabled by default.
-	$lightbox_animation = 'zoom';
-	if ( isset( $lightbox_settings['animation'] ) && '' !== $lightbox_settings['animation'] ) {
-		$lightbox_animation = $lightbox_settings['animation'];
-	}
-
-	// Note: We want to store the `src` in the context so we
-	// can set it dynamically when the lightbox is opened.
-	if ( isset( $block['attrs']['id'] ) ) {
-		$img_uploaded_src = wp_get_attachment_url( $block['attrs']['id'] );
-		$img_metadata     = wp_get_attachment_metadata( $block['attrs']['id'] );
-		$img_width        = $img_metadata['width'] ?? 'none';
-		$img_height       = $img_metadata['height'] ?? 'none';
-	} else {
-		$img_uploaded_src = $processor->get_attribute( 'src' );
-		$img_width        = 'none';
-		$img_height       = 'none';
-	}
-
-	if ( isset( $block['attrs']['scale'] ) ) {
-		$scale_attr = $block['attrs']['scale'];
-	} else {
-		$scale_attr = false;
-	}
-
-	$w = new WP_HTML_Tag_Processor( $block_content );
-	$w->next_tag( 'figure' );
-	$w->add_class( 'wp-lightbox-container' );
-	$w->set_attribute( 'data-wp-interactive', true );
-
-	$w->set_attribute(
-		'data-wp-context',
-		sprintf(
-			'{ "core":
-				{ "image":
-					{   "imageLoaded": false,
-						"initialized": false,
-						"lightboxEnabled": false,
-						"hideAnimationEnabled": false,
-						"preloadInitialized": false,
-						"lightboxAnimation": "%s",
-						"imageUploadedSrc": "%s",
-						"imageCurrentSrc": "",
-						"targetWidth": "%s",
-						"targetHeight": "%s",
-						"scaleAttr": "%s"
-					}
-				}
-			}',
-			$lightbox_animation,
-			$img_uploaded_src,
-			$img_width,
-			$img_height,
-			$scale_attr
-		)
-	);
-	$w->next_tag( 'img' );
-	$w->set_attribute( 'data-wp-init', 'effects.core.image.setCurrentSrc' );
-	$w->set_attribute( 'data-wp-on--load', 'actions.core.image.handleLoad' );
-	$w->set_attribute( 'data-wp-effect', 'effects.core.image.setButtonStyles' );
-	$body_content = $w->get_updated_html();
-
-	// Wrap the image in the body content with a button.
-	$img = null;
-	preg_match( '/<img[^>]+>/', $body_content, $img );
-
-	$button =
-		$img[0]
-		. '<button
-			type="button"
-			aria-haspopup="dialog"
-			aria-label="' . esc_attr( $aria_label ) . '"
-			data-wp-on--click="actions.core.image.showLightbox"
-			data-wp-style--width="context.core.image.imageButtonWidth"
-			data-wp-style--height="context.core.image.imageButtonHeight"
-			data-wp-style--left="context.core.image.imageButtonLeft"
-			data-wp-style--top="context.core.image.imageButtonTop"
-		></button>';
-
-	$body_content = preg_replace( '/<img[^>]+>/', $button, $body_content );
-
-	// We need both a responsive image and an enlarged image to animate
-	// the zoom seamlessly on slow internet connections; the responsive
-	// image is a copy of the one in the body, which animates immediately
-	// as the lightbox is opened, while the enlarged one is a full-sized
-	// version that will likely still be loading as the animation begins.
-	$m = new WP_HTML_Tag_Processor( $block_content );
-	$m->next_tag( 'figure' );
-	$m->add_class( 'responsive-image' );
-	$m->next_tag( 'img' );
-	// We want to set the 'src' attribute to an empty string in the responsive image
-	// because otherwise, as of this writing, the wp_filter_content_tags() function in
-	// WordPress will automatically add a 'srcset' attribute to the image, which will at
-	// times cause the incorrectly sized image to be loaded in the lightbox on Firefox.
-	// Because of this, we bind the 'src' attribute explicitly the current src to reliably
-	// use the exact same image as in the content when the lightbox is first opened while
-	// we wait for the larger image to load.
-	$m->set_attribute( 'src', '' );
-	$m->set_attribute( 'data-wp-bind--src', 'context.core.image.imageCurrentSrc' );
-	$m->set_attribute( 'data-wp-style--object-fit', 'selectors.core.image.lightboxObjectFit' );
-	$initial_image_content = $m->get_updated_html();
-
-	$q = new WP_HTML_Tag_Processor( $block_content );
-	$q->next_tag( 'figure' );
-	$q->add_class( 'enlarged-image' );
-	$q->next_tag( 'img' );
-
-	// We set the 'src' attribute to an empty string to prevent the browser from loading the image
-	// on initial page load, then bind the attribute to a selector that returns the full-sized image src when
-	// the lightbox is opened. We could use 'loading=lazy' in combination with the 'hidden' attribute to
-	// accomplish the same behavior, but that approach breaks progressive loading of the image in Safari
-	// and Chrome (see https://github.com/WordPress/gutenberg/pull/52765#issuecomment-1674008151). Until that
-	// is resolved, manually setting the 'src' seems to be the best solution to load the large image on demand.
-	$q->set_attribute( 'src', '' );
-	$q->set_attribute( 'data-wp-bind--src', 'selectors.core.image.enlargedImgSrc' );
-	$q->set_attribute( 'data-wp-style--object-fit', 'selectors.core.image.lightboxObjectFit' );
-	$enlarged_image_content = $q->get_updated_html();
-
-	$background_color = esc_attr( wp_get_global_styles( array( 'color', 'background' ) ) );
-
-	$close_button_icon  = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="15" height="15" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg>';
-	$close_button_color = esc_attr( wp_get_global_styles( array( 'color', 'text' ) ) );
-	$dialog_label       = esc_attr__( 'Enlarged image', 'gutenberg' );
-	$close_button_label = esc_attr__( 'Close', 'gutenberg' );
-
-	$lightbox_html = <<<HTML
-        <div data-wp-body="" class="wp-lightbox-overlay $lightbox_animation"
-            data-wp-bind--role="selectors.core.image.roleAttribute"
-            aria-label="$dialog_label"
-            data-wp-class--initialized="context.core.image.initialized"
-            data-wp-class--active="context.core.image.lightboxEnabled"
-			data-wp-class--hideAnimationEnabled="context.core.image.hideAnimationEnabled"
-            data-wp-bind--aria-hidden="!context.core.image.lightboxEnabled"
-            data-wp-bind--aria-modal="context.core.image.lightboxEnabled"
-            data-wp-effect="effects.core.image.initLightbox"
-            data-wp-on--keydown="actions.core.image.handleKeydown"
-            data-wp-on--touchstart="actions.core.image.handleTouchStart"
-            data-wp-on--touchmove="actions.core.image.handleTouchMove"
-            data-wp-on--touchend="actions.core.image.handleTouchEnd"
-            data-wp-on--click="actions.core.image.hideLightbox"
-            >
-                <button type="button" aria-label="$close_button_label" style="fill: $close_button_color" class="close-button" data-wp-on--click="actions.core.image.hideLightbox">
-                    $close_button_icon
-                </button>
-                <div class="lightbox-image-container">$initial_image_content</div>
-				<div class="lightbox-image-container">$enlarged_image_content</div>
-                <div class="scrim" style="background-color: $background_color"></div>
-        </div>
-HTML;
-
-	return str_replace( '</figure>', $lightbox_html . '</figure>', $body_content );
-}
-
-// Register the block support.
-WP_Block_Supports::get_instance()->register(
-	'behaviors',
-	array(
-		'register_attribute' => 'gutenberg_register_behaviors_support',
-	)
-);
diff --git a/lib/block-supports/block-style-variations.php b/lib/block-supports/block-style-variations.php
new file mode 100644
index 00000000000000..3942fed24b98a8
--- /dev/null
+++ b/lib/block-supports/block-style-variations.php
@@ -0,0 +1,317 @@
+<?php
+/**
+ * Block support to enable per-section styling of block types via
+ * block style variations.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Generate block style variation instance name.
+ *
+ * @since 6.6.0
+ *
+ * @deprecated 6.7.0
+ *
+ * @param array  $block     Block object.
+ * @param string $variation Slug for the block style variation.
+ *
+ * @return string The unique variation name.
+ */
+function gutenberg_create_block_style_variation_instance_name( $block, $variation ) {
+	_deprecated_function( __FUNCTION__, '6.7.0' );
+	return $variation . '--' . md5( serialize( $block ) );
+}
+
+/**
+ * Determines the block style variation names within a CSS class string.
+ *
+ * @since 6.6.0
+ *
+ * @param string $class_string CSS class string to look for a variation in.
+ *
+ * @return array|null The block style variation name if found.
+ */
+function gutenberg_get_block_style_variation_name_from_class( $class_string ) {
+	if ( ! is_string( $class_string ) ) {
+		return null;
+	}
+
+	preg_match_all( '/\bis-style-(?!default)(\S+)\b/', $class_string, $matches );
+	return $matches[1] ?? null;
+}
+
+/**
+ * Recursively resolves any `ref` values within a block style variation's data.
+ *
+ * @since 6.6.0
+ *
+ * @param array $variation_data Reference to the variation data being processed.
+ * @param array $theme_json     Theme.json data to retrieve referenced values from.
+ */
+function gutenberg_resolve_block_style_variation_ref_values( &$variation_data, $theme_json ) {
+	foreach ( $variation_data as $key => &$value ) {
+		// Only need to potentially process arrays.
+		if ( is_array( $value ) ) {
+			// If ref value is set, attempt to find its matching value and update it.
+			if ( array_key_exists( 'ref', $value ) ) {
+				// Clean up any invalid ref value.
+				if ( empty( $value['ref'] ) || ! is_string( $value['ref'] ) ) {
+					unset( $variation_data[ $key ] );
+				}
+
+				$value_path = explode( '.', $value['ref'] ?? '' );
+				$ref_value  = _wp_array_get( $theme_json, $value_path );
+
+				// Only update the current value if the referenced path matched a value.
+				if ( null === $ref_value ) {
+					unset( $variation_data[ $key ] );
+				} else {
+					$value = $ref_value;
+				}
+			} else {
+				// Recursively look for ref instances.
+				gutenberg_resolve_block_style_variation_ref_values( $value, $theme_json );
+			}
+		}
+	}
+}
+
+/**
+ * Render the block style variation's styles.
+ *
+ * In the case of nested blocks with variations applied, we want the parent
+ * variation's styles to be rendered before their descendants. This solves the
+ * issue of a block type being styled in both the parent and descendant: we want
+ * the descendant style to take priority, and this is done by loading it after,
+ * in the DOM order. This is why the variation stylesheet generation is in a
+ * different filter.
+ *
+ * @since 6.6.0
+ *
+ * @param array $parsed_block The parsed block.
+ *
+ * @return array The parsed block with block style variation classname added.
+ */
+function gutenberg_render_block_style_variation_support_styles( $parsed_block ) {
+	$classes    = $parsed_block['attrs']['className'] ?? null;
+	$variations = gutenberg_get_block_style_variation_name_from_class( $classes );
+
+	if ( ! $variations ) {
+		return $parsed_block;
+	}
+
+	$tree       = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
+	$theme_json = $tree->get_raw_data();
+
+	// Only the first block style variation with data is supported.
+	$variation_data = array();
+	foreach ( $variations as $variation ) {
+		$variation_data = $theme_json['styles']['blocks'][ $parsed_block['blockName'] ]['variations'][ $variation ] ?? array();
+
+		if ( ! empty( $variation_data ) ) {
+			break;
+		}
+	}
+
+	if ( empty( $variation_data ) ) {
+		return $parsed_block;
+	}
+
+	// Recursively resolve any ref values with the appropriate value within the
+	// theme_json data.
+	gutenberg_resolve_block_style_variation_ref_values( $variation_data, $theme_json );
+
+	$variation_instance = wp_unique_id( $variation . '--' );
+	$class_name         = "is-style-$variation_instance";
+	$updated_class_name = $parsed_block['attrs']['className'] . " $class_name";
+
+	/*
+	 * Even though block style variations are effectively theme.json partials,
+	 * they can't be processed completely as though they are.
+	 *
+	 * Block styles support custom selectors to direct specific types of styles
+	 * to inner elements. For example, borders on Image block's get applied to
+	 * the inner `img` element rather than the wrapping `figure`.
+	 *
+	 * The following relocates the "root" block style variation styles to
+	 * under an appropriate blocks property to leverage the preexisting style
+	 * generation for simple block style variations. This way they get the
+	 * custom selectors they need.
+	 *
+	 * The inner elements and block styles for the variation itself are
+	 * still included at the top level but scoped by the variation's selector
+	 * when the stylesheet is generated.
+	 */
+	$elements_data = $variation_data['elements'] ?? array();
+	$blocks_data   = $variation_data['blocks'] ?? array();
+	unset( $variation_data['elements'] );
+	unset( $variation_data['blocks'] );
+
+	_wp_array_set(
+		$blocks_data,
+		array( $parsed_block['blockName'], 'variations', $variation_instance ),
+		$variation_data
+	);
+
+	$config = array(
+		'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+		'styles'  => array(
+			'elements' => $elements_data,
+			'blocks'   => $blocks_data,
+		),
+	);
+
+	// Turn off filter that excludes block nodes. They are needed here for the variation's inner block types.
+	if ( ! is_admin() ) {
+		remove_filter( 'wp_theme_json_get_style_nodes', 'wp_filter_out_block_nodes' );
+	}
+
+	// Temporarily prevent variation instance from being sanitized while processing theme.json.
+	$styles_registry = WP_Block_Styles_Registry::get_instance();
+	$styles_registry->register( $parsed_block['blockName'], array( 'name' => $variation_instance ) );
+
+	$variation_theme_json = new WP_Theme_JSON_Gutenberg( $config, 'blocks' );
+	$variation_styles     = $variation_theme_json->get_stylesheet(
+		array( 'styles' ),
+		array( 'custom' ),
+		array(
+			'include_block_style_variations' => true,
+			'skip_root_layout_styles'        => true,
+			'scope'                          => ".$class_name",
+		)
+	);
+
+	// Clean up temporary block style now instance styles have been processed.
+	$styles_registry->unregister( $parsed_block['blockName'], $variation_instance );
+
+	// Restore filter that excludes block nodes.
+	if ( ! is_admin() ) {
+		add_filter( 'wp_theme_json_get_style_nodes', 'wp_filter_out_block_nodes' );
+	}
+
+	if ( empty( $variation_styles ) ) {
+		return $parsed_block;
+	}
+
+	wp_register_style( 'block-style-variation-styles', false, array( 'wp-block-library', 'global-styles' ) );
+	wp_add_inline_style( 'block-style-variation-styles', $variation_styles );
+
+	/*
+	 * Add variation instance class name to block's className string so it can
+	 * be enforced in the block markup via render_block filter.
+	 */
+	_wp_array_set( $parsed_block, array( 'attrs', 'className' ), $updated_class_name );
+
+	return $parsed_block;
+}
+
+/**
+ * Ensure the variation block support class name generated and added to
+ * block attributes in the `render_block_data` filter gets applied to the
+ * block's markup.
+ *
+ * @see gutenberg_render_block_style_variation_support_styles
+ *
+ * @since 6.6.0
+ *
+ * @param  string $block_content Rendered block content.
+ * @param  array  $block         Block object.
+ *
+ * @return string                Filtered block content.
+ */
+function gutenberg_render_block_style_variation_class_name( $block_content, $block ) {
+	if ( ! $block_content || empty( $block['attrs']['className'] ) ) {
+		return $block_content;
+	}
+
+	/*
+	 * Matches a class prefixed by `is-style`, followed by the
+	 * variation slug, then `--`, and finally an instance number.
+	 */
+	preg_match( '/\bis-style-(\S+?--\d+)\b/', $block['attrs']['className'], $matches );
+
+	if ( empty( $matches ) ) {
+		return $block_content;
+	}
+
+	$tags = new WP_HTML_Tag_Processor( $block_content );
+
+	if ( $tags->next_tag() ) {
+		/*
+		 * Ensure the variation instance class name set in the
+		 * `render_block_data` filter is applied in markup.
+		 * See `gutenberg_render_block_style_variation_support_styles`.
+		 */
+		$tags->add_class( $matches[0] );
+	}
+
+	return $tags->get_updated_html();
+}
+
+/**
+ * Enqueues styles for block style variations.
+ *
+ * @since 6.6.0
+ */
+function gutenberg_enqueue_block_style_variation_styles() {
+	wp_enqueue_style( 'block-style-variation-styles' );
+}
+
+// Register the block support.
+WP_Block_Supports::get_instance()->register( 'block-style-variation', array() );
+
+// Remove core filters and action.
+if ( function_exists( 'wp_render_block_style_variation_support_styles' ) ) {
+	remove_filter( 'render_block_data', 'wp_render_block_style_variation_support_styles' );
+}
+if ( function_exists( 'wp_render_block_style_variation_class_name' ) ) {
+	remove_filter( 'render_block', 'wp_render_block_style_variation_class_name' );
+}
+if ( function_exists( 'wp_enqueue_block_style_variation_styles' ) ) {
+	remove_action( 'wp_enqueue_scripts', 'wp_enqueue_block_style_variation_styles' );
+}
+
+// Add Gutenberg filters and action.
+add_filter( 'render_block_data', 'gutenberg_render_block_style_variation_support_styles', 10, 2 );
+add_filter( 'render_block', 'gutenberg_render_block_style_variation_class_name', 10, 2 );
+add_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_block_style_variation_styles', 1 );
+
+/**
+ * Registers block style variations read in from theme.json partials.
+ *
+ * @access private
+ *
+ * @param array $variations Shared block style variations.
+ */
+function gutenberg_register_block_style_variations_from_theme_json_partials( $variations ) {
+	if ( empty( $variations ) ) {
+		return;
+	}
+
+	$registry = WP_Block_Styles_Registry::get_instance();
+
+	foreach ( $variations as $variation ) {
+		if ( empty( $variation['blockTypes'] ) || empty( $variation['styles'] ) ) {
+			continue;
+		}
+
+		$variation_name  = $variation['slug'] ?? _wp_to_kebab_case( $variation['title'] );
+		$variation_label = $variation['title'] ?? $variation_name;
+
+		foreach ( $variation['blockTypes'] as $block_type ) {
+			$registered_styles = $registry->get_registered_styles_for_block( $block_type );
+
+			// Register block style variation if it hasn't already been registered.
+			if ( ! array_key_exists( $variation_name, $registered_styles ) ) {
+				register_block_style(
+					$block_type,
+					array(
+						'name'  => $variation_name,
+						'label' => $variation_label,
+					)
+				);
+			}
+		}
+	}
+}
diff --git a/lib/block-supports/dimensions.php b/lib/block-supports/dimensions.php
index 1ef43133c2cdfb..1980faba278175 100644
--- a/lib/block-supports/dimensions.php
+++ b/lib/block-supports/dimensions.php
@@ -74,6 +74,83 @@ function gutenberg_apply_dimensions_support( $block_type, $block_attributes ) {
 	return $attributes;
 }
 
+/**
+ * Renders server-side dimensions styles to the block wrapper.
+ * This block support uses the `render_block` hook to ensure that
+ * it is also applied to non-server-rendered blocks.
+ *
+ * @param  string $block_content Rendered block content.
+ * @param  array  $block         Block object.
+ * @return string                Filtered block content.
+ */
+function gutenberg_render_dimensions_support( $block_content, $block ) {
+	$block_type               = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+	$block_attributes         = ( isset( $block['attrs'] ) && is_array( $block['attrs'] ) ) ? $block['attrs'] : array();
+	$has_aspect_ratio_support = block_has_support( $block_type, array( 'dimensions', 'aspectRatio' ), false );
+
+	if (
+		! $has_aspect_ratio_support ||
+		wp_should_skip_block_supports_serialization( $block_type, 'dimensions', 'aspectRatio' )
+	) {
+		return $block_content;
+	}
+
+	$dimensions_block_styles                = array();
+	$dimensions_block_styles['aspectRatio'] = $block_attributes['style']['dimensions']['aspectRatio'] ?? null;
+
+	// To ensure the aspect ratio does not get overridden by `minHeight` unset any existing rule.
+	if (
+		isset( $dimensions_block_styles['aspectRatio'] )
+	) {
+		$dimensions_block_styles['minHeight'] = 'unset';
+	} elseif (
+		isset( $block_attributes['style']['dimensions']['minHeight'] ) ||
+		isset( $block_attributes['minHeight'] )
+	) {
+		$dimensions_block_styles['aspectRatio'] = 'unset';
+	}
+
+	$styles = gutenberg_style_engine_get_styles( array( 'dimensions' => $dimensions_block_styles ) );
+
+	if ( ! empty( $styles['css'] ) ) {
+		// Inject dimensions styles to the first element, presuming it's the wrapper, if it exists.
+		$tags = new WP_HTML_Tag_Processor( $block_content );
+
+		if ( $tags->next_tag() ) {
+			$existing_style = $tags->get_attribute( 'style' );
+			$updated_style  = '';
+
+			if ( ! empty( $existing_style ) ) {
+				$updated_style = $existing_style;
+				if ( ! str_ends_with( $existing_style, ';' ) ) {
+					$updated_style .= ';';
+				}
+			}
+
+			$updated_style .= $styles['css'];
+			$tags->set_attribute( 'style', $updated_style );
+
+			if ( ! empty( $styles['classnames'] ) ) {
+				foreach ( explode( ' ', $styles['classnames'] ) as $class_name ) {
+					if (
+						str_contains( $class_name, 'aspect-ratio' ) &&
+						! isset( $block_attributes['style']['dimensions']['aspectRatio'] )
+					) {
+						continue;
+					}
+					$tags->add_class( $class_name );
+				}
+			}
+		}
+
+		return $tags->get_updated_html();
+	}
+
+	return $block_content;
+}
+
+add_filter( 'render_block', 'gutenberg_render_dimensions_support', 10, 2 );
+
 // Register the block support.
 WP_Block_Supports::get_instance()->register(
 	'dimensions',
diff --git a/lib/block-supports/duotone.php b/lib/block-supports/duotone.php
index f6e2b479f350fc..98791fe05c1096 100644
--- a/lib/block-supports/duotone.php
+++ b/lib/block-supports/duotone.php
@@ -28,8 +28,10 @@
 }
 if ( class_exists( 'WP_Duotone' ) ) {
 	remove_filter( 'render_block', array( 'WP_Duotone', 'render_duotone_support' ) );
+	remove_filter( 'render_block_core/image', array( 'WP_Duotone', 'restore_image_outer_container' ) );
 }
 add_filter( 'render_block', array( 'WP_Duotone_Gutenberg', 'render_duotone_support' ), 10, 2 );
+add_filter( 'render_block_core/image', array( 'WP_Duotone_Gutenberg', 'restore_image_outer_container' ), 10, 1 );
 
 // Enqueue styles.
 // Block styles (core-block-supports-inline-css) before the style engine (gutenberg_enqueue_stored_styles).
diff --git a/lib/block-supports/elements.php b/lib/block-supports/elements.php
index 85dbd7d39797c1..35a41270a19800 100644
--- a/lib/block-supports/elements.php
+++ b/lib/block-supports/elements.php
@@ -8,20 +8,32 @@
 /**
  * Update the block content with elements class names.
  *
+ * @deprecated 6.6.0 Use `gutenberg_render_elements_class_name` instead.
+ *
  * @param  string $block_content Rendered block content.
- * @param  array  $block         Block object.
  * @return string                Filtered block content.
  */
-function gutenberg_render_elements_support( $block_content, $block ) {
-	if ( ! $block_content || ! isset( $block['attrs']['style']['elements'] ) ) {
-		return $block_content;
-	}
+function gutenberg_render_elements_support( $block_content ) {
+	_deprecated_function( __FUNCTION__, '6.6.0', 'gutenberg_render_elements_class_name' );
+	return $block_content;
+}
 
-	$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+/**
+ * Determines whether an elements class name should be added to the block.
+ *
+ * @param  array $block   Block object.
+ * @param  array $options Per element type options e.g. whether to skip serialization.
+ *
+ * @return boolean        Whether the block needs an elements class name.
+ */
+function gutenberg_should_add_elements_class_name( $block, $options ) {
+	if ( ! isset( $block['attrs']['style']['elements'] ) ) {
+		return false;
+	}
 
 	$element_color_properties = array(
 		'button'  => array(
-			'skip'  => wp_should_skip_block_supports_serialization( $block_type, 'color', 'button' ),
+			'skip'  => $options['button']['skip'] ?? false,
 			'paths' => array(
 				array( 'button', 'color', 'text' ),
 				array( 'button', 'color', 'background' ),
@@ -29,14 +41,14 @@ function gutenberg_render_elements_support( $block_content, $block ) {
 			),
 		),
 		'link'    => array(
-			'skip'  => wp_should_skip_block_supports_serialization( $block_type, 'color', 'link' ),
+			'skip'  => $options['link']['skip'] ?? false,
 			'paths' => array(
 				array( 'link', 'color', 'text' ),
 				array( 'link', ':hover', 'color', 'text' ),
 			),
 		),
 		'heading' => array(
-			'skip'  => wp_should_skip_block_supports_serialization( $block_type, 'color', 'heading' ),
+			'skip'  => $options['heading']['skip'] ?? false,
 			'paths' => array(
 				array( 'heading', 'color', 'text' ),
 				array( 'heading', 'color', 'background' ),
@@ -63,14 +75,6 @@ function gutenberg_render_elements_support( $block_content, $block ) {
 		),
 	);
 
-	$skip_all_element_color_serialization = $element_color_properties['button']['skip'] &&
-		$element_color_properties['link']['skip'] &&
-		$element_color_properties['heading']['skip'];
-
-	if ( $skip_all_element_color_serialization ) {
-		return $block_content;
-	}
-
 	$elements_style_attributes = $block['attrs']['style']['elements'];
 
 	foreach ( $element_color_properties as $element_config ) {
@@ -80,47 +84,51 @@ function gutenberg_render_elements_support( $block_content, $block ) {
 
 		foreach ( $element_config['paths'] as $path ) {
 			if ( null !== _wp_array_get( $elements_style_attributes, $path, null ) ) {
-				/*
-				 * It only takes a single custom attribute to require that the custom
-				 * class name be added to the block, so once one is found there's no
-				 * need to continue looking for others.
-				 *
-				 * As is done with the layout hook, this code assumes that the block
-				 * contains a single wrapper and that it's the first element in the
-				 * rendered output. That first element, if it exists, gets the class.
-				 */
-				$tags = new WP_HTML_Tag_Processor( $block_content );
-				if ( $tags->next_tag() ) {
-					$tags->add_class( wp_get_elements_class_name( $block ) );
-				}
-
-				return $tags->get_updated_html();
+				return true;
 			}
 		}
 	}
 
-	// If no custom attributes were found then there's nothing to modify.
-	return $block_content;
+	return false;
 }
 
 /**
- * Render the elements stylesheet.
+ * Render the elements stylesheet and adds elements class name to block as required.
  *
  * In the case of nested blocks we want the parent element styles to be rendered before their descendants.
  * This solves the issue of an element (e.g.: link color) being styled in both the parent and a descendant:
  * we want the descendant style to take priority, and this is done by loading it after, in DOM order.
  *
- * @param string|null $pre_render   The pre-rendered content. Default null.
- * @param array       $block The block being rendered.
+ * @since 6.6.0 Element block support class and styles are generated via the `render_block_data` filter instead of `pre_render_block`
  *
- * @return null
+ * @param array $parsed_block The parsed block.
+ *
+ * @return array The same parsed block with elements classname added if appropriate.
  */
-function gutenberg_render_elements_support_styles( $pre_render, $block ) {
-	$block_type           = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
-	$element_block_styles = isset( $block['attrs']['style']['elements'] ) ? $block['attrs']['style']['elements'] : null;
+function gutenberg_render_elements_support_styles( $parsed_block ) {
+	/*
+	 * The generation of element styles and classname were moved to the
+	 * `render_block_data` filter in 6.6.0 to avoid filtered attributes
+	 * breaking the application of the elements CSS class.
+	 *
+	 * @see https://github.com/WordPress/gutenberg/pull/59535.
+	 *
+	 * The change in filter means, the argument types for this function
+	 * have changed and require deprecating.
+	 */
+	if ( is_string( $parsed_block ) ) {
+		_deprecated_argument(
+			__FUNCTION__,
+			'6.6.0',
+			__( 'Use as a `pre_render_block` filter is deprecated. Use with `render_block_data` instead.', 'gutenberg' )
+		);
+	}
+
+	$block_type           = WP_Block_Type_Registry::get_instance()->get_registered( $parsed_block['blockName'] );
+	$element_block_styles = $parsed_block['attrs']['style']['elements'] ?? null;
 
 	if ( ! $element_block_styles ) {
-		return null;
+		return $parsed_block;
 	}
 
 	$skip_link_color_serialization         = wp_should_skip_block_supports_serialization( $block_type, 'color', 'link' );
@@ -131,19 +139,34 @@ function gutenberg_render_elements_support_styles( $pre_render, $block ) {
 		$skip_button_color_serialization;
 
 	if ( $skips_all_element_color_serialization ) {
-		return null;
+		return $parsed_block;
 	}
 
-	$class_name = wp_get_elements_class_name( $block );
+	$options = array(
+		'button'  => array( 'skip' => $skip_button_color_serialization ),
+		'link'    => array( 'skip' => $skip_link_color_serialization ),
+		'heading' => array( 'skip' => $skip_heading_color_serialization ),
+	);
+
+	if ( ! gutenberg_should_add_elements_class_name( $parsed_block, $options ) ) {
+		return $parsed_block;
+	}
 
+	$class_name         = wp_get_elements_class_name( $parsed_block );
+	$updated_class_name = isset( $parsed_block['attrs']['className'] ) ? $parsed_block['attrs']['className'] . " $class_name" : $class_name;
+
+	_wp_array_set( $parsed_block, array( 'attrs', 'className' ), $updated_class_name );
+
+	// Generate element styles based on selector and store in style engine for enqueuing.
 	$element_types = array(
 		'button'  => array(
 			'selector' => ".$class_name .wp-element-button, .$class_name .wp-block-button__link",
 			'skip'     => $skip_button_color_serialization,
 		),
 		'link'    => array(
-			'selector'       => ".$class_name a",
-			'hover_selector' => ".$class_name a:hover",
+			// :where(:not) matches theme.json selector.
+			'selector'       => ".$class_name a:where(:not(.wp-element-button))",
+			'hover_selector' => ".$class_name a:where(:not(.wp-element-button)):hover",
 			'skip'           => $skip_link_color_serialization,
 		),
 		'heading' => array(
@@ -199,11 +222,45 @@ function gutenberg_render_elements_support_styles( $pre_render, $block ) {
 		}
 	}
 
-	return null;
+	return $parsed_block;
 }
 
-// Remove WordPress core filters to avoid rendering duplicate elements stylesheet & attaching classes twice.
+/**
+ * Ensure the elements block support class name generated, and added to
+ * block attributes, in the `render_block_data` filter gets applied to the
+ * block's markup.
+ *
+ * @see gutenberg_render_elements_support_styles
+ *
+ * @param  string $block_content Rendered block content.
+ * @param  array  $block         Block object.
+ *
+ * @return string                Filtered block content.
+ */
+function gutenberg_render_elements_class_name( $block_content, $block ) {
+	$class_string = $block['attrs']['className'] ?? '';
+	preg_match( '/\bwp-elements-\S+\b/', $class_string, $matches );
+
+	if ( empty( $matches ) ) {
+		return $block_content;
+	}
+
+	$tags = new WP_HTML_Tag_Processor( $block_content );
+
+	if ( $tags->next_tag() ) {
+		$tags->add_class( $matches[0] );
+	}
+
+	return $tags->get_updated_html();
+}
+
+// Remove deprecated WordPress core filters.
 remove_filter( 'render_block', 'wp_render_elements_support', 10, 2 );
 remove_filter( 'pre_render_block', 'wp_render_elements_support_styles', 10, 2 );
-add_filter( 'render_block', 'gutenberg_render_elements_support', 10, 2 );
-add_filter( 'pre_render_block', 'gutenberg_render_elements_support_styles', 10, 2 );
+
+// Remove WordPress core filters to avoid rendering duplicate elements stylesheet & attaching classes twice.
+remove_filter( 'render_block', 'wp_render_elements_class_name', 10, 2 );
+remove_filter( 'render_block_data', 'wp_render_elements_support_styles', 10, 1 );
+
+add_filter( 'render_block', 'gutenberg_render_elements_class_name', 10, 2 );
+add_filter( 'render_block_data', 'gutenberg_render_elements_support_styles', 10, 1 );
diff --git a/lib/block-supports/layout.php b/lib/block-supports/layout.php
index db02364b707901..ddbd1917c30547 100644
--- a/lib/block-supports/layout.php
+++ b/lib/block-supports/layout.php
@@ -47,13 +47,13 @@ function gutenberg_get_layout_definitions() {
 			),
 			'spacingStyles' => array(
 				array(
-					'selector' => ' > :first-child:first-child',
+					'selector' => ' > :first-child',
 					'rules'    => array(
 						'margin-block-start' => '0',
 					),
 				),
 				array(
-					'selector' => ' > :last-child:last-child',
+					'selector' => ' > :last-child',
 					'rules'    => array(
 						'margin-block-end' => '0',
 					),
@@ -112,13 +112,13 @@ function gutenberg_get_layout_definitions() {
 			),
 			'spacingStyles' => array(
 				array(
-					'selector' => ' > :first-child:first-child',
+					'selector' => ' > :first-child',
 					'rules'    => array(
 						'margin-block-start' => '0',
 					),
 				),
 				array(
-					'selector' => ' > :last-child:last-child',
+					'selector' => ' > :last-child',
 					'rules'    => array(
 						'margin-block-end' => '0',
 					),
@@ -146,7 +146,7 @@ function gutenberg_get_layout_definitions() {
 					),
 				),
 				array(
-					'selector' => ' > *',
+					'selector' => ' > :is(*, div)', // :is(*, div) instead of just * increases the specificity by 001.
 					'rules'    => array(
 						'margin' => '0',
 					),
@@ -168,7 +168,7 @@ function gutenberg_get_layout_definitions() {
 			'displayMode'   => 'grid',
 			'baseStyles'    => array(
 				array(
-					'selector' => ' > *',
+					'selector' => ' > :is(*, div)',  // :is(*, div) instead of just * increases the specificity by 001.
 					'rules'    => array(
 						'margin' => '0',
 					),
@@ -248,7 +248,7 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
 						),
 					),
 					array(
-						'selector'     => "$selector$selector > * + *",
+						'selector'     => "$selector > * + *",
 						'declarations' => array(
 							'margin-block-start' => $gap_value,
 							'margin-block-end'   => '0',
@@ -292,32 +292,40 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
 					'declarations' => array( 'max-width' => 'none' ),
 				)
 			);
+		}
 
-			if ( isset( $block_spacing ) ) {
-				$block_spacing_values = gutenberg_style_engine_get_styles(
-					array(
-						'spacing' => $block_spacing,
-					)
-				);
+		if ( isset( $block_spacing ) ) {
+			$block_spacing_values = gutenberg_style_engine_get_styles(
+				array(
+					'spacing' => $block_spacing,
+				)
+			);
 
-				/*
-				 * Handle negative margins for alignfull children of blocks with custom padding set.
-				 * They're added separately because padding might only be set on one side.
-				 */
-				if ( isset( $block_spacing_values['declarations']['padding-right'] ) ) {
-					$padding_right   = $block_spacing_values['declarations']['padding-right'];
-					$layout_styles[] = array(
-						'selector'     => "$selector > .alignfull",
-						'declarations' => array( 'margin-right' => "calc($padding_right * -1)" ),
-					);
+			/*
+			 * Handle negative margins for alignfull children of blocks with custom padding set.
+			 * They're added separately because padding might only be set on one side.
+			 */
+			if ( isset( $block_spacing_values['declarations']['padding-right'] ) ) {
+				$padding_right = $block_spacing_values['declarations']['padding-right'];
+				// Add unit if 0.
+				if ( '0' === $padding_right ) {
+					$padding_right = '0px';
 				}
-				if ( isset( $block_spacing_values['declarations']['padding-left'] ) ) {
-					$padding_left    = $block_spacing_values['declarations']['padding-left'];
-					$layout_styles[] = array(
-						'selector'     => "$selector > .alignfull",
-						'declarations' => array( 'margin-left' => "calc($padding_left * -1)" ),
-					);
+				$layout_styles[] = array(
+					'selector'     => "$selector > .alignfull",
+					'declarations' => array( 'margin-right' => "calc($padding_right * -1)" ),
+				);
+			}
+			if ( isset( $block_spacing_values['declarations']['padding-left'] ) ) {
+				$padding_left = $block_spacing_values['declarations']['padding-left'];
+				// Add unit if 0.
+				if ( '0' === $padding_left ) {
+					$padding_left = '0px';
 				}
+				$layout_styles[] = array(
+					'selector'     => "$selector > .alignfull",
+					'declarations' => array( 'margin-left' => "calc($padding_left * -1)" ),
+				);
 			}
 		}
 
@@ -357,7 +365,7 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
 						),
 					),
 					array(
-						'selector'     => "$selector$selector > * + *",
+						'selector'     => "$selector > * + *",
 						'declarations' => array(
 							'margin-block-start' => $gap_value,
 							'margin-block-end'   => '0',
@@ -466,20 +474,8 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
 			}
 		}
 	} elseif ( 'grid' === $layout_type ) {
-		if ( ! empty( $layout['columnCount'] ) ) {
-			$layout_styles[] = array(
-				'selector'     => $selector,
-				'declarations' => array( 'grid-template-columns' => 'repeat(' . $layout['columnCount'] . ', minmax(0, 1fr))' ),
-			);
-		} else {
-			$minimum_column_width = ! empty( $layout['minimumColumnWidth'] ) ? $layout['minimumColumnWidth'] : '12rem';
-
-			$layout_styles[] = array(
-				'selector'     => $selector,
-				'declarations' => array( 'grid-template-columns' => 'repeat(auto-fill, minmax(min(' . $minimum_column_width . ', 100%), 1fr))' ),
-			);
-		}
-
+		// Deal with block gap first so it can be used for responsive computation.
+		$responsive_gap_value = '1.2rem';
 		if ( $has_block_gap_support && isset( $gap_value ) ) {
 			$combined_gap_value = '';
 			$gap_sides          = is_array( $gap_value ) ? array( 'top', 'left' ) : array( 'top' );
@@ -497,14 +493,53 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
 				}
 				$combined_gap_value .= "$process_value ";
 			}
-			$gap_value = trim( $combined_gap_value );
+			$gap_value            = trim( $combined_gap_value );
+			$responsive_gap_value = $gap_value;
+		}
 
-			if ( null !== $gap_value && ! $should_skip_gap_serialization ) {
+		if ( ! empty( $layout['columnCount'] ) && ! empty( $layout['minimumColumnWidth'] ) ) {
+			$max_value       = 'max(' . $layout['minimumColumnWidth'] . ', (100% - (' . $responsive_gap_value . ' * (' . $layout['columnCount'] . ' - 1))) /' . $layout['columnCount'] . ')';
+			$layout_styles[] = array(
+				'selector'     => $selector,
+				'declarations' => array(
+					'grid-template-columns' => 'repeat(auto-fill, minmax(' . $max_value . ', 1fr))',
+					'container-type'        => 'inline-size',
+				),
+			);
+			if ( ! empty( $layout['rowCount'] ) ) {
 				$layout_styles[] = array(
 					'selector'     => $selector,
-					'declarations' => array( 'gap' => $gap_value ),
+					'declarations' => array( 'grid-template-rows' => 'repeat(' . $layout['rowCount'] . ', minmax(1rem, auto))' ),
+				);
+			}
+		} elseif ( ! empty( $layout['columnCount'] ) ) {
+			$layout_styles[] = array(
+				'selector'     => $selector,
+				'declarations' => array( 'grid-template-columns' => 'repeat(' . $layout['columnCount'] . ', minmax(0, 1fr))' ),
+			);
+			if ( ! empty( $layout['rowCount'] ) ) {
+				$layout_styles[] = array(
+					'selector'     => $selector,
+					'declarations' => array( 'grid-template-rows' => 'repeat(' . $layout['rowCount'] . ', minmax(1rem, auto))' ),
 				);
 			}
+		} else {
+			$minimum_column_width = ! empty( $layout['minimumColumnWidth'] ) ? $layout['minimumColumnWidth'] : '12rem';
+
+			$layout_styles[] = array(
+				'selector'     => $selector,
+				'declarations' => array(
+					'grid-template-columns' => 'repeat(auto-fill, minmax(min(' . $minimum_column_width . ', 100%), 1fr))',
+					'container-type'        => 'inline-size',
+				),
+			);
+		}
+
+		if ( $has_block_gap_support && null !== $gap_value && ! $should_skip_gap_serialization ) {
+			$layout_styles[] = array(
+				'selector'     => $selector,
+				'declarations' => array( 'gap' => $gap_value ),
+			);
 		}
 	}
 
@@ -557,37 +592,123 @@ function gutenberg_incremental_id_per_prefix( $prefix = '' ) {
 function gutenberg_render_layout_support_flag( $block_content, $block ) {
 	$block_type            = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
 	$block_supports_layout = block_has_support( $block_type, array( 'layout' ), false ) || block_has_support( $block_type, array( '__experimentalLayout' ), false );
-	$layout_from_parent    = $block['attrs']['style']['layout']['selfStretch'] ?? null;
+	// If there is any value in style -> layout, the block has a child layout.
+	$child_layout = $block['attrs']['style']['layout'] ?? null;
 
-	if ( ! $block_supports_layout && ! $layout_from_parent ) {
+	if ( ! $block_supports_layout && ! $child_layout ) {
 		return $block_content;
 	}
 
 	$outer_class_names = array();
 
-	if ( 'fixed' === $layout_from_parent || 'fill' === $layout_from_parent ) {
-		$container_content_class = wp_unique_id( 'wp-container-content-' );
+	// Child layout specific logic.
+	if ( $child_layout ) {
+		$container_content_class   = wp_unique_prefixed_id( 'wp-container-content-' );
+		$child_layout_declarations = array();
+		$child_layout_styles       = array();
 
-		$child_layout_styles = array();
+		$self_stretch = isset( $block['attrs']['style']['layout']['selfStretch'] ) ? $block['attrs']['style']['layout']['selfStretch'] : null;
+
+		if ( 'fixed' === $self_stretch && isset( $block['attrs']['style']['layout']['flexSize'] ) ) {
+			$child_layout_declarations['flex-basis'] = $block['attrs']['style']['layout']['flexSize'];
+			$child_layout_declarations['box-sizing'] = 'border-box';
+		} elseif ( 'fill' === $self_stretch ) {
+			$child_layout_declarations['flex-grow'] = '1';
+		}
+
+		$column_start = isset( $block['attrs']['style']['layout']['columnStart'] ) ? $block['attrs']['style']['layout']['columnStart'] : null;
+		$column_span  = isset( $block['attrs']['style']['layout']['columnSpan'] ) ? $block['attrs']['style']['layout']['columnSpan'] : null;
+		if ( $column_start && $column_span ) {
+			$child_layout_declarations['grid-column'] = "$column_start / span $column_span";
+		} elseif ( $column_start ) {
+			$child_layout_declarations['grid-column'] = "$column_start";
+		} elseif ( $column_span ) {
+			$child_layout_declarations['grid-column'] = "span $column_span";
+		}
+
+		$row_start = isset( $block['attrs']['style']['layout']['rowStart'] ) ? $block['attrs']['style']['layout']['rowStart'] : null;
+		$row_span  = isset( $block['attrs']['style']['layout']['rowSpan'] ) ? $block['attrs']['style']['layout']['rowSpan'] : null;
+		if ( $row_start && $row_span ) {
+			$child_layout_declarations['grid-row'] = "$row_start / span $row_span";
+		} elseif ( $row_start ) {
+			$child_layout_declarations['grid-row'] = "$row_start";
+		} elseif ( $row_span ) {
+			$child_layout_declarations['grid-row'] = "span $row_span";
+		}
+
+		$child_layout_styles[] = array(
+			'selector'     => ".$container_content_class",
+			'declarations' => $child_layout_declarations,
+		);
+
+		$minimum_column_width = isset( $block['parentLayout']['minimumColumnWidth'] ) ? $block['parentLayout']['minimumColumnWidth'] : null;
+		$column_count         = isset( $block['parentLayout']['columnCount'] ) ? $block['parentLayout']['columnCount'] : null;
+
+		/*
+		 * If columnSpan or columnStart is set, and the parent grid is responsive, i.e. if it has a minimumColumnWidth set,
+		 * the columnSpan should be removed once the grid is smaller than the span, and columnStart should be removed
+		 * once the grid has less columns than the start.
+		 * If there's a minimumColumnWidth, the grid is responsive. But if the minimumColumnWidth value wasn't changed, it won't be set.
+		 * In that case, if columnCount doesn't exist, we can assume that the grid is responsive.
+		 */
+		if ( ( $column_span || $column_start ) && ( $minimum_column_width || ! $column_count ) ) {
+			$column_span_number  = floatval( $column_span );
+			$column_start_number = floatval( $column_start );
+			$parent_column_width = $minimum_column_width ? $minimum_column_width : '12rem';
+			$parent_column_value = floatval( $parent_column_width );
+			$parent_column_unit  = explode( $parent_column_value, $parent_column_width );
+
+			$num_cols_to_break_at = 2;
+			if ( $column_span_number && $column_start_number ) {
+				$num_cols_to_break_at = $column_start_number + $column_span_number - 1;
+			} elseif ( $column_span_number ) {
+				$num_cols_to_break_at = $column_span_number;
+			} else {
+				$num_cols_to_break_at = $column_start_number;
+			}
+
+			/*
+			 * If there is no unit, the width has somehow been mangled so we reset both unit and value
+			 * to defaults.
+			 * Additionally, the unit should be one of px, rem or em, so that also needs to be checked.
+			 */
+			if ( count( $parent_column_unit ) <= 1 ) {
+				$parent_column_unit  = 'rem';
+				$parent_column_value = 12;
+			} else {
+				$parent_column_unit = $parent_column_unit[1];
+
+				if ( ! in_array( $parent_column_unit, array( 'px', 'rem', 'em' ), true ) ) {
+					$parent_column_unit = 'rem';
+				}
+			}
+
+			/*
+			 * A default gap value is used for this computation because custom gap values may not be
+			 * viable to use in the computation of the container query value.
+			 */
+			$default_gap_value             = 'px' === $parent_column_unit ? 24 : 1.5;
+			$container_query_value         = $num_cols_to_break_at * $parent_column_value + ( $num_cols_to_break_at - 1 ) * $default_gap_value;
+			$minimum_container_query_value = $parent_column_value * 2 + $default_gap_value - 1;
+			$container_query_value         = max( $container_query_value, $minimum_container_query_value ) . $parent_column_unit;
+			// If a span is set we want to preserve it as long as possible, otherwise we just reset the value.
+			$grid_column_value = $column_span && $column_span > 1 ? '1/-1' : 'auto';
 
-		if ( 'fixed' === $layout_from_parent && isset( $block['attrs']['style']['layout']['flexSize'] ) ) {
-			$child_layout_styles[] = array(
-				'selector'     => ".$container_content_class",
-				'declarations' => array(
-					'flex-basis' => $block['attrs']['style']['layout']['flexSize'],
-					'box-sizing' => 'border-box',
-				),
-			);
-		} elseif ( 'fill' === $layout_from_parent ) {
 			$child_layout_styles[] = array(
+				'rules_group'  => "@container (max-width: $container_query_value )",
 				'selector'     => ".$container_content_class",
 				'declarations' => array(
-					'flex-grow' => '1',
+					'grid-column' => $grid_column_value,
+					'grid-row'    => 'auto',
 				),
 			);
 		}
 
-		gutenberg_style_engine_get_stylesheet_from_css_rules(
+		/*
+		 * Add to the style engine store to enqueue and render layout styles.
+		 * Return styles here just to check if any exist.
+		 */
+		$child_css = gutenberg_style_engine_get_stylesheet_from_css_rules(
 			$child_layout_styles,
 			array(
 				'context'  => 'block-supports',
@@ -595,7 +716,9 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 			)
 		);
 
-		$outer_class_names[] = $container_content_class;
+		if ( $child_css ) {
+			$outer_class_names[] = $container_content_class;
+		}
 	}
 
 	// Prep the processor for modifying the block output.
@@ -639,7 +762,7 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 	* for features like the enhanced pagination of the Query block.
 	*/
 	$container_class = gutenberg_incremental_id_per_prefix(
-		'wp-container-' . sanitize_title( $block['blockName'] ) . '-layout-'
+		'wp-container-' . sanitize_title( $block['blockName'] ) . '-is-layout-'
 	);
 
 	// Set the correct layout type for blocks using legacy content width.
@@ -716,7 +839,7 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 		$has_block_gap_support = isset( $block_gap );
 
 		$style = gutenberg_get_layout_style(
-			".$container_class.$container_class",
+			".$container_class",
 			$used_layout,
 			$has_block_gap_support,
 			$gap_value,
@@ -743,7 +866,7 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 		}
 	}
 
-	/**
+	/*
 	 * Attempts to refer to the inner-block wrapping element by its class attribute.
 	 *
 	 * When examining a block's inner content, if a block has inner blocks, then
@@ -781,7 +904,7 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 	 * are still present in the wrapper as they are in this example. Frequently, additional classes
 	 * will also be present; rarely should classes be removed.
 	 *
-	 * @TODO: Find a better way to match the first inner block. If it's possible to identify where the
+	 * @todo Find a better way to match the first inner block. If it's possible to identify where the
 	 *        first inner block starts, then it will be possible to find the last tag before it starts
 	 *        and then that tag, if an opening tag, can be solidly identified as a wrapping element.
 	 *        Can some unique value or class or ID be added to the inner blocks when they process
@@ -820,7 +943,7 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 		}
 
 		$class_attribute = $processor->get_attribute( 'class' );
-		if ( is_string( $class_attribute ) && false !== strpos( $class_attribute, $inner_block_wrapper_classes ) ) {
+		if ( is_string( $class_attribute ) && str_contains( $class_attribute, $inner_block_wrapper_classes ) ) {
 			break;
 		}
 	} while ( $processor->next_tag() );
@@ -833,6 +956,25 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 	return $processor->get_updated_html();
 }
 
+/*
+ * Add a `render_block_data` filter to fetch the parent block layout data.
+ */
+add_filter(
+	'render_block_data',
+	function ( $parsed_block, $source_block, $parent_block ) {
+		/*
+		 * Check if the parent block exists and if it has a layout attribute.
+		 * If it does, add the parent layout to the parsed block.
+		 */
+		if ( $parent_block && isset( $parent_block->parsed_block['attrs']['layout'] ) ) {
+			$parsed_block['parentLayout'] = $parent_block->parsed_block['attrs']['layout'];
+		}
+		return $parsed_block;
+	},
+	10,
+	3
+);
+
 // Register the block support. (overrides core one).
 WP_Block_Supports::get_instance()->register(
 	'layout',
@@ -869,7 +1011,7 @@ function gutenberg_restore_group_inner_container( $block_content, $block ) {
 		return $block_content;
 	}
 
-	/**
+	/*
 	 * This filter runs after the layout classnames have been added to the block, so they
 	 * have to be removed from the outer wrapper and then added to the inner.
 	*/
@@ -877,27 +1019,10 @@ function gutenberg_restore_group_inner_container( $block_content, $block ) {
 	$processor      = new WP_HTML_Tag_Processor( $block_content );
 
 	if ( $processor->next_tag( array( 'class_name' => 'wp-block-group' ) ) ) {
-		if ( method_exists( $processor, 'class_list' ) ) {
-			foreach ( $processor->class_list() as $class_name ) {
-				if ( str_contains( $class_name, 'layout' ) ) {
-					array_push( $layout_classes, $class_name );
-					$processor->remove_class( $class_name );
-				}
-			}
-		} else {
-			/**
-			* The class_list method was only added in 6.4 so this needs a temporary fallback.
-			* This fallback should be removed when the minimum supported version is 6.4.
-			*/
-			$classes = $processor->get_attribute( 'class' );
-			if ( $classes ) {
-				$classes = explode( ' ', $classes );
-				foreach ( $classes as $class_name ) {
-					if ( str_contains( $class_name, 'layout' ) ) {
-						array_push( $layout_classes, $class_name );
-						$processor->remove_class( $class_name );
-					}
-				}
+		foreach ( $processor->class_list() as $class_name ) {
+			if ( str_contains( $class_name, 'layout' ) ) {
+				array_push( $layout_classes, $class_name );
+				$processor->remove_class( $class_name );
 			}
 		}
 	}
diff --git a/lib/block-supports/pattern.php b/lib/block-supports/pattern.php
deleted file mode 100644
index a783135c793e3f..00000000000000
--- a/lib/block-supports/pattern.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Pattern block support flag.
- *
- * @package gutenberg
- */
-
-$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-	/**
-	 * Registers the overrides context for block types that support it.
-	 *
-	 * @param WP_Block_Type $block_type Block Type.
-	 */
-	function gutenberg_register_pattern_support( $block_type ) {
-		$pattern_support = property_exists( $block_type, 'supports' ) ? _wp_array_get( $block_type->supports, array( '__experimentalConnections' ), false ) : false;
-
-		if ( $pattern_support ) {
-			if ( ! $block_type->uses_context ) {
-				$block_type->uses_context = array();
-			}
-
-			if ( ! in_array( 'pattern/overrides', $block_type->uses_context, true ) ) {
-				$block_type->uses_context[] = 'pattern/overrides';
-			}
-		}
-	}
-
-	// Register the block support.
-	WP_Block_Supports::get_instance()->register(
-		'pattern',
-		array(
-			'register_attribute' => 'gutenberg_register_pattern_support',
-		)
-	);
-}
diff --git a/lib/block-supports/shadow.php b/lib/block-supports/shadow.php
index 4a28c98b79325d..25c365067e0c32 100644
--- a/lib/block-supports/shadow.php
+++ b/lib/block-supports/shadow.php
@@ -47,15 +47,17 @@ function gutenberg_register_shadow_support( $block_type ) {
 function gutenberg_apply_shadow_support( $block_type, $block_attributes ) {
 	$has_shadow_support = block_has_support( $block_type, array( 'shadow' ), false );
 
-	if ( ! $has_shadow_support ) {
+	if (
+		! $has_shadow_support ||
+		wp_should_skip_block_supports_serialization( $block_type, 'shadow' )
+	) {
 		return array();
 	}
 
 	$shadow_block_styles = array();
 
-	$preset_shadow                 = array_key_exists( 'shadow', $block_attributes ) ? "var:preset|shadow|{$block_attributes['shadow']}" : null;
-	$custom_shadow                 = isset( $block_attributes['style']['shadow'] ) ? $block_attributes['style']['shadow'] : null;
-	$shadow_block_styles['shadow'] = $preset_shadow ? $preset_shadow : $custom_shadow;
+	$custom_shadow                 = $block_attributes['style']['shadow'] ?? null;
+	$shadow_block_styles['shadow'] = $custom_shadow;
 
 	$attributes = array();
 	$styles     = gutenberg_style_engine_get_styles( $shadow_block_styles );
diff --git a/lib/block-supports/typography.php b/lib/block-supports/typography.php
index 3cda86cf0a2573..a4719b7bdd4099 100644
--- a/lib/block-supports/typography.php
+++ b/lib/block-supports/typography.php
@@ -26,6 +26,7 @@ function gutenberg_register_typography_support( $block_type ) {
 	$has_font_weight_support     = $typography_supports['__experimentalFontWeight'] ?? false;
 	$has_letter_spacing_support  = $typography_supports['__experimentalLetterSpacing'] ?? false;
 	$has_line_height_support     = $typography_supports['lineHeight'] ?? false;
+	$has_text_align_support      = $typography_supports['textAlign'] ?? false;
 	$has_text_columns_support    = $typography_supports['textColumns'] ?? false;
 	$has_text_decoration_support = $typography_supports['__experimentalTextDecoration'] ?? false;
 	$has_text_transform_support  = $typography_supports['__experimentalTextTransform'] ?? false;
@@ -37,6 +38,7 @@ function gutenberg_register_typography_support( $block_type ) {
 		|| $has_font_weight_support
 		|| $has_letter_spacing_support
 		|| $has_line_height_support
+		|| $has_text_align_support
 		|| $has_text_columns_support
 		|| $has_text_decoration_support
 		|| $has_text_transform_support
@@ -95,6 +97,7 @@ function gutenberg_apply_typography_support( $block_type, $block_attributes ) {
 	$has_font_weight_support     = $typography_supports['__experimentalFontWeight'] ?? false;
 	$has_letter_spacing_support  = $typography_supports['__experimentalLetterSpacing'] ?? false;
 	$has_line_height_support     = $typography_supports['lineHeight'] ?? false;
+	$has_text_align_support      = $typography_supports['textAlign'] ?? false;
 	$has_text_columns_support    = $typography_supports['textColumns'] ?? false;
 	$has_text_decoration_support = $typography_supports['__experimentalTextDecoration'] ?? false;
 	$has_text_transform_support  = $typography_supports['__experimentalTextTransform'] ?? false;
@@ -106,6 +109,7 @@ function gutenberg_apply_typography_support( $block_type, $block_attributes ) {
 	$should_skip_font_style      = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontStyle' );
 	$should_skip_font_weight     = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontWeight' );
 	$should_skip_line_height     = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'lineHeight' );
+	$should_skip_text_align      = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textAlign' );
 	$should_skip_text_columns    = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textColumns' );
 	$should_skip_text_decoration = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textDecoration' );
 	$should_skip_text_transform  = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textTransform' );
@@ -143,6 +147,10 @@ function gutenberg_apply_typography_support( $block_type, $block_attributes ) {
 			$typography_block_styles['lineHeight'] = $block_attributes['style']['typography']['lineHeight'] ?? null;
 	}
 
+	if ( $has_text_align_support && ! $should_skip_text_align ) {
+			$typography_block_styles['textAlign'] = $block_attributes['style']['typography']['textAlign'] ?? null;
+	}
+
 	if ( $has_text_columns_support && ! $should_skip_text_columns && isset( $block_attributes['style']['typography']['textColumns'] ) ) {
 		$typography_block_styles['textColumns'] = $block_attributes['style']['typography']['textColumns'] ?? null;
 	}
@@ -167,13 +175,22 @@ function gutenberg_apply_typography_support( $block_type, $block_attributes ) {
 	}
 
 	$attributes = array();
+	$classnames = array();
 	$styles     = gutenberg_style_engine_get_styles(
 		array( 'typography' => $typography_block_styles ),
 		array( 'convert_vars_to_classnames' => true )
 	);
 
 	if ( ! empty( $styles['classnames'] ) ) {
-		$attributes['class'] = $styles['classnames'];
+		$classnames[] = $styles['classnames'];
+	}
+
+	if ( $has_text_align_support && ! $should_skip_text_align && isset( $block_attributes['style']['typography']['textAlign'] ) ) {
+		$classnames[] = 'has-text-align-' . $block_attributes['style']['typography']['textAlign'];
+	}
+
+	if ( ! empty( $classnames ) ) {
+		$attributes['class'] = implode( ' ', $classnames );
 	}
 
 	if ( ! empty( $styles['css'] ) ) {
@@ -401,10 +418,18 @@ function gutenberg_get_computed_fluid_typography_value( $args = array() ) {
 		return null;
 	}
 
-	// Build CSS rule.
-	// Borrowed from https://websemantics.uk/tools/responsive-font-calculator/.
+	// Calculates the linear factor denominator. If it's 0, we cannot calculate a fluid value.
+	$linear_factor_denominator = $maximum_viewport_width['value'] - $minimum_viewport_width['value'];
+	if ( empty( $linear_factor_denominator ) ) {
+		return null;
+	}
+
+	/*
+	 * Build CSS rule.
+	 * Borrowed from https://websemantics.uk/tools/responsive-font-calculator/.
+	 */
 	$view_port_width_offset = round( $minimum_viewport_width['value'] / 100, 3 ) . $font_size_unit;
-	$linear_factor          = 100 * ( ( $maximum_font_size['value'] - $minimum_font_size['value'] ) / ( $maximum_viewport_width['value'] - $minimum_viewport_width['value'] ) );
+	$linear_factor          = 100 * ( ( $maximum_font_size['value'] - $minimum_font_size['value'] ) / ( $linear_factor_denominator ) );
 	$linear_factor_scaled   = round( $linear_factor * $scale_factor, 3 );
 	$linear_factor_scaled   = empty( $linear_factor_scaled ) ? 1 : $linear_factor_scaled;
 	$fluid_target_font_size = implode( '', $minimum_font_size_rem ) . " + ((1vw - $view_port_width_offset) * $linear_factor_scaled)";
@@ -412,6 +437,7 @@ function gutenberg_get_computed_fluid_typography_value( $args = array() ) {
 	return "clamp($minimum_font_size_raw, $fluid_target_font_size, $maximum_font_size_raw)";
 }
 
+
 /**
  * Returns a font-size value based on a given font-size preset.
  * Takes into account fluid typography parameters and attempts to return a CSS
@@ -422,47 +448,69 @@ function gutenberg_get_computed_fluid_typography_value( $args = array() ) {
  * @since 6.2.0 Added 'settings.typography.fluid.minFontSize' support.
  * @since 6.3.0 Using layout.wideSize as max viewport width, and logarithmic scale factor to calculate minimum font scale.
  * @since 6.4.0 Added configurable min and max viewport width values to the typography.fluid theme.json schema.
+ * @since 6.6.0 Deprecated bool argument $should_use_fluid_typography.
+ * @since 6.7.0 Font size presets can enable fluid typography individually, even if it’s disabled globally.
  *
- * @param array $preset                     {
+ * @param array $preset       {
  *     Required. fontSizes preset value as seen in theme.json.
  *
  *     @type string           $name Name of the font size preset.
  *     @type string           $slug Kebab-case unique identifier for the font size preset.
  *     @type string|int|float $size CSS font-size value, including units where applicable.
  * }
- * @param bool  $should_use_fluid_typography An override to switch fluid typography "on". Can be used for unit testing. Default is `false`.
+ * @param bool|array $settings Optional Theme JSON settings array that overrides any global theme settings.
+ *                             Default is `array()`.
  *
  * @return string|null Font-size value or `null` if a size is not passed in $preset.
  */
-function gutenberg_get_typography_font_size_value( $preset, $should_use_fluid_typography = false ) {
+function gutenberg_get_typography_font_size_value( $preset, $settings = array() ) {
 	if ( ! isset( $preset['size'] ) ) {
 		return null;
 	}
 
 	/*
-	 * Catches empty values and 0/'0'.
-	 * Fluid calculations cannot be performed on 0.
+	 * Catch falsy values and 0/'0'. Fluid calculations cannot be performed on `0`.
+	 * Also return early when a preset font size explicitly disables fluid typography with `false`.
 	 */
-	if ( empty( $preset['size'] ) ) {
+	$fluid_font_size_settings = $preset['fluid'] ?? null;
+	if ( false === $fluid_font_size_settings || empty( $preset['size'] ) ) {
 		return $preset['size'];
 	}
 
-	// Checks if fluid font sizes are activated.
-	$global_settings     = gutenberg_get_global_settings();
-	$typography_settings = isset( $global_settings['typography'] ) ? $global_settings['typography'] : array();
-	$layout_settings     = isset( $global_settings['layout'] ) ? $global_settings['layout'] : array();
+	/*
+	 * Backwards compatibility since 6.5.
+	 * As a bool (deprecated since 6.5), $settings acts as an override to switch fluid typography "on" (`true`) or "off" (`false`).
+	 */
+	if ( is_bool( $settings ) ) {
+		_deprecated_argument( __FUNCTION__, '6.6.0', __( '`boolean` type for second argument `$settings` is deprecated. Use `array()` instead.', 'gutenberg' ) );
+		$settings = array(
+			'typography' => array(
+				'fluid' => $settings,
+			),
+		);
+	}
 
-	$should_use_fluid_typography
-		= isset( $typography_settings['fluid'] ) &&
-		( true === $typography_settings['fluid'] || is_array( $typography_settings['fluid'] ) ) ?
-		true :
-		$should_use_fluid_typography;
+	// Fallback to global settings as default.
+	$global_settings     = gutenberg_get_global_settings();
+	$settings            = wp_parse_args(
+		$settings,
+		$global_settings
+	);
+	$typography_settings = $settings['typography'] ?? array();
 
-	if ( ! $should_use_fluid_typography ) {
+	/*
+	 * Return early when fluid typography is disabled in the settings, and there
+	 * are no local settings to enable it for the individual preset.
+	 *
+	 * If this condition isn't met, either the settings or individual preset settings
+	 * have enabled fluid typography.
+	 */
+	if ( empty( $typography_settings['fluid'] ) && empty( $fluid_font_size_settings ) ) {
 		return $preset['size'];
 	}
 
-	$fluid_settings = isset( $typography_settings['fluid'] ) && is_array( $typography_settings['fluid'] ) ? $typography_settings['fluid'] : array();
+	$fluid_settings  = isset( $typography_settings['fluid'] ) ? $typography_settings['fluid'] : array();
+	$layout_settings = isset( $settings['layout'] ) ? $settings['layout'] : array();
 
 	// Defaults.
 	$default_maximum_viewport_width       = '1600px';
@@ -481,14 +529,6 @@ function gutenberg_get_typography_font_size_value( $preset, $should_use_fluid_ty
 	$has_min_font_size       = isset( $fluid_settings['minFontSize'] ) && ! empty( gutenberg_get_typography_value_and_unit( $fluid_settings['minFontSize'] ) );
 	$minimum_font_size_limit = $has_min_font_size ? $fluid_settings['minFontSize'] : $default_minimum_font_size_limit;
 
-	// Font sizes.
-	$fluid_font_size_settings = isset( $preset['fluid'] ) ? $preset['fluid'] : null;
-
-	// A font size has explicitly bypassed fluid calculations.
-	if ( false === $fluid_font_size_settings ) {
-		return $preset['size'];
-	}
-
 	// Try to grab explicit min and max fluid font sizes.
 	$minimum_font_size_raw = isset( $fluid_font_size_settings['min'] ) ? $fluid_font_size_settings['min'] : null;
 	$maximum_font_size_raw = isset( $fluid_font_size_settings['max'] ) ? $fluid_font_size_settings['max'] : null;
diff --git a/lib/block-template-utils.php b/lib/block-template-utils.php
new file mode 100644
index 00000000000000..a644047d3cfdc1
--- /dev/null
+++ b/lib/block-template-utils.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Utilities used to fetch and create templates and template parts.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Creates an export of the current templates and
+ * template parts from the site editor at the
+ * specified path in a ZIP file.
+ *
+ * @since 5.9.0
+ * @since 6.0.0 Adds the whole theme to the export archive.
+ *
+ * @global string $wp_version The WordPress version string.
+ *
+ * @return WP_Error|string Path of the ZIP file or error on failure.
+ */
+function gutenberg_generate_block_templates_export_file() {
+	global $wp_version;
+
+	if ( ! class_exists( 'ZipArchive' ) ) {
+		return new WP_Error( 'missing_zip_package', __( 'Zip Export not supported.', 'gutenberg' ) );
+	}
+
+	$obscura    = wp_generate_password( 12, false, false );
+	$theme_name = basename( get_stylesheet() );
+	$filename   = get_temp_dir() . $theme_name . $obscura . '.zip';
+
+	$zip = new ZipArchive();
+	if ( true !== $zip->open( $filename, ZipArchive::CREATE | ZipArchive::OVERWRITE ) ) {
+		return new WP_Error( 'unable_to_create_zip', __( 'Unable to open export file (archive) for writing.', 'gutenberg' ) );
+	}
+
+	$zip->addEmptyDir( 'templates' );
+	$zip->addEmptyDir( 'parts' );
+
+	// Get path of the theme.
+	$theme_path = wp_normalize_path( get_stylesheet_directory() );
+
+	// Create recursive directory iterator.
+	$theme_files = new RecursiveIteratorIterator(
+		new RecursiveDirectoryIterator( $theme_path ),
+		RecursiveIteratorIterator::LEAVES_ONLY
+	);
+
+	// Make a copy of the current theme.
+	foreach ( $theme_files as $file ) {
+		// Skip directories as they are added automatically.
+		if ( ! $file->isDir() ) {
+			// Get real and relative path for current file.
+			$file_path     = wp_normalize_path( $file );
+			$relative_path = substr( $file_path, strlen( $theme_path ) + 1 );
+
+			if ( ! wp_is_theme_directory_ignored( $relative_path ) ) {
+				$zip->addFile( $file_path, $relative_path );
+			}
+		}
+	}
+
+	// Load templates into the zip file.
+	$templates = gutenberg_get_block_templates();
+	foreach ( $templates as $template ) {
+		$template->content = traverse_and_serialize_blocks(
+			parse_blocks( $template->content ),
+			'_remove_theme_attribute_from_template_part_block'
+		);
+
+		$zip->addFromString(
+			'templates/' . $template->slug . '.html',
+			$template->content
+		);
+	}
+
+	// Load template parts into the zip file.
+	$template_parts = gutenberg_get_block_templates( array(), 'wp_template_part' );
+	foreach ( $template_parts as $template_part ) {
+		$zip->addFromString(
+			'parts/' . $template_part->slug . '.html',
+			$template_part->content
+		);
+	}
+
+	// Load theme.json into the zip file.
+	$tree = WP_Theme_JSON_Resolver_Gutenberg::get_theme_data( array(), array( 'with_supports' => false ) );
+	// Merge with user data.
+	$tree->merge( WP_Theme_JSON_Resolver_Gutenberg::get_user_data() );
+
+	$theme_json_raw = $tree->get_data();
+	// If a version is defined, add a schema.
+	if ( $theme_json_raw['version'] ) {
+		$theme_json_version = 'wp/' . substr( $wp_version, 0, 3 );
+		$schema             = array( '$schema' => 'https://schemas.wp.org/' . $theme_json_version . '/theme.json' );
+		$theme_json_raw     = array_merge( $schema, $theme_json_raw );
+	}
+
+	// Convert to a string.
+	$theme_json_encoded = wp_json_encode( $theme_json_raw, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE );
+
+	// Replace 4 spaces with a tab.
+	$theme_json_tabbed = preg_replace( '~(?:^|\G)\h{4}~m', "\t", $theme_json_encoded );
+
+	// Add the theme.json file to the zip.
+	$zip->addFromString(
+		'theme.json',
+		$theme_json_tabbed
+	);
+
+	// Save changes to the zip file.
+	$zip->close();
+
+	return $filename;
+}
diff --git a/lib/blocks.php b/lib/blocks.php
index 698b5d6873748f..c3fdb26700c58c 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -26,9 +26,7 @@ function gutenberg_reregister_core_block_types() {
 				'form-submit-button',
 				'group',
 				'html',
-				'list',
 				'list-item',
-				'media-text',
 				'missing',
 				'more',
 				'nextpage',
@@ -50,6 +48,7 @@ function gutenberg_reregister_core_block_types() {
 				'archives.php'                     => 'core/archives',
 				'avatar.php'                       => 'core/avatar',
 				'block.php'                        => 'core/block',
+				'button.php'                       => 'core/button',
 				'calendar.php'                     => 'core/calendar',
 				'categories.php'                   => 'core/categories',
 				'cover.php'                        => 'core/cover',
@@ -77,7 +76,9 @@ function gutenberg_reregister_core_block_types() {
 				'heading.php'                      => 'core/heading',
 				'latest-comments.php'              => 'core/latest-comments',
 				'latest-posts.php'                 => 'core/latest-posts',
+				'list.php'                         => 'core/list',
 				'loginout.php'                     => 'core/loginout',
+				'media-text.php'                   => 'core/media-text',
 				'navigation.php'                   => 'core/navigation',
 				'navigation-link.php'              => 'core/navigation-link',
 				'navigation-submenu.php'           => 'core/navigation-submenu',
@@ -269,23 +270,12 @@ function gutenberg_register_core_block_assets( $block_name ) {
 		wp_register_style( "wp-block-{$block_name}", false, array() );
 	}
 
-	// If the current theme supports wp-block-styles, dequeue the full stylesheet
-	// and instead attach each block's theme-styles to their block styles stylesheet.
+	/*
+	 * If the current theme supports wp-block-styles, dequeue the core styles
+	 * and enqueue the plugin ones instead.
+	 */
 	if ( current_theme_supports( 'wp-block-styles' ) ) {
 
-		// Dequeue the full stylesheet.
-		// Make sure this only runs once, it doesn't need to run for every block.
-		static $stylesheet_removed;
-		if ( ! $stylesheet_removed ) {
-			add_action(
-				'wp_enqueue_scripts',
-				static function () {
-					wp_dequeue_style( 'wp-block-library-theme' );
-				}
-			);
-			$stylesheet_removed = true;
-		}
-
 		// Get the path to the block's stylesheet.
 		$theme_style_path = is_rtl()
 			? "build/block-library/blocks/$block_name/theme-rtl.css"
@@ -293,23 +283,14 @@ static function () {
 
 		// If the file exists, enqueue it.
 		if ( file_exists( gutenberg_dir_path() . $theme_style_path ) ) {
-
-			if ( file_exists( $stylesheet_path ) ) {
-				// If there is a main stylesheet for this block, append the theme styles to main styles.
-				wp_add_inline_style(
-					"wp-block-{$block_name}",
-					file_get_contents( gutenberg_dir_path() . $theme_style_path )
-				);
-			} else {
-				// If there is no main stylesheet for this block, register theme style.
-				wp_register_style(
-					"wp-block-{$block_name}",
-					gutenberg_url( $theme_style_path ),
-					array(),
-					$default_version
-				);
-				wp_style_add_data( "wp-block-{$block_name}", 'path', gutenberg_dir_path() . $theme_style_path );
-			}
+			wp_deregister_style( "wp-block-{$block_name}-theme" );
+			wp_register_style(
+				"wp-block-{$block_name}-theme",
+				gutenberg_url( $theme_style_path ),
+				array(),
+				$default_version
+			);
+			wp_style_add_data( "wp-block-{$block_name}-theme", 'path', gutenberg_dir_path() . $theme_style_path );
 		}
 	}
 
@@ -439,55 +420,7 @@ function gutenberg_legacy_wp_block_post_meta( $value, $object_id, $meta_key, $si
 
 add_filter( 'default_post_metadata', 'gutenberg_legacy_wp_block_post_meta', 10, 4 );
 
-/**
- * Complements the lightbox implementation for the 'core/image' block.
- *
- * This function is INTENTIONALLY left out of core as it only provides
- * backwards compatibility for the legacy lightbox syntax that was only
- * introduced in Gutenberg. The legacy syntax was using the `behaviors` key in
- * the block attrbutes and the `theme.json` file.
- *
- * @since 16.7.0
- *
- * @param array $block The block to check.
- * @return array The block with the legacyLightboxSettings set if available.
- */
-function gutenberg_should_render_lightbox( $block ) {
-
-	if ( 'core/image' !== $block['blockName'] ) {
-		return $block;
-	}
-
-	if ( isset( $block['attrs']['behaviors']['lightbox'] ) ) {
-		$block['legacyLightboxSettings'] = $block['attrs']['behaviors']['lightbox'];
-	}
-
-	return $block;
-}
-
-add_filter( 'render_block_data', 'gutenberg_should_render_lightbox', 15, 1 );
-
-/**
- * Registers the metadata block attribute for all block types.
- *
- * @param array $args Array of arguments for registering a block type.
- * @return array $args
- */
-function gutenberg_register_metadata_attribute( $args ) {
-	// Setup attributes if needed.
-	if ( ! isset( $args['attributes'] ) || ! is_array( $args['attributes'] ) ) {
-		$args['attributes'] = array();
-	}
-
-	if ( ! array_key_exists( 'metadata', $args['attributes'] ) ) {
-		$args['attributes']['metadata'] = array(
-			'type' => 'object',
-		);
-	}
 
-	return $args;
-}
-add_filter( 'register_block_type_args', 'gutenberg_register_metadata_attribute' );
 
 /**
  * Strips all HTML from the content of footnotes, and sanitizes the ID.
diff --git a/lib/class-wp-duotone-gutenberg.php b/lib/class-wp-duotone-gutenberg.php
index 93714e59740063..5f3b1bb5cd6b11 100644
--- a/lib/class-wp-duotone-gutenberg.php
+++ b/lib/class-wp-duotone-gutenberg.php
@@ -32,10 +32,6 @@
  * @since 6.3.0
  */
 
-if ( class_exists( 'WP_Duotone_Gutenberg' ) ) {
-	return;
-}
-
 /**
  * Manages duotone block supports and global styles.
  *
@@ -627,7 +623,7 @@ private static function get_svg_definitions( $sources ) {
 	 * @return string The CSS for global styles.
 	 */
 	private static function get_global_styles_presets( $sources ) {
-		$css = 'body{';
+		$css = WP_Theme_JSON_Gutenberg::ROOT_CSS_PROPERTIES_SELECTOR . '{';
 		foreach ( $sources as $filter_id => $filter_data ) {
 			$slug              = $filter_data['slug'];
 			$colors            = $filter_data['colors'];
@@ -900,6 +896,45 @@ public static function render_duotone_support( $block_content, $block ) {
 		return $tags->get_updated_html();
 	}
 
+	/**
+	 * Fixes the issue with our generated class name not being added to the block's outer container
+	 * in classic themes due to gutenberg_restore_image_outer_container from layout block supports.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param  string $block_content Rendered block content.
+	 * @return string                Filtered block content.
+	 */
+	public static function restore_image_outer_container( $block_content ) {
+		if ( wp_theme_has_theme_json() ) {
+			return $block_content;
+		}
+
+		$tags          = new WP_HTML_Tag_Processor( $block_content );
+		$wrapper_query = array(
+			'tag_name'   => 'div',
+			'class_name' => 'wp-block-image',
+		);
+		if ( ! $tags->next_tag( $wrapper_query ) ) {
+			return $block_content;
+		}
+
+		$tags->set_bookmark( 'wrapper-div' );
+		$tags->next_tag();
+
+		$inner_classnames = explode( ' ', $tags->get_attribute( 'class' ) );
+		foreach ( $inner_classnames as $classname ) {
+			if ( 0 === strpos( $classname, 'wp-duotone' ) ) {
+				$tags->remove_class( $classname );
+				$tags->seek( 'wrapper-div' );
+				$tags->add_class( $classname );
+				break;
+			}
+		}
+
+		return $tags->get_updated_html();
+	}
+
 	/**
 	 * Appends the used block duotone filter declarations to the inline block supports CSS.
 	 *
diff --git a/lib/class-wp-rest-edit-site-export-controller-gutenberg.php b/lib/class-wp-rest-edit-site-export-controller-gutenberg.php
new file mode 100644
index 00000000000000..b05de230dd0ccd
--- /dev/null
+++ b/lib/class-wp-rest-edit-site-export-controller-gutenberg.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Controller which provides REST endpoint for exporting current templates
+ * and template parts.
+ *
+ * This class extension exists so that theme exporting takes into account any updates/changes to
+ * WP_Theme_JSON_Gutenberg, WP_Theme_JSON_Resolver_Gutenberg or related classes.
+ *
+ * @package    gutenberg
+ * @subpackage REST_API
+ * @since 5.9.0
+ */
+
+if ( class_exists( 'WP_REST_Edit_Site_Export_Controller_Gutenberg' ) ) {
+	return;
+}
+
+class WP_REST_Edit_Site_Export_Controller_Gutenberg extends WP_REST_Edit_Site_Export_Controller {
+	/**
+	 * Output a ZIP file with an export of the current templates
+	 * and template parts from the site editor, and close the connection.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @return WP_Error|void
+	 */
+	public function export() {
+		// Generate the export file.
+		$filename = gutenberg_generate_block_templates_export_file();
+
+		if ( is_wp_error( $filename ) ) {
+			$filename->add_data( array( 'status' => 500 ) );
+
+			return $filename;
+		}
+
+		$theme_name = basename( get_stylesheet() );
+		header( 'Content-Type: application/zip' );
+		header( 'Content-Disposition: attachment; filename=' . $theme_name . '.zip' );
+		header( 'Content-Length: ' . filesize( $filename ) );
+		flush();
+		readfile( $filename );
+		unlink( $filename );
+		exit;
+	}
+}
diff --git a/lib/class-wp-rest-global-styles-controller-gutenberg.php b/lib/class-wp-rest-global-styles-controller-gutenberg.php
index 8125b2ebf1c288..1f6543fa184283 100644
--- a/lib/class-wp-rest-global-styles-controller-gutenberg.php
+++ b/lib/class-wp-rest-global-styles-controller-gutenberg.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * REST API: Try: bundle WP_Theme_JSON class instead of inheriting per WordPress version class
+ * REST API: Bundle WP_Theme_JSON class instead of inheriting per WordPress version class
  *
  * Changes to this class should be synced to the corresponding class
  * in WordPress core: src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php.
@@ -10,32 +10,33 @@
  * @since 5.9.0
  */
 
-if ( class_exists( 'WP_REST_Global_Styles_Controller_Gutenberg' ) ) {
-	return;
-}
-
 /**
  * Base Global Styles REST API Controller.
  */
-class WP_REST_Global_Styles_Controller_Gutenberg extends WP_REST_Controller {
+class WP_REST_Global_Styles_Controller_Gutenberg extends WP_REST_Posts_Controller {
 
 	/**
-	 * Post type.
+	 * Whether the controller supports batching.
 	 *
-	 * @since 5.9.0
-	 * @var string
+	 * @since 6.6.0
+	 * @var array
 	 */
-	protected $post_type;
+	protected $allow_batch = array( 'v1' => false );
 
 	/**
 	 * Constructor.
 	 *
 	 * @since 5.9.0
 	 */
-	public function __construct() {
-		$this->namespace = 'wp/v2';
-		$this->rest_base = 'global-styles';
-		$this->post_type = 'wp_global_styles';
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $post_type Post type.
+	 */
+	public function __construct( $post_type = 'wp_global_styles' ) {
+		parent::__construct( $post_type );
 	}
 
 	/**
@@ -58,8 +59,14 @@ public function register_routes() {
 							'type'        => 'string',
 						),
 					),
+					'allow_batch'         => $this->allow_batch,
 				),
-			)
+			),
+			/*
+			 * $override is set to true to avoid conflicts with the core endpoint.
+			 * Do not sync to WordPress core.
+			 */
+			true
 		);
 
 		// List themes global styles.
@@ -69,8 +76,10 @@ public function register_routes() {
 			sprintf(
 				'/%s/themes/(?P<stylesheet>%s)',
 				$this->rest_base,
-				// Matches theme's directory: `/themes/<subdirectory>/<theme>/` or `/themes/<theme>/`.
-				// Excludes invalid directory name characters: `/:<>*?"|`.
+				/*
+				 * Matches theme's directory: `/themes/<subdirectory>/<theme>/` or `/themes/<theme>/`.
+				 * Excludes invalid directory name characters: `/:<>*?"|`.
+				 */
 				'[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?'
 			),
 			array(
@@ -85,8 +94,14 @@ public function register_routes() {
 							'sanitize_callback' => array( $this, '_sanitize_global_styles_callback' ),
 						),
 					),
+					'allow_batch'         => $this->allow_batch,
 				),
-			)
+			),
+			/*
+			 * $override is set to true to avoid conflicts with the core endpoint.
+			 * Do not sync to WordPress core.
+			 */
+			true
 		);
 
 		// Lists/updates a single global style variation based on the given id.
@@ -112,8 +127,14 @@ public function register_routes() {
 					'permission_callback' => array( $this, 'update_item_permissions_check' ),
 					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
 				),
-				'schema' => array( $this, 'get_public_item_schema' ),
-			)
+				'schema'      => array( $this, 'get_public_item_schema' ),
+				'allow_batch' => $this->allow_batch,
+			),
+			/*
+			 * $override is set to true to avoid conflicts with the core endpoint.
+			 * Do not sync to WordPress core.
+			 */
+			true
 		);
 	}
 
@@ -200,28 +221,10 @@ public function get_item_permissions_check( $request ) {
 	 * @param WP_Post $post Post object.
 	 * @return bool Whether the post can be read.
 	 */
-	protected function check_read_permission( $post ) {
+	public function check_read_permission( $post ) {
 		return current_user_can( 'read_post', $post->ID );
 	}
 
-	/**
-	 * Returns the given global styles config.
-	 *
-	 * @since 5.9.0
-	 *
-	 * @param WP_REST_Request $request The request instance.
-	 *
-	 * @return WP_REST_Response|WP_Error
-	 */
-	public function get_item( $request ) {
-		$post = $this->get_post( $request['id'] );
-		if ( is_wp_error( $post ) ) {
-			return $post;
-		}
-
-		return $this->prepare_item_for_response( $post, $request );
-	}
-
 	/**
 	 * Checks if a given request has access to write a single global styles config.
 	 *
@@ -247,61 +250,12 @@ public function update_item_permissions_check( $request ) {
 		return true;
 	}
 
-	/**
-	 * Checks if a global style can be edited.
-	 *
-	 * @since 5.9.0
-	 *
-	 * @param WP_Post $post Post object.
-	 * @return bool Whether the post can be edited.
-	 */
-	protected function check_update_permission( $post ) {
-		return current_user_can( 'edit_post', $post->ID );
-	}
-
-	/**
-	 * Updates a single global style config.
-	 *
-	 * @since 5.9.0
-	 * @since 6.2.0 Added validation of styles.css property.
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function update_item( $request ) {
-		$post_before = $this->get_post( $request['id'] );
-		if ( is_wp_error( $post_before ) ) {
-			return $post_before;
-		}
-
-		$changes = $this->prepare_item_for_database( $request );
-		if ( is_wp_error( $changes ) ) {
-			return $changes;
-		}
-
-		$result = wp_update_post( wp_slash( (array) $changes ), true, false );
-		if ( is_wp_error( $result ) ) {
-			return $result;
-		}
-
-		$post          = get_post( $request['id'] );
-		$fields_update = $this->update_additional_fields_for_object( $post, $request );
-		if ( is_wp_error( $fields_update ) ) {
-			return $fields_update;
-		}
-
-		wp_after_insert_post( $post, true, $post_before );
-
-		$response = $this->prepare_item_for_response( $post, $request );
-
-		return rest_ensure_response( $response );
-	}
-
 	/**
 	 * Prepares a single global styles config for update.
 	 *
 	 * @since 5.9.0
 	 * @since 6.2.0 Added validation of styles.css property.
+	 * @since 6.6.0 Added registration of block style variations from theme.json sources (theme.json, user theme.json, partials).
 	 *
 	 * @param WP_REST_Request $request Request object.
 	 * @return stdClass|WP_Error Prepared item on success. WP_Error on when the custom CSS is not valid.
@@ -334,6 +288,11 @@ protected function prepare_item_for_database( $request ) {
 			} elseif ( isset( $existing_config['styles'] ) ) {
 				$config['styles'] = $existing_config['styles'];
 			}
+
+			// Register theme-defined variations e.g. from block style variation partials under `/styles`.
+			$variations = WP_Theme_JSON_Resolver_Gutenberg::get_style_variations( 'block' );
+			gutenberg_register_block_style_variations_from_theme_json_partials( $variations );
+
 			if ( isset( $request['settings'] ) ) {
 				$config['settings'] = $request['settings'];
 			} elseif ( isset( $existing_config['settings'] ) ) {
@@ -361,6 +320,7 @@ protected function prepare_item_for_database( $request ) {
 	 *
 	 * @since 5.9.0
 	 * @since 6.2.0 Handling of style.css was added to WP_Theme_JSON.
+	 * @since 6.6.0 Added custom relative theme file URIs to `_links`.
 	 *
 	 * @param WP_Post         $post    Global Styles post object.
 	 * @param WP_REST_Request $request Request object.
@@ -370,8 +330,10 @@ public function prepare_item_for_response( $post, $request ) { // phpcs:ignore V
 		$raw_config                       = json_decode( $post->post_content, true );
 		$is_global_styles_user_theme_json = isset( $raw_config['isGlobalStylesUserThemeJSON'] ) && true === $raw_config['isGlobalStylesUserThemeJSON'];
 		$config                           = array();
+		$theme_json                       = null;
 		if ( $is_global_styles_user_theme_json ) {
-			$config = ( new WP_Theme_JSON_Gutenberg( $raw_config, 'custom' ) )->get_raw_data();
+			$theme_json = new WP_Theme_JSON_Gutenberg( $raw_config, 'custom' );
+			$config     = $theme_json->get_raw_data();
 		}
 
 		// Base fields for every post.
@@ -390,10 +352,12 @@ public function prepare_item_for_response( $post, $request ) { // phpcs:ignore V
 		}
 		if ( rest_is_field_included( 'title.rendered', $fields ) ) {
 			add_filter( 'protected_title_format', array( $this, 'protected_title_format' ) );
+			add_filter( 'private_title_format', array( $this, 'protected_title_format' ) );
 
 			$data['title']['rendered'] = get_the_title( $post->ID );
 
 			remove_filter( 'protected_title_format', array( $this, 'protected_title_format' ) );
+			remove_filter( 'private_title_format', array( $this, 'protected_title_format' ) );
 		}
 
 		if ( rest_is_field_included( 'settings', $fields ) ) {
@@ -413,9 +377,16 @@ public function prepare_item_for_response( $post, $request ) { // phpcs:ignore V
 
 		if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
 			$links = $this->prepare_links( $post->ID );
+			// Only return resolved URIs for get requests to user theme JSON.
+			if ( $theme_json ) {
+				$resolved_theme_uris = WP_Theme_JSON_Resolver_Gutenberg::get_resolved_theme_uris( $theme_json );
+				if ( ! empty( $resolved_theme_uris ) ) {
+					$links['https://api.w.org/theme-file'] = $resolved_theme_uris;
+				}
+			}
 			$response->add_links( $links );
 			if ( ! empty( $links['self']['href'] ) ) {
-				$actions = $this->get_available_actions();
+				$actions = $this->get_available_actions( $post, $request );
 				$self    = $links['self']['href'];
 				foreach ( $actions as $rel ) {
 					$response->add_link( $rel, $self );
@@ -439,9 +410,12 @@ protected function prepare_links( $id ) {
 		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
 
 		$links = array(
-			'self' => array(
+			'self'  => array(
 				'href' => rest_url( trailingslashit( $base ) . $id ),
 			),
+			'about' => array(
+				'href' => rest_url( 'wp/v2/types/' . $this->post_type ),
+			),
 		);
 
 		if ( post_type_supports( $this->post_type, 'revisions' ) ) {
@@ -462,13 +436,16 @@ protected function prepare_links( $id ) {
 	 *
 	 * @since 5.9.0
 	 * @since 6.2.0 Added 'edit-css' action.
+	 * @since 6.6.0 Added $post and $request parameters.
 	 *
+	 * @param WP_Post         $post    Post object.
+	 * @param WP_REST_Request $request Request object.
 	 * @return array List of link relations.
 	 */
-	protected function get_available_actions() {
+	protected function get_available_actions( $post, $request ) {  // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 		$rels = array();
 
-		$post_type = get_post_type_object( $this->post_type );
+		$post_type = get_post_type_object( $post->post_type );
 		if ( current_user_can( $post_type->cap->publish_posts ) ) {
 			$rels[] = 'https://api.w.org/action-publish';
 		}
@@ -480,21 +457,6 @@ protected function get_available_actions() {
 		return $rels;
 	}
 
-	/**
-	 * Overwrites the default protected title format.
-	 *
-	 * By default, WordPress will show password protected posts with a title of
-	 * "Protected: %s", as the REST API communicates the protected status of a post
-	 * in a machine readable format, we remove the "Protected: " prefix.
-	 *
-	 * @since 5.9.0
-	 *
-	 * @return string Protected title format.
-	 */
-	public function protected_title_format() {
-		return '%s';
-	}
-
 	/**
 	 * Retrieves the query params for the global styles collection.
 	 *
@@ -570,27 +532,39 @@ public function get_item_schema() {
 	 * Checks if a given request has access to read a single theme global styles config.
 	 *
 	 * @since 5.9.0
+	 * @since 6.7.0 Allow users with edit post capabilities to view theme global styles.
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.
 	 */
 	public function get_theme_item_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		/*
+		 * Verify if the current user has edit_posts capability.
+		 */
+		if ( current_user_can( 'edit_posts' ) ) {
+			return true;
+		}
+
+		foreach ( get_post_types( array( 'show_in_rest' => true ), 'objects' ) as $post_type ) {
+			if ( current_user_can( $post_type->cap->edit_posts ) ) {
+				return true;
+			}
+		}
 
 		/*
 		 * Verify if the current user has edit_theme_options capability.
-		 * This capability is required to edit/view/delete templates.
 		 */
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			return new WP_Error(
-				'rest_cannot_manage_global_styles',
-				__( 'Sorry, you are not allowed to access the global styles on this site.', 'gutenberg' ),
-				array(
-					'status' => rest_authorization_required_code(),
-				)
-			);
+		if ( current_user_can( 'edit_theme_options' ) ) {
+			return true;
 		}
 
-		return true;
+		return new WP_Error(
+			'rest_cannot_read_global_styles',
+			__( 'Sorry, you are not allowed to access the global styles on this site.', 'gutenberg' ),
+			array(
+				'status' => rest_authorization_required_code(),
+			)
+		);
 	}
 
 	/**
@@ -612,8 +586,8 @@ public function get_theme_item( $request ) {
 		}
 
 		$theme  = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( 'theme' );
-		$data   = array();
 		$fields = $this->get_fields_for_response( $request );
+		$data   = array();
 
 		if ( rest_is_field_included( 'settings', $fields ) ) {
 			$data['settings'] = $theme->get_settings();
@@ -624,18 +598,22 @@ public function get_theme_item( $request ) {
 			$data['styles'] = isset( $raw_data['styles'] ) ? $raw_data['styles'] : array();
 		}
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
+		$context  = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, $context );
 		$response = rest_ensure_response( $data );
 
 		if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
-			$links = array(
+			$links               = array(
 				'self' => array(
 					'href' => rest_url( sprintf( '%s/%s/themes/%s', $this->namespace, $this->rest_base, $request['stylesheet'] ) ),
 				),
 			);
+			$resolved_theme_uris = WP_Theme_JSON_Resolver_Gutenberg::get_resolved_theme_uris( $theme );
+			if ( ! empty( $resolved_theme_uris ) ) {
+				$links['https://api.w.org/theme-file'] = $resolved_theme_uris;
+			}
+
 			$response->add_links( $links );
 		}
 
@@ -650,23 +628,8 @@ public function get_theme_item( $request ) {
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.
 	 */
-	public function get_theme_items_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-
-		/*
-		 * Verify if the current user has edit_theme_options capability.
-		 * This capability is required to edit/view/delete templates.
-		 */
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			return new WP_Error(
-				'rest_cannot_manage_global_styles',
-				__( 'Sorry, you are not allowed to access the global styles on this site.', 'gutenberg' ),
-				array(
-					'status' => rest_authorization_required_code(),
-				)
-			);
-		}
-
-		return true;
+	public function get_theme_items_permissions_check( $request ) {
+		return $this->get_theme_item_permissions_check( $request );
 	}
 
 	/**
@@ -675,6 +638,7 @@ public function get_theme_items_permissions_check( $request ) { // phpcs:ignore
 	 * @since 6.0.0
 	 * @since 6.2.0 Returns parent theme variations, if they exist.
 	 * @since 6.4.0 Removed unnecessary local variable.
+	 * @since 6.6.0 Added custom relative theme file URIs to `_links` for each item.
 	 *
 	 * @param WP_REST_Request $request The request instance.
 	 *
@@ -690,9 +654,30 @@ public function get_theme_items( $request ) {
 			);
 		}
 
+		$response = array();
+
+		// Register theme-defined variations e.g. from block style variation partials under `/styles`.
+		$partials = WP_Theme_JSON_Resolver_Gutenberg::get_style_variations( 'block' );
+		gutenberg_register_block_style_variations_from_theme_json_partials( $partials );
+
 		$variations = WP_Theme_JSON_Resolver_Gutenberg::get_style_variations();
 
-		return rest_ensure_response( $variations );
+		// Add resolved theme asset links.
+		foreach ( $variations as $variation ) {
+			$variation_theme_json = new WP_Theme_JSON_Gutenberg( $variation );
+			$resolved_theme_uris  = WP_Theme_JSON_Resolver_Gutenberg::get_resolved_theme_uris( $variation_theme_json );
+			$data                 = rest_ensure_response( $variation );
+			if ( ! empty( $resolved_theme_uris ) ) {
+				$data->add_links(
+					array(
+						'https://api.w.org/theme-file' => $resolved_theme_uris,
+					)
+				);
+			}
+			$response[] = $this->prepare_response_for_collection( $data );
+		}
+
+		return rest_ensure_response( $response );
 	}
 
 	/**
diff --git a/lib/class-wp-theme-json-data-gutenberg.php b/lib/class-wp-theme-json-data-gutenberg.php
index f0d2025347493b..2c7eec9d5dbf4a 100644
--- a/lib/class-wp-theme-json-data-gutenberg.php
+++ b/lib/class-wp-theme-json-data-gutenberg.php
@@ -6,10 +6,6 @@
  * @since 6.1.0
  */
 
-if ( class_exists( 'WP_Theme_JSON_Data_Gutenberg' ) ) {
-	return;
-}
-
 /**
  * Class to provide access to update a theme.json structure.
  */
@@ -42,7 +38,7 @@ class WP_Theme_JSON_Data_Gutenberg {
 	 * @param array  $data   Array following the theme.json specification.
 	 * @param string $origin The origin of the data: default, theme, user.
 	 */
-	public function __construct( $data = array(), $origin = 'theme' ) {
+	public function __construct( $data = array( 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA ), $origin = 'theme' ) {
 		$this->origin     = $origin;
 		$this->theme_json = new WP_Theme_JSON_Gutenberg( $data, $this->origin );
 	}
@@ -72,4 +68,15 @@ public function update_with( $new_data ) {
 	public function get_data() {
 		return $this->theme_json->get_raw_data();
 	}
+
+	/**
+	 * Return theme JSON object.
+	 *
+	 * @since 18.5.0
+	 *
+	 * @return WP_Theme_JSON
+	 */
+	public function get_theme_json() {
+		return $this->theme_json;
+	}
 }
diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
index 43a3772a1c3af0..5975e4fe9852ff 100644
--- a/lib/class-wp-theme-json-gutenberg.php
+++ b/lib/class-wp-theme-json-gutenberg.php
@@ -6,10 +6,6 @@
  * @since 5.8.0
  */
 
-if ( class_exists( 'WP_Theme_JSON_Gutenberg' ) ) {
-	return;
-}
-
 /**
  * Class that encapsulates the processing of structures that adhere to the theme.json spec.
  *
@@ -41,6 +37,14 @@ class WP_Theme_JSON_Gutenberg {
 	 */
 	protected static $blocks_metadata = array();
 
+	/**
+	 * The CSS selector for the top-level preset settings.
+	 *
+	 * @since 6.6.0
+	 * @var string
+	 */
+	const ROOT_CSS_PROPERTIES_SELECTOR = ':root';
+
 	/**
 	 * The CSS selector for the top-level styles.
 	 *
@@ -119,9 +123,20 @@ class WP_Theme_JSON_Gutenberg {
 	 * @since 6.0.0 Replaced `override` with `prevent_override` and updated the
 	 *              `prevent_override` value for `color.duotone` to use `color.defaultDuotone`.
 	 * @since 6.2.0 Added 'shadow' presets.
+	 * @since 6.6.0 Updated the 'prevent_override' value for font size presets to use 'typography.defaultFontSizes' and spacing size presets to use `spacing.defaultSpacingSizes`.
+	 * @since 6.6.0 Added `aspectRatios`.
 	 * @var array
 	 */
 	const PRESETS_METADATA = array(
+		array(
+			'path'              => array( 'dimensions', 'aspectRatios' ),
+			'prevent_override'  => array( 'dimensions', 'defaultAspectRatios' ),
+			'use_default_names' => false,
+			'value_key'         => 'ratio',
+			'css_vars'          => '--wp--preset--aspect-ratio--$slug',
+			'classes'           => array(),
+			'properties'        => array( 'aspect-ratio' ),
+		),
 		array(
 			'path'              => array( 'color', 'palette' ),
 			'prevent_override'  => array( 'color', 'defaultPalette' ),
@@ -155,7 +170,7 @@ class WP_Theme_JSON_Gutenberg {
 		),
 		array(
 			'path'              => array( 'typography', 'fontSizes' ),
-			'prevent_override'  => false,
+			'prevent_override'  => array( 'typography', 'defaultFontSizes' ),
 			'use_default_names' => true,
 			'value_func'        => 'gutenberg_get_typography_font_size_value',
 			'css_vars'          => '--wp--preset--font-size--$slug',
@@ -173,7 +188,7 @@ class WP_Theme_JSON_Gutenberg {
 		),
 		array(
 			'path'              => array( 'spacing', 'spacingSizes' ),
-			'prevent_override'  => false,
+			'prevent_override'  => array( 'spacing', 'defaultSpacingSizes' ),
 			'use_default_names' => true,
 			'value_key'         => 'size',
 			'css_vars'          => '--wp--preset--spacing--$slug',
@@ -207,12 +222,19 @@ class WP_Theme_JSON_Gutenberg {
 	 *              removed the `--wp--style--block-gap` property.
 	 * @since 6.2.0 Added `outline-*`, and `min-height` properties.
 	 * @since 6.3.0 Added `writing-mode` property.
+	 * @since 6.6.0 Added `background-[image|position|repeat|size]` properties.
 	 *
 	 * @var array
 	 */
 	const PROPERTIES_METADATA = array(
+		'aspect-ratio'                      => array( 'dimensions', 'aspectRatio' ),
 		'background'                        => array( 'color', 'gradient' ),
 		'background-color'                  => array( 'color', 'background' ),
+		'background-image'                  => array( 'background', 'backgroundImage' ),
+		'background-position'               => array( 'background', 'backgroundPosition' ),
+		'background-repeat'                 => array( 'background', 'backgroundRepeat' ),
+		'background-size'                   => array( 'background', 'backgroundSize' ),
+		'background-attachment'             => array( 'background', 'backgroundAttachment' ),
 		'border-radius'                     => array( 'border', 'radius' ),
 		'border-top-left-radius'            => array( 'border', 'radius', 'topLeft' ),
 		'border-top-right-radius'           => array( 'border', 'radius', 'topRight' ),
@@ -234,6 +256,7 @@ class WP_Theme_JSON_Gutenberg {
 		'border-left-width'                 => array( 'border', 'left', 'width' ),
 		'border-left-style'                 => array( 'border', 'left', 'style' ),
 		'color'                             => array( 'color', 'text' ),
+		'text-align'                        => array( 'typography', 'textAlign' ),
 		'column-count'                      => array( 'typography', 'textColumns' ),
 		'font-family'                       => array( 'typography', 'fontFamily' ),
 		'font-size'                         => array( 'typography', 'fontSize' ),
@@ -276,26 +299,30 @@ class WP_Theme_JSON_Gutenberg {
 	 *
 	 * Indirect properties are not output directly by `compute_style_properties`,
 	 * but are used elsewhere in the processing of global styles. The indirect
-	 * property is used to validate whether or not a style value is allowed.
+	 * property is used to validate whether a style value is allowed.
 	 *
 	 * @since 6.2.0
+	 * @since 6.6.0 Added background-image properties.
 	 *
 	 * @var array
 	 */
 	const INDIRECT_PROPERTIES_METADATA = array(
-		'gap'        => array(
+		'gap'              => array(
 			array( 'spacing', 'blockGap' ),
 		),
-		'column-gap' => array(
+		'column-gap'       => array(
 			array( 'spacing', 'blockGap', 'left' ),
 		),
-		'row-gap'    => array(
+		'row-gap'          => array(
 			array( 'spacing', 'blockGap', 'top' ),
 		),
-		'max-width'  => array(
+		'max-width'        => array(
 			array( 'layout', 'contentSize' ),
 			array( 'layout', 'wideSize' ),
 		),
+		'background-image' => array(
+			array( 'background', 'backgroundImage', 'url' ),
+		),
 	);
 
 	/**
@@ -323,6 +350,7 @@ class WP_Theme_JSON_Gutenberg {
 	 * @var string[]
 	 */
 	const VALID_TOP_LEVEL_KEYS = array(
+		'blockTypes',
 		'customTemplates',
 		'description',
 		'patterns',
@@ -330,6 +358,7 @@ class WP_Theme_JSON_Gutenberg {
 		'styles',
 		'templateParts',
 		'title',
+		'slug',
 		'version',
 	);
 
@@ -354,6 +383,7 @@ class WP_Theme_JSON_Gutenberg {
 		'useRootPaddingAwareAlignments' => null,
 		'background'                    => array(
 			'backgroundImage' => null,
+			'backgroundSize'  => null,
 		),
 		'border'                        => array(
 			'color'  => null,
@@ -380,7 +410,10 @@ class WP_Theme_JSON_Gutenberg {
 		),
 		'custom'                        => null,
 		'dimensions'                    => array(
-			'minHeight' => null,
+			'aspectRatio'         => null,
+			'aspectRatios'        => null,
+			'defaultAspectRatios' => null,
+			'minHeight'           => null,
 		),
 		'layout'                        => array(
 			'contentSize'                   => null,
@@ -397,32 +430,35 @@ class WP_Theme_JSON_Gutenberg {
 			'sticky' => null,
 		),
 		'spacing'                       => array(
-			'customSpacingSize' => null,
-			'spacingSizes'      => null,
-			'spacingScale'      => null,
-			'blockGap'          => null,
-			'margin'            => null,
-			'padding'           => null,
-			'units'             => null,
+			'customSpacingSize'   => null,
+			'defaultSpacingSizes' => null,
+			'spacingSizes'        => null,
+			'spacingScale'        => null,
+			'blockGap'            => null,
+			'margin'              => null,
+			'padding'             => null,
+			'units'               => null,
 		),
 		'shadow'                        => array(
 			'presets'        => null,
 			'defaultPresets' => null,
 		),
 		'typography'                    => array(
-			'fluid'          => null,
-			'customFontSize' => null,
-			'dropCap'        => null,
-			'fontFamilies'   => null,
-			'fontSizes'      => null,
-			'fontStyle'      => null,
-			'fontWeight'     => null,
-			'letterSpacing'  => null,
-			'lineHeight'     => null,
-			'textColumns'    => null,
-			'textDecoration' => null,
-			'textTransform'  => null,
-			'writingMode'    => null,
+			'fluid'            => null,
+			'customFontSize'   => null,
+			'defaultFontSizes' => null,
+			'dropCap'          => null,
+			'fontFamilies'     => null,
+			'fontSizes'        => null,
+			'fontStyle'        => null,
+			'fontWeight'       => null,
+			'letterSpacing'    => null,
+			'lineHeight'       => null,
+			'textAlign'        => null,
+			'textColumns'      => null,
+			'textDecoration'   => null,
+			'textTransform'    => null,
+			'writingMode'      => null,
 		),
 	);
 
@@ -431,7 +467,6 @@ class WP_Theme_JSON_Gutenberg {
 			'fontFamily' => null,
 			'name'       => null,
 			'slug'       => null,
-			'preview'    => null,
 			'fontFace'   => array(
 				array(
 					'ascentOverride'        => null,
@@ -447,7 +482,6 @@ class WP_Theme_JSON_Gutenberg {
 					'sizeAdjust'            => null,
 					'src'                   => null,
 					'unicodeRange'          => null,
-					'preview'               => null,
 				),
 			),
 		),
@@ -464,10 +498,18 @@ class WP_Theme_JSON_Gutenberg {
 	 *              added new property `shadow`,
 	 *              updated `blockGap` to be allowed at any level.
 	 * @since 6.2.0 Added `outline`, and `minHeight` properties.
-	 *
+	 * @since 6.6.0 Added `background` sub properties to top-level only.
+	 * @since 6.6.0 Added `dimensions.aspectRatio`.
 	 * @var array
 	 */
 	const VALID_STYLES = array(
+		'background' => array(
+			'backgroundImage'      => null,
+			'backgroundAttachment' => null,
+			'backgroundPosition'   => null,
+			'backgroundRepeat'     => null,
+			'backgroundSize'       => null,
+		),
 		'border'     => array(
 			'color'  => null,
 			'radius' => null,
@@ -484,7 +526,8 @@ class WP_Theme_JSON_Gutenberg {
 			'text'       => null,
 		),
 		'dimensions' => array(
-			'minHeight' => null,
+			'aspectRatio' => null,
+			'minHeight'   => null,
 		),
 		'filter'     => array(
 			'duotone' => null,
@@ -508,6 +551,7 @@ class WP_Theme_JSON_Gutenberg {
 			'fontWeight'     => null,
 			'letterSpacing'  => null,
 			'lineHeight'     => null,
+			'textAlign'      => null,
 			'textColumns'    => null,
 			'textDecoration' => null,
 			'textTransform'  => null,
@@ -650,6 +694,7 @@ public static function get_element_class_name( $element ) {
 	 */
 	const APPEARANCE_TOOLS_OPT_INS = array(
 		array( 'background', 'backgroundImage' ),
+		array( 'background', 'backgroundSize' ),
 		array( 'border', 'color' ),
 		array( 'border', 'radius' ),
 		array( 'border', 'style' ),
@@ -658,6 +703,7 @@ public static function get_element_class_name( $element ) {
 		array( 'color', 'heading' ),
 		array( 'color', 'button' ),
 		array( 'color', 'caption' ),
+		array( 'dimensions', 'aspectRatio' ),
 		array( 'dimensions', 'minHeight' ),
 		// BEGIN EXPERIMENTAL.
 		// Allow `position.fixed` to be opted-in by default.
@@ -677,37 +723,35 @@ public static function get_element_class_name( $element ) {
 	 *
 	 * @since 5.8.0
 	 * @since 5.9.0 Changed value from 1 to 2.
+	 * @since 6.5.0 Changed value from 2 to 3.
 	 * @var int
 	 */
-	const LATEST_SCHEMA = 2;
+	const LATEST_SCHEMA = 3;
 
 	/**
 	 * Constructor.
 	 *
 	 * @since 5.8.0
+	 * @since 6.6.0 Key spacingScale by origin, and pre-generate the spacingSizes from spacingScale.
+	 *              Added unwrapping of shared block style variations into block type variations if registered.
 	 *
 	 * @param array  $theme_json A structure that follows the theme.json schema.
 	 * @param string $origin     Optional. What source of data this object represents.
-	 *                           One of 'default', 'theme', or 'custom'. Default 'theme'.
+	 *                           One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
 	 */
-	public function __construct( $theme_json = array(), $origin = 'theme' ) {
+	public function __construct( $theme_json = array( 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA ), $origin = 'theme' ) {
 		if ( ! in_array( $origin, static::VALID_ORIGINS, true ) ) {
 			$origin = 'theme';
 		}
 
-		$this->theme_json    = WP_Theme_JSON_Schema_Gutenberg::migrate( $theme_json );
+		$this->theme_json    = WP_Theme_JSON_Schema_Gutenberg::migrate( $theme_json, $origin );
 		$registry            = WP_Block_Type_Registry::get_instance();
 		$valid_block_names   = array_keys( $registry->get_all_registered() );
 		$valid_element_names = array_keys( static::ELEMENTS );
-		$valid_variations    = array();
-		foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
-			if ( ! isset( $block_meta['styleVariations'] ) ) {
-				continue;
-			}
-			$valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
-		}
-		$theme_json       = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names, $valid_variations );
-		$this->theme_json = static::maybe_opt_in_into_settings( $theme_json );
+		$valid_variations    = static::get_valid_block_style_variations();
+		$this->theme_json    = static::unwrap_shared_block_style_variations( $this->theme_json, $valid_variations );
+		$this->theme_json    = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names, $valid_variations );
+		$this->theme_json    = static::maybe_opt_in_into_settings( $this->theme_json );
 
 		// Internally, presets are keyed by origin.
 		$nodes = static::get_setting_nodes( $this->theme_json );
@@ -726,6 +770,95 @@ public function __construct( $theme_json = array(), $origin = 'theme' ) {
 				}
 			}
 		}
+
+		// In addition to presets, spacingScale (which generates presets) is also keyed by origin.
+		$scale_path    = array( 'settings', 'spacing', 'spacingScale' );
+		$spacing_scale = _wp_array_get( $this->theme_json, $scale_path, null );
+		if ( null !== $spacing_scale ) {
+			// If the spacingScale is not already keyed by origin.
+			if ( empty( array_intersect( array_keys( $spacing_scale ), static::VALID_ORIGINS ) ) ) {
+				_wp_array_set( $this->theme_json, $scale_path, array( $origin => $spacing_scale ) );
+			}
+		}
+
+		// Pre-generate the spacingSizes from spacingScale.
+		$scale_path    = array( 'settings', 'spacing', 'spacingScale', $origin );
+		$spacing_scale = _wp_array_get( $this->theme_json, $scale_path, null );
+		if ( isset( $spacing_scale ) ) {
+			$sizes_path           = array( 'settings', 'spacing', 'spacingSizes', $origin );
+			$spacing_sizes        = _wp_array_get( $this->theme_json, $sizes_path, array() );
+			$spacing_scale_sizes  = static::compute_spacing_sizes( $spacing_scale );
+			$merged_spacing_sizes = static::merge_spacing_sizes( $spacing_scale_sizes, $spacing_sizes );
+			_wp_array_set( $this->theme_json, $sizes_path, $merged_spacing_sizes );
+		}
+	}
+
+	/**
+	 * Unwraps shared block style variations.
+	 *
+	 * It takes the shared variations (styles.variations.variationName) and
+	 * applies them to all the blocks that have the given variation registered
+	 * (styles.blocks.blockType.variations.variationName).
+	 *
+	 * For example, given the `core/paragraph` and `core/group` blocks have
+	 * registered the `section-a` style variation, and given the following input:
+	 *
+	 * {
+	 *   "styles": {
+	 *     "variations": {
+	 *       "section-a": { "color": { "background": "backgroundColor" } }
+	 *     }
+	 *   }
+	 * }
+	 *
+	 * It returns the following output:
+	 *
+	 * {
+	 *   "styles": {
+	 *     "blocks": {
+	 *       "core/paragraph": {
+	 *         "variations": {
+	 *             "section-a": { "color": { "background": "backgroundColor" } }
+	 *         },
+	 *       },
+	 *       "core/group": {
+	 *         "variations": {
+	 *           "section-a": { "color": { "background": "backgroundColor" } }
+	 *         }
+	 *       }
+	 *     }
+	 *   }
+	 * }
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array $theme_json       A structure that follows the theme.json schema.
+	 * @param array $valid_variations Valid block style variations.
+	 *
+	 * @return array Theme json data with shared variation definitions unwrapped under appropriate block types.
+	 */
+	private static function unwrap_shared_block_style_variations( $theme_json, $valid_variations ) {
+		if ( empty( $theme_json['styles']['variations'] ) || empty( $valid_variations ) ) {
+			return $theme_json;
+		}
+
+		$new_theme_json = $theme_json;
+		$variations     = $new_theme_json['styles']['variations'];
+
+		foreach ( $valid_variations as $block_type => $registered_variations ) {
+			foreach ( $registered_variations as $variation_name ) {
+				$block_level_data = $new_theme_json['styles']['blocks'][ $block_type ]['variations'][ $variation_name ] ?? array();
+				$top_level_data   = $variations[ $variation_name ] ?? array();
+				$merged_data      = array_replace_recursive( $top_level_data, $block_level_data );
+				if ( ! empty( $merged_data ) ) {
+					_wp_array_set( $new_theme_json, array( 'styles', 'blocks', $block_type, 'variations', $variation_name ), $merged_data );
+				}
+			}
+		}
+
+		unset( $new_theme_json['styles']['variations'] );
+
+		return $new_theme_json;
 	}
 
 	/**
@@ -781,6 +914,7 @@ protected static function do_opt_in_into_settings( &$context ) {
 	 *
 	 * @since 5.8.0
 	 * @since 5.9.0 Added the `$valid_block_names` and `$valid_element_name` parameters.
+	 * @since 6.6.0 Extended schema definition to allow enhanced block style variations.
 	 *
 	 * @param array $input               Structure to sanitize.
 	 * @param array $valid_block_names   List of valid block names.
@@ -839,6 +973,27 @@ protected static function sanitize( $input, $valid_block_names, $valid_element_n
 
 		$schema_styles_blocks   = array();
 		$schema_settings_blocks = array();
+
+		/*
+		 * Generate a schema for blocks.
+		 * - Block styles can contain `elements` & `variations` definitions.
+		 * - Variations definitions cannot be nested.
+		 * - Variations can contain styles for inner `blocks`.
+		 * - Variation inner `blocks` styles can contain `elements`.
+		 *
+		 * As each variation needs a `blocks` schema but further nested
+		 * inner `blocks`, the overall schema will be generated in multiple passes.
+		 */
+		foreach ( $valid_block_names as $block ) {
+			$schema_settings_blocks[ $block ]           = static::VALID_SETTINGS;
+			$schema_styles_blocks[ $block ]             = $styles_non_top_level;
+			$schema_styles_blocks[ $block ]['elements'] = $schema_styles_elements;
+		}
+
+		$block_style_variation_styles             = static::VALID_STYLES;
+		$block_style_variation_styles['blocks']   = $schema_styles_blocks;
+		$block_style_variation_styles['elements'] = $schema_styles_elements;
+
 		foreach ( $valid_block_names as $block ) {
 			// Build the schema for each block style variation.
 			$style_variation_names = array();
@@ -855,12 +1010,9 @@ protected static function sanitize( $input, $valid_block_names, $valid_element_n
 
 			$schema_styles_variations = array();
 			if ( ! empty( $style_variation_names ) ) {
-				$schema_styles_variations = array_fill_keys( $style_variation_names, $styles_non_top_level );
+				$schema_styles_variations = array_fill_keys( $style_variation_names, $block_style_variation_styles );
 			}
 
-			$schema_settings_blocks[ $block ]             = static::VALID_SETTINGS;
-			$schema_styles_blocks[ $block ]               = $styles_non_top_level;
-			$schema_styles_blocks[ $block ]['elements']   = $schema_styles_elements;
 			$schema_styles_blocks[ $block ]['variations'] = $schema_styles_variations;
 		}
 
@@ -973,17 +1125,37 @@ protected static function prepend_to_selector( $selector, $to_prepend ) {
 	 * @since 5.8.0
 	 * @since 5.9.0 Added `duotone` key with CSS selector.
 	 * @since 6.1.0 Added `features` key with block support feature level selectors.
+	 * @since 6.6.0 Added non-core block style variations to generated metadata.
 	 *
 	 * @return array Block metadata.
 	 */
 	protected static function get_blocks_metadata() {
 		// NOTE: the compat/6.1 version of this method in Gutenberg did not have these changes.
-		$registry = WP_Block_Type_Registry::get_instance();
-		$blocks   = $registry->get_all_registered();
+		$registry       = WP_Block_Type_Registry::get_instance();
+		$blocks         = $registry->get_all_registered();
+		$style_registry = WP_Block_Styles_Registry::get_instance();
 
 		// Is there metadata for all currently registered blocks?
 		$blocks = array_diff_key( $blocks, static::$blocks_metadata );
 		if ( empty( $blocks ) ) {
+			/*
+			 * New block styles may have been registered within WP_Block_Styles_Registry.
+			 * Update block metadata for any new block style variations.
+			 */
+			$registered_styles = $style_registry->get_all_registered();
+			foreach ( static::$blocks_metadata as $block_name => $block_metadata ) {
+				if ( ! empty( $registered_styles[ $block_name ] ) ) {
+					$style_selectors = $block_metadata['styleVariations'] ?? array();
+
+					foreach ( $registered_styles[ $block_name ] as $block_style ) {
+						if ( ! isset( $style_selectors[ $block_style['name'] ] ) ) {
+							$style_selectors[ $block_style['name'] ] = static::get_block_style_variation_selector( $block_style['name'], $block_metadata['selector'] );
+						}
+					}
+
+					static::$blocks_metadata[ $block_name ]['styleVariations'] = $style_selectors;
+				}
+			}
 			return static::$blocks_metadata;
 		}
 
@@ -1007,7 +1179,7 @@ protected static function get_blocks_metadata() {
 
 				if ( $duotone_support ) {
 					$root_selector    = wp_get_block_css_selector( $block_type );
-					$duotone_selector = WP_Theme_JSON_Gutenberg::scope_selector( $root_selector, $duotone_support );
+					$duotone_selector = static::scope_selector( $root_selector, $duotone_support );
 				}
 			}
 
@@ -1016,12 +1188,20 @@ protected static function get_blocks_metadata() {
 			}
 
 			// If the block has style variations, append their selectors to the block metadata.
+			$style_selectors = array();
 			if ( ! empty( $block_type->styles ) ) {
-				$style_selectors = array();
 				foreach ( $block_type->styles as $style ) {
-					// The style variation classname is duplicated in the selector to ensure that it overrides core block styles.
-					$style_selectors[ $style['name'] ] = static::append_to_selector( '.is-style-' . $style['name'] . '.is-style-' . $style['name'], static::$blocks_metadata[ $block_name ]['selector'] );
+					$style_selectors[ $style['name'] ] = static::get_block_style_variation_selector( $style['name'], static::$blocks_metadata[ $block_name ]['selector'] );
 				}
+			}
+
+			// Block style variations can be registered through the WP_Block_Styles_Registry as well as block.json.
+			$registered_styles = $style_registry->get_registered_styles_for_block( $block_name );
+			foreach ( $registered_styles as $style ) {
+				$style_selectors[ $style['name'] ] = static::get_block_style_variation_selector( $style['name'], static::$blocks_metadata[ $block_name ]['selector'] );
+			}
+
+			if ( ! empty( $style_selectors ) ) {
 				static::$blocks_metadata[ $block_name ]['styleVariations'] = $style_selectors;
 			}
 		}
@@ -1133,6 +1313,7 @@ public function get_settings() {
 	 *
 	 * @since 5.8.0
 	 * @since 5.9.0 Removed the `$type` parameter`, added the `$types` and `$origins` parameters.
+	 * @since 6.6.0 Added option to skip root layout or block style variation styles.
 	 *
 	 * @param array $types   Types of styles to load. Will load all by default. It accepts:
 	 *                       - `variables`: only the CSS Custom Properties for presets & custom ones.
@@ -1140,8 +1321,11 @@ public function get_settings() {
 	 *                       - `presets`: only the classes for the presets.
 	 * @param array $origins A list of origins to include. By default it includes VALID_ORIGINS.
 	 * @param array $options An array of options for now used for internal purposes only (may change without notice).
-	 *                       The options currently supported are 'scope' that makes sure all style are scoped to a given selector,
-	 *                       and root_selector which overwrites and forces a given selector to be used on the root node.
+	 *                       The options currently supported are:
+	 *                       - 'scope' that makes sure all style are scoped to a given selector
+	 *                       - `root_selector` which overwrites and forces a given selector to be used on the root node
+	 *                       - `skip_root_layout_styles` which omits root layout styles from the generated stylesheet.
+	 *                       - `include_block_style_variations` which includes CSS for block style variations.
 	 * @return string The resulting stylesheet.
 	 */
 	public function get_stylesheet( $types = array( 'variables', 'styles', 'presets' ), $origins = null, $options = array() ) {
@@ -1162,7 +1346,7 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 		}
 
 		$blocks_metadata = static::get_blocks_metadata();
-		$style_nodes     = static::get_style_nodes( $this->theme_json, $blocks_metadata );
+		$style_nodes     = static::get_style_nodes( $this->theme_json, $blocks_metadata, $options );
 		$setting_nodes   = static::get_setting_nodes( $this->theme_json, $blocks_metadata );
 
 		$root_style_key    = array_search( static::ROOT_BLOCK_SELECTOR, array_column( $style_nodes, 'selector' ), true );
@@ -1173,7 +1357,7 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 				$node['selector'] = static::scope_selector( $options['scope'], $node['selector'] );
 			}
 			foreach ( $style_nodes as &$node ) {
-				$node['selector'] = static::scope_selector( $options['scope'], $node['selector'] );
+				$node = static::scope_style_node_selectors( $options['scope'], $node );
 			}
 			unset( $node );
 		}
@@ -1183,7 +1367,7 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 				$setting_nodes[ $root_settings_key ]['selector'] = $options['root_selector'];
 			}
 			if ( false !== $root_style_key ) {
-				$setting_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
+				$style_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
 			}
 		}
 
@@ -1194,7 +1378,7 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 		}
 
 		if ( in_array( 'styles', $types, true ) ) {
-			if ( false !== $root_style_key ) {
+			if ( false !== $root_style_key && empty( $options['skip_root_layout_styles'] ) ) {
 				$stylesheet .= $this->get_root_layout_rules( $style_nodes[ $root_style_key ]['selector'], $style_nodes[ $root_style_key ] );
 			}
 			$stylesheet .= $this->get_block_classes( $style_nodes );
@@ -1230,7 +1414,7 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 			);
 
 			foreach ( $base_styles_nodes as $base_style_node ) {
-				$stylesheet .= $this->get_layout_styles( $base_style_node );
+				$stylesheet .= $this->get_layout_styles( $base_style_node, $types );
 			}
 		}
 
@@ -1238,6 +1422,12 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 			$stylesheet .= $this->get_preset_classes( $setting_nodes, $origins );
 		}
 
+		// Load the custom CSS last so it has the highest specificity.
+		if ( in_array( 'custom-css', $types, true ) ) {
+			// Add the global styles root CSS.
+			$stylesheet .= _wp_array_get( $this->theme_json, array( 'styles', 'css' ) );
+		}
+
 		return $stylesheet;
 	}
 
@@ -1253,13 +1443,20 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 	protected function process_blocks_custom_css( $css, $selector ) {
 		$processed_css = '';
 
+		if ( empty( $css ) ) {
+			return $processed_css;
+		}
+
 		// Split CSS nested rules.
 		$parts = explode( '&', $css );
 		foreach ( $parts as $part ) {
+			if ( empty( $part ) ) {
+				continue;
+			}
 			$is_root_css = ( ! str_contains( $part, '{' ) );
 			if ( $is_root_css ) {
 				// If the part doesn't contain braces, it applies to the root level.
-				$processed_css .= trim( $selector ) . '{' . trim( $part ) . '}';
+				$processed_css .= ':root :where(' . trim( $selector ) . '){' . trim( $part ) . '}';
 			} else {
 				// If the part contains braces, it's a nested CSS rule.
 				$part = explode( '{', str_replace( '}', '', $part ) );
@@ -1268,10 +1465,24 @@ protected function process_blocks_custom_css( $css, $selector ) {
 				}
 				$nested_selector = $part[0];
 				$css_value       = $part[1];
-				$part_selector   = str_starts_with( $nested_selector, ' ' )
+
+				/*
+				 * Handle pseudo elements such as ::before, ::after etc. Regex will also
+				 * capture any leading combinator such as >, +, or ~, as well as spaces.
+				 * This allows pseudo elements as descendants e.g. `.parent ::before`.
+				 */
+				$matches            = array();
+				$has_pseudo_element = preg_match( '/([>+~\s]*::[a-zA-Z-]+)/', $nested_selector, $matches );
+				$pseudo_part        = $has_pseudo_element ? $matches[1] : '';
+				$nested_selector    = $has_pseudo_element ? str_replace( $pseudo_part, '', $nested_selector ) : $nested_selector;
+
+				// Finalize selector and re-append pseudo element if required.
+				$part_selector  = str_starts_with( $nested_selector, ' ' )
 					? static::scope_selector( $selector, $nested_selector )
 					: static::append_to_selector( $selector, $nested_selector );
-				$processed_css  .= $part_selector . '{' . trim( $css_value ) . '}';
+				$final_selector = ":root :where($part_selector)$pseudo_part";
+
+				$processed_css .= $final_selector . '{' . trim( $css_value ) . '}';
 			}
 		}
 		return $processed_css;
@@ -1281,25 +1492,74 @@ protected function process_blocks_custom_css( $css, $selector ) {
 	 * Returns the global styles custom css.
 	 *
 	 * @since 6.2.0
+	 * @deprecated 6.7.0 Use {@see 'get_stylesheet'} instead.
 	 *
 	 * @return string The global styles custom CSS.
 	 */
 	public function get_custom_css() {
-		// Add the global styles root CSS.
-		$stylesheet = $this->theme_json['styles']['css'] ?? '';
+		_deprecated_function( __METHOD__, '6.7.0', 'get_stylesheet' );
+		$block_custom_css = '';
+		$block_nodes      = $this->get_block_custom_css_nodes();
+		foreach ( $block_nodes as $node ) {
+			// The node selector will have its specificity set to 0-1-0 within process_blocks_custom_css.
+			$block_custom_css .= $this->get_block_custom_css( $node['css'], $node['selector'] );
+		}
+
+		return $this->get_base_custom_css() . $block_custom_css;
+	}
+
+	/**
+	 * Returns the global styles base custom CSS.
+	 * This function is deprecated; please do not sync to core.
+	 *
+	 * @return string The global styles base custom CSS.
+	 */
+	public function get_base_custom_css() {
+		_deprecated_function( __METHOD__, 'Gutenberg 18.6.0', 'get_stylesheet' );
+		return isset( $this->theme_json['styles']['css'] ) ? $this->theme_json['styles']['css'] : '';
+	}
+
+	/**
+	 * Returns the block nodes with custom CSS.
+	 * This function is deprecated; please do not sync to core.
+	 *
+	 * @return array The block nodes.
+	 */
+	public function get_block_custom_css_nodes() {
+		_deprecated_function( __METHOD__, 'Gutenberg 18.6.0', 'get_block_nodes' );
+		$block_nodes = array();
 
 		// Add the global styles block CSS.
 		if ( isset( $this->theme_json['styles']['blocks'] ) ) {
 			foreach ( $this->theme_json['styles']['blocks'] as $name => $node ) {
-				$custom_block_css = $this->theme_json['styles']['blocks'][ $name ]['css'] ?? null;
+				$custom_block_css = isset( $this->theme_json['styles']['blocks'][ $name ]['css'] )
+					? $this->theme_json['styles']['blocks'][ $name ]['css']
+					: null;
 				if ( $custom_block_css ) {
-					$selector    = static::$blocks_metadata[ $name ]['selector'];
-					$stylesheet .= $this->process_blocks_custom_css( $custom_block_css, $selector );
+					$block_nodes[] = array(
+						'name'     => $name,
+						'selector' => static::$blocks_metadata[ $name ]['selector'],
+						'css'      => $custom_block_css,
+					);
 				}
 			}
 		}
 
-		return $stylesheet;
+		return $block_nodes;
+	}
+
+	/**
+	 * Returns the global styles custom CSS for a single block.
+	 * This function is deprecated; please do not sync to core.
+	 *
+	 * @param array  $css The block css node.
+	 * @param string $selector The block selector.
+	 *
+	 * @return string The global styles custom CSS for the block.
+	 */
+	public function get_block_custom_css( $css, $selector ) {
+		_deprecated_function( __METHOD__, 'Gutenberg 18.6.0', 'get_styles_for_block' );
+		return $this->process_blocks_custom_css( $css, $selector );
 	}
 
 	/**
@@ -1392,7 +1652,7 @@ protected function get_block_classes( $style_nodes ) {
 	 * @param array $block_metadata Metadata about the block to get styles for.
 	 * @return string Layout styles for the block.
 	 */
-	protected function get_layout_styles( $block_metadata ) {
+	protected function get_layout_styles( $block_metadata, $types = array() ) {
 		$block_rules = '';
 		$block_type  = null;
 
@@ -1413,7 +1673,7 @@ protected function get_layout_styles( $block_metadata ) {
 		$has_fallback_gap_support = ! $has_block_gap_support; // This setting isn't useful yet: it exists as a placeholder for a future explicit fallback gap styles support.
 		$node                     = _wp_array_get( $this->theme_json, $block_metadata['path'], array() );
 		$layout_definitions       = gutenberg_get_layout_definitions();
-		$layout_selector_pattern  = '/^[a-zA-Z0-9\-\.\ *+>:\(\)]*$/'; // Allow alphanumeric classnames, spaces, wildcard, sibling, child combinator and pseudo class selectors.
+		$layout_selector_pattern  = '/^[a-zA-Z0-9\-\.\,\ *+>:\(\)]*$/'; // Allow alphanumeric classnames, spaces, wildcard, sibling, child combinator and pseudo class selectors.
 
 		// Gap styles will only be output if the theme has block gap support, or supports a fallback gap.
 		// Default layout gap styles will be skipped for themes that do not explicitly opt-in to blockGap with a `true` or `false` value.
@@ -1484,7 +1744,7 @@ protected function get_layout_styles( $block_metadata ) {
 										$spacing_rule['selector']
 									);
 								} else {
-									$format          = static::ROOT_BLOCK_SELECTOR === $selector ? ':where(%s .%s) %s' : '%s-%s%s';
+									$format          = static::ROOT_BLOCK_SELECTOR === $selector ? ':root :where(.%2$s)%3$s' : ':root :where(%1$s-%2$s)%3$s';
 									$layout_selector = sprintf(
 										$format,
 										$selector,
@@ -1538,12 +1798,27 @@ protected function get_layout_styles( $block_metadata ) {
 					foreach ( $base_style_rules as $base_style_rule ) {
 						$declarations = array();
 
+						// Skip outputting base styles for flow and constrained layout types if theme doesn't support theme.json. The 'base-layout-styles' type flags this.
+						if ( in_array( 'base-layout-styles', $types, true ) && ( 'default' === $layout_definition['name'] || 'constrained' === $layout_definition['name'] ) ) {
+							continue;
+						}
+
 						if (
 							isset( $base_style_rule['selector'] ) &&
 							preg_match( $layout_selector_pattern, $base_style_rule['selector'] ) &&
 							! empty( $base_style_rule['rules'] )
 						) {
 							foreach ( $base_style_rule['rules'] as $css_property => $css_value ) {
+								// Skip rules that reference content size or wide size if they are not defined in the theme.json.
+								if (
+									is_string( $css_value ) &&
+									( str_contains( $css_value, '--global--content-size' ) || str_contains( $css_value, '--global--wide-size' ) ) &&
+									! isset( $this->theme_json['settings']['layout']['contentSize'] ) &&
+									! isset( $this->theme_json['settings']['layout']['wideSize'] )
+								) {
+									continue;
+								}
+
 								if ( static::is_safe_css_declaration( $css_property, $css_value ) ) {
 									$declarations[] = array(
 										'name'  => $css_property,
@@ -1553,8 +1828,7 @@ protected function get_layout_styles( $block_metadata ) {
 							}
 
 							$layout_selector = sprintf(
-								'%s .%s%s',
-								$selector,
+								'.%s%s',
 								$class_name,
 								$base_style_rule['selector']
 							);
@@ -1693,7 +1967,7 @@ static function ( $carry, $element ) {
 	 * @return string The result of processing the presets.
 	 */
 	protected static function compute_preset_classes( $settings, $selector, $origins ) {
-		if ( static::ROOT_BLOCK_SELECTOR === $selector ) {
+		if ( static::ROOT_BLOCK_SELECTOR === $selector || static::ROOT_CSS_PROPERTIES_SELECTOR === $selector ) {
 			// Classes at the global level do not need any CSS prefixed,
 			// and we don't want to increase its specificity.
 			$selector = '';
@@ -1747,6 +2021,10 @@ protected static function compute_preset_classes( $settings, $selector, $origins
 	 * @return string Scoped selector.
 	 */
 	public static function scope_selector( $scope, $selector ) {
+		if ( ! $scope || ! $selector ) {
+			return $selector;
+		}
+
 		$scopes    = explode( ',', $scope );
 		$selectors = explode( ',', $selector );
 
@@ -1769,6 +2047,39 @@ public static function scope_selector( $scope, $selector ) {
 		return $result;
 	}
 
+	/**
+	 * Scopes the selectors for a given style node. This includes the primary
+	 * selector, i.e. `$node['selector']`, as well as any custom selectors for
+	 * features and subfeatures, e.g. `$node['selectors']['border']` etc.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $scope Selector to scope to.
+	 * @param array  $node  Style node with selectors to scope.
+	 *
+	 * @return array Node with updated selectors.
+	 */
+	protected static function scope_style_node_selectors( $scope, $node ) {
+		$node['selector'] = static::scope_selector( $scope, $node['selector'] );
+
+		if ( empty( $node['selectors'] ) ) {
+			return $node;
+		}
+
+		foreach ( $node['selectors'] as $feature => $selector ) {
+			if ( is_string( $selector ) ) {
+				$node['selectors'][ $feature ] = static::scope_selector( $scope, $selector );
+			}
+			if ( is_array( $selector ) ) {
+				foreach ( $selector as $subfeature => $subfeature_selector ) {
+					$node['selectors'][ $feature ][ $subfeature ] = static::scope_selector( $scope, $subfeature_selector );
+				}
+			}
+		}
+
+		return $node;
+	}
+
 	/**
 	 * Gets preset values keyed by slugs based on settings and metadata.
 	 *
@@ -1799,6 +2110,7 @@ public static function scope_selector( $scope, $selector ) {
 	 * </code>
 	 *
 	 * @since 5.9.0
+	 * @since 6.6.0 Passing $settings to the callbacks defined in static::PRESETS_METADATA.
 	 *
 	 * @param array $settings        Settings to process.
 	 * @param array $preset_metadata One of the PRESETS_METADATA values.
@@ -1825,7 +2137,7 @@ protected static function get_settings_values_by_slug( $settings, $preset_metada
 					is_callable( $preset_metadata['value_func'] )
 				) {
 					$value_func = $preset_metadata['value_func'];
-					$value      = call_user_func( $value_func, $preset );
+					$value      = call_user_func( $value_func, $preset, $settings );
 				} else {
 					// If we don't have a value, then don't add it to the result.
 					continue;
@@ -2017,13 +2329,16 @@ protected static function flatten_tree( $tree, $prefix = '', $token = '--' ) {
 	 * ```php
 	 * array(
 	 *   'name'  => 'property_name',
-	 *   'value' => 'property_value,
+	 *   'value' => 'property_value',
 	 * )
 	 * ```
 	 *
 	 * @since 5.8.0
 	 * @since 5.9.0 Added the `$settings` and `$properties` parameters.
 	 * @since 6.1.0 Added `$theme_json`, `$selector`, and `$use_root_padding` parameters.
+	 * @since 6.5.0 Output a `min-height: unset` rule when `aspect-ratio` is set.
+	 * @since 6.6.0 Passing current theme JSON settings to wp_get_typography_font_size_value(). Using style engine to correctly fetch background CSS values.
+	 * @since 6.7.0 Allow ref resolution of background properties.
 	 *
 	 * @param array   $styles Styles to process.
 	 * @param array   $settings Theme settings.
@@ -2034,42 +2349,60 @@ protected static function flatten_tree( $tree, $prefix = '', $token = '--' ) {
 	 * @return array  Returns the modified $declarations.
 	 */
 	protected static function compute_style_properties( $styles, $settings = array(), $properties = null, $theme_json = null, $selector = null, $use_root_padding = null ) {
-		if ( null === $properties ) {
-			$properties = static::PROPERTIES_METADATA;
-		}
-
-		$declarations = array();
 		if ( empty( $styles ) ) {
-			return $declarations;
+			return array();
 		}
 
+		if ( null === $properties ) {
+			$properties = static::PROPERTIES_METADATA;
+		}
+		$declarations             = array();
 		$root_variable_duplicates = array();
+		$root_style_length        = strlen( '--wp--style--root--' );
 
 		foreach ( $properties as $css_property => $value_path ) {
-			$value = static::get_property_value( $styles, $value_path, $theme_json );
+			if ( ! is_array( $value_path ) ) {
+				continue;
+			}
 
-			if ( str_starts_with( $css_property, '--wp--style--root--' ) && ( static::ROOT_BLOCK_SELECTOR !== $selector || ! $use_root_padding ) ) {
+			$is_root_style = str_starts_with( $css_property, '--wp--style--root--' );
+			if ( $is_root_style && ( static::ROOT_BLOCK_SELECTOR !== $selector || ! $use_root_padding ) ) {
 				continue;
 			}
+
+			$value = static::get_property_value( $styles, $value_path, $theme_json );
+
 			// Root-level padding styles don't currently support strings with CSS shorthand values.
 			// This may change: https://github.com/WordPress/gutenberg/issues/40132.
 			if ( '--wp--style--root--padding' === $css_property && is_string( $value ) ) {
 				continue;
 			}
 
-			if ( str_starts_with( $css_property, '--wp--style--root--' ) && $use_root_padding ) {
-				$root_variable_duplicates[] = substr( $css_property, strlen( '--wp--style--root--' ) );
+			if ( $is_root_style && $use_root_padding ) {
+				$root_variable_duplicates[] = substr( $css_property, $root_style_length );
 			}
 
-			// Look up protected properties, keyed by value path.
-			// Skip protected properties that are explicitly set to `null`.
-			if ( is_array( $value_path ) ) {
-				$path_string = implode( '.', $value_path );
-				if (
-					isset( static::PROTECTED_PROPERTIES[ $path_string ] ) &&
-					_wp_array_get( $settings, static::PROTECTED_PROPERTIES[ $path_string ], null ) === null
-				) {
-					continue;
+			/*
+			 * Processes background image styles.
+			 * If the value is a URL, it will be converted to a CSS `url()` value.
+			 * For an uploaded image (images with a database ID), apply size and position
+			 * defaults equal to those applied in block supports in lib/background.php.
+			 */
+			if ( 'background-image' === $css_property && ! empty( $value ) ) {
+				$background_styles = gutenberg_style_engine_get_styles(
+					array( 'background' => array( 'backgroundImage' => $value ) )
+				);
+
+				$value = $background_styles['declarations'][ $css_property ];
+			}
+			if ( empty( $value ) && static::ROOT_BLOCK_SELECTOR !== $selector && ! empty( $styles['background']['backgroundImage']['id'] ) ) {
+				if ( 'background-size' === $css_property ) {
+					$value = 'cover';
+				}
+				// If the background size is set to `contain` and no position is set, set the position to `center`.
+				if ( 'background-position' === $css_property ) {
+					$background_size = $styles['background']['backgroundSize'] ?? null;
+					$value           = 'contain' === $background_size ? '50% 50%' : null;
 				}
 			}
 
@@ -2079,6 +2412,16 @@ protected static function compute_style_properties( $styles, $settings = array()
 				continue;
 			}
 
+			// Look up protected properties, keyed by value path.
+			// Skip protected properties that are explicitly set to `null`.
+			$path_string = implode( '.', $value_path );
+			if (
+				isset( static::PROTECTED_PROPERTIES[ $path_string ] ) &&
+				_wp_array_get( $settings, static::PROTECTED_PROPERTIES[ $path_string ], null ) === null
+			) {
+				continue;
+			}
+
 			// Calculates fluid typography rules where available.
 			if ( 'font-size' === $css_property ) {
 				/*
@@ -2087,8 +2430,18 @@ protected static function compute_style_properties( $styles, $settings = array()
 				 * whether the incoming value can be converted to a fluid value.
 				 * Values that already have a clamp() function will not pass the test,
 				 * and therefore the original $value will be returned.
+				 * Pass the current theme_json settings to override any global settings.
 				 */
-				$value = gutenberg_get_typography_font_size_value( array( 'size' => $value ) );
+				$value = gutenberg_get_typography_font_size_value( array( 'size' => $value ), $settings );
+			}
+
+			if ( 'aspect-ratio' === $css_property ) {
+				// For aspect ratio to work, other dimensions rules must be unset.
+				// This ensures that a fixed height does not override the aspect ratio.
+				$declarations[] = array(
+					'name'  => 'min-height',
+					'value' => 'unset',
+				);
 			}
 
 			$declarations[] = array(
@@ -2118,6 +2471,7 @@ protected static function compute_style_properties( $styles, $settings = array()
 	 * @since 5.8.0
 	 * @since 5.9.0 Added support for values of array type, which are returned as is.
 	 * @since 6.1.0 Added the `$theme_json` parameter.
+	 * @since 6.7.0 Added support for background image refs
 	 *
 	 * @param array $styles Styles subtree.
 	 * @param array $path   Which property to process.
@@ -2134,15 +2488,17 @@ protected static function get_property_value( $styles, $path, $theme_json = null
 		}
 
 		/*
-		 * This converts references to a path to the value at that path
-		 * where the values is an array with a "ref" key, pointing to a path.
+		 * Where the current value is an array with a 'ref' key pointing
+		 * to a path, this converts that path into the value at that path.
 		 * For example: { "ref": "style.color.background" } => "#fff".
 		 */
 		if ( is_array( $value ) && isset( $value['ref'] ) ) {
 			$value_path = explode( '.', $value['ref'] );
-			$ref_value  = _wp_array_get( $theme_json, $value_path );
+			$ref_value  = _wp_array_get( $theme_json, $value_path, null );
+			// Background Image refs can refer to a string or an array containing a URL string.
+			$ref_value_url = $ref_value['url'] ?? null;
 			// Only use the ref value if we find anything.
-			if ( ! empty( $ref_value ) && is_string( $ref_value ) ) {
+			if ( ! empty( $ref_value ) && ( is_string( $ref_value ) || is_string( $ref_value_url ) ) ) {
 				$value = $ref_value;
 			}
 
@@ -2200,7 +2556,7 @@ protected static function get_setting_nodes( $theme_json, $selectors = array() )
 		// Top-level.
 		$nodes[] = array(
 			'path'     => array( 'settings' ),
-			'selector' => static::ROOT_BLOCK_SELECTOR,
+			'selector' => static::ROOT_CSS_PROPERTIES_SELECTOR,
 		);
 
 		// Calculate paths for blocks.
@@ -2243,9 +2599,12 @@ protected static function get_setting_nodes( $theme_json, $selectors = array() )
 	 *
 	 * @param array $theme_json The tree to extract style nodes from.
 	 * @param array $selectors  List of selectors per block.
+	 * @param array $options    An array of options to facilitate filtering style node generation
+	 *                          The options currently supported are:
+	 *                            - `include_block_style_variations` which includes CSS for block style variations.
 	 * @return array An array of style nodes metadata.
 	 */
-	protected static function get_style_nodes( $theme_json, $selectors = array() ) {
+	protected static function get_style_nodes( $theme_json, $selectors = array(), $options = array() ) {
 		$nodes = array();
 		if ( ! isset( $theme_json['styles'] ) ) {
 			return $nodes;
@@ -2289,7 +2648,7 @@ protected static function get_style_nodes( $theme_json, $selectors = array() ) {
 			return $nodes;
 		}
 
-		$block_nodes = static::get_block_nodes( $theme_json, $selectors );
+		$block_nodes = static::get_block_nodes( $theme_json, $selectors, $options );
 		foreach ( $block_nodes as $block_node ) {
 			$nodes[] = $block_node;
 		}
@@ -2364,59 +2723,84 @@ private static function update_separator_declarations( $declarations ) {
 	 *
 	 * @param array $theme_json The theme.json converted to an array.
 	 * @param array $selectors  Optional list of selectors per block.
+	 * @param array $options {
+	 *     Optional. An array of options for now used for internal purposes only (may change without notice).
+	 *
+	 *     @type bool $include_block_style_variations Includes nodes for block style variations. Default false.
+	 *     @type bool $include_node_paths_only        Return only block nodes node paths. Default false.
+	 * }
 	 * @return array The block nodes in theme.json.
 	 */
-	private static function get_block_nodes( $theme_json, $selectors = array() ) {
-		$selectors = empty( $selectors ) ? static::get_blocks_metadata() : $selectors;
-		$nodes     = array();
-		if ( ! isset( $theme_json['styles'] ) ) {
-			return $nodes;
-		}
+	private static function get_block_nodes( $theme_json, $selectors = array(), $options = array() ) {
+		$nodes = array();
 
-		// Blocks.
 		if ( ! isset( $theme_json['styles']['blocks'] ) ) {
 			return $nodes;
 		}
 
-		foreach ( $theme_json['styles']['blocks'] as $name => $node ) {
-			$selector = null;
-			if ( isset( $selectors[ $name ]['selector'] ) ) {
-				$selector = $selectors[ $name ]['selector'];
-			}
+		$include_variations      = $options['include_block_style_variations'] ?? false;
+		$include_node_paths_only = $options['include_node_paths_only'] ?? false;
 
-			$duotone_selector = null;
-			if ( isset( $selectors[ $name ]['duotone'] ) ) {
-				$duotone_selector = $selectors[ $name ]['duotone'];
-			}
+		// If only node paths are to be returned, skip selector assignment.
+		if ( ! $include_node_paths_only ) {
+			$selectors = empty( $selectors ) ? static::get_blocks_metadata() : $selectors;
+		}
 
-			$feature_selectors = null;
-			if ( isset( $selectors[ $name ]['selectors'] ) ) {
-				$feature_selectors = $selectors[ $name ]['selectors'];
-			}
+		foreach ( $theme_json['styles']['blocks'] as $name => $node ) {
+			$node_path = array( 'styles', 'blocks', $name );
+			if ( $include_node_paths_only ) {
+				$nodes[] = array(
+					'path' => $node_path,
+				);
+			} else {
+				$selector = null;
+				if ( isset( $selectors[ $name ]['selector'] ) ) {
+					$selector = $selectors[ $name ]['selector'];
+				}
 
-			$variation_selectors = array();
-			if ( isset( $node['variations'] ) ) {
-				foreach ( $node['variations'] as $variation => $node ) {
-					$variation_selectors[] = array(
-						'path'     => array( 'styles', 'blocks', $name, 'variations', $variation ),
-						'selector' => $selectors[ $name ]['styleVariations'][ $variation ],
-					);
+				$duotone_selector = null;
+				if ( isset( $selectors[ $name ]['duotone'] ) ) {
+					$duotone_selector = $selectors[ $name ]['duotone'];
 				}
-			}
 
-			$nodes[] = array(
-				'name'       => $name,
-				'path'       => array( 'styles', 'blocks', $name ),
-				'selector'   => $selector,
-				'selectors'  => $feature_selectors,
-				'duotone'    => $duotone_selector,
-				'variations' => $variation_selectors,
-			);
+				$feature_selectors = null;
+				if ( isset( $selectors[ $name ]['selectors'] ) ) {
+					$feature_selectors = $selectors[ $name ]['selectors'];
+				}
+
+				$variation_selectors = array();
 
+				if ( $include_variations && isset( $node['variations'] ) ) {
+					foreach ( $node['variations'] as $variation => $node ) {
+						$variation_selectors[] = array(
+							'path'     => array( 'styles', 'blocks', $name, 'variations', $variation ),
+							'selector' => $selectors[ $name ]['styleVariations'][ $variation ],
+						);
+					}
+				}
+
+				$nodes[] = array(
+					'name'       => $name,
+					'path'       => $node_path,
+					'selector'   => $selector,
+					'selectors'  => $feature_selectors,
+					'duotone'    => $duotone_selector,
+					'variations' => $variation_selectors,
+					'css'        => $selector,
+				);
+			}
 			if ( isset( $theme_json['styles']['blocks'][ $name ]['elements'] ) ) {
 				foreach ( $theme_json['styles']['blocks'][ $name ]['elements'] as $element => $node ) {
+					$node_path = array( 'styles', 'blocks', $name, 'elements', $element );
+					if ( $include_node_paths_only ) {
+						$nodes[] = array(
+							'path' => $node_path,
+						);
+						continue;
+					}
+
 					$nodes[] = array(
-						'path'     => array( 'styles', 'blocks', $name, 'elements', $element ),
+						'path'     => $node_path,
 						'selector' => $selectors[ $name ]['elements'][ $element ],
 					);
 
@@ -2424,8 +2808,16 @@ private static function get_block_nodes( $theme_json, $selectors = array() ) {
 					if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] ) ) {
 						foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] as $pseudo_selector ) {
 							if ( isset( $theme_json['styles']['blocks'][ $name ]['elements'][ $element ][ $pseudo_selector ] ) ) {
+								$node_path = array( 'styles', 'blocks', $name, 'elements', $element );
+								if ( $include_node_paths_only ) {
+									$nodes[] = array(
+										'path' => $node_path,
+									);
+									continue;
+								}
+
 								$nodes[] = array(
-									'path'     => array( 'styles', 'blocks', $name, 'elements', $element ),
+									'path'     => $node_path,
 									'selector' => static::append_to_selector( $selectors[ $name ]['elements'][ $element ], $pseudo_selector ),
 								);
 							}
@@ -2442,6 +2834,7 @@ private static function get_block_nodes( $theme_json, $selectors = array() ) {
 	 * Gets the CSS rules for a particular block from theme.json.
 	 *
 	 * @since 6.1.0
+	 * @since 6.6.0 Setting a min-height of HTML when root styles have a background gradient or image.
 	 *
 	 * @param array $block_metadata Metadata about the block to get styles for.
 	 *
@@ -2452,11 +2845,13 @@ public function get_styles_for_block( $block_metadata ) {
 		$use_root_padding = isset( $this->theme_json['settings']['useRootPaddingAwareAlignments'] ) && true === $this->theme_json['settings']['useRootPaddingAwareAlignments'];
 		$selector         = $block_metadata['selector'];
 		$settings         = $this->theme_json['settings'] ?? null;
+		$is_root_selector = static::ROOT_BLOCK_SELECTOR === $selector;
 
 		$feature_declarations = static::get_feature_declarations_for_node( $block_metadata, $node );
 
 		// If there are style variations, generate the declarations for them, including any feature selectors the block may have.
 		$style_variation_declarations = array();
+		$style_variation_custom_css   = array();
 		if ( ! empty( $block_metadata['variations'] ) ) {
 			foreach ( $block_metadata['variations'] as $style_variation ) {
 				$style_variation_node           = _wp_array_get( $this->theme_json, $style_variation['path'], array() );
@@ -2483,9 +2878,12 @@ static function ( $split_selector ) use ( $clean_style_variation_selector ) {
 					// Add the new declarations to the overall results under the modified selector.
 					$style_variation_declarations[ $combined_selectors ] = $new_declarations;
 				}
-
 				// Compute declarations for remaining styles not covered by feature level selectors.
 				$style_variation_declarations[ $style_variation['selector'] ] = static::compute_style_properties( $style_variation_node, $settings, null, $this->theme_json );
+				// Store custom CSS for the style variation.
+				if ( isset( $style_variation_node['css'] ) ) {
+					$style_variation_custom_css[ $style_variation['selector'] ] = $this->process_blocks_custom_css( $style_variation_node['css'], $style_variation['selector'] );
+				}
 			}
 		}
 
@@ -2537,10 +2935,16 @@ static function ( $pseudo_selector ) use ( $selector ) {
 		$block_rules = '';
 
 		/*
-		 * 1. Separate the declarations that use the general selector
+		 * 1. Bespoke declaration modifiers:
+		 * - 'filter': Separate the declarations that use the general selector
 		 * from the ones using the duotone selector.
+		 * - 'background|background-image': set the html min-height to 100%
+		 * to ensure the background covers the entire viewport.
+		 *
 		 */
-		$declarations_duotone = array();
+		$declarations_duotone       = array();
+		$should_set_root_min_height = false;
+
 		foreach ( $declarations as $index => $declaration ) {
 			if ( 'filter' === $declaration['name'] ) {
 				/*
@@ -2557,6 +2961,28 @@ static function ( $pseudo_selector ) use ( $selector ) {
 				}
 				unset( $declarations[ $index ] );
 			}
+
+			if ( $is_root_selector && ( 'background-image' === $declaration['name'] || 'background' === $declaration['name'] ) ) {
+				$should_set_root_min_height = true;
+			}
+		}
+
+		/*
+		 * If root styles has a background-image or a background (gradient) set,
+		 * set the min-height to '100%'. Minus `--wp-admin--admin-bar--height` for logged-in view.
+		 * Setting the CSS rule on the HTML tag ensures background gradients and images behave similarly,
+		 * and matches the behavior of the site editor.
+		 */
+		if ( $should_set_root_min_height ) {
+			$block_rules .= static::to_ruleset(
+				'html',
+				array(
+					array(
+						'name'  => 'min-height',
+						'value' => 'calc(100% - var(--wp-admin--admin-bar--height, 0px))',
+					),
+				)
+			);
 		}
 
 		// Update declarations if there are separators with only background color defined.
@@ -2564,8 +2990,28 @@ static function ( $pseudo_selector ) use ( $selector ) {
 			$declarations = static::update_separator_declarations( $declarations );
 		}
 
+		/*
+		 * Root selector (body) styles should not be wrapped in `:root where()` to keep
+		 * specificity at (0,0,1) and maintain backwards compatibility.
+		 *
+		 * Top-level element styles using element-only specificity selectors should
+		 * not get wrapped in `:root :where()` to maintain backwards compatibility.
+		 *
+		 * Pseudo classes, e.g. :hover, :focus etc., are a class-level selector so
+		 * still need to be wrapped in `:root :where` to cap specificity for nested
+		 * variations etc. Pseudo selectors won't match the ELEMENTS selector exactly.
+		 */
+		$element_only_selector = $is_root_selector || (
+				$current_element &&
+				isset( static::ELEMENTS[ $current_element ] ) &&
+				// buttons, captions etc. still need `:root :where()` as they are class based selectors.
+				! isset( static::__EXPERIMENTAL_ELEMENT_CLASS_NAMES[ $current_element ] ) &&
+				static::ELEMENTS[ $current_element ] === $selector
+			);
+
 		// 2. Generate and append the rules that use the general selector.
-		$block_rules .= static::to_ruleset( $selector, $declarations );
+		$general_selector = $element_only_selector ? $selector : ":root :where($selector)";
+		$block_rules     .= static::to_ruleset( $general_selector, $declarations );
 
 		// 3. Generate and append the rules that use the duotone selector.
 		if ( isset( $block_metadata['duotone'] ) && ! empty( $declarations_duotone ) ) {
@@ -2574,7 +3020,7 @@ static function ( $pseudo_selector ) use ( $selector ) {
 
 		// 4. Generate Layout block gap styles.
 		if (
-			static::ROOT_BLOCK_SELECTOR !== $selector &&
+			! $is_root_selector &&
 			! empty( $block_metadata['name'] )
 		) {
 			$block_rules .= $this->get_layout_styles( $block_metadata );
@@ -2582,12 +3028,20 @@ static function ( $pseudo_selector ) use ( $selector ) {
 
 		// 5. Generate and append the feature level rulesets.
 		foreach ( $feature_declarations as $feature_selector => $individual_feature_declarations ) {
-			$block_rules .= static::to_ruleset( $feature_selector, $individual_feature_declarations );
+			$block_rules .= static::to_ruleset( ":root :where($feature_selector)", $individual_feature_declarations );
 		}
 
 		// 6. Generate and append the style variation rulesets.
 		foreach ( $style_variation_declarations as $style_variation_selector => $individual_style_variation_declarations ) {
-			$block_rules .= static::to_ruleset( $style_variation_selector, $individual_style_variation_declarations );
+			$block_rules .= static::to_ruleset( ":root :where($style_variation_selector)", $individual_style_variation_declarations );
+			if ( isset( $style_variation_custom_css[ $style_variation_selector ] ) ) {
+				$block_rules .= $style_variation_custom_css[ $style_variation_selector ];
+			}
+		}
+
+		// 7. Generate and append any custom CSS rules.
+		if ( isset( $node['css'] ) && ! $is_root_selector ) {
+			$block_rules .= $this->process_blocks_custom_css( $node['css'], $selector );
 		}
 
 		return $block_rules;
@@ -2597,6 +3051,7 @@ static function ( $pseudo_selector ) use ( $selector ) {
 	 * Outputs the CSS for layout rules on the root.
 	 *
 	 * @since 6.1.0
+	 * @since 6.6.0 Use `ROOT_CSS_PROPERTIES_SELECTOR` for CSS custom properties.
 	 *
 	 * @param string $selector The root node selector.
 	 * @param array  $block_metadata The metadata for the root block.
@@ -2607,16 +3062,6 @@ public function get_root_layout_rules( $selector, $block_metadata ) {
 		$settings         = $this->theme_json['settings'] ?? array();
 		$use_root_padding = isset( $this->theme_json['settings']['useRootPaddingAwareAlignments'] ) && true === $this->theme_json['settings']['useRootPaddingAwareAlignments'];
 
-		/*
-		* Reset default browser margin on the root body element.
-		* This is set on the root selector **before** generating the ruleset
-		* from the `theme.json`. This is to ensure that if the `theme.json` declares
-		* `margin` in its `spacing` declaration for the `body` element then these
-		* user-generated values take precedence in the CSS cascade.
-		* @link https://github.com/WordPress/gutenberg/issues/36147.
-		*/
-		$css .= 'body { margin: 0;';
-
 		/*
 		* If there are content and wide widths in theme.json, output them
 		* as custom properties on the body element so all blocks can use them.
@@ -2626,43 +3071,45 @@ public function get_root_layout_rules( $selector, $block_metadata ) {
 			$content_size = static::is_safe_css_declaration( 'max-width', $content_size ) ? $content_size : 'initial';
 			$wide_size    = isset( $settings['layout']['wideSize'] ) ? $settings['layout']['wideSize'] : $settings['layout']['contentSize'];
 			$wide_size    = static::is_safe_css_declaration( 'max-width', $wide_size ) ? $wide_size : 'initial';
-			$css         .= '--wp--style--global--content-size: ' . $content_size . ';';
-			$css         .= '--wp--style--global--wide-size: ' . $wide_size . ';';
+			$css         .= static::ROOT_CSS_PROPERTIES_SELECTOR . ' { --wp--style--global--content-size: ' . $content_size . ';';
+			$css         .= '--wp--style--global--wide-size: ' . $wide_size . '; }';
 		}
 
-		$css .= '}';
+		/*
+		* Reset default browser margin on the body element.
+		* This is set on the body selector **before** generating the ruleset
+		* from the `theme.json`. This is to ensure that if the `theme.json` declares
+		* `margin` in its `spacing` declaration for the `body` element then these
+		* user-generated values take precedence in the CSS cascade.
+		* @link https://github.com/WordPress/gutenberg/issues/36147.
+		*/
+		$css .= ':where(body) { margin: 0; }';
 
 		if ( $use_root_padding ) {
 			// Top and bottom padding are applied to the outer block container.
 			$css .= '.wp-site-blocks { padding-top: var(--wp--style--root--padding-top); padding-bottom: var(--wp--style--root--padding-bottom); }';
 			// Right and left padding are applied to the first container with `.has-global-padding` class.
 			$css .= '.has-global-padding { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }';
-			// Nested containers with `.has-global-padding` class do not get padding.
-			$css .= '.has-global-padding :where(.has-global-padding:not(.wp-block-block)) { padding-right: 0; padding-left: 0; }';
 			// Alignfull children of the container with left and right padding have negative margins so they can still be full width.
 			$css .= '.has-global-padding > .alignfull { margin-right: calc(var(--wp--style--root--padding-right) * -1); margin-left: calc(var(--wp--style--root--padding-left) * -1); }';
-			// The above rule is negated for alignfull children of nested containers.
-			$css .= '.has-global-padding :where(.has-global-padding:not(.wp-block-block)) > .alignfull { margin-right: 0; margin-left: 0; }';
-			// Some of the children of alignfull blocks without content width should also get padding: text blocks and non-alignfull container blocks.
-			$css .= '.has-global-padding > .alignfull:where(:not(.has-global-padding):not(.is-layout-flex):not(.is-layout-grid)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),.wp-block:not(.alignfull),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }';
-			// The above rule also has to be negated for blocks inside nested `.has-global-padding` blocks.
-			$css .= '.has-global-padding :where(.has-global-padding) > .alignfull:where(:not(.has-global-padding)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),.wp-block:not(.alignfull),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: 0; padding-left: 0; }';
+			// Nested children of the container with left and right padding that are not full aligned do not get padding, unless they are direct children of an alignfull flow container.
+			$css .= '.has-global-padding :where(:not(.alignfull.is-layout-flow) > .has-global-padding:not(.wp-block-block, .alignfull)) { padding-right: 0; padding-left: 0; }';
+			// Alignfull direct children of the containers that are targeted by the rule above do not need negative margins.
+			$css .= '.has-global-padding :where(:not(.alignfull.is-layout-flow) > .has-global-padding:not(.wp-block-block, .alignfull)) > .alignfull { margin-left: 0; margin-right: 0; }';
 		}
 
 		$css .= '.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }';
 		$css .= '.wp-site-blocks > .alignright { float: right; margin-left: 2em; }';
 		$css .= '.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
-
-		$block_gap_value       = $this->theme_json['styles']['spacing']['blockGap'] ?? '0.5em';
-		$has_block_gap_support = isset( $this->theme_json['settings']['spacing']['blockGap'] );
-		if ( $has_block_gap_support ) {
+		// Block gap styles will be output unless explicitly set to `null`. See static::PROTECTED_PROPERTIES.
+		if ( isset( $this->theme_json['settings']['spacing']['blockGap'] ) ) {
 			$block_gap_value = static::get_property_value( $this->theme_json, array( 'styles', 'spacing', 'blockGap' ) );
 			$css            .= ":where(.wp-site-blocks) > * { margin-block-start: $block_gap_value; margin-block-end: 0; }";
-			$css            .= ':where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }';
-			$css            .= ':where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }';
+			$css            .= ':where(.wp-site-blocks) > :first-child { margin-block-start: 0; }';
+			$css            .= ':where(.wp-site-blocks) > :last-child { margin-block-end: 0; }';
 
 			// For backwards compatibility, ensure the legacy block gap CSS variable is still available.
-			$css .= "$selector { --wp--style--block-gap: $block_gap_value; }";
+			$css .= static::ROOT_CSS_PROPERTIES_SELECTOR . " { --wp--style--block-gap: $block_gap_value; }";
 		}
 		$css .= $this->get_layout_styles( $block_metadata );
 
@@ -2714,13 +3161,49 @@ protected static function get_metadata_boolean( $data, $path, $default_value = f
 	 *
 	 * @since 5.8.0
 	 * @since 5.9.0 Duotone preset also has origins.
+	 * @since 6.6.0 Use the spacingScale keyed by origin, and re-generate the
+	 *              spacingSizes from spacingScale.
 	 *
-	 * @param WP_Theme_JSON $incoming Data to merge.
+	 * @param WP_Theme_JSON_Gutenberg $incoming Data to merge.
 	 */
 	public function merge( $incoming ) {
 		$incoming_data    = $incoming->get_raw_data();
 		$this->theme_json = array_replace_recursive( $this->theme_json, $incoming_data );
 
+		/*
+		 * Recompute all the spacing sizes based on the new hierarchy of data. In the constructor
+		 * spacingScale and spacingSizes are both keyed by origin and VALID_ORIGINS is ordered, so
+		 * we can allow partial spacingScale data to inherit missing data from earlier layers when
+		 * computing the spacing sizes.
+		 *
+		 * This happens before the presets are merged to ensure that default spacing sizes can be
+		 * removed from the theme origin if $prevent_override is true.
+		 */
+		$flattened_spacing_scale = array();
+		foreach ( static::VALID_ORIGINS as $origin ) {
+			$scale_path = array( 'settings', 'spacing', 'spacingScale', $origin );
+
+			// Apply the base spacing scale to the current layer.
+			$base_spacing_scale      = _wp_array_get( $this->theme_json, $scale_path, array() );
+			$flattened_spacing_scale = array_replace( $flattened_spacing_scale, $base_spacing_scale );
+
+			$spacing_scale = _wp_array_get( $incoming_data, $scale_path, null );
+			if ( ! isset( $spacing_scale ) ) {
+				continue;
+			}
+
+			// Allow partial scale settings by merging with lower layers.
+			$flattened_spacing_scale = array_replace( $flattened_spacing_scale, $spacing_scale );
+
+			// Generate and merge the scales for this layer.
+			$sizes_path           = array( 'settings', 'spacing', 'spacingSizes', $origin );
+			$spacing_sizes        = _wp_array_get( $incoming_data, $sizes_path, array() );
+			$spacing_scale_sizes  = static::compute_spacing_sizes( $flattened_spacing_scale );
+			$merged_spacing_sizes = static::merge_spacing_sizes( $spacing_scale_sizes, $spacing_sizes );
+
+			_wp_array_set( $incoming_data, $sizes_path, $merged_spacing_sizes );
+		}
+
 		/*
 		 * The array_replace_recursive algorithm merges at the leaf level,
 		 * but we don't want leaf arrays to be merged, so we overwrite it.
@@ -2757,12 +3240,15 @@ public function merge( $incoming ) {
 			}
 
 			// Replace the presets.
-			foreach ( static::PRESETS_METADATA as $preset ) {
-				$override_preset = ! static::get_metadata_boolean( $this->theme_json['settings'], $preset['prevent_override'], true );
+			foreach ( static::PRESETS_METADATA as $preset_metadata ) {
+				$prevent_override = $preset_metadata['prevent_override'];
+				if ( is_array( $prevent_override ) ) {
+					$prevent_override = _wp_array_get( $this->theme_json['settings'], $preset_metadata['prevent_override'] );
+				}
 
 				foreach ( static::VALID_ORIGINS as $origin ) {
 					$base_path = $node['path'];
-					foreach ( $preset['path'] as $leaf ) {
+					foreach ( $preset_metadata['path'] as $leaf ) {
 						$base_path[] = $leaf;
 					}
 
@@ -2774,7 +3260,8 @@ public function merge( $incoming ) {
 						continue;
 					}
 
-					if ( 'theme' === $origin && $preset['use_default_names'] ) {
+					// Set names for theme presets based on the slug if they are not set and can use default names.
+					if ( 'theme' === $origin && $preset_metadata['use_default_names'] ) {
 						foreach ( $content as $key => $item ) {
 							if ( ! isset( $item['name'] ) ) {
 								$name = static::get_name_from_defaults( $item['slug'], $base_path );
@@ -2785,22 +3272,43 @@ public function merge( $incoming ) {
 						}
 					}
 
-					if (
-						( 'theme' !== $origin ) ||
-						( 'theme' === $origin && $override_preset )
-					) {
-						_wp_array_set( $this->theme_json, $path, $content );
-					} else {
-						$slugs_node = static::get_default_slugs( $this->theme_json, $node['path'] );
-						$slugs      = array_merge_recursive( $slugs_global, $slugs_node );
+					// Filter out default slugs from theme presets when defaults should not be overridden.
+					if ( 'theme' === $origin && $prevent_override ) {
+						$slugs_node    = static::get_default_slugs( $this->theme_json, $node['path'] );
+						$preset_global = _wp_array_get( $slugs_global, $preset_metadata['path'], array() );
+						$preset_node   = _wp_array_get( $slugs_node, $preset_metadata['path'], array() );
+						$preset_slugs  = array_merge_recursive( $preset_global, $preset_node );
 
-						$slugs_for_preset = _wp_array_get( $slugs, $preset['path'], array() );
-						$content          = static::filter_slugs( $content, $slugs_for_preset );
-						_wp_array_set( $this->theme_json, $path, $content );
+						$content = static::filter_slugs( $content, $preset_slugs );
 					}
+
+					_wp_array_set( $this->theme_json, $path, $content );
 				}
 			}
 		}
+
+		/*
+		 * Style values are merged at the leaf level, however
+		 * some values provide exceptions, namely style values that are
+		 * objects and represent unique definitions for the style.
+		 */
+		$style_nodes = static::get_block_nodes(
+			$this->theme_json,
+			array(),
+			array( 'include_node_paths_only' => true )
+		);
+		foreach ( $style_nodes as $style_node ) {
+			$path = $style_node['path'];
+			/*
+			 * Background image styles should be replaced, not merged,
+			 * as they themselves are specific object definitions for the style.
+			 */
+			$background_image_path = array_merge( $path, static::PROPERTIES_METADATA['background-image'] );
+			$content               = _wp_array_get( $incoming_data, $background_image_path, null );
+			if ( isset( $content ) ) {
+				_wp_array_set( $this->theme_json, $background_image_path, $content );
+			}
+		}
 	}
 
 	/**
@@ -2982,29 +3490,31 @@ protected static function filter_slugs( $node, $slugs ) {
 	 * Removes insecure data from theme.json.
 	 *
 	 * @since 5.9.0
+	 * @since 6.6.0 Added support for block style variation element styles and $origin parameter.
 	 *
-	 * @param array $theme_json Structure to sanitize.
+	 * @param array  $theme_json Structure to sanitize.
+	 * @param string $origin    Optional. What source of data this object represents.
+	 *                          One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
 	 * @return array Sanitized structure.
 	 */
-	public static function remove_insecure_properties( $theme_json ) {
+	public static function remove_insecure_properties( $theme_json, $origin = 'theme' ) {
+		if ( ! in_array( $origin, static::VALID_ORIGINS, true ) ) {
+			$origin = 'theme';
+		}
+
 		$sanitized = array();
 
-		$theme_json = WP_Theme_JSON_Schema_Gutenberg::migrate( $theme_json );
+		$theme_json = WP_Theme_JSON_Schema_Gutenberg::migrate( $theme_json, $origin );
 
 		$valid_block_names   = array_keys( static::get_blocks_metadata() );
 		$valid_element_names = array_keys( static::ELEMENTS );
-		$valid_variations    = array();
-		foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
-			if ( ! isset( $block_meta['styleVariations'] ) ) {
-				continue;
-			}
-			$valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
-		}
+		$valid_variations    = static::get_valid_block_style_variations();
 
 		$theme_json = static::sanitize( $theme_json, $valid_block_names, $valid_element_names, $valid_variations );
 
 		$blocks_metadata = static::get_blocks_metadata();
-		$style_nodes     = static::get_style_nodes( $theme_json, $blocks_metadata );
+		$style_options   = array( 'include_block_style_variations' => true ); // Allow variations data.
+		$style_nodes     = static::get_style_nodes( $theme_json, $blocks_metadata, $style_options );
 
 		foreach ( $style_nodes as $metadata ) {
 			$input = _wp_array_get( $theme_json, $metadata['path'], array() );
@@ -3049,6 +3559,29 @@ public static function remove_insecure_properties( $theme_json ) {
 					}
 
 					$variation_output = static::remove_insecure_styles( $variation_input );
+
+					// Process a variation's elements and element pseudo selector styles.
+					if ( isset( $variation_input['elements'] ) ) {
+						foreach ( $valid_element_names as $element_name ) {
+							$element_input = $variation_input['elements'][ $element_name ] ?? null;
+							if ( $element_input ) {
+								$element_output = static::remove_insecure_styles( $element_input );
+
+								if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element_name ] ) ) {
+									foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element_name ] as $pseudo_selector ) {
+										if ( isset( $element_input[ $pseudo_selector ] ) ) {
+											$element_output[ $pseudo_selector ] = static::remove_insecure_styles( $element_input[ $pseudo_selector ] );
+										}
+									}
+								}
+
+								if ( ! empty( $element_output ) ) {
+									_wp_array_set( $variation_output, array( 'elements', $element_name ), $element_output );
+								}
+							}
+						}
+					}
+
 					if ( ! empty( $variation_output ) ) {
 						_wp_array_set( $sanitized, $variation['path'], $variation_output );
 					}
@@ -3245,53 +3778,32 @@ public static function get_from_editor_settings( $settings ) {
 
 		// Deprecated theme supports.
 		if ( isset( $settings['disableCustomColors'] ) ) {
-			if ( ! isset( $theme_settings['settings']['color'] ) ) {
-				$theme_settings['settings']['color'] = array();
-			}
 			$theme_settings['settings']['color']['custom'] = ! $settings['disableCustomColors'];
 		}
 
 		if ( isset( $settings['disableCustomGradients'] ) ) {
-			if ( ! isset( $theme_settings['settings']['color'] ) ) {
-				$theme_settings['settings']['color'] = array();
-			}
 			$theme_settings['settings']['color']['customGradient'] = ! $settings['disableCustomGradients'];
 		}
 
 		if ( isset( $settings['disableCustomFontSizes'] ) ) {
-			if ( ! isset( $theme_settings['settings']['typography'] ) ) {
-				$theme_settings['settings']['typography'] = array();
-			}
 			$theme_settings['settings']['typography']['customFontSize'] = ! $settings['disableCustomFontSizes'];
 		}
 
 		if ( isset( $settings['enableCustomLineHeight'] ) ) {
-			if ( ! isset( $theme_settings['settings']['typography'] ) ) {
-				$theme_settings['settings']['typography'] = array();
-			}
 			$theme_settings['settings']['typography']['lineHeight'] = $settings['enableCustomLineHeight'];
 		}
 
 		if ( isset( $settings['enableCustomUnits'] ) ) {
-			if ( ! isset( $theme_settings['settings']['spacing'] ) ) {
-				$theme_settings['settings']['spacing'] = array();
-			}
 			$theme_settings['settings']['spacing']['units'] = ( true === $settings['enableCustomUnits'] ) ?
 				array( 'px', 'em', 'rem', 'vh', 'vw', '%' ) :
 				$settings['enableCustomUnits'];
 		}
 
 		if ( isset( $settings['colors'] ) ) {
-			if ( ! isset( $theme_settings['settings']['color'] ) ) {
-				$theme_settings['settings']['color'] = array();
-			}
 			$theme_settings['settings']['color']['palette'] = $settings['colors'];
 		}
 
 		if ( isset( $settings['gradients'] ) ) {
-			if ( ! isset( $theme_settings['settings']['color'] ) ) {
-				$theme_settings['settings']['color'] = array();
-			}
 			$theme_settings['settings']['color']['gradients'] = $settings['gradients'];
 		}
 
@@ -3303,19 +3815,17 @@ public static function get_from_editor_settings( $settings ) {
 					$font_sizes[ $key ]['size'] = $font_size['size'] . 'px';
 				}
 			}
-			if ( ! isset( $theme_settings['settings']['typography'] ) ) {
-				$theme_settings['settings']['typography'] = array();
-			}
 			$theme_settings['settings']['typography']['fontSizes'] = $font_sizes;
 		}
 
 		if ( isset( $settings['enableCustomSpacing'] ) ) {
-			if ( ! isset( $theme_settings['settings']['spacing'] ) ) {
-				$theme_settings['settings']['spacing'] = array();
-			}
 			$theme_settings['settings']['spacing']['padding'] = $settings['enableCustomSpacing'];
 		}
 
+		if ( isset( $settings['spacingSizes'] ) ) {
+			$theme_settings['settings']['spacing']['spacingSizes'] = $settings['spacingSizes'];
+		}
+
 		return $theme_settings;
 	}
 
@@ -3481,11 +3991,16 @@ public function get_data() {
 	 * Sets the spacingSizes array based on the spacingScale values from theme.json.
 	 *
 	 * @since 6.1.0
+	 * @deprecated 6.6.0 No longer used as the spacingSizes are automatically
+	 *                   generated in the constructor and merge methods instead
+	 *                   of manually after instantiation.
 	 *
 	 * @return null|void
 	 */
 	public function set_spacing_sizes() {
-		$spacing_scale = $this->theme_json['settings']['spacing']['spacingScale'] ?? array();
+		_deprecated_function( __METHOD__, '6.6.0' );
+
+		$spacing_scale = $this->theme_json['settings']['spacing']['spacingScale']['default'] ?? array();
 
 		// Gutenberg didn't have the 1st isset check.
 		if ( ! isset( $spacing_scale['steps'] )
@@ -3509,6 +4024,99 @@ public function set_spacing_sizes() {
 			return null;
 		}
 
+		$spacing_sizes = static::compute_spacing_sizes( $spacing_scale );
+
+		// If there are 7 or less steps in the scale revert to numbers for labels instead of t-shirt sizes.
+		if ( $spacing_scale['steps'] <= 7 ) {
+			for ( $spacing_sizes_count = 0; $spacing_sizes_count < count( $spacing_sizes ); $spacing_sizes_count++ ) {
+				$spacing_sizes[ $spacing_sizes_count ]['name'] = (string) ( $spacing_sizes_count + 1 );
+			}
+		}
+
+		_wp_array_set( $this->theme_json, array( 'settings', 'spacing', 'spacingSizes', 'default' ), $spacing_sizes );
+	}
+
+	/**
+	 * Merges two sets of spacing size presets.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array $base     The base set of spacing sizes.
+	 * @param array $incoming The set of spacing sizes to merge with the base. Duplicate slugs will override the base values.
+	 * @return array The merged set of spacing sizes.
+	 */
+	private static function merge_spacing_sizes( $base, $incoming ) {
+		// Preserve the order if there are no base (spacingScale) values.
+		if ( empty( $base ) ) {
+			return $incoming;
+		}
+		$merged = array();
+		foreach ( $base as $item ) {
+			$merged[ $item['slug'] ] = $item;
+		}
+		foreach ( $incoming as $item ) {
+			$merged[ $item['slug'] ] = $item;
+		}
+		ksort( $merged, SORT_NUMERIC );
+		return array_values( $merged );
+	}
+
+	/**
+	 * Generates a set of spacing sizes by starting with a medium size and
+	 * applying an operator with an increment value to generate the rest of the
+	 * sizes outward from the medium size. The medium slug is '50' with the rest
+	 * of the slugs being 10 apart. The generated names use t-shirt sizing.
+	 *
+	 * Example:
+	 *
+	 *     $spacing_scale = array(
+	 *         'steps'      => 4,
+	 *         'mediumStep' => 16,
+	 *         'unit'       => 'px',
+	 *         'operator'   => '+',
+	 *         'increment'  => 2,
+	 *     );
+	 *     $spacing_sizes = static::compute_spacing_sizes( $spacing_scale );
+	 *     // -> array(
+	 *     //        array( 'name' => 'Small',   'slug' => '40', 'size' => '14px' ),
+	 *     //        array( 'name' => 'Medium',  'slug' => '50', 'size' => '16px' ),
+	 *     //        array( 'name' => 'Large',   'slug' => '60', 'size' => '18px' ),
+	 *     //        array( 'name' => 'X-Large', 'slug' => '70', 'size' => '20px' ),
+	 *     //    )
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array $spacing_scale {
+	 *      The spacing scale values. All are required.
+	 *
+	 *      @type int    $steps      The number of steps in the scale. (up to 10 steps are supported.)
+	 *      @type float  $mediumStep The middle value that gets the slug '50'. (For even number of steps, this becomes the first middle value.)
+	 *      @type string $unit       The CSS unit to use for the sizes.
+	 *      @type string $operator   The mathematical operator to apply to generate the other sizes. Either '+' or '*'.
+	 *      @type float  $increment  The value used with the operator to generate the other sizes.
+	 * }
+	 * @return array The spacing sizes presets or an empty array if some spacing scale values are missing or invalid.
+	 */
+	private static function compute_spacing_sizes( $spacing_scale ) {
+		/*
+		 * This condition is intentionally missing some checks on ranges for the values in order to
+		 * keep backwards compatibility with the previous implementation.
+		 */
+		if (
+			! isset( $spacing_scale['steps'] ) ||
+			! is_numeric( $spacing_scale['steps'] ) ||
+			0 === $spacing_scale['steps'] ||
+			! isset( $spacing_scale['mediumStep'] ) ||
+			! is_numeric( $spacing_scale['mediumStep'] ) ||
+			! isset( $spacing_scale['unit'] ) ||
+			! isset( $spacing_scale['operator'] ) ||
+			( '+' !== $spacing_scale['operator'] && '*' !== $spacing_scale['operator'] ) ||
+			! isset( $spacing_scale['increment'] ) ||
+			! is_numeric( $spacing_scale['increment'] )
+		) {
+			return array();
+		}
+
 		$unit            = '%' === $spacing_scale['unit'] ? '%' : sanitize_title( $spacing_scale['unit'] );
 		$current_step    = $spacing_scale['mediumStep'];
 		$steps_mid_point = round( $spacing_scale['steps'] / 2, 0 );
@@ -3591,14 +4199,7 @@ public function set_spacing_sizes() {
 			$spacing_sizes[] = $above_sizes_item;
 		}
 
-		// If there are 7 or less steps in the scale revert to numbers for labels instead of t-shirt sizes.
-		if ( $spacing_scale['steps'] <= 7 ) {
-			for ( $spacing_sizes_count = 0; $spacing_sizes_count < count( $spacing_sizes ); $spacing_sizes_count++ ) {
-				$spacing_sizes[ $spacing_sizes_count ]['name'] = (string) ( $spacing_sizes_count + 1 );
-			}
-		}
-
-		_wp_array_set( $this->theme_json, array( 'settings', 'spacing', 'spacingSizes', 'default' ), $spacing_sizes );
+		return $spacing_sizes;
 	}
 
 	/**
@@ -3799,12 +4400,18 @@ private static function resolve_custom_css_format( $tree ) {
 	 * Replaces CSS variables with their values in place.
 	 *
 	 * @since 6.3.0
+	 * @since 6.6.0 Check for empty style before processing.
+	 *
 	 * @param array $styles CSS declarations to convert.
 	 * @param array $values key => value pairs to use for replacement.
 	 * @return array
 	 */
 	private static function convert_variables_to_value( $styles, $values ) {
 		foreach ( $styles as $key => $style ) {
+			if ( empty( $style ) ) {
+				continue;
+			}
+
 			if ( is_array( $style ) ) {
 				$styles[ $key ] = self::convert_variables_to_value( $style, $values );
 				continue;
@@ -3867,4 +4474,54 @@ function ( $carry, $item ) {
 		$theme_json->theme_json['styles'] = self::convert_variables_to_value( $styles, $vars );
 		return $theme_json;
 	}
+
+	/**
+	 * Generates a selector for a block style variation.
+	 *
+	 * @param string $variation_name Name of the block style variation.
+	 * @param string $block_selector CSS selector for the block.
+	 *
+	 * @return string Block selector with block style variation selector added to it.
+	 */
+	protected static function get_block_style_variation_selector( $variation_name, $block_selector ) {
+		$variation_class = ".is-style-$variation_name";
+
+		if ( ! $block_selector ) {
+			return $variation_class;
+		}
+
+		$limit          = 1;
+		$selector_parts = explode( ',', $block_selector );
+		$result         = array();
+
+		foreach ( $selector_parts as $part ) {
+			$result[] = preg_replace_callback(
+				'/((?::\([^)]+\))?\s*)([^\s:]+)/',
+				function ( $matches ) use ( $variation_class ) {
+					return $matches[1] . $matches[2] . $variation_class;
+				},
+				$part,
+				$limit
+			);
+		}
+
+		return implode( ',', $result );
+	}
+
+	/**
+	 * Collects valid block style variations keyed by block type.
+	 *
+	 * @return array Valid block style variations by block type.
+	 */
+	protected static function get_valid_block_style_variations() {
+		$valid_variations = array();
+		foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
+			if ( ! isset( $block_meta['styleVariations'] ) ) {
+				continue;
+			}
+			$valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
+		}
+
+		return $valid_variations;
+	}
 }
diff --git a/lib/class-wp-theme-json-resolver-gutenberg.php b/lib/class-wp-theme-json-resolver-gutenberg.php
index 950d9e00e6243f..2231cb0f11538f 100644
--- a/lib/class-wp-theme-json-resolver-gutenberg.php
+++ b/lib/class-wp-theme-json-resolver-gutenberg.php
@@ -1,15 +1,11 @@
 <?php
 /**
- * WP_Theme_JSON_Resolver class
+ * WP_Theme_JSON_Resolver_Gutenberg class
  *
- * @package gutenberg
+ * @package Gutenberg
  * @since 5.8.0
  */
 
-if ( class_exists( 'WP_Theme_JSON_Resolver_Gutenberg' ) ) {
-	return;
-}
-
 /**
  * Class that abstracts the processing of the different data sources
  * for site-level config and offers an API to work with them.
@@ -18,6 +14,7 @@
  * This is a low-level API that may need to do breaking changes. Please,
  * use gutenberg_get_global_settings, gutenberg_get_global_styles, and gutenberg_get_global_stylesheet instead.
  *
+ * @since 5.8.0
  * @access private
  */
 #[AllowDynamicProperties]
@@ -40,7 +37,7 @@ class WP_Theme_JSON_Resolver_Gutenberg {
 	 * Container for data coming from core.
 	 *
 	 * @since 5.8.0
-	 * @var WP_Theme_JSON
+	 * @var WP_Theme_JSON_Gutenberg
 	 */
 	protected static $core = null;
 
@@ -48,7 +45,7 @@ class WP_Theme_JSON_Resolver_Gutenberg {
 	 * Container for data coming from the blocks.
 	 *
 	 * @since 6.1.0
-	 * @var WP_Theme_JSON
+	 * @var WP_Theme_JSON_Gutenberg
 	 */
 	protected static $blocks = null;
 
@@ -56,7 +53,7 @@ class WP_Theme_JSON_Resolver_Gutenberg {
 	 * Container for data coming from the theme.
 	 *
 	 * @since 5.8.0
-	 * @var WP_Theme_JSON
+	 * @var WP_Theme_JSON_Gutenberg
 	 */
 	protected static $theme = null;
 
@@ -64,7 +61,7 @@ class WP_Theme_JSON_Resolver_Gutenberg {
 	 * Container for data coming from the user.
 	 *
 	 * @since 5.9.0
-	 * @var WP_Theme_JSON
+	 * @var WP_Theme_JSON_Gutenberg
 	 */
 	protected static $user = null;
 
@@ -158,7 +155,7 @@ protected static function translate( $theme_json, $domain = 'default' ) {
 	 *
 	 * @since 5.8.0
 	 *
-	 * @return WP_Theme_JSON Entity that holds core data.
+	 * @return WP_Theme_JSON_Gutenberg Entity that holds core data.
 	 */
 	public static function get_core_data() {
 		if ( null !== static::$core && static::has_same_registered_blocks( 'core' ) ) {
@@ -173,11 +170,10 @@ public static function get_core_data() {
 		 *
 		 * @since 6.1.0
 		 *
-		 * @param WP_Theme_JSON_Data Class to access and update the underlying data.
+		 * @param WP_Theme_JSON_Data_Gutenberg Class to access and update the underlying data.
 		 */
 		$theme_json   = apply_filters( 'wp_theme_json_data_default', new WP_Theme_JSON_Data_Gutenberg( $config, 'default' ) );
-		$config       = $theme_json->get_data();
-		static::$core = new WP_Theme_JSON_Gutenberg( $config, 'default' );
+		static::$core = $theme_json->get_theme_json();
 
 		return static::$core;
 	}
@@ -224,6 +220,8 @@ protected static function has_same_registered_blocks( $origin ) {
 	 * @since 5.8.0
 	 * @since 5.9.0 Theme supports have been inlined and the `$theme_support_data` argument removed.
 	 * @since 6.0.0 Added an `$options` parameter to allow the theme data to be returned without theme supports.
+	 * @since 6.6.0 Added support for 'default-font-sizes' and 'default-spacing-sizes' theme supports.
+	 *              Added registration and merging of block style variations from partial theme.json files and the block styles registry.
 	 *
 	 * @param array $deprecated Deprecated. Not used.
 	 * @param array $options {
@@ -231,7 +229,7 @@ protected static function has_same_registered_blocks( $origin ) {
 	 *
 	 *     @type bool $with_supports Whether to include theme supports in the data. Default true.
 	 * }
-	 * @return WP_Theme_JSON Entity that holds theme data.
+	 * @return WP_Theme_JSON_Gutenberg Entity that holds theme data.
 	 */
 	public static function get_theme_data( $deprecated = array(), $options = array() ) {
 		if ( ! empty( $deprecated ) ) {
@@ -247,19 +245,41 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 				$theme_json_data = static::read_json_file( $theme_json_file );
 				$theme_json_data = static::translate( $theme_json_data, $wp_theme->get( 'TextDomain' ) );
 			} else {
-				$theme_json_data = array();
+				$theme_json_data = array( 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA );
 			}
 
+			/*
+			 * Register variations defined by theme partials (theme.json files in the styles directory).
+			 * This is required so the variations pass sanitization of theme.json data.
+			 */
+			$variations = static::get_style_variations( 'block' );
+			gutenberg_register_block_style_variations_from_theme_json_partials( $variations );
+
+			/*
+			 * Source variations from the block styles registry and block style variation files. Then, merge them into the existing theme.json data.
+			 *
+			 * In case the same style properties are defined in several sources, this is how we should resolve the values,
+			 * from higher to lower priority:
+			 *
+			 * - styles.blocks.blockType.variations from theme.json
+			 * - styles.variations from theme.json
+			 * - variations from block style variation files
+			 * - variations from block styles registry
+			 *
+			 * See test_add_registered_block_styles_to_theme_data and test_unwraps_block_style_variations.
+			 */
+			$theme_json_data = static::inject_variations_from_block_style_variation_files( $theme_json_data, $variations );
+			$theme_json_data = static::inject_variations_from_block_styles_registry( $theme_json_data );
+
 			/**
 			 * Filters the data provided by the theme for global styles and settings.
 			 *
 			 * @since 6.1.0
 			 *
-			 * @param WP_Theme_JSON_Data Class to access and update the underlying data.
+			 * @param WP_Theme_JSON_Data_Gutenberg Class to access and update the underlying data.
 			 */
-			$theme_json      = apply_filters( 'wp_theme_json_data_theme', new WP_Theme_JSON_Data_Gutenberg( $theme_json_data, 'theme' ) );
-			$theme_json_data = $theme_json->get_data();
-			static::$theme   = new WP_Theme_JSON_Gutenberg( $theme_json_data );
+			$theme_json    = apply_filters( 'wp_theme_json_data_theme', new WP_Theme_JSON_Data_Gutenberg( $theme_json_data, 'theme' ) );
+			static::$theme = $theme_json->get_theme_json();
 
 			if ( $wp_theme->parent() ) {
 				// Get parent theme.json.
@@ -296,34 +316,34 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 		 * So we take theme supports, transform it to theme.json shape
 		 * and merge the static::$theme upon that.
 		 */
-		$theme_support_data = WP_Theme_JSON_Gutenberg::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
+		$theme_support_data = WP_Theme_JSON_Gutenberg::get_from_editor_settings( gutenberg_get_classic_theme_supports_block_editor_settings() );
 		if ( ! wp_theme_has_theme_json() ) {
-			if ( ! isset( $theme_support_data['settings']['color'] ) ) {
-				$theme_support_data['settings']['color'] = array();
-			}
-
-			$default_palette = false;
-			if ( current_theme_supports( 'default-color-palette' ) ) {
-				$default_palette = true;
-			}
-			if ( ! isset( $theme_support_data['settings']['color']['palette'] ) ) {
-				// If the theme does not have any palette, we still want to show the core one.
-				$default_palette = true;
-			}
-			$theme_support_data['settings']['color']['defaultPalette'] = $default_palette;
-
-			$default_gradients = false;
-			if ( current_theme_supports( 'default-gradient-presets' ) ) {
-				$default_gradients = true;
-			}
-			if ( ! isset( $theme_support_data['settings']['color']['gradients'] ) ) {
-				// If the theme does not have any gradients, we still want to show the core ones.
-				$default_gradients = true;
-			}
-			$theme_support_data['settings']['color']['defaultGradients'] = $default_gradients;
-
-			// Classic themes without a theme.json don't support global duotone.
-			$theme_support_data['settings']['color']['defaultDuotone'] = false;
+			/*
+			 * Unlike block themes, classic themes without a theme.json disable
+			 * default presets when custom preset theme support is added. This
+			 * behavior can be overridden by using the corresponding default
+			 * preset theme support.
+			 */
+			$theme_support_data['settings']['color']['defaultPalette']        =
+				! isset( $theme_support_data['settings']['color']['palette'] ) ||
+				current_theme_supports( 'default-color-palette' );
+			$theme_support_data['settings']['color']['defaultGradients']      =
+				! isset( $theme_support_data['settings']['color']['gradients'] ) ||
+				current_theme_supports( 'default-gradient-presets' );
+			$theme_support_data['settings']['typography']['defaultFontSizes'] =
+				! isset( $theme_support_data['settings']['typography']['fontSizes'] ) ||
+				current_theme_supports( 'default-font-sizes' );
+			$theme_support_data['settings']['spacing']['defaultSpacingSizes'] =
+				! isset( $theme_support_data['settings']['spacing']['spacingSizes'] ) ||
+				current_theme_supports( 'default-spacing-sizes' );
+
+			/*
+			 * Shadow presets are explicitly disabled for classic themes until a
+			 * decision is made for whether the default presets should match the
+			 * other presets or if they should be disabled by default in classic
+			 * themes. See https://github.com/WordPress/gutenberg/issues/59989.
+			 */
+			$theme_support_data['settings']['shadow']['defaultPresets'] = false;
 
 			// Allow themes to enable all border settings via theme_support.
 			if ( current_theme_supports( 'border' ) ) {
@@ -345,15 +365,10 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 				);
 			}
 
-			// BEGIN EXPERIMENTAL.
 			// Allow themes to enable appearance tools via theme_support.
-			// This feature was backported for WordPress 6.2 as of https://core.trac.wordpress.org/ticket/56487
-			// and then reverted as of https://core.trac.wordpress.org/ticket/57649
-			// Not to backport until the issues are resolved.
 			if ( current_theme_supports( 'appearance-tools' ) ) {
 				$theme_support_data['settings']['appearanceTools'] = true;
 			}
-			// END EXPERIMENTAL.
 		}
 		$with_theme_supports = new WP_Theme_JSON_Gutenberg( $theme_support_data );
 		$with_theme_supports->merge( static::$theme );
@@ -365,7 +380,7 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 	 *
 	 * @since 6.1.0
 	 *
-	 * @return WP_Theme_JSON
+	 * @return WP_Theme_JSON_Gutenberg
 	 */
 	public static function get_block_data() {
 		$registry = WP_Block_Type_Registry::get_instance();
@@ -375,7 +390,7 @@ public static function get_block_data() {
 			return static::$blocks;
 		}
 
-		$config = array( 'version' => 2 );
+		$config = array( 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA );
 		foreach ( $blocks as $block_name => $block_type ) {
 			if ( isset( $block_type->supports['__experimentalStyle'] ) ) {
 				$config['styles']['blocks'][ $block_name ] = static::remove_json_comments( $block_type->supports['__experimentalStyle'] );
@@ -396,12 +411,11 @@ public static function get_block_data() {
 		 *
 		 * @since 6.1.0
 		 *
-		 * @param WP_Theme_JSON_Data Class to access and update the underlying data.
+		 * @param WP_Theme_JSON_Data_Gutenberg Class to access and update the underlying data.
 		 */
-		$theme_json = apply_filters( 'wp_theme_json_data_blocks', new WP_Theme_JSON_Data_Gutenberg( $config, 'blocks' ) );
-		$config     = $theme_json->get_data();
+		$theme_json     = apply_filters( 'wp_theme_json_data_blocks', new WP_Theme_JSON_Data_Gutenberg( $config, 'blocks' ) );
+		static::$blocks = $theme_json->get_theme_json();
 
-		static::$blocks = new WP_Theme_JSON_Gutenberg( $config, 'blocks' );
 		return static::$blocks;
 	}
 
@@ -509,7 +523,7 @@ public static function get_user_data_from_wp_global_styles( $theme, $create_post
 	 *
 	 * @since 5.9.0
 	 *
-	 * @return WP_Theme_JSON Entity that holds styles for user data.
+	 * @return WP_Theme_JSON_Gutenberg Entity that holds styles for user data.
 	 */
 	public static function get_user_data() {
 		if ( null !== static::$user && static::has_same_registered_blocks( 'user' ) ) {
@@ -530,11 +544,11 @@ public static function get_user_data() {
 				 *
 				 * @since 6.1.0
 				 *
-				 * @param WP_Theme_JSON_Data Class to access and update the underlying data.
+				 * @param WP_Theme_JSON_Data_Gutenberg Class to access and update the underlying data.
 				 */
 				$theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data_Gutenberg( $config, 'custom' ) );
-				$config     = $theme_json->get_data();
-				return new WP_Theme_JSON_Gutenberg( $config, 'custom' );
+
+				return $theme_json->get_theme_json();
 			}
 
 			// Very important to verify that the flag isGlobalStylesUserThemeJSON is true.
@@ -551,8 +565,7 @@ public static function get_user_data() {
 
 		/** This filter is documented in wp-includes/class-wp-theme-json-resolver.php */
 		$theme_json   = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data_Gutenberg( $config, 'custom' ) );
-		$config       = $theme_json->get_data();
-		static::$user = new WP_Theme_JSON_Gutenberg( $config, 'custom' );
+		static::$user = $theme_json->get_theme_json();
 
 		return static::$user;
 	}
@@ -590,7 +603,7 @@ public static function get_user_data() {
 	 * @param string $origin Optional. To what level should we merge data:'default', 'blocks', 'theme' or 'custom'.
 	 *                       'custom' is used as default value as well as fallback value if the origin is unknown.
 	 *
-	 * @return WP_Theme_JSON
+	 * @return WP_Theme_JSON_Gutenberg
 	 */
 	public static function get_merged_data( $origin = 'custom' ) {
 		if ( is_array( $origin ) ) {
@@ -600,7 +613,6 @@ public static function get_merged_data( $origin = 'custom' ) {
 		$result = new WP_Theme_JSON_Gutenberg();
 		$result->merge( static::get_core_data() );
 		if ( 'default' === $origin ) {
-			$result->set_spacing_sizes();
 			return $result;
 		}
 
@@ -611,12 +623,10 @@ public static function get_merged_data( $origin = 'custom' ) {
 
 		$result->merge( static::get_theme_data() );
 		if ( 'theme' === $origin ) {
-			$result->set_spacing_sizes();
 			return $result;
 		}
 
 		$result->merge( static::get_user_data() );
-		$result->set_spacing_sizes();
 		return $result;
 	}
 
@@ -716,16 +726,56 @@ private static function recursively_iterate_json( $dir ) {
 		return $nested_json_files;
 	}
 
+	/**
+	 * Determines if a supplied style variation matches the provided scope.
+	 *
+	 * For backwards compatibility, if a variation does not define any scope
+	 * related property, e.g. `blockTypes`, it is assumed to be a theme style
+	 * variation.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array  $variation Theme.json shaped style variation object.
+	 * @param string $scope     Scope to check e.g. theme, block etc.
+	 *
+	 * @return boolean
+	 */
+	private static function style_variation_has_scope( $variation, $scope ) {
+		if ( 'block' === $scope ) {
+			return isset( $variation['blockTypes'] );
+		}
+
+		if ( 'theme' === $scope ) {
+			return ! isset( $variation['blockTypes'] );
+		}
+
+		return false;
+	}
+
 	/**
 	 * Returns the style variations defined by the theme (parent and child).
 	 *
 	 * @since 6.2.0 Returns parent theme variations if theme is a child.
+	 * @since 6.6.0 Added configurable scope parameter to allow filtering
+	 *              theme.json partial files by the scope to which they
+	 *              can be applied e.g. theme vs block etc.
 	 *
+	 * @param string $scope The scope or type of style variation to retrieve e.g. theme, block etc.
 	 * @return array
 	 */
-	public static function get_style_variations() {
+	public static function get_style_variations( $scope = 'theme' ) {
+		return static::get_style_variations_from_directory( get_stylesheet_directory(), $scope );
+	}
+
+	/**
+	 * Returns the style variation files defined by the theme (parent and child).
+	 *
+	 * @since 6.7.0
+	 *
+	 * @return array An array of style variation files.
+	 */
+	protected static function get_style_variation_files_from_current_theme() {
 		$variation_files    = array();
-		$variations         = array();
 		$base_directory     = get_stylesheet_directory() . '/styles';
 		$template_directory = get_template_directory() . '/styles';
 		if ( is_dir( $base_directory ) ) {
@@ -743,10 +793,33 @@ public static function get_style_variations() {
 			}
 			$variation_files = array_merge( $variation_files, $variation_files_parent );
 		}
+
+		return $variation_files;
+	}
+
+	/**
+	 * Returns the style variations in the given directory.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @param string $directory The directory to get the style variations from.
+	 * @param string $scope     The scope or type of style variation to retrieve e.g. theme, block etc.
+	 * @return array
+	 */
+	public static function get_style_variations_from_directory( $directory, $scope = 'theme' ) {
+		$variation_files = array();
+		$variations      = array();
+		if ( is_dir( $directory ) ) {
+			if ( get_stylesheet_directory() === $directory ) {
+				$variation_files = static::get_style_variation_files_from_current_theme();
+			} else {
+				$variation_files = static::recursively_iterate_json( $directory );
+			}
+		}
 		ksort( $variation_files );
 		foreach ( $variation_files as $path => $file ) {
-			$decoded_file = wp_json_file_decode( $path, array( 'associative' => true ) );
-			if ( is_array( $decoded_file ) ) {
+			$decoded_file = self::read_json_file( $path );
+			if ( is_array( $decoded_file ) && static::style_variation_has_scope( $decoded_file, $scope ) ) {
 				$translated = static::translate( $decoded_file, wp_get_theme()->get( 'TextDomain' ) );
 				$variation  = ( new WP_Theme_JSON_Gutenberg( $translated ) )->get_raw_data();
 				if ( empty( $variation['title'] ) ) {
@@ -757,4 +830,187 @@ public static function get_style_variations() {
 		}
 		return $variations;
 	}
+
+
+	/**
+	 * Resolves relative paths in theme.json styles to theme absolute paths
+	 * and returns them in an array that can be embedded
+	 * as the value of `_link` object in REST API responses.
+	 *
+	 * @since 6.6.0
+	 * @since 6.7.0 Added support for resolving block styles.
+	 *
+	 * @param WP_Theme_JSON_Gutenberg $theme_json A theme json instance.
+	 * @return array An array of resolved paths.
+	 */
+	public static function get_resolved_theme_uris( $theme_json ) {
+		$resolved_theme_uris = array();
+
+		if ( ! $theme_json instanceof WP_Theme_JSON_Gutenberg ) {
+			return $resolved_theme_uris;
+		}
+
+		$theme_json_data = $theme_json->get_raw_data();
+
+		// Using the same file convention when registering web fonts. See: WP_Font_Face_Resolver:: to_theme_file_uri.
+		$placeholder = 'file:./';
+
+		// Top level styles.
+		$background_image_url = $theme_json_data['styles']['background']['backgroundImage']['url'] ?? null;
+		if (
+			isset( $background_image_url ) &&
+			is_string( $background_image_url ) &&
+			// Skip if the src doesn't start with the placeholder, as there's nothing to replace.
+			str_starts_with( $background_image_url, $placeholder ) ) {
+				$file_type          = wp_check_filetype( $background_image_url );
+				$src_url            = str_replace( $placeholder, '', $background_image_url );
+				$resolved_theme_uri = array(
+					'name'   => $background_image_url,
+					'href'   => sanitize_url( get_theme_file_uri( $src_url ) ),
+					'target' => 'styles.background.backgroundImage.url',
+				);
+				if ( isset( $file_type['type'] ) ) {
+					$resolved_theme_uri['type'] = $file_type['type'];
+				}
+				$resolved_theme_uris[] = $resolved_theme_uri;
+		}
+
+		// Block styles.
+		if ( ! empty( $theme_json_data['styles']['blocks'] ) ) {
+			foreach ( $theme_json_data['styles']['blocks'] as $block_name => $block_styles ) {
+				if ( ! isset( $block_styles['background']['backgroundImage']['url'] ) ) {
+					continue;
+				}
+				$background_image_url = $block_styles['background']['backgroundImage']['url'] ?? null;
+				if (
+					isset( $background_image_url ) &&
+					is_string( $background_image_url ) &&
+					// Skip if the src doesn't start with the placeholder, as there's nothing to replace.
+					str_starts_with( $background_image_url, $placeholder ) ) {
+					$file_type          = wp_check_filetype( $background_image_url );
+					$src_url            = str_replace( $placeholder, '', $background_image_url );
+					$resolved_theme_uri = array(
+						'name'   => $background_image_url,
+						'href'   => sanitize_url( get_theme_file_uri( $src_url ) ),
+						'target' => "styles.blocks.{$block_name}.background.backgroundImage.url",
+					);
+					if ( isset( $file_type['type'] ) ) {
+						$resolved_theme_uri['type'] = $file_type['type'];
+					}
+					$resolved_theme_uris[] = $resolved_theme_uri;
+				}
+			}
+		}
+
+		return $resolved_theme_uris;
+	}
+
+	/**
+	 * Resolves relative paths in theme.json styles to theme absolute paths
+	 * and merges them with incoming theme JSON.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param WP_Theme_JSON_Gutenberg $theme_json A theme json instance.
+	 * @return WP_Theme_JSON_Gutenberg Theme merged with resolved paths, if any found.
+	 */
+	public static function resolve_theme_file_uris( $theme_json ) {
+		$resolved_urls = static::get_resolved_theme_uris( $theme_json );
+		if ( empty( $resolved_urls ) ) {
+			return $theme_json;
+		}
+
+		$resolved_theme_json_data = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+		);
+
+		foreach ( $resolved_urls as $resolved_url ) {
+			$path = explode( '.', $resolved_url['target'] );
+			_wp_array_set( $resolved_theme_json_data, $path, $resolved_url['href'] );
+		}
+
+		$theme_json->merge( new WP_Theme_JSON_Gutenberg( $resolved_theme_json_data ) );
+
+		return $theme_json;
+	}
+
+	/**
+	 * Adds variations sourced from block style variations files to the supplied theme.json data.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array $data   Array following the theme.json specification.
+	 * @param array $variations Shared block style variations.
+	 * @return array Theme json data including shared block style variation definitions.
+	 */
+	private static function inject_variations_from_block_style_variation_files( $data, $variations ) {
+		if ( empty( $variations ) ) {
+			return $data;
+		}
+
+		foreach ( $variations as $variation ) {
+			if ( empty( $variation['styles'] ) || empty( $variation['blockTypes'] ) ) {
+				continue;
+			}
+
+			$variation_name = $variation['slug'] ?? _wp_to_kebab_case( $variation['title'] );
+
+			foreach ( $variation['blockTypes'] as $block_type ) {
+				// First, override partial styles with any top-level styles.
+				$top_level_data = $data['styles']['variations'][ $variation_name ] ?? array();
+				if ( ! empty( $top_level_data ) ) {
+					$variation['styles'] = array_replace_recursive( $variation['styles'], $top_level_data );
+				}
+
+				// Then, override styles so far with any block-level styles.
+				$block_level_data = $data['styles']['blocks'][ $block_type ]['variations'][ $variation_name ] ?? array();
+				if ( ! empty( $block_level_data ) ) {
+					$variation['styles'] = array_replace_recursive( $variation['styles'], $block_level_data );
+				}
+
+				$path = array( 'styles', 'blocks', $block_type, 'variations', $variation_name );
+				_wp_array_set( $data, $path, $variation['styles'] );
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Adds variations sourced from the block styles registry to the supplied theme.json data.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array $data   Array following the theme.json specification.
+	 * @return array Theme json data including variations from the block styles registry.
+	 */
+	private static function inject_variations_from_block_styles_registry( $data ) {
+		$registry = WP_Block_Styles_Registry::get_instance();
+		$styles   = $registry->get_all_registered();
+
+		foreach ( $styles as $block_type => $variations ) {
+			foreach ( $variations as $variation_name => $variation ) {
+				if ( empty( $variation['style_data'] ) ) {
+					continue;
+				}
+
+				// First, override registry styles with any top-level styles.
+				$top_level_data = $data['styles']['variations'][ $variation_name ] ?? array();
+				if ( ! empty( $top_level_data ) ) {
+					$variation['style_data'] = array_replace_recursive( $variation['style_data'], $top_level_data );
+				}
+
+				// Then, override styles so far with any block-level styles.
+				$block_level_data = $data['styles']['blocks'][ $block_type ]['variations'][ $variation_name ] ?? array();
+				if ( ! empty( $block_level_data ) ) {
+					$variation['style_data'] = array_replace_recursive( $variation['style_data'], $block_level_data );
+				}
+
+				$path = array( 'styles', 'blocks', $block_type, 'variations', $variation_name );
+				_wp_array_set( $data, $path, $variation['style_data'] );
+			}
+		}
+
+		return $data;
+	}
 }
diff --git a/lib/class-wp-theme-json-schema-gutenberg.php b/lib/class-wp-theme-json-schema-gutenberg.php
index d11545751af362..af0977ada1b307 100644
--- a/lib/class-wp-theme-json-schema-gutenberg.php
+++ b/lib/class-wp-theme-json-schema-gutenberg.php
@@ -2,12 +2,8 @@
 /**
  * WP_Theme_JSON_Schema_Gutenberg class
  *
- * This class/file will NOT be backported to Core. It exists to provide a
- * migration path for theme.json files that used the deprecated "behaviors".
- * This file will be removed from Gutenberg in version 17.0.0.
- *
- * @package gutenberg
- * @since 16.7.0
+ * @package Gutenberg
+ * @since 5.9.0
  */
 
 if ( class_exists( 'WP_Theme_JSON_Schema_Gutenberg' ) ) {
@@ -42,24 +38,28 @@ class WP_Theme_JSON_Schema_Gutenberg {
 	 * Function that migrates a given theme.json structure to the last version.
 	 *
 	 * @since 5.9.0
+	 * @since 6.6.0 Migrate up to v3.
 	 *
-	 * @param array $theme_json The structure to migrate.
+	 * @param array  $theme_json The structure to migrate.
+	 * @param string $origin     Optional. What source of data this object represents.
+	 *                           One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
 	 *
 	 * @return array The structure in the last version.
 	 */
-	public static function migrate( $theme_json ) {
+	public static function migrate( $theme_json, $origin = 'theme' ) {
 		if ( ! isset( $theme_json['version'] ) ) {
 			$theme_json = array(
 				'version' => WP_Theme_JSON::LATEST_SCHEMA,
 			);
 		}
 
-		if ( 1 === $theme_json['version'] ) {
-			$theme_json = self::migrate_v1_to_v2( $theme_json );
-		}
-
-		if ( 2 === $theme_json['version'] ) {
-			$theme_json = self::migrate_deprecated_lightbox_behaviors( $theme_json );
+		// Migrate each version in order starting with the current version.
+		switch ( $theme_json['version'] ) {
+			case 1:
+				$theme_json = self::migrate_v1_to_v2( $theme_json );
+				// Deliberate fall through. Once migrated to v2, also migrate to v3.
+			case 2:
+				$theme_json = self::migrate_v2_to_v3( $theme_json, $origin );
 		}
 
 		return $theme_json;
@@ -95,41 +95,72 @@ private static function migrate_v1_to_v2( $old ) {
 		return $new;
 	}
 
-
 	/**
-	 * Migrate away from the previous syntax that used a top-level "behaviors" key
-	 * in the `theme.json` to a new "lightbox" setting.
-	 *
-	 * This function SHOULD NOT be ported to Core!!!
+	 * Migrates from v2 to v3.
 	 *
-	 * It is a temporary migration that will be removed in Gutenberg 17.0.0
+	 * - Sets settings.typography.defaultFontSizes to false if settings.typography.fontSizes are defined.
+	 * - Sets settings.spacing.defaultSpacingSizes to false if settings.spacing.spacingSizes are defined.
+	 * - Prevents settings.spacing.spacingSizes from merging with settings.spacing.spacingScale by
+	 *   unsetting spacingScale when spacingSizes are defined.
 	 *
-	 * @since 16.7.0
+	 * @since 6.6.0
 	 *
-	 * @param array $old Data with (potentially) behaviors.
-	 * @return array Data with behaviors removed.
+	 * @param array $old     Data to migrate.
+	 * @param string $origin What source of data this object represents.
+	 *                       One of 'blocks', 'default', 'theme', or 'custom'.
+	 * @return array Data with defaultFontSizes set to false.
 	 */
-	private static function migrate_deprecated_lightbox_behaviors( $old ) {
+	private static function migrate_v2_to_v3( $old, $origin ) {
 		// Copy everything.
 		$new = $old;
 
-		// Migrate the old behaviors syntax to the new "lightbox" syntax.
-		if ( isset( $old['behaviors']['blocks']['core/image']['lightbox']['enabled'] ) ) {
-			_wp_array_set(
-				$new,
-				array( 'settings', 'blocks', 'core/image', 'lightbox', 'enabled' ),
-				$old['behaviors']['blocks']['core/image']['lightbox']['enabled']
-			);
+		// Set the new version.
+		$new['version'] = 3;
+
+		/*
+		 * Remaining changes do not need to be applied to the custom origin,
+		 * as they should take on the value of the theme origin.
+		 */
+		if ( 'custom' === $origin ) {
+			return $new;
 		}
 
-		// Migrate the behaviors setting to the new syntax. This setting controls
-		// whether the Lightbox UI shows up in the block editor.
-		if ( isset( $old['settings']['blocks']['core/image']['behaviors']['lightbox'] ) ) {
-			_wp_array_set(
-				$new,
-				array( 'settings', 'blocks', 'core/image', 'lightbox', 'allowEditing' ),
-				$old['settings']['blocks']['core/image']['behaviors']['lightbox']
-			);
+		/*
+		 * Even though defaultFontSizes is a new setting, we need to migrate
+		 * it as it controls the PRESETS_METADATA prevent_override which was
+		 * previously hardcoded to false. This only needs to happen when the
+		 * theme provided font sizes as they could match the default ones and
+		 * affect the generated CSS. And in v2 we provided default font sizes
+		 * when the theme did not provide any.
+		 */
+		if ( isset( $old['settings']['typography']['fontSizes'] ) ) {
+			$new['settings']['typography']['defaultFontSizes'] = false;
+		}
+
+		/*
+		 * Similarly to defaultFontSizes, we need to migrate defaultSpacingSizes
+		 * as it controls the PRESETS_METADATA prevent_override which was
+		 * previously hardcoded to false. This only needs to happen when the
+		 * theme provided spacing sizes via spacingSizes or spacingScale.
+		 */
+		if (
+			isset( $old['settings']['spacing']['spacingSizes'] ) ||
+			isset( $old['settings']['spacing']['spacingScale'] )
+		) {
+			$new['settings']['spacing']['defaultSpacingSizes'] = false;
+		}
+
+		/*
+		 * In v3 spacingSizes is merged with the generated spacingScale sizes
+		 * instead of completely replacing them. The v3 behavior is what was
+		 * documented for the v2 schema, but the code never actually did work
+		 * that way. Instead of surprising users with a behavior change two
+		 * years after the fact at the same time as a v3 update is introduced,
+		 * we'll continue using the "bugged" behavior for v2 themes. And treat
+		 * the "bug fix" as a breaking change for v3.
+		 */
+		if ( isset( $old['settings']['spacing']['spacingSizes'] ) ) {
+			unset( $new['settings']['spacing']['spacingScale'] );
 		}
 
 		return $new;
diff --git a/lib/client-assets.php b/lib/client-assets.php
index c5b03b6833d030..f6b17ffcce68be 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -13,9 +13,9 @@
 /**
  * Retrieves the root plugin path.
  *
- * @return string Root path to the gutenberg plugin.
- *
  * @since 0.1.0
+ *
+ * @return string Root path to the gutenberg plugin.
  */
 function gutenberg_dir_path() {
 	return plugin_dir_path( __DIR__ );
@@ -24,11 +24,11 @@ function gutenberg_dir_path() {
 /**
  * Retrieves a URL to a file in the gutenberg plugin.
  *
+ * @since 0.1.0
+ *
  * @param  string $path Relative path of the desired file.
  *
  * @return string       Fully qualified URL pointing to the desired file.
- *
- * @since 0.1.0
  */
 function gutenberg_url( $path ) {
 	return plugins_url( $path, __DIR__ );
@@ -244,7 +244,9 @@ function gutenberg_register_packages_scripts( $scripts ) {
  * `build/` location.
  *
  * @since 6.7.0
-
+ *
+ * @global array $editor_styles
+ *
  * @param WP_Styles $styles WP_Styles instance.
  */
 function gutenberg_register_packages_styles( $styles ) {
@@ -266,7 +268,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-block-editor',
 		gutenberg_url( 'build/block-editor/style.css' ),
-		array( 'wp-components' ),
+		array( 'wp-components', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-block-editor', 'rtl', 'replace' );
@@ -275,7 +277,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-editor',
 		gutenberg_url( 'build/editor/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-patterns', 'wp-reusable-blocks' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-patterns', 'wp-reusable-blocks', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-editor', 'rtl', 'replace' );
@@ -284,7 +286,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-edit-post',
 		gutenberg_url( 'build/edit-post/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-block-library', 'wp-commands' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-block-library', 'wp-commands', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-edit-post', 'rtl', 'replace' );
@@ -318,14 +320,13 @@ function gutenberg_register_packages_styles( $styles ) {
 	);
 	$styles->add_data( 'wp-format-library', 'rtl', 'replace' );
 
+	// Only add CONTENT styles here that should be enqueued in the iframe!
 	$wp_edit_blocks_dependencies = array(
 		'wp-components',
 		// This need to be added before the block library styles,
 		// The block library styles override the "reset" styles.
 		'wp-reset-editor-styles',
 		'wp-block-library',
-		'wp-patterns',
-		'wp-reusable-blocks',
 		// Until #37466, we can't specifically add them as editor styles yet,
 		// so we must hard-code it here as a dependency.
 		'wp-block-editor-content',
@@ -409,7 +410,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-edit-site',
 		gutenberg_url( 'build/edit-site/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-commands' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'common', 'forms', 'wp-commands', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-edit-site', 'rtl', 'replace' );
@@ -418,7 +419,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-edit-widgets',
 		gutenberg_url( 'build/edit-widgets/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-patterns', 'wp-reusable-blocks', 'wp-widgets' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-patterns', 'wp-widgets', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-edit-widgets', 'rtl', 'replace' );
@@ -436,7 +437,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-customize-widgets',
 		gutenberg_url( 'build/customize-widgets/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-widgets' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-widgets', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-customize-widgets', 'rtl', 'replace' );
@@ -466,6 +467,15 @@ function gutenberg_register_packages_styles( $styles ) {
 		array( 'wp-components' )
 	);
 	$styles->add_data( 'wp-widgets', 'rtl', 'replace' );
+
+	gutenberg_override_style(
+		$styles,
+		'wp-preferences',
+		gutenberg_url( 'build/preferences/style.css' ),
+		array( 'wp-components' ),
+		$version
+	);
+	$styles->add_data( 'wp-preferences', 'rtl', 'replace' );
 }
 add_action( 'wp_default_styles', 'gutenberg_register_packages_styles' );
 
@@ -476,7 +486,9 @@ function gutenberg_register_packages_styles( $styles ) {
  * This hook also exists, and should be backported to Core in future versions.
  * However, it is envisaged that Gutenberg will continue to use the Style Engine's `gutenberg_*` functions and `_Gutenberg` classes to aid continuous development.
  *
- * See: https://developer.wordpress.org/block-editor/reference-guides/packages/packages-style-engine/
+ * @since 6.1
+ *
+ * @see https://developer.wordpress.org/block-editor/reference-guides/packages/packages-style-engine/
  *
  * @param array $options {
  *     Optional. An array of options to pass to gutenberg_style_engine_get_stylesheet_from_context(). Default empty array.
@@ -485,8 +497,6 @@ function gutenberg_register_packages_styles( $styles ) {
  *     @type bool $prettify Whether to add new lines and indents to output. Default is the test of whether the global constant `SCRIPT_DEBUG` is defined.
  * }
  *
- * @since 6.1
- *
  * @return void
  */
 function gutenberg_enqueue_stored_styles( $options = array() ) {
@@ -579,9 +589,67 @@ function gutenberg_register_vendor_scripts( $scripts ) {
 		array( 'react' ),
 		'18'
 	);
+
+	gutenberg_override_script(
+		$scripts,
+		'react-jsx-runtime',
+		gutenberg_url( 'build/vendors/react-jsx-runtime' . $extension ),
+		array( 'react' ),
+		'18'
+	);
 }
 add_action( 'wp_default_scripts', 'gutenberg_register_vendor_scripts' );
 
+/**
+ * Registers or re-registers Gutenberg Script Modules.
+ *
+ * Script modules that are registered by Core will be re-registered by Gutenberg.
+ *
+ * @since 19.3.0
+ */
+function gutenberg_default_script_modules() {
+	/*
+	 * Expects multidimensional array like:
+	 *
+	 *     'interactivity/index.min.js' => array('dependencies' => array(…), 'version' => '…'),
+	 *     'interactivity/debug.min.js' => array('dependencies' => array(…), 'version' => '…'),
+	 *     'interactivity-router/index.min.js' => …
+	 */
+	$assets = include gutenberg_dir_path() . '/build-module/assets.php';
+
+	foreach ( $assets as $file_name => $script_module_data ) {
+		/*
+		 * Build the WordPress Script Module ID from the file name.
+		 * Prepend `@wordpress/` and remove extensions and `/index` if present:
+		 *   - interactivity/index.min.js  => @wordpress/interactivity
+		 *   - interactivity/debug.min.js  => @wordpress/interactivity/debug
+		 *   - block-library/query/view.js => @wordpress/block-library/query/view
+		 */
+		$script_module_id = '@wordpress/' . preg_replace( '~(?:/index)?\.min\.js$~D', '', $file_name, 1 );
+		switch ( $script_module_id ) {
+			/*
+			 * Interactivity exposes two entrypoints, "/index" and "/debug".
+			 * "/debug" should replace "/index" in development.
+			 */
+			case '@wordpress/interactivity/debug':
+				if ( ! SCRIPT_DEBUG ) {
+					continue 2;
+				}
+				$script_module_id = '@wordpress/interactivity';
+				break;
+			case '@wordpress/interactivity':
+				if ( SCRIPT_DEBUG ) {
+					continue 2;
+				}
+				break;
+		}
+
+		$path = gutenberg_url( "build-module/{$file_name}" );
+		wp_register_script_module( $script_module_id, $path, $script_module_data['dependencies'], $script_module_data['version'] );
+	}
+}
+remove_action( 'wp_default_scripts', 'wp_default_script_modules' );
+add_action( 'wp_default_scripts', 'gutenberg_default_script_modules' );
 
 /*
  * Always remove the Core action hook while gutenberg_enqueue_stored_styles() exists to avoid styles being printed twice.
diff --git a/lib/compat/plugin/fonts.php b/lib/compat/plugin/fonts.php
new file mode 100644
index 00000000000000..f427f6110f610a
--- /dev/null
+++ b/lib/compat/plugin/fonts.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * A special compat layer for legacy font files upload directory.
+ *
+ * @see https://github.com/WordPress/gutenberg/pull/57688#issuecomment-2259037546
+ *
+ * @package gutenberg
+ */
+
+// @core-merge: Do not merge this function, it is for deleting fonts from the wp-content/fonts directory only used in Gutenberg.
+/**
+ * Deletes associated font files from wp-content/fonts, when a font face is deleted.
+ *
+ * @param int     $post_id Post ID.
+ * @param WP_Post $post    Post object.
+ */
+function gutenberg_before_delete_font_face( $post_id, $post ) {
+	if ( 'wp_font_face' !== $post->post_type ) {
+		return;
+	}
+
+	$font_files = get_post_meta( $post_id, '_wp_font_face_file', false );
+
+	if ( empty( $font_files ) ) {
+		return;
+	}
+
+	$site_path = '';
+	if ( is_multisite() && ! ( is_main_network() && is_main_site() ) ) {
+		$site_path = '/sites/' . get_current_blog_id();
+	}
+
+	$font_dir = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
+
+	foreach ( $font_files as $font_file ) {
+		$font_path = $font_dir . '/' . $font_file;
+
+		if ( file_exists( $font_path ) ) {
+			wp_delete_file( $font_path );
+		}
+	}
+}
+add_action( 'before_delete_post', 'gutenberg_before_delete_font_face', 10, 2 );
diff --git a/lib/compat/plugin/footnotes.php b/lib/compat/plugin/footnotes.php
deleted file mode 100644
index a14a7922b24a10..00000000000000
--- a/lib/compat/plugin/footnotes.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * Compatibility shim for the footnotes bloct to enable test passing while awaiting the tested code to be merged to core.
- *
- * See https://github.com/WordPress/gutenberg/pull/52988.
- *
- * Once merged, this shim can be removed.
- *
- * @package gutenberg
- */
-
-/**
- * Remove footnote revision hooks when plugin is running on a version of core that already supports meta revisions.
- */
-if ( function_exists( 'wp_post_revision_meta_keys' ) ) {
-	if ( has_action( 'rest_after_insert_post', 'wp_add_footnotes_revisions_to_post_meta' ) ) {
-		remove_action( 'rest_after_insert_post', 'wp_add_footnotes_revisions_to_post_meta' );
-	}
-	if ( has_action( 'rest_after_insert_page', 'wp_add_footnotes_revisions_to_post_meta' ) ) {
-		remove_action( 'rest_after_insert_page', 'wp_add_footnotes_revisions_to_post_meta' );
-	}
-	if ( has_action( 'wp_after_insert_post', 'wp_save_footnotes_meta' ) ) {
-		remove_action( 'wp_after_insert_post', 'wp_save_footnotes_meta' );
-	}
-	if ( has_action( '_wp_put_post_revision', 'wp_keep_footnotes_revision_id' ) ) {
-		remove_action( '_wp_put_post_revision', 'wp_keep_footnotes_revision_id' );
-	}
-	if ( has_action( 'wp_restore_post_revision', 'wp_restore_footnotes_from_revision' ) ) {
-		remove_action( 'wp_restore_post_revision', 'wp_restore_footnotes_from_revision' );
-	}
-	if ( has_action( 'wp_creating_autosave', '_wp_rest_api_autosave_meta' ) ) {
-		remove_action( 'wp_creating_autosave', '_wp_rest_api_autosave_meta' );
-	}
-	if ( has_action( '_wp_put_post_revision', '_wp_rest_api_autosave_meta' ) ) {
-		remove_action( '_wp_put_post_revision', '_wp_rest_api_autosave_meta' );
-	}
-	if ( has_filter( 'rest_pre_insert_post', '_wp_rest_api_force_autosave_difference' ) ) {
-		remove_filter( 'rest_pre_insert_post', '_wp_rest_api_force_autosave_difference' );
-	}
-} else {
-	/**
-	 * For versions of core that don't support meta revisions, use hooks to add.
-	 */
-	if ( ! function_exists( 'wp_save_footnotes_meta' ) ) {
-		/**
-		 * Saves the footnotes meta value to the revision.
-		 *
-		 * @since 6.3.0
-		 * @since 6.4.0 Core added post meta revisions, so this is no longer needed.
-		 *
-		 * @param int $revision_id The revision ID.
-		 */
-		function wp_save_footnotes_meta( $revision_id ) {
-			$post_id = wp_is_post_revision( $revision_id );
-
-			if ( $post_id ) {
-				$footnotes = get_post_meta( $post_id, 'footnotes', true );
-
-				if ( $footnotes ) {
-					// Can't use update_post_meta() because it doesn't allow revisions.
-					update_metadata( 'post', $revision_id, 'footnotes', wp_slash( $footnotes ) );
-				}
-			}
-		}
-		if ( ! function_exists( 'wp_post_revision_meta_keys' ) ) {
-			add_action( 'wp_after_insert_post', 'wp_save_footnotes_meta' );
-		}
-	}
-
-	if ( ! function_exists( 'wp_keep_footnotes_revision_id' ) ) {
-		/**
-		 * Keeps track of the revision ID for "rest_after_insert_{$post_type}".
-		 *
-		 * @since 6.3.0
-		 * @since 6.4.0 Core added post meta revisions, so this is no longer needed.
-		 *
-		 * @global int $wp_temporary_footnote_revision_id The footnote revision ID.
-		 *
-		 * @param int $revision_id The revision ID.
-		 */
-		function wp_keep_footnotes_revision_id( $revision_id ) {
-			global $wp_temporary_footnote_revision_id;
-			$wp_temporary_footnote_revision_id = $revision_id;
-		}
-		if ( ! function_exists( 'wp_post_revision_meta_keys' ) ) {
-			add_action( '_wp_put_post_revision', 'wp_keep_footnotes_revision_id' );
-		}
-	}
-
-	if ( ! function_exists( 'wp_add_footnotes_revisions_to_post_meta' ) ) {
-
-		/**
-		 * This is a specific fix for the REST API. The REST API doesn't update
-		 * the post and post meta in one go (through `meta_input`). While it
-		 * does fix the `wp_after_insert_post` hook to be called correctly after
-		 * updating meta, it does NOT fix hooks such as post_updated and
-		 * save_post, which are normally also fired after post meta is updated
-		 * in `wp_insert_post()`. Unfortunately, `wp_save_post_revision` is
-		 * added to the `post_updated` action, which means the meta is not
-		 * available at the time, so we have to add it afterwards through the
-		 * `"rest_after_insert_{$post_type}"` action.
-		 *
-		 * @since 6.3.0
-		 * @since 6.4.0 Core added post meta revisions, so this is no longer needed.
-		 *
-		 * @global int $wp_temporary_footnote_revision_id The footnote revision ID.
-		 *
-		 * @param WP_Post $post The post object.
-		 */
-		function wp_add_footnotes_revisions_to_post_meta( $post ) {
-			global $wp_temporary_footnote_revision_id;
-
-			if ( $wp_temporary_footnote_revision_id ) {
-				$revision = get_post( $wp_temporary_footnote_revision_id );
-
-				if ( ! $revision ) {
-					return;
-				}
-
-				$post_id = $revision->post_parent;
-
-				// Just making sure we're updating the right revision.
-				if ( $post->ID === $post_id ) {
-					$footnotes = get_post_meta( $post_id, 'footnotes', true );
-
-					if ( $footnotes ) {
-						// Can't use update_post_meta() because it doesn't allow revisions.
-						update_metadata( 'post', $wp_temporary_footnote_revision_id, 'footnotes', wp_slash( $footnotes ) );
-					}
-				}
-			}
-		}
-
-		if ( ! function_exists( 'wp_post_revision_meta_keys' ) ) {
-			add_action( 'rest_after_insert_post', 'wp_add_footnotes_revisions_to_post_meta' );
-			add_action( 'rest_after_insert_page', 'wp_add_footnotes_revisions_to_post_meta' );
-		}
-	}
-
-	if ( ! function_exists( 'wp_restore_footnotes_from_revision' ) ) {
-
-		/**
-		 * Restores the footnotes meta value from the revision.
-		 *
-		 * @since 6.3.0
-		 * @since 6.4.0 Core added post meta revisions, so this is no longer needed.
-		 *
-		 * @param int $post_id     The post ID.
-		 * @param int $revision_id The revision ID.
-		 */
-		function wp_restore_footnotes_from_revision( $post_id, $revision_id ) {
-			$footnotes = get_post_meta( $revision_id, 'footnotes', true );
-
-			if ( $footnotes ) {
-				update_post_meta( $post_id, 'footnotes', wp_slash( $footnotes ) );
-			} else {
-				delete_post_meta( $post_id, 'footnotes' );
-			}
-		}
-		if ( ! function_exists( 'wp_post_revision_meta_keys' ) ) {
-			add_action( 'wp_restore_post_revision', 'wp_restore_footnotes_from_revision', 10, 2 );
-		}
-	}
-
-	if ( ! function_exists( '_wp_rest_api_autosave_meta' ) ) {
-
-		/**
-		 * The REST API autosave endpoint doesn't save meta, so we can use the
-		 * `wp_creating_autosave` when it updates an exiting autosave, and
-		 * `_wp_put_post_revision` when it creates a new autosave.
-		 *
-		 * @since 6.3.0
-		 * @since 6.4.0 Core added post meta revisions, so this is no longer needed.
-		 *
-		 * @param int|array $autosave The autosave ID or array.
-		 */
-		function _wp_rest_api_autosave_meta( $autosave ) {
-			// Ensure it's a REST API request.
-			if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) {
-				return;
-			}
-
-			$body = rest_get_server()->get_raw_data();
-			$body = json_decode( $body, true );
-
-			if ( ! isset( $body['meta']['footnotes'] ) ) {
-				return;
-			}
-
-			// `wp_creating_autosave` passes the array,
-			// `_wp_put_post_revision` passes the ID.
-			$id = is_int( $autosave ) ? $autosave : $autosave['ID'];
-
-			if ( ! $id ) {
-				return;
-			}
-
-			// Can't use update_post_meta() because it doesn't allow revisions.
-			update_metadata( 'post', $id, 'footnotes', wp_slash( $body['meta']['footnotes'] ) );
-		}
-
-		if ( ! function_exists( 'wp_post_revision_meta_keys' ) ) {
-			// See https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php#L391C1-L391C1.
-			add_action( 'wp_creating_autosave', '_wp_rest_api_autosave_meta' );
-			// See https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php#L398.
-			// Then https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/revision.php#L367.
-			add_action( '_wp_put_post_revision', '_wp_rest_api_autosave_meta' );
-		}
-	}
-
-	if ( ! function_exists( '_wp_rest_api_force_autosave_difference' ) ) {
-
-		/**
-		 * This is a workaround for the autosave endpoint returning early if the
-		 * revision field are equal. The problem is that "footnotes" is not real
-		 * revision post field, so there's nothing to compare against.
-		 *
-		 * This trick sets the "footnotes" field (value doesn't matter), which will
-		 * cause the autosave endpoint to always update the latest revision. That should
-		 * be fine, it should be ok to update the revision even if nothing changed. Of
-		 * course, this is temporary fix.
-		 *
-		 * @since 6.3.0
-		 * @since 6.4.0 Core added post meta revisions, so this is no longer needed.
-		 *
-		 * @param WP_Post         $prepared_post The prepared post object.
-		 * @param WP_REST_Request $request       The request object.
-		 *
-		 * See https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php#L365-L384.
-		 * See https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php#L219.
-		 */
-		function _wp_rest_api_force_autosave_difference( $prepared_post, $request ) {
-			// We only want to be altering POST requests.
-			if ( $request->get_method() !== 'POST' ) {
-				return $prepared_post;
-			}
-
-			// Only alter requests for the '/autosaves' route.
-			if ( substr( $request->get_route(), -strlen( '/autosaves' ) ) !== '/autosaves' ) {
-				return $prepared_post;
-			}
-
-			$prepared_post->footnotes = '[]';
-			return $prepared_post;
-		}
-		if ( ! function_exists( 'wp_post_revision_meta_keys' ) ) {
-			add_filter( 'rest_pre_insert_post', '_wp_rest_api_force_autosave_difference', 10, 2 );
-		}
-	}
-}
diff --git a/lib/compat/wordpress-6.4/block-hooks.php b/lib/compat/wordpress-6.4/block-hooks.php
deleted file mode 100644
index 9cf6d2414926a5..00000000000000
--- a/lib/compat/wordpress-6.4/block-hooks.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-/**
- * Block hooks.
- *
- * @package gutenberg
- */
-
-/**
- * Register hooked blocks for automatic insertion, based on their block.json metadata.
- *
- * @param array $settings Array of determined settings for registering a block type.
- * @param array $metadata Metadata provided for registering a block type.
- * @return array Updated settings array.
- */
-function gutenberg_add_hooked_blocks( $settings, $metadata ) {
-	if ( ! isset( $metadata['blockHooks'] ) ) {
-		return $settings;
-	}
-	$block_hooks = $metadata['blockHooks'];
-
-	/**
-	 * Map the camelCased position string from block.json to the snake_cased block type position
-	 * used in the hooked block registration function.
-	 *
-	 * @var array
-	 */
-	$property_mappings = array(
-		'before'     => 'before',
-		'after'      => 'after',
-		'firstChild' => 'first_child',
-		'lastChild'  => 'last_child',
-	);
-
-	$inserted_block_name = $metadata['name'];
-	foreach ( $block_hooks as $anchor_block_name => $position ) {
-		// Avoid infinite recursion (hooking to itself).
-		if ( $inserted_block_name === $anchor_block_name ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Cannot hook block to itself.', 'gutenberg' ),
-				'6.4.0'
-			);
-			continue;
-		}
-
-		if ( ! isset( $property_mappings[ $position ] ) ) {
-			continue;
-		}
-
-		$mapped_position = $property_mappings[ $position ];
-
-		gutenberg_add_hooked_block( $inserted_block_name, $mapped_position, $anchor_block_name );
-
-		$settings['block_hooks'][ $anchor_block_name ] = $mapped_position;
-	}
-
-	// Copied from `get_block_editor_server_block_settings()`.
-	$fields_to_pick = array(
-		'api_version'      => 'apiVersion',
-		'title'            => 'title',
-		'description'      => 'description',
-		'icon'             => 'icon',
-		'attributes'       => 'attributes',
-		'provides_context' => 'providesContext',
-		'uses_context'     => 'usesContext',
-		'selectors'        => 'selectors',
-		'supports'         => 'supports',
-		'category'         => 'category',
-		'styles'           => 'styles',
-		'textdomain'       => 'textdomain',
-		'parent'           => 'parent',
-		'ancestor'         => 'ancestor',
-		'keywords'         => 'keywords',
-		'example'          => 'example',
-		'variations'       => 'variations',
-	);
-	// Add `block_hooks` to the list of fields to pick.
-	$fields_to_pick['block_hooks'] = 'blockHooks';
-
-	$exposed_settings = array_intersect_key( $settings, $fields_to_pick );
-
-	// TODO: Make work for blocks registered via direct call to gutenberg_add_hooked_block().
-	wp_add_inline_script(
-		'wp-blocks',
-		'wp.blocks.unstable__bootstrapServerSideBlockDefinitions(' . wp_json_encode( array( $inserted_block_name => $exposed_settings ) ) . ');'
-	);
-
-	return $settings;
-}
-
-/**
- * Register a hooked block for automatic insertion into a given block hook.
- *
- * A block hook is specified by a block type and a relative position. The hooked block
- * will be automatically inserted in the given position next to the "anchor" block
- * whenever the latter is encountered. This applies both to the frontend and to the markup
- * returned by the templates and patterns REST API endpoints.
- *
- * This is currently done by filtering parsed blocks as obtained from a block template,
- * template part, or pattern, and injecting the hooked block where applicable.
- *
- * @todo In the long run, we'd likely want some sort of registry for hooked blocks.
- *
- * @param string $hooked_block  The name of the block to insert.
- * @param string $position      The desired position of the hooked block, relative to its anchor block.
- *                              Can be 'before', 'after', 'first_child', or 'last_child'.
- * @param string $anchor_block  The name of the block to insert the hooked block next to.
- * @return void
- */
-function gutenberg_add_hooked_block( $hooked_block, $position, $anchor_block ) {
-		$hooked_block_array = array(
-			'blockName'    => $hooked_block,
-			'attrs'        => array(),
-			'innerHTML'    => '',
-			'innerContent' => array(),
-			'innerBlocks'  => array(),
-		);
-
-		$inserter = gutenberg_insert_hooked_block( $hooked_block_array, $position, $anchor_block );
-		add_filter( 'gutenberg_serialize_block', $inserter, 10, 1 );
-
-		/*
-		 * The block-types REST API controller uses objects of the `WP_Block_Type` class, which are
-		 * in turn created upon block type registration. However, that class does not contain
-		 * a `block_hooks` property (and is not easily extensible), so we have to use a different
-		 * mechanism to communicate to the controller which hooked blocks have been registered for
-		 * automatic insertion. We're doing so here (i.e. upon block registration), by adding a filter to
-		 * the controller's response.
-		 */
-		$controller_extender = gutenberg_add_block_hooks_field_to_block_type_controller( $hooked_block, $position, $anchor_block );
-		add_filter( 'rest_prepare_block_type', $controller_extender, 10, 2 );
-}
-
-/**
- * Return a function that auto-inserts a block next to a given "anchor" block.
- *
- * This is a helper function used in the implementation of block hooks.
- * It is not meant for public use.
- *
- * The auto-inserted block can be inserted before or after the anchor block,
- * or as the first or last child of the anchor block.
- *
- * Note that the returned function mutates the automatically inserted block's
- * designated parent block by inserting into the parent's `innerBlocks` array,
- * and by updating the parent's `innerContent` array accordingly.
- *
- * @param array  $inserted_block    The block to insert.
- * @param string $relative_position The position relative to the given block.
- *                                  Can be 'before', 'after', 'first_child', or 'last_child'.
- * @param string $anchor_block_type The automatically inserted block will be inserted next to instances of this block type.
- * @return callable A function that accepts a block's content and returns the content with the inserted block.
- */
-function gutenberg_insert_hooked_block( $inserted_block, $relative_position, $anchor_block_type ) {
-	return function ( $block ) use ( $inserted_block, $relative_position, $anchor_block_type ) {
-		if ( $anchor_block_type === $block['blockName'] ) {
-			if ( 'first_child' === $relative_position ) {
-				array_unshift( $block['innerBlocks'], $inserted_block );
-				// Since WP_Block::render() iterates over `inner_content` (rather than `inner_blocks`)
-				// when rendering blocks, we also need to prepend a value (`null`, to mark a block
-				// location) to that array after HTML content for the inner blocks wrapper.
-				$chunk_index = 0;
-				for ( $index = $chunk_index; $index < count( $block['innerContent'] ); $index++ ) {
-					if ( is_null( $block['innerContent'][ $index ] ) ) {
-						$chunk_index = $index;
-						break;
-					}
-				}
-				array_splice( $block['innerContent'], $chunk_index, 0, array( null ) );
-			} elseif ( 'last_child' === $relative_position ) {
-				array_push( $block['innerBlocks'], $inserted_block );
-				// Since WP_Block::render() iterates over `inner_content` (rather than `inner_blocks`)
-				// when rendering blocks, we also need to correctly append a value (`null`, to mark a block
-				// location) to that array before the remaining HTML content for the inner blocks wrapper.
-				$chunk_index = count( $block['innerContent'] );
-				for ( $index = count( $block['innerContent'] ); $index > 0; $index-- ) {
-					if ( is_null( $block['innerContent'][ $index - 1 ] ) ) {
-						$chunk_index = $index;
-						break;
-					}
-				}
-				array_splice( $block['innerContent'], $chunk_index, 0, array( null ) );
-			}
-			return $block;
-		}
-
-		$anchor_block_index = array_search( $anchor_block_type, array_column( $block['innerBlocks'], 'blockName' ), true );
-		if ( false !== $anchor_block_index && ( 'after' === $relative_position || 'before' === $relative_position ) ) {
-			if ( 'after' === $relative_position ) {
-				++$anchor_block_index;
-			}
-			array_splice( $block['innerBlocks'], $anchor_block_index, 0, array( $inserted_block ) );
-
-			// Find matching `innerContent` chunk index.
-			$chunk_index = 0;
-			while ( $anchor_block_index > 0 ) {
-				if ( ! is_string( $block['innerContent'][ $chunk_index ] ) ) {
-					--$anchor_block_index;
-				}
-				++$chunk_index;
-			}
-			// Since WP_Block::render() iterates over `inner_content` (rather than `inner_blocks`)
-			// when rendering blocks, we also need to insert a value (`null`, to mark a block
-			// location) into that array.
-			array_splice( $block['innerContent'], $chunk_index, 0, array( null ) );
-		}
-		return $block;
-	};
-}
-
-/**
- * Add block hooks information to a block type's controller.
- *
- * @param array  $inserted_block_type The type of block to insert.
- * @param string $position            The position relative to the anchor block.
- *                                    Can be 'before', 'after', 'first_child', or 'last_child'.
- * @param string $anchor_block_type   The hooked block will be inserted next to instances of this block type.
- * @return callable A filter for the `rest_prepare_block_type` hook that adds a `block_hooks` field to the network response.
- */
-function gutenberg_add_block_hooks_field_to_block_type_controller( $inserted_block_type, $position, $anchor_block_type ) {
-	return function ( $response, $block_type ) use ( $inserted_block_type, $position, $anchor_block_type ) {
-		if ( $block_type->name !== $inserted_block_type ) {
-			return $response;
-		}
-
-		$data = $response->get_data();
-		if ( ! isset( $data['block_hooks'] ) ) {
-			$data['block_hooks'] = array();
-		}
-		$data['block_hooks'][ $anchor_block_type ] = $position;
-		$response->set_data( $data );
-		return $response;
-	};
-}
-
-/**
- * Parse and reserialize block templates to allow running filters.
- *
- * By parsing a block template's content and then reserializing it
- * via `gutenberg_serialize_blocks()`, we are able to run filters
- * on the parsed blocks. This allows us to modify (parsed) blocks during
- * depth-first traversal already provided by the serialization process,
- * rather than having to do so in a separate pass.
- *
- * @param WP_Block_Template[] $query_result Array of found block templates.
- * @return WP_Block_Template[] Updated array of found block templates.
- */
-function gutenberg_parse_and_serialize_block_templates( $query_result ) {
-	foreach ( $query_result as $block_template ) {
-		if ( empty( $block_template->content ) || 'custom' === $block_template->source ) {
-			continue;
-		}
-		$blocks                  = parse_blocks( $block_template->content );
-		$block_template->content = gutenberg_serialize_blocks( $blocks );
-	}
-
-	return $query_result;
-}
-
-/**
- * Filters the block template object after it has been (potentially) fetched from the theme file.
- *
- * By parsing a block template's content and then reserializing it
- * via `gutenberg_serialize_blocks()`, we are able to run filters
- * on the parsed blocks. This allows us to modify (parsed) blocks during
- * depth-first traversal already provided by the serialization process,
- * rather than having to do so in a separate pass.
- *
- * @param WP_Block_Template|null $block_template The found block template, or null if there is none.
- */
-function gutenberg_parse_and_serialize_blocks( $block_template ) {
-	if ( empty( $block_template->content ) ) {
-		return $block_template;
-	}
-
-	$blocks                  = parse_blocks( $block_template->content );
-	$block_template->content = gutenberg_serialize_blocks( $blocks );
-
-	return $block_template;
-}
-
-/**
- * Register the `block_hooks` field for the block-types REST API controller.
- *
- * @return void
- */
-function gutenberg_register_block_hooks_rest_field() {
-	register_rest_field(
-		'block-type',
-		'block_hooks',
-		array(
-			'schema' => array(
-				'description'       => __( 'This block is automatically inserted near any occurence of the block types used as keys of this map, into a relative position given by the corresponding value.', 'gutenberg' ),
-				'type'              => 'object',
-				'patternProperties' => array(
-					'^[a-zA-Z0-9-]+/[a-zA-Z0-9-]+$' => array(
-						'type' => 'string',
-						'enum' => array( 'before', 'after', 'first_child', 'last_child' ),
-					),
-				),
-			),
-		)
-	);
-}
-
-// Install the polyfill for Block Hooks only if it isn't already handled in WordPress core.
-if ( ! function_exists( 'traverse_and_serialize_blocks' ) ) {
-	add_filter( 'block_type_metadata_settings', 'gutenberg_add_hooked_blocks', 10, 2 );
-	add_filter( 'get_block_templates', 'gutenberg_parse_and_serialize_block_templates', 10, 1 );
-	add_filter( 'get_block_file_template', 'gutenberg_parse_and_serialize_blocks', 10, 1 );
-	add_action( 'rest_api_init', 'gutenberg_register_block_hooks_rest_field' );
-}
-
-// Helper functions.
-// -----------------
-// The sole purpose of the following two functions (`gutenberg_serialize_block`
-// and `gutenberg_serialize_blocks`), which are otherwise copies of their unprefixed
-// counterparts (`serialize_block` and `serialize_blocks`) is to apply a filter
-// (also called `gutenberg_serialize_block`) as an entry point for modifications
-// to the parsed blocks.
-
-/**
- * Filterable version of `serialize_block()`.
- *
- * This function is identical to `serialize_block()`, except that it applies
- * the `gutenberg_serialize_block` filter to each block before it is serialized.
- *
- * @param array $block The block to be serialized.
- * @return string The serialized block.
- *
- * @see serialize_block()
- */
-function gutenberg_serialize_block( $block ) {
-	$block_content = '';
-
-	/**
-	 * Filters a parsed block before it is serialized.
-	 *
-	 * @param array $block The block to be serialized.
-	 */
-	$block = apply_filters( 'gutenberg_serialize_block', $block );
-
-	$index = 0;
-	foreach ( $block['innerContent'] as $chunk ) {
-		if ( is_string( $chunk ) ) {
-			$block_content .= $chunk;
-		} else { // Compare to WP_Block::render().
-			$inner_block    = $block['innerBlocks'][ $index++ ];
-			$block_content .= gutenberg_serialize_block( $inner_block );
-		}
-	}
-
-	if ( ! is_array( $block['attrs'] ) ) {
-		$block['attrs'] = array();
-	}
-
-	return get_comment_delimited_block_content(
-		$block['blockName'],
-		$block['attrs'],
-		$block_content
-	);
-}
-
-/**
- * Filterable version of `serialize_blocks()`.
- *
- * This function is identical to `serialize_blocks()`, except that it applies
- * the `gutenberg_serialize_block` filter to each block before it is serialized.
- *
- * @param array $blocks The blocks to be serialized.
- * @return string[] The serialized blocks.
- *
- * @see serialize_blocks()
- */
-function gutenberg_serialize_blocks( $blocks ) {
-	return implode( '', array_map( 'gutenberg_serialize_block', $blocks ) );
-}
diff --git a/lib/compat/wordpress-6.4/block-patterns.php b/lib/compat/wordpress-6.4/block-patterns.php
deleted file mode 100644
index 65c31fb7a22af4..00000000000000
--- a/lib/compat/wordpress-6.4/block-patterns.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Overrides Core's wp-includes/block-patterns.php to add new wp_patterns taxonomy for WP 6.4.
- *
- * @package gutenberg
- */
-
-/**
- * Adds a new taxonomy for organizing user created patterns.
- *
- * Note: This should be removed when the minimum required WP version is >= 6.4.
- *
- * @see https://github.com/WordPress/gutenberg/pull/53163
- *
- * @return void
- */
-function gutenberg_register_taxonomy_patterns() {
-	$args = array(
-		'public'             => false,
-		'publicly_queryable' => false,
-		'hierarchical'       => false,
-		'labels'             => array(
-			'name'          => _x( 'Pattern Categories', 'taxonomy general name' ),
-			'singular_name' => _x( 'Pattern Category', 'taxonomy singular name' ),
-		),
-		'query_var'          => false,
-		'rewrite'            => false,
-		'show_ui'            => true,
-		'_builtin'           => true,
-		'show_in_nav_menus'  => false,
-		'show_in_rest'       => true,
-		'show_admin_column'  => true,
-	);
-	register_taxonomy( 'wp_pattern_category', array( 'wp_block' ), $args );
-}
-add_action( 'init', 'gutenberg_register_taxonomy_patterns' );
diff --git a/lib/compat/wordpress-6.4/blocks.php b/lib/compat/wordpress-6.4/blocks.php
deleted file mode 100644
index 74fa9253e45d50..00000000000000
--- a/lib/compat/wordpress-6.4/blocks.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Temporary compatibility shims for block APIs present in Gutenberg.
- *
- * @package gutenberg
- */
-
-/**
- * Adds delete_posts capabilities to the wp_block post type.
- *
- * @param array $args Register post type args.
- *
- * @return array Register post type args.
- */
-function gutenberg_add_custom_capabilities_to_wp_block( $args ) {
-	if ( is_array( $args ) ) {
-		if ( ! isset( $args['capabilities'] ) || is_array( $args['capabilities'] ) ) {
-			$args['capabilities']['delete_posts'] = 'delete_posts';
-		}
-	}
-	return $args;
-}
-add_filter( 'register_wp_block_post_type_args', 'gutenberg_add_custom_capabilities_to_wp_block', 10, 1 );
diff --git a/lib/compat/wordpress-6.4/class-gutenberg-rest-block-patterns-controller.php b/lib/compat/wordpress-6.4/class-gutenberg-rest-block-patterns-controller.php
deleted file mode 100644
index d3c3431bae4b31..00000000000000
--- a/lib/compat/wordpress-6.4/class-gutenberg-rest-block-patterns-controller.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * REST API: Gutenberg_REST_Block_Patterns_Controller class
- *
- * @package    Gutenberg
- * @subpackage REST_API
- */
-
-/**
- * Core class used to access block patterns via the REST API.
- *
- * @since 6.4.0
- *
- * @see WP_REST_Controller
- */
-class Gutenberg_REST_Block_Patterns_Controller extends WP_REST_Block_Patterns_Controller {
-	/**
-	 * Prepare a raw block pattern before it gets output in a REST API response.
-	 *
-	 * @todo In the long run, we'd likely want to have a filter in the `WP_Block_Patterns_Registry` class
-	 * instead to allow us plugging in code like this.
-	 *
-	 * @param array           $item    Raw pattern as registered, before any changes.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function prepare_item_for_response( $item, $request ) {
-		$response = parent::prepare_item_for_response( $item, $request );
-
-		// Run the polyfill for Block Hooks only if it isn't already handled in WordPress core.
-		if ( function_exists( 'traverse_and_serialize_blocks' ) ) {
-			return $response;
-		}
-
-		$data = $response->get_data();
-
-		if ( empty( $data['content'] ) ) {
-			return $response;
-		}
-
-		$blocks          = parse_blocks( $data['content'] );
-		$data['content'] = gutenberg_serialize_blocks( $blocks ); // Serialize or render?
-
-		return rest_ensure_response( $data );
-	}
-}
diff --git a/lib/compat/wordpress-6.4/class-gutenberg-rest-global-styles-revisions-controller-6-4.php b/lib/compat/wordpress-6.4/class-gutenberg-rest-global-styles-revisions-controller-6-4.php
deleted file mode 100644
index 4c7df97c33e57c..00000000000000
--- a/lib/compat/wordpress-6.4/class-gutenberg-rest-global-styles-revisions-controller-6-4.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * REST API: Gutenberg_REST_Global_Styles_Revisions_Controller class, inspired by WP_REST_Revisions_Controller.
- *
- * @package WordPress
- * @subpackage REST_API
- * @since 6.3.0
- */
-
-/**
- * Core class used to access global styles revisions via the REST API.
- *
- * @since 6.3.0
- *
- * @see WP_REST_Controller
- */
-class Gutenberg_REST_Global_Styles_Revisions_Controller_6_4 extends WP_REST_Global_Styles_Revisions_Controller {
-	/**
-	 * Prepares the revision for the REST response.
-	 *
-	 * @since 6.3.0
-	 *
-	 * @param WP_Post         $post    Post revision object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response|WP_Error Response object.
-	 */
-	public function prepare_item_for_response( $post, $request ) {
-		$parent               = $this->get_parent( $request['parent'] );
-		$global_styles_config = $this->get_decoded_global_styles_json( $post->post_content );
-
-		if ( is_wp_error( $global_styles_config ) ) {
-			return $global_styles_config;
-		}
-
-		$fields = $this->get_fields_for_response( $request );
-		$data   = array();
-
-		if ( ! empty( $global_styles_config['styles'] ) || ! empty( $global_styles_config['settings'] ) ) {
-			$global_styles_config = ( new WP_Theme_JSON_Gutenberg( $global_styles_config, 'custom' ) )->get_raw_data();
-			if ( rest_is_field_included( 'settings', $fields ) ) {
-				$data['settings'] = ! empty( $global_styles_config['settings'] ) ? $global_styles_config['settings'] : new stdClass();
-			}
-			if ( rest_is_field_included( 'styles', $fields ) ) {
-				$data['styles'] = ! empty( $global_styles_config['styles'] ) ? $global_styles_config['styles'] : new stdClass();
-			}
-		}
-
-		if ( rest_is_field_included( 'author', $fields ) ) {
-			$data['author'] = (int) $post->post_author;
-		}
-
-		if ( rest_is_field_included( 'date', $fields ) ) {
-			$data['date'] = $this->prepare_date_response( $post->post_date_gmt, $post->post_date );
-		}
-
-		if ( rest_is_field_included( 'date_gmt', $fields ) ) {
-			$data['date_gmt'] = $this->prepare_date_response( $post->post_date_gmt );
-		}
-
-		if ( rest_is_field_included( 'id', $fields ) ) {
-			$data['id'] = (int) $post->ID;
-		}
-
-		if ( rest_is_field_included( 'modified', $fields ) ) {
-			$data['modified'] = $this->prepare_date_response( $post->post_modified_gmt, $post->post_modified );
-		}
-
-		if ( rest_is_field_included( 'modified_gmt', $fields ) ) {
-			$data['modified_gmt'] = $this->prepare_date_response( $post->post_modified_gmt );
-		}
-
-		if ( rest_is_field_included( 'parent', $fields ) ) {
-			$data['parent'] = (int) $parent->ID;
-		}
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		return rest_ensure_response( $data );
-	}
-
-	/**
-	 * Retrieves the revision's schema, conforming to JSON Schema.
-	 *
-	 * @since 6.3.0
-	 *
-	 * @return array Item schema data.
-	 */
-	public function get_item_schema() {
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
-		}
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => "{$this->parent_post_type}-revision",
-			'type'       => 'object',
-			// Base properties for every Revision.
-			'properties' => array(
-
-				/*
-				 * Adds settings and styles from the WP_REST_Revisions_Controller item fields.
-				 * Leaves out GUID as global styles shouldn't be accessible via URL.
-				 */
-				'author'       => array(
-					'description' => __( 'The ID for the author of the revision.', 'gutenberg' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'date'         => array(
-					'description' => __( "The date the revision was published, in the site's timezone.", 'gutenberg' ),
-					'type'        => 'string',
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'date_gmt'     => array(
-					'description' => __( 'The date the revision was published, as GMT.', 'gutenberg' ),
-					'type'        => 'string',
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit' ),
-				),
-				'id'           => array(
-					'description' => __( 'Unique identifier for the revision.', 'gutenberg' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-				'modified'     => array(
-					'description' => __( "The date the revision was last modified, in the site's timezone.", 'gutenberg' ),
-					'type'        => 'string',
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit' ),
-				),
-				'modified_gmt' => array(
-					'description' => __( 'The date the revision was last modified, as GMT.', 'gutenberg' ),
-					'type'        => 'string',
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit' ),
-				),
-				'parent'       => array(
-					'description' => __( 'The ID for the parent of the revision.', 'gutenberg' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				// Adds settings and styles from the WP_REST_Global_Styles_Controller parent schema.
-				'styles'       => array(
-					'description' => __( 'Global styles.', 'gutenberg' ),
-					'type'        => array( 'object' ),
-					'context'     => array( 'view', 'edit' ),
-				),
-				'settings'     => array(
-					'description' => __( 'Global settings.', 'gutenberg' ),
-					'type'        => array( 'object' ),
-					'context'     => array( 'view', 'edit' ),
-				),
-			),
-		);
-
-		$this->schema = $schema;
-
-		return $this->add_additional_fields_schema( $this->schema );
-	}
-}
diff --git a/lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php b/lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php
deleted file mode 100644
index 01b9d4566aa670..00000000000000
--- a/lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/**
- * WP_Font_Face_Resolver class.
- *
- * @package    WordPress
- * @subpackage Fonts
- * @since      6.4.0
- *
- * @core-merge: this file is located in `wp-includes/fonts/`.
- */
-
-if ( class_exists( 'WP_Font_Face_Resolver' ) ) {
-	return;
-}
-
-/**
- * The Font Face Resolver abstracts the processing of different data sources
- * (such as theme.json) for processing within the Font Face.
- *
- * This class is for internal core usage and is not supposed to be used by
- * extenders (plugins and/or themes).
- *
- * @access private
- */
-class WP_Font_Face_Resolver {
-
-	/**
-	 * Gets fonts defined in theme.json.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @return array Returns the font-families, each with their font-face variations.
-	 */
-	public static function get_fonts_from_theme_json() {
-		$settings = gutenberg_get_global_settings();
-
-		// Bail out early if there are no font settings.
-		if ( empty( $settings['typography']['fontFamilies'] ) ) {
-			return array();
-		}
-
-		return static::parse_settings( $settings );
-	}
-
-	/**
-	 * Parse theme.json settings to extract font definitions with variations grouped by font-family.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $settings Font settings to parse.
-	 * @return array Returns an array of fonts, grouped by font-family.
-	 */
-	private static function parse_settings( array $settings ) {
-		$fonts = array();
-
-		foreach ( $settings['typography']['fontFamilies'] as $font_families ) {
-			foreach ( $font_families as $definition ) {
-
-				// Skip if "fontFace" is not defined, meaning there are no variations.
-				if ( empty( $definition['fontFace'] ) ) {
-					continue;
-				}
-
-				// Skip if "fontFamily" is not defined.
-				if ( empty( $definition['fontFamily'] ) ) {
-					continue;
-				}
-
-				$font_family_name = static::maybe_parse_name_from_comma_separated_list( $definition['fontFamily'] );
-
-				// Skip if no font family is defined.
-				if ( empty( $font_family_name ) ) {
-					continue;
-				}
-
-				// Prepare the fonts array structure for this font-family.
-				if ( ! array_key_exists( $font_family_name, $fonts ) ) {
-					$fonts[ $font_family_name ] = array();
-				}
-
-				$fonts[ $font_family_name ] = static::convert_font_face_properties( $definition['fontFace'], $font_family_name );
-			}
-		}
-
-		return $fonts;
-	}
-
-	/**
-	 * Parse font-family name from comma-separated lists.
-	 *
-	 * If the given `fontFamily` is a comma-separated lists (example: "Inter, sans-serif" ),
-	 * parse and return the fist font from the list.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param string $font_family Font family `fontFamily' to parse.
-	 * @return string Font-family name.
-	 */
-	private static function maybe_parse_name_from_comma_separated_list( $font_family ) {
-		if ( str_contains( $font_family, ',' ) ) {
-			$font_family = explode( ',', $font_family )[0];
-		}
-
-		return trim( $font_family, "\"'" );
-	}
-
-	/**
-	 * Converts font-face properties from theme.json format.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array  $font_face_definition The font-face definitions to convert.
-	 * @param string $font_family_property The value to store in the font-face font-family property.
-	 * @return array Converted font-face properties.
-	 */
-	private static function convert_font_face_properties( array $font_face_definition, $font_family_property ) {
-		$converted_font_faces = array();
-
-		foreach ( $font_face_definition as $font_face ) {
-			// Add the font-family property to the font-face.
-			$font_face['font-family'] = $font_family_property;
-
-			// Converts the "file:./" src placeholder into a theme font file URI.
-			if ( ! empty( $font_face['src'] ) ) {
-				$font_face['src'] = static::to_theme_file_uri( (array) $font_face['src'] );
-			}
-
-			// Convert camelCase properties into kebab-case.
-			$font_face = static::to_kebab_case( $font_face );
-
-			$converted_font_faces[] = $font_face;
-		}
-
-		return $converted_font_faces;
-	}
-
-	/**
-	 * Converts each 'file:./' placeholder into a URI to the font file in the theme.
-	 *
-	 * The 'file:./' is specified in the theme's `theme.json` as a placeholder to be
-	 * replaced with the URI to the font file's location in the theme. When a "src"
-	 * beings with this placeholder, it is replaced, converting the src into a URI.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $src An array of font file sources to process.
-	 * @return array An array of font file src URI(s).
-	 */
-	private static function to_theme_file_uri( array $src ) {
-		$placeholder = 'file:./';
-
-		foreach ( $src as $src_key => $src_url ) {
-			// Skip if the src doesn't start with the placeholder, as there's nothing to replace.
-			if ( ! str_starts_with( $src_url, $placeholder ) ) {
-				continue;
-			}
-
-			$src_file        = str_replace( $placeholder, '', $src_url );
-			$src[ $src_key ] = get_theme_file_uri( $src_file );
-		}
-
-		return $src;
-	}
-
-	/**
-	 * Converts all first dimension keys into kebab-case.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $data The array to process.
-	 * @return array Data with first dimension keys converted into kebab-case.
-	 */
-	private static function to_kebab_case( array $data ) {
-		foreach ( $data as $key => $value ) {
-			$kebab_case          = _wp_to_kebab_case( $key );
-			$data[ $kebab_case ] = $value;
-			if ( $kebab_case !== $key ) {
-				unset( $data[ $key ] );
-			}
-		}
-
-		return $data;
-	}
-}
diff --git a/lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face.php b/lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face.php
deleted file mode 100644
index 8bb1d55414854f..00000000000000
--- a/lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-/**
- * WP_Font_Face class.
- *
- * @package    WordPress
- * @subpackage Fonts
- * @since      6.4.0
- *
- * @core-merge: this file is located in `wp-includes/fonts/`.
- */
-
-if ( class_exists( 'WP_Font_Face' ) ) {
-	return;
-}
-
-/**
- * Font Face generates and prints `@font-face` styles for given fonts.
- *
- * @since 6.4.0
- */
-class WP_Font_Face {
-
-	/**
-	 * The font-face property defaults.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string[]
-	 */
-	private $font_face_property_defaults = array(
-		'font-family'  => '',
-		'font-style'   => 'normal',
-		'font-weight'  => '400',
-		'font-display' => 'fallback',
-	);
-
-	/**
-	 * Valid font-face property names.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string[]
-	 */
-	private $valid_font_face_properties = array(
-		'ascent-override',
-		'descent-override',
-		'font-display',
-		'font-family',
-		'font-stretch',
-		'font-style',
-		'font-weight',
-		'font-variant',
-		'font-feature-settings',
-		'font-variation-settings',
-		'line-gap-override',
-		'size-adjust',
-		'src',
-		'unicode-range',
-	);
-
-	/**
-	 * Valid font-display values.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string[]
-	 */
-	private $valid_font_display = array( 'auto', 'block', 'fallback', 'swap', 'optional' );
-
-	/**
-	 * Array of font-face style tag's attribute(s)
-	 * where the key is the attribute name and the
-	 * value is its value.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string[]
-	 */
-	private $style_tag_attrs = array();
-
-	/**
-	 * Creates and initializes an instance of WP_Font_Face.
-	 *
-	 * @since 6.4.0
-	 */
-	public function __construct() {
-		if (
-			function_exists( 'is_admin' ) && ! is_admin()
-			&&
-			function_exists( 'current_theme_supports' ) && ! current_theme_supports( 'html5', 'style' )
-		) {
-			$this->style_tag_attrs = array( 'type' => 'text/css' );
-		}
-	}
-
-	/**
-	 * Generates and prints the `@font-face` styles for the given fonts.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array[][] $fonts Optional. The font-families and their font variations.
-	 *                         See {@see wp_print_font_faces()} for the supported fields.
-	 *                         Default empty array.
-	 */
-	public function generate_and_print( array $fonts ) {
-		$fonts = $this->validate_fonts( $fonts );
-
-		// Bail out if there are no fonts are given to process.
-		if ( empty( $fonts ) ) {
-			return;
-		}
-
-		$css = $this->get_css( $fonts );
-
-		/*
-		 * The font-face CSS is contained within <style> tags and can only be interpreted
-		 * as CSS in the browser. Using wp_strip_all_tags() is sufficient escaping
-		 * to avoid malicious attempts to close </style> and open a <script>.
-		 */
-		$css = wp_strip_all_tags( $css );
-
-		// Bail out if there is no CSS to print.
-		if ( empty( $css ) ) {
-			return;
-		}
-
-		printf( $this->get_style_element(), $css );
-	}
-
-	/**
-	 * Validates each of the font-face properties.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $fonts The fonts to valid.
-	 * @return array Prepared font-faces organized by provider and font-family.
-	 */
-	private function validate_fonts( array $fonts ) {
-		$validated_fonts = array();
-
-		foreach ( $fonts as $font_faces ) {
-			foreach ( $font_faces as $font_face ) {
-				$font_face = $this->validate_font_face_declarations( $font_face );
-				// Skip if failed validation.
-				if ( false === $font_face ) {
-					continue;
-				}
-
-				$validated_fonts[] = $font_face;
-			}
-		}
-
-		return $validated_fonts;
-	}
-
-	/**
-	 * Validates each font-face declaration (property and value pairing).
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $font_face Font face property and value pairings to validate.
-	 * @return array|false Validated font-face on success, or false on failure.
-	 */
-	private function validate_font_face_declarations( array $font_face ) {
-		$font_face = wp_parse_args( $font_face, $this->font_face_property_defaults );
-
-		// Check the font-family.
-		if ( empty( $font_face['font-family'] ) || ! is_string( $font_face['font-family'] ) ) {
-			// @todo replace with `wp_trigger_error()`.
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Font font-family must be a non-empty string.' ),
-				'6.4.0'
-			);
-			return false;
-		}
-
-		// Make sure that local fonts have 'src' defined.
-		if ( empty( $font_face['src'] ) || ( ! is_string( $font_face['src'] ) && ! is_array( $font_face['src'] ) ) ) {
-			// @todo replace with `wp_trigger_error()`.
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Font src must be a non-empty string or an array of strings.' ),
-				'6.4.0'
-			);
-			return false;
-		}
-
-		// Validate the 'src' property.
-		foreach ( (array) $font_face['src'] as $src ) {
-			if ( empty( $src ) || ! is_string( $src ) ) {
-				// @todo replace with `wp_trigger_error()`.
-				_doing_it_wrong(
-					__METHOD__,
-					__( 'Each font src must be a non-empty string.' ),
-					'6.4.0'
-				);
-				return false;
-			}
-		}
-
-		// Check the font-weight.
-		if ( ! is_string( $font_face['font-weight'] ) && ! is_int( $font_face['font-weight'] ) ) {
-			// @todo replace with `wp_trigger_error()`.
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Font font-weight must be a properly formatted string or integer.' ),
-				'6.4.0'
-			);
-			return false;
-		}
-
-		// Check the font-display.
-		if ( ! in_array( $font_face['font-display'], $this->valid_font_display, true ) ) {
-			$font_face['font-display'] = $this->font_face_property_defaults['font-display'];
-		}
-
-		// Remove invalid properties.
-		foreach ( $font_face as $property => $value ) {
-			if ( ! in_array( $property, $this->valid_font_face_properties, true ) ) {
-				unset( $font_face[ $property ] );
-			}
-		}
-
-		return $font_face;
-	}
-
-	/**
-	 * Gets the style element for wrapping the `@font-face` CSS.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @return string The style element.
-	 */
-	private function get_style_element() {
-		$attributes = $this->generate_style_element_attributes();
-
-		return "<style id='wp-fonts-local'{$attributes}>\n%s\n</style>\n";
-	}
-
-	/**
-	 * Gets the defined <style> element's attributes.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @return string A string of attribute=value when defined, else, empty string.
-	 */
-	private function generate_style_element_attributes() {
-		$attributes = '';
-		foreach ( $this->style_tag_attrs as $name => $value ) {
-			$attributes .= " {$name}='{$value}'";
-		}
-		return $attributes;
-	}
-
-	/**
-	 * Gets the `@font-face` CSS styles for locally-hosted font files.
-	 *
-	 * This method does the following processing tasks:
-	 *    1. Orchestrates an optimized `src` (with format) for browser support.
-	 *    2. Generates the `@font-face` for all its fonts.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $font_faces The font-faces to generate @font-face CSS styles.
-	 * @return string The `@font-face` CSS styles.
-	 */
-	private function get_css( $font_faces ) {
-		$css = '';
-
-		foreach ( $font_faces as $font_face ) {
-			// Order the font's `src` items to optimize for browser support.
-			$font_face = $this->order_src( $font_face );
-
-			// Build the @font-face CSS for this font.
-			$css .= '@font-face{' . $this->build_font_face_css( $font_face ) . '}' . "\n";
-		}
-
-		// Don't print the last newline character.
-		return rtrim( $css, "\n" );
-	}
-
-	/**
-	 * Orders `src` items to optimize for browser support.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $font_face Font face to process.
-	 * @return array Font-face with ordered src items.
-	 */
-	private function order_src( array $font_face ) {
-		if ( ! is_array( $font_face['src'] ) ) {
-			$font_face['src'] = (array) $font_face['src'];
-		}
-
-		$src         = array();
-		$src_ordered = array();
-
-		foreach ( $font_face['src'] as $url ) {
-			// Add data URIs first.
-			if ( str_starts_with( trim( $url ), 'data:' ) ) {
-				$src_ordered[] = array(
-					'url'    => $url,
-					'format' => 'data',
-				);
-				continue;
-			}
-			$format         = pathinfo( $url, PATHINFO_EXTENSION );
-			$src[ $format ] = $url;
-		}
-
-		// Add woff2.
-		if ( ! empty( $src['woff2'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff2'],
-				'format' => 'woff2',
-			);
-		}
-
-		// Add woff.
-		if ( ! empty( $src['woff'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff'],
-				'format' => 'woff',
-			);
-		}
-
-		// Add ttf.
-		if ( ! empty( $src['ttf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['ttf'],
-				'format' => 'truetype',
-			);
-		}
-
-		// Add eot.
-		if ( ! empty( $src['eot'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['eot'],
-				'format' => 'embedded-opentype',
-			);
-		}
-
-		// Add otf.
-		if ( ! empty( $src['otf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['otf'],
-				'format' => 'opentype',
-			);
-		}
-		$font_face['src'] = $src_ordered;
-
-		return $font_face;
-	}
-
-	/**
-	 * Builds the font-family's CSS.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $font_face Font face to process.
-	 * @return string This font-family's CSS.
-	 */
-	private function build_font_face_css( array $font_face ) {
-		$css = '';
-
-		/*
-		 * Wrap font-family in quotes if it contains spaces
-		 * and is not already wrapped in quotes.
-		 */
-		if (
-			str_contains( $font_face['font-family'], ' ' ) &&
-			! str_contains( $font_face['font-family'], '"' ) &&
-			! str_contains( $font_face['font-family'], "'" )
-		) {
-			$font_face['font-family'] = '"' . $font_face['font-family'] . '"';
-		}
-
-		foreach ( $font_face as $key => $value ) {
-			// Compile the "src" parameter.
-			if ( 'src' === $key ) {
-				$value = $this->compile_src( $value );
-			}
-
-			// If font-variation-settings is an array, convert it to a string.
-			if ( 'font-variation-settings' === $key && is_array( $value ) ) {
-				$value = $this->compile_variations( $value );
-			}
-
-			if ( ! empty( $value ) ) {
-				$css .= "$key:$value;";
-			}
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Compiles the `src` into valid CSS.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $value Value to process.
-	 * @return string The CSS.
-	 */
-	private function compile_src( array $value ) {
-		$src = '';
-
-		foreach ( $value as $item ) {
-			$src .= ( 'data' === $item['format'] )
-				? ", url({$item['url']})"
-				: ", url('{$item['url']}') format('{$item['format']}')";
-		}
-
-		$src = ltrim( $src, ', ' );
-		return $src;
-	}
-
-	/**
-	 * Compiles the font variation settings.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array $font_variation_settings Array of font variation settings.
-	 * @return string The CSS.
-	 */
-	private function compile_variations( array $font_variation_settings ) {
-		$variations = '';
-
-		foreach ( $font_variation_settings as $key => $value ) {
-			$variations .= "$key $value";
-		}
-
-		return $variations;
-	}
-}
diff --git a/lib/compat/wordpress-6.4/fonts/fonts.php b/lib/compat/wordpress-6.4/fonts/fonts.php
deleted file mode 100644
index 94aef51a440a1e..00000000000000
--- a/lib/compat/wordpress-6.4/fonts/fonts.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Fonts functions.
- *
- * @package    WordPress
- * @subpackage Fonts
- * @since      6.4.0
- *
- * @core-merge: this file is located in `wp-includes/fonts.php`. It will contain Font Face and Font Library functions.
- */
-
-if ( ! function_exists( 'wp_print_font_faces' ) ) {
-	// @core-merge: will merge into Core's `wp-includes/default-filters.php` file.
-	add_action( 'wp_head', 'wp_print_font_faces', 50 );
-	// @core-merge: will merge into Core's `wp-admin/includes/admin-filters.php.` file.
-	add_action( 'admin_print_styles', 'wp_print_font_faces', 50 );
-
-	/**
-	 * Generates and prints font-face styles for given fonts or theme.json fonts.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param array[][] $fonts {
-	 *     Optional. The font-families and their font variations. Default empty array.
-	 *
-	 *     @type string $font-family => array[] $variations {
-	 *         Optional. An associated array of font variations for this font-family.
-	 *         Each variation has the following structure.
-	 *
-	 *         @type array $font_variation {
-	 *             @type string          $font-family             The font-family property.
-	 *             @type string|string[] $src                     The URL(s) to each resource containing the font data.
-	 *             @type string          $font_style              Optional. The font-style property. Default 'normal'.
-	 *             @type string          $font-weight             Optional. The font-weight property. Default '400'.
-	 *             @type string          $font-display            Optional. The font-display property. Default 'fallback'.
-	 *             @type string          $ascent-override         Optional. The ascent-override property.
-	 *             @type string          $descent-override        Optional. The descent-override property.
-	 *             @type string          $font-stretch            Optional. The font-stretch property.
-	 *             @type string          $font-variant            Optional. The font-variant property.
-	 *             @type string          $font-feature-settings   Optional. The font-feature-settings property.
-	 *             @type string          $font-variation-settings Optional. The font-variation-settings property.
-	 *             @type string          $line-gap-override       Optional. The line-gap-override property.
-	 *             @type string          $size-adjust             Optional. The size-adjust property.
-	 *             @type string          $unicode-range           Optional. The unicode-range property.
-	 *         }
-	 *     }
-	 * }
-	 */
-	function wp_print_font_faces( $fonts = array() ) {
-
-		if ( empty( $fonts ) ) {
-			$fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json();
-		}
-
-		if ( empty( $fonts ) ) {
-			return;
-		}
-
-		$wp_font_face = new WP_Font_Face();
-		$wp_font_face->generate_and_print( $fonts );
-	}
-}
-
-// @core-merge: do not merge this code into Core.
-add_filter(
-	'block_editor_settings_all',
-	static function ( $settings ) {
-		ob_start();
-		// @core-merge: add only this line into Core's `_wp_get_iframed_editor_assets()` function after `wp_print_styles()`.
-		wp_print_font_faces();
-		$styles = ob_get_clean();
-
-		// Add the font-face styles to iframed editor assets.
-		$settings['__unstableResolvedAssets']['styles'] .= $styles;
-		return $settings;
-	},
-	11
-);
diff --git a/lib/compat/wordpress-6.4/html-api/class-gutenberg-html-tag-processor-6-4.php b/lib/compat/wordpress-6.4/html-api/class-gutenberg-html-tag-processor-6-4.php
deleted file mode 100644
index e22b4fb17b902e..00000000000000
--- a/lib/compat/wordpress-6.4/html-api/class-gutenberg-html-tag-processor-6-4.php
+++ /dev/null
@@ -1,2450 +0,0 @@
-<?php
-/**
- * HTML API: WP_HTML_Tag_Processor class
- *
- * Scans through an HTML document to find specific tags, then
- * transforms those tags by adding, removing, or updating the
- * values of the HTML attributes within that tag (opener).
- *
- * Does not fully parse HTML or _recurse_ into the HTML structure
- * Instead this scans linearly through a document and only parses
- * the HTML tag openers.
- *
- * ### Possible future direction for this module
- *
- *  - Prune the whitespace when removing classes/attributes: e.g. "a b c" -> "c" not " c".
- *    This would increase the size of the changes for some operations but leave more
- *    natural-looking output HTML.
- *  - Decode HTML character references within class names when matching. E.g. match having
- *    class `1<"2` needs to recognize `class="1&lt;&quot;2"`. Currently the Tag Processor
- *    will fail to find the right tag if the class name is encoded as such.
- *  - Properly decode HTML character references in `get_attribute()`. PHP's
- *    `html_entity_decode()` is wrong in a couple ways: it doesn't account for the
- *    no-ambiguous-ampersand rule, and it improperly handles the way semicolons may
- *    or may not terminate a character reference.
- *
- * @package WordPress
- * @subpackage HTML-API
- * @since 6.2.0
- */
-
-/**
- * Core class used to modify attributes in an HTML document for tags matching a query.
- *
- * ## Usage
- *
- * Use of this class requires three steps:
- *
- *  1. Create a new class instance with your input HTML document.
- *  2. Find the tag(s) you are looking for.
- *  3. Request changes to the attributes in those tag(s).
- *
- * Example:
- *
- *     $tags = new WP_HTML_Tag_Processor( $html );
- *     if ( $tags->next_tag( 'option' ) ) {
- *         $tags->set_attribute( 'selected', true );
- *     }
- *
- * ### Finding tags
- *
- * The `next_tag()` function moves the internal cursor through
- * your input HTML document until it finds a tag meeting any of
- * the supplied restrictions in the optional query argument. If
- * no argument is provided then it will find the next HTML tag,
- * regardless of what kind it is.
- *
- * If you want to _find whatever the next tag is_:
- *
- *     $tags->next_tag();
- *
- * | Goal                                                      | Query                                                                           |
- * |-----------------------------------------------------------|---------------------------------------------------------------------------------|
- * | Find any tag.                                             | `$tags->next_tag();`                                                            |
- * | Find next image tag.                                      | `$tags->next_tag( array( 'tag_name' => 'img' ) );`                              |
- * | Find next image tag (without passing the array).          | `$tags->next_tag( 'img' );`                                                     |
- * | Find next tag containing the `fullwidth` CSS class.       | `$tags->next_tag( array( 'class_name' => 'fullwidth' ) );`                      |
- * | Find next image tag containing the `fullwidth` CSS class. | `$tags->next_tag( array( 'tag_name' => 'img', 'class_name' => 'fullwidth' ) );` |
- *
- * If a tag was found meeting your criteria then `next_tag()`
- * will return `true` and you can proceed to modify it. If it
- * returns `false`, however, it failed to find the tag and
- * moved the cursor to the end of the file.
- *
- * Once the cursor reaches the end of the file the processor
- * is done and if you want to reach an earlier tag you will
- * need to recreate the processor and start over, as it's
- * unable to back up or move in reverse.
- *
- * See the section on bookmarks for an exception to this
- * no-backing-up rule.
- *
- * #### Custom queries
- *
- * Sometimes it's necessary to further inspect an HTML tag than
- * the query syntax here permits. In these cases one may further
- * inspect the search results using the read-only functions
- * provided by the processor or external state or variables.
- *
- * Example:
- *
- *     // Paint up to the first five DIV or SPAN tags marked with the "jazzy" style.
- *     $remaining_count = 5;
- *     while ( $remaining_count > 0 && $tags->next_tag() ) {
- *         if (
- *              ( 'DIV' === $tags->get_tag() || 'SPAN' === $tags->get_tag() ) &&
- *              'jazzy' === $tags->get_attribute( 'data-style' )
- *         ) {
- *             $tags->add_class( 'theme-style-everest-jazz' );
- *             $remaining_count--;
- *         }
- *     }
- *
- * `get_attribute()` will return `null` if the attribute wasn't present
- * on the tag when it was called. It may return `""` (the empty string)
- * in cases where the attribute was present but its value was empty.
- * For boolean attributes, those whose name is present but no value is
- * given, it will return `true` (the only way to set `false` for an
- * attribute is to remove it).
- *
- * ### Modifying HTML attributes for a found tag
- *
- * Once you've found the start of an opening tag you can modify
- * any number of the attributes on that tag. You can set a new
- * value for an attribute, remove the entire attribute, or do
- * nothing and move on to the next opening tag.
- *
- * Example:
- *
- *     if ( $tags->next_tag( array( 'class_name' => 'wp-group-block' ) ) ) {
- *         $tags->set_attribute( 'title', 'This groups the contained content.' );
- *         $tags->remove_attribute( 'data-test-id' );
- *     }
- *
- * If `set_attribute()` is called for an existing attribute it will
- * overwrite the existing value. Similarly, calling `remove_attribute()`
- * for a non-existing attribute has no effect on the document. Both
- * of these methods are safe to call without knowing if a given attribute
- * exists beforehand.
- *
- * ### Modifying CSS classes for a found tag
- *
- * The tag processor treats the `class` attribute as a special case.
- * Because it's a common operation to add or remove CSS classes, this
- * interface adds helper methods to make that easier.
- *
- * As with attribute values, adding or removing CSS classes is a safe
- * operation that doesn't require checking if the attribute or class
- * exists before making changes. If removing the only class then the
- * entire `class` attribute will be removed.
- *
- * Example:
- *
- *     // from `<span>Yippee!</span>`
- *     //   to `<span class="is-active">Yippee!</span>`
- *     $tags->add_class( 'is-active' );
- *
- *     // from `<span class="excited">Yippee!</span>`
- *     //   to `<span class="excited is-active">Yippee!</span>`
- *     $tags->add_class( 'is-active' );
- *
- *     // from `<span class="is-active heavy-accent">Yippee!</span>`
- *     //   to `<span class="is-active heavy-accent">Yippee!</span>`
- *     $tags->add_class( 'is-active' );
- *
- *     // from `<input type="text" class="is-active rugby not-disabled" length="24">`
- *     //   to `<input type="text" class="is-active not-disabled" length="24">
- *     $tags->remove_class( 'rugby' );
- *
- *     // from `<input type="text" class="rugby" length="24">`
- *     //   to `<input type="text" length="24">
- *     $tags->remove_class( 'rugby' );
- *
- *     // from `<input type="text" length="24">`
- *     //   to `<input type="text" length="24">
- *     $tags->remove_class( 'rugby' );
- *
- * When class changes are enqueued but a direct change to `class` is made via
- * `set_attribute` then the changes to `set_attribute` (or `remove_attribute`)
- * will take precedence over those made through `add_class` and `remove_class`.
- *
- * ### Bookmarks
- *
- * While scanning through the input HTMl document it's possible to set
- * a named bookmark when a particular tag is found. Later on, after
- * continuing to scan other tags, it's possible to `seek` to one of
- * the set bookmarks and then proceed again from that point forward.
- *
- * Because bookmarks create processing overhead one should avoid
- * creating too many of them. As a rule, create only bookmarks
- * of known string literal names; avoid creating "mark_{$index}"
- * and so on. It's fine from a performance standpoint to create a
- * bookmark and update it frequently, such as within a loop.
- *
- *     $total_todos = 0;
- *     while ( $p->next_tag( array( 'tag_name' => 'UL', 'class_name' => 'todo' ) ) ) {
- *         $p->set_bookmark( 'list-start' );
- *         while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
- *             if ( 'UL' === $p->get_tag() && $p->is_tag_closer() ) {
- *                 $p->set_bookmark( 'list-end' );
- *                 $p->seek( 'list-start' );
- *                 $p->set_attribute( 'data-contained-todos', (string) $total_todos );
- *                 $total_todos = 0;
- *                 $p->seek( 'list-end' );
- *                 break;
- *             }
- *
- *             if ( 'LI' === $p->get_tag() && ! $p->is_tag_closer() ) {
- *                 $total_todos++;
- *             }
- *         }
- *     }
- *
- * ## Design and limitations
- *
- * The Tag Processor is designed to linearly scan HTML documents and tokenize
- * HTML tags and their attributes. It's designed to do this as efficiently as
- * possible without compromising parsing integrity. Therefore it will be
- * slower than some methods of modifying HTML, such as those incorporating
- * over-simplified PCRE patterns, but will not introduce the defects and
- * failures that those methods bring in, which lead to broken page renders
- * and often to security vulnerabilities. On the other hand, it will be faster
- * than full-blown HTML parsers such as DOMDocument and use considerably
- * less memory. It requires a negligible memory overhead, enough to consider
- * it a zero-overhead system.
- *
- * The performance characteristics are maintained by avoiding tree construction
- * and semantic cleanups which are specified in HTML5. Because of this, for
- * example, it's not possible for the Tag Processor to associate any given
- * opening tag with its corresponding closing tag, or to return the inner markup
- * inside an element. Systems may be built on top of the Tag Processor to do
- * this, but the Tag Processor is and should be constrained so it can remain an
- * efficient, low-level, and reliable HTML scanner.
- *
- * The Tag Processor's design incorporates a "garbage-in-garbage-out" philosophy.
- * HTML5 specifies that certain invalid content be transformed into different forms
- * for display, such as removing null bytes from an input document and replacing
- * invalid characters with the Unicode replacement character `U+FFFD` (visually "�").
- * Where errors or transformations exist within the HTML5 specification, the Tag Processor
- * leaves those invalid inputs untouched, passing them through to the final browser
- * to handle. While this implies that certain operations will be non-spec-compliant,
- * such as reading the value of an attribute with invalid content, it also preserves a
- * simplicity and efficiency for handling those error cases.
- *
- * Most operations within the Tag Processor are designed to minimize the difference
- * between an input and output document for any given change. For example, the
- * `add_class` and `remove_class` methods preserve whitespace and the class ordering
- * within the `class` attribute; and when encountering tags with duplicated attributes,
- * the Tag Processor will leave those invalid duplicate attributes where they are but
- * update the proper attribute which the browser will read for parsing its value. An
- * exception to this rule is that all attribute updates store their values as
- * double-quoted strings, meaning that attributes on input with single-quoted or
- * unquoted values will appear in the output with double-quotes.
- *
- * @since 6.2.0
- * @since 6.2.1 Fix: Support for various invalid comments; attribute updates are case-insensitive.
- * @since 6.3.2 Fix: Skip HTML-like content inside rawtext elements such as STYLE.
- */
-class Gutenberg_HTML_Tag_Processor_6_4 {
-	/**
-	 * The maximum number of bookmarks allowed to exist at
-	 * any given time.
-	 *
-	 * @since 6.2.0
-	 * @var int
-	 *
-	 * @see WP_HTML_Tag_Processor::set_bookmark()
-	 */
-	const MAX_BOOKMARKS = 10;
-
-	/**
-	 * Maximum number of times seek() can be called.
-	 * Prevents accidental infinite loops.
-	 *
-	 * @since 6.2.0
-	 * @var int
-	 *
-	 * @see WP_HTML_Tag_Processor::seek()
-	 */
-	const MAX_SEEK_OPS = 1000;
-
-	/**
-	 * The HTML document to parse.
-	 *
-	 * @since 6.2.0
-	 * @var string
-	 */
-	protected $html;
-
-	/**
-	 * The last query passed to next_tag().
-	 *
-	 * @since 6.2.0
-	 * @var array|null
-	 */
-	private $last_query;
-
-	/**
-	 * The tag name this processor currently scans for.
-	 *
-	 * @since 6.2.0
-	 * @var string|null
-	 */
-	private $sought_tag_name;
-
-	/**
-	 * The CSS class name this processor currently scans for.
-	 *
-	 * @since 6.2.0
-	 * @var string|null
-	 */
-	private $sought_class_name;
-
-	/**
-	 * The match offset this processor currently scans for.
-	 *
-	 * @since 6.2.0
-	 * @var int|null
-	 */
-	private $sought_match_offset;
-
-	/**
-	 * Whether to visit tag closers, e.g. </div>, when walking an input document.
-	 *
-	 * @since 6.2.0
-	 * @var bool
-	 */
-	private $stop_on_tag_closers;
-
-	/**
-	 * How many bytes from the original HTML document have been read and parsed.
-	 *
-	 * This value points to the latest byte offset in the input document which
-	 * has been already parsed. It is the internal cursor for the Tag Processor
-	 * and updates while scanning through the HTML tokens.
-	 *
-	 * @since 6.2.0
-	 * @var int
-	 */
-	private $bytes_already_parsed = 0;
-
-	/**
-	 * Byte offset in input document where current tag name starts.
-	 *
-	 * Example:
-	 *
-	 *     <div id="test">...
-	 *     01234
-	 *      - tag name starts at 1
-	 *
-	 * @since 6.2.0
-	 * @var int|null
-	 */
-	private $tag_name_starts_at;
-
-	/**
-	 * Byte length of current tag name.
-	 *
-	 * Example:
-	 *
-	 *     <div id="test">...
-	 *     01234
-	 *      --- tag name length is 3
-	 *
-	 * @since 6.2.0
-	 * @var int|null
-	 */
-	private $tag_name_length;
-
-	/**
-	 * Byte offset in input document where current tag token ends.
-	 *
-	 * Example:
-	 *
-	 *     <div id="test">...
-	 *     0         1   |
-	 *     01234567890123456
-	 *      --- tag name ends at 14
-	 *
-	 * @since 6.2.0
-	 * @var int|null
-	 */
-	private $tag_ends_at;
-
-	/**
-	 * Whether the current tag is an opening tag, e.g. <div>, or a closing tag, e.g. </div>.
-	 *
-	 * @var bool
-	 */
-	private $is_closing_tag;
-
-	/**
-	 * Lazily-built index of attributes found within an HTML tag, keyed by the attribute name.
-	 *
-	 * Example:
-	 *
-	 *     // Supposing the parser is working through this content
-	 *     // and stops after recognizing the `id` attribute.
-	 *     // <div id="test-4" class=outline title="data:text/plain;base64=asdk3nk1j3fo8">
-	 *     //                 ^ parsing will continue from this point.
-	 *     $this->attributes = array(
-	 *         'id' => new WP_HTML_Attribute_Match( 'id', null, 6, 17 )
-	 *     );
-	 *
-	 *     // When picking up parsing again, or when asking to find the
-	 *     // `class` attribute we will continue and add to this array.
-	 *     $this->attributes = array(
-	 *         'id'    => new WP_HTML_Attribute_Match( 'id', null, 6, 17 ),
-	 *         'class' => new WP_HTML_Attribute_Match( 'class', 'outline', 18, 32 )
-	 *     );
-	 *
-	 *     // Note that only the `class` attribute value is stored in the index.
-	 *     // That's because it is the only value used by this class at the moment.
-	 *
-	 * @since 6.2.0
-	 * @var WP_HTML_Attribute_Token[]
-	 */
-	private $attributes = array();
-
-	/**
-	 * Tracks spans of duplicate attributes on a given tag, used for removing
-	 * all copies of an attribute when calling `remove_attribute()`.
-	 *
-	 * @since 6.3.2
-	 *
-	 * @var (WP_HTML_Span[])[]|null
-	 */
-	private $duplicate_attributes = null;
-
-	/**
-	 * Which class names to add or remove from a tag.
-	 *
-	 * These are tracked separately from attribute updates because they are
-	 * semantically distinct, whereas this interface exists for the common
-	 * case of adding and removing class names while other attributes are
-	 * generally modified as with DOM `setAttribute` calls.
-	 *
-	 * When modifying an HTML document these will eventually be collapsed
-	 * into a single `set_attribute( 'class', $changes )` call.
-	 *
-	 * Example:
-	 *
-	 *     // Add the `wp-block-group` class, remove the `wp-group` class.
-	 *     $classname_updates = array(
-	 *         // Indexed by a comparable class name.
-	 *         'wp-block-group' => WP_HTML_Tag_Processor::ADD_CLASS,
-	 *         'wp-group'       => WP_HTML_Tag_Processor::REMOVE_CLASS
-	 *     );
-	 *
-	 * @since 6.2.0
-	 * @var bool[]
-	 */
-	private $classname_updates = array();
-
-	/**
-	 * Tracks a semantic location in the original HTML which
-	 * shifts with updates as they are applied to the document.
-	 *
-	 * @since 6.2.0
-	 * @var WP_HTML_Span[]
-	 */
-	protected $bookmarks = array();
-
-	const ADD_CLASS    = true;
-	const REMOVE_CLASS = false;
-	const SKIP_CLASS   = null;
-
-	/**
-	 * Lexical replacements to apply to input HTML document.
-	 *
-	 * "Lexical" in this class refers to the part of this class which
-	 * operates on pure text _as text_ and not as HTML. There's a line
-	 * between the public interface, with HTML-semantic methods like
-	 * `set_attribute` and `add_class`, and an internal state that tracks
-	 * text offsets in the input document.
-	 *
-	 * When higher-level HTML methods are called, those have to transform their
-	 * operations (such as setting an attribute's value) into text diffing
-	 * operations (such as replacing the sub-string from indices A to B with
-	 * some given new string). These text-diffing operations are the lexical
-	 * updates.
-	 *
-	 * As new higher-level methods are added they need to collapse their
-	 * operations into these lower-level lexical updates since that's the
-	 * Tag Processor's internal language of change. Any code which creates
-	 * these lexical updates must ensure that they do not cross HTML syntax
-	 * boundaries, however, so these should never be exposed outside of this
-	 * class or any classes which intentionally expand its functionality.
-	 *
-	 * These are enqueued while editing the document instead of being immediately
-	 * applied to avoid processing overhead, string allocations, and string
-	 * copies when applying many updates to a single document.
-	 *
-	 * Example:
-	 *
-	 *     // Replace an attribute stored with a new value, indices
-	 *     // sourced from the lazily-parsed HTML recognizer.
-	 *     $start = $attributes['src']->start;
-	 *     $end   = $attributes['src']->end;
-	 *     $modifications[] = new WP_HTML_Text_Replacement( $start, $end, $new_value );
-	 *
-	 *     // Correspondingly, something like this will appear in this array.
-	 *     $lexical_updates = array(
-	 *         WP_HTML_Text_Replacement( 14, 28, 'https://my-site.my-domain/wp-content/uploads/2014/08/kittens.jpg' )
-	 *     );
-	 *
-	 * @since 6.2.0
-	 * @var WP_HTML_Text_Replacement[]
-	 */
-	protected $lexical_updates = array();
-
-	/**
-	 * Tracks and limits `seek()` calls to prevent accidental infinite loops.
-	 *
-	 * @since 6.2.0
-	 * @var int
-	 *
-	 * @see WP_HTML_Tag_Processor::seek()
-	 */
-	protected $seek_count = 0;
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param string $html HTML to process.
-	 */
-	public function __construct( $html ) {
-		$this->html = $html;
-	}
-
-	/**
-	 * Finds the next tag matching the $query.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param array|string|null $query {
-	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
-	 *
-	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
-	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
-	 *                                     1 for "first" tag, 3 for "third," etc.
-	 *                                     Defaults to first tag.
-	 *     @type string|null $class_name   Tag must contain this whole class name to match.
-	 *     @type string|null $tag_closers  "visit" or "skip": whether to stop on tag closers, e.g. </div>.
-	 * }
-	 * @return bool Whether a tag was matched.
-	 */
-	public function next_tag( $query = null ) {
-		$this->parse_query( $query );
-		$already_found = 0;
-
-		do {
-			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
-				return false;
-			}
-
-			// Find the next tag if it exists.
-			if ( false === $this->parse_next_tag() ) {
-				$this->bytes_already_parsed = strlen( $this->html );
-
-				return false;
-			}
-
-			// Parse all of its attributes.
-			while ( $this->parse_next_attribute() ) {
-				continue;
-			}
-
-			// Ensure that the tag closes before the end of the document.
-			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
-				return false;
-			}
-
-			$tag_ends_at = strpos( $this->html, '>', $this->bytes_already_parsed );
-			if ( false === $tag_ends_at ) {
-				return false;
-			}
-			$this->tag_ends_at          = $tag_ends_at;
-			$this->bytes_already_parsed = $tag_ends_at;
-
-			// Finally, check if the parsed tag and its attributes match the search query.
-			if ( $this->matches() ) {
-				++$already_found;
-			}
-
-			/*
-			 * For non-DATA sections which might contain text that looks like HTML tags but
-			 * isn't, scan with the appropriate alternative mode. Looking at the first letter
-			 * of the tag name as a pre-check avoids a string allocation when it's not needed.
-			 */
-			$t = $this->html[ $this->tag_name_starts_at ];
-			if (
-				! $this->is_closing_tag &&
-				(
-					'i' === $t || 'I' === $t ||
-					'n' === $t || 'N' === $t ||
-					's' === $t || 'S' === $t ||
-					't' === $t || 'T' === $t
-				) ) {
-				$tag_name = $this->get_tag();
-
-				if ( 'SCRIPT' === $tag_name && ! $this->skip_script_data() ) {
-					$this->bytes_already_parsed = strlen( $this->html );
-					return false;
-				} elseif (
-					( 'TEXTAREA' === $tag_name || 'TITLE' === $tag_name ) &&
-					! $this->skip_rcdata( $tag_name )
-				) {
-					$this->bytes_already_parsed = strlen( $this->html );
-					return false;
-				} elseif (
-					(
-						'IFRAME' === $tag_name ||
-						'NOEMBED' === $tag_name ||
-						'NOFRAMES' === $tag_name ||
-						'NOSCRIPT' === $tag_name ||
-						'STYLE' === $tag_name
-					) &&
-					! $this->skip_rawtext( $tag_name )
-				) {
-					/*
-					 * "XMP" should be here too but its rules are more complicated and require the
-					 * complexity of the HTML Processor (it needs to close out any open P element,
-					 * meaning it can't be skipped here or else the HTML Processor will lose its
-					 * place). For now, it can be ignored as it's a rare HTML tag in practice and
-					 * any normative HTML should be using PRE instead.
-					 */
-					$this->bytes_already_parsed = strlen( $this->html );
-					return false;
-				}
-			}
-		} while ( $already_found < $this->sought_match_offset );
-
-		return true;
-	}
-
-
-	/**
-	 * Generator for a foreach loop to step through each class name for the matched tag.
-	 *
-	 * This generator function is designed to be used inside a "foreach" loop.
-	 *
-	 * Example:
-	 *
-	 *     $p = new WP_HTML_Tag_Processor( "<div class='free &lt;egg&lt;\tlang-en'>" );
-	 *     $p->next_tag();
-	 *     foreach ( $p->class_list() as $class_name ) {
-	 *         echo "{$class_name} ";
-	 *     }
-	 *     // Outputs: "free <egg> lang-en "
-	 *
-	 * @since 6.4.0
-	 */
-	public function class_list() {
-		/** @var string $class contains the string value of the class attribute, with character references decoded. */
-		$class = $this->get_attribute( 'class' );
-
-		if ( ! is_string( $class ) ) {
-			return;
-		}
-
-		$seen = array();
-
-		$at = 0;
-		while ( $at < strlen( $class ) ) {
-			// Skip past any initial boundary characters.
-			$at += strspn( $class, " \t\f\r\n", $at );
-			if ( $at >= strlen( $class ) ) {
-				return;
-			}
-
-			// Find the byte length until the next boundary.
-			$length = strcspn( $class, " \t\f\r\n", $at );
-			if ( 0 === $length ) {
-				return;
-			}
-
-			/*
-			 * CSS class names are case-insensitive in the ASCII range.
-			 *
-			 * @see https://www.w3.org/TR/CSS2/syndata.html#x1
-			 */
-			$name = strtolower( substr( $class, $at, $length ) );
-			$at  += $length;
-
-			/*
-			 * It's expected that the number of class names for a given tag is relatively small.
-			 * Given this, it is probably faster overall to scan an array for a value rather
-			 * than to use the class name as a key and check if it's a key of $seen.
-			 */
-			if ( in_array( $name, $seen, true ) ) {
-				continue;
-			}
-
-			$seen[] = $name;
-			yield $name;
-		}
-	}
-
-
-	/**
-	 * Returns if a matched tag contains the given ASCII case-insensitive class name.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param string $wanted_class Look for this CSS class name, ASCII case-insensitive.
-	 * @return bool|null Whether the matched tag contains the given class name, or null if not matched.
-	 */
-	public function has_class( $wanted_class ) {
-		if ( ! $this->tag_name_starts_at ) {
-			return null;
-		}
-
-		$wanted_class = strtolower( $wanted_class );
-
-		foreach ( $this->class_list() as $class_name ) {
-			if ( $class_name === $wanted_class ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Sets a bookmark in the HTML document.
-	 *
-	 * Bookmarks represent specific places or tokens in the HTML
-	 * document, such as a tag opener or closer. When applying
-	 * edits to a document, such as setting an attribute, the
-	 * text offsets of that token may shift; the bookmark is
-	 * kept updated with those shifts and remains stable unless
-	 * the entire span of text in which the token sits is removed.
-	 *
-	 * Release bookmarks when they are no longer needed.
-	 *
-	 * Example:
-	 *
-	 *     <main><h2>Surprising fact you may not know!</h2></main>
-	 *           ^  ^
-	 *            \-|-- this `H2` opener bookmark tracks the token
-	 *
-	 *     <main class="clickbait"><h2>Surprising fact you may no…
-	 *                             ^  ^
-	 *                              \-|-- it shifts with edits
-	 *
-	 * Bookmarks provide the ability to seek to a previously-scanned
-	 * place in the HTML document. This avoids the need to re-scan
-	 * the entire document.
-	 *
-	 * Example:
-	 *
-	 *     <ul><li>One</li><li>Two</li><li>Three</li></ul>
-	 *                                 ^^^^
-	 *                                 want to note this last item
-	 *
-	 *     $p = new WP_HTML_Tag_Processor( $html );
-	 *     $in_list = false;
-	 *     while ( $p->next_tag( array( 'tag_closers' => $in_list ? 'visit' : 'skip' ) ) ) {
-	 *         if ( 'UL' === $p->get_tag() ) {
-	 *             if ( $p->is_tag_closer() ) {
-	 *                 $in_list = false;
-	 *                 $p->set_bookmark( 'resume' );
-	 *                 if ( $p->seek( 'last-li' ) ) {
-	 *                     $p->add_class( 'last-li' );
-	 *                 }
-	 *                 $p->seek( 'resume' );
-	 *                 $p->release_bookmark( 'last-li' );
-	 *                 $p->release_bookmark( 'resume' );
-	 *             } else {
-	 *                 $in_list = true;
-	 *             }
-	 *         }
-	 *
-	 *         if ( 'LI' === $p->get_tag() ) {
-	 *             $p->set_bookmark( 'last-li' );
-	 *         }
-	 *     }
-	 *
-	 * Bookmarks intentionally hide the internal string offsets
-	 * to which they refer. They are maintained internally as
-	 * updates are applied to the HTML document and therefore
-	 * retain their "position" - the location to which they
-	 * originally pointed. The inability to use bookmarks with
-	 * functions like `substr` is therefore intentional to guard
-	 * against accidentally breaking the HTML.
-	 *
-	 * Because bookmarks allocate memory and require processing
-	 * for every applied update, they are limited and require
-	 * a name. They should not be created with programmatically-made
-	 * names, such as "li_{$index}" with some loop. As a general
-	 * rule they should only be created with string-literal names
-	 * like "start-of-section" or "last-paragraph".
-	 *
-	 * Bookmarks are a powerful tool to enable complicated behavior.
-	 * Consider double-checking that you need this tool if you are
-	 * reaching for it, as inappropriate use could lead to broken
-	 * HTML structure or unwanted processing overhead.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param string $name Identifies this particular bookmark.
-	 * @return bool Whether the bookmark was successfully created.
-	 */
-	public function set_bookmark( $name ) {
-		if ( null === $this->tag_name_starts_at ) {
-			return false;
-		}
-
-		if ( ! array_key_exists( $name, $this->bookmarks ) && count( $this->bookmarks ) >= static::MAX_BOOKMARKS ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Too many bookmarks: cannot create any more.' ),
-				'6.2.0'
-			);
-			return false;
-		}
-
-		$this->bookmarks[ $name ] = new WP_HTML_Span(
-			$this->tag_name_starts_at - ( $this->is_closing_tag ? 2 : 1 ),
-			$this->tag_ends_at
-		);
-
-		return true;
-	}
-
-
-	/**
-	 * Removes a bookmark that is no longer needed.
-	 *
-	 * Releasing a bookmark frees up the small
-	 * performance overhead it requires.
-	 *
-	 * @param string $name Name of the bookmark to remove.
-	 * @return bool Whether the bookmark already existed before removal.
-	 */
-	public function release_bookmark( $name ) {
-		if ( ! array_key_exists( $name, $this->bookmarks ) ) {
-			return false;
-		}
-
-		unset( $this->bookmarks[ $name ] );
-
-		return true;
-	}
-
-	/**
-	 * Skips contents of generic rawtext elements.
-	 *
-	 * @since 6.3.2
-	 *
-	 * @see https://html.spec.whatwg.org/#generic-raw-text-element-parsing-algorithm
-	 *
-	 * @param string $tag_name The uppercase tag name which will close the RAWTEXT region.
-	 * @return bool Whether an end to the RAWTEXT region was found before the end of the document.
-	 */
-	private function skip_rawtext( $tag_name ) {
-		/*
-		 * These two functions distinguish themselves on whether character references are
-		 * decoded, and since functionality to read the inner markup isn't supported, it's
-		 * not necessary to implement these two functions separately.
-		 */
-		return $this->skip_rcdata( $tag_name );
-	}
-
-	/**
-	 * Skips contents of RCDATA elements, namely title and textarea tags.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @see https://html.spec.whatwg.org/multipage/parsing.html#rcdata-state
-	 *
-	 * @param string $tag_name The uppercase tag name which will close the RCDATA region.
-	 * @return bool Whether an end to the RCDATA region was found before the end of the document.
-	 */
-	private function skip_rcdata( $tag_name ) {
-		$html       = $this->html;
-		$doc_length = strlen( $html );
-		$tag_length = strlen( $tag_name );
-
-		$at = $this->bytes_already_parsed;
-
-		while ( false !== $at && $at < $doc_length ) {
-			$at = strpos( $this->html, '</', $at );
-
-			// If there is no possible tag closer then fail.
-			if ( false === $at || ( $at + $tag_length ) >= $doc_length ) {
-				$this->bytes_already_parsed = $doc_length;
-				return false;
-			}
-
-			$closer_potentially_starts_at = $at;
-			$at                          += 2;
-
-			/*
-			 * Find a case-insensitive match to the tag name.
-			 *
-			 * Because tag names are limited to US-ASCII there is no
-			 * need to perform any kind of Unicode normalization when
-			 * comparing; any character which could be impacted by such
-			 * normalization could not be part of a tag name.
-			 */
-			for ( $i = 0; $i < $tag_length; $i++ ) {
-				$tag_char  = $tag_name[ $i ];
-				$html_char = $html[ $at + $i ];
-
-				if ( $html_char !== $tag_char && strtoupper( $html_char ) !== $tag_char ) {
-					$at += $i;
-					continue 2;
-				}
-			}
-
-			$at                        += $tag_length;
-			$this->bytes_already_parsed = $at;
-
-			/*
-			 * Ensure that the tag name terminates to avoid matching on
-			 * substrings of a longer tag name. For example, the sequence
-			 * "</textarearug" should not match for "</textarea" even
-			 * though "textarea" is found within the text.
-			 */
-			$c = $html[ $at ];
-			if ( ' ' !== $c && "\t" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
-				continue;
-			}
-
-			while ( $this->parse_next_attribute() ) {
-				continue;
-			}
-			$at = $this->bytes_already_parsed;
-			if ( $at >= strlen( $this->html ) ) {
-				return false;
-			}
-
-			if ( '>' === $html[ $at ] || '/' === $html[ $at ] ) {
-				$this->bytes_already_parsed = $closer_potentially_starts_at;
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Skips contents of script tags.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @return bool Whether the script tag was closed before the end of the document.
-	 */
-	private function skip_script_data() {
-		$state      = 'unescaped';
-		$html       = $this->html;
-		$doc_length = strlen( $html );
-		$at         = $this->bytes_already_parsed;
-
-		while ( false !== $at && $at < $doc_length ) {
-			$at += strcspn( $html, '-<', $at );
-
-			/*
-			 * For all script states a "-->"  transitions
-			 * back into the normal unescaped script mode,
-			 * even if that's the current state.
-			 */
-			if (
-				$at + 2 < $doc_length &&
-				'-' === $html[ $at ] &&
-				'-' === $html[ $at + 1 ] &&
-				'>' === $html[ $at + 2 ]
-			) {
-				$at   += 3;
-				$state = 'unescaped';
-				continue;
-			}
-
-			// Everything of interest past here starts with "<".
-			if ( $at + 1 >= $doc_length || '<' !== $html[ $at++ ] ) {
-				continue;
-			}
-
-			/*
-			 * Unlike with "-->", the "<!--" only transitions
-			 * into the escaped mode if not already there.
-			 *
-			 * Inside the escaped modes it will be ignored; and
-			 * should never break out of the double-escaped
-			 * mode and back into the escaped mode.
-			 *
-			 * While this requires a mode change, it does not
-			 * impact the parsing otherwise, so continue
-			 * parsing after updating the state.
-			 */
-			if (
-				$at + 2 < $doc_length &&
-				'!' === $html[ $at ] &&
-				'-' === $html[ $at + 1 ] &&
-				'-' === $html[ $at + 2 ]
-			) {
-				$at   += 3;
-				$state = 'unescaped' === $state ? 'escaped' : $state;
-				continue;
-			}
-
-			if ( '/' === $html[ $at ] ) {
-				$closer_potentially_starts_at = $at - 1;
-				$is_closing                   = true;
-				++$at;
-			} else {
-				$is_closing = false;
-			}
-
-			/*
-			 * At this point the only remaining state-changes occur with the
-			 * <script> and </script> tags; unless one of these appears next,
-			 * proceed scanning to the next potential token in the text.
-			 */
-			if ( ! (
-				$at + 6 < $doc_length &&
-				( 's' === $html[ $at ] || 'S' === $html[ $at ] ) &&
-				( 'c' === $html[ $at + 1 ] || 'C' === $html[ $at + 1 ] ) &&
-				( 'r' === $html[ $at + 2 ] || 'R' === $html[ $at + 2 ] ) &&
-				( 'i' === $html[ $at + 3 ] || 'I' === $html[ $at + 3 ] ) &&
-				( 'p' === $html[ $at + 4 ] || 'P' === $html[ $at + 4 ] ) &&
-				( 't' === $html[ $at + 5 ] || 'T' === $html[ $at + 5 ] )
-			) ) {
-				++$at;
-				continue;
-			}
-
-			/*
-			 * Ensure that the script tag terminates to avoid matching on
-			 * substrings of a non-match. For example, the sequence
-			 * "<script123" should not end a script region even though
-			 * "<script" is found within the text.
-			 */
-			if ( $at + 6 >= $doc_length ) {
-				continue;
-			}
-			$at += 6;
-			$c   = $html[ $at ];
-			if ( ' ' !== $c && "\t" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
-				++$at;
-				continue;
-			}
-
-			if ( 'escaped' === $state && ! $is_closing ) {
-				$state = 'double-escaped';
-				continue;
-			}
-
-			if ( 'double-escaped' === $state && $is_closing ) {
-				$state = 'escaped';
-				continue;
-			}
-
-			if ( $is_closing ) {
-				$this->bytes_already_parsed = $closer_potentially_starts_at;
-				if ( $this->bytes_already_parsed >= $doc_length ) {
-					return false;
-				}
-
-				while ( $this->parse_next_attribute() ) {
-					continue;
-				}
-
-				if ( '>' === $html[ $this->bytes_already_parsed ] ) {
-					$this->bytes_already_parsed = $closer_potentially_starts_at;
-					return true;
-				}
-			}
-
-			++$at;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Parses the next tag.
-	 *
-	 * This will find and start parsing the next tag, including
-	 * the opening `<`, the potential closer `/`, and the tag
-	 * name. It does not parse the attributes or scan to the
-	 * closing `>`; these are left for other methods.
-	 *
-	 * @since 6.2.0
-	 * @since 6.2.1 Support abruptly-closed comments, invalid-tag-closer-comments, and empty elements.
-	 *
-	 * @return bool Whether a tag was found before the end of the document.
-	 */
-	private function parse_next_tag() {
-		$this->after_tag();
-
-		$html       = $this->html;
-		$doc_length = strlen( $html );
-		$at         = $this->bytes_already_parsed;
-
-		while ( false !== $at && $at < $doc_length ) {
-			$at = strpos( $html, '<', $at );
-			if ( false === $at ) {
-				return false;
-			}
-
-			if ( '/' === $this->html[ $at + 1 ] ) {
-				$this->is_closing_tag = true;
-				++$at;
-			} else {
-				$this->is_closing_tag = false;
-			}
-
-			/*
-			 * HTML tag names must start with [a-zA-Z] otherwise they are not tags.
-			 * For example, "<3" is rendered as text, not a tag opener. If at least
-			 * one letter follows the "<" then _it is_ a tag, but if the following
-			 * character is anything else it _is not a tag_.
-			 *
-			 * It's not uncommon to find non-tags starting with `<` in an HTML
-			 * document, so it's good for performance to make this pre-check before
-			 * continuing to attempt to parse a tag name.
-			 *
-			 * Reference:
-			 * * https://html.spec.whatwg.org/multipage/parsing.html#data-state
-			 * * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
-			 */
-			$tag_name_prefix_length = strspn( $html, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', $at + 1 );
-			if ( $tag_name_prefix_length > 0 ) {
-				++$at;
-				$this->tag_name_length      = $tag_name_prefix_length + strcspn( $html, " \t\f\r\n/>", $at + $tag_name_prefix_length );
-				$this->tag_name_starts_at   = $at;
-				$this->bytes_already_parsed = $at + $this->tag_name_length;
-				return true;
-			}
-
-			/*
-			 * Abort if no tag is found before the end of
-			 * the document. There is nothing left to parse.
-			 */
-			if ( $at + 1 >= strlen( $html ) ) {
-				return false;
-			}
-
-			/*
-			 * <! transitions to markup declaration open state
-			 * https://html.spec.whatwg.org/multipage/parsing.html#markup-declaration-open-state
-			 */
-			if ( '!' === $html[ $at + 1 ] ) {
-				/*
-				 * <!-- transitions to a bogus comment state – skip to the nearest -->
-				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
-				 */
-				if (
-					strlen( $html ) > $at + 3 &&
-					'-' === $html[ $at + 2 ] &&
-					'-' === $html[ $at + 3 ]
-				) {
-					$closer_at = $at + 4;
-					// If it's not possible to close the comment then there is nothing more to scan.
-					if ( strlen( $html ) <= $closer_at ) {
-						return false;
-					}
-
-					// Abruptly-closed empty comments are a sequence of dashes followed by `>`.
-					$span_of_dashes = strspn( $html, '-', $closer_at );
-					if ( '>' === $html[ $closer_at + $span_of_dashes ] ) {
-						$at = $closer_at + $span_of_dashes + 1;
-						continue;
-					}
-
-					/*
-					 * Comments may be closed by either a --> or an invalid --!>.
-					 * The first occurrence closes the comment.
-					 *
-					 * See https://html.spec.whatwg.org/#parse-error-incorrectly-closed-comment
-					 */
-					--$closer_at; // Pre-increment inside condition below reduces risk of accidental infinite looping.
-					while ( ++$closer_at < strlen( $html ) ) {
-						$closer_at = strpos( $html, '--', $closer_at );
-						if ( false === $closer_at ) {
-							return false;
-						}
-
-						if ( $closer_at + 2 < strlen( $html ) && '>' === $html[ $closer_at + 2 ] ) {
-							$at = $closer_at + 3;
-							continue 2;
-						}
-
-						if ( $closer_at + 3 < strlen( $html ) && '!' === $html[ $closer_at + 2 ] && '>' === $html[ $closer_at + 3 ] ) {
-							$at = $closer_at + 4;
-							continue 2;
-						}
-					}
-				}
-
-				/*
-				 * <![CDATA[ transitions to CDATA section state – skip to the nearest ]]>
-				 * The CDATA is case-sensitive.
-				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
-				 */
-				if (
-					strlen( $html ) > $at + 8 &&
-					'[' === $html[ $at + 2 ] &&
-					'C' === $html[ $at + 3 ] &&
-					'D' === $html[ $at + 4 ] &&
-					'A' === $html[ $at + 5 ] &&
-					'T' === $html[ $at + 6 ] &&
-					'A' === $html[ $at + 7 ] &&
-					'[' === $html[ $at + 8 ]
-				) {
-					$closer_at = strpos( $html, ']]>', $at + 9 );
-					if ( false === $closer_at ) {
-						return false;
-					}
-
-					$at = $closer_at + 3;
-					continue;
-				}
-
-				/*
-				 * <!DOCTYPE transitions to DOCTYPE state – skip to the nearest >
-				 * These are ASCII-case-insensitive.
-				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
-				 */
-				if (
-					strlen( $html ) > $at + 8 &&
-					( 'D' === $html[ $at + 2 ] || 'd' === $html[ $at + 2 ] ) &&
-					( 'O' === $html[ $at + 3 ] || 'o' === $html[ $at + 3 ] ) &&
-					( 'C' === $html[ $at + 4 ] || 'c' === $html[ $at + 4 ] ) &&
-					( 'T' === $html[ $at + 5 ] || 't' === $html[ $at + 5 ] ) &&
-					( 'Y' === $html[ $at + 6 ] || 'y' === $html[ $at + 6 ] ) &&
-					( 'P' === $html[ $at + 7 ] || 'p' === $html[ $at + 7 ] ) &&
-					( 'E' === $html[ $at + 8 ] || 'e' === $html[ $at + 8 ] )
-				) {
-					$closer_at = strpos( $html, '>', $at + 9 );
-					if ( false === $closer_at ) {
-						return false;
-					}
-
-					$at = $closer_at + 1;
-					continue;
-				}
-
-				/*
-				 * Anything else here is an incorrectly-opened comment and transitions
-				 * to the bogus comment state - skip to the nearest >.
-				 */
-				$at = strpos( $html, '>', $at + 1 );
-				continue;
-			}
-
-			/*
-			 * </> is a missing end tag name, which is ignored.
-			 *
-			 * See https://html.spec.whatwg.org/#parse-error-missing-end-tag-name
-			 */
-			if ( '>' === $html[ $at + 1 ] ) {
-				++$at;
-				continue;
-			}
-
-			/*
-			 * <? transitions to a bogus comment state – skip to the nearest >
-			 * See https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
-			 */
-			if ( '?' === $html[ $at + 1 ] ) {
-				$closer_at = strpos( $html, '>', $at + 2 );
-				if ( false === $closer_at ) {
-					return false;
-				}
-
-				$at = $closer_at + 1;
-				continue;
-			}
-
-			/*
-			 * If a non-alpha starts the tag name in a tag closer it's a comment.
-			 * Find the first `>`, which closes the comment.
-			 *
-			 * See https://html.spec.whatwg.org/#parse-error-invalid-first-character-of-tag-name
-			 */
-			if ( $this->is_closing_tag ) {
-				$closer_at = strpos( $html, '>', $at + 3 );
-				if ( false === $closer_at ) {
-					return false;
-				}
-
-				$at = $closer_at + 1;
-				continue;
-			}
-
-			++$at;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Parses the next attribute.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @return bool Whether an attribute was found before the end of the document.
-	 */
-	private function parse_next_attribute() {
-		// Skip whitespace and slashes.
-		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n/", $this->bytes_already_parsed );
-		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
-			return false;
-		}
-
-		/*
-		 * Treat the equal sign as a part of the attribute
-		 * name if it is the first encountered byte.
-		 *
-		 * @see https://html.spec.whatwg.org/multipage/parsing.html#before-attribute-name-state
-		 */
-		$name_length = '=' === $this->html[ $this->bytes_already_parsed ]
-			? 1 + strcspn( $this->html, "=/> \t\f\r\n", $this->bytes_already_parsed + 1 )
-			: strcspn( $this->html, "=/> \t\f\r\n", $this->bytes_already_parsed );
-
-		// No attribute, just tag closer.
-		if ( 0 === $name_length || $this->bytes_already_parsed + $name_length >= strlen( $this->html ) ) {
-			return false;
-		}
-
-		$attribute_start             = $this->bytes_already_parsed;
-		$attribute_name              = substr( $this->html, $attribute_start, $name_length );
-		$this->bytes_already_parsed += $name_length;
-		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
-			return false;
-		}
-
-		$this->skip_whitespace();
-		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
-			return false;
-		}
-
-		$has_value = '=' === $this->html[ $this->bytes_already_parsed ];
-		if ( $has_value ) {
-			++$this->bytes_already_parsed;
-			$this->skip_whitespace();
-			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
-				return false;
-			}
-
-			switch ( $this->html[ $this->bytes_already_parsed ] ) {
-				case "'":
-				case '"':
-					$quote                      = $this->html[ $this->bytes_already_parsed ];
-					$value_start                = $this->bytes_already_parsed + 1;
-					$value_length               = strcspn( $this->html, $quote, $value_start );
-					$attribute_end              = $value_start + $value_length + 1;
-					$this->bytes_already_parsed = $attribute_end;
-					break;
-
-				default:
-					$value_start                = $this->bytes_already_parsed;
-					$value_length               = strcspn( $this->html, "> \t\f\r\n", $value_start );
-					$attribute_end              = $value_start + $value_length;
-					$this->bytes_already_parsed = $attribute_end;
-			}
-		} else {
-			$value_start   = $this->bytes_already_parsed;
-			$value_length  = 0;
-			$attribute_end = $attribute_start + $name_length;
-		}
-
-		if ( $attribute_end >= strlen( $this->html ) ) {
-			return false;
-		}
-
-		if ( $this->is_closing_tag ) {
-			return true;
-		}
-
-		/*
-		 * > There must never be two or more attributes on
-		 * > the same start tag whose names are an ASCII
-		 * > case-insensitive match for each other.
-		 *     - HTML 5 spec
-		 *
-		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
-		 */
-		$comparable_name = strtolower( $attribute_name );
-
-		// If an attribute is listed many times, only use the first declaration and ignore the rest.
-		if ( ! array_key_exists( $comparable_name, $this->attributes ) ) {
-			$this->attributes[ $comparable_name ] = new WP_HTML_Attribute_Token(
-				$attribute_name,
-				$value_start,
-				$value_length,
-				$attribute_start,
-				$attribute_end,
-				! $has_value
-			);
-
-			return true;
-		}
-
-		/*
-		 * Track the duplicate attributes so if we remove it, all disappear together.
-		 *
-		 * While `$this->duplicated_attributes` could always be stored as an `array()`,
-		 * which would simplify the logic here, storing a `null` and only allocating
-		 * an array when encountering duplicates avoids needless allocations in the
-		 * normative case of parsing tags with no duplicate attributes.
-		 */
-		$duplicate_span = new WP_HTML_Span( $attribute_start, $attribute_end );
-		if ( null === $this->duplicate_attributes ) {
-			$this->duplicate_attributes = array( $comparable_name => array( $duplicate_span ) );
-		} elseif ( ! array_key_exists( $comparable_name, $this->duplicate_attributes ) ) {
-			$this->duplicate_attributes[ $comparable_name ] = array( $duplicate_span );
-		} else {
-			$this->duplicate_attributes[ $comparable_name ][] = $duplicate_span;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Move the internal cursor past any immediate successive whitespace.
-	 *
-	 * @since 6.2.0
-	 */
-	private function skip_whitespace() {
-		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n", $this->bytes_already_parsed );
-	}
-
-	/**
-	 * Applies attribute updates and cleans up once a tag is fully parsed.
-	 *
-	 * @since 6.2.0
-	 */
-	private function after_tag() {
-		$this->get_updated_html();
-		$this->tag_name_starts_at   = null;
-		$this->tag_name_length      = null;
-		$this->tag_ends_at          = null;
-		$this->is_closing_tag       = null;
-		$this->attributes           = array();
-		$this->duplicate_attributes = null;
-	}
-
-	/**
-	 * Converts class name updates into tag attributes updates
-	 * (they are accumulated in different data formats for performance).
-	 *
-	 * @since 6.2.0
-	 *
-	 * @see WP_HTML_Tag_Processor::$lexical_updates
-	 * @see WP_HTML_Tag_Processor::$classname_updates
-	 */
-	private function class_name_updates_to_attributes_updates() {
-		if ( count( $this->classname_updates ) === 0 ) {
-			return;
-		}
-
-		$existing_class = $this->get_enqueued_attribute_value( 'class' );
-		if ( null === $existing_class || true === $existing_class ) {
-			$existing_class = '';
-		}
-
-		if ( false === $existing_class && isset( $this->attributes['class'] ) ) {
-			$existing_class = substr(
-				$this->html,
-				$this->attributes['class']->value_starts_at,
-				$this->attributes['class']->value_length
-			);
-		}
-
-		if ( false === $existing_class ) {
-			$existing_class = '';
-		}
-
-		/**
-		 * Updated "class" attribute value.
-		 *
-		 * This is incrementally built while scanning through the existing class
-		 * attribute, skipping removed classes on the way, and then appending
-		 * added classes at the end. Only when finished processing will the
-		 * value contain the final new value.
-
-		 * @var string $class
-		 */
-		$class = '';
-
-		/**
-		 * Tracks the cursor position in the existing
-		 * class attribute value while parsing.
-		 *
-		 * @var int $at
-		 */
-		$at = 0;
-
-		/**
-		 * Indicates if there's any need to modify the existing class attribute.
-		 *
-		 * If a call to `add_class()` and `remove_class()` wouldn't impact
-		 * the `class` attribute value then there's no need to rebuild it.
-		 * For example, when adding a class that's already present or
-		 * removing one that isn't.
-		 *
-		 * This flag enables a performance optimization when none of the enqueued
-		 * class updates would impact the `class` attribute; namely, that the
-		 * processor can continue without modifying the input document, as if
-		 * none of the `add_class()` or `remove_class()` calls had been made.
-		 *
-		 * This flag is set upon the first change that requires a string update.
-		 *
-		 * @var bool $modified
-		 */
-		$modified = false;
-
-		// Remove unwanted classes by only copying the new ones.
-		$existing_class_length = strlen( $existing_class );
-		while ( $at < $existing_class_length ) {
-			// Skip to the first non-whitespace character.
-			$ws_at     = $at;
-			$ws_length = strspn( $existing_class, " \t\f\r\n", $ws_at );
-			$at       += $ws_length;
-
-			// Capture the class name – it's everything until the next whitespace.
-			$name_length = strcspn( $existing_class, " \t\f\r\n", $at );
-			if ( 0 === $name_length ) {
-				// If no more class names are found then that's the end.
-				break;
-			}
-
-			$name = substr( $existing_class, $at, $name_length );
-			$at  += $name_length;
-
-			// If this class is marked for removal, start processing the next one.
-			$remove_class = (
-				isset( $this->classname_updates[ $name ] ) &&
-				self::REMOVE_CLASS === $this->classname_updates[ $name ]
-			);
-
-			// If a class has already been seen then skip it; it should not be added twice.
-			if ( ! $remove_class ) {
-				$this->classname_updates[ $name ] = self::SKIP_CLASS;
-			}
-
-			if ( $remove_class ) {
-				$modified = true;
-				continue;
-			}
-
-			/*
-			 * Otherwise, append it to the new "class" attribute value.
-			 *
-			 * There are options for handling whitespace between tags.
-			 * Preserving the existing whitespace produces fewer changes
-			 * to the HTML content and should clarify the before/after
-			 * content when debugging the modified output.
-			 *
-			 * This approach contrasts normalizing the inter-class
-			 * whitespace to a single space, which might appear cleaner
-			 * in the output HTML but produce a noisier change.
-			 */
-			$class .= substr( $existing_class, $ws_at, $ws_length );
-			$class .= $name;
-		}
-
-		// Add new classes by appending those which haven't already been seen.
-		foreach ( $this->classname_updates as $name => $operation ) {
-			if ( self::ADD_CLASS === $operation ) {
-				$modified = true;
-
-				$class .= strlen( $class ) > 0 ? ' ' : '';
-				$class .= $name;
-			}
-		}
-
-		$this->classname_updates = array();
-		if ( ! $modified ) {
-			return;
-		}
-
-		if ( strlen( $class ) > 0 ) {
-			$this->set_attribute( 'class', $class );
-		} else {
-			$this->remove_attribute( 'class' );
-		}
-	}
-
-	/**
-	 * Applies attribute updates to HTML document.
-	 *
-	 * @since 6.2.0
-	 * @since 6.2.1 Accumulates shift for internal cursor and passed pointer.
-	 * @since 6.3.0 Invalidate any bookmarks whose targets are overwritten.
-	 *
-	 * @param int $shift_this_point Accumulate and return shift for this position.
-	 * @return int How many bytes the given pointer moved in response to the updates.
-	 */
-	private function apply_attributes_updates( $shift_this_point = 0 ) {
-		if ( ! count( $this->lexical_updates ) ) {
-			return 0;
-		}
-
-		$accumulated_shift_for_given_point = 0;
-
-		/*
-		 * Attribute updates can be enqueued in any order but updates
-		 * to the document must occur in lexical order; that is, each
-		 * replacement must be made before all others which follow it
-		 * at later string indices in the input document.
-		 *
-		 * Sorting avoid making out-of-order replacements which
-		 * can lead to mangled output, partially-duplicated
-		 * attributes, and overwritten attributes.
-		 */
-		usort( $this->lexical_updates, array( self::class, 'sort_start_ascending' ) );
-
-		$bytes_already_copied = 0;
-		$output_buffer        = '';
-		foreach ( $this->lexical_updates as $diff ) {
-			$shift = strlen( $diff->text ) - ( $diff->end - $diff->start );
-
-			// Adjust the cursor position by however much an update affects it.
-			if ( $diff->start <= $this->bytes_already_parsed ) {
-				$this->bytes_already_parsed += $shift;
-			}
-
-			// Accumulate shift of the given pointer within this function call.
-			if ( $diff->start <= $shift_this_point ) {
-				$accumulated_shift_for_given_point += $shift;
-			}
-
-			$output_buffer       .= substr( $this->html, $bytes_already_copied, $diff->start - $bytes_already_copied );
-			$output_buffer       .= $diff->text;
-			$bytes_already_copied = $diff->end;
-		}
-
-		$this->html = $output_buffer . substr( $this->html, $bytes_already_copied );
-
-		/*
-		 * Adjust bookmark locations to account for how the text
-		 * replacements adjust offsets in the input document.
-		 */
-		foreach ( $this->bookmarks as $bookmark_name => $bookmark ) {
-			/*
-			 * Each lexical update which appears before the bookmark's endpoints
-			 * might shift the offsets for those endpoints. Loop through each change
-			 * and accumulate the total shift for each bookmark, then apply that
-			 * shift after tallying the full delta.
-			 */
-			$head_delta = 0;
-			$tail_delta = 0;
-
-			foreach ( $this->lexical_updates as $diff ) {
-				if ( $bookmark->start < $diff->start && $bookmark->end < $diff->start ) {
-					break;
-				}
-
-				if ( $bookmark->start >= $diff->start && $bookmark->end < $diff->end ) {
-					$this->release_bookmark( $bookmark_name );
-					continue 2;
-				}
-
-				$delta = strlen( $diff->text ) - ( $diff->end - $diff->start );
-
-				if ( $bookmark->start >= $diff->start ) {
-					$head_delta += $delta;
-				}
-
-				if ( $bookmark->end >= $diff->end ) {
-					$tail_delta += $delta;
-				}
-			}
-
-			$bookmark->start += $head_delta;
-			$bookmark->end   += $tail_delta;
-		}
-
-		$this->lexical_updates = array();
-
-		return $accumulated_shift_for_given_point;
-	}
-
-	/**
-	 * Checks whether a bookmark with the given name exists.
-	 *
-	 * @since 6.3.0
-	 *
-	 * @param string $bookmark_name Name to identify a bookmark that potentially exists.
-	 * @return bool Whether that bookmark exists.
-	 */
-	public function has_bookmark( $bookmark_name ) {
-		return array_key_exists( $bookmark_name, $this->bookmarks );
-	}
-
-	/**
-	 * Move the internal cursor in the Tag Processor to a given bookmark's location.
-	 *
-	 * In order to prevent accidental infinite loops, there's a
-	 * maximum limit on the number of times seek() can be called.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param string $bookmark_name Jump to the place in the document identified by this bookmark name.
-	 * @return bool Whether the internal cursor was successfully moved to the bookmark's location.
-	 */
-	public function seek( $bookmark_name ) {
-		if ( ! array_key_exists( $bookmark_name, $this->bookmarks ) ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Unknown bookmark name.' ),
-				'6.2.0'
-			);
-			return false;
-		}
-
-		if ( ++$this->seek_count > static::MAX_SEEK_OPS ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Too many calls to seek() - this can lead to performance issues.' ),
-				'6.2.0'
-			);
-			return false;
-		}
-
-		// Flush out any pending updates to the document.
-		$this->get_updated_html();
-
-		// Point this tag processor before the sought tag opener and consume it.
-		$this->bytes_already_parsed = $this->bookmarks[ $bookmark_name ]->start;
-		return $this->next_tag( array( 'tag_closers' => 'visit' ) );
-	}
-
-	/**
-	 * Compare two WP_HTML_Text_Replacement objects.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param WP_HTML_Text_Replacement $a First attribute update.
-	 * @param WP_HTML_Text_Replacement $b Second attribute update.
-	 * @return int Comparison value for string order.
-	 */
-	private static function sort_start_ascending( $a, $b ) {
-		$by_start = $a->start - $b->start;
-		if ( 0 !== $by_start ) {
-			return $by_start;
-		}
-
-		$by_text = isset( $a->text, $b->text ) ? strcmp( $a->text, $b->text ) : 0;
-		if ( 0 !== $by_text ) {
-			return $by_text;
-		}
-
-		/*
-		 * This code should be unreachable, because it implies the two replacements
-		 * start at the same location and contain the same text.
-		 */
-		return $a->end - $b->end;
-	}
-
-	/**
-	 * Return the enqueued value for a given attribute, if one exists.
-	 *
-	 * Enqueued updates can take different data types:
-	 *  - If an update is enqueued and is boolean, the return will be `true`
-	 *  - If an update is otherwise enqueued, the return will be the string value of that update.
-	 *  - If an attribute is enqueued to be removed, the return will be `null` to indicate that.
-	 *  - If no updates are enqueued, the return will be `false` to differentiate from "removed."
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param string $comparable_name The attribute name in its comparable form.
-	 * @return string|boolean|null Value of enqueued update if present, otherwise false.
-	 */
-	private function get_enqueued_attribute_value( $comparable_name ) {
-		if ( ! isset( $this->lexical_updates[ $comparable_name ] ) ) {
-			return false;
-		}
-
-		$enqueued_text = $this->lexical_updates[ $comparable_name ]->text;
-
-		// Removed attributes erase the entire span.
-		if ( '' === $enqueued_text ) {
-			return null;
-		}
-
-		/*
-		 * Boolean attribute updates are just the attribute name without a corresponding value.
-		 *
-		 * This value might differ from the given comparable name in that there could be leading
-		 * or trailing whitespace, and that the casing follows the name given in `set_attribute`.
-		 *
-		 * Example:
-		 *
-		 *     $p->set_attribute( 'data-TEST-id', 'update' );
-		 *     'update' === $p->get_enqueued_attribute_value( 'data-test-id' );
-		 *
-		 * Detect this difference based on the absence of the `=`, which _must_ exist in any
-		 * attribute containing a value, e.g. `<input type="text" enabled />`.
-		 *                                            ¹           ²
-		 *                                       1. Attribute with a string value.
-		 *                                       2. Boolean attribute whose value is `true`.
-		 */
-		$equals_at = strpos( $enqueued_text, '=' );
-		if ( false === $equals_at ) {
-			return true;
-		}
-
-		/*
-		 * Finally, a normal update's value will appear after the `=` and
-		 * be double-quoted, as performed incidentally by `set_attribute`.
-		 *
-		 * e.g. `type="text"`
-		 *           ¹²    ³
-		 *        1. Equals is here.
-		 *        2. Double-quoting starts one after the equals sign.
-		 *        3. Double-quoting ends at the last character in the update.
-		 */
-		$enqueued_value = substr( $enqueued_text, $equals_at + 2, -1 );
-		return html_entity_decode( $enqueued_value );
-	}
-
-	/**
-	 * Returns the value of a requested attribute from a matched tag opener if that attribute exists.
-	 *
-	 * Example:
-	 *
-	 *     $p = new WP_HTML_Tag_Processor( '<div enabled class="test" data-test-id="14">Test</div>' );
-	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
-	 *     $p->get_attribute( 'data-test-id' ) === '14';
-	 *     $p->get_attribute( 'enabled' ) === true;
-	 *     $p->get_attribute( 'aria-label' ) === null;
-	 *
-	 *     $p->next_tag() === false;
-	 *     $p->get_attribute( 'class' ) === null;
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param string $name Name of attribute whose value is requested.
-	 * @return string|true|null Value of attribute or `null` if not available. Boolean attributes return `true`.
-	 */
-	public function get_attribute( $name ) {
-		if ( null === $this->tag_name_starts_at ) {
-			return null;
-		}
-
-		$comparable = strtolower( $name );
-
-		/*
-		 * For every attribute other than `class` it's possible to perform a quick check if
-		 * there's an enqueued lexical update whose value takes priority over what's found in
-		 * the input document.
-		 *
-		 * The `class` attribute is special though because of the exposed helpers `add_class`
-		 * and `remove_class`. These form a builder for the `class` attribute, so an additional
-		 * check for enqueued class changes is required in addition to the check for any enqueued
-		 * attribute values. If any exist, those enqueued class changes must first be flushed out
-		 * into an attribute value update.
-		 */
-		if ( 'class' === $name ) {
-			$this->class_name_updates_to_attributes_updates();
-		}
-
-		// Return any enqueued attribute value updates if they exist.
-		$enqueued_value = $this->get_enqueued_attribute_value( $comparable );
-		if ( false !== $enqueued_value ) {
-			return $enqueued_value;
-		}
-
-		if ( ! isset( $this->attributes[ $comparable ] ) ) {
-			return null;
-		}
-
-		$attribute = $this->attributes[ $comparable ];
-
-		/*
-		 * This flag distinguishes an attribute with no value
-		 * from an attribute with an empty string value. For
-		 * unquoted attributes this could look very similar.
-		 * It refers to whether an `=` follows the name.
-		 *
-		 * e.g. <div boolean-attribute empty-attribute=></div>
-		 *           ¹                 ²
-		 *        1. Attribute `boolean-attribute` is `true`.
-		 *        2. Attribute `empty-attribute` is `""`.
-		 */
-		if ( true === $attribute->is_true ) {
-			return true;
-		}
-
-		$raw_value = substr( $this->html, $attribute->value_starts_at, $attribute->value_length );
-
-		return html_entity_decode( $raw_value );
-	}
-
-	/**
-	 * Gets lowercase names of all attributes matching a given prefix in the current tag.
-	 *
-	 * Note that matching is case-insensitive. This is in accordance with the spec:
-	 *
-	 * > There must never be two or more attributes on
-	 * > the same start tag whose names are an ASCII
-	 * > case-insensitive match for each other.
-	 *     - HTML 5 spec
-	 *
-	 * Example:
-	 *
-	 *     $p = new WP_HTML_Tag_Processor( '<div data-ENABLED class="test" DATA-test-id="14">Test</div>' );
-	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
-	 *     $p->get_attribute_names_with_prefix( 'data-' ) === array( 'data-enabled', 'data-test-id' );
-	 *
-	 *     $p->next_tag() === false;
-	 *     $p->get_attribute_names_with_prefix( 'data-' ) === null;
-	 *
-	 * @since 6.2.0
-	 *
-	 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
-	 *
-	 * @param string $prefix Prefix of requested attribute names.
-	 * @return array|null List of attribute names, or `null` when no tag opener is matched.
-	 */
-	public function get_attribute_names_with_prefix( $prefix ) {
-		if ( $this->is_closing_tag || null === $this->tag_name_starts_at ) {
-			return null;
-		}
-
-		$comparable = strtolower( $prefix );
-
-		$matches = array();
-		foreach ( array_keys( $this->attributes ) as $attr_name ) {
-			if ( str_starts_with( $attr_name, $comparable ) ) {
-				$matches[] = $attr_name;
-			}
-		}
-		return $matches;
-	}
-
-	/**
-	 * Returns the uppercase name of the matched tag.
-	 *
-	 * Example:
-	 *
-	 *     $p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
-	 *     $p->next_tag() === true;
-	 *     $p->get_tag() === 'DIV';
-	 *
-	 *     $p->next_tag() === false;
-	 *     $p->get_tag() === null;
-	 *
-	 * @since 6.2.0
-	 *
-	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
-	 */
-	public function get_tag() {
-		if ( null === $this->tag_name_starts_at ) {
-			return null;
-		}
-
-		$tag_name = substr( $this->html, $this->tag_name_starts_at, $this->tag_name_length );
-
-		return strtoupper( $tag_name );
-	}
-
-	/**
-	 * Indicates if the currently matched tag contains the self-closing flag.
-	 *
-	 * No HTML elements ought to have the self-closing flag and for those, the self-closing
-	 * flag will be ignored. For void elements this is benign because they "self close"
-	 * automatically. For non-void HTML elements though problems will appear if someone
-	 * intends to use a self-closing element in place of that element with an empty body.
-	 * For HTML foreign elements and custom elements the self-closing flag determines if
-	 * they self-close or not.
-	 *
-	 * This function does not determine if a tag is self-closing,
-	 * but only if the self-closing flag is present in the syntax.
-	 *
-	 * @since 6.3.0
-	 *
-	 * @return bool Whether the currently matched tag contains the self-closing flag.
-	 */
-	public function has_self_closing_flag() {
-		if ( ! $this->tag_name_starts_at ) {
-			return false;
-		}
-
-		return '/' === $this->html[ $this->tag_ends_at - 1 ];
-	}
-
-	/**
-	 * Indicates if the current tag token is a tag closer.
-	 *
-	 * Example:
-	 *
-	 *     $p = new WP_HTML_Tag_Processor( '<div></div>' );
-	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
-	 *     $p->is_tag_closer() === false;
-	 *
-	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
-	 *     $p->is_tag_closer() === true;
-	 *
-	 * @since 6.2.0
-	 *
-	 * @return bool Whether the current tag is a tag closer.
-	 */
-	public function is_tag_closer() {
-		return $this->is_closing_tag;
-	}
-
-	/**
-	 * Updates or creates a new attribute on the currently matched tag with the passed value.
-	 *
-	 * For boolean attributes special handling is provided:
-	 *  - When `true` is passed as the value, then only the attribute name is added to the tag.
-	 *  - When `false` is passed, the attribute gets removed if it existed before.
-	 *
-	 * For string attributes, the value is escaped using the `esc_attr` function.
-	 *
-	 * @since 6.2.0
-	 * @since 6.2.1 Fix: Only create a single update for multiple calls with case-variant attribute names.
-	 *
-	 * @param string      $name  The attribute name to target.
-	 * @param string|bool $value The new attribute value.
-	 * @return bool Whether an attribute value was set.
-	 */
-	public function set_attribute( $name, $value ) {
-		if ( $this->is_closing_tag || null === $this->tag_name_starts_at ) {
-			return false;
-		}
-
-		/*
-		 * WordPress rejects more characters than are strictly forbidden
-		 * in HTML5. This is to prevent additional security risks deeper
-		 * in the WordPress and plugin stack. Specifically the
-		 * less-than (<) greater-than (>) and ampersand (&) aren't allowed.
-		 *
-		 * The use of a PCRE match enables looking for specific Unicode
-		 * code points without writing a UTF-8 decoder. Whereas scanning
-		 * for one-byte characters is trivial (with `strcspn`), scanning
-		 * for the longer byte sequences would be more complicated. Given
-		 * that this shouldn't be in the hot path for execution, it's a
-		 * reasonable compromise in efficiency without introducing a
-		 * noticeable impact on the overall system.
-		 *
-		 * @see https://html.spec.whatwg.org/#attributes-2
-		 *
-		 * @todo As the only regex pattern maybe we should take it out?
-		 *       Are Unicode patterns available broadly in Core?
-		 */
-		if ( preg_match(
-			'~[' .
-				// Syntax-like characters.
-				'"\'>&</ =' .
-				// Control characters.
-				'\x{00}-\x{1F}' .
-				// HTML noncharacters.
-				'\x{FDD0}-\x{FDEF}' .
-				'\x{FFFE}\x{FFFF}\x{1FFFE}\x{1FFFF}\x{2FFFE}\x{2FFFF}\x{3FFFE}\x{3FFFF}' .
-				'\x{4FFFE}\x{4FFFF}\x{5FFFE}\x{5FFFF}\x{6FFFE}\x{6FFFF}\x{7FFFE}\x{7FFFF}' .
-				'\x{8FFFE}\x{8FFFF}\x{9FFFE}\x{9FFFF}\x{AFFFE}\x{AFFFF}\x{BFFFE}\x{BFFFF}' .
-				'\x{CFFFE}\x{CFFFF}\x{DFFFE}\x{DFFFF}\x{EFFFE}\x{EFFFF}\x{FFFFE}\x{FFFFF}' .
-				'\x{10FFFE}\x{10FFFF}' .
-			']~Ssu',
-			$name
-		) ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Invalid attribute name.' ),
-				'6.2.0'
-			);
-
-			return false;
-		}
-
-		/*
-		 * > The values "true" and "false" are not allowed on boolean attributes.
-		 * > To represent a false value, the attribute has to be omitted altogether.
-		 *     - HTML5 spec, https://html.spec.whatwg.org/#boolean-attributes
-		 */
-		if ( false === $value ) {
-			return $this->remove_attribute( $name );
-		}
-
-		if ( true === $value ) {
-			$updated_attribute = $name;
-		} else {
-			$escaped_new_value = esc_attr( $value );
-			$updated_attribute = "{$name}=\"{$escaped_new_value}\"";
-		}
-
-		/*
-		 * > There must never be two or more attributes on
-		 * > the same start tag whose names are an ASCII
-		 * > case-insensitive match for each other.
-		 *     - HTML 5 spec
-		 *
-		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
-		 */
-		$comparable_name = strtolower( $name );
-
-		if ( isset( $this->attributes[ $comparable_name ] ) ) {
-			/*
-			 * Update an existing attribute.
-			 *
-			 * Example – set attribute id to "new" in <div id="initial_id" />:
-			 *
-			 *     <div id="initial_id"/>
-			 *          ^-------------^
-			 *          start         end
-			 *     replacement: `id="new"`
-			 *
-			 *     Result: <div id="new"/>
-			 */
-			$existing_attribute                        = $this->attributes[ $comparable_name ];
-			$this->lexical_updates[ $comparable_name ] = new WP_HTML_Text_Replacement(
-				$existing_attribute->start,
-				$existing_attribute->end,
-				$updated_attribute
-			);
-		} else {
-			/*
-			 * Create a new attribute at the tag's name end.
-			 *
-			 * Example – add attribute id="new" to <div />:
-			 *
-			 *     <div/>
-			 *         ^
-			 *         start and end
-			 *     replacement: ` id="new"`
-			 *
-			 *     Result: <div id="new"/>
-			 */
-			$this->lexical_updates[ $comparable_name ] = new WP_HTML_Text_Replacement(
-				$this->tag_name_starts_at + $this->tag_name_length,
-				$this->tag_name_starts_at + $this->tag_name_length,
-				' ' . $updated_attribute
-			);
-		}
-
-		/*
-		 * Any calls to update the `class` attribute directly should wipe out any
-		 * enqueued class changes from `add_class` and `remove_class`.
-		 */
-		if ( 'class' === $comparable_name && ! empty( $this->classname_updates ) ) {
-			$this->classname_updates = array();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Remove an attribute from the currently-matched tag.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param string $name The attribute name to remove.
-	 * @return bool Whether an attribute was removed.
-	 */
-	public function remove_attribute( $name ) {
-		if ( $this->is_closing_tag ) {
-			return false;
-		}
-
-		/*
-		 * > There must never be two or more attributes on
-		 * > the same start tag whose names are an ASCII
-		 * > case-insensitive match for each other.
-		 *     - HTML 5 spec
-		 *
-		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
-		 */
-		$name = strtolower( $name );
-
-		/*
-		 * Any calls to update the `class` attribute directly should wipe out any
-		 * enqueued class changes from `add_class` and `remove_class`.
-		 */
-		if ( 'class' === $name && count( $this->classname_updates ) !== 0 ) {
-			$this->classname_updates = array();
-		}
-
-		/*
-		 * If updating an attribute that didn't exist in the input
-		 * document, then remove the enqueued update and move on.
-		 *
-		 * For example, this might occur when calling `remove_attribute()`
-		 * after calling `set_attribute()` for the same attribute
-		 * and when that attribute wasn't originally present.
-		 */
-		if ( ! isset( $this->attributes[ $name ] ) ) {
-			if ( isset( $this->lexical_updates[ $name ] ) ) {
-				unset( $this->lexical_updates[ $name ] );
-			}
-			return false;
-		}
-
-		/*
-		 * Removes an existing tag attribute.
-		 *
-		 * Example – remove the attribute id from <div id="main"/>:
-		 *    <div id="initial_id"/>
-		 *         ^-------------^
-		 *         start         end
-		 *    replacement: ``
-		 *
-		 *    Result: <div />
-		 */
-		$this->lexical_updates[ $name ] = new WP_HTML_Text_Replacement(
-			$this->attributes[ $name ]->start,
-			$this->attributes[ $name ]->end,
-			''
-		);
-
-		// Removes any duplicated attributes if they were also present.
-		if ( null !== $this->duplicate_attributes && array_key_exists( $name, $this->duplicate_attributes ) ) {
-			foreach ( $this->duplicate_attributes[ $name ] as $attribute_token ) {
-				$this->lexical_updates[] = new WP_HTML_Text_Replacement(
-					$attribute_token->start,
-					$attribute_token->end,
-					''
-				);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Adds a new class name to the currently matched tag.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param string $class_name The class name to add.
-	 * @return bool Whether the class was set to be added.
-	 */
-	public function add_class( $class_name ) {
-		if ( $this->is_closing_tag ) {
-			return false;
-		}
-
-		if ( null !== $this->tag_name_starts_at ) {
-			$this->classname_updates[ $class_name ] = self::ADD_CLASS;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Removes a class name from the currently matched tag.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param string $class_name The class name to remove.
-	 * @return bool Whether the class was set to be removed.
-	 */
-	public function remove_class( $class_name ) {
-		if ( $this->is_closing_tag ) {
-			return false;
-		}
-
-		if ( null !== $this->tag_name_starts_at ) {
-			$this->classname_updates[ $class_name ] = self::REMOVE_CLASS;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Returns the string representation of the HTML Tag Processor.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @see WP_HTML_Tag_Processor::get_updated_html()
-	 *
-	 * @return string The processed HTML.
-	 */
-	public function __toString() {
-		return $this->get_updated_html();
-	}
-
-	/**
-	 * Returns the string representation of the HTML Tag Processor.
-	 *
-	 * @since 6.2.0
-	 * @since 6.2.1 Shifts the internal cursor corresponding to the applied updates.
-	 * @since 6.4.0 No longer calls subclass method `next_tag()` after updating HTML.
-	 *
-	 * @return string The processed HTML.
-	 */
-	public function get_updated_html() {
-		$requires_no_updating = 0 === count( $this->classname_updates ) && 0 === count( $this->lexical_updates );
-
-		/*
-		 * When there is nothing more to update and nothing has already been
-		 * updated, return the original document and avoid a string copy.
-		 */
-		if ( $requires_no_updating ) {
-			return $this->html;
-		}
-
-		/*
-		 * Keep track of the position right before the current tag. This will
-		 * be necessary for reparsing the current tag after updating the HTML.
-		 */
-		$before_current_tag = $this->tag_name_starts_at - 1;
-
-		/*
-		 * 1. Apply the enqueued edits and update all the pointers to reflect those changes.
-		 */
-		$this->class_name_updates_to_attributes_updates();
-		$before_current_tag += $this->apply_attributes_updates( $before_current_tag );
-
-		/*
-		 * 2. Rewind to before the current tag and reparse to get updated attributes.
-		 *
-		 * At this point the internal cursor points to the end of the tag name.
-		 * Rewind before the tag name starts so that it's as if the cursor didn't
-		 * move; a call to `next_tag()` will reparse the recently-updated attributes
-		 * and additional calls to modify the attributes will apply at this same
-		 * location, but in order to avoid issues with subclasses that might add
-		 * behaviors to `next_tag()`, the internal methods should be called here
-		 * instead.
-		 *
-		 * It's important to note that in this specific place there will be no change
-		 * because the processor was already at a tag when this was called and it's
-		 * rewinding only to the beginning of this very tag before reprocessing it
-		 * and its attributes.
-		 *
-		 * <p>Previous HTML<em>More HTML</em></p>
-		 *                 ↑  │ back up by the length of the tag name plus the opening <
-		 *                 └←─┘ back up by strlen("em") + 1 ==> 3
-		 */
-		$this->bytes_already_parsed = $before_current_tag;
-		$this->parse_next_tag();
-		// Reparse the attributes.
-		while ( $this->parse_next_attribute() ) {
-			continue;
-		}
-
-		$tag_ends_at                = strpos( $this->html, '>', $this->bytes_already_parsed );
-		$this->tag_ends_at          = $tag_ends_at;
-		$this->bytes_already_parsed = $tag_ends_at;
-
-		return $this->html;
-	}
-
-	/**
-	 * Parses tag query input into internal search criteria.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @param array|string|null $query {
-	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
-	 *
-	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
-	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
-	 *                                     1 for "first" tag, 3 for "third," etc.
-	 *                                     Defaults to first tag.
-	 *     @type string|null $class_name   Tag must contain this class name to match.
-	 *     @type string      $tag_closers  "visit" or "skip": whether to stop on tag closers, e.g. </div>.
-	 * }
-	 */
-	private function parse_query( $query ) {
-		if ( null !== $query && $query === $this->last_query ) {
-			return;
-		}
-
-		$this->last_query          = $query;
-		$this->sought_tag_name     = null;
-		$this->sought_class_name   = null;
-		$this->sought_match_offset = 1;
-		$this->stop_on_tag_closers = false;
-
-		// A single string value means "find the tag of this name".
-		if ( is_string( $query ) ) {
-			$this->sought_tag_name = $query;
-			return;
-		}
-
-		// An empty query parameter applies no restrictions on the search.
-		if ( null === $query ) {
-			return;
-		}
-
-		// If not using the string interface, an associative array is required.
-		if ( ! is_array( $query ) ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'The query argument must be an array or a tag name.' ),
-				'6.2.0'
-			);
-			return;
-		}
-
-		if ( isset( $query['tag_name'] ) && is_string( $query['tag_name'] ) ) {
-			$this->sought_tag_name = $query['tag_name'];
-		}
-
-		if ( isset( $query['class_name'] ) && is_string( $query['class_name'] ) ) {
-			$this->sought_class_name = $query['class_name'];
-		}
-
-		if ( isset( $query['match_offset'] ) && is_int( $query['match_offset'] ) && 0 < $query['match_offset'] ) {
-			$this->sought_match_offset = $query['match_offset'];
-		}
-
-		if ( isset( $query['tag_closers'] ) ) {
-			$this->stop_on_tag_closers = 'visit' === $query['tag_closers'];
-		}
-	}
-
-
-	/**
-	 * Checks whether a given tag and its attributes match the search criteria.
-	 *
-	 * @since 6.2.0
-	 *
-	 * @return bool Whether the given tag and its attribute match the search criteria.
-	 */
-	private function matches() {
-		if ( $this->is_closing_tag && ! $this->stop_on_tag_closers ) {
-			return false;
-		}
-
-		// Does the tag name match the requested tag name in a case-insensitive manner?
-		if ( null !== $this->sought_tag_name ) {
-			/*
-			 * String (byte) length lookup is fast. If they aren't the
-			 * same length then they can't be the same string values.
-			 */
-			if ( strlen( $this->sought_tag_name ) !== $this->tag_name_length ) {
-				return false;
-			}
-
-			/*
-			 * Check each character to determine if they are the same.
-			 * Defer calls to `strtoupper()` to avoid them when possible.
-			 * Calling `strcasecmp()` here tested slowed than comparing each
-			 * character, so unless benchmarks show otherwise, it should
-			 * not be used.
-			 *
-			 * It's expected that most of the time that this runs, a
-			 * lower-case tag name will be supplied and the input will
-			 * contain lower-case tag names, thus normally bypassing
-			 * the case comparison code.
-			 */
-			for ( $i = 0; $i < $this->tag_name_length; $i++ ) {
-				$html_char = $this->html[ $this->tag_name_starts_at + $i ];
-				$tag_char  = $this->sought_tag_name[ $i ];
-
-				if ( $html_char !== $tag_char && strtoupper( $html_char ) !== $tag_char ) {
-					return false;
-				}
-			}
-		}
-
-		if ( null !== $this->sought_class_name && ! $this->has_class( $this->sought_class_name ) ) {
-			return false;
-		}
-
-		return true;
-	}
-}
diff --git a/lib/compat/wordpress-6.4/html-api/class-wp-html-active-formatting-elements.php b/lib/compat/wordpress-6.4/html-api/class-wp-html-active-formatting-elements.php
deleted file mode 100644
index 0db8d4ba36c93d..00000000000000
--- a/lib/compat/wordpress-6.4/html-api/class-wp-html-active-formatting-elements.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
- * HTML API: WP_HTML_Active_Formatting_Elements class
- *
- * @package WordPress
- * @subpackage HTML-API
- * @since 6.4.0
- */
-
-if ( class_exists( 'WP_HTML_Active_Formatting_Elements' ) ) {
-	return;
-}
-
-/**
- * Core class used by the HTML processor during HTML parsing
- * for managing the stack of active formatting elements.
- *
- * This class is designed for internal use by the HTML processor.
- *
- * > Initially, the list of active formatting elements is empty.
- * > It is used to handle mis-nested formatting element tags.
- * >
- * > The list contains elements in the formatting category, and markers.
- * > The markers are inserted when entering applet, object, marquee,
- * > template, td, th, and caption elements, and are used to prevent
- * > formatting from "leaking" into applet, object, marquee, template,
- * > td, th, and caption elements.
- * >
- * > In addition, each element in the list of active formatting elements
- * > is associated with the token for which it was created, so that
- * > further elements can be created for that token if necessary.
- *
- * @since 6.4.0
- *
- * @access private
- *
- * @see https://html.spec.whatwg.org/#list-of-active-formatting-elements
- * @see WP_HTML_Processor
- */
-class WP_HTML_Active_Formatting_Elements {
-	/**
-	 * Holds the stack of active formatting element references.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var WP_HTML_Token[]
-	 */
-	private $stack = array();
-
-	/**
-	 * Reports if a specific node is in the stack of active formatting elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param WP_HTML_Token $token Look for this node in the stack.
-	 * @return bool Whether the referenced node is in the stack of active formatting elements.
-	 */
-	public function contains_node( $token ) {
-		foreach ( $this->walk_up() as $item ) {
-			if ( $token->bookmark_name === $item->bookmark_name ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns how many nodes are currently in the stack of active formatting elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @return int How many node are in the stack of active formatting elements.
-	 */
-	public function count() {
-		return count( $this->stack );
-	}
-
-	/**
-	 * Returns the node at the end of the stack of active formatting elements,
-	 * if one exists. If the stack is empty, returns null.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @return WP_HTML_Token|null Last node in the stack of active formatting elements, if one exists, otherwise null.
-	 */
-	public function current_node() {
-		$current_node = end( $this->stack );
-
-		return $current_node ? $current_node : null;
-	}
-
-	/**
-	 * Pushes a node onto the stack of active formatting elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#push-onto-the-list-of-active-formatting-elements
-	 *
-	 * @param WP_HTML_Token $token Push this node onto the stack.
-	 */
-	public function push( $token ) {
-		/*
-		 * > If there are already three elements in the list of active formatting elements after the last marker,
-		 * > if any, or anywhere in the list if there are no markers, that have the same tag name, namespace, and
-		 * > attributes as element, then remove the earliest such element from the list of active formatting
-		 * > elements. For these purposes, the attributes must be compared as they were when the elements were
-		 * > created by the parser; two elements have the same attributes if all their parsed attributes can be
-		 * > paired such that the two attributes in each pair have identical names, namespaces, and values
-		 * > (the order of the attributes does not matter).
-		 *
-		 * @TODO: Implement the "Noah's Ark clause" to only add up to three of any given kind of formatting elements to the stack.
-		 */
-		// > Add element to the list of active formatting elements.
-		$this->stack[] = $token;
-	}
-
-	/**
-	 * Removes a node from the stack of active formatting elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param WP_HTML_Token $token Remove this node from the stack, if it's there already.
-	 * @return bool Whether the node was found and removed from the stack of active formatting elements.
-	 */
-	public function remove_node( $token ) {
-		foreach ( $this->walk_up() as $position_from_end => $item ) {
-			if ( $token->bookmark_name !== $item->bookmark_name ) {
-				continue;
-			}
-
-			$position_from_start = $this->count() - $position_from_end - 1;
-			array_splice( $this->stack, $position_from_start, 1 );
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Steps through the stack of active formatting elements, starting with the
-	 * top element (added first) and walking downwards to the one added last.
-	 *
-	 * This generator function is designed to be used inside a "foreach" loop.
-	 *
-	 * Example:
-	 *
-	 *     $html = '<em><strong><a>We are here';
-	 *     foreach ( $stack->walk_down() as $node ) {
-	 *         echo "{$node->node_name} -> ";
-	 *     }
-	 *     > EM -> STRONG -> A ->
-	 *
-	 * To start with the most-recently added element and walk towards the top,
-	 * see WP_HTML_Active_Formatting_Elements::walk_up().
-	 *
-	 * @since 6.4.0
-	 */
-	public function walk_down() {
-		$count = count( $this->stack );
-
-		for ( $i = 0; $i < $count; $i++ ) {
-			yield $this->stack[ $i ];
-		}
-	}
-
-	/**
-	 * Steps through the stack of active formatting elements, starting with the
-	 * bottom element (added last) and walking upwards to the one added first.
-	 *
-	 * This generator function is designed to be used inside a "foreach" loop.
-	 *
-	 * Example:
-	 *
-	 *     $html = '<em><strong><a>We are here';
-	 *     foreach ( $stack->walk_up() as $node ) {
-	 *         echo "{$node->node_name} -> ";
-	 *     }
-	 *     > A -> STRONG -> EM ->
-	 *
-	 * To start with the first added element and walk towards the bottom,
-	 * see WP_HTML_Active_Formatting_Elements::walk_down().
-	 *
-	 * @since 6.4.0
-	 */
-	public function walk_up() {
-		for ( $i = count( $this->stack ) - 1; $i >= 0; $i-- ) {
-			yield $this->stack[ $i ];
-		}
-	}
-}
diff --git a/lib/compat/wordpress-6.4/html-api/class-wp-html-open-elements.php b/lib/compat/wordpress-6.4/html-api/class-wp-html-open-elements.php
deleted file mode 100644
index 622ddd2f31a16e..00000000000000
--- a/lib/compat/wordpress-6.4/html-api/class-wp-html-open-elements.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-/**
- * HTML API: WP_HTML_Open_Elements class
- *
- * @package WordPress
- * @subpackage HTML-API
- * @since 6.4.0
- */
-
-if ( class_exists( 'WP_HTML_Open_Elements' ) ) {
-	return;
-}
-
-/**
- * Core class used by the HTML processor during HTML parsing
- * for managing the stack of open elements.
- *
- * This class is designed for internal use by the HTML processor.
- *
- * > Initially, the stack of open elements is empty. The stack grows
- * > downwards; the topmost node on the stack is the first one added
- * > to the stack, and the bottommost node of the stack is the most
- * > recently added node in the stack (notwithstanding when the stack
- * > is manipulated in a random access fashion as part of the handling
- * > for misnested tags).
- *
- * @since 6.4.0
- *
- * @access private
- *
- * @see https://html.spec.whatwg.org/#stack-of-open-elements
- * @see WP_HTML_Processor
- */
-class WP_HTML_Open_Elements {
-	/**
-	 * Holds the stack of open element references.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var WP_HTML_Token[]
-	 */
-	public $stack = array();
-
-	/**
-	 * Whether a P element is in button scope currently.
-	 *
-	 * This class optimizes scope lookup by pre-calculating
-	 * this value when elements are added and removed to the
-	 * stack of open elements which might change its value.
-	 * This avoids frequent iteration over the stack.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var bool
-	 */
-	private $has_p_in_button_scope = false;
-
-	/**
-	 * Reports if a specific node is in the stack of open elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param WP_HTML_Token $token Look for this node in the stack.
-	 * @return bool Whether the referenced node is in the stack of open elements.
-	 */
-	public function contains_node( $token ) {
-		foreach ( $this->walk_up() as $item ) {
-			if ( $token->bookmark_name === $item->bookmark_name ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns how many nodes are currently in the stack of open elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @return int How many node are in the stack of open elements.
-	 */
-	public function count() {
-		return count( $this->stack );
-	}
-
-	/**
-	 * Returns the node at the end of the stack of open elements,
-	 * if one exists. If the stack is empty, returns null.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @return WP_HTML_Token|null Last node in the stack of open elements, if one exists, otherwise null.
-	 */
-	public function current_node() {
-		$current_node = end( $this->stack );
-
-		return $current_node ? $current_node : null;
-	}
-
-	/**
-	 * Returns whether an element is in a specific scope.
-	 *
-	 * ## HTML Support
-	 *
-	 * This function skips checking for the termination list because there
-	 * are no supported elements which appear in the termination list.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#has-an-element-in-the-specific-scope
-	 *
-	 * @param string   $tag_name         Name of tag check.
-	 * @param string[] $termination_list List of elements that terminate the search.
-	 * @return bool Whether the element was found in a specific scope.
-	 */
-	public function has_element_in_specific_scope( $tag_name, $termination_list ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		foreach ( $this->walk_up() as $node ) {
-			if ( $node->node_name === $tag_name ) {
-				return true;
-			}
-
-			switch ( $node->node_name ) {
-				case 'HTML':
-					return false;
-			}
-
-			if ( in_array( $node->node_name, $termination_list, true ) ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns whether a particular element is in scope.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#has-an-element-in-scope
-	 *
-	 * @param string $tag_name Name of tag to check.
-	 * @return bool Whether given element is in scope.
-	 */
-	public function has_element_in_scope( $tag_name ) {
-		return $this->has_element_in_specific_scope(
-			$tag_name,
-			array(
-
-				/*
-				 * Because it's not currently possible to encounter
-				 * one of the termination elements, they don't need
-				 * to be listed here. If they were, they would be
-				 * unreachable and only waste CPU cycles while
-				 * scanning through HTML.
-				 */
-			)
-		);
-	}
-
-	/**
-	 * Returns whether a particular element is in list item scope.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#has-an-element-in-list-item-scope
-	 *
-	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
-	 *
-	 * @param string $tag_name Name of tag to check.
-	 * @return bool Whether given element is in scope.
-	 */
-	public function has_element_in_list_item_scope( $tag_name ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on list item scope.' );
-
-		return false; // The linter requires this unreachable code until the function is implemented and can return.
-	}
-
-	/**
-	 * Returns whether a particular element is in button scope.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
-	 *
-	 * @param string $tag_name Name of tag to check.
-	 * @return bool Whether given element is in scope.
-	 */
-	public function has_element_in_button_scope( $tag_name ) {
-		return $this->has_element_in_specific_scope( $tag_name, array( 'BUTTON' ) );
-	}
-
-	/**
-	 * Returns whether a particular element is in table scope.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#has-an-element-in-table-scope
-	 *
-	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
-	 *
-	 * @param string $tag_name Name of tag to check.
-	 * @return bool Whether given element is in scope.
-	 */
-	public function has_element_in_table_scope( $tag_name ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on table scope.' );
-
-		return false; // The linter requires this unreachable code until the function is implemented and can return.
-	}
-
-	/**
-	 * Returns whether a particular element is in select scope.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#has-an-element-in-select-scope
-	 *
-	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
-	 *
-	 * @param string $tag_name Name of tag to check.
-	 * @return bool Whether given element is in scope.
-	 */
-	public function has_element_in_select_scope( $tag_name ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on select scope.' );
-
-		return false; // The linter requires this unreachable code until the function is implemented and can return.
-	}
-
-	/**
-	 * Returns whether a P is in BUTTON scope.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
-	 *
-	 * @return bool Whether a P is in BUTTON scope.
-	 */
-	public function has_p_in_button_scope() {
-		return $this->has_p_in_button_scope;
-	}
-
-	/**
-	 * Pops a node off of the stack of open elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
-	 *
-	 * @return bool Whether a node was popped off of the stack.
-	 */
-	public function pop() {
-		$item = array_pop( $this->stack );
-
-		if ( null === $item ) {
-			return false;
-		}
-
-		$this->after_element_pop( $item );
-		return true;
-	}
-
-	/**
-	 * Pops nodes off of the stack of open elements until one with the given tag name has been popped.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see WP_HTML_Open_Elements::pop
-	 *
-	 * @param string $tag_name Name of tag that needs to be popped off of the stack of open elements.
-	 * @return bool Whether a tag of the given name was found and popped off of the stack of open elements.
-	 */
-	public function pop_until( $tag_name ) {
-		foreach ( $this->walk_up() as $item ) {
-			$this->pop();
-
-			if ( $tag_name === $item->node_name ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Pushes a node onto the stack of open elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
-	 *
-	 * @param WP_HTML_Token $stack_item Item to add onto stack.
-	 */
-	public function push( $stack_item ) {
-		$this->stack[] = $stack_item;
-		$this->after_element_push( $stack_item );
-	}
-
-	/**
-	 * Removes a specific node from the stack of open elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param WP_HTML_Token $token The node to remove from the stack of open elements.
-	 * @return bool Whether the node was found and removed from the stack of open elements.
-	 */
-	public function remove_node( $token ) {
-		foreach ( $this->walk_up() as $position_from_end => $item ) {
-			if ( $token->bookmark_name !== $item->bookmark_name ) {
-				continue;
-			}
-
-			$position_from_start = $this->count() - $position_from_end - 1;
-			array_splice( $this->stack, $position_from_start, 1 );
-			$this->after_element_pop( $item );
-			return true;
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Steps through the stack of open elements, starting with the top element
-	 * (added first) and walking downwards to the one added last.
-	 *
-	 * This generator function is designed to be used inside a "foreach" loop.
-	 *
-	 * Example:
-	 *
-	 *     $html = '<em><strong><a>We are here';
-	 *     foreach ( $stack->walk_down() as $node ) {
-	 *         echo "{$node->node_name} -> ";
-	 *     }
-	 *     > EM -> STRONG -> A ->
-	 *
-	 * To start with the most-recently added element and walk towards the top,
-	 * see WP_HTML_Open_Elements::walk_up().
-	 *
-	 * @since 6.4.0
-	 */
-	public function walk_down() {
-		$count = count( $this->stack );
-
-		for ( $i = 0; $i < $count; $i++ ) {
-			yield $this->stack[ $i ];
-		}
-	}
-
-	/**
-	 * Steps through the stack of open elements, starting with the bottom element
-	 * (added last) and walking upwards to the one added first.
-	 *
-	 * This generator function is designed to be used inside a "foreach" loop.
-	 *
-	 * Example:
-	 *
-	 *     $html = '<em><strong><a>We are here';
-	 *     foreach ( $stack->walk_up() as $node ) {
-	 *         echo "{$node->node_name} -> ";
-	 *     }
-	 *     > A -> STRONG -> EM ->
-	 *
-	 * To start with the first added element and walk towards the bottom,
-	 * see WP_HTML_Open_Elements::walk_down().
-	 *
-	 * @since 6.4.0
-	 */
-	public function walk_up() {
-		for ( $i = count( $this->stack ) - 1; $i >= 0; $i-- ) {
-			yield $this->stack[ $i ];
-		}
-	}
-
-	/*
-	 * Internal helpers.
-	 */
-
-	/**
-	 * Updates internal flags after adding an element.
-	 *
-	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
-	 * flags that are only modified when adding and removing elements. This allows
-	 * the HTML Processor to quickly check for these conditions instead of iterating
-	 * over the open stack elements upon each new tag it encounters. These flags,
-	 * however, need to be maintained as items are added and removed from the stack.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param WP_HTML_Token $item Element that was added to the stack of open elements.
-	 */
-	public function after_element_push( $item ) {
-		/*
-		 * When adding support for new elements, expand this switch to trap
-		 * cases where the precalculated value needs to change.
-		 */
-		switch ( $item->node_name ) {
-			case 'BUTTON':
-				$this->has_p_in_button_scope = false;
-				break;
-
-			case 'P':
-				$this->has_p_in_button_scope = true;
-				break;
-		}
-	}
-
-	/**
-	 * Updates internal flags after removing an element.
-	 *
-	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
-	 * flags that are only modified when adding and removing elements. This allows
-	 * the HTML Processor to quickly check for these conditions instead of iterating
-	 * over the open stack elements upon each new tag it encounters. These flags,
-	 * however, need to be maintained as items are added and removed from the stack.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param WP_HTML_Token $item Element that was removed from the stack of open elements.
-	 */
-	public function after_element_pop( $item ) {
-		/*
-		 * When adding support for new elements, expand this switch to trap
-		 * cases where the precalculated value needs to change.
-		 */
-		switch ( $item->node_name ) {
-			case 'BUTTON':
-				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
-				break;
-
-			case 'P':
-				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
-				break;
-		}
-	}
-}
diff --git a/lib/compat/wordpress-6.4/html-api/class-wp-html-processor-state.php b/lib/compat/wordpress-6.4/html-api/class-wp-html-processor-state.php
deleted file mode 100644
index bcde6734d304a7..00000000000000
--- a/lib/compat/wordpress-6.4/html-api/class-wp-html-processor-state.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * HTML API: WP_HTML_Processor_State class
- *
- * @package WordPress
- * @subpackage HTML-API
- * @since 6.4.0
- */
-
-if ( class_exists( 'WP_HTML_Processor_State' ) ) {
-	return;
-}
-
-/**
- * Core class used by the HTML processor during HTML parsing
- * for managing the internal parsing state.
- *
- * This class is designed for internal use by the HTML processor.
- *
- * @since 6.4.0
- *
- * @access private
- *
- * @see WP_HTML_Processor
- */
-class WP_HTML_Processor_State {
-	/*
-	 * Insertion mode constants.
-	 *
-	 * These constants exist and are named to make it easier to
-	 * discover and recognize the supported insertion modes in
-	 * the parser.
-	 *
-	 * Out of all the possible insertion modes, only those
-	 * supported by the parser are listed here. As support
-	 * is added to the parser for more modes, add them here
-	 * following the same naming and value pattern.
-	 *
-	 * @see https://html.spec.whatwg.org/#the-insertion-mode
-	 */
-
-	/**
-	 * Initial insertion mode for full HTML parser.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#the-initial-insertion-mode
-	 * @see WP_HTML_Processor_State::$insertion_mode
-	 *
-	 * @var string
-	 */
-	const INSERTION_MODE_INITIAL = 'insertion-mode-initial';
-
-	/**
-	 * In body insertion mode for full HTML parser.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
-	 * @see WP_HTML_Processor_State::$insertion_mode
-	 *
-	 * @var string
-	 */
-	const INSERTION_MODE_IN_BODY = 'insertion-mode-in-body';
-
-	/**
-	 * Tracks open elements while scanning HTML.
-	 *
-	 * This property is initialized in the constructor and never null.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
-	 *
-	 * @var WP_HTML_Open_Elements
-	 */
-	public $stack_of_open_elements = null;
-
-	/**
-	 * Tracks open formatting elements, used to handle mis-nested formatting element tags.
-	 *
-	 * This property is initialized in the constructor and never null.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#list-of-active-formatting-elements
-	 *
-	 * @var WP_HTML_Active_Formatting_Elements
-	 */
-	public $active_formatting_elements = null;
-
-	/**
-	 * Tree construction insertion mode.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#insertion-mode
-	 *
-	 * @var string
-	 */
-	public $insertion_mode = self::INSERTION_MODE_INITIAL;
-
-	/**
-	 * Context node initializing fragment parser, if created as a fragment parser.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#concept-frag-parse-context
-	 *
-	 * @var [string, array]|null
-	 */
-	public $context_node = null;
-
-	/**
-	 * The frameset-ok flag indicates if a `FRAMESET` element is allowed in the current state.
-	 *
-	 * > The frameset-ok flag is set to "ok" when the parser is created. It is set to "not ok" after certain tokens are seen.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#frameset-ok-flag
-	 *
-	 * @var bool
-	 */
-	public $frameset_ok = true;
-
-	/**
-	 * Constructor - creates a new and empty state value.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see WP_HTML_Processor
-	 */
-	public function __construct() {
-		$this->stack_of_open_elements     = new WP_HTML_Open_Elements();
-		$this->active_formatting_elements = new WP_HTML_Active_Formatting_Elements();
-	}
-}
diff --git a/lib/compat/wordpress-6.4/html-api/class-wp-html-processor.php b/lib/compat/wordpress-6.4/html-api/class-wp-html-processor.php
deleted file mode 100644
index d1c8b9e82c708a..00000000000000
--- a/lib/compat/wordpress-6.4/html-api/class-wp-html-processor.php
+++ /dev/null
@@ -1,1487 +0,0 @@
-<?php
-/**
- * HTML API: WP_HTML_Processor class
- *
- * @package WordPress
- * @subpackage HTML-API
- * @since 6.4.0
- */
-
-if ( class_exists( 'WP_HTML_Processor' ) ) {
-	return;
-}
-
-/**
- * Core class used to safely parse and modify an HTML document.
- *
- * The HTML Processor class properly parses and modifies HTML5 documents.
- *
- * It supports a subset of the HTML5 specification, and when it encounters
- * unsupported markup, it aborts early to avoid unintentionally breaking
- * the document. The HTML Processor should never break an HTML document.
- *
- * While the `WP_HTML_Tag_Processor` is a valuable tool for modifying
- * attributes on individual HTML tags, the HTML Processor is more capable
- * and useful for the following operations:
- *
- *  - Querying based on nested HTML structure.
- *
- * Eventually the HTML Processor will also support:
- *  - Wrapping a tag in surrounding HTML.
- *  - Unwrapping a tag by removing its parent.
- *  - Inserting and removing nodes.
- *  - Reading and changing inner content.
- *  - Navigating up or around HTML structure.
- *
- * ## Usage
- *
- * Use of this class requires three steps:
- *
- *   1. Call a static creator method with your input HTML document.
- *   2. Find the location in the document you are looking for.
- *   3. Request changes to the document at that location.
- *
- * Example:
- *
- *     $processor = WP_HTML_Processor::create_fragment( $html );
- *     if ( $processor->next_tag( array( 'breadcrumbs' => array( 'DIV', 'FIGURE', 'IMG' ) ) ) ) {
- *         $processor->add_class( 'responsive-image' );
- *     }
- *
- * #### Breadcrumbs
- *
- * Breadcrumbs represent the stack of open elements from the root
- * of the document or fragment down to the currently-matched node,
- * if one is currently selected. Call WP_HTML_Processor::get_breadcrumbs()
- * to inspect the breadcrumbs for a matched tag.
- *
- * Breadcrumbs can specify nested HTML structure and are equivalent
- * to a CSS selector comprising tag names separated by the child
- * combinator, such as "DIV > FIGURE > IMG".
- *
- * Since all elements find themselves inside a full HTML document
- * when parsed, the return value from `get_breadcrumbs()` will always
- * contain any implicit outermost elements. For example, when parsing
- * with `create_fragment()` in the `BODY` context (the default), any
- * tag in the given HTML document will contain `array( 'HTML', 'BODY', … )`
- * in its breadcrumbs.
- *
- * Despite containing the implied outermost elements in their breadcrumbs,
- * tags may be found with the shortest-matching breadcrumb query. That is,
- * `array( 'IMG' )` matches all IMG elements and `array( 'P', 'IMG' )`
- * matches all IMG elements directly inside a P element. To ensure that no
- * partial matches erroneously match it's possible to specify in a query
- * the full breadcrumb match all the way down from the root HTML element.
- *
- * Example:
- *
- *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
- *     //               ----- Matches here.
- *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'IMG' ) ) );
- *
- *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
- *     //                                  ---- Matches here.
- *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'FIGCAPTION', 'EM' ) ) );
- *
- *     $html = '<div><img></div><img>';
- *     //                       ----- Matches here, because IMG must be a direct child of the implicit BODY.
- *     $processor->next_tag( array( 'breadcrumbs' => array( 'BODY', 'IMG' ) ) );
- *
- * ## HTML Support
- *
- * This class implements a small part of the HTML5 specification.
- * It's designed to operate within its support and abort early whenever
- * encountering circumstances it can't properly handle. This is
- * the principle way in which this class remains as simple as possible
- * without cutting corners and breaking compliance.
- *
- * ### Supported elements
- *
- * If any unsupported element appears in the HTML input the HTML Processor
- * will abort early and stop all processing. This draconian measure ensures
- * that the HTML Processor won't break any HTML it doesn't fully understand.
- *
- * The following list specifies the HTML tags that _are_ supported:
- *
- *  - Containers: ADDRESS, BLOCKQUOTE, DETAILS, DIALOG, DIV, FOOTER, HEADER, MAIN, MENU, SPAN, SUMMARY.
- *  - Form elements: BUTTON, FIELDSET, SEARCH.
- *  - Formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U.
- *  - Heading elements: HGROUP.
- *  - Links: A.
- *  - Lists: DL.
- *  - Media elements: FIGCAPTION, FIGURE, IMG.
- *  - Paragraph: P.
- *  - Sectioning elements: ARTICLE, ASIDE, NAV, SECTION
- *  - Deprecated elements: CENTER, DIR
- *
- * ### Supported markup
- *
- * Some kinds of non-normative HTML involve reconstruction of formatting elements and
- * re-parenting of mis-nested elements. For example, a DIV tag found inside a TABLE
- * may in fact belong _before_ the table in the DOM. If the HTML Processor encounters
- * such a case it will stop processing.
- *
- * The following list specifies HTML markup that _is_ supported:
- *
- *  - Markup involving only those tags listed above.
- *  - Fully-balanced and non-overlapping tags.
- *  - HTML with unexpected tag closers.
- *  - Some unbalanced or overlapping tags.
- *  - P tags after unclosed P tags.
- *  - BUTTON tags after unclosed BUTTON tags.
- *  - A tags after unclosed A tags that don't involve any active formatting elements.
- *
- * @since 6.4.0
- *
- * @see WP_HTML_Tag_Processor
- * @see https://html.spec.whatwg.org/
- */
-class WP_HTML_Processor extends Gutenberg_HTML_Tag_Processor_6_4 {
-	/**
-	 * The maximum number of bookmarks allowed to exist at any given time.
-	 *
-	 * HTML processing requires more bookmarks than basic tag processing,
-	 * so this class constant from the Tag Processor is overwritten.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var int
-	 */
-	const MAX_BOOKMARKS = 100;
-
-	/**
-	 * Static query for instructing the Tag Processor to visit every token.
-	 *
-	 * @access private
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var array
-	 */
-	const VISIT_EVERYTHING = array( 'tag_closers' => 'visit' );
-
-	/**
-	 * Holds the working state of the parser, including the stack of
-	 * open elements and the stack of active formatting elements.
-	 *
-	 * Initialized in the constructor.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var WP_HTML_Processor_State
-	 */
-	private $state = null;
-
-	/**
-	 * Used to create unique bookmark names.
-	 *
-	 * This class sets a bookmark for every tag in the HTML document that it encounters.
-	 * The bookmark name is auto-generated and increments, starting with `1`. These are
-	 * internal bookmarks and are automatically released when the referring WP_HTML_Token
-	 * goes out of scope and is garbage-collected.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see WP_HTML_Processor::$release_internal_bookmark_on_destruct
-	 *
-	 * @var int
-	 */
-	private $bookmark_counter = 0;
-
-	/**
-	 * Stores an explanation for why something failed, if it did.
-	 *
-	 * @see self::get_last_error
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string|null
-	 */
-	private $last_error = null;
-
-	/**
-	 * Releases a bookmark when PHP garbage-collects its wrapping WP_HTML_Token instance.
-	 *
-	 * This function is created inside the class constructor so that it can be passed to
-	 * the stack of open elements and the stack of active formatting elements without
-	 * exposing it as a public method on the class.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var closure
-	 */
-	private $release_internal_bookmark_on_destruct = null;
-
-	/*
-	 * Public Interface Functions
-	 */
-
-	/**
-	 * Creates an HTML processor in the fragment parsing mode.
-	 *
-	 * Use this for cases where you are processing chunks of HTML that
-	 * will be found within a bigger HTML document, such as rendered
-	 * block output that exists within a post, `the_content` inside a
-	 * rendered site layout.
-	 *
-	 * Fragment parsing occurs within a context, which is an HTML element
-	 * that the document will eventually be placed in. It becomes important
-	 * when special elements have different rules than others, such as inside
-	 * a TEXTAREA or a TITLE tag where things that look like tags are text,
-	 * or inside a SCRIPT tag where things that look like HTML syntax are JS.
-	 *
-	 * The context value should be a representation of the tag into which the
-	 * HTML is found. For most cases this will be the body element. The HTML
-	 * form is provided because a context element may have attributes that
-	 * impact the parse, such as with a SCRIPT tag and its `type` attribute.
-	 *
-	 * ## Current HTML Support
-	 *
-	 *  - The only supported context is `<body>`, which is the default value.
-	 *  - The only supported document encoding is `UTF-8`, which is the default value.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param string $html     Input HTML fragment to process.
-	 * @param string $context  Context element for the fragment, must be default of `<body>`.
-	 * @param string $encoding Text encoding of the document; must be default of 'UTF-8'.
-	 * @return WP_HTML_Processor|null The created processor if successful, otherwise null.
-	 */
-	public static function create_fragment( $html, $context = '<body>', $encoding = 'UTF-8' ) {
-		if ( '<body>' !== $context || 'UTF-8' !== $encoding ) {
-			return null;
-		}
-
-		$p                        = new self( $html, self::CONSTRUCTOR_UNLOCK_CODE );
-		$p->state->context_node   = array( 'BODY', array() );
-		$p->state->insertion_mode = WP_HTML_Processor_State::INSERTION_MODE_IN_BODY;
-
-		// @TODO: Create "fake" bookmarks for non-existent but implied nodes.
-		$p->bookmarks['root-node']    = new WP_HTML_Span( 0, 0 );
-		$p->bookmarks['context-node'] = new WP_HTML_Span( 0, 0 );
-
-		$p->state->stack_of_open_elements->push(
-			new WP_HTML_Token(
-				'root-node',
-				'HTML',
-				false
-			)
-		);
-
-		$p->state->stack_of_open_elements->push(
-			new WP_HTML_Token(
-				'context-node',
-				$p->state->context_node[0],
-				false
-			)
-		);
-
-		return $p;
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * Do not use this method. Use the static creator methods instead.
-	 *
-	 * @access private
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see WP_HTML_Processor::create_fragment()
-	 *
-	 * @param string      $html                                  HTML to process.
-	 * @param string|null $use_the_static_create_methods_instead This constructor should not be called manually.
-	 */
-	public function __construct( $html, $use_the_static_create_methods_instead = null ) {
-		parent::__construct( $html );
-
-		if ( self::CONSTRUCTOR_UNLOCK_CODE !== $use_the_static_create_methods_instead ) {
-			_doing_it_wrong(
-				__METHOD__,
-				sprintf(
-					/* translators: %s: WP_HTML_Processor::create_fragment(). */
-					__( 'Call %s to create an HTML Processor instead of calling the constructor directly.' ),
-					'<code>WP_HTML_Processor::create_fragment()</code>'
-				),
-				'6.4.0'
-			);
-		}
-
-		$this->state = new WP_HTML_Processor_State();
-
-		/*
-		 * Create this wrapper so that it's possible to pass
-		 * a private method into WP_HTML_Token classes without
-		 * exposing it to any public API.
-		 */
-		$this->release_internal_bookmark_on_destruct = function ( $name ) {
-			parent::release_bookmark( $name );
-		};
-	}
-
-	/**
-	 * Returns the last error, if any.
-	 *
-	 * Various situations lead to parsing failure but this class will
-	 * return `false` in all those cases. To determine why something
-	 * failed it's possible to request the last error. This can be
-	 * helpful to know to distinguish whether a given tag couldn't
-	 * be found or if content in the document caused the processor
-	 * to give up and abort processing.
-	 *
-	 * Example
-	 *
-	 *     $processor = WP_HTML_Processor::create_fragment( '<template><strong><button><em><p><em>' );
-	 *     false === $processor->next_tag();
-	 *     WP_HTML_Processor::ERROR_UNSUPPORTED === $processor->get_last_error();
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see self::ERROR_UNSUPPORTED
-	 * @see self::ERROR_EXCEEDED_MAX_BOOKMARKS
-	 *
-	 * @return string|null The last error, if one exists, otherwise null.
-	 */
-	public function get_last_error() {
-		return $this->last_error;
-	}
-
-	/**
-	 * Finds the next tag matching the $query.
-	 *
-	 * @todo Support matching the class name and tag name.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
-	 *
-	 * @param array|string|null $query {
-	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
-	 *
-	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
-	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
-	 *                                     1 for "first" tag, 3 for "third," etc.
-	 *                                     Defaults to first tag.
-	 *     @type string|null $class_name   Tag must contain this whole class name to match.
-	 *     @type string[]    $breadcrumbs  DOM sub-path at which element is found, e.g. `array( 'FIGURE', 'IMG' )`.
-	 *                                     May also contain the wildcard `*` which matches a single element, e.g. `array( 'SECTION', '*' )`.
-	 * }
-	 * @return bool Whether a tag was matched.
-	 */
-	public function next_tag( $query = null ) {
-		if ( null === $query ) {
-			while ( $this->step() ) {
-				if ( ! $this->is_tag_closer() ) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		if ( is_string( $query ) ) {
-			$query = array( 'breadcrumbs' => array( $query ) );
-		}
-
-		if ( ! is_array( $query ) ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Please pass a query array to this function.' ),
-				'6.4.0'
-			);
-			return false;
-		}
-
-		if ( ! ( array_key_exists( 'breadcrumbs', $query ) && is_array( $query['breadcrumbs'] ) ) ) {
-			while ( $this->step() ) {
-				if ( ! $this->is_tag_closer() ) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		if ( isset( $query['tag_closers'] ) && 'visit' === $query['tag_closers'] ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( 'Cannot visit tag closers in HTML Processor.' ),
-				'6.4.0'
-			);
-			return false;
-		}
-
-		$breadcrumbs  = $query['breadcrumbs'];
-		$match_offset = isset( $query['match_offset'] ) ? (int) $query['match_offset'] : 1;
-
-		while ( $match_offset > 0 && $this->step() ) {
-			if ( $this->matches_breadcrumbs( $breadcrumbs ) && 0 === --$match_offset ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Indicates if the currently-matched tag matches the given breadcrumbs.
-	 *
-	 * A "*" represents a single tag wildcard, where any tag matches, but not no tags.
-	 *
-	 * At some point this function _may_ support a `**` syntax for matching any number
-	 * of unspecified tags in the breadcrumb stack. This has been intentionally left
-	 * out, however, to keep this function simple and to avoid introducing backtracking,
-	 * which could open up surprising performance breakdowns.
-	 *
-	 * Example:
-	 *
-	 *     $processor = WP_HTML_Processor::create_fragment( '<div><span><figure><img></figure></span></div>' );
-	 *     $processor->next_tag( 'img' );
-	 *     true  === $processor->matches_breadcrumbs( array( 'figure', 'img' ) );
-	 *     true  === $processor->matches_breadcrumbs( array( 'span', 'figure', 'img' ) );
-	 *     false === $processor->matches_breadcrumbs( array( 'span', 'img' ) );
-	 *     true  === $processor->matches_breadcrumbs( array( 'span', '*', 'img' ) );
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param string[] $breadcrumbs DOM sub-path at which element is found, e.g. `array( 'FIGURE', 'IMG' )`.
-	 *                              May also contain the wildcard `*` which matches a single element, e.g. `array( 'SECTION', '*' )`.
-	 * @return bool Whether the currently-matched tag is found at the given nested structure.
-	 */
-	public function matches_breadcrumbs( $breadcrumbs ) {
-		if ( ! $this->get_tag() ) {
-			return false;
-		}
-
-		// Everything matches when there are zero constraints.
-		if ( 0 === count( $breadcrumbs ) ) {
-			return true;
-		}
-
-		// Start at the last crumb.
-		$crumb = end( $breadcrumbs );
-
-		if ( '*' !== $crumb && $this->get_tag() !== strtoupper( $crumb ) ) {
-			return false;
-		}
-
-		foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
-			$crumb = strtoupper( current( $breadcrumbs ) );
-
-			if ( '*' !== $crumb && $node->node_name !== $crumb ) {
-				return false;
-			}
-
-			if ( false === prev( $breadcrumbs ) ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Steps through the HTML document and stop at the next tag, if any.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
-	 *
-	 * @see self::PROCESS_NEXT_NODE
-	 * @see self::REPROCESS_CURRENT_NODE
-	 *
-	 * @param string $node_to_process Whether to parse the next node or reprocess the current node.
-	 * @return bool Whether a tag was matched.
-	 */
-	public function step( $node_to_process = self::PROCESS_NEXT_NODE ) {
-		// Refuse to proceed if there was a previous error.
-		if ( null !== $this->last_error ) {
-			return false;
-		}
-
-		if ( self::PROCESS_NEXT_NODE === $node_to_process ) {
-			/*
-			 * Void elements still hop onto the stack of open elements even though
-			 * there's no corresponding closing tag. This is important for managing
-			 * stack-based operations such as "navigate to parent node" or checking
-			 * on an element's breadcrumbs.
-			 *
-			 * When moving on to the next node, therefore, if the bottom-most element
-			 * on the stack is a void element, it must be closed.
-			 *
-			 * @TODO: Once self-closing foreign elements and BGSOUND are supported,
-			 *        they must also be implicitly closed here too. BGSOUND is
-			 *        special since it's only self-closing if the self-closing flag
-			 *        is provided in the opening tag, otherwise it expects a tag closer.
-			 */
-			$top_node = $this->state->stack_of_open_elements->current_node();
-			if ( $top_node && self::is_void( $top_node->node_name ) ) {
-				$this->state->stack_of_open_elements->pop();
-			}
-
-			parent::next_tag( self::VISIT_EVERYTHING );
-		}
-
-		// Finish stepping when there are no more tokens in the document.
-		if ( null === $this->get_tag() ) {
-			return false;
-		}
-
-		$this->state->current_token = new WP_HTML_Token(
-			$this->bookmark_tag(),
-			$this->get_tag(),
-			$this->is_tag_closer(),
-			$this->release_internal_bookmark_on_destruct
-		);
-
-		try {
-			switch ( $this->state->insertion_mode ) {
-				case WP_HTML_Processor_State::INSERTION_MODE_IN_BODY:
-					return $this->step_in_body();
-
-				default:
-					$this->last_error = self::ERROR_UNSUPPORTED;
-					throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
-			}
-		} catch ( WP_HTML_Unsupported_Exception $e ) {
-			/*
-			 * Exceptions are used in this class to escape deep call stacks that
-			 * otherwise might involve messier calling and return conventions.
-			 */
-			return false;
-		}
-	}
-
-	/**
-	 * Computes the HTML breadcrumbs for the currently-matched node, if matched.
-	 *
-	 * Breadcrumbs start at the outermost parent and descend toward the matched element.
-	 * They always include the entire path from the root HTML node to the matched element.
-	 *
-	 * @todo It could be more efficient to expose a generator-based version of this function
-	 *       to avoid creating the array copy on tag iteration. If this is done, it would likely
-	 *       be more useful to walk up the stack when yielding instead of starting at the top.
-	 *
-	 * Example
-	 *
-	 *     $processor = WP_HTML_Processor::create_fragment( '<p><strong><em><img></em></strong></p>' );
-	 *     $processor->next_tag( 'IMG' );
-	 *     $processor->get_breadcrumbs() === array( 'HTML', 'BODY', 'P', 'STRONG', 'EM', 'IMG' );
-	 *
-	 * @since 6.4.0
-	 *
-	 * @return string[]|null Array of tag names representing path to matched node, if matched, otherwise NULL.
-	 */
-	public function get_breadcrumbs() {
-		if ( ! $this->get_tag() ) {
-			return null;
-		}
-
-		$breadcrumbs = array();
-		foreach ( $this->state->stack_of_open_elements->walk_down() as $stack_item ) {
-			$breadcrumbs[] = $stack_item->node_name;
-		}
-
-		return $breadcrumbs;
-	}
-
-	/**
-	 * Parses next element in the 'in body' insertion mode.
-	 *
-	 * This internal function performs the 'in body' insertion mode
-	 * logic for the generalized WP_HTML_Processor::step() function.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
-	 *
-	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
-	 * @see WP_HTML_Processor::step
-	 *
-	 * @return bool Whether an element was found.
-	 */
-	private function step_in_body() {
-		$tag_name = $this->get_tag();
-		$op_sigil = $this->is_tag_closer() ? '-' : '+';
-		$op       = "{$op_sigil}{$tag_name}";
-
-		switch ( $op ) {
-			/*
-			 * > A start tag whose tag name is "button"
-			 */
-			case '+BUTTON':
-				if ( $this->state->stack_of_open_elements->has_element_in_scope( 'BUTTON' ) ) {
-					// @TODO: Indicate a parse error once it's possible. This error does not impact the logic here.
-					$this->generate_implied_end_tags();
-					$this->state->stack_of_open_elements->pop_until( 'BUTTON' );
-				}
-
-				$this->reconstruct_active_formatting_elements();
-				$this->insert_html_element( $this->state->current_token );
-				$this->state->frameset_ok = false;
-
-				return true;
-
-			/*
-			 * > A start tag whose tag name is one of: "address", "article", "aside",
-			 * > "blockquote", "center", "details", "dialog", "dir", "div", "dl",
-			 * > "fieldset", "figcaption", "figure", "footer", "header", "hgroup",
-			 * > "main", "menu", "nav", "ol", "p", "search", "section", "summary", "ul"
-			 */
-			case '+ADDRESS':
-			case '+ARTICLE':
-			case '+ASIDE':
-			case '+BLOCKQUOTE':
-			case '+CENTER':
-			case '+DETAILS':
-			case '+DIALOG':
-			case '+DIR':
-			case '+DIV':
-			case '+DL':
-			case '+FIELDSET':
-			case '+FIGCAPTION':
-			case '+FIGURE':
-			case '+FOOTER':
-			case '+HEADER':
-			case '+HGROUP':
-			case '+MAIN':
-			case '+MENU':
-			case '+NAV':
-			case '+P':
-			case '+SEARCH':
-			case '+SECTION':
-			case '+SUMMARY':
-				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
-					$this->close_a_p_element();
-				}
-
-				$this->insert_html_element( $this->state->current_token );
-				return true;
-
-			/*
-			 * > An end tag whose tag name is one of: "address", "article", "aside", "blockquote",
-			 * > "button", "center", "details", "dialog", "dir", "div", "dl", "fieldset",
-			 * > "figcaption", "figure", "footer", "header", "hgroup", "listing", "main",
-			 * > "menu", "nav", "ol", "pre", "search", "section", "summary", "ul"
-			 */
-			case '-ADDRESS':
-			case '-ARTICLE':
-			case '-ASIDE':
-			case '-BLOCKQUOTE':
-			case '-BUTTON':
-			case '-CENTER':
-			case '-DETAILS':
-			case '-DIALOG':
-			case '-DIR':
-			case '-DIV':
-			case '-DL':
-			case '-FIELDSET':
-			case '-FIGCAPTION':
-			case '-FIGURE':
-			case '-FOOTER':
-			case '-HEADER':
-			case '-HGROUP':
-			case '-MAIN':
-			case '-MENU':
-			case '-NAV':
-			case '-SEARCH':
-			case '-SECTION':
-			case '-SUMMARY':
-				if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $tag_name ) ) {
-					// @TODO: Report parse error.
-					// Ignore the token.
-					return $this->step();
-				}
-
-				$this->generate_implied_end_tags();
-				if ( $this->state->stack_of_open_elements->current_node()->node_name !== $tag_name ) {
-					// @TODO: Record parse error: this error doesn't impact parsing.
-				}
-				$this->state->stack_of_open_elements->pop_until( $tag_name );
-				return true;
-
-			/*
-			 * > An end tag whose tag name is "p"
-			 */
-			case '-P':
-				if ( ! $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
-					$this->insert_html_element( $this->state->current_token );
-				}
-
-				$this->close_a_p_element();
-				return true;
-
-			// > A start tag whose tag name is "a"
-			case '+A':
-				foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
-					switch ( $item->node_name ) {
-						case 'marker':
-							break;
-
-						case 'A':
-							$this->run_adoption_agency_algorithm();
-							$this->state->active_formatting_elements->remove_node( $item );
-							$this->state->stack_of_open_elements->remove_node( $item );
-							break;
-					}
-				}
-
-				$this->reconstruct_active_formatting_elements();
-				$this->insert_html_element( $this->state->current_token );
-				$this->state->active_formatting_elements->push( $this->state->current_token );
-				return true;
-
-			/*
-			 * > A start tag whose tag name is one of: "b", "big", "code", "em", "font", "i",
-			 * > "s", "small", "strike", "strong", "tt", "u"
-			 */
-			case '+B':
-			case '+BIG':
-			case '+CODE':
-			case '+EM':
-			case '+FONT':
-			case '+I':
-			case '+S':
-			case '+SMALL':
-			case '+STRIKE':
-			case '+STRONG':
-			case '+TT':
-			case '+U':
-				$this->reconstruct_active_formatting_elements();
-				$this->insert_html_element( $this->state->current_token );
-				$this->state->active_formatting_elements->push( $this->state->current_token );
-				return true;
-
-			/*
-			 * > An end tag whose tag name is one of: "a", "b", "big", "code", "em", "font", "i",
-			 * > "nobr", "s", "small", "strike", "strong", "tt", "u"
-			 */
-			case '-A':
-			case '-B':
-			case '-BIG':
-			case '-CODE':
-			case '-EM':
-			case '-FONT':
-			case '-I':
-			case '-S':
-			case '-SMALL':
-			case '-STRIKE':
-			case '-STRONG':
-			case '-TT':
-			case '-U':
-				$this->run_adoption_agency_algorithm();
-				return true;
-
-			/*
-			 * > A start tag whose tag name is one of: "area", "br", "embed", "img", "keygen", "wbr"
-			 */
-			case '+IMG':
-				$this->reconstruct_active_formatting_elements();
-				$this->insert_html_element( $this->state->current_token );
-				return true;
-
-			/*
-			 * > Any other start tag
-			 */
-			case '+SPAN':
-				$this->reconstruct_active_formatting_elements();
-				$this->insert_html_element( $this->state->current_token );
-				return true;
-
-			/*
-			 * Any other end tag
-			 */
-			case '-SPAN':
-				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
-					// > If node is an HTML element with the same tag name as the token, then:
-					if ( $item->node_name === $tag_name ) {
-						$this->generate_implied_end_tags( $tag_name );
-
-						// > If node is not the current node, then this is a parse error.
-
-						$this->state->stack_of_open_elements->pop_until( $tag_name );
-						return true;
-					}
-
-					// > Otherwise, if node is in the special category, then this is a parse error; ignore the token, and return.
-					if ( self::is_special( $item->node_name ) ) {
-						return $this->step();
-					}
-				}
-				// Execution should not reach here; if it does then something went wrong.
-				return false;
-
-			default:
-				$this->last_error = self::ERROR_UNSUPPORTED;
-				throw new WP_HTML_Unsupported_Exception( "Cannot process {$tag_name} element." );
-		}
-	}
-
-	/*
-	 * Internal helpers
-	 */
-
-	/**
-	 * Creates a new bookmark for the currently-matched tag and returns the generated name.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @throws Exception When unable to allocate requested bookmark.
-	 *
-	 * @return string|false Name of created bookmark, or false if unable to create.
-	 */
-	private function bookmark_tag() {
-		if ( ! $this->get_tag() ) {
-			return false;
-		}
-
-		if ( ! parent::set_bookmark( ++$this->bookmark_counter ) ) {
-			$this->last_error = self::ERROR_EXCEEDED_MAX_BOOKMARKS;
-			throw new Exception( 'could not allocate bookmark' );
-		}
-
-		return "{$this->bookmark_counter}";
-	}
-
-	/*
-	 * HTML semantic overrides for Tag Processor
-	 */
-
-	/**
-	 * Returns the uppercase name of the matched tag.
-	 *
-	 * The semantic rules for HTML specify that certain tags be reprocessed
-	 * with a different tag name. Because of this, the tag name presented
-	 * by the HTML Processor may differ from the one reported by the HTML
-	 * Tag Processor, which doesn't apply these semantic rules.
-	 *
-	 * Example:
-	 *
-	 *     $processor = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
-	 *     $processor->next_tag() === true;
-	 *     $processor->get_tag() === 'DIV';
-	 *
-	 *     $processor->next_tag() === false;
-	 *     $processor->get_tag() === null;
-	 *
-	 * @since 6.4.0
-	 *
-	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
-	 */
-	public function get_tag() {
-		if ( null !== $this->last_error ) {
-			return null;
-		}
-
-		$tag_name = parent::get_tag();
-
-		switch ( $tag_name ) {
-			case 'IMAGE':
-				/*
-				 * > A start tag whose tag name is "image"
-				 * > Change the token's tag name to "img" and reprocess it. (Don't ask.)
-				 */
-				return 'IMG';
-
-			default:
-				return $tag_name;
-		}
-	}
-
-	/**
-	 * Removes a bookmark that is no longer needed.
-	 *
-	 * Releasing a bookmark frees up the small
-	 * performance overhead it requires.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param string $bookmark_name Name of the bookmark to remove.
-	 * @return bool Whether the bookmark already existed before removal.
-	 */
-	public function release_bookmark( $bookmark_name ) {
-		return parent::release_bookmark( "_{$bookmark_name}" );
-	}
-
-	/**
-	 * Moves the internal cursor in the HTML Processor to a given bookmark's location.
-	 *
-	 * In order to prevent accidental infinite loops, there's a
-	 * maximum limit on the number of times seek() can be called.
-	 *
-	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param string $bookmark_name Jump to the place in the document identified by this bookmark name.
-	 * @return bool Whether the internal cursor was successfully moved to the bookmark's location.
-	 */
-	public function seek( $bookmark_name ) {
-		$actual_bookmark_name = "_{$bookmark_name}";
-		$processor_started_at = $this->state->current_token
-			? $this->bookmarks[ $this->state->current_token->bookmark_name ]->start
-			: 0;
-		$bookmark_starts_at   = $this->bookmarks[ $actual_bookmark_name ]->start;
-		$direction            = $bookmark_starts_at > $processor_started_at ? 'forward' : 'backward';
-
-		switch ( $direction ) {
-			case 'forward':
-				// When moving forwards, re-parse the document until reaching the same location as the original bookmark.
-				while ( $this->step() ) {
-					if ( $bookmark_starts_at === $this->bookmarks[ $this->state->current_token->bookmark_name ]->start ) {
-						return true;
-					}
-				}
-
-				return false;
-
-			case 'backward':
-				/*
-				 * When moving backwards, clear out all existing stack entries which appear after the destination
-				 * bookmark. These could be stored for later retrieval, but doing so would require additional
-				 * memory overhead and also demand that references and bookmarks are updated as the document
-				 * changes. In time this could be a valuable optimization, but it's okay to give up that
-				 * optimization in exchange for more CPU time to recompute the stack, to re-parse the
-				 * document that may have already been parsed once.
-				 */
-				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
-					if ( $bookmark_starts_at >= $this->bookmarks[ $item->bookmark_name ]->start ) {
-						break;
-					}
-
-					$this->state->stack_of_open_elements->remove_node( $item );
-				}
-
-				foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
-					if ( $bookmark_starts_at >= $this->bookmarks[ $item->bookmark_name ]->start ) {
-						break;
-					}
-
-					$this->state->active_formatting_elements->remove_node( $item );
-				}
-
-				return parent::seek( $actual_bookmark_name );
-		}
-	}
-
-	/**
-	 * Sets a bookmark in the HTML document.
-	 *
-	 * Bookmarks represent specific places or tokens in the HTML
-	 * document, such as a tag opener or closer. When applying
-	 * edits to a document, such as setting an attribute, the
-	 * text offsets of that token may shift; the bookmark is
-	 * kept updated with those shifts and remains stable unless
-	 * the entire span of text in which the token sits is removed.
-	 *
-	 * Release bookmarks when they are no longer needed.
-	 *
-	 * Example:
-	 *
-	 *     <main><h2>Surprising fact you may not know!</h2></main>
-	 *           ^  ^
-	 *            \-|-- this `H2` opener bookmark tracks the token
-	 *
-	 *     <main class="clickbait"><h2>Surprising fact you may no…
-	 *                             ^  ^
-	 *                              \-|-- it shifts with edits
-	 *
-	 * Bookmarks provide the ability to seek to a previously-scanned
-	 * place in the HTML document. This avoids the need to re-scan
-	 * the entire document.
-	 *
-	 * Example:
-	 *
-	 *     <ul><li>One</li><li>Two</li><li>Three</li></ul>
-	 *                                 ^^^^
-	 *                                 want to note this last item
-	 *
-	 *     $p = new WP_HTML_Tag_Processor( $html );
-	 *     $in_list = false;
-	 *     while ( $p->next_tag( array( 'tag_closers' => $in_list ? 'visit' : 'skip' ) ) ) {
-	 *         if ( 'UL' === $p->get_tag() ) {
-	 *             if ( $p->is_tag_closer() ) {
-	 *                 $in_list = false;
-	 *                 $p->set_bookmark( 'resume' );
-	 *                 if ( $p->seek( 'last-li' ) ) {
-	 *                     $p->add_class( 'last-li' );
-	 *                 }
-	 *                 $p->seek( 'resume' );
-	 *                 $p->release_bookmark( 'last-li' );
-	 *                 $p->release_bookmark( 'resume' );
-	 *             } else {
-	 *                 $in_list = true;
-	 *             }
-	 *         }
-	 *
-	 *         if ( 'LI' === $p->get_tag() ) {
-	 *             $p->set_bookmark( 'last-li' );
-	 *         }
-	 *     }
-	 *
-	 * Bookmarks intentionally hide the internal string offsets
-	 * to which they refer. They are maintained internally as
-	 * updates are applied to the HTML document and therefore
-	 * retain their "position" - the location to which they
-	 * originally pointed. The inability to use bookmarks with
-	 * functions like `substr` is therefore intentional to guard
-	 * against accidentally breaking the HTML.
-	 *
-	 * Because bookmarks allocate memory and require processing
-	 * for every applied update, they are limited and require
-	 * a name. They should not be created with programmatically-made
-	 * names, such as "li_{$index}" with some loop. As a general
-	 * rule they should only be created with string-literal names
-	 * like "start-of-section" or "last-paragraph".
-	 *
-	 * Bookmarks are a powerful tool to enable complicated behavior.
-	 * Consider double-checking that you need this tool if you are
-	 * reaching for it, as inappropriate use could lead to broken
-	 * HTML structure or unwanted processing overhead.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param string $bookmark_name Identifies this particular bookmark.
-	 * @return bool Whether the bookmark was successfully created.
-	 */
-	public function set_bookmark( $bookmark_name ) {
-		return parent::set_bookmark( "_{$bookmark_name}" );
-	}
-
-	/*
-	 * HTML Parsing Algorithms
-	 */
-
-	/**
-	 * Closes a P element.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
-	 *
-	 * @see https://html.spec.whatwg.org/#close-a-p-element
-	 */
-	private function close_a_p_element() {
-		$this->generate_implied_end_tags( 'P' );
-		$this->state->stack_of_open_elements->pop_until( 'P' );
-	}
-
-	/**
-	 * Closes elements that have implied end tags.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
-	 *
-	 * @param string|null $except_for_this_element Perform as if this element doesn't exist in the stack of open elements.
-	 */
-	private function generate_implied_end_tags( $except_for_this_element = null ) {
-		$elements_with_implied_end_tags = array(
-			'P',
-		);
-
-		$current_node = $this->state->stack_of_open_elements->current_node();
-		while (
-			$current_node && $current_node->node_name !== $except_for_this_element &&
-			in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true )
-		) {
-			$this->state->stack_of_open_elements->pop();
-		}
-	}
-
-	/**
-	 * Closes elements that have implied end tags, thoroughly.
-	 *
-	 * See the HTML specification for an explanation why this is
-	 * different from generating end tags in the normal sense.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see WP_HTML_Processor::generate_implied_end_tags
-	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
-	 */
-	private function generate_implied_end_tags_thoroughly() {
-		$elements_with_implied_end_tags = array(
-			'P',
-		);
-
-		while ( in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true ) ) {
-			$this->state->stack_of_open_elements->pop();
-		}
-	}
-
-	/**
-	 * Reconstructs the active formatting elements.
-	 *
-	 * > This has the effect of reopening all the formatting elements that were opened
-	 * > in the current body, cell, or caption (whichever is youngest) that haven't
-	 * > been explicitly closed.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
-	 *
-	 * @see https://html.spec.whatwg.org/#reconstruct-the-active-formatting-elements
-	 *
-	 * @return bool Whether any formatting elements needed to be reconstructed.
-	 */
-	private function reconstruct_active_formatting_elements() {
-		/*
-		 * > If there are no entries in the list of active formatting elements, then there is nothing
-		 * > to reconstruct; stop this algorithm.
-		 */
-		if ( 0 === $this->state->active_formatting_elements->count() ) {
-			return false;
-		}
-
-		$last_entry = $this->state->active_formatting_elements->current_node();
-		if (
-
-			/*
-			 * > If the last (most recently added) entry in the list of active formatting elements is a marker;
-			 * > stop this algorithm.
-			 */
-			'marker' === $last_entry->node_name ||
-
-			/*
-			 * > If the last (most recently added) entry in the list of active formatting elements is an
-			 * > element that is in the stack of open elements, then there is nothing to reconstruct;
-			 * > stop this algorithm.
-			 */
-			$this->state->stack_of_open_elements->contains_node( $last_entry )
-		) {
-			return false;
-		}
-
-		$this->last_error = self::ERROR_UNSUPPORTED;
-		throw new WP_HTML_Unsupported_Exception( 'Cannot reconstruct active formatting elements when advancing and rewinding is required.' );
-	}
-
-	/**
-	 * Runs the adoption agency algorithm.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
-	 *
-	 * @see https://html.spec.whatwg.org/#adoption-agency-algorithm
-	 */
-	private function run_adoption_agency_algorithm() {
-		$budget       = 1000;
-		$subject      = $this->get_tag();
-		$current_node = $this->state->stack_of_open_elements->current_node();
-
-		if (
-			// > If the current node is an HTML element whose tag name is subject
-			$current_node && $subject === $current_node->node_name &&
-			// > the current node is not in the list of active formatting elements
-			! $this->state->active_formatting_elements->contains_node( $current_node )
-		) {
-			$this->state->stack_of_open_elements->pop();
-			return;
-		}
-
-		$outer_loop_counter = 0;
-		while ( $budget-- > 0 ) {
-			if ( $outer_loop_counter++ >= 8 ) {
-				return;
-			}
-
-			/*
-			 * > Let formatting element be the last element in the list of active formatting elements that:
-			 * >   - is between the end of the list and the last marker in the list,
-			 * >     if any, or the start of the list otherwise,
-			 * >   - and has the tag name subject.
-			 */
-			$formatting_element = null;
-			foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
-				if ( 'marker' === $item->node_name ) {
-					break;
-				}
-
-				if ( $subject === $item->node_name ) {
-					$formatting_element = $item;
-					break;
-				}
-			}
-
-			// > If there is no such element, then return and instead act as described in the "any other end tag" entry above.
-			if ( null === $formatting_element ) {
-				$this->last_error = self::ERROR_UNSUPPORTED;
-				throw new WP_HTML_Unsupported_Exception( 'Cannot run adoption agency when "any other end tag" is required.' );
-			}
-
-			// > If formatting element is not in the stack of open elements, then this is a parse error; remove the element from the list, and return.
-			if ( ! $this->state->stack_of_open_elements->contains_node( $formatting_element ) ) {
-				$this->state->active_formatting_elements->remove_node( $formatting_element->bookmark_name );
-				return;
-			}
-
-			// > If formatting element is in the stack of open elements, but the element is not in scope, then this is a parse error; return.
-			if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $formatting_element->node_name ) ) {
-				return;
-			}
-
-			/*
-			 * > Let furthest block be the topmost node in the stack of open elements that is lower in the stack
-			 * > than formatting element, and is an element in the special category. There might not be one.
-			 */
-			$is_above_formatting_element = true;
-			$furthest_block              = null;
-			foreach ( $this->state->stack_of_open_elements->walk_down() as $item ) {
-				if ( $is_above_formatting_element && $formatting_element->bookmark_name !== $item->bookmark_name ) {
-					continue;
-				}
-
-				if ( $is_above_formatting_element ) {
-					$is_above_formatting_element = false;
-					continue;
-				}
-
-				if ( self::is_special( $item->node_name ) ) {
-					$furthest_block = $item;
-					break;
-				}
-			}
-
-			/*
-			 * > If there is no furthest block, then the UA must first pop all the nodes from the bottom of the
-			 * > stack of open elements, from the current node up to and including formatting element, then
-			 * > remove formatting element from the list of active formatting elements, and finally return.
-			 */
-			if ( null === $furthest_block ) {
-				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
-					$this->state->stack_of_open_elements->pop();
-
-					if ( $formatting_element->bookmark_name === $item->bookmark_name ) {
-						$this->state->active_formatting_elements->remove_node( $formatting_element );
-						return;
-					}
-				}
-			}
-
-			$this->last_error = self::ERROR_UNSUPPORTED;
-			throw new WP_HTML_Unsupported_Exception( 'Cannot extract common ancestor in adoption agency algorithm.' );
-		}
-
-		$this->last_error = self::ERROR_UNSUPPORTED;
-		throw new WP_HTML_Unsupported_Exception( 'Cannot run adoption agency when looping required.' );
-	}
-
-	/**
-	 * Inserts an HTML element on the stack of open elements.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#insert-a-foreign-element
-	 *
-	 * @param WP_HTML_Token $token Name of bookmark pointing to element in original input HTML.
-	 */
-	private function insert_html_element( $token ) {
-		$this->state->stack_of_open_elements->push( $token );
-	}
-
-	/*
-	 * HTML Specification Helpers
-	 */
-
-	/**
-	 * Returns whether an element of a given name is in the HTML special category.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#special
-	 *
-	 * @param string $tag_name Name of element to check.
-	 * @return bool Whether the element of the given name is in the special category.
-	 */
-	public static function is_special( $tag_name ) {
-		$tag_name = strtoupper( $tag_name );
-
-		return (
-			'ADDRESS' === $tag_name ||
-			'APPLET' === $tag_name ||
-			'AREA' === $tag_name ||
-			'ARTICLE' === $tag_name ||
-			'ASIDE' === $tag_name ||
-			'BASE' === $tag_name ||
-			'BASEFONT' === $tag_name ||
-			'BGSOUND' === $tag_name ||
-			'BLOCKQUOTE' === $tag_name ||
-			'BODY' === $tag_name ||
-			'BR' === $tag_name ||
-			'BUTTON' === $tag_name ||
-			'CAPTION' === $tag_name ||
-			'CENTER' === $tag_name ||
-			'COL' === $tag_name ||
-			'COLGROUP' === $tag_name ||
-			'DD' === $tag_name ||
-			'DETAILS' === $tag_name ||
-			'DIR' === $tag_name ||
-			'DIV' === $tag_name ||
-			'DL' === $tag_name ||
-			'DT' === $tag_name ||
-			'EMBED' === $tag_name ||
-			'FIELDSET' === $tag_name ||
-			'FIGCAPTION' === $tag_name ||
-			'FIGURE' === $tag_name ||
-			'FOOTER' === $tag_name ||
-			'FORM' === $tag_name ||
-			'FRAME' === $tag_name ||
-			'FRAMESET' === $tag_name ||
-			'H1' === $tag_name ||
-			'H2' === $tag_name ||
-			'H3' === $tag_name ||
-			'H4' === $tag_name ||
-			'H5' === $tag_name ||
-			'H6' === $tag_name ||
-			'HEAD' === $tag_name ||
-			'HEADER' === $tag_name ||
-			'HGROUP' === $tag_name ||
-			'HR' === $tag_name ||
-			'HTML' === $tag_name ||
-			'IFRAME' === $tag_name ||
-			'IMG' === $tag_name ||
-			'INPUT' === $tag_name ||
-			'KEYGEN' === $tag_name ||
-			'LI' === $tag_name ||
-			'LINK' === $tag_name ||
-			'LISTING' === $tag_name ||
-			'MAIN' === $tag_name ||
-			'MARQUEE' === $tag_name ||
-			'MENU' === $tag_name ||
-			'META' === $tag_name ||
-			'NAV' === $tag_name ||
-			'NOEMBED' === $tag_name ||
-			'NOFRAMES' === $tag_name ||
-			'NOSCRIPT' === $tag_name ||
-			'OBJECT' === $tag_name ||
-			'OL' === $tag_name ||
-			'P' === $tag_name ||
-			'PARAM' === $tag_name ||
-			'PLAINTEXT' === $tag_name ||
-			'PRE' === $tag_name ||
-			'SCRIPT' === $tag_name ||
-			'SEARCH' === $tag_name ||
-			'SECTION' === $tag_name ||
-			'SELECT' === $tag_name ||
-			'SOURCE' === $tag_name ||
-			'STYLE' === $tag_name ||
-			'SUMMARY' === $tag_name ||
-			'TABLE' === $tag_name ||
-			'TBODY' === $tag_name ||
-			'TD' === $tag_name ||
-			'TEMPLATE' === $tag_name ||
-			'TEXTAREA' === $tag_name ||
-			'TFOOT' === $tag_name ||
-			'TH' === $tag_name ||
-			'THEAD' === $tag_name ||
-			'TITLE' === $tag_name ||
-			'TR' === $tag_name ||
-			'TRACK' === $tag_name ||
-			'UL' === $tag_name ||
-			'WBR' === $tag_name ||
-			'XMP' === $tag_name ||
-
-			// MathML.
-			'MI' === $tag_name ||
-			'MO' === $tag_name ||
-			'MN' === $tag_name ||
-			'MS' === $tag_name ||
-			'MTEXT' === $tag_name ||
-			'ANNOTATION-XML' === $tag_name ||
-
-			// SVG.
-			'FOREIGNOBJECT' === $tag_name ||
-			'DESC' === $tag_name ||
-			'TITLE' === $tag_name
-		);
-	}
-
-	/**
-	 * Returns whether a given element is an HTML Void Element
-	 *
-	 * > area, base, br, col, embed, hr, img, input, link, meta, source, track, wbr
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#void-elements
-	 *
-	 * @param string $tag_name Name of HTML tag to check.
-	 * @return bool Whether the given tag is an HTML Void Element.
-	 */
-	public static function is_void( $tag_name ) {
-		$tag_name = strtoupper( $tag_name );
-
-		return (
-			'AREA' === $tag_name ||
-			'BASE' === $tag_name ||
-			'BR' === $tag_name ||
-			'COL' === $tag_name ||
-			'EMBED' === $tag_name ||
-			'HR' === $tag_name ||
-			'IMG' === $tag_name ||
-			'INPUT' === $tag_name ||
-			'LINK' === $tag_name ||
-			'META' === $tag_name ||
-			'SOURCE' === $tag_name ||
-			'TRACK' === $tag_name ||
-			'WBR' === $tag_name
-		);
-	}
-
-	/*
-	 * Constants that would pollute the top of the class if they were found there.
-	 */
-
-	/**
-	 * Indicates that the next HTML token should be parsed and processed.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string
-	 */
-	const PROCESS_NEXT_NODE = 'process-next-node';
-
-	/**
-	 * Indicates that the current HTML token should be reprocessed in the newly-selected insertion mode.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string
-	 */
-	const REPROCESS_CURRENT_NODE = 'reprocess-current-node';
-
-	/**
-	 * Indicates that the parser encountered unsupported markup and has bailed.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string
-	 */
-	const ERROR_UNSUPPORTED = 'unsupported';
-
-	/**
-	 * Indicates that the parser encountered more HTML tokens than it
-	 * was able to process and has bailed.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string
-	 */
-	const ERROR_EXCEEDED_MAX_BOOKMARKS = 'exceeded-max-bookmarks';
-
-	/**
-	 * Unlock code that must be passed into the constructor to create this class.
-	 *
-	 * This class extends the WP_HTML_Tag_Processor, which has a public class
-	 * constructor. Therefore, it's not possible to have a private constructor here.
-	 *
-	 * This unlock code is used to ensure that anyone calling the constructor is
-	 * doing so with a full understanding that it's intended to be a private API.
-	 *
-	 * @access private
-	 */
-	const CONSTRUCTOR_UNLOCK_CODE = 'Use WP_HTML_Processor::create_fragment() instead of calling the class constructor directly.';
-}
diff --git a/lib/compat/wordpress-6.4/html-api/class-wp-html-token.php b/lib/compat/wordpress-6.4/html-api/class-wp-html-token.php
deleted file mode 100644
index 4975eb840437c6..00000000000000
--- a/lib/compat/wordpress-6.4/html-api/class-wp-html-token.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * HTML API: WP_HTML_Token class
- *
- * @package WordPress
- * @subpackage HTML-API
- * @since 6.4.0
- */
-
-if ( class_exists( 'WP_HTML_Token' ) ) {
-	return;
-}
-
-/**
- * Core class used by the HTML processor during HTML parsing
- * for referring to tokens in the input HTML string.
- *
- * This class is designed for internal use by the HTML processor.
- *
- * @since 6.4.0
- *
- * @access private
- *
- * @see WP_HTML_Processor
- */
-class WP_HTML_Token {
-	/**
-	 * Name of bookmark corresponding to source of token in input HTML string.
-	 *
-	 * Having a bookmark name does not imply that the token still exists. It
-	 * may be that the source token and underlying bookmark was wiped out by
-	 * some modification to the source HTML.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @var string
-	 */
-	public $bookmark_name = null;
-
-	/**
-	 * Name of node; lowercase names such as "marker" are not HTML elements.
-	 *
-	 * For HTML elements/tags this value should come from WP_HTML_Processor::get_tag().
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see WP_HTML_Processor::get_tag()
-	 *
-	 * @var string
-	 */
-	public $node_name = null;
-
-	/**
-	 * Whether node contains the self-closing flag.
-	 *
-	 * A node may have a self-closing flag when it shouldn't. This value
-	 * only reports if the flag is present in the original HTML.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @see https://html.spec.whatwg.org/#self-closing-flag
-	 *
-	 * @var bool
-	 */
-	public $has_self_closing_flag = false;
-
-	/**
-	 * Called when token is garbage-collected or otherwise destroyed.
-	 *
-	 * @var callable|null
-	 */
-	public $on_destroy = null;
-
-	/**
-	 * Constructor - creates a reference to a token in some external HTML string.
-	 *
-	 * @since 6.4.0
-	 *
-	 * @param string   $bookmark_name         Name of bookmark corresponding to location in HTML where token is found.
-	 * @param string   $node_name             Name of node token represents; if uppercase, an HTML element; if lowercase, a special value like "marker".
-	 * @param bool     $has_self_closing_flag Whether the source token contains the self-closing flag, regardless of whether it's valid.
-	 * @param callable $on_destroy            Function to call when destroying token, useful for releasing the bookmark.
-	 */
-	public function __construct( $bookmark_name, $node_name, $has_self_closing_flag, $on_destroy = null ) {
-		$this->bookmark_name         = $bookmark_name;
-		$this->node_name             = $node_name;
-		$this->has_self_closing_flag = $has_self_closing_flag;
-		$this->on_destroy            = $on_destroy;
-	}
-
-	/**
-	 * Destructor.
-	 *
-	 * @since 6.4.0
-	 */
-	public function __destruct() {
-		if ( is_callable( $this->on_destroy ) ) {
-			call_user_func( $this->on_destroy, $this->bookmark_name );
-		}
-	}
-}
diff --git a/lib/compat/wordpress-6.4/html-api/class-wp-html-unsupported-exception.php b/lib/compat/wordpress-6.4/html-api/class-wp-html-unsupported-exception.php
deleted file mode 100644
index 052ab649c0250e..00000000000000
--- a/lib/compat/wordpress-6.4/html-api/class-wp-html-unsupported-exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * HTML API: WP_HTML_Unsupported_Exception class
- *
- * @package WordPress
- * @subpackage HTML-API
- * @since 6.4.0
- */
-
-if ( class_exists( 'WP_HTML_Unsupported_Exception' ) ) {
-	return;
-}
-
-/**
- * Core class used by the HTML processor during HTML parsing
- * for indicating that a given operation is unsupported.
- *
- * This class is designed for internal use by the HTML processor.
- *
- * The HTML API aims to operate in compliance with the HTML5
- * specification, but does not implement the full specification.
- * In cases where it lacks support it should not cause breakage
- * or unexpected behavior. In the cases where it recognizes that
- * it cannot proceed, this class is used to abort from any
- * operation and signify that the given HTML cannot be processed.
- *
- * @since 6.4.0
- *
- * @access private
- *
- * @see WP_HTML_Processor
- */
-class WP_HTML_Unsupported_Exception extends Exception {
-
-}
diff --git a/lib/compat/wordpress-6.4/kses.php b/lib/compat/wordpress-6.4/kses.php
deleted file mode 100644
index 019d1cc9b06dbf..00000000000000
--- a/lib/compat/wordpress-6.4/kses.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Temporary compatibility shims for block APIs present in Gutenberg.
- *
- * @package gutenberg
- */
-
-/**
- * Update allowed inline style attributes list.
- *
- * @param string[] $attrs Array of allowed CSS attributes.
- * @return string[] CSS attributes.
- */
-function gutenberg_safe_style_attrs_6_4( $attrs ) {
-	$attrs[] = 'writing-mode';
-	return $attrs;
-}
-add_filter( 'safe_style_css', 'gutenberg_safe_style_attrs_6_4' );
diff --git a/lib/compat/wordpress-6.4/rest-api.php b/lib/compat/wordpress-6.4/rest-api.php
deleted file mode 100644
index 274eb3af945439..00000000000000
--- a/lib/compat/wordpress-6.4/rest-api.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * PHP and WordPress configuration compatibility functions for the Gutenberg
- * editor plugin changes related to REST API.
- *
- * @package gutenberg
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	die( 'Silence is golden.' );
-}
-
-/**
- * Registers the block patterns REST API routes.
- */
-function gutenberg_register_rest_block_patterns_routes() {
-	$block_patterns = new Gutenberg_REST_Block_Patterns_Controller();
-	$block_patterns->register_routes();
-}
-add_action( 'rest_api_init', 'gutenberg_register_rest_block_patterns_routes' );
diff --git a/lib/compat/wordpress-6.4/script-loader.php b/lib/compat/wordpress-6.4/script-loader.php
deleted file mode 100644
index dd7042d54e1799..00000000000000
--- a/lib/compat/wordpress-6.4/script-loader.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Updates the script-loader.php file
- *
- * @package gutenberg
- */
-
-/**
- * Updates the registered inline script `wp-date` required for moment.js localization.
- * Changes to the inline script output should be synced with Core in the file
- * src/wp-includes/script-loader.php in `wp_default_packages_inline_scripts()`.
- *
- * @since 6.4.0
- *
- * @global WP_Locale $wp_locale WordPress date and time locale object.
- *
- * @param WP_Scripts $scripts WP_Scripts object.
- */
-function gutenberg_update_wp_date_settings( $scripts ) {
-	if ( $scripts->query( 'wp-date', 'registered' ) ) {
-		global $wp_locale;
-		// Calculate the timezone abbr (EDT, PST) if possible.
-		$timezone_string = get_option( 'timezone_string', 'UTC' );
-		$timezone_abbr   = '';
-
-		if ( ! empty( $timezone_string ) ) {
-			$timezone_date = new DateTime( 'now', new DateTimeZone( $timezone_string ) );
-			$timezone_abbr = $timezone_date->format( 'T' );
-		}
-		$scripts->registered['wp-date']->extra['after'] = array(
-			false,
-			sprintf(
-				'wp.date.setSettings( %s );',
-				wp_json_encode(
-					array(
-						'l10n'     => array(
-							'locale'        => get_user_locale(),
-							'months'        => array_values( $wp_locale->month ),
-							'monthsShort'   => array_values( $wp_locale->month_abbrev ),
-							'weekdays'      => array_values( $wp_locale->weekday ),
-							'weekdaysShort' => array_values( $wp_locale->weekday_abbrev ),
-							'meridiem'      => (object) $wp_locale->meridiem,
-							'relative'      => array(
-								/* translators: %s: Duration. */
-								'future' => __( '%s from now', 'gutenberg' ),
-								/* translators: %s: Duration. */
-								'past'   => __( '%s ago', 'gutenberg' ),
-								/* translators: One second from or to a particular datetime, e.g., "a second ago" or "a second from now". */
-								's'      => __( 'a second', 'gutenberg' ),
-								/* translators: %s: Duration in seconds from or to a particular datetime, e.g., "4 seconds ago" or "4 seconds from now". */
-								'ss'     => __( '%d seconds', 'gutenberg' ),
-								/* translators: One minute from or to a particular datetime, e.g., "a minute ago" or "a minute from now". */
-								'm'      => __( 'a minute', 'gutenberg' ),
-								/* translators: %s: Duration in minutes from or to a particular datetime, e.g., "4 minutes ago" or "4 minutes from now". */
-								'mm'     => __( '%d minutes', 'gutenberg' ),
-								/* translators: %s: One hour from or to a particular datetime, e.g., "an hour ago" or "an hour from now". */
-								'h'      => __( 'an hour', 'gutenberg' ),
-								/* translators: %s: Duration in hours from or to a particular datetime, e.g., "4 hours ago" or "4 hours from now". */
-								'hh'     => __( '%d hours', 'gutenberg' ),
-								/* translators: %s: One day from or to a particular datetime, e.g., "a day ago" or "a day from now". */
-								'd'      => __( 'a day', 'gutenberg' ),
-								/* translators: %s: Duration in days from or to a particular datetime, e.g., "4 days ago" or "4 days from now". */
-								'dd'     => __( '%d days', 'gutenberg' ),
-								/* translators: %s: One month from or to a particular datetime, e.g., "a month ago" or "a month from now". */
-								'M'      => __( 'a month', 'gutenberg' ),
-								/* translators: %s: Duration in months from or to a particular datetime, e.g., "4 months ago" or "4 months from now". */
-								'MM'     => __( '%d months', 'gutenberg' ),
-								/* translators: %s: One year from or to a particular datetime, e.g., "a year ago" or "a year from now". */
-								'y'      => __( 'a year', 'gutenberg' ),
-								/* translators: %s: Duration in years from or to a particular datetime, e.g., "4 years ago" or "4 years from now". */
-								'yy'     => __( '%d years', 'gutenberg' ),
-							),
-							'startOfWeek'   => (int) get_option( 'start_of_week', 0 ),
-						),
-						'formats'  => array(
-							/* translators: Time format, see https://www.php.net/manual/datetime.format.php */
-							'time'                => get_option( 'time_format', __( 'g:i a', 'default' ) ),
-							/* translators: Date format, see https://www.php.net/manual/datetime.format.php */
-							'date'                => get_option( 'date_format', __( 'F j, Y', 'default' ) ),
-							/* translators: Date/Time format, see https://www.php.net/manual/datetime.format.php */
-							'datetime'            => __( 'F j, Y g:i a', 'default' ),
-							/* translators: Abbreviated date/time format, see https://www.php.net/manual/datetime.format.php */
-							'datetimeAbbreviated' => __( 'M j, Y g:i a', 'default' ),
-						),
-						'timezone' => array(
-							'offset' => (float) get_option( 'gmt_offset', 0 ),
-							'string' => $timezone_string,
-							'abbr'   => $timezone_abbr,
-						),
-					)
-				)
-			),
-		);
-	}
-}
-
-add_action( 'wp_default_scripts', 'gutenberg_update_wp_date_settings' );
-
-/**
- * Collect the block editor assets that need to be loaded into the editor's iframe.
- *
- * @since 6.0.0
- * @access private
- *
- * @return array {
- *     The block editor assets.
- *
- *     @type string|false $styles  String containing the HTML for styles.
- *     @type string|false $scripts String containing the HTML for scripts.
- * }
- */
-function _gutenberg_get_iframed_editor_assets_6_4() {
-	global $wp_styles, $wp_scripts;
-
-	// Keep track of the styles and scripts instance to restore later.
-	$current_wp_styles  = $wp_styles;
-	$current_wp_scripts = $wp_scripts;
-
-	// Create new instances to collect the assets.
-	$wp_styles  = new WP_Styles();
-	$wp_scripts = new WP_Scripts();
-
-	// Register all currently registered styles and scripts. The actions that
-	// follow enqueue assets, but don't necessarily register them.
-	$wp_styles->registered  = $current_wp_styles->registered;
-	$wp_scripts->registered = $current_wp_scripts->registered;
-
-	// We generally do not need reset styles for the iframed editor.
-	// However, if it's a classic theme, margins will be added to every block,
-	// which is reset specifically for list items, so classic themes rely on
-	// these reset styles.
-	$wp_styles->done =
-		wp_theme_has_theme_json() ? array( 'wp-reset-editor-styles' ) : array();
-
-	wp_enqueue_script( 'wp-polyfill' );
-	// Enqueue the `editorStyle` handles for all core block, and dependencies.
-	wp_enqueue_style( 'wp-edit-blocks' );
-
-	if ( current_theme_supports( 'wp-block-styles' ) ) {
-		wp_enqueue_style( 'wp-block-library-theme' );
-	}
-
-	// We don't want to load EDITOR scripts in the iframe, only enqueue
-	// front-end assets for the content.
-	add_filter( 'should_load_block_editor_scripts_and_styles', '__return_false' );
-	do_action( 'enqueue_block_assets' );
-	remove_filter( 'should_load_block_editor_scripts_and_styles', '__return_false' );
-
-	$block_registry = WP_Block_Type_Registry::get_instance();
-
-	// Additionally, do enqueue `editorStyle` assets for all blocks, which
-	// contains editor-only styling for blocks (editor content).
-	foreach ( $block_registry->get_all_registered() as $block_type ) {
-		if ( isset( $block_type->editor_style_handles ) && is_array( $block_type->editor_style_handles ) ) {
-			foreach ( $block_type->editor_style_handles as $style_handle ) {
-				wp_enqueue_style( $style_handle );
-			}
-		}
-	}
-
-	/**
-	 * Remove the deprecated `print_emoji_styles` handler.
-	 * It avoids breaking style generation with a deprecation message.
-	 */
-	$has_emoji_styles = has_action( 'wp_print_styles', 'print_emoji_styles' );
-	if ( $has_emoji_styles ) {
-		remove_action( 'wp_print_styles', 'print_emoji_styles' );
-	}
-
-	ob_start();
-	wp_print_styles();
-	$styles = ob_get_clean();
-
-	if ( $has_emoji_styles ) {
-		add_action( 'wp_print_styles', 'print_emoji_styles' );
-	}
-
-	ob_start();
-	wp_print_head_scripts();
-	wp_print_footer_scripts();
-	$scripts = ob_get_clean();
-
-	// Restore the original instances.
-	$wp_styles  = $current_wp_styles;
-	$wp_scripts = $current_wp_scripts;
-
-	return array(
-		'styles'  => $styles,
-		'scripts' => $scripts,
-	);
-}
-
-add_filter(
-	'block_editor_settings_all',
-	static function ( $settings ) {
-		// We must override what core is passing now.
-		$settings['__unstableResolvedAssets'] = _gutenberg_get_iframed_editor_assets_6_4();
-		return $settings;
-	}
-);
diff --git a/lib/compat/wordpress-6.4/theme-previews.php b/lib/compat/wordpress-6.4/theme-previews.php
deleted file mode 100644
index 5755fc992921d4..00000000000000
--- a/lib/compat/wordpress-6.4/theme-previews.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Enable theme previews in the Site Editor for block themes.
- *
- * @package gutenberg
- */
-
-/**
- * Allow developers to customize the back to dashboard link in the Site Editor
- *
- * @param array $settings The editor settings.
- * @return array The editor settings.
- */
-function gutenberg_theme_preview_block_editor_settings_all( $settings ) {
-	$settings['__experimentalDashboardLink']     = 'themes.php';
-	$settings['__experimentalDashboardLinkText'] = __( 'Go back to the theme showcase' );
-	return $settings;
-}
-
-/**
- * Attaches filters to enable theme previews in the Site Editor.
- * This would go inside of `initialize_theme_preview_hooks`
- * to avoid the global scope when we port this to the core.
- */
-if ( ! empty( $_GET['wp_theme_preview'] ) ) {
-	add_filter( 'block_editor_settings_all', 'gutenberg_theme_preview_block_editor_settings_all' );
-}
diff --git a/lib/compat/wordpress-6.5/block-patterns.php b/lib/compat/wordpress-6.5/block-patterns.php
deleted file mode 100644
index 4521d5e4e578f3..00000000000000
--- a/lib/compat/wordpress-6.5/block-patterns.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Extends Core's wp-includes/block-patterns.php to add new media related
- * pattern categories for WP 6.5.
- *
- * @package gutenberg
- */
-
-/**
- * Adds new pattern categories for better organization of media related patterns.
- *
- * Note: This should be removed when the minimum required WP version is >= 6.5.
- *
- * @return void
- */
-function gutenberg_register_media_pattern_categories() {
-	// Register new categories.
-	register_block_pattern_category(
-		'videos',
-		array(
-			'label'       => _x( 'Videos', 'Block pattern category' ),
-			'description' => __( 'Different layouts containing videos.' ),
-		)
-	);
-	register_block_pattern_category(
-		'audio',
-		array(
-			'label'       => _x( 'Audio', 'Block pattern category' ),
-			'description' => __( 'Different layouts containing audio.' ),
-		)
-	);
-}
-add_action( 'init', 'gutenberg_register_media_pattern_categories' );
diff --git a/lib/compat/wordpress-6.5/class-gutenberg-rest-global-styles-revisions-controller-6-5.php b/lib/compat/wordpress-6.5/class-gutenberg-rest-global-styles-revisions-controller-6-5.php
deleted file mode 100644
index e7b2ac85f6e525..00000000000000
--- a/lib/compat/wordpress-6.5/class-gutenberg-rest-global-styles-revisions-controller-6-5.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * REST API: Gutenberg_REST_Global_Styles_Revisions_Controller class, inspired by WP_REST_Revisions_Controller.
- *
- * @package WordPress
- * @subpackage REST_API
- * @since 6.3.0
- */
-
-/**
- * Core class used to access global styles revisions via the REST API.
- *
- * @since 6.3.0
- *
- * @see WP_REST_Controller
- */
-class Gutenberg_REST_Global_Styles_Revisions_Controller_6_5 extends Gutenberg_REST_Global_Styles_Revisions_Controller_6_4 {
-	/**
-	 * Registers the controller's routes.
-	 *
-	 * @since 6.3.0
-	 * @since 6.5.0 Adds route to fetch individual global styles revisions.
-	 */
-	public function register_routes() {
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base . '/(?P<id>[\d]+)',
-			array(
-				'args'   => array(
-					'parent' => array(
-						'description' => __( 'The ID for the parent of the global styles revision.' ),
-						'type'        => 'integer',
-					),
-					'id'     => array(
-						'description' => __( 'Unique identifier for the global styles revision.' ),
-						'type'        => 'integer',
-					),
-				),
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_item' ),
-					'permission_callback' => array( $this, 'get_item_permissions_check' ),
-					'args'                => array(
-						'context' => $this->get_context_param( array( 'default' => 'view' ) ),
-					),
-				),
-				'schema' => array( $this, 'get_public_item_schema' ),
-			)
-		);
-		parent::register_routes();
-	}
-
-	/**
-	 * Retrieves one global styles revision from the collection.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_item( $request ) {
-		$parent = $this->get_parent( $request['parent'] );
-		if ( is_wp_error( $parent ) ) {
-			return $parent;
-		}
-
-		$revision = $this->get_revision( $request['id'] );
-		if ( is_wp_error( $revision ) ) {
-			return $revision;
-		}
-
-		$response = $this->prepare_item_for_response( $revision, $request );
-		return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Get the global styles revision, if the ID is valid.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param int $id Supplied ID.
-	 * @return WP_Post|WP_Error Revision post object if ID is valid, WP_Error otherwise.
-	 */
-	protected function get_revision( $id ) {
-		$error = new WP_Error(
-			'rest_post_invalid_id',
-			__( 'Invalid revision ID.' ),
-			array( 'status' => 404 )
-		);
-
-		if ( (int) $id <= 0 ) {
-			return $error;
-		}
-
-		$revision = get_post( (int) $id );
-		if ( empty( $revision ) || empty( $revision->ID ) || 'revision' !== $revision->post_type ) {
-			return $error;
-		}
-
-		return $revision;
-	}
-}
diff --git a/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php b/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php
deleted file mode 100644
index 9c2314ebe6890c..00000000000000
--- a/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php
+++ /dev/null
@@ -1,646 +0,0 @@
-<?php
-/**
- * WP_Navigation_Block_Renderer class
- *
- * @package gutenberg
- * @since 6.5.0
- */
-
-if ( class_exists( 'WP_Navigation_Block_Renderer' ) ) {
-	return;
-}
-
-/**
- * Helper functions used to render the navigation block.
- */
-class WP_Navigation_Block_Renderer {
-	/**
-	 * Used to determine which blocks are wrapped in an <li>.
-	 *
-	 * @var array
-	 */
-	private static $nav_blocks_wrapped_in_list_item = array(
-		'core/navigation-link',
-		'core/home-link',
-		'core/site-title',
-		'core/site-logo',
-		'core/navigation-submenu',
-	);
-
-	/**
-	 * Used to determine which blocks need an <li> wrapper.
-	 *
-	 * @var array
-	 */
-	private static $needs_list_item_wrapper = array(
-		'core/site-title',
-		'core/site-logo',
-	);
-
-	/**
-	 * Keeps track of all the navigation names that have been seen.
-	 *
-	 * @var array
-	 */
-	private static $seen_menu_names = array();
-
-	/**
-	 * Returns whether or not this is responsive navigation.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return bool Returns whether or not this is responsive navigation.
-	 */
-	private static function is_responsive( $attributes ) {
-		/**
-		 * This is for backwards compatibility after the `isResponsive` attribute was been removed.
-		 */
-
-		$has_old_responsive_attribute = ! empty( $attributes['isResponsive'] ) && $attributes['isResponsive'];
-		return isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'] || $has_old_responsive_attribute;
-	}
-
-	/**
-	 * Returns whether or not a navigation has a submenu.
-	 *
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @return bool Returns whether or not a navigation has a submenu.
-	 */
-	private static function has_submenus( $inner_blocks ) {
-		foreach ( $inner_blocks as $inner_block ) {
-			$inner_block_content = $inner_block->render();
-			$p                   = new WP_HTML_Tag_Processor( $inner_block_content );
-			if ( $p->next_tag(
-				array(
-					'name'       => 'LI',
-					'class_name' => 'has-child',
-				)
-			) ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Determine whether to load the view script.
-	 *
-	 * @param array         $attributes   The block attributes.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @return bool Returns whether or not to load the view script.
-	 */
-	private static function should_load_view_script( $attributes, $inner_blocks ) {
-		$has_submenus       = static::has_submenus( $inner_blocks );
-		$is_responsive_menu = static::is_responsive( $attributes );
-		return ( $has_submenus && ( $attributes['openSubmenusOnClick'] || $attributes['showSubmenuIcon'] ) ) || $is_responsive_menu;
-	}
-
-	/**
-	 * Returns whether or not a block needs a list item wrapper.
-	 *
-	 * @param WP_Block $block The block.
-	 * @return bool Returns whether or not a block needs a list item wrapper.
-	 */
-	private static function does_block_need_a_list_item_wrapper( $block ) {
-		return in_array( $block->name, static::$needs_list_item_wrapper, true );
-	}
-
-	/**
-	 * Returns the markup for a single inner block.
-	 *
-	 * @param WP_Block $inner_block The inner block.
-	 * @return string Returns the markup for a single inner block.
-	 */
-	private static function get_markup_for_inner_block( $inner_block ) {
-		$inner_block_content = $inner_block->render();
-		if ( ! empty( $inner_block_content ) ) {
-			if ( static::does_block_need_a_list_item_wrapper( $inner_block ) ) {
-				return '<li class="wp-block-navigation-item">' . $inner_block_content . '</li>';
-			}
-
-			return $inner_block_content;
-		}
-	}
-
-	/**
-	 * Returns the html for the inner blocks of the navigation block.
-	 *
-	 * @param array         $attributes   The block attributes.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @return string Returns the html for the inner blocks of the navigation block.
-	 */
-	private static function get_inner_blocks_html( $attributes, $inner_blocks ) {
-		$has_submenus            = static::has_submenus( $inner_blocks );
-		$should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
-
-		$style                = static::get_styles( $attributes );
-		$class                = static::get_classes( $attributes );
-		$container_attributes = get_block_wrapper_attributes(
-			array(
-				'class' => 'wp-block-navigation__container ' . $class,
-				'style' => $style,
-			)
-		);
-
-		$inner_blocks_html = '';
-		$is_list_open      = false;
-
-		foreach ( $inner_blocks as $inner_block ) {
-			$is_list_item = in_array( $inner_block->name, static::$nav_blocks_wrapped_in_list_item, true );
-
-			if ( $is_list_item && ! $is_list_open ) {
-				$is_list_open       = true;
-				$inner_blocks_html .= sprintf(
-					'<ul %1$s>',
-					$container_attributes
-				);
-			}
-
-			if ( ! $is_list_item && $is_list_open ) {
-				$is_list_open       = false;
-				$inner_blocks_html .= '</ul>';
-			}
-
-			$inner_blocks_html .= static::get_markup_for_inner_block( $inner_block );
-		}
-
-		if ( $is_list_open ) {
-			$inner_blocks_html .= '</ul>';
-		}
-
-		// Add directives to the submenu if needed.
-		if ( $has_submenus && $should_load_view_script ) {
-			$tags              = new WP_HTML_Tag_Processor( $inner_blocks_html );
-			$inner_blocks_html = gutenberg_block_core_navigation_add_directives_to_submenu( $tags, $attributes );
-		}
-
-		return $inner_blocks_html;
-	}
-
-	/**
-	 * Gets the inner blocks for the navigation block from the navigation post.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return WP_Block_List Returns the inner blocks for the navigation block.
-	 */
-	private static function get_inner_blocks_from_navigation_post( $attributes ) {
-		$navigation_post = get_post( $attributes['ref'] );
-		if ( ! isset( $navigation_post ) ) {
-			return '';
-		}
-
-		// Only published posts are valid. If this is changed then a corresponding change
-		// must also be implemented in `use-navigation-menu.js`.
-		if ( 'publish' === $navigation_post->post_status ) {
-			$parsed_blocks = parse_blocks( $navigation_post->post_content );
-
-			// 'parse_blocks' includes a null block with '\n\n' as the content when
-			// it encounters whitespace. This code strips it.
-			$compacted_blocks = gutenberg_block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
-
-			// TODO - this uses the full navigation block attributes for the
-			// context which could be refined.
-			return new WP_Block_List( $compacted_blocks, $attributes );
-		}
-	}
-
-	/**
-	 * Gets the inner blocks for the navigation block from the fallback.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return WP_Block_List Returns the inner blocks for the navigation block.
-	 */
-	private static function get_inner_blocks_from_fallback( $attributes ) {
-		$fallback_blocks = gutenberg_block_core_navigation_get_fallback_blocks();
-
-		// Fallback my have been filtered so do basic test for validity.
-		if ( empty( $fallback_blocks ) || ! is_array( $fallback_blocks ) ) {
-			return '';
-		}
-
-		return new WP_Block_List( $fallback_blocks, $attributes );
-	}
-
-	/**
-	 * Gets the inner blocks for the navigation block.
-	 *
-	 * @param array    $attributes The block attributes.
-	 * @param WP_Block $block The parsed block.
-	 * @return WP_Block_List Returns the inner blocks for the navigation block.
-	 */
-	private static function get_inner_blocks( $attributes, $block ) {
-		$inner_blocks = $block->inner_blocks;
-
-		// Ensure that blocks saved with the legacy ref attribute name (navigationMenuId) continue to render.
-		if ( array_key_exists( 'navigationMenuId', $attributes ) ) {
-			$attributes['ref'] = $attributes['navigationMenuId'];
-		}
-
-		// If:
-		// - the gutenberg plugin is active
-		// - `__unstableLocation` is defined
-		// - we have menu items at the defined location
-		// - we don't have a relationship to a `wp_navigation` Post (via `ref`).
-		// ...then create inner blocks from the classic menu assigned to that location.
-		if (
-			defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN &&
-			array_key_exists( '__unstableLocation', $attributes ) &&
-			! array_key_exists( 'ref', $attributes ) &&
-			! empty( gutenberg_block_core_navigation_get_menu_items_at_location( $attributes['__unstableLocation'] ) )
-		) {
-			$inner_blocks = gutenberg_block_core_navigation_get_inner_blocks_from_unstable_location( $attributes );
-		}
-
-		// Load inner blocks from the navigation post.
-		if ( array_key_exists( 'ref', $attributes ) ) {
-			$inner_blocks = static::get_inner_blocks_from_navigation_post( $attributes );
-		}
-
-		// If there are no inner blocks then fallback to rendering an appropriate fallback.
-		if ( empty( $inner_blocks ) ) {
-			$inner_blocks = static::get_inner_blocks_from_fallback( $attributes );
-		}
-
-		/**
-		 * Filter navigation block $inner_blocks.
-		 * Allows modification of a navigation block menu items.
-		 *
-		 * @since 6.1.0
-		 *
-		 * @param \WP_Block_List $inner_blocks
-		 */
-		$inner_blocks = apply_filters( 'block_core_navigation_render_inner_blocks', $inner_blocks );
-
-		$post_ids = gutenberg_block_core_navigation_get_post_ids( $inner_blocks );
-		if ( $post_ids ) {
-			_prime_post_caches( $post_ids, false, false );
-		}
-
-		return $inner_blocks;
-	}
-
-	/**
-	 * Gets the name of the current navigation, if it has one.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns the name of the navigation.
-	 */
-	private static function get_navigation_name( $attributes ) {
-
-		$navigation_name = $attributes['ariaLabel'] ?? '';
-
-		// Load the navigation post.
-		if ( array_key_exists( 'ref', $attributes ) ) {
-			$navigation_post = get_post( $attributes['ref'] );
-			if ( ! isset( $navigation_post ) ) {
-				return $navigation_name;
-			}
-
-			// Only published posts are valid. If this is changed then a corresponding change
-			// must also be implemented in `use-navigation-menu.js`.
-			if ( 'publish' === $navigation_post->post_status ) {
-				$navigation_name = $navigation_post->post_title;
-
-				// This is used to count the number of times a navigation name has been seen,
-				// so that we can ensure every navigation has a unique id.
-				if ( isset( static::$seen_menu_names[ $navigation_name ] ) ) {
-					++static::$seen_menu_names[ $navigation_name ];
-				} else {
-					static::$seen_menu_names[ $navigation_name ] = 1;
-				}
-			}
-		}
-
-		return $navigation_name;
-	}
-
-	/**
-	 * Returns the layout class for the navigation block.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns the layout class for the navigation block.
-	 */
-	private static function get_layout_class( $attributes ) {
-		$layout_justification = array(
-			'left'          => 'items-justified-left',
-			'right'         => 'items-justified-right',
-			'center'        => 'items-justified-center',
-			'space-between' => 'items-justified-space-between',
-		);
-
-		$layout_class = '';
-		if (
-			isset( $attributes['layout']['justifyContent'] ) &&
-			isset( $layout_justification[ $attributes['layout']['justifyContent'] ] )
-		) {
-			$layout_class .= $layout_justification[ $attributes['layout']['justifyContent'] ];
-		}
-		if ( isset( $attributes['layout']['orientation'] ) && 'vertical' === $attributes['layout']['orientation'] ) {
-			$layout_class .= ' is-vertical';
-		}
-
-		if ( isset( $attributes['layout']['flexWrap'] ) && 'nowrap' === $attributes['layout']['flexWrap'] ) {
-			$layout_class .= ' no-wrap';
-		}
-		return $layout_class;
-	}
-
-	/**
-	 * Return classes for the navigation block.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns the classes for the navigation block.
-	 */
-	private static function get_classes( $attributes ) {
-		// Restore legacy classnames for submenu positioning.
-		$layout_class       = static::get_layout_class( $attributes );
-		$colors             = gutenberg_block_core_navigation_build_css_colors( $attributes );
-		$font_sizes         = gutenberg_block_core_navigation_build_css_font_sizes( $attributes );
-		$is_responsive_menu = static::is_responsive( $attributes );
-
-		// Manually add block support text decoration as CSS class.
-		$text_decoration       = $attributes['style']['typography']['textDecoration'] ?? null;
-		$text_decoration_class = sprintf( 'has-text-decoration-%s', $text_decoration );
-
-		$classes = array_merge(
-			$colors['css_classes'],
-			$font_sizes['css_classes'],
-			$is_responsive_menu ? array( 'is-responsive' ) : array(),
-			$layout_class ? array( $layout_class ) : array(),
-			$text_decoration ? array( $text_decoration_class ) : array()
-		);
-		return implode( ' ', $classes );
-	}
-
-	/**
-	 * Get styles for the navigation block.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns the styles for the navigation block.
-	 */
-	private static function get_styles( $attributes ) {
-		$colors       = gutenberg_block_core_navigation_build_css_colors( $attributes );
-		$font_sizes   = gutenberg_block_core_navigation_build_css_font_sizes( $attributes );
-		$block_styles = isset( $attributes['styles'] ) ? $attributes['styles'] : '';
-		return $block_styles . $colors['inline_styles'] . $font_sizes['inline_styles'];
-	}
-
-	/**
-	 * Get the responsive container markup
-	 *
-	 * @param array         $attributes The block attributes.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @param string        $inner_blocks_html The markup for the inner blocks.
-	 * @return string Returns the container markup.
-	 */
-	private static function get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html ) {
-		$should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
-		$colors                  = gutenberg_block_core_navigation_build_css_colors( $attributes );
-		$modal_unique_id         = wp_unique_id( 'modal-' );
-
-		$is_hidden_by_default = isset( $attributes['overlayMenu'] ) && 'always' === $attributes['overlayMenu'];
-
-		$responsive_container_classes = array(
-			'wp-block-navigation__responsive-container',
-			$is_hidden_by_default ? 'hidden-by-default' : '',
-			implode( ' ', $colors['overlay_css_classes'] ),
-		);
-		$open_button_classes          = array(
-			'wp-block-navigation__responsive-container-open',
-			$is_hidden_by_default ? 'always-shown' : '',
-		);
-
-		$should_display_icon_label = isset( $attributes['hasIcon'] ) && true === $attributes['hasIcon'];
-		$toggle_button_icon        = '<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><rect x="4" y="7.5" width="16" height="1.5" /><rect x="4" y="15" width="16" height="1.5" /></svg>';
-		if ( isset( $attributes['icon'] ) ) {
-			if ( 'menu' === $attributes['icon'] ) {
-				$toggle_button_icon = '<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 5v1.5h14V5H5zm0 7.8h14v-1.5H5v1.5zM5 19h14v-1.5H5V19z" /></svg>';
-			}
-		}
-		$toggle_button_content       = $should_display_icon_label ? $toggle_button_icon : __( 'Menu' );
-		$toggle_close_button_icon    = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg>';
-		$toggle_close_button_content = $should_display_icon_label ? $toggle_close_button_icon : __( 'Close' );
-		$toggle_aria_label_open      = $should_display_icon_label ? 'aria-label="' . __( 'Open menu' ) . '"' : ''; // Open button label.
-		$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
-
-		// Add Interactivity API directives to the markup if needed.
-		$open_button_directives          = '';
-		$responsive_container_directives = '';
-		$responsive_dialog_directives    = '';
-		$close_button_directives         = '';
-		if ( $should_load_view_script ) {
-			$open_button_directives          = '
-				data-wp-on--click="actions.openMenuOnClick"
-				data-wp-on--keydown="actions.handleMenuKeydown"
-			';
-			$responsive_container_directives = '
-				data-wp-class--has-modal-open="state.isMenuOpen"
-				data-wp-class--is-menu-open="state.isMenuOpen"
-				data-wp-watch="callbacks.initMenu"
-				data-wp-on--keydown="actions.handleMenuKeydown"
-				data-wp-on--focusout="actions.handleMenuFocusout"
-				tabindex="-1"
-			';
-			$responsive_dialog_directives    = '
-				data-wp-bind--aria-modal="state.ariaModal"
-				data-wp-bind--aria-label="state.ariaLabel"
-				data-wp-bind--role="state.roleAttribute"
-				data-wp-watch="callbacks.focusFirstElement"
-			';
-			$close_button_directives         = '
-				data-wp-on--click="actions.closeMenuOnClick"
-			';
-		}
-
-		return sprintf(
-			'<button aria-haspopup="dialog" %3$s class="%6$s" %10$s>%8$s</button>
-				<div class="%5$s" style="%7$s" id="%1$s" %11$s>
-					<div class="wp-block-navigation__responsive-close" tabindex="-1">
-						<div class="wp-block-navigation__responsive-dialog" %12$s>
-							<button %4$s class="wp-block-navigation__responsive-container-close" %13$s>%9$s</button>
-							<div class="wp-block-navigation__responsive-container-content" id="%1$s-content">
-								%2$s
-							</div>
-						</div>
-					</div>
-				</div>',
-			esc_attr( $modal_unique_id ),
-			$inner_blocks_html,
-			$toggle_aria_label_open,
-			$toggle_aria_label_close,
-			esc_attr( implode( ' ', $responsive_container_classes ) ),
-			esc_attr( implode( ' ', $open_button_classes ) ),
-			esc_attr( safecss_filter_attr( $colors['overlay_inline_styles'] ) ),
-			$toggle_button_content,
-			$toggle_close_button_content,
-			$open_button_directives,
-			$responsive_container_directives,
-			$responsive_dialog_directives,
-			$close_button_directives
-		);
-	}
-
-	/**
-	 * Get the wrapper attributes
-	 *
-	 * @param array         $attributes    The block attributes.
-	 * @param WP_Block_List $inner_blocks  A list of inner blocks.
-	 * @return string Returns the navigation block markup.
-	 */
-	private static function get_nav_wrapper_attributes( $attributes, $inner_blocks ) {
-		$nav_menu_name           = static::get_unique_navigation_name( $attributes );
-		$should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
-		$is_responsive_menu      = static::is_responsive( $attributes );
-		$style                   = static::get_styles( $attributes );
-		$class                   = static::get_classes( $attributes );
-		$wrapper_attributes      = get_block_wrapper_attributes(
-			array(
-				'class'      => $class,
-				'style'      => $style,
-				'aria-label' => $nav_menu_name,
-			)
-		);
-
-		if ( $is_responsive_menu ) {
-			$nav_element_directives = static::get_nav_element_directives( $should_load_view_script );
-			$wrapper_attributes    .= ' ' . $nav_element_directives;
-		}
-
-		return $wrapper_attributes;
-	}
-
-	/**
-	 * Get the nav element directives
-	 *
-	 * @param bool $should_load_view_script Whether or not the view script should be loaded.
-	 * @return string the directives for the navigation element.
-	 */
-	private static function get_nav_element_directives( $should_load_view_script ) {
-		if ( ! $should_load_view_script ) {
-			return '';
-		}
-		// When adding to this array be mindful of security concerns.
-		$nav_element_context = wp_json_encode(
-			array(
-				'overlayOpenedBy' => array(),
-				'type'            => 'overlay',
-				'roleAttribute'   => '',
-				'ariaLabel'       => __( 'Menu' ),
-			),
-			JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP
-		);
-		return '
-			data-wp-interactive=\'{"namespace":"core/navigation"}\'
-			data-wp-context=\'' . $nav_element_context . '\'
-		';
-	}
-
-	/**
-	 * Handle view script loading.
-	 *
-	 * @param array         $attributes   The block attributes.
-	 * @param WP_Block      $block        The parsed block.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 */
-	private static function handle_view_script_loading( $attributes, $block, $inner_blocks ) {
-		$should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
-		$is_gutenberg_plugin     = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-		$view_js_file            = 'wp-block-navigation-view';
-		$script_handles          = $block->block_type->view_script_handles;
-
-		if ( $is_gutenberg_plugin ) {
-			if ( $should_load_view_script ) {
-				gutenberg_enqueue_module( '@wordpress/block-library/navigation-block' );
-			}
-			// Remove the view script because we are using the module.
-			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-		} else {
-			// If the script already exists, there is no point in removing it from viewScript.
-			if ( ! wp_script_is( $view_js_file ) ) {
-
-				// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-				if ( ! $should_load_view_script && in_array( $view_js_file, $script_handles, true ) ) {
-					$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-				}
-				// If the script is needed, but it was previously removed, add it again.
-				if ( $should_load_view_script && ! in_array( $view_js_file, $script_handles, true ) ) {
-					$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the markup for the navigation block.
-	 *
-	 * @param array         $attributes The block attributes.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @return string Returns the navigation wrapper markup.
-	 */
-	private static function get_wrapper_markup( $attributes, $inner_blocks ) {
-		$inner_blocks_html = static::get_inner_blocks_html( $attributes, $inner_blocks );
-		if ( static::is_responsive( $attributes ) ) {
-			return static::get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html );
-		}
-		return $inner_blocks_html;
-	}
-
-	/**
-	 * Returns a unique name for the navigation.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns a unique name for the navigation.
-	 */
-	private static function get_unique_navigation_name( $attributes ) {
-		$nav_menu_name = static::get_navigation_name( $attributes );
-
-		// If the menu name has been used previously then append an ID
-		// to the name to ensure uniqueness across a given post.
-		if ( isset( static::$seen_menu_names[ $nav_menu_name ] ) && static::$seen_menu_names[ $nav_menu_name ] > 1 ) {
-			$count         = static::$seen_menu_names[ $nav_menu_name ];
-			$nav_menu_name = $nav_menu_name . ' ' . ( $count );
-		}
-
-		return $nav_menu_name;
-	}
-
-	/**
-	 * Renders the navigation block.
-	 *
-	 * @param array    $attributes The block attributes.
-	 * @param string   $content    The saved content.
-	 * @param WP_Block $block      The parsed block.
-	 * @return string Returns the navigation block markup.
-	 */
-	public static function render( $attributes, $content, $block ) {
-		/**
-		 * Deprecated:
-		 * The rgbTextColor and rgbBackgroundColor attributes
-		 * have been deprecated in favor of
-		 * customTextColor and customBackgroundColor ones.
-		 * Move the values from old attrs to the new ones.
-		 */
-		if ( isset( $attributes['rgbTextColor'] ) && empty( $attributes['textColor'] ) ) {
-			$attributes['customTextColor'] = $attributes['rgbTextColor'];
-		}
-
-		if ( isset( $attributes['rgbBackgroundColor'] ) && empty( $attributes['backgroundColor'] ) ) {
-			$attributes['customBackgroundColor'] = $attributes['rgbBackgroundColor'];
-		}
-
-		unset( $attributes['rgbTextColor'], $attributes['rgbBackgroundColor'] );
-
-		$inner_blocks = static::get_inner_blocks( $attributes, $block );
-		// Prevent navigation blocks referencing themselves from rendering.
-		if ( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) ) {
-			return '';
-		}
-
-		static::handle_view_script_loading( $attributes, $block, $inner_blocks );
-
-		return sprintf(
-			'<nav %1$s>%2$s</nav>',
-			static::get_nav_wrapper_attributes( $attributes, $inner_blocks ),
-			static::get_wrapper_markup( $attributes, $inner_blocks )
-		);
-	}
-}
diff --git a/lib/compat/wordpress-6.5/rest-api.php b/lib/compat/wordpress-6.5/rest-api.php
deleted file mode 100644
index 3b82815c41e420..00000000000000
--- a/lib/compat/wordpress-6.5/rest-api.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * PHP and WordPress configuration compatibility functions for the Gutenberg
- * editor plugin changes related to REST API.
- *
- * @package gutenberg
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	die( 'Silence is golden.' );
-}
-
-/**
- * Registers the Global Styles Revisions REST API routes.
- */
-function gutenberg_register_global_styles_revisions_endpoints() {
-	$global_styles_revisions_controller = new Gutenberg_REST_Global_Styles_Revisions_Controller_6_5();
-	$global_styles_revisions_controller->register_routes();
-}
-
-add_action( 'rest_api_init', 'gutenberg_register_global_styles_revisions_endpoints' );
-
-/**
- * Registers additional fields for wp_template and wp_template_part rest api.
- *
- * @access private
- * @internal
- *
- * @param  array $template_object Template object.
- * @return string                 Original source of the template one of theme, plugin, site, or user.
- */
-function _gutenberg_get_wp_templates_original_source_field( $template_object ) {
-	if ( 'wp_template' === $template_object['type'] || 'wp_template_part' === $template_object['type'] ) {
-		// Added by theme.
-		// Template originally provided by a theme, but customized by a user.
-		// Templates originally didn't have the 'origin' field so identify
-		// older customized templates by checking for no origin and a 'theme'
-		// or 'custom' source.
-		if ( $template_object['has_theme_file'] &&
-			( 'theme' === $template_object['origin'] || (
-				empty( $template_object['origin'] ) && in_array(
-					$template_object['source'],
-					array(
-						'theme',
-						'custom',
-					),
-					true
-				) )
-			)
-		) {
-			return 'theme';
-		}
-
-		// Added by plugin.
-		if ( $template_object['has_theme_file'] && 'plugin' === $template_object['origin'] ) {
-			return 'plugin';
-		}
-
-		// Added by site.
-		// Template was created from scratch, but has no author. Author support
-		// was only added to templates in WordPress 5.9. Fallback to showing the
-		// site logo and title.
-		if ( empty( $template_object['has_theme_file'] ) && 'custom' === $template_object['source'] && empty( $template_object['author'] ) ) {
-			return 'site';
-		}
-	}
-
-	// Added by user.
-	return 'user';
-}
-
-/**
- * Registers additional fields for wp_template and wp_template_part rest api.
- *
- * @access private
- * @internal
- *
- * @param  array $template_object Template object.
- * @return string                 Human readable text for the author.
- */
-function _gutenberg_get_wp_templates_author_text_field( $template_object ) {
-	$original_source = _gutenberg_get_wp_templates_original_source_field( $template_object );
-	switch ( $original_source ) {
-		case 'theme':
-			$theme_name = wp_get_theme( $template_object['theme'] )->get( 'Name' );
-			return empty( $theme_name ) ? $template_object['theme'] : $theme_name;
-		case 'plugin':
-			$plugins = get_plugins();
-			$plugin  = $plugins[ plugin_basename( sanitize_text_field( $template_object['theme'] . '.php' ) ) ];
-			return empty( $plugin['Name'] ) ? $template_object['theme'] : $plugin['Name'];
-		case 'site':
-			return get_bloginfo( 'name' );
-		case 'user':
-			return get_user_by( 'id', $template_object['author'] )->get( 'display_name' );
-	}
-}
-
-/**
- * Registers additional fields for wp_template and wp_template_part rest api.
- *
- * @access private
- * @internal
- */
-function _gutenberg_register_wp_templates_additional_fields() {
-	register_rest_field(
-		array( 'wp_template', 'wp_template_part' ),
-		'author_text',
-		array(
-			'get_callback'    => '_gutenberg_get_wp_templates_author_text_field',
-			'update_callback' => null,
-			'schema'          => array(
-				'type'        => 'string',
-				'description' => __( 'Human readable text for the author.', 'gutenberg' ),
-				'readonly'    => true,
-				'context'     => array( 'view', 'edit', 'embed' ),
-			),
-		)
-	);
-
-	register_rest_field(
-		array( 'wp_template', 'wp_template_part' ),
-		'original_source',
-		array(
-			'get_callback'    => '_gutenberg_get_wp_templates_original_source_field',
-			'update_callback' => null,
-			'schema'          => array(
-				'description' => __( 'Where the template originally comes from e.g. \'theme\'', 'gutenberg' ),
-				'type'        => 'string',
-				'readonly'    => true,
-				'context'     => array( 'view', 'edit', 'embed' ),
-				'enum'        => array(
-					'theme',
-					'plugin',
-					'site',
-					'user',
-				),
-			),
-		)
-	);
-}
-
-add_action( 'rest_api_init', '_gutenberg_register_wp_templates_additional_fields' );
diff --git a/lib/compat/wordpress-6.6/admin-bar.php b/lib/compat/wordpress-6.6/admin-bar.php
new file mode 100644
index 00000000000000..b7a77faebea72a
--- /dev/null
+++ b/lib/compat/wordpress-6.6/admin-bar.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Changes to the WordPress admin bar.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Adds the "Site Editor" link to the Toolbar.
+ *
+ * @since 5.9.0
+ * @since 6.3.0 Added `$_wp_current_template_id` global for editing of current template directly from the admin bar.
+ * @since 6.6.0 Added the canvas argument to the url.
+ *
+ * @global string $_wp_current_template_id
+ *
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
+ */
+function gutenberg_admin_bar_edit_site_menu( $wp_admin_bar ) {
+	global $_wp_current_template_id;
+
+	// Don't show if a block theme is not activated.
+	if ( ! wp_is_block_theme() ) {
+		return;
+	}
+
+	// Don't show for users who can't edit theme options or when in the admin.
+	if ( ! current_user_can( 'edit_theme_options' ) || is_admin() || ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) ) {
+		return;
+	}
+
+	$wp_admin_bar->add_node(
+		array(
+			'id'    => 'site-editor',
+			'title' => __( 'Edit site' ),
+			'href'  => add_query_arg(
+				array(
+					'postType' => 'wp_template',
+					'postId'   => $_wp_current_template_id,
+					'canvas'   => 'edit',
+				),
+				admin_url( 'site-editor.php' )
+			),
+		)
+	);
+}
+remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_site_menu', 40 );
+add_action( 'admin_bar_menu', 'gutenberg_admin_bar_edit_site_menu', 41 );
diff --git a/lib/compat/wordpress-6.6/block-bindings/pattern-overrides.php b/lib/compat/wordpress-6.6/block-bindings/pattern-overrides.php
new file mode 100644
index 00000000000000..e5f9891f04c471
--- /dev/null
+++ b/lib/compat/wordpress-6.6/block-bindings/pattern-overrides.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Pattern Overrides source for the Block Bindings.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Gets value for the Pattern Overrides source.
+ *
+ * @param array    $source_args    Array containing source arguments used to look up the override value.
+ *                                 Example: array( "key" => "foo" ).
+ * @param WP_Block $block_instance The block instance.
+ * @param string   $attribute_name The name of the target attribute.
+ * @return mixed The value computed for the source.
+ */
+function gutenberg_block_bindings_pattern_overrides_callback( $source_attrs, $block_instance, $attribute_name ) {
+	if ( ! isset( $block_instance->context['pattern/overrides'] ) ) {
+		return null;
+	}
+
+	$override_content = $block_instance->context['pattern/overrides'];
+
+	// Back compat. Pattern overrides previously used a metadata `id` instead of `name`.
+	// We check first for the name, and if it exists, use that value.
+	if ( isset( $block_instance->attributes['metadata']['name'] ) ) {
+		$metadata_name = $block_instance->attributes['metadata']['name'];
+		if ( array_key_exists( $metadata_name, $override_content ) ) {
+			return _wp_array_get( $override_content, array( $metadata_name, $attribute_name ), null );
+		}
+	}
+
+	// Next check for the `id`.
+	if ( isset( $block_instance->attributes['metadata']['id'] ) ) {
+		$metadata_id = $block_instance->attributes['metadata']['id'];
+		if ( array_key_exists( $metadata_id, $override_content ) ) {
+			return _wp_array_get( $override_content, array( $metadata_id, $attribute_name ), null );
+		}
+	}
+
+	return null;
+}
+
+/**
+ * Registers Pattern Overrides source in the Block Bindings registry.
+ */
+function gutenberg_register_block_bindings_pattern_overrides_source() {
+	// Override the "core/pattern-overrides" source from core.
+	if ( array_key_exists( 'core/pattern-overrides', get_all_registered_block_bindings_sources() ) ) {
+		unregister_block_bindings_source( 'core/pattern-overrides' );
+	}
+	register_block_bindings_source(
+		'core/pattern-overrides',
+		array(
+			'label'              => _x( 'Pattern Overrides', 'block bindings source' ),
+			'get_value_callback' => 'gutenberg_block_bindings_pattern_overrides_callback',
+			'uses_context'       => array( 'pattern/overrides' ),
+		)
+	);
+}
+
+add_action( 'init', 'gutenberg_register_block_bindings_pattern_overrides_source' );
diff --git a/lib/compat/wordpress-6.6/block-editor.php b/lib/compat/wordpress-6.6/block-editor.php
new file mode 100644
index 00000000000000..6253f6a0adca4f
--- /dev/null
+++ b/lib/compat/wordpress-6.6/block-editor.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Block Editor API.
+ *
+ * @package Gutenberg
+ * @subpackage Editor
+ */
+
+/**
+ * Returns the classic theme supports settings for block editor.
+ *
+ * @since 6.2.0
+ * @since 6.6.0 Add support for custom spacing sizes.
+ *
+ * @return array The classic theme supports settings.
+ */
+function gutenberg_get_classic_theme_supports_block_editor_settings() {
+	$theme_settings = array(
+		'disableCustomColors'    => get_theme_support( 'disable-custom-colors' ),
+		'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ),
+		'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ),
+		'disableLayoutStyles'    => get_theme_support( 'disable-layout-styles' ),
+		'enableCustomLineHeight' => get_theme_support( 'custom-line-height' ),
+		'enableCustomSpacing'    => get_theme_support( 'custom-spacing' ),
+		'enableCustomUnits'      => get_theme_support( 'custom-units' ),
+	);
+
+	// Theme settings.
+	$color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
+	if ( false !== $color_palette ) {
+		$theme_settings['colors'] = $color_palette;
+	}
+
+	$font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) );
+	if ( false !== $font_sizes ) {
+		$theme_settings['fontSizes'] = $font_sizes;
+	}
+
+	$gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) );
+	if ( false !== $gradient_presets ) {
+		$theme_settings['gradients'] = $gradient_presets;
+	}
+
+	$spacing_sizes = current( (array) get_theme_support( 'editor-spacing-sizes' ) );
+	if ( false !== $spacing_sizes ) {
+		$theme_settings['spacingSizes'] = $spacing_sizes;
+	}
+
+	return $theme_settings;
+}
diff --git a/lib/compat/wordpress-6.6/block-template-utils.php b/lib/compat/wordpress-6.6/block-template-utils.php
new file mode 100644
index 00000000000000..953f6bf20c077e
--- /dev/null
+++ b/lib/compat/wordpress-6.6/block-template-utils.php
@@ -0,0 +1,362 @@
+<?php
+/**
+ * Utilities used to fetch and create templates and template parts.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Gets the template hierarchy for the given template slug to be created.
+ *
+ * Note: Always add `index` as the last fallback template.
+ *
+ *
+ * @param string $slug            The template slug to be created.
+ * @param bool   $is_custom       Optional. Indicates if a template is custom or
+ *                                part of the template hierarchy. Default false.
+ * @param string $template_prefix Optional. The template prefix for the created template.
+ *                                Used to extract the main template type, e.g.
+ *                                in `taxonomy-books` the `taxonomy` is extracted.
+ *                                Default empty string.
+ * @return string[] The template hierarchy.
+ */
+function gutenberg_get_template_hierarchy( $slug, $is_custom = false, $template_prefix = '' ) {
+	if ( 'index' === $slug ) {
+		/** This filter is documented in wp-includes/template.php */
+		return apply_filters( 'index_template_hierarchy', array( 'index' ) );
+	}
+	if ( $is_custom ) {
+		/** This filter is documented in wp-includes/template.php */
+		return apply_filters( 'page_template_hierarchy', array( 'page', 'singular', 'index' ) );
+	}
+	if ( 'front-page' === $slug ) {
+		/** This filter is documented in wp-includes/template.php */
+		return apply_filters( 'frontpage_template_hierarchy', array( 'front-page', 'home', 'index' ) );
+	}
+
+	$matches = array();
+
+	$template_hierarchy = array( $slug );
+	// Most default templates don't have `$template_prefix` assigned.
+	if ( ! empty( $template_prefix ) ) {
+		list( $type ) = explode( '-', $template_prefix );
+		// We need these checks because we always add the `$slug` above.
+		if ( ! in_array( $template_prefix, array( $slug, $type ), true ) ) {
+			$template_hierarchy[] = $template_prefix;
+		}
+		if ( $slug !== $type ) {
+			$template_hierarchy[] = $type;
+		}
+	} elseif ( preg_match( '/^(author|category|archive|tag|page)-.+$/', $slug, $matches ) ) {
+		$template_hierarchy[] = $matches[1];
+	} elseif ( preg_match( '/^(taxonomy|single)-(.+)$/', $slug, $matches ) ) {
+		$type           = $matches[1];
+		$slug_remaining = $matches[2];
+
+		$items = 'single' === $type ? get_post_types() : get_taxonomies();
+		foreach ( $items as $item ) {
+			if ( ! str_starts_with( $slug_remaining, $item ) ) {
+					continue;
+			}
+
+			// If $slug_remaining is equal to $post_type or $taxonomy we have
+			// the single-$post_type template or the taxonomy-$taxonomy template.
+			if ( $slug_remaining === $item ) {
+				$template_hierarchy[] = $type;
+				break;
+			}
+
+			// If $slug_remaining is single-$post_type-$slug template.
+			if ( strlen( $slug_remaining ) > strlen( $item ) + 1 ) {
+				$template_hierarchy[] = "$type-$item";
+				$template_hierarchy[] = $type;
+				break;
+			}
+		}
+	}
+	// Handle `archive` template.
+	if (
+		str_starts_with( $slug, 'author' ) ||
+		str_starts_with( $slug, 'taxonomy' ) ||
+		str_starts_with( $slug, 'category' ) ||
+		str_starts_with( $slug, 'tag' ) ||
+		'date' === $slug
+	) {
+		$template_hierarchy[] = 'archive';
+	}
+	// Handle `single` template.
+	if ( 'attachment' === $slug ) {
+		$template_hierarchy[] = 'single';
+	}
+	// Handle `singular` template.
+	if (
+		str_starts_with( $slug, 'single' ) ||
+		str_starts_with( $slug, 'page' ) ||
+		'attachment' === $slug
+	) {
+		$template_hierarchy[] = 'singular';
+	}
+	$template_hierarchy[] = 'index';
+
+	$template_type = '';
+	if ( ! empty( $template_prefix ) ) {
+		list( $template_type ) = explode( '-', $template_prefix );
+	} else {
+		list( $template_type ) = explode( '-', $slug );
+	}
+	$valid_template_types = array( '404', 'archive', 'attachment', 'author', 'category', 'date', 'embed', 'frontpage', 'home', 'index', 'page', 'paged', 'privacypolicy', 'search', 'single', 'singular', 'tag', 'taxonomy' );
+	if ( in_array( $template_type, $valid_template_types, true ) ) {
+		/** This filter is documented in wp-includes/template.php */
+		return apply_filters( "{$template_type}_template_hierarchy", $template_hierarchy );
+	}
+	return $template_hierarchy;
+}
+
+/**
+ * Retrieves the template files from the theme.
+ *
+ * @since 5.9.0
+ * @since 6.3.0 Added the `$query` parameter.
+ * @access private
+ *
+ * @param string $template_type Template type. Either 'wp_template' or 'wp_template_part'.
+ * @param array  $query {
+ *     Arguments to retrieve templates. Optional, empty by default.
+ *
+ *     @type string[] $slug__in     List of slugs to include.
+ *     @type string[] $slug__not_in List of slugs to skip.
+ *     @type string   $area         A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
+ *     @type string   $post_type    Post type to get the templates for.
+ * }
+ *
+ * @return array Template
+ */
+function _gutenberg_get_block_templates_files( $template_type, $query = array() ) {
+	if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) {
+		return null;
+	}
+
+	// @core-merge: This code will go into Core's '_get_block_templates_files' function.
+	$default_template_types = array();
+	if ( 'wp_template' === $template_type ) {
+		$default_template_types = get_default_block_template_types();
+	}
+	// @core-merge: End of the code that will go into Core.
+
+	// Prepare metadata from $query.
+	$slugs_to_include = isset( $query['slug__in'] ) ? $query['slug__in'] : array();
+	$slugs_to_skip    = isset( $query['slug__not_in'] ) ? $query['slug__not_in'] : array();
+	$area             = isset( $query['area'] ) ? $query['area'] : null;
+	$post_type        = isset( $query['post_type'] ) ? $query['post_type'] : '';
+
+	$stylesheet = get_stylesheet();
+	$template   = get_template();
+	$themes     = array(
+		$stylesheet => get_stylesheet_directory(),
+	);
+	// Add the parent theme if it's not the same as the current theme.
+	if ( $stylesheet !== $template ) {
+		$themes[ $template ] = get_template_directory();
+	}
+	$template_files = array();
+	foreach ( $themes as $theme_slug => $theme_dir ) {
+		$template_base_paths  = get_block_theme_folders( $theme_slug );
+		$theme_template_files = _get_block_templates_paths( $theme_dir . '/' . $template_base_paths[ $template_type ] );
+		foreach ( $theme_template_files as $template_file ) {
+			$template_base_path = $template_base_paths[ $template_type ];
+			$template_slug      = substr(
+				$template_file,
+				// Starting position of slug.
+				strpos( $template_file, $template_base_path . DIRECTORY_SEPARATOR ) + 1 + strlen( $template_base_path ),
+				// Subtract ending '.html'.
+				-5
+			);
+
+			// Skip this item if its slug doesn't match any of the slugs to include.
+			if ( ! empty( $slugs_to_include ) && ! in_array( $template_slug, $slugs_to_include, true ) ) {
+				continue;
+			}
+
+			// Skip this item if its slug matches any of the slugs to skip.
+			if ( ! empty( $slugs_to_skip ) && in_array( $template_slug, $slugs_to_skip, true ) ) {
+				continue;
+			}
+
+			/*
+			 * The child theme items (stylesheet) are processed before the parent theme's (template).
+			 * If a child theme defines a template, prevent the parent template from being added to the list as well.
+			 */
+			if ( isset( $template_files[ $template_slug ] ) ) {
+				continue;
+			}
+
+			$new_template_item = array(
+				'slug'  => $template_slug,
+				'path'  => $template_file,
+				'theme' => $theme_slug,
+				'type'  => $template_type,
+			);
+
+			if ( 'wp_template_part' === $template_type ) {
+				$candidate = _add_block_template_part_area_info( $new_template_item );
+				if ( ! isset( $area ) || ( isset( $area ) && $area === $candidate['area'] ) ) {
+					$template_files[ $template_slug ] = $candidate;
+				}
+			}
+
+			if ( 'wp_template' === $template_type ) {
+				$candidate = _add_block_template_info( $new_template_item );
+				$is_custom = ! isset( $default_template_types[ $candidate['slug'] ] );
+
+				if (
+					! $post_type ||
+					( $post_type && isset( $candidate['postTypes'] ) && in_array( $post_type, $candidate['postTypes'], true ) )
+				) {
+					$template_files[ $template_slug ] = $candidate;
+				}
+
+				// @core-merge: This code will go into Core's '_get_block_templates_files' function.
+				// The custom templates with no associated post-types are available for all post-types.
+				if ( $post_type && ! isset( $candidate['postTypes'] ) && $is_custom ) {
+					$template_files[ $template_slug ] = $candidate;
+				}
+				// @core-merge: End of the code that will go into Core.
+			}
+		}
+	}
+
+	return array_values( $template_files );
+}
+
+/**
+ * Retrieves a list of unified template objects based on a query.
+ *
+ * @since 5.8.0
+ *
+ * @param array  $query {
+ *     Optional. Arguments to retrieve templates.
+ *
+ *     @type string[] $slug__in  List of slugs to include.
+ *     @type int      $wp_id     Post ID of customized template.
+ *     @type string   $area      A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
+ *     @type string   $post_type Post type to get the templates for.
+ * }
+ * @param string $template_type Template type. Either 'wp_template' or 'wp_template_part'.
+ * @return WP_Block_Template[] Array of block templates.
+ */
+function gutenberg_get_block_templates( $query = array(), $template_type = 'wp_template' ) {
+	/**
+	 * Filters the block templates array before the query takes place.
+	 *
+	 * Return a non-null value to bypass the WordPress queries.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @param WP_Block_Template[]|null $block_templates Return an array of block templates to short-circuit the default query,
+	 *                                                  or null to allow WP to run its normal queries.
+	 * @param array  $query {
+	 *     Arguments to retrieve templates. All arguments are optional.
+	 *
+	 *     @type string[] $slug__in  List of slugs to include.
+	 *     @type int      $wp_id     Post ID of customized template.
+	 *     @type string   $area      A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
+	 *     @type string   $post_type Post type to get the templates for.
+	 * }
+	 * @param string $template_type Template type. Either 'wp_template' or 'wp_template_part'.
+	 */
+	$templates = apply_filters( 'pre_get_block_templates', null, $query, $template_type );
+	if ( ! is_null( $templates ) ) {
+		return $templates;
+	}
+
+	$post_type     = isset( $query['post_type'] ) ? $query['post_type'] : '';
+	$wp_query_args = array(
+		'post_status'         => array( 'auto-draft', 'draft', 'publish' ),
+		'post_type'           => $template_type,
+		'posts_per_page'      => -1,
+		'no_found_rows'       => true,
+		'lazy_load_term_meta' => false,
+		'tax_query'           => array(
+			array(
+				'taxonomy' => 'wp_theme',
+				'field'    => 'name',
+				'terms'    => get_stylesheet(),
+			),
+		),
+	);
+
+	if ( 'wp_template_part' === $template_type && isset( $query['area'] ) ) {
+		$wp_query_args['tax_query'][]           = array(
+			'taxonomy' => 'wp_template_part_area',
+			'field'    => 'name',
+			'terms'    => $query['area'],
+		);
+		$wp_query_args['tax_query']['relation'] = 'AND';
+	}
+
+	if ( ! empty( $query['slug__in'] ) ) {
+		$wp_query_args['post_name__in']  = $query['slug__in'];
+		$wp_query_args['posts_per_page'] = count( array_unique( $query['slug__in'] ) );
+	}
+
+	// This is only needed for the regular templates/template parts post type listing and editor.
+	if ( isset( $query['wp_id'] ) ) {
+		$wp_query_args['p'] = $query['wp_id'];
+	} else {
+		$wp_query_args['post_status'] = 'publish';
+	}
+
+	$template_query = new WP_Query( $wp_query_args );
+	$query_result   = array();
+	foreach ( $template_query->posts as $post ) {
+		$template = _build_block_template_result_from_post( $post );
+
+		if ( is_wp_error( $template ) ) {
+			continue;
+		}
+
+		if ( $post_type && ! $template->is_custom ) {
+			continue;
+		}
+
+		if (
+			$post_type &&
+			isset( $template->post_types ) &&
+			! in_array( $post_type, $template->post_types, true )
+		) {
+			continue;
+		}
+
+		$query_result[] = $template;
+	}
+
+	if ( ! isset( $query['wp_id'] ) ) {
+		/*
+		 * If the query has found some use templates, those have priority
+		 * over the theme-provided ones, so we skip querying and building them.
+		 */
+		$query['slug__not_in'] = wp_list_pluck( $query_result, 'slug' );
+		$template_files        = _gutenberg_get_block_templates_files( $template_type, $query );
+		foreach ( $template_files as $template_file ) {
+			$query_result[] = _build_block_template_result_from_file( $template_file, $template_type );
+		}
+	}
+
+	/**
+	 * Filters the array of queried block templates array after they've been fetched.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @param WP_Block_Template[] $query_result Array of found block templates.
+	 * @param array               $query {
+	 *     Arguments to retrieve templates. All arguments are optional.
+	 *
+	 *     @type string[] $slug__in  List of slugs to include.
+	 *     @type int      $wp_id     Post ID of customized template.
+	 *     @type string   $area      A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
+	 *     @type string   $post_type Post type to get the templates for.
+	 * }
+	 * @param string              $template_type wp_template or wp_template_part.
+	 */
+	return apply_filters( 'get_block_templates', $query_result, $query, $template_type );
+}
diff --git a/lib/compat/wordpress-6.6/blocks.php b/lib/compat/wordpress-6.6/blocks.php
new file mode 100644
index 00000000000000..0d8805a489d9cb
--- /dev/null
+++ b/lib/compat/wordpress-6.6/blocks.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Temporary compatibility shims for block APIs present in Gutenberg.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Replace the `__default` block bindings attribute with the full list of supported
+ * attribute names for pattern overrides.
+ *
+ * @param array $parsed_block The full block, including name and attributes.
+ *
+ * @return string The parsed block with default binding replace.
+ */
+function gutenberg_replace_pattern_override_default_binding( $parsed_block ) {
+	$supported_block_attrs = array(
+		'core/paragraph' => array( 'content' ),
+		'core/heading'   => array( 'content' ),
+		'core/image'     => array( 'id', 'url', 'title', 'alt' ),
+		'core/button'    => array( 'url', 'text', 'linkTarget', 'rel' ),
+	);
+
+	$bindings = $parsed_block['attrs']['metadata']['bindings'] ?? array();
+	if (
+		isset( $bindings['__default']['source'] ) &&
+		'core/pattern-overrides' === $bindings['__default']['source']
+	) {
+		$updated_bindings = array();
+
+		// Build an binding array of all supported attributes.
+		// Note that this also omits the `__default` attribute from the
+		// resulting array.
+		foreach ( $supported_block_attrs[ $parsed_block['blockName'] ] as $attribute_name ) {
+			// Retain any non-pattern override bindings that might be present.
+			$updated_bindings[ $attribute_name ] = isset( $bindings[ $attribute_name ] )
+				? $bindings[ $attribute_name ]
+				: array( 'source' => 'core/pattern-overrides' );
+		}
+		$parsed_block['attrs']['metadata']['bindings'] = $updated_bindings;
+	}
+
+	return $parsed_block;
+}
+
+add_filter( 'render_block_data', 'gutenberg_replace_pattern_override_default_binding', 10, 1 );
diff --git a/lib/compat/wordpress-6.6/class-gutenberg-rest-global-styles-revisions-controller-6-6.php b/lib/compat/wordpress-6.6/class-gutenberg-rest-global-styles-revisions-controller-6-6.php
new file mode 100644
index 00000000000000..3e5d4cdd68454a
--- /dev/null
+++ b/lib/compat/wordpress-6.6/class-gutenberg-rest-global-styles-revisions-controller-6-6.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * REST API: Gutenberg_REST_Global_Styles_Revisions_Controller class, inspired by WP_REST_Revisions_Controller.
+ *
+ * @package WordPress
+ * @subpackage REST_API
+ * @since 6.3.0
+ */
+
+/**
+ * Core class used to access global styles revisions via the REST API.
+ *
+ * @since 6.3.0
+ * @since 6.6.0 Added custom relative theme file URIs to `_links`.
+ *
+ * @see WP_REST_Controller
+ */
+class Gutenberg_REST_Global_Styles_Revisions_Controller_6_6 extends WP_REST_Global_Styles_Revisions_Controller {
+	/**
+	 * Prepares the revision for the REST response.
+	 *
+	 * @since 6.3.0
+	 * @since 6.6.0 Added resolved URI links to the response.
+	 *
+	 * @param WP_Post         $post    Post revision object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response|WP_Error Response object.
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$parent               = $this->get_parent( $request['parent'] );
+		$global_styles_config = $this->get_decoded_global_styles_json( $post->post_content );
+
+		if ( is_wp_error( $global_styles_config ) ) {
+			return $global_styles_config;
+		}
+
+		$fields     = $this->get_fields_for_response( $request );
+		$data       = array();
+		$theme_json = array();
+
+		if ( ! empty( $global_styles_config['styles'] ) || ! empty( $global_styles_config['settings'] ) ) {
+			$theme_json           = new WP_Theme_JSON_Gutenberg( $global_styles_config, 'custom' );
+			$global_styles_config = ( $theme_json )->get_raw_data();
+
+			if ( rest_is_field_included( 'settings', $fields ) ) {
+				$data['settings'] = ! empty( $global_styles_config['settings'] ) ? $global_styles_config['settings'] : new stdClass();
+			}
+			if ( rest_is_field_included( 'styles', $fields ) ) {
+				$data['styles'] = ! empty( $global_styles_config['styles'] ) ? $global_styles_config['styles'] : new stdClass();
+			}
+		}
+
+		if ( rest_is_field_included( 'author', $fields ) ) {
+			$data['author'] = (int) $post->post_author;
+		}
+
+		if ( rest_is_field_included( 'date', $fields ) ) {
+			$data['date'] = $this->prepare_date_response( $post->post_date_gmt, $post->post_date );
+		}
+
+		if ( rest_is_field_included( 'date_gmt', $fields ) ) {
+			$data['date_gmt'] = $this->prepare_date_response( $post->post_date_gmt );
+		}
+
+		if ( rest_is_field_included( 'id', $fields ) ) {
+			$data['id'] = (int) $post->ID;
+		}
+
+		if ( rest_is_field_included( 'modified', $fields ) ) {
+			$data['modified'] = $this->prepare_date_response( $post->post_modified_gmt, $post->post_modified );
+		}
+
+		if ( rest_is_field_included( 'modified_gmt', $fields ) ) {
+			$data['modified_gmt'] = $this->prepare_date_response( $post->post_modified_gmt );
+		}
+
+		if ( rest_is_field_included( 'parent', $fields ) ) {
+			$data['parent'] = (int) $parent->ID;
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		// Add resolved URIs to the response.
+		$links               = array();
+		$resolved_theme_uris = WP_Theme_JSON_Resolver_Gutenberg::get_resolved_theme_uris( $theme_json );
+		if ( ! empty( $resolved_theme_uris ) ) {
+			$links['https://api.w.org/theme-file'] = $resolved_theme_uris;
+		}
+		$response->add_links( $links );
+
+		return $response;
+	}
+}
diff --git a/lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php b/lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php
new file mode 100644
index 00000000000000..034187ca9a70ae
--- /dev/null
+++ b/lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * REST API: Gutenberg_REST_Templates_Controller_6_6 class
+ *
+ * @package    gutenberg
+ */
+
+/**
+ * Gutenberg_REST_Templates_Controller_6_6 class
+ *
+ * Templates and template parts currently only allow access to administrators with the
+ * `edit_theme_options` capability. In order to allow other roles to also view the templates,
+ * we need to override the permissions check for the REST API endpoints.
+ */
+class Gutenberg_REST_Templates_Controller_6_6 extends WP_REST_Templates_Controller {
+
+	/**
+	 * Checks if a given request has access to read templates.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+	 */
+	public function get_items_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		if ( current_user_can( 'edit_posts' ) ) {
+			return true;
+		}
+		foreach ( get_post_types( array( 'show_in_rest' => true ), 'objects' ) as $post_type ) {
+			if ( current_user_can( $post_type->cap->edit_posts ) ) {
+				return true;
+			}
+		}
+
+		return new WP_Error(
+			'rest_cannot_manage_templates',
+			__( 'Sorry, you are not allowed to access the templates on this site.', 'default' ),
+			array(
+				'status' => rest_authorization_required_code(),
+			)
+		);
+	}
+
+	/**
+	 * Returns a list of templates.
+	 *
+	 * @since 5.8.0
+	 *
+	 * @param WP_REST_Request $request The request instance.
+	 * @return WP_REST_Response
+	 */
+	public function get_items( $request ) {
+		$query = array();
+		if ( isset( $request['wp_id'] ) ) {
+			$query['wp_id'] = $request['wp_id'];
+		}
+		if ( isset( $request['area'] ) ) {
+			$query['area'] = $request['area'];
+		}
+		if ( isset( $request['post_type'] ) ) {
+			$query['post_type'] = $request['post_type'];
+		}
+
+		$templates = array();
+		foreach ( gutenberg_get_block_templates( $query, $this->post_type ) as $template ) {
+			$data        = $this->prepare_item_for_response( $template, $request );
+			$templates[] = $this->prepare_response_for_collection( $data );
+		}
+
+		return rest_ensure_response( $templates );
+	}
+
+	/**
+	 * Checks if a given request has access to read templates.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+	 */
+	public function get_item_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		if ( current_user_can( 'edit_posts' ) ) {
+			return true;
+		}
+		foreach ( get_post_types( array( 'show_in_rest' => true ), 'objects' ) as $post_type ) {
+			if ( current_user_can( $post_type->cap->edit_posts ) ) {
+				return true;
+			}
+		}
+
+		return new WP_Error(
+			'rest_cannot_manage_templates',
+			__( 'Sorry, you are not allowed to access the templates on this site.', 'default' ),
+			array(
+				'status' => rest_authorization_required_code(),
+			)
+		);
+	}
+
+	/**
+	 * Returns the fallback template for the given slug.
+	 *
+	 * @since 6.1.0
+	 *
+	 * @param WP_REST_Request $request The request instance.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_template_fallback( $request ) {
+		$hierarchy = gutenberg_get_template_hierarchy( $request['slug'], $request['is_custom'], $request['template_prefix'] );
+
+		do {
+			$fallback_template = resolve_block_template( $request['slug'], $hierarchy, '' );
+			array_shift( $hierarchy );
+		} while ( ! empty( $hierarchy ) && empty( $fallback_template->content ) );
+
+		// To maintain original behavior, return an empty object rather than a 404 error when no template is found.
+		$response = $fallback_template ? $this->prepare_item_for_response( $fallback_template, $request ) : new stdClass();
+
+		return rest_ensure_response( $response );
+	}
+
+	/**
+	 * See WP_REST_Templates_Controller::prepare_item_for_response
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$blocks        = parse_blocks( $item->content );
+		$blocks        = gutenberg_replace_pattern_blocks( $blocks );
+		$item->content = serialize_blocks( $blocks );
+		return parent::prepare_item_for_response( $item, $request );
+	}
+}
diff --git a/lib/compat/wordpress-6.6/class-gutenberg-token-map-6-6.php b/lib/compat/wordpress-6.6/class-gutenberg-token-map-6-6.php
new file mode 100644
index 00000000000000..1df1fe91dab141
--- /dev/null
+++ b/lib/compat/wordpress-6.6/class-gutenberg-token-map-6-6.php
@@ -0,0 +1,818 @@
+<?php
+
+/**
+ * Class for efficiently looking up and mapping string keys to string values, with limits.
+ *
+ * @package    WordPress
+ * @since      6.6.0
+ */
+
+/**
+ * WP_Token_Map class.
+ *
+ * Use this class in specific circumstances with a static set of lookup keys which map to
+ * a static set of transformed values. For example, this class is used to map HTML named
+ * character references to their equivalent UTF-8 values.
+ *
+ * This class works differently than code calling `in_array()` and other methods. It
+ * internalizes lookup logic and provides helper interfaces to optimize lookup and
+ * transformation. It provides a method for precomputing the lookup tables and storing
+ * them as PHP source code.
+ *
+ * All tokens and substitutions must be shorter than 256 bytes.
+ *
+ * Example:
+ *
+ *     $smilies = WP_Token_Map::from_array( array(
+ *         '8O' => '😯',
+ *         ':(' => '🙁',
+ *         ':)' => '🙂',
+ *         ':?' => '😕',
+ *      ) );
+ *
+ *      true  === $smilies->contains( ':)' );
+ *      false === $smilies->contains( 'simile' );
+ *
+ *      '😕' === $smilies->read_token( 'Not sure :?.', 9, $length_of_smily_syntax );
+ *      2    === $length_of_smily_syntax;
+ *
+ * ## Precomputing the Token Map.
+ *
+ * Creating the class involves some work sorting and organizing the tokens and their
+ * replacement values. In order to skip this, it's possible for the class to export
+ * its state and be used as actual PHP source code.
+ *
+ * Example:
+ *
+ *      // Export with four spaces as the indent, only for the sake of this docblock.
+ *      // The default indent is a tab character.
+ *      $indent = '    ';
+ *      echo $smilies->precomputed_php_source_table( $indent );
+ *
+ *      // Output, to be pasted into a PHP source file:
+ *      WP_Token_Map::from_precomputed_table(
+ *          array(
+ *              "storage_version" => "6.6.0",
+ *              "key_length" => 2,
+ *              "groups" => "",
+ *              "long_words" => array(),
+ *              "small_words" => "8O\x00:)\x00:(\x00:?\x00",
+ *              "small_mappings" => array( "😯", "🙂", "🙁", "😕" )
+ *          )
+ *      );
+ *
+ * ## Large vs. small words.
+ *
+ * This class uses a short prefix called the "key" to optimize lookup of its tokens.
+ * This means that some tokens may be shorter than or equal in length to that key.
+ * Those words that are longer than the key are called "large" while those shorter
+ * than or equal to the key length are called "small."
+ *
+ * This separation of large and small words is incidental to the way this class
+ * optimizes lookup, and should be considered an internal implementation detail
+ * of the class. It may still be important to be aware of it, however.
+ *
+ * ## Determining Key Length.
+ *
+ * The choice of the size of the key length should be based on the data being stored in
+ * the token map. It should divide the data as evenly as possible, but should not create
+ * so many groups that a large fraction of the groups only contain a single token.
+ *
+ * For the HTML5 named character references, a key length of 2 was found to provide a
+ * sufficient spread and should be a good default for relatively large sets of tokens.
+ *
+ * However, for some data sets this might be too long. For example, a list of smilies
+ * may be too small for a key length of 2. Perhaps 1 would be more appropriate. It's
+ * best to experiment and determine empirically which values are appropriate.
+ *
+ * ## Generate Pre-Computed Source Code.
+ *
+ * Since the `WP_Token_Map` is designed for relatively static lookups, it can be
+ * advantageous to precompute the values and instantiate a table that has already
+ * sorted and grouped the tokens and built the lookup strings.
+ *
+ * This can be done with `WP_Token_Map::precomputed_php_source_table()`.
+ *
+ * Note that if there is a leading character that all tokens need, such as `&` for
+ * HTML named character references, it can be beneficial to exclude this from the
+ * token map. Instead, find occurrences of the leading character and then use the
+ * token map to see if the following characters complete the token.
+ *
+ * Example:
+ *
+ *     $map = WP_Token_Map::from_array( array( 'simple_smile:' => '🙂', 'sob:' => '😭', 'soba:' => '🍜' ) );
+ *     echo $map->precomputed_php_source_table();
+ *     // Output
+ *     WP_Token_Map::from_precomputed_table(
+ *         array(
+ *             "storage_version" => "6.6.0",
+ *             "key_length" => 2,
+ *             "groups" => "si\x00so\x00",
+ *             "long_words" => array(
+ *                 // simple_smile:[🙂].
+ *                 "\x0bmple_smile:\x04🙂",
+ *                 // soba:[🍜] sob:[😭].
+ *                 "\x03ba:\x04🍜\x02b:\x04😭",
+ *             ),
+ *             "short_words" => "",
+ *             "short_mappings" => array()
+ *         }
+ *     );
+ *
+ * This precomputed value can be stored directly in source code and will skip the
+ * startup cost of generating the lookup strings. See `$html5_named_character_entities`.
+ *
+ * Note that any updates to the precomputed format should update the storage version
+ * constant. It would also be best to provide an update function to take older known
+ * versions and upgrade them in place when loading into `from_precomputed_table()`.
+ *
+ * ## Future Direction.
+ *
+ * It may be viable to dynamically increase the length limits such that there's no need to impose them.
+ * The limit appears because of the packing structure, which indicates how many bytes each segment of
+ * text in the lookup tables spans. If, however, care were taken to track the longest word length, then
+ * the packing structure could change its representation to allow for that. Each additional byte storing
+ * length, however, increases the memory overhead and lookup runtime.
+ *
+ * An alternative approach could be to borrow the UTF-8 variable-length encoding and store lengths of less
+ * than 127 as a single byte with the high bit unset, storing longer lengths as the combination of
+ * continuation bytes.
+ *
+ * Since it has not been shown during the development of this class that longer strings are required, this
+ * update is deferred until such a need is clear.
+ *
+ * @since 6.6.0
+ */
+class Gutenberg_Token_Map_6_6 {
+	/**
+	 * Denotes the version of the code which produces pre-computed source tables.
+	 *
+	 * This version will be used not only to verify pre-computed data, but also
+	 * to upgrade pre-computed data from older versions. Choosing a name that
+	 * corresponds to the WordPress release will help people identify where an
+	 * old copy of data came from.
+	 */
+	const STORAGE_VERSION = '6.6.0-trunk';
+
+	/**
+	 * Maximum length for each key and each transformed value in the table (in bytes).
+	 *
+	 * @since 6.6.0
+	 */
+	const MAX_LENGTH = 256;
+
+	/**
+	 * How many bytes of each key are used to form a group key for lookup.
+	 * This also determines whether a word is considered short or long.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var int
+	 */
+	private $key_length = 2;
+
+	/**
+	 * Stores an optimized form of the word set, where words are grouped
+	 * by a prefix of the `$key_length` and then collapsed into a string.
+	 *
+	 * In each group, the keys and lookups form a packed data structure.
+	 * The keys in the string are stripped of their "group key," which is
+	 * the prefix of length `$this->key_length` shared by all of the items
+	 * in the group. Each word in the string is prefixed by a single byte
+	 * whose raw unsigned integer value represents how many bytes follow.
+	 *
+	 *     ┌────────────────┬───────────────┬─────────────────┬────────┐
+	 *     │ Length of rest │ Rest of key   │ Length of value │ Value  │
+	 *     │ of key (bytes) │               │ (bytes)         │        │
+	 *     ├────────────────┼───────────────┼─────────────────┼────────┤
+	 *     │ 0x08           │ nterDot;      │ 0x02            │ ·      │
+	 *     └────────────────┴───────────────┴─────────────────┴────────┘
+	 *
+	 * In this example, the key `CenterDot;` has a group key `Ce`, leaving
+	 * eight bytes for the rest of the key, `nterDot;`, and two bytes for
+	 * the transformed value `·` (or U+B7 or "\xC2\xB7").
+	 *
+	 * Example:
+	 *
+	 *    // Stores array( 'CenterDot;' => '·', 'Cedilla;' => '¸' ).
+	 *    $groups      = "Ce\x00";
+	 *    $large_words = array( "\x08nterDot;\x02·\x06dilla;\x02¸" )
+	 *
+	 * The prefixes appear in the `$groups` string, each followed by a null
+	 * byte. This makes for quick lookup of where in the group string the key
+	 * is found, and then a simple division converts that offset into the index
+	 * in the `$large_words` array where the group string is to be found.
+	 *
+	 * This lookup data structure is designed to optimize cache locality and
+	 * minimize indirect memory reads when matching strings in the set.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var array
+	 */
+	private $large_words = array();
+
+	/**
+	 * Stores the group keys for sequential string lookup.
+	 *
+	 * The offset into this string where the group key appears corresponds with the index
+	 * into the group array where the rest of the group string appears. This is an optimization
+	 * to improve cache locality while searching and minimize indirect memory accesses.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var string
+	 */
+	private $groups = '';
+
+	/**
+	 * Stores an optimized row of small words, where every entry is
+	 * `$this->key_size + 1` bytes long and zero-extended.
+	 *
+	 * This packing allows for direct lookup of a short word followed
+	 * by the null byte, if extended to `$this->key_size + 1`.
+	 *
+	 * Example:
+	 *
+	 *     // Stores array( 'GT', 'LT', 'gt', 'lt' ).
+	 *     "GT\x00LT\x00gt\x00lt\x00"
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var string
+	 */
+	private $small_words = '';
+
+	/**
+	 * Replacements for the small words, in the same order they appear.
+	 *
+	 * With the position of a small word it's possible to index the translation
+	 * directly, as its position in the `$small_words` string corresponds to
+	 * the index of the replacement in the `$small_mapping` array.
+	 *
+	 * Example:
+	 *
+	 *     array( '>', '<', '>', '<' )
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var string[]
+	 */
+	private $small_mappings = array();
+
+	/**
+	 * Create a token map using an associative array of key/value pairs as the input.
+	 *
+	 * Example:
+	 *
+	 *     $smilies = WP_Token_Map::from_array( array(
+	 *          '8O' => '😯',
+	 *          ':(' => '🙁',
+	 *          ':)' => '🙂',
+	 *          ':?' => '😕',
+	 *       ) );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array $mappings   The keys transform into the values, both are strings.
+	 * @param int   $key_length Determines the group key length. Leave at the default value
+	 *                          of 2 unless there's an empirical reason to change it.
+	 *
+	 * @return WP_Token_Map|null Token map, unless unable to create it.
+	 */
+	public static function from_array( $mappings, $key_length = 2 ) {
+		$map             = new static();
+		$map->key_length = $key_length;
+
+		// Start by grouping words.
+
+		$groups = array();
+		$shorts = array();
+		foreach ( $mappings as $word => $mapping ) {
+			if (
+				self::MAX_LENGTH <= strlen( $word ) ||
+				self::MAX_LENGTH <= strlen( $mapping )
+			) {
+				_doing_it_wrong(
+					__METHOD__,
+					sprintf(
+						/* translators: 1: maximum byte length (a count) */
+						__( 'Token Map tokens and substitutions must all be shorter than %1$d bytes.' ),
+						self::MAX_LENGTH
+					),
+					'6.6.0'
+				);
+				return null;
+			}
+
+			$length = strlen( $word );
+
+			if ( $key_length >= $length ) {
+				$shorts[] = $word;
+			} else {
+				$group = substr( $word, 0, $key_length );
+
+				if ( ! isset( $groups[ $group ] ) ) {
+					$groups[ $group ] = array();
+				}
+
+				$groups[ $group ][] = array( substr( $word, $key_length ), $mapping );
+			}
+		}
+
+		/*
+		 * Sort the words to ensure that no smaller substring of a match masks the full match.
+		 * For example, `Cap` should not match before `CapitalDifferentialD`.
+		 */
+		usort( $shorts, 'static::longest_first_then_alphabetical' );
+		foreach ( $groups as $group_key => $group ) {
+			usort(
+				$groups[ $group_key ],
+				static function ( $a, $b ) {
+					return self::longest_first_then_alphabetical( $a[0], $b[0] );
+				}
+			);
+		}
+
+		// Finally construct the optimized lookups.
+
+		foreach ( $shorts as $word ) {
+			$map->small_words     .= str_pad( $word, $key_length + 1, "\x00", STR_PAD_RIGHT );
+			$map->small_mappings[] = $mappings[ $word ];
+		}
+
+		$group_keys = array_keys( $groups );
+		sort( $group_keys );
+
+		foreach ( $group_keys as $group ) {
+			$map->groups .= "{$group}\x00";
+
+			$group_string = '';
+
+			foreach ( $groups[ $group ] as $group_word ) {
+				list( $word, $mapping ) = $group_word;
+
+				$word_length    = pack( 'C', strlen( $word ) );
+				$mapping_length = pack( 'C', strlen( $mapping ) );
+				$group_string  .= "{$word_length}{$word}{$mapping_length}{$mapping}";
+			}
+
+			$map->large_words[] = $group_string;
+		}
+
+		return $map;
+	}
+
+	/**
+	 * Creates a token map from a pre-computed table.
+	 * This skips the initialization cost of generating the table.
+	 *
+	 * This function should only be used to load data created with
+	 * WP_Token_Map::precomputed_php_source_tag().
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array $state {
+	 *     Stores pre-computed state for directly loading into a Token Map.
+	 *
+	 *     @type string $storage_version Which version of the code produced this state.
+	 *     @type int    $key_length      Group key length.
+	 *     @type string $groups          Group lookup index.
+	 *     @type array  $large_words     Large word groups and packed strings.
+	 *     @type string $small_words     Small words packed string.
+	 *     @type array  $small_mappings  Small word mappings.
+	 * }
+	 *
+	 * @return WP_Token_Map Map with precomputed data loaded.
+	 */
+	public static function from_precomputed_table( $state ) {
+		$has_necessary_state = isset(
+			$state['storage_version'],
+			$state['key_length'],
+			$state['groups'],
+			$state['large_words'],
+			$state['small_words'],
+			$state['small_mappings']
+		);
+
+		if ( ! $has_necessary_state ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Missing required inputs to pre-computed WP_Token_Map.' ),
+				'6.6.0'
+			);
+			return null;
+		}
+
+		if ( self::STORAGE_VERSION !== $state['storage_version'] ) {
+			_doing_it_wrong(
+				__METHOD__,
+				/* translators: 1: version string, 2: version string. */
+				sprintf( __( 'Loaded version \'%1$s\' incompatible with expected version \'%2$s\'.' ), $state['storage_version'], self::STORAGE_VERSION ),
+				'6.6.0'
+			);
+			return null;
+		}
+
+		$map = new static();
+
+		$map->key_length     = $state['key_length'];
+		$map->groups         = $state['groups'];
+		$map->large_words    = $state['large_words'];
+		$map->small_words    = $state['small_words'];
+		$map->small_mappings = $state['small_mappings'];
+
+		return $map;
+	}
+
+	/**
+	 * Indicates if a given word is a lookup key in the map.
+	 *
+	 * Example:
+	 *
+	 *     true  === $smilies->contains( ':)' );
+	 *     false === $smilies->contains( 'simile' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $word             Determine if this word is a lookup key in the map.
+	 * @param string $case_sensitivity Optional. Pass 'ascii-case-insensitive' to ignore ASCII case when matching. Default 'case-sensitive'.
+	 * @return bool Whether there's an entry for the given word in the map.
+	 */
+	public function contains( $word, $case_sensitivity = 'case-sensitive' ) {
+		$ignore_case = 'ascii-case-insensitive' === $case_sensitivity;
+
+		if ( $this->key_length >= strlen( $word ) ) {
+			if ( 0 === strlen( $this->small_words ) ) {
+				return false;
+			}
+
+			$term    = str_pad( $word, $this->key_length + 1, "\x00", STR_PAD_RIGHT );
+			$word_at = $ignore_case ? stripos( $this->small_words, $term ) : strpos( $this->small_words, $term );
+			if ( false === $word_at ) {
+				return false;
+			}
+
+			return true;
+		}
+
+		$group_key = substr( $word, 0, $this->key_length );
+		$group_at  = $ignore_case ? stripos( $this->groups, $group_key ) : strpos( $this->groups, $group_key );
+		if ( false === $group_at ) {
+			return false;
+		}
+		$group        = $this->large_words[ $group_at / ( $this->key_length + 1 ) ];
+		$group_length = strlen( $group );
+		$slug         = substr( $word, $this->key_length );
+		$length       = strlen( $slug );
+		$at           = 0;
+
+		while ( $at < $group_length ) {
+			$token_length   = unpack( 'C', $group[ $at++ ] )[1];
+			$token_at       = $at;
+			$at            += $token_length;
+			$mapping_length = unpack( 'C', $group[ $at++ ] )[1];
+			$mapping_at     = $at;
+
+			if ( $token_length === $length && 0 === substr_compare( $group, $slug, $token_at, $token_length, $ignore_case ) ) {
+				return true;
+			}
+
+			$at = $mapping_at + $mapping_length;
+		}
+
+		return false;
+	}
+
+	/**
+	 * If the text starting at a given offset is a lookup key in the map,
+	 * return the corresponding transformation from the map, else `false`.
+	 *
+	 * This function returns the translated string, but accepts an optional
+	 * parameter `$matched_token_byte_length`, which communicates how many
+	 * bytes long the lookup key was, if it found one. This can be used to
+	 * advance a cursor in calling code if a lookup key was found.
+	 *
+	 * Example:
+	 *
+	 *     false === $smilies->read_token( 'Not sure :?.', 0, $token_byte_length );
+	 *     '😕'  === $smilies->read_token( 'Not sure :?.', 9, $token_byte_length );
+	 *     2     === $token_byte_length;
+	 *
+	 * Example:
+	 *
+	 *     while ( $at < strlen( $input ) ) {
+	 *         $next_at = strpos( $input, ':', $at );
+	 *         if ( false === $next_at ) {
+	 *             break;
+	 *         }
+	 *
+	 *         $smily = $smilies->read_token( $input, $next_at, $token_byte_length );
+	 *         if ( false === $next_at ) {
+	 *             ++$at;
+	 *             continue;
+	 *         }
+	 *
+	 *         $prefix  = substr( $input, $at, $next_at - $at );
+	 *         $at     += $token_byte_length;
+	 *         $output .= "{$prefix}{$smily}";
+	 *     }
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string  $text                       String in which to search for a lookup key.
+	 * @param int     $offset                     Optional. How many bytes into the string where the lookup key ought to start. Default 0.
+	 * @param ?int    &$matched_token_byte_length Optional. Holds byte-length of found token matched, otherwise not set. Default null.
+	 * @param string  $case_sensitivity           Optional. Pass 'ascii-case-insensitive' to ignore ASCII case when matching. Default 'case-sensitive'.
+	 * @return string|null Mapped value of lookup key if found, otherwise `null`.
+	 */
+	public function read_token( $text, $offset = 0, &$matched_token_byte_length = null, $case_sensitivity = 'case-sensitive' ) {
+		$ignore_case = 'ascii-case-insensitive' === $case_sensitivity;
+		$text_length = strlen( $text );
+
+		// Search for a long word first, if the text is long enough, and if that fails, a short one.
+		if ( $text_length > $this->key_length ) {
+			$group_key = substr( $text, $offset, $this->key_length );
+
+			$group_at = $ignore_case ? stripos( $this->groups, $group_key ) : strpos( $this->groups, $group_key );
+			if ( false === $group_at ) {
+				// Perhaps a short word then.
+				return strlen( $this->small_words ) > 0
+					? $this->read_small_token( $text, $offset, $matched_token_byte_length, $case_sensitivity )
+					: null;
+			}
+
+			$group        = $this->large_words[ $group_at / ( $this->key_length + 1 ) ];
+			$group_length = strlen( $group );
+			$at           = 0;
+			while ( $at < $group_length ) {
+				$token_length   = unpack( 'C', $group[ $at++ ] )[1];
+				$token          = substr( $group, $at, $token_length );
+				$at            += $token_length;
+				$mapping_length = unpack( 'C', $group[ $at++ ] )[1];
+				$mapping_at     = $at;
+
+				if ( 0 === substr_compare( $text, $token, $offset + $this->key_length, $token_length, $ignore_case ) ) {
+					$matched_token_byte_length = $this->key_length + $token_length;
+					return substr( $group, $mapping_at, $mapping_length );
+				}
+
+				$at = $mapping_at + $mapping_length;
+			}
+		}
+
+		// Perhaps a short word then.
+		return strlen( $this->small_words ) > 0
+			? $this->read_small_token( $text, $offset, $matched_token_byte_length, $case_sensitivity )
+			: null;
+	}
+
+	/**
+	 * Finds a match for a short word at the index.
+	 *
+	 * @since 6.6.0.
+	 *
+	 * @param string $text                       String in which to search for a lookup key.
+	 * @param int    $offset                     Optional. How many bytes into the string where the lookup key ought to start. Default 0.
+	 * @param ?int   &$matched_token_byte_length Optional. Holds byte-length of found lookup key if matched, otherwise not set. Default null.
+	 * @param string $case_sensitivity           Optional. Pass 'ascii-case-insensitive' to ignore ASCII case when matching. Default 'case-sensitive'.
+	 * @return string|null Mapped value of lookup key if found, otherwise `null`.
+	 */
+	private function read_small_token( $text, $offset, &$matched_token_byte_length, $case_sensitivity = 'case-sensitive' ) {
+		$ignore_case  = 'ascii-case-insensitive' === $case_sensitivity;
+		$small_length = strlen( $this->small_words );
+		$search_text  = substr( $text, $offset, $this->key_length );
+		if ( $ignore_case ) {
+			$search_text = strtoupper( $search_text );
+		}
+		$starting_char = $search_text[0];
+
+		$at = 0;
+		while ( $at < $small_length ) {
+			if (
+				$starting_char !== $this->small_words[ $at ] &&
+				( ! $ignore_case || strtoupper( $this->small_words[ $at ] ) !== $starting_char )
+			) {
+				$at += $this->key_length + 1;
+				continue;
+			}
+
+			for ( $adjust = 1; $adjust < $this->key_length; $adjust++ ) {
+				if ( "\x00" === $this->small_words[ $at + $adjust ] ) {
+					$matched_token_byte_length = $adjust;
+					return $this->small_mappings[ $at / ( $this->key_length + 1 ) ];
+				}
+
+				if (
+					$search_text[ $adjust ] !== $this->small_words[ $at + $adjust ] &&
+					( ! $ignore_case || strtoupper( $this->small_words[ $at + $adjust ] !== $search_text[ $adjust ] ) )
+				) {
+					$at += $this->key_length + 1;
+					continue 2;
+				}
+			}
+
+			$matched_token_byte_length = $adjust;
+			return $this->small_mappings[ $at / ( $this->key_length + 1 ) ];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Exports the token map into an associate array of key/value pairs.
+	 *
+	 * Example:
+	 *
+	 *     $smilies->to_array() === array(
+	 *         '8O' => '😯',
+	 *         ':(' => '🙁',
+	 *         ':)' => '🙂',
+	 *         ':?' => '😕',
+	 *     );
+	 *
+	 * @return array The lookup key/substitution values as an associate array.
+	 */
+	public function to_array() {
+		$tokens = array();
+
+		$at            = 0;
+		$small_mapping = 0;
+		$small_length  = strlen( $this->small_words );
+		while ( $at < $small_length ) {
+			$key            = rtrim( substr( $this->small_words, $at, $this->key_length + 1 ), "\x00" );
+			$value          = $this->small_mappings[ $small_mapping++ ];
+			$tokens[ $key ] = $value;
+
+			$at += $this->key_length + 1;
+		}
+
+		foreach ( $this->large_words as $index => $group ) {
+			$prefix       = substr( $this->groups, $index * ( $this->key_length + 1 ), 2 );
+			$group_length = strlen( $group );
+			$at           = 0;
+			while ( $at < $group_length ) {
+				$length = unpack( 'C', $group[ $at++ ] )[1];
+				$key    = $prefix . substr( $group, $at, $length );
+
+				$at    += $length;
+				$length = unpack( 'C', $group[ $at++ ] )[1];
+				$value  = substr( $group, $at, $length );
+
+				$tokens[ $key ] = $value;
+				$at            += $length;
+			}
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * Export the token map for quick loading in PHP source code.
+	 *
+	 * This function has a specific purpose, to make loading of static token maps fast.
+	 * It's used to ensure that the HTML character reference lookups add a minimal cost
+	 * to initializing the PHP process.
+	 *
+	 * Example:
+	 *
+	 *     echo $smilies->precomputed_php_source_table();
+	 *
+	 *     // Output.
+	 *     WP_Token_Map::from_precomputed_table(
+	 *         array(
+	 *             "storage_version" => "6.6.0",
+	 *             "key_length" => 2,
+	 *             "groups" => "",
+	 *             "long_words" => array(),
+	 *             "small_words" => "8O\x00:)\x00:(\x00:?\x00",
+	 *             "small_mappings" => array( "😯", "🙂", "🙁", "😕" )
+	 *         )
+	 *     );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $indent Optional. Use this string for indentation, or rely on the default horizontal tab character. Default "\t".
+	 * @return string Value which can be pasted into a PHP source file for quick loading of table.
+	 */
+	public function precomputed_php_source_table( $indent = "\t" ) {
+		$i1 = $indent;
+		$i2 = $i1 . $indent;
+		$i3 = $i2 . $indent;
+
+		$class_version = self::STORAGE_VERSION;
+
+		$output  = self::class . "::from_precomputed_table(\n";
+		$output .= "{$i1}array(\n";
+		$output .= "{$i2}\"storage_version\" => \"{$class_version}\",\n";
+		$output .= "{$i2}\"key_length\" => {$this->key_length},\n";
+
+		$group_line = str_replace( "\x00", "\\x00", $this->groups );
+		$output    .= "{$i2}\"groups\" => \"{$group_line}\",\n";
+
+		$output .= "{$i2}\"large_words\" => array(\n";
+
+		$prefixes = explode( "\x00", $this->groups );
+		foreach ( $prefixes as $index => $prefix ) {
+			if ( '' === $prefix ) {
+				break;
+			}
+			$group        = $this->large_words[ $index ];
+			$group_length = strlen( $group );
+			$comment_line = "{$i3}//";
+			$data_line    = "{$i3}\"";
+			$at           = 0;
+			while ( $at < $group_length ) {
+				$token_length   = unpack( 'C', $group[ $at++ ] )[1];
+				$token          = substr( $group, $at, $token_length );
+				$at            += $token_length;
+				$mapping_length = unpack( 'C', $group[ $at++ ] )[1];
+				$mapping        = substr( $group, $at, $mapping_length );
+				$at            += $mapping_length;
+
+				$token_digits   = str_pad( dechex( $token_length ), 2, '0', STR_PAD_LEFT );
+				$mapping_digits = str_pad( dechex( $mapping_length ), 2, '0', STR_PAD_LEFT );
+
+				$mapping = preg_replace_callback(
+					"~[\\x00-\\x1f\\x22\\x5c]~",
+					static function ( $match_result ) {
+						switch ( $match_result[0] ) {
+							case '"':
+								return '\\"';
+
+							case '\\':
+								return '\\\\';
+
+							default:
+								$hex = dechex( ord( $match_result[0] ) );
+								return "\\x{$hex}";
+						}
+					},
+					$mapping
+				);
+
+				$comment_line .= " {$prefix}{$token}[{$mapping}]";
+				$data_line    .= "\\x{$token_digits}{$token}\\x{$mapping_digits}{$mapping}";
+			}
+			$comment_line .= ".\n";
+			$data_line    .= "\",\n";
+
+			$output .= $comment_line;
+			$output .= $data_line;
+		}
+
+		$output .= "{$i2}),\n";
+
+		$small_words  = array();
+		$small_length = strlen( $this->small_words );
+		$at           = 0;
+		while ( $at < $small_length ) {
+			$small_words[] = substr( $this->small_words, $at, $this->key_length + 1 );
+			$at           += $this->key_length + 1;
+		}
+
+		$small_text = str_replace( "\x00", '\x00', implode( '', $small_words ) );
+		$output    .= "{$i2}\"small_words\" => \"{$small_text}\",\n";
+
+		$output .= "{$i2}\"small_mappings\" => array(\n";
+		foreach ( $this->small_mappings as $mapping ) {
+			$output .= "{$i3}\"{$mapping}\",\n";
+		}
+		$output .= "{$i2})\n";
+		$output .= "{$i1})\n";
+		$output .= ')';
+
+		return $output;
+	}
+
+	/**
+	 * Compares two strings, returning the longest, or whichever
+	 * is first alphabetically if they are the same length.
+	 *
+	 * This is an important sort when building the token map because
+	 * it should not form a match on a substring of a longer potential
+	 * match. For example, it should not detect `Cap` when matching
+	 * against the string `CapitalDifferentialD`.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $a First string to compare.
+	 * @param string $b Second string to compare.
+	 * @return int -1 or lower if `$a` is less than `$b`; 1 or greater if `$a` is greater than `$b`, and 0 if they are equal.
+	 */
+	private static function longest_first_then_alphabetical( $a, $b ) {
+		if ( $a === $b ) {
+			return 0;
+		}
+
+		$length_a = strlen( $a );
+		$length_b = strlen( $b );
+
+		// Longer strings are less-than for comparison's sake.
+		if ( $length_a !== $length_b ) {
+			return $length_b - $length_a;
+		}
+
+		return strcmp( $a, $b );
+	}
+}
diff --git a/lib/compat/wordpress-6.6/compat.php b/lib/compat/wordpress-6.6/compat.php
new file mode 100644
index 00000000000000..4e444d3149824a
--- /dev/null
+++ b/lib/compat/wordpress-6.6/compat.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * WordPress 6.6 compatibility functions.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Change the Patterns submenu link and remove the Template Parts submenu for
+ * the Classic theme. This function should not be backported to core, and should be
+ * removed when the required WP core version for Gutenberg is >= 6.6.0.
+ *
+ * @global array $submenu
+ */
+function gutenberg_change_patterns_link_and_remove_template_parts_submenu_item() {
+	if ( ! wp_is_block_theme() ) {
+		global $submenu;
+
+		if ( empty( $submenu['themes.php'] ) ) {
+			return;
+		}
+
+		foreach ( $submenu['themes.php'] as $key => $item ) {
+			if ( 'edit.php?post_type=wp_block' === $item[2] ) {
+				$submenu['themes.php'][ $key ][2] = 'site-editor.php?path=/patterns';
+			} elseif ( 'site-editor.php?path=/wp_template_part/all' === $item[2] ) {
+				unset( $submenu['themes.php'][ $key ] );
+			}
+		}
+	}
+}
+add_action( 'admin_init', 'gutenberg_change_patterns_link_and_remove_template_parts_submenu_item' );
diff --git a/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-decoder-6-6.php b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-decoder-6-6.php
new file mode 100644
index 00000000000000..d0b9f18bf5b29b
--- /dev/null
+++ b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-decoder-6-6.php
@@ -0,0 +1,463 @@
+<?php
+
+/**
+ * HTML API: WP_HTML_Decoder class
+ *
+ * Decodes spans of raw text found inside HTML content.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.6.0
+ */
+class Gutenberg_HTML_Decoder_6_6 {
+	/**
+	 * Indicates if an attribute value starts with a given raw string value.
+	 *
+	 * Use this method to determine if an attribute value starts with a given string, regardless
+	 * of how it might be encoded in HTML. For instance, `http:` could be represented as `http:`
+	 * or as `http&colon;` or as `&#x68;ttp:` or as `h&#116;tp&colon;`, or in many other ways.
+	 *
+	 * Example:
+	 *
+	 *     $value = 'http&colon;//wordpress.org/';
+	 *     true   === WP_HTML_Decoder::attribute_starts_with( $value, 'http:', 'ascii-case-insensitive' );
+	 *     false  === WP_HTML_Decoder::attribute_starts_with( $value, 'https:', 'ascii-case-insensitive' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $haystack         String containing the raw non-decoded attribute value.
+	 * @param string $search_text      Does the attribute value start with this plain string.
+	 * @param string $case_sensitivity Optional. Pass 'ascii-case-insensitive' to ignore ASCII case when matching.
+	 *                                 Default 'case-sensitive'.
+	 * @return bool Whether the attribute value starts with the given string.
+	 */
+	public static function attribute_starts_with( $haystack, $search_text, $case_sensitivity = 'case-sensitive' ) {
+		$search_length = strlen( $search_text );
+		$loose_case    = 'ascii-case-insensitive' === $case_sensitivity;
+		$haystack_end  = strlen( $haystack );
+		$search_at     = 0;
+		$haystack_at   = 0;
+
+		while ( $search_at < $search_length && $haystack_at < $haystack_end ) {
+			$chars_match = $loose_case
+				? strtolower( $haystack[ $haystack_at ] ) === strtolower( $search_text[ $search_at ] )
+				: $haystack[ $haystack_at ] === $search_text[ $search_at ];
+
+			$is_introducer = '&' === $haystack[ $haystack_at ];
+			$next_chunk    = $is_introducer
+				? self::read_character_reference( 'attribute', $haystack, $haystack_at, $token_length )
+				: null;
+
+			// If there's no character reference and the characters don't match, the match fails.
+			if ( null === $next_chunk && ! $chars_match ) {
+				return false;
+			}
+
+			// If there's no character reference but the character do match, then it could still match.
+			if ( null === $next_chunk && $chars_match ) {
+				++$haystack_at;
+				++$search_at;
+				continue;
+			}
+
+			// If there is a character reference, then the decoded value must exactly match what follows in the search string.
+			if ( 0 !== substr_compare( $search_text, $next_chunk, $search_at, strlen( $next_chunk ), $loose_case ) ) {
+				return false;
+			}
+
+			// The character reference matched, so continue checking.
+			$haystack_at += $token_length;
+			$search_at   += strlen( $next_chunk );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns a string containing the decoded value of a given HTML text node.
+	 *
+	 * Text nodes appear in HTML DATA sections, which are the text segments inside
+	 * and around tags, excepting SCRIPT and STYLE elements (and some others),
+	 * whose inner text is not decoded. Use this function to read the decoded
+	 * value of such a text span in an HTML document.
+	 *
+	 * Example:
+	 *
+	 *     '“😄”' === WP_HTML_Decode::decode_text_node( '&#x93;&#x1f604;&#x94' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $text Text containing raw and non-decoded text node to decode.
+	 * @return string Decoded UTF-8 value of given text node.
+	 */
+	public static function decode_text_node( $text ) {
+		return static::decode( 'data', $text );
+	}
+
+	/**
+	 * Returns a string containing the decoded value of a given HTML attribute.
+	 *
+	 * Text found inside an HTML attribute has different parsing rules than for
+	 * text found inside other markup, or DATA segments. Use this function to
+	 * read the decoded value of an HTML string inside a quoted attribute.
+	 *
+	 * Example:
+	 *
+	 *     '“😄”' === WP_HTML_Decode::decode_attribute( '&#x93;&#x1f604;&#x94' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $text Text containing raw and non-decoded attribute value to decode.
+	 * @return string Decoded UTF-8 value of given attribute value.
+	 */
+	public static function decode_attribute( $text ) {
+		return static::decode( 'attribute', $text );
+	}
+
+	/**
+	 * Decodes a span of HTML text, depending on the context in which it's found.
+	 *
+	 * This is a low-level method; prefer calling WP_HTML_Decoder::decode_attribute() or
+	 * WP_HTML_Decoder::decode_text_node() instead. It's provided for cases where this
+	 * may be difficult to do from calling code.
+	 *
+	 * Example:
+	 *
+	 *     '©' = WP_HTML_Decoder::decode( 'data', '&copy;' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @access private
+	 *
+	 * @param string $context `attribute` for decoding attribute values, `data` otherwise.
+	 * @param string $text    Text document containing span of text to decode.
+	 * @return string Decoded UTF-8 string.
+	 */
+	public static function decode( $context, $text ) {
+		$decoded = '';
+		$end     = strlen( $text );
+		$at      = 0;
+		$was_at  = 0;
+
+		while ( $at < $end ) {
+			$next_character_reference_at = strpos( $text, '&', $at );
+			if ( false === $next_character_reference_at || $next_character_reference_at >= $end ) {
+				break;
+			}
+
+			$character_reference = self::read_character_reference( $context, $text, $next_character_reference_at, $token_length );
+			if ( isset( $character_reference ) ) {
+				$at       = $next_character_reference_at;
+				$decoded .= substr( $text, $was_at, $at - $was_at );
+				$decoded .= $character_reference;
+				$at      += $token_length;
+				$was_at   = $at;
+				continue;
+			}
+
+			++$at;
+		}
+
+		if ( 0 === $was_at ) {
+			return $text;
+		}
+
+		if ( $was_at < $end ) {
+			$decoded .= substr( $text, $was_at, $end - $was_at );
+		}
+
+		return $decoded;
+	}
+
+	/**
+	 * Attempt to read a character reference at the given location in a given string,
+	 * depending on the context in which it's found.
+	 *
+	 * If a character reference is found, this function will return the translated value
+	 * that the reference maps to. It will then set `$match_byte_length` the
+	 * number of bytes of input it read while consuming the character reference. This
+	 * gives calling code the opportunity to advance its cursor when traversing a string
+	 * and decoding.
+	 *
+	 * Example:
+	 *
+	 *     null === WP_HTML_Decoder::read_character_reference( 'attribute', 'Ships&hellip;', 0 );
+	 *     '…'  === WP_HTML_Decoder::read_character_reference( 'attribute', 'Ships&hellip;', 5, $token_length );
+	 *     8    === $token_length; // `&hellip;`
+	 *
+	 *     null === WP_HTML_Decoder::read_character_reference( 'attribute', '&notin', 0 );
+	 *     '∉'  === WP_HTML_Decoder::read_character_reference( 'attribute', '&notin;', 0, $token_length );
+	 *     7    === $token_length; // `&notin;`
+	 *
+	 *     '¬'  === WP_HTML_Decoder::read_character_reference( 'data', '&notin', 0, $token_length );
+	 *     4    === $token_length; // `&not`
+	 *     '∉'  === WP_HTML_Decoder::read_character_reference( 'data', '&notin;', 0, $token_length );
+	 *     7    === $token_length; // `&notin;`
+	 *
+	 * @since 6.6.0
+	 *
+	 * @global WP_Token_Map $html5_named_character_references
+	 *
+	 * @param string $context            `attribute` for decoding attribute values, `data` otherwise.
+	 * @param string $text               Text document containing span of text to decode.
+	 * @param int    $at                 Optional. Byte offset into text where span begins, defaults to the beginning (0).
+	 * @param int    &$match_byte_length Optional. Set to byte-length of character reference if provided and if a match
+	 *                                   is found, otherwise not set. Default null.
+	 * @return string|false Decoded character reference in UTF-8 if found, otherwise `false`.
+	 */
+	public static function read_character_reference( $context, $text, $at = 0, &$match_byte_length = null ) {
+		/**
+		 * Mappings for HTML5 named character references.
+		 *
+		 * @var WP_Token_Map $html5_named_character_references
+		 */
+		global $html5_named_character_references;
+
+		$length = strlen( $text );
+		if ( $at + 1 >= $length ) {
+			return null;
+		}
+
+		if ( '&' !== $text[ $at ] ) {
+			return null;
+		}
+
+		/*
+		 * Numeric character references.
+		 *
+		 * When truncated, these will encode the code point found by parsing the
+		 * digits that are available. For example, when `&#x1f170;` is truncated
+		 * to `&#x1f1` it will encode `DZ`. It does not:
+		 *  - know how to parse the original `🅰`.
+		 *  - fail to parse and return plaintext `&#x1f1`.
+		 *  - fail to parse and return the replacement character `�`
+		 */
+		if ( '#' === $text[ $at + 1 ] ) {
+			if ( $at + 2 >= $length ) {
+				return null;
+			}
+
+			/** Tracks inner parsing within the numeric character reference. */
+			$digits_at = $at + 2;
+
+			if ( 'x' === $text[ $digits_at ] || 'X' === $text[ $digits_at ] ) {
+				$numeric_base   = 16;
+				$numeric_digits = '0123456789abcdefABCDEF';
+				$max_digits     = 6; // &#x10FFFF;
+				++$digits_at;
+			} else {
+				$numeric_base   = 10;
+				$numeric_digits = '0123456789';
+				$max_digits     = 7; // &#1114111;
+			}
+
+			// Cannot encode invalid Unicode code points. Max is to U+10FFFF.
+			$zero_count    = strspn( $text, '0', $digits_at );
+			$digit_count   = strspn( $text, $numeric_digits, $digits_at + $zero_count );
+			$after_digits  = $digits_at + $zero_count + $digit_count;
+			$has_semicolon = $after_digits < $length && ';' === $text[ $after_digits ];
+			$end_of_span   = $has_semicolon ? $after_digits + 1 : $after_digits;
+
+			// `&#` or `&#x` without digits returns into plaintext.
+			if ( 0 === $digit_count && 0 === $zero_count ) {
+				return null;
+			}
+
+			// Whereas `&#` and only zeros is invalid.
+			if ( 0 === $digit_count ) {
+				$match_byte_length = $end_of_span - $at;
+				return '�';
+			}
+
+			// If there are too many digits then it's not worth parsing. It's invalid.
+			if ( $digit_count > $max_digits ) {
+				$match_byte_length = $end_of_span - $at;
+				return '�';
+			}
+
+			$digits     = substr( $text, $digits_at + $zero_count, $digit_count );
+			$code_point = intval( $digits, $numeric_base );
+
+			/*
+			 * Noncharacters, 0x0D, and non-ASCII-whitespace control characters.
+			 *
+			 * > A noncharacter is a code point that is in the range U+FDD0 to U+FDEF,
+			 * > inclusive, or U+FFFE, U+FFFF, U+1FFFE, U+1FFFF, U+2FFFE, U+2FFFF,
+			 * > U+3FFFE, U+3FFFF, U+4FFFE, U+4FFFF, U+5FFFE, U+5FFFF, U+6FFFE,
+			 * > U+6FFFF, U+7FFFE, U+7FFFF, U+8FFFE, U+8FFFF, U+9FFFE, U+9FFFF,
+			 * > U+AFFFE, U+AFFFF, U+BFFFE, U+BFFFF, U+CFFFE, U+CFFFF, U+DFFFE,
+			 * > U+DFFFF, U+EFFFE, U+EFFFF, U+FFFFE, U+FFFFF, U+10FFFE, or U+10FFFF.
+			 *
+			 * A C0 control is a code point that is in the range of U+00 to U+1F,
+			 * but ASCII whitespace includes U+09, U+0A, U+0C, and U+0D.
+			 *
+			 * These characters are invalid but still decode as any valid character.
+			 * This comment is here to note and explain why there's no check to
+			 * remove these characters or replace them.
+			 *
+			 * @see https://infra.spec.whatwg.org/#noncharacter
+			 */
+
+			/*
+			 * Code points in the C1 controls area need to be remapped as if they
+			 * were stored in Windows-1252. Note! This transformation only happens
+			 * for numeric character references. The raw code points in the byte
+			 * stream are not translated.
+			 *
+			 * > If the number is one of the numbers in the first column of
+			 * > the following table, then find the row with that number in
+			 * > the first column, and set the character reference code to
+			 * > the number in the second column of that row.
+			 */
+			if ( $code_point >= 0x80 && $code_point <= 0x9F ) {
+				$windows_1252_mapping = array(
+					0x20AC, // 0x80 -> EURO SIGN (€).
+					0x81,   // 0x81 -> (no change).
+					0x201A, // 0x82 -> SINGLE LOW-9 QUOTATION MARK (‚).
+					0x0192, // 0x83 -> LATIN SMALL LETTER F WITH HOOK (ƒ).
+					0x201E, // 0x84 -> DOUBLE LOW-9 QUOTATION MARK („).
+					0x2026, // 0x85 -> HORIZONTAL ELLIPSIS (…).
+					0x2020, // 0x86 -> DAGGER (†).
+					0x2021, // 0x87 -> DOUBLE DAGGER (‡).
+					0x02C6, // 0x88 -> MODIFIER LETTER CIRCUMFLEX ACCENT (ˆ).
+					0x2030, // 0x89 -> PER MILLE SIGN (‰).
+					0x0160, // 0x8A -> LATIN CAPITAL LETTER S WITH CARON (Š).
+					0x2039, // 0x8B -> SINGLE LEFT-POINTING ANGLE QUOTATION MARK (‹).
+					0x0152, // 0x8C -> LATIN CAPITAL LIGATURE OE (Œ).
+					0x8D,   // 0x8D -> (no change).
+					0x017D, // 0x8E -> LATIN CAPITAL LETTER Z WITH CARON (Ž).
+					0x8F,   // 0x8F -> (no change).
+					0x90,   // 0x90 -> (no change).
+					0x2018, // 0x91 -> LEFT SINGLE QUOTATION MARK (‘).
+					0x2019, // 0x92 -> RIGHT SINGLE QUOTATION MARK (’).
+					0x201C, // 0x93 -> LEFT DOUBLE QUOTATION MARK (“).
+					0x201D, // 0x94 -> RIGHT DOUBLE QUOTATION MARK (”).
+					0x2022, // 0x95 -> BULLET (•).
+					0x2013, // 0x96 -> EN DASH (–).
+					0x2014, // 0x97 -> EM DASH (—).
+					0x02DC, // 0x98 -> SMALL TILDE (˜).
+					0x2122, // 0x99 -> TRADE MARK SIGN (™).
+					0x0161, // 0x9A -> LATIN SMALL LETTER S WITH CARON (š).
+					0x203A, // 0x9B -> SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (›).
+					0x0153, // 0x9C -> LATIN SMALL LIGATURE OE (œ).
+					0x9D,   // 0x9D -> (no change).
+					0x017E, // 0x9E -> LATIN SMALL LETTER Z WITH CARON (ž).
+					0x0178, // 0x9F -> LATIN CAPITAL LETTER Y WITH DIAERESIS (Ÿ).
+				);
+
+				$code_point = $windows_1252_mapping[ $code_point - 0x80 ];
+			}
+
+			$match_byte_length = $end_of_span - $at;
+			return self::code_point_to_utf8_bytes( $code_point );
+		}
+
+		/** Tracks inner parsing within the named character reference. */
+		$name_at = $at + 1;
+		// Minimum named character reference is two characters. E.g. `GT`.
+		if ( $name_at + 2 > $length ) {
+			return null;
+		}
+
+		$name_length = 0;
+		$replacement = $html5_named_character_references->read_token( $text, $name_at, $name_length );
+		if ( false === $replacement ) {
+			return null;
+		}
+
+		$after_name = $name_at + $name_length;
+
+		// If the match ended with a semicolon then it should always be decoded.
+		if ( ';' === $text[ $name_at + $name_length - 1 ] ) {
+			$match_byte_length = $after_name - $at;
+			return $replacement;
+		}
+
+		/*
+		 * At this point though there's a match for an entry in the named
+		 * character reference table but the match doesn't end in `;`.
+		 * It may be allowed if it's followed by something unambiguous.
+		 */
+		$ambiguous_follower = (
+			$after_name < $length &&
+			$name_at < $length &&
+			(
+				ctype_alnum( $text[ $after_name ] ) ||
+				'=' === $text[ $after_name ]
+			)
+		);
+
+		// It's non-ambiguous, safe to leave it in.
+		if ( ! $ambiguous_follower ) {
+			$match_byte_length = $after_name - $at;
+			return $replacement;
+		}
+
+		// It's ambiguous, which isn't allowed inside attributes.
+		if ( 'attribute' === $context ) {
+			return null;
+		}
+
+		$match_byte_length = $after_name - $at;
+		return $replacement;
+	}
+
+	/**
+	 * Encode a code point number into the UTF-8 encoding.
+	 *
+	 * This encoder implements the UTF-8 encoding algorithm for converting
+	 * a code point into a byte sequence. If it receives an invalid code
+	 * point it will return the Unicode Replacement Character U+FFFD `�`.
+	 *
+	 * Example:
+	 *
+	 *     '🅰' === WP_HTML_Decoder::code_point_to_utf8_bytes( 0x1f170 );
+	 *
+	 *     // Half of a surrogate pair is an invalid code point.
+	 *     '�' === WP_HTML_Decoder::code_point_to_utf8_bytes( 0xd83c );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @see https://www.rfc-editor.org/rfc/rfc3629 For the UTF-8 standard.
+	 *
+	 * @param int $code_point Which code point to convert.
+	 * @return string Converted code point, or `�` if invalid.
+	 */
+	public static function code_point_to_utf8_bytes( $code_point ) {
+		// Pre-check to ensure a valid code point.
+		if (
+			$code_point <= 0 ||
+			( $code_point >= 0xD800 && $code_point <= 0xDFFF ) ||
+			$code_point > 0x10FFFF
+		) {
+			return '�';
+		}
+
+		if ( $code_point <= 0x7F ) {
+			return chr( $code_point );
+		}
+
+		if ( $code_point <= 0x7FF ) {
+			$byte1 = ( $code_point >> 6 ) | 0xC0;
+			$byte2 = $code_point & 0x3F | 0x80;
+
+			return pack( 'CC', $byte1, $byte2 );
+		}
+
+		if ( $code_point <= 0xFFFF ) {
+			$byte1 = ( $code_point >> 12 ) | 0xE0;
+			$byte2 = ( $code_point >> 6 ) & 0x3F | 0x80;
+			$byte3 = $code_point & 0x3F | 0x80;
+
+			return pack( 'CCC', $byte1, $byte2, $byte3 );
+		}
+
+		// Any values above U+10FFFF are eliminated above in the pre-check.
+		$byte1 = ( $code_point >> 18 ) | 0xF0;
+		$byte2 = ( $code_point >> 12 ) & 0x3F | 0x80;
+		$byte3 = ( $code_point >> 6 ) & 0x3F | 0x80;
+		$byte4 = $code_point & 0x3F | 0x80;
+
+		return pack( 'CCCC', $byte1, $byte2, $byte3, $byte4 );
+	}
+}
diff --git a/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-open-elements-6-6.php b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-open-elements-6-6.php
new file mode 100644
index 00000000000000..da237e02bc63ba
--- /dev/null
+++ b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-open-elements-6-6.php
@@ -0,0 +1,541 @@
+<?php
+/**
+ * HTML API: WP_HTML_Open_Elements class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the stack of open elements.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * > Initially, the stack of open elements is empty. The stack grows
+ * > downwards; the topmost node on the stack is the first one added
+ * > to the stack, and the bottommost node of the stack is the most
+ * > recently added node in the stack (notwithstanding when the stack
+ * > is manipulated in a random access fashion as part of the handling
+ * > for misnested tags).
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see https://html.spec.whatwg.org/#stack-of-open-elements
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Open_Elements_6_6 {
+	/**
+	 * Holds the stack of open element references.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token[]
+	 */
+	public $stack = array();
+
+	/**
+	 * Whether a P element is in button scope currently.
+	 *
+	 * This class optimizes scope lookup by pre-calculating
+	 * this value when elements are added and removed to the
+	 * stack of open elements which might change its value.
+	 * This avoids frequent iteration over the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var bool
+	 */
+	private $has_p_in_button_scope = false;
+
+	/**
+	 * A function that will be called when an item is popped off the stack of open elements.
+	 *
+	 * The function will be called with the popped item as its argument.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var Closure
+	 */
+	private $pop_handler = null;
+
+	/**
+	 * A function that will be called when an item is pushed onto the stack of open elements.
+	 *
+	 * The function will be called with the pushed item as its argument.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var Closure
+	 */
+	private $push_handler = null;
+
+	/**
+	 * Sets a pop handler that will be called when an item is popped off the stack of
+	 * open elements.
+	 *
+	 * The function will be called with the pushed item as its argument.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param Closure $handler The handler function.
+	 */
+	public function set_pop_handler( Closure $handler ) {
+		$this->pop_handler = $handler;
+	}
+
+	/**
+	 * Sets a push handler that will be called when an item is pushed onto the stack of
+	 * open elements.
+	 *
+	 * The function will be called with the pushed item as its argument.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param Closure $handler The handler function.
+	 */
+	public function set_push_handler( Closure $handler ) {
+		$this->push_handler = $handler;
+	}
+
+	/**
+	 * Reports if a specific node is in the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token Look for this node in the stack.
+	 * @return bool Whether the referenced node is in the stack of open elements.
+	 */
+	public function contains_node( $token ) {
+		foreach ( $this->walk_up() as $item ) {
+			if ( $token->bookmark_name === $item->bookmark_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns how many nodes are currently in the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return int How many node are in the stack of open elements.
+	 */
+	public function count() {
+		return count( $this->stack );
+	}
+
+	/**
+	 * Returns the node at the end of the stack of open elements,
+	 * if one exists. If the stack is empty, returns null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return WP_HTML_Token|null Last node in the stack of open elements, if one exists, otherwise null.
+	 */
+	public function current_node() {
+		$current_node = end( $this->stack );
+
+		return $current_node ? $current_node : null;
+	}
+
+	/**
+	 * Returns whether an element is in a specific scope.
+	 *
+	 * ## HTML Support
+	 *
+	 * This function skips checking for the termination list because there
+	 * are no supported elements which appear in the termination list.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-the-specific-scope
+	 *
+	 * @param string   $tag_name         Name of tag check.
+	 * @param string[] $termination_list List of elements that terminate the search.
+	 * @return bool Whether the element was found in a specific scope.
+	 */
+	public function has_element_in_specific_scope( $tag_name, $termination_list ) {
+		foreach ( $this->walk_up() as $node ) {
+			if ( $node->node_name === $tag_name ) {
+				return true;
+			}
+
+			if (
+				'(internal: H1 through H6 - do not use)' === $tag_name &&
+				in_array( $node->node_name, array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ), true )
+			) {
+				return true;
+			}
+
+			switch ( $node->node_name ) {
+				case 'HTML':
+					return false;
+			}
+
+			if ( in_array( $node->node_name, $termination_list, true ) ) {
+				return false;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns whether a particular element is in scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_scope( $tag_name ) {
+		return $this->has_element_in_specific_scope(
+			$tag_name,
+			array(
+
+				/*
+				 * Because it's not currently possible to encounter
+				 * one of the termination elements, they don't need
+				 * to be listed here. If they were, they would be
+				 * unreachable and only waste CPU cycles while
+				 * scanning through HTML.
+				 */
+			)
+		);
+	}
+
+	/**
+	 * Returns whether a particular element is in list item scope.
+	 *
+	 * @since 6.4.0
+	 * @since 6.5.0 Implemented: no longer throws on every invocation.
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-list-item-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_list_item_scope( $tag_name ) {
+		return $this->has_element_in_specific_scope(
+			$tag_name,
+			array(
+				// There are more elements that belong here which aren't currently supported.
+				'OL',
+				'UL',
+			)
+		);
+	}
+
+	/**
+	 * Returns whether a particular element is in button scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_button_scope( $tag_name ) {
+		return $this->has_element_in_specific_scope( $tag_name, array( 'BUTTON' ) );
+	}
+
+	/**
+	 * Returns whether a particular element is in table scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-table-scope
+	 *
+	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_table_scope( $tag_name ) {
+		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on table scope.' );
+
+		return false; // The linter requires this unreachable code until the function is implemented and can return.
+	}
+
+	/**
+	 * Returns whether a particular element is in select scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-select-scope
+	 *
+	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_select_scope( $tag_name ) {
+		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on select scope.' );
+
+		return false; // The linter requires this unreachable code until the function is implemented and can return.
+	}
+
+	/**
+	 * Returns whether a P is in BUTTON scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
+	 *
+	 * @return bool Whether a P is in BUTTON scope.
+	 */
+	public function has_p_in_button_scope() {
+		return $this->has_p_in_button_scope;
+	}
+
+	/**
+	 * Pops a node off of the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @return bool Whether a node was popped off of the stack.
+	 */
+	public function pop() {
+		$item = array_pop( $this->stack );
+		if ( null === $item ) {
+			return false;
+		}
+
+		if ( 'context-node' === $item->bookmark_name ) {
+			$this->stack[] = $item;
+			return false;
+		}
+
+		$this->after_element_pop( $item );
+		return true;
+	}
+
+	/**
+	 * Pops nodes off of the stack of open elements until one with the given tag name has been popped.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Open_Elements::pop
+	 *
+	 * @param string $tag_name Name of tag that needs to be popped off of the stack of open elements.
+	 * @return bool Whether a tag of the given name was found and popped off of the stack of open elements.
+	 */
+	public function pop_until( $tag_name ) {
+		foreach ( $this->walk_up() as $item ) {
+			if ( 'context-node' === $item->bookmark_name ) {
+				return true;
+			}
+
+			$this->pop();
+
+			if (
+				'(internal: H1 through H6 - do not use)' === $tag_name &&
+				in_array( $item->node_name, array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ), true )
+			) {
+				return true;
+			}
+
+			if ( $tag_name === $item->node_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Pushes a node onto the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @param WP_HTML_Token $stack_item Item to add onto stack.
+	 */
+	public function push( $stack_item ) {
+		$this->stack[] = $stack_item;
+		$this->after_element_push( $stack_item );
+	}
+
+	/**
+	 * Removes a specific node from the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token The node to remove from the stack of open elements.
+	 * @return bool Whether the node was found and removed from the stack of open elements.
+	 */
+	public function remove_node( $token ) {
+		if ( 'context-node' === $token->bookmark_name ) {
+			return false;
+		}
+
+		foreach ( $this->walk_up() as $position_from_end => $item ) {
+			if ( $token->bookmark_name !== $item->bookmark_name ) {
+				continue;
+			}
+
+			$position_from_start = $this->count() - $position_from_end - 1;
+			array_splice( $this->stack, $position_from_start, 1 );
+			$this->after_element_pop( $item );
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Steps through the stack of open elements, starting with the top element
+	 * (added first) and walking downwards to the one added last.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_down() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > EM -> STRONG -> A ->
+	 *
+	 * To start with the most-recently added element and walk towards the top,
+	 * see WP_HTML_Open_Elements::walk_up().
+	 *
+	 * @since 6.4.0
+	 */
+	public function walk_down() {
+		$count = count( $this->stack );
+
+		for ( $i = 0; $i < $count; $i++ ) {
+			yield $this->stack[ $i ];
+		}
+	}
+
+	/**
+	 * Steps through the stack of open elements, starting with the bottom element
+	 * (added last) and walking upwards to the one added first.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_up() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > A -> STRONG -> EM ->
+	 *
+	 * To start with the first added element and walk towards the bottom,
+	 * see WP_HTML_Open_Elements::walk_down().
+	 *
+	 * @since 6.4.0
+	 * @since 6.5.0 Accepts $above_this_node to start traversal above a given node, if it exists.
+	 *
+	 * @param ?WP_HTML_Token $above_this_node Start traversing above this node, if provided and if the node exists.
+	 */
+	public function walk_up( $above_this_node = null ) {
+		$has_found_node = null === $above_this_node;
+
+		for ( $i = count( $this->stack ) - 1; $i >= 0; $i-- ) {
+			$node = $this->stack[ $i ];
+
+			if ( ! $has_found_node ) {
+				$has_found_node = $node === $above_this_node;
+				continue;
+			}
+
+			yield $node;
+		}
+	}
+
+	/*
+	 * Internal helpers.
+	 */
+
+	/**
+	 * Updates internal flags after adding an element.
+	 *
+	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
+	 * flags that are only modified when adding and removing elements. This allows
+	 * the HTML Processor to quickly check for these conditions instead of iterating
+	 * over the open stack elements upon each new tag it encounters. These flags,
+	 * however, need to be maintained as items are added and removed from the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $item Element that was added to the stack of open elements.
+	 */
+	public function after_element_push( $item ) {
+		/*
+		 * When adding support for new elements, expand this switch to trap
+		 * cases where the precalculated value needs to change.
+		 */
+		switch ( $item->node_name ) {
+			case 'BUTTON':
+				$this->has_p_in_button_scope = false;
+				break;
+
+			case 'P':
+				$this->has_p_in_button_scope = true;
+				break;
+		}
+
+		if ( null !== $this->push_handler ) {
+			( $this->push_handler )( $item );
+		}
+	}
+
+	/**
+	 * Updates internal flags after removing an element.
+	 *
+	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
+	 * flags that are only modified when adding and removing elements. This allows
+	 * the HTML Processor to quickly check for these conditions instead of iterating
+	 * over the open stack elements upon each new tag it encounters. These flags,
+	 * however, need to be maintained as items are added and removed from the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $item Element that was removed from the stack of open elements.
+	 */
+	public function after_element_pop( $item ) {
+		/*
+		 * When adding support for new elements, expand this switch to trap
+		 * cases where the precalculated value needs to change.
+		 */
+		switch ( $item->node_name ) {
+			case 'BUTTON':
+				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
+				break;
+
+			case 'P':
+				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
+				break;
+		}
+
+		if ( null !== $this->pop_handler ) {
+			( $this->pop_handler )( $item );
+		}
+	}
+
+	/**
+	 * Wakeup magic method.
+	 *
+	 * @since 6.6.0
+	 */
+	public function __wakeup() {
+		throw new \LogicException( __CLASS__ . ' should never be unserialized' );
+	}
+}
diff --git a/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-processor-6-6.php b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-processor-6-6.php
new file mode 100644
index 00000000000000..77801535ff3683
--- /dev/null
+++ b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-processor-6-6.php
@@ -0,0 +1,2472 @@
+<?php
+/**
+ * HTML API: WP_HTML_Processor class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used to safely parse and modify an HTML document.
+ *
+ * The HTML Processor class properly parses and modifies HTML5 documents.
+ *
+ * It supports a subset of the HTML5 specification, and when it encounters
+ * unsupported markup, it aborts early to avoid unintentionally breaking
+ * the document. The HTML Processor should never break an HTML document.
+ *
+ * While the `WP_HTML_Tag_Processor` is a valuable tool for modifying
+ * attributes on individual HTML tags, the HTML Processor is more capable
+ * and useful for the following operations:
+ *
+ *  - Querying based on nested HTML structure.
+ *
+ * Eventually the HTML Processor will also support:
+ *  - Wrapping a tag in surrounding HTML.
+ *  - Unwrapping a tag by removing its parent.
+ *  - Inserting and removing nodes.
+ *  - Reading and changing inner content.
+ *  - Navigating up or around HTML structure.
+ *
+ * ## Usage
+ *
+ * Use of this class requires three steps:
+ *
+ *   1. Call a static creator method with your input HTML document.
+ *   2. Find the location in the document you are looking for.
+ *   3. Request changes to the document at that location.
+ *
+ * Example:
+ *
+ *     $processor = WP_HTML_Processor::create_fragment( $html );
+ *     if ( $processor->next_tag( array( 'breadcrumbs' => array( 'DIV', 'FIGURE', 'IMG' ) ) ) ) {
+ *         $processor->add_class( 'responsive-image' );
+ *     }
+ *
+ * #### Breadcrumbs
+ *
+ * Breadcrumbs represent the stack of open elements from the root
+ * of the document or fragment down to the currently-matched node,
+ * if one is currently selected. Call WP_HTML_Processor::get_breadcrumbs()
+ * to inspect the breadcrumbs for a matched tag.
+ *
+ * Breadcrumbs can specify nested HTML structure and are equivalent
+ * to a CSS selector comprising tag names separated by the child
+ * combinator, such as "DIV > FIGURE > IMG".
+ *
+ * Since all elements find themselves inside a full HTML document
+ * when parsed, the return value from `get_breadcrumbs()` will always
+ * contain any implicit outermost elements. For example, when parsing
+ * with `create_fragment()` in the `BODY` context (the default), any
+ * tag in the given HTML document will contain `array( 'HTML', 'BODY', … )`
+ * in its breadcrumbs.
+ *
+ * Despite containing the implied outermost elements in their breadcrumbs,
+ * tags may be found with the shortest-matching breadcrumb query. That is,
+ * `array( 'IMG' )` matches all IMG elements and `array( 'P', 'IMG' )`
+ * matches all IMG elements directly inside a P element. To ensure that no
+ * partial matches erroneously match it's possible to specify in a query
+ * the full breadcrumb match all the way down from the root HTML element.
+ *
+ * Example:
+ *
+ *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
+ *     //               ----- Matches here.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'IMG' ) ) );
+ *
+ *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
+ *     //                                  ---- Matches here.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'FIGCAPTION', 'EM' ) ) );
+ *
+ *     $html = '<div><img></div><img>';
+ *     //                       ----- Matches here, because IMG must be a direct child of the implicit BODY.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'BODY', 'IMG' ) ) );
+ *
+ * ## HTML Support
+ *
+ * This class implements a small part of the HTML5 specification.
+ * It's designed to operate within its support and abort early whenever
+ * encountering circumstances it can't properly handle. This is
+ * the principle way in which this class remains as simple as possible
+ * without cutting corners and breaking compliance.
+ *
+ * ### Supported elements
+ *
+ * If any unsupported element appears in the HTML input the HTML Processor
+ * will abort early and stop all processing. This draconian measure ensures
+ * that the HTML Processor won't break any HTML it doesn't fully understand.
+ *
+ * The following list specifies the HTML tags that _are_ supported:
+ *
+ *  - Containers: ADDRESS, BLOCKQUOTE, DETAILS, DIALOG, DIV, FOOTER, HEADER, MAIN, MENU, SPAN, SUMMARY.
+ *  - Custom elements: All custom elements are supported. :)
+ *  - Form elements: BUTTON, DATALIST, FIELDSET, INPUT, LABEL, LEGEND, METER, PROGRESS, SEARCH.
+ *  - Formatting elements: B, BIG, CODE, EM, FONT, I, PRE, SMALL, STRIKE, STRONG, TT, U, WBR.
+ *  - Heading elements: H1, H2, H3, H4, H5, H6, HGROUP.
+ *  - Links: A.
+ *  - Lists: DD, DL, DT, LI, OL, UL.
+ *  - Media elements: AUDIO, CANVAS, EMBED, FIGCAPTION, FIGURE, IMG, MAP, PICTURE, SOURCE, TRACK, VIDEO.
+ *  - Paragraph: BR, P.
+ *  - Phrasing elements: ABBR, AREA, BDI, BDO, CITE, DATA, DEL, DFN, INS, MARK, OUTPUT, Q, SAMP, SUB, SUP, TIME, VAR.
+ *  - Sectioning elements: ARTICLE, ASIDE, HR, NAV, SECTION.
+ *  - Templating elements: SLOT.
+ *  - Text decoration: RUBY.
+ *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, KEYGEN, LISTING, MULTICOL, NEXTID, PARAM, SPACER.
+ *
+ * ### Supported markup
+ *
+ * Some kinds of non-normative HTML involve reconstruction of formatting elements and
+ * re-parenting of mis-nested elements. For example, a DIV tag found inside a TABLE
+ * may in fact belong _before_ the table in the DOM. If the HTML Processor encounters
+ * such a case it will stop processing.
+ *
+ * The following list specifies HTML markup that _is_ supported:
+ *
+ *  - Markup involving only those tags listed above.
+ *  - Fully-balanced and non-overlapping tags.
+ *  - HTML with unexpected tag closers.
+ *  - Some unbalanced or overlapping tags.
+ *  - P tags after unclosed P tags.
+ *  - BUTTON tags after unclosed BUTTON tags.
+ *  - A tags after unclosed A tags that don't involve any active formatting elements.
+ *
+ * @since 6.4.0
+ *
+ * @see WP_HTML_Tag_Processor
+ * @see https://html.spec.whatwg.org/
+ */
+class Gutenberg_HTML_Processor_6_6 extends Gutenberg_HTML_Tag_Processor_6_6 {
+	/**
+	 * The maximum number of bookmarks allowed to exist at any given time.
+	 *
+	 * HTML processing requires more bookmarks than basic tag processing,
+	 * so this class constant from the Tag Processor is overwritten.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var int
+	 */
+	const MAX_BOOKMARKS = 100;
+
+	/**
+	 * Holds the working state of the parser, including the stack of
+	 * open elements and the stack of active formatting elements.
+	 *
+	 * Initialized in the constructor.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Processor_State
+	 */
+	private $state = null;
+
+	/**
+	 * Used to create unique bookmark names.
+	 *
+	 * This class sets a bookmark for every tag in the HTML document that it encounters.
+	 * The bookmark name is auto-generated and increments, starting with `1`. These are
+	 * internal bookmarks and are automatically released when the referring WP_HTML_Token
+	 * goes out of scope and is garbage-collected.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::$release_internal_bookmark_on_destruct
+	 *
+	 * @var int
+	 */
+	private $bookmark_counter = 0;
+
+	/**
+	 * Stores an explanation for why something failed, if it did.
+	 *
+	 * @see self::get_last_error
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string|null
+	 */
+	private $last_error = null;
+
+	/**
+	 * Releases a bookmark when PHP garbage-collects its wrapping WP_HTML_Token instance.
+	 *
+	 * This function is created inside the class constructor so that it can be passed to
+	 * the stack of open elements and the stack of active formatting elements without
+	 * exposing it as a public method on the class.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var closure
+	 */
+	private $release_internal_bookmark_on_destruct = null;
+
+	/**
+	 * Stores stack events which arise during parsing of the
+	 * HTML document, which will then supply the "match" events.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var WP_HTML_Stack_Event[]
+	 */
+	private $element_queue = array();
+
+	/**
+	 * Current stack event, if set, representing a matched token.
+	 *
+	 * Because the parser may internally point to a place further along in a document
+	 * than the nodes which have already been processed (some "virtual" nodes may have
+	 * appeared while scanning the HTML document), this will point at the "current" node
+	 * being processed. It comes from the front of the element queue.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var ?WP_HTML_Stack_Event
+	 */
+	private $current_element = null;
+
+	/**
+	 * Context node if created as a fragment parser.
+	 *
+	 * @var ?WP_HTML_Token
+	 */
+	private $context_node = null;
+
+	/**
+	 * Whether the parser has yet processed the context node,
+	 * if created as a fragment parser.
+	 *
+	 * The context node will be initially pushed onto the stack of open elements,
+	 * but when created as a fragment parser, this context element (and the implicit
+	 * HTML document node above it) should not be exposed as a matched token or node.
+	 *
+	 * This boolean indicates whether the processor should skip over the current
+	 * node in its initial search for the first node created from the input HTML.
+	 *
+	 * @var bool
+	 */
+	private $has_seen_context_node = false;
+
+	/*
+	 * Public Interface Functions
+	 */
+
+	/**
+	 * Creates an HTML processor in the fragment parsing mode.
+	 *
+	 * Use this for cases where you are processing chunks of HTML that
+	 * will be found within a bigger HTML document, such as rendered
+	 * block output that exists within a post, `the_content` inside a
+	 * rendered site layout.
+	 *
+	 * Fragment parsing occurs within a context, which is an HTML element
+	 * that the document will eventually be placed in. It becomes important
+	 * when special elements have different rules than others, such as inside
+	 * a TEXTAREA or a TITLE tag where things that look like tags are text,
+	 * or inside a SCRIPT tag where things that look like HTML syntax are JS.
+	 *
+	 * The context value should be a representation of the tag into which the
+	 * HTML is found. For most cases this will be the body element. The HTML
+	 * form is provided because a context element may have attributes that
+	 * impact the parse, such as with a SCRIPT tag and its `type` attribute.
+	 *
+	 * ## Current HTML Support
+	 *
+	 *  - The only supported context is `<body>`, which is the default value.
+	 *  - The only supported document encoding is `UTF-8`, which is the default value.
+	 *
+	 * @since 6.4.0
+	 * @since 6.6.0 Returns `static` instead of `self` so it can create subclass instances.
+	 *
+	 * @param string $html     Input HTML fragment to process.
+	 * @param string $context  Context element for the fragment, must be default of `<body>`.
+	 * @param string $encoding Text encoding of the document; must be default of 'UTF-8'.
+	 * @return static|null The created processor if successful, otherwise null.
+	 */
+	public static function create_fragment( $html, $context = '<body>', $encoding = 'UTF-8' ) {
+		if ( '<body>' !== $context || 'UTF-8' !== $encoding ) {
+			return null;
+		}
+
+		$processor                        = new static( $html, self::CONSTRUCTOR_UNLOCK_CODE );
+		$processor->state->context_node   = array( 'BODY', array() );
+		$processor->state->insertion_mode = Gutenberg_HTML_Processor_State_6_6::INSERTION_MODE_IN_BODY;
+
+		// @todo Create "fake" bookmarks for non-existent but implied nodes.
+		$processor->bookmarks['root-node']    = new WP_HTML_Span( 0, 0 );
+		$processor->bookmarks['context-node'] = new WP_HTML_Span( 0, 0 );
+
+		$processor->state->stack_of_open_elements->push(
+			new WP_HTML_Token(
+				'root-node',
+				'HTML',
+				false
+			)
+		);
+
+		$context_node = new WP_HTML_Token(
+			'context-node',
+			$processor->state->context_node[0],
+			false
+		);
+
+		$processor->state->stack_of_open_elements->push( $context_node );
+		$processor->context_node = $context_node;
+
+		return $processor;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * Do not use this method. Use the static creator methods instead.
+	 *
+	 * @access private
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::create_fragment()
+	 *
+	 * @param string      $html                                  HTML to process.
+	 * @param string|null $use_the_static_create_methods_instead This constructor should not be called manually.
+	 */
+	public function __construct( $html, $use_the_static_create_methods_instead = null ) {
+		parent::__construct( $html );
+
+		if ( self::CONSTRUCTOR_UNLOCK_CODE !== $use_the_static_create_methods_instead ) {
+			_doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					/* translators: %s: WP_HTML_Processor::create_fragment(). */
+					__( 'Call %s to create an HTML Processor instead of calling the constructor directly.' ),
+					'<code>WP_HTML_Processor::create_fragment()</code>'
+				),
+				'6.4.0'
+			);
+		}
+
+		$this->state = new Gutenberg_HTML_Processor_State_6_6();
+
+		$this->state->stack_of_open_elements->set_push_handler(
+			function ( WP_HTML_Token $token ) {
+				$is_virtual            = ! isset( $this->state->current_token ) || $this->is_tag_closer();
+				$same_node             = isset( $this->state->current_token ) && $token->node_name === $this->state->current_token->node_name;
+				$provenance            = ( ! $same_node || $is_virtual ) ? 'virtual' : 'real';
+				$this->element_queue[] = new Gutenberg_HTML_Stack_Event_6_6( $token, Gutenberg_HTML_Stack_Event_6_6::PUSH, $provenance );
+			}
+		);
+
+		$this->state->stack_of_open_elements->set_pop_handler(
+			function ( WP_HTML_Token $token ) {
+				$is_virtual            = ! isset( $this->state->current_token ) || ! $this->is_tag_closer();
+				$same_node             = isset( $this->state->current_token ) && $token->node_name === $this->state->current_token->node_name;
+				$provenance            = ( ! $same_node || $is_virtual ) ? 'virtual' : 'real';
+				$this->element_queue[] = new Gutenberg_HTML_Stack_Event_6_6( $token, Gutenberg_HTML_Stack_Event_6_6::POP, $provenance );
+			}
+		);
+
+		/*
+		 * Create this wrapper so that it's possible to pass
+		 * a private method into WP_HTML_Token classes without
+		 * exposing it to any public API.
+		 */
+		$this->release_internal_bookmark_on_destruct = function ( $name ) {
+			parent::release_bookmark( $name );
+		};
+	}
+
+	/**
+	 * Returns the last error, if any.
+	 *
+	 * Various situations lead to parsing failure but this class will
+	 * return `false` in all those cases. To determine why something
+	 * failed it's possible to request the last error. This can be
+	 * helpful to know to distinguish whether a given tag couldn't
+	 * be found or if content in the document caused the processor
+	 * to give up and abort processing.
+	 *
+	 * Example
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<template><strong><button><em><p><em>' );
+	 *     false === $processor->next_tag();
+	 *     WP_HTML_Processor::ERROR_UNSUPPORTED === $processor->get_last_error();
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see self::ERROR_UNSUPPORTED
+	 * @see self::ERROR_EXCEEDED_MAX_BOOKMARKS
+	 *
+	 * @return string|null The last error, if one exists, otherwise null.
+	 */
+	public function get_last_error() {
+		return $this->last_error;
+	}
+
+	/**
+	 * Finds the next tag matching the $query.
+	 *
+	 * @todo Support matching the class name and tag name.
+	 *
+	 * @since 6.4.0
+	 * @since 6.6.0 Visits all tokens, including virtual ones.
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type string      $tag_closers  'visit' to pause at tag closers, 'skip' or unset to only visit openers.
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this whole class name to match.
+	 *     @type string[]    $breadcrumbs  DOM sub-path at which element is found, e.g. `array( 'FIGURE', 'IMG' )`.
+	 *                                     May also contain the wildcard `*` which matches a single element, e.g. `array( 'SECTION', '*' )`.
+	 * }
+	 * @return bool Whether a tag was matched.
+	 */
+	public function next_tag( $query = null ) {
+		$visit_closers = isset( $query['tag_closers'] ) && 'visit' === $query['tag_closers'];
+
+		if ( null === $query ) {
+			while ( $this->next_token() ) {
+				if ( '#tag' !== $this->get_token_type() ) {
+					continue;
+				}
+
+				if ( ! $this->is_tag_closer() || $visit_closers ) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		if ( is_string( $query ) ) {
+			$query = array( 'breadcrumbs' => array( $query ) );
+		}
+
+		if ( ! is_array( $query ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Please pass a query array to this function.' ),
+				'6.4.0'
+			);
+			return false;
+		}
+
+		$needs_class = ( isset( $query['class_name'] ) && is_string( $query['class_name'] ) )
+			? $query['class_name']
+			: null;
+
+		if ( ! ( array_key_exists( 'breadcrumbs', $query ) && is_array( $query['breadcrumbs'] ) ) ) {
+			while ( $this->next_token() ) {
+				if ( '#tag' !== $this->get_token_type() ) {
+					continue;
+				}
+
+				if ( isset( $needs_class ) && ! $this->has_class( $needs_class ) ) {
+					continue;
+				}
+
+				if ( ! $this->is_tag_closer() || $visit_closers ) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		$breadcrumbs  = $query['breadcrumbs'];
+		$match_offset = isset( $query['match_offset'] ) ? (int) $query['match_offset'] : 1;
+
+		while ( $match_offset > 0 && $this->next_token() ) {
+			if ( '#tag' !== $this->get_token_type() || $this->is_tag_closer() ) {
+				continue;
+			}
+
+			if ( isset( $needs_class ) && ! $this->has_class( $needs_class ) ) {
+				continue;
+			}
+
+			if ( $this->matches_breadcrumbs( $breadcrumbs ) && 0 === --$match_offset ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Ensures internal accounting is maintained for HTML semantic rules while
+	 * the underlying Tag Processor class is seeking to a bookmark.
+	 *
+	 * This doesn't currently have a way to represent non-tags and doesn't process
+	 * semantic rules for text nodes. For access to the raw tokens consider using
+	 * WP_HTML_Tag_Processor instead.
+	 *
+	 * @since 6.5.0 Added for internal support; do not use.
+	 *
+	 * @access private
+	 *
+	 * @return bool
+	 */
+	public function next_token() {
+		$this->current_element = null;
+
+		if ( isset( $this->last_error ) ) {
+			return false;
+		}
+
+		if ( 'done' !== $this->has_seen_context_node && 0 === count( $this->element_queue ) && ! $this->step() ) {
+			while ( 'context-node' !== $this->state->stack_of_open_elements->current_node()->bookmark_name && $this->state->stack_of_open_elements->pop() ) {
+				continue;
+			}
+			$this->has_seen_context_node = 'done';
+			return $this->next_token();
+		}
+
+		$this->current_element = array_shift( $this->element_queue );
+		while ( isset( $this->context_node ) && ! $this->has_seen_context_node ) {
+			if ( isset( $this->current_element ) ) {
+				if ( $this->context_node === $this->current_element->token && Gutenberg_HTML_Stack_Event_6_6::PUSH === $this->current_element->operation ) {
+					$this->has_seen_context_node = true;
+					return $this->next_token();
+				}
+			}
+			$this->current_element = array_shift( $this->element_queue );
+		}
+
+		if ( ! isset( $this->current_element ) ) {
+			if ( 'done' === $this->has_seen_context_node ) {
+				return false;
+			} else {
+				return $this->next_token();
+			}
+		}
+
+		if ( isset( $this->context_node ) && Gutenberg_HTML_Stack_Event_6_6::POP === $this->current_element->operation && $this->context_node === $this->current_element->token ) {
+			$this->element_queue   = array();
+			$this->current_element = null;
+			return false;
+		}
+
+		// Avoid sending close events for elements which don't expect a closing.
+		if (
+			Gutenberg_HTML_Stack_Event_6_6::POP === $this->current_element->operation &&
+			! static::expects_closer( $this->current_element->token )
+		) {
+			return $this->next_token();
+		}
+
+		return true;
+	}
+
+
+	/**
+	 * Indicates if the current tag token is a tag closer.
+	 *
+	 * Example:
+	 *
+	 *     $p = WP_HTML_Processor::create_fragment( '<div></div>' );
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === false;
+	 *
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === true;
+	 *
+	 * @since 6.6.0 Subclassed for HTML Processor.
+	 *
+	 * @return bool Whether the current tag is a tag closer.
+	 */
+	public function is_tag_closer() {
+		return $this->is_virtual()
+			? ( Gutenberg_HTML_Stack_Event_6_6::POP === $this->current_element->operation && '#tag' === $this->get_token_type() )
+			: parent::is_tag_closer();
+	}
+
+	/**
+	 * Indicates if the currently-matched token is virtual, created by a stack operation
+	 * while processing HTML, rather than a token found in the HTML text itself.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @return bool Whether the current token is virtual.
+	 */
+	private function is_virtual() {
+		return (
+			isset( $this->current_element->provenance ) &&
+			'virtual' === $this->current_element->provenance
+		);
+	}
+
+	/**
+	 * Indicates if the currently-matched tag matches the given breadcrumbs.
+	 *
+	 * A "*" represents a single tag wildcard, where any tag matches, but not no tags.
+	 *
+	 * At some point this function _may_ support a `**` syntax for matching any number
+	 * of unspecified tags in the breadcrumb stack. This has been intentionally left
+	 * out, however, to keep this function simple and to avoid introducing backtracking,
+	 * which could open up surprising performance breakdowns.
+	 *
+	 * Example:
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<div><span><figure><img></figure></span></div>' );
+	 *     $processor->next_tag( 'img' );
+	 *     true  === $processor->matches_breadcrumbs( array( 'figure', 'img' ) );
+	 *     true  === $processor->matches_breadcrumbs( array( 'span', 'figure', 'img' ) );
+	 *     false === $processor->matches_breadcrumbs( array( 'span', 'img' ) );
+	 *     true  === $processor->matches_breadcrumbs( array( 'span', '*', 'img' ) );
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string[] $breadcrumbs DOM sub-path at which element is found, e.g. `array( 'FIGURE', 'IMG' )`.
+	 *                              May also contain the wildcard `*` which matches a single element, e.g. `array( 'SECTION', '*' )`.
+	 * @return bool Whether the currently-matched tag is found at the given nested structure.
+	 */
+	public function matches_breadcrumbs( $breadcrumbs ) {
+		// Everything matches when there are zero constraints.
+		if ( 0 === count( $breadcrumbs ) ) {
+			return true;
+		}
+
+		// Start at the last crumb.
+		$crumb = end( $breadcrumbs );
+
+		if ( '*' !== $crumb && $this->get_tag() !== strtoupper( $crumb ) ) {
+			return false;
+		}
+
+		foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
+			$crumb = strtoupper( current( $breadcrumbs ) );
+
+			if ( '*' !== $crumb && $node->node_name !== $crumb ) {
+				return false;
+			}
+
+			if ( false === prev( $breadcrumbs ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Indicates if the currently-matched node expects a closing
+	 * token, or if it will self-close on the next step.
+	 *
+	 * Most HTML elements expect a closer, such as a P element or
+	 * a DIV element. Others, like an IMG element are void and don't
+	 * have a closing tag. Special elements, such as SCRIPT and STYLE,
+	 * are treated just like void tags. Text nodes and self-closing
+	 * foreign content will also act just like a void tag, immediately
+	 * closing as soon as the processor advances to the next token.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @todo When adding support for foreign content, ensure that
+	 *       this returns false for self-closing elements in the
+	 *       SVG and MathML namespace.
+	 *
+	 * @param  ?WP_HTML_Token $node Node to examine instead of current node, if provided.
+	 * @return bool Whether to expect a closer for the currently-matched node,
+	 *              or `null` if not matched on any token.
+	 */
+	public function expects_closer( $node = null ) {
+		$token_name = $node->node_name ?? $this->get_token_name();
+		if ( ! isset( $token_name ) ) {
+			return null;
+		}
+
+		return ! (
+			// Comments, text nodes, and other atomic tokens.
+			'#' === $token_name[0] ||
+			// Doctype declarations.
+			'html' === $token_name ||
+			// Void elements.
+			self::is_void( $token_name ) ||
+			// Special atomic elements.
+			in_array( $token_name, array( 'IFRAME', 'NOEMBED', 'NOFRAMES', 'SCRIPT', 'STYLE', 'TEXTAREA', 'TITLE', 'XMP' ), true )
+		);
+	}
+
+	/**
+	 * Steps through the HTML document and stop at the next tag, if any.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @see self::PROCESS_NEXT_NODE
+	 * @see self::REPROCESS_CURRENT_NODE
+	 *
+	 * @param string $node_to_process Whether to parse the next node or reprocess the current node.
+	 * @return bool Whether a tag was matched.
+	 */
+	public function step( $node_to_process = self::PROCESS_NEXT_NODE ) {
+		// Refuse to proceed if there was a previous error.
+		if ( null !== $this->last_error ) {
+			return false;
+		}
+
+		if ( self::REPROCESS_CURRENT_NODE !== $node_to_process ) {
+			/*
+			 * Void elements still hop onto the stack of open elements even though
+			 * there's no corresponding closing tag. This is important for managing
+			 * stack-based operations such as "navigate to parent node" or checking
+			 * on an element's breadcrumbs.
+			 *
+			 * When moving on to the next node, therefore, if the bottom-most element
+			 * on the stack is a void element, it must be closed.
+			 *
+			 * @todo Once self-closing foreign elements and BGSOUND are supported,
+			 *        they must also be implicitly closed here too. BGSOUND is
+			 *        special since it's only self-closing if the self-closing flag
+			 *        is provided in the opening tag, otherwise it expects a tag closer.
+			 */
+			$top_node = $this->state->stack_of_open_elements->current_node();
+			if ( isset( $top_node ) && ! static::expects_closer( $top_node ) ) {
+				$this->state->stack_of_open_elements->pop();
+			}
+		}
+
+		if ( self::PROCESS_NEXT_NODE === $node_to_process ) {
+			parent::next_token();
+		}
+
+		// Finish stepping when there are no more tokens in the document.
+		if (
+			Gutenberg_HTML_Tag_Processor_6_6::STATE_INCOMPLETE_INPUT === $this->parser_state ||
+			Gutenberg_HTML_Tag_Processor_6_6::STATE_COMPLETE === $this->parser_state
+		) {
+			return false;
+		}
+
+		$this->state->current_token = new WP_HTML_Token(
+			$this->bookmark_token(),
+			$this->get_token_name(),
+			$this->has_self_closing_flag(),
+			$this->release_internal_bookmark_on_destruct
+		);
+
+		try {
+			switch ( $this->state->insertion_mode ) {
+				case Gutenberg_HTML_Processor_State_6_6::INSERTION_MODE_IN_BODY:
+					return $this->step_in_body();
+
+				default:
+					$this->last_error = self::ERROR_UNSUPPORTED;
+					throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+			}
+		} catch ( WP_HTML_Unsupported_Exception $e ) {
+			/*
+			 * Exceptions are used in this class to escape deep call stacks that
+			 * otherwise might involve messier calling and return conventions.
+			 */
+			return false;
+		}
+	}
+
+	/**
+	 * Computes the HTML breadcrumbs for the currently-matched node, if matched.
+	 *
+	 * Breadcrumbs start at the outermost parent and descend toward the matched element.
+	 * They always include the entire path from the root HTML node to the matched element.
+	 *
+	 * @todo It could be more efficient to expose a generator-based version of this function
+	 *       to avoid creating the array copy on tag iteration. If this is done, it would likely
+	 *       be more useful to walk up the stack when yielding instead of starting at the top.
+	 *
+	 * Example
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<p><strong><em><img></em></strong></p>' );
+	 *     $processor->next_tag( 'IMG' );
+	 *     $processor->get_breadcrumbs() === array( 'HTML', 'BODY', 'P', 'STRONG', 'EM', 'IMG' );
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return string[]|null Array of tag names representing path to matched node, if matched, otherwise NULL.
+	 */
+	public function get_breadcrumbs() {
+		$breadcrumbs = array();
+
+		foreach ( $this->state->stack_of_open_elements->walk_down() as $stack_item ) {
+			$breadcrumbs[] = $stack_item->node_name;
+		}
+
+		if ( ! $this->is_virtual() ) {
+			return $breadcrumbs;
+		}
+
+		foreach ( $this->element_queue as $queue_item ) {
+			if ( $this->current_element->token->bookmark_name === $queue_item->token->bookmark_name ) {
+				break;
+			}
+
+			if ( 'context-node' === $queue_item->token->bookmark_name ) {
+				break;
+			}
+
+			if ( 'real' === $queue_item->provenance ) {
+				break;
+			}
+
+			if ( Gutenberg_HTML_Stack_Event_6_6::PUSH === $queue_item->operation ) {
+				$breadcrumbs[] = $queue_item->token->node_name;
+			} else {
+				array_pop( $breadcrumbs );
+			}
+		}
+
+		if ( null !== parent::get_token_name() && ! parent::is_tag_closer() ) {
+			array_pop( $breadcrumbs );
+		}
+
+		// Add the virtual node we're at.
+		if ( Gutenberg_HTML_Stack_Event_6_6::PUSH === $this->current_element->operation ) {
+			$breadcrumbs[] = $this->current_element->token->node_name;
+		}
+
+		return $breadcrumbs;
+	}
+
+	/**
+	 * Returns the nesting depth of the current location in the document.
+	 *
+	 * Example:
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<div><p></p></div>' );
+	 *     // The processor starts in the BODY context, meaning it has depth from the start: HTML > BODY.
+	 *     2 === $processor->get_current_depth();
+	 *
+	 *     // Opening the DIV element increases the depth.
+	 *     $processor->next_token();
+	 *     3 === $processor->get_current_depth();
+	 *
+	 *     // Opening the P element increases the depth.
+	 *     $processor->next_token();
+	 *     4 === $processor->get_current_depth();
+	 *
+	 *     // The P element is closed during `next_token()` so the depth is decreased to reflect that.
+	 *     $processor->next_token();
+	 *     3 === $processor->get_current_depth();
+	 *
+	 * @since 6.6.0
+	 *
+	 * @return int Nesting-depth of current location in the document.
+	 */
+	public function get_current_depth() {
+		return $this->is_virtual()
+			? count( $this->get_breadcrumbs() )
+			: $this->state->stack_of_open_elements->count();
+	}
+
+	/**
+	 * Parses next element in the 'in body' insertion mode.
+	 *
+	 * This internal function performs the 'in body' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_body() {
+		$token_name = $this->get_token_name();
+		$token_type = $this->get_token_type();
+		$op_sigil   = '#tag' === $token_type ? ( parent::is_tag_closer() ? '-' : '+' ) : '';
+		$op         = "{$op_sigil}{$token_name}";
+
+		switch ( $op ) {
+			case '#comment':
+			case '#funky-comment':
+			case '#presumptuous-tag':
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			case '#text':
+				$this->reconstruct_active_formatting_elements();
+
+				$current_token = $this->bookmarks[ $this->state->current_token->bookmark_name ];
+
+				/*
+				 * > A character token that is U+0000 NULL
+				 *
+				 * Any successive sequence of NULL bytes is ignored and won't
+				 * trigger active format reconstruction. Therefore, if the text
+				 * only comprises NULL bytes then the token should be ignored
+				 * here, but if there are any other characters in the stream
+				 * the active formats should be reconstructed.
+				 */
+				if (
+					1 <= $current_token->length &&
+					"\x00" === $this->html[ $current_token->start ] &&
+					strspn( $this->html, "\x00", $current_token->start, $current_token->length ) === $current_token->length
+				) {
+					// Parse error: ignore the token.
+					return $this->step();
+				}
+
+				/*
+				 * Whitespace-only text does not affect the frameset-ok flag.
+				 * It is probably inter-element whitespace, but it may also
+				 * contain character references which decode only to whitespace.
+				 */
+				$text = $this->get_modifiable_text();
+				if ( strlen( $text ) !== strspn( $text, " \t\n\f\r" ) ) {
+					$this->state->frameset_ok = false;
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			case 'html':
+				/*
+				 * > A DOCTYPE token
+				 * > Parse error. Ignore the token.
+				 */
+				return $this->step();
+
+			/*
+			 * > A start tag whose tag name is "button"
+			 */
+			case '+BUTTON':
+				if ( $this->state->stack_of_open_elements->has_element_in_scope( 'BUTTON' ) ) {
+					// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+					$this->generate_implied_end_tags();
+					$this->state->stack_of_open_elements->pop_until( 'BUTTON' );
+				}
+
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "address", "article", "aside",
+			 * > "blockquote", "center", "details", "dialog", "dir", "div", "dl",
+			 * > "fieldset", "figcaption", "figure", "footer", "header", "hgroup",
+			 * > "main", "menu", "nav", "ol", "p", "search", "section", "summary", "ul"
+			 */
+			case '+ADDRESS':
+			case '+ARTICLE':
+			case '+ASIDE':
+			case '+BLOCKQUOTE':
+			case '+CENTER':
+			case '+DETAILS':
+			case '+DIALOG':
+			case '+DIR':
+			case '+DIV':
+			case '+DL':
+			case '+FIELDSET':
+			case '+FIGCAPTION':
+			case '+FIGURE':
+			case '+FOOTER':
+			case '+HEADER':
+			case '+HGROUP':
+			case '+MAIN':
+			case '+MENU':
+			case '+NAV':
+			case '+OL':
+			case '+P':
+			case '+SEARCH':
+			case '+SECTION':
+			case '+SUMMARY':
+			case '+UL':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "address", "article", "aside", "blockquote",
+			 * > "button", "center", "details", "dialog", "dir", "div", "dl", "fieldset",
+			 * > "figcaption", "figure", "footer", "header", "hgroup", "listing", "main",
+			 * > "menu", "nav", "ol", "pre", "search", "section", "summary", "ul"
+			 */
+			case '-ADDRESS':
+			case '-ARTICLE':
+			case '-ASIDE':
+			case '-BLOCKQUOTE':
+			case '-BUTTON':
+			case '-CENTER':
+			case '-DETAILS':
+			case '-DIALOG':
+			case '-DIR':
+			case '-DIV':
+			case '-DL':
+			case '-FIELDSET':
+			case '-FIGCAPTION':
+			case '-FIGURE':
+			case '-FOOTER':
+			case '-HEADER':
+			case '-HGROUP':
+			case '-LISTING':
+			case '-MAIN':
+			case '-MENU':
+			case '-NAV':
+			case '-OL':
+			case '-PRE':
+			case '-SEARCH':
+			case '-SECTION':
+			case '-SUMMARY':
+			case '-UL':
+				if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $token_name ) ) {
+					// @todo Report parse error.
+					// Ignore the token.
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags();
+				if ( $this->state->stack_of_open_elements->current_node()->node_name !== $token_name ) {
+					// @todo Record parse error: this error doesn't impact parsing.
+				}
+				$this->state->stack_of_open_elements->pop_until( $token_name );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "h1", "h2", "h3", "h4", "h5", "h6"
+			 */
+			case '+H1':
+			case '+H2':
+			case '+H3':
+			case '+H4':
+			case '+H5':
+			case '+H6':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				if (
+					in_array(
+						$this->state->stack_of_open_elements->current_node()->node_name,
+						array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ),
+						true
+					)
+				) {
+					// @todo Indicate a parse error once it's possible.
+					$this->state->stack_of_open_elements->pop();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "pre", "listing"
+			 */
+			case '+PRE':
+			case '+LISTING':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "h1", "h2", "h3", "h4", "h5", "h6"
+			 */
+			case '-H1':
+			case '-H2':
+			case '-H3':
+			case '-H4':
+			case '-H5':
+			case '-H6':
+				if ( ! $this->state->stack_of_open_elements->has_element_in_scope( '(internal: H1 through H6 - do not use)' ) ) {
+					/*
+					 * This is a parse error; ignore the token.
+					 *
+					 * @todo Indicate a parse error once it's possible.
+					 */
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags();
+
+				if ( $this->state->stack_of_open_elements->current_node()->node_name !== $token_name ) {
+					// @todo Record parse error: this error doesn't impact parsing.
+				}
+
+				$this->state->stack_of_open_elements->pop_until( '(internal: H1 through H6 - do not use)' );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is "li"
+			 * > A start tag whose tag name is one of: "dd", "dt"
+			 */
+			case '+DD':
+			case '+DT':
+			case '+LI':
+				$this->state->frameset_ok = false;
+				$node                     = $this->state->stack_of_open_elements->current_node();
+				$is_li                    = 'LI' === $token_name;
+
+				in_body_list_loop:
+				/*
+				 * The logic for LI and DT/DD is the same except for one point: LI elements _only_
+				 * close other LI elements, but a DT or DD element closes _any_ open DT or DD element.
+				 */
+				if ( $is_li ? 'LI' === $node->node_name : ( 'DD' === $node->node_name || 'DT' === $node->node_name ) ) {
+					$node_name = $is_li ? 'LI' : $node->node_name;
+					$this->generate_implied_end_tags( $node_name );
+					if ( $node_name !== $this->state->stack_of_open_elements->current_node()->node_name ) {
+						// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+					}
+
+					$this->state->stack_of_open_elements->pop_until( $node_name );
+					goto in_body_list_done;
+				}
+
+				if (
+					'ADDRESS' !== $node->node_name &&
+					'DIV' !== $node->node_name &&
+					'P' !== $node->node_name &&
+					$this->is_special( $node->node_name )
+				) {
+					/*
+					 * > If node is in the special category, but is not an address, div,
+					 * > or p element, then jump to the step labeled done below.
+					 */
+					goto in_body_list_done;
+				} else {
+					/*
+					 * > Otherwise, set node to the previous entry in the stack of open elements
+					 * > and return to the step labeled loop.
+					 */
+					foreach ( $this->state->stack_of_open_elements->walk_up( $node ) as $item ) {
+						$node = $item;
+						break;
+					}
+					goto in_body_list_loop;
+				}
+
+				in_body_list_done:
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "li"
+			 * > An end tag whose tag name is one of: "dd", "dt"
+			 */
+			case '-DD':
+			case '-DT':
+			case '-LI':
+				if (
+					/*
+					 * An end tag whose tag name is "li":
+					 * If the stack of open elements does not have an li element in list item scope,
+					 * then this is a parse error; ignore the token.
+					 */
+					(
+						'LI' === $token_name &&
+						! $this->state->stack_of_open_elements->has_element_in_list_item_scope( 'LI' )
+					) ||
+					/*
+					 * An end tag whose tag name is one of: "dd", "dt":
+					 * If the stack of open elements does not have an element in scope that is an
+					 * HTML element with the same tag name as that of the token, then this is a
+					 * parse error; ignore the token.
+					 */
+					(
+						'LI' !== $token_name &&
+						! $this->state->stack_of_open_elements->has_element_in_scope( $token_name )
+					)
+				) {
+					/*
+					 * This is a parse error, ignore the token.
+					 *
+					 * @todo Indicate a parse error once it's possible.
+					 */
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags( $token_name );
+
+				if ( $token_name !== $this->state->stack_of_open_elements->current_node()->node_name ) {
+					// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+				}
+
+				$this->state->stack_of_open_elements->pop_until( $token_name );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "p"
+			 */
+			case '-P':
+				if ( ! $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->insert_html_element( $this->state->current_token );
+				}
+
+				$this->close_a_p_element();
+				return true;
+
+			// > A start tag whose tag name is "a"
+			case '+A':
+				foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+					switch ( $item->node_name ) {
+						case 'marker':
+							break;
+
+						case 'A':
+							$this->run_adoption_agency_algorithm();
+							$this->state->active_formatting_elements->remove_node( $item );
+							$this->state->stack_of_open_elements->remove_node( $item );
+							break;
+					}
+				}
+
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->active_formatting_elements->push( $this->state->current_token );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "b", "big", "code", "em", "font", "i",
+			 * > "s", "small", "strike", "strong", "tt", "u"
+			 */
+			case '+B':
+			case '+BIG':
+			case '+CODE':
+			case '+EM':
+			case '+FONT':
+			case '+I':
+			case '+S':
+			case '+SMALL':
+			case '+STRIKE':
+			case '+STRONG':
+			case '+TT':
+			case '+U':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->active_formatting_elements->push( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "a", "b", "big", "code", "em", "font", "i",
+			 * > "nobr", "s", "small", "strike", "strong", "tt", "u"
+			 */
+			case '-A':
+			case '-B':
+			case '-BIG':
+			case '-CODE':
+			case '-EM':
+			case '-FONT':
+			case '-I':
+			case '-S':
+			case '-SMALL':
+			case '-STRIKE':
+			case '-STRONG':
+			case '-TT':
+			case '-U':
+				$this->run_adoption_agency_algorithm();
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "br"
+			 * >   Parse error. Drop the attributes from the token, and act as described in the next
+			 * >   entry; i.e. act as if this was a "br" start tag token with no attributes, rather
+			 * >   than the end tag token that it actually is.
+			 */
+			case '-BR':
+				$this->last_error = self::ERROR_UNSUPPORTED;
+				throw new WP_HTML_Unsupported_Exception( 'Closing BR tags require unimplemented special handling.' );
+
+			/*
+			 * > A start tag whose tag name is one of: "area", "br", "embed", "img", "keygen", "wbr"
+			 */
+			case '+AREA':
+			case '+BR':
+			case '+EMBED':
+			case '+IMG':
+			case '+KEYGEN':
+			case '+WBR':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+				return true;
+
+			/*
+			 * > A start tag whose tag name is "input"
+			 */
+			case '+INPUT':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$type_attribute = $this->get_attribute( 'type' );
+				/*
+				 * > If the token does not have an attribute with the name "type", or if it does,
+				 * > but that attribute's value is not an ASCII case-insensitive match for the
+				 * > string "hidden", then: set the frameset-ok flag to "not ok".
+				 */
+				if ( ! is_string( $type_attribute ) || 'hidden' !== strtolower( $type_attribute ) ) {
+					$this->state->frameset_ok = false;
+				}
+				return true;
+
+			/*
+			 * > A start tag whose tag name is "hr"
+			 */
+			case '+HR':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "param", "source", "track"
+			 */
+			case '+PARAM':
+			case '+SOURCE':
+			case '+TRACK':
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+		}
+
+		/*
+		 * These tags require special handling in the 'in body' insertion mode
+		 * but that handling hasn't yet been implemented.
+		 *
+		 * As the rules for each tag are implemented, the corresponding tag
+		 * name should be removed from this list. An accompanying test should
+		 * help ensure this list is maintained.
+		 *
+		 * @see Tests_HtmlApi_WpHtmlProcessor::test_step_in_body_fails_on_unsupported_tags
+		 *
+		 * Since this switch structure throws a WP_HTML_Unsupported_Exception, it's
+		 * possible to handle "any other start tag" and "any other end tag" below,
+		 * as that guarantees execution doesn't proceed for the unimplemented tags.
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-inbody
+		 */
+		switch ( $token_name ) {
+			case 'APPLET':
+			case 'BASE':
+			case 'BASEFONT':
+			case 'BGSOUND':
+			case 'BODY':
+			case 'CAPTION':
+			case 'COL':
+			case 'COLGROUP':
+			case 'FORM':
+			case 'FRAME':
+			case 'FRAMESET':
+			case 'HEAD':
+			case 'HTML':
+			case 'IFRAME':
+			case 'LINK':
+			case 'MARQUEE':
+			case 'MATH':
+			case 'META':
+			case 'NOBR':
+			case 'NOEMBED':
+			case 'NOFRAMES':
+			case 'NOSCRIPT':
+			case 'OBJECT':
+			case 'OPTGROUP':
+			case 'OPTION':
+			case 'PLAINTEXT':
+			case 'RB':
+			case 'RP':
+			case 'RT':
+			case 'RTC':
+			case 'SARCASM':
+			case 'SCRIPT':
+			case 'SELECT':
+			case 'STYLE':
+			case 'SVG':
+			case 'TABLE':
+			case 'TBODY':
+			case 'TD':
+			case 'TEMPLATE':
+			case 'TEXTAREA':
+			case 'TFOOT':
+			case 'TH':
+			case 'THEAD':
+			case 'TITLE':
+			case 'TR':
+			case 'XMP':
+				$this->last_error = self::ERROR_UNSUPPORTED;
+				throw new WP_HTML_Unsupported_Exception( "Cannot process {$token_name} element." );
+		}
+
+		if ( ! parent::is_tag_closer() ) {
+			/*
+			 * > Any other start tag
+			 */
+			$this->reconstruct_active_formatting_elements();
+			$this->insert_html_element( $this->state->current_token );
+			return true;
+		} else {
+			/*
+			 * > Any other end tag
+			 */
+
+			/*
+			 * Find the corresponding tag opener in the stack of open elements, if
+			 * it exists before reaching a special element, which provides a kind
+			 * of boundary in the stack. For example, a `</custom-tag>` should not
+			 * close anything beyond its containing `P` or `DIV` element.
+			 */
+			foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
+				if ( $token_name === $node->node_name ) {
+					break;
+				}
+
+				if ( self::is_special( $node->node_name ) ) {
+					// This is a parse error, ignore the token.
+					return $this->step();
+				}
+			}
+
+			$this->generate_implied_end_tags( $token_name );
+			if ( $node !== $this->state->stack_of_open_elements->current_node() ) {
+				// @todo Record parse error: this error doesn't impact parsing.
+			}
+
+			foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+				$this->state->stack_of_open_elements->pop();
+				if ( $node === $item ) {
+					return true;
+				}
+			}
+		}
+	}
+
+	/*
+	 * Internal helpers
+	 */
+
+	/**
+	 * Creates a new bookmark for the currently-matched token and returns the generated name.
+	 *
+	 * @since 6.4.0
+	 * @since 6.5.0 Renamed from bookmark_tag() to bookmark_token().
+	 *
+	 * @throws Exception When unable to allocate requested bookmark.
+	 *
+	 * @return string|false Name of created bookmark, or false if unable to create.
+	 */
+	private function bookmark_token() {
+		if ( ! parent::set_bookmark( ++$this->bookmark_counter ) ) {
+			$this->last_error = self::ERROR_EXCEEDED_MAX_BOOKMARKS;
+			throw new Exception( 'could not allocate bookmark' );
+		}
+
+		return "{$this->bookmark_counter}";
+	}
+
+	/*
+	 * HTML semantic overrides for Tag Processor
+	 */
+
+	/**
+	 * Returns the uppercase name of the matched tag.
+	 *
+	 * The semantic rules for HTML specify that certain tags be reprocessed
+	 * with a different tag name. Because of this, the tag name presented
+	 * by the HTML Processor may differ from the one reported by the HTML
+	 * Tag Processor, which doesn't apply these semantic rules.
+	 *
+	 * Example:
+	 *
+	 *     $processor = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+	 *     $processor->next_tag() === true;
+	 *     $processor->get_tag() === 'DIV';
+	 *
+	 *     $processor->next_tag() === false;
+	 *     $processor->get_tag() === null;
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
+	 */
+	public function get_tag() {
+		if ( null !== $this->last_error ) {
+			return null;
+		}
+
+		if ( $this->is_virtual() ) {
+			return $this->current_element->token->node_name;
+		}
+
+		$tag_name = parent::get_tag();
+
+		switch ( $tag_name ) {
+			case 'IMAGE':
+				/*
+				 * > A start tag whose tag name is "image"
+				 * > Change the token's tag name to "img" and reprocess it. (Don't ask.)
+				 */
+				return 'IMG';
+
+			default:
+				return $tag_name;
+		}
+	}
+
+	/**
+	 * Indicates if the currently matched tag contains the self-closing flag.
+	 *
+	 * No HTML elements ought to have the self-closing flag and for those, the self-closing
+	 * flag will be ignored. For void elements this is benign because they "self close"
+	 * automatically. For non-void HTML elements though problems will appear if someone
+	 * intends to use a self-closing element in place of that element with an empty body.
+	 * For HTML foreign elements and custom elements the self-closing flag determines if
+	 * they self-close or not.
+	 *
+	 * This function does not determine if a tag is self-closing,
+	 * but only if the self-closing flag is present in the syntax.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return bool Whether the currently matched tag contains the self-closing flag.
+	 */
+	public function has_self_closing_flag() {
+		return $this->is_virtual() ? false : parent::has_self_closing_flag();
+	}
+
+	/**
+	 * Returns the node name represented by the token.
+	 *
+	 * This matches the DOM API value `nodeName`. Some values
+	 * are static, such as `#text` for a text node, while others
+	 * are dynamically generated from the token itself.
+	 *
+	 * Dynamic names:
+	 *  - Uppercase tag name for tag matches.
+	 *  - `html` for DOCTYPE declarations.
+	 *
+	 * Note that if the Tag Processor is not matched on a token
+	 * then this function will return `null`, either because it
+	 * hasn't yet found a token or because it reached the end
+	 * of the document without matching a token.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return string|null Name of the matched token.
+	 */
+	public function get_token_name() {
+		return $this->is_virtual()
+			? $this->current_element->token->node_name
+			: parent::get_token_name();
+	}
+
+	/**
+	 * Indicates the kind of matched token, if any.
+	 *
+	 * This differs from `get_token_name()` in that it always
+	 * returns a static string indicating the type, whereas
+	 * `get_token_name()` may return values derived from the
+	 * token itself, such as a tag name or processing
+	 * instruction tag.
+	 *
+	 * Possible values:
+	 *  - `#tag` when matched on a tag.
+	 *  - `#text` when matched on a text node.
+	 *  - `#cdata-section` when matched on a CDATA node.
+	 *  - `#comment` when matched on a comment.
+	 *  - `#doctype` when matched on a DOCTYPE declaration.
+	 *  - `#presumptuous-tag` when matched on an empty tag closer.
+	 *  - `#funky-comment` when matched on a funky comment.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return string|null What kind of token is matched, or null.
+	 */
+	public function get_token_type() {
+		if ( $this->is_virtual() ) {
+			/*
+			 * This logic comes from the Tag Processor.
+			 *
+			 * @todo It would be ideal not to repeat this here, but it's not clearly
+			 *       better to allow passing a token name to `get_token_type()`.
+			 */
+			$node_name     = $this->current_element->token->node_name;
+			$starting_char = $node_name[0];
+			if ( 'A' <= $starting_char && 'Z' >= $starting_char ) {
+				return '#tag';
+			}
+
+			if ( 'html' === $node_name ) {
+				return '#doctype';
+			}
+
+			return $node_name;
+		}
+
+		return parent::get_token_type();
+	}
+
+	/**
+	 * Returns the value of a requested attribute from a matched tag opener if that attribute exists.
+	 *
+	 * Example:
+	 *
+	 *     $p = WP_HTML_Processor::create_fragment( '<div enabled class="test" data-test-id="14">Test</div>' );
+	 *     $p->next_token() === true;
+	 *     $p->get_attribute( 'data-test-id' ) === '14';
+	 *     $p->get_attribute( 'enabled' ) === true;
+	 *     $p->get_attribute( 'aria-label' ) === null;
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute( 'class' ) === null;
+	 *
+	 * @since 6.6.0 Subclassed for HTML Processor.
+	 *
+	 * @param string $name Name of attribute whose value is requested.
+	 * @return string|true|null Value of attribute or `null` if not available. Boolean attributes return `true`.
+	 */
+	public function get_attribute( $name ) {
+		return $this->is_virtual() ? null : parent::get_attribute( $name );
+	}
+
+	/**
+	 * Updates or creates a new attribute on the currently matched tag with the passed value.
+	 *
+	 * For boolean attributes special handling is provided:
+	 *  - When `true` is passed as the value, then only the attribute name is added to the tag.
+	 *  - When `false` is passed, the attribute gets removed if it existed before.
+	 *
+	 * For string attributes, the value is escaped using the `esc_attr` function.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @param string      $name  The attribute name to target.
+	 * @param string|bool $value The new attribute value.
+	 * @return bool Whether an attribute value was set.
+	 */
+	public function set_attribute( $name, $value ) {
+		return $this->is_virtual() ? false : parent::set_attribute( $name, $value );
+	}
+
+	/**
+	 * Remove an attribute from the currently-matched tag.
+	 *
+	 * @since 6.6.0 Subclassed for HTML Processor.
+	 *
+	 * @param string $name The attribute name to remove.
+	 * @return bool Whether an attribute was removed.
+	 */
+	public function remove_attribute( $name ) {
+		return $this->is_virtual() ? false : parent::remove_attribute( $name );
+	}
+
+	/**
+	 * Gets lowercase names of all attributes matching a given prefix in the current tag.
+	 *
+	 * Note that matching is case-insensitive. This is in accordance with the spec:
+	 *
+	 * > There must never be two or more attributes on
+	 * > the same start tag whose names are an ASCII
+	 * > case-insensitive match for each other.
+	 *     - HTML 5 spec
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div data-ENABLED class="test" DATA-test-id="14">Test</div>' );
+	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === array( 'data-enabled', 'data-test-id' );
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === null;
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+	 *
+	 * @param string $prefix Prefix of requested attribute names.
+	 * @return array|null List of attribute names, or `null` when no tag opener is matched.
+	 */
+	public function get_attribute_names_with_prefix( $prefix ) {
+		return $this->is_virtual() ? null : parent::get_attribute_names_with_prefix( $prefix );
+	}
+
+	/**
+	 * Adds a new class name to the currently matched tag.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @param string $class_name The class name to add.
+	 * @return bool Whether the class was set to be added.
+	 */
+	public function add_class( $class_name ) {
+		return $this->is_virtual() ? false : parent::add_class( $class_name );
+	}
+
+	/**
+	 * Removes a class name from the currently matched tag.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @param string $class_name The class name to remove.
+	 * @return bool Whether the class was set to be removed.
+	 */
+	public function remove_class( $class_name ) {
+		return $this->is_virtual() ? false : parent::remove_class( $class_name );
+	}
+
+	/**
+	 * Returns if a matched tag contains the given ASCII case-insensitive class name.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @param string $wanted_class Look for this CSS class name, ASCII case-insensitive.
+	 * @return bool|null Whether the matched tag contains the given class name, or null if not matched.
+	 */
+	public function has_class( $wanted_class ) {
+		return $this->is_virtual() ? null : parent::has_class( $wanted_class );
+	}
+
+	/**
+	 * Generator for a foreach loop to step through each class name for the matched tag.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $p = WP_HTML_Processor::create_fragment( "<div class='free &lt;egg&lt;\tlang-en'>" );
+	 *     $p->next_tag();
+	 *     foreach ( $p->class_list() as $class_name ) {
+	 *         echo "{$class_name} ";
+	 *     }
+	 *     // Outputs: "free <egg> lang-en "
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 */
+	public function class_list() {
+		return $this->is_virtual() ? null : parent::class_list();
+	}
+
+	/**
+	 * Returns the modifiable text for a matched token, or an empty string.
+	 *
+	 * Modifiable text is text content that may be read and changed without
+	 * changing the HTML structure of the document around it. This includes
+	 * the contents of `#text` nodes in the HTML as well as the inner
+	 * contents of HTML comments, Processing Instructions, and others, even
+	 * though these nodes aren't part of a parsed DOM tree. They also contain
+	 * the contents of SCRIPT and STYLE tags, of TEXTAREA tags, and of any
+	 * other section in an HTML document which cannot contain HTML markup (DATA).
+	 *
+	 * If a token has no modifiable text then an empty string is returned to
+	 * avoid needless crashing or type errors. An empty string does not mean
+	 * that a token has modifiable text, and a token with modifiable text may
+	 * have an empty string (e.g. a comment with no contents).
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return string
+	 */
+	public function get_modifiable_text() {
+		return $this->is_virtual() ? '' : parent::get_modifiable_text();
+	}
+
+	/**
+	 * Indicates what kind of comment produced the comment node.
+	 *
+	 * Because there are different kinds of HTML syntax which produce
+	 * comments, the Tag Processor tracks and exposes this as a type
+	 * for the comment. Nominally only regular HTML comments exist as
+	 * they are commonly known, but a number of unrelated syntax errors
+	 * also produce comments.
+	 *
+	 * @see self::COMMENT_AS_ABRUPTLY_CLOSED_COMMENT
+	 * @see self::COMMENT_AS_CDATA_LOOKALIKE
+	 * @see self::COMMENT_AS_INVALID_HTML
+	 * @see self::COMMENT_AS_HTML_COMMENT
+	 * @see self::COMMENT_AS_PI_NODE_LOOKALIKE
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return string|null
+	 */
+	public function get_comment_type() {
+		return $this->is_virtual() ? null : parent::get_comment_type();
+	}
+
+	/**
+	 * Removes a bookmark that is no longer needed.
+	 *
+	 * Releasing a bookmark frees up the small
+	 * performance overhead it requires.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Name of the bookmark to remove.
+	 * @return bool Whether the bookmark already existed before removal.
+	 */
+	public function release_bookmark( $bookmark_name ) {
+		return parent::release_bookmark( "_{$bookmark_name}" );
+	}
+
+	/**
+	 * Moves the internal cursor in the HTML Processor to a given bookmark's location.
+	 *
+	 * Be careful! Seeking backwards to a previous location resets the parser to the
+	 * start of the document and reparses the entire contents up until it finds the
+	 * sought-after bookmarked location.
+	 *
+	 * In order to prevent accidental infinite loops, there's a
+	 * maximum limit on the number of times seek() can be called.
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Jump to the place in the document identified by this bookmark name.
+	 * @return bool Whether the internal cursor was successfully moved to the bookmark's location.
+	 */
+	public function seek( $bookmark_name ) {
+		// Flush any pending updates to the document before beginning.
+		$this->get_updated_html();
+
+		$actual_bookmark_name = "_{$bookmark_name}";
+		$processor_started_at = $this->state->current_token
+			? $this->bookmarks[ $this->state->current_token->bookmark_name ]->start
+			: 0;
+		$bookmark_starts_at   = $this->bookmarks[ $actual_bookmark_name ]->start;
+		$bookmark_length      = $this->bookmarks[ $actual_bookmark_name ]->length;
+		$direction            = $bookmark_starts_at > $processor_started_at ? 'forward' : 'backward';
+
+		/*
+		 * If seeking backwards, it's possible that the sought-after bookmark exists within an element
+		 * which has been closed before the current cursor; in other words, it has already been removed
+		 * from the stack of open elements. This means that it's insufficient to simply pop off elements
+		 * from the stack of open elements which appear after the bookmarked location and then jump to
+		 * that location, as the elements which were open before won't be re-opened.
+		 *
+		 * In order to maintain consistency, the HTML Processor rewinds to the start of the document
+		 * and reparses everything until it finds the sought-after bookmark.
+		 *
+		 * There are potentially better ways to do this: cache the parser state for each bookmark and
+		 * restore it when seeking; store an immutable and idempotent register of where elements open
+		 * and close.
+		 *
+		 * If caching the parser state it will be essential to properly maintain the cached stack of
+		 * open elements and active formatting elements when modifying the document. This could be a
+		 * tedious and time-consuming process as well, and so for now will not be performed.
+		 *
+		 * It may be possible to track bookmarks for where elements open and close, and in doing so
+		 * be able to quickly recalculate breadcrumbs for any element in the document. It may even
+		 * be possible to remove the stack of open elements and compute it on the fly this way.
+		 * If doing this, the parser would need to track the opening and closing locations for all
+		 * tokens in the breadcrumb path for any and all bookmarks. By utilizing bookmarks themselves
+		 * this list could be automatically maintained while modifying the document. Finding the
+		 * breadcrumbs would then amount to traversing that list from the start until the token
+		 * being inspected. Once an element closes, if there are no bookmarks pointing to locations
+		 * within that element, then all of these locations may be forgotten to save on memory use
+		 * and computation time.
+		 */
+		if ( 'backward' === $direction ) {
+			/*
+			 * Instead of clearing the parser state and starting fresh, calling the stack methods
+			 * maintains the proper flags in the parser.
+			 */
+			foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+				if ( 'context-node' === $item->bookmark_name ) {
+					break;
+				}
+
+				$this->state->stack_of_open_elements->remove_node( $item );
+			}
+
+			foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+				if ( 'context-node' === $item->bookmark_name ) {
+					break;
+				}
+
+				$this->state->active_formatting_elements->remove_node( $item );
+			}
+
+			parent::seek( 'context-node' );
+			$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_6::INSERTION_MODE_IN_BODY;
+			$this->state->frameset_ok    = true;
+			$this->element_queue         = array();
+			$this->current_element       = null;
+		}
+
+		// When moving forwards, reparse the document until reaching the same location as the original bookmark.
+		if ( $bookmark_starts_at === $this->bookmarks[ $this->state->current_token->bookmark_name ]->start ) {
+			return true;
+		}
+
+		while ( $this->next_token() ) {
+			if ( $bookmark_starts_at === $this->bookmarks[ $this->state->current_token->bookmark_name ]->start ) {
+				while ( isset( $this->current_element ) && Gutenberg_HTML_Stack_Event_6_6::POP === $this->current_element->operation ) {
+					$this->current_element = array_shift( $this->element_queue );
+				}
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Sets a bookmark in the HTML document.
+	 *
+	 * Bookmarks represent specific places or tokens in the HTML
+	 * document, such as a tag opener or closer. When applying
+	 * edits to a document, such as setting an attribute, the
+	 * text offsets of that token may shift; the bookmark is
+	 * kept updated with those shifts and remains stable unless
+	 * the entire span of text in which the token sits is removed.
+	 *
+	 * Release bookmarks when they are no longer needed.
+	 *
+	 * Example:
+	 *
+	 *     <main><h2>Surprising fact you may not know!</h2></main>
+	 *           ^  ^
+	 *            \-|-- this `H2` opener bookmark tracks the token
+	 *
+	 *     <main class="clickbait"><h2>Surprising fact you may no…
+	 *                             ^  ^
+	 *                              \-|-- it shifts with edits
+	 *
+	 * Bookmarks provide the ability to seek to a previously-scanned
+	 * place in the HTML document. This avoids the need to re-scan
+	 * the entire document.
+	 *
+	 * Example:
+	 *
+	 *     <ul><li>One</li><li>Two</li><li>Three</li></ul>
+	 *                                 ^^^^
+	 *                                 want to note this last item
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( $html );
+	 *     $in_list = false;
+	 *     while ( $p->next_tag( array( 'tag_closers' => $in_list ? 'visit' : 'skip' ) ) ) {
+	 *         if ( 'UL' === $p->get_tag() ) {
+	 *             if ( $p->is_tag_closer() ) {
+	 *                 $in_list = false;
+	 *                 $p->set_bookmark( 'resume' );
+	 *                 if ( $p->seek( 'last-li' ) ) {
+	 *                     $p->add_class( 'last-li' );
+	 *                 }
+	 *                 $p->seek( 'resume' );
+	 *                 $p->release_bookmark( 'last-li' );
+	 *                 $p->release_bookmark( 'resume' );
+	 *             } else {
+	 *                 $in_list = true;
+	 *             }
+	 *         }
+	 *
+	 *         if ( 'LI' === $p->get_tag() ) {
+	 *             $p->set_bookmark( 'last-li' );
+	 *         }
+	 *     }
+	 *
+	 * Bookmarks intentionally hide the internal string offsets
+	 * to which they refer. They are maintained internally as
+	 * updates are applied to the HTML document and therefore
+	 * retain their "position" - the location to which they
+	 * originally pointed. The inability to use bookmarks with
+	 * functions like `substr` is therefore intentional to guard
+	 * against accidentally breaking the HTML.
+	 *
+	 * Because bookmarks allocate memory and require processing
+	 * for every applied update, they are limited and require
+	 * a name. They should not be created with programmatically-made
+	 * names, such as "li_{$index}" with some loop. As a general
+	 * rule they should only be created with string-literal names
+	 * like "start-of-section" or "last-paragraph".
+	 *
+	 * Bookmarks are a powerful tool to enable complicated behavior.
+	 * Consider double-checking that you need this tool if you are
+	 * reaching for it, as inappropriate use could lead to broken
+	 * HTML structure or unwanted processing overhead.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Identifies this particular bookmark.
+	 * @return bool Whether the bookmark was successfully created.
+	 */
+	public function set_bookmark( $bookmark_name ) {
+		return parent::set_bookmark( "_{$bookmark_name}" );
+	}
+
+	/**
+	 * Checks whether a bookmark with the given name exists.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $bookmark_name Name to identify a bookmark that potentially exists.
+	 * @return bool Whether that bookmark exists.
+	 */
+	public function has_bookmark( $bookmark_name ) {
+		return parent::has_bookmark( "_{$bookmark_name}" );
+	}
+
+	/*
+	 * HTML Parsing Algorithms
+	 */
+
+	/**
+	 * Closes a P element.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#close-a-p-element
+	 */
+	private function close_a_p_element() {
+		$this->generate_implied_end_tags( 'P' );
+		$this->state->stack_of_open_elements->pop_until( 'P' );
+	}
+
+	/**
+	 * Closes elements that have implied end tags.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
+	 *
+	 * @param string|null $except_for_this_element Perform as if this element doesn't exist in the stack of open elements.
+	 */
+	private function generate_implied_end_tags( $except_for_this_element = null ) {
+		$elements_with_implied_end_tags = array(
+			'DD',
+			'DT',
+			'LI',
+			'P',
+		);
+
+		$current_node = $this->state->stack_of_open_elements->current_node();
+		while (
+			$current_node && $current_node->node_name !== $except_for_this_element &&
+			in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true )
+		) {
+			$this->state->stack_of_open_elements->pop();
+		}
+	}
+
+	/**
+	 * Closes elements that have implied end tags, thoroughly.
+	 *
+	 * See the HTML specification for an explanation why this is
+	 * different from generating end tags in the normal sense.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::generate_implied_end_tags
+	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
+	 */
+	private function generate_implied_end_tags_thoroughly() {
+		$elements_with_implied_end_tags = array(
+			'DD',
+			'DT',
+			'LI',
+			'P',
+		);
+
+		while ( in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true ) ) {
+			$this->state->stack_of_open_elements->pop();
+		}
+	}
+
+	/**
+	 * Reconstructs the active formatting elements.
+	 *
+	 * > This has the effect of reopening all the formatting elements that were opened
+	 * > in the current body, cell, or caption (whichever is youngest) that haven't
+	 * > been explicitly closed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#reconstruct-the-active-formatting-elements
+	 *
+	 * @return bool Whether any formatting elements needed to be reconstructed.
+	 */
+	private function reconstruct_active_formatting_elements() {
+		/*
+		 * > If there are no entries in the list of active formatting elements, then there is nothing
+		 * > to reconstruct; stop this algorithm.
+		 */
+		if ( 0 === $this->state->active_formatting_elements->count() ) {
+			return false;
+		}
+
+		$last_entry = $this->state->active_formatting_elements->current_node();
+		if (
+
+			/*
+			 * > If the last (most recently added) entry in the list of active formatting elements is a marker;
+			 * > stop this algorithm.
+			 */
+			'marker' === $last_entry->node_name ||
+
+			/*
+			 * > If the last (most recently added) entry in the list of active formatting elements is an
+			 * > element that is in the stack of open elements, then there is nothing to reconstruct;
+			 * > stop this algorithm.
+			 */
+			$this->state->stack_of_open_elements->contains_node( $last_entry )
+		) {
+			return false;
+		}
+
+		$this->last_error = self::ERROR_UNSUPPORTED;
+		throw new WP_HTML_Unsupported_Exception( 'Cannot reconstruct active formatting elements when advancing and rewinding is required.' );
+	}
+
+	/**
+	 * Runs the adoption agency algorithm.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#adoption-agency-algorithm
+	 */
+	private function run_adoption_agency_algorithm() {
+		$budget       = 1000;
+		$subject      = $this->get_tag();
+		$current_node = $this->state->stack_of_open_elements->current_node();
+
+		if (
+			// > If the current node is an HTML element whose tag name is subject
+			$current_node && $subject === $current_node->node_name &&
+			// > the current node is not in the list of active formatting elements
+			! $this->state->active_formatting_elements->contains_node( $current_node )
+		) {
+			$this->state->stack_of_open_elements->pop();
+			return;
+		}
+
+		$outer_loop_counter = 0;
+		while ( $budget-- > 0 ) {
+			if ( $outer_loop_counter++ >= 8 ) {
+				return;
+			}
+
+			/*
+			 * > Let formatting element be the last element in the list of active formatting elements that:
+			 * >   - is between the end of the list and the last marker in the list,
+			 * >     if any, or the start of the list otherwise,
+			 * >   - and has the tag name subject.
+			 */
+			$formatting_element = null;
+			foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+				if ( 'marker' === $item->node_name ) {
+					break;
+				}
+
+				if ( $subject === $item->node_name ) {
+					$formatting_element = $item;
+					break;
+				}
+			}
+
+			// > If there is no such element, then return and instead act as described in the "any other end tag" entry above.
+			if ( null === $formatting_element ) {
+				$this->last_error = self::ERROR_UNSUPPORTED;
+				throw new WP_HTML_Unsupported_Exception( 'Cannot run adoption agency when "any other end tag" is required.' );
+			}
+
+			// > If formatting element is not in the stack of open elements, then this is a parse error; remove the element from the list, and return.
+			if ( ! $this->state->stack_of_open_elements->contains_node( $formatting_element ) ) {
+				$this->state->active_formatting_elements->remove_node( $formatting_element );
+				return;
+			}
+
+			// > If formatting element is in the stack of open elements, but the element is not in scope, then this is a parse error; return.
+			if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $formatting_element->node_name ) ) {
+				return;
+			}
+
+			/*
+			 * > Let furthest block be the topmost node in the stack of open elements that is lower in the stack
+			 * > than formatting element, and is an element in the special category. There might not be one.
+			 */
+			$is_above_formatting_element = true;
+			$furthest_block              = null;
+			foreach ( $this->state->stack_of_open_elements->walk_down() as $item ) {
+				if ( $is_above_formatting_element && $formatting_element->bookmark_name !== $item->bookmark_name ) {
+					continue;
+				}
+
+				if ( $is_above_formatting_element ) {
+					$is_above_formatting_element = false;
+					continue;
+				}
+
+				if ( self::is_special( $item->node_name ) ) {
+					$furthest_block = $item;
+					break;
+				}
+			}
+
+			/*
+			 * > If there is no furthest block, then the UA must first pop all the nodes from the bottom of the
+			 * > stack of open elements, from the current node up to and including formatting element, then
+			 * > remove formatting element from the list of active formatting elements, and finally return.
+			 */
+			if ( null === $furthest_block ) {
+				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+					$this->state->stack_of_open_elements->pop();
+
+					if ( $formatting_element->bookmark_name === $item->bookmark_name ) {
+						$this->state->active_formatting_elements->remove_node( $formatting_element );
+						return;
+					}
+				}
+			}
+
+			$this->last_error = self::ERROR_UNSUPPORTED;
+			throw new WP_HTML_Unsupported_Exception( 'Cannot extract common ancestor in adoption agency algorithm.' );
+		}
+
+		$this->last_error = self::ERROR_UNSUPPORTED;
+		throw new WP_HTML_Unsupported_Exception( 'Cannot run adoption agency when looping required.' );
+	}
+
+	/**
+	 * Inserts an HTML element on the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#insert-a-foreign-element
+	 *
+	 * @param WP_HTML_Token $token Name of bookmark pointing to element in original input HTML.
+	 */
+	private function insert_html_element( $token ) {
+		$this->state->stack_of_open_elements->push( $token );
+	}
+
+	/*
+	 * HTML Specification Helpers
+	 */
+
+	/**
+	 * Returns whether an element of a given name is in the HTML special category.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#special
+	 *
+	 * @param string $tag_name Name of element to check.
+	 * @return bool Whether the element of the given name is in the special category.
+	 */
+	public static function is_special( $tag_name ) {
+		$tag_name = strtoupper( $tag_name );
+
+		return (
+			'ADDRESS' === $tag_name ||
+			'APPLET' === $tag_name ||
+			'AREA' === $tag_name ||
+			'ARTICLE' === $tag_name ||
+			'ASIDE' === $tag_name ||
+			'BASE' === $tag_name ||
+			'BASEFONT' === $tag_name ||
+			'BGSOUND' === $tag_name ||
+			'BLOCKQUOTE' === $tag_name ||
+			'BODY' === $tag_name ||
+			'BR' === $tag_name ||
+			'BUTTON' === $tag_name ||
+			'CAPTION' === $tag_name ||
+			'CENTER' === $tag_name ||
+			'COL' === $tag_name ||
+			'COLGROUP' === $tag_name ||
+			'DD' === $tag_name ||
+			'DETAILS' === $tag_name ||
+			'DIR' === $tag_name ||
+			'DIV' === $tag_name ||
+			'DL' === $tag_name ||
+			'DT' === $tag_name ||
+			'EMBED' === $tag_name ||
+			'FIELDSET' === $tag_name ||
+			'FIGCAPTION' === $tag_name ||
+			'FIGURE' === $tag_name ||
+			'FOOTER' === $tag_name ||
+			'FORM' === $tag_name ||
+			'FRAME' === $tag_name ||
+			'FRAMESET' === $tag_name ||
+			'H1' === $tag_name ||
+			'H2' === $tag_name ||
+			'H3' === $tag_name ||
+			'H4' === $tag_name ||
+			'H5' === $tag_name ||
+			'H6' === $tag_name ||
+			'HEAD' === $tag_name ||
+			'HEADER' === $tag_name ||
+			'HGROUP' === $tag_name ||
+			'HR' === $tag_name ||
+			'HTML' === $tag_name ||
+			'IFRAME' === $tag_name ||
+			'IMG' === $tag_name ||
+			'INPUT' === $tag_name ||
+			'KEYGEN' === $tag_name ||
+			'LI' === $tag_name ||
+			'LINK' === $tag_name ||
+			'LISTING' === $tag_name ||
+			'MAIN' === $tag_name ||
+			'MARQUEE' === $tag_name ||
+			'MENU' === $tag_name ||
+			'META' === $tag_name ||
+			'NAV' === $tag_name ||
+			'NOEMBED' === $tag_name ||
+			'NOFRAMES' === $tag_name ||
+			'NOSCRIPT' === $tag_name ||
+			'OBJECT' === $tag_name ||
+			'OL' === $tag_name ||
+			'P' === $tag_name ||
+			'PARAM' === $tag_name ||
+			'PLAINTEXT' === $tag_name ||
+			'PRE' === $tag_name ||
+			'SCRIPT' === $tag_name ||
+			'SEARCH' === $tag_name ||
+			'SECTION' === $tag_name ||
+			'SELECT' === $tag_name ||
+			'SOURCE' === $tag_name ||
+			'STYLE' === $tag_name ||
+			'SUMMARY' === $tag_name ||
+			'TABLE' === $tag_name ||
+			'TBODY' === $tag_name ||
+			'TD' === $tag_name ||
+			'TEMPLATE' === $tag_name ||
+			'TEXTAREA' === $tag_name ||
+			'TFOOT' === $tag_name ||
+			'TH' === $tag_name ||
+			'THEAD' === $tag_name ||
+			'TITLE' === $tag_name ||
+			'TR' === $tag_name ||
+			'TRACK' === $tag_name ||
+			'UL' === $tag_name ||
+			'WBR' === $tag_name ||
+			'XMP' === $tag_name ||
+
+			// MathML.
+			'MI' === $tag_name ||
+			'MO' === $tag_name ||
+			'MN' === $tag_name ||
+			'MS' === $tag_name ||
+			'MTEXT' === $tag_name ||
+			'ANNOTATION-XML' === $tag_name ||
+
+			// SVG.
+			'FOREIGNOBJECT' === $tag_name ||
+			'DESC' === $tag_name ||
+			'TITLE' === $tag_name
+		);
+	}
+
+	/**
+	 * Returns whether a given element is an HTML Void Element
+	 *
+	 * > area, base, br, col, embed, hr, img, input, link, meta, source, track, wbr
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#void-elements
+	 *
+	 * @param string $tag_name Name of HTML tag to check.
+	 * @return bool Whether the given tag is an HTML Void Element.
+	 */
+	public static function is_void( $tag_name ) {
+		$tag_name = strtoupper( $tag_name );
+
+		return (
+			'AREA' === $tag_name ||
+			'BASE' === $tag_name ||
+			'BASEFONT' === $tag_name || // Obsolete but still treated as void.
+			'BGSOUND' === $tag_name || // Obsolete but still treated as void.
+			'BR' === $tag_name ||
+			'COL' === $tag_name ||
+			'EMBED' === $tag_name ||
+			'FRAME' === $tag_name ||
+			'HR' === $tag_name ||
+			'IMG' === $tag_name ||
+			'INPUT' === $tag_name ||
+			'KEYGEN' === $tag_name || // Obsolete but still treated as void.
+			'LINK' === $tag_name ||
+			'META' === $tag_name ||
+			'PARAM' === $tag_name || // Obsolete but still treated as void.
+			'SOURCE' === $tag_name ||
+			'TRACK' === $tag_name ||
+			'WBR' === $tag_name
+		);
+	}
+
+	/*
+	 * Constants that would pollute the top of the class if they were found there.
+	 */
+
+	/**
+	 * Indicates that the next HTML token should be parsed and processed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const PROCESS_NEXT_NODE = 'process-next-node';
+
+	/**
+	 * Indicates that the current HTML token should be reprocessed in the newly-selected insertion mode.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const REPROCESS_CURRENT_NODE = 'reprocess-current-node';
+
+	/**
+	 * Indicates that the current HTML token should be processed without advancing the parser.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string
+	 */
+	const PROCESS_CURRENT_NODE = 'process-current-node';
+
+	/**
+	 * Indicates that the parser encountered unsupported markup and has bailed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const ERROR_UNSUPPORTED = 'unsupported';
+
+	/**
+	 * Indicates that the parser encountered more HTML tokens than it
+	 * was able to process and has bailed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const ERROR_EXCEEDED_MAX_BOOKMARKS = 'exceeded-max-bookmarks';
+
+	/**
+	 * Unlock code that must be passed into the constructor to create this class.
+	 *
+	 * This class extends the WP_HTML_Tag_Processor, which has a public class
+	 * constructor. Therefore, it's not possible to have a private constructor here.
+	 *
+	 * This unlock code is used to ensure that anyone calling the constructor is
+	 * doing so with a full understanding that it's intended to be a private API.
+	 *
+	 * @access private
+	 */
+	const CONSTRUCTOR_UNLOCK_CODE = 'Use WP_HTML_Processor::create_fragment() instead of calling the class constructor directly.';
+}
diff --git a/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-processor-state-6-6.php b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-processor-state-6-6.php
new file mode 100644
index 00000000000000..69896986d53f00
--- /dev/null
+++ b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-processor-state-6-6.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * HTML API: WP_HTML_Processor_State class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the internal parsing state.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Processor_State_6_6 {
+	/*
+	 * Insertion mode constants.
+	 *
+	 * These constants exist and are named to make it easier to
+	 * discover and recognize the supported insertion modes in
+	 * the parser.
+	 *
+	 * Out of all the possible insertion modes, only those
+	 * supported by the parser are listed here. As support
+	 * is added to the parser for more modes, add them here
+	 * following the same naming and value pattern.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-insertion-mode
+	 */
+
+	/**
+	 * Initial insertion mode for full HTML parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#the-initial-insertion-mode
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_INITIAL = 'insertion-mode-initial';
+
+	/**
+	 * In body insertion mode for full HTML parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_BODY = 'insertion-mode-in-body';
+
+	/**
+	 * Tracks open elements while scanning HTML.
+	 *
+	 * This property is initialized in the constructor and never null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @var WP_HTML_Open_Elements
+	 */
+	public $stack_of_open_elements = null;
+
+	/**
+	 * Tracks open formatting elements, used to handle mis-nested formatting element tags.
+	 *
+	 * This property is initialized in the constructor and never null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#list-of-active-formatting-elements
+	 *
+	 * @var WP_HTML_Active_Formatting_Elements
+	 */
+	public $active_formatting_elements = null;
+
+	/**
+	 * Refers to the currently-matched tag, if any.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token|null
+	 */
+	public $current_token = null;
+
+	/**
+	 * Tree construction insertion mode.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#insertion-mode
+	 *
+	 * @var string
+	 */
+	public $insertion_mode = self::INSERTION_MODE_INITIAL;
+
+	/**
+	 * Context node initializing fragment parser, if created as a fragment parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#concept-frag-parse-context
+	 *
+	 * @var [string, array]|null
+	 */
+	public $context_node = null;
+
+	/**
+	 * The frameset-ok flag indicates if a `FRAMESET` element is allowed in the current state.
+	 *
+	 * > The frameset-ok flag is set to "ok" when the parser is created. It is set to "not ok" after certain tokens are seen.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#frameset-ok-flag
+	 *
+	 * @var bool
+	 */
+	public $frameset_ok = true;
+
+	/**
+	 * Constructor - creates a new and empty state value.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor
+	 */
+	public function __construct() {
+		$this->stack_of_open_elements     = new Gutenberg_HTML_Open_Elements_6_6();
+		$this->active_formatting_elements = new WP_HTML_Active_Formatting_Elements();
+	}
+}
diff --git a/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-stack-event-6-6.php b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-stack-event-6-6.php
new file mode 100644
index 00000000000000..0be6e709363bb6
--- /dev/null
+++ b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-stack-event-6-6.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * HTML API: WP_HTML_Stack_Event class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.6.0
+ */
+
+/**
+ * Core class used by the HTML Processor as a record for stack operations.
+ *
+ * This class is for internal usage of the WP_HTML_Processor class.
+ *
+ * @access private
+ * @since 6.6.0
+ *
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Stack_Event_6_6 {
+	/**
+	 * Refers to popping an element off of the stack of open elements.
+	 *
+	 * @since 6.6.0
+	 */
+	const POP = 'pop';
+
+	/**
+	 * Refers to pushing an element onto the stack of open elements.
+	 *
+	 * @since 6.6.0
+	 */
+	const PUSH = 'push';
+
+	/**
+	 * References the token associated with the stack push event,
+	 * even if this is a pop event for that element.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var WP_HTML_Token
+	 */
+	public $token;
+
+	/**
+	 * Indicates which kind of stack operation this event represents.
+	 *
+	 * May be one of the class constants.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @see self::POP
+	 * @see self::PUSH
+	 *
+	 * @var string
+	 */
+	public $operation;
+
+	/**
+	 * Indicates if the stack element is a real or virtual node.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var string
+	 */
+	public $provenance;
+
+	/**
+	 * Constructor function.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param WP_HTML_Token $token      Token associated with stack event, always an opening token.
+	 * @param string        $operation  One of self::PUSH or self::POP.
+	 * @param string        $provenance "virtual" or "real".
+	 */
+	public function __construct( $token, $operation, $provenance ) {
+		$this->token      = $token;
+		$this->operation  = $operation;
+		$this->provenance = $provenance;
+	}
+}
diff --git a/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-tag-processor-6-6.php b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-tag-processor-6-6.php
new file mode 100644
index 00000000000000..ecbc6d0d7b6af4
--- /dev/null
+++ b/lib/compat/wordpress-6.6/html-api/class-gutenberg-html-tag-processor-6-6.php
@@ -0,0 +1,3559 @@
+<?php
+/**
+ * HTML API: WP_HTML_Tag_Processor class
+ *
+ * Scans through an HTML document to find specific tags, then
+ * transforms those tags by adding, removing, or updating the
+ * values of the HTML attributes within that tag (opener).
+ *
+ * Does not fully parse HTML or _recurse_ into the HTML structure
+ * Instead this scans linearly through a document and only parses
+ * the HTML tag openers.
+ *
+ * ### Possible future direction for this module
+ *
+ *  - Prune the whitespace when removing classes/attributes: e.g. "a b c" -> "c" not " c".
+ *    This would increase the size of the changes for some operations but leave more
+ *    natural-looking output HTML.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Core class used to modify attributes in an HTML document for tags matching a query.
+ *
+ * ## Usage
+ *
+ * Use of this class requires three steps:
+ *
+ *  1. Create a new class instance with your input HTML document.
+ *  2. Find the tag(s) you are looking for.
+ *  3. Request changes to the attributes in those tag(s).
+ *
+ * Example:
+ *
+ *     $tags = new WP_HTML_Tag_Processor( $html );
+ *     if ( $tags->next_tag( 'option' ) ) {
+ *         $tags->set_attribute( 'selected', true );
+ *     }
+ *
+ * ### Finding tags
+ *
+ * The `next_tag()` function moves the internal cursor through
+ * your input HTML document until it finds a tag meeting any of
+ * the supplied restrictions in the optional query argument. If
+ * no argument is provided then it will find the next HTML tag,
+ * regardless of what kind it is.
+ *
+ * If you want to _find whatever the next tag is_:
+ *
+ *     $tags->next_tag();
+ *
+ * | Goal                                                      | Query                                                                           |
+ * |-----------------------------------------------------------|---------------------------------------------------------------------------------|
+ * | Find any tag.                                             | `$tags->next_tag();`                                                            |
+ * | Find next image tag.                                      | `$tags->next_tag( array( 'tag_name' => 'img' ) );`                              |
+ * | Find next image tag (without passing the array).          | `$tags->next_tag( 'img' );`                                                     |
+ * | Find next tag containing the `fullwidth` CSS class.       | `$tags->next_tag( array( 'class_name' => 'fullwidth' ) );`                      |
+ * | Find next image tag containing the `fullwidth` CSS class. | `$tags->next_tag( array( 'tag_name' => 'img', 'class_name' => 'fullwidth' ) );` |
+ *
+ * If a tag was found meeting your criteria then `next_tag()`
+ * will return `true` and you can proceed to modify it. If it
+ * returns `false`, however, it failed to find the tag and
+ * moved the cursor to the end of the file.
+ *
+ * Once the cursor reaches the end of the file the processor
+ * is done and if you want to reach an earlier tag you will
+ * need to recreate the processor and start over, as it's
+ * unable to back up or move in reverse.
+ *
+ * See the section on bookmarks for an exception to this
+ * no-backing-up rule.
+ *
+ * #### Custom queries
+ *
+ * Sometimes it's necessary to further inspect an HTML tag than
+ * the query syntax here permits. In these cases one may further
+ * inspect the search results using the read-only functions
+ * provided by the processor or external state or variables.
+ *
+ * Example:
+ *
+ *     // Paint up to the first five DIV or SPAN tags marked with the "jazzy" style.
+ *     $remaining_count = 5;
+ *     while ( $remaining_count > 0 && $tags->next_tag() ) {
+ *         if (
+ *              ( 'DIV' === $tags->get_tag() || 'SPAN' === $tags->get_tag() ) &&
+ *              'jazzy' === $tags->get_attribute( 'data-style' )
+ *         ) {
+ *             $tags->add_class( 'theme-style-everest-jazz' );
+ *             $remaining_count--;
+ *         }
+ *     }
+ *
+ * `get_attribute()` will return `null` if the attribute wasn't present
+ * on the tag when it was called. It may return `""` (the empty string)
+ * in cases where the attribute was present but its value was empty.
+ * For boolean attributes, those whose name is present but no value is
+ * given, it will return `true` (the only way to set `false` for an
+ * attribute is to remove it).
+ *
+ * #### When matching fails
+ *
+ * When `next_tag()` returns `false` it could mean different things:
+ *
+ *  - The requested tag wasn't found in the input document.
+ *  - The input document ended in the middle of an HTML syntax element.
+ *
+ * When a document ends in the middle of a syntax element it will pause
+ * the processor. This is to make it possible in the future to extend the
+ * input document and proceed - an important requirement for chunked
+ * streaming parsing of a document.
+ *
+ * Example:
+ *
+ *     $processor = new WP_HTML_Tag_Processor( 'This <div is="a" partial="token' );
+ *     false === $processor->next_tag();
+ *
+ * If a special element (see next section) is encountered but no closing tag
+ * is found it will count as an incomplete tag. The parser will pause as if
+ * the opening tag were incomplete.
+ *
+ * Example:
+ *
+ *     $processor = new WP_HTML_Tag_Processor( '<style>// there could be more styling to come' );
+ *     false === $processor->next_tag();
+ *
+ *     $processor = new WP_HTML_Tag_Processor( '<style>// this is everything</style><div>' );
+ *     true === $processor->next_tag( 'DIV' );
+ *
+ * #### Special elements
+ *
+ * Some HTML elements are handled in a special way; their start and end tags
+ * act like a void tag. These are special because their contents can't contain
+ * HTML markup. Everything inside these elements is handled in a special way
+ * and content that _appears_ like HTML tags inside of them isn't. There can
+ * be no nesting in these elements.
+ *
+ * In the following list, "raw text" means that all of the content in the HTML
+ * until the matching closing tag is treated verbatim without any replacements
+ * and without any parsing.
+ *
+ *  - IFRAME allows no content but requires a closing tag.
+ *  - NOEMBED (deprecated) content is raw text.
+ *  - NOFRAMES (deprecated) content is raw text.
+ *  - SCRIPT content is plaintext apart from legacy rules allowing `</script>` inside an HTML comment.
+ *  - STYLE content is raw text.
+ *  - TITLE content is plain text but character references are decoded.
+ *  - TEXTAREA content is plain text but character references are decoded.
+ *  - XMP (deprecated) content is raw text.
+ *
+ * ### Modifying HTML attributes for a found tag
+ *
+ * Once you've found the start of an opening tag you can modify
+ * any number of the attributes on that tag. You can set a new
+ * value for an attribute, remove the entire attribute, or do
+ * nothing and move on to the next opening tag.
+ *
+ * Example:
+ *
+ *     if ( $tags->next_tag( array( 'class_name' => 'wp-group-block' ) ) ) {
+ *         $tags->set_attribute( 'title', 'This groups the contained content.' );
+ *         $tags->remove_attribute( 'data-test-id' );
+ *     }
+ *
+ * If `set_attribute()` is called for an existing attribute it will
+ * overwrite the existing value. Similarly, calling `remove_attribute()`
+ * for a non-existing attribute has no effect on the document. Both
+ * of these methods are safe to call without knowing if a given attribute
+ * exists beforehand.
+ *
+ * ### Modifying CSS classes for a found tag
+ *
+ * The tag processor treats the `class` attribute as a special case.
+ * Because it's a common operation to add or remove CSS classes, this
+ * interface adds helper methods to make that easier.
+ *
+ * As with attribute values, adding or removing CSS classes is a safe
+ * operation that doesn't require checking if the attribute or class
+ * exists before making changes. If removing the only class then the
+ * entire `class` attribute will be removed.
+ *
+ * Example:
+ *
+ *     // from `<span>Yippee!</span>`
+ *     //   to `<span class="is-active">Yippee!</span>`
+ *     $tags->add_class( 'is-active' );
+ *
+ *     // from `<span class="excited">Yippee!</span>`
+ *     //   to `<span class="excited is-active">Yippee!</span>`
+ *     $tags->add_class( 'is-active' );
+ *
+ *     // from `<span class="is-active heavy-accent">Yippee!</span>`
+ *     //   to `<span class="is-active heavy-accent">Yippee!</span>`
+ *     $tags->add_class( 'is-active' );
+ *
+ *     // from `<input type="text" class="is-active rugby not-disabled" length="24">`
+ *     //   to `<input type="text" class="is-active not-disabled" length="24">
+ *     $tags->remove_class( 'rugby' );
+ *
+ *     // from `<input type="text" class="rugby" length="24">`
+ *     //   to `<input type="text" length="24">
+ *     $tags->remove_class( 'rugby' );
+ *
+ *     // from `<input type="text" length="24">`
+ *     //   to `<input type="text" length="24">
+ *     $tags->remove_class( 'rugby' );
+ *
+ * When class changes are enqueued but a direct change to `class` is made via
+ * `set_attribute` then the changes to `set_attribute` (or `remove_attribute`)
+ * will take precedence over those made through `add_class` and `remove_class`.
+ *
+ * ### Bookmarks
+ *
+ * While scanning through the input HTMl document it's possible to set
+ * a named bookmark when a particular tag is found. Later on, after
+ * continuing to scan other tags, it's possible to `seek` to one of
+ * the set bookmarks and then proceed again from that point forward.
+ *
+ * Because bookmarks create processing overhead one should avoid
+ * creating too many of them. As a rule, create only bookmarks
+ * of known string literal names; avoid creating "mark_{$index}"
+ * and so on. It's fine from a performance standpoint to create a
+ * bookmark and update it frequently, such as within a loop.
+ *
+ *     $total_todos = 0;
+ *     while ( $p->next_tag( array( 'tag_name' => 'UL', 'class_name' => 'todo' ) ) ) {
+ *         $p->set_bookmark( 'list-start' );
+ *         while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
+ *             if ( 'UL' === $p->get_tag() && $p->is_tag_closer() ) {
+ *                 $p->set_bookmark( 'list-end' );
+ *                 $p->seek( 'list-start' );
+ *                 $p->set_attribute( 'data-contained-todos', (string) $total_todos );
+ *                 $total_todos = 0;
+ *                 $p->seek( 'list-end' );
+ *                 break;
+ *             }
+ *
+ *             if ( 'LI' === $p->get_tag() && ! $p->is_tag_closer() ) {
+ *                 $total_todos++;
+ *             }
+ *         }
+ *     }
+ *
+ * ## Tokens and finer-grained processing.
+ *
+ * It's possible to scan through every lexical token in the
+ * HTML document using the `next_token()` function. This
+ * alternative form takes no argument and provides no built-in
+ * query syntax.
+ *
+ * Example:
+ *
+ *      $title = '(untitled)';
+ *      $text  = '';
+ *      while ( $processor->next_token() ) {
+ *          switch ( $processor->get_token_name() ) {
+ *              case '#text':
+ *                  $text .= $processor->get_modifiable_text();
+ *                  break;
+ *
+ *              case 'BR':
+ *                  $text .= "\n";
+ *                  break;
+ *
+ *              case 'TITLE':
+ *                  $title = $processor->get_modifiable_text();
+ *                  break;
+ *          }
+ *      }
+ *      return trim( "# {$title}\n\n{$text}" );
+ *
+ * ### Tokens and _modifiable text_.
+ *
+ * #### Special "atomic" HTML elements.
+ *
+ * Not all HTML elements are able to contain other elements inside of them.
+ * For instance, the contents inside a TITLE element are plaintext (except
+ * that character references like &amp; will be decoded). This means that
+ * if the string `<img>` appears inside a TITLE element, then it's not an
+ * image tag, but rather it's text describing an image tag. Likewise, the
+ * contents of a SCRIPT or STYLE element are handled entirely separately in
+ * a browser than the contents of other elements because they represent a
+ * different language than HTML.
+ *
+ * For these elements the Tag Processor treats the entire sequence as one,
+ * from the opening tag, including its contents, through its closing tag.
+ * This means that the it's not possible to match the closing tag for a
+ * SCRIPT element unless it's unexpected; the Tag Processor already matched
+ * it when it found the opening tag.
+ *
+ * The inner contents of these elements are that element's _modifiable text_.
+ *
+ * The special elements are:
+ *  - `SCRIPT` whose contents are treated as raw plaintext but supports a legacy
+ *    style of including JavaScript inside of HTML comments to avoid accidentally
+ *    closing the SCRIPT from inside a JavaScript string. E.g. `console.log( '</script>' )`.
+ *  - `TITLE` and `TEXTAREA` whose contents are treated as plaintext and then any
+ *    character references are decoded. E.g. `1 &lt; 2 < 3` becomes `1 < 2 < 3`.
+ *  - `IFRAME`, `NOSCRIPT`, `NOEMBED`, `NOFRAME`, `STYLE` whose contents are treated as
+ *    raw plaintext and left as-is. E.g. `1 &lt; 2 < 3` remains `1 &lt; 2 < 3`.
+ *
+ * #### Other tokens with modifiable text.
+ *
+ * There are also non-elements which are void/self-closing in nature and contain
+ * modifiable text that is part of that individual syntax token itself.
+ *
+ *  - `#text` nodes, whose entire token _is_ the modifiable text.
+ *  - HTML comments and tokens that become comments due to some syntax error. The
+ *    text for these tokens is the portion of the comment inside of the syntax.
+ *    E.g. for `<!-- comment -->` the text is `" comment "` (note the spaces are included).
+ *  - `CDATA` sections, whose text is the content inside of the section itself. E.g. for
+ *    `<![CDATA[some content]]>` the text is `"some content"` (with restrictions [1]).
+ *  - "Funky comments," which are a special case of invalid closing tags whose name is
+ *    invalid. The text for these nodes is the text that a browser would transform into
+ *    an HTML comment when parsing. E.g. for `</%post_author>` the text is `%post_author`.
+ *  - `DOCTYPE` declarations like `<DOCTYPE html>` which have no closing tag.
+ *  - XML Processing instruction nodes like `<?wp __( "Like" ); ?>` (with restrictions [2]).
+ *  - The empty end tag `</>` which is ignored in the browser and DOM.
+ *
+ * [1]: There are no CDATA sections in HTML. When encountering `<![CDATA[`, everything
+ *      until the next `>` becomes a bogus HTML comment, meaning there can be no CDATA
+ *      section in an HTML document containing `>`. The Tag Processor will first find
+ *      all valid and bogus HTML comments, and then if the comment _would_ have been a
+ *      CDATA section _were they to exist_, it will indicate this as the type of comment.
+ *
+ * [2]: XML allows a broader range of characters in a processing instruction's target name
+ *      and disallows "xml" as a name, since it's special. The Tag Processor only recognizes
+ *      target names with an ASCII-representable subset of characters. It also exhibits the
+ *      same constraint as with CDATA sections, in that `>` cannot exist within the token
+ *      since Processing Instructions do no exist within HTML and their syntax transforms
+ *      into a bogus comment in the DOM.
+ *
+ * ## Design and limitations
+ *
+ * The Tag Processor is designed to linearly scan HTML documents and tokenize
+ * HTML tags and their attributes. It's designed to do this as efficiently as
+ * possible without compromising parsing integrity. Therefore it will be
+ * slower than some methods of modifying HTML, such as those incorporating
+ * over-simplified PCRE patterns, but will not introduce the defects and
+ * failures that those methods bring in, which lead to broken page renders
+ * and often to security vulnerabilities. On the other hand, it will be faster
+ * than full-blown HTML parsers such as DOMDocument and use considerably
+ * less memory. It requires a negligible memory overhead, enough to consider
+ * it a zero-overhead system.
+ *
+ * The performance characteristics are maintained by avoiding tree construction
+ * and semantic cleanups which are specified in HTML5. Because of this, for
+ * example, it's not possible for the Tag Processor to associate any given
+ * opening tag with its corresponding closing tag, or to return the inner markup
+ * inside an element. Systems may be built on top of the Tag Processor to do
+ * this, but the Tag Processor is and should be constrained so it can remain an
+ * efficient, low-level, and reliable HTML scanner.
+ *
+ * The Tag Processor's design incorporates a "garbage-in-garbage-out" philosophy.
+ * HTML5 specifies that certain invalid content be transformed into different forms
+ * for display, such as removing null bytes from an input document and replacing
+ * invalid characters with the Unicode replacement character `U+FFFD` (visually "�").
+ * Where errors or transformations exist within the HTML5 specification, the Tag Processor
+ * leaves those invalid inputs untouched, passing them through to the final browser
+ * to handle. While this implies that certain operations will be non-spec-compliant,
+ * such as reading the value of an attribute with invalid content, it also preserves a
+ * simplicity and efficiency for handling those error cases.
+ *
+ * Most operations within the Tag Processor are designed to minimize the difference
+ * between an input and output document for any given change. For example, the
+ * `add_class` and `remove_class` methods preserve whitespace and the class ordering
+ * within the `class` attribute; and when encountering tags with duplicated attributes,
+ * the Tag Processor will leave those invalid duplicate attributes where they are but
+ * update the proper attribute which the browser will read for parsing its value. An
+ * exception to this rule is that all attribute updates store their values as
+ * double-quoted strings, meaning that attributes on input with single-quoted or
+ * unquoted values will appear in the output with double-quotes.
+ *
+ * ### Scripting Flag
+ *
+ * The Tag Processor parses HTML with the "scripting flag" disabled. This means
+ * that it doesn't run any scripts while parsing the page. In a browser with
+ * JavaScript enabled, for example, the script can change the parse of the
+ * document as it loads. On the server, however, evaluating JavaScript is not
+ * only impractical, but also unwanted.
+ *
+ * Practically this means that the Tag Processor will descend into NOSCRIPT
+ * elements and process its child tags. Were the scripting flag enabled, such
+ * as in a typical browser, the contents of NOSCRIPT are skipped entirely.
+ *
+ * This allows the HTML API to process the content that will be presented in
+ * a browser when scripting is disabled, but it offers a different view of a
+ * page than most browser sessions will experience. E.g. the tags inside the
+ * NOSCRIPT disappear.
+ *
+ * ### Text Encoding
+ *
+ * The Tag Processor assumes that the input HTML document is encoded with a
+ * text encoding compatible with 7-bit ASCII's '<', '>', '&', ';', '/', '=',
+ * "'", '"', 'a' - 'z', 'A' - 'Z', and the whitespace characters ' ', tab,
+ * carriage-return, newline, and form-feed.
+ *
+ * In practice, this includes almost every single-byte encoding as well as
+ * UTF-8. Notably, however, it does not include UTF-16. If providing input
+ * that's incompatible, then convert the encoding beforehand.
+ *
+ * @since 6.2.0
+ * @since 6.2.1 Fix: Support for various invalid comments; attribute updates are case-insensitive.
+ * @since 6.3.2 Fix: Skip HTML-like content inside rawtext elements such as STYLE.
+ * @since 6.5.0 Pauses processor when input ends in an incomplete syntax token.
+ *              Introduces "special" elements which act like void elements, e.g. TITLE, STYLE.
+ *              Allows scanning through all tokens and processing modifiable text, where applicable.
+ */
+class Gutenberg_HTML_Tag_Processor_6_6 {
+	/**
+	 * The maximum number of bookmarks allowed to exist at
+	 * any given time.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 *
+	 * @see WP_HTML_Tag_Processor::set_bookmark()
+	 */
+	const MAX_BOOKMARKS = 10;
+
+	/**
+	 * Maximum number of times seek() can be called.
+	 * Prevents accidental infinite loops.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 *
+	 * @see WP_HTML_Tag_Processor::seek()
+	 */
+	const MAX_SEEK_OPS = 1000;
+
+	/**
+	 * The HTML document to parse.
+	 *
+	 * @since 6.2.0
+	 * @var string
+	 */
+	protected $html;
+
+	/**
+	 * The last query passed to next_tag().
+	 *
+	 * @since 6.2.0
+	 * @var array|null
+	 */
+	private $last_query;
+
+	/**
+	 * The tag name this processor currently scans for.
+	 *
+	 * @since 6.2.0
+	 * @var string|null
+	 */
+	private $sought_tag_name;
+
+	/**
+	 * The CSS class name this processor currently scans for.
+	 *
+	 * @since 6.2.0
+	 * @var string|null
+	 */
+	private $sought_class_name;
+
+	/**
+	 * The match offset this processor currently scans for.
+	 *
+	 * @since 6.2.0
+	 * @var int|null
+	 */
+	private $sought_match_offset;
+
+	/**
+	 * Whether to visit tag closers, e.g. </div>, when walking an input document.
+	 *
+	 * @since 6.2.0
+	 * @var bool
+	 */
+	private $stop_on_tag_closers;
+
+	/**
+	 * Specifies mode of operation of the parser at any given time.
+	 *
+	 * | State           | Meaning                                                              |
+	 * | ----------------|----------------------------------------------------------------------|
+	 * | *Ready*         | The parser is ready to run.                                          |
+	 * | *Complete*      | There is nothing left to parse.                                      |
+	 * | *Incomplete*    | The HTML ended in the middle of a token; nothing more can be parsed. |
+	 * | *Matched tag*   | Found an HTML tag; it's possible to modify its attributes.           |
+	 * | *Text node*     | Found a #text node; this is plaintext and modifiable.                |
+	 * | *CDATA node*    | Found a CDATA section; this is modifiable.                           |
+	 * | *Comment*       | Found a comment or bogus comment; this is modifiable.                |
+	 * | *Presumptuous*  | Found an empty tag closer: `</>`.                                    |
+	 * | *Funky comment* | Found a tag closer with an invalid tag name; this is modifiable.     |
+	 *
+	 * @since 6.5.0
+	 *
+	 * @see WP_HTML_Tag_Processor::STATE_READY
+	 * @see WP_HTML_Tag_Processor::STATE_COMPLETE
+	 * @see WP_HTML_Tag_Processor::STATE_INCOMPLETE_INPUT
+	 * @see WP_HTML_Tag_Processor::STATE_MATCHED_TAG
+	 * @see WP_HTML_Tag_Processor::STATE_TEXT_NODE
+	 * @see WP_HTML_Tag_Processor::STATE_CDATA_NODE
+	 * @see WP_HTML_Tag_Processor::STATE_COMMENT
+	 * @see WP_HTML_Tag_Processor::STATE_DOCTYPE
+	 * @see WP_HTML_Tag_Processor::STATE_PRESUMPTUOUS_TAG
+	 * @see WP_HTML_Tag_Processor::STATE_FUNKY_COMMENT
+	 *
+	 * @var string
+	 */
+	protected $parser_state = self::STATE_READY;
+
+	/**
+	 * What kind of syntax token became an HTML comment.
+	 *
+	 * Since there are many ways in which HTML syntax can create an HTML comment,
+	 * this indicates which of those caused it. This allows the Tag Processor to
+	 * represent more from the original input document than would appear in the DOM.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string|null
+	 */
+	protected $comment_type = null;
+
+	/**
+	 * How many bytes from the original HTML document have been read and parsed.
+	 *
+	 * This value points to the latest byte offset in the input document which
+	 * has been already parsed. It is the internal cursor for the Tag Processor
+	 * and updates while scanning through the HTML tokens.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	private $bytes_already_parsed = 0;
+
+	/**
+	 * Byte offset in input document where current token starts.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     01234
+	 *     - token starts at 0
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var int|null
+	 */
+	private $token_starts_at;
+
+	/**
+	 * Byte length of current token.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     012345678901234
+	 *     - token length is 14 - 0 = 14
+	 *
+	 *     a <!-- comment --> is a token.
+	 *     0123456789 123456789 123456789
+	 *     - token length is 17 - 2 = 15
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var int|null
+	 */
+	private $token_length;
+
+	/**
+	 * Byte offset in input document where current tag name starts.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     01234
+	 *      - tag name starts at 1
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var int|null
+	 */
+	private $tag_name_starts_at;
+
+	/**
+	 * Byte length of current tag name.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     01234
+	 *      --- tag name length is 3
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var int|null
+	 */
+	private $tag_name_length;
+
+	/**
+	 * Byte offset into input document where current modifiable text starts.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var int
+	 */
+	private $text_starts_at;
+
+	/**
+	 * Byte length of modifiable text.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string
+	 */
+	private $text_length;
+
+	/**
+	 * Whether the current tag is an opening tag, e.g. <div>, or a closing tag, e.g. </div>.
+	 *
+	 * @var bool
+	 */
+	private $is_closing_tag;
+
+	/**
+	 * Lazily-built index of attributes found within an HTML tag, keyed by the attribute name.
+	 *
+	 * Example:
+	 *
+	 *     // Supposing the parser is working through this content
+	 *     // and stops after recognizing the `id` attribute.
+	 *     // <div id="test-4" class=outline title="data:text/plain;base64=asdk3nk1j3fo8">
+	 *     //                 ^ parsing will continue from this point.
+	 *     $this->attributes = array(
+	 *         'id' => new WP_HTML_Attribute_Token( 'id', 9, 6, 5, 11, false )
+	 *     );
+	 *
+	 *     // When picking up parsing again, or when asking to find the
+	 *     // `class` attribute we will continue and add to this array.
+	 *     $this->attributes = array(
+	 *         'id'    => new WP_HTML_Attribute_Token( 'id', 9, 6, 5, 11, false ),
+	 *         'class' => new WP_HTML_Attribute_Token( 'class', 23, 7, 17, 13, false )
+	 *     );
+	 *
+	 *     // Note that only the `class` attribute value is stored in the index.
+	 *     // That's because it is the only value used by this class at the moment.
+	 *
+	 * @since 6.2.0
+	 * @var WP_HTML_Attribute_Token[]
+	 */
+	private $attributes = array();
+
+	/**
+	 * Tracks spans of duplicate attributes on a given tag, used for removing
+	 * all copies of an attribute when calling `remove_attribute()`.
+	 *
+	 * @since 6.3.2
+	 *
+	 * @var (WP_HTML_Span[])[]|null
+	 */
+	private $duplicate_attributes = null;
+
+	/**
+	 * Which class names to add or remove from a tag.
+	 *
+	 * These are tracked separately from attribute updates because they are
+	 * semantically distinct, whereas this interface exists for the common
+	 * case of adding and removing class names while other attributes are
+	 * generally modified as with DOM `setAttribute` calls.
+	 *
+	 * When modifying an HTML document these will eventually be collapsed
+	 * into a single `set_attribute( 'class', $changes )` call.
+	 *
+	 * Example:
+	 *
+	 *     // Add the `wp-block-group` class, remove the `wp-group` class.
+	 *     $classname_updates = array(
+	 *         // Indexed by a comparable class name.
+	 *         'wp-block-group' => WP_HTML_Tag_Processor::ADD_CLASS,
+	 *         'wp-group'       => WP_HTML_Tag_Processor::REMOVE_CLASS
+	 *     );
+	 *
+	 * @since 6.2.0
+	 * @var bool[]
+	 */
+	private $classname_updates = array();
+
+	/**
+	 * Tracks a semantic location in the original HTML which
+	 * shifts with updates as they are applied to the document.
+	 *
+	 * @since 6.2.0
+	 * @var WP_HTML_Span[]
+	 */
+	protected $bookmarks = array();
+
+	const ADD_CLASS    = true;
+	const REMOVE_CLASS = false;
+	const SKIP_CLASS   = null;
+
+	/**
+	 * Lexical replacements to apply to input HTML document.
+	 *
+	 * "Lexical" in this class refers to the part of this class which
+	 * operates on pure text _as text_ and not as HTML. There's a line
+	 * between the public interface, with HTML-semantic methods like
+	 * `set_attribute` and `add_class`, and an internal state that tracks
+	 * text offsets in the input document.
+	 *
+	 * When higher-level HTML methods are called, those have to transform their
+	 * operations (such as setting an attribute's value) into text diffing
+	 * operations (such as replacing the sub-string from indices A to B with
+	 * some given new string). These text-diffing operations are the lexical
+	 * updates.
+	 *
+	 * As new higher-level methods are added they need to collapse their
+	 * operations into these lower-level lexical updates since that's the
+	 * Tag Processor's internal language of change. Any code which creates
+	 * these lexical updates must ensure that they do not cross HTML syntax
+	 * boundaries, however, so these should never be exposed outside of this
+	 * class or any classes which intentionally expand its functionality.
+	 *
+	 * These are enqueued while editing the document instead of being immediately
+	 * applied to avoid processing overhead, string allocations, and string
+	 * copies when applying many updates to a single document.
+	 *
+	 * Example:
+	 *
+	 *     // Replace an attribute stored with a new value, indices
+	 *     // sourced from the lazily-parsed HTML recognizer.
+	 *     $start  = $attributes['src']->start;
+	 *     $length = $attributes['src']->length;
+	 *     $modifications[] = new WP_HTML_Text_Replacement( $start, $length, $new_value );
+	 *
+	 *     // Correspondingly, something like this will appear in this array.
+	 *     $lexical_updates = array(
+	 *         WP_HTML_Text_Replacement( 14, 28, 'https://my-site.my-domain/wp-content/uploads/2014/08/kittens.jpg' )
+	 *     );
+	 *
+	 * @since 6.2.0
+	 * @var WP_HTML_Text_Replacement[]
+	 */
+	protected $lexical_updates = array();
+
+	/**
+	 * Tracks and limits `seek()` calls to prevent accidental infinite loops.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 *
+	 * @see WP_HTML_Tag_Processor::seek()
+	 */
+	protected $seek_count = 0;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $html HTML to process.
+	 */
+	public function __construct( $html ) {
+		$this->html = $html;
+	}
+
+	/**
+	 * Finds the next tag matching the $query.
+	 *
+	 * @since 6.2.0
+	 * @since 6.5.0 No longer processes incomplete tokens at end of document; pauses the processor at start of token.
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this whole class name to match.
+	 *     @type string|null $tag_closers  "visit" or "skip": whether to stop on tag closers, e.g. </div>.
+	 * }
+	 * @return bool Whether a tag was matched.
+	 */
+	public function next_tag( $query = null ) {
+		$this->parse_query( $query );
+		$already_found = 0;
+
+		do {
+			if ( false === $this->next_token() ) {
+				return false;
+			}
+
+			if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+				continue;
+			}
+
+			if ( $this->matches() ) {
+				++$already_found;
+			}
+		} while ( $already_found < $this->sought_match_offset );
+
+		return true;
+	}
+
+	/**
+	 * Finds the next token in the HTML document.
+	 *
+	 * An HTML document can be viewed as a stream of tokens,
+	 * where tokens are things like HTML tags, HTML comments,
+	 * text nodes, etc. This method finds the next token in
+	 * the HTML document and returns whether it found one.
+	 *
+	 * If it starts parsing a token and reaches the end of the
+	 * document then it will seek to the start of the last
+	 * token and pause, returning `false` to indicate that it
+	 * failed to find a complete token.
+	 *
+	 * Possible token types, based on the HTML specification:
+	 *
+	 *  - an HTML tag, whether opening, closing, or void.
+	 *  - a text node - the plaintext inside tags.
+	 *  - an HTML comment.
+	 *  - a DOCTYPE declaration.
+	 *  - a processing instruction, e.g. `<?xml version="1.0" ?>`.
+	 *
+	 * The Tag Processor currently only supports the tag token.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return bool Whether a token was parsed.
+	 */
+	public function next_token() {
+		return $this->base_class_next_token();
+	}
+
+	/**
+	 * Internal method which finds the next token in the HTML document.
+	 *
+	 * This method is a protected internal function which implements the logic for
+	 * finding the next token in a document. It exists so that the parser can update
+	 * its state without affecting the location of the cursor in the document and
+	 * without triggering subclass methods for things like `next_token()`, e.g. when
+	 * applying patches before searching for the next token.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 *
+	 * @return bool Whether a token was parsed.
+	 */
+	private function base_class_next_token() {
+		$was_at = $this->bytes_already_parsed;
+		$this->after_tag();
+
+		// Don't proceed if there's nothing more to scan.
+		if (
+			self::STATE_COMPLETE === $this->parser_state ||
+			self::STATE_INCOMPLETE_INPUT === $this->parser_state
+		) {
+			return false;
+		}
+
+		/*
+		 * The next step in the parsing loop determines the parsing state;
+		 * clear it so that state doesn't linger from the previous step.
+		 */
+		$this->parser_state = self::STATE_READY;
+
+		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_COMPLETE;
+			return false;
+		}
+
+		// Find the next tag if it exists.
+		if ( false === $this->parse_next_tag() ) {
+			if ( self::STATE_INCOMPLETE_INPUT === $this->parser_state ) {
+				$this->bytes_already_parsed = $was_at;
+			}
+
+			return false;
+		}
+
+		/*
+		 * For legacy reasons the rest of this function handles tags and their
+		 * attributes. If the processor has reached the end of the document
+		 * or if it matched any other token then it should return here to avoid
+		 * attempting to process tag-specific syntax.
+		 */
+		if (
+			self::STATE_INCOMPLETE_INPUT !== $this->parser_state &&
+			self::STATE_COMPLETE !== $this->parser_state &&
+			self::STATE_MATCHED_TAG !== $this->parser_state
+		) {
+			return true;
+		}
+
+		// Parse all of its attributes.
+		while ( $this->parse_next_attribute() ) {
+			continue;
+		}
+
+		// Ensure that the tag closes before the end of the document.
+		if (
+			self::STATE_INCOMPLETE_INPUT === $this->parser_state ||
+			$this->bytes_already_parsed >= strlen( $this->html )
+		) {
+			// Does this appropriately clear state (parsed attributes)?
+			$this->parser_state         = self::STATE_INCOMPLETE_INPUT;
+			$this->bytes_already_parsed = $was_at;
+
+			return false;
+		}
+
+		$tag_ends_at = strpos( $this->html, '>', $this->bytes_already_parsed );
+		if ( false === $tag_ends_at ) {
+			$this->parser_state         = self::STATE_INCOMPLETE_INPUT;
+			$this->bytes_already_parsed = $was_at;
+
+			return false;
+		}
+		$this->parser_state         = self::STATE_MATCHED_TAG;
+		$this->bytes_already_parsed = $tag_ends_at + 1;
+		$this->token_length         = $this->bytes_already_parsed - $this->token_starts_at;
+
+		/*
+		 * For non-DATA sections which might contain text that looks like HTML tags but
+		 * isn't, scan with the appropriate alternative mode. Looking at the first letter
+		 * of the tag name as a pre-check avoids a string allocation when it's not needed.
+		 */
+		$t = $this->html[ $this->tag_name_starts_at ];
+		if (
+			$this->is_closing_tag ||
+			! (
+				'i' === $t || 'I' === $t ||
+				'n' === $t || 'N' === $t ||
+				's' === $t || 'S' === $t ||
+				't' === $t || 'T' === $t ||
+				'x' === $t || 'X' === $t
+			)
+		) {
+			return true;
+		}
+
+		$tag_name = $this->get_tag();
+
+		/*
+		 * Preserve the opening tag pointers, as these will be overwritten
+		 * when finding the closing tag. They will be reset after finding
+		 * the closing to tag to point to the opening of the special atomic
+		 * tag sequence.
+		 */
+		$tag_name_starts_at   = $this->tag_name_starts_at;
+		$tag_name_length      = $this->tag_name_length;
+		$tag_ends_at          = $this->token_starts_at + $this->token_length;
+		$attributes           = $this->attributes;
+		$duplicate_attributes = $this->duplicate_attributes;
+
+		// Find the closing tag if necessary.
+		$found_closer = false;
+		switch ( $tag_name ) {
+			case 'SCRIPT':
+				$found_closer = $this->skip_script_data();
+				break;
+
+			case 'TEXTAREA':
+			case 'TITLE':
+				$found_closer = $this->skip_rcdata( $tag_name );
+				break;
+
+			/*
+			 * In the browser this list would include the NOSCRIPT element,
+			 * but the Tag Processor is an environment with the scripting
+			 * flag disabled, meaning that it needs to descend into the
+			 * NOSCRIPT element to be able to properly process what will be
+			 * sent to a browser.
+			 *
+			 * Note that this rule makes HTML5 syntax incompatible with XML,
+			 * because the parsing of this token depends on client application.
+			 * The NOSCRIPT element cannot be represented in the XHTML syntax.
+			 */
+			case 'IFRAME':
+			case 'NOEMBED':
+			case 'NOFRAMES':
+			case 'STYLE':
+			case 'XMP':
+				$found_closer = $this->skip_rawtext( $tag_name );
+				break;
+
+			// No other tags should be treated in their entirety here.
+			default:
+				return true;
+		}
+
+		if ( ! $found_closer ) {
+			$this->parser_state         = self::STATE_INCOMPLETE_INPUT;
+			$this->bytes_already_parsed = $was_at;
+			return false;
+		}
+
+		/*
+		 * The values here look like they reference the opening tag but they reference
+		 * the closing tag instead. This is why the opening tag values were stored
+		 * above in a variable. It reads confusingly here, but that's because the
+		 * functions that skip the contents have moved all the internal cursors past
+		 * the inner content of the tag.
+		 */
+		$this->token_starts_at      = $was_at;
+		$this->token_length         = $this->bytes_already_parsed - $this->token_starts_at;
+		$this->text_starts_at       = $tag_ends_at;
+		$this->text_length          = $this->tag_name_starts_at - $this->text_starts_at;
+		$this->tag_name_starts_at   = $tag_name_starts_at;
+		$this->tag_name_length      = $tag_name_length;
+		$this->attributes           = $attributes;
+		$this->duplicate_attributes = $duplicate_attributes;
+
+		return true;
+	}
+
+	/**
+	 * Whether the processor paused because the input HTML document ended
+	 * in the middle of a syntax element, such as in the middle of a tag.
+	 *
+	 * Example:
+	 *
+	 *     $processor = new WP_HTML_Tag_Processor( '<input type="text" value="Th' );
+	 *     false      === $processor->get_next_tag();
+	 *     true       === $processor->paused_at_incomplete_token();
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return bool Whether the parse paused at the start of an incomplete token.
+	 */
+	public function paused_at_incomplete_token() {
+		return self::STATE_INCOMPLETE_INPUT === $this->parser_state;
+	}
+
+	/**
+	 * Generator for a foreach loop to step through each class name for the matched tag.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( "<div class='free &lt;egg&lt;\tlang-en'>" );
+	 *     $p->next_tag();
+	 *     foreach ( $p->class_list() as $class_name ) {
+	 *         echo "{$class_name} ";
+	 *     }
+	 *     // Outputs: "free <egg> lang-en "
+	 *
+	 * @since 6.4.0
+	 */
+	public function class_list() {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return;
+		}
+
+		/** @var string $class contains the string value of the class attribute, with character references decoded. */
+		$class = $this->get_attribute( 'class' );
+
+		if ( ! is_string( $class ) ) {
+			return;
+		}
+
+		$seen = array();
+
+		$at = 0;
+		while ( $at < strlen( $class ) ) {
+			// Skip past any initial boundary characters.
+			$at += strspn( $class, " \t\f\r\n", $at );
+			if ( $at >= strlen( $class ) ) {
+				return;
+			}
+
+			// Find the byte length until the next boundary.
+			$length = strcspn( $class, " \t\f\r\n", $at );
+			if ( 0 === $length ) {
+				return;
+			}
+
+			/*
+			 * CSS class names are case-insensitive in the ASCII range.
+			 *
+			 * @see https://www.w3.org/TR/CSS2/syndata.html#x1
+			 */
+			$name = strtolower( substr( $class, $at, $length ) );
+			$at  += $length;
+
+			/*
+			 * It's expected that the number of class names for a given tag is relatively small.
+			 * Given this, it is probably faster overall to scan an array for a value rather
+			 * than to use the class name as a key and check if it's a key of $seen.
+			 */
+			if ( in_array( $name, $seen, true ) ) {
+				continue;
+			}
+
+			$seen[] = $name;
+			yield $name;
+		}
+	}
+
+
+	/**
+	 * Returns if a matched tag contains the given ASCII case-insensitive class name.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $wanted_class Look for this CSS class name, ASCII case-insensitive.
+	 * @return bool|null Whether the matched tag contains the given class name, or null if not matched.
+	 */
+	public function has_class( $wanted_class ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return null;
+		}
+
+		$wanted_class = strtolower( $wanted_class );
+
+		foreach ( $this->class_list() as $class_name ) {
+			if ( $class_name === $wanted_class ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Sets a bookmark in the HTML document.
+	 *
+	 * Bookmarks represent specific places or tokens in the HTML
+	 * document, such as a tag opener or closer. When applying
+	 * edits to a document, such as setting an attribute, the
+	 * text offsets of that token may shift; the bookmark is
+	 * kept updated with those shifts and remains stable unless
+	 * the entire span of text in which the token sits is removed.
+	 *
+	 * Release bookmarks when they are no longer needed.
+	 *
+	 * Example:
+	 *
+	 *     <main><h2>Surprising fact you may not know!</h2></main>
+	 *           ^  ^
+	 *            \-|-- this `H2` opener bookmark tracks the token
+	 *
+	 *     <main class="clickbait"><h2>Surprising fact you may no…
+	 *                             ^  ^
+	 *                              \-|-- it shifts with edits
+	 *
+	 * Bookmarks provide the ability to seek to a previously-scanned
+	 * place in the HTML document. This avoids the need to re-scan
+	 * the entire document.
+	 *
+	 * Example:
+	 *
+	 *     <ul><li>One</li><li>Two</li><li>Three</li></ul>
+	 *                                 ^^^^
+	 *                                 want to note this last item
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( $html );
+	 *     $in_list = false;
+	 *     while ( $p->next_tag( array( 'tag_closers' => $in_list ? 'visit' : 'skip' ) ) ) {
+	 *         if ( 'UL' === $p->get_tag() ) {
+	 *             if ( $p->is_tag_closer() ) {
+	 *                 $in_list = false;
+	 *                 $p->set_bookmark( 'resume' );
+	 *                 if ( $p->seek( 'last-li' ) ) {
+	 *                     $p->add_class( 'last-li' );
+	 *                 }
+	 *                 $p->seek( 'resume' );
+	 *                 $p->release_bookmark( 'last-li' );
+	 *                 $p->release_bookmark( 'resume' );
+	 *             } else {
+	 *                 $in_list = true;
+	 *             }
+	 *         }
+	 *
+	 *         if ( 'LI' === $p->get_tag() ) {
+	 *             $p->set_bookmark( 'last-li' );
+	 *         }
+	 *     }
+	 *
+	 * Bookmarks intentionally hide the internal string offsets
+	 * to which they refer. They are maintained internally as
+	 * updates are applied to the HTML document and therefore
+	 * retain their "position" - the location to which they
+	 * originally pointed. The inability to use bookmarks with
+	 * functions like `substr` is therefore intentional to guard
+	 * against accidentally breaking the HTML.
+	 *
+	 * Because bookmarks allocate memory and require processing
+	 * for every applied update, they are limited and require
+	 * a name. They should not be created with programmatically-made
+	 * names, such as "li_{$index}" with some loop. As a general
+	 * rule they should only be created with string-literal names
+	 * like "start-of-section" or "last-paragraph".
+	 *
+	 * Bookmarks are a powerful tool to enable complicated behavior.
+	 * Consider double-checking that you need this tool if you are
+	 * reaching for it, as inappropriate use could lead to broken
+	 * HTML structure or unwanted processing overhead.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name Identifies this particular bookmark.
+	 * @return bool Whether the bookmark was successfully created.
+	 */
+	public function set_bookmark( $name ) {
+		// It only makes sense to set a bookmark if the parser has paused on a concrete token.
+		if (
+			self::STATE_COMPLETE === $this->parser_state ||
+			self::STATE_INCOMPLETE_INPUT === $this->parser_state
+		) {
+			return false;
+		}
+
+		if ( ! array_key_exists( $name, $this->bookmarks ) && count( $this->bookmarks ) >= static::MAX_BOOKMARKS ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Too many bookmarks: cannot create any more.' ),
+				'6.2.0'
+			);
+			return false;
+		}
+
+		$this->bookmarks[ $name ] = new WP_HTML_Span( $this->token_starts_at, $this->token_length );
+
+		return true;
+	}
+
+
+	/**
+	 * Removes a bookmark that is no longer needed.
+	 *
+	 * Releasing a bookmark frees up the small
+	 * performance overhead it requires.
+	 *
+	 * @param string $name Name of the bookmark to remove.
+	 * @return bool Whether the bookmark already existed before removal.
+	 */
+	public function release_bookmark( $name ) {
+		if ( ! array_key_exists( $name, $this->bookmarks ) ) {
+			return false;
+		}
+
+		unset( $this->bookmarks[ $name ] );
+
+		return true;
+	}
+
+	/**
+	 * Skips contents of generic rawtext elements.
+	 *
+	 * @since 6.3.2
+	 *
+	 * @see https://html.spec.whatwg.org/#generic-raw-text-element-parsing-algorithm
+	 *
+	 * @param string $tag_name The uppercase tag name which will close the RAWTEXT region.
+	 * @return bool Whether an end to the RAWTEXT region was found before the end of the document.
+	 */
+	private function skip_rawtext( $tag_name ) {
+		/*
+		 * These two functions distinguish themselves on whether character references are
+		 * decoded, and since functionality to read the inner markup isn't supported, it's
+		 * not necessary to implement these two functions separately.
+		 */
+		return $this->skip_rcdata( $tag_name );
+	}
+
+	/**
+	 * Skips contents of RCDATA elements, namely title and textarea tags.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/parsing.html#rcdata-state
+	 *
+	 * @param string $tag_name The uppercase tag name which will close the RCDATA region.
+	 * @return bool Whether an end to the RCDATA region was found before the end of the document.
+	 */
+	private function skip_rcdata( $tag_name ) {
+		$html       = $this->html;
+		$doc_length = strlen( $html );
+		$tag_length = strlen( $tag_name );
+
+		$at = $this->bytes_already_parsed;
+
+		while ( false !== $at && $at < $doc_length ) {
+			$at                       = strpos( $this->html, '</', $at );
+			$this->tag_name_starts_at = $at;
+
+			// Fail if there is no possible tag closer.
+			if ( false === $at || ( $at + $tag_length ) >= $doc_length ) {
+				return false;
+			}
+
+			$at += 2;
+
+			/*
+			 * Find a case-insensitive match to the tag name.
+			 *
+			 * Because tag names are limited to US-ASCII there is no
+			 * need to perform any kind of Unicode normalization when
+			 * comparing; any character which could be impacted by such
+			 * normalization could not be part of a tag name.
+			 */
+			for ( $i = 0; $i < $tag_length; $i++ ) {
+				$tag_char  = $tag_name[ $i ];
+				$html_char = $html[ $at + $i ];
+
+				if ( $html_char !== $tag_char && strtoupper( $html_char ) !== $tag_char ) {
+					$at += $i;
+					continue 2;
+				}
+			}
+
+			$at                        += $tag_length;
+			$this->bytes_already_parsed = $at;
+
+			if ( $at >= strlen( $html ) ) {
+				return false;
+			}
+
+			/*
+			 * Ensure that the tag name terminates to avoid matching on
+			 * substrings of a longer tag name. For example, the sequence
+			 * "</textarearug" should not match for "</textarea" even
+			 * though "textarea" is found within the text.
+			 */
+			$c = $html[ $at ];
+			if ( ' ' !== $c && "\t" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
+				continue;
+			}
+
+			while ( $this->parse_next_attribute() ) {
+				continue;
+			}
+
+			$at = $this->bytes_already_parsed;
+			if ( $at >= strlen( $this->html ) ) {
+				return false;
+			}
+
+			if ( '>' === $html[ $at ] ) {
+				$this->bytes_already_parsed = $at + 1;
+				return true;
+			}
+
+			if ( $at + 1 >= strlen( $this->html ) ) {
+				return false;
+			}
+
+			if ( '/' === $html[ $at ] && '>' === $html[ $at + 1 ] ) {
+				$this->bytes_already_parsed = $at + 2;
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Skips contents of script tags.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether the script tag was closed before the end of the document.
+	 */
+	private function skip_script_data() {
+		$state      = 'unescaped';
+		$html       = $this->html;
+		$doc_length = strlen( $html );
+		$at         = $this->bytes_already_parsed;
+
+		while ( false !== $at && $at < $doc_length ) {
+			$at += strcspn( $html, '-<', $at );
+
+			/*
+			 * For all script states a "-->"  transitions
+			 * back into the normal unescaped script mode,
+			 * even if that's the current state.
+			 */
+			if (
+				$at + 2 < $doc_length &&
+				'-' === $html[ $at ] &&
+				'-' === $html[ $at + 1 ] &&
+				'>' === $html[ $at + 2 ]
+			) {
+				$at   += 3;
+				$state = 'unescaped';
+				continue;
+			}
+
+			// Everything of interest past here starts with "<".
+			if ( $at + 1 >= $doc_length || '<' !== $html[ $at++ ] ) {
+				continue;
+			}
+
+			/*
+			 * Unlike with "-->", the "<!--" only transitions
+			 * into the escaped mode if not already there.
+			 *
+			 * Inside the escaped modes it will be ignored; and
+			 * should never break out of the double-escaped
+			 * mode and back into the escaped mode.
+			 *
+			 * While this requires a mode change, it does not
+			 * impact the parsing otherwise, so continue
+			 * parsing after updating the state.
+			 */
+			if (
+				$at + 2 < $doc_length &&
+				'!' === $html[ $at ] &&
+				'-' === $html[ $at + 1 ] &&
+				'-' === $html[ $at + 2 ]
+			) {
+				$at   += 3;
+				$state = 'unescaped' === $state ? 'escaped' : $state;
+				continue;
+			}
+
+			if ( '/' === $html[ $at ] ) {
+				$closer_potentially_starts_at = $at - 1;
+				$is_closing                   = true;
+				++$at;
+			} else {
+				$is_closing = false;
+			}
+
+			/*
+			 * At this point the only remaining state-changes occur with the
+			 * <script> and </script> tags; unless one of these appears next,
+			 * proceed scanning to the next potential token in the text.
+			 */
+			if ( ! (
+				$at + 6 < $doc_length &&
+				( 's' === $html[ $at ] || 'S' === $html[ $at ] ) &&
+				( 'c' === $html[ $at + 1 ] || 'C' === $html[ $at + 1 ] ) &&
+				( 'r' === $html[ $at + 2 ] || 'R' === $html[ $at + 2 ] ) &&
+				( 'i' === $html[ $at + 3 ] || 'I' === $html[ $at + 3 ] ) &&
+				( 'p' === $html[ $at + 4 ] || 'P' === $html[ $at + 4 ] ) &&
+				( 't' === $html[ $at + 5 ] || 'T' === $html[ $at + 5 ] )
+			) ) {
+				++$at;
+				continue;
+			}
+
+			/*
+			 * Ensure that the script tag terminates to avoid matching on
+			 * substrings of a non-match. For example, the sequence
+			 * "<script123" should not end a script region even though
+			 * "<script" is found within the text.
+			 */
+			if ( $at + 6 >= $doc_length ) {
+				continue;
+			}
+			$at += 6;
+			$c   = $html[ $at ];
+			if ( ' ' !== $c && "\t" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
+				++$at;
+				continue;
+			}
+
+			if ( 'escaped' === $state && ! $is_closing ) {
+				$state = 'double-escaped';
+				continue;
+			}
+
+			if ( 'double-escaped' === $state && $is_closing ) {
+				$state = 'escaped';
+				continue;
+			}
+
+			if ( $is_closing ) {
+				$this->bytes_already_parsed = $closer_potentially_starts_at;
+				$this->tag_name_starts_at   = $closer_potentially_starts_at;
+				if ( $this->bytes_already_parsed >= $doc_length ) {
+					return false;
+				}
+
+				while ( $this->parse_next_attribute() ) {
+					continue;
+				}
+
+				if ( $this->bytes_already_parsed >= $doc_length ) {
+					$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+					return false;
+				}
+
+				if ( '>' === $html[ $this->bytes_already_parsed ] ) {
+					++$this->bytes_already_parsed;
+					return true;
+				}
+			}
+
+			++$at;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parses the next tag.
+	 *
+	 * This will find and start parsing the next tag, including
+	 * the opening `<`, the potential closer `/`, and the tag
+	 * name. It does not parse the attributes or scan to the
+	 * closing `>`; these are left for other methods.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Support abruptly-closed comments, invalid-tag-closer-comments, and empty elements.
+	 *
+	 * @return bool Whether a tag was found before the end of the document.
+	 */
+	private function parse_next_tag() {
+		$this->after_tag();
+
+		$html       = $this->html;
+		$doc_length = strlen( $html );
+		$was_at     = $this->bytes_already_parsed;
+		$at         = $was_at;
+
+		while ( false !== $at && $at < $doc_length ) {
+			$at = strpos( $html, '<', $at );
+
+			/*
+			 * This does not imply an incomplete parse; it indicates that there
+			 * can be nothing left in the document other than a #text node.
+			 */
+			if ( false === $at ) {
+				$this->parser_state         = self::STATE_TEXT_NODE;
+				$this->token_starts_at      = $was_at;
+				$this->token_length         = strlen( $html ) - $was_at;
+				$this->text_starts_at       = $was_at;
+				$this->text_length          = $this->token_length;
+				$this->bytes_already_parsed = strlen( $html );
+				return true;
+			}
+
+			if ( $at > $was_at ) {
+				/*
+				 * A "<" normally starts a new HTML tag or syntax token, but in cases where the
+				 * following character can't produce a valid token, the "<" is instead treated
+				 * as plaintext and the parser should skip over it. This avoids a problem when
+				 * following earlier practices of typing emoji with text, e.g. "<3". This
+				 * should be a heart, not a tag. It's supposed to be rendered, not hidden.
+				 *
+				 * At this point the parser checks if this is one of those cases and if it is
+				 * will continue searching for the next "<" in search of a token boundary.
+				 *
+				 * @see https://html.spec.whatwg.org/#tag-open-state
+				 */
+				if ( strlen( $html ) > $at + 1 ) {
+					$next_character  = $html[ $at + 1 ];
+					$at_another_node = (
+						'!' === $next_character ||
+						'/' === $next_character ||
+						'?' === $next_character ||
+						( 'A' <= $next_character && $next_character <= 'Z' ) ||
+						( 'a' <= $next_character && $next_character <= 'z' )
+					);
+					if ( ! $at_another_node ) {
+						++$at;
+						continue;
+					}
+				}
+
+				$this->parser_state         = self::STATE_TEXT_NODE;
+				$this->token_starts_at      = $was_at;
+				$this->token_length         = $at - $was_at;
+				$this->text_starts_at       = $was_at;
+				$this->text_length          = $this->token_length;
+				$this->bytes_already_parsed = $at;
+				return true;
+			}
+
+			$this->token_starts_at = $at;
+
+			if ( $at + 1 < $doc_length && '/' === $this->html[ $at + 1 ] ) {
+				$this->is_closing_tag = true;
+				++$at;
+			} else {
+				$this->is_closing_tag = false;
+			}
+
+			/*
+			 * HTML tag names must start with [a-zA-Z] otherwise they are not tags.
+			 * For example, "<3" is rendered as text, not a tag opener. If at least
+			 * one letter follows the "<" then _it is_ a tag, but if the following
+			 * character is anything else it _is not a tag_.
+			 *
+			 * It's not uncommon to find non-tags starting with `<` in an HTML
+			 * document, so it's good for performance to make this pre-check before
+			 * continuing to attempt to parse a tag name.
+			 *
+			 * Reference:
+			 * * https://html.spec.whatwg.org/multipage/parsing.html#data-state
+			 * * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+			 */
+			$tag_name_prefix_length = strspn( $html, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', $at + 1 );
+			if ( $tag_name_prefix_length > 0 ) {
+				++$at;
+				$this->parser_state         = self::STATE_MATCHED_TAG;
+				$this->tag_name_starts_at   = $at;
+				$this->tag_name_length      = $tag_name_prefix_length + strcspn( $html, " \t\f\r\n/>", $at + $tag_name_prefix_length );
+				$this->bytes_already_parsed = $at + $this->tag_name_length;
+				return true;
+			}
+
+			/*
+			 * Abort if no tag is found before the end of
+			 * the document. There is nothing left to parse.
+			 */
+			if ( $at + 1 >= $doc_length ) {
+				$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+				return false;
+			}
+
+			/*
+			 * `<!` transitions to markup declaration open state
+			 * https://html.spec.whatwg.org/multipage/parsing.html#markup-declaration-open-state
+			 */
+			if ( ! $this->is_closing_tag && '!' === $html[ $at + 1 ] ) {
+				/*
+				 * `<!--` transitions to a comment state – apply further comment rules.
+				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+				 */
+				if (
+					$doc_length > $at + 3 &&
+					'-' === $html[ $at + 2 ] &&
+					'-' === $html[ $at + 3 ]
+				) {
+					$closer_at = $at + 4;
+					// If it's not possible to close the comment then there is nothing more to scan.
+					if ( $doc_length <= $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+						return false;
+					}
+
+					// Abruptly-closed empty comments are a sequence of dashes followed by `>`.
+					$span_of_dashes = strspn( $html, '-', $closer_at );
+					if ( '>' === $html[ $closer_at + $span_of_dashes ] ) {
+						/*
+						 * @todo When implementing `set_modifiable_text()` ensure that updates to this token
+						 *       don't break the syntax for short comments, e.g. `<!--->`. Unlike other comment
+						 *       and bogus comment syntax, these leave no clear insertion point for text and
+						 *       they need to be modified specially in order to contain text. E.g. to store
+						 *       `?` as the modifiable text, the `<!--->` needs to become `<!--?-->`, which
+						 *       involves inserting an additional `-` into the token after the modifiable text.
+						 */
+						$this->parser_state = self::STATE_COMMENT;
+						$this->comment_type = self::COMMENT_AS_ABRUPTLY_CLOSED_COMMENT;
+						$this->token_length = $closer_at + $span_of_dashes + 1 - $this->token_starts_at;
+
+						// Only provide modifiable text if the token is long enough to contain it.
+						if ( $span_of_dashes >= 2 ) {
+							$this->comment_type   = self::COMMENT_AS_HTML_COMMENT;
+							$this->text_starts_at = $this->token_starts_at + 4;
+							$this->text_length    = $span_of_dashes - 2;
+						}
+
+						$this->bytes_already_parsed = $closer_at + $span_of_dashes + 1;
+						return true;
+					}
+
+					/*
+					 * Comments may be closed by either a --> or an invalid --!>.
+					 * The first occurrence closes the comment.
+					 *
+					 * See https://html.spec.whatwg.org/#parse-error-incorrectly-closed-comment
+					 */
+					--$closer_at; // Pre-increment inside condition below reduces risk of accidental infinite looping.
+					while ( ++$closer_at < $doc_length ) {
+						$closer_at = strpos( $html, '--', $closer_at );
+						if ( false === $closer_at ) {
+							$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+							return false;
+						}
+
+						if ( $closer_at + 2 < $doc_length && '>' === $html[ $closer_at + 2 ] ) {
+							$this->parser_state         = self::STATE_COMMENT;
+							$this->comment_type         = self::COMMENT_AS_HTML_COMMENT;
+							$this->token_length         = $closer_at + 3 - $this->token_starts_at;
+							$this->text_starts_at       = $this->token_starts_at + 4;
+							$this->text_length          = $closer_at - $this->text_starts_at;
+							$this->bytes_already_parsed = $closer_at + 3;
+							return true;
+						}
+
+						if (
+							$closer_at + 3 < $doc_length &&
+							'!' === $html[ $closer_at + 2 ] &&
+							'>' === $html[ $closer_at + 3 ]
+						) {
+							$this->parser_state         = self::STATE_COMMENT;
+							$this->comment_type         = self::COMMENT_AS_HTML_COMMENT;
+							$this->token_length         = $closer_at + 4 - $this->token_starts_at;
+							$this->text_starts_at       = $this->token_starts_at + 4;
+							$this->text_length          = $closer_at - $this->text_starts_at;
+							$this->bytes_already_parsed = $closer_at + 4;
+							return true;
+						}
+					}
+				}
+
+				/*
+				 * `<!DOCTYPE` transitions to DOCTYPE state – skip to the nearest >
+				 * These are ASCII-case-insensitive.
+				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+				 */
+				if (
+					$doc_length > $at + 8 &&
+					( 'D' === $html[ $at + 2 ] || 'd' === $html[ $at + 2 ] ) &&
+					( 'O' === $html[ $at + 3 ] || 'o' === $html[ $at + 3 ] ) &&
+					( 'C' === $html[ $at + 4 ] || 'c' === $html[ $at + 4 ] ) &&
+					( 'T' === $html[ $at + 5 ] || 't' === $html[ $at + 5 ] ) &&
+					( 'Y' === $html[ $at + 6 ] || 'y' === $html[ $at + 6 ] ) &&
+					( 'P' === $html[ $at + 7 ] || 'p' === $html[ $at + 7 ] ) &&
+					( 'E' === $html[ $at + 8 ] || 'e' === $html[ $at + 8 ] )
+				) {
+					$closer_at = strpos( $html, '>', $at + 9 );
+					if ( false === $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+						return false;
+					}
+
+					$this->parser_state         = self::STATE_DOCTYPE;
+					$this->token_length         = $closer_at + 1 - $this->token_starts_at;
+					$this->text_starts_at       = $this->token_starts_at + 9;
+					$this->text_length          = $closer_at - $this->text_starts_at;
+					$this->bytes_already_parsed = $closer_at + 1;
+					return true;
+				}
+
+				/*
+				 * Anything else here is an incorrectly-opened comment and transitions
+				 * to the bogus comment state - skip to the nearest >. If no closer is
+				 * found then the HTML was truncated inside the markup declaration.
+				 */
+				$closer_at = strpos( $html, '>', $at + 1 );
+				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+					return false;
+				}
+
+				$this->parser_state         = self::STATE_COMMENT;
+				$this->comment_type         = self::COMMENT_AS_INVALID_HTML;
+				$this->token_length         = $closer_at + 1 - $this->token_starts_at;
+				$this->text_starts_at       = $this->token_starts_at + 2;
+				$this->text_length          = $closer_at - $this->text_starts_at;
+				$this->bytes_already_parsed = $closer_at + 1;
+
+				/*
+				 * Identify nodes that would be CDATA if HTML had CDATA sections.
+				 *
+				 * This section must occur after identifying the bogus comment end
+				 * because in an HTML parser it will span to the nearest `>`, even
+				 * if there's no `]]>` as would be required in an XML document. It
+				 * is therefore not possible to parse a CDATA section containing
+				 * a `>` in the HTML syntax.
+				 *
+				 * Inside foreign elements there is a discrepancy between browsers
+				 * and the specification on this.
+				 *
+				 * @todo Track whether the Tag Processor is inside a foreign element
+				 *       and require the proper closing `]]>` in those cases.
+				 */
+				if (
+					$this->token_length >= 10 &&
+					'[' === $html[ $this->token_starts_at + 2 ] &&
+					'C' === $html[ $this->token_starts_at + 3 ] &&
+					'D' === $html[ $this->token_starts_at + 4 ] &&
+					'A' === $html[ $this->token_starts_at + 5 ] &&
+					'T' === $html[ $this->token_starts_at + 6 ] &&
+					'A' === $html[ $this->token_starts_at + 7 ] &&
+					'[' === $html[ $this->token_starts_at + 8 ] &&
+					']' === $html[ $closer_at - 1 ] &&
+					']' === $html[ $closer_at - 2 ]
+				) {
+					$this->parser_state    = self::STATE_COMMENT;
+					$this->comment_type    = self::COMMENT_AS_CDATA_LOOKALIKE;
+					$this->text_starts_at += 7;
+					$this->text_length    -= 9;
+				}
+
+				return true;
+			}
+
+			/*
+			 * </> is a missing end tag name, which is ignored.
+			 *
+			 * This was also known as the "presumptuous empty tag"
+			 * in early discussions as it was proposed to close
+			 * the nearest previous opening tag.
+			 *
+			 * See https://html.spec.whatwg.org/#parse-error-missing-end-tag-name
+			 */
+			if ( '>' === $html[ $at + 1 ] ) {
+				// `<>` is interpreted as plaintext.
+				if ( ! $this->is_closing_tag ) {
+					++$at;
+					continue;
+				}
+
+				$this->parser_state         = self::STATE_PRESUMPTUOUS_TAG;
+				$this->token_length         = $at + 2 - $this->token_starts_at;
+				$this->bytes_already_parsed = $at + 2;
+				return true;
+			}
+
+			/*
+			 * `<?` transitions to a bogus comment state – skip to the nearest >
+			 * See https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+			 */
+			if ( ! $this->is_closing_tag && '?' === $html[ $at + 1 ] ) {
+				$closer_at = strpos( $html, '>', $at + 2 );
+				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+					return false;
+				}
+
+				$this->parser_state         = self::STATE_COMMENT;
+				$this->comment_type         = self::COMMENT_AS_INVALID_HTML;
+				$this->token_length         = $closer_at + 1 - $this->token_starts_at;
+				$this->text_starts_at       = $this->token_starts_at + 2;
+				$this->text_length          = $closer_at - $this->text_starts_at;
+				$this->bytes_already_parsed = $closer_at + 1;
+
+				/*
+				 * Identify a Processing Instruction node were HTML to have them.
+				 *
+				 * This section must occur after identifying the bogus comment end
+				 * because in an HTML parser it will span to the nearest `>`, even
+				 * if there's no `?>` as would be required in an XML document. It
+				 * is therefore not possible to parse a Processing Instruction node
+				 * containing a `>` in the HTML syntax.
+				 *
+				 * XML allows for more target names, but this code only identifies
+				 * those with ASCII-representable target names. This means that it
+				 * may identify some Processing Instruction nodes as bogus comments,
+				 * but it will not misinterpret the HTML structure. By limiting the
+				 * identification to these target names the Tag Processor can avoid
+				 * the need to start parsing UTF-8 sequences.
+				 *
+				 * > NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] |
+				 *                     [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] |
+				 *                     [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] |
+				 *                     [#x10000-#xEFFFF]
+				 * > NameChar      ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
+				 *
+				 * @see https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-PITarget
+				 */
+				if ( $this->token_length >= 5 && '?' === $html[ $closer_at - 1 ] ) {
+					$comment_text     = substr( $html, $this->token_starts_at + 2, $this->token_length - 4 );
+					$pi_target_length = strspn( $comment_text, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ:_' );
+
+					if ( 0 < $pi_target_length ) {
+						$pi_target_length += strspn( $comment_text, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:_-.', $pi_target_length );
+
+						$this->comment_type       = self::COMMENT_AS_PI_NODE_LOOKALIKE;
+						$this->tag_name_starts_at = $this->token_starts_at + 2;
+						$this->tag_name_length    = $pi_target_length;
+						$this->text_starts_at    += $pi_target_length;
+						$this->text_length       -= $pi_target_length + 1;
+					}
+				}
+
+				return true;
+			}
+
+			/*
+			 * If a non-alpha starts the tag name in a tag closer it's a comment.
+			 * Find the first `>`, which closes the comment.
+			 *
+			 * This parser classifies these particular comments as special "funky comments"
+			 * which are made available for further processing.
+			 *
+			 * See https://html.spec.whatwg.org/#parse-error-invalid-first-character-of-tag-name
+			 */
+			if ( $this->is_closing_tag ) {
+				// No chance of finding a closer.
+				if ( $at + 3 > $doc_length ) {
+					return false;
+				}
+
+				$closer_at = strpos( $html, '>', $at + 2 );
+				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+					return false;
+				}
+
+				$this->parser_state         = self::STATE_FUNKY_COMMENT;
+				$this->token_length         = $closer_at + 1 - $this->token_starts_at;
+				$this->text_starts_at       = $this->token_starts_at + 2;
+				$this->text_length          = $closer_at - $this->text_starts_at;
+				$this->bytes_already_parsed = $closer_at + 1;
+				return true;
+			}
+
+			++$at;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parses the next attribute.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether an attribute was found before the end of the document.
+	 */
+	private function parse_next_attribute() {
+		// Skip whitespace and slashes.
+		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n/", $this->bytes_already_parsed );
+		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+			return false;
+		}
+
+		/*
+		 * Treat the equal sign as a part of the attribute
+		 * name if it is the first encountered byte.
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/parsing.html#before-attribute-name-state
+		 */
+		$name_length = '=' === $this->html[ $this->bytes_already_parsed ]
+			? 1 + strcspn( $this->html, "=/> \t\f\r\n", $this->bytes_already_parsed + 1 )
+			: strcspn( $this->html, "=/> \t\f\r\n", $this->bytes_already_parsed );
+
+		// No attribute, just tag closer.
+		if ( 0 === $name_length || $this->bytes_already_parsed + $name_length >= strlen( $this->html ) ) {
+			return false;
+		}
+
+		$attribute_start             = $this->bytes_already_parsed;
+		$attribute_name              = substr( $this->html, $attribute_start, $name_length );
+		$this->bytes_already_parsed += $name_length;
+		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+			return false;
+		}
+
+		$this->skip_whitespace();
+		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+			return false;
+		}
+
+		$has_value = '=' === $this->html[ $this->bytes_already_parsed ];
+		if ( $has_value ) {
+			++$this->bytes_already_parsed;
+			$this->skip_whitespace();
+			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+				$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+				return false;
+			}
+
+			switch ( $this->html[ $this->bytes_already_parsed ] ) {
+				case "'":
+				case '"':
+					$quote                      = $this->html[ $this->bytes_already_parsed ];
+					$value_start                = $this->bytes_already_parsed + 1;
+					$value_length               = strcspn( $this->html, $quote, $value_start );
+					$attribute_end              = $value_start + $value_length + 1;
+					$this->bytes_already_parsed = $attribute_end;
+					break;
+
+				default:
+					$value_start                = $this->bytes_already_parsed;
+					$value_length               = strcspn( $this->html, "> \t\f\r\n", $value_start );
+					$attribute_end              = $value_start + $value_length;
+					$this->bytes_already_parsed = $attribute_end;
+			}
+		} else {
+			$value_start   = $this->bytes_already_parsed;
+			$value_length  = 0;
+			$attribute_end = $attribute_start + $name_length;
+		}
+
+		if ( $attribute_end >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+			return false;
+		}
+
+		if ( $this->is_closing_tag ) {
+			return true;
+		}
+
+		/*
+		 * > There must never be two or more attributes on
+		 * > the same start tag whose names are an ASCII
+		 * > case-insensitive match for each other.
+		 *     - HTML 5 spec
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+		 */
+		$comparable_name = strtolower( $attribute_name );
+
+		// If an attribute is listed many times, only use the first declaration and ignore the rest.
+		if ( ! array_key_exists( $comparable_name, $this->attributes ) ) {
+			$this->attributes[ $comparable_name ] = new WP_HTML_Attribute_Token(
+				$attribute_name,
+				$value_start,
+				$value_length,
+				$attribute_start,
+				$attribute_end - $attribute_start,
+				! $has_value
+			);
+
+			return true;
+		}
+
+		/*
+		 * Track the duplicate attributes so if we remove it, all disappear together.
+		 *
+		 * While `$this->duplicated_attributes` could always be stored as an `array()`,
+		 * which would simplify the logic here, storing a `null` and only allocating
+		 * an array when encountering duplicates avoids needless allocations in the
+		 * normative case of parsing tags with no duplicate attributes.
+		 */
+		$duplicate_span = new WP_HTML_Span( $attribute_start, $attribute_end - $attribute_start );
+		if ( null === $this->duplicate_attributes ) {
+			$this->duplicate_attributes = array( $comparable_name => array( $duplicate_span ) );
+		} elseif ( ! array_key_exists( $comparable_name, $this->duplicate_attributes ) ) {
+			$this->duplicate_attributes[ $comparable_name ] = array( $duplicate_span );
+		} else {
+			$this->duplicate_attributes[ $comparable_name ][] = $duplicate_span;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Move the internal cursor past any immediate successive whitespace.
+	 *
+	 * @since 6.2.0
+	 */
+	private function skip_whitespace() {
+		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n", $this->bytes_already_parsed );
+	}
+
+	/**
+	 * Applies attribute updates and cleans up once a tag is fully parsed.
+	 *
+	 * @since 6.2.0
+	 */
+	private function after_tag() {
+		/*
+		 * There could be lexical updates enqueued for an attribute that
+		 * also exists on the next tag. In order to avoid conflating the
+		 * attributes across the two tags, lexical updates with names
+		 * need to be flushed to raw lexical updates.
+		 */
+		$this->class_name_updates_to_attributes_updates();
+
+		/*
+		 * Purge updates if there are too many. The actual count isn't
+		 * scientific, but a few values from 100 to a few thousand were
+		 * tests to find a practically-useful limit.
+		 *
+		 * If the update queue grows too big, then the Tag Processor
+		 * will spend more time iterating through them and lose the
+		 * efficiency gains of deferring applying them.
+		 */
+		if ( 1000 < count( $this->lexical_updates ) ) {
+			$this->get_updated_html();
+		}
+
+		foreach ( $this->lexical_updates as $name => $update ) {
+			/*
+			 * Any updates appearing after the cursor should be applied
+			 * before proceeding, otherwise they may be overlooked.
+			 */
+			if ( $update->start >= $this->bytes_already_parsed ) {
+				$this->get_updated_html();
+				break;
+			}
+
+			if ( is_int( $name ) ) {
+				continue;
+			}
+
+			$this->lexical_updates[] = $update;
+			unset( $this->lexical_updates[ $name ] );
+		}
+
+		$this->token_starts_at      = null;
+		$this->token_length         = null;
+		$this->tag_name_starts_at   = null;
+		$this->tag_name_length      = null;
+		$this->text_starts_at       = 0;
+		$this->text_length          = 0;
+		$this->is_closing_tag       = null;
+		$this->attributes           = array();
+		$this->comment_type         = null;
+		$this->duplicate_attributes = null;
+	}
+
+	/**
+	 * Converts class name updates into tag attributes updates
+	 * (they are accumulated in different data formats for performance).
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see WP_HTML_Tag_Processor::$lexical_updates
+	 * @see WP_HTML_Tag_Processor::$classname_updates
+	 */
+	private function class_name_updates_to_attributes_updates() {
+		if ( count( $this->classname_updates ) === 0 ) {
+			return;
+		}
+
+		$existing_class = $this->get_enqueued_attribute_value( 'class' );
+		if ( null === $existing_class || true === $existing_class ) {
+			$existing_class = '';
+		}
+
+		if ( false === $existing_class && isset( $this->attributes['class'] ) ) {
+			$existing_class = substr(
+				$this->html,
+				$this->attributes['class']->value_starts_at,
+				$this->attributes['class']->value_length
+			);
+		}
+
+		if ( false === $existing_class ) {
+			$existing_class = '';
+		}
+
+		/**
+		 * Updated "class" attribute value.
+		 *
+		 * This is incrementally built while scanning through the existing class
+		 * attribute, skipping removed classes on the way, and then appending
+		 * added classes at the end. Only when finished processing will the
+		 * value contain the final new value.
+
+		 * @var string $class
+		 */
+		$class = '';
+
+		/**
+		 * Tracks the cursor position in the existing
+		 * class attribute value while parsing.
+		 *
+		 * @var int $at
+		 */
+		$at = 0;
+
+		/**
+		 * Indicates if there's any need to modify the existing class attribute.
+		 *
+		 * If a call to `add_class()` and `remove_class()` wouldn't impact
+		 * the `class` attribute value then there's no need to rebuild it.
+		 * For example, when adding a class that's already present or
+		 * removing one that isn't.
+		 *
+		 * This flag enables a performance optimization when none of the enqueued
+		 * class updates would impact the `class` attribute; namely, that the
+		 * processor can continue without modifying the input document, as if
+		 * none of the `add_class()` or `remove_class()` calls had been made.
+		 *
+		 * This flag is set upon the first change that requires a string update.
+		 *
+		 * @var bool $modified
+		 */
+		$modified = false;
+
+		// Remove unwanted classes by only copying the new ones.
+		$existing_class_length = strlen( $existing_class );
+		while ( $at < $existing_class_length ) {
+			// Skip to the first non-whitespace character.
+			$ws_at     = $at;
+			$ws_length = strspn( $existing_class, " \t\f\r\n", $ws_at );
+			$at       += $ws_length;
+
+			// Capture the class name – it's everything until the next whitespace.
+			$name_length = strcspn( $existing_class, " \t\f\r\n", $at );
+			if ( 0 === $name_length ) {
+				// If no more class names are found then that's the end.
+				break;
+			}
+
+			$name = substr( $existing_class, $at, $name_length );
+			$at  += $name_length;
+
+			// If this class is marked for removal, start processing the next one.
+			$remove_class = (
+				isset( $this->classname_updates[ $name ] ) &&
+				self::REMOVE_CLASS === $this->classname_updates[ $name ]
+			);
+
+			// If a class has already been seen then skip it; it should not be added twice.
+			if ( ! $remove_class ) {
+				$this->classname_updates[ $name ] = self::SKIP_CLASS;
+			}
+
+			if ( $remove_class ) {
+				$modified = true;
+				continue;
+			}
+
+			/*
+			 * Otherwise, append it to the new "class" attribute value.
+			 *
+			 * There are options for handling whitespace between tags.
+			 * Preserving the existing whitespace produces fewer changes
+			 * to the HTML content and should clarify the before/after
+			 * content when debugging the modified output.
+			 *
+			 * This approach contrasts normalizing the inter-class
+			 * whitespace to a single space, which might appear cleaner
+			 * in the output HTML but produce a noisier change.
+			 */
+			$class .= substr( $existing_class, $ws_at, $ws_length );
+			$class .= $name;
+		}
+
+		// Add new classes by appending those which haven't already been seen.
+		foreach ( $this->classname_updates as $name => $operation ) {
+			if ( self::ADD_CLASS === $operation ) {
+				$modified = true;
+
+				$class .= strlen( $class ) > 0 ? ' ' : '';
+				$class .= $name;
+			}
+		}
+
+		$this->classname_updates = array();
+		if ( ! $modified ) {
+			return;
+		}
+
+		if ( strlen( $class ) > 0 ) {
+			$this->set_attribute( 'class', $class );
+		} else {
+			$this->remove_attribute( 'class' );
+		}
+	}
+
+	/**
+	 * Applies attribute updates to HTML document.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Accumulates shift for internal cursor and passed pointer.
+	 * @since 6.3.0 Invalidate any bookmarks whose targets are overwritten.
+	 *
+	 * @param int $shift_this_point Accumulate and return shift for this position.
+	 * @return int How many bytes the given pointer moved in response to the updates.
+	 */
+	private function apply_attributes_updates( $shift_this_point ) {
+		if ( ! count( $this->lexical_updates ) ) {
+			return 0;
+		}
+
+		$accumulated_shift_for_given_point = 0;
+
+		/*
+		 * Attribute updates can be enqueued in any order but updates
+		 * to the document must occur in lexical order; that is, each
+		 * replacement must be made before all others which follow it
+		 * at later string indices in the input document.
+		 *
+		 * Sorting avoid making out-of-order replacements which
+		 * can lead to mangled output, partially-duplicated
+		 * attributes, and overwritten attributes.
+		 */
+		usort( $this->lexical_updates, array( self::class, 'sort_start_ascending' ) );
+
+		$bytes_already_copied = 0;
+		$output_buffer        = '';
+		foreach ( $this->lexical_updates as $diff ) {
+			$shift = strlen( $diff->text ) - $diff->length;
+
+			// Adjust the cursor position by however much an update affects it.
+			if ( $diff->start < $this->bytes_already_parsed ) {
+				$this->bytes_already_parsed += $shift;
+			}
+
+			// Accumulate shift of the given pointer within this function call.
+			if ( $diff->start <= $shift_this_point ) {
+				$accumulated_shift_for_given_point += $shift;
+			}
+
+			$output_buffer       .= substr( $this->html, $bytes_already_copied, $diff->start - $bytes_already_copied );
+			$output_buffer       .= $diff->text;
+			$bytes_already_copied = $diff->start + $diff->length;
+		}
+
+		$this->html = $output_buffer . substr( $this->html, $bytes_already_copied );
+
+		/*
+		 * Adjust bookmark locations to account for how the text
+		 * replacements adjust offsets in the input document.
+		 */
+		foreach ( $this->bookmarks as $bookmark_name => $bookmark ) {
+			$bookmark_end = $bookmark->start + $bookmark->length;
+
+			/*
+			 * Each lexical update which appears before the bookmark's endpoints
+			 * might shift the offsets for those endpoints. Loop through each change
+			 * and accumulate the total shift for each bookmark, then apply that
+			 * shift after tallying the full delta.
+			 */
+			$head_delta = 0;
+			$tail_delta = 0;
+
+			foreach ( $this->lexical_updates as $diff ) {
+				$diff_end = $diff->start + $diff->length;
+
+				if ( $bookmark->start < $diff->start && $bookmark_end < $diff->start ) {
+					break;
+				}
+
+				if ( $bookmark->start >= $diff->start && $bookmark_end < $diff_end ) {
+					$this->release_bookmark( $bookmark_name );
+					continue 2;
+				}
+
+				$delta = strlen( $diff->text ) - $diff->length;
+
+				if ( $bookmark->start >= $diff->start ) {
+					$head_delta += $delta;
+				}
+
+				if ( $bookmark_end >= $diff_end ) {
+					$tail_delta += $delta;
+				}
+			}
+
+			$bookmark->start  += $head_delta;
+			$bookmark->length += $tail_delta - $head_delta;
+		}
+
+		$this->lexical_updates = array();
+
+		return $accumulated_shift_for_given_point;
+	}
+
+	/**
+	 * Checks whether a bookmark with the given name exists.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $bookmark_name Name to identify a bookmark that potentially exists.
+	 * @return bool Whether that bookmark exists.
+	 */
+	public function has_bookmark( $bookmark_name ) {
+		return array_key_exists( $bookmark_name, $this->bookmarks );
+	}
+
+	/**
+	 * Move the internal cursor in the Tag Processor to a given bookmark's location.
+	 *
+	 * In order to prevent accidental infinite loops, there's a
+	 * maximum limit on the number of times seek() can be called.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $bookmark_name Jump to the place in the document identified by this bookmark name.
+	 * @return bool Whether the internal cursor was successfully moved to the bookmark's location.
+	 */
+	public function seek( $bookmark_name ) {
+		if ( ! array_key_exists( $bookmark_name, $this->bookmarks ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Unknown bookmark name.' ),
+				'6.2.0'
+			);
+			return false;
+		}
+
+		if ( ++$this->seek_count > static::MAX_SEEK_OPS ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Too many calls to seek() - this can lead to performance issues.' ),
+				'6.2.0'
+			);
+			return false;
+		}
+
+		// Flush out any pending updates to the document.
+		$this->get_updated_html();
+
+		// Point this tag processor before the sought tag opener and consume it.
+		$this->bytes_already_parsed = $this->bookmarks[ $bookmark_name ]->start;
+		$this->parser_state         = self::STATE_READY;
+		return $this->next_token();
+	}
+
+	/**
+	 * Compare two WP_HTML_Text_Replacement objects.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param WP_HTML_Text_Replacement $a First attribute update.
+	 * @param WP_HTML_Text_Replacement $b Second attribute update.
+	 * @return int Comparison value for string order.
+	 */
+	private static function sort_start_ascending( $a, $b ) {
+		$by_start = $a->start - $b->start;
+		if ( 0 !== $by_start ) {
+			return $by_start;
+		}
+
+		$by_text = isset( $a->text, $b->text ) ? strcmp( $a->text, $b->text ) : 0;
+		if ( 0 !== $by_text ) {
+			return $by_text;
+		}
+
+		/*
+		 * This code should be unreachable, because it implies the two replacements
+		 * start at the same location and contain the same text.
+		 */
+		return $a->length - $b->length;
+	}
+
+	/**
+	 * Return the enqueued value for a given attribute, if one exists.
+	 *
+	 * Enqueued updates can take different data types:
+	 *  - If an update is enqueued and is boolean, the return will be `true`
+	 *  - If an update is otherwise enqueued, the return will be the string value of that update.
+	 *  - If an attribute is enqueued to be removed, the return will be `null` to indicate that.
+	 *  - If no updates are enqueued, the return will be `false` to differentiate from "removed."
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $comparable_name The attribute name in its comparable form.
+	 * @return string|boolean|null Value of enqueued update if present, otherwise false.
+	 */
+	private function get_enqueued_attribute_value( $comparable_name ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return false;
+		}
+
+		if ( ! isset( $this->lexical_updates[ $comparable_name ] ) ) {
+			return false;
+		}
+
+		$enqueued_text = $this->lexical_updates[ $comparable_name ]->text;
+
+		// Removed attributes erase the entire span.
+		if ( '' === $enqueued_text ) {
+			return null;
+		}
+
+		/*
+		 * Boolean attribute updates are just the attribute name without a corresponding value.
+		 *
+		 * This value might differ from the given comparable name in that there could be leading
+		 * or trailing whitespace, and that the casing follows the name given in `set_attribute`.
+		 *
+		 * Example:
+		 *
+		 *     $p->set_attribute( 'data-TEST-id', 'update' );
+		 *     'update' === $p->get_enqueued_attribute_value( 'data-test-id' );
+		 *
+		 * Detect this difference based on the absence of the `=`, which _must_ exist in any
+		 * attribute containing a value, e.g. `<input type="text" enabled />`.
+		 *                                            ¹           ²
+		 *                                       1. Attribute with a string value.
+		 *                                       2. Boolean attribute whose value is `true`.
+		 */
+		$equals_at = strpos( $enqueued_text, '=' );
+		if ( false === $equals_at ) {
+			return true;
+		}
+
+		/*
+		 * Finally, a normal update's value will appear after the `=` and
+		 * be double-quoted, as performed incidentally by `set_attribute`.
+		 *
+		 * e.g. `type="text"`
+		 *           ¹²    ³
+		 *        1. Equals is here.
+		 *        2. Double-quoting starts one after the equals sign.
+		 *        3. Double-quoting ends at the last character in the update.
+		 */
+		$enqueued_value = substr( $enqueued_text, $equals_at + 2, -1 );
+		return Gutenberg_HTML_Decoder_6_6::decode_attribute( $enqueued_value );
+	}
+
+	/**
+	 * Returns the value of a requested attribute from a matched tag opener if that attribute exists.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div enabled class="test" data-test-id="14">Test</div>' );
+	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
+	 *     $p->get_attribute( 'data-test-id' ) === '14';
+	 *     $p->get_attribute( 'enabled' ) === true;
+	 *     $p->get_attribute( 'aria-label' ) === null;
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute( 'class' ) === null;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name Name of attribute whose value is requested.
+	 * @return string|true|null Value of attribute or `null` if not available. Boolean attributes return `true`.
+	 */
+	public function get_attribute( $name ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return null;
+		}
+
+		$comparable = strtolower( $name );
+
+		/*
+		 * For every attribute other than `class` it's possible to perform a quick check if
+		 * there's an enqueued lexical update whose value takes priority over what's found in
+		 * the input document.
+		 *
+		 * The `class` attribute is special though because of the exposed helpers `add_class`
+		 * and `remove_class`. These form a builder for the `class` attribute, so an additional
+		 * check for enqueued class changes is required in addition to the check for any enqueued
+		 * attribute values. If any exist, those enqueued class changes must first be flushed out
+		 * into an attribute value update.
+		 */
+		if ( 'class' === $name ) {
+			$this->class_name_updates_to_attributes_updates();
+		}
+
+		// Return any enqueued attribute value updates if they exist.
+		$enqueued_value = $this->get_enqueued_attribute_value( $comparable );
+		if ( false !== $enqueued_value ) {
+			return $enqueued_value;
+		}
+
+		if ( ! isset( $this->attributes[ $comparable ] ) ) {
+			return null;
+		}
+
+		$attribute = $this->attributes[ $comparable ];
+
+		/*
+		 * This flag distinguishes an attribute with no value
+		 * from an attribute with an empty string value. For
+		 * unquoted attributes this could look very similar.
+		 * It refers to whether an `=` follows the name.
+		 *
+		 * e.g. <div boolean-attribute empty-attribute=></div>
+		 *           ¹                 ²
+		 *        1. Attribute `boolean-attribute` is `true`.
+		 *        2. Attribute `empty-attribute` is `""`.
+		 */
+		if ( true === $attribute->is_true ) {
+			return true;
+		}
+
+		$raw_value = substr( $this->html, $attribute->value_starts_at, $attribute->value_length );
+
+		return Gutenberg_HTML_Decoder_6_6::decode_attribute( $raw_value );
+	}
+
+	/**
+	 * Gets lowercase names of all attributes matching a given prefix in the current tag.
+	 *
+	 * Note that matching is case-insensitive. This is in accordance with the spec:
+	 *
+	 * > There must never be two or more attributes on
+	 * > the same start tag whose names are an ASCII
+	 * > case-insensitive match for each other.
+	 *     - HTML 5 spec
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div data-ENABLED class="test" DATA-test-id="14">Test</div>' );
+	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === array( 'data-enabled', 'data-test-id' );
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === null;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+	 *
+	 * @param string $prefix Prefix of requested attribute names.
+	 * @return array|null List of attribute names, or `null` when no tag opener is matched.
+	 */
+	public function get_attribute_names_with_prefix( $prefix ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return null;
+		}
+
+		$comparable = strtolower( $prefix );
+
+		$matches = array();
+		foreach ( array_keys( $this->attributes ) as $attr_name ) {
+			if ( str_starts_with( $attr_name, $comparable ) ) {
+				$matches[] = $attr_name;
+			}
+		}
+		return $matches;
+	}
+
+	/**
+	 * Returns the uppercase name of the matched tag.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+	 *     $p->next_tag() === true;
+	 *     $p->get_tag() === 'DIV';
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_tag() === null;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
+	 */
+	public function get_tag() {
+		if ( null === $this->tag_name_starts_at ) {
+			return null;
+		}
+
+		$tag_name = substr( $this->html, $this->tag_name_starts_at, $this->tag_name_length );
+
+		if ( self::STATE_MATCHED_TAG === $this->parser_state ) {
+			return strtoupper( $tag_name );
+		}
+
+		if (
+			self::STATE_COMMENT === $this->parser_state &&
+			self::COMMENT_AS_PI_NODE_LOOKALIKE === $this->get_comment_type()
+		) {
+			return $tag_name;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Indicates if the currently matched tag contains the self-closing flag.
+	 *
+	 * No HTML elements ought to have the self-closing flag and for those, the self-closing
+	 * flag will be ignored. For void elements this is benign because they "self close"
+	 * automatically. For non-void HTML elements though problems will appear if someone
+	 * intends to use a self-closing element in place of that element with an empty body.
+	 * For HTML foreign elements and custom elements the self-closing flag determines if
+	 * they self-close or not.
+	 *
+	 * This function does not determine if a tag is self-closing,
+	 * but only if the self-closing flag is present in the syntax.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return bool Whether the currently matched tag contains the self-closing flag.
+	 */
+	public function has_self_closing_flag() {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return false;
+		}
+
+		/*
+		 * The self-closing flag is the solidus at the _end_ of the tag, not the beginning.
+		 *
+		 * Example:
+		 *
+		 *     <figure />
+		 *             ^ this appears one character before the end of the closing ">".
+		 */
+		return '/' === $this->html[ $this->token_starts_at + $this->token_length - 2 ];
+	}
+
+	/**
+	 * Indicates if the current tag token is a tag closer.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div></div>' );
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === false;
+	 *
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === true;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether the current tag is a tag closer.
+	 */
+	public function is_tag_closer() {
+		return (
+			self::STATE_MATCHED_TAG === $this->parser_state &&
+			$this->is_closing_tag
+		);
+	}
+
+	/**
+	 * Indicates the kind of matched token, if any.
+	 *
+	 * This differs from `get_token_name()` in that it always
+	 * returns a static string indicating the type, whereas
+	 * `get_token_name()` may return values derived from the
+	 * token itself, such as a tag name or processing
+	 * instruction tag.
+	 *
+	 * Possible values:
+	 *  - `#tag` when matched on a tag.
+	 *  - `#text` when matched on a text node.
+	 *  - `#cdata-section` when matched on a CDATA node.
+	 *  - `#comment` when matched on a comment.
+	 *  - `#doctype` when matched on a DOCTYPE declaration.
+	 *  - `#presumptuous-tag` when matched on an empty tag closer.
+	 *  - `#funky-comment` when matched on a funky comment.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return string|null What kind of token is matched, or null.
+	 */
+	public function get_token_type() {
+		switch ( $this->parser_state ) {
+			case self::STATE_MATCHED_TAG:
+				return '#tag';
+
+			case self::STATE_DOCTYPE:
+				return '#doctype';
+
+			default:
+				return $this->get_token_name();
+		}
+	}
+
+	/**
+	 * Returns the node name represented by the token.
+	 *
+	 * This matches the DOM API value `nodeName`. Some values
+	 * are static, such as `#text` for a text node, while others
+	 * are dynamically generated from the token itself.
+	 *
+	 * Dynamic names:
+	 *  - Uppercase tag name for tag matches.
+	 *  - `html` for DOCTYPE declarations.
+	 *
+	 * Note that if the Tag Processor is not matched on a token
+	 * then this function will return `null`, either because it
+	 * hasn't yet found a token or because it reached the end
+	 * of the document without matching a token.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return string|null Name of the matched token.
+	 */
+	public function get_token_name() {
+		switch ( $this->parser_state ) {
+			case self::STATE_MATCHED_TAG:
+				return $this->get_tag();
+
+			case self::STATE_TEXT_NODE:
+				return '#text';
+
+			case self::STATE_CDATA_NODE:
+				return '#cdata-section';
+
+			case self::STATE_COMMENT:
+				return '#comment';
+
+			case self::STATE_DOCTYPE:
+				return 'html';
+
+			case self::STATE_PRESUMPTUOUS_TAG:
+				return '#presumptuous-tag';
+
+			case self::STATE_FUNKY_COMMENT:
+				return '#funky-comment';
+		}
+
+		return null;
+	}
+
+	/**
+	 * Indicates what kind of comment produced the comment node.
+	 *
+	 * Because there are different kinds of HTML syntax which produce
+	 * comments, the Tag Processor tracks and exposes this as a type
+	 * for the comment. Nominally only regular HTML comments exist as
+	 * they are commonly known, but a number of unrelated syntax errors
+	 * also produce comments.
+	 *
+	 * @see self::COMMENT_AS_ABRUPTLY_CLOSED_COMMENT
+	 * @see self::COMMENT_AS_CDATA_LOOKALIKE
+	 * @see self::COMMENT_AS_INVALID_HTML
+	 * @see self::COMMENT_AS_HTML_COMMENT
+	 * @see self::COMMENT_AS_PI_NODE_LOOKALIKE
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return string|null
+	 */
+	public function get_comment_type() {
+		if ( self::STATE_COMMENT !== $this->parser_state ) {
+			return null;
+		}
+
+		return $this->comment_type;
+	}
+
+	/**
+	 * Returns the modifiable text for a matched token, or an empty string.
+	 *
+	 * Modifiable text is text content that may be read and changed without
+	 * changing the HTML structure of the document around it. This includes
+	 * the contents of `#text` nodes in the HTML as well as the inner
+	 * contents of HTML comments, Processing Instructions, and others, even
+	 * though these nodes aren't part of a parsed DOM tree. They also contain
+	 * the contents of SCRIPT and STYLE tags, of TEXTAREA tags, and of any
+	 * other section in an HTML document which cannot contain HTML markup (DATA).
+	 *
+	 * If a token has no modifiable text then an empty string is returned to
+	 * avoid needless crashing or type errors. An empty string does not mean
+	 * that a token has modifiable text, and a token with modifiable text may
+	 * have an empty string (e.g. a comment with no contents).
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return string
+	 */
+	public function get_modifiable_text() {
+		if ( null === $this->text_starts_at ) {
+			return '';
+		}
+
+		$text = substr( $this->html, $this->text_starts_at, $this->text_length );
+
+		// Comment data is not decoded.
+		if (
+			self::STATE_CDATA_NODE === $this->parser_state ||
+			self::STATE_COMMENT === $this->parser_state ||
+			self::STATE_DOCTYPE === $this->parser_state ||
+			self::STATE_FUNKY_COMMENT === $this->parser_state
+		) {
+			return $text;
+		}
+
+		$tag_name = $this->get_tag();
+		if (
+			// Script data is not decoded.
+			'SCRIPT' === $tag_name ||
+
+			// RAWTEXT data is not decoded.
+			'IFRAME' === $tag_name ||
+			'NOEMBED' === $tag_name ||
+			'NOFRAMES' === $tag_name ||
+			'STYLE' === $tag_name ||
+			'XMP' === $tag_name
+		) {
+			return $text;
+		}
+
+		$decoded = Gutenberg_HTML_Decoder_6_6::decode_text_node( $text );
+
+		/*
+		 * TEXTAREA skips a leading newline, but this newline may appear not only as the
+		 * literal character `\n`, but also as a character reference, such as in the
+		 * following markup: `<textarea>&#x0a;Content</textarea>`.
+		 *
+		 * For these cases it's important to first decode the text content before checking
+		 * for a leading newline and removing it.
+		 */
+		if (
+			self::STATE_MATCHED_TAG === $this->parser_state &&
+			'TEXTAREA' === $tag_name &&
+			strlen( $decoded ) > 0 &&
+			"\n" === $decoded[0]
+		) {
+			return substr( $decoded, 1 );
+		}
+
+		return $decoded;
+	}
+
+	/**
+	 * Updates or creates a new attribute on the currently matched tag with the passed value.
+	 *
+	 * For boolean attributes special handling is provided:
+	 *  - When `true` is passed as the value, then only the attribute name is added to the tag.
+	 *  - When `false` is passed, the attribute gets removed if it existed before.
+	 *
+	 * For string attributes, the value is escaped using the `esc_attr` function.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Fix: Only create a single update for multiple calls with case-variant attribute names.
+	 *
+	 * @param string      $name  The attribute name to target.
+	 * @param string|bool $value The new attribute value.
+	 * @return bool Whether an attribute value was set.
+	 */
+	public function set_attribute( $name, $value ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return false;
+		}
+
+		/*
+		 * WordPress rejects more characters than are strictly forbidden
+		 * in HTML5. This is to prevent additional security risks deeper
+		 * in the WordPress and plugin stack. Specifically the
+		 * less-than (<) greater-than (>) and ampersand (&) aren't allowed.
+		 *
+		 * The use of a PCRE match enables looking for specific Unicode
+		 * code points without writing a UTF-8 decoder. Whereas scanning
+		 * for one-byte characters is trivial (with `strcspn`), scanning
+		 * for the longer byte sequences would be more complicated. Given
+		 * that this shouldn't be in the hot path for execution, it's a
+		 * reasonable compromise in efficiency without introducing a
+		 * noticeable impact on the overall system.
+		 *
+		 * @see https://html.spec.whatwg.org/#attributes-2
+		 *
+		 * @todo As the only regex pattern maybe we should take it out?
+		 *       Are Unicode patterns available broadly in Core?
+		 */
+		if ( preg_match(
+			'~[' .
+				// Syntax-like characters.
+				'"\'>&</ =' .
+				// Control characters.
+				'\x{00}-\x{1F}' .
+				// HTML noncharacters.
+				'\x{FDD0}-\x{FDEF}' .
+				'\x{FFFE}\x{FFFF}\x{1FFFE}\x{1FFFF}\x{2FFFE}\x{2FFFF}\x{3FFFE}\x{3FFFF}' .
+				'\x{4FFFE}\x{4FFFF}\x{5FFFE}\x{5FFFF}\x{6FFFE}\x{6FFFF}\x{7FFFE}\x{7FFFF}' .
+				'\x{8FFFE}\x{8FFFF}\x{9FFFE}\x{9FFFF}\x{AFFFE}\x{AFFFF}\x{BFFFE}\x{BFFFF}' .
+				'\x{CFFFE}\x{CFFFF}\x{DFFFE}\x{DFFFF}\x{EFFFE}\x{EFFFF}\x{FFFFE}\x{FFFFF}' .
+				'\x{10FFFE}\x{10FFFF}' .
+			']~Ssu',
+			$name
+		) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Invalid attribute name.' ),
+				'6.2.0'
+			);
+
+			return false;
+		}
+
+		/*
+		 * > The values "true" and "false" are not allowed on boolean attributes.
+		 * > To represent a false value, the attribute has to be omitted altogether.
+		 *     - HTML5 spec, https://html.spec.whatwg.org/#boolean-attributes
+		 */
+		if ( false === $value ) {
+			return $this->remove_attribute( $name );
+		}
+
+		if ( true === $value ) {
+			$updated_attribute = $name;
+		} else {
+			$comparable_name = strtolower( $name );
+
+			/*
+			 * Escape URL attributes.
+			 *
+			 * @see https://html.spec.whatwg.org/#attributes-3
+			 */
+			$escaped_new_value = in_array( $comparable_name, wp_kses_uri_attributes() ) ? esc_url( $value ) : esc_attr( $value );
+			$updated_attribute = "{$name}=\"{$escaped_new_value}\"";
+		}
+
+		/*
+		 * > There must never be two or more attributes on
+		 * > the same start tag whose names are an ASCII
+		 * > case-insensitive match for each other.
+		 *     - HTML 5 spec
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+		 */
+		$comparable_name = strtolower( $name );
+
+		if ( isset( $this->attributes[ $comparable_name ] ) ) {
+			/*
+			 * Update an existing attribute.
+			 *
+			 * Example – set attribute id to "new" in <div id="initial_id" />:
+			 *
+			 *     <div id="initial_id"/>
+			 *          ^-------------^
+			 *          start         end
+			 *     replacement: `id="new"`
+			 *
+			 *     Result: <div id="new"/>
+			 */
+			$existing_attribute                        = $this->attributes[ $comparable_name ];
+			$this->lexical_updates[ $comparable_name ] = new WP_HTML_Text_Replacement(
+				$existing_attribute->start,
+				$existing_attribute->length,
+				$updated_attribute
+			);
+		} else {
+			/*
+			 * Create a new attribute at the tag's name end.
+			 *
+			 * Example – add attribute id="new" to <div />:
+			 *
+			 *     <div/>
+			 *         ^
+			 *         start and end
+			 *     replacement: ` id="new"`
+			 *
+			 *     Result: <div id="new"/>
+			 */
+			$this->lexical_updates[ $comparable_name ] = new WP_HTML_Text_Replacement(
+				$this->tag_name_starts_at + $this->tag_name_length,
+				0,
+				' ' . $updated_attribute
+			);
+		}
+
+		/*
+		 * Any calls to update the `class` attribute directly should wipe out any
+		 * enqueued class changes from `add_class` and `remove_class`.
+		 */
+		if ( 'class' === $comparable_name && ! empty( $this->classname_updates ) ) {
+			$this->classname_updates = array();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Remove an attribute from the currently-matched tag.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name The attribute name to remove.
+	 * @return bool Whether an attribute was removed.
+	 */
+	public function remove_attribute( $name ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return false;
+		}
+
+		/*
+		 * > There must never be two or more attributes on
+		 * > the same start tag whose names are an ASCII
+		 * > case-insensitive match for each other.
+		 *     - HTML 5 spec
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+		 */
+		$name = strtolower( $name );
+
+		/*
+		 * Any calls to update the `class` attribute directly should wipe out any
+		 * enqueued class changes from `add_class` and `remove_class`.
+		 */
+		if ( 'class' === $name && count( $this->classname_updates ) !== 0 ) {
+			$this->classname_updates = array();
+		}
+
+		/*
+		 * If updating an attribute that didn't exist in the input
+		 * document, then remove the enqueued update and move on.
+		 *
+		 * For example, this might occur when calling `remove_attribute()`
+		 * after calling `set_attribute()` for the same attribute
+		 * and when that attribute wasn't originally present.
+		 */
+		if ( ! isset( $this->attributes[ $name ] ) ) {
+			if ( isset( $this->lexical_updates[ $name ] ) ) {
+				unset( $this->lexical_updates[ $name ] );
+			}
+			return false;
+		}
+
+		/*
+		 * Removes an existing tag attribute.
+		 *
+		 * Example – remove the attribute id from <div id="main"/>:
+		 *    <div id="initial_id"/>
+		 *         ^-------------^
+		 *         start         end
+		 *    replacement: ``
+		 *
+		 *    Result: <div />
+		 */
+		$this->lexical_updates[ $name ] = new WP_HTML_Text_Replacement(
+			$this->attributes[ $name ]->start,
+			$this->attributes[ $name ]->length,
+			''
+		);
+
+		// Removes any duplicated attributes if they were also present.
+		if ( null !== $this->duplicate_attributes && array_key_exists( $name, $this->duplicate_attributes ) ) {
+			foreach ( $this->duplicate_attributes[ $name ] as $attribute_token ) {
+				$this->lexical_updates[] = new WP_HTML_Text_Replacement(
+					$attribute_token->start,
+					$attribute_token->length,
+					''
+				);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Adds a new class name to the currently matched tag.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $class_name The class name to add.
+	 * @return bool Whether the class was set to be added.
+	 */
+	public function add_class( $class_name ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return false;
+		}
+
+		$this->classname_updates[ $class_name ] = self::ADD_CLASS;
+
+		return true;
+	}
+
+	/**
+	 * Removes a class name from the currently matched tag.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $class_name The class name to remove.
+	 * @return bool Whether the class was set to be removed.
+	 */
+	public function remove_class( $class_name ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return false;
+		}
+
+		if ( null !== $this->tag_name_starts_at ) {
+			$this->classname_updates[ $class_name ] = self::REMOVE_CLASS;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the string representation of the HTML Tag Processor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see WP_HTML_Tag_Processor::get_updated_html()
+	 *
+	 * @return string The processed HTML.
+	 */
+	public function __toString() {
+		return $this->get_updated_html();
+	}
+
+	/**
+	 * Returns the string representation of the HTML Tag Processor.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Shifts the internal cursor corresponding to the applied updates.
+	 * @since 6.4.0 No longer calls subclass method `next_tag()` after updating HTML.
+	 *
+	 * @return string The processed HTML.
+	 */
+	public function get_updated_html() {
+		$requires_no_updating = 0 === count( $this->classname_updates ) && 0 === count( $this->lexical_updates );
+
+		/*
+		 * When there is nothing more to update and nothing has already been
+		 * updated, return the original document and avoid a string copy.
+		 */
+		if ( $requires_no_updating ) {
+			return $this->html;
+		}
+
+		/*
+		 * Keep track of the position right before the current tag. This will
+		 * be necessary for reparsing the current tag after updating the HTML.
+		 */
+		$before_current_tag = $this->token_starts_at ?? 0;
+
+		/*
+		 * 1. Apply the enqueued edits and update all the pointers to reflect those changes.
+		 */
+		$this->class_name_updates_to_attributes_updates();
+		$before_current_tag += $this->apply_attributes_updates( $before_current_tag );
+
+		/*
+		 * 2. Rewind to before the current tag and reparse to get updated attributes.
+		 *
+		 * At this point the internal cursor points to the end of the tag name.
+		 * Rewind before the tag name starts so that it's as if the cursor didn't
+		 * move; a call to `next_tag()` will reparse the recently-updated attributes
+		 * and additional calls to modify the attributes will apply at this same
+		 * location, but in order to avoid issues with subclasses that might add
+		 * behaviors to `next_tag()`, the internal methods should be called here
+		 * instead.
+		 *
+		 * It's important to note that in this specific place there will be no change
+		 * because the processor was already at a tag when this was called and it's
+		 * rewinding only to the beginning of this very tag before reprocessing it
+		 * and its attributes.
+		 *
+		 * <p>Previous HTML<em>More HTML</em></p>
+		 *                 ↑  │ back up by the length of the tag name plus the opening <
+		 *                 └←─┘ back up by strlen("em") + 1 ==> 3
+		 */
+		$this->bytes_already_parsed = $before_current_tag;
+		$this->base_class_next_token();
+
+		return $this->html;
+	}
+
+	/**
+	 * Parses tag query input into internal search criteria.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this class name to match.
+	 *     @type string      $tag_closers  "visit" or "skip": whether to stop on tag closers, e.g. </div>.
+	 * }
+	 */
+	private function parse_query( $query ) {
+		if ( null !== $query && $query === $this->last_query ) {
+			return;
+		}
+
+		$this->last_query          = $query;
+		$this->sought_tag_name     = null;
+		$this->sought_class_name   = null;
+		$this->sought_match_offset = 1;
+		$this->stop_on_tag_closers = false;
+
+		// A single string value means "find the tag of this name".
+		if ( is_string( $query ) ) {
+			$this->sought_tag_name = $query;
+			return;
+		}
+
+		// An empty query parameter applies no restrictions on the search.
+		if ( null === $query ) {
+			return;
+		}
+
+		// If not using the string interface, an associative array is required.
+		if ( ! is_array( $query ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'The query argument must be an array or a tag name.' ),
+				'6.2.0'
+			);
+			return;
+		}
+
+		if ( isset( $query['tag_name'] ) && is_string( $query['tag_name'] ) ) {
+			$this->sought_tag_name = $query['tag_name'];
+		}
+
+		if ( isset( $query['class_name'] ) && is_string( $query['class_name'] ) ) {
+			$this->sought_class_name = $query['class_name'];
+		}
+
+		if ( isset( $query['match_offset'] ) && is_int( $query['match_offset'] ) && 0 < $query['match_offset'] ) {
+			$this->sought_match_offset = $query['match_offset'];
+		}
+
+		if ( isset( $query['tag_closers'] ) ) {
+			$this->stop_on_tag_closers = 'visit' === $query['tag_closers'];
+		}
+	}
+
+
+	/**
+	 * Checks whether a given tag and its attributes match the search criteria.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether the given tag and its attribute match the search criteria.
+	 */
+	private function matches() {
+		if ( $this->is_closing_tag && ! $this->stop_on_tag_closers ) {
+			return false;
+		}
+
+		// Does the tag name match the requested tag name in a case-insensitive manner?
+		if ( null !== $this->sought_tag_name ) {
+			/*
+			 * String (byte) length lookup is fast. If they aren't the
+			 * same length then they can't be the same string values.
+			 */
+			if ( strlen( $this->sought_tag_name ) !== $this->tag_name_length ) {
+				return false;
+			}
+
+			/*
+			 * Check each character to determine if they are the same.
+			 * Defer calls to `strtoupper()` to avoid them when possible.
+			 * Calling `strcasecmp()` here tested slowed than comparing each
+			 * character, so unless benchmarks show otherwise, it should
+			 * not be used.
+			 *
+			 * It's expected that most of the time that this runs, a
+			 * lower-case tag name will be supplied and the input will
+			 * contain lower-case tag names, thus normally bypassing
+			 * the case comparison code.
+			 */
+			for ( $i = 0; $i < $this->tag_name_length; $i++ ) {
+				$html_char = $this->html[ $this->tag_name_starts_at + $i ];
+				$tag_char  = $this->sought_tag_name[ $i ];
+
+				if ( $html_char !== $tag_char && strtoupper( $html_char ) !== $tag_char ) {
+					return false;
+				}
+			}
+		}
+
+		if ( null !== $this->sought_class_name && ! $this->has_class( $this->sought_class_name ) ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Parser Ready State.
+	 *
+	 * Indicates that the parser is ready to run and waiting for a state transition.
+	 * It may not have started yet, or it may have just finished parsing a token and
+	 * is ready to find the next one.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_READY = 'STATE_READY';
+
+	/**
+	 * Parser Complete State.
+	 *
+	 * Indicates that the parser has reached the end of the document and there is
+	 * nothing left to scan. It finished parsing the last token completely.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_COMPLETE = 'STATE_COMPLETE';
+
+	/**
+	 * Parser Incomplete Input State.
+	 *
+	 * Indicates that the parser has reached the end of the document before finishing
+	 * a token. It started parsing a token but there is a possibility that the input
+	 * HTML document was truncated in the middle of a token.
+	 *
+	 * The parser is reset at the start of the incomplete token and has paused. There
+	 * is nothing more than can be scanned unless provided a more complete document.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_INCOMPLETE_INPUT = 'STATE_INCOMPLETE_INPUT';
+
+	/**
+	 * Parser Matched Tag State.
+	 *
+	 * Indicates that the parser has found an HTML tag and it's possible to get
+	 * the tag name and read or modify its attributes (if it's not a closing tag).
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_MATCHED_TAG = 'STATE_MATCHED_TAG';
+
+	/**
+	 * Parser Text Node State.
+	 *
+	 * Indicates that the parser has found a text node and it's possible
+	 * to read and modify that text.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_TEXT_NODE = 'STATE_TEXT_NODE';
+
+	/**
+	 * Parser CDATA Node State.
+	 *
+	 * Indicates that the parser has found a CDATA node and it's possible
+	 * to read and modify its modifiable text. Note that in HTML there are
+	 * no CDATA nodes outside of foreign content (SVG and MathML). Outside
+	 * of foreign content, they are treated as HTML comments.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_CDATA_NODE = 'STATE_CDATA_NODE';
+
+	/**
+	 * Indicates that the parser has found an HTML comment and it's
+	 * possible to read and modify its modifiable text.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_COMMENT = 'STATE_COMMENT';
+
+	/**
+	 * Indicates that the parser has found a DOCTYPE node and it's
+	 * possible to read and modify its modifiable text.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_DOCTYPE = 'STATE_DOCTYPE';
+
+	/**
+	 * Indicates that the parser has found an empty tag closer `</>`.
+	 *
+	 * Note that in HTML there are no empty tag closers, and they
+	 * are ignored. Nonetheless, the Tag Processor still
+	 * recognizes them as they appear in the HTML stream.
+	 *
+	 * These were historically discussed as a "presumptuous tag
+	 * closer," which would close the nearest open tag, but were
+	 * dismissed in favor of explicitly-closing tags.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_PRESUMPTUOUS_TAG = 'STATE_PRESUMPTUOUS_TAG';
+
+	/**
+	 * Indicates that the parser has found a "funky comment"
+	 * and it's possible to read and modify its modifiable text.
+	 *
+	 * Example:
+	 *
+	 *     </%url>
+	 *     </{"wp-bit":"query/post-author"}>
+	 *     </2>
+	 *
+	 * Funky comments are tag closers with invalid tag names. Note
+	 * that in HTML these are turn into bogus comments. Nonetheless,
+	 * the Tag Processor recognizes them in a stream of HTML and
+	 * exposes them for inspection and modification.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_FUNKY_COMMENT = 'STATE_WP_FUNKY';
+
+	/**
+	 * Indicates that a comment was created when encountering abruptly-closed HTML comment.
+	 *
+	 * Example:
+	 *
+	 *     <!-->
+	 *     <!--->
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_ABRUPTLY_CLOSED_COMMENT = 'COMMENT_AS_ABRUPTLY_CLOSED_COMMENT';
+
+	/**
+	 * Indicates that a comment would be parsed as a CDATA node,
+	 * were HTML to allow CDATA nodes outside of foreign content.
+	 *
+	 * Example:
+	 *
+	 *     <![CDATA[This is a CDATA node.]]>
+	 *
+	 * This is an HTML comment, but it looks like a CDATA node.
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_CDATA_LOOKALIKE = 'COMMENT_AS_CDATA_LOOKALIKE';
+
+	/**
+	 * Indicates that a comment was created when encountering
+	 * normative HTML comment syntax.
+	 *
+	 * Example:
+	 *
+	 *     <!-- this is a comment -->
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_HTML_COMMENT = 'COMMENT_AS_HTML_COMMENT';
+
+	/**
+	 * Indicates that a comment would be parsed as a Processing
+	 * Instruction node, were they to exist within HTML.
+	 *
+	 * Example:
+	 *
+	 *     <?wp __( 'Like' ) ?>
+	 *
+	 * This is an HTML comment, but it looks like a CDATA node.
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_PI_NODE_LOOKALIKE = 'COMMENT_AS_PI_NODE_LOOKALIKE';
+
+	/**
+	 * Indicates that a comment was created when encountering invalid
+	 * HTML input, a so-called "bogus comment."
+	 *
+	 * Example:
+	 *
+	 *     <?nothing special>
+	 *     <!{nothing special}>
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_INVALID_HTML = 'COMMENT_AS_INVALID_HTML';
+}
diff --git a/lib/compat/wordpress-6.6/html-api/gutenberg-html5-named-character-references-6-6.php b/lib/compat/wordpress-6.6/html-api/gutenberg-html5-named-character-references-6-6.php
new file mode 100644
index 00000000000000..c09deb3c9e6642
--- /dev/null
+++ b/lib/compat/wordpress-6.6/html-api/gutenberg-html5-named-character-references-6-6.php
@@ -0,0 +1,1315 @@
+<?php
+
+/**
+ * Auto-generated class for looking up HTML named character references.
+ *
+ * ⚠️ !!! THIS ENTIRE FILE IS AUTOMATICALLY GENERATED !!! ⚠️
+ * Do not modify this file directly.
+ *
+ * To regenerate, run the generation script directly.
+ *
+ * Example:
+ *
+ *     php tests/phpunit/data/html5-entities/generate-html5-named-character-references.php
+ *
+ * @package WordPress
+ * @since 6.6.0
+ */
+
+// phpcs:disable
+
+global $html5_named_character_references;
+
+/**
+ * Set of named character references in the HTML5 specification.
+ *
+ * This list will never change, according to the spec. Each named
+ * character reference is case-sensitive and the presence or absence
+ * of the semicolon is significant. Without the semicolon, the rules
+ * for an ambiguous ampersand govern whether the following text is
+ * to be interpreted as a character reference or not.
+ *
+ * The list of entities is sourced directly from the WHATWG server
+ * and cached in the test directory to avoid needing to download it
+ * every time this file is updated.
+ *
+ * @link https://html.spec.whatwg.org/entities.json.
+ */
+if ( ! isset( $html5_named_character_references ) ) {
+	$html5_named_character_references = Gutenberg_Token_Map_6_6::from_precomputed_table(
+		array(
+			"storage_version" => "6.6.0-trunk",
+			"key_length" => 2,
+			"groups" => "AE\x00AM\x00Aa\x00Ab\x00Ac\x00Af\x00Ag\x00Al\x00Am\x00An\x00Ao\x00Ap\x00Ar\x00As\x00At\x00Au\x00Ba\x00Bc\x00Be\x00Bf\x00Bo\x00Br\x00Bs\x00Bu\x00CH\x00CO\x00Ca\x00Cc\x00Cd\x00Ce\x00Cf\x00Ch\x00Ci\x00Cl\x00Co\x00Cr\x00Cs\x00Cu\x00DD\x00DJ\x00DS\x00DZ\x00Da\x00Dc\x00De\x00Df\x00Di\x00Do\x00Ds\x00EN\x00ET\x00Ea\x00Ec\x00Ed\x00Ef\x00Eg\x00El\x00Em\x00Eo\x00Ep\x00Eq\x00Es\x00Et\x00Eu\x00Ex\x00Fc\x00Ff\x00Fi\x00Fo\x00Fs\x00GJ\x00GT\x00Ga\x00Gb\x00Gc\x00Gd\x00Gf\x00Gg\x00Go\x00Gr\x00Gs\x00Gt\x00HA\x00Ha\x00Hc\x00Hf\x00Hi\x00Ho\x00Hs\x00Hu\x00IE\x00IJ\x00IO\x00Ia\x00Ic\x00Id\x00If\x00Ig\x00Im\x00In\x00Io\x00Is\x00It\x00Iu\x00Jc\x00Jf\x00Jo\x00Js\x00Ju\x00KH\x00KJ\x00Ka\x00Kc\x00Kf\x00Ko\x00Ks\x00LJ\x00LT\x00La\x00Lc\x00Le\x00Lf\x00Ll\x00Lm\x00Lo\x00Ls\x00Lt\x00Ma\x00Mc\x00Me\x00Mf\x00Mi\x00Mo\x00Ms\x00Mu\x00NJ\x00Na\x00Nc\x00Ne\x00Nf\x00No\x00Ns\x00Nt\x00Nu\x00OE\x00Oa\x00Oc\x00Od\x00Of\x00Og\x00Om\x00Oo\x00Op\x00Or\x00Os\x00Ot\x00Ou\x00Ov\x00Pa\x00Pc\x00Pf\x00Ph\x00Pi\x00Pl\x00Po\x00Pr\x00Ps\x00QU\x00Qf\x00Qo\x00Qs\x00RB\x00RE\x00Ra\x00Rc\x00Re\x00Rf\x00Rh\x00Ri\x00Ro\x00Rr\x00Rs\x00Ru\x00SH\x00SO\x00Sa\x00Sc\x00Sf\x00Sh\x00Si\x00Sm\x00So\x00Sq\x00Ss\x00St\x00Su\x00TH\x00TR\x00TS\x00Ta\x00Tc\x00Tf\x00Th\x00Ti\x00To\x00Tr\x00Ts\x00Ua\x00Ub\x00Uc\x00Ud\x00Uf\x00Ug\x00Um\x00Un\x00Uo\x00Up\x00Ur\x00Us\x00Ut\x00Uu\x00VD\x00Vb\x00Vc\x00Vd\x00Ve\x00Vf\x00Vo\x00Vs\x00Vv\x00Wc\x00We\x00Wf\x00Wo\x00Ws\x00Xf\x00Xi\x00Xo\x00Xs\x00YA\x00YI\x00YU\x00Ya\x00Yc\x00Yf\x00Yo\x00Ys\x00Yu\x00ZH\x00Za\x00Zc\x00Zd\x00Ze\x00Zf\x00Zo\x00Zs\x00aa\x00ab\x00ac\x00ae\x00af\x00ag\x00al\x00am\x00an\x00ao\x00ap\x00ar\x00as\x00at\x00au\x00aw\x00bN\x00ba\x00bb\x00bc\x00bd\x00be\x00bf\x00bi\x00bk\x00bl\x00bn\x00bo\x00bp\x00br\x00bs\x00bu\x00ca\x00cc\x00cd\x00ce\x00cf\x00ch\x00ci\x00cl\x00co\x00cr\x00cs\x00ct\x00cu\x00cw\x00cy\x00dA\x00dH\x00da\x00db\x00dc\x00dd\x00de\x00df\x00dh\x00di\x00dj\x00dl\x00do\x00dr\x00ds\x00dt\x00du\x00dw\x00dz\x00eD\x00ea\x00ec\x00ed\x00ee\x00ef\x00eg\x00el\x00em\x00en\x00eo\x00ep\x00eq\x00er\x00es\x00et\x00eu\x00ex\x00fa\x00fc\x00fe\x00ff\x00fi\x00fj\x00fl\x00fn\x00fo\x00fp\x00fr\x00fs\x00gE\x00ga\x00gb\x00gc\x00gd\x00ge\x00gf\x00gg\x00gi\x00gj\x00gl\x00gn\x00go\x00gr\x00gs\x00gt\x00gv\x00hA\x00ha\x00hb\x00hc\x00he\x00hf\x00hk\x00ho\x00hs\x00hy\x00ia\x00ic\x00ie\x00if\x00ig\x00ii\x00ij\x00im\x00in\x00io\x00ip\x00iq\x00is\x00it\x00iu\x00jc\x00jf\x00jm\x00jo\x00js\x00ju\x00ka\x00kc\x00kf\x00kg\x00kh\x00kj\x00ko\x00ks\x00lA\x00lB\x00lE\x00lH\x00la\x00lb\x00lc\x00ld\x00le\x00lf\x00lg\x00lh\x00lj\x00ll\x00lm\x00ln\x00lo\x00lp\x00lr\x00ls\x00lt\x00lu\x00lv\x00mD\x00ma\x00mc\x00md\x00me\x00mf\x00mh\x00mi\x00ml\x00mn\x00mo\x00mp\x00ms\x00mu\x00nG\x00nL\x00nR\x00nV\x00na\x00nb\x00nc\x00nd\x00ne\x00nf\x00ng\x00nh\x00ni\x00nj\x00nl\x00nm\x00no\x00np\x00nr\x00ns\x00nt\x00nu\x00nv\x00nw\x00oS\x00oa\x00oc\x00od\x00oe\x00of\x00og\x00oh\x00oi\x00ol\x00om\x00oo\x00op\x00or\x00os\x00ot\x00ou\x00ov\x00pa\x00pc\x00pe\x00pf\x00ph\x00pi\x00pl\x00pm\x00po\x00pr\x00ps\x00pu\x00qf\x00qi\x00qo\x00qp\x00qs\x00qu\x00rA\x00rB\x00rH\x00ra\x00rb\x00rc\x00rd\x00re\x00rf\x00rh\x00ri\x00rl\x00rm\x00rn\x00ro\x00rp\x00rr\x00rs\x00rt\x00ru\x00rx\x00sa\x00sb\x00sc\x00sd\x00se\x00sf\x00sh\x00si\x00sl\x00sm\x00so\x00sp\x00sq\x00sr\x00ss\x00st\x00su\x00sw\x00sz\x00ta\x00tb\x00tc\x00td\x00te\x00tf\x00th\x00ti\x00to\x00tp\x00tr\x00ts\x00tw\x00uA\x00uH\x00ua\x00ub\x00uc\x00ud\x00uf\x00ug\x00uh\x00ul\x00um\x00uo\x00up\x00ur\x00us\x00ut\x00uu\x00uw\x00vA\x00vB\x00vD\x00va\x00vc\x00vd\x00ve\x00vf\x00vl\x00vn\x00vo\x00vp\x00vr\x00vs\x00vz\x00wc\x00we\x00wf\x00wo\x00wp\x00wr\x00ws\x00xc\x00xd\x00xf\x00xh\x00xi\x00xl\x00xm\x00xn\x00xo\x00xr\x00xs\x00xu\x00xv\x00xw\x00ya\x00yc\x00ye\x00yf\x00yi\x00yo\x00ys\x00yu\x00za\x00zc\x00zd\x00ze\x00zf\x00zh\x00zi\x00zo\x00zs\x00zw\x00",
+			"large_words" => array(
+				// AElig;[Æ] AElig[Æ].
+				"\x04lig;\x02Æ\x03lig\x02Æ",
+				// AMP;[&] AMP[&].
+				"\x02P;\x01&\x01P\x01&",
+				// Aacute;[Á] Aacute[Á].
+				"\x05cute;\x02Á\x04cute\x02Á",
+				// Abreve;[Ă].
+				"\x05reve;\x02Ă",
+				// Acirc;[Â] Acirc[Â] Acy;[А].
+				"\x04irc;\x02Â\x03irc\x02Â\x02y;\x02А",
+				// Afr;[𝔄].
+				"\x02r;\x04𝔄",
+				// Agrave;[À] Agrave[À].
+				"\x05rave;\x02À\x04rave\x02À",
+				// Alpha;[Α].
+				"\x04pha;\x02Α",
+				// Amacr;[Ā].
+				"\x04acr;\x02Ā",
+				// And;[⩓].
+				"\x02d;\x03⩓",
+				// Aogon;[Ą] Aopf;[𝔸].
+				"\x04gon;\x02Ą\x03pf;\x04𝔸",
+				// ApplyFunction;[⁡].
+				"\x0cplyFunction;\x03⁡",
+				// Aring;[Å] Aring[Å].
+				"\x04ing;\x02Å\x03ing\x02Å",
+				// Assign;[≔] Ascr;[𝒜].
+				"\x05sign;\x03≔\x03cr;\x04𝒜",
+				// Atilde;[Ã] Atilde[Ã].
+				"\x05ilde;\x02Ã\x04ilde\x02Ã",
+				// Auml;[Ä] Auml[Ä].
+				"\x03ml;\x02Ä\x02ml\x02Ä",
+				// Backslash;[∖] Barwed;[⌆] Barv;[⫧].
+				"\x08ckslash;\x03∖\x05rwed;\x03⌆\x03rv;\x03⫧",
+				// Bcy;[Б].
+				"\x02y;\x02Б",
+				// Bernoullis;[ℬ] Because;[∵] Beta;[Β].
+				"\x09rnoullis;\x03ℬ\x06cause;\x03∵\x03ta;\x02Β",
+				// Bfr;[𝔅].
+				"\x02r;\x04𝔅",
+				// Bopf;[𝔹].
+				"\x03pf;\x04𝔹",
+				// Breve;[˘].
+				"\x04eve;\x02˘",
+				// Bscr;[ℬ].
+				"\x03cr;\x03ℬ",
+				// Bumpeq;[≎].
+				"\x05mpeq;\x03≎",
+				// CHcy;[Ч].
+				"\x03cy;\x02Ч",
+				// COPY;[©] COPY[©].
+				"\x03PY;\x02©\x02PY\x02©",
+				// CapitalDifferentialD;[ⅅ] Cayleys;[ℭ] Cacute;[Ć] Cap;[⋒].
+				"\x13pitalDifferentialD;\x03ⅅ\x06yleys;\x03ℭ\x05cute;\x02Ć\x02p;\x03⋒",
+				// Cconint;[∰] Ccaron;[Č] Ccedil;[Ç] Ccedil[Ç] Ccirc;[Ĉ].
+				"\x06onint;\x03∰\x05aron;\x02Č\x05edil;\x02Ç\x04edil\x02Ç\x04irc;\x02Ĉ",
+				// Cdot;[Ċ].
+				"\x03ot;\x02Ċ",
+				// CenterDot;[·] Cedilla;[¸].
+				"\x08nterDot;\x02·\x06dilla;\x02¸",
+				// Cfr;[ℭ].
+				"\x02r;\x03ℭ",
+				// Chi;[Χ].
+				"\x02i;\x02Χ",
+				// CircleMinus;[⊖] CircleTimes;[⊗] CirclePlus;[⊕] CircleDot;[⊙].
+				"\x0arcleMinus;\x03⊖\x0arcleTimes;\x03⊗\x09rclePlus;\x03⊕\x08rcleDot;\x03⊙",
+				// ClockwiseContourIntegral;[∲] CloseCurlyDoubleQuote;[”] CloseCurlyQuote;[’].
+				"\x17ockwiseContourIntegral;\x03∲\x14oseCurlyDoubleQuote;\x03”\x0eoseCurlyQuote;\x03’",
+				// CounterClockwiseContourIntegral;[∳] ContourIntegral;[∮] Congruent;[≡] Coproduct;[∐] Colone;[⩴] Conint;[∯] Colon;[∷] Copf;[ℂ].
+				"\x1eunterClockwiseContourIntegral;\x03∳\x0entourIntegral;\x03∮\x08ngruent;\x03≡\x08product;\x03∐\x05lone;\x03⩴\x05nint;\x03∯\x04lon;\x03∷\x03pf;\x03ℂ",
+				// Cross;[⨯].
+				"\x04oss;\x03⨯",
+				// Cscr;[𝒞].
+				"\x03cr;\x04𝒞",
+				// CupCap;[≍] Cup;[⋓].
+				"\x05pCap;\x03≍\x02p;\x03⋓",
+				// DDotrahd;[⤑] DD;[ⅅ].
+				"\x07otrahd;\x03⤑\x01;\x03ⅅ",
+				// DJcy;[Ђ].
+				"\x03cy;\x02Ђ",
+				// DScy;[Ѕ].
+				"\x03cy;\x02Ѕ",
+				// DZcy;[Џ].
+				"\x03cy;\x02Џ",
+				// Dagger;[‡] Dashv;[⫤] Darr;[↡].
+				"\x05gger;\x03‡\x04shv;\x03⫤\x03rr;\x03↡",
+				// Dcaron;[Ď] Dcy;[Д].
+				"\x05aron;\x02Ď\x02y;\x02Д",
+				// Delta;[Δ] Del;[∇].
+				"\x04lta;\x02Δ\x02l;\x03∇",
+				// Dfr;[𝔇].
+				"\x02r;\x04𝔇",
+				// DiacriticalDoubleAcute;[˝] DiacriticalAcute;[´] DiacriticalGrave;[`] DiacriticalTilde;[˜] DiacriticalDot;[˙] DifferentialD;[ⅆ] Diamond;[⋄].
+				"\x15acriticalDoubleAcute;\x02˝\x0facriticalAcute;\x02´\x0facriticalGrave;\x01`\x0facriticalTilde;\x02˜\x0dacriticalDot;\x02˙\x0cfferentialD;\x03ⅆ\x06amond;\x03⋄",
+				// DoubleLongLeftRightArrow;[⟺] DoubleContourIntegral;[∯] DoubleLeftRightArrow;[⇔] DoubleLongRightArrow;[⟹] DoubleLongLeftArrow;[⟸] DownLeftRightVector;[⥐] DownRightTeeVector;[⥟] DownRightVectorBar;[⥗] DoubleUpDownArrow;[⇕] DoubleVerticalBar;[∥] DownLeftTeeVector;[⥞] DownLeftVectorBar;[⥖] DoubleRightArrow;[⇒] DownArrowUpArrow;[⇵] DoubleDownArrow;[⇓] DoubleLeftArrow;[⇐] DownRightVector;[⇁] DoubleRightTee;[⊨] DownLeftVector;[↽] DoubleLeftTee;[⫤] DoubleUpArrow;[⇑] DownArrowBar;[⤓] DownTeeArrow;[↧] DoubleDot;[¨] DownArrow;[↓] DownBreve;[̑] Downarrow;[⇓] DotEqual;[≐] DownTee;[⊤] DotDot;[⃜] Dopf;[𝔻] Dot;[¨].
+				"\x17ubleLongLeftRightArrow;\x03⟺\x14ubleContourIntegral;\x03∯\x13ubleLeftRightArrow;\x03⇔\x13ubleLongRightArrow;\x03⟹\x12ubleLongLeftArrow;\x03⟸\x12wnLeftRightVector;\x03⥐\x11wnRightTeeVector;\x03⥟\x11wnRightVectorBar;\x03⥗\x10ubleUpDownArrow;\x03⇕\x10ubleVerticalBar;\x03∥\x10wnLeftTeeVector;\x03⥞\x10wnLeftVectorBar;\x03⥖\x0fubleRightArrow;\x03⇒\x0fwnArrowUpArrow;\x03⇵\x0eubleDownArrow;\x03⇓\x0eubleLeftArrow;\x03⇐\x0ewnRightVector;\x03⇁\x0dubleRightTee;\x03⊨\x0dwnLeftVector;\x03↽\x0cubleLeftTee;\x03⫤\x0cubleUpArrow;\x03⇑\x0bwnArrowBar;\x03⤓\x0bwnTeeArrow;\x03↧\x08ubleDot;\x02¨\x08wnArrow;\x03↓\x08wnBreve;\x02̑\x08wnarrow;\x03⇓\x07tEqual;\x03≐\x06wnTee;\x03⊤\x05tDot;\x03⃜\x03pf;\x04𝔻\x02t;\x02¨",
+				// Dstrok;[Đ] Dscr;[𝒟].
+				"\x05trok;\x02Đ\x03cr;\x04𝒟",
+				// ENG;[Ŋ].
+				"\x02G;\x02Ŋ",
+				// ETH;[Ð] ETH[Ð].
+				"\x02H;\x02Ð\x01H\x02Ð",
+				// Eacute;[É] Eacute[É].
+				"\x05cute;\x02É\x04cute\x02É",
+				// Ecaron;[Ě] Ecirc;[Ê] Ecirc[Ê] Ecy;[Э].
+				"\x05aron;\x02Ě\x04irc;\x02Ê\x03irc\x02Ê\x02y;\x02Э",
+				// Edot;[Ė].
+				"\x03ot;\x02Ė",
+				// Efr;[𝔈].
+				"\x02r;\x04𝔈",
+				// Egrave;[È] Egrave[È].
+				"\x05rave;\x02È\x04rave\x02È",
+				// Element;[∈].
+				"\x06ement;\x03∈",
+				// EmptyVerySmallSquare;[▫] EmptySmallSquare;[◻] Emacr;[Ē].
+				"\x13ptyVerySmallSquare;\x03▫\x0fptySmallSquare;\x03◻\x04acr;\x02Ē",
+				// Eogon;[Ę] Eopf;[𝔼].
+				"\x04gon;\x02Ę\x03pf;\x04𝔼",
+				// Epsilon;[Ε].
+				"\x06silon;\x02Ε",
+				// Equilibrium;[⇌] EqualTilde;[≂] Equal;[⩵].
+				"\x0auilibrium;\x03⇌\x09ualTilde;\x03≂\x04ual;\x03⩵",
+				// Escr;[ℰ] Esim;[⩳].
+				"\x03cr;\x03ℰ\x03im;\x03⩳",
+				// Eta;[Η].
+				"\x02a;\x02Η",
+				// Euml;[Ë] Euml[Ë].
+				"\x03ml;\x02Ë\x02ml\x02Ë",
+				// ExponentialE;[ⅇ] Exists;[∃].
+				"\x0bponentialE;\x03ⅇ\x05ists;\x03∃",
+				// Fcy;[Ф].
+				"\x02y;\x02Ф",
+				// Ffr;[𝔉].
+				"\x02r;\x04𝔉",
+				// FilledVerySmallSquare;[▪] FilledSmallSquare;[◼].
+				"\x14lledVerySmallSquare;\x03▪\x10lledSmallSquare;\x03◼",
+				// Fouriertrf;[ℱ] ForAll;[∀] Fopf;[𝔽].
+				"\x09uriertrf;\x03ℱ\x05rAll;\x03∀\x03pf;\x04𝔽",
+				// Fscr;[ℱ].
+				"\x03cr;\x03ℱ",
+				// GJcy;[Ѓ].
+				"\x03cy;\x02Ѓ",
+				// GT;[>].
+				"\x01;\x01>",
+				// Gammad;[Ϝ] Gamma;[Γ].
+				"\x05mmad;\x02Ϝ\x04mma;\x02Γ",
+				// Gbreve;[Ğ].
+				"\x05reve;\x02Ğ",
+				// Gcedil;[Ģ] Gcirc;[Ĝ] Gcy;[Г].
+				"\x05edil;\x02Ģ\x04irc;\x02Ĝ\x02y;\x02Г",
+				// Gdot;[Ġ].
+				"\x03ot;\x02Ġ",
+				// Gfr;[𝔊].
+				"\x02r;\x04𝔊",
+				// Gg;[⋙].
+				"\x01;\x03⋙",
+				// Gopf;[𝔾].
+				"\x03pf;\x04𝔾",
+				// GreaterSlantEqual;[⩾] GreaterEqualLess;[⋛] GreaterFullEqual;[≧] GreaterGreater;[⪢] GreaterEqual;[≥] GreaterTilde;[≳] GreaterLess;[≷].
+				"\x10eaterSlantEqual;\x03⩾\x0featerEqualLess;\x03⋛\x0featerFullEqual;\x03≧\x0deaterGreater;\x03⪢\x0beaterEqual;\x03≥\x0beaterTilde;\x03≳\x0aeaterLess;\x03≷",
+				// Gscr;[𝒢].
+				"\x03cr;\x04𝒢",
+				// Gt;[≫].
+				"\x01;\x03≫",
+				// HARDcy;[Ъ].
+				"\x05RDcy;\x02Ъ",
+				// Hacek;[ˇ] Hat;[^].
+				"\x04cek;\x02ˇ\x02t;\x01^",
+				// Hcirc;[Ĥ].
+				"\x04irc;\x02Ĥ",
+				// Hfr;[ℌ].
+				"\x02r;\x03ℌ",
+				// HilbertSpace;[ℋ].
+				"\x0blbertSpace;\x03ℋ",
+				// HorizontalLine;[─] Hopf;[ℍ].
+				"\x0drizontalLine;\x03─\x03pf;\x03ℍ",
+				// Hstrok;[Ħ] Hscr;[ℋ].
+				"\x05trok;\x02Ħ\x03cr;\x03ℋ",
+				// HumpDownHump;[≎] HumpEqual;[≏].
+				"\x0bmpDownHump;\x03≎\x08mpEqual;\x03≏",
+				// IEcy;[Е].
+				"\x03cy;\x02Е",
+				// IJlig;[IJ].
+				"\x04lig;\x02IJ",
+				// IOcy;[Ё].
+				"\x03cy;\x02Ё",
+				// Iacute;[Í] Iacute[Í].
+				"\x05cute;\x02Í\x04cute\x02Í",
+				// Icirc;[Î] Icirc[Î] Icy;[И].
+				"\x04irc;\x02Î\x03irc\x02Î\x02y;\x02И",
+				// Idot;[İ].
+				"\x03ot;\x02İ",
+				// Ifr;[ℑ].
+				"\x02r;\x03ℑ",
+				// Igrave;[Ì] Igrave[Ì].
+				"\x05rave;\x02Ì\x04rave\x02Ì",
+				// ImaginaryI;[ⅈ] Implies;[⇒] Imacr;[Ī] Im;[ℑ].
+				"\x09aginaryI;\x03ⅈ\x06plies;\x03⇒\x04acr;\x02Ī\x01;\x03ℑ",
+				// InvisibleComma;[⁣] InvisibleTimes;[⁢] Intersection;[⋂] Integral;[∫] Int;[∬].
+				"\x0dvisibleComma;\x03⁣\x0dvisibleTimes;\x03⁢\x0btersection;\x03⋂\x07tegral;\x03∫\x02t;\x03∬",
+				// Iogon;[Į] Iopf;[𝕀] Iota;[Ι].
+				"\x04gon;\x02Į\x03pf;\x04𝕀\x03ta;\x02Ι",
+				// Iscr;[ℐ].
+				"\x03cr;\x03ℐ",
+				// Itilde;[Ĩ].
+				"\x05ilde;\x02Ĩ",
+				// Iukcy;[І] Iuml;[Ï] Iuml[Ï].
+				"\x04kcy;\x02І\x03ml;\x02Ï\x02ml\x02Ï",
+				// Jcirc;[Ĵ] Jcy;[Й].
+				"\x04irc;\x02Ĵ\x02y;\x02Й",
+				// Jfr;[𝔍].
+				"\x02r;\x04𝔍",
+				// Jopf;[𝕁].
+				"\x03pf;\x04𝕁",
+				// Jsercy;[Ј] Jscr;[𝒥].
+				"\x05ercy;\x02Ј\x03cr;\x04𝒥",
+				// Jukcy;[Є].
+				"\x04kcy;\x02Є",
+				// KHcy;[Х].
+				"\x03cy;\x02Х",
+				// KJcy;[Ќ].
+				"\x03cy;\x02Ќ",
+				// Kappa;[Κ].
+				"\x04ppa;\x02Κ",
+				// Kcedil;[Ķ] Kcy;[К].
+				"\x05edil;\x02Ķ\x02y;\x02К",
+				// Kfr;[𝔎].
+				"\x02r;\x04𝔎",
+				// Kopf;[𝕂].
+				"\x03pf;\x04𝕂",
+				// Kscr;[𝒦].
+				"\x03cr;\x04𝒦",
+				// LJcy;[Љ].
+				"\x03cy;\x02Љ",
+				// LT;[<].
+				"\x01;\x01<",
+				// Laplacetrf;[ℒ] Lacute;[Ĺ] Lambda;[Λ] Lang;[⟪] Larr;[↞].
+				"\x09placetrf;\x03ℒ\x05cute;\x02Ĺ\x05mbda;\x02Λ\x03ng;\x03⟪\x03rr;\x03↞",
+				// Lcaron;[Ľ] Lcedil;[Ļ] Lcy;[Л].
+				"\x05aron;\x02Ľ\x05edil;\x02Ļ\x02y;\x02Л",
+				// LeftArrowRightArrow;[⇆] LeftDoubleBracket;[⟦] LeftDownTeeVector;[⥡] LeftDownVectorBar;[⥙] LeftTriangleEqual;[⊴] LeftAngleBracket;[⟨] LeftUpDownVector;[⥑] LessEqualGreater;[⋚] LeftRightVector;[⥎] LeftTriangleBar;[⧏] LeftUpTeeVector;[⥠] LeftUpVectorBar;[⥘] LeftDownVector;[⇃] LeftRightArrow;[↔] Leftrightarrow;[⇔] LessSlantEqual;[⩽] LeftTeeVector;[⥚] LeftVectorBar;[⥒] LessFullEqual;[≦] LeftArrowBar;[⇤] LeftTeeArrow;[↤] LeftTriangle;[⊲] LeftUpVector;[↿] LeftCeiling;[⌈] LessGreater;[≶] LeftVector;[↼] LeftArrow;[←] LeftFloor;[⌊] Leftarrow;[⇐] LessTilde;[≲] LessLess;[⪡] LeftTee;[⊣].
+				"\x12ftArrowRightArrow;\x03⇆\x10ftDoubleBracket;\x03⟦\x10ftDownTeeVector;\x03⥡\x10ftDownVectorBar;\x03⥙\x10ftTriangleEqual;\x03⊴\x0fftAngleBracket;\x03⟨\x0fftUpDownVector;\x03⥑\x0fssEqualGreater;\x03⋚\x0eftRightVector;\x03⥎\x0eftTriangleBar;\x03⧏\x0eftUpTeeVector;\x03⥠\x0eftUpVectorBar;\x03⥘\x0dftDownVector;\x03⇃\x0dftRightArrow;\x03↔\x0dftrightarrow;\x03⇔\x0dssSlantEqual;\x03⩽\x0cftTeeVector;\x03⥚\x0cftVectorBar;\x03⥒\x0cssFullEqual;\x03≦\x0bftArrowBar;\x03⇤\x0bftTeeArrow;\x03↤\x0bftTriangle;\x03⊲\x0bftUpVector;\x03↿\x0aftCeiling;\x03⌈\x0assGreater;\x03≶\x09ftVector;\x03↼\x08ftArrow;\x03←\x08ftFloor;\x03⌊\x08ftarrow;\x03⇐\x08ssTilde;\x03≲\x07ssLess;\x03⪡\x06ftTee;\x03⊣",
+				// Lfr;[𝔏].
+				"\x02r;\x04𝔏",
+				// Lleftarrow;[⇚] Ll;[⋘].
+				"\x09eftarrow;\x03⇚\x01;\x03⋘",
+				// Lmidot;[Ŀ].
+				"\x05idot;\x02Ŀ",
+				// LongLeftRightArrow;[⟷] Longleftrightarrow;[⟺] LowerRightArrow;[↘] LongRightArrow;[⟶] Longrightarrow;[⟹] LowerLeftArrow;[↙] LongLeftArrow;[⟵] Longleftarrow;[⟸] Lopf;[𝕃].
+				"\x11ngLeftRightArrow;\x03⟷\x11ngleftrightarrow;\x03⟺\x0ewerRightArrow;\x03↘\x0dngRightArrow;\x03⟶\x0dngrightarrow;\x03⟹\x0dwerLeftArrow;\x03↙\x0cngLeftArrow;\x03⟵\x0cngleftarrow;\x03⟸\x03pf;\x04𝕃",
+				// Lstrok;[Ł] Lscr;[ℒ] Lsh;[↰].
+				"\x05trok;\x02Ł\x03cr;\x03ℒ\x02h;\x03↰",
+				// Lt;[≪].
+				"\x01;\x03≪",
+				// Map;[⤅].
+				"\x02p;\x03⤅",
+				// Mcy;[М].
+				"\x02y;\x02М",
+				// MediumSpace;[ ] Mellintrf;[ℳ].
+				"\x0adiumSpace;\x03 \x08llintrf;\x03ℳ",
+				// Mfr;[𝔐].
+				"\x02r;\x04𝔐",
+				// MinusPlus;[∓].
+				"\x08nusPlus;\x03∓",
+				// Mopf;[𝕄].
+				"\x03pf;\x04𝕄",
+				// Mscr;[ℳ].
+				"\x03cr;\x03ℳ",
+				// Mu;[Μ].
+				"\x01;\x02Μ",
+				// NJcy;[Њ].
+				"\x03cy;\x02Њ",
+				// Nacute;[Ń].
+				"\x05cute;\x02Ń",
+				// Ncaron;[Ň] Ncedil;[Ņ] Ncy;[Н].
+				"\x05aron;\x02Ň\x05edil;\x02Ņ\x02y;\x02Н",
+				// NegativeVeryThinSpace;[​] NestedGreaterGreater;[≫] NegativeMediumSpace;[​] NegativeThickSpace;[​] NegativeThinSpace;[​] NestedLessLess;[≪] NewLine;[\xa].
+				"\x14gativeVeryThinSpace;\x03​\x13stedGreaterGreater;\x03≫\x12gativeMediumSpace;\x03​\x11gativeThickSpace;\x03​\x10gativeThinSpace;\x03​\x0dstedLessLess;\x03≪\x06wLine;\x01\xa",
+				// Nfr;[𝔑].
+				"\x02r;\x04𝔑",
+				// NotNestedGreaterGreater;[⪢̸] NotSquareSupersetEqual;[⋣] NotPrecedesSlantEqual;[⋠] NotRightTriangleEqual;[⋭] NotSucceedsSlantEqual;[⋡] NotDoubleVerticalBar;[∦] NotGreaterSlantEqual;[⩾̸] NotLeftTriangleEqual;[⋬] NotSquareSubsetEqual;[⋢] NotGreaterFullEqual;[≧̸] NotRightTriangleBar;[⧐̸] NotLeftTriangleBar;[⧏̸] NotGreaterGreater;[≫̸] NotLessSlantEqual;[⩽̸] NotNestedLessLess;[⪡̸] NotReverseElement;[∌] NotSquareSuperset;[⊐̸] NotTildeFullEqual;[≇] NonBreakingSpace;[ ] NotPrecedesEqual;[⪯̸] NotRightTriangle;[⋫] NotSucceedsEqual;[⪰̸] NotSucceedsTilde;[≿̸] NotSupersetEqual;[⊉] NotGreaterEqual;[≱] NotGreaterTilde;[≵] NotHumpDownHump;[≎̸] NotLeftTriangle;[⋪] NotSquareSubset;[⊏̸] NotGreaterLess;[≹] NotLessGreater;[≸] NotSubsetEqual;[⊈] NotVerticalBar;[∤] NotEqualTilde;[≂̸] NotTildeEqual;[≄] NotTildeTilde;[≉] NotCongruent;[≢] NotHumpEqual;[≏̸] NotLessEqual;[≰] NotLessTilde;[≴] NotLessLess;[≪̸] NotPrecedes;[⊀] NotSucceeds;[⊁] NotSuperset;[⊃⃒] NotElement;[∉] NotGreater;[≯] NotCupCap;[≭] NotExists;[∄] NotSubset;[⊂⃒] NotEqual;[≠] NotTilde;[≁] NoBreak;[⁠] NotLess;[≮] Nopf;[ℕ] Not;[⫬].
+				"\x16tNestedGreaterGreater;\x05⪢̸\x15tSquareSupersetEqual;\x03⋣\x14tPrecedesSlantEqual;\x03⋠\x14tRightTriangleEqual;\x03⋭\x14tSucceedsSlantEqual;\x03⋡\x13tDoubleVerticalBar;\x03∦\x13tGreaterSlantEqual;\x05⩾̸\x13tLeftTriangleEqual;\x03⋬\x13tSquareSubsetEqual;\x03⋢\x12tGreaterFullEqual;\x05≧̸\x12tRightTriangleBar;\x05⧐̸\x11tLeftTriangleBar;\x05⧏̸\x10tGreaterGreater;\x05≫̸\x10tLessSlantEqual;\x05⩽̸\x10tNestedLessLess;\x05⪡̸\x10tReverseElement;\x03∌\x10tSquareSuperset;\x05⊐̸\x10tTildeFullEqual;\x03≇\x0fnBreakingSpace;\x02 \x0ftPrecedesEqual;\x05⪯̸\x0ftRightTriangle;\x03⋫\x0ftSucceedsEqual;\x05⪰̸\x0ftSucceedsTilde;\x05≿̸\x0ftSupersetEqual;\x03⊉\x0etGreaterEqual;\x03≱\x0etGreaterTilde;\x03≵\x0etHumpDownHump;\x05≎̸\x0etLeftTriangle;\x03⋪\x0etSquareSubset;\x05⊏̸\x0dtGreaterLess;\x03≹\x0dtLessGreater;\x03≸\x0dtSubsetEqual;\x03⊈\x0dtVerticalBar;\x03∤\x0ctEqualTilde;\x05≂̸\x0ctTildeEqual;\x03≄\x0ctTildeTilde;\x03≉\x0btCongruent;\x03≢\x0btHumpEqual;\x05≏̸\x0btLessEqual;\x03≰\x0btLessTilde;\x03≴\x0atLessLess;\x05≪̸\x0atPrecedes;\x03⊀\x0atSucceeds;\x03⊁\x0atSuperset;\x06⊃⃒\x09tElement;\x03∉\x09tGreater;\x03≯\x08tCupCap;\x03≭\x08tExists;\x03∄\x08tSubset;\x06⊂⃒\x07tEqual;\x03≠\x07tTilde;\x03≁\x06Break;\x03⁠\x06tLess;\x03≮\x03pf;\x03ℕ\x02t;\x03⫬",
+				// Nscr;[𝒩].
+				"\x03cr;\x04𝒩",
+				// Ntilde;[Ñ] Ntilde[Ñ].
+				"\x05ilde;\x02Ñ\x04ilde\x02Ñ",
+				// Nu;[Ν].
+				"\x01;\x02Ν",
+				// OElig;[Œ].
+				"\x04lig;\x02Œ",
+				// Oacute;[Ó] Oacute[Ó].
+				"\x05cute;\x02Ó\x04cute\x02Ó",
+				// Ocirc;[Ô] Ocirc[Ô] Ocy;[О].
+				"\x04irc;\x02Ô\x03irc\x02Ô\x02y;\x02О",
+				// Odblac;[Ő].
+				"\x05blac;\x02Ő",
+				// Ofr;[𝔒].
+				"\x02r;\x04𝔒",
+				// Ograve;[Ò] Ograve[Ò].
+				"\x05rave;\x02Ò\x04rave\x02Ò",
+				// Omicron;[Ο] Omacr;[Ō] Omega;[Ω].
+				"\x06icron;\x02Ο\x04acr;\x02Ō\x04ega;\x02Ω",
+				// Oopf;[𝕆].
+				"\x03pf;\x04𝕆",
+				// OpenCurlyDoubleQuote;[“] OpenCurlyQuote;[‘].
+				"\x13enCurlyDoubleQuote;\x03“\x0denCurlyQuote;\x03‘",
+				// Or;[⩔].
+				"\x01;\x03⩔",
+				// Oslash;[Ø] Oslash[Ø] Oscr;[𝒪].
+				"\x05lash;\x02Ø\x04lash\x02Ø\x03cr;\x04𝒪",
+				// Otilde;[Õ] Otimes;[⨷] Otilde[Õ].
+				"\x05ilde;\x02Õ\x05imes;\x03⨷\x04ilde\x02Õ",
+				// Ouml;[Ö] Ouml[Ö].
+				"\x03ml;\x02Ö\x02ml\x02Ö",
+				// OverParenthesis;[⏜] OverBracket;[⎴] OverBrace;[⏞] OverBar;[‾].
+				"\x0eerParenthesis;\x03⏜\x0aerBracket;\x03⎴\x08erBrace;\x03⏞\x06erBar;\x03‾",
+				// PartialD;[∂].
+				"\x07rtialD;\x03∂",
+				// Pcy;[П].
+				"\x02y;\x02П",
+				// Pfr;[𝔓].
+				"\x02r;\x04𝔓",
+				// Phi;[Φ].
+				"\x02i;\x02Φ",
+				// Pi;[Π].
+				"\x01;\x02Π",
+				// PlusMinus;[±].
+				"\x08usMinus;\x02±",
+				// Poincareplane;[ℌ] Popf;[ℙ].
+				"\x0cincareplane;\x03ℌ\x03pf;\x03ℙ",
+				// PrecedesSlantEqual;[≼] PrecedesEqual;[⪯] PrecedesTilde;[≾] Proportional;[∝] Proportion;[∷] Precedes;[≺] Product;[∏] Prime;[″] Pr;[⪻].
+				"\x11ecedesSlantEqual;\x03≼\x0cecedesEqual;\x03⪯\x0cecedesTilde;\x03≾\x0boportional;\x03∝\x09oportion;\x03∷\x07ecedes;\x03≺\x06oduct;\x03∏\x04ime;\x03″\x01;\x03⪻",
+				// Pscr;[𝒫] Psi;[Ψ].
+				"\x03cr;\x04𝒫\x02i;\x02Ψ",
+				// QUOT;[\"] QUOT[\"].
+				"\x03OT;\x01\"\x02OT\x01\"",
+				// Qfr;[𝔔].
+				"\x02r;\x04𝔔",
+				// Qopf;[ℚ].
+				"\x03pf;\x03ℚ",
+				// Qscr;[𝒬].
+				"\x03cr;\x04𝒬",
+				// RBarr;[⤐].
+				"\x04arr;\x03⤐",
+				// REG;[®] REG[®].
+				"\x02G;\x02®\x01G\x02®",
+				// Racute;[Ŕ] Rarrtl;[⤖] Rang;[⟫] Rarr;[↠].
+				"\x05cute;\x02Ŕ\x05rrtl;\x03⤖\x03ng;\x03⟫\x03rr;\x03↠",
+				// Rcaron;[Ř] Rcedil;[Ŗ] Rcy;[Р].
+				"\x05aron;\x02Ř\x05edil;\x02Ŗ\x02y;\x02Р",
+				// ReverseUpEquilibrium;[⥯] ReverseEquilibrium;[⇋] ReverseElement;[∋] Re;[ℜ].
+				"\x13verseUpEquilibrium;\x03⥯\x11verseEquilibrium;\x03⇋\x0dverseElement;\x03∋\x01;\x03ℜ",
+				// Rfr;[ℜ].
+				"\x02r;\x03ℜ",
+				// Rho;[Ρ].
+				"\x02o;\x02Ρ",
+				// RightArrowLeftArrow;[⇄] RightDoubleBracket;[⟧] RightDownTeeVector;[⥝] RightDownVectorBar;[⥕] RightTriangleEqual;[⊵] RightAngleBracket;[⟩] RightUpDownVector;[⥏] RightTriangleBar;[⧐] RightUpTeeVector;[⥜] RightUpVectorBar;[⥔] RightDownVector;[⇂] RightTeeVector;[⥛] RightVectorBar;[⥓] RightArrowBar;[⇥] RightTeeArrow;[↦] RightTriangle;[⊳] RightUpVector;[↾] RightCeiling;[⌉] RightVector;[⇀] RightArrow;[→] RightFloor;[⌋] Rightarrow;[⇒] RightTee;[⊢].
+				"\x12ghtArrowLeftArrow;\x03⇄\x11ghtDoubleBracket;\x03⟧\x11ghtDownTeeVector;\x03⥝\x11ghtDownVectorBar;\x03⥕\x11ghtTriangleEqual;\x03⊵\x10ghtAngleBracket;\x03⟩\x10ghtUpDownVector;\x03⥏\x0fghtTriangleBar;\x03⧐\x0fghtUpTeeVector;\x03⥜\x0fghtUpVectorBar;\x03⥔\x0eghtDownVector;\x03⇂\x0dghtTeeVector;\x03⥛\x0dghtVectorBar;\x03⥓\x0cghtArrowBar;\x03⇥\x0cghtTeeArrow;\x03↦\x0cghtTriangle;\x03⊳\x0cghtUpVector;\x03↾\x0bghtCeiling;\x03⌉\x0aghtVector;\x03⇀\x09ghtArrow;\x03→\x09ghtFloor;\x03⌋\x09ghtarrow;\x03⇒\x07ghtTee;\x03⊢",
+				// RoundImplies;[⥰] Ropf;[ℝ].
+				"\x0bundImplies;\x03⥰\x03pf;\x03ℝ",
+				// Rrightarrow;[⇛].
+				"\x0aightarrow;\x03⇛",
+				// Rscr;[ℛ] Rsh;[↱].
+				"\x03cr;\x03ℛ\x02h;\x03↱",
+				// RuleDelayed;[⧴].
+				"\x0aleDelayed;\x03⧴",
+				// SHCHcy;[Щ] SHcy;[Ш].
+				"\x05CHcy;\x02Щ\x03cy;\x02Ш",
+				// SOFTcy;[Ь].
+				"\x05FTcy;\x02Ь",
+				// Sacute;[Ś].
+				"\x05cute;\x02Ś",
+				// Scaron;[Š] Scedil;[Ş] Scirc;[Ŝ] Scy;[С] Sc;[⪼].
+				"\x05aron;\x02Š\x05edil;\x02Ş\x04irc;\x02Ŝ\x02y;\x02С\x01;\x03⪼",
+				// Sfr;[𝔖].
+				"\x02r;\x04𝔖",
+				// ShortRightArrow;[→] ShortDownArrow;[↓] ShortLeftArrow;[←] ShortUpArrow;[↑].
+				"\x0eortRightArrow;\x03→\x0dortDownArrow;\x03↓\x0dortLeftArrow;\x03←\x0bortUpArrow;\x03↑",
+				// Sigma;[Σ].
+				"\x04gma;\x02Σ",
+				// SmallCircle;[∘].
+				"\x0aallCircle;\x03∘",
+				// Sopf;[𝕊].
+				"\x03pf;\x04𝕊",
+				// SquareSupersetEqual;[⊒] SquareIntersection;[⊓] SquareSubsetEqual;[⊑] SquareSuperset;[⊐] SquareSubset;[⊏] SquareUnion;[⊔] Square;[□] Sqrt;[√].
+				"\x12uareSupersetEqual;\x03⊒\x11uareIntersection;\x03⊓\x10uareSubsetEqual;\x03⊑\x0duareSuperset;\x03⊐\x0buareSubset;\x03⊏\x0auareUnion;\x03⊔\x05uare;\x03□\x03rt;\x03√",
+				// Sscr;[𝒮].
+				"\x03cr;\x04𝒮",
+				// Star;[⋆].
+				"\x03ar;\x03⋆",
+				// SucceedsSlantEqual;[≽] SucceedsEqual;[⪰] SucceedsTilde;[≿] SupersetEqual;[⊇] SubsetEqual;[⊆] Succeeds;[≻] SuchThat;[∋] Superset;[⊃] Subset;[⋐] Supset;[⋑] Sub;[⋐] Sum;[∑] Sup;[⋑].
+				"\x11cceedsSlantEqual;\x03≽\x0ccceedsEqual;\x03⪰\x0ccceedsTilde;\x03≿\x0cpersetEqual;\x03⊇\x0absetEqual;\x03⊆\x07cceeds;\x03≻\x07chThat;\x03∋\x07perset;\x03⊃\x05bset;\x03⋐\x05pset;\x03⋑\x02b;\x03⋐\x02m;\x03∑\x02p;\x03⋑",
+				// THORN;[Þ] THORN[Þ].
+				"\x04ORN;\x02Þ\x03ORN\x02Þ",
+				// TRADE;[™].
+				"\x04ADE;\x03™",
+				// TSHcy;[Ћ] TScy;[Ц].
+				"\x04Hcy;\x02Ћ\x03cy;\x02Ц",
+				// Tab;[\x9] Tau;[Τ].
+				"\x02b;\x01\x9\x02u;\x02Τ",
+				// Tcaron;[Ť] Tcedil;[Ţ] Tcy;[Т].
+				"\x05aron;\x02Ť\x05edil;\x02Ţ\x02y;\x02Т",
+				// Tfr;[𝔗].
+				"\x02r;\x04𝔗",
+				// ThickSpace;[  ] Therefore;[∴] ThinSpace;[ ] Theta;[Θ].
+				"\x09ickSpace;\x06  \x08erefore;\x03∴\x08inSpace;\x03 \x04eta;\x02Θ",
+				// TildeFullEqual;[≅] TildeEqual;[≃] TildeTilde;[≈] Tilde;[∼].
+				"\x0dldeFullEqual;\x03≅\x09ldeEqual;\x03≃\x09ldeTilde;\x03≈\x04lde;\x03∼",
+				// Topf;[𝕋].
+				"\x03pf;\x04𝕋",
+				// TripleDot;[⃛].
+				"\x08ipleDot;\x03⃛",
+				// Tstrok;[Ŧ] Tscr;[𝒯].
+				"\x05trok;\x02Ŧ\x03cr;\x04𝒯",
+				// Uarrocir;[⥉] Uacute;[Ú] Uacute[Ú] Uarr;[↟].
+				"\x07rrocir;\x03⥉\x05cute;\x02Ú\x04cute\x02Ú\x03rr;\x03↟",
+				// Ubreve;[Ŭ] Ubrcy;[Ў].
+				"\x05reve;\x02Ŭ\x04rcy;\x02Ў",
+				// Ucirc;[Û] Ucirc[Û] Ucy;[У].
+				"\x04irc;\x02Û\x03irc\x02Û\x02y;\x02У",
+				// Udblac;[Ű].
+				"\x05blac;\x02Ű",
+				// Ufr;[𝔘].
+				"\x02r;\x04𝔘",
+				// Ugrave;[Ù] Ugrave[Ù].
+				"\x05rave;\x02Ù\x04rave\x02Ù",
+				// Umacr;[Ū].
+				"\x04acr;\x02Ū",
+				// UnderParenthesis;[⏝] UnderBracket;[⎵] UnderBrace;[⏟] UnionPlus;[⊎] UnderBar;[_] Union;[⋃].
+				"\x0fderParenthesis;\x03⏝\x0bderBracket;\x03⎵\x09derBrace;\x03⏟\x08ionPlus;\x03⊎\x07derBar;\x01_\x04ion;\x03⋃",
+				// Uogon;[Ų] Uopf;[𝕌].
+				"\x04gon;\x02Ų\x03pf;\x04𝕌",
+				// UpArrowDownArrow;[⇅] UpperRightArrow;[↗] UpperLeftArrow;[↖] UpEquilibrium;[⥮] UpDownArrow;[↕] Updownarrow;[⇕] UpArrowBar;[⤒] UpTeeArrow;[↥] UpArrow;[↑] Uparrow;[⇑] Upsilon;[Υ] UpTee;[⊥] Upsi;[ϒ].
+				"\x0fArrowDownArrow;\x03⇅\x0eperRightArrow;\x03↗\x0dperLeftArrow;\x03↖\x0cEquilibrium;\x03⥮\x0aDownArrow;\x03↕\x0adownarrow;\x03⇕\x09ArrowBar;\x03⤒\x09TeeArrow;\x03↥\x06Arrow;\x03↑\x06arrow;\x03⇑\x06silon;\x02Υ\x04Tee;\x03⊥\x03si;\x02ϒ",
+				// Uring;[Ů].
+				"\x04ing;\x02Ů",
+				// Uscr;[𝒰].
+				"\x03cr;\x04𝒰",
+				// Utilde;[Ũ].
+				"\x05ilde;\x02Ũ",
+				// Uuml;[Ü] Uuml[Ü].
+				"\x03ml;\x02Ü\x02ml\x02Ü",
+				// VDash;[⊫].
+				"\x04ash;\x03⊫",
+				// Vbar;[⫫].
+				"\x03ar;\x03⫫",
+				// Vcy;[В].
+				"\x02y;\x02В",
+				// Vdashl;[⫦] Vdash;[⊩].
+				"\x05ashl;\x03⫦\x04ash;\x03⊩",
+				// VerticalSeparator;[❘] VerticalTilde;[≀] VeryThinSpace;[ ] VerticalLine;[|] VerticalBar;[∣] Verbar;[‖] Vert;[‖] Vee;[⋁].
+				"\x10rticalSeparator;\x03❘\x0crticalTilde;\x03≀\x0cryThinSpace;\x03 \x0brticalLine;\x01|\x0articalBar;\x03∣\x05rbar;\x03‖\x03rt;\x03‖\x02e;\x03⋁",
+				// Vfr;[𝔙].
+				"\x02r;\x04𝔙",
+				// Vopf;[𝕍].
+				"\x03pf;\x04𝕍",
+				// Vscr;[𝒱].
+				"\x03cr;\x04𝒱",
+				// Vvdash;[⊪].
+				"\x05dash;\x03⊪",
+				// Wcirc;[Ŵ].
+				"\x04irc;\x02Ŵ",
+				// Wedge;[⋀].
+				"\x04dge;\x03⋀",
+				// Wfr;[𝔚].
+				"\x02r;\x04𝔚",
+				// Wopf;[𝕎].
+				"\x03pf;\x04𝕎",
+				// Wscr;[𝒲].
+				"\x03cr;\x04𝒲",
+				// Xfr;[𝔛].
+				"\x02r;\x04𝔛",
+				// Xi;[Ξ].
+				"\x01;\x02Ξ",
+				// Xopf;[𝕏].
+				"\x03pf;\x04𝕏",
+				// Xscr;[𝒳].
+				"\x03cr;\x04𝒳",
+				// YAcy;[Я].
+				"\x03cy;\x02Я",
+				// YIcy;[Ї].
+				"\x03cy;\x02Ї",
+				// YUcy;[Ю].
+				"\x03cy;\x02Ю",
+				// Yacute;[Ý] Yacute[Ý].
+				"\x05cute;\x02Ý\x04cute\x02Ý",
+				// Ycirc;[Ŷ] Ycy;[Ы].
+				"\x04irc;\x02Ŷ\x02y;\x02Ы",
+				// Yfr;[𝔜].
+				"\x02r;\x04𝔜",
+				// Yopf;[𝕐].
+				"\x03pf;\x04𝕐",
+				// Yscr;[𝒴].
+				"\x03cr;\x04𝒴",
+				// Yuml;[Ÿ].
+				"\x03ml;\x02Ÿ",
+				// ZHcy;[Ж].
+				"\x03cy;\x02Ж",
+				// Zacute;[Ź].
+				"\x05cute;\x02Ź",
+				// Zcaron;[Ž] Zcy;[З].
+				"\x05aron;\x02Ž\x02y;\x02З",
+				// Zdot;[Ż].
+				"\x03ot;\x02Ż",
+				// ZeroWidthSpace;[​] Zeta;[Ζ].
+				"\x0droWidthSpace;\x03​\x03ta;\x02Ζ",
+				// Zfr;[ℨ].
+				"\x02r;\x03ℨ",
+				// Zopf;[ℤ].
+				"\x03pf;\x03ℤ",
+				// Zscr;[𝒵].
+				"\x03cr;\x04𝒵",
+				// aacute;[á] aacute[á].
+				"\x05cute;\x02á\x04cute\x02á",
+				// abreve;[ă].
+				"\x05reve;\x02ă",
+				// acirc;[â] acute;[´] acirc[â] acute[´] acE;[∾̳] acd;[∿] acy;[а] ac;[∾].
+				"\x04irc;\x02â\x04ute;\x02´\x03irc\x02â\x03ute\x02´\x02E;\x05∾̳\x02d;\x03∿\x02y;\x02а\x01;\x03∾",
+				// aelig;[æ] aelig[æ].
+				"\x04lig;\x02æ\x03lig\x02æ",
+				// afr;[𝔞] af;[⁡].
+				"\x02r;\x04𝔞\x01;\x03⁡",
+				// agrave;[à] agrave[à].
+				"\x05rave;\x02à\x04rave\x02à",
+				// alefsym;[ℵ] aleph;[ℵ] alpha;[α].
+				"\x06efsym;\x03ℵ\x04eph;\x03ℵ\x04pha;\x02α",
+				// amacr;[ā] amalg;[⨿] amp;[&] amp[&].
+				"\x04acr;\x02ā\x04alg;\x03⨿\x02p;\x01&\x01p\x01&",
+				// andslope;[⩘] angmsdaa;[⦨] angmsdab;[⦩] angmsdac;[⦪] angmsdad;[⦫] angmsdae;[⦬] angmsdaf;[⦭] angmsdag;[⦮] angmsdah;[⦯] angrtvbd;[⦝] angrtvb;[⊾] angzarr;[⍼] andand;[⩕] angmsd;[∡] angsph;[∢] angle;[∠] angrt;[∟] angst;[Å] andd;[⩜] andv;[⩚] ange;[⦤] and;[∧] ang;[∠].
+				"\x07dslope;\x03⩘\x07gmsdaa;\x03⦨\x07gmsdab;\x03⦩\x07gmsdac;\x03⦪\x07gmsdad;\x03⦫\x07gmsdae;\x03⦬\x07gmsdaf;\x03⦭\x07gmsdag;\x03⦮\x07gmsdah;\x03⦯\x07grtvbd;\x03⦝\x06grtvb;\x03⊾\x06gzarr;\x03⍼\x05dand;\x03⩕\x05gmsd;\x03∡\x05gsph;\x03∢\x04gle;\x03∠\x04grt;\x03∟\x04gst;\x02Å\x03dd;\x03⩜\x03dv;\x03⩚\x03ge;\x03⦤\x02d;\x03∧\x02g;\x03∠",
+				// aogon;[ą] aopf;[𝕒].
+				"\x04gon;\x02ą\x03pf;\x04𝕒",
+				// approxeq;[≊] apacir;[⩯] approx;[≈] apid;[≋] apos;['] apE;[⩰] ape;[≊] ap;[≈].
+				"\x07proxeq;\x03≊\x05acir;\x03⩯\x05prox;\x03≈\x03id;\x03≋\x03os;\x01'\x02E;\x03⩰\x02e;\x03≊\x01;\x03≈",
+				// aring;[å] aring[å].
+				"\x04ing;\x02å\x03ing\x02å",
+				// asympeq;[≍] asymp;[≈] ascr;[𝒶] ast;[*].
+				"\x06ympeq;\x03≍\x04ymp;\x03≈\x03cr;\x04𝒶\x02t;\x01*",
+				// atilde;[ã] atilde[ã].
+				"\x05ilde;\x02ã\x04ilde\x02ã",
+				// auml;[ä] auml[ä].
+				"\x03ml;\x02ä\x02ml\x02ä",
+				// awconint;[∳] awint;[⨑].
+				"\x07conint;\x03∳\x04int;\x03⨑",
+				// bNot;[⫭].
+				"\x03ot;\x03⫭",
+				// backepsilon;[϶] backprime;[‵] backsimeq;[⋍] backcong;[≌] barwedge;[⌅] backsim;[∽] barvee;[⊽] barwed;[⌅].
+				"\x0ackepsilon;\x02϶\x08ckprime;\x03‵\x08cksimeq;\x03⋍\x07ckcong;\x03≌\x07rwedge;\x03⌅\x06cksim;\x03∽\x05rvee;\x03⊽\x05rwed;\x03⌅",
+				// bbrktbrk;[⎶] bbrk;[⎵].
+				"\x07rktbrk;\x03⎶\x03rk;\x03⎵",
+				// bcong;[≌] bcy;[б].
+				"\x04ong;\x03≌\x02y;\x02б",
+				// bdquo;[„].
+				"\x04quo;\x03„",
+				// because;[∵] bemptyv;[⦰] between;[≬] becaus;[∵] bernou;[ℬ] bepsi;[϶] beta;[β] beth;[ℶ].
+				"\x06cause;\x03∵\x06mptyv;\x03⦰\x06tween;\x03≬\x05caus;\x03∵\x05rnou;\x03ℬ\x04psi;\x02϶\x03ta;\x02β\x03th;\x03ℶ",
+				// bfr;[𝔟].
+				"\x02r;\x04𝔟",
+				// bigtriangledown;[▽] bigtriangleup;[△] bigotimes;[⨂] bigoplus;[⨁] bigsqcup;[⨆] biguplus;[⨄] bigwedge;[⋀] bigcirc;[◯] bigodot;[⨀] bigstar;[★] bigcap;[⋂] bigcup;[⋃] bigvee;[⋁].
+				"\x0egtriangledown;\x03▽\x0cgtriangleup;\x03△\x08gotimes;\x03⨂\x07goplus;\x03⨁\x07gsqcup;\x03⨆\x07guplus;\x03⨄\x07gwedge;\x03⋀\x06gcirc;\x03◯\x06godot;\x03⨀\x06gstar;\x03★\x05gcap;\x03⋂\x05gcup;\x03⋃\x05gvee;\x03⋁",
+				// bkarow;[⤍].
+				"\x05arow;\x03⤍",
+				// blacktriangleright;[▸] blacktriangledown;[▾] blacktriangleleft;[◂] blacktriangle;[▴] blacklozenge;[⧫] blacksquare;[▪] blank;[␣] blk12;[▒] blk14;[░] blk34;[▓] block;[█].
+				"\x11acktriangleright;\x03▸\x10acktriangledown;\x03▾\x10acktriangleleft;\x03◂\x0cacktriangle;\x03▴\x0backlozenge;\x03⧫\x0aacksquare;\x03▪\x04ank;\x03␣\x04k12;\x03▒\x04k14;\x03░\x04k34;\x03▓\x04ock;\x03█",
+				// bnequiv;[≡⃥] bnot;[⌐] bne;[=⃥].
+				"\x06equiv;\x06≡⃥\x03ot;\x03⌐\x02e;\x04=⃥",
+				// boxminus;[⊟] boxtimes;[⊠] boxplus;[⊞] bottom;[⊥] bowtie;[⋈] boxbox;[⧉] boxDL;[╗] boxDR;[╔] boxDl;[╖] boxDr;[╓] boxHD;[╦] boxHU;[╩] boxHd;[╤] boxHu;[╧] boxUL;[╝] boxUR;[╚] boxUl;[╜] boxUr;[╙] boxVH;[╬] boxVL;[╣] boxVR;[╠] boxVh;[╫] boxVl;[╢] boxVr;[╟] boxdL;[╕] boxdR;[╒] boxdl;[┐] boxdr;[┌] boxhD;[╥] boxhU;[╨] boxhd;[┬] boxhu;[┴] boxuL;[╛] boxuR;[╘] boxul;[┘] boxur;[└] boxvH;[╪] boxvL;[╡] boxvR;[╞] boxvh;[┼] boxvl;[┤] boxvr;[├] bopf;[𝕓] boxH;[═] boxV;[║] boxh;[─] boxv;[│] bot;[⊥].
+				"\x07xminus;\x03⊟\x07xtimes;\x03⊠\x06xplus;\x03⊞\x05ttom;\x03⊥\x05wtie;\x03⋈\x05xbox;\x03⧉\x04xDL;\x03╗\x04xDR;\x03╔\x04xDl;\x03╖\x04xDr;\x03╓\x04xHD;\x03╦\x04xHU;\x03╩\x04xHd;\x03╤\x04xHu;\x03╧\x04xUL;\x03╝\x04xUR;\x03╚\x04xUl;\x03╜\x04xUr;\x03╙\x04xVH;\x03╬\x04xVL;\x03╣\x04xVR;\x03╠\x04xVh;\x03╫\x04xVl;\x03╢\x04xVr;\x03╟\x04xdL;\x03╕\x04xdR;\x03╒\x04xdl;\x03┐\x04xdr;\x03┌\x04xhD;\x03╥\x04xhU;\x03╨\x04xhd;\x03┬\x04xhu;\x03┴\x04xuL;\x03╛\x04xuR;\x03╘\x04xul;\x03┘\x04xur;\x03└\x04xvH;\x03╪\x04xvL;\x03╡\x04xvR;\x03╞\x04xvh;\x03┼\x04xvl;\x03┤\x04xvr;\x03├\x03pf;\x04𝕓\x03xH;\x03═\x03xV;\x03║\x03xh;\x03─\x03xv;\x03│\x02t;\x03⊥",
+				// bprime;[‵].
+				"\x05rime;\x03‵",
+				// brvbar;[¦] breve;[˘] brvbar[¦].
+				"\x05vbar;\x02¦\x04eve;\x02˘\x04vbar\x02¦",
+				// bsolhsub;[⟈] bsemi;[⁏] bsime;[⋍] bsolb;[⧅] bscr;[𝒷] bsim;[∽] bsol;[\\].
+				"\x07olhsub;\x03⟈\x04emi;\x03⁏\x04ime;\x03⋍\x04olb;\x03⧅\x03cr;\x04𝒷\x03im;\x03∽\x03ol;\x01\\",
+				// bullet;[•] bumpeq;[≏] bumpE;[⪮] bumpe;[≏] bull;[•] bump;[≎].
+				"\x05llet;\x03•\x05mpeq;\x03≏\x04mpE;\x03⪮\x04mpe;\x03≏\x03ll;\x03•\x03mp;\x03≎",
+				// capbrcup;[⩉] cacute;[ć] capand;[⩄] capcap;[⩋] capcup;[⩇] capdot;[⩀] caret;[⁁] caron;[ˇ] caps;[∩︀] cap;[∩].
+				"\x07pbrcup;\x03⩉\x05cute;\x02ć\x05pand;\x03⩄\x05pcap;\x03⩋\x05pcup;\x03⩇\x05pdot;\x03⩀\x04ret;\x03⁁\x04ron;\x02ˇ\x03ps;\x06∩︀\x02p;\x03∩",
+				// ccupssm;[⩐] ccaron;[č] ccedil;[ç] ccaps;[⩍] ccedil[ç] ccirc;[ĉ] ccups;[⩌].
+				"\x06upssm;\x03⩐\x05aron;\x02č\x05edil;\x02ç\x04aps;\x03⩍\x04edil\x02ç\x04irc;\x02ĉ\x04ups;\x03⩌",
+				// cdot;[ċ].
+				"\x03ot;\x02ċ",
+				// centerdot;[·] cemptyv;[⦲] cedil;[¸] cedil[¸] cent;[¢] cent[¢].
+				"\x08nterdot;\x02·\x06mptyv;\x03⦲\x04dil;\x02¸\x03dil\x02¸\x03nt;\x02¢\x02nt\x02¢",
+				// cfr;[𝔠].
+				"\x02r;\x04𝔠",
+				// checkmark;[✓] check;[✓] chcy;[ч] chi;[χ].
+				"\x08eckmark;\x03✓\x04eck;\x03✓\x03cy;\x02ч\x02i;\x02χ",
+				// circlearrowright;[↻] circlearrowleft;[↺] circledcirc;[⊚] circleddash;[⊝] circledast;[⊛] circledR;[®] circledS;[Ⓢ] cirfnint;[⨐] cirscir;[⧂] circeq;[≗] cirmid;[⫯] cirE;[⧃] circ;[ˆ] cire;[≗] cir;[○].
+				"\x0frclearrowright;\x03↻\x0erclearrowleft;\x03↺\x0arcledcirc;\x03⊚\x0arcleddash;\x03⊝\x09rcledast;\x03⊛\x07rcledR;\x02®\x07rcledS;\x03Ⓢ\x07rfnint;\x03⨐\x06rscir;\x03⧂\x05rceq;\x03≗\x05rmid;\x03⫯\x03rE;\x03⧃\x03rc;\x02ˆ\x03re;\x03≗\x02r;\x03○",
+				// clubsuit;[♣] clubs;[♣].
+				"\x07ubsuit;\x03♣\x04ubs;\x03♣",
+				// complement;[∁] complexes;[ℂ] coloneq;[≔] congdot;[⩭] colone;[≔] commat;[@] compfn;[∘] conint;[∮] coprod;[∐] copysr;[℗] colon;[:] comma;[,] comp;[∁] cong;[≅] copf;[𝕔] copy;[©] copy[©].
+				"\x09mplement;\x03∁\x08mplexes;\x03ℂ\x06loneq;\x03≔\x06ngdot;\x03⩭\x05lone;\x03≔\x05mmat;\x01@\x05mpfn;\x03∘\x05nint;\x03∮\x05prod;\x03∐\x05pysr;\x03℗\x04lon;\x01:\x04mma;\x01,\x03mp;\x03∁\x03ng;\x03≅\x03pf;\x04𝕔\x03py;\x02©\x02py\x02©",
+				// crarr;[↵] cross;[✗].
+				"\x04arr;\x03↵\x04oss;\x03✗",
+				// csube;[⫑] csupe;[⫒] cscr;[𝒸] csub;[⫏] csup;[⫐].
+				"\x04ube;\x03⫑\x04upe;\x03⫒\x03cr;\x04𝒸\x03ub;\x03⫏\x03up;\x03⫐",
+				// ctdot;[⋯].
+				"\x04dot;\x03⋯",
+				// curvearrowright;[↷] curvearrowleft;[↶] curlyeqprec;[⋞] curlyeqsucc;[⋟] curlywedge;[⋏] cupbrcap;[⩈] curlyvee;[⋎] cudarrl;[⤸] cudarrr;[⤵] cularrp;[⤽] curarrm;[⤼] cularr;[↶] cupcap;[⩆] cupcup;[⩊] cupdot;[⊍] curarr;[↷] curren;[¤] cuepr;[⋞] cuesc;[⋟] cupor;[⩅] curren[¤] cuvee;[⋎] cuwed;[⋏] cups;[∪︀] cup;[∪].
+				"\x0ervearrowright;\x03↷\x0drvearrowleft;\x03↶\x0arlyeqprec;\x03⋞\x0arlyeqsucc;\x03⋟\x09rlywedge;\x03⋏\x07pbrcap;\x03⩈\x07rlyvee;\x03⋎\x06darrl;\x03⤸\x06darrr;\x03⤵\x06larrp;\x03⤽\x06rarrm;\x03⤼\x05larr;\x03↶\x05pcap;\x03⩆\x05pcup;\x03⩊\x05pdot;\x03⊍\x05rarr;\x03↷\x05rren;\x02¤\x04epr;\x03⋞\x04esc;\x03⋟\x04por;\x03⩅\x04rren\x02¤\x04vee;\x03⋎\x04wed;\x03⋏\x03ps;\x06∪︀\x02p;\x03∪",
+				// cwconint;[∲] cwint;[∱].
+				"\x07conint;\x03∲\x04int;\x03∱",
+				// cylcty;[⌭].
+				"\x05lcty;\x03⌭",
+				// dArr;[⇓].
+				"\x03rr;\x03⇓",
+				// dHar;[⥥].
+				"\x03ar;\x03⥥",
+				// dagger;[†] daleth;[ℸ] dashv;[⊣] darr;[↓] dash;[‐].
+				"\x05gger;\x03†\x05leth;\x03ℸ\x04shv;\x03⊣\x03rr;\x03↓\x03sh;\x03‐",
+				// dbkarow;[⤏] dblac;[˝].
+				"\x06karow;\x03⤏\x04lac;\x02˝",
+				// dcaron;[ď] dcy;[д].
+				"\x05aron;\x02ď\x02y;\x02д",
+				// ddagger;[‡] ddotseq;[⩷] ddarr;[⇊] dd;[ⅆ].
+				"\x06agger;\x03‡\x06otseq;\x03⩷\x04arr;\x03⇊\x01;\x03ⅆ",
+				// demptyv;[⦱] delta;[δ] deg;[°] deg[°].
+				"\x06mptyv;\x03⦱\x04lta;\x02δ\x02g;\x02°\x01g\x02°",
+				// dfisht;[⥿] dfr;[𝔡].
+				"\x05isht;\x03⥿\x02r;\x04𝔡",
+				// dharl;[⇃] dharr;[⇂].
+				"\x04arl;\x03⇃\x04arr;\x03⇂",
+				// divideontimes;[⋇] diamondsuit;[♦] diamond;[⋄] digamma;[ϝ] divide;[÷] divonx;[⋇] diams;[♦] disin;[⋲] divide[÷] diam;[⋄] die;[¨] div;[÷].
+				"\x0cvideontimes;\x03⋇\x0aamondsuit;\x03♦\x06amond;\x03⋄\x06gamma;\x02ϝ\x05vide;\x02÷\x05vonx;\x03⋇\x04ams;\x03♦\x04sin;\x03⋲\x04vide\x02÷\x03am;\x03⋄\x02e;\x02¨\x02v;\x02÷",
+				// djcy;[ђ].
+				"\x03cy;\x02ђ",
+				// dlcorn;[⌞] dlcrop;[⌍].
+				"\x05corn;\x03⌞\x05crop;\x03⌍",
+				// downharpoonright;[⇂] downharpoonleft;[⇃] doublebarwedge;[⌆] downdownarrows;[⇊] dotsquare;[⊡] downarrow;[↓] doteqdot;[≑] dotminus;[∸] dotplus;[∔] dollar;[$] doteq;[≐] dopf;[𝕕] dot;[˙].
+				"\x0fwnharpoonright;\x03⇂\x0ewnharpoonleft;\x03⇃\x0dublebarwedge;\x03⌆\x0dwndownarrows;\x03⇊\x08tsquare;\x03⊡\x08wnarrow;\x03↓\x07teqdot;\x03≑\x07tminus;\x03∸\x06tplus;\x03∔\x05llar;\x01$\x04teq;\x03≐\x03pf;\x04𝕕\x02t;\x02˙",
+				// drbkarow;[⤐] drcorn;[⌟] drcrop;[⌌].
+				"\x07bkarow;\x03⤐\x05corn;\x03⌟\x05crop;\x03⌌",
+				// dstrok;[đ] dscr;[𝒹] dscy;[ѕ] dsol;[⧶].
+				"\x05trok;\x02đ\x03cr;\x04𝒹\x03cy;\x02ѕ\x03ol;\x03⧶",
+				// dtdot;[⋱] dtrif;[▾] dtri;[▿].
+				"\x04dot;\x03⋱\x04rif;\x03▾\x03ri;\x03▿",
+				// duarr;[⇵] duhar;[⥯].
+				"\x04arr;\x03⇵\x04har;\x03⥯",
+				// dwangle;[⦦].
+				"\x06angle;\x03⦦",
+				// dzigrarr;[⟿] dzcy;[џ].
+				"\x07igrarr;\x03⟿\x03cy;\x02џ",
+				// eDDot;[⩷] eDot;[≑].
+				"\x04Dot;\x03⩷\x03ot;\x03≑",
+				// eacute;[é] easter;[⩮] eacute[é].
+				"\x05cute;\x02é\x05ster;\x03⩮\x04cute\x02é",
+				// ecaron;[ě] ecolon;[≕] ecirc;[ê] ecir;[≖] ecirc[ê] ecy;[э].
+				"\x05aron;\x02ě\x05olon;\x03≕\x04irc;\x02ê\x03ir;\x03≖\x03irc\x02ê\x02y;\x02э",
+				// edot;[ė].
+				"\x03ot;\x02ė",
+				// ee;[ⅇ].
+				"\x01;\x03ⅇ",
+				// efDot;[≒] efr;[𝔢].
+				"\x04Dot;\x03≒\x02r;\x04𝔢",
+				// egrave;[è] egsdot;[⪘] egrave[è] egs;[⪖] eg;[⪚].
+				"\x05rave;\x02è\x05sdot;\x03⪘\x04rave\x02è\x02s;\x03⪖\x01;\x03⪚",
+				// elinters;[⏧] elsdot;[⪗] ell;[ℓ] els;[⪕] el;[⪙].
+				"\x07inters;\x03⏧\x05sdot;\x03⪗\x02l;\x03ℓ\x02s;\x03⪕\x01;\x03⪙",
+				// emptyset;[∅] emptyv;[∅] emsp13;[ ] emsp14;[ ] emacr;[ē] empty;[∅] emsp;[ ].
+				"\x07ptyset;\x03∅\x05ptyv;\x03∅\x05sp13;\x03 \x05sp14;\x03 \x04acr;\x02ē\x04pty;\x03∅\x03sp;\x03 ",
+				// ensp;[ ] eng;[ŋ].
+				"\x03sp;\x03 \x02g;\x02ŋ",
+				// eogon;[ę] eopf;[𝕖].
+				"\x04gon;\x02ę\x03pf;\x04𝕖",
+				// epsilon;[ε] eparsl;[⧣] eplus;[⩱] epsiv;[ϵ] epar;[⋕] epsi;[ε].
+				"\x06silon;\x02ε\x05arsl;\x03⧣\x04lus;\x03⩱\x04siv;\x02ϵ\x03ar;\x03⋕\x03si;\x02ε",
+				// eqslantless;[⪕] eqslantgtr;[⪖] eqvparsl;[⧥] eqcolon;[≕] equivDD;[⩸] eqcirc;[≖] equals;[=] equest;[≟] eqsim;[≂] equiv;[≡].
+				"\x0aslantless;\x03⪕\x09slantgtr;\x03⪖\x07vparsl;\x03⧥\x06colon;\x03≕\x06uivDD;\x03⩸\x05circ;\x03≖\x05uals;\x01=\x05uest;\x03≟\x04sim;\x03≂\x04uiv;\x03≡",
+				// erDot;[≓] erarr;[⥱].
+				"\x04Dot;\x03≓\x04arr;\x03⥱",
+				// esdot;[≐] escr;[ℯ] esim;[≂].
+				"\x04dot;\x03≐\x03cr;\x03ℯ\x03im;\x03≂",
+				// eta;[η] eth;[ð] eth[ð].
+				"\x02a;\x02η\x02h;\x02ð\x01h\x02ð",
+				// euml;[ë] euro;[€] euml[ë].
+				"\x03ml;\x02ë\x03ro;\x03€\x02ml\x02ë",
+				// exponentiale;[ⅇ] expectation;[ℰ] exist;[∃] excl;[!].
+				"\x0bponentiale;\x03ⅇ\x0apectation;\x03ℰ\x04ist;\x03∃\x03cl;\x01!",
+				// fallingdotseq;[≒].
+				"\x0cllingdotseq;\x03≒",
+				// fcy;[ф].
+				"\x02y;\x02ф",
+				// female;[♀].
+				"\x05male;\x03♀",
+				// ffilig;[ffi] ffllig;[ffl] fflig;[ff] ffr;[𝔣].
+				"\x05ilig;\x03ffi\x05llig;\x03ffl\x04lig;\x03ff\x02r;\x04𝔣",
+				// filig;[fi].
+				"\x04lig;\x03fi",
+				// fjlig;[fj].
+				"\x04lig;\x02fj",
+				// fllig;[fl] fltns;[▱] flat;[♭].
+				"\x04lig;\x03fl\x04tns;\x03▱\x03at;\x03♭",
+				// fnof;[ƒ].
+				"\x03of;\x02ƒ",
+				// forall;[∀] forkv;[⫙] fopf;[𝕗] fork;[⋔].
+				"\x05rall;\x03∀\x04rkv;\x03⫙\x03pf;\x04𝕗\x03rk;\x03⋔",
+				// fpartint;[⨍].
+				"\x07artint;\x03⨍",
+				// frac12;[½] frac13;[⅓] frac14;[¼] frac15;[⅕] frac16;[⅙] frac18;[⅛] frac23;[⅔] frac25;[⅖] frac34;[¾] frac35;[⅗] frac38;[⅜] frac45;[⅘] frac56;[⅚] frac58;[⅝] frac78;[⅞] frac12[½] frac14[¼] frac34[¾] frasl;[⁄] frown;[⌢].
+				"\x05ac12;\x02½\x05ac13;\x03⅓\x05ac14;\x02¼\x05ac15;\x03⅕\x05ac16;\x03⅙\x05ac18;\x03⅛\x05ac23;\x03⅔\x05ac25;\x03⅖\x05ac34;\x02¾\x05ac35;\x03⅗\x05ac38;\x03⅜\x05ac45;\x03⅘\x05ac56;\x03⅚\x05ac58;\x03⅝\x05ac78;\x03⅞\x04ac12\x02½\x04ac14\x02¼\x04ac34\x02¾\x04asl;\x03⁄\x04own;\x03⌢",
+				// fscr;[𝒻].
+				"\x03cr;\x04𝒻",
+				// gEl;[⪌] gE;[≧].
+				"\x02l;\x03⪌\x01;\x03≧",
+				// gacute;[ǵ] gammad;[ϝ] gamma;[γ] gap;[⪆].
+				"\x05cute;\x02ǵ\x05mmad;\x02ϝ\x04mma;\x02γ\x02p;\x03⪆",
+				// gbreve;[ğ].
+				"\x05reve;\x02ğ",
+				// gcirc;[ĝ] gcy;[г].
+				"\x04irc;\x02ĝ\x02y;\x02г",
+				// gdot;[ġ].
+				"\x03ot;\x02ġ",
+				// geqslant;[⩾] gesdotol;[⪄] gesdoto;[⪂] gesdot;[⪀] gesles;[⪔] gescc;[⪩] geqq;[≧] gesl;[⋛︀] gel;[⋛] geq;[≥] ges;[⩾] ge;[≥].
+				"\x07qslant;\x03⩾\x07sdotol;\x03⪄\x06sdoto;\x03⪂\x05sdot;\x03⪀\x05sles;\x03⪔\x04scc;\x03⪩\x03qq;\x03≧\x03sl;\x06⋛︀\x02l;\x03⋛\x02q;\x03≥\x02s;\x03⩾\x01;\x03≥",
+				// gfr;[𝔤].
+				"\x02r;\x04𝔤",
+				// ggg;[⋙] gg;[≫].
+				"\x02g;\x03⋙\x01;\x03≫",
+				// gimel;[ℷ].
+				"\x04mel;\x03ℷ",
+				// gjcy;[ѓ].
+				"\x03cy;\x02ѓ",
+				// glE;[⪒] gla;[⪥] glj;[⪤] gl;[≷].
+				"\x02E;\x03⪒\x02a;\x03⪥\x02j;\x03⪤\x01;\x03≷",
+				// gnapprox;[⪊] gneqq;[≩] gnsim;[⋧] gnap;[⪊] gneq;[⪈] gnE;[≩] gne;[⪈].
+				"\x07approx;\x03⪊\x04eqq;\x03≩\x04sim;\x03⋧\x03ap;\x03⪊\x03eq;\x03⪈\x02E;\x03≩\x02e;\x03⪈",
+				// gopf;[𝕘].
+				"\x03pf;\x04𝕘",
+				// grave;[`].
+				"\x04ave;\x01`",
+				// gsime;[⪎] gsiml;[⪐] gscr;[ℊ] gsim;[≳].
+				"\x04ime;\x03⪎\x04iml;\x03⪐\x03cr;\x03ℊ\x03im;\x03≳",
+				// gtreqqless;[⪌] gtrapprox;[⪆] gtreqless;[⋛] gtquest;[⩼] gtrless;[≷] gtlPar;[⦕] gtrarr;[⥸] gtrdot;[⋗] gtrsim;[≳] gtcir;[⩺] gtdot;[⋗] gtcc;[⪧] gt;[>].
+				"\x09reqqless;\x03⪌\x08rapprox;\x03⪆\x08reqless;\x03⋛\x06quest;\x03⩼\x06rless;\x03≷\x05lPar;\x03⦕\x05rarr;\x03⥸\x05rdot;\x03⋗\x05rsim;\x03≳\x04cir;\x03⩺\x04dot;\x03⋗\x03cc;\x03⪧\x01;\x01>",
+				// gvertneqq;[≩︀] gvnE;[≩︀].
+				"\x08ertneqq;\x06≩︀\x03nE;\x06≩︀",
+				// hArr;[⇔].
+				"\x03rr;\x03⇔",
+				// harrcir;[⥈] hairsp;[ ] hamilt;[ℋ] hardcy;[ъ] harrw;[↭] half;[½] harr;[↔].
+				"\x06rrcir;\x03⥈\x05irsp;\x03 \x05milt;\x03ℋ\x05rdcy;\x02ъ\x04rrw;\x03↭\x03lf;\x02½\x03rr;\x03↔",
+				// hbar;[ℏ].
+				"\x03ar;\x03ℏ",
+				// hcirc;[ĥ].
+				"\x04irc;\x02ĥ",
+				// heartsuit;[♥] hearts;[♥] hellip;[…] hercon;[⊹].
+				"\x08artsuit;\x03♥\x05arts;\x03♥\x05llip;\x03…\x05rcon;\x03⊹",
+				// hfr;[𝔥].
+				"\x02r;\x04𝔥",
+				// hksearow;[⤥] hkswarow;[⤦].
+				"\x07searow;\x03⤥\x07swarow;\x03⤦",
+				// hookrightarrow;[↪] hookleftarrow;[↩] homtht;[∻] horbar;[―] hoarr;[⇿] hopf;[𝕙].
+				"\x0dokrightarrow;\x03↪\x0cokleftarrow;\x03↩\x05mtht;\x03∻\x05rbar;\x03―\x04arr;\x03⇿\x03pf;\x04𝕙",
+				// hslash;[ℏ] hstrok;[ħ] hscr;[𝒽].
+				"\x05lash;\x03ℏ\x05trok;\x02ħ\x03cr;\x04𝒽",
+				// hybull;[⁃] hyphen;[‐].
+				"\x05bull;\x03⁃\x05phen;\x03‐",
+				// iacute;[í] iacute[í].
+				"\x05cute;\x02í\x04cute\x02í",
+				// icirc;[î] icirc[î] icy;[и] ic;[⁣].
+				"\x04irc;\x02î\x03irc\x02î\x02y;\x02и\x01;\x03⁣",
+				// iexcl;[¡] iecy;[е] iexcl[¡].
+				"\x04xcl;\x02¡\x03cy;\x02е\x03xcl\x02¡",
+				// iff;[⇔] ifr;[𝔦].
+				"\x02f;\x03⇔\x02r;\x04𝔦",
+				// igrave;[ì] igrave[ì].
+				"\x05rave;\x02ì\x04rave\x02ì",
+				// iiiint;[⨌] iinfin;[⧜] iiint;[∭] iiota;[℩] ii;[ⅈ].
+				"\x05iint;\x03⨌\x05nfin;\x03⧜\x04int;\x03∭\x04ota;\x03℩\x01;\x03ⅈ",
+				// ijlig;[ij].
+				"\x04lig;\x02ij",
+				// imagline;[ℐ] imagpart;[ℑ] imacr;[ī] image;[ℑ] imath;[ı] imped;[Ƶ] imof;[⊷].
+				"\x07agline;\x03ℐ\x07agpart;\x03ℑ\x04acr;\x02ī\x04age;\x03ℑ\x04ath;\x02ı\x04ped;\x02Ƶ\x03of;\x03⊷",
+				// infintie;[⧝] integers;[ℤ] intercal;[⊺] intlarhk;[⨗] intprod;[⨼] incare;[℅] inodot;[ı] intcal;[⊺] infin;[∞] int;[∫] in;[∈].
+				"\x07fintie;\x03⧝\x07tegers;\x03ℤ\x07tercal;\x03⊺\x07tlarhk;\x03⨗\x06tprod;\x03⨼\x05care;\x03℅\x05odot;\x02ı\x05tcal;\x03⊺\x04fin;\x03∞\x02t;\x03∫\x01;\x03∈",
+				// iogon;[į] iocy;[ё] iopf;[𝕚] iota;[ι].
+				"\x04gon;\x02į\x03cy;\x02ё\x03pf;\x04𝕚\x03ta;\x02ι",
+				// iprod;[⨼].
+				"\x04rod;\x03⨼",
+				// iquest;[¿] iquest[¿].
+				"\x05uest;\x02¿\x04uest\x02¿",
+				// isindot;[⋵] isinsv;[⋳] isinE;[⋹] isins;[⋴] isinv;[∈] iscr;[𝒾] isin;[∈].
+				"\x06indot;\x03⋵\x05insv;\x03⋳\x04inE;\x03⋹\x04ins;\x03⋴\x04inv;\x03∈\x03cr;\x04𝒾\x03in;\x03∈",
+				// itilde;[ĩ] it;[⁢].
+				"\x05ilde;\x02ĩ\x01;\x03⁢",
+				// iukcy;[і] iuml;[ï] iuml[ï].
+				"\x04kcy;\x02і\x03ml;\x02ï\x02ml\x02ï",
+				// jcirc;[ĵ] jcy;[й].
+				"\x04irc;\x02ĵ\x02y;\x02й",
+				// jfr;[𝔧].
+				"\x02r;\x04𝔧",
+				// jmath;[ȷ].
+				"\x04ath;\x02ȷ",
+				// jopf;[𝕛].
+				"\x03pf;\x04𝕛",
+				// jsercy;[ј] jscr;[𝒿].
+				"\x05ercy;\x02ј\x03cr;\x04𝒿",
+				// jukcy;[є].
+				"\x04kcy;\x02є",
+				// kappav;[ϰ] kappa;[κ].
+				"\x05ppav;\x02ϰ\x04ppa;\x02κ",
+				// kcedil;[ķ] kcy;[к].
+				"\x05edil;\x02ķ\x02y;\x02к",
+				// kfr;[𝔨].
+				"\x02r;\x04𝔨",
+				// kgreen;[ĸ].
+				"\x05reen;\x02ĸ",
+				// khcy;[х].
+				"\x03cy;\x02х",
+				// kjcy;[ќ].
+				"\x03cy;\x02ќ",
+				// kopf;[𝕜].
+				"\x03pf;\x04𝕜",
+				// kscr;[𝓀].
+				"\x03cr;\x04𝓀",
+				// lAtail;[⤛] lAarr;[⇚] lArr;[⇐].
+				"\x05tail;\x03⤛\x04arr;\x03⇚\x03rr;\x03⇐",
+				// lBarr;[⤎].
+				"\x04arr;\x03⤎",
+				// lEg;[⪋] lE;[≦].
+				"\x02g;\x03⪋\x01;\x03≦",
+				// lHar;[⥢].
+				"\x03ar;\x03⥢",
+				// laemptyv;[⦴] larrbfs;[⤟] larrsim;[⥳] lacute;[ĺ] lagran;[ℒ] lambda;[λ] langle;[⟨] larrfs;[⤝] larrhk;[↩] larrlp;[↫] larrpl;[⤹] larrtl;[↢] latail;[⤙] langd;[⦑] laquo;[«] larrb;[⇤] lates;[⪭︀] lang;[⟨] laquo[«] larr;[←] late;[⪭] lap;[⪅] lat;[⪫].
+				"\x07emptyv;\x03⦴\x06rrbfs;\x03⤟\x06rrsim;\x03⥳\x05cute;\x02ĺ\x05gran;\x03ℒ\x05mbda;\x02λ\x05ngle;\x03⟨\x05rrfs;\x03⤝\x05rrhk;\x03↩\x05rrlp;\x03↫\x05rrpl;\x03⤹\x05rrtl;\x03↢\x05tail;\x03⤙\x04ngd;\x03⦑\x04quo;\x02«\x04rrb;\x03⇤\x04tes;\x06⪭︀\x03ng;\x03⟨\x03quo\x02«\x03rr;\x03←\x03te;\x03⪭\x02p;\x03⪅\x02t;\x03⪫",
+				// lbrksld;[⦏] lbrkslu;[⦍] lbrace;[{] lbrack;[[] lbarr;[⤌] lbbrk;[❲] lbrke;[⦋].
+				"\x06rksld;\x03⦏\x06rkslu;\x03⦍\x05race;\x01{\x05rack;\x01[\x04arr;\x03⤌\x04brk;\x03❲\x04rke;\x03⦋",
+				// lcaron;[ľ] lcedil;[ļ] lceil;[⌈] lcub;[{] lcy;[л].
+				"\x05aron;\x02ľ\x05edil;\x02ļ\x04eil;\x03⌈\x03ub;\x01{\x02y;\x02л",
+				// ldrushar;[⥋] ldrdhar;[⥧] ldquor;[„] ldquo;[“] ldca;[⤶] ldsh;[↲].
+				"\x07rushar;\x03⥋\x06rdhar;\x03⥧\x05quor;\x03„\x04quo;\x03“\x03ca;\x03⤶\x03sh;\x03↲",
+				// leftrightsquigarrow;[↭] leftrightharpoons;[⇋] leftharpoondown;[↽] leftrightarrows;[⇆] leftleftarrows;[⇇] leftrightarrow;[↔] leftthreetimes;[⋋] leftarrowtail;[↢] leftharpoonup;[↼] lessapprox;[⪅] lesseqqgtr;[⪋] leftarrow;[←] lesseqgtr;[⋚] leqslant;[⩽] lesdotor;[⪃] lesdoto;[⪁] lessdot;[⋖] lessgtr;[≶] lesssim;[≲] lesdot;[⩿] lesges;[⪓] lescc;[⪨] leqq;[≦] lesg;[⋚︀] leg;[⋚] leq;[≤] les;[⩽] le;[≤].
+				"\x12ftrightsquigarrow;\x03↭\x10ftrightharpoons;\x03⇋\x0eftharpoondown;\x03↽\x0eftrightarrows;\x03⇆\x0dftleftarrows;\x03⇇\x0dftrightarrow;\x03↔\x0dftthreetimes;\x03⋋\x0cftarrowtail;\x03↢\x0cftharpoonup;\x03↼\x09ssapprox;\x03⪅\x09sseqqgtr;\x03⪋\x08ftarrow;\x03←\x08sseqgtr;\x03⋚\x07qslant;\x03⩽\x07sdotor;\x03⪃\x06sdoto;\x03⪁\x06ssdot;\x03⋖\x06ssgtr;\x03≶\x06sssim;\x03≲\x05sdot;\x03⩿\x05sges;\x03⪓\x04scc;\x03⪨\x03qq;\x03≦\x03sg;\x06⋚︀\x02g;\x03⋚\x02q;\x03≤\x02s;\x03⩽\x01;\x03≤",
+				// lfisht;[⥼] lfloor;[⌊] lfr;[𝔩].
+				"\x05isht;\x03⥼\x05loor;\x03⌊\x02r;\x04𝔩",
+				// lgE;[⪑] lg;[≶].
+				"\x02E;\x03⪑\x01;\x03≶",
+				// lharul;[⥪] lhard;[↽] lharu;[↼] lhblk;[▄].
+				"\x05arul;\x03⥪\x04ard;\x03↽\x04aru;\x03↼\x04blk;\x03▄",
+				// ljcy;[љ].
+				"\x03cy;\x02љ",
+				// llcorner;[⌞] llhard;[⥫] llarr;[⇇] lltri;[◺] ll;[≪].
+				"\x07corner;\x03⌞\x05hard;\x03⥫\x04arr;\x03⇇\x04tri;\x03◺\x01;\x03≪",
+				// lmoustache;[⎰] lmidot;[ŀ] lmoust;[⎰].
+				"\x09oustache;\x03⎰\x05idot;\x02ŀ\x05oust;\x03⎰",
+				// lnapprox;[⪉] lneqq;[≨] lnsim;[⋦] lnap;[⪉] lneq;[⪇] lnE;[≨] lne;[⪇].
+				"\x07approx;\x03⪉\x04eqq;\x03≨\x04sim;\x03⋦\x03ap;\x03⪉\x03eq;\x03⪇\x02E;\x03≨\x02e;\x03⪇",
+				// longleftrightarrow;[⟷] longrightarrow;[⟶] looparrowright;[↬] longleftarrow;[⟵] looparrowleft;[↫] longmapsto;[⟼] lotimes;[⨴] lozenge;[◊] loplus;[⨭] lowast;[∗] lowbar;[_] loang;[⟬] loarr;[⇽] lobrk;[⟦] lopar;[⦅] lopf;[𝕝] lozf;[⧫] loz;[◊].
+				"\x11ngleftrightarrow;\x03⟷\x0dngrightarrow;\x03⟶\x0doparrowright;\x03↬\x0cngleftarrow;\x03⟵\x0coparrowleft;\x03↫\x09ngmapsto;\x03⟼\x06times;\x03⨴\x06zenge;\x03◊\x05plus;\x03⨭\x05wast;\x03∗\x05wbar;\x01_\x04ang;\x03⟬\x04arr;\x03⇽\x04brk;\x03⟦\x04par;\x03⦅\x03pf;\x04𝕝\x03zf;\x03⧫\x02z;\x03◊",
+				// lparlt;[⦓] lpar;[(].
+				"\x05arlt;\x03⦓\x03ar;\x01(",
+				// lrcorner;[⌟] lrhard;[⥭] lrarr;[⇆] lrhar;[⇋] lrtri;[⊿] lrm;[‎].
+				"\x07corner;\x03⌟\x05hard;\x03⥭\x04arr;\x03⇆\x04har;\x03⇋\x04tri;\x03⊿\x02m;\x03‎",
+				// lsaquo;[‹] lsquor;[‚] lstrok;[ł] lsime;[⪍] lsimg;[⪏] lsquo;[‘] lscr;[𝓁] lsim;[≲] lsqb;[[] lsh;[↰].
+				"\x05aquo;\x03‹\x05quor;\x03‚\x05trok;\x02ł\x04ime;\x03⪍\x04img;\x03⪏\x04quo;\x03‘\x03cr;\x04𝓁\x03im;\x03≲\x03qb;\x01[\x02h;\x03↰",
+				// ltquest;[⩻] lthree;[⋋] ltimes;[⋉] ltlarr;[⥶] ltrPar;[⦖] ltcir;[⩹] ltdot;[⋖] ltrie;[⊴] ltrif;[◂] ltcc;[⪦] ltri;[◃] lt;[<].
+				"\x06quest;\x03⩻\x05hree;\x03⋋\x05imes;\x03⋉\x05larr;\x03⥶\x05rPar;\x03⦖\x04cir;\x03⩹\x04dot;\x03⋖\x04rie;\x03⊴\x04rif;\x03◂\x03cc;\x03⪦\x03ri;\x03◃\x01;\x01<",
+				// lurdshar;[⥊] luruhar;[⥦].
+				"\x07rdshar;\x03⥊\x06ruhar;\x03⥦",
+				// lvertneqq;[≨︀] lvnE;[≨︀].
+				"\x08ertneqq;\x06≨︀\x03nE;\x06≨︀",
+				// mDDot;[∺].
+				"\x04Dot;\x03∺",
+				// mapstodown;[↧] mapstoleft;[↤] mapstoup;[↥] maltese;[✠] mapsto;[↦] marker;[▮] macr;[¯] male;[♂] malt;[✠] macr[¯] map;[↦].
+				"\x09pstodown;\x03↧\x09pstoleft;\x03↤\x07pstoup;\x03↥\x06ltese;\x03✠\x05psto;\x03↦\x05rker;\x03▮\x03cr;\x02¯\x03le;\x03♂\x03lt;\x03✠\x02cr\x02¯\x02p;\x03↦",
+				// mcomma;[⨩] mcy;[м].
+				"\x05omma;\x03⨩\x02y;\x02м",
+				// mdash;[—].
+				"\x04ash;\x03—",
+				// measuredangle;[∡].
+				"\x0casuredangle;\x03∡",
+				// mfr;[𝔪].
+				"\x02r;\x04𝔪",
+				// mho;[℧].
+				"\x02o;\x03℧",
+				// minusdu;[⨪] midast;[*] midcir;[⫰] middot;[·] minusb;[⊟] minusd;[∸] micro;[µ] middot[·] minus;[−] micro[µ] mid;[∣].
+				"\x06nusdu;\x03⨪\x05dast;\x01*\x05dcir;\x03⫰\x05ddot;\x02·\x05nusb;\x03⊟\x05nusd;\x03∸\x04cro;\x02µ\x04ddot\x02·\x04nus;\x03−\x03cro\x02µ\x02d;\x03∣",
+				// mlcp;[⫛] mldr;[…].
+				"\x03cp;\x03⫛\x03dr;\x03…",
+				// mnplus;[∓].
+				"\x05plus;\x03∓",
+				// models;[⊧] mopf;[𝕞].
+				"\x05dels;\x03⊧\x03pf;\x04𝕞",
+				// mp;[∓].
+				"\x01;\x03∓",
+				// mstpos;[∾] mscr;[𝓂].
+				"\x05tpos;\x03∾\x03cr;\x04𝓂",
+				// multimap;[⊸] mumap;[⊸] mu;[μ].
+				"\x07ltimap;\x03⊸\x04map;\x03⊸\x01;\x02μ",
+				// nGtv;[≫̸] nGg;[⋙̸] nGt;[≫⃒].
+				"\x03tv;\x05≫̸\x02g;\x05⋙̸\x02t;\x06≫⃒",
+				// nLeftrightarrow;[⇎] nLeftarrow;[⇍] nLtv;[≪̸] nLl;[⋘̸] nLt;[≪⃒].
+				"\x0eeftrightarrow;\x03⇎\x09eftarrow;\x03⇍\x03tv;\x05≪̸\x02l;\x05⋘̸\x02t;\x06≪⃒",
+				// nRightarrow;[⇏].
+				"\x0aightarrow;\x03⇏",
+				// nVDash;[⊯] nVdash;[⊮].
+				"\x05Dash;\x03⊯\x05dash;\x03⊮",
+				// naturals;[ℕ] napprox;[≉] natural;[♮] nacute;[ń] nabla;[∇] napid;[≋̸] napos;[ʼn] natur;[♮] nang;[∠⃒] napE;[⩰̸] nap;[≉].
+				"\x07turals;\x03ℕ\x06pprox;\x03≉\x06tural;\x03♮\x05cute;\x02ń\x04bla;\x03∇\x04pid;\x05≋̸\x04pos;\x02ʼn\x04tur;\x03♮\x03ng;\x06∠⃒\x03pE;\x05⩰̸\x02p;\x03≉",
+				// nbumpe;[≏̸] nbump;[≎̸] nbsp;[ ] nbsp[ ].
+				"\x05umpe;\x05≏̸\x04ump;\x05≎̸\x03sp;\x02 \x02sp\x02 ",
+				// ncongdot;[⩭̸] ncaron;[ň] ncedil;[ņ] ncong;[≇] ncap;[⩃] ncup;[⩂] ncy;[н].
+				"\x07ongdot;\x05⩭̸\x05aron;\x02ň\x05edil;\x02ņ\x04ong;\x03≇\x03ap;\x03⩃\x03up;\x03⩂\x02y;\x02н",
+				// ndash;[–].
+				"\x04ash;\x03–",
+				// nearrow;[↗] nexists;[∄] nearhk;[⤤] nequiv;[≢] nesear;[⤨] nexist;[∄] neArr;[⇗] nearr;[↗] nedot;[≐̸] nesim;[≂̸] ne;[≠].
+				"\x06arrow;\x03↗\x06xists;\x03∄\x05arhk;\x03⤤\x05quiv;\x03≢\x05sear;\x03⤨\x05xist;\x03∄\x04Arr;\x03⇗\x04arr;\x03↗\x04dot;\x05≐̸\x04sim;\x05≂̸\x01;\x03≠",
+				// nfr;[𝔫].
+				"\x02r;\x04𝔫",
+				// ngeqslant;[⩾̸] ngeqq;[≧̸] ngsim;[≵] ngeq;[≱] nges;[⩾̸] ngtr;[≯] ngE;[≧̸] nge;[≱] ngt;[≯].
+				"\x08eqslant;\x05⩾̸\x04eqq;\x05≧̸\x04sim;\x03≵\x03eq;\x03≱\x03es;\x05⩾̸\x03tr;\x03≯\x02E;\x05≧̸\x02e;\x03≱\x02t;\x03≯",
+				// nhArr;[⇎] nharr;[↮] nhpar;[⫲].
+				"\x04Arr;\x03⇎\x04arr;\x03↮\x04par;\x03⫲",
+				// nisd;[⋺] nis;[⋼] niv;[∋] ni;[∋].
+				"\x03sd;\x03⋺\x02s;\x03⋼\x02v;\x03∋\x01;\x03∋",
+				// njcy;[њ].
+				"\x03cy;\x02њ",
+				// nleftrightarrow;[↮] nleftarrow;[↚] nleqslant;[⩽̸] nltrie;[⋬] nlArr;[⇍] nlarr;[↚] nleqq;[≦̸] nless;[≮] nlsim;[≴] nltri;[⋪] nldr;[‥] nleq;[≰] nles;[⩽̸] nlE;[≦̸] nle;[≰] nlt;[≮].
+				"\x0eeftrightarrow;\x03↮\x09eftarrow;\x03↚\x08eqslant;\x05⩽̸\x05trie;\x03⋬\x04Arr;\x03⇍\x04arr;\x03↚\x04eqq;\x05≦̸\x04ess;\x03≮\x04sim;\x03≴\x04tri;\x03⋪\x03dr;\x03‥\x03eq;\x03≰\x03es;\x05⩽̸\x02E;\x05≦̸\x02e;\x03≰\x02t;\x03≮",
+				// nmid;[∤].
+				"\x03id;\x03∤",
+				// notindot;[⋵̸] notinva;[∉] notinvb;[⋷] notinvc;[⋶] notniva;[∌] notnivb;[⋾] notnivc;[⋽] notinE;[⋹̸] notin;[∉] notni;[∌] nopf;[𝕟] not;[¬] not[¬].
+				"\x07tindot;\x05⋵̸\x06tinva;\x03∉\x06tinvb;\x03⋷\x06tinvc;\x03⋶\x06tniva;\x03∌\x06tnivb;\x03⋾\x06tnivc;\x03⋽\x05tinE;\x05⋹̸\x04tin;\x03∉\x04tni;\x03∌\x03pf;\x04𝕟\x02t;\x02¬\x01t\x02¬",
+				// nparallel;[∦] npolint;[⨔] npreceq;[⪯̸] nparsl;[⫽⃥] nprcue;[⋠] npart;[∂̸] nprec;[⊀] npar;[∦] npre;[⪯̸] npr;[⊀].
+				"\x08arallel;\x03∦\x06olint;\x03⨔\x06receq;\x05⪯̸\x05arsl;\x06⫽⃥\x05rcue;\x03⋠\x04art;\x05∂̸\x04rec;\x03⊀\x03ar;\x03∦\x03re;\x05⪯̸\x02r;\x03⊀",
+				// nrightarrow;[↛] nrarrc;[⤳̸] nrarrw;[↝̸] nrtrie;[⋭] nrArr;[⇏] nrarr;[↛] nrtri;[⋫].
+				"\x0aightarrow;\x03↛\x05arrc;\x05⤳̸\x05arrw;\x05↝̸\x05trie;\x03⋭\x04Arr;\x03⇏\x04arr;\x03↛\x04tri;\x03⋫",
+				// nshortparallel;[∦] nsubseteqq;[⫅̸] nsupseteqq;[⫆̸] nshortmid;[∤] nsubseteq;[⊈] nsupseteq;[⊉] nsqsube;[⋢] nsqsupe;[⋣] nsubset;[⊂⃒] nsucceq;[⪰̸] nsupset;[⊃⃒] nsccue;[⋡] nsimeq;[≄] nsime;[≄] nsmid;[∤] nspar;[∦] nsubE;[⫅̸] nsube;[⊈] nsucc;[⊁] nsupE;[⫆̸] nsupe;[⊉] nsce;[⪰̸] nscr;[𝓃] nsim;[≁] nsub;[⊄] nsup;[⊅] nsc;[⊁].
+				"\x0dhortparallel;\x03∦\x09ubseteqq;\x05⫅̸\x09upseteqq;\x05⫆̸\x08hortmid;\x03∤\x08ubseteq;\x03⊈\x08upseteq;\x03⊉\x06qsube;\x03⋢\x06qsupe;\x03⋣\x06ubset;\x06⊂⃒\x06ucceq;\x05⪰̸\x06upset;\x06⊃⃒\x05ccue;\x03⋡\x05imeq;\x03≄\x04ime;\x03≄\x04mid;\x03∤\x04par;\x03∦\x04ubE;\x05⫅̸\x04ube;\x03⊈\x04ucc;\x03⊁\x04upE;\x05⫆̸\x04upe;\x03⊉\x03ce;\x05⪰̸\x03cr;\x04𝓃\x03im;\x03≁\x03ub;\x03⊄\x03up;\x03⊅\x02c;\x03⊁",
+				// ntrianglerighteq;[⋭] ntrianglelefteq;[⋬] ntriangleright;[⋫] ntriangleleft;[⋪] ntilde;[ñ] ntilde[ñ] ntgl;[≹] ntlg;[≸].
+				"\x0frianglerighteq;\x03⋭\x0erianglelefteq;\x03⋬\x0driangleright;\x03⋫\x0criangleleft;\x03⋪\x05ilde;\x02ñ\x04ilde\x02ñ\x03gl;\x03≹\x03lg;\x03≸",
+				// numero;[№] numsp;[ ] num;[#] nu;[ν].
+				"\x05mero;\x03№\x04msp;\x03 \x02m;\x01#\x01;\x02ν",
+				// nvinfin;[⧞] nvltrie;[⊴⃒] nvrtrie;[⊵⃒] nvDash;[⊭] nvHarr;[⤄] nvdash;[⊬] nvlArr;[⤂] nvrArr;[⤃] nvsim;[∼⃒] nvap;[≍⃒] nvge;[≥⃒] nvgt;[>⃒] nvle;[≤⃒] nvlt;[<⃒].
+				"\x06infin;\x03⧞\x06ltrie;\x06⊴⃒\x06rtrie;\x06⊵⃒\x05Dash;\x03⊭\x05Harr;\x03⤄\x05dash;\x03⊬\x05lArr;\x03⤂\x05rArr;\x03⤃\x04sim;\x06∼⃒\x03ap;\x06≍⃒\x03ge;\x06≥⃒\x03gt;\x04>⃒\x03le;\x06≤⃒\x03lt;\x04<⃒",
+				// nwarrow;[↖] nwarhk;[⤣] nwnear;[⤧] nwArr;[⇖] nwarr;[↖].
+				"\x06arrow;\x03↖\x05arhk;\x03⤣\x05near;\x03⤧\x04Arr;\x03⇖\x04arr;\x03↖",
+				// oS;[Ⓢ].
+				"\x01;\x03Ⓢ",
+				// oacute;[ó] oacute[ó] oast;[⊛].
+				"\x05cute;\x02ó\x04cute\x02ó\x03st;\x03⊛",
+				// ocirc;[ô] ocir;[⊚] ocirc[ô] ocy;[о].
+				"\x04irc;\x02ô\x03ir;\x03⊚\x03irc\x02ô\x02y;\x02о",
+				// odblac;[ő] odsold;[⦼] odash;[⊝] odiv;[⨸] odot;[⊙].
+				"\x05blac;\x02ő\x05sold;\x03⦼\x04ash;\x03⊝\x03iv;\x03⨸\x03ot;\x03⊙",
+				// oelig;[œ].
+				"\x04lig;\x02œ",
+				// ofcir;[⦿] ofr;[𝔬].
+				"\x04cir;\x03⦿\x02r;\x04𝔬",
+				// ograve;[ò] ograve[ò] ogon;[˛] ogt;[⧁].
+				"\x05rave;\x02ò\x04rave\x02ò\x03on;\x02˛\x02t;\x03⧁",
+				// ohbar;[⦵] ohm;[Ω].
+				"\x04bar;\x03⦵\x02m;\x02Ω",
+				// oint;[∮].
+				"\x03nt;\x03∮",
+				// olcross;[⦻] olarr;[↺] olcir;[⦾] oline;[‾] olt;[⧀].
+				"\x06cross;\x03⦻\x04arr;\x03↺\x04cir;\x03⦾\x04ine;\x03‾\x02t;\x03⧀",
+				// omicron;[ο] ominus;[⊖] omacr;[ō] omega;[ω] omid;[⦶].
+				"\x06icron;\x02ο\x05inus;\x03⊖\x04acr;\x02ō\x04ega;\x02ω\x03id;\x03⦶",
+				// oopf;[𝕠].
+				"\x03pf;\x04𝕠",
+				// operp;[⦹] oplus;[⊕] opar;[⦷].
+				"\x04erp;\x03⦹\x04lus;\x03⊕\x03ar;\x03⦷",
+				// orderof;[ℴ] orslope;[⩗] origof;[⊶] orarr;[↻] order;[ℴ] ordf;[ª] ordm;[º] oror;[⩖] ord;[⩝] ordf[ª] ordm[º] orv;[⩛] or;[∨].
+				"\x06derof;\x03ℴ\x06slope;\x03⩗\x05igof;\x03⊶\x04arr;\x03↻\x04der;\x03ℴ\x03df;\x02ª\x03dm;\x02º\x03or;\x03⩖\x02d;\x03⩝\x02df\x02ª\x02dm\x02º\x02v;\x03⩛\x01;\x03∨",
+				// oslash;[ø] oslash[ø] oscr;[ℴ] osol;[⊘].
+				"\x05lash;\x02ø\x04lash\x02ø\x03cr;\x03ℴ\x03ol;\x03⊘",
+				// otimesas;[⨶] otilde;[õ] otimes;[⊗] otilde[õ].
+				"\x07imesas;\x03⨶\x05ilde;\x02õ\x05imes;\x03⊗\x04ilde\x02õ",
+				// ouml;[ö] ouml[ö].
+				"\x03ml;\x02ö\x02ml\x02ö",
+				// ovbar;[⌽].
+				"\x04bar;\x03⌽",
+				// parallel;[∥] parsim;[⫳] parsl;[⫽] para;[¶] part;[∂] par;[∥] para[¶].
+				"\x07rallel;\x03∥\x05rsim;\x03⫳\x04rsl;\x03⫽\x03ra;\x02¶\x03rt;\x03∂\x02r;\x03∥\x02ra\x02¶",
+				// pcy;[п].
+				"\x02y;\x02п",
+				// pertenk;[‱] percnt;[%] period;[.] permil;[‰] perp;[⊥].
+				"\x06rtenk;\x03‱\x05rcnt;\x01%\x05riod;\x01.\x05rmil;\x03‰\x03rp;\x03⊥",
+				// pfr;[𝔭].
+				"\x02r;\x04𝔭",
+				// phmmat;[ℳ] phone;[☎] phiv;[ϕ] phi;[φ].
+				"\x05mmat;\x03ℳ\x04one;\x03☎\x03iv;\x02ϕ\x02i;\x02φ",
+				// pitchfork;[⋔] piv;[ϖ] pi;[π].
+				"\x08tchfork;\x03⋔\x02v;\x02ϖ\x01;\x02π",
+				// plusacir;[⨣] planckh;[ℎ] pluscir;[⨢] plussim;[⨦] plustwo;[⨧] planck;[ℏ] plankv;[ℏ] plusdo;[∔] plusdu;[⨥] plusmn;[±] plusb;[⊞] pluse;[⩲] plusmn[±] plus;[+].
+				"\x07usacir;\x03⨣\x06anckh;\x03ℎ\x06uscir;\x03⨢\x06ussim;\x03⨦\x06ustwo;\x03⨧\x05anck;\x03ℏ\x05ankv;\x03ℏ\x05usdo;\x03∔\x05usdu;\x03⨥\x05usmn;\x02±\x04usb;\x03⊞\x04use;\x03⩲\x04usmn\x02±\x03us;\x01+",
+				// pm;[±].
+				"\x01;\x02±",
+				// pointint;[⨕] pound;[£] popf;[𝕡] pound[£].
+				"\x07intint;\x03⨕\x04und;\x02£\x03pf;\x04𝕡\x03und\x02£",
+				// preccurlyeq;[≼] precnapprox;[⪹] precapprox;[⪷] precneqq;[⪵] precnsim;[⋨] profalar;[⌮] profline;[⌒] profsurf;[⌓] precsim;[≾] preceq;[⪯] primes;[ℙ] prnsim;[⋨] propto;[∝] prurel;[⊰] prcue;[≼] prime;[′] prnap;[⪹] prsim;[≾] prap;[⪷] prec;[≺] prnE;[⪵] prod;[∏] prop;[∝] prE;[⪳] pre;[⪯] pr;[≺].
+				"\x0aeccurlyeq;\x03≼\x0aecnapprox;\x03⪹\x09ecapprox;\x03⪷\x07ecneqq;\x03⪵\x07ecnsim;\x03⋨\x07ofalar;\x03⌮\x07ofline;\x03⌒\x07ofsurf;\x03⌓\x06ecsim;\x03≾\x05eceq;\x03⪯\x05imes;\x03ℙ\x05nsim;\x03⋨\x05opto;\x03∝\x05urel;\x03⊰\x04cue;\x03≼\x04ime;\x03′\x04nap;\x03⪹\x04sim;\x03≾\x03ap;\x03⪷\x03ec;\x03≺\x03nE;\x03⪵\x03od;\x03∏\x03op;\x03∝\x02E;\x03⪳\x02e;\x03⪯\x01;\x03≺",
+				// pscr;[𝓅] psi;[ψ].
+				"\x03cr;\x04𝓅\x02i;\x02ψ",
+				// puncsp;[ ].
+				"\x05ncsp;\x03 ",
+				// qfr;[𝔮].
+				"\x02r;\x04𝔮",
+				// qint;[⨌].
+				"\x03nt;\x03⨌",
+				// qopf;[𝕢].
+				"\x03pf;\x04𝕢",
+				// qprime;[⁗].
+				"\x05rime;\x03⁗",
+				// qscr;[𝓆].
+				"\x03cr;\x04𝓆",
+				// quaternions;[ℍ] quatint;[⨖] questeq;[≟] quest;[?] quot;[\"] quot[\"].
+				"\x0aaternions;\x03ℍ\x06atint;\x03⨖\x06esteq;\x03≟\x04est;\x01?\x03ot;\x01\"\x02ot\x01\"",
+				// rAtail;[⤜] rAarr;[⇛] rArr;[⇒].
+				"\x05tail;\x03⤜\x04arr;\x03⇛\x03rr;\x03⇒",
+				// rBarr;[⤏].
+				"\x04arr;\x03⤏",
+				// rHar;[⥤].
+				"\x03ar;\x03⥤",
+				// rationals;[ℚ] raemptyv;[⦳] rarrbfs;[⤠] rarrsim;[⥴] racute;[ŕ] rangle;[⟩] rarrap;[⥵] rarrfs;[⤞] rarrhk;[↪] rarrlp;[↬] rarrpl;[⥅] rarrtl;[↣] ratail;[⤚] radic;[√] rangd;[⦒] range;[⦥] raquo;[»] rarrb;[⇥] rarrc;[⤳] rarrw;[↝] ratio;[∶] race;[∽̱] rang;[⟩] raquo[»] rarr;[→].
+				"\x08tionals;\x03ℚ\x07emptyv;\x03⦳\x06rrbfs;\x03⤠\x06rrsim;\x03⥴\x05cute;\x02ŕ\x05ngle;\x03⟩\x05rrap;\x03⥵\x05rrfs;\x03⤞\x05rrhk;\x03↪\x05rrlp;\x03↬\x05rrpl;\x03⥅\x05rrtl;\x03↣\x05tail;\x03⤚\x04dic;\x03√\x04ngd;\x03⦒\x04nge;\x03⦥\x04quo;\x02»\x04rrb;\x03⇥\x04rrc;\x03⤳\x04rrw;\x03↝\x04tio;\x03∶\x03ce;\x05∽̱\x03ng;\x03⟩\x03quo\x02»\x03rr;\x03→",
+				// rbrksld;[⦎] rbrkslu;[⦐] rbrace;[}] rbrack;[]] rbarr;[⤍] rbbrk;[❳] rbrke;[⦌].
+				"\x06rksld;\x03⦎\x06rkslu;\x03⦐\x05race;\x01}\x05rack;\x01]\x04arr;\x03⤍\x04brk;\x03❳\x04rke;\x03⦌",
+				// rcaron;[ř] rcedil;[ŗ] rceil;[⌉] rcub;[}] rcy;[р].
+				"\x05aron;\x02ř\x05edil;\x02ŗ\x04eil;\x03⌉\x03ub;\x01}\x02y;\x02р",
+				// rdldhar;[⥩] rdquor;[”] rdquo;[”] rdca;[⤷] rdsh;[↳].
+				"\x06ldhar;\x03⥩\x05quor;\x03”\x04quo;\x03”\x03ca;\x03⤷\x03sh;\x03↳",
+				// realpart;[ℜ] realine;[ℛ] reals;[ℝ] real;[ℜ] rect;[▭] reg;[®] reg[®].
+				"\x07alpart;\x03ℜ\x06aline;\x03ℛ\x04als;\x03ℝ\x03al;\x03ℜ\x03ct;\x03▭\x02g;\x02®\x01g\x02®",
+				// rfisht;[⥽] rfloor;[⌋] rfr;[𝔯].
+				"\x05isht;\x03⥽\x05loor;\x03⌋\x02r;\x04𝔯",
+				// rharul;[⥬] rhard;[⇁] rharu;[⇀] rhov;[ϱ] rho;[ρ].
+				"\x05arul;\x03⥬\x04ard;\x03⇁\x04aru;\x03⇀\x03ov;\x02ϱ\x02o;\x02ρ",
+				// rightleftharpoons;[⇌] rightharpoondown;[⇁] rightrightarrows;[⇉] rightleftarrows;[⇄] rightsquigarrow;[↝] rightthreetimes;[⋌] rightarrowtail;[↣] rightharpoonup;[⇀] risingdotseq;[≓] rightarrow;[→] ring;[˚].
+				"\x10ghtleftharpoons;\x03⇌\x0fghtharpoondown;\x03⇁\x0fghtrightarrows;\x03⇉\x0eghtleftarrows;\x03⇄\x0eghtsquigarrow;\x03↝\x0eghtthreetimes;\x03⋌\x0dghtarrowtail;\x03↣\x0dghtharpoonup;\x03⇀\x0bsingdotseq;\x03≓\x09ghtarrow;\x03→\x03ng;\x02˚",
+				// rlarr;[⇄] rlhar;[⇌] rlm;[‏].
+				"\x04arr;\x03⇄\x04har;\x03⇌\x02m;\x03‏",
+				// rmoustache;[⎱] rmoust;[⎱].
+				"\x09oustache;\x03⎱\x05oust;\x03⎱",
+				// rnmid;[⫮].
+				"\x04mid;\x03⫮",
+				// rotimes;[⨵] roplus;[⨮] roang;[⟭] roarr;[⇾] robrk;[⟧] ropar;[⦆] ropf;[𝕣].
+				"\x06times;\x03⨵\x05plus;\x03⨮\x04ang;\x03⟭\x04arr;\x03⇾\x04brk;\x03⟧\x04par;\x03⦆\x03pf;\x04𝕣",
+				// rppolint;[⨒] rpargt;[⦔] rpar;[)].
+				"\x07polint;\x03⨒\x05argt;\x03⦔\x03ar;\x01)",
+				// rrarr;[⇉].
+				"\x04arr;\x03⇉",
+				// rsaquo;[›] rsquor;[’] rsquo;[’] rscr;[𝓇] rsqb;[]] rsh;[↱].
+				"\x05aquo;\x03›\x05quor;\x03’\x04quo;\x03’\x03cr;\x04𝓇\x03qb;\x01]\x02h;\x03↱",
+				// rtriltri;[⧎] rthree;[⋌] rtimes;[⋊] rtrie;[⊵] rtrif;[▸] rtri;[▹].
+				"\x07riltri;\x03⧎\x05hree;\x03⋌\x05imes;\x03⋊\x04rie;\x03⊵\x04rif;\x03▸\x03ri;\x03▹",
+				// ruluhar;[⥨].
+				"\x06luhar;\x03⥨",
+				// rx;[℞].
+				"\x01;\x03℞",
+				// sacute;[ś].
+				"\x05cute;\x02ś",
+				// sbquo;[‚].
+				"\x04quo;\x03‚",
+				// scpolint;[⨓] scaron;[š] scedil;[ş] scnsim;[⋩] sccue;[≽] scirc;[ŝ] scnap;[⪺] scsim;[≿] scap;[⪸] scnE;[⪶] scE;[⪴] sce;[⪰] scy;[с] sc;[≻].
+				"\x07polint;\x03⨓\x05aron;\x02š\x05edil;\x02ş\x05nsim;\x03⋩\x04cue;\x03≽\x04irc;\x02ŝ\x04nap;\x03⪺\x04sim;\x03≿\x03ap;\x03⪸\x03nE;\x03⪶\x02E;\x03⪴\x02e;\x03⪰\x02y;\x02с\x01;\x03≻",
+				// sdotb;[⊡] sdote;[⩦] sdot;[⋅].
+				"\x04otb;\x03⊡\x04ote;\x03⩦\x03ot;\x03⋅",
+				// setminus;[∖] searrow;[↘] searhk;[⤥] seswar;[⤩] seArr;[⇘] searr;[↘] setmn;[∖] sect;[§] semi;[;] sext;[✶] sect[§].
+				"\x07tminus;\x03∖\x06arrow;\x03↘\x05arhk;\x03⤥\x05swar;\x03⤩\x04Arr;\x03⇘\x04arr;\x03↘\x04tmn;\x03∖\x03ct;\x02§\x03mi;\x01;\x03xt;\x03✶\x02ct\x02§",
+				// sfrown;[⌢] sfr;[𝔰].
+				"\x05rown;\x03⌢\x02r;\x04𝔰",
+				// shortparallel;[∥] shortmid;[∣] shchcy;[щ] sharp;[♯] shcy;[ш] shy;[­] shy[­].
+				"\x0cortparallel;\x03∥\x07ortmid;\x03∣\x05chcy;\x02щ\x04arp;\x03♯\x03cy;\x02ш\x02y;\x02­\x01y\x02­",
+				// simplus;[⨤] simrarr;[⥲] sigmaf;[ς] sigmav;[ς] simdot;[⩪] sigma;[σ] simeq;[≃] simgE;[⪠] simlE;[⪟] simne;[≆] sime;[≃] simg;[⪞] siml;[⪝] sim;[∼].
+				"\x06mplus;\x03⨤\x06mrarr;\x03⥲\x05gmaf;\x02ς\x05gmav;\x02ς\x05mdot;\x03⩪\x04gma;\x02σ\x04meq;\x03≃\x04mgE;\x03⪠\x04mlE;\x03⪟\x04mne;\x03≆\x03me;\x03≃\x03mg;\x03⪞\x03ml;\x03⪝\x02m;\x03∼",
+				// slarr;[←].
+				"\x04arr;\x03←",
+				// smallsetminus;[∖] smeparsl;[⧤] smashp;[⨳] smile;[⌣] smtes;[⪬︀] smid;[∣] smte;[⪬] smt;[⪪].
+				"\x0callsetminus;\x03∖\x07eparsl;\x03⧤\x05ashp;\x03⨳\x04ile;\x03⌣\x04tes;\x06⪬︀\x03id;\x03∣\x03te;\x03⪬\x02t;\x03⪪",
+				// softcy;[ь] solbar;[⌿] solb;[⧄] sopf;[𝕤] sol;[/].
+				"\x05ftcy;\x02ь\x05lbar;\x03⌿\x03lb;\x03⧄\x03pf;\x04𝕤\x02l;\x01/",
+				// spadesuit;[♠] spades;[♠] spar;[∥].
+				"\x08adesuit;\x03♠\x05ades;\x03♠\x03ar;\x03∥",
+				// sqsubseteq;[⊑] sqsupseteq;[⊒] sqsubset;[⊏] sqsupset;[⊐] sqcaps;[⊓︀] sqcups;[⊔︀] sqsube;[⊑] sqsupe;[⊒] square;[□] squarf;[▪] sqcap;[⊓] sqcup;[⊔] sqsub;[⊏] sqsup;[⊐] squf;[▪] squ;[□].
+				"\x09subseteq;\x03⊑\x09supseteq;\x03⊒\x07subset;\x03⊏\x07supset;\x03⊐\x05caps;\x06⊓︀\x05cups;\x06⊔︀\x05sube;\x03⊑\x05supe;\x03⊒\x05uare;\x03□\x05uarf;\x03▪\x04cap;\x03⊓\x04cup;\x03⊔\x04sub;\x03⊏\x04sup;\x03⊐\x03uf;\x03▪\x02u;\x03□",
+				// srarr;[→].
+				"\x04arr;\x03→",
+				// ssetmn;[∖] ssmile;[⌣] sstarf;[⋆] sscr;[𝓈].
+				"\x05etmn;\x03∖\x05mile;\x03⌣\x05tarf;\x03⋆\x03cr;\x04𝓈",
+				// straightepsilon;[ϵ] straightphi;[ϕ] starf;[★] strns;[¯] star;[☆].
+				"\x0eraightepsilon;\x02ϵ\x0araightphi;\x02ϕ\x04arf;\x03★\x04rns;\x02¯\x03ar;\x03☆",
+				// succcurlyeq;[≽] succnapprox;[⪺] subsetneqq;[⫋] succapprox;[⪸] supsetneqq;[⫌] subseteqq;[⫅] subsetneq;[⊊] supseteqq;[⫆] supsetneq;[⊋] subseteq;[⊆] succneqq;[⪶] succnsim;[⋩] supseteq;[⊇] subedot;[⫃] submult;[⫁] subplus;[⪿] subrarr;[⥹] succsim;[≿] supdsub;[⫘] supedot;[⫄] suphsol;[⟉] suphsub;[⫗] suplarr;[⥻] supmult;[⫂] supplus;[⫀] subdot;[⪽] subset;[⊂] subsim;[⫇] subsub;[⫕] subsup;[⫓] succeq;[⪰] supdot;[⪾] supset;[⊃] supsim;[⫈] supsub;[⫔] supsup;[⫖] subnE;[⫋] subne;[⊊] supnE;[⫌] supne;[⊋] subE;[⫅] sube;[⊆] succ;[≻] sung;[♪] sup1;[¹] sup2;[²] sup3;[³] supE;[⫆] supe;[⊇] sub;[⊂] sum;[∑] sup1[¹] sup2[²] sup3[³] sup;[⊃].
+				"\x0acccurlyeq;\x03≽\x0accnapprox;\x03⪺\x09bsetneqq;\x03⫋\x09ccapprox;\x03⪸\x09psetneqq;\x03⫌\x08bseteqq;\x03⫅\x08bsetneq;\x03⊊\x08pseteqq;\x03⫆\x08psetneq;\x03⊋\x07bseteq;\x03⊆\x07ccneqq;\x03⪶\x07ccnsim;\x03⋩\x07pseteq;\x03⊇\x06bedot;\x03⫃\x06bmult;\x03⫁\x06bplus;\x03⪿\x06brarr;\x03⥹\x06ccsim;\x03≿\x06pdsub;\x03⫘\x06pedot;\x03⫄\x06phsol;\x03⟉\x06phsub;\x03⫗\x06plarr;\x03⥻\x06pmult;\x03⫂\x06pplus;\x03⫀\x05bdot;\x03⪽\x05bset;\x03⊂\x05bsim;\x03⫇\x05bsub;\x03⫕\x05bsup;\x03⫓\x05cceq;\x03⪰\x05pdot;\x03⪾\x05pset;\x03⊃\x05psim;\x03⫈\x05psub;\x03⫔\x05psup;\x03⫖\x04bnE;\x03⫋\x04bne;\x03⊊\x04pnE;\x03⫌\x04pne;\x03⊋\x03bE;\x03⫅\x03be;\x03⊆\x03cc;\x03≻\x03ng;\x03♪\x03p1;\x02¹\x03p2;\x02²\x03p3;\x02³\x03pE;\x03⫆\x03pe;\x03⊇\x02b;\x03⊂\x02m;\x03∑\x02p1\x02¹\x02p2\x02²\x02p3\x02³\x02p;\x03⊃",
+				// swarrow;[↙] swarhk;[⤦] swnwar;[⤪] swArr;[⇙] swarr;[↙].
+				"\x06arrow;\x03↙\x05arhk;\x03⤦\x05nwar;\x03⤪\x04Arr;\x03⇙\x04arr;\x03↙",
+				// szlig;[ß] szlig[ß].
+				"\x04lig;\x02ß\x03lig\x02ß",
+				// target;[⌖] tau;[τ].
+				"\x05rget;\x03⌖\x02u;\x02τ",
+				// tbrk;[⎴].
+				"\x03rk;\x03⎴",
+				// tcaron;[ť] tcedil;[ţ] tcy;[т].
+				"\x05aron;\x02ť\x05edil;\x02ţ\x02y;\x02т",
+				// tdot;[⃛].
+				"\x03ot;\x03⃛",
+				// telrec;[⌕].
+				"\x05lrec;\x03⌕",
+				// tfr;[𝔱].
+				"\x02r;\x04𝔱",
+				// thickapprox;[≈] therefore;[∴] thetasym;[ϑ] thicksim;[∼] there4;[∴] thetav;[ϑ] thinsp;[ ] thksim;[∼] theta;[θ] thkap;[≈] thorn;[þ] thorn[þ].
+				"\x0aickapprox;\x03≈\x08erefore;\x03∴\x07etasym;\x02ϑ\x07icksim;\x03∼\x05ere4;\x03∴\x05etav;\x02ϑ\x05insp;\x03 \x05ksim;\x03∼\x04eta;\x02θ\x04kap;\x03≈\x04orn;\x02þ\x03orn\x02þ",
+				// timesbar;[⨱] timesb;[⊠] timesd;[⨰] tilde;[˜] times;[×] times[×] tint;[∭].
+				"\x07mesbar;\x03⨱\x05mesb;\x03⊠\x05mesd;\x03⨰\x04lde;\x02˜\x04mes;\x02×\x03mes\x02×\x03nt;\x03∭",
+				// topfork;[⫚] topbot;[⌶] topcir;[⫱] toea;[⤨] topf;[𝕥] tosa;[⤩] top;[⊤].
+				"\x06pfork;\x03⫚\x05pbot;\x03⌶\x05pcir;\x03⫱\x03ea;\x03⤨\x03pf;\x04𝕥\x03sa;\x03⤩\x02p;\x03⊤",
+				// tprime;[‴].
+				"\x05rime;\x03‴",
+				// trianglerighteq;[⊵] trianglelefteq;[⊴] triangleright;[▹] triangledown;[▿] triangleleft;[◃] triangleq;[≜] triangle;[▵] triminus;[⨺] trpezium;[⏢] triplus;[⨹] tritime;[⨻] tridot;[◬] trade;[™] trisb;[⧍] trie;[≜].
+				"\x0eianglerighteq;\x03⊵\x0dianglelefteq;\x03⊴\x0ciangleright;\x03▹\x0biangledown;\x03▿\x0biangleleft;\x03◃\x08iangleq;\x03≜\x07iangle;\x03▵\x07iminus;\x03⨺\x07pezium;\x03⏢\x06iplus;\x03⨹\x06itime;\x03⨻\x05idot;\x03◬\x04ade;\x03™\x04isb;\x03⧍\x03ie;\x03≜",
+				// tstrok;[ŧ] tshcy;[ћ] tscr;[𝓉] tscy;[ц].
+				"\x05trok;\x02ŧ\x04hcy;\x02ћ\x03cr;\x04𝓉\x03cy;\x02ц",
+				// twoheadrightarrow;[↠] twoheadleftarrow;[↞] twixt;[≬].
+				"\x10oheadrightarrow;\x03↠\x0foheadleftarrow;\x03↞\x04ixt;\x03≬",
+				// uArr;[⇑].
+				"\x03rr;\x03⇑",
+				// uHar;[⥣].
+				"\x03ar;\x03⥣",
+				// uacute;[ú] uacute[ú] uarr;[↑].
+				"\x05cute;\x02ú\x04cute\x02ú\x03rr;\x03↑",
+				// ubreve;[ŭ] ubrcy;[ў].
+				"\x05reve;\x02ŭ\x04rcy;\x02ў",
+				// ucirc;[û] ucirc[û] ucy;[у].
+				"\x04irc;\x02û\x03irc\x02û\x02y;\x02у",
+				// udblac;[ű] udarr;[⇅] udhar;[⥮].
+				"\x05blac;\x02ű\x04arr;\x03⇅\x04har;\x03⥮",
+				// ufisht;[⥾] ufr;[𝔲].
+				"\x05isht;\x03⥾\x02r;\x04𝔲",
+				// ugrave;[ù] ugrave[ù].
+				"\x05rave;\x02ù\x04rave\x02ù",
+				// uharl;[↿] uharr;[↾] uhblk;[▀].
+				"\x04arl;\x03↿\x04arr;\x03↾\x04blk;\x03▀",
+				// ulcorner;[⌜] ulcorn;[⌜] ulcrop;[⌏] ultri;[◸].
+				"\x07corner;\x03⌜\x05corn;\x03⌜\x05crop;\x03⌏\x04tri;\x03◸",
+				// umacr;[ū] uml;[¨] uml[¨].
+				"\x04acr;\x02ū\x02l;\x02¨\x01l\x02¨",
+				// uogon;[ų] uopf;[𝕦].
+				"\x04gon;\x02ų\x03pf;\x04𝕦",
+				// upharpoonright;[↾] upharpoonleft;[↿] updownarrow;[↕] upuparrows;[⇈] uparrow;[↑] upsilon;[υ] uplus;[⊎] upsih;[ϒ] upsi;[υ].
+				"\x0dharpoonright;\x03↾\x0charpoonleft;\x03↿\x0adownarrow;\x03↕\x09uparrows;\x03⇈\x06arrow;\x03↑\x06silon;\x02υ\x04lus;\x03⊎\x04sih;\x02ϒ\x03si;\x02υ",
+				// urcorner;[⌝] urcorn;[⌝] urcrop;[⌎] uring;[ů] urtri;[◹].
+				"\x07corner;\x03⌝\x05corn;\x03⌝\x05crop;\x03⌎\x04ing;\x02ů\x04tri;\x03◹",
+				// uscr;[𝓊].
+				"\x03cr;\x04𝓊",
+				// utilde;[ũ] utdot;[⋰] utrif;[▴] utri;[▵].
+				"\x05ilde;\x02ũ\x04dot;\x03⋰\x04rif;\x03▴\x03ri;\x03▵",
+				// uuarr;[⇈] uuml;[ü] uuml[ü].
+				"\x04arr;\x03⇈\x03ml;\x02ü\x02ml\x02ü",
+				// uwangle;[⦧].
+				"\x06angle;\x03⦧",
+				// vArr;[⇕].
+				"\x03rr;\x03⇕",
+				// vBarv;[⫩] vBar;[⫨].
+				"\x04arv;\x03⫩\x03ar;\x03⫨",
+				// vDash;[⊨].
+				"\x04ash;\x03⊨",
+				// vartriangleright;[⊳] vartriangleleft;[⊲] varsubsetneqq;[⫋︀] varsupsetneqq;[⫌︀] varsubsetneq;[⊊︀] varsupsetneq;[⊋︀] varepsilon;[ϵ] varnothing;[∅] varpropto;[∝] varkappa;[ϰ] varsigma;[ς] vartheta;[ϑ] vangrt;[⦜] varphi;[ϕ] varrho;[ϱ] varpi;[ϖ] varr;[↕].
+				"\x0frtriangleright;\x03⊳\x0ertriangleleft;\x03⊲\x0crsubsetneqq;\x06⫋︀\x0crsupsetneqq;\x06⫌︀\x0brsubsetneq;\x06⊊︀\x0brsupsetneq;\x06⊋︀\x09repsilon;\x02ϵ\x09rnothing;\x03∅\x08rpropto;\x03∝\x07rkappa;\x02ϰ\x07rsigma;\x02ς\x07rtheta;\x02ϑ\x05ngrt;\x03⦜\x05rphi;\x02ϕ\x05rrho;\x02ϱ\x04rpi;\x02ϖ\x03rr;\x03↕",
+				// vcy;[в].
+				"\x02y;\x02в",
+				// vdash;[⊢].
+				"\x04ash;\x03⊢",
+				// veebar;[⊻] vellip;[⋮] verbar;[|] veeeq;[≚] vert;[|] vee;[∨].
+				"\x05ebar;\x03⊻\x05llip;\x03⋮\x05rbar;\x01|\x04eeq;\x03≚\x03rt;\x01|\x02e;\x03∨",
+				// vfr;[𝔳].
+				"\x02r;\x04𝔳",
+				// vltri;[⊲].
+				"\x04tri;\x03⊲",
+				// vnsub;[⊂⃒] vnsup;[⊃⃒].
+				"\x04sub;\x06⊂⃒\x04sup;\x06⊃⃒",
+				// vopf;[𝕧].
+				"\x03pf;\x04𝕧",
+				// vprop;[∝].
+				"\x04rop;\x03∝",
+				// vrtri;[⊳].
+				"\x04tri;\x03⊳",
+				// vsubnE;[⫋︀] vsubne;[⊊︀] vsupnE;[⫌︀] vsupne;[⊋︀] vscr;[𝓋].
+				"\x05ubnE;\x06⫋︀\x05ubne;\x06⊊︀\x05upnE;\x06⫌︀\x05upne;\x06⊋︀\x03cr;\x04𝓋",
+				// vzigzag;[⦚].
+				"\x06igzag;\x03⦚",
+				// wcirc;[ŵ].
+				"\x04irc;\x02ŵ",
+				// wedbar;[⩟] wedgeq;[≙] weierp;[℘] wedge;[∧].
+				"\x05dbar;\x03⩟\x05dgeq;\x03≙\x05ierp;\x03℘\x04dge;\x03∧",
+				// wfr;[𝔴].
+				"\x02r;\x04𝔴",
+				// wopf;[𝕨].
+				"\x03pf;\x04𝕨",
+				// wp;[℘].
+				"\x01;\x03℘",
+				// wreath;[≀] wr;[≀].
+				"\x05eath;\x03≀\x01;\x03≀",
+				// wscr;[𝓌].
+				"\x03cr;\x04𝓌",
+				// xcirc;[◯] xcap;[⋂] xcup;[⋃].
+				"\x04irc;\x03◯\x03ap;\x03⋂\x03up;\x03⋃",
+				// xdtri;[▽].
+				"\x04tri;\x03▽",
+				// xfr;[𝔵].
+				"\x02r;\x04𝔵",
+				// xhArr;[⟺] xharr;[⟷].
+				"\x04Arr;\x03⟺\x04arr;\x03⟷",
+				// xi;[ξ].
+				"\x01;\x02ξ",
+				// xlArr;[⟸] xlarr;[⟵].
+				"\x04Arr;\x03⟸\x04arr;\x03⟵",
+				// xmap;[⟼].
+				"\x03ap;\x03⟼",
+				// xnis;[⋻].
+				"\x03is;\x03⋻",
+				// xoplus;[⨁] xotime;[⨂] xodot;[⨀] xopf;[𝕩].
+				"\x05plus;\x03⨁\x05time;\x03⨂\x04dot;\x03⨀\x03pf;\x04𝕩",
+				// xrArr;[⟹] xrarr;[⟶].
+				"\x04Arr;\x03⟹\x04arr;\x03⟶",
+				// xsqcup;[⨆] xscr;[𝓍].
+				"\x05qcup;\x03⨆\x03cr;\x04𝓍",
+				// xuplus;[⨄] xutri;[△].
+				"\x05plus;\x03⨄\x04tri;\x03△",
+				// xvee;[⋁].
+				"\x03ee;\x03⋁",
+				// xwedge;[⋀].
+				"\x05edge;\x03⋀",
+				// yacute;[ý] yacute[ý] yacy;[я].
+				"\x05cute;\x02ý\x04cute\x02ý\x03cy;\x02я",
+				// ycirc;[ŷ] ycy;[ы].
+				"\x04irc;\x02ŷ\x02y;\x02ы",
+				// yen;[¥] yen[¥].
+				"\x02n;\x02¥\x01n\x02¥",
+				// yfr;[𝔶].
+				"\x02r;\x04𝔶",
+				// yicy;[ї].
+				"\x03cy;\x02ї",
+				// yopf;[𝕪].
+				"\x03pf;\x04𝕪",
+				// yscr;[𝓎].
+				"\x03cr;\x04𝓎",
+				// yucy;[ю] yuml;[ÿ] yuml[ÿ].
+				"\x03cy;\x02ю\x03ml;\x02ÿ\x02ml\x02ÿ",
+				// zacute;[ź].
+				"\x05cute;\x02ź",
+				// zcaron;[ž] zcy;[з].
+				"\x05aron;\x02ž\x02y;\x02з",
+				// zdot;[ż].
+				"\x03ot;\x02ż",
+				// zeetrf;[ℨ] zeta;[ζ].
+				"\x05etrf;\x03ℨ\x03ta;\x02ζ",
+				// zfr;[𝔷].
+				"\x02r;\x04𝔷",
+				// zhcy;[ж].
+				"\x03cy;\x02ж",
+				// zigrarr;[⇝].
+				"\x06grarr;\x03⇝",
+				// zopf;[𝕫].
+				"\x03pf;\x04𝕫",
+				// zscr;[𝓏].
+				"\x03cr;\x04𝓏",
+				// zwnj;[‌] zwj;[‍].
+				"\x03nj;\x03‌\x02j;\x03‍",
+			),
+			"small_words" => "GT\x00LT\x00gt\x00lt\x00",
+			"small_mappings" => array(
+				">",
+				"<",
+				">",
+				"<",
+			)
+		)
+	);
+}
diff --git a/lib/compat/wordpress-6.6/option.php b/lib/compat/wordpress-6.6/option.php
new file mode 100644
index 00000000000000..9ec81467c261da
--- /dev/null
+++ b/lib/compat/wordpress-6.6/option.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Options API changes for the Gutenberg plugin.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Updates arguments for default settings available in WordPress.
+ *
+ * Note: During the core sync, the updates will be made to `register_initial_settings`.
+*/
+function gutenberg_update_initial_settings( $args, $defaults, $option_group, $option_name ) {
+	$settings_label_map = array(
+		'blogname'               => __( 'Title' ),
+		'blogdescription'        => __( 'Tagline' ),
+		'show_on_front'          => __( 'Show on front' ),
+		'page_on_front'          => __( 'Page on front' ),
+		'posts_per_page'         => __( 'Maximum posts per page' ),
+		'default_comment_status' => __( 'Allow comments on new posts' ),
+	);
+
+	if ( isset( $settings_label_map[ $option_name ] ) ) {
+		$args['label'] = $settings_label_map[ $option_name ];
+	}
+
+	// Don't update schema when a setting isn't exposed via REST API.
+	if ( ! isset( $args['show_in_rest'] ) ) {
+		return $args;
+	}
+
+	// Don't update schema when label isn't provided.
+	if ( ! isset( $args['label'] ) ) {
+		return $args;
+	}
+
+	$schema = array( 'title' => $args['label'] );
+	if ( ! is_array( $args['show_in_rest'] ) ) {
+		$args['show_in_rest'] = array(
+			'schema' => $schema,
+		);
+		return $args;
+	}
+
+	if ( ! empty( $args['show_in_rest']['schema'] ) ) {
+		$args['show_in_rest']['schema'] = array_merge( $args['show_in_rest']['schema'], $schema );
+	} else {
+		$args['show_in_rest']['schema'] = $schema;
+	}
+
+	return $args;
+}
+add_filter( 'register_setting_args', 'gutenberg_update_initial_settings', 10, 4 );
diff --git a/lib/compat/wordpress-6.6/post.php b/lib/compat/wordpress-6.6/post.php
new file mode 100644
index 00000000000000..8415f3bf42f18f
--- /dev/null
+++ b/lib/compat/wordpress-6.6/post.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Temporary compatibility shims for block APIs present in Gutenberg.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Adds support for excerpt to the wp_block post type.
+ */
+function gutenberg_add_excerpt_support_to_wp_block() {
+	add_post_type_support( 'wp_block', 'excerpt' );
+}
+
+add_action( 'init', 'gutenberg_add_excerpt_support_to_wp_block' );
+
+/**
+ * Updates the labels for the template post type.
+ *
+ * @param  object $labels Object with labels for the post type as member variables.
+ * @return object Object with all the labels as member variables.
+ */
+function gutenberg_update_wp_template_labels( $labels ) {
+	$labels->item_updated = __( 'Template updated.', 'gutenberg' );
+	return $labels;
+}
+add_filter( 'post_type_labels_wp_template', 'gutenberg_update_wp_template_labels', 10, 1 );
+
+/**
+ * Updates the labels for the template parts post type.
+ *
+ * @param  object $labels Object with labels for the post type as member variables.
+ * @return object Object with all the labels as member variables.
+ */
+function gutenberg_update_wp_template__part_labels( $labels ) {
+	$labels->item_updated = __( 'Template part updated.', 'gutenberg' );
+	return $labels;
+}
+add_filter( 'post_type_labels_wp_template_part', 'gutenberg_update_wp_template__part_labels', 10, 1 );
diff --git a/lib/compat/wordpress-6.6/resolve-patterns.php b/lib/compat/wordpress-6.6/resolve-patterns.php
new file mode 100644
index 00000000000000..5105619c42613c
--- /dev/null
+++ b/lib/compat/wordpress-6.6/resolve-patterns.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Replaces pattern blocks with their content.
+ *
+ * @param array $blocks Array of blocks.
+ * @param array $inner_content Optional array of inner content.
+ * @return array Array of blocks with patterns replaced.
+ */
+function gutenberg_replace_pattern_blocks( $blocks, &$inner_content = null ) {
+	// Keep track of seen references to avoid infinite loops.
+	static $seen_refs = array();
+	$i                = 0;
+	while ( $i < count( $blocks ) ) {
+		if ( 'core/pattern' === $blocks[ $i ]['blockName'] ) {
+			$slug = $blocks[ $i ]['attrs']['slug'];
+
+			if ( isset( $seen_refs[ $slug ] ) ) {
+				// Skip recursive patterns.
+				array_splice( $blocks, $i, 1 );
+				continue;
+			}
+
+			$registry = WP_Block_Patterns_Registry::get_instance();
+			$pattern  = $registry->get_registered( $slug );
+
+			// Skip unknown patterns.
+			if ( ! $pattern ) {
+				++$i;
+				continue;
+			}
+
+			$blocks_to_insert   = parse_blocks( $pattern['content'] );
+			$seen_refs[ $slug ] = true;
+			$blocks_to_insert   = gutenberg_replace_pattern_blocks( $blocks_to_insert );
+			unset( $seen_refs[ $slug ] );
+			array_splice( $blocks, $i, 1, $blocks_to_insert );
+
+			// If we have inner content, we need to insert nulls in the
+			// inner content array, otherwise serialize_blocks will skip
+			// blocks.
+			if ( $inner_content ) {
+				$null_indices  = array_keys( $inner_content, null, true );
+				$content_index = $null_indices[ $i ];
+				$nulls         = array_fill( 0, count( $blocks_to_insert ), null );
+				array_splice( $inner_content, $content_index, 1, $nulls );
+			}
+
+			// Skip inserted blocks.
+			$i += count( $blocks_to_insert );
+		} else {
+			if ( ! empty( $blocks[ $i ]['innerBlocks'] ) ) {
+				$blocks[ $i ]['innerBlocks'] = gutenberg_replace_pattern_blocks(
+					$blocks[ $i ]['innerBlocks'],
+					$blocks[ $i ]['innerContent']
+				);
+			}
+			++$i;
+		}
+	}
+	return $blocks;
+}
+
+function gutenberg_replace_pattern_blocks_patterns_endpoint( $result, $server, $request ) {
+	if ( $request->get_route() !== '/wp/v2/block-patterns/patterns' ) {
+		return $result;
+	}
+
+	$data = $result->get_data();
+
+	foreach ( $data as $index => $pattern ) {
+		$blocks                    = parse_blocks( $pattern['content'] );
+		$blocks                    = gutenberg_replace_pattern_blocks( $blocks );
+		$data[ $index ]['content'] = serialize_blocks( $blocks );
+	}
+
+	$result->set_data( $data );
+
+	return $result;
+}
+
+// Similarly, for patterns, we can avoid the double parse here:
+// https://github.com/WordPress/wordpress-develop/blob/02fb53498f1ce7e63d807b9bafc47a7dba19d169/src/wp-includes/class-wp-block-patterns-registry.php#L175
+add_filter( 'rest_post_dispatch', 'gutenberg_replace_pattern_blocks_patterns_endpoint', 10, 3 );
diff --git a/lib/compat/wordpress-6.6/rest-api.php b/lib/compat/wordpress-6.6/rest-api.php
new file mode 100644
index 00000000000000..eadd3b1d376a72
--- /dev/null
+++ b/lib/compat/wordpress-6.6/rest-api.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * PHP and WordPress configuration compatibility functions for the Gutenberg
+ * editor plugin changes related to REST API.
+ *
+ * @package gutenberg
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	die( 'Silence is golden.' );
+}
+
+if ( ! function_exists( 'wp_api_template_access_controller' ) ) {
+	/**
+	 * Hook in to the template and template part post types and modify the
+	 * access control for the rest endpoint to allow lower user roles to access
+	 * the templates and template parts.
+	 *
+	 * @param array  $args Current registered post type args.
+	 * @param string $post_type Name of post type.
+	 *
+	 * @return array
+	 */
+	function wp_api_template_access_controller( $args, $post_type ) {
+		if ( 'wp_template' === $post_type || 'wp_template_part' === $post_type ) {
+			$args['rest_controller_class'] = 'Gutenberg_REST_Templates_Controller_6_6';
+		}
+		return $args;
+	}
+}
+add_filter( 'register_post_type_args', 'wp_api_template_access_controller', 10, 2 );
+
+/**
+ * Adds the post classes to the REST API response.
+ *
+ * @param  array $post The response object data.
+ *
+ * @return array
+ */
+function gutenberg_add_class_list_to_api_response( $post ) {
+
+	if ( ! isset( $post['id'] ) ) {
+		return array();
+	}
+
+	return get_post_class( array(), $post['id'] );
+}
+
+/**
+ * Adds the post classes to public post types in the REST API.
+ */
+function gutenberg_add_class_list_to_public_post_types() {
+	$post_types = get_post_types(
+		array(
+			'public'       => true,
+			'show_in_rest' => true,
+		),
+		'names'
+	);
+
+	if ( ! empty( $post_types ) ) {
+		register_rest_field(
+			$post_types,
+			'class_list',
+			array(
+				'get_callback' => 'gutenberg_add_class_list_to_api_response',
+				'schema'       => array(
+					'description' => __( 'An array of the class names for the post container element.', 'gutenberg' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type' => 'string',
+					),
+				),
+			)
+		);
+	}
+}
+add_action( 'rest_api_init', 'gutenberg_add_class_list_to_public_post_types' );
+
+
+/**
+ * Registers the Global Styles Revisions REST API routes.
+ */
+function gutenberg_register_global_styles_revisions_endpoints() {
+	$global_styles_revisions_controller = new Gutenberg_REST_Global_Styles_Revisions_Controller_6_6();
+	$global_styles_revisions_controller->register_routes();
+}
+
+add_action( 'rest_api_init', 'gutenberg_register_global_styles_revisions_endpoints' );
+
+/**
+ * Adds `stylesheet_uri` fields to WP_REST_Themes_Controller class.
+ */
+function gutenberg_register_wp_rest_themes_stylesheet_directory_uri_field() {
+	register_rest_field(
+		'theme',
+		'stylesheet_uri',
+		array(
+			'get_callback' => function ( $item ) {
+				if ( ! empty( $item['stylesheet'] ) ) {
+					$theme         = wp_get_theme( $item['stylesheet'] );
+					$current_theme = wp_get_theme();
+					if ( $theme->get_stylesheet() === $current_theme->get_stylesheet() ) {
+						return get_stylesheet_directory_uri();
+					} else {
+						return $theme->get_stylesheet_directory_uri();
+					}
+				}
+
+				return null;
+			},
+			'schema'       => array(
+				'type'        => 'string',
+				'description' => __( 'The uri for the theme\'s stylesheet directory.', 'gutenberg' ),
+				'format'      => 'uri',
+				'readonly'    => true,
+				'context'     => array( 'view', 'edit', 'embed' ),
+			),
+		)
+	);
+}
+add_action( 'rest_api_init', 'gutenberg_register_wp_rest_themes_stylesheet_directory_uri_field' );
+
+/**
+ * Adds `template_uri` fields to WP_REST_Themes_Controller class.
+ */
+function gutenberg_register_wp_rest_themes_template_directory_uri_field() {
+	register_rest_field(
+		'theme',
+		'template_uri',
+		array(
+			'get_callback' => function ( $item ) {
+				if ( ! empty( $item['stylesheet'] ) ) {
+					$theme         = wp_get_theme( $item['stylesheet'] );
+					$current_theme = wp_get_theme();
+					if ( $theme->get_stylesheet() === $current_theme->get_stylesheet() ) {
+						return get_template_directory_uri();
+					} else {
+						return $theme->get_template_directory_uri();
+					}
+				}
+
+				return null;
+			},
+			'schema'       => array(
+				'type'        => 'string',
+				'description' => __( 'The uri for the theme\'s template directory. If this is a child theme, this refers to the parent theme, otherwise this is the same as the theme\'s stylesheet directory.', 'gutenberg' ),
+				'format'      => 'uri',
+				'readonly'    => true,
+				'context'     => array( 'view', 'edit', 'embed' ),
+			),
+		)
+	);
+}
+add_action( 'rest_api_init', 'gutenberg_register_wp_rest_themes_template_directory_uri_field' );
+
+/**
+ * Adds `template` and `template_lock` fields to WP_REST_Post_Types_Controller class.
+ */
+function gutenberg_register_wp_rest_post_types_controller_fields() {
+	register_rest_field(
+		'type',
+		'template',
+		array(
+			'get_callback' => function ( $item ) {
+				$post_type = get_post_type_object( $item['slug'] );
+				if ( ! empty( $post_type ) ) {
+					return $post_type->template ?? array();
+				}
+			},
+			'schema'       => array(
+				'type'        => 'array',
+				'description' => __( 'The block template associated with the post type.', 'gutenberg' ),
+				'readonly'    => true,
+				'context'     => array( 'view', 'edit', 'embed' ),
+			),
+		)
+	);
+	register_rest_field(
+		'type',
+		'template_lock',
+		array(
+			'get_callback' => function ( $item ) {
+				$post_type = get_post_type_object( $item['slug'] );
+				if ( ! empty( $post_type ) ) {
+					return ! empty( $post_type->template_lock ) ? $post_type->template_lock : false;
+				}
+			},
+			'schema'       => array(
+				'type'        => array( 'string', 'boolean' ),
+				'enum'        => array( 'all', 'insert', 'contentOnly', false ),
+				'description' => __( 'The template_lock associated with the post type, or false if none.', 'gutenberg' ),
+				'readonly'    => true,
+				'context'     => array( 'view', 'edit', 'embed' ),
+			),
+		)
+	);
+}
+add_action( 'rest_api_init', 'gutenberg_register_wp_rest_post_types_controller_fields' );
+
+/**
+ * Preload theme and global styles paths to avoid flash of variation styles in post editor.
+ *
+ * @param array                   $paths REST API paths to preload.
+ * @param WP_Block_Editor_Context $context Current block editor context.
+ * @return array Filtered preload paths.
+ */
+function gutenberg_block_editor_preload_paths_6_6( $paths, $context ) {
+	if ( 'core/edit-post' === $context->name ) {
+		$paths[] = '/wp/v2/global-styles/themes/' . get_stylesheet();
+		$paths[] = '/wp/v2/themes?context=edit&status=active';
+		$paths[] = '/wp/v2/global-styles/' . WP_Theme_JSON_Resolver_Gutenberg::get_user_global_styles_post_id() . '?context=edit';
+	}
+	return $paths;
+}
+add_filter( 'block_editor_rest_api_preload_paths', 'gutenberg_block_editor_preload_paths_6_6', 10, 2 );
diff --git a/lib/compat/wordpress-6.7/block-bindings.php b/lib/compat/wordpress-6.7/block-bindings.php
new file mode 100644
index 00000000000000..70ba523ac966ea
--- /dev/null
+++ b/lib/compat/wordpress-6.7/block-bindings.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Temporary compatibility code for new functionalities/changes related to block bindings APIs present in Gutenberg.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Bootstrap the block bindings sources registered in the server.
+ */
+function gutenberg_bootstrap_server_block_bindings_sources() {
+	$registered_sources = get_all_registered_block_bindings_sources();
+	if ( ! empty( $registered_sources ) ) {
+		$filtered_sources = array();
+		foreach ( $registered_sources as $source ) {
+			$filtered_sources[] = array(
+				'name'        => $source->name,
+				'label'       => $source->label,
+				'usesContext' => $source->uses_context,
+			);
+		}
+		$script = sprintf( 'for ( const source of %s ) { ! wp.blocks.getBlockBindingsSource( source.name ) && wp.blocks.registerBlockBindingsSource( source ); }', wp_json_encode( $filtered_sources ) );
+		wp_add_inline_script(
+			'wp-blocks',
+			$script
+		);
+	}
+}
+
+add_action( 'enqueue_block_editor_assets', 'gutenberg_bootstrap_server_block_bindings_sources', 5 );
+
+/**
+ * Initialize `canUpdateBlockBindings` editor setting if it doesn't exist. By default, it is `true` only for admin users.
+ *
+ * @param array $settings The block editor settings from the `block_editor_settings_all` filter.
+ * @return array The editor settings including `canUpdateBlockBindings`.
+ */
+function gutenberg_add_can_update_block_bindings_editor_setting( $editor_settings ) {
+	if ( empty( $editor_settings['canUpdateBlockBindings'] ) ) {
+		$editor_settings['canUpdateBlockBindings'] = current_user_can( 'manage_options' );
+	}
+	return $editor_settings;
+}
+
+add_filter( 'block_editor_settings_all', 'gutenberg_add_can_update_block_bindings_editor_setting', 10 );
+
+/**
+ * Add `label` to `register_meta`.
+ *
+ * @param array  $args Array of arguments for registering meta.
+ * @return array Modified arguments array including `label`.
+ */
+function gutenberg_update_meta_args_with_label( $args ) {
+	// Don't update schema when label isn't provided.
+	if ( ! isset( $args['label'] ) ) {
+		return $args;
+	}
+
+	$schema = array( 'title' => $args['label'] );
+	if ( ! is_array( $args['show_in_rest'] ) ) {
+		$args['show_in_rest'] = array(
+			'schema' => $schema,
+		);
+		return $args;
+	}
+
+	if ( ! empty( $args['show_in_rest']['schema'] ) ) {
+		$args['show_in_rest']['schema'] = array_merge( $args['show_in_rest']['schema'], $schema );
+	} else {
+		$args['show_in_rest']['schema'] = $schema;
+	}
+
+	return $args;
+}
+
+// Priority must be lower than 10 to ensure the label is not removed.
+add_filter( 'register_meta_args', 'gutenberg_update_meta_args_with_label', 5, 1 );
diff --git a/lib/compat/wordpress-6.7/block-templates.php b/lib/compat/wordpress-6.7/block-templates.php
new file mode 100644
index 00000000000000..acbd0b4981fe29
--- /dev/null
+++ b/lib/compat/wordpress-6.7/block-templates.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Block template functions.
+ *
+ * @package gutenberg
+ */
+
+if ( ! function_exists( 'register_block_template' ) ) {
+	/**
+	 * Register a template.
+	 *
+	 * @param string       $template_name  Template name in the form of `plugin_uri//template_name`.
+	 * @param array|string $args           {
+	 *     @type string        $title                 Optional. Title of the template as it will be shown in the Site Editor
+	 *                                                and other UI elements.
+	 *     @type string        $description           Optional. Description of the template as it will be shown in the Site
+	 *                                                Editor.
+	 *     @type string        $content               Optional. Default content of the template that will be used when the
+	 *                                                template is rendered or edited in the editor.
+	 *     @type string[]      $post_types            Optional. Array of post types to which the template should be available.
+	 *     @type string        $plugin                Uri of the plugin that registers the template.
+	 * }
+	 * @return WP_Block_Template|WP_Error The registered template object on success, WP_Error object on failure.
+	 */
+	function register_block_template( $template_name, $args = array() ) {
+		return WP_Block_Templates_Registry::get_instance()->register( $template_name, $args );
+	}
+}
+
+if ( ! function_exists( 'unregister_block_template' ) ) {
+	/**
+	 * Unregister a template.
+	 *
+	 * @param string $template_name Template name in the form of `plugin_uri//template_name`.
+	 * @return WP_Block_Template|WP_Error The unregistered template object on success, WP_Error object on failure or if
+	 *                                    the template doesn't exist.
+	 */
+	function unregister_block_template( $template_name ) {
+		return WP_Block_Templates_Registry::get_instance()->unregister( $template_name );
+	}
+}
+
+if ( ! function_exists( 'wp_register_block_template' ) ) {
+	/**
+	 * Register a template.
+	 *
+	 * @deprecated 19.4.0 wp_register_block_template is deprecated. Please use register_block_template instead.
+	 *
+	 * @param string       $template_name Template name in the form of `plugin_uri//template_name`.
+	 * @param array|string $args {
+	 *     Optional. Array or string of arguments for registering a block template.
+	 *
+	 *     @type string   $title       Optional. Title of the template as it will be shown in the Site Editor
+	 *                                 and other UI elements.
+	 *     @type string   $description Optional. Description of the template as it will be shown in the Site
+	 *                                 Editor.
+	 *     @type string   $content     Optional. Default content of the template that will be used when the
+	 *                                 template is rendered or edited in the editor.
+	 *     @type string[] $post_types  Optional. Array of post types to which the template should be available.
+	 *     @type string   $plugin      Uri of the plugin that registers the template.
+	 * }
+	 * @return WP_Block_Template|WP_Error The registered template object on success, WP_Error object on failure.
+	 */
+	function wp_register_block_template( $template_name, $args = array() ) {
+		_deprecated_function( __FUNCTION__, 'Gutenberg 19.4.0', 'register_block_template' );
+		return register_block_template( $template_name, $args );
+	}
+}
+
+if ( ! function_exists( 'wp_unregister_block_template' ) ) {
+	/**
+	 * Unregister a template.
+	 *
+	 * @deprecated 19.4.0 wp_unregister_block_template is deprecated. Please use unregister_block_template instead.
+	 *
+	 * @param string $template_name Template name in the form of `plugin_uri//template_name`.
+	 * @return WP_Block_Template|WP_Error The unregistered template object on success, WP_Error object on failure or if
+	 *                                    the template doesn't exist.
+	 */
+	function wp_unregister_block_template( $template_name ) {
+		_deprecated_function( __FUNCTION__, 'Gutenberg 19.4.0', 'unregister_block_template' );
+		return unregister_block_template( $template_name );
+	}
+}
diff --git a/lib/compat/wordpress-6.7/blocks.php b/lib/compat/wordpress-6.7/blocks.php
new file mode 100644
index 00000000000000..6b9526f8056fd3
--- /dev/null
+++ b/lib/compat/wordpress-6.7/blocks.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Temporary compatibility shims for block APIs present in Gutenberg.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Allow passing a PHP file as `variations` field for Core versions < 6.7
+ *
+ * @param array $settings Array of determined settings for registering a block type.
+ * @param array $metadata Metadata provided for registering a block type.
+ * @return array The block type settings
+ */
+function gutenberg_filter_block_type_metadata_settings_allow_variations_php_file( $settings, $metadata ) {
+	// If `variations` is a string, it's the name of a PHP file that
+	// generates the variations.
+	if ( ! empty( $settings['variations'] ) && is_string( $settings['variations'] ) ) {
+		$variations_path = wp_normalize_path(
+			realpath(
+				dirname( $metadata['file'] ) . '/' .
+				remove_block_asset_path_prefix( $settings['variations'] )
+			)
+		);
+		if ( $variations_path ) {
+			/**
+			 * Generates the list of block variations.
+			 *
+			 * @since 6.7.0
+			 *
+			 * @return string Returns the list of block variations.
+			 */
+			$settings['variation_callback'] = static function () use ( $variations_path ) {
+				$variations = require $variations_path;
+				return $variations;
+			};
+			// The block instance's `variations` field is only allowed to be an array
+			// (of known block variations). We unset it so that the block instance will
+			// provide a getter that returns the result of the `variation_callback` instead.
+			unset( $settings['variations'] );
+		}
+	}
+	return $settings;
+}
+add_filter( 'block_type_metadata_settings', 'gutenberg_filter_block_type_metadata_settings_allow_variations_php_file', 10, 2 );
+
+/**
+ * Adds post format query vars to the query loop block's WP_Query when the block's attributes call for them.
+ *
+ * @see 'query_loop_block_query_vars'
+ *
+ * @param array    $query The query vars.
+ * @param WP_Block $block Block instance.
+ * @return array   The filtered query vars.
+ */
+function gutenberg_add_format_query_vars_to_query_loop_block( $query, $block ) {
+	// Return early if there is no format or if the format is not an array.
+	if ( empty( $block->context['query']['format'] ) || ! is_array( $block->context['query']['format'] ) ) {
+		return $query;
+	}
+
+	$formats   = $block->context['query']['format'];
+	$tax_query = array( 'relation' => 'OR' );
+
+	// The default post format, 'standard', is not stored in the database.
+	// If 'standard' is part of the request, the query needs to exclude all post items that
+	// have a format assigned.
+	if ( in_array( 'standard', $formats, true ) ) {
+		$tax_query[] = array(
+			'taxonomy' => 'post_format',
+			'field'    => 'slug',
+			'terms'    => array(),
+			'operator' => 'NOT EXISTS',
+		);
+		// Remove the standard format, since it cannot be queried.
+		unset( $formats[ array_search( 'standard', $formats, true ) ] );
+	}
+
+	// Add any remaining formats to the tax query.
+	if ( ! empty( $formats ) ) {
+		// Add the post-format- prefix.
+		$terms = array_map(
+			static function ( $format ) {
+				return 'post-format-' . $format;
+			},
+			$formats
+		);
+
+		$tax_query[] = array(
+			'taxonomy' => 'post_format',
+			'field'    => 'slug',
+			'terms'    => $terms,
+			'operator' => 'IN',
+		);
+	}
+
+	// This condition is intended to prevent $tax_query from being added to $query
+	// if it only contains the relation.
+	if ( count( $tax_query ) > 1 ) {
+		$query['tax_query'][] = $tax_query;
+	}
+
+	return $query;
+}
+add_filter( 'query_loop_block_query_vars', 'gutenberg_add_format_query_vars_to_query_loop_block', 10, 2 );
diff --git a/lib/compat/wordpress-6.7/class-gutenberg-rest-posts-controller-6-7.php b/lib/compat/wordpress-6.7/class-gutenberg-rest-posts-controller-6-7.php
new file mode 100644
index 00000000000000..c7de4371c94f56
--- /dev/null
+++ b/lib/compat/wordpress-6.7/class-gutenberg-rest-posts-controller-6-7.php
@@ -0,0 +1,698 @@
+<?php
+/**
+ * REST API: Gutenberg_REST_Posts_Controller_6_7 class
+ *
+ * @package WordPress
+ * @subpackage REST_API
+ * @since 6.7.0
+ */
+
+/**
+ * Extend the core WP_REST_Posts_Controller class to add support for post formats.
+ *
+ * @see WP_REST_Controller
+ */
+class Gutenberg_REST_Posts_Controller_6_7 extends WP_REST_Posts_Controller {
+	/**
+	 * Post type.
+	 *
+	 * @since 4.7.0
+	 * @var string
+	 */
+	protected $post_type;
+
+	/**
+	 * Retrieves a collection of posts.
+	 *
+	 * @since 4.7.0
+	 * @since 6.7.0 Added support for the `format` query parameter.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function get_items( $request ) {
+		// Ensure a search string is set in case the orderby is set to 'relevance'.
+		if ( ! empty( $request['orderby'] ) && 'relevance' === $request['orderby'] && empty( $request['search'] ) ) {
+			return new WP_Error(
+				'rest_no_search_term_defined',
+				__( 'You need to define a search term to order by relevance.' ),
+				array( 'status' => 400 )
+			);
+		}
+
+		// Ensure an include parameter is set in case the orderby is set to 'include'.
+		if ( ! empty( $request['orderby'] ) && 'include' === $request['orderby'] && empty( $request['include'] ) ) {
+			return new WP_Error(
+				'rest_orderby_include_missing_include',
+				__( 'You need to define an include parameter to order by include.' ),
+				array( 'status' => 400 )
+			);
+		}
+
+		// Retrieve the list of registered collection query parameters.
+		$registered = $this->get_collection_params();
+		$args       = array();
+
+		/*
+		 * This array defines mappings between public API query parameters whose
+		 * values are accepted as-passed, and their internal WP_Query parameter
+		 * name equivalents (some are the same). Only values which are also
+		 * present in $registered will be set.
+		 */
+		$parameter_mappings = array(
+			'author'         => 'author__in',
+			'author_exclude' => 'author__not_in',
+			'exclude'        => 'post__not_in',
+			'include'        => 'post__in',
+			'menu_order'     => 'menu_order',
+			'offset'         => 'offset',
+			'order'          => 'order',
+			'orderby'        => 'orderby',
+			'page'           => 'paged',
+			'parent'         => 'post_parent__in',
+			'parent_exclude' => 'post_parent__not_in',
+			'search'         => 's',
+			'search_columns' => 'search_columns',
+			'slug'           => 'post_name__in',
+			'status'         => 'post_status',
+		);
+
+		/*
+		 * For each known parameter which is both registered and present in the request,
+		 * set the parameter's value on the query $args.
+		 */
+		foreach ( $parameter_mappings as $api_param => $wp_param ) {
+			if ( isset( $registered[ $api_param ], $request[ $api_param ] ) ) {
+				$args[ $wp_param ] = $request[ $api_param ];
+			}
+		}
+
+		// Check for & assign any parameters which require special handling or setting.
+		$args['date_query'] = array();
+
+		if ( isset( $registered['before'], $request['before'] ) ) {
+			$args['date_query'][] = array(
+				'before' => $request['before'],
+				'column' => 'post_date',
+			);
+		}
+
+		if ( isset( $registered['modified_before'], $request['modified_before'] ) ) {
+			$args['date_query'][] = array(
+				'before' => $request['modified_before'],
+				'column' => 'post_modified',
+			);
+		}
+
+		if ( isset( $registered['after'], $request['after'] ) ) {
+			$args['date_query'][] = array(
+				'after'  => $request['after'],
+				'column' => 'post_date',
+			);
+		}
+
+		if ( isset( $registered['modified_after'], $request['modified_after'] ) ) {
+			$args['date_query'][] = array(
+				'after'  => $request['modified_after'],
+				'column' => 'post_modified',
+			);
+		}
+
+		// Ensure our per_page parameter overrides any provided posts_per_page filter.
+		if ( isset( $registered['per_page'] ) ) {
+			$args['posts_per_page'] = $request['per_page'];
+		}
+
+		if ( isset( $registered['sticky'], $request['sticky'] ) ) {
+			$sticky_posts = get_option( 'sticky_posts', array() );
+			if ( ! is_array( $sticky_posts ) ) {
+				$sticky_posts = array();
+			}
+			if ( $request['sticky'] ) {
+				/*
+				 * As post__in will be used to only get sticky posts,
+				 * we have to support the case where post__in was already
+				 * specified.
+				 */
+				$args['post__in'] = $args['post__in'] ? array_intersect( $sticky_posts, $args['post__in'] ) : $sticky_posts;
+
+				/*
+				 * If we intersected, but there are no post IDs in common,
+				 * WP_Query won't return "no posts" for post__in = array()
+				 * so we have to fake it a bit.
+				 */
+				if ( ! $args['post__in'] ) {
+					$args['post__in'] = array( 0 );
+				}
+			} elseif ( $sticky_posts ) {
+				/*
+				 * As post___not_in will be used to only get posts that
+				 * are not sticky, we have to support the case where post__not_in
+				 * was already specified.
+				 */
+				$args['post__not_in'] = array_merge( $args['post__not_in'], $sticky_posts );
+			}
+		}
+
+		$args = $this->prepare_tax_query( $args, $request );
+
+		if ( ! empty( $request['format'] ) ) {
+			$formats   = $request['format'];
+			$tax_query = array( 'relation' => 'OR' );
+
+			// The default post format, 'standard', is not stored in the database.
+			// If 'standard' is part of the request, the query needs to exclude all post items that
+			// have a format assigned.
+			if ( in_array( 'standard', $formats, true ) ) {
+				$tax_query[] = array(
+					'taxonomy' => 'post_format',
+					'field'    => 'slug',
+					'terms'    => array(),
+					'operator' => 'NOT EXISTS',
+				);
+				// Remove the standard format, since it cannot be queried.
+				unset( $formats[ array_search( 'standard', $formats, true ) ] );
+			}
+
+			// Add any remaining formats to the tax query.
+			if ( ! empty( $formats ) ) {
+				// Add the post-format- prefix.
+				$terms = array_map(
+					static function ( $format ) {
+						return 'post-format-' . $format;
+					},
+					$formats
+				);
+
+				$tax_query[] = array(
+					'taxonomy' => 'post_format',
+					'field'    => 'slug',
+					'terms'    => $terms,
+					'operator' => 'IN',
+				);
+			}
+
+			// Enable filtering by both post formats and other taxonomies by combining them with AND.
+			if ( isset( $args['tax_query'] ) ) {
+				$args['tax_query'][] = array(
+					'relation' => 'AND',
+					$tax_query,
+				);
+			} else {
+				$args['tax_query'] = $tax_query;
+			}
+		}
+
+		// Force the post_type argument, since it's not a user input variable.
+		$args['post_type'] = $this->post_type;
+
+		/**
+		 * Filters WP_Query arguments when querying posts via the REST API.
+		 *
+		 * The dynamic portion of the hook name, `$this->post_type`, refers to the post type slug.
+		 *
+		 * Possible hook names include:
+		 *
+		 *  - `rest_post_query`
+		 *  - `rest_page_query`
+		 *  - `rest_attachment_query`
+		 *
+		 * Enables adding extra arguments or setting defaults for a post collection request.
+		 *
+		 * @since 4.7.0
+		 * @since 5.7.0 Moved after the `tax_query` query arg is generated.
+		 *
+		 * @link https://developer.wordpress.org/reference/classes/wp_query/
+		 *
+		 * @param array           $args    Array of arguments for WP_Query.
+		 * @param WP_REST_Request $request The REST API request.
+		 */
+		$args       = apply_filters( "rest_{$this->post_type}_query", $args, $request );
+		$query_args = $this->prepare_items_query( $args, $request );
+
+		$posts_query  = new WP_Query();
+		$query_result = $posts_query->query( $query_args );
+
+		// Allow access to all password protected posts if the context is edit.
+		if ( 'edit' === $request['context'] ) {
+			add_filter( 'post_password_required', array( $this, 'check_password_required' ), 10, 2 );
+		}
+
+		$posts = array();
+
+		update_post_author_caches( $query_result );
+		update_post_parent_caches( $query_result );
+
+		if ( post_type_supports( $this->post_type, 'thumbnail' ) ) {
+			update_post_thumbnail_cache( $posts_query );
+		}
+
+		foreach ( $query_result as $post ) {
+			if ( ! $this->check_read_permission( $post ) ) {
+				continue;
+			}
+
+			$data    = $this->prepare_item_for_response( $post, $request );
+			$posts[] = $this->prepare_response_for_collection( $data );
+		}
+
+		// Reset filter.
+		if ( 'edit' === $request['context'] ) {
+			remove_filter( 'post_password_required', array( $this, 'check_password_required' ) );
+		}
+
+		$page        = (int) $query_args['paged'];
+		$total_posts = $posts_query->found_posts;
+
+		if ( $total_posts < 1 && $page > 1 ) {
+			// Out-of-bounds, run the query again without LIMIT for total count.
+			unset( $query_args['paged'] );
+
+			$count_query = new WP_Query();
+			$count_query->query( $query_args );
+			$total_posts = $count_query->found_posts;
+		}
+
+		$max_pages = (int) ceil( $total_posts / (int) $posts_query->query_vars['posts_per_page'] );
+
+		if ( $page > $max_pages && $total_posts > 0 ) {
+			return new WP_Error(
+				'rest_post_invalid_page_number',
+				__( 'The page number requested is larger than the number of pages available.' ),
+				array( 'status' => 400 )
+			);
+		}
+
+		$response = rest_ensure_response( $posts );
+
+		$response->header( 'X-WP-Total', (int) $total_posts );
+		$response->header( 'X-WP-TotalPages', (int) $max_pages );
+
+		$request_params = $request->get_query_params();
+		$collection_url = rest_url( rest_get_route_for_post_type_items( $this->post_type ) );
+		$base           = add_query_arg( urlencode_deep( $request_params ), $collection_url );
+
+		if ( $page > 1 ) {
+			$prev_page = $page - 1;
+
+			if ( $prev_page > $max_pages ) {
+				$prev_page = $max_pages;
+			}
+
+			$prev_link = add_query_arg( 'page', $prev_page, $base );
+			$response->link_header( 'prev', $prev_link );
+		}
+		if ( $max_pages > $page ) {
+			$next_page = $page + 1;
+			$next_link = add_query_arg( 'page', $next_page, $base );
+
+			$response->link_header( 'next', $next_link );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Retrieves the query params for the posts collection.
+	 *
+	 * @since 4.7.0
+	 * @since 5.4.0 The `tax_relation` query parameter was added.
+	 * @since 5.7.0 The `modified_after` and `modified_before` query parameters were added.
+	 * @since 6.7.0 The `format` query parameter was added.
+	 *
+	 * @return array Collection parameters.
+	 */
+	public function get_collection_params() {
+		$query_params = parent::get_collection_params();
+
+		$query_params['context']['default'] = 'view';
+
+		$query_params['after'] = array(
+			'description' => __( 'Limit response to posts published after a given ISO8601 compliant date.' ),
+			'type'        => 'string',
+			'format'      => 'date-time',
+		);
+
+		$query_params['modified_after'] = array(
+			'description' => __( 'Limit response to posts modified after a given ISO8601 compliant date.' ),
+			'type'        => 'string',
+			'format'      => 'date-time',
+		);
+
+		if ( post_type_supports( $this->post_type, 'author' ) ) {
+			$query_params['author']         = array(
+				'description' => __( 'Limit result set to posts assigned to specific authors.' ),
+				'type'        => 'array',
+				'items'       => array(
+					'type' => 'integer',
+				),
+				'default'     => array(),
+			);
+			$query_params['author_exclude'] = array(
+				'description' => __( 'Ensure result set excludes posts assigned to specific authors.' ),
+				'type'        => 'array',
+				'items'       => array(
+					'type' => 'integer',
+				),
+				'default'     => array(),
+			);
+		}
+
+		$query_params['before'] = array(
+			'description' => __( 'Limit response to posts published before a given ISO8601 compliant date.' ),
+			'type'        => 'string',
+			'format'      => 'date-time',
+		);
+
+		$query_params['modified_before'] = array(
+			'description' => __( 'Limit response to posts modified before a given ISO8601 compliant date.' ),
+			'type'        => 'string',
+			'format'      => 'date-time',
+		);
+
+		$query_params['exclude'] = array(
+			'description' => __( 'Ensure result set excludes specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
+			),
+			'default'     => array(),
+		);
+
+		$query_params['include'] = array(
+			'description' => __( 'Limit result set to specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
+			),
+			'default'     => array(),
+		);
+
+		if ( 'page' === $this->post_type || post_type_supports( $this->post_type, 'page-attributes' ) ) {
+			$query_params['menu_order'] = array(
+				'description' => __( 'Limit result set to posts with a specific menu_order value.' ),
+				'type'        => 'integer',
+			);
+		}
+
+		$query_params['offset'] = array(
+			'description' => __( 'Offset the result set by a specific number of items.' ),
+			'type'        => 'integer',
+		);
+
+		$query_params['order'] = array(
+			'description' => __( 'Order sort attribute ascending or descending.' ),
+			'type'        => 'string',
+			'default'     => 'desc',
+			'enum'        => array( 'asc', 'desc' ),
+		);
+
+		$query_params['orderby'] = array(
+			'description' => __( 'Sort collection by post attribute.' ),
+			'type'        => 'string',
+			'default'     => 'date',
+			'enum'        => array(
+				'author',
+				'date',
+				'id',
+				'include',
+				'modified',
+				'parent',
+				'relevance',
+				'slug',
+				'include_slugs',
+				'title',
+			),
+		);
+
+		if ( 'page' === $this->post_type || post_type_supports( $this->post_type, 'page-attributes' ) ) {
+			$query_params['orderby']['enum'][] = 'menu_order';
+		}
+
+		$post_type = get_post_type_object( $this->post_type );
+
+		if ( $post_type->hierarchical || 'attachment' === $this->post_type ) {
+			$query_params['parent']         = array(
+				'description' => __( 'Limit result set to items with particular parent IDs.' ),
+				'type'        => 'array',
+				'items'       => array(
+					'type' => 'integer',
+				),
+				'default'     => array(),
+			);
+			$query_params['parent_exclude'] = array(
+				'description' => __( 'Limit result set to all items except those of a particular parent ID.' ),
+				'type'        => 'array',
+				'items'       => array(
+					'type' => 'integer',
+				),
+				'default'     => array(),
+			);
+		}
+
+		$query_params['search_columns'] = array(
+			'default'     => array(),
+			'description' => __( 'Array of column names to be searched.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'enum' => array( 'post_title', 'post_content', 'post_excerpt' ),
+				'type' => 'string',
+			),
+		);
+
+		$query_params['slug'] = array(
+			'description' => __( 'Limit result set to posts with one or more specific slugs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'string',
+			),
+		);
+
+		$query_params['status'] = array(
+			'default'           => 'publish',
+			'description'       => __( 'Limit result set to posts assigned one or more statuses.' ),
+			'type'              => 'array',
+			'items'             => array(
+				'enum' => array_merge( array_keys( get_post_stati() ), array( 'any' ) ),
+				'type' => 'string',
+			),
+			'sanitize_callback' => array( $this, 'sanitize_post_statuses' ),
+		);
+
+		$query_params = $this->prepare_taxonomy_limit_schema( $query_params );
+
+		if ( 'post' === $this->post_type ) {
+			$query_params['sticky'] = array(
+				'description' => __( 'Limit result set to items that are sticky.' ),
+				'type'        => 'boolean',
+			);
+		}
+
+		if ( post_type_supports( $this->post_type, 'post-formats' ) ) {
+			$query_params['format'] = array(
+				'description' => __( 'Limit result set to items assigned one or more given formats.' ),
+				'type'        => 'array',
+				'uniqueItems' => true,
+				'items'       => array(
+					'enum' => array_values( get_post_format_slugs() ),
+					'type' => 'string',
+				),
+			);
+		}
+
+		/**
+		 * Filters collection parameters for the posts controller.
+		 *
+		 * The dynamic part of the filter `$this->post_type` refers to the post
+		 * type slug for the controller.
+		 *
+		 * This filter registers the collection parameter, but does not map the
+		 * collection parameter to an internal WP_Query parameter. Use the
+		 * `rest_{$this->post_type}_query` filter to set WP_Query parameters.
+		 *
+		 * @since 4.7.0
+		 *
+		 * @param array        $query_params JSON Schema-formatted collection parameters.
+		 * @param WP_Post_Type $post_type    Post type object.
+		 */
+		return apply_filters( "rest_{$this->post_type}_collection_params", $query_params, $post_type );
+	}
+
+	/**
+	 * Prepares the 'tax_query' for a collection of posts.
+	 *
+	 * @since 5.7.0
+	 *
+	 * @param array           $args    WP_Query arguments.
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return array Updated query arguments.
+	 */
+	private function prepare_tax_query( array $args, WP_REST_Request $request ) {
+		$relation = $request['tax_relation'];
+
+		if ( $relation ) {
+			$args['tax_query'] = array( 'relation' => $relation );
+		}
+
+		$taxonomies = wp_list_filter(
+			get_object_taxonomies( $this->post_type, 'objects' ),
+			array( 'show_in_rest' => true )
+		);
+
+		foreach ( $taxonomies as $taxonomy ) {
+			$base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
+
+			$tax_include = $request[ $base ];
+			$tax_exclude = $request[ $base . '_exclude' ];
+
+			if ( $tax_include ) {
+				$terms            = array();
+				$include_children = false;
+				$operator         = 'IN';
+
+				if ( rest_is_array( $tax_include ) ) {
+					$terms = $tax_include;
+				} elseif ( rest_is_object( $tax_include ) ) {
+					$terms            = empty( $tax_include['terms'] ) ? array() : $tax_include['terms'];
+					$include_children = ! empty( $tax_include['include_children'] );
+
+					if ( isset( $tax_include['operator'] ) && 'AND' === $tax_include['operator'] ) {
+						$operator = 'AND';
+					}
+				}
+
+				if ( $terms ) {
+					$args['tax_query'][] = array(
+						'taxonomy'         => $taxonomy->name,
+						'field'            => 'term_id',
+						'terms'            => $terms,
+						'include_children' => $include_children,
+						'operator'         => $operator,
+					);
+				}
+			}
+
+			if ( $tax_exclude ) {
+				$terms            = array();
+				$include_children = false;
+
+				if ( rest_is_array( $tax_exclude ) ) {
+					$terms = $tax_exclude;
+				} elseif ( rest_is_object( $tax_exclude ) ) {
+					$terms            = empty( $tax_exclude['terms'] ) ? array() : $tax_exclude['terms'];
+					$include_children = ! empty( $tax_exclude['include_children'] );
+				}
+
+				if ( $terms ) {
+					$args['tax_query'][] = array(
+						'taxonomy'         => $taxonomy->name,
+						'field'            => 'term_id',
+						'terms'            => $terms,
+						'include_children' => $include_children,
+						'operator'         => 'NOT IN',
+					);
+				}
+			}
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Prepares the collection schema for including and excluding items by terms.
+	 *
+	 * @since 5.7.0
+	 *
+	 * @param array $query_params Collection schema.
+	 * @return array Updated schema.
+	 */
+	private function prepare_taxonomy_limit_schema( array $query_params ) {
+		$taxonomies = wp_list_filter( get_object_taxonomies( $this->post_type, 'objects' ), array( 'show_in_rest' => true ) );
+
+		if ( ! $taxonomies ) {
+			return $query_params;
+		}
+
+		$query_params['tax_relation'] = array(
+			'description' => __( 'Limit result set based on relationship between multiple taxonomies.' ),
+			'type'        => 'string',
+			'enum'        => array( 'AND', 'OR' ),
+		);
+
+		$limit_schema = array(
+			'type'  => array( 'object', 'array' ),
+			'oneOf' => array(
+				array(
+					'title'       => __( 'Term ID List' ),
+					'description' => __( 'Match terms with the listed IDs.' ),
+					'type'        => 'array',
+					'items'       => array(
+						'type' => 'integer',
+					),
+				),
+				array(
+					'title'                => __( 'Term ID Taxonomy Query' ),
+					'description'          => __( 'Perform an advanced term query.' ),
+					'type'                 => 'object',
+					'properties'           => array(
+						'terms'            => array(
+							'description' => __( 'Term IDs.' ),
+							'type'        => 'array',
+							'items'       => array(
+								'type' => 'integer',
+							),
+							'default'     => array(),
+						),
+						'include_children' => array(
+							'description' => __( 'Whether to include child terms in the terms limiting the result set.' ),
+							'type'        => 'boolean',
+							'default'     => false,
+						),
+					),
+					'additionalProperties' => false,
+				),
+			),
+		);
+
+		$include_schema = array_merge(
+			array(
+				/* translators: %s: Taxonomy name. */
+				'description' => __( 'Limit result set to items with specific terms assigned in the %s taxonomy.' ),
+			),
+			$limit_schema
+		);
+		// 'operator' is supported only for 'include' queries.
+		$include_schema['oneOf'][1]['properties']['operator'] = array(
+			'description' => __( 'Whether items must be assigned all or any of the specified terms.' ),
+			'type'        => 'string',
+			'enum'        => array( 'AND', 'OR' ),
+			'default'     => 'OR',
+		);
+
+		$exclude_schema = array_merge(
+			array(
+				/* translators: %s: Taxonomy name. */
+				'description' => __( 'Limit result set to items except those with specific terms assigned in the %s taxonomy.' ),
+			),
+			$limit_schema
+		);
+
+		foreach ( $taxonomies as $taxonomy ) {
+			$base         = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
+			$base_exclude = $base . '_exclude';
+
+			$query_params[ $base ]                = $include_schema;
+			$query_params[ $base ]['description'] = sprintf( $query_params[ $base ]['description'], $base );
+
+			$query_params[ $base_exclude ]                = $exclude_schema;
+			$query_params[ $base_exclude ]['description'] = sprintf( $query_params[ $base_exclude ]['description'], $base );
+
+			if ( ! $taxonomy->hierarchical ) {
+				unset( $query_params[ $base ]['oneOf'][1]['properties']['include_children'] );
+				unset( $query_params[ $base_exclude ]['oneOf'][1]['properties']['include_children'] );
+			}
+		}
+
+		return $query_params;
+	}
+}
diff --git a/lib/compat/wordpress-6.7/class-gutenberg-rest-server.php b/lib/compat/wordpress-6.7/class-gutenberg-rest-server.php
new file mode 100644
index 00000000000000..efdc41289dfac2
--- /dev/null
+++ b/lib/compat/wordpress-6.7/class-gutenberg-rest-server.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * A custom REST server for Gutenberg.
+ *
+ * @package gutenberg
+ * @since   6.7.0
+ */
+
+class Gutenberg_REST_Server extends WP_REST_Server {
+	/**
+	 * Converts a response to data to send.
+	 *
+	 * @since 4.4.0
+	 * @since 5.4.0 The `$embed` parameter can now contain a list of link relations to include.
+	 *
+	 * @param WP_REST_Response $response Response object.
+	 * @param bool|string[]    $embed    Whether to embed all links, a filtered list of link relations, or no links.
+	 * @return array {
+	 *     Data with sub-requests embedded.
+	 *
+	 *     @type array $_links    Links.
+	 *     @type array $_embedded Embedded objects.
+	 * }
+	 */
+	// @core-merge: Do not merge. The method is copied here to fix the inheritance issue.
+	public function response_to_data( $response, $embed ) {
+		$data  = $response->get_data();
+		$links = static::get_compact_response_links( $response );
+
+		if ( ! empty( $links ) ) {
+			// Convert links to part of the data.
+			$data['_links'] = $links;
+		}
+
+		if ( $embed ) {
+			$this->embed_cache = array();
+			// Determine if this is a numeric array.
+			if ( wp_is_numeric_array( $data ) ) {
+				foreach ( $data as $key => $item ) {
+					$data[ $key ] = $this->embed_links( $item, $embed );
+				}
+			} else {
+				$data = $this->embed_links( $data, $embed );
+			}
+			$this->embed_cache = array();
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Retrieves links from a response.
+	 *
+	 * Extracts the links from a response into a structured hash, suitable for
+	 * direct output.
+	 *
+	 * @since 4.4.0
+	 * @since 6.7.0 The `targetHints` property to the `self` link object was added.
+	 *
+	 * @param WP_REST_Response $response Response to extract links from.
+	 * @return array Map of link relation to list of link hashes.
+	 */
+	public static function get_response_links( $response ) {
+		$links = $response->get_links();
+
+		if ( empty( $links ) ) {
+			return array();
+		}
+
+		$server = rest_get_server();
+
+		// Convert links to part of the data.
+		$data = array();
+		foreach ( $links as $rel => $items ) {
+			$data[ $rel ] = array();
+
+			foreach ( $items as $item ) {
+				$attributes         = $item['attributes'];
+				$attributes['href'] = $item['href'];
+
+				if ( 'self' !== $rel ) {
+					$data[ $rel ][] = $attributes;
+					continue;
+				}
+
+				// Prefer targetHints that were specifically designated by the developer.
+				if ( isset( $attributes['targetHints']['allow'] ) ) {
+					$data[ $rel ][] = $attributes;
+					continue;
+				}
+
+				$request = WP_REST_Request::from_url( $item['href'] );
+				if ( ! $request ) {
+					$data[ $rel ][] = $attributes;
+					continue;
+				}
+
+				$matched = $server->match_request_to_handler( $request );
+
+				if ( is_wp_error( $matched ) ) {
+					$data[ $rel ][] = $attributes;
+					continue;
+				}
+
+				if ( is_wp_error( $request->has_valid_params() ) ) {
+					$data[ $rel ][] = $attributes;
+					continue;
+				}
+
+				if ( is_wp_error( $request->sanitize_params() ) ) {
+					$data[ $rel ][] = $attributes;
+					continue;
+				}
+
+				list( $route, $handler ) = $matched;
+
+				$response = new WP_REST_Response();
+				$response->set_matched_route( $route );
+				$response->set_matched_handler( $handler );
+				$headers = rest_send_allow_header( $response, $server, $request )->get_headers();
+
+				foreach ( $headers as $name => $value ) {
+					$name                               = WP_REST_Request::canonicalize_header_name( $name );
+					$attributes['targetHints'][ $name ] = array_map( 'trim', explode( ',', $value ) );
+				}
+
+				$data[ $rel ][] = $attributes;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Retrieves the CURIEs (compact URIs) used for relations.
+	 *
+	 * Extracts the links from a response into a structured hash, suitable for
+	 * direct output.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @param WP_REST_Response $response Response to extract links from.
+	 * @return array Map of link relation to list of link hashes.
+	 */
+	// @core-merge: Do not merge. The method is copied here to fix the inheritance issue.
+	public static function get_compact_response_links( $response ) {
+		$links = static::get_response_links( $response );
+
+		if ( empty( $links ) ) {
+			return array();
+		}
+
+		$curies      = $response->get_curies();
+		$used_curies = array();
+
+		foreach ( $links as $rel => $items ) {
+
+			// Convert $rel URIs to their compact versions if they exist.
+			foreach ( $curies as $curie ) {
+				$href_prefix = substr( $curie['href'], 0, strpos( $curie['href'], '{rel}' ) );
+				if ( ! str_starts_with( $rel, $href_prefix ) ) {
+					continue;
+				}
+
+				// Relation now changes from '$uri' to '$curie:$relation'.
+				$rel_regex = str_replace( '\{rel\}', '(.+)', preg_quote( $curie['href'], '!' ) );
+				preg_match( '!' . $rel_regex . '!', $rel, $matches );
+				if ( $matches ) {
+					$new_rel                       = $curie['name'] . ':' . $matches[1];
+					$used_curies[ $curie['name'] ] = $curie;
+					$links[ $new_rel ]             = $items;
+					unset( $links[ $rel ] );
+					break;
+				}
+			}
+		}
+
+		// Push the curies onto the start of the links array.
+		if ( $used_curies ) {
+			$links['curies'] = array_values( $used_curies );
+		}
+
+		return $links;
+	}
+}
diff --git a/lib/compat/wordpress-6.7/class-gutenberg-rest-templates-controller-6-7.php b/lib/compat/wordpress-6.7/class-gutenberg-rest-templates-controller-6-7.php
new file mode 100644
index 00000000000000..ed67dded75ecb1
--- /dev/null
+++ b/lib/compat/wordpress-6.7/class-gutenberg-rest-templates-controller-6-7.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * REST API: Gutenberg_REST_Templates_Controller_6_7 class
+ *
+ * @package    gutenberg
+ */
+
+/**
+ * Gutenberg_REST_Templates_Controller_6_7 class
+ *
+ */
+class Gutenberg_REST_Templates_Controller_6_7 extends Gutenberg_REST_Templates_Controller_6_6 {
+	/**
+	 * Returns the given template
+	 *
+	 * @param WP_REST_Request $request The request instance.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_item( $request ) {
+		if ( isset( $request['source'] ) && ( 'theme' === $request['source'] || 'plugin' === $request['source'] ) ) {
+			$template = get_block_file_template( $request['id'], $this->post_type );
+		} else {
+			$template = get_block_template( $request['id'], $this->post_type );
+		}
+
+		if ( ! $template ) {
+			return new WP_Error( 'rest_template_not_found', __( 'No templates exist with that id.' ), array( 'status' => 404 ) );
+		}
+
+		return $this->prepare_item_for_response( $template, $request );
+	}
+
+	/**
+	 * Prepare a single template output for response
+	 *
+	 * @param WP_Block_Template $item    Template instance.
+	 * @param WP_REST_Request   $request Request object.
+	 * @return WP_REST_Response Response object.
+	 */
+	// @core-merge: Fix wrong author in plugin templates.
+	public function prepare_item_for_response( $item, $request ) {
+		$template = $item;
+
+		$fields = $this->get_fields_for_response( $request );
+
+		if ( 'plugin' !== $item->origin ) {
+			return parent::prepare_item_for_response( $item, $request );
+		}
+		$cloned_item = clone $item;
+		// Set the origin as theme when calling the previous `prepare_item_for_response()` to prevent warnings when generating the author text.
+		$cloned_item->origin = 'theme';
+		$response            = parent::prepare_item_for_response( $cloned_item, $request );
+		$data                = $response->data;
+
+		if ( rest_is_field_included( 'origin', $fields ) ) {
+			$data['origin'] = 'plugin';
+		}
+
+		if ( rest_is_field_included( 'plugin', $fields ) ) {
+			$registered_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $cloned_item->slug );
+			if ( $registered_template ) {
+				$data['plugin'] = $registered_template->plugin;
+			}
+		}
+
+		if ( rest_is_field_included( 'author_text', $fields ) ) {
+			$data['author_text'] = $this->get_wp_templates_author_text_field( $template );
+		}
+
+		if ( rest_is_field_included( 'original_source', $fields ) ) {
+			$data['original_source'] = $this->get_wp_templates_original_source_field( $template );
+		}
+
+		$response = rest_ensure_response( $data );
+
+		if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
+			$links = $this->prepare_links( $template->id );
+			$response->add_links( $links );
+			if ( ! empty( $links['self']['href'] ) ) {
+				$actions = $this->get_available_actions();
+				$self    = $links['self']['href'];
+				foreach ( $actions as $rel ) {
+					$response->add_link( $rel, $self );
+				}
+			}
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Returns the source from where the template originally comes from.
+	 *
+	 * @param WP_Block_Template $template_object Template instance.
+	 * @return string                            Original source of the template one of theme, plugin, site, or user.
+	 */
+	// @core-merge: Changed the comments format (from inline to multi-line) in the entire function.
+	private static function get_wp_templates_original_source_field( $template_object ) {
+		if ( 'wp_template' === $template_object->type || 'wp_template_part' === $template_object->type ) {
+			/*
+			 * Added by theme.
+			 * Template originally provided by a theme, but customized by a user.
+			 * Templates originally didn't have the 'origin' field so identify
+			 * older customized templates by checking for no origin and a 'theme'
+			 * or 'custom' source.
+			 */
+			if ( $template_object->has_theme_file &&
+			( 'theme' === $template_object->origin || (
+				empty( $template_object->origin ) && in_array(
+					$template_object->source,
+					array(
+						'theme',
+						'custom',
+					),
+					true
+				) )
+			)
+			) {
+				return 'theme';
+			}
+
+			// Added by plugin.
+			// @core-merge: Removed `$template_object->has_theme_file` check from this if clause.
+			if ( 'plugin' === $template_object->origin ) {
+				return 'plugin';
+			}
+
+			/*
+			 * Added by site.
+			 * Template was created from scratch, but has no author. Author support
+			 * was only added to templates in WordPress 5.9. Fallback to showing the
+			 * site logo and title.
+			 */
+			if ( empty( $template_object->has_theme_file ) && 'custom' === $template_object->source && empty( $template_object->author ) ) {
+				return 'site';
+			}
+		}
+
+		// Added by user.
+		return 'user';
+	}
+
+	/**
+	 * Returns a human readable text for the author of the template.
+	 *
+	 * @param WP_Block_Template $template_object Template instance.
+	 * @return string                            Human readable text for the author.
+	 */
+	private static function get_wp_templates_author_text_field( $template_object ) {
+		$original_source = self::get_wp_templates_original_source_field( $template_object );
+		switch ( $original_source ) {
+			case 'theme':
+				$theme_name = wp_get_theme( $template_object->theme )->get( 'Name' );
+				return empty( $theme_name ) ? $template_object->theme : $theme_name;
+			case 'plugin':
+				// @core-merge: Prioritize plugin name instead of theme name for plugin-registered templates.
+				if ( ! function_exists( 'get_plugins' ) || ! function_exists( 'get_plugin_data' ) ) {
+					require_once ABSPATH . 'wp-admin/includes/plugin.php';
+				}
+				if ( isset( $template_object->plugin ) ) {
+					$plugins = wp_get_active_and_valid_plugins();
+
+					foreach ( $plugins as $plugin_file ) {
+						$plugin_basename = plugin_basename( $plugin_file );
+						// Split basename by '/' to get the plugin slug.
+						list( $plugin_slug, ) = explode( '/', $plugin_basename );
+
+						if ( $plugin_slug === $template_object->plugin ) {
+							$plugin_data = get_plugin_data( $plugin_file );
+
+							if ( ! empty( $plugin_data['Name'] ) ) {
+								return $plugin_data['Name'];
+							}
+
+							break;
+						}
+					}
+				}
+
+				/*
+				 * Fall back to the theme name if the plugin is not defined. That's needed to keep backwards
+				 * compatibility with templates that were registered before the plugin attribute was added.
+				 */
+				$plugins         = get_plugins();
+				$plugin_basename = plugin_basename( sanitize_text_field( $template_object->theme . '.php' ) );
+				if ( isset( $plugins[ $plugin_basename ] ) && isset( $plugins[ $plugin_basename ]['Name'] ) ) {
+					return $plugins[ $plugin_basename ]['Name'];
+				}
+				return isset( $template_object->plugin ) ?
+					$template_object->plugin :
+					$template_object->theme;
+				// @core-merge: End of changes to merge in core.
+			case 'site':
+				return get_bloginfo( 'name' );
+			case 'user':
+				$author = get_user_by( 'id', $template_object->author );
+				if ( ! $author ) {
+					return __( 'Unknown author' );
+				}
+				return $author->get( 'display_name' );
+		}
+	}
+}
diff --git a/lib/compat/wordpress-6.7/class-gutenberg-token-map-6-7.php b/lib/compat/wordpress-6.7/class-gutenberg-token-map-6-7.php
new file mode 100644
index 00000000000000..a2142171ddc14f
--- /dev/null
+++ b/lib/compat/wordpress-6.7/class-gutenberg-token-map-6-7.php
@@ -0,0 +1,820 @@
+<?php
+
+/**
+ * Class for efficiently looking up and mapping string keys to string values, with limits.
+ *
+ * @package    WordPress
+ * @since      6.6.0
+ */
+
+/**
+ * WP_Token_Map class.
+ *
+ * Use this class in specific circumstances with a static set of lookup keys which map to
+ * a static set of transformed values. For example, this class is used to map HTML named
+ * character references to their equivalent UTF-8 values.
+ *
+ * This class works differently than code calling `in_array()` and other methods. It
+ * internalizes lookup logic and provides helper interfaces to optimize lookup and
+ * transformation. It provides a method for precomputing the lookup tables and storing
+ * them as PHP source code.
+ *
+ * All tokens and substitutions must be shorter than 256 bytes.
+ *
+ * Example:
+ *
+ *     $smilies = WP_Token_Map::from_array( array(
+ *         '8O' => '😯',
+ *         ':(' => '🙁',
+ *         ':)' => '🙂',
+ *         ':?' => '😕',
+ *      ) );
+ *
+ *      true  === $smilies->contains( ':)' );
+ *      false === $smilies->contains( 'simile' );
+ *
+ *      '😕' === $smilies->read_token( 'Not sure :?.', 9, $length_of_smily_syntax );
+ *      2    === $length_of_smily_syntax;
+ *
+ * ## Precomputing the Token Map.
+ *
+ * Creating the class involves some work sorting and organizing the tokens and their
+ * replacement values. In order to skip this, it's possible for the class to export
+ * its state and be used as actual PHP source code.
+ *
+ * Example:
+ *
+ *      // Export with four spaces as the indent, only for the sake of this docblock.
+ *      // The default indent is a tab character.
+ *      $indent = '    ';
+ *      echo $smilies->precomputed_php_source_table( $indent );
+ *
+ *      // Output, to be pasted into a PHP source file:
+ *      WP_Token_Map::from_precomputed_table(
+ *          array(
+ *              "storage_version" => "6.6.0",
+ *              "key_length" => 2,
+ *              "groups" => "",
+ *              "long_words" => array(),
+ *              "small_words" => "8O\x00:)\x00:(\x00:?\x00",
+ *              "small_mappings" => array( "😯", "🙂", "🙁", "😕" )
+ *          )
+ *      );
+ *
+ * ## Large vs. small words.
+ *
+ * This class uses a short prefix called the "key" to optimize lookup of its tokens.
+ * This means that some tokens may be shorter than or equal in length to that key.
+ * Those words that are longer than the key are called "large" while those shorter
+ * than or equal to the key length are called "small."
+ *
+ * This separation of large and small words is incidental to the way this class
+ * optimizes lookup, and should be considered an internal implementation detail
+ * of the class. It may still be important to be aware of it, however.
+ *
+ * ## Determining Key Length.
+ *
+ * The choice of the size of the key length should be based on the data being stored in
+ * the token map. It should divide the data as evenly as possible, but should not create
+ * so many groups that a large fraction of the groups only contain a single token.
+ *
+ * For the HTML5 named character references, a key length of 2 was found to provide a
+ * sufficient spread and should be a good default for relatively large sets of tokens.
+ *
+ * However, for some data sets this might be too long. For example, a list of smilies
+ * may be too small for a key length of 2. Perhaps 1 would be more appropriate. It's
+ * best to experiment and determine empirically which values are appropriate.
+ *
+ * ## Generate Pre-Computed Source Code.
+ *
+ * Since the `WP_Token_Map` is designed for relatively static lookups, it can be
+ * advantageous to precompute the values and instantiate a table that has already
+ * sorted and grouped the tokens and built the lookup strings.
+ *
+ * This can be done with `WP_Token_Map::precomputed_php_source_table()`.
+ *
+ * Note that if there is a leading character that all tokens need, such as `&` for
+ * HTML named character references, it can be beneficial to exclude this from the
+ * token map. Instead, find occurrences of the leading character and then use the
+ * token map to see if the following characters complete the token.
+ *
+ * Example:
+ *
+ *     $map = WP_Token_Map::from_array( array( 'simple_smile:' => '🙂', 'sob:' => '😭', 'soba:' => '🍜' ) );
+ *     echo $map->precomputed_php_source_table();
+ *     // Output
+ *     WP_Token_Map::from_precomputed_table(
+ *         array(
+ *             "storage_version" => "6.6.0",
+ *             "key_length" => 2,
+ *             "groups" => "si\x00so\x00",
+ *             "long_words" => array(
+ *                 // simple_smile:[🙂].
+ *                 "\x0bmple_smile:\x04🙂",
+ *                 // soba:[🍜] sob:[😭].
+ *                 "\x03ba:\x04🍜\x02b:\x04😭",
+ *             ),
+ *             "short_words" => "",
+ *             "short_mappings" => array()
+ *         }
+ *     );
+ *
+ * This precomputed value can be stored directly in source code and will skip the
+ * startup cost of generating the lookup strings. See `$html5_named_character_entities`.
+ *
+ * Note that any updates to the precomputed format should update the storage version
+ * constant. It would also be best to provide an update function to take older known
+ * versions and upgrade them in place when loading into `from_precomputed_table()`.
+ *
+ * ## Future Direction.
+ *
+ * It may be viable to dynamically increase the length limits such that there's no need to impose them.
+ * The limit appears because of the packing structure, which indicates how many bytes each segment of
+ * text in the lookup tables spans. If, however, care were taken to track the longest word length, then
+ * the packing structure could change its representation to allow for that. Each additional byte storing
+ * length, however, increases the memory overhead and lookup runtime.
+ *
+ * An alternative approach could be to borrow the UTF-8 variable-length encoding and store lengths of less
+ * than 127 as a single byte with the high bit unset, storing longer lengths as the combination of
+ * continuation bytes.
+ *
+ * Since it has not been shown during the development of this class that longer strings are required, this
+ * update is deferred until such a need is clear.
+ *
+ * @since 6.6.0
+ */
+class Gutenberg_Token_Map_6_7 {
+	/**
+	 * Denotes the version of the code which produces pre-computed source tables.
+	 *
+	 * This version will be used not only to verify pre-computed data, but also
+	 * to upgrade pre-computed data from older versions. Choosing a name that
+	 * corresponds to the WordPress release will help people identify where an
+	 * old copy of data came from.
+	 */
+	const STORAGE_VERSION = '6.6.0-trunk';
+
+	/**
+	 * Maximum length for each key and each transformed value in the table (in bytes).
+	 *
+	 * @since 6.6.0
+	 */
+	const MAX_LENGTH = 256;
+
+	/**
+	 * How many bytes of each key are used to form a group key for lookup.
+	 * This also determines whether a word is considered short or long.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var int
+	 */
+	private $key_length = 2;
+
+	/**
+	 * Stores an optimized form of the word set, where words are grouped
+	 * by a prefix of the `$key_length` and then collapsed into a string.
+	 *
+	 * In each group, the keys and lookups form a packed data structure.
+	 * The keys in the string are stripped of their "group key," which is
+	 * the prefix of length `$this->key_length` shared by all of the items
+	 * in the group. Each word in the string is prefixed by a single byte
+	 * whose raw unsigned integer value represents how many bytes follow.
+	 *
+	 *     ┌────────────────┬───────────────┬─────────────────┬────────┐
+	 *     │ Length of rest │ Rest of key   │ Length of value │ Value  │
+	 *     │ of key (bytes) │               │ (bytes)         │        │
+	 *     ├────────────────┼───────────────┼─────────────────┼────────┤
+	 *     │ 0x08           │ nterDot;      │ 0x02            │ ·      │
+	 *     └────────────────┴───────────────┴─────────────────┴────────┘
+	 *
+	 * In this example, the key `CenterDot;` has a group key `Ce`, leaving
+	 * eight bytes for the rest of the key, `nterDot;`, and two bytes for
+	 * the transformed value `·` (or U+B7 or "\xC2\xB7").
+	 *
+	 * Example:
+	 *
+	 *    // Stores array( 'CenterDot;' => '·', 'Cedilla;' => '¸' ).
+	 *    $groups      = "Ce\x00";
+	 *    $large_words = array( "\x08nterDot;\x02·\x06dilla;\x02¸" )
+	 *
+	 * The prefixes appear in the `$groups` string, each followed by a null
+	 * byte. This makes for quick lookup of where in the group string the key
+	 * is found, and then a simple division converts that offset into the index
+	 * in the `$large_words` array where the group string is to be found.
+	 *
+	 * This lookup data structure is designed to optimize cache locality and
+	 * minimize indirect memory reads when matching strings in the set.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var array
+	 */
+	private $large_words = array();
+
+	/**
+	 * Stores the group keys for sequential string lookup.
+	 *
+	 * The offset into this string where the group key appears corresponds with the index
+	 * into the group array where the rest of the group string appears. This is an optimization
+	 * to improve cache locality while searching and minimize indirect memory accesses.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var string
+	 */
+	private $groups = '';
+
+	/**
+	 * Stores an optimized row of small words, where every entry is
+	 * `$this->key_size + 1` bytes long and zero-extended.
+	 *
+	 * This packing allows for direct lookup of a short word followed
+	 * by the null byte, if extended to `$this->key_size + 1`.
+	 *
+	 * Example:
+	 *
+	 *     // Stores array( 'GT', 'LT', 'gt', 'lt' ).
+	 *     "GT\x00LT\x00gt\x00lt\x00"
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var string
+	 */
+	private $small_words = '';
+
+	/**
+	 * Replacements for the small words, in the same order they appear.
+	 *
+	 * With the position of a small word it's possible to index the translation
+	 * directly, as its position in the `$small_words` string corresponds to
+	 * the index of the replacement in the `$small_mapping` array.
+	 *
+	 * Example:
+	 *
+	 *     array( '>', '<', '>', '<' )
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var string[]
+	 */
+	private $small_mappings = array();
+
+	/**
+	 * Create a token map using an associative array of key/value pairs as the input.
+	 *
+	 * Example:
+	 *
+	 *     $smilies = WP_Token_Map::from_array( array(
+	 *          '8O' => '😯',
+	 *          ':(' => '🙁',
+	 *          ':)' => '🙂',
+	 *          ':?' => '😕',
+	 *       ) );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array $mappings   The keys transform into the values, both are strings.
+	 * @param int   $key_length Determines the group key length. Leave at the default value
+	 *                          of 2 unless there's an empirical reason to change it.
+	 *
+	 * @return WP_Token_Map|null Token map, unless unable to create it.
+	 */
+	public static function from_array( array $mappings, int $key_length = 2 ): ?WP_Token_Map {
+		$map             = new WP_Token_Map();
+		$map->key_length = $key_length;
+
+		// Start by grouping words.
+
+		$groups = array();
+		$shorts = array();
+		foreach ( $mappings as $word => $mapping ) {
+			if (
+				self::MAX_LENGTH <= strlen( $word ) ||
+				self::MAX_LENGTH <= strlen( $mapping )
+			) {
+				_doing_it_wrong(
+					__METHOD__,
+					sprintf(
+						/* translators: 1: maximum byte length (a count) */
+						__( 'Token Map tokens and substitutions must all be shorter than %1$d bytes.' ),
+						self::MAX_LENGTH
+					),
+					'6.6.0'
+				);
+				return null;
+			}
+
+			$length = strlen( $word );
+
+			if ( $key_length >= $length ) {
+				$shorts[] = $word;
+			} else {
+				$group = substr( $word, 0, $key_length );
+
+				if ( ! isset( $groups[ $group ] ) ) {
+					$groups[ $group ] = array();
+				}
+
+				$groups[ $group ][] = array( substr( $word, $key_length ), $mapping );
+			}
+		}
+
+		/*
+		 * Sort the words to ensure that no smaller substring of a match masks the full match.
+		 * For example, `Cap` should not match before `CapitalDifferentialD`.
+		 */
+		usort( $shorts, 'WP_Token_Map::longest_first_then_alphabetical' );
+		foreach ( $groups as $group_key => $group ) {
+			usort(
+				$groups[ $group_key ],
+				static function ( array $a, array $b ): int {
+					return self::longest_first_then_alphabetical( $a[0], $b[0] );
+				}
+			);
+		}
+
+		// Finally construct the optimized lookups.
+
+		foreach ( $shorts as $word ) {
+			$map->small_words     .= str_pad( $word, $key_length + 1, "\x00", STR_PAD_RIGHT );
+			$map->small_mappings[] = $mappings[ $word ];
+		}
+
+		$group_keys = array_keys( $groups );
+		sort( $group_keys );
+
+		foreach ( $group_keys as $group ) {
+			$map->groups .= "{$group}\x00";
+
+			$group_string = '';
+
+			foreach ( $groups[ $group ] as $group_word ) {
+				list( $word, $mapping ) = $group_word;
+
+				$word_length    = pack( 'C', strlen( $word ) );
+				$mapping_length = pack( 'C', strlen( $mapping ) );
+				$group_string  .= "{$word_length}{$word}{$mapping_length}{$mapping}";
+			}
+
+			$map->large_words[] = $group_string;
+		}
+
+		return $map;
+	}
+
+	/**
+	 * Creates a token map from a pre-computed table.
+	 * This skips the initialization cost of generating the table.
+	 *
+	 * This function should only be used to load data created with
+	 * WP_Token_Map::precomputed_php_source_tag().
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param array $state {
+	 *     Stores pre-computed state for directly loading into a Token Map.
+	 *
+	 *     @type string $storage_version Which version of the code produced this state.
+	 *     @type int    $key_length      Group key length.
+	 *     @type string $groups          Group lookup index.
+	 *     @type array  $large_words     Large word groups and packed strings.
+	 *     @type string $small_words     Small words packed string.
+	 *     @type array  $small_mappings  Small word mappings.
+	 * }
+	 *
+	 * @return WP_Token_Map Map with precomputed data loaded.
+	 */
+	public static function from_precomputed_table( $state ): ?WP_Token_Map {
+		$has_necessary_state = isset(
+			$state['storage_version'],
+			$state['key_length'],
+			$state['groups'],
+			$state['large_words'],
+			$state['small_words'],
+			$state['small_mappings']
+		);
+
+		if ( ! $has_necessary_state ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Missing required inputs to pre-computed WP_Token_Map.' ),
+				'6.6.0'
+			);
+			return null;
+		}
+
+		if ( self::STORAGE_VERSION !== $state['storage_version'] ) {
+			_doing_it_wrong(
+				__METHOD__,
+				/* translators: 1: version string, 2: version string. */
+				sprintf( __( 'Loaded version \'%1$s\' incompatible with expected version \'%2$s\'.' ), $state['storage_version'], self::STORAGE_VERSION ),
+				'6.6.0'
+			);
+			return null;
+		}
+
+		$map = new WP_Token_Map();
+
+		$map->key_length     = $state['key_length'];
+		$map->groups         = $state['groups'];
+		$map->large_words    = $state['large_words'];
+		$map->small_words    = $state['small_words'];
+		$map->small_mappings = $state['small_mappings'];
+
+		return $map;
+	}
+
+	/**
+	 * Indicates if a given word is a lookup key in the map.
+	 *
+	 * Example:
+	 *
+	 *     true  === $smilies->contains( ':)' );
+	 *     false === $smilies->contains( 'simile' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $word             Determine if this word is a lookup key in the map.
+	 * @param string $case_sensitivity Optional. Pass 'ascii-case-insensitive' to ignore ASCII case when matching. Default 'case-sensitive'.
+	 * @return bool Whether there's an entry for the given word in the map.
+	 */
+	public function contains( string $word, string $case_sensitivity = 'case-sensitive' ): bool {
+		$ignore_case = 'ascii-case-insensitive' === $case_sensitivity;
+
+		if ( $this->key_length >= strlen( $word ) ) {
+			if ( 0 === strlen( $this->small_words ) ) {
+				return false;
+			}
+
+			$term    = str_pad( $word, $this->key_length + 1, "\x00", STR_PAD_RIGHT );
+			$word_at = $ignore_case ? stripos( $this->small_words, $term ) : strpos( $this->small_words, $term );
+			if ( false === $word_at ) {
+				return false;
+			}
+
+			return true;
+		}
+
+		$group_key = substr( $word, 0, $this->key_length );
+		$group_at  = $ignore_case ? stripos( $this->groups, $group_key ) : strpos( $this->groups, $group_key );
+		if ( false === $group_at ) {
+			return false;
+		}
+		$group        = $this->large_words[ $group_at / ( $this->key_length + 1 ) ];
+		$group_length = strlen( $group );
+		$slug         = substr( $word, $this->key_length );
+		$length       = strlen( $slug );
+		$at           = 0;
+
+		while ( $at < $group_length ) {
+			$token_length   = unpack( 'C', $group[ $at++ ] )[1];
+			$token_at       = $at;
+			$at            += $token_length;
+			$mapping_length = unpack( 'C', $group[ $at++ ] )[1];
+			$mapping_at     = $at;
+
+			if ( $token_length === $length && 0 === substr_compare( $group, $slug, $token_at, $token_length, $ignore_case ) ) {
+				return true;
+			}
+
+			$at = $mapping_at + $mapping_length;
+		}
+
+		return false;
+	}
+
+	/**
+	 * If the text starting at a given offset is a lookup key in the map,
+	 * return the corresponding transformation from the map, else `false`.
+	 *
+	 * This function returns the translated string, but accepts an optional
+	 * parameter `$matched_token_byte_length`, which communicates how many
+	 * bytes long the lookup key was, if it found one. This can be used to
+	 * advance a cursor in calling code if a lookup key was found.
+	 *
+	 * Example:
+	 *
+	 *     false === $smilies->read_token( 'Not sure :?.', 0, $token_byte_length );
+	 *     '😕'  === $smilies->read_token( 'Not sure :?.', 9, $token_byte_length );
+	 *     2     === $token_byte_length;
+	 *
+	 * Example:
+	 *
+	 *     while ( $at < strlen( $input ) ) {
+	 *         $next_at = strpos( $input, ':', $at );
+	 *         if ( false === $next_at ) {
+	 *             break;
+	 *         }
+	 *
+	 *         $smily = $smilies->read_token( $input, $next_at, $token_byte_length );
+	 *         if ( false === $next_at ) {
+	 *             ++$at;
+	 *             continue;
+	 *         }
+	 *
+	 *         $prefix  = substr( $input, $at, $next_at - $at );
+	 *         $at     += $token_byte_length;
+	 *         $output .= "{$prefix}{$smily}";
+	 *     }
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string   $text                       String in which to search for a lookup key.
+	 * @param int      $offset                     Optional. How many bytes into the string where the lookup key ought to start. Default 0.
+	 * @param int|null &$matched_token_byte_length Optional. Holds byte-length of found token matched, otherwise not set. Default null.
+	 * @param string   $case_sensitivity           Optional. Pass 'ascii-case-insensitive' to ignore ASCII case when matching. Default 'case-sensitive'.
+	 *
+	 * @return string|null Mapped value of lookup key if found, otherwise `null`.
+	 */
+	public function read_token( string $text, int $offset = 0, &$matched_token_byte_length = null, $case_sensitivity = 'case-sensitive' ): ?string {
+		$ignore_case = 'ascii-case-insensitive' === $case_sensitivity;
+		$text_length = strlen( $text );
+
+		// Search for a long word first, if the text is long enough, and if that fails, a short one.
+		if ( $text_length > $this->key_length ) {
+			$group_key = substr( $text, $offset, $this->key_length );
+
+			$group_at = $ignore_case ? stripos( $this->groups, $group_key ) : strpos( $this->groups, $group_key );
+			if ( false === $group_at ) {
+				// Perhaps a short word then.
+				return strlen( $this->small_words ) > 0
+					? $this->read_small_token( $text, $offset, $matched_token_byte_length, $case_sensitivity )
+					: null;
+			}
+
+			$group        = $this->large_words[ $group_at / ( $this->key_length + 1 ) ];
+			$group_length = strlen( $group );
+			$at           = 0;
+			while ( $at < $group_length ) {
+				$token_length   = unpack( 'C', $group[ $at++ ] )[1];
+				$token          = substr( $group, $at, $token_length );
+				$at            += $token_length;
+				$mapping_length = unpack( 'C', $group[ $at++ ] )[1];
+				$mapping_at     = $at;
+
+				if ( 0 === substr_compare( $text, $token, $offset + $this->key_length, $token_length, $ignore_case ) ) {
+					$matched_token_byte_length = $this->key_length + $token_length;
+					return substr( $group, $mapping_at, $mapping_length );
+				}
+
+				$at = $mapping_at + $mapping_length;
+			}
+		}
+
+		// Perhaps a short word then.
+		return strlen( $this->small_words ) > 0
+			? $this->read_small_token( $text, $offset, $matched_token_byte_length, $case_sensitivity )
+			: null;
+	}
+
+	/**
+	 * Finds a match for a short word at the index.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string   $text                       String in which to search for a lookup key.
+	 * @param int      $offset                     Optional. How many bytes into the string where the lookup key ought to start. Default 0.
+	 * @param int|null &$matched_token_byte_length Optional. Holds byte-length of found lookup key if matched, otherwise not set. Default null.
+	 * @param string   $case_sensitivity           Optional. Pass 'ascii-case-insensitive' to ignore ASCII case when matching. Default 'case-sensitive'.
+	 *
+	 * @return string|null Mapped value of lookup key if found, otherwise `null`.
+	 */
+	private function read_small_token( string $text, int $offset = 0, &$matched_token_byte_length = null, $case_sensitivity = 'case-sensitive' ): ?string {
+		$ignore_case  = 'ascii-case-insensitive' === $case_sensitivity;
+		$small_length = strlen( $this->small_words );
+		$search_text  = substr( $text, $offset, $this->key_length );
+		if ( $ignore_case ) {
+			$search_text = strtoupper( $search_text );
+		}
+		$starting_char = $search_text[0];
+
+		$at = 0;
+		while ( $at < $small_length ) {
+			if (
+				$starting_char !== $this->small_words[ $at ] &&
+				( ! $ignore_case || strtoupper( $this->small_words[ $at ] ) !== $starting_char )
+			) {
+				$at += $this->key_length + 1;
+				continue;
+			}
+
+			for ( $adjust = 1; $adjust < $this->key_length; $adjust++ ) {
+				if ( "\x00" === $this->small_words[ $at + $adjust ] ) {
+					$matched_token_byte_length = $adjust;
+					return $this->small_mappings[ $at / ( $this->key_length + 1 ) ];
+				}
+
+				if (
+					$search_text[ $adjust ] !== $this->small_words[ $at + $adjust ] &&
+					( ! $ignore_case || strtoupper( $this->small_words[ $at + $adjust ] !== $search_text[ $adjust ] ) )
+				) {
+					$at += $this->key_length + 1;
+					continue 2;
+				}
+			}
+
+			$matched_token_byte_length = $adjust;
+			return $this->small_mappings[ $at / ( $this->key_length + 1 ) ];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Exports the token map into an associate array of key/value pairs.
+	 *
+	 * Example:
+	 *
+	 *     $smilies->to_array() === array(
+	 *         '8O' => '😯',
+	 *         ':(' => '🙁',
+	 *         ':)' => '🙂',
+	 *         ':?' => '😕',
+	 *     );
+	 *
+	 * @return array The lookup key/substitution values as an associate array.
+	 */
+	public function to_array(): array {
+		$tokens = array();
+
+		$at            = 0;
+		$small_mapping = 0;
+		$small_length  = strlen( $this->small_words );
+		while ( $at < $small_length ) {
+			$key            = rtrim( substr( $this->small_words, $at, $this->key_length + 1 ), "\x00" );
+			$value          = $this->small_mappings[ $small_mapping++ ];
+			$tokens[ $key ] = $value;
+
+			$at += $this->key_length + 1;
+		}
+
+		foreach ( $this->large_words as $index => $group ) {
+			$prefix       = substr( $this->groups, $index * ( $this->key_length + 1 ), 2 );
+			$group_length = strlen( $group );
+			$at           = 0;
+			while ( $at < $group_length ) {
+				$length = unpack( 'C', $group[ $at++ ] )[1];
+				$key    = $prefix . substr( $group, $at, $length );
+
+				$at    += $length;
+				$length = unpack( 'C', $group[ $at++ ] )[1];
+				$value  = substr( $group, $at, $length );
+
+				$tokens[ $key ] = $value;
+				$at            += $length;
+			}
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * Export the token map for quick loading in PHP source code.
+	 *
+	 * This function has a specific purpose, to make loading of static token maps fast.
+	 * It's used to ensure that the HTML character reference lookups add a minimal cost
+	 * to initializing the PHP process.
+	 *
+	 * Example:
+	 *
+	 *     echo $smilies->precomputed_php_source_table();
+	 *
+	 *     // Output.
+	 *     WP_Token_Map::from_precomputed_table(
+	 *         array(
+	 *             "storage_version" => "6.6.0",
+	 *             "key_length" => 2,
+	 *             "groups" => "",
+	 *             "long_words" => array(),
+	 *             "small_words" => "8O\x00:)\x00:(\x00:?\x00",
+	 *             "small_mappings" => array( "😯", "🙂", "🙁", "😕" )
+	 *         )
+	 *     );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $indent Optional. Use this string for indentation, or rely on the default horizontal tab character. Default "\t".
+	 * @return string Value which can be pasted into a PHP source file for quick loading of table.
+	 */
+	public function precomputed_php_source_table( string $indent = "\t" ): string {
+		$i1 = $indent;
+		$i2 = $i1 . $indent;
+		$i3 = $i2 . $indent;
+
+		$class_version = self::STORAGE_VERSION;
+
+		$output  = self::class . "::from_precomputed_table(\n";
+		$output .= "{$i1}array(\n";
+		$output .= "{$i2}\"storage_version\" => \"{$class_version}\",\n";
+		$output .= "{$i2}\"key_length\" => {$this->key_length},\n";
+
+		$group_line = str_replace( "\x00", "\\x00", $this->groups );
+		$output    .= "{$i2}\"groups\" => \"{$group_line}\",\n";
+
+		$output .= "{$i2}\"large_words\" => array(\n";
+
+		$prefixes = explode( "\x00", $this->groups );
+		foreach ( $prefixes as $index => $prefix ) {
+			if ( '' === $prefix ) {
+				break;
+			}
+			$group        = $this->large_words[ $index ];
+			$group_length = strlen( $group );
+			$comment_line = "{$i3}//";
+			$data_line    = "{$i3}\"";
+			$at           = 0;
+			while ( $at < $group_length ) {
+				$token_length   = unpack( 'C', $group[ $at++ ] )[1];
+				$token          = substr( $group, $at, $token_length );
+				$at            += $token_length;
+				$mapping_length = unpack( 'C', $group[ $at++ ] )[1];
+				$mapping        = substr( $group, $at, $mapping_length );
+				$at            += $mapping_length;
+
+				$token_digits   = str_pad( dechex( $token_length ), 2, '0', STR_PAD_LEFT );
+				$mapping_digits = str_pad( dechex( $mapping_length ), 2, '0', STR_PAD_LEFT );
+
+				$mapping = preg_replace_callback(
+					"~[\\x00-\\x1f\\x22\\x5c]~",
+					static function ( $match_result ) {
+						switch ( $match_result[0] ) {
+							case '"':
+								return '\\"';
+
+							case '\\':
+								return '\\\\';
+
+							default:
+								$hex = dechex( ord( $match_result[0] ) );
+								return "\\x{$hex}";
+						}
+					},
+					$mapping
+				);
+
+				$comment_line .= " {$prefix}{$token}[{$mapping}]";
+				$data_line    .= "\\x{$token_digits}{$token}\\x{$mapping_digits}{$mapping}";
+			}
+			$comment_line .= ".\n";
+			$data_line    .= "\",\n";
+
+			$output .= $comment_line;
+			$output .= $data_line;
+		}
+
+		$output .= "{$i2}),\n";
+
+		$small_words  = array();
+		$small_length = strlen( $this->small_words );
+		$at           = 0;
+		while ( $at < $small_length ) {
+			$small_words[] = substr( $this->small_words, $at, $this->key_length + 1 );
+			$at           += $this->key_length + 1;
+		}
+
+		$small_text = str_replace( "\x00", '\x00', implode( '', $small_words ) );
+		$output    .= "{$i2}\"small_words\" => \"{$small_text}\",\n";
+
+		$output .= "{$i2}\"small_mappings\" => array(\n";
+		foreach ( $this->small_mappings as $mapping ) {
+			$output .= "{$i3}\"{$mapping}\",\n";
+		}
+		$output .= "{$i2})\n";
+		$output .= "{$i1})\n";
+		$output .= ')';
+
+		return $output;
+	}
+
+	/**
+	 * Compares two strings, returning the longest, or whichever
+	 * is first alphabetically if they are the same length.
+	 *
+	 * This is an important sort when building the token map because
+	 * it should not form a match on a substring of a longer potential
+	 * match. For example, it should not detect `Cap` when matching
+	 * against the string `CapitalDifferentialD`.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $a First string to compare.
+	 * @param string $b Second string to compare.
+	 * @return int -1 or lower if `$a` is less than `$b`; 1 or greater if `$a` is greater than `$b`, and 0 if they are equal.
+	 */
+	private static function longest_first_then_alphabetical( string $a, string $b ): int {
+		if ( $a === $b ) {
+			return 0;
+		}
+
+		$length_a = strlen( $a );
+		$length_b = strlen( $b );
+
+		// Longer strings are less-than for comparison's sake.
+		if ( $length_a !== $length_b ) {
+			return $length_b - $length_a;
+		}
+
+		return strcmp( $a, $b );
+	}
+}
diff --git a/lib/compat/wordpress-6.7/class-wp-block-templates-registry.php b/lib/compat/wordpress-6.7/class-wp-block-templates-registry.php
new file mode 100644
index 00000000000000..92673c0bf50f90
--- /dev/null
+++ b/lib/compat/wordpress-6.7/class-wp-block-templates-registry.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * Templates registry functions.
+ *
+ * @package Gutenberg
+ * @since 6.7.0
+ */
+
+if ( ! class_exists( 'WP_Block_Templates_Registry' ) ) {
+	/**
+	 * Core class used for interacting with templates.
+	 *
+	 * @since 6.7.0
+	 */
+	final class WP_Block_Templates_Registry {
+		/**
+		 * Registered templates, as `$name => $instance` pairs.
+		 *
+		 * @since 6.7.0
+		 * @var WP_Block_Template[] $registered_block_templates Registered templates.
+		 */
+		private $registered_templates = array();
+
+		/**
+		 * Container for the main instance of the class.
+		 *
+		 * @since 6.7.0
+		 * @var WP_Block_Templates_Registry|null
+		 */
+		private static $instance = null;
+
+		/**
+		 * Registers a template.
+		 *
+		 * @since 6.7.0
+		 *
+		 * @param string $template_name Template name including namespace.
+		 * @param array  $args          Optional. Array of template arguments.
+		 * @return WP_Block_Template|WP_Error The registered template on success, or WP_Error on failure.
+		 */
+		public function register( $template_name, $args = array() ) {
+
+			$template = null;
+
+			$error_message = '';
+			$error_code    = '';
+			if ( ! is_string( $template_name ) ) {
+				$error_message = __( 'Template names must be strings.', 'gutenberg' );
+				$error_code    = 'template_name_no_string';
+			} elseif ( preg_match( '/[A-Z]+/', $template_name ) ) {
+				$error_message = __( 'Template names must not contain uppercase characters.', 'gutenberg' );
+				$error_code    = 'template_name_no_uppercase';
+			} elseif ( ! preg_match( '/^[a-z0-9-]+\/\/[a-z0-9-]+$/', $template_name ) ) {
+				$error_message = __( 'Template names must contain a namespace prefix. Example: my-plugin//my-custom-template', 'gutenberg' );
+				$error_code    = 'template_no_prefix';
+			} elseif ( $this->is_registered( $template_name ) ) {
+				/* translators: %s: Template name. */
+				$error_message = sprintf( __( 'Template "%s" is already registered.', 'gutenberg' ), $template_name );
+				$error_code    = 'template_already_registered';
+			}
+
+			if ( $error_message ) {
+				_doing_it_wrong(
+					__METHOD__,
+					$error_message,
+					'6.7.0'
+				);
+				return new WP_Error( $error_code, $error_message );
+			}
+
+			if ( ! $template ) {
+				$theme_name             = get_stylesheet();
+				list( $plugin, $slug )  = explode( '//', $template_name );
+				$default_template_types = get_default_block_template_types();
+
+				$template              = new WP_Block_Template();
+				$template->id          = $theme_name . '//' . $slug;
+				$template->theme       = $theme_name;
+				$template->plugin      = $plugin;
+				$template->author      = null;
+				$template->content     = isset( $args['content'] ) ? $args['content'] : '';
+				$template->source      = 'plugin';
+				$template->slug        = $slug;
+				$template->type        = 'wp_template';
+				$template->title       = isset( $args['title'] ) ? $args['title'] : $template_name;
+				$template->description = isset( $args['description'] ) ? $args['description'] : '';
+				$template->status      = 'publish';
+				$template->origin      = 'plugin';
+				$template->is_custom   = ! isset( $default_template_types[ $template_name ] );
+				$template->post_types  = isset( $args['post_types'] ) ? $args['post_types'] : array();
+			}
+
+			$this->registered_templates[ $template_name ] = $template;
+
+			return $template;
+		}
+
+		/**
+		 * Retrieves all registered templates.
+		 *
+		 * @since 6.7.0
+		 *
+		 * @return WP_Block_Template[] Associative array of `$template_name => $template` pairs.
+		 */
+		public function get_all_registered() {
+			return $this->registered_templates;
+		}
+
+		/**
+		 * Retrieves a registered template by its name.
+		 *
+		 * @since 6.7.0
+		 *
+		 * @param string $template_name Template name including namespace.
+		 * @return WP_Block_Template|null The registered template, or null if it is not registered.
+		 */
+		public function get_registered( $template_name ) {
+			if ( ! $this->is_registered( $template_name ) ) {
+				return null;
+			}
+
+			return $this->registered_templates[ $template_name ];
+		}
+
+		/**
+		 * Retrieves a registered template by its slug.
+		 *
+		 * @since 6.7.0
+		 *
+		 * @param string $template_slug Slug of the template.
+		 * @return WP_Block_Template|null The registered template, or null if it is not registered.
+		 */
+		public function get_by_slug( $template_slug ) {
+			$all_templates = $this->get_all_registered();
+
+			if ( ! $all_templates ) {
+				return null;
+			}
+
+			foreach ( $all_templates as $template ) {
+				if ( $template->slug === $template_slug ) {
+					return $template;
+				}
+			}
+
+			return null;
+		}
+
+		/**
+		 * Retrieves registered templates matching a query.
+		 *
+		 * @since 6.7.0
+		 *
+		 * @param array  $query {
+		 *     Arguments to retrieve templates. Optional, empty by default.
+		 *
+		 *     @type string[] $slug__in     List of slugs to include.
+		 *     @type string[] $slug__not_in List of slugs to skip.
+		 *     @type string   $post_type    Post type to get the templates for.
+		 * }
+		 */
+		public function get_by_query( $query = array() ) {
+			$all_templates = $this->get_all_registered();
+
+			if ( ! $all_templates ) {
+				return array();
+			}
+
+			$query            = wp_parse_args(
+				$query,
+				array(
+					'slug__in'     => array(),
+					'slug__not_in' => array(),
+					'post_type'    => '',
+				)
+			);
+			$slugs_to_include = $query['slug__in'];
+			$slugs_to_skip    = $query['slug__not_in'];
+			$post_type        = $query['post_type'];
+
+			$matching_templates = array();
+			foreach ( $all_templates as $template_name => $template ) {
+				if ( $slugs_to_include && ! in_array( $template->slug, $slugs_to_include, true ) ) {
+					continue;
+				}
+
+				if ( $slugs_to_skip && in_array( $template->slug, $slugs_to_skip, true ) ) {
+					continue;
+				}
+
+				if ( $post_type && ! in_array( $post_type, $template->post_types, true ) ) {
+					continue;
+				}
+
+				$matching_templates[ $template_name ] = $template;
+			}
+
+			return $matching_templates;
+		}
+
+		/**
+		 * Checks if a template is registered.
+		 *
+		 * @since 6.7.0
+		 *
+		 * @param string $template_name Template name.
+		 * @return bool True if the template is registered, false otherwise.
+		 */
+		public function is_registered( $template_name ) {
+			return isset( $this->registered_templates[ $template_name ] );
+		}
+
+		/**
+		 * Unregisters a template.
+		 *
+		 * @since 6.7.0
+		 *
+		 * @param string $template_name Template name including namespace.
+		 * @return WP_Block_Template|WP_Error The unregistered template on success, or WP_Error on failure.
+		 */
+		public function unregister( $template_name ) {
+			if ( ! $this->is_registered( $template_name ) ) {
+				_doing_it_wrong(
+					__METHOD__,
+					/* translators: %s: Template name. */
+					sprintf( __( 'Template "%s" is not registered.', 'gutenberg' ), $template_name ),
+					'6.7.0'
+				);
+				/* translators: %s: Template name. */
+				return new WP_Error( 'template_not_registered', __( 'Template "%s" is not registered.', 'gutenberg' ) );
+			}
+
+			$unregistered_template = $this->registered_templates[ $template_name ];
+			unset( $this->registered_templates[ $template_name ] );
+
+			return $unregistered_template;
+		}
+
+		/**
+		 * Utility method to retrieve the main instance of the class.
+		 *
+		 * The instance will be created if it does not exist yet.
+		 *
+		 * @since 6.7.0
+		 *
+		 * @return WP_Block_Templates_Registry The main instance.
+		 */
+		public static function get_instance() {
+			if ( null === self::$instance ) {
+				self::$instance = new self();
+			}
+
+			return self::$instance;
+		}
+	}
+}
diff --git a/lib/compat/wordpress-6.7/compat.php b/lib/compat/wordpress-6.7/compat.php
new file mode 100644
index 00000000000000..cd533a42cc528e
--- /dev/null
+++ b/lib/compat/wordpress-6.7/compat.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * WordPress 6.7 compatibility functions.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Hooks into `get_block_templates` so templates from the registry are also returned, as long as there
+ * isn't a theme template with the same slug.
+ *
+ * @param WP_Block_Template[] $query_result Array of found block templates.
+ * @param array               $query {
+ *     Arguments to retrieve templates. All arguments are optional.
+ *
+ *     @type string[] $slug__in  List of slugs to include.
+ *     @type int      $wp_id     Post ID of customized template.
+ *     @type string   $area      A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
+ *     @type string   $post_type Post type to get the templates for.
+ * }
+ * @param string              $template_type wp_template or wp_template_part.
+ * @return WP_Block_Template[] The same $query_result but might contain some additional templates from
+ * the registry.
+ */
+function _gutenberg_add_block_templates_from_registry( $query_result, $query, $template_type ) {
+	// Add `plugin` property to templates registered by a plugin.
+	foreach ( $query_result as $key => $value ) {
+		$registered_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $query_result[ $key ]->slug );
+		if ( $registered_template ) {
+			$query_result[ $key ]->plugin      = $registered_template->plugin;
+			$query_result[ $key ]->origin      =
+				'theme' !== $query_result[ $key ]->origin && 'theme' !== $query_result[ $key ]->source ?
+				'plugin' :
+				$query_result[ $key ]->origin;
+			$query_result[ $key ]->title       =
+				empty( $query_result[ $key ]->title ) || $query_result[ $key ]->title === $query_result[ $key ]->slug ?
+				$registered_template->title : $query_result[ $key ]->title;
+			$query_result[ $key ]->description = empty( $query_result[ $key ]->description ) ? $registered_template->description : $query_result[ $key ]->description;
+		}
+	}
+
+	if ( ! isset( $query['wp_id'] ) ) {
+		$template_files = _gutenberg_get_block_templates_files( $template_type, $query );
+
+		/*
+		 * Add templates registered in the template registry. Filtering out the ones which have a theme file.
+		 */
+		$registered_templates          = WP_Block_Templates_Registry::get_instance()->get_by_query( $query );
+		$matching_registered_templates = array_filter(
+			$registered_templates,
+			function ( $registered_template ) use ( $template_files ) {
+				foreach ( $template_files as $template_file ) {
+					if ( $template_file['slug'] === $registered_template->slug ) {
+						return false;
+					}
+				}
+				return true;
+			}
+		);
+		$query_result                  = array_merge( $query_result, $matching_registered_templates );
+	}
+
+	return $query_result;
+}
+add_filter( 'get_block_templates', '_gutenberg_add_block_templates_from_registry', 10, 3 );
+
+/**
+ * Hooks into `get_block_template` to add the `plugin` property when necessary.
+ *
+ * @param [WP_Block_Template|null] $block_template The found block template, or null if there isn’t one.
+ * @return [WP_Block_Template|null] The block template that was already found with the plugin property defined if it was registered by a plugin.
+ */
+function _gutenberg_add_block_template_plugin_attribute( $block_template ) {
+	if ( $block_template ) {
+		$registered_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $block_template->slug );
+		if ( $registered_template ) {
+			$block_template->plugin      = $registered_template->plugin;
+			$block_template->origin      =
+				'theme' !== $block_template->origin && 'theme' !== $block_template->source ?
+				'plugin' :
+				$block_template->origin;
+			$block_template->title       = empty( $block_template->title ) || $block_template->title === $block_template->slug ? $registered_template->title : $block_template->title;
+			$block_template->description = empty( $block_template->description ) ? $registered_template->description : $block_template->description;
+		}
+	}
+
+	return $block_template;
+}
+add_filter( 'get_block_template', '_gutenberg_add_block_template_plugin_attribute', 10, 1 );
+
+/**
+ * Hooks into `get_block_file_template` so templates from the registry are also returned.
+ *
+ * @param WP_Block_Template|null $block_template The found block template, or null if there is none.
+ * @param string                 $id             Template unique identifier (example: 'theme_slug//template_slug').
+ * @return WP_Block_Template|null The block template that was already found or from the registry. In case the template was already found, add the necessary details from the registry.
+ */
+function _gutenberg_add_block_file_templates_from_registry( $block_template, $id ) {
+	if ( $block_template ) {
+		$registered_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $block_template->slug );
+		if ( $registered_template ) {
+			$block_template->plugin = $registered_template->plugin;
+			$block_template->origin =
+				'theme' !== $block_template->origin && 'theme' !== $block_template->source ?
+				'plugin' :
+				$block_template->origin;
+		}
+		return $block_template;
+	}
+
+	$parts = explode( '//', $id, 2 );
+
+	if ( count( $parts ) < 2 ) {
+		return $block_template;
+	}
+
+	list( , $slug ) = $parts;
+	return WP_Block_Templates_Registry::get_instance()->get_by_slug( $slug );
+}
+add_filter( 'get_block_file_template', '_gutenberg_add_block_file_templates_from_registry', 10, 2 );
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-active-formatting-elements-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-active-formatting-elements-6-7.php
new file mode 100644
index 00000000000000..10f53fe82ce4e0
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-active-formatting-elements-6-7.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * HTML API: WP_HTML_Active_Formatting_Elements class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the stack of active formatting elements.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * > Initially, the list of active formatting elements is empty.
+ * > It is used to handle mis-nested formatting element tags.
+ * >
+ * > The list contains elements in the formatting category, and markers.
+ * > The markers are inserted when entering applet, object, marquee,
+ * > template, td, th, and caption elements, and are used to prevent
+ * > formatting from "leaking" into applet, object, marquee, template,
+ * > td, th, and caption elements.
+ * >
+ * > In addition, each element in the list of active formatting elements
+ * > is associated with the token for which it was created, so that
+ * > further elements can be created for that token if necessary.
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see https://html.spec.whatwg.org/#list-of-active-formatting-elements
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Active_Formatting_Elements_6_7 {
+	/**
+	 * Holds the stack of active formatting element references.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token[]
+	 */
+	private $stack = array();
+
+	/**
+	 * Reports if a specific node is in the stack of active formatting elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token Look for this node in the stack.
+	 * @return bool Whether the referenced node is in the stack of active formatting elements.
+	 */
+	public function contains_node( Gutenberg_HTML_Token_6_7 $token ) {
+		foreach ( $this->walk_up() as $item ) {
+			if ( $token->bookmark_name === $item->bookmark_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns how many nodes are currently in the stack of active formatting elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return int How many node are in the stack of active formatting elements.
+	 */
+	public function count() {
+		return count( $this->stack );
+	}
+
+	/**
+	 * Returns the node at the end of the stack of active formatting elements,
+	 * if one exists. If the stack is empty, returns null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return WP_HTML_Token|null Last node in the stack of active formatting elements, if one exists, otherwise null.
+	 */
+	public function current_node() {
+		$current_node = end( $this->stack );
+
+		return $current_node ? $current_node : null;
+	}
+
+	/**
+	 * Pushes a node onto the stack of active formatting elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#push-onto-the-list-of-active-formatting-elements
+	 *
+	 * @param WP_HTML_Token $token Push this node onto the stack.
+	 */
+	public function push( Gutenberg_HTML_Token_6_7 $token ) {
+		/*
+		 * > If there are already three elements in the list of active formatting elements after the last marker,
+		 * > if any, or anywhere in the list if there are no markers, that have the same tag name, namespace, and
+		 * > attributes as element, then remove the earliest such element from the list of active formatting
+		 * > elements. For these purposes, the attributes must be compared as they were when the elements were
+		 * > created by the parser; two elements have the same attributes if all their parsed attributes can be
+		 * > paired such that the two attributes in each pair have identical names, namespaces, and values
+		 * > (the order of the attributes does not matter).
+		 *
+		 * @todo Implement the "Noah's Ark clause" to only add up to three of any given kind of formatting elements to the stack.
+		 */
+		// > Add element to the list of active formatting elements.
+		$this->stack[] = $token;
+	}
+
+	/**
+	 * Removes a node from the stack of active formatting elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token Remove this node from the stack, if it's there already.
+	 * @return bool Whether the node was found and removed from the stack of active formatting elements.
+	 */
+	public function remove_node( Gutenberg_HTML_Token_6_7 $token ) {
+		foreach ( $this->walk_up() as $position_from_end => $item ) {
+			if ( $token->bookmark_name !== $item->bookmark_name ) {
+				continue;
+			}
+
+			$position_from_start = $this->count() - $position_from_end - 1;
+			array_splice( $this->stack, $position_from_start, 1 );
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Steps through the stack of active formatting elements, starting with the
+	 * top element (added first) and walking downwards to the one added last.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_down() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > EM -> STRONG -> A ->
+	 *
+	 * To start with the most-recently added element and walk towards the top,
+	 * see WP_HTML_Active_Formatting_Elements::walk_up().
+	 *
+	 * @since 6.4.0
+	 */
+	public function walk_down() {
+		$count = count( $this->stack );
+
+		for ( $i = 0; $i < $count; $i++ ) {
+			yield $this->stack[ $i ];
+		}
+	}
+
+	/**
+	 * Steps through the stack of active formatting elements, starting with the
+	 * bottom element (added last) and walking upwards to the one added first.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_up() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > A -> STRONG -> EM ->
+	 *
+	 * To start with the first added element and walk towards the bottom,
+	 * see WP_HTML_Active_Formatting_Elements::walk_down().
+	 *
+	 * @since 6.4.0
+	 */
+	public function walk_up() {
+		for ( $i = count( $this->stack ) - 1; $i >= 0; $i-- ) {
+			yield $this->stack[ $i ];
+		}
+	}
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-attribute-token-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-attribute-token-6-7.php
new file mode 100644
index 00000000000000..4ee369b795c84c
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-attribute-token-6-7.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * HTML API: WP_HTML_Attribute_Token class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Core class used by the HTML tag processor as a data structure for the attribute token,
+ * allowing to drastically improve performance.
+ *
+ * This class is for internal usage of the WP_HTML_Tag_Processor class.
+ *
+ * @access private
+ * @since 6.2.0
+ * @since 6.5.0 Replaced `end` with `length` to more closely match `substr()`.
+ *
+ * @see WP_HTML_Tag_Processor
+ */
+class Gutenberg_HTML_Attribute_Token_6_7 {
+	/**
+	 * Attribute name.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var string
+	 */
+	public $name;
+
+	/**
+	 * Attribute value.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var int
+	 */
+	public $value_starts_at;
+
+	/**
+	 * How many bytes the value occupies in the input HTML.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var int
+	 */
+	public $value_length;
+
+	/**
+	 * The string offset where the attribute name starts.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var int
+	 */
+	public $start;
+
+	/**
+	 * Byte length of text spanning the attribute inside a tag.
+	 *
+	 * This span starts at the first character of the attribute name
+	 * and it ends after one of three cases:
+	 *
+	 *  - at the end of the attribute name for boolean attributes.
+	 *  - at the end of the value for unquoted attributes.
+	 *  - at the final single or double quote for quoted attributes.
+	 *
+	 * Example:
+	 *
+	 *     <div class="post">
+	 *          ------------ length is 12, including quotes
+	 *
+	 *     <input type="checked" checked id="selector">
+	 *                           ------- length is 6
+	 *
+	 *     <a rel=noopener>
+	 *        ------------ length is 11
+	 *
+	 * @since 6.5.0 Replaced `end` with `length` to more closely match `substr()`.
+	 *
+	 * @var int
+	 */
+	public $length;
+
+	/**
+	 * Whether the attribute is a boolean attribute with value `true`.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var bool
+	 */
+	public $is_true;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.2.0
+	 * @since 6.5.0 Replaced `end` with `length` to more closely match `substr()`.
+	 *
+	 * @param string $name         Attribute name.
+	 * @param int    $value_start  Attribute value.
+	 * @param int    $value_length Number of bytes attribute value spans.
+	 * @param int    $start        The string offset where the attribute name starts.
+	 * @param int    $length       Byte length of the entire attribute name or name and value pair expression.
+	 * @param bool   $is_true      Whether the attribute is a boolean attribute with true value.
+	 */
+	public function __construct( $name, $value_start, $value_length, $start, $length, $is_true ) {
+		$this->name            = $name;
+		$this->value_starts_at = $value_start;
+		$this->value_length    = $value_length;
+		$this->start           = $start;
+		$this->length          = $length;
+		$this->is_true         = $is_true;
+	}
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-decoder-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-decoder-6-7.php
new file mode 100644
index 00000000000000..c745904865b1f8
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-decoder-6-7.php
@@ -0,0 +1,463 @@
+<?php
+
+/**
+ * HTML API: WP_HTML_Decoder class
+ *
+ * Decodes spans of raw text found inside HTML content.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.6.0
+ */
+class Gutenberg_HTML_Decoder_6_7 {
+	/**
+	 * Indicates if an attribute value starts with a given raw string value.
+	 *
+	 * Use this method to determine if an attribute value starts with a given string, regardless
+	 * of how it might be encoded in HTML. For instance, `http:` could be represented as `http:`
+	 * or as `http&colon;` or as `&#x68;ttp:` or as `h&#116;tp&colon;`, or in many other ways.
+	 *
+	 * Example:
+	 *
+	 *     $value = 'http&colon;//wordpress.org/';
+	 *     true   === WP_HTML_Decoder::attribute_starts_with( $value, 'http:', 'ascii-case-insensitive' );
+	 *     false  === WP_HTML_Decoder::attribute_starts_with( $value, 'https:', 'ascii-case-insensitive' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $haystack         String containing the raw non-decoded attribute value.
+	 * @param string $search_text      Does the attribute value start with this plain string.
+	 * @param string $case_sensitivity Optional. Pass 'ascii-case-insensitive' to ignore ASCII case when matching.
+	 *                                 Default 'case-sensitive'.
+	 * @return bool Whether the attribute value starts with the given string.
+	 */
+	public static function attribute_starts_with( $haystack, $search_text, $case_sensitivity = 'case-sensitive' ): bool {
+		$search_length = strlen( $search_text );
+		$loose_case    = 'ascii-case-insensitive' === $case_sensitivity;
+		$haystack_end  = strlen( $haystack );
+		$search_at     = 0;
+		$haystack_at   = 0;
+
+		while ( $search_at < $search_length && $haystack_at < $haystack_end ) {
+			$chars_match = $loose_case
+				? strtolower( $haystack[ $haystack_at ] ) === strtolower( $search_text[ $search_at ] )
+				: $haystack[ $haystack_at ] === $search_text[ $search_at ];
+
+			$is_introducer = '&' === $haystack[ $haystack_at ];
+			$next_chunk    = $is_introducer
+				? self::read_character_reference( 'attribute', $haystack, $haystack_at, $token_length )
+				: null;
+
+			// If there's no character reference and the characters don't match, the match fails.
+			if ( null === $next_chunk && ! $chars_match ) {
+				return false;
+			}
+
+			// If there's no character reference but the character do match, then it could still match.
+			if ( null === $next_chunk && $chars_match ) {
+				++$haystack_at;
+				++$search_at;
+				continue;
+			}
+
+			// If there is a character reference, then the decoded value must exactly match what follows in the search string.
+			if ( 0 !== substr_compare( $search_text, $next_chunk, $search_at, strlen( $next_chunk ), $loose_case ) ) {
+				return false;
+			}
+
+			// The character reference matched, so continue checking.
+			$haystack_at += $token_length;
+			$search_at   += strlen( $next_chunk );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns a string containing the decoded value of a given HTML text node.
+	 *
+	 * Text nodes appear in HTML DATA sections, which are the text segments inside
+	 * and around tags, excepting SCRIPT and STYLE elements (and some others),
+	 * whose inner text is not decoded. Use this function to read the decoded
+	 * value of such a text span in an HTML document.
+	 *
+	 * Example:
+	 *
+	 *     '“😄”' === WP_HTML_Decode::decode_text_node( '&#x93;&#x1f604;&#x94' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $text Text containing raw and non-decoded text node to decode.
+	 * @return string Decoded UTF-8 value of given text node.
+	 */
+	public static function decode_text_node( $text ): string {
+		return static::decode( 'data', $text );
+	}
+
+	/**
+	 * Returns a string containing the decoded value of a given HTML attribute.
+	 *
+	 * Text found inside an HTML attribute has different parsing rules than for
+	 * text found inside other markup, or DATA segments. Use this function to
+	 * read the decoded value of an HTML string inside a quoted attribute.
+	 *
+	 * Example:
+	 *
+	 *     '“😄”' === WP_HTML_Decode::decode_attribute( '&#x93;&#x1f604;&#x94' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param string $text Text containing raw and non-decoded attribute value to decode.
+	 * @return string Decoded UTF-8 value of given attribute value.
+	 */
+	public static function decode_attribute( $text ): string {
+		return static::decode( 'attribute', $text );
+	}
+
+	/**
+	 * Decodes a span of HTML text, depending on the context in which it's found.
+	 *
+	 * This is a low-level method; prefer calling WP_HTML_Decoder::decode_attribute() or
+	 * WP_HTML_Decoder::decode_text_node() instead. It's provided for cases where this
+	 * may be difficult to do from calling code.
+	 *
+	 * Example:
+	 *
+	 *     '©' = WP_HTML_Decoder::decode( 'data', '&copy;' );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @access private
+	 *
+	 * @param string $context `attribute` for decoding attribute values, `data` otherwise.
+	 * @param string $text    Text document containing span of text to decode.
+	 * @return string Decoded UTF-8 string.
+	 */
+	public static function decode( $context, $text ): string {
+		$decoded = '';
+		$end     = strlen( $text );
+		$at      = 0;
+		$was_at  = 0;
+
+		while ( $at < $end ) {
+			$next_character_reference_at = strpos( $text, '&', $at );
+			if ( false === $next_character_reference_at ) {
+				break;
+			}
+
+			$character_reference = self::read_character_reference( $context, $text, $next_character_reference_at, $token_length );
+			if ( isset( $character_reference ) ) {
+				$at       = $next_character_reference_at;
+				$decoded .= substr( $text, $was_at, $at - $was_at );
+				$decoded .= $character_reference;
+				$at      += $token_length;
+				$was_at   = $at;
+				continue;
+			}
+
+			++$at;
+		}
+
+		if ( 0 === $was_at ) {
+			return $text;
+		}
+
+		if ( $was_at < $end ) {
+			$decoded .= substr( $text, $was_at, $end - $was_at );
+		}
+
+		return $decoded;
+	}
+
+	/**
+	 * Attempt to read a character reference at the given location in a given string,
+	 * depending on the context in which it's found.
+	 *
+	 * If a character reference is found, this function will return the translated value
+	 * that the reference maps to. It will then set `$match_byte_length` the
+	 * number of bytes of input it read while consuming the character reference. This
+	 * gives calling code the opportunity to advance its cursor when traversing a string
+	 * and decoding.
+	 *
+	 * Example:
+	 *
+	 *     null === WP_HTML_Decoder::read_character_reference( 'attribute', 'Ships&hellip;', 0 );
+	 *     '…'  === WP_HTML_Decoder::read_character_reference( 'attribute', 'Ships&hellip;', 5, $token_length );
+	 *     8    === $token_length; // `&hellip;`
+	 *
+	 *     null === WP_HTML_Decoder::read_character_reference( 'attribute', '&notin', 0 );
+	 *     '∉'  === WP_HTML_Decoder::read_character_reference( 'attribute', '&notin;', 0, $token_length );
+	 *     7    === $token_length; // `&notin;`
+	 *
+	 *     '¬'  === WP_HTML_Decoder::read_character_reference( 'data', '&notin', 0, $token_length );
+	 *     4    === $token_length; // `&not`
+	 *     '∉'  === WP_HTML_Decoder::read_character_reference( 'data', '&notin;', 0, $token_length );
+	 *     7    === $token_length; // `&notin;`
+	 *
+	 * @since 6.6.0
+	 *
+	 * @global WP_Token_Map $html5_named_character_references
+	 *
+	 * @param string $context            `attribute` for decoding attribute values, `data` otherwise.
+	 * @param string $text               Text document containing span of text to decode.
+	 * @param int    $at                 Optional. Byte offset into text where span begins, defaults to the beginning (0).
+	 * @param int    &$match_byte_length Optional. Set to byte-length of character reference if provided and if a match
+	 *                                   is found, otherwise not set. Default null.
+	 * @return string|false Decoded character reference in UTF-8 if found, otherwise `false`.
+	 */
+	public static function read_character_reference( $context, $text, $at = 0, &$match_byte_length = null ) {
+		/**
+		 * Mappings for HTML5 named character references.
+		 *
+		 * @var WP_Token_Map $html5_named_character_references
+		 */
+		global $html5_named_character_references;
+
+		$length = strlen( $text );
+		if ( $at + 1 >= $length ) {
+			return null;
+		}
+
+		if ( '&' !== $text[ $at ] ) {
+			return null;
+		}
+
+		/*
+		 * Numeric character references.
+		 *
+		 * When truncated, these will encode the code point found by parsing the
+		 * digits that are available. For example, when `&#x1f170;` is truncated
+		 * to `&#x1f1` it will encode `DZ`. It does not:
+		 *  - know how to parse the original `🅰`.
+		 *  - fail to parse and return plaintext `&#x1f1`.
+		 *  - fail to parse and return the replacement character `�`
+		 */
+		if ( '#' === $text[ $at + 1 ] ) {
+			if ( $at + 2 >= $length ) {
+				return null;
+			}
+
+			/** Tracks inner parsing within the numeric character reference. */
+			$digits_at = $at + 2;
+
+			if ( 'x' === $text[ $digits_at ] || 'X' === $text[ $digits_at ] ) {
+				$numeric_base   = 16;
+				$numeric_digits = '0123456789abcdefABCDEF';
+				$max_digits     = 6; // &#x10FFFF;
+				++$digits_at;
+			} else {
+				$numeric_base   = 10;
+				$numeric_digits = '0123456789';
+				$max_digits     = 7; // &#1114111;
+			}
+
+			// Cannot encode invalid Unicode code points. Max is to U+10FFFF.
+			$zero_count    = strspn( $text, '0', $digits_at );
+			$digit_count   = strspn( $text, $numeric_digits, $digits_at + $zero_count );
+			$after_digits  = $digits_at + $zero_count + $digit_count;
+			$has_semicolon = $after_digits < $length && ';' === $text[ $after_digits ];
+			$end_of_span   = $has_semicolon ? $after_digits + 1 : $after_digits;
+
+			// `&#` or `&#x` without digits returns into plaintext.
+			if ( 0 === $digit_count && 0 === $zero_count ) {
+				return null;
+			}
+
+			// Whereas `&#` and only zeros is invalid.
+			if ( 0 === $digit_count ) {
+				$match_byte_length = $end_of_span - $at;
+				return '�';
+			}
+
+			// If there are too many digits then it's not worth parsing. It's invalid.
+			if ( $digit_count > $max_digits ) {
+				$match_byte_length = $end_of_span - $at;
+				return '�';
+			}
+
+			$digits     = substr( $text, $digits_at + $zero_count, $digit_count );
+			$code_point = intval( $digits, $numeric_base );
+
+			/*
+			 * Noncharacters, 0x0D, and non-ASCII-whitespace control characters.
+			 *
+			 * > A noncharacter is a code point that is in the range U+FDD0 to U+FDEF,
+			 * > inclusive, or U+FFFE, U+FFFF, U+1FFFE, U+1FFFF, U+2FFFE, U+2FFFF,
+			 * > U+3FFFE, U+3FFFF, U+4FFFE, U+4FFFF, U+5FFFE, U+5FFFF, U+6FFFE,
+			 * > U+6FFFF, U+7FFFE, U+7FFFF, U+8FFFE, U+8FFFF, U+9FFFE, U+9FFFF,
+			 * > U+AFFFE, U+AFFFF, U+BFFFE, U+BFFFF, U+CFFFE, U+CFFFF, U+DFFFE,
+			 * > U+DFFFF, U+EFFFE, U+EFFFF, U+FFFFE, U+FFFFF, U+10FFFE, or U+10FFFF.
+			 *
+			 * A C0 control is a code point that is in the range of U+00 to U+1F,
+			 * but ASCII whitespace includes U+09, U+0A, U+0C, and U+0D.
+			 *
+			 * These characters are invalid but still decode as any valid character.
+			 * This comment is here to note and explain why there's no check to
+			 * remove these characters or replace them.
+			 *
+			 * @see https://infra.spec.whatwg.org/#noncharacter
+			 */
+
+			/*
+			 * Code points in the C1 controls area need to be remapped as if they
+			 * were stored in Windows-1252. Note! This transformation only happens
+			 * for numeric character references. The raw code points in the byte
+			 * stream are not translated.
+			 *
+			 * > If the number is one of the numbers in the first column of
+			 * > the following table, then find the row with that number in
+			 * > the first column, and set the character reference code to
+			 * > the number in the second column of that row.
+			 */
+			if ( $code_point >= 0x80 && $code_point <= 0x9F ) {
+				$windows_1252_mapping = array(
+					0x20AC, // 0x80 -> EURO SIGN (€).
+					0x81,   // 0x81 -> (no change).
+					0x201A, // 0x82 -> SINGLE LOW-9 QUOTATION MARK (‚).
+					0x0192, // 0x83 -> LATIN SMALL LETTER F WITH HOOK (ƒ).
+					0x201E, // 0x84 -> DOUBLE LOW-9 QUOTATION MARK („).
+					0x2026, // 0x85 -> HORIZONTAL ELLIPSIS (…).
+					0x2020, // 0x86 -> DAGGER (†).
+					0x2021, // 0x87 -> DOUBLE DAGGER (‡).
+					0x02C6, // 0x88 -> MODIFIER LETTER CIRCUMFLEX ACCENT (ˆ).
+					0x2030, // 0x89 -> PER MILLE SIGN (‰).
+					0x0160, // 0x8A -> LATIN CAPITAL LETTER S WITH CARON (Š).
+					0x2039, // 0x8B -> SINGLE LEFT-POINTING ANGLE QUOTATION MARK (‹).
+					0x0152, // 0x8C -> LATIN CAPITAL LIGATURE OE (Œ).
+					0x8D,   // 0x8D -> (no change).
+					0x017D, // 0x8E -> LATIN CAPITAL LETTER Z WITH CARON (Ž).
+					0x8F,   // 0x8F -> (no change).
+					0x90,   // 0x90 -> (no change).
+					0x2018, // 0x91 -> LEFT SINGLE QUOTATION MARK (‘).
+					0x2019, // 0x92 -> RIGHT SINGLE QUOTATION MARK (’).
+					0x201C, // 0x93 -> LEFT DOUBLE QUOTATION MARK (“).
+					0x201D, // 0x94 -> RIGHT DOUBLE QUOTATION MARK (”).
+					0x2022, // 0x95 -> BULLET (•).
+					0x2013, // 0x96 -> EN DASH (–).
+					0x2014, // 0x97 -> EM DASH (—).
+					0x02DC, // 0x98 -> SMALL TILDE (˜).
+					0x2122, // 0x99 -> TRADE MARK SIGN (™).
+					0x0161, // 0x9A -> LATIN SMALL LETTER S WITH CARON (š).
+					0x203A, // 0x9B -> SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (›).
+					0x0153, // 0x9C -> LATIN SMALL LIGATURE OE (œ).
+					0x9D,   // 0x9D -> (no change).
+					0x017E, // 0x9E -> LATIN SMALL LETTER Z WITH CARON (ž).
+					0x0178, // 0x9F -> LATIN CAPITAL LETTER Y WITH DIAERESIS (Ÿ).
+				);
+
+				$code_point = $windows_1252_mapping[ $code_point - 0x80 ];
+			}
+
+			$match_byte_length = $end_of_span - $at;
+			return self::code_point_to_utf8_bytes( $code_point );
+		}
+
+		/** Tracks inner parsing within the named character reference. */
+		$name_at = $at + 1;
+		// Minimum named character reference is two characters. E.g. `GT`.
+		if ( $name_at + 2 > $length ) {
+			return null;
+		}
+
+		$name_length = 0;
+		$replacement = $html5_named_character_references->read_token( $text, $name_at, $name_length );
+		if ( false === $replacement ) {
+			return null;
+		}
+
+		$after_name = $name_at + $name_length;
+
+		// If the match ended with a semicolon then it should always be decoded.
+		if ( ';' === $text[ $name_at + $name_length - 1 ] ) {
+			$match_byte_length = $after_name - $at;
+			return $replacement;
+		}
+
+		/*
+		 * At this point though there's a match for an entry in the named
+		 * character reference table but the match doesn't end in `;`.
+		 * It may be allowed if it's followed by something unambiguous.
+		 */
+		$ambiguous_follower = (
+			$after_name < $length &&
+			$name_at < $length &&
+			(
+				ctype_alnum( $text[ $after_name ] ) ||
+				'=' === $text[ $after_name ]
+			)
+		);
+
+		// It's non-ambiguous, safe to leave it in.
+		if ( ! $ambiguous_follower ) {
+			$match_byte_length = $after_name - $at;
+			return $replacement;
+		}
+
+		// It's ambiguous, which isn't allowed inside attributes.
+		if ( 'attribute' === $context ) {
+			return null;
+		}
+
+		$match_byte_length = $after_name - $at;
+		return $replacement;
+	}
+
+	/**
+	 * Encode a code point number into the UTF-8 encoding.
+	 *
+	 * This encoder implements the UTF-8 encoding algorithm for converting
+	 * a code point into a byte sequence. If it receives an invalid code
+	 * point it will return the Unicode Replacement Character U+FFFD `�`.
+	 *
+	 * Example:
+	 *
+	 *     '🅰' === WP_HTML_Decoder::code_point_to_utf8_bytes( 0x1f170 );
+	 *
+	 *     // Half of a surrogate pair is an invalid code point.
+	 *     '�' === WP_HTML_Decoder::code_point_to_utf8_bytes( 0xd83c );
+	 *
+	 * @since 6.6.0
+	 *
+	 * @see https://www.rfc-editor.org/rfc/rfc3629 For the UTF-8 standard.
+	 *
+	 * @param int $code_point Which code point to convert.
+	 * @return string Converted code point, or `�` if invalid.
+	 */
+	public static function code_point_to_utf8_bytes( $code_point ): string {
+		// Pre-check to ensure a valid code point.
+		if (
+			$code_point <= 0 ||
+			( $code_point >= 0xD800 && $code_point <= 0xDFFF ) ||
+			$code_point > 0x10FFFF
+		) {
+			return '�';
+		}
+
+		if ( $code_point <= 0x7F ) {
+			return chr( $code_point );
+		}
+
+		if ( $code_point <= 0x7FF ) {
+			$byte1 = chr( ( $code_point >> 6 ) | 0xC0 );
+			$byte2 = chr( $code_point & 0x3F | 0x80 );
+
+			return "{$byte1}{$byte2}";
+		}
+
+		if ( $code_point <= 0xFFFF ) {
+			$byte1 = chr( ( $code_point >> 12 ) | 0xE0 );
+			$byte2 = chr( ( $code_point >> 6 ) & 0x3F | 0x80 );
+			$byte3 = chr( $code_point & 0x3F | 0x80 );
+
+			return "{$byte1}{$byte2}{$byte3}";
+		}
+
+		// Any values above U+10FFFF are eliminated above in the pre-check.
+		$byte1 = chr( ( $code_point >> 18 ) | 0xF0 );
+		$byte2 = chr( ( $code_point >> 12 ) & 0x3F | 0x80 );
+		$byte3 = chr( ( $code_point >> 6 ) & 0x3F | 0x80 );
+		$byte4 = chr( $code_point & 0x3F | 0x80 );
+
+		return "{$byte1}{$byte2}{$byte3}{$byte4}";
+	}
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-open-elements-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-open-elements-6-7.php
new file mode 100644
index 00000000000000..fd2b252432455e
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-open-elements-6-7.php
@@ -0,0 +1,598 @@
+<?php
+/**
+ * HTML API: WP_HTML_Open_Elements class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the stack of open elements.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * > Initially, the stack of open elements is empty. The stack grows
+ * > downwards; the topmost node on the stack is the first one added
+ * > to the stack, and the bottommost node of the stack is the most
+ * > recently added node in the stack (notwithstanding when the stack
+ * > is manipulated in a random access fashion as part of the handling
+ * > for misnested tags).
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see https://html.spec.whatwg.org/#stack-of-open-elements
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Open_Elements_6_7 {
+	/**
+	 * Holds the stack of open element references.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token[]
+	 */
+	public $stack = array();
+
+	/**
+	 * Whether a P element is in button scope currently.
+	 *
+	 * This class optimizes scope lookup by pre-calculating
+	 * this value when elements are added and removed to the
+	 * stack of open elements which might change its value.
+	 * This avoids frequent iteration over the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var bool
+	 */
+	private $has_p_in_button_scope = false;
+
+	/**
+	 * A function that will be called when an item is popped off the stack of open elements.
+	 *
+	 * The function will be called with the popped item as its argument.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var Closure|null
+	 */
+	private $pop_handler = null;
+
+	/**
+	 * A function that will be called when an item is pushed onto the stack of open elements.
+	 *
+	 * The function will be called with the pushed item as its argument.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var Closure|null
+	 */
+	private $push_handler = null;
+
+	/**
+	 * Sets a pop handler that will be called when an item is popped off the stack of
+	 * open elements.
+	 *
+	 * The function will be called with the pushed item as its argument.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param Closure $handler The handler function.
+	 */
+	public function set_pop_handler( Closure $handler ): void {
+		$this->pop_handler = $handler;
+	}
+
+	/**
+	 * Sets a push handler that will be called when an item is pushed onto the stack of
+	 * open elements.
+	 *
+	 * The function will be called with the pushed item as its argument.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param Closure $handler The handler function.
+	 */
+	public function set_push_handler( Closure $handler ): void {
+		$this->push_handler = $handler;
+	}
+
+	/**
+	 * Reports if a specific node is in the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token Look for this node in the stack.
+	 * @return bool Whether the referenced node is in the stack of open elements.
+	 */
+	public function contains_node( Gutenberg_HTML_Token_6_7 $token ): bool {
+		foreach ( $this->walk_up() as $item ) {
+			if ( $token->bookmark_name === $item->bookmark_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns how many nodes are currently in the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return int How many node are in the stack of open elements.
+	 */
+	public function count(): int {
+		return count( $this->stack );
+	}
+
+	/**
+	 * Returns the node at the end of the stack of open elements,
+	 * if one exists. If the stack is empty, returns null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return WP_HTML_Token|null Last node in the stack of open elements, if one exists, otherwise null.
+	 */
+	public function current_node(): ?Gutenberg_HTML_Token_6_7 {
+		$current_node = end( $this->stack );
+
+		return $current_node ? $current_node : null;
+	}
+
+	/**
+	 * Indicates if the current node is of a given type or name.
+	 *
+	 * It's possible to pass either a node type or a node name to this function.
+	 * In the case there is no current element it will always return `false`.
+	 *
+	 * Example:
+	 *
+	 *     // Is the current node a text node?
+	 *     $stack->current_node_is( '#text' );
+	 *
+	 *     // Is the current node a DIV element?
+	 *     $stack->current_node_is( 'DIV' );
+	 *
+	 *     // Is the current node any element/tag?
+	 *     $stack->current_node_is( '#tag' );
+	 *
+	 * @see WP_HTML_Tag_Processor::get_token_type
+	 * @see WP_HTML_Tag_Processor::get_token_name
+	 *
+	 * @since 6.7.0
+	 *
+	 * @access private
+	 *
+	 * @param string $identity Check if the current node has this name or type (depending on what is provided).
+	 * @return bool Whether there is a current element that matches the given identity, whether a token name or type.
+	 */
+	public function current_node_is( string $identity ): bool {
+		$current_node = end( $this->stack );
+		if ( false === $current_node ) {
+			return false;
+		}
+
+		$current_node_name = $current_node->node_name;
+
+		return (
+			$current_node_name === $identity ||
+			( '#doctype' === $identity && 'html' === $current_node_name ) ||
+			( '#tag' === $identity && ctype_upper( $current_node_name ) )
+		);
+	}
+
+	/**
+	 * Returns whether an element is in a specific scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-the-specific-scope
+	 *
+	 * @param string   $tag_name         Name of tag check.
+	 * @param string[] $termination_list List of elements that terminate the search.
+	 * @return bool Whether the element was found in a specific scope.
+	 */
+	public function has_element_in_specific_scope( string $tag_name, $termination_list ): bool {
+		foreach ( $this->walk_up() as $node ) {
+			if ( $node->node_name === $tag_name ) {
+				return true;
+			}
+
+			if (
+				'(internal: H1 through H6 - do not use)' === $tag_name &&
+				in_array( $node->node_name, array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ), true )
+			) {
+				return true;
+			}
+
+			switch ( $node->node_name ) {
+				case 'HTML':
+					return false;
+			}
+
+			if ( in_array( $node->node_name, $termination_list, true ) ) {
+				return false;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns whether a particular element is in scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_scope( string $tag_name ): bool {
+		return $this->has_element_in_specific_scope(
+			$tag_name,
+			array(
+
+				/*
+				 * Because it's not currently possible to encounter
+				 * one of the termination elements, they don't need
+				 * to be listed here. If they were, they would be
+				 * unreachable and only waste CPU cycles while
+				 * scanning through HTML.
+				 */
+			)
+		);
+	}
+
+	/**
+	 * Returns whether a particular element is in list item scope.
+	 *
+	 * @since 6.4.0
+	 * @since 6.5.0 Implemented: no longer throws on every invocation.
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-list-item-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_list_item_scope( string $tag_name ): bool {
+		return $this->has_element_in_specific_scope(
+			$tag_name,
+			array(
+				// There are more elements that belong here which aren't currently supported.
+				'OL',
+				'UL',
+			)
+		);
+	}
+
+	/**
+	 * Returns whether a particular element is in button scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_button_scope( string $tag_name ): bool {
+		return $this->has_element_in_specific_scope( $tag_name, array( 'BUTTON' ) );
+	}
+
+	/**
+	 * Returns whether a particular element is in table scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-table-scope
+	 *
+	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_table_scope( string $tag_name ): bool {
+		throw new Gutenberg_HTML_Unsupported_Exception_6_7( 'Cannot process elements depending on table scope.' );
+
+		return false; // The linter requires this unreachable code until the function is implemented and can return.
+	}
+
+	/**
+	 * Returns whether a particular element is in select scope.
+	 *
+	 * This test differs from the others like it, in that its rules are inverted.
+	 * Instead of arriving at a match when one of any tag in a termination group
+	 * is reached, this one terminates if any other tag is reached.
+	 *
+	 * > The stack of open elements is said to have a particular element in select scope when it has
+	 * > that element in the specific scope consisting of all element types except the following:
+	 * >   - optgroup in the HTML namespace
+	 * >   - option in the HTML namespace
+	 *
+	 * @since 6.4.0 Stub implementation (throws).
+	 * @since 6.7.0 Full implementation.
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-select-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether the given element is in SELECT scope.
+	 */
+	public function has_element_in_select_scope( string $tag_name ): bool {
+		foreach ( $this->walk_up() as $node ) {
+			if ( $node->node_name === $tag_name ) {
+				return true;
+			}
+
+			if (
+				'OPTION' !== $node->node_name &&
+				'OPTGROUP' !== $node->node_name
+			) {
+				return false;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns whether a P is in BUTTON scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
+	 *
+	 * @return bool Whether a P is in BUTTON scope.
+	 */
+	public function has_p_in_button_scope(): bool {
+		return $this->has_p_in_button_scope;
+	}
+
+	/**
+	 * Pops a node off of the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @return bool Whether a node was popped off of the stack.
+	 */
+	public function pop(): bool {
+		$item = array_pop( $this->stack );
+		if ( null === $item ) {
+			return false;
+		}
+
+		if ( 'context-node' === $item->bookmark_name ) {
+			$this->stack[] = $item;
+			return false;
+		}
+
+		$this->after_element_pop( $item );
+		return true;
+	}
+
+	/**
+	 * Pops nodes off of the stack of open elements until one with the given tag name has been popped.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Open_Elements::pop
+	 *
+	 * @param string $tag_name Name of tag that needs to be popped off of the stack of open elements.
+	 * @return bool Whether a tag of the given name was found and popped off of the stack of open elements.
+	 */
+	public function pop_until( string $tag_name ): bool {
+		foreach ( $this->walk_up() as $item ) {
+			if ( 'context-node' === $item->bookmark_name ) {
+				return true;
+			}
+
+			$this->pop();
+
+			if (
+				'(internal: H1 through H6 - do not use)' === $tag_name &&
+				in_array( $item->node_name, array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ), true )
+			) {
+				return true;
+			}
+
+			if ( $tag_name === $item->node_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Pushes a node onto the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @param WP_HTML_Token $stack_item Item to add onto stack.
+	 */
+	public function push( Gutenberg_HTML_Token_6_7 $stack_item ): void {
+		$this->stack[] = $stack_item;
+		$this->after_element_push( $stack_item );
+	}
+
+	/**
+	 * Removes a specific node from the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token The node to remove from the stack of open elements.
+	 * @return bool Whether the node was found and removed from the stack of open elements.
+	 */
+	public function remove_node( Gutenberg_HTML_Token_6_7 $token ): bool {
+		if ( 'context-node' === $token->bookmark_name ) {
+			return false;
+		}
+
+		foreach ( $this->walk_up() as $position_from_end => $item ) {
+			if ( $token->bookmark_name !== $item->bookmark_name ) {
+				continue;
+			}
+
+			$position_from_start = $this->count() - $position_from_end - 1;
+			array_splice( $this->stack, $position_from_start, 1 );
+			$this->after_element_pop( $item );
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Steps through the stack of open elements, starting with the top element
+	 * (added first) and walking downwards to the one added last.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_down() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > EM -> STRONG -> A ->
+	 *
+	 * To start with the most-recently added element and walk towards the top,
+	 * see WP_HTML_Open_Elements::walk_up().
+	 *
+	 * @since 6.4.0
+	 */
+	public function walk_down() {
+		$count = count( $this->stack );
+
+		for ( $i = 0; $i < $count; $i++ ) {
+			yield $this->stack[ $i ];
+		}
+	}
+
+	/**
+	 * Steps through the stack of open elements, starting with the bottom element
+	 * (added last) and walking upwards to the one added first.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_up() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > A -> STRONG -> EM ->
+	 *
+	 * To start with the first added element and walk towards the bottom,
+	 * see WP_HTML_Open_Elements::walk_down().
+	 *
+	 * @since 6.4.0
+	 * @since 6.5.0 Accepts $above_this_node to start traversal above a given node, if it exists.
+	 *
+	 * @param WP_HTML_Token|null $above_this_node Optional. Start traversing above this node,
+	 *                                            if provided and if the node exists.
+	 */
+	public function walk_up( ?Gutenberg_HTML_Token_6_7 $above_this_node = null ) {
+		$has_found_node = null === $above_this_node;
+
+		for ( $i = count( $this->stack ) - 1; $i >= 0; $i-- ) {
+			$node = $this->stack[ $i ];
+
+			if ( ! $has_found_node ) {
+				$has_found_node = $node === $above_this_node;
+				continue;
+			}
+
+			yield $node;
+		}
+	}
+
+	/*
+	 * Internal helpers.
+	 */
+
+	/**
+	 * Updates internal flags after adding an element.
+	 *
+	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
+	 * flags that are only modified when adding and removing elements. This allows
+	 * the HTML Processor to quickly check for these conditions instead of iterating
+	 * over the open stack elements upon each new tag it encounters. These flags,
+	 * however, need to be maintained as items are added and removed from the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $item Element that was added to the stack of open elements.
+	 */
+	public function after_element_push( Gutenberg_HTML_Token_6_7 $item ): void {
+		/*
+		 * When adding support for new elements, expand this switch to trap
+		 * cases where the precalculated value needs to change.
+		 */
+		switch ( $item->node_name ) {
+			case 'BUTTON':
+				$this->has_p_in_button_scope = false;
+				break;
+
+			case 'P':
+				$this->has_p_in_button_scope = true;
+				break;
+		}
+
+		if ( null !== $this->push_handler ) {
+			( $this->push_handler )( $item );
+		}
+	}
+
+	/**
+	 * Updates internal flags after removing an element.
+	 *
+	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
+	 * flags that are only modified when adding and removing elements. This allows
+	 * the HTML Processor to quickly check for these conditions instead of iterating
+	 * over the open stack elements upon each new tag it encounters. These flags,
+	 * however, need to be maintained as items are added and removed from the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $item Element that was removed from the stack of open elements.
+	 */
+	public function after_element_pop( Gutenberg_HTML_Token_6_7 $item ): void {
+		/*
+		 * When adding support for new elements, expand this switch to trap
+		 * cases where the precalculated value needs to change.
+		 */
+		switch ( $item->node_name ) {
+			case 'BUTTON':
+				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
+				break;
+
+			case 'P':
+				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
+				break;
+		}
+
+		if ( null !== $this->pop_handler ) {
+			( $this->pop_handler )( $item );
+		}
+	}
+
+	/**
+	 * Wakeup magic method.
+	 *
+	 * @since 6.6.0
+	 */
+	public function __wakeup() {
+		throw new \LogicException( __CLASS__ . ' should never be unserialized' );
+	}
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-processor-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-processor-6-7.php
new file mode 100644
index 00000000000000..15cbbdc6adda8c
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-processor-6-7.php
@@ -0,0 +1,3402 @@
+<?php
+/**
+ * HTML API: WP_HTML_Processor class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used to safely parse and modify an HTML document.
+ *
+ * The HTML Processor class properly parses and modifies HTML5 documents.
+ *
+ * It supports a subset of the HTML5 specification, and when it encounters
+ * unsupported markup, it aborts early to avoid unintentionally breaking
+ * the document. The HTML Processor should never break an HTML document.
+ *
+ * While the `WP_HTML_Tag_Processor` is a valuable tool for modifying
+ * attributes on individual HTML tags, the HTML Processor is more capable
+ * and useful for the following operations:
+ *
+ *  - Querying based on nested HTML structure.
+ *
+ * Eventually the HTML Processor will also support:
+ *  - Wrapping a tag in surrounding HTML.
+ *  - Unwrapping a tag by removing its parent.
+ *  - Inserting and removing nodes.
+ *  - Reading and changing inner content.
+ *  - Navigating up or around HTML structure.
+ *
+ * ## Usage
+ *
+ * Use of this class requires three steps:
+ *
+ *   1. Call a static creator method with your input HTML document.
+ *   2. Find the location in the document you are looking for.
+ *   3. Request changes to the document at that location.
+ *
+ * Example:
+ *
+ *     $processor = WP_HTML_Processor::create_fragment( $html );
+ *     if ( $processor->next_tag( array( 'breadcrumbs' => array( 'DIV', 'FIGURE', 'IMG' ) ) ) ) {
+ *         $processor->add_class( 'responsive-image' );
+ *     }
+ *
+ * #### Breadcrumbs
+ *
+ * Breadcrumbs represent the stack of open elements from the root
+ * of the document or fragment down to the currently-matched node,
+ * if one is currently selected. Call WP_HTML_Processor::get_breadcrumbs()
+ * to inspect the breadcrumbs for a matched tag.
+ *
+ * Breadcrumbs can specify nested HTML structure and are equivalent
+ * to a CSS selector comprising tag names separated by the child
+ * combinator, such as "DIV > FIGURE > IMG".
+ *
+ * Since all elements find themselves inside a full HTML document
+ * when parsed, the return value from `get_breadcrumbs()` will always
+ * contain any implicit outermost elements. For example, when parsing
+ * with `create_fragment()` in the `BODY` context (the default), any
+ * tag in the given HTML document will contain `array( 'HTML', 'BODY', … )`
+ * in its breadcrumbs.
+ *
+ * Despite containing the implied outermost elements in their breadcrumbs,
+ * tags may be found with the shortest-matching breadcrumb query. That is,
+ * `array( 'IMG' )` matches all IMG elements and `array( 'P', 'IMG' )`
+ * matches all IMG elements directly inside a P element. To ensure that no
+ * partial matches erroneously match it's possible to specify in a query
+ * the full breadcrumb match all the way down from the root HTML element.
+ *
+ * Example:
+ *
+ *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
+ *     //               ----- Matches here.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'IMG' ) ) );
+ *
+ *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
+ *     //                                  ---- Matches here.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'FIGCAPTION', 'EM' ) ) );
+ *
+ *     $html = '<div><img></div><img>';
+ *     //                       ----- Matches here, because IMG must be a direct child of the implicit BODY.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'BODY', 'IMG' ) ) );
+ *
+ * ## HTML Support
+ *
+ * This class implements a small part of the HTML5 specification.
+ * It's designed to operate within its support and abort early whenever
+ * encountering circumstances it can't properly handle. This is
+ * the principle way in which this class remains as simple as possible
+ * without cutting corners and breaking compliance.
+ *
+ * ### Supported elements
+ *
+ * If any unsupported element appears in the HTML input the HTML Processor
+ * will abort early and stop all processing. This draconian measure ensures
+ * that the HTML Processor won't break any HTML it doesn't fully understand.
+ *
+ * The following list specifies the HTML tags that _are_ supported:
+ *
+ *  - Containers: ADDRESS, BLOCKQUOTE, DETAILS, DIALOG, DIV, FOOTER, HEADER, MAIN, MENU, SPAN, SUMMARY.
+ *  - Custom elements: All custom elements are supported. :)
+ *  - Form elements: BUTTON, DATALIST, FIELDSET, INPUT, LABEL, LEGEND, METER, OPTGROUP, OPTION, PROGRESS, SEARCH, SELECT.
+ *  - Formatting elements: B, BIG, CODE, EM, FONT, I, PRE, SMALL, STRIKE, STRONG, TT, U, WBR.
+ *  - Heading elements: H1, H2, H3, H4, H5, H6, HGROUP.
+ *  - Links: A.
+ *  - Lists: DD, DL, DT, LI, OL, UL.
+ *  - Media elements: AUDIO, CANVAS, EMBED, FIGCAPTION, FIGURE, IMG, MAP, PICTURE, SOURCE, TRACK, VIDEO.
+ *  - Paragraph: BR, P.
+ *  - Phrasing elements: ABBR, AREA, BDI, BDO, CITE, DATA, DEL, DFN, INS, MARK, OUTPUT, Q, SAMP, SUB, SUP, TIME, VAR.
+ *  - Sectioning elements: ARTICLE, ASIDE, HR, NAV, SECTION.
+ *  - Templating elements: SLOT.
+ *  - Text decoration: RUBY.
+ *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, KEYGEN, LISTING, MULTICOL, NEXTID, PARAM, SPACER.
+ *
+ * ### Supported markup
+ *
+ * Some kinds of non-normative HTML involve reconstruction of formatting elements and
+ * re-parenting of mis-nested elements. For example, a DIV tag found inside a TABLE
+ * may in fact belong _before_ the table in the DOM. If the HTML Processor encounters
+ * such a case it will stop processing.
+ *
+ * The following list specifies HTML markup that _is_ supported:
+ *
+ *  - Markup involving only those tags listed above.
+ *  - Fully-balanced and non-overlapping tags.
+ *  - HTML with unexpected tag closers.
+ *  - Some unbalanced or overlapping tags.
+ *  - P tags after unclosed P tags.
+ *  - BUTTON tags after unclosed BUTTON tags.
+ *  - A tags after unclosed A tags that don't involve any active formatting elements.
+ *
+ * @since 6.4.0
+ *
+ * @see WP_HTML_Tag_Processor
+ * @see https://html.spec.whatwg.org/
+ */
+class Gutenberg_HTML_Processor_6_7 extends Gutenberg_HTML_Tag_Processor_6_7 {
+	/**
+	 * The maximum number of bookmarks allowed to exist at any given time.
+	 *
+	 * HTML processing requires more bookmarks than basic tag processing,
+	 * so this class constant from the Tag Processor is overwritten.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var int
+	 */
+	const MAX_BOOKMARKS = 100;
+
+	/**
+	 * Holds the working state of the parser, including the stack of
+	 * open elements and the stack of active formatting elements.
+	 *
+	 * Initialized in the constructor.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Processor_State
+	 */
+	private $state;
+
+	/**
+	 * Used to create unique bookmark names.
+	 *
+	 * This class sets a bookmark for every tag in the HTML document that it encounters.
+	 * The bookmark name is auto-generated and increments, starting with `1`. These are
+	 * internal bookmarks and are automatically released when the referring WP_HTML_Token
+	 * goes out of scope and is garbage-collected.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::$release_internal_bookmark_on_destruct
+	 *
+	 * @var int
+	 */
+	private $bookmark_counter = 0;
+
+	/**
+	 * Stores an explanation for why something failed, if it did.
+	 *
+	 * @see self::get_last_error
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string|null
+	 */
+	private $last_error = null;
+
+	/**
+	 * Stores context for why the parser bailed on unsupported HTML, if it did.
+	 *
+	 * @see self::get_unsupported_exception
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var WP_HTML_Unsupported_Exception|null
+	 */
+	private $unsupported_exception = null;
+
+	/**
+	 * Releases a bookmark when PHP garbage-collects its wrapping WP_HTML_Token instance.
+	 *
+	 * This function is created inside the class constructor so that it can be passed to
+	 * the stack of open elements and the stack of active formatting elements without
+	 * exposing it as a public method on the class.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var Closure|null
+	 */
+	private $release_internal_bookmark_on_destruct = null;
+
+	/**
+	 * Stores stack events which arise during parsing of the
+	 * HTML document, which will then supply the "match" events.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var WP_HTML_Stack_Event[]
+	 */
+	private $element_queue = array();
+
+	/**
+	 * Stores the current breadcrumbs.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var string[]
+	 */
+	private $breadcrumbs = array();
+
+	/**
+	 * Current stack event, if set, representing a matched token.
+	 *
+	 * Because the parser may internally point to a place further along in a document
+	 * than the nodes which have already been processed (some "virtual" nodes may have
+	 * appeared while scanning the HTML document), this will point at the "current" node
+	 * being processed. It comes from the front of the element queue.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var WP_HTML_Stack_Event|null
+	 */
+	private $current_element = null;
+
+	/**
+	 * Context node if created as a fragment parser.
+	 *
+	 * @var WP_HTML_Token|null
+	 */
+	private $context_node = null;
+
+	/**
+	 * Whether the parser has yet processed the context node,
+	 * if created as a fragment parser.
+	 *
+	 * The context node will be initially pushed onto the stack of open elements,
+	 * but when created as a fragment parser, this context element (and the implicit
+	 * HTML document node above it) should not be exposed as a matched token or node.
+	 *
+	 * This boolean indicates whether the processor should skip over the current
+	 * node in its initial search for the first node created from the input HTML.
+	 *
+	 * @var bool
+	 */
+	private $has_seen_context_node = false;
+
+	/*
+	 * Public Interface Functions
+	 */
+
+	/**
+	 * Creates an HTML processor in the fragment parsing mode.
+	 *
+	 * Use this for cases where you are processing chunks of HTML that
+	 * will be found within a bigger HTML document, such as rendered
+	 * block output that exists within a post, `the_content` inside a
+	 * rendered site layout.
+	 *
+	 * Fragment parsing occurs within a context, which is an HTML element
+	 * that the document will eventually be placed in. It becomes important
+	 * when special elements have different rules than others, such as inside
+	 * a TEXTAREA or a TITLE tag where things that look like tags are text,
+	 * or inside a SCRIPT tag where things that look like HTML syntax are JS.
+	 *
+	 * The context value should be a representation of the tag into which the
+	 * HTML is found. For most cases this will be the body element. The HTML
+	 * form is provided because a context element may have attributes that
+	 * impact the parse, such as with a SCRIPT tag and its `type` attribute.
+	 *
+	 * ## Current HTML Support
+	 *
+	 *  - The only supported context is `<body>`, which is the default value.
+	 *  - The only supported document encoding is `UTF-8`, which is the default value.
+	 *
+	 * @since 6.4.0
+	 * @since 6.6.0 Returns `static` instead of `self` so it can create subclass instances.
+	 *
+	 * @param string $html     Input HTML fragment to process.
+	 * @param string $context  Context element for the fragment, must be default of `<body>`.
+	 * @param string $encoding Text encoding of the document; must be default of 'UTF-8'.
+	 * @return static|null The created processor if successful, otherwise null.
+	 */
+	public static function create_fragment( $html, $context = '<body>', $encoding = 'UTF-8' ) {
+		if ( '<body>' !== $context || 'UTF-8' !== $encoding ) {
+			return null;
+		}
+
+		$processor                        = new static( $html, self::CONSTRUCTOR_UNLOCK_CODE );
+		$processor->state->context_node   = array( 'BODY', array() );
+		$processor->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_BODY;
+
+		// @todo Create "fake" bookmarks for non-existent but implied nodes.
+		$processor->bookmarks['root-node']    = new Gutenberg_HTML_Span_6_7( 0, 0 );
+		$processor->bookmarks['context-node'] = new Gutenberg_HTML_Span_6_7( 0, 0 );
+
+		$processor->state->stack_of_open_elements->push(
+			new Gutenberg_HTML_Token_6_7(
+				'root-node',
+				'HTML',
+				false
+			)
+		);
+
+		$context_node = new Gutenberg_HTML_Token_6_7(
+			'context-node',
+			$processor->state->context_node[0],
+			false
+		);
+
+		$processor->context_node = $context_node;
+		$processor->breadcrumbs  = array( 'HTML', $context_node->node_name );
+
+		return $processor;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * Do not use this method. Use the static creator methods instead.
+	 *
+	 * @access private
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::create_fragment()
+	 *
+	 * @param string      $html                                  HTML to process.
+	 * @param string|null $use_the_static_create_methods_instead This constructor should not be called manually.
+	 */
+	public function __construct( $html, $use_the_static_create_methods_instead = null ) {
+		parent::__construct( $html );
+
+		if ( self::CONSTRUCTOR_UNLOCK_CODE !== $use_the_static_create_methods_instead ) {
+			_doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					/* translators: %s: WP_HTML_Processor::create_fragment(). */
+					__( 'Call %s to create an HTML Processor instead of calling the constructor directly.' ),
+					'<code>WP_HTML_Processor::create_fragment()</code>'
+				),
+				'6.4.0'
+			);
+		}
+
+		$this->state = new Gutenberg_HTML_Processor_State_6_7();
+
+		$this->state->stack_of_open_elements->set_push_handler(
+			function ( Gutenberg_HTML_Token_6_7 $token ): void {
+				$is_virtual            = ! isset( $this->state->current_token ) || $this->is_tag_closer();
+				$same_node             = isset( $this->state->current_token ) && $token->node_name === $this->state->current_token->node_name;
+				$provenance            = ( ! $same_node || $is_virtual ) ? 'virtual' : 'real';
+				$this->element_queue[] = new Gutenberg_HTML_Stack_Event_6_7( $token, Gutenberg_HTML_Stack_Event_6_7::PUSH, $provenance );
+			}
+		);
+
+		$this->state->stack_of_open_elements->set_pop_handler(
+			function ( Gutenberg_HTML_Token_6_7 $token ): void {
+				$is_virtual            = ! isset( $this->state->current_token ) || ! $this->is_tag_closer();
+				$same_node             = isset( $this->state->current_token ) && $token->node_name === $this->state->current_token->node_name;
+				$provenance            = ( ! $same_node || $is_virtual ) ? 'virtual' : 'real';
+				$this->element_queue[] = new Gutenberg_HTML_Stack_Event_6_7( $token, Gutenberg_HTML_Stack_Event_6_7::POP, $provenance );
+			}
+		);
+
+		/*
+		 * Create this wrapper so that it's possible to pass
+		 * a private method into WP_HTML_Token classes without
+		 * exposing it to any public API.
+		 */
+		$this->release_internal_bookmark_on_destruct = function ( string $name ): void {
+			parent::release_bookmark( $name );
+		};
+	}
+
+	/**
+	 * Stops the parser and terminates its execution when encountering unsupported markup.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception Halts execution of the parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @param string $message Explains support is missing in order to parse the current node.
+	 */
+	private function bail( string $message ) {
+		$here  = $this->bookmarks[ $this->state->current_token->bookmark_name ];
+		$token = substr( $this->html, $here->start, $here->length );
+
+		$open_elements = array();
+		foreach ( $this->state->stack_of_open_elements->stack as $item ) {
+			$open_elements[] = $item->node_name;
+		}
+
+		$active_formats = array();
+		foreach ( $this->state->active_formatting_elements->walk_down() as $item ) {
+			$active_formats[] = $item->node_name;
+		}
+
+		$this->last_error = self::ERROR_UNSUPPORTED;
+
+		$this->unsupported_exception = new Gutenberg_HTML_Unsupported_Exception_6_7(
+			$message,
+			$this->state->current_token->node_name,
+			$here->start,
+			$token,
+			$open_elements,
+			$active_formats
+		);
+
+		throw $this->unsupported_exception;
+	}
+
+	/**
+	 * Returns the last error, if any.
+	 *
+	 * Various situations lead to parsing failure but this class will
+	 * return `false` in all those cases. To determine why something
+	 * failed it's possible to request the last error. This can be
+	 * helpful to know to distinguish whether a given tag couldn't
+	 * be found or if content in the document caused the processor
+	 * to give up and abort processing.
+	 *
+	 * Example
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<template><strong><button><em><p><em>' );
+	 *     false === $processor->next_tag();
+	 *     WP_HTML_Processor::ERROR_UNSUPPORTED === $processor->get_last_error();
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see self::ERROR_UNSUPPORTED
+	 * @see self::ERROR_EXCEEDED_MAX_BOOKMARKS
+	 *
+	 * @return string|null The last error, if one exists, otherwise null.
+	 */
+	public function get_last_error(): ?string {
+		return $this->last_error;
+	}
+
+	/**
+	 * Returns context for why the parser aborted due to unsupported HTML, if it did.
+	 *
+	 * This is meant for debugging purposes, not for production use.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see self::$unsupported_exception
+	 *
+	 * @return WP_HTML_Unsupported_Exception|null
+	 */
+	public function get_unsupported_exception() {
+		return $this->unsupported_exception;
+	}
+
+	/**
+	 * Finds the next tag matching the $query.
+	 *
+	 * @todo Support matching the class name and tag name.
+	 *
+	 * @since 6.4.0
+	 * @since 6.6.0 Visits all tokens, including virtual ones.
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type string      $tag_closers  'visit' to pause at tag closers, 'skip' or unset to only visit openers.
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this whole class name to match.
+	 *     @type string[]    $breadcrumbs  DOM sub-path at which element is found, e.g. `array( 'FIGURE', 'IMG' )`.
+	 *                                     May also contain the wildcard `*` which matches a single element, e.g. `array( 'SECTION', '*' )`.
+	 * }
+	 * @return bool Whether a tag was matched.
+	 */
+	public function next_tag( $query = null ): bool {
+		$visit_closers = isset( $query['tag_closers'] ) && 'visit' === $query['tag_closers'];
+
+		if ( null === $query ) {
+			while ( $this->next_token() ) {
+				if ( '#tag' !== $this->get_token_type() ) {
+					continue;
+				}
+
+				if ( ! $this->is_tag_closer() || $visit_closers ) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		if ( is_string( $query ) ) {
+			$query = array( 'breadcrumbs' => array( $query ) );
+		}
+
+		if ( ! is_array( $query ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Please pass a query array to this function.' ),
+				'6.4.0'
+			);
+			return false;
+		}
+
+		$needs_class = ( isset( $query['class_name'] ) && is_string( $query['class_name'] ) )
+			? $query['class_name']
+			: null;
+
+		if ( ! ( array_key_exists( 'breadcrumbs', $query ) && is_array( $query['breadcrumbs'] ) ) ) {
+			while ( $this->next_token() ) {
+				if ( '#tag' !== $this->get_token_type() ) {
+					continue;
+				}
+
+				if ( isset( $query['tag_name'] ) && $query['tag_name'] !== $this->get_token_name() ) {
+					continue;
+				}
+
+				if ( isset( $needs_class ) && ! $this->has_class( $needs_class ) ) {
+					continue;
+				}
+
+				if ( ! $this->is_tag_closer() || $visit_closers ) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		$breadcrumbs  = $query['breadcrumbs'];
+		$match_offset = isset( $query['match_offset'] ) ? (int) $query['match_offset'] : 1;
+
+		while ( $match_offset > 0 && $this->next_token() ) {
+			if ( '#tag' !== $this->get_token_type() || $this->is_tag_closer() ) {
+				continue;
+			}
+
+			if ( isset( $needs_class ) && ! $this->has_class( $needs_class ) ) {
+				continue;
+			}
+
+			if ( $this->matches_breadcrumbs( $breadcrumbs ) && 0 === --$match_offset ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Ensures internal accounting is maintained for HTML semantic rules while
+	 * the underlying Tag Processor class is seeking to a bookmark.
+	 *
+	 * This doesn't currently have a way to represent non-tags and doesn't process
+	 * semantic rules for text nodes. For access to the raw tokens consider using
+	 * WP_HTML_Tag_Processor instead.
+	 *
+	 * @since 6.5.0 Added for internal support; do not use.
+	 *
+	 * @access private
+	 *
+	 * @return bool
+	 */
+	public function next_token(): bool {
+		$this->current_element = null;
+
+		if ( isset( $this->last_error ) ) {
+			return false;
+		}
+
+		/*
+		 * Prime the events if there are none.
+		 *
+		 * @todo In some cases, probably related to the adoption agency
+		 *       algorithm, this call to step() doesn't create any new
+		 *       events. Calling it again creates them. Figure out why
+		 *       this is and if it's inherent or if it's a bug. Looping
+		 *       until there are events or until there are no more
+		 *       tokens works in the meantime and isn't obviously wrong.
+		 */
+		while ( empty( $this->element_queue ) && $this->step() ) {
+			continue;
+		}
+
+		// Process the next event on the queue.
+		$this->current_element = array_shift( $this->element_queue );
+		if ( ! isset( $this->current_element ) ) {
+			return false;
+		}
+
+		$is_pop = Gutenberg_HTML_Stack_Event_6_7::POP === $this->current_element->operation;
+
+		/*
+		 * The root node only exists in the fragment parser, and closing it
+		 * indicates that the parse is complete. Stop before popping if from
+		 * the breadcrumbs.
+		 */
+		if ( 'root-node' === $this->current_element->token->bookmark_name ) {
+			return ! $is_pop && $this->next_token();
+		}
+
+		// Adjust the breadcrumbs for this event.
+		if ( $is_pop ) {
+			array_pop( $this->breadcrumbs );
+		} else {
+			$this->breadcrumbs[] = $this->current_element->token->node_name;
+		}
+
+		// Avoid sending close events for elements which don't expect a closing.
+		if ( $is_pop && ! static::expects_closer( $this->current_element->token ) ) {
+			return $this->next_token();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Indicates if the current tag token is a tag closer.
+	 *
+	 * Example:
+	 *
+	 *     $p = WP_HTML_Processor::create_fragment( '<div></div>' );
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === false;
+	 *
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === true;
+	 *
+	 * @since 6.6.0 Subclassed for HTML Processor.
+	 *
+	 * @return bool Whether the current tag is a tag closer.
+	 */
+	public function is_tag_closer(): bool {
+		return $this->is_virtual()
+			? ( Gutenberg_HTML_Stack_Event_6_7::POP === $this->current_element->operation && '#tag' === $this->get_token_type() )
+			: parent::is_tag_closer();
+	}
+
+	/**
+	 * Indicates if the currently-matched token is virtual, created by a stack operation
+	 * while processing HTML, rather than a token found in the HTML text itself.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @return bool Whether the current token is virtual.
+	 */
+	private function is_virtual(): bool {
+		return (
+			isset( $this->current_element->provenance ) &&
+			'virtual' === $this->current_element->provenance
+		);
+	}
+
+	/**
+	 * Indicates if the currently-matched tag matches the given breadcrumbs.
+	 *
+	 * A "*" represents a single tag wildcard, where any tag matches, but not no tags.
+	 *
+	 * At some point this function _may_ support a `**` syntax for matching any number
+	 * of unspecified tags in the breadcrumb stack. This has been intentionally left
+	 * out, however, to keep this function simple and to avoid introducing backtracking,
+	 * which could open up surprising performance breakdowns.
+	 *
+	 * Example:
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<div><span><figure><img></figure></span></div>' );
+	 *     $processor->next_tag( 'img' );
+	 *     true  === $processor->matches_breadcrumbs( array( 'figure', 'img' ) );
+	 *     true  === $processor->matches_breadcrumbs( array( 'span', 'figure', 'img' ) );
+	 *     false === $processor->matches_breadcrumbs( array( 'span', 'img' ) );
+	 *     true  === $processor->matches_breadcrumbs( array( 'span', '*', 'img' ) );
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string[] $breadcrumbs DOM sub-path at which element is found, e.g. `array( 'FIGURE', 'IMG' )`.
+	 *                              May also contain the wildcard `*` which matches a single element, e.g. `array( 'SECTION', '*' )`.
+	 * @return bool Whether the currently-matched tag is found at the given nested structure.
+	 */
+	public function matches_breadcrumbs( $breadcrumbs ): bool {
+		// Everything matches when there are zero constraints.
+		if ( 0 === count( $breadcrumbs ) ) {
+			return true;
+		}
+
+		// Start at the last crumb.
+		$crumb = end( $breadcrumbs );
+
+		if ( '*' !== $crumb && $this->get_tag() !== strtoupper( $crumb ) ) {
+			return false;
+		}
+
+		for ( $i = count( $this->breadcrumbs ) - 1; $i >= 0; $i-- ) {
+			$node  = $this->breadcrumbs[ $i ];
+			$crumb = strtoupper( current( $breadcrumbs ) );
+
+			if ( '*' !== $crumb && $node !== $crumb ) {
+				return false;
+			}
+
+			if ( false === prev( $breadcrumbs ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Indicates if the currently-matched node expects a closing
+	 * token, or if it will self-close on the next step.
+	 *
+	 * Most HTML elements expect a closer, such as a P element or
+	 * a DIV element. Others, like an IMG element are void and don't
+	 * have a closing tag. Special elements, such as SCRIPT and STYLE,
+	 * are treated just like void tags. Text nodes and self-closing
+	 * foreign content will also act just like a void tag, immediately
+	 * closing as soon as the processor advances to the next token.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @todo When adding support for foreign content, ensure that
+	 *       this returns false for self-closing elements in the
+	 *       SVG and MathML namespace.
+	 *
+	 * @param WP_HTML_Token|null $node Optional. Node to examine, if provided.
+	 *                                 Default is to examine current node.
+	 * @return bool|null Whether to expect a closer for the currently-matched node,
+	 *                   or `null` if not matched on any token.
+	 */
+	public function expects_closer( $node = null ): ?bool {
+		$token_name = $node->node_name ?? $this->get_token_name();
+		if ( ! isset( $token_name ) ) {
+			return null;
+		}
+
+		return ! (
+			// Comments, text nodes, and other atomic tokens.
+			'#' === $token_name[0] ||
+			// Doctype declarations.
+			'html' === $token_name ||
+			// Void elements.
+			self::is_void( $token_name ) ||
+			// Special atomic elements.
+			in_array( $token_name, array( 'IFRAME', 'NOEMBED', 'NOFRAMES', 'SCRIPT', 'STYLE', 'TEXTAREA', 'TITLE', 'XMP' ), true )
+		);
+	}
+
+	/**
+	 * Steps through the HTML document and stop at the next tag, if any.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @see self::PROCESS_NEXT_NODE
+	 * @see self::REPROCESS_CURRENT_NODE
+	 *
+	 * @param string $node_to_process Whether to parse the next node or reprocess the current node.
+	 * @return bool Whether a tag was matched.
+	 */
+	public function step( $node_to_process = self::PROCESS_NEXT_NODE ): bool {
+		// Refuse to proceed if there was a previous error.
+		if ( null !== $this->last_error ) {
+			return false;
+		}
+
+		if ( self::REPROCESS_CURRENT_NODE !== $node_to_process ) {
+			/*
+			 * Void elements still hop onto the stack of open elements even though
+			 * there's no corresponding closing tag. This is important for managing
+			 * stack-based operations such as "navigate to parent node" or checking
+			 * on an element's breadcrumbs.
+			 *
+			 * When moving on to the next node, therefore, if the bottom-most element
+			 * on the stack is a void element, it must be closed.
+			 *
+			 * @todo Once self-closing foreign elements and BGSOUND are supported,
+			 *        they must also be implicitly closed here too. BGSOUND is
+			 *        special since it's only self-closing if the self-closing flag
+			 *        is provided in the opening tag, otherwise it expects a tag closer.
+			 */
+			$top_node = $this->state->stack_of_open_elements->current_node();
+			if ( isset( $top_node ) && ! static::expects_closer( $top_node ) ) {
+				$this->state->stack_of_open_elements->pop();
+			}
+		}
+
+		if ( self::PROCESS_NEXT_NODE === $node_to_process ) {
+			parent::next_token();
+		}
+
+		// Finish stepping when there are no more tokens in the document.
+		if (
+			Gutenberg_HTML_Tag_Processor_6_7::STATE_INCOMPLETE_INPUT === $this->parser_state ||
+			Gutenberg_HTML_Tag_Processor_6_7::STATE_COMPLETE === $this->parser_state
+		) {
+			return false;
+		}
+
+		$this->state->current_token = new Gutenberg_HTML_Token_6_7(
+			$this->bookmark_token(),
+			$this->get_token_name(),
+			$this->has_self_closing_flag(),
+			$this->release_internal_bookmark_on_destruct
+		);
+
+		try {
+			switch ( $this->state->insertion_mode ) {
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_INITIAL:
+					return $this->step_initial();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_BEFORE_HTML:
+					return $this->step_before_html();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_BEFORE_HEAD:
+					return $this->step_before_head();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_HEAD:
+					return $this->step_in_head();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_HEAD_NOSCRIPT:
+					return $this->step_in_head_noscript();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_AFTER_HEAD:
+					return $this->step_after_head();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_BODY:
+					return $this->step_in_body();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_TABLE:
+					return $this->step_in_table();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_TABLE_TEXT:
+					return $this->step_in_table_text();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_CAPTION:
+					return $this->step_in_caption();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_COLUMN_GROUP:
+					return $this->step_in_column_group();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_TABLE_BODY:
+					return $this->step_in_table_body();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_ROW:
+					return $this->step_in_row();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_CELL:
+					return $this->step_in_cell();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_SELECT:
+					return $this->step_in_select();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_SELECT_IN_TABLE:
+					return $this->step_in_select_in_table();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_TEMPLATE:
+					return $this->step_in_template();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_AFTER_BODY:
+					return $this->step_after_body();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_FRAMESET:
+					return $this->step_in_frameset();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_AFTER_FRAMESET:
+					return $this->step_after_frameset();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_AFTER_AFTER_BODY:
+					return $this->step_after_after_body();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_AFTER_AFTER_FRAMESET:
+					return $this->step_after_after_frameset();
+
+				case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_FOREIGN_CONTENT:
+					return $this->step_in_foreign_content();
+
+				// This should be unreachable but PHP doesn't have total type checking on switch.
+				default:
+					$this->bail( "Unaware of the requested parsing mode: '{$this->state->insertion_mode}'." );
+			}
+		} catch ( Gutenberg_HTML_Unsupported_Exception_6_7 $e ) {
+			/*
+			 * Exceptions are used in this class to escape deep call stacks that
+			 * otherwise might involve messier calling and return conventions.
+			 */
+			return false;
+		}
+	}
+
+	/**
+	 * Computes the HTML breadcrumbs for the currently-matched node, if matched.
+	 *
+	 * Breadcrumbs start at the outermost parent and descend toward the matched element.
+	 * They always include the entire path from the root HTML node to the matched element.
+	 *
+	 * @todo It could be more efficient to expose a generator-based version of this function
+	 *       to avoid creating the array copy on tag iteration. If this is done, it would likely
+	 *       be more useful to walk up the stack when yielding instead of starting at the top.
+	 *
+	 * Example
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<p><strong><em><img></em></strong></p>' );
+	 *     $processor->next_tag( 'IMG' );
+	 *     $processor->get_breadcrumbs() === array( 'HTML', 'BODY', 'P', 'STRONG', 'EM', 'IMG' );
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return string[]|null Array of tag names representing path to matched node, if matched, otherwise NULL.
+	 */
+	public function get_breadcrumbs(): ?array {
+		return $this->breadcrumbs;
+	}
+
+	/**
+	 * Returns the nesting depth of the current location in the document.
+	 *
+	 * Example:
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<div><p></p></div>' );
+	 *     // The processor starts in the BODY context, meaning it has depth from the start: HTML > BODY.
+	 *     2 === $processor->get_current_depth();
+	 *
+	 *     // Opening the DIV element increases the depth.
+	 *     $processor->next_token();
+	 *     3 === $processor->get_current_depth();
+	 *
+	 *     // Opening the P element increases the depth.
+	 *     $processor->next_token();
+	 *     4 === $processor->get_current_depth();
+	 *
+	 *     // The P element is closed during `next_token()` so the depth is decreased to reflect that.
+	 *     $processor->next_token();
+	 *     3 === $processor->get_current_depth();
+	 *
+	 * @since 6.6.0
+	 *
+	 * @return int Nesting-depth of current location in the document.
+	 */
+	public function get_current_depth(): int {
+		return count( $this->breadcrumbs );
+	}
+
+	/**
+	 * Parses next element in the 'initial' insertion mode.
+	 *
+	 * This internal function performs the 'initial' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-initial-insertion-mode
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_initial(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'before html' insertion mode.
+	 *
+	 * This internal function performs the 'before html' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-before-html-insertion-mode
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_before_html(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'before head' insertion mode.
+	 *
+	 * This internal function performs the 'before head' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-before-head-insertion-mode
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_before_head(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in head' insertion mode.
+	 *
+	 * This internal function performs the 'in head' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-inhead
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_head(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in head noscript' insertion mode.
+	 *
+	 * This internal function performs the 'in head noscript' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inheadnoscript
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_head_noscript(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'after head' insertion mode.
+	 *
+	 * This internal function performs the 'after head' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-after-head-insertion-mode
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_after_head(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in body' insertion mode.
+	 *
+	 * This internal function performs the 'in body' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_body(): bool {
+		$token_name = $this->get_token_name();
+		$token_type = $this->get_token_type();
+		$op_sigil   = '#tag' === $token_type ? ( parent::is_tag_closer() ? '-' : '+' ) : '';
+		$op         = "{$op_sigil}{$token_name}";
+
+		switch ( $op ) {
+			case '#comment':
+			case '#funky-comment':
+			case '#presumptuous-tag':
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			case '#text':
+				$this->reconstruct_active_formatting_elements();
+
+				$current_token = $this->bookmarks[ $this->state->current_token->bookmark_name ];
+
+				/*
+				 * > A character token that is U+0000 NULL
+				 *
+				 * Any successive sequence of NULL bytes is ignored and won't
+				 * trigger active format reconstruction. Therefore, if the text
+				 * only comprises NULL bytes then the token should be ignored
+				 * here, but if there are any other characters in the stream
+				 * the active formats should be reconstructed.
+				 */
+				if (
+					1 <= $current_token->length &&
+					"\x00" === $this->html[ $current_token->start ] &&
+					strspn( $this->html, "\x00", $current_token->start, $current_token->length ) === $current_token->length
+				) {
+					// Parse error: ignore the token.
+					return $this->step();
+				}
+
+				/*
+				 * Whitespace-only text does not affect the frameset-ok flag.
+				 * It is probably inter-element whitespace, but it may also
+				 * contain character references which decode only to whitespace.
+				 */
+				$text = $this->get_modifiable_text();
+				if ( strlen( $text ) !== strspn( $text, " \t\n\f\r" ) ) {
+					$this->state->frameset_ok = false;
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			case 'html':
+				/*
+				 * > A DOCTYPE token
+				 * > Parse error. Ignore the token.
+				 */
+				return $this->step();
+
+			/*
+			 * > A start tag whose tag name is "button"
+			 */
+			case '+BUTTON':
+				if ( $this->state->stack_of_open_elements->has_element_in_scope( 'BUTTON' ) ) {
+					// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+					$this->generate_implied_end_tags();
+					$this->state->stack_of_open_elements->pop_until( 'BUTTON' );
+				}
+
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "address", "article", "aside",
+			 * > "blockquote", "center", "details", "dialog", "dir", "div", "dl",
+			 * > "fieldset", "figcaption", "figure", "footer", "header", "hgroup",
+			 * > "main", "menu", "nav", "ol", "p", "search", "section", "summary", "ul"
+			 */
+			case '+ADDRESS':
+			case '+ARTICLE':
+			case '+ASIDE':
+			case '+BLOCKQUOTE':
+			case '+CENTER':
+			case '+DETAILS':
+			case '+DIALOG':
+			case '+DIR':
+			case '+DIV':
+			case '+DL':
+			case '+FIELDSET':
+			case '+FIGCAPTION':
+			case '+FIGURE':
+			case '+FOOTER':
+			case '+HEADER':
+			case '+HGROUP':
+			case '+MAIN':
+			case '+MENU':
+			case '+NAV':
+			case '+OL':
+			case '+P':
+			case '+SEARCH':
+			case '+SECTION':
+			case '+SUMMARY':
+			case '+UL':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "address", "article", "aside", "blockquote",
+			 * > "button", "center", "details", "dialog", "dir", "div", "dl", "fieldset",
+			 * > "figcaption", "figure", "footer", "header", "hgroup", "listing", "main",
+			 * > "menu", "nav", "ol", "pre", "search", "section", "summary", "ul"
+			 */
+			case '-ADDRESS':
+			case '-ARTICLE':
+			case '-ASIDE':
+			case '-BLOCKQUOTE':
+			case '-BUTTON':
+			case '-CENTER':
+			case '-DETAILS':
+			case '-DIALOG':
+			case '-DIR':
+			case '-DIV':
+			case '-DL':
+			case '-FIELDSET':
+			case '-FIGCAPTION':
+			case '-FIGURE':
+			case '-FOOTER':
+			case '-HEADER':
+			case '-HGROUP':
+			case '-LISTING':
+			case '-MAIN':
+			case '-MENU':
+			case '-NAV':
+			case '-OL':
+			case '-PRE':
+			case '-SEARCH':
+			case '-SECTION':
+			case '-SUMMARY':
+			case '-UL':
+				if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $token_name ) ) {
+					// @todo Report parse error.
+					// Ignore the token.
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags();
+				if ( ! $this->state->stack_of_open_elements->current_node_is( $token_name ) ) {
+					// @todo Record parse error: this error doesn't impact parsing.
+				}
+				$this->state->stack_of_open_elements->pop_until( $token_name );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "h1", "h2", "h3", "h4", "h5", "h6"
+			 */
+			case '+H1':
+			case '+H2':
+			case '+H3':
+			case '+H4':
+			case '+H5':
+			case '+H6':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				if (
+					in_array(
+						$this->state->stack_of_open_elements->current_node()->node_name,
+						array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ),
+						true
+					)
+				) {
+					// @todo Indicate a parse error once it's possible.
+					$this->state->stack_of_open_elements->pop();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "pre", "listing"
+			 */
+			case '+PRE':
+			case '+LISTING':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "h1", "h2", "h3", "h4", "h5", "h6"
+			 */
+			case '-H1':
+			case '-H2':
+			case '-H3':
+			case '-H4':
+			case '-H5':
+			case '-H6':
+				if ( ! $this->state->stack_of_open_elements->has_element_in_scope( '(internal: H1 through H6 - do not use)' ) ) {
+					/*
+					 * This is a parse error; ignore the token.
+					 *
+					 * @todo Indicate a parse error once it's possible.
+					 */
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags();
+
+				if ( ! $this->state->stack_of_open_elements->current_node_is( $token_name ) ) {
+					// @todo Record parse error: this error doesn't impact parsing.
+				}
+
+				$this->state->stack_of_open_elements->pop_until( '(internal: H1 through H6 - do not use)' );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is "li"
+			 * > A start tag whose tag name is one of: "dd", "dt"
+			 */
+			case '+DD':
+			case '+DT':
+			case '+LI':
+				$this->state->frameset_ok = false;
+				$node                     = $this->state->stack_of_open_elements->current_node();
+				$is_li                    = 'LI' === $token_name;
+
+				in_body_list_loop:
+				/*
+				 * The logic for LI and DT/DD is the same except for one point: LI elements _only_
+				 * close other LI elements, but a DT or DD element closes _any_ open DT or DD element.
+				 */
+				if ( $is_li ? 'LI' === $node->node_name : ( 'DD' === $node->node_name || 'DT' === $node->node_name ) ) {
+					$node_name = $is_li ? 'LI' : $node->node_name;
+					$this->generate_implied_end_tags( $node_name );
+					if ( ! $this->state->stack_of_open_elements->current_node_is( $node_name ) ) {
+						// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+					}
+
+					$this->state->stack_of_open_elements->pop_until( $node_name );
+					goto in_body_list_done;
+				}
+
+				if (
+					'ADDRESS' !== $node->node_name &&
+					'DIV' !== $node->node_name &&
+					'P' !== $node->node_name &&
+					$this->is_special( $node->node_name )
+				) {
+					/*
+					 * > If node is in the special category, but is not an address, div,
+					 * > or p element, then jump to the step labeled done below.
+					 */
+					goto in_body_list_done;
+				} else {
+					/*
+					 * > Otherwise, set node to the previous entry in the stack of open elements
+					 * > and return to the step labeled loop.
+					 */
+					foreach ( $this->state->stack_of_open_elements->walk_up( $node ) as $item ) {
+						$node = $item;
+						break;
+					}
+					goto in_body_list_loop;
+				}
+
+				in_body_list_done:
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "li"
+			 * > An end tag whose tag name is one of: "dd", "dt"
+			 */
+			case '-DD':
+			case '-DT':
+			case '-LI':
+				if (
+					/*
+					 * An end tag whose tag name is "li":
+					 * If the stack of open elements does not have an li element in list item scope,
+					 * then this is a parse error; ignore the token.
+					 */
+					(
+						'LI' === $token_name &&
+						! $this->state->stack_of_open_elements->has_element_in_list_item_scope( 'LI' )
+					) ||
+					/*
+					 * An end tag whose tag name is one of: "dd", "dt":
+					 * If the stack of open elements does not have an element in scope that is an
+					 * HTML element with the same tag name as that of the token, then this is a
+					 * parse error; ignore the token.
+					 */
+					(
+						'LI' !== $token_name &&
+						! $this->state->stack_of_open_elements->has_element_in_scope( $token_name )
+					)
+				) {
+					/*
+					 * This is a parse error, ignore the token.
+					 *
+					 * @todo Indicate a parse error once it's possible.
+					 */
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags( $token_name );
+
+				if ( ! $this->state->stack_of_open_elements->current_node_is( $token_name ) ) {
+					// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+				}
+
+				$this->state->stack_of_open_elements->pop_until( $token_name );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "p"
+			 */
+			case '-P':
+				if ( ! $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->insert_html_element( $this->state->current_token );
+				}
+
+				$this->close_a_p_element();
+				return true;
+
+			// > A start tag whose tag name is "a"
+			case '+A':
+				foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+					switch ( $item->node_name ) {
+						case 'marker':
+							break;
+
+						case 'A':
+							$this->run_adoption_agency_algorithm();
+							$this->state->active_formatting_elements->remove_node( $item );
+							$this->state->stack_of_open_elements->remove_node( $item );
+							break;
+					}
+				}
+
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->active_formatting_elements->push( $this->state->current_token );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "b", "big", "code", "em", "font", "i",
+			 * > "s", "small", "strike", "strong", "tt", "u"
+			 */
+			case '+B':
+			case '+BIG':
+			case '+CODE':
+			case '+EM':
+			case '+FONT':
+			case '+I':
+			case '+S':
+			case '+SMALL':
+			case '+STRIKE':
+			case '+STRONG':
+			case '+TT':
+			case '+U':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->active_formatting_elements->push( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "a", "b", "big", "code", "em", "font", "i",
+			 * > "nobr", "s", "small", "strike", "strong", "tt", "u"
+			 */
+			case '-A':
+			case '-B':
+			case '-BIG':
+			case '-CODE':
+			case '-EM':
+			case '-FONT':
+			case '-I':
+			case '-S':
+			case '-SMALL':
+			case '-STRIKE':
+			case '-STRONG':
+			case '-TT':
+			case '-U':
+				$this->run_adoption_agency_algorithm();
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "br"
+			 * >   Parse error. Drop the attributes from the token, and act as described in the next
+			 * >   entry; i.e. act as if this was a "br" start tag token with no attributes, rather
+			 * >   than the end tag token that it actually is.
+			 */
+			case '-BR':
+				$this->bail( 'Closing BR tags require unimplemented special handling.' );
+				// This return required because PHPCS can't determine that the call to bail() throws.
+				return false;
+
+			/*
+			 * > A start tag whose tag name is one of: "area", "br", "embed", "img", "keygen", "wbr"
+			 */
+			case '+AREA':
+			case '+BR':
+			case '+EMBED':
+			case '+IMG':
+			case '+KEYGEN':
+			case '+WBR':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+				return true;
+
+			/*
+			 * > A start tag whose tag name is "input"
+			 */
+			case '+INPUT':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$type_attribute = $this->get_attribute( 'type' );
+				/*
+				 * > If the token does not have an attribute with the name "type", or if it does,
+				 * > but that attribute's value is not an ASCII case-insensitive match for the
+				 * > string "hidden", then: set the frameset-ok flag to "not ok".
+				 */
+				if ( ! is_string( $type_attribute ) || 'hidden' !== strtolower( $type_attribute ) ) {
+					$this->state->frameset_ok = false;
+				}
+				return true;
+
+			/*
+			 * > A start tag whose tag name is "hr"
+			 */
+			case '+HR':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "param", "source", "track"
+			 */
+			case '+PARAM':
+			case '+SOURCE':
+			case '+TRACK':
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is "select"
+			 */
+			case '+SELECT':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+
+				switch ( $this->state->insertion_mode ) {
+					/*
+					 * > If the insertion mode is one of "in table", "in caption", "in table body", "in row",
+					 * > or "in cell", then switch the insertion mode to "in select in table".
+					 */
+					case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_TABLE:
+					case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_CAPTION:
+					case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_TABLE_BODY:
+					case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_ROW:
+					case Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_CELL:
+						$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_SELECT_IN_TABLE;
+						break;
+
+					/*
+					 * > Otherwise, switch the insertion mode to "in select".
+					 */
+					default:
+						$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_SELECT;
+						break;
+				}
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "optgroup", "option"
+			 */
+			case '+OPTGROUP':
+			case '+OPTION':
+				if ( $this->state->stack_of_open_elements->current_node_is( 'OPTION' ) ) {
+					$this->state->stack_of_open_elements->pop();
+				}
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+		}
+
+		/*
+		 * These tags require special handling in the 'in body' insertion mode
+		 * but that handling hasn't yet been implemented.
+		 *
+		 * As the rules for each tag are implemented, the corresponding tag
+		 * name should be removed from this list. An accompanying test should
+		 * help ensure this list is maintained.
+		 *
+		 * @see Tests_HtmlApi_WpHtmlProcessor::test_step_in_body_fails_on_unsupported_tags
+		 *
+		 * Since this switch structure throws a WP_HTML_Unsupported_Exception, it's
+		 * possible to handle "any other start tag" and "any other end tag" below,
+		 * as that guarantees execution doesn't proceed for the unimplemented tags.
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-inbody
+		 */
+		switch ( $token_name ) {
+			case 'APPLET':
+			case 'BASE':
+			case 'BASEFONT':
+			case 'BGSOUND':
+			case 'BODY':
+			case 'CAPTION':
+			case 'COL':
+			case 'COLGROUP':
+			case 'FORM':
+			case 'FRAME':
+			case 'FRAMESET':
+			case 'HEAD':
+			case 'HTML':
+			case 'IFRAME':
+			case 'LINK':
+			case 'MARQUEE':
+			case 'MATH':
+			case 'META':
+			case 'NOBR':
+			case 'NOEMBED':
+			case 'NOFRAMES':
+			case 'NOSCRIPT':
+			case 'OBJECT':
+			case 'PLAINTEXT':
+			case 'RB':
+			case 'RP':
+			case 'RT':
+			case 'RTC':
+			case 'SARCASM':
+			case 'SCRIPT':
+			case 'STYLE':
+			case 'SVG':
+			case 'TABLE':
+			case 'TBODY':
+			case 'TD':
+			case 'TEMPLATE':
+			case 'TEXTAREA':
+			case 'TFOOT':
+			case 'TH':
+			case 'THEAD':
+			case 'TITLE':
+			case 'TR':
+			case 'XMP':
+				$this->bail( "Cannot process {$token_name} element." );
+		}
+
+		if ( ! parent::is_tag_closer() ) {
+			/*
+			 * > Any other start tag
+			 */
+			$this->reconstruct_active_formatting_elements();
+			$this->insert_html_element( $this->state->current_token );
+			return true;
+		} else {
+			/*
+			 * > Any other end tag
+			 */
+
+			/*
+			 * Find the corresponding tag opener in the stack of open elements, if
+			 * it exists before reaching a special element, which provides a kind
+			 * of boundary in the stack. For example, a `</custom-tag>` should not
+			 * close anything beyond its containing `P` or `DIV` element.
+			 */
+			foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
+				if ( $token_name === $node->node_name ) {
+					break;
+				}
+
+				if ( self::is_special( $node->node_name ) ) {
+					// This is a parse error, ignore the token.
+					return $this->step();
+				}
+			}
+
+			$this->generate_implied_end_tags( $token_name );
+			if ( $node !== $this->state->stack_of_open_elements->current_node() ) {
+				// @todo Record parse error: this error doesn't impact parsing.
+			}
+
+			foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+				$this->state->stack_of_open_elements->pop();
+				if ( $node === $item ) {
+					return true;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Parses next element in the 'in table' insertion mode.
+	 *
+	 * This internal function performs the 'in table' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intable
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_table(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in table text' insertion mode.
+	 *
+	 * This internal function performs the 'in table text' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intabletext
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_table_text(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in caption' insertion mode.
+	 *
+	 * This internal function performs the 'in caption' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-incaption
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_caption(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in column group' insertion mode.
+	 *
+	 * This internal function performs the 'in column group' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-incolgroup
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_column_group(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in table body' insertion mode.
+	 *
+	 * This internal function performs the 'in table body' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intbody
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_table_body(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in row' insertion mode.
+	 *
+	 * This internal function performs the 'in row' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intr
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_row(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in cell' insertion mode.
+	 *
+	 * This internal function performs the 'in cell' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intd
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_cell(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in select' insertion mode.
+	 *
+	 * This internal function performs the 'in select' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-inselect
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_select(): bool {
+		$token_name = $this->get_token_name();
+		$token_type = $this->get_token_type();
+		$op_sigil   = '#tag' === $token_type ? ( parent::is_tag_closer() ? '-' : '+' ) : '';
+		$op         = "{$op_sigil}{$token_name}";
+
+		switch ( $op ) {
+			/*
+			 * > Any other character token
+			 */
+			case '#text':
+				$current_token = $this->bookmarks[ $this->state->current_token->bookmark_name ];
+
+				/*
+				 * > A character token that is U+0000 NULL
+				 *
+				 * If a text node only comprises null bytes then it should be
+				 * entirely ignored and should not return to calling code.
+				 */
+				if (
+					1 <= $current_token->length &&
+					"\x00" === $this->html[ $current_token->start ] &&
+					strspn( $this->html, "\x00", $current_token->start, $current_token->length ) === $current_token->length
+				) {
+					// Parse error: ignore the token.
+					return $this->step();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > A comment token
+			 */
+			case '#comment':
+			case '#funky-comment':
+			case '#presumptuous-tag':
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > A DOCTYPE token
+			 */
+			case 'html':
+				// Parse error: ignore the token.
+				return $this->step();
+
+			/*
+			 * > A start tag whose tag name is "html"
+			 */
+			case '+HTML':
+				return $this->step_in_body();
+
+			/*
+			 * > A start tag whose tag name is "option"
+			 */
+			case '+OPTION':
+				if ( $this->state->stack_of_open_elements->current_node_is( 'OPTION' ) ) {
+					$this->state->stack_of_open_elements->pop();
+				}
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is "optgroup"
+			 * > A start tag whose tag name is "hr"
+			 *
+			 * These rules are identical except for the treatment of the self-closing flag and
+			 * the subsequent pop of the HR void element, all of which is handled elsewhere in the processor.
+			 */
+			case '+OPTGROUP':
+			case '+HR':
+				if ( $this->state->stack_of_open_elements->current_node_is( 'OPTION' ) ) {
+					$this->state->stack_of_open_elements->pop();
+				}
+
+				if ( $this->state->stack_of_open_elements->current_node_is( 'OPTGROUP' ) ) {
+					$this->state->stack_of_open_elements->pop();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "optgroup"
+			 */
+			case '-OPTGROUP':
+				$current_node = $this->state->stack_of_open_elements->current_node();
+				if ( $current_node && 'OPTION' === $current_node->node_name ) {
+					foreach ( $this->state->stack_of_open_elements->walk_up( $current_node ) as $parent ) {
+						break;
+					}
+					if ( $parent && 'OPTGROUP' === $parent->node_name ) {
+						$this->state->stack_of_open_elements->pop();
+					}
+				}
+
+				if ( $this->state->stack_of_open_elements->current_node_is( 'OPTGROUP' ) ) {
+					$this->state->stack_of_open_elements->pop();
+					return true;
+				}
+
+				// Parse error: ignore the token.
+				return $this->step();
+
+			/*
+			 * > An end tag whose tag name is "option"
+			 */
+			case '-OPTION':
+				if ( $this->state->stack_of_open_elements->current_node_is( 'OPTION' ) ) {
+					$this->state->stack_of_open_elements->pop();
+					return true;
+				}
+
+				// Parse error: ignore the token.
+				return $this->step();
+
+			/*
+			 * > An end tag whose tag name is "select"
+			 * > A start tag whose tag name is "select"
+			 *
+			 * > It just gets treated like an end tag.
+			 */
+			case '-SELECT':
+			case '+SELECT':
+				if ( ! $this->state->stack_of_open_elements->has_element_in_select_scope( 'SELECT' ) ) {
+					// Parse error: ignore the token.
+					return $this->step();
+				}
+				$this->state->stack_of_open_elements->pop_until( 'SELECT' );
+				$this->reset_insertion_mode();
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "input", "keygen", "textarea"
+			 *
+			 * All three of these tags are considered a parse error when found in this insertion mode.
+			 */
+			case '+INPUT':
+			case '+KEYGEN':
+			case '+TEXTAREA':
+				if ( ! $this->state->stack_of_open_elements->has_element_in_select_scope( 'SELECT' ) ) {
+					// Ignore the token.
+					return $this->step();
+				}
+				$this->state->stack_of_open_elements->pop_until( 'SELECT' );
+				$this->reset_insertion_mode();
+				return $this->step( self::REPROCESS_CURRENT_NODE );
+
+			/*
+			 * > A start tag whose tag name is one of: "script", "template"
+			 * > An end tag whose tag name is "template"
+			 */
+			case '+SCRIPT':
+			case '+TEMPLATE':
+			case '-TEMPLATE':
+				return $this->step_in_head();
+		}
+
+		/*
+		 * > Anything else
+		 * >   Parse error: ignore the token.
+		 */
+		return $this->step();
+	}
+
+	/**
+	 * Parses next element in the 'in select in table' insertion mode.
+	 *
+	 * This internal function performs the 'in select in table' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inselectintable
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_select_in_table(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in template' insertion mode.
+	 *
+	 * This internal function performs the 'in template' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intemplate
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_template(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'after body' insertion mode.
+	 *
+	 * This internal function performs the 'after body' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-afterbody
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_after_body(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in frameset' insertion mode.
+	 *
+	 * This internal function performs the 'in frameset' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inframeset
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_frameset(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'after frameset' insertion mode.
+	 *
+	 * This internal function performs the 'after frameset' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-afterframeset
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_after_frameset(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'after after body' insertion mode.
+	 *
+	 * This internal function performs the 'after after body' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-after-after-body-insertion-mode
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_after_after_body(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'after after frameset' insertion mode.
+	 *
+	 * This internal function performs the 'after after frameset' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-after-after-frameset-insertion-mode
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_after_after_frameset(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/**
+	 * Parses next element in the 'in foreign content' insertion mode.
+	 *
+	 * This internal function performs the 'in foreign content' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.7.0 Stub implementation.
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inforeign
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_foreign_content(): bool {
+		$this->bail( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+	}
+
+	/*
+	 * Internal helpers
+	 */
+
+	/**
+	 * Creates a new bookmark for the currently-matched token and returns the generated name.
+	 *
+	 * @since 6.4.0
+	 * @since 6.5.0 Renamed from bookmark_tag() to bookmark_token().
+	 *
+	 * @throws Exception When unable to allocate requested bookmark.
+	 *
+	 * @return string|false Name of created bookmark, or false if unable to create.
+	 */
+	private function bookmark_token() {
+		if ( ! parent::set_bookmark( ++$this->bookmark_counter ) ) {
+			$this->last_error = self::ERROR_EXCEEDED_MAX_BOOKMARKS;
+			throw new Exception( 'could not allocate bookmark' );
+		}
+
+		return "{$this->bookmark_counter}";
+	}
+
+	/*
+	 * HTML semantic overrides for Tag Processor
+	 */
+
+	/**
+	 * Returns the uppercase name of the matched tag.
+	 *
+	 * The semantic rules for HTML specify that certain tags be reprocessed
+	 * with a different tag name. Because of this, the tag name presented
+	 * by the HTML Processor may differ from the one reported by the HTML
+	 * Tag Processor, which doesn't apply these semantic rules.
+	 *
+	 * Example:
+	 *
+	 *     $processor = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+	 *     $processor->next_tag() === true;
+	 *     $processor->get_tag() === 'DIV';
+	 *
+	 *     $processor->next_tag() === false;
+	 *     $processor->get_tag() === null;
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
+	 */
+	public function get_tag(): ?string {
+		if ( null !== $this->last_error ) {
+			return null;
+		}
+
+		if ( $this->is_virtual() ) {
+			return $this->current_element->token->node_name;
+		}
+
+		$tag_name = parent::get_tag();
+
+		switch ( $tag_name ) {
+			case 'IMAGE':
+				/*
+				 * > A start tag whose tag name is "image"
+				 * > Change the token's tag name to "img" and reprocess it. (Don't ask.)
+				 */
+				return 'IMG';
+
+			default:
+				return $tag_name;
+		}
+	}
+
+	/**
+	 * Indicates if the currently matched tag contains the self-closing flag.
+	 *
+	 * No HTML elements ought to have the self-closing flag and for those, the self-closing
+	 * flag will be ignored. For void elements this is benign because they "self close"
+	 * automatically. For non-void HTML elements though problems will appear if someone
+	 * intends to use a self-closing element in place of that element with an empty body.
+	 * For HTML foreign elements and custom elements the self-closing flag determines if
+	 * they self-close or not.
+	 *
+	 * This function does not determine if a tag is self-closing,
+	 * but only if the self-closing flag is present in the syntax.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return bool Whether the currently matched tag contains the self-closing flag.
+	 */
+	public function has_self_closing_flag(): bool {
+		return $this->is_virtual() ? false : parent::has_self_closing_flag();
+	}
+
+	/**
+	 * Returns the node name represented by the token.
+	 *
+	 * This matches the DOM API value `nodeName`. Some values
+	 * are static, such as `#text` for a text node, while others
+	 * are dynamically generated from the token itself.
+	 *
+	 * Dynamic names:
+	 *  - Uppercase tag name for tag matches.
+	 *  - `html` for DOCTYPE declarations.
+	 *
+	 * Note that if the Tag Processor is not matched on a token
+	 * then this function will return `null`, either because it
+	 * hasn't yet found a token or because it reached the end
+	 * of the document without matching a token.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return string|null Name of the matched token.
+	 */
+	public function get_token_name(): ?string {
+		return $this->is_virtual()
+			? $this->current_element->token->node_name
+			: parent::get_token_name();
+	}
+
+	/**
+	 * Indicates the kind of matched token, if any.
+	 *
+	 * This differs from `get_token_name()` in that it always
+	 * returns a static string indicating the type, whereas
+	 * `get_token_name()` may return values derived from the
+	 * token itself, such as a tag name or processing
+	 * instruction tag.
+	 *
+	 * Possible values:
+	 *  - `#tag` when matched on a tag.
+	 *  - `#text` when matched on a text node.
+	 *  - `#cdata-section` when matched on a CDATA node.
+	 *  - `#comment` when matched on a comment.
+	 *  - `#doctype` when matched on a DOCTYPE declaration.
+	 *  - `#presumptuous-tag` when matched on an empty tag closer.
+	 *  - `#funky-comment` when matched on a funky comment.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return string|null What kind of token is matched, or null.
+	 */
+	public function get_token_type(): ?string {
+		if ( $this->is_virtual() ) {
+			/*
+			 * This logic comes from the Tag Processor.
+			 *
+			 * @todo It would be ideal not to repeat this here, but it's not clearly
+			 *       better to allow passing a token name to `get_token_type()`.
+			 */
+			$node_name     = $this->current_element->token->node_name;
+			$starting_char = $node_name[0];
+			if ( 'A' <= $starting_char && 'Z' >= $starting_char ) {
+				return '#tag';
+			}
+
+			if ( 'html' === $node_name ) {
+				return '#doctype';
+			}
+
+			return $node_name;
+		}
+
+		return parent::get_token_type();
+	}
+
+	/**
+	 * Returns the value of a requested attribute from a matched tag opener if that attribute exists.
+	 *
+	 * Example:
+	 *
+	 *     $p = WP_HTML_Processor::create_fragment( '<div enabled class="test" data-test-id="14">Test</div>' );
+	 *     $p->next_token() === true;
+	 *     $p->get_attribute( 'data-test-id' ) === '14';
+	 *     $p->get_attribute( 'enabled' ) === true;
+	 *     $p->get_attribute( 'aria-label' ) === null;
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute( 'class' ) === null;
+	 *
+	 * @since 6.6.0 Subclassed for HTML Processor.
+	 *
+	 * @param string $name Name of attribute whose value is requested.
+	 * @return string|true|null Value of attribute or `null` if not available. Boolean attributes return `true`.
+	 */
+	public function get_attribute( $name ) {
+		return $this->is_virtual() ? null : parent::get_attribute( $name );
+	}
+
+	/**
+	 * Updates or creates a new attribute on the currently matched tag with the passed value.
+	 *
+	 * For boolean attributes special handling is provided:
+	 *  - When `true` is passed as the value, then only the attribute name is added to the tag.
+	 *  - When `false` is passed, the attribute gets removed if it existed before.
+	 *
+	 * For string attributes, the value is escaped using the `esc_attr` function.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @param string      $name  The attribute name to target.
+	 * @param string|bool $value The new attribute value.
+	 * @return bool Whether an attribute value was set.
+	 */
+	public function set_attribute( $name, $value ): bool {
+		return $this->is_virtual() ? false : parent::set_attribute( $name, $value );
+	}
+
+	/**
+	 * Remove an attribute from the currently-matched tag.
+	 *
+	 * @since 6.6.0 Subclassed for HTML Processor.
+	 *
+	 * @param string $name The attribute name to remove.
+	 * @return bool Whether an attribute was removed.
+	 */
+	public function remove_attribute( $name ): bool {
+		return $this->is_virtual() ? false : parent::remove_attribute( $name );
+	}
+
+	/**
+	 * Gets lowercase names of all attributes matching a given prefix in the current tag.
+	 *
+	 * Note that matching is case-insensitive. This is in accordance with the spec:
+	 *
+	 * > There must never be two or more attributes on
+	 * > the same start tag whose names are an ASCII
+	 * > case-insensitive match for each other.
+	 *     - HTML 5 spec
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div data-ENABLED class="test" DATA-test-id="14">Test</div>' );
+	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === array( 'data-enabled', 'data-test-id' );
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === null;
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+	 *
+	 * @param string $prefix Prefix of requested attribute names.
+	 * @return array|null List of attribute names, or `null` when no tag opener is matched.
+	 */
+	public function get_attribute_names_with_prefix( $prefix ): ?array {
+		return $this->is_virtual() ? null : parent::get_attribute_names_with_prefix( $prefix );
+	}
+
+	/**
+	 * Adds a new class name to the currently matched tag.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @param string $class_name The class name to add.
+	 * @return bool Whether the class was set to be added.
+	 */
+	public function add_class( $class_name ): bool {
+		return $this->is_virtual() ? false : parent::add_class( $class_name );
+	}
+
+	/**
+	 * Removes a class name from the currently matched tag.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @param string $class_name The class name to remove.
+	 * @return bool Whether the class was set to be removed.
+	 */
+	public function remove_class( $class_name ): bool {
+		return $this->is_virtual() ? false : parent::remove_class( $class_name );
+	}
+
+	/**
+	 * Returns if a matched tag contains the given ASCII case-insensitive class name.
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @param string $wanted_class Look for this CSS class name, ASCII case-insensitive.
+	 * @return bool|null Whether the matched tag contains the given class name, or null if not matched.
+	 */
+	public function has_class( $wanted_class ): ?bool {
+		return $this->is_virtual() ? null : parent::has_class( $wanted_class );
+	}
+
+	/**
+	 * Generator for a foreach loop to step through each class name for the matched tag.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $p = WP_HTML_Processor::create_fragment( "<div class='free &lt;egg&lt;\tlang-en'>" );
+	 *     $p->next_tag();
+	 *     foreach ( $p->class_list() as $class_name ) {
+	 *         echo "{$class_name} ";
+	 *     }
+	 *     // Outputs: "free <egg> lang-en "
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 */
+	public function class_list() {
+		return $this->is_virtual() ? null : parent::class_list();
+	}
+
+	/**
+	 * Returns the modifiable text for a matched token, or an empty string.
+	 *
+	 * Modifiable text is text content that may be read and changed without
+	 * changing the HTML structure of the document around it. This includes
+	 * the contents of `#text` nodes in the HTML as well as the inner
+	 * contents of HTML comments, Processing Instructions, and others, even
+	 * though these nodes aren't part of a parsed DOM tree. They also contain
+	 * the contents of SCRIPT and STYLE tags, of TEXTAREA tags, and of any
+	 * other section in an HTML document which cannot contain HTML markup (DATA).
+	 *
+	 * If a token has no modifiable text then an empty string is returned to
+	 * avoid needless crashing or type errors. An empty string does not mean
+	 * that a token has modifiable text, and a token with modifiable text may
+	 * have an empty string (e.g. a comment with no contents).
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return string
+	 */
+	public function get_modifiable_text(): string {
+		return $this->is_virtual() ? '' : parent::get_modifiable_text();
+	}
+
+	/**
+	 * Indicates what kind of comment produced the comment node.
+	 *
+	 * Because there are different kinds of HTML syntax which produce
+	 * comments, the Tag Processor tracks and exposes this as a type
+	 * for the comment. Nominally only regular HTML comments exist as
+	 * they are commonly known, but a number of unrelated syntax errors
+	 * also produce comments.
+	 *
+	 * @see self::COMMENT_AS_ABRUPTLY_CLOSED_COMMENT
+	 * @see self::COMMENT_AS_CDATA_LOOKALIKE
+	 * @see self::COMMENT_AS_INVALID_HTML
+	 * @see self::COMMENT_AS_HTML_COMMENT
+	 * @see self::COMMENT_AS_PI_NODE_LOOKALIKE
+	 *
+	 * @since 6.6.0 Subclassed for the HTML Processor.
+	 *
+	 * @return string|null
+	 */
+	public function get_comment_type(): ?string {
+		return $this->is_virtual() ? null : parent::get_comment_type();
+	}
+
+	/**
+	 * Removes a bookmark that is no longer needed.
+	 *
+	 * Releasing a bookmark frees up the small
+	 * performance overhead it requires.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Name of the bookmark to remove.
+	 * @return bool Whether the bookmark already existed before removal.
+	 */
+	public function release_bookmark( $bookmark_name ): bool {
+		return parent::release_bookmark( "_{$bookmark_name}" );
+	}
+
+	/**
+	 * Moves the internal cursor in the HTML Processor to a given bookmark's location.
+	 *
+	 * Be careful! Seeking backwards to a previous location resets the parser to the
+	 * start of the document and reparses the entire contents up until it finds the
+	 * sought-after bookmarked location.
+	 *
+	 * In order to prevent accidental infinite loops, there's a
+	 * maximum limit on the number of times seek() can be called.
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Jump to the place in the document identified by this bookmark name.
+	 * @return bool Whether the internal cursor was successfully moved to the bookmark's location.
+	 */
+	public function seek( $bookmark_name ): bool {
+		// Flush any pending updates to the document before beginning.
+		$this->get_updated_html();
+
+		$actual_bookmark_name = "_{$bookmark_name}";
+		$processor_started_at = $this->state->current_token
+			? $this->bookmarks[ $this->state->current_token->bookmark_name ]->start
+			: 0;
+		$bookmark_starts_at   = $this->bookmarks[ $actual_bookmark_name ]->start;
+		$direction            = $bookmark_starts_at > $processor_started_at ? 'forward' : 'backward';
+
+		/*
+		 * If seeking backwards, it's possible that the sought-after bookmark exists within an element
+		 * which has been closed before the current cursor; in other words, it has already been removed
+		 * from the stack of open elements. This means that it's insufficient to simply pop off elements
+		 * from the stack of open elements which appear after the bookmarked location and then jump to
+		 * that location, as the elements which were open before won't be re-opened.
+		 *
+		 * In order to maintain consistency, the HTML Processor rewinds to the start of the document
+		 * and reparses everything until it finds the sought-after bookmark.
+		 *
+		 * There are potentially better ways to do this: cache the parser state for each bookmark and
+		 * restore it when seeking; store an immutable and idempotent register of where elements open
+		 * and close.
+		 *
+		 * If caching the parser state it will be essential to properly maintain the cached stack of
+		 * open elements and active formatting elements when modifying the document. This could be a
+		 * tedious and time-consuming process as well, and so for now will not be performed.
+		 *
+		 * It may be possible to track bookmarks for where elements open and close, and in doing so
+		 * be able to quickly recalculate breadcrumbs for any element in the document. It may even
+		 * be possible to remove the stack of open elements and compute it on the fly this way.
+		 * If doing this, the parser would need to track the opening and closing locations for all
+		 * tokens in the breadcrumb path for any and all bookmarks. By utilizing bookmarks themselves
+		 * this list could be automatically maintained while modifying the document. Finding the
+		 * breadcrumbs would then amount to traversing that list from the start until the token
+		 * being inspected. Once an element closes, if there are no bookmarks pointing to locations
+		 * within that element, then all of these locations may be forgotten to save on memory use
+		 * and computation time.
+		 */
+		if ( 'backward' === $direction ) {
+			/*
+			 * Instead of clearing the parser state and starting fresh, calling the stack methods
+			 * maintains the proper flags in the parser.
+			 */
+			foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+				if ( 'context-node' === $item->bookmark_name ) {
+					break;
+				}
+
+				$this->state->stack_of_open_elements->remove_node( $item );
+			}
+
+			foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+				if ( 'context-node' === $item->bookmark_name ) {
+					break;
+				}
+
+				$this->state->active_formatting_elements->remove_node( $item );
+			}
+
+			parent::seek( 'context-node' );
+			$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_BODY;
+			$this->state->frameset_ok    = true;
+			$this->element_queue         = array();
+			$this->current_element       = null;
+
+			if ( isset( $this->context_node ) ) {
+				$this->breadcrumbs = array_slice( $this->breadcrumbs, 0, 2 );
+			} else {
+				$this->breadcrumbs = array();
+			}
+		}
+
+		// When moving forwards, reparse the document until reaching the same location as the original bookmark.
+		if ( $bookmark_starts_at === $this->bookmarks[ $this->state->current_token->bookmark_name ]->start ) {
+			return true;
+		}
+
+		while ( $this->next_token() ) {
+			if ( $bookmark_starts_at === $this->bookmarks[ $this->state->current_token->bookmark_name ]->start ) {
+				while ( isset( $this->current_element ) && Gutenberg_HTML_Stack_Event_6_7::POP === $this->current_element->operation ) {
+					$this->current_element = array_shift( $this->element_queue );
+				}
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Sets a bookmark in the HTML document.
+	 *
+	 * Bookmarks represent specific places or tokens in the HTML
+	 * document, such as a tag opener or closer. When applying
+	 * edits to a document, such as setting an attribute, the
+	 * text offsets of that token may shift; the bookmark is
+	 * kept updated with those shifts and remains stable unless
+	 * the entire span of text in which the token sits is removed.
+	 *
+	 * Release bookmarks when they are no longer needed.
+	 *
+	 * Example:
+	 *
+	 *     <main><h2>Surprising fact you may not know!</h2></main>
+	 *           ^  ^
+	 *            \-|-- this `H2` opener bookmark tracks the token
+	 *
+	 *     <main class="clickbait"><h2>Surprising fact you may no…
+	 *                             ^  ^
+	 *                              \-|-- it shifts with edits
+	 *
+	 * Bookmarks provide the ability to seek to a previously-scanned
+	 * place in the HTML document. This avoids the need to re-scan
+	 * the entire document.
+	 *
+	 * Example:
+	 *
+	 *     <ul><li>One</li><li>Two</li><li>Three</li></ul>
+	 *                                 ^^^^
+	 *                                 want to note this last item
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( $html );
+	 *     $in_list = false;
+	 *     while ( $p->next_tag( array( 'tag_closers' => $in_list ? 'visit' : 'skip' ) ) ) {
+	 *         if ( 'UL' === $p->get_tag() ) {
+	 *             if ( $p->is_tag_closer() ) {
+	 *                 $in_list = false;
+	 *                 $p->set_bookmark( 'resume' );
+	 *                 if ( $p->seek( 'last-li' ) ) {
+	 *                     $p->add_class( 'last-li' );
+	 *                 }
+	 *                 $p->seek( 'resume' );
+	 *                 $p->release_bookmark( 'last-li' );
+	 *                 $p->release_bookmark( 'resume' );
+	 *             } else {
+	 *                 $in_list = true;
+	 *             }
+	 *         }
+	 *
+	 *         if ( 'LI' === $p->get_tag() ) {
+	 *             $p->set_bookmark( 'last-li' );
+	 *         }
+	 *     }
+	 *
+	 * Bookmarks intentionally hide the internal string offsets
+	 * to which they refer. They are maintained internally as
+	 * updates are applied to the HTML document and therefore
+	 * retain their "position" - the location to which they
+	 * originally pointed. The inability to use bookmarks with
+	 * functions like `substr` is therefore intentional to guard
+	 * against accidentally breaking the HTML.
+	 *
+	 * Because bookmarks allocate memory and require processing
+	 * for every applied update, they are limited and require
+	 * a name. They should not be created with programmatically-made
+	 * names, such as "li_{$index}" with some loop. As a general
+	 * rule they should only be created with string-literal names
+	 * like "start-of-section" or "last-paragraph".
+	 *
+	 * Bookmarks are a powerful tool to enable complicated behavior.
+	 * Consider double-checking that you need this tool if you are
+	 * reaching for it, as inappropriate use could lead to broken
+	 * HTML structure or unwanted processing overhead.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Identifies this particular bookmark.
+	 * @return bool Whether the bookmark was successfully created.
+	 */
+	public function set_bookmark( $bookmark_name ): bool {
+		return parent::set_bookmark( "_{$bookmark_name}" );
+	}
+
+	/**
+	 * Checks whether a bookmark with the given name exists.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $bookmark_name Name to identify a bookmark that potentially exists.
+	 * @return bool Whether that bookmark exists.
+	 */
+	public function has_bookmark( $bookmark_name ): bool {
+		return parent::has_bookmark( "_{$bookmark_name}" );
+	}
+
+	/*
+	 * HTML Parsing Algorithms
+	 */
+
+	/**
+	 * Closes a P element.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#close-a-p-element
+	 */
+	private function close_a_p_element(): void {
+		$this->generate_implied_end_tags( 'P' );
+		$this->state->stack_of_open_elements->pop_until( 'P' );
+	}
+
+	/**
+	 * Closes elements that have implied end tags.
+	 *
+	 * @since 6.4.0
+	 * @since 6.7.0 Full spec support.
+	 *
+	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
+	 *
+	 * @param string|null $except_for_this_element Perform as if this element doesn't exist in the stack of open elements.
+	 */
+	private function generate_implied_end_tags( ?string $except_for_this_element = null ): void {
+		$elements_with_implied_end_tags = array(
+			'DD',
+			'DT',
+			'LI',
+			'OPTGROUP',
+			'OPTION',
+			'P',
+			'RB',
+			'RP',
+			'RT',
+			'RTC',
+		);
+
+		$no_exclusions = ! isset( $except_for_this_element );
+
+		while (
+			( $no_exclusions || ! $this->state->stack_of_open_elements->current_node_is( $except_for_this_element ) ) &&
+			in_array( $this->state->stack_of_open_elements->current_node()->node_name, $elements_with_implied_end_tags, true )
+		) {
+			$this->state->stack_of_open_elements->pop();
+		}
+	}
+
+	/**
+	 * Closes elements that have implied end tags, thoroughly.
+	 *
+	 * See the HTML specification for an explanation why this is
+	 * different from generating end tags in the normal sense.
+	 *
+	 * @since 6.4.0
+	 * @since 6.7.0 Full spec support.
+	 *
+	 * @see WP_HTML_Processor::generate_implied_end_tags
+	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
+	 */
+	private function generate_implied_end_tags_thoroughly(): void {
+		$elements_with_implied_end_tags = array(
+			'CAPTION',
+			'COLGROUP',
+			'DD',
+			'DT',
+			'LI',
+			'OPTGROUP',
+			'OPTION',
+			'P',
+			'RB',
+			'RP',
+			'RT',
+			'RTC',
+			'TBODY',
+			'TD',
+			'TFOOT',
+			'TH',
+			'THEAD',
+			'TR',
+		);
+
+		while ( in_array( $this->state->stack_of_open_elements->current_node()->node_name, $elements_with_implied_end_tags, true ) ) {
+			$this->state->stack_of_open_elements->pop();
+		}
+	}
+
+	/**
+	 * Reconstructs the active formatting elements.
+	 *
+	 * > This has the effect of reopening all the formatting elements that were opened
+	 * > in the current body, cell, or caption (whichever is youngest) that haven't
+	 * > been explicitly closed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#reconstruct-the-active-formatting-elements
+	 *
+	 * @return bool Whether any formatting elements needed to be reconstructed.
+	 */
+	private function reconstruct_active_formatting_elements(): bool {
+		/*
+		 * > If there are no entries in the list of active formatting elements, then there is nothing
+		 * > to reconstruct; stop this algorithm.
+		 */
+		if ( 0 === $this->state->active_formatting_elements->count() ) {
+			return false;
+		}
+
+		$last_entry = $this->state->active_formatting_elements->current_node();
+		if (
+
+			/*
+			 * > If the last (most recently added) entry in the list of active formatting elements is a marker;
+			 * > stop this algorithm.
+			 */
+			'marker' === $last_entry->node_name ||
+
+			/*
+			 * > If the last (most recently added) entry in the list of active formatting elements is an
+			 * > element that is in the stack of open elements, then there is nothing to reconstruct;
+			 * > stop this algorithm.
+			 */
+			$this->state->stack_of_open_elements->contains_node( $last_entry )
+		) {
+			return false;
+		}
+
+		$this->bail( 'Cannot reconstruct active formatting elements when advancing and rewinding is required.' );
+	}
+
+	/**
+	 * Runs the reset the insertion mode appropriately algorithm.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/parsing.html#reset-the-insertion-mode-appropriately
+	 */
+	public function reset_insertion_mode(): void {
+		// Set the first node.
+		$first_node = null;
+		foreach ( $this->state->stack_of_open_elements->walk_down() as $first_node ) {
+			break;
+		}
+
+		/*
+		 * > 1. Let _last_ be false.
+		 */
+		$last = false;
+		foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
+			/*
+			 * > 2. Let _node_ be the last node in the stack of open elements.
+			 * > 3. _Loop_: If _node_ is the first node in the stack of open elements, then set _last_
+			 * >            to true, and, if the parser was created as part of the HTML fragment parsing
+			 * >            algorithm (fragment case), set node to the context element passed to
+			 * >            that algorithm.
+			 * > …
+			 */
+			if ( $node === $first_node ) {
+				$last = true;
+				if ( isset( $this->context_node ) ) {
+					$node = $this->context_node;
+				}
+			}
+
+			switch ( $node->node_name ) {
+				/*
+				 * > 4. If node is a `select` element, run these substeps:
+				 * >   1. If _last_ is true, jump to the step below labeled done.
+				 * >   2. Let _ancestor_ be _node_.
+				 * >   3. _Loop_: If _ancestor_ is the first node in the stack of open elements,
+				 * >      jump to the step below labeled done.
+				 * >   4. Let ancestor be the node before ancestor in the stack of open elements.
+				 * >   …
+				 * >   7. Jump back to the step labeled _loop_.
+				 * >   8. _Done_: Switch the insertion mode to "in select" and return.
+				 */
+				case 'SELECT':
+					if ( ! $last ) {
+						foreach ( $this->state->stack_of_open_elements->walk_up( $node ) as $ancestor ) {
+							switch ( $ancestor->node_name ) {
+								/*
+								 * > 5. If _ancestor_ is a `template` node, jump to the step below
+								 * >    labeled _done_.
+								 */
+								case 'TEMPLATE':
+									break 2;
+
+								/*
+								 * > 6. If _ancestor_ is a `table` node, switch the insertion mode to
+								 * >    "in select in table" and return.
+								 */
+								case 'TABLE':
+									$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_SELECT_IN_TABLE;
+									return;
+							}
+						}
+					}
+					$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_SELECT;
+					return;
+
+				/*
+				 * > 5. If _node_ is a `td` or `th` element and _last_ is false, then switch the
+				 * >    insertion mode to "in cell" and return.
+				 */
+				case 'TD':
+				case 'TH':
+					if ( ! $last ) {
+						$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_CELL;
+						return;
+					}
+					break;
+
+					/*
+					* > 6. If _node_ is a `tr` element, then switch the insertion mode to "in row"
+					* >    and return.
+					*/
+				case 'TR':
+					$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_ROW;
+					return;
+
+				/*
+				 * > 7. If _node_ is a `tbody`, `thead`, or `tfoot` element, then switch the
+				 * >    insertion mode to "in table body" and return.
+				 */
+				case 'TBODY':
+				case 'THEAD':
+				case 'TFOOT':
+					$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_TABLE_BODY;
+					return;
+
+				/*
+				 * > 8. If _node_ is a `caption` element, then switch the insertion mode to
+				 * >    "in caption" and return.
+				 */
+				case 'CAPTION':
+					$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_CAPTION;
+					return;
+
+				/*
+				 * > 9. If _node_ is a `colgroup` element, then switch the insertion mode to
+				 * >    "in column group" and return.
+				 */
+				case 'COLGROUP':
+					$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_COLUMN_GROUP;
+					return;
+
+				/*
+				 * > 10. If _node_ is a `table` element, then switch the insertion mode to
+				 * >     "in table" and return.
+				 */
+				case 'TABLE':
+					$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_TABLE;
+					return;
+
+				/*
+				 * > 11. If _node_ is a `template` element, then switch the insertion mode to the
+				 * >     current template insertion mode and return.
+				 */
+				case 'TEMPLATE':
+					$this->state->insertion_mode = end( $this->state->stack_of_template_insertion_modes );
+					return;
+
+				/*
+				 * > 12. If _node_ is a `head` element and _last_ is false, then switch the
+				 * >     insertion mode to "in head" and return.
+				 */
+				case 'HEAD':
+					if ( ! $last ) {
+						$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_HEAD;
+						return;
+					}
+					break;
+
+				/*
+				 * > 13. If _node_ is a `body` element, then switch the insertion mode to "in body"
+				 * >     and return.
+				 */
+				case 'BODY':
+					$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_BODY;
+					return;
+
+				/*
+				 * > 14. If _node_ is a `frameset` element, then switch the insertion mode to
+				 * >     "in frameset" and return. (fragment case)
+				 */
+				case 'FRAMESET':
+					$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_FRAMESET;
+					return;
+
+				/*
+				 * > 15. If _node_ is an `html` element, run these substeps:
+				 * >     1. If the head element pointer is null, switch the insertion mode to
+				 * >        "before head" and return. (fragment case)
+				 * >     2. Otherwise, the head element pointer is not null, switch the insertion
+				 * >        mode to "after head" and return.
+				 */
+				case 'HTML':
+					$this->state->insertion_mode = isset( $this->state->head_element )
+						? Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_AFTER_HEAD
+						: Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_BEFORE_HEAD;
+					return;
+			}
+		}
+
+		/*
+		 * > 16. If _last_ is true, then switch the insertion mode to "in body"
+		 * >     and return. (fragment case)
+		 *
+		 * This is only reachable if `$last` is true, as per the fragment parsing case.
+		 */
+		$this->state->insertion_mode = Gutenberg_HTML_Processor_State_6_7::INSERTION_MODE_IN_BODY;
+	}
+
+	/**
+	 * Runs the adoption agency algorithm.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#adoption-agency-algorithm
+	 */
+	private function run_adoption_agency_algorithm(): void {
+		$budget       = 1000;
+		$subject      = $this->get_tag();
+		$current_node = $this->state->stack_of_open_elements->current_node();
+
+		if (
+			// > If the current node is an HTML element whose tag name is subject
+			$current_node && $subject === $current_node->node_name &&
+			// > the current node is not in the list of active formatting elements
+			! $this->state->active_formatting_elements->contains_node( $current_node )
+		) {
+			$this->state->stack_of_open_elements->pop();
+			return;
+		}
+
+		$outer_loop_counter = 0;
+		while ( $budget-- > 0 ) {
+			if ( $outer_loop_counter++ >= 8 ) {
+				return;
+			}
+
+			/*
+			 * > Let formatting element be the last element in the list of active formatting elements that:
+			 * >   - is between the end of the list and the last marker in the list,
+			 * >     if any, or the start of the list otherwise,
+			 * >   - and has the tag name subject.
+			 */
+			$formatting_element = null;
+			foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+				if ( 'marker' === $item->node_name ) {
+					break;
+				}
+
+				if ( $subject === $item->node_name ) {
+					$formatting_element = $item;
+					break;
+				}
+			}
+
+			// > If there is no such element, then return and instead act as described in the "any other end tag" entry above.
+			if ( null === $formatting_element ) {
+				$this->bail( 'Cannot run adoption agency when "any other end tag" is required.' );
+			}
+
+			// > If formatting element is not in the stack of open elements, then this is a parse error; remove the element from the list, and return.
+			if ( ! $this->state->stack_of_open_elements->contains_node( $formatting_element ) ) {
+				$this->state->active_formatting_elements->remove_node( $formatting_element );
+				return;
+			}
+
+			// > If formatting element is in the stack of open elements, but the element is not in scope, then this is a parse error; return.
+			if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $formatting_element->node_name ) ) {
+				return;
+			}
+
+			/*
+			 * > Let furthest block be the topmost node in the stack of open elements that is lower in the stack
+			 * > than formatting element, and is an element in the special category. There might not be one.
+			 */
+			$is_above_formatting_element = true;
+			$furthest_block              = null;
+			foreach ( $this->state->stack_of_open_elements->walk_down() as $item ) {
+				if ( $is_above_formatting_element && $formatting_element->bookmark_name !== $item->bookmark_name ) {
+					continue;
+				}
+
+				if ( $is_above_formatting_element ) {
+					$is_above_formatting_element = false;
+					continue;
+				}
+
+				if ( self::is_special( $item->node_name ) ) {
+					$furthest_block = $item;
+					break;
+				}
+			}
+
+			/*
+			 * > If there is no furthest block, then the UA must first pop all the nodes from the bottom of the
+			 * > stack of open elements, from the current node up to and including formatting element, then
+			 * > remove formatting element from the list of active formatting elements, and finally return.
+			 */
+			if ( null === $furthest_block ) {
+				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+					$this->state->stack_of_open_elements->pop();
+
+					if ( $formatting_element->bookmark_name === $item->bookmark_name ) {
+						$this->state->active_formatting_elements->remove_node( $formatting_element );
+						return;
+					}
+				}
+			}
+
+			$this->bail( 'Cannot extract common ancestor in adoption agency algorithm.' );
+		}
+
+		$this->bail( 'Cannot run adoption agency when looping required.' );
+	}
+
+	/**
+	 * Inserts an HTML element on the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#insert-a-foreign-element
+	 *
+	 * @param WP_HTML_Token $token Name of bookmark pointing to element in original input HTML.
+	 */
+	private function insert_html_element( Gutenberg_HTML_Token_6_7 $token ): void {
+		$this->state->stack_of_open_elements->push( $token );
+	}
+
+	/*
+	 * HTML Specification Helpers
+	 */
+
+	/**
+	 * Returns whether an element of a given name is in the HTML special category.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#special
+	 *
+	 * @param string $tag_name Name of element to check.
+	 * @return bool Whether the element of the given name is in the special category.
+	 */
+	public static function is_special( $tag_name ): bool {
+		$tag_name = strtoupper( $tag_name );
+
+		return (
+			'ADDRESS' === $tag_name ||
+			'APPLET' === $tag_name ||
+			'AREA' === $tag_name ||
+			'ARTICLE' === $tag_name ||
+			'ASIDE' === $tag_name ||
+			'BASE' === $tag_name ||
+			'BASEFONT' === $tag_name ||
+			'BGSOUND' === $tag_name ||
+			'BLOCKQUOTE' === $tag_name ||
+			'BODY' === $tag_name ||
+			'BR' === $tag_name ||
+			'BUTTON' === $tag_name ||
+			'CAPTION' === $tag_name ||
+			'CENTER' === $tag_name ||
+			'COL' === $tag_name ||
+			'COLGROUP' === $tag_name ||
+			'DD' === $tag_name ||
+			'DETAILS' === $tag_name ||
+			'DIR' === $tag_name ||
+			'DIV' === $tag_name ||
+			'DL' === $tag_name ||
+			'DT' === $tag_name ||
+			'EMBED' === $tag_name ||
+			'FIELDSET' === $tag_name ||
+			'FIGCAPTION' === $tag_name ||
+			'FIGURE' === $tag_name ||
+			'FOOTER' === $tag_name ||
+			'FORM' === $tag_name ||
+			'FRAME' === $tag_name ||
+			'FRAMESET' === $tag_name ||
+			'H1' === $tag_name ||
+			'H2' === $tag_name ||
+			'H3' === $tag_name ||
+			'H4' === $tag_name ||
+			'H5' === $tag_name ||
+			'H6' === $tag_name ||
+			'HEAD' === $tag_name ||
+			'HEADER' === $tag_name ||
+			'HGROUP' === $tag_name ||
+			'HR' === $tag_name ||
+			'HTML' === $tag_name ||
+			'IFRAME' === $tag_name ||
+			'IMG' === $tag_name ||
+			'INPUT' === $tag_name ||
+			'KEYGEN' === $tag_name ||
+			'LI' === $tag_name ||
+			'LINK' === $tag_name ||
+			'LISTING' === $tag_name ||
+			'MAIN' === $tag_name ||
+			'MARQUEE' === $tag_name ||
+			'MENU' === $tag_name ||
+			'META' === $tag_name ||
+			'NAV' === $tag_name ||
+			'NOEMBED' === $tag_name ||
+			'NOFRAMES' === $tag_name ||
+			'NOSCRIPT' === $tag_name ||
+			'OBJECT' === $tag_name ||
+			'OL' === $tag_name ||
+			'P' === $tag_name ||
+			'PARAM' === $tag_name ||
+			'PLAINTEXT' === $tag_name ||
+			'PRE' === $tag_name ||
+			'SCRIPT' === $tag_name ||
+			'SEARCH' === $tag_name ||
+			'SECTION' === $tag_name ||
+			'SELECT' === $tag_name ||
+			'SOURCE' === $tag_name ||
+			'STYLE' === $tag_name ||
+			'SUMMARY' === $tag_name ||
+			'TABLE' === $tag_name ||
+			'TBODY' === $tag_name ||
+			'TD' === $tag_name ||
+			'TEMPLATE' === $tag_name ||
+			'TEXTAREA' === $tag_name ||
+			'TFOOT' === $tag_name ||
+			'TH' === $tag_name ||
+			'THEAD' === $tag_name ||
+			'TITLE' === $tag_name ||
+			'TR' === $tag_name ||
+			'TRACK' === $tag_name ||
+			'UL' === $tag_name ||
+			'WBR' === $tag_name ||
+			'XMP' === $tag_name ||
+
+			// MathML.
+			'MI' === $tag_name ||
+			'MO' === $tag_name ||
+			'MN' === $tag_name ||
+			'MS' === $tag_name ||
+			'MTEXT' === $tag_name ||
+			'ANNOTATION-XML' === $tag_name ||
+
+			// SVG.
+			'FOREIGNOBJECT' === $tag_name ||
+			'DESC' === $tag_name ||
+			'TITLE' === $tag_name
+		);
+	}
+
+	/**
+	 * Returns whether a given element is an HTML Void Element
+	 *
+	 * > area, base, br, col, embed, hr, img, input, link, meta, source, track, wbr
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#void-elements
+	 *
+	 * @param string $tag_name Name of HTML tag to check.
+	 * @return bool Whether the given tag is an HTML Void Element.
+	 */
+	public static function is_void( $tag_name ): bool {
+		$tag_name = strtoupper( $tag_name );
+
+		return (
+			'AREA' === $tag_name ||
+			'BASE' === $tag_name ||
+			'BASEFONT' === $tag_name || // Obsolete but still treated as void.
+			'BGSOUND' === $tag_name || // Obsolete but still treated as void.
+			'BR' === $tag_name ||
+			'COL' === $tag_name ||
+			'EMBED' === $tag_name ||
+			'FRAME' === $tag_name ||
+			'HR' === $tag_name ||
+			'IMG' === $tag_name ||
+			'INPUT' === $tag_name ||
+			'KEYGEN' === $tag_name || // Obsolete but still treated as void.
+			'LINK' === $tag_name ||
+			'META' === $tag_name ||
+			'PARAM' === $tag_name || // Obsolete but still treated as void.
+			'SOURCE' === $tag_name ||
+			'TRACK' === $tag_name ||
+			'WBR' === $tag_name
+		);
+	}
+
+	/*
+	 * Constants that would pollute the top of the class if they were found there.
+	 */
+
+	/**
+	 * Indicates that the next HTML token should be parsed and processed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const PROCESS_NEXT_NODE = 'process-next-node';
+
+	/**
+	 * Indicates that the current HTML token should be reprocessed in the newly-selected insertion mode.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const REPROCESS_CURRENT_NODE = 'reprocess-current-node';
+
+	/**
+	 * Indicates that the current HTML token should be processed without advancing the parser.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string
+	 */
+	const PROCESS_CURRENT_NODE = 'process-current-node';
+
+	/**
+	 * Indicates that the parser encountered unsupported markup and has bailed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const ERROR_UNSUPPORTED = 'unsupported';
+
+	/**
+	 * Indicates that the parser encountered more HTML tokens than it
+	 * was able to process and has bailed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const ERROR_EXCEEDED_MAX_BOOKMARKS = 'exceeded-max-bookmarks';
+
+	/**
+	 * Unlock code that must be passed into the constructor to create this class.
+	 *
+	 * This class extends the WP_HTML_Tag_Processor, which has a public class
+	 * constructor. Therefore, it's not possible to have a private constructor here.
+	 *
+	 * This unlock code is used to ensure that anyone calling the constructor is
+	 * doing so with a full understanding that it's intended to be a private API.
+	 *
+	 * @access private
+	 */
+	const CONSTRUCTOR_UNLOCK_CODE = 'Use WP_HTML_Processor::create_fragment() instead of calling the class constructor directly.';
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-processor-state-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-processor-state-6-7.php
new file mode 100644
index 00000000000000..5a3941c415dd79
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-processor-state-6-7.php
@@ -0,0 +1,417 @@
+<?php
+/**
+ * HTML API: WP_HTML_Processor_State class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the internal parsing state.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Processor_State_6_7 {
+	/*
+	 * Insertion mode constants.
+	 *
+	 * These constants exist and are named to make it easier to
+	 * discover and recognize the supported insertion modes in
+	 * the parser.
+	 *
+	 * Out of all the possible insertion modes, only those
+	 * supported by the parser are listed here. As support
+	 * is added to the parser for more modes, add them here
+	 * following the same naming and value pattern.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-insertion-mode
+	 */
+
+	/**
+	 * Initial insertion mode for full HTML parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#the-initial-insertion-mode
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_INITIAL = 'insertion-mode-initial';
+
+	/**
+	 * Before HTML insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#the-before-html-insertion-mode
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_BEFORE_HTML = 'insertion-mode-before-html';
+
+	/**
+	 * Before head insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-beforehead
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_BEFORE_HEAD = 'insertion-mode-before-head';
+
+	/**
+	 * In head insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inhead
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_HEAD = 'insertion-mode-in-head';
+
+	/**
+	 * In head noscript insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inheadnoscript
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_HEAD_NOSCRIPT = 'insertion-mode-in-head-noscript';
+
+	/**
+	 * After head insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-afterhead
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_AFTER_HEAD = 'insertion-mode-after-head';
+
+	/**
+	 * In body insertion mode for full HTML parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_BODY = 'insertion-mode-in-body';
+
+	/**
+	 * In table insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intable
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_TABLE = 'insertion-mode-in-table';
+
+	/**
+	 * In table text insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intabletext
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_TABLE_TEXT = 'insertion-mode-in-table-text';
+
+	/**
+	 * In caption insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-incaption
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_CAPTION = 'insertion-mode-in-caption';
+
+	/**
+	 * In column group insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-incolumngroup
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_COLUMN_GROUP = 'insertion-mode-in-column-group';
+
+	/**
+	 * In table body insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intablebody
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_TABLE_BODY = 'insertion-mode-in-table-body';
+
+	/**
+	 * In row insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inrow
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_ROW = 'insertion-mode-in-row';
+
+	/**
+	 * In cell insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-incell
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_CELL = 'insertion-mode-in-cell';
+
+	/**
+	 * In select insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inselect
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_SELECT = 'insertion-mode-in-select';
+
+	/**
+	 * In select in table insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inselectintable
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_SELECT_IN_TABLE = 'insertion-mode-in-select-in-table';
+
+	/**
+	 * In template insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-intemplate
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_TEMPLATE = 'insertion-mode-in-template';
+
+	/**
+	 * After body insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-afterbody
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_AFTER_BODY = 'insertion-mode-after-body';
+
+	/**
+	 * In frameset insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inframeset
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_FRAMESET = 'insertion-mode-in-frameset';
+
+	/**
+	 * After frameset insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-afterframeset
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_AFTER_FRAMESET = 'insertion-mode-after-frameset';
+
+	/**
+	 * After after body insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#the-after-after-body-insertion-mode
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_AFTER_AFTER_BODY = 'insertion-mode-after-after-body';
+
+	/**
+	 * After after frameset insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#the-after-after-frameset-insertion-mode
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_AFTER_AFTER_FRAMESET = 'insertion-mode-after-after-frameset';
+
+	/**
+	 * In foreign content insertion mode for full HTML parser.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inforeign
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_FOREIGN_CONTENT = 'insertion-mode-in-foreign-content';
+
+	/**
+	 * The stack of template insertion modes.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/#the-insertion-mode:stack-of-template-insertion-modes
+	 *
+	 * @var array<string>
+	 */
+	public $stack_of_template_insertion_modes = array();
+
+	/**
+	 * Tracks open elements while scanning HTML.
+	 *
+	 * This property is initialized in the constructor and never null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @var WP_HTML_Open_Elements
+	 */
+	public $stack_of_open_elements;
+
+	/**
+	 * Tracks open formatting elements, used to handle mis-nested formatting element tags.
+	 *
+	 * This property is initialized in the constructor and never null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#list-of-active-formatting-elements
+	 *
+	 * @var WP_HTML_Active_Formatting_Elements
+	 */
+	public $active_formatting_elements;
+
+	/**
+	 * Refers to the currently-matched tag, if any.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token|null
+	 */
+	public $current_token = null;
+
+	/**
+	 * Tree construction insertion mode.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#insertion-mode
+	 *
+	 * @var string
+	 */
+	public $insertion_mode = self::INSERTION_MODE_INITIAL;
+
+	/**
+	 * Context node initializing fragment parser, if created as a fragment parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#concept-frag-parse-context
+	 *
+	 * @var [string, array]|null
+	 */
+	public $context_node = null;
+
+	/**
+	 * HEAD element pointer.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/parsing.html#head-element-pointer
+	 *
+	 * @var WP_HTML_Token|null
+	 */
+	public $head_element = null;
+
+	/**
+	 * The frameset-ok flag indicates if a `FRAMESET` element is allowed in the current state.
+	 *
+	 * > The frameset-ok flag is set to "ok" when the parser is created. It is set to "not ok" after certain tokens are seen.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#frameset-ok-flag
+	 *
+	 * @var bool
+	 */
+	public $frameset_ok = true;
+
+	/**
+	 * Constructor - creates a new and empty state value.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor
+	 */
+	public function __construct() {
+		$this->stack_of_open_elements     = new Gutenberg_HTML_Open_Elements_6_7();
+		$this->active_formatting_elements = new Gutenberg_HTML_Active_Formatting_Elements_6_7();
+	}
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-span-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-span-6-7.php
new file mode 100644
index 00000000000000..5a55d9f5568746
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-span-6-7.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * HTML API: WP_HTML_Span class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Core class used by the HTML tag processor to represent a textual span
+ * inside an HTML document.
+ *
+ * This is a two-tuple in disguise, used to avoid the memory overhead
+ * involved in using an array for the same purpose.
+ *
+ * This class is for internal usage of the WP_HTML_Tag_Processor class.
+ *
+ * @access private
+ * @since 6.2.0
+ * @since 6.5.0 Replaced `end` with `length` to more closely align with `substr()`.
+ *
+ * @see WP_HTML_Tag_Processor
+ */
+class Gutenberg_HTML_Span_6_7 {
+	/**
+	 * Byte offset into document where span begins.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var int
+	 */
+	public $start;
+
+	/**
+	 * Byte length of this span.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var int
+	 */
+	public $length;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param int $start  Byte offset into document where replacement span begins.
+	 * @param int $length Byte length of span.
+	 */
+	public function __construct( int $start, int $length ) {
+		$this->start  = $start;
+		$this->length = $length;
+	}
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-stack-event-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-stack-event-6-7.php
new file mode 100644
index 00000000000000..30a8024b1c07c5
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-stack-event-6-7.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * HTML API: WP_HTML_Stack_Event class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.6.0
+ */
+
+/**
+ * Core class used by the HTML Processor as a record for stack operations.
+ *
+ * This class is for internal usage of the WP_HTML_Processor class.
+ *
+ * @access private
+ * @since 6.6.0
+ *
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Stack_Event_6_7 {
+	/**
+	 * Refers to popping an element off of the stack of open elements.
+	 *
+	 * @since 6.6.0
+	 */
+	const POP = 'pop';
+
+	/**
+	 * Refers to pushing an element onto the stack of open elements.
+	 *
+	 * @since 6.6.0
+	 */
+	const PUSH = 'push';
+
+	/**
+	 * References the token associated with the stack push event,
+	 * even if this is a pop event for that element.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var WP_HTML_Token
+	 */
+	public $token;
+
+	/**
+	 * Indicates which kind of stack operation this event represents.
+	 *
+	 * May be one of the class constants.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @see self::POP
+	 * @see self::PUSH
+	 *
+	 * @var string
+	 */
+	public $operation;
+
+	/**
+	 * Indicates if the stack element is a real or virtual node.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @var string
+	 */
+	public $provenance;
+
+	/**
+	 * Constructor function.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @param WP_HTML_Token $token      Token associated with stack event, always an opening token.
+	 * @param string        $operation  One of self::PUSH or self::POP.
+	 * @param string        $provenance "virtual" or "real".
+	 */
+	public function __construct( Gutenberg_HTML_Token_6_7 $token, string $operation, string $provenance ) {
+		$this->token      = $token;
+		$this->operation  = $operation;
+		$this->provenance = $provenance;
+	}
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-tag-processor-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-tag-processor-6-7.php
new file mode 100644
index 00000000000000..0377706d5eaa63
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-tag-processor-6-7.php
@@ -0,0 +1,3521 @@
+<?php
+/**
+ * HTML API: WP_HTML_Tag_Processor class
+ *
+ * Scans through an HTML document to find specific tags, then
+ * transforms those tags by adding, removing, or updating the
+ * values of the HTML attributes within that tag (opener).
+ *
+ * Does not fully parse HTML or _recurse_ into the HTML structure
+ * Instead this scans linearly through a document and only parses
+ * the HTML tag openers.
+ *
+ * ### Possible future direction for this module
+ *
+ *  - Prune the whitespace when removing classes/attributes: e.g. "a b c" -> "c" not " c".
+ *    This would increase the size of the changes for some operations but leave more
+ *    natural-looking output HTML.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Core class used to modify attributes in an HTML document for tags matching a query.
+ *
+ * ## Usage
+ *
+ * Use of this class requires three steps:
+ *
+ *  1. Create a new class instance with your input HTML document.
+ *  2. Find the tag(s) you are looking for.
+ *  3. Request changes to the attributes in those tag(s).
+ *
+ * Example:
+ *
+ *     $tags = new WP_HTML_Tag_Processor( $html );
+ *     if ( $tags->next_tag( 'option' ) ) {
+ *         $tags->set_attribute( 'selected', true );
+ *     }
+ *
+ * ### Finding tags
+ *
+ * The `next_tag()` function moves the internal cursor through
+ * your input HTML document until it finds a tag meeting any of
+ * the supplied restrictions in the optional query argument. If
+ * no argument is provided then it will find the next HTML tag,
+ * regardless of what kind it is.
+ *
+ * If you want to _find whatever the next tag is_:
+ *
+ *     $tags->next_tag();
+ *
+ * | Goal                                                      | Query                                                                           |
+ * |-----------------------------------------------------------|---------------------------------------------------------------------------------|
+ * | Find any tag.                                             | `$tags->next_tag();`                                                            |
+ * | Find next image tag.                                      | `$tags->next_tag( array( 'tag_name' => 'img' ) );`                              |
+ * | Find next image tag (without passing the array).          | `$tags->next_tag( 'img' );`                                                     |
+ * | Find next tag containing the `fullwidth` CSS class.       | `$tags->next_tag( array( 'class_name' => 'fullwidth' ) );`                      |
+ * | Find next image tag containing the `fullwidth` CSS class. | `$tags->next_tag( array( 'tag_name' => 'img', 'class_name' => 'fullwidth' ) );` |
+ *
+ * If a tag was found meeting your criteria then `next_tag()`
+ * will return `true` and you can proceed to modify it. If it
+ * returns `false`, however, it failed to find the tag and
+ * moved the cursor to the end of the file.
+ *
+ * Once the cursor reaches the end of the file the processor
+ * is done and if you want to reach an earlier tag you will
+ * need to recreate the processor and start over, as it's
+ * unable to back up or move in reverse.
+ *
+ * See the section on bookmarks for an exception to this
+ * no-backing-up rule.
+ *
+ * #### Custom queries
+ *
+ * Sometimes it's necessary to further inspect an HTML tag than
+ * the query syntax here permits. In these cases one may further
+ * inspect the search results using the read-only functions
+ * provided by the processor or external state or variables.
+ *
+ * Example:
+ *
+ *     // Paint up to the first five DIV or SPAN tags marked with the "jazzy" style.
+ *     $remaining_count = 5;
+ *     while ( $remaining_count > 0 && $tags->next_tag() ) {
+ *         if (
+ *              ( 'DIV' === $tags->get_tag() || 'SPAN' === $tags->get_tag() ) &&
+ *              'jazzy' === $tags->get_attribute( 'data-style' )
+ *         ) {
+ *             $tags->add_class( 'theme-style-everest-jazz' );
+ *             $remaining_count--;
+ *         }
+ *     }
+ *
+ * `get_attribute()` will return `null` if the attribute wasn't present
+ * on the tag when it was called. It may return `""` (the empty string)
+ * in cases where the attribute was present but its value was empty.
+ * For boolean attributes, those whose name is present but no value is
+ * given, it will return `true` (the only way to set `false` for an
+ * attribute is to remove it).
+ *
+ * #### When matching fails
+ *
+ * When `next_tag()` returns `false` it could mean different things:
+ *
+ *  - The requested tag wasn't found in the input document.
+ *  - The input document ended in the middle of an HTML syntax element.
+ *
+ * When a document ends in the middle of a syntax element it will pause
+ * the processor. This is to make it possible in the future to extend the
+ * input document and proceed - an important requirement for chunked
+ * streaming parsing of a document.
+ *
+ * Example:
+ *
+ *     $processor = new WP_HTML_Tag_Processor( 'This <div is="a" partial="token' );
+ *     false === $processor->next_tag();
+ *
+ * If a special element (see next section) is encountered but no closing tag
+ * is found it will count as an incomplete tag. The parser will pause as if
+ * the opening tag were incomplete.
+ *
+ * Example:
+ *
+ *     $processor = new WP_HTML_Tag_Processor( '<style>// there could be more styling to come' );
+ *     false === $processor->next_tag();
+ *
+ *     $processor = new WP_HTML_Tag_Processor( '<style>// this is everything</style><div>' );
+ *     true === $processor->next_tag( 'DIV' );
+ *
+ * #### Special elements
+ *
+ * Some HTML elements are handled in a special way; their start and end tags
+ * act like a void tag. These are special because their contents can't contain
+ * HTML markup. Everything inside these elements is handled in a special way
+ * and content that _appears_ like HTML tags inside of them isn't. There can
+ * be no nesting in these elements.
+ *
+ * In the following list, "raw text" means that all of the content in the HTML
+ * until the matching closing tag is treated verbatim without any replacements
+ * and without any parsing.
+ *
+ *  - IFRAME allows no content but requires a closing tag.
+ *  - NOEMBED (deprecated) content is raw text.
+ *  - NOFRAMES (deprecated) content is raw text.
+ *  - SCRIPT content is plaintext apart from legacy rules allowing `</script>` inside an HTML comment.
+ *  - STYLE content is raw text.
+ *  - TITLE content is plain text but character references are decoded.
+ *  - TEXTAREA content is plain text but character references are decoded.
+ *  - XMP (deprecated) content is raw text.
+ *
+ * ### Modifying HTML attributes for a found tag
+ *
+ * Once you've found the start of an opening tag you can modify
+ * any number of the attributes on that tag. You can set a new
+ * value for an attribute, remove the entire attribute, or do
+ * nothing and move on to the next opening tag.
+ *
+ * Example:
+ *
+ *     if ( $tags->next_tag( array( 'class_name' => 'wp-group-block' ) ) ) {
+ *         $tags->set_attribute( 'title', 'This groups the contained content.' );
+ *         $tags->remove_attribute( 'data-test-id' );
+ *     }
+ *
+ * If `set_attribute()` is called for an existing attribute it will
+ * overwrite the existing value. Similarly, calling `remove_attribute()`
+ * for a non-existing attribute has no effect on the document. Both
+ * of these methods are safe to call without knowing if a given attribute
+ * exists beforehand.
+ *
+ * ### Modifying CSS classes for a found tag
+ *
+ * The tag processor treats the `class` attribute as a special case.
+ * Because it's a common operation to add or remove CSS classes, this
+ * interface adds helper methods to make that easier.
+ *
+ * As with attribute values, adding or removing CSS classes is a safe
+ * operation that doesn't require checking if the attribute or class
+ * exists before making changes. If removing the only class then the
+ * entire `class` attribute will be removed.
+ *
+ * Example:
+ *
+ *     // from `<span>Yippee!</span>`
+ *     //   to `<span class="is-active">Yippee!</span>`
+ *     $tags->add_class( 'is-active' );
+ *
+ *     // from `<span class="excited">Yippee!</span>`
+ *     //   to `<span class="excited is-active">Yippee!</span>`
+ *     $tags->add_class( 'is-active' );
+ *
+ *     // from `<span class="is-active heavy-accent">Yippee!</span>`
+ *     //   to `<span class="is-active heavy-accent">Yippee!</span>`
+ *     $tags->add_class( 'is-active' );
+ *
+ *     // from `<input type="text" class="is-active rugby not-disabled" length="24">`
+ *     //   to `<input type="text" class="is-active not-disabled" length="24">
+ *     $tags->remove_class( 'rugby' );
+ *
+ *     // from `<input type="text" class="rugby" length="24">`
+ *     //   to `<input type="text" length="24">
+ *     $tags->remove_class( 'rugby' );
+ *
+ *     // from `<input type="text" length="24">`
+ *     //   to `<input type="text" length="24">
+ *     $tags->remove_class( 'rugby' );
+ *
+ * When class changes are enqueued but a direct change to `class` is made via
+ * `set_attribute` then the changes to `set_attribute` (or `remove_attribute`)
+ * will take precedence over those made through `add_class` and `remove_class`.
+ *
+ * ### Bookmarks
+ *
+ * While scanning through the input HTMl document it's possible to set
+ * a named bookmark when a particular tag is found. Later on, after
+ * continuing to scan other tags, it's possible to `seek` to one of
+ * the set bookmarks and then proceed again from that point forward.
+ *
+ * Because bookmarks create processing overhead one should avoid
+ * creating too many of them. As a rule, create only bookmarks
+ * of known string literal names; avoid creating "mark_{$index}"
+ * and so on. It's fine from a performance standpoint to create a
+ * bookmark and update it frequently, such as within a loop.
+ *
+ *     $total_todos = 0;
+ *     while ( $p->next_tag( array( 'tag_name' => 'UL', 'class_name' => 'todo' ) ) ) {
+ *         $p->set_bookmark( 'list-start' );
+ *         while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
+ *             if ( 'UL' === $p->get_tag() && $p->is_tag_closer() ) {
+ *                 $p->set_bookmark( 'list-end' );
+ *                 $p->seek( 'list-start' );
+ *                 $p->set_attribute( 'data-contained-todos', (string) $total_todos );
+ *                 $total_todos = 0;
+ *                 $p->seek( 'list-end' );
+ *                 break;
+ *             }
+ *
+ *             if ( 'LI' === $p->get_tag() && ! $p->is_tag_closer() ) {
+ *                 $total_todos++;
+ *             }
+ *         }
+ *     }
+ *
+ * ## Tokens and finer-grained processing.
+ *
+ * It's possible to scan through every lexical token in the
+ * HTML document using the `next_token()` function. This
+ * alternative form takes no argument and provides no built-in
+ * query syntax.
+ *
+ * Example:
+ *
+ *      $title = '(untitled)';
+ *      $text  = '';
+ *      while ( $processor->next_token() ) {
+ *          switch ( $processor->get_token_name() ) {
+ *              case '#text':
+ *                  $text .= $processor->get_modifiable_text();
+ *                  break;
+ *
+ *              case 'BR':
+ *                  $text .= "\n";
+ *                  break;
+ *
+ *              case 'TITLE':
+ *                  $title = $processor->get_modifiable_text();
+ *                  break;
+ *          }
+ *      }
+ *      return trim( "# {$title}\n\n{$text}" );
+ *
+ * ### Tokens and _modifiable text_.
+ *
+ * #### Special "atomic" HTML elements.
+ *
+ * Not all HTML elements are able to contain other elements inside of them.
+ * For instance, the contents inside a TITLE element are plaintext (except
+ * that character references like &amp; will be decoded). This means that
+ * if the string `<img>` appears inside a TITLE element, then it's not an
+ * image tag, but rather it's text describing an image tag. Likewise, the
+ * contents of a SCRIPT or STYLE element are handled entirely separately in
+ * a browser than the contents of other elements because they represent a
+ * different language than HTML.
+ *
+ * For these elements the Tag Processor treats the entire sequence as one,
+ * from the opening tag, including its contents, through its closing tag.
+ * This means that the it's not possible to match the closing tag for a
+ * SCRIPT element unless it's unexpected; the Tag Processor already matched
+ * it when it found the opening tag.
+ *
+ * The inner contents of these elements are that element's _modifiable text_.
+ *
+ * The special elements are:
+ *  - `SCRIPT` whose contents are treated as raw plaintext but supports a legacy
+ *    style of including JavaScript inside of HTML comments to avoid accidentally
+ *    closing the SCRIPT from inside a JavaScript string. E.g. `console.log( '</script>' )`.
+ *  - `TITLE` and `TEXTAREA` whose contents are treated as plaintext and then any
+ *    character references are decoded. E.g. `1 &lt; 2 < 3` becomes `1 < 2 < 3`.
+ *  - `IFRAME`, `NOSCRIPT`, `NOEMBED`, `NOFRAME`, `STYLE` whose contents are treated as
+ *    raw plaintext and left as-is. E.g. `1 &lt; 2 < 3` remains `1 &lt; 2 < 3`.
+ *
+ * #### Other tokens with modifiable text.
+ *
+ * There are also non-elements which are void/self-closing in nature and contain
+ * modifiable text that is part of that individual syntax token itself.
+ *
+ *  - `#text` nodes, whose entire token _is_ the modifiable text.
+ *  - HTML comments and tokens that become comments due to some syntax error. The
+ *    text for these tokens is the portion of the comment inside of the syntax.
+ *    E.g. for `<!-- comment -->` the text is `" comment "` (note the spaces are included).
+ *  - `CDATA` sections, whose text is the content inside of the section itself. E.g. for
+ *    `<![CDATA[some content]]>` the text is `"some content"` (with restrictions [1]).
+ *  - "Funky comments," which are a special case of invalid closing tags whose name is
+ *    invalid. The text for these nodes is the text that a browser would transform into
+ *    an HTML comment when parsing. E.g. for `</%post_author>` the text is `%post_author`.
+ *  - `DOCTYPE` declarations like `<DOCTYPE html>` which have no closing tag.
+ *  - XML Processing instruction nodes like `<?wp __( "Like" ); ?>` (with restrictions [2]).
+ *  - The empty end tag `</>` which is ignored in the browser and DOM.
+ *
+ * [1]: There are no CDATA sections in HTML. When encountering `<![CDATA[`, everything
+ *      until the next `>` becomes a bogus HTML comment, meaning there can be no CDATA
+ *      section in an HTML document containing `>`. The Tag Processor will first find
+ *      all valid and bogus HTML comments, and then if the comment _would_ have been a
+ *      CDATA section _were they to exist_, it will indicate this as the type of comment.
+ *
+ * [2]: XML allows a broader range of characters in a processing instruction's target name
+ *      and disallows "xml" as a name, since it's special. The Tag Processor only recognizes
+ *      target names with an ASCII-representable subset of characters. It also exhibits the
+ *      same constraint as with CDATA sections, in that `>` cannot exist within the token
+ *      since Processing Instructions do no exist within HTML and their syntax transforms
+ *      into a bogus comment in the DOM.
+ *
+ * ## Design and limitations
+ *
+ * The Tag Processor is designed to linearly scan HTML documents and tokenize
+ * HTML tags and their attributes. It's designed to do this as efficiently as
+ * possible without compromising parsing integrity. Therefore it will be
+ * slower than some methods of modifying HTML, such as those incorporating
+ * over-simplified PCRE patterns, but will not introduce the defects and
+ * failures that those methods bring in, which lead to broken page renders
+ * and often to security vulnerabilities. On the other hand, it will be faster
+ * than full-blown HTML parsers such as DOMDocument and use considerably
+ * less memory. It requires a negligible memory overhead, enough to consider
+ * it a zero-overhead system.
+ *
+ * The performance characteristics are maintained by avoiding tree construction
+ * and semantic cleanups which are specified in HTML5. Because of this, for
+ * example, it's not possible for the Tag Processor to associate any given
+ * opening tag with its corresponding closing tag, or to return the inner markup
+ * inside an element. Systems may be built on top of the Tag Processor to do
+ * this, but the Tag Processor is and should be constrained so it can remain an
+ * efficient, low-level, and reliable HTML scanner.
+ *
+ * The Tag Processor's design incorporates a "garbage-in-garbage-out" philosophy.
+ * HTML5 specifies that certain invalid content be transformed into different forms
+ * for display, such as removing null bytes from an input document and replacing
+ * invalid characters with the Unicode replacement character `U+FFFD` (visually "�").
+ * Where errors or transformations exist within the HTML5 specification, the Tag Processor
+ * leaves those invalid inputs untouched, passing them through to the final browser
+ * to handle. While this implies that certain operations will be non-spec-compliant,
+ * such as reading the value of an attribute with invalid content, it also preserves a
+ * simplicity and efficiency for handling those error cases.
+ *
+ * Most operations within the Tag Processor are designed to minimize the difference
+ * between an input and output document for any given change. For example, the
+ * `add_class` and `remove_class` methods preserve whitespace and the class ordering
+ * within the `class` attribute; and when encountering tags with duplicated attributes,
+ * the Tag Processor will leave those invalid duplicate attributes where they are but
+ * update the proper attribute which the browser will read for parsing its value. An
+ * exception to this rule is that all attribute updates store their values as
+ * double-quoted strings, meaning that attributes on input with single-quoted or
+ * unquoted values will appear in the output with double-quotes.
+ *
+ * ### Scripting Flag
+ *
+ * The Tag Processor parses HTML with the "scripting flag" disabled. This means
+ * that it doesn't run any scripts while parsing the page. In a browser with
+ * JavaScript enabled, for example, the script can change the parse of the
+ * document as it loads. On the server, however, evaluating JavaScript is not
+ * only impractical, but also unwanted.
+ *
+ * Practically this means that the Tag Processor will descend into NOSCRIPT
+ * elements and process its child tags. Were the scripting flag enabled, such
+ * as in a typical browser, the contents of NOSCRIPT are skipped entirely.
+ *
+ * This allows the HTML API to process the content that will be presented in
+ * a browser when scripting is disabled, but it offers a different view of a
+ * page than most browser sessions will experience. E.g. the tags inside the
+ * NOSCRIPT disappear.
+ *
+ * ### Text Encoding
+ *
+ * The Tag Processor assumes that the input HTML document is encoded with a
+ * text encoding compatible with 7-bit ASCII's '<', '>', '&', ';', '/', '=',
+ * "'", '"', 'a' - 'z', 'A' - 'Z', and the whitespace characters ' ', tab,
+ * carriage-return, newline, and form-feed.
+ *
+ * In practice, this includes almost every single-byte encoding as well as
+ * UTF-8. Notably, however, it does not include UTF-16. If providing input
+ * that's incompatible, then convert the encoding beforehand.
+ *
+ * @since 6.2.0
+ * @since 6.2.1 Fix: Support for various invalid comments; attribute updates are case-insensitive.
+ * @since 6.3.2 Fix: Skip HTML-like content inside rawtext elements such as STYLE.
+ * @since 6.5.0 Pauses processor when input ends in an incomplete syntax token.
+ *              Introduces "special" elements which act like void elements, e.g. TITLE, STYLE.
+ *              Allows scanning through all tokens and processing modifiable text, where applicable.
+ */
+class Gutenberg_HTML_Tag_Processor_6_7 {
+	/**
+	 * The maximum number of bookmarks allowed to exist at
+	 * any given time.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 *
+	 * @see WP_HTML_Tag_Processor::set_bookmark()
+	 */
+	const MAX_BOOKMARKS = 10;
+
+	/**
+	 * Maximum number of times seek() can be called.
+	 * Prevents accidental infinite loops.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 *
+	 * @see WP_HTML_Tag_Processor::seek()
+	 */
+	const MAX_SEEK_OPS = 1000;
+
+	/**
+	 * The HTML document to parse.
+	 *
+	 * @since 6.2.0
+	 * @var string
+	 */
+	protected $html;
+
+	/**
+	 * The last query passed to next_tag().
+	 *
+	 * @since 6.2.0
+	 * @var array|null
+	 */
+	private $last_query;
+
+	/**
+	 * The tag name this processor currently scans for.
+	 *
+	 * @since 6.2.0
+	 * @var string|null
+	 */
+	private $sought_tag_name;
+
+	/**
+	 * The CSS class name this processor currently scans for.
+	 *
+	 * @since 6.2.0
+	 * @var string|null
+	 */
+	private $sought_class_name;
+
+	/**
+	 * The match offset this processor currently scans for.
+	 *
+	 * @since 6.2.0
+	 * @var int|null
+	 */
+	private $sought_match_offset;
+
+	/**
+	 * Whether to visit tag closers, e.g. </div>, when walking an input document.
+	 *
+	 * @since 6.2.0
+	 * @var bool
+	 */
+	private $stop_on_tag_closers;
+
+	/**
+	 * Specifies mode of operation of the parser at any given time.
+	 *
+	 * | State           | Meaning                                                              |
+	 * | ----------------|----------------------------------------------------------------------|
+	 * | *Ready*         | The parser is ready to run.                                          |
+	 * | *Complete*      | There is nothing left to parse.                                      |
+	 * | *Incomplete*    | The HTML ended in the middle of a token; nothing more can be parsed. |
+	 * | *Matched tag*   | Found an HTML tag; it's possible to modify its attributes.           |
+	 * | *Text node*     | Found a #text node; this is plaintext and modifiable.                |
+	 * | *CDATA node*    | Found a CDATA section; this is modifiable.                           |
+	 * | *Comment*       | Found a comment or bogus comment; this is modifiable.                |
+	 * | *Presumptuous*  | Found an empty tag closer: `</>`.                                    |
+	 * | *Funky comment* | Found a tag closer with an invalid tag name; this is modifiable.     |
+	 *
+	 * @since 6.5.0
+	 *
+	 * @see WP_HTML_Tag_Processor::STATE_READY
+	 * @see WP_HTML_Tag_Processor::STATE_COMPLETE
+	 * @see WP_HTML_Tag_Processor::STATE_INCOMPLETE_INPUT
+	 * @see WP_HTML_Tag_Processor::STATE_MATCHED_TAG
+	 * @see WP_HTML_Tag_Processor::STATE_TEXT_NODE
+	 * @see WP_HTML_Tag_Processor::STATE_CDATA_NODE
+	 * @see WP_HTML_Tag_Processor::STATE_COMMENT
+	 * @see WP_HTML_Tag_Processor::STATE_DOCTYPE
+	 * @see WP_HTML_Tag_Processor::STATE_PRESUMPTUOUS_TAG
+	 * @see WP_HTML_Tag_Processor::STATE_FUNKY_COMMENT
+	 *
+	 * @var string
+	 */
+	protected $parser_state = self::STATE_READY;
+
+	/**
+	 * What kind of syntax token became an HTML comment.
+	 *
+	 * Since there are many ways in which HTML syntax can create an HTML comment,
+	 * this indicates which of those caused it. This allows the Tag Processor to
+	 * represent more from the original input document than would appear in the DOM.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string|null
+	 */
+	protected $comment_type = null;
+
+	/**
+	 * How many bytes from the original HTML document have been read and parsed.
+	 *
+	 * This value points to the latest byte offset in the input document which
+	 * has been already parsed. It is the internal cursor for the Tag Processor
+	 * and updates while scanning through the HTML tokens.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	private $bytes_already_parsed = 0;
+
+	/**
+	 * Byte offset in input document where current token starts.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     01234
+	 *     - token starts at 0
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var int|null
+	 */
+	private $token_starts_at;
+
+	/**
+	 * Byte length of current token.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     012345678901234
+	 *     - token length is 14 - 0 = 14
+	 *
+	 *     a <!-- comment --> is a token.
+	 *     0123456789 123456789 123456789
+	 *     - token length is 17 - 2 = 15
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var int|null
+	 */
+	private $token_length;
+
+	/**
+	 * Byte offset in input document where current tag name starts.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     01234
+	 *      - tag name starts at 1
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var int|null
+	 */
+	private $tag_name_starts_at;
+
+	/**
+	 * Byte length of current tag name.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     01234
+	 *      --- tag name length is 3
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var int|null
+	 */
+	private $tag_name_length;
+
+	/**
+	 * Byte offset into input document where current modifiable text starts.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var int
+	 */
+	private $text_starts_at;
+
+	/**
+	 * Byte length of modifiable text.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string
+	 */
+	private $text_length;
+
+	/**
+	 * Whether the current tag is an opening tag, e.g. <div>, or a closing tag, e.g. </div>.
+	 *
+	 * @var bool
+	 */
+	private $is_closing_tag;
+
+	/**
+	 * Lazily-built index of attributes found within an HTML tag, keyed by the attribute name.
+	 *
+	 * Example:
+	 *
+	 *     // Supposing the parser is working through this content
+	 *     // and stops after recognizing the `id` attribute.
+	 *     // <div id="test-4" class=outline title="data:text/plain;base64=asdk3nk1j3fo8">
+	 *     //                 ^ parsing will continue from this point.
+	 *     $this->attributes = array(
+	 *         'id' => new WP_HTML_Attribute_Token( 'id', 9, 6, 5, 11, false )
+	 *     );
+	 *
+	 *     // When picking up parsing again, or when asking to find the
+	 *     // `class` attribute we will continue and add to this array.
+	 *     $this->attributes = array(
+	 *         'id'    => new WP_HTML_Attribute_Token( 'id', 9, 6, 5, 11, false ),
+	 *         'class' => new WP_HTML_Attribute_Token( 'class', 23, 7, 17, 13, false )
+	 *     );
+	 *
+	 *     // Note that only the `class` attribute value is stored in the index.
+	 *     // That's because it is the only value used by this class at the moment.
+	 *
+	 * @since 6.2.0
+	 * @var WP_HTML_Attribute_Token[]
+	 */
+	private $attributes = array();
+
+	/**
+	 * Tracks spans of duplicate attributes on a given tag, used for removing
+	 * all copies of an attribute when calling `remove_attribute()`.
+	 *
+	 * @since 6.3.2
+	 *
+	 * @var (WP_HTML_Span[])[]|null
+	 */
+	private $duplicate_attributes = null;
+
+	/**
+	 * Which class names to add or remove from a tag.
+	 *
+	 * These are tracked separately from attribute updates because they are
+	 * semantically distinct, whereas this interface exists for the common
+	 * case of adding and removing class names while other attributes are
+	 * generally modified as with DOM `setAttribute` calls.
+	 *
+	 * When modifying an HTML document these will eventually be collapsed
+	 * into a single `set_attribute( 'class', $changes )` call.
+	 *
+	 * Example:
+	 *
+	 *     // Add the `wp-block-group` class, remove the `wp-group` class.
+	 *     $classname_updates = array(
+	 *         // Indexed by a comparable class name.
+	 *         'wp-block-group' => WP_HTML_Tag_Processor::ADD_CLASS,
+	 *         'wp-group'       => WP_HTML_Tag_Processor::REMOVE_CLASS
+	 *     );
+	 *
+	 * @since 6.2.0
+	 * @var bool[]
+	 */
+	private $classname_updates = array();
+
+	/**
+	 * Tracks a semantic location in the original HTML which
+	 * shifts with updates as they are applied to the document.
+	 *
+	 * @since 6.2.0
+	 * @var WP_HTML_Span[]
+	 */
+	protected $bookmarks = array();
+
+	const ADD_CLASS    = true;
+	const REMOVE_CLASS = false;
+	const SKIP_CLASS   = null;
+
+	/**
+	 * Lexical replacements to apply to input HTML document.
+	 *
+	 * "Lexical" in this class refers to the part of this class which
+	 * operates on pure text _as text_ and not as HTML. There's a line
+	 * between the public interface, with HTML-semantic methods like
+	 * `set_attribute` and `add_class`, and an internal state that tracks
+	 * text offsets in the input document.
+	 *
+	 * When higher-level HTML methods are called, those have to transform their
+	 * operations (such as setting an attribute's value) into text diffing
+	 * operations (such as replacing the sub-string from indices A to B with
+	 * some given new string). These text-diffing operations are the lexical
+	 * updates.
+	 *
+	 * As new higher-level methods are added they need to collapse their
+	 * operations into these lower-level lexical updates since that's the
+	 * Tag Processor's internal language of change. Any code which creates
+	 * these lexical updates must ensure that they do not cross HTML syntax
+	 * boundaries, however, so these should never be exposed outside of this
+	 * class or any classes which intentionally expand its functionality.
+	 *
+	 * These are enqueued while editing the document instead of being immediately
+	 * applied to avoid processing overhead, string allocations, and string
+	 * copies when applying many updates to a single document.
+	 *
+	 * Example:
+	 *
+	 *     // Replace an attribute stored with a new value, indices
+	 *     // sourced from the lazily-parsed HTML recognizer.
+	 *     $start  = $attributes['src']->start;
+	 *     $length = $attributes['src']->length;
+	 *     $modifications[] = new WP_HTML_Text_Replacement( $start, $length, $new_value );
+	 *
+	 *     // Correspondingly, something like this will appear in this array.
+	 *     $lexical_updates = array(
+	 *         WP_HTML_Text_Replacement( 14, 28, 'https://my-site.my-domain/wp-content/uploads/2014/08/kittens.jpg' )
+	 *     );
+	 *
+	 * @since 6.2.0
+	 * @var WP_HTML_Text_Replacement[]
+	 */
+	protected $lexical_updates = array();
+
+	/**
+	 * Tracks and limits `seek()` calls to prevent accidental infinite loops.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 *
+	 * @see WP_HTML_Tag_Processor::seek()
+	 */
+	protected $seek_count = 0;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $html HTML to process.
+	 */
+	public function __construct( $html ) {
+		$this->html = $html;
+	}
+
+	/**
+	 * Finds the next tag matching the $query.
+	 *
+	 * @since 6.2.0
+	 * @since 6.5.0 No longer processes incomplete tokens at end of document; pauses the processor at start of token.
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this whole class name to match.
+	 *     @type string|null $tag_closers  "visit" or "skip": whether to stop on tag closers, e.g. </div>.
+	 * }
+	 * @return bool Whether a tag was matched.
+	 */
+	public function next_tag( $query = null ): bool {
+		$this->parse_query( $query );
+		$already_found = 0;
+
+		do {
+			if ( false === $this->next_token() ) {
+				return false;
+			}
+
+			if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+				continue;
+			}
+
+			if ( $this->matches() ) {
+				++$already_found;
+			}
+		} while ( $already_found < $this->sought_match_offset );
+
+		return true;
+	}
+
+	/**
+	 * Finds the next token in the HTML document.
+	 *
+	 * An HTML document can be viewed as a stream of tokens,
+	 * where tokens are things like HTML tags, HTML comments,
+	 * text nodes, etc. This method finds the next token in
+	 * the HTML document and returns whether it found one.
+	 *
+	 * If it starts parsing a token and reaches the end of the
+	 * document then it will seek to the start of the last
+	 * token and pause, returning `false` to indicate that it
+	 * failed to find a complete token.
+	 *
+	 * Possible token types, based on the HTML specification:
+	 *
+	 *  - an HTML tag, whether opening, closing, or void.
+	 *  - a text node - the plaintext inside tags.
+	 *  - an HTML comment.
+	 *  - a DOCTYPE declaration.
+	 *  - a processing instruction, e.g. `<?xml version="1.0" ?>`.
+	 *
+	 * The Tag Processor currently only supports the tag token.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return bool Whether a token was parsed.
+	 */
+	public function next_token(): bool {
+		return $this->base_class_next_token();
+	}
+
+	/**
+	 * Internal method which finds the next token in the HTML document.
+	 *
+	 * This method is a protected internal function which implements the logic for
+	 * finding the next token in a document. It exists so that the parser can update
+	 * its state without affecting the location of the cursor in the document and
+	 * without triggering subclass methods for things like `next_token()`, e.g. when
+	 * applying patches before searching for the next token.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 *
+	 * @return bool Whether a token was parsed.
+	 */
+	private function base_class_next_token(): bool {
+		$was_at = $this->bytes_already_parsed;
+		$this->after_tag();
+
+		// Don't proceed if there's nothing more to scan.
+		if (
+			self::STATE_COMPLETE === $this->parser_state ||
+			self::STATE_INCOMPLETE_INPUT === $this->parser_state
+		) {
+			return false;
+		}
+
+		/*
+		 * The next step in the parsing loop determines the parsing state;
+		 * clear it so that state doesn't linger from the previous step.
+		 */
+		$this->parser_state = self::STATE_READY;
+
+		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_COMPLETE;
+			return false;
+		}
+
+		// Find the next tag if it exists.
+		if ( false === $this->parse_next_tag() ) {
+			if ( self::STATE_INCOMPLETE_INPUT === $this->parser_state ) {
+				$this->bytes_already_parsed = $was_at;
+			}
+
+			return false;
+		}
+
+		/*
+		 * For legacy reasons the rest of this function handles tags and their
+		 * attributes. If the processor has reached the end of the document
+		 * or if it matched any other token then it should return here to avoid
+		 * attempting to process tag-specific syntax.
+		 */
+		if (
+			self::STATE_INCOMPLETE_INPUT !== $this->parser_state &&
+			self::STATE_COMPLETE !== $this->parser_state &&
+			self::STATE_MATCHED_TAG !== $this->parser_state
+		) {
+			return true;
+		}
+
+		// Parse all of its attributes.
+		while ( $this->parse_next_attribute() ) {
+			continue;
+		}
+
+		// Ensure that the tag closes before the end of the document.
+		if (
+			self::STATE_INCOMPLETE_INPUT === $this->parser_state ||
+			$this->bytes_already_parsed >= strlen( $this->html )
+		) {
+			// Does this appropriately clear state (parsed attributes)?
+			$this->parser_state         = self::STATE_INCOMPLETE_INPUT;
+			$this->bytes_already_parsed = $was_at;
+
+			return false;
+		}
+
+		$tag_ends_at = strpos( $this->html, '>', $this->bytes_already_parsed );
+		if ( false === $tag_ends_at ) {
+			$this->parser_state         = self::STATE_INCOMPLETE_INPUT;
+			$this->bytes_already_parsed = $was_at;
+
+			return false;
+		}
+		$this->parser_state         = self::STATE_MATCHED_TAG;
+		$this->bytes_already_parsed = $tag_ends_at + 1;
+		$this->token_length         = $this->bytes_already_parsed - $this->token_starts_at;
+
+		/*
+		 * For non-DATA sections which might contain text that looks like HTML tags but
+		 * isn't, scan with the appropriate alternative mode. Looking at the first letter
+		 * of the tag name as a pre-check avoids a string allocation when it's not needed.
+		 */
+		$t = $this->html[ $this->tag_name_starts_at ];
+		if (
+			$this->is_closing_tag ||
+			! (
+				'i' === $t || 'I' === $t ||
+				'n' === $t || 'N' === $t ||
+				's' === $t || 'S' === $t ||
+				't' === $t || 'T' === $t ||
+				'x' === $t || 'X' === $t
+			)
+		) {
+			return true;
+		}
+
+		$tag_name = $this->get_tag();
+
+		/*
+		 * Preserve the opening tag pointers, as these will be overwritten
+		 * when finding the closing tag. They will be reset after finding
+		 * the closing to tag to point to the opening of the special atomic
+		 * tag sequence.
+		 */
+		$tag_name_starts_at   = $this->tag_name_starts_at;
+		$tag_name_length      = $this->tag_name_length;
+		$tag_ends_at          = $this->token_starts_at + $this->token_length;
+		$attributes           = $this->attributes;
+		$duplicate_attributes = $this->duplicate_attributes;
+
+		// Find the closing tag if necessary.
+		$found_closer = false;
+		switch ( $tag_name ) {
+			case 'SCRIPT':
+				$found_closer = $this->skip_script_data();
+				break;
+
+			case 'TEXTAREA':
+			case 'TITLE':
+				$found_closer = $this->skip_rcdata( $tag_name );
+				break;
+
+			/*
+			 * In the browser this list would include the NOSCRIPT element,
+			 * but the Tag Processor is an environment with the scripting
+			 * flag disabled, meaning that it needs to descend into the
+			 * NOSCRIPT element to be able to properly process what will be
+			 * sent to a browser.
+			 *
+			 * Note that this rule makes HTML5 syntax incompatible with XML,
+			 * because the parsing of this token depends on client application.
+			 * The NOSCRIPT element cannot be represented in the XHTML syntax.
+			 */
+			case 'IFRAME':
+			case 'NOEMBED':
+			case 'NOFRAMES':
+			case 'STYLE':
+			case 'XMP':
+				$found_closer = $this->skip_rawtext( $tag_name );
+				break;
+
+			// No other tags should be treated in their entirety here.
+			default:
+				return true;
+		}
+
+		if ( ! $found_closer ) {
+			$this->parser_state         = self::STATE_INCOMPLETE_INPUT;
+			$this->bytes_already_parsed = $was_at;
+			return false;
+		}
+
+		/*
+		 * The values here look like they reference the opening tag but they reference
+		 * the closing tag instead. This is why the opening tag values were stored
+		 * above in a variable. It reads confusingly here, but that's because the
+		 * functions that skip the contents have moved all the internal cursors past
+		 * the inner content of the tag.
+		 */
+		$this->token_starts_at      = $was_at;
+		$this->token_length         = $this->bytes_already_parsed - $this->token_starts_at;
+		$this->text_starts_at       = $tag_ends_at;
+		$this->text_length          = $this->tag_name_starts_at - $this->text_starts_at;
+		$this->tag_name_starts_at   = $tag_name_starts_at;
+		$this->tag_name_length      = $tag_name_length;
+		$this->attributes           = $attributes;
+		$this->duplicate_attributes = $duplicate_attributes;
+
+		return true;
+	}
+
+	/**
+	 * Whether the processor paused because the input HTML document ended
+	 * in the middle of a syntax element, such as in the middle of a tag.
+	 *
+	 * Example:
+	 *
+	 *     $processor = new WP_HTML_Tag_Processor( '<input type="text" value="Th' );
+	 *     false      === $processor->get_next_tag();
+	 *     true       === $processor->paused_at_incomplete_token();
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return bool Whether the parse paused at the start of an incomplete token.
+	 */
+	public function paused_at_incomplete_token(): bool {
+		return self::STATE_INCOMPLETE_INPUT === $this->parser_state;
+	}
+
+	/**
+	 * Generator for a foreach loop to step through each class name for the matched tag.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( "<div class='free &lt;egg&lt;\tlang-en'>" );
+	 *     $p->next_tag();
+	 *     foreach ( $p->class_list() as $class_name ) {
+	 *         echo "{$class_name} ";
+	 *     }
+	 *     // Outputs: "free <egg> lang-en "
+	 *
+	 * @since 6.4.0
+	 */
+	public function class_list() {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return;
+		}
+
+		/** @var string $class contains the string value of the class attribute, with character references decoded. */
+		$class = $this->get_attribute( 'class' );
+
+		if ( ! is_string( $class ) ) {
+			return;
+		}
+
+		$seen = array();
+
+		$at = 0;
+		while ( $at < strlen( $class ) ) {
+			// Skip past any initial boundary characters.
+			$at += strspn( $class, " \t\f\r\n", $at );
+			if ( $at >= strlen( $class ) ) {
+				return;
+			}
+
+			// Find the byte length until the next boundary.
+			$length = strcspn( $class, " \t\f\r\n", $at );
+			if ( 0 === $length ) {
+				return;
+			}
+
+			/*
+			 * CSS class names are case-insensitive in the ASCII range.
+			 *
+			 * @see https://www.w3.org/TR/CSS2/syndata.html#x1
+			 */
+			$name = strtolower( substr( $class, $at, $length ) );
+			$at  += $length;
+
+			/*
+			 * It's expected that the number of class names for a given tag is relatively small.
+			 * Given this, it is probably faster overall to scan an array for a value rather
+			 * than to use the class name as a key and check if it's a key of $seen.
+			 */
+			if ( in_array( $name, $seen, true ) ) {
+				continue;
+			}
+
+			$seen[] = $name;
+			yield $name;
+		}
+	}
+
+
+	/**
+	 * Returns if a matched tag contains the given ASCII case-insensitive class name.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $wanted_class Look for this CSS class name, ASCII case-insensitive.
+	 * @return bool|null Whether the matched tag contains the given class name, or null if not matched.
+	 */
+	public function has_class( $wanted_class ): ?bool {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return null;
+		}
+
+		$wanted_class = strtolower( $wanted_class );
+
+		foreach ( $this->class_list() as $class_name ) {
+			if ( $class_name === $wanted_class ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Sets a bookmark in the HTML document.
+	 *
+	 * Bookmarks represent specific places or tokens in the HTML
+	 * document, such as a tag opener or closer. When applying
+	 * edits to a document, such as setting an attribute, the
+	 * text offsets of that token may shift; the bookmark is
+	 * kept updated with those shifts and remains stable unless
+	 * the entire span of text in which the token sits is removed.
+	 *
+	 * Release bookmarks when they are no longer needed.
+	 *
+	 * Example:
+	 *
+	 *     <main><h2>Surprising fact you may not know!</h2></main>
+	 *           ^  ^
+	 *            \-|-- this `H2` opener bookmark tracks the token
+	 *
+	 *     <main class="clickbait"><h2>Surprising fact you may no…
+	 *                             ^  ^
+	 *                              \-|-- it shifts with edits
+	 *
+	 * Bookmarks provide the ability to seek to a previously-scanned
+	 * place in the HTML document. This avoids the need to re-scan
+	 * the entire document.
+	 *
+	 * Example:
+	 *
+	 *     <ul><li>One</li><li>Two</li><li>Three</li></ul>
+	 *                                 ^^^^
+	 *                                 want to note this last item
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( $html );
+	 *     $in_list = false;
+	 *     while ( $p->next_tag( array( 'tag_closers' => $in_list ? 'visit' : 'skip' ) ) ) {
+	 *         if ( 'UL' === $p->get_tag() ) {
+	 *             if ( $p->is_tag_closer() ) {
+	 *                 $in_list = false;
+	 *                 $p->set_bookmark( 'resume' );
+	 *                 if ( $p->seek( 'last-li' ) ) {
+	 *                     $p->add_class( 'last-li' );
+	 *                 }
+	 *                 $p->seek( 'resume' );
+	 *                 $p->release_bookmark( 'last-li' );
+	 *                 $p->release_bookmark( 'resume' );
+	 *             } else {
+	 *                 $in_list = true;
+	 *             }
+	 *         }
+	 *
+	 *         if ( 'LI' === $p->get_tag() ) {
+	 *             $p->set_bookmark( 'last-li' );
+	 *         }
+	 *     }
+	 *
+	 * Bookmarks intentionally hide the internal string offsets
+	 * to which they refer. They are maintained internally as
+	 * updates are applied to the HTML document and therefore
+	 * retain their "position" - the location to which they
+	 * originally pointed. The inability to use bookmarks with
+	 * functions like `substr` is therefore intentional to guard
+	 * against accidentally breaking the HTML.
+	 *
+	 * Because bookmarks allocate memory and require processing
+	 * for every applied update, they are limited and require
+	 * a name. They should not be created with programmatically-made
+	 * names, such as "li_{$index}" with some loop. As a general
+	 * rule they should only be created with string-literal names
+	 * like "start-of-section" or "last-paragraph".
+	 *
+	 * Bookmarks are a powerful tool to enable complicated behavior.
+	 * Consider double-checking that you need this tool if you are
+	 * reaching for it, as inappropriate use could lead to broken
+	 * HTML structure or unwanted processing overhead.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name Identifies this particular bookmark.
+	 * @return bool Whether the bookmark was successfully created.
+	 */
+	public function set_bookmark( $name ): bool {
+		// It only makes sense to set a bookmark if the parser has paused on a concrete token.
+		if (
+			self::STATE_COMPLETE === $this->parser_state ||
+			self::STATE_INCOMPLETE_INPUT === $this->parser_state
+		) {
+			return false;
+		}
+
+		if ( ! array_key_exists( $name, $this->bookmarks ) && count( $this->bookmarks ) >= static::MAX_BOOKMARKS ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Too many bookmarks: cannot create any more.' ),
+				'6.2.0'
+			);
+			return false;
+		}
+
+		$this->bookmarks[ $name ] = new Gutenberg_HTML_Span_6_7( $this->token_starts_at, $this->token_length );
+
+		return true;
+	}
+
+
+	/**
+	 * Removes a bookmark that is no longer needed.
+	 *
+	 * Releasing a bookmark frees up the small
+	 * performance overhead it requires.
+	 *
+	 * @param string $name Name of the bookmark to remove.
+	 * @return bool Whether the bookmark already existed before removal.
+	 */
+	public function release_bookmark( $name ): bool {
+		if ( ! array_key_exists( $name, $this->bookmarks ) ) {
+			return false;
+		}
+
+		unset( $this->bookmarks[ $name ] );
+
+		return true;
+	}
+
+	/**
+	 * Skips contents of generic rawtext elements.
+	 *
+	 * @since 6.3.2
+	 *
+	 * @see https://html.spec.whatwg.org/#generic-raw-text-element-parsing-algorithm
+	 *
+	 * @param string $tag_name The uppercase tag name which will close the RAWTEXT region.
+	 * @return bool Whether an end to the RAWTEXT region was found before the end of the document.
+	 */
+	private function skip_rawtext( string $tag_name ): bool {
+		/*
+		 * These two functions distinguish themselves on whether character references are
+		 * decoded, and since functionality to read the inner markup isn't supported, it's
+		 * not necessary to implement these two functions separately.
+		 */
+		return $this->skip_rcdata( $tag_name );
+	}
+
+	/**
+	 * Skips contents of RCDATA elements, namely title and textarea tags.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/parsing.html#rcdata-state
+	 *
+	 * @param string $tag_name The uppercase tag name which will close the RCDATA region.
+	 * @return bool Whether an end to the RCDATA region was found before the end of the document.
+	 */
+	private function skip_rcdata( string $tag_name ): bool {
+		$html       = $this->html;
+		$doc_length = strlen( $html );
+		$tag_length = strlen( $tag_name );
+
+		$at = $this->bytes_already_parsed;
+
+		while ( false !== $at && $at < $doc_length ) {
+			$at                       = strpos( $this->html, '</', $at );
+			$this->tag_name_starts_at = $at;
+
+			// Fail if there is no possible tag closer.
+			if ( false === $at || ( $at + $tag_length ) >= $doc_length ) {
+				return false;
+			}
+
+			$at += 2;
+
+			/*
+			 * Find a case-insensitive match to the tag name.
+			 *
+			 * Because tag names are limited to US-ASCII there is no
+			 * need to perform any kind of Unicode normalization when
+			 * comparing; any character which could be impacted by such
+			 * normalization could not be part of a tag name.
+			 */
+			for ( $i = 0; $i < $tag_length; $i++ ) {
+				$tag_char  = $tag_name[ $i ];
+				$html_char = $html[ $at + $i ];
+
+				if ( $html_char !== $tag_char && strtoupper( $html_char ) !== $tag_char ) {
+					$at += $i;
+					continue 2;
+				}
+			}
+
+			$at                        += $tag_length;
+			$this->bytes_already_parsed = $at;
+
+			if ( $at >= strlen( $html ) ) {
+				return false;
+			}
+
+			/*
+			 * Ensure that the tag name terminates to avoid matching on
+			 * substrings of a longer tag name. For example, the sequence
+			 * "</textarearug" should not match for "</textarea" even
+			 * though "textarea" is found within the text.
+			 */
+			$c = $html[ $at ];
+			if ( ' ' !== $c && "\t" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
+				continue;
+			}
+
+			while ( $this->parse_next_attribute() ) {
+				continue;
+			}
+
+			$at = $this->bytes_already_parsed;
+			if ( $at >= strlen( $this->html ) ) {
+				return false;
+			}
+
+			if ( '>' === $html[ $at ] ) {
+				$this->bytes_already_parsed = $at + 1;
+				return true;
+			}
+
+			if ( $at + 1 >= strlen( $this->html ) ) {
+				return false;
+			}
+
+			if ( '/' === $html[ $at ] && '>' === $html[ $at + 1 ] ) {
+				$this->bytes_already_parsed = $at + 2;
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Skips contents of script tags.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether the script tag was closed before the end of the document.
+	 */
+	private function skip_script_data(): bool {
+		$state      = 'unescaped';
+		$html       = $this->html;
+		$doc_length = strlen( $html );
+		$at         = $this->bytes_already_parsed;
+
+		while ( false !== $at && $at < $doc_length ) {
+			$at += strcspn( $html, '-<', $at );
+
+			/*
+			 * For all script states a "-->"  transitions
+			 * back into the normal unescaped script mode,
+			 * even if that's the current state.
+			 */
+			if (
+				$at + 2 < $doc_length &&
+				'-' === $html[ $at ] &&
+				'-' === $html[ $at + 1 ] &&
+				'>' === $html[ $at + 2 ]
+			) {
+				$at   += 3;
+				$state = 'unescaped';
+				continue;
+			}
+
+			// Everything of interest past here starts with "<".
+			if ( $at + 1 >= $doc_length || '<' !== $html[ $at++ ] ) {
+				continue;
+			}
+
+			/*
+			 * Unlike with "-->", the "<!--" only transitions
+			 * into the escaped mode if not already there.
+			 *
+			 * Inside the escaped modes it will be ignored; and
+			 * should never break out of the double-escaped
+			 * mode and back into the escaped mode.
+			 *
+			 * While this requires a mode change, it does not
+			 * impact the parsing otherwise, so continue
+			 * parsing after updating the state.
+			 */
+			if (
+				$at + 2 < $doc_length &&
+				'!' === $html[ $at ] &&
+				'-' === $html[ $at + 1 ] &&
+				'-' === $html[ $at + 2 ]
+			) {
+				$at   += 3;
+				$state = 'unescaped' === $state ? 'escaped' : $state;
+				continue;
+			}
+
+			if ( '/' === $html[ $at ] ) {
+				$closer_potentially_starts_at = $at - 1;
+				$is_closing                   = true;
+				++$at;
+			} else {
+				$is_closing = false;
+			}
+
+			/*
+			 * At this point the only remaining state-changes occur with the
+			 * <script> and </script> tags; unless one of these appears next,
+			 * proceed scanning to the next potential token in the text.
+			 */
+			if ( ! (
+				$at + 6 < $doc_length &&
+				( 's' === $html[ $at ] || 'S' === $html[ $at ] ) &&
+				( 'c' === $html[ $at + 1 ] || 'C' === $html[ $at + 1 ] ) &&
+				( 'r' === $html[ $at + 2 ] || 'R' === $html[ $at + 2 ] ) &&
+				( 'i' === $html[ $at + 3 ] || 'I' === $html[ $at + 3 ] ) &&
+				( 'p' === $html[ $at + 4 ] || 'P' === $html[ $at + 4 ] ) &&
+				( 't' === $html[ $at + 5 ] || 'T' === $html[ $at + 5 ] )
+			) ) {
+				++$at;
+				continue;
+			}
+
+			/*
+			 * Ensure that the script tag terminates to avoid matching on
+			 * substrings of a non-match. For example, the sequence
+			 * "<script123" should not end a script region even though
+			 * "<script" is found within the text.
+			 */
+			if ( $at + 6 >= $doc_length ) {
+				continue;
+			}
+			$at += 6;
+			$c   = $html[ $at ];
+			if ( ' ' !== $c && "\t" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
+				++$at;
+				continue;
+			}
+
+			if ( 'escaped' === $state && ! $is_closing ) {
+				$state = 'double-escaped';
+				continue;
+			}
+
+			if ( 'double-escaped' === $state && $is_closing ) {
+				$state = 'escaped';
+				continue;
+			}
+
+			if ( $is_closing ) {
+				$this->bytes_already_parsed = $closer_potentially_starts_at;
+				$this->tag_name_starts_at   = $closer_potentially_starts_at;
+				if ( $this->bytes_already_parsed >= $doc_length ) {
+					return false;
+				}
+
+				while ( $this->parse_next_attribute() ) {
+					continue;
+				}
+
+				if ( $this->bytes_already_parsed >= $doc_length ) {
+					$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+					return false;
+				}
+
+				if ( '>' === $html[ $this->bytes_already_parsed ] ) {
+					++$this->bytes_already_parsed;
+					return true;
+				}
+			}
+
+			++$at;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parses the next tag.
+	 *
+	 * This will find and start parsing the next tag, including
+	 * the opening `<`, the potential closer `/`, and the tag
+	 * name. It does not parse the attributes or scan to the
+	 * closing `>`; these are left for other methods.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Support abruptly-closed comments, invalid-tag-closer-comments, and empty elements.
+	 *
+	 * @return bool Whether a tag was found before the end of the document.
+	 */
+	private function parse_next_tag(): bool {
+		$this->after_tag();
+
+		$html       = $this->html;
+		$doc_length = strlen( $html );
+		$was_at     = $this->bytes_already_parsed;
+		$at         = $was_at;
+
+		while ( $at < $doc_length ) {
+			$at = strpos( $html, '<', $at );
+			if ( false === $at ) {
+				break;
+			}
+
+			if ( $at > $was_at ) {
+				/*
+				 * A "<" normally starts a new HTML tag or syntax token, but in cases where the
+				 * following character can't produce a valid token, the "<" is instead treated
+				 * as plaintext and the parser should skip over it. This avoids a problem when
+				 * following earlier practices of typing emoji with text, e.g. "<3". This
+				 * should be a heart, not a tag. It's supposed to be rendered, not hidden.
+				 *
+				 * At this point the parser checks if this is one of those cases and if it is
+				 * will continue searching for the next "<" in search of a token boundary.
+				 *
+				 * @see https://html.spec.whatwg.org/#tag-open-state
+				 */
+				if ( 1 !== strspn( $html, '!/?abcdefghijklmnopqrstuvwxyzABCEFGHIJKLMNOPQRSTUVWXYZ', $at + 1, 1 ) ) {
+					++$at;
+					continue;
+				}
+
+				$this->parser_state         = self::STATE_TEXT_NODE;
+				$this->token_starts_at      = $was_at;
+				$this->token_length         = $at - $was_at;
+				$this->text_starts_at       = $was_at;
+				$this->text_length          = $this->token_length;
+				$this->bytes_already_parsed = $at;
+				return true;
+			}
+
+			$this->token_starts_at = $at;
+
+			if ( $at + 1 < $doc_length && '/' === $this->html[ $at + 1 ] ) {
+				$this->is_closing_tag = true;
+				++$at;
+			} else {
+				$this->is_closing_tag = false;
+			}
+
+			/*
+			 * HTML tag names must start with [a-zA-Z] otherwise they are not tags.
+			 * For example, "<3" is rendered as text, not a tag opener. If at least
+			 * one letter follows the "<" then _it is_ a tag, but if the following
+			 * character is anything else it _is not a tag_.
+			 *
+			 * It's not uncommon to find non-tags starting with `<` in an HTML
+			 * document, so it's good for performance to make this pre-check before
+			 * continuing to attempt to parse a tag name.
+			 *
+			 * Reference:
+			 * * https://html.spec.whatwg.org/multipage/parsing.html#data-state
+			 * * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+			 */
+			$tag_name_prefix_length = strspn( $html, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', $at + 1 );
+			if ( $tag_name_prefix_length > 0 ) {
+				++$at;
+				$this->parser_state         = self::STATE_MATCHED_TAG;
+				$this->tag_name_starts_at   = $at;
+				$this->tag_name_length      = $tag_name_prefix_length + strcspn( $html, " \t\f\r\n/>", $at + $tag_name_prefix_length );
+				$this->bytes_already_parsed = $at + $this->tag_name_length;
+				return true;
+			}
+
+			/*
+			 * Abort if no tag is found before the end of
+			 * the document. There is nothing left to parse.
+			 */
+			if ( $at + 1 >= $doc_length ) {
+				$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+				return false;
+			}
+
+			/*
+			 * `<!` transitions to markup declaration open state
+			 * https://html.spec.whatwg.org/multipage/parsing.html#markup-declaration-open-state
+			 */
+			if ( ! $this->is_closing_tag && '!' === $html[ $at + 1 ] ) {
+				/*
+				 * `<!--` transitions to a comment state – apply further comment rules.
+				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+				 */
+				if ( 0 === substr_compare( $html, '--', $at + 2, 2 ) ) {
+					$closer_at = $at + 4;
+					// If it's not possible to close the comment then there is nothing more to scan.
+					if ( $doc_length <= $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+						return false;
+					}
+
+					// Abruptly-closed empty comments are a sequence of dashes followed by `>`.
+					$span_of_dashes = strspn( $html, '-', $closer_at );
+					if ( '>' === $html[ $closer_at + $span_of_dashes ] ) {
+						/*
+						 * @todo When implementing `set_modifiable_text()` ensure that updates to this token
+						 *       don't break the syntax for short comments, e.g. `<!--->`. Unlike other comment
+						 *       and bogus comment syntax, these leave no clear insertion point for text and
+						 *       they need to be modified specially in order to contain text. E.g. to store
+						 *       `?` as the modifiable text, the `<!--->` needs to become `<!--?-->`, which
+						 *       involves inserting an additional `-` into the token after the modifiable text.
+						 */
+						$this->parser_state = self::STATE_COMMENT;
+						$this->comment_type = self::COMMENT_AS_ABRUPTLY_CLOSED_COMMENT;
+						$this->token_length = $closer_at + $span_of_dashes + 1 - $this->token_starts_at;
+
+						// Only provide modifiable text if the token is long enough to contain it.
+						if ( $span_of_dashes >= 2 ) {
+							$this->comment_type   = self::COMMENT_AS_HTML_COMMENT;
+							$this->text_starts_at = $this->token_starts_at + 4;
+							$this->text_length    = $span_of_dashes - 2;
+						}
+
+						$this->bytes_already_parsed = $closer_at + $span_of_dashes + 1;
+						return true;
+					}
+
+					/*
+					 * Comments may be closed by either a --> or an invalid --!>.
+					 * The first occurrence closes the comment.
+					 *
+					 * See https://html.spec.whatwg.org/#parse-error-incorrectly-closed-comment
+					 */
+					--$closer_at; // Pre-increment inside condition below reduces risk of accidental infinite looping.
+					while ( ++$closer_at < $doc_length ) {
+						$closer_at = strpos( $html, '--', $closer_at );
+						if ( false === $closer_at ) {
+							$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+							return false;
+						}
+
+						if ( $closer_at + 2 < $doc_length && '>' === $html[ $closer_at + 2 ] ) {
+							$this->parser_state         = self::STATE_COMMENT;
+							$this->comment_type         = self::COMMENT_AS_HTML_COMMENT;
+							$this->token_length         = $closer_at + 3 - $this->token_starts_at;
+							$this->text_starts_at       = $this->token_starts_at + 4;
+							$this->text_length          = $closer_at - $this->text_starts_at;
+							$this->bytes_already_parsed = $closer_at + 3;
+							return true;
+						}
+
+						if (
+							$closer_at + 3 < $doc_length &&
+							'!' === $html[ $closer_at + 2 ] &&
+							'>' === $html[ $closer_at + 3 ]
+						) {
+							$this->parser_state         = self::STATE_COMMENT;
+							$this->comment_type         = self::COMMENT_AS_HTML_COMMENT;
+							$this->token_length         = $closer_at + 4 - $this->token_starts_at;
+							$this->text_starts_at       = $this->token_starts_at + 4;
+							$this->text_length          = $closer_at - $this->text_starts_at;
+							$this->bytes_already_parsed = $closer_at + 4;
+							return true;
+						}
+					}
+				}
+
+				/*
+				 * `<!DOCTYPE` transitions to DOCTYPE state – skip to the nearest >
+				 * These are ASCII-case-insensitive.
+				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+				 */
+				if (
+					$doc_length > $at + 8 &&
+					( 'D' === $html[ $at + 2 ] || 'd' === $html[ $at + 2 ] ) &&
+					( 'O' === $html[ $at + 3 ] || 'o' === $html[ $at + 3 ] ) &&
+					( 'C' === $html[ $at + 4 ] || 'c' === $html[ $at + 4 ] ) &&
+					( 'T' === $html[ $at + 5 ] || 't' === $html[ $at + 5 ] ) &&
+					( 'Y' === $html[ $at + 6 ] || 'y' === $html[ $at + 6 ] ) &&
+					( 'P' === $html[ $at + 7 ] || 'p' === $html[ $at + 7 ] ) &&
+					( 'E' === $html[ $at + 8 ] || 'e' === $html[ $at + 8 ] )
+				) {
+					$closer_at = strpos( $html, '>', $at + 9 );
+					if ( false === $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+						return false;
+					}
+
+					$this->parser_state         = self::STATE_DOCTYPE;
+					$this->token_length         = $closer_at + 1 - $this->token_starts_at;
+					$this->text_starts_at       = $this->token_starts_at + 9;
+					$this->text_length          = $closer_at - $this->text_starts_at;
+					$this->bytes_already_parsed = $closer_at + 1;
+					return true;
+				}
+
+				/*
+				 * Anything else here is an incorrectly-opened comment and transitions
+				 * to the bogus comment state - skip to the nearest >. If no closer is
+				 * found then the HTML was truncated inside the markup declaration.
+				 */
+				$closer_at = strpos( $html, '>', $at + 1 );
+				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+					return false;
+				}
+
+				$this->parser_state         = self::STATE_COMMENT;
+				$this->comment_type         = self::COMMENT_AS_INVALID_HTML;
+				$this->token_length         = $closer_at + 1 - $this->token_starts_at;
+				$this->text_starts_at       = $this->token_starts_at + 2;
+				$this->text_length          = $closer_at - $this->text_starts_at;
+				$this->bytes_already_parsed = $closer_at + 1;
+
+				/*
+				 * Identify nodes that would be CDATA if HTML had CDATA sections.
+				 *
+				 * This section must occur after identifying the bogus comment end
+				 * because in an HTML parser it will span to the nearest `>`, even
+				 * if there's no `]]>` as would be required in an XML document. It
+				 * is therefore not possible to parse a CDATA section containing
+				 * a `>` in the HTML syntax.
+				 *
+				 * Inside foreign elements there is a discrepancy between browsers
+				 * and the specification on this.
+				 *
+				 * @todo Track whether the Tag Processor is inside a foreign element
+				 *       and require the proper closing `]]>` in those cases.
+				 */
+				if (
+					$this->token_length >= 10 &&
+					'[' === $html[ $this->token_starts_at + 2 ] &&
+					'C' === $html[ $this->token_starts_at + 3 ] &&
+					'D' === $html[ $this->token_starts_at + 4 ] &&
+					'A' === $html[ $this->token_starts_at + 5 ] &&
+					'T' === $html[ $this->token_starts_at + 6 ] &&
+					'A' === $html[ $this->token_starts_at + 7 ] &&
+					'[' === $html[ $this->token_starts_at + 8 ] &&
+					']' === $html[ $closer_at - 1 ] &&
+					']' === $html[ $closer_at - 2 ]
+				) {
+					$this->parser_state    = self::STATE_COMMENT;
+					$this->comment_type    = self::COMMENT_AS_CDATA_LOOKALIKE;
+					$this->text_starts_at += 7;
+					$this->text_length    -= 9;
+				}
+
+				return true;
+			}
+
+			/*
+			 * </> is a missing end tag name, which is ignored.
+			 *
+			 * This was also known as the "presumptuous empty tag"
+			 * in early discussions as it was proposed to close
+			 * the nearest previous opening tag.
+			 *
+			 * See https://html.spec.whatwg.org/#parse-error-missing-end-tag-name
+			 */
+			if ( '>' === $html[ $at + 1 ] ) {
+				// `<>` is interpreted as plaintext.
+				if ( ! $this->is_closing_tag ) {
+					++$at;
+					continue;
+				}
+
+				$this->parser_state         = self::STATE_PRESUMPTUOUS_TAG;
+				$this->token_length         = $at + 2 - $this->token_starts_at;
+				$this->bytes_already_parsed = $at + 2;
+				return true;
+			}
+
+			/*
+			 * `<?` transitions to a bogus comment state – skip to the nearest >
+			 * See https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+			 */
+			if ( ! $this->is_closing_tag && '?' === $html[ $at + 1 ] ) {
+				$closer_at = strpos( $html, '>', $at + 2 );
+				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+					return false;
+				}
+
+				$this->parser_state         = self::STATE_COMMENT;
+				$this->comment_type         = self::COMMENT_AS_INVALID_HTML;
+				$this->token_length         = $closer_at + 1 - $this->token_starts_at;
+				$this->text_starts_at       = $this->token_starts_at + 2;
+				$this->text_length          = $closer_at - $this->text_starts_at;
+				$this->bytes_already_parsed = $closer_at + 1;
+
+				/*
+				 * Identify a Processing Instruction node were HTML to have them.
+				 *
+				 * This section must occur after identifying the bogus comment end
+				 * because in an HTML parser it will span to the nearest `>`, even
+				 * if there's no `?>` as would be required in an XML document. It
+				 * is therefore not possible to parse a Processing Instruction node
+				 * containing a `>` in the HTML syntax.
+				 *
+				 * XML allows for more target names, but this code only identifies
+				 * those with ASCII-representable target names. This means that it
+				 * may identify some Processing Instruction nodes as bogus comments,
+				 * but it will not misinterpret the HTML structure. By limiting the
+				 * identification to these target names the Tag Processor can avoid
+				 * the need to start parsing UTF-8 sequences.
+				 *
+				 * > NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] |
+				 *                     [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] |
+				 *                     [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] |
+				 *                     [#x10000-#xEFFFF]
+				 * > NameChar      ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
+				 *
+				 * @see https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-PITarget
+				 */
+				if ( $this->token_length >= 5 && '?' === $html[ $closer_at - 1 ] ) {
+					$comment_text     = substr( $html, $this->token_starts_at + 2, $this->token_length - 4 );
+					$pi_target_length = strspn( $comment_text, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ:_' );
+
+					if ( 0 < $pi_target_length ) {
+						$pi_target_length += strspn( $comment_text, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:_-.', $pi_target_length );
+
+						$this->comment_type       = self::COMMENT_AS_PI_NODE_LOOKALIKE;
+						$this->tag_name_starts_at = $this->token_starts_at + 2;
+						$this->tag_name_length    = $pi_target_length;
+						$this->text_starts_at    += $pi_target_length;
+						$this->text_length       -= $pi_target_length + 1;
+					}
+				}
+
+				return true;
+			}
+
+			/*
+			 * If a non-alpha starts the tag name in a tag closer it's a comment.
+			 * Find the first `>`, which closes the comment.
+			 *
+			 * This parser classifies these particular comments as special "funky comments"
+			 * which are made available for further processing.
+			 *
+			 * See https://html.spec.whatwg.org/#parse-error-invalid-first-character-of-tag-name
+			 */
+			if ( $this->is_closing_tag ) {
+				// No chance of finding a closer.
+				if ( $at + 3 > $doc_length ) {
+					return false;
+				}
+
+				$closer_at = strpos( $html, '>', $at + 2 );
+				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+					return false;
+				}
+
+				$this->parser_state         = self::STATE_FUNKY_COMMENT;
+				$this->token_length         = $closer_at + 1 - $this->token_starts_at;
+				$this->text_starts_at       = $this->token_starts_at + 2;
+				$this->text_length          = $closer_at - $this->text_starts_at;
+				$this->bytes_already_parsed = $closer_at + 1;
+				return true;
+			}
+
+			++$at;
+		}
+
+		/*
+		 * This does not imply an incomplete parse; it indicates that there
+		 * can be nothing left in the document other than a #text node.
+		 */
+		$this->parser_state         = self::STATE_TEXT_NODE;
+		$this->token_starts_at      = $was_at;
+		$this->token_length         = $doc_length - $was_at;
+		$this->text_starts_at       = $was_at;
+		$this->text_length          = $this->token_length;
+		$this->bytes_already_parsed = $doc_length;
+		return true;
+	}
+
+	/**
+	 * Parses the next attribute.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether an attribute was found before the end of the document.
+	 */
+	private function parse_next_attribute(): bool {
+		$doc_length = strlen( $this->html );
+
+		// Skip whitespace and slashes.
+		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n/", $this->bytes_already_parsed );
+		if ( $this->bytes_already_parsed >= $doc_length ) {
+			$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+			return false;
+		}
+
+		/*
+		 * Treat the equal sign as a part of the attribute
+		 * name if it is the first encountered byte.
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/parsing.html#before-attribute-name-state
+		 */
+		$name_length = '=' === $this->html[ $this->bytes_already_parsed ]
+			? 1 + strcspn( $this->html, "=/> \t\f\r\n", $this->bytes_already_parsed + 1 )
+			: strcspn( $this->html, "=/> \t\f\r\n", $this->bytes_already_parsed );
+
+		// No attribute, just tag closer.
+		if ( 0 === $name_length || $this->bytes_already_parsed + $name_length >= $doc_length ) {
+			return false;
+		}
+
+		$attribute_start             = $this->bytes_already_parsed;
+		$attribute_name              = substr( $this->html, $attribute_start, $name_length );
+		$this->bytes_already_parsed += $name_length;
+		if ( $this->bytes_already_parsed >= $doc_length ) {
+			$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+			return false;
+		}
+
+		$this->skip_whitespace();
+		if ( $this->bytes_already_parsed >= $doc_length ) {
+			$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+			return false;
+		}
+
+		$has_value = '=' === $this->html[ $this->bytes_already_parsed ];
+		if ( $has_value ) {
+			++$this->bytes_already_parsed;
+			$this->skip_whitespace();
+			if ( $this->bytes_already_parsed >= $doc_length ) {
+				$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+				return false;
+			}
+
+			switch ( $this->html[ $this->bytes_already_parsed ] ) {
+				case "'":
+				case '"':
+					$quote                      = $this->html[ $this->bytes_already_parsed ];
+					$value_start                = $this->bytes_already_parsed + 1;
+					$end_quote_at               = strpos( $this->html, $quote, $value_start );
+					$end_quote_at               = false === $end_quote_at ? $doc_length : $end_quote_at;
+					$value_length               = $end_quote_at - $value_start;
+					$attribute_end              = $end_quote_at + 1;
+					$this->bytes_already_parsed = $attribute_end;
+					break;
+
+				default:
+					$value_start                = $this->bytes_already_parsed;
+					$value_length               = strcspn( $this->html, "> \t\f\r\n", $value_start );
+					$attribute_end              = $value_start + $value_length;
+					$this->bytes_already_parsed = $attribute_end;
+			}
+		} else {
+			$value_start   = $this->bytes_already_parsed;
+			$value_length  = 0;
+			$attribute_end = $attribute_start + $name_length;
+		}
+
+		if ( $attribute_end >= $doc_length ) {
+			$this->parser_state = self::STATE_INCOMPLETE_INPUT;
+
+			return false;
+		}
+
+		if ( $this->is_closing_tag ) {
+			return true;
+		}
+
+		/*
+		 * > There must never be two or more attributes on
+		 * > the same start tag whose names are an ASCII
+		 * > case-insensitive match for each other.
+		 *     - HTML 5 spec
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+		 */
+		$comparable_name = strtolower( $attribute_name );
+
+		// If an attribute is listed many times, only use the first declaration and ignore the rest.
+		if ( ! isset( $this->attributes[ $comparable_name ] ) ) {
+			$this->attributes[ $comparable_name ] = new Gutenberg_HTML_Attribute_Token_6_7(
+				$attribute_name,
+				$value_start,
+				$value_length,
+				$attribute_start,
+				$attribute_end - $attribute_start,
+				! $has_value
+			);
+
+			return true;
+		}
+
+		/*
+		 * Track the duplicate attributes so if we remove it, all disappear together.
+		 *
+		 * While `$this->duplicated_attributes` could always be stored as an `array()`,
+		 * which would simplify the logic here, storing a `null` and only allocating
+		 * an array when encountering duplicates avoids needless allocations in the
+		 * normative case of parsing tags with no duplicate attributes.
+		 */
+		$duplicate_span = new Gutenberg_HTML_Span_6_7( $attribute_start, $attribute_end - $attribute_start );
+		if ( null === $this->duplicate_attributes ) {
+			$this->duplicate_attributes = array( $comparable_name => array( $duplicate_span ) );
+		} elseif ( ! isset( $this->duplicate_attributes[ $comparable_name ] ) ) {
+			$this->duplicate_attributes[ $comparable_name ] = array( $duplicate_span );
+		} else {
+			$this->duplicate_attributes[ $comparable_name ][] = $duplicate_span;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Move the internal cursor past any immediate successive whitespace.
+	 *
+	 * @since 6.2.0
+	 */
+	private function skip_whitespace(): void {
+		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n", $this->bytes_already_parsed );
+	}
+
+	/**
+	 * Applies attribute updates and cleans up once a tag is fully parsed.
+	 *
+	 * @since 6.2.0
+	 */
+	private function after_tag(): void {
+		/*
+		 * There could be lexical updates enqueued for an attribute that
+		 * also exists on the next tag. In order to avoid conflating the
+		 * attributes across the two tags, lexical updates with names
+		 * need to be flushed to raw lexical updates.
+		 */
+		$this->class_name_updates_to_attributes_updates();
+
+		/*
+		 * Purge updates if there are too many. The actual count isn't
+		 * scientific, but a few values from 100 to a few thousand were
+		 * tests to find a practically-useful limit.
+		 *
+		 * If the update queue grows too big, then the Tag Processor
+		 * will spend more time iterating through them and lose the
+		 * efficiency gains of deferring applying them.
+		 */
+		if ( 1000 < count( $this->lexical_updates ) ) {
+			$this->get_updated_html();
+		}
+
+		foreach ( $this->lexical_updates as $name => $update ) {
+			/*
+			 * Any updates appearing after the cursor should be applied
+			 * before proceeding, otherwise they may be overlooked.
+			 */
+			if ( $update->start >= $this->bytes_already_parsed ) {
+				$this->get_updated_html();
+				break;
+			}
+
+			if ( is_int( $name ) ) {
+				continue;
+			}
+
+			$this->lexical_updates[] = $update;
+			unset( $this->lexical_updates[ $name ] );
+		}
+
+		$this->token_starts_at      = null;
+		$this->token_length         = null;
+		$this->tag_name_starts_at   = null;
+		$this->tag_name_length      = null;
+		$this->text_starts_at       = 0;
+		$this->text_length          = 0;
+		$this->is_closing_tag       = null;
+		$this->attributes           = array();
+		$this->comment_type         = null;
+		$this->duplicate_attributes = null;
+	}
+
+	/**
+	 * Converts class name updates into tag attributes updates
+	 * (they are accumulated in different data formats for performance).
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see WP_HTML_Tag_Processor::$lexical_updates
+	 * @see WP_HTML_Tag_Processor::$classname_updates
+	 */
+	private function class_name_updates_to_attributes_updates(): void {
+		if ( count( $this->classname_updates ) === 0 ) {
+			return;
+		}
+
+		$existing_class = $this->get_enqueued_attribute_value( 'class' );
+		if ( null === $existing_class || true === $existing_class ) {
+			$existing_class = '';
+		}
+
+		if ( false === $existing_class && isset( $this->attributes['class'] ) ) {
+			$existing_class = substr(
+				$this->html,
+				$this->attributes['class']->value_starts_at,
+				$this->attributes['class']->value_length
+			);
+		}
+
+		if ( false === $existing_class ) {
+			$existing_class = '';
+		}
+
+		/**
+		 * Updated "class" attribute value.
+		 *
+		 * This is incrementally built while scanning through the existing class
+		 * attribute, skipping removed classes on the way, and then appending
+		 * added classes at the end. Only when finished processing will the
+		 * value contain the final new value.
+
+		 * @var string $class
+		 */
+		$class = '';
+
+		/**
+		 * Tracks the cursor position in the existing
+		 * class attribute value while parsing.
+		 *
+		 * @var int $at
+		 */
+		$at = 0;
+
+		/**
+		 * Indicates if there's any need to modify the existing class attribute.
+		 *
+		 * If a call to `add_class()` and `remove_class()` wouldn't impact
+		 * the `class` attribute value then there's no need to rebuild it.
+		 * For example, when adding a class that's already present or
+		 * removing one that isn't.
+		 *
+		 * This flag enables a performance optimization when none of the enqueued
+		 * class updates would impact the `class` attribute; namely, that the
+		 * processor can continue without modifying the input document, as if
+		 * none of the `add_class()` or `remove_class()` calls had been made.
+		 *
+		 * This flag is set upon the first change that requires a string update.
+		 *
+		 * @var bool $modified
+		 */
+		$modified = false;
+
+		// Remove unwanted classes by only copying the new ones.
+		$existing_class_length = strlen( $existing_class );
+		while ( $at < $existing_class_length ) {
+			// Skip to the first non-whitespace character.
+			$ws_at     = $at;
+			$ws_length = strspn( $existing_class, " \t\f\r\n", $ws_at );
+			$at       += $ws_length;
+
+			// Capture the class name – it's everything until the next whitespace.
+			$name_length = strcspn( $existing_class, " \t\f\r\n", $at );
+			if ( 0 === $name_length ) {
+				// If no more class names are found then that's the end.
+				break;
+			}
+
+			$name = substr( $existing_class, $at, $name_length );
+			$at  += $name_length;
+
+			// If this class is marked for removal, start processing the next one.
+			$remove_class = (
+				isset( $this->classname_updates[ $name ] ) &&
+				self::REMOVE_CLASS === $this->classname_updates[ $name ]
+			);
+
+			// If a class has already been seen then skip it; it should not be added twice.
+			if ( ! $remove_class ) {
+				$this->classname_updates[ $name ] = self::SKIP_CLASS;
+			}
+
+			if ( $remove_class ) {
+				$modified = true;
+				continue;
+			}
+
+			/*
+			 * Otherwise, append it to the new "class" attribute value.
+			 *
+			 * There are options for handling whitespace between tags.
+			 * Preserving the existing whitespace produces fewer changes
+			 * to the HTML content and should clarify the before/after
+			 * content when debugging the modified output.
+			 *
+			 * This approach contrasts normalizing the inter-class
+			 * whitespace to a single space, which might appear cleaner
+			 * in the output HTML but produce a noisier change.
+			 */
+			if ( '' !== $class ) {
+				$class .= substr( $existing_class, $ws_at, $ws_length );
+			}
+			$class .= $name;
+		}
+
+		// Add new classes by appending those which haven't already been seen.
+		foreach ( $this->classname_updates as $name => $operation ) {
+			if ( self::ADD_CLASS === $operation ) {
+				$modified = true;
+
+				$class .= strlen( $class ) > 0 ? ' ' : '';
+				$class .= $name;
+			}
+		}
+
+		$this->classname_updates = array();
+		if ( ! $modified ) {
+			return;
+		}
+
+		if ( strlen( $class ) > 0 ) {
+			$this->set_attribute( 'class', $class );
+		} else {
+			$this->remove_attribute( 'class' );
+		}
+	}
+
+	/**
+	 * Applies attribute updates to HTML document.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Accumulates shift for internal cursor and passed pointer.
+	 * @since 6.3.0 Invalidate any bookmarks whose targets are overwritten.
+	 *
+	 * @param int $shift_this_point Accumulate and return shift for this position.
+	 * @return int How many bytes the given pointer moved in response to the updates.
+	 */
+	private function apply_attributes_updates( int $shift_this_point ): int {
+		if ( ! count( $this->lexical_updates ) ) {
+			return 0;
+		}
+
+		$accumulated_shift_for_given_point = 0;
+
+		/*
+		 * Attribute updates can be enqueued in any order but updates
+		 * to the document must occur in lexical order; that is, each
+		 * replacement must be made before all others which follow it
+		 * at later string indices in the input document.
+		 *
+		 * Sorting avoid making out-of-order replacements which
+		 * can lead to mangled output, partially-duplicated
+		 * attributes, and overwritten attributes.
+		 */
+		usort( $this->lexical_updates, array( self::class, 'sort_start_ascending' ) );
+
+		$bytes_already_copied = 0;
+		$output_buffer        = '';
+		foreach ( $this->lexical_updates as $diff ) {
+			$shift = strlen( $diff->text ) - $diff->length;
+
+			// Adjust the cursor position by however much an update affects it.
+			if ( $diff->start < $this->bytes_already_parsed ) {
+				$this->bytes_already_parsed += $shift;
+			}
+
+			// Accumulate shift of the given pointer within this function call.
+			if ( $diff->start <= $shift_this_point ) {
+				$accumulated_shift_for_given_point += $shift;
+			}
+
+			$output_buffer       .= substr( $this->html, $bytes_already_copied, $diff->start - $bytes_already_copied );
+			$output_buffer       .= $diff->text;
+			$bytes_already_copied = $diff->start + $diff->length;
+		}
+
+		$this->html = $output_buffer . substr( $this->html, $bytes_already_copied );
+
+		/*
+		 * Adjust bookmark locations to account for how the text
+		 * replacements adjust offsets in the input document.
+		 */
+		foreach ( $this->bookmarks as $bookmark_name => $bookmark ) {
+			$bookmark_end = $bookmark->start + $bookmark->length;
+
+			/*
+			 * Each lexical update which appears before the bookmark's endpoints
+			 * might shift the offsets for those endpoints. Loop through each change
+			 * and accumulate the total shift for each bookmark, then apply that
+			 * shift after tallying the full delta.
+			 */
+			$head_delta = 0;
+			$tail_delta = 0;
+
+			foreach ( $this->lexical_updates as $diff ) {
+				$diff_end = $diff->start + $diff->length;
+
+				if ( $bookmark->start < $diff->start && $bookmark_end < $diff->start ) {
+					break;
+				}
+
+				if ( $bookmark->start >= $diff->start && $bookmark_end < $diff_end ) {
+					$this->release_bookmark( $bookmark_name );
+					continue 2;
+				}
+
+				$delta = strlen( $diff->text ) - $diff->length;
+
+				if ( $bookmark->start >= $diff->start ) {
+					$head_delta += $delta;
+				}
+
+				if ( $bookmark_end >= $diff_end ) {
+					$tail_delta += $delta;
+				}
+			}
+
+			$bookmark->start  += $head_delta;
+			$bookmark->length += $tail_delta - $head_delta;
+		}
+
+		$this->lexical_updates = array();
+
+		return $accumulated_shift_for_given_point;
+	}
+
+	/**
+	 * Checks whether a bookmark with the given name exists.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $bookmark_name Name to identify a bookmark that potentially exists.
+	 * @return bool Whether that bookmark exists.
+	 */
+	public function has_bookmark( $bookmark_name ): bool {
+		return array_key_exists( $bookmark_name, $this->bookmarks );
+	}
+
+	/**
+	 * Move the internal cursor in the Tag Processor to a given bookmark's location.
+	 *
+	 * In order to prevent accidental infinite loops, there's a
+	 * maximum limit on the number of times seek() can be called.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $bookmark_name Jump to the place in the document identified by this bookmark name.
+	 * @return bool Whether the internal cursor was successfully moved to the bookmark's location.
+	 */
+	public function seek( $bookmark_name ): bool {
+		if ( ! array_key_exists( $bookmark_name, $this->bookmarks ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Unknown bookmark name.' ),
+				'6.2.0'
+			);
+			return false;
+		}
+
+		if ( ++$this->seek_count > static::MAX_SEEK_OPS ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Too many calls to seek() - this can lead to performance issues.' ),
+				'6.2.0'
+			);
+			return false;
+		}
+
+		// Flush out any pending updates to the document.
+		$this->get_updated_html();
+
+		// Point this tag processor before the sought tag opener and consume it.
+		$this->bytes_already_parsed = $this->bookmarks[ $bookmark_name ]->start;
+		$this->parser_state         = self::STATE_READY;
+		return $this->next_token();
+	}
+
+	/**
+	 * Compare two WP_HTML_Text_Replacement objects.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param WP_HTML_Text_Replacement $a First attribute update.
+	 * @param WP_HTML_Text_Replacement $b Second attribute update.
+	 * @return int Comparison value for string order.
+	 */
+	private static function sort_start_ascending( Gutenberg_HTML_Text_Replacement_6_7 $a, Gutenberg_HTML_Text_Replacement_6_7 $b ): int {
+		$by_start = $a->start - $b->start;
+		if ( 0 !== $by_start ) {
+			return $by_start;
+		}
+
+		$by_text = isset( $a->text, $b->text ) ? strcmp( $a->text, $b->text ) : 0;
+		if ( 0 !== $by_text ) {
+			return $by_text;
+		}
+
+		/*
+		 * This code should be unreachable, because it implies the two replacements
+		 * start at the same location and contain the same text.
+		 */
+		return $a->length - $b->length;
+	}
+
+	/**
+	 * Return the enqueued value for a given attribute, if one exists.
+	 *
+	 * Enqueued updates can take different data types:
+	 *  - If an update is enqueued and is boolean, the return will be `true`
+	 *  - If an update is otherwise enqueued, the return will be the string value of that update.
+	 *  - If an attribute is enqueued to be removed, the return will be `null` to indicate that.
+	 *  - If no updates are enqueued, the return will be `false` to differentiate from "removed."
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $comparable_name The attribute name in its comparable form.
+	 * @return string|boolean|null Value of enqueued update if present, otherwise false.
+	 */
+	private function get_enqueued_attribute_value( string $comparable_name ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return false;
+		}
+
+		if ( ! isset( $this->lexical_updates[ $comparable_name ] ) ) {
+			return false;
+		}
+
+		$enqueued_text = $this->lexical_updates[ $comparable_name ]->text;
+
+		// Removed attributes erase the entire span.
+		if ( '' === $enqueued_text ) {
+			return null;
+		}
+
+		/*
+		 * Boolean attribute updates are just the attribute name without a corresponding value.
+		 *
+		 * This value might differ from the given comparable name in that there could be leading
+		 * or trailing whitespace, and that the casing follows the name given in `set_attribute`.
+		 *
+		 * Example:
+		 *
+		 *     $p->set_attribute( 'data-TEST-id', 'update' );
+		 *     'update' === $p->get_enqueued_attribute_value( 'data-test-id' );
+		 *
+		 * Detect this difference based on the absence of the `=`, which _must_ exist in any
+		 * attribute containing a value, e.g. `<input type="text" enabled />`.
+		 *                                            ¹           ²
+		 *                                       1. Attribute with a string value.
+		 *                                       2. Boolean attribute whose value is `true`.
+		 */
+		$equals_at = strpos( $enqueued_text, '=' );
+		if ( false === $equals_at ) {
+			return true;
+		}
+
+		/*
+		 * Finally, a normal update's value will appear after the `=` and
+		 * be double-quoted, as performed incidentally by `set_attribute`.
+		 *
+		 * e.g. `type="text"`
+		 *           ¹²    ³
+		 *        1. Equals is here.
+		 *        2. Double-quoting starts one after the equals sign.
+		 *        3. Double-quoting ends at the last character in the update.
+		 */
+		$enqueued_value = substr( $enqueued_text, $equals_at + 2, -1 );
+		return Gutenberg_HTML_Decoder_6_7::decode_attribute( $enqueued_value );
+	}
+
+	/**
+	 * Returns the value of a requested attribute from a matched tag opener if that attribute exists.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div enabled class="test" data-test-id="14">Test</div>' );
+	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
+	 *     $p->get_attribute( 'data-test-id' ) === '14';
+	 *     $p->get_attribute( 'enabled' ) === true;
+	 *     $p->get_attribute( 'aria-label' ) === null;
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute( 'class' ) === null;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name Name of attribute whose value is requested.
+	 * @return string|true|null Value of attribute or `null` if not available. Boolean attributes return `true`.
+	 */
+	public function get_attribute( $name ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return null;
+		}
+
+		$comparable = strtolower( $name );
+
+		/*
+		 * For every attribute other than `class` it's possible to perform a quick check if
+		 * there's an enqueued lexical update whose value takes priority over what's found in
+		 * the input document.
+		 *
+		 * The `class` attribute is special though because of the exposed helpers `add_class`
+		 * and `remove_class`. These form a builder for the `class` attribute, so an additional
+		 * check for enqueued class changes is required in addition to the check for any enqueued
+		 * attribute values. If any exist, those enqueued class changes must first be flushed out
+		 * into an attribute value update.
+		 */
+		if ( 'class' === $name ) {
+			$this->class_name_updates_to_attributes_updates();
+		}
+
+		// Return any enqueued attribute value updates if they exist.
+		$enqueued_value = $this->get_enqueued_attribute_value( $comparable );
+		if ( false !== $enqueued_value ) {
+			return $enqueued_value;
+		}
+
+		if ( ! isset( $this->attributes[ $comparable ] ) ) {
+			return null;
+		}
+
+		$attribute = $this->attributes[ $comparable ];
+
+		/*
+		 * This flag distinguishes an attribute with no value
+		 * from an attribute with an empty string value. For
+		 * unquoted attributes this could look very similar.
+		 * It refers to whether an `=` follows the name.
+		 *
+		 * e.g. <div boolean-attribute empty-attribute=></div>
+		 *           ¹                 ²
+		 *        1. Attribute `boolean-attribute` is `true`.
+		 *        2. Attribute `empty-attribute` is `""`.
+		 */
+		if ( true === $attribute->is_true ) {
+			return true;
+		}
+
+		$raw_value = substr( $this->html, $attribute->value_starts_at, $attribute->value_length );
+
+		return Gutenberg_HTML_Decoder_6_7::decode_attribute( $raw_value );
+	}
+
+	/**
+	 * Gets lowercase names of all attributes matching a given prefix in the current tag.
+	 *
+	 * Note that matching is case-insensitive. This is in accordance with the spec:
+	 *
+	 * > There must never be two or more attributes on
+	 * > the same start tag whose names are an ASCII
+	 * > case-insensitive match for each other.
+	 *     - HTML 5 spec
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div data-ENABLED class="test" DATA-test-id="14">Test</div>' );
+	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === array( 'data-enabled', 'data-test-id' );
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === null;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+	 *
+	 * @param string $prefix Prefix of requested attribute names.
+	 * @return array|null List of attribute names, or `null` when no tag opener is matched.
+	 */
+	public function get_attribute_names_with_prefix( $prefix ): ?array {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return null;
+		}
+
+		$comparable = strtolower( $prefix );
+
+		$matches = array();
+		foreach ( array_keys( $this->attributes ) as $attr_name ) {
+			if ( str_starts_with( $attr_name, $comparable ) ) {
+				$matches[] = $attr_name;
+			}
+		}
+		return $matches;
+	}
+
+	/**
+	 * Returns the uppercase name of the matched tag.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+	 *     $p->next_tag() === true;
+	 *     $p->get_tag() === 'DIV';
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_tag() === null;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
+	 */
+	public function get_tag(): ?string {
+		if ( null === $this->tag_name_starts_at ) {
+			return null;
+		}
+
+		$tag_name = substr( $this->html, $this->tag_name_starts_at, $this->tag_name_length );
+
+		if ( self::STATE_MATCHED_TAG === $this->parser_state ) {
+			return strtoupper( $tag_name );
+		}
+
+		if (
+			self::STATE_COMMENT === $this->parser_state &&
+			self::COMMENT_AS_PI_NODE_LOOKALIKE === $this->get_comment_type()
+		) {
+			return $tag_name;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Indicates if the currently matched tag contains the self-closing flag.
+	 *
+	 * No HTML elements ought to have the self-closing flag and for those, the self-closing
+	 * flag will be ignored. For void elements this is benign because they "self close"
+	 * automatically. For non-void HTML elements though problems will appear if someone
+	 * intends to use a self-closing element in place of that element with an empty body.
+	 * For HTML foreign elements and custom elements the self-closing flag determines if
+	 * they self-close or not.
+	 *
+	 * This function does not determine if a tag is self-closing,
+	 * but only if the self-closing flag is present in the syntax.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return bool Whether the currently matched tag contains the self-closing flag.
+	 */
+	public function has_self_closing_flag(): bool {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return false;
+		}
+
+		/*
+		 * The self-closing flag is the solidus at the _end_ of the tag, not the beginning.
+		 *
+		 * Example:
+		 *
+		 *     <figure />
+		 *             ^ this appears one character before the end of the closing ">".
+		 */
+		return '/' === $this->html[ $this->token_starts_at + $this->token_length - 2 ];
+	}
+
+	/**
+	 * Indicates if the current tag token is a tag closer.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div></div>' );
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === false;
+	 *
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === true;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether the current tag is a tag closer.
+	 */
+	public function is_tag_closer(): bool {
+		return (
+			self::STATE_MATCHED_TAG === $this->parser_state &&
+			$this->is_closing_tag
+		);
+	}
+
+	/**
+	 * Indicates the kind of matched token, if any.
+	 *
+	 * This differs from `get_token_name()` in that it always
+	 * returns a static string indicating the type, whereas
+	 * `get_token_name()` may return values derived from the
+	 * token itself, such as a tag name or processing
+	 * instruction tag.
+	 *
+	 * Possible values:
+	 *  - `#tag` when matched on a tag.
+	 *  - `#text` when matched on a text node.
+	 *  - `#cdata-section` when matched on a CDATA node.
+	 *  - `#comment` when matched on a comment.
+	 *  - `#doctype` when matched on a DOCTYPE declaration.
+	 *  - `#presumptuous-tag` when matched on an empty tag closer.
+	 *  - `#funky-comment` when matched on a funky comment.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return string|null What kind of token is matched, or null.
+	 */
+	public function get_token_type(): ?string {
+		switch ( $this->parser_state ) {
+			case self::STATE_MATCHED_TAG:
+				return '#tag';
+
+			case self::STATE_DOCTYPE:
+				return '#doctype';
+
+			default:
+				return $this->get_token_name();
+		}
+	}
+
+	/**
+	 * Returns the node name represented by the token.
+	 *
+	 * This matches the DOM API value `nodeName`. Some values
+	 * are static, such as `#text` for a text node, while others
+	 * are dynamically generated from the token itself.
+	 *
+	 * Dynamic names:
+	 *  - Uppercase tag name for tag matches.
+	 *  - `html` for DOCTYPE declarations.
+	 *
+	 * Note that if the Tag Processor is not matched on a token
+	 * then this function will return `null`, either because it
+	 * hasn't yet found a token or because it reached the end
+	 * of the document without matching a token.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return string|null Name of the matched token.
+	 */
+	public function get_token_name(): ?string {
+		switch ( $this->parser_state ) {
+			case self::STATE_MATCHED_TAG:
+				return $this->get_tag();
+
+			case self::STATE_TEXT_NODE:
+				return '#text';
+
+			case self::STATE_CDATA_NODE:
+				return '#cdata-section';
+
+			case self::STATE_COMMENT:
+				return '#comment';
+
+			case self::STATE_DOCTYPE:
+				return 'html';
+
+			case self::STATE_PRESUMPTUOUS_TAG:
+				return '#presumptuous-tag';
+
+			case self::STATE_FUNKY_COMMENT:
+				return '#funky-comment';
+		}
+
+		return null;
+	}
+
+	/**
+	 * Indicates what kind of comment produced the comment node.
+	 *
+	 * Because there are different kinds of HTML syntax which produce
+	 * comments, the Tag Processor tracks and exposes this as a type
+	 * for the comment. Nominally only regular HTML comments exist as
+	 * they are commonly known, but a number of unrelated syntax errors
+	 * also produce comments.
+	 *
+	 * @see self::COMMENT_AS_ABRUPTLY_CLOSED_COMMENT
+	 * @see self::COMMENT_AS_CDATA_LOOKALIKE
+	 * @see self::COMMENT_AS_INVALID_HTML
+	 * @see self::COMMENT_AS_HTML_COMMENT
+	 * @see self::COMMENT_AS_PI_NODE_LOOKALIKE
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return string|null
+	 */
+	public function get_comment_type(): ?string {
+		if ( self::STATE_COMMENT !== $this->parser_state ) {
+			return null;
+		}
+
+		return $this->comment_type;
+	}
+
+	/**
+	 * Returns the modifiable text for a matched token, or an empty string.
+	 *
+	 * Modifiable text is text content that may be read and changed without
+	 * changing the HTML structure of the document around it. This includes
+	 * the contents of `#text` nodes in the HTML as well as the inner
+	 * contents of HTML comments, Processing Instructions, and others, even
+	 * though these nodes aren't part of a parsed DOM tree. They also contain
+	 * the contents of SCRIPT and STYLE tags, of TEXTAREA tags, and of any
+	 * other section in an HTML document which cannot contain HTML markup (DATA).
+	 *
+	 * If a token has no modifiable text then an empty string is returned to
+	 * avoid needless crashing or type errors. An empty string does not mean
+	 * that a token has modifiable text, and a token with modifiable text may
+	 * have an empty string (e.g. a comment with no contents).
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return string
+	 */
+	public function get_modifiable_text(): string {
+		if ( null === $this->text_starts_at ) {
+			return '';
+		}
+
+		$text = substr( $this->html, $this->text_starts_at, $this->text_length );
+
+		// Comment data is not decoded.
+		if (
+			self::STATE_CDATA_NODE === $this->parser_state ||
+			self::STATE_COMMENT === $this->parser_state ||
+			self::STATE_DOCTYPE === $this->parser_state ||
+			self::STATE_FUNKY_COMMENT === $this->parser_state
+		) {
+			return $text;
+		}
+
+		$tag_name = $this->get_tag();
+		if (
+			// Script data is not decoded.
+			'SCRIPT' === $tag_name ||
+
+			// RAWTEXT data is not decoded.
+			'IFRAME' === $tag_name ||
+			'NOEMBED' === $tag_name ||
+			'NOFRAMES' === $tag_name ||
+			'STYLE' === $tag_name ||
+			'XMP' === $tag_name
+		) {
+			return $text;
+		}
+
+		$decoded = Gutenberg_HTML_Decoder_6_7::decode_text_node( $text );
+
+		/*
+		 * TEXTAREA skips a leading newline, but this newline may appear not only as the
+		 * literal character `\n`, but also as a character reference, such as in the
+		 * following markup: `<textarea>&#x0a;Content</textarea>`.
+		 *
+		 * For these cases it's important to first decode the text content before checking
+		 * for a leading newline and removing it.
+		 */
+		if (
+			self::STATE_MATCHED_TAG === $this->parser_state &&
+			'TEXTAREA' === $tag_name &&
+			strlen( $decoded ) > 0 &&
+			"\n" === $decoded[0]
+		) {
+			return substr( $decoded, 1 );
+		}
+
+		return $decoded;
+	}
+
+	/**
+	 * Updates or creates a new attribute on the currently matched tag with the passed value.
+	 *
+	 * For boolean attributes special handling is provided:
+	 *  - When `true` is passed as the value, then only the attribute name is added to the tag.
+	 *  - When `false` is passed, the attribute gets removed if it existed before.
+	 *
+	 * For string attributes, the value is escaped using the `esc_attr` function.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Fix: Only create a single update for multiple calls with case-variant attribute names.
+	 *
+	 * @param string      $name  The attribute name to target.
+	 * @param string|bool $value The new attribute value.
+	 * @return bool Whether an attribute value was set.
+	 */
+	public function set_attribute( $name, $value ): bool {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return false;
+		}
+
+		/*
+		 * WordPress rejects more characters than are strictly forbidden
+		 * in HTML5. This is to prevent additional security risks deeper
+		 * in the WordPress and plugin stack. Specifically the
+		 * less-than (<) greater-than (>) and ampersand (&) aren't allowed.
+		 *
+		 * The use of a PCRE match enables looking for specific Unicode
+		 * code points without writing a UTF-8 decoder. Whereas scanning
+		 * for one-byte characters is trivial (with `strcspn`), scanning
+		 * for the longer byte sequences would be more complicated. Given
+		 * that this shouldn't be in the hot path for execution, it's a
+		 * reasonable compromise in efficiency without introducing a
+		 * noticeable impact on the overall system.
+		 *
+		 * @see https://html.spec.whatwg.org/#attributes-2
+		 *
+		 * @todo As the only regex pattern maybe we should take it out?
+		 *       Are Unicode patterns available broadly in Core?
+		 */
+		if ( preg_match(
+			'~[' .
+				// Syntax-like characters.
+				'"\'>&</ =' .
+				// Control characters.
+				'\x{00}-\x{1F}' .
+				// HTML noncharacters.
+				'\x{FDD0}-\x{FDEF}' .
+				'\x{FFFE}\x{FFFF}\x{1FFFE}\x{1FFFF}\x{2FFFE}\x{2FFFF}\x{3FFFE}\x{3FFFF}' .
+				'\x{4FFFE}\x{4FFFF}\x{5FFFE}\x{5FFFF}\x{6FFFE}\x{6FFFF}\x{7FFFE}\x{7FFFF}' .
+				'\x{8FFFE}\x{8FFFF}\x{9FFFE}\x{9FFFF}\x{AFFFE}\x{AFFFF}\x{BFFFE}\x{BFFFF}' .
+				'\x{CFFFE}\x{CFFFF}\x{DFFFE}\x{DFFFF}\x{EFFFE}\x{EFFFF}\x{FFFFE}\x{FFFFF}' .
+				'\x{10FFFE}\x{10FFFF}' .
+			']~Ssu',
+			$name
+		) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Invalid attribute name.' ),
+				'6.2.0'
+			);
+
+			return false;
+		}
+
+		/*
+		 * > The values "true" and "false" are not allowed on boolean attributes.
+		 * > To represent a false value, the attribute has to be omitted altogether.
+		 *     - HTML5 spec, https://html.spec.whatwg.org/#boolean-attributes
+		 */
+		if ( false === $value ) {
+			return $this->remove_attribute( $name );
+		}
+
+		if ( true === $value ) {
+			$updated_attribute = $name;
+		} else {
+			$comparable_name = strtolower( $name );
+
+			/*
+			 * Escape URL attributes.
+			 *
+			 * @see https://html.spec.whatwg.org/#attributes-3
+			 */
+			$escaped_new_value = in_array( $comparable_name, wp_kses_uri_attributes() ) ? esc_url( $value ) : esc_attr( $value );
+			$updated_attribute = "{$name}=\"{$escaped_new_value}\"";
+		}
+
+		/*
+		 * > There must never be two or more attributes on
+		 * > the same start tag whose names are an ASCII
+		 * > case-insensitive match for each other.
+		 *     - HTML 5 spec
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+		 */
+		$comparable_name = strtolower( $name );
+
+		if ( isset( $this->attributes[ $comparable_name ] ) ) {
+			/*
+			 * Update an existing attribute.
+			 *
+			 * Example – set attribute id to "new" in <div id="initial_id" />:
+			 *
+			 *     <div id="initial_id"/>
+			 *          ^-------------^
+			 *          start         end
+			 *     replacement: `id="new"`
+			 *
+			 *     Result: <div id="new"/>
+			 */
+			$existing_attribute                        = $this->attributes[ $comparable_name ];
+			$this->lexical_updates[ $comparable_name ] = new Gutenberg_HTML_Text_Replacement_6_7(
+				$existing_attribute->start,
+				$existing_attribute->length,
+				$updated_attribute
+			);
+		} else {
+			/*
+			 * Create a new attribute at the tag's name end.
+			 *
+			 * Example – add attribute id="new" to <div />:
+			 *
+			 *     <div/>
+			 *         ^
+			 *         start and end
+			 *     replacement: ` id="new"`
+			 *
+			 *     Result: <div id="new"/>
+			 */
+			$this->lexical_updates[ $comparable_name ] = new Gutenberg_HTML_Text_Replacement_6_7(
+				$this->tag_name_starts_at + $this->tag_name_length,
+				0,
+				' ' . $updated_attribute
+			);
+		}
+
+		/*
+		 * Any calls to update the `class` attribute directly should wipe out any
+		 * enqueued class changes from `add_class` and `remove_class`.
+		 */
+		if ( 'class' === $comparable_name && ! empty( $this->classname_updates ) ) {
+			$this->classname_updates = array();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Remove an attribute from the currently-matched tag.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name The attribute name to remove.
+	 * @return bool Whether an attribute was removed.
+	 */
+	public function remove_attribute( $name ): bool {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return false;
+		}
+
+		/*
+		 * > There must never be two or more attributes on
+		 * > the same start tag whose names are an ASCII
+		 * > case-insensitive match for each other.
+		 *     - HTML 5 spec
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+		 */
+		$name = strtolower( $name );
+
+		/*
+		 * Any calls to update the `class` attribute directly should wipe out any
+		 * enqueued class changes from `add_class` and `remove_class`.
+		 */
+		if ( 'class' === $name && count( $this->classname_updates ) !== 0 ) {
+			$this->classname_updates = array();
+		}
+
+		/*
+		 * If updating an attribute that didn't exist in the input
+		 * document, then remove the enqueued update and move on.
+		 *
+		 * For example, this might occur when calling `remove_attribute()`
+		 * after calling `set_attribute()` for the same attribute
+		 * and when that attribute wasn't originally present.
+		 */
+		if ( ! isset( $this->attributes[ $name ] ) ) {
+			if ( isset( $this->lexical_updates[ $name ] ) ) {
+				unset( $this->lexical_updates[ $name ] );
+			}
+			return false;
+		}
+
+		/*
+		 * Removes an existing tag attribute.
+		 *
+		 * Example – remove the attribute id from <div id="main"/>:
+		 *    <div id="initial_id"/>
+		 *         ^-------------^
+		 *         start         end
+		 *    replacement: ``
+		 *
+		 *    Result: <div />
+		 */
+		$this->lexical_updates[ $name ] = new Gutenberg_HTML_Text_Replacement_6_7(
+			$this->attributes[ $name ]->start,
+			$this->attributes[ $name ]->length,
+			''
+		);
+
+		// Removes any duplicated attributes if they were also present.
+		foreach ( $this->duplicate_attributes[ $name ] ?? array() as $attribute_token ) {
+			$this->lexical_updates[] = new Gutenberg_HTML_Text_Replacement_6_7(
+				$attribute_token->start,
+				$attribute_token->length,
+				''
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Adds a new class name to the currently matched tag.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $class_name The class name to add.
+	 * @return bool Whether the class was set to be added.
+	 */
+	public function add_class( $class_name ): bool {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return false;
+		}
+
+		$this->classname_updates[ $class_name ] = self::ADD_CLASS;
+
+		return true;
+	}
+
+	/**
+	 * Removes a class name from the currently matched tag.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $class_name The class name to remove.
+	 * @return bool Whether the class was set to be removed.
+	 */
+	public function remove_class( $class_name ): bool {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
+			return false;
+		}
+
+		if ( null !== $this->tag_name_starts_at ) {
+			$this->classname_updates[ $class_name ] = self::REMOVE_CLASS;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the string representation of the HTML Tag Processor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see WP_HTML_Tag_Processor::get_updated_html()
+	 *
+	 * @return string The processed HTML.
+	 */
+	public function __toString(): string {
+		return $this->get_updated_html();
+	}
+
+	/**
+	 * Returns the string representation of the HTML Tag Processor.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Shifts the internal cursor corresponding to the applied updates.
+	 * @since 6.4.0 No longer calls subclass method `next_tag()` after updating HTML.
+	 *
+	 * @return string The processed HTML.
+	 */
+	public function get_updated_html(): string {
+		$requires_no_updating = 0 === count( $this->classname_updates ) && 0 === count( $this->lexical_updates );
+
+		/*
+		 * When there is nothing more to update and nothing has already been
+		 * updated, return the original document and avoid a string copy.
+		 */
+		if ( $requires_no_updating ) {
+			return $this->html;
+		}
+
+		/*
+		 * Keep track of the position right before the current tag. This will
+		 * be necessary for reparsing the current tag after updating the HTML.
+		 */
+		$before_current_tag = $this->token_starts_at ?? 0;
+
+		/*
+		 * 1. Apply the enqueued edits and update all the pointers to reflect those changes.
+		 */
+		$this->class_name_updates_to_attributes_updates();
+		$before_current_tag += $this->apply_attributes_updates( $before_current_tag );
+
+		/*
+		 * 2. Rewind to before the current tag and reparse to get updated attributes.
+		 *
+		 * At this point the internal cursor points to the end of the tag name.
+		 * Rewind before the tag name starts so that it's as if the cursor didn't
+		 * move; a call to `next_tag()` will reparse the recently-updated attributes
+		 * and additional calls to modify the attributes will apply at this same
+		 * location, but in order to avoid issues with subclasses that might add
+		 * behaviors to `next_tag()`, the internal methods should be called here
+		 * instead.
+		 *
+		 * It's important to note that in this specific place there will be no change
+		 * because the processor was already at a tag when this was called and it's
+		 * rewinding only to the beginning of this very tag before reprocessing it
+		 * and its attributes.
+		 *
+		 * <p>Previous HTML<em>More HTML</em></p>
+		 *                 ↑  │ back up by the length of the tag name plus the opening <
+		 *                 └←─┘ back up by strlen("em") + 1 ==> 3
+		 */
+		$this->bytes_already_parsed = $before_current_tag;
+		$this->base_class_next_token();
+
+		return $this->html;
+	}
+
+	/**
+	 * Parses tag query input into internal search criteria.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this class name to match.
+	 *     @type string      $tag_closers  "visit" or "skip": whether to stop on tag closers, e.g. </div>.
+	 * }
+	 */
+	private function parse_query( $query ) {
+		if ( null !== $query && $query === $this->last_query ) {
+			return;
+		}
+
+		$this->last_query          = $query;
+		$this->sought_tag_name     = null;
+		$this->sought_class_name   = null;
+		$this->sought_match_offset = 1;
+		$this->stop_on_tag_closers = false;
+
+		// A single string value means "find the tag of this name".
+		if ( is_string( $query ) ) {
+			$this->sought_tag_name = $query;
+			return;
+		}
+
+		// An empty query parameter applies no restrictions on the search.
+		if ( null === $query ) {
+			return;
+		}
+
+		// If not using the string interface, an associative array is required.
+		if ( ! is_array( $query ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'The query argument must be an array or a tag name.' ),
+				'6.2.0'
+			);
+			return;
+		}
+
+		if ( isset( $query['tag_name'] ) && is_string( $query['tag_name'] ) ) {
+			$this->sought_tag_name = $query['tag_name'];
+		}
+
+		if ( isset( $query['class_name'] ) && is_string( $query['class_name'] ) ) {
+			$this->sought_class_name = $query['class_name'];
+		}
+
+		if ( isset( $query['match_offset'] ) && is_int( $query['match_offset'] ) && 0 < $query['match_offset'] ) {
+			$this->sought_match_offset = $query['match_offset'];
+		}
+
+		if ( isset( $query['tag_closers'] ) ) {
+			$this->stop_on_tag_closers = 'visit' === $query['tag_closers'];
+		}
+	}
+
+
+	/**
+	 * Checks whether a given tag and its attributes match the search criteria.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether the given tag and its attribute match the search criteria.
+	 */
+	private function matches(): bool {
+		if ( $this->is_closing_tag && ! $this->stop_on_tag_closers ) {
+			return false;
+		}
+
+		// Does the tag name match the requested tag name in a case-insensitive manner?
+		if ( isset( $this->sought_tag_name ) && 0 !== substr_compare( $this->html, $this->sought_tag_name, $this->tag_name_starts_at, $this->tag_name_length, true ) ) {
+			return false;
+		}
+
+		if ( null !== $this->sought_class_name && ! $this->has_class( $this->sought_class_name ) ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Parser Ready State.
+	 *
+	 * Indicates that the parser is ready to run and waiting for a state transition.
+	 * It may not have started yet, or it may have just finished parsing a token and
+	 * is ready to find the next one.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_READY = 'STATE_READY';
+
+	/**
+	 * Parser Complete State.
+	 *
+	 * Indicates that the parser has reached the end of the document and there is
+	 * nothing left to scan. It finished parsing the last token completely.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_COMPLETE = 'STATE_COMPLETE';
+
+	/**
+	 * Parser Incomplete Input State.
+	 *
+	 * Indicates that the parser has reached the end of the document before finishing
+	 * a token. It started parsing a token but there is a possibility that the input
+	 * HTML document was truncated in the middle of a token.
+	 *
+	 * The parser is reset at the start of the incomplete token and has paused. There
+	 * is nothing more than can be scanned unless provided a more complete document.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_INCOMPLETE_INPUT = 'STATE_INCOMPLETE_INPUT';
+
+	/**
+	 * Parser Matched Tag State.
+	 *
+	 * Indicates that the parser has found an HTML tag and it's possible to get
+	 * the tag name and read or modify its attributes (if it's not a closing tag).
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_MATCHED_TAG = 'STATE_MATCHED_TAG';
+
+	/**
+	 * Parser Text Node State.
+	 *
+	 * Indicates that the parser has found a text node and it's possible
+	 * to read and modify that text.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_TEXT_NODE = 'STATE_TEXT_NODE';
+
+	/**
+	 * Parser CDATA Node State.
+	 *
+	 * Indicates that the parser has found a CDATA node and it's possible
+	 * to read and modify its modifiable text. Note that in HTML there are
+	 * no CDATA nodes outside of foreign content (SVG and MathML). Outside
+	 * of foreign content, they are treated as HTML comments.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_CDATA_NODE = 'STATE_CDATA_NODE';
+
+	/**
+	 * Indicates that the parser has found an HTML comment and it's
+	 * possible to read and modify its modifiable text.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_COMMENT = 'STATE_COMMENT';
+
+	/**
+	 * Indicates that the parser has found a DOCTYPE node and it's
+	 * possible to read and modify its modifiable text.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_DOCTYPE = 'STATE_DOCTYPE';
+
+	/**
+	 * Indicates that the parser has found an empty tag closer `</>`.
+	 *
+	 * Note that in HTML there are no empty tag closers, and they
+	 * are ignored. Nonetheless, the Tag Processor still
+	 * recognizes them as they appear in the HTML stream.
+	 *
+	 * These were historically discussed as a "presumptuous tag
+	 * closer," which would close the nearest open tag, but were
+	 * dismissed in favor of explicitly-closing tags.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_PRESUMPTUOUS_TAG = 'STATE_PRESUMPTUOUS_TAG';
+
+	/**
+	 * Indicates that the parser has found a "funky comment"
+	 * and it's possible to read and modify its modifiable text.
+	 *
+	 * Example:
+	 *
+	 *     </%url>
+	 *     </{"wp-bit":"query/post-author"}>
+	 *     </2>
+	 *
+	 * Funky comments are tag closers with invalid tag names. Note
+	 * that in HTML these are turn into bogus comments. Nonetheless,
+	 * the Tag Processor recognizes them in a stream of HTML and
+	 * exposes them for inspection and modification.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_FUNKY_COMMENT = 'STATE_WP_FUNKY';
+
+	/**
+	 * Indicates that a comment was created when encountering abruptly-closed HTML comment.
+	 *
+	 * Example:
+	 *
+	 *     <!-->
+	 *     <!--->
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_ABRUPTLY_CLOSED_COMMENT = 'COMMENT_AS_ABRUPTLY_CLOSED_COMMENT';
+
+	/**
+	 * Indicates that a comment would be parsed as a CDATA node,
+	 * were HTML to allow CDATA nodes outside of foreign content.
+	 *
+	 * Example:
+	 *
+	 *     <![CDATA[This is a CDATA node.]]>
+	 *
+	 * This is an HTML comment, but it looks like a CDATA node.
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_CDATA_LOOKALIKE = 'COMMENT_AS_CDATA_LOOKALIKE';
+
+	/**
+	 * Indicates that a comment was created when encountering
+	 * normative HTML comment syntax.
+	 *
+	 * Example:
+	 *
+	 *     <!-- this is a comment -->
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_HTML_COMMENT = 'COMMENT_AS_HTML_COMMENT';
+
+	/**
+	 * Indicates that a comment would be parsed as a Processing
+	 * Instruction node, were they to exist within HTML.
+	 *
+	 * Example:
+	 *
+	 *     <?wp __( 'Like' ) ?>
+	 *
+	 * This is an HTML comment, but it looks like a CDATA node.
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_PI_NODE_LOOKALIKE = 'COMMENT_AS_PI_NODE_LOOKALIKE';
+
+	/**
+	 * Indicates that a comment was created when encountering invalid
+	 * HTML input, a so-called "bogus comment."
+	 *
+	 * Example:
+	 *
+	 *     <?nothing special>
+	 *     <!{nothing special}>
+	 *
+	 * @since 6.5.0
+	 */
+	const COMMENT_AS_INVALID_HTML = 'COMMENT_AS_INVALID_HTML';
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-text-replacement-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-text-replacement-6-7.php
new file mode 100644
index 00000000000000..1be784e6e84a53
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-text-replacement-6-7.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * HTML API: WP_HTML_Text_Replacement class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Core class used by the HTML tag processor as a data structure for replacing
+ * existing content from start to end, allowing to drastically improve performance.
+ *
+ * This class is for internal usage of the WP_HTML_Tag_Processor class.
+ *
+ * @access private
+ * @since 6.2.0
+ * @since 6.5.0 Replace `end` with `length` to more closely match `substr()`.
+ *
+ * @see WP_HTML_Tag_Processor
+ */
+class Gutenberg_HTML_Text_Replacement_6_7 {
+	/**
+	 * Byte offset into document where replacement span begins.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var int
+	 */
+	public $start;
+
+	/**
+	 * Byte length of span being replaced.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var int
+	 */
+	public $length;
+
+	/**
+	 * Span of text to insert in document to replace existing content from start to end.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var string
+	 */
+	public $text;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param int    $start  Byte offset into document where replacement span begins.
+	 * @param int    $length Byte length of span in document being replaced.
+	 * @param string $text   Span of text to insert in document to replace existing content from start to end.
+	 */
+	public function __construct( int $start, int $length, string $text ) {
+		$this->start  = $start;
+		$this->length = $length;
+		$this->text   = $text;
+	}
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-token-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-token-6-7.php
new file mode 100644
index 00000000000000..95adb54f69b081
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-token-6-7.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * HTML API: WP_HTML_Token class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for referring to tokens in the input HTML string.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Token_6_7 {
+	/**
+	 * Name of bookmark corresponding to source of token in input HTML string.
+	 *
+	 * Having a bookmark name does not imply that the token still exists. It
+	 * may be that the source token and underlying bookmark was wiped out by
+	 * some modification to the source HTML.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	public $bookmark_name = null;
+
+	/**
+	 * Name of node; lowercase names such as "marker" are not HTML elements.
+	 *
+	 * For HTML elements/tags this value should come from WP_HTML_Processor::get_tag().
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::get_tag()
+	 *
+	 * @var string
+	 */
+	public $node_name = null;
+
+	/**
+	 * Whether node contains the self-closing flag.
+	 *
+	 * A node may have a self-closing flag when it shouldn't. This value
+	 * only reports if the flag is present in the original HTML.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#self-closing-flag
+	 *
+	 * @var bool
+	 */
+	public $has_self_closing_flag = false;
+
+	/**
+	 * Called when token is garbage-collected or otherwise destroyed.
+	 *
+	 * @var callable|null
+	 */
+	public $on_destroy = null;
+
+	/**
+	 * Constructor - creates a reference to a token in some external HTML string.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string        $bookmark_name         Name of bookmark corresponding to location in HTML where token is found.
+	 * @param string        $node_name             Name of node token represents; if uppercase, an HTML element; if lowercase, a special value like "marker".
+	 * @param bool          $has_self_closing_flag Whether the source token contains the self-closing flag, regardless of whether it's valid.
+	 * @param callable|null $on_destroy            Optional. Function to call when destroying token, useful for releasing the bookmark.
+	 */
+	public function __construct( string $bookmark_name, string $node_name, bool $has_self_closing_flag, ?callable $on_destroy = null ) {
+		$this->bookmark_name         = $bookmark_name;
+		$this->node_name             = $node_name;
+		$this->has_self_closing_flag = $has_self_closing_flag;
+		$this->on_destroy            = $on_destroy;
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * @since 6.4.0
+	 */
+	public function __destruct() {
+		if ( is_callable( $this->on_destroy ) ) {
+			call_user_func( $this->on_destroy, $this->bookmark_name );
+		}
+	}
+
+	/**
+	 * Wakeup magic method.
+	 *
+	 * @since 6.4.2
+	 */
+	public function __wakeup() {
+		throw new \LogicException( __CLASS__ . ' should never be unserialized' );
+	}
+}
diff --git a/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-unsupported-exception-6-7.php b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-unsupported-exception-6-7.php
new file mode 100644
index 00000000000000..2de4c0b98d746c
--- /dev/null
+++ b/lib/compat/wordpress-6.7/html-api/class-gutenberg-html-unsupported-exception-6-7.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * HTML API: WP_HTML_Unsupported_Exception class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for indicating that a given operation is unsupported.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * The HTML API aims to operate in compliance with the HTML5
+ * specification, but does not implement the full specification.
+ * In cases where it lacks support it should not cause breakage
+ * or unexpected behavior. In the cases where it recognizes that
+ * it cannot proceed, this class is used to abort from any
+ * operation and signify that the given HTML cannot be processed.
+ *
+ * @since 6.4.0
+ * @since 6.7.0 Gained contextual information for use in debugging parse failures.
+ *
+ * @access private
+ *
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Unsupported_Exception_6_7 extends Exception {
+	/**
+	 * Name of the matched token when the exception was raised,
+	 * if matched on a token.
+	 *
+	 * This does not imply that the token itself was unsupported, but it
+	 * may have been the case that the token triggered part of the HTML
+	 * parsing that isn't supported, such as the adoption agency algorithm.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var string
+	 */
+	public $token_name;
+
+	/**
+	 * Number of bytes into the input HTML document where the parser was
+	 * parsing when the exception was raised.
+	 *
+	 * Use this to reconstruct context for the failure.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var int
+	 */
+	public $token_at;
+
+	/**
+	 * Full raw text of the matched token when the exception was raised,
+	 * if matched on a token.
+	 *
+	 * Whereas the `$token_name` will be normalized, this contains the full
+	 * raw text of the token, including original casing, duplicated attributes,
+	 * and other syntactic variations that are normally abstracted in the HTML API.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var string
+	 */
+	public $token;
+
+	/**
+	 * Stack of open elements when the exception was raised.
+	 *
+	 * Use this to trace the parsing circumstances which led to the exception.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var string[]
+	 */
+	public $stack_of_open_elements = array();
+
+	/**
+	 * List of active formatting elements when the exception was raised.
+	 *
+	 * Use this to trace the parsing circumstances which led to the exception.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @var string[]
+	 */
+	public $active_formatting_elements = array();
+
+	/**
+	 * Constructor function.
+	 *
+	 * @since 6.7.0
+	 *
+	 * @param string   $message                    Brief message explaining what is unsupported, the reason this exception was raised.
+	 * @param string   $token_name                 Normalized name of matched token when this exception was raised.
+	 * @param int      $token_at                   Number of bytes into source HTML document where matched token starts.
+	 * @param string   $token                      Full raw text of matched token when this exception was raised.
+	 * @param string[] $stack_of_open_elements     Stack of open elements when this exception was raised.
+	 * @param string[] $active_formatting_elements List of active formatting elements when this exception was raised.
+	 */
+	public function __construct( string $message, string $token_name, int $token_at, string $token, array $stack_of_open_elements, array $active_formatting_elements ) {
+		parent::__construct( $message );
+
+		$this->token_name = $token_name;
+		$this->token_at   = $token_at;
+		$this->token      = $token;
+
+		$this->stack_of_open_elements     = $stack_of_open_elements;
+		$this->active_formatting_elements = $active_formatting_elements;
+	}
+}
diff --git a/lib/compat/wordpress-6.7/post-formats.php b/lib/compat/wordpress-6.7/post-formats.php
new file mode 100644
index 00000000000000..d3de5b83957e29
--- /dev/null
+++ b/lib/compat/wordpress-6.7/post-formats.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Shims for changes to post formats until they are merged in all
+ * versions of WordPress which Gutenberg supports.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Registers the extension of the WP_REST_Posts_Controller class,
+ * to add support for post formats.
+ */
+function gutenberg_post_format_rest_posts_controller( $args ) {
+	/**
+	 * This hook runs before support values are available via `post_type_supports`.
+	 * Check registration arguments for REST API controller override.
+	 */
+	if ( ! empty( $args['supports'] ) && in_array( 'post-formats', $args['supports'], true ) ) {
+		$args['rest_controller_class'] = 'Gutenberg_REST_Posts_Controller_6_7';
+	}
+
+	return $args;
+}
+add_filter( 'register_post_type_args', 'gutenberg_post_format_rest_posts_controller', 10 );
diff --git a/lib/compat/wordpress-6.7/rest-api.php b/lib/compat/wordpress-6.7/rest-api.php
new file mode 100644
index 00000000000000..313367594caae0
--- /dev/null
+++ b/lib/compat/wordpress-6.7/rest-api.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * PHP and WordPress configuration compatibility functions for the Gutenberg
+ * editor plugin changes related to REST API.
+ *
+ * @package gutenberg
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	die( 'Silence is golden.' );
+}
+
+/**
+ * Update the preload paths registered in Core (`site-editor.php` or `edit-form-blocks.php`).
+ *
+ * @param array                   $paths REST API paths to preload.
+ * @param WP_Block_Editor_Context $context Current block editor context.
+ * @return array Filtered preload paths.
+ */
+function gutenberg_block_editor_preload_paths_6_7( $paths, $context ) {
+	if ( 'core/edit-site' === $context->name ) {
+		// Fixes post type name. It should be `type/wp_template_part`.
+		$parts_key = array_search( '/wp/v2/types/wp_template-part?context=edit', $paths, true );
+		if ( false !== $parts_key ) {
+			$paths[ $parts_key ] = '/wp/v2/types/wp_template_part?context=edit';
+		}
+
+		$page_options_path = array( rest_get_route_for_post_type_items( 'page' ), 'OPTIONS' );
+		$page_options_key  = array_search( $page_options_path, $paths, true );
+		if ( false === $page_options_key ) {
+			$paths[] = $page_options_path;
+		}
+	}
+
+	if ( 'core/edit-post' === $context->name ) {
+		$reusable_blocks_key = array_search(
+			add_query_arg(
+				array(
+					'context'  => 'edit',
+					'per_page' => -1,
+				),
+				rest_get_route_for_post_type_items( 'wp_block' )
+			),
+			$paths,
+			true
+		);
+
+		if ( false !== $reusable_blocks_key ) {
+			unset( $paths[ $reusable_blocks_key ] );
+		}
+	}
+
+	return $paths;
+}
+add_filter( 'block_editor_rest_api_preload_paths', 'gutenberg_block_editor_preload_paths_6_7', 10, 2 );
+
+if ( ! function_exists( 'wp_api_template_registry' ) ) {
+	/**
+	 * Hook in to the template and template part post types and modify the rest
+	 * endpoint to include modifications to read templates from the
+	 * BlockTemplatesRegistry.
+	 *
+	 * @param array  $args Current registered post type args.
+	 * @param string $post_type Name of post type.
+	 *
+	 * @return array
+	 */
+	function wp_api_template_registry( $args, $post_type ) {
+		if ( 'wp_template' === $post_type || 'wp_template_part' === $post_type ) {
+			$args['rest_controller_class'] = 'Gutenberg_REST_Templates_Controller_6_7';
+		}
+		return $args;
+	}
+}
+add_filter( 'register_post_type_args', 'wp_api_template_registry', 10, 2 );
+
+/**
+ * Adds `plugin` fields to WP_REST_Templates_Controller class.
+ */
+function gutenberg_register_wp_rest_templates_controller_plugin_field() {
+
+	register_rest_field(
+		'wp_template',
+		'plugin',
+		array(
+			'get_callback'    => function ( $template_object ) {
+				if ( $template_object ) {
+					$registered_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $template_object['slug'] );
+					if ( $registered_template ) {
+						return $registered_template->plugin;
+					}
+				}
+
+				return;
+			},
+			'update_callback' => null,
+			'schema'          => array(
+				'type'        => 'string',
+				'description' => __( 'Plugin that registered the template.', 'gutenberg' ),
+				'readonly'    => true,
+				'context'     => array( 'view', 'edit', 'embed' ),
+			),
+		)
+	);
+}
+add_action( 'rest_api_init', 'gutenberg_register_wp_rest_templates_controller_plugin_field' );
+
+/**
+ * Overrides the default 'WP_REST_Server' class.
+ *
+ * @return string The name of the custom server class.
+ */
+function gutenberg_override_default_rest_server() {
+	return 'Gutenberg_REST_Server';
+}
+add_filter( 'wp_rest_server_class', 'gutenberg_override_default_rest_server', 1 );
+
+
+/**
+ * Filters the arguments for registering a wp_global_styles post type.
+ * Note when syncing to Core: the capabilities should be updates for `wp_global_styles` in the wp-includes/post.php.
+ *
+ * @since 6.7.0
+ *
+ * @param array  $args      Array of arguments for registering a post type.
+ *                          See the register_post_type() function for accepted arguments.
+ * @param string $post_type Post type key.
+ *
+ * @return array Array of arguments for registering a post type.
+ */
+function gutenberg_register_post_type_args_for_wp_global_styles( $args, $post_type ) {
+	if ( 'wp_global_styles' === $post_type ) {
+		$args['capabilities']['read'] = 'edit_posts';
+	}
+
+	return $args;
+}
+
+add_filter( 'register_post_type_args', 'gutenberg_register_post_type_args_for_wp_global_styles', 10, 2 );
diff --git a/lib/compat/wordpress-6.7/script-modules.php b/lib/compat/wordpress-6.7/script-modules.php
new file mode 100644
index 00000000000000..2282a3d4bd5acd
--- /dev/null
+++ b/lib/compat/wordpress-6.7/script-modules.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * Print data associated with Script Modules in Script tags.
+ *
+ * This embeds data in the page HTML so that it is available on page load.
+ *
+ * Data can be associated with a given Script Module by using the
+ * `script_module_data_{$module_id}` filter.
+ *
+ * The data for a given Script Module will be JSON serialized in a script tag with an ID
+ * like `wp-script-module-data-{$module_id}`.
+ */
+function gutenberg_print_script_module_data(): void {
+	$get_marked_for_enqueue = new ReflectionMethod( 'WP_Script_Modules', 'get_marked_for_enqueue' );
+	$get_marked_for_enqueue->setAccessible( true );
+	$get_import_map = new ReflectionMethod( 'WP_Script_Modules', 'get_import_map' );
+	$get_import_map->setAccessible( true );
+
+	$modules = array();
+	foreach ( array_keys( $get_marked_for_enqueue->invoke( wp_script_modules() ) ) as $id ) {
+		$modules[ $id ] = true;
+	}
+	foreach ( array_keys( $get_import_map->invoke( wp_script_modules() )['imports'] ) as $id ) {
+		$modules[ $id ] = true;
+	}
+
+	foreach ( array_keys( $modules ) as $module_id ) {
+		/**
+		 * Filters data associated with a given Script Module.
+		 *
+		 * Script Modules may require data that is required for initialization or is essential to
+		 * have immediately available on page load. These are suitable use cases for this data.
+		 *
+		 * This is best suited to a minimal set of data and is not intended to replace the REST API.
+		 *
+		 * If the filter returns no data (an empty array), nothing will be embedded in the page.
+		 *
+		 * The data for a given Script Module, if provided, will be JSON serialized in a script tag
+		 * with an ID like `wp-script-module-data-{$module_id}`.
+		 *
+		 * The dynamic portion of the hook name, `$module_id`, refers to the Script Module ID that
+		 * the data is associated with.
+		 *
+		 * @param array $data The data that should be associated with the array.
+		 */
+		$data = apply_filters( "script_module_data_{$module_id}", array() );
+
+		if ( is_array( $data ) && ! empty( $data ) ) {
+			/*
+			 * This data will be printed as JSON inside a script tag like this:
+			 *   <script type="application/json"></script>
+			 *
+			 * A script tag must be closed by a sequence beginning with `</`. It's impossible to
+			 * close a script tag without using `<`. We ensure that `<` is escaped and `/` can
+			 * remain unescaped, so `</script>` will be printed as `\u003C/script\u00E3`.
+			 *
+			 *   - JSON_HEX_TAG: All < and > are converted to \u003C and \u003E.
+			 *   - JSON_UNESCAPED_SLASHES: Don't escape /.
+			 *
+			 * If the page will use UTF-8 encoding, it's safe to print unescaped unicode:
+			 *
+			 *   - JSON_UNESCAPED_UNICODE: Encode multibyte Unicode characters literally (instead of as `\uXXXX`).
+			 *   - JSON_UNESCAPED_LINE_TERMINATORS: The line terminators are kept unescaped when
+			 *     JSON_UNESCAPED_UNICODE is supplied. It uses the same behaviour as it was
+			 *     before PHP 7.1 without this constant. Available as of PHP 7.1.0.
+			 *
+			 * The JSON specification requires encoding in UTF-8, so if the generated HTML page
+			 * is not encoded in UTF-8 then it's not safe to include those literals. They must
+			 * be escaped to avoid encoding issues.
+			 *
+			 * @see https://www.rfc-editor.org/rfc/rfc8259.html for details on encoding requirements.
+			 * @see https://www.php.net/manual/en/json.constants.php for details on these constants.
+			 * @see https://html.spec.whatwg.org/#script-data-state for details on script tag parsing.
+			 */
+			$json_encode_flags = JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_LINE_TERMINATORS;
+			if ( 'UTF-8' !== get_option( 'blog_charset' ) ) {
+				$json_encode_flags = JSON_HEX_TAG | JSON_UNESCAPED_SLASHES;
+			}
+
+			wp_print_inline_script_tag(
+				wp_json_encode( $data, $json_encode_flags ),
+				array(
+					'type' => 'application/json',
+					'id'   => "wp-script-module-data-{$module_id}",
+				)
+			);
+		}
+	}
+}
+
+add_action(
+	'after_setup_theme',
+	function () {
+		if ( ! has_action( 'wp_footer', array( wp_script_modules(), 'print_script_module_data' ) ) ) {
+			add_action( 'wp_footer', 'gutenberg_print_script_module_data' );
+		}
+
+		if ( ! has_action( 'admin_print_footer_scripts', array( wp_script_modules(), 'print_script_module_data' ) ) ) {
+			add_action( 'admin_print_footer_scripts', 'gutenberg_print_script_module_data' );
+		}
+	},
+	20
+);
+
+/**
+ * Prints HTML for the a11y Script Module.
+ *
+ * a11y relies on some DOM elements to use as ARIA live regions.
+ * Ideally, these elements are part of the initial HTML of the page
+ * so that accessibility tools can find them and observe updates.
+ */
+function gutenberg_a11y_script_module_html() {
+	$a11y_module_available = false;
+
+	$get_marked_for_enqueue = new ReflectionMethod( 'WP_Script_Modules', 'get_marked_for_enqueue' );
+	$get_marked_for_enqueue->setAccessible( true );
+	$get_import_map = new ReflectionMethod( 'WP_Script_Modules', 'get_import_map' );
+	$get_import_map->setAccessible( true );
+
+	foreach ( array_keys( $get_marked_for_enqueue->invoke( wp_script_modules() ) ) as $id ) {
+		if ( '@wordpress/a11y' === $id ) {
+			$a11y_module_available = true;
+			break;
+		}
+	}
+	if ( ! $a11y_module_available ) {
+		foreach ( array_keys( $get_import_map->invoke( wp_script_modules() )['imports'] ) as $id ) {
+			if ( '@wordpress/a11y' === $id ) {
+				$a11y_module_available = true;
+				break;
+			}
+		}
+	}
+	if ( ! $a11y_module_available ) {
+		return;
+	}
+	echo '<div style="position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip-path:inset(50%);border:0;word-wrap:normal !important;">'
+		. '<p id="a11y-speak-intro-text" class="a11y-speak-intro-text" hidden>' . esc_html__( 'Notifications', 'default' ) . '</p>'
+		. '<div id="a11y-speak-assertive" class="a11y-speak-region" aria-live="assertive" aria-relevant="additions text" aria-atomic="true"></div>'
+		. '<div id="a11y-speak-polite" class="a11y-speak-region" aria-live="polite" aria-relevant="additions text" aria-atomic="true"></div>'
+		. '</div>';
+}
+if ( ! method_exists( 'WP_Script_Modules', 'print_a11y_script_module_html' ) ) {
+	add_action( 'wp_footer', 'gutenberg_a11y_script_module_html' );
+	add_action( 'admin_footer', 'gutenberg_a11y_script_module_html' );
+}
diff --git a/lib/compat/wordpress-6.8/block-comments.php b/lib/compat/wordpress-6.8/block-comments.php
new file mode 100644
index 00000000000000..ff9f03b69aa1c3
--- /dev/null
+++ b/lib/compat/wordpress-6.8/block-comments.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Updates the comment type in the REST API for WordPress version 6.7.
+ *
+ * This function is used as a filter callback for the 'rest_pre_insert_comment' hook.
+ * It checks if the 'comment_type' parameter is set to 'block_comment' in the REST API request,
+ * and if so, updates the 'comment_type' and 'comment_approved' properties of the prepared comment.
+ *
+ * @param array $prepared_comment The prepared comment data.
+ * @param WP_REST_Request $request The REST API request object.
+ * @return array The updated prepared comment data.
+ */
+if ( ! function_exists( 'update_comment_type_in_rest_api_6_8' ) && gutenberg_is_experiment_enabled( 'gutenberg-block-comment' ) ) {
+	function update_comment_type_in_rest_api_6_8( $prepared_comment, $request ) {
+		if ( ! empty( $request['comment_type'] ) && 'block_comment' === $request['comment_type'] ) {
+			$prepared_comment['comment_type']     = $request['comment_type'];
+			$prepared_comment['comment_approved'] = $request['comment_approved'];
+		}
+
+		return $prepared_comment;
+	}
+	add_filter( 'rest_pre_insert_comment', 'update_comment_type_in_rest_api_6_8', 10, 2 );
+}
+
+/**
+ * Updates the comment type for avatars in the WordPress REST API.
+ *
+ * This function adds the 'block_comment' type to the list of comment types
+ * for which avatars should be retrieved in the WordPress REST API.
+ *
+ * @param array $comment_type The array of comment types.
+ * @return array The updated array of comment types.
+ */
+if ( ! function_exists( 'update_get_avatar_comment_type' ) && gutenberg_is_experiment_enabled( 'gutenberg-block-comment' ) ) {
+	function update_get_avatar_comment_type( $comment_type ) {
+		$comment_type[] = 'block_comment';
+		return $comment_type;
+	}
+	add_filter( 'get_avatar_comment_types', 'update_get_avatar_comment_type' );
+}
+
+/**
+ * Excludes block comments from the admin comments query.
+ *
+ * This function modifies the comments query to exclude comments of type 'block_comment'
+ * when the query is for comments in the WordPress admin.
+ *
+ * @param WP_Comment_Query $query The current comments query.
+ *
+ * @return void
+ */
+if ( ! function_exists( 'exclude_block_comments_from_admin' ) && gutenberg_is_experiment_enabled( 'gutenberg-block-comment' ) ) {
+	function exclude_block_comments_from_admin( $query ) {
+		// Only modify the query if it's for comments
+		if ( isset( $query->query_vars['type'] ) && '' === $query->query_vars['type'] ) {
+			$query->set( 'type', '' );
+
+			add_filter(
+				'comments_clauses',
+				function ( $clauses ) {
+					global $wpdb;
+					// Exclude comments of type 'block_comment'
+					$clauses['where'] .= " AND {$wpdb->comments}.comment_type != 'block_comment'";
+					return $clauses;
+				}
+			);
+		}
+	}
+	add_action( 'pre_get_comments', 'exclude_block_comments_from_admin' );
+}
diff --git a/lib/compat/wordpress-6.8/class-gutenberg-rest-comment-controller-6-8.php b/lib/compat/wordpress-6.8/class-gutenberg-rest-comment-controller-6-8.php
new file mode 100644
index 00000000000000..981b9dbd840319
--- /dev/null
+++ b/lib/compat/wordpress-6.8/class-gutenberg-rest-comment-controller-6-8.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * A custom REST server for Gutenberg.
+ *
+ * @package gutenberg
+ * @since   6.8.0
+ */
+
+// Create a new class that extends WP_REST_Comments_Controller
+class Gutenberg_REST_Comment_Controller_6_8 extends WP_REST_Comments_Controller {
+
+	public function create_item_permissions_check( $request ) {
+		if ( ! is_user_logged_in() ) {
+			if ( get_option( 'comment_registration' ) ) {
+				return new WP_Error(
+					'rest_comment_login_required',
+					__( 'Sorry, you must be logged in to comment.' ),
+					array( 'status' => 401 )
+				);
+			}
+
+			/**
+			 * Filters whether comments can be created via the REST API without authentication.
+			 *
+			 * Enables creating comments for anonymous users.
+			 *
+			 * @since 4.7.0
+			 *
+			 * @param bool $allow_anonymous Whether to allow anonymous comments to
+			 *                              be created. Default `false`.
+			 * @param WP_REST_Request $request Request used to generate the
+			 *                                 response.
+			 */
+			$allow_anonymous = apply_filters( 'rest_allow_anonymous_comments', false, $request );
+
+			if ( ! $allow_anonymous ) {
+				return new WP_Error(
+					'rest_comment_login_required',
+					__( 'Sorry, you must be logged in to comment.' ),
+					array( 'status' => 401 )
+				);
+			}
+		}
+
+		// Limit who can set comment `author`, `author_ip` or `status` to anything other than the default.
+		if ( isset( $request['author'] ) && get_current_user_id() !== $request['author'] && ! current_user_can( 'moderate_comments' ) ) {
+			return new WP_Error(
+				'rest_comment_invalid_author',
+				/* translators: %s: Request parameter. */
+				sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'author' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
+		if ( isset( $request['author_ip'] ) && ! current_user_can( 'moderate_comments' ) ) {
+			if ( empty( $_SERVER['REMOTE_ADDR'] ) || $request['author_ip'] !== $_SERVER['REMOTE_ADDR'] ) {
+				return new WP_Error(
+					'rest_comment_invalid_author_ip',
+					/* translators: %s: Request parameter. */
+					sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'author_ip' ),
+					array( 'status' => rest_authorization_required_code() )
+				);
+			}
+		}
+
+		if ( isset( $request['status'] ) && ! current_user_can( 'moderate_comments' ) ) {
+			return new WP_Error(
+				'rest_comment_invalid_status',
+				/* translators: %s: Request parameter. */
+				sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'status' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
+		if ( empty( $request['post'] ) ) {
+			return new WP_Error(
+				'rest_comment_invalid_post_id',
+				__( 'Sorry, you are not allowed to create this comment without a post.' ),
+				array( 'status' => 403 )
+			);
+		}
+
+		$post = get_post( (int) $request['post'] );
+
+		if ( ! $post ) {
+			return new WP_Error(
+				'rest_comment_invalid_post_id',
+				__( 'Sorry, you are not allowed to create this comment without a post.' ),
+				array( 'status' => 403 )
+			);
+		}
+
+		if ( 'draft' === $post->post_status && 'comment' === $request['comment_type'] ) {
+			return new WP_Error(
+				'rest_comment_draft_post',
+				__( 'Sorry, you are not allowed to create a comment on this post.' ),
+				array( 'status' => 403 )
+			);
+		}
+
+		if ( 'trash' === $post->post_status ) {
+			return new WP_Error(
+				'rest_comment_trash_post',
+				__( 'Sorry, you are not allowed to create a comment on this post.' ),
+				array( 'status' => 403 )
+			);
+		}
+
+		if ( ! $this->check_read_post_permission( $post, $request ) ) {
+			return new WP_Error(
+				'rest_cannot_read_post',
+				__( 'Sorry, you are not allowed to read the post for this comment.' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
+		if ( ! comments_open( $post->ID ) && 'comment' === $request['comment_type'] ) {
+			return new WP_Error(
+				'rest_comment_closed',
+				__( 'Sorry, comments are closed for this item.' ),
+				array( 'status' => 403 )
+			);
+		}
+
+		return true;
+	}
+}
+
+add_action(
+	'rest_api_init',
+	function () {
+		$controller = new Gutenberg_REST_Comment_Controller_6_8();
+		$controller->register_routes();
+	}
+);
diff --git a/lib/compat/wordpress-6.8/remove-default-css.php b/lib/compat/wordpress-6.8/remove-default-css.php
new file mode 100644
index 00000000000000..1076d84f299214
--- /dev/null
+++ b/lib/compat/wordpress-6.8/remove-default-css.php
@@ -0,0 +1,11 @@
+<?php
+
+function gutenberg_remove_default_css( $hook ) {
+	// Maybe also remove on post.php when Gutenberg is enabled for posts.
+	if ( 'site-editor.php' !== $hook ) {
+		return;
+	}
+	wp_dequeue_style( 'colors' );
+}
+
+add_action( 'admin_enqueue_scripts', 'gutenberg_remove_default_css' );
diff --git a/lib/experimental/block-editor-settings-mobile.php b/lib/experimental/block-editor-settings-mobile.php
index 91e3694c199f83..62c03db222afce 100644
--- a/lib/experimental/block-editor-settings-mobile.php
+++ b/lib/experimental/block-editor-settings-mobile.php
@@ -16,24 +16,15 @@
  * @return array New block editor settings.
  */
 function gutenberg_get_block_editor_settings_mobile( $settings ) {
-	if (
-		defined( 'REST_REQUEST' ) &&
-		REST_REQUEST &&
-		isset( $_GET['context'] ) &&
-		'mobile' === $_GET['context']
-	) {
-		if ( wp_theme_has_theme_json() ) {
-			$settings['__experimentalStyles'] = gutenberg_get_global_styles();
-		}
-
-		// To tell mobile that the site uses quote v2 (inner blocks).
-		// See https://github.com/WordPress/gutenberg/pull/25892.
-		$settings['__experimentalEnableQuoteBlockV2'] = true;
-		// To tell mobile that the site uses list v2 (inner blocks).
-		$settings['__experimentalEnableListBlockV2'] = true;
+	if ( wp_theme_has_theme_json() ) {
+		$settings['__experimentalStyles'] = gutenberg_get_global_styles();
 	}
 
+	// To tell mobile that the site uses quote v2 (inner blocks).
+	// See https://github.com/WordPress/gutenberg/pull/25892.
+	$settings['__experimentalEnableQuoteBlockV2'] = true;
+	// To tell mobile that the site uses list v2 (inner blocks).
+	$settings['__experimentalEnableListBlockV2'] = true;
+
 	return $settings;
 }
-
-add_filter( 'block_editor_settings_all', 'gutenberg_get_block_editor_settings_mobile', PHP_INT_MAX );
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index 88e46b478389d2..68113276ec1c06 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -78,123 +78,42 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 	}
 }
 
-
-
-
-$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-if ( $gutenberg_experiments && (
-	array_key_exists( 'gutenberg-connections', $gutenberg_experiments ) ||
-	array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments )
-) ) {
-	/**
-	 * Renders the block meta attributes.
-	 *
-	 * @param string   $block_content Block Content.
-	 * @param array    $block Block attributes.
-	 * @param WP_Block $block_instance The block instance.
-	 */
-	function gutenberg_render_block_connections( $block_content, $block, $block_instance ) {
-		$connection_sources = require __DIR__ . '/connection-sources/index.php';
-		$block_type         = $block_instance->block_type;
-
-		// Allowlist of blocks that support block connections.
-		// Currently, we only allow the following blocks and attributes:
-		// - Paragraph: content.
-		// - Image: url.
-		$blocks_attributes_allowlist = array(
-			'core/paragraph' => array( 'content' ),
-			'core/image'     => array( 'url' ),
+/**
+ * Registers a new block style for one or more block types.
+ *
+ * WP_Block_Styles_Registry was marked as `final` in core so it cannot be
+ * updated via Gutenberg to allow registration of a style across multiple
+ * block types as well as with an optional style object. This function will
+ * support the desired functionality until the styles registry can be updated
+ * in core.
+ *
+ * @param string|array $block_name       Block type name including namespace or array of namespaced block type names.
+ * @param array        $style_properties Array containing the properties of the style name, label,
+ *                                       style_handle (name of the stylesheet to be enqueued),
+ *                                       inline_style (string containing the CSS to be added),
+ *                                       style_data (theme.json-like object to generate CSS from).
+ *
+ * @return bool True if all block styles were registered with success and false otherwise.
+ */
+function gutenberg_register_block_style( $block_name, $style_properties ) {
+	if ( ! is_string( $block_name ) && ! is_array( $block_name ) ) {
+		_doing_it_wrong(
+			__METHOD__,
+			__( 'Block name must be a string or array.', 'gutenberg' ),
+			'6.6.0'
 		);
 
-		// Whitelist of the block types that support block connections.
-		// Currently, we only allow the Paragraph and Image blocks to use block connections.
-		if ( ! in_array( $block['blockName'], array_keys( $blocks_attributes_allowlist ), true ) ) {
-			return $block_content;
-		}
-
-		// If for some reason, the block type is not found, skip it.
-		if ( null === $block_type ) {
-			return $block_content;
-		}
-
-		// If the block does not have support for block connections, skip it.
-		if ( ! block_has_support( $block_type, array( '__experimentalConnections' ), false ) ) {
-			return $block_content;
-		}
-
-		// Get all the attributes that have a connection.
-		$connected_attributes = $block['attrs']['connections']['attributes'] ?? false;
-		if ( ! $connected_attributes ) {
-			return $block_content;
-		}
-
-		foreach ( $connected_attributes as $attribute_name => $attribute_value ) {
-
-			// If the attribute is not in the allowlist, skip it.
-			if ( ! in_array( $attribute_name, $blocks_attributes_allowlist[ $block['blockName'] ], true ) ) {
-				continue;
-			}
-
-			// Skip if the source value is not "meta_fields" or "pattern_attributes".
-			if ( 'meta_fields' !== $attribute_value['source'] && 'pattern_attributes' !== $attribute_value['source'] ) {
-				continue;
-			}
-
-			// If the attribute does not have a source, skip it.
-			if ( ! isset( $block_type->attributes[ $attribute_name ]['source'] ) ) {
-				continue;
-			}
-
-			if ( 'pattern_attributes' === $attribute_value['source'] ) {
-				if ( ! _wp_array_get( $block_instance->attributes, array( 'metadata', 'id' ), false ) ) {
-					continue;
-				}
-
-				$custom_value = $connection_sources[ $attribute_value['source'] ]( $block_instance );
-			} else {
-				// If the attribute does not specify the name of the custom field, skip it.
-				if ( ! isset( $attribute_value['value'] ) ) {
-					continue;
-				}
-
-				// Get the content from the connection source.
-				$custom_value = $connection_sources[ $attribute_value['source'] ](
-					$block_instance,
-					$attribute_value['value']
-				);
-			}
-
-			if ( false === $custom_value ) {
-				continue;
-			}
-
-			$tags  = new WP_HTML_Tag_Processor( $block_content );
-			$found = $tags->next_tag(
-				array(
-					// TODO: In the future, when blocks other than Paragraph and Image are
-					// supported, we should build the full query from CSS selector.
-					'tag_name' => $block_type->attributes[ $attribute_name ]['selector'],
-				)
-			);
-			if ( ! $found ) {
-				return $block_content;
-			}
-			$tag_name     = $tags->get_tag();
-			$markup       = "<$tag_name>$custom_value</$tag_name>";
-			$updated_tags = new WP_HTML_Tag_Processor( $markup );
-			$updated_tags->next_tag();
+		return false;
+	}
 
-			// Get all the attributes from the original block and add them to the new markup.
-			$names = $tags->get_attribute_names_with_prefix( '' );
-			foreach ( $names as $name ) {
-				$updated_tags->set_attribute( $name, $tags->get_attribute( $name ) );
-			}
+	$block_names = is_string( $block_name ) ? array( $block_name ) : $block_name;
+	$result      = true;
 
-			return $updated_tags->get_updated_html();
+	foreach ( $block_names as $name ) {
+		if ( ! WP_Block_Styles_Registry::get_instance()->register( $name, $style_properties ) ) {
+			$result = false;
 		}
-
-		return $block_content;
 	}
 
-	add_filter( 'render_block', 'gutenberg_render_block_connections', 10, 3 );
+	return $result;
 }
diff --git a/lib/experimental/class--wp-editors.php b/lib/experimental/class--wp-editors.php
index 41062db75c0700..5ab06fefe92c0f 100644
--- a/lib/experimental/class--wp-editors.php
+++ b/lib/experimental/class--wp-editors.php
@@ -8,24 +8,23 @@
 
 // phpcs:disable PEAR.NamingConventions.ValidClassName.StartWithCapital
 
-if ( class_exists( '_WP_Editors' ) ) {
-	return;
-}
+if ( ! class_exists( '_WP_Editors' ) ) {
 
-/**
- * Placeholder class.
- * Used to disable loading of TinyMCE assets.
- *
- * @access public
- */
-final class _WP_Editors {
 	/**
-	 * Necessary to ensure no additional TinyMCE assets are enqueued.
+	 * Placeholder class.
+	 * Used to disable loading of TinyMCE assets.
+	 *
+	 * @access public
 	 */
-	public static function enqueue_default_editor() {}
+	final class _WP_Editors {
+		/**
+		 * Necessary to ensure no additional TinyMCE assets are enqueued.
+		 */
+		public static function enqueue_default_editor() {}
 
-	/**
-	 * Necessary for wp admin dashboard.
-	 */
-	public static function editor() {}
+		/**
+		 * Necessary for wp admin dashboard.
+		 */
+		public static function editor() {}
+	}
 }
diff --git a/lib/experimental/class-gutenberg-rest-template-revision-count.php b/lib/experimental/class-gutenberg-rest-template-revision-count.php
deleted file mode 100644
index 17fb34e05ecfe1..00000000000000
--- a/lib/experimental/class-gutenberg-rest-template-revision-count.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * REST API: Gutenberg_REST_Template_Revision_Count class
- *
- * @package    gutenberg
- */
-
-/**
- * Gutenberg_REST_Template_Revision_Count class
- *
- * Template revision changes are waiting on a core change to be merged.
- * See: https://github.com/WordPress/gutenberg/pull/45215#issuecomment-1592704026
- * When merging into core, prepare_revision_links() should be merged with
- * WP_REST_Templates_Controller::prepare_links().
- */
-class Gutenberg_REST_Template_Revision_Count extends WP_REST_Templates_Controller {
-	/**
-	 * Add revisions to the response.
-	 *
-	 * @param WP_Block_Template $item    Template instance.
-	 * @param WP_REST_Request   $request Request object.
-	 * @return WP_REST_Response Response object.
-	 */
-	public function prepare_item_for_response( $item, $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		$template = $item;
-
-		$fields = $this->get_fields_for_response( $request );
-
-		$response = parent::prepare_item_for_response( $item, $request );
-
-		if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
-			$links = $this->prepare_revision_links( $template );
-			$response->add_links( $links );
-			if ( ! empty( $links['self']['href'] ) ) {
-				$actions = $this->get_available_actions();
-				$self    = $links['self']['href'];
-				foreach ( $actions as $rel ) {
-					$response->add_link( $rel, $self );
-				}
-			}
-		}
-
-		return $response;
-	}
-
-	/**
-	 * Adds revisions to links.
-	 *
-	 * @param WP_Block_Template $template  Template instance.
-	 * @return array Links for the given post.
-	 */
-	protected function prepare_revision_links( $template ) {
-		$links = array();
-
-		if ( post_type_supports( $this->post_type, 'revisions' ) && (int) $template->wp_id ) {
-			$revisions       = wp_get_latest_revision_id_and_total_count( (int) $template->wp_id );
-			$revisions_count = ! is_wp_error( $revisions ) ? $revisions['count'] : 0;
-			$revisions_base  = sprintf( '/%s/%s/%s/revisions', $this->namespace, $this->rest_base, $template->id );
-
-			$links['version-history'] = array(
-				'href'  => rest_url( $revisions_base ),
-				'count' => $revisions_count,
-			);
-
-			if ( $revisions_count > 0 ) {
-				$links['predecessor-version'] = array(
-					'href' => rest_url( $revisions_base . '/' . $revisions['latest_id'] ),
-					'id'   => $revisions['latest_id'],
-				);
-			}
-		}
-
-		return $links;
-	}
-}
diff --git a/lib/experimental/class-wp-rest-block-editor-settings-controller.php b/lib/experimental/class-wp-rest-block-editor-settings-controller.php
index 510ae573e3de8e..ed2dcfe8584a6c 100644
--- a/lib/experimental/class-wp-rest-block-editor-settings-controller.php
+++ b/lib/experimental/class-wp-rest-block-editor-settings-controller.php
@@ -6,317 +6,320 @@
  * @subpackage REST_API
  */
 
-if ( class_exists( 'WP_REST_Block_Editor_Settings_Controller' ) ) {
-	return;
-}
+if ( ! class_exists( 'WP_REST_Block_Editor_Settings_Controller' ) ) {
 
-/**
- * Core class used to retrieve the block editor settings via the REST API.
- *
- * @see WP_REST_Controller
- */
-class WP_REST_Block_Editor_Settings_Controller extends WP_REST_Controller {
 	/**
-	 * Constructs the controller.
+	 * Core class used to retrieve the block editor settings via the REST API.
+	 *
+	 * @see WP_REST_Controller
 	 */
-	public function __construct() {
-		$this->namespace = 'wp-block-editor/v1';
-		$this->rest_base = 'settings';
-	}
+	class WP_REST_Block_Editor_Settings_Controller extends WP_REST_Controller {
+		/**
+		 * Constructs the controller.
+		 */
+		public function __construct() {
+			$this->namespace = 'wp-block-editor/v1';
+			$this->rest_base = 'settings';
+		}
 
-	/**
-	 * Registers the necessary REST API routes.
-	 */
-	public function register_routes() {
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base,
-			array(
+		/**
+		 * Registers the necessary REST API routes.
+		 */
+		public function register_routes() {
+			register_rest_route(
+				$this->namespace,
+				'/' . $this->rest_base,
 				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				),
-				'schema' => array( $this, 'get_public_item_schema' ),
-			)
-		);
-	}
-
-	/**
-	 * Checks whether a given request has permission to read block editor settings
-	 *
-	 * @since 5.8.0
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 *
-	 * @return WP_Error|bool True if the request has permission, WP_Error object otherwise.
-	 */
-	public function get_items_permissions_check( $request ) {// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		if ( current_user_can( 'edit_posts' ) ) {
-			return true;
+					array(
+						'methods'             => WP_REST_Server::READABLE,
+						'callback'            => array( $this, 'get_items' ),
+						'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					),
+					'schema' => array( $this, 'get_public_item_schema' ),
+				)
+			);
 		}
 
-		foreach ( get_post_types( array( 'show_in_rest' => true ), 'objects' ) as $post_type ) {
-			if ( current_user_can( $post_type->cap->edit_posts ) ) {
+		/**
+		 * Checks whether a given request has permission to read block editor settings
+		 *
+		 * @since 5.8.0
+		 *
+		 * @param WP_REST_Request $request Full details about the request.
+		 *
+		 * @return WP_Error|bool True if the request has permission, WP_Error object otherwise.
+		 */
+		public function get_items_permissions_check( $request ) {// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+			if ( current_user_can( 'edit_posts' ) ) {
 				return true;
 			}
-		}
-
-		return new WP_Error(
-			'rest_cannot_read_block_editor_settings',
-			__( 'Sorry, you are not allowed to read the block editor settings.', 'gutenberg' ),
-			array( 'status' => rest_authorization_required_code() )
-		);
-	}
 
-	/**
-	 * Returns the block editor's settings
-	 *
-	 * @since 5.8.0
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 *
-	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
-	 */
-	public function get_items( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis
-		switch ( $request['context'] ) {
-			case 'post-editor':
-			default:
-				$editor_context_name = 'core/edit-post';
-				break;
-			case 'widgets-editor':
-				$editor_context_name = 'core/edit-widgets';
-				break;
-			case 'site-editor':
-				$editor_context_name = 'core/edit-site';
-				break;
-			case 'mobile':
-				$editor_context_name = 'core/mobile';
-				break;
-		}
-
-		$editor_context = new WP_Block_Editor_Context( array( 'name' => $editor_context_name ) );
-		$settings       = get_block_editor_settings( array(), $editor_context );
-
-		return rest_ensure_response( $settings );
-	}
+			foreach ( get_post_types( array( 'show_in_rest' => true ), 'objects' ) as $post_type ) {
+				if ( current_user_can( $post_type->cap->edit_posts ) ) {
+					return true;
+				}
+			}
 
-	/**
-	 * Retrieves the block editor's settings schema, conforming to JSON Schema.
-	 *
-	 * @since 5.8.0
-	 *
-	 * @return array Item schema data.
-	 */
-	public function get_item_schema() {
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
+			return new WP_Error(
+				'rest_cannot_read_block_editor_settings',
+				__( 'Sorry, you are not allowed to read the block editor settings.', 'gutenberg' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
 		}
 
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => 'block-editor-settings-item',
-			'type'       => 'object',
-			'properties' => array(
-				'__unstableEnableFullSiteEditingBlocks'  => array(
-					'description' => __( 'Enables experimental Site Editor blocks', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'styles'                                 => array(
-					'description' => __( 'Editor styles', 'gutenberg' ),
-					'type'        => 'array',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'supportsTemplateMode'                   => array(
-					'description' => __( 'Indicates whether the current theme supports block-based templates.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'supportsLayout'                         => array(
-					'description' => __( 'Enable/disable layouts support in container blocks.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'widgetTypesToHideFromLegacyWidgetBlock' => array(
-					'description' => __( 'Widget types to hide from Legacy Widget block.', 'gutenberg' ),
-					'type'        => 'array',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'__experimentalFeatures'                 => array(
-					'description' => __( 'Settings consolidated from core, theme, and user origins.', 'gutenberg' ),
-					'type'        => 'object',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor', 'mobile' ),
-				),
-
-				'__experimentalStyles'                   => array(
-					'description' => __( 'Styles consolidated from core, theme, and user origins.', 'gutenberg' ),
-					'type'        => 'object',
-					'context'     => array( 'mobile' ),
-				),
-
-				'__experimentalEnableQuoteBlockV2'       => array(
-					'description' => __( 'Whether the V2 of the quote block that uses inner blocks should be enabled.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'mobile' ),
-				),
-
-				'__experimentalEnableListBlockV2'        => array(
-					'description' => __( 'Whether the V2 of the list block that uses inner blocks should be enabled.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'mobile' ),
-				),
-
-				'alignWide'                              => array(
-					'description' => __( 'Enable/Disable Wide/Full Alignments.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'allowedBlockTypes'                      => array(
-					'description' => __( 'List of allowed block types.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'allowedMimeTypes'                       => array(
-					'description' => __( 'List of allowed mime types and file extensions.', 'gutenberg' ),
-					'type'        => 'object',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'blockCategories'                        => array(
-					'description' => __( 'Returns all the categories for block types that will be shown in the block editor.', 'gutenberg' ),
-					'type'        => 'array',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'blockInspectorTabs'                     => array(
-					'description' => __( 'Block inspector tab display overrides.', 'gutenberg' ),
-					'type'        => 'object',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'disableCustomColors'                    => array(
-					'description' => __( 'Disables custom colors.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'disableCustomFontSizes'                 => array(
-					'description' => __( 'Disables custom font size.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'disableCustomGradients'                 => array(
-					'description' => __( 'Disables custom font size.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'disableLayoutStyles'                    => array(
-					'description' => __( 'Disables output of layout styles.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'enableCustomLineHeight'                 => array(
-					'description' => __( 'Enables custom line height.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'enableCustomSpacing'                    => array(
-					'description' => __( 'Enables custom spacing.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'enableCustomUnits'                      => array(
-					'description' => __( 'Enables custom units.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'isRTL'                                  => array(
-					'description' => __( 'Determines whether the current locale is right-to-left (RTL).', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'imageDefaultSize'                       => array(
-					'description' => __( 'Default size for images.', 'gutenberg' ),
-					'type'        => 'string',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'imageDimensions'                        => array(
-					'description' => __( 'Available image dimensions.', 'gutenberg' ),
-					'type'        => 'object',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-
-				'imageEditing'                           => array(
-					'description' => __( 'Determines whether the image editing feature is enabled.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
+		/**
+		 * Returns the block editor's settings
+		 *
+		 * @since 5.8.0
+		 *
+		 * @param WP_REST_Request $request Full details about the request.
+		 *
+		 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
+		 */
+		public function get_items( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis
+			switch ( $request['context'] ) {
+				case 'post-editor':
+				default:
+					$editor_context_name = 'core/edit-post';
+					break;
+				case 'widgets-editor':
+					$editor_context_name = 'core/edit-widgets';
+					break;
+				case 'site-editor':
+					$editor_context_name = 'core/edit-site';
+					break;
+				case 'mobile':
+					$editor_context_name = 'core/mobile';
+					break;
+			}
 
-				'imageSizes'                             => array(
-					'description' => __( 'Available image sizes.', 'gutenberg' ),
-					'type'        => 'array',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
+			add_filter( 'block_editor_settings_all', 'gutenberg_get_block_editor_settings_mobile', PHP_INT_MAX );
 
-				'maxUploadFileSize'                      => array(
-					'description' => __( 'Maximum upload size in bytes allowed for the site.', 'gutenberg' ),
-					'type'        => 'number',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
+			$editor_context = new WP_Block_Editor_Context( array( 'name' => $editor_context_name ) );
+			$settings       = get_block_editor_settings( array(), $editor_context );
 
-				'colors'                                 => array(
-					'description' => __( 'Active theme color palette.', 'gutenberg' ),
-					'type'        => 'array',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
+			remove_filter( 'block_editor_settings_all', 'gutenberg_get_block_editor_settings_mobile', PHP_INT_MAX );
 
-				'fontSizes'                              => array(
-					'description' => __( 'Active theme font sizes.', 'gutenberg' ),
-					'type'        => 'array',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
+			return rest_ensure_response( $settings );
+		}
 
-				'gradients'                              => array(
-					'description' => __( 'Active theme gradients.', 'gutenberg' ),
-					'type'        => 'array',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-				'spacingSizes'                           => array(
-					'description' => __( 'Active theme spacing sizes.', 'gutenberg' ),
-					'type'        => 'array',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-				'spacingScale'                           => array(
-					'description' => __( 'Active theme spacing scale.', 'gutenberg' ),
-					'type'        => 'array',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-				'disableCustomSpacingSizes'              => array(
-					'description' => __( 'Disables custom spacing sizes.', 'gutenberg' ),
-					'type'        => 'boolean',
-					'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
-				),
-			),
-		);
+		/**
+		 * Retrieves the block editor's settings schema, conforming to JSON Schema.
+		 *
+		 * @since 5.8.0
+		 *
+		 * @return array Item schema data.
+		 */
+		public function get_item_schema() {
+			if ( $this->schema ) {
+				return $this->add_additional_fields_schema( $this->schema );
+			}
 
-		$this->schema = $schema;
+			$schema = array(
+				'$schema'    => 'http://json-schema.org/draft-04/schema#',
+				'title'      => 'block-editor-settings-item',
+				'type'       => 'object',
+				'properties' => array(
+					'__unstableEnableFullSiteEditingBlocks' => array(
+						'description' => __( 'Enables experimental Site Editor blocks', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'styles'                           => array(
+						'description' => __( 'Editor styles', 'gutenberg' ),
+						'type'        => 'array',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'supportsTemplateMode'             => array(
+						'description' => __( 'Indicates whether the current theme supports block-based templates.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'supportsLayout'                   => array(
+						'description' => __( 'Enable/disable layouts support in container blocks.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'widgetTypesToHideFromLegacyWidgetBlock' => array(
+						'description' => __( 'Widget types to hide from Legacy Widget block.', 'gutenberg' ),
+						'type'        => 'array',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'__experimentalFeatures'           => array(
+						'description' => __( 'Settings consolidated from core, theme, and user origins.', 'gutenberg' ),
+						'type'        => 'object',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor', 'mobile' ),
+					),
+
+					'__experimentalStyles'             => array(
+						'description' => __( 'Styles consolidated from core, theme, and user origins.', 'gutenberg' ),
+						'type'        => 'object',
+						'context'     => array( 'mobile' ),
+					),
+
+					'__experimentalEnableQuoteBlockV2' => array(
+						'description' => __( 'Whether the V2 of the quote block that uses inner blocks should be enabled.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'mobile' ),
+					),
+
+					'__experimentalEnableListBlockV2'  => array(
+						'description' => __( 'Whether the V2 of the list block that uses inner blocks should be enabled.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'mobile' ),
+					),
+
+					'alignWide'                        => array(
+						'description' => __( 'Enable/Disable Wide/Full Alignments.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'allowedBlockTypes'                => array(
+						'description' => __( 'List of allowed block types.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'allowedMimeTypes'                 => array(
+						'description' => __( 'List of allowed mime types and file extensions.', 'gutenberg' ),
+						'type'        => 'object',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'blockCategories'                  => array(
+						'description' => __( 'Returns all the categories for block types that will be shown in the block editor.', 'gutenberg' ),
+						'type'        => 'array',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'blockInspectorTabs'               => array(
+						'description' => __( 'Block inspector tab display overrides.', 'gutenberg' ),
+						'type'        => 'object',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'disableCustomColors'              => array(
+						'description' => __( 'Disables custom colors.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'disableCustomFontSizes'           => array(
+						'description' => __( 'Disables custom font size.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'disableCustomGradients'           => array(
+						'description' => __( 'Disables custom font size.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'disableLayoutStyles'              => array(
+						'description' => __( 'Disables output of layout styles.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'enableCustomLineHeight'           => array(
+						'description' => __( 'Enables custom line height.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'enableCustomSpacing'              => array(
+						'description' => __( 'Enables custom spacing.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'enableCustomUnits'                => array(
+						'description' => __( 'Enables custom units.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'isRTL'                            => array(
+						'description' => __( 'Determines whether the current locale is right-to-left (RTL).', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'imageDefaultSize'                 => array(
+						'description' => __( 'Default size for images.', 'gutenberg' ),
+						'type'        => 'string',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'imageDimensions'                  => array(
+						'description' => __( 'Available image dimensions.', 'gutenberg' ),
+						'type'        => 'object',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'imageEditing'                     => array(
+						'description' => __( 'Determines whether the image editing feature is enabled.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'imageSizes'                       => array(
+						'description' => __( 'Available image sizes.', 'gutenberg' ),
+						'type'        => 'array',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'maxUploadFileSize'                => array(
+						'description' => __( 'Maximum upload size in bytes allowed for the site.', 'gutenberg' ),
+						'type'        => 'number',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'colors'                           => array(
+						'description' => __( 'Active theme color palette.', 'gutenberg' ),
+						'type'        => 'array',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'fontSizes'                        => array(
+						'description' => __( 'Active theme font sizes.', 'gutenberg' ),
+						'type'        => 'array',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+
+					'gradients'                        => array(
+						'description' => __( 'Active theme gradients.', 'gutenberg' ),
+						'type'        => 'array',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+					'spacingSizes'                     => array(
+						'description' => __( 'Active theme spacing sizes.', 'gutenberg' ),
+						'type'        => 'array',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+					'spacingScale'                     => array(
+						'description' => __( 'Active theme spacing scale.', 'gutenberg' ),
+						'type'        => 'array',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+					'disableCustomSpacingSizes'        => array(
+						'description' => __( 'Disables custom spacing sizes.', 'gutenberg' ),
+						'type'        => 'boolean',
+						'context'     => array( 'post-editor', 'site-editor', 'widgets-editor' ),
+					),
+				),
+			);
+
+			$this->schema = $schema;
 
-		return $this->add_additional_fields_schema( $this->schema );
+			return $this->add_additional_fields_schema( $this->schema );
+		}
 	}
 }
diff --git a/lib/experimental/class-wp-rest-customizer-nonces.php b/lib/experimental/class-wp-rest-customizer-nonces.php
deleted file mode 100644
index 67be9485df29f4..00000000000000
--- a/lib/experimental/class-wp-rest-customizer-nonces.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * WP_Rest_Customizer_Nonces class.
- *
- * @package gutenberg
- */
-
-if ( class_exists( 'WP_Rest_Customizer_Nonces' ) ) {
-	return;
-}
-
-/**
- * Class that returns the customizer "save" nonce that's required for the
- * batch save operation using the customizer API endpoint.
- */
-class WP_Rest_Customizer_Nonces extends WP_REST_Controller {
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() {
-		$this->namespace = '__experimental';
-		$this->rest_base = 'customizer-nonces';
-	}
-
-	/**
-	 * Registers the necessary REST API routes.
-	 *
-	 * @access public
-	 */
-	public function register_routes() {
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base . '/get-save-nonce',
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_save_nonce' ),
-					'permission_callback' => array( $this, 'permissions_check' ),
-					'args'                => $this->get_collection_params(),
-				),
-				'schema' => array( $this, 'get_public_item_schema' ),
-			)
-		);
-	}
-
-	/**
-	 * Checks if a given request has access to read menu items if they have access to edit them.
-	 *
-	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
-	 */
-	public function permissions_check() {
-		$post_type = get_post_type_object( 'nav_menu_item' );
-		if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
-			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit posts in this post type.', 'gutenberg' ), array( 'status' => rest_authorization_required_code() ) );
-		}
-		return true;
-	}
-
-	/**
-	 * Returns the nonce required to request the customizer API endpoint.
-	 *
-	 * @access public
-	 */
-	public function get_save_nonce() {
-		require_once ABSPATH . 'wp-includes/class-wp-customize-manager.php';
-		$wp_customize = new WP_Customize_Manager();
-		$nonce        = wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() );
-		return array(
-			'success'    => true,
-			'nonce'      => $nonce,
-			'stylesheet' => $wp_customize->get_stylesheet(),
-		);
-	}
-}
diff --git a/lib/experimental/connection-sources/index.php b/lib/experimental/connection-sources/index.php
deleted file mode 100644
index bf89ba177b6e94..00000000000000
--- a/lib/experimental/connection-sources/index.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Connection sources that block attributes can be connected to.
- *
- * @package gutenberg
- */
-
-return array(
-	'name'               => 'meta',
-	'meta_fields'        => function ( $block_instance, $meta_field ) {
-		// We should probably also check if the meta field exists but for now it's okay because
-		// if it doesn't, `get_post_meta()` will just return an empty string.
-		return get_post_meta( $block_instance->context['postId'], $meta_field, true );
-	},
-	'pattern_attributes' => function ( $block_instance ) {
-		$block_id = $block_instance->attributes['metadata']['id'];
-		return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id ), false );
-	},
-);
diff --git a/lib/experimental/data-views.php b/lib/experimental/data-views.php
index e9fb2134f3b39c..a5c350a18b0ca5 100644
--- a/lib/experimental/data-views.php
+++ b/lib/experimental/data-views.php
@@ -10,7 +10,7 @@
  */
 function _gutenberg_register_data_views_post_type() {
 	$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-	if ( empty( $gutenberg_experiments ) || ! array_key_exists( 'gutenberg-dataviews', $gutenberg_experiments ) ) {
+	if ( empty( $gutenberg_experiments ) || ! array_key_exists( 'gutenberg-custom-dataviews', $gutenberg_experiments ) ) {
 		return;
 	}
 	register_post_type(
diff --git a/lib/experimental/editor-settings.php b/lib/experimental/editor-settings.php
index 5f61684e8b1342..afc6d7e220f676 100644
--- a/lib/experimental/editor-settings.php
+++ b/lib/experimental/editor-settings.php
@@ -13,29 +13,29 @@ function gutenberg_enable_experiments() {
 	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-sync-collaboration', $gutenberg_experiments ) ) {
 		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableSync = true', 'before' );
 	}
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-zoomed-out-view', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableZoomedOutView = true', 'before' );
-	}
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-dataviews', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalAdminViews = true', 'before' );
+	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-custom-dataviews', $gutenberg_experiments ) ) {
+		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalCustomViews = true', 'before' );
 	}
 	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-color-randomizer', $gutenberg_experiments ) ) {
 		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableColorRandomizer = true', 'before' );
 	}
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-group-grid-variation', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableGroupGridVariation = true', 'before' );
-	}
-
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-connections', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalConnections = true', 'before' );
+	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-grid-interactivity', $gutenberg_experiments ) ) {
+		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableGridInteractivity = true', 'before' );
 	}
-
 	if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
 		wp_add_inline_script( 'wp-block-library', 'window.__experimentalDisableTinymce = true', 'before' );
 	}
-
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalPatternPartialSyncing = true', 'before' );
+	if ( gutenberg_is_experiment_enabled( 'gutenberg-full-page-client-side-navigation' ) ) {
+		wp_add_inline_script( 'wp-block-library', 'window.__experimentalFullPageClientSideNavigation = true', 'before' );
+	}
+	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-block-comment', $gutenberg_experiments ) ) {
+		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableBlockComment = true', 'before' );
+	}
+	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-quick-edit-dataviews', $gutenberg_experiments ) ) {
+		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalQuickEditDataViews = true', 'before' );
+	}
+	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-media-processing', $gutenberg_experiments ) ) {
+		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalMediaProcessing = true', 'before' );
 	}
 }
 
@@ -43,12 +43,28 @@ function gutenberg_enable_experiments() {
 
 /**
  * Sets a global JS variable used to trigger the availability of form & input blocks.
+ *
+ * @deprecated 19.0.0 Use gutenberg_enable_block_experiments().
  */
 function gutenberg_enable_form_input_blocks() {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 19.0.0', 'gutenberg_enable_block_experiments' );
+}
+
+/**
+ * Sets global JS variables used to enable various block experiments.
+ */
+function gutenberg_enable_block_experiments() {
 	$gutenberg_experiments = get_option( 'gutenberg-experiments' );
+
+	// Experimental form blocks.
 	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-form-blocks', $gutenberg_experiments ) ) {
 		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableFormBlocks = true', 'before' );
 	}
+
+	// General experimental blocks that are not in the default block library.
+	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-block-experiments', $gutenberg_experiments ) ) {
+		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableBlockExperiments = true', 'before' );
+	}
 }
 
-add_action( 'admin_init', 'gutenberg_enable_form_input_blocks' );
+add_action( 'admin_init', 'gutenberg_enable_block_experiments' );
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php b/lib/experimental/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php
similarity index 100%
rename from lib/experimental/fonts/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php
rename to lib/experimental/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php
diff --git a/lib/experimental/font-face/bc-layer/class-wp-fonts-provider-local.php b/lib/experimental/font-face/bc-layer/class-wp-fonts-provider-local.php
new file mode 100644
index 00000000000000..67d5a616344067
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-fonts-provider-local.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Webfonts API: Provider for locally-hosted fonts.
+ *
+ * @package    WordPress
+ * @subpackage Fonts API
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Fonts_Provider_Local' ) ) {
+
+	/**
+	 * A core bundled provider for generating `@font-face` styles
+	 * from locally-hosted font files.
+	 *
+	 * @since X.X.X
+	 * @deprecated 16.3.0 Providers are not supported.
+	 *                    Local provider is in WP_Font_Face.
+	 */
+	class WP_Fonts_Provider_Local extends WP_Fonts_Provider {
+
+		/**
+		 * The provider's unique ID.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 *
+		 * @var string
+		 */
+		protected $id = 'local';
+
+		/**
+		 * Gets the `@font-face` CSS styles for locally-hosted font files.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Get styles is not supported.
+		 *
+		 * @return string Empty string.
+		 */
+		public function get_css() {
+			_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
+			return '';
+		}
+	}
+}
diff --git a/lib/experimental/font-face/bc-layer/class-wp-fonts-provider.php b/lib/experimental/font-face/bc-layer/class-wp-fonts-provider.php
new file mode 100644
index 00000000000000..099105dc53c100
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-fonts-provider.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Fonts API: Provider abstract class.
+ *
+ * Individual fonts providers should extend this class and implement.
+ *
+ * @package    WordPress
+ * @subpackage Fonts API
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Fonts_Provider' ) ) {
+
+	/**
+	 * Abstract class for Fonts API providers.
+	 *
+	 * @since X.X.X
+	 * @deprecated 16.3.0 Custom providers are not supported.
+	 */
+	abstract class WP_Fonts_Provider {
+
+		/**
+		 * The provider's unique ID.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 *
+		 * @var string
+		 */
+		protected $id = '';
+
+		/**
+		 * Fonts to be processed.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 *
+		 * @var array[]
+		 */
+		protected $fonts = array();
+
+		/**
+		 * Array of Font-face style tag's attribute(s)
+		 * where the key is the attribute name and the
+		 * value is its value.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 *
+		 * @var string[]
+		 */
+		protected $style_tag_atts = array();
+
+		/**
+		 * Sets this provider's fonts property.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Set is not supported.
+		 */
+		public function set_fonts() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Prints the generated styles.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Use wp_print_font_faces() instead.
+		 */
+		public function print_styles() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0', 'wp_print_font_faces' );
+		}
+
+		/**
+		 * Gets the `@font-face` CSS for the provider's fonts.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 *
+		 * @return string The `@font-face` CSS.
+		 */
+		abstract public function get_css();
+
+		/**
+		 * Gets the `<style>` element for wrapping the `@font-face` CSS.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Get style element is not supported.
+		 *
+		 * @return string Empty string.
+		 */
+		protected function get_style_element() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return '';
+		}
+	}
+}
diff --git a/lib/experimental/font-face/bc-layer/class-wp-fonts-resolver.php b/lib/experimental/font-face/bc-layer/class-wp-fonts-resolver.php
new file mode 100644
index 00000000000000..e02948b73d5df7
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-fonts-resolver.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * WP_Fonts_Resolver class.
+ *
+ * @package    WordPress
+ * @subpackage Fonts API
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Fonts_Resolver' ) ) {
+
+	/**
+	 * The Fonts API Resolver abstracts the processing of different data sources
+	 * (such as theme.json and global styles) for font interactions with the API.
+	 *
+	 * This class is for internal core usage and is not supposed to be used by
+	 * extenders (plugins and/or themes).
+	 *
+	 * @access private
+	 *
+	 * @since X.X.X
+	 * @deprecated 16.3.0 Fonts API is not supported.
+	 */
+	class WP_Fonts_Resolver {
+
+		/**
+		 * Enqueues user-selected fonts via global styles.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Enqueue is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public static function enqueue_user_selected_fonts() {
+			_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
+			return array();
+		}
+
+		/**
+		 * Register fonts defined in theme.json.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Register is not supported.
+		 */
+		public static function register_fonts_from_theme_json() {
+			_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
+		}
+
+		/**
+		 * Add missing fonts to the global styles.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Adding fonts into theme.json theme data layer is not supported.
+		 *
+		 * @param WP_Theme_JSON_Gutenberg|WP_Theme_JSON $data The global styles.
+		 * @return WP_Theme_JSON_Gutenberg|WP_Theme_JSON Unchanged global styles.
+		 */
+		public static function add_missing_fonts_to_theme_json( $data ) {
+			_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
+			return $data;
+		}
+	}
+}
diff --git a/lib/experimental/font-face/bc-layer/class-wp-fonts-utils.php b/lib/experimental/font-face/bc-layer/class-wp-fonts-utils.php
new file mode 100644
index 00000000000000..85a68fd0d9e10a
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-fonts-utils.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Font API's utility helpers.
+ *
+ * @package    WordPress
+ * @subpackage Fonts API
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Fonts_Utils' ) ) {
+
+	/**
+	 * Utility helpers for the Fonts API.
+	 *
+	 * @since X.X.X
+	 * @deprecated 16.3.0 Fonts API is not supported.
+	 */
+	class WP_Fonts_Utils {
+
+		/**
+		 * Converts the given font family into a handle.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 This method is not supported.
+		 *
+		 * @return null
+		 */
+		public static function convert_font_family_into_handle() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return null;
+		}
+
+		/**
+		 * Converts the given variation and its font-family into a handle.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 This method is not supported.
+		 *
+		 * @return null
+		 */
+		public static function convert_variation_into_handle() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return null;
+		}
+
+		/**
+		 * Gets the font family from the variation.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 This method is not supported.
+		 *
+		 * @return null Null.
+		 */
+		public static function get_font_family_from_variation() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return null;
+		}
+
+		/**
+		 * Checks if the given input is defined, i.e. meaning is a non-empty string.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 *
+		 * @param string $input The input to check.
+		 * @return bool True when non-empty string. Else false.
+		 */
+		public static function is_defined( $input ) {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return ( is_string( $input ) && ! empty( $input ) );
+		}
+	}
+}
diff --git a/lib/experimental/font-face/bc-layer/class-wp-fonts.php b/lib/experimental/font-face/bc-layer/class-wp-fonts.php
new file mode 100644
index 00000000000000..c717702595b833
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-fonts.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * WP Fonts API class.
+ *
+ * @package    WordPress
+ * @subpackage Fonts API
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Fonts' ) ) {
+
+	/**
+	 * Class WP_Fonts
+	 *
+	 * @since X.X.X
+	 * @deprecated 16.3.0 Fonts API is not supported.
+	 */
+	class WP_Fonts extends WP_Dependencies {
+
+		/**
+		 * Registered "origin", indicating the font is registered in the API.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 *
+		 * @var string
+		 */
+		const REGISTERED_ORIGIN = 'gutenberg_wp_fonts_api';
+
+		/**
+		 * Constructor.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 */
+		public function __construct() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Get the list of registered providers.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Providers are not supported.
+		 */
+		public function get_providers() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Register a provider.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Providers are not supported.
+		 *
+		 * @return bool False.
+		 */
+		public function register_provider() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return false;
+		}
+
+		/**
+		 * Get the list of all registered font family handles.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Register is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function get_registered_font_families() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+
+		/**
+		 * Get the list of all registered font families and their variations.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Register is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function get_registered() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+
+		/**
+		 * Get the list of enqueued font families and their variations.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Enqueue is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function get_enqueued() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+
+		/**
+		 * Registers a font family.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Add is not supported.
+		 *
+		 * @return null Null.
+		 */
+		public function add_font_family() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return null;
+		}
+
+		/**
+		 * Removes a font family and all registered variations.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Remove is not supported.
+		 */
+		public function remove_font_family() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Add a variation to an existing family or register family if none exists.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Add is not supported.
+		 *
+		 * @return null Null.
+		 */
+		public function add_variation() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return null;
+		}
+
+		/**
+		 * Removes a variation.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Remove is not supported.
+		 */
+		public function remove_variation() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Processes the items and dependencies.
+		 *
+		 * Processes the items passed to it or the queue, and their dependencies.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Processing items and dependencies is not supported.
+		 *
+		 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
+		 *                                      single item (string), or multiple items (array of strings).
+		 *                                      Default false.
+		 * @param int|false            $group   Optional. Group level: level (int), no group (false).
+		 *
+		 * @return array Empty array.
+		 */
+		public function do_items( $handles = false, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+
+		/**
+		 * Invokes each provider to process and print its styles.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Process and print provider styles is not supported.
+		 *
+		 * @see WP_Dependencies::do_item()
+		 *
+		 * @param string    $provider_id The provider to process.
+		 * @param int|false $group       Not used.
+		 * @return bool False.
+		 */
+		public function do_item( $provider_id, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return false;
+		}
+
+		/**
+		 * Converts the font family and its variations into theme.json structural format.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Convert is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function to_theme_json() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+	}
+}
diff --git a/lib/experimental/font-face/bc-layer/class-wp-web-fonts.php b/lib/experimental/font-face/bc-layer/class-wp-web-fonts.php
new file mode 100644
index 00000000000000..aaf1f9b9a7ba74
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-web-fonts.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Web Fonts API class.
+ *
+ * @package    WordPress
+ * @subpackage Fonts API
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Web_Fonts' ) ) {
+
+	/**
+	 * Class WP_Web_Fonts
+	 *
+	 * @since 14.9.1
+	 * @deprecated 15.1 Use WP_Fonts instead.
+	 * @deprecated 16.3.0 Fonts API is not supported.
+	 */
+	class WP_Web_Fonts extends WP_Webfonts {
+
+		/**
+		 * Constructor.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 */
+		public function __construct() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Get the list of registered providers.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Providers are not supported.
+		 */
+		public function get_providers() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Register a provider.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Providers are not supported.
+		 *
+		 * @return bool False.
+		 */
+		public function register_provider() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return false;
+		}
+
+		/**
+		 * Get the list of all registered font family handles.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Register is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function get_registered_font_families() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+
+		/**
+		 * Get the list of all registered font families and their variations.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Register is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function get_registered() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+
+		/**
+		 * Get the list of enqueued font families and their variations.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Enqueue is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function get_enqueued() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+
+		/**
+		 * Registers a font family.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Add is not supported.
+		 *
+		 * @return null Null.
+		 */
+		public function add_font_family() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return null;
+		}
+
+		/**
+		 * Removes a font family and all registered variations.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Remove is not supported.
+		 */
+		public function remove_font_family() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Add a variation to an existing family or register family if none exists.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Add is not supported.
+		 *
+		 * @return null Null.
+		 */
+		public function add_variation() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return null;
+		}
+
+		/**
+		 * Removes a variation.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Remove is not supported.
+		 */
+		public function remove_variation() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Processes the items and dependencies.
+		 *
+		 * Processes the items passed to it or the queue, and their dependencies.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Processing items and dependencies is not supported.
+		 *
+		 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
+		 *                                      single item (string), or multiple items (array of strings).
+		 *                                      Default false.
+		 * @param int|false            $group   Optional. Group level: level (int), no group (false).
+		 *
+		 * @return array Empty array.
+		 */
+		public function do_items( $handles = false, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+
+		/**
+		 * Invokes each provider to process and print its styles.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Process and print provider styles is not supported.
+		 *
+		 * @see WP_Dependencies::do_item()
+		 *
+		 * @param string    $provider_id The provider to process.
+		 * @param int|false $group       Not used.
+		 * @return bool False.
+		 */
+		public function do_item( $provider_id, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return false;
+		}
+
+		/**
+		 * Converts the font family and its variations into theme.json structural format.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Convert is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function to_theme_json() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return array();
+		}
+	}
+}
diff --git a/lib/experimental/font-face/bc-layer/class-wp-webfonts-provider-local.php b/lib/experimental/font-face/bc-layer/class-wp-webfonts-provider-local.php
new file mode 100644
index 00000000000000..cbf5b2b99b9e63
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-webfonts-provider-local.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Fonts API: Provider for locally-hosted fonts.
+ *
+ * Part of the backwards-compatibility (BC) layer for all
+ * deprecated publicly exposed methods and functionality.
+ *
+ * This class/file will NOT be backported to Core. Rather for sites
+ * using the previous API, it exists to prevent breakages, giving
+ * developers time to upgrade their code.
+ *
+ * @package    WordPress
+ * @subpackage Fonts
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Webfonts_Provider_Local' ) ) {
+
+	/**
+	 * A deprecated core bundled provider for generating `@font-face` styles
+	 * from locally-hosted font files.
+	 *
+	 * BACKPORT NOTE: Do not backport this file to Core.
+	 *
+	 * @since X.X.X
+	 * @deprecated 15.1 Use `WP_Fonts_Provider_Local` instead.
+	 * @deprecated 16.3.0 Providers are not supported.
+	 *                    Local provider is in WP_Font_Face.
+	 */
+	class WP_Webfonts_Provider_Local extends WP_Webfonts_Provider {
+
+		/**
+		 * The provider's unique ID.
+		 *
+		 * @since 6.0.0
+		 * @deprecated 16.3.0
+		 *
+		 * @var string
+		 */
+		protected $id = 'local';
+
+		/**
+		 * Constructor.
+		 *
+		 * @since 6.1.0
+		 */
+		public function __construct() {
+			_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
+		}
+
+		/**
+		 * Gets the `@font-face` CSS styles for locally-hosted font files.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0 Get styles is not supported.
+		 *
+		 * @return string Empty string.
+		 */
+		public function get_css() {
+			_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
+			return '';
+		}
+	}
+}
diff --git a/lib/experimental/font-face/bc-layer/class-wp-webfonts-provider.php b/lib/experimental/font-face/bc-layer/class-wp-webfonts-provider.php
new file mode 100644
index 00000000000000..1610d9b3b163b9
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-webfonts-provider.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Fonts API: Provider abstract class.
+ *
+ * Part of the backwards-compatibility (BC) layer for all
+ * deprecated publicly exposed methods and functionality.
+ *
+ * This class/file will NOT be backported to Core. Rather for sites
+ * using the previous API, it exists to prevent breakages, giving
+ * developers time to upgrade their code.
+ *
+ * @package    WordPress
+ * @subpackage Fonts API
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Webfonts_Provider' ) ) {
+
+	/**
+	 * Deprecated abstract class for Fonts API providers.
+	 *
+	 * BACKPORT NOTE: Do not backport this file to Core.
+	 *
+	 * @since X.X.X
+	 * @deprecated 15.1 Use `WP_Fonts_Provider` instead.
+	 * @deprecated 16.3.0 Custom providers are not supported.
+	 */
+	abstract class WP_Webfonts_Provider extends WP_Fonts_Provider {
+
+		/**
+		 * Fonts to be processed.
+		 *
+		 * @since X.X.X
+		 * @deprecated 15.1 Use WP_Fonts_Provider::$fonts property instead.
+		 * @deprecated 16.3.0
+		 *
+		 * @var array[]
+		 */
+		protected $webfonts = array();
+
+		/**
+		 * Sets this provider's fonts property.
+		 *
+		 * @since X.X.X
+		 * @deprecated GB 15.1 Use WP_Fonts_Provider::set_fonts() instead.
+		 * @deprecated 16.3.0 Set is not supported.
+		 */
+		public function set_webfonts() {
+			_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
+		}
+	}
+}
diff --git a/lib/experimental/font-face/bc-layer/class-wp-webfonts-utils.php b/lib/experimental/font-face/bc-layer/class-wp-webfonts-utils.php
new file mode 100644
index 00000000000000..3fbd0e8d7357cc
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-webfonts-utils.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Webfont API's utility helpers.
+ *
+ * BACKPORT NOTE: Do not backport this file to Core.
+ * This file is now part of the API's Backwards-Compatibility (BC) layer.
+ *
+ * @package    WordPress
+ * @subpackage Fonts API
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Webfonts_Utils' ) ) {
+
+	/**
+	 * Utility helpers for the Webfonts API.
+	 *
+	 * @since X.X.X
+	 * @deprecated 15.1 Use WP_Fonts_Utils instead.
+	 * @deprecated 16.3.0 Webfonts API is not supported.
+	 */
+	class WP_Webfonts_Utils {
+
+		/**
+		 * Converts the given font family into a handle.
+		 *
+		 * @since X.X.X
+		 * @deprecated 15.1 Use WP_Fonts_Utils::convert_font_family_into_handle() instead.
+		 * @deprecated 16.3.0 This method is not supported.
+		 *
+		 * @return null
+		 */
+		public static function convert_font_family_into_handle() {
+			_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
+			return null;
+		}
+
+		/**
+		 * Converts the given variation and its font-family into a handle.
+		 *
+		 * @since X.X.X
+		 * @deprecated 15.1 Use WP_Fonts_Utils::convert_variation_into_handle() instead.
+		 * @deprecated 16.3.0 This method is not supported.
+		 *
+		 * @return null
+		 */
+		public static function convert_variation_into_handle() {
+			_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
+			return null;
+		}
+
+		/**
+		 * Gets the font family from the variation.
+		 *
+		 * @since X.X.X
+		 * @deprecated 15.1 Use WP_Fonts_Utils::get_font_family_from_variation() instead.
+		 * @deprecated 16.3.0 This method is not supported.
+		 *
+		 * @return null
+		 */
+		public static function get_font_family_from_variation() {
+			_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
+			return null;
+		}
+
+		/**
+		 * Checks if the given input is defined, i.e. meaning is a non-empty string.
+		 *
+		 * @since X.X.X
+		 * @deprecated 15.1 Use WP_Fonts_Utils::is_defined() instead.
+		 * @deprecated 16.3.0 This method is not supported.
+		 *
+		 * @param string $input The input to check.
+		 * @return bool True when non-empty string. Else false.
+		 */
+		public static function is_defined( $input ) {
+			_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
+			return ( is_string( $input ) && ! empty( $input ) );
+		}
+	}
+}
diff --git a/lib/experimental/font-face/bc-layer/class-wp-webfonts.php b/lib/experimental/font-face/bc-layer/class-wp-webfonts.php
new file mode 100644
index 00000000000000..9cd681054597b1
--- /dev/null
+++ b/lib/experimental/font-face/bc-layer/class-wp-webfonts.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Webfonts API class: backwards-compatibility (BC) layer for all
+ * deprecated publicly exposed methods and functionality.
+ *
+ * This class/file will NOT be backported to Core. Rather for sites
+ * using the previous API, it exists to prevent breakages, giving
+ * developers time to upgrade their code.
+ *
+ * @package    Gutenberg
+ * @subpackage Fonts API's BC Layer
+ * @since      X.X.X
+ */
+
+if ( ! class_exists( 'WP_Webfonts' ) ) {
+
+	/**
+	 * Class WP_Webfonts
+	 *
+	 * @since X.X.X
+	 * @deprecated 15.1 Use WP_Fonts instead.
+	 * @deprecated 16.3.0 Fonts API is not supported.
+	 */
+	class WP_Webfonts {
+
+		/**
+		 * Constructor.
+		 *
+		 * @since X.X.X
+		 * @deprecated 16.3.0
+		 */
+		public function __construct() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+		}
+
+		/**
+		 * Gets the font slug.
+		 *
+		 * @since X.X.X
+		 * @deprecated Use WP_Fonts_Utils::convert_font_family_into_handle() or WP_Fonts_Utils::get_font_family_from_variation().
+		 * @deprecated 16.3.0 This method is not supported.
+		 *
+		 * @return false False.
+		 */
+		public static function get_font_slug() {
+			_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
+			return false;
+		}
+
+		/**
+		 * Initializes the API.
+		 *
+		 * @since 6.0.0
+		 * @deprecated 14.9.1 Use wp_fonts().
+		 */
+		public static function init() {
+			_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_fonts()' );
+		}
+
+		/**
+		 * Get the list of all registered font family handles.
+		 *
+		 * @since X.X.X
+		 * @deprecated GB 15.8.0 Use wp_fonts()->get_registered_font_families().
+		 * @deprecated 16.3.0 Register is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function get_registered_font_families() {
+			_deprecated_function( __METHOD__, 'Gutenberg 15.8.0' );
+			return array();
+		}
+
+		/**
+		 * Gets the list of registered fonts.
+		 *
+		 * @since 6.0.0
+		 * @deprecated 14.9.1 Use wp_fonts()->get_registered().
+		 * @deprecated 16.3.0 Register is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function get_registered_webfonts() {
+			_deprecated_function( __METHOD__, 'Gutenberg 14.9.1' );
+
+			return array();
+		}
+
+		/**
+		 * Gets the list of enqueued fonts.
+		 *
+		 * @since 6.0.0
+		 * @deprecated 14.9.1 Use wp_fonts()->get_enqueued().
+		 * @deprecated 16.3.0 Enqueue is not supported.
+		 *
+		 * @return array Empty array.
+		 */
+		public function get_enqueued_webfonts() {
+			_deprecated_function( __METHOD__, 'Gutenberg 14.9.1' );
+			return array();
+		}
+
+		/**
+		 * Gets the list of all fonts.
+		 *
+		 * @since X.X.X
+		 * @deprecated GB 14.9.1 Use wp_fonts()->get_registered().
+		 * @deprecated 16.3.0 This method is not supported.
+		 *
+		 * @return array[]
+		 */
+		public function get_all_webfonts() {
+			_deprecated_function( __METHOD__, 'Gutenberg 14.9.1', 'wp_fonts()->get_registered()' );
+			return array();
+		}
+
+		/**
+		 * Registers a webfont.
+		 *
+		 * @since 6.0.0
+		 * @deprecated GB 14.9.1 Use wp_register_fonts().
+		 * @deprecated 16.3.0 Register is not supported.
+		 *
+		 * @return bool False.
+		 */
+		public function register_webfont() {
+			_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_register_fonts()' );
+			return false;
+		}
+
+		/**
+		 * Enqueue a font-family that has been already registered.
+		 *
+		 * @since XX.X
+		 * @deprecated 14.9.1 Use wp_enqueue_fonts().
+		 * @deprecated 16.3.0 Register is not supported.
+		 *
+		 * @return bool False.
+		 */
+		public function enqueue_webfont() {
+			_deprecated_function( __METHOD__, 'Gutenberg 14.9.1' );
+			return false;
+		}
+	}
+}
diff --git a/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php b/lib/experimental/font-face/bc-layer/webfonts-deprecations.php
similarity index 100%
rename from lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php
rename to lib/experimental/font-face/bc-layer/webfonts-deprecations.php
diff --git a/lib/experimental/fonts-api/bc-layer/class-gutenberg-fonts-api-bc-layer.php b/lib/experimental/fonts-api/bc-layer/class-gutenberg-fonts-api-bc-layer.php
deleted file mode 100644
index 8c859769875230..00000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-gutenberg-fonts-api-bc-layer.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Fonts API BC Layer helpers.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- * This file is now part of the API's Backwards-Compatibility (BC) layer.
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- * @since      15.7.0
- */
-
-/**
- * Class Gutenberg_Fonts_API_BC_Layer
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- */
-class Gutenberg_Fonts_API_BC_Layer {
-
-	/**
-	 * Determines if the given fonts array is the deprecated array structure.
-	 *
-	 * @param array $fonts Array of fonts to check.
-	 * @return bool True when deprecated structure, else false.
-	 */
-	public static function is_deprecated_structure( array $fonts ) {
-		/*
-		 * Iterates over the array's first dimension keys, which should
-		 * be the variation's font-family. If a key is empty or a non-string,
-		 * then the fonts are using a deprecated structure.
-		 */
-		foreach ( array_keys( $fonts ) as $font_family ) {
-			if ( ! WP_Fonts_Utils::is_defined( $font_family ) ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Migrates deprecated fonts structure into new API data structure,
-	 * i.e. variations grouped by their font-family.
-	 *
-	 * @param array $fonts               Array of fonts to migrate.
-	 * @param bool  $silence_deprecation Optional. Silences the deprecation notice. For internal use.
-	 *                                   Default false.
-	 * @return array
-	 */
-	public static function migrate_deprecated_structure( array $fonts, $silence_deprecation = false ) {
-		if ( ! self::is_deprecated_structure( $fonts ) ) {
-			return $fonts;
-		}
-
-		if ( ! $silence_deprecation ) {
-			_deprecated_argument(
-				__METHOD__,
-				'14.9.1',
-				'A deprecated fonts array structure passed to wp_register_fonts(). Variations must be grouped and keyed by their font family.'
-			);
-		}
-
-		$new_fonts = array();
-		foreach ( $fonts as $font ) {
-			$font_family = WP_Fonts_Utils::get_font_family_from_variation( $font );
-			if ( ! $font_family ) {
-				continue;
-			}
-
-			if ( ! isset( $new_fonts[ $font_family ] ) ) {
-				$new_fonts[ $font_family ] = array();
-			}
-
-			$new_fonts[ $font_family ][] = $font;
-		}
-
-		return $new_fonts;
-	}
-
-	/**
-	 * Handle the deprecated fonts structure.
-	 *
-	 * @param array  $font    Font for extracting font family.
-	 * @param string $message Deprecation message to throw.
-	 * @return string|null The font family slug if successfully registered. Else null.
-	 */
-	protected static function extract_font_family_from_deprecated_fonts_structure( array $font, $message ) {
-		_deprecated_argument( __METHOD__, '14.9.1', $message );
-
-		$font_family = WP_Fonts_Utils::get_font_family_from_variation( $font );
-		if ( ! $font_family ) {
-			return null;
-		}
-
-		return WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-web-fonts.php b/lib/experimental/fonts-api/bc-layer/class-wp-web-fonts.php
deleted file mode 100644
index 550940935b7dbb..00000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-web-fonts.php
+++ /dev/null
@@ -1,703 +0,0 @@
-<?php
-/**
- * Web Fonts API class.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Web_Fonts' ) ) {
-	return;
-}
-
-/**
- * Class WP_Web_Fonts
- *
- * @since GB 14.9.1
- * @deprecated GB 15.1 Use WP_Fonts instead.
- */
-class WP_Web_Fonts extends WP_Webfonts {
-
-	/**
-	 * Constructor.
-	 *
-	 * @since X.X.X
-	 */
-	public function __construct() {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts' );
-
-		/**
-		 * Filters the web font variation's property defaults.
-		 *
-		 * @since X.X.X
-		 *
-		 * @param array $defaults {
-		 *     An array of required web font properties and defaults.
-		 *
-		 *     @type string $provider     The provider ID. Default 'local'.
-		 *     @type string $font-family  The font-family property. Default empty string.
-		 *     @type string $font-style   The font-style property. Default 'normal'.
-		 *     @type string $font-weight  The font-weight property. Default '400'.
-		 *     @type string $font-display The font-display property. Default 'fallback'.
-		 * }
-		 */
-		$this->variation_property_defaults = apply_filters( 'wp_webfont_variation_defaults', $this->variation_property_defaults );
-
-		/**
-		 * Fires when the WP_Webfonts instance is initialized.
-		 *
-		 * @since X.X.X
-		 *
-		 * @param WP_Web_Fonts $wp_webfonts WP_Web_Fonts instance (passed by reference).
-		 */
-		do_action_ref_array( 'wp_default_webfonts', array( &$this ) );
-	}
-
-	/**
-	 * Get the list of registered providers.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array $providers {
-	 *     An associative array of registered providers, keyed by their unique ID.
-	 *
-	 *     @type string $provider_id => array {
-	 *         An associate array of provider's class name and fonts.
-	 *
-	 *         @type string $class_name Fully qualified name of the provider's class.
-	 *         @type string[] $fonts    An array of enqueued font handles for this provider.
-	 *     }
-	 * }
-	 */
-	public function get_providers() {
-		return $this->providers;
-	}
-
-	/**
-	 * Register a provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider's unique ID.
-	 * @param string $class_name  The provider class name.
-	 * @return bool True if successfully registered, else false.
-	 */
-	public function register_provider( $provider_id, $class_name ) {
-		if ( empty( $provider_id ) || empty( $class_name ) || ! class_exists( $class_name ) ) {
-			return false;
-		}
-
-		$this->providers[ $provider_id ] = array(
-			'class' => $class_name,
-			'fonts' => array(),
-		);
-		return true;
-	}
-
-	/**
-	 * Get the list of all registered font family handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	public function get_registered_font_families() {
-		$font_families = array();
-		foreach ( $this->registered as $handle => $obj ) {
-			if ( $obj->extra['is_font_family'] ) {
-				$font_families[] = $handle;
-			}
-		}
-		return $font_families;
-	}
-
-	/**
-	 * Get the list of all registered font families and their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	public function get_registered() {
-		return array_keys( $this->registered );
-	}
-
-	/**
-	 * Get the list of enqueued font families and their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array[]
-	 */
-	public function get_enqueued() {
-		return $this->queue;
-	}
-
-	/**
-	 * Registers a font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family Font family name to register.
-	 * @return string|null Font family handle when registration successes. Null on failure.
-	 */
-	public function add_font_family( $font_family ) {
-		$font_family_handle = WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-		if ( ! $font_family_handle ) {
-			return null;
-		}
-
-		if ( isset( $this->registered[ $font_family_handle ] ) ) {
-			return $font_family_handle;
-		}
-
-		$registered = $this->add( $font_family_handle, false );
-		if ( ! $registered ) {
-			return null;
-		}
-
-		$this->add_data( $font_family_handle, 'font-properties', array( 'font-family' => $font_family ) );
-		$this->add_data( $font_family_handle, 'is_font_family', true );
-
-		return $font_family_handle;
-	}
-
-	/**
-	 * Removes a font family and all registered variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family to remove.
-	 */
-	public function remove_font_family( $font_family_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return;
-		}
-
-		$variations = $this->registered[ $font_family_handle ]->deps;
-
-		foreach ( $variations as $variation ) {
-			$this->remove( $variation );
-		}
-
-		$this->remove( $font_family_handle );
-	}
-
-	/**
-	 * Add a variation to an existing family or register family if none exists.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 * @param string $variation_handle   Optional. The variation's handle. When none is provided, the
-	 *                                   handle will be dynamically generated.
-	 *                                   Default empty string.
-	 * @return string|null Variation handle on success. Else null.
-	 */
-	public function add_variation( $font_family_handle, array $variation, $variation_handle = '' ) {
-		if ( ! WP_Fonts_Utils::is_defined( $font_family_handle ) ) {
-			trigger_error( 'Font family handle must be a non-empty string.' );
-			return null;
-		}
-
-		// When there is a variation handle, check it.
-		if ( '' !== $variation_handle && ! WP_Fonts_Utils::is_defined( $variation_handle ) ) {
-			trigger_error( 'Variant handle must be a non-empty string.' );
-			return null;
-		}
-
-		// Register the font family when it does not yet exist.
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			if ( ! $this->add_font_family( $font_family_handle ) ) {
-				return null;
-			}
-		}
-
-		$variation = $this->validate_variation( $variation );
-
-		// Variation validation failed.
-		if ( ! $variation ) {
-			return null;
-		}
-
-		// When there's no variation handle, attempt to create one.
-		if ( '' === $variation_handle ) {
-			$variation_handle = WP_Fonts_Utils::convert_variation_into_handle( $font_family_handle, $variation );
-			if ( is_null( $variation_handle ) ) {
-				return null;
-			}
-		}
-
-		// Bail out if the variant is already registered.
-		if ( $this->is_variation_registered( $font_family_handle, $variation_handle ) ) {
-			return $variation_handle;
-		}
-
-		$variation_src = array_key_exists( 'src', $variation ) ? $variation['src'] : false;
-		$result        = $this->add( $variation_handle, $variation_src );
-
-		// Bail out if the registration failed.
-		if ( ! $result ) {
-			return null;
-		}
-
-		$this->add_data( $variation_handle, 'font-properties', $variation );
-		$this->add_data( $variation_handle, 'is_font_family', false );
-
-		// Add the font variation as a dependency to the registered font family.
-		$this->add_dependency( $font_family_handle, $variation_handle );
-
-		$this->providers[ $variation['provider'] ]['fonts'][] = $variation_handle;
-
-		return $variation_handle;
-	}
-
-	/**
-	 * Removes a variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family for this variation.
-	 * @param string $variation_handle   The variation's handle to remove.
-	 */
-	public function remove_variation( $font_family_handle, $variation_handle ) {
-		if ( isset( $this->registered[ $variation_handle ] ) ) {
-			$this->remove( $variation_handle );
-		}
-
-		if ( ! $this->is_variation_registered( $font_family_handle, $variation_handle ) ) {
-			return;
-		}
-
-		// Remove the variation as a dependency from its font family.
-		$this->registered[ $font_family_handle ]->deps = array_values(
-			array_diff(
-				$this->registered[ $font_family_handle ]->deps,
-				array( $variation_handle )
-			)
-		);
-	}
-
-	/**
-	 * Checks if the variation is registered.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param string $variation_handle   Variation's handle.
-	 * @return bool True when registered to the given font family. Else false.
-	 */
-	private function is_variation_registered( $font_family_handle, $variation_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return false;
-		}
-
-		return in_array( $variation_handle, $this->registered[ $font_family_handle ]->deps, true );
-	}
-
-	/**
-	 * Adds a variation as a dependency to the given font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param string $variation_handle   The variation's handle.
-	 */
-	private function add_dependency( $font_family_handle, $variation_handle ) {
-		$this->registered[ $font_family_handle ]->deps[] = $variation_handle;
-	}
-
-	/**
-	 * Validates and sanitizes a variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $variation  Variation properties to add.
-	 * @return false|array Validated variation on success. Else, false.
-	 */
-	private function validate_variation( $variation ) {
-		$variation = wp_parse_args( $variation, $this->variation_property_defaults );
-
-		// Check the font-family.
-		if ( empty( $variation['font-family'] ) || ! is_string( $variation['font-family'] ) ) {
-			trigger_error( 'Webfont font-family must be a non-empty string.' );
-			return false;
-		}
-
-		// Local fonts need a "src".
-		if ( 'local' === $variation['provider'] ) {
-			// Make sure that local fonts have 'src' defined.
-			if ( empty( $variation['src'] ) || ( ! is_string( $variation['src'] ) && ! is_array( $variation['src'] ) ) ) {
-				trigger_error( 'Webfont src must be a non-empty string or an array of strings.' );
-				return false;
-			}
-		} elseif ( ! isset( $this->providers[ $variation['provider'] ] ) ) {
-			trigger_error( sprintf( 'The provider "%s" is not registered', $variation['provider'] ) );
-			return false;
-		} elseif ( ! class_exists( $this->providers[ $variation['provider'] ]['class'] ) ) {
-			trigger_error( sprintf( 'The provider class "%s" does not exist', $variation['provider'] ) );
-			return false;
-		}
-
-		// Validate the 'src' property.
-		if ( ! empty( $variation['src'] ) ) {
-			foreach ( (array) $variation['src'] as $src ) {
-				if ( empty( $src ) || ! is_string( $src ) ) {
-					trigger_error( 'Each webfont src must be a non-empty string.' );
-					return false;
-				}
-			}
-		}
-
-		// Check the font-weight.
-		if ( ! is_string( $variation['font-weight'] ) && ! is_int( $variation['font-weight'] ) ) {
-			trigger_error( 'Webfont font-weight must be a properly formatted string or integer.' );
-			return false;
-		}
-
-		// Check the font-display.
-		if ( ! in_array( $variation['font-display'], array( 'auto', 'block', 'fallback', 'swap', 'optional' ), true ) ) {
-			$variation['font-display'] = 'fallback';
-		}
-
-		$valid_props = array(
-			'ascent-override',
-			'descent-override',
-			'font-display',
-			'font-family',
-			'font-stretch',
-			'font-style',
-			'font-weight',
-			'font-variant',
-			'font-feature-settings',
-			'font-variation-settings',
-			'line-gap-override',
-			'size-adjust',
-			'src',
-			'unicode-range',
-
-			// Exceptions.
-			'provider',
-		);
-
-		foreach ( $variation as $prop => $value ) {
-			if ( ! in_array( $prop, $valid_props, true ) ) {
-				unset( $variation[ $prop ] );
-			}
-		}
-
-		return $variation;
-	}
-
-	/**
-	 * Processes the items and dependencies.
-	 *
-	 * Processes the items passed to it or the queue, and their dependencies.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
-	 *                                      single item (string), or multiple items (array of strings).
-	 *                                      Default false.
-	 * @param int|false            $group   Optional. Group level: level (int), no group (false).
-	 *
-	 * @return array|string[] Array of web font handles that have been processed.
-	 *                        An empty array if none were processed.
-	 */
-	public function do_items( $handles = false, $group = false ) {
-		$handles = $this->prepare_handles_for_printing( $handles );
-
-		if ( empty( $handles ) ) {
-			return $this->done;
-		}
-
-		$this->all_deps( $handles );
-		if ( empty( $this->to_do ) ) {
-			return $this->done;
-		}
-
-		$this->to_do_keyed_handles = array_flip( $this->to_do );
-
-		foreach ( $this->get_providers() as $provider_id => $provider ) {
-			// Alert and skip if the provider class does not exist.
-			if ( ! class_exists( $provider['class'] ) ) {
-				/* translators: %s is the provider name. */
-				trigger_error(
-					sprintf(
-						'Class "%s" not found for "%s" web font provider',
-						$provider['class'],
-						$provider_id
-					)
-				);
-				continue;
-			}
-
-			$this->do_item( $provider_id, $group );
-		}
-
-		$this->process_font_families_after_printing( $handles );
-
-		return $this->done;
-	}
-
-	/**
-	 * Prepares the given handles for printing.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Handles to prepare.
-	 *                                      Default false.
-	 * @return array Array of handles.
-	 */
-	private function prepare_handles_for_printing( $handles = false ) {
-		if ( false !== $handles ) {
-			$handles = $this->validate_handles( $handles );
-			// Bail out when invalid.
-			if ( empty( $handles ) ) {
-				return array();
-			}
-		}
-
-		// Use the enqueued queue.
-		if ( empty( $handles ) ) {
-			if ( empty( $this->queue ) ) {
-				return array();
-			}
-			$handles = $this->queue;
-		}
-
-		return $handles;
-	}
-
-	/**
-	 * Validates handle(s) to ensure each is a non-empty string.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[] $handles Handles to prepare.
-	 * @return string[]|null Array of handles on success. Else null.
-	 */
-	private function validate_handles( $handles ) {
-		// Validate each element is a non-empty string handle.
-		$handles = array_filter( (array) $handles, array( WP_Fonts_Utils::class, 'is_defined' ) );
-
-		if ( empty( $handles ) ) {
-			trigger_error( 'Handles must be a non-empty string or array of non-empty strings' );
-			return null;
-		}
-
-		return $handles;
-	}
-
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @see WP_Dependencies::do_item()
-	 *
-	 * @param string    $provider_id The provider to process.
-	 * @param int|false $group       Not used.
-	 * @return bool
-	 */
-	public function do_item( $provider_id, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		// Bail out if the provider is not registered.
-		if ( ! isset( $this->providers[ $provider_id ] ) ) {
-			return false;
-		}
-
-		$font_handles = $this->get_enqueued_fonts_for_provider( $provider_id );
-		if ( empty( $font_handles ) ) {
-			return false;
-		}
-
-		$properties_by_font = $this->get_font_properties_for_provider( $font_handles );
-		if ( empty( $properties_by_font ) ) {
-			return false;
-		}
-
-		// Invoke provider to print its styles.
-		$provider = $this->get_provider_instance( $provider_id );
-		$provider->set_fonts( $properties_by_font );
-		$provider->print_styles();
-
-		// Clean up.
-		$this->update_queues_for_printed_fonts( $font_handles );
-
-		return true;
-	}
-
-	/**
-	 * Retrieves a list of enqueued web font variations for a provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider to process.
-	 * @return array[] Webfonts organized by providers.
-	 */
-	private function get_enqueued_fonts_for_provider( $provider_id ) {
-		$providers = $this->get_providers();
-
-		if ( empty( $providers[ $provider_id ] ) ) {
-			return array();
-		}
-
-		return array_intersect(
-			$providers[ $provider_id ]['fonts'],
-			$this->to_do
-		);
-	}
-
-	/**
-	 * Gets a list of font properties for each of the given font handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_handles Font handles to get properties.
-	 * @return array A list of fonts with each font's properties.
-	 */
-	private function get_font_properties_for_provider( array $font_handles ) {
-		$font_properties = array();
-
-		foreach ( $font_handles as $font_handle ) {
-			$properties = $this->get_data( $font_handle, 'font-properties' );
-			if ( ! $properties ) {
-				continue;
-			}
-			$font_properties[ $font_handle ] = $properties;
-		}
-
-		return $font_properties;
-	}
-
-	/**
-	 * Gets the instance of the provider from the WP_Webfonts::$provider_instance store.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider to get.
-	 * @return object Instance of the provider.
-	 */
-	private function get_provider_instance( $provider_id ) {
-		if ( ! isset( $this->provider_instances[ $provider_id ] ) ) {
-			$this->provider_instances[ $provider_id ] = new $this->providers[ $provider_id ]['class']();
-		}
-		return $this->provider_instances[ $provider_id ];
-	}
-
-	/**
-	 * Update queues for the given printed fonts.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_handles Font handles to get properties.
-	 */
-	private function update_queues_for_printed_fonts( array $font_handles ) {
-		foreach ( $font_handles as $font_handle ) {
-			$this->set_as_done( $font_handle );
-			$this->remove_from_to_do_queues( $font_handle );
-		}
-	}
-
-	/**
-	 * Processes the font families after printing the variations.
-	 *
-	 * For each queued font family:
-	 *
-	 * a. if any of their variations were printed, the font family is added to the `done` list.
-	 * b. removes each from the to_do queues.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $handles Handles to process.
-	 */
-	private function process_font_families_after_printing( array $handles ) {
-		foreach ( $handles as $handle ) {
-			if (
-				! $this->get_data( $handle, 'is_font_family' ) ||
-				! isset( $this->to_do_keyed_handles[ $handle ] )
-			) {
-				continue;
-			}
-			$font_family = $this->registered[ $handle ];
-
-			// Add the font family to `done` list if any of its variations were printed.
-			if ( ! empty( $font_family->deps ) ) {
-				$processed = array_intersect( $font_family->deps, $this->done );
-				if ( ! empty( $processed ) ) {
-					$this->set_as_done( $handle );
-				}
-			}
-
-			$this->remove_from_to_do_queues( $handle );
-		}
-	}
-
-	/**
-	 * Removes the handle from the `to_do` and `to_do_keyed_handles` lists.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $handle Handle to remove.
-	 */
-	private function remove_from_to_do_queues( $handle ) {
-		unset(
-			$this->to_do[ $this->to_do_keyed_handles[ $handle ] ],
-			$this->to_do_keyed_handles[ $handle ]
-		);
-	}
-
-	/**
-	 * Sets the given handle to done by adding it to the `done` list.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $handle Handle to set as done.
-	 */
-	private function set_as_done( $handle ) {
-		if ( ! is_array( $this->done ) ) {
-			$this->done = array();
-		}
-		$this->done[] = $handle;
-	}
-
-	/**
-	 * Converts the font family and its variations into theme.json structural format.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle Font family to convert.
-	 * @return array Webfonts in theme.json structural format.
-	 */
-	public function to_theme_json( $font_family_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return array();
-		}
-
-		$font_family_name  = $this->registered[ $font_family_handle ]->extra['font-properties']['font-family'];
-		$theme_json_format = array(
-			'fontFamily' => str_contains( $font_family_name, ' ' ) ? "'{$font_family_name}'" : $font_family_name,
-			'name'       => $font_family_name,
-			'slug'       => $font_family_handle,
-			'fontFace'   => array(),
-		);
-
-		foreach ( $this->registered[ $font_family_handle ]->deps as $variation_handle ) {
-			if ( ! isset( $this->registered[ $variation_handle ] ) ) {
-				continue;
-			}
-
-			$variation_obj        = $this->registered[ $variation_handle ];
-			$variation_properties = array( 'origin' => 'gutenberg_wp_fonts_api' );
-			foreach ( $variation_obj->extra['font-properties'] as $property_name => $property_value ) {
-				$property_in_camelcase                          = lcfirst( str_replace( '-', '', ucwords( $property_name, '-' ) ) );
-				$variation_properties[ $property_in_camelcase ] = $property_value;
-			}
-			$theme_json_format['fontFace'][ $variation_obj->handle ] = $variation_properties;
-		}
-
-		return $theme_json_format;
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider-local.php b/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider-local.php
deleted file mode 100644
index b6fd5d78a1435a..00000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider-local.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/**
- * Fonts API: Provider for locally-hosted fonts.
- *
- * Part of the backwards-compatibility (BC) layer for all
- * deprecated publicly exposed methods and functionality.
- *
- * This class/file will NOT be backported to Core. Rather for sites
- * using the previous API, it exists to prevent breakages, giving
- * developers time to upgrade their code.
- *
- * @package    WordPress
- * @subpackage Fonts
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts_Provider_Local' ) ) {
-	return;
-}
-
-/**
- * A deprecated core bundled provider for generating `@font-face` styles
- * from locally-hosted font files.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- *
- * @since X.X.X
- * @deprecated GB 15.1 Use `WP_Fonts_Provider_Local` instead.
- */
-class WP_Webfonts_Provider_Local extends WP_Webfonts_Provider {
-
-	/**
-	 * The provider's unique ID.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @var string
-	 */
-	protected $id = 'local';
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 6.1.0
-	 */
-	public function __construct() {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Provider_Local' );
-
-		if (
-			function_exists( 'is_admin' ) && ! is_admin()
-			&&
-			function_exists( 'current_theme_supports' ) && ! current_theme_supports( 'html5', 'style' )
-		) {
-			$this->style_tag_atts = array( 'type' => 'text/css' );
-		}
-	}
-
-	/**
-	 * Gets the `@font-face` CSS styles for locally-hosted font files.
-	 *
-	 * This method does the following processing tasks:
-	 *    1. Orchestrates an optimized `src` (with format) for browser support.
-	 *    2. Generates the `@font-face` for all its webfonts.
-	 *
-	 * For example, when given these webfonts:
-	 * <code>
-	 * array(
-	 *      'source-serif-pro.normal.200 900' => array(
-	 *          'provider'    => 'local',
-	 *          'font_family' => 'Source Serif Pro',
-	 *          'font_weight' => '200 900',
-	 *          'font_style'  => 'normal',
-	 *          'src'         => 'https://example.com/wp-content/themes/twentytwentytwo/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2' ),
-	 *      ),
-	 *      'source-serif-pro.italic.400 900' => array(
-	 *          'provider'    => 'local',
-	 *          'font_family' => 'Source Serif Pro',
-	 *          'font_weight' => '200 900',
-	 *          'font_style'  => 'italic',
-	 *          'src'         => 'https://example.com/wp-content/themes/twentytwentytwo/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2' ),
-	 *      ),
-	 * )
-	 * </code>
-	 *
-	 * the following `@font-face` styles are generated and returned:
-	 * <code>
-	 *
-	 * @font-face{
-	 *      font-family:"Source Serif Pro";
-	 *      font-style:normal;
-	 *      font-weight:200 900;
-	 *      font-stretch:normal;
-	 *      src:local("Source Serif Pro"), url('/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');
-	 * }
-	 * @font-face{
-	 *      font-family:"Source Serif Pro";
-	 *      font-style:italic;
-	 *      font-weight:200 900;
-	 *      font-stretch:normal;
-	 *      src:local("Source Serif Pro"), url('/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');
-	 * }
-	 * </code>
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string The `@font-face` CSS.
-	 */
-	public function get_css() {
-		$css = '';
-
-		foreach ( $this->webfonts as $webfont ) {
-			// Order the webfont's `src` items to optimize for browser support.
-			$webfont = $this->order_src( $webfont );
-
-			// Build the @font-face CSS for this webfont.
-			$css .= '@font-face{' . $this->build_font_face_css( $webfont ) . '}';
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Order `src` items to optimize for browser support.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param array $webfont Webfont to process.
-	 * @return array
-	 */
-	private function order_src( array $webfont ) {
-		if ( ! is_array( $webfont['src'] ) ) {
-			$webfont['src'] = (array) $webfont['src'];
-		}
-
-		$src         = array();
-		$src_ordered = array();
-
-		foreach ( $webfont['src'] as $url ) {
-			// Add data URIs first.
-			if ( str_starts_with( trim( $url ), 'data:' ) ) {
-				$src_ordered[] = array(
-					'url'    => $url,
-					'format' => 'data',
-				);
-				continue;
-			}
-			$format         = pathinfo( $url, PATHINFO_EXTENSION );
-			$src[ $format ] = $url;
-		}
-
-		// Add woff2.
-		if ( ! empty( $src['woff2'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff2'],
-				'format' => 'woff2',
-			);
-		}
-
-		// Add woff.
-		if ( ! empty( $src['woff'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff'],
-				'format' => 'woff',
-			);
-		}
-
-		// Add ttf.
-		if ( ! empty( $src['ttf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['ttf'],
-				'format' => 'truetype',
-			);
-		}
-
-		// Add eot.
-		if ( ! empty( $src['eot'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['eot'],
-				'format' => 'embedded-opentype',
-			);
-		}
-
-		// Add otf.
-		if ( ! empty( $src['otf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['otf'],
-				'format' => 'opentype',
-			);
-		}
-		$webfont['src'] = $src_ordered;
-
-		return $webfont;
-	}
-
-	/**
-	 * Builds the font-family's CSS.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param array $webfont Webfont to process.
-	 * @return string This font-family's CSS.
-	 */
-	private function build_font_face_css( array $webfont ) {
-		$css = '';
-
-		// Wrap font-family in quotes if it contains spaces
-		// and is not already wrapped in quotes.
-		if (
-			str_contains( $webfont['font-family'], ' ' ) &&
-			! str_contains( $webfont['font-family'], '"' ) &&
-			! str_contains( $webfont['font-family'], "'" )
-		) {
-			$webfont['font-family'] = '"' . $webfont['font-family'] . '"';
-		}
-
-		foreach ( $webfont as $key => $value ) {
-
-			// Skip "provider", since it's for internal API use,
-			// and not a valid CSS property.
-			if ( 'provider' === $key ) {
-				continue;
-			}
-
-			// Compile the "src" parameter.
-			if ( 'src' === $key ) {
-				$value = $this->compile_src( $webfont['font-family'], $value );
-			}
-
-			// If font-variation-settings is an array, convert it to a string.
-			if ( 'font-variation-settings' === $key && is_array( $value ) ) {
-				$value = $this->compile_variations( $value );
-			}
-
-			if ( ! empty( $value ) ) {
-				$css .= "$key:$value;";
-			}
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Compiles the `src` into valid CSS.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param string $font_family Font family.
-	 * @param array  $value       Value to process.
-	 * @return string The CSS.
-	 */
-	private function compile_src( $font_family, array $value ) {
-		$src = "local($font_family)";
-
-		foreach ( $value as $item ) {
-
-			if ( str_starts_with( $item['url'], get_site_url() ) ) {
-				$item['url'] = wp_make_link_relative( $item['url'] );
-			}
-
-			$src .= ( 'data' === $item['format'] )
-				? ", url({$item['url']})"
-				: ", url('{$item['url']}') format('{$item['format']}')";
-		}
-		return $src;
-	}
-
-	/**
-	 * Compiles the font variation settings.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param array $font_variation_settings Array of font variation settings.
-	 * @return string The CSS.
-	 */
-	private function compile_variations( array $font_variation_settings ) {
-		$variations = '';
-
-		foreach ( $font_variation_settings as $key => $value ) {
-			$variations .= "$key $value";
-		}
-
-		return $variations;
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider.php b/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider.php
deleted file mode 100644
index 5b7f5ece335b11..00000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Fonts API: Provider abstract class.
- *
- * Part of the backwards-compatibility (BC) layer for all
- * deprecated publicly exposed methods and functionality.
- *
- * This class/file will NOT be backported to Core. Rather for sites
- * using the previous API, it exists to prevent breakages, giving
- * developers time to upgrade their code.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts_Provider' ) ) {
-	return;
-}
-
-/**
- * Deprecated abstract class for Fonts API providers.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- *
- * @since X.X.X
- * @deprecated GB 15.1 Use `WP_Fonts_Provider` instead.
- */
-abstract class WP_Webfonts_Provider extends WP_Fonts_Provider {
-
-	/**
-	 * Fonts to be processed.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use WP_Fonts_Provider::$fonts property instead.
-	 *
-	 * @var array[]
-	 */
-	protected $webfonts = array();
-
-	/**
-	 * Sets this provider's fonts property.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use WP_Fonts_Provider::set_fonts() instead.
-	 *
-	 * @param array[] $fonts Fonts to be processed.
-	 */
-	public function set_webfonts( array $fonts ) {
-		_deprecated_function( __METHOD__, 'X.X.X', 'WP_Fonts_Provider::set_fonts()' );
-
-		parent::set_fonts( $fonts );
-		$this->webfonts = $this->fonts;
-	}
-
-	/**
-	 * This method is here to wire WP_Fonts_Provider::do_item() to this
-	 * deprecated class to ensure the fonts get set.
-	 *
-	 * @param array[] $fonts Fonts to be processed.
-	 */
-	public function set_fonts( array $fonts ) {
-		parent::set_fonts( $fonts );
-		$this->webfonts = $this->fonts;
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-utils.php b/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-utils.php
deleted file mode 100644
index d0242acf9a2b6f..00000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-utils.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Webfont API's utility helpers.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- * This file is now part of the API's Backwards-Compatibility (BC) layer.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts_Utils' ) ) {
-	return;
-}
-
-/**
- * Utility helpers for the Webfonts API.
- *
- * @since X.X.X
- * @deprecated GB 15.1 Use WP_Fonts_Utils instead.
- */
-class WP_Webfonts_Utils {
-
-	/**
-	 * Converts the given font family into a handle.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::convert_font_family_into_handle() instead.
-	 *
-	 * @param string $font_family Font family to convert into a handle.
-	 * @return string|null The font family handle on success. Else, null.
-	 */
-	public static function convert_font_family_into_handle( $font_family ) {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Utils::convert_font_family_into_handle()' );
-
-		return WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-	}
-
-	/**
-	 * Converts the given variation and its font-family into a handle.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::convert_variation_into_handle() instead.
-	 *
-	 * @param string $font_family The font family's handle for this variation.
-	 * @param array  $variation   An array of variation properties.
-	 * @return string|null The variation handle.
-	 */
-	public static function convert_variation_into_handle( $font_family, array $variation ) {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Utils::convert_variation_into_handle()' );
-
-		return WP_Fonts_Utils::convert_variation_into_handle( $variation );
-	}
-
-	/**
-	 * Gets the font family from the variation.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::get_font_family_from_variation() instead.
-	 *
-	 * @param array $variation An array of variation properties to search.
-	 * @return string|null The font family if defined. Else, null.
-	 */
-	public static function get_font_family_from_variation( array $variation ) {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Utils::get_font_family_from_variation()' );
-
-		return WP_Fonts_Utils::get_font_family_from_variation( $variation );
-	}
-
-	/**
-	 * Checks if the given input is defined, i.e. meaning is a non-empty string.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::is_defined() instead.
-	 *
-	 * @param string $input The input to check.
-	 * @return bool True when non-empty string. Else false.
-	 */
-	public static function is_defined( $input ) {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Utils::is_defined()' );
-
-		return WP_Fonts_Utils::is_defined( $input );
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts.php b/lib/experimental/fonts-api/bc-layer/class-wp-webfonts.php
deleted file mode 100644
index 58633b9f8082b4..00000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Webfonts API class: backwards-compatibility (BC) layer for all
- * deprecated publicly exposed methods and functionality.
- *
- * This class/file will NOT be backported to Core. Rather for sites
- * using the previous API, it exists to prevent breakages, giving
- * developers time to upgrade their code.
- *
- * @package    Gutenberg
- * @subpackage Fonts API's BC Layer
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts' ) ) {
-	return;
-}
-
-/**
- * Class WP_Webfonts
- *
- * @deprecated GB 15.1 Use WP_Fonts instead.
- */
-class WP_Webfonts {
-	/**
-	 * Instance of WP_Fonts.
-	 *
-	 * @var WP_Fonts
-	 */
-	private $wp_fonts;
-
-	/**
-	 * Instantiate an instance of WP_Webfonts.
-	 *
-	 * @param null|WP_Fonts $wp_fonts Optional. Instance of WP_Fonts.
-	 *                                Default uses wp_fonts().
-	 */
-	public function __construct( $wp_fonts = null ) {
-		$this->wp_fonts = ! empty( $wp_fonts ) ? $wp_fonts : wp_fonts();
-	}
-
-	/**
-	 * Gets the font slug.
-	 *
-	 * @since X.X.X
-	 * @deprecated Use WP_Fonts_Utils::convert_font_family_into_handle() or WP_Fonts_Utils::get_font_family_from_variation().
-	 *
-	 * @param array|string $to_convert The value to convert into a slug. Expected as the web font's array
-	 *                                 or a font-family as a string.
-	 * @return string|false The font slug on success, or false if the font-family cannot be determined.
-	 */
-	public static function get_font_slug( $to_convert ) {
-		$message = is_array( $to_convert )
-			? 'Use WP_Fonts_Utils::get_font_family_from_variation() to get the font family from an array and then WP_Fonts_Utils::convert_font_family_into_handle() to convert the font-family name into a handle'
-			: 'Use WP_Fonts_Utils::convert_font_family_into_handle() to convert the font-family name into a handle';
-		_deprecated_function( __METHOD__, 'GB 14.9.1', $message );
-
-		if ( empty( $to_convert ) ) {
-			return false;
-		}
-
-		$font_family_name = is_array( $to_convert )
-			? WP_Fonts_Utils::get_font_family_from_variation( $to_convert )
-			: $to_convert;
-
-		$slug = false;
-		if ( ! empty( $font_family_name ) ) {
-			$slug = WP_Fonts_Utils::convert_font_family_into_handle( $font_family_name );
-		}
-
-		return $slug;
-	}
-
-	/**
-	 * Initializes the API.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_fonts().
-	 */
-	public static function init() {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_fonts()' );
-	}
-
-	/**
-	 * Get the list of all registered font family handles.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.8.0 Use wp_fonts()->get_registered_font_families().
-	 *
-	 * @return string[]
-	 */
-	public function get_registered_font_families() {
-		_deprecated_function( __METHOD__, 'GB 15.8.0', 'wp_fonts()->get_registered_font_families()' );
-
-		return $this->wp_fonts->get_registered_font_families();
-	}
-
-	/**
-	 * Gets the list of registered fonts.
-	 *
-	 * @since 6.0.0
-	 * @deprecated 14.9.1 Use wp_fonts()->get_registered().
-	 *
-	 * @return array[]
-	 */
-	public function get_registered_webfonts() {
-		_deprecated_function( __METHOD__, '14.9.1', 'wp_fonts()->get_registered()' );
-
-		return $this->_get_registered_webfonts();
-	}
-
-	/**
-	 * Gets the list of enqueued fonts.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_fonts()->get_enqueued().
-	 *
-	 * @return array[]
-	 */
-	public function get_enqueued_webfonts() {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_fonts()->get_enqueued()' );
-
-		return $this->wp_fonts->queue;
-	}
-
-	/**
-	 * Gets the list of all fonts.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_fonts()->get_registered().
-	 *
-	 * @return array[]
-	 */
-	public function get_all_webfonts() {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_fonts()->get_registered()' );
-
-		return $this->_get_registered_webfonts();
-	}
-
-	/**
-	 * Registers a webfont.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_register_fonts().
-	 *
-	 * @param array  $webfont             Web font to register.
-	 * @param string $font_family_handle  Optional. Font family handle for the given variation.
-	 *                                    Default empty string.
-	 * @param string $variation_handle    Optional. Handle for the variation to register.
-	 * @param bool   $silence_deprecation Optional. Silences the deprecation notice. For internal use.
-	 * @return string|false The font family slug if successfully registered, else false.
-	 */
-	public function register_webfont( array $webfont, $font_family_handle = '', $variation_handle = '', $silence_deprecation = false ) {
-		if ( ! $silence_deprecation ) {
-			_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_register_fonts()' );
-		}
-
-		// Bail out if no variation passed as there's not to register.
-		if ( empty( $webfont ) ) {
-			return false;
-		}
-
-		// Restructure definition: keyed by font-family and array of variations.
-		$font = array( $webfont );
-		if ( WP_Fonts_Utils::is_defined( $font_family_handle ) ) {
-			$font = array( $font_family_handle => $font );
-		} else {
-			$font               = Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure( $font, true );
-			$font_family_handle = array_key_first( $font );
-		}
-
-		if ( empty( $font ) || empty( $font_family_handle ) ) {
-			return false;
-		}
-
-		// If the variation handle was passed, add it as variation key.
-		if ( WP_Fonts_Utils::is_defined( $variation_handle ) ) {
-			$font[ $font_family_handle ] = array( $variation_handle => $font[ $font_family_handle ][0] );
-		}
-
-		// Register with the Fonts API.
-		$handle = wp_register_fonts( $font );
-		if ( empty( $handle ) ) {
-			return false;
-		}
-		return array_pop( $handle );
-	}
-
-	/**
-	 * Enqueue a font-family that has been already registered.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_enqueue_fonts().
-	 *
-	 * @param string $font_family_name The font family name to be enqueued.
-	 * @return bool True if successfully enqueued, else false.
-	 */
-	public function enqueue_webfont( $font_family_name ) {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_enqueue_fonts()' );
-
-		wp_enqueue_fonts( array( $font_family_name ) );
-		return true;
-	}
-
-	/**
-	 * Gets the registered webfonts in the original web font property structure keyed by each handle.
-	 *
-	 * @return array[]
-	 */
-	private function _get_registered_webfonts() {
-		$font_families = array();
-		$registered    = array();
-
-		// Find the registered font families.
-		foreach ( $this->wp_fonts->registered as $handle => $obj ) {
-			if ( ! $obj->extra['is_font_family'] ) {
-				continue;
-			}
-
-			if ( ! isset( $registered[ $handle ] ) ) {
-				$registered[ $handle ] = array();
-			}
-
-			$font_families[ $handle ] = $obj->deps;
-		}
-
-		// Build the return array structure.
-		foreach ( $font_families as $font_family_handle => $variations ) {
-			foreach ( $variations as $variation_handle ) {
-				$variation_obj = $this->wp_fonts->registered[ $variation_handle ];
-
-				$registered[ $font_family_handle ][ $variation_handle ] = $variation_obj->extra['font-properties'];
-			}
-		}
-
-		return $registered;
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/webfonts-deprecations.php b/lib/experimental/fonts-api/bc-layer/webfonts-deprecations.php
deleted file mode 100644
index 7a3a7bd013eea3..00000000000000
--- a/lib/experimental/fonts-api/bc-layer/webfonts-deprecations.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * Deprecated functions provided here to give extenders time to change
- * their plugins/themes before this API is introduced into Core.
- *
- * BACKPORT NOTE: Do not backport these deprecated functions to Core.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( ! function_exists( 'wp_webfonts' ) ) {
-	/**
-	 * Initialize $wp_webfonts if it has not been set.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use wp_fonts() instead.
-	 *
-	 * @global WP_Webfonts $wp_webfonts
-	 *
-	 * @return WP_Webfonts WP_Webfonts instance.
-	 */
-	function wp_webfonts() {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_fonts()' );
-
-		global $wp_webfonts;
-
-		if ( ! ( $wp_webfonts instanceof WP_Webfonts ) ) {
-			$wp_webfonts = new WP_Webfonts( wp_fonts() );
-		}
-
-		return $wp_webfonts;
-	}
-}
-
-if ( ! function_exists( 'wp_register_webfonts' ) ) {
-	/**
-	 * Registers one or more font-families and each of their variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use wp_register_fonts() instead.
-	 *
-	 * @param array[] $webfonts {
-	 *     Web fonts to be registered, grouped by each font-family.
-	 *
-	 *     @type string $font-family => array[] $variations {
-	 *          An array of web font variations for this font-family.
-	 *          Each variation has the following structure.
-	 *
-	 *          @type array $variation {
-	 *              @type string $provider     The provider ID. Default 'local'.
-	 *              @type string $font-style   The font-style property. Default 'normal'.
-	 *              @type string $font-weight  The font-weight property. Default '400'.
-	 *              @type string $font-display The font-display property. Default 'fallback'.
-	 *         }
-	 *     }
-	 * }
-	 * @return string[] Array of registered font family handles.
-	 */
-	function wp_register_webfonts( array $webfonts ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_register_fonts()' );
-
-		$webfonts = Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure( $webfonts );
-
-		return wp_register_fonts( $webfonts );
-	}
-}
-
-if ( ! function_exists( 'wp_register_webfont' ) ) {
-	/**
-	 * Registers a single webfont.
-	 *
-	 * Example of how to register Source Serif Pro font with font-weight range of 200-900:
-	 *
-	 * If the font file is contained within the theme:
-	 *
-	 * <code>
-	 * wp_register_webfont(
-	 *      array(
-	 *          'provider'    => 'local',
-	 *          'font-family' => 'Source Serif Pro',
-	 *          'font-weight' => '200 900',
-	 *          'font-style'  => 'normal',
-	 *          'src'         => get_theme_file_uri( 'assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2' ),
-	 *      )
-	 * );
-	 * </code>
-	 *
-	 * @since 6.0.0
-	 * @deprecated 14.9.1 Use wp_register_fonts().
-	 *
-	 * @param array $webfont Webfont to be registered.
-	 * @return string|false The font family slug if successfully registered, else false.
-	 */
-	function wp_register_webfont( array $webfont ) {
-		_deprecated_function( __FUNCTION__, '14.9.1', 'wp_register_fonts()' );
-
-		return wp_fonts()->register_webfont( $webfont, '', '', false );
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_webfonts' ) ) {
-	/**
-	 * Enqueues one or more font family and all of its variations.
-	 *
-	 * @since X.X.X
-	 * @since GB 15.1 Use wp_enqueue_fonts() ihstead.
-	 *
-	 * @param string[] $font_families Font family(ies) to enqueue.
-	 */
-	function wp_enqueue_webfonts( array $font_families ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_enqueue_fonts()' );
-
-		wp_enqueue_fonts( $font_families );
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_webfont' ) ) {
-	/**
-	 * Enqueue a single font family that has been registered beforehand.
-	 *
-	 * Example of how to enqueue Source Serif Pro font:
-	 *
-	 * <code>
-	 * wp_enqueue_webfont( 'Source Serif Pro' );
-	 * </code>
-	 *
-	 * Font families should be enqueued from the `init` hook or later.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_enqueue_fonts() instead.
-	 *
-	 * @param string $font_family_name The font family name to be enqueued.
-	 * @return bool True if successfully enqueued, else false.
-	 */
-	function wp_enqueue_webfont( $font_family_name ) {
-		_deprecated_function( __FUNCTION__, 'GB 14.9.1', 'wp_enqueue_fonts()' );
-
-		wp_enqueue_fonts( array( $font_family_name ) );
-		return true;
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_webfont_variations' ) ) {
-	/**
-	 * Enqueues a specific set of web font variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use wp_enqueue_font_variations() instead.
-	 *
-	 * @param string|string[] $variation_handles Variation handle (string) or handles (array of strings).
-	 */
-	function wp_enqueue_webfont_variations( $variation_handles ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_enqueue_font_variations()' );
-
-		wp_enqueue_font_variations( $variation_handles );
-	}
-}
-
-if ( ! function_exists( 'wp_deregister_webfont_variation' ) ) {
-	/**
-	 * Deregisters a font variation.
-	 *
-	 * @since GB 14.9.1
-	 * @deprecated GB 15.1 Use wp_deregister_font_variation() instead.
-	 *
-	 * @param string $font_family_handle The font family for this variation.
-	 * @param string $variation_handle   The variation's handle to remove.
-	 */
-	function wp_deregister_webfont_variation( $font_family_handle, $variation_handle ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_deregister_font_variation()' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-	}
-}
-
-if ( ! function_exists( 'wp_get_webfont_providers' ) ) {
-	/**
-	 * Gets all registered providers.
-	 *
-	 * Return an array of providers, each keyed by their unique
-	 * ID (i.e. the `$id` property in the provider's object) with
-	 * an instance of the provider (object):
-	 *     ID => provider instance
-	 *
-	 * Each provider contains the business logic for how to
-	 * process its specific font service (i.e. local or remote)
-	 * and how to generate the `@font-face` styles for its service.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 14.9.1 Use wp_fonts()->get_providers().
-	 *
-	 * @return string[] All registered providers, each keyed by their unique ID.
-	 */
-	function wp_get_webfont_providers() {
-		_deprecated_function( __FUNCTION__, '14.9.1', 'wp_fonts()->get_providers()' );
-
-		$providers = array();
-		foreach ( wp_fonts()->get_providers() as $id => $config ) {
-			$providers[ $id ] = $config['class'];
-		}
-
-		return $providers;
-	}
-}
-
-if ( ! function_exists( 'wp_register_webfont_provider' ) ) {
-	/**
-	 * Registers a custom font service provider.
-	 *
-	 * A webfont provider contains the business logic for how to
-	 * interact with a remote font service and how to generate
-	 * the `@font-face` styles for that remote service.
-	 *
-	 * How to register a custom font service provider:
-	 *    1. Load its class file into memory before registration.
-	 *    2. Pass the class' name to this function.
-	 *
-	 * For example, for a class named `My_Custom_Font_Service_Provider`:
-	 * ```
-	 *    wp_register_webfont_provider( My_Custom_Font_Service_Provider::class );
-	 * ```
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use wp_register_font_provider() instead.
-	 *
-	 * @param string $name      The provider's name.
-	 * @param string $classname The provider's class name.
-	 *                          The class should be a child of `WP_Webfonts_Provider`.
-	 *                          See {@see WP_Webfonts_Provider}.
-	 *
-	 * @return bool True if successfully registered, else false.
-	 */
-	function wp_register_webfont_provider( $name, $classname ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_register_font_provider' );
-
-		return wp_register_font_provider( $name, $classname );
-	}
-}
-
-if ( ! function_exists( 'wp_print_webfonts' ) ) {
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since GB 14.9.1
-	 * @deprecated GB 15.1 Use wp_print_fonts() instead.
-	 *
-	 * @param string|string[]|false $handles Optional. Items to be processed: queue (false),
-	 *                                       single item (string), or multiple items (array of strings).
-	 *                                       Default false.
-	 * @return array|string[] Array of web font handles that have been processed.
-	 *                        An empty array if none were processed.
-	 */
-	function wp_print_webfonts( $handles = false ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_print_fonts' );
-
-		return wp_print_fonts( $handles );
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts-provider-local.php b/lib/experimental/fonts-api/class-wp-fonts-provider-local.php
deleted file mode 100644
index 019861a9ae191f..00000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts-provider-local.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/**
- * Webfonts API: Provider for locally-hosted fonts.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Provider_Local' ) ) {
-	return;
-}
-
-/**
- * A core bundled provider for generating `@font-face` styles
- * from locally-hosted font files.
- *
- * This provider builds an optimized `src` (for browser support)
- * and then generates the `@font-face` styles.
- *
- * All know-how (business logic) for how to interact with and
- * generate styles from locally-hosted font files is contained
- * in this provider.
- *
- * @since X.X.X
- */
-class WP_Fonts_Provider_Local extends WP_Fonts_Provider {
-
-	/**
-	 * The provider's unique ID.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string
-	 */
-	protected $id = 'local';
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 6.1.0
-	 */
-	public function __construct() {
-		if (
-			function_exists( 'is_admin' ) && ! is_admin()
-			&&
-			function_exists( 'current_theme_supports' ) && ! current_theme_supports( 'html5', 'style' )
-		) {
-			$this->style_tag_atts = array( 'type' => 'text/css' );
-		}
-	}
-
-	/**
-	 * Gets the `@font-face` CSS styles for locally-hosted font files.
-	 *
-	 * This method does the following processing tasks:
-	 *    1. Orchestrates an optimized `src` (with format) for browser support.
-	 *    2. Generates the `@font-face` for all its fonts.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string The `@font-face` CSS.
-	 */
-	public function get_css() {
-		$css = '';
-
-		foreach ( $this->fonts as $font ) {
-			// Order the font's `src` items to optimize for browser support.
-			$font = $this->order_src( $font );
-
-			// Build the @font-face CSS for this font.
-			$css .= '@font-face{' . $this->build_font_face_css( $font ) . '}';
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Order `src` items to optimize for browser support.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font Font to process.
-	 * @return array
-	 */
-	private function order_src( array $font ) {
-		if ( ! is_array( $font['src'] ) ) {
-			$font['src'] = (array) $font['src'];
-		}
-
-		$src         = array();
-		$src_ordered = array();
-
-		foreach ( $font['src'] as $url ) {
-			// Add data URIs first.
-			if ( str_starts_with( trim( $url ), 'data:' ) ) {
-				$src_ordered[] = array(
-					'url'    => $url,
-					'format' => 'data',
-				);
-				continue;
-			}
-			$format         = pathinfo( $url, PATHINFO_EXTENSION );
-			$src[ $format ] = $url;
-		}
-
-		// Add woff2.
-		if ( ! empty( $src['woff2'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff2'],
-				'format' => 'woff2',
-			);
-		}
-
-		// Add woff.
-		if ( ! empty( $src['woff'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff'],
-				'format' => 'woff',
-			);
-		}
-
-		// Add ttf.
-		if ( ! empty( $src['ttf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['ttf'],
-				'format' => 'truetype',
-			);
-		}
-
-		// Add eot.
-		if ( ! empty( $src['eot'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['eot'],
-				'format' => 'embedded-opentype',
-			);
-		}
-
-		// Add otf.
-		if ( ! empty( $src['otf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['otf'],
-				'format' => 'opentype',
-			);
-		}
-		$font['src'] = $src_ordered;
-
-		return $font;
-	}
-
-	/**
-	 * Builds the font-family's CSS.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font Font to process.
-	 * @return string This font-family's CSS.
-	 */
-	private function build_font_face_css( array $font ) {
-		$css = '';
-
-		// Wrap font-family in quotes if it contains spaces
-		// and is not already wrapped in quotes.
-		if (
-			str_contains( $font['font-family'], ' ' ) &&
-			! str_contains( $font['font-family'], '"' ) &&
-			! str_contains( $font['font-family'], "'" )
-		) {
-			$font['font-family'] = '"' . $font['font-family'] . '"';
-		}
-
-		foreach ( $font as $key => $value ) {
-
-			// Skip "provider", since it's for internal API use,
-			// and not a valid CSS property.
-			if ( 'provider' === $key ) {
-				continue;
-			}
-
-			// Compile the "src" parameter.
-			if ( 'src' === $key ) {
-				$value = $this->compile_src( $value );
-			}
-
-			// If font-variation-settings is an array, convert it to a string.
-			if ( 'font-variation-settings' === $key && is_array( $value ) ) {
-				$value = $this->compile_variations( $value );
-			}
-
-			if ( ! empty( $value ) ) {
-				$css .= "$key:$value;";
-			}
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Compiles the `src` into valid CSS.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $value Value to process.
-	 * @return string The CSS.
-	 */
-	private function compile_src( array $value ) {
-		$src = '';
-
-		foreach ( $value as $item ) {
-			$src .= ( 'data' === $item['format'] )
-				? ", url({$item['url']})"
-				: ", url('{$item['url']}') format('{$item['format']}')";
-		}
-
-		$src = ltrim( $src, ', ' );
-		return $src;
-	}
-
-	/**
-	 * Compiles the font variation settings.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_variation_settings Array of font variation settings.
-	 * @return string The CSS.
-	 */
-	private function compile_variations( array $font_variation_settings ) {
-		$variations = '';
-
-		foreach ( $font_variation_settings as $key => $value ) {
-			$variations .= "$key $value";
-		}
-
-		return $variations;
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts-provider.php b/lib/experimental/fonts-api/class-wp-fonts-provider.php
deleted file mode 100644
index b59c59d6b8938f..00000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts-provider.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Fonts API: Provider abstract class.
- *
- * Individual fonts providers should extend this class and implement.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Provider' ) ) {
-	return;
-}
-
-/**
- * Abstract class for Fonts API providers.
- *
- * The starting point to building a font service provider.
- *
- * What is a Provider?
- *
- * A provider contains the know-how (business logic) for how to
- * process its specific font service (i.e. local or remote)
- * and how to generate the `@font-face` styles for its service.
- *
- * It receives a collection of fonts from the Controller
- * {@see WP_Fonts_Provider::set_fonts()}, and when requested
- * {@see WP_Fonts_Provider::get_css()}, it transforms them
- * into styles (in a performant way for the provider service
- * it manages).
- *
- * @since X.X.X
- */
-abstract class WP_Fonts_Provider {
-
-	/**
-	 * The provider's unique ID.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string
-	 */
-	protected $id = '';
-
-	/**
-	 * Fonts to be processed.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var array[]
-	 */
-	protected $fonts = array();
-
-	/**
-	 * Array of Font-face style tag's attribute(s)
-	 * where the key is the attribute name and the
-	 * value is its value.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string[]
-	 */
-	protected $style_tag_atts = array();
-
-	/**
-	 * Sets this provider's fonts property.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array[] $fonts Registered fonts.
-	 */
-	public function set_fonts( array $fonts ) {
-		$this->fonts = $fonts;
-	}
-
-	/**
-	 * Prints the generated styles.
-	 *
-	 * @since X.X.X
-	 */
-	public function print_styles() {
-		printf(
-			$this->get_style_element(),
-			$this->get_css()
-		);
-	}
-
-	/**
-	 * Gets the `@font-face` CSS for the provider's fonts.
-	 *
-	 * This method is where the provider does it processing to build the
-	 * needed `@font-face` CSS for all of its fonts. Specifics of how
-	 * this processing is done is contained in each provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string The `@font-face` CSS.
-	 */
-	abstract public function get_css();
-
-	/**
-	 * Gets the `<style>` element for wrapping the `@font-face` CSS.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string The style element.
-	 */
-	protected function get_style_element() {
-		$attributes = $this->generate_style_element_attributes();
-
-		return "<style id='wp-fonts-{$this->id}'{$attributes}>\n%s\n</style>\n";
-	}
-
-	/**
-	 * Gets the defined <style> element's attributes.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string A string of attribute=value when defined, else, empty string.
-	 */
-	private function generate_style_element_attributes() {
-		$attributes = '';
-		foreach ( $this->style_tag_atts as $name => $value ) {
-			$attributes .= " {$name}='{$value}'";
-		}
-		return $attributes;
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts-resolver.php b/lib/experimental/fonts-api/class-wp-fonts-resolver.php
deleted file mode 100644
index efa66839cd39ca..00000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts-resolver.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/**
- * WP_Fonts_Resolver class.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Resolver' ) ) {
-	return;
-}
-
-/**
- * The Fonts API Resolver abstracts the processing of different data sources
- * (such as theme.json and global styles) for font interactions with the API.
- *
- * This class is for internal core usage and is not supposed to be used by
- * extenders (plugins and/or themes).
- *
- * @access private
- */
-class WP_Fonts_Resolver {
-	/**
-	 * Defines the key structure in global styles to the fontFamily
-	 * user-selected font.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string[][]
-	 */
-	protected static $global_styles_font_family_structure = array(
-		array( 'elements', 'link', 'typography', 'fontFamily' ),
-		array( 'elements', 'heading', 'typography', 'fontFamily' ),
-		array( 'elements', 'caption', 'typography', 'fontFamily' ),
-		array( 'elements', 'button', 'typography', 'fontFamily' ),
-		array( 'typography', 'fontFamily' ),
-	);
-
-	/**
-	 * Enqueues user-selected fonts via global styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array User selected font-families when exists, else empty array.
-	 */
-	public static function enqueue_user_selected_fonts() {
-		$user_selected_fonts = array();
-		$user_global_styles  = WP_Theme_JSON_Resolver_Gutenberg::get_user_data()->get_raw_data();
-		if ( isset( $user_global_styles['styles'] ) ) {
-			$user_selected_fonts = static::get_user_selected_fonts( $user_global_styles['styles'] );
-		}
-
-		if ( empty( $user_selected_fonts ) ) {
-			return array();
-		}
-
-		wp_enqueue_fonts( $user_selected_fonts );
-		return $user_selected_fonts;
-	}
-
-	/**
-	 * Gets the user-selected font-family handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param  array $global_styles Global styles potentially containing user-selected fonts.
-	 * @return array User-selected font-families.
-	 */
-	private static function get_user_selected_fonts( array $global_styles ) {
-		$font_families = array();
-
-		foreach ( static::$global_styles_font_family_structure as $path ) {
-			$style_value = _wp_array_get( $global_styles, $path, '' );
-
-			$font_family = static::get_value_from_style( $style_value );
-			if ( '' !== $font_family ) {
-				$font_families[] = $font_family;
-			}
-		}
-
-		return array_unique( $font_families );
-	}
-
-	/**
-	 * Get the value (i.e. preset slug) from the given style value.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $style       The style to parse.
-	 * @param string $preset_type Optional. The type to parse. Default 'font-family'.
-	 * @return string Preset slug.
-	 */
-	private static function get_value_from_style( $style, $preset_type = 'font-family' ) {
-		if ( '' === $style ) {
-			return '';
-		}
-
-		$starting_pattern = "var(--wp--preset--{$preset_type}--";
-		$ending_pattern   = ')';
-		if ( ! str_starts_with( $style, $starting_pattern ) ) {
-			return '';
-		}
-
-		$offset = strlen( $starting_pattern );
-		$length = strpos( $style, $ending_pattern ) - $offset;
-		return substr( $style, $offset, $length );
-	}
-
-	/**
-	 * Register fonts defined in theme.json.
-	 *
-	 * @since X.X.X
-	 */
-	public static function register_fonts_from_theme_json() {
-
-		$settings = static::get_settings();
-		// Bail out early if there are no settings for fonts.
-		if ( empty( $settings['typography'] ) || empty( $settings['typography']['fontFamilies'] ) ) {
-			return;
-		}
-
-		list( $fonts, $handles ) = static::parse_font_families( $settings );
-
-		wp_register_fonts( $fonts );
-		wp_enqueue_fonts( $handles );
-	}
-
-	/**
-	 * Add missing fonts to the global styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param WP_Theme_JSON_Gutenberg|WP_Theme_JSON $data The global styles.
-	 * @return WP_Theme_JSON_Gutenberg|WP_Theme_JSON The global styles with missing fonts.
-	 */
-	public static function add_missing_fonts_to_theme_json( $data ) {
-		$font_families_registered = wp_fonts()->get_registered_font_families();
-
-		$raw_data = $data->get_raw_data();
-
-		$font_families_from_theme = ! empty( $raw_data['settings']['typography']['fontFamilies']['theme'] )
-			? $raw_data['settings']['typography']['fontFamilies']['theme']
-			: array();
-
-		// Find missing fonts that are not in the theme's theme.json.
-		$to_add = array();
-		if ( ! empty( $font_families_registered ) ) {
-			$to_add = array_diff( $font_families_registered, static::get_font_families( $font_families_from_theme ) );
-		}
-
-		// Bail out early if there are no missing fonts.
-		if ( empty( $to_add ) ) {
-			return $data;
-		}
-
-		/*
-		 * Make sure the path to settings.typography.fontFamilies.theme exists
-		 * before adding missing fonts.
-		 */
-		if ( empty( $raw_data['settings'] ) ) {
-			$raw_data['settings'] = array();
-		}
-		$raw_data['settings'] = static::set_tyopgraphy_settings_array_structure( $raw_data['settings'] );
-
-		foreach ( $to_add as $font_family_handle ) {
-			$raw_data['settings']['typography']['fontFamilies']['theme'][] = wp_fonts()->to_theme_json( $font_family_handle );
-		}
-
-		return new WP_Theme_JSON_Gutenberg( $raw_data );
-	}
-
-	/**
-	 * Returns theme's settings and adds fonts defined in variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array An array containing theme's settings.
-	 */
-	private static function get_settings() {
-		// Get settings.
-		$settings = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()->get_settings();
-
-		if ( ! is_admin() && ! ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) {
-			return $settings;
-		}
-
-		// If in the editor, add fonts defined in variations.
-		$variations          = WP_Theme_JSON_Resolver_Gutenberg::get_style_variations();
-		$set_theme_structure = true;
-
-		foreach ( $variations as $variation ) {
-
-			// Skip if settings.typography.fontFamilies are not defined in the variation.
-			if ( empty( $variation['settings']['typography']['fontFamilies'] ) ) {
-				continue;
-			}
-
-			// One time, set any missing parts of the array structure.
-			if ( $set_theme_structure ) {
-				$set_theme_structure = false;
-				$settings            = static::set_tyopgraphy_settings_array_structure( $settings );
-			}
-
-			// Initialize the font families from variation if set and is an array, otherwise default to an empty array.
-			$variation_font_families = ( isset( $variation['settings']['typography']['fontFamilies']['theme'] ) && is_array( $variation['settings']['typography']['fontFamilies']['theme'] ) )
-				? $variation['settings']['typography']['fontFamilies']['theme']
-				: array();
-
-			// Merge the variation settings with the global settings.
-			$settings['typography']['fontFamilies']['theme'] = array_merge(
-				$settings['typography']['fontFamilies']['theme'],
-				$variation_font_families
-			);
-
-			// Make sure there are no duplicates.
-			$settings['typography']['fontFamilies'] = array_unique( $settings['typography']['fontFamilies'], SORT_REGULAR );
-
-			// The font families from settings might become null after running the `array_unique`.
-			if ( ! isset( $settings['typography']['fontFamilies']['theme'] ) || ! is_array( $settings['typography']['fontFamilies']['theme'] ) ) {
-				$settings['typography']['fontFamilies']['theme'] = array();
-			}
-		}
-
-		return $settings;
-	}
-
-	/**
-	 * Converts a list of font families into font handles and returns them as an array.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $families_data An array of font families data.
-	 * @return array An array containing font handles.
-	 */
-	private static function get_font_families( $families_data ) {
-		$families = array();
-		foreach ( $families_data as $family ) {
-			$font_family = WP_Fonts_Utils::get_font_family_from_variation( $family );
-			$handle      = WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-			if ( ! empty( $handle ) ) {
-				$families[ $handle ] = true;
-			}
-		}
-
-		return ! empty( $families ) ? array_keys( $families ) : array();
-	}
-
-	/**
-	 * Parse font families from theme.json.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $settings Font settings to parse.
-	 * @return array Returns an array that contains font data and corresponding handles.
-	 */
-	private static function parse_font_families( array $settings ) {
-		$handles = array();
-		$fonts   = array();
-
-		// Look for fontFamilies.
-		foreach ( $settings['typography']['fontFamilies'] as $font_families ) {
-			foreach ( $font_families as $font_family ) {
-
-				// Skip if fontFace is not defined.
-				if ( empty( $font_family['fontFace'] ) ) {
-					continue;
-				}
-
-				$font_family['fontFace'] = (array) $font_family['fontFace'];
-				$font_family_slug        = isset( $font_family['slug'] ) ? $font_family['slug'] : '';
-
-				foreach ( $font_family['fontFace'] as $font_face ) {
-					// Skip if the font was registered through the Fonts API.
-					if ( isset( $font_face['origin'] ) && WP_Fonts::REGISTERED_ORIGIN === $font_face['origin'] ) {
-						continue;
-					}
-
-					// For each font "src", convert the "file:./" placeholder into a theme font file URI.
-					if ( ! empty( $font_face['src'] ) ) {
-						$font_face['src'] = static::to_theme_file_uri( (array) $font_face['src'] );
-					}
-
-					// Convert font-face properties into kebab-case.
-					$font_face = static::to_kebab_case( $font_face );
-
-					// Convert font-face properties into kebab-case.
-					$font_face = static::to_kebab_case( $font_face );
-
-					$font_family_handle = static::get_font_family_handle( $font_family_slug, $font_face );
-
-					// Skip if no font-family handle was found.
-					if ( null === $font_family_handle ) {
-						continue;
-					}
-
-					$handles[] = $font_family_handle;
-					if ( ! array_key_exists( $font_family_handle, $fonts ) ) {
-						$fonts[ $font_family_handle ] = array();
-					}
-
-					$fonts[ $font_family_handle ][] = $font_face;
-				}
-			}
-		}
-
-		return array( $fonts, $handles );
-	}
-
-	/**
-	 * Sets the typography.fontFamilies.theme structure in the given array, if not already set.
-	 * if not already set.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $data The target array to process.
-	 * @return array Data array with typography.fontFamilies.theme structure set.
-	 */
-	private static function set_tyopgraphy_settings_array_structure( array $data ) {
-		if ( empty( $data['typography'] ) ) {
-			$data['typography'] = array();
-		}
-		if ( empty( $data['typography']['fontFamilies'] ) ) {
-			$data['typography']['fontFamilies'] = array();
-		}
-		if ( empty( $data['typography']['fontFamilies']['theme'] ) ) {
-			$data['typography']['fontFamilies']['theme'] = array();
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Converts each 'file:./' placeholder into a URI to the font file in the theme.
-	 *
-	 * The 'file:./' is specified in the theme's `theme.json` as a placeholder to be
-	 * replaced with the URI to the font file's location in the theme. When a "src"
-	 * beings with this placeholder, it is replaced, converting the src into a URI.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $src An array of font file sources to process.
-	 * @return array An array of font file src URI(s).
-	 */
-	private static function to_theme_file_uri( array $src ) {
-		$placeholder = 'file:./';
-
-		foreach ( $src as $src_key => $src_url ) {
-			// Skip if the src doesn't start with the placeholder, as there's nothing to replace.
-			if ( ! str_starts_with( $src_url, $placeholder ) ) {
-				continue;
-			}
-
-			$src_file        = str_replace( $placeholder, '', $src_url );
-			$src[ $src_key ] = get_theme_file_uri( $src_file );
-		}
-
-		return $src;
-	}
-
-	/**
-	 * Converts all first dimension keys into kebab-case.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $data The array to process.
-	 */
-	private static function to_kebab_case( array $data ) {
-		foreach ( $data as $key => $value ) {
-			$kebab_case          = _wp_to_kebab_case( $key );
-			$data[ $kebab_case ] = $value;
-			if ( $kebab_case !== $key ) {
-				unset( $data[ $key ] );
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Gets the font-family handle if defined in the "slug" or font-face variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_slug Font-family "slug".
-	 * @param array  $font_face        Font-face (variation) to search.
-	 * @return string|null Font-family handle on success, else null if not found.
-	 */
-	private static function get_font_family_handle( $font_family_slug, array $font_face ) {
-		$font_family_handle = WP_Fonts_Utils::get_font_family_from_variation( $font_face );
-
-		// Use the defined slug if no handle found.
-		if ( empty( $font_family_handle ) ) {
-			$font_family_handle = $font_family_slug;
-		}
-
-		if ( ! empty( $font_family_handle ) ) {
-			$font_family_handle = WP_Fonts_Utils::convert_font_family_into_handle( $font_family_handle );
-		}
-
-		if ( empty( $font_family_handle ) ) {
-			_doing_it_wrong( __FUNCTION__, __( 'Font family not defined in the variation or "slug".', 'gutenberg' ), '6.1.0' );
-			return null;
-		}
-
-		return $font_family_handle;
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts-utils.php b/lib/experimental/fonts-api/class-wp-fonts-utils.php
deleted file mode 100644
index 8204dc965fc8bb..00000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts-utils.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Font API's utility helpers.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Utils' ) ) {
-	return;
-}
-
-/**
- * Utility helpers for the Fonts API.
- *
- * @since X.X.X
- */
-class WP_Fonts_Utils {
-
-	/**
-	 * Converts the given font family into a handle.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family Font family to convert into a handle.
-	 * @return string|null The font family handle on success. Else, null.
-	 */
-	public static function convert_font_family_into_handle( $font_family ) {
-		if ( ! self::is_defined( $font_family ) ) {
-			return null;
-		}
-
-		// If the font-family is a comma-separated list (example: "Inter, sans-serif" ), use just the first font.
-		if ( str_contains( $font_family, ',' ) ) {
-			$font_family = explode( ',', $font_family )[0];
-		}
-
-		return sanitize_title( $font_family );
-	}
-
-	/**
-	 * Converts the given variation and its font-family into a handle.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family The font family's handle for this variation.
-	 * @param array  $variation   An array of variation properties.
-	 * @return string|null The variation handle.
-	 */
-	public static function convert_variation_into_handle( $font_family, array $variation ) {
-		$handle = '';
-		foreach ( array( 'font-weight', 'font-style' ) as $property ) {
-			if ( ! array_key_exists( $property, $variation ) || ! static::is_defined( $variation[ $property ] ) ) {
-				continue;
-			}
-
-			$handle .= ' ' . $variation[ $property ];
-		}
-
-		if ( '' === $handle ) {
-			trigger_error( 'Variant handle could not be determined as font-weight and/or font-style are require' );
-			return null;
-		}
-
-		return sanitize_title( $font_family . $handle );
-	}
-
-	/**
-	 * Gets the font family from the variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $variation An array of variation properties to search.
-	 * @return string|null The font family if defined. Else, null.
-	 */
-	public static function get_font_family_from_variation( array $variation ) {
-		return static::search_for_font_family( $variation );
-	}
-
-	/**
-	 * Checks if the given input is defined, i.e. meaning is a non-empty string.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $input The input to check.
-	 * @return bool True when non-empty string. Else false.
-	 */
-	public static function is_defined( $input ) {
-		return ( is_string( $input ) && ! empty( $input ) );
-	}
-
-	/**
-	 * Searches the variation array to extract the font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $haystack An array of variation properties to search.
-	 * @return string|null The font family when found. Else, null.
-	 */
-	private static function search_for_font_family( array $haystack ) {
-		if ( array_key_exists( 'fontFamily', $haystack ) ) {
-			$key = 'fontFamily';
-		} elseif ( array_key_exists( 'font-family', $haystack ) ) {
-			$key = 'font-family';
-		} else {
-			trigger_error( 'Font family not found.' );
-			return null;
-		}
-
-		if ( static::is_defined( $haystack[ $key ] ) ) {
-			// If the font-family is a comma-separated list (example: "Inter, sans-serif" ), use just the first font.
-			if ( strpos( $haystack[ $key ], ',' ) !== false ) {
-				return explode( ',', $haystack[ $key ] )[0];
-			}
-			return $haystack[ $key ];
-		}
-
-		trigger_error( 'Font family not defined in the variation.' );
-		return null;
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts.php b/lib/experimental/fonts-api/class-wp-fonts.php
deleted file mode 100644
index b6d965d5bbc5e6..00000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts.php
+++ /dev/null
@@ -1,753 +0,0 @@
-<?php
-/**
- * WP Fonts API class.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts' ) ) {
-	return;
-}
-
-/**
- * Class WP_Web_Fonts
- *
- * @since X.X.X
- */
-class WP_Fonts extends WP_Dependencies {
-
-	/**
-	 * Registered "origin", indicating the font is registered in the API.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string
-	 */
-	const REGISTERED_ORIGIN = 'gutenberg_wp_fonts_api';
-
-	/**
-	 * An array of registered providers.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var array
-	 */
-	private $providers = array();
-
-	/**
-	 * The flipped $to_do array of font handles.
-	 *
-	 * Used for a faster lookup of the font handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string[]
-	 */
-	private $to_do_keyed_handles;
-
-	/**
-	 * Provider instance store, keyed by provider ID.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var array
-	 */
-	private $provider_instances = array();
-
-	/**
-	 * Variation property defaults.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var array
-	 */
-	private $variation_property_defaults = array(
-		'provider'     => 'local',
-		'font-family'  => '',
-		'font-style'   => 'normal',
-		'font-weight'  => '400',
-		'font-display' => 'fallback',
-	);
-
-	/**
-	 * Constructor.
-	 *
-	 * @since X.X.X
-	 */
-	public function __construct() {
-		/**
-		 * Filters the font variation's property defaults.
-		 *
-		 * @since X.X.X
-		 *
-		 * @param array $defaults {
-		 *     An array of required font properties and defaults.
-		 *
-		 *     @type string $provider     The provider ID. Default 'local'.
-		 *     @type string $font-family  The font-family property. Default empty string.
-		 *     @type string $font-style   The font-style property. Default 'normal'.
-		 *     @type string $font-weight  The font-weight property. Default '400'.
-		 *     @type string $font-display The font-display property. Default 'fallback'.
-		 * }
-		 */
-		$this->variation_property_defaults = apply_filters( 'wp_font_variation_defaults', $this->variation_property_defaults );
-
-		/**
-		 * Fires when the WP_Fonts instance is initialized.
-		 *
-		 * @since X.X.X
-		 *
-		 * @param WP_Fonts $wp_fonts WP_Fonts instance (passed by reference).
-		 */
-		do_action_ref_array( 'wp_default_fonts', array( &$this ) );
-	}
-
-	/**
-	 * Get the list of registered providers.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array $providers {
-	 *     An associative array of registered providers, keyed by their unique ID.
-	 *
-	 *     @type string $provider_id => array {
-	 *         An associate array of provider's class name and fonts.
-	 *
-	 *         @type string $class_name Fully qualified name of the provider's class.
-	 *         @type string[] $fonts    An array of enqueued font handles for this provider.
-	 *     }
-	 * }
-	 */
-	public function get_providers() {
-		return $this->providers;
-	}
-
-	/**
-	 * Register a provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider's unique ID.
-	 * @param string $class_name  The provider class name.
-	 * @return bool True if successfully registered, else false.
-	 */
-	public function register_provider( $provider_id, $class_name ) {
-		if ( empty( $provider_id ) || empty( $class_name ) || ! class_exists( $class_name ) ) {
-			return false;
-		}
-
-		$this->providers[ $provider_id ] = array(
-			'class' => $class_name,
-			'fonts' => array(),
-		);
-		return true;
-	}
-
-	/**
-	 * Get the list of all registered font family handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	public function get_registered_font_families() {
-		$font_families = array();
-		foreach ( $this->registered as $handle => $obj ) {
-			if ( $obj->extra['is_font_family'] ) {
-				$font_families[] = $handle;
-			}
-		}
-		return $font_families;
-	}
-
-	/**
-	 * Get the list of all registered font families and their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	public function get_registered() {
-		return array_keys( $this->registered );
-	}
-
-	/**
-	 * Get the list of enqueued font families and their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array[]
-	 */
-	public function get_enqueued() {
-		return $this->queue;
-	}
-
-	/**
-	 * Registers a font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family Font family name to register.
-	 * @return string|null Font family handle when registration successes. Null on failure.
-	 */
-	public function add_font_family( $font_family ) {
-		$font_family_handle = WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-		if ( ! $font_family_handle ) {
-			return null;
-		}
-
-		if ( isset( $this->registered[ $font_family_handle ] ) ) {
-			return $font_family_handle;
-		}
-
-		$registered = $this->add( $font_family_handle, false );
-		if ( ! $registered ) {
-			return null;
-		}
-
-		$this->add_data( $font_family_handle, 'font-properties', array( 'font-family' => $font_family ) );
-		$this->add_data( $font_family_handle, 'is_font_family', true );
-
-		return $font_family_handle;
-	}
-
-	/**
-	 * Removes a font family and all registered variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family to remove.
-	 */
-	public function remove_font_family( $font_family_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return;
-		}
-
-		$variations = $this->registered[ $font_family_handle ]->deps;
-
-		foreach ( $variations as $variation ) {
-			$this->remove( $variation );
-		}
-
-		$this->remove( $font_family_handle );
-	}
-
-	/**
-	 * Add a variation to an existing family or register family if none exists.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 * @param string $variation_handle   Optional. The variation's handle. When none is provided, the
-	 *                                   handle will be dynamically generated.
-	 *                                   Default empty string.
-	 * @return string|null Variation handle on success. Else null.
-	 */
-	public function add_variation( $font_family_handle, array $variation, $variation_handle = '' ) {
-		if ( ! WP_Fonts_Utils::is_defined( $font_family_handle ) ) {
-			trigger_error( 'Font family handle must be a non-empty string.' );
-			return null;
-		}
-
-		// When there is a variation handle, check it.
-		if ( '' !== $variation_handle && ! WP_Fonts_Utils::is_defined( $variation_handle ) ) {
-			trigger_error( 'Variant handle must be a non-empty string.' );
-			return null;
-		}
-
-		// Register the font family when it does not yet exist.
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			if ( ! $this->add_font_family( $font_family_handle ) ) {
-				return null;
-			}
-		}
-
-		$variation = $this->validate_variation( $variation );
-
-		// Variation validation failed.
-		if ( ! $variation ) {
-			return null;
-		}
-
-		// When there's no variation handle, attempt to create one.
-		if ( '' === $variation_handle ) {
-			$variation_handle = WP_Fonts_Utils::convert_variation_into_handle( $font_family_handle, $variation );
-			if ( is_null( $variation_handle ) ) {
-				return null;
-			}
-		}
-
-		// Bail out if the variant is already registered.
-		if ( $this->is_variation_registered( $font_family_handle, $variation_handle ) ) {
-			return $variation_handle;
-		}
-
-		$variation_src = array_key_exists( 'src', $variation ) ? $variation['src'] : false;
-		$result        = $this->add( $variation_handle, $variation_src );
-
-		// Bail out if the registration failed.
-		if ( ! $result ) {
-			return null;
-		}
-
-		$this->add_data( $variation_handle, 'font-properties', $variation );
-		$this->add_data( $variation_handle, 'is_font_family', false );
-
-		// Add the font variation as a dependency to the registered font family.
-		$this->add_dependency( $font_family_handle, $variation_handle );
-
-		$this->providers[ $variation['provider'] ]['fonts'][] = $variation_handle;
-
-		return $variation_handle;
-	}
-
-	/**
-	 * Removes a variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family for this variation.
-	 * @param string $variation_handle   The variation's handle to remove.
-	 */
-	public function remove_variation( $font_family_handle, $variation_handle ) {
-		if ( isset( $this->registered[ $variation_handle ] ) ) {
-			$this->remove( $variation_handle );
-		}
-
-		if ( ! $this->is_variation_registered( $font_family_handle, $variation_handle ) ) {
-			return;
-		}
-
-		// Remove the variation as a dependency from its font family.
-		$this->registered[ $font_family_handle ]->deps = array_values(
-			array_diff(
-				$this->registered[ $font_family_handle ]->deps,
-				array( $variation_handle )
-			)
-		);
-	}
-
-	/**
-	 * Checks if the variation is registered.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param string $variation_handle   Variation's handle.
-	 * @return bool True when registered to the given font family. Else false.
-	 */
-	private function is_variation_registered( $font_family_handle, $variation_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return false;
-		}
-
-		return in_array( $variation_handle, $this->registered[ $font_family_handle ]->deps, true );
-	}
-
-	/**
-	 * Adds a variation as a dependency to the given font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param string $variation_handle   The variation's handle.
-	 */
-	private function add_dependency( $font_family_handle, $variation_handle ) {
-		$this->registered[ $font_family_handle ]->deps[] = $variation_handle;
-	}
-
-	/**
-	 * Validates and sanitizes a variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $variation  Variation properties to add.
-	 * @return false|array Validated variation on success. Else, false.
-	 */
-	private function validate_variation( $variation ) {
-		$variation = wp_parse_args( $variation, $this->variation_property_defaults );
-
-		// Check the font-family.
-		if ( empty( $variation['font-family'] ) || ! is_string( $variation['font-family'] ) ) {
-			trigger_error( 'Webfont font-family must be a non-empty string.' );
-			return false;
-		}
-
-		// Local fonts need a "src".
-		if ( 'local' === $variation['provider'] ) {
-			// Make sure that local fonts have 'src' defined.
-			if ( empty( $variation['src'] ) || ( ! is_string( $variation['src'] ) && ! is_array( $variation['src'] ) ) ) {
-				trigger_error( 'Webfont src must be a non-empty string or an array of strings.' );
-				return false;
-			}
-		} elseif ( ! isset( $this->providers[ $variation['provider'] ] ) ) {
-			trigger_error( sprintf( 'The provider "%s" is not registered', $variation['provider'] ) );
-			return false;
-		} elseif ( ! class_exists( $this->providers[ $variation['provider'] ]['class'] ) ) {
-			trigger_error( sprintf( 'The provider class "%s" does not exist', $variation['provider'] ) );
-			return false;
-		}
-
-		// Validate the 'src' property.
-		if ( ! empty( $variation['src'] ) ) {
-			foreach ( (array) $variation['src'] as $src ) {
-				if ( empty( $src ) || ! is_string( $src ) ) {
-					trigger_error( 'Each font src must be a non-empty string.' );
-					return false;
-				}
-			}
-		}
-
-		// Check the font-weight.
-		if ( ! is_string( $variation['font-weight'] ) && ! is_int( $variation['font-weight'] ) ) {
-			trigger_error( 'Webfont font-weight must be a properly formatted string or integer.' );
-			return false;
-		}
-
-		// Check the font-display.
-		if ( ! in_array( $variation['font-display'], array( 'auto', 'block', 'fallback', 'swap', 'optional' ), true ) ) {
-			$variation['font-display'] = 'fallback';
-		}
-
-		$valid_props = array(
-			'ascent-override',
-			'descent-override',
-			'font-display',
-			'font-family',
-			'font-stretch',
-			'font-style',
-			'font-weight',
-			'font-variant',
-			'font-feature-settings',
-			'font-variation-settings',
-			'line-gap-override',
-			'size-adjust',
-			'src',
-			'unicode-range',
-
-			// Exceptions.
-			'provider',
-		);
-
-		foreach ( $variation as $prop => $value ) {
-			if ( ! in_array( $prop, $valid_props, true ) ) {
-				unset( $variation[ $prop ] );
-			}
-		}
-
-		return $variation;
-	}
-
-	/**
-	 * Processes the items and dependencies.
-	 *
-	 * Processes the items passed to it or the queue, and their dependencies.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
-	 *                                      single item (string), or multiple items (array of strings).
-	 *                                      Default false.
-	 * @param int|false            $group   Optional. Group level: level (int), no group (false).
-	 *
-	 * @return array|string[] Array of font handles that have been processed.
-	 *                        An empty array if none were processed.
-	 */
-	public function do_items( $handles = false, $group = false ) {
-		$handles = $this->prepare_handles_for_printing( $handles );
-
-		if ( empty( $handles ) ) {
-			return $this->done;
-		}
-
-		$this->all_deps( $handles );
-		if ( empty( $this->to_do ) ) {
-			return $this->done;
-		}
-
-		$this->to_do_keyed_handles = array_flip( $this->to_do );
-
-		foreach ( $this->get_providers() as $provider_id => $provider ) {
-			// Alert and skip if the provider class does not exist.
-			if ( ! class_exists( $provider['class'] ) ) {
-				/* translators: %s is the provider name. */
-				trigger_error(
-					sprintf(
-						'Class "%s" not found for "%s" font provider',
-						$provider['class'],
-						$provider_id
-					)
-				);
-				continue;
-			}
-
-			$this->do_item( $provider_id, $group );
-		}
-
-		$this->process_font_families_after_printing( $handles );
-
-		return $this->done;
-	}
-
-	/**
-	 * Prepares the given handles for printing.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Handles to prepare.
-	 *                                      Default false.
-	 * @return array Array of handles.
-	 */
-	private function prepare_handles_for_printing( $handles = false ) {
-		if ( false !== $handles ) {
-			$handles = $this->validate_handles( $handles );
-			// Bail out when invalid.
-			if ( empty( $handles ) ) {
-				return array();
-			}
-		}
-
-		// Use the enqueued queue.
-		if ( empty( $handles ) ) {
-			if ( empty( $this->queue ) ) {
-				return array();
-			}
-			$handles = $this->queue;
-		}
-
-		return $handles;
-	}
-
-	/**
-	 * Validates handle(s) to ensure each is a non-empty string.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[] $handles Handles to prepare.
-	 * @return string[]|null Array of handles on success. Else null.
-	 */
-	private function validate_handles( $handles ) {
-		// Validate each element is a non-empty string handle.
-		$handles = array_filter( (array) $handles, array( WP_Fonts_Utils::class, 'is_defined' ) );
-
-		if ( empty( $handles ) ) {
-			trigger_error( 'Handles must be a non-empty string or array of non-empty strings' );
-			return null;
-		}
-
-		return $handles;
-	}
-
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @see WP_Dependencies::do_item()
-	 *
-	 * @param string    $provider_id The provider to process.
-	 * @param int|false $group       Not used.
-	 * @return bool
-	 */
-	public function do_item( $provider_id, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		// Bail out if the provider is not registered.
-		if ( ! isset( $this->providers[ $provider_id ] ) ) {
-			return false;
-		}
-
-		$font_handles = $this->get_enqueued_fonts_for_provider( $provider_id );
-		if ( empty( $font_handles ) ) {
-			return false;
-		}
-
-		$properties_by_font = $this->get_font_properties_for_provider( $font_handles );
-		if ( empty( $properties_by_font ) ) {
-			return false;
-		}
-
-		// Invoke provider to print its styles.
-		$provider = $this->get_provider_instance( $provider_id );
-		$provider->set_fonts( $properties_by_font );
-		$provider->print_styles();
-
-		// Clean up.
-		$this->update_queues_for_printed_fonts( $font_handles );
-
-		return true;
-	}
-
-	/**
-	 * Retrieves a list of enqueued font variations for a provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider to process.
-	 * @return array[] Webfonts organized by providers.
-	 */
-	private function get_enqueued_fonts_for_provider( $provider_id ) {
-		$providers = $this->get_providers();
-
-		if ( empty( $providers[ $provider_id ] ) ) {
-			return array();
-		}
-
-		return array_intersect(
-			$providers[ $provider_id ]['fonts'],
-			$this->to_do
-		);
-	}
-
-	/**
-	 * Gets a list of font properties for each of the given font handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_handles Font handles to get properties.
-	 * @return array A list of fonts with each font's properties.
-	 */
-	private function get_font_properties_for_provider( array $font_handles ) {
-		$font_properties = array();
-
-		foreach ( $font_handles as $font_handle ) {
-			$properties = $this->get_data( $font_handle, 'font-properties' );
-			if ( ! $properties ) {
-				continue;
-			}
-			$font_properties[ $font_handle ] = $properties;
-		}
-
-		return $font_properties;
-	}
-
-	/**
-	 * Gets the instance of the provider from the WP_Webfonts::$provider_instance store.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider to get.
-	 * @return object Instance of the provider.
-	 */
-	private function get_provider_instance( $provider_id ) {
-		if ( ! isset( $this->provider_instances[ $provider_id ] ) ) {
-			$this->provider_instances[ $provider_id ] = new $this->providers[ $provider_id ]['class']();
-		}
-		return $this->provider_instances[ $provider_id ];
-	}
-
-	/**
-	 * Update queues for the given printed fonts.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_handles Font handles to get properties.
-	 */
-	private function update_queues_for_printed_fonts( array $font_handles ) {
-		foreach ( $font_handles as $font_handle ) {
-			$this->set_as_done( $font_handle );
-			$this->remove_from_to_do_queues( $font_handle );
-		}
-	}
-
-	/**
-	 * Processes the font families after printing the variations.
-	 *
-	 * For each queued font family:
-	 *
-	 * a. if any of their variations were printed, the font family is added to the `done` list.
-	 * b. removes each from the to_do queues.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $handles Handles to process.
-	 */
-	private function process_font_families_after_printing( array $handles ) {
-		foreach ( $handles as $handle ) {
-			if (
-				! $this->get_data( $handle, 'is_font_family' ) ||
-				! isset( $this->to_do_keyed_handles[ $handle ] )
-			) {
-				continue;
-			}
-			$font_family = $this->registered[ $handle ];
-
-			// Add the font family to `done` list if any of its variations were printed.
-			if ( ! empty( $font_family->deps ) ) {
-				$processed = array_intersect( $font_family->deps, $this->done );
-				if ( ! empty( $processed ) ) {
-					$this->set_as_done( $handle );
-				}
-			}
-
-			$this->remove_from_to_do_queues( $handle );
-		}
-	}
-
-	/**
-	 * Removes the handle from the `to_do` and `to_do_keyed_handles` lists.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $handle Handle to remove.
-	 */
-	private function remove_from_to_do_queues( $handle ) {
-		unset(
-			$this->to_do[ $this->to_do_keyed_handles[ $handle ] ],
-			$this->to_do_keyed_handles[ $handle ]
-		);
-	}
-
-	/**
-	 * Sets the given handle to done by adding it to the `done` list.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $handle Handle to set as done.
-	 */
-	private function set_as_done( $handle ) {
-		if ( ! is_array( $this->done ) ) {
-			$this->done = array();
-		}
-		$this->done[] = $handle;
-	}
-
-	/**
-	 * Converts the font family and its variations into theme.json structural format.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle Font family to convert.
-	 * @return array Webfonts in theme.json structural format.
-	 */
-	public function to_theme_json( $font_family_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return array();
-		}
-
-		$font_family_name  = $this->registered[ $font_family_handle ]->extra['font-properties']['font-family'];
-		$theme_json_format = array(
-			'fontFamily' => str_contains( $font_family_name, ' ' ) ? "'{$font_family_name}'" : $font_family_name,
-			'name'       => $font_family_name,
-			'slug'       => $font_family_handle,
-			'fontFace'   => array(),
-		);
-
-		foreach ( $this->registered[ $font_family_handle ]->deps as $variation_handle ) {
-			if ( ! isset( $this->registered[ $variation_handle ] ) ) {
-				continue;
-			}
-
-			$variation_obj        = $this->registered[ $variation_handle ];
-			$variation_properties = array( 'origin' => static::REGISTERED_ORIGIN );
-			foreach ( $variation_obj->extra['font-properties'] as $property_name => $property_value ) {
-				$property_in_camelcase                          = lcfirst( str_replace( '-', '', ucwords( $property_name, '-' ) ) );
-				$variation_properties[ $property_in_camelcase ] = $property_value;
-			}
-			$theme_json_format['fontFace'][ $variation_obj->handle ] = $variation_properties;
-		}
-
-		return $theme_json_format;
-	}
-}
diff --git a/lib/experimental/fonts-api/fonts-api.php b/lib/experimental/fonts-api/fonts-api.php
deleted file mode 100644
index 2ff0ff07208d77..00000000000000
--- a/lib/experimental/fonts-api/fonts-api.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/**
- * Fonts API functions.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( ! function_exists( 'wp_fonts' ) ) {
-	/**
-	 * Initialize $wp_fonts if it has not been set.
-	 *
-	 * @since X.X.X
-	 *
-	 * @global WP_Fonts $wp_fonts
-	 *
-	 * @return WP_Fonts WP_Fonts instance.
-	 */
-	function wp_fonts() {
-		global $wp_fonts;
-
-		if ( ! ( $wp_fonts instanceof WP_Fonts ) ) {
-			$wp_fonts = new WP_Fonts();
-
-			// Initialize.
-			$wp_fonts->register_provider( 'local', 'WP_Fonts_Provider_Local' );
-			add_action( 'wp_head', 'wp_print_fonts', 50 );
-			add_action( 'admin_print_styles', 'wp_print_fonts', 50 );
-		}
-
-		return $wp_fonts;
-	}
-}
-
-if ( ! function_exists( 'wp_register_fonts' ) ) {
-	/**
-	 * Registers one or more font-families and each of their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array[] $fonts {
-	 *     Fonts to be registered, grouped by each font-family.
-	 *
-	 *     @type string $font-family => array[] $variations {
-	 *          An array of web font variations for this font-family.
-	 *          Each variation has the following structure.
-	 *
-	 *          @type array $variation {
-	 *              @type string $provider     The provider ID. Default 'local'.
-	 *              @type string $font-style   The font-style property. Default 'normal'.
-	 *              @type string $font-weight  The font-weight property. Default '400'.
-	 *              @type string $font-display The font-display property. Default 'fallback'.
-	 *         }
-	 *     }
-	 * }
-	 * @return string[] Array of registered font family handles.
-	 */
-	function wp_register_fonts( array $fonts ) {
-		$registered = array();
-		$wp_fonts   = wp_fonts();
-
-		foreach ( $fonts as $font_family => $variations ) {
-			$font_family_handle = $wp_fonts->add_font_family( $font_family );
-			if ( ! $font_family_handle ) {
-				continue;
-			}
-
-			// Register each of the variations for this font family.
-			foreach ( $variations as $variation_handle => $variation ) {
-				if ( ! WP_Fonts_Utils::is_defined( $variation_handle ) ) {
-					$variation_handle = '';
-				}
-
-				$wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-			}
-
-			$registered[] = $font_family_handle;
-		}
-
-		return $registered;
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_fonts' ) ) {
-	/**
-	 * Enqueues one or more font family and all of its variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string[] $font_families Font family(ies) to enqueue.
-	 */
-	function wp_enqueue_fonts( array $font_families ) {
-		$handles = array_map( array( WP_Fonts_Utils::class, 'convert_font_family_into_handle' ), $font_families );
-
-		wp_fonts()->enqueue( $handles );
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_font_variations' ) ) {
-	/**
-	 * Enqueues a specific set of font variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[] $variation_handles Variation handle (string) or handles (array of strings).
-	 */
-	function wp_enqueue_font_variations( $variation_handles ) {
-		wp_fonts()->enqueue( $variation_handles );
-	}
-}
-
-if ( ! function_exists( 'wp_deregister_font_family' ) ) {
-	/**
-	 * Deregisters a font family and all of its registered variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family to remove.
-	 */
-	function wp_deregister_font_family( $font_family_handle ) {
-		wp_fonts()->remove_font_family( $font_family_handle );
-	}
-}
-
-if ( ! function_exists( 'wp_deregister_font_variation' ) ) {
-	/**
-	 * Deregisters a font variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family for this variation.
-	 * @param string $variation_handle   The variation's handle to remove.
-	 */
-	function wp_deregister_font_variation( $font_family_handle, $variation_handle ) {
-		wp_fonts()->remove_variation( $font_family_handle, $variation_handle );
-	}
-}
-
-if ( ! function_exists( 'wp_register_font_provider' ) ) {
-	/**
-	 * Registers a custom font service provider.
-	 *
-	 * A webfont provider contains the business logic for how to
-	 * interact with a remote font service and how to generate
-	 * the `@font-face` styles for that remote service.
-	 *
-	 * How to register a custom font service provider:
-	 *    1. Load its class file into memory before registration.
-	 *    2. Pass the class' name to this function.
-	 *
-	 * For example, for a class named `My_Custom_Font_Service_Provider`:
-	 * ```
-	 *    wp_register_font_provider( My_Custom_Font_Service_Provider::class );
-	 * ```
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param string $name      The provider's name.
-	 * @param string $classname The provider's class name.
-	 *                          The class should be a child of `WP_Webfonts_Provider`.
-	 *                          See {@see WP_Webfonts_Provider}.
-	 *
-	 * @return bool True if successfully registered, else false.
-	 */
-	function wp_register_font_provider( $name, $classname ) {
-		return wp_fonts()->register_provider( $name, $classname );
-	}
-}
-
-if ( ! function_exists( 'wp_print_fonts' ) ) {
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
-	 *                                      for iframed editor assets (true), single item (string),
-	 *                                      or multiple items (array of strings).
-	 *                                      Default false.
-	 * @return array|string[] Array of font handles that have been processed.
-	 *                        An empty array if none were processed.
-	 */
-	function wp_print_fonts( $handles = false ) {
-		$wp_fonts          = wp_fonts();
-		$registered        = $wp_fonts->get_registered_font_families();
-		$in_iframed_editor = true === $handles;
-
-		// Nothing to print, as no fonts are registered.
-		if ( empty( $registered ) ) {
-			return array();
-		}
-
-		if ( empty( $handles ) ) {
-			// Automatically enqueue all user-selected fonts.
-			WP_Fonts_Resolver::enqueue_user_selected_fonts();
-			$handles = false;
-		} elseif ( $in_iframed_editor ) {
-			// Print all registered fonts for the iframed editor.
-			$queue           = $wp_fonts->queue;
-			$done            = $wp_fonts->done;
-			$wp_fonts->done  = array();
-			$wp_fonts->queue = $registered;
-			$handles         = false;
-		}
-
-		_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
-
-		$printed = $wp_fonts->do_items( $handles );
-
-		// Reset the API.
-		if ( $in_iframed_editor ) {
-			$wp_fonts->done  = $done;
-			$wp_fonts->queue = $queue;
-		}
-
-		return $printed;
-	}
-}
-
-/**
- * Add webfonts mime types.
- */
-add_filter(
-	'mime_types',
-	static function ( $mime_types ) {
-		// Webfonts formats.
-		$mime_types['woff2'] = 'font/woff2';
-		$mime_types['woff']  = 'font/woff';
-		$mime_types['ttf']   = 'font/ttf';
-		$mime_types['eot']   = 'application/vnd.ms-fontobject';
-		$mime_types['otf']   = 'application/x-font-opentype';
-
-		return $mime_types;
-	}
-);
-
-/*
- * To make sure blocks are registered before any Theme_JSON operations take place, a priority of 21 is used.
- *
- * Why 21?
- * Blocks are registered via the "init" hook with a priority value of `20`, which is dynamically added
- * during the build. See: tools/webpack/blocks.js.
- */
-add_action( 'init', 'WP_Fonts_Resolver::register_fonts_from_theme_json', 21 );
-
-add_filter(
-	'block_editor_settings_all',
-	static function ( $settings ) {
-		ob_start();
-		wp_print_fonts( true );
-		$styles = ob_get_clean();
-
-		// Add the font-face styles to iframed editor assets.
-		$settings['__unstableResolvedAssets']['styles'] .= $styles;
-		return $settings;
-	},
-	11
-);
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php
deleted file mode 100644
index 6acdce24a7dc3a..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Webfonts API: Provider for locally-hosted fonts.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Provider_Local' ) ) {
-	return;
-}
-
-/**
- * A core bundled provider for generating `@font-face` styles
- * from locally-hosted font files.
- *
- * @since X.X.X
- * @deprecated 16.3.0 Providers are not supported.
- *                    Local provider is in WP_Font_Face.
- */
-class WP_Fonts_Provider_Local extends WP_Fonts_Provider {
-
-	/**
-	 * The provider's unique ID.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 *
-	 * @var string
-	 */
-	protected $id = 'local';
-
-	/**
-	 * Gets the `@font-face` CSS styles for locally-hosted font files.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Get styles is not supported.
-	 *
-	 * @return string Empty string.
-	 */
-	public function get_css() {
-		_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
-		return '';
-	}
-}
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php
deleted file mode 100644
index d983b99fd9a788..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Fonts API: Provider abstract class.
- *
- * Individual fonts providers should extend this class and implement.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Provider' ) ) {
-	return;
-}
-
-/**
- * Abstract class for Fonts API providers.
- *
- * @since X.X.X
- * @deprecated 16.3.0 Custom providers are not supported.
- */
-abstract class WP_Fonts_Provider {
-
-	/**
-	 * The provider's unique ID.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 *
-	 * @var string
-	 */
-	protected $id = '';
-
-	/**
-	 * Fonts to be processed.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 *
-	 * @var array[]
-	 */
-	protected $fonts = array();
-
-	/**
-	 * Array of Font-face style tag's attribute(s)
-	 * where the key is the attribute name and the
-	 * value is its value.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 *
-	 * @var string[]
-	 */
-	protected $style_tag_atts = array();
-
-	/**
-	 * Sets this provider's fonts property.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Set is not supported.
-	 */
-	public function set_fonts() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Prints the generated styles.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Use wp_print_font_faces() instead.
-	 */
-	public function print_styles() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0', 'wp_print_font_faces' );
-	}
-
-	/**
-	 * Gets the `@font-face` CSS for the provider's fonts.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 *
-	 * @return string The `@font-face` CSS.
-	 */
-	abstract public function get_css();
-
-	/**
-	 * Gets the `<style>` element for wrapping the `@font-face` CSS.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Get style element is not supported.
-	 *
-	 * @return string Empty string.
-	 */
-	protected function get_style_element() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return '';
-	}
-}
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php
deleted file mode 100644
index c2702348b95232..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * WP_Fonts_Resolver class.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Resolver' ) ) {
-	return;
-}
-
-/**
- * The Fonts API Resolver abstracts the processing of different data sources
- * (such as theme.json and global styles) for font interactions with the API.
- *
- * This class is for internal core usage and is not supposed to be used by
- * extenders (plugins and/or themes).
- *
- * @access private
- *
- * @since X.X.X
- * @deprecated 16.3.0 Fonts API is not supported.
- */
-class WP_Fonts_Resolver {
-
-	/**
-	 * Enqueues user-selected fonts via global styles.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Enqueue is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public static function enqueue_user_selected_fonts() {
-		_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
-		return array();
-	}
-
-	/**
-	 * Register fonts defined in theme.json.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Register is not supported.
-	 */
-	public static function register_fonts_from_theme_json() {
-		_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
-	}
-
-	/**
-	 * Add missing fonts to the global styles.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Adding fonts into theme.json theme data layer is not supported.
-	 *
-	 * @param WP_Theme_JSON_Gutenberg|WP_Theme_JSON $data The global styles.
-	 * @return WP_Theme_JSON_Gutenberg|WP_Theme_JSON Unchanged global styles.
-	 */
-	public static function add_missing_fonts_to_theme_json( $data ) {
-		_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
-		return $data;
-	}
-}
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php
deleted file mode 100644
index 3290a997483492..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Font API's utility helpers.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Utils' ) ) {
-	return;
-}
-
-/**
- * Utility helpers for the Fonts API.
- *
- * @since X.X.X
- * @deprecated 16.3.0 Fonts API is not supported.
- */
-class WP_Fonts_Utils {
-
-	/**
-	 * Converts the given font family into a handle.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 This method is not supported.
-	 *
-	 * @return null
-	 */
-	public static function convert_font_family_into_handle() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return null;
-	}
-
-	/**
-	 * Converts the given variation and its font-family into a handle.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 This method is not supported.
-	 *
-	 * @return null
-	 */
-	public static function convert_variation_into_handle() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return null;
-	}
-
-	/**
-	 * Gets the font family from the variation.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 This method is not supported.
-	 *
-	 * @return null Null.
-	 */
-	public static function get_font_family_from_variation() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return null;
-	}
-
-	/**
-	 * Checks if the given input is defined, i.e. meaning is a non-empty string.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 *
-	 * @param string $input The input to check.
-	 * @return bool True when non-empty string. Else false.
-	 */
-	public static function is_defined( $input ) {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return ( is_string( $input ) && ! empty( $input ) );
-	}
-}
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts.php
deleted file mode 100644
index 9c48a7c31222bf..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * WP Fonts API class.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts' ) ) {
-	return;
-}
-
-/**
- * Class WP_Fonts
- *
- * @since X.X.X
- * @deprecated 16.3.0 Fonts API is not supported.
- */
-class WP_Fonts extends WP_Dependencies {
-
-	/**
-	 * Registered "origin", indicating the font is registered in the API.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 *
-	 * @var string
-	 */
-	const REGISTERED_ORIGIN = 'gutenberg_wp_fonts_api';
-
-	/**
-	 * Constructor.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 */
-	public function __construct() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Get the list of registered providers.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Providers are not supported.
-	 */
-	public function get_providers() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Register a provider.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Providers are not supported.
-	 *
-	 * @return bool False.
-	 */
-	public function register_provider() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return false;
-	}
-
-	/**
-	 * Get the list of all registered font family handles.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Register is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function get_registered_font_families() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-
-	/**
-	 * Get the list of all registered font families and their variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Register is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function get_registered() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-
-	/**
-	 * Get the list of enqueued font families and their variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Enqueue is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function get_enqueued() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-
-	/**
-	 * Registers a font family.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Add is not supported.
-	 *
-	 * @return null Null.
-	 */
-	public function add_font_family() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return null;
-	}
-
-	/**
-	 * Removes a font family and all registered variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Remove is not supported.
-	 */
-	public function remove_font_family() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Add a variation to an existing family or register family if none exists.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Add is not supported.
-	 *
-	 * @return null Null.
-	 */
-	public function add_variation() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return null;
-	}
-
-	/**
-	 * Removes a variation.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Remove is not supported.
-	 */
-	public function remove_variation() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Processes the items and dependencies.
-	 *
-	 * Processes the items passed to it or the queue, and their dependencies.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Processing items and dependencies is not supported.
-	 *
-	 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
-	 *                                      single item (string), or multiple items (array of strings).
-	 *                                      Default false.
-	 * @param int|false            $group   Optional. Group level: level (int), no group (false).
-	 *
-	 * @return array Empty array.
-	 */
-	public function do_items( $handles = false, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Process and print provider styles is not supported.
-	 *
-	 * @see WP_Dependencies::do_item()
-	 *
-	 * @param string    $provider_id The provider to process.
-	 * @param int|false $group       Not used.
-	 * @return bool False.
-	 */
-	public function do_item( $provider_id, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return false;
-	}
-
-	/**
-	 * Converts the font family and its variations into theme.json structural format.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Convert is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function to_theme_json() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-}
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php
deleted file mode 100644
index e5133eb2cb3bdb..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Web Fonts API class.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Web_Fonts' ) ) {
-	return;
-}
-
-/**
- * Class WP_Web_Fonts
- *
- * @since 14.9.1
- * @deprecated 15.1 Use WP_Fonts instead.
- * @deprecated 16.3.0 Fonts API is not supported.
- */
-class WP_Web_Fonts extends WP_Webfonts {
-
-	/**
-	 * Constructor.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 */
-	public function __construct() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Get the list of registered providers.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Providers are not supported.
-	 */
-	public function get_providers() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Register a provider.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Providers are not supported.
-	 *
-	 * @return bool False.
-	 */
-	public function register_provider() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return false;
-	}
-
-	/**
-	 * Get the list of all registered font family handles.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Register is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function get_registered_font_families() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-
-	/**
-	 * Get the list of all registered font families and their variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Register is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function get_registered() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-
-	/**
-	 * Get the list of enqueued font families and their variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Enqueue is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function get_enqueued() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-
-	/**
-	 * Registers a font family.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Add is not supported.
-	 *
-	 * @return null Null.
-	 */
-	public function add_font_family() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return null;
-	}
-
-	/**
-	 * Removes a font family and all registered variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Remove is not supported.
-	 */
-	public function remove_font_family() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Add a variation to an existing family or register family if none exists.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Add is not supported.
-	 *
-	 * @return null Null.
-	 */
-	public function add_variation() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return null;
-	}
-
-	/**
-	 * Removes a variation.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Remove is not supported.
-	 */
-	public function remove_variation() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Processes the items and dependencies.
-	 *
-	 * Processes the items passed to it or the queue, and their dependencies.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Processing items and dependencies is not supported.
-	 *
-	 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
-	 *                                      single item (string), or multiple items (array of strings).
-	 *                                      Default false.
-	 * @param int|false            $group   Optional. Group level: level (int), no group (false).
-	 *
-	 * @return array Empty array.
-	 */
-	public function do_items( $handles = false, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Process and print provider styles is not supported.
-	 *
-	 * @see WP_Dependencies::do_item()
-	 *
-	 * @param string    $provider_id The provider to process.
-	 * @param int|false $group       Not used.
-	 * @return bool False.
-	 */
-	public function do_item( $provider_id, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return false;
-	}
-
-	/**
-	 * Converts the font family and its variations into theme.json structural format.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Convert is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function to_theme_json() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return array();
-	}
-}
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php
deleted file mode 100644
index 9ddd813d7ccbb4..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Fonts API: Provider for locally-hosted fonts.
- *
- * Part of the backwards-compatibility (BC) layer for all
- * deprecated publicly exposed methods and functionality.
- *
- * This class/file will NOT be backported to Core. Rather for sites
- * using the previous API, it exists to prevent breakages, giving
- * developers time to upgrade their code.
- *
- * @package    WordPress
- * @subpackage Fonts
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts_Provider_Local' ) ) {
-	return;
-}
-
-/**
- * A deprecated core bundled provider for generating `@font-face` styles
- * from locally-hosted font files.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- *
- * @since X.X.X
- * @deprecated 15.1 Use `WP_Fonts_Provider_Local` instead.
- * @deprecated 16.3.0 Providers are not supported.
- *                    Local provider is in WP_Font_Face.
- */
-class WP_Webfonts_Provider_Local extends WP_Webfonts_Provider {
-
-	/**
-	 * The provider's unique ID.
-	 *
-	 * @since 6.0.0
-	 * @deprecated 16.3.0
-	 *
-	 * @var string
-	 */
-	protected $id = 'local';
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 6.1.0
-	 */
-	public function __construct() {
-		_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
-	}
-
-	/**
-	 * Gets the `@font-face` CSS styles for locally-hosted font files.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0 Get styles is not supported.
-	 *
-	 * @return string Empty string.
-	 */
-	public function get_css() {
-		_deprecated_function( __FUNCTION__, 'Gutenberg 16.3' );
-		return '';
-	}
-}
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php
deleted file mode 100644
index d536476e91b7b0..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Fonts API: Provider abstract class.
- *
- * Part of the backwards-compatibility (BC) layer for all
- * deprecated publicly exposed methods and functionality.
- *
- * This class/file will NOT be backported to Core. Rather for sites
- * using the previous API, it exists to prevent breakages, giving
- * developers time to upgrade their code.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts_Provider' ) ) {
-	return;
-}
-
-/**
- * Deprecated abstract class for Fonts API providers.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- *
- * @since X.X.X
- * @deprecated 15.1 Use `WP_Fonts_Provider` instead.
- * @deprecated 16.3.0 Custom providers are not supported.
- */
-abstract class WP_Webfonts_Provider extends WP_Fonts_Provider {
-
-	/**
-	 * Fonts to be processed.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Provider::$fonts property instead.
-	 * @deprecated 16.3.0
-	 *
-	 * @var array[]
-	 */
-	protected $webfonts = array();
-
-	/**
-	 * Sets this provider's fonts property.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use WP_Fonts_Provider::set_fonts() instead.
-	 * @deprecated 16.3.0 Set is not supported.
-	 */
-	public function set_webfonts() {
-		_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
-	}
-}
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php
deleted file mode 100644
index dbe7a4325b7b77..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Webfont API's utility helpers.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- * This file is now part of the API's Backwards-Compatibility (BC) layer.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts_Utils' ) ) {
-	return;
-}
-
-/**
- * Utility helpers for the Webfonts API.
- *
- * @since X.X.X
- * @deprecated 15.1 Use WP_Fonts_Utils instead.
- * @deprecated 16.3.0 Webfonts API is not supported.
- */
-class WP_Webfonts_Utils {
-
-	/**
-	 * Converts the given font family into a handle.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::convert_font_family_into_handle() instead.
-	 * @deprecated 16.3.0 This method is not supported.
-	 *
-	 * @return null
-	 */
-	public static function convert_font_family_into_handle() {
-		_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
-		return null;
-	}
-
-	/**
-	 * Converts the given variation and its font-family into a handle.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::convert_variation_into_handle() instead.
-	 * @deprecated 16.3.0 This method is not supported.
-	 *
-	 * @return null
-	 */
-	public static function convert_variation_into_handle() {
-		_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
-		return null;
-	}
-
-	/**
-	 * Gets the font family from the variation.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::get_font_family_from_variation() instead.
-	 * @deprecated 16.3.0 This method is not supported.
-	 *
-	 * @return null
-	 */
-	public static function get_font_family_from_variation() {
-		_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
-		return null;
-	}
-
-	/**
-	 * Checks if the given input is defined, i.e. meaning is a non-empty string.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::is_defined() instead.
-	 * @deprecated 16.3.0 This method is not supported.
-	 *
-	 * @param string $input The input to check.
-	 * @return bool True when non-empty string. Else false.
-	 */
-	public static function is_defined( $input ) {
-		_deprecated_function( __METHOD__, 'Gutenberg 15.1' );
-		return ( is_string( $input ) && ! empty( $input ) );
-	}
-}
diff --git a/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php
deleted file mode 100644
index 95bfa11f3d0c6b..00000000000000
--- a/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * Webfonts API class: backwards-compatibility (BC) layer for all
- * deprecated publicly exposed methods and functionality.
- *
- * This class/file will NOT be backported to Core. Rather for sites
- * using the previous API, it exists to prevent breakages, giving
- * developers time to upgrade their code.
- *
- * @package    Gutenberg
- * @subpackage Fonts API's BC Layer
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts' ) ) {
-	return;
-}
-
-/**
- * Class WP_Webfonts
- *
- * @since X.X.X
- * @deprecated 15.1 Use WP_Fonts instead.
- * @deprecated 16.3.0 Fonts API is not supported.
- */
-class WP_Webfonts {
-
-	/**
-	 * Constructor.
-	 *
-	 * @since X.X.X
-	 * @deprecated 16.3.0
-	 */
-	public function __construct() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-	}
-
-	/**
-	 * Gets the font slug.
-	 *
-	 * @since X.X.X
-	 * @deprecated Use WP_Fonts_Utils::convert_font_family_into_handle() or WP_Fonts_Utils::get_font_family_from_variation().
-	 * @deprecated 16.3.0 This method is not supported.
-	 *
-	 * @return false False.
-	 */
-	public static function get_font_slug() {
-		_deprecated_function( __METHOD__, 'Gutenberg 16.3.0' );
-		return false;
-	}
-
-	/**
-	 * Initializes the API.
-	 *
-	 * @since 6.0.0
-	 * @deprecated 14.9.1 Use wp_fonts().
-	 */
-	public static function init() {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_fonts()' );
-	}
-
-	/**
-	 * Get the list of all registered font family handles.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.8.0 Use wp_fonts()->get_registered_font_families().
-	 * @deprecated 16.3.0 Register is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function get_registered_font_families() {
-		_deprecated_function( __METHOD__, 'Gutenberg 15.8.0' );
-		return array();
-	}
-
-	/**
-	 * Gets the list of registered fonts.
-	 *
-	 * @since 6.0.0
-	 * @deprecated 14.9.1 Use wp_fonts()->get_registered().
-	 * @deprecated 16.3.0 Register is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function get_registered_webfonts() {
-		_deprecated_function( __METHOD__, 'Gutenberg 14.9.1' );
-
-		return array();
-	}
-
-	/**
-	 * Gets the list of enqueued fonts.
-	 *
-	 * @since 6.0.0
-	 * @deprecated 14.9.1 Use wp_fonts()->get_enqueued().
-	 * @deprecated 16.3.0 Enqueue is not supported.
-	 *
-	 * @return array Empty array.
-	 */
-	public function get_enqueued_webfonts() {
-		_deprecated_function( __METHOD__, 'Gutenberg 14.9.1' );
-		return array();
-	}
-
-	/**
-	 * Gets the list of all fonts.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 14.9.1 Use wp_fonts()->get_registered().
-	 * @deprecated 16.3.0 This method is not supported.
-	 *
-	 * @return array[]
-	 */
-	public function get_all_webfonts() {
-		_deprecated_function( __METHOD__, 'Gutenberg 14.9.1', 'wp_fonts()->get_registered()' );
-		return array();
-	}
-
-	/**
-	 * Registers a webfont.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_register_fonts().
-	 * @deprecated 16.3.0 Register is not supported.
-	 *
-	 * @return bool False.
-	 */
-	public function register_webfont() {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_register_fonts()' );
-		return false;
-	}
-
-	/**
-	 * Enqueue a font-family that has been already registered.
-	 *
-	 * @since XX.X
-	 * @deprecated 14.9.1 Use wp_enqueue_fonts().
-	 * @deprecated 16.3.0 Register is not supported.
-	 *
-	 * @return bool False.
-	 */
-	public function enqueue_webfont() {
-		_deprecated_function( __METHOD__, 'Gutenberg 14.9.1' );
-		return false;
-	}
-}
diff --git a/lib/experimental/fonts/font-library/class-wp-font-collection.php b/lib/experimental/fonts/font-library/class-wp-font-collection.php
deleted file mode 100644
index e8cc7c98fe730f..00000000000000
--- a/lib/experimental/fonts/font-library/class-wp-font-collection.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Font Collection class.
- *
- * This file contains the Font Collection class definition.
- *
- * @package    WordPress
- * @subpackage Font Library
- * @since      6.5.0
- */
-
-if ( class_exists( 'WP_Font_Collection' ) ) {
-	return;
-}
-
-/**
- * Font Collection class.
- *
- * @since 6.5.0
- */
-class WP_Font_Collection {
-
-	/**
-	 * Font collection configuration.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @var array
-	 */
-	private $config;
-
-	/**
-	 * WP_Font_Collection constructor.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $config Font collection config options.
-	 *                      See {@see wp_register_font_collection()} for the supported fields.
-	 * @throws Exception If the required parameters are missing.
-	 */
-	public function __construct( $config ) {
-		if ( empty( $config ) || ! is_array( $config ) ) {
-			throw new Exception( 'Font Collection config options is required as a non-empty array.' );
-		}
-
-		if ( empty( $config['id'] ) || ! is_string( $config['id'] ) ) {
-			throw new Exception( 'Font Collection config ID is required as a non-empty string.' );
-		}
-
-		if ( empty( $config['name'] ) || ! is_string( $config['name'] ) ) {
-			throw new Exception( 'Font Collection config name is required as a non-empty string.' );
-		}
-
-		if ( empty( $config['src'] ) || ! is_string( $config['src'] ) ) {
-			throw new Exception( 'Font Collection config "src" option is required as a non-empty string.' );
-		}
-
-		$this->config = $config;
-	}
-
-	/**
-	 * Gets the font collection config.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return array An array containing the font collection config.
-	 */
-	public function get_config() {
-		return $this->config;
-	}
-
-	/**
-	 * Gets the font collection data.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return array|WP_Error An array containing the list of font families in theme.json format on success,
-	 *                        else an instance of WP_Error on failure.
-	 */
-	public function get_data() {
-		// If the src is a URL, fetch the data from the URL.
-		if ( str_contains( $this->config['src'], 'http' ) && str_contains( $this->config['src'], '://' ) ) {
-			if ( ! wp_http_validate_url( $this->config['src'] ) ) {
-				return new WP_Error( 'font_collection_read_error', __( 'Invalid URL for Font Collection data.', 'gutenberg' ) );
-			}
-
-			$response = wp_remote_get( $this->config['src'] );
-			if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
-				return new WP_Error( 'font_collection_read_error', __( 'Error fetching the Font Collection data from a URL.', 'gutenberg' ) );
-			}
-
-			$data = json_decode( wp_remote_retrieve_body( $response ), true );
-			if ( empty( $data ) ) {
-				return new WP_Error( 'font_collection_read_error', __( 'Error decoding the Font Collection data from the REST response JSON.', 'gutenberg' ) );
-			}
-			// If the src is a file path, read the data from the file.
-		} else {
-			if ( ! file_exists( $this->config['src'] ) ) {
-				return new WP_Error( 'font_collection_read_error', __( 'Font Collection data JSON file does not exist.', 'gutenberg' ) );
-			}
-			$data = wp_json_file_decode( $this->config['src'], array( 'associative' => true ) );
-			if ( empty( $data ) ) {
-				return new WP_Error( 'font_collection_read_error', __( 'Error reading the Font Collection data JSON file contents.', 'gutenberg' ) );
-			}
-		}
-
-		$collection_data         = $this->get_config();
-		$collection_data['data'] = $data;
-		unset( $collection_data['src'] );
-		return $collection_data;
-	}
-}
diff --git a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
deleted file mode 100644
index 7d954e79e96a3c..00000000000000
--- a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Fonts Family Utils class.
- *
- * This file contains utils fot Font Family class.
- *
- * @package    WordPress
- * @subpackage Font Library
- * @since      6.5.0
- */
-
-if ( class_exists( 'WP_Font_Family_Utils' ) ) {
-	return;
-}
-
-/**
- * A class of utilities for working with the Font Library.
- *
- * @since 6.5.0
- */
-class WP_Font_Family_Utils {
-
-	/**
-	 * Generates a filename for a font face asset.
-	 *
-	 * Creates a filename for a font face asset using font family, style, weight and
-	 * extension information.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $font_slug The font slug to use in the filename.
-	 * @param array  $font_face The font face array containing 'fontFamily', 'fontStyle', and
-	 *                          'fontWeight' attributes.
-	 * @param string $url       The URL of the font face asset, used to derive the file extension.
-	 * @param string $suffix    Optional. The suffix added to the resulting filename. Default empty string.
-	 * @return string The generated filename for the font face asset.
-	 */
-	public static function get_filename_from_font_face( $font_slug, $font_face, $url, $suffix = '' ) {
-		$extension = pathinfo( $url, PATHINFO_EXTENSION );
-		$filename  = "{$font_slug}_{$font_face['fontStyle']}_{$font_face['fontWeight']}";
-		if ( '' !== $suffix ) {
-			$filename .= "_{$suffix}";
-		}
-
-		return sanitize_file_name( "{$filename}.{$extension}" );
-	}
-
-	/**
-	 * Merges two fonts and their font faces.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $font1 The first font to merge.
-	 * @param array $font2 The second font to merge.
-	 * @return array|WP_Error The merged font or WP_Error if the fonts have different slugs.
-	 */
-	public static function merge_fonts_data( $font1, $font2 ) {
-		if ( $font1['slug'] !== $font2['slug'] ) {
-			return new WP_Error(
-				'fonts_must_have_same_slug',
-				__( 'Fonts must have the same slug to be merged.', 'gutenberg' )
-			);
-		}
-
-		$font_faces_1      = isset( $font1['fontFace'] ) ? $font1['fontFace'] : array();
-		$font_faces_2      = isset( $font2['fontFace'] ) ? $font2['fontFace'] : array();
-		$merged_font_faces = array_merge( $font_faces_1, $font_faces_2 );
-
-		$serialized_faces        = array_map( 'serialize', $merged_font_faces );
-		$unique_serialized_faces = array_unique( $serialized_faces );
-		$unique_faces            = array_map( 'unserialize', $unique_serialized_faces );
-
-		$merged_font             = array_merge( $font1, $font2 );
-		$merged_font['fontFace'] = array_values( $unique_faces );
-
-		return $merged_font;
-	}
-
-	/**
-	 * Returns whether the given file has a font MIME type.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $filepath The file to check.
-	 * @return bool True if the file has a font MIME type, false otherwise.
-	 */
-	public static function has_font_mime_type( $filepath ) {
-		$allowed_mime_types = WP_Font_Library::get_expected_font_mime_types_per_php_version();
-		$filetype           = wp_check_filetype( $filepath, $allowed_mime_types );
-
-		return in_array( $filetype['type'], $allowed_mime_types, true );
-	}
-
-	/**
-	 * Format font family to make it valid CSS.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $font_family Font family attribute.
-	 * @return string The formatted font family attribute.
-	 */
-	public static function format_font_family( $font_family ) {
-		if ( $font_family ) {
-			$font_families         = explode( ',', $font_family );
-			$wrapped_font_families = array_map(
-				function ( $family ) {
-					$trimmed = trim( $family );
-					if ( ! empty( $trimmed ) && strpos( $trimmed, ' ' ) !== false && strpos( $trimmed, "'" ) === false && strpos( $trimmed, '"' ) === false ) {
-							return "'" . $trimmed . "'";
-					}
-					return $trimmed;
-				},
-				$font_families
-			);
-
-			if ( count( $wrapped_font_families ) === 1 ) {
-				$font_family = $wrapped_font_families[0];
-			} else {
-				$font_family = implode( ', ', $wrapped_font_families );
-			}
-		}
-
-		return $font_family;
-	}
-}
diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php
deleted file mode 100644
index 58d4f476e834d1..00000000000000
--- a/lib/experimental/fonts/font-library/class-wp-font-family.php
+++ /dev/null
@@ -1,633 +0,0 @@
-<?php
-/**
- * Font Family class.
- *
- * This file contains the Font Family class definition.
- *
- * @package    WordPress
- * @subpackage Font Library
- * @since      6.5.0
- */
-
-if ( class_exists( 'WP_Font_Family' ) ) {
-	return;
-}
-
-/**
- * Font Library class.
- *
- * @since 6.5.0
- */
-class WP_Font_Family {
-
-	/**
-	 * Font family data.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @var array
-	 */
-	private $data;
-
-	/**
-	 * WP_Font_Family constructor.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $font_data Font family data.
-	 * @throws Exception If the font family data is missing the slug.
-	 */
-	public function __construct( $font_data = array() ) {
-		if ( empty( $font_data['slug'] ) ) {
-			throw new Exception( 'Font family data is missing the slug.' );
-		}
-		$this->data = $font_data;
-	}
-
-	/**
-	 * Gets the font family data.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return array An array in fontFamily theme.json format.
-	 */
-	public function get_data() {
-		return $this->data;
-	}
-
-	/**
-	 * Gets the font family data.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return string fontFamily in theme.json format as stringified JSON.
-	 */
-	public function get_data_as_json() {
-		return wp_json_encode( $this->get_data() );
-	}
-
-	/**
-	 * Checks whether the font family has font faces defined.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return bool True if the font family has font faces defined, false otherwise.
-	 */
-	public function has_font_faces() {
-		return ! empty( $this->data['fontFace'] ) && is_array( $this->data['fontFace'] );
-	}
-
-	/**
-	 * Removes font family assets.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return bool True if assets were removed, false otherwise.
-	 */
-	private function remove_font_family_assets() {
-		if ( $this->has_font_faces() ) {
-			foreach ( $this->data['fontFace'] as $font_face ) {
-				$were_assets_removed = $this->delete_font_face_assets( $font_face );
-				if ( false === $were_assets_removed ) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Removes a font family from the database and deletes its assets.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return bool|WP_Error True if the font family was uninstalled, WP_Error otherwise.
-	 */
-	public function uninstall() {
-		$post = $this->get_data_from_post();
-		if ( null === $post ) {
-			return new WP_Error(
-				'font_family_not_found',
-				__( 'The font family could not be found.', 'gutenberg' )
-			);
-		}
-
-		if (
-			! $this->remove_font_family_assets() ||
-			! wp_delete_post( $post->ID, true )
-		) {
-			return new WP_Error(
-				'font_family_not_deleted',
-				__( 'The font family could not be deleted.', 'gutenberg' )
-			);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes a specified font asset file from the fonts directory.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $src The path of the font asset file to delete.
-	 * @return bool Whether the file was deleted.
-	 */
-	private static function delete_asset( $src ) {
-		$filename  = basename( $src );
-		$file_path = path_join( WP_Font_Library::get_fonts_dir(), $filename );
-
-		wp_delete_file( $file_path );
-
-		return ! file_exists( $file_path );
-	}
-
-	/**
-	 * Deletes all font face asset files associated with a given font face.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $font_face The font face array containing the 'src' attribute
-	 *                         with the file path(s) to be deleted.
-	 * @return bool True if delete was successful, otherwise false.
-	 */
-	private static function delete_font_face_assets( $font_face ) {
-		$sources = (array) $font_face['src'];
-		foreach ( $sources as $src ) {
-			$was_asset_removed = self::delete_asset( $src );
-			if ( ! $was_asset_removed ) {
-				// Bail if any of the assets could not be removed.
-				return false;
-			}
-		}
-		return true;
-	}
-
-
-	/**
-	 * Gets the overrides for the 'wp_handle_upload' function.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $filename The filename to be used for the uploaded file.
-	 * @return array The overrides for the 'wp_handle_upload' function.
-	 */
-	private function get_upload_overrides( $filename ) {
-		return array(
-			// Arbitrary string to avoid the is_uploaded_file() check applied
-			// when using 'wp_handle_upload'.
-			'action'                   => 'wp_handle_font_upload',
-			// Not testing a form submission.
-			'test_form'                => false,
-			// Seems mime type for files that are not images cannot be tested.
-			// See wp_check_filetype_and_ext().
-			'test_type'                => true,
-			'mimes'                    => WP_Font_Library::get_expected_font_mime_types_per_php_version(),
-			'unique_filename_callback' => static function () use ( $filename ) {
-				// Keep the original filename.
-				return $filename;
-			},
-		);
-	}
-
-	/**
-	 * Downloads a font asset from a specified source URL and saves it to
-	 * the font directory.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $url      The source URL of the font asset to be downloaded.
-	 * @param string $filename The filename to save the downloaded font asset as.
-	 * @return string|bool The relative path to the downloaded font asset.
-	 *                     False if the download failed.
-	 */
-	private function download_asset( $url, $filename ) {
-		// Checks if the file to be downloaded has a font mime type.
-		if ( ! WP_Font_Family_Utils::has_font_mime_type( $filename ) ) {
-			return false;
-		}
-
-		// Include file with download_url() if function doesn't exist.
-		if ( ! function_exists( 'download_url' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/file.php';
-		}
-
-		// Downloads the font asset or returns false.
-		$temp_file = download_url( $url );
-		if ( is_wp_error( $temp_file ) ) {
-			return false;
-		}
-
-		$overrides = $this->get_upload_overrides( $filename );
-
-		$file = array(
-			'tmp_name' => $temp_file,
-			'name'     => $filename,
-		);
-
-		$handled_file = wp_handle_upload( $file, $overrides );
-
-		// Cleans the temp file.
-		@unlink( $temp_file );
-
-		if ( ! isset( $handled_file['url'] ) ) {
-			return false;
-		}
-
-		// Returns the relative path to the downloaded font asset to be used as
-		// font face src.
-		return $handled_file['url'];
-	}
-
-	/**
-	 * Moves an uploaded font face asset from temp folder to the fonts directory.
-	 *
-	 * This is used when uploading local fonts.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $font_face Font face to download.
-	 * @param array $file      Uploaded file.
-	 * @return array New font face with all assets downloaded and referenced in
-	 *               the font face definition.
-	 */
-	private function move_font_face_asset( $font_face, $file ) {
-		$new_font_face = $font_face;
-		$filename      = WP_Font_Family_Utils::get_filename_from_font_face(
-			$this->data['slug'],
-			$font_face,
-			$file['name']
-		);
-
-		// Remove the uploaded font asset reference from the font face definition
-		// because it is no longer needed.
-		unset( $new_font_face['uploadedFile'] );
-
-		// If the filename has no font mime type, don't move the file and
-		// return the font face definition without src to be ignored later.
-		if ( ! WP_Font_Family_Utils::has_font_mime_type( $filename ) ) {
-			return $new_font_face;
-		}
-
-		// Move the uploaded font asset from the temp folder to the fonts directory.
-		if ( ! function_exists( 'wp_handle_upload' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/file.php';
-		}
-
-		$overrides = $this->get_upload_overrides( $filename );
-
-		$handled_file = wp_handle_upload( $file, $overrides );
-
-		if ( isset( $handled_file['url'] ) ) {
-			// If the file was successfully moved, update the font face definition
-			// to reference the new file location.
-			$new_font_face['src'] = $handled_file['url'];
-		}
-
-		return $new_font_face;
-	}
-
-	/**
-	 * Sanitizes the font family data using WP_Theme_JSON.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return array A sanitized font family definition.
-	 */
-	private function sanitize() {
-		// Creates the structure of theme.json array with the new fonts.
-		$fonts_json = array(
-			'version'  => '2',
-			'settings' => array(
-				'typography' => array(
-					'fontFamilies' => array(
-						'custom' => array(
-							$this->data,
-						),
-					),
-				),
-			),
-		);
-
-		// Creates a new WP_Theme_JSON object with the new fonts to
-		// leverage sanitization and validation.
-		$fonts_json     = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $fonts_json );
-		$theme_json     = new WP_Theme_JSON_Gutenberg( $fonts_json );
-		$theme_data     = $theme_json->get_data();
-		$sanitized_font = ! empty( $theme_data['settings']['typography']['fontFamilies'] )
-			? $theme_data['settings']['typography']['fontFamilies'][0]
-			: array();
-
-		$sanitized_font['slug']       = _wp_to_kebab_case( $sanitized_font['slug'] );
-		$sanitized_font['fontFamily'] = WP_Font_Family_Utils::format_font_family( $sanitized_font['fontFamily'] );
-		$this->data                   = $sanitized_font;
-		return $this->data;
-	}
-
-	/**
-	 * Downloads font face assets.
-	 *
-	 * Downloads the font face asset(s) associated with a font face. It works with
-	 * both single source URLs and arrays of multiple source URLs.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $font_face The font face array containing the 'src' attribute
-	 *                         with the source URL(s) of the assets.
-	 * @return array The modified font face array with the new source URL(s) to
-	 *               the downloaded assets.
-	 */
-	private function download_font_face_assets( $font_face ) {
-		$new_font_face        = $font_face;
-		$sources              = (array) $font_face['downloadFromUrl'];
-		$new_font_face['src'] = array();
-		$index                = 0;
-
-		foreach ( $sources as $src ) {
-			$suffix   = $index++ > 0 ? $index : '';
-			$filename = WP_Font_Family_Utils::get_filename_from_font_face(
-				$this->data['slug'],
-				$font_face,
-				$src,
-				$suffix
-			);
-			$new_src  = $this->download_asset( $src, $filename );
-			if ( $new_src ) {
-				$new_font_face['src'][] = $new_src;
-			}
-		}
-
-		if ( count( $new_font_face['src'] ) === 1 ) {
-			$new_font_face['src'] = $new_font_face['src'][0];
-		}
-
-		// Remove the download url reference from the font face definition
-		// because it is no longer needed.
-		unset( $new_font_face['downloadFromUrl'] );
-
-		return $new_font_face;
-	}
-
-
-	/**
-	 * Downloads font face assets if the font family is a Google font,
-	 * or moves them if it is a local font.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $files An array of files to be installed.
-	 * @return bool True if the font faces were downloaded or moved successfully, false otherwise.
-	 */
-	private function download_or_move_font_faces( $files ) {
-		if ( ! $this->has_font_faces() ) {
-			return true;
-		}
-
-		$new_font_faces = array();
-		foreach ( $this->data['fontFace'] as $font_face ) {
-			// If the fonts are not meant to be downloaded or uploaded
-			// (for example to install fonts that use a remote url).
-			$new_font_face = $font_face;
-
-			$font_face_is_repeated = false;
-
-			// If the font face has the same fontStyle and fontWeight as an existing, continue.
-			foreach ( $new_font_faces as $font_to_compare ) {
-				if ( $new_font_face['fontStyle'] === $font_to_compare['fontStyle'] &&
-					$new_font_face['fontWeight'] === $font_to_compare['fontWeight'] ) {
-					$font_face_is_repeated = true;
-				}
-			}
-
-			if ( $font_face_is_repeated ) {
-				continue;
-			}
-
-			// If the font face requires the use of the filesystem, create the fonts dir if it doesn't exist.
-			if ( ! empty( $font_face['downloadFromUrl'] ) && ! empty( $font_face['uploadedFile'] ) ) {
-				wp_mkdir_p( WP_Font_Library::get_fonts_dir() );
-			}
-
-			// If installing google fonts, download the font face assets.
-			if ( ! empty( $font_face['downloadFromUrl'] ) ) {
-				$new_font_face = $this->download_font_face_assets( $new_font_face );
-			}
-
-			// If installing local fonts, move the font face assets from
-			// the temp folder to the wp fonts directory.
-			if ( ! empty( $font_face['uploadedFile'] ) && ! empty( $files ) ) {
-				$new_font_face = $this->move_font_face_asset(
-					$new_font_face,
-					$files[ $new_font_face['uploadedFile'] ]
-				);
-			}
-
-			/*
-			 * If the font face assets were successfully downloaded, add the font face
-			 * to the new font. Font faces with failed downloads are not added to the
-			 * new font.
-			 */
-			if ( ! empty( $new_font_face['src'] ) ) {
-				$new_font_faces[] = $new_font_face;
-			}
-		}
-
-		if ( ! empty( $new_font_faces ) ) {
-			$this->data['fontFace'] = $new_font_faces;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Gets the post for a font family.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return WP_Post|null The post for this font family object or
-	 *                      null if the post does not exist.
-	 */
-	public function get_font_post() {
-		$args = array(
-			'post_type'      => 'wp_font_family',
-			'post_name'      => $this->data['slug'],
-			'name'           => $this->data['slug'],
-			'posts_per_page' => 1,
-		);
-
-		$posts_query = new WP_Query( $args );
-
-		if ( $posts_query->have_posts() ) {
-			return $posts_query->posts[0];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Gets the data for this object from the database and
-	 * sets it to the data property.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return WP_Post|null The post for this font family object or
-	 *                      null if the post does not exist.
-	 */
-	private function get_data_from_post() {
-		$post = $this->get_font_post();
-		if ( $post ) {
-			$this->data = json_decode( $post->post_content, true );
-			return $post;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Creates a post for a font family.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return int|WP_Error Post ID if the post was created, WP_Error otherwise.
-	 */
-	private function create_font_post() {
-		$post = array(
-			'post_title'   => $this->data['name'],
-			'post_name'    => $this->data['slug'],
-			'post_type'    => 'wp_font_family',
-			'post_content' => $this->get_data_as_json(),
-			'post_status'  => 'publish',
-		);
-
-		$post_id = wp_insert_post( $post );
-		if ( 0 === $post_id || is_wp_error( $post_id ) ) {
-			return new WP_Error(
-				'font_post_creation_failed',
-				__( 'Font post creation failed', 'gutenberg' )
-			);
-		}
-
-		return $post_id;
-	}
-
-	/**
-	 * Gets the font faces that are in both the existing and incoming font families.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $existing The existing font faces.
-	 * @param array $incoming The incoming font faces.
-	 * @return array The font faces that are in both the existing and incoming font families.
-	 */
-	private function get_intersecting_font_faces( $existing, $incoming ) {
-		$intersecting = array();
-		foreach ( $existing as $existing_face ) {
-			foreach ( $incoming as $incoming_face ) {
-				if ( $incoming_face['fontStyle'] === $existing_face['fontStyle'] &&
-					$incoming_face['fontWeight'] === $existing_face['fontWeight'] &&
-					$incoming_face['src'] !== $existing_face['src'] ) {
-					$intersecting[] = $existing_face;
-				}
-			}
-		}
-		return $intersecting;
-	}
-
-	/**
-	 * Updates a post for a font family.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param WP_Post $post The post to update.
-	 * @return int|WP_Error Post ID if the update was successful, WP_Error otherwise.
-	 */
-	private function update_font_post( $post ) {
-		$post_font_data = json_decode( $post->post_content, true );
-		$new_data       = WP_Font_Family_Utils::merge_fonts_data( $post_font_data, $this->data );
-		if ( isset( $post_font_data['fontFace'] ) && ! empty( $post_font_data['fontFace'] ) ) {
-			$intersecting = $this->get_intersecting_font_faces( $post_font_data['fontFace'], $new_data['fontFace'] );
-		}
-
-		if ( isset( $intersecting ) && ! empty( $intersecting ) ) {
-			$serialized_font_faces   = array_map( 'serialize', $new_data['fontFace'] );
-			$serialized_intersecting = array_map( 'serialize', $intersecting );
-
-			$diff = array_diff( $serialized_font_faces, $serialized_intersecting );
-
-			$new_data['fontFace'] = array_values( array_map( 'unserialize', $diff ) );
-
-			foreach ( $intersecting as $intersect ) {
-				$this->delete_font_face_assets( $intersect );
-			}
-		}
-		$this->data = $new_data;
-
-		$post = array(
-			'ID'           => $post->ID,
-			'post_content' => $this->get_data_as_json(),
-		);
-
-		$post_id = wp_update_post( $post );
-
-		if ( 0 === $post_id || is_wp_error( $post_id ) ) {
-			return new WP_Error(
-				'font_post_update_failed',
-				__( 'Font post update failed', 'gutenberg' )
-			);
-		}
-
-		return $post_id;
-	}
-
-	/**
-	 * Creates a post for a font in the Font Library if it doesn't exist,
-	 * or updates it if it does.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return int|WP_Error Post id if the post was created or updated successfully,
-	 *                      WP_Error otherwise.
-	 */
-	private function create_or_update_font_post() {
-		$this->sanitize();
-
-		$post = $this->get_font_post();
-		if ( $post ) {
-			return $this->update_font_post( $post );
-		}
-
-		return $this->create_font_post();
-	}
-
-	/**
-	 * Installs the font family into the library.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $files Optional. An array of files to be installed. Default null.
-	 * @return array|WP_Error An array of font family data on success, WP_Error otherwise.
-	 */
-	public function install( $files = null ) {
-		add_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
-		add_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) );
-		$were_assets_written = $this->download_or_move_font_faces( $files );
-		remove_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) );
-		remove_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
-
-		if ( ! $were_assets_written ) {
-			return new WP_Error(
-				'font_face_download_failed',
-				__( 'The font face assets could not be written.', 'gutenberg' )
-			);
-		}
-
-		$post_id = $this->create_or_update_font_post();
-
-		if ( is_wp_error( $post_id ) ) {
-			return $post_id;
-		}
-
-		return $this->get_data();
-	}
-}
diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php
deleted file mode 100644
index 9320a554e510c7..00000000000000
--- a/lib/experimental/fonts/font-library/class-wp-font-library.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Font Library class.
- *
- * This file contains the Font Library class definition.
- *
- * @package    WordPress
- * @subpackage Font Library
- * @since      6.5.0
- */
-
-if ( class_exists( 'WP_Font_Library' ) ) {
-	return;
-}
-
-/**
- * Font Library class.
- *
- * @since 6.5.0
- */
-class WP_Font_Library {
-
-	/**
-	 * Provide the expected mime-type value for font files per-PHP release. Due to differences in the values returned these values differ between PHP versions.
-	 *
-	 * This is necessary until a collection of valid mime-types per-file extension can be provided to 'upload_mimes' filter.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $php_version_id The version of PHP to provide mime types for. The default is the current PHP version.
-	 *
-	 * @return Array A collection of mime types keyed by file extension.
-	 */
-	public static function get_expected_font_mime_types_per_php_version( $php_version_id = PHP_VERSION_ID ) {
-
-		$php_7_ttf_mime_type = $php_version_id >= 70300 ? 'application/font-sfnt' : 'application/x-font-ttf';
-
-		return array(
-			'otf'   => 'application/vnd.ms-opentype',
-			'ttf'   => $php_version_id >= 70400 ? 'font/sfnt' : $php_7_ttf_mime_type,
-			'woff'  => $php_version_id >= 80100 ? 'font/woff' : 'application/font-woff',
-			'woff2' => $php_version_id >= 80100 ? 'font/woff2' : 'application/font-woff2',
-		);
-	}
-
-	/**
-	 * Font collections.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @var array
-	 */
-	private static $collections = array();
-
-	/**
-	 * Register a new font collection.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $config Font collection config options.
-	 *                      See {@see wp_register_font_collection()} for the supported fields.
-	 * @return WP_Font_Collection|WP_Error A font collection is it was registered successfully and a WP_Error otherwise.
-	 */
-	public static function register_font_collection( $config ) {
-		$new_collection = new WP_Font_Collection( $config );
-
-		if ( isset( self::$collections[ $config['id'] ] ) ) {
-			return new WP_Error( 'font_collection_registration_error', 'Font collection already registered.' );
-		}
-
-		self::$collections[ $config['id'] ] = $new_collection;
-		return $new_collection;
-	}
-
-	/**
-	 * Gets all the font collections available.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return array List of font collections.
-	 */
-	public static function get_font_collections() {
-		return self::$collections;
-	}
-
-	/**
-	 * Gets a font collection.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $id Font collection id.
-	 * @return array List of font collections.
-	 */
-	public static function get_font_collection( $id ) {
-		if ( array_key_exists( $id, self::$collections ) ) {
-			return self::$collections[ $id ];
-		}
-		return new WP_Error( 'font_collection_not_found', 'Font collection not found.' );
-	}
-
-	/**
-	 * Gets the upload directory for fonts.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return string Path of the upload directory for fonts.
-	 */
-	public static function get_fonts_dir() {
-		return path_join( WP_CONTENT_DIR, 'fonts' );
-	}
-
-	/**
-	 * Sets the upload directory for fonts.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $defaults {
-	 *     Default upload directory.
-	 *
-	 *     @type string $path    Path to the directory.
-	 *     @type string $url     URL for the directory.
-	 *     @type string $subdir  Sub-directory of the directory.
-	 *     @type string $basedir Base directory.
-	 *     @type string $baseurl Base URL.
-	 * }
-	 * @return array Modified upload directory.
-	 */
-	public static function set_upload_dir( $defaults ) {
-		$defaults['basedir'] = WP_CONTENT_DIR;
-		$defaults['baseurl'] = content_url();
-		$defaults['subdir']  = '/fonts';
-		$defaults['path']    = self::get_fonts_dir();
-		$defaults['url']     = $defaults['baseurl'] . '/fonts';
-
-		return $defaults;
-	}
-
-	/**
-	 * Sets the allowed mime types for fonts.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $mime_types List of allowed mime types.
-	 * @return array Modified upload directory.
-	 */
-	public static function set_allowed_mime_types( $mime_types ) {
-		return array_merge( $mime_types, self::get_expected_font_mime_types_per_php_version() );
-	}
-}
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-library-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-library-controller.php
deleted file mode 100644
index 9655178d706679..00000000000000
--- a/lib/experimental/fonts/font-library/class-wp-rest-font-library-controller.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-/**
- * Rest Font Library Controller.
- *
- * This file contains the class for the REST API Font Library Controller.
- *
- * @package    WordPress
- * @subpackage Font Library
- * @since      6.5.0
- */
-
-if ( class_exists( 'WP_REST_Font_Library_Controller' ) ) {
-	return;
-}
-
-/**
- * Font Library Controller class.
- *
- * @since 6.5.0
- */
-class WP_REST_Font_Library_Controller extends WP_REST_Controller {
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 6.5.0
-	 */
-	public function __construct() {
-		$this->rest_base = 'fonts';
-		$this->namespace = 'wp/v2';
-	}
-
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 6.5.0
-	 */
-	public function register_routes() {
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base,
-			array(
-				array(
-					'methods'             => WP_REST_Server::EDITABLE,
-					'callback'            => array( $this, 'install_fonts' ),
-					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
-					'args'                => array(
-						'font_families' => array(
-							'required'          => true,
-							'type'              => 'string',
-							'validate_callback' => array( $this, 'validate_install_font_families' ),
-						),
-					),
-				),
-			)
-		);
-
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base,
-			array(
-				array(
-					'methods'             => WP_REST_Server::DELETABLE,
-					'callback'            => array( $this, 'uninstall_fonts' ),
-					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
-					'args'                => $this->uninstall_schema(),
-				),
-			)
-		);
-
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base . '/collections',
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_font_collections' ),
-					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
-				),
-			)
-		);
-
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base . '/collections' . '/(?P<id>[\/\w-]+)',
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_font_collection' ),
-					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
-				),
-			)
-		);
-	}
-
-	/**
-	 * Gets a font collection.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_font_collection( $request ) {
-		$id         = $request->get_param( 'id' );
-		$collection = WP_Font_Library::get_font_collection( $id );
-		// If the collection doesn't exist returns a 404.
-		if ( is_wp_error( $collection ) ) {
-			$collection->add_data( array( 'status' => 404 ) );
-			return $collection;
-		}
-		$collection_with_data = $collection->get_data();
-		// If there was an error getting the collection data, return the error.
-		if ( is_wp_error( $collection_with_data ) ) {
-			$collection_with_data->add_data( array( 'status' => 500 ) );
-			return $collection_with_data;
-		}
-		return new WP_REST_Response( $collection_with_data );
-	}
-
-	/**
-	 * Gets the font collections available.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_font_collections() {
-		$collections = array();
-		foreach ( WP_Font_Library::get_font_collections() as $collection ) {
-			$collections[] = $collection->get_config();
-		}
-
-		return new WP_REST_Response( $collections, 200 );
-	}
-
-	/**
-	 * Returns validation errors in font families data for installation.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array[] $font_families Font families to install.
-	 * @param array   $files         Files to install.
-	 * @return array $error_messages Array of error messages.
-	 */
-	private function get_validation_errors( $font_families, $files ) {
-		$error_messages = array();
-
-		if ( ! is_array( $font_families ) ) {
-			$error_messages[] = __( 'font_families should be an array of font families.', 'gutenberg' );
-			return $error_messages;
-		}
-
-		// Checks if there is at least one font family.
-		if ( count( $font_families ) < 1 ) {
-			$error_messages[] = __( 'font_families should have at least one font family definition.', 'gutenberg' );
-			return $error_messages;
-		}
-
-		for ( $family_index = 0; $family_index < count( $font_families ); $family_index++ ) {
-			$font_family = $font_families[ $family_index ];
-
-			if (
-				! isset( $font_family['slug'] ) ||
-				! isset( $font_family['name'] ) ||
-				! isset( $font_family['fontFamily'] )
-			) {
-				$error_messages[] = sprintf(
-					// translators: 1: font family index.
-					__( 'Font family [%s] should have slug, name and fontFamily properties defined.', 'gutenberg' ),
-					$family_index
-				);
-			}
-
-			if ( isset( $font_family['fontFace'] ) ) {
-				if ( ! is_array( $font_family['fontFace'] ) ) {
-					$error_messages[] = sprintf(
-						// translators: 1: font family index.
-						__( 'Font family [%s] should have fontFace property defined as an array.', 'gutenberg' ),
-						$family_index
-					);
-					continue;
-				}
-
-				if ( count( $font_family['fontFace'] ) < 1 ) {
-					$error_messages[] = sprintf(
-						// translators: 1: font family index.
-						__( 'Font family [%s] should have at least one font face definition.', 'gutenberg' ),
-						$family_index
-					);
-				}
-
-				if ( ! empty( $font_family['fontFace'] ) ) {
-					for ( $face_index = 0; $face_index < count( $font_family['fontFace'] ); $face_index++ ) {
-
-						$font_face = $font_family['fontFace'][ $face_index ];
-						if ( ! isset( $font_face['fontWeight'] ) || ! isset( $font_face['fontStyle'] ) ) {
-							$error_messages[] = sprintf(
-								// translators: 1: font family index, 2: font face index.
-								__( 'Font family [%1$s] Font face [%2$s] should have fontWeight and fontStyle properties defined.', 'gutenberg' ),
-								$family_index,
-								$face_index
-							);
-						}
-
-						if ( isset( $font_face['downloadFromUrl'] ) && isset( $font_face['uploadedFile'] ) ) {
-							$error_messages[] = sprintf(
-								// translators: 1: font family index, 2: font face index.
-								__( 'Font family [%1$s] Font face [%2$s] should have only one of the downloadFromUrl or uploadedFile properties defined and not both.', 'gutenberg' ),
-								$family_index,
-								$face_index
-							);
-						}
-
-						if ( isset( $font_face['uploadedFile'] ) ) {
-							if ( ! isset( $files[ $font_face['uploadedFile'] ] ) ) {
-								$error_messages[] = sprintf(
-									// translators: 1: font family index, 2: font face index.
-									__( 'Font family [%1$s] Font face [%2$s] file is not defined in the request files.', 'gutenberg' ),
-									$family_index,
-									$face_index
-								);
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return $error_messages;
-	}
-
-	/**
-	 * Validate input for the install endpoint.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string          $param The font families to install.
-	 * @param WP_REST_Request $request The request object.
-	 * @return true|WP_Error True if the parameter is valid, WP_Error otherwise.
-	 */
-	public function validate_install_font_families( $param, $request ) {
-		$font_families  = json_decode( $param, true );
-		$files          = $request->get_file_params();
-		$error_messages = $this->get_validation_errors( $font_families, $files );
-
-		if ( empty( $error_messages ) ) {
-			return true;
-		}
-
-		return new WP_Error( 'rest_invalid_param', implode( ', ', $error_messages ), array( 'status' => 400 ) );
-	}
-
-	/**
-	 * Gets the schema for the uninstall endpoint.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return array Schema array.
-	 */
-	public function uninstall_schema() {
-		return array(
-			'font_families' => array(
-				'type'        => 'array',
-				'description' => __( 'The font families to install.', 'gutenberg' ),
-				'required'    => true,
-				'minItems'    => 1,
-				'items'       => array(
-					'required'   => true,
-					'type'       => 'object',
-					'properties' => array(
-						'slug' => array(
-							'type'        => 'string',
-							'description' => __( 'The font family slug.', 'gutenberg' ),
-							'required'    => true,
-						),
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Removes font families from the Font Library and all their assets.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function uninstall_fonts( $request ) {
-		$fonts_to_uninstall = $request->get_param( 'font_families' );
-
-		$errors    = array();
-		$successes = array();
-
-		if ( empty( $fonts_to_uninstall ) ) {
-			$errors[] = new WP_Error(
-				'no_fonts_to_install',
-				__( 'No fonts to uninstall', 'gutenberg' )
-			);
-			$data     = array(
-				'successes' => $successes,
-				'errors'    => $errors,
-			);
-			$response = rest_ensure_response( $data );
-			$response->set_status( 400 );
-			return $response;
-		}
-
-		foreach ( $fonts_to_uninstall as $font_data ) {
-			$font   = new WP_Font_Family( $font_data );
-			$result = $font->uninstall();
-			if ( is_wp_error( $result ) ) {
-				$errors[] = $result;
-			} else {
-				$successes[] = $result;
-			}
-		}
-		$data = array(
-			'successes' => $successes,
-			'errors'    => $errors,
-		);
-		return rest_ensure_response( $data );
-	}
-
-	/**
-	 * Checks whether the user has permissions to update the Font Library.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return true|WP_Error True if the request has write access for the item, WP_Error object otherwise.
-	 */
-	public function update_font_library_permissions_check() {
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			return new WP_Error(
-				'rest_cannot_update_font_library',
-				__( 'Sorry, you are not allowed to update the Font Library on this site.', 'gutenberg' ),
-				array(
-					'status' => rest_authorization_required_code(),
-				)
-			);
-		}
-		return true;
-	}
-
-	/**
-	 * Checks whether the font directory exists or not.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return bool Whether the font directory exists.
-	 */
-	private function has_upload_directory() {
-		$upload_dir = WP_Font_Library::get_fonts_dir();
-		return is_dir( $upload_dir );
-	}
-
-	/**
-	 * Checks whether the user has write permissions to the temp and fonts directories.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return true|WP_Error True if the user has write permissions, WP_Error object otherwise.
-	 */
-	private function has_write_permission() {
-		// The update endpoints requires write access to the temp and the fonts directories.
-		$temp_dir   = get_temp_dir();
-		$upload_dir = WP_Font_Library::get_fonts_dir();
-		if ( ! is_writable( $temp_dir ) || ! wp_is_writable( $upload_dir ) ) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Checks whether the request needs write permissions.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array[] $font_families Font families to install.
-	 * @return bool Whether the request needs write permissions.
-	 */
-	private function needs_write_permission( $font_families ) {
-		foreach ( $font_families as $font ) {
-			if ( isset( $font['fontFace'] ) ) {
-				foreach ( $font['fontFace'] as $face ) {
-					// If the font is being downloaded from a URL or uploaded, it needs write permissions.
-					if ( isset( $face['downloadFromUrl'] ) || isset( $face['uploadedFile'] ) ) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Installs new fonts.
-	 *
-	 * Takes a request containing new fonts to install, downloads their assets, and adds them
-	 * to the Font Library.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param WP_REST_Request $request The request object containing the new fonts to install
-	 *                                 in the request parameters.
-	 * @return WP_REST_Response|WP_Error The updated Font Library post content.
-	 */
-	public function install_fonts( $request ) {
-		// Get new fonts to install.
-		$fonts_param = $request->get_param( 'font_families' );
-
-		/*
-		 * As this is receiving form data, the font families are encoded as a string.
-		 * The form data is used  because local fonts need to use that format to
-		 * attach the files in the request.
-		 */
-		$fonts_to_install = json_decode( $fonts_param, true );
-
-		$successes       = array();
-		$errors          = array();
-		$response_status = 200;
-
-		if ( empty( $fonts_to_install ) ) {
-			$errors[]        = new WP_Error(
-				'no_fonts_to_install',
-				__( 'No fonts to install', 'gutenberg' )
-			);
-			$response_status = 400;
-		}
-
-		if ( $this->needs_write_permission( $fonts_to_install ) ) {
-			$upload_dir = WP_Font_Library::get_fonts_dir();
-			if ( ! $this->has_upload_directory() ) {
-				if ( ! wp_mkdir_p( $upload_dir ) ) {
-					$errors[] = new WP_Error(
-						'cannot_create_fonts_folder',
-						sprintf(
-							/* translators: %s: Directory path. */
-							__( 'Error: Unable to create directory %s.', 'gutenberg' ),
-							esc_html( $upload_dir )
-						)
-					);
-					$response_status = 500;
-				}
-			}
-
-			if ( $this->has_upload_directory() && ! $this->has_write_permission() ) {
-				$errors[]        = new WP_Error(
-					'cannot_write_fonts_folder',
-					__( 'Error: WordPress does not have permission to write the fonts folder on your server.', 'gutenberg' )
-				);
-				$response_status = 500;
-			}
-		}
-
-		if ( ! empty( $errors ) ) {
-			$data     = array(
-				'successes' => $successes,
-				'errors'    => $errors,
-			);
-			$response = rest_ensure_response( $data );
-			$response->set_status( $response_status );
-			return $response;
-		}
-
-		// Get uploaded files (used when installing local fonts).
-		$files = $request->get_file_params();
-		foreach ( $fonts_to_install as $font_data ) {
-			$font   = new WP_Font_Family( $font_data );
-			$result = $font->install( $files );
-			if ( is_wp_error( $result ) ) {
-				$errors[] = $result;
-			} else {
-				$successes[] = $result;
-			}
-		}
-
-		$data = array(
-			'successes' => $successes,
-			'errors'    => $errors,
-		);
-		return rest_ensure_response( $data );
-	}
-}
diff --git a/lib/experimental/fonts/font-library/font-library.php b/lib/experimental/fonts/font-library/font-library.php
deleted file mode 100644
index 6c31c02d409f7a..00000000000000
--- a/lib/experimental/fonts/font-library/font-library.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Font Library initialization.
- *
- * This file contains Font Library init calls.
- *
- * @package    WordPress
- * @subpackage Font Library
- * @since      6.5.0
- */
-
-/**
- * Registers the routes for the objects of the controller.
- *
- * This function will not be merged into Core. However, the
- * code in the function will be. @core-merge annotation
- * provides instructions on where the could needs to go
- * in Core.
- *
- * @since 6.5.0
- */
-function gutenberg_init_font_library_routes() {
-	// @core-merge: This code will go into Core's `create_initial_post_types()`.
-	$args = array(
-		'public'       => false,
-		'_builtin'     => true,  /* internal use only. don't use this when registering your own post type. */
-		'label'        => 'Font Library',
-		'show_in_rest' => true,
-	);
-	register_post_type( 'wp_font_family', $args );
-
-	// @core-merge: This code will go into Core's `create_initial_rest_routes()`.
-	$font_library_controller = new WP_REST_Font_Library_Controller();
-	$font_library_controller->register_routes();
-}
-
-add_action( 'rest_api_init', 'gutenberg_init_font_library_routes' );
-
-
-if ( ! function_exists( 'wp_register_font_collection' ) ) {
-	/**
-	 * Registers a new Font Collection in the Font Library.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string[] $config {
-	 *     Font collection associative array of configuration options.
-	 *
-	 *     @type string $id             The font collection's unique ID.
-	 *     @type string $src The font collection's data JSON file.
-	 * }
-	 * @return WP_Font_Collection|WP_Error A font collection is it was registered
-	 *                                     successfully, else WP_Error.
-	 */
-	function wp_register_font_collection( $config ) {
-		return WP_Font_Library::register_font_collection( $config );
-	}
-}
-
-
-$default_font_collection = array(
-	'id'          => 'default-font-collection',
-	'name'        => 'Google Fonts',
-	'description' => __( 'Add from Google Fonts. Fonts are copied to and served from your site.', 'gutenberg' ),
-	'src'         => 'https://s.w.org/images/fonts/16.7/collections/google-fonts-with-preview.json',
-);
-
-wp_register_font_collection( $default_font_collection );
diff --git a/lib/experimental/full-page-client-side-navigation.php b/lib/experimental/full-page-client-side-navigation.php
new file mode 100644
index 00000000000000..621502912a668a
--- /dev/null
+++ b/lib/experimental/full-page-client-side-navigation.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Registers full page client-side navigation option using the Interactivity API and adds the necessary directives.
+ */
+
+/**
+ * Enqueue the interactivity router script.
+ */
+function _gutenberg_enqueue_interactivity_router() {
+	// Set the navigation mode to full page client-side navigation.
+	wp_interactivity_config( 'core/router', array( 'navigationMode' => 'fullPage' ) );
+	wp_enqueue_script_module( '@wordpress/interactivity-router' );
+}
+
+add_action( 'wp_enqueue_scripts', '_gutenberg_enqueue_interactivity_router' );
+
+/**
+ * Set enhancedPagination attribute for query loop when the experiment is enabled.
+ *
+ * @param array $parsed_block The parsed block.
+ *
+ * @return array The same parsed block with the modified attribute.
+ */
+function _gutenberg_add_enhanced_pagination_to_query_block( $parsed_block ) {
+	if ( 'core/query' !== $parsed_block['blockName'] ) {
+		return $parsed_block;
+	}
+
+	$parsed_block['attrs']['enhancedPagination'] = true;
+	return $parsed_block;
+}
+
+add_filter( 'render_block_data', '_gutenberg_add_enhanced_pagination_to_query_block' );
+
+/**
+ * Adds client-side navigation directives to BODY tag.
+ *
+ * Note: This should probably be done per site, not by default when this option is enabled.
+ *
+ * @param string $response_body The response body.
+ *
+ * @return string The rendered template with modified BODY attributes.
+ */
+function _gutenberg_add_client_side_navigation_directives( $response_body ) {
+	$is_html_content_type = false;
+	foreach ( headers_list() as $header ) {
+		$header_parts = preg_split( '/\s*[:;]\s*/', strtolower( $header ) );
+		if ( count( $header_parts ) >= 2 && 'content-type' === $header_parts[0] ) {
+			$is_html_content_type = in_array( $header_parts[1], array( 'text/html', 'application/xhtml+xml' ), true );
+		}
+	}
+	if ( ! $is_html_content_type ) {
+		return $response_body;
+	}
+
+	$p = new WP_HTML_Tag_Processor( $response_body );
+	if ( $p->next_tag( array( 'tag_name' => 'BODY' ) ) ) {
+		$p->set_attribute( 'data-wp-interactive', 'core/experimental' );
+		$p->set_attribute( 'data-wp-context', '{}' );
+		$response_body = $p->get_updated_html();
+	}
+	return $response_body;
+}
+
+// TODO: Explore moving this to the server directive processing.
+add_filter( 'gutenberg_template_output_buffer', '_gutenberg_add_client_side_navigation_directives' );
+
+/**
+ * Starts output buffering at the end of the 'template_include' filter.
+ *
+ * This is to implement #43258 in core.
+ *
+ * This is a hack which would eventually be replaced with something like this in wp-includes/template-loader.php:
+ *
+ *          $template = apply_filters( 'template_include', $template );
+ *     +    ob_start( 'wp_template_output_buffer_callback' );
+ *          if ( $template ) {
+ *              include $template;
+ *          } elseif ( current_user_can( 'switch_themes' ) ) {
+ *
+ * @link https://core.trac.wordpress.org/ticket/43258
+ *
+ * @param string $passthrough Value for the template_include filter which is passed through.
+ *
+ * @return string Unmodified value of $passthrough.
+ */
+function _gutenberg_buffer_template_output( string $passthrough ): string {
+	ob_start(
+		static function ( string $output ): string {
+			/**
+			 * Filters the template output buffer prior to sending to the client.
+			 *
+			 * @param string $output Output buffer.
+			 * @return string Filtered output buffer.
+			 */
+			return (string) apply_filters( 'gutenberg_template_output_buffer', $output );
+		}
+	);
+	return $passthrough;
+}
+add_filter( 'template_include', '_gutenberg_buffer_template_output', PHP_INT_MAX );
diff --git a/lib/experimental/interactivity-api/class-wp-directive-context.php b/lib/experimental/interactivity-api/class-wp-directive-context.php
deleted file mode 100644
index 4276eddca20acb..00000000000000
--- a/lib/experimental/interactivity-api/class-wp-directive-context.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Context data implementation.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( class_exists( 'WP_Directive_Context' ) ) {
-	return;
-}
-
-/**
- * This is a data structure to hold the current context.
- *
- * Whenever encountering a `data-wp-context` directive, we need to update
- * the context with the data found in that directive. Conversely,
- * when "leaving" that context (by encountering a closing tag), we
- * need to reset the context to its previous state. This means that
- * we actually need sort of a stack to keep track of all nested contexts.
- *
- * Example:
- *
- * <div data-wp-context='{ "foo": 123 }'>
- *     <!-- foo should be 123 here. -->
- *     <div data-wp-context='{ "foo": 456 }'>
- *         <!-- foo should be 456 here. -->
- *     </div>
- *     <!-- foo should be reset to 123 here. -->
- * </div>
- */
-class WP_Directive_Context {
-	/**
-	 * The stack used to store contexts internally.
-	 *
-	 * @var array An array of contexts.
-	 */
-	protected $stack = array( array() );
-
-	/**
-	 * Constructor.
-	 *
-	 * Accepts a context as an argument to initialize this with.
-	 *
-	 * @param array $context A context.
-	 */
-	public function __construct( $context = array() ) {
-		$this->set_context( $context );
-	}
-
-	/**
-	 * Return the current context.
-	 *
-	 * @return array The current context.
-	 */
-	public function get_context() {
-		return end( $this->stack );
-	}
-
-	/**
-	 * Set the current context.
-	 *
-	 * @param array $context The context to be set.
-	 *
-	 * @return void
-	 */
-	public function set_context( $context ) {
-		array_push(
-			$this->stack,
-			array_replace_recursive( $this->get_context(), $context )
-		);
-	}
-
-	/**
-	 * Reset the context to its previous state.
-	 *
-	 * @return void
-	 */
-	public function rewind_context() {
-		array_pop( $this->stack );
-	}
-}
diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
deleted file mode 100644
index e717b2e5539431..00000000000000
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ /dev/null
@@ -1,315 +0,0 @@
-<?php
-/**
- * WP_Directive_Processor class
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( class_exists( 'WP_Directive_Processor' ) ) {
-	return;
-}
-
-/**
- * This processor is built on top of the HTML Tag Processor and augments its
- * capabilities to process the Interactivity API directives.
- *
- * IMPORTANT DISCLAIMER: This code is highly experimental and its only purpose
- * is to provide a way to test the server-side rendering of the Interactivity
- * API. Most of this code will be discarded once the HTML Processor is
- * available.  Please restrain from investing unnecessary time and effort trying
- * to improve this code.
- */
-class WP_Directive_Processor extends Gutenberg_HTML_Tag_Processor_6_4 {
-
-	/**
-	 * An array of root blocks.
-	 *
-	 * @var array
-	 */
-	public static $root_block = null;
-
-	/**
-	 * Add a root block to the variable.
-	 *
-	 * @param array $block The block to add.
-	 *
-	 * @return void
-	 */
-	public static function mark_root_block( $block ) {
-		self::$root_block = md5( serialize( $block ) );
-	}
-
-	/**
-	 * Remove a root block to the variable.
-	 *
-	 * @return void
-	 */
-	public static function unmark_root_block() {
-		self::$root_block = null;
-	}
-
-	/**
-	 * Check if block is a root block.
-	 *
-	 * @param array $block The block to check.
-	 *
-	 * @return bool True if block is a root block, false otherwise.
-	 */
-	public static function is_marked_as_root_block( $block ) {
-		return md5( serialize( $block ) ) === self::$root_block;
-	}
-
-	/**
-	 * Check if a root block has already been defined.
-	 *
-	 * @return bool True if block is a root block, false otherwise.
-	 */
-	public static function has_root_block() {
-		return isset( self::$root_block );
-	}
-
-
-	/**
-	 * Find the matching closing tag for an opening tag.
-	 *
-	 * When called while on an open tag, traverse the HTML until we find the
-	 * matching closing tag, respecting any in-between content, including nested
-	 * tags of the same name. Return false when called on a closing or void tag,
-	 * or if no matching closing tag was found.
-	 *
-	 * @return bool Whether a matching closing tag was found.
-	 */
-	public function next_balanced_closer() {
-		$depth = 0;
-
-		$tag_name = $this->get_tag();
-
-		if ( self::is_html_void_element( $tag_name ) ) {
-			return false;
-		}
-
-		while ( $this->next_tag(
-			array(
-				'tag_name'    => $tag_name,
-				'tag_closers' => 'visit',
-			)
-		) ) {
-			if ( ! $this->is_tag_closer() ) {
-				++$depth;
-				continue;
-			}
-
-			if ( 0 === $depth ) {
-				return true;
-			}
-
-			--$depth;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Traverses the HTML searching for Interactivity API directives and processing
-	 * them.
-	 *
-	 * @param WP_Directive_Processor $tags An instance of the WP_Directive_Processor.
-	 * @param string                 $prefix Attribute prefix.
-	 * @param string[]               $directives Directives.
-	 *
-	 * @return WP_Directive_Processor The modified instance of the
-	 * WP_Directive_Processor.
-	 */
-	public function process_rendered_html( $tags, $prefix, $directives ) {
-		$context   = new WP_Directive_Context();
-		$tag_stack = array();
-
-		while ( $tags->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
-			$tag_name = $tags->get_tag();
-
-			// Is this a tag that closes the latest opening tag?
-			if ( $tags->is_tag_closer() ) {
-				if ( 0 === count( $tag_stack ) ) {
-					continue;
-				}
-
-				list( $latest_opening_tag_name, $attributes ) = end( $tag_stack );
-				if ( $latest_opening_tag_name === $tag_name ) {
-					array_pop( $tag_stack );
-
-					// If the matching opening tag didn't have any directives, we move on.
-					if ( 0 === count( $attributes ) ) {
-						continue;
-					}
-				}
-			} else {
-				$attributes = array();
-				foreach ( $tags->get_attribute_names_with_prefix( $prefix ) as $name ) {
-					/*
-					 * Removes the part after the double hyphen before looking for
-					 * the directive processor inside `$directives`, e.g., "wp-bind"
-					 * from "wp-bind--src" and "wp-context" from "wp-context" etc...
-					 */
-					list( $type ) = WP_Directive_Processor::parse_attribute_name( $name );
-					if ( array_key_exists( $type, $directives ) ) {
-						$attributes[] = $type;
-					}
-				}
-
-				/*
-				 * If this is an open tag, and if it either has directives, or if
-				 * we're inside a tag that does, take note of this tag and its
-				 * directives so we can call its directive processor once we
-				 * encounter the matching closing tag.
-				 */
-				if (
-				! WP_Directive_Processor::is_html_void_element( $tags->get_tag() ) &&
-				( 0 !== count( $attributes ) || 0 !== count( $tag_stack ) )
-				) {
-					$tag_stack[] = array( $tag_name, $attributes );
-				}
-			}
-
-			foreach ( $attributes as $attribute ) {
-				call_user_func( $directives[ $attribute ], $tags, $context );
-			}
-		}
-
-		return $tags;
-	}
-
-	/**
-	 * Return the content between two balanced tags.
-	 *
-	 * When called on an opening tag, return the HTML content found between that
-	 * opening tag and its matching closing tag.
-	 *
-	 * @return string The content between the current opening and its matching
-	 * closing tag.
-	 */
-	public function get_inner_html() {
-		$bookmarks = $this->get_balanced_tag_bookmarks();
-		if ( ! $bookmarks ) {
-			return false;
-		}
-		list( $start_name, $end_name ) = $bookmarks;
-
-		$start = $this->bookmarks[ $start_name ]->end + 1;
-		$end   = $this->bookmarks[ $end_name ]->start;
-
-		$this->seek( $start_name ); // Return to original position.
-		$this->release_bookmark( $start_name );
-		$this->release_bookmark( $end_name );
-
-		return substr( $this->html, $start, $end - $start );
-	}
-
-	/**
-	 * Set the content between two balanced tags.
-	 *
-	 * When called on an opening tag, set the HTML content found between that
-	 * opening tag and its matching closing tag.
-	 *
-	 * @param string $new_html The string to replace the content between the
-	 * matching tags with.
-	 *
-	 * @return bool            Whether the content was successfully replaced.
-	 */
-	public function set_inner_html( $new_html ) {
-		$this->get_updated_html(); // Apply potential previous updates.
-
-		$bookmarks = $this->get_balanced_tag_bookmarks();
-		if ( ! $bookmarks ) {
-			return false;
-		}
-		list( $start_name, $end_name ) = $bookmarks;
-
-		$start = $this->bookmarks[ $start_name ]->end + 1;
-		$end   = $this->bookmarks[ $end_name ]->start;
-
-		$this->seek( $start_name ); // Return to original position.
-		$this->release_bookmark( $start_name );
-		$this->release_bookmark( $end_name );
-
-		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $start, $end, $new_html );
-		return true;
-	}
-
-	/**
-	 * Return a pair of bookmarks for the current opening tag and the matching
-	 * closing tag.
-	 *
-	 * @return array|false A pair of bookmarks, or false if there's no matching
-	 * closing tag.
-	 */
-	public function get_balanced_tag_bookmarks() {
-		$i = 0;
-		while ( array_key_exists( 'start' . $i, $this->bookmarks ) ) {
-			++$i;
-		}
-		$start_name = 'start' . $i;
-
-		$this->set_bookmark( $start_name );
-		if ( ! $this->next_balanced_closer() ) {
-			$this->release_bookmark( $start_name );
-			return false;
-		}
-
-		$i = 0;
-		while ( array_key_exists( 'end' . $i, $this->bookmarks ) ) {
-			++$i;
-		}
-		$end_name = 'end' . $i;
-		$this->set_bookmark( $end_name );
-
-		return array( $start_name, $end_name );
-	}
-
-	/**
-	 * Whether a given HTML element is void (e.g. <br>).
-	 *
-	 * @param string $tag_name The element in question.
-	 * @return bool True if the element is void.
-	 *
-	 * @see https://html.spec.whatwg.org/#elements-2
-	 */
-	public static function is_html_void_element( $tag_name ) {
-		switch ( $tag_name ) {
-			case 'AREA':
-			case 'BASE':
-			case 'BR':
-			case 'COL':
-			case 'EMBED':
-			case 'HR':
-			case 'IMG':
-			case 'INPUT':
-			case 'LINK':
-			case 'META':
-			case 'SOURCE':
-			case 'TRACK':
-			case 'WBR':
-				return true;
-
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Extract and return the directive type and the the part after the double
-	 * hyphen from an attribute name (if present), in an array format.
-	 *
-	 * Examples:
-	 *
-	 *     'wp-island'            => array( 'wp-island', null )
-	 *     'wp-bind--src'         => array( 'wp-bind', 'src' )
-	 *     'wp-thing--and--thang' => array( 'wp-thing', 'and--thang' )
-	 *
-	 * @param string $name The attribute name.
-	 * @return array The resulting array
-	 */
-	public static function parse_attribute_name( $name ) {
-		return explode( '--', $name, 2 );
-	}
-}
diff --git a/lib/experimental/interactivity-api/class-wp-interactivity-store.php b/lib/experimental/interactivity-api/class-wp-interactivity-store.php
deleted file mode 100644
index c53701b14e8aff..00000000000000
--- a/lib/experimental/interactivity-api/class-wp-interactivity-store.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * WP_Interactivity_Store class
- *
- * Manages the initial state of the Interactivity API store in the server and
- * its serialization so it can be restored in the browser upon hydration.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( class_exists( 'WP_Interactivity_Store' ) ) {
-	return;
-}
-
-/**
- * Manages the initial state of the Interactivity API store in the server and
- * its serialization so it can be restored in the browser upon hydration.
- *
- * It's a private class, exposed by other functions, like `wp_store`.
- *
- * @access private
- */
-class WP_Interactivity_Store {
-	/**
-	 * Store.
-	 *
-	 * @var array
-	 */
-	private static $store = array();
-
-	/**
-	 * Get store data.
-	 *
-	 * @return array
-	 */
-	public static function get_data() {
-		return self::$store;
-	}
-
-	/**
-	 * Merge data.
-	 *
-	 * @param array $data The data that will be merged with the existing store.
-	 */
-	public static function merge_data( $data ) {
-		self::$store = array_replace_recursive( self::$store, $data );
-	}
-
-	/**
-	 * Reset the store data.
-	 */
-	public static function reset() {
-		self::$store = array();
-	}
-
-	/**
-	 * Render the store data.
-	 */
-	public static function render() {
-		if ( empty( self::$store ) ) {
-			return;
-		}
-		echo sprintf(
-			'<script id="wp-interactivity-initial-state" type="application/json">%s</script>',
-			wp_json_encode( self::$store, JSON_HEX_TAG | JSON_HEX_AMP )
-		);
-	}
-}
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
deleted file mode 100644
index 064fc8ea62cbb2..00000000000000
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Functions and hooks to process the server side rendering of the Interactivity
- * API directives.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Mark if the block is a root block. Checks that there is already a root block
- * in order not to mark template-parts or synced patterns as root blocks, where
- * the parent is null.
- *
- * @param array $parsed_block The parsed block.
- * @param array $source_block The source block.
- * @param array $parent_block The parent block.
- *
- * @return array The parsed block.
- */
-function gutenberg_interactivity_mark_root_blocks( $parsed_block, $source_block, $parent_block ) {
-	if ( ! isset( $parent_block ) && ! WP_Directive_Processor::has_root_block() ) {
-		WP_Directive_Processor::mark_root_block( $parsed_block );
-	}
-
-	return $parsed_block;
-}
-add_filter( 'render_block_data', 'gutenberg_interactivity_mark_root_blocks', 10, 3 );
-
-/**
- * Process directives in each root block.
- *
- * @param string $block_content The block content.
- * @param array  $block         The full block.
- *
- * @return string Filtered block content.
- */
-function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
-	if ( WP_Directive_Processor::is_marked_as_root_block( $block ) ) {
-		WP_Directive_Processor::unmark_root_block();
-		$directives = array(
-			'data-wp-bind'    => 'gutenberg_interactivity_process_wp_bind',
-			'data-wp-context' => 'gutenberg_interactivity_process_wp_context',
-			'data-wp-class'   => 'gutenberg_interactivity_process_wp_class',
-			'data-wp-style'   => 'gutenberg_interactivity_process_wp_style',
-			'data-wp-text'    => 'gutenberg_interactivity_process_wp_text',
-		);
-
-		$tags = new WP_Directive_Processor( $block_content );
-		$tags = $tags->process_rendered_html( $tags, 'data-wp-', $directives );
-		return $tags->get_updated_html();
-
-	}
-
-	return $block_content;
-}
-add_filter( 'render_block', 'gutenberg_process_directives_in_root_blocks', 10, 2 );
-
-
-/**
- * Resolve the reference using the store and the context from the provided path.
- *
- * @param string $path Path.
- * @param array  $context Context data.
- * @return mixed
- */
-function gutenberg_interactivity_evaluate_reference( $path, array $context = array() ) {
-	$store = array_merge(
-		WP_Interactivity_Store::get_data(),
-		array( 'context' => $context )
-	);
-
-	/*
-	 * Check first if the directive path is preceded by a negator operator (!),
-	 * indicating that the value obtained from the Interactivity Store (or the
-	 * passed context) using the subsequent path should be negated.
-	 */
-	$should_negate_value = '!' === $path[0];
-
-	$path          = $should_negate_value ? substr( $path, 1 ) : $path;
-	$path_segments = explode( '.', $path );
-	$current       = $store;
-	foreach ( $path_segments as $p ) {
-		if ( isset( $current[ $p ] ) ) {
-			$current = $current[ $p ];
-		} else {
-			return null;
-		}
-	}
-
-	/*
-	 * Check if $current is an anonymous function or an arrow function, and if
-	 * so, call it passing the store. Other types of callables are ignored on
-	 * purpose, as arbitrary strings or arrays could be wrongly evaluated as
-	 * "callables".
-	 *
-	 * E.g., "file" is an string and a "callable" (the "file" function exists).
-	 */
-	if ( $current instanceof Closure ) {
-		$current = call_user_func( $current, $store );
-	}
-
-	// Return the opposite if it has a negator operator (!).
-	return $should_negate_value ? ! $current : $current;
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-bind.php b/lib/experimental/interactivity-api/directives/wp-bind.php
deleted file mode 100644
index 54be4a9faeb7d2..00000000000000
--- a/lib/experimental/interactivity-api/directives/wp-bind.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Process the wp-bind directive attribute.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Process wp-bind directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- */
-function gutenberg_interactivity_process_wp_bind( $tags, $context ) {
-	if ( $tags->is_tag_closer() ) {
-		return;
-	}
-
-	$prefixed_attributes = $tags->get_attribute_names_with_prefix( 'data-wp-bind--' );
-
-	foreach ( $prefixed_attributes as $attr ) {
-		list( , $bound_attr ) = WP_Directive_Processor::parse_attribute_name( $attr );
-		if ( empty( $bound_attr ) ) {
-			continue;
-		}
-
-		$expr  = $tags->get_attribute( $attr );
-		$value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
-		$tags->set_attribute( $bound_attr, $value );
-	}
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-class.php b/lib/experimental/interactivity-api/directives/wp-class.php
deleted file mode 100644
index 741cc75b42c60e..00000000000000
--- a/lib/experimental/interactivity-api/directives/wp-class.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Process wp-class directive attribute.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Process wp-class directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- */
-function gutenberg_interactivity_process_wp_class( $tags, $context ) {
-	if ( $tags->is_tag_closer() ) {
-		return;
-	}
-
-	$prefixed_attributes = $tags->get_attribute_names_with_prefix( 'data-wp-class--' );
-
-	foreach ( $prefixed_attributes as $attr ) {
-		list( , $class_name ) = WP_Directive_Processor::parse_attribute_name( $attr );
-		if ( empty( $class_name ) ) {
-			continue;
-		}
-
-		$expr      = $tags->get_attribute( $attr );
-		$add_class = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
-		if ( $add_class ) {
-			$tags->add_class( $class_name );
-		} else {
-			$tags->remove_class( $class_name );
-		}
-	}
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-context.php b/lib/experimental/interactivity-api/directives/wp-context.php
deleted file mode 100644
index 7d92b0ac7b0c67..00000000000000
--- a/lib/experimental/interactivity-api/directives/wp-context.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Process wp-context directive attribute.
- *
- * @package wp-directives
- */
-
-/**
- * Process wp-context directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- */
-function gutenberg_interactivity_process_wp_context( $tags, $context ) {
-	if ( $tags->is_tag_closer() ) {
-		$context->rewind_context();
-		return;
-	}
-
-	$value = $tags->get_attribute( 'data-wp-context' );
-
-	$new_context = json_decode(
-		is_string( $value ) && ! empty( $value ) ? $value : '{}',
-		true
-	);
-
-	$context->set_context( $new_context ?? array() );
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-style.php b/lib/experimental/interactivity-api/directives/wp-style.php
deleted file mode 100644
index 9c37f9082c2c0b..00000000000000
--- a/lib/experimental/interactivity-api/directives/wp-style.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Process wp-style directive attribute.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Process wp-style directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- */
-function gutenberg_interactivity_process_wp_style( $tags, $context ) {
-	if ( $tags->is_tag_closer() ) {
-		return;
-	}
-
-	$prefixed_attributes = $tags->get_attribute_names_with_prefix( 'data-wp-style--' );
-
-	foreach ( $prefixed_attributes as $attr ) {
-		list( , $style_name ) = WP_Directive_Processor::parse_attribute_name( $attr );
-		if ( empty( $style_name ) ) {
-			continue;
-		}
-
-		$expr        = $tags->get_attribute( $attr );
-		$style_value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
-		if ( $style_value ) {
-			$style_attr = $tags->get_attribute( 'style' );
-			$style_attr = gutenberg_interactivity_set_style( $style_attr, $style_name, $style_value );
-			$tags->set_attribute( 'style', $style_attr );
-		} else {
-			// TODO: Do we want to unset styles if they're null?
-		}
-	}
-}
-
-/**
- * Set style.
- *
- * @param string $style Existing style to amend.
- * @param string $name  Style property name.
- * @param string $value Style property value.
- * @return string Amended styles.
- */
-function gutenberg_interactivity_set_style( $style, $name, $value ) {
-	$style_assignments = explode( ';', $style );
-	$modified          = false;
-	foreach ( $style_assignments as $style_assignment ) {
-		list( $style_name ) = explode( ':', $style_assignment );
-		if ( trim( $style_name ) === $name ) {
-			// TODO: Retain surrounding whitespace from $style_value, if any.
-			$style_assignment = $style_name . ': ' . $value;
-			$modified         = true;
-			break;
-		}
-	}
-
-	if ( ! $modified ) {
-		$new_style_assignment = $name . ': ' . $value;
-		// If the last element is empty or whitespace-only, we insert
-		// the new "key: value" pair before it.
-		if ( empty( trim( end( $style_assignments ) ) ) ) {
-			array_splice( $style_assignments, - 1, 0, $new_style_assignment );
-		} else {
-			array_push( $style_assignments, $new_style_assignment );
-		}
-	}
-	return implode( ';', $style_assignments );
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-text.php b/lib/experimental/interactivity-api/directives/wp-text.php
deleted file mode 100644
index b0cfc98a74e702..00000000000000
--- a/lib/experimental/interactivity-api/directives/wp-text.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Process wp-text directive attribute.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Process wp-text directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- */
-function gutenberg_interactivity_process_wp_text( $tags, $context ) {
-	if ( $tags->is_tag_closer() ) {
-		return;
-	}
-
-	$value = $tags->get_attribute( 'data-wp-text' );
-	if ( null === $value ) {
-		return;
-	}
-
-	$text = gutenberg_interactivity_evaluate_reference( $value, $context->get_context() );
-	$tags->set_inner_html( esc_html( $text ) );
-}
diff --git a/lib/experimental/interactivity-api/modules.php b/lib/experimental/interactivity-api/modules.php
deleted file mode 100644
index 0695da26f4b1b3..00000000000000
--- a/lib/experimental/interactivity-api/modules.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Interactive modules.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Register the `@wordpress/interactivity` module.
- */
-function gutenberg_register_interactivity_module() {
-	gutenberg_register_module(
-		'@wordpress/interactivity',
-		gutenberg_url( '/build/interactivity/index.min.js' ),
-		array(),
-		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-	);
-}
-
-add_action( 'wp_enqueue_scripts', 'gutenberg_register_interactivity_module' );
diff --git a/lib/experimental/interactivity-api/store.php b/lib/experimental/interactivity-api/store.php
deleted file mode 100644
index 05c8b35f780d4f..00000000000000
--- a/lib/experimental/interactivity-api/store.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Functions to expose the store of the WP_Interactivity_Store class.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( ! function_exists( 'wp_store' ) ) {
-	/**
-	 * Merge data with the existing store.
-	 *
-	 * @param array $data Data that will be merged with the existing store.
-	 *
-	 * @return $data The current store data.
-	 */
-	function wp_store( $data = null ) {
-		if ( $data ) {
-			WP_Interactivity_Store::merge_data( $data );
-		}
-		return WP_Interactivity_Store::get_data();
-	}
-}
-
-/**
- * Render the Interactivity API store in the frontend.
- */
-add_action( 'wp_footer', array( 'WP_Interactivity_Store', 'render' ), 8 );
diff --git a/lib/experimental/kses.php b/lib/experimental/kses.php
index d447b10fcbd05d..160704417195b3 100644
--- a/lib/experimental/kses.php
+++ b/lib/experimental/kses.php
@@ -31,7 +31,7 @@ function gutenberg_filter_global_styles_post( $data ) {
 	) {
 		unset( $decoded_data['isGlobalStylesUserThemeJSON'] );
 
-		$data_to_encode = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $decoded_data );
+		$data_to_encode = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $decoded_data, 'custom' );
 
 		$data_to_encode['isGlobalStylesUserThemeJSON'] = true;
 		return wp_slash( wp_json_encode( $data_to_encode ) );
@@ -87,3 +87,17 @@ function allow_filter_in_styles( $allow_css, $css_test_string ) {
 	}
 }
 add_filter( 'safecss_filter_attr_allow_css', 'allow_filter_in_styles', 10, 2 );
+
+/**
+ * Update allowed inline style attributes list.
+ *
+ * @param string[] $attrs Array of allowed CSS attributes.
+ * @return string[] CSS attributes.
+ */
+function gutenberg_safe_grid_attrs( $attrs ) {
+	$attrs[] = 'grid-column';
+	$attrs[] = 'grid-row';
+	$attrs[] = 'container-type';
+	return $attrs;
+}
+add_filter( 'safe_style_css', 'gutenberg_safe_grid_attrs' );
diff --git a/lib/experimental/media/class-gutenberg-rest-attachments-controller.php b/lib/experimental/media/class-gutenberg-rest-attachments-controller.php
new file mode 100644
index 00000000000000..71bf7b7a958351
--- /dev/null
+++ b/lib/experimental/media/class-gutenberg-rest-attachments-controller.php
@@ -0,0 +1,367 @@
+<?php
+/**
+ * Class Gutenberg_REST_Attachments_Controller.
+ *
+ * @package MediaExperiments
+ */
+
+/**
+ * Class Gutenberg_REST_Attachments_Controller.
+ */
+class Gutenberg_REST_Attachments_Controller extends WP_REST_Attachments_Controller {
+	/**
+	 * Registers the routes for attachments.
+	 *
+	 * @see register_rest_route()
+	 */
+	public function register_routes(): void {
+		parent::register_routes();
+
+		$valid_image_sizes = array_keys( wp_get_registered_image_subsizes() );
+
+		// Special case to set 'original_image' in attachment metadata.
+		$valid_image_sizes[] = 'original';
+		// Used for PDF thumbnails.
+		$valid_image_sizes[] = 'full';
+
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<id>[\d]+)/sideload',
+			array(
+				array(
+					'methods'             => WP_REST_Server::CREATABLE,
+					'callback'            => array( $this, 'sideload_item' ),
+					'permission_callback' => array( $this, 'sideload_item_permissions_check' ),
+					'args'                => array(
+						'id'         => array(
+							'description' => __( 'Unique identifier for the attachment.', 'gutenberg' ),
+							'type'        => 'integer',
+						),
+						'image_size' => array(
+							'description' => __( 'Image size.', 'gutenberg' ),
+							'type'        => 'string',
+							'enum'        => $valid_image_sizes,
+							'required'    => true,
+						),
+					),
+				),
+				'allow_batch' => $this->allow_batch,
+				'schema'      => array( $this, 'get_public_item_schema' ),
+			)
+		);
+	}
+
+	/**
+	 * Retrieves an array of endpoint arguments from the item schema for the controller.
+	 *
+	 * @param string $method Optional. HTTP method of the request. The arguments for `CREATABLE` requests are
+	 *                       checked for required values and may fall-back to a given default, this is not done
+	 *                       on `EDITABLE` requests. Default WP_REST_Server::CREATABLE.
+	 * @return array Endpoint arguments.
+	 */
+	public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CREATABLE ) {
+		$args = rest_get_endpoint_args_for_schema( $this->get_item_schema(), $method );
+
+		if ( WP_REST_Server::CREATABLE === $method ) {
+			$args['generate_sub_sizes'] = array(
+				'type'        => 'boolean',
+				'default'     => true,
+				'description' => __( 'Whether to generate image sub sizes.', 'gutenberg' ),
+			);
+			$args['convert_format']     = array(
+				'type'        => 'boolean',
+				'default'     => true,
+				'description' => __( 'Whether to convert image formats.', 'gutenberg' ),
+			);
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Prepares a single attachment output for response.
+	 *
+	 * Ensures 'missing_image_sizes' is set for PDFs and not just images.
+	 *
+	 * @param WP_Post         $item    Attachment object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response Response object.
+	 */
+	public function prepare_item_for_response( $item, $request ): WP_REST_Response {
+		$response = parent::prepare_item_for_response( $item, $request );
+
+		$data = $response->get_data();
+
+		// Handle missing image sizes for PDFs.
+
+		$fields = $this->get_fields_for_response( $request );
+
+		if (
+			rest_is_field_included( 'missing_image_sizes', $fields ) &&
+			empty( $data['missing_image_sizes'] )
+		) {
+			$mime_type = get_post_mime_type( $item );
+
+			if ( 'application/pdf' === $mime_type ) {
+				$metadata = wp_get_attachment_metadata( $item->ID, true );
+
+				if ( ! is_array( $metadata ) ) {
+					$metadata = array();
+				}
+
+				$metadata['sizes'] = $metadata['sizes'] ?? array();
+
+				$fallback_sizes = array(
+					'thumbnail',
+					'medium',
+					'large',
+				);
+
+				// The filter might have been added by ::create_item().
+				remove_filter( 'fallback_intermediate_image_sizes', '__return_empty_array', 100 );
+
+				/** This filter is documented in wp-admin/includes/image.php */
+				$fallback_sizes = apply_filters( 'fallback_intermediate_image_sizes', $fallback_sizes, $metadata ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
+
+				$registered_sizes = wp_get_registered_image_subsizes();
+				$merged_sizes     = array_keys( array_intersect_key( $registered_sizes, array_flip( $fallback_sizes ) ) );
+
+				$missing_image_sizes         = array_diff( $merged_sizes, array_keys( $metadata['sizes'] ) );
+				$data['missing_image_sizes'] = $missing_image_sizes;
+			}
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$links = $response->get_links();
+
+		$response = rest_ensure_response( $data );
+
+		foreach ( $links as $rel => $rel_links ) {
+			foreach ( $rel_links as $link ) {
+				$response->add_link( $rel, $link['href'], $link['attributes'] );
+			}
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Creates a single attachment.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, WP_Error object on failure.
+	 */
+	public function create_item( $request ) {
+		if ( ! $request['generate_sub_sizes'] ) {
+			add_filter( 'intermediate_image_sizes_advanced', '__return_empty_array', 100 );
+			add_filter( 'fallback_intermediate_image_sizes', '__return_empty_array', 100 );
+
+		}
+
+		if ( ! $request['convert_format'] ) {
+			add_filter( 'image_editor_output_format', '__return_empty_array', 100 );
+		}
+
+		$response = parent::create_item( $request );
+
+		remove_filter( 'intermediate_image_sizes_advanced', '__return_empty_array', 100 );
+		remove_filter( 'fallback_intermediate_image_sizes', '__return_empty_array', 100 );
+		remove_filter( 'image_editor_output_format', '__return_empty_array', 100 );
+
+		return $response;
+	}
+
+
+	/**
+	 * Checks if a given request has access to sideload a file.
+	 *
+	 * Sideloading a file for an existing attachment
+	 * requires both update and create permissions.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
+	 */
+	public function sideload_item_permissions_check( $request ) {
+		return $this->edit_media_item_permissions_check( $request );
+	}
+
+	/**
+	 * Filters {@see 'wp_unique_filename'} during sideloads.
+	 *
+	 * {@see wp_unique_filename()} will always add numeric suffix if the name looks like a sub-size to avoid conflicts.
+	 *
+	 * Adding this closure to the filter helps work around this safeguard.
+	 *
+	 * Example: when uploading myphoto.jpeg, WordPress normally creates myphoto-150x150.jpeg,
+	 * and when uploading myphoto-150x150.jpeg, it will be renamed to myphoto-150x150-1.jpeg
+	 * However, here it is desired not to add the suffix in order to maintain the same
+	 * naming convention as if the file was uploaded regularly.
+	 *
+	 * @link https://github.com/WordPress/wordpress-develop/blob/30954f7ac0840cfdad464928021d7f380940c347/src/wp-includes/functions.php#L2576-L2582
+	 *
+	 * @param string        $filename                 Unique file name.
+	 * @param string        $ext                      File extension. Example: ".png".
+	 * @param string        $dir                      Directory path.
+	 * @param callable|null $unique_filename_callback Callback function that generates the unique file name.
+	 * @param string[]      $alt_filenames            Array of alternate file names that were checked for collisions.
+	 * @param int|string    $number                   The highest number that was used to make the file name unique
+	 *                                                or an empty string if unused.
+	 * @return string Filtered file name.
+	 */
+	private function filter_wp_unique_filename( $filename, $ext, $dir, $unique_filename_callback, $alt_filenames, $number, $attachment_filename ) {
+		if ( empty( $number ) || ! $attachment_filename ) {
+			return $filename;
+		}
+
+		$ext       = pathinfo( $filename, PATHINFO_EXTENSION );
+		$name      = pathinfo( $filename, PATHINFO_FILENAME );
+		$orig_name = pathinfo( $attachment_filename, PATHINFO_FILENAME );
+
+		if ( ! $ext || ! $name ) {
+			return $filename;
+		}
+
+		$matches = array();
+		if ( preg_match( '/(.*)(-\d+x\d+)-' . $number . '$/', $name, $matches ) ) {
+			$filename_without_suffix = $matches[1] . $matches[2] . ".$ext";
+			if ( $matches[1] === $orig_name && ! file_exists( "$dir/$filename_without_suffix" ) ) {
+				return $filename_without_suffix;
+			}
+		}
+
+		return $filename;
+	}
+
+	/**
+	 * Side-loads a media file without creating an attachment.
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, WP_Error object on failure.
+	 */
+	public function sideload_item( WP_REST_Request $request ) {
+		$attachment_id = $request['id'];
+
+		$post = $this->get_post( $attachment_id );
+
+		if ( is_wp_error( $post ) ) {
+			return $post;
+		}
+
+		if (
+			! wp_attachment_is_image( $post ) &&
+			! wp_attachment_is( 'pdf', $post )
+		) {
+			return new WP_Error(
+				'rest_post_invalid_id',
+				__( 'Invalid post ID, only images and PDFs can be sideloaded.', 'gutenberg' ),
+				array( 'status' => 400 )
+			);
+		}
+
+		if ( ! $request['convert_format'] ) {
+			// Prevent image conversion as that is done client-side.
+			add_filter( 'image_editor_output_format', '__return_empty_array', 100 );
+		}
+
+		// Get the file via $_FILES or raw data.
+		$files   = $request->get_file_params();
+		$headers = $request->get_headers();
+
+		/*
+		 * wp_unique_filename() will always add numeric suffix if the name looks like a sub-size to avoid conflicts.
+		 * See https://github.com/WordPress/wordpress-develop/blob/30954f7ac0840cfdad464928021d7f380940c347/src/wp-includes/functions.php#L2576-L2582
+		 * With the following filter we can work around this safeguard.
+		 */
+
+		$attachment_filename = get_attached_file( $attachment_id, true );
+		$attachment_filename = $attachment_filename ? wp_basename( $attachment_filename ) : null;
+
+		/**
+		 * @param string        $filename                 Unique file name.
+		 * @param string        $ext                      File extension. Example: ".png".
+		 * @param string        $dir                      Directory path.
+		 * @param callable|null $unique_filename_callback Callback function that generates the unique file name.
+		 * @param string[]      $alt_filenames            Array of alternate file names that were checked for collisions.
+		 * @param int|string    $number                   The highest number that was used to make the file name unique
+		 *                                                or an empty string if unused.
+		 * @return string Filtered file name.
+		 */
+		$filter_filename = function ( $filename, $ext, $dir, $unique_filename_callback, $alt_filenames, $number ) use ( $attachment_filename ) {
+			return $this->filter_wp_unique_filename( $filename, $ext, $dir, $unique_filename_callback, $alt_filenames, $number, $attachment_filename );
+		};
+
+		add_filter( 'wp_unique_filename', $filter_filename, 10, 6 );
+
+		$parent_post = get_post_parent( $attachment_id );
+
+		$time = null;
+
+		// Matches logic in media_handle_upload().
+		// The post date doesn't usually matter for pages, so don't backdate this upload.
+		if ( $parent_post && 'page' !== $parent_post->post_type && substr( $parent_post->post_date, 0, 4 ) > 0 ) {
+			$time = $parent_post->post_date;
+		}
+
+		if ( ! empty( $files ) ) {
+			$file = $this->upload_from_file( $files, $headers, $time );
+		} else {
+			$file = $this->upload_from_data( $request->get_body(), $headers, $time );
+		}
+
+		remove_filter( 'wp_unique_filename', $filter_filename );
+		remove_filter( 'image_editor_output_format', '__return_empty_array', 100 );
+
+		if ( is_wp_error( $file ) ) {
+			return $file;
+		}
+
+		$type = $file['type'];
+		$path = $file['file'];
+
+		$image_size = $request['image_size'];
+
+		$metadata = wp_get_attachment_metadata( $attachment_id, true );
+
+		if ( ! $metadata ) {
+			$metadata = array();
+		}
+
+		if ( 'original' === $image_size ) {
+			$metadata['original_image'] = wp_basename( $path );
+		} else {
+			$metadata['sizes'] = $metadata['sizes'] ?? array();
+
+			$size = wp_getimagesize( $path );
+
+			$metadata['sizes'][ $image_size ] = array(
+				'width'     => $size ? $size[0] : 0,
+				'height'    => $size ? $size[1] : 0,
+				'file'      => wp_basename( $path ),
+				'mime-type' => $type,
+				'filesize'  => wp_filesize( $path ),
+			);
+		}
+
+		wp_update_attachment_metadata( $attachment_id, $metadata );
+
+		$response_request = new WP_REST_Request(
+			WP_REST_Server::READABLE,
+			rest_get_route_for_post( $attachment_id )
+		);
+
+		$response_request['context'] = 'edit';
+
+		if ( isset( $request['_fields'] ) ) {
+			$response_request['_fields'] = $request['_fields'];
+		}
+
+		$response = $this->prepare_item_for_response( get_post( $attachment_id ), $response_request );
+
+		$response->header( 'Location', rest_url( rest_get_route_for_post( $attachment_id ) ) );
+
+		return $response;
+	}
+}
diff --git a/lib/experimental/media/load.php b/lib/experimental/media/load.php
new file mode 100644
index 00000000000000..bcb02accf62a6b
--- /dev/null
+++ b/lib/experimental/media/load.php
@@ -0,0 +1,360 @@
+<?php
+/**
+ * Adds media-related experimental functionality.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Returns a list of all available image sizes.
+ *
+ * @return array Existing image sizes.
+ */
+function gutenberg_get_all_image_sizes(): array {
+	$sizes = wp_get_registered_image_subsizes();
+
+	foreach ( $sizes as $name => &$size ) {
+		$size['height'] = (int) $size['height'];
+		$size['width']  = (int) $size['width'];
+		$size['name']   = $name;
+	}
+	unset( $size );
+
+	return $sizes;
+}
+
+/**
+ * Returns the default output format mapping for the supported image formats.
+ *
+ * @return array<string,string> Map of input formats to output formats.
+ */
+function gutenberg_get_default_image_output_formats() {
+	$input_formats = array(
+		'image/jpeg',
+		'image/png',
+		'image/gif',
+		'image/webp',
+		'image/avif',
+		'image/heic',
+	);
+
+	$output_formats = array();
+
+	foreach ( $input_formats as $mime_type ) {
+		/** This filter is documented in wp-includes/media.php */
+		$output_formats = apply_filters(
+			'image_editor_output_format', // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
+			$output_formats,
+			'',
+			$mime_type
+		);
+	}
+
+	return $output_formats;
+}
+
+/**
+ * Filters the REST API root index data to add custom settings.
+ *
+ * @param WP_REST_Response $response Response data.
+ */
+function gutenberg_media_processing_filter_rest_index( WP_REST_Response $response ) {
+	/** This filter is documented in wp-admin/includes/images.php */
+	$image_size_threshold = (int) apply_filters( 'big_image_size_threshold', 2560, array( 0, 0 ), '', 0 ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
+
+	$default_image_output_formats = gutenberg_get_default_image_output_formats();
+
+	/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
+	$jpeg_interlaced = (bool) apply_filters( 'image_save_progressive', false, 'image/jpeg' ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
+	/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
+	$png_interlaced = (bool) apply_filters( 'image_save_progressive', false, 'image/png' ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
+	/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
+	$gif_interlaced = (bool) apply_filters( 'image_save_progressive', false, 'image/gif' ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
+
+	if ( current_user_can( 'upload_files' ) ) {
+		$response->data['image_sizes']          = gutenberg_get_all_image_sizes();
+		$response->data['image_size_threshold'] = $image_size_threshold;
+		$response->data['image_output_formats'] = (object) $default_image_output_formats;
+		$response->data['jpeg_interlaced']      = $jpeg_interlaced;
+		$response->data['png_interlaced']       = $png_interlaced;
+		$response->data['gif_interlaced']       = $gif_interlaced;
+	}
+
+	return $response;
+}
+
+add_filter( 'rest_index', 'gutenberg_media_processing_filter_rest_index' );
+
+
+/**
+ * Overrides the REST controller for the attachment post type.
+ *
+ * @param array  $args      Array of arguments for registering a post type.
+ *                          See the register_post_type() function for accepted arguments.
+ * @param string $post_type Post type key.
+ */
+function gutenberg_filter_attachment_post_type_args( array $args, string $post_type ): array {
+	if ( 'attachment' === $post_type ) {
+		require_once __DIR__ . '/class-gutenberg-rest-attachments-controller.php';
+
+		$args['rest_controller_class'] = Gutenberg_REST_Attachments_Controller::class;
+	}
+
+	return $args;
+}
+
+add_filter( 'register_post_type_args', 'gutenberg_filter_attachment_post_type_args', 10, 2 );
+
+
+/**
+ * Registers additional REST fields for attachments.
+ */
+function gutenberg_media_processing_register_rest_fields(): void {
+	register_rest_field(
+		'attachment',
+		'filename',
+		array(
+			'schema'       => array(
+				'description' => __( 'Original attachment file name', 'gutenberg' ),
+				'type'        => 'string',
+				'context'     => array( 'view', 'edit' ),
+			),
+			'get_callback' => 'gutenberg_rest_get_attachment_filename',
+		)
+	);
+
+	register_rest_field(
+		'attachment',
+		'filesize',
+		array(
+			'schema'       => array(
+				'description' => __( 'Attachment file size', 'gutenberg' ),
+				'type'        => 'number',
+				'context'     => array( 'view', 'edit' ),
+			),
+			'get_callback' => 'gutenberg_rest_get_attachment_filesize',
+		)
+	);
+}
+
+add_action( 'rest_api_init', 'gutenberg_media_processing_register_rest_fields' );
+
+/**
+ * Returns the attachment's original file name.
+ *
+ * @param array $post Post data.
+ * @return string|null Attachment file name.
+ */
+function gutenberg_rest_get_attachment_filename( array $post ): ?string {
+	$path = wp_get_original_image_path( $post['id'] );
+
+	if ( $path ) {
+		return basename( $path );
+	}
+
+	$path = get_attached_file( $post['id'] );
+
+	if ( $path ) {
+		return basename( $path );
+	}
+
+	return null;
+}
+
+/**
+ * Returns the attachment's file size in bytes.
+ *
+ * @param array $post Post data.
+ * @return int|null Attachment file size.
+ */
+function gutenberg_rest_get_attachment_filesize( array $post ): ?int {
+	$attachment_id = $post['id'];
+
+	$meta = wp_get_attachment_metadata( $attachment_id );
+
+	if ( isset( $meta['filesize'] ) ) {
+		return $meta['filesize'];
+	}
+
+	$original_path = wp_get_original_image_path( $attachment_id );
+	$attached_file = $original_path ? $original_path : get_attached_file( $attachment_id );
+
+	if ( is_string( $attached_file ) && file_exists( $attached_file ) ) {
+		return wp_filesize( $attached_file );
+	}
+
+	return null;
+}
+
+/**
+ * Filters the list of rewrite rules formatted for output to an .htaccess file.
+ *
+ * Adds support for serving wasm-vips locally.
+ *
+ * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.
+ * @return string Filtered rewrite rules.
+ */
+function gutenberg_filter_mod_rewrite_rules( string $rules ): string {
+	$rules .= "\n# BEGIN Gutenberg client-side media processing experiment\n" .
+				"AddType application/wasm wasm\n" .
+				"# END Gutenberg client-side media processing experiment\n";
+
+	return $rules;
+}
+
+add_filter( 'mod_rewrite_rules', 'gutenberg_filter_mod_rewrite_rules' );
+
+/**
+ * Enables cross-origin isolation in the block editor.
+ *
+ * Required for enabling SharedArrayBuffer for WebAssembly-based
+ * media processing in the editor.
+ *
+ * @link https://web.dev/coop-coep/
+ */
+function gutenberg_set_up_cross_origin_isolation() {
+	$screen = get_current_screen();
+
+	if ( ! $screen ) {
+		return;
+	}
+
+	if ( ! $screen->is_block_editor() && 'site-editor' !== $screen->id && ! ( 'widgets' === $screen->id && wp_use_widgets_block_editor() ) ) {
+		return;
+	}
+
+	$user_id = get_current_user_id();
+	if ( ! $user_id ) {
+		return;
+	}
+
+	// Cross-origin isolation is not needed if users can't upload files anyway.
+	if ( ! user_can( $user_id, 'upload_files' ) ) {
+		return;
+	}
+
+	gutenberg_start_cross_origin_isolation_output_buffer();
+}
+
+add_action( 'load-post.php', 'gutenberg_set_up_cross_origin_isolation' );
+add_action( 'load-post-new.php', 'gutenberg_set_up_cross_origin_isolation' );
+add_action( 'load-site-editor.php', 'gutenberg_set_up_cross_origin_isolation' );
+add_action( 'load-widgets.php', 'gutenberg_set_up_cross_origin_isolation' );
+
+/**
+ * Sends headers for cross-origin isolation.
+ *
+ * Uses an output buffer to add crossorigin="anonymous" where needed.
+ *
+ * @link https://web.dev/coop-coep/
+ */
+function gutenberg_start_cross_origin_isolation_output_buffer(): void {
+	global $is_safari;
+
+	$coep = $is_safari ? 'require-corp' : 'credentialless';
+
+	ob_start(
+		function ( string $output ) use ( $coep ): string {
+			header( 'Cross-Origin-Opener-Policy: same-origin' );
+			header( "Cross-Origin-Embedder-Policy: $coep" );
+
+			return gutenberg_add_crossorigin_attributes( $output );
+		}
+	);
+}
+
+/**
+ * Adds crossorigin="anonymous" to relevant tags in the given HTML string.
+ *
+ * @param string $html HTML input.
+ *
+ * @return string Modified HTML.
+ */
+function gutenberg_add_crossorigin_attributes( string $html ): string {
+	$site_url = site_url();
+
+	$processor = new WP_HTML_Tag_Processor( $html );
+
+	// See https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/crossorigin.
+	$tags = array(
+		'AUDIO'  => 'src',
+		'IMG'    => 'src',
+		'LINK'   => 'href',
+		'SCRIPT' => 'src',
+		'VIDEO'  => 'src',
+		'SOURCE' => 'src',
+	);
+
+	$tag_names = array_keys( $tags );
+
+	while ( $processor->next_tag() ) {
+		$tag = $processor->get_tag();
+
+		if ( ! in_array( $tag, $tag_names, true ) ) {
+			continue;
+		}
+
+		if ( 'AUDIO' === $tag || 'VIDEO' === $tag ) {
+			$processor->set_bookmark( 'audio-video-parent' );
+		}
+
+		$processor->set_bookmark( 'resume' );
+
+		$seeked = false;
+
+		$crossorigin = $processor->get_attribute( 'crossorigin' );
+
+		$url = $processor->get_attribute( $tags[ $tag ] );
+
+		if ( is_string( $url ) && ! str_starts_with( $url, $site_url ) && ! str_starts_with( $url, '/' ) && ! is_string( $crossorigin ) ) {
+			if ( 'SOURCE' === $tag ) {
+				$seeked = $processor->seek( 'audio-video-parent' );
+
+				if ( $seeked ) {
+					$processor->set_attribute( 'crossorigin', 'anonymous' );
+				}
+			} else {
+				$processor->set_attribute( 'crossorigin', 'anonymous' );
+			}
+
+			if ( $seeked ) {
+				$processor->seek( 'resume' );
+				$processor->release_bookmark( 'audio-video-parent' );
+			}
+		}
+	}
+
+	return $processor->get_updated_html();
+}
+
+/**
+ * Overrides templates from wp_print_media_templates with custom ones.
+ *
+ * Adds `crossorigin` attribute to all tags that
+ * could have assets loaded from a different domain.
+ */
+function gutenberg_override_media_templates(): void {
+	remove_action( 'admin_footer', 'wp_print_media_templates' );
+	add_action(
+		'admin_footer',
+		static function (): void {
+			ob_start();
+			wp_print_media_templates();
+			$html = (string) ob_get_clean();
+
+			$tags = array(
+				'audio',
+				'img',
+				'video',
+			);
+
+			foreach ( $tags as $tag ) {
+				$html = (string) str_replace( "<$tag", "<$tag crossorigin=\"anonymous\"", $html );
+			}
+
+			echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		}
+	);
+}
+
+add_action( 'wp_enqueue_media', 'gutenberg_override_media_templates' );
diff --git a/lib/experimental/modules/class-gutenberg-modules.php b/lib/experimental/modules/class-gutenberg-modules.php
deleted file mode 100644
index 5f847fa8c897ad..00000000000000
--- a/lib/experimental/modules/class-gutenberg-modules.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Modules API: Gutenberg_Modules class.
- *
- * Native support for ES Modules and Import Maps.
- *
- * @package Gutenberg
- * @subpackage Modules
- */
-
-/**
- * Gutenberg_Modules class
- */
-class Gutenberg_Modules {
-	/**
-	 * An array of registered modules, keyed by module identifier.
-	 *
-	 * @var array
-	 */
-	private static $registered = array();
-
-	/**
-	 * An array of queued modules.
-	 *
-	 * @var string[]
-	 */
-	private static $enqueued = array();
-
-	/**
-	 * Registers the module if no module with that module identifier already
-	 * exists.
-	 *
-	 * @param string           $module_identifier The identifier of the module. Should be unique. It will be used in the final import map.
-	 * @param string           $src               Full URL of the module, or path of the script relative to the WordPress root directory.
-	 * @param array            $dependencies      Optional. An array of module identifiers of the static and dynamic dependencies of this module. It can be an indexed array, in which case all the dependencies are static, or it can be an associative array, in which case it has to contain the keys `static` and `dynamic`.
-	 * @param string|bool|null $version           Optional. String specifying module version number. It is added to the URL as a query string for cache busting purposes. If SCRIPT_DEBUG is true, a timestamp is used. If it is set to false, a version number is automatically added equal to current installed WordPress version. If set to null, no version is added.
-	 */
-	public static function register( $module_identifier, $src, $dependencies = array(), $version = false ) {
-		// Register the module if it's not already registered.
-		if ( ! isset( self::$registered[ $module_identifier ] ) ) {
-			$deps = array(
-				'static'  => isset( $dependencies['static'] ) || isset( $dependencies['dynamic'] ) ? $dependencies['static'] ?? array() : $dependencies,
-				'dynamic' => isset( $dependencies['dynamic'] ) ? $dependencies['dynamic'] : array(),
-			);
-
-			self::$registered[ $module_identifier ] = array(
-				'src'          => $src,
-				'version'      => $version,
-				'dependencies' => $deps,
-			);
-		}
-	}
-
-	/**
-	 * Enqueues a module in the page.
-	 *
-	 * @param string $module_identifier The identifier of the module.
-	 */
-	public static function enqueue( $module_identifier ) {
-		// Add the module to the queue if it's not already there.
-		if ( ! in_array( $module_identifier, self::$enqueued, true ) ) {
-			self::$enqueued[] = $module_identifier;
-		}
-	}
-
-	/**
-	 * Returns the import map array.
-	 *
-	 * @return array Associative array with 'imports' key mapping to an array of module identifiers and their respective source strings.
-	 */
-	public static function get_import_map() {
-		$imports = array();
-		foreach ( self::get_dependencies( self::$enqueued, array( 'static', 'dynamic' ) ) as $module_identifier => $module ) {
-			$imports[ $module_identifier ] = $module['src'] . self::get_version_query_string( $module['version'] );
-		}
-		return array( 'imports' => $imports );
-	}
-
-	/**
-	 * Prints the import map.
-	 */
-	public static function print_import_map() {
-		$import_map = self::get_import_map();
-		if ( ! empty( $import_map['imports'] ) ) {
-			echo '<script type="importmap">' . wp_json_encode( self::get_import_map(), JSON_HEX_TAG | JSON_HEX_AMP ) . '</script>';
-		}
-	}
-
-	/**
-	 * Prints all the enqueued modules using <script type="module">.
-	 */
-	public static function print_enqueued_modules() {
-		foreach ( self::$enqueued as $module_identifier ) {
-			if ( isset( self::$registered[ $module_identifier ] ) ) {
-				$module = self::$registered[ $module_identifier ];
-				wp_print_script_tag(
-					array(
-						'type' => 'module',
-						'src'  => $module['src'] . self::get_version_query_string( $module['version'] ),
-						'id'   => $module_identifier,
-					)
-				);
-			}
-		}
-	}
-
-	/**
-	 * Prints the link tag with rel="modulepreload" for all the static
-	 * dependencies of the enqueued modules.
-	 */
-	public static function print_module_preloads() {
-		foreach ( self::get_dependencies( self::$enqueued, array( 'static' ) ) as $dependency_identifier => $module ) {
-				echo '<link rel="modulepreload" href="' . $module['src'] . self::get_version_query_string( $module['version'] ) . '" id="' . $dependency_identifier . '">';
-		}
-	}
-
-	/**
-	 * Prints the necessary script to load import map polyfill for browsers that
-	 * do not support import maps.
-	 *
-	 * TODO: Replace the polyfill with a simpler version that only provides
-	 * support for import maps and load it only when the browser doesn't support
-	 * import maps (https://github.com/guybedford/es-module-shims/issues/371).
-	 */
-	public static function print_import_map_polyfill() {
-		$import_map = self::get_import_map();
-		if ( ! empty( $import_map['imports'] ) ) {
-			wp_print_script_tag(
-				array(
-					'src'   => gutenberg_url( '/build/modules/importmap-polyfill.min.js' ),
-					'defer' => true,
-				)
-			);
-		}
-	}
-
-	/**
-	 * Gets the module's version. It either returns a timestamp (if SCRIPT_DEBUG
-	 * is true), the explicit version of the module if it is set and not false, or
-	 * an empty string if none of the above conditions are met.
-	 *
-	 * @param array $version The version of the module.
-	 * @return string A string presenting the version.
-	 */
-	private static function get_version_query_string( $version ) {
-		if ( SCRIPT_DEBUG ) {
-			return '?ver=' . time();
-		} elseif ( false === $version ) {
-			return '?ver=' . get_bloginfo( 'version' );
-		} elseif ( null !== $version ) {
-			return '?ver=' . $version;
-		}
-		return '';
-	}
-
-	/**
-	 * Returns all unique static and/or dynamic dependencies for the received modules. It's
-	 * recursive, so it will also get the static or dynamic dependencies of the dependencies.
-	 *
-	 * @param array $module_identifiers The identifiers of the modules to get dependencies for.
-	 * @param array $types              The type of dependencies to retrieve. It can be `static`, `dynamic` or both.
-	 * @return array The array containing the unique dependencies of the modules.
-	 */
-	private static function get_dependencies( $module_identifiers, $types = array( 'static', 'dynamic' ) ) {
-		return array_reduce(
-			$module_identifiers,
-			function ( $dependency_modules, $module_identifier ) use ( $types ) {
-				if ( ! isset( self::$registered[ $module_identifier ] ) ) {
-					return $dependency_modules;
-				}
-
-				$dependencies = array();
-				foreach ( $types as $type ) {
-					$dependencies = array_merge( $dependencies, self::$registered[ $module_identifier ]['dependencies'][ $type ] );
-				}
-				$dependencies       = array_unique( $dependencies );
-				$dependency_modules = array_intersect_key( self::$registered, array_flip( $dependencies ) );
-
-				return array_merge( $dependency_modules, $dependency_modules, self::get_dependencies( $dependencies, $types ) );
-			},
-			array()
-		);
-	}
-}
-
-/**
- * Registers a JavaScript module. It will be added to the import map.
- *
- * @param string           $module_identifier The identifier of the module. Should be unique. It will be used in the final import map.
- * @param string           $src               Full URL of the module, or path of the script relative to the WordPress root directory.
- * @param array            $dependencies      Optional. An array of module identifiers of the static and dynamic dependencies of this module. It can be an indexed array, in which case all the dependencies are static, or it can be an associative array, in which case it has to contain the keys `static` and `dynamic`.
- * @param string|bool|null $version           Optional. String specifying module version number. It is added to the URL as a query string for cache busting purposes. If SCRIPT_DEBUG is true, a timestamp is used. If it is set to false, a version number is automatically added equal to current installed WordPress version. If set to null, no version is added.
- */
-function gutenberg_register_module( $module_identifier, $src, $dependencies = array(), $version = false ) {
-	Gutenberg_Modules::register( $module_identifier, $src, $dependencies, $version );
-}
-
-/**
- * Enqueues a JavaScript module. It will be added to both the import map and a
- * script tag with the "module" type.
- *
- * @param string $module_identifier The identifier of the module. Should be unique. It will be used in the final import map.
- */
-function gutenberg_enqueue_module( $module_identifier ) {
-	Gutenberg_Modules::enqueue( $module_identifier );
-}
-
-// Prints the import map in the head tag.
-add_action( 'wp_head', array( 'Gutenberg_Modules', 'print_import_map' ) );
-
-// Prints the enqueued modules in the head tag.
-add_action( 'wp_head', array( 'Gutenberg_Modules', 'print_enqueued_modules' ) );
-
-// Prints the preloaded modules in the head tag.
-add_action( 'wp_head', array( 'Gutenberg_Modules', 'print_module_preloads' ) );
-
-// Prints the script that loads the import map polyfill in the footer.
-add_action( 'wp_footer', array( 'Gutenberg_Modules', 'print_import_map_polyfill' ), 11 );
diff --git a/lib/experimental/posts/load.php b/lib/experimental/posts/load.php
new file mode 100644
index 00000000000000..7321392b11a25d
--- /dev/null
+++ b/lib/experimental/posts/load.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Bootstraps the new posts dashboard page.
+ *
+ * @package Gutenberg
+ */
+
+add_action( 'admin_menu', 'gutenberg_replace_posts_dashboard' );
+
+if ( isset( $_GET['page'] ) && 'gutenberg-posts-dashboard' === $_GET['page'] ) {
+	// Default to is-fullscreen-mode to avoid jumps in the UI.
+	add_filter(
+		'admin_body_class',
+		static function ( $classes ) {
+			return "$classes is-fullscreen-mode";
+		}
+	);
+}
+
+/**
+ * Renders the new posts dashboard page.
+ */
+function gutenberg_posts_dashboard() {
+	$block_editor_context = new WP_Block_Editor_Context( array( 'name' => 'core/edit-site' ) );
+	$custom_settings      = array(
+		'siteUrl'        => site_url(),
+		'styles'         => get_block_editor_theme_styles(),
+		'supportsLayout' => wp_theme_has_theme_json(),
+	);
+
+	$editor_settings         = get_block_editor_settings( $custom_settings, $block_editor_context );
+	$active_global_styles_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_global_styles_post_id();
+	$active_theme            = get_stylesheet();
+
+	$preload_paths = array(
+		array( '/wp/v2/media', 'OPTIONS' ),
+		'/wp/v2/types?context=view',
+		'/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
+		'/wp/v2/global-styles/' . $active_global_styles_id,
+		'/wp/v2/global-styles/themes/' . $active_theme,
+	);
+	block_editor_rest_api_preload( $preload_paths, $block_editor_context );
+
+	// Preload server-registered block schemas.
+	wp_add_inline_script(
+		'wp-blocks',
+		'wp.blocks.unstable__bootstrapServerSideBlockDefinitions(' . wp_json_encode( get_block_editor_server_block_settings() ) . ');'
+	);
+
+	/** This action is documented in wp-admin/edit-form-blocks.php */
+	do_action( 'enqueue_block_editor_assets' );
+	wp_register_style(
+		'wp-gutenberg-posts-dashboard',
+		gutenberg_url( 'build/edit-site/posts.css', __FILE__ ),
+		array( 'wp-components', 'wp-commands', 'wp-edit-site' )
+	);
+	wp_enqueue_style( 'wp-gutenberg-posts-dashboard' );
+	wp_add_inline_script(
+		'wp-edit-site',
+		sprintf(
+			'wp.domReady( function() {
+				wp.editSite.initializePostsDashboard( "gutenberg-posts-dashboard", %s );
+			} );',
+			wp_json_encode( $editor_settings )
+		)
+	);
+	wp_enqueue_script( 'wp-edit-site' );
+	wp_enqueue_media();
+	echo '<div id="gutenberg-posts-dashboard"></div>';
+}
+
+/**
+ * Redirects to the new posts dashboard page and adds the postType query arg.
+ */
+function gutenberg_add_post_type_arg() {
+	global $pagenow;
+	if ( 'admin.php' === $pagenow && isset( $_GET['page'] ) && 'gutenberg-posts-dashboard' === $_GET['page'] && empty( $_GET['postType'] ) ) {
+		wp_redirect( admin_url( '/admin.php?page=gutenberg-posts-dashboard&postType=post' ) );
+		exit;
+	}
+}
+add_action( 'admin_init', 'gutenberg_add_post_type_arg' );
+
+/**
+ * Replaces the default posts menu item with the new posts dashboard.
+ */
+function gutenberg_replace_posts_dashboard() {
+	$gutenberg_experiments = get_option( 'gutenberg-experiments' );
+	if ( ! $gutenberg_experiments || ! array_key_exists( 'gutenberg-new-posts-dashboard', $gutenberg_experiments ) || ! $gutenberg_experiments['gutenberg-new-posts-dashboard'] ) {
+		return;
+	}
+	$ptype_obj = get_post_type_object( 'post' );
+	add_submenu_page(
+		'gutenberg',
+		$ptype_obj->labels->name,
+		$ptype_obj->labels->name,
+		'edit_posts',
+		'gutenberg-posts-dashboard',
+		'gutenberg_posts_dashboard'
+	);
+}
diff --git a/lib/experimental/rest-api.php b/lib/experimental/rest-api.php
index 7c6a9bf74d7395..6bb2947f889147 100644
--- a/lib/experimental/rest-api.php
+++ b/lib/experimental/rest-api.php
@@ -10,15 +10,6 @@
 	die( 'Silence is golden.' );
 }
 
-/**
- * Registers the customizer nonces REST API routes.
- */
-function gutenberg_register_rest_customizer_nonces() {
-	$customizer_nonces = new WP_Rest_Customizer_Nonces();
-	$customizer_nonces->register_routes();
-}
-add_action( 'rest_api_init', 'gutenberg_register_rest_customizer_nonces' );
-
 /**
  * Registers the Block editor settings REST API routes.
  */
@@ -101,25 +92,3 @@ function gutenberg_auto_draft_get_sample_permalink( $permalink, $id, $title, $na
 	return $permalink;
 }
 add_filter( 'get_sample_permalink', 'gutenberg_auto_draft_get_sample_permalink', 10, 5 );
-
-if ( ! function_exists( 'wp_api_template_revision_args' ) ) {
-	/**
-	 * Hook in to the template and template part post types and decorate
-	 * the rest endpoint with the revision count.
-	 *
-	 * When merging to core, this can be removed once Gutenberg_REST_Template_Revision_Count is
-	 * merged with WP_REST_Template_Controller.
-	 *
-	 * @param array  $args Current registered post type args.
-	 * @param string $post_type Name of post type.
-	 *
-	 * @return array
-	 */
-	function wp_api_template_revision_args( $args, $post_type ) {
-		if ( 'wp_template' === $post_type || 'wp_template_part' === $post_type ) {
-			$args['rest_controller_class'] = 'Gutenberg_REST_Template_Revision_Count';
-		}
-		return $args;
-	}
-}
-add_filter( 'register_post_type_args', 'wp_api_template_revision_args', 10, 2 );
diff --git a/lib/experimental/script-modules.php b/lib/experimental/script-modules.php
new file mode 100644
index 00000000000000..5a14e1418ed6de
--- /dev/null
+++ b/lib/experimental/script-modules.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Add module fields from block metadata to WP_Block_Type settings.
+ *
+ * This filter allows us to register modules from block metadata and attach additional fields to
+ * WP_Block_Type instances.
+ *
+ * @param array $settings Array of determined settings for registering a block type.
+ * @param array $metadata Metadata provided for registering a block type.
+ */
+function gutenberg_filter_block_type_metadata_settings_register_view_module( $settings, $metadata = null ) {
+	$module_fields = array(
+		// @todo remove viewModule support in Gutenberg >= 17.8 (replaced by viewScriptModule).
+		'viewModule' => 'view_script_module_ids',
+	);
+	foreach ( $module_fields as $metadata_field_name => $settings_field_name ) {
+		if ( ! empty( $settings[ $metadata_field_name ] ) ) {
+			$metadata[ $metadata_field_name ] = $settings[ $metadata_field_name ];
+		}
+		if ( ! empty( $metadata[ $metadata_field_name ] ) ) {
+			$modules           = $metadata[ $metadata_field_name ];
+			$processed_modules = array();
+			if ( is_array( $modules ) ) {
+				for ( $index = 0; $index < count( $modules ); $index++ ) {
+					$processed_modules[] = gutenberg_register_block_module_id(
+						$metadata,
+						$metadata_field_name,
+						$index
+					);
+				}
+			} else {
+				$processed_modules[] = gutenberg_register_block_module_id(
+					$metadata,
+					$metadata_field_name
+				);
+			}
+			$settings[ $settings_field_name ] = $processed_modules;
+		}
+	}
+
+	return $settings;
+}
+
+add_filter( 'block_type_metadata_settings', 'gutenberg_filter_block_type_metadata_settings_register_view_module', 20, 2 );
+
+/**
+ * Finds a module ID for the selected block metadata field. It detects
+ * when a path to file was provided and finds a corresponding asset file
+ * with details necessary to register the module under an automatically
+ * generated module ID.
+ *
+ * This is analogous to the `register_block_script_handle` in WordPress Core.
+ *
+ * @param array  $metadata   Block metadata.
+ * @param string $field_name Field name to pick from metadata.
+ * @param int    $index      Optional. Index of the script to register when multiple items passed.
+ *                           Default 0.
+ * @return string Module ID.
+ */
+function gutenberg_register_block_module_id( $metadata, $field_name, $index = 0 ) {
+	if ( empty( $metadata[ $field_name ] ) ) {
+		return false;
+	}
+
+	$module_id = $metadata[ $field_name ];
+	if ( is_array( $module_id ) ) {
+		if ( empty( $module_id[ $index ] ) ) {
+			return false;
+		}
+		$module_id = $module_id[ $index ];
+	}
+
+	$module_path = remove_block_asset_path_prefix( $module_id );
+	if ( $module_id === $module_path ) {
+		return $module_id;
+	}
+
+	$path                  = dirname( $metadata['file'] );
+	$module_asset_raw_path = $path . '/' . substr_replace( $module_path, '.asset.php', - strlen( '.js' ) );
+	$module_id             = gutenberg_generate_block_asset_module_id( $metadata['name'], $field_name, $index );
+	$module_asset_path     = wp_normalize_path( realpath( $module_asset_raw_path ) );
+
+	$module_path_norm    = wp_normalize_path( realpath( $path . '/' . $module_path ) );
+	$module_uri          = get_block_asset_url( $module_path_norm );
+	$module_asset        = ! empty( $module_asset_path ) ? require $module_asset_path : array();
+	$module_dependencies = isset( $module_asset['dependencies'] ) ? $module_asset['dependencies'] : array();
+
+	wp_register_script_module(
+		$module_id,
+		$module_uri,
+		$module_dependencies,
+		isset( $module_asset['version'] ) ? $module_asset['version'] : false
+	);
+
+	return $module_id;
+}
+
+/**
+ * Generates the module ID for an asset based on the name of the block
+ * and the field name provided.
+ *
+ * This is analogous to the `generate_block_asset_handle` in WordPress Core.
+ *
+ * @param string $block_name Name of the block.
+ * @param string $field_name Name of the metadata field.
+ * @param int    $index      Optional. Index of the asset when multiple items passed.
+ *                           Default 0.
+ * @return string Generated module ID for the block's field.
+ */
+function gutenberg_generate_block_asset_module_id( $block_name, $field_name, $index = 0 ) {
+	if ( str_starts_with( $block_name, 'core/' ) ) {
+		$asset_handle = str_replace( 'core/', 'wp-block-', $block_name );
+		if ( str_starts_with( $field_name, 'editor' ) ) {
+			$asset_handle .= '-editor';
+		}
+		if ( str_starts_with( $field_name, 'view' ) ) {
+			$asset_handle .= '-view';
+		}
+		if ( $index > 0 ) {
+			$asset_handle .= '-' . ( $index + 1 );
+		}
+		return $asset_handle;
+	}
+
+	$field_mappings = array(
+		// @todo remove viewModule support in Gutenberg >= 17.8 (replaced by viewScriptModule).
+		'viewModule'       => 'view-script-module',
+		'viewScriptModule' => 'view-script-module',
+	);
+	$asset_handle   = str_replace( '/', '-', $block_name ) .
+		'-' . $field_mappings[ $field_name ];
+	if ( $index > 0 ) {
+		$asset_handle .= '-' . ( $index + 1 );
+	}
+	return $asset_handle;
+}
+
+/**
+ * Registers a REST field for block types to provide view module IDs.
+ *
+ * Adds the `view_script_module_ids` and `view_module_ids` (deprecated) field to block type objects in the REST API, which
+ * lists the script module IDs for any script modules associated with the
+ * block's viewScriptModule key.
+ */
+function gutenberg_register_view_module_ids_rest_field() {
+	// @todo remove view_module_ids support in Gutenberg >= 17.8 (replaced by view_script_module_ids).
+	register_rest_field(
+		'block-type',
+		'view_module_ids',
+		array(
+			'get_callback' => function ( $item ) {
+				$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $item['name'] );
+				if ( isset( $block_type->view_script_module_ids ) ) {
+					return $block_type->view_script_module_ids;
+				}
+				return array();
+			},
+		)
+	);
+}
+
+add_action( 'rest_api_init', 'gutenberg_register_view_module_ids_rest_field' );
+
+/**
+ * Registers the module if no module with that module identifier has already
+ * been registered.
+ *
+ * @deprecated 17.6.0 gutenberg_register_module is deprecated. Please use wp_register_script_module instead.
+ *
+ * @param string            $module_identifier The identifier of the module. Should be unique. It will be used in the final import map.
+ * @param string            $src               Full URL of the module, or path of the script relative to the WordPress root directory.
+ * @param array             $dependencies      Optional. An array of module identifiers of the dependencies of this module. The dependencies can be strings or arrays. If they are arrays, they need an `id` key with the module identifier, and can contain an `import` key with either `static` or `dynamic`. By default, dependencies that don't contain an import are considered static.
+ * @param string|false|null $version           Optional. String specifying module version number. Defaults to false. It is added to the URL as a query string for cache busting purposes. If $version is set to false, the version number is the currently installed WordPress version. If $version is set to null, no version is added.
+ */
+function gutenberg_register_module( $module_identifier, $src = '', $dependencies = array(), $version = false ) {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_register_script_module' );
+	wp_script_modules()->register( $module_identifier, $src, $dependencies, $version );
+}
+
+/**
+ * Marks the module to be enqueued in the page.
+ *
+ * @deprecated 17.6.0 gutenberg_enqueue_module is deprecated. Please use wp_enqueue_script_module instead.
+ *
+ * @param string $module_identifier The identifier of the module.
+ */
+function gutenberg_enqueue_module( $module_identifier ) {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_enqueue_script_module' );
+	wp_script_modules()->enqueue( $module_identifier );
+}
+
+/**
+ * Unmarks the module so it is not longer enqueued in the page.
+ *
+ * @deprecated 17.6.0 gutenberg_dequeue_module is deprecated. Please use wp_dequeue_script_module instead.
+ *
+ * @param string $module_identifier The identifier of the module.
+ */
+function gutenberg_dequeue_module( $module_identifier ) {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_dequeue_script_module' );
+	wp_script_modules()->dequeue( $module_identifier );
+}
diff --git a/lib/experiments-page.php b/lib/experiments-page.php
index b77a69b692ff1f..946b68283a3e0b 100644
--- a/lib/experiments-page.php
+++ b/lib/experiments-page.php
@@ -45,7 +45,7 @@ function gutenberg_initialize_experiments_settings() {
 
 	add_settings_field(
 		'gutenberg-sync-collaboration',
-		__( 'Live Collaboration and offline persistence ', 'gutenberg' ),
+		__( 'Live Collaboration and offline persistence', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
@@ -56,43 +56,44 @@ function gutenberg_initialize_experiments_settings() {
 	);
 
 	add_settings_field(
-		'gutenberg-zoomed-out-view',
-		__( 'Zoomed out view ', 'gutenberg' ),
+		'gutenberg-custom-dataviews',
+		__( 'Custom dataviews', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Test a new zoomed out view on the site editor (Warning: The new feature is not ready. You may experience UX issues that are being addressed)', 'gutenberg' ),
-			'id'    => 'gutenberg-zoomed-out-view',
+			'label' => __( 'Test the custom dataviews in the pages page.', 'gutenberg' ),
+			'id'    => 'gutenberg-custom-dataviews',
 		)
 	);
 
 	add_settings_field(
-		'gutenberg-dataviews',
-		__( 'New admin views', 'gutenberg' ),
+		'gutenberg-color-randomizer',
+		__( 'Color randomizer ', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Test the new views for different entities like pages.', 'gutenberg' ),
-			'id'    => 'gutenberg-dataviews',
+			'label' => __( 'Test the Global Styles color randomizer; a utility that lets you mix the current color palette pseudo-randomly.', 'gutenberg' ),
+			'id'    => 'gutenberg-color-randomizer',
 		)
 	);
 
 	add_settings_field(
-		'gutenberg-color-randomizer',
-		__( 'Color randomizer ', 'gutenberg' ),
+		'gutenberg-block-experiments',
+		__( 'Experimental blocks', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Test the Global Styles color randomizer; a utility that lets you mix the current color palette pseudo-randomly.', 'gutenberg' ),
-			'id'    => 'gutenberg-color-randomizer',
+			'label' => __( 'Enable experimental blocks.<p class="description">(Warning: these blocks may have significant changes during development that cause validation errors and display issues.)</p>', 'gutenberg' ),
+			'id'    => 'gutenberg-block-experiments',
 		)
 	);
+
 	add_settings_field(
 		'gutenberg-form-blocks',
-		__( 'Form and input blocks ', 'gutenberg' ),
+		__( 'Form and input blocks', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
@@ -103,14 +104,14 @@ function gutenberg_initialize_experiments_settings() {
 	);
 
 	add_settings_field(
-		'gutenberg-group-grid-variation',
-		__( 'Grid variation for Group block ', 'gutenberg' ),
+		'gutenberg-grid-interactivity',
+		__( 'Grid interactivity', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Test the Grid layout type as a new variation of Group block.', 'gutenberg' ),
-			'id'    => 'gutenberg-group-grid-variation',
+			'label' => __( 'Test enhancements to the Grid block that let you move and resize items in the editor canvas.', 'gutenberg' ),
+			'id'    => 'gutenberg-grid-interactivity',
 		)
 	);
 
@@ -127,26 +128,62 @@ function gutenberg_initialize_experiments_settings() {
 	);
 
 	add_settings_field(
-		'gutenberg-custom-fields',
-		__( 'Connections', 'gutenberg' ),
+		'gutenberg-full-page-client-side-navigation',
+		__( 'Enable full page client-side navigation', 'gutenberg' ),
+		'gutenberg_display_experiment_field',
+		'gutenberg-experiments',
+		'gutenberg_experiments_section',
+		array(
+			'label' => __( 'Enable full page client-side navigation using the Interactivity API', 'gutenberg' ),
+			'id'    => 'gutenberg-full-page-client-side-navigation',
+		)
+	);
+
+	add_settings_field(
+		'gutenberg-new-posts-dashboard',
+		__( 'Redesigned posts dashboard', 'gutenberg' ),
+		'gutenberg_display_experiment_field',
+		'gutenberg-experiments',
+		'gutenberg_experiments_section',
+		array(
+			'label' => __( 'Enable a redesigned posts dashboard.', 'gutenberg' ),
+			'id'    => 'gutenberg-new-posts-dashboard',
+		)
+	);
+
+	add_settings_field(
+		'gutenberg-quick-edit-dataviews',
+		__( 'Quick Edit in DataViews', 'gutenberg' ),
+		'gutenberg_display_experiment_field',
+		'gutenberg-experiments',
+		'gutenberg_experiments_section',
+		array(
+			'label' => __( 'Allow access to a quick edit panel in the pages data views.', 'gutenberg' ),
+			'id'    => 'gutenberg-quick-edit-dataviews',
+		)
+	);
+
+	add_settings_field(
+		'gutenberg-block-comment',
+		__( 'Block Comments', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Test Connections', 'gutenberg' ),
-			'id'    => 'gutenberg-connections',
+			'label' => __( 'Enable multi-user commenting on blocks', 'gutenberg' ),
+			'id'    => 'gutenberg-block-comment',
 		)
 	);
 
 	add_settings_field(
-		'gutenberg-pattern-partial-syncing',
-		__( 'Synced patterns partial syncing', 'gutenberg' ),
+		'gutenberg-media-processing',
+		__( 'Client-side media processing', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Test partial syncing of patterns', 'gutenberg' ),
-			'id'    => 'gutenberg-pattern-partial-syncing',
+			'label' => __( 'Enable client-side media processing.', 'gutenberg' ),
+			'id'    => 'gutenberg-media-processing',
 		)
 	);
 
@@ -183,7 +220,7 @@ function gutenberg_display_experiment_field( $args ) {
  */
 function gutenberg_display_experiment_section() {
 	?>
-	<p><?php echo __( "The block editor includes experimental features that are useable while they're in development. Select the ones you'd like to enable. These features are likely to change, so avoid using them in production.", 'gutenberg' ); ?></p>
+	<p><?php echo __( "The block editor includes experimental features that are usable while they're in development. Select the ones you'd like to enable. These features are likely to change, so avoid using them in production.", 'gutenberg' ); ?></p>
 
 	<?php
 }
diff --git a/lib/global-styles-and-settings.php b/lib/global-styles-and-settings.php
index 03c8de10a89251..c4446cf29cf011 100644
--- a/lib/global-styles-and-settings.php
+++ b/lib/global-styles-and-settings.php
@@ -28,6 +28,7 @@ function gutenberg_get_global_stylesheet( $types = array() ) {
 		}
 	}
 	$tree = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
+	$tree = WP_Theme_JSON_Resolver_Gutenberg::resolve_theme_file_uris( $tree );
 
 	$supports_theme_json = wp_theme_has_theme_json();
 	if ( empty( $types ) && ! $supports_theme_json ) {
@@ -72,7 +73,14 @@ function gutenberg_get_global_stylesheet( $types = array() ) {
 		 * @see wp_add_global_styles_for_blocks
 		 */
 		$origins = array( 'default', 'theme', 'custom' );
-		if ( ! $supports_theme_json ) {
+
+		/*
+		* If the theme doesn't have theme.json but supports both appearance tools and color palette,
+		* the 'theme' origin should be included so color palette presets are also output.
+		*/
+		if ( ! $supports_theme_json && ( current_theme_supports( 'appearance-tools' ) || current_theme_supports( 'border' ) ) && current_theme_supports( 'editor-color-palette' ) ) {
+			$origins = array( 'default', 'theme' );
+		} elseif ( ! $supports_theme_json ) {
 			$origins = array( 'default' );
 		}
 		$styles_rest = $tree->get_stylesheet( $types, $origins );
@@ -137,6 +145,7 @@ function gutenberg_get_global_settings( $path = array(), $context = array() ) {
  * @return string
  */
 function gutenberg_get_global_styles_custom_css() {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 18.6.0', 'gutenberg_get_global_stylesheet' );
 	// Ignore cache when `WP_DEBUG` is enabled, so it doesn't interfere with the theme developers workflow.
 	$can_use_cached = ! WP_DEBUG;
 	$cache_key      = 'gutenberg_get_global_custom_css';
@@ -162,16 +171,135 @@ function gutenberg_get_global_styles_custom_css() {
 	return $stylesheet;
 }
 
+/**
+ * Gets the global styles base custom CSS from theme.json.
+ *
+ * @since 6.6.0
+ *
+ * @return string The global base custom CSS.
+ */
+function gutenberg_get_global_styles_base_custom_css() {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 18.6.0', 'gutenberg_get_global_stylesheet' );
+	if ( ! wp_theme_has_theme_json() ) {
+		return '';
+	}
+
+	$can_use_cached = ! WP_DEBUG;
+
+	$cache_key   = 'gutenberg_get_global_styles_base_custom_css';
+	$cache_group = 'theme_json';
+	if ( $can_use_cached ) {
+		$cached = wp_cache_get( $cache_key, $cache_group );
+		if ( $cached ) {
+			return $cached;
+		}
+	}
+
+	$tree       = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
+	$stylesheet = $tree->get_base_custom_css();
+
+	if ( $can_use_cached ) {
+		wp_cache_set( $cache_key, $stylesheet, $cache_group );
+	}
+
+	return $stylesheet;
+}
+
+/**
+ * Adds the global styles per-block custom CSS from theme.json
+ * to the inline style for each block.
+ *
+ * @since 6.6.0
+ *
+ * @global WP_Styles $wp_styles
+ */
+function gutenberg_add_global_styles_block_custom_css() {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 18.6.0', 'gutenberg_add_global_styles_for_blocks' );
+	global $wp_styles;
+
+	if ( ! wp_theme_has_theme_json() || ! wp_should_load_separate_core_block_assets() ) {
+		return;
+	}
+
+	$tree        = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
+	$block_nodes = $tree->get_block_custom_css_nodes();
+
+	foreach ( $block_nodes as $metadata ) {
+		$block_css = $tree->get_block_custom_css( $metadata['css'], $metadata['selector'] );
+
+		$stylesheet_handle = 'global-styles';
+
+		/*
+		 * When `wp_should_load_separate_core_block_assets()` is true, follow a similar
+		 * logic to the one in `gutenberg_add_global_styles_for_blocks` to add the custom
+		 * css only when the block is rendered.
+		 */
+		if ( isset( $metadata['name'] ) ) {
+			if ( str_starts_with( $metadata['name'], 'core/' ) ) {
+				$block_name   = str_replace( 'core/', '', $metadata['name'] );
+				$block_handle = 'wp-block-' . $block_name;
+				if ( in_array( $block_handle, $wp_styles->queue, true ) ) {
+					wp_add_inline_style( $stylesheet_handle, $block_css );
+				}
+			} else {
+				wp_add_inline_style( $stylesheet_handle, $block_css );
+			}
+		}
+	}
+}
+
+
 /**
  * Adds global style rules to the inline style for each block.
  *
+ * @global WP_Styles $wp_styles
+ *
  * @return void
  */
 function gutenberg_add_global_styles_for_blocks() {
+	global $wp_styles;
 	$tree        = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data();
+	$tree        = WP_Theme_JSON_Resolver_Gutenberg::resolve_theme_file_uris( $tree );
 	$block_nodes = $tree->get_styles_block_nodes();
+
+	$can_use_cached = ! wp_is_development_mode( 'theme' );
+	$update_cache   = false;
+
+	if ( $can_use_cached ) {
+		// Hash the merged WP_Theme_JSON data to bust cache on settings or styles change.
+		$cache_hash = md5( wp_json_encode( $tree->get_raw_data() ) );
+		$cache_key  = 'wp_styles_for_blocks';
+		$cached     = get_transient( $cache_key );
+
+		// Reset the cached data if there is no value or if the hash has changed.
+		if ( ! is_array( $cached ) || $cached['hash'] !== $cache_hash ) {
+			$cached = array(
+				'hash'   => $cache_hash,
+				'blocks' => array(),
+			);
+
+			// Update the cache if the hash has changed.
+			$update_cache = true;
+		}
+	}
+
 	foreach ( $block_nodes as $metadata ) {
-		$block_css = $tree->get_styles_for_block( $metadata );
+		if ( $can_use_cached ) {
+			// Use the block name as the key for cached CSS data. Otherwise, use a hash of the metadata.
+			$cache_node_key = isset( $metadata['name'] ) ? $metadata['name'] : md5( wp_json_encode( $metadata ) );
+
+			if ( isset( $cached['blocks'][ $cache_node_key ] ) ) {
+				$block_css = $cached['blocks'][ $cache_node_key ];
+			} else {
+				$block_css                           = $tree->get_styles_for_block( $metadata );
+				$cached['blocks'][ $cache_node_key ] = $block_css;
+
+				// Update the cache if the cache contents have changed.
+				$update_cache = true;
+			}
+		} else {
+			$block_css = $tree->get_styles_for_block( $metadata );
+		}
 
 		if ( ! wp_should_load_separate_core_block_assets() ) {
 			wp_add_inline_style( 'global-styles', $block_css );
@@ -179,41 +307,48 @@ function gutenberg_add_global_styles_for_blocks() {
 		}
 
 		$stylesheet_handle = 'global-styles';
+
+		/*
+		 * When `wp_should_load_separate_core_block_assets()` is true, block styles are
+		 * enqueued for each block on the page in class WP_Block's render function.
+		 * This means there will be a handle in the styles queue for each of those blocks.
+		 * Block-specific global styles should be attached to the global-styles handle, but
+		 * only for blocks on the page, thus we check if the block's handle is in the queue
+		 * before adding the inline style.
+		 * This conditional loading only applies to core blocks.
+		 */
 		if ( isset( $metadata['name'] ) ) {
-			/*
-			 * These block styles are added on block_render.
-			 * This hooks inline CSS to them so that they are loaded conditionally
-			 * based on whether or not the block is used on the page.
-			 */
 			if ( str_starts_with( $metadata['name'], 'core/' ) ) {
-				$block_name        = str_replace( 'core/', '', $metadata['name'] );
-				$stylesheet_handle = 'wp-block-' . $block_name;
+				$block_name   = str_replace( 'core/', '', $metadata['name'] );
+				$block_handle = 'wp-block-' . $block_name;
+				if ( in_array( $block_handle, $wp_styles->queue, true ) ) {
+					wp_add_inline_style( $stylesheet_handle, $block_css );
+				}
+			} else {
+				wp_add_inline_style( $stylesheet_handle, $block_css );
 			}
-			wp_add_inline_style( $stylesheet_handle, $block_css );
 		}
 
 		// The likes of block element styles from theme.json do not have  $metadata['name'] set.
 		if ( ! isset( $metadata['name'] ) && ! empty( $metadata['path'] ) ) {
-			$result = array_values(
-				array_filter(
-					$metadata['path'],
-					static function ( $item ) {
-						if ( strpos( $item, 'core/' ) !== false ) {
-							return true;
-						}
-						return false;
+			$block_name = wp_get_block_name_from_theme_json_path( $metadata['path'] );
+			if ( $block_name ) {
+				if ( str_starts_with( $block_name, 'core/' ) ) {
+					$block_name   = str_replace( 'core/', '', $block_name );
+					$block_handle = 'wp-block-' . $block_name;
+					if ( in_array( $block_handle, $wp_styles->queue, true ) ) {
+						wp_add_inline_style( $stylesheet_handle, $block_css );
 					}
-				)
-			);
-			if ( isset( $result[0] ) ) {
-				if ( str_starts_with( $result[0], 'core/' ) ) {
-					$block_name        = str_replace( 'core/', '', $result[0] );
-					$stylesheet_handle = 'wp-block-' . $block_name;
+				} else {
+					wp_add_inline_style( $stylesheet_handle, $block_css );
 				}
-				wp_add_inline_style( $stylesheet_handle, $block_css );
 			}
 		}
 	}
+
+	if ( $update_cache ) {
+		set_transient( $cache_key, $cached );
+	}
 }
 
 /**
@@ -227,6 +362,7 @@ function _gutenberg_clean_theme_json_caches() {
 	wp_cache_delete( 'gutenberg_get_global_settings_custom', 'theme_json' );
 	wp_cache_delete( 'gutenberg_get_global_settings_theme', 'theme_json' );
 	wp_cache_delete( 'gutenberg_get_global_custom_css', 'theme_json' );
+	wp_cache_delete( 'gutenberg_get_global_styles_base_custom_css', 'theme_json' );
 	WP_Theme_JSON_Resolver_Gutenberg::clean_cached_data();
 }
 add_action( 'start_previewing_theme', '_gutenberg_clean_theme_json_caches' );
diff --git a/lib/init.php b/lib/init.php
index 71b6a276c60f33..13ca26d4b9e83c 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -14,8 +14,8 @@
  */
 function gutenberg_menu() {
 	add_menu_page(
-		'Gutenberg',
-		'Gutenberg',
+		__( 'Gutenberg', 'gutenberg' ),
+		__( 'Gutenberg', 'gutenberg' ),
 		'edit_posts',
 		'gutenberg',
 		'',
@@ -51,7 +51,7 @@ function gutenberg_menu() {
 		'gutenberg',
 		__( 'Experiments Settings', 'gutenberg' ),
 		__( 'Experiments', 'gutenberg' ),
-		'edit_posts',
+		'manage_options',
 		'gutenberg-experiments',
 		'the_gutenberg_experiments'
 	);
diff --git a/lib/interactivity-api.php b/lib/interactivity-api.php
new file mode 100644
index 00000000000000..ff68936f054a7e
--- /dev/null
+++ b/lib/interactivity-api.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Interactivity API functions specific for the Gutenberg editor plugin.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Adds script data to the interactivity-router script module.
+ *
+ * This filter is registered conditionally anticipating a WordPress Core change to add the script module data.
+ * The filter runs on 'after_setup_theme' (when Core registers Interactivity and Script Modules hooks)
+ * to ensure that the conditional registration happens after Core and correctly determine whether
+ * the filter should be added.
+ *
+ * @see https://github.com/WordPress/wordpress-develop/pull/7304
+ */
+function gutenberg_register_interactivity_script_module_data_hooks() {
+	if ( ! has_filter( 'script_module_data_@wordpress/interactivity-router', array( wp_interactivity(), 'filter_script_module_interactivity_router_data' ) ) ) {
+		add_filter(
+			'script_module_data_@wordpress/interactivity-router',
+			function ( $data ) {
+				if ( ! isset( $data['i18n'] ) ) {
+					$data['i18n'] = array();
+				}
+				$data['i18n']['loading'] = __( 'Loading page, please wait.', 'default' );
+				$data['i18n']['loaded']  = __( 'Page Loaded.', 'default' );
+				return $data;
+			}
+		);
+	}
+}
+add_action( 'after_setup_theme', 'gutenberg_register_interactivity_script_module_data_hooks', 20 );
diff --git a/lib/load.php b/lib/load.php
index 9c7618dbfc678b..b91118cbced985 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -35,27 +35,28 @@ function gutenberg_is_experiment_enabled( $name ) {
 		require_once __DIR__ . '/experimental/class-wp-rest-block-editor-settings-controller.php';
 	}
 
-	// WordPress 6.4 compat.
-	require_once __DIR__ . '/compat/wordpress-6.4/class-gutenberg-rest-global-styles-revisions-controller-6-4.php';
-	require_once __DIR__ . '/compat/wordpress-6.4/class-gutenberg-rest-block-patterns-controller.php';
-	require_once __DIR__ . '/compat/wordpress-6.4/rest-api.php';
-	require_once __DIR__ . '/compat/wordpress-6.4/theme-previews.php';
-
-	// WordPress 6.5 compat.
-	require_once __DIR__ . '/compat/wordpress-6.5/class-gutenberg-rest-global-styles-revisions-controller-6-5.php';
-	require_once __DIR__ . '/compat/wordpress-6.5/rest-api.php';
+	// WordPress 6.6 compat.
+	require __DIR__ . '/compat/wordpress-6.6/class-gutenberg-rest-global-styles-revisions-controller-6-6.php';
+	require __DIR__ . '/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php';
+	require __DIR__ . '/compat/wordpress-6.6/rest-api.php';
+
+	// WordPress 6.7 compat.
+	require __DIR__ . '/compat/wordpress-6.7/class-gutenberg-rest-posts-controller-6-7.php';
+	require __DIR__ . '/compat/wordpress-6.7/class-gutenberg-rest-templates-controller-6-7.php';
+	require __DIR__ . '/compat/wordpress-6.7/class-gutenberg-rest-server.php';
+	require __DIR__ . '/compat/wordpress-6.7/rest-api.php';
+
+	// WordPress 6.8 compat.
+	require __DIR__ . '/compat/wordpress-6.8/remove-default-css.php';
+	require __DIR__ . '/compat/wordpress-6.8/block-comments.php';
+	require __DIR__ . '/compat/wordpress-6.8/class-gutenberg-rest-comment-controller-6-8.php';
 
 	// Plugin specific code.
 	require_once __DIR__ . '/class-wp-rest-global-styles-controller-gutenberg.php';
+	require_once __DIR__ . '/class-wp-rest-edit-site-export-controller-gutenberg.php';
 	require_once __DIR__ . '/rest-api.php';
 
-	// Experimental.
-	if ( ! class_exists( 'WP_Rest_Customizer_Nonces' ) ) {
-		require_once __DIR__ . '/experimental/class-wp-rest-customizer-nonces.php';
-	}
-	require_once __DIR__ . '/experimental/class-gutenberg-rest-template-revision-count.php';
 	require_once __DIR__ . '/experimental/rest-api.php';
-
 	require_once __DIR__ . '/experimental/kses-allowed-html.php';
 }
 
@@ -68,38 +69,53 @@ function gutenberg_is_experiment_enabled( $name ) {
 
 // Gutenberg plugin compat.
 require __DIR__ . '/compat/plugin/edit-site-routes-backwards-compat.php';
-require __DIR__ . '/compat/plugin/footnotes.php';
-
-/*
- * There are upstream updates to the Tag Processor that may not appear if Gutenberg is running
- * a version of WordPress newer than 6.3 and older than the latest `trunk`. This file should
- * always be loaded so that Gutenberg code can run the newest version of the Tag Processor.
- */
-require __DIR__ . '/compat/wordpress-6.4/html-api/class-gutenberg-html-tag-processor-6-4.php';
-
-/*
- * The HTML Processor appeared after WordPress 6.3. If Gutenberg is running on a version of
- * WordPress before it was introduced, these verbatim Core files will be missing.
- */
-if ( ! class_exists( 'WP_HTML_Processor' ) ) {
-	require __DIR__ . '/compat/wordpress-6.4/html-api/class-wp-html-active-formatting-elements.php';
-	require __DIR__ . '/compat/wordpress-6.4/html-api/class-wp-html-open-elements.php';
-	require __DIR__ . '/compat/wordpress-6.4/html-api/class-wp-html-processor-state.php';
-	require __DIR__ . '/compat/wordpress-6.4/html-api/class-wp-html-token.php';
-	require __DIR__ . '/compat/wordpress-6.4/html-api/class-wp-html-unsupported-exception.php';
-	require __DIR__ . '/compat/wordpress-6.4/html-api/class-wp-html-processor.php';
-}
-
-// WordPress 6.4 compat.
-require __DIR__ . '/compat/wordpress-6.4/blocks.php';
-require __DIR__ . '/compat/wordpress-6.4/block-hooks.php';
-require __DIR__ . '/compat/wordpress-6.4/block-patterns.php';
-require __DIR__ . '/compat/wordpress-6.4/script-loader.php';
-require __DIR__ . '/compat/wordpress-6.4/kses.php';
-
-// WordPress 6.5 compat.
-require __DIR__ . '/compat/wordpress-6.5/block-patterns.php';
-require __DIR__ . '/compat/wordpress-6.5/class-wp-navigation-block-renderer.php';
+require __DIR__ . '/compat/plugin/fonts.php';
+
+// The Token Map was created during 6.6 in order to support the HTML API. It must be loaded before it.
+require __DIR__ . '/compat/wordpress-6.6/class-gutenberg-token-map-6-6.php';
+require __DIR__ . '/compat/wordpress-6.7/class-gutenberg-token-map-6-7.php';
+
+require __DIR__ . '/compat/wordpress-6.6/html-api/gutenberg-html5-named-character-references-6-6.php';
+require __DIR__ . '/compat/wordpress-6.6/html-api/class-gutenberg-html-decoder-6-6.php';
+require __DIR__ . '/compat/wordpress-6.6/html-api/class-gutenberg-html-tag-processor-6-6.php';
+require __DIR__ . '/compat/wordpress-6.6/html-api/class-gutenberg-html-open-elements-6-6.php';
+require __DIR__ . '/compat/wordpress-6.6/html-api/class-gutenberg-html-stack-event-6-6.php';
+require __DIR__ . '/compat/wordpress-6.6/html-api/class-gutenberg-html-processor-state-6-6.php';
+require __DIR__ . '/compat/wordpress-6.6/html-api/class-gutenberg-html-processor-6-6.php';
+
+// Type annotations were added in 6.7 so every file is updated.
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-active-formatting-elements-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-attribute-token-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-decoder-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-open-elements-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-span-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-stack-event-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-text-replacement-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-token-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-unsupported-exception-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-tag-processor-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-processor-state-6-7.php';
+require __DIR__ . '/compat/wordpress-6.7/html-api/class-gutenberg-html-processor-6-7.php';
+
+// WordPress 6.6 compat.
+require __DIR__ . '/compat/wordpress-6.6/admin-bar.php';
+require __DIR__ . '/compat/wordpress-6.6/blocks.php';
+require __DIR__ . '/compat/wordpress-6.6/block-editor.php';
+require __DIR__ . '/compat/wordpress-6.6/compat.php';
+require __DIR__ . '/compat/wordpress-6.6/resolve-patterns.php';
+require __DIR__ . '/compat/wordpress-6.6/block-bindings/pattern-overrides.php';
+require __DIR__ . '/compat/wordpress-6.6/block-template-utils.php';
+require __DIR__ . '/compat/wordpress-6.6/option.php';
+require __DIR__ . '/compat/wordpress-6.6/post.php';
+
+// WordPress 6.7 compat.
+require __DIR__ . '/compat/wordpress-6.7/block-templates.php';
+require __DIR__ . '/compat/wordpress-6.7/blocks.php';
+require __DIR__ . '/compat/wordpress-6.7/block-bindings.php';
+require __DIR__ . '/compat/wordpress-6.7/script-modules.php';
+require __DIR__ . '/compat/wordpress-6.7/class-wp-block-templates-registry.php';
+require __DIR__ . '/compat/wordpress-6.7/compat.php';
+require __DIR__ . '/compat/wordpress-6.7/post-formats.php';
 
 // Experimental features.
 require __DIR__ . '/experimental/block-editor-settings-mobile.php';
@@ -108,121 +124,46 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/kses.php';
 require __DIR__ . '/experimental/l10n.php';
 require __DIR__ . '/experimental/synchronization.php';
+require __DIR__ . '/experimental/script-modules.php';
+require __DIR__ . '/experimental/posts/load.php';
 
 if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
 	require __DIR__ . '/experimental/disable-tinymce.php';
 }
 
-require __DIR__ . '/experimental/interactivity-api/class-wp-interactivity-store.php';
-require __DIR__ . '/experimental/interactivity-api/store.php';
-require __DIR__ . '/experimental/interactivity-api/modules.php';
-require __DIR__ . '/experimental/interactivity-api/class-wp-directive-processor.php';
-require __DIR__ . '/experimental/interactivity-api/class-wp-directive-context.php';
-require __DIR__ . '/experimental/interactivity-api/directive-processing.php';
-require __DIR__ . '/experimental/interactivity-api/directives/wp-bind.php';
-require __DIR__ . '/experimental/interactivity-api/directives/wp-context.php';
-require __DIR__ . '/experimental/interactivity-api/directives/wp-class.php';
-require __DIR__ . '/experimental/interactivity-api/directives/wp-style.php';
-require __DIR__ . '/experimental/interactivity-api/directives/wp-text.php';
-
-require __DIR__ . '/experimental/modules/class-gutenberg-modules.php';
-
-// Fonts API / Font Face.
-remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler.
-
-/*
- * If the Font Library is available, load the Font Face files, else load the Fonts API.
- * This strategy is temporary until the Font Library is merged. It's used here to allow
- * the Font Face (redesigned Fonts API) to be merged before the Font Library while
- * keeping Fonts API available for sites that are using it.
- */
-if (
-	! defined( 'FONT_LIBRARY_DISABLED' ) || ! FONT_LIBRARY_DISABLED
-) {
-	// Loads the Font Library.
-	if ( ! class_exists( 'WP_Font_Library' ) ) {
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-font-collection.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-library-controller.php';
-		require __DIR__ . '/experimental/fonts/font-library/font-library.php';
-	}
-
-	// Load the Font Face.
-	if ( ! class_exists( 'WP_Font_Face' ) ) {
-		require __DIR__ . '/compat/wordpress-6.4/fonts/font-face/class-wp-font-face.php';
-		require __DIR__ . '/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php';
-	}
-
-	/*
-	 * As _gutenberg_get_iframed_editor_assets_6_4() overrides Core's _wp_get_iframed_editor_assets(),
-	 * load this file to ensure wp_print_font_faces() is invoked to load the styles into the
-	 * iframed editor.
-	 */
-	require __DIR__ . '/compat/wordpress-6.4/fonts/fonts.php';
-
-	// Load the BC Layer to avoid fatal errors of extenders using the Fonts API.
-	// @core-merge: do not merge the BC layer files into WordPress Core.
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php';
-} elseif ( ! class_exists( 'WP_Fonts' ) ) {
-
-	// Disables the Font Library.
-	// @core-merge: this should not go to core.
-	add_action(
-		'enqueue_block_editor_assets',
-		function () {
-			wp_add_inline_script( 'wp-block-editor', 'window.__experimentalDisableFontLibrary = true', 'before' );
-		}
-	);
-
-	// Turns off Font Face hooks in Core.
-	// @since 6.4.0.
-	remove_action( 'wp_head', 'wp_print_font_faces', 50 );
-	remove_action( 'admin_print_styles', 'wp_print_font_faces', 50 );
-
-	// Fonts API files.
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts-provider.php';
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts-utils.php';
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts.php';
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts-provider-local.php';
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts-resolver.php';
-	require __DIR__ . '/experimental/fonts-api/fonts-api.php';
-
-	// BC Layer files, which will not be backported to WP Core.
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-gutenberg-fonts-api-bc-layer.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/webfonts-deprecations.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-webfonts-utils.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-webfonts-provider.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-webfonts-provider-local.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-webfonts.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-web-fonts.php';
-}
+// Load the BC Layer to avoid fatal errors of extenders using the Fonts API.
+// @core-merge: do not merge the BC layer files into WordPress Core.
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-provider.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-utils.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-provider-local.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-resolver.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php';
+require __DIR__ . '/experimental/font-face/bc-layer/webfonts-deprecations.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts-utils.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts-provider.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts-provider-local.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts.php';
+require __DIR__ . '/experimental/font-face/bc-layer/class-wp-web-fonts.php';
 
 // Plugin specific code.
 require __DIR__ . '/script-loader.php';
 require __DIR__ . '/global-styles-and-settings.php';
 require __DIR__ . '/class-wp-theme-json-data-gutenberg.php';
 require __DIR__ . '/class-wp-theme-json-gutenberg.php';
-require __DIR__ . '/class-wp-theme-json-schema-gutenberg.php';
 require __DIR__ . '/class-wp-theme-json-resolver-gutenberg.php';
+require __DIR__ . '/class-wp-theme-json-schema-gutenberg.php';
 require __DIR__ . '/class-wp-duotone-gutenberg.php';
 require __DIR__ . '/blocks.php';
 require __DIR__ . '/block-editor-settings.php';
 require __DIR__ . '/client-assets.php';
 require __DIR__ . '/demo.php';
 require __DIR__ . '/experiments-page.php';
+require __DIR__ . '/interactivity-api.php';
+require __DIR__ . '/block-template-utils.php';
+if ( gutenberg_is_experiment_enabled( 'gutenberg-full-page-client-side-navigation' ) ) {
+	require __DIR__ . '/experimental/full-page-client-side-navigation.php';
+}
 
 // Copied package PHP files.
 if ( is_dir( __DIR__ . '/../build/style-engine' ) ) {
@@ -247,8 +188,12 @@ function () {
 require __DIR__ . '/block-supports/duotone.php';
 require __DIR__ . '/block-supports/shadow.php';
 require __DIR__ . '/block-supports/background.php';
-require __DIR__ . '/block-supports/behaviors.php';
-require __DIR__ . '/block-supports/pattern.php';
+require __DIR__ . '/block-supports/block-style-variations.php';
 
 // Data views.
 require_once __DIR__ . '/experimental/data-views.php';
+
+// Client-side media processing.
+if ( gutenberg_is_experiment_enabled( 'gutenberg-media-processing' ) ) {
+	require_once __DIR__ . '/experimental/media/load.php';
+}
diff --git a/lib/rest-api.php b/lib/rest-api.php
index 04f521d132c461..7570bb19737233 100644
--- a/lib/rest-api.php
+++ b/lib/rest-api.php
@@ -11,10 +11,29 @@
 }
 
 /**
- * Registers the Global Styles REST API routes.
+ * Overrides the REST controller for the `wp_global_styles` post type.
+ *
+ * @param array $args Array of arguments for registering a post type.
+ *                          See the register_post_type() function for accepted arguments.
+ *
+ * @return array Array of arguments for registering a post type.
+ */
+function gutenberg_override_global_styles_endpoint( array $args ): array {
+	$args['rest_controller_class']           = 'WP_REST_Global_Styles_Controller_Gutenberg';
+	$args['revisions_rest_controller_class'] = 'Gutenberg_REST_Global_Styles_Revisions_Controller_6_6';
+	$args['late_route_registration']         = true;
+	$args['show_in_rest']                    = true;
+	$args['rest_base']                       = 'global-styles';
+
+	return $args;
+}
+add_filter( 'register_wp_global_styles_post_type_args', 'gutenberg_override_global_styles_endpoint', 10, 2 );
+
+/**
+ * Registers the Edit Site Export REST API routes.
  */
-function gutenberg_register_global_styles_endpoints() {
-	$global_styles_controller = new WP_REST_Global_Styles_Controller_Gutenberg();
-	$global_styles_controller->register_routes();
+function gutenberg_register_edit_site_export_controller_endpoints() {
+	$edit_site_export_controller = new WP_REST_Edit_Site_Export_Controller_Gutenberg();
+	$edit_site_export_controller->register_routes();
 }
-add_action( 'rest_api_init', 'gutenberg_register_global_styles_endpoints' );
+add_action( 'rest_api_init', 'gutenberg_register_edit_site_export_controller_endpoints' );
diff --git a/lib/script-loader.php b/lib/script-loader.php
index 2b5c7bb08a676f..51346e57b4a73a 100644
--- a/lib/script-loader.php
+++ b/lib/script-loader.php
@@ -43,6 +43,21 @@ function gutenberg_enqueue_global_styles() {
 	add_filter( 'wp_theme_json_get_style_nodes', 'wp_filter_out_block_nodes' );
 
 	$stylesheet = gutenberg_get_global_stylesheet();
+
+	if ( $is_block_theme ) {
+		/*
+		 * Dequeue the Customizer's custom CSS
+		 * and add it before the global styles custom CSS.
+		 */
+		remove_action( 'wp_head', 'wp_custom_css_cb', 101 );
+		// Get the custom CSS from the Customizer and add it to the global stylesheet.
+		$custom_css  = wp_get_custom_css();
+		$stylesheet .= $custom_css;
+
+		// Add the global styles custom CSS at the end.
+		$stylesheet .= gutenberg_get_global_stylesheet( array( 'custom-css' ) );
+	}
+
 	if ( empty( $stylesheet ) ) {
 		return;
 	}
@@ -63,6 +78,7 @@ function gutenberg_enqueue_global_styles() {
  * @since 6.2.0
  */
 function gutenberg_enqueue_global_styles_custom_css() {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 17.8.0', 'gutenberg_enqueue_global_styles' );
 	if ( ! wp_is_block_theme() ) {
 		return;
 	}
@@ -77,8 +93,6 @@ function gutenberg_enqueue_global_styles_custom_css() {
 		wp_add_inline_style( 'global-styles', $custom_css );
 	}
 }
-remove_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles_custom_css' );
-add_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_global_styles_custom_css' );
 
 /**
  * Function that enqueues the CSS Custom Properties coming from theme.json.
diff --git a/lib/theme-i18n.json b/lib/theme-i18n.json
index ea6bf7fe6727e8..e4d14502132cbe 100644
--- a/lib/theme-i18n.json
+++ b/lib/theme-i18n.json
@@ -38,6 +38,13 @@
 				}
 			]
 		},
+		"dimensions": {
+			"aspectRatios": [
+				{
+					"name": "Aspect ratio name"
+				}
+			]
+		},
 		"blocks": {
 			"*": {
 				"typography": {
diff --git a/lib/theme.json b/lib/theme.json
index 671dd50227852b..f638d9722ef67c 100644
--- a/lib/theme.json
+++ b/lib/theme.json
@@ -1,5 +1,6 @@
 {
-	"version": 2,
+	"$schema": "../schemas/json/theme.json",
+	"version": 3,
 	"settings": {
 		"appearanceTools": false,
 		"useRootPaddingAwareAlignments": false,
@@ -189,6 +190,46 @@
 			],
 			"text": true
 		},
+		"dimensions": {
+			"defaultAspectRatios": true,
+			"aspectRatios": [
+				{
+					"name": "Square - 1:1",
+					"slug": "square",
+					"ratio": "1"
+				},
+				{
+					"name": "Standard - 4:3",
+					"slug": "4-3",
+					"ratio": "4/3"
+				},
+				{
+					"name": "Portrait - 3:4",
+					"slug": "3-4",
+					"ratio": "3/4"
+				},
+				{
+					"name": "Classic - 3:2",
+					"slug": "3-2",
+					"ratio": "3/2"
+				},
+				{
+					"name": "Classic Portrait - 2:3",
+					"slug": "2-3",
+					"ratio": "2/3"
+				},
+				{
+					"name": "Wide - 16:9",
+					"slug": "16-9",
+					"ratio": "16/9"
+				},
+				{
+					"name": "Tall - 9:16",
+					"slug": "9-16",
+					"ratio": "9/16"
+				}
+			]
+		},
 		"shadow": {
 			"defaultPresets": true,
 			"presets": [
@@ -224,6 +265,7 @@
 			"margin": false,
 			"padding": false,
 			"customSpacingSize": true,
+			"defaultSpacingSizes": true,
 			"units": [ "px", "em", "rem", "vh", "vw", "%" ],
 			"spacingScale": {
 				"operator": "*",
@@ -235,6 +277,7 @@
 		},
 		"typography": {
 			"customFontSize": true,
+			"defaultFontSizes": true,
 			"dropCap": true,
 			"fontSizes": [
 				{
@@ -262,6 +305,7 @@
 			"fontWeight": true,
 			"letterSpacing": true,
 			"lineHeight": false,
+			"textAlign": true,
 			"textColumns": false,
 			"textDecoration": true,
 			"textTransform": true,
@@ -296,7 +340,12 @@
 					"background": "#32373c"
 				},
 				"spacing": {
-					"padding": "calc(0.667em + 2px) calc(1.333em + 2px)"
+					"padding": {
+						"top": "calc(0.667em + 2px)",
+						"right": "calc(1.333em + 2px)",
+						"bottom": "calc(0.667em + 2px)",
+						"left": "calc(1.333em + 2px)"
+					}
 				},
 				"typography": {
 					"fontSize": "inherit",
@@ -322,6 +371,40 @@
 				"bottom": "0px",
 				"left": "0px"
 			}
+		},
+		"blocks": {
+			"core/button": {
+				"variations": {
+					"outline": {
+						"border": {
+							"width": "2px",
+							"style": "solid",
+							"color": "currentColor"
+						},
+						"color": {
+							"text": "currentColor",
+							"gradient": "transparent none"
+						},
+						"spacing": {
+							"padding": {
+								"top": "0.667em",
+								"right": "1.33em",
+								"bottom": "0.667em",
+								"left": "1.33em"
+							}
+						}
+					}
+				}
+			},
+			"core/site-logo": {
+				"variations": {
+					"rounded": {
+						"border": {
+							"radius": "9999px"
+						}
+					}
+				}
+			}
 		}
 	}
 }
diff --git a/package-lock.json b/package-lock.json
index 5707a537e7e565..a1060b1267af50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,178 +1,84 @@
 {
 	"name": "gutenberg",
-	"version": "17.2.0-rc.1",
-	"lockfileVersion": 2,
+	"version": "19.5.0",
+	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "17.2.0-rc.1",
+			"version": "19.5.0",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
-			"dependencies": {
-				"@wordpress/a11y": "file:packages/a11y",
-				"@wordpress/annotations": "file:packages/annotations",
-				"@wordpress/api-fetch": "file:packages/api-fetch",
-				"@wordpress/autop": "file:packages/autop",
-				"@wordpress/blob": "file:packages/blob",
-				"@wordpress/block-directory": "file:packages/block-directory",
-				"@wordpress/block-editor": "file:packages/block-editor",
-				"@wordpress/block-library": "file:packages/block-library",
-				"@wordpress/block-serialization-default-parser": "file:packages/block-serialization-default-parser",
-				"@wordpress/block-serialization-spec-parser": "file:packages/block-serialization-spec-parser",
-				"@wordpress/blocks": "file:packages/blocks",
-				"@wordpress/commands": "file:packages/commands",
-				"@wordpress/components": "file:packages/components",
-				"@wordpress/compose": "file:packages/compose",
-				"@wordpress/core-commands": "file:packages/core-commands",
-				"@wordpress/core-data": "file:packages/core-data",
-				"@wordpress/customize-widgets": "file:packages/customize-widgets",
-				"@wordpress/data": "file:packages/data",
-				"@wordpress/data-controls": "file:packages/data-controls",
-				"@wordpress/dataviews": "file:packages/dataviews",
-				"@wordpress/date": "file:packages/date",
-				"@wordpress/deprecated": "file:packages/deprecated",
-				"@wordpress/dom": "file:packages/dom",
-				"@wordpress/dom-ready": "file:packages/dom-ready",
-				"@wordpress/edit-post": "file:packages/edit-post",
-				"@wordpress/edit-site": "file:packages/edit-site",
-				"@wordpress/edit-widgets": "file:packages/edit-widgets",
-				"@wordpress/editor": "file:packages/editor",
-				"@wordpress/element": "file:packages/element",
-				"@wordpress/escape-html": "file:packages/escape-html",
-				"@wordpress/format-library": "file:packages/format-library",
-				"@wordpress/hooks": "file:packages/hooks",
-				"@wordpress/html-entities": "file:packages/html-entities",
-				"@wordpress/i18n": "file:packages/i18n",
-				"@wordpress/icons": "file:packages/icons",
-				"@wordpress/interactivity": "file:packages/interactivity",
-				"@wordpress/interface": "file:packages/interface",
-				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
-				"@wordpress/keyboard-shortcuts": "file:packages/keyboard-shortcuts",
-				"@wordpress/keycodes": "file:packages/keycodes",
-				"@wordpress/list-reusable-blocks": "file:packages/list-reusable-blocks",
-				"@wordpress/media-utils": "file:packages/media-utils",
-				"@wordpress/notices": "file:packages/notices",
-				"@wordpress/nux": "file:packages/nux",
-				"@wordpress/patterns": "file:packages/patterns",
-				"@wordpress/plugins": "file:packages/plugins",
-				"@wordpress/preferences": "file:packages/preferences",
-				"@wordpress/preferences-persistence": "file:packages/preferences-persistence",
-				"@wordpress/primitives": "file:packages/primitives",
-				"@wordpress/priority-queue": "file:packages/priority-queue",
-				"@wordpress/private-apis": "file:packages/private-apis",
-				"@wordpress/react-i18n": "file:packages/react-i18n",
-				"@wordpress/react-native-aztec": "file:packages/react-native-aztec",
-				"@wordpress/react-native-bridge": "file:packages/react-native-bridge",
-				"@wordpress/react-native-editor": "file:packages/react-native-editor",
-				"@wordpress/redux-routine": "file:packages/redux-routine",
-				"@wordpress/reusable-blocks": "file:packages/reusable-blocks",
-				"@wordpress/rich-text": "file:packages/rich-text",
-				"@wordpress/router": "file:packages/router",
-				"@wordpress/server-side-render": "file:packages/server-side-render",
-				"@wordpress/shortcode": "file:packages/shortcode",
-				"@wordpress/style-engine": "file:packages/style-engine",
-				"@wordpress/sync": "file:packages/sync",
-				"@wordpress/token-list": "file:packages/token-list",
-				"@wordpress/undo-manager": "file:packages/undo-manager",
-				"@wordpress/url": "file:packages/url",
-				"@wordpress/viewport": "file:packages/viewport",
-				"@wordpress/warning": "file:packages/warning",
-				"@wordpress/widgets": "file:packages/widgets",
-				"@wordpress/wordcount": "file:packages/wordcount",
-				"es-module-shims": "^1.8.2",
-				"wicg-inert": "3.1.2"
-			},
+			"workspaces": [
+				"packages/*"
+			],
 			"devDependencies": {
 				"@actions/core": "1.9.1",
 				"@actions/github": "5.0.0",
-				"@ariakit/test": "^0.3.0",
-				"@babel/core": "7.16.0",
-				"@babel/plugin-proposal-export-namespace-from": "7.18.9",
-				"@babel/plugin-syntax-jsx": "7.16.0",
-				"@babel/runtime-corejs3": "7.16.0",
-				"@babel/traverse": "7.16.0",
-				"@emotion/babel-plugin": "11.3.0",
+				"@apidevtools/json-schema-ref-parser": "11.6.4",
+				"@ariakit/test": "^0.4.2",
+				"@babel/core": "7.25.7",
+				"@babel/plugin-syntax-jsx": "7.25.7",
+				"@babel/runtime-corejs3": "7.25.7",
+				"@babel/traverse": "7.25.7",
+				"@emotion/babel-plugin": "11.11.0",
 				"@emotion/jest": "11.7.1",
 				"@emotion/native": "11.0.0",
+				"@geometricpanda/storybook-addon-badges": "2.0.1",
 				"@octokit/rest": "16.26.0",
 				"@octokit/types": "6.34.0",
-				"@octokit/webhooks-types": "5.6.0",
-				"@playwright/test": "1.39.0",
+				"@octokit/webhooks-types": "5.8.0",
+				"@playwright/test": "1.48.1",
 				"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
-				"@storybook/addon-a11y": "7.2.2",
-				"@storybook/addon-actions": "7.2.2",
-				"@storybook/addon-controls": "7.2.2",
-				"@storybook/addon-docs": "7.2.2",
-				"@storybook/addon-toolbars": "7.2.2",
-				"@storybook/addon-viewport": "7.2.2",
-				"@storybook/react": "7.2.2",
-				"@storybook/react-webpack5": "7.2.2",
-				"@storybook/source-loader": "7.2.2",
-				"@storybook/theming": "7.2.2",
+				"@react-native/babel-preset": "0.73.10",
+				"@react-native/metro-babel-transformer": "0.73.10",
+				"@react-native/metro-config": "0.73.4",
+				"@storybook/addon-a11y": "7.6.15",
+				"@storybook/addon-actions": "7.6.15",
+				"@storybook/addon-controls": "7.6.15",
+				"@storybook/addon-docs": "7.6.15",
+				"@storybook/addon-toolbars": "7.6.15",
+				"@storybook/addon-viewport": "7.6.15",
+				"@storybook/react": "7.6.15",
+				"@storybook/react-webpack5": "7.6.15",
+				"@storybook/source-loader": "7.6.15",
+				"@storybook/theming": "7.6.15",
 				"@testing-library/jest-dom": "5.16.5",
-				"@testing-library/react": "14.0.0",
-				"@testing-library/react-native": "12.1.2",
+				"@testing-library/react": "14.3.0",
+				"@testing-library/react-native": "12.4.3",
 				"@testing-library/user-event": "14.4.3",
-				"@types/eslint": "7.28.0",
-				"@types/estree": "0.0.50",
+				"@types/eslint": "8.56.9",
+				"@types/estree": "1.0.5",
 				"@types/istanbul-lib-report": "3.0.0",
 				"@types/mime": "2.0.3",
 				"@types/npm-package-arg": "6.1.1",
 				"@types/prettier": "2.4.4",
 				"@types/qs": "6.9.7",
-				"@types/react": "18.0.21",
+				"@types/react": "18.3.1",
 				"@types/react-dates": "21.8.3",
-				"@types/react-dom": "18.0.6",
+				"@types/react-dom": "18.3.0",
 				"@types/requestidlecallback": "0.3.4",
 				"@types/semver": "7.3.8",
 				"@types/sprintf-js": "1.1.2",
 				"@types/uuid": "8.3.1",
-				"@wordpress/babel-plugin-import-jsx-pragma": "file:packages/babel-plugin-import-jsx-pragma",
-				"@wordpress/babel-plugin-makepot": "file:packages/babel-plugin-makepot",
-				"@wordpress/babel-preset-default": "file:packages/babel-preset-default",
-				"@wordpress/base-styles": "file:packages/base-styles",
-				"@wordpress/browserslist-config": "file:packages/browserslist-config",
-				"@wordpress/create-block": "file:packages/create-block",
-				"@wordpress/create-block-tutorial-template": "file:packages/create-block-tutorial-template",
-				"@wordpress/dependency-extraction-webpack-plugin": "file:packages/dependency-extraction-webpack-plugin",
-				"@wordpress/docgen": "file:packages/docgen",
-				"@wordpress/e2e-test-utils": "file:packages/e2e-test-utils",
-				"@wordpress/e2e-test-utils-playwright": "file:packages/e2e-test-utils-playwright",
-				"@wordpress/e2e-tests": "file:packages/e2e-tests",
-				"@wordpress/env": "file:packages/env",
-				"@wordpress/eslint-plugin": "file:packages/eslint-plugin",
-				"@wordpress/jest-console": "file:packages/jest-console",
-				"@wordpress/jest-preset-default": "file:packages/jest-preset-default",
-				"@wordpress/jest-puppeteer-axe": "file:packages/jest-puppeteer-axe",
-				"@wordpress/lazy-import": "file:packages/lazy-import",
-				"@wordpress/npm-package-json-lint-config": "file:packages/npm-package-json-lint-config",
-				"@wordpress/postcss-plugins-preset": "file:packages/postcss-plugins-preset",
-				"@wordpress/postcss-themes": "file:packages/postcss-themes",
-				"@wordpress/prettier-config": "file:packages/prettier-config",
-				"@wordpress/project-management-automation": "file:packages/project-management-automation",
-				"@wordpress/readable-js-assets-webpack-plugin": "file:packages/readable-js-assets-webpack-plugin",
-				"@wordpress/report-flaky-tests": "file:packages/report-flaky-tests",
-				"@wordpress/scripts": "file:packages/scripts",
-				"@wordpress/stylelint-config": "file:packages/stylelint-config",
 				"ajv": "8.7.1",
-				"ajv-draft-04": "1.0.0",
 				"appium": "2.0.0",
-				"babel-jest": "29.6.2",
-				"babel-loader": "8.2.3",
+				"babel-jest": "29.7.0",
+				"babel-loader": "9.2.1",
 				"babel-plugin-inline-json-import": "0.3.2",
 				"babel-plugin-react-native-classname-to-style": "1.2.2",
 				"babel-plugin-react-native-platform-specific-extensions": "1.1.1",
 				"babel-plugin-transform-remove-console": "6.9.4",
 				"benchmark": "2.1.4",
-				"browserslist": "4.21.10",
-				"caniuse-lite": "1.0.30001538",
+				"browserslist": "4.24.0",
+				"caniuse-lite": "1.0.30001667",
 				"chalk": "4.1.1",
 				"change-case": "4.1.2",
+				"client-zip": "^2.4.5",
 				"commander": "9.2.0",
 				"concurrently": "3.5.0",
 				"copy-webpack-plugin": "10.2.0",
-				"core-js-builder": "3.31.0",
+				"core-js-builder": "3.38.1",
 				"cross-env": "3.2.4",
 				"css-loader": "6.2.0",
 				"cssnano": "6.0.1",
@@ -200,29 +106,33 @@
 				"jest-junit": "13.0.0",
 				"jest-message-util": "29.6.2",
 				"jest-watch-typeahead": "2.2.2",
+				"json2md": "2.0.1",
 				"lerna": "7.1.4",
-				"lint-staged": "10.0.1",
+				"lint-staged": "10.0.2",
 				"make-dir": "3.0.0",
-				"metro-react-native-babel-preset": "0.73.10",
-				"metro-react-native-babel-transformer": "0.73.10",
 				"mkdirp": "3.0.1",
 				"mock-match-media": "0.4.2",
 				"moment-timezone-data-webpack-plugin": "1.5.1",
 				"nock": "12.0.3",
-				"node-fetch": "2.6.1",
+				"node-fetch": "2.7.0",
 				"node-watch": "0.7.0",
 				"npm-run-all": "4.1.5",
-				"patch-package": "6.2.2",
-				"postcss": "8.4.16",
+				"patch-package": "8.0.0",
+				"postcss": "8.4.38",
+				"postcss-import": "16.1.0",
 				"postcss-loader": "6.2.1",
+				"postcss-local-keyframes": "^0.0.2",
 				"prettier": "npm:wp-prettier@3.0.3",
 				"progress": "2.0.3",
-				"react": "18.2.0",
-				"react-dom": "18.2.0",
-				"react-native": "0.71.11",
+				"puppeteer-core": "23.1.0",
+				"raw-loader": "4.0.2",
+				"react": "18.3.1",
+				"react-docgen-typescript": "2.2.2",
+				"react-dom": "18.3.1",
+				"react-native": "0.73.3",
 				"react-native-url-polyfill": "1.1.2",
 				"react-refresh": "0.14.0",
-				"react-test-renderer": "18.2.0",
+				"react-test-renderer": "18.3.1",
 				"reassure": "0.7.1",
 				"redux": "4.1.2",
 				"resize-observer-polyfill": "1.5.1",
@@ -231,42 +141,32 @@
 				"sass": "1.35.2",
 				"sass-loader": "12.1.0",
 				"semver": "7.5.4",
-				"simple-git": "3.5.0",
+				"simple-git": "3.24.0",
 				"snapshot-diff": "0.10.0",
 				"source-map-loader": "3.0.0",
 				"sprintf-js": "1.1.1",
-				"storybook": "7.2.2",
+				"storybook": "7.6.15",
 				"storybook-source-link": "2.0.9",
 				"strip-json-comments": "5.0.0",
 				"style-loader": "3.2.1",
-				"terser-webpack-plugin": "5.3.9",
-				"typescript": "5.1.6",
-				"uglify-js": "3.13.7",
+				"terser": "5.32.0",
+				"terser-webpack-plugin": "5.3.10",
+				"typescript": "5.5.3",
 				"uuid": "9.0.1",
 				"webdriverio": "8.16.20",
-				"webpack": "5.88.2",
+				"webpack": "5.95.0",
 				"webpack-bundle-analyzer": "4.9.1",
 				"worker-farm": "1.7.0"
 			},
 			"engines": {
-				"node": ">=16.0.0",
-				"npm": ">=8 <9"
-			}
-		},
-		"node_modules/@aashutoshrathi/word-wrap": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-			"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=20.10.0",
+				"npm": ">=10.2.3"
 			}
 		},
 		"node_modules/@actions/core": {
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
 			"integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
-			"dev": true,
 			"dependencies": {
 				"@actions/http-client": "^2.0.1",
 				"uuid": "^8.3.2"
@@ -276,7 +176,6 @@
 			"version": "8.3.2",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
 			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"dev": true,
 			"bin": {
 				"uuid": "dist/bin/uuid"
 			}
@@ -285,7 +184,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.0.tgz",
 			"integrity": "sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==",
-			"dev": true,
 			"dependencies": {
 				"@actions/http-client": "^1.0.11",
 				"@octokit/core": "^3.4.0",
@@ -297,25 +195,26 @@
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
 			"integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
-			"dev": true,
 			"dependencies": {
 				"tunnel": "0.0.6"
 			}
 		},
 		"node_modules/@actions/http-client": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.1.tgz",
-			"integrity": "sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw==",
-			"dev": true,
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
+			"integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
+			"license": "MIT",
 			"dependencies": {
-				"tunnel": "^0.0.6"
+				"tunnel": "^0.0.6",
+				"undici": "^5.25.4"
 			}
 		},
 		"node_modules/@adobe/css-tools": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz",
-			"integrity": "sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==",
-			"dev": true
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz",
+			"integrity": "sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@ampproject/remapping": {
 			"version": "2.2.1",
@@ -329,6 +228,47 @@
 				"node": ">=6.0.0"
 			}
 		},
+		"node_modules/@apidevtools/json-schema-ref-parser": {
+			"version": "11.6.4",
+			"resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-11.6.4.tgz",
+			"integrity": "sha512-9K6xOqeevacvweLGik6LnZCb1fBtCOSIWQs8d096XGeqoLKC33UVMGz9+77Gw44KvbH4pKcQPWo4ZpxkXYj05w==",
+			"dev": true,
+			"dependencies": {
+				"@jsdevtools/ono": "^7.1.3",
+				"@types/json-schema": "^7.0.15",
+				"js-yaml": "^4.1.0"
+			},
+			"engines": {
+				"node": ">= 16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/philsturgeon"
+			}
+		},
+		"node_modules/@apidevtools/json-schema-ref-parser/node_modules/@types/json-schema": {
+			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+			"dev": true
+		},
+		"node_modules/@apidevtools/json-schema-ref-parser/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/@apidevtools/json-schema-ref-parser/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
 		"node_modules/@appium/base-driver": {
 			"version": "9.4.0",
 			"resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.4.0.tgz",
@@ -371,12 +311,12 @@
 			}
 		},
 		"node_modules/@appium/base-driver/node_modules/@appium/schema": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.4.0.tgz",
-			"integrity": "sha512-Wa+N2aXioe7j+7MP0fojsRSVGEiyHv2NsxJP5BgSRMPd65blIBSl1iAsYorQG/r1fmQA+NLPaPMnatHOTI+sqw==",
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.4.2.tgz",
+			"integrity": "sha512-b2tC2sKAS8wnw8V7W7Rm6pXFt8QY4NTWvibprVYi1g8rZLnlmlIwUW0Gl6FhrWTUyK+u4rbF8vVIIBIU8C+i/g==",
 			"dev": true,
 			"dependencies": {
-				"@types/json-schema": "7.0.13",
+				"@types/json-schema": "7.0.15",
 				"json-schema": "0.4.0",
 				"source-map-support": "0.5.21"
 			},
@@ -386,16 +326,16 @@
 			}
 		},
 		"node_modules/@appium/base-driver/node_modules/@appium/types": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/@appium/types/-/types-0.14.0.tgz",
-			"integrity": "sha512-PKiJSyaInSfpFQVjLS2e+e9QFocKvm+vmwOGOC99GAPLgLsMHZdQQNOCRk36VJXFu3U1Dn2+eBuHpWGD+hv9jg==",
+			"version": "0.14.3",
+			"resolved": "https://registry.npmjs.org/@appium/types/-/types-0.14.3.tgz",
+			"integrity": "sha512-zW/fjn6HqvXLQVvWBX0qjYiWpfWKweXQQxUBO6egtiq77PRbDMkpeVAJIF8fvnng7XdaOo4OTdvADaZxpcgKCw==",
 			"dev": true,
 			"dependencies": {
-				"@appium/schema": "^0.4.0",
-				"@appium/tsconfig": "^0.3.2",
-				"@types/express": "4.17.19",
-				"@types/npmlog": "4.1.4",
-				"@types/ws": "8.5.7",
+				"@appium/schema": "^0.4.2",
+				"@appium/tsconfig": "^0.x",
+				"@types/express": "4.17.21",
+				"@types/npmlog": "4.1.6",
+				"@types/ws": "8.5.10",
 				"type-fest": "3.13.1"
 			},
 			"engines": {
@@ -403,6 +343,18 @@
 				"npm": ">=8"
 			}
 		},
+		"node_modules/@appium/base-driver/node_modules/@appium/types/node_modules/@types/express": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+			"integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/body-parser": "*",
+				"@types/express-serve-static-core": "^4.17.33",
+				"@types/qs": "*",
+				"@types/serve-static": "*"
+			}
+		},
 		"node_modules/@appium/base-driver/node_modules/@colors/colors": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
@@ -431,29 +383,27 @@
 			}
 		},
 		"node_modules/@appium/base-driver/node_modules/@types/json-schema": {
-			"version": "7.0.13",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
-			"integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
+			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
 			"dev": true
 		},
-		"node_modules/@appium/base-driver/node_modules/@types/ws": {
-			"version": "8.5.7",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.7.tgz",
-			"integrity": "sha512-6UrLjiDUvn40CMrAubXuIVtj2PEfKDffJS7ychvnPU44j+KVeXmdHHTgqcM/dxLUTHxlXHiFM8Skmb8ozGdTnQ==",
+		"node_modules/@appium/base-driver/node_modules/@types/npmlog": {
+			"version": "4.1.6",
+			"resolved": "https://registry.npmjs.org/@types/npmlog/-/npmlog-4.1.6.tgz",
+			"integrity": "sha512-0l3z16vnlJGl2Mi/rgJFrdwfLZ4jfNYgE6ZShEpjqhHuGTqdEzNles03NpYHwUMVYZa+Tj46UxKIEpE78lQ3DQ==",
 			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
-		"node_modules/@appium/base-driver/node_modules/axios": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-			"integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+		"node_modules/@appium/base-driver/node_modules/@types/ws": {
+			"version": "8.5.10",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+			"integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
 			"dev": true,
 			"dependencies": {
-				"follow-redirects": "^1.15.0",
-				"form-data": "^4.0.0",
-				"proxy-from-env": "^1.1.0"
+				"@types/node": "*"
 			}
 		},
 		"node_modules/@appium/base-driver/node_modules/body-parser": {
@@ -987,12 +937,12 @@
 			}
 		},
 		"node_modules/@appium/support/node_modules/@appium/schema": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.4.0.tgz",
-			"integrity": "sha512-Wa+N2aXioe7j+7MP0fojsRSVGEiyHv2NsxJP5BgSRMPd65blIBSl1iAsYorQG/r1fmQA+NLPaPMnatHOTI+sqw==",
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.4.2.tgz",
+			"integrity": "sha512-b2tC2sKAS8wnw8V7W7Rm6pXFt8QY4NTWvibprVYi1g8rZLnlmlIwUW0Gl6FhrWTUyK+u4rbF8vVIIBIU8C+i/g==",
 			"dev": true,
 			"dependencies": {
-				"@types/json-schema": "7.0.13",
+				"@types/json-schema": "7.0.15",
 				"json-schema": "0.4.0",
 				"source-map-support": "0.5.21"
 			},
@@ -1002,16 +952,16 @@
 			}
 		},
 		"node_modules/@appium/support/node_modules/@appium/types": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/@appium/types/-/types-0.14.0.tgz",
-			"integrity": "sha512-PKiJSyaInSfpFQVjLS2e+e9QFocKvm+vmwOGOC99GAPLgLsMHZdQQNOCRk36VJXFu3U1Dn2+eBuHpWGD+hv9jg==",
+			"version": "0.14.3",
+			"resolved": "https://registry.npmjs.org/@appium/types/-/types-0.14.3.tgz",
+			"integrity": "sha512-zW/fjn6HqvXLQVvWBX0qjYiWpfWKweXQQxUBO6egtiq77PRbDMkpeVAJIF8fvnng7XdaOo4OTdvADaZxpcgKCw==",
 			"dev": true,
 			"dependencies": {
-				"@appium/schema": "^0.4.0",
-				"@appium/tsconfig": "^0.3.2",
-				"@types/express": "4.17.19",
-				"@types/npmlog": "4.1.4",
-				"@types/ws": "8.5.7",
+				"@appium/schema": "^0.4.2",
+				"@appium/tsconfig": "^0.x",
+				"@types/express": "4.17.21",
+				"@types/npmlog": "4.1.6",
+				"@types/ws": "8.5.10",
 				"type-fest": "3.13.1"
 			},
 			"engines": {
@@ -1019,6 +969,15 @@
 				"npm": ">=8"
 			}
 		},
+		"node_modules/@appium/support/node_modules/@appium/types/node_modules/@types/npmlog": {
+			"version": "4.1.6",
+			"resolved": "https://registry.npmjs.org/@types/npmlog/-/npmlog-4.1.6.tgz",
+			"integrity": "sha512-0l3z16vnlJGl2Mi/rgJFrdwfLZ4jfNYgE6ZShEpjqhHuGTqdEzNles03NpYHwUMVYZa+Tj46UxKIEpE78lQ3DQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
 		"node_modules/@appium/support/node_modules/@colors/colors": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
@@ -1029,9 +988,9 @@
 			}
 		},
 		"node_modules/@appium/support/node_modules/@types/express": {
-			"version": "4.17.19",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.19.tgz",
-			"integrity": "sha512-UtOfBtzN9OvpZPPbnnYunfjM7XCI4jyk1NvnFhTVz5krYAnW4o5DCoIekvms+8ApqhB4+9wSge1kBijdfTSmfg==",
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+			"integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
 			"dev": true,
 			"dependencies": {
 				"@types/body-parser": "*",
@@ -1041,9 +1000,9 @@
 			}
 		},
 		"node_modules/@appium/support/node_modules/@types/json-schema": {
-			"version": "7.0.13",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
-			"integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
+			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
 			"dev": true
 		},
 		"node_modules/@appium/support/node_modules/@types/semver": {
@@ -1068,38 +1027,23 @@
 			"dev": true
 		},
 		"node_modules/@appium/support/node_modules/@types/ws": {
-			"version": "8.5.7",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.7.tgz",
-			"integrity": "sha512-6UrLjiDUvn40CMrAubXuIVtj2PEfKDffJS7ychvnPU44j+KVeXmdHHTgqcM/dxLUTHxlXHiFM8Skmb8ozGdTnQ==",
+			"version": "8.5.10",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+			"integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
 			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@appium/support/node_modules/are-we-there-yet": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.1.tgz",
-			"integrity": "sha512-2zuA+jpOYBRgoBCfa+fB87Rk0oGJjDX6pxGzqH6f33NzUhG25Xur6R0u0Z9VVAq8Z5JvQpQI6j6rtonuivC8QA==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz",
+			"integrity": "sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg==",
 			"dev": true,
-			"dependencies": {
-				"delegates": "^1.0.0",
-				"readable-stream": "^4.1.0"
-			},
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/@appium/support/node_modules/axios": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-			"integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
-			"dev": true,
-			"dependencies": {
-				"follow-redirects": "^1.15.0",
-				"form-data": "^4.0.0",
-				"proxy-from-env": "^1.1.0"
-			}
-		},
 		"node_modules/@appium/support/node_modules/bplist-parser": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz",
@@ -1121,59 +1065,6 @@
 				"balanced-match": "^1.0.0"
 			}
 		},
-		"node_modules/@appium/support/node_modules/buffer": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-			"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"dependencies": {
-				"base64-js": "^1.3.1",
-				"ieee754": "^1.2.1"
-			}
-		},
-		"node_modules/@appium/support/node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@appium/support/node_modules/cross-spawn/node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
 		"node_modules/@appium/support/node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -1196,26 +1087,10 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@appium/support/node_modules/foreground-child": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-			"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-			"dev": true,
-			"dependencies": {
-				"cross-spawn": "^7.0.0",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@appium/support/node_modules/gauge": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.1.tgz",
-			"integrity": "sha512-CmykPMJGuNan/3S4kZOpvvPYSNqSHANiWnh9XcMU2pSjtBfF0XzZ2p1bFAxTbnFxyBuPxQYHhzwaoOmUdqzvxQ==",
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.2.tgz",
+			"integrity": "sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ==",
 			"dev": true,
 			"dependencies": {
 				"aproba": "^1.0.3 || ^2.0.0",
@@ -1283,6 +1158,15 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/@appium/support/node_modules/isexe": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+			"integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=16"
+			}
+		},
 		"node_modules/@appium/support/node_modules/locate-path": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -1299,10 +1183,11 @@
 			}
 		},
 		"node_modules/@appium/support/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -1314,10 +1199,11 @@
 			}
 		},
 		"node_modules/@appium/support/node_modules/minipass": {
-			"version": "7.0.4",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-			"integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": ">=16 || 14 >=14.17"
 			}
@@ -1361,15 +1247,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@appium/support/node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/@appium/support/node_modules/pkg-dir": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
@@ -1382,22 +1259,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/@appium/support/node_modules/readable-stream": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz",
-			"integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==",
-			"dev": true,
-			"dependencies": {
-				"abort-controller": "^3.0.0",
-				"buffer": "^6.0.3",
-				"events": "^3.3.0",
-				"process": "^0.11.10",
-				"string_decoder": "^1.3.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
 		"node_modules/@appium/support/node_modules/resolve-from": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -1407,47 +1268,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@appium/support/node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			]
-		},
-		"node_modules/@appium/support/node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@appium/support/node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/@appium/support/node_modules/signal-exit": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
@@ -1460,15 +1280,6 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/@appium/support/node_modules/string_decoder": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-			"dev": true,
-			"dependencies": {
-				"safe-buffer": "~5.2.0"
-			}
-		},
 		"node_modules/@appium/support/node_modules/string-width": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -1541,15 +1352,6 @@
 				"node": "^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/@appium/support/node_modules/which/node_modules/isexe": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-			"integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=16"
-			}
-		},
 		"node_modules/@appium/tsconfig": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/@appium/tsconfig/-/tsconfig-0.3.2.tgz",
@@ -1629,54 +1431,28 @@
 			}
 		},
 		"node_modules/@ariakit/core": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.4.tgz",
-			"integrity": "sha512-mMTWYOs0SvkrBbLPy4IY15E+fgvSbZKg4XzpBwE17meBG+G7wJjnuHq8lNiIAn9VnQBIc/lsXxqH3FCD7hHaUg=="
-		},
-		"node_modules/@ariakit/react": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.3.5.tgz",
-			"integrity": "sha512-x7LfGP0on0lVV1NcDNO8+aEBb64sUI6YYB1akEWXkb4lTiU4uG1sHGc8YhfHVh0cFS1kwpQcqyiNPzyB8OgymA==",
-			"dependencies": {
-				"@ariakit/react-core": "0.3.5"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/ariakit"
-			},
-			"peerDependencies": {
-				"react": "^17.0.0 || ^18.0.0",
-				"react-dom": "^17.0.0 || ^18.0.0"
-			}
-		},
-		"node_modules/@ariakit/react-core": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.3.5.tgz",
-			"integrity": "sha512-TdQmUj7BPJ7QWjpjlpP5M1YbANDQL/voYYvKq1Hele7uoEWk51v2nZNaNXo9DZ4He/bkG99ISDx5Tgkzi5En8Q==",
-			"dependencies": {
-				"@ariakit/core": "0.3.4",
-				"@floating-ui/dom": "^1.0.0",
-				"use-sync-external-store": "^1.2.0"
-			},
-			"peerDependencies": {
-				"react": "^17.0.0 || ^18.0.0",
-				"react-dom": "^17.0.0 || ^18.0.0"
-			}
+			"version": "0.4.9",
+			"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.4.9.tgz",
+			"integrity": "sha512-nV0B/OTK/0iB+P9RC7fudznYZ8eR6rR1F912Zc54e3+wSW5RrRvNOiRxyMrgENidd4R7cCMDw77XJLSBLKgEPQ=="
 		},
 		"node_modules/@ariakit/test": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@ariakit/test/-/test-0.3.0.tgz",
-			"integrity": "sha512-fngAzkzCl9zM4O/tzVaUf7ixWUAk779hjTegr/zcegoxaMS5SmaLhNQ7RU0AGx06LrhJse6GYGy8ZtK58HP/EQ==",
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/@ariakit/test/-/test-0.4.2.tgz",
+			"integrity": "sha512-WXAAiAyTaHV9klntOB81Y+YHyA5iGxy9wXCmjQOfYK5InsuIour+7TVXICUxn2NF0XD6j6OoEJbCVDJ2Y46xEA==",
 			"dev": true,
 			"dependencies": {
-				"@ariakit/core": "0.3.3",
-				"@testing-library/dom": "^8.0.0 || ^9.0.0"
+				"@ariakit/core": "0.4.9",
+				"@testing-library/dom": "^8.0.0 || ^9.0.0 || ^10.0.0"
 			},
 			"peerDependencies": {
-				"@testing-library/react": "^12.0.0 || ^13.0.0 || ^14.0.0",
-				"react": "^17.0.0 || ^18.0.0"
+				"@playwright/test": "^1.27.0",
+				"@testing-library/react": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
+				"react": "^17.0.0 || ^18.0.0 || ^19.0.0"
 			},
 			"peerDependenciesMeta": {
+				"@playwright/test": {
+					"optional": true
+				},
 				"@testing-library/react": {
 					"optional": true
 				},
@@ -1685,12 +1461,6 @@
 				}
 			}
 		},
-		"node_modules/@ariakit/test/node_modules/@ariakit/core": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.3.tgz",
-			"integrity": "sha512-8x77R0aE9O9pheygg+h/z0oU9Wx/Xdlr7nfkl4klGnkJma8/nAhJ2RrchCTQCUef4WMsRnq/doCz8m/sslP6CA==",
-			"dev": true
-		},
 		"node_modules/@aw-web-design/x-default-browser": {
 			"version": "1.4.126",
 			"resolved": "https://registry.npmjs.org/@aw-web-design/x-default-browser/-/x-default-browser-1.4.126.tgz",
@@ -1707,7 +1477,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/@axe-core/puppeteer/-/puppeteer-4.0.0.tgz",
 			"integrity": "sha512-APFc2iRmrmUfqdBUevjsMxJliDudWPwvCU5Pzw2uKZ0sMVtW3rQuElTcfJCHFq8KOZSSO0BPD+lK+pXOx1ta5Q==",
-			"dev": true,
 			"dependencies": {
 				"axe-core": "^4.0.1"
 			},
@@ -1719,69 +1488,48 @@
 			}
 		},
 		"node_modules/@babel/code-frame": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
-			"integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.9.tgz",
+			"integrity": "sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/highlight": "^7.22.10",
-				"chalk": "^2.4.2"
+				"@babel/highlight": "^7.25.9",
+				"picocolors": "^1.0.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/code-frame/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@babel/compat-data": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-			"integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.9.tgz",
+			"integrity": "sha512-yD+hEuJ/+wAJ4Ox2/rpNv5HIuPG82x3ZlQvYVn8iYCprdxzE7P1udpGF1jyjQVBU4dgznN+k2h103vxZ7NdPyw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/core": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz",
-			"integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==",
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.7.tgz",
+			"integrity": "sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/code-frame": "^7.16.0",
-				"@babel/generator": "^7.16.0",
-				"@babel/helper-compilation-targets": "^7.16.0",
-				"@babel/helper-module-transforms": "^7.16.0",
-				"@babel/helpers": "^7.16.0",
-				"@babel/parser": "^7.16.0",
-				"@babel/template": "^7.16.0",
-				"@babel/traverse": "^7.16.0",
-				"@babel/types": "^7.16.0",
-				"convert-source-map": "^1.7.0",
+				"@ampproject/remapping": "^2.2.0",
+				"@babel/code-frame": "^7.25.7",
+				"@babel/generator": "^7.25.7",
+				"@babel/helper-compilation-targets": "^7.25.7",
+				"@babel/helper-module-transforms": "^7.25.7",
+				"@babel/helpers": "^7.25.7",
+				"@babel/parser": "^7.25.7",
+				"@babel/template": "^7.25.7",
+				"@babel/traverse": "^7.25.7",
+				"@babel/types": "^7.25.7",
+				"convert-source-map": "^2.0.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.1.2",
-				"semver": "^6.3.0",
-				"source-map": "^0.5.0"
+				"json5": "^2.2.3",
+				"semver": "^6.3.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1791,6 +1539,11 @@
 				"url": "https://opencollective.com/babel"
 			}
 		},
+		"node_modules/@babel/core/node_modules/convert-source-map": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+		},
 		"node_modules/@babel/core/node_modules/semver": {
 			"version": "6.3.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -1799,99 +1552,82 @@
 				"semver": "bin/semver.js"
 			}
 		},
-		"node_modules/@babel/core/node_modules/source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/@babel/eslint-parser": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.0.tgz",
-			"integrity": "sha512-c+AsYOHjI+FgCa+ifLd8sDXp4U4mjkfFgL9NdQWhuA731kAUJs0WdJIXET4A14EJAR9Jv9FFF/MzPWJfV9Oirw==",
-			"dev": true,
+		"node_modules/@babel/generator": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.9.tgz",
+			"integrity": "sha512-omlUGkr5EaoIJrhLf9CJ0TvjBRpd9+AXRG//0GEQ9THSo8wPiTlbpy1/Ow8ZTrbXpjd9FHXfbFQx32I04ht0FA==",
+			"license": "MIT",
 			"dependencies": {
-				"eslint-scope": "^5.1.1",
-				"eslint-visitor-keys": "^2.1.0",
-				"semver": "^6.3.0"
+				"@babel/types": "^7.25.9",
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"jsesc": "^3.0.2"
 			},
 			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": ">=7.11.0",
-				"eslint": "^7.5.0 || ^8.0.0"
+				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/eslint-parser/node_modules/eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-			"dev": true,
+		"node_modules/@babel/helper-annotate-as-pure": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+			"integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+			"license": "MIT",
 			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
-				"node": ">=8.0.0"
-			}
-		},
-		"node_modules/@babel/eslint-parser/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
+				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/generator": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-			"integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
+		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz",
+			"integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.22.10",
-				"@jridgewell/gen-mapping": "^0.3.2",
-				"@jridgewell/trace-mapping": "^0.3.17",
-				"jsesc": "^2.5.1"
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helper-annotate-as-pure": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-			"integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
-			"integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.22.10"
-			},
+		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
 			"engines": {
-				"node": ">=6.9.0"
+				"node": ">=4"
 			}
 		},
 		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-			"integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+			"integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-validator-option": "^7.22.5",
-				"browserslist": "^4.21.9",
+				"@babel/compat-data": "^7.25.9",
+				"@babel/helper-validator-option": "^7.25.9",
+				"browserslist": "^4.24.0",
 				"lru-cache": "^5.1.1",
 				"semver": "^6.3.1"
 			},
@@ -1921,18 +1657,17 @@
 			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
 		},
 		"node_modules/@babel/helper-create-class-features-plugin": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz",
-			"integrity": "sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+			"integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-member-expression-to-functions": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-member-expression-to-functions": "^7.25.9",
+				"@babel/helper-optimise-call-expression": "^7.25.9",
+				"@babel/helper-replace-supers": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+				"@babel/traverse": "^7.25.9",
 				"semver": "^6.3.1"
 			},
 			"engines": {
@@ -1942,6 +1677,33 @@
 				"@babel/core": "^7.0.0"
 			}
 		},
+		"node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-create-class-features-plugin/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
 			"version": "6.3.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -1951,12 +1713,13 @@
 			}
 		},
 		"node_modules/@babel/helper-create-regexp-features-plugin": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
-			"integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz",
+			"integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"regexpu-core": "^5.3.1",
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"regexpu-core": "^6.1.1",
 				"semver": "^6.3.1"
 			},
 			"engines": {
@@ -1975,94 +1738,119 @@
 			}
 		},
 		"node_modules/@babel/helper-define-polyfill-provider": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz",
-			"integrity": "sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==",
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+			"integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-compilation-targets": "^7.13.0",
-				"@babel/helper-module-imports": "^7.12.13",
-				"@babel/helper-plugin-utils": "^7.13.0",
-				"@babel/traverse": "^7.13.0",
+				"@babel/helper-compilation-targets": "^7.22.6",
+				"@babel/helper-plugin-utils": "^7.22.5",
 				"debug": "^4.1.1",
 				"lodash.debounce": "^4.0.8",
-				"resolve": "^1.14.2",
-				"semver": "^6.1.2"
+				"resolve": "^1.14.2"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.4.0-0"
-			}
-		},
-		"node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/@babel/helper-environment-visitor": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-			"integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+			"version": "7.22.20",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+			"integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helper-function-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-			"integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+		"node_modules/@babel/helper-member-expression-to-functions": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+			"integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/template": "^7.22.5",
-				"@babel/types": "^7.22.5"
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helper-hoist-variables": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-			"integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+		"node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helper-member-expression-to-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-			"integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+		"node_modules/@babel/helper-member-expression-to-functions/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/helper-module-imports": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+			"integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helper-module-imports": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-			"integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+		"node_modules/@babel/helper-module-imports/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/helper-module-imports/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-			"integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.9.tgz",
+			"integrity": "sha512-TvLZY/F3+GvdRYFZFyxMvnsKi+4oJdgZzU3BoGN9Uc2d9C6zfNwJcKKhjqLAhK8i46mv93jsO74fDh3ih6rpHA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-simple-access": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/helper-validator-identifier": "^7.22.5"
+				"@babel/helper-module-imports": "^7.25.9",
+				"@babel/helper-simple-access": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2071,33 +1859,63 @@
 				"@babel/core": "^7.0.0"
 			}
 		},
+		"node_modules/@babel/helper-module-transforms/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-transforms/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/helper-optimise-call-expression": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-			"integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+			"integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-plugin-utils": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-			"integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+			"integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-remap-async-to-generator": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
-			"integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+			"integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-wrap-function": "^7.22.9"
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-wrap-function": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2106,14 +1924,42 @@
 				"@babel/core": "^7.0.0"
 			}
 		},
+		"node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-remap-async-to-generator/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/helper-replace-supers": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
-			"integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+			"integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-member-expression-to-functions": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5"
+				"@babel/helper-member-expression-to-functions": "^7.25.9",
+				"@babel/helper-optimise-call-expression": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2122,125 +1968,204 @@
 				"@babel/core": "^7.0.0"
 			}
 		},
+		"node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-replace-supers/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/helper-simple-access": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-			"integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
+			"integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-simple-access/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/helper-simple-access/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-			"integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+			"integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helper-split-export-declaration": {
-			"version": "7.22.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-			"integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+		"node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/helper-string-parser": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-			"integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-			"integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-option": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-			"integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+			"integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-wrap-function": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
-			"integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
-			"dependencies": {
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/template": "^7.22.5",
-				"@babel/types": "^7.22.10"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helpers": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
-			"integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+			"integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10"
+				"@babel/template": "^7.25.9",
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helpers/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
+		"node_modules/@babel/helper-wrap-function/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
 				"globals": "^11.1.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helpers/node_modules/globals": {
+		"node_modules/@babel/helper-wrap-function/node_modules/globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
 			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
+		"node_modules/@babel/helpers": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz",
+			"integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/template": "^7.25.7",
+				"@babel/types": "^7.25.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
 		"node_modules/@babel/highlight": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-			"integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.9.tgz",
+			"integrity": "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.22.5",
+				"@babel/helper-validator-identifier": "^7.25.9",
 				"chalk": "^2.4.2",
-				"js-tokens": "^4.0.0"
+				"js-tokens": "^4.0.0",
+				"picocolors": "^1.0.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2250,6 +2175,7 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"license": "MIT",
 			"dependencies": {
 				"color-convert": "^1.9.0"
 			},
@@ -2261,6 +2187,7 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"license": "MIT",
 			"dependencies": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -2271,9 +2198,13 @@
 			}
 		},
 		"node_modules/@babel/parser": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
-			"integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.9.tgz",
+			"integrity": "sha512-aI3jjAAO1fh7vY/pBGsn1i9LDbRP43+asrRlkPuTXW5yHXtd1NgTEMudbBoDDxrf1daEEfPJqR+JBMakzrR4Dg==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.25.9"
+			},
 			"bin": {
 				"parser": "bin/babel-parser.js"
 			},
@@ -2281,13 +2212,71 @@
 				"node": ">=6.0.0"
 			}
 		},
+		"node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+			"integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+			"integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
 		"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-			"integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+			"integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2297,14 +2286,14 @@
 			}
 		},
 		"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-			"integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+			"integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/plugin-transform-optional-chaining": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+				"@babel/plugin-transform-optional-chaining": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2313,13 +2302,58 @@
 				"@babel/core": "^7.13.0"
 			}
 		},
+		"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+			"integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz",
-			"integrity": "sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
+			"integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/helper-remap-async-to-generator": "^7.16.0",
+				"@babel/helper-environment-visitor": "^7.18.9",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-remap-async-to-generator": "^7.18.9",
 				"@babel/plugin-syntax-async-generators": "^7.8.4"
 			},
 			"engines": {
@@ -2330,12 +2364,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-proposal-class-properties": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz",
-			"integrity": "sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A==",
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+			"integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.16.0",
-				"@babel/helper-plugin-utils": "^7.14.5"
+				"@babel/helper-create-class-features-plugin": "^7.18.6",
+				"@babel/helper-plugin-utils": "^7.18.6"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2345,12 +2380,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-proposal-export-default-from": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.16.0.tgz",
-			"integrity": "sha512-kFAhaIbh5qbBwETRNa/cgGmPJ/BicXhIyrZhAkyYhf/Z9LXCTRGO1mvUwczto0Hl1q4YtzP9cRtTKT4wujm38Q==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.23.3.tgz",
+			"integrity": "sha512-Q23MpLZfSGZL1kU7fWqV262q65svLSCIP5kZ/JCW/rKTCm/FrLjpvEd2kfUYMVeHh4QhV/xzyoRAHWrAZJrE3Q==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/plugin-syntax-export-default-from": "^7.16.0"
+				"@babel/helper-plugin-utils": "^7.22.5",
+				"@babel/plugin-syntax-export-default-from": "^7.23.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2359,14 +2394,14 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-export-namespace-from": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-			"integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-			"dev": true,
+		"node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+			"integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.18.6",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2375,13 +2410,14 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz",
-			"integrity": "sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ==",
+		"node_modules/@babel/plugin-proposal-numeric-separator": {
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+			"integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.18.6",
+				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2394,6 +2430,7 @@
 			"version": "7.20.7",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
 			"integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.",
 			"dependencies": {
 				"@babel/compat-data": "^7.20.5",
 				"@babel/helper-compilation-targets": "^7.20.7",
@@ -2409,11 +2446,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-proposal-optional-catch-binding": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz",
-			"integrity": "sha512-kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw==",
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+			"integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5",
+				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
 			},
 			"engines": {
@@ -2424,12 +2462,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-proposal-optional-chaining": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz",
-			"integrity": "sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg==",
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+			"integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
+			"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
 				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
 			},
 			"engines": {
@@ -2439,6 +2478,18 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
+		"node_modules/@babel/plugin-proposal-private-property-in-object": {
+			"version": "7.21.0-placeholder-for-preset-env.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+			"integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
 		"node_modules/@babel/plugin-syntax-async-generators": {
 			"version": "7.8.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -2454,7 +2505,6 @@
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
 			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
 			},
@@ -2477,7 +2527,6 @@
 			"version": "7.14.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
 			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.14.5"
 			},
@@ -2500,11 +2549,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-export-default-from": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.16.0.tgz",
-			"integrity": "sha512-xllLOdBj77mFSw8s02I+2SSQGHOftbWTlGmagheuNk/gjQsk7IrYsR/EosXVAVpgIUFffLckB/iPRioQYLHSrQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.23.3.tgz",
+			"integrity": "sha512-KeENO5ck1IeZ/l2lFZNy+mpobV3D2Zy5C1YFnWm+YuY5mQiAWc4yAp13dqgguwsBsFVLh4LPCEqCa5qW13N+hw==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
+				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2517,7 +2566,6 @@
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
 			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.3"
 			},
@@ -2526,9 +2574,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-flow": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz",
-			"integrity": "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz",
+			"integrity": "sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -2540,12 +2588,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-import-assertions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-			"integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.9.tgz",
+			"integrity": "sha512-4GHX5uzr5QMOOuzV0an9MFju4hKlm0OyePl/lHhcsTVae5t/IKVHnb8W67Vr6FuLlk5lPqLB7n7O+K5R46emYg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2555,12 +2603,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-import-attributes": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-			"integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.9.tgz",
+			"integrity": "sha512-u3EN9ub8LyYvgTnrgp8gboElouayiwPdnM7x5tcnW3iSt09/lQYPwMNK40I9IUxo7QOZhAsPHCmmuO7EPdruqg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2573,7 +2621,6 @@
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
 			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -2585,7 +2632,6 @@
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
 			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
 			},
@@ -2594,11 +2640,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz",
-			"integrity": "sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg==",
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.7.tgz",
+			"integrity": "sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2611,7 +2658,6 @@
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
 			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -2634,7 +2680,6 @@
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
 			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -2679,7 +2724,6 @@
 			"version": "7.14.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
 			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.14.5"
 			},
@@ -2694,7 +2738,6 @@
 			"version": "7.14.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
 			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.14.5"
 			},
@@ -2706,11 +2749,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-typescript": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
-			"integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+			"integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2723,7 +2767,6 @@
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
 			"integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
@@ -2736,11 +2779,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-arrow-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-			"integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+			"integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2750,15 +2794,14 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-async-generator-functions": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
-			"integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
+			"integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.9",
-				"@babel/plugin-syntax-async-generators": "^7.8.4"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-remap-async-to-generator": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2767,14 +2810,42 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
+		"node_modules/@babel/plugin-transform-async-generator-functions/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-async-generator-functions/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/plugin-transform-async-to-generator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-			"integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+			"integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.5"
+				"@babel/helper-module-imports": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-remap-async-to-generator": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2784,11 +2855,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-			"integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+			"integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2798,11 +2870,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-block-scoping": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
-			"integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+			"integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2812,13 +2885,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-class-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-			"integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+			"integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-class-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2828,14 +2901,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-class-static-block": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-			"integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.9.tgz",
+			"integrity": "sha512-UIf+72C7YJ+PJ685/PpATbCz00XqiFEzHX5iysRwfvNT0Ko+FaXSvRgLytFSp8xUItrG9pFM/KoBBZDrY/cYyg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5"
+				"@babel/helper-create-class-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2845,18 +2917,16 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-classes": {
-			"version": "7.22.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
-			"integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+			"integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-compilation-targets": "^7.22.6",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-replace-supers": "^7.25.9",
+				"@babel/traverse": "^7.25.9",
 				"globals": "^11.1.0"
 			},
 			"engines": {
@@ -2866,6 +2936,24 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
+		"node_modules/@babel/plugin-transform-classes/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
 		"node_modules/@babel/plugin-transform-classes/node_modules/globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -2875,12 +2963,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-computed-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-			"integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+			"integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/template": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/template": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2890,11 +2979,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-destructuring": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
-			"integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+			"integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2904,13 +2994,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-dotall-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-			"integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+			"integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2920,12 +3010,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-duplicate-keys": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-			"integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+			"integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2934,14 +3024,29 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
+		"node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+			"integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
 		"node_modules/@babel/plugin-transform-dynamic-import": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-			"integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+			"integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2951,13 +3056,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-			"integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz",
+			"integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2967,13 +3072,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-export-namespace-from": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-			"integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+			"integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2983,12 +3087,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-flow-strip-types": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz",
-			"integrity": "sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz",
+			"integrity": "sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-flow": "^7.22.5"
+				"@babel/plugin-syntax-flow": "^7.23.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2998,11 +3102,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-for-of": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-			"integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+			"integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3012,13 +3118,14 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-function-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-			"integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+			"integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-compilation-targets": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3027,14 +3134,40 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
+		"node_modules/@babel/plugin-transform-function-name/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-function-name/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/plugin-transform-json-strings": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-			"integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+			"integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-json-strings": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3044,11 +3177,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-			"integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+			"integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3058,13 +3192,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-logical-assignment-operators": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-			"integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+			"integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3074,11 +3207,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-member-expression-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-			"integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+			"integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3088,13 +3222,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-amd": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-			"integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+			"integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-module-transforms": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3104,13 +3238,14 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-commonjs": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-			"integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
+			"integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-simple-access": "^7.22.5"
+				"@babel/helper-module-transforms": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-simple-access": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3120,15 +3255,15 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-systemjs": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-			"integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+			"integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.5"
+				"@babel/helper-module-transforms": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3137,14 +3272,41 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
+		"node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/traverse": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+			"integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/generator": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.25.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-modules-systemjs/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/plugin-transform-modules-umd": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-			"integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+			"integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-module-transforms": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3154,12 +3316,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-			"integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+			"integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3169,12 +3332,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-new-target": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-			"integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+			"integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3184,13 +3347,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-			"integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
+			"integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3200,13 +3362,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-numeric-separator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-			"integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+			"integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3216,9 +3377,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-object-assign": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.22.5.tgz",
-			"integrity": "sha512-iDhx9ARkXq4vhZ2CYOSnQXkmxkDgosLi3J8Z17mKz7LyzthtkdVchLD7WZ3aXeCuvJDOW3+1I5TpJmwIbF9MKQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.23.3.tgz",
+			"integrity": "sha512-TPJ6O7gVC2rlQH2hvQGRH273G1xdoloCj9Pc07Q7JbIZYDi+Sv5gaE2fu+r5E7qK4zyt6vj0FbZaZTRU5C3OMA==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -3230,16 +3391,14 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-object-rest-spread": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-			"integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+			"integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/compat-data": "^7.22.5",
-				"@babel/helper-compilation-targets": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.22.5"
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/plugin-transform-parameters": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3249,12 +3408,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-object-super": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-			"integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+			"integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-replace-supers": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3264,13 +3424,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-optional-catch-binding": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-			"integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+			"integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3280,14 +3439,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-optional-chaining": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
-			"integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+			"integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3297,11 +3455,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-parameters": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-			"integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+			"integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3311,13 +3470,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-private-methods": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-			"integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+			"integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-class-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3327,15 +3486,14 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-private-property-in-object": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-			"integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+			"integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-create-class-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3345,11 +3503,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-property-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-			"integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+			"integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3362,7 +3521,6 @@
 			"version": "7.22.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz",
 			"integrity": "sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -3374,9 +3532,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-display-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz",
-			"integrity": "sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz",
+			"integrity": "sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -3388,15 +3546,16 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-jsx": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
-			"integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz",
+			"integrity": "sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-jsx": "^7.22.5",
-				"@babel/types": "^7.22.5"
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-module-imports": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/plugin-syntax-jsx": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3409,7 +3568,6 @@
 			"version": "7.22.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
 			"integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
-			"dev": true,
 			"dependencies": {
 				"@babel/plugin-transform-react-jsx": "^7.22.5"
 			},
@@ -3421,9 +3579,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-jsx-self": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz",
-			"integrity": "sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz",
+			"integrity": "sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -3435,9 +3593,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-jsx-source": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz",
-			"integrity": "sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz",
+			"integrity": "sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -3449,11 +3607,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
-			"integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+			"integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3463,10 +3622,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-pure-annotations": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz",
-			"integrity": "sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==",
-			"dev": true,
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz",
+			"integrity": "sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==",
 			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.22.5",
 				"@babel/helper-plugin-utils": "^7.22.5"
@@ -3479,12 +3637,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-regenerator": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-			"integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+			"integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
+				"@babel/helper-plugin-utils": "^7.25.9",
 				"regenerator-transform": "^0.15.2"
 			},
 			"engines": {
@@ -3495,12 +3653,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-reserved-words": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-			"integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+			"integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3510,16 +3668,17 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-runtime": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.0.tgz",
-			"integrity": "sha512-zlPf1/XFn5+vWdve3AAhf+Sxl+MVa5VlwTwWgnLx23u4GlatSRQJ3Eoo9vllf0a9il3woQsT4SK+5Z7c06h8ag==",
-			"dependencies": {
-				"@babel/helper-module-imports": "^7.16.0",
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"babel-plugin-polyfill-corejs2": "^0.2.3",
-				"babel-plugin-polyfill-corejs3": "^0.3.0",
-				"babel-plugin-polyfill-regenerator": "^0.2.3",
-				"semver": "^6.3.0"
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz",
+			"integrity": "sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"babel-plugin-polyfill-corejs2": "^0.4.10",
+				"babel-plugin-polyfill-corejs3": "^0.10.6",
+				"babel-plugin-polyfill-regenerator": "^0.6.1",
+				"semver": "^6.3.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3537,11 +3696,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-shorthand-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-			"integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+			"integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3551,12 +3711,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-spread": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-			"integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+			"integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3566,11 +3727,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-sticky-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-			"integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+			"integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3580,11 +3742,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-template-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-			"integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+			"integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3594,12 +3757,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-typeof-symbol": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-			"integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+			"integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3609,14 +3772,16 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-typescript": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.10.tgz",
-			"integrity": "sha512-7++c8I/ymsDo4QQBAgbraXLzIM6jmfao11KgIBEYZRReWzNWH9NtNgJcyrZiXsOPh523FQm6LfpLyy/U5fn46A==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.9.tgz",
+			"integrity": "sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-create-class-features-plugin": "^7.22.10",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-typescript": "^7.22.5"
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-create-class-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+				"@babel/plugin-syntax-typescript": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3626,12 +3791,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-escapes": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-			"integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+			"integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3641,13 +3806,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-property-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-			"integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+			"integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3657,12 +3822,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-			"integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+			"integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3672,13 +3838,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-sets-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-			"integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+			"integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3688,90 +3854,78 @@
 			}
 		},
 		"node_modules/@babel/preset-env": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
-			"integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
-			"dev": true,
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.9.tgz",
+			"integrity": "sha512-XqDEt+hfsQukahSX9JOBDHhpUHDhj2zGSxoqWQFCMajOSBnbhBdgON/bU/5PkBA1yX5tqW6tTzuIPVsZTQ7h5Q==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+				"@babel/compat-data": "^7.25.9",
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-validator-option": "^7.25.9",
+				"@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
+				"@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
+				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
+				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
+				"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
 				"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-class-properties": "^7.12.13",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-import-assertions": "^7.22.5",
-				"@babel/plugin-syntax-import-attributes": "^7.22.5",
-				"@babel/plugin-syntax-import-meta": "^7.10.4",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-				"@babel/plugin-syntax-top-level-await": "^7.14.5",
+				"@babel/plugin-syntax-import-assertions": "^7.25.9",
+				"@babel/plugin-syntax-import-attributes": "^7.25.9",
 				"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-				"@babel/plugin-transform-arrow-functions": "^7.22.5",
-				"@babel/plugin-transform-async-generator-functions": "^7.22.10",
-				"@babel/plugin-transform-async-to-generator": "^7.22.5",
-				"@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-				"@babel/plugin-transform-block-scoping": "^7.22.10",
-				"@babel/plugin-transform-class-properties": "^7.22.5",
-				"@babel/plugin-transform-class-static-block": "^7.22.5",
-				"@babel/plugin-transform-classes": "^7.22.6",
-				"@babel/plugin-transform-computed-properties": "^7.22.5",
-				"@babel/plugin-transform-destructuring": "^7.22.10",
-				"@babel/plugin-transform-dotall-regex": "^7.22.5",
-				"@babel/plugin-transform-duplicate-keys": "^7.22.5",
-				"@babel/plugin-transform-dynamic-import": "^7.22.5",
-				"@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-				"@babel/plugin-transform-export-namespace-from": "^7.22.5",
-				"@babel/plugin-transform-for-of": "^7.22.5",
-				"@babel/plugin-transform-function-name": "^7.22.5",
-				"@babel/plugin-transform-json-strings": "^7.22.5",
-				"@babel/plugin-transform-literals": "^7.22.5",
-				"@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
-				"@babel/plugin-transform-member-expression-literals": "^7.22.5",
-				"@babel/plugin-transform-modules-amd": "^7.22.5",
-				"@babel/plugin-transform-modules-commonjs": "^7.22.5",
-				"@babel/plugin-transform-modules-systemjs": "^7.22.5",
-				"@babel/plugin-transform-modules-umd": "^7.22.5",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-				"@babel/plugin-transform-new-target": "^7.22.5",
-				"@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-				"@babel/plugin-transform-numeric-separator": "^7.22.5",
-				"@babel/plugin-transform-object-rest-spread": "^7.22.5",
-				"@babel/plugin-transform-object-super": "^7.22.5",
-				"@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-				"@babel/plugin-transform-optional-chaining": "^7.22.10",
-				"@babel/plugin-transform-parameters": "^7.22.5",
-				"@babel/plugin-transform-private-methods": "^7.22.5",
-				"@babel/plugin-transform-private-property-in-object": "^7.22.5",
-				"@babel/plugin-transform-property-literals": "^7.22.5",
-				"@babel/plugin-transform-regenerator": "^7.22.10",
-				"@babel/plugin-transform-reserved-words": "^7.22.5",
-				"@babel/plugin-transform-shorthand-properties": "^7.22.5",
-				"@babel/plugin-transform-spread": "^7.22.5",
-				"@babel/plugin-transform-sticky-regex": "^7.22.5",
-				"@babel/plugin-transform-template-literals": "^7.22.5",
-				"@babel/plugin-transform-typeof-symbol": "^7.22.5",
-				"@babel/plugin-transform-unicode-escapes": "^7.22.10",
-				"@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
+				"@babel/plugin-transform-arrow-functions": "^7.25.9",
+				"@babel/plugin-transform-async-generator-functions": "^7.25.9",
+				"@babel/plugin-transform-async-to-generator": "^7.25.9",
+				"@babel/plugin-transform-block-scoped-functions": "^7.25.9",
+				"@babel/plugin-transform-block-scoping": "^7.25.9",
+				"@babel/plugin-transform-class-properties": "^7.25.9",
+				"@babel/plugin-transform-class-static-block": "^7.25.9",
+				"@babel/plugin-transform-classes": "^7.25.9",
+				"@babel/plugin-transform-computed-properties": "^7.25.9",
+				"@babel/plugin-transform-destructuring": "^7.25.9",
+				"@babel/plugin-transform-dotall-regex": "^7.25.9",
+				"@babel/plugin-transform-duplicate-keys": "^7.25.9",
+				"@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
+				"@babel/plugin-transform-dynamic-import": "^7.25.9",
+				"@babel/plugin-transform-exponentiation-operator": "^7.25.9",
+				"@babel/plugin-transform-export-namespace-from": "^7.25.9",
+				"@babel/plugin-transform-for-of": "^7.25.9",
+				"@babel/plugin-transform-function-name": "^7.25.9",
+				"@babel/plugin-transform-json-strings": "^7.25.9",
+				"@babel/plugin-transform-literals": "^7.25.9",
+				"@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+				"@babel/plugin-transform-member-expression-literals": "^7.25.9",
+				"@babel/plugin-transform-modules-amd": "^7.25.9",
+				"@babel/plugin-transform-modules-commonjs": "^7.25.9",
+				"@babel/plugin-transform-modules-systemjs": "^7.25.9",
+				"@babel/plugin-transform-modules-umd": "^7.25.9",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
+				"@babel/plugin-transform-new-target": "^7.25.9",
+				"@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
+				"@babel/plugin-transform-numeric-separator": "^7.25.9",
+				"@babel/plugin-transform-object-rest-spread": "^7.25.9",
+				"@babel/plugin-transform-object-super": "^7.25.9",
+				"@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+				"@babel/plugin-transform-optional-chaining": "^7.25.9",
+				"@babel/plugin-transform-parameters": "^7.25.9",
+				"@babel/plugin-transform-private-methods": "^7.25.9",
+				"@babel/plugin-transform-private-property-in-object": "^7.25.9",
+				"@babel/plugin-transform-property-literals": "^7.25.9",
+				"@babel/plugin-transform-regenerator": "^7.25.9",
+				"@babel/plugin-transform-reserved-words": "^7.25.9",
+				"@babel/plugin-transform-shorthand-properties": "^7.25.9",
+				"@babel/plugin-transform-spread": "^7.25.9",
+				"@babel/plugin-transform-sticky-regex": "^7.25.9",
+				"@babel/plugin-transform-template-literals": "^7.25.9",
+				"@babel/plugin-transform-typeof-symbol": "^7.25.9",
+				"@babel/plugin-transform-unicode-escapes": "^7.25.9",
+				"@babel/plugin-transform-unicode-property-regex": "^7.25.9",
+				"@babel/plugin-transform-unicode-regex": "^7.25.9",
+				"@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
 				"@babel/preset-modules": "0.1.6-no-external-plugins",
-				"@babel/types": "^7.22.10",
-				"babel-plugin-polyfill-corejs2": "^0.4.5",
-				"babel-plugin-polyfill-corejs3": "^0.8.3",
-				"babel-plugin-polyfill-regenerator": "^0.5.2",
-				"core-js-compat": "^3.31.0",
+				"babel-plugin-polyfill-corejs2": "^0.4.10",
+				"babel-plugin-polyfill-corejs3": "^0.10.6",
+				"babel-plugin-polyfill-regenerator": "^0.6.1",
+				"core-js-compat": "^3.38.1",
 				"semver": "^6.3.1"
 			},
 			"engines": {
@@ -3781,90 +3935,22 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/preset-env/node_modules/@babel/helper-define-polyfill-provider": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
-			"integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-compilation-targets": "^7.22.6",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"debug": "^4.1.1",
-				"lodash.debounce": "^4.0.8",
-				"resolve": "^1.14.2"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-			}
-		},
-		"node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-private-property-in-object": {
-			"version": "7.21.0-placeholder-for-preset-env.2",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-			"integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs2": {
-			"version": "0.4.5",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
-			"integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/compat-data": "^7.22.6",
-				"@babel/helper-define-polyfill-provider": "^0.4.2",
-				"semver": "^6.3.1"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-			}
-		},
-		"node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
-			"integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.4.2",
-				"core-js-compat": "^3.31.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-			}
-		},
-		"node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
-			"integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.4.2"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-			}
-		},
 		"node_modules/@babel/preset-env/node_modules/semver": {
 			"version": "6.3.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
 			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
 			"bin": {
 				"semver": "bin/semver.js"
 			}
 		},
 		"node_modules/@babel/preset-flow": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.22.5.tgz",
-			"integrity": "sha512-ta2qZ+LSiGCrP5pgcGt8xMnnkXQrq8Sa4Ulhy06BOlF5QbLw9q5hIx7bn5MrsvyTGAfh6kTOo07Q+Pfld/8Y5Q==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.23.3.tgz",
+			"integrity": "sha512-7yn6hl8RIv+KNk6iIrGZ+D06VhVY35wLVf23Cz/mMu1zOr7u4MMP4j0nZ9tLf8+4ZFpnib8cFYgB/oYg9hfswA==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-transform-flow-strip-types": "^7.22.5"
+				"@babel/helper-validator-option": "^7.22.15",
+				"@babel/plugin-transform-flow-strip-types": "^7.23.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3877,7 +3963,6 @@
 			"version": "0.1.6-no-external-plugins",
 			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
 			"integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.0.0",
 				"@babel/types": "^7.4.4",
@@ -3888,17 +3973,16 @@
 			}
 		},
 		"node_modules/@babel/preset-react": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.5.tgz",
-			"integrity": "sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==",
-			"dev": true,
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.23.3.tgz",
+			"integrity": "sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-transform-react-display-name": "^7.22.5",
-				"@babel/plugin-transform-react-jsx": "^7.22.5",
+				"@babel/helper-validator-option": "^7.22.15",
+				"@babel/plugin-transform-react-display-name": "^7.23.3",
+				"@babel/plugin-transform-react-jsx": "^7.22.15",
 				"@babel/plugin-transform-react-jsx-development": "^7.22.5",
-				"@babel/plugin-transform-react-pure-annotations": "^7.22.5"
+				"@babel/plugin-transform-react-pure-annotations": "^7.23.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3908,15 +3992,16 @@
 			}
 		},
 		"node_modules/@babel/preset-typescript": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz",
-			"integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.25.9.tgz",
+			"integrity": "sha512-XWxw1AcKk36kgxf4C//fl0ikjLeqGUWn062/Fd8GtpTfDJOX6Ud95FK+4JlDA36BX4bNGndXi3a6Vr4Jo5/61A==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-syntax-jsx": "^7.22.5",
-				"@babel/plugin-transform-modules-commonjs": "^7.22.5",
-				"@babel/plugin-transform-typescript": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-validator-option": "^7.25.9",
+				"@babel/plugin-syntax-jsx": "^7.25.9",
+				"@babel/plugin-transform-modules-commonjs": "^7.25.9",
+				"@babel/plugin-transform-typescript": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3926,11 +4011,12 @@
 			}
 		},
 		"node_modules/@babel/preset-typescript/node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
-			"integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+			"integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -3940,14 +4026,14 @@
 			}
 		},
 		"node_modules/@babel/register": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/register/-/register-7.16.0.tgz",
-			"integrity": "sha512-lzl4yfs0zVXnooeLE0AAfYaT7F3SPA8yB2Bj4W1BiZwLbMS3MZH35ZvCWSRHvneUugwuM+Wsnrj7h0F7UmU3NQ==",
+			"version": "7.23.7",
+			"resolved": "https://registry.npmjs.org/@babel/register/-/register-7.23.7.tgz",
+			"integrity": "sha512-EjJeB6+kvpk+Y5DAkEAmbOBEFkh9OASx0huoEkqYTFxAZHzOAX2Oh5uwAUuL2rUddqfM0SA+KPXV2TbzoZ2kvQ==",
 			"dependencies": {
 				"clone-deep": "^4.0.1",
 				"find-cache-dir": "^2.0.0",
 				"make-dir": "^2.1.0",
-				"pirates": "^4.0.0",
+				"pirates": "^4.0.6",
 				"source-map-support": "^0.5.16"
 			},
 			"engines": {
@@ -3985,15 +4071,11 @@
 				"semver": "bin/semver"
 			}
 		},
-		"node_modules/@babel/regjsgen": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-			"integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
-		},
 		"node_modules/@babel/runtime": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz",
-			"integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==",
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
+			"integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
+			"license": "MIT",
 			"dependencies": {
 				"regenerator-runtime": "^0.14.0"
 			},
@@ -4002,49 +4084,54 @@
 			}
 		},
 		"node_modules/@babel/runtime-corejs3": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz",
-			"integrity": "sha512-Oi2qwQ21X7/d9gn3WiwkDTJmq3TQtYNz89lRnoFy8VeZpWlsyXvzSwiRrRZ8cXluvSwqKxqHJ6dBd9Rv+p0ZGQ==",
-			"dev": true,
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.25.7.tgz",
+			"integrity": "sha512-gMmIEhg35sXk9Te5qbGp3W9YKrvLt3HV658/d3odWrHSqT0JeG5OzsJWFHRLiOohRyjRsJc/x03DhJm3i8VJxg==",
+			"license": "MIT",
 			"dependencies": {
-				"core-js-pure": "^3.19.0",
-				"regenerator-runtime": "^0.13.4"
+				"core-js-pure": "^3.30.2",
+				"regenerator-runtime": "^0.14.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/runtime-corejs3/node_modules/regenerator-runtime": {
+			"version": "0.14.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+		},
 		"node_modules/@babel/runtime/node_modules/regenerator-runtime": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-			"integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+			"version": "0.14.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
 		},
 		"node_modules/@babel/template": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-			"integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+			"integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/code-frame": "^7.22.5",
-				"@babel/parser": "^7.22.5",
-				"@babel/types": "^7.22.5"
+				"@babel/code-frame": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/traverse": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.0.tgz",
-			"integrity": "sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==",
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
+			"integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/code-frame": "^7.16.0",
-				"@babel/generator": "^7.16.0",
-				"@babel/helper-function-name": "^7.16.0",
-				"@babel/helper-hoist-variables": "^7.16.0",
-				"@babel/helper-split-export-declaration": "^7.16.0",
-				"@babel/parser": "^7.16.0",
-				"@babel/types": "^7.16.0",
-				"debug": "^4.1.0",
+				"@babel/code-frame": "^7.25.7",
+				"@babel/generator": "^7.25.7",
+				"@babel/parser": "^7.25.7",
+				"@babel/template": "^7.25.7",
+				"@babel/types": "^7.25.7",
+				"debug": "^4.3.1",
 				"globals": "^11.1.0"
 			},
 			"engines": {
@@ -4060,13 +4147,13 @@
 			}
 		},
 		"node_modules/@babel/types": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-			"integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.9.tgz",
+			"integrity": "sha512-OwS2CM5KocvQ/k7dFJa8i5bNGJP0hXWfVCfDkqRFP1IreH1JDC7wG6eCYCi0+McbfT8OR/kNqsI0UU0xP9H6PQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-string-parser": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.5",
-				"to-fast-properties": "^2.0.0"
+				"@babel/helper-string-parser": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -4081,8 +4168,7 @@
 		"node_modules/@bcoe/v8-coverage": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-			"dev": true
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
 		},
 		"node_modules/@callstack/reassure-cli": {
 			"version": "0.6.1",
@@ -4127,21 +4213,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@callstack/reassure-cli/node_modules/simple-git": {
-			"version": "3.19.1",
-			"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.19.1.tgz",
-			"integrity": "sha512-Ck+rcjVaE1HotraRAS8u/+xgTvToTuoMkT9/l9lvuP5jftwnYUp6DwuJzsKErHgfyRk8IB8pqGHWEbM3tLgV1w==",
-			"dev": true,
-			"dependencies": {
-				"@kwsites/file-exists": "^1.1.1",
-				"@kwsites/promise-deferred": "^1.1.1",
-				"debug": "^4.3.4"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/steveukx/git-js?sponsor=1"
-			}
-		},
 		"node_modules/@callstack/reassure-cli/node_modules/string-width": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -4260,6 +4331,88 @@
 				"node": ">=0.1.90"
 			}
 		},
+		"node_modules/@csstools/css-parser-algorithms": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.1.tgz",
+			"integrity": "sha512-lSquqZCHxDfuTg/Sk2hiS0mcSFCEBuj49JfzPHJogDBT0mGCyY5A1AQzBWngitrp7i1/HAZpIgzF/VjhOEIJIg==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"engines": {
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-tokenizer": "^3.0.1"
+			}
+		},
+		"node_modules/@csstools/css-tokenizer": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.1.tgz",
+			"integrity": "sha512-UBqaiu7kU0lfvaP982/o3khfXccVlHPWp0/vwwiIgDF0GmqqqxoiXC/6FCjlS9u92f7CoEz6nXKQnrn1kIAkOw==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@csstools/media-query-list-parser": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz",
+			"integrity": "sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"engines": {
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-parser-algorithms": "^3.0.1",
+				"@csstools/css-tokenizer": "^3.0.1"
+			}
+		},
+		"node_modules/@csstools/selector-specificity": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz",
+			"integrity": "sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"engines": {
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"postcss-selector-parser": "^6.1.0"
+			}
+		},
 		"node_modules/@dabh/diagnostics": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
@@ -4275,11 +4428,19 @@
 			"version": "0.5.7",
 			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
 			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.0.0"
 			}
 		},
+		"node_modules/@dual-bundle/import-meta-resolve": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
+			"integrity": "sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/@egjs/hammerjs": {
 			"version": "2.0.17",
 			"resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz",
@@ -4292,31 +4453,27 @@
 			}
 		},
 		"node_modules/@emotion/babel-plugin": {
-			"version": "11.3.0",
-			"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz",
-			"integrity": "sha512-UZKwBV2rADuhRp+ZOGgNWg2eYgbzKzQXfQPtJbu/PLy8onurxlNCLvxMQEvlr1/GudguPI5IU9qIY1+2z1M5bA==",
+			"version": "11.11.0",
+			"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
+			"integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
 			"dependencies": {
-				"@babel/helper-module-imports": "^7.12.13",
-				"@babel/plugin-syntax-jsx": "^7.12.13",
-				"@babel/runtime": "^7.13.10",
-				"@emotion/hash": "^0.8.0",
-				"@emotion/memoize": "^0.7.5",
-				"@emotion/serialize": "^1.0.2",
-				"babel-plugin-macros": "^2.6.1",
+				"@babel/helper-module-imports": "^7.16.7",
+				"@babel/runtime": "^7.18.3",
+				"@emotion/hash": "^0.9.1",
+				"@emotion/memoize": "^0.8.1",
+				"@emotion/serialize": "^1.1.2",
+				"babel-plugin-macros": "^3.1.0",
 				"convert-source-map": "^1.5.0",
 				"escape-string-regexp": "^4.0.0",
 				"find-root": "^1.1.0",
 				"source-map": "^0.5.7",
-				"stylis": "^4.0.3"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
+				"stylis": "4.2.0"
 			}
 		},
 		"node_modules/@emotion/babel-plugin/node_modules/@emotion/memoize": {
-			"version": "0.7.5",
-			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",
-			"integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+			"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
 		},
 		"node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
 			"version": "4.0.0",
@@ -4337,6 +4494,11 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/@emotion/babel-plugin/node_modules/stylis": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
+			"integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
+		},
 		"node_modules/@emotion/cache": {
 			"version": "11.7.1",
 			"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.7.1.tgz",
@@ -4379,86 +4541,11 @@
 				"stylis": "4.0.13"
 			}
 		},
-		"node_modules/@emotion/css/node_modules/@emotion/babel-plugin": {
-			"version": "11.11.0",
-			"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
-			"integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
-			"dependencies": {
-				"@babel/helper-module-imports": "^7.16.7",
-				"@babel/runtime": "^7.18.3",
-				"@emotion/hash": "^0.9.1",
-				"@emotion/memoize": "^0.8.1",
-				"@emotion/serialize": "^1.1.2",
-				"babel-plugin-macros": "^3.1.0",
-				"convert-source-map": "^1.5.0",
-				"escape-string-regexp": "^4.0.0",
-				"find-root": "^1.1.0",
-				"source-map": "^0.5.7",
-				"stylis": "4.2.0"
-			}
-		},
-		"node_modules/@emotion/css/node_modules/@emotion/hash": {
+		"node_modules/@emotion/hash": {
 			"version": "0.9.1",
 			"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
 			"integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
 		},
-		"node_modules/@emotion/css/node_modules/@emotion/memoize": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
-			"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
-		},
-		"node_modules/@emotion/css/node_modules/babel-plugin-macros": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-			"integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-			"dependencies": {
-				"@babel/runtime": "^7.12.5",
-				"cosmiconfig": "^7.0.0",
-				"resolve": "^1.19.0"
-			},
-			"engines": {
-				"node": ">=10",
-				"npm": ">=6"
-			}
-		},
-		"node_modules/@emotion/css/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/@emotion/css/node_modules/source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/@emotion/css/node_modules/stylis": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
-			"integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
-		},
-		"node_modules/@emotion/hash": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
-			"integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
-		},
-		"node_modules/@emotion/is-prop-valid": {
-			"version": "0.8.8",
-			"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-			"integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
-			"optional": true,
-			"dependencies": {
-				"@emotion/memoize": "0.7.4"
-			}
-		},
 		"node_modules/@emotion/jest": {
 			"version": "11.7.1",
 			"resolved": "https://registry.npmjs.org/@emotion/jest/-/jest-11.7.1.tgz",
@@ -4485,9 +4572,9 @@
 			}
 		},
 		"node_modules/@emotion/memoize": {
-			"version": "0.7.4",
-			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-			"integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
+			"version": "0.7.5",
+			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",
+			"integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
 		},
 		"node_modules/@emotion/native": {
 			"version": "11.0.0",
@@ -4575,11 +4662,6 @@
 				"csstype": "^3.0.2"
 			}
 		},
-		"node_modules/@emotion/serialize/node_modules/@emotion/hash": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
-			"integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
-		},
 		"node_modules/@emotion/serialize/node_modules/@emotion/memoize": {
 			"version": "0.8.1",
 			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
@@ -4616,9 +4698,9 @@
 			}
 		},
 		"node_modules/@emotion/styled/node_modules/@emotion/is-prop-valid": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
-			"integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz",
+			"integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==",
 			"dependencies": {
 				"@emotion/memoize": "^0.8.1"
 			}
@@ -4656,7 +4738,6 @@
 			"version": "0.40.1",
 			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz",
 			"integrity": "sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg==",
-			"dev": true,
 			"dependencies": {
 				"comment-parser": "1.4.0",
 				"esquery": "^1.5.0",
@@ -5022,7 +5103,6 @@
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
 			"integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-			"dev": true,
 			"dependencies": {
 				"eslint-visitor-keys": "^3.3.0"
 			},
@@ -5034,10 +5114,9 @@
 			}
 		},
 		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-			"integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-			"dev": true,
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
@@ -5049,7 +5128,6 @@
 			"version": "4.8.0",
 			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
 			"integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
-			"dev": true,
 			"engines": {
 				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
 			}
@@ -5058,7 +5136,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.4.tgz",
 			"integrity": "sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==",
-			"dev": true,
 			"dependencies": {
 				"ajv": "^6.12.4",
 				"debug": "^4.3.2",
@@ -5078,7 +5155,6 @@
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -5093,14 +5169,12 @@
 		"node_modules/@eslint/eslintrc/node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
 		},
 		"node_modules/@eslint/eslintrc/node_modules/ignore": {
 			"version": "4.0.6",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
 			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 4"
 			}
@@ -5109,7 +5183,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
 			"dependencies": {
 				"argparse": "^2.0.1"
 			},
@@ -5121,7 +5194,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -5135,6 +5207,14 @@
 			"integrity": "sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==",
 			"dev": true
 		},
+		"node_modules/@fastify/busboy": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
+			"integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
+			"engines": {
+				"node": ">=14"
+			}
+		},
 		"node_modules/@floating-ui/core": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz",
@@ -5144,23 +5224,68 @@
 			}
 		},
 		"node_modules/@floating-ui/dom": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz",
-			"integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==",
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz",
+			"integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==",
 			"dependencies": {
-				"@floating-ui/core": "^1.4.1",
-				"@floating-ui/utils": "^0.1.1"
+				"@floating-ui/core": "^1.0.0",
+				"@floating-ui/utils": "^0.2.0"
+			}
+		},
+		"node_modules/@floating-ui/dom/node_modules/@floating-ui/utils": {
+			"version": "0.2.8",
+			"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
+			"integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
+			"license": "MIT"
+		},
+		"node_modules/@floating-ui/react-dom": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
+			"integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@floating-ui/dom": "^1.0.0"
+			},
+			"peerDependencies": {
+				"react": ">=16.8.0",
+				"react-dom": ">=16.8.0"
 			}
 		},
 		"node_modules/@floating-ui/utils": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.2.tgz",
-			"integrity": "sha512-ou3elfqG/hZsbmF4bxeJhPHIf3G2pm0ujc39hYEZrfVqt7Vk/Zji6CXc3W0pmYM8BW1g40U+akTl9DKZhFhInQ=="
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz",
+			"integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
+		},
+		"node_modules/@geometricpanda/storybook-addon-badges": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@geometricpanda/storybook-addon-badges/-/storybook-addon-badges-2.0.1.tgz",
+			"integrity": "sha512-dCEK/xJewuFe1d+ndF0hQIAJRnUsV9q5kuDmp7zvO7fTd7cDz0X9Bjz0lNRn6n4Z9bL9/iFHKzJESDHFfs4ihQ==",
+			"dev": true,
+			"peerDependencies": {
+				"@storybook/blocks": "^7.0.0",
+				"@storybook/components": "^7.0.0",
+				"@storybook/core-events": "^7.0.0",
+				"@storybook/manager-api": "^7.0.0",
+				"@storybook/preview-api": "^7.0.0",
+				"@storybook/theming": "^7.0.0",
+				"@storybook/types": "^7.0.0",
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"react": {
+					"optional": true
+				},
+				"react-dom": {
+					"optional": true
+				}
+			}
 		},
 		"node_modules/@hapi/hoek": {
-			"version": "9.2.1",
-			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz",
-			"integrity": "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw=="
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+			"integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
 		},
 		"node_modules/@hapi/topo": {
 			"version": "5.1.0",
@@ -5174,7 +5299,6 @@
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz",
 			"integrity": "sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==",
-			"dev": true,
 			"dependencies": {
 				"@humanwhocodes/object-schema": "^1.2.0",
 				"debug": "^4.1.1",
@@ -5187,8 +5311,7 @@
 		"node_modules/@humanwhocodes/object-schema": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-			"dev": true
+			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
 		},
 		"node_modules/@hutson/parse-repository-url": {
 			"version": "3.0.2",
@@ -5217,10 +5340,11 @@
 			}
 		},
 		"node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=12"
 			},
@@ -5295,11 +5419,18 @@
 				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
+		"node_modules/@isaacs/ttlcache": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz",
+			"integrity": "sha512-RQgQ4uQ+pLbqXfOmieB91ejmLwvSgv9nLx6sT6sD83s7umBypgg+OIBOBbEUiJXrfpnp9j0mRhYYdzp9uqq3lA==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/@istanbuljs/load-nyc-config": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz",
 			"integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==",
-			"dev": true,
 			"dependencies": {
 				"camelcase": "^5.3.1",
 				"find-up": "^4.1.0",
@@ -5314,7 +5445,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
 			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
 			"dependencies": {
 				"locate-path": "^5.0.0",
 				"path-exists": "^4.0.0"
@@ -5327,7 +5457,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
 			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
 			"dependencies": {
 				"p-locate": "^4.1.0"
 			},
@@ -5339,7 +5468,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
 			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
 			"dependencies": {
 				"p-try": "^2.0.0"
 			},
@@ -5354,7 +5482,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
 			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
 			"dependencies": {
 				"p-limit": "^2.2.0"
 			},
@@ -5366,7 +5493,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
 			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -5375,7 +5501,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
 			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -5384,7 +5509,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
 			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -5393,7 +5517,6 @@
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
 			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -5402,7 +5525,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
 			"integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
-			"dev": true,
 			"dependencies": {
 				"@jest/types": "^29.6.1",
 				"@types/node": "*",
@@ -5419,7 +5541,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
 			"integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
-			"dev": true,
 			"dependencies": {
 				"@jest/console": "^29.6.2",
 				"@jest/reporters": "^29.6.2",
@@ -5463,25 +5584,25 @@
 			}
 		},
 		"node_modules/@jest/create-cache-key-function": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/@jest/create-cache-key-function/-/create-cache-key-function-29.6.1.tgz",
-			"integrity": "sha512-d77/1BbNLbJDBV6tH7ctYpau+3tnU5YMhg36uGabW4VDrl1Arp6E0jDRioHFoFqIbm+BXMVbyQc9MpfKo6OIQQ==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/create-cache-key-function/-/create-cache-key-function-29.7.0.tgz",
+			"integrity": "sha512-4QqS3LY5PBmTRHj9sAg1HLoPzqAI0uOX6wI/TRqHIcOxlFidy6YEmCQJk6FSZjNLGCeubDMfmkWL+qaLKhSGQA==",
 			"dependencies": {
-				"@jest/types": "^29.6.1"
+				"@jest/types": "^29.6.3"
 			},
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/@jest/environment": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
-			"integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+			"integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
 			"dependencies": {
-				"@jest/fake-timers": "^29.6.2",
-				"@jest/types": "^29.6.1",
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/types": "^29.6.3",
 				"@types/node": "*",
-				"jest-mock": "^29.6.2"
+				"jest-mock": "^29.7.0"
 			},
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -5491,7 +5612,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
 			"integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
-			"dev": true,
 			"dependencies": {
 				"expect": "^29.6.2",
 				"jest-snapshot": "^29.6.2"
@@ -5504,7 +5624,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
 			"integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
-			"dev": true,
 			"dependencies": {
 				"jest-get-type": "^29.4.3"
 			},
@@ -5513,16 +5632,35 @@
 			}
 		},
 		"node_modules/@jest/fake-timers": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
-			"integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+			"integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
 			"dependencies": {
-				"@jest/types": "^29.6.1",
+				"@jest/types": "^29.6.3",
 				"@sinonjs/fake-timers": "^10.0.2",
 				"@types/node": "*",
-				"jest-message-util": "^29.6.2",
-				"jest-mock": "^29.6.2",
-				"jest-util": "^29.6.2"
+				"jest-message-util": "^29.7.0",
+				"jest-mock": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/jest-message-util": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+			"integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^29.6.3",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
 			},
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -5532,7 +5670,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
 			"integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
-			"dev": true,
 			"dependencies": {
 				"@jest/environment": "^29.6.2",
 				"@jest/expect": "^29.6.2",
@@ -5547,7 +5684,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
 			"integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
-			"dev": true,
 			"dependencies": {
 				"@bcoe/v8-coverage": "^0.2.3",
 				"@jest/console": "^29.6.2",
@@ -5590,7 +5726,6 @@
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
 			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -5607,9 +5742,9 @@
 			}
 		},
 		"node_modules/@jest/schemas": {
-			"version": "29.6.0",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
-			"integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+			"integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
 			"dependencies": {
 				"@sinclair/typebox": "^0.27.8"
 			},
@@ -5621,7 +5756,6 @@
 			"version": "29.6.0",
 			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
 			"integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
-			"dev": true,
 			"dependencies": {
 				"@jridgewell/trace-mapping": "^0.3.18",
 				"callsites": "^3.0.0",
@@ -5635,7 +5769,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
 			"integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
-			"dev": true,
 			"dependencies": {
 				"@jest/console": "^29.6.2",
 				"@jest/types": "^29.6.1",
@@ -5650,7 +5783,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
 			"integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
-			"dev": true,
 			"dependencies": {
 				"@jest/test-result": "^29.6.2",
 				"graceful-fs": "^4.2.9",
@@ -5662,22 +5794,21 @@
 			}
 		},
 		"node_modules/@jest/transform": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
-			"integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
-			"dev": true,
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+			"integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
 			"dependencies": {
 				"@babel/core": "^7.11.6",
-				"@jest/types": "^29.6.1",
+				"@jest/types": "^29.6.3",
 				"@jridgewell/trace-mapping": "^0.3.18",
 				"babel-plugin-istanbul": "^6.1.1",
 				"chalk": "^4.0.0",
 				"convert-source-map": "^2.0.0",
 				"fast-json-stable-stringify": "^2.1.0",
 				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.6.2",
-				"jest-regex-util": "^29.4.3",
-				"jest-util": "^29.6.2",
+				"jest-haste-map": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-util": "^29.7.0",
 				"micromatch": "^4.0.4",
 				"pirates": "^4.0.4",
 				"slash": "^3.0.0",
@@ -5690,14 +5821,12 @@
 		"node_modules/@jest/transform/node_modules/convert-source-map": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-			"dev": true
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
 		},
 		"node_modules/@jest/transform/node_modules/write-file-atomic": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
 			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-			"dev": true,
 			"dependencies": {
 				"imurmurhash": "^0.1.4",
 				"signal-exit": "^3.0.7"
@@ -5707,11 +5836,11 @@
 			}
 		},
 		"node_modules/@jest/types": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
-			"integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
 			"dependencies": {
-				"@jest/schemas": "^29.6.0",
+				"@jest/schemas": "^29.6.3",
 				"@types/istanbul-lib-coverage": "^2.0.0",
 				"@types/istanbul-reports": "^3.0.0",
 				"@types/node": "*",
@@ -5723,13 +5852,13 @@
 			}
 		},
 		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-			"integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
 			"dependencies": {
-				"@jridgewell/set-array": "^1.0.1",
+				"@jridgewell/set-array": "^1.2.1",
 				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/trace-mapping": "^0.3.24"
 			},
 			"engines": {
 				"node": ">=6.0.0"
@@ -5744,9 +5873,9 @@
 			}
 		},
 		"node_modules/@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
 			"engines": {
 				"node": ">=6.0.0"
 			}
@@ -5761,19 +5890,25 @@
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.14",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-			"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+			"version": "1.4.15",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
 		},
 		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.19",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-			"integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+			"version": "0.3.25",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
 			"dependencies": {
 				"@jridgewell/resolve-uri": "^3.1.0",
 				"@jridgewell/sourcemap-codec": "^1.4.14"
 			}
 		},
+		"node_modules/@jsdevtools/ono": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
+			"integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
+			"dev": true
+		},
 		"node_modules/@juggle/resize-observer": {
 			"version": "3.4.0",
 			"resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz",
@@ -5784,7 +5919,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
 			"integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==",
-			"dev": true,
 			"dependencies": {
 				"debug": "^4.1.1"
 			}
@@ -5792,14 +5926,12 @@
 		"node_modules/@kwsites/promise-deferred": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz",
-			"integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
-			"dev": true
+			"integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="
 		},
 		"node_modules/@leichtgewicht/ip-codec": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-			"dev": true
+			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
 		},
 		"node_modules/@lerna/child-process": {
 			"version": "7.1.4",
@@ -5991,9 +6123,9 @@
 			}
 		},
 		"node_modules/@lerna/create/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -6076,9 +6208,9 @@
 			}
 		},
 		"node_modules/@lerna/create/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
@@ -6097,9 +6229,9 @@
 			}
 		},
 		"node_modules/@lerna/create/node_modules/validate-npm-package-name/node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
+			"integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
 			"dev": true,
 			"dependencies": {
 				"semver": "^7.0.0"
@@ -6111,15 +6243,6 @@
 			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 			"dev": true
 		},
-		"node_modules/@lerna/create/node_modules/yargs-parser": {
-			"version": "20.2.4",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/@mdx-js/react": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.3.0.tgz",
@@ -6149,20 +6272,42 @@
 			}
 		},
 		"node_modules/@ndelangen/get-tarball/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
 			}
 		},
+		"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+			"version": "5.1.1-v1",
+			"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+			"integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+			"license": "MIT",
+			"dependencies": {
+				"eslint-scope": "5.1.1"
+			}
+		},
+		"node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz",
 			"integrity": "sha512-wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w==",
-			"dev": true,
 			"dependencies": {
 				"@nodelib/fs.stat": "2.0.2",
 				"run-parallel": "^1.1.9"
@@ -6171,20 +6316,10 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/@nodelib/fs.scandir/node_modules/@nodelib/fs.stat": {
+		"node_modules/@nodelib/fs.stat": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz",
 			"integrity": "sha512-z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-			"dev": true,
 			"engines": {
 				"node": ">= 8"
 			}
@@ -6193,7 +6328,6 @@
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz",
 			"integrity": "sha512-l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA==",
-			"dev": true,
 			"dependencies": {
 				"@nodelib/fs.scandir": "2.1.2",
 				"fastq": "^1.6.0"
@@ -6202,6 +6336,18 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/@npmcli/fs": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
+			"integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
+			"dev": true,
+			"dependencies": {
+				"semver": "^7.3.5"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			}
+		},
 		"node_modules/@npmcli/git": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz",
@@ -6262,9 +6408,9 @@
 			}
 		},
 		"node_modules/@npmcli/installed-package-contents/node_modules/npm-bundled": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz",
-			"integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
+			"integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
 			"dev": true,
 			"dependencies": {
 				"npm-normalize-package-bin": "^3.0.0"
@@ -6416,15 +6562,12 @@
 			}
 		},
 		"node_modules/@nx/devkit/node_modules/tmp": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-			"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+			"integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
 			"dev": true,
-			"dependencies": {
-				"rimraf": "^3.0.0"
-			},
 			"engines": {
-				"node": ">=8.17.0"
+				"node": ">=14.14"
 			}
 		},
 		"node_modules/@nx/devkit/node_modules/yallist": {
@@ -6597,7 +6740,6 @@
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
 			"integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/types": "^6.0.3"
 			}
@@ -6606,7 +6748,6 @@
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
 			"integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/auth-token": "^2.4.4",
 				"@octokit/graphql": "^4.5.8",
@@ -6621,7 +6762,6 @@
 			"version": "6.0.12",
 			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
 			"integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/types": "^6.0.3",
 				"is-plain-object": "^5.0.0",
@@ -6632,7 +6772,6 @@
 			"version": "5.6.3",
 			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
 			"integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/endpoint": "^6.0.1",
 				"@octokit/request-error": "^2.1.0",
@@ -6645,54 +6784,31 @@
 		"node_modules/@octokit/core/node_modules/before-after-hook": {
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
-			"integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
-			"dev": true
-		},
-		"node_modules/@octokit/core/node_modules/node-fetch": {
-			"version": "2.6.12",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-			"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-			"dev": true,
-			"dependencies": {
-				"whatwg-url": "^5.0.0"
-			},
-			"engines": {
-				"node": "4.x || >=6.0.0"
-			},
-			"peerDependencies": {
-				"encoding": "^0.1.0"
-			},
-			"peerDependenciesMeta": {
-				"encoding": {
-					"optional": true
-				}
-			}
+			"integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
 		},
 		"node_modules/@octokit/core/node_modules/universal-user-agent": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-			"integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-			"dev": true
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+			"integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ=="
 		},
 		"node_modules/@octokit/endpoint": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.1.2.tgz",
-			"integrity": "sha512-bBGGmcRFq1x0jrB29G/9KjYmO3cdHfk3476B2JOHRvLsNw1Pn3l+ZvbiqtcO9qAS4Ti+zFedLB84ziHZRZclQA==",
+			"version": "5.5.3",
+			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.3.tgz",
+			"integrity": "sha512-EzKwkwcxeegYYah5ukEeAI/gYRLv2Y9U5PpIsseGSFDk+G3RbipQGBs8GuYS1TLCtQaqoO66+aQGtITPalxsNQ==",
 			"dev": true,
 			"dependencies": {
-				"deepmerge": "3.2.0",
+				"@octokit/types": "^2.0.0",
 				"is-plain-object": "^3.0.0",
-				"universal-user-agent": "^2.1.0",
-				"url-template": "^2.0.8"
+				"universal-user-agent": "^5.0.0"
 			}
 		},
-		"node_modules/@octokit/endpoint/node_modules/deepmerge": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.2.0.tgz",
-			"integrity": "sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==",
+		"node_modules/@octokit/endpoint/node_modules/@octokit/types": {
+			"version": "2.16.2",
+			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
+			"integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+			"dependencies": {
+				"@types/node": ">= 8"
 			}
 		},
 		"node_modules/@octokit/endpoint/node_modules/is-plain-object": {
@@ -6704,11 +6820,19 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/@octokit/endpoint/node_modules/universal-user-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
+			"integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
+			"dev": true,
+			"dependencies": {
+				"os-name": "^3.1.0"
+			}
+		},
 		"node_modules/@octokit/graphql": {
 			"version": "4.8.0",
 			"resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
 			"integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/request": "^5.6.0",
 				"@octokit/types": "^6.0.3",
@@ -6719,7 +6843,6 @@
 			"version": "6.0.12",
 			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
 			"integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/types": "^6.0.3",
 				"is-plain-object": "^5.0.0",
@@ -6730,7 +6853,6 @@
 			"version": "5.6.3",
 			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
 			"integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/endpoint": "^6.0.1",
 				"@octokit/request-error": "^2.1.0",
@@ -6740,37 +6862,15 @@
 				"universal-user-agent": "^6.0.0"
 			}
 		},
-		"node_modules/@octokit/graphql/node_modules/node-fetch": {
-			"version": "2.6.12",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-			"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-			"dev": true,
-			"dependencies": {
-				"whatwg-url": "^5.0.0"
-			},
-			"engines": {
-				"node": "4.x || >=6.0.0"
-			},
-			"peerDependencies": {
-				"encoding": "^0.1.0"
-			},
-			"peerDependenciesMeta": {
-				"encoding": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/@octokit/graphql/node_modules/universal-user-agent": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-			"integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-			"dev": true
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+			"integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ=="
 		},
 		"node_modules/@octokit/openapi-types": {
 			"version": "11.2.0",
 			"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-			"integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==",
-			"dev": true
+			"integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="
 		},
 		"node_modules/@octokit/plugin-enterprise-rest": {
 			"version": "6.0.1",
@@ -6782,7 +6882,6 @@
 			"version": "2.21.3",
 			"resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz",
 			"integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/types": "^6.40.0"
 			},
@@ -6793,14 +6892,12 @@
 		"node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
 			"version": "12.11.0",
 			"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
-			"integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==",
-			"dev": true
+			"integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="
 		},
 		"node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
 			"version": "6.41.0",
 			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
 			"integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/openapi-types": "^12.11.0"
 			}
@@ -6818,7 +6915,6 @@
 			"version": "5.16.2",
 			"resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz",
 			"integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/types": "^6.39.0",
 				"deprecation": "^2.3.1"
@@ -6830,14 +6926,12 @@
 		"node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
 			"version": "12.11.0",
 			"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
-			"integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==",
-			"dev": true
+			"integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="
 		},
 		"node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
 			"version": "6.41.0",
 			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
 			"integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/openapi-types": "^12.11.0"
 			}
@@ -6861,7 +6955,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
 			"integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/types": "^6.0.3",
 				"deprecation": "^2.0.0",
@@ -6948,25 +7041,21 @@
 			"version": "6.34.0",
 			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
 			"integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
-			"dev": true,
 			"dependencies": {
 				"@octokit/openapi-types": "^11.2.0"
 			}
 		},
-		"node_modules/@octokit/webhooks": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-7.1.0.tgz",
-			"integrity": "sha512-kHyYkJkqY/wiP/hp0IT9FhkY5PhnV01co16V2YMRP/Zgnk3Vsy3U5iLAaP6U/0eRIlz5T4LSvkrcfNlfSb3cVQ==",
-			"dev": true,
-			"dependencies": {
-				"debug": "^4.0.0"
-			}
+		"node_modules/@octokit/webhooks-methods": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@octokit/webhooks-methods/-/webhooks-methods-2.0.0.tgz",
+			"integrity": "sha512-35cfQ4YWlnZnmZKmIxlGPUPLtbkF8lr/A/1Sk1eC0ddLMwQN06dOuLc+dI3YLQS+T+MoNt3DIQ0NynwgKPilig==",
+			"license": "MIT"
 		},
 		"node_modules/@octokit/webhooks-types": {
-			"version": "5.6.0",
-			"resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-5.6.0.tgz",
-			"integrity": "sha512-y3MqE6N6Ksg1+YV0sXVpW2WP7Y24h7rUp2hDJuzoqWdKGr7owmRDyHC72INwfCYNzura/vsNPXvc6Xbfp4wGGw==",
-			"dev": true
+			"version": "5.8.0",
+			"resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-5.8.0.tgz",
+			"integrity": "sha512-8adktjIb76A7viIdayQSFuBEwOzwhDC+9yxZpKNHjfzrlostHCw0/N7JWpWMObfElwvJMk2fY2l1noENCk9wmw==",
+			"license": "MIT"
 		},
 		"node_modules/@parcel/watcher": {
 			"version": "2.0.4",
@@ -7000,7 +7089,6 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz",
 			"integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==",
-			"dev": true,
 			"dependencies": {
 				"cross-spawn": "^7.0.3",
 				"fast-glob": "^3.3.0",
@@ -7020,7 +7108,6 @@
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
 			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -7034,7 +7121,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
 			"integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -7043,10 +7129,9 @@
 			}
 		},
 		"node_modules/@pkgr/utils/node_modules/fast-glob": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-			"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-			"dev": true,
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
 			"dependencies": {
 				"@nodelib/fs.stat": "^2.0.2",
 				"@nodelib/fs.walk": "^1.2.3",
@@ -7062,7 +7147,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -7074,7 +7158,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
 			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-			"dev": true,
 			"dependencies": {
 				"is-docker": "^2.0.0"
 			},
@@ -7086,7 +7169,6 @@
 			"version": "9.1.0",
 			"resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz",
 			"integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==",
-			"dev": true,
 			"dependencies": {
 				"default-browser": "^4.0.0",
 				"define-lazy-prop": "^3.0.0",
@@ -7104,7 +7186,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -7113,7 +7194,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -7125,7 +7205,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -7134,7 +7213,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -7146,25 +7224,24 @@
 			}
 		},
 		"node_modules/@playwright/test": {
-			"version": "1.39.0",
-			"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.39.0.tgz",
-			"integrity": "sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==",
+			"version": "1.48.1",
+			"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.1.tgz",
+			"integrity": "sha512-s9RtWoxkOLmRJdw3oFvhFbs9OJS0BzrLUc8Hf6l2UdCNd1rqeEyD4BhCJkvzeEoD1FsK4mirsWwGerhVmYKtZg==",
 			"dev": true,
 			"dependencies": {
-				"playwright": "1.39.0"
+				"playwright": "1.48.1"
 			},
 			"bin": {
 				"playwright": "cli.js"
 			},
 			"engines": {
-				"node": ">=16"
+				"node": ">=18"
 			}
 		},
 		"node_modules/@pmmmwh/react-refresh-webpack-plugin": {
 			"version": "0.5.11",
 			"resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.11.tgz",
 			"integrity": "sha512-7j/6vdTym0+qZ6u4XbSAxrWBGYSdCfTzySkj7WAFgDLmSyWlOrWvpyzxlFh5jtw9dn0oL/jtW+06XfFiisN3JQ==",
-			"dev": true,
 			"dependencies": {
 				"ansi-html-community": "^0.0.8",
 				"common-path-prefix": "^3.0.0",
@@ -7214,7 +7291,6 @@
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -7230,7 +7306,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
 			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-			"dev": true,
 			"dependencies": {
 				"locate-path": "^6.0.0",
 				"path-exists": "^4.0.0"
@@ -7246,7 +7321,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
 			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-			"dev": true,
 			"dependencies": {
 				"p-locate": "^5.0.0"
 			},
@@ -7261,7 +7335,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
 			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-			"dev": true,
 			"dependencies": {
 				"p-limit": "^3.0.2"
 			},
@@ -7276,7 +7349,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
 			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -7285,7 +7357,6 @@
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
 			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dev": true,
 			"dependencies": {
 				"@types/json-schema": "^7.0.8",
 				"ajv": "^6.12.5",
@@ -7303,7 +7374,6 @@
 			"version": "0.7.4",
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
 			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-			"dev": true,
 			"engines": {
 				"node": ">= 8"
 			}
@@ -7311,24 +7381,15 @@
 		"node_modules/@polka/url": {
 			"version": "1.0.0-next.23",
 			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.23.tgz",
-			"integrity": "sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==",
-			"dev": true
-		},
-		"node_modules/@popperjs/core": {
-			"version": "2.11.7",
-			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
-			"integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/popperjs"
-			}
+			"integrity": "sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg=="
 		},
 		"node_modules/@preact/signals": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.1.3.tgz",
-			"integrity": "sha512-N09DuAVvc90bBZVRwD+aFhtGyHAmJLhS3IFoawO/bYJRcil4k83nBOchpCEoS0s5+BXBpahgp0Mjf+IOqP57Og==",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.3.0.tgz",
+			"integrity": "sha512-EOMeg42SlLS72dhoq6Vjq08havnLseWmPQ8A0YsgIAqMgWgx7V1a39+Pxo6i7SY5NwJtH4849JogFq3M67AzWg==",
+			"license": "MIT",
 			"dependencies": {
-				"@preact/signals-core": "^1.2.3"
+				"@preact/signals-core": "^1.7.0"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -7339,9 +7400,10 @@
 			}
 		},
 		"node_modules/@preact/signals-core": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.4.0.tgz",
-			"integrity": "sha512-5iYoZBhELLIhUQceZI7sDTQWPb+xcVSn2qk8T/aNl/VMh+A4AiPX9YRSh4XO7fZ6pncrVxl1Iln82poVqYVbbw==",
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.8.0.tgz",
+			"integrity": "sha512-OBvUsRZqNmjzCZXWLxkZfhcgT+Fk8DDcT/8vD6a1xhDemodyy87UJRJfASMuSD8FaAIeGgGm85ydXhm7lr4fyA==",
+			"license": "MIT",
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/preact"
@@ -7351,7 +7413,6 @@
 			"version": "1.4.6",
 			"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.6.tgz",
 			"integrity": "sha512-x4BEjr2SjOPowNeiguzjozQbsc6h437ovD/wu+JpaenxVLm3jkgzHY2xOslMTp50HoTvQreMjiexiGQw1sqZlQ==",
-			"dev": true,
 			"dependencies": {
 				"debug": "4.3.4",
 				"extract-zip": "2.0.1",
@@ -7380,7 +7441,6 @@
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
 			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-			"dev": true,
 			"dependencies": {
 				"string-width": "^4.2.0",
 				"strip-ansi": "^6.0.1",
@@ -7393,14 +7453,12 @@
 		"node_modules/@puppeteer/browsers/node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
 		"node_modules/@puppeteer/browsers/node_modules/extract-zip": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
 			"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-			"dev": true,
 			"dependencies": {
 				"debug": "^4.1.1",
 				"get-stream": "^5.1.0",
@@ -7420,16 +7478,15 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/@puppeteer/browsers/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-			"dev": true,
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
@@ -7439,7 +7496,6 @@
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
@@ -7453,7 +7509,6 @@
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
 			"integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
-			"dev": true,
 			"dependencies": {
 				"mkdirp-classic": "^0.5.2",
 				"pump": "^3.0.0",
@@ -7461,10 +7516,9 @@
 			}
 		},
 		"node_modules/@puppeteer/browsers/node_modules/tar-stream": {
-			"version": "3.1.6",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-			"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
-			"dev": true,
+			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+			"integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
 			"dependencies": {
 				"b4a": "^1.6.4",
 				"fast-fifo": "^1.2.0",
@@ -7475,7 +7529,6 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
 			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.0.0",
 				"string-width": "^4.1.0",
@@ -7492,7 +7545,6 @@
 			"version": "5.0.8",
 			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
 			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -7501,7 +7553,6 @@
 			"version": "17.7.1",
 			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
 			"integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-			"dev": true,
 			"dependencies": {
 				"cliui": "^8.0.1",
 				"escalade": "^3.1.1",
@@ -7519,7 +7570,6 @@
 			"version": "21.1.1",
 			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
 			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			}
@@ -7534,379 +7584,205 @@
 			}
 		},
 		"node_modules/@radix-ui/primitive": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.0.tgz",
-			"integrity": "sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.1.tgz",
+			"integrity": "sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10"
 			}
 		},
 		"node_modules/@radix-ui/react-arrow": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.2.tgz",
-			"integrity": "sha512-fqYwhhI9IarZ0ll2cUSfKuXHlJK0qE4AfnRrPBbRwEH/4mGQn04/QFGomLi8TXWIdv9WJk//KgGm+aDxVIr1wA==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.3.tgz",
+			"integrity": "sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==",
+			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-primitive": "1.0.2"
+				"@radix-ui/react-primitive": "1.0.3"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
 				"react": "^16.8 || ^17.0 || ^18.0",
 				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-arrow/node_modules/@radix-ui/react-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-			"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.1"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-arrow/node_modules/@radix-ui/react-slot": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-			"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@radix-ui/react-collection": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.0.2.tgz",
-			"integrity": "sha512-s8WdQQ6wNXpaxdZ308KSr8fEWGrg4un8i4r/w7fhiS4ElRNjk5rRcl0/C6TANG2LvLOGIxtzo/jAg6Qf73TEBw==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-slot": "1.0.1"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-			"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.0.3.tgz",
+			"integrity": "sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==",
+			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.1"
+				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/react-context": "1.0.1",
+				"@radix-ui/react-primitive": "1.0.3",
+				"@radix-ui/react-slot": "1.0.2"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
 				"react": "^16.8 || ^17.0 || ^18.0",
 				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-slot": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-			"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@radix-ui/react-compose-refs": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz",
-			"integrity": "sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz",
+			"integrity": "sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
 				"react": "^16.8 || ^17.0 || ^18.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@radix-ui/react-context": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.0.tgz",
-			"integrity": "sha512-1pVM9RfOQ+n/N5PJK33kRSKsr1glNxomxONs5c49MliinBY6Yw2Q995qfBUUo0/Mbg05B/sGA0gkgPI7kmSHBg==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.1.tgz",
+			"integrity": "sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
 				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-dialog": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.0.tgz",
-			"integrity": "sha512-Yn9YU+QlHYLWwV1XfKiqnGVpWYWk6MeBVM6x/bcoyPvxgjQGoeT35482viLPctTMWoMw0PoHgqfSox7Ig+957Q==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-dismissable-layer": "1.0.0",
-				"@radix-ui/react-focus-guards": "1.0.0",
-				"@radix-ui/react-focus-scope": "1.0.0",
-				"@radix-ui/react-id": "1.0.0",
-				"@radix-ui/react-portal": "1.0.0",
-				"@radix-ui/react-presence": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.0",
-				"@radix-ui/react-slot": "1.0.0",
-				"@radix-ui/react-use-controllable-state": "1.0.0",
-				"aria-hidden": "^1.1.1",
-				"react-remove-scroll": "2.5.4"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@radix-ui/react-direction": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.0.tgz",
-			"integrity": "sha512-2HV05lGUgYcA6xgLQ4BKPDmtL+QbIZYH5fCOTAOOcJ5O0QbWS3i9lKaurLzliYUDhORI2Qr3pyjhJh44lKA3rQ==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.1.tgz",
+			"integrity": "sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==",
+			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
 				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-dismissable-layer": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.0.tgz",
-			"integrity": "sha512-n7kDRfx+LB1zLueRDvZ1Pd0bxdJWDUZNQ/GWoxDn2prnuJKRdxsjulejX/ePkOsLi2tTm6P24mDqlMSgQpsT6g==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.0",
-				"@radix-ui/react-use-callback-ref": "1.0.0",
-				"@radix-ui/react-use-escape-keydown": "1.0.0"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-dropdown-menu": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.0.4.tgz",
-			"integrity": "sha512-y6AT9+MydyXcByivdK1+QpjWoKaC7MLjkS/cH1Q3keEyMvDkiY85m8o2Bi6+Z1PPUlCsMULopxagQOSfN0wahg==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-id": "1.0.0",
-				"@radix-ui/react-menu": "2.0.4",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-use-controllable-state": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@radix-ui/react-dropdown-menu/node_modules/@radix-ui/react-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-			"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
+		"node_modules/@radix-ui/react-dismissable-layer": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.4.tgz",
+			"integrity": "sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.1"
+				"@radix-ui/primitive": "1.0.1",
+				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/react-primitive": "1.0.3",
+				"@radix-ui/react-use-callback-ref": "1.0.1",
+				"@radix-ui/react-use-escape-keydown": "1.0.3"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
 				"react": "^16.8 || ^17.0 || ^18.0",
 				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-dropdown-menu/node_modules/@radix-ui/react-slot": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-			"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@radix-ui/react-focus-guards": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.0.tgz",
-			"integrity": "sha512-UagjDk4ijOAnGu4WMUPj9ahi7/zJJqNZ9ZAiGPp7waUWJO0O1aWXi/udPphI0IUjvrhBsZJGSN66dR2dsueLWQ==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz",
+			"integrity": "sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
 				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-focus-scope": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.0.tgz",
-			"integrity": "sha512-C4SWtsULLGf/2L4oGeIHlvWQx7Rf+7cX/vKOAD2dXW0A1b5QXwi3wWeaEgW+wn+SEVrraMUk05vLU9fZZz5HbQ==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.0",
-				"@radix-ui/react-use-callback-ref": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-id": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.0.tgz",
-			"integrity": "sha512-Q6iAB/U7Tq3NTolBBQbHTgclPmGWE3OlktGGqrClPozSw4vkQ1DfQAOtzgRPecKsMdJINE05iaoDUG8tRzCBjw==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-layout-effect": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-menu": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.0.4.tgz",
-			"integrity": "sha512-mzKR47tZ1t193trEqlQoJvzY4u9vYfVH16ryBrVrCAGZzkgyWnMQYEZdUkM7y8ak9mrkKtJiqB47TlEnubeOFQ==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-collection": "1.0.2",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-direction": "1.0.0",
-				"@radix-ui/react-dismissable-layer": "1.0.3",
-				"@radix-ui/react-focus-guards": "1.0.0",
-				"@radix-ui/react-focus-scope": "1.0.2",
-				"@radix-ui/react-id": "1.0.0",
-				"@radix-ui/react-popper": "1.1.1",
-				"@radix-ui/react-portal": "1.0.2",
-				"@radix-ui/react-presence": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-roving-focus": "1.0.3",
-				"@radix-ui/react-slot": "1.0.1",
-				"@radix-ui/react-use-callback-ref": "1.0.0",
-				"aria-hidden": "^1.1.1",
-				"react-remove-scroll": "2.5.5"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-dismissable-layer": {
+		"node_modules/@radix-ui/react-focus-scope": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.3.tgz",
-			"integrity": "sha512-nXZOvFjOuHS1ovumntGV7NNoLaEp9JEvTht3MBjP44NSW5hUKj/8OnfN3+8WmB+CEhN44XaGhpHoSsUIEl5P7Q==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-use-callback-ref": "1.0.0",
-				"@radix-ui/react-use-escape-keydown": "1.0.2"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-focus-scope": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.2.tgz",
-			"integrity": "sha512-spwXlNTfeIprt+kaEWE/qYuYT3ZAqJiAGjN/JgdvgVDTu8yc+HuX+WOWXrKliKnLnwck0F6JDkqIERncnih+4A==",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.3.tgz",
+			"integrity": "sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-use-callback-ref": "1.0.0"
+				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/react-primitive": "1.0.3",
+				"@radix-ui/react-use-callback-ref": "1.0.1"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
 				"react": "^16.8 || ^17.0 || ^18.0",
 				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-portal": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.2.tgz",
-			"integrity": "sha512-swu32idoCW7KA2VEiUZGBSu9nB6qwGdV6k6HYhUoOo3M1FFpD+VgLzUqtt3mwL1ssz7r2x8MggpLSQach2Xy/Q==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-primitive": "1.0.2"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-			"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.1"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-slot": {
+		"node_modules/@radix-ui/react-id": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-			"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.1.tgz",
+			"integrity": "sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0"
+				"@radix-ui/react-use-layout-effect": "1.0.1"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
 				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-use-escape-keydown": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.2.tgz",
-			"integrity": "sha512-DXGim3x74WgUv+iMNCF+cAo8xUHHeqvjx8zs7trKf+FkQKPQXLk2sX7Gx1ysH7Q76xCpZuxIJE7HLPxRE+Q+GA==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-callback-ref": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-menu/node_modules/react-remove-scroll": {
-			"version": "2.5.5",
-			"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
-			"integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
-			"dependencies": {
-				"react-remove-scroll-bar": "^2.3.3",
-				"react-style-singleton": "^2.2.1",
-				"tslib": "^2.1.0",
-				"use-callback-ref": "^1.3.0",
-				"use-sidecar": "^1.1.2"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"peerDependencies": {
-				"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			},
 			"peerDependenciesMeta": {
 				"@types/react": {
@@ -7915,162 +7791,117 @@
 			}
 		},
 		"node_modules/@radix-ui/react-popper": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.1.1.tgz",
-			"integrity": "sha512-keYDcdMPNMjSC8zTsZ8wezUMiWM9Yj14wtF3s0PTIs9srnEPC9Kt2Gny1T3T81mmSeyDjZxsD9N5WCwNNb712w==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@floating-ui/react-dom": "0.7.2",
-				"@radix-ui/react-arrow": "1.0.2",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-use-callback-ref": "1.0.0",
-				"@radix-ui/react-use-layout-effect": "1.0.0",
-				"@radix-ui/react-use-rect": "1.0.0",
-				"@radix-ui/react-use-size": "1.0.0",
-				"@radix-ui/rect": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-popper/node_modules/@floating-ui/core": {
-			"version": "0.7.3",
-			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.3.tgz",
-			"integrity": "sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg=="
-		},
-		"node_modules/@radix-ui/react-popper/node_modules/@floating-ui/dom": {
-			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.4.tgz",
-			"integrity": "sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==",
-			"dependencies": {
-				"@floating-ui/core": "^0.7.3"
-			}
-		},
-		"node_modules/@radix-ui/react-popper/node_modules/@floating-ui/react-dom": {
-			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-0.7.2.tgz",
-			"integrity": "sha512-1T0sJcpHgX/u4I1OzIEhlcrvkUN8ln39nz7fMoE/2HDHrPiMFoOGR7++GYyfUmIQHkkrTinaeQsO3XWubjSvGg==",
-			"dependencies": {
-				"@floating-ui/dom": "^0.5.3",
-				"use-isomorphic-layout-effect": "^1.1.1"
-			},
-			"peerDependencies": {
-				"react": ">=16.8.0",
-				"react-dom": ">=16.8.0"
-			}
-		},
-		"node_modules/@radix-ui/react-popper/node_modules/@radix-ui/react-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-			"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.1.2.tgz",
+			"integrity": "sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==",
+			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.1"
+				"@floating-ui/react-dom": "^2.0.0",
+				"@radix-ui/react-arrow": "1.0.3",
+				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/react-context": "1.0.1",
+				"@radix-ui/react-primitive": "1.0.3",
+				"@radix-ui/react-use-callback-ref": "1.0.1",
+				"@radix-ui/react-use-layout-effect": "1.0.1",
+				"@radix-ui/react-use-rect": "1.0.1",
+				"@radix-ui/react-use-size": "1.0.1",
+				"@radix-ui/rect": "1.0.1"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
 				"react": "^16.8 || ^17.0 || ^18.0",
 				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-popper/node_modules/@radix-ui/react-slot": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-			"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@radix-ui/react-portal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.0.tgz",
-			"integrity": "sha512-a8qyFO/Xb99d8wQdu4o7qnigNjTPG123uADNecz0eX4usnQEj7o+cG4ZX4zkqq98NYekT7UoEQIjxBNWIFuqTA==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.3.tgz",
+			"integrity": "sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-primitive": "1.0.0"
+				"@radix-ui/react-primitive": "1.0.3"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
 				"react": "^16.8 || ^17.0 || ^18.0",
 				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-presence": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.0.tgz",
-			"integrity": "sha512-A+6XEvN01NfVWiKu38ybawfHsBjWum42MRPnEuqPsBZ4eV7e/7K321B5VgYMPv3Xx5An6o1/l9ZuDBgmcmWK3w==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-use-layout-effect": "1.0.0"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@radix-ui/react-primitive": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.0.tgz",
-			"integrity": "sha512-EyXe6mnRlHZ8b6f4ilTDrXmkLShICIuOTTj0GX4w1rp+wSxf3+TD05u1UOITC8VsJ2a9nwHvdXtOXEOl0Cw/zQ==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-roving-focus": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.3.tgz",
-			"integrity": "sha512-stjCkIoMe6h+1fWtXlA6cRfikdBzCLp3SnVk7c48cv/uy3DTGoXhN76YaOYUJuy3aEDvDIKwKR5KSmvrtPvQPQ==",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz",
+			"integrity": "sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-collection": "1.0.2",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-direction": "1.0.0",
-				"@radix-ui/react-id": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-use-callback-ref": "1.0.0",
-				"@radix-ui/react-use-controllable-state": "1.0.0"
+				"@radix-ui/react-slot": "1.0.2"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
 				"react": "^16.8 || ^17.0 || ^18.0",
 				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@radix-ui/react-roving-focus/node_modules/@radix-ui/react-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-			"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
+		"node_modules/@radix-ui/react-roving-focus": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.4.tgz",
+			"integrity": "sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==",
+			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.1"
+				"@radix-ui/primitive": "1.0.1",
+				"@radix-ui/react-collection": "1.0.3",
+				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/react-context": "1.0.1",
+				"@radix-ui/react-direction": "1.0.1",
+				"@radix-ui/react-id": "1.0.1",
+				"@radix-ui/react-primitive": "1.0.3",
+				"@radix-ui/react-use-callback-ref": "1.0.1",
+				"@radix-ui/react-use-controllable-state": "1.0.1"
 			},
 			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
 				"react": "^16.8 || ^17.0 || ^18.0",
 				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-roving-focus/node_modules/@radix-ui/react-slot": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-			"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0"
 			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@radix-ui/react-select": {
@@ -8117,32 +7948,10 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@floating-ui/react-dom": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.1.tgz",
-			"integrity": "sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==",
-			"dev": true,
-			"dependencies": {
-				"@floating-ui/dom": "^1.3.0"
-			},
-			"peerDependencies": {
-				"react": ">=16.8.0",
-				"react-dom": ">=16.8.0"
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/primitive": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.1.tgz",
-			"integrity": "sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-arrow": {
+		"node_modules/@radix-ui/react-separator": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.3.tgz",
-			"integrity": "sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.0.3.tgz",
+			"integrity": "sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==",
 			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
@@ -8163,76 +7972,14 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-collection": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.0.3.tgz",
-			"integrity": "sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==",
-			"dev": true,
+		"node_modules/@radix-ui/react-slot": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
+			"integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.1",
-				"@radix-ui/react-context": "1.0.1",
-				"@radix-ui/react-primitive": "1.0.3",
-				"@radix-ui/react-slot": "1.0.2"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"@types/react-dom": "*",
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				},
-				"@types/react-dom": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-compose-refs": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz",
-			"integrity": "sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"react": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-context": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.1.tgz",
-			"integrity": "sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"react": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-direction": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.1.tgz",
-			"integrity": "sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
+				"@radix-ui/react-compose-refs": "1.0.1"
 			},
 			"peerDependencies": {
 				"@types/react": "*",
@@ -8244,18 +7991,16 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-dismissable-layer": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.4.tgz",
-			"integrity": "sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==",
+		"node_modules/@radix-ui/react-toggle": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.0.3.tgz",
+			"integrity": "sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==",
 			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
 				"@radix-ui/primitive": "1.0.1",
-				"@radix-ui/react-compose-refs": "1.0.1",
 				"@radix-ui/react-primitive": "1.0.3",
-				"@radix-ui/react-use-callback-ref": "1.0.1",
-				"@radix-ui/react-use-escape-keydown": "1.0.3"
+				"@radix-ui/react-use-controllable-state": "1.0.1"
 			},
 			"peerDependencies": {
 				"@types/react": "*",
@@ -8272,34 +8017,20 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-focus-guards": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz",
-			"integrity": "sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"react": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-focus-scope": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.3.tgz",
-			"integrity": "sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==",
+		"node_modules/@radix-ui/react-toggle-group": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.0.4.tgz",
+			"integrity": "sha512-Uaj/M/cMyiyT9Bx6fOZO0SAG4Cls0GptBWiBmBxofmDbNVnYYoyRWj/2M/6VCi/7qcXFWnHhRUfdfZFvvkuu8A==",
 			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/primitive": "1.0.1",
+				"@radix-ui/react-context": "1.0.1",
+				"@radix-ui/react-direction": "1.0.1",
 				"@radix-ui/react-primitive": "1.0.3",
-				"@radix-ui/react-use-callback-ref": "1.0.1"
+				"@radix-ui/react-roving-focus": "1.0.4",
+				"@radix-ui/react-toggle": "1.0.3",
+				"@radix-ui/react-use-controllable-state": "1.0.1"
 			},
 			"peerDependencies": {
 				"@types/react": "*",
@@ -8316,90 +8047,20 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-id": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.1.tgz",
-			"integrity": "sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-layout-effect": "1.0.1"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"react": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-popper": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.1.2.tgz",
-			"integrity": "sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==",
+		"node_modules/@radix-ui/react-toolbar": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-toolbar/-/react-toolbar-1.0.4.tgz",
+			"integrity": "sha512-tBgmM/O7a07xbaEkYJWYTXkIdU/1pW4/KZORR43toC/4XWyBCURK0ei9kMUdp+gTPPKBgYLxXmRSH1EVcIDp8Q==",
 			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@floating-ui/react-dom": "^2.0.0",
-				"@radix-ui/react-arrow": "1.0.3",
-				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/primitive": "1.0.1",
 				"@radix-ui/react-context": "1.0.1",
+				"@radix-ui/react-direction": "1.0.1",
 				"@radix-ui/react-primitive": "1.0.3",
-				"@radix-ui/react-use-callback-ref": "1.0.1",
-				"@radix-ui/react-use-layout-effect": "1.0.1",
-				"@radix-ui/react-use-rect": "1.0.1",
-				"@radix-ui/react-use-size": "1.0.1",
-				"@radix-ui/rect": "1.0.1"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"@types/react-dom": "*",
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				},
-				"@types/react-dom": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-portal": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.3.tgz",
-			"integrity": "sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-primitive": "1.0.3"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"@types/react-dom": "*",
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				},
-				"@types/react-dom": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-primitive": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz",
-			"integrity": "sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.2"
+				"@radix-ui/react-roving-focus": "1.0.4",
+				"@radix-ui/react-separator": "1.0.3",
+				"@radix-ui/react-toggle-group": "1.0.4"
 			},
 			"peerDependencies": {
 				"@types/react": "*",
@@ -8416,30 +8077,11 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-slot": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
-			"integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.1"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"react": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-use-callback-ref": {
+		"node_modules/@radix-ui/react-use-callback-ref": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz",
 			"integrity": "sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==",
-			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10"
 			},
@@ -8453,11 +8095,11 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-use-controllable-state": {
+		"node_modules/@radix-ui/react-use-controllable-state": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz",
 			"integrity": "sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==",
-			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
 				"@radix-ui/react-use-callback-ref": "1.0.1"
@@ -8472,11 +8114,11 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-use-escape-keydown": {
+		"node_modules/@radix-ui/react-use-escape-keydown": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz",
 			"integrity": "sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==",
-			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
 				"@radix-ui/react-use-callback-ref": "1.0.1"
@@ -8491,11 +8133,11 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-use-layout-effect": {
+		"node_modules/@radix-ui/react-use-layout-effect": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz",
 			"integrity": "sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==",
-			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10"
 			},
@@ -8509,14 +8151,13 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-use-rect": {
+		"node_modules/@radix-ui/react-use-previous": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.1.tgz",
-			"integrity": "sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.0.1.tgz",
+			"integrity": "sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==",
 			"dev": true,
 			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/rect": "1.0.1"
+				"@babel/runtime": "^7.13.10"
 			},
 			"peerDependencies": {
 				"@types/react": "*",
@@ -8528,14 +8169,14 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-use-size": {
+		"node_modules/@radix-ui/react-use-rect": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.1.tgz",
-			"integrity": "sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.1.tgz",
+			"integrity": "sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==",
 			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-layout-effect": "1.0.1"
+				"@radix-ui/rect": "1.0.1"
 			},
 			"peerDependencies": {
 				"@types/react": "*",
@@ -8547,105 +8188,14 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-select/node_modules/@radix-ui/rect": {
+		"node_modules/@radix-ui/react-use-size": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.1.tgz",
-			"integrity": "sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"node_modules/@radix-ui/react-select/node_modules/react-remove-scroll": {
-			"version": "2.5.5",
-			"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
-			"integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.1.tgz",
+			"integrity": "sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==",
 			"dev": true,
-			"dependencies": {
-				"react-remove-scroll-bar": "^2.3.3",
-				"react-style-singleton": "^2.2.1",
-				"tslib": "^2.1.0",
-				"use-callback-ref": "^1.3.0",
-				"use-sidecar": "^1.1.2"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"peerDependencies": {
-				"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-slot": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.0.tgz",
-			"integrity": "sha512-3mrKauI/tWXo1Ll+gN5dHcxDPdm/Df1ufcDLCecn+pnCIVcdWE7CujXo8QaXOWRJyZyQWWbpB8eFwHzWXlv5mQ==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-use-callback-ref": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.0.tgz",
-			"integrity": "sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-use-controllable-state": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.0.tgz",
-			"integrity": "sha512-FohDoZvk3mEXh9AWAVyRTYR4Sq7/gavuofglmiXB2g1aKyboUD4YtgWxKj8O5n+Uak52gXQ4wKz5IFST4vtJHg==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-callback-ref": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-use-escape-keydown": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.0.tgz",
-			"integrity": "sha512-JwfBCUIfhXRxKExgIqGa4CQsiMemo1Xt0W/B4ei3fpzpvPENKpMKQ8mZSB6Acj3ebrAEgi2xiQvcI1PAAodvyg==",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-callback-ref": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-use-layout-effect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.0.tgz",
-			"integrity": "sha512-6Tpkq+R6LOlmQb1R5NNETLG0B4YP0wc+klfXafpUCj6JGyaUc8il7/kUZ7m59rGbXGczE9Bs+iz2qloqsZBduQ==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-use-previous": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.0.1.tgz",
-			"integrity": "sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
+				"@radix-ui/react-use-layout-effect": "1.0.1"
 			},
 			"peerDependencies": {
 				"@types/react": "*",
@@ -8657,30 +8207,6 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-use-rect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.0.tgz",
-			"integrity": "sha512-TB7pID8NRMEHxb/qQJpvSt3hQU4sqNPM1VCTjTRjEOa7cEop/QMuq8S6fb/5Tsz64kqSvB9WnwsDHtjnrM9qew==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/rect": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
-		"node_modules/@radix-ui/react-use-size": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.0.tgz",
-			"integrity": "sha512-imZ3aYcoYCKhhgNpkNDh/aTiU05qw9hX+HHI1QDBTyIlcFjgeFlKKySNGMwTp7nYFLQg/j0VA2FmCY4WPDDHMg==",
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-layout-effect": "1.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8 || ^17.0 || ^18.0"
-			}
-		},
 		"node_modules/@radix-ui/react-visually-hidden": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.3.tgz",
@@ -8705,71 +8231,11 @@
 				}
 			}
 		},
-		"node_modules/@radix-ui/react-visually-hidden/node_modules/@radix-ui/react-compose-refs": {
+		"node_modules/@radix-ui/rect": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz",
-			"integrity": "sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"react": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-visually-hidden/node_modules/@radix-ui/react-primitive": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz",
-			"integrity": "sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==",
-			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.2"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"@types/react-dom": "*",
-				"react": "^16.8 || ^17.0 || ^18.0",
-				"react-dom": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				},
-				"@types/react-dom": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/react-visually-hidden/node_modules/@radix-ui/react-slot": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
-			"integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+			"resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.1.tgz",
+			"integrity": "sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==",
 			"dev": true,
-			"dependencies": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.1"
-			},
-			"peerDependencies": {
-				"@types/react": "*",
-				"react": "^16.8 || ^17.0 || ^18.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@radix-ui/rect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.0.tgz",
-			"integrity": "sha512-d0O68AYy/9oeEy1DdC07bz1/ZXX+DqCskRd3i4JzLSTXwefzaepQrKjXC7aNM8lTHjFLDO0pDgaEiQ7jEk+HVg==",
 			"dependencies": {
 				"@babel/runtime": "^7.13.10"
 			}
@@ -8792,15 +8258,45 @@
 				"react-native": "*"
 			}
 		},
+		"node_modules/@react-native-community/cli": {
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-12.3.2.tgz",
+			"integrity": "sha512-WgoUWwLDcf/G1Su2COUUVs3RzAwnV/vUTdISSpAUGgSc57mPabaAoUctKTnfYEhCnE3j02k3VtaVPwCAFRO3TQ==",
+			"dependencies": {
+				"@react-native-community/cli-clean": "12.3.2",
+				"@react-native-community/cli-config": "12.3.2",
+				"@react-native-community/cli-debugger-ui": "12.3.2",
+				"@react-native-community/cli-doctor": "12.3.2",
+				"@react-native-community/cli-hermes": "12.3.2",
+				"@react-native-community/cli-plugin-metro": "12.3.2",
+				"@react-native-community/cli-server-api": "12.3.2",
+				"@react-native-community/cli-tools": "12.3.2",
+				"@react-native-community/cli-types": "12.3.2",
+				"chalk": "^4.1.2",
+				"commander": "^9.4.1",
+				"deepmerge": "^4.3.0",
+				"execa": "^5.0.0",
+				"find-up": "^4.1.0",
+				"fs-extra": "^8.1.0",
+				"graceful-fs": "^4.1.3",
+				"prompts": "^2.4.2",
+				"semver": "^7.5.2"
+			},
+			"bin": {
+				"react-native": "build/bin.js"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/@react-native-community/cli-clean": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-10.1.1.tgz",
-			"integrity": "sha512-iNsrjzjIRv9yb5y309SWJ8NDHdwYtnCpmxZouQDyOljUdC9MwdZ4ChbtA4rwQyAwgOVfS9F/j56ML3Cslmvrxg==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-12.3.2.tgz",
+			"integrity": "sha512-90k2hCX0ddSFPT7EN7h5SZj0XZPXP0+y/++v262hssoey3nhurwF57NGWN0XAR0o9BSW7+mBfeInfabzDraO6A==",
 			"dependencies": {
-				"@react-native-community/cli-tools": "^10.1.1",
+				"@react-native-community/cli-tools": "12.3.2",
 				"chalk": "^4.1.2",
-				"execa": "^1.0.0",
-				"prompts": "^2.4.0"
+				"execa": "^5.0.0"
 			}
 		},
 		"node_modules/@react-native-community/cli-clean/node_modules/chalk": {
@@ -8819,46 +8315,49 @@
 			}
 		},
 		"node_modules/@react-native-community/cli-clean/node_modules/cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dependencies": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
 			},
 			"engines": {
-				"node": ">=4.8"
+				"node": ">= 8"
 			}
 		},
 		"node_modules/@react-native-community/cli-clean/node_modules/execa": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dependencies": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.0.0",
-				"is-stream": "^1.1.0",
-				"npm-run-path": "^2.0.0",
-				"p-finally": "^1.0.0",
-				"signal-exit": "^3.0.0",
-				"strip-eof": "^1.0.0"
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
 		"node_modules/@react-native-community/cli-clean/node_modules/get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-			"dependencies": {
-				"pump": "^3.0.0"
-			},
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/@react-native-community/cli-clean/node_modules/has-flag": {
@@ -8869,26 +8368,88 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-clean/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-			"dependencies": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
+		"node_modules/@react-native-community/cli-clean/node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"engines": {
+				"node": ">=10.17.0"
 			}
 		},
-		"node_modules/@react-native-community/cli-clean/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"bin": {
-				"semver": "bin/semver"
+		"node_modules/@react-native-community/cli-clean/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@react-native-community/cli-clean/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+		"node_modules/@react-native-community/cli-clean/node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@react-native-community/cli-clean/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native-community/cli-clean/node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dependencies": {
+				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@react-native-community/cli-clean/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native-community/cli-clean/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native-community/cli-clean/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native-community/cli-clean/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dependencies": {
 				"has-flag": "^4.0.0"
@@ -8897,15 +8458,29 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/@react-native-community/cli-clean/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
 		"node_modules/@react-native-community/cli-config": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-10.1.1.tgz",
-			"integrity": "sha512-p4mHrjC+s/ayiNVG6T35GdEGdP6TuyBUg5plVGRJfTl8WT6LBfLYLk+fz/iETrEZ/YkhQIsQcEUQC47MqLNHog==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-12.3.2.tgz",
+			"integrity": "sha512-UUCzDjQgvAVL/57rL7eOuFUhd+d+6qfM7V8uOegQFeFEmSmvUUDLYoXpBa5vAK9JgQtSqMBJ1Shmwao+/oElxQ==",
 			"dependencies": {
-				"@react-native-community/cli-tools": "^10.1.1",
+				"@react-native-community/cli-tools": "12.3.2",
 				"chalk": "^4.1.2",
 				"cosmiconfig": "^5.1.0",
-				"deepmerge": "^3.2.0",
+				"deepmerge": "^4.3.0",
 				"glob": "^7.1.3",
 				"joi": "^17.2.1"
 			}
@@ -8939,14 +8514,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/@react-native-community/cli-config/node_modules/deepmerge": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz",
-			"integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/@react-native-community/cli-config/node_modules/glob": {
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -9010,47 +8577,35 @@
 			}
 		},
 		"node_modules/@react-native-community/cli-debugger-ui": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-10.0.0.tgz",
-			"integrity": "sha512-8UKLcvpSNxnUTRy8CkCl27GGLqZunQ9ncGYhSrWyKrU9SWBJJGeZwi2k2KaoJi5FvF2+cD0t8z8cU6lsq2ZZmA==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-12.3.2.tgz",
+			"integrity": "sha512-nSWQUL+51J682DlfcC1bjkUbQbGvHCC25jpqTwHIjmmVjYCX1uHuhPSqQKgPNdvtfOkrkACxczd7kVMmetxY2Q==",
 			"dependencies": {
 				"serve-static": "^1.13.1"
 			}
 		},
 		"node_modules/@react-native-community/cli-doctor": {
-			"version": "10.2.5",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-10.2.5.tgz",
-			"integrity": "sha512-1YbzXvsldBmSw1MmBsXB74bKiHXKNCjlb2ByLgkfTiarpSvETYam3g5vex0N+qc0Cdkzkq+8NznE744LFhnUpw==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-12.3.2.tgz",
+			"integrity": "sha512-GrAabdY4qtBX49knHFvEAdLtCjkmndjTeqhYO6BhsbAeKOtspcLT/0WRgdLIaKODRa61ADNB3K5Zm4dU0QrZOg==",
 			"dependencies": {
-				"@react-native-community/cli-config": "^10.1.1",
-				"@react-native-community/cli-platform-ios": "^10.2.5",
-				"@react-native-community/cli-tools": "^10.1.1",
+				"@react-native-community/cli-config": "12.3.2",
+				"@react-native-community/cli-platform-android": "12.3.2",
+				"@react-native-community/cli-platform-ios": "12.3.2",
+				"@react-native-community/cli-tools": "12.3.2",
 				"chalk": "^4.1.2",
 				"command-exists": "^1.2.8",
-				"envinfo": "^7.7.2",
-				"execa": "^1.0.0",
+				"deepmerge": "^4.3.0",
+				"envinfo": "^7.10.0",
+				"execa": "^5.0.0",
 				"hermes-profile-transformer": "^0.0.6",
 				"ip": "^1.1.5",
 				"node-stream-zip": "^1.9.1",
 				"ora": "^5.4.1",
-				"prompts": "^2.4.0",
-				"semver": "^6.3.0",
+				"semver": "^7.5.2",
 				"strip-ansi": "^5.2.0",
-				"sudo-prompt": "^9.0.0",
-				"wcwidth": "^1.0.1"
-			}
-		},
-		"node_modules/@react-native-community/cli-doctor/node_modules/@react-native-community/cli-platform-ios": {
-			"version": "10.2.5",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.5.tgz",
-			"integrity": "sha512-hq+FZZuSBK9z82GLQfzdNDl8vbFx5UlwCLFCuTtNCROgBoapFtVZQKRP2QBftYNrQZ0dLAb01gkwxagHsQCFyg==",
-			"dependencies": {
-				"@react-native-community/cli-tools": "^10.1.1",
-				"chalk": "^4.1.2",
-				"execa": "^1.0.0",
-				"fast-xml-parser": "^4.0.12",
-				"glob": "^7.1.3",
-				"ora": "^5.4.1"
+				"wcwidth": "^1.0.1",
+				"yaml": "^2.2.1"
 			}
 		},
 		"node_modules/@react-native-community/cli-doctor/node_modules/chalk": {
@@ -9080,73 +8635,49 @@
 			}
 		},
 		"node_modules/@react-native-community/cli-doctor/node_modules/cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dependencies": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
 			},
 			"engines": {
-				"node": ">=4.8"
-			}
-		},
-		"node_modules/@react-native-community/cli-doctor/node_modules/cross-spawn/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"bin": {
-				"semver": "bin/semver"
+				"node": ">= 8"
 			}
 		},
 		"node_modules/@react-native-community/cli-doctor/node_modules/execa": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dependencies": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.0.0",
-				"is-stream": "^1.1.0",
-				"npm-run-path": "^2.0.0",
-				"p-finally": "^1.0.0",
-				"signal-exit": "^3.0.0",
-				"strip-eof": "^1.0.0"
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/@react-native-community/cli-doctor/node_modules/get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-			"dependencies": {
-				"pump": "^3.0.0"
+				"node": ">=10"
 			},
-			"engines": {
-				"node": ">=6"
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
-		"node_modules/@react-native-community/cli-doctor/node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
+		"node_modules/@react-native-community/cli-doctor/node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
 			"engines": {
-				"node": "*"
+				"node": ">=10"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/@react-native-community/cli-doctor/node_modules/has-flag": {
@@ -9157,6 +8688,25 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/@react-native-community/cli-doctor/node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"engines": {
+				"node": ">=10.17.0"
+			}
+		},
+		"node_modules/@react-native-community/cli-doctor/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/@react-native-community/cli-doctor/node_modules/mimic-fn": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -9165,6 +8715,17 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/@react-native-community/cli-doctor/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/@react-native-community/cli-doctor/node_modules/onetime": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
@@ -9212,13 +8773,12 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-doctor/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-			"dependencies": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
+		"node_modules/@react-native-community/cli-doctor/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"engines": {
+				"node": ">=8"
 			}
 		},
 		"node_modules/@react-native-community/cli-doctor/node_modules/restore-cursor": {
@@ -9233,12 +8793,23 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-doctor/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
+		"node_modules/@react-native-community/cli-doctor/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native-community/cli-doctor/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"engines": {
+				"node": ">=8"
 			}
 		},
 		"node_modules/@react-native-community/cli-doctor/node_modules/strip-ansi": {
@@ -9271,13 +8842,39 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/@react-native-community/cli-doctor/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@react-native-community/cli-doctor/node_modules/yaml": {
+			"version": "2.6.0",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+			"integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+			"license": "ISC",
+			"bin": {
+				"yaml": "bin.mjs"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
 		"node_modules/@react-native-community/cli-hermes": {
-			"version": "10.2.0",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-hermes/-/cli-hermes-10.2.0.tgz",
-			"integrity": "sha512-urfmvNeR8IiO/Sd92UU3xPO+/qI2lwCWQnxOkWaU/i2EITFekE47MD6MZrfVulRVYRi5cuaFqKZO/ccOdOB/vQ==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-hermes/-/cli-hermes-12.3.2.tgz",
+			"integrity": "sha512-SL6F9O8ghp4ESBFH2YAPLtIN39jdnvGBKnK4FGKpDCjtB3DnUmDsGFlH46S+GGt5M6VzfG2eeKEOKf3pZ6jUzA==",
 			"dependencies": {
-				"@react-native-community/cli-platform-android": "^10.2.0",
-				"@react-native-community/cli-tools": "^10.1.1",
+				"@react-native-community/cli-platform-android": "12.3.2",
+				"@react-native-community/cli-tools": "12.3.2",
 				"chalk": "^4.1.2",
 				"hermes-profile-transformer": "^0.0.6",
 				"ip": "^1.1.5"
@@ -9318,13 +8915,14 @@
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-android": {
-			"version": "10.2.0",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-10.2.0.tgz",
-			"integrity": "sha512-CBenYwGxwFdObZTn1lgxWtMGA5ms2G/ALQhkS+XTAD7KHDrCxFF9yT/fnAjFZKM6vX/1TqGI1RflruXih3kAhw==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-12.3.2.tgz",
+			"integrity": "sha512-MZ5nO8yi/N+Fj2i9BJcJ9C/ez+9/Ir7lQt49DWRo9YDmzye66mYLr/P2l/qxsixllbbDi7BXrlLpxaEhMrDopg==",
 			"dependencies": {
-				"@react-native-community/cli-tools": "^10.1.1",
+				"@react-native-community/cli-tools": "12.3.2",
 				"chalk": "^4.1.2",
-				"execa": "^1.0.0",
+				"execa": "^5.0.0",
+				"fast-xml-parser": "^4.2.4",
 				"glob": "^7.1.3",
 				"logkitty": "^0.7.1"
 			}
@@ -9345,46 +8943,49 @@
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-android/node_modules/cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dependencies": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
 			},
 			"engines": {
-				"node": ">=4.8"
+				"node": ">= 8"
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-android/node_modules/execa": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dependencies": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.0.0",
-				"is-stream": "^1.1.0",
-				"npm-run-path": "^2.0.0",
-				"p-finally": "^1.0.0",
-				"signal-exit": "^3.0.0",
-				"strip-eof": "^1.0.0"
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-android/node_modules/get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-			"dependencies": {
-				"pump": "^3.0.0"
-			},
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-android/node_modules/glob": {
@@ -9414,21 +9015,83 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-platform-android/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+		"node_modules/@react-native-community/cli-platform-android/node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"engines": {
+				"node": ">=10.17.0"
+			}
+		},
+		"node_modules/@react-native-community/cli-platform-android/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@react-native-community/cli-platform-android/node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@react-native-community/cli-platform-android/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
 			"dependencies": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-platform-android/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"bin": {
-				"semver": "bin/semver"
+		"node_modules/@react-native-community/cli-platform-android/node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dependencies": {
+				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@react-native-community/cli-platform-android/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native-community/cli-platform-android/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native-community/cli-platform-android/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"engines": {
+				"node": ">=8"
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-android/node_modules/supports-color": {
@@ -9442,14 +9105,28 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/@react-native-community/cli-platform-android/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
 		"node_modules/@react-native-community/cli-platform-ios": {
-			"version": "10.2.4",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.4.tgz",
-			"integrity": "sha512-/6K+jeRhcGojFIJMWMXV2eY5n/In+YUzBr/DKWQOeHBOHkESRNheG310xSAIjgB46YniSSUKhSyeuhalTbm9OQ==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-12.3.2.tgz",
+			"integrity": "sha512-OcWEAbkev1IL6SUiQnM6DQdsvfsKZhRZtoBNSj9MfdmwotVZSOEZJ+IjZ1FR9ChvMWayO9ns/o8LgoQxr1ZXeg==",
 			"dependencies": {
-				"@react-native-community/cli-tools": "^10.1.1",
+				"@react-native-community/cli-tools": "12.3.2",
 				"chalk": "^4.1.2",
-				"execa": "^1.0.0",
+				"execa": "^5.0.0",
 				"fast-xml-parser": "^4.0.12",
 				"glob": "^7.1.3",
 				"ora": "^5.4.1"
@@ -9482,46 +9159,49 @@
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-ios/node_modules/cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dependencies": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
 			},
 			"engines": {
-				"node": ">=4.8"
+				"node": ">= 8"
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-ios/node_modules/execa": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dependencies": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.0.0",
-				"is-stream": "^1.1.0",
-				"npm-run-path": "^2.0.0",
-				"p-finally": "^1.0.0",
-				"signal-exit": "^3.0.0",
-				"strip-eof": "^1.0.0"
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-ios/node_modules/get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-			"dependencies": {
-				"pump": "^3.0.0"
-			},
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-ios/node_modules/glob": {
@@ -9551,6 +9231,25 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/@react-native-community/cli-platform-ios/node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"engines": {
+				"node": ">=10.17.0"
+			}
+		},
+		"node_modules/@react-native-community/cli-platform-ios/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/@react-native-community/cli-platform-ios/node_modules/mimic-fn": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -9559,6 +9258,17 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/@react-native-community/cli-platform-ios/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/@react-native-community/cli-platform-ios/node_modules/onetime": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
@@ -9595,13 +9305,12 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@react-native-community/cli-platform-ios/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-			"dependencies": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
+		"node_modules/@react-native-community/cli-platform-ios/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"engines": {
+				"node": ">=8"
 			}
 		},
 		"node_modules/@react-native-community/cli-platform-ios/node_modules/restore-cursor": {
@@ -9616,147 +9325,65 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-platform-ios/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"bin": {
-				"semver": "bin/semver"
-			}
-		},
-		"node_modules/@react-native-community/cli-platform-ios/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+		"node_modules/@react-native-community/cli-platform-ios/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dependencies": {
-				"has-flag": "^4.0.0"
+				"shebang-regex": "^3.0.0"
 			},
 			"engines": {
 				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-plugin-metro": {
-			"version": "10.2.3",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-10.2.3.tgz",
-			"integrity": "sha512-jHi2oDuTePmW4NEyVT8JEGNlIYcnFXCSV2ZMp4rnDrUk4TzzyvS3IMvDlESEmG8Kry8rvP0KSUx/hTpy37Sbkw==",
-			"dependencies": {
-				"@react-native-community/cli-server-api": "^10.1.1",
-				"@react-native-community/cli-tools": "^10.1.1",
-				"chalk": "^4.1.2",
-				"execa": "^1.0.0",
-				"metro": "0.73.10",
-				"metro-config": "0.73.10",
-				"metro-core": "0.73.10",
-				"metro-react-native-babel-transformer": "0.73.10",
-				"metro-resolver": "0.73.10",
-				"metro-runtime": "0.73.10",
-				"readline": "^1.3.0"
-			}
-		},
-		"node_modules/@react-native-community/cli-plugin-metro/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/@react-native-community/cli-plugin-metro/node_modules/cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-			"dependencies": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
-			},
-			"engines": {
-				"node": ">=4.8"
-			}
-		},
-		"node_modules/@react-native-community/cli-plugin-metro/node_modules/execa": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-			"dependencies": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.0.0",
-				"is-stream": "^1.1.0",
-				"npm-run-path": "^2.0.0",
-				"p-finally": "^1.0.0",
-				"signal-exit": "^3.0.0",
-				"strip-eof": "^1.0.0"
-			},
+		"node_modules/@react-native-community/cli-platform-ios/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"engines": {
-				"node": ">=6"
+				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-plugin-metro/node_modules/get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+		"node_modules/@react-native-community/cli-platform-ios/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dependencies": {
-				"pump": "^3.0.0"
+				"has-flag": "^4.0.0"
 			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/@react-native-community/cli-plugin-metro/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"engines": {
 				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-plugin-metro/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+		"node_modules/@react-native-community/cli-platform-ios/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dependencies": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
-			}
-		},
-		"node_modules/@react-native-community/cli-plugin-metro/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+				"isexe": "^2.0.0"
+			},
 			"bin": {
-				"semver": "bin/semver"
-			}
-		},
-		"node_modules/@react-native-community/cli-plugin-metro/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dependencies": {
-				"has-flag": "^4.0.0"
+				"node-which": "bin/node-which"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">= 8"
 			}
 		},
+		"node_modules/@react-native-community/cli-plugin-metro": {
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-12.3.2.tgz",
+			"integrity": "sha512-FpFBwu+d2E7KRhYPTkKvQsWb2/JKsJv+t1tcqgQkn+oByhp+qGyXBobFB8/R3yYvRRDCSDhS+atWTJzk9TjM8g=="
+		},
 		"node_modules/@react-native-community/cli-server-api": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-10.1.1.tgz",
-			"integrity": "sha512-NZDo/wh4zlm8as31UEBno2bui8+ufzsZV+KN7QjEJWEM0levzBtxaD+4je0OpfhRIIkhaRm2gl/vVf7OYAzg4g==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-12.3.2.tgz",
+			"integrity": "sha512-iwa7EO9XFA/OjI5pPLLpI/6mFVqv8L73kNck3CNOJIUCCveGXBKK0VMyOkXaf/BYnihgQrXh+x5cxbDbggr7+Q==",
 			"dependencies": {
-				"@react-native-community/cli-debugger-ui": "^10.0.0",
-				"@react-native-community/cli-tools": "^10.1.1",
+				"@react-native-community/cli-debugger-ui": "12.3.2",
+				"@react-native-community/cli-tools": "12.3.2",
 				"compression": "^1.7.1",
 				"connect": "^3.6.5",
-				"errorhandler": "^1.5.0",
+				"errorhandler": "^1.5.1",
 				"nocache": "^3.0.1",
 				"pretty-format": "^26.6.2",
 				"serve-static": "^1.13.1",
@@ -9779,9 +9406,9 @@
 			}
 		},
 		"node_modules/@react-native-community/cli-server-api/node_modules/@types/yargs": {
-			"version": "15.0.15",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz",
-			"integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==",
+			"version": "15.0.19",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
+			"integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
 			"dependencies": {
 				"@types/yargs-parser": "*"
 			}
@@ -9806,9 +9433,9 @@
 			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
 		},
 		"node_modules/@react-native-community/cli-tools": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-10.1.1.tgz",
-			"integrity": "sha512-+FlwOnZBV+ailEzXjcD8afY2ogFEBeHOw/8+XXzMgPaquU2Zly9B+8W089tnnohO3yfiQiZqkQlElP423MY74g==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-12.3.2.tgz",
+			"integrity": "sha512-nDH7vuEicHI2TI0jac/DjT3fr977iWXRdgVAqPZFFczlbs7A8GQvEdGnZ1G8dqRUmg+kptw0e4hwczAOG89JzQ==",
 			"dependencies": {
 				"appdirsjs": "^1.2.4",
 				"chalk": "^4.1.2",
@@ -9817,8 +9444,9 @@
 				"node-fetch": "^2.6.0",
 				"open": "^6.2.0",
 				"ora": "^5.4.1",
-				"semver": "^6.3.0",
-				"shell-quote": "^1.7.3"
+				"semver": "^7.5.2",
+				"shell-quote": "^1.7.3",
+				"sudo-prompt": "^9.0.0"
 			}
 		},
 		"node_modules/@react-native-community/cli-tools/node_modules/chalk": {
@@ -9973,14 +9601,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@react-native-community/cli-tools/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
 		"node_modules/@react-native-community/cli-tools/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -9993,1568 +9613,1380 @@
 			}
 		},
 		"node_modules/@react-native-community/cli-types": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-10.0.0.tgz",
-			"integrity": "sha512-31oUM6/rFBZQfSmDQsT1DX/5fjqfxg7sf2u8kTPJK7rXVya5SRpAMaCXsPAG0omsmJxXt+J9HxUi3Ic+5Ux5Iw==",
+			"version": "12.3.2",
+			"resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-12.3.2.tgz",
+			"integrity": "sha512-9D0UEFqLW8JmS16mjHJxUJWX8E+zJddrHILSH8AJHZ0NNHv4u2DXKdb0wFLMobFxGNxPT+VSOjc60fGvXzWHog==",
 			"dependencies": {
 				"joi": "^17.2.1"
 			}
 		},
-		"node_modules/@react-native-community/slider": {
-			"version": "3.0.2-wp-4",
-			"resolved": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz",
-			"integrity": "sha512-BrfAehlhFSUN0kzIhpeF8X4BvCJp6Rtxqfr+1Kpfn2B4kCuRmJoaqIDc+igPCl8ya99vzV1Uifw30P16NTMhuQ==",
-			"workspaces": [
-				"src",
-				"example"
-			]
-		},
-		"node_modules/@react-native-masked-view/masked-view": {
-			"version": "0.2.9",
-			"resolved": "https://registry.npmjs.org/@react-native-masked-view/masked-view/-/masked-view-0.2.9.tgz",
-			"integrity": "sha512-Hs4vKBKj+15VxHZHFtMaFWSBxXoOE5Ea8saoigWhahp8Mepssm0ezU+2pTl7DK9z8Y9s5uOl/aPb4QmBZ3R3Zw==",
-			"peerDependencies": {
-				"react": ">=16",
-				"react-native": ">=0.57"
-			}
-		},
-		"node_modules/@react-native/assets": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@react-native/assets/-/assets-1.0.0.tgz",
-			"integrity": "sha512-KrwSpS1tKI70wuKl68DwJZYEvXktDHdZMG0k2AXD/rJVSlB23/X2CB2cutVR0HwNMJIal9HOUOBB2rVfa6UGtQ=="
-		},
-		"node_modules/@react-native/gradle-plugin": {
-			"version": "0.72.11",
-			"resolved": "https://registry.npmjs.org/@react-native/gradle-plugin/-/gradle-plugin-0.72.11.tgz",
-			"integrity": "sha512-P9iRnxiR2w7EHcZ0mJ+fmbPzMby77ZzV6y9sJI3lVLJzF7TLSdbwcQyD3lwMsiL+q5lKUHoZJS4sYmih+P2HXw=="
-		},
-		"node_modules/@react-native/normalize-color": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/@react-native/normalize-color/-/normalize-color-2.1.0.tgz",
-			"integrity": "sha512-Z1jQI2NpdFJCVgpY+8Dq/Bt3d+YUi1928Q+/CZm/oh66fzM0RUl54vvuXlPJKybH4pdCZey1eDTPaLHkMPNgWA=="
-		},
-		"node_modules/@react-native/polyfills": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@react-native/polyfills/-/polyfills-2.0.0.tgz",
-			"integrity": "sha512-K0aGNn1TjalKj+65D7ycc1//H9roAQ51GJVk5ZJQFb2teECGmzd86bYDC0aYdbRf7gtovescq4Zt6FR0tgXiHQ=="
-		},
-		"node_modules/@react-navigation/core": {
-			"version": "5.12.0",
-			"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.12.0.tgz",
-			"integrity": "sha512-CTmYrFXCZwInN40CpEzkPxhrpzujj20qvsUgpH05+oO1flwsnaJsyBfYawIcTS62/1/Z6SAM7iW5PbKk+qw9iQ==",
+		"node_modules/@react-native-community/cli/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dependencies": {
-				"@react-navigation/routers": "^5.4.9",
-				"escape-string-regexp": "^4.0.0",
-				"nanoid": "^3.1.9",
-				"query-string": "^6.13.1",
-				"react-is": "^16.13.0",
-				"use-subscription": "^1.4.0"
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
 			},
-			"peerDependencies": {
-				"react": "*"
-			}
-		},
-		"node_modules/@react-navigation/core/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"engines": {
 				"node": ">=10"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"node_modules/@react-navigation/elements": {
-			"version": "1.3.18",
-			"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.18.tgz",
-			"integrity": "sha512-/0hwnJkrr415yP0Hf4PjUKgGyfshrvNUKFXN85Mrt1gY49hy9IwxZgrrxlh0THXkPeq8q4VWw44eHDfAcQf20Q==",
-			"peerDependencies": {
-				"@react-navigation/native": "^6.0.0",
-				"react": "*",
-				"react-native": "*",
-				"react-native-safe-area-context": ">= 3.0.0"
+		"node_modules/@react-native-community/cli/node_modules/commander": {
+			"version": "9.5.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+			"integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+			"engines": {
+				"node": "^12.20.0 || >=14"
 			}
 		},
-		"node_modules/@react-navigation/native": {
-			"version": "6.0.14",
-			"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.14.tgz",
-			"integrity": "sha512-Z95bJrRkZerBJq6Qc/xjA/kibPpB+UvPeMWS1CBhRF8FaX1483UdHqPqSbW879tPwjP2R4XfoA4dtoEHswrOjA==",
+		"node_modules/@react-native-community/cli/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dependencies": {
-				"@react-navigation/core": "^6.4.1",
-				"escape-string-regexp": "^4.0.0",
-				"fast-deep-equal": "^3.1.3",
-				"nanoid": "^3.1.23"
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
 			},
-			"peerDependencies": {
-				"react": "*",
-				"react-native": "*"
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"node_modules/@react-navigation/native/node_modules/@react-navigation/core": {
-			"version": "6.4.9",
-			"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.9.tgz",
-			"integrity": "sha512-G9GH7bP9x0qqupxZnkSftnkn4JoXancElTvFc8FVGfEvxnxP+gBo3wqcknyBi7M5Vad4qecsYjCOa9wqsftv9g==",
+		"node_modules/@react-native-community/cli/node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dependencies": {
-				"@react-navigation/routers": "^6.1.9",
-				"escape-string-regexp": "^4.0.0",
-				"nanoid": "^3.1.23",
-				"query-string": "^7.1.3",
-				"react-is": "^16.13.0",
-				"use-latest-callback": "^0.1.5"
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
 			},
-			"peerDependencies": {
-				"react": "*"
-			}
-		},
-		"node_modules/@react-navigation/native/node_modules/@react-navigation/routers": {
-			"version": "6.1.9",
-			"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.9.tgz",
-			"integrity": "sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA==",
-			"dependencies": {
-				"nanoid": "^3.1.23"
-			}
-		},
-		"node_modules/@react-navigation/native/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"engines": {
 				"node": ">=10"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
-		"node_modules/@react-navigation/native/node_modules/query-string": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz",
-			"integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==",
+		"node_modules/@react-native-community/cli/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dependencies": {
-				"decode-uri-component": "^0.2.2",
-				"filter-obj": "^1.1.0",
-				"split-on-first": "^1.0.0",
-				"strict-uri-encode": "^2.0.0"
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native-community/cli/node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"engines": {
+				"node": ">=10"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@react-navigation/routers": {
-			"version": "5.4.9",
-			"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.4.9.tgz",
-			"integrity": "sha512-dYD5qrIKUmuBEp+O98hB0tDYpEsGQgCQFQgMEoFKBmVVhx2JnJJ1zxRjU7xWcCU4VdBA8IOowgHQHJsVNKYyrg==",
-			"dependencies": {
-				"nanoid": "^3.1.9"
-			}
-		},
-		"node_modules/@react-navigation/stack": {
-			"version": "6.3.5",
-			"resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.3.5.tgz",
-			"integrity": "sha512-G706Ow+8fhiLT5Cf48566YsjboU5h5ll9nva90xX3br7V6x0JMoGMvXjvbORZyzLuUytQO3mf0T3nVUuO52vZQ==",
-			"dependencies": {
-				"@react-navigation/elements": "^1.3.7",
-				"color": "^4.2.3",
-				"warn-once": "^0.1.0"
-			},
-			"peerDependencies": {
-				"@react-navigation/native": "^6.0.0",
-				"react": "*",
-				"react-native": "*",
-				"react-native-gesture-handler": ">= 1.0.0",
-				"react-native-safe-area-context": ">= 3.0.0",
-				"react-native-screens": ">= 3.0.0"
+		"node_modules/@react-native-community/cli/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/@react-spring/animated": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.5.5.tgz",
-			"integrity": "sha512-glzViz7syQ3CE6BQOwAyr75cgh0qsihm5lkaf24I0DfU63cMm/3+br299UEYkuaHNmfDfM414uktiPlZCNJbQA==",
-			"dependencies": {
-				"@react-spring/shared": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+		"node_modules/@react-native-community/cli/node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"engines": {
+				"node": ">=10.17.0"
 			}
 		},
-		"node_modules/@react-spring/core": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.5.5.tgz",
-			"integrity": "sha512-shaJYb3iX18Au6gkk8ahaF0qx0LpS0Yd+ajb4asBaAQf6WPGuEdJsbsNSgei1/O13JyEATsJl20lkjeslJPMYA==",
-			"dependencies": {
-				"@react-spring/animated": "~9.5.5",
-				"@react-spring/rafz": "~9.5.5",
-				"@react-spring/shared": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
+		"node_modules/@react-native-community/cli/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"engines": {
+				"node": ">=8"
 			},
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/react-spring/donate"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@react-spring/rafz": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.5.5.tgz",
-			"integrity": "sha512-F/CLwB0d10jL6My5vgzRQxCNY2RNyDJZedRBK7FsngdCmzoq3V4OqqNc/9voJb9qRC2wd55oGXUeXv2eIaFmsw=="
-		},
-		"node_modules/@react-spring/shared": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.5.5.tgz",
-			"integrity": "sha512-YwW70Pa/YXPOwTutExHZmMQSHcNC90kJOnNR4G4mCDNV99hE98jWkIPDOsgqbYx3amIglcFPiYKMaQuGdr8dyQ==",
+		"node_modules/@react-native-community/cli/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dependencies": {
-				"@react-spring/rafz": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
+				"p-locate": "^4.1.0"
 			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/@react-spring/types": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.5.5.tgz",
-			"integrity": "sha512-7I/qY8H7Enwasxr4jU6WmtNK+RZ4Z/XvSlDvjXFVe7ii1x0MoSlkw6pD7xuac8qrHQRm9BTcbZNyeeKApYsvCg=="
+		"node_modules/@react-native-community/cli/node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"node_modules/@react-spring/web": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.5.5.tgz",
-			"integrity": "sha512-+moT8aDX/ho/XAhU+HRY9m0LVV9y9CK6NjSRaI+30Re150pB3iEip6QfnF4qnhSCQ5drpMF0XRXHgOTY/xbtFw==",
+		"node_modules/@react-native-community/cli/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
 			"dependencies": {
-				"@react-spring/animated": "~9.5.5",
-				"@react-spring/core": "~9.5.5",
-				"@react-spring/shared": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
+				"path-key": "^3.0.0"
 			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/@samverschueren/stream-to-observable": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
-			"integrity": "sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==",
-			"dev": true,
+		"node_modules/@react-native-community/cli/node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 			"dependencies": {
-				"any-observable": "^0.3.0"
+				"mimic-fn": "^2.1.0"
 			},
 			"engines": {
 				"node": ">=6"
 			},
-			"peerDependenciesMeta": {
-				"rxjs": {
-					"optional": true
-				},
-				"zen-observable": {
-					"optional": true
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@sentry/core": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.19.7.tgz",
-			"integrity": "sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==",
-			"dev": true,
+		"node_modules/@react-native-community/cli/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dependencies": {
-				"@sentry/hub": "6.19.7",
-				"@sentry/minimal": "6.19.7",
-				"@sentry/types": "6.19.7",
-				"@sentry/utils": "6.19.7",
-				"tslib": "^1.9.3"
+				"p-try": "^2.0.0"
 			},
 			"engines": {
 				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@sentry/core/node_modules/tslib": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-			"dev": true
-		},
-		"node_modules/@sentry/hub": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.19.7.tgz",
-			"integrity": "sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA==",
-			"dev": true,
+		"node_modules/@react-native-community/cli/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 			"dependencies": {
-				"@sentry/types": "6.19.7",
-				"@sentry/utils": "6.19.7",
-				"tslib": "^1.9.3"
+				"p-limit": "^2.2.0"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": ">=8"
 			}
 		},
-		"node_modules/@sentry/hub/node_modules/tslib": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-			"dev": true
-		},
-		"node_modules/@sentry/minimal": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.19.7.tgz",
-			"integrity": "sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ==",
-			"dev": true,
-			"dependencies": {
-				"@sentry/hub": "6.19.7",
-				"@sentry/types": "6.19.7",
-				"tslib": "^1.9.3"
-			},
+		"node_modules/@react-native-community/cli/node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 			"engines": {
 				"node": ">=6"
 			}
 		},
-		"node_modules/@sentry/minimal/node_modules/tslib": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-			"dev": true
-		},
-		"node_modules/@sentry/node": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.19.7.tgz",
-			"integrity": "sha512-gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg==",
-			"dev": true,
-			"dependencies": {
-				"@sentry/core": "6.19.7",
-				"@sentry/hub": "6.19.7",
-				"@sentry/types": "6.19.7",
-				"@sentry/utils": "6.19.7",
-				"cookie": "^0.4.1",
-				"https-proxy-agent": "^5.0.0",
-				"lru_map": "^0.3.3",
-				"tslib": "^1.9.3"
-			},
+		"node_modules/@react-native-community/cli/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 			"engines": {
-				"node": ">=6"
+				"node": ">=8"
 			}
 		},
-		"node_modules/@sentry/node/node_modules/cookie": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-			"integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-			"dev": true,
+		"node_modules/@react-native-community/cli/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 			"engines": {
-				"node": ">= 0.6"
+				"node": ">=8"
 			}
 		},
-		"node_modules/@sentry/node/node_modules/tslib": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-			"dev": true
+		"node_modules/@react-native-community/cli/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"node_modules/@sentry/types": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.19.7.tgz",
-			"integrity": "sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==",
-			"dev": true,
+		"node_modules/@react-native-community/cli/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"engines": {
-				"node": ">=6"
+				"node": ">=8"
 			}
 		},
-		"node_modules/@sentry/utils": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.19.7.tgz",
-			"integrity": "sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA==",
-			"dev": true,
+		"node_modules/@react-native-community/cli/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dependencies": {
-				"@sentry/types": "6.19.7",
-				"tslib": "^1.9.3"
+				"has-flag": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": ">=8"
 			}
 		},
-		"node_modules/@sentry/utils/node_modules/tslib": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-			"dev": true
-		},
-		"node_modules/@sideway/address": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
-			"integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
+		"node_modules/@react-native-community/cli/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dependencies": {
-				"@hapi/hoek": "^9.0.0"
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"node_modules/@sideway/formula": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
-			"integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
+		"node_modules/@react-native-community/slider": {
+			"version": "3.0.2-wp-5",
+			"resolved": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-5/react-native-community-slider-3.0.2-wp-5.tgz",
+			"integrity": "sha512-19yl9Em1mFKFLB9o3IO3VpBFw+U7cswjRk6cZ7kkhDCpDD3u0cpzkaIZK6NuFIPCLqOwU0MPtP+gonanN1JQKw==",
+			"workspaces": [
+				"src",
+				"example"
+			]
 		},
-		"node_modules/@sideway/pinpoint": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
-			"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
+		"node_modules/@react-native-masked-view/masked-view": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@react-native-masked-view/masked-view/-/masked-view-0.3.0.tgz",
+			"integrity": "sha512-qLyoObcjzrkpNcoJjXquUePXfL1dXjHtuv+yX0zZ0Q4kG5yvVqd620+tSh7WbRoHkjpXhFBfLwvGhcWB2I0Lpw==",
+			"peerDependencies": {
+				"react": ">=16",
+				"react-native": ">=0.57"
+			}
 		},
-		"node_modules/@sidvind/better-ajv-errors": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/@sidvind/better-ajv-errors/-/better-ajv-errors-2.1.0.tgz",
-			"integrity": "sha512-JuIb009FhHuL9priFBho2kv7QmZOydj0LgYvj+h1t0mMCmhM/YmQNRlJR5wVtBZya6wrVFK5Hi5TIbv5BKEx7w==",
-			"dev": true,
+		"node_modules/@react-native/assets-registry": {
+			"version": "0.73.1",
+			"resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.73.1.tgz",
+			"integrity": "sha512-2FgAbU7uKM5SbbW9QptPPZx8N9Ke2L7bsHb+EhAanZjFZunA9PaYtyjUQ1s7HD+zDVqOQIvjkpXSv7Kejd2tqg==",
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@react-native/babel-plugin-codegen": {
+			"version": "0.73.3",
+			"resolved": "https://registry.npmjs.org/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.73.3.tgz",
+			"integrity": "sha512-+zQrDDbz6lB48LyzFHxNCgXDCBHH+oTRdXAjikRcBUdeG9St9ABbYFLtb799zSxLOrCqFVyXqhJR2vlgLLEbcg==",
 			"dependencies": {
-				"@babel/code-frame": "^7.16.0",
-				"chalk": "^4.1.0"
+				"@react-native/codegen": "0.73.2"
 			},
 			"engines": {
-				"node": ">= 14.0.0"
-			},
-			"peerDependencies": {
-				"ajv": "4.11.8 - 8"
+				"node": ">=18"
 			}
 		},
-		"node_modules/@sigstore/bundle": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.0.0.tgz",
-			"integrity": "sha512-yLvrWDOh6uMOUlFCTJIZEnwOT9Xte7NPXUqVexEKGSF5XtBAuSg5du0kn3dRR0p47a4ah10Y0mNt8+uyeQXrBQ==",
+		"node_modules/@react-native/babel-preset": {
+			"version": "0.73.10",
+			"resolved": "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.73.10.tgz",
+			"integrity": "sha512-LPxR9DZK1EtVSEm2+fpei/AWwzgyHfaY7fuX8wDiy2THRYc/56+v28IihN8g0IAbQH+gdjXVcshJRYfV6bh2gg==",
 			"dev": true,
 			"dependencies": {
-				"@sigstore/protobuf-specs": "^0.2.0"
+				"@babel/core": "^7.20.0",
+				"@babel/plugin-proposal-async-generator-functions": "^7.0.0",
+				"@babel/plugin-proposal-class-properties": "^7.18.0",
+				"@babel/plugin-proposal-export-default-from": "^7.0.0",
+				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.0",
+				"@babel/plugin-proposal-numeric-separator": "^7.0.0",
+				"@babel/plugin-proposal-object-rest-spread": "^7.20.0",
+				"@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+				"@babel/plugin-proposal-optional-chaining": "^7.20.0",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.0",
+				"@babel/plugin-syntax-export-default-from": "^7.0.0",
+				"@babel/plugin-syntax-flow": "^7.18.0",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
+				"@babel/plugin-syntax-optional-chaining": "^7.0.0",
+				"@babel/plugin-transform-arrow-functions": "^7.0.0",
+				"@babel/plugin-transform-async-to-generator": "^7.20.0",
+				"@babel/plugin-transform-block-scoping": "^7.0.0",
+				"@babel/plugin-transform-classes": "^7.0.0",
+				"@babel/plugin-transform-computed-properties": "^7.0.0",
+				"@babel/plugin-transform-destructuring": "^7.20.0",
+				"@babel/plugin-transform-flow-strip-types": "^7.20.0",
+				"@babel/plugin-transform-function-name": "^7.0.0",
+				"@babel/plugin-transform-literals": "^7.0.0",
+				"@babel/plugin-transform-modules-commonjs": "^7.0.0",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
+				"@babel/plugin-transform-parameters": "^7.0.0",
+				"@babel/plugin-transform-react-display-name": "^7.0.0",
+				"@babel/plugin-transform-react-jsx": "^7.0.0",
+				"@babel/plugin-transform-react-jsx-self": "^7.0.0",
+				"@babel/plugin-transform-react-jsx-source": "^7.0.0",
+				"@babel/plugin-transform-runtime": "^7.0.0",
+				"@babel/plugin-transform-shorthand-properties": "^7.0.0",
+				"@babel/plugin-transform-spread": "^7.0.0",
+				"@babel/plugin-transform-sticky-regex": "^7.0.0",
+				"@babel/plugin-transform-typescript": "^7.5.0",
+				"@babel/plugin-transform-unicode-regex": "^7.0.0",
+				"@babel/template": "^7.0.0",
+				"babel-plugin-transform-flow-enums": "^0.0.2",
+				"react-refresh": "^0.4.0"
 			},
 			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@babel/core": "*"
 			}
 		},
-		"node_modules/@sigstore/protobuf-specs": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.0.tgz",
-			"integrity": "sha512-8ZhZKAVfXjIspDWwm3D3Kvj0ddbJ0HqDZ/pOs5cx88HpT8mVsotFrg7H1UMnXOuDHz6Zykwxn4mxG3QLuN+RUg==",
+		"node_modules/@react-native/babel-preset/node_modules/react-refresh": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
+			"integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==",
 			"dev": true,
 			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/@sigstore/tuf": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz",
-			"integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==",
-			"dev": true,
+		"node_modules/@react-native/codegen": {
+			"version": "0.73.2",
+			"resolved": "https://registry.npmjs.org/@react-native/codegen/-/codegen-0.73.2.tgz",
+			"integrity": "sha512-lfy8S7umhE3QLQG5ViC4wg5N1Z+E6RnaeIw8w1voroQsXXGPB72IBozh8dAHR3+ceTxIU0KX3A8OpJI8e1+HpQ==",
 			"dependencies": {
-				"@sigstore/protobuf-specs": "^0.2.0",
-				"tuf-js": "^1.1.7"
+				"@babel/parser": "^7.20.0",
+				"flow-parser": "^0.206.0",
+				"glob": "^7.1.1",
+				"invariant": "^2.2.4",
+				"jscodeshift": "^0.14.0",
+				"mkdirp": "^0.5.1",
+				"nullthrows": "^1.1.1"
 			},
 			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@sinclair/typebox": {
-			"version": "0.27.8",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
-		},
-		"node_modules/@sindresorhus/is": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-			"integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
+				"node": ">=18"
 			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/is?sponsor=1"
+			"peerDependencies": {
+				"@babel/preset-env": "^7.1.6"
 			}
 		},
-		"node_modules/@sinonjs/commons": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
-			"integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
+		"node_modules/@react-native/codegen/node_modules/mkdirp": {
+			"version": "0.5.6",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
 			"dependencies": {
-				"type-detect": "4.0.8"
+				"minimist": "^1.2.6"
+			},
+			"bin": {
+				"mkdirp": "bin/cmd.js"
 			}
 		},
-		"node_modules/@sinonjs/fake-timers": {
-			"version": "10.3.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+		"node_modules/@react-native/community-cli-plugin": {
+			"version": "0.73.14",
+			"resolved": "https://registry.npmjs.org/@react-native/community-cli-plugin/-/community-cli-plugin-0.73.14.tgz",
+			"integrity": "sha512-KzIwsTvAJrXPtwhGOSm+OcJH1B8TpY8cS4xxzu/e2qv3a2n4VLePHTPAfco1tmvekV8OHWvvD9JSIX7i2fB1gg==",
 			"dependencies": {
-				"@sinonjs/commons": "^3.0.0"
+				"@react-native-community/cli-server-api": "12.3.2",
+				"@react-native-community/cli-tools": "12.3.2",
+				"@react-native/dev-middleware": "0.73.7",
+				"@react-native/metro-babel-transformer": "0.73.14",
+				"chalk": "^4.0.0",
+				"execa": "^5.1.1",
+				"metro": "^0.80.3",
+				"metro-config": "^0.80.3",
+				"metro-core": "^0.80.3",
+				"node-fetch": "^2.2.0",
+				"readline": "^1.3.0"
+			},
+			"engines": {
+				"node": ">=18"
 			}
 		},
-		"node_modules/@sliphua/lilconfig-ts-loader": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/@sliphua/lilconfig-ts-loader/-/lilconfig-ts-loader-3.2.2.tgz",
-			"integrity": "sha512-nX2aBwAykiG50fSUzK9eyA5UvWcrEKzA0ZzCq9mLwHMwpKxM+U05YH8PHba1LJrbeZ7R1HSjJagWKMqFyq8cxw==",
-			"dev": true,
+		"node_modules/@react-native/community-cli-plugin/node_modules/@react-native/babel-preset": {
+			"version": "0.73.20",
+			"resolved": "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.73.20.tgz",
+			"integrity": "sha512-fU9NqkusbfFq71l4BWQfqqD/lLcLC0MZ++UYgieA3j8lIEppJTLVauv2RwtD2yltBkjebgYEC5Rwvt1l0MUBXw==",
 			"dependencies": {
-				"lodash.get": "^4",
-				"make-error": "^1",
-				"ts-node": "^9",
-				"tslib": "^2"
+				"@babel/core": "^7.20.0",
+				"@babel/plugin-proposal-async-generator-functions": "^7.0.0",
+				"@babel/plugin-proposal-class-properties": "^7.18.0",
+				"@babel/plugin-proposal-export-default-from": "^7.0.0",
+				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.0",
+				"@babel/plugin-proposal-numeric-separator": "^7.0.0",
+				"@babel/plugin-proposal-object-rest-spread": "^7.20.0",
+				"@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+				"@babel/plugin-proposal-optional-chaining": "^7.20.0",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.0",
+				"@babel/plugin-syntax-export-default-from": "^7.0.0",
+				"@babel/plugin-syntax-flow": "^7.18.0",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
+				"@babel/plugin-syntax-optional-chaining": "^7.0.0",
+				"@babel/plugin-transform-arrow-functions": "^7.0.0",
+				"@babel/plugin-transform-async-to-generator": "^7.20.0",
+				"@babel/plugin-transform-block-scoping": "^7.0.0",
+				"@babel/plugin-transform-classes": "^7.0.0",
+				"@babel/plugin-transform-computed-properties": "^7.0.0",
+				"@babel/plugin-transform-destructuring": "^7.20.0",
+				"@babel/plugin-transform-flow-strip-types": "^7.20.0",
+				"@babel/plugin-transform-function-name": "^7.0.0",
+				"@babel/plugin-transform-literals": "^7.0.0",
+				"@babel/plugin-transform-modules-commonjs": "^7.0.0",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
+				"@babel/plugin-transform-parameters": "^7.0.0",
+				"@babel/plugin-transform-private-methods": "^7.22.5",
+				"@babel/plugin-transform-private-property-in-object": "^7.22.11",
+				"@babel/plugin-transform-react-display-name": "^7.0.0",
+				"@babel/plugin-transform-react-jsx": "^7.0.0",
+				"@babel/plugin-transform-react-jsx-self": "^7.0.0",
+				"@babel/plugin-transform-react-jsx-source": "^7.0.0",
+				"@babel/plugin-transform-runtime": "^7.0.0",
+				"@babel/plugin-transform-shorthand-properties": "^7.0.0",
+				"@babel/plugin-transform-spread": "^7.0.0",
+				"@babel/plugin-transform-sticky-regex": "^7.0.0",
+				"@babel/plugin-transform-typescript": "^7.5.0",
+				"@babel/plugin-transform-unicode-regex": "^7.0.0",
+				"@babel/template": "^7.0.0",
+				"@react-native/babel-plugin-codegen": "0.73.3",
+				"babel-plugin-transform-flow-enums": "^0.0.2",
+				"react-refresh": "^0.14.0"
 			},
 			"engines": {
-				"node": ">=10.0.0"
+				"node": ">=18"
 			},
 			"peerDependencies": {
-				"lilconfig": ">=2"
+				"@babel/core": "*"
 			}
 		},
-		"node_modules/@storybook/addon-a11y": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-7.2.2.tgz",
-			"integrity": "sha512-gMGP5GdnTENdv5M1+1buk2n9md43jx6S8ZCsXlRagpVM57+jE9WyKtV6R+BPwfX2lBY45nhAj7Qmiy+OrUHarA==",
-			"dev": true,
+		"node_modules/@react-native/community-cli-plugin/node_modules/@react-native/metro-babel-transformer": {
+			"version": "0.73.14",
+			"resolved": "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.73.14.tgz",
+			"integrity": "sha512-5wLeYw/lormpSqYfI9H/geZ/EtPmi+x5qLkEit15Q/70hkzYo/M+aWztUtbOITfgTEOP8d6ybROzoGsqgyZLcw==",
 			"dependencies": {
-				"@storybook/addon-highlight": "7.2.2",
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"axe-core": "^4.2.0",
-				"lodash": "^4.17.21",
-				"react-resize-detector": "^7.1.2"
+				"@babel/core": "^7.20.0",
+				"@react-native/babel-preset": "0.73.20",
+				"hermes-parser": "0.15.0",
+				"nullthrows": "^1.1.1"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+			"engines": {
+				"node": ">=18"
 			},
 			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			},
-			"peerDependenciesMeta": {
-				"react": {
-					"optional": true
-				},
-				"react-dom": {
-					"optional": true
-				}
+				"@babel/core": "*"
 			}
 		},
-		"node_modules/@storybook/addon-a11y/node_modules/@storybook/channels": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-			"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-			"dev": true,
+		"node_modules/@react-native/community-cli-plugin/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"qs": "^6.10.0",
-				"telejson": "^7.0.3",
-				"tiny-invariant": "^1.3.1"
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"node_modules/@storybook/addon-a11y/node_modules/telejson": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-			"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-			"dev": true,
+		"node_modules/@react-native/community-cli-plugin/node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dependencies": {
-				"memoizerific": "^1.11.3"
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
-		"node_modules/@storybook/addon-actions": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-7.2.2.tgz",
-			"integrity": "sha512-Ev9oGlpxrt7tCpCmAYA04hsZYKnZIiksaQDCgKAf6I2+yUZBBkZh490yBPkMExpH5bLk7fAgjCMZP9gOyzaq3A==",
-			"dev": true,
-			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"dequal": "^2.0.2",
-				"lodash": "^4.17.21",
-				"polished": "^4.2.2",
-				"prop-types": "^15.7.2",
-				"react-inspector": "^6.0.0",
-				"telejson": "^7.0.3",
-				"ts-dedent": "^2.0.0",
-				"uuid": "^9.0.0"
+		"node_modules/@react-native/community-cli-plugin/node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"engines": {
+				"node": ">=10"
 			},
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			},
-			"peerDependenciesMeta": {
-				"react": {
-					"optional": true
-				},
-				"react-dom": {
-					"optional": true
-				}
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@storybook/addon-actions/node_modules/telejson": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-			"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-			"dev": true,
-			"dependencies": {
-				"memoizerific": "^1.11.3"
+		"node_modules/@react-native/community-cli-plugin/node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"engines": {
+				"node": ">=10.17.0"
 			}
 		},
-		"node_modules/@storybook/addon-controls": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-7.2.2.tgz",
-			"integrity": "sha512-kcFG7RMQJVz3fNvQO+9vjAodKbRrobsdr3WJYN6zmugh+qxEdUvHUUe093t0MpMKp2njY6c9eAbfjN+PrLSCJQ==",
-			"dev": true,
-			"dependencies": {
-				"@storybook/blocks": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"lodash": "^4.17.21",
-				"ts-dedent": "^2.0.0"
+		"node_modules/@react-native/community-cli-plugin/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"engines": {
+				"node": ">=8"
 			},
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@react-native/community-cli-plugin/node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@react-native/community-cli-plugin/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dependencies": {
+				"path-key": "^3.0.0"
 			},
-			"peerDependenciesMeta": {
-				"react": {
-					"optional": true
-				},
-				"react-dom": {
-					"optional": true
-				}
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/@storybook/addon-docs": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-7.2.2.tgz",
-			"integrity": "sha512-rQZ/LAC1oAQityI/NNwntLellAT2yrT7vQAPhHBpaVi/AOdT87wTkCyxnFJj/y3XYDAs4XgUqgbIKSIcRni/eA==",
-			"dev": true,
+		"node_modules/@react-native/community-cli-plugin/node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 			"dependencies": {
-				"@jest/transform": "^29.3.1",
-				"@mdx-js/react": "^2.1.5",
-				"@storybook/blocks": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/csf-plugin": "7.2.2",
-				"@storybook/csf-tools": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/mdx2-csf": "^1.0.0",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/postinstall": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/react-dom-shim": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"fs-extra": "^11.1.0",
-				"remark-external-links": "^8.0.0",
-				"remark-slug": "^6.0.0",
-				"ts-dedent": "^2.0.0"
+				"mimic-fn": "^2.1.0"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+			"engines": {
+				"node": ">=6"
 			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@storybook/addon-docs/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-			"dev": true,
+		"node_modules/@react-native/community-cli-plugin/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native/community-cli-plugin/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dependencies": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^6.0.1",
-				"universalify": "^2.0.0"
+				"shebang-regex": "^3.0.0"
 			},
 			"engines": {
-				"node": ">=14.14"
+				"node": ">=8"
 			}
 		},
-		"node_modules/@storybook/addon-docs/node_modules/jsonfile": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-			"dev": true,
+		"node_modules/@react-native/community-cli-plugin/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native/community-cli-plugin/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dependencies": {
-				"universalify": "^2.0.0"
+				"isexe": "^2.0.0"
 			},
-			"optionalDependencies": {
-				"graceful-fs": "^4.1.6"
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"node_modules/@storybook/addon-docs/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-			"dev": true,
+		"node_modules/@react-native/debugger-frontend": {
+			"version": "0.73.3",
+			"resolved": "https://registry.npmjs.org/@react-native/debugger-frontend/-/debugger-frontend-0.73.3.tgz",
+			"integrity": "sha512-RgEKnWuoo54dh7gQhV7kvzKhXZEhpF9LlMdZolyhGxHsBqZ2gXdibfDlfcARFFifPIiaZ3lXuOVVa4ei+uPgTw==",
 			"engines": {
-				"node": ">= 10.0.0"
+				"node": ">=18"
 			}
 		},
-		"node_modules/@storybook/addon-highlight": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-7.2.2.tgz",
-			"integrity": "sha512-jyuxPPTg3q021GYBzA+JoBO2ece6B4gt4ZqtWjKbOpTHpUyzkH6IBcBuWGtgGcQgrCGlmb5B8QCLAb8Cmy6VJg==",
-			"dev": true,
+		"node_modules/@react-native/dev-middleware": {
+			"version": "0.73.7",
+			"resolved": "https://registry.npmjs.org/@react-native/dev-middleware/-/dev-middleware-0.73.7.tgz",
+			"integrity": "sha512-BZXpn+qKp/dNdr4+TkZxXDttfx8YobDh8MFHsMk9usouLm22pKgFIPkGBV0X8Do4LBkFNPGtrnsKkWk/yuUXKg==",
 			"dependencies": {
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/preview-api": "7.2.2"
+				"@isaacs/ttlcache": "^1.4.1",
+				"@react-native/debugger-frontend": "0.73.3",
+				"chrome-launcher": "^0.15.2",
+				"chromium-edge-launcher": "^1.0.0",
+				"connect": "^3.6.5",
+				"debug": "^2.2.0",
+				"node-fetch": "^2.2.0",
+				"open": "^7.0.3",
+				"serve-static": "^1.13.1",
+				"temp-dir": "^2.0.0"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+			"engines": {
+				"node": ">=18"
 			}
 		},
-		"node_modules/@storybook/addon-toolbars": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-7.2.2.tgz",
-			"integrity": "sha512-KQkFwLEqi/Xm9wq6mqaqO6VEW7+Sgbr8BUtVRAB9sSpy2mlhZEzZpcWKjuHmyMb9/eiRvnicM9kXxz0tHAF0jA==",
-			"dev": true,
+		"node_modules/@react-native/dev-middleware/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/@react-native/dev-middleware/node_modules/is-wsl": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2"
+				"is-docker": "^2.0.0"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native/dev-middleware/node_modules/open": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+			"integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+			"dependencies": {
+				"is-docker": "^2.0.0",
+				"is-wsl": "^2.1.1"
 			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			"engines": {
+				"node": ">=8"
 			},
-			"peerDependenciesMeta": {
-				"react": {
-					"optional": true
-				},
-				"react-dom": {
-					"optional": true
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@storybook/addon-viewport": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-7.2.2.tgz",
-			"integrity": "sha512-6qjtkFSV+9Fxw/nS5X7b5xC1kbk+CMGUEZhzmqM+iYtijHZmK0K1+x6AoR/mOul/rLL2YT73U3OYCCKWV9lemQ==",
+		"node_modules/@react-native/dev-middleware/node_modules/temp-dir": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
+			"integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@react-native/gradle-plugin": {
+			"version": "0.73.4",
+			"resolved": "https://registry.npmjs.org/@react-native/gradle-plugin/-/gradle-plugin-0.73.4.tgz",
+			"integrity": "sha512-PMDnbsZa+tD55Ug+W8CfqXiGoGneSSyrBZCMb5JfiB3AFST3Uj5e6lw8SgI/B6SKZF7lG0BhZ6YHZsRZ5MlXmg==",
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@react-native/js-polyfills": {
+			"version": "0.73.1",
+			"resolved": "https://registry.npmjs.org/@react-native/js-polyfills/-/js-polyfills-0.73.1.tgz",
+			"integrity": "sha512-ewMwGcumrilnF87H4jjrnvGZEaPFCAC4ebraEK+CurDDmwST/bIicI4hrOAv+0Z0F7DEK4O4H7r8q9vH7IbN4g==",
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@react-native/metro-babel-transformer": {
+			"version": "0.73.10",
+			"resolved": "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.73.10.tgz",
+			"integrity": "sha512-g0q12s1VcrhI4ab9ZQzFHmvjkDW5PYdJd3LiyhIO3OAWLD7iNLWL5tJe9iA3n8rxbanmf1oauqlNY1UmkxhAvQ==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"memoizerific": "^1.11.3",
-				"prop-types": "^15.7.2"
+				"@babel/core": "^7.20.0",
+				"@react-native/babel-preset": "*",
+				"babel-preset-fbjs": "^3.4.0",
+				"hermes-parser": "0.15.0",
+				"nullthrows": "^1.1.1"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+			"engines": {
+				"node": ">=18"
 			},
 			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			},
-			"peerDependenciesMeta": {
-				"react": {
-					"optional": true
-				},
-				"react-dom": {
-					"optional": true
-				}
+				"@babel/core": "*"
 			}
 		},
-		"node_modules/@storybook/blocks": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-7.2.2.tgz",
-			"integrity": "sha512-VgO46E5zA8oo/Cn8kT9o3xiFtnqxlqsRRGp5t8A1YqgN2OvYTtg5/PLS16XH8Qui/m9EvOoT7DlOmcqlp3Z78w==",
+		"node_modules/@react-native/metro-config": {
+			"version": "0.73.4",
+			"resolved": "https://registry.npmjs.org/@react-native/metro-config/-/metro-config-0.73.4.tgz",
+			"integrity": "sha512-4IpWb9InOY23ssua6z/ho2B4uRqF4QaNHGg4aV3D/og5yiVF39GEm/REHU36i+KoHRO3GcB6DrI7N9KrcvgGBw==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/docs-tools": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/lodash": "^4.14.167",
-				"color-convert": "^2.0.1",
-				"dequal": "^2.0.2",
-				"lodash": "^4.17.21",
-				"markdown-to-jsx": "^7.1.8",
-				"memoizerific": "^1.11.3",
-				"polished": "^4.2.2",
-				"react-colorful": "^5.1.2",
-				"telejson": "^7.0.3",
-				"tocbot": "^4.20.1",
-				"ts-dedent": "^2.0.0",
-				"util-deprecate": "^1.0.2"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+				"@react-native/js-polyfills": "0.73.1",
+				"@react-native/metro-babel-transformer": "0.73.14",
+				"metro-config": "^0.80.3",
+				"metro-runtime": "^0.80.3"
 			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			"engines": {
+				"node": ">=18"
 			}
 		},
-		"node_modules/@storybook/blocks/node_modules/@storybook/channels": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-			"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
+		"node_modules/@react-native/metro-config/node_modules/@react-native/babel-preset": {
+			"version": "0.73.20",
+			"resolved": "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.73.20.tgz",
+			"integrity": "sha512-fU9NqkusbfFq71l4BWQfqqD/lLcLC0MZ++UYgieA3j8lIEppJTLVauv2RwtD2yltBkjebgYEC5Rwvt1l0MUBXw==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"qs": "^6.10.0",
-				"telejson": "^7.0.3",
-				"tiny-invariant": "^1.3.1"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			}
-		},
-		"node_modules/@storybook/blocks/node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
+				"@babel/core": "^7.20.0",
+				"@babel/plugin-proposal-async-generator-functions": "^7.0.0",
+				"@babel/plugin-proposal-class-properties": "^7.18.0",
+				"@babel/plugin-proposal-export-default-from": "^7.0.0",
+				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.0",
+				"@babel/plugin-proposal-numeric-separator": "^7.0.0",
+				"@babel/plugin-proposal-object-rest-spread": "^7.20.0",
+				"@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+				"@babel/plugin-proposal-optional-chaining": "^7.20.0",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.0",
+				"@babel/plugin-syntax-export-default-from": "^7.0.0",
+				"@babel/plugin-syntax-flow": "^7.18.0",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
+				"@babel/plugin-syntax-optional-chaining": "^7.0.0",
+				"@babel/plugin-transform-arrow-functions": "^7.0.0",
+				"@babel/plugin-transform-async-to-generator": "^7.20.0",
+				"@babel/plugin-transform-block-scoping": "^7.0.0",
+				"@babel/plugin-transform-classes": "^7.0.0",
+				"@babel/plugin-transform-computed-properties": "^7.0.0",
+				"@babel/plugin-transform-destructuring": "^7.20.0",
+				"@babel/plugin-transform-flow-strip-types": "^7.20.0",
+				"@babel/plugin-transform-function-name": "^7.0.0",
+				"@babel/plugin-transform-literals": "^7.0.0",
+				"@babel/plugin-transform-modules-commonjs": "^7.0.0",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
+				"@babel/plugin-transform-parameters": "^7.0.0",
+				"@babel/plugin-transform-private-methods": "^7.22.5",
+				"@babel/plugin-transform-private-property-in-object": "^7.22.11",
+				"@babel/plugin-transform-react-display-name": "^7.0.0",
+				"@babel/plugin-transform-react-jsx": "^7.0.0",
+				"@babel/plugin-transform-react-jsx-self": "^7.0.0",
+				"@babel/plugin-transform-react-jsx-source": "^7.0.0",
+				"@babel/plugin-transform-runtime": "^7.0.0",
+				"@babel/plugin-transform-shorthand-properties": "^7.0.0",
+				"@babel/plugin-transform-spread": "^7.0.0",
+				"@babel/plugin-transform-sticky-regex": "^7.0.0",
+				"@babel/plugin-transform-typescript": "^7.5.0",
+				"@babel/plugin-transform-unicode-regex": "^7.0.0",
+				"@babel/template": "^7.0.0",
+				"@react-native/babel-plugin-codegen": "0.73.3",
+				"babel-plugin-transform-flow-enums": "^0.0.2",
+				"react-refresh": "^0.14.0"
 			},
 			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/@storybook/blocks/node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"node_modules/@storybook/blocks/node_modules/telejson": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-			"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-			"dev": true,
-			"dependencies": {
-				"memoizerific": "^1.11.3"
-			}
-		},
-		"node_modules/@storybook/builder-manager": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/builder-manager/-/builder-manager-7.2.2.tgz",
-			"integrity": "sha512-19LqtL5/Yos9/wXqTxg+zOOK6M312eHXAdaYt2REGk1iqJzQXoy4wnmE2rbjBMmD5bUTzWm2vkmHGtkzAjwzzA==",
-			"dev": true,
-			"dependencies": {
-				"@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/manager": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@types/ejs": "^3.1.1",
-				"@types/find-cache-dir": "^3.2.1",
-				"@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10",
-				"browser-assert": "^1.2.1",
-				"ejs": "^3.1.8",
-				"esbuild": "^0.18.0",
-				"esbuild-plugin-alias": "^0.2.1",
-				"express": "^4.17.3",
-				"find-cache-dir": "^3.0.0",
-				"fs-extra": "^11.1.0",
-				"process": "^0.11.10",
-				"util": "^0.12.4"
+				"node": ">=18"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+			"peerDependencies": {
+				"@babel/core": "*"
 			}
 		},
-		"node_modules/@storybook/builder-manager/node_modules/find-cache-dir": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+		"node_modules/@react-native/metro-config/node_modules/@react-native/metro-babel-transformer": {
+			"version": "0.73.14",
+			"resolved": "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.73.14.tgz",
+			"integrity": "sha512-5wLeYw/lormpSqYfI9H/geZ/EtPmi+x5qLkEit15Q/70hkzYo/M+aWztUtbOITfgTEOP8d6ybROzoGsqgyZLcw==",
 			"dev": true,
 			"dependencies": {
-				"commondir": "^1.0.1",
-				"make-dir": "^3.0.2",
-				"pkg-dir": "^4.1.0"
+				"@babel/core": "^7.20.0",
+				"@react-native/babel-preset": "0.73.20",
+				"hermes-parser": "0.15.0",
+				"nullthrows": "^1.1.1"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=18"
 			},
-			"funding": {
-				"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+			"peerDependencies": {
+				"@babel/core": "*"
 			}
 		},
-		"node_modules/@storybook/builder-manager/node_modules/find-cache-dir/node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
+		"node_modules/@react-native/normalize-color": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@react-native/normalize-color/-/normalize-color-2.1.0.tgz",
+			"integrity": "sha512-Z1jQI2NpdFJCVgpY+8Dq/Bt3d+YUi1928Q+/CZm/oh66fzM0RUl54vvuXlPJKybH4pdCZey1eDTPaLHkMPNgWA=="
+		},
+		"node_modules/@react-native/normalize-colors": {
+			"version": "0.73.2",
+			"resolved": "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.73.2.tgz",
+			"integrity": "sha512-bRBcb2T+I88aG74LMVHaKms2p/T8aQd8+BZ7LuuzXlRfog1bMWWn/C5i0HVuvW4RPtXQYgIlGiXVDy9Ir1So/w=="
+		},
+		"node_modules/@react-native/virtualized-lists": {
+			"version": "0.73.4",
+			"resolved": "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.73.4.tgz",
+			"integrity": "sha512-HpmLg1FrEiDtrtAbXiwCgXFYyloK/dOIPIuWW3fsqukwJEWAiTzm1nXGJ7xPU5XTHiWZ4sKup5Ebaj8z7iyWog==",
 			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
+				"invariant": "^2.2.4",
+				"nullthrows": "^1.1.1"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"react-native": "*"
 			}
 		},
-		"node_modules/@storybook/builder-manager/node_modules/find-cache-dir/node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
+		"node_modules/@react-navigation/core": {
+			"version": "5.12.0",
+			"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.12.0.tgz",
+			"integrity": "sha512-CTmYrFXCZwInN40CpEzkPxhrpzujj20qvsUgpH05+oO1flwsnaJsyBfYawIcTS62/1/Z6SAM7iW5PbKk+qw9iQ==",
 			"dependencies": {
-				"p-locate": "^4.1.0"
+				"@react-navigation/routers": "^5.4.9",
+				"escape-string-regexp": "^4.0.0",
+				"nanoid": "^3.1.9",
+				"query-string": "^6.13.1",
+				"react-is": "^16.13.0",
+				"use-subscription": "^1.4.0"
 			},
-			"engines": {
-				"node": ">=8"
+			"peerDependencies": {
+				"react": "*"
 			}
 		},
-		"node_modules/@storybook/builder-manager/node_modules/find-cache-dir/node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
+		"node_modules/@react-navigation/core/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@storybook/builder-manager/node_modules/find-cache-dir/node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@storybook/builder-manager/node_modules/find-cache-dir/node_modules/pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
-			"dependencies": {
-				"find-up": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
+		"node_modules/@react-navigation/elements": {
+			"version": "1.3.18",
+			"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.18.tgz",
+			"integrity": "sha512-/0hwnJkrr415yP0Hf4PjUKgGyfshrvNUKFXN85Mrt1gY49hy9IwxZgrrxlh0THXkPeq8q4VWw44eHDfAcQf20Q==",
+			"peerDependencies": {
+				"@react-navigation/native": "^6.0.0",
+				"react": "*",
+				"react-native": "*",
+				"react-native-safe-area-context": ">= 3.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-manager/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-			"dev": true,
+		"node_modules/@react-navigation/native": {
+			"version": "6.0.14",
+			"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.14.tgz",
+			"integrity": "sha512-Z95bJrRkZerBJq6Qc/xjA/kibPpB+UvPeMWS1CBhRF8FaX1483UdHqPqSbW879tPwjP2R4XfoA4dtoEHswrOjA==",
 			"dependencies": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^6.0.1",
-				"universalify": "^2.0.0"
+				"@react-navigation/core": "^6.4.1",
+				"escape-string-regexp": "^4.0.0",
+				"fast-deep-equal": "^3.1.3",
+				"nanoid": "^3.1.23"
 			},
-			"engines": {
-				"node": ">=14.14"
+			"peerDependencies": {
+				"react": "*",
+				"react-native": "*"
 			}
 		},
-		"node_modules/@storybook/builder-manager/node_modules/jsonfile": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-			"dev": true,
+		"node_modules/@react-navigation/native/node_modules/@react-navigation/core": {
+			"version": "6.4.17",
+			"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.17.tgz",
+			"integrity": "sha512-Nd76EpomzChWAosGqWOYE3ItayhDzIEzzZsT7PfGcRFDgW5miHV2t4MZcq9YIK4tzxZjVVpYbIynOOQQd1e0Cg==",
+			"license": "MIT",
 			"dependencies": {
-				"universalify": "^2.0.0"
+				"@react-navigation/routers": "^6.1.9",
+				"escape-string-regexp": "^4.0.0",
+				"nanoid": "^3.1.23",
+				"query-string": "^7.1.3",
+				"react-is": "^16.13.0",
+				"use-latest-callback": "^0.2.1"
 			},
-			"optionalDependencies": {
-				"graceful-fs": "^4.1.6"
+			"peerDependencies": {
+				"react": "*"
 			}
 		},
-		"node_modules/@storybook/builder-manager/node_modules/make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-			"dev": true,
+		"node_modules/@react-navigation/native/node_modules/@react-navigation/routers": {
+			"version": "6.1.9",
+			"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.9.tgz",
+			"integrity": "sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA==",
 			"dependencies": {
-				"semver": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/@storybook/builder-manager/node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
+				"nanoid": "^3.1.23"
 			}
 		},
-		"node_modules/@storybook/builder-manager/node_modules/path-exists": {
+		"node_modules/@react-navigation/native/node_modules/escape-string-regexp": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@storybook/builder-manager/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@storybook/builder-manager/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-			"dev": true,
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"engines": {
-				"node": ">= 10.0.0"
-			}
-		},
-		"node_modules/@storybook/builder-manager/node_modules/util": {
-			"version": "0.12.5",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"is-arguments": "^1.0.4",
-				"is-generator-function": "^1.0.7",
-				"is-typed-array": "^1.1.3",
-				"which-typed-array": "^1.1.2"
-			}
-		},
-		"node_modules/@storybook/builder-webpack5": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-7.2.2.tgz",
-			"integrity": "sha512-+f2H3tXPZfn3q/eruXCmWPVAopd1MMEAAvneZ4iqlSHPC5HK2dcX/zj3yPar6rjfHHvZBXNm5sSi4WuD5Pw9MA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.22.9",
-				"@storybook/addons": "7.2.2",
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-api": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/core-webpack": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/preview": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/router": "7.2.2",
-				"@storybook/store": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@swc/core": "^1.3.49",
-				"@types/node": "^16.0.0",
-				"@types/semver": "^7.3.4",
-				"babel-loader": "^9.0.0",
-				"babel-plugin-named-exports-order": "^0.0.2",
-				"browser-assert": "^1.2.1",
-				"case-sensitive-paths-webpack-plugin": "^2.4.0",
-				"constants-browserify": "^1.0.0",
-				"css-loader": "^6.7.1",
-				"express": "^4.17.3",
-				"fork-ts-checker-webpack-plugin": "^8.0.0",
-				"fs-extra": "^11.1.0",
-				"html-webpack-plugin": "^5.5.0",
-				"path-browserify": "^1.0.1",
-				"process": "^0.11.10",
-				"semver": "^7.3.7",
-				"style-loader": "^3.3.1",
-				"swc-loader": "^0.2.3",
-				"terser-webpack-plugin": "^5.3.1",
-				"ts-dedent": "^2.0.0",
-				"url": "^0.11.0",
-				"util": "^0.12.4",
-				"util-deprecate": "^1.0.2",
-				"webpack": "5",
-				"webpack-dev-middleware": "^6.1.1",
-				"webpack-hot-middleware": "^2.25.1",
-				"webpack-virtual-modules": "^0.5.0"
+				"node": ">=10"
 			},
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			},
-			"peerDependenciesMeta": {
-				"typescript": {
-					"optional": true
-				}
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dev": true,
+		"node_modules/@react-navigation/native/node_modules/query-string": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz",
+			"integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==",
 			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
+				"decode-uri-component": "^0.2.2",
+				"filter-obj": "^1.1.0",
+				"split-on-first": "^1.0.0",
+				"strict-uri-encode": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=6.9.0"
+				"node": ">=6"
 			},
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/@babel/core/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
+		"node_modules/@react-navigation/routers": {
+			"version": "5.4.9",
+			"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.4.9.tgz",
+			"integrity": "sha512-dYD5qrIKUmuBEp+O98hB0tDYpEsGQgCQFQgMEoFKBmVVhx2JnJJ1zxRjU7xWcCU4VdBA8IOowgHQHJsVNKYyrg==",
+			"dependencies": {
+				"nanoid": "^3.1.9"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dev": true,
+		"node_modules/@react-navigation/stack": {
+			"version": "6.3.5",
+			"resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.3.5.tgz",
+			"integrity": "sha512-G706Ow+8fhiLT5Cf48566YsjboU5h5ll9nva90xX3br7V6x0JMoGMvXjvbORZyzLuUytQO3mf0T3nVUuO52vZQ==",
 			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
+				"@react-navigation/elements": "^1.3.7",
+				"color": "^4.2.3",
+				"warn-once": "^0.1.0"
 			},
-			"engines": {
-				"node": ">=6.9.0"
+			"peerDependencies": {
+				"@react-navigation/native": "^6.0.0",
+				"react": "*",
+				"react-native": "*",
+				"react-native-gesture-handler": ">= 1.0.0",
+				"react-native-safe-area-context": ">= 3.0.0",
+				"react-native-screens": ">= 3.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/@storybook/addons": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-7.2.2.tgz",
-			"integrity": "sha512-yWBBpBcRyPP1deAjzWV9OAXrPfeRd/vRpJw09dWHzuD3xtnd3jZ2h+t1r9a5yTSQbP5GO1YdS/WOK5Uf9hcsuw==",
-			"dev": true,
+		"node_modules/@react-spring/animated": {
+			"version": "9.5.5",
+			"resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.5.5.tgz",
+			"integrity": "sha512-glzViz7syQ3CE6BQOwAyr75cgh0qsihm5lkaf24I0DfU63cMm/3+br299UEYkuaHNmfDfM414uktiPlZCNJbQA==",
 			"dependencies": {
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/types": "7.2.2"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+				"@react-spring/shared": "~9.5.5",
+				"@react-spring/types": "~9.5.5"
 			},
 			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/@storybook/channels": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-			"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-			"dev": true,
+		"node_modules/@react-spring/core": {
+			"version": "9.5.5",
+			"resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.5.5.tgz",
+			"integrity": "sha512-shaJYb3iX18Au6gkk8ahaF0qx0LpS0Yd+ajb4asBaAQf6WPGuEdJsbsNSgei1/O13JyEATsJl20lkjeslJPMYA==",
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"qs": "^6.10.0",
-				"telejson": "^7.0.3",
-				"tiny-invariant": "^1.3.1"
+				"@react-spring/animated": "~9.5.5",
+				"@react-spring/rafz": "~9.5.5",
+				"@react-spring/shared": "~9.5.5",
+				"@react-spring/types": "~9.5.5"
 			},
 			"funding": {
 				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+				"url": "https://opencollective.com/react-spring/donate"
+			},
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/@storybook/client-api": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-7.2.2.tgz",
-			"integrity": "sha512-47WDNZ5FdvtQuSijg3IexxFve2aBrBih6VHdKKcel2SSiS0W01043fNMsP1T+m6kJr4jdnp0J5GVQpTQFi8Kxg==",
-			"dev": true,
+		"node_modules/@react-spring/rafz": {
+			"version": "9.5.5",
+			"resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.5.5.tgz",
+			"integrity": "sha512-F/CLwB0d10jL6My5vgzRQxCNY2RNyDJZedRBK7FsngdCmzoq3V4OqqNc/9voJb9qRC2wd55oGXUeXv2eIaFmsw=="
+		},
+		"node_modules/@react-spring/shared": {
+			"version": "9.5.5",
+			"resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.5.5.tgz",
+			"integrity": "sha512-YwW70Pa/YXPOwTutExHZmMQSHcNC90kJOnNR4G4mCDNV99hE98jWkIPDOsgqbYx3amIglcFPiYKMaQuGdr8dyQ==",
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/preview-api": "7.2.2"
+				"@react-spring/rafz": "~9.5.5",
+				"@react-spring/types": "~9.5.5"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/@storybook/router": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/router/-/router-7.2.2.tgz",
-			"integrity": "sha512-cnJg43dm3dVifKkRBUsQ4wXC4sJOm46JAS95yRPeGACoHpJTcbCWk1n5GLYA7ozO+KFQSNdxHxPIjNqvnzMFiA==",
-			"dev": true,
+		"node_modules/@react-spring/types": {
+			"version": "9.5.5",
+			"resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.5.5.tgz",
+			"integrity": "sha512-7I/qY8H7Enwasxr4jU6WmtNK+RZ4Z/XvSlDvjXFVe7ii1x0MoSlkw6pD7xuac8qrHQRm9BTcbZNyeeKApYsvCg=="
+		},
+		"node_modules/@react-spring/web": {
+			"version": "9.5.5",
+			"resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.5.5.tgz",
+			"integrity": "sha512-+moT8aDX/ho/XAhU+HRY9m0LVV9y9CK6NjSRaI+30Re150pB3iEip6QfnF4qnhSCQ5drpMF0XRXHgOTY/xbtFw==",
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"memoizerific": "^1.11.3",
-				"qs": "^6.10.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+				"@react-spring/animated": "~9.5.5",
+				"@react-spring/core": "~9.5.5",
+				"@react-spring/shared": "~9.5.5",
+				"@react-spring/types": "~9.5.5"
 			},
 			"peerDependencies": {
 				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
 				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/@storybook/store": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/store/-/store-7.2.2.tgz",
-			"integrity": "sha512-4Z0iFdD6u9u9rDvr0ekLXOx1tIcmS1OU3xhk92RFWbGpAx4+bb1JDWmO7T04l+uPvLvYpWn5NrSV1ZdgyTVxUg==",
+		"node_modules/@samverschueren/stream-to-observable": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
+			"integrity": "sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/preview-api": "7.2.2"
+				"any-observable": "^0.3.0"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			}
-		},
-		"node_modules/@storybook/builder-webpack5/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-			"dev": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+			"engines": {
+				"node": ">=6"
 			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
+			"peerDependenciesMeta": {
+				"rxjs": {
+					"optional": true
+				},
+				"zen-observable": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/babel-loader": {
-			"version": "9.1.3",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
-			"integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
-			"dev": true,
+		"node_modules/@sentry/core": {
+			"version": "6.19.7",
+			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.19.7.tgz",
+			"integrity": "sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==",
 			"dependencies": {
-				"find-cache-dir": "^4.0.0",
-				"schema-utils": "^4.0.0"
+				"@sentry/hub": "6.19.7",
+				"@sentry/minimal": "6.19.7",
+				"@sentry/types": "6.19.7",
+				"@sentry/utils": "6.19.7",
+				"tslib": "^1.9.3"
 			},
 			"engines": {
-				"node": ">= 14.15.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.12.0",
-				"webpack": ">=5"
+				"node": ">=6"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/babel-loader/node_modules/find-cache-dir": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
-			"integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
-			"dev": true,
+		"node_modules/@sentry/core/node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+		},
+		"node_modules/@sentry/hub": {
+			"version": "6.19.7",
+			"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.19.7.tgz",
+			"integrity": "sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA==",
 			"dependencies": {
-				"common-path-prefix": "^3.0.0",
-				"pkg-dir": "^7.0.0"
+				"@sentry/types": "6.19.7",
+				"@sentry/utils": "6.19.7",
+				"tslib": "^1.9.3"
 			},
 			"engines": {
-				"node": ">=14.16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">=6"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/babel-loader/node_modules/find-up": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
-			"integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
-			"dev": true,
+		"node_modules/@sentry/hub/node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+		},
+		"node_modules/@sentry/minimal": {
+			"version": "6.19.7",
+			"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.19.7.tgz",
+			"integrity": "sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ==",
 			"dependencies": {
-				"locate-path": "^7.1.0",
-				"path-exists": "^5.0.0"
+				"@sentry/hub": "6.19.7",
+				"@sentry/types": "6.19.7",
+				"tslib": "^1.9.3"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">=6"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/babel-loader/node_modules/locate-path": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
-			"integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
-			"dev": true,
+		"node_modules/@sentry/minimal/node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+		},
+		"node_modules/@sentry/node": {
+			"version": "6.19.7",
+			"resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.19.7.tgz",
+			"integrity": "sha512-gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg==",
 			"dependencies": {
-				"p-locate": "^6.0.0"
+				"@sentry/core": "6.19.7",
+				"@sentry/hub": "6.19.7",
+				"@sentry/types": "6.19.7",
+				"@sentry/utils": "6.19.7",
+				"cookie": "^0.4.1",
+				"https-proxy-agent": "^5.0.0",
+				"lru_map": "^0.3.3",
+				"tslib": "^1.9.3"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">=6"
+			}
+		},
+		"node_modules/@sentry/node/node_modules/cookie": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+			"integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/@sentry/node/node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+		},
+		"node_modules/@sentry/types": {
+			"version": "6.19.7",
+			"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.19.7.tgz",
+			"integrity": "sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@sentry/utils": {
+			"version": "6.19.7",
+			"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.19.7.tgz",
+			"integrity": "sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA==",
+			"dependencies": {
+				"@sentry/types": "6.19.7",
+				"tslib": "^1.9.3"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/babel-loader/node_modules/p-limit": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-			"integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+		"node_modules/@sentry/utils/node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+		},
+		"node_modules/@sideway/address": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
+			"integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
+			"dependencies": {
+				"@hapi/hoek": "^9.0.0"
+			}
+		},
+		"node_modules/@sideway/formula": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+			"integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
+		},
+		"node_modules/@sideway/pinpoint": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+			"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
+		},
+		"node_modules/@sidvind/better-ajv-errors": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@sidvind/better-ajv-errors/-/better-ajv-errors-2.1.0.tgz",
+			"integrity": "sha512-JuIb009FhHuL9priFBho2kv7QmZOydj0LgYvj+h1t0mMCmhM/YmQNRlJR5wVtBZya6wrVFK5Hi5TIbv5BKEx7w==",
 			"dev": true,
 			"dependencies": {
-				"yocto-queue": "^1.0.0"
+				"@babel/code-frame": "^7.16.0",
+				"chalk": "^4.1.0"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": ">= 14.0.0"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+			"peerDependencies": {
+				"ajv": "4.11.8 - 8"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/babel-loader/node_modules/p-locate": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
-			"integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+		"node_modules/@sigstore/bundle": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.0.0.tgz",
+			"integrity": "sha512-yLvrWDOh6uMOUlFCTJIZEnwOT9Xte7NPXUqVexEKGSF5XtBAuSg5du0kn3dRR0p47a4ah10Y0mNt8+uyeQXrBQ==",
 			"dev": true,
 			"dependencies": {
-				"p-limit": "^4.0.0"
+				"@sigstore/protobuf-specs": "^0.2.0"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/babel-loader/node_modules/path-exists": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-			"integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+		"node_modules/@sigstore/protobuf-specs": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.0.tgz",
+			"integrity": "sha512-8ZhZKAVfXjIspDWwm3D3Kvj0ddbJ0HqDZ/pOs5cx88HpT8mVsotFrg7H1UMnXOuDHz6Zykwxn4mxG3QLuN+RUg==",
 			"dev": true,
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/babel-loader/node_modules/pkg-dir": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
-			"integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+		"node_modules/@sigstore/tuf": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz",
+			"integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==",
 			"dev": true,
 			"dependencies": {
-				"find-up": "^6.3.0"
+				"@sigstore/protobuf-specs": "^0.2.0",
+				"tuf-js": "^1.1.7"
 			},
 			"engines": {
-				"node": ">=14.16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
+		"node_modules/@sinclair/typebox": {
+			"version": "0.27.8",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
+		},
+		"node_modules/@sindresorhus/is": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+			"integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
 			"engines": {
 				"node": ">=10"
 			},
 			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
+				"url": "https://github.com/sindresorhus/is?sponsor=1"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/colorette": {
-			"version": "2.0.20",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-			"dev": true
+		"node_modules/@sinonjs/commons": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
+			"integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
+			"dependencies": {
+				"type-detect": "4.0.8"
+			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/css-loader": {
-			"version": "6.8.1",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-			"integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
-			"dev": true,
+		"node_modules/@sinonjs/fake-timers": {
+			"version": "10.3.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
 			"dependencies": {
-				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.21",
-				"postcss-modules-extract-imports": "^3.0.0",
-				"postcss-modules-local-by-default": "^4.0.3",
-				"postcss-modules-scope": "^3.0.0",
-				"postcss-modules-values": "^4.0.0",
-				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.3.8"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.0.0"
+				"@sinonjs/commons": "^3.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-8.0.0.tgz",
-			"integrity": "sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==",
+		"node_modules/@sliphua/lilconfig-ts-loader": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@sliphua/lilconfig-ts-loader/-/lilconfig-ts-loader-3.2.2.tgz",
+			"integrity": "sha512-nX2aBwAykiG50fSUzK9eyA5UvWcrEKzA0ZzCq9mLwHMwpKxM+U05YH8PHba1LJrbeZ7R1HSjJagWKMqFyq8cxw==",
 			"dev": true,
 			"dependencies": {
-				"@babel/code-frame": "^7.16.7",
-				"chalk": "^4.1.2",
-				"chokidar": "^3.5.3",
-				"cosmiconfig": "^7.0.1",
-				"deepmerge": "^4.2.2",
-				"fs-extra": "^10.0.0",
-				"memfs": "^3.4.1",
-				"minimatch": "^3.0.4",
-				"node-abort-controller": "^3.0.1",
-				"schema-utils": "^3.1.1",
-				"semver": "^7.3.5",
-				"tapable": "^2.2.1"
+				"lodash.get": "^4",
+				"make-error": "^1",
+				"ts-node": "^9",
+				"tslib": "^2"
 			},
 			"engines": {
-				"node": ">=12.13.0",
-				"yarn": ">=1.0.0"
+				"node": ">=10.0.0"
 			},
 			"peerDependencies": {
-				"typescript": ">3.6.0",
-				"webpack": "^5.11.0"
+				"lilconfig": ">=2"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+		"node_modules/@storybook/addon-a11y": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-7.6.15.tgz",
+			"integrity": "sha512-8PxRMBJUSxNoceo2IYXFyZp3VU+/ONK/DsD0dj/fVrv7izFrS8aw2GWSsSMK8xAbEUpANXWMKGaSyvrRFVgsVQ==",
 			"dev": true,
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
+				"@storybook/addon-highlight": "7.6.15",
+				"axe-core": "^4.2.0"
 			},
 			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-			"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+		"node_modules/@storybook/addon-actions": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-7.6.15.tgz",
+			"integrity": "sha512-2Jfvbahe/tmq1iNnNxmcP0JnX0rqCuijjXXai9yMDV3koIMawn6t88MPVrdcso5ch/fxE45522nZqA3SZJbM4g==",
 			"dev": true,
 			"dependencies": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^6.0.1",
-				"universalify": "^2.0.0"
+				"@storybook/core-events": "7.6.15",
+				"@storybook/global": "^5.0.0",
+				"@types/uuid": "^9.0.1",
+				"dequal": "^2.0.2",
+				"polished": "^4.2.2",
+				"uuid": "^9.0.0"
 			},
-			"engines": {
-				"node": ">=12"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin/node_modules/json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+		"node_modules/@storybook/addon-actions/node_modules/@types/uuid": {
+			"version": "9.0.8",
+			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
+			"integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
 			"dev": true
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+		"node_modules/@storybook/addon-controls": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-7.6.15.tgz",
+			"integrity": "sha512-HXcG/Lr4ri7WUFz14Y5lEBTA1XmKy0E/DepW88XVy6YNsTpERVWEBcvjKoLAU1smKrfhVto96hK2AVFL3A8EBQ==",
 			"dev": true,
 			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
+				"@storybook/blocks": "7.6.15",
+				"lodash": "^4.17.21",
+				"ts-dedent": "^2.0.0"
 			},
-			"engines": {
-				"node": ">= 10.13.0"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
+			}
+		},
+		"node_modules/@storybook/addon-docs": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-7.6.15.tgz",
+			"integrity": "sha512-UPODqO+mrYaKyTSAtfRslxOFgSP/v/5vfDx896pbNTC4Sf8xLytoudw4I14hzkHmRdXiOnd21FqXJfmF/Onsvw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/transform": "^29.3.1",
+				"@mdx-js/react": "^2.1.5",
+				"@storybook/blocks": "7.6.15",
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/components": "7.6.15",
+				"@storybook/csf-plugin": "7.6.15",
+				"@storybook/csf-tools": "7.6.15",
+				"@storybook/global": "^5.0.0",
+				"@storybook/mdx2-csf": "^1.0.0",
+				"@storybook/node-logger": "7.6.15",
+				"@storybook/postinstall": "7.6.15",
+				"@storybook/preview-api": "7.6.15",
+				"@storybook/react-dom-shim": "7.6.15",
+				"@storybook/theming": "7.6.15",
+				"@storybook/types": "7.6.15",
+				"fs-extra": "^11.1.0",
+				"remark-external-links": "^8.0.0",
+				"remark-slug": "^6.0.0",
+				"ts-dedent": "^2.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
+				"url": "https://opencollective.com/storybook"
+			},
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+		"node_modules/@storybook/addon-docs/node_modules/fs-extra": {
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -11565,31 +10997,7 @@
 				"node": ">=14.14"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@storybook/builder-webpack5/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@storybook/builder-webpack5/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
-		},
-		"node_modules/@storybook/builder-webpack5/node_modules/jsonfile": {
+		"node_modules/@storybook/addon-docs/node_modules/jsonfile": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
 			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
@@ -11601,217 +11009,509 @@
 				"graceful-fs": "^4.1.6"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/path-browserify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-			"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-			"dev": true
+		"node_modules/@storybook/addon-docs/node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/postcss": {
-			"version": "8.4.27",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
-			"integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
+		"node_modules/@storybook/addon-highlight": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-7.6.15.tgz",
+			"integrity": "sha512-ptidWZJJcEM83YsxCjf+m1q8Rr9sN8piJ4PJlM2vyc4MLZY4q6htb1JJFeq3ov1Iz6SY9KjKc/zOkWo4L54nxw==",
 			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/postcss"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
 			"dependencies": {
-				"nanoid": "^3.3.6",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
+				"@storybook/global": "^5.0.0"
 			},
-			"engines": {
-				"node": "^10 || ^12 || >=14"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+		"node_modules/@storybook/addon-toolbars": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-7.6.15.tgz",
+			"integrity": "sha512-QougKS2eABB5Jd332i9tBpKgh2lN4aaqXkvmVC5egT5dOuJ9IeuZbGwiALef/uf1f3IuyUP41So9l2dI4u19aw==",
+			"dev": true,
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
+			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/schema-utils": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+		"node_modules/@storybook/addon-viewport": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-7.6.15.tgz",
+			"integrity": "sha512-0esg0+onJftU2prD3n/sbxBTrTOIGQnZhbrKPP+/S26dVHuYaR/65XdwpRgXNY5PHK2yjU78HxiJP+Kyu75ntw==",
 			"dev": true,
 			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
+				"memoizerific": "^1.11.3"
 			},
 			"funding": {
 				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
+				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/schema-utils/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+		"node_modules/@storybook/blocks": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-7.6.15.tgz",
+			"integrity": "sha512-ODP7AVh2iIGblI5WKGokWSHbp9YQHc+Uce7JCGcnDbNavoy64Z6R6G+wXzF5jfl7xQlbhQ8yQCuSSL4GNdYTeA==",
 			"dev": true,
 			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
+				"@storybook/channels": "7.6.15",
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/components": "7.6.15",
+				"@storybook/core-events": "7.6.15",
+				"@storybook/csf": "^0.1.2",
+				"@storybook/docs-tools": "7.6.15",
+				"@storybook/global": "^5.0.0",
+				"@storybook/manager-api": "7.6.15",
+				"@storybook/preview-api": "7.6.15",
+				"@storybook/theming": "7.6.15",
+				"@storybook/types": "7.6.15",
+				"@types/lodash": "^4.14.167",
+				"color-convert": "^2.0.1",
+				"dequal": "^2.0.2",
+				"lodash": "^4.17.21",
+				"markdown-to-jsx": "^7.1.8",
+				"memoizerific": "^1.11.3",
+				"polished": "^4.2.2",
+				"react-colorful": "^5.1.2",
+				"telejson": "^7.2.0",
+				"tocbot": "^4.20.1",
+				"ts-dedent": "^2.0.0",
+				"util-deprecate": "^1.0.2"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
 			},
 			"peerDependencies": {
-				"ajv": "^8.8.2"
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+		"node_modules/@storybook/blocks/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=7.0.0"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/style-loader": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
-			"integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
+		"node_modules/@storybook/blocks/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/@storybook/builder-manager": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/builder-manager/-/builder-manager-7.6.15.tgz",
+			"integrity": "sha512-vfpfCywiasyP7vtbgLJhjssBEwUjZhBsRsubDAzumgOochPiKKPNwsSc5NU/4ZIGaC5zRO26kUaUqFIbJdTEUQ==",
 			"dev": true,
-			"engines": {
-				"node": ">= 12.13.0"
+			"dependencies": {
+				"@fal-works/esbuild-plugin-global-externals": "^2.1.2",
+				"@storybook/core-common": "7.6.15",
+				"@storybook/manager": "7.6.15",
+				"@storybook/node-logger": "7.6.15",
+				"@types/ejs": "^3.1.1",
+				"@types/find-cache-dir": "^3.2.1",
+				"@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10",
+				"browser-assert": "^1.2.1",
+				"ejs": "^3.1.8",
+				"esbuild": "^0.18.0",
+				"esbuild-plugin-alias": "^0.2.1",
+				"express": "^4.17.3",
+				"find-cache-dir": "^3.0.0",
+				"fs-extra": "^11.1.0",
+				"process": "^0.11.10",
+				"util": "^0.12.4"
 			},
 			"funding": {
 				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.0.0"
+				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+		"node_modules/@storybook/builder-manager/node_modules/find-cache-dir": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
 			"dev": true,
 			"dependencies": {
-				"has-flag": "^4.0.0"
+				"commondir": "^1.0.1",
+				"make-dir": "^3.0.2",
+				"pkg-dir": "^4.1.0"
 			},
 			"engines": {
 				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/tapable": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+		"node_modules/@storybook/builder-manager/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
 			"engines": {
-				"node": ">=6"
+				"node": ">=8"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/telejson": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-			"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
+		"node_modules/@storybook/builder-manager/node_modules/fs-extra": {
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
-				"memoizerific": "^1.11.3"
-			}
-		},
-		"node_modules/@storybook/builder-webpack5/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-			"dev": true,
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
 			"engines": {
-				"node": ">= 10.0.0"
+				"node": ">=14.14"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/util": {
-			"version": "0.12.5",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+		"node_modules/@storybook/builder-manager/node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
 			"dev": true,
 			"dependencies": {
-				"inherits": "^2.0.3",
-				"is-arguments": "^1.0.4",
-				"is-generator-function": "^1.0.7",
-				"is-typed-array": "^1.1.3",
-				"which-typed-array": "^1.1.2"
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/webpack-dev-middleware": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz",
-			"integrity": "sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==",
+		"node_modules/@storybook/builder-manager/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
 			"dependencies": {
-				"colorette": "^2.0.10",
-				"memfs": "^3.4.12",
-				"mime-types": "^2.1.31",
-				"range-parser": "^1.2.1",
-				"schema-utils": "^4.0.0"
+				"p-locate": "^4.1.0"
 			},
 			"engines": {
-				"node": ">= 14.15.0"
+				"node": ">=8"
+			}
+		},
+		"node_modules/@storybook/builder-manager/node_modules/make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+			"dev": true,
+			"dependencies": {
+				"semver": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@storybook/builder-manager/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@storybook/builder-manager/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@storybook/builder-manager/node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/@storybook/builder-manager/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@storybook/builder-manager/node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@storybook/builder-manager/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@storybook/builder-manager/node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
+		"node_modules/@storybook/builder-manager/node_modules/util": {
+			"version": "0.12.5",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"is-arguments": "^1.0.4",
+				"is-generator-function": "^1.0.7",
+				"is-typed-array": "^1.1.3",
+				"which-typed-array": "^1.1.2"
+			}
+		},
+		"node_modules/@storybook/builder-webpack5": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-7.6.15.tgz",
+			"integrity": "sha512-HF+TSK/eU2ld8uQ8VWgcAIzOQ2hjnEkzup363vGZkYUfsHsVbjMpZgf+foDjI4LZNfQ/RjcVEZxqJqIbpM0Sjg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.23.2",
+				"@storybook/channels": "7.6.15",
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/core-common": "7.6.15",
+				"@storybook/core-events": "7.6.15",
+				"@storybook/core-webpack": "7.6.15",
+				"@storybook/node-logger": "7.6.15",
+				"@storybook/preview": "7.6.15",
+				"@storybook/preview-api": "7.6.15",
+				"@swc/core": "^1.3.82",
+				"@types/node": "^18.0.0",
+				"@types/semver": "^7.3.4",
+				"babel-loader": "^9.0.0",
+				"browser-assert": "^1.2.1",
+				"case-sensitive-paths-webpack-plugin": "^2.4.0",
+				"cjs-module-lexer": "^1.2.3",
+				"constants-browserify": "^1.0.0",
+				"css-loader": "^6.7.1",
+				"es-module-lexer": "^1.4.1",
+				"express": "^4.17.3",
+				"fork-ts-checker-webpack-plugin": "^8.0.0",
+				"fs-extra": "^11.1.0",
+				"html-webpack-plugin": "^5.5.0",
+				"magic-string": "^0.30.5",
+				"path-browserify": "^1.0.1",
+				"process": "^0.11.10",
+				"semver": "^7.3.7",
+				"style-loader": "^3.3.1",
+				"swc-loader": "^0.2.3",
+				"terser-webpack-plugin": "^5.3.1",
+				"ts-dedent": "^2.0.0",
+				"url": "^0.11.0",
+				"util": "^0.12.4",
+				"util-deprecate": "^1.0.2",
+				"webpack": "5",
+				"webpack-dev-middleware": "^6.1.1",
+				"webpack-hot-middleware": "^2.25.1",
+				"webpack-virtual-modules": "^0.5.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@storybook/builder-webpack5/node_modules/css-loader": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+			"integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
+			"dev": true,
+			"dependencies": {
+				"icss-utils": "^5.1.0",
+				"postcss": "^8.4.33",
+				"postcss-modules-extract-imports": "^3.1.0",
+				"postcss-modules-local-by-default": "^4.0.5",
+				"postcss-modules-scope": "^3.2.0",
+				"postcss-modules-values": "^4.0.0",
+				"postcss-value-parser": "^4.2.0",
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/webpack"
 			},
 			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
 				"webpack": "^5.0.0"
 			},
 			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
 				"webpack": {
 					"optional": true
 				}
 			}
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/webpack-virtual-modules": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
-			"integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
+		"node_modules/@storybook/builder-webpack5/node_modules/fs-extra": {
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=14.14"
+			}
+		},
+		"node_modules/@storybook/builder-webpack5/node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dev": true,
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/@storybook/builder-webpack5/node_modules/path-browserify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+			"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
 			"dev": true
 		},
-		"node_modules/@storybook/builder-webpack5/node_modules/yocto-queue": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-			"integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+		"node_modules/@storybook/builder-webpack5/node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+			"dev": true
+		},
+		"node_modules/@storybook/builder-webpack5/node_modules/style-loader": {
+			"version": "3.3.4",
+			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+			"integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
 			"dev": true,
 			"engines": {
-				"node": ">=12.20"
+				"node": ">= 12.13.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/@storybook/builder-webpack5/node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
+		"node_modules/@storybook/builder-webpack5/node_modules/util": {
+			"version": "0.12.5",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"is-arguments": "^1.0.4",
+				"is-generator-function": "^1.0.7",
+				"is-typed-array": "^1.1.3",
+				"which-typed-array": "^1.1.2"
+			}
+		},
+		"node_modules/@storybook/channels": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.6.15.tgz",
+			"integrity": "sha512-UPDYRzGkygYFa8QUpEiumWrvZm4u4RKVzgiBt9C4RmHORqkkZzL9LXhaZJp2SmIz1ND5gx6KR5ze8ZnAdwxxoQ==",
+			"dev": true,
+			"dependencies": {
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/core-events": "7.6.15",
+				"@storybook/global": "^5.0.0",
+				"qs": "^6.10.0",
+				"telejson": "^7.2.0",
+				"tiny-invariant": "^1.3.1"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
 			}
 		},
 		"node_modules/@storybook/cli": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/cli/-/cli-7.2.2.tgz",
-			"integrity": "sha512-YoXRCRICj4NEqUvYvgVRmk5IJadou6feCymI5r94z7XHQiObMoZd3p6QjyEp8ayi8XpxoJM/Hrddu3hddxUvyw==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/cli/-/cli-7.6.15.tgz",
+			"integrity": "sha512-2QRqCyVGDSkraHxX2JPYkkFccbu5Uo+JYFaFJo4vmMXzDurjWON+Ga2B8FCTd4A8P4C02Ca/79jgQoyBB3xoew==",
 			"dev": true,
 			"dependencies": {
-				"@babel/core": "^7.22.9",
-				"@babel/preset-env": "^7.22.9",
-				"@babel/types": "^7.22.5",
+				"@babel/core": "^7.23.2",
+				"@babel/preset-env": "^7.23.2",
+				"@babel/types": "^7.23.0",
 				"@ndelangen/get-tarball": "^3.0.7",
-				"@storybook/codemod": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/core-server": "7.2.2",
-				"@storybook/csf-tools": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/telemetry": "7.2.2",
-				"@storybook/types": "7.2.2",
+				"@storybook/codemod": "7.6.15",
+				"@storybook/core-common": "7.6.15",
+				"@storybook/core-events": "7.6.15",
+				"@storybook/core-server": "7.6.15",
+				"@storybook/csf-tools": "7.6.15",
+				"@storybook/node-logger": "7.6.15",
+				"@storybook/telemetry": "7.6.15",
+				"@storybook/types": "7.6.15",
 				"@types/semver": "^7.3.4",
 				"@yarnpkg/fslib": "2.10.3",
 				"@yarnpkg/libzip": "2.3.0",
@@ -11828,7 +11528,7 @@
 				"get-port": "^5.1.1",
 				"giget": "^1.0.0",
 				"globby": "^11.0.2",
-				"jscodeshift": "^0.14.0",
+				"jscodeshift": "^0.15.1",
 				"leven": "^3.1.0",
 				"ora": "^5.4.1",
 				"prettier": "^2.8.0",
@@ -11836,7 +11536,6 @@
 				"puppeteer-core": "^2.1.1",
 				"read-pkg-up": "^7.0.1",
 				"semver": "^7.3.7",
-				"simple-update-notifier": "^2.0.0",
 				"strip-json-comments": "^3.0.1",
 				"tempy": "^1.0.1",
 				"ts-dedent": "^2.0.0",
@@ -11851,66 +11550,6 @@
 				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/cli/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dev": true,
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@storybook/cli/node_modules/@babel/core/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@storybook/cli/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
 		"node_modules/@storybook/cli/node_modules/agent-base": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
@@ -11920,18 +11559,6 @@
 				"node": ">= 6.0.0"
 			}
 		},
-		"node_modules/@storybook/cli/node_modules/ast-types": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz",
-			"integrity": "sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==",
-			"dev": true,
-			"dependencies": {
-				"tslib": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@storybook/cli/node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -12032,9 +11659,9 @@
 			}
 		},
 		"node_modules/@storybook/cli/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -12057,13 +11684,24 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@storybook/cli/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+		"node_modules/@storybook/cli/node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
 			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
 			"engines": {
-				"node": ">=4"
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/@storybook/cli/node_modules/has-flag": {
@@ -12110,20 +11748,21 @@
 			}
 		},
 		"node_modules/@storybook/cli/node_modules/jscodeshift": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
-			"integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.15.2.tgz",
+			"integrity": "sha512-FquR7Okgmc4Sd0aEDwqho3rEiKR3BdvuG9jfdHjLJ6JQoWSMpavug3AoIfnfWhxFlf+5pzQh8qjqz0DWFrNQzA==",
 			"dev": true,
 			"dependencies": {
-				"@babel/core": "^7.13.16",
-				"@babel/parser": "^7.13.16",
-				"@babel/plugin-proposal-class-properties": "^7.13.0",
-				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-				"@babel/plugin-proposal-optional-chaining": "^7.13.12",
-				"@babel/plugin-transform-modules-commonjs": "^7.13.8",
-				"@babel/preset-flow": "^7.13.13",
-				"@babel/preset-typescript": "^7.13.0",
-				"@babel/register": "^7.13.16",
+				"@babel/core": "^7.23.0",
+				"@babel/parser": "^7.23.0",
+				"@babel/plugin-transform-class-properties": "^7.22.5",
+				"@babel/plugin-transform-modules-commonjs": "^7.23.0",
+				"@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
+				"@babel/plugin-transform-optional-chaining": "^7.23.0",
+				"@babel/plugin-transform-private-methods": "^7.22.5",
+				"@babel/preset-flow": "^7.22.15",
+				"@babel/preset-typescript": "^7.23.0",
+				"@babel/register": "^7.22.15",
 				"babel-core": "^7.0.0-bridge.0",
 				"chalk": "^4.1.2",
 				"flow-parser": "0.*",
@@ -12131,7 +11770,7 @@
 				"micromatch": "^4.0.4",
 				"neo-async": "^2.5.0",
 				"node-dir": "^0.1.17",
-				"recast": "^0.21.0",
+				"recast": "^0.23.3",
 				"temp": "^0.8.4",
 				"write-file-atomic": "^2.3.0"
 			},
@@ -12140,6 +11779,11 @@
 			},
 			"peerDependencies": {
 				"@babel/preset-env": "^7.1.6"
+			},
+			"peerDependenciesMeta": {
+				"@babel/preset-env": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@storybook/cli/node_modules/jsonfile": {
@@ -12310,14 +11954,16 @@
 			}
 		},
 		"node_modules/@storybook/cli/node_modules/recast": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz",
-			"integrity": "sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==",
+			"version": "0.23.9",
+			"resolved": "https://registry.npmjs.org/recast/-/recast-0.23.9.tgz",
+			"integrity": "sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ast-types": "0.15.2",
+				"ast-types": "^0.16.1",
 				"esprima": "~4.0.0",
 				"source-map": "~0.6.1",
+				"tiny-invariant": "^1.3.3",
 				"tslib": "^2.0.1"
 			},
 			"engines": {
@@ -12349,26 +11995,6 @@
 				"rimraf": "bin.js"
 			}
 		},
-		"node_modules/@storybook/cli/node_modules/rimraf/node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@storybook/cli/node_modules/shebang-command": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -12414,54 +12040,10 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@storybook/cli/node_modules/temp": {
-			"version": "0.8.4",
-			"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
-			"integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
-			"dev": true,
-			"dependencies": {
-				"rimraf": "~2.6.2"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@storybook/cli/node_modules/temp/node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/@storybook/cli/node_modules/temp/node_modules/rimraf": {
-			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-			"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-			"dev": true,
-			"dependencies": {
-				"glob": "^7.1.3"
-			},
-			"bin": {
-				"rimraf": "bin.js"
-			}
-		},
 		"node_modules/@storybook/cli/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
@@ -12483,18 +12065,19 @@
 			}
 		},
 		"node_modules/@storybook/cli/node_modules/ws": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-			"integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+			"version": "6.2.3",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz",
+			"integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"async-limiter": "~1.0.0"
 			}
 		},
 		"node_modules/@storybook/client-logger": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-7.2.2.tgz",
-			"integrity": "sha512-ULqPNTJsJdlWTQt5V/hEv4CUq7GgrLzLvcjhKB9IYbp4a0gjhinfq7jBFIcXRE8BSOQLui2PDGE3SzElzOp5/g==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-7.6.15.tgz",
+			"integrity": "sha512-n+K8IqnombqiQNnywVovS+lK61tvv/XSfgPt0cgvoF/hJZB0VDOMRjWsV+v9qQpj1TQEl1lLWeJwZMthTWupJA==",
 			"dev": true,
 			"dependencies": {
 				"@storybook/global": "^5.0.0"
@@ -12505,22 +12088,22 @@
 			}
 		},
 		"node_modules/@storybook/codemod": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-7.2.2.tgz",
-			"integrity": "sha512-i8WY3PJeJalVWTjLChlJREYHp42mGw0GXLqTH/q0hbAwzuVBBTrsMqy+oXOWRCAeCGbK5uP10GOLN23s+zuNTQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.22.9",
-				"@babel/preset-env": "^7.22.9",
-				"@babel/types": "^7.22.5",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/csf-tools": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/types": "7.2.2",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-7.6.15.tgz",
+			"integrity": "sha512-NiEbTLCdacj6TMxC7G49IImXeMzkG8wpPr8Ayxm9HeG6q5UkiF5/DiZdqbJm2zaosOsOKWwvXg1t6Pq6Nivytg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.23.2",
+				"@babel/preset-env": "^7.23.2",
+				"@babel/types": "^7.23.0",
+				"@storybook/csf": "^0.1.2",
+				"@storybook/csf-tools": "7.6.15",
+				"@storybook/node-logger": "7.6.15",
+				"@storybook/types": "7.6.15",
 				"@types/cross-spawn": "^6.0.2",
 				"cross-spawn": "^7.0.3",
 				"globby": "^11.0.2",
-				"jscodeshift": "^0.14.0",
+				"jscodeshift": "^0.15.1",
 				"lodash": "^4.17.21",
 				"prettier": "^2.8.0",
 				"recast": "^0.23.1"
@@ -12530,81 +12113,6 @@
 				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/codemod/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dev": true,
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@storybook/codemod/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@storybook/codemod/node_modules/assert": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-			"integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
-			"dev": true,
-			"dependencies": {
-				"es6-object-assign": "^1.1.0",
-				"is-nan": "^1.2.1",
-				"object-is": "^1.0.1",
-				"util": "^0.12.0"
-			}
-		},
-		"node_modules/@storybook/codemod/node_modules/ast-types": {
-			"version": "0.16.1",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz",
-			"integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
-			"dev": true,
-			"dependencies": {
-				"tslib": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@storybook/codemod/node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -12635,35 +12143,6 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/@storybook/codemod/node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/@storybook/codemod/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@storybook/codemod/node_modules/has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -12674,20 +12153,21 @@
 			}
 		},
 		"node_modules/@storybook/codemod/node_modules/jscodeshift": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
-			"integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.15.2.tgz",
+			"integrity": "sha512-FquR7Okgmc4Sd0aEDwqho3rEiKR3BdvuG9jfdHjLJ6JQoWSMpavug3AoIfnfWhxFlf+5pzQh8qjqz0DWFrNQzA==",
 			"dev": true,
 			"dependencies": {
-				"@babel/core": "^7.13.16",
-				"@babel/parser": "^7.13.16",
-				"@babel/plugin-proposal-class-properties": "^7.13.0",
-				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-				"@babel/plugin-proposal-optional-chaining": "^7.13.12",
-				"@babel/plugin-transform-modules-commonjs": "^7.13.8",
-				"@babel/preset-flow": "^7.13.13",
-				"@babel/preset-typescript": "^7.13.0",
-				"@babel/register": "^7.13.16",
+				"@babel/core": "^7.23.0",
+				"@babel/parser": "^7.23.0",
+				"@babel/plugin-transform-class-properties": "^7.22.5",
+				"@babel/plugin-transform-modules-commonjs": "^7.23.0",
+				"@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
+				"@babel/plugin-transform-optional-chaining": "^7.23.0",
+				"@babel/plugin-transform-private-methods": "^7.22.5",
+				"@babel/preset-flow": "^7.22.15",
+				"@babel/preset-typescript": "^7.23.0",
+				"@babel/register": "^7.22.15",
 				"babel-core": "^7.0.0-bridge.0",
 				"chalk": "^4.1.2",
 				"flow-parser": "0.*",
@@ -12695,7 +12175,7 @@
 				"micromatch": "^4.0.4",
 				"neo-async": "^2.5.0",
 				"node-dir": "^0.1.17",
-				"recast": "^0.21.0",
+				"recast": "^0.23.3",
 				"temp": "^0.8.4",
 				"write-file-atomic": "^2.3.0"
 			},
@@ -12704,33 +12184,11 @@
 			},
 			"peerDependencies": {
 				"@babel/preset-env": "^7.1.6"
-			}
-		},
-		"node_modules/@storybook/codemod/node_modules/jscodeshift/node_modules/ast-types": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz",
-			"integrity": "sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==",
-			"dev": true,
-			"dependencies": {
-				"tslib": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@storybook/codemod/node_modules/jscodeshift/node_modules/recast": {
-			"version": "0.21.5",
-			"resolved": "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz",
-			"integrity": "sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==",
-			"dev": true,
-			"dependencies": {
-				"ast-types": "0.15.2",
-				"esprima": "~4.0.0",
-				"source-map": "~0.6.1",
-				"tslib": "^2.0.1"
 			},
-			"engines": {
-				"node": ">= 4"
+			"peerDependenciesMeta": {
+				"@babel/preset-env": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@storybook/codemod/node_modules/path-key": {
@@ -12758,42 +12216,22 @@
 			}
 		},
 		"node_modules/@storybook/codemod/node_modules/recast": {
-			"version": "0.23.3",
-			"resolved": "https://registry.npmjs.org/recast/-/recast-0.23.3.tgz",
-			"integrity": "sha512-HbCVFh2ANP6a09nzD4lx7XthsxMOJWKX5pIcUwtLrmeEIl3I0DwjCoVXDE0Aobk+7k/mS3H50FK4iuYArpcT6Q==",
+			"version": "0.23.9",
+			"resolved": "https://registry.npmjs.org/recast/-/recast-0.23.9.tgz",
+			"integrity": "sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"assert": "^2.0.0",
 				"ast-types": "^0.16.1",
 				"esprima": "~4.0.0",
 				"source-map": "~0.6.1",
+				"tiny-invariant": "^1.3.3",
 				"tslib": "^2.0.1"
 			},
 			"engines": {
 				"node": ">= 4"
 			}
 		},
-		"node_modules/@storybook/codemod/node_modules/rimraf": {
-			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-			"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-			"dev": true,
-			"dependencies": {
-				"glob": "^7.1.3"
-			},
-			"bin": {
-				"rimraf": "bin.js"
-			}
-		},
-		"node_modules/@storybook/codemod/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
 		"node_modules/@storybook/codemod/node_modules/shebang-command": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -12827,31 +12265,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@storybook/codemod/node_modules/temp": {
-			"version": "0.8.4",
-			"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
-			"integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
-			"dev": true,
-			"dependencies": {
-				"rimraf": "~2.6.2"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@storybook/codemod/node_modules/util": {
-			"version": "0.12.5",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"is-arguments": "^1.0.4",
-				"is-generator-function": "^1.0.7",
-				"is-typed-array": "^1.1.3",
-				"which-typed-array": "^1.1.2"
-			}
-		},
 		"node_modules/@storybook/codemod/node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -12868,18 +12281,18 @@
 			}
 		},
 		"node_modules/@storybook/components": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/components/-/components-7.2.2.tgz",
-			"integrity": "sha512-A2SavROGKFK76w4pfMGr0Zf3A2QaQrnJqPZOfVB6dKrXBwgwM3VhdUj6N8cI9X4W7VaEvEyUWXVTCv+bG+yZtQ==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/components/-/components-7.6.15.tgz",
+			"integrity": "sha512-xD+maP7+C9HeZXi2vJ+uK9hXN4S4spP4uDj9pyZ9yViKb+ztEO6WpovUMT8WRQ0mMegWyLXkx3zqu43hZvXM1g==",
 			"dev": true,
 			"dependencies": {
 				"@radix-ui/react-select": "^1.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/csf": "^0.1.0",
+				"@radix-ui/react-toolbar": "^1.0.4",
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/csf": "^0.1.2",
 				"@storybook/global": "^5.0.0",
-				"@storybook/icons": "^1.1.0",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
+				"@storybook/theming": "7.6.15",
+				"@storybook/types": "7.6.15",
 				"memoizerific": "^1.11.3",
 				"use-resize-observer": "^9.1.0",
 				"util-deprecate": "^1.0.2"
@@ -12893,21 +12306,36 @@
 				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
+		"node_modules/@storybook/core-client": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/core-client/-/core-client-7.6.15.tgz",
+			"integrity": "sha512-jwWol+zo+ItKBzPm9i80bEL6seHMsV0wKSaViVMQ4TqHtEbNeFE8sFEc2NTr18VNBnQOdlQPnEWmdboXBUrGcA==",
+			"dev": true,
+			"dependencies": {
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/preview-api": "7.6.15"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
+			}
+		},
 		"node_modules/@storybook/core-common": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-7.2.2.tgz",
-			"integrity": "sha512-evLV0oRLhByHVhrncRXdSmQL5VP8jLXUOBPiM63oCnSWDsw4GMt37JrmCYBNM4E1YiJ7zSllmvcFCBmyChcPFA==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-7.6.15.tgz",
+			"integrity": "sha512-VGmcLJ5U1r1s8/YnLbKcyB4GnNL+/sZIPqwlcSKzDXO76HoVFv1kywf7PbASote7P3gdhLSxBdg95LH2bdIbmw==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/types": "7.2.2",
+				"@storybook/core-events": "7.6.15",
+				"@storybook/node-logger": "7.6.15",
+				"@storybook/types": "7.6.15",
 				"@types/find-cache-dir": "^3.2.1",
-				"@types/node": "^16.0.0",
+				"@types/node": "^18.0.0",
 				"@types/node-fetch": "^2.6.4",
 				"@types/pretty-hrtime": "^1.0.0",
 				"chalk": "^4.1.0",
 				"esbuild": "^0.18.0",
-				"esbuild-register": "^3.4.0",
+				"esbuild-register": "^3.5.0",
 				"file-system-cache": "2.3.0",
 				"find-cache-dir": "^3.0.0",
 				"find-up": "^5.0.0",
@@ -12936,20 +12364,6 @@
 				"balanced-match": "^1.0.0"
 			}
 		},
-		"node_modules/@storybook/core-common/node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
 		"node_modules/@storybook/core-common/node_modules/find-cache-dir": {
 			"version": "3.3.2",
 			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
@@ -13047,26 +12461,10 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@storybook/core-common/node_modules/foreground-child": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-			"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-			"dev": true,
-			"dependencies": {
-				"cross-spawn": "^7.0.0",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@storybook/core-common/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -13078,25 +12476,40 @@
 			}
 		},
 		"node_modules/@storybook/core-common/node_modules/glob": {
-			"version": "10.3.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-			"integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"foreground-child": "^3.1.0",
-				"jackspeak": "^2.0.3",
-				"minimatch": "^9.0.1",
-				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-				"path-scurry": "^1.10.1"
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
 			},
 			"bin": {
-				"glob": "dist/cjs/src/bin.js"
+				"glob": "dist/esm/bin.mjs"
 			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@storybook/core-common/node_modules/jackspeak": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+			"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"@isaacs/cliui": "^8.0.2"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
+			},
+			"optionalDependencies": {
+				"@pkgjs/parseargs": "^0.11.0"
 			}
 		},
 		"node_modules/@storybook/core-common/node_modules/jsonfile": {
@@ -13142,10 +12555,11 @@
 			}
 		},
 		"node_modules/@storybook/core-common/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -13157,10 +12571,11 @@
 			}
 		},
 		"node_modules/@storybook/core-common/node_modules/minipass": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.2.tgz",
-			"integrity": "sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": ">=16 || 14 >=14.17"
 			}
@@ -13198,15 +12613,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@storybook/core-common/node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/@storybook/core-common/node_modules/pkg-dir": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
@@ -13237,96 +12643,51 @@
 				"semver": "bin/semver.js"
 			}
 		},
-		"node_modules/@storybook/core-common/node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@storybook/core-common/node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@storybook/core-common/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@storybook/core-common/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
 			}
 		},
-		"node_modules/@storybook/core-common/node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+		"node_modules/@storybook/core-events": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.6.15.tgz",
+			"integrity": "sha512-i4YnjGecbpGyrFe0340sPhQ9QjZZEBqvMy6kF4XWt6DYLHxZmsTj1HEdvxVl4Ej7V49Vw0Dm8MepJ1d4Y8MKrQ==",
 			"dev": true,
 			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
+				"ts-dedent": "^2.0.0"
 			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@storybook/core-events": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.2.2.tgz",
-			"integrity": "sha512-0MUsOygFSyYRIWHrVAA7Y7zBoehdILgK2AbnV42qescmPD48YyovkSRiGq0BwSWvuvMRq+094dp7sh2tkfSGHg==",
-			"dev": true,
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/storybook"
 			}
 		},
 		"node_modules/@storybook/core-server": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-7.2.2.tgz",
-			"integrity": "sha512-djtZIe/dFvjppuUMuTSHq51NW4dgkKAercfHwyyzcvN3m+ZBZdUENCUzBfwsS0+Pn64lVgppg6otm8ckMFilMQ==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-7.6.15.tgz",
+			"integrity": "sha512-iIlxEAkrmKTSA3iGNqt/4QG7hf5suxBGYIB3DZAOfBo8EdZogMYaEmuCm5dbuaJr0mcVwlqwdhQiWb1VsR/NhA==",
 			"dev": true,
 			"dependencies": {
 				"@aw-web-design/x-default-browser": "1.4.126",
 				"@discoveryjs/json-ext": "^0.5.3",
-				"@storybook/builder-manager": "7.2.2",
-				"@storybook/channels": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/csf-tools": "7.2.2",
+				"@storybook/builder-manager": "7.6.15",
+				"@storybook/channels": "7.6.15",
+				"@storybook/core-common": "7.6.15",
+				"@storybook/core-events": "7.6.15",
+				"@storybook/csf": "^0.1.2",
+				"@storybook/csf-tools": "7.6.15",
 				"@storybook/docs-mdx": "^0.1.0",
 				"@storybook/global": "^5.0.0",
-				"@storybook/manager": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/telemetry": "7.2.2",
-				"@storybook/types": "7.2.2",
+				"@storybook/manager": "7.6.15",
+				"@storybook/node-logger": "7.6.15",
+				"@storybook/preview-api": "7.6.15",
+				"@storybook/telemetry": "7.6.15",
+				"@storybook/types": "7.6.15",
 				"@types/detect-port": "^1.3.0",
-				"@types/node": "^16.0.0",
+				"@types/node": "^18.0.0",
 				"@types/pretty-hrtime": "^1.0.0",
 				"@types/semver": "^7.3.4",
 				"better-opn": "^3.0.2",
@@ -13344,8 +12705,7 @@
 				"prompts": "^2.4.0",
 				"read-pkg-up": "^7.0.1",
 				"semver": "^7.3.7",
-				"serve-favicon": "^2.5.0",
-				"telejson": "^7.0.3",
+				"telejson": "^7.2.0",
 				"tiny-invariant": "^1.3.1",
 				"ts-dedent": "^2.0.0",
 				"util": "^0.12.4",
@@ -13358,28 +12718,10 @@
 				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/core-server/node_modules/@storybook/channels": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-			"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-			"dev": true,
-			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"qs": "^6.10.0",
-				"telejson": "^7.0.3",
-				"tiny-invariant": "^1.3.1"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			}
-		},
 		"node_modules/@storybook/core-server/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -13391,9 +12733,9 @@
 			}
 		},
 		"node_modules/@storybook/core-server/node_modules/ip": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-			"integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
+			"integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==",
 			"dev": true
 		},
 		"node_modules/@storybook/core-server/node_modules/is-wsl": {
@@ -13437,19 +12779,10 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@storybook/core-server/node_modules/telejson": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-			"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-			"dev": true,
-			"dependencies": {
-				"memoizerific": "^1.11.3"
-			}
-		},
 		"node_modules/@storybook/core-server/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
@@ -13469,10 +12802,11 @@
 			}
 		},
 		"node_modules/@storybook/core-server/node_modules/watchpack": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.1.2"
@@ -13482,10 +12816,11 @@
 			}
 		},
 		"node_modules/@storybook/core-server/node_modules/ws": {
-			"version": "8.13.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-			"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			},
@@ -13503,15 +12838,15 @@
 			}
 		},
 		"node_modules/@storybook/core-webpack": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-7.2.2.tgz",
-			"integrity": "sha512-KwdY+mFTWclIJM+qF25u0d4gQ/951uOZkgrsiRheKI5BKwD9omuF2OfLexWKnMEWz+UHzHKoN0QFlxcKs/rddw==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-7.6.15.tgz",
+			"integrity": "sha512-6Qk/kc7OKcy4jNowQFz6TFLWM2NYeLoJ73dIbFnN2o8DYS5WwmQLZhZ+MRvr92M+w1nlnc268kaqooYmAj8Mnw==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/core-common": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/node": "^16.0.0",
+				"@storybook/core-common": "7.6.15",
+				"@storybook/node-logger": "7.6.15",
+				"@storybook/types": "7.6.15",
+				"@types/node": "^18.0.0",
 				"ts-dedent": "^2.0.0"
 			},
 			"funding": {
@@ -13520,21 +12855,22 @@
 			}
 		},
 		"node_modules/@storybook/csf": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.1.tgz",
-			"integrity": "sha512-4hE3AlNVxR60Wc5KSC68ASYzUobjPqtSKyhV6G+ge0FIXU55N5nTY7dXGRZHQGDBPq+XqchMkIdlkHPRs8nTHg==",
+			"version": "0.1.11",
+			"resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.11.tgz",
+			"integrity": "sha512-dHYFQH3mA+EtnCkHXzicbLgsvzYjcDJ1JWsogbItZogkPHgSJM/Wr71uMkcvw8v9mmCyP4NpXJuu6bPoVsOnzg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"type-fest": "^2.19.0"
 			}
 		},
 		"node_modules/@storybook/csf-plugin": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-7.2.2.tgz",
-			"integrity": "sha512-8iHeK0zfcCIXbcwQm89Bj6Ejqak/dXBwQUMFmgmKzJ4VdyzKdhLgRO3T3EYGsX4AvH0dnuAPONP5uVrGEF8iLw==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-7.6.15.tgz",
+			"integrity": "sha512-5Pm2B8XKNdG3fHyItWKbWnXHSRDFSvetlML+sMWGWYIjwOsnvPqt+gAvLksWhv/uJgDujGxNcPEh+/Y5C8ZAjQ==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/csf-tools": "7.2.2",
+				"@storybook/csf-tools": "7.6.15",
 				"unplugin": "^1.3.1"
 			},
 			"funding": {
@@ -13543,17 +12879,17 @@
 			}
 		},
 		"node_modules/@storybook/csf-tools": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-7.2.2.tgz",
-			"integrity": "sha512-uO9AXtc64tpEpnoqHk5eYCUUL6nMwo1xHTXgIst9NKOdNSBL1/wvRgaT+rW+AzyXGsBjMwvDNjX/HIptqsoNgw==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-7.6.15.tgz",
+			"integrity": "sha512-8iKgg2cmbFTpVhRRJOqouhPcEh0c8ywabG4S8ICZvnJooSXUI9mD9p3tYCS7MYuSiHj0epa1Kkn9DtXJRo9o6g==",
 			"dev": true,
 			"dependencies": {
-				"@babel/generator": "^7.22.9",
-				"@babel/parser": "^7.22.7",
-				"@babel/traverse": "^7.22.8",
-				"@babel/types": "^7.22.5",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/types": "7.2.2",
+				"@babel/generator": "^7.23.0",
+				"@babel/parser": "^7.23.0",
+				"@babel/traverse": "^7.23.2",
+				"@babel/types": "^7.23.0",
+				"@storybook/csf": "^0.1.2",
+				"@storybook/types": "7.6.15",
 				"fs-extra": "^11.1.0",
 				"recast": "^0.23.1",
 				"ts-dedent": "^2.0.0"
@@ -13563,55 +12899,10 @@
 				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/csf-tools/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@storybook/csf-tools/node_modules/assert": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-			"integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
-			"dev": true,
-			"dependencies": {
-				"es6-object-assign": "^1.1.0",
-				"is-nan": "^1.2.1",
-				"object-is": "^1.0.1",
-				"util": "^0.12.0"
-			}
-		},
-		"node_modules/@storybook/csf-tools/node_modules/ast-types": {
-			"version": "0.16.1",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz",
-			"integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
-			"dev": true,
-			"dependencies": {
-				"tslib": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@storybook/csf-tools/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -13622,15 +12913,6 @@
 				"node": ">=14.14"
 			}
 		},
-		"node_modules/@storybook/csf-tools/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@storybook/csf-tools/node_modules/jsonfile": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -13644,15 +12926,16 @@
 			}
 		},
 		"node_modules/@storybook/csf-tools/node_modules/recast": {
-			"version": "0.23.3",
-			"resolved": "https://registry.npmjs.org/recast/-/recast-0.23.3.tgz",
-			"integrity": "sha512-HbCVFh2ANP6a09nzD4lx7XthsxMOJWKX5pIcUwtLrmeEIl3I0DwjCoVXDE0Aobk+7k/mS3H50FK4iuYArpcT6Q==",
+			"version": "0.23.9",
+			"resolved": "https://registry.npmjs.org/recast/-/recast-0.23.9.tgz",
+			"integrity": "sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"assert": "^2.0.0",
 				"ast-types": "^0.16.1",
 				"esprima": "~4.0.0",
 				"source-map": "~0.6.1",
+				"tiny-invariant": "^1.3.3",
 				"tslib": "^2.0.1"
 			},
 			"engines": {
@@ -13660,27 +12943,14 @@
 			}
 		},
 		"node_modules/@storybook/csf-tools/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
 			}
 		},
-		"node_modules/@storybook/csf-tools/node_modules/util": {
-			"version": "0.12.5",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"is-arguments": "^1.0.4",
-				"is-generator-function": "^1.0.7",
-				"is-typed-array": "^1.1.3",
-				"which-typed-array": "^1.1.2"
-			}
-		},
 		"node_modules/@storybook/csf/node_modules/type-fest": {
 			"version": "2.19.0",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
@@ -13700,15 +12970,16 @@
 			"dev": true
 		},
 		"node_modules/@storybook/docs-tools": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-7.2.2.tgz",
-			"integrity": "sha512-57PiramTgJio0J8HyKQI8cjb/5pTFvKxWBji8UdM6WUe1EqLIwZbymUcOQZDQWr3H+6bdrm4pgYxj7XglcUa5A==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-7.6.15.tgz",
+			"integrity": "sha512-npZEaI9Wpn9uJcRXFElqyiRw8bSxt95mLywPiEEGMT2kE5FfXM8d5Uj5O64kzoXdRI9IhRPEEZZidOtA/UInfQ==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/core-common": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/types": "7.2.2",
+				"@storybook/core-common": "7.6.15",
+				"@storybook/preview-api": "7.6.15",
+				"@storybook/types": "7.6.15",
 				"@types/doctrine": "^0.0.3",
+				"assert": "^2.1.0",
 				"doctrine": "^3.0.0",
 				"lodash": "^4.17.21"
 			},
@@ -13717,6 +12988,19 @@
 				"url": "https://opencollective.com/storybook"
 			}
 		},
+		"node_modules/@storybook/docs-tools/node_modules/assert": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
+			"integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"is-nan": "^1.3.2",
+				"object-is": "^1.1.5",
+				"object.assign": "^4.1.4",
+				"util": "^0.12.5"
+			}
+		},
 		"node_modules/@storybook/docs-tools/node_modules/doctrine": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -13729,29 +13013,29 @@
 				"node": ">=6.0.0"
 			}
 		},
+		"node_modules/@storybook/docs-tools/node_modules/util": {
+			"version": "0.12.5",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"is-arguments": "^1.0.4",
+				"is-generator-function": "^1.0.7",
+				"is-typed-array": "^1.1.3",
+				"which-typed-array": "^1.1.2"
+			}
+		},
 		"node_modules/@storybook/global": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/@storybook/global/-/global-5.0.0.tgz",
 			"integrity": "sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==",
 			"dev": true
 		},
-		"node_modules/@storybook/icons": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/@storybook/icons/-/icons-1.1.6.tgz",
-			"integrity": "sha512-co5gDCYPojRAc5lRMnWxbjrR1V37/rTmAo9Vok4a1hDpHZIwkGTWesdzvYivSQXYFxZTpxdM1b5K3W87brnahw==",
-			"dev": true,
-			"engines": {
-				"node": ">=14.0.0"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
 		"node_modules/@storybook/manager": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/manager/-/manager-7.2.2.tgz",
-			"integrity": "sha512-a7pGZMj5r5vk39IfB7Ca32DNkSTM6SEp+BZhqc4jMDHwSEsGKOZ+GZtWJipUlB1fEnHtdA3LH6IKTKbcpYP+Rg==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/manager/-/manager-7.6.15.tgz",
+			"integrity": "sha512-GGV2ElV5AOIApy/FSDzoSlLUbyd2VhQVD3TdNGRxNauYRjEO8ulXHw2tNbT6ludtpYpDTAILzI6zT/iag8hmPQ==",
 			"dev": true,
 			"funding": {
 				"type": "opencollective",
@@ -13759,80 +13043,29 @@
 			}
 		},
 		"node_modules/@storybook/manager-api": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-7.2.2.tgz",
-			"integrity": "sha512-7EI7TABGGB3VOTc4q7byC5dW/9A1xUJyR1gfCPU+7XiSNItnCz+seBJMSaf6Em/9wYxSAL6PQAGhrwTHGzgWAA==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-7.6.15.tgz",
+			"integrity": "sha512-cPBsXcnJiaO3QyaEum2JgdihYea3cI03FeV35JdrBYLIelT4oqbYFnzjznsFg9+Ia9iAbz7aOBNyyRsWnC/UKw==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/csf": "^0.1.0",
+				"@storybook/channels": "7.6.15",
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/core-events": "7.6.15",
+				"@storybook/csf": "^0.1.2",
 				"@storybook/global": "^5.0.0",
-				"@storybook/router": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
+				"@storybook/router": "7.6.15",
+				"@storybook/theming": "7.6.15",
+				"@storybook/types": "7.6.15",
 				"dequal": "^2.0.2",
 				"lodash": "^4.17.21",
 				"memoizerific": "^1.11.3",
-				"semver": "^7.3.7",
 				"store2": "^2.14.2",
-				"telejson": "^7.0.3",
+				"telejson": "^7.2.0",
 				"ts-dedent": "^2.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/storybook"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
-		"node_modules/@storybook/manager-api/node_modules/@storybook/channels": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-			"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-			"dev": true,
-			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"qs": "^6.10.0",
-				"telejson": "^7.0.3",
-				"tiny-invariant": "^1.3.1"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			}
-		},
-		"node_modules/@storybook/manager-api/node_modules/@storybook/router": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/router/-/router-7.2.2.tgz",
-			"integrity": "sha512-cnJg43dm3dVifKkRBUsQ4wXC4sJOm46JAS95yRPeGACoHpJTcbCWk1n5GLYA7ozO+KFQSNdxHxPIjNqvnzMFiA==",
-			"dev": true,
-			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"memoizerific": "^1.11.3",
-				"qs": "^6.10.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
-		"node_modules/@storybook/manager-api/node_modules/telejson": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-			"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-			"dev": true,
-			"dependencies": {
-				"memoizerific": "^1.11.3"
 			}
 		},
 		"node_modules/@storybook/mdx2-csf": {
@@ -13842,9 +13075,9 @@
 			"dev": true
 		},
 		"node_modules/@storybook/node-logger": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-7.2.2.tgz",
-			"integrity": "sha512-Pn6NJ349S+6tkzaFc1j3qOniDR9DyFPRfZsnAT85APKQaXyzNB3b1xwAhxnVjiCHIfp/a+SLOAdfXa+F8ALFQQ==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-7.6.15.tgz",
+			"integrity": "sha512-C+sCvRjR+5uVU3VTrfyv7/RlPBxesAjIucUAK0keGyIZ7sFQYCPdkm4m/C4s+TcubgAzVvuoUHlRrSppdA7WzQ==",
 			"dev": true,
 			"funding": {
 				"type": "opencollective",
@@ -13852,9 +13085,9 @@
 			}
 		},
 		"node_modules/@storybook/postinstall": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/postinstall/-/postinstall-7.2.2.tgz",
-			"integrity": "sha512-tGFZAFu5QFnuzhmzGMpasETVpzD1CVskok4+Dns/3iBWb8fZsFWaC0ZKazO+vHBtWZYO4uvrUbFSDTX2yPhtTQ==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/postinstall/-/postinstall-7.6.15.tgz",
+			"integrity": "sha512-DXQQ4kjAbQ7BSd9M4lDI/12vEEciYMP8uYFDlrPFjwD9LezsxtRiORkazjNRRX4730faO5zZsnWhXxCVkxck0g==",
 			"dev": true,
 			"funding": {
 				"type": "opencollective",
@@ -13862,25 +13095,26 @@
 			}
 		},
 		"node_modules/@storybook/preset-react-webpack": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-7.2.2.tgz",
-			"integrity": "sha512-com92dj2rAvGG5xrx35kXZDawQr0GwfNJD8xoyZwzd+XjaguBU/DJNdjYwmJLscHx0wg+Vt5oK+hS1ICq82Ujg==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-7.6.15.tgz",
+			"integrity": "sha512-Oo3J7RKO/tFUVnRXs16tZGcX6n90gTpHdlT2Z1fZ+y8wEd9o+VvvKFEIIeMcRxf3hHa49R6Kbc4AQaE9FAuDlw==",
 			"dev": true,
 			"dependencies": {
-				"@babel/preset-flow": "^7.22.5",
-				"@babel/preset-react": "^7.22.5",
-				"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
-				"@storybook/core-webpack": "7.2.2",
-				"@storybook/docs-tools": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/react": "7.2.2",
+				"@babel/preset-flow": "^7.22.15",
+				"@babel/preset-react": "^7.22.15",
+				"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+				"@storybook/core-webpack": "7.6.15",
+				"@storybook/docs-tools": "7.6.15",
+				"@storybook/node-logger": "7.6.15",
+				"@storybook/react": "7.6.15",
 				"@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0",
-				"@types/node": "^16.0.0",
+				"@types/node": "^18.0.0",
 				"@types/semver": "^7.3.4",
 				"babel-plugin-add-react-displayname": "^0.0.5",
-				"babel-plugin-react-docgen": "^4.2.1",
 				"fs-extra": "^11.1.0",
-				"react-refresh": "^0.11.0",
+				"magic-string": "^0.30.5",
+				"react-docgen": "^7.0.0",
+				"react-refresh": "^0.14.0",
 				"semver": "^7.3.7",
 				"webpack": "5"
 			},
@@ -13906,9 +13140,9 @@
 			}
 		},
 		"node_modules/@storybook/preset-react-webpack/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -13931,28 +13165,19 @@
 				"graceful-fs": "^4.1.6"
 			}
 		},
-		"node_modules/@storybook/preset-react-webpack/node_modules/react-refresh": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
-			"integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/@storybook/preset-react-webpack/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
 			}
 		},
 		"node_modules/@storybook/preview": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-7.2.2.tgz",
-			"integrity": "sha512-F3S3yK+RmpriADWnfVZsRN36WRT6LaFjD0sNrUkX8duxdnxNDaLFfJ3Cbxwyv/2lZ48uByIQbX2LC5HieVI0KA==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-7.6.15.tgz",
+			"integrity": "sha512-q8d9v0+Bo/DHLV68OyV3Klep4knf2GAbrlHhLW1X4jlPccuEDUojIfqfK7m48ayeIxJzO48fcO0JdKM1XABx7g==",
 			"dev": true,
 			"funding": {
 				"type": "opencollective",
@@ -13960,17 +13185,17 @@
 			}
 		},
 		"node_modules/@storybook/preview-api": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-7.2.2.tgz",
-			"integrity": "sha512-II0EioQCGS2zTSoHbXNKyI1rwk2X7MBi2/tJerj4w4Qwi2fDQlwM0LKsIWlRjXTxBpOAsOoTelh24wSBoZu4bg==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-7.6.15.tgz",
+			"integrity": "sha512-2KN9vlizF6sFlYsJEGnFqcQaJXs4TTdawC1VazVdtaMSHANDxxDu8F1cP+u7lpPH3DkNZUmTGQDBYfYY9xR0eQ==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/csf": "^0.1.0",
+				"@storybook/channels": "7.6.15",
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/core-events": "7.6.15",
+				"@storybook/csf": "^0.1.2",
 				"@storybook/global": "^5.0.0",
-				"@storybook/types": "7.2.2",
+				"@storybook/types": "7.6.15",
 				"@types/qs": "^6.9.5",
 				"dequal": "^2.0.2",
 				"lodash": "^4.17.21",
@@ -13985,53 +13210,26 @@
 				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/preview-api/node_modules/@storybook/channels": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-			"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-			"dev": true,
-			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"qs": "^6.10.0",
-				"telejson": "^7.0.3",
-				"tiny-invariant": "^1.3.1"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			}
-		},
-		"node_modules/@storybook/preview-api/node_modules/telejson": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-			"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-			"dev": true,
-			"dependencies": {
-				"memoizerific": "^1.11.3"
-			}
-		},
 		"node_modules/@storybook/react": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/react/-/react-7.2.2.tgz",
-			"integrity": "sha512-41vOR9mCPGeO4YBVfej+X+Fge+igelqSFCJF/koZDdYxOVehsz3bK++TNrKo2utF69evhwSmIU1iEMEjesmbNg==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/react/-/react-7.6.15.tgz",
+			"integrity": "sha512-oJMSh4iTGu6OqCmj0LhkuPyMkxGMTCoohN4HcDpXd96jCSyWotVebRsg9xm5ddB7f54e6DY4XDoGH0WnVoR23g==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-client": "7.2.2",
-				"@storybook/docs-tools": "7.2.2",
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/core-client": "7.6.15",
+				"@storybook/docs-tools": "7.6.15",
 				"@storybook/global": "^5.0.0",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/react-dom-shim": "7.2.2",
-				"@storybook/types": "7.2.2",
+				"@storybook/preview-api": "7.6.15",
+				"@storybook/react-dom-shim": "7.6.15",
+				"@storybook/types": "7.6.15",
 				"@types/escodegen": "^0.0.6",
 				"@types/estree": "^0.0.51",
-				"@types/node": "^16.0.0",
+				"@types/node": "^18.0.0",
 				"acorn": "^7.4.1",
 				"acorn-jsx": "^5.3.1",
 				"acorn-walk": "^7.2.0",
-				"escodegen": "^2.0.0",
+				"escodegen": "^2.1.0",
 				"html-tags": "^3.1.0",
 				"lodash": "^4.17.21",
 				"prop-types": "^15.7.2",
@@ -14201,9 +13399,9 @@
 			}
 		},
 		"node_modules/@storybook/react-dom-shim": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-7.2.2.tgz",
-			"integrity": "sha512-H/yHlWl94vbUv1NNolcB3vCy1S185XKicswljJRC9o/AFCJK+a7d9wDVGTPKF6oy7ujrgpANLQyq02d+OuoO7w==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-7.6.15.tgz",
+			"integrity": "sha512-2+X0HIxIyvjfSKVyGGjSJJLEFJ2ox7Rr8FjlMiRo5QfoOJhohZuWH7p4Lw7JMwm5PotnjrwlfsZI3cCilYJeYA==",
 			"dev": true,
 			"funding": {
 				"type": "opencollective",
@@ -14215,15 +13413,15 @@
 			}
 		},
 		"node_modules/@storybook/react-webpack5": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-7.2.2.tgz",
-			"integrity": "sha512-VBFOO4LUuX/DVqaVBHpSTNT1NcIUlt1RpHX371NM0IcPSAj4EjHu3fLK4GjPMNJSqjnT7i6cthwPPe4hATTldg==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-7.6.15.tgz",
+			"integrity": "sha512-TyYYSDho+4cQRBCVMKu7XDTCrAsLWaeldCoZm910e4DTXZUV3NDG8hVJIXzweaCu1o7JtDOelxsA6iizR/22GQ==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/builder-webpack5": "7.2.2",
-				"@storybook/preset-react-webpack": "7.2.2",
-				"@storybook/react": "7.2.2",
-				"@types/node": "^16.0.0"
+				"@storybook/builder-webpack5": "7.6.15",
+				"@storybook/preset-react-webpack": "7.6.15",
+				"@storybook/react": "7.6.15",
+				"@types/node": "^18.0.0"
 			},
 			"engines": {
 				"node": ">=16.0.0"
@@ -14247,20 +13445,6 @@
 				}
 			}
 		},
-		"node_modules/@storybook/react/node_modules/@storybook/core-client": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/core-client/-/core-client-7.2.2.tgz",
-			"integrity": "sha512-RbtXvSiT7kunM6oz5svbp/IeastWz+40qZpdidkRLZ9QUpttU5NSKNUu+MPlfaMHT3A38VfZakk5cRAEztbu2w==",
-			"dev": true,
-			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/preview-api": "7.2.2"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
-			}
-		},
 		"node_modules/@storybook/react/node_modules/@types/estree": {
 			"version": "0.0.51",
 			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
@@ -14291,14 +13475,29 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/@storybook/router": {
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/router/-/router-7.6.15.tgz",
+			"integrity": "sha512-5yhXXoVZ1iKUgeZoO8PGqBclrLgoJisxIYVK/Y1iJMXZ2ZvwUiTswLALT6lu97tSrcoBVxmqSghg0+U0YEU4Fg==",
+			"dev": true,
+			"dependencies": {
+				"@storybook/client-logger": "7.6.15",
+				"memoizerific": "^1.11.3",
+				"qs": "^6.10.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/storybook"
+			}
+		},
 		"node_modules/@storybook/source-loader": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/source-loader/-/source-loader-7.2.2.tgz",
-			"integrity": "sha512-kzUhihfnOWKekEw9eX7BNhjuVj4gvcU3F2Fe/GrtyCOilB8fgTOla47SEbqJ2WIPamp91ZI1VoSjSNy5BhG9Ow==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/source-loader/-/source-loader-7.6.15.tgz",
+			"integrity": "sha512-E7LqjfvEUs2dn8ZWc1OfqzXU3vyi2/yP7rPHPRFjDUIpz1QI4IUCUIFY+n3YWkbk8wlmf6dV/2QYzYZPp6RD0g==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/csf": "^0.1.0",
-				"@storybook/types": "7.2.2",
+				"@storybook/csf": "^0.1.2",
+				"@storybook/types": "7.6.15",
 				"estraverse": "^5.2.0",
 				"lodash": "^4.17.21",
 				"prettier": "^2.8.0"
@@ -14306,10 +13505,6 @@
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/storybook"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
 		"node_modules/@storybook/source-loader/node_modules/estraverse": {
@@ -14337,14 +13532,14 @@
 			}
 		},
 		"node_modules/@storybook/telemetry": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/telemetry/-/telemetry-7.2.2.tgz",
-			"integrity": "sha512-pJ8oQ++QD7hLezARp+3PR0JAw3FH6cmOrSs4KAB+IhNgACs8gehaEdy7TAikor5tlAUCWvqPetnNXDrrDIZhTQ==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/telemetry/-/telemetry-7.6.15.tgz",
+			"integrity": "sha512-klhKXLUS3OXozGEtMbbhKZLDfm+m3nNk2jvGwD6kkBenzFUzb0P2m8awxU7h1pBcKZKH/27U9t3KVzNFzWoWPw==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/csf-tools": "7.2.2",
+				"@storybook/client-logger": "7.6.15",
+				"@storybook/core-common": "7.6.15",
+				"@storybook/csf-tools": "7.6.15",
 				"chalk": "^4.1.0",
 				"detect-package-manager": "^2.0.1",
 				"fetch-retry": "^5.0.2",
@@ -14357,9 +13552,9 @@
 			}
 		},
 		"node_modules/@storybook/telemetry/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -14383,22 +13578,22 @@
 			}
 		},
 		"node_modules/@storybook/telemetry/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
 			}
 		},
 		"node_modules/@storybook/theming": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-7.2.2.tgz",
-			"integrity": "sha512-B4nxcxl4IyVvB1NXwRi4yopAS73zl052f2zJi3kVghJbZ3tgPwgvi3CVpOs2D4pgmxOrKCgiLnzLrGTH+13+0A==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-7.6.15.tgz",
+			"integrity": "sha512-9PpsHAbUf6o0w33/P3mnb7QheTmfGlTYCismj5HMM1O2/zY0kQK9XcG9W+Cyvu56D/lFC19fz9YHQY8W4AbfnQ==",
 			"dev": true,
 			"dependencies": {
 				"@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
-				"@storybook/client-logger": "7.2.2",
+				"@storybook/client-logger": "7.6.15",
 				"@storybook/global": "^5.0.0",
 				"memoizerific": "^1.11.3"
 			},
@@ -14412,12 +13607,12 @@
 			}
 		},
 		"node_modules/@storybook/types": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/types/-/types-7.2.2.tgz",
-			"integrity": "sha512-yrL0+KD+dsusQvDmNKQGv36WjvdhoiUxMDEBgsZkP047kRc3b8/zEbD3Tu7iMDsWnpgwip1Frgy29Ro3UtK57Q==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/@storybook/types/-/types-7.6.15.tgz",
+			"integrity": "sha512-tLH0lK6SXECSfMpKin9bge+7XiHZII17n6jc9ZI1TfSBZJyq3M6VzWh2r1C2lC97FlkcKXjIwM3n8h1xNjnI+A==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/channels": "7.2.2",
+				"@storybook/channels": "7.6.15",
 				"@types/babel__core": "^7.0.0",
 				"@types/express": "^4.7.0",
 				"file-system-cache": "2.3.0"
@@ -14427,38 +13622,36 @@
 				"url": "https://opencollective.com/storybook"
 			}
 		},
-		"node_modules/@storybook/types/node_modules/@storybook/channels": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-			"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-			"dev": true,
+		"node_modules/@stylistic/stylelint-plugin": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-3.0.1.tgz",
+			"integrity": "sha512-j3mH8HSw2Rob/KJFWZ627w3CQ8gQqVHtzCdPeEffUg5vOgpz4rgrR+Xw2kU0OQCDcdW8Y1nKfdXKKjM5Rn8X0g==",
 			"dependencies": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"qs": "^6.10.0",
-				"telejson": "^7.0.3",
-				"tiny-invariant": "^1.3.1"
+				"@csstools/css-parser-algorithms": "^3.0.0",
+				"@csstools/css-tokenizer": "^3.0.0",
+				"@csstools/media-query-list-parser": "^3.0.0",
+				"is-plain-object": "^5.0.0",
+				"postcss-selector-parser": "^6.1.2",
+				"postcss-value-parser": "^4.2.0",
+				"style-search": "^0.1.0",
+				"stylelint": "^16.8.2"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/storybook"
+			"engines": {
+				"node": "^18.12 || >=20.9"
+			},
+			"peerDependencies": {
+				"stylelint": "^16.8.0"
 			}
 		},
-		"node_modules/@storybook/types/node_modules/telejson": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-			"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-			"dev": true,
-			"dependencies": {
-				"memoizerific": "^1.11.3"
-			}
+		"node_modules/@stylistic/stylelint-plugin/node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/@svgr/babel-plugin-add-jsx-attribute": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz",
 			"integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==",
-			"dev": true,
 			"engines": {
 				"node": ">=14"
 			},
@@ -14474,7 +13667,6 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz",
 			"integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==",
-			"dev": true,
 			"engines": {
 				"node": ">=14"
 			},
@@ -14490,7 +13682,6 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz",
 			"integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==",
-			"dev": true,
 			"engines": {
 				"node": ">=14"
 			},
@@ -14506,7 +13697,6 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz",
 			"integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=14"
 			},
@@ -14522,7 +13712,6 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz",
 			"integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==",
-			"dev": true,
 			"engines": {
 				"node": ">=14"
 			},
@@ -14538,7 +13727,6 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz",
 			"integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==",
-			"dev": true,
 			"engines": {
 				"node": ">=14"
 			},
@@ -14554,7 +13742,6 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.0.0.tgz",
 			"integrity": "sha512-UKrY3860AQICgH7g+6h2zkoxeVEPLYwX/uAjmqo4PIq2FIHppwhIqZstIyTz0ZtlwreKR41O3W3BzsBBiJV2Aw==",
-			"dev": true,
 			"engines": {
 				"node": ">=14"
 			},
@@ -14570,7 +13757,6 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz",
 			"integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -14586,7 +13772,6 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.0.0.tgz",
 			"integrity": "sha512-KLcjiZychInVrhs86OvcYPLTFu9L5XV2vj0XAaE1HwE3J3jLmIzRY8ttdeAg/iFyp8nhavJpafpDZTt+1LIpkQ==",
-			"dev": true,
 			"dependencies": {
 				"@svgr/babel-plugin-add-jsx-attribute": "8.0.0",
 				"@svgr/babel-plugin-remove-jsx-attribute": "8.0.0",
@@ -14612,7 +13797,6 @@
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.0.0.tgz",
 			"integrity": "sha512-aJKtc+Pie/rFYsVH/unSkDaZGvEeylNv/s2cP+ta9/rYWxRVvoV/S4Qw65Kmrtah4CBK5PM6ISH9qUH7IJQCng==",
-			"dev": true,
 			"dependencies": {
 				"@babel/core": "^7.21.3",
 				"@svgr/babel-preset": "8.0.0",
@@ -14628,68 +13812,15 @@
 				"url": "https://github.com/sponsors/gregberge"
 			}
 		},
-		"node_modules/@svgr/core/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dev": true,
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@svgr/core/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
 		"node_modules/@svgr/core/node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
 		},
 		"node_modules/@svgr/core/node_modules/camelcase": {
 			"version": "6.3.0",
 			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
 			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -14698,14 +13829,13 @@
 			}
 		},
 		"node_modules/@svgr/core/node_modules/cosmiconfig": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-			"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-			"dev": true,
+			"version": "8.3.6",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+			"integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
 			"dependencies": {
-				"import-fresh": "^3.2.1",
+				"import-fresh": "^3.3.0",
 				"js-yaml": "^4.1.0",
-				"parse-json": "^5.0.0",
+				"parse-json": "^5.2.0",
 				"path-type": "^4.0.0"
 			},
 			"engines": {
@@ -14713,22 +13843,20 @@
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/d-fischer"
-			}
-		},
-		"node_modules/@svgr/core/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.9.5"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@svgr/core/node_modules/js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
 			"dependencies": {
 				"argparse": "^2.0.1"
 			},
@@ -14740,25 +13868,14 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
 			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
 		},
-		"node_modules/@svgr/core/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
 		"node_modules/@svgr/hast-util-to-babel-ast": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz",
 			"integrity": "sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==",
-			"dev": true,
 			"dependencies": {
 				"@babel/types": "^7.21.3",
 				"entities": "^4.4.0"
@@ -14775,7 +13892,6 @@
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
 			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.12"
 			},
@@ -14787,7 +13903,6 @@
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.0.1.tgz",
 			"integrity": "sha512-bfCFb+4ZsM3UuKP2t7KmDwn6YV8qVn9HIQJmau6xeQb/iV65Rpi7NBNBWA2hcCd4GKoCqG8hpaaDk5FDR0eH+g==",
-			"dev": true,
 			"dependencies": {
 				"@babel/core": "^7.21.3",
 				"@svgr/babel-preset": "8.0.0",
@@ -14805,80 +13920,10 @@
 				"@svgr/core": "*"
 			}
 		},
-		"node_modules/@svgr/plugin-jsx/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dev": true,
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@svgr/plugin-jsx/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@svgr/plugin-jsx/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@svgr/plugin-jsx/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
 		"node_modules/@svgr/plugin-svgo": {
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-8.0.1.tgz",
 			"integrity": "sha512-29OJ1QmJgnohQHDAgAuY2h21xWD6TZiXji+hnx+W635RiXTAlHTbjrZDktfqzkN0bOeQEtNe+xgq73/XeWFfSg==",
-			"dev": true,
 			"dependencies": {
 				"cosmiconfig": "^8.1.3",
 				"deepmerge": "^4.3.1",
@@ -14898,18 +13943,16 @@
 		"node_modules/@svgr/plugin-svgo/node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
 		},
 		"node_modules/@svgr/plugin-svgo/node_modules/cosmiconfig": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-			"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-			"dev": true,
+			"version": "8.3.6",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+			"integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
 			"dependencies": {
-				"import-fresh": "^3.2.1",
+				"import-fresh": "^3.3.0",
 				"js-yaml": "^4.1.0",
-				"parse-json": "^5.0.0",
+				"parse-json": "^5.2.0",
 				"path-type": "^4.0.0"
 			},
 			"engines": {
@@ -14917,13 +13960,20 @@
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/d-fischer"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.9.5"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@svgr/plugin-svgo/node_modules/js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
 			"dependencies": {
 				"argparse": "^2.0.1"
 			},
@@ -14935,7 +13985,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
 			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -14944,7 +13993,6 @@
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-8.0.1.tgz",
 			"integrity": "sha512-zSoeKcbCmfMXjA11uDuCJb+1LWNb3vy6Qw/VHj0Nfcl3UuqwuoZWknHsBIhCWvi4wU9vPui3aq054qjVyZqY4A==",
-			"dev": true,
 			"dependencies": {
 				"@babel/core": "^7.21.3",
 				"@babel/plugin-transform-react-constant-elements": "^7.21.3",
@@ -14963,81 +14011,16 @@
 				"url": "https://github.com/sponsors/gregberge"
 			}
 		},
-		"node_modules/@svgr/webpack/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dev": true,
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@svgr/webpack/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@svgr/webpack/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@svgr/webpack/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
 		"node_modules/@swc/core": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.76.tgz",
-			"integrity": "sha512-aYYTA2aVYkwJAZepQXtPnkUthhOfn8qd6rsh+lrJxonFrjmpI7RHt2tMDVTXP6XDX7fvnvrVtT1bwZfmBFPh0Q==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core/-/core-1.4.1.tgz",
+			"integrity": "sha512-3y+Y8js+e7BbM16iND+6Rcs3jdiL28q3iVtYsCviYSSpP2uUVKkp5sJnCY4pg8AaVvyN7CGQHO7gLEZQ5ByozQ==",
 			"dev": true,
 			"hasInstallScript": true,
+			"dependencies": {
+				"@swc/counter": "^0.1.2",
+				"@swc/types": "^0.1.5"
+			},
 			"engines": {
 				"node": ">=10"
 			},
@@ -15046,16 +14029,16 @@
 				"url": "https://opencollective.com/swc"
 			},
 			"optionalDependencies": {
-				"@swc/core-darwin-arm64": "1.3.76",
-				"@swc/core-darwin-x64": "1.3.76",
-				"@swc/core-linux-arm-gnueabihf": "1.3.76",
-				"@swc/core-linux-arm64-gnu": "1.3.76",
-				"@swc/core-linux-arm64-musl": "1.3.76",
-				"@swc/core-linux-x64-gnu": "1.3.76",
-				"@swc/core-linux-x64-musl": "1.3.76",
-				"@swc/core-win32-arm64-msvc": "1.3.76",
-				"@swc/core-win32-ia32-msvc": "1.3.76",
-				"@swc/core-win32-x64-msvc": "1.3.76"
+				"@swc/core-darwin-arm64": "1.4.1",
+				"@swc/core-darwin-x64": "1.4.1",
+				"@swc/core-linux-arm-gnueabihf": "1.4.1",
+				"@swc/core-linux-arm64-gnu": "1.4.1",
+				"@swc/core-linux-arm64-musl": "1.4.1",
+				"@swc/core-linux-x64-gnu": "1.4.1",
+				"@swc/core-linux-x64-musl": "1.4.1",
+				"@swc/core-win32-arm64-msvc": "1.4.1",
+				"@swc/core-win32-ia32-msvc": "1.4.1",
+				"@swc/core-win32-x64-msvc": "1.4.1"
 			},
 			"peerDependencies": {
 				"@swc/helpers": "^0.5.0"
@@ -15067,9 +14050,9 @@
 			}
 		},
 		"node_modules/@swc/core-darwin-arm64": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.76.tgz",
-			"integrity": "sha512-ovviEhZ/1E81Z9OGrO0ivLWk4VCa3I3ZzM+cd3gugglRRwVwtlIaoIYqY5S3KiCAupDd1+UCl5X7Vbio7a/V8g==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.1.tgz",
+			"integrity": "sha512-ePyfx0348UbR4DOAW24TedeJbafnzha8liXFGuQ4bdXtEVXhLfPngprrxKrAddCuv42F9aTxydlF6+adD3FBhA==",
 			"cpu": [
 				"arm64"
 			],
@@ -15083,9 +14066,9 @@
 			}
 		},
 		"node_modules/@swc/core-darwin-x64": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.76.tgz",
-			"integrity": "sha512-tcySTDqs0SHCebtW35sCdcLWsmTEo7bEwx0gNL/spetqVT9fpFi6qU8qcnt7i2KaZHbeNl9g1aadu+Yrni+GzA==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.4.1.tgz",
+			"integrity": "sha512-eLf4JSe6VkCMdDowjM8XNC5rO+BrgfbluEzAVtKR8L2HacNYukieumN7EzpYCi0uF1BYwu1ku6tLyG2r0VcGxA==",
 			"cpu": [
 				"x64"
 			],
@@ -15099,9 +14082,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-arm-gnueabihf": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.76.tgz",
-			"integrity": "sha512-apgzpGWy1AwoMF4urAAASsAjE7rEzZFIF+p6utuxhS7cNHzE0AyEVDYJbo+pzBdlZ8orBdzzsHtFwoEgKOjebA==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.1.tgz",
+			"integrity": "sha512-K8VtTLWMw+rkN/jDC9o/Q9SMmzdiHwYo2CfgkwVT29NsGccwmNhCQx6XoYiPKyKGIFKt4tdQnJHKUFzxUqQVtQ==",
 			"cpu": [
 				"arm"
 			],
@@ -15115,9 +14098,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-arm64-gnu": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.76.tgz",
-			"integrity": "sha512-c3c0zz6S0eludqidDpuqbadE0WT3OZczyQxe9Vw8lFFXES85mvNGtwYzyGK2o7TICpsuHrndwDIoYpmpWk879g==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.1.tgz",
+			"integrity": "sha512-0e8p4g0Bfkt8lkiWgcdiENH3RzkcqKtpRXIVNGOmVc0OBkvc2tpm2WTx/eoCnes2HpTT4CTtR3Zljj4knQ4Fvw==",
 			"cpu": [
 				"arm64"
 			],
@@ -15131,9 +14114,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-arm64-musl": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.76.tgz",
-			"integrity": "sha512-Is3bpq7F2qtlnkzEeOD6HIZJPpOmu3q6c82lKww90Q0NnrlSluVMozTHJgwVoFZyizH7uLnk0LuNcEAWLnmJIw==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.1.tgz",
+			"integrity": "sha512-b/vWGQo2n7lZVUnSQ7NBq3Qrj85GrAPPiRbpqaIGwOytiFSk8VULFihbEUwDe0rXgY4LDm8z8wkgADZcLnmdUA==",
 			"cpu": [
 				"arm64"
 			],
@@ -15147,9 +14130,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-x64-gnu": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.76.tgz",
-			"integrity": "sha512-iwCeRzd9oSvUzqt7nU6p/ztceAWfnO9XVxBn502R5gs6QCBbE1HCKrWHDO77aKPK7ss+0NcIGHvXTd9L8/wRzw==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.1.tgz",
+			"integrity": "sha512-AFMQlvkKEdNi1Vk2GFTxxJzbICttBsOQaXa98kFTeWTnFFIyiIj2w7Sk8XRTEJ/AjF8ia8JPKb1zddBWr9+bEQ==",
 			"cpu": [
 				"x64"
 			],
@@ -15163,9 +14146,9 @@
 			}
 		},
 		"node_modules/@swc/core-linux-x64-musl": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.76.tgz",
-			"integrity": "sha512-a671g4tW8kyFeuICsgq4uB9ukQfiIyXJT4V6YSnmqhCTz5mazWuDxZ5wKnx/1g5nXTl+U5cWH2TZaCJatp4GKA==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.1.tgz",
+			"integrity": "sha512-QX2MxIECX1gfvUVZY+jk528/oFkS9MAl76e3ZRvG2KC/aKlCQL0KSzcTSm13mOxkDKS30EaGRDRQWNukGpMeRg==",
 			"cpu": [
 				"x64"
 			],
@@ -15179,9 +14162,9 @@
 			}
 		},
 		"node_modules/@swc/core-win32-arm64-msvc": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.76.tgz",
-			"integrity": "sha512-+swEFtjdMezS0vKUhJC3psdSDtOJGY5pEOt4e8XOPvn7aQpKQ9LfF49XVtIwDSk5SGuWtVoLFzkSY3reWUJCyg==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.1.tgz",
+			"integrity": "sha512-OklkJYXXI/tntD2zaY8i3iZldpyDw5q+NAP3k9OlQ7wXXf37djRsHLV0NW4+ZNHBjE9xp2RsXJ0jlOJhfgGoFA==",
 			"cpu": [
 				"arm64"
 			],
@@ -15195,9 +14178,9 @@
 			}
 		},
 		"node_modules/@swc/core-win32-ia32-msvc": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.76.tgz",
-			"integrity": "sha512-5CqwAykpGBJ3PqGLOlWGLGIPpBAG1IwWVDUfro3hhjQ7XJxV5Z1aQf5V5OJ90HJVtrEAVx2xx59UV/Dh081LOg==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.1.tgz",
+			"integrity": "sha512-MBuc3/QfKX9FnLOU7iGN+6yHRTQaPQ9WskiC8s8JFiKQ+7I2p25tay2RplR9dIEEGgVAu6L7auv96LbNTh+FaA==",
 			"cpu": [
 				"ia32"
 			],
@@ -15211,9 +14194,9 @@
 			}
 		},
 		"node_modules/@swc/core-win32-x64-msvc": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.76.tgz",
-			"integrity": "sha512-CiMpWLLlR3Cew9067E7XxaLBwYYJ90r9EhGSO6V1pvYSWj7ET/Ppmtj1ZhzPJMqRXAP6xflfl5R5o4ee1m4WLA==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.1.tgz",
+			"integrity": "sha512-lu4h4wFBb/bOK6N2MuZwg7TrEpwYXgpQf5R7ObNSXL65BwZ9BG8XRzD+dLJmALu8l5N08rP/TrpoKRoGT4WSxw==",
 			"cpu": [
 				"x64"
 			],
@@ -15226,11 +14209,22 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/@swc/counter": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+			"integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+			"dev": true
+		},
+		"node_modules/@swc/types": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz",
+			"integrity": "sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==",
+			"dev": true
+		},
 		"node_modules/@szmarczak/http-timer": {
 			"version": "4.0.6",
 			"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
 			"integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-			"dev": true,
 			"dependencies": {
 				"defer-to-connect": "^2.0.0"
 			},
@@ -15265,37 +14259,6 @@
 			"resolved": "https://registry.npmjs.org/@tannin/postfix/-/postfix-1.1.0.tgz",
 			"integrity": "sha512-oocsqY7g0cR+Gur5jRQLSrX2OtpMLMse1I10JQBm8CdGMrDkh1Mg2gjsiquMHRtBs4Qwu5wgEp5GgIYHk4SNPw=="
 		},
-		"node_modules/@tanstack/react-table": {
-			"version": "8.10.3",
-			"resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.10.3.tgz",
-			"integrity": "sha512-Qya1cJ+91arAlW7IRDWksRDnYw28O446jJ/ljkRSc663EaftJoBCAU10M+VV1K6MpCBLrXq1BD5IQc1zj/ZEjA==",
-			"dependencies": {
-				"@tanstack/table-core": "8.10.3"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/tannerlinsley"
-			},
-			"peerDependencies": {
-				"react": ">=16",
-				"react-dom": ">=16"
-			}
-		},
-		"node_modules/@tanstack/table-core": {
-			"version": "8.10.3",
-			"resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.10.3.tgz",
-			"integrity": "sha512-hJ55YfJlWbfzRROfcyA/kC1aZr/shsLA8XNAwN8jXylhYWGLnPmiJJISrUfj4dMMWRiFi0xBlnlC7MLH+zSrcw==",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/tannerlinsley"
-			}
-		},
 		"node_modules/@testing-library/dom": {
 			"version": "9.3.1",
 			"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
@@ -15414,12 +14377,13 @@
 			}
 		},
 		"node_modules/@testing-library/jest-dom/node_modules/aria-query": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-			"integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+			"integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
 			"dev": true,
-			"dependencies": {
-				"dequal": "^2.0.3"
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/@testing-library/jest-dom/node_modules/chalk": {
@@ -15457,9 +14421,9 @@
 			}
 		},
 		"node_modules/@testing-library/react": {
-			"version": "14.0.0",
-			"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.0.0.tgz",
-			"integrity": "sha512-S04gSNJbYE30TlIMLTzv6QCTzt9AqIF5y6s6SzVFILNcNvbV/jU96GeiTPillGQo+Ny64M/5PV7klNYYgv5Dfg==",
+			"version": "14.3.0",
+			"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.3.0.tgz",
+			"integrity": "sha512-AYJGvNFMbCa5vt1UtDCa/dcaABrXq8gph6VN+cffIx0UeA0qiGqS+sT60+sb+Gjc8tGXdECWYQgaF0khf8b+Lg==",
 			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.12.5",
@@ -15475,12 +14439,14 @@
 			}
 		},
 		"node_modules/@testing-library/react-native": {
-			"version": "12.1.2",
-			"resolved": "https://registry.npmjs.org/@testing-library/react-native/-/react-native-12.1.2.tgz",
-			"integrity": "sha512-5rQMQpbSQAuJc4TxjTt1IoeT1a5eVXaa61hf/YcjV2QtGqCoyhuW8DvhTowrL7y2Ds4NzuYBmbVxjNPR6GIblw==",
+			"version": "12.4.3",
+			"resolved": "https://registry.npmjs.org/@testing-library/react-native/-/react-native-12.4.3.tgz",
+			"integrity": "sha512-WLE7VbbR5jZJQl3vfNK7Wt+IHnzhOxyu95Mr56EHmzH3XhC8DkrPVAnUq9asq/QWj4aGnymbinFx6zZys/WZmA==",
 			"dev": true,
 			"dependencies": {
-				"pretty-format": "^29.0.0"
+				"jest-matcher-utils": "^29.7.0",
+				"pretty-format": "^29.7.0",
+				"redent": "^3.0.0"
 			},
 			"peerDependencies": {
 				"jest": ">=28.0.0",
@@ -15510,14 +14476,12 @@
 		"node_modules/@tootallnate/quickjs-emscripten": {
 			"version": "0.23.0",
 			"resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
-			"integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
-			"dev": true
+			"integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
 		},
 		"node_modules/@trysound/sax": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
 			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.13.0"
 			}
@@ -15560,10 +14524,11 @@
 			}
 		},
 		"node_modules/@tufjs/models/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -15605,7 +14570,6 @@
 			"version": "7.20.0",
 			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
 			"integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
-			"dev": true,
 			"dependencies": {
 				"@babel/parser": "^7.20.7",
 				"@babel/types": "^7.20.7",
@@ -15618,7 +14582,6 @@
 			"version": "7.6.4",
 			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
 			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-			"dev": true,
 			"dependencies": {
 				"@babel/types": "^7.0.0"
 			}
@@ -15627,19 +14590,17 @@
 			"version": "7.4.1",
 			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
 			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-			"dev": true,
 			"dependencies": {
 				"@babel/parser": "^7.1.0",
 				"@babel/types": "^7.0.0"
 			}
 		},
 		"node_modules/@types/babel__traverse": {
-			"version": "7.0.11",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz",
-			"integrity": "sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==",
-			"dev": true,
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+			"integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
 			"dependencies": {
-				"@babel/types": "^7.3.0"
+				"@babel/types": "^7.20.7"
 			}
 		},
 		"node_modules/@types/base64-stream": {
@@ -15661,7 +14622,6 @@
 			"version": "1.19.2",
 			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
 			"integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-			"dev": true,
 			"dependencies": {
 				"@types/connect": "*",
 				"@types/node": "*"
@@ -15671,7 +14631,6 @@
 			"version": "3.5.11",
 			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.11.tgz",
 			"integrity": "sha512-isGhjmBtLIxdHBDl2xGwUzEM8AOyOvWsADWq7rqirdi/ZQoHnLWErHvsThcEzTX8juDRiZtzp2Qkv5bgNh6mAg==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -15680,7 +14639,6 @@
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
 			"integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-			"dev": true,
 			"dependencies": {
 				"@types/http-cache-semantics": "*",
 				"@types/keyv": "^3.1.4",
@@ -15692,7 +14650,6 @@
 			"version": "3.4.35",
 			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
 			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -15701,25 +14658,24 @@
 			"version": "1.5.1",
 			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.1.tgz",
 			"integrity": "sha512-iaQslNbARe8fctL5Lk+DsmgWOM83lM+7FzP0eQUJs1jd3kBE8NWqBTIT2S8SqQOJjxvt2eyIjpOuYeRXq2AdMw==",
-			"dev": true,
 			"dependencies": {
 				"@types/express-serve-static-core": "*",
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/cross-spawn": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.2.tgz",
-			"integrity": "sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==",
+			"version": "6.0.6",
+			"resolved": "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.6.tgz",
+			"integrity": "sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA==",
 			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/detect-port": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/@types/detect-port/-/detect-port-1.3.3.tgz",
-			"integrity": "sha512-bV/jQlAJ/nPY3XqSatkGpu+nGzou+uSwrH1cROhn+jBFg47yaNH+blW4C7p9KhopC7QxCv/6M86s37k8dMk0Yg==",
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/@types/detect-port/-/detect-port-1.3.5.tgz",
+			"integrity": "sha512-Rf3/lB9WkDfIL9eEKaSYKc+1L/rNVYBjThk22JTqQw0YozXarX8YljFAz+HCoC6h4B4KwCMsBPZHaFezwT4BNA==",
 			"dev": true
 		},
 		"node_modules/@types/doctrine": {
@@ -15729,15 +14685,15 @@
 			"dev": true
 		},
 		"node_modules/@types/ejs": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.2.tgz",
-			"integrity": "sha512-ZmiaE3wglXVWBM9fyVC17aGPkLo/UgaOjEiI2FXQfyczrCefORPxIe+2dVmnmk3zkVIbizjrlQzmPGhSYGXG5g==",
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz",
+			"integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==",
 			"dev": true
 		},
 		"node_modules/@types/emscripten": {
-			"version": "1.39.7",
-			"resolved": "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.39.7.tgz",
-			"integrity": "sha512-tLqYV94vuqDrXh515F/FOGtBcRMTPGvVV1LzLbtYDcQmmhtpf/gLYf+hikBbQk8MzOHNz37wpFfJbYAuSn8HqA==",
+			"version": "1.39.10",
+			"resolved": "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.39.10.tgz",
+			"integrity": "sha512-TB/6hBkYQJxsZHSqyeuO1Jt0AB/bW6G7rHt9g7lML7SOF6lbgcHvw/Lr+69iqN0qxgXLhWKScAon73JNnptuDw==",
 			"dev": true
 		},
 		"node_modules/@types/escodegen": {
@@ -15747,42 +14703,29 @@
 			"dev": true
 		},
 		"node_modules/@types/eslint": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz",
-			"integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==",
+			"version": "8.56.9",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.9.tgz",
+			"integrity": "sha512-W4W3KcqzjJ0sHg2vAq9vfml6OhsJ53TcUjUqfzzZf/EChUtwspszj/S0pzMxnfRcO55/iGq47dscXw71Fxc4Zg==",
 			"dev": true,
 			"dependencies": {
 				"@types/estree": "*",
 				"@types/json-schema": "*"
 			}
 		},
-		"node_modules/@types/eslint-scope": {
-			"version": "3.7.4",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-			"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-			"dev": true,
-			"dependencies": {
-				"@types/eslint": "*",
-				"@types/estree": "*"
-			}
-		},
 		"node_modules/@types/estree": {
-			"version": "0.0.50",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-			"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
-			"dev": true
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+			"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
 		},
 		"node_modules/@types/events": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-			"integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-			"dev": true
+			"integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="
 		},
 		"node_modules/@types/express": {
 			"version": "4.17.17",
 			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
 			"integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
-			"dev": true,
 			"dependencies": {
 				"@types/body-parser": "*",
 				"@types/express-serve-static-core": "^4.17.33",
@@ -15794,7 +14737,6 @@
 			"version": "4.17.35",
 			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
 			"integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"@types/qs": "*",
@@ -15824,7 +14766,6 @@
 			"version": "7.1.1",
 			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
 			"integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
-			"dev": true,
 			"dependencies": {
 				"@types/events": "*",
 				"@types/minimatch": "*",
@@ -15835,15 +14776,14 @@
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
 			"integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/hammerjs": {
-			"version": "2.0.41",
-			"resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz",
-			"integrity": "sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA=="
+			"version": "2.0.45",
+			"resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.45.tgz",
+			"integrity": "sha512-qkcUlZmX6c4J8q45taBKTL3p+LbITgyx7qhlPYOdOHZB7B31K0mXbP5YA7i7SgDeEGuI9MnumiKPEMrxg8j3KQ=="
 		},
 		"node_modules/@types/highlight-words-core": {
 			"version": "1.2.1",
@@ -15859,20 +14799,17 @@
 		"node_modules/@types/http-cache-semantics": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz",
-			"integrity": "sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw==",
-			"dev": true
+			"integrity": "sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="
 		},
 		"node_modules/@types/http-errors": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
-			"integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
-			"dev": true
+			"integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ=="
 		},
 		"node_modules/@types/http-proxy": {
 			"version": "1.17.12",
 			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz",
 			"integrity": "sha512-kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -15912,7 +14849,6 @@
 			"version": "20.0.1",
 			"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
 			"integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"@types/tough-cookie": "*",
@@ -15931,20 +14867,17 @@
 		"node_modules/@types/json-schema": {
 			"version": "7.0.12",
 			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-			"integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
-			"dev": true
+			"integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
 		},
 		"node_modules/@types/json5": {
 			"version": "0.0.29",
 			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-			"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-			"dev": true
+			"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
 		},
 		"node_modules/@types/keyv": {
 			"version": "3.1.4",
 			"resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
 			"integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -15988,26 +14921,23 @@
 		"node_modules/@types/mime": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz",
-			"integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==",
-			"dev": true
+			"integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="
 		},
 		"node_modules/@types/mime-types": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
-			"integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.4.tgz",
+			"integrity": "sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==",
 			"dev": true
 		},
 		"node_modules/@types/minimatch": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-			"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-			"dev": true
+			"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
 		},
 		"node_modules/@types/minimist": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
-			"integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
-			"dev": true
+			"integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY="
 		},
 		"node_modules/@types/mousetrap": {
 			"version": "1.6.8",
@@ -16030,39 +14960,28 @@
 			}
 		},
 		"node_modules/@types/node": {
-			"version": "16.18.40",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.40.tgz",
-			"integrity": "sha512-+yno3ItTEwGxXiS/75Q/aHaa5srkpnJaH+kdkTVJ3DtJEwv92itpKbxU+FjPoh2m/5G9zmUQfrL4A4C13c+iGA=="
-		},
-		"node_modules/@types/node-fetch": {
-			"version": "2.6.4",
-			"resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.4.tgz",
-			"integrity": "sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==",
-			"dev": true,
+			"version": "18.19.59",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.59.tgz",
+			"integrity": "sha512-vizm2EqwV/7Zay+A6J3tGl9Lhr7CjZe2HmWS988sefiEmsyP9CeXEleho6i4hJk/8UtZAo0bWN4QPZZr83RxvQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@types/node": "*",
-				"form-data": "^3.0.0"
+				"undici-types": "~5.26.4"
 			}
 		},
-		"node_modules/@types/node-fetch/node_modules/form-data": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+		"node_modules/@types/node-fetch": {
+			"version": "2.6.11",
+			"resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.11.tgz",
+			"integrity": "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==",
 			"dev": true,
 			"dependencies": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.8",
-				"mime-types": "^2.1.12"
-			},
-			"engines": {
-				"node": ">= 6"
+				"@types/node": "*",
+				"form-data": "^4.0.0"
 			}
 		},
 		"node_modules/@types/normalize-package-data": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-			"integrity": "sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==",
-			"dev": true
+			"integrity": "sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A=="
 		},
 		"node_modules/@types/npm-package-arg": {
 			"version": "6.1.1",
@@ -16099,9 +15018,9 @@
 			"dev": true
 		},
 		"node_modules/@types/pretty-hrtime": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz",
-			"integrity": "sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@types/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+			"integrity": "sha512-nj39q0wAIdhwn7DGUyT9irmsKK1tV0bd5WFEhgpqNTMFZ8cE+jieuTphCW0tfdm47S2zVT5mr09B28b1chmQMA==",
 			"dev": true
 		},
 		"node_modules/@types/prop-types": {
@@ -16112,22 +15031,19 @@
 		"node_modules/@types/qs": {
 			"version": "6.9.7",
 			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-			"dev": true
+			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
 		},
 		"node_modules/@types/range-parser": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-			"dev": true
+			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
 		},
 		"node_modules/@types/react": {
-			"version": "18.0.21",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.21.tgz",
-			"integrity": "sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==",
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz",
+			"integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==",
 			"dependencies": {
 				"@types/prop-types": "*",
-				"@types/scheduler": "*",
 				"csstype": "^3.0.2"
 			}
 		},
@@ -16143,9 +15059,9 @@
 			}
 		},
 		"node_modules/@types/react-dom": {
-			"version": "18.0.6",
-			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.6.tgz",
-			"integrity": "sha512-/5OFZgfIPSwy+YuIBP/FgJnQnsxhZhjjrnxudMddeblOouIodEQ75X14Rr4wGSG/bknL+Omy9iWlLo1u/9GzAA==",
+			"version": "18.3.0",
+			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
+			"integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
 			"dependencies": {
 				"@types/react": "*"
 			}
@@ -16174,11 +15090,16 @@
 			"integrity": "sha512-aTSyiZuRemRLTQkJPb25L7A4/eR2Teo5l4yJ1V6P3+MFxEZckTDkNKNtr/V1zEOMzS6H8DgxF22U6jPAPrzQvw==",
 			"dev": true
 		},
+		"node_modules/@types/resolve": {
+			"version": "1.20.6",
+			"resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.6.tgz",
+			"integrity": "sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==",
+			"dev": true
+		},
 		"node_modules/@types/responselike": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
 			"integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -16186,8 +15107,7 @@
 		"node_modules/@types/retry": {
 			"version": "0.12.1",
 			"resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-			"integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==",
-			"dev": true
+			"integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="
 		},
 		"node_modules/@types/scheduler": {
 			"version": "0.16.2",
@@ -16204,17 +15124,15 @@
 			"version": "0.17.1",
 			"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
 			"integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
-			"dev": true,
 			"dependencies": {
 				"@types/mime": "^1",
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/send/node_modules/@types/mime": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-			"integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-			"dev": true
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+			"integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
 		},
 		"node_modules/@types/serve-favicon": {
 			"version": "2.5.5",
@@ -16229,7 +15147,6 @@
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
 			"integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-			"dev": true,
 			"dependencies": {
 				"@types/express": "*"
 			}
@@ -16238,7 +15155,6 @@
 			"version": "1.15.2",
 			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
 			"integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
-			"dev": true,
 			"dependencies": {
 				"@types/http-errors": "*",
 				"@types/mime": "*",
@@ -16263,7 +15179,6 @@
 			"version": "0.3.33",
 			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
 			"integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -16271,8 +15186,7 @@
 		"node_modules/@types/source-list-map": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-			"dev": true
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="
 		},
 		"node_modules/@types/sprintf-js": {
 			"version": "1.1.2",
@@ -16294,8 +15208,7 @@
 		"node_modules/@types/tapable": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.5.tgz",
-			"integrity": "sha512-/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ==",
-			"dev": true
+			"integrity": "sha512-/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ=="
 		},
 		"node_modules/@types/teen_process": {
 			"version": "2.0.0",
@@ -16318,8 +15231,7 @@
 		"node_modules/@types/tough-cookie": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
-			"integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
-			"dev": true
+			"integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw=="
 		},
 		"node_modules/@types/triple-beam": {
 			"version": "1.3.3",
@@ -16331,7 +15243,6 @@
 			"version": "3.9.2",
 			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.2.tgz",
 			"integrity": "sha512-d6dIfpPbF+8B7WiCi2ELY7m0w1joD8cRW4ms88Emdb2w062NeEpbNCeWwVCgzLRpVG+5e74VFSg4rgJ2xXjEiQ==",
-			"dev": true,
 			"dependencies": {
 				"source-map": "^0.6.1"
 			}
@@ -16339,8 +15250,7 @@
 		"node_modules/@types/unist": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-			"integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
-			"dev": true
+			"integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ=="
 		},
 		"node_modules/@types/uuid": {
 			"version": "8.3.1",
@@ -16352,7 +15262,6 @@
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/@types/vfile/-/vfile-3.0.2.tgz",
 			"integrity": "sha512-b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"@types/unist": "*",
@@ -16363,7 +15272,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-1.0.1.tgz",
 			"integrity": "sha512-mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"@types/unist": "*"
@@ -16373,7 +15281,6 @@
 			"version": "4.41.33",
 			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz",
 			"integrity": "sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"@types/tapable": "^1",
@@ -16387,7 +15294,6 @@
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz",
 			"integrity": "sha512-XyaHrJILjK1VHVC4aVlKsdNN5KBTwufMb43cQs+flGxtPAf/1Qwl8+Q0tp5BwEGaI8D6XT1L+9bSWXckgkjTLw==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"@types/source-list-map": "*",
@@ -16410,15 +15316,15 @@
 			"version": "8.5.5",
 			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
 			"integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/yargs": {
-			"version": "17.0.24",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
-			"integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+			"version": "17.0.33",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+			"integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+			"license": "MIT",
 			"dependencies": {
 				"@types/yargs-parser": "*"
 			}
@@ -16432,7 +15338,6 @@
 			"version": "2.10.0",
 			"resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
 			"integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"@types/node": "*"
@@ -16442,7 +15347,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.1.tgz",
 			"integrity": "sha512-3F5PtBzUW0dYlq77Lcqo13fv+58KDwUib3BddilE8ajPJT+faGgxmI9Sw+I8ZS22BYwoir9ZhNXcLi+S+I2bkw==",
-			"dev": true,
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.5.1",
 				"@typescript-eslint/scope-manager": "6.4.1",
@@ -16474,16 +15378,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/eslint-plugin/node_modules/@types/semver": {
-			"version": "7.5.0",
-			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-			"integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-			"dev": true
+			"version": "7.5.8",
+			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+			"integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="
 		},
 		"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
 			"integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "6.4.1",
 				"@typescript-eslint/visitor-keys": "6.4.1"
@@ -16500,7 +15402,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
 			"integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
-			"dev": true,
 			"engines": {
 				"node": "^16.0.0 || >=18.0.0"
 			},
@@ -16513,7 +15414,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
 			"integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "6.4.1",
 				"@typescript-eslint/visitor-keys": "6.4.1",
@@ -16540,7 +15440,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
 			"integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
-			"dev": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.4.0",
 				"@types/json-schema": "^7.0.12",
@@ -16565,7 +15464,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
 			"integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "6.4.1",
 				"eslint-visitor-keys": "^3.4.1"
@@ -16582,7 +15480,6 @@
 			"version": "3.4.3",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
 			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-			"dev": true,
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
@@ -16594,7 +15491,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.1.tgz",
 			"integrity": "sha512-610G6KHymg9V7EqOaNBMtD1GgpAmGROsmfHJPXNLCU9bfIuLrkdOygltK784F6Crboyd5tBFayPB7Sf0McrQwg==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/scope-manager": "6.4.1",
 				"@typescript-eslint/types": "6.4.1",
@@ -16622,7 +15518,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
 			"integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "6.4.1",
 				"@typescript-eslint/visitor-keys": "6.4.1"
@@ -16639,7 +15534,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
 			"integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
-			"dev": true,
 			"engines": {
 				"node": "^16.0.0 || >=18.0.0"
 			},
@@ -16652,7 +15546,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
 			"integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "6.4.1",
 				"@typescript-eslint/visitor-keys": "6.4.1",
@@ -16679,7 +15572,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
 			"integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "6.4.1",
 				"eslint-visitor-keys": "^3.4.1"
@@ -16696,7 +15588,6 @@
 			"version": "3.4.3",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
 			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-			"dev": true,
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
@@ -16708,7 +15599,6 @@
 			"version": "5.62.0",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
 			"integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "5.62.0",
 				"@typescript-eslint/visitor-keys": "5.62.0"
@@ -16725,7 +15615,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.1.tgz",
 			"integrity": "sha512-7ON8M8NXh73SGZ5XvIqWHjgX2f+vvaOarNliGhjrJnv1vdjG0LVIz+ToYfPirOoBi56jxAKLfsLm40+RvxVVXA==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/typescript-estree": "6.4.1",
 				"@typescript-eslint/utils": "6.4.1",
@@ -16749,16 +15638,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/type-utils/node_modules/@types/semver": {
-			"version": "7.5.0",
-			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-			"integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-			"dev": true
+			"version": "7.5.8",
+			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+			"integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="
 		},
 		"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
 			"integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "6.4.1",
 				"@typescript-eslint/visitor-keys": "6.4.1"
@@ -16775,7 +15662,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
 			"integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
-			"dev": true,
 			"engines": {
 				"node": "^16.0.0 || >=18.0.0"
 			},
@@ -16788,7 +15674,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
 			"integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "6.4.1",
 				"@typescript-eslint/visitor-keys": "6.4.1",
@@ -16815,7 +15700,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
 			"integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
-			"dev": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.4.0",
 				"@types/json-schema": "^7.0.12",
@@ -16840,7 +15724,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
 			"integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "6.4.1",
 				"eslint-visitor-keys": "^3.4.1"
@@ -16857,7 +15740,6 @@
 			"version": "3.4.3",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
 			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-			"dev": true,
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
@@ -16869,7 +15751,6 @@
 			"version": "5.62.0",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
 			"integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
-			"dev": true,
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
@@ -16882,7 +15763,6 @@
 			"version": "5.62.0",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
 			"integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "5.62.0",
 				"@typescript-eslint/visitor-keys": "5.62.0",
@@ -16909,7 +15789,6 @@
 			"version": "5.62.0",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
 			"integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
-			"dev": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@types/json-schema": "^7.0.9",
@@ -16932,16 +15811,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/utils/node_modules/@types/semver": {
-			"version": "7.5.0",
-			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-			"integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-			"dev": true
+			"version": "7.5.8",
+			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+			"integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="
 		},
 		"node_modules/@typescript-eslint/utils/node_modules/eslint-scope": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
 			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-			"dev": true,
 			"dependencies": {
 				"esrecurse": "^4.3.0",
 				"estraverse": "^4.1.1"
@@ -16954,7 +15831,6 @@
 			"version": "5.62.0",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
 			"integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/types": "5.62.0",
 				"eslint-visitor-keys": "^3.3.0"
@@ -16968,10 +15844,9 @@
 			}
 		},
 		"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-			"integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-			"dev": true,
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
@@ -16980,16 +15855,16 @@
 			}
 		},
 		"node_modules/@use-gesture/core": {
-			"version": "10.2.24",
-			"resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.24.tgz",
-			"integrity": "sha512-ZL7F9mgOn3Qlnp6QLI9jaOfcvqrx6JPE/BkdVSd8imveaFTm/a3udoO6f5Us/1XtqnL4347PsIiK6AtCvMHk2Q=="
+			"version": "10.3.1",
+			"resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz",
+			"integrity": "sha512-WcINiDt8WjqBdUXye25anHiNxPc0VOrlT8F6LLkU6cycrOGUDyY/yyFmsg3k8i5OLvv25llc0QC45GhR/C8llw=="
 		},
 		"node_modules/@use-gesture/react": {
-			"version": "10.2.24",
-			"resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.24.tgz",
-			"integrity": "sha512-rAZ8Nnpu1g4eFzqCPlaq+TppJpMy0dTpYOQx5KpfoBF4P3aWnCqwj7eKxcmdIb1NJKpIJj50DPugUH4mq5cpBg==",
+			"version": "10.3.1",
+			"resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.3.1.tgz",
+			"integrity": "sha512-Yy19y6O2GJq8f7CHf7L0nxL8bf4PZCPaVOCgJrusOeFHY1LvHgYXnmnXg6N5iwAnbgbZCDjo60SiM6IPJi9C5g==",
 			"dependencies": {
-				"@use-gesture/core": "10.2.24"
+				"@use-gesture/core": "10.3.1"
 			},
 			"peerDependencies": {
 				"react": ">= 16.8.0"
@@ -17023,20 +15898,6 @@
 				"balanced-match": "^1.0.0"
 			}
 		},
-		"node_modules/@wdio/config/node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
 		"node_modules/@wdio/config/node_modules/decamelize": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
@@ -17065,48 +15926,31 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@wdio/config/node_modules/foreground-child": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-			"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-			"dev": true,
-			"dependencies": {
-				"cross-spawn": "^7.0.0",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@wdio/config/node_modules/glob": {
-			"version": "10.3.10",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-			"integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"foreground-child": "^3.1.0",
-				"jackspeak": "^2.3.5",
-				"minimatch": "^9.0.1",
-				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-				"path-scurry": "^1.10.1"
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
 			},
 			"bin": {
 				"glob": "dist/esm/bin.mjs"
 			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/@wdio/config/node_modules/hosted-git-info": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
-			"integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+			"integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
 			"dev": true,
 			"dependencies": {
 				"lru-cache": "^10.0.1"
@@ -17115,19 +15959,35 @@
 				"node": "^16.14.0 || >=18.0.0"
 			}
 		},
+		"node_modules/@wdio/config/node_modules/jackspeak": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+			"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"@isaacs/cliui": "^8.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			},
+			"optionalDependencies": {
+				"@pkgjs/parseargs": "^0.11.0"
+			}
+		},
 		"node_modules/@wdio/config/node_modules/json-parse-even-better-errors": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
-			"integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+			"integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
 			"dev": true,
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
 		"node_modules/@wdio/config/node_modules/lines-and-columns": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz",
-			"integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==",
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz",
+			"integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==",
 			"dev": true,
 			"engines": {
 				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
@@ -17149,19 +16009,18 @@
 			}
 		},
 		"node_modules/@wdio/config/node_modules/lru-cache": {
-			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
-			"integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
+			"version": "10.4.3",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+			"integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
 			"dev": true,
-			"engines": {
-				"node": "14 || >=16.14"
-			}
+			"license": "ISC"
 		},
 		"node_modules/@wdio/config/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -17173,22 +16032,23 @@
 			}
 		},
 		"node_modules/@wdio/config/node_modules/minipass": {
-			"version": "7.0.4",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-			"integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": ">=16 || 14 >=14.17"
 			}
 		},
 		"node_modules/@wdio/config/node_modules/normalize-package-data": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz",
-			"integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==",
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
+			"integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"hosted-git-info": "^7.0.0",
-				"is-core-module": "^2.8.1",
 				"semver": "^7.3.5",
 				"validate-npm-package-license": "^3.0.4"
 			},
@@ -17227,9 +16087,9 @@
 			}
 		},
 		"node_modules/@wdio/config/node_modules/parse-json": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.0.tgz",
-			"integrity": "sha512-ihtdrgbqdONYD156Ap6qTcaGcGdkdAxodO1wLqQ/j7HP1u2sFYppINiq4jyC8F+Nm+4fVufylCV00QmkTHkSUg==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz",
+			"integrity": "sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==",
 			"dev": true,
 			"dependencies": {
 				"@babel/code-frame": "^7.21.4",
@@ -17266,15 +16126,6 @@
 				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			}
 		},
-		"node_modules/@wdio/config/node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/@wdio/config/node_modules/read-pkg": {
 			"version": "8.1.0",
 			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz",
@@ -17310,44 +16161,12 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@wdio/config/node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@wdio/config/node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@wdio/config/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@wdio/config/node_modules/type-fest": {
-			"version": "4.3.3",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.3.3.tgz",
-			"integrity": "sha512-bxhiFii6BBv6UiSDq7uKTMyADT9unXEl3ydGefndVLxFeB44LRbT4K7OJGDYSyDrKnklCC1Pre68qT2wbUl2Aw==",
+			"version": "4.26.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
+			"integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
 			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
 			"engines": {
 				"node": ">=16"
 			},
@@ -17355,26 +16174,12 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@wdio/config/node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
 		"node_modules/@wdio/config/node_modules/yocto-queue": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-			"integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
+			"integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=12.20"
 			},
@@ -17398,10 +16203,11 @@
 			}
 		},
 		"node_modules/@wdio/logger/node_modules/ansi-regex": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=12"
 			},
@@ -17455,10 +16261,21 @@
 			}
 		},
 		"node_modules/@wdio/repl/node_modules/@types/node": {
-			"version": "20.8.2",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-			"integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-			"dev": true
+			"version": "20.16.15",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.15.tgz",
+			"integrity": "sha512-DV58qQz9dBMqVVn+qnKwGa51QzCD4YM/tQM16qLKxdf5tqz5W4QwtrMzjSTbabN1cFTSuyxVYBy+QWHjWW8X/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.19.2"
+			}
+		},
+		"node_modules/@wdio/repl/node_modules/undici-types": {
+			"version": "6.19.8",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+			"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@wdio/types": {
 			"version": "8.16.12",
@@ -17473,10 +16290,21 @@
 			}
 		},
 		"node_modules/@wdio/types/node_modules/@types/node": {
-			"version": "20.8.2",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-			"integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-			"dev": true
+			"version": "20.16.15",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.15.tgz",
+			"integrity": "sha512-DV58qQz9dBMqVVn+qnKwGa51QzCD4YM/tQM16qLKxdf5tqz5W4QwtrMzjSTbabN1cFTSuyxVYBy+QWHjWW8X/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.19.2"
+			}
+		},
+		"node_modules/@wdio/types/node_modules/undici-types": {
+			"version": "6.19.8",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+			"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@wdio/utils": {
 			"version": "8.16.17",
@@ -17504,9 +16332,9 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/@puppeteer/browsers": {
-			"version": "1.7.1",
-			"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.7.1.tgz",
-			"integrity": "sha512-nIb8SOBgDEMFY2iS2MdnUZOg2ikcYchRrBoF+wtdjieRFKR2uGRipHY/oFLo+2N6anDualyClPzGywTHRGrLfw==",
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.9.1.tgz",
+			"integrity": "sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==",
 			"dev": true,
 			"dependencies": {
 				"debug": "4.3.4",
@@ -17515,7 +16343,7 @@
 				"proxy-agent": "6.3.1",
 				"tar-fs": "3.0.4",
 				"unbzip2-stream": "1.4.3",
-				"yargs": "17.7.1"
+				"yargs": "17.7.2"
 			},
 			"bin": {
 				"browsers": "lib/cjs/main-cli.js"
@@ -17549,9 +16377,9 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/agent-base": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-			"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+			"integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
 			"dev": true,
 			"dependencies": {
 				"debug": "^4.3.4"
@@ -17652,9 +16480,9 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/get-port": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/get-port/-/get-port-7.0.0.tgz",
-			"integrity": "sha512-mDHFgApoQd+azgMdwylJrv2DX47ywGq1i5VFJE7fZ0dttNq3iQMfsU4IvEgBHojA3KqEudyu7Vq+oN8kNaNkWw==",
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/get-port/-/get-port-7.1.0.tgz",
+			"integrity": "sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==",
 			"dev": true,
 			"engines": {
 				"node": ">=16"
@@ -17701,9 +16529,9 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/http-proxy-agent": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-			"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
 			"dev": true,
 			"dependencies": {
 				"agent-base": "^7.1.0",
@@ -17714,9 +16542,9 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/http2-wrapper": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz",
-			"integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==",
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+			"integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
 			"dev": true,
 			"dependencies": {
 				"quick-lru": "^5.1.1",
@@ -17727,10 +16555,11 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/https-proxy-agent": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-			"integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+			"integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"agent-base": "^7.0.2",
 				"debug": "4"
@@ -17782,9 +16611,9 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/normalize-url": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz",
-			"integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==",
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
+			"integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
 			"dev": true,
 			"engines": {
 				"node": ">=14.16"
@@ -17822,10 +16651,11 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
@@ -17859,14 +16689,15 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/socks-proxy-agent": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
-			"integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
+			"version": "8.0.4",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+			"integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"agent-base": "^7.0.2",
+				"agent-base": "^7.1.1",
 				"debug": "^4.3.4",
-				"socks": "^2.7.1"
+				"socks": "^2.8.3"
 			},
 			"engines": {
 				"node": ">= 14"
@@ -17907,9 +16738,9 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/tar-stream": {
-			"version": "3.1.6",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-			"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+			"integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
 			"dev": true,
 			"dependencies": {
 				"b4a": "^1.6.4",
@@ -17944,9 +16775,9 @@
 			}
 		},
 		"node_modules/@wdio/utils/node_modules/yargs": {
-			"version": "17.7.1",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-			"integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+			"version": "17.7.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
 			"dev": true,
 			"dependencies": {
 				"cliui": "^8.0.1",
@@ -18027,7 +16858,6 @@
 			"version": "1.11.6",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
 			"integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
-			"dev": true,
 			"dependencies": {
 				"@webassemblyjs/floating-point-hex-parser": "1.11.6",
 				"@webassemblyjs/helper-api-error": "1.11.6",
@@ -18037,14 +16867,12 @@
 		"node_modules/@webassemblyjs/helper-numbers/node_modules/@webassemblyjs/floating-point-hex-parser": {
 			"version": "1.11.6",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-			"integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-			"dev": true
+			"integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
 		},
 		"node_modules/@webassemblyjs/helper-numbers/node_modules/@webassemblyjs/helper-api-error": {
 			"version": "1.11.6",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-			"dev": true
+			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
 		},
 		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
 			"version": "1.9.0",
@@ -18172,7 +17000,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
 			"integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
-			"dev": true,
 			"engines": {
 				"node": ">=14.15.0"
 			},
@@ -18185,7 +17012,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
 			"integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
-			"dev": true,
 			"engines": {
 				"node": ">=14.15.0"
 			},
@@ -18198,7 +17024,6 @@
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
 			"integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=14.15.0"
 			},
@@ -18300,6 +17125,10 @@
 			"resolved": "packages/create-block",
 			"link": true
 		},
+		"node_modules/@wordpress/create-block-interactive-template": {
+			"resolved": "packages/create-block-interactive-template",
+			"link": true
+		},
 		"node_modules/@wordpress/create-block-tutorial-template": {
 			"resolved": "packages/create-block-tutorial-template",
 			"link": true
@@ -18388,6 +17217,10 @@
 			"resolved": "packages/eslint-plugin",
 			"link": true
 		},
+		"node_modules/@wordpress/fields": {
+			"resolved": "packages/fields",
+			"link": true
+		},
 		"node_modules/@wordpress/format-library": {
 			"resolved": "packages/format-library",
 			"link": true
@@ -18412,6 +17245,10 @@
 			"resolved": "packages/interactivity",
 			"link": true
 		},
+		"node_modules/@wordpress/interactivity-router": {
+			"resolved": "packages/interactivity-router",
+			"link": true
+		},
 		"node_modules/@wordpress/interface": {
 			"resolved": "packages/interface",
 			"link": true
@@ -18588,6 +17425,10 @@
 			"resolved": "packages/viewport",
 			"link": true
 		},
+		"node_modules/@wordpress/vips": {
+			"resolved": "packages/vips",
+			"link": true
+		},
 		"node_modules/@wordpress/warning": {
 			"resolved": "packages/warning",
 			"link": true
@@ -18612,14 +17453,12 @@
 		"node_modules/@xtuc/ieee754": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-			"dev": true
+			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
 		},
 		"node_modules/@xtuc/long": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-			"dev": true
+			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
 		},
 		"node_modules/@yarnpkg/esbuild-plugin-pnp": {
 			"version": "3.0.0-rc.15",
@@ -18714,8 +17553,7 @@
 		"node_modules/abab": {
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-			"dev": true
+			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
 		},
 		"node_modules/abbrev": {
 			"version": "1.1.1",
@@ -18734,11 +17572,6 @@
 				"node": ">=6.5"
 			}
 		},
-		"node_modules/absolute-path": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/absolute-path/-/absolute-path-0.0.0.tgz",
-			"integrity": "sha512-HQiug4c+/s3WOvEnDRxXVmNtSG5s2gJM9r19BTcqjp7BWcE48PB+Y2G6jE65kqI0LpsQeMZygt/b60Gi4KxGyA=="
-		},
 		"node_modules/accepts": {
 			"version": "1.3.8",
 			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -18763,11 +17596,10 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/acorn-import-assertions": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-			"dev": true,
+		"node_modules/acorn-import-attributes": {
+			"version": "1.9.5",
+			"resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+			"integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
 			"peerDependencies": {
 				"acorn": "^8"
 			}
@@ -18776,7 +17608,6 @@
 			"version": "5.3.1",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
 			"integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-			"dev": true,
 			"peerDependencies": {
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
@@ -18809,7 +17640,6 @@
 			"version": "0.5.9",
 			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz",
 			"integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==",
-			"dev": true,
 			"engines": {
 				"node": ">=6.0"
 			}
@@ -18818,7 +17648,6 @@
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
 			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-			"dev": true,
 			"dependencies": {
 				"debug": "4"
 			},
@@ -18839,23 +17668,31 @@
 			}
 		},
 		"node_modules/aggregate-error": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.0.tgz",
-			"integrity": "sha512-yKD9kEoJIR+2IFqhMwayIBgheLYbB3PS2OBhWae1L/ODTd/JF/30cW0bc9TqzRL3k4U41Dieu3BF4I29p8xesA==",
-			"dev": true,
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+			"integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+			"license": "MIT",
 			"dependencies": {
 				"clean-stack": "^2.0.0",
-				"indent-string": "^3.2.0"
+				"indent-string": "^4.0.0"
 			},
 			"engines": {
 				"node": ">=8"
 			}
 		},
+		"node_modules/aggregate-error/node_modules/indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/ajv": {
 			"version": "8.7.1",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.7.1.tgz",
 			"integrity": "sha512-gPpOObTO1QjbnN1sVMjJcp1TF9nggMfO4MBR5uQl6ZVTOaEPq5i4oq/6R9q2alMMPB3eg53wFv1RuJBLuxf3Hw==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"json-schema-traverse": "^1.0.0",
@@ -18867,25 +17704,10 @@
 				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"node_modules/ajv-draft-04": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz",
-			"integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==",
-			"dev": true,
-			"peerDependencies": {
-				"ajv": "^8.5.0"
-			},
-			"peerDependenciesMeta": {
-				"ajv": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/ajv-errors": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
 			"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-			"dev": true,
 			"peerDependencies": {
 				"ajv": ">=5.0.0"
 			}
@@ -18894,7 +17716,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
 			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-			"dev": true,
 			"dependencies": {
 				"ajv": "^8.0.0"
 			},
@@ -18911,7 +17732,6 @@
 			"version": "3.5.2",
 			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
 			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-			"dev": true,
 			"peerDependencies": {
 				"ajv": "^6.9.1"
 			}
@@ -18919,8 +17739,7 @@
 		"node_modules/ajv/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
 		},
 		"node_modules/anser": {
 			"version": "1.4.10",
@@ -18931,7 +17750,6 @@
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
 			"integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -18940,7 +17758,6 @@
 			"version": "4.3.2",
 			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
 			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-			"dev": true,
 			"dependencies": {
 				"type-fest": "^0.21.3"
 			},
@@ -18955,7 +17772,6 @@
 			"version": "0.21.3",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
 			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -19020,7 +17836,6 @@
 			"version": "0.0.8",
 			"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
 			"integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-			"dev": true,
 			"engines": [
 				"node >= 0.8.0"
 			],
@@ -19187,14 +18002,10 @@
 			}
 		},
 		"node_modules/appium/node_modules/are-we-there-yet": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.1.tgz",
-			"integrity": "sha512-2zuA+jpOYBRgoBCfa+fB87Rk0oGJjDX6pxGzqH6f33NzUhG25Xur6R0u0Z9VVAq8Z5JvQpQI6j6rtonuivC8QA==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz",
+			"integrity": "sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg==",
 			"dev": true,
-			"dependencies": {
-				"delegates": "^1.0.0",
-				"readable-stream": "^4.1.0"
-			},
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
@@ -19225,30 +18036,6 @@
 				"balanced-match": "^1.0.0"
 			}
 		},
-		"node_modules/appium/node_modules/buffer": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-			"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"dependencies": {
-				"base64-js": "^1.3.1",
-				"ieee754": "^1.2.1"
-			}
-		},
 		"node_modules/appium/node_modules/cli-cursor": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -19316,9 +18103,9 @@
 			}
 		},
 		"node_modules/appium/node_modules/gauge": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.1.tgz",
-			"integrity": "sha512-CmykPMJGuNan/3S4kZOpvvPYSNqSHANiWnh9XcMU2pSjtBfF0XzZ2p1bFAxTbnFxyBuPxQYHhzwaoOmUdqzvxQ==",
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.2.tgz",
+			"integrity": "sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ==",
 			"dev": true,
 			"dependencies": {
 				"aproba": "^1.0.3 || ^2.0.0",
@@ -19502,22 +18289,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/appium/node_modules/readable-stream": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz",
-			"integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==",
-			"dev": true,
-			"dependencies": {
-				"abort-controller": "^3.0.0",
-				"buffer": "^6.0.3",
-				"events": "^3.3.0",
-				"process": "^0.11.10",
-				"string_decoder": "^1.3.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
 		"node_modules/appium/node_modules/resolve-from": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -19546,26 +18317,6 @@
 			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
 			"dev": true
 		},
-		"node_modules/appium/node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			]
-		},
 		"node_modules/appium/node_modules/semver": {
 			"version": "7.5.3",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
@@ -19614,15 +18365,6 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/appium/node_modules/string_decoder": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-			"dev": true,
-			"dependencies": {
-				"safe-buffer": "~5.2.0"
-			}
-		},
 		"node_modules/appium/node_modules/string-width": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -19806,9 +18548,9 @@
 			}
 		},
 		"node_modules/archiver/node_modules/tar-stream": {
-			"version": "3.1.6",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-			"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+			"integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
 			"dev": true,
 			"dependencies": {
 				"b4a": "^1.6.4",
@@ -19820,7 +18562,6 @@
 			"version": "0.0.2",
 			"resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
 			"integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
-			"dev": true,
 			"engines": {
 				"node": ">=14"
 			}
@@ -19886,7 +18627,6 @@
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
 			"integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.10.2",
 				"@babel/runtime-corejs3": "^7.10.2"
@@ -19899,6 +18639,7 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
 			"integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -19907,6 +18648,7 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
 			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -19923,7 +18665,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
 			"integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"is-array-buffer": "^3.0.1"
@@ -19944,8 +18685,7 @@
 		"node_modules/array-flatten": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-			"dev": true
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
 		},
 		"node_modules/array-ify": {
 			"version": "1.0.0",
@@ -19957,7 +18697,6 @@
 			"version": "3.1.6",
 			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
 			"integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -19975,14 +18714,12 @@
 		"node_modules/array-iterate": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.2.tgz",
-			"integrity": "sha512-1hWSHTIlG/8wtYD+PPX5AOBtKWngpDFjrsrHgZpe+JdgNGz0udYu6ZIkAa/xuenIUEqFv7DvE2Yr60jxweJSrQ==",
-			"dev": true
+			"integrity": "sha512-1hWSHTIlG/8wtYD+PPX5AOBtKWngpDFjrsrHgZpe+JdgNGz0udYu6ZIkAa/xuenIUEqFv7DvE2Yr60jxweJSrQ=="
 		},
 		"node_modules/array-union": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
 			"integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
-			"dev": true,
 			"dependencies": {
 				"array-uniq": "^1.0.1"
 			},
@@ -19994,7 +18731,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
 			"integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -20003,6 +18739,7 @@
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
 			"integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -20011,7 +18748,6 @@
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
 			"integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -20029,7 +18765,6 @@
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
 			"integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -20047,7 +18782,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
 			"integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
-			"dev": true,
 			"dependencies": {
 				"array-buffer-byte-length": "^1.0.0",
 				"call-bind": "^1.0.2",
@@ -20067,7 +18801,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
 			"integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -20096,42 +18829,38 @@
 			"dev": true
 		},
 		"node_modules/assert": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-			"integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+			"integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
 			"dev": true,
 			"dependencies": {
-				"object-assign": "^4.1.1",
-				"util": "0.10.3"
+				"object.assign": "^4.1.4",
+				"util": "^0.10.4"
 			}
 		},
-		"node_modules/assert/node_modules/inherits": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-			"integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-			"dev": true
-		},
 		"node_modules/assert/node_modules/util": {
-			"version": "0.10.3",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-			"integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+			"version": "0.10.4",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+			"integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
 			"dev": true,
 			"dependencies": {
-				"inherits": "2.0.1"
+				"inherits": "2.0.3"
 			}
 		},
 		"node_modules/assign-symbols": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
 			"integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/ast-types": {
-			"version": "0.14.2",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz",
-			"integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==",
+			"version": "0.16.1",
+			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz",
+			"integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
+			"dev": true,
 			"dependencies": {
 				"tslib": "^2.0.1"
 			},
@@ -20142,8 +18871,7 @@
 		"node_modules/ast-types-flow": {
 			"version": "0.0.7",
 			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-			"integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
-			"dev": true
+			"integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
 		},
 		"node_modules/astral-regex": {
 			"version": "1.0.0",
@@ -20156,13 +18884,20 @@
 		"node_modules/async": {
 			"version": "3.2.4",
 			"resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-			"integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+			"integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+			"dev": true
 		},
 		"node_modules/async-each": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-			"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
+			"integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://paulmillr.com/funding/"
+				}
+			],
 			"optional": true
 		},
 		"node_modules/async-limiter": {
@@ -20195,8 +18930,16 @@
 		"node_modules/asynckit": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-			"dev": true
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+		},
+		"node_modules/at-least-node": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+			"integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4.0.0"
+			}
 		},
 		"node_modules/atob": {
 			"version": "2.1.2",
@@ -20219,7 +18962,6 @@
 			"version": "10.4.14",
 			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
 			"integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
-			"dev": true,
 			"funding": [
 				{
 					"type": "opencollective",
@@ -20251,8 +18993,7 @@
 		"node_modules/autoprefixer/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/autosize": {
 			"version": "4.0.2",
@@ -20263,7 +19004,6 @@
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
 			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -20275,22 +19015,30 @@
 			"version": "4.7.2",
 			"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
 			"integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
-			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
 		},
+		"node_modules/axios": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+			"integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+			"dev": true,
+			"dependencies": {
+				"follow-redirects": "^1.15.0",
+				"form-data": "^4.0.0",
+				"proxy-from-env": "^1.1.0"
+			}
+		},
 		"node_modules/axobject-query": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-			"integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-			"dev": true
+			"integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA=="
 		},
 		"node_modules/b4a": {
 			"version": "1.6.4",
 			"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
-			"integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==",
-			"dev": true
+			"integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw=="
 		},
 		"node_modules/babel-core": {
 			"version": "7.0.0-bridge.0",
@@ -20301,15 +19049,14 @@
 			}
 		},
 		"node_modules/babel-jest": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
-			"integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
-			"dev": true,
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+			"integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
 			"dependencies": {
-				"@jest/transform": "^29.6.2",
+				"@jest/transform": "^29.7.0",
 				"@types/babel__core": "^7.1.14",
 				"babel-plugin-istanbul": "^6.1.1",
-				"babel-preset-jest": "^29.5.0",
+				"babel-preset-jest": "^29.6.3",
 				"chalk": "^4.0.0",
 				"graceful-fs": "^4.2.9",
 				"slash": "^3.0.0"
@@ -20322,205 +19069,189 @@
 			}
 		},
 		"node_modules/babel-loader": {
-			"version": "8.2.3",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-			"integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
+			"version": "9.2.1",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz",
+			"integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^1.4.0",
-				"make-dir": "^3.1.0",
-				"schema-utils": "^2.6.5"
+				"find-cache-dir": "^4.0.0",
+				"schema-utils": "^4.0.0"
 			},
 			"engines": {
-				"node": ">= 8.9"
+				"node": ">= 14.15.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0",
-				"webpack": ">=2"
+				"@babel/core": "^7.12.0",
+				"webpack": ">=5"
 			}
 		},
 		"node_modules/babel-loader/node_modules/ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
 			},
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"node_modules/babel-loader/node_modules/find-cache-dir": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+		"node_modules/babel-loader/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
 			"dev": true,
 			"dependencies": {
-				"commondir": "^1.0.1",
-				"make-dir": "^3.0.2",
-				"pkg-dir": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
+				"fast-deep-equal": "^3.1.3"
 			},
-			"funding": {
-				"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+			"peerDependencies": {
+				"ajv": "^8.8.2"
 			}
 		},
-		"node_modules/babel-loader/node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+		"node_modules/babel-loader/node_modules/find-cache-dir": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+			"integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
 			"dev": true,
 			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
+				"common-path-prefix": "^3.0.0",
+				"pkg-dir": "^7.0.0"
 			},
 			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-loader/node_modules/json5": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-			"dev": true,
-			"dependencies": {
-				"minimist": "^1.2.0"
+				"node": ">=14.16"
 			},
-			"bin": {
-				"json5": "lib/cli.js"
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/babel-loader/node_modules/loader-utils": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-			"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+		"node_modules/babel-loader/node_modules/find-up": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+			"integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
 			"dev": true,
 			"dependencies": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^1.0.1"
+				"locate-path": "^7.1.0",
+				"path-exists": "^5.0.0"
 			},
 			"engines": {
-				"node": ">=4.0.0"
-			}
-		},
-		"node_modules/babel-loader/node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"dependencies": {
-				"p-locate": "^4.1.0"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			},
-			"engines": {
-				"node": ">=8"
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/babel-loader/node_modules/make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+		"node_modules/babel-loader/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/babel-loader/node_modules/locate-path": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+			"integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
 			"dev": true,
 			"dependencies": {
-				"semver": "^6.0.0"
+				"p-locate": "^6.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/babel-loader/node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+			"integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
 			"dev": true,
 			"dependencies": {
-				"p-try": "^2.0.0"
+				"yocto-queue": "^1.0.0"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/babel-loader/node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+			"integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
 			"dev": true,
 			"dependencies": {
-				"p-limit": "^2.2.0"
+				"p-limit": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-loader/node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/babel-loader/node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+			"integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
 			"dev": true,
 			"engines": {
-				"node": ">=8"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			}
 		},
 		"node_modules/babel-loader/node_modules/pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+			"integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
 			"dev": true,
 			"dependencies": {
-				"find-up": "^4.0.0"
+				"find-up": "^6.3.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/babel-loader/node_modules/schema-utils": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
 			"dev": true,
 			"dependencies": {
-				"@types/json-schema": "^7.0.5",
-				"ajv": "^6.12.4",
-				"ajv-keywords": "^3.5.2"
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
 			},
 			"engines": {
-				"node": ">= 8.9.0"
+				"node": ">= 12.13.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"node_modules/babel-loader/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+		"node_modules/babel-loader/node_modules/yocto-queue": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
+			"integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
 			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
+			"license": "MIT",
+			"engines": {
+				"node": ">=12.20"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/babel-plugin-add-react-displayname": {
@@ -20542,7 +19273,6 @@
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
 			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-			"dev": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.0.0",
 				"@istanbuljs/load-nyc-config": "^1.0.0",
@@ -20555,10 +19285,9 @@
 			}
 		},
 		"node_modules/babel-plugin-jest-hoist": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
-			"integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
-			"dev": true,
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+			"integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
 			"dependencies": {
 				"@babel/template": "^7.3.3",
 				"@babel/types": "^7.3.3",
@@ -20570,97 +19299,65 @@
 			}
 		},
 		"node_modules/babel-plugin-macros": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
-			"integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
-			"dependencies": {
-				"@babel/runtime": "^7.7.2",
-				"cosmiconfig": "^6.0.0",
-				"resolve": "^1.12.0"
-			}
-		},
-		"node_modules/babel-plugin-macros/node_modules/cosmiconfig": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-			"integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+			"integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
 			"dependencies": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.1.0",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.7.2"
+				"@babel/runtime": "^7.12.5",
+				"cosmiconfig": "^7.0.0",
+				"resolve": "^1.19.0"
 			},
 			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-plugin-macros/node_modules/path-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"engines": {
-				"node": ">=8"
+				"node": ">=10",
+				"npm": ">=6"
 			}
 		},
-		"node_modules/babel-plugin-named-exports-order": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/babel-plugin-named-exports-order/-/babel-plugin-named-exports-order-0.0.2.tgz",
-			"integrity": "sha512-OgOYHOLoRK+/mvXU9imKHlG6GkPLYrUCvFXG/CM93R/aNNO8pOOF4aS+S8CCHMDQoNSeiOYEZb/G6RwL95Jktw==",
-			"dev": true
-		},
 		"node_modules/babel-plugin-polyfill-corejs2": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz",
-			"integrity": "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==",
+			"version": "0.4.11",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+			"integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/compat-data": "^7.13.11",
-				"@babel/helper-define-polyfill-provider": "^0.2.4",
-				"semver": "^6.1.1"
+				"@babel/compat-data": "^7.22.6",
+				"@babel/helper-define-polyfill-provider": "^0.6.2",
+				"semver": "^6.3.1"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
 			"version": "6.3.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
 			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"license": "ISC",
 			"bin": {
 				"semver": "bin/semver.js"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-corejs3": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz",
-			"integrity": "sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg==",
+			"version": "0.10.6",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+			"integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.2.4",
-				"core-js-compat": "^3.18.0"
+				"@babel/helper-define-polyfill-provider": "^0.6.2",
+				"core-js-compat": "^3.38.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-regenerator": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz",
-			"integrity": "sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==",
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
+			"integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.2.4"
+				"@babel/helper-define-polyfill-provider": "^0.6.2"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/babel-plugin-react-docgen": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz",
-			"integrity": "sha512-UQ0NmGHj/HAqi5Bew8WvNfCk8wSsmdgNd8ZdMjBCICtyCJCq9LiqgqvjCYe570/Wg7AQArSq1VQ60Dd/CHN7mQ==",
-			"dev": true,
-			"dependencies": {
-				"ast-types": "^0.14.2",
-				"lodash": "^4.17.15",
-				"react-docgen": "^5.0.0"
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/babel-plugin-react-native-classname-to-style": {
@@ -20681,7 +19378,16 @@
 		"node_modules/babel-plugin-syntax-trailing-function-commas": {
 			"version": "7.0.0-beta.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz",
-			"integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ=="
+			"integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==",
+			"dev": true
+		},
+		"node_modules/babel-plugin-transform-flow-enums": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-enums/-/babel-plugin-transform-flow-enums-0.0.2.tgz",
+			"integrity": "sha512-g4aaCrDDOsWjbm0PUUeVnkcVd6AKJsVc/MbnPhEotEpkeJQP6b8nzewohQi7+QS8UyPehOhGWn0nOwjvWpmMvQ==",
+			"dependencies": {
+				"@babel/plugin-syntax-flow": "^7.12.1"
+			}
 		},
 		"node_modules/babel-plugin-transform-remove-console": {
 			"version": "6.9.4",
@@ -20693,7 +19399,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
 			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-			"dev": true,
 			"dependencies": {
 				"@babel/plugin-syntax-async-generators": "^7.8.4",
 				"@babel/plugin-syntax-bigint": "^7.8.3",
@@ -20716,6 +19421,7 @@
 			"version": "3.4.0",
 			"resolved": "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz",
 			"integrity": "sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==",
+			"dev": true,
 			"dependencies": {
 				"@babel/plugin-proposal-class-properties": "^7.0.0",
 				"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
@@ -20750,12 +19456,11 @@
 			}
 		},
 		"node_modules/babel-preset-jest": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
-			"integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
-			"dev": true,
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+			"integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
 			"dependencies": {
-				"babel-plugin-jest-hoist": "^29.5.0",
+				"babel-plugin-jest-hoist": "^29.6.3",
 				"babel-preset-current-node-syntax": "^1.0.0"
 			},
 			"engines": {
@@ -20765,21 +19470,75 @@
 				"@babel/core": "^7.0.0"
 			}
 		},
+		"node_modules/babel-runtime": {
+			"version": "6.25.0",
+			"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz",
+			"integrity": "sha512-zeCYxDePWYAT/DfmQWIHsMSFW2vv45UIwIAMjGvQVsTd47RwsiRH0uK1yzyWZ7LDBKdhnGDPM6NYEO5CZyhPrg==",
+			"dependencies": {
+				"core-js": "^2.4.0",
+				"regenerator-runtime": "^0.10.0"
+			}
+		},
+		"node_modules/babel-runtime/node_modules/core-js": {
+			"version": "2.6.12",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+			"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+			"deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+			"hasInstallScript": true
+		},
+		"node_modules/babel-runtime/node_modules/regenerator-runtime": {
+			"version": "0.10.5",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+			"integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w=="
+		},
 		"node_modules/bail": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz",
-			"integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==",
-			"dev": true
+			"integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg=="
 		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
 		},
+		"node_modules/bare-events": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.1.tgz",
+			"integrity": "sha512-9GYPpsPFvrWBkelIhOhTWtkeZxVxZOdb3VnFTCzlOo3OjvmTvzLoZFUT8kNFACx0vJej6QPney1Cf9BvzCNE/A==",
+			"optional": true
+		},
+		"node_modules/bare-fs": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.2.2.tgz",
+			"integrity": "sha512-X9IqgvyB0/VA5OZJyb5ZstoN62AzD7YxVGog13kkfYWYqJYcK0kcqLZ6TrmH5qr4/8//ejVcX4x/a0UvaogXmA==",
+			"optional": true,
+			"dependencies": {
+				"bare-events": "^2.0.0",
+				"bare-os": "^2.0.0",
+				"bare-path": "^2.0.0",
+				"streamx": "^2.13.0"
+			}
+		},
+		"node_modules/bare-os": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.2.1.tgz",
+			"integrity": "sha512-OwPyHgBBMkhC29Hl3O4/YfxW9n7mdTr2+SsO29XBWKKJsbgj3mnorDB80r5TiCQgQstgE5ga1qNYrpes6NvX2w==",
+			"optional": true
+		},
+		"node_modules/bare-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.0.tgz",
+			"integrity": "sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==",
+			"optional": true,
+			"dependencies": {
+				"bare-os": "^2.1.0"
+			}
+		},
 		"node_modules/base": {
 			"version": "0.11.2",
 			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
 			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"dev": true,
 			"dependencies": {
 				"cache-base": "^1.0.1",
 				"class-utils": "^0.3.5",
@@ -20797,6 +19556,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
 			"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+			"dev": true,
 			"dependencies": {
 				"is-descriptor": "^1.0.0"
 			},
@@ -20804,39 +19564,17 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/base/node_modules/is-accessor-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-			"dependencies": {
-				"kind-of": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/base/node_modules/is-data-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-			"dependencies": {
-				"kind-of": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/base/node_modules/is-descriptor": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+			"integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+			"dev": true,
 			"dependencies": {
-				"is-accessor-descriptor": "^1.0.0",
-				"is-data-descriptor": "^1.0.0",
-				"kind-of": "^6.0.2"
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/base64-js": {
@@ -20880,7 +19618,6 @@
 			"version": "5.0.3",
 			"resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz",
 			"integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.0.0"
 			}
@@ -20888,8 +19625,7 @@
 		"node_modules/batch": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-			"dev": true
+			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
 		},
 		"node_modules/before-after-hook": {
 			"version": "1.4.0",
@@ -20952,7 +19688,6 @@
 			"version": "1.6.51",
 			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
 			"integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.6"
 			}
@@ -20961,7 +19696,6 @@
 			"version": "5.2.2",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
 			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-			"dev": true,
 			"engines": {
 				"node": "*"
 			}
@@ -20980,12 +19714,14 @@
 			}
 		},
 		"node_modules/binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-			"dev": true,
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+			"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
 			"engines": {
 				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/bindings": {
@@ -21065,7 +19801,6 @@
 			"version": "1.20.1",
 			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
 			"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-			"dev": true,
 			"dependencies": {
 				"bytes": "3.1.2",
 				"content-type": "~1.0.4",
@@ -21089,7 +19824,6 @@
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
 			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.8"
 			}
@@ -21098,7 +19832,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -21107,7 +19840,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
 			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.8"
 			}
@@ -21116,7 +19848,6 @@
 			"version": "0.4.24",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
 			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"dev": true,
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			},
@@ -21128,7 +19859,6 @@
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
 			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-			"dev": true,
 			"dependencies": {
 				"ee-first": "1.1.1"
 			},
@@ -21136,16 +19866,10 @@
 				"node": ">= 0.8"
 			}
 		},
-		"node_modules/body-scroll-lock": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz",
-			"integrity": "sha512-Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg=="
-		},
 		"node_modules/bonjour-service": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
 			"integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
-			"dev": true,
 			"dependencies": {
 				"array-flatten": "^2.1.2",
 				"dns-equal": "^1.0.0",
@@ -21156,8 +19880,7 @@
 		"node_modules/bonjour-service/node_modules/array-flatten": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-			"dev": true
+			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
 		},
 		"node_modules/boolbase": {
 			"version": "1.0.0",
@@ -21177,7 +19900,6 @@
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
 			"integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
-			"dev": true,
 			"dependencies": {
 				"big-integer": "^1.6.44"
 			},
@@ -21195,11 +19917,12 @@
 			}
 		},
 		"node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+			"license": "MIT",
 			"dependencies": {
-				"fill-range": "^7.0.1"
+				"fill-range": "^7.1.1"
 			},
 			"engines": {
 				"node": ">=8"
@@ -21265,20 +19988,23 @@
 			}
 		},
 		"node_modules/browserify-sign": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+			"integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
 			"dev": true,
 			"dependencies": {
-				"bn.js": "^5.1.1",
-				"browserify-rsa": "^4.0.1",
+				"bn.js": "^5.2.1",
+				"browserify-rsa": "^4.1.0",
 				"create-hash": "^1.2.0",
 				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.3",
+				"elliptic": "^6.5.4",
 				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.5",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
+				"parse-asn1": "^5.1.6",
+				"readable-stream": "^3.6.2",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 4"
 			}
 		},
 		"node_modules/browserify-sign/node_modules/inherits": {
@@ -21331,9 +20057,9 @@
 			}
 		},
 		"node_modules/browserslist": {
-			"version": "4.21.10",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-			"integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+			"version": "4.24.0",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+			"integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -21349,10 +20075,10 @@
 				}
 			],
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001517",
-				"electron-to-chromium": "^1.4.477",
-				"node-releases": "^2.0.13",
-				"update-browserslist-db": "^1.0.11"
+				"caniuse-lite": "^1.0.30001663",
+				"electron-to-chromium": "^1.5.28",
+				"node-releases": "^2.0.18",
+				"update-browserslist-db": "^1.1.0"
 			},
 			"bin": {
 				"browserslist": "cli.js"
@@ -21390,7 +20116,6 @@
 			"version": "0.2.13",
 			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
 			"integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-			"dev": true,
 			"engines": {
 				"node": "*"
 			}
@@ -21428,7 +20153,6 @@
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
 			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			},
@@ -21445,14 +20169,12 @@
 		"node_modules/builtins": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-			"integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==",
-			"dev": true
+			"integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ=="
 		},
 		"node_modules/bundle-name": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz",
 			"integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==",
-			"dev": true,
 			"dependencies": {
 				"run-applescript": "^5.0.0"
 			},
@@ -21480,87 +20202,6 @@
 				"node": ">= 0.8"
 			}
 		},
-		"node_modules/c8": {
-			"version": "7.14.0",
-			"resolved": "https://registry.npmjs.org/c8/-/c8-7.14.0.tgz",
-			"integrity": "sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==",
-			"dev": true,
-			"dependencies": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@istanbuljs/schema": "^0.1.3",
-				"find-up": "^5.0.0",
-				"foreground-child": "^2.0.0",
-				"istanbul-lib-coverage": "^3.2.0",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-reports": "^3.1.4",
-				"rimraf": "^3.0.2",
-				"test-exclude": "^6.0.0",
-				"v8-to-istanbul": "^9.0.0",
-				"yargs": "^16.2.0",
-				"yargs-parser": "^20.2.9"
-			},
-			"bin": {
-				"c8": "bin/c8.js"
-			},
-			"engines": {
-				"node": ">=10.12.0"
-			}
-		},
-		"node_modules/c8/node_modules/find-up": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-			"dev": true,
-			"dependencies": {
-				"locate-path": "^6.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/c8/node_modules/locate-path": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-			"dev": true,
-			"dependencies": {
-				"p-locate": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/c8/node_modules/p-locate": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-			"dev": true,
-			"dependencies": {
-				"p-limit": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/c8/node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/cacache": {
 			"version": "12.0.4",
 			"resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
@@ -21647,6 +20288,7 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
 			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+			"dev": true,
 			"dependencies": {
 				"collection-visit": "^1.0.0",
 				"component-emitter": "^1.2.1",
@@ -21666,7 +20308,6 @@
 			"version": "5.0.4",
 			"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
 			"integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.6.0"
 			}
@@ -21675,7 +20316,6 @@
 			"version": "7.0.4",
 			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
 			"integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
-			"dev": true,
 			"dependencies": {
 				"clone-response": "^1.0.2",
 				"get-stream": "^5.1.0",
@@ -21690,13 +20330,18 @@
 			}
 		},
 		"node_modules/call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"dev": true,
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"set-function-length": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -21770,7 +20415,6 @@
 			"version": "6.2.2",
 			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
 			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-			"dev": true,
 			"dependencies": {
 				"camelcase": "^5.3.1",
 				"map-obj": "^4.0.0",
@@ -21787,7 +20431,6 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
 			"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -21804,7 +20447,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
 			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-			"dev": true,
 			"dependencies": {
 				"browserslist": "^4.0.0",
 				"caniuse-lite": "^1.0.0",
@@ -21813,9 +20455,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001538",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
-			"integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==",
+			"version": "1.0.30001667",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz",
+			"integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -21853,8 +20495,7 @@
 		"node_modules/ccount": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz",
-			"integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==",
-			"dev": true
+			"integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw=="
 		},
 		"node_modules/chainsaw": {
 			"version": "0.1.0",
@@ -21934,7 +20575,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
 			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -21942,38 +20582,32 @@
 		"node_modules/character-entities": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
-			"integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==",
-			"dev": true
+			"integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ=="
 		},
 		"node_modules/character-entities-html4": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz",
-			"integrity": "sha512-sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==",
-			"dev": true
+			"integrity": "sha512-sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw=="
 		},
 		"node_modules/character-entities-legacy": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz",
-			"integrity": "sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==",
-			"dev": true
+			"integrity": "sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA=="
 		},
 		"node_modules/character-reference-invalid": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz",
-			"integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==",
-			"dev": true
+			"integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ=="
 		},
 		"node_modules/chardet": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-			"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-			"dev": true
+			"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
 		},
 		"node_modules/check-node-version": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-4.1.0.tgz",
 			"integrity": "sha512-TSXGsyfW5/xY2QseuJn8/hleO2AU7HxVCdkc900jp1vcfzF840GkjvRT7CHl8sRtWn23n3X3k0cwH9RXeRwhfw==",
-			"dev": true,
 			"dependencies": {
 				"chalk": "^3.0.0",
 				"map-values": "^1.0.1",
@@ -21993,7 +20627,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
 			"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.1.0",
 				"supports-color": "^7.1.0"
@@ -22006,7 +20639,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -22015,7 +20647,6 @@
 			"version": "6.3.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
 			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
 			"bin": {
 				"semver": "bin/semver.js"
 			}
@@ -22024,7 +20655,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -22033,16 +20663,9 @@
 			}
 		},
 		"node_modules/chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://paulmillr.com/funding/"
-				}
-			],
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+			"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
 			"dependencies": {
 				"anymatch": "~3.1.2",
 				"braces": "~3.0.2",
@@ -22055,6 +20678,9 @@
 			"engines": {
 				"node": ">= 8.10.0"
 			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			},
 			"optionalDependencies": {
 				"fsevents": "~2.3.2"
 			}
@@ -22063,7 +20689,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -22081,7 +20706,6 @@
 			"version": "0.15.2",
 			"resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.2.tgz",
 			"integrity": "sha512-zdLEwNo3aUVzIhKhTtXfxhdvZhUghrnmkvcAq2NoDd+LeOHKf03H5jwZ8T/STsAlzyALkBVK552iaG1fGf1xVQ==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"escape-string-regexp": "^4.0.0",
@@ -22099,7 +20723,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
 			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -22111,7 +20734,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
 			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-			"dev": true,
 			"dependencies": {
 				"is-docker": "^2.0.0"
 			},
@@ -22123,7 +20745,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
 			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-			"dev": true,
 			"engines": {
 				"node": ">=6.0"
 			}
@@ -22132,7 +20753,6 @@
 			"version": "0.4.16",
 			"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.16.tgz",
 			"integrity": "sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==",
-			"dev": true,
 			"dependencies": {
 				"mitt": "3.0.0"
 			},
@@ -22140,10 +20760,56 @@
 				"devtools-protocol": "*"
 			}
 		},
+		"node_modules/chromium-edge-launcher": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/chromium-edge-launcher/-/chromium-edge-launcher-1.0.0.tgz",
+			"integrity": "sha512-pgtgjNKZ7i5U++1g1PWv75umkHvhVTDOQIZ+sjeUX9483S7Y6MUvO0lrd7ShGlQlFHMN4SwKTCq/X8hWrbv2KA==",
+			"dependencies": {
+				"@types/node": "*",
+				"escape-string-regexp": "^4.0.0",
+				"is-wsl": "^2.2.0",
+				"lighthouse-logger": "^1.0.0",
+				"mkdirp": "^1.0.4",
+				"rimraf": "^3.0.2"
+			}
+		},
+		"node_modules/chromium-edge-launcher/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/chromium-edge-launcher/node_modules/is-wsl": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+			"dependencies": {
+				"is-docker": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/chromium-edge-launcher/node_modules/mkdirp": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
 		"node_modules/ci-info": {
-			"version": "3.8.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-			"integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+			"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
 			"funding": [
 				{
 					"type": "github",
@@ -22164,16 +20830,34 @@
 				"safe-buffer": "^5.0.1"
 			}
 		},
+		"node_modules/citty": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz",
+			"integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==",
+			"dev": true,
+			"dependencies": {
+				"consola": "^3.2.3"
+			}
+		},
+		"node_modules/citty/node_modules/consola": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz",
+			"integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==",
+			"dev": true,
+			"engines": {
+				"node": "^14.18.0 || >=16.10.0"
+			}
+		},
 		"node_modules/cjs-module-lexer": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
-			"integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
-			"dev": true
+			"integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
 		},
 		"node_modules/class-utils": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
 			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+			"dev": true,
 			"dependencies": {
 				"arr-union": "^3.1.0",
 				"define-property": "^0.2.5",
@@ -22188,6 +20872,7 @@
 			"version": "0.2.5",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dev": true,
 			"dependencies": {
 				"is-descriptor": "^0.1.0"
 			},
@@ -22195,15 +20880,10 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/classnames": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-			"integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
-		},
 		"node_modules/clean-css": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
-			"integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
+			"version": "5.3.3",
+			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+			"integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
 			"dev": true,
 			"dependencies": {
 				"source-map": "~0.6.0"
@@ -22216,7 +20896,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
 			"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -22225,7 +20904,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz",
 			"integrity": "sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A==",
-			"dev": true,
 			"dependencies": {
 				"@types/webpack": "^4.4.31",
 				"del": "^4.1.1"
@@ -22367,18 +21045,12 @@
 		"node_modules/cli-width": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-			"dev": true
+			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
 		},
-		"node_modules/clipboard": {
-			"version": "2.0.8",
-			"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
-			"integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
-			"dependencies": {
-				"good-listener": "^1.2.2",
-				"select": "^1.1.2",
-				"tiny-emitter": "^2.0.0"
-			}
+		"node_modules/client-zip": {
+			"version": "2.4.5",
+			"resolved": "https://registry.npmjs.org/client-zip/-/client-zip-2.4.5.tgz",
+			"integrity": "sha512-4y4d5ZeTH/szIAMQeC8ju67pxtvj+3u20wMGwOFrZk+pegy3aSEA2JkwgC8XVDTXP/Iqn1gyqNQXmkyBp4KLEQ=="
 		},
 		"node_modules/cliui": {
 			"version": "6.0.0",
@@ -22448,32 +21120,10 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/clone-regexp": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-			"integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-			"dev": true,
-			"dependencies": {
-				"is-regexp": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/clone-regexp/node_modules/is-regexp": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-			"integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/clone-response": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
 			"integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-			"dev": true,
 			"dependencies": {
 				"mimic-response": "^1.0.0"
 			},
@@ -22481,6 +21131,14 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/clsx": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/cmd-shim": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz",
@@ -22490,24 +21148,10 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/cmdk": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cmdk/-/cmdk-0.2.0.tgz",
-			"integrity": "sha512-JQpKvEOb86SnvMZbYaFKYhvzFntWBeSZdyii0rZPhKJj9uwJBxu4DaVYDrRN7r3mPop56oPhRw+JYWTKs66TYw==",
-			"dependencies": {
-				"@radix-ui/react-dialog": "1.0.0",
-				"command-score": "0.1.2"
-			},
-			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
-			}
-		},
 		"node_modules/co": {
 			"version": "4.6.0",
 			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
 			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-			"dev": true,
 			"engines": {
 				"iojs": ">= 1.0.0",
 				"node": ">= 0.12.0"
@@ -22525,19 +21169,18 @@
 		"node_modules/collapse-white-space": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
-			"integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==",
-			"dev": true
+			"integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw=="
 		},
 		"node_modules/collect-v8-coverage": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-			"dev": true
+			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
 		},
 		"node_modules/collection-visit": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
 			"integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+			"dev": true,
 			"dependencies": {
 				"map-visit": "^1.0.0",
 				"object-visit": "^1.0.0"
@@ -22652,7 +21295,6 @@
 			"version": "1.0.8",
 			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
 			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
 			"dependencies": {
 				"delayed-stream": "~1.0.0"
 			},
@@ -22665,16 +21307,10 @@
 			"resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
 			"integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
 		},
-		"node_modules/command-score": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/command-score/-/command-score-0.1.2.tgz",
-			"integrity": "sha512-VtDvQpIJBvBatnONUsPzXYFVKQQAhuf3XTNOAsdBxCNO/QCtUUd8LSgjn0GVarBkCad6aJCZfXgrjYbl/KRr7w=="
-		},
 		"node_modules/commander": {
 			"version": "9.2.0",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-9.2.0.tgz",
 			"integrity": "sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w==",
-			"dev": true,
 			"engines": {
 				"node": "^12.20.0 || >=14"
 			}
@@ -22683,7 +21319,6 @@
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.0.tgz",
 			"integrity": "sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==",
-			"dev": true,
 			"engines": {
 				"node": ">= 12.0.0"
 			}
@@ -22691,8 +21326,7 @@
 		"node_modules/common-path-prefix": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-			"integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-			"dev": true
+			"integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="
 		},
 		"node_modules/commondir": {
 			"version": "1.0.1",
@@ -22725,7 +21359,8 @@
 		"node_modules/component-emitter": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+			"dev": true
 		},
 		"node_modules/compress-commons": {
 			"version": "5.0.1",
@@ -22792,11 +21427,6 @@
 				"ms": "2.0.0"
 			}
 		},
-		"node_modules/compute-scroll-into-view": {
-			"version": "1.0.16",
-			"resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz",
-			"integrity": "sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ=="
-		},
 		"node_modules/computed-style": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/computed-style/-/computed-style-0.1.4.tgz",
@@ -22811,7 +21441,6 @@
 			"version": "1.6.2",
 			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
 			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-			"dev": true,
 			"engines": [
 				"node >= 0.8"
 			],
@@ -22961,7 +21590,6 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
 			"integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-			"dev": true,
 			"dependencies": {
 				"dot-prop": "^5.2.0",
 				"graceful-fs": "^4.1.2",
@@ -22978,7 +21606,6 @@
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
 			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-			"dev": true,
 			"dependencies": {
 				"imurmurhash": "^0.1.4",
 				"is-typedarray": "^1.0.0",
@@ -23004,7 +21631,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
 			"integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.8"
 			}
@@ -23055,7 +21681,6 @@
 			"version": "0.5.4",
 			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
 			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-			"dev": true,
 			"dependencies": {
 				"safe-buffer": "5.2.1"
 			},
@@ -23067,7 +21692,6 @@
 			"version": "5.2.1",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
 			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-			"dev": true,
 			"funding": [
 				{
 					"type": "github",
@@ -23087,7 +21711,6 @@
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
 			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -23361,7 +21984,6 @@
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
 			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -23369,8 +21991,7 @@
 		"node_modules/cookie-signature": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-			"dev": true
+			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
 		},
 		"node_modules/copy-concurrently": {
 			"version": "1.0.5",
@@ -23434,6 +22055,7 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
 			"integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -23441,14 +22063,12 @@
 		"node_modules/copy-dir": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/copy-dir/-/copy-dir-1.3.0.tgz",
-			"integrity": "sha512-Q4+qBFnN4bwGwvtXXzbp4P/4iNk0MaiGAzvQ8OiMtlLjkIKjmNN689uVzShSM0908q7GoFHXIPx4zi75ocoaHw==",
-			"dev": true
+			"integrity": "sha512-Q4+qBFnN4bwGwvtXXzbp4P/4iNk0MaiGAzvQ8OiMtlLjkIKjmNN689uVzShSM0908q7GoFHXIPx4zi75ocoaHw=="
 		},
 		"node_modules/copy-webpack-plugin": {
 			"version": "10.2.0",
 			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.0.tgz",
 			"integrity": "sha512-my6iXII95c78w14HzYCNya5TlJYa44lOppAge5GSTMM1SyDxNsVGCJvhP4/ld6snm8lzjn3XOonMZD6s1L86Og==",
-			"dev": true,
 			"dependencies": {
 				"fast-glob": "^3.2.7",
 				"glob-parent": "^6.0.1",
@@ -23469,15 +22089,15 @@
 			}
 		},
 		"node_modules/copy-webpack-plugin/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-			"dev": true,
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"license": "MIT",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
 				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+				"require-from-string": "^2.0.2"
 			},
 			"funding": {
 				"type": "github",
@@ -23488,7 +22108,6 @@
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
 			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.3"
 			},
@@ -23500,7 +22119,6 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
 			"integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -23512,7 +22130,6 @@
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
 			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-			"dev": true,
 			"dependencies": {
 				"is-glob": "^4.0.3"
 			},
@@ -23524,7 +22141,6 @@
 			"version": "12.2.0",
 			"resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
 			"integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
-			"dev": true,
 			"dependencies": {
 				"array-union": "^3.0.1",
 				"dir-glob": "^3.0.1",
@@ -23543,14 +22159,12 @@
 		"node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
 		},
 		"node_modules/copy-webpack-plugin/node_modules/schema-utils": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
 			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-			"dev": true,
 			"dependencies": {
 				"@types/json-schema": "^7.0.9",
 				"ajv": "^8.9.0",
@@ -23566,10 +22180,9 @@
 			}
 		},
 		"node_modules/copy-webpack-plugin/node_modules/serialize-javascript": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-			"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-			"dev": true,
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
 			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
@@ -23578,7 +22191,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
 			"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -23587,9 +22199,9 @@
 			}
 		},
 		"node_modules/core-js": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
-			"integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==",
+			"version": "3.38.1",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
+			"integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
 			"hasInstallScript": true,
 			"funding": {
 				"type": "opencollective",
@@ -23597,15 +22209,15 @@
 			}
 		},
 		"node_modules/core-js-builder": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.31.0.tgz",
-			"integrity": "sha512-qx8vgRM3U4+IjlMqNQl7Vj53ectTm1FpzJ+nJSQuT865StCXvusxCO+HuASWIKlkoc+96AfnFa2MEdqvGep9nA==",
+			"version": "3.38.1",
+			"resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.38.1.tgz",
+			"integrity": "sha512-SxxFz0xLPX+MMCC3QtRavu5rzhFe28QqiaQKko+25DrUEsPYbNasZACUkKDDGfInxJiUk/9/PhmHwIdyN4vSKA==",
 			"dev": true,
 			"dependencies": {
-				"core-js": "3.31.0",
-				"core-js-compat": "3.31.0",
-				"mkdirp": ">=0.5.5 <1",
-				"webpack": ">=4.46.0 <5"
+				"core-js": "3.38.1",
+				"core-js-compat": "3.38.1",
+				"mkdirp": ">=0.5.6 <1",
+				"webpack": ">=4.47.0 <5"
 			},
 			"engines": {
 				"node": ">=8.9.0"
@@ -23777,10 +22389,11 @@
 			}
 		},
 		"node_modules/core-js-builder/node_modules/terser-webpack-plugin": {
-			"version": "1.4.5",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-			"integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
+			"version": "1.4.6",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.6.tgz",
+			"integrity": "sha512-2lBVf/VMVIddjSn3GqbT90GvIJ/eYXJkt8cTzU7NbjKqK8fwv18Ftr4PlbF46b/e88743iZFL5Dtr/rC4hjIeA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"cacache": "^12.0.2",
 				"find-cache-dir": "^2.1.0",
@@ -23800,9 +22413,9 @@
 			}
 		},
 		"node_modules/core-js-builder/node_modules/webpack": {
-			"version": "4.46.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
-			"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
+			"version": "4.47.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
+			"integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
 			"dev": true,
 			"dependencies": {
 				"@webassemblyjs/ast": "1.9.0",
@@ -23859,11 +22472,11 @@
 			}
 		},
 		"node_modules/core-js-compat": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-			"integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
+			"version": "3.38.1",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
+			"integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
 			"dependencies": {
-				"browserslist": "^4.21.5"
+				"browserslist": "^4.23.3"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -23874,7 +22487,6 @@
 			"version": "3.31.0",
 			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.31.0.tgz",
 			"integrity": "sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg==",
-			"dev": true,
 			"hasInstallScript": true,
 			"funding": {
 				"type": "opencollective",
@@ -24014,39 +22626,18 @@
 			}
 		},
 		"node_modules/cross-fetch": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-			"integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
-			"dev": true,
-			"dependencies": {
-				"node-fetch": "2.6.7"
-			}
-		},
-		"node_modules/cross-fetch/node_modules/node-fetch": {
-			"version": "2.6.7",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-			"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-			"dev": true,
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+			"integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+			"license": "MIT",
 			"dependencies": {
-				"whatwg-url": "^5.0.0"
-			},
-			"engines": {
-				"node": "4.x || >=6.0.0"
-			},
-			"peerDependencies": {
-				"encoding": "^0.1.0"
-			},
-			"peerDependenciesMeta": {
-				"encoding": {
-					"optional": true
-				}
+				"node-fetch": "^2.6.12"
 			}
 		},
 		"node_modules/cross-spawn": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
 			"integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
-			"dev": true,
 			"dependencies": {
 				"lru-cache": "^4.0.1",
 				"shebang-command": "^1.2.0",
@@ -24079,7 +22670,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
 			"integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -24087,8 +22677,7 @@
 		"node_modules/csp_evaluator": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/csp_evaluator/-/csp_evaluator-1.1.1.tgz",
-			"integrity": "sha512-N3ASg0C4kNPUaNxt1XAvzHIVuzdtr8KLgfk1O8WDyimp1GisPAHESupArO2ieHk9QWbrJ/WkQODyh21Ps/xhxw==",
-			"dev": true
+			"integrity": "sha512-N3ASg0C4kNPUaNxt1XAvzHIVuzdtr8KLgfk1O8WDyimp1GisPAHESupArO2ieHk9QWbrJ/WkQODyh21Ps/xhxw=="
 		},
 		"node_modules/css": {
 			"version": "2.2.4",
@@ -24113,7 +22702,6 @@
 			"version": "6.4.1",
 			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
 			"integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
-			"dev": true,
 			"engines": {
 				"node": "^10 || ^12 || >=14"
 			},
@@ -24121,11 +22709,18 @@
 				"postcss": "^8.0.9"
 			}
 		},
+		"node_modules/css-functions-list": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz",
+			"integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==",
+			"engines": {
+				"node": ">=12 || >=16"
+			}
+		},
 		"node_modules/css-loader": {
 			"version": "6.2.0",
 			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.2.0.tgz",
 			"integrity": "sha512-/rvHfYRjIpymZblf49w8jYcRo2y9gj6rV8UroHGmBxKrIyGLokpycyKzp9OkitvqT29ZSpzJ0Ic7SpnJX3sC8g==",
-			"dev": true,
 			"dependencies": {
 				"icss-utils": "^5.1.0",
 				"postcss": "^8.2.15",
@@ -24150,8 +22745,7 @@
 		"node_modules/css-loader/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/css-mediaquery": {
 			"version": "0.1.2",
@@ -24300,7 +22894,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
 			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-			"dev": true,
 			"bin": {
 				"cssesc": "bin/cssesc"
 			},
@@ -24312,7 +22905,6 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz",
 			"integrity": "sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==",
-			"dev": true,
 			"dependencies": {
 				"cssnano-preset-default": "^6.0.1",
 				"lilconfig": "^2.1.0"
@@ -24332,7 +22924,6 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz",
 			"integrity": "sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==",
-			"dev": true,
 			"dependencies": {
 				"css-declaration-sorter": "^6.3.1",
 				"cssnano-utils": "^4.0.0",
@@ -24375,7 +22966,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.0.tgz",
 			"integrity": "sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==",
-			"dev": true,
 			"engines": {
 				"node": "^14 || ^16 || >=18.0"
 			},
@@ -24387,7 +22977,6 @@
 			"version": "5.0.5",
 			"resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
 			"integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
-			"dev": true,
 			"dependencies": {
 				"css-tree": "~2.2.0"
 			},
@@ -24400,7 +22989,6 @@
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
 			"integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
-			"dev": true,
 			"dependencies": {
 				"mdn-data": "2.0.28",
 				"source-map-js": "^1.0.1"
@@ -24413,28 +23001,26 @@
 		"node_modules/csso/node_modules/mdn-data": {
 			"version": "2.0.28",
 			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-			"integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
-			"dev": true
+			"integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g=="
 		},
 		"node_modules/csso/node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-			"dev": true,
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/cssstyle": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
-			"integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
-			"dev": true,
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.1.0.tgz",
+			"integrity": "sha512-h66W1URKpBS5YMI/V8PyXvTMFT8SupJ1IzoIV8IeBC/ji8WVmrO8dGlTi+2dh6whmdk6BiKJLD/ZBkhWbcg6nA==",
 			"dependencies": {
-				"rrweb-cssom": "^0.6.0"
+				"rrweb-cssom": "^0.7.1"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
 		"node_modules/csstype": {
@@ -24446,7 +23032,6 @@
 			"version": "0.10.0",
 			"resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
 			"integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
-			"dev": true,
 			"dependencies": {
 				"find-pkg": "^0.1.2",
 				"fs-exists-sync": "^0.1.0"
@@ -24456,16 +23041,15 @@
 			}
 		},
 		"node_modules/cyclist": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-			"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz",
+			"integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==",
 			"dev": true
 		},
 		"node_modules/damerau-levenshtein": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-			"integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-			"dev": true
+			"integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw=="
 		},
 		"node_modules/dargs": {
 			"version": "7.0.0",
@@ -24480,72 +23064,60 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz",
 			"integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 14"
 			}
 		},
 		"node_modules/data-urls": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
-			"integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
-			"dev": true,
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+			"integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
 			"dependencies": {
-				"abab": "^2.0.6",
-				"whatwg-mimetype": "^3.0.0",
-				"whatwg-url": "^12.0.0"
+				"whatwg-mimetype": "^4.0.0",
+				"whatwg-url": "^14.0.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
 		"node_modules/data-urls/node_modules/tr46": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-			"integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
-			"dev": true,
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
+			"integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
 			"dependencies": {
-				"punycode": "^2.3.0"
+				"punycode": "^2.3.1"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
 		"node_modules/data-urls/node_modules/webidl-conversions": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
 			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/data-urls/node_modules/whatwg-url": {
-			"version": "12.0.1",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-			"integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
-			"dev": true,
+			"version": "14.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
+			"integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
 			"dependencies": {
-				"tr46": "^4.1.1",
+				"tr46": "^5.0.0",
 				"webidl-conversions": "^7.0.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
 		"node_modules/date-fns": {
-			"version": "2.30.0",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-			"integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-			"dependencies": {
-				"@babel/runtime": "^7.21.0"
-			},
-			"engines": {
-				"node": ">=0.11"
-			},
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
+			"integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/date-fns"
+				"type": "github",
+				"url": "https://github.com/sponsors/kossnocorp"
 			}
 		},
 		"node_modules/dateformat": {
@@ -24558,9 +23130,9 @@
 			}
 		},
 		"node_modules/dayjs": {
-			"version": "1.11.9",
-			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz",
-			"integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA=="
+			"version": "1.11.10",
+			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
+			"integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
 		},
 		"node_modules/debug": {
 			"version": "4.3.4",
@@ -24604,7 +23176,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
 			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-			"dev": true,
 			"dependencies": {
 				"decamelize": "^1.1.0",
 				"map-obj": "^1.0.0"
@@ -24616,8 +23187,7 @@
 		"node_modules/decimal.js": {
 			"version": "10.4.3",
 			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-			"integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-			"dev": true
+			"integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
 		},
 		"node_modules/decode-uri-component": {
 			"version": "0.2.2",
@@ -24631,7 +23201,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
 			"integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-			"dev": true,
 			"dependencies": {
 				"mimic-response": "^3.1.0"
 			},
@@ -24646,7 +23215,6 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
 			"integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -24664,7 +23232,6 @@
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
 			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-			"dev": true,
 			"engines": {
 				"node": ">=4.0.0"
 			}
@@ -24678,8 +23245,7 @@
 		"node_modules/deep-is": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-			"dev": true
+			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
 		},
 		"node_modules/deepmerge": {
 			"version": "4.3.1",
@@ -24698,36 +23264,10 @@
 				"node": ">=16.0.0"
 			}
 		},
-		"node_modules/deepsignal": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/deepsignal/-/deepsignal-1.3.6.tgz",
-			"integrity": "sha512-yjd+vtiznL6YaMptOsKnEKkPr60OEApa+LRe+Qe6Ile/RfCOrELKk/YM3qVpXFZiyOI3Ng67GDEyjAlqVc697g==",
-			"peerDependencies": {
-				"@preact/signals": "^1.1.4",
-				"@preact/signals-core": "^1.3.1",
-				"@preact/signals-react": "^1.3.3",
-				"preact": "^10.16.0"
-			},
-			"peerDependenciesMeta": {
-				"@preact/signals": {
-					"optional": true
-				},
-				"@preact/signals-core": {
-					"optional": true
-				},
-				"@preact/signals-react": {
-					"optional": true
-				},
-				"preact": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/default-browser": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz",
 			"integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==",
-			"dev": true,
 			"dependencies": {
 				"bundle-name": "^3.0.0",
 				"default-browser-id": "^3.0.0",
@@ -24745,7 +23285,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz",
 			"integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==",
-			"dev": true,
 			"dependencies": {
 				"bplist-parser": "^0.2.0",
 				"untildify": "^4.0.0"
@@ -24761,7 +23300,6 @@
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
 			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -24775,7 +23313,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
 			"integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
-			"dev": true,
 			"dependencies": {
 				"cross-spawn": "^7.0.3",
 				"get-stream": "^6.0.1",
@@ -24798,7 +23335,6 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
 			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -24810,7 +23346,6 @@
 			"version": "4.3.1",
 			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
 			"integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=14.18.0"
 			}
@@ -24819,7 +23354,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
 			"integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-			"dev": true,
 			"engines": {
 				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			},
@@ -24831,7 +23365,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
 			"integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -24840,10 +23373,9 @@
 			}
 		},
 		"node_modules/default-browser/node_modules/npm-run-path": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-			"integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
-			"dev": true,
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+			"integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
 			"dependencies": {
 				"path-key": "^4.0.0"
 			},
@@ -24858,7 +23390,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
 			"integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -24870,7 +23401,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
 			"integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-			"dev": true,
 			"dependencies": {
 				"mimic-fn": "^4.0.0"
 			},
@@ -24885,7 +23415,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -24894,7 +23423,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -24906,7 +23434,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -24915,7 +23442,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
 			"integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -24927,7 +23453,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -24942,7 +23467,6 @@
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
 			"integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-			"dev": true,
 			"dependencies": {
 				"execa": "^5.0.0"
 			},
@@ -24954,7 +23478,6 @@
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
 			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -24968,7 +23491,6 @@
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
 			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"dev": true,
 			"dependencies": {
 				"cross-spawn": "^7.0.3",
 				"get-stream": "^6.0.0",
@@ -24991,7 +23513,6 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
 			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -25003,7 +23524,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
 			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.17.0"
 			}
@@ -25012,7 +23532,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
 			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -25024,7 +23543,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -25033,7 +23551,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
 			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.0.0"
 			},
@@ -25045,7 +23562,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
 			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
 			"dependencies": {
 				"mimic-fn": "^2.1.0"
 			},
@@ -25060,7 +23576,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -25069,7 +23584,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -25081,7 +23595,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -25090,7 +23603,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -25113,16 +23625,30 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
 			"integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
 		},
+		"node_modules/define-data-property": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+			"dependencies": {
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/define-lazy-prop": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
 			"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -25131,7 +23657,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
 			"integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-			"dev": true,
 			"dependencies": {
 				"has-property-descriptors": "^1.0.0",
 				"object-keys": "^1.1.1"
@@ -25147,6 +23672,7 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
 			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+			"dev": true,
 			"dependencies": {
 				"is-descriptor": "^1.0.2",
 				"isobject": "^3.0.1"
@@ -25155,52 +23681,29 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/define-property/node_modules/is-accessor-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-			"dependencies": {
-				"kind-of": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/define-property/node_modules/is-data-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-			"dependencies": {
-				"kind-of": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/define-property/node_modules/is-descriptor": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+			"integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+			"dev": true,
 			"dependencies": {
-				"is-accessor-descriptor": "^1.0.0",
-				"is-data-descriptor": "^1.0.0",
-				"kind-of": "^6.0.2"
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/defu": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/defu/-/defu-6.1.2.tgz",
-			"integrity": "sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==",
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
+			"integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
 			"dev": true
 		},
 		"node_modules/degenerator": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
 			"integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
-			"dev": true,
 			"dependencies": {
 				"ast-types": "^0.13.4",
 				"escodegen": "^2.1.0",
@@ -25214,7 +23717,6 @@
 			"version": "0.13.4",
 			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
 			"integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
-			"dev": true,
 			"dependencies": {
 				"tslib": "^2.0.1"
 			},
@@ -25226,7 +23728,6 @@
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
 			"integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-			"dev": true,
 			"dependencies": {
 				"@types/glob": "^7.1.1",
 				"globby": "^6.1.0",
@@ -25244,7 +23745,6 @@
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
 			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -25264,7 +23764,6 @@
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
 			"integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-			"dev": true,
 			"dependencies": {
 				"array-union": "^1.0.1",
 				"glob": "^7.0.3",
@@ -25280,7 +23779,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
 			"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -25289,7 +23787,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
 			"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -25298,7 +23795,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
 			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -25307,7 +23803,6 @@
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-			"dev": true,
 			"dependencies": {
 				"glob": "^7.1.3"
 			},
@@ -25319,7 +23814,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
 			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.4.0"
 			}
@@ -25344,7 +23838,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
 			"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -25362,8 +23855,7 @@
 		"node_modules/deprecation": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-			"integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
-			"dev": true
+			"integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
 		},
 		"node_modules/dequal": {
 			"version": "2.0.3",
@@ -25375,9 +23867,9 @@
 			}
 		},
 		"node_modules/des.js": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+			"integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
 			"dev": true,
 			"dependencies": {
 				"inherits": "^2.0.1",
@@ -25397,7 +23889,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
 			"integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==",
-			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
@@ -25416,7 +23907,6 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
 			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -25424,8 +23914,7 @@
 		"node_modules/detect-node": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-			"dev": true
+			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
 		},
 		"node_modules/detect-node-es": {
 			"version": "1.1.0",
@@ -25610,10 +24099,10 @@
 			}
 		},
 		"node_modules/devtools-protocol": {
-			"version": "0.0.981744",
-			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
-			"integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
-			"dev": true
+			"version": "0.0.1312386",
+			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+			"integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/diff": {
 			"version": "4.0.2",
@@ -25624,10 +24113,9 @@
 			}
 		},
 		"node_modules/diff-sequences": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
-			"integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
-			"dev": true,
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+			"integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
@@ -25653,7 +24141,6 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
 			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-			"dev": true,
 			"dependencies": {
 				"path-type": "^4.0.0"
 			},
@@ -25665,7 +24152,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
 			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -25673,14 +24159,12 @@
 		"node_modules/dns-equal": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-			"dev": true
+			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
 		},
 		"node_modules/dns-packet": {
 			"version": "5.6.1",
 			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
 			"integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
-			"dev": true,
 			"dependencies": {
 				"@leichtgewicht/ip-codec": "^2.0.1"
 			},
@@ -25692,7 +24176,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
 			"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-			"dev": true,
 			"dependencies": {
 				"esutils": "^2.0.2"
 			},
@@ -25715,11 +24198,6 @@
 				"utila": "~0.4"
 			}
 		},
-		"node_modules/dom-scroll-into-view": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz",
-			"integrity": "sha512-LwNVg3GJOprWDO+QhLL1Z9MMgWe/KAFLxVWKzjRTxNSPn8/LLDIfmuG71YHznXCqaqTjvHJDYO1MEAgX6XCNbQ=="
-		},
 		"node_modules/dom-serializer": {
 			"version": "0.2.2",
 			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
@@ -25763,27 +24241,6 @@
 			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
 			"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
 		},
-		"node_modules/domexception": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-			"integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-			"dev": true,
-			"dependencies": {
-				"webidl-conversions": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/domexception/node_modules/webidl-conversions": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-			"dev": true,
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/domhandler": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
@@ -25814,7 +24271,6 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
 			"integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-			"dev": true,
 			"dependencies": {
 				"is-obj": "^2.0.0"
 			},
@@ -25826,21 +24282,20 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
 			"integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/dotenv": {
-			"version": "16.3.1",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
-			"integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+			"version": "16.4.5",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+			"integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
 			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
 			"funding": {
-				"url": "https://github.com/motdotla/dotenv?sponsor=1"
+				"url": "https://dotenvx.com"
 			}
 		},
 		"node_modules/dotenv-expand": {
@@ -25852,30 +24307,10 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/downshift": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.0.tgz",
-			"integrity": "sha512-MnEJERij+1pTVAsOPsH3q9MJGNIZuu2sT90uxOCEOZYH6sEzkVGtUcTBVDRQkE8y96zpB7uEbRn24aE9VpHnZg==",
-			"dependencies": {
-				"@babel/runtime": "^7.12.5",
-				"compute-scroll-into-view": "^1.0.16",
-				"prop-types": "^15.7.2",
-				"react-is": "^17.0.1"
-			},
-			"peerDependencies": {
-				"react": ">=16.12.0"
-			}
-		},
-		"node_modules/downshift/node_modules/react-is": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-		},
 		"node_modules/duplexer": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-			"dev": true
+			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
 		},
 		"node_modules/duplexer2": {
 			"version": "0.1.4",
@@ -26028,10 +24463,11 @@
 			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
 		},
 		"node_modules/ejs": {
-			"version": "3.1.9",
-			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-			"integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+			"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
 				"jake": "^10.8.5"
 			},
@@ -26043,9 +24479,9 @@
 			}
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.525",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.525.tgz",
-			"integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA=="
+			"version": "1.5.33",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.33.tgz",
+			"integrity": "sha512-+cYTcFB1QqD4j4LegwLfpCNxifb6dDFUAwk6RsLusCwIaZI6or2f+q8rs5tTB2YC53HhOlIbEaqHMAAC8IOIwA=="
 		},
 		"node_modules/elegant-spinner": {
 			"version": "1.0.1",
@@ -26087,7 +24523,6 @@
 			"version": "0.13.1",
 			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
 			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -26104,7 +24539,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
 			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-			"dev": true,
 			"engines": {
 				"node": ">= 4"
 			}
@@ -26181,7 +24615,6 @@
 			"version": "2.3.6",
 			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
 			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-			"dev": true,
 			"dependencies": {
 				"ansi-colors": "^4.1.1"
 			},
@@ -26198,15 +24631,15 @@
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
 			"integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/envinfo": {
-			"version": "7.10.0",
-			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz",
-			"integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==",
+			"version": "7.14.0",
+			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
+			"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
+			"license": "MIT",
 			"bin": {
 				"envinfo": "dist/cli.js"
 			},
@@ -26269,7 +24702,6 @@
 			"version": "1.22.1",
 			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
 			"integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
-			"dev": true,
 			"dependencies": {
 				"array-buffer-byte-length": "^1.0.0",
 				"arraybuffer.prototype.slice": "^1.0.1",
@@ -26318,6 +24750,25 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/es-define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+			"dependencies": {
+				"get-intrinsic": "^1.2.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-errors": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/es-get-iterator": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
@@ -26345,21 +24796,14 @@
 			"dev": true
 		},
 		"node_modules/es-module-lexer": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
-			"integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
-			"dev": true
-		},
-		"node_modules/es-module-shims": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.2.tgz",
-			"integrity": "sha512-7vIYVzpOhXtpc3Yn03itB+GSgVZFW7oL4kdydA+iL+IEi7HiSLBUxM05QFw4SxTl6e++pMpGqZPo2+vdNs3TbA=="
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
+			"integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w=="
 		},
 		"node_modules/es-set-tostringtag": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
 			"integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-			"dev": true,
 			"dependencies": {
 				"get-intrinsic": "^1.1.3",
 				"has": "^1.0.3",
@@ -26373,7 +24817,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
 			"integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-			"dev": true,
 			"dependencies": {
 				"has": "^1.0.3"
 			}
@@ -26382,7 +24825,6 @@
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
 			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-			"dev": true,
 			"dependencies": {
 				"is-callable": "^1.1.4",
 				"is-date-object": "^1.0.1",
@@ -26401,12 +24843,6 @@
 			"integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
 			"dev": true
 		},
-		"node_modules/es6-object-assign": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-			"integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
-			"dev": true
-		},
 		"node_modules/esbuild": {
 			"version": "0.18.20",
 			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
@@ -26451,9 +24887,9 @@
 			"dev": true
 		},
 		"node_modules/esbuild-register": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.4.2.tgz",
-			"integrity": "sha512-kG/XyTDyz6+YDuyfB9ZoSIOOmgyFCH+xPRtsCa8W85HLRV5Csp+o3jWVbOSHgSLfyLc5DmP+KFDNwty4mEjC+Q==",
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.5.0.tgz",
+			"integrity": "sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==",
 			"dev": true,
 			"dependencies": {
 				"debug": "^4.3.4"
@@ -26463,9 +24899,9 @@
 			}
 		},
 		"node_modules/escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
 			"engines": {
 				"node": ">=6"
 			}
@@ -26493,7 +24929,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
 			"integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-			"dev": true,
 			"dependencies": {
 				"esprima": "^4.0.1",
 				"estraverse": "^5.2.0",
@@ -26514,7 +24949,6 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
 			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
 			"engines": {
 				"node": ">=4.0"
 			}
@@ -26523,7 +24957,6 @@
 			"version": "8.3.0",
 			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.3.0.tgz",
 			"integrity": "sha512-aIay56Ph6RxOTC7xyr59Kt3ewX185SaGnAr8eWukoPLeriCrvGjvAubxuvaXOfsxhtwV5g0uBOsyhAom4qJdww==",
-			"dev": true,
 			"dependencies": {
 				"@eslint/eslintrc": "^1.0.4",
 				"@humanwhocodes/config-array": "^0.6.0",
@@ -26578,7 +25011,6 @@
 			"version": "8.3.0",
 			"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
 			"integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
-			"dev": true,
 			"bin": {
 				"eslint-config-prettier": "bin/cli.js"
 			},
@@ -26609,7 +25041,6 @@
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz",
 			"integrity": "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==",
-			"dev": true,
 			"dependencies": {
 				"debug": "^3.2.7",
 				"find-up": "^2.1.0",
@@ -26623,7 +25054,6 @@
 			"version": "3.2.7",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
 			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-			"dev": true,
 			"dependencies": {
 				"ms": "^2.1.1"
 			}
@@ -26631,8 +25061,7 @@
 		"node_modules/eslint-module-utils/node_modules/ms": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-			"dev": true
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
 		},
 		"node_modules/eslint-plugin-eslint-comments": {
 			"version": "3.1.2",
@@ -26654,7 +25083,6 @@
 			"version": "2.25.2",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz",
 			"integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==",
-			"dev": true,
 			"dependencies": {
 				"array-includes": "^3.1.4",
 				"array.prototype.flat": "^1.2.5",
@@ -26681,7 +25109,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -26690,7 +25117,6 @@
 			"version": "0.3.9",
 			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
 			"integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
-			"dev": true,
 			"dependencies": {
 				"debug": "^3.2.7",
 				"is-core-module": "^2.13.0",
@@ -26701,7 +25127,6 @@
 			"version": "3.2.7",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
 			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-			"dev": true,
 			"dependencies": {
 				"ms": "^2.1.1"
 			}
@@ -26709,14 +25134,12 @@
 		"node_modules/eslint-plugin-import/node_modules/eslint-import-resolver-node/node_modules/ms": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-			"dev": true
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
 		},
 		"node_modules/eslint-plugin-jest": {
 			"version": "27.2.3",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.2.3.tgz",
 			"integrity": "sha512-sRLlSCpICzWuje66Gl9zvdF6mwD5X86I4u55hJyFBsxYOsBCmT5+kSUjf+fkFWVMMgpzNEupjW8WzUqi83hJAQ==",
-			"dev": true,
 			"dependencies": {
 				"@typescript-eslint/utils": "^5.10.0"
 			},
@@ -26760,7 +25183,6 @@
 			"version": "46.4.6",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.4.6.tgz",
 			"integrity": "sha512-z4SWYnJfOqftZI+b3RM9AtWL1vF/sLWE/LlO9yOKDof9yN2+n3zOdOJTGX/pRE/xnPsooOLG2Rq6e4d+XW3lNw==",
-			"dev": true,
 			"dependencies": {
 				"@es-joy/jsdoccomment": "~0.40.1",
 				"are-docs-informative": "^0.0.2",
@@ -26783,7 +25205,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
 			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -26795,7 +25216,6 @@
 			"version": "6.5.1",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
 			"integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
-			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.16.3",
 				"aria-query": "^4.2.2",
@@ -26820,14 +25240,12 @@
 		"node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
 			"version": "9.2.2",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-			"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-			"dev": true
+			"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
 		},
 		"node_modules/eslint-plugin-playwright": {
 			"version": "0.15.3",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-0.15.3.tgz",
 			"integrity": "sha512-LQMW5y0DLK5Fnpya7JR1oAYL2/7Y9wDiYw6VZqlKqcRGSgjbVKNqxraphk7ra1U3Bb5EK444xMgUlQPbMg2M1g==",
-			"dev": true,
 			"peerDependencies": {
 				"eslint": ">=7",
 				"eslint-plugin-jest": ">=25"
@@ -26842,7 +25260,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz",
 			"integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==",
-			"dev": true,
 			"dependencies": {
 				"prettier-linter-helpers": "^1.0.0",
 				"synckit": "^0.8.5"
@@ -26871,7 +25288,6 @@
 			"version": "7.27.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.0.tgz",
 			"integrity": "sha512-0Ut+CkzpppgFtoIhdzi2LpdpxxBvgFf99eFqWxJnUrO7mMe0eOiNpou6rvNYeVVV6lWZvTah0BFne7k5xHjARg==",
-			"dev": true,
 			"dependencies": {
 				"array-includes": "^3.1.4",
 				"array.prototype.flatmap": "^1.2.5",
@@ -26899,7 +25315,6 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz",
 			"integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -26911,18 +25326,16 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
 			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
 			"engines": {
 				"node": ">=4.0"
 			}
 		},
 		"node_modules/eslint-plugin-react/node_modules/resolve": {
-			"version": "2.0.0-next.4",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-			"integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-			"dev": true,
+			"version": "2.0.0-next.5",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+			"integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
 			"dependencies": {
-				"is-core-module": "^2.9.0",
+				"is-core-module": "^2.13.0",
 				"path-parse": "^1.0.7",
 				"supports-preserve-symlinks-flag": "^1.0.0"
 			},
@@ -26937,7 +25350,6 @@
 			"version": "6.3.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
 			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
 			"bin": {
 				"semver": "bin/semver.js"
 			}
@@ -27014,7 +25426,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
 			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-			"dev": true,
 			"dependencies": {
 				"eslint-visitor-keys": "^2.0.0"
 			},
@@ -27032,7 +25443,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
 			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -27041,7 +25451,6 @@
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -27056,14 +25465,12 @@
 		"node_modules/eslint/node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
 		},
 		"node_modules/eslint/node_modules/cross-spawn": {
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
 			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -27077,7 +25484,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
 			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-			"dev": true,
 			"dependencies": {
 				"esutils": "^2.0.2"
 			},
@@ -27089,7 +25495,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
 			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -27101,7 +25506,6 @@
 			"version": "7.2.2",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
 			"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-			"dev": true,
 			"dependencies": {
 				"esrecurse": "^4.3.0",
 				"estraverse": "^5.2.0"
@@ -27114,10 +25518,9 @@
 			}
 		},
 		"node_modules/eslint/node_modules/eslint-visitor-keys": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-			"integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-			"dev": true,
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
@@ -27129,7 +25532,6 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
 			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
 			"engines": {
 				"node": ">=4.0"
 			}
@@ -27138,7 +25540,6 @@
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
 			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-			"dev": true,
 			"dependencies": {
 				"is-glob": "^4.0.3"
 			},
@@ -27150,7 +25551,6 @@
 			"version": "4.0.6",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
 			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 4"
 			}
@@ -27159,7 +25559,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
 			"dependencies": {
 				"argparse": "^2.0.1"
 			},
@@ -27171,7 +25570,6 @@
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
 			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-			"dev": true,
 			"dependencies": {
 				"prelude-ls": "^1.2.1",
 				"type-check": "~0.4.0"
@@ -27181,17 +25579,16 @@
 			}
 		},
 		"node_modules/eslint/node_modules/optionator": {
-			"version": "0.9.3",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-			"integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-			"dev": true,
+			"version": "0.9.4",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
 			"dependencies": {
-				"@aashutoshrathi/word-wrap": "^1.2.3",
 				"deep-is": "^0.1.3",
 				"fast-levenshtein": "^2.0.6",
 				"levn": "^0.4.1",
 				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0"
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.5"
 			},
 			"engines": {
 				"node": ">= 0.8.0"
@@ -27201,7 +25598,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -27210,7 +25606,6 @@
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
 			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.8.0"
 			}
@@ -27219,7 +25614,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -27231,7 +25625,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -27240,7 +25633,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -27252,7 +25644,6 @@
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
 			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-			"dev": true,
 			"dependencies": {
 				"prelude-ls": "^1.2.1"
 			},
@@ -27264,7 +25655,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -27279,7 +25669,6 @@
 			"version": "9.1.0",
 			"resolved": "https://registry.npmjs.org/espree/-/espree-9.1.0.tgz",
 			"integrity": "sha512-ZgYLvCS1wxOczBYGcQT9DDWgicXwJ4dbocr9uYN+/eresBAUuBu+O4WzB21ufQ/JqQT8gyp7hJ3z8SHii32mTQ==",
-			"dev": true,
 			"dependencies": {
 				"acorn": "^8.6.0",
 				"acorn-jsx": "^5.3.1",
@@ -27290,10 +25679,10 @@
 			}
 		},
 		"node_modules/espree/node_modules/acorn": {
-			"version": "8.10.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-			"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-			"dev": true,
+			"version": "8.13.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+			"integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -27302,10 +25691,9 @@
 			}
 		},
 		"node_modules/espree/node_modules/eslint-visitor-keys": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-			"integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-			"dev": true,
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
@@ -27329,7 +25717,6 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
 			"integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-			"dev": true,
 			"dependencies": {
 				"estraverse": "^5.1.0"
 			},
@@ -27341,7 +25728,6 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
 			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
 			"engines": {
 				"node": ">=4.0"
 			}
@@ -27350,7 +25736,6 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
 			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-			"dev": true,
 			"dependencies": {
 				"estraverse": "^5.2.0"
 			},
@@ -27362,7 +25747,6 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
 			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
 			"engines": {
 				"node": ">=4.0"
 			}
@@ -27371,30 +25755,14 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
 			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-			"dev": true,
 			"engines": {
 				"node": ">=4.0"
 			}
 		},
-		"node_modules/estree-to-babel": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/estree-to-babel/-/estree-to-babel-3.2.1.tgz",
-			"integrity": "sha512-YNF+mZ/Wu2FU/gvmzuWtYc8rloubL7wfXCTgouFrnjGVXPA/EeYYA7pupXWrb3Iv1cTBeSSxxJIbK23l4MRNqg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/traverse": "^7.1.6",
-				"@babel/types": "^7.2.0",
-				"c8": "^7.6.0"
-			},
-			"engines": {
-				"node": ">=8.3.0"
-			}
-		},
 		"node_modules/esutils": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
 			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -27423,14 +25791,12 @@
 		"node_modules/eventemitter3": {
 			"version": "4.0.7",
 			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-			"dev": true
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
 		},
 		"node_modules/events": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
 			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.8.x"
 			}
@@ -27449,7 +25815,6 @@
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz",
 			"integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==",
-			"dev": true,
 			"dependencies": {
 				"cross-spawn": "^7.0.0",
 				"get-stream": "^5.0.0",
@@ -27472,7 +25837,6 @@
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
 			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -27486,7 +25850,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
 			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -27498,7 +25861,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -27507,7 +25869,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
 			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.0.0"
 			},
@@ -27519,7 +25880,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
 			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
 			"dependencies": {
 				"mimic-fn": "^2.1.0"
 			},
@@ -27534,7 +25894,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -27543,7 +25902,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -27555,7 +25913,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -27564,7 +25921,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -27575,23 +25931,10 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/execall": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-			"integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-			"dev": true,
-			"dependencies": {
-				"clone-regexp": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/exit": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
 			"integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.8.0"
 			}
@@ -27600,6 +25943,7 @@
 			"version": "2.1.4",
 			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
 			"integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+			"dev": true,
 			"dependencies": {
 				"debug": "^2.3.3",
 				"define-property": "^0.2.5",
@@ -27617,6 +25961,7 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -27625,6 +25970,7 @@
 			"version": "0.2.5",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dev": true,
 			"dependencies": {
 				"is-descriptor": "^0.1.0"
 			},
@@ -27636,6 +25982,7 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dev": true,
 			"dependencies": {
 				"is-extendable": "^0.1.0"
 			},
@@ -27657,7 +26004,6 @@
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
 			"integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
-			"dev": true,
 			"dependencies": {
 				"os-homedir": "^1.0.1"
 			},
@@ -27669,7 +26015,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
 			"integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
-			"dev": true,
 			"dependencies": {
 				"@jest/expect-utils": "^29.6.2",
 				"@types/node": "*",
@@ -27685,8 +26030,7 @@
 		"node_modules/expect-puppeteer": {
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-4.4.0.tgz",
-			"integrity": "sha512-6Ey4Xy2xvmuQu7z7YQtMsaMV0EHJRpVxIDOd5GRrm04/I3nkTKIutELfECsLp6le+b3SSa3cXhPiw6PgqzxYWA==",
-			"dev": true
+			"integrity": "sha512-6Ey4Xy2xvmuQu7z7YQtMsaMV0EHJRpVxIDOd5GRrm04/I3nkTKIutELfECsLp6le+b3SSa3cXhPiw6PgqzxYWA=="
 		},
 		"node_modules/exponential-backoff": {
 			"version": "3.1.1",
@@ -27698,7 +26042,6 @@
 			"version": "4.18.2",
 			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
 			"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-			"dev": true,
 			"dependencies": {
 				"accepts": "~1.3.8",
 				"array-flatten": "1.1.1",
@@ -27740,7 +26083,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -27749,7 +26091,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
 			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.8"
 			}
@@ -27758,7 +26099,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
 			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-			"dev": true,
 			"dependencies": {
 				"debug": "2.6.9",
 				"encodeurl": "~1.0.2",
@@ -27776,7 +26116,6 @@
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
 			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-			"dev": true,
 			"dependencies": {
 				"ee-first": "1.1.1"
 			},
@@ -27788,7 +26127,6 @@
 			"version": "5.2.1",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
 			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-			"dev": true,
 			"funding": [
 				{
 					"type": "github",
@@ -27808,7 +26146,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
 			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.8"
 			}
@@ -27816,13 +26153,13 @@
 		"node_modules/extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
 		},
 		"node_modules/extend-shallow": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
 			"integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+			"dev": true,
 			"dependencies": {
 				"assign-symbols": "^1.0.0",
 				"is-extendable": "^1.0.1"
@@ -27835,6 +26172,7 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
 			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+			"dev": true,
 			"dependencies": {
 				"is-plain-object": "^2.0.4"
 			},
@@ -27846,6 +26184,7 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
 			"dependencies": {
 				"isobject": "^3.0.1"
 			},
@@ -27857,7 +26196,6 @@
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
 			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
-			"dev": true,
 			"dependencies": {
 				"chardet": "^0.7.0",
 				"iconv-lite": "^0.4.24",
@@ -27871,7 +26209,6 @@
 			"version": "0.4.24",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
 			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"dev": true,
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			},
@@ -27883,6 +26220,7 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
 			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+			"dev": true,
 			"dependencies": {
 				"array-unique": "^0.3.2",
 				"define-property": "^1.0.0",
@@ -27901,6 +26239,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
 			"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+			"dev": true,
 			"dependencies": {
 				"is-descriptor": "^1.0.0"
 			},
@@ -27912,6 +26251,7 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dev": true,
 			"dependencies": {
 				"is-extendable": "^0.1.0"
 			},
@@ -27919,46 +26259,23 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/extglob/node_modules/is-accessor-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-			"dependencies": {
-				"kind-of": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/extglob/node_modules/is-data-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-			"dependencies": {
-				"kind-of": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/extglob/node_modules/is-descriptor": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+			"integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+			"dev": true,
 			"dependencies": {
-				"is-accessor-descriptor": "^1.0.0",
-				"is-data-descriptor": "^1.0.0",
-				"kind-of": "^6.0.2"
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/extract-zip": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
 			"integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
-			"dev": true,
 			"dependencies": {
 				"concat-stream": "^1.6.2",
 				"debug": "^2.6.9",
@@ -27973,7 +26290,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -27982,7 +26298,6 @@
 			"version": "0.5.6",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
 			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-			"dev": true,
 			"dependencies": {
 				"minimist": "^1.2.6"
 			},
@@ -28014,20 +26329,17 @@
 		"node_modules/fast-diff": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-			"integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-			"dev": true
+			"integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
 		},
 		"node_modules/fast-fifo": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.0.tgz",
-			"integrity": "sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw==",
-			"dev": true
+			"integrity": "sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw=="
 		},
 		"node_modules/fast-glob": {
 			"version": "3.2.7",
 			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
 			"integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-			"dev": true,
 			"dependencies": {
 				"@nodelib/fs.stat": "^2.0.2",
 				"@nodelib/fs.walk": "^1.2.3",
@@ -28043,7 +26355,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -28060,32 +26371,36 @@
 		"node_modules/fast-json-stable-stringify": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
 		},
 		"node_modules/fast-levenshtein": {
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-			"dev": true
+			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
 		},
 		"node_modules/fast-memoize": {
 			"version": "2.5.2",
 			"resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz",
 			"integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="
 		},
+		"node_modules/fast-uri": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
+			"integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
+			"license": "MIT"
+		},
 		"node_modules/fast-xml-parser": {
-			"version": "4.2.6",
-			"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.6.tgz",
-			"integrity": "sha512-Xo1qV++h/Y3Ng8dphjahnYe+rGHaaNdsYOBWL9Y9GCPKpNKilJtilvWkLcI9f9X2DoKTLsZsGYAls5+JL5jfLA==",
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.4.tgz",
+			"integrity": "sha512-utnwm92SyozgA3hhH2I8qldf2lBqm6qHOICawRNRFu1qMe3+oqr+GcXjGqTmXTMGE5T4eC03kr/rlh5C1IRdZA==",
 			"funding": [
-				{
-					"type": "paypal",
-					"url": "https://paypal.me/naturalintelligence"
-				},
 				{
 					"type": "github",
 					"url": "https://github.com/sponsors/NaturalIntelligence"
+				},
+				{
+					"type": "paypal",
+					"url": "https://paypal.me/naturalintelligence"
 				}
 			],
 			"dependencies": {
@@ -28096,16 +26411,17 @@
 			}
 		},
 		"node_modules/fastest-levenshtein": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-			"integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-			"dev": true
+			"version": "1.0.16",
+			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+			"engines": {
+				"node": ">= 4.9.1"
+			}
 		},
 		"node_modules/fastq": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz",
 			"integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==",
-			"dev": true,
 			"dependencies": {
 				"reusify": "^1.0.0"
 			}
@@ -28114,7 +26430,6 @@
 			"version": "0.11.4",
 			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
 			"integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-			"dev": true,
 			"dependencies": {
 				"websocket-driver": ">=0.5.1"
 			},
@@ -28134,7 +26449,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
 			"integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-			"dev": true,
 			"dependencies": {
 				"pend": "~1.2.0"
 			}
@@ -28175,9 +26489,10 @@
 			"dev": true
 		},
 		"node_modules/figgy-pudding": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-			"integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+			"integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+			"deprecated": "This module is no longer supported.",
 			"dev": true
 		},
 		"node_modules/figures": {
@@ -28196,7 +26511,6 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
 			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-			"dev": true,
 			"dependencies": {
 				"flat-cache": "^3.0.4"
 			},
@@ -28241,9 +26555,9 @@
 			}
 		},
 		"node_modules/file-system-cache/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
@@ -28290,7 +26604,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
 			"integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
@@ -28299,7 +26612,6 @@
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.2.0.tgz",
 			"integrity": "sha512-pkgE+4p7N1n7QieOopmn3TqJaefjdWXwEkj2XLZJLKfOgcQKkn11ahvGNgTD8mLggexLiDFQxeTs14xVU22XPA==",
-			"dev": true,
 			"dependencies": {
 				"filename-reserved-regex": "^2.0.0",
 				"strip-outer": "^1.0.1",
@@ -28313,9 +26625,10 @@
 			}
 		},
 		"node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+			"license": "MIT",
 			"dependencies": {
 				"to-regex-range": "^5.0.1"
 			},
@@ -28327,6 +26640,7 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.12.0"
 			}
@@ -28335,6 +26649,7 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
 			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"license": "MIT",
 			"dependencies": {
 				"is-number": "^7.0.0"
 			},
@@ -28487,7 +26802,6 @@
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
 			"integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
-			"dev": true,
 			"dependencies": {
 				"fs-exists-sync": "^0.1.0",
 				"resolve-dir": "^0.1.0"
@@ -28499,14 +26813,12 @@
 		"node_modules/find-parent-dir": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
-			"integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
-			"dev": true
+			"integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ="
 		},
 		"node_modules/find-pkg": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
 			"integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
-			"dev": true,
 			"dependencies": {
 				"find-file-up": "^0.1.2"
 			},
@@ -28518,7 +26830,6 @@
 			"version": "1.4.7",
 			"resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
 			"integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
-			"dev": true,
 			"dependencies": {
 				"chalk": "^4.0.0",
 				"commander": "^5.1.0",
@@ -28532,7 +26843,6 @@
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
 			"integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 6"
 			}
@@ -28546,7 +26856,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
 			"integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
-			"dev": true,
 			"dependencies": {
 				"locate-path": "^2.0.0"
 			},
@@ -28555,108 +26864,12 @@
 			}
 		},
 		"node_modules/find-yarn-workspace-root": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz",
-			"integrity": "sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==",
-			"dev": true,
-			"dependencies": {
-				"fs-extra": "^4.0.3",
-				"micromatch": "^3.1.4"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/braces": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-			"dev": true,
-			"dependencies": {
-				"arr-flatten": "^1.1.0",
-				"array-unique": "^0.3.2",
-				"extend-shallow": "^2.0.1",
-				"fill-range": "^4.0.0",
-				"isobject": "^3.0.1",
-				"repeat-element": "^1.1.2",
-				"snapdragon": "^0.8.1",
-				"snapdragon-node": "^2.0.1",
-				"split-string": "^3.0.2",
-				"to-regex": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/braces/node_modules/extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-			"dev": true,
-			"dependencies": {
-				"is-extendable": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/fill-range": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-			"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-			"dev": true,
-			"dependencies": {
-				"extend-shallow": "^2.0.1",
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1",
-				"to-regex-range": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/fill-range/node_modules/extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-			"dev": true,
-			"dependencies": {
-				"is-extendable": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/fs-extra": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-			"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-			"dev": true,
-			"dependencies": {
-				"graceful-fs": "^4.1.2",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/micromatch": {
-			"version": "3.1.10",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
+			"integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
 			"dev": true,
 			"dependencies": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"braces": "^2.3.1",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"extglob": "^2.0.4",
-				"fragment-cache": "^0.2.1",
-				"kind-of": "^6.0.2",
-				"nanomatch": "^1.2.9",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
+				"micromatch": "^4.0.2"
 			}
 		},
 		"node_modules/flat": {
@@ -28669,12 +26882,13 @@
 			}
 		},
 		"node_modules/flat-cache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-			"dev": true,
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+			"integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+			"license": "MIT",
 			"dependencies": {
-				"flatted": "^3.1.0",
+				"flatted": "^3.2.9",
+				"keyv": "^4.5.3",
 				"rimraf": "^3.0.2"
 			},
 			"engines": {
@@ -28682,27 +26896,31 @@
 			}
 		},
 		"node_modules/flatted": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz",
-			"integrity": "sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==",
-			"dev": true
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+			"integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw=="
+		},
+		"node_modules/flow-enums-runtime": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/flow-enums-runtime/-/flow-enums-runtime-0.0.6.tgz",
+			"integrity": "sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw=="
 		},
 		"node_modules/flow-parser": {
-			"version": "0.185.2",
-			"resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.185.2.tgz",
-			"integrity": "sha512-2hJ5ACYeJCzNtiVULov6pljKOLygy0zddoqSI1fFetM+XRPpRshFdGEijtqlamA1XwyZ+7rhryI6FQFzvtLWUQ==",
+			"version": "0.206.0",
+			"resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.206.0.tgz",
+			"integrity": "sha512-HVzoK3r6Vsg+lKvlIZzaWNBVai+FXTX1wdYhz/wVlH13tb/gOdLXmlTqy6odmTBhT5UoWUbq0k8263Qhr9d88w==",
 			"engines": {
 				"node": ">=0.4.0"
 			}
 		},
 		"node_modules/flush-write-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"dependencies": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.4"
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
 		"node_modules/fn.name": {
@@ -28712,10 +26930,9 @@
 			"dev": true
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-			"dev": true,
+			"version": "1.15.6",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 			"funding": [
 				{
 					"type": "individual",
@@ -28735,7 +26952,6 @@
 			"version": "0.3.3",
 			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
 			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-			"dev": true,
 			"dependencies": {
 				"is-callable": "^1.1.3"
 			}
@@ -28752,7 +26968,6 @@
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
 			"integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
-			"dev": true,
 			"dependencies": {
 				"for-in": "^1.0.1"
 			},
@@ -28761,16 +26976,19 @@
 			}
 		},
 		"node_modules/foreground-child": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-			"integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+			"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
 			"dev": true,
 			"dependencies": {
 				"cross-spawn": "^7.0.0",
-				"signal-exit": "^3.0.2"
+				"signal-exit": "^4.0.1"
 			},
 			"engines": {
-				"node": ">=8.0.0"
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/foreground-child/node_modules/cross-spawn": {
@@ -28817,6 +27035,18 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/foreground-child/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"node_modules/foreground-child/node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -28832,11 +27062,153 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/fork-ts-checker-webpack-plugin": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-8.0.0.tgz",
+			"integrity": "sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.16.7",
+				"chalk": "^4.1.2",
+				"chokidar": "^3.5.3",
+				"cosmiconfig": "^7.0.1",
+				"deepmerge": "^4.2.2",
+				"fs-extra": "^10.0.0",
+				"memfs": "^3.4.1",
+				"minimatch": "^3.0.4",
+				"node-abort-controller": "^3.0.1",
+				"schema-utils": "^3.1.1",
+				"semver": "^7.3.5",
+				"tapable": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=12.13.0",
+				"yarn": ">=1.0.0"
+			},
+			"peerDependencies": {
+				"typescript": ">3.6.0",
+				"webpack": "^5.11.0"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+			"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dev": true,
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/tapable": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
 		"node_modules/form-data": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
 			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-			"dev": true,
 			"dependencies": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.8",
@@ -28871,7 +27243,6 @@
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
 			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -28880,7 +27251,6 @@
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
 			"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-			"dev": true,
 			"engines": {
 				"node": "*"
 			},
@@ -28893,6 +27263,7 @@
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
 			"integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+			"dev": true,
 			"dependencies": {
 				"map-cache": "^0.2.2"
 			},
@@ -28900,6 +27271,30 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/framer-motion": {
+			"version": "11.1.9",
+			"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.1.9.tgz",
+			"integrity": "sha512-flECDIPV4QDNcOrDafVFiIazp8X01HFpzc01eDKJsdNH/wrATcYydJSH9JbPWMS8UD5lZlw+J1sK8LG2kICgqw==",
+			"dependencies": {
+				"tslib": "^2.4.0"
+			},
+			"peerDependencies": {
+				"@emotion/is-prop-valid": "*",
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@emotion/is-prop-valid": {
+					"optional": true
+				},
+				"react": {
+					"optional": true
+				},
+				"react-dom": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/fresh": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -28928,7 +27323,6 @@
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
 			"integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -28961,8 +27355,7 @@
 		"node_modules/fs-monkey": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
-			"integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
-			"dev": true
+			"integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ=="
 		},
 		"node_modules/fs-write-stream-atomic": {
 			"version": "1.0.10",
@@ -29090,15 +27483,17 @@
 			"dev": true
 		},
 		"node_modules/function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/function.prototype.name": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
 			"integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.3",
@@ -29115,14 +27510,12 @@
 		"node_modules/functional-red-black-tree": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
 		},
 		"node_modules/functions-have-names": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
 			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-			"dev": true,
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
@@ -29199,9 +27592,9 @@
 			}
 		},
 		"node_modules/geckodriver/node_modules/agent-base": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-			"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+			"integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
 			"dev": true,
 			"dependencies": {
 				"debug": "^4.3.4"
@@ -29232,9 +27625,9 @@
 			}
 		},
 		"node_modules/geckodriver/node_modules/http-proxy-agent": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-			"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
 			"dev": true,
 			"dependencies": {
 				"agent-base": "^7.1.0",
@@ -29245,10 +27638,11 @@
 			}
 		},
 		"node_modules/geckodriver/node_modules/https-proxy-agent": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-			"integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+			"integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"agent-base": "^7.0.2",
 				"debug": "4"
@@ -29285,30 +27679,34 @@
 			}
 		},
 		"node_modules/geckodriver/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
 			}
 		},
 		"node_modules/geckodriver/node_modules/tar-fs": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
-			"integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+			"integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
 			"dev": true,
 			"dependencies": {
-				"mkdirp-classic": "^0.5.2",
 				"pump": "^3.0.0",
 				"tar-stream": "^3.1.5"
+			},
+			"optionalDependencies": {
+				"bare-fs": "^2.1.1",
+				"bare-path": "^2.1.0"
 			}
 		},
 		"node_modules/geckodriver/node_modules/tar-stream": {
-			"version": "3.1.6",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-			"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+			"integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
 			"dev": true,
 			"dependencies": {
 				"b4a": "^1.6.4",
@@ -29353,15 +27751,18 @@
 			}
 		},
 		"node_modules/get-intrinsic": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-			"integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-			"dev": true,
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
 				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3"
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -29376,9 +27777,9 @@
 			}
 		},
 		"node_modules/get-npm-tarball-url": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
-			"integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.1.0.tgz",
+			"integrity": "sha512-ro+DiMu5DXgRBabqXupW38h7WPZ9+Ad8UjwhvsmmN8w1sU7ab0nzAXvVZ4kqYg57OrqomRtJvepX5/xvFKNtjA==",
 			"dev": true,
 			"engines": {
 				"node": ">=12.17"
@@ -29412,7 +27813,6 @@
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
 			"integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -29420,11 +27820,21 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/get-stdin": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
+			"integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/get-stream": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
 			"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-			"dev": true,
 			"dependencies": {
 				"pump": "^3.0.0"
 			},
@@ -29436,10 +27846,10 @@
 			}
 		},
 		"node_modules/get-stream/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-			"dev": true,
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
@@ -29449,7 +27859,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
 			"integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"get-intrinsic": "^1.1.1"
@@ -29465,7 +27874,6 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz",
 			"integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==",
-			"dev": true,
 			"dependencies": {
 				"basic-ftp": "^5.0.2",
 				"data-uri-to-buffer": "^5.0.1",
@@ -29480,6 +27888,7 @@
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
 			"integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -29494,18 +27903,19 @@
 			}
 		},
 		"node_modules/giget": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/giget/-/giget-1.1.2.tgz",
-			"integrity": "sha512-HsLoS07HiQ5oqvObOI+Qb2tyZH4Gj5nYGfF9qQcZNrPw+uEFhdXtgJr01aO2pWadGHucajYDLxxbtQkm97ON2A==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/giget/-/giget-1.2.1.tgz",
+			"integrity": "sha512-4VG22mopWtIeHwogGSy1FViXVo0YT+m6BrqZfz0JJFwbSsePsCdOzdLIIli5BtMp7Xe8f/o2OmBpQX2NBOC24g==",
 			"dev": true,
 			"dependencies": {
-				"colorette": "^2.0.19",
-				"defu": "^6.1.2",
-				"https-proxy-agent": "^5.0.1",
-				"mri": "^1.2.0",
-				"node-fetch-native": "^1.0.2",
-				"pathe": "^1.1.0",
-				"tar": "^6.1.13"
+				"citty": "^0.1.5",
+				"consola": "^3.2.3",
+				"defu": "^6.1.3",
+				"node-fetch-native": "^1.6.1",
+				"nypm": "^0.3.3",
+				"ohash": "^1.1.3",
+				"pathe": "^1.1.1",
+				"tar": "^6.2.0"
 			},
 			"bin": {
 				"giget": "dist/cli.mjs"
@@ -29520,11 +27930,14 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/giget/node_modules/colorette": {
-			"version": "2.0.20",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-			"dev": true
+		"node_modules/giget/node_modules/consola": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz",
+			"integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==",
+			"dev": true,
+			"engines": {
+				"node": "^14.18.0 || >=16.10.0"
+			}
 		},
 		"node_modules/giget/node_modules/minipass": {
 			"version": "5.0.0",
@@ -29548,9 +27961,9 @@
 			}
 		},
 		"node_modules/giget/node_modules/tar": {
-			"version": "6.1.15",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
-			"integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+			"integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
 			"dev": true,
 			"dependencies": {
 				"chownr": "^2.0.0",
@@ -29661,7 +28074,6 @@
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
 			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-			"dev": true,
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -29701,14 +28113,12 @@
 		"node_modules/glob-to-regexp": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-			"dev": true
+			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
 		},
 		"node_modules/global-modules": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
 			"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-			"dev": true,
 			"dependencies": {
 				"global-prefix": "^3.0.0"
 			},
@@ -29720,7 +28130,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
 			"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-			"dev": true,
 			"dependencies": {
 				"ini": "^1.3.5",
 				"kind-of": "^6.0.2",
@@ -29731,10 +28140,9 @@
 			}
 		},
 		"node_modules/globals": {
-			"version": "13.20.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-			"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-			"dev": true,
+			"version": "13.24.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
 			"dependencies": {
 				"type-fest": "^0.20.2"
 			},
@@ -29749,7 +28157,6 @@
 			"version": "0.20.2",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
 			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -29761,7 +28168,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
 			"integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-			"dev": true,
 			"dependencies": {
 				"define-properties": "^1.1.3"
 			},
@@ -29776,7 +28182,6 @@
 			"version": "11.1.0",
 			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
 			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-			"dev": true,
 			"dependencies": {
 				"array-union": "^2.1.0",
 				"dir-glob": "^3.0.1",
@@ -29796,16 +28201,14 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
 			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/globby/node_modules/fast-glob": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-			"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-			"dev": true,
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
 			"dependencies": {
 				"@nodelib/fs.stat": "^2.0.2",
 				"@nodelib/fs.walk": "^1.2.3",
@@ -29821,7 +28224,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -29832,8 +28234,7 @@
 		"node_modules/globjoin": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-			"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
-			"dev": true
+			"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg=="
 		},
 		"node_modules/good-listener": {
 			"version": "1.2.2",
@@ -29847,7 +28248,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
 			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-			"dev": true,
 			"dependencies": {
 				"get-intrinsic": "^1.1.3"
 			},
@@ -29859,7 +28259,6 @@
 			"version": "11.8.6",
 			"resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
 			"integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-			"dev": true,
 			"dependencies": {
 				"@sindresorhus/is": "^4.0.0",
 				"@szmarczak/http-timer": "^4.0.5",
@@ -29902,8 +28301,7 @@
 		"node_modules/graphemer": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-			"dev": true
+			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
 		},
 		"node_modules/gunzip-maybe": {
 			"version": "1.4.2",
@@ -29940,8 +28338,7 @@
 		"node_modules/handle-thing": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-			"dev": true
+			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
 		},
 		"node_modules/handlebars": {
 			"version": "4.7.8",
@@ -29968,7 +28365,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
 			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -30009,7 +28405,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
 			"integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-			"dev": true,
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
@@ -30023,12 +28418,11 @@
 			}
 		},
 		"node_modules/has-property-descriptors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-			"dev": true,
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
 			"dependencies": {
-				"get-intrinsic": "^1.1.1"
+				"es-define-property": "^1.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -30038,7 +28432,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
 			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -30050,7 +28443,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
 			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -30062,7 +28454,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
 			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-			"dev": true,
 			"dependencies": {
 				"has-symbols": "^1.0.2"
 			},
@@ -30083,6 +28474,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
 			"integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+			"dev": true,
 			"dependencies": {
 				"get-value": "^2.0.6",
 				"has-values": "^1.0.0",
@@ -30096,6 +28488,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
 			"integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+			"dev": true,
 			"dependencies": {
 				"is-number": "^3.0.0",
 				"kind-of": "^4.0.0"
@@ -30108,6 +28501,7 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
 			"integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+			"dev": true,
 			"dependencies": {
 				"is-buffer": "^1.1.5"
 			},
@@ -30179,6 +28573,17 @@
 				"minimalistic-assert": "^1.0.1"
 			}
 		},
+		"node_modules/hasown": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/he": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -30198,16 +28603,16 @@
 			}
 		},
 		"node_modules/hermes-estree": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.8.0.tgz",
-			"integrity": "sha512-W6JDAOLZ5pMPMjEiQGLCXSSV7pIBEgRR5zGkxgmzGSXHOxqV5dC/M1Zevqpbm9TZDE5tu358qZf8Vkzmsc+u7Q=="
+			"version": "0.15.0",
+			"resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.15.0.tgz",
+			"integrity": "sha512-lLYvAd+6BnOqWdnNbP/Q8xfl8LOGw4wVjfrNd9Gt8eoFzhNBRVD95n4l2ksfMVOoxuVyegs85g83KS9QOsxbVQ=="
 		},
 		"node_modules/hermes-parser": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.8.0.tgz",
-			"integrity": "sha512-yZKalg1fTYG5eOiToLUaw69rQfZq/fi+/NtEXRU7N87K/XobNRhRWorh80oSge2lWUiZfTgUvRJH+XgZWrhoqA==",
+			"version": "0.15.0",
+			"resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.15.0.tgz",
+			"integrity": "sha512-Q1uks5rjZlE9RjMMjSUCkGrEIPI5pKJILeCtK1VmTj7U4pf3wVPoo+cxfu+s4cBAPy2JzikIIdCZgBoR6x7U1Q==",
 			"dependencies": {
-				"hermes-estree": "0.8.0"
+				"hermes-estree": "0.15.0"
 			}
 		},
 		"node_modules/hermes-profile-transformer": {
@@ -30235,9 +28640,9 @@
 			"integrity": "sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg=="
 		},
 		"node_modules/history": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/history/-/history-5.1.0.tgz",
-			"integrity": "sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==",
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
+			"integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
 			"dependencies": {
 				"@babel/runtime": "^7.7.6"
 			}
@@ -30265,7 +28670,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
 			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-			"dev": true,
 			"dependencies": {
 				"parse-passwd": "^1.0.0"
 			},
@@ -30277,7 +28681,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
 			"integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-			"dev": true,
 			"dependencies": {
 				"lru-cache": "^6.0.0"
 			},
@@ -30289,7 +28692,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
 			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
 			"dependencies": {
 				"yallist": "^4.0.0"
 			},
@@ -30300,14 +28702,12 @@
 		"node_modules/hosted-git-info/node_modules/yallist": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
 		},
 		"node_modules/hpack.js": {
 			"version": "2.1.6",
 			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
 			"integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-			"dev": true,
 			"dependencies": {
 				"inherits": "^2.0.1",
 				"obuf": "^1.0.0",
@@ -30321,22 +28721,20 @@
 			"integrity": "sha512-fvYTvdCFOWQupGxqkahrkA+ERBuMdzkxwtUdKrxR6rmMd4Pfl+iZ1QiQYoaZ0B/v0y59MOMnz3XFUWbT50/NWA=="
 		},
 		"node_modules/html-encoding-sniffer": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-			"integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-			"dev": true,
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+			"integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
 			"dependencies": {
-				"whatwg-encoding": "^2.0.0"
+				"whatwg-encoding": "^3.1.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/html-entities": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-			"integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
-			"dev": true,
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+			"integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
 			"funding": [
 				{
 					"type": "github",
@@ -30351,8 +28749,7 @@
 		"node_modules/html-escaper": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz",
-			"integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==",
-			"dev": true
+			"integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig=="
 		},
 		"node_modules/html-minifier-terser": {
 			"version": "6.1.0",
@@ -30385,18 +28782,20 @@
 			}
 		},
 		"node_modules/html-tags": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
-			"integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
-			"dev": true,
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+			"integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
 			"engines": {
 				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/html-webpack-plugin": {
-			"version": "5.5.3",
-			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
-			"integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
+			"version": "5.6.0",
+			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz",
+			"integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==",
 			"dev": true,
 			"dependencies": {
 				"@types/html-minifier-terser": "^6.0.0",
@@ -30413,7 +28812,16 @@
 				"url": "https://opencollective.com/html-webpack-plugin"
 			},
 			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
 				"webpack": "^5.20.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/html-webpack-plugin/node_modules/tapable": {
@@ -30525,14 +28933,12 @@
 		"node_modules/http-cache-semantics": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-			"integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-			"dev": true
+			"integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
 		},
 		"node_modules/http-deceiver": {
 			"version": "1.2.7",
 			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-			"dev": true
+			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
 		},
 		"node_modules/http-errors": {
 			"version": "2.0.0",
@@ -30574,7 +28980,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/http-link-header/-/http-link-header-1.1.1.tgz",
 			"integrity": "sha512-mW3N/rTYpCn99s1do0zx6nzFZSwLH9HGfUM4ZqLWJ16ylmYaC2v5eYGqrNTQlByx8AzUgGI+V/32gXPugs1+Sw==",
-			"dev": true,
 			"engines": {
 				"node": ">=6.0.0"
 			}
@@ -30582,14 +28987,12 @@
 		"node_modules/http-parser-js": {
 			"version": "0.5.3",
 			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-			"integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
-			"dev": true
+			"integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
 		},
 		"node_modules/http-proxy": {
 			"version": "1.18.1",
 			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
 			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-			"dev": true,
 			"dependencies": {
 				"eventemitter3": "^4.0.0",
 				"follow-redirects": "^1.0.0",
@@ -30626,7 +29029,6 @@
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
 			"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-			"dev": true,
 			"dependencies": {
 				"@types/http-proxy": "^1.17.8",
 				"http-proxy": "^1.18.1",
@@ -30656,7 +29058,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
 			"integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-			"dev": true,
 			"dependencies": {
 				"quick-lru": "^5.1.1",
 				"resolve-alpn": "^1.0.0"
@@ -30669,7 +29070,6 @@
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
 			"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -30687,7 +29087,6 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
 			"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-			"dev": true,
 			"dependencies": {
 				"agent-base": "6",
 				"debug": "4"
@@ -30700,7 +29099,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
 			"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8.12.0"
 			}
@@ -30744,7 +29142,6 @@
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
 			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-			"dev": true,
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
 			},
@@ -30781,7 +29178,6 @@
 			"version": "5.2.4",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
 			"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-			"dev": true,
 			"engines": {
 				"node": ">= 4"
 			}
@@ -30790,7 +29186,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz",
 			"integrity": "sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==",
-			"dev": true,
 			"dependencies": {
 				"minimatch": "^3.0.4"
 			},
@@ -30799,21 +29194,23 @@
 			}
 		},
 		"node_modules/image-size": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz",
-			"integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.1.1.tgz",
+			"integrity": "sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ==",
+			"dependencies": {
+				"queue": "6.0.2"
+			},
 			"bin": {
 				"image-size": "bin/image-size.js"
 			},
 			"engines": {
-				"node": ">=4.0"
+				"node": ">=16.x"
 			}
 		},
 		"node_modules/image-ssim": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/image-ssim/-/image-ssim-0.2.0.tgz",
-			"integrity": "sha512-W7+sO6/yhxy83L0G7xR8YAc5Z5QFtYEXXRV6EaE8tuYBZJnA3gVgp3q7X7muhLZVodeb9UfvjSbwt9VJwjIYAg==",
-			"dev": true
+			"integrity": "sha512-W7+sO6/yhxy83L0G7xR8YAc5Z5QFtYEXXRV6EaE8tuYBZJnA3gVgp3q7X7muhLZVodeb9UfvjSbwt9VJwjIYAg=="
 		},
 		"node_modules/import-fresh": {
 			"version": "3.3.0",
@@ -30838,20 +29235,10 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/import-lazy": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/import-local": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
 			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-			"dev": true,
 			"dependencies": {
 				"pkg-dir": "^4.2.0",
 				"resolve-cwd": "^3.0.0"
@@ -30870,7 +29257,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
 			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
 			"dependencies": {
 				"locate-path": "^5.0.0",
 				"path-exists": "^4.0.0"
@@ -30883,7 +29269,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
 			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
 			"dependencies": {
 				"p-locate": "^4.1.0"
 			},
@@ -30895,7 +29280,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
 			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
 			"dependencies": {
 				"p-try": "^2.0.0"
 			},
@@ -30910,7 +29294,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
 			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
 			"dependencies": {
 				"p-limit": "^2.2.0"
 			},
@@ -30922,7 +29305,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
 			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -30931,7 +29313,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
 			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -30940,7 +29321,6 @@
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
 			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
 			"dependencies": {
 				"find-up": "^4.0.0"
 			},
@@ -30980,6 +29360,13 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/indento": {
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/indento/-/indento-1.1.13.tgz",
+			"integrity": "sha512-YZWk3mreBEM7sBPddsiQnW9Z8SGg/gNpFfscJq00HCDS7pxcQWWWMSVKJU7YkTRyDu1Zv2s8zaK8gQWKmCXHlg==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/infer-owner": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
@@ -31003,8 +29390,7 @@
 		"node_modules/ini": {
 			"version": "1.3.8",
 			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-			"dev": true
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
 		},
 		"node_modules/init-package-json": {
 			"version": "5.0.0",
@@ -31024,15 +29410,6 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/init-package-json/node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.0.0"
-			}
-		},
 		"node_modules/init-package-json/node_modules/hosted-git-info": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
@@ -31070,13 +29447,10 @@
 			}
 		},
 		"node_modules/init-package-json/node_modules/validate-npm-package-name": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-			"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+			"integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
 			"dev": true,
-			"dependencies": {
-				"builtins": "^5.0.0"
-			},
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
@@ -31085,7 +29459,6 @@
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
 			"integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-			"dev": true,
 			"dependencies": {
 				"ansi-escapes": "^4.2.1",
 				"chalk": "^3.0.0",
@@ -31109,7 +29482,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
 			"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.1.0",
 				"supports-color": "^7.1.0"
@@ -31122,7 +29494,6 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
 			"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-			"dev": true,
 			"dependencies": {
 				"restore-cursor": "^3.1.0"
 			},
@@ -31133,14 +29504,12 @@
 		"node_modules/inquirer/node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
 		"node_modules/inquirer/node_modules/figures": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
 			"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-			"dev": true,
 			"dependencies": {
 				"escape-string-regexp": "^1.0.5"
 			},
@@ -31155,7 +29524,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -31164,7 +29532,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -31173,7 +29540,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -31182,7 +29548,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
 			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
 			"dependencies": {
 				"mimic-fn": "^2.1.0"
 			},
@@ -31197,7 +29562,6 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
 			"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-			"dev": true,
 			"dependencies": {
 				"onetime": "^5.1.0",
 				"signal-exit": "^3.0.2"
@@ -31210,7 +29574,6 @@
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
@@ -31224,7 +29587,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -31236,7 +29598,6 @@
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
 			"integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
-			"dev": true,
 			"dependencies": {
 				"get-intrinsic": "^1.2.0",
 				"has": "^1.0.3",
@@ -31250,7 +29611,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
 			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.13.0"
 			}
@@ -31259,7 +29619,6 @@
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-4.4.0.tgz",
 			"integrity": "sha512-z+Bj2rS3LZSYU4+sNitdHrwnBhr0wO80ZJSW8EzKDBowwUe3Q/UsvgCGjrwa+HPzoGCLEb9HAjfJgo4j2Sac8w==",
-			"dev": true,
 			"dependencies": {
 				"intl-messageformat-parser": "^1.8.1"
 			}
@@ -31268,8 +29627,7 @@
 			"version": "1.8.1",
 			"resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.8.1.tgz",
 			"integrity": "sha512-IMSCKVf0USrM/959vj3xac7s8f87sc+80Y/ipBzdKy4ifBv5Gsj2tZ41EAaURVg01QU71fYr77uA8Meh6kELbg==",
-			"deprecated": "We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser",
-			"dev": true
+			"deprecated": "We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser"
 		},
 		"node_modules/invariant": {
 			"version": "2.2.4",
@@ -31280,15 +29638,33 @@
 			}
 		},
 		"node_modules/ip": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-			"integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+			"integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="
+		},
+		"node_modules/ip-address": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+			"integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+			"license": "MIT",
+			"dependencies": {
+				"jsbn": "1.1.0",
+				"sprintf-js": "^1.1.3"
+			},
+			"engines": {
+				"node": ">= 12"
+			}
+		},
+		"node_modules/ip-address/node_modules/sprintf-js": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+			"integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/ipaddr.js": {
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
 			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.10"
 			}
@@ -31297,7 +29673,6 @@
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.2.0.tgz",
 			"integrity": "sha512-YqTdPLfwP7YFN0SsD3QUVCkm9ZG2VzOXv3DOrw5G5mkMbVwptTwVcFv7/C0vOpBmgTxAeTG19XpUs1E522LW9Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -31312,32 +29687,21 @@
 			}
 		},
 		"node_modules/is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-accessor-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+			"integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+			"dev": true,
 			"dependencies": {
-				"is-buffer": "^1.1.5"
+				"hasown": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.10"
 			}
 		},
 		"node_modules/is-alphabetical": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
 			"integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-			"dev": true,
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -31347,7 +29711,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
 			"integrity": "sha512-ZmRL7++ZkcMOfDuWZuMJyIVLr2keE1o/DeNWh1EmgqGhUcV+9BIVsx0BcSBOHTZqzjs4+dISzr2KAeBEWGgXeA==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -31356,7 +29719,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz",
 			"integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
-			"dev": true,
 			"dependencies": {
 				"is-alphabetical": "^1.0.0",
 				"is-decimal": "^1.0.0"
@@ -31382,7 +29744,6 @@
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
 			"integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"get-intrinsic": "^1.2.0",
@@ -31401,7 +29762,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
 			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-			"dev": true,
 			"dependencies": {
 				"has-bigints": "^1.0.1"
 			},
@@ -31413,7 +29773,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
 			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-			"dev": true,
 			"dependencies": {
 				"binary-extensions": "^2.0.0"
 			},
@@ -31425,7 +29784,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
 			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -31446,7 +29804,6 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
 			"integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
-			"dev": true,
 			"dependencies": {
 				"builtin-modules": "^3.3.0"
 			},
@@ -31461,7 +29818,6 @@
 			"version": "1.2.7",
 			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
 			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -31499,32 +29855,21 @@
 			}
 		},
 		"node_modules/is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-			"dependencies": {
-				"kind-of": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-data-descriptor/node_modules/kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+			"integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+			"dev": true,
 			"dependencies": {
-				"is-buffer": "^1.1.5"
+				"hasown": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/is-date-object": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
 			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-			"dev": true,
 			"dependencies": {
 				"has-tostringtag": "^1.0.0"
 			},
@@ -31538,8 +29883,7 @@
 		"node_modules/is-decimal": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz",
-			"integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==",
-			"dev": true
+			"integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg=="
 		},
 		"node_modules/is-deflate": {
 			"version": "1.0.0",
@@ -31548,24 +29892,16 @@
 			"dev": true
 		},
 		"node_modules/is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+			"integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+			"dev": true,
 			"dependencies": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-descriptor/node_modules/kind-of": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-			"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/is-directory": {
@@ -31580,7 +29916,6 @@
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
 			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-			"dev": true,
 			"bin": {
 				"is-docker": "cli.js"
 			},
@@ -31603,7 +29938,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
 			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -31620,7 +29954,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
 			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -31644,7 +29977,6 @@
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
 			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"dev": true,
 			"dependencies": {
 				"is-extglob": "^2.1.1"
 			},
@@ -31664,14 +29996,12 @@
 		"node_modules/is-hexadecimal": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz",
-			"integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==",
-			"dev": true
+			"integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A=="
 		},
 		"node_modules/is-inside-container": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
 			"integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
-			"dev": true,
 			"dependencies": {
 				"is-docker": "^3.0.0"
 			},
@@ -31689,7 +30019,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
 			"integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-			"dev": true,
 			"bin": {
 				"is-docker": "cli.js"
 			},
@@ -31743,7 +30072,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
 			"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -31755,6 +30083,7 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
 			"integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+			"dev": true,
 			"dependencies": {
 				"kind-of": "^3.0.2"
 			},
@@ -31766,7 +30095,6 @@
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
 			"integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-			"dev": true,
 			"dependencies": {
 				"has-tostringtag": "^1.0.0"
 			},
@@ -31781,6 +30109,7 @@
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
 			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"dev": true,
 			"dependencies": {
 				"is-buffer": "^1.1.5"
 			},
@@ -31813,7 +30142,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
 			"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -31822,7 +30150,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
 			"integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-			"dev": true,
 			"dependencies": {
 				"is-path-inside": "^2.1.0"
 			},
@@ -31834,7 +30161,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
 			"integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-			"dev": true,
 			"dependencies": {
 				"path-is-inside": "^1.0.2"
 			},
@@ -31846,7 +30172,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
 			"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -31865,8 +30190,7 @@
 		"node_modules/is-potential-custom-element-name": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-			"dev": true
+			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
 		},
 		"node_modules/is-promise": {
 			"version": "4.0.0",
@@ -31877,7 +30201,6 @@
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
 			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -31911,7 +30234,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
 			"integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2"
 			},
@@ -31932,6 +30254,7 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
 			"integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -31940,7 +30263,6 @@
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
 			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-			"dev": true,
 			"dependencies": {
 				"has-tostringtag": "^1.0.0"
 			},
@@ -31955,7 +30277,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
 			"integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-			"dev": true,
 			"dependencies": {
 				"has-symbols": "^1.0.2"
 			},
@@ -31982,7 +30303,6 @@
 			"version": "1.1.12",
 			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
 			"integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
-			"dev": true,
 			"dependencies": {
 				"which-typed-array": "^1.1.11"
 			},
@@ -31996,8 +30316,7 @@
 		"node_modules/is-typedarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-			"dev": true
+			"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
 		},
 		"node_modules/is-unicode-supported": {
 			"version": "0.1.0",
@@ -32023,7 +30342,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
 			"integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2"
 			},
@@ -32048,7 +30366,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
 			"integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-			"dev": true,
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -32058,6 +30375,7 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
 			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -32066,7 +30384,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
 			"integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-			"dev": true,
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -32111,7 +30428,6 @@
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
 			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -32120,7 +30436,6 @@
 			"version": "5.2.1",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
 			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-			"dev": true,
 			"dependencies": {
 				"@babel/core": "^7.12.3",
 				"@babel/parser": "^7.14.7",
@@ -32136,7 +30451,6 @@
 			"version": "6.3.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
 			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
 			"bin": {
 				"semver": "bin/semver.js"
 			}
@@ -32145,7 +30459,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
 			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-			"dev": true,
 			"dependencies": {
 				"istanbul-lib-coverage": "^3.0.0",
 				"make-dir": "^3.0.0",
@@ -32159,7 +30472,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -32168,7 +30480,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -32180,7 +30491,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
 			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-			"dev": true,
 			"dependencies": {
 				"debug": "^4.1.1",
 				"istanbul-lib-coverage": "^3.0.0",
@@ -32194,7 +30504,6 @@
 			"version": "3.1.6",
 			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
 			"integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
-			"dev": true,
 			"dependencies": {
 				"html-escaper": "^2.0.0",
 				"istanbul-lib-report": "^3.0.0"
@@ -32254,7 +30563,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
 			"integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
-			"dev": true,
 			"dependencies": {
 				"@jest/core": "^29.6.2",
 				"@jest/types": "^29.6.1",
@@ -32280,7 +30588,6 @@
 			"version": "29.5.0",
 			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
 			"integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
-			"dev": true,
 			"dependencies": {
 				"execa": "^5.0.0",
 				"p-limit": "^3.1.0"
@@ -32293,7 +30600,6 @@
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
 			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -32307,7 +30613,6 @@
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
 			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"dev": true,
 			"dependencies": {
 				"cross-spawn": "^7.0.3",
 				"get-stream": "^6.0.0",
@@ -32330,7 +30635,6 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
 			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -32342,7 +30646,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
 			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.17.0"
 			}
@@ -32351,7 +30654,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
 			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -32363,7 +30665,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -32372,7 +30673,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
 			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.0.0"
 			},
@@ -32384,7 +30684,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
 			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
 			"dependencies": {
 				"mimic-fn": "^2.1.0"
 			},
@@ -32399,7 +30698,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -32408,7 +30706,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -32420,7 +30717,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -32429,7 +30725,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -32444,7 +30739,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
 			"integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
-			"dev": true,
 			"dependencies": {
 				"@jest/environment": "^29.6.2",
 				"@jest/expect": "^29.6.2",
@@ -32472,10 +30766,9 @@
 			}
 		},
 		"node_modules/jest-circus/node_modules/dedent": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
-			"integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
-			"dev": true,
+			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+			"integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
 			"peerDependencies": {
 				"babel-plugin-macros": "^3.1.0"
 			},
@@ -32489,7 +30782,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
 			"integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
-			"dev": true,
 			"dependencies": {
 				"@jest/core": "^29.6.2",
 				"@jest/test-result": "^29.6.2",
@@ -32523,7 +30815,6 @@
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
 			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-			"dev": true,
 			"dependencies": {
 				"string-width": "^4.2.0",
 				"strip-ansi": "^6.0.1",
@@ -32536,14 +30827,12 @@
 		"node_modules/jest-cli/node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
 		"node_modules/jest-cli/node_modules/is-fullwidth-code-point": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -32552,7 +30841,6 @@
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
@@ -32566,7 +30854,6 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
 			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.0.0",
 				"string-width": "^4.1.0",
@@ -32583,7 +30870,6 @@
 			"version": "5.0.8",
 			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
 			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -32592,7 +30878,6 @@
 			"version": "17.7.2",
 			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
 			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-			"dev": true,
 			"dependencies": {
 				"cliui": "^8.0.1",
 				"escalade": "^3.1.1",
@@ -32610,7 +30895,6 @@
 			"version": "21.1.1",
 			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
 			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			}
@@ -32619,7 +30903,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
 			"integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
-			"dev": true,
 			"dependencies": {
 				"@babel/core": "^7.11.6",
 				"@jest/test-sequencer": "^29.6.2",
@@ -32664,7 +30947,6 @@
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
 			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -32684,7 +30966,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -32693,15 +30974,14 @@
 			}
 		},
 		"node_modules/jest-diff": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
-			"integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
-			"dev": true,
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+			"integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
 			"dependencies": {
 				"chalk": "^4.0.0",
-				"diff-sequences": "^29.4.3",
-				"jest-get-type": "^29.4.3",
-				"pretty-format": "^29.6.2"
+				"diff-sequences": "^29.6.3",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
 			},
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -32711,7 +30991,6 @@
 			"version": "29.4.3",
 			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
 			"integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
-			"dev": true,
 			"dependencies": {
 				"detect-newline": "^3.0.0"
 			},
@@ -32723,7 +31002,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
 			"integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
-			"dev": true,
 			"dependencies": {
 				"@jest/types": "^29.6.1",
 				"chalk": "^4.0.0",
@@ -32739,7 +31017,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.2.tgz",
 			"integrity": "sha512-7oa/+266AAEgkzae8i1awNEfTfjwawWKLpiw2XesZmaoVVj9u9t8JOYx18cG29rbPNtkUlZ8V4b5Jb36y/VxoQ==",
-			"dev": true,
 			"dependencies": {
 				"@jest/environment": "^29.6.2",
 				"@jest/fake-timers": "^29.6.2",
@@ -32763,45 +31040,43 @@
 			}
 		},
 		"node_modules/jest-environment-node": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
-			"integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+			"integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
 			"dependencies": {
-				"@jest/environment": "^29.6.2",
-				"@jest/fake-timers": "^29.6.2",
-				"@jest/types": "^29.6.1",
+				"@jest/environment": "^29.7.0",
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/types": "^29.6.3",
 				"@types/node": "*",
-				"jest-mock": "^29.6.2",
-				"jest-util": "^29.6.2"
+				"jest-mock": "^29.7.0",
+				"jest-util": "^29.7.0"
 			},
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/jest-get-type": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
-			"integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
-			"dev": true,
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/jest-haste-map": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
-			"integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
-			"dev": true,
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+			"integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
 			"dependencies": {
-				"@jest/types": "^29.6.1",
+				"@jest/types": "^29.6.3",
 				"@types/graceful-fs": "^4.1.3",
 				"@types/node": "*",
 				"anymatch": "^3.0.3",
 				"fb-watchman": "^2.0.0",
 				"graceful-fs": "^4.2.9",
-				"jest-regex-util": "^29.4.3",
-				"jest-util": "^29.6.2",
-				"jest-worker": "^29.6.2",
+				"jest-regex-util": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"jest-worker": "^29.7.0",
 				"micromatch": "^4.0.4",
 				"walker": "^1.0.8"
 			},
@@ -32880,7 +31155,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
 			"integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
-			"dev": true,
 			"dependencies": {
 				"jest-get-type": "^29.4.3",
 				"pretty-format": "^29.6.2"
@@ -32890,15 +31164,14 @@
 			}
 		},
 		"node_modules/jest-matcher-utils": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
-			"integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
-			"dev": true,
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+			"integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
 			"dependencies": {
 				"chalk": "^4.0.0",
-				"jest-diff": "^29.6.2",
-				"jest-get-type": "^29.4.3",
-				"pretty-format": "^29.6.2"
+				"jest-diff": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
 			},
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -32924,13 +31197,13 @@
 			}
 		},
 		"node_modules/jest-mock": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
-			"integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+			"integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
 			"dependencies": {
-				"@jest/types": "^29.6.1",
+				"@jest/types": "^29.6.3",
 				"@types/node": "*",
-				"jest-util": "^29.6.2"
+				"jest-util": "^29.7.0"
 			},
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -32940,7 +31213,6 @@
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
 			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			},
@@ -32954,10 +31226,9 @@
 			}
 		},
 		"node_modules/jest-regex-util": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
-			"integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
-			"dev": true,
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+			"integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
@@ -32966,7 +31237,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
 			"integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
-			"dev": true,
 			"dependencies": {
 				"chalk": "^4.0.0",
 				"graceful-fs": "^4.2.9",
@@ -32986,7 +31256,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
 			"integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
-			"dev": true,
 			"dependencies": {
 				"jest-regex-util": "^29.4.3",
 				"jest-snapshot": "^29.6.2"
@@ -32999,7 +31268,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
 			"integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
-			"dev": true,
 			"dependencies": {
 				"@jest/console": "^29.6.2",
 				"@jest/environment": "^29.6.2",
@@ -33031,7 +31299,6 @@
 			"version": "0.5.13",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
 			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-			"dev": true,
 			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
@@ -33041,7 +31308,6 @@
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
 			"integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
-			"dev": true,
 			"dependencies": {
 				"@jest/environment": "^29.6.2",
 				"@jest/fake-timers": "^29.6.2",
@@ -33074,7 +31340,6 @@
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
 			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -33090,23 +31355,10 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/jest-serializer": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-			"integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-			"dependencies": {
-				"@types/node": "*",
-				"graceful-fs": "^4.2.9"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
 		"node_modules/jest-snapshot": {
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
 			"integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
-			"dev": true,
 			"dependencies": {
 				"@babel/core": "^7.11.6",
 				"@babel/generator": "^7.7.2",
@@ -33134,11 +31386,11 @@
 			}
 		},
 		"node_modules/jest-util": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
-			"integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
 			"dependencies": {
-				"@jest/types": "^29.6.1",
+				"@jest/types": "^29.6.3",
 				"@types/node": "*",
 				"chalk": "^4.0.0",
 				"ci-info": "^3.2.0",
@@ -33150,17 +31402,16 @@
 			}
 		},
 		"node_modules/jest-validate": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
-			"integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
-			"dev": true,
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+			"integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
 			"dependencies": {
-				"@jest/types": "^29.6.1",
+				"@jest/types": "^29.6.3",
 				"camelcase": "^6.2.0",
 				"chalk": "^4.0.0",
-				"jest-get-type": "^29.4.3",
+				"jest-get-type": "^29.6.3",
 				"leven": "^3.1.0",
-				"pretty-format": "^29.6.2"
+				"pretty-format": "^29.7.0"
 			},
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -33170,7 +31421,6 @@
 			"version": "6.3.0",
 			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
 			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -33200,13 +31450,10 @@
 			}
 		},
 		"node_modules/jest-watch-typeahead/node_modules/ansi-escapes": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz",
-			"integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==",
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz",
+			"integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==",
 			"dev": true,
-			"dependencies": {
-				"type-fest": "^3.0.0"
-			},
 			"engines": {
 				"node": ">=14.16"
 			},
@@ -33215,10 +31462,11 @@
 			}
 		},
 		"node_modules/jest-watch-typeahead/node_modules/ansi-regex": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=12"
 			},
@@ -33290,23 +31538,10 @@
 				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
 			}
 		},
-		"node_modules/jest-watch-typeahead/node_modules/type-fest": {
-			"version": "3.13.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-			"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-			"dev": true,
-			"engines": {
-				"node": ">=14.16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/jest-watcher": {
 			"version": "29.6.2",
 			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
 			"integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
-			"dev": true,
 			"dependencies": {
 				"@jest/test-result": "^29.6.2",
 				"@jest/types": "^29.6.1",
@@ -33322,13 +31557,12 @@
 			}
 		},
 		"node_modules/jest-worker": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
-			"integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
-			"dev": true,
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+			"integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
 			"dependencies": {
 				"@types/node": "*",
-				"jest-util": "^29.6.2",
+				"jest-util": "^29.7.0",
 				"merge-stream": "^2.0.0",
 				"supports-color": "^8.0.0"
 			},
@@ -33340,7 +31574,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -33349,7 +31582,6 @@
 			"version": "8.1.1",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
 			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -33361,28 +31593,27 @@
 			}
 		},
 		"node_modules/joi": {
-			"version": "17.5.0",
-			"resolved": "https://registry.npmjs.org/joi/-/joi-17.5.0.tgz",
-			"integrity": "sha512-R7hR50COp7StzLnDi4ywOXHrBrgNXuUUfJWIR5lPY5Bm/pOD3jZaTwpluUXVLRWcoWZxkrHBBJ5hLxgnlehbdw==",
-			"dependencies": {
-				"@hapi/hoek": "^9.0.0",
-				"@hapi/topo": "^5.0.0",
-				"@sideway/address": "^4.1.3",
-				"@sideway/formula": "^3.0.0",
+			"version": "17.13.3",
+			"resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
+			"integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@hapi/hoek": "^9.3.0",
+				"@hapi/topo": "^5.1.0",
+				"@sideway/address": "^4.1.5",
+				"@sideway/formula": "^3.0.1",
 				"@sideway/pinpoint": "^2.0.0"
 			}
 		},
 		"node_modules/jpeg-js": {
 			"version": "0.4.4",
 			"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
-			"integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==",
-			"dev": true
+			"integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
 		},
 		"node_modules/js-library-detector": {
 			"version": "6.7.0",
 			"resolved": "https://registry.npmjs.org/js-library-detector/-/js-library-detector-6.7.0.tgz",
 			"integrity": "sha512-c80Qupofp43y4cJ7+8TTDN/AsDwLi5oOm/plBrWI+iQt485vKXCco+yVmOwEgdo9VOdsYTuV0UlTeetVPTriXA==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			}
@@ -33404,6 +31635,12 @@
 				"js-yaml": "bin/js-yaml.js"
 			}
 		},
+		"node_modules/jsbn": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+			"integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+			"license": "MIT"
+		},
 		"node_modules/jsc-android": {
 			"version": "250231.0.0",
 			"resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-250231.0.0.tgz",
@@ -33415,9 +31652,9 @@
 			"integrity": "sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q=="
 		},
 		"node_modules/jscodeshift": {
-			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.13.1.tgz",
-			"integrity": "sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ==",
+			"version": "0.14.0",
+			"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
+			"integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
 			"dependencies": {
 				"@babel/core": "^7.13.16",
 				"@babel/parser": "^7.13.16",
@@ -33432,10 +31669,10 @@
 				"chalk": "^4.1.2",
 				"flow-parser": "0.*",
 				"graceful-fs": "^4.2.4",
-				"micromatch": "^3.1.10",
+				"micromatch": "^4.0.4",
 				"neo-async": "^2.5.0",
 				"node-dir": "^0.1.17",
-				"recast": "^0.20.4",
+				"recast": "^0.21.0",
 				"temp": "^0.8.4",
 				"write-file-atomic": "^2.3.0"
 			},
@@ -33446,37 +31683,6 @@
 				"@babel/preset-env": "^7.1.6"
 			}
 		},
-		"node_modules/jscodeshift/node_modules/braces": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-			"dependencies": {
-				"arr-flatten": "^1.1.0",
-				"array-unique": "^0.3.2",
-				"extend-shallow": "^2.0.1",
-				"fill-range": "^4.0.0",
-				"isobject": "^3.0.1",
-				"repeat-element": "^1.1.2",
-				"snapdragon": "^0.8.1",
-				"snapdragon-node": "^2.0.1",
-				"split-string": "^3.0.2",
-				"to-regex": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/jscodeshift/node_modules/braces/node_modules/extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-			"dependencies": {
-				"is-extendable": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/jscodeshift/node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -33492,50 +31698,6 @@
 				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"node_modules/jscodeshift/node_modules/fill-range": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-			"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-			"dependencies": {
-				"extend-shallow": "^2.0.1",
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1",
-				"to-regex-range": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/jscodeshift/node_modules/fill-range/node_modules/extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-			"dependencies": {
-				"is-extendable": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/jscodeshift/node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/jscodeshift/node_modules/has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -33544,40 +31706,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/jscodeshift/node_modules/micromatch": {
-			"version": "3.1.10",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-			"dependencies": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"braces": "^2.3.1",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"extglob": "^2.0.4",
-				"fragment-cache": "^0.2.1",
-				"kind-of": "^6.0.2",
-				"nanomatch": "^1.2.9",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/jscodeshift/node_modules/rimraf": {
-			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-			"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-			"dependencies": {
-				"glob": "^7.1.3"
-			},
-			"bin": {
-				"rimraf": "bin.js"
-			}
-		},
 		"node_modules/jscodeshift/node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -33589,61 +31717,46 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/jscodeshift/node_modules/temp": {
-			"version": "0.8.4",
-			"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
-			"integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
-			"dependencies": {
-				"rimraf": "~2.6.2"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
 		"node_modules/jsdoc-type-pratt-parser": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
 			"integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=12.0.0"
 			}
 		},
 		"node_modules/jsdom": {
-			"version": "22.1.0",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
-			"integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
-			"dev": true,
+			"version": "25.0.1",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-25.0.1.tgz",
+			"integrity": "sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==",
 			"dependencies": {
-				"abab": "^2.0.6",
-				"cssstyle": "^3.0.0",
-				"data-urls": "^4.0.0",
+				"cssstyle": "^4.1.0",
+				"data-urls": "^5.0.0",
 				"decimal.js": "^10.4.3",
-				"domexception": "^4.0.0",
 				"form-data": "^4.0.0",
-				"html-encoding-sniffer": "^3.0.0",
-				"http-proxy-agent": "^5.0.0",
-				"https-proxy-agent": "^5.0.1",
+				"html-encoding-sniffer": "^4.0.0",
+				"http-proxy-agent": "^7.0.2",
+				"https-proxy-agent": "^7.0.5",
 				"is-potential-custom-element-name": "^1.0.1",
-				"nwsapi": "^2.2.4",
+				"nwsapi": "^2.2.12",
 				"parse5": "^7.1.2",
-				"rrweb-cssom": "^0.6.0",
+				"rrweb-cssom": "^0.7.1",
 				"saxes": "^6.0.0",
 				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^4.1.2",
-				"w3c-xmlserializer": "^4.0.0",
+				"tough-cookie": "^5.0.0",
+				"w3c-xmlserializer": "^5.0.0",
 				"webidl-conversions": "^7.0.0",
-				"whatwg-encoding": "^2.0.0",
-				"whatwg-mimetype": "^3.0.0",
-				"whatwg-url": "^12.0.1",
-				"ws": "^8.13.0",
-				"xml-name-validator": "^4.0.0"
+				"whatwg-encoding": "^3.1.1",
+				"whatwg-mimetype": "^4.0.0",
+				"whatwg-url": "^14.0.0",
+				"ws": "^8.18.0",
+				"xml-name-validator": "^5.0.0"
 			},
 			"engines": {
-				"node": ">=16"
+				"node": ">=18"
 			},
 			"peerDependencies": {
-				"canvas": "^2.5.0"
+				"canvas": "^2.11.2"
 			},
 			"peerDependenciesMeta": {
 				"canvas": {
@@ -33660,69 +31773,77 @@
 				"querystring": "^0.2.0"
 			}
 		},
-		"node_modules/jsdom/node_modules/tough-cookie": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-			"integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-			"dev": true,
+		"node_modules/jsdom/node_modules/agent-base": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+			"integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
 			"dependencies": {
-				"psl": "^1.1.33",
-				"punycode": "^2.1.1",
-				"universalify": "^0.2.0",
-				"url-parse": "^1.5.3"
+				"debug": "^4.3.4"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": ">= 14"
 			}
 		},
-		"node_modules/jsdom/node_modules/tr46": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-			"integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
-			"dev": true,
+		"node_modules/jsdom/node_modules/http-proxy-agent": {
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
 			"dependencies": {
-				"punycode": "^2.3.0"
+				"agent-base": "^7.1.0",
+				"debug": "^4.3.4"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">= 14"
 			}
 		},
-		"node_modules/jsdom/node_modules/universalify": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-			"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-			"dev": true,
+		"node_modules/jsdom/node_modules/https-proxy-agent": {
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+			"integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+			"dependencies": {
+				"agent-base": "^7.0.2",
+				"debug": "4"
+			},
 			"engines": {
-				"node": ">= 4.0.0"
+				"node": ">= 14"
+			}
+		},
+		"node_modules/jsdom/node_modules/tr46": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
+			"integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
+			"dependencies": {
+				"punycode": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/jsdom/node_modules/webidl-conversions": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
 			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/jsdom/node_modules/whatwg-url": {
-			"version": "12.0.1",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-			"integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
-			"dev": true,
+			"version": "14.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
+			"integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
 			"dependencies": {
-				"tr46": "^4.1.1",
+				"tr46": "^5.0.0",
 				"webidl-conversions": "^7.0.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
 		"node_modules/jsdom/node_modules/ws": {
-			"version": "8.13.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-			"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-			"dev": true,
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			},
@@ -33740,14 +31861,15 @@
 			}
 		},
 		"node_modules/jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+			"integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+			"license": "MIT",
 			"bin": {
 				"jsesc": "bin/jsesc"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": ">=6"
 			}
 		},
 		"node_modules/jsftp": {
@@ -33785,8 +31907,7 @@
 		"node_modules/json-buffer": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-			"dev": true
+			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
 		},
 		"node_modules/json-parse-better-errors": {
 			"version": "1.0.2",
@@ -33807,13 +31928,35 @@
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
+		"node_modules/json-stable-stringify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz",
+			"integrity": "sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.5",
+				"isarray": "^2.0.5",
+				"jsonify": "^0.0.1",
+				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+		},
+		"node_modules/json-stable-stringify/node_modules/isarray": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
 			"dev": true
 		},
 		"node_modules/json-stringify-safe": {
@@ -33822,11 +31965,20 @@
 			"integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
 			"dev": true
 		},
+		"node_modules/json2md": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/json2md/-/json2md-2.0.1.tgz",
+			"integrity": "sha512-VbwmZ83qmUfKBS2pUOHlzNKEZFPBeJSbzEok3trMYyboZUgdHNn1XZfc1uT8UZs1GHCrmRUBXCfqw4YmmQuOhw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"indento": "^1.1.13"
+			}
+		},
 		"node_modules/json2php": {
 			"version": "0.0.7",
 			"resolved": "https://registry.npmjs.org/json2php/-/json2php-0.0.7.tgz",
-			"integrity": "sha512-dnSoUiLAoVaMXxFsVi4CrPVYMKOuDBXTghXSmMINX44RZ8WM9cXlY7UqrQnlAcODCVO7FV3+8t/5nDKAjimLfg==",
-			"dev": true
+			"integrity": "sha512-dnSoUiLAoVaMXxFsVi4CrPVYMKOuDBXTghXSmMINX44RZ8WM9cXlY7UqrQnlAcODCVO7FV3+8t/5nDKAjimLfg=="
 		},
 		"node_modules/json5": {
 			"version": "2.2.3",
@@ -33842,8 +31994,7 @@
 		"node_modules/jsonc-parser": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-			"integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-			"dev": true
+			"integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
 		},
 		"node_modules/jsonfile": {
 			"version": "4.0.0",
@@ -33853,6 +32004,15 @@
 				"graceful-fs": "^4.1.6"
 			}
 		},
+		"node_modules/jsonify": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+			"integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/jsonparse": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -33882,7 +32042,6 @@
 			"version": "3.3.5",
 			"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
 			"integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-			"dev": true,
 			"dependencies": {
 				"array-includes": "^3.1.6",
 				"array.prototype.flat": "^1.3.1",
@@ -33894,10 +32053,9 @@
 			}
 		},
 		"node_modules/keyv": {
-			"version": "4.5.3",
-			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
-			"integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
-			"dev": true,
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
 			"dependencies": {
 				"json-buffer": "3.0.1"
 			}
@@ -33940,16 +32098,14 @@
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
 			"integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
-			"dev": true,
 			"engines": {
 				"node": ">= 8"
 			}
 		},
 		"node_modules/known-css-properties": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
-			"integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
-			"dev": true
+			"version": "0.34.0",
+			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.34.0.tgz",
+			"integrity": "sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ=="
 		},
 		"node_modules/kuler": {
 			"version": "2.0.0",
@@ -33972,14 +32128,12 @@
 		"node_modules/language-subtag-registry": {
 			"version": "0.3.21",
 			"resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-			"integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-			"dev": true
+			"integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg=="
 		},
 		"node_modules/language-tags": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
 			"integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
-			"dev": true,
 			"dependencies": {
 				"language-subtag-registry": "~0.3.2"
 			}
@@ -33988,7 +32142,6 @@
 			"version": "2.6.0",
 			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
 			"integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
-			"dev": true,
 			"dependencies": {
 				"picocolors": "^1.0.0",
 				"shell-quote": "^1.7.3"
@@ -33998,7 +32151,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
 			"integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -34174,9 +32326,9 @@
 			}
 		},
 		"node_modules/lerna/node_modules/@octokit/openapi-types": {
-			"version": "18.0.0",
-			"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz",
-			"integrity": "sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw==",
+			"version": "18.1.1",
+			"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.1.1.tgz",
+			"integrity": "sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==",
 			"dev": true
 		},
 		"node_modules/lerna/node_modules/@octokit/plugin-paginate-rest": {
@@ -34324,14 +32476,14 @@
 			}
 		},
 		"node_modules/lerna/node_modules/cosmiconfig": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-			"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
+			"version": "8.3.6",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+			"integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
 			"dev": true,
 			"dependencies": {
-				"import-fresh": "^3.2.1",
+				"import-fresh": "^3.3.0",
 				"js-yaml": "^4.1.0",
-				"parse-json": "^5.0.0",
+				"parse-json": "^5.2.0",
 				"path-type": "^4.0.0"
 			},
 			"engines": {
@@ -34339,6 +32491,14 @@
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/d-fischer"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.9.5"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/lerna/node_modules/cross-spawn": {
@@ -34412,9 +32572,9 @@
 			}
 		},
 		"node_modules/lerna/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -34648,21 +32808,6 @@
 				"graceful-fs": "^4.1.6"
 			}
 		},
-		"node_modules/lerna/node_modules/load-json-file": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz",
-			"integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==",
-			"dev": true,
-			"dependencies": {
-				"graceful-fs": "^4.1.15",
-				"parse-json": "^5.0.0",
-				"strip-bom": "^4.0.0",
-				"type-fest": "^0.6.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/lerna/node_modules/lru-cache": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -34725,6 +32870,7 @@
 			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
 			"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"whatwg-url": "^5.0.0"
 			},
@@ -35021,15 +33167,15 @@
 			}
 		},
 		"node_modules/lerna/node_modules/universal-user-agent": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-			"integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+			"integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
 			"dev": true
 		},
 		"node_modules/lerna/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
@@ -35058,9 +33204,9 @@
 			}
 		},
 		"node_modules/lerna/node_modules/validate-npm-package-name/node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
+			"integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
 			"dev": true,
 			"dependencies": {
 				"semver": "^7.0.0"
@@ -35112,15 +33258,6 @@
 			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 			"dev": true
 		},
-		"node_modules/lerna/node_modules/yargs-parser": {
-			"version": "20.2.4",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/leven": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -35133,7 +33270,6 @@
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
 			"integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-			"dev": true,
 			"dependencies": {
 				"prelude-ls": "~1.1.2",
 				"type-check": "~0.3.2"
@@ -35174,15 +33310,6 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/libnpmaccess/node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.0.0"
-			}
-		},
 		"node_modules/libnpmaccess/node_modules/hosted-git-info": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
@@ -35220,13 +33347,10 @@
 			}
 		},
 		"node_modules/libnpmaccess/node_modules/validate-npm-package-name": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-			"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+			"integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
 			"dev": true,
-			"dependencies": {
-				"builtins": "^5.0.0"
-			},
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
@@ -35250,15 +33374,6 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/libnpmpublish/node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.0.0"
-			}
-		},
 		"node_modules/libnpmpublish/node_modules/hosted-git-info": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
@@ -35281,12 +33396,13 @@
 			}
 		},
 		"node_modules/libnpmpublish/node_modules/minipass": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-			"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
-				"node": ">=8"
+				"node": ">=16 || 14 >=14.17"
 			}
 		},
 		"node_modules/libnpmpublish/node_modules/normalize-package-data": {
@@ -35320,25 +33436,22 @@
 			}
 		},
 		"node_modules/libnpmpublish/node_modules/ssri": {
-			"version": "10.0.4",
-			"resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz",
-			"integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==",
+			"version": "10.0.6",
+			"resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
+			"integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
 			"dev": true,
 			"dependencies": {
-				"minipass": "^5.0.0"
+				"minipass": "^7.0.3"
 			},
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
 		"node_modules/libnpmpublish/node_modules/validate-npm-package-name": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-			"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+			"integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
 			"dev": true,
-			"dependencies": {
-				"builtins": "^5.0.0"
-			},
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
@@ -35347,7 +33460,6 @@
 			"version": "10.4.0",
 			"resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-10.4.0.tgz",
 			"integrity": "sha512-XQWHEWkJ8YxSPsxttBJORy5+hQrzbvGkYfeP3fJjyYKioWkF2MXfFqNK4ZuV4jL8pBu7Z91qnQP6In0bq1yXww==",
-			"dev": true,
 			"dependencies": {
 				"@sentry/node": "^6.17.4",
 				"axe-core": "4.7.2",
@@ -35390,7 +33502,6 @@
 			"version": "1.4.2",
 			"resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz",
 			"integrity": "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==",
-			"dev": true,
 			"dependencies": {
 				"debug": "^2.6.9",
 				"marky": "^1.2.2"
@@ -35400,7 +33511,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -35408,14 +33518,12 @@
 		"node_modules/lighthouse-stack-packs": {
 			"version": "1.11.0",
 			"resolved": "https://registry.npmjs.org/lighthouse-stack-packs/-/lighthouse-stack-packs-1.11.0.tgz",
-			"integrity": "sha512-sRr0z1S/I26VffRLq9KJsKtLk856YrJlNGmcJmbLX8dFn3MuzVPUbstuChEhqnSxZb8TZmVfthuXuwhG9vRoSw==",
-			"dev": true
+			"integrity": "sha512-sRr0z1S/I26VffRLq9KJsKtLk856YrJlNGmcJmbLX8dFn3MuzVPUbstuChEhqnSxZb8TZmVfthuXuwhG9vRoSw=="
 		},
 		"node_modules/lighthouse/node_modules/cliui": {
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
 			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-			"dev": true,
 			"dependencies": {
 				"string-width": "^4.2.0",
 				"strip-ansi": "^6.0.1",
@@ -35425,32 +33533,20 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/lighthouse/node_modules/cross-fetch": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
-			"integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
-			"dev": true,
-			"dependencies": {
-				"node-fetch": "^2.6.12"
-			}
-		},
 		"node_modules/lighthouse/node_modules/devtools-protocol": {
 			"version": "0.0.1155343",
 			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1155343.tgz",
-			"integrity": "sha512-oD9vGBV2wTc7fAzAM6KC0chSgs234V8+qDEeK+mcbRj2UvcuA7lgBztGi/opj/iahcXD3BSj8Ymvib628yy9FA==",
-			"dev": true
+			"integrity": "sha512-oD9vGBV2wTc7fAzAM6KC0chSgs234V8+qDEeK+mcbRj2UvcuA7lgBztGi/opj/iahcXD3BSj8Ymvib628yy9FA=="
 		},
 		"node_modules/lighthouse/node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
 		"node_modules/lighthouse/node_modules/is-fullwidth-code-point": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -35459,7 +33555,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
 			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-			"dev": true,
 			"dependencies": {
 				"is-docker": "^2.0.0"
 			},
@@ -35467,31 +33562,10 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/lighthouse/node_modules/node-fetch": {
-			"version": "2.6.12",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-			"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-			"dev": true,
-			"dependencies": {
-				"whatwg-url": "^5.0.0"
-			},
-			"engines": {
-				"node": "4.x || >=6.0.0"
-			},
-			"peerDependencies": {
-				"encoding": "^0.1.0"
-			},
-			"peerDependenciesMeta": {
-				"encoding": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/lighthouse/node_modules/open": {
 			"version": "8.4.2",
 			"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
 			"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-			"dev": true,
 			"dependencies": {
 				"define-lazy-prop": "^2.0.0",
 				"is-docker": "^2.1.1",
@@ -35508,7 +33582,6 @@
 			"version": "20.9.0",
 			"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.9.0.tgz",
 			"integrity": "sha512-H9fYZQzMTRrkboEfPmf7m3CLDN6JvbxXA3qTtS+dFt27tR+CsFHzPsT6pzp6lYL6bJbAPaR0HaPO6uSi+F94Pg==",
-			"dev": true,
 			"dependencies": {
 				"@puppeteer/browsers": "1.4.6",
 				"chromium-bidi": "0.4.16",
@@ -35532,14 +33605,12 @@
 		"node_modules/lighthouse/node_modules/puppeteer-core/node_modules/devtools-protocol": {
 			"version": "0.0.1147663",
 			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1147663.tgz",
-			"integrity": "sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ==",
-			"dev": true
+			"integrity": "sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ=="
 		},
 		"node_modules/lighthouse/node_modules/puppeteer-core/node_modules/ws": {
 			"version": "8.13.0",
 			"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
 			"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.0.0"
 			},
@@ -35560,7 +33631,6 @@
 			"version": "5.7.2",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
 			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"dev": true,
 			"bin": {
 				"semver": "bin/semver"
 			}
@@ -35569,7 +33639,6 @@
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
@@ -35583,7 +33652,6 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
 			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.0.0",
 				"string-width": "^4.1.0",
@@ -35600,7 +33668,6 @@
 			"version": "5.0.8",
 			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
 			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -35609,7 +33676,6 @@
 			"version": "17.7.2",
 			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
 			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-			"dev": true,
 			"dependencies": {
 				"cliui": "^8.0.1",
 				"escalade": "^3.1.1",
@@ -35627,7 +33693,6 @@
 			"version": "21.1.1",
 			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
 			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			}
@@ -35636,7 +33701,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
 			"integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -35653,23 +33717,22 @@
 			}
 		},
 		"node_modules/lines-and-columns": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
 		},
 		"node_modules/linkify-it": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
 			"integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
-			"dev": true,
 			"dependencies": {
 				"uc.micro": "^1.0.1"
 			}
 		},
 		"node_modules/lint-staged": {
-			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.0.1.tgz",
-			"integrity": "sha512-Qk48GmcMX8zFzhuJsf0ZquILxnnDkY56Y+/y1TGxEe4S5P+RetnisiF0Z15t+Gwa5PMNAG4dPxqGHabW7L4zwg==",
+			"version": "10.0.2",
+			"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.0.2.tgz",
+			"integrity": "sha512-ZldhtIfT7bynVa7nmU/1jbK05r9hYQXbIQqZSotqdBCAcGJDEUqaUB7kG3ZCdoe9Qkj6HUM3x2yjCGJRxPUQLA==",
 			"dev": true,
 			"dependencies": {
 				"chalk": "^3.0.0",
@@ -35683,6 +33746,7 @@
 				"micromatch": "^4.0.2",
 				"normalize-path": "^3.0.0",
 				"please-upgrade-node": "^3.2.0",
+				"string-argv": "0.3.1",
 				"stringify-object": "^3.3.0"
 			},
 			"bin": {
@@ -36155,6 +34219,21 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/load-json-file": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz",
+			"integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.1.15",
+				"parse-json": "^5.0.0",
+				"strip-bom": "^4.0.0",
+				"type-fest": "^0.6.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/loader-runner": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -36168,7 +34247,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
 			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-			"dev": true,
 			"dependencies": {
 				"big.js": "^5.2.2",
 				"emojis-list": "^3.0.0",
@@ -36204,8 +34282,7 @@
 		"node_modules/locate-path": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-			"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-			"dev": true,
+			"integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
 			"dependencies": {
 				"p-locate": "^2.0.0",
 				"path-exists": "^3.0.0"
@@ -36242,14 +34319,12 @@
 		"node_modules/lodash.escape": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-			"integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==",
-			"dev": true
+			"integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw=="
 		},
 		"node_modules/lodash.flatten": {
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-			"integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-			"dev": true
+			"integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="
 		},
 		"node_modules/lodash.get": {
 			"version": "4.4.2",
@@ -36260,13 +34335,7 @@
 		"node_modules/lodash.invokemap": {
 			"version": "4.6.0",
 			"resolved": "https://registry.npmjs.org/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz",
-			"integrity": "sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w==",
-			"dev": true
-		},
-		"node_modules/lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+			"integrity": "sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w=="
 		},
 		"node_modules/lodash.ismatch": {
 			"version": "4.4.0",
@@ -36277,20 +34346,17 @@
 		"node_modules/lodash.memoize": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-			"dev": true
+			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
 		},
 		"node_modules/lodash.merge": {
 			"version": "4.6.2",
 			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"dev": true
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
 		},
 		"node_modules/lodash.pullall": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/lodash.pullall/-/lodash.pullall-4.2.0.tgz",
-			"integrity": "sha512-VhqxBKH0ZxPpLhiu68YD1KnHmbhQJQctcipvmFnqIBDYzcIHzf3Zpu0tpeOKtR4x76p9yohc506eGdOjTmyIBg==",
-			"dev": true
+			"integrity": "sha512-VhqxBKH0ZxPpLhiu68YD1KnHmbhQJQctcipvmFnqIBDYzcIHzf3Zpu0tpeOKtR4x76p9yohc506eGdOjTmyIBg=="
 		},
 		"node_modules/lodash.set": {
 			"version": "4.3.2",
@@ -36306,20 +34372,17 @@
 		"node_modules/lodash.truncate": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-			"integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-			"dev": true
+			"integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="
 		},
 		"node_modules/lodash.uniq": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-			"dev": true
+			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
 		},
 		"node_modules/lodash.uniqby": {
 			"version": "4.7.0",
 			"resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
-			"integrity": "sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==",
-			"dev": true
+			"integrity": "sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww=="
 		},
 		"node_modules/lodash.zip": {
 			"version": "4.2.0",
@@ -36577,14 +34640,12 @@
 		"node_modules/longest-streak": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
-			"integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
-			"dev": true
+			"integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA=="
 		},
 		"node_modules/lookup-closest-locale": {
 			"version": "6.2.0",
 			"resolved": "https://registry.npmjs.org/lookup-closest-locale/-/lookup-closest-locale-6.2.0.tgz",
-			"integrity": "sha512-/c2kL+Vnp1jnV6K6RpDTHK3dgg0Tu2VVp+elEiJpjfS1UyY7AjOYHohRug6wT0OpoX2qFgNORndE9RqesfVxWQ==",
-			"dev": true
+			"integrity": "sha512-/c2kL+Vnp1jnV6K6RpDTHK3dgg0Tu2VVp+elEiJpjfS1UyY7AjOYHohRug6wT0OpoX2qFgNORndE9RqesfVxWQ=="
 		},
 		"node_modules/loose-envify": {
 			"version": "1.4.0",
@@ -36609,7 +34670,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
 			"integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -36617,14 +34677,12 @@
 		"node_modules/lru_map": {
 			"version": "0.3.3",
 			"resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
-			"integrity": "sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==",
-			"dev": true
+			"integrity": "sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="
 		},
 		"node_modules/lru-cache": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
-			"integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-			"dev": true,
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
 			"dependencies": {
 				"pseudomap": "^1.0.2",
 				"yallist": "^2.1.2"
@@ -36654,11 +34712,22 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/magic-string": {
+			"version": "0.30.7",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz",
+			"integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/sourcemap-codec": "^1.4.15"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/make-dir": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz",
 			"integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
-			"dev": true,
 			"dependencies": {
 				"semver": "^6.0.0"
 			},
@@ -36670,7 +34739,6 @@
 			"version": "6.3.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
 			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
 			"bin": {
 				"semver": "bin/semver.js"
 			}
@@ -36707,18 +34775,6 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/make-fetch-happen/node_modules/@npmcli/fs": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
-			"integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.3.5"
-			},
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
 		"node_modules/make-fetch-happen/node_modules/brace-expansion": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -36729,16 +34785,16 @@
 			}
 		},
 		"node_modules/make-fetch-happen/node_modules/cacache": {
-			"version": "17.1.3",
-			"resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz",
-			"integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==",
+			"version": "17.1.4",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
+			"integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
 			"dev": true,
 			"dependencies": {
 				"@npmcli/fs": "^3.1.0",
 				"fs-minipass": "^3.0.0",
 				"glob": "^10.2.2",
 				"lru-cache": "^7.7.1",
-				"minipass": "^5.0.0",
+				"minipass": "^7.0.3",
 				"minipass-collect": "^1.0.2",
 				"minipass-flush": "^1.0.5",
 				"minipass-pipeline": "^1.2.4",
@@ -36751,68 +34807,83 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/make-fetch-happen/node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+		"node_modules/make-fetch-happen/node_modules/cacache/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
+			"license": "ISC",
 			"engines": {
-				"node": ">= 8"
+				"node": ">=16 || 14 >=14.17"
 			}
 		},
-		"node_modules/make-fetch-happen/node_modules/foreground-child": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-			"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+		"node_modules/make-fetch-happen/node_modules/fs-minipass": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
+			"integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
 			"dev": true,
 			"dependencies": {
-				"cross-spawn": "^7.0.0",
-				"signal-exit": "^4.0.1"
+				"minipass": "^7.0.3"
 			},
 			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/make-fetch-happen/node_modules/fs-minipass": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz",
-			"integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==",
+		"node_modules/make-fetch-happen/node_modules/fs-minipass/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
-			"dependencies": {
-				"minipass": "^5.0.0"
-			},
+			"license": "ISC",
 			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+				"node": ">=16 || 14 >=14.17"
 			}
 		},
 		"node_modules/make-fetch-happen/node_modules/glob": {
-			"version": "10.3.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-			"integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"foreground-child": "^3.1.0",
-				"jackspeak": "^2.0.3",
-				"minimatch": "^9.0.1",
-				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-				"path-scurry": "^1.10.1"
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
 			},
 			"bin": {
-				"glob": "dist/cjs/src/bin.js"
+				"glob": "dist/esm/bin.mjs"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/make-fetch-happen/node_modules/glob/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": ">=16 || 14 >=14.17"
+			}
+		},
+		"node_modules/make-fetch-happen/node_modules/jackspeak": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+			"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"@isaacs/cliui": "^8.0.2"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
+			},
+			"optionalDependencies": {
+				"@pkgjs/parseargs": "^0.11.0"
 			}
 		},
 		"node_modules/make-fetch-happen/node_modules/lru-cache": {
@@ -36825,10 +34896,11 @@
 			}
 		},
 		"node_modules/make-fetch-happen/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -36848,58 +34920,26 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/make-fetch-happen/node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/make-fetch-happen/node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+		"node_modules/make-fetch-happen/node_modules/ssri": {
+			"version": "10.0.6",
+			"resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
+			"integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
 			"dev": true,
 			"dependencies": {
-				"shebang-regex": "^3.0.0"
+				"minipass": "^7.0.3"
 			},
 			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/make-fetch-happen/node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/make-fetch-happen/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/make-fetch-happen/node_modules/ssri": {
-			"version": "10.0.4",
-			"resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz",
-			"integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==",
+		"node_modules/make-fetch-happen/node_modules/ssri/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
-			"dependencies": {
-				"minipass": "^5.0.0"
-			},
+			"license": "ISC",
 			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+				"node": ">=16 || 14 >=14.17"
 			}
 		},
 		"node_modules/make-fetch-happen/node_modules/unique-filename": {
@@ -36926,21 +34966,6 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/make-fetch-happen/node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
 		"node_modules/makeerror": {
 			"version": "1.0.12",
 			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -36953,6 +34978,7 @@
 			"version": "0.2.2",
 			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
 			"integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -36961,7 +34987,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
 			"integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -36975,13 +35000,13 @@
 		"node_modules/map-values": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/map-values/-/map-values-1.0.1.tgz",
-			"integrity": "sha512-BbShUnr5OartXJe1GeccAWtfro11hhgNJg6G9/UtWKjVGvV5U4C09cg5nk8JUevhXODaXY+hQ3xxMUKSs62ONQ==",
-			"dev": true
+			"integrity": "sha512-BbShUnr5OartXJe1GeccAWtfro11hhgNJg6G9/UtWKjVGvV5U4C09cg5nk8JUevhXODaXY+hQ3xxMUKSs62ONQ=="
 		},
 		"node_modules/map-visit": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
 			"integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+			"dev": true,
 			"dependencies": {
 				"object-visit": "^1.0.0"
 			},
@@ -37202,10 +35227,11 @@
 			}
 		},
 		"node_modules/markdown-builder/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
@@ -37246,14 +35272,12 @@
 		"node_modules/markdown-escapes": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
-			"integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
-			"dev": true
+			"integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA=="
 		},
 		"node_modules/markdown-it": {
 			"version": "12.3.2",
 			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
 			"integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
-			"dev": true,
 			"dependencies": {
 				"argparse": "^2.0.1",
 				"entities": "~2.1.0",
@@ -37268,14 +35292,12 @@
 		"node_modules/markdown-it/node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
 		},
 		"node_modules/markdown-it/node_modules/entities": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
 			"integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-			"dev": true,
 			"funding": {
 				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
@@ -37283,13 +35305,12 @@
 		"node_modules/markdown-table": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz",
-			"integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==",
-			"dev": true
+			"integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q=="
 		},
 		"node_modules/markdown-to-jsx": {
-			"version": "7.3.2",
-			"resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.3.2.tgz",
-			"integrity": "sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q==",
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.4.1.tgz",
+			"integrity": "sha512-GbrbkTnHp9u6+HqbPRFJbObi369AgJNXi/sGqq5HRsoZW063xR1XDCaConqq+whfEIAlzB1YPnOgsPc7B7bc/A==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10"
@@ -37302,7 +35323,6 @@
 			"version": "0.25.1",
 			"resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.25.1.tgz",
 			"integrity": "sha512-AG7UkLzNa1fxiOv5B+owPsPhtM4D6DoODhsJgiaNg1xowXovrYgOnLqAgOOFQpWOlHFVQUzjMY5ypNNTeov92g==",
-			"dev": true,
 			"dependencies": {
 				"markdown-it": "12.3.2"
 			},
@@ -37314,7 +35334,6 @@
 			"version": "0.31.1",
 			"resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.31.1.tgz",
 			"integrity": "sha512-keIOMwQn+Ch7MoBwA+TdkyVMuxAeZFEGmIIlvwgV0Z1TGS5MxPnRr29XCLhkNzCHU+uNKGjU+VEjLX+Z9kli6g==",
-			"dev": true,
 			"dependencies": {
 				"commander": "~9.0.0",
 				"get-stdin": "~9.0.0",
@@ -37337,35 +35356,20 @@
 		"node_modules/markdownlint-cli/node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
 		},
 		"node_modules/markdownlint-cli/node_modules/commander": {
 			"version": "9.0.0",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-9.0.0.tgz",
 			"integrity": "sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==",
-			"dev": true,
 			"engines": {
 				"node": "^12.20.0 || >=14"
 			}
 		},
-		"node_modules/markdownlint-cli/node_modules/get-stdin": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
-			"integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
-			"dev": true,
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/markdownlint-cli/node_modules/glob": {
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
 			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -37385,7 +35389,6 @@
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
 			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
 			"dependencies": {
 				"brace-expansion": "^1.1.7"
 			},
@@ -37397,7 +35400,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
 			"dependencies": {
 				"argparse": "^2.0.1"
 			},
@@ -37409,7 +35411,6 @@
 			"version": "3.0.8",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
 			"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
-			"dev": true,
 			"dependencies": {
 				"brace-expansion": "^1.1.7"
 			},
@@ -37420,8 +35421,7 @@
 		"node_modules/markdownlint-rule-helpers": {
 			"version": "0.16.0",
 			"resolved": "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.16.0.tgz",
-			"integrity": "sha512-oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w==",
-			"dev": true
+			"integrity": "sha512-oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w=="
 		},
 		"node_modules/marked": {
 			"version": "4.3.0",
@@ -37438,8 +35438,7 @@
 		"node_modules/marky": {
 			"version": "1.2.5",
 			"resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
-			"integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
-			"dev": true
+			"integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q=="
 		},
 		"node_modules/mathjs": {
 			"version": "10.6.4",
@@ -37468,7 +35467,6 @@
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
 			"integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-			"dev": true,
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -37489,7 +35487,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
 			"integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-			"dev": true,
 			"dependencies": {
 				"unist-util-modify-children": "^1.0.0",
 				"unist-util-visit": "^1.1.0"
@@ -37551,7 +35548,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz",
 			"integrity": "sha512-CcJ0mHa36QYumDKiZ2OIR+ClhfOM7zIzN+Wfy8tRZ1hpH9DKLCS+Mh4DyK5bCxzE9uxMWcbIpeNFWsg1zrj/2g==",
-			"dev": true,
 			"dependencies": {
 				"mdast-util-to-string": "^1.0.0"
 			}
@@ -37559,8 +35555,7 @@
 		"node_modules/mdast-util-to-string": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.5.tgz",
-			"integrity": "sha512-2qLt/DEOo5F6nc2VFScQiHPzQ0XXcabquRJxKMhKte8nt42o08HUxNDPk7tt0YPxnWjAT11I1SYi0X0iPnfI5A==",
-			"dev": true
+			"integrity": "sha512-2qLt/DEOo5F6nc2VFScQiHPzQ0XXcabquRJxKMhKte8nt42o08HUxNDPk7tt0YPxnWjAT11I1SYi0X0iPnfI5A=="
 		},
 		"node_modules/mdn-data": {
 			"version": "2.0.14",
@@ -37570,14 +35565,12 @@
 		"node_modules/mdurl": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-			"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-			"dev": true
+			"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
 		},
 		"node_modules/media-typer": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
 			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -37586,7 +35579,6 @@
 			"version": "3.5.3",
 			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
 			"integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
-			"dev": true,
 			"dependencies": {
 				"fs-monkey": "^1.0.4"
 			},
@@ -37688,7 +35680,6 @@
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
 			"integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
-			"dev": true,
 			"dependencies": {
 				"arr-union": "^3.1.0",
 				"clone-deep": "^0.2.4",
@@ -37702,7 +35693,6 @@
 			"version": "0.2.4",
 			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
 			"integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==",
-			"dev": true,
 			"dependencies": {
 				"for-own": "^0.1.3",
 				"is-plain-object": "^2.0.1",
@@ -37718,7 +35708,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
 			"dependencies": {
 				"isobject": "^3.0.1"
 			},
@@ -37730,7 +35719,6 @@
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
 			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-			"dev": true,
 			"dependencies": {
 				"is-buffer": "^1.1.5"
 			},
@@ -37742,7 +35730,6 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
 			"integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==",
-			"dev": true,
 			"dependencies": {
 				"is-extendable": "^0.1.1",
 				"kind-of": "^2.0.1",
@@ -37757,7 +35744,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
 			"integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==",
-			"dev": true,
 			"dependencies": {
 				"is-buffer": "^1.0.2"
 			},
@@ -37769,7 +35755,6 @@
 			"version": "0.2.7",
 			"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
 			"integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -37777,8 +35762,7 @@
 		"node_modules/merge-descriptors": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-			"dev": true
+			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
 		},
 		"node_modules/merge-stream": {
 			"version": "2.0.0",
@@ -37789,7 +35773,6 @@
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
 			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 8"
 			}
@@ -37797,8 +35780,7 @@
 		"node_modules/metaviewport-parser": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/metaviewport-parser/-/metaviewport-parser-0.3.0.tgz",
-			"integrity": "sha512-EoYJ8xfjQ6kpe9VbVHvZTZHiOl4HL1Z18CrZ+qahvLXT7ZO4YTC2JMyt5FaUp9JJp6J4Ybb/z7IsCXZt86/QkQ==",
-			"dev": true
+			"integrity": "sha512-EoYJ8xfjQ6kpe9VbVHvZTZHiOl4HL1Z18CrZ+qahvLXT7ZO4YTC2JMyt5FaUp9JJp6J4Ybb/z7IsCXZt86/QkQ=="
 		},
 		"node_modules/method-override": {
 			"version": "3.0.0",
@@ -37828,15 +35810,14 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
 			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/metro": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro/-/metro-0.73.10.tgz",
-			"integrity": "sha512-J2gBhNHFtc/Z48ysF0B/bfTwUwaRDLjNv7egfhQCc+934dpXcjJG2KZFeuybF+CvA9vo4QUi56G2U+RSAJ5tsA==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro/-/metro-0.80.5.tgz",
+			"integrity": "sha512-OE/CGbOgbi8BlTN1QqJgKOBaC27dS0JBQw473JcivrpgVnqIsluROA7AavEaTVUrB9wPUZvoNVDROn5uiM2jfw==",
 			"dependencies": {
 				"@babel/code-frame": "^7.0.0",
 				"@babel/core": "^7.20.0",
@@ -37845,9 +35826,7 @@
 				"@babel/template": "^7.0.0",
 				"@babel/traverse": "^7.20.0",
 				"@babel/types": "^7.20.0",
-				"absolute-path": "^0.0.0",
 				"accepts": "^1.3.7",
-				"async": "^3.2.2",
 				"chalk": "^4.0.0",
 				"ci-info": "^2.0.0",
 				"connect": "^3.6.5",
@@ -37855,29 +35834,24 @@
 				"denodeify": "^1.2.1",
 				"error-stack-parser": "^2.0.6",
 				"graceful-fs": "^4.2.4",
-				"hermes-parser": "0.8.0",
-				"image-size": "^0.6.0",
+				"hermes-parser": "0.18.2",
+				"image-size": "^1.0.2",
 				"invariant": "^2.2.4",
-				"jest-worker": "^27.2.0",
+				"jest-worker": "^29.6.3",
 				"jsc-safe-url": "^0.2.2",
 				"lodash.throttle": "^4.1.1",
-				"metro-babel-transformer": "0.73.10",
-				"metro-cache": "0.73.10",
-				"metro-cache-key": "0.73.10",
-				"metro-config": "0.73.10",
-				"metro-core": "0.73.10",
-				"metro-file-map": "0.73.10",
-				"metro-hermes-compiler": "0.73.10",
-				"metro-inspector-proxy": "0.73.10",
-				"metro-minify-terser": "0.73.10",
-				"metro-minify-uglify": "0.73.10",
-				"metro-react-native-babel-preset": "0.73.10",
-				"metro-resolver": "0.73.10",
-				"metro-runtime": "0.73.10",
-				"metro-source-map": "0.73.10",
-				"metro-symbolicate": "0.73.10",
-				"metro-transform-plugins": "0.73.10",
-				"metro-transform-worker": "0.73.10",
+				"metro-babel-transformer": "0.80.5",
+				"metro-cache": "0.80.5",
+				"metro-cache-key": "0.80.5",
+				"metro-config": "0.80.5",
+				"metro-core": "0.80.5",
+				"metro-file-map": "0.80.5",
+				"metro-resolver": "0.80.5",
+				"metro-runtime": "0.80.5",
+				"metro-source-map": "0.80.5",
+				"metro-symbolicate": "0.80.5",
+				"metro-transform-plugins": "0.80.5",
+				"metro-transform-worker": "0.80.5",
 				"mime-types": "^2.1.27",
 				"node-fetch": "^2.2.0",
 				"nullthrows": "^1.1.1",
@@ -37885,150 +35859,78 @@
 				"serialize-error": "^2.1.0",
 				"source-map": "^0.5.6",
 				"strip-ansi": "^6.0.0",
-				"temp": "0.8.3",
 				"throat": "^5.0.0",
 				"ws": "^7.5.1",
-				"yargs": "^17.5.1"
+				"yargs": "^17.6.2"
 			},
 			"bin": {
 				"metro": "src/cli.js"
+			},
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-babel-transformer": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.73.10.tgz",
-			"integrity": "sha512-Yv2myTSnpzt/lTyurLvqYbBkytvUJcLHN8XD3t7W6rGiLTQPzmf1zypHQLphvcAXtCWBOXFtH7KLOSi2/qMg+A==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.80.5.tgz",
+			"integrity": "sha512-sxH6hcWCorhTbk4kaShCWsadzu99WBL4Nvq4m/sDTbp32//iGuxtAnUK+ZV+6IEygr2u9Z0/4XoZ8Sbcl71MpA==",
 			"dependencies": {
 				"@babel/core": "^7.20.0",
-				"hermes-parser": "0.8.0",
-				"metro-source-map": "0.73.10",
+				"hermes-parser": "0.18.2",
 				"nullthrows": "^1.1.1"
-			}
-		},
-		"node_modules/metro-babel-transformer/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
 			},
 			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
+				"node": ">=18"
 			}
 		},
-		"node_modules/metro-babel-transformer/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
+		"node_modules/metro-babel-transformer/node_modules/hermes-estree": {
+			"version": "0.18.2",
+			"resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.18.2.tgz",
+			"integrity": "sha512-KoLsoWXJ5o81nit1wSyEZnWUGy9cBna9iYMZBR7skKh7okYAYKqQ9/OczwpMHn/cH0hKDyblulGsJ7FknlfVxQ=="
 		},
-		"node_modules/metro-babel-transformer/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/metro-babel-transformer/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
+		"node_modules/metro-babel-transformer/node_modules/hermes-parser": {
+			"version": "0.18.2",
+			"resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.18.2.tgz",
+			"integrity": "sha512-1eQfvib+VPpgBZ2zYKQhpuOjw1tH+Emuib6QmjkJWJMhyjM8xnXMvA+76o9LhF0zOAJDZgPfQhg43cyXEyl5Ew==",
+			"dependencies": {
+				"hermes-estree": "0.18.2"
 			}
 		},
 		"node_modules/metro-cache": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.73.10.tgz",
-			"integrity": "sha512-wPGlQZpdVlM404m7MxJqJ+hTReDr5epvfPbt2LerUAHY9RN99w61FeeAe25BMZBwgUgDtAsfGlJ51MBHg8MAqw==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.80.5.tgz",
+			"integrity": "sha512-2u+dQ4PZwmC7eZo9uMBNhQQMig9f+w4QWBZwXCdVy/RYOHM0eObgGdMEOwODo73uxie82T9lWzxr3aZOZ+Nqtw==",
 			"dependencies": {
-				"metro-core": "0.73.10",
+				"metro-core": "0.80.5",
 				"rimraf": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-cache-key": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.73.10.tgz",
-			"integrity": "sha512-JMVDl/EREDiUW//cIcUzRjKSwE2AFxVWk47cFBer+KA4ohXIG2CQPEquT56hOw1Y1s6gKNxxs1OlAOEsubrFjw=="
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.80.5.tgz",
+			"integrity": "sha512-fr3QLZUarsB3tRbVcmr34kCBsTHk0Sh9JXGvBY/w3b2lbre+Lq5gtgLyFElHPecGF7o4z1eK9r3ubxtScHWcbA==",
+			"engines": {
+				"node": ">=18"
+			}
 		},
 		"node_modules/metro-config": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.73.10.tgz",
-			"integrity": "sha512-wIlybd1Z9I8K2KcStTiJxTB7OK529dxFgogNpKCTU/3DxkgAASqSkgXnZP6kVyqjh5EOWAKFe5U6IPic7kXDdQ==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.80.5.tgz",
+			"integrity": "sha512-elqo/lwvF+VjZ1OPyvmW/9hSiGlmcqu+rQvDKw5F5WMX48ZC+ySTD1WcaD7e97pkgAlJHVYqZ98FCjRAYOAFRQ==",
 			"dependencies": {
+				"connect": "^3.6.5",
 				"cosmiconfig": "^5.0.5",
-				"jest-validate": "^26.5.2",
-				"metro": "0.73.10",
-				"metro-cache": "0.73.10",
-				"metro-core": "0.73.10",
-				"metro-runtime": "0.73.10"
-			}
-		},
-		"node_modules/metro-config/node_modules/@jest/types": {
-			"version": "26.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-			"integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
-			"dependencies": {
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^15.0.0",
-				"chalk": "^4.0.0"
+				"jest-validate": "^29.6.3",
+				"metro": "0.80.5",
+				"metro-cache": "0.80.5",
+				"metro-core": "0.80.5",
+				"metro-runtime": "0.80.5"
 			},
 			"engines": {
-				"node": ">= 10.14.2"
-			}
-		},
-		"node_modules/metro-config/node_modules/@types/yargs": {
-			"version": "15.0.15",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz",
-			"integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==",
-			"dependencies": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"node_modules/metro-config/node_modules/camelcase": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-config/node_modules/cosmiconfig": {
@@ -38057,30 +35959,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/metro-config/node_modules/jest-get-type": {
-			"version": "26.3.0",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-			"integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-			"engines": {
-				"node": ">= 10.14.2"
-			}
-		},
-		"node_modules/metro-config/node_modules/jest-validate": {
-			"version": "26.6.2",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
-			"integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
-			"dependencies": {
-				"@jest/types": "^26.6.2",
-				"camelcase": "^6.0.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^26.3.0",
-				"leven": "^3.1.0",
-				"pretty-format": "^26.6.2"
-			},
-			"engines": {
-				"node": ">= 10.14.2"
-			}
-		},
 		"node_modules/metro-config/node_modules/parse-json": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -38093,80 +35971,41 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/metro-config/node_modules/pretty-format": {
-			"version": "26.6.2",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-			"integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
-			"dependencies": {
-				"@jest/types": "^26.6.2",
-				"ansi-regex": "^5.0.0",
-				"ansi-styles": "^4.0.0",
-				"react-is": "^17.0.1"
-			},
-			"engines": {
-				"node": ">= 10"
-			}
-		},
-		"node_modules/metro-config/node_modules/react-is": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-		},
 		"node_modules/metro-core": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.73.10.tgz",
-			"integrity": "sha512-5uYkajIxKyL6W45iz/ftNnYPe1l92CvF2QJeon1CHsMXkEiOJxEjo41l+iSnO/YodBGrmMCyupSO4wOQGUc0lw==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.80.5.tgz",
+			"integrity": "sha512-vkLuaBhnZxTVpaZO8ZJVEHzjaqSXpOdpAiztSZ+NDaYM6jEFgle3/XIbLW91jTSf2+T8Pj5yB1G7KuOX+BcVwg==",
 			"dependencies": {
 				"lodash.throttle": "^4.1.1",
-				"metro-resolver": "0.73.10"
+				"metro-resolver": "0.80.5"
+			},
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-file-map": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.73.10.tgz",
-			"integrity": "sha512-XOMWAybeaXyD6zmVZPnoCCL2oO3rp4ta76oUlqWP0skBzhFxVtkE/UtDwApEMUY361JeBBago647gnKiARs+1g==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.80.5.tgz",
+			"integrity": "sha512-bKCvJ05drjq6QhQxnDUt3I8x7bTcHo3IIKVobEr14BK++nmxFGn/BmFLRzVBlghM6an3gqwpNEYxS5qNc+VKcg==",
 			"dependencies": {
-				"abort-controller": "^3.0.0",
 				"anymatch": "^3.0.3",
 				"debug": "^2.2.0",
 				"fb-watchman": "^2.0.0",
 				"graceful-fs": "^4.2.4",
 				"invariant": "^2.2.4",
-				"jest-regex-util": "^27.0.6",
-				"jest-serializer": "^27.0.6",
-				"jest-util": "^27.2.0",
-				"jest-worker": "^27.2.0",
+				"jest-worker": "^29.6.3",
 				"micromatch": "^4.0.4",
+				"node-abort-controller": "^3.1.1",
 				"nullthrows": "^1.1.1",
 				"walker": "^1.0.7"
 			},
+			"engines": {
+				"node": ">=18"
+			},
 			"optionalDependencies": {
 				"fsevents": "^2.3.2"
 			}
 		},
-		"node_modules/metro-file-map/node_modules/@jest/types": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-			"integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-			"dependencies": {
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^16.0.0",
-				"chalk": "^4.0.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/metro-file-map/node_modules/@types/yargs": {
-			"version": "16.0.5",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
-			"integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
-			"dependencies": {
-				"@types/yargs-parser": "*"
-			}
-		},
 		"node_modules/metro-file-map/node_modules/debug": {
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -38175,465 +36014,52 @@
 				"ms": "2.0.0"
 			}
 		},
-		"node_modules/metro-file-map/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/metro-file-map/node_modules/jest-regex-util": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-			"integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/metro-file-map/node_modules/jest-util": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-			"integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-			"dependencies": {
-				"@jest/types": "^27.5.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.9",
-				"picomatch": "^2.2.3"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-			}
-		},
-		"node_modules/metro-file-map/node_modules/jest-worker": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-			"dependencies": {
-				"@types/node": "*",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/metro-file-map/node_modules/supports-color": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/metro-hermes-compiler": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-hermes-compiler/-/metro-hermes-compiler-0.73.10.tgz",
-			"integrity": "sha512-rTRWEzkVrwtQLiYkOXhSdsKkIObnL+Jqo+IXHI7VEK2aSLWRAbtGNqECBs44kbOUypDYTFFE+WLtoqvUWqYkWg=="
-		},
-		"node_modules/metro-inspector-proxy": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.73.10.tgz",
-			"integrity": "sha512-CEEvocYc5xCCZBtGSIggMCiRiXTrnBbh8pmjKQqm9TtJZALeOGyt5pXUaEkKGnhrXETrexsg6yIbsQHhEvVfvQ==",
-			"dependencies": {
-				"connect": "^3.6.5",
-				"debug": "^2.2.0",
-				"ws": "^7.5.1",
-				"yargs": "^17.5.1"
-			},
-			"bin": {
-				"metro-inspector-proxy": "src/cli.js"
-			}
-		},
-		"node_modules/metro-inspector-proxy/node_modules/cliui": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-			"dependencies": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.1",
-				"wrap-ansi": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/metro-inspector-proxy/node_modules/debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dependencies": {
-				"ms": "2.0.0"
-			}
-		},
-		"node_modules/metro-inspector-proxy/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-		},
-		"node_modules/metro-inspector-proxy/node_modules/is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/metro-inspector-proxy/node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/metro-inspector-proxy/node_modules/wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/metro-inspector-proxy/node_modules/y18n": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/metro-inspector-proxy/node_modules/yargs": {
-			"version": "17.7.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-			"dependencies": {
-				"cliui": "^8.0.1",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.3",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^21.1.1"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/metro-inspector-proxy/node_modules/yargs-parser": {
-			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/metro-minify-terser": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.73.10.tgz",
-			"integrity": "sha512-uG7TSKQ/i0p9kM1qXrwbmY3v+6BrMItsOcEXcSP8Z+68bb+t9HeVK0T/hIfUu1v1PEnonhkhfzVsaP8QyTd5lQ==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.80.5.tgz",
+			"integrity": "sha512-S7oZLLcab6YXUT6jYFX/ZDMN7Fq6xBGGAG8liMFU1UljX6cTcEC2u+UIafYgCLrdVexp/+ClxrIetVPZ5LtL/g==",
 			"dependencies": {
 				"terser": "^5.15.0"
-			}
-		},
-		"node_modules/metro-minify-uglify": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.73.10.tgz",
-			"integrity": "sha512-eocnSeJKnLz/UoYntVFhCJffED7SLSgbCHgNvI6ju6hFb6EFHGJT9OLbkJWeXaWBWD3Zw5mYLS8GGqGn/CHZPA==",
-			"dependencies": {
-				"uglify-es": "^3.1.9"
-			}
-		},
-		"node_modules/metro-react-native-babel-preset": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.10.tgz",
-			"integrity": "sha512-1/dnH4EHwFb2RKEKx34vVDpUS3urt2WEeR8FYim+ogqALg4sTpG7yeQPxWpbgKATezt4rNfqAANpIyH19MS4BQ==",
-			"dependencies": {
-				"@babel/core": "^7.20.0",
-				"@babel/plugin-proposal-async-generator-functions": "^7.0.0",
-				"@babel/plugin-proposal-class-properties": "^7.0.0",
-				"@babel/plugin-proposal-export-default-from": "^7.0.0",
-				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-				"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-				"@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
-				"@babel/plugin-proposal-optional-chaining": "^7.0.0",
-				"@babel/plugin-syntax-dynamic-import": "^7.0.0",
-				"@babel/plugin-syntax-export-default-from": "^7.0.0",
-				"@babel/plugin-syntax-flow": "^7.18.0",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
-				"@babel/plugin-syntax-optional-chaining": "^7.0.0",
-				"@babel/plugin-transform-arrow-functions": "^7.0.0",
-				"@babel/plugin-transform-async-to-generator": "^7.0.0",
-				"@babel/plugin-transform-block-scoping": "^7.0.0",
-				"@babel/plugin-transform-classes": "^7.0.0",
-				"@babel/plugin-transform-computed-properties": "^7.0.0",
-				"@babel/plugin-transform-destructuring": "^7.0.0",
-				"@babel/plugin-transform-flow-strip-types": "^7.0.0",
-				"@babel/plugin-transform-function-name": "^7.0.0",
-				"@babel/plugin-transform-literals": "^7.0.0",
-				"@babel/plugin-transform-modules-commonjs": "^7.0.0",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
-				"@babel/plugin-transform-parameters": "^7.0.0",
-				"@babel/plugin-transform-react-display-name": "^7.0.0",
-				"@babel/plugin-transform-react-jsx": "^7.0.0",
-				"@babel/plugin-transform-react-jsx-self": "^7.0.0",
-				"@babel/plugin-transform-react-jsx-source": "^7.0.0",
-				"@babel/plugin-transform-runtime": "^7.0.0",
-				"@babel/plugin-transform-shorthand-properties": "^7.0.0",
-				"@babel/plugin-transform-spread": "^7.0.0",
-				"@babel/plugin-transform-sticky-regex": "^7.0.0",
-				"@babel/plugin-transform-template-literals": "^7.0.0",
-				"@babel/plugin-transform-typescript": "^7.5.0",
-				"@babel/plugin-transform-unicode-regex": "^7.0.0",
-				"@babel/template": "^7.0.0",
-				"react-refresh": "^0.4.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "*"
-			}
-		},
-		"node_modules/metro-react-native-babel-preset/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
 			},
 			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/metro-react-native-babel-preset/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/metro-react-native-babel-preset/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/metro-react-native-babel-preset/node_modules/react-refresh": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
-			"integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/metro-react-native-babel-preset/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/metro-react-native-babel-transformer": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.10.tgz",
-			"integrity": "sha512-4G/upwqKdmKEjmsNa92/NEgsOxUWOygBVs+FXWfXWKgybrmcjh3NoqdRYrROo9ZRA/sB9Y/ZXKVkWOGKHtGzgg==",
-			"dependencies": {
-				"@babel/core": "^7.20.0",
-				"babel-preset-fbjs": "^3.4.0",
-				"hermes-parser": "0.8.0",
-				"metro-babel-transformer": "0.73.10",
-				"metro-react-native-babel-preset": "0.73.10",
-				"metro-source-map": "0.73.10",
-				"nullthrows": "^1.1.1"
-			},
-			"peerDependencies": {
-				"@babel/core": "*"
-			}
-		},
-		"node_modules/metro-react-native-babel-transformer/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/metro-react-native-babel-transformer/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/metro-react-native-babel-transformer/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/metro-react-native-babel-transformer/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-resolver": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.73.10.tgz",
-			"integrity": "sha512-HeXbs+0wjakaaVQ5BI7eT7uqxlZTc9rnyw6cdBWWMgUWB++KpoI0Ge7Hi6eQAOoVAzXC3m26mPFYLejpzTWjng==",
-			"dependencies": {
-				"absolute-path": "^0.0.0"
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.80.5.tgz",
+			"integrity": "sha512-haJ/Hveio3zv/Fr4eXVdKzjUeHHDogYok7OpRqPSXGhTXisNXB+sLN7CpcUrCddFRUDLnVaqQOYwhYsFndgUwA==",
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-runtime": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.73.10.tgz",
-			"integrity": "sha512-EpVKm4eN0Fgx2PEWpJ5NiMArV8zVoOin866jIIvzFLpmkZz1UEqgjf2JAfUJnjgv3fjSV3JqeGG2vZCaGQBTow==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.80.5.tgz",
+			"integrity": "sha512-L0syTWJUdWzfUmKgkScr6fSBVTh6QDr8eKEkRtn40OBd8LPagrJGySBboWSgbyn9eIb4ayW3Y347HxgXBSAjmg==",
 			"dependencies": {
-				"@babel/runtime": "^7.0.0",
-				"react-refresh": "^0.4.0"
-			}
-		},
-		"node_modules/metro-runtime/node_modules/react-refresh": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
-			"integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==",
+				"@babel/runtime": "^7.0.0"
+			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-source-map": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.73.10.tgz",
-			"integrity": "sha512-NAGv14701p/YaFZ76KzyPkacBw/QlEJF1f8elfs23N1tC33YyKLDKvPAzFJiYqjdcFvuuuDCA8JCXd2TgLxNPw==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.80.5.tgz",
+			"integrity": "sha512-DwSF4l03mKPNqCtyQ6K23I43qzU1BViAXnuH81eYWdHglP+sDlPpY+/7rUahXEo6qXEHXfAJgVoo1sirbXbmsQ==",
 			"dependencies": {
 				"@babel/traverse": "^7.20.0",
 				"@babel/types": "^7.20.0",
 				"invariant": "^2.2.4",
-				"metro-symbolicate": "0.73.10",
+				"metro-symbolicate": "0.80.5",
 				"nullthrows": "^1.1.1",
-				"ob1": "0.73.10",
+				"ob1": "0.80.5",
 				"source-map": "^0.5.6",
 				"vlq": "^1.0.0"
-			}
-		},
-		"node_modules/metro-source-map/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
 			},
 			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/metro-source-map/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"engines": {
-				"node": ">=4"
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-source-map/node_modules/source-map": {
@@ -38645,12 +36071,12 @@
 			}
 		},
 		"node_modules/metro-symbolicate": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.73.10.tgz",
-			"integrity": "sha512-PmCe3TOe1c/NVwMlB+B17me951kfkB3Wve5RqJn+ErPAj93od1nxicp6OJe7JT4QBRnpUP8p9tw2sHKqceIzkA==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.80.5.tgz",
+			"integrity": "sha512-IsM4mTYvmo9JvIqwEkCZ5+YeDVPST78Q17ZgljfLdHLSpIivOHp9oVoiwQ/YGbLx0xRHRIS/tKiXueWBnj3UWA==",
 			"dependencies": {
 				"invariant": "^2.2.4",
-				"metro-source-map": "0.73.10",
+				"metro-source-map": "0.80.5",
 				"nullthrows": "^1.1.1",
 				"source-map": "^0.5.6",
 				"through2": "^2.0.1",
@@ -38660,7 +36086,7 @@
 				"metro-symbolicate": "src/index.js"
 			},
 			"engines": {
-				"node": ">=8.3"
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-symbolicate/node_modules/source-map": {
@@ -38672,246 +36098,40 @@
 			}
 		},
 		"node_modules/metro-transform-plugins": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.73.10.tgz",
-			"integrity": "sha512-D4AgD3Vsrac+4YksaPmxs/0ocT67bvwTkFSIgWWeDvWwIG0U1iHzTS9f8Bvb4PITnXryDoFtjI6OWF7uOpGxpA==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.80.5.tgz",
+			"integrity": "sha512-7IdlTqK/k5+qE3RvIU5QdCJUPk4tHWEqgVuYZu8exeW+s6qOJ66hGIJjXY/P7ccucqF+D4nsbAAW5unkoUdS6g==",
 			"dependencies": {
 				"@babel/core": "^7.20.0",
 				"@babel/generator": "^7.20.0",
 				"@babel/template": "^7.0.0",
 				"@babel/traverse": "^7.20.0",
 				"nullthrows": "^1.1.1"
-			}
-		},
-		"node_modules/metro-transform-plugins/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
 			},
 			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/metro-transform-plugins/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/metro-transform-plugins/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/metro-transform-plugins/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro-transform-worker": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.73.10.tgz",
-			"integrity": "sha512-IySvVubudFxahxOljWtP0QIMMpgUrCP0bW16cz2Enof0PdumwmR7uU3dTbNq6S+XTzuMHR+076aIe4VhPAWsIQ==",
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.80.5.tgz",
+			"integrity": "sha512-Q1oM7hfP+RBgAtzRFBDjPhArELUJF8iRCZ8OidqCpYzQJVGuJZ7InSnIf3hn1JyqiUQwv2f1LXBO78i2rAjzyA==",
 			"dependencies": {
 				"@babel/core": "^7.20.0",
 				"@babel/generator": "^7.20.0",
 				"@babel/parser": "^7.20.0",
 				"@babel/types": "^7.20.0",
-				"babel-preset-fbjs": "^3.4.0",
-				"metro": "0.73.10",
-				"metro-babel-transformer": "0.73.10",
-				"metro-cache": "0.73.10",
-				"metro-cache-key": "0.73.10",
-				"metro-hermes-compiler": "0.73.10",
-				"metro-source-map": "0.73.10",
-				"metro-transform-plugins": "0.73.10",
+				"metro": "0.80.5",
+				"metro-babel-transformer": "0.80.5",
+				"metro-cache": "0.80.5",
+				"metro-cache-key": "0.80.5",
+				"metro-minify-terser": "0.80.5",
+				"metro-source-map": "0.80.5",
+				"metro-transform-plugins": "0.80.5",
 				"nullthrows": "^1.1.1"
-			}
-		},
-		"node_modules/metro-transform-worker/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/metro-transform-worker/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/metro-transform-worker/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/metro-transform-worker/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/metro/node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/metro/node_modules/@babel/core/node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-			"dependencies": {
-				"ms": "2.1.2"
-			},
-			"engines": {
-				"node": ">=6.0"
-			},
-			"peerDependenciesMeta": {
-				"supports-color": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/metro/node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
 			},
 			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/metro/node_modules/@babel/traverse/node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-			"dependencies": {
-				"ms": "2.1.2"
-			},
-			"engines": {
-				"node": ">=6.0"
-			},
-			"peerDependenciesMeta": {
-				"supports-color": {
-					"optional": true
-				}
+				"node": ">=18"
 			}
 		},
 		"node_modules/metro/node_modules/ci-info": {
@@ -38940,30 +36160,22 @@
 				"ms": "2.0.0"
 			}
 		},
-		"node_modules/metro/node_modules/debug/node_modules/ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-		},
 		"node_modules/metro/node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
 			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
-		"node_modules/metro/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"engines": {
-				"node": ">=4"
-			}
+		"node_modules/metro/node_modules/hermes-estree": {
+			"version": "0.18.2",
+			"resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.18.2.tgz",
+			"integrity": "sha512-KoLsoWXJ5o81nit1wSyEZnWUGy9cBna9iYMZBR7skKh7okYAYKqQ9/OczwpMHn/cH0hKDyblulGsJ7FknlfVxQ=="
 		},
-		"node_modules/metro/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"engines": {
-				"node": ">=8"
+		"node_modules/metro/node_modules/hermes-parser": {
+			"version": "0.18.2",
+			"resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.18.2.tgz",
+			"integrity": "sha512-1eQfvib+VPpgBZ2zYKQhpuOjw1tH+Emuib6QmjkJWJMhyjM8xnXMvA+76o9LhF0zOAJDZgPfQhg43cyXEyl5Ew==",
+			"dependencies": {
+				"hermes-estree": "0.18.2"
 			}
 		},
 		"node_modules/metro/node_modules/is-fullwidth-code-point": {
@@ -38974,32 +36186,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/metro/node_modules/jest-worker": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-			"dependencies": {
-				"@types/node": "*",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/metro/node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-		},
-		"node_modules/metro/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
 		"node_modules/metro/node_modules/source-map": {
 			"version": "0.5.7",
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -39021,20 +36207,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/metro/node_modules/supports-color": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
 		"node_modules/metro/node_modules/wrap-ansi": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -39085,11 +36257,12 @@
 			}
 		},
 		"node_modules/micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+			"license": "MIT",
 			"dependencies": {
-				"braces": "^3.0.2",
+				"braces": "^3.0.3",
 				"picomatch": "^2.3.1"
 			},
 			"engines": {
@@ -39119,7 +36292,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
 			"integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
-			"dev": true,
 			"bin": {
 				"mime": "cli.js"
 			},
@@ -39159,16 +36331,14 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
 			"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/min-indent": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz",
-			"integrity": "sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=",
-			"dev": true,
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
 			"engines": {
 				"node": ">=4"
 			}
@@ -39177,7 +36347,6 @@
 			"version": "2.5.1",
 			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.1.tgz",
 			"integrity": "sha512-CRC6E2yedNjfOA3nQjpqAkpnranxhxmilhBPYtldnXcPT/QZb3aJFzvt0pp8W1jhuLR/E0zDa+QEHuC/HhhaLQ==",
-			"dev": true,
 			"dependencies": {
 				"schema-utils": "^4.0.0"
 			},
@@ -39193,15 +36362,15 @@
 			}
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-			"dev": true,
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"license": "MIT",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
 				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+				"require-from-string": "^2.0.2"
 			},
 			"funding": {
 				"type": "github",
@@ -39212,7 +36381,6 @@
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
 			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.3"
 			},
@@ -39223,14 +36391,12 @@
 		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
 			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-			"dev": true,
 			"dependencies": {
 				"@types/json-schema": "^7.0.9",
 				"ajv": "^8.9.0",
@@ -39248,8 +36414,7 @@
 		"node_modules/minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-			"dev": true
+			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
 		},
 		"node_modules/minimalistic-crypto-utils": {
 			"version": "1.0.1",
@@ -39280,7 +36445,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
 			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-			"dev": true,
 			"dependencies": {
 				"arrify": "^1.0.1",
 				"is-plain-obj": "^1.1.0",
@@ -39294,7 +36458,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
 			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -39442,10 +36605,11 @@
 			}
 		},
 		"node_modules/mississippi/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
@@ -39454,13 +36618,13 @@
 		"node_modules/mitt": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
-			"integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
-			"dev": true
+			"integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="
 		},
 		"node_modules/mixin-deep": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
 			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+			"dev": true,
 			"dependencies": {
 				"for-in": "^1.0.2",
 				"is-extendable": "^1.0.1"
@@ -39473,6 +36637,7 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
 			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+			"dev": true,
 			"dependencies": {
 				"is-plain-object": "^2.0.4"
 			},
@@ -39484,6 +36649,7 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
 			"dependencies": {
 				"isobject": "^3.0.1"
 			},
@@ -39495,7 +36661,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
 			"integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
-			"dev": true,
 			"dependencies": {
 				"for-in": "^0.1.3",
 				"is-extendable": "^0.1.1"
@@ -39508,7 +36673,6 @@
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
 			"integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -39531,8 +36695,7 @@
 		"node_modules/mkdirp-classic": {
 			"version": "0.5.3",
 			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-			"dev": true
+			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
 		},
 		"node_modules/mock-match-media": {
 			"version": "0.4.2",
@@ -39805,20 +36968,10 @@
 				"rimraf": "bin.js"
 			}
 		},
-		"node_modules/mri": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
-			"integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/mrmime": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
 			"integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -39832,7 +36985,6 @@
 			"version": "7.2.5",
 			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
 			"integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-			"dev": true,
 			"dependencies": {
 				"dns-packet": "^5.2.2",
 				"thunky": "^1.0.2"
@@ -39882,7 +37034,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.0.tgz",
 			"integrity": "sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA==",
-			"dev": true,
 			"bin": {
 				"mustache": "bin/mustache"
 			},
@@ -39893,8 +37044,7 @@
 		"node_modules/mute-stream": {
 			"version": "0.0.8",
 			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-			"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-			"dev": true
+			"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
 		},
 		"node_modules/mv": {
 			"version": "2.1.1",
@@ -39957,16 +37107,16 @@
 			"dev": true
 		},
 		"node_modules/nan": {
-			"version": "2.14.2",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-			"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+			"version": "2.18.0",
+			"resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+			"integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
 			"dev": true,
 			"optional": true
 		},
 		"node_modules/nanoid": {
-			"version": "3.3.6",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-			"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+			"version": "3.3.7",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
 			"funding": [
 				{
 					"type": "github",
@@ -39984,6 +37134,7 @@
 			"version": "1.2.13",
 			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
 			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+			"dev": true,
 			"dependencies": {
 				"arr-diff": "^4.0.0",
 				"array-unique": "^0.3.2",
@@ -40011,8 +37162,7 @@
 		"node_modules/natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-			"dev": true
+			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
 		},
 		"node_modules/ncp": {
 			"version": "2.0.0",
@@ -40040,7 +37190,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
 			"integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.4.0"
 			}
@@ -40048,7 +37197,8 @@
 		"node_modules/nice-try": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+			"dev": true
 		},
 		"node_modules/no-case": {
 			"version": "3.0.4",
@@ -40098,8 +37248,7 @@
 		"node_modules/node-abort-controller": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
-			"integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
-			"dev": true
+			"integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="
 		},
 		"node_modules/node-addon-api": {
 			"version": "3.2.1",
@@ -40138,24 +37287,35 @@
 			}
 		},
 		"node_modules/node-fetch": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+			"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+			"license": "MIT",
+			"dependencies": {
+				"whatwg-url": "^5.0.0"
+			},
 			"engines": {
 				"node": "4.x || >=6.0.0"
+			},
+			"peerDependencies": {
+				"encoding": "^0.1.0"
+			},
+			"peerDependenciesMeta": {
+				"encoding": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/node-fetch-native": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.2.0.tgz",
-			"integrity": "sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==",
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.2.tgz",
+			"integrity": "sha512-69mtXOFZ6hSkYiXAVB5SqaRvrbITC/NPyqv7yuu/qw0nmgPyYbIMYYNIDhNtwPrzk0ptrimrLz/hhjvm4w5Z+w==",
 			"dev": true
 		},
 		"node_modules/node-forge": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
 			"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-			"dev": true,
 			"engines": {
 				"node": ">= 6.13.0"
 			}
@@ -40280,9 +37440,9 @@
 			"dev": true
 		},
 		"node_modules/node-releases": {
-			"version": "2.0.13",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-			"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+			"version": "2.0.18",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+			"integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
 		},
 		"node_modules/node-stream-zip": {
 			"version": "1.15.0",
@@ -40324,7 +37484,6 @@
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
 			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-			"dev": true,
 			"dependencies": {
 				"hosted-git-info": "^2.1.4",
 				"resolve": "^1.10.0",
@@ -40335,14 +37494,12 @@
 		"node_modules/normalize-package-data/node_modules/hosted-git-info": {
 			"version": "2.8.9",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-			"dev": true
+			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
 		},
 		"node_modules/normalize-package-data/node_modules/semver": {
 			"version": "5.7.2",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
 			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"dev": true,
 			"bin": {
 				"semver": "bin/semver"
 			}
@@ -40359,22 +37516,14 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
 			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/normalize-selector": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-			"integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-			"dev": true
-		},
 		"node_modules/normalize-url": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
 			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -40391,7 +37540,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
 			"integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
-			"dev": true,
 			"dependencies": {
 				"npm-normalize-package-bin": "^1.0.1"
 			}
@@ -40411,14 +37559,12 @@
 		"node_modules/npm-normalize-package-bin": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-			"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
-			"dev": true
+			"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
 		},
 		"node_modules/npm-package-arg": {
 			"version": "8.1.5",
 			"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
 			"integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
-			"dev": true,
 			"dependencies": {
 				"hosted-git-info": "^4.0.1",
 				"semver": "^7.3.4",
@@ -40432,7 +37578,6 @@
 			"version": "6.4.0",
 			"resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-6.4.0.tgz",
 			"integrity": "sha512-cuXAJJB1Rdqz0UO6w524matlBqDBjcNt7Ru+RDIu4y6RI1gVqiWBnylrK8sPRk81gGBA0X8hJbDXolVOoTc+sA==",
-			"dev": true,
 			"dependencies": {
 				"ajv": "^6.12.6",
 				"ajv-errors": "^1.0.1",
@@ -40464,7 +37609,6 @@
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -40479,23 +37623,12 @@
 		"node_modules/npm-package-json-lint/node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
-		},
-		"node_modules/npm-package-json-lint/node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.0.0"
-			}
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
 		},
 		"node_modules/npm-package-json-lint/node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
 			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.1.0",
 				"supports-color": "^7.1.0"
@@ -40508,14 +37641,13 @@
 			}
 		},
 		"node_modules/npm-package-json-lint/node_modules/cosmiconfig": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-			"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-			"dev": true,
+			"version": "8.3.6",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+			"integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
 			"dependencies": {
-				"import-fresh": "^3.2.1",
+				"import-fresh": "^3.3.0",
 				"js-yaml": "^4.1.0",
-				"parse-json": "^5.0.0",
+				"parse-json": "^5.2.0",
 				"path-type": "^4.0.0"
 			},
 			"engines": {
@@ -40523,13 +37655,20 @@
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/d-fischer"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.9.5"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/npm-package-json-lint/node_modules/has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -40538,7 +37677,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
 			"dependencies": {
 				"argparse": "^2.0.1"
 			},
@@ -40547,16 +37685,15 @@
 			}
 		},
 		"node_modules/npm-package-json-lint/node_modules/jsonc-parser": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-			"integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-			"dev": true
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+			"integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+			"license": "MIT"
 		},
 		"node_modules/npm-package-json-lint/node_modules/meow": {
 			"version": "9.0.0",
 			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
 			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-			"dev": true,
 			"dependencies": {
 				"@types/minimist": "^1.2.0",
 				"camelcase-keys": "^6.2.2",
@@ -40582,7 +37719,6 @@
 			"version": "0.18.1",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
 			"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -40594,7 +37730,6 @@
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
 			"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-			"dev": true,
 			"dependencies": {
 				"hosted-git-info": "^4.0.1",
 				"is-core-module": "^2.5.0",
@@ -40609,7 +37744,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
 			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -40618,7 +37752,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -40630,7 +37763,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -40642,7 +37774,6 @@
 			"version": "3.13.1",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
 			"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-			"dev": true,
 			"engines": {
 				"node": ">=14.16"
 			},
@@ -40651,13 +37782,9 @@
 			}
 		},
 		"node_modules/npm-package-json-lint/node_modules/validate-npm-package-name": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-			"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-			"dev": true,
-			"dependencies": {
-				"builtins": "^5.0.0"
-			},
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+			"integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
@@ -40666,7 +37793,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-3.0.0.tgz",
 			"integrity": "sha512-L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ==",
-			"dev": true,
 			"dependencies": {
 				"glob": "^7.1.6",
 				"ignore-walk": "^4.0.1",
@@ -40684,7 +37810,6 @@
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
 			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -40715,15 +37840,6 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/npm-pick-manifest/node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.0.0"
-			}
-		},
 		"node_modules/npm-pick-manifest/node_modules/hosted-git-info": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
@@ -40770,13 +37886,10 @@
 			}
 		},
 		"node_modules/npm-pick-manifest/node_modules/validate-npm-package-name": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-			"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+			"integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
 			"dev": true,
-			"dependencies": {
-				"builtins": "^5.0.0"
-			},
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
@@ -40799,15 +37912,6 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/npm-registry-fetch/node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.0.0"
-			}
-		},
 		"node_modules/npm-registry-fetch/node_modules/hosted-git-info": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
@@ -40854,13 +37958,10 @@
 			}
 		},
 		"node_modules/npm-registry-fetch/node_modules/validate-npm-package-name": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-			"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+			"integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
 			"dev": true,
-			"dependencies": {
-				"builtins": "^5.0.0"
-			},
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
@@ -41005,6 +38106,7 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
 			"integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+			"dev": true,
 			"dependencies": {
 				"path-key": "^2.0.0"
 			},
@@ -41053,10 +38155,9 @@
 			}
 		},
 		"node_modules/nwsapi": {
-			"version": "2.2.7",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-			"integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
-			"dev": true
+			"version": "2.2.13",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.13.tgz",
+			"integrity": "sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ=="
 		},
 		"node_modules/nx": {
 			"version": "16.6.0",
@@ -41135,17 +38236,6 @@
 			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
 			"dev": true
 		},
-		"node_modules/nx/node_modules/axios": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
-			"integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
-			"dev": true,
-			"dependencies": {
-				"follow-redirects": "^1.15.0",
-				"form-data": "^4.0.0",
-				"proxy-from-env": "^1.1.0"
-			}
-		},
 		"node_modules/nx/node_modules/cli-cursor": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -41200,9 +38290,9 @@
 			}
 		},
 		"node_modules/nx/node_modules/fs-extra": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-			"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dev": true,
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
@@ -41282,9 +38372,9 @@
 			}
 		},
 		"node_modules/nx/node_modules/lines-and-columns": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz",
-			"integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==",
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz",
+			"integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==",
 			"dev": true,
 			"engines": {
 				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
@@ -41428,15 +38518,12 @@
 			}
 		},
 		"node_modules/nx/node_modules/tmp": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-			"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+			"integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
 			"dev": true,
-			"dependencies": {
-				"rimraf": "^3.0.0"
-			},
 			"engines": {
-				"node": ">=8.17.0"
+				"node": ">=14.14"
 			}
 		},
 		"node_modules/nx/node_modules/tsconfig-paths": {
@@ -41454,9 +38541,9 @@
 			}
 		},
 		"node_modules/nx/node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 10.0.0"
@@ -41535,10 +38622,224 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/nypm": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/nypm/-/nypm-0.3.6.tgz",
+			"integrity": "sha512-2CATJh3pd6CyNfU5VZM7qSwFu0ieyabkEdnogE30Obn1czrmOYiZ8DOZLe1yBdLKWoyD3Mcy2maUs+0MR3yVjQ==",
+			"dev": true,
+			"dependencies": {
+				"citty": "^0.1.5",
+				"execa": "^8.0.1",
+				"pathe": "^1.1.2",
+				"ufo": "^1.3.2"
+			},
+			"bin": {
+				"nypm": "dist/cli.mjs"
+			},
+			"engines": {
+				"node": "^14.16.0 || >=16.10.0"
+			}
+		},
+		"node_modules/nypm/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/nypm/node_modules/execa": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
+			"integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
+			"dev": true,
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^8.0.1",
+				"human-signals": "^5.0.0",
+				"is-stream": "^3.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^5.1.0",
+				"onetime": "^6.0.0",
+				"signal-exit": "^4.1.0",
+				"strip-final-newline": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=16.17"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/nypm/node_modules/get-stream": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
+			"integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
+			"dev": true,
+			"engines": {
+				"node": ">=16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/nypm/node_modules/human-signals": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
+			"integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=16.17.0"
+			}
+		},
+		"node_modules/nypm/node_modules/is-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+			"integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/nypm/node_modules/mimic-fn": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+			"integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/nypm/node_modules/npm-run-path": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+			"integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^4.0.0"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/nypm/node_modules/npm-run-path/node_modules/path-key": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+			"integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/nypm/node_modules/onetime": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+			"integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+			"dev": true,
+			"dependencies": {
+				"mimic-fn": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/nypm/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/nypm/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/nypm/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/nypm/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/nypm/node_modules/strip-final-newline": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+			"integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/nypm/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
 		"node_modules/ob1": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/ob1/-/ob1-0.73.10.tgz",
-			"integrity": "sha512-aO6EYC+QRRCkZxVJhCWhLKgVjhNuD6Gu1riGjxrIm89CqLsmKgxzYDDEsktmKsoDeRdWGQM5EdMzXDl5xcVfsw=="
+			"version": "0.80.5",
+			"resolved": "https://registry.npmjs.org/ob1/-/ob1-0.80.5.tgz",
+			"integrity": "sha512-zYDMnnNrFi/1Tqh0vo3PE4p97Tpl9/4MP2k2ECvkbLOZzQuAYZJLTUYVLZb7hJhbhjT+JJxAwBGS8iu5hCSd1w==",
+			"engines": {
+				"node": ">=18"
+			}
 		},
 		"node_modules/object-assign": {
 			"version": "4.1.1",
@@ -41552,6 +38853,7 @@
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
 			"integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+			"dev": true,
 			"dependencies": {
 				"copy-descriptor": "^0.1.0",
 				"define-property": "^0.2.5",
@@ -41565,6 +38867,7 @@
 			"version": "0.2.5",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dev": true,
 			"dependencies": {
 				"is-descriptor": "^0.1.0"
 			},
@@ -41576,6 +38879,7 @@
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
 			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"dev": true,
 			"dependencies": {
 				"is-buffer": "^1.1.5"
 			},
@@ -41586,14 +38890,12 @@
 		"node_modules/object-filter": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/object-filter/-/object-filter-1.0.2.tgz",
-			"integrity": "sha512-NahvP2vZcy1ZiiYah30CEPw0FpDcSkSePJBMpzl5EQgCmISijiGuJm3SPYp7U+Lf2TljyaIw3E5EgkEx/TNEVA==",
-			"dev": true
+			"integrity": "sha512-NahvP2vZcy1ZiiYah30CEPw0FpDcSkSePJBMpzl5EQgCmISijiGuJm3SPYp7U+Lf2TljyaIw3E5EgkEx/TNEVA=="
 		},
 		"node_modules/object-inspect": {
-			"version": "1.12.3",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-			"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-			"dev": true,
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+			"integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
@@ -41618,7 +38920,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
 			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.4"
 			}
@@ -41627,6 +38928,7 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
 			"integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+			"dev": true,
 			"dependencies": {
 				"isobject": "^3.0.0"
 			},
@@ -41638,7 +38940,6 @@
 			"version": "4.1.4",
 			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
 			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -41656,7 +38957,6 @@
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
 			"integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -41670,7 +38970,6 @@
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
 			"integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -41687,7 +38986,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.0.tgz",
 			"integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==",
-			"dev": true,
 			"dependencies": {
 				"define-properties": "^1.1.3",
 				"es-abstract": "^1.19.1"
@@ -41700,6 +38998,7 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
 			"integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+			"dev": true,
 			"dependencies": {
 				"isobject": "^3.0.1"
 			},
@@ -41711,7 +39010,6 @@
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
 			"integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -41733,8 +39031,7 @@
 		"node_modules/obuf": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-			"dev": true
+			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
 		},
 		"node_modules/octokit-pagination-methods": {
 			"version": "1.1.0",
@@ -41742,6 +39039,12 @@
 			"integrity": "sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==",
 			"dev": true
 		},
+		"node_modules/ohash": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.3.tgz",
+			"integrity": "sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==",
+			"dev": true
+		},
 		"node_modules/on-finished": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -41811,7 +39114,6 @@
 			"version": "1.5.2",
 			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
 			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-			"dev": true,
 			"bin": {
 				"opener": "bin/opener-bin.js"
 			}
@@ -41820,7 +39122,6 @@
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
 			"integrity": "sha512-oCOQ8AIC2ciLy/sE2ehafRBleBgDLvzGhBRRev87sP7ovnbvQfqpc3XFI0DhHey2OfVoNV91W+GPC6B3540/5Q==",
-			"dev": true,
 			"dependencies": {
 				"deep-is": "~0.1.3",
 				"fast-levenshtein": "~2.0.4",
@@ -41837,7 +39138,6 @@
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz",
 			"integrity": "sha512-sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A==",
-			"dev": true,
 			"dependencies": {
 				"chalk": "^3.0.0",
 				"cli-cursor": "^3.1.0",
@@ -41859,7 +39159,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
 			"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.1.0",
 				"supports-color": "^7.1.0"
@@ -41872,7 +39171,6 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
 			"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-			"dev": true,
 			"dependencies": {
 				"restore-cursor": "^3.1.0"
 			},
@@ -41884,7 +39182,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -41893,7 +39190,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
 			"integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
-			"dev": true,
 			"dependencies": {
 				"chalk": "^2.4.2"
 			},
@@ -41905,7 +39201,6 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
 			"dependencies": {
 				"color-convert": "^1.9.0"
 			},
@@ -41917,7 +39212,6 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -41931,7 +39225,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
 			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
@@ -41940,7 +39233,6 @@
 			"version": "5.5.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^3.0.0"
 			},
@@ -41952,7 +39244,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -41961,7 +39252,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
 			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
 			"dependencies": {
 				"mimic-fn": "^2.1.0"
 			},
@@ -41976,7 +39266,6 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
 			"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-			"dev": true,
 			"dependencies": {
 				"onetime": "^5.1.0",
 				"signal-exit": "^3.0.2"
@@ -41989,7 +39278,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -42007,7 +39295,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 			"integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -42037,7 +39324,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
 			"integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -42046,6 +39332,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
 			"integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
@@ -42068,7 +39355,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
 			"integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
-			"dev": true,
 			"dependencies": {
 				"p-limit": "^1.1.0"
 			},
@@ -42080,7 +39366,6 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
 			"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-			"dev": true,
 			"dependencies": {
 				"p-try": "^1.0.0"
 			},
@@ -42153,7 +39438,6 @@
 			"version": "4.6.1",
 			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
 			"integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
-			"dev": true,
 			"dependencies": {
 				"@types/retry": "^0.12.0",
 				"retry": "^0.13.1"
@@ -42166,7 +39450,6 @@
 			"version": "0.13.1",
 			"resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
 			"integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 4"
 			}
@@ -42187,7 +39470,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
 			"integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
-			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
@@ -42211,7 +39493,6 @@
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
 			"integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==",
-			"dev": true,
 			"dependencies": {
 				"@tootallnate/quickjs-emscripten": "^0.23.0",
 				"agent-base": "^7.0.2",
@@ -42227,10 +39508,9 @@
 			}
 		},
 		"node_modules/pac-proxy-agent/node_modules/agent-base": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-			"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-			"dev": true,
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+			"integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
 			"dependencies": {
 				"debug": "^4.3.4"
 			},
@@ -42239,10 +39519,9 @@
 			}
 		},
 		"node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-			"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-			"dev": true,
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
 			"dependencies": {
 				"agent-base": "^7.1.0",
 				"debug": "^4.3.4"
@@ -42252,10 +39531,10 @@
 			}
 		},
 		"node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-			"integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
-			"dev": true,
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+			"integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+			"license": "MIT",
 			"dependencies": {
 				"agent-base": "^7.0.2",
 				"debug": "4"
@@ -42265,14 +39544,14 @@
 			}
 		},
 		"node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
-			"integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
-			"dev": true,
+			"version": "8.0.4",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+			"integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+			"license": "MIT",
 			"dependencies": {
-				"agent-base": "^7.0.2",
+				"agent-base": "^7.1.1",
 				"debug": "^4.3.4",
-				"socks": "^2.7.1"
+				"socks": "^2.8.3"
 			},
 			"engines": {
 				"node": ">= 14"
@@ -42282,7 +39561,6 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz",
 			"integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==",
-			"dev": true,
 			"dependencies": {
 				"degenerator": "^5.0.0",
 				"ip": "^1.1.8",
@@ -42313,6 +39591,13 @@
 				"node": ">= 6"
 			}
 		},
+		"node_modules/package-json-from-dist": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+			"integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0"
+		},
 		"node_modules/pacote": {
 			"version": "15.2.0",
 			"resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz",
@@ -42345,18 +39630,6 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/pacote/node_modules/@npmcli/fs": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
-			"integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.3.5"
-			},
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
 		"node_modules/pacote/node_modules/brace-expansion": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -42366,26 +39639,17 @@
 				"balanced-match": "^1.0.0"
 			}
 		},
-		"node_modules/pacote/node_modules/builtins": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-			"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.0.0"
-			}
-		},
 		"node_modules/pacote/node_modules/cacache": {
-			"version": "17.1.3",
-			"resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz",
-			"integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==",
+			"version": "17.1.4",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
+			"integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
 			"dev": true,
 			"dependencies": {
 				"@npmcli/fs": "^3.1.0",
 				"fs-minipass": "^3.0.0",
 				"glob": "^10.2.2",
 				"lru-cache": "^7.7.1",
-				"minipass": "^5.0.0",
+				"minipass": "^7.0.3",
 				"minipass-collect": "^1.0.2",
 				"minipass-flush": "^1.0.5",
 				"minipass-pipeline": "^1.2.4",
@@ -42398,70 +39662,69 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/pacote/node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+		"node_modules/pacote/node_modules/cacache/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
+			"license": "ISC",
 			"engines": {
-				"node": ">= 8"
+				"node": ">=16 || 14 >=14.17"
 			}
 		},
-		"node_modules/pacote/node_modules/foreground-child": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-			"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+		"node_modules/pacote/node_modules/fs-minipass": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
+			"integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
 			"dev": true,
 			"dependencies": {
-				"cross-spawn": "^7.0.0",
-				"signal-exit": "^4.0.1"
+				"minipass": "^7.0.3"
 			},
 			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/pacote/node_modules/fs-minipass": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz",
-			"integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==",
+		"node_modules/pacote/node_modules/fs-minipass/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
-			"dependencies": {
-				"minipass": "^5.0.0"
-			},
+			"license": "ISC",
 			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+				"node": ">=16 || 14 >=14.17"
 			}
 		},
 		"node_modules/pacote/node_modules/glob": {
-			"version": "10.3.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-			"integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"foreground-child": "^3.1.0",
-				"jackspeak": "^2.0.3",
-				"minimatch": "^9.0.1",
-				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-				"path-scurry": "^1.10.1"
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
 			},
 			"bin": {
-				"glob": "dist/cjs/src/bin.js"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
+				"glob": "dist/esm/bin.mjs"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
+		"node_modules/pacote/node_modules/glob/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			}
+		},
 		"node_modules/pacote/node_modules/hosted-git-info": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
@@ -42475,9 +39738,9 @@
 			}
 		},
 		"node_modules/pacote/node_modules/ignore-walk": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz",
-			"integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==",
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
+			"integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
 			"dev": true,
 			"dependencies": {
 				"minimatch": "^9.0.0"
@@ -42486,6 +39749,22 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
+		"node_modules/pacote/node_modules/jackspeak": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+			"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"@isaacs/cliui": "^8.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			},
+			"optionalDependencies": {
+				"@pkgjs/parseargs": "^0.11.0"
+			}
+		},
 		"node_modules/pacote/node_modules/lru-cache": {
 			"version": "7.18.3",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@@ -42496,10 +39775,11 @@
 			}
 		},
 		"node_modules/pacote/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -42546,58 +39826,26 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/pacote/node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pacote/node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+		"node_modules/pacote/node_modules/ssri": {
+			"version": "10.0.6",
+			"resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
+			"integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
 			"dev": true,
 			"dependencies": {
-				"shebang-regex": "^3.0.0"
+				"minipass": "^7.0.3"
 			},
 			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pacote/node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/pacote/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+		"node_modules/pacote/node_modules/ssri/node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/pacote/node_modules/ssri": {
-			"version": "10.0.4",
-			"resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz",
-			"integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==",
-			"dev": true,
-			"dependencies": {
-				"minipass": "^5.0.0"
-			},
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+				"node": ">=16 || 14 >=14.17"
 			}
 		},
 		"node_modules/pacote/node_modules/unique-filename": {
@@ -42625,32 +39873,14 @@
 			}
 		},
 		"node_modules/pacote/node_modules/validate-npm-package-name": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-			"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+			"integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
 			"dev": true,
-			"dependencies": {
-				"builtins": "^5.0.0"
-			},
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/pacote/node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
 		"node_modules/pako": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -42658,12 +39888,12 @@
 			"dev": true
 		},
 		"node_modules/parallel-transform": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-			"integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+			"integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
 			"dev": true,
 			"dependencies": {
-				"cyclist": "~0.2.2",
+				"cyclist": "^1.0.1",
 				"inherits": "^2.0.3",
 				"readable-stream": "^2.1.5"
 			}
@@ -42704,14 +39934,12 @@
 		"node_modules/parse-cache-control": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz",
-			"integrity": "sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==",
-			"dev": true
+			"integrity": "sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg=="
 		},
 		"node_modules/parse-entities": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz",
 			"integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==",
-			"dev": true,
 			"dependencies": {
 				"character-entities": "^1.0.0",
 				"character-entities-legacy": "^1.0.0",
@@ -42751,7 +39979,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
 			"integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -42778,7 +40005,6 @@
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
 			"integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-			"dev": true,
 			"dependencies": {
 				"entities": "^4.4.0"
 			},
@@ -42790,7 +40016,6 @@
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
 			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.12"
 			},
@@ -42798,6 +40023,12 @@
 				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
 		},
+		"node_modules/parsel-js": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/parsel-js/-/parsel-js-1.1.2.tgz",
+			"integrity": "sha512-D66DG2nKx4Yoq66TMEyCUHlR2STGqO7vsBrX7tgyS9cfQyO6XD5JyzOiflwmWN6a4wbUAqpmHqmrxlTQVGZcbA==",
+			"license": "MIT"
+		},
 		"node_modules/parseurl": {
 			"version": "1.3.3",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -42819,90 +40050,84 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
 			"integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/patch-package": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz",
-			"integrity": "sha512-YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",
+			"integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",
 			"dev": true,
 			"dependencies": {
 				"@yarnpkg/lockfile": "^1.1.0",
-				"chalk": "^2.4.2",
-				"cross-spawn": "^6.0.5",
-				"find-yarn-workspace-root": "^1.2.1",
-				"fs-extra": "^7.0.1",
-				"is-ci": "^2.0.0",
+				"chalk": "^4.1.2",
+				"ci-info": "^3.7.0",
+				"cross-spawn": "^7.0.3",
+				"find-yarn-workspace-root": "^2.0.0",
+				"fs-extra": "^9.0.0",
+				"json-stable-stringify": "^1.0.2",
 				"klaw-sync": "^6.0.0",
-				"minimist": "^1.2.0",
+				"minimist": "^1.2.6",
+				"open": "^7.4.2",
 				"rimraf": "^2.6.3",
-				"semver": "^5.6.0",
+				"semver": "^7.5.3",
 				"slash": "^2.0.0",
-				"tmp": "^0.0.33"
+				"tmp": "^0.0.33",
+				"yaml": "^2.2.2"
 			},
 			"bin": {
 				"patch-package": "index.js"
 			},
 			"engines": {
+				"node": ">=14",
 				"npm": ">5"
 			}
 		},
-		"node_modules/patch-package/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/patch-package/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
 			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
 		"node_modules/patch-package/node_modules/cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dev": true,
 			"dependencies": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
 			},
 			"engines": {
-				"node": ">=4.8"
+				"node": ">= 8"
 			}
 		},
 		"node_modules/patch-package/node_modules/fs-extra": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+			"integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
 			"dev": true,
 			"dependencies": {
-				"graceful-fs": "^4.1.2",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
+				"at-least-node": "^1.0.0",
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=6 <7 || >=8"
+				"node": ">=10"
 			}
 		},
 		"node_modules/patch-package/node_modules/glob": {
@@ -42925,6 +40150,64 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
+		"node_modules/patch-package/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/patch-package/node_modules/is-wsl": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+			"dev": true,
+			"dependencies": {
+				"is-docker": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/patch-package/node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dev": true,
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/patch-package/node_modules/open": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+			"integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+			"dev": true,
+			"dependencies": {
+				"is-docker": "^2.0.0",
+				"is-wsl": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/patch-package/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/patch-package/node_modules/rimraf": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -42937,13 +40220,25 @@
 				"rimraf": "bin.js"
 			}
 		},
-		"node_modules/patch-package/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+		"node_modules/patch-package/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
-			"bin": {
-				"semver": "bin/semver"
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/patch-package/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
 		"node_modules/patch-package/node_modules/slash": {
@@ -42955,6 +40250,55 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/patch-package/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/patch-package/node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
+		"node_modules/patch-package/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/patch-package/node_modules/yaml": {
+			"version": "2.6.0",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+			"integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"yaml": "bin.mjs"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
 		"node_modules/path-browserify": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -42996,13 +40340,13 @@
 		"node_modules/path-is-inside": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-			"integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-			"dev": true
+			"integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="
 		},
 		"node_modules/path-key": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
 			"integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
@@ -43013,35 +40357,35 @@
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
 		"node_modules/path-scurry": {
-			"version": "1.10.1",
-			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
-			"integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+			"integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
 			"dev": true,
+			"license": "BlueOak-1.0.0",
 			"dependencies": {
-				"lru-cache": "^9.1.1 || ^10.0.0",
+				"lru-cache": "^10.2.0",
 				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
 			},
 			"engines": {
-				"node": ">=16 || 14 >=14.17"
+				"node": ">=16 || 14 >=14.18"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/path-scurry/node_modules/lru-cache": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.0.tgz",
-			"integrity": "sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==",
+			"version": "10.4.3",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+			"integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
 			"dev": true,
-			"engines": {
-				"node": "14 || >=16.14"
-			}
+			"license": "ISC"
 		},
 		"node_modules/path-scurry/node_modules/minipass": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.2.tgz",
-			"integrity": "sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": ">=16 || 14 >=14.17"
 			}
@@ -43049,8 +40393,7 @@
 		"node_modules/path-to-regexp": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-			"dev": true
+			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
 		},
 		"node_modules/path-type": {
 			"version": "3.0.0",
@@ -43074,9 +40417,9 @@
 			}
 		},
 		"node_modules/pathe": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-			"integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+			"integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
 			"dev": true
 		},
 		"node_modules/pbkdf2": {
@@ -43120,8 +40463,7 @@
 		"node_modules/pend": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-			"integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-			"dev": true
+			"integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
 		},
 		"node_modules/phpegjs": {
 			"version": "1.0.0-beta7",
@@ -43132,9 +40474,10 @@
 			}
 		},
 		"node_modules/picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+			"integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+			"license": "ISC"
 		},
 		"node_modules/picomatch": {
 			"version": "2.3.1",
@@ -43163,7 +40506,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
 			"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -43172,7 +40514,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
 			"integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -43181,7 +40522,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
 			"integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-			"dev": true,
 			"dependencies": {
 				"pinkie": "^2.0.0"
 			},
@@ -43190,9 +40530,9 @@
 			}
 		},
 		"node_modules/pirates": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-			"integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+			"integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
 			"engines": {
 				"node": ">= 6"
 			}
@@ -43201,7 +40541,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
 			"integrity": "sha512-ojakdnUgL5pzJYWw2AIDEupaQCX5OPbM688ZevubICjdIX01PRSYKqm33fJoCOJBRseYCTUlQRnBNX+Pchaejw==",
-			"dev": true,
 			"dependencies": {
 				"find-up": "^2.1.0"
 			},
@@ -43216,33 +40555,33 @@
 			"dev": true
 		},
 		"node_modules/playwright": {
-			"version": "1.39.0",
-			"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.39.0.tgz",
-			"integrity": "sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==",
+			"version": "1.48.1",
+			"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.1.tgz",
+			"integrity": "sha512-j8CiHW/V6HxmbntOfyB4+T/uk08tBy6ph0MpBXwuoofkSnLmlfdYNNkFTYD6ofzzlSqLA1fwH4vwvVFvJgLN0w==",
 			"dev": true,
 			"dependencies": {
-				"playwright-core": "1.39.0"
+				"playwright-core": "1.48.1"
 			},
 			"bin": {
 				"playwright": "cli.js"
 			},
 			"engines": {
-				"node": ">=16"
+				"node": ">=18"
 			},
 			"optionalDependencies": {
 				"fsevents": "2.3.2"
 			}
 		},
-		"node_modules/playwright/node_modules/playwright-core": {
-			"version": "1.39.0",
-			"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.39.0.tgz",
-			"integrity": "sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==",
+		"node_modules/playwright-core": {
+			"version": "1.48.1",
+			"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.1.tgz",
+			"integrity": "sha512-Yw/t4VAFX/bBr1OzwCuOMZkY1Cnb4z/doAFSwf4huqAGWmf9eMNjmK7NiOljCdLmxeRYcGPPmcDgU0zOlzP0YA==",
 			"dev": true,
 			"bin": {
 				"playwright-core": "cli.js"
 			},
 			"engines": {
-				"node": ">=16"
+				"node": ">=18"
 			}
 		},
 		"node_modules/please-upgrade-node": {
@@ -43272,7 +40611,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
 			"integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
-			"dev": true,
 			"dependencies": {
 				"irregular-plurals": "^3.2.0"
 			},
@@ -43308,15 +40646,15 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
 			"integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/postcss": {
-			"version": "8.4.16",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-			"integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
-			"dev": true,
+			"version": "8.4.38",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+			"integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -43325,12 +40663,17 @@
 				{
 					"type": "tidelift",
 					"url": "https://tidelift.com/funding/github/npm/postcss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"nanoid": "^3.3.4",
+				"nanoid": "^3.3.7",
 				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
+				"source-map-js": "^1.2.0"
 			},
 			"engines": {
 				"node": "^10 || ^12 || >=14"
@@ -43340,7 +40683,6 @@
 			"version": "9.0.1",
 			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
 			"integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
-			"dev": true,
 			"dependencies": {
 				"postcss-selector-parser": "^6.0.11",
 				"postcss-value-parser": "^4.2.0"
@@ -43355,14 +40697,12 @@
 		"node_modules/postcss-calc/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-colormin": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.0.tgz",
 			"integrity": "sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==",
-			"dev": true,
 			"dependencies": {
 				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0",
@@ -43379,14 +40719,12 @@
 		"node_modules/postcss-colormin/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-convert-values": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz",
 			"integrity": "sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==",
-			"dev": true,
 			"dependencies": {
 				"browserslist": "^4.21.4",
 				"postcss-value-parser": "^4.2.0"
@@ -43401,14 +40739,12 @@
 		"node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-discard-comments": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz",
 			"integrity": "sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==",
-			"dev": true,
 			"engines": {
 				"node": "^14 || ^16 || >=18.0"
 			},
@@ -43420,7 +40756,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz",
 			"integrity": "sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==",
-			"dev": true,
 			"engines": {
 				"node": "^14 || ^16 || >=18.0"
 			},
@@ -43432,7 +40767,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz",
 			"integrity": "sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==",
-			"dev": true,
 			"engines": {
 				"node": "^14 || ^16 || >=18.0"
 			},
@@ -43444,7 +40778,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz",
 			"integrity": "sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==",
-			"dev": true,
 			"engines": {
 				"node": "^14 || ^16 || >=18.0"
 			},
@@ -43452,11 +40785,31 @@
 				"postcss": "^8.2.15"
 			}
 		},
+		"node_modules/postcss-import": {
+			"version": "16.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.1.0.tgz",
+			"integrity": "sha512-7hsAZ4xGXl4MW+OKEWCnF6T5jqBw80/EE9aXg1r2yyn1RsVEU8EtKXbijEODa+rg7iih4bKf7vlvTGYR4CnPNg==",
+			"dependencies": {
+				"postcss-value-parser": "^4.0.0",
+				"read-cache": "^1.0.0",
+				"resolve": "^1.1.7"
+			},
+			"engines": {
+				"node": ">=18.0.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.0.0"
+			}
+		},
+		"node_modules/postcss-import/node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+		},
 		"node_modules/postcss-loader": {
 			"version": "6.2.1",
 			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
 			"integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
-			"dev": true,
 			"dependencies": {
 				"cosmiconfig": "^7.0.0",
 				"klona": "^2.0.5",
@@ -43474,17 +40827,27 @@
 				"webpack": "^5.0.0"
 			}
 		},
+		"node_modules/postcss-local-keyframes": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/postcss-local-keyframes/-/postcss-local-keyframes-0.0.2.tgz",
+			"integrity": "sha512-nRN01llvxnqLw1TZu4kBknHwpxPPK3DLLJClQ3eTGhS+jBNyoIAMx0hw+fdiDOy7TXjfnojamPwUm/UxBEZDTw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.8"
+			}
+		},
 		"node_modules/postcss-media-query-parser": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-			"integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-			"dev": true
+			"integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig=="
 		},
 		"node_modules/postcss-merge-longhand": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz",
 			"integrity": "sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0",
 				"stylehacks": "^6.0.0"
@@ -43499,14 +40862,12 @@
 		"node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-merge-rules": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz",
 			"integrity": "sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==",
-			"dev": true,
 			"dependencies": {
 				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0",
@@ -43524,7 +40885,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz",
 			"integrity": "sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
@@ -43538,14 +40898,12 @@
 		"node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-minify-gradients": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz",
 			"integrity": "sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==",
-			"dev": true,
 			"dependencies": {
 				"colord": "^2.9.1",
 				"cssnano-utils": "^4.0.0",
@@ -43561,14 +40919,12 @@
 		"node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-minify-params": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz",
 			"integrity": "sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==",
-			"dev": true,
 			"dependencies": {
 				"browserslist": "^4.21.4",
 				"cssnano-utils": "^4.0.0",
@@ -43584,14 +40940,12 @@
 		"node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-minify-selectors": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz",
 			"integrity": "sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==",
-			"dev": true,
 			"dependencies": {
 				"postcss-selector-parser": "^6.0.5"
 			},
@@ -43603,10 +40957,9 @@
 			}
 		},
 		"node_modules/postcss-modules-extract-imports": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-			"dev": true,
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
 			},
@@ -43615,10 +40968,9 @@
 			}
 		},
 		"node_modules/postcss-modules-local-by-default": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-			"integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
-			"dev": true,
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
+			"integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
 			"dependencies": {
 				"icss-utils": "^5.0.0",
 				"postcss-selector-parser": "^6.0.2",
@@ -43634,14 +40986,12 @@
 		"node_modules/postcss-modules-local-by-default/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-modules-scope": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-			"dev": true,
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
+			"integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
 			"dependencies": {
 				"postcss-selector-parser": "^6.0.4"
 			},
@@ -43656,7 +41006,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
 			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-			"dev": true,
 			"dependencies": {
 				"icss-utils": "^5.0.0"
 			},
@@ -43671,7 +41020,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz",
 			"integrity": "sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==",
-			"dev": true,
 			"engines": {
 				"node": "^14 || ^16 || >=18.0"
 			},
@@ -43683,7 +41031,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz",
 			"integrity": "sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
@@ -43697,14 +41044,12 @@
 		"node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-normalize-positions": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz",
 			"integrity": "sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
@@ -43718,14 +41063,12 @@
 		"node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-normalize-repeat-style": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz",
 			"integrity": "sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
@@ -43739,14 +41082,12 @@
 		"node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-normalize-string": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz",
 			"integrity": "sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
@@ -43760,14 +41101,12 @@
 		"node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-normalize-timing-functions": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz",
 			"integrity": "sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
@@ -43781,14 +41120,12 @@
 		"node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-normalize-unicode": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz",
 			"integrity": "sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==",
-			"dev": true,
 			"dependencies": {
 				"browserslist": "^4.21.4",
 				"postcss-value-parser": "^4.2.0"
@@ -43803,14 +41140,12 @@
 		"node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-normalize-url": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz",
 			"integrity": "sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
@@ -43824,14 +41159,12 @@
 		"node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-normalize-whitespace": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz",
 			"integrity": "sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
@@ -43845,14 +41178,12 @@
 		"node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-ordered-values": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz",
 			"integrity": "sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==",
-			"dev": true,
 			"dependencies": {
 				"cssnano-utils": "^4.0.0",
 				"postcss-value-parser": "^4.2.0"
@@ -43867,22 +41198,21 @@
 		"node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
-		"node_modules/postcss-prefixwrap": {
-			"version": "1.41.0",
-			"resolved": "https://registry.npmjs.org/postcss-prefixwrap/-/postcss-prefixwrap-1.41.0.tgz",
-			"integrity": "sha512-gmwwAEE+ci3/ZKjUZppTETINlh1QwihY8gCstInuS7ohk353KYItU4d64hvnUvO2GUy29hBGPHz4Ce+qJRi90A==",
+		"node_modules/postcss-prefix-selector": {
+			"version": "1.16.1",
+			"resolved": "https://registry.npmjs.org/postcss-prefix-selector/-/postcss-prefix-selector-1.16.1.tgz",
+			"integrity": "sha512-Umxu+FvKMwlY6TyDzGFoSUnzW+NOfMBLyC1tAkIjgX+Z/qGspJeRjVC903D7mx7TuBpJlwti2ibXtWuA7fKMeQ==",
+			"license": "MIT",
 			"peerDependencies": {
-				"postcss": "*"
+				"postcss": ">4 <9"
 			}
 		},
 		"node_modules/postcss-reduce-initial": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz",
 			"integrity": "sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==",
-			"dev": true,
 			"dependencies": {
 				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0"
@@ -43898,7 +41228,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz",
 			"integrity": "sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
@@ -43912,36 +41241,67 @@
 		"node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-resolve-nested-selector": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-			"integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
-			"dev": true
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz",
+			"integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw=="
 		},
 		"node_modules/postcss-safe-parser": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-			"integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-			"dev": true,
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz",
+			"integrity": "sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss-safe-parser"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
 			"engines": {
-				"node": ">=12.0"
+				"node": ">=18.0"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/postcss/"
+			"peerDependencies": {
+				"postcss": "^8.4.31"
+			}
+		},
+		"node_modules/postcss-scss": {
+			"version": "4.0.9",
+			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz",
+			"integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss-scss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"engines": {
+				"node": ">=12.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.3.3"
+				"postcss": "^8.4.29"
 			}
 		},
 		"node_modules/postcss-selector-parser": {
-			"version": "6.0.13",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-			"integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
-			"dev": true,
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+			"integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
 			"dependencies": {
 				"cssesc": "^3.0.0",
 				"util-deprecate": "^1.0.2"
@@ -43954,7 +41314,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz",
 			"integrity": "sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==",
-			"dev": true,
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0",
 				"svgo": "^3.0.2"
@@ -43969,14 +41328,12 @@
 		"node_modules/postcss-svgo/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/postcss-unique-selectors": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz",
 			"integrity": "sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==",
-			"dev": true,
 			"dependencies": {
 				"postcss-selector-parser": "^6.0.5"
 			},
@@ -43987,40 +41344,25 @@
 				"postcss": "^8.2.15"
 			}
 		},
-		"node_modules/postcss-urlrebase": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/postcss-urlrebase/-/postcss-urlrebase-1.3.0.tgz",
-			"integrity": "sha512-LOFN43n1IewKriXiypMNNinXeptttSyGGRLPbBMdQzuTvvCEo5mz/gG06y/HqrkN7p3ayHQf2R2bTBv639FOaQ==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.3.0"
-			}
-		},
-		"node_modules/postcss-urlrebase/node_modules/postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
-		},
 		"node_modules/postcss-value-parser": {
 			"version": "3.3.1",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
 			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
 		},
 		"node_modules/postcss/node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-			"dev": true,
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/preact": {
-			"version": "10.13.2",
-			"resolved": "https://registry.npmjs.org/preact/-/preact-10.13.2.tgz",
-			"integrity": "sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw==",
+			"version": "10.24.2",
+			"resolved": "https://registry.npmjs.org/preact/-/preact-10.24.2.tgz",
+			"integrity": "sha512-1cSoF0aCC8uaARATfrlz4VCBqE8LwZwRfLgkxJOQwAlQt6ayTmi0D9OF7nXid1POI5SZidFuG9CnlXbDfLqY/Q==",
+			"license": "MIT",
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/preact"
@@ -44054,10 +41396,11 @@
 			}
 		},
 		"node_modules/prebuild-install/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
 			"dev": true,
+			"license": "MIT",
 			"optional": true,
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
@@ -44068,7 +41411,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
 			"integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.8.0"
 			}
@@ -44078,7 +41420,6 @@
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-3.0.3.tgz",
 			"integrity": "sha512-X4UlrxDTH8oom9qXlcjnydsjAOD2BmB6yFmvS4Z2zdTzqqpRWb+fbqrH412+l+OUXmbzJlSXjlMFYPgYG12IAA==",
-			"dev": true,
 			"bin": {
 				"prettier": "bin/prettier.cjs"
 			},
@@ -44093,7 +41434,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
 			"integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-			"dev": true,
 			"dependencies": {
 				"fast-diff": "^1.1.2"
 			},
@@ -44112,11 +41452,11 @@
 			}
 		},
 		"node_modules/pretty-format": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
-			"integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
 			"dependencies": {
-				"@jest/schemas": "^29.6.0",
+				"@jest/schemas": "^29.6.3",
 				"ansi-styles": "^5.0.0",
 				"react-is": "^18.0.0"
 			},
@@ -44136,9 +41476,9 @@
 			}
 		},
 		"node_modules/pretty-format/node_modules/react-is": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-			"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
 		},
 		"node_modules/pretty-hrtime": {
 			"version": "1.0.3",
@@ -44176,7 +41516,6 @@
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
 			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.4.0"
 			}
@@ -44233,13 +41572,13 @@
 			}
 		},
 		"node_modules/prop-types": {
-			"version": "15.7.2",
-			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-			"integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+			"version": "15.8.1",
+			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+			"integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
 			"dependencies": {
 				"loose-envify": "^1.4.0",
 				"object-assign": "^4.1.1",
-				"react-is": "^16.8.1"
+				"react-is": "^16.13.1"
 			}
 		},
 		"node_modules/propagate": {
@@ -44261,7 +41600,6 @@
 			"version": "2.0.7",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
 			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-			"dev": true,
 			"dependencies": {
 				"forwarded": "0.2.0",
 				"ipaddr.js": "1.9.1"
@@ -44274,7 +41612,6 @@
 			"version": "6.3.0",
 			"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.0.tgz",
 			"integrity": "sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==",
-			"dev": true,
 			"dependencies": {
 				"agent-base": "^7.0.2",
 				"debug": "^4.3.4",
@@ -44290,10 +41627,9 @@
 			}
 		},
 		"node_modules/proxy-agent/node_modules/agent-base": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-			"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-			"dev": true,
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+			"integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
 			"dependencies": {
 				"debug": "^4.3.4"
 			},
@@ -44302,10 +41638,9 @@
 			}
 		},
 		"node_modules/proxy-agent/node_modules/http-proxy-agent": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-			"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-			"dev": true,
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
 			"dependencies": {
 				"agent-base": "^7.1.0",
 				"debug": "^4.3.4"
@@ -44315,10 +41650,10 @@
 			}
 		},
 		"node_modules/proxy-agent/node_modules/https-proxy-agent": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz",
-			"integrity": "sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==",
-			"dev": true,
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+			"integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+			"license": "MIT",
 			"dependencies": {
 				"agent-base": "^7.0.2",
 				"debug": "4"
@@ -44331,35 +41666,28 @@
 			"version": "7.18.3",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
 			"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/proxy-agent/node_modules/socks-proxy-agent": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz",
-			"integrity": "sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==",
-			"dev": true,
+			"version": "8.0.4",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+			"integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+			"license": "MIT",
 			"dependencies": {
-				"agent-base": "^7.0.1",
+				"agent-base": "^7.1.1",
 				"debug": "^4.3.4",
-				"socks": "^2.7.1"
+				"socks": "^2.8.3"
 			},
 			"engines": {
 				"node": ">= 14"
 			}
 		},
-		"node_modules/proxy-compare": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/proxy-compare/-/proxy-compare-2.3.0.tgz",
-			"integrity": "sha512-c3L2CcAi7f7pvlD0D7xsF+2CQIW8C3HaYx2Pfgq8eA4HAl3GAH6/dVYsyBbYF/0XJs2ziGLrzmz5fmzPm6A0pQ=="
-		},
 		"node_modules/proxy-from-env": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-			"dev": true
+			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
 		},
 		"node_modules/prr": {
 			"version": "1.0.1",
@@ -44371,7 +41699,6 @@
 			"version": "8.1.1",
 			"resolved": "https://registry.npmjs.org/ps-list/-/ps-list-8.1.1.tgz",
 			"integrity": "sha512-OPS9kEJYVmiO48u/B9qneqhkMvgCxT+Tm28VCEJpheTpl8cJ0ffZRRNgS5mrQRTrX5yRTpaJ+hRDeefXYmmorQ==",
-			"dev": true,
 			"engines": {
 				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			},
@@ -44382,14 +41709,7 @@
 		"node_modules/pseudomap": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-			"integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-			"dev": true
-		},
-		"node_modules/psl": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-			"integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-			"dev": true
+			"integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
 		},
 		"node_modules/public-encrypt": {
 			"version": "4.0.3",
@@ -44433,41 +41753,120 @@
 			}
 		},
 		"node_modules/punycode": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-			"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/puppeteer-core": {
-			"version": "13.7.0",
-			"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.7.0.tgz",
-			"integrity": "sha512-rXja4vcnAzFAP1OVLq/5dWNfwBGuzcOARJ6qGV7oAZhnLmVRU8G5MsdeQEAOy332ZhkIOnn9jp15R89LKHyp2Q==",
-			"dev": true,
+			"version": "23.1.0",
+			"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.1.0.tgz",
+			"integrity": "sha512-SvAsu+xnLN2FMXE/59bp3s3WXp8ewqUGzVV4AQtml/2xmsciZnU/bXcCW+eETHPWQ6Agg2vTI7QzWXPpEARK2g==",
+			"license": "Apache-2.0",
 			"dependencies": {
-				"cross-fetch": "3.1.5",
-				"debug": "4.3.4",
-				"devtools-protocol": "0.0.981744",
-				"extract-zip": "2.0.1",
-				"https-proxy-agent": "5.0.1",
-				"pkg-dir": "4.2.0",
-				"progress": "2.0.3",
-				"proxy-from-env": "1.1.0",
-				"rimraf": "3.0.2",
-				"tar-fs": "2.1.1",
-				"unbzip2-stream": "1.4.3",
-				"ws": "8.5.0"
+				"@puppeteer/browsers": "2.3.1",
+				"chromium-bidi": "0.6.4",
+				"debug": "^4.3.6",
+				"devtools-protocol": "0.0.1312386",
+				"typed-query-selector": "^2.12.0",
+				"ws": "^8.18.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/@puppeteer/browsers": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
+			"integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"debug": "^4.3.6",
+				"extract-zip": "^2.0.1",
+				"progress": "^2.0.3",
+				"proxy-agent": "^6.4.0",
+				"semver": "^7.6.3",
+				"tar-fs": "^3.0.6",
+				"unbzip2-stream": "^1.4.3",
+				"yargs": "^17.7.2"
+			},
+			"bin": {
+				"browsers": "lib/cjs/main-cli.js"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/agent-base": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+			"integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^4.3.4"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/chromium-bidi": {
+			"version": "0.6.4",
+			"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.4.tgz",
+			"integrity": "sha512-8zoq6ogmhQQkAKZVKO2ObFTl4uOkqoX1PlKQX3hZQ5E9cbUotcAb7h4pTNVAGGv8Z36PF3CtdOriEp/Rz82JqQ==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"mitt": "3.0.1",
+				"urlpattern-polyfill": "10.0.0",
+				"zod": "3.23.8"
+			},
+			"peerDependencies": {
+				"devtools-protocol": "*"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/cliui": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+			"license": "ISC",
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.1",
+				"wrap-ansi": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/debug": {
+			"version": "4.3.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+			"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.3"
 			},
 			"engines": {
-				"node": ">=10.18.1"
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
 			}
 		},
+		"node_modules/puppeteer-core/node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"license": "MIT"
+		},
 		"node_modules/puppeteer-core/node_modules/extract-zip": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
 			"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"debug": "^4.1.1",
 				"get-stream": "^5.1.0",
@@ -44483,99 +41882,184 @@
 				"@types/yauzl": "^2.9.1"
 			}
 		},
-		"node_modules/puppeteer-core/node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
+		"node_modules/puppeteer-core/node_modules/http-proxy-agent": {
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+			"license": "MIT",
 			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
+				"agent-base": "^7.1.0",
+				"debug": "^4.3.4"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">= 14"
 			}
 		},
-		"node_modules/puppeteer-core/node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
+		"node_modules/puppeteer-core/node_modules/https-proxy-agent": {
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+			"integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+			"license": "MIT",
 			"dependencies": {
-				"p-locate": "^4.1.0"
+				"agent-base": "^7.0.2",
+				"debug": "4"
 			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
-		"node_modules/puppeteer-core/node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
+		"node_modules/puppeteer-core/node_modules/lru-cache": {
+			"version": "7.18.3",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+			"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/mitt": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+			"integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+			"license": "MIT"
+		},
+		"node_modules/puppeteer-core/node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"license": "MIT"
+		},
+		"node_modules/puppeteer-core/node_modules/proxy-agent": {
+			"version": "6.4.0",
+			"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+			"integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
+			"license": "MIT",
 			"dependencies": {
-				"p-try": "^2.0.0"
+				"agent-base": "^7.0.2",
+				"debug": "^4.3.4",
+				"http-proxy-agent": "^7.0.1",
+				"https-proxy-agent": "^7.0.3",
+				"lru-cache": "^7.14.1",
+				"pac-proxy-agent": "^7.0.1",
+				"proxy-from-env": "^1.1.0",
+				"socks-proxy-agent": "^8.0.2"
 			},
 			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">= 14"
 			}
 		},
-		"node_modules/puppeteer-core/node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
+		"node_modules/puppeteer-core/node_modules/pump": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+			"license": "MIT",
 			"dependencies": {
-				"p-limit": "^2.2.0"
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=10"
 			}
 		},
-		"node_modules/puppeteer-core/node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
+		"node_modules/puppeteer-core/node_modules/socks-proxy-agent": {
+			"version": "8.0.4",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+			"integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+			"license": "MIT",
+			"dependencies": {
+				"agent-base": "^7.1.1",
+				"debug": "^4.3.4",
+				"socks": "^2.8.3"
+			},
 			"engines": {
-				"node": ">=6"
+				"node": ">= 14"
 			}
 		},
-		"node_modules/puppeteer-core/node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
+		"node_modules/puppeteer-core/node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
 			"engines": {
 				"node": ">=8"
 			}
 		},
-		"node_modules/puppeteer-core/node_modules/pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
+		"node_modules/puppeteer-core/node_modules/tar-fs": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+			"integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+			"license": "MIT",
 			"dependencies": {
-				"find-up": "^4.0.0"
+				"pump": "^3.0.0",
+				"tar-stream": "^3.1.5"
+			},
+			"optionalDependencies": {
+				"bare-fs": "^2.1.1",
+				"bare-path": "^2.1.0"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/tar-stream": {
+			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+			"integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+			"license": "MIT",
+			"dependencies": {
+				"b4a": "^1.6.4",
+				"fast-fifo": "^1.2.0",
+				"streamx": "^2.15.0"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
 		"node_modules/puppeteer-core/node_modules/ws": {
-			"version": "8.5.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-			"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-			"dev": true,
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			},
 			"peerDependencies": {
 				"bufferutil": "^4.0.1",
-				"utf-8-validate": "^5.0.2"
+				"utf-8-validate": ">=5.0.2"
 			},
 			"peerDependenciesMeta": {
 				"bufferutil": {
@@ -44586,102 +42070,46 @@
 				}
 			}
 		},
-		"node_modules/puppeteer-testing-library": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/puppeteer-testing-library/-/puppeteer-testing-library-0.5.0.tgz",
-			"integrity": "sha512-x72CJwpbdJaGEjBEpUHqeNVdDu36Hoqt6yodnyL/msNN7IoioKS+3ZmwLw/DIiDZJujUAtq3qltbIehA+uGWHQ==",
-			"dev": true,
-			"dependencies": {
-				"jest-diff": "^26.6.2"
-			},
-			"peerDependencies": {
-				"puppeteer": "*"
-			}
-		},
-		"node_modules/puppeteer-testing-library/node_modules/@jest/types": {
-			"version": "26.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-			"integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
-			"dev": true,
-			"dependencies": {
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^15.0.0",
-				"chalk": "^4.0.0"
-			},
-			"engines": {
-				"node": ">= 10.14.2"
-			}
-		},
-		"node_modules/puppeteer-testing-library/node_modules/@types/yargs": {
-			"version": "15.0.15",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz",
-			"integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==",
-			"dev": true,
-			"dependencies": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"node_modules/puppeteer-testing-library/node_modules/diff-sequences": {
-			"version": "26.6.2",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
-			"integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
-			"dev": true,
+		"node_modules/puppeteer-core/node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"license": "ISC",
 			"engines": {
-				"node": ">= 10.14.2"
+				"node": ">=10"
 			}
 		},
-		"node_modules/puppeteer-testing-library/node_modules/jest-diff": {
-			"version": "26.6.2",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-			"integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
-			"dev": true,
+		"node_modules/puppeteer-core/node_modules/yargs": {
+			"version": "17.7.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+			"license": "MIT",
 			"dependencies": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^26.6.2",
-				"jest-get-type": "^26.3.0",
-				"pretty-format": "^26.6.2"
+				"cliui": "^8.0.1",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.3",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^21.1.1"
 			},
 			"engines": {
-				"node": ">= 10.14.2"
-			}
-		},
-		"node_modules/puppeteer-testing-library/node_modules/jest-get-type": {
-			"version": "26.3.0",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-			"integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-			"dev": true,
-			"engines": {
-				"node": ">= 10.14.2"
+				"node": ">=12"
 			}
 		},
-		"node_modules/puppeteer-testing-library/node_modules/pretty-format": {
-			"version": "26.6.2",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-			"integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^26.6.2",
-				"ansi-regex": "^5.0.0",
-				"ansi-styles": "^4.0.0",
-				"react-is": "^17.0.1"
-			},
+		"node_modules/puppeteer-core/node_modules/yargs-parser": {
+			"version": "21.1.1",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+			"license": "ISC",
 			"engines": {
-				"node": ">= 10"
+				"node": ">=12"
 			}
 		},
-		"node_modules/puppeteer-testing-library/node_modules/react-is": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-			"dev": true
-		},
 		"node_modules/pure-rand": {
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
 			"integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
-			"dev": true,
 			"funding": [
 				{
 					"type": "individual",
@@ -44697,7 +42125,6 @@
 			"version": "6.11.0",
 			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
 			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-			"dev": true,
 			"dependencies": {
 				"side-channel": "^1.0.4"
 			},
@@ -44749,11 +42176,13 @@
 				"node": ">=0.4.x"
 			}
 		},
-		"node_modules/querystringify": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-			"dev": true
+		"node_modules/queue": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
+			"integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
+			"dependencies": {
+				"inherits": "~2.0.3"
+			}
 		},
 		"node_modules/queue-microtask": {
 			"version": "1.2.3",
@@ -44777,14 +42206,12 @@
 		"node_modules/queue-tick": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-			"integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-			"dev": true
+			"integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
 		},
 		"node_modules/quick-lru": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
 			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -44829,7 +42256,6 @@
 			"version": "2.5.1",
 			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
 			"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-			"dev": true,
 			"dependencies": {
 				"bytes": "3.1.2",
 				"http-errors": "2.0.0",
@@ -44844,7 +42270,6 @@
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
 			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.8"
 			}
@@ -44853,7 +42278,6 @@
 			"version": "0.4.24",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
 			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"dev": true,
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			},
@@ -44861,6 +42285,63 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/raw-loader": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
+			"integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^2.0.0",
+				"schema-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/raw-loader/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/raw-loader/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
 		"node_modules/rc": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -44900,9 +42381,9 @@
 			}
 		},
 		"node_modules/react": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-			"integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+			"integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
 			"dependencies": {
 				"loose-envify": "^1.1.0"
 			},
@@ -44934,36 +42415,33 @@
 			}
 		},
 		"node_modules/react-devtools-core": {
-			"version": "4.28.0",
-			"resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.0.tgz",
-			"integrity": "sha512-E3C3X1skWBdBzwpOUbmXG8SgH6BtsluSMe+s6rRcujNKG1DGi8uIfhdhszkgDpAsMoE55hwqRUzeXCmETDBpTg==",
+			"version": "4.28.5",
+			"resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.5.tgz",
+			"integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==",
 			"dependencies": {
 				"shell-quote": "^1.6.1",
 				"ws": "^7"
 			}
 		},
 		"node_modules/react-docgen": {
-			"version": "5.4.3",
-			"resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.4.3.tgz",
-			"integrity": "sha512-xlLJyOlnfr8lLEEeaDZ+X2J/KJoe6Nr9AzxnkdQWush5hz2ZSu66w6iLMOScMmxoSHWpWMn+k3v5ZiyCfcWsOA==",
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-7.0.3.tgz",
+			"integrity": "sha512-i8aF1nyKInZnANZ4uZrH49qn1paRgBZ7wZiCNBMnenlPzEv0mRl+ShpTVEI6wZNl8sSc79xZkivtgLKQArcanQ==",
 			"dev": true,
 			"dependencies": {
-				"@babel/core": "^7.7.5",
-				"@babel/generator": "^7.12.11",
-				"@babel/runtime": "^7.7.6",
-				"ast-types": "^0.14.2",
-				"commander": "^2.19.0",
+				"@babel/core": "^7.18.9",
+				"@babel/traverse": "^7.18.9",
+				"@babel/types": "^7.18.9",
+				"@types/babel__core": "^7.18.0",
+				"@types/babel__traverse": "^7.18.0",
+				"@types/doctrine": "^0.0.9",
+				"@types/resolve": "^1.20.2",
 				"doctrine": "^3.0.0",
-				"estree-to-babel": "^3.1.0",
-				"neo-async": "^2.6.1",
-				"node-dir": "^0.1.10",
-				"strip-indent": "^3.0.0"
-			},
-			"bin": {
-				"react-docgen": "bin/react-docgen.js"
+				"resolve": "^1.22.1",
+				"strip-indent": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=8.10.0"
+				"node": ">=16.14.0"
 			}
 		},
 		"node_modules/react-docgen-typescript": {
@@ -44971,14 +42449,15 @@
 			"resolved": "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz",
 			"integrity": "sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==",
 			"dev": true,
+			"license": "MIT",
 			"peerDependencies": {
 				"typescript": ">= 4.3.x"
 			}
 		},
-		"node_modules/react-docgen/node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+		"node_modules/react-docgen/node_modules/@types/doctrine": {
+			"version": "0.0.9",
+			"resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.9.tgz",
+			"integrity": "sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==",
 			"dev": true
 		},
 		"node_modules/react-docgen/node_modules/doctrine": {
@@ -44993,36 +42472,33 @@
 				"node": ">=6.0.0"
 			}
 		},
-		"node_modules/react-dom": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-			"integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+		"node_modules/react-docgen/node_modules/strip-indent": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",
+			"integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==",
+			"dev": true,
 			"dependencies": {
-				"loose-envify": "^1.1.0",
-				"scheduler": "^0.23.0"
+				"min-indent": "^1.0.1"
 			},
-			"peerDependencies": {
-				"react": "^18.2.0"
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/react-easy-crop": {
-			"version": "4.5.1",
-			"resolved": "https://registry.npmjs.org/react-easy-crop/-/react-easy-crop-4.5.1.tgz",
-			"integrity": "sha512-MVzCWmKXTwZTK0iYqlF/gPLdLqvUGrLGX7SQ4g+DO3b/lCiVAwxZKLeZ1wjDfG+r/yEWUoL7At5a0kkDJeU+rQ==",
+		"node_modules/react-dom": {
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+			"integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
 			"dependencies": {
-				"normalize-wheel": "^1.0.1",
-				"tslib": "2.0.1"
+				"loose-envify": "^1.1.0",
+				"scheduler": "^0.23.2"
 			},
 			"peerDependencies": {
-				"react": ">=16.4.0",
-				"react-dom": ">=16.4.0"
+				"react": "^18.3.1"
 			}
 		},
-		"node_modules/react-easy-crop/node_modules/tslib": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-			"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
-		},
 		"node_modules/react-element-to-jsx-string": {
 			"version": "15.0.0",
 			"resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-15.0.0.tgz",
@@ -45055,65 +42531,60 @@
 				"react": ">=17.0.0"
 			}
 		},
-		"node_modules/react-inspector": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-6.0.2.tgz",
-			"integrity": "sha512-x+b7LxhmHXjHoU/VrFAzw5iutsILRoYyDq97EDYdFpPLcvqtEzk4ZSZSQjnFPbr5T57tLXnHcqFYoN1pI6u8uQ==",
-			"dev": true,
-			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0 || ^18.0.0"
-			}
-		},
 		"node_modules/react-is": {
 			"version": "16.13.1",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
 			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
 		},
 		"node_modules/react-native": {
-			"version": "0.71.11",
-			"resolved": "https://registry.npmjs.org/react-native/-/react-native-0.71.11.tgz",
-			"integrity": "sha512-++8IxgUe4Ev+bTiFlLfJCdSoE5cReVP1DTpVJ8f/QtzaxA3h1008Y3Xah1Q5vsR4rZcYMO7Pn3af+wOshdQFug==",
-			"dependencies": {
-				"@jest/create-cache-key-function": "^29.2.1",
-				"@react-native-community/cli": "10.2.4",
-				"@react-native-community/cli-platform-android": "10.2.0",
-				"@react-native-community/cli-platform-ios": "10.2.4",
-				"@react-native/assets": "1.0.0",
-				"@react-native/normalize-color": "2.1.0",
-				"@react-native/polyfills": "2.0.0",
+			"version": "0.73.3",
+			"resolved": "https://registry.npmjs.org/react-native/-/react-native-0.73.3.tgz",
+			"integrity": "sha512-RSQDtT2DNUcmB4IgmW9NhRb5wqvXFl6DI2NEJmt0ps2OrVHpoA8Tkq+lkFOA/fvPscJKtFKEHFBDSR5UHR3PUw==",
+			"dependencies": {
+				"@jest/create-cache-key-function": "^29.6.3",
+				"@react-native-community/cli": "12.3.2",
+				"@react-native-community/cli-platform-android": "12.3.2",
+				"@react-native-community/cli-platform-ios": "12.3.2",
+				"@react-native/assets-registry": "0.73.1",
+				"@react-native/codegen": "0.73.2",
+				"@react-native/community-cli-plugin": "0.73.14",
+				"@react-native/gradle-plugin": "0.73.4",
+				"@react-native/js-polyfills": "0.73.1",
+				"@react-native/normalize-colors": "0.73.2",
+				"@react-native/virtualized-lists": "0.73.4",
 				"abort-controller": "^3.0.0",
 				"anser": "^1.4.9",
-				"base64-js": "^1.1.2",
-				"deprecated-react-native-prop-types": "^3.0.1",
+				"ansi-regex": "^5.0.0",
+				"base64-js": "^1.5.1",
+				"chalk": "^4.0.0",
+				"deprecated-react-native-prop-types": "^5.0.0",
 				"event-target-shim": "^5.0.1",
+				"flow-enums-runtime": "^0.0.6",
 				"invariant": "^2.2.4",
-				"jest-environment-node": "^29.2.1",
+				"jest-environment-node": "^29.6.3",
 				"jsc-android": "^250231.0.0",
 				"memoize-one": "^5.0.0",
-				"metro-react-native-babel-transformer": "0.73.10",
-				"metro-runtime": "0.73.10",
-				"metro-source-map": "0.73.10",
+				"metro-runtime": "^0.80.3",
+				"metro-source-map": "^0.80.3",
 				"mkdirp": "^0.5.1",
 				"nullthrows": "^1.1.1",
 				"pretty-format": "^26.5.2",
 				"promise": "^8.3.0",
-				"react-devtools-core": "^4.26.1",
-				"react-native-codegen": "^0.71.5",
-				"react-native-gradle-plugin": "^0.71.19",
-				"react-refresh": "^0.4.0",
+				"react-devtools-core": "^4.27.7",
+				"react-refresh": "^0.14.0",
 				"react-shallow-renderer": "^16.15.0",
 				"regenerator-runtime": "^0.13.2",
-				"scheduler": "^0.23.0",
-				"stacktrace-parser": "^0.1.3",
-				"use-sync-external-store": "^1.0.0",
+				"scheduler": "0.24.0-canary-efb381bbf-20230505",
+				"stacktrace-parser": "^0.1.10",
 				"whatwg-fetch": "^3.0.0",
-				"ws": "^6.2.2"
+				"ws": "^6.2.2",
+				"yargs": "^17.6.2"
 			},
 			"bin": {
 				"react-native": "cli.js"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			},
 			"peerDependencies": {
 				"react": "18.2.0"
@@ -45127,17 +42598,6 @@
 				"prop-types": "^15.7.2"
 			}
 		},
-		"node_modules/react-native-codegen": {
-			"version": "0.71.5",
-			"resolved": "https://registry.npmjs.org/react-native-codegen/-/react-native-codegen-0.71.5.tgz",
-			"integrity": "sha512-rfsuc0zkuUuMjFnrT55I1mDZ+pBRp2zAiRwxck3m6qeGJBGK5OV5JH66eDQ4aa+3m0of316CqrJDRzVlYufzIg==",
-			"dependencies": {
-				"@babel/parser": "^7.14.0",
-				"flow-parser": "^0.185.0",
-				"jscodeshift": "^0.13.1",
-				"nullthrows": "^1.1.1"
-			}
-		},
 		"node_modules/react-native-fast-image": {
 			"version": "8.5.11",
 			"resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-8.5.11.tgz",
@@ -45148,9 +42608,9 @@
 			}
 		},
 		"node_modules/react-native-gesture-handler": {
-			"version": "2.10.2",
-			"resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.10.2.tgz",
-			"integrity": "sha512-yUwTrgLinaGRdJN3igL5/QP+09B294EKgoCH7QJ4ABKb4W2mUvSDbbuGMaYBNnwMKAD87Ns2q/qibLWy3E3LTw==",
+			"version": "2.14.1",
+			"resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.14.1.tgz",
+			"integrity": "sha512-YiM1BApV4aKeuwsM6O4C2ufwewYEKk6VMXOt0YqEZFMwABBFWhXLySFZYjBSNRU2USGppJbfHP1q1DfFQpKhdA==",
 			"dependencies": {
 				"@egjs/hammerjs": "^2.0.17",
 				"hoist-non-react-statics": "^3.3.0",
@@ -45174,11 +42634,6 @@
 				"react-native": ">=0.56"
 			}
 		},
-		"node_modules/react-native-gradle-plugin": {
-			"version": "0.71.19",
-			"resolved": "https://registry.npmjs.org/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.19.tgz",
-			"integrity": "sha512-1dVk9NwhoyKHCSxcrM6vY6cxmojeATsBobDicX0ZKr7DgUF2cBQRTKsimQFvzH8XhOVXyH8p4HyDSZNIFI8OlQ=="
-		},
 		"node_modules/react-native-linear-gradient": {
 			"version": "2.7.3",
 			"resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.7.3.tgz",
@@ -45202,23 +42657,31 @@
 			}
 		},
 		"node_modules/react-native-reanimated": {
-			"version": "2.17.0",
-			"resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.17.0.tgz",
-			"integrity": "sha512-bVy+FUEaHXq4i+aPPqzGeor1rG4scgVNBbBz21ohvC7iMpB9IIgvGsmy1FAoodZhZ5sa3EPF67Rcec76F1PXlQ==",
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.6.2.tgz",
+			"integrity": "sha512-IIMREMOrxhtK35drfpzh2UhxNqAOHnuvGgtMofj7yHcMj16tmWZR2zFvMUf6z2MfmXv+aVgFQ6TRZ6yKYf7LNA==",
 			"dependencies": {
 				"@babel/plugin-transform-object-assign": "^7.16.7",
 				"@babel/preset-typescript": "^7.16.7",
-				"invariant": "^2.2.4",
-				"lodash.isequal": "^4.5.0",
-				"setimmediate": "^1.0.5",
-				"string-hash-64": "^1.0.3"
+				"convert-source-map": "^2.0.0",
+				"invariant": "^2.2.4"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.0.0-0",
+				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0-0",
+				"@babel/plugin-proposal-optional-chaining": "^7.0.0-0",
+				"@babel/plugin-transform-arrow-functions": "^7.0.0-0",
+				"@babel/plugin-transform-shorthand-properties": "^7.0.0-0",
+				"@babel/plugin-transform-template-literals": "^7.0.0-0",
 				"react": "*",
 				"react-native": "*"
 			}
 		},
+		"node_modules/react-native-reanimated/node_modules/convert-source-map": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+		},
 		"node_modules/react-native-safe-area": {
 			"version": "0.5.1",
 			"resolved": "https://registry.npmjs.org/react-native-safe-area/-/react-native-safe-area-0.5.1.tgz",
@@ -45228,21 +42691,22 @@
 			}
 		},
 		"node_modules/react-native-safe-area-context": {
-			"version": "4.6.3",
-			"resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.6.3.tgz",
-			"integrity": "sha512-3CeZM9HFXkuqiU9HqhOQp1yxhXw6q99axPWrT+VJkITd67gnPSU03+U27Xk2/cr9XrLUnakM07kj7H0hdPnFiQ==",
+			"version": "4.8.2",
+			"resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.8.2.tgz",
+			"integrity": "sha512-ffUOv8BJQ6RqO3nLml5gxJ6ab3EestPiyWekxdzO/1MQ7NF8fW1Mzh1C5QE9yq573Xefnc7FuzGXjtesZGv7cQ==",
 			"peerDependencies": {
 				"react": "*",
 				"react-native": "*"
 			}
 		},
 		"node_modules/react-native-safe-area/node_modules/@types/react": {
-			"version": "16.14.44",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.44.tgz",
-			"integrity": "sha512-TvEx2X0MrSioYQpUSiWe122KeHNmOm5cZd4czKroIc7/cST4IaIgoCplQQ87xucEpOmRtNykq7vR6/4fo93Y+g==",
+			"version": "16.14.62",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.62.tgz",
+			"integrity": "sha512-BWf7hqninZav6nerxXj+NeZT/mTpDeG6Lk2zREHAy63CrnXoOGPGtNqTFYFN/sqpSaREDP5otVV88axIXmKfGA==",
+			"license": "MIT",
 			"dependencies": {
 				"@types/prop-types": "*",
-				"@types/scheduler": "*",
+				"@types/scheduler": "^0.16",
 				"csstype": "^3.0.2"
 			}
 		},
@@ -45269,9 +42733,9 @@
 			}
 		},
 		"node_modules/react-native-screens": {
-			"version": "3.22.0",
-			"resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.22.0.tgz",
-			"integrity": "sha512-csLypBSXIt/egh37YJmokETptZJCtZdoZBsZNLR9n31GesDyVogprT+MM22dEPDuxPxt/mFWq+lSpVwk7khuTw==",
+			"version": "3.29.0",
+			"resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.29.0.tgz",
+			"integrity": "sha512-yB1GoAMamFAcYf4ku94uBPn0/ani9QG7NdI98beJ5cet2YFESYYzuEIuU+kt+CNRcO8qqKeugxlfgAa3HyTqlg==",
 			"dependencies": {
 				"react-freeze": "^1.0.0",
 				"warn-once": "^0.1.0"
@@ -45282,9 +42746,9 @@
 			}
 		},
 		"node_modules/react-native-svg": {
-			"version": "13.9.0",
-			"resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.9.0.tgz",
-			"integrity": "sha512-Ey18POH0dA0ob/QiwCBVrxIiwflhYuw0P0hBlOHeY4J5cdbs8ngdKHeWC/Kt9+ryP6fNoEQ1PUgPYw2Bs/rp5Q==",
+			"version": "14.0.0",
+			"resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-14.0.0.tgz",
+			"integrity": "sha512-17W/gWXRUMS7p7PSHu/WyGkZUc1NzRTGxxXc0VqBLjzKSchyb0EmgsiWf9aKmfC6gmY0wcsmKZcGV41bCcNfBA==",
 			"dependencies": {
 				"css-select": "^5.1.0",
 				"css-tree": "^1.1.3"
@@ -45332,18 +42796,18 @@
 			}
 		},
 		"node_modules/react-native-video": {
-			"version": "5.2.0-wp-6",
-			"resolved": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz",
-			"integrity": "sha512-3MZ9UsoagCWc5qiQzd2tG5qQbLT+PF8BXjoahEIptQ5mNPX9P4OkJOE3cyoGEDhby6ZYwWvUQNnwhhObhlP0DQ==",
+			"version": "5.2.0-wp-7",
+			"resolved": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-7/react-native-video-5.2.0-wp-7.tgz",
+			"integrity": "sha512-DTwhGwqkc3IyDWsyJe8d+cEwaw7aHBgT7Q9+X+N3zDIC7qP3bZnXuTUeag8oz9XhfxRDRQJmF+t5is3qVNIuUA==",
 			"dependencies": {
 				"deprecated-react-native-prop-types": "^2.2.0",
 				"prop-types": "^15.7.2"
 			}
 		},
 		"node_modules/react-native-webview": {
-			"version": "11.26.1",
-			"resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.26.1.tgz",
-			"integrity": "sha512-hC7BkxOpf+z0UKhxFSFTPAM4shQzYmZHoELa6/8a/MspcjEP7ukYKpuSUTLDywQditT8yI9idfcKvfZDKQExGw==",
+			"version": "13.6.1",
+			"resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-13.6.1.tgz",
+			"integrity": "sha512-m8leQJhouBIER0YFc1nKF7XKYtaF040tvSJJ5VAoD/P0lW7nAXZO4D1jaOEq3HQvEq3SsMl7qh7DW/XO5VhUlg==",
 			"dependencies": {
 				"escape-string-regexp": "2.0.0",
 				"invariant": "2.2.4"
@@ -45376,155 +42840,49 @@
 				"node": ">= 10.14.2"
 			}
 		},
-		"node_modules/react-native/node_modules/@react-native-community/cli": {
-			"version": "10.2.4",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-10.2.4.tgz",
-			"integrity": "sha512-E9BUDHfLEsnjkjeJqECuCjl4E/1Ox9Nl6hkQBhEqjZm4AaQxgU7M6AyFfOgaXn5v3am16/R4ZOUTrJnGJWS3GA==",
-			"dependencies": {
-				"@react-native-community/cli-clean": "^10.1.1",
-				"@react-native-community/cli-config": "^10.1.1",
-				"@react-native-community/cli-debugger-ui": "^10.0.0",
-				"@react-native-community/cli-doctor": "^10.2.4",
-				"@react-native-community/cli-hermes": "^10.2.0",
-				"@react-native-community/cli-plugin-metro": "^10.2.3",
-				"@react-native-community/cli-server-api": "^10.1.1",
-				"@react-native-community/cli-tools": "^10.1.1",
-				"@react-native-community/cli-types": "^10.0.0",
-				"chalk": "^4.1.2",
-				"commander": "^9.4.1",
-				"execa": "^1.0.0",
-				"find-up": "^4.1.0",
-				"fs-extra": "^8.1.0",
-				"graceful-fs": "^4.1.3",
-				"prompts": "^2.4.0",
-				"semver": "^6.3.0"
-			},
-			"bin": {
-				"react-native": "build/bin.js"
-			},
-			"engines": {
-				"node": ">=14"
-			}
-		},
 		"node_modules/react-native/node_modules/@types/yargs": {
-			"version": "15.0.15",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz",
-			"integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==",
+			"version": "15.0.19",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
+			"integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
 			"dependencies": {
 				"@types/yargs-parser": "*"
 			}
 		},
-		"node_modules/react-native/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/react-native/node_modules/commander": {
-			"version": "9.5.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-			"integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
-			"engines": {
-				"node": "^12.20.0 || >=14"
-			}
-		},
-		"node_modules/react-native/node_modules/cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+		"node_modules/react-native/node_modules/cliui": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
 			"dependencies": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.1",
+				"wrap-ansi": "^7.0.0"
 			},
 			"engines": {
-				"node": ">=4.8"
-			}
-		},
-		"node_modules/react-native/node_modules/cross-spawn/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"bin": {
-				"semver": "bin/semver"
+				"node": ">=12"
 			}
 		},
 		"node_modules/react-native/node_modules/deprecated-react-native-prop-types": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/deprecated-react-native-prop-types/-/deprecated-react-native-prop-types-3.0.1.tgz",
-			"integrity": "sha512-J0jCJcsk4hMlIb7xwOZKLfMpuJn6l8UtrPEzzQV5ewz5gvKNYakhBuq9h2rWX7YwHHJZFhU5W8ye7dB9oN8VcQ==",
-			"dependencies": {
-				"@react-native/normalize-color": "*",
-				"invariant": "*",
-				"prop-types": "*"
-			}
-		},
-		"node_modules/react-native/node_modules/execa": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-			"dependencies": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.0.0",
-				"is-stream": "^1.1.0",
-				"npm-run-path": "^2.0.0",
-				"p-finally": "^1.0.0",
-				"signal-exit": "^3.0.0",
-				"strip-eof": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/react-native/node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/react-native/node_modules/get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/deprecated-react-native-prop-types/-/deprecated-react-native-prop-types-5.0.0.tgz",
+			"integrity": "sha512-cIK8KYiiGVOFsKdPMmm1L3tA/Gl+JopXL6F5+C7x39MyPsQYnP57Im/D6bNUzcborD7fcMwiwZqcBdBXXZucYQ==",
 			"dependencies": {
-				"pump": "^3.0.0"
+				"@react-native/normalize-colors": "^0.73.0",
+				"invariant": "^2.2.4",
+				"prop-types": "^15.8.1"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": ">=18"
 			}
 		},
-		"node_modules/react-native/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"engines": {
-				"node": ">=8"
-			}
+		"node_modules/react-native/node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
-		"node_modules/react-native/node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
+		"node_modules/react-native/node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"engines": {
 				"node": ">=8"
 			}
@@ -45540,47 +42898,6 @@
 				"mkdirp": "bin/cmd.js"
 			}
 		},
-		"node_modules/react-native/node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/react-native/node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/react-native/node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/react-native/node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/react-native/node_modules/pretty-format": {
 			"version": "26.6.2",
 			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -45595,68 +42912,103 @@
 				"node": ">= 10"
 			}
 		},
-		"node_modules/react-native/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-			"dependencies": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
-			}
-		},
 		"node_modules/react-native/node_modules/react-is": {
 			"version": "17.0.2",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
 			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
 		},
-		"node_modules/react-native/node_modules/react-refresh": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
-			"integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==",
-			"engines": {
-				"node": ">=0.10.0"
+		"node_modules/react-native/node_modules/scheduler": {
+			"version": "0.24.0-canary-efb381bbf-20230505",
+			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.24.0-canary-efb381bbf-20230505.tgz",
+			"integrity": "sha512-ABvovCDe/k9IluqSh4/ISoq8tIJnW8euVAWYt5j/bg6dRnqwQwiGO1F/V4AyK96NGF/FB04FhOUDuWj8IKfABA==",
+			"dependencies": {
+				"loose-envify": "^1.1.0"
 			}
 		},
-		"node_modules/react-native/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
+		"node_modules/react-native/node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"node_modules/react-native/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+		"node_modules/react-native/node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
 			"dependencies": {
-				"has-flag": "^4.0.0"
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
 		"node_modules/react-native/node_modules/ws": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-			"integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+			"version": "6.2.3",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz",
+			"integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==",
+			"license": "MIT",
 			"dependencies": {
 				"async-limiter": "~1.0.0"
 			}
 		},
+		"node_modules/react-native/node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/react-native/node_modules/yargs": {
+			"version": "17.7.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+			"dependencies": {
+				"cliui": "^8.0.1",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.3",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^21.1.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/react-native/node_modules/yargs-parser": {
+			"version": "21.1.1",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/react-refresh": {
 			"version": "0.14.0",
 			"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
 			"integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/react-remove-scroll": {
-			"version": "2.5.4",
-			"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.4.tgz",
-			"integrity": "sha512-xGVKJJr0SJGQVirVFAUZ2k1QLyO6m+2fy0l8Qawbp5Jgrv3DeLalrfMNBFSlmz5kriGGzsVBtGVnf4pTKIhhWA==",
+			"version": "2.5.5",
+			"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
+			"integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
+			"license": "MIT",
 			"dependencies": {
 				"react-remove-scroll-bar": "^2.3.3",
 				"react-style-singleton": "^2.2.1",
@@ -45698,19 +43050,6 @@
 				}
 			}
 		},
-		"node_modules/react-resize-detector": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-7.1.2.tgz",
-			"integrity": "sha512-zXnPJ2m8+6oq9Nn8zsep/orts9vQv3elrpA+R8XTcW7DVVUJ9vwDwMXaBtykAYjMnkCIaOoK9vObyR7ZgFNlOw==",
-			"dev": true,
-			"dependencies": {
-				"lodash": "^4.17.21"
-			},
-			"peerDependencies": {
-				"react": "^16.0.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
 		"node_modules/react-shallow-renderer": {
 			"version": "16.15.0",
 			"resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz",
@@ -45746,23 +43085,23 @@
 			}
 		},
 		"node_modules/react-test-renderer": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.2.0.tgz",
-			"integrity": "sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==",
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.3.1.tgz",
+			"integrity": "sha512-KkAgygexHUkQqtvvx/otwxtuFu5cVjfzTCtjXLH9boS19/Nbtg84zS7wIQn39G8IlrhThBpQsMKkq5ZHZIYFXA==",
 			"dev": true,
 			"dependencies": {
-				"react-is": "^18.2.0",
+				"react-is": "^18.3.1",
 				"react-shallow-renderer": "^16.15.0",
-				"scheduler": "^0.23.0"
+				"scheduler": "^0.23.2"
 			},
 			"peerDependencies": {
-				"react": "^18.2.0"
+				"react": "^18.3.1"
 			}
 		},
 		"node_modules/react-test-renderer/node_modules/react-is": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-			"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
 			"dev": true
 		},
 		"node_modules/read": {
@@ -45777,6 +43116,14 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
+		"node_modules/read-cache": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+			"integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+			"dependencies": {
+				"pify": "^2.3.0"
+			}
+		},
 		"node_modules/read-cmd-shim": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz",
@@ -45815,9 +43162,9 @@
 			}
 		},
 		"node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
-			"integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+			"integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
 			"dev": true,
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -45841,53 +43188,22 @@
 				"balanced-match": "^1.0.0"
 			}
 		},
-		"node_modules/read-package-json/node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/read-package-json/node_modules/foreground-child": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-			"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-			"dev": true,
-			"dependencies": {
-				"cross-spawn": "^7.0.0",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/read-package-json/node_modules/glob": {
-			"version": "10.3.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-			"integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"foreground-child": "^3.1.0",
-				"jackspeak": "^2.0.3",
-				"minimatch": "^9.0.1",
-				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-				"path-scurry": "^1.10.1"
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
 			},
 			"bin": {
-				"glob": "dist/cjs/src/bin.js"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
+				"glob": "dist/esm/bin.mjs"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
@@ -45905,10 +43221,26 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
+		"node_modules/read-package-json/node_modules/jackspeak": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+			"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"@isaacs/cliui": "^8.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			},
+			"optionalDependencies": {
+				"@pkgjs/parseargs": "^0.11.0"
+			}
+		},
 		"node_modules/read-package-json/node_modules/json-parse-even-better-errors": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
-			"integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+			"integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
 			"dev": true,
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -45924,10 +43256,11 @@
 			}
 		},
 		"node_modules/read-package-json/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -45939,10 +43272,11 @@
 			}
 		},
 		"node_modules/read-package-json/node_modules/minipass": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.2.tgz",
-			"integrity": "sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": ">=16 || 14 >=14.17"
 			}
@@ -45971,68 +43305,10 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
-		"node_modules/read-package-json/node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-package-json/node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-package-json/node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/read-package-json/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/read-package-json/node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
 		"node_modules/read-pkg": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
 			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-			"dev": true,
 			"dependencies": {
 				"@types/normalize-package-data": "^2.4.0",
 				"normalize-package-data": "^2.5.0",
@@ -46047,7 +43323,6 @@
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
 			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-			"dev": true,
 			"dependencies": {
 				"find-up": "^4.1.0",
 				"read-pkg": "^5.2.0",
@@ -46064,7 +43339,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
 			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
 			"dependencies": {
 				"locate-path": "^5.0.0",
 				"path-exists": "^4.0.0"
@@ -46077,7 +43351,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
 			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
 			"dependencies": {
 				"p-locate": "^4.1.0"
 			},
@@ -46089,7 +43362,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
 			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
 			"dependencies": {
 				"p-try": "^2.0.0"
 			},
@@ -46104,7 +43376,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
 			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
 			"dependencies": {
 				"p-limit": "^2.2.0"
 			},
@@ -46116,7 +43387,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
 			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -46125,7 +43395,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
 			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -46134,7 +43403,6 @@
 			"version": "0.8.1",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
 			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -46196,7 +43464,6 @@
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
 			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-			"dev": true,
 			"dependencies": {
 				"picomatch": "^2.2.1"
 			},
@@ -46209,58 +43476,6 @@
 			"resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz",
 			"integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="
 		},
-		"node_modules/reakit": {
-			"version": "1.3.11",
-			"resolved": "https://registry.npmjs.org/reakit/-/reakit-1.3.11.tgz",
-			"integrity": "sha512-mYxw2z0fsJNOQKAEn5FJCPTU3rcrY33YZ/HzoWqZX0G7FwySp1wkCYW79WhuYMNIUFQ8s3Baob1RtsEywmZSig==",
-			"dependencies": {
-				"@popperjs/core": "^2.5.4",
-				"body-scroll-lock": "^3.1.5",
-				"reakit-system": "^0.15.2",
-				"reakit-utils": "^0.15.2",
-				"reakit-warning": "^0.6.2"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/ariakit"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0"
-			}
-		},
-		"node_modules/reakit-system": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/reakit-system/-/reakit-system-0.15.2.tgz",
-			"integrity": "sha512-TvRthEz0DmD0rcJkGamMYx+bATwnGNWJpe/lc8UV2Js8nnPvkaxrHk5fX9cVASFrWbaIyegZHCWUBfxr30bmmA==",
-			"dependencies": {
-				"reakit-utils": "^0.15.2"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0"
-			}
-		},
-		"node_modules/reakit-utils": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/reakit-utils/-/reakit-utils-0.15.2.tgz",
-			"integrity": "sha512-i/RYkq+W6hvfFmXw5QW7zvfJJT/K8a4qZ0hjA79T61JAFPGt23DsfxwyBbyK91GZrJ9HMrXFVXWMovsKBc1qEQ==",
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0",
-				"react-dom": "^16.8.0 || ^17.0.0"
-			}
-		},
-		"node_modules/reakit-warning": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/reakit-warning/-/reakit-warning-0.6.2.tgz",
-			"integrity": "sha512-z/3fvuc46DJyD3nJAUOto6inz2EbSQTjvI/KBQDqxwB0y02HDyeP8IWOJxvkuAUGkWpeSx+H3QWQFSNiPcHtmw==",
-			"dependencies": {
-				"reakit-utils": "^0.15.2"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0"
-			}
-		},
 		"node_modules/reassure": {
 			"version": "0.7.1",
 			"resolved": "https://registry.npmjs.org/reassure/-/reassure-0.7.1.tgz",
@@ -46273,11 +43488,11 @@
 			}
 		},
 		"node_modules/recast": {
-			"version": "0.20.5",
-			"resolved": "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz",
-			"integrity": "sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==",
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz",
+			"integrity": "sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==",
 			"dependencies": {
-				"ast-types": "0.14.2",
+				"ast-types": "0.15.2",
 				"esprima": "~4.0.0",
 				"source-map": "~0.6.1",
 				"tslib": "^2.0.1"
@@ -46286,11 +43501,21 @@
 				"node": ">= 4"
 			}
 		},
+		"node_modules/recast/node_modules/ast-types": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz",
+			"integrity": "sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==",
+			"dependencies": {
+				"tslib": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/rechoir": {
 			"version": "0.8.0",
 			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
 			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
-			"dev": true,
 			"dependencies": {
 				"resolve": "^1.20.0"
 			},
@@ -46302,7 +43527,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
 			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-			"dev": true,
 			"dependencies": {
 				"indent-string": "^4.0.0",
 				"strip-indent": "^3.0.0"
@@ -46315,7 +43539,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
 			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -46331,12 +43554,14 @@
 		"node_modules/regenerate": {
 			"version": "1.4.2",
 			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
+			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+			"license": "MIT"
 		},
 		"node_modules/regenerate-unicode-properties": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-			"integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+			"version": "10.2.0",
+			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+			"integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
+			"license": "MIT",
 			"dependencies": {
 				"regenerate": "^1.4.2"
 			},
@@ -46353,7 +43578,6 @@
 			"version": "0.15.2",
 			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
 			"integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-			"dev": true,
 			"dependencies": {
 				"@babel/runtime": "^7.8.4"
 			}
@@ -46362,6 +43586,7 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
 			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+			"dev": true,
 			"dependencies": {
 				"extend-shallow": "^3.0.2",
 				"safe-regex": "^1.1.0"
@@ -46374,7 +43599,6 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
 			"integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.2.0",
@@ -46391,7 +43615,6 @@
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
 			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -46400,14 +43623,15 @@
 			}
 		},
 		"node_modules/regexpu-core": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-			"integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
+			"integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/regjsgen": "^0.8.0",
 				"regenerate": "^1.4.2",
-				"regenerate-unicode-properties": "^10.1.0",
-				"regjsparser": "^0.9.1",
+				"regenerate-unicode-properties": "^10.2.0",
+				"regjsgen": "^0.8.0",
+				"regjsparser": "^0.11.0",
 				"unicode-match-property-ecmascript": "^2.0.0",
 				"unicode-match-property-value-ecmascript": "^2.1.0"
 			},
@@ -46415,25 +43639,24 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/regjsgen": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+			"integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+			"license": "MIT"
+		},
 		"node_modules/regjsparser": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz",
+			"integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==",
+			"license": "BSD-2-Clause",
 			"dependencies": {
-				"jsesc": "~0.5.0"
+				"jsesc": "~3.0.2"
 			},
 			"bin": {
 				"regjsparser": "bin/parser"
 			}
 		},
-		"node_modules/regjsparser/node_modules/jsesc": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-			"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-			"bin": {
-				"jsesc": "bin/jsesc"
-			}
-		},
 		"node_modules/relateurl": {
 			"version": "0.2.7",
 			"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
@@ -46447,7 +43670,6 @@
 			"version": "10.0.1",
 			"resolved": "https://registry.npmjs.org/remark/-/remark-10.0.1.tgz",
 			"integrity": "sha512-E6lMuoLIy2TyiokHprMjcWNJ5UxfGQjaMSMhV+f4idM625UjjK4j798+gPs5mfjzDE6vL0oFKVeZM6gZVSVrzQ==",
-			"dev": true,
 			"dependencies": {
 				"remark-parse": "^6.0.0",
 				"remark-stringify": "^6.0.0",
@@ -46514,7 +43736,6 @@
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-6.0.3.tgz",
 			"integrity": "sha512-QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg==",
-			"dev": true,
 			"dependencies": {
 				"collapse-white-space": "^1.0.2",
 				"is-alphabetical": "^1.0.0",
@@ -46591,7 +43812,6 @@
 			"version": "6.0.4",
 			"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-6.0.4.tgz",
 			"integrity": "sha512-eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg==",
-			"dev": true,
 			"dependencies": {
 				"ccount": "^1.0.0",
 				"is-alphanumeric": "^1.0.0",
@@ -46723,6 +43943,7 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
 			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -46739,7 +43960,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
 			"integrity": "sha512-vuNYXC7gG7IeVNBC1xUllqCcZKRbJoSPOBhnTEcAIiKCsbuef6zO3F0Rve3isPMMoNoQRWjQwbAgAjHUHniyEA==",
-			"dev": true,
 			"engines": {
 				"node": ">= 0.10"
 			}
@@ -46761,7 +43981,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
 			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -46775,7 +43994,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
 			"integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.5"
 			}
@@ -46783,8 +44001,7 @@
 		"node_modules/requires-port": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-			"dev": true
+			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
 		},
 		"node_modules/resize-observer-polyfill": {
 			"version": "1.5.1",
@@ -46793,9 +44010,9 @@
 			"dev": true
 		},
 		"node_modules/resolve": {
-			"version": "1.22.4",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
-			"integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
+			"version": "1.22.8",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
 			"dependencies": {
 				"is-core-module": "^2.13.0",
 				"path-parse": "^1.0.7",
@@ -46811,14 +44028,12 @@
 		"node_modules/resolve-alpn": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-			"integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-			"dev": true
+			"integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
 		},
 		"node_modules/resolve-bin": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/resolve-bin/-/resolve-bin-0.4.0.tgz",
 			"integrity": "sha1-RxMiSYkRAa+xmZH+k3ywpfBy5dk=",
-			"dev": true,
 			"dependencies": {
 				"find-parent-dir": "~0.3.0"
 			}
@@ -46827,7 +44042,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
 			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-			"dev": true,
 			"dependencies": {
 				"resolve-from": "^5.0.0"
 			},
@@ -46839,7 +44053,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
 			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -46848,7 +44061,6 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
 			"integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
-			"dev": true,
 			"dependencies": {
 				"expand-tilde": "^1.2.2",
 				"global-modules": "^0.2.3"
@@ -46861,7 +44073,6 @@
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
 			"integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
-			"dev": true,
 			"dependencies": {
 				"global-prefix": "^0.1.4",
 				"is-windows": "^0.2.0"
@@ -46874,7 +44085,6 @@
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
 			"integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
-			"dev": true,
 			"dependencies": {
 				"homedir-polyfill": "^1.0.0",
 				"ini": "^1.3.4",
@@ -46889,7 +44099,6 @@
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
 			"integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -46912,7 +44121,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
 			"integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -46921,7 +44129,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
 			"integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-			"dev": true,
 			"dependencies": {
 				"lowercase-keys": "^2.0.0"
 			},
@@ -46961,6 +44168,7 @@
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
 			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.12"
 			}
@@ -46978,7 +44186,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
 			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true,
 			"engines": {
 				"iojs": ">=1.0.0",
 				"node": ">=0.10.0"
@@ -47037,16 +44244,14 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/robots-parser/-/robots-parser-3.0.1.tgz",
 			"integrity": "sha512-s+pyvQeIKIZ0dx5iJiQk1tPLJAWln39+MI5jtM8wnyws+G5azk+dMnMX0qfbqNetKKNgcWWOdi0sfm+FbQbgdQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.0.0"
 			}
 		},
 		"node_modules/rrweb-cssom": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
-			"integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
-			"dev": true
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz",
+			"integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg=="
 		},
 		"node_modules/rtlcss": {
 			"version": "4.0.0",
@@ -47066,6 +44271,91 @@
 				"node": ">=12.0.0"
 			}
 		},
+		"node_modules/rtlcss-webpack-plugin": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/rtlcss-webpack-plugin/-/rtlcss-webpack-plugin-4.0.7.tgz",
+			"integrity": "sha512-ouSbJtgcLBBQIsMgarxsDnfgRqm/AS4BKls/mz/Xb6HSl+PdEzefTR+Wz5uWQx4odoX0g261Z7yb3QBz0MTm0g==",
+			"dependencies": {
+				"babel-runtime": "~6.25.0",
+				"rtlcss": "^3.5.0"
+			}
+		},
+		"node_modules/rtlcss-webpack-plugin/node_modules/find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dependencies": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/rtlcss-webpack-plugin/node_modules/locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dependencies": {
+				"p-locate": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/rtlcss-webpack-plugin/node_modules/p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/rtlcss-webpack-plugin/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/rtlcss-webpack-plugin/node_modules/rtlcss": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.5.0.tgz",
+			"integrity": "sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A==",
+			"dependencies": {
+				"find-up": "^5.0.0",
+				"picocolors": "^1.0.0",
+				"postcss": "^8.3.11",
+				"strip-json-comments": "^3.1.1"
+			},
+			"bin": {
+				"rtlcss": "bin/rtlcss.js"
+			}
+		},
+		"node_modules/rtlcss-webpack-plugin/node_modules/strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/rtlcss/node_modules/strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -47082,7 +44372,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz",
 			"integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==",
-			"dev": true,
 			"dependencies": {
 				"execa": "^5.0.0"
 			},
@@ -47097,7 +44386,6 @@
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
 			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -47111,7 +44399,6 @@
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
 			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"dev": true,
 			"dependencies": {
 				"cross-spawn": "^7.0.3",
 				"get-stream": "^6.0.0",
@@ -47134,7 +44421,6 @@
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
 			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -47146,7 +44432,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
 			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.17.0"
 			}
@@ -47155,7 +44440,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
 			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -47167,7 +44451,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -47176,7 +44459,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
 			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.0.0"
 			},
@@ -47188,7 +44470,6 @@
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
 			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
 			"dependencies": {
 				"mimic-fn": "^2.1.0"
 			},
@@ -47203,7 +44484,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -47212,7 +44492,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -47224,7 +44503,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -47233,7 +44511,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -47248,7 +44525,6 @@
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
 			"integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.12.0"
 			}
@@ -47257,7 +44533,6 @@
 			"version": "1.2.10",
 			"resolved": "https://registry.npmjs.org/run-con/-/run-con-1.2.10.tgz",
 			"integrity": "sha512-n7PZpYmMM26ZO21dd8y3Yw1TRtGABjRtgPSgFS/nhzfvbJMXFtJhJVyEgayMiP+w/23craJjsnfDvx4W4ue/HQ==",
-			"dev": true,
 			"dependencies": {
 				"deep-extend": "^0.6.0",
 				"ini": "~2.0.0",
@@ -47272,7 +44547,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
 			"integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -47281,7 +44555,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			},
@@ -47304,8 +44577,7 @@
 		"node_modules/run-parallel": {
 			"version": "1.1.9",
 			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-			"integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
-			"dev": true
+			"integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
 		},
 		"node_modules/run-queue": {
 			"version": "1.0.3",
@@ -47331,7 +44603,6 @@
 			"version": "6.6.7",
 			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
 			"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-			"dev": true,
 			"dependencies": {
 				"tslib": "^1.9.0"
 			},
@@ -47342,8 +44613,7 @@
 		"node_modules/rxjs/node_modules/tslib": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-			"dev": true
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
 		},
 		"node_modules/safaridriver": {
 			"version": "0.1.0",
@@ -47355,7 +44625,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
 			"integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"get-intrinsic": "^1.2.0",
@@ -47372,8 +44641,7 @@
 		"node_modules/safe-array-concat/node_modules/isarray": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-			"dev": true
+			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
 		},
 		"node_modules/safe-buffer": {
 			"version": "5.1.2",
@@ -47384,6 +44652,7 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
 			"integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+			"dev": true,
 			"dependencies": {
 				"ret": "~0.1.10"
 			}
@@ -47392,7 +44661,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
 			"integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"get-intrinsic": "^1.1.3",
@@ -47429,7 +44697,6 @@
 			"version": "1.35.2",
 			"resolved": "https://registry.npmjs.org/sass/-/sass-1.35.2.tgz",
 			"integrity": "sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==",
-			"dev": true,
 			"dependencies": {
 				"chokidar": ">=3.0.0 <4.0.0"
 			},
@@ -47444,7 +44711,6 @@
 			"version": "12.1.0",
 			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.1.0.tgz",
 			"integrity": "sha512-FVJZ9kxVRYNZTIe2xhw93n3xJNYZADr+q69/s98l9nTCrWASo+DR2Ot0s5xTKQDDEosUkatsGeHxcH4QBp5bSg==",
-			"dev": true,
 			"dependencies": {
 				"klona": "^2.0.4",
 				"neo-async": "^2.6.2"
@@ -47478,7 +44744,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
 			"integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
-			"dev": true,
 			"dependencies": {
 				"xmlchars": "^2.2.0"
 			},
@@ -47487,9 +44752,9 @@
 			}
 		},
 		"node_modules/scheduler": {
-			"version": "0.23.0",
-			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-			"integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+			"version": "0.23.2",
+			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+			"integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
 			"dependencies": {
 				"loose-envify": "^1.1.0"
 			}
@@ -47538,14 +44803,12 @@
 		"node_modules/select-hose": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-			"dev": true
+			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
 		},
 		"node_modules/selfsigned": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
 			"integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-			"dev": true,
 			"dependencies": {
 				"node-forge": "^1"
 			},
@@ -47557,7 +44820,6 @@
 			"version": "7.5.4",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
 			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-			"dev": true,
 			"dependencies": {
 				"lru-cache": "^6.0.0"
 			},
@@ -47578,7 +44840,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
 			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
 			"dependencies": {
 				"yallist": "^4.0.0"
 			},
@@ -47589,8 +44850,7 @@
 		"node_modules/semver/node_modules/yallist": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
 		},
 		"node_modules/send": {
 			"version": "0.18.0",
@@ -47730,7 +44990,6 @@
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
 			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-			"dev": true,
 			"dependencies": {
 				"accepts": "~1.3.4",
 				"batch": "0.6.1",
@@ -47748,7 +45007,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -47757,7 +45015,6 @@
 			"version": "1.6.3",
 			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
 			"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-			"dev": true,
 			"dependencies": {
 				"depd": "~1.1.2",
 				"inherits": "2.0.3",
@@ -47771,8 +45028,7 @@
 		"node_modules/serve-index/node_modules/setprototypeof": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-			"dev": true
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
 		},
 		"node_modules/serve-static": {
 			"version": "1.15.0",
@@ -47793,10 +45049,27 @@
 			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
 			"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
 		},
+		"node_modules/set-function-length": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+			"dependencies": {
+				"define-data-property": "^1.1.4",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/set-value": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
 			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+			"dev": true,
 			"dependencies": {
 				"extend-shallow": "^2.0.1",
 				"is-extendable": "^0.1.1",
@@ -47811,6 +45084,7 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dev": true,
 			"dependencies": {
 				"is-extendable": "^0.1.0"
 			},
@@ -47822,6 +45096,7 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
 			"dependencies": {
 				"isobject": "^3.0.1"
 			},
@@ -47832,7 +45107,8 @@
 		"node_modules/setimmediate": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+			"dev": true
 		},
 		"node_modules/setprototypeof": {
 			"version": "1.2.0",
@@ -47895,10 +45171,11 @@
 			"optional": true
 		},
 		"node_modules/sharp/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
 			"dev": true,
+			"license": "MIT",
 			"optional": true,
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
@@ -47906,21 +45183,24 @@
 			}
 		},
 		"node_modules/sharp/node_modules/tar-fs": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
-			"integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+			"integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
 			"dev": true,
 			"optional": true,
 			"dependencies": {
-				"mkdirp-classic": "^0.5.2",
 				"pump": "^3.0.0",
 				"tar-stream": "^3.1.5"
+			},
+			"optionalDependencies": {
+				"bare-fs": "^2.1.1",
+				"bare-path": "^2.1.0"
 			}
 		},
 		"node_modules/sharp/node_modules/tar-stream": {
-			"version": "3.1.6",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-			"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+			"integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
 			"dev": true,
 			"optional": true,
 			"dependencies": {
@@ -47969,10 +45249,11 @@
 			}
 		},
 		"node_modules/shiki/node_modules/jsonc-parser": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-			"integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-			"dev": true
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+			"integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/showdown": {
 			"version": "1.9.1",
@@ -48135,14 +45416,17 @@
 			}
 		},
 		"node_modules/side-channel": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-			"dev": true,
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+			"integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
 			"dependencies": {
-				"call-bind": "^1.0.0",
-				"get-intrinsic": "^1.0.2",
-				"object-inspect": "^1.9.0"
+				"call-bind": "^1.0.7",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.4",
+				"object-inspect": "^1.13.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -48219,18 +45503,17 @@
 			}
 		},
 		"node_modules/simple-git": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz",
-			"integrity": "sha512-fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA==",
-			"dev": true,
+			"version": "3.24.0",
+			"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.24.0.tgz",
+			"integrity": "sha512-QqAKee9Twv+3k8IFOFfPB2hnk6as6Y6ACUpwCtQvRYBAes23Wv3SZlHVobAzqcE8gfsisCvPw3HGW3HYM+VYYw==",
 			"dependencies": {
 				"@kwsites/file-exists": "^1.1.1",
 				"@kwsites/promise-deferred": "^1.1.1",
-				"debug": "^4.3.3"
+				"debug": "^4.3.4"
 			},
 			"funding": {
 				"type": "github",
-				"url": "https://github.com/sponsors/steveukx/"
+				"url": "https://github.com/steveukx/git-js?sponsor=1"
 			}
 		},
 		"node_modules/simple-html-tokenizer": {
@@ -48320,23 +45603,10 @@
 			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
 			"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
 		},
-		"node_modules/simple-update-notifier": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
-			"integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.5.3"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/sirv": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.3.tgz",
 			"integrity": "sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==",
-			"dev": true,
 			"dependencies": {
 				"@polka/url": "^1.0.0-next.20",
 				"mrmime": "^1.0.0",
@@ -48372,7 +45642,6 @@
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
 			"integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-			"dev": true,
 			"engines": {
 				"node": ">= 6.0.0",
 				"npm": ">= 3.0.0"
@@ -48391,6 +45660,7 @@
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
 			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+			"dev": true,
 			"dependencies": {
 				"base": "^0.11.1",
 				"debug": "^2.2.0",
@@ -48409,6 +45679,7 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
 			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+			"dev": true,
 			"dependencies": {
 				"define-property": "^1.0.0",
 				"isobject": "^3.0.0",
@@ -48422,6 +45693,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
 			"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+			"dev": true,
 			"dependencies": {
 				"is-descriptor": "^1.0.0"
 			},
@@ -48429,45 +45701,24 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-			"dependencies": {
-				"kind-of": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/snapdragon-node/node_modules/is-data-descriptor": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-			"dependencies": {
-				"kind-of": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/snapdragon-node/node_modules/is-descriptor": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+			"integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+			"dev": true,
 			"dependencies": {
-				"is-accessor-descriptor": "^1.0.0",
-				"is-data-descriptor": "^1.0.0",
-				"kind-of": "^6.0.2"
+				"is-accessor-descriptor": "^1.0.1",
+				"is-data-descriptor": "^1.0.1"
 			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/snapdragon-util": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
 			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+			"dev": true,
 			"dependencies": {
 				"kind-of": "^3.2.0"
 			},
@@ -48479,6 +45730,7 @@
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
 			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"dev": true,
 			"dependencies": {
 				"is-buffer": "^1.1.5"
 			},
@@ -48490,6 +45742,7 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -48498,6 +45751,7 @@
 			"version": "0.2.5",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dev": true,
 			"dependencies": {
 				"is-descriptor": "^0.1.0"
 			},
@@ -48509,6 +45763,7 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+			"dev": true,
 			"dependencies": {
 				"is-extendable": "^0.1.0"
 			},
@@ -48520,6 +45775,7 @@
 			"version": "0.5.7",
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
 			"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -48545,7 +45801,6 @@
 			"version": "0.3.24",
 			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
 			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-			"dev": true,
 			"dependencies": {
 				"faye-websocket": "^0.11.3",
 				"uuid": "^8.3.2",
@@ -48556,22 +45811,21 @@
 			"version": "8.3.2",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
 			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"dev": true,
 			"bin": {
 				"uuid": "dist/bin/uuid"
 			}
 		},
 		"node_modules/socks": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-			"integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-			"dev": true,
+			"version": "2.8.3",
+			"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+			"integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+			"license": "MIT",
 			"dependencies": {
-				"ip": "^2.0.0",
+				"ip-address": "^9.0.5",
 				"smart-buffer": "^4.2.0"
 			},
 			"engines": {
-				"node": ">= 10.13.0",
+				"node": ">= 10.0.0",
 				"npm": ">= 3.0.0"
 			}
 		},
@@ -48589,17 +45843,10 @@
 				"node": ">= 10"
 			}
 		},
-		"node_modules/socks/node_modules/ip": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-			"integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
-			"dev": true
-		},
 		"node_modules/sort-keys": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
 			"integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
-			"dev": true,
 			"dependencies": {
 				"is-plain-obj": "^1.0.0"
 			},
@@ -48611,15 +45858,14 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
 			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/source-list-map": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-			"integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+			"integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
 			"dev": true
 		},
 		"node_modules/source-map": {
@@ -48634,7 +45880,6 @@
 			"version": "0.6.2",
 			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
 			"integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -48643,7 +45888,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.0.tgz",
 			"integrity": "sha512-GKGWqWvYr04M7tn8dryIWvb0s8YM41z82iQv01yBtIylgxax0CwvSy6gc2Y02iuXwEfGWRlMicH0nvms9UZphw==",
-			"dev": true,
 			"dependencies": {
 				"abab": "^2.0.5",
 				"iconv-lite": "^0.6.2",
@@ -48708,7 +45952,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
 			"integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-			"dev": true,
 			"dependencies": {
 				"spdx-expression-parse": "^3.0.0",
 				"spdx-license-ids": "^3.0.0"
@@ -48717,14 +45960,12 @@
 		"node_modules/spdx-exceptions": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
-			"integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
-			"dev": true
+			"integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="
 		},
 		"node_modules/spdx-expression-parse": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
 			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-			"dev": true,
 			"dependencies": {
 				"spdx-exceptions": "^2.1.0",
 				"spdx-license-ids": "^3.0.0"
@@ -48733,14 +45974,12 @@
 		"node_modules/spdx-license-ids": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
-			"integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
-			"dev": true
+			"integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="
 		},
 		"node_modules/spdy": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
 			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-			"dev": true,
 			"dependencies": {
 				"debug": "^4.1.0",
 				"handle-thing": "^2.0.0",
@@ -48756,7 +45995,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
 			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-			"dev": true,
 			"dependencies": {
 				"debug": "^4.1.0",
 				"detect-node": "^2.0.4",
@@ -48770,7 +46008,6 @@
 			"version": "3.6.2",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
 			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-			"dev": true,
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"string_decoder": "^1.1.1",
@@ -48793,7 +46030,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/speedline-core/-/speedline-core-1.4.3.tgz",
 			"integrity": "sha512-DI7/OuAUD+GMpR6dmu8lliO2Wg5zfeh+/xsdyJZCzd8o5JgFUjCeLsBDuZjIQJdwXS3J0L/uZYrELKYqx+PXog==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"image-ssim": "^0.2.0",
@@ -48827,6 +46063,7 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
 			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+			"dev": true,
 			"dependencies": {
 				"extend-shallow": "^3.0.0"
 			},
@@ -48926,13 +46163,13 @@
 		"node_modules/state-toggle": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz",
-			"integrity": "sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==",
-			"dev": true
+			"integrity": "sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og=="
 		},
 		"node_modules/static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
 			"integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+			"dev": true,
 			"dependencies": {
 				"define-property": "^0.2.5",
 				"object-copy": "^0.1.0"
@@ -48945,6 +46182,7 @@
 			"version": "0.2.5",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
 			"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+			"dev": true,
 			"dependencies": {
 				"is-descriptor": "^0.1.0"
 			},
@@ -48979,12 +46217,12 @@
 			"dev": true
 		},
 		"node_modules/storybook": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/storybook/-/storybook-7.2.2.tgz",
-			"integrity": "sha512-JT4CtVagLi7B5CKFUX/ozRpW3X7z4ffdXaXr4g6uBQjPN8NmvQCCftVIntpiXPKIbQa+cqyOTCNiprGvFnQQfg==",
+			"version": "7.6.15",
+			"resolved": "https://registry.npmjs.org/storybook/-/storybook-7.6.15.tgz",
+			"integrity": "sha512-Ybezq9JRk5CBhzjgzZ/oT7mnU45UwhyVSGKW+PUKZGGUG9VH2hCrTEES9f/zEF82kj/5COVPyqR/5vlXuuS39A==",
 			"dev": true,
 			"dependencies": {
-				"@storybook/cli": "7.2.2"
+				"@storybook/cli": "7.6.15"
 			},
 			"bin": {
 				"sb": "index.js",
@@ -49048,9 +46286,9 @@
 			}
 		},
 		"node_modules/stream-each": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
-			"integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+			"integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
 			"dev": true,
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
@@ -49080,7 +46318,6 @@
 			"version": "2.15.1",
 			"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz",
 			"integrity": "sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==",
-			"dev": true,
 			"dependencies": {
 				"fast-fifo": "^1.1.0",
 				"queue-tick": "^1.0.1"
@@ -49102,16 +46339,19 @@
 				"safe-buffer": "~5.1.0"
 			}
 		},
-		"node_modules/string-hash-64": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz",
-			"integrity": "sha512-D5OKWKvDhyVWWn2x5Y9b+37NUllks34q1dCDhk/vYcso9fmhs+Tl3KR/gE4v5UNj2UA35cnX4KdVVGkG1deKqw=="
+		"node_modules/string-argv": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+			"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.6.19"
+			}
 		},
 		"node_modules/string-length": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
 			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-			"dev": true,
 			"dependencies": {
 				"char-regex": "^1.0.2",
 				"strip-ansi": "^6.0.0"
@@ -49188,7 +46428,6 @@
 			"version": "4.0.8",
 			"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
 			"integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -49224,7 +46463,6 @@
 			"version": "1.2.7",
 			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
 			"integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -49241,7 +46479,6 @@
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
 			"integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -49255,7 +46492,6 @@
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
 			"integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
@@ -49269,7 +46505,6 @@
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz",
 			"integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==",
-			"dev": true,
 			"dependencies": {
 				"character-entities-html4": "^1.0.0",
 				"character-entities-legacy": "^1.0.0",
@@ -49319,7 +46554,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
 			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -49328,6 +46562,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
 			"integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -49336,7 +46571,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
 			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -49345,7 +46579,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
 			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-			"dev": true,
 			"dependencies": {
 				"min-indent": "^1.0.0"
 			},
@@ -49369,7 +46602,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
 			"integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
-			"dev": true,
 			"dependencies": {
 				"escape-string-regexp": "^1.0.2"
 			},
@@ -49418,14 +46650,12 @@
 		"node_modules/style-search": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-			"integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
-			"dev": true
+			"integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg=="
 		},
 		"node_modules/stylehacks": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.0.tgz",
 			"integrity": "sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==",
-			"dev": true,
 			"dependencies": {
 				"browserslist": "^4.21.4",
 				"postcss-selector-parser": "^6.0.4"
@@ -49438,140 +46668,140 @@
 			}
 		},
 		"node_modules/stylelint": {
-			"version": "14.2.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz",
-			"integrity": "sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==",
-			"dev": true,
+			"version": "16.8.2",
+			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.8.2.tgz",
+			"integrity": "sha512-fInKATippQhcSm7AB+T32GpI+626yohrg33GkFT/5jzliUw5qhlwZq2UQQwgl3HsHrf09oeARi0ZwgY/UWEv9A==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/stylelint"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/stylelint"
+				}
+			],
 			"dependencies": {
+				"@csstools/css-parser-algorithms": "^3.0.0",
+				"@csstools/css-tokenizer": "^3.0.0",
+				"@csstools/media-query-list-parser": "^3.0.0",
+				"@csstools/selector-specificity": "^4.0.0",
+				"@dual-bundle/import-meta-resolve": "^4.1.0",
 				"balanced-match": "^2.0.0",
-				"colord": "^2.9.2",
-				"cosmiconfig": "^7.0.1",
-				"debug": "^4.3.3",
-				"execall": "^2.0.0",
-				"fast-glob": "^3.2.7",
-				"fastest-levenshtein": "^1.0.12",
-				"file-entry-cache": "^6.0.1",
-				"get-stdin": "^8.0.0",
+				"colord": "^2.9.3",
+				"cosmiconfig": "^9.0.0",
+				"css-functions-list": "^3.2.2",
+				"css-tree": "^2.3.1",
+				"debug": "^4.3.6",
+				"fast-glob": "^3.3.2",
+				"fastest-levenshtein": "^1.0.16",
+				"file-entry-cache": "^9.0.0",
 				"global-modules": "^2.0.0",
-				"globby": "^11.0.4",
+				"globby": "^11.1.0",
 				"globjoin": "^0.1.4",
-				"html-tags": "^3.1.0",
-				"ignore": "^5.2.0",
-				"import-lazy": "^4.0.0",
+				"html-tags": "^3.3.1",
+				"ignore": "^5.3.2",
 				"imurmurhash": "^0.1.4",
 				"is-plain-object": "^5.0.0",
-				"known-css-properties": "^0.24.0",
+				"known-css-properties": "^0.34.0",
 				"mathml-tag-names": "^2.1.3",
-				"meow": "^9.0.0",
-				"micromatch": "^4.0.4",
+				"meow": "^13.2.0",
+				"micromatch": "^4.0.7",
 				"normalize-path": "^3.0.0",
-				"normalize-selector": "^0.2.0",
-				"picocolors": "^1.0.0",
-				"postcss": "^8.3.11",
-				"postcss-media-query-parser": "^0.2.3",
-				"postcss-resolve-nested-selector": "^0.1.1",
-				"postcss-safe-parser": "^6.0.0",
-				"postcss-selector-parser": "^6.0.7",
-				"postcss-value-parser": "^4.1.0",
+				"picocolors": "^1.0.1",
+				"postcss": "^8.4.41",
+				"postcss-resolve-nested-selector": "^0.1.6",
+				"postcss-safe-parser": "^7.0.0",
+				"postcss-selector-parser": "^6.1.2",
+				"postcss-value-parser": "^4.2.0",
 				"resolve-from": "^5.0.0",
-				"specificity": "^0.4.1",
 				"string-width": "^4.2.3",
-				"strip-ansi": "^6.0.1",
-				"style-search": "^0.1.0",
+				"strip-ansi": "^7.1.0",
+				"supports-hyperlinks": "^3.0.0",
 				"svg-tags": "^1.0.0",
-				"table": "^6.7.5",
-				"v8-compile-cache": "^2.3.0",
-				"write-file-atomic": "^3.0.3"
+				"table": "^6.8.2",
+				"write-file-atomic": "^5.0.1"
 			},
 			"bin": {
-				"stylelint": "bin/stylelint.js"
+				"stylelint": "bin/stylelint.mjs"
 			},
 			"engines": {
-				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/stylelint"
+				"node": ">=18.12.0"
 			}
 		},
-		"node_modules/stylelint-config-recommended": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
-			"integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-			"dev": true,
-			"peerDependencies": {
-				"stylelint": "^14.0.0"
-			}
+		"node_modules/stylelint/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
 		},
-		"node_modules/stylelint-config-recommended-scss": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
-			"integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
-			"dev": true,
+		"node_modules/stylelint/node_modules/balanced-match": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+			"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="
+		},
+		"node_modules/stylelint/node_modules/cosmiconfig": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+			"integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
 			"dependencies": {
-				"postcss-scss": "^4.0.2",
-				"stylelint-config-recommended": "^6.0.0",
-				"stylelint-scss": "^4.0.0"
+				"env-paths": "^2.2.1",
+				"import-fresh": "^3.3.0",
+				"js-yaml": "^4.1.0",
+				"parse-json": "^5.2.0"
 			},
-			"peerDependencies": {
-				"stylelint": "^14.0.0"
-			}
-		},
-		"node_modules/stylelint-config-recommended-scss/node_modules/postcss-scss": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
-			"integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
-			"dev": true,
 			"engines": {
-				"node": ">=12.0"
+				"node": ">=14"
 			},
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/postcss/"
+				"url": "https://github.com/sponsors/d-fischer"
 			},
 			"peerDependencies": {
-				"postcss": "^8.3.3"
+				"typescript": ">=4.9.5"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/stylelint-scss": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.1.0.tgz",
-			"integrity": "sha512-BNYTo7MMamhFOlcaAWp2dMpjg6hPyM/FFqfDIYzmYVLMmQJqc8lWRIiTqP4UX5bresj9Vo0dKC6odSh43VP2NA==",
-			"dev": true,
+		"node_modules/stylelint/node_modules/css-tree": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
 			"dependencies": {
-				"lodash": "^4.17.21",
-				"postcss-media-query-parser": "^0.2.3",
-				"postcss-resolve-nested-selector": "^0.1.1",
-				"postcss-selector-parser": "^6.0.6",
-				"postcss-value-parser": "^4.1.0"
+				"mdn-data": "2.0.30",
+				"source-map-js": "^1.0.1"
 			},
-			"peerDependencies": {
-				"stylelint": "^14.0.0"
+			"engines": {
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
 			}
 		},
-		"node_modules/stylelint-scss/node_modules/postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
-		},
-		"node_modules/stylelint/node_modules/balanced-match": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-			"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-			"dev": true
+		"node_modules/stylelint/node_modules/debug": {
+			"version": "4.3.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+			"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.3"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
 		},
 		"node_modules/stylelint/node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
 		"node_modules/stylelint/node_modules/fast-glob": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-			"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-			"dev": true,
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
 			"dependencies": {
 				"@nodelib/fs.stat": "^2.0.2",
 				"@nodelib/fs.walk": "^1.2.3",
@@ -49583,23 +46813,34 @@
 				"node": ">=8.6.0"
 			}
 		},
-		"node_modules/stylelint/node_modules/get-stdin": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-			"integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-			"dev": true,
+		"node_modules/stylelint/node_modules/file-entry-cache": {
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.1.0.tgz",
+			"integrity": "sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==",
+			"license": "MIT",
+			"dependencies": {
+				"flat-cache": "^5.0.0"
+			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=18"
+			}
+		},
+		"node_modules/stylelint/node_modules/flat-cache": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz",
+			"integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==",
+			"dependencies": {
+				"flatted": "^3.3.1",
+				"keyv": "^4.5.4"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/stylelint/node_modules/glob-parent": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -49607,76 +46848,128 @@
 				"node": ">= 6"
 			}
 		},
+		"node_modules/stylelint/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/ignore": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
 		"node_modules/stylelint/node_modules/is-fullwidth-code-point": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
 		},
-		"node_modules/stylelint/node_modules/meow": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-			"dev": true,
+		"node_modules/stylelint/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"dependencies": {
-				"@types/minimist": "^1.2.0",
-				"camelcase-keys": "^6.2.2",
-				"decamelize": "^1.2.0",
-				"decamelize-keys": "^1.1.0",
-				"hard-rejection": "^2.1.0",
-				"minimist-options": "4.1.0",
-				"normalize-package-data": "^3.0.0",
-				"read-pkg-up": "^7.0.1",
-				"redent": "^3.0.0",
-				"trim-newlines": "^3.0.0",
-				"type-fest": "^0.18.0",
-				"yargs-parser": "^20.2.3"
+				"argparse": "^2.0.1"
 			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/stylelint/node_modules/mdn-data": {
+			"version": "2.0.30",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="
+		},
+		"node_modules/stylelint/node_modules/meow": {
+			"version": "13.2.0",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz",
+			"integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==",
 			"engines": {
-				"node": ">=10"
+				"node": ">=18"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/stylelint/node_modules/normalize-package-data": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-			"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-			"dev": true,
+		"node_modules/stylelint/node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"license": "MIT"
+		},
+		"node_modules/stylelint/node_modules/postcss": {
+			"version": "8.4.47",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+			"integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
 			"dependencies": {
-				"hosted-git-info": "^4.0.1",
-				"is-core-module": "^2.5.0",
-				"semver": "^7.3.4",
-				"validate-npm-package-license": "^3.0.1"
+				"nanoid": "^3.3.7",
+				"picocolors": "^1.1.0",
+				"source-map-js": "^1.2.1"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": "^10 || ^12 || >=14"
 			}
 		},
 		"node_modules/stylelint/node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"node_modules/stylelint/node_modules/resolve-from": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
 			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
 		},
+		"node_modules/stylelint/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/stylelint/node_modules/source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/stylelint/node_modules/string-width": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
@@ -49686,28 +46979,79 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/stylelint/node_modules/type-fest": {
-			"version": "0.18.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-			"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-			"dev": true,
+		"node_modules/stylelint/node_modules/string-width/node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/strip-ansi": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+			"dependencies": {
+				"ansi-regex": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
+			}
+		},
+		"node_modules/stylelint/node_modules/strip-ansi/node_modules/ansi-regex": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
+			}
+		},
+		"node_modules/stylelint/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/supports-hyperlinks": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz",
+			"integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==",
+			"dependencies": {
+				"has-flag": "^4.0.0",
+				"supports-color": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=14.18"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/stylelint/node_modules/write-file-atomic": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-			"dev": true,
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
 			"dependencies": {
 				"imurmurhash": "^0.1.4",
-				"is-typedarray": "^1.0.0",
-				"signal-exit": "^3.0.2",
-				"typedarray-to-buffer": "^3.1.5"
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
 		"node_modules/stylis": {
@@ -49732,10 +47076,10 @@
 			}
 		},
 		"node_modules/supports-hyperlinks": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.0.0.tgz",
-			"integrity": "sha512-bFhn0MQ8qefLyJ3K7PpHiPUTuTVPWw6RXfaMeV6xgJLXtBbszyboz1bvGTVv4R0YpQm2DqlXXn0fFHhxUHVE5w==",
-			"dev": true,
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+			"integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+			"license": "MIT",
 			"dependencies": {
 				"has-flag": "^4.0.0",
 				"supports-color": "^7.0.0"
@@ -49748,7 +47092,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -49757,7 +47100,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -49779,20 +47121,17 @@
 		"node_modules/svg-parser": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
-			"integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
-			"dev": true
+			"integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="
 		},
 		"node_modules/svg-tags": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-			"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-			"dev": true
+			"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="
 		},
 		"node_modules/svgo": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz",
 			"integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==",
-			"dev": true,
 			"dependencies": {
 				"@trysound/sax": "0.2.0",
 				"commander": "^7.2.0",
@@ -49816,7 +47155,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
 			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"dev": true,
 			"engines": {
 				"node": ">= 10"
 			}
@@ -49825,7 +47163,6 @@
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
 			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-			"dev": true,
 			"dependencies": {
 				"mdn-data": "2.0.30",
 				"source-map-js": "^1.0.1"
@@ -49837,23 +47174,25 @@
 		"node_modules/svgo/node_modules/mdn-data": {
 			"version": "2.0.30",
 			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-			"dev": true
+			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="
 		},
 		"node_modules/svgo/node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-			"dev": true,
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/swc-loader": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/swc-loader/-/swc-loader-0.2.3.tgz",
-			"integrity": "sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==",
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/swc-loader/-/swc-loader-0.2.6.tgz",
+			"integrity": "sha512-9Zi9UP2YmDpgmQVbyOPJClY0dwf58JDyDMQ7uRc4krmc72twNI2fvlBWHLqVekBpPc7h5NJkGVT1zNDxFrqhvg==",
 			"dev": true,
+			"dependencies": {
+				"@swc/counter": "^0.1.3"
+			},
 			"peerDependencies": {
 				"@swc/core": "^1.2.147",
 				"webpack": ">=2"
@@ -49871,20 +47210,18 @@
 		"node_modules/symbol-tree": {
 			"version": "3.2.4",
 			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-			"dev": true
+			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
 		},
 		"node_modules/synchronous-promise": {
-			"version": "2.0.15",
-			"resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.15.tgz",
-			"integrity": "sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg==",
+			"version": "2.0.17",
+			"resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.17.tgz",
+			"integrity": "sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==",
 			"dev": true
 		},
 		"node_modules/synckit": {
 			"version": "0.8.5",
 			"resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz",
 			"integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==",
-			"dev": true,
 			"dependencies": {
 				"@pkgr/utils": "^2.3.1",
 				"tslib": "^2.5.0"
@@ -49897,10 +47234,9 @@
 			}
 		},
 		"node_modules/table": {
-			"version": "6.8.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-			"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
-			"dev": true,
+			"version": "6.8.2",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
+			"integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
 			"dependencies": {
 				"ajv": "^8.0.1",
 				"lodash.truncate": "^4.4.2",
@@ -49916,7 +47252,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
 			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -49924,14 +47259,12 @@
 		"node_modules/table/node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
 		"node_modules/table/node_modules/is-fullwidth-code-point": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -49940,7 +47273,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
 			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.0.0",
 				"astral-regex": "^2.0.0",
@@ -49957,7 +47289,6 @@
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
@@ -50014,10 +47345,11 @@
 			}
 		},
 		"node_modules/tar-fs/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
@@ -50131,16 +47463,24 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/telejson": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.2.0.tgz",
+			"integrity": "sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==",
+			"dev": true,
+			"dependencies": {
+				"memoizerific": "^1.11.3"
+			}
+		},
 		"node_modules/temp": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
-			"integrity": "sha512-jtnWJs6B1cZlHs9wPG7BrowKxZw/rf6+UpGAkr8AaYmiTyTO7zQlLoST8zx/8TcUPnZmeBoB+H8ARuHZaSijVw==",
-			"engines": [
-				"node >=0.8.0"
-			],
+			"version": "0.8.4",
+			"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
+			"integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
 			"dependencies": {
-				"os-tmpdir": "^1.0.0",
-				"rimraf": "~2.2.6"
+				"rimraf": "~2.6.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/temp-dir": {
@@ -50152,10 +47492,32 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/temp/node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"node_modules/temp/node_modules/rimraf": {
-			"version": "2.2.8",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-			"integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
+			"version": "2.6.3",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+			"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
 			"bin": {
 				"rimraf": "bin.js"
 			}
@@ -50247,7 +47609,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.0.0.tgz",
 			"integrity": "sha512-rdBAY35jUvVapqCuhehjenLbYY73cVgRQ6podD6u9EDBomBBHjCOtmq2InPgPpTysOIOsQ5PdBzwSC/sKjv6ew==",
-			"dev": true,
 			"dependencies": {
 				"ansi-escapes": "^4.2.1",
 				"supports-hyperlinks": "^2.0.0"
@@ -50257,9 +47618,9 @@
 			}
 		},
 		"node_modules/terser": {
-			"version": "5.19.2",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-			"integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
+			"version": "5.32.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.32.0.tgz",
+			"integrity": "sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==",
 			"dependencies": {
 				"@jridgewell/source-map": "^0.3.3",
 				"acorn": "^8.8.2",
@@ -50274,16 +47635,15 @@
 			}
 		},
 		"node_modules/terser-webpack-plugin": {
-			"version": "5.3.9",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
-			"integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
-			"dev": true,
+			"version": "5.3.10",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+			"integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
 			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.17",
+				"@jridgewell/trace-mapping": "^0.3.20",
 				"jest-worker": "^27.4.5",
 				"schema-utils": "^3.1.1",
 				"serialize-javascript": "^6.0.1",
-				"terser": "^5.16.8"
+				"terser": "^5.26.0"
 			},
 			"engines": {
 				"node": ">= 10.13.0"
@@ -50311,7 +47671,6 @@
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -50327,7 +47686,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -50336,7 +47694,6 @@
 			"version": "27.5.1",
 			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
 			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"merge-stream": "^2.0.0",
@@ -50350,7 +47707,6 @@
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
 			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dev": true,
 			"dependencies": {
 				"@types/json-schema": "^7.0.8",
 				"ajv": "^6.12.5",
@@ -50365,10 +47721,9 @@
 			}
 		},
 		"node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-			"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-			"dev": true,
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
 			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
@@ -50377,7 +47732,6 @@
 			"version": "8.1.1",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
 			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -50389,9 +47743,10 @@
 			}
 		},
 		"node_modules/terser/node_modules/acorn": {
-			"version": "8.10.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-			"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+			"version": "8.13.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+			"integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -50408,7 +47763,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
 			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-			"dev": true,
 			"dependencies": {
 				"@istanbuljs/schema": "^0.1.2",
 				"glob": "^7.1.4",
@@ -50422,7 +47776,6 @@
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
 			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -50456,14 +47809,12 @@
 		"node_modules/text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-			"dev": true
+			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
 		},
 		"node_modules/third-party-web": {
 			"version": "0.23.4",
 			"resolved": "https://registry.npmjs.org/third-party-web/-/third-party-web-0.23.4.tgz",
-			"integrity": "sha512-kwYnSZRhEvv0SBW2fp8SBBKRglMoBjV8xz6C31m0ewqOtknB5UL+Ihg+M81hyFY5ldkZuGWPb+e4GVDkzf/gYg==",
-			"dev": true
+			"integrity": "sha512-kwYnSZRhEvv0SBW2fp8SBBKRglMoBjV8xz6C31m0ewqOtknB5UL+Ihg+M81hyFY5ldkZuGWPb+e4GVDkzf/gYg=="
 		},
 		"node_modules/throat": {
 			"version": "5.0.0",
@@ -50473,8 +47824,7 @@
 		"node_modules/through": {
 			"version": "2.3.8",
 			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-			"dev": true
+			"integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
 		},
 		"node_modules/through2": {
 			"version": "2.0.5",
@@ -50488,8 +47838,7 @@
 		"node_modules/thunky": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-			"dev": true
+			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
 		},
 		"node_modules/timers-browserify": {
 			"version": "2.0.12",
@@ -50509,16 +47858,15 @@
 			"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
 		},
 		"node_modules/tiny-invariant": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
-			"integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==",
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+			"integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
 			"dev": true
 		},
 		"node_modules/titleize": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz",
 			"integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -50526,11 +47874,26 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/tldts": {
+			"version": "6.1.50",
+			"resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.50.tgz",
+			"integrity": "sha512-q9GOap6q3KCsLMdOjXhWU5jVZ8/1dIib898JBRLsN+tBhENpBDcAVQbE0epADOjw11FhQQy9AcbqKGBQPUfTQA==",
+			"dependencies": {
+				"tldts-core": "^6.1.50"
+			},
+			"bin": {
+				"tldts": "bin/cli.js"
+			}
+		},
+		"node_modules/tldts-core": {
+			"version": "6.1.50",
+			"resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.50.tgz",
+			"integrity": "sha512-na2EcZqmdA2iV9zHV7OHQDxxdciEpxrjbkp+aHmZgnZKHzoElLajP59np5/4+sare9fQBfixgvXKx8ev1d7ytw=="
+		},
 		"node_modules/tmp": {
 			"version": "0.0.33",
 			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
 			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-			"dev": true,
 			"dependencies": {
 				"os-tmpdir": "~1.0.2"
 			},
@@ -50549,18 +47912,11 @@
 			"integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
 			"dev": true
 		},
-		"node_modules/to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/to-object-path": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
 			"integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+			"dev": true,
 			"dependencies": {
 				"kind-of": "^3.0.2"
 			},
@@ -50572,6 +47928,7 @@
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
 			"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+			"dev": true,
 			"dependencies": {
 				"is-buffer": "^1.1.5"
 			},
@@ -50583,6 +47940,7 @@
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
 			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+			"dev": true,
 			"dependencies": {
 				"define-property": "^2.0.2",
 				"extend-shallow": "^3.0.2",
@@ -50597,6 +47955,7 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
 			"integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+			"dev": true,
 			"dependencies": {
 				"is-number": "^3.0.0",
 				"repeat-string": "^1.6.1"
@@ -50606,9 +47965,9 @@
 			}
 		},
 		"node_modules/tocbot": {
-			"version": "4.21.1",
-			"resolved": "https://registry.npmjs.org/tocbot/-/tocbot-4.21.1.tgz",
-			"integrity": "sha512-IfajhBTeg0HlMXu1f+VMbPef05QpDTsZ9X2Yn1+8npdaXsXg/+wrm9Ze1WG5OS1UDC3qJ5EQN/XOZ3gfXjPFCw==",
+			"version": "4.25.0",
+			"resolved": "https://registry.npmjs.org/tocbot/-/tocbot-4.25.0.tgz",
+			"integrity": "sha512-kE5wyCQJ40hqUaRVkyQ4z5+4juzYsv/eK+aqD97N62YH0TxFhzJvo22RUQQZdO3YnXAk42ZOfOpjVdy+Z0YokA==",
 			"dev": true
 		},
 		"node_modules/toidentifier": {
@@ -50623,22 +47982,30 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
 			"integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
 		},
+		"node_modules/tough-cookie": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.0.0.tgz",
+			"integrity": "sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==",
+			"dependencies": {
+				"tldts": "^6.1.32"
+			},
+			"engines": {
+				"node": ">=16"
+			}
+		},
 		"node_modules/tr46": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-			"dev": true
+			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
 		},
 		"node_modules/tree-kill": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
 			"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-			"dev": true,
 			"bin": {
 				"tree-kill": "cli.js"
 			}
@@ -50647,14 +48014,12 @@
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
 			"integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==",
-			"deprecated": "Use String.prototype.trim() instead",
-			"dev": true
+			"deprecated": "Use String.prototype.trim() instead"
 		},
 		"node_modules/trim-newlines": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
 			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -50663,7 +48028,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
 			"integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
-			"dev": true,
 			"dependencies": {
 				"escape-string-regexp": "^1.0.2"
 			},
@@ -50674,8 +48038,7 @@
 		"node_modules/trim-trailing-lines": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz",
-			"integrity": "sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==",
-			"dev": true
+			"integrity": "sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="
 		},
 		"node_modules/triple-beam": {
 			"version": "1.4.1",
@@ -50689,8 +48052,7 @@
 		"node_modules/trough": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz",
-			"integrity": "sha512-fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw==",
-			"dev": true
+			"integrity": "sha512-fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw=="
 		},
 		"node_modules/truncate-utf8-bytes": {
 			"version": "1.0.2",
@@ -50705,7 +48067,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.2.tgz",
 			"integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=16.13.0"
 			},
@@ -50749,14 +48110,13 @@
 			}
 		},
 		"node_modules/tsconfig-paths": {
-			"version": "3.11.0",
-			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz",
-			"integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
-			"dev": true,
+			"version": "3.15.0",
+			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+			"integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
 			"dependencies": {
 				"@types/json5": "^0.0.29",
-				"json5": "^1.0.1",
-				"minimist": "^1.2.0",
+				"json5": "^1.0.2",
+				"minimist": "^1.2.6",
 				"strip-bom": "^3.0.0"
 			}
 		},
@@ -50764,7 +48124,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
 			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-			"dev": true,
 			"dependencies": {
 				"minimist": "^1.2.0"
 			},
@@ -50776,21 +48135,20 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
 			"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/tslib": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-			"integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
+			"integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
+			"license": "0BSD"
 		},
 		"node_modules/tsutils": {
 			"version": "3.21.0",
 			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
 			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-			"dev": true,
 			"dependencies": {
 				"tslib": "^1.8.1"
 			},
@@ -50804,8 +48162,7 @@
 		"node_modules/tsutils/node_modules/tslib": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-			"dev": true
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
 		},
 		"node_modules/tty-browserify": {
 			"version": "0.0.0",
@@ -50831,7 +48188,6 @@
 			"version": "0.0.6",
 			"resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
 			"integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.6.11 <=0.7.0 || >=0.7.3"
 			}
@@ -50853,7 +48209,6 @@
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
 			"integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-			"dev": true,
 			"dependencies": {
 				"prelude-ls": "~1.1.2"
 			},
@@ -50873,7 +48228,6 @@
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
 			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -50882,7 +48236,6 @@
 			"version": "1.6.18",
 			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
 			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-			"dev": true,
 			"dependencies": {
 				"media-typer": "0.3.0",
 				"mime-types": "~2.1.24"
@@ -50895,7 +48248,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
 			"integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"get-intrinsic": "^1.2.1",
@@ -50909,7 +48261,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
 			"integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"for-each": "^0.3.3",
@@ -50927,7 +48278,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
 			"integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
-			"dev": true,
 			"dependencies": {
 				"available-typed-arrays": "^1.0.5",
 				"call-bind": "^1.0.2",
@@ -50946,7 +48296,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
 			"integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"for-each": "^0.3.3",
@@ -50965,17 +48314,20 @@
 				"node": ">= 10"
 			}
 		},
+		"node_modules/typed-query-selector": {
+			"version": "2.12.0",
+			"resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
+			"integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg=="
+		},
 		"node_modules/typedarray": {
 			"version": "0.0.6",
 			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-			"dev": true
+			"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
 		},
 		"node_modules/typedarray-to-buffer": {
 			"version": "3.1.5",
 			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
 			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-			"dev": true,
 			"dependencies": {
 				"is-typedarray": "^1.0.0"
 			}
@@ -51051,10 +48403,11 @@
 			}
 		},
 		"node_modules/typescript": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-			"integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+			"version": "5.5.3",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+			"integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -51066,35 +48419,20 @@
 		"node_modules/uc.micro": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-			"dev": true
+			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
 		},
-		"node_modules/uglify-es": {
-			"version": "3.3.9",
-			"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
-			"integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
-			"deprecated": "support for ECMAScript is superseded by `uglify-js` as of v3.13.0",
-			"dependencies": {
-				"commander": "~2.13.0",
-				"source-map": "~0.6.1"
-			},
-			"bin": {
-				"uglifyjs": "bin/uglifyjs"
-			},
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/uglify-es/node_modules/commander": {
-			"version": "2.13.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-			"integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="
+		"node_modules/ufo": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/ufo/-/ufo-1.4.0.tgz",
+			"integrity": "sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==",
+			"dev": true
 		},
 		"node_modules/uglify-js": {
 			"version": "3.13.7",
 			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.7.tgz",
 			"integrity": "sha512-1Psi2MmnZJbnEsgJJIlfnd7tFlJfitusmR7zDI8lXlFI0ACD4/Rm/xdrU8bh6zF0i74aiVoBtkRiFulkrmh3AA==",
 			"dev": true,
+			"optional": true,
 			"bin": {
 				"uglifyjs": "bin/uglifyjs"
 			},
@@ -51106,7 +48444,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
 			"integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-			"dev": true,
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"has-bigints": "^1.0.2",
@@ -51121,7 +48458,6 @@
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
 			"integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-			"dev": true,
 			"dependencies": {
 				"buffer": "^5.2.1",
 				"through": "^2.3.8"
@@ -51131,7 +48467,6 @@
 			"version": "5.7.1",
 			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
 			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-			"dev": true,
 			"funding": [
 				{
 					"type": "github",
@@ -51151,20 +48486,37 @@
 				"ieee754": "^1.1.13"
 			}
 		},
+		"node_modules/undici": {
+			"version": "5.28.4",
+			"resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
+			"integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
+			"license": "MIT",
+			"dependencies": {
+				"@fastify/busboy": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=14.0"
+			}
+		},
+		"node_modules/undici-types": {
+			"version": "5.26.5",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+		},
 		"node_modules/unherit": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz",
 			"integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
-			"dev": true,
 			"dependencies": {
 				"inherits": "^2.0.1",
 				"xtend": "^4.0.1"
 			}
 		},
 		"node_modules/unicode-canonical-property-names-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+			"integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
@@ -51173,6 +48525,7 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
 			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+			"license": "MIT",
 			"dependencies": {
 				"unicode-canonical-property-names-ecmascript": "^2.0.0",
 				"unicode-property-aliases-ecmascript": "^2.0.0"
@@ -51182,9 +48535,10 @@
 			}
 		},
 		"node_modules/unicode-match-property-value-ecmascript": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+			"integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
@@ -51193,6 +48547,7 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
 			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
@@ -51201,7 +48556,6 @@
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/unified/-/unified-7.1.0.tgz",
 			"integrity": "sha512-lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw==",
-			"dev": true,
 			"dependencies": {
 				"@types/unist": "^2.0.0",
 				"@types/vfile": "^3.0.0",
@@ -51217,7 +48571,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
 			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -51226,6 +48579,7 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
 			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+			"dev": true,
 			"dependencies": {
 				"arr-union": "^3.1.0",
 				"get-value": "^2.0.6",
@@ -51258,7 +48612,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
 			"integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-			"dev": true,
 			"dependencies": {
 				"crypto-random-string": "^2.0.0"
 			},
@@ -51269,14 +48622,12 @@
 		"node_modules/unist-util-is": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
-			"integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==",
-			"dev": true
+			"integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="
 		},
 		"node_modules/unist-util-modify-children": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.2.tgz",
 			"integrity": "sha512-GRi04yhng1WqBf5RBzPkOtWAadcZS2gvuOgNn/cyJBYNxtTuyYqTKN0eg4rC1YJwGnzrqfRB3dSKm8cNCjNirg==",
-			"dev": true,
 			"dependencies": {
 				"array-iterate": "^1.0.0"
 			}
@@ -51285,7 +48636,6 @@
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz",
 			"integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==",
-			"dev": true,
 			"dependencies": {
 				"unist-util-visit": "^1.1.0"
 			},
@@ -51297,14 +48647,12 @@
 		"node_modules/unist-util-stringify-position": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
-			"integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==",
-			"dev": true
+			"integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="
 		},
 		"node_modules/unist-util-visit": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
 			"integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
-			"dev": true,
 			"dependencies": {
 				"unist-util-visit-parents": "^2.0.0"
 			}
@@ -51313,7 +48661,6 @@
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz",
 			"integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==",
-			"dev": true,
 			"dependencies": {
 				"unist-util-is": "^3.0.0"
 			}
@@ -51353,22 +48700,23 @@
 			}
 		},
 		"node_modules/unplugin": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.4.0.tgz",
-			"integrity": "sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==",
+			"version": "1.7.1",
+			"resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.7.1.tgz",
+			"integrity": "sha512-JqzORDAPxxs8ErLV4x+LL7bk5pk3YlcWqpSNsIkAZj972KzFZLClc/ekppahKkOczGkwIG6ElFgdOgOlK4tXZw==",
 			"dev": true,
 			"dependencies": {
-				"acorn": "^8.9.0",
+				"acorn": "^8.11.3",
 				"chokidar": "^3.5.3",
 				"webpack-sources": "^3.2.3",
-				"webpack-virtual-modules": "^0.5.0"
+				"webpack-virtual-modules": "^0.6.1"
 			}
 		},
 		"node_modules/unplugin/node_modules/acorn": {
-			"version": "8.10.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-			"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+			"version": "8.13.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+			"integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -51377,15 +48725,17 @@
 			}
 		},
 		"node_modules/unplugin/node_modules/webpack-virtual-modules": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
-			"integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
-			"dev": true
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
+			"integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/unset-value": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
 			"integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+			"dev": true,
 			"dependencies": {
 				"has-value": "^0.3.1",
 				"isobject": "^3.0.0"
@@ -51398,6 +48748,7 @@
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
 			"integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+			"dev": true,
 			"dependencies": {
 				"get-value": "^2.0.3",
 				"has-values": "^0.1.4",
@@ -51411,6 +48762,7 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
 			"integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+			"dev": true,
 			"dependencies": {
 				"isarray": "1.0.0"
 			},
@@ -51422,6 +48774,7 @@
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
 			"integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -51430,7 +48783,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
 			"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -51471,9 +48823,9 @@
 			}
 		},
 		"node_modules/update-browserslist-db": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-			"integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+			"integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -51489,8 +48841,8 @@
 				}
 			],
 			"dependencies": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
+				"escalade": "^3.2.0",
+				"picocolors": "^1.1.0"
 			},
 			"bin": {
 				"update-browserslist-db": "cli.js"
@@ -51519,7 +48871,6 @@
 			"version": "4.4.1",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
 			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"dev": true,
 			"dependencies": {
 				"punycode": "^2.1.0"
 			}
@@ -51531,20 +48882,23 @@
 			"deprecated": "Please see https://github.com/lydell/urix#deprecated"
 		},
 		"node_modules/url": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
-			"integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
+			"version": "0.11.4",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
+			"integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"punycode": "^1.4.1",
-				"qs": "^6.11.0"
+				"qs": "^6.12.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/url-loader": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
 			"integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
-			"dev": true,
 			"dependencies": {
 				"loader-utils": "^2.0.0",
 				"mime-types": "^2.1.27",
@@ -51571,7 +48925,6 @@
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -51587,7 +48940,6 @@
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
 			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dev": true,
 			"dependencies": {
 				"@types/json-schema": "^7.0.8",
 				"ajv": "^6.12.5",
@@ -51601,16 +48953,6 @@
 				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"node_modules/url-parse": {
-			"version": "1.5.10",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-			"dev": true,
-			"dependencies": {
-				"querystringify": "^2.1.1",
-				"requires-port": "^1.0.0"
-			}
-		},
 		"node_modules/url-template": {
 			"version": "2.0.8",
 			"resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
@@ -51623,10 +48965,32 @@
 			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
 			"dev": true
 		},
+		"node_modules/url/node_modules/qs": {
+			"version": "6.13.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+			"integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"side-channel": "^1.0.6"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/urlpattern-polyfill": {
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+			"integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg=="
+		},
 		"node_modules/use": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
 			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+			"dev": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -51651,40 +49015,15 @@
 				}
 			}
 		},
-		"node_modules/use-isomorphic-layout-effect": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
-			"integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/use-latest-callback": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.6.tgz",
-			"integrity": "sha512-VO/P91A/PmKH9bcN9a7O3duSuxe6M14ZoYXgA6a8dab8doWNdhiIHzEkX/jFeTTRBsX0Ubk6nG4q2NIjNsj+bg==",
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.2.1.tgz",
+			"integrity": "sha512-QWlq8Is8BGWBf883QOEQP5HWYX/kMI+JTbJ5rdtvJLmXTIh9XoHIO3PQcmQl8BU44VKxow1kbQUHa6mQSMALDQ==",
+			"license": "MIT",
 			"peerDependencies": {
 				"react": ">=16.8"
 			}
 		},
-		"node_modules/use-lilius": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/use-lilius/-/use-lilius-2.0.1.tgz",
-			"integrity": "sha512-Dque7ax/91znesQWz2wM95O5iTHWzAsKQa2e7qvyPhXev/UAfgQIiXSqiB96tfiwQ+8+371FDK7oftuzw0Awhg==",
-			"hasInstallScript": true,
-			"dependencies": {
-				"date-fns": "^2.28.0"
-			},
-			"peerDependencies": {
-				"react": "*",
-				"react-dom": "*"
-			}
-		},
 		"node_modules/use-memo-one": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.1.tgz",
@@ -51801,7 +49140,6 @@
 			"version": "9.0.1",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
 			"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-			"dev": true,
 			"funding": [
 				"https://github.com/sponsors/broofa",
 				"https://github.com/sponsors/ctavan"
@@ -51813,14 +49151,12 @@
 		"node_modules/v8-compile-cache": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-			"dev": true
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
 		},
 		"node_modules/v8-to-istanbul": {
 			"version": "9.1.0",
 			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
 			"integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
-			"dev": true,
 			"dependencies": {
 				"@jridgewell/trace-mapping": "^0.3.12",
 				"@types/istanbul-lib-coverage": "^2.0.1",
@@ -51834,7 +49170,6 @@
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
 			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-			"dev": true,
 			"dependencies": {
 				"spdx-correct": "^3.0.0",
 				"spdx-expression-parse": "^3.0.0"
@@ -51844,7 +49179,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
 			"integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
-			"dev": true,
 			"dependencies": {
 				"builtins": "^1.0.3"
 			}
@@ -51855,46 +49189,6 @@
 			"integrity": "sha512-PnFM3xiZ+kYmLyTiMgTYmU7ZHkjBZz2/+F0DaALc/uUtVzdCt1wAosvYJ5hFQi/hz8O4zb52FQhHZRC+uVkJ+g==",
 			"dev": true
 		},
-		"node_modules/valtio": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/valtio/-/valtio-1.7.0.tgz",
-			"integrity": "sha512-3Tnix66EERwMcrl1rfB3ylcewOcL5L/GiPmC3FlVNreQzqf2jufEeqlNmgnLgSGchkEmH3WYVtS+x6Qw4r+yzQ==",
-			"dependencies": {
-				"proxy-compare": "2.3.0",
-				"use-sync-external-store": "1.2.0"
-			},
-			"engines": {
-				"node": ">=12.7.0"
-			},
-			"peerDependencies": {
-				"@babel/helper-module-imports": ">=7.12",
-				"@babel/types": ">=7.13",
-				"aslemammad-vite-plugin-macro": ">=1.0.0-alpha.1",
-				"babel-plugin-macros": ">=3.0",
-				"react": ">=16.8",
-				"vite": ">=2.8.6"
-			},
-			"peerDependenciesMeta": {
-				"@babel/helper-module-imports": {
-					"optional": true
-				},
-				"@babel/types": {
-					"optional": true
-				},
-				"aslemammad-vite-plugin-macro": {
-					"optional": true
-				},
-				"babel-plugin-macros": {
-					"optional": true
-				},
-				"react": {
-					"optional": true
-				},
-				"vite": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/vary": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -51907,7 +49201,6 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz",
 			"integrity": "sha512-y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ==",
-			"dev": true,
 			"dependencies": {
 				"is-buffer": "^2.0.0",
 				"replace-ext": "1.0.0",
@@ -51919,7 +49212,6 @@
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz",
 			"integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==",
-			"dev": true,
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
@@ -51929,7 +49221,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz",
 			"integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==",
-			"dev": true,
 			"dependencies": {
 				"unist-util-stringify-position": "^1.1.1"
 			}
@@ -51938,7 +49229,6 @@
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
 			"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-			"dev": true,
 			"funding": [
 				{
 					"type": "github",
@@ -51981,15 +49271,14 @@
 			"dev": true
 		},
 		"node_modules/w3c-xmlserializer": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-			"integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
-			"dev": true,
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+			"integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
 			"dependencies": {
-				"xml-name-validator": "^4.0.0"
+				"xml-name-validator": "^5.0.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
 		"node_modules/wait-port": {
@@ -52068,6 +49357,15 @@
 			"resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.1.tgz",
 			"integrity": "sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q=="
 		},
+		"node_modules/wasm-vips": {
+			"version": "0.0.10",
+			"resolved": "https://registry.npmjs.org/wasm-vips/-/wasm-vips-0.0.10.tgz",
+			"integrity": "sha512-ZDIRjxTm03iRRXM9WwvVh8MH+mKHUBedJTC/MYd/cVGZxShnYcEd0BB7gSGDpxgkzcPSYUnN1HQJipDBhxVHTg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=16.4.0"
+			}
+		},
 		"node_modules/watchpack": {
 			"version": "1.7.5",
 			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
@@ -52290,7 +49588,6 @@
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
 			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-			"dev": true,
 			"dependencies": {
 				"minimalistic-assert": "^1.0.0"
 			}
@@ -52312,12 +49609,6 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/web-vitals": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.0.tgz",
-			"integrity": "sha512-f5YnCHVG9Y6uLCePD4tY8bO/Ge15NPEQWtvm3tPzDKygloiqtb4SVqRHBcrIAqo2ztqX5XueqDn97zHF0LdT6w==",
-			"dev": true
-		},
 		"node_modules/webdriver": {
 			"version": "8.16.20",
 			"resolved": "https://registry.npmjs.org/webdriver/-/webdriver-8.16.20.tgz",
@@ -52365,10 +49656,14 @@
 			}
 		},
 		"node_modules/webdriver/node_modules/@types/node": {
-			"version": "20.8.2",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-			"integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-			"dev": true
+			"version": "20.16.15",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.15.tgz",
+			"integrity": "sha512-DV58qQz9dBMqVVn+qnKwGa51QzCD4YM/tQM16qLKxdf5tqz5W4QwtrMzjSTbabN1cFTSuyxVYBy+QWHjWW8X/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.19.2"
+			}
 		},
 		"node_modules/webdriver/node_modules/cacheable-lookup": {
 			"version": "7.0.0",
@@ -52435,9 +49730,9 @@
 			}
 		},
 		"node_modules/webdriver/node_modules/http2-wrapper": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz",
-			"integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==",
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+			"integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
 			"dev": true,
 			"dependencies": {
 				"quick-lru": "^5.1.1",
@@ -52472,9 +49767,9 @@
 			}
 		},
 		"node_modules/webdriver/node_modules/normalize-url": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz",
-			"integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==",
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
+			"integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
 			"dev": true,
 			"engines": {
 				"node": ">=14.16"
@@ -52519,11 +49814,19 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/webdriver/node_modules/undici-types": {
+			"version": "6.19.8",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+			"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/webdriver/node_modules/ws": {
-			"version": "8.14.2",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-			"integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			},
@@ -52584,18 +49887,23 @@
 			}
 		},
 		"node_modules/webdriverio/node_modules/@types/node": {
-			"version": "20.8.2",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-			"integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-			"dev": true
+			"version": "20.16.15",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.15.tgz",
+			"integrity": "sha512-DV58qQz9dBMqVVn+qnKwGa51QzCD4YM/tQM16qLKxdf5tqz5W4QwtrMzjSTbabN1cFTSuyxVYBy+QWHjWW8X/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.19.2"
+			}
 		},
 		"node_modules/webdriverio/node_modules/aria-query": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-			"integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+			"integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
 			"dev": true,
-			"dependencies": {
-				"dequal": "^2.0.3"
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/webdriverio/node_modules/brace-expansion": {
@@ -52607,15 +49915,6 @@
 				"balanced-match": "^1.0.0"
 			}
 		},
-		"node_modules/webdriverio/node_modules/cross-fetch": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
-			"integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
-			"dev": true,
-			"dependencies": {
-				"node-fetch": "^2.6.12"
-			}
-		},
 		"node_modules/webdriverio/node_modules/devtools-protocol": {
 			"version": "0.0.1203626",
 			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1203626.tgz",
@@ -52635,10 +49934,11 @@
 			}
 		},
 		"node_modules/webdriverio/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -52649,26 +49949,6 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/webdriverio/node_modules/node-fetch": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-			"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-			"dev": true,
-			"dependencies": {
-				"whatwg-url": "^5.0.0"
-			},
-			"engines": {
-				"node": "4.x || >=6.0.0"
-			},
-			"peerDependencies": {
-				"encoding": "^0.1.0"
-			},
-			"peerDependenciesMeta": {
-				"encoding": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/webdriverio/node_modules/puppeteer-core": {
 			"version": "20.9.0",
 			"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.9.0.tgz",
@@ -52701,9 +49981,9 @@
 			"dev": true
 		},
 		"node_modules/webdriverio/node_modules/serialize-error": {
-			"version": "11.0.2",
-			"resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.2.tgz",
-			"integrity": "sha512-o43i0jLcA0LXA5Uu+gI1Vj+lF66KR9IAcy0ThbGq1bAMPN+k5IgSHsulfnqf/ddKAz6dWf+k8PD5hAr9oCSHEQ==",
+			"version": "11.0.3",
+			"resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz",
+			"integrity": "sha512-2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==",
 			"dev": true,
 			"dependencies": {
 				"type-fest": "^2.12.2"
@@ -52727,6 +50007,13 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/webdriverio/node_modules/undici-types": {
+			"version": "6.19.8",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+			"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/webdriverio/node_modules/ws": {
 			"version": "8.13.0",
 			"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
@@ -52751,38 +50038,35 @@
 		"node_modules/webidl-conversions": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-			"dev": true
+			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
 		},
 		"node_modules/webpack": {
-			"version": "5.88.2",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
-			"integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
-			"dev": true,
-			"dependencies": {
-				"@types/eslint-scope": "^3.7.3",
-				"@types/estree": "^1.0.0",
-				"@webassemblyjs/ast": "^1.11.5",
-				"@webassemblyjs/wasm-edit": "^1.11.5",
-				"@webassemblyjs/wasm-parser": "^1.11.5",
+			"version": "5.95.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+			"integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
+			"dependencies": {
+				"@types/estree": "^1.0.5",
+				"@webassemblyjs/ast": "^1.12.1",
+				"@webassemblyjs/wasm-edit": "^1.12.1",
+				"@webassemblyjs/wasm-parser": "^1.12.1",
 				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.9.0",
-				"browserslist": "^4.14.5",
+				"acorn-import-attributes": "^1.9.5",
+				"browserslist": "^4.21.10",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.15.0",
+				"enhanced-resolve": "^5.17.1",
 				"es-module-lexer": "^1.2.1",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.9",
+				"graceful-fs": "^4.2.11",
 				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
 				"schema-utils": "^3.2.0",
 				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.3.7",
-				"watchpack": "^2.4.0",
+				"terser-webpack-plugin": "^5.3.10",
+				"watchpack": "^2.4.1",
 				"webpack-sources": "^3.2.3"
 			},
 			"bin": {
@@ -52805,7 +50089,6 @@
 			"version": "4.9.1",
 			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz",
 			"integrity": "sha512-jnd6EoYrf9yMxCyYDPj8eutJvtjQNp8PHmni/e/ulydHBWhT5J3menXt3HEkScsu9YqMAcG4CfFjs3rj5pVU1w==",
-			"dev": true,
 			"dependencies": {
 				"@discoveryjs/json-ext": "0.5.7",
 				"acorn": "^8.0.4",
@@ -52833,10 +50116,10 @@
 			}
 		},
 		"node_modules/webpack-bundle-analyzer/node_modules/acorn": {
-			"version": "8.10.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-			"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-			"dev": true,
+			"version": "8.13.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+			"integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -52845,10 +50128,13 @@
 			}
 		},
 		"node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-			"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-			"dev": true,
+			"version": "8.3.4",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+			"integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+			"license": "MIT",
+			"dependencies": {
+				"acorn": "^8.11.0"
+			},
 			"engines": {
 				"node": ">=0.4.0"
 			}
@@ -52857,7 +50143,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
 			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"dev": true,
 			"engines": {
 				"node": ">= 10"
 			}
@@ -52866,7 +50151,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
 			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -52878,7 +50162,6 @@
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
 			"integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
-			"dev": true,
 			"dependencies": {
 				"duplexer": "^0.1.2"
 			},
@@ -52893,7 +50176,6 @@
 			"version": "5.1.4",
 			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
 			"integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
-			"dev": true,
 			"dependencies": {
 				"@discoveryjs/json-ext": "^0.5.0",
 				"@webpack-cli/configtest": "^2.1.1",
@@ -52937,14 +50219,12 @@
 		"node_modules/webpack-cli/node_modules/colorette": {
 			"version": "2.0.20",
 			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-			"dev": true
+			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
 		},
 		"node_modules/webpack-cli/node_modules/commander": {
 			"version": "10.0.1",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
 			"integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
-			"dev": true,
 			"engines": {
 				"node": ">=14"
 			}
@@ -52953,7 +50233,6 @@
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
 			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -52967,7 +50246,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -52976,7 +50254,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -52988,7 +50265,6 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -52997,7 +50273,6 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -53008,11 +50283,98 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/webpack-dev-middleware": {
+			"version": "6.1.3",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.3.tgz",
+			"integrity": "sha512-A4ChP0Qj8oGociTs6UdlRUGANIGrCDL3y+pmQMc+dSsraXHCatFpmMey4mYELA+juqwUqwQsUgJJISXl1KWmiw==",
+			"dev": true,
+			"dependencies": {
+				"colorette": "^2.0.10",
+				"memfs": "^3.4.12",
+				"mime-types": "^2.1.31",
+				"range-parser": "^1.2.1",
+				"schema-utils": "^4.0.0"
+			},
+			"engines": {
+				"node": ">= 14.15.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"webpack": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/colorette": {
+			"version": "2.0.20",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+			"dev": true
+		},
+		"node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
 		"node_modules/webpack-dev-server": {
 			"version": "4.15.1",
 			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
 			"integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
-			"dev": true,
 			"dependencies": {
 				"@types/bonjour": "^3.5.9",
 				"@types/connect-history-api-fallback": "^1.3.5",
@@ -53068,15 +50430,15 @@
 			}
 		},
 		"node_modules/webpack-dev-server/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-			"dev": true,
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"license": "MIT",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
 				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+				"require-from-string": "^2.0.2"
 			},
 			"funding": {
 				"type": "github",
@@ -53087,7 +50449,6 @@
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
 			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.3"
 			},
@@ -53098,14 +50459,12 @@
 		"node_modules/webpack-dev-server/node_modules/colorette": {
 			"version": "2.0.20",
 			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-			"dev": true
+			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
 		},
 		"node_modules/webpack-dev-server/node_modules/ipaddr.js": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
-			"integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
-			"dev": true,
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+			"integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
 			"engines": {
 				"node": ">= 10"
 			}
@@ -53114,7 +50473,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
 			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-			"dev": true,
 			"dependencies": {
 				"is-docker": "^2.0.0"
 			},
@@ -53125,14 +50483,12 @@
 		"node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
 		},
 		"node_modules/webpack-dev-server/node_modules/open": {
 			"version": "8.4.2",
 			"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
 			"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-			"dev": true,
 			"dependencies": {
 				"define-lazy-prop": "^2.0.0",
 				"is-docker": "^2.1.1",
@@ -53149,7 +50505,6 @@
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
 			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-			"dev": true,
 			"dependencies": {
 				"@types/json-schema": "^7.0.9",
 				"ajv": "^8.9.0",
@@ -53165,10 +50520,9 @@
 			}
 		},
 		"node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-			"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
-			"dev": true,
+			"version": "5.3.4",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+			"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
 			"dependencies": {
 				"colorette": "^2.0.10",
 				"memfs": "^3.4.3",
@@ -53188,10 +50542,10 @@
 			}
 		},
 		"node_modules/webpack-dev-server/node_modules/ws": {
-			"version": "8.13.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-			"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-			"dev": true,
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			},
@@ -53209,14 +50563,13 @@
 			}
 		},
 		"node_modules/webpack-hot-middleware": {
-			"version": "2.25.1",
-			"resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.1.tgz",
-			"integrity": "sha512-Koh0KyU/RPYwel/khxbsDz9ibDivmUbrRuKSSQvW42KSDdO4w23WI3SkHpSUKHE76LrFnnM/L7JCrpBwu8AXYw==",
+			"version": "2.26.1",
+			"resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.26.1.tgz",
+			"integrity": "sha512-khZGfAeJx6I8K9zKohEWWYN6KDlVw2DHownoe+6Vtwj1LP9WFgegXnVMSkZ/dBEBtXFwrkkydsaPFlB7f8wU2A==",
 			"dev": true,
 			"dependencies": {
 				"ansi-html-community": "0.0.8",
 				"html-entities": "^2.1.0",
-				"querystring": "^0.2.0",
 				"strip-ansi": "^6.0.0"
 			}
 		},
@@ -53224,7 +50577,6 @@
 			"version": "5.8.0",
 			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
 			"integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-			"dev": true,
 			"dependencies": {
 				"clone-deep": "^4.0.1",
 				"wildcard": "^2.0.0"
@@ -53237,22 +50589,20 @@
 			"version": "3.2.3",
 			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
 			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-			"dev": true,
 			"engines": {
 				"node": ">=10.13.0"
 			}
 		},
-		"node_modules/webpack/node_modules/@types/estree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
-			"integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
+		"node_modules/webpack-virtual-modules": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
+			"integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
 			"dev": true
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/ast": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-			"integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
-			"dev": true,
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+			"integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
 			"dependencies": {
 				"@webassemblyjs/helper-numbers": "1.11.6",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
@@ -53261,38 +50611,33 @@
 		"node_modules/webpack/node_modules/@webassemblyjs/helper-api-error": {
 			"version": "1.11.6",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-			"dev": true
+			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/helper-buffer": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-			"integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
-			"dev": true
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+			"integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw=="
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-bytecode": {
 			"version": "1.11.6",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-			"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-			"dev": true
+			"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-section": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-			"integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
-			"dev": true,
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+			"integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6"
+				"@webassemblyjs/wasm-gen": "1.12.1"
 			}
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/ieee754": {
 			"version": "1.11.6",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
 			"integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
-			"dev": true,
 			"dependencies": {
 				"@xtuc/ieee754": "^1.2.0"
 			}
@@ -53301,7 +50646,6 @@
 			"version": "1.11.6",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
 			"integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
-			"dev": true,
 			"dependencies": {
 				"@xtuc/long": "4.2.2"
 			}
@@ -53309,32 +50653,29 @@
 		"node_modules/webpack/node_modules/@webassemblyjs/utf8": {
 			"version": "1.11.6",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-			"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-			"dev": true
+			"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/wasm-edit": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-			"integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
-			"dev": true,
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+			"integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/helper-wasm-section": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6",
-				"@webassemblyjs/wasm-opt": "1.11.6",
-				"@webassemblyjs/wasm-parser": "1.11.6",
-				"@webassemblyjs/wast-printer": "1.11.6"
+				"@webassemblyjs/helper-wasm-section": "1.12.1",
+				"@webassemblyjs/wasm-gen": "1.12.1",
+				"@webassemblyjs/wasm-opt": "1.12.1",
+				"@webassemblyjs/wasm-parser": "1.12.1",
+				"@webassemblyjs/wast-printer": "1.12.1"
 			}
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/wasm-gen": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-			"integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
-			"dev": true,
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+			"integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
 				"@webassemblyjs/ieee754": "1.11.6",
 				"@webassemblyjs/leb128": "1.11.6",
@@ -53342,24 +50683,22 @@
 			}
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/wasm-opt": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-			"integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
-			"dev": true,
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+			"integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6",
-				"@webassemblyjs/wasm-parser": "1.11.6"
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
+				"@webassemblyjs/wasm-gen": "1.12.1",
+				"@webassemblyjs/wasm-parser": "1.12.1"
 			}
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/wasm-parser": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-			"integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
-			"dev": true,
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+			"integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
 				"@webassemblyjs/helper-api-error": "1.11.6",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
 				"@webassemblyjs/ieee754": "1.11.6",
@@ -53368,20 +50707,19 @@
 			}
 		},
 		"node_modules/webpack/node_modules/@webassemblyjs/wast-printer": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-			"integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
-			"dev": true,
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+			"integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
 				"@xtuc/long": "4.2.2"
 			}
 		},
 		"node_modules/webpack/node_modules/acorn": {
-			"version": "8.10.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-			"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-			"dev": true,
+			"version": "8.13.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+			"integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -53393,7 +50731,6 @@
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -53406,10 +50743,10 @@
 			}
 		},
 		"node_modules/webpack/node_modules/enhanced-resolve": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-			"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
-			"dev": true,
+			"version": "5.17.1",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+			"integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+			"license": "MIT",
 			"dependencies": {
 				"graceful-fs": "^4.2.4",
 				"tapable": "^2.2.0"
@@ -53422,7 +50759,6 @@
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
 			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-			"dev": true,
 			"dependencies": {
 				"esrecurse": "^4.3.0",
 				"estraverse": "^4.1.1"
@@ -53435,7 +50771,6 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
 			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-			"dev": true,
 			"engines": {
 				"node": ">=6.11.5"
 			}
@@ -53444,7 +50779,6 @@
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
 			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dev": true,
 			"dependencies": {
 				"@types/json-schema": "^7.0.8",
 				"ajv": "^6.12.5",
@@ -53462,16 +50796,15 @@
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
 			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/webpack/node_modules/watchpack": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-			"dev": true,
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+			"license": "MIT",
 			"dependencies": {
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.1.2"
@@ -53484,7 +50817,6 @@
 			"version": "0.7.4",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
 			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-			"dev": true,
 			"dependencies": {
 				"http-parser-js": ">=0.5.1",
 				"safe-buffer": ">=5.1.0",
@@ -53498,42 +50830,38 @@
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
 			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.8.0"
 			}
 		},
 		"node_modules/whatwg-encoding": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-			"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-			"dev": true,
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+			"integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
 			"dependencies": {
 				"iconv-lite": "0.6.3"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/whatwg-fetch": {
-			"version": "3.6.17",
-			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz",
-			"integrity": "sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ=="
+			"version": "3.6.20",
+			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
+			"integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
 		},
 		"node_modules/whatwg-mimetype": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-			"integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-			"dev": true,
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+			"integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/whatwg-url": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
 			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-			"dev": true,
 			"dependencies": {
 				"tr46": "~0.0.3",
 				"webidl-conversions": "^3.0.0"
@@ -53575,7 +50903,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
 			"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-			"dev": true,
 			"dependencies": {
 				"is-bigint": "^1.0.1",
 				"is-boolean-object": "^1.1.0",
@@ -53611,7 +50938,6 @@
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
 			"integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
-			"dev": true,
 			"dependencies": {
 				"available-typed-arrays": "^1.0.5",
 				"call-bind": "^1.0.2",
@@ -53626,11 +50952,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/wicg-inert": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.2.tgz",
-			"integrity": "sha512-Ba9tGNYxXwaqKEi9sJJvPMKuo063umUPsHN0JJsjrs2j8KDSzkWLMZGZ+MH1Jf1Fq4OWZ5HsESJID6nRza2ang=="
-		},
 		"node_modules/wide-align": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
@@ -53643,8 +50964,7 @@
 		"node_modules/wildcard": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-			"integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-			"dev": true
+			"integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
 		},
 		"node_modules/windows-release": {
 			"version": "3.2.0",
@@ -53705,10 +51025,11 @@
 			}
 		},
 		"node_modules/windows-release/node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
@@ -53799,11 +51120,18 @@
 				"node": ">= 6"
 			}
 		},
+		"node_modules/word-wrap": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/wordwrap": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-			"integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-			"dev": true
+			"integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="
 		},
 		"node_modules/worker-farm": {
 			"version": "1.7.0",
@@ -53919,7 +51247,6 @@
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz",
 			"integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==",
-			"dev": true,
 			"dependencies": {
 				"detect-indent": "^5.0.0",
 				"graceful-fs": "^4.1.15",
@@ -53936,7 +51263,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
 			"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-			"dev": true,
 			"dependencies": {
 				"pify": "^4.0.1",
 				"semver": "^5.6.0"
@@ -53949,7 +51275,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
 			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -53958,7 +51283,6 @@
 			"version": "5.7.2",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
 			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"dev": true,
 			"bin": {
 				"semver": "bin/semver"
 			}
@@ -53967,7 +51291,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz",
 			"integrity": "sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==",
-			"dev": true,
 			"dependencies": {
 				"sort-keys": "^2.0.0",
 				"type-fest": "^0.4.1",
@@ -53981,15 +51304,15 @@
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz",
 			"integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==",
-			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/ws": {
-			"version": "7.5.9",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-			"integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+			"version": "7.5.10",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+			"integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=8.3.0"
 			},
@@ -54009,14 +51332,12 @@
 		"node_modules/x-is-string": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
-			"integrity": "sha512-GojqklwG8gpzOVEVki5KudKNoq7MbbjYZCbyWzEz7tyPA7eleiE0+ePwOWQQRb5fm86rD3S8Tc0tSFf3AOv50w==",
-			"dev": true
+			"integrity": "sha512-GojqklwG8gpzOVEVki5KudKNoq7MbbjYZCbyWzEz7tyPA7eleiE0+ePwOWQQRb5fm86rD3S8Tc0tSFf3AOv50w=="
 		},
 		"node_modules/xdg-basedir": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
 			"integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -54028,12 +51349,11 @@
 			"dev": true
 		},
 		"node_modules/xml-name-validator": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-			"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-			"dev": true,
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+			"integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/xmlbuilder": {
@@ -54048,8 +51368,7 @@
 		"node_modules/xmlchars": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-			"dev": true
+			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
 		},
 		"node_modules/xtend": {
 			"version": "4.0.2",
@@ -54117,8 +51436,7 @@
 		"node_modules/yallist": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-			"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-			"dev": true
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
 		},
 		"node_modules/yaml": {
 			"version": "1.10.2",
@@ -54147,10 +51465,9 @@
 			}
 		},
 		"node_modules/yargs-parser": {
-			"version": "20.2.9",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-			"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-			"dev": true,
+			"version": "20.2.4",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
 			"engines": {
 				"node": ">=10"
 			}
@@ -54225,7 +51542,6 @@
 			"version": "2.10.0",
 			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
 			"integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-			"dev": true,
 			"dependencies": {
 				"buffer-crc32": "~0.2.3",
 				"fd-slicer": "~1.1.0"
@@ -54296,42 +51612,43 @@
 			}
 		},
 		"node_modules/zod": {
-			"version": "3.20.2",
-			"resolved": "https://registry.npmjs.org/zod/-/zod-3.20.2.tgz",
-			"integrity": "sha512-1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ==",
-			"dev": true,
+			"version": "3.23.8",
+			"resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+			"integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/colinhacks"
 			}
 		},
 		"packages/a11y": {
 			"name": "@wordpress/a11y",
-			"version": "3.47.0",
+			"version": "4.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/dom-ready": "file:../dom-ready",
-				"@wordpress/i18n": "file:../i18n"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/dom-ready": "*",
+				"@wordpress/i18n": "*"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
 		"packages/annotations": {
 			"name": "@wordpress/annotations",
-			"version": "2.47.0",
+			"version": "3.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/data": "file:../data",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/rich-text": "file:../rich-text",
-				"rememo": "^4.0.2",
+				"@babel/runtime": "7.25.7",
+				"@wordpress/data": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/rich-text": "*",
 				"uuid": "^9.0.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
 				"react": "^18.0.0"
@@ -54347,44 +51664,45 @@
 		},
 		"packages/api-fetch": {
 			"name": "@wordpress/api-fetch",
-			"version": "6.44.0",
+			"version": "7.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/url": "file:../url"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/i18n": "*",
+				"@wordpress/url": "*"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
 		"packages/autop": {
 			"name": "@wordpress/autop",
-			"version": "3.47.0",
+			"version": "4.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/runtime": "7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
 		"packages/babel-plugin-import-jsx-pragma": {
 			"name": "@wordpress/babel-plugin-import-jsx-pragma",
-			"version": "4.30.0",
-			"dev": true,
+			"version": "5.10.0",
 			"license": "GPL-2.0-or-later",
 			"engines": {
-				"node": ">=14"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.12.9"
+				"@babel/core": "^7.25.7"
 			}
 		},
 		"packages/babel-plugin-makepot": {
 			"name": "@wordpress/babel-plugin-makepot",
-			"version": "5.31.0",
-			"dev": true,
+			"version": "6.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"deepmerge": "^4.3.0",
@@ -54392,44492 +51710,4335 @@
 				"is-plain-object": "^5.0.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.12.9"
+				"@babel/core": "^7.25.7"
 			}
 		},
 		"packages/babel-preset-default": {
 			"name": "@wordpress/babel-preset-default",
-			"version": "7.31.0",
-			"dev": true,
+			"version": "8.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/core": "^7.16.0",
-				"@babel/plugin-transform-react-jsx": "^7.16.0",
-				"@babel/plugin-transform-runtime": "^7.16.0",
-				"@babel/preset-env": "^7.16.0",
-				"@babel/preset-typescript": "^7.16.0",
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/babel-plugin-import-jsx-pragma": "file:../babel-plugin-import-jsx-pragma",
-				"@wordpress/browserslist-config": "file:../browserslist-config",
-				"@wordpress/warning": "file:../warning",
+				"@babel/core": "7.25.7",
+				"@babel/plugin-transform-react-jsx": "7.25.7",
+				"@babel/plugin-transform-runtime": "7.25.7",
+				"@babel/preset-env": "7.25.7",
+				"@babel/preset-typescript": "7.25.7",
+				"@babel/runtime": "7.25.7",
+				"@wordpress/browserslist-config": "*",
+				"@wordpress/warning": "*",
 				"browserslist": "^4.21.10",
 				"core-js": "^3.31.0",
-				"react": "^18.2.0"
+				"react": "^18.3.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/base-styles": {
-			"name": "@wordpress/base-styles",
-			"version": "4.38.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later"
-		},
-		"packages/blob": {
-			"name": "@wordpress/blob",
-			"version": "3.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz",
+			"integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/traverse": "^7.25.7",
+				"@babel/types": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			}
 		},
-		"packages/block-directory": {
-			"name": "@wordpress/block-directory",
-			"version": "4.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/helper-create-class-features-plugin": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz",
+			"integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/edit-post": "file:../edit-post",
-				"@wordpress/editor": "file:../editor",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url",
-				"change-case": "^4.1.2"
+				"@babel/helper-annotate-as-pure": "^7.25.7",
+				"@babel/helper-member-expression-to-functions": "^7.25.7",
+				"@babel/helper-optimise-call-expression": "^7.25.7",
+				"@babel/helper-replace-supers": "^7.25.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
+				"@babel/traverse": "^7.25.7",
+				"semver": "^6.3.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"packages/block-editor": {
-			"name": "@wordpress/block-editor",
-			"version": "12.15.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/helper-member-expression-to-functions": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz",
+			"integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@emotion/react": "^11.7.1",
-				"@emotion/styled": "^11.6.0",
-				"@react-spring/web": "^9.4.5",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/style-engine": "file:../style-engine",
-				"@wordpress/token-list": "file:../token-list",
-				"@wordpress/url": "file:../url",
-				"@wordpress/warning": "file:../warning",
-				"@wordpress/wordcount": "file:../wordcount",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.7.0",
-				"deepmerge": "^4.3.0",
-				"diff": "^4.0.2",
-				"dom-scroll-into-view": "^1.2.1",
-				"fast-deep-equal": "^3.1.3",
-				"memize": "^2.1.0",
-				"postcss": "^8.4.21",
-				"postcss-prefixwrap": "^1.41.0",
-				"postcss-urlrebase": "^1.0.0",
-				"react-autosize-textarea": "^7.1.0",
-				"react-easy-crop": "^4.5.1",
-				"rememo": "^4.0.2",
-				"remove-accents": "^0.5.0"
+				"@babel/traverse": "^7.25.7",
+				"@babel/types": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
-			},
-			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"node": ">=6.9.0"
 			}
 		},
-		"packages/block-editor/node_modules/postcss": {
-			"version": "8.4.30",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
-			"integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/postcss"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
+		"packages/babel-preset-default/node_modules/@babel/helper-optimise-call-expression": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz",
+			"integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==",
+			"license": "MIT",
 			"dependencies": {
-				"nanoid": "^3.3.6",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
+				"@babel/types": "^7.25.7"
 			},
 			"engines": {
-				"node": "^10 || ^12 || >=14"
-			}
-		},
-		"packages/block-editor/node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=6.9.0"
 			}
 		},
-		"packages/block-library": {
-			"name": "@wordpress/block-library",
-			"version": "8.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/helper-replace-supers": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz",
+			"integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/autop": "file:../autop",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interactivity": "file:../interactivity",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/primitives": "file:../primitives",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/reusable-blocks": "file:../reusable-blocks",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/server-side-render": "file:../server-side-render",
-				"@wordpress/url": "file:../url",
-				"@wordpress/viewport": "file:../viewport",
-				"@wordpress/wordcount": "file:../wordcount",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.7.0",
-				"escape-html": "^1.0.3",
-				"fast-average-color": "^9.1.1",
-				"fast-deep-equal": "^3.1.3",
-				"memize": "^2.1.0",
-				"remove-accents": "^0.5.0",
-				"uuid": "^9.0.1"
+				"@babel/helper-member-expression-to-functions": "^7.25.7",
+				"@babel/helper-optimise-call-expression": "^7.25.7",
+				"@babel/traverse": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
-			}
-		},
-		"packages/block-library/node_modules/uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"bin": {
-				"uuid": "dist/bin/uuid"
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"packages/block-serialization-default-parser": {
-			"name": "@wordpress/block-serialization-default-parser",
-			"version": "4.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz",
+			"integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/traverse": "^7.25.7",
+				"@babel/types": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			}
 		},
-		"packages/block-serialization-spec-parser": {
-			"name": "@wordpress/block-serialization-spec-parser",
-			"version": "4.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz",
+			"integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==",
+			"license": "MIT",
 			"dependencies": {
-				"pegjs": "^0.10.0",
-				"phpegjs": "^1.0.0-beta7"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"packages/blocks": {
-			"name": "@wordpress/blocks",
-			"version": "12.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz",
+			"integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/autop": "file:../autop",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/block-serialization-default-parser": "file:../block-serialization-default-parser",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/shortcode": "file:../shortcode",
-				"change-case": "^4.1.2",
-				"colord": "^2.7.0",
-				"fast-deep-equal": "^3.1.3",
-				"hpq": "^1.3.0",
-				"is-plain-object": "^5.0.0",
-				"memize": "^2.1.0",
-				"rememo": "^4.0.2",
-				"remove-accents": "^0.5.0",
-				"showdown": "^1.9.1",
-				"simple-html-tokenizer": "^0.5.7",
-				"uuid": "^9.0.1"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
+				"@babel/plugin-transform-optional-chaining": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0"
-			}
-		},
-		"packages/blocks/node_modules/uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"bin": {
-				"uuid": "dist/bin/uuid"
+				"@babel/core": "^7.13.0"
 			}
 		},
-		"packages/browserslist-config": {
-			"name": "@wordpress/browserslist-config",
-			"version": "5.30.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.7.tgz",
+			"integrity": "sha512-UVATLMidXrnH+GMUIuxq55nejlj02HP7F5ETyBONzP6G87fPBogG4CH6kxrSrdIuAjdwNO9VzyaYsrZPscWUrw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/traverse": "^7.25.7"
+			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"packages/commands": {
-			"name": "@wordpress/commands",
-			"version": "0.18.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-syntax-import-assertions": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz",
+			"integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/components": "file:../components",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/private-apis": "file:../private-apis",
-				"classnames": "^2.3.1",
-				"cmdk": "^0.2.0",
-				"rememo": "^4.0.2"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/components": {
-			"name": "@wordpress/components",
-			"version": "25.13.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-syntax-import-attributes": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.7.tgz",
+			"integrity": "sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==",
+			"license": "MIT",
 			"dependencies": {
-				"@ariakit/react": "^0.3.5",
-				"@babel/runtime": "^7.16.0",
-				"@emotion/cache": "^11.7.1",
-				"@emotion/css": "^11.7.1",
-				"@emotion/react": "^11.7.1",
-				"@emotion/serialize": "^1.0.2",
-				"@emotion/styled": "^11.6.0",
-				"@emotion/utils": "^1.0.0",
-				"@floating-ui/react-dom": "^2.0.1",
-				"@radix-ui/react-dropdown-menu": "2.0.4",
-				"@types/gradient-parser": "0.1.3",
-				"@types/highlight-words-core": "1.2.1",
-				"@use-gesture/react": "^10.2.24",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/primitives": "file:../primitives",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/warning": "file:../warning",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.7.0",
-				"date-fns": "^2.28.0",
-				"deepmerge": "^4.3.0",
-				"dom-scroll-into-view": "^1.2.1",
-				"downshift": "^6.0.15",
-				"fast-deep-equal": "^3.1.3",
-				"framer-motion": "^10.13.0",
-				"gradient-parser": "^0.1.5",
-				"highlight-words-core": "^1.2.2",
-				"is-plain-object": "^5.0.0",
-				"memize": "^2.1.0",
-				"path-to-regexp": "^6.2.1",
-				"re-resizable": "^6.4.0",
-				"react-colorful": "^5.3.1",
-				"reakit": "^1.3.11",
-				"remove-accents": "^0.5.0",
-				"use-lilius": "^2.0.1",
-				"uuid": "^9.0.1",
-				"valtio": "1.7.0"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/components/node_modules/@floating-ui/react-dom": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.1.tgz",
-			"integrity": "sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==",
+		"packages/babel-preset-default/node_modules/@babel/plugin-syntax-typescript": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.7.tgz",
+			"integrity": "sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==",
+			"license": "MIT",
 			"dependencies": {
-				"@floating-ui/dom": "^1.3.0"
+				"@babel/helper-plugin-utils": "^7.25.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": ">=16.8.0",
-				"react-dom": ">=16.8.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/components/node_modules/@types/gradient-parser": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@types/gradient-parser/-/gradient-parser-0.1.3.tgz",
-			"integrity": "sha512-XDbrTSBlQV9nxE1GiDL3FaOPy4G/KaJkhDutBX48Kg8CYZMBARyyDFGCWfWJn4pobmInmwud1xxH7VJMAr0CKQ=="
-		},
-		"packages/components/node_modules/framer-motion": {
-			"version": "10.13.0",
-			"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.13.0.tgz",
-			"integrity": "sha512-xKhw9VCizmwEHbopOfluaoVunGHSZyMztGbTvsgOYqCjaKu6qtlwWY1J+6GhL41NY1P157JgEikjDm67XCFnvQ==",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-arrow-functions": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz",
+			"integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==",
+			"license": "MIT",
 			"dependencies": {
-				"tslib": "^2.4.0"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
-			"optionalDependencies": {
-				"@emotion/is-prop-valid": "^0.8.2"
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/components/node_modules/path-to-regexp": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
-			"integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
-		},
-		"packages/components/node_modules/uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"bin": {
-				"uuid": "dist/bin/uuid"
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-async-to-generator": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.7.tgz",
+			"integrity": "sha512-ZUCjAavsh5CESCmi/xCpX1qcCaAglzs/7tmuvoFnJgA1dM7gQplsguljoTg+Ru8WENpX89cQyAtWoaE0I3X3Pg==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-remap-async-to-generator": "^7.25.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/compose": {
-			"name": "@wordpress/compose",
-			"version": "6.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-block-scoped-functions": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz",
+			"integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@types/mousetrap": "^1.6.8",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/priority-queue": "file:../priority-queue",
-				"@wordpress/undo-manager": "file:../undo-manager",
-				"change-case": "^4.1.2",
-				"clipboard": "^2.0.8",
-				"mousetrap": "^1.6.5",
-				"use-memo-one": "^1.1.1"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/core-commands": {
-			"name": "@wordpress/core-commands",
-			"version": "0.16.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-block-scoping": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz",
+			"integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/router": "file:../router",
-				"@wordpress/url": "file:../url"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/core-data": {
-			"name": "@wordpress/core-data",
-			"version": "6.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-class-properties": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz",
+			"integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/sync": "file:../sync",
-				"@wordpress/undo-manager": "file:../undo-manager",
-				"@wordpress/url": "file:../url",
-				"change-case": "^4.1.2",
-				"equivalent-key-map": "^0.2.2",
-				"fast-deep-equal": "^3.1.3",
-				"memize": "^2.1.0",
-				"rememo": "^4.0.2",
-				"uuid": "^9.0.1"
+				"@babel/helper-create-class-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/core-data/node_modules/uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"bin": {
-				"uuid": "dist/bin/uuid"
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-class-static-block": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.7.tgz",
+			"integrity": "sha512-rvUUtoVlkDWtDWxGAiiQj0aNktTPn3eFynBcMC2IhsXweehwgdI9ODe+XjWw515kEmv22sSOTp/rxIRuTiB7zg==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-create-class-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-class-static-block": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.12.0"
 			}
 		},
-		"packages/create-block": {
-			"name": "@wordpress/create-block",
-			"version": "4.31.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-classes": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz",
+			"integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==",
+			"license": "MIT",
 			"dependencies": {
-				"@wordpress/lazy-import": "file:../lazy-import",
-				"chalk": "^4.0.0",
-				"change-case": "^4.1.2",
-				"check-node-version": "^4.1.0",
-				"commander": "^9.2.0",
-				"execa": "^4.0.2",
-				"fast-glob": "^3.2.7",
-				"inquirer": "^7.1.0",
-				"make-dir": "^3.0.0",
-				"mustache": "^4.0.0",
-				"npm-package-arg": "^8.1.5",
-				"rimraf": "^3.0.2",
-				"write-pkg": "^4.0.0"
-			},
-			"bin": {
-				"wp-create-block": "index.js"
+				"@babel/helper-annotate-as-pure": "^7.25.7",
+				"@babel/helper-compilation-targets": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-replace-supers": "^7.25.7",
+				"@babel/traverse": "^7.25.7",
+				"globals": "^11.1.0"
 			},
 			"engines": {
-				"node": ">=14",
-				"npm": ">=6.14.4"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/create-block-tutorial-template": {
-			"name": "@wordpress/create-block-tutorial-template",
-			"version": "3.1.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later"
-		},
-		"packages/customize-widgets": {
-			"name": "@wordpress/customize-widgets",
-			"version": "4.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-computed-properties": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz",
+			"integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interface": "file:../interface",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/widgets": "file:../widgets",
-				"classnames": "^2.3.1",
-				"fast-deep-equal": "^3.1.3"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/template": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/data": {
-			"name": "@wordpress/data",
-			"version": "9.17.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-destructuring": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz",
+			"integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/priority-queue": "file:../priority-queue",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/redux-routine": "file:../redux-routine",
-				"deepmerge": "^4.3.0",
-				"equivalent-key-map": "^0.2.2",
-				"is-plain-object": "^5.0.0",
-				"is-promise": "^4.0.0",
-				"redux": "^4.1.2",
-				"rememo": "^4.0.2",
-				"use-memo-one": "^1.1.1"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/data-controls": {
-			"name": "@wordpress/data-controls",
-			"version": "3.16.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-dotall-regex": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz",
+			"integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/dataviews": {
-			"name": "@wordpress/dataviews",
-			"version": "0.1.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-duplicate-keys": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz",
+			"integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@tanstack/react-table": "^8.10.3",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/private-apis": "file:../private-apis",
-				"classnames": "^2.3.1",
-				"remove-accents": "^0.5.0"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/date": {
-			"name": "@wordpress/date",
-			"version": "4.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-dynamic-import": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.7.tgz",
+			"integrity": "sha512-UvcLuual4h7/GfylKm2IAA3aph9rwvAM2XBA0uPKU3lca+Maai4jBjjEVUS568ld6kJcgbouuumCBhMd/Yz17w==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/deprecated": "file:../deprecated",
-				"moment": "^2.29.4",
-				"moment-timezone": "^0.5.40"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/dependency-extraction-webpack-plugin": {
-			"name": "@wordpress/dependency-extraction-webpack-plugin",
-			"version": "4.30.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-exponentiation-operator": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz",
+			"integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==",
+			"license": "MIT",
 			"dependencies": {
-				"json2php": "^0.0.7",
-				"webpack-sources": "^3.2.2"
+				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"webpack": "^4.8.3 || ^5.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/deprecated": {
-			"name": "@wordpress/deprecated",
-			"version": "3.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-for-of": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz",
+			"integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "file:../hooks"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/docgen": {
-			"name": "@wordpress/docgen",
-			"version": "1.56.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-function-name": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz",
+			"integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/core": "^7.16.0",
-				"comment-parser": "^1.1.1",
-				"mdast-util-inject": "1.1.0",
-				"optionator": "0.8.2",
-				"remark": "10.0.1",
-				"remark-parse": "6.0.3",
-				"unified": "7.1.0"
+				"@babel/helper-compilation-targets": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/traverse": "^7.25.7"
 			},
-			"bin": {
-				"docgen": "bin/cli.js"
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/dom": {
-			"name": "@wordpress/dom",
-			"version": "3.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-json-strings": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.7.tgz",
+			"integrity": "sha512-Ot43PrL9TEAiCe8C/2erAjXMeVSnE/BLEx6eyrKLNFCCw5jvhTHKyHxdI1pA0kz5njZRYAnMO2KObGqOCRDYSA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/deprecated": "file:../deprecated"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-json-strings": "^7.8.3"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/dom-ready": {
-			"name": "@wordpress/dom-ready",
-			"version": "3.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-literals": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz",
+			"integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/e2e-test-utils": {
-			"name": "@wordpress/e2e-test-utils",
-			"version": "10.18.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-logical-assignment-operators": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.7.tgz",
+			"integrity": "sha512-iImzbA55BjiovLyG2bggWS+V+OLkaBorNvc/yJoeeDQGztknRnDdYfp2d/UPmunZYEnZi6Lg8QcTmNMHOB0lGA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/url": "file:../url",
-				"change-case": "^4.1.2",
-				"form-data": "^4.0.0",
-				"node-fetch": "^2.6.0"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"jest": ">=29",
-				"puppeteer-core": ">=11"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/e2e-test-utils-playwright": {
-			"name": "@wordpress/e2e-test-utils-playwright",
-			"version": "0.15.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-member-expression-literals": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz",
+			"integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==",
+			"license": "MIT",
 			"dependencies": {
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/url": "file:../url",
-				"change-case": "^4.1.2",
-				"form-data": "^4.0.0",
-				"get-port": "^5.1.1",
-				"lighthouse": "^10.4.0",
-				"mime": "^3.0.0",
-				"web-vitals": "^3.5.0"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@playwright/test": ">=1"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/e2e-tests": {
-			"name": "@wordpress/e2e-tests",
-			"version": "7.18.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-modules-amd": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz",
+			"integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==",
+			"license": "MIT",
 			"dependencies": {
-				"@wordpress/e2e-test-utils": "file:../e2e-test-utils",
-				"@wordpress/interactivity": "file:../interactivity",
-				"@wordpress/jest-console": "file:../jest-console",
-				"@wordpress/jest-puppeteer-axe": "file:../jest-puppeteer-axe",
-				"@wordpress/scripts": "file:../scripts",
-				"@wordpress/url": "file:../url",
-				"chalk": "^4.0.0",
-				"expect-puppeteer": "^4.4.0",
-				"filenamify": "^4.2.0",
-				"jest-message-util": "^29.6.2",
-				"jest-snapshot": "^29.6.2",
-				"puppeteer-testing-library": "^0.5.0",
-				"uuid": "^9.0.1"
+				"@babel/helper-module-transforms": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"jest": ">=29",
-				"puppeteer-core": ">=11",
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
-			}
-		},
-		"packages/e2e-tests/node_modules/uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"dev": true,
-			"bin": {
-				"uuid": "dist/bin/uuid"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/edit-post": {
-			"name": "@wordpress/edit-post",
-			"version": "7.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-modules-commonjs": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz",
+			"integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-commands": "file:../core-commands",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/editor": "file:../editor",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interface": "file:../interface",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url",
-				"@wordpress/viewport": "file:../viewport",
-				"@wordpress/warning": "file:../warning",
-				"@wordpress/widgets": "file:../widgets",
-				"classnames": "^2.3.1",
-				"memize": "^2.1.0",
-				"rememo": "^4.0.2"
+				"@babel/helper-module-transforms": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-simple-access": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/edit-site": {
-			"name": "@wordpress/edit-site",
-			"version": "5.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-modules-systemjs": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz",
+			"integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-commands": "file:../core-commands",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/dataviews": "file:../dataviews",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/editor": "file:../editor",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interface": "file:../interface",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/patterns": "file:../patterns",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/primitives": "file:../primitives",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/reusable-blocks": "file:../reusable-blocks",
-				"@wordpress/router": "file:../router",
-				"@wordpress/style-engine": "file:../style-engine",
-				"@wordpress/url": "file:../url",
-				"@wordpress/viewport": "file:../viewport",
-				"@wordpress/widgets": "file:../widgets",
-				"@wordpress/wordcount": "file:../wordcount",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.9.2",
-				"deepmerge": "^4.3.0",
-				"fast-deep-equal": "^3.1.3",
-				"is-plain-object": "^5.0.0",
-				"memize": "^2.1.0",
-				"react-autosize-textarea": "^7.1.0",
-				"rememo": "^4.0.2",
-				"remove-accents": "^0.5.0"
+				"@babel/helper-module-transforms": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-validator-identifier": "^7.25.7",
+				"@babel/traverse": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/edit-widgets": {
-			"name": "@wordpress/edit-widgets",
-			"version": "5.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-modules-umd": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz",
+			"integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interface": "file:../interface",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/patterns": "file:../patterns",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/reusable-blocks": "file:../reusable-blocks",
-				"@wordpress/url": "file:../url",
-				"@wordpress/widgets": "file:../widgets",
-				"classnames": "^2.3.1"
+				"@babel/helper-module-transforms": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/editor": {
-			"name": "@wordpress/editor",
-			"version": "13.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz",
+			"integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/patterns": "file:../patterns",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/reusable-blocks": "file:../reusable-blocks",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/server-side-render": "file:../server-side-render",
-				"@wordpress/url": "file:../url",
-				"@wordpress/wordcount": "file:../wordcount",
-				"classnames": "^2.3.1",
-				"date-fns": "^2.28.0",
-				"memize": "^2.1.0",
-				"react-autosize-textarea": "^7.1.0",
-				"rememo": "^4.0.2",
-				"remove-accents": "^0.5.0"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"packages/element": {
-			"name": "@wordpress/element",
-			"version": "5.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-new-target": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz",
+			"integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@types/react": "^18.0.21",
-				"@types/react-dom": "^18.0.6",
-				"@wordpress/escape-html": "file:../escape-html",
-				"change-case": "^4.1.2",
-				"is-plain-object": "^5.0.0",
-				"react": "^18.2.0",
-				"react-dom": "^18.2.0"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
-			}
-		},
-		"packages/env": {
-			"name": "@wordpress/env",
-			"version": "8.13.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"copy-dir": "^1.3.0",
-				"docker-compose": "^0.24.3",
-				"extract-zip": "^1.6.7",
-				"got": "^11.8.5",
-				"inquirer": "^7.1.0",
-				"js-yaml": "^3.13.1",
-				"ora": "^4.0.2",
-				"rimraf": "^3.0.2",
-				"simple-git": "^3.5.0",
-				"terminal-link": "^2.0.0",
-				"yargs": "^17.3.0"
+				"node": ">=6.9.0"
 			},
-			"bin": {
-				"wp-env": "bin/wp-env"
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/env/node_modules/cliui": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-			"dev": true,
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.7.tgz",
+			"integrity": "sha512-FbuJ63/4LEL32mIxrxwYaqjJxpbzxPVQj5a+Ebrc8JICV6YX8nE53jY+K0RZT3um56GoNWgkS2BQ/uLGTjtwfw==",
+			"license": "MIT",
 			"dependencies": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.1",
-				"wrap-ansi": "^7.0.0"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
 			},
 			"engines": {
-				"node": ">=12"
-			}
-		},
-		"packages/env/node_modules/docker-compose": {
-			"version": "0.24.2",
-			"resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.2.tgz",
-			"integrity": "sha512-2/WLvA7UZ6A2LDLQrYW0idKipmNBWhtfvrn2yzjC5PnHDzuFVj1zAZN6MJxVMKP0zZH8uzAK6OwVZYHGuyCmTw==",
-			"dev": true,
-			"dependencies": {
-				"yaml": "^2.2.2"
+				"node": ">=6.9.0"
 			},
-			"engines": {
-				"node": ">= 6.0.0"
-			}
-		},
-		"packages/env/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
-		},
-		"packages/env/node_modules/is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/env/node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-numeric-separator": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.7.tgz",
+			"integrity": "sha512-8CbutzSSh4hmD+jJHIA8vdTNk15kAzOnFLVVgBSMGr28rt85ouT01/rezMecks9pkU939wDInImwCKv4ahU4IA==",
+			"license": "MIT",
 			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/env/node_modules/wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-object-rest-spread": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.7.tgz",
+			"integrity": "sha512-1JdVKPhD7Y5PvgfFy0Mv2brdrolzpzSoUq2pr6xsR+m+3viGGeHEokFKsCgOkbeFOQxfB1Vt2F0cPJLRpFI4Zg==",
+			"license": "MIT",
 			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
+				"@babel/helper-compilation-targets": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-transform-parameters": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=6.9.0"
 			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"packages/env/node_modules/y18n": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true
-		},
-		"packages/env/node_modules/yaml": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz",
-			"integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 14"
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/env/node_modules/yargs": {
-			"version": "17.7.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-			"dev": true,
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-object-super": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz",
+			"integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==",
+			"license": "MIT",
 			"dependencies": {
-				"cliui": "^8.0.1",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.3",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^21.1.1"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-replace-supers": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
-			}
-		},
-		"packages/env/node_modules/yargs-parser": {
-			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"dev": true
-		},
-		"packages/escape-html": {
-			"name": "@wordpress/escape-html",
-			"version": "2.47.0",
-			"license": "GPL-2.0-or-later",
-			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"node": ">=6.9.0"
 			},
-			"engines": {
-				"node": ">=12"
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/eslint-plugin": {
-			"name": "@wordpress/eslint-plugin",
-			"version": "17.4.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-optional-catch-binding": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.7.tgz",
+			"integrity": "sha512-m9obYBA39mDPN7lJzD5WkGGb0GO54PPLXsbcnj1Hyeu8mSRz7Gb4b1A6zxNX32ZuUySDK4G6it8SDFWD1nCnqg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/eslint-parser": "^7.16.0",
-				"@typescript-eslint/eslint-plugin": "^6.4.1",
-				"@typescript-eslint/parser": "^6.4.1",
-				"@wordpress/babel-preset-default": "file:../babel-preset-default",
-				"@wordpress/prettier-config": "file:../prettier-config",
-				"cosmiconfig": "^7.0.0",
-				"eslint-config-prettier": "^8.3.0",
-				"eslint-plugin-import": "^2.25.2",
-				"eslint-plugin-jest": "^27.2.3",
-				"eslint-plugin-jsdoc": "^46.4.6",
-				"eslint-plugin-jsx-a11y": "^6.5.1",
-				"eslint-plugin-playwright": "^0.15.3",
-				"eslint-plugin-prettier": "^5.0.0",
-				"eslint-plugin-react": "^7.27.0",
-				"eslint-plugin-react-hooks": "^4.3.0",
-				"globals": "^13.12.0",
-				"requireindex": "^1.2.0"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
 			},
 			"engines": {
-				"node": ">=14",
-				"npm": ">=6.14.4"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": ">=7",
-				"eslint": ">=8",
-				"prettier": ">=3",
-				"typescript": ">=4"
-			},
-			"peerDependenciesMeta": {
-				"prettier": {
-					"optional": true
-				},
-				"typescript": {
-					"optional": true
-				}
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/format-library": {
-			"name": "@wordpress/format-library",
-			"version": "4.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-optional-chaining": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.7.tgz",
+			"integrity": "sha512-h39agClImgPWg4H8mYVAbD1qP9vClFbEjqoJmt87Zen8pjqK8FTPUwrOXAvqu5soytwxrLMd2fx2KSCp2CHcNg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/url": "file:../url"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/hooks": {
-			"name": "@wordpress/hooks",
-			"version": "3.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-parameters": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz",
+			"integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
-			}
-		},
-		"packages/html-entities": {
-			"name": "@wordpress/html-entities",
-			"version": "3.47.0",
-			"license": "GPL-2.0-or-later",
-			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"node": ">=6.9.0"
 			},
-			"engines": {
-				"node": ">=12"
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/i18n": {
-			"name": "@wordpress/i18n",
-			"version": "4.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-private-methods": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz",
+			"integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "file:../hooks",
-				"gettext-parser": "^1.3.1",
-				"memize": "^2.1.0",
-				"sprintf-js": "^1.1.1",
-				"tannin": "^1.2.0"
-			},
-			"bin": {
-				"pot-to-php": "tools/pot-to-php.js"
+				"@babel/helper-create-class-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/icons": {
-			"name": "@wordpress/icons",
-			"version": "9.38.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-private-property-in-object": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.7.tgz",
+			"integrity": "sha512-LzA5ESzBy7tqj00Yjey9yWfs3FKy4EmJyKOSWld144OxkTji81WWnUT8nkLUn+imN/zHL8ZQlOu/MTUAhHaX3g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "file:../element",
-				"@wordpress/primitives": "file:../primitives"
+				"@babel/helper-annotate-as-pure": "^7.25.7",
+				"@babel/helper-create-class-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/interactivity": {
-			"name": "@wordpress/interactivity",
-			"version": "3.0.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-property-literals": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz",
+			"integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==",
+			"license": "MIT",
 			"dependencies": {
-				"@preact/signals": "^1.1.3",
-				"deepsignal": "^1.3.6",
-				"preact": "^10.13.2"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/interface": {
-			"name": "@wordpress/interface",
-			"version": "5.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-react-jsx": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.7.tgz",
+			"integrity": "sha512-vILAg5nwGlR9EXE8JIOX4NHXd49lrYbN8hnjffDtoULwpL9hUx/N55nqh2qd0q6FyNDfjl9V79ecKGvFbcSA0Q==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/viewport": "file:../viewport",
-				"classnames": "^2.3.1"
+				"@babel/helper-annotate-as-pure": "^7.25.7",
+				"@babel/helper-module-imports": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/plugin-syntax-jsx": "^7.25.7",
+				"@babel/types": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/is-shallow-equal": {
-			"name": "@wordpress/is-shallow-equal",
-			"version": "4.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-regenerator": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz",
+			"integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"regenerator-transform": "^0.15.2"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/jest-console": {
-			"name": "@wordpress/jest-console",
-			"version": "7.18.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-reserved-words": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz",
+			"integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"jest-matcher-utils": "^29.6.2"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"jest": ">=29"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/jest-preset-default": {
-			"name": "@wordpress/jest-preset-default",
-			"version": "11.18.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-runtime": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.7.tgz",
+			"integrity": "sha512-Y9p487tyTzB0yDYQOtWnC+9HGOuogtP3/wNpun1xJXEEvI6vip59BSBTsHnekZLqxmPcgsrAKt46HAAb//xGhg==",
+			"license": "MIT",
 			"dependencies": {
-				"@wordpress/jest-console": "file:../jest-console",
-				"babel-jest": "^29.6.2"
+				"@babel/helper-module-imports": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"babel-plugin-polyfill-corejs2": "^0.4.10",
+				"babel-plugin-polyfill-corejs3": "^0.10.6",
+				"babel-plugin-polyfill-regenerator": "^0.6.1",
+				"semver": "^6.3.1"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": ">=7",
-				"jest": ">=29"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/jest-puppeteer-axe": {
-			"name": "@wordpress/jest-puppeteer-axe",
-			"version": "6.18.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-shorthand-properties": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz",
+			"integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==",
+			"license": "MIT",
 			"dependencies": {
-				"@axe-core/puppeteer": "^4.0.0",
-				"@babel/runtime": "^7.16.0"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"jest": ">=29",
-				"puppeteer": ">=11"
-			},
-			"peerDependenciesMeta": {
-				"puppeteer": {
-					"optional": true
-				}
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/keyboard-shortcuts": {
-			"name": "@wordpress/keyboard-shortcuts",
-			"version": "4.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-spread": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz",
+			"integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/keycodes": "file:../keycodes",
-				"rememo": "^4.0.2"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/keycodes": {
-			"name": "@wordpress/keycodes",
-			"version": "3.47.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-sticky-regex": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz",
+			"integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/i18n": "file:../i18n",
-				"change-case": "^4.1.2"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/lazy-import": {
-			"name": "@wordpress/lazy-import",
-			"version": "1.34.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-template-literals": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz",
+			"integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==",
+			"license": "MIT",
 			"dependencies": {
-				"execa": "^4.0.2",
-				"npm-package-arg": "^8.1.5",
-				"semver": "^7.3.5"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"npm": ">=6.9.0"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/list-reusable-blocks": {
-			"name": "@wordpress/list-reusable-blocks",
-			"version": "4.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-typeof-symbol": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz",
+			"integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"change-case": "^4.1.2"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/media-utils": {
-			"name": "@wordpress/media-utils",
-			"version": "4.38.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-typescript": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.7.tgz",
+			"integrity": "sha512-VKlgy2vBzj8AmEzunocMun2fF06bsSWV+FvVXohtL6FGve/+L217qhHxRTVGHEDO/YR8IANcjzgJsd04J8ge5Q==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n"
+				"@babel/helper-annotate-as-pure": "^7.25.7",
+				"@babel/helper-create-class-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
+				"@babel/plugin-syntax-typescript": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/notices": {
-			"name": "@wordpress/notices",
-			"version": "4.15.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-unicode-escapes": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz",
+			"integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/data": "file:../data"
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/npm-package-json-lint-config": {
-			"name": "@wordpress/npm-package-json-lint-config",
-			"version": "4.32.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-unicode-property-regex": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.7.tgz",
+			"integrity": "sha512-IWfR89zcEPQGB/iB408uGtSPlQd3Jpq11Im86vUgcmSTcoWAiQMCTOa2K2yNNqFJEBVICKhayctee65Ka8OB0w==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
+			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"npm-package-json-lint": ">=6.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/nux": {
-			"name": "@wordpress/nux",
-			"version": "8.9.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-unicode-regex": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz",
+			"integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"rememo": "^4.0.2"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/patterns": {
-			"name": "@wordpress/patterns",
-			"version": "1.8.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/plugin-transform-unicode-sets-regex": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.7.tgz",
+			"integrity": "sha512-YRW8o9vzImwmh4Q3Rffd09bH5/hvY0pxg+1H1i0f7APoUeg12G7+HhLj9ZFNIrYkgBXhIijPJ+IXypN0hLTIbw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url",
-				"nanoid": "^3.3.4"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=16.0.0"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"packages/plugins": {
-			"name": "@wordpress/plugins",
-			"version": "6.15.0",
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/preset-env": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.7.tgz",
+			"integrity": "sha512-Gibz4OUdyNqqLj+7OAvBZxOD7CklCtMA5/j0JgUEwOnaRULsPDXmic2iKxL2DX2vQduPR5wH2hjZas/Vr/Oc0g==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"memize": "^2.0.1"
+				"@babel/compat-data": "^7.25.7",
+				"@babel/helper-compilation-targets": "^7.25.7",
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-validator-option": "^7.25.7",
+				"@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.7",
+				"@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.7",
+				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.7",
+				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.7",
+				"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.7",
+				"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-class-properties": "^7.12.13",
+				"@babel/plugin-syntax-class-static-block": "^7.14.5",
+				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
+				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+				"@babel/plugin-syntax-import-assertions": "^7.25.7",
+				"@babel/plugin-syntax-import-attributes": "^7.25.7",
+				"@babel/plugin-syntax-import-meta": "^7.10.4",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+				"@babel/plugin-syntax-top-level-await": "^7.14.5",
+				"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+				"@babel/plugin-transform-arrow-functions": "^7.25.7",
+				"@babel/plugin-transform-async-generator-functions": "^7.25.7",
+				"@babel/plugin-transform-async-to-generator": "^7.25.7",
+				"@babel/plugin-transform-block-scoped-functions": "^7.25.7",
+				"@babel/plugin-transform-block-scoping": "^7.25.7",
+				"@babel/plugin-transform-class-properties": "^7.25.7",
+				"@babel/plugin-transform-class-static-block": "^7.25.7",
+				"@babel/plugin-transform-classes": "^7.25.7",
+				"@babel/plugin-transform-computed-properties": "^7.25.7",
+				"@babel/plugin-transform-destructuring": "^7.25.7",
+				"@babel/plugin-transform-dotall-regex": "^7.25.7",
+				"@babel/plugin-transform-duplicate-keys": "^7.25.7",
+				"@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.7",
+				"@babel/plugin-transform-dynamic-import": "^7.25.7",
+				"@babel/plugin-transform-exponentiation-operator": "^7.25.7",
+				"@babel/plugin-transform-export-namespace-from": "^7.25.7",
+				"@babel/plugin-transform-for-of": "^7.25.7",
+				"@babel/plugin-transform-function-name": "^7.25.7",
+				"@babel/plugin-transform-json-strings": "^7.25.7",
+				"@babel/plugin-transform-literals": "^7.25.7",
+				"@babel/plugin-transform-logical-assignment-operators": "^7.25.7",
+				"@babel/plugin-transform-member-expression-literals": "^7.25.7",
+				"@babel/plugin-transform-modules-amd": "^7.25.7",
+				"@babel/plugin-transform-modules-commonjs": "^7.25.7",
+				"@babel/plugin-transform-modules-systemjs": "^7.25.7",
+				"@babel/plugin-transform-modules-umd": "^7.25.7",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.25.7",
+				"@babel/plugin-transform-new-target": "^7.25.7",
+				"@babel/plugin-transform-nullish-coalescing-operator": "^7.25.7",
+				"@babel/plugin-transform-numeric-separator": "^7.25.7",
+				"@babel/plugin-transform-object-rest-spread": "^7.25.7",
+				"@babel/plugin-transform-object-super": "^7.25.7",
+				"@babel/plugin-transform-optional-catch-binding": "^7.25.7",
+				"@babel/plugin-transform-optional-chaining": "^7.25.7",
+				"@babel/plugin-transform-parameters": "^7.25.7",
+				"@babel/plugin-transform-private-methods": "^7.25.7",
+				"@babel/plugin-transform-private-property-in-object": "^7.25.7",
+				"@babel/plugin-transform-property-literals": "^7.25.7",
+				"@babel/plugin-transform-regenerator": "^7.25.7",
+				"@babel/plugin-transform-reserved-words": "^7.25.7",
+				"@babel/plugin-transform-shorthand-properties": "^7.25.7",
+				"@babel/plugin-transform-spread": "^7.25.7",
+				"@babel/plugin-transform-sticky-regex": "^7.25.7",
+				"@babel/plugin-transform-template-literals": "^7.25.7",
+				"@babel/plugin-transform-typeof-symbol": "^7.25.7",
+				"@babel/plugin-transform-unicode-escapes": "^7.25.7",
+				"@babel/plugin-transform-unicode-property-regex": "^7.25.7",
+				"@babel/plugin-transform-unicode-regex": "^7.25.7",
+				"@babel/plugin-transform-unicode-sets-regex": "^7.25.7",
+				"@babel/preset-modules": "0.1.6-no-external-plugins",
+				"babel-plugin-polyfill-corejs2": "^0.4.10",
+				"babel-plugin-polyfill-corejs3": "^0.10.6",
+				"babel-plugin-polyfill-regenerator": "^0.6.1",
+				"core-js-compat": "^3.38.1",
+				"semver": "^6.3.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/postcss-plugins-preset": {
-			"name": "@wordpress/postcss-plugins-preset",
-			"version": "4.31.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/babel-preset-default/node_modules/@babel/preset-typescript": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.25.7.tgz",
+			"integrity": "sha512-rkkpaXJZOFN45Fb+Gki0c+KMIglk4+zZXOoMJuyEK8y8Kkc8Jd3BDmP7qPsz0zQMJj+UD7EprF+AqAXcILnexw==",
+			"license": "MIT",
 			"dependencies": {
-				"@wordpress/base-styles": "file:../base-styles",
-				"autoprefixer": "^10.2.5"
+				"@babel/helper-plugin-utils": "^7.25.7",
+				"@babel/helper-validator-option": "^7.25.7",
+				"@babel/plugin-syntax-jsx": "^7.25.7",
+				"@babel/plugin-transform-modules-commonjs": "^7.25.7",
+				"@babel/plugin-transform-typescript": "^7.25.7"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.0.0"
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"packages/postcss-themes": {
-			"name": "@wordpress/postcss-themes",
-			"version": "5.30.0",
-			"dev": true,
+		"packages/babel-preset-default/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"packages/babel-preset-default/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"packages/base-styles": {
+			"name": "@wordpress/base-styles",
+			"version": "5.10.0",
 			"license": "GPL-2.0-or-later",
 			"engines": {
-				"node": ">=14"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			}
+		},
+		"packages/blob": {
+			"name": "@wordpress/blob",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7"
 			},
-			"peerDependencies": {
-				"postcss": "^8.0.0"
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/preferences": {
-			"name": "@wordpress/preferences",
-			"version": "3.24.0",
+		"packages/block-directory": {
+			"name": "@wordpress/block-directory",
+			"version": "5.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/components": "file:../components",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"classnames": "^2.3.1"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/editor": "*",
+				"@wordpress/element": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/plugins": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/url": "*",
+				"change-case": "^4.1.2",
+				"clsx": "^2.1.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
 				"react": "^18.0.0",
 				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/preferences-persistence": {
-			"name": "@wordpress/preferences-persistence",
-			"version": "1.39.0",
+		"packages/block-editor": {
+			"name": "@wordpress/block-editor",
+			"version": "14.5.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch"
+				"@babel/runtime": "7.25.7",
+				"@emotion/react": "^11.7.1",
+				"@emotion/styled": "^11.6.0",
+				"@react-spring/web": "^9.4.5",
+				"@wordpress/a11y": "*",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/blob": "*",
+				"@wordpress/block-serialization-default-parser": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/commands": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/date": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/element": "*",
+				"@wordpress/escape-html": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/is-shallow-equal": "*",
+				"@wordpress/keyboard-shortcuts": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/preferences": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/rich-text": "*",
+				"@wordpress/style-engine": "*",
+				"@wordpress/token-list": "*",
+				"@wordpress/url": "*",
+				"@wordpress/warning": "*",
+				"@wordpress/wordcount": "*",
+				"change-case": "^4.1.2",
+				"clsx": "^2.1.1",
+				"colord": "^2.7.0",
+				"deepmerge": "^4.3.0",
+				"diff": "^4.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"memize": "^2.1.0",
+				"parsel-js": "^1.1.2",
+				"postcss": "^8.4.21",
+				"postcss-prefix-selector": "^1.16.0",
+				"postcss-urlrebase": "^1.4.0",
+				"react-autosize-textarea": "^7.1.0",
+				"react-easy-crop": "^5.0.6",
+				"remove-accents": "^0.5.0"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/prettier-config": {
-			"name": "@wordpress/prettier-config",
-			"version": "3.4.0",
-			"dev": true,
+		"packages/block-editor/node_modules/postcss-urlrebase": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/postcss-urlrebase/-/postcss-urlrebase-1.4.0.tgz",
+			"integrity": "sha512-rRaxMmWvXrn8Rk1PqsxmaJwldRHsr0WbbASKKCZYxXwotHkM/5X/6IrwaEe8pdzpbNGCEY86yhYMN0MhgOkADA==",
+			"license": "MIT",
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.3.0"
+			}
+		},
+		"packages/block-editor/node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+			"license": "MIT"
+		},
+		"packages/block-editor/node_modules/react-easy-crop": {
+			"version": "5.0.6",
+			"resolved": "https://registry.npmjs.org/react-easy-crop/-/react-easy-crop-5.0.6.tgz",
+			"integrity": "sha512-LV8te8NGC72k3l8uAqPAw73D2i9AbRlZqyo1Xz8VetwiMfkSKYgyqE3IFEwf5h+1g7AS1nMxBKk6ZPdhvLw6MQ==",
+			"dependencies": {
+				"normalize-wheel": "^1.0.1",
+				"tslib": "2.0.1"
+			},
+			"peerDependencies": {
+				"react": ">=16.4.0",
+				"react-dom": ">=16.4.0"
+			}
+		},
+		"packages/block-editor/node_modules/tslib": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+			"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+		},
+		"packages/block-library": {
+			"name": "@wordpress/block-library",
+			"version": "9.10.0",
 			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/autop": "*",
+				"@wordpress/blob": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/date": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/element": "*",
+				"@wordpress/escape-html": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/interactivity": "*",
+				"@wordpress/interactivity-router": "*",
+				"@wordpress/keyboard-shortcuts": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/patterns": "*",
+				"@wordpress/primitives": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/reusable-blocks": "*",
+				"@wordpress/rich-text": "*",
+				"@wordpress/server-side-render": "*",
+				"@wordpress/url": "*",
+				"@wordpress/viewport": "*",
+				"@wordpress/wordcount": "*",
+				"change-case": "^4.1.2",
+				"clsx": "^2.1.1",
+				"colord": "^2.7.0",
+				"escape-html": "^1.0.3",
+				"fast-average-color": "^9.1.1",
+				"fast-deep-equal": "^3.1.3",
+				"memize": "^2.1.0",
+				"remove-accents": "^0.5.0",
+				"uuid": "^9.0.1"
+			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
-				"prettier": ">=3"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/primitives": {
-			"name": "@wordpress/primitives",
-			"version": "3.45.0",
+		"packages/block-library/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"packages/block-serialization-default-parser": {
+			"name": "@wordpress/block-serialization-default-parser",
+			"version": "5.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "file:../element",
-				"classnames": "^2.3.1"
+				"@babel/runtime": "7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/priority-queue": {
-			"name": "@wordpress/priority-queue",
-			"version": "2.47.0",
+		"packages/block-serialization-spec-parser": {
+			"name": "@wordpress/block-serialization-spec-parser",
+			"version": "5.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"requestidlecallback": "^0.3.0"
+				"pegjs": "^0.10.0",
+				"phpegjs": "^1.0.0-beta7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/private-apis": {
-			"name": "@wordpress/private-apis",
-			"version": "0.29.0",
+		"packages/blocks": {
+			"name": "@wordpress/blocks",
+			"version": "13.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/autop": "*",
+				"@wordpress/blob": "*",
+				"@wordpress/block-serialization-default-parser": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/element": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/is-shallow-equal": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/rich-text": "*",
+				"@wordpress/shortcode": "*",
+				"@wordpress/warning": "*",
+				"change-case": "^4.1.2",
+				"colord": "^2.7.0",
+				"fast-deep-equal": "^3.1.3",
+				"hpq": "^1.3.0",
+				"is-plain-object": "^5.0.0",
+				"memize": "^2.1.0",
+				"react-is": "^18.3.0",
+				"remove-accents": "^0.5.0",
+				"showdown": "^1.9.1",
+				"simple-html-tokenizer": "^0.5.7",
+				"uuid": "^9.0.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"packages/project-management-automation": {
-			"name": "@wordpress/project-management-automation",
-			"version": "1.46.0",
-			"dev": true,
+		"packages/blocks/node_modules/react-is": {
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+		},
+		"packages/blocks/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"packages/browserslist-config": {
+			"name": "@wordpress/browserslist-config",
+			"version": "6.10.0",
 			"license": "GPL-2.0-or-later",
-			"dependencies": {
-				"@actions/core": "1.9.1",
-				"@actions/github": "^5.0.0",
-				"@babel/runtime": "^7.16.0",
-				"@octokit/request-error": "^2.1.0",
-				"@octokit/webhooks": "7.1.0"
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/react-i18n": {
-			"name": "@wordpress/react-i18n",
-			"version": "3.45.0",
+		"packages/commands": {
+			"name": "@wordpress/commands",
+			"version": "1.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"utility-types": "^3.10.0"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/components": "*",
+				"@wordpress/data": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/keyboard-shortcuts": "*",
+				"@wordpress/private-apis": "*",
+				"clsx": "^2.1.1",
+				"cmdk": "^1.0.0"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/react-native-aztec": {
-			"name": "@wordpress/react-native-aztec",
-			"version": "1.109.2",
-			"license": "GPL-2.0-or-later",
+		"packages/commands/node_modules/@radix-ui/react-dialog": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz",
+			"integrity": "sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==",
 			"dependencies": {
-				"@wordpress/element": "file:../element",
-				"@wordpress/keycodes": "file:../keycodes"
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/primitive": "1.0.1",
+				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/react-context": "1.0.1",
+				"@radix-ui/react-dismissable-layer": "1.0.5",
+				"@radix-ui/react-focus-guards": "1.0.1",
+				"@radix-ui/react-focus-scope": "1.0.4",
+				"@radix-ui/react-id": "1.0.1",
+				"@radix-ui/react-portal": "1.0.4",
+				"@radix-ui/react-presence": "1.0.1",
+				"@radix-ui/react-primitive": "1.0.3",
+				"@radix-ui/react-slot": "1.0.2",
+				"@radix-ui/react-use-controllable-state": "1.0.1",
+				"aria-hidden": "^1.1.1",
+				"react-remove-scroll": "2.5.5"
 			},
 			"peerDependencies": {
-				"react": "*",
-				"react-native": "*"
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
-		"packages/react-native-bridge": {
-			"name": "@wordpress/react-native-bridge",
-			"version": "1.109.2",
-			"license": "GPL-2.0-or-later",
+		"packages/commands/node_modules/@radix-ui/react-dialog/node_modules/@babel/runtime": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.9.tgz",
+			"integrity": "sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==",
+			"license": "MIT",
 			"dependencies": {
-				"@wordpress/react-native-aztec": "file:../react-native-aztec"
+				"regenerator-runtime": "^0.14.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"packages/commands/node_modules/@radix-ui/react-dismissable-layer": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz",
+			"integrity": "sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/primitive": "1.0.1",
+				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/react-primitive": "1.0.3",
+				"@radix-ui/react-use-callback-ref": "1.0.1",
+				"@radix-ui/react-use-escape-keydown": "1.0.3"
 			},
 			"peerDependencies": {
-				"react-native": "*"
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
-		"packages/react-native-editor": {
-			"name": "@wordpress/react-native-editor",
-			"version": "1.109.2",
-			"hasInstallScript": true,
-			"license": "GPL-2.0-or-later",
+		"packages/commands/node_modules/@radix-ui/react-dismissable-layer/node_modules/@babel/runtime": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.9.tgz",
+			"integrity": "sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/runtime": "^7.20.0",
-				"@react-native-clipboard/clipboard": "1.11.2",
-				"@react-native-community/blur": "4.2.0",
-				"@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz",
-				"@react-native-masked-view/masked-view": "0.2.9",
-				"@react-native/gradle-plugin": "0.72.11",
-				"@react-navigation/core": "5.12.0",
-				"@react-navigation/native": "6.0.14",
-				"@react-navigation/routers": "5.4.9",
-				"@react-navigation/stack": "6.3.5",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/data": "file:../data",
-				"@wordpress/edit-post": "file:../edit-post",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/react-native-aztec": "file:../react-native-aztec",
-				"@wordpress/react-native-bridge": "file:../react-native-bridge",
-				"core-js": "^3.31.0",
-				"fast-average-color": "^9.1.1",
-				"gettext-parser": "^1.3.1",
-				"jed": "^1.1.1",
-				"jsdom-jscore-rn": "0.1.8",
-				"node-fetch": "^2.6.0",
-				"react-native": "0.71.11",
-				"react-native-fast-image": "8.5.11",
-				"react-native-gesture-handler": "2.10.2",
-				"react-native-get-random-values": "1.4.0",
-				"react-native-linear-gradient": "2.7.3",
-				"react-native-modal": "13.0.1",
-				"react-native-reanimated": "2.17.0",
-				"react-native-safe-area": "^0.5.0",
-				"react-native-safe-area-context": "4.6.3",
-				"react-native-sass-transformer": "^1.1.1",
-				"react-native-screens": "3.22.0",
-				"react-native-svg": "13.9.0",
-				"react-native-url-polyfill": "1.3.0",
-				"react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz",
-				"react-native-webview": "11.26.1"
+				"regenerator-runtime": "^0.14.0"
 			},
 			"engines": {
-				"node": ">=12",
-				"npm": ">=6.9"
+				"node": ">=6.9.0"
 			}
 		},
-		"packages/react-native-editor/node_modules/buffer": {
-			"version": "5.7.1",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
+		"packages/commands/node_modules/@radix-ui/react-focus-scope": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.4.tgz",
+			"integrity": "sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/react-primitive": "1.0.3",
+				"@radix-ui/react-use-callback-ref": "1.0.1"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
 				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
+				"@types/react-dom": {
+					"optional": true
 				}
-			],
+			}
+		},
+		"packages/commands/node_modules/@radix-ui/react-focus-scope/node_modules/@babel/runtime": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.9.tgz",
+			"integrity": "sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==",
+			"license": "MIT",
 			"dependencies": {
-				"base64-js": "^1.3.1",
-				"ieee754": "^1.1.13"
+				"regenerator-runtime": "^0.14.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"packages/react-native-editor/node_modules/react-native-url-polyfill": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz",
-			"integrity": "sha512-w9JfSkvpqqlix9UjDvJjm1EjSt652zVQ6iwCIj1cVVkwXf4jQhQgTNXY6EVTwuAmUjg6BC6k9RHCBynoLFo3IQ==",
+		"packages/commands/node_modules/@radix-ui/react-portal": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.4.tgz",
+			"integrity": "sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==",
 			"dependencies": {
-				"whatwg-url-without-unicode": "8.0.0-3"
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-primitive": "1.0.3"
 			},
 			"peerDependencies": {
-				"react-native": "*"
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
-		"packages/react-native-editor/node_modules/webidl-conversions": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-			"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+		"packages/commands/node_modules/@radix-ui/react-portal/node_modules/@babel/runtime": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.9.tgz",
+			"integrity": "sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==",
+			"license": "MIT",
+			"dependencies": {
+				"regenerator-runtime": "^0.14.0"
+			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=6.9.0"
 			}
 		},
-		"packages/react-native-editor/node_modules/whatwg-url-without-unicode": {
-			"version": "8.0.0-3",
-			"resolved": "https://registry.npmjs.org/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-3.tgz",
-			"integrity": "sha512-HoKuzZrUlgpz35YO27XgD28uh/WJH4B0+3ttFqRo//lmq+9T/mIOJ6kqmINI9HpUpz1imRC/nR/lxKpJiv0uig==",
+		"packages/commands/node_modules/@radix-ui/react-presence": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.1.tgz",
+			"integrity": "sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==",
 			"dependencies": {
-				"buffer": "^5.4.3",
-				"punycode": "^2.1.1",
-				"webidl-conversions": "^5.0.0"
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-compose-refs": "1.0.1",
+				"@radix-ui/react-use-layout-effect": "1.0.1"
 			},
-			"engines": {
-				"node": ">=10"
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
 			}
 		},
-		"packages/readable-js-assets-webpack-plugin": {
-			"name": "@wordpress/readable-js-assets-webpack-plugin",
-			"version": "2.30.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/commands/node_modules/@radix-ui/react-presence/node_modules/@babel/runtime": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.9.tgz",
+			"integrity": "sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==",
+			"license": "MIT",
+			"dependencies": {
+				"regenerator-runtime": "^0.14.0"
+			},
 			"engines": {
-				"node": ">=14.0"
+				"node": ">=6.9.0"
+			}
+		},
+		"packages/commands/node_modules/cmdk": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.0.0.tgz",
+			"integrity": "sha512-gDzVf0a09TvoJ5jnuPvygTB77+XdOSwEmJ88L6XPFPlv7T3RxbP9jgenfylrAMD0+Le1aO0nVjQUzl2g+vjz5Q==",
+			"dependencies": {
+				"@radix-ui/react-dialog": "1.0.5",
+				"@radix-ui/react-primitive": "1.0.3"
 			},
 			"peerDependencies": {
-				"webpack": "^4.8.3 || ^5.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/redux-routine": {
-			"name": "@wordpress/redux-routine",
-			"version": "4.47.0",
+		"packages/commands/node_modules/regenerator-runtime": {
+			"version": "0.14.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+			"license": "MIT"
+		},
+		"packages/components": {
+			"name": "@wordpress/components",
+			"version": "28.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
+				"@ariakit/react": "^0.4.10",
+				"@babel/runtime": "7.25.7",
+				"@emotion/cache": "^11.7.1",
+				"@emotion/css": "^11.7.1",
+				"@emotion/react": "^11.7.1",
+				"@emotion/serialize": "^1.0.2",
+				"@emotion/styled": "^11.6.0",
+				"@emotion/utils": "^1.0.0",
+				"@floating-ui/react-dom": "^2.0.8",
+				"@types/gradient-parser": "0.1.3",
+				"@types/highlight-words-core": "1.2.1",
+				"@use-gesture/react": "^10.3.1",
+				"@wordpress/a11y": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/date": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/element": "*",
+				"@wordpress/escape-html": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/is-shallow-equal": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/primitives": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/rich-text": "*",
+				"@wordpress/warning": "*",
+				"change-case": "^4.1.2",
+				"clsx": "^2.1.1",
+				"colord": "^2.7.0",
+				"date-fns": "^3.6.0",
+				"deepmerge": "^4.3.0",
+				"fast-deep-equal": "^3.1.3",
+				"framer-motion": "^11.1.9",
+				"gradient-parser": "^0.1.5",
+				"highlight-words-core": "^1.2.2",
 				"is-plain-object": "^5.0.0",
-				"is-promise": "^4.0.0",
-				"rungen": "^0.3.2"
+				"memize": "^2.1.0",
+				"path-to-regexp": "^6.2.1",
+				"re-resizable": "^6.4.0",
+				"react-colorful": "^5.3.1",
+				"remove-accents": "^0.5.0",
+				"uuid": "^9.0.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
-				"redux": ">=4"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/report-flaky-tests": {
-			"name": "@wordpress/report-flaky-tests",
-			"version": "0.0.0",
-			"dev": true,
-			"license": "GPL-2.0-or-later",
+		"packages/components/node_modules/@ariakit/react": {
+			"version": "0.4.10",
+			"resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.4.10.tgz",
+			"integrity": "sha512-c1+6sNLj57aAXrBZMCVGG+OXeFrPAG0TV1jT7oPJcN/KLRs3aCuO3CCJVep/eKepFzzK01kNRGYX3wPT1TXPNw==",
 			"dependencies": {
-				"@actions/core": "^1.8.0",
-				"@actions/github": "^5.0.1",
-				"jest-message-util": "^29.6.2"
+				"@ariakit/react-core": "0.4.10"
 			},
-			"engines": {
-				"node": ">=14",
-				"npm": ">=6.9"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/ariakit"
+			},
+			"peerDependencies": {
+				"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+				"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
 			}
 		},
-		"packages/report-flaky-tests/node_modules/@actions/github": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
-			"integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
-			"dev": true,
+		"packages/components/node_modules/@ariakit/react-core": {
+			"version": "0.4.10",
+			"resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.4.10.tgz",
+			"integrity": "sha512-r6DZmtHBmSoOj848+RpBwdZy/55YxPhMhfH14JIO2OLn1F6iSFkQwR7AAGpIrlYycWJFSF7KrQu50O+SSfFJdQ==",
 			"dependencies": {
-				"@actions/http-client": "^2.0.1",
-				"@octokit/core": "^3.6.0",
-				"@octokit/plugin-paginate-rest": "^2.17.0",
-				"@octokit/plugin-rest-endpoint-methods": "^5.13.0"
+				"@ariakit/core": "0.4.9",
+				"@floating-ui/dom": "^1.0.0",
+				"use-sync-external-store": "^1.2.0"
+			},
+			"peerDependencies": {
+				"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+				"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
 			}
 		},
-		"packages/reusable-blocks": {
-			"name": "@wordpress/reusable-blocks",
-			"version": "4.24.0",
-			"license": "GPL-2.0-or-later",
+		"packages/components/node_modules/@floating-ui/react-dom": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.1.tgz",
+			"integrity": "sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url"
-			},
-			"engines": {
-				"node": ">=12"
+				"@floating-ui/dom": "^1.3.0"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"react": ">=16.8.0",
+				"react-dom": ">=16.8.0"
 			}
 		},
-		"packages/rich-text": {
-			"name": "@wordpress/rich-text",
-			"version": "6.24.0",
+		"packages/components/node_modules/@types/gradient-parser": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@types/gradient-parser/-/gradient-parser-0.1.3.tgz",
+			"integrity": "sha512-XDbrTSBlQV9nxE1GiDL3FaOPy4G/KaJkhDutBX48Kg8CYZMBARyyDFGCWfWJn4pobmInmwud1xxH7VJMAr0CKQ=="
+		},
+		"packages/components/node_modules/path-to-regexp": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+			"integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+			"license": "MIT"
+		},
+		"packages/components/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"packages/compose": {
+			"name": "@wordpress/compose",
+			"version": "7.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/keycodes": "file:../keycodes",
-				"memize": "^2.1.0",
-				"rememo": "^4.0.2"
+				"@babel/runtime": "7.25.7",
+				"@types/mousetrap": "^1.6.8",
+				"@wordpress/deprecated": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/element": "*",
+				"@wordpress/is-shallow-equal": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/priority-queue": "*",
+				"@wordpress/undo-manager": "*",
+				"change-case": "^4.1.2",
+				"clipboard": "^2.0.11",
+				"mousetrap": "^1.6.5",
+				"use-memo-one": "^1.1.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
 				"react": "^18.0.0"
 			}
 		},
-		"packages/router": {
-			"name": "@wordpress/router",
-			"version": "0.16.0",
+		"packages/compose/node_modules/clipboard": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+			"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+			"dependencies": {
+				"good-listener": "^1.2.2",
+				"select": "^1.1.2",
+				"tiny-emitter": "^2.0.0"
+			}
+		},
+		"packages/core-commands": {
+			"name": "@wordpress/core-commands",
+			"version": "1.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "file:../element",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url",
-				"history": "^5.1.0"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/block-editor": "*",
+				"@wordpress/commands": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/element": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/router": "*",
+				"@wordpress/url": "*"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/scripts": {
-			"name": "@wordpress/scripts",
-			"version": "26.18.0",
-			"dev": true,
+		"packages/core-data": {
+			"name": "@wordpress/core-data",
+			"version": "7.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/core": "^7.16.0",
-				"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
-				"@svgr/webpack": "^8.0.1",
-				"@wordpress/babel-preset-default": "file:../babel-preset-default",
-				"@wordpress/browserslist-config": "file:../browserslist-config",
-				"@wordpress/dependency-extraction-webpack-plugin": "file:../dependency-extraction-webpack-plugin",
-				"@wordpress/e2e-test-utils-playwright": "file:../e2e-test-utils-playwright",
-				"@wordpress/eslint-plugin": "file:../eslint-plugin",
-				"@wordpress/jest-preset-default": "file:../jest-preset-default",
-				"@wordpress/npm-package-json-lint-config": "file:../npm-package-json-lint-config",
-				"@wordpress/postcss-plugins-preset": "file:../postcss-plugins-preset",
-				"@wordpress/prettier-config": "file:../prettier-config",
-				"@wordpress/stylelint-config": "file:../stylelint-config",
-				"adm-zip": "^0.5.9",
-				"babel-jest": "^29.6.2",
-				"babel-loader": "^8.2.3",
-				"browserslist": "^4.21.10",
-				"chalk": "^4.0.0",
-				"check-node-version": "^4.1.0",
-				"clean-webpack-plugin": "^3.0.0",
-				"copy-webpack-plugin": "^10.2.0",
-				"cross-spawn": "^5.1.0",
-				"css-loader": "^6.2.0",
-				"cssnano": "^6.0.1",
-				"cwd": "^0.10.0",
-				"dir-glob": "^3.0.1",
-				"eslint": "^8.3.0",
-				"expect-puppeteer": "^4.4.0",
-				"fast-glob": "^3.2.7",
-				"filenamify": "^4.2.0",
-				"jest": "^29.6.2",
-				"jest-dev-server": "^9.0.1",
-				"jest-environment-jsdom": "^29.6.2",
-				"jest-environment-node": "^29.6.2",
-				"markdownlint-cli": "^0.31.1",
-				"merge-deep": "^3.0.3",
-				"mini-css-extract-plugin": "^2.5.1",
-				"minimist": "^1.2.0",
-				"npm-package-json-lint": "^6.4.0",
-				"npm-packlist": "^3.0.0",
-				"playwright-core": "1.39.0",
-				"postcss": "^8.4.5",
-				"postcss-loader": "^6.2.1",
-				"prettier": "npm:wp-prettier@3.0.3",
-				"puppeteer-core": "^13.2.0",
-				"react-refresh": "^0.14.0",
-				"read-pkg-up": "^7.0.1",
-				"resolve-bin": "^0.4.0",
-				"sass": "^1.35.2",
-				"sass-loader": "^12.1.0",
-				"source-map-loader": "^3.0.0",
-				"stylelint": "^14.2.0",
-				"terser-webpack-plugin": "^5.3.9",
-				"url-loader": "^4.1.1",
-				"webpack": "^5.88.2",
-				"webpack-bundle-analyzer": "^4.9.1",
-				"webpack-cli": "^5.1.4",
-				"webpack-dev-server": "^4.15.1"
-			},
-			"bin": {
-				"wp-scripts": "bin/wp-scripts.js"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/element": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/is-shallow-equal": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/rich-text": "*",
+				"@wordpress/sync": "*",
+				"@wordpress/undo-manager": "*",
+				"@wordpress/url": "*",
+				"@wordpress/warning": "*",
+				"change-case": "^4.1.2",
+				"equivalent-key-map": "^0.2.2",
+				"fast-deep-equal": "^3.1.3",
+				"memize": "^2.1.0",
+				"uuid": "^9.0.1"
 			},
 			"engines": {
-				"node": ">=14",
-				"npm": ">=6.14.4"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
-				"@playwright/test": "^1.39.0",
 				"react": "^18.0.0",
 				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/scripts/node_modules/axios": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-			"integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
-			"dev": true,
-			"dependencies": {
-				"follow-redirects": "^1.15.0",
-				"form-data": "^4.0.0",
-				"proxy-from-env": "^1.1.0"
+		"packages/core-data/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
 			}
 		},
-		"packages/scripts/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
+		"packages/create-block": {
+			"name": "@wordpress/create-block",
+			"version": "4.53.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
+				"@wordpress/lazy-import": "*",
+				"chalk": "^4.0.0",
+				"change-case": "^4.1.2",
+				"check-node-version": "^4.1.0",
+				"commander": "^9.2.0",
+				"execa": "^4.0.2",
+				"fast-glob": "^3.2.7",
+				"inquirer": "^7.1.0",
+				"make-dir": "^3.0.0",
+				"mustache": "^4.0.0",
+				"npm-package-arg": "^8.1.5",
+				"rimraf": "^3.0.2",
+				"write-pkg": "^4.0.0"
 			},
-			"engines": {
-				"node": ">=10"
+			"bin": {
+				"wp-create-block": "index.js"
 			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
+			"engines": {
+				"node": ">=20.10.0",
+				"npm": ">=10.2.3"
 			}
 		},
-		"packages/scripts/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
+		"packages/create-block-interactive-template": {
+			"name": "@wordpress/create-block-interactive-template",
+			"version": "2.10.0",
+			"license": "GPL-2.0-or-later",
 			"engines": {
-				"node": ">=8"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/scripts/node_modules/jest-dev-server": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-9.0.1.tgz",
-			"integrity": "sha512-eqpJKSvVl4M0ojHZUPNbka8yEzLNbIMiINXDsuMF3lYfIdRO2iPqy+ASR4wBQ6nUyR3OT24oKPWhpsfLhgAVyg==",
-			"dev": true,
-			"dependencies": {
-				"chalk": "^4.1.2",
-				"cwd": "^0.10.0",
-				"find-process": "^1.4.7",
-				"prompts": "^2.4.2",
-				"spawnd": "^9.0.1",
-				"tree-kill": "^1.2.2",
-				"wait-on": "^7.0.1"
-			},
+		"packages/create-block-tutorial-template": {
+			"name": "@wordpress/create-block-tutorial-template",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
 			"engines": {
-				"node": ">=16"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/scripts/node_modules/joi": {
-			"version": "17.11.0",
-			"resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz",
-			"integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==",
-			"dev": true,
+		"packages/customize-widgets": {
+			"name": "@wordpress/customize-widgets",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@hapi/hoek": "^9.0.0",
-				"@hapi/topo": "^5.0.0",
-				"@sideway/address": "^4.1.3",
-				"@sideway/formula": "^3.0.1",
-				"@sideway/pinpoint": "^2.0.0"
-			}
-		},
-		"packages/scripts/node_modules/playwright-core": {
-			"version": "1.39.0",
-			"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.39.0.tgz",
-			"integrity": "sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==",
-			"dev": true,
-			"bin": {
-				"playwright-core": "cli.js"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/block-editor": "*",
+				"@wordpress/block-library": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/editor": "*",
+				"@wordpress/element": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/interface": "*",
+				"@wordpress/is-shallow-equal": "*",
+				"@wordpress/keyboard-shortcuts": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/media-utils": "*",
+				"@wordpress/preferences": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/widgets": "*",
+				"clsx": "^2.1.1",
+				"fast-deep-equal": "^3.1.3"
 			},
 			"engines": {
-				"node": ">=16"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/scripts/node_modules/rxjs": {
-			"version": "7.8.1",
-			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-			"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-			"dev": true,
+		"packages/data": {
+			"name": "@wordpress/data",
+			"version": "10.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"tslib": "^2.1.0"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/compose": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/element": "*",
+				"@wordpress/is-shallow-equal": "*",
+				"@wordpress/priority-queue": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/redux-routine": "*",
+				"deepmerge": "^4.3.0",
+				"equivalent-key-map": "^0.2.2",
+				"is-plain-object": "^5.0.0",
+				"is-promise": "^4.0.0",
+				"redux": "^4.1.2",
+				"rememo": "^4.0.2",
+				"use-memo-one": "^1.1.1"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"packages/scripts/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
+		"packages/data-controls": {
+			"name": "@wordpress/data-controls",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*"
+			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"packages/scripts/node_modules/spawnd": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/spawnd/-/spawnd-9.0.1.tgz",
-			"integrity": "sha512-vaMk8E9CpbjTYToBxLXowDeArGf1+yI7A6PU6Nr57b2g8BVY8nRi5vTBj3bMF8UkCrMdTMyf/Lh+lrcrW2z7pw==",
-			"dev": true,
+		"packages/dataviews": {
+			"name": "@wordpress/dataviews",
+			"version": "4.6.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"signal-exit": "^4.1.0",
-				"tree-kill": "^1.2.2"
+				"@ariakit/react": "^0.4.10",
+				"@babel/runtime": "7.25.7",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/primitives": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/warning": "*",
+				"clsx": "^2.1.1",
+				"remove-accents": "^0.5.0"
 			},
 			"engines": {
-				"node": ">=16"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"packages/scripts/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
+		"packages/dataviews/node_modules/@ariakit/react": {
+			"version": "0.4.10",
+			"resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.4.10.tgz",
+			"integrity": "sha512-c1+6sNLj57aAXrBZMCVGG+OXeFrPAG0TV1jT7oPJcN/KLRs3aCuO3CCJVep/eKepFzzK01kNRGYX3wPT1TXPNw==",
 			"dependencies": {
-				"has-flag": "^4.0.0"
+				"@ariakit/react-core": "0.4.10"
 			},
-			"engines": {
-				"node": ">=8"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/ariakit"
+			},
+			"peerDependencies": {
+				"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+				"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
 			}
 		},
-		"packages/scripts/node_modules/wait-on": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz",
-			"integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==",
-			"dev": true,
+		"packages/dataviews/node_modules/@ariakit/react-core": {
+			"version": "0.4.10",
+			"resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.4.10.tgz",
+			"integrity": "sha512-r6DZmtHBmSoOj848+RpBwdZy/55YxPhMhfH14JIO2OLn1F6iSFkQwR7AAGpIrlYycWJFSF7KrQu50O+SSfFJdQ==",
 			"dependencies": {
-				"axios": "^1.6.1",
-				"joi": "^17.11.0",
-				"lodash": "^4.17.21",
-				"minimist": "^1.2.8",
-				"rxjs": "^7.8.1"
+				"@ariakit/core": "0.4.9",
+				"@floating-ui/dom": "^1.0.0",
+				"use-sync-external-store": "^1.2.0"
 			},
-			"bin": {
-				"wait-on": "bin/wait-on"
+			"peerDependencies": {
+				"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+				"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
+			}
+		},
+		"packages/date": {
+			"name": "@wordpress/date",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/deprecated": "*",
+				"moment": "^2.29.4",
+				"moment-timezone": "^0.5.40"
 			},
 			"engines": {
-				"node": ">=12.0.0"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/server-side-render": {
-			"name": "@wordpress/server-side-render",
-			"version": "4.24.0",
+		"packages/dependency-extraction-webpack-plugin": {
+			"name": "@wordpress/dependency-extraction-webpack-plugin",
+			"version": "6.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/url": "file:../url",
-				"fast-deep-equal": "^3.1.3"
+				"json2php": "^0.0.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0",
-				"react-dom": "^18.0.0"
+				"webpack": "^5.0.0"
 			}
 		},
-		"packages/shortcode": {
-			"name": "@wordpress/shortcode",
-			"version": "3.47.0",
+		"packages/deprecated": {
+			"name": "@wordpress/deprecated",
+			"version": "4.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"memize": "^2.0.1"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/hooks": "*"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/style-engine": {
-			"name": "@wordpress/style-engine",
-			"version": "1.30.0",
+		"packages/docgen": {
+			"name": "@wordpress/docgen",
+			"version": "2.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"change-case": "^4.1.2"
+				"@babel/core": "7.25.7",
+				"comment-parser": "^1.1.1",
+				"mdast-util-inject": "1.1.0",
+				"optionator": "0.8.2",
+				"remark": "10.0.1",
+				"remark-parse": "6.0.3",
+				"unified": "7.1.0"
+			},
+			"bin": {
+				"docgen": "bin/cli.js"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/stylelint-config": {
-			"name": "@wordpress/stylelint-config",
-			"version": "21.30.0",
-			"dev": true,
-			"license": "MIT",
+		"packages/dom": {
+			"name": "@wordpress/dom",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"stylelint-config-recommended": "^6.0.0",
-				"stylelint-config-recommended-scss": "^5.0.2"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/deprecated": "*"
 			},
 			"engines": {
-				"node": ">=14"
-			},
-			"peerDependencies": {
-				"stylelint": "^14.2"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/sync": {
-			"name": "@wordpress/sync",
-			"version": "0.9.0",
+		"packages/dom-ready": {
+			"name": "@wordpress/dom-ready",
+			"version": "4.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@types/simple-peer": "^9.11.5",
-				"@wordpress/url": "file:../url",
-				"import-locals": "^2.0.0",
-				"lib0": "^0.2.42",
-				"simple-peer": "^9.11.0",
-				"y-indexeddb": "~9.0.11",
-				"y-protocols": "^1.0.5",
-				"y-webrtc": "~10.2.5",
-				"yjs": "~13.6.6"
+				"@babel/runtime": "7.25.7"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"packages/token-list": {
-			"name": "@wordpress/token-list",
-			"version": "2.47.0",
+		"packages/e2e-test-utils": {
+			"name": "@wordpress/e2e-test-utils",
+			"version": "11.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/url": "*",
+				"change-case": "^4.1.2",
+				"form-data": "^4.0.0",
+				"node-fetch": "2.7.0"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"jest": ">=29",
+				"puppeteer-core": ">=11"
 			}
 		},
-		"packages/undo-manager": {
-			"name": "@wordpress/undo-manager",
-			"version": "0.7.0",
+		"packages/e2e-test-utils-playwright": {
+			"name": "@wordpress/e2e-test-utils-playwright",
+			"version": "1.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal"
+				"change-case": "^4.1.2",
+				"form-data": "^4.0.0",
+				"get-port": "^5.1.1",
+				"lighthouse": "^10.4.0",
+				"mime": "^3.0.0",
+				"web-vitals": "^4.2.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"@playwright/test": ">=1"
 			}
 		},
-		"packages/url": {
-			"name": "@wordpress/url",
-			"version": "3.48.0",
+		"packages/e2e-test-utils-playwright/node_modules/web-vitals": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-4.2.1.tgz",
+			"integrity": "sha512-U6bAxeudnhDqcXNl50JC4hLlqox9DZnngxfISZm3DMZnonW35xtJOVUc091L+DOY+6hVZVpKXoiCP0RiT6339Q==",
+			"license": "Apache-2.0"
+		},
+		"packages/e2e-tests": {
+			"name": "@wordpress/e2e-tests",
+			"version": "8.10.1",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"remove-accents": "^0.5.0"
+				"@wordpress/e2e-test-utils": "*",
+				"@wordpress/interactivity": "*",
+				"@wordpress/interactivity-router": "*",
+				"@wordpress/jest-console": "*",
+				"@wordpress/jest-puppeteer-axe": "*",
+				"@wordpress/scripts": "*",
+				"@wordpress/url": "*",
+				"chalk": "^4.0.0",
+				"expect-puppeteer": "^4.4.0",
+				"filenamify": "^4.2.0",
+				"jest-message-util": "^29.6.2",
+				"jest-snapshot": "^29.6.2",
+				"uuid": "^9.0.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"jest": ">=29",
+				"puppeteer-core": ">=11",
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/viewport": {
-			"name": "@wordpress/viewport",
-			"version": "5.24.0",
+		"packages/e2e-tests/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"packages/edit-post": {
+			"name": "@wordpress/edit-post",
+			"version": "8.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element"
-			},
-			"engines": {
-				"node": ">=12"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/block-library": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/commands": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-commands": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/editor": "*",
+				"@wordpress/element": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/keyboard-shortcuts": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/plugins": "*",
+				"@wordpress/preferences": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/url": "*",
+				"@wordpress/viewport": "*",
+				"@wordpress/warning": "*",
+				"@wordpress/widgets": "*",
+				"clsx": "^2.1.1",
+				"memize": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
-				"react": "^18.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/warning": {
-			"name": "@wordpress/warning",
-			"version": "2.47.0",
+		"packages/edit-site": {
+			"name": "@wordpress/edit-site",
+			"version": "6.10.0",
 			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@react-spring/web": "^9.4.5",
+				"@wordpress/a11y": "*",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/blob": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/block-library": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/commands": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-commands": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/dataviews": "*",
+				"@wordpress/date": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/editor": "*",
+				"@wordpress/element": "*",
+				"@wordpress/escape-html": "*",
+				"@wordpress/fields": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/keyboard-shortcuts": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/patterns": "*",
+				"@wordpress/plugins": "*",
+				"@wordpress/preferences": "*",
+				"@wordpress/primitives": "*",
+				"@wordpress/priority-queue": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/reusable-blocks": "*",
+				"@wordpress/router": "*",
+				"@wordpress/style-engine": "*",
+				"@wordpress/url": "*",
+				"@wordpress/viewport": "*",
+				"@wordpress/widgets": "*",
+				"@wordpress/wordcount": "*",
+				"change-case": "^4.1.2",
+				"clsx": "^2.1.1",
+				"colord": "^2.9.2",
+				"fast-deep-equal": "^3.1.3",
+				"memize": "^2.1.0",
+				"react-autosize-textarea": "^7.1.0"
+			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/widgets": {
-			"name": "@wordpress/widgets",
-			"version": "3.24.0",
+		"packages/edit-widgets": {
+			"name": "@wordpress/edit-widgets",
+			"version": "6.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/notices": "file:../notices",
-				"classnames": "^2.3.1"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/block-library": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/editor": "*",
+				"@wordpress/element": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/interface": "*",
+				"@wordpress/keyboard-shortcuts": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/media-utils": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/patterns": "*",
+				"@wordpress/plugins": "*",
+				"@wordpress/preferences": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/reusable-blocks": "*",
+				"@wordpress/url": "*",
+				"@wordpress/widgets": "*",
+				"clsx": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			},
 			"peerDependencies": {
 				"react": "^18.0.0",
 				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/wordcount": {
-			"name": "@wordpress/wordcount",
-			"version": "3.47.0",
+		"packages/editor": {
+			"name": "@wordpress/editor",
+			"version": "14.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@babel/runtime": "^7.16.0"
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/blob": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/commands": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/dataviews": "*",
+				"@wordpress/date": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/dom": "*",
+				"@wordpress/element": "*",
+				"@wordpress/fields": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/interface": "*",
+				"@wordpress/keyboard-shortcuts": "*",
+				"@wordpress/keycodes": "*",
+				"@wordpress/media-utils": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/patterns": "*",
+				"@wordpress/plugins": "*",
+				"@wordpress/preferences": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/reusable-blocks": "*",
+				"@wordpress/rich-text": "*",
+				"@wordpress/server-side-render": "*",
+				"@wordpress/url": "*",
+				"@wordpress/warning": "*",
+				"@wordpress/wordcount": "*",
+				"change-case": "^4.1.2",
+				"client-zip": "^2.4.5",
+				"clsx": "^2.1.1",
+				"date-fns": "^3.6.0",
+				"deepmerge": "^4.3.0",
+				"fast-deep-equal": "^3.1.3",
+				"is-plain-object": "^5.0.0",
+				"memize": "^2.1.0",
+				"react-autosize-textarea": "^7.1.0",
+				"remove-accents": "^0.5.0",
+				"uuid": "^9.0.1"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
-		}
-	},
-	"dependencies": {
-		"@aashutoshrathi/word-wrap": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-			"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-			"dev": true
 		},
-		"@actions/core": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
-			"integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
-			"dev": true,
-			"requires": {
-				"@actions/http-client": "^2.0.1",
-				"uuid": "^8.3.2"
-			},
+		"packages/element": {
+			"name": "@wordpress/element",
+			"version": "6.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"uuid": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-					"dev": true
-				}
+				"@babel/runtime": "7.25.7",
+				"@types/react": "^18.2.79",
+				"@types/react-dom": "^18.2.25",
+				"@wordpress/escape-html": "*",
+				"change-case": "^4.1.2",
+				"is-plain-object": "^5.0.0",
+				"react": "^18.3.0",
+				"react-dom": "^18.3.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@actions/github": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.0.tgz",
-			"integrity": "sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==",
-			"dev": true,
-			"requires": {
-				"@actions/http-client": "^1.0.11",
-				"@octokit/core": "^3.4.0",
-				"@octokit/plugin-paginate-rest": "^2.13.3",
-				"@octokit/plugin-rest-endpoint-methods": "^5.1.1"
+		"packages/env": {
+			"name": "@wordpress/env",
+			"version": "10.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"copy-dir": "^1.3.0",
+				"docker-compose": "^0.24.3",
+				"extract-zip": "^1.6.7",
+				"got": "^11.8.5",
+				"inquirer": "^7.1.0",
+				"js-yaml": "^3.13.1",
+				"ora": "^4.0.2",
+				"rimraf": "^3.0.2",
+				"simple-git": "^3.5.0",
+				"terminal-link": "^2.0.0",
+				"yargs": "^17.3.0"
+			},
+			"bin": {
+				"wp-env": "bin/wp-env"
 			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			}
+		},
+		"packages/env/node_modules/cliui": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
 			"dependencies": {
-				"@actions/http-client": {
-					"version": "1.0.11",
-					"resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
-					"integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
-					"dev": true,
-					"requires": {
-						"tunnel": "0.0.6"
-					}
-				}
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.1",
+				"wrap-ansi": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"@actions/http-client": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.1.tgz",
-			"integrity": "sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw==",
-			"dev": true,
-			"requires": {
-				"tunnel": "^0.0.6"
+		"packages/env/node_modules/docker-compose": {
+			"version": "0.24.2",
+			"resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.2.tgz",
+			"integrity": "sha512-2/WLvA7UZ6A2LDLQrYW0idKipmNBWhtfvrn2yzjC5PnHDzuFVj1zAZN6MJxVMKP0zZH8uzAK6OwVZYHGuyCmTw==",
+			"dependencies": {
+				"yaml": "^2.2.2"
+			},
+			"engines": {
+				"node": ">= 6.0.0"
 			}
 		},
-		"@adobe/css-tools": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz",
-			"integrity": "sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==",
-			"dev": true
+		"packages/env/node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
 		},
-		"@ampproject/remapping": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-			"integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-			"requires": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+		"packages/env/node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@appium/base-driver": {
-			"version": "9.4.0",
-			"resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.4.0.tgz",
-			"integrity": "sha512-R2RdNQ9eMV++VfdrTjnvriaJnrk+btvgol7DE4wZIvwEZ3IPS0NC4yE6twA77RqEhfGixCUmS82pQVWucEnTpA==",
-			"dev": true,
-			"requires": {
-				"@appium/support": "^4.1.7",
-				"@appium/types": "^0.14.0",
-				"@colors/colors": "1.6.0",
-				"@types/async-lock": "1.4.0",
-				"@types/bluebird": "3.5.40",
-				"@types/express": "4.17.19",
-				"@types/lodash": "4.14.199",
-				"@types/method-override": "0.0.33",
-				"@types/serve-favicon": "2.5.5",
-				"async-lock": "1.4.0",
-				"asyncbox": "2.9.4",
-				"axios": "1.5.1",
-				"bluebird": "3.7.2",
-				"body-parser": "1.20.2",
-				"es6-error": "4.1.1",
-				"express": "4.18.2",
-				"http-status-codes": "2.3.0",
-				"lodash": "4.17.21",
-				"lru-cache": "10.0.1",
-				"method-override": "3.0.0",
-				"morgan": "1.10.0",
-				"path-to-regexp": "6.2.1",
-				"serve-favicon": "2.5.0",
-				"source-map-support": "0.5.21",
-				"spdy": "4.0.2",
-				"type-fest": "3.13.1",
-				"validate.js": "0.13.1"
-			},
+		"packages/env/node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dependencies": {
-				"@appium/schema": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.4.0.tgz",
-					"integrity": "sha512-Wa+N2aXioe7j+7MP0fojsRSVGEiyHv2NsxJP5BgSRMPd65blIBSl1iAsYorQG/r1fmQA+NLPaPMnatHOTI+sqw==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "7.0.13",
-						"json-schema": "0.4.0",
-						"source-map-support": "0.5.21"
-					}
-				},
-				"@appium/types": {
-					"version": "0.14.0",
-					"resolved": "https://registry.npmjs.org/@appium/types/-/types-0.14.0.tgz",
-					"integrity": "sha512-PKiJSyaInSfpFQVjLS2e+e9QFocKvm+vmwOGOC99GAPLgLsMHZdQQNOCRk36VJXFu3U1Dn2+eBuHpWGD+hv9jg==",
-					"dev": true,
-					"requires": {
-						"@appium/schema": "^0.4.0",
-						"@appium/tsconfig": "^0.3.2",
-						"@types/express": "4.17.19",
-						"@types/npmlog": "4.1.4",
-						"@types/ws": "8.5.7",
-						"type-fest": "3.13.1"
-					}
-				},
-				"@colors/colors": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
-					"integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
-					"dev": true
-				},
-				"@types/bluebird": {
-					"version": "3.5.40",
-					"resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.40.tgz",
-					"integrity": "sha512-4dEtF/qcby/FdT6iChii+jFXzVVX0+5HYiDqHKBtHQ3ZV58x5uVJJYRG0N4QllIaj5a2+UDdf/nupae+/M6mdw==",
-					"dev": true
-				},
-				"@types/express": {
-					"version": "4.17.19",
-					"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.19.tgz",
-					"integrity": "sha512-UtOfBtzN9OvpZPPbnnYunfjM7XCI4jyk1NvnFhTVz5krYAnW4o5DCoIekvms+8ApqhB4+9wSge1kBijdfTSmfg==",
-					"dev": true,
-					"requires": {
-						"@types/body-parser": "*",
-						"@types/express-serve-static-core": "^4.17.33",
-						"@types/qs": "*",
-						"@types/serve-static": "*"
-					}
-				},
-				"@types/json-schema": {
-					"version": "7.0.13",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
-					"integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
-					"dev": true
-				},
-				"@types/ws": {
-					"version": "8.5.7",
-					"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.7.tgz",
-					"integrity": "sha512-6UrLjiDUvn40CMrAubXuIVtj2PEfKDffJS7ychvnPU44j+KVeXmdHHTgqcM/dxLUTHxlXHiFM8Skmb8ozGdTnQ==",
-					"dev": true,
-					"requires": {
-						"@types/node": "*"
-					}
-				},
-				"axios": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-					"integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
-					"dev": true,
-					"requires": {
-						"follow-redirects": "^1.15.0",
-						"form-data": "^4.0.0",
-						"proxy-from-env": "^1.1.0"
-					}
-				},
-				"body-parser": {
-					"version": "1.20.2",
-					"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-					"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
-					"dev": true,
-					"requires": {
-						"bytes": "3.1.2",
-						"content-type": "~1.0.5",
-						"debug": "2.6.9",
-						"depd": "2.0.0",
-						"destroy": "1.2.0",
-						"http-errors": "2.0.0",
-						"iconv-lite": "0.4.24",
-						"on-finished": "2.4.1",
-						"qs": "6.11.0",
-						"raw-body": "2.5.2",
-						"type-is": "~1.6.18",
-						"unpipe": "1.0.0"
-					}
-				},
-				"bytes": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-					"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-					"dev": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-					"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-					"dev": true
-				},
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				},
-				"lru-cache": {
-					"version": "10.0.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
-					"integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
-					"dev": true
-				},
-				"on-finished": {
-					"version": "2.4.1",
-					"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-					"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-					"dev": true,
-					"requires": {
-						"ee-first": "1.1.1"
-					}
-				},
-				"path-to-regexp": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
-					"integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==",
-					"dev": true
-				},
-				"raw-body": {
-					"version": "2.5.2",
-					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-					"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
-					"dev": true,
-					"requires": {
-						"bytes": "3.1.2",
-						"http-errors": "2.0.0",
-						"iconv-lite": "0.4.24",
-						"unpipe": "1.0.0"
-					}
-				},
-				"type-fest": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-					"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-					"dev": true
-				}
-			}
-		},
-		"@appium/base-plugin": {
-			"version": "2.2.21",
-			"resolved": "https://registry.npmjs.org/@appium/base-plugin/-/base-plugin-2.2.21.tgz",
-			"integrity": "sha512-MRQyuS3xC0JQwOV+q5gHWSPH6lA/owgsQqGPyVkZH0OB69lx4mmGvO/9Zuz3kTdONN/QdxI6oo6nEvvty9Kt2A==",
-			"dev": true,
-			"requires": {
-				"@appium/base-driver": "^9.4.0",
-				"@appium/support": "^4.1.7"
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@appium/docutils": {
-			"version": "0.4.10",
-			"resolved": "https://registry.npmjs.org/@appium/docutils/-/docutils-0.4.10.tgz",
-			"integrity": "sha512-8HOVfNkvAE3wmhj4bbZJOo7xXNyoXD6/5pIR42NMey/to/P+a8OI9msXIT5QiZxrItNzWXnnVqhrPW0r2yDtpQ==",
-			"dev": true,
-			"requires": {
-				"@appium/support": "^4.1.7",
-				"@appium/tsconfig": "^0.3.2",
-				"@appium/typedoc-plugin-appium": "^0.6.6",
-				"@sliphua/lilconfig-ts-loader": "3.2.2",
-				"@types/which": "3.0.0",
-				"chalk": "4.1.2",
-				"consola": "2.15.3",
-				"diff": "5.1.0",
-				"figures": "3.2.0",
-				"find-up": "5.0.0",
-				"json5": "2.2.3",
-				"lilconfig": "2.1.0",
-				"lodash": "4.17.21",
-				"log-symbols": "4.1.0",
-				"pkg-dir": "5.0.0",
-				"read-pkg": "5.2.0",
-				"semver": "7.5.4",
-				"source-map-support": "0.5.21",
-				"teen_process": "2.0.50",
-				"type-fest": "3.13.1",
-				"typedoc": "0.23.28",
-				"typedoc-plugin-markdown": "3.14.0",
-				"typedoc-plugin-resolve-crossmodule-references": "0.3.3",
-				"typescript": "5.0.4",
-				"yaml": "2.3.3",
-				"yargs": "17.7.2",
-				"yargs-parser": "21.1.1"
-			},
+		"packages/env/node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
 			"dependencies": {
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cliui": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.1",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"diff": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-					"integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
-					"integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
-					"dev": true,
-					"requires": {
-						"find-up": "^5.0.0"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"teen_process": {
-					"version": "2.0.50",
-					"resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.0.50.tgz",
-					"integrity": "sha512-DDppkV654MHUqIrZe2M4FK4NmTKxHHHlr/2M9yE0VrsY3iDUsZFbCIBzVEZ9fQ47Cem4JLtUp9ml4FGp3vR+Uw==",
-					"dev": true,
-					"requires": {
-						"bluebird": "3.7.2",
-						"lodash": "4.17.21",
-						"shell-quote": "1.8.1",
-						"source-map-support": "0.5.21"
-					}
-				},
-				"type-fest": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-					"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-					"dev": true
-				},
-				"typescript": {
-					"version": "5.0.4",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-					"integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
-					"dev": true
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yaml": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.3.tgz",
-					"integrity": "sha512-zw0VAJxgeZ6+++/su5AFoqBbZbrEakwu+X0M5HmcwUiBL7AzcuPKjj5we4xfQLp78LkEMpD0cOnUhmgOVy3KdQ==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "17.7.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-					"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-					"dev": true,
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-					"dev": true
-				}
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
-		"@appium/schema": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.3.1.tgz",
-			"integrity": "sha512-j1/vldw+De2/X+GG5Iy0Vtv9tAiADXjXGycc+nfttrHZNGATxn16xxEFmuoFFPCT77o4adcBrov8Y8l9+oUB2Q==",
-			"dev": true,
-			"requires": {
-				"@types/json-schema": "7.0.12",
-				"json-schema": "0.4.0",
-				"source-map-support": "0.5.21"
-			}
+		"packages/env/node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
 		},
-		"@appium/support": {
-			"version": "4.1.7",
-			"resolved": "https://registry.npmjs.org/@appium/support/-/support-4.1.7.tgz",
-			"integrity": "sha512-YcEVF9ix+LPoCcuxUj4P0MigQ7wd3f8OfHllR3dTzRauM9QU7nRt0NGxBtbhtV6YPjWg/mGmt/i/m1bJptKsKA==",
-			"dev": true,
-			"requires": {
-				"@appium/tsconfig": "^0.3.2",
-				"@appium/types": "^0.14.0",
-				"@colors/colors": "1.6.0",
-				"@types/archiver": "5.3.3",
-				"@types/base64-stream": "1.0.3",
-				"@types/find-root": "1.1.2",
-				"@types/jsftp": "2.1.3",
-				"@types/klaw": "3.0.4",
-				"@types/lockfile": "1.0.2",
-				"@types/mv": "2.1.2",
-				"@types/ncp": "2.0.6",
-				"@types/npmlog": "4.1.4",
-				"@types/pluralize": "0.0.31",
-				"@types/semver": "7.5.3",
-				"@types/shell-quote": "1.7.2",
-				"@types/supports-color": "8.1.1",
-				"@types/teen_process": "2.0.1",
-				"@types/uuid": "9.0.5",
-				"@types/which": "3.0.0",
-				"archiver": "6.0.1",
-				"axios": "1.5.1",
-				"base64-stream": "1.0.0",
-				"bluebird": "3.7.2",
-				"bplist-creator": "0.1.1",
-				"bplist-parser": "0.3.2",
-				"form-data": "4.0.0",
-				"get-stream": "6.0.1",
-				"glob": "10.3.10",
-				"jsftp": "2.1.3",
-				"klaw": "4.1.0",
-				"lockfile": "1.0.4",
-				"lodash": "4.17.21",
-				"log-symbols": "4.1.0",
-				"moment": "2.29.4",
-				"mv": "2.1.1",
-				"ncp": "2.0.0",
-				"npmlog": "7.0.1",
-				"opencv-bindings": "4.5.5",
-				"pkg-dir": "5.0.0",
-				"plist": "3.1.0",
-				"pluralize": "8.0.0",
-				"read-pkg": "5.2.0",
-				"resolve-from": "5.0.0",
-				"sanitize-filename": "1.6.3",
-				"semver": "7.5.4",
-				"sharp": "0.32.6",
-				"shell-quote": "1.8.1",
-				"source-map-support": "0.5.21",
-				"supports-color": "8.1.1",
-				"teen_process": "2.0.50",
-				"type-fest": "3.13.1",
-				"uuid": "9.0.1",
-				"which": "4.0.0",
-				"yauzl": "2.10.0"
+		"packages/env/node_modules/yaml": {
+			"version": "2.6.0",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+			"integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+			"license": "ISC",
+			"bin": {
+				"yaml": "bin.mjs"
 			},
-			"dependencies": {
-				"@appium/schema": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/@appium/schema/-/schema-0.4.0.tgz",
-					"integrity": "sha512-Wa+N2aXioe7j+7MP0fojsRSVGEiyHv2NsxJP5BgSRMPd65blIBSl1iAsYorQG/r1fmQA+NLPaPMnatHOTI+sqw==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "7.0.13",
-						"json-schema": "0.4.0",
-						"source-map-support": "0.5.21"
-					}
-				},
-				"@appium/types": {
-					"version": "0.14.0",
-					"resolved": "https://registry.npmjs.org/@appium/types/-/types-0.14.0.tgz",
-					"integrity": "sha512-PKiJSyaInSfpFQVjLS2e+e9QFocKvm+vmwOGOC99GAPLgLsMHZdQQNOCRk36VJXFu3U1Dn2+eBuHpWGD+hv9jg==",
-					"dev": true,
-					"requires": {
-						"@appium/schema": "^0.4.0",
-						"@appium/tsconfig": "^0.3.2",
-						"@types/express": "4.17.19",
-						"@types/npmlog": "4.1.4",
-						"@types/ws": "8.5.7",
-						"type-fest": "3.13.1"
-					}
-				},
-				"@colors/colors": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
-					"integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
-					"dev": true
-				},
-				"@types/express": {
-					"version": "4.17.19",
-					"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.19.tgz",
-					"integrity": "sha512-UtOfBtzN9OvpZPPbnnYunfjM7XCI4jyk1NvnFhTVz5krYAnW4o5DCoIekvms+8ApqhB4+9wSge1kBijdfTSmfg==",
-					"dev": true,
-					"requires": {
-						"@types/body-parser": "*",
-						"@types/express-serve-static-core": "^4.17.33",
-						"@types/qs": "*",
-						"@types/serve-static": "*"
-					}
-				},
-				"@types/json-schema": {
-					"version": "7.0.13",
-					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
-					"integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
-					"dev": true
-				},
-				"@types/semver": {
-					"version": "7.5.3",
-					"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz",
-					"integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==",
-					"dev": true
-				},
-				"@types/teen_process": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/@types/teen_process/-/teen_process-2.0.1.tgz",
-					"integrity": "sha512-hSLCkcQa9Ok1Mg0c1NbCJh9km6Gynj/7mHF2wQQNiiugMGkbhGfToZwEW78XRBnlw3784B6C8nsYnVeiU9bEwg==",
-					"dev": true,
-					"requires": {
-						"@types/node": "*"
-					}
-				},
-				"@types/uuid": {
-					"version": "9.0.5",
-					"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.5.tgz",
-					"integrity": "sha512-xfHdwa1FMJ082prjSJpoEI57GZITiQz10r3vEJCHa2khEFQjKy91aWKz6+zybzssCvXUwE1LQWgWVwZ4nYUvHQ==",
-					"dev": true
-				},
-				"@types/ws": {
-					"version": "8.5.7",
-					"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.7.tgz",
-					"integrity": "sha512-6UrLjiDUvn40CMrAubXuIVtj2PEfKDffJS7ychvnPU44j+KVeXmdHHTgqcM/dxLUTHxlXHiFM8Skmb8ozGdTnQ==",
-					"dev": true,
-					"requires": {
-						"@types/node": "*"
-					}
-				},
-				"are-we-there-yet": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.1.tgz",
-					"integrity": "sha512-2zuA+jpOYBRgoBCfa+fB87Rk0oGJjDX6pxGzqH6f33NzUhG25Xur6R0u0Z9VVAq8Z5JvQpQI6j6rtonuivC8QA==",
-					"dev": true,
-					"requires": {
-						"delegates": "^1.0.0",
-						"readable-stream": "^4.1.0"
-					}
-				},
-				"axios": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-					"integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
-					"dev": true,
-					"requires": {
-						"follow-redirects": "^1.15.0",
-						"form-data": "^4.0.0",
-						"proxy-from-env": "^1.1.0"
-					}
-				},
-				"bplist-parser": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz",
-					"integrity": "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==",
-					"dev": true,
-					"requires": {
-						"big-integer": "1.6.x"
-					}
-				},
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"buffer": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-					"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-					"dev": true,
-					"requires": {
-						"base64-js": "^1.3.1",
-						"ieee754": "^1.2.1"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					},
-					"dependencies": {
-						"which": {
-							"version": "2.0.2",
-							"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-							"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-							"dev": true,
-							"requires": {
-								"isexe": "^2.0.0"
-							}
-						}
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"foreground-child": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-					"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"signal-exit": "^4.0.1"
-					}
-				},
-				"gauge": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.1.tgz",
-					"integrity": "sha512-CmykPMJGuNan/3S4kZOpvvPYSNqSHANiWnh9XcMU2pSjtBfF0XzZ2p1bFAxTbnFxyBuPxQYHhzwaoOmUdqzvxQ==",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.0.3 || ^2.0.0",
-						"color-support": "^1.1.3",
-						"console-control-strings": "^1.1.0",
-						"has-unicode": "^2.0.1",
-						"signal-exit": "^4.0.1",
-						"string-width": "^4.2.3",
-						"strip-ansi": "^6.0.1",
-						"wide-align": "^1.1.5"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"glob": {
-					"version": "10.3.10",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-					"integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
-					"dev": true,
-					"requires": {
-						"foreground-child": "^3.1.0",
-						"jackspeak": "^2.3.5",
-						"minimatch": "^9.0.1",
-						"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-						"path-scurry": "^1.10.1"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"minimatch": {
-					"version": "9.0.3",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-					"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				},
-				"minipass": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-					"integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
-					"dev": true
-				},
-				"npmlog": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-7.0.1.tgz",
-					"integrity": "sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==",
-					"dev": true,
-					"requires": {
-						"are-we-there-yet": "^4.0.0",
-						"console-control-strings": "^1.1.0",
-						"gauge": "^5.0.0",
-						"set-blocking": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
-					"integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
-					"dev": true,
-					"requires": {
-						"find-up": "^5.0.0"
-					}
-				},
-				"readable-stream": {
-					"version": "4.4.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz",
-					"integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==",
-					"dev": true,
-					"requires": {
-						"abort-controller": "^3.0.0",
-						"buffer": "^6.0.3",
-						"events": "^3.3.0",
-						"process": "^0.11.10",
-						"string_decoder": "^1.3.0"
-					}
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"signal-exit": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-					"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-					"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "~5.2.0"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"teen_process": {
-					"version": "2.0.50",
-					"resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.0.50.tgz",
-					"integrity": "sha512-DDppkV654MHUqIrZe2M4FK4NmTKxHHHlr/2M9yE0VrsY3iDUsZFbCIBzVEZ9fQ47Cem4JLtUp9ml4FGp3vR+Uw==",
-					"dev": true,
-					"requires": {
-						"bluebird": "3.7.2",
-						"lodash": "4.17.21",
-						"shell-quote": "1.8.1",
-						"source-map-support": "0.5.21"
-					}
-				},
-				"type-fest": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-					"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-					"dev": true
-				},
-				"which": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-					"integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
-					"dev": true,
-					"requires": {
-						"isexe": "^3.1.1"
-					},
-					"dependencies": {
-						"isexe": {
-							"version": "3.1.1",
-							"resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-							"integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-							"dev": true
-						}
-					}
-				}
+			"engines": {
+				"node": ">= 14"
 			}
 		},
-		"@appium/tsconfig": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@appium/tsconfig/-/tsconfig-0.3.2.tgz",
-			"integrity": "sha512-GPJKATPBHbOC1lRX3+mq4wPRHzilEsBDh64TFBa156BtBRPhKi2DoLv38I93gNAWPJ+StwqZ5YMndriuu/8jKQ==",
-			"dev": true,
-			"requires": {
-				"@tsconfig/node14": "14.1.0"
+		"packages/env/node_modules/yargs": {
+			"version": "17.7.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+			"dependencies": {
+				"cliui": "^8.0.1",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.3",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^21.1.1"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"@appium/typedoc-plugin-appium": {
-			"version": "0.6.6",
-			"resolved": "https://registry.npmjs.org/@appium/typedoc-plugin-appium/-/typedoc-plugin-appium-0.6.6.tgz",
-			"integrity": "sha512-sZwhveCtUti2QPAhHWysE8IJVyT9KLUwLxXUBnvDjamEm8cuJmqQDDW9nPgv6iiw1bz9ankv/VLYI8egIpTl6g==",
-			"dev": true,
-			"requires": {
-				"handlebars": "4.7.8",
-				"lodash": "4.17.21",
-				"pluralize": "8.0.0",
-				"type-fest": "3.13.1"
-			},
+		"packages/env/node_modules/yargs-parser": {
+			"version": "21.1.1",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
+		},
+		"packages/escape-html": {
+			"name": "@wordpress/escape-html",
+			"version": "3.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"type-fest": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-					"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-					"dev": true
-				}
+				"@babel/runtime": "7.25.7"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@appium/types": {
-			"version": "0.13.4",
-			"resolved": "https://registry.npmjs.org/@appium/types/-/types-0.13.4.tgz",
-			"integrity": "sha512-Kly8Bf6x6sbP8zt8+WFI9bIh8W+1N8sf2eBrbAoluk8/875sJe9X4JUSvJSxH6ew/C4Yo1e3J/hVywY5AF19ug==",
-			"dev": true,
-			"requires": {
-				"@appium/schema": "^0.3.1",
-				"@appium/tsconfig": "^0.3.1",
-				"@types/express": "4.17.17",
-				"@types/npmlog": "4.1.4",
-				"@types/ws": "8.5.5",
-				"type-fest": "3.13.1"
-			},
+		"packages/eslint-plugin": {
+			"name": "@wordpress/eslint-plugin",
+			"version": "21.3.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"type-fest": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-					"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-					"dev": true
+				"@babel/eslint-parser": "7.25.7",
+				"@typescript-eslint/eslint-plugin": "^6.4.1",
+				"@typescript-eslint/parser": "^6.4.1",
+				"@wordpress/babel-preset-default": "*",
+				"@wordpress/prettier-config": "*",
+				"cosmiconfig": "^7.0.0",
+				"eslint-config-prettier": "^8.3.0",
+				"eslint-plugin-import": "^2.25.2",
+				"eslint-plugin-jest": "^27.2.3",
+				"eslint-plugin-jsdoc": "^46.4.6",
+				"eslint-plugin-jsx-a11y": "^6.5.1",
+				"eslint-plugin-playwright": "^0.15.3",
+				"eslint-plugin-prettier": "^5.0.0",
+				"eslint-plugin-react": "^7.27.0",
+				"eslint-plugin-react-hooks": "^4.3.0",
+				"globals": "^13.12.0",
+				"requireindex": "^1.2.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7",
+				"eslint": ">=8",
+				"prettier": ">=3",
+				"typescript": ">=4"
+			},
+			"peerDependenciesMeta": {
+				"prettier": {
+					"optional": true
+				},
+				"typescript": {
+					"optional": true
 				}
 			}
 		},
-		"@ariakit/core": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.4.tgz",
-			"integrity": "sha512-mMTWYOs0SvkrBbLPy4IY15E+fgvSbZKg4XzpBwE17meBG+G7wJjnuHq8lNiIAn9VnQBIc/lsXxqH3FCD7hHaUg=="
-		},
-		"@ariakit/react": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.3.5.tgz",
-			"integrity": "sha512-x7LfGP0on0lVV1NcDNO8+aEBb64sUI6YYB1akEWXkb4lTiU4uG1sHGc8YhfHVh0cFS1kwpQcqyiNPzyB8OgymA==",
-			"requires": {
-				"@ariakit/react-core": "0.3.5"
+		"packages/eslint-plugin/node_modules/@babel/eslint-parser": {
+			"version": "7.25.7",
+			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.7.tgz",
+			"integrity": "sha512-B+BO9x86VYsQHimucBAL1fxTJKF4wyKY6ZVzee9QgzdZOUfs3BaR6AQrgoGrRI+7IFS1wUz/VyQ+SoBcSpdPbw==",
+			"license": "MIT",
+			"dependencies": {
+				"@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+				"eslint-visitor-keys": "^2.1.0",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.11.0",
+				"eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
 			}
 		},
-		"@ariakit/react-core": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.3.5.tgz",
-			"integrity": "sha512-TdQmUj7BPJ7QWjpjlpP5M1YbANDQL/voYYvKq1Hele7uoEWk51v2nZNaNXo9DZ4He/bkG99ISDx5Tgkzi5En8Q==",
-			"requires": {
-				"@ariakit/core": "0.3.4",
-				"@floating-ui/dom": "^1.0.0",
-				"use-sync-external-store": "^1.2.0"
+		"packages/eslint-plugin/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
 			}
 		},
-		"@ariakit/test": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@ariakit/test/-/test-0.3.0.tgz",
-			"integrity": "sha512-fngAzkzCl9zM4O/tzVaUf7ixWUAk779hjTegr/zcegoxaMS5SmaLhNQ7RU0AGx06LrhJse6GYGy8ZtK58HP/EQ==",
-			"dev": true,
-			"requires": {
-				"@ariakit/core": "0.3.3",
-				"@testing-library/dom": "^8.0.0 || ^9.0.0"
-			},
+		"packages/fields": {
+			"name": "@wordpress/fields",
+			"version": "0.2.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@ariakit/core": {
-					"version": "0.3.3",
-					"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.3.tgz",
-					"integrity": "sha512-8x77R0aE9O9pheygg+h/z0oU9Wx/Xdlr7nfkl4klGnkJma8/nAhJ2RrchCTQCUef4WMsRnq/doCz8m/sslP6CA==",
-					"dev": true
-				}
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/blob": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/dataviews": "*",
+				"@wordpress/element": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/media-utils": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/patterns": "*",
+				"@wordpress/primitives": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/router": "*",
+				"@wordpress/url": "*",
+				"@wordpress/warning": "*",
+				"change-case": "4.1.2",
+				"client-zip": "^2.4.5"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"@aw-web-design/x-default-browser": {
-			"version": "1.4.126",
-			"resolved": "https://registry.npmjs.org/@aw-web-design/x-default-browser/-/x-default-browser-1.4.126.tgz",
-			"integrity": "sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==",
-			"dev": true,
-			"requires": {
-				"default-browser-id": "3.0.0"
+		"packages/format-library": {
+			"name": "@wordpress/format-library",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/element": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/rich-text": "*",
+				"@wordpress/url": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"@axe-core/puppeteer": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@axe-core/puppeteer/-/puppeteer-4.0.0.tgz",
-			"integrity": "sha512-APFc2iRmrmUfqdBUevjsMxJliDudWPwvCU5Pzw2uKZ0sMVtW3rQuElTcfJCHFq8KOZSSO0BPD+lK+pXOx1ta5Q==",
-			"dev": true,
-			"requires": {
-				"axe-core": "^4.0.1"
+		"packages/hooks": {
+			"name": "@wordpress/hooks",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/code-frame": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
-			"integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
-			"requires": {
-				"@babel/highlight": "^7.22.10",
-				"chalk": "^2.4.2"
-			},
+		"packages/html-entities": {
+			"name": "@wordpress/html-entities",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				}
+				"@babel/runtime": "7.25.7"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/compat-data": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-			"integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
-		},
-		"@babel/core": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz",
-			"integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==",
-			"requires": {
-				"@babel/code-frame": "^7.16.0",
-				"@babel/generator": "^7.16.0",
-				"@babel/helper-compilation-targets": "^7.16.0",
-				"@babel/helper-module-transforms": "^7.16.0",
-				"@babel/helpers": "^7.16.0",
-				"@babel/parser": "^7.16.0",
-				"@babel/template": "^7.16.0",
-				"@babel/traverse": "^7.16.0",
-				"@babel/types": "^7.16.0",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.1.2",
-				"semver": "^6.3.0",
-				"source-map": "^0.5.0"
-			},
+		"packages/i18n": {
+			"name": "@wordpress/i18n",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-				}
+				"@babel/runtime": "7.25.7",
+				"@wordpress/hooks": "*",
+				"gettext-parser": "^1.3.1",
+				"memize": "^2.1.0",
+				"sprintf-js": "^1.1.1",
+				"tannin": "^1.2.0"
+			},
+			"bin": {
+				"pot-to-php": "tools/pot-to-php.js"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/eslint-parser": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.0.tgz",
-			"integrity": "sha512-c+AsYOHjI+FgCa+ifLd8sDXp4U4mjkfFgL9NdQWhuA731kAUJs0WdJIXET4A14EJAR9Jv9FFF/MzPWJfV9Oirw==",
-			"dev": true,
-			"requires": {
-				"eslint-scope": "^5.1.1",
-				"eslint-visitor-keys": "^2.1.0",
-				"semver": "^6.3.0"
-			},
+		"packages/icons": {
+			"name": "@wordpress/icons",
+			"version": "10.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"eslint-scope": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-					"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-					"dev": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^4.1.1"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
+				"@babel/runtime": "7.25.7",
+				"@wordpress/element": "*",
+				"@wordpress/primitives": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/generator": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-			"integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
-			"requires": {
-				"@babel/types": "^7.22.10",
-				"@jridgewell/gen-mapping": "^0.3.2",
-				"@jridgewell/trace-mapping": "^0.3.17",
-				"jsesc": "^2.5.1"
+		"packages/interactivity": {
+			"name": "@wordpress/interactivity",
+			"version": "6.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@preact/signals": "^1.3.0",
+				"preact": "^10.24.2"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/helper-annotate-as-pure": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-			"integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-			"requires": {
-				"@babel/types": "^7.22.5"
+		"packages/interactivity-router": {
+			"name": "@wordpress/interactivity-router",
+			"version": "2.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@wordpress/a11y": "*",
+				"@wordpress/interactivity": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/helper-builder-binary-assignment-operator-visitor": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
-			"integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.22.10"
+		"packages/interface": {
+			"name": "@wordpress/interface",
+			"version": "7.0.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/plugins": "*",
+				"@wordpress/preferences": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/viewport": "*",
+				"clsx": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"@babel/helper-compilation-targets": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-			"integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
-			"requires": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-validator-option": "^7.22.5",
-				"browserslist": "^4.21.9",
-				"lru-cache": "^5.1.1",
-				"semver": "^6.3.1"
-			},
+		"packages/is-shallow-equal": {
+			"name": "@wordpress/is-shallow-equal",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				},
-				"yallist": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-				}
+				"@babel/runtime": "7.25.7"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/helper-create-class-features-plugin": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz",
-			"integrity": "sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-member-expression-to-functions": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"semver": "^6.3.1"
-			},
+		"packages/jest-console": {
+			"name": "@wordpress/jest-console",
+			"version": "8.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
+				"@babel/runtime": "7.25.7",
+				"jest-matcher-utils": "^29.6.2"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"jest": ">=29"
 			}
 		},
-		"@babel/helper-create-regexp-features-plugin": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
-			"integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"regexpu-core": "^5.3.1",
-				"semver": "^6.3.1"
-			},
+		"packages/jest-preset-default": {
+			"name": "@wordpress/jest-preset-default",
+			"version": "12.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
+				"@wordpress/jest-console": "*",
+				"babel-jest": "29.7.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7",
+				"jest": ">=29"
 			}
 		},
-		"@babel/helper-define-polyfill-provider": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz",
-			"integrity": "sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==",
-			"requires": {
-				"@babel/helper-compilation-targets": "^7.13.0",
-				"@babel/helper-module-imports": "^7.12.13",
-				"@babel/helper-plugin-utils": "^7.13.0",
-				"@babel/traverse": "^7.13.0",
-				"debug": "^4.1.1",
-				"lodash.debounce": "^4.0.8",
-				"resolve": "^1.14.2",
-				"semver": "^6.1.2"
-			},
+		"packages/jest-puppeteer-axe": {
+			"name": "@wordpress/jest-puppeteer-axe",
+			"version": "7.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+				"@axe-core/puppeteer": "^4.0.0",
+				"@babel/runtime": "7.25.7"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"jest": ">=29",
+				"puppeteer": ">=11"
+			},
+			"peerDependenciesMeta": {
+				"puppeteer": {
+					"optional": true
 				}
 			}
 		},
-		"@babel/helper-environment-visitor": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-			"integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
-		},
-		"@babel/helper-function-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-			"integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
-			"requires": {
-				"@babel/template": "^7.22.5",
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-hoist-variables": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-			"integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-			"requires": {
-				"@babel/types": "^7.22.5"
+		"packages/keyboard-shortcuts": {
+			"name": "@wordpress/keyboard-shortcuts",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/data": "*",
+				"@wordpress/element": "*",
+				"@wordpress/keycodes": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"@babel/helper-member-expression-to-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-			"integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
-			"requires": {
-				"@babel/types": "^7.22.5"
+		"packages/keycodes": {
+			"name": "@wordpress/keycodes",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/i18n": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/helper-module-imports": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-			"integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
-			"requires": {
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-module-transforms": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-			"integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-simple-access": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/helper-validator-identifier": "^7.22.5"
-			}
-		},
-		"@babel/helper-optimise-call-expression": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-			"integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
-			"requires": {
-				"@babel/types": "^7.22.5"
+		"packages/lazy-import": {
+			"name": "@wordpress/lazy-import",
+			"version": "2.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"execa": "^4.0.2",
+				"npm-package-arg": "^8.1.5",
+				"semver": "^7.3.5"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/helper-plugin-utils": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-			"integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
-		},
-		"@babel/helper-remap-async-to-generator": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
-			"integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-wrap-function": "^7.22.9"
+		"packages/list-reusable-blocks": {
+			"name": "@wordpress/list-reusable-blocks",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/blob": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"change-case": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"@babel/helper-replace-supers": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
-			"integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-member-expression-to-functions": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5"
+		"packages/media-utils": {
+			"name": "@wordpress/media-utils",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/blob": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/helper-simple-access": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-			"integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-			"requires": {
-				"@babel/types": "^7.22.5"
+		"packages/notices": {
+			"name": "@wordpress/notices",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/data": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-			"integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
-			"requires": {
-				"@babel/types": "^7.22.5"
+		"packages/npm-package-json-lint-config": {
+			"name": "@wordpress/npm-package-json-lint-config",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"npm-package-json-lint": ">=6.0.0"
 			}
 		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.22.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-			"integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-			"requires": {
-				"@babel/types": "^7.22.5"
+		"packages/nux": {
+			"name": "@wordpress/nux",
+			"version": "9.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"@babel/helper-string-parser": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-			"integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
-		},
-		"@babel/helper-validator-identifier": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-			"integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
-		},
-		"@babel/helper-validator-option": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-			"integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
-		},
-		"@babel/helper-wrap-function": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
-			"integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
-			"requires": {
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/template": "^7.22.5",
-				"@babel/types": "^7.22.10"
-			}
-		},
-		"@babel/helpers": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
-			"integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
-			"requires": {
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10"
-			},
-			"dependencies": {
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				}
+		"packages/patterns": {
+			"name": "@wordpress/patterns",
+			"version": "2.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/element": "*",
+				"@wordpress/html-entities": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/url": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"@babel/highlight": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-			"integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.22.5",
-				"chalk": "^2.4.2",
-				"js-tokens": "^4.0.0"
-			},
+		"packages/plugins": {
+			"name": "@wordpress/plugins",
+			"version": "7.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				}
+				"@babel/runtime": "7.25.7",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/element": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/is-shallow-equal": "*",
+				"memize": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"@babel/parser": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
-			"integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ=="
-		},
-		"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-			"integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+		"packages/postcss-plugins-preset": {
+			"name": "@wordpress/postcss-plugins-preset",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@wordpress/base-styles": "*",
+				"autoprefixer": "^10.2.5"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"postcss": "^8.0.0"
 			}
 		},
-		"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-			"integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/plugin-transform-optional-chaining": "^7.22.5"
+		"packages/postcss-themes": {
+			"name": "@wordpress/postcss-themes",
+			"version": "6.10.0",
+			"license": "GPL-2.0-or-later",
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"postcss": "^8.0.0"
 			}
 		},
-		"@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz",
-			"integrity": "sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/helper-remap-async-to-generator": "^7.16.0",
-				"@babel/plugin-syntax-async-generators": "^7.8.4"
+		"packages/preferences": {
+			"name": "@wordpress/preferences",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/private-apis": "*",
+				"clsx": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"@babel/plugin-proposal-class-properties": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz",
-			"integrity": "sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A==",
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.16.0",
-				"@babel/helper-plugin-utils": "^7.14.5"
+		"packages/preferences-persistence": {
+			"name": "@wordpress/preferences-persistence",
+			"version": "2.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/plugin-proposal-export-default-from": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.16.0.tgz",
-			"integrity": "sha512-kFAhaIbh5qbBwETRNa/cgGmPJ/BicXhIyrZhAkyYhf/Z9LXCTRGO1mvUwczto0Hl1q4YtzP9cRtTKT4wujm38Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/plugin-syntax-export-default-from": "^7.16.0"
+		"packages/prettier-config": {
+			"name": "@wordpress/prettier-config",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"prettier": ">=3"
 			}
 		},
-		"@babel/plugin-proposal-export-namespace-from": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-			"integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+		"packages/primitives": {
+			"name": "@wordpress/primitives",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/element": "*",
+				"clsx": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"@babel/plugin-proposal-nullish-coalescing-operator": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz",
-			"integrity": "sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+		"packages/priority-queue": {
+			"name": "@wordpress/priority-queue",
+			"version": "3.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"requestidlecallback": "^0.3.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.20.7",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
-			"integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
-			"requires": {
-				"@babel/compat-data": "^7.20.5",
-				"@babel/helper-compilation-targets": "^7.20.7",
-				"@babel/helper-plugin-utils": "^7.20.2",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.20.7"
+		"packages/private-apis": {
+			"name": "@wordpress/private-apis",
+			"version": "1.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/plugin-proposal-optional-catch-binding": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz",
-			"integrity": "sha512-kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+		"packages/project-management-automation": {
+			"name": "@wordpress/project-management-automation",
+			"version": "2.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@actions/core": "1.9.1",
+				"@actions/github": "^5.0.0",
+				"@babel/runtime": "7.25.7",
+				"@octokit/request-error": "^2.1.0",
+				"@octokit/webhooks": "^9.26.3"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/plugin-proposal-optional-chaining": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz",
-			"integrity": "sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
+		"packages/project-management-automation/node_modules/@octokit/webhooks": {
+			"version": "9.26.3",
+			"resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-9.26.3.tgz",
+			"integrity": "sha512-DLGk+gzeVq5oK89Bo601txYmyrelMQ7Fi5EnjHE0Xs8CWicy2xkmnJMKptKJrBJpstqbd/9oeDFi/Zj2pudBDQ==",
+			"license": "MIT",
+			"dependencies": {
+				"@octokit/request-error": "^2.0.2",
+				"@octokit/webhooks-methods": "^2.0.0",
+				"@octokit/webhooks-types": "5.8.0",
+				"aggregate-error": "^3.1.0"
 			}
 		},
-		"@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+		"packages/react-i18n": {
+			"name": "@wordpress/react-i18n",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"utility-types": "^3.10.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/plugin-syntax-bigint": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+		"packages/react-native-aztec": {
+			"name": "@wordpress/react-native-aztec",
+			"version": "1.121.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@wordpress/element": "*",
+				"@wordpress/keycodes": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "*",
+				"react-native": "*"
 			}
 		},
-		"@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.12.13"
+		"packages/react-native-bridge": {
+			"name": "@wordpress/react-native-bridge",
+			"version": "1.121.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@wordpress/react-native-aztec": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react-native": "*"
 			}
 		},
-		"@babel/plugin-syntax-class-static-block": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
+		"packages/react-native-editor": {
+			"name": "@wordpress/react-native-editor",
+			"version": "1.121.0",
+			"hasInstallScript": true,
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@react-native-clipboard/clipboard": "1.11.2",
+				"@react-native-community/blur": "4.2.0",
+				"@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-5/react-native-community-slider-3.0.2-wp-5.tgz",
+				"@react-native-masked-view/masked-view": "0.3.0",
+				"@react-navigation/core": "5.12.0",
+				"@react-navigation/native": "6.0.14",
+				"@react-navigation/routers": "5.4.9",
+				"@react-navigation/stack": "6.3.5",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/block-library": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/data": "*",
+				"@wordpress/edit-post": "*",
+				"@wordpress/element": "*",
+				"@wordpress/hooks": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/react-native-aztec": "*",
+				"@wordpress/react-native-bridge": "*",
+				"core-js": "^3.31.0",
+				"fast-average-color": "^9.1.1",
+				"gettext-parser": "^1.3.1",
+				"jed": "^1.1.1",
+				"jsdom-jscore-rn": "0.1.8",
+				"node-fetch": "2.7.0",
+				"react-native": "0.73.3",
+				"react-native-fast-image": "8.5.11",
+				"react-native-gesture-handler": "2.14.1",
+				"react-native-get-random-values": "1.4.0",
+				"react-native-linear-gradient": "2.7.3",
+				"react-native-modal": "13.0.1",
+				"react-native-reanimated": "3.6.2",
+				"react-native-safe-area": "^0.5.0",
+				"react-native-safe-area-context": "4.8.2",
+				"react-native-sass-transformer": "^1.1.1",
+				"react-native-screens": "3.29.0",
+				"react-native-svg": "14.0.0",
+				"react-native-url-polyfill": "1.3.0",
+				"react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-7/react-native-video-5.2.0-wp-7.tgz",
+				"react-native-webview": "13.6.1"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/plugin-syntax-dynamic-import": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-			"integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+		"packages/react-native-editor/node_modules/buffer": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.1.13"
 			}
 		},
-		"@babel/plugin-syntax-export-default-from": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.16.0.tgz",
-			"integrity": "sha512-xllLOdBj77mFSw8s02I+2SSQGHOftbWTlGmagheuNk/gjQsk7IrYsR/EosXVAVpgIUFffLckB/iPRioQYLHSrQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
+		"packages/react-native-editor/node_modules/react-native-url-polyfill": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz",
+			"integrity": "sha512-w9JfSkvpqqlix9UjDvJjm1EjSt652zVQ6iwCIj1cVVkwXf4jQhQgTNXY6EVTwuAmUjg6BC6k9RHCBynoLFo3IQ==",
+			"dependencies": {
+				"whatwg-url-without-unicode": "8.0.0-3"
+			},
+			"peerDependencies": {
+				"react-native": "*"
 			}
 		},
-		"@babel/plugin-syntax-export-namespace-from": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.3"
+		"packages/react-native-editor/node_modules/webidl-conversions": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+			"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@babel/plugin-syntax-flow": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz",
-			"integrity": "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+		"packages/react-native-editor/node_modules/whatwg-url-without-unicode": {
+			"version": "8.0.0-3",
+			"resolved": "https://registry.npmjs.org/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-3.tgz",
+			"integrity": "sha512-HoKuzZrUlgpz35YO27XgD28uh/WJH4B0+3ttFqRo//lmq+9T/mIOJ6kqmINI9HpUpz1imRC/nR/lxKpJiv0uig==",
+			"dependencies": {
+				"buffer": "^5.4.3",
+				"punycode": "^2.1.1",
+				"webidl-conversions": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"@babel/plugin-syntax-import-assertions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-			"integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+		"packages/readable-js-assets-webpack-plugin": {
+			"name": "@wordpress/readable-js-assets-webpack-plugin",
+			"version": "3.10.0",
+			"license": "GPL-2.0-or-later",
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"webpack": "^4.8.3 || ^5.0.0"
 			}
 		},
-		"@babel/plugin-syntax-import-attributes": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-			"integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+		"packages/redux-routine": {
+			"name": "@wordpress/redux-routine",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"is-plain-object": "^5.0.0",
+				"is-promise": "^4.0.0",
+				"rungen": "^0.3.2"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"redux": ">=4"
 			}
 		},
-		"@babel/plugin-syntax-import-meta": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+		"packages/report-flaky-tests": {
+			"name": "@wordpress/report-flaky-tests",
+			"version": "0.0.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@actions/core": "^1.8.0",
+				"@actions/github": "^5.0.1",
+				"jest-message-util": "^29.6.2"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+		"packages/report-flaky-tests/node_modules/@actions/github": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
+			"integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
+			"dependencies": {
+				"@actions/http-client": "^2.0.1",
+				"@octokit/core": "^3.6.0",
+				"@octokit/plugin-paginate-rest": "^2.17.0",
+				"@octokit/plugin-rest-endpoint-methods": "^5.13.0"
 			}
 		},
-		"@babel/plugin-syntax-jsx": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz",
-			"integrity": "sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
+		"packages/reusable-blocks": {
+			"name": "@wordpress/reusable-blocks",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/block-editor": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/notices": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/url": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+		"packages/rich-text": {
+			"name": "@wordpress/rich-text",
+			"version": "7.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/a11y": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/element": "*",
+				"@wordpress/escape-html": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/keycodes": "*",
+				"memize": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+		"packages/router": {
+			"name": "@wordpress/router",
+			"version": "1.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/element": "*",
+				"@wordpress/private-apis": "*",
+				"@wordpress/url": "*",
+				"history": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+		"packages/scripts": {
+			"name": "@wordpress/scripts",
+			"version": "30.3.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/core": "7.25.7",
+				"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+				"@svgr/webpack": "^8.0.1",
+				"@wordpress/babel-preset-default": "*",
+				"@wordpress/browserslist-config": "*",
+				"@wordpress/dependency-extraction-webpack-plugin": "*",
+				"@wordpress/e2e-test-utils-playwright": "*",
+				"@wordpress/eslint-plugin": "*",
+				"@wordpress/jest-preset-default": "*",
+				"@wordpress/npm-package-json-lint-config": "*",
+				"@wordpress/postcss-plugins-preset": "*",
+				"@wordpress/prettier-config": "*",
+				"@wordpress/stylelint-config": "*",
+				"adm-zip": "^0.5.9",
+				"babel-jest": "29.7.0",
+				"babel-loader": "9.2.1",
+				"browserslist": "^4.21.10",
+				"chalk": "^4.0.0",
+				"check-node-version": "^4.1.0",
+				"clean-webpack-plugin": "^3.0.0",
+				"copy-webpack-plugin": "^10.2.0",
+				"cross-spawn": "^5.1.0",
+				"css-loader": "^6.2.0",
+				"cssnano": "^6.0.1",
+				"cwd": "^0.10.0",
+				"dir-glob": "^3.0.1",
+				"eslint": "^8.3.0",
+				"expect-puppeteer": "^4.4.0",
+				"fast-glob": "^3.2.7",
+				"filenamify": "^4.2.0",
+				"jest": "^29.6.2",
+				"jest-dev-server": "^9.0.1",
+				"jest-environment-jsdom": "^29.6.2",
+				"jest-environment-node": "^29.6.2",
+				"json2php": "^0.0.9",
+				"markdownlint-cli": "^0.31.1",
+				"merge-deep": "^3.0.3",
+				"mini-css-extract-plugin": "^2.5.1",
+				"minimist": "^1.2.0",
+				"npm-package-json-lint": "^6.4.0",
+				"npm-packlist": "^3.0.0",
+				"postcss": "^8.4.5",
+				"postcss-import": "^16.1.0",
+				"postcss-loader": "^6.2.1",
+				"prettier": "npm:wp-prettier@3.0.3",
+				"puppeteer-core": "^23.1.0",
+				"react-refresh": "^0.14.0",
+				"read-pkg-up": "^7.0.1",
+				"resolve-bin": "^0.4.0",
+				"rtlcss-webpack-plugin": "^4.0.7",
+				"sass": "^1.35.2",
+				"sass-loader": "^12.1.0",
+				"schema-utils": "^4.2.0",
+				"source-map-loader": "^3.0.0",
+				"stylelint": "^16.8.2",
+				"terser-webpack-plugin": "^5.3.10",
+				"url-loader": "^4.1.1",
+				"webpack": "^5.95.0",
+				"webpack-bundle-analyzer": "^4.9.1",
+				"webpack-cli": "^5.1.4",
+				"webpack-dev-server": "^4.15.1"
+			},
+			"bin": {
+				"wp-scripts": "bin/wp-scripts.js"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"@playwright/test": "^1.48.1",
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"@babel/plugin-syntax-object-rest-spread": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+		"packages/scripts/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+		"packages/scripts/node_modules/axios": {
+			"version": "1.7.7",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+			"integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+			"license": "MIT",
+			"dependencies": {
+				"follow-redirects": "^1.15.6",
+				"form-data": "^4.0.0",
+				"proxy-from-env": "^1.1.0"
 			}
 		},
-		"@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+		"packages/scripts/node_modules/babel-loader": {
+			"version": "8.4.1",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz",
+			"integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==",
+			"license": "MIT",
+			"dependencies": {
+				"find-cache-dir": "^3.3.1",
+				"loader-utils": "^2.0.4",
+				"make-dir": "^3.1.0",
+				"schema-utils": "^2.6.5"
+			},
+			"engines": {
+				"node": ">= 8.9"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0",
+				"webpack": ">=2"
 			}
 		},
-		"@babel/plugin-syntax-private-property-in-object": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			}
-		},
-		"@babel/plugin-syntax-top-level-await": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			}
-		},
-		"@babel/plugin-syntax-typescript": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
-			"integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-syntax-unicode-sets-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
-			"integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-arrow-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-			"integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-async-generator-functions": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
-			"integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.9",
-				"@babel/plugin-syntax-async-generators": "^7.8.4"
-			}
-		},
-		"@babel/plugin-transform-async-to-generator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-			"integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
-			"requires": {
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-			"integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-block-scoping": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
-			"integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-class-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-			"integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-class-static-block": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-			"integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5"
-			}
-		},
-		"@babel/plugin-transform-classes": {
-			"version": "7.22.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
-			"integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-compilation-targets": "^7.22.6",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"globals": "^11.1.0"
-			},
-			"dependencies": {
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				}
-			}
-		},
-		"@babel/plugin-transform-computed-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-			"integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/template": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-destructuring": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
-			"integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-dotall-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-			"integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-duplicate-keys": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-			"integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-dynamic-import": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-			"integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-			"integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-export-namespace-from": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-			"integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-flow-strip-types": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz",
-			"integrity": "sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-flow": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-for-of": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-			"integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-function-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-			"integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
-			"requires": {
-				"@babel/helper-compilation-targets": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-json-strings": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-			"integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-json-strings": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-			"integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-logical-assignment-operators": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-			"integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-			}
-		},
-		"@babel/plugin-transform-member-expression-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-			"integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-modules-amd": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-			"integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-modules-commonjs": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-			"integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
-			"requires": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-simple-access": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-modules-systemjs": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-			"integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-modules-umd": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-			"integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-			"integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-new-target": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-			"integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-nullish-coalescing-operator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-			"integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-numeric-separator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-			"integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
-			}
-		},
-		"@babel/plugin-transform-object-assign": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.22.5.tgz",
-			"integrity": "sha512-iDhx9ARkXq4vhZ2CYOSnQXkmxkDgosLi3J8Z17mKz7LyzthtkdVchLD7WZ3aXeCuvJDOW3+1I5TpJmwIbF9MKQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-object-rest-spread": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-			"integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
-			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.22.5",
-				"@babel/helper-compilation-targets": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-object-super": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-			"integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-optional-catch-binding": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-			"integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-optional-chaining": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
-			"integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-parameters": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-			"integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-private-methods": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-			"integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-private-property-in-object": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-			"integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-			}
-		},
-		"@babel/plugin-transform-property-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-			"integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-constant-elements": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz",
-			"integrity": "sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-display-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz",
-			"integrity": "sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-jsx": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
-			"integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-jsx": "^7.22.5",
-				"@babel/types": "^7.22.5"
-			},
-			"dependencies": {
-				"@babel/plugin-syntax-jsx": {
-					"version": "7.22.5",
-					"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
-					"integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
-					"requires": {
-						"@babel/helper-plugin-utils": "^7.22.5"
-					}
-				}
-			}
-		},
-		"@babel/plugin-transform-react-jsx-development": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
-			"integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
-			"dev": true,
-			"requires": {
-				"@babel/plugin-transform-react-jsx": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-jsx-self": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz",
-			"integrity": "sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-jsx-source": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz",
-			"integrity": "sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-pure-annotations": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz",
-			"integrity": "sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-regenerator": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-			"integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"regenerator-transform": "^0.15.2"
-			}
-		},
-		"@babel/plugin-transform-reserved-words": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-			"integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-runtime": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.0.tgz",
-			"integrity": "sha512-zlPf1/XFn5+vWdve3AAhf+Sxl+MVa5VlwTwWgnLx23u4GlatSRQJ3Eoo9vllf0a9il3woQsT4SK+5Z7c06h8ag==",
-			"requires": {
-				"@babel/helper-module-imports": "^7.16.0",
-				"@babel/helper-plugin-utils": "^7.14.5",
-				"babel-plugin-polyfill-corejs2": "^0.2.3",
-				"babel-plugin-polyfill-corejs3": "^0.3.0",
-				"babel-plugin-polyfill-regenerator": "^0.2.3",
-				"semver": "^6.3.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"@babel/plugin-transform-shorthand-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-			"integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-spread": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-			"integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-sticky-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-			"integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-template-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-			"integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-typeof-symbol": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-			"integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-typescript": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.10.tgz",
-			"integrity": "sha512-7++c8I/ymsDo4QQBAgbraXLzIM6jmfao11KgIBEYZRReWzNWH9NtNgJcyrZiXsOPh523FQm6LfpLyy/U5fn46A==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-create-class-features-plugin": "^7.22.10",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-typescript": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-unicode-escapes": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-			"integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-unicode-property-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-			"integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-unicode-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-			"integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-unicode-sets-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-			"integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/preset-env": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
-			"integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
-			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
-				"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-class-properties": "^7.12.13",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-import-assertions": "^7.22.5",
-				"@babel/plugin-syntax-import-attributes": "^7.22.5",
-				"@babel/plugin-syntax-import-meta": "^7.10.4",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-				"@babel/plugin-syntax-top-level-await": "^7.14.5",
-				"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-				"@babel/plugin-transform-arrow-functions": "^7.22.5",
-				"@babel/plugin-transform-async-generator-functions": "^7.22.10",
-				"@babel/plugin-transform-async-to-generator": "^7.22.5",
-				"@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-				"@babel/plugin-transform-block-scoping": "^7.22.10",
-				"@babel/plugin-transform-class-properties": "^7.22.5",
-				"@babel/plugin-transform-class-static-block": "^7.22.5",
-				"@babel/plugin-transform-classes": "^7.22.6",
-				"@babel/plugin-transform-computed-properties": "^7.22.5",
-				"@babel/plugin-transform-destructuring": "^7.22.10",
-				"@babel/plugin-transform-dotall-regex": "^7.22.5",
-				"@babel/plugin-transform-duplicate-keys": "^7.22.5",
-				"@babel/plugin-transform-dynamic-import": "^7.22.5",
-				"@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-				"@babel/plugin-transform-export-namespace-from": "^7.22.5",
-				"@babel/plugin-transform-for-of": "^7.22.5",
-				"@babel/plugin-transform-function-name": "^7.22.5",
-				"@babel/plugin-transform-json-strings": "^7.22.5",
-				"@babel/plugin-transform-literals": "^7.22.5",
-				"@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
-				"@babel/plugin-transform-member-expression-literals": "^7.22.5",
-				"@babel/plugin-transform-modules-amd": "^7.22.5",
-				"@babel/plugin-transform-modules-commonjs": "^7.22.5",
-				"@babel/plugin-transform-modules-systemjs": "^7.22.5",
-				"@babel/plugin-transform-modules-umd": "^7.22.5",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-				"@babel/plugin-transform-new-target": "^7.22.5",
-				"@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-				"@babel/plugin-transform-numeric-separator": "^7.22.5",
-				"@babel/plugin-transform-object-rest-spread": "^7.22.5",
-				"@babel/plugin-transform-object-super": "^7.22.5",
-				"@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-				"@babel/plugin-transform-optional-chaining": "^7.22.10",
-				"@babel/plugin-transform-parameters": "^7.22.5",
-				"@babel/plugin-transform-private-methods": "^7.22.5",
-				"@babel/plugin-transform-private-property-in-object": "^7.22.5",
-				"@babel/plugin-transform-property-literals": "^7.22.5",
-				"@babel/plugin-transform-regenerator": "^7.22.10",
-				"@babel/plugin-transform-reserved-words": "^7.22.5",
-				"@babel/plugin-transform-shorthand-properties": "^7.22.5",
-				"@babel/plugin-transform-spread": "^7.22.5",
-				"@babel/plugin-transform-sticky-regex": "^7.22.5",
-				"@babel/plugin-transform-template-literals": "^7.22.5",
-				"@babel/plugin-transform-typeof-symbol": "^7.22.5",
-				"@babel/plugin-transform-unicode-escapes": "^7.22.10",
-				"@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
-				"@babel/preset-modules": "0.1.6-no-external-plugins",
-				"@babel/types": "^7.22.10",
-				"babel-plugin-polyfill-corejs2": "^0.4.5",
-				"babel-plugin-polyfill-corejs3": "^0.8.3",
-				"babel-plugin-polyfill-regenerator": "^0.5.2",
-				"core-js-compat": "^3.31.0",
-				"semver": "^6.3.1"
-			},
-			"dependencies": {
-				"@babel/helper-define-polyfill-provider": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
-					"integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
-					"dev": true,
-					"requires": {
-						"@babel/helper-compilation-targets": "^7.22.6",
-						"@babel/helper-plugin-utils": "^7.22.5",
-						"debug": "^4.1.1",
-						"lodash.debounce": "^4.0.8",
-						"resolve": "^1.14.2"
-					}
-				},
-				"@babel/plugin-proposal-private-property-in-object": {
-					"version": "7.21.0-placeholder-for-preset-env.2",
-					"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-					"integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-					"dev": true
-				},
-				"babel-plugin-polyfill-corejs2": {
-					"version": "0.4.5",
-					"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
-					"integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
-					"dev": true,
-					"requires": {
-						"@babel/compat-data": "^7.22.6",
-						"@babel/helper-define-polyfill-provider": "^0.4.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"babel-plugin-polyfill-corejs3": {
-					"version": "0.8.3",
-					"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
-					"integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
-					"dev": true,
-					"requires": {
-						"@babel/helper-define-polyfill-provider": "^0.4.2",
-						"core-js-compat": "^3.31.0"
-					}
-				},
-				"babel-plugin-polyfill-regenerator": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
-					"integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
-					"dev": true,
-					"requires": {
-						"@babel/helper-define-polyfill-provider": "^0.4.2"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/preset-flow": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.22.5.tgz",
-			"integrity": "sha512-ta2qZ+LSiGCrP5pgcGt8xMnnkXQrq8Sa4Ulhy06BOlF5QbLw9q5hIx7bn5MrsvyTGAfh6kTOo07Q+Pfld/8Y5Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-transform-flow-strip-types": "^7.22.5"
-			}
-		},
-		"@babel/preset-modules": {
-			"version": "0.1.6-no-external-plugins",
-			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
-			"integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@babel/types": "^7.4.4",
-				"esutils": "^2.0.2"
-			}
-		},
-		"@babel/preset-react": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.5.tgz",
-			"integrity": "sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-transform-react-display-name": "^7.22.5",
-				"@babel/plugin-transform-react-jsx": "^7.22.5",
-				"@babel/plugin-transform-react-jsx-development": "^7.22.5",
-				"@babel/plugin-transform-react-pure-annotations": "^7.22.5"
-			}
-		},
-		"@babel/preset-typescript": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz",
-			"integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-syntax-jsx": "^7.22.5",
-				"@babel/plugin-transform-modules-commonjs": "^7.22.5",
-				"@babel/plugin-transform-typescript": "^7.22.5"
-			},
-			"dependencies": {
-				"@babel/plugin-syntax-jsx": {
-					"version": "7.22.5",
-					"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
-					"integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
-					"requires": {
-						"@babel/helper-plugin-utils": "^7.22.5"
-					}
-				}
-			}
-		},
-		"@babel/register": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/register/-/register-7.16.0.tgz",
-			"integrity": "sha512-lzl4yfs0zVXnooeLE0AAfYaT7F3SPA8yB2Bj4W1BiZwLbMS3MZH35ZvCWSRHvneUugwuM+Wsnrj7h0F7UmU3NQ==",
-			"requires": {
-				"clone-deep": "^4.0.1",
-				"find-cache-dir": "^2.0.0",
-				"make-dir": "^2.1.0",
-				"pirates": "^4.0.0",
-				"source-map-support": "^0.5.16"
-			},
-			"dependencies": {
-				"make-dir": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-					"requires": {
-						"pify": "^4.0.1",
-						"semver": "^5.6.0"
-					}
-				},
-				"pify": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-				}
-			}
-		},
-		"@babel/regjsgen": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-			"integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
-		},
-		"@babel/runtime": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz",
-			"integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==",
-			"requires": {
-				"regenerator-runtime": "^0.14.0"
-			},
-			"dependencies": {
-				"regenerator-runtime": {
-					"version": "0.14.0",
-					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-					"integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
-				}
-			}
-		},
-		"@babel/runtime-corejs3": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz",
-			"integrity": "sha512-Oi2qwQ21X7/d9gn3WiwkDTJmq3TQtYNz89lRnoFy8VeZpWlsyXvzSwiRrRZ8cXluvSwqKxqHJ6dBd9Rv+p0ZGQ==",
-			"dev": true,
-			"requires": {
-				"core-js-pure": "^3.19.0",
-				"regenerator-runtime": "^0.13.4"
-			}
-		},
-		"@babel/template": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-			"integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
-			"requires": {
-				"@babel/code-frame": "^7.22.5",
-				"@babel/parser": "^7.22.5",
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/traverse": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.0.tgz",
-			"integrity": "sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==",
-			"requires": {
-				"@babel/code-frame": "^7.16.0",
-				"@babel/generator": "^7.16.0",
-				"@babel/helper-function-name": "^7.16.0",
-				"@babel/helper-hoist-variables": "^7.16.0",
-				"@babel/helper-split-export-declaration": "^7.16.0",
-				"@babel/parser": "^7.16.0",
-				"@babel/types": "^7.16.0",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"dependencies": {
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				}
-			}
-		},
-		"@babel/types": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-			"integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
-			"requires": {
-				"@babel/helper-string-parser": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.5",
-				"to-fast-properties": "^2.0.0"
-			}
-		},
-		"@base2/pretty-print-object": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz",
-			"integrity": "sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==",
-			"dev": true
-		},
-		"@bcoe/v8-coverage": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-			"dev": true
-		},
-		"@callstack/reassure-cli": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/@callstack/reassure-cli/-/reassure-cli-0.6.1.tgz",
-			"integrity": "sha512-c5Pihix9anX9hSLsN8Y5cpRUuB5vHSFeaGAHuiRyNLlEOAIEODjQIOCQ7MkxEiWd5rT5t00m9EMfANb1FcnfiA==",
-			"dev": true,
-			"requires": {
-				"@callstack/reassure-compare": "0.3.0",
-				"simple-git": "^3.16.0",
-				"yargs": "^17.6.2"
-			},
-			"dependencies": {
-				"cliui": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.1",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"simple-git": {
-					"version": "3.19.1",
-					"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.19.1.tgz",
-					"integrity": "sha512-Ck+rcjVaE1HotraRAS8u/+xgTvToTuoMkT9/l9lvuP5jftwnYUp6DwuJzsKErHgfyRk8IB8pqGHWEbM3tLgV1w==",
-					"dev": true,
-					"requires": {
-						"@kwsites/file-exists": "^1.1.1",
-						"@kwsites/promise-deferred": "^1.1.1",
-						"debug": "^4.3.4"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "17.7.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-					"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-					"dev": true,
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-					"dev": true
-				}
-			}
-		},
-		"@callstack/reassure-compare": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@callstack/reassure-compare/-/reassure-compare-0.3.0.tgz",
-			"integrity": "sha512-1TIUhzZELlXkVJE9wH6qm7IkoLChTsKj7rOE9h86yRX4y4vrSru9cdHwktjsuopQ543YbOxehMMx6tGbefsGBA==",
-			"dev": true,
-			"requires": {
-				"markdown-builder": "^0.9.0",
-				"markdown-table": "^2.0.0",
-				"zod": "^3.20.2"
-			},
-			"dependencies": {
-				"markdown-table": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-					"integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-					"dev": true,
-					"requires": {
-						"repeat-string": "^1.0.0"
-					}
-				}
-			}
-		},
-		"@callstack/reassure-danger": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/@callstack/reassure-danger/-/reassure-danger-0.1.1.tgz",
-			"integrity": "sha512-lfza+qBdvVYtP7WvMTT+LfjBfuYsXZ4RxuBldsL8wJArGeCl3OZwUg+9bTo8v6kk/nY8memk5HxrCwWDSO24UA==",
-			"dev": true
-		},
-		"@callstack/reassure-measure": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@callstack/reassure-measure/-/reassure-measure-0.3.1.tgz",
-			"integrity": "sha512-A7gdyA9nfm6TZt4bQs5bfgy9SOFn8FmMdOjPojSpmpSyECXRK/7aMqqBIuwPt4jgIFFDiEFsd5w88FgsE13CTQ==",
-			"dev": true,
-			"requires": {
-				"mathjs": "^10.1.1"
-			}
-		},
-		"@colors/colors": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-			"integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-			"dev": true
-		},
-		"@dabh/diagnostics": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
-			"integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==",
-			"dev": true,
-			"requires": {
-				"colorspace": "1.1.x",
-				"enabled": "2.0.x",
-				"kuler": "^2.0.0"
-			}
-		},
-		"@discoveryjs/json-ext": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
-			"dev": true
-		},
-		"@egjs/hammerjs": {
-			"version": "2.0.17",
-			"resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz",
-			"integrity": "sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==",
-			"requires": {
-				"@types/hammerjs": "^2.0.36"
-			}
-		},
-		"@emotion/babel-plugin": {
-			"version": "11.3.0",
-			"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz",
-			"integrity": "sha512-UZKwBV2rADuhRp+ZOGgNWg2eYgbzKzQXfQPtJbu/PLy8onurxlNCLvxMQEvlr1/GudguPI5IU9qIY1+2z1M5bA==",
-			"requires": {
-				"@babel/helper-module-imports": "^7.12.13",
-				"@babel/plugin-syntax-jsx": "^7.12.13",
-				"@babel/runtime": "^7.13.10",
-				"@emotion/hash": "^0.8.0",
-				"@emotion/memoize": "^0.7.5",
-				"@emotion/serialize": "^1.0.2",
-				"babel-plugin-macros": "^2.6.1",
-				"convert-source-map": "^1.5.0",
-				"escape-string-regexp": "^4.0.0",
-				"find-root": "^1.1.0",
-				"source-map": "^0.5.7",
-				"stylis": "^4.0.3"
-			},
-			"dependencies": {
-				"@emotion/memoize": {
-					"version": "0.7.5",
-					"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",
-					"integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
-				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-				}
-			}
-		},
-		"@emotion/cache": {
-			"version": "11.7.1",
-			"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.7.1.tgz",
-			"integrity": "sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==",
-			"requires": {
-				"@emotion/memoize": "^0.7.4",
-				"@emotion/sheet": "^1.1.0",
-				"@emotion/utils": "^1.0.0",
-				"@emotion/weak-memoize": "^0.2.5",
-				"stylis": "4.0.13"
-			}
-		},
-		"@emotion/css": {
-			"version": "11.7.1",
-			"resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.7.1.tgz",
-			"integrity": "sha512-RUUgPlMZunlc7SE5A6Hg+VWRzb2cU6O9xlV78KCFgcnl25s7Qz/20oQg71iKudpLqk7xj0vhbJlwcJJMT0BOZg==",
-			"requires": {
-				"@emotion/babel-plugin": "^11.7.1",
-				"@emotion/cache": "^11.7.1",
-				"@emotion/serialize": "^1.0.0",
-				"@emotion/sheet": "^1.0.3",
-				"@emotion/utils": "^1.0.0"
-			},
-			"dependencies": {
-				"@emotion/babel-plugin": {
-					"version": "11.11.0",
-					"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
-					"integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
-					"requires": {
-						"@babel/helper-module-imports": "^7.16.7",
-						"@babel/runtime": "^7.18.3",
-						"@emotion/hash": "^0.9.1",
-						"@emotion/memoize": "^0.8.1",
-						"@emotion/serialize": "^1.1.2",
-						"babel-plugin-macros": "^3.1.0",
-						"convert-source-map": "^1.5.0",
-						"escape-string-regexp": "^4.0.0",
-						"find-root": "^1.1.0",
-						"source-map": "^0.5.7",
-						"stylis": "4.2.0"
-					}
-				},
-				"@emotion/hash": {
-					"version": "0.9.1",
-					"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
-					"integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
-				},
-				"@emotion/memoize": {
-					"version": "0.8.1",
-					"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
-					"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
-				},
-				"babel-plugin-macros": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-					"integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-					"requires": {
-						"@babel/runtime": "^7.12.5",
-						"cosmiconfig": "^7.0.0",
-						"resolve": "^1.19.0"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-				},
-				"stylis": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
-					"integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
-				}
-			}
-		},
-		"@emotion/css-prettifier": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@emotion/css-prettifier/-/css-prettifier-1.0.1.tgz",
-			"integrity": "sha512-cA9Dtol47mtvWKasPC+8tkh2DS0wBkX0MMHKieXGSkGyx079V7yFY85KC0pPalcIy+vi0LbMR9DNyiJBqYgJ1Q==",
-			"dev": true,
-			"requires": {
-				"@emotion/memoize": "^0.7.4",
-				"stylis": "4.0.13"
-			}
-		},
-		"@emotion/hash": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
-			"integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
-		},
-		"@emotion/is-prop-valid": {
-			"version": "0.8.8",
-			"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-			"integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
-			"optional": true,
-			"requires": {
-				"@emotion/memoize": "0.7.4"
-			}
-		},
-		"@emotion/jest": {
-			"version": "11.7.1",
-			"resolved": "https://registry.npmjs.org/@emotion/jest/-/jest-11.7.1.tgz",
-			"integrity": "sha512-IYKyiIm4a7LINESYTa6aAizRj6YTwIvpD9s9yDzkrOEJXKwCqWWOTVNNOJKBygim3fv4lC9KM5jG5qzHvy4ZJg==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@emotion/css-prettifier": "^1.0.1",
-				"chalk": "^4.1.0",
-				"specificity": "^0.4.1",
-				"stylis": "4.0.13"
-			}
-		},
-		"@emotion/memoize": {
-			"version": "0.7.4",
-			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-			"integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
-		},
-		"@emotion/native": {
-			"version": "11.0.0",
-			"resolved": "https://registry.npmjs.org/@emotion/native/-/native-11.0.0.tgz",
-			"integrity": "sha512-IByi+OfagLtcQsXZMkS06ztcNMZePg6dqwzM4FIkXjN4PhoeJ/jTDRICT3pTIk3ChuurX2oF8fmE+0bfvYi/SA==",
-			"dev": true,
-			"requires": {
-				"@emotion/primitives-core": "^11.0.0"
-			}
-		},
-		"@emotion/primitives-core": {
-			"version": "11.0.0",
-			"resolved": "https://registry.npmjs.org/@emotion/primitives-core/-/primitives-core-11.0.0.tgz",
-			"integrity": "sha512-4zpfUV7hz9A+j7Hcyiend3LEtRogDXDtMzQy8LOoU39Mw5ntgvTlYQSPbQSzs98BJty/F9Ybyg3pBzFDdMpmDg==",
-			"dev": true,
-			"requires": {
-				"css-to-react-native": "^3.0.0"
-			},
-			"dependencies": {
-				"css-to-react-native": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
-					"integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
-					"dev": true,
-					"requires": {
-						"camelize": "^1.0.0",
-						"css-color-keywords": "^1.0.0",
-						"postcss-value-parser": "^4.0.2"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"@emotion/react": {
-			"version": "11.7.1",
-			"resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.1.tgz",
-			"integrity": "sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@emotion/cache": "^11.7.1",
-				"@emotion/serialize": "^1.0.2",
-				"@emotion/sheet": "^1.1.0",
-				"@emotion/utils": "^1.0.0",
-				"@emotion/weak-memoize": "^0.2.5",
-				"hoist-non-react-statics": "^3.3.1"
-			}
-		},
-		"@emotion/serialize": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.2.tgz",
-			"integrity": "sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==",
-			"requires": {
-				"@emotion/hash": "^0.9.1",
-				"@emotion/memoize": "^0.8.1",
-				"@emotion/unitless": "^0.8.1",
-				"@emotion/utils": "^1.2.1",
-				"csstype": "^3.0.2"
-			},
-			"dependencies": {
-				"@emotion/hash": {
-					"version": "0.9.1",
-					"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
-					"integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
-				},
-				"@emotion/memoize": {
-					"version": "0.8.1",
-					"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
-					"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
-				}
-			}
-		},
-		"@emotion/sheet": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.1.0.tgz",
-			"integrity": "sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g=="
-		},
-		"@emotion/styled": {
-			"version": "11.6.0",
-			"resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.6.0.tgz",
-			"integrity": "sha512-mxVtVyIOTmCAkFbwIp+nCjTXJNgcz4VWkOYQro87jE2QBTydnkiYusMrRGFtzuruiGK4dDaNORk4gH049iiQuw==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@emotion/babel-plugin": "^11.3.0",
-				"@emotion/is-prop-valid": "^1.1.1",
-				"@emotion/serialize": "^1.0.2",
-				"@emotion/utils": "^1.0.0"
-			},
-			"dependencies": {
-				"@emotion/is-prop-valid": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
-					"integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
-					"requires": {
-						"@emotion/memoize": "^0.8.1"
-					}
-				},
-				"@emotion/memoize": {
-					"version": "0.8.1",
-					"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
-					"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
-				}
-			}
-		},
-		"@emotion/unitless": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
-			"integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
-		},
-		"@emotion/use-insertion-effect-with-fallbacks": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
-			"integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",
-			"dev": true
-		},
-		"@emotion/utils": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz",
-			"integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg=="
-		},
-		"@emotion/weak-memoize": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
-			"integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
-		},
-		"@es-joy/jsdoccomment": {
-			"version": "0.40.1",
-			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz",
-			"integrity": "sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg==",
-			"dev": true,
-			"requires": {
-				"comment-parser": "1.4.0",
-				"esquery": "^1.5.0",
-				"jsdoc-type-pratt-parser": "~4.0.0"
-			}
-		},
-		"@esbuild/android-arm": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-			"integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/android-arm64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-			"integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/android-x64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-			"integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/darwin-arm64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-			"integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/darwin-x64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-			"integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/freebsd-arm64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-			"integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/freebsd-x64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-			"integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/linux-arm": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-			"integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/linux-arm64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-			"integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/linux-ia32": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-			"integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/linux-loong64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-			"integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/linux-mips64el": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-			"integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/linux-ppc64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-			"integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/linux-riscv64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-			"integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/linux-s390x": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-			"integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/linux-x64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-			"integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/netbsd-x64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-			"integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/openbsd-x64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-			"integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/sunos-x64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-			"integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/win32-arm64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-			"integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/win32-ia32": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-			"integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
-			"dev": true,
-			"optional": true
-		},
-		"@esbuild/win32-x64": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-			"integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
-			"dev": true,
-			"optional": true
-		},
-		"@eslint-community/eslint-utils": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-			"integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-			"dev": true,
-			"requires": {
-				"eslint-visitor-keys": "^3.3.0"
-			},
-			"dependencies": {
-				"eslint-visitor-keys": {
-					"version": "3.4.2",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-					"integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-					"dev": true
-				}
-			}
-		},
-		"@eslint-community/regexpp": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
-			"integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
-			"dev": true
-		},
-		"@eslint/eslintrc": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.4.tgz",
-			"integrity": "sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==",
-			"dev": true,
-			"requires": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^9.0.0",
-				"globals": "^13.9.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.0.4",
-				"strip-json-comments": "^3.1.1"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"ignore": {
-					"version": "4.0.6",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-					"dev": true
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"strip-json-comments": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-					"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-					"dev": true
-				}
-			}
-		},
-		"@fal-works/esbuild-plugin-global-externals": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz",
-			"integrity": "sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==",
-			"dev": true
-		},
-		"@floating-ui/core": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz",
-			"integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==",
-			"requires": {
-				"@floating-ui/utils": "^0.1.1"
-			}
-		},
-		"@floating-ui/dom": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz",
-			"integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==",
-			"requires": {
-				"@floating-ui/core": "^1.4.1",
-				"@floating-ui/utils": "^0.1.1"
-			}
-		},
-		"@floating-ui/utils": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.2.tgz",
-			"integrity": "sha512-ou3elfqG/hZsbmF4bxeJhPHIf3G2pm0ujc39hYEZrfVqt7Vk/Zji6CXc3W0pmYM8BW1g40U+akTl9DKZhFhInQ=="
-		},
-		"@hapi/hoek": {
-			"version": "9.2.1",
-			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz",
-			"integrity": "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw=="
-		},
-		"@hapi/topo": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
-			"integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
-			"requires": {
-				"@hapi/hoek": "^9.0.0"
-			}
-		},
-		"@humanwhocodes/config-array": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz",
-			"integrity": "sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==",
-			"dev": true,
-			"requires": {
-				"@humanwhocodes/object-schema": "^1.2.0",
-				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
-			}
-		},
-		"@humanwhocodes/object-schema": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-			"dev": true
-		},
-		"@hutson/parse-repository-url": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz",
-			"integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==",
-			"dev": true
-		},
-		"@isaacs/cliui": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-			"integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-			"dev": true,
-			"requires": {
-				"string-width": "^5.1.2",
-				"string-width-cjs": "npm:string-width@^4.2.0",
-				"strip-ansi": "^7.0.1",
-				"strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-				"wrap-ansi": "^8.1.0",
-				"wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-					"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-					"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "9.2.2",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-					"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-					"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-					"dev": true,
-					"requires": {
-						"eastasianwidth": "^0.2.0",
-						"emoji-regex": "^9.2.2",
-						"strip-ansi": "^7.0.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-					"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^6.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-					"integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^6.1.0",
-						"string-width": "^5.0.1",
-						"strip-ansi": "^7.0.1"
-					}
-				}
-			}
-		},
-		"@istanbuljs/load-nyc-config": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz",
-			"integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^5.3.1",
-				"find-up": "^4.1.0",
-				"js-yaml": "^3.13.1",
-				"resolve-from": "^5.0.0"
-			},
-			"dependencies": {
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				}
-			}
-		},
-		"@istanbuljs/schema": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-			"dev": true
-		},
-		"@jest/console": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
-			"integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"jest-message-util": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"slash": "^3.0.0"
-			}
-		},
-		"@jest/core": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
-			"integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^29.6.2",
-				"@jest/reporters": "^29.6.2",
-				"@jest/test-result": "^29.6.2",
-				"@jest/transform": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.9",
-				"jest-changed-files": "^29.5.0",
-				"jest-config": "^29.6.2",
-				"jest-haste-map": "^29.6.2",
-				"jest-message-util": "^29.6.2",
-				"jest-regex-util": "^29.4.3",
-				"jest-resolve": "^29.6.2",
-				"jest-resolve-dependencies": "^29.6.2",
-				"jest-runner": "^29.6.2",
-				"jest-runtime": "^29.6.2",
-				"jest-snapshot": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"jest-validate": "^29.6.2",
-				"jest-watcher": "^29.6.2",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^29.6.2",
-				"slash": "^3.0.0",
-				"strip-ansi": "^6.0.0"
-			}
-		},
-		"@jest/create-cache-key-function": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/@jest/create-cache-key-function/-/create-cache-key-function-29.6.1.tgz",
-			"integrity": "sha512-d77/1BbNLbJDBV6tH7ctYpau+3tnU5YMhg36uGabW4VDrl1Arp6E0jDRioHFoFqIbm+BXMVbyQc9MpfKo6OIQQ==",
-			"requires": {
-				"@jest/types": "^29.6.1"
-			}
-		},
-		"@jest/environment": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
-			"integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
-			"requires": {
-				"@jest/fake-timers": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"jest-mock": "^29.6.2"
-			}
-		},
-		"@jest/expect": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
-			"integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
-			"dev": true,
-			"requires": {
-				"expect": "^29.6.2",
-				"jest-snapshot": "^29.6.2"
-			}
-		},
-		"@jest/expect-utils": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
-			"integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
-			"dev": true,
-			"requires": {
-				"jest-get-type": "^29.4.3"
-			}
-		},
-		"@jest/fake-timers": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
-			"integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
-			"requires": {
-				"@jest/types": "^29.6.1",
-				"@sinonjs/fake-timers": "^10.0.2",
-				"@types/node": "*",
-				"jest-message-util": "^29.6.2",
-				"jest-mock": "^29.6.2",
-				"jest-util": "^29.6.2"
-			}
-		},
-		"@jest/globals": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
-			"integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^29.6.2",
-				"@jest/expect": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"jest-mock": "^29.6.2"
-			}
-		},
-		"@jest/reporters": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
-			"integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
-			"dev": true,
-			"requires": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "^29.6.2",
-				"@jest/test-result": "^29.6.2",
-				"@jest/transform": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-instrument": "^5.1.0",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
-				"istanbul-reports": "^3.1.3",
-				"jest-message-util": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"jest-worker": "^29.6.2",
-				"slash": "^3.0.0",
-				"string-length": "^4.0.1",
-				"strip-ansi": "^6.0.0",
-				"v8-to-istanbul": "^9.0.1"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
-			}
-		},
-		"@jest/schemas": {
-			"version": "29.6.0",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
-			"integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
-			"requires": {
-				"@sinclair/typebox": "^0.27.8"
-			}
-		},
-		"@jest/source-map": {
-			"version": "29.6.0",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
-			"integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
-			"dev": true,
-			"requires": {
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.2.9"
-			}
-		},
-		"@jest/test-result": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
-			"integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"collect-v8-coverage": "^1.0.0"
-			}
-		},
-		"@jest/test-sequencer": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
-			"integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
-			"dev": true,
-			"requires": {
-				"@jest/test-result": "^29.6.2",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.6.2",
-				"slash": "^3.0.0"
-			}
-		},
-		"@jest/transform": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
-			"integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.11.6",
-				"@jest/types": "^29.6.1",
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"babel-plugin-istanbul": "^6.1.1",
-				"chalk": "^4.0.0",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.6.2",
-				"jest-regex-util": "^29.4.3",
-				"jest-util": "^29.6.2",
-				"micromatch": "^4.0.4",
-				"pirates": "^4.0.4",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^4.0.2"
-			},
-			"dependencies": {
-				"convert-source-map": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-					"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-					"dev": true
-				},
-				"write-file-atomic": {
-					"version": "4.0.2",
-					"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-					"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-					"dev": true,
-					"requires": {
-						"imurmurhash": "^0.1.4",
-						"signal-exit": "^3.0.7"
-					}
-				}
-			}
-		},
-		"@jest/types": {
-			"version": "29.6.1",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
-			"integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
-			"requires": {
-				"@jest/schemas": "^29.6.0",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.8",
-				"chalk": "^4.0.0"
-			}
-		},
-		"@jridgewell/gen-mapping": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-			"integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-			"requires": {
-				"@jridgewell/set-array": "^1.0.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			}
-		},
-		"@jridgewell/resolve-uri": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-			"integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
-		},
-		"@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
-		},
-		"@jridgewell/source-map": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-			"integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
-			"requires": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			}
-		},
-		"@jridgewell/sourcemap-codec": {
-			"version": "1.4.14",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-			"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-		},
-		"@jridgewell/trace-mapping": {
-			"version": "0.3.19",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-			"integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
-			"requires": {
-				"@jridgewell/resolve-uri": "^3.1.0",
-				"@jridgewell/sourcemap-codec": "^1.4.14"
-			}
-		},
-		"@juggle/resize-observer": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz",
-			"integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==",
-			"dev": true
-		},
-		"@kwsites/file-exists": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
-			"integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.1"
-			}
-		},
-		"@kwsites/promise-deferred": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz",
-			"integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
-			"dev": true
-		},
-		"@leichtgewicht/ip-codec": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-			"dev": true
-		},
-		"@lerna/child-process": {
-			"version": "7.1.4",
-			"resolved": "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.1.4.tgz",
-			"integrity": "sha512-cSiMDx9oI9vvVT+V/WHcbqrksNoc9PIPFiks1lPS7zrVWkEbgA6REQyYmRd2H71kihzqhX5TJ20f2dWv6oEPdA==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.1.0",
-				"execa": "^5.0.0",
-				"strong-log-transformer": "^2.1.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"human-signals": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-					"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@lerna/create": {
-			"version": "7.1.4",
-			"resolved": "https://registry.npmjs.org/@lerna/create/-/create-7.1.4.tgz",
-			"integrity": "sha512-D5YWXsXIxWb1aGqcbtttczg86zMzkNhcs00/BleFNxdNYlTRdjLIReELOGBGrq3Hij05UN+7Dv9EKnPFJVbqAw==",
-			"dev": true,
-			"requires": {
-				"@lerna/child-process": "7.1.4",
-				"dedent": "0.7.0",
-				"fs-extra": "^11.1.1",
-				"init-package-json": "5.0.0",
-				"npm-package-arg": "8.1.1",
-				"p-reduce": "^2.1.0",
-				"pacote": "^15.2.0",
-				"pify": "5.0.0",
-				"semver": "^7.3.4",
-				"slash": "^3.0.0",
-				"validate-npm-package-license": "^3.0.4",
-				"validate-npm-package-name": "5.0.0",
-				"yargs-parser": "20.2.4"
-			},
-			"dependencies": {
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"hosted-git-info": {
-					"version": "3.0.8",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
-					"integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"npm-package-arg": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz",
-					"integrity": "sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^3.0.6",
-						"semver": "^7.0.0",
-						"validate-npm-package-name": "^3.0.0"
-					},
-					"dependencies": {
-						"validate-npm-package-name": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-							"integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
-							"dev": true,
-							"requires": {
-								"builtins": "^1.0.3"
-							}
-						}
-					}
-				},
-				"pify": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-					"integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
-					"dev": true
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				},
-				"validate-npm-package-name": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-					"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-					"dev": true,
-					"requires": {
-						"builtins": "^5.0.0"
-					},
-					"dependencies": {
-						"builtins": {
-							"version": "5.0.1",
-							"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-							"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-							"dev": true,
-							"requires": {
-								"semver": "^7.0.0"
-							}
-						}
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				},
-				"yargs-parser": {
-					"version": "20.2.4",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-					"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-					"dev": true
-				}
-			}
-		},
-		"@mdx-js/react": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.3.0.tgz",
-			"integrity": "sha512-zQH//gdOmuu7nt2oJR29vFhDv88oGPmVw6BggmrHeMI+xgEkp1B2dX9/bMBSYtK0dyLX/aOmesKS09g222K1/g==",
-			"dev": true,
-			"requires": {
-				"@types/mdx": "^2.0.0",
-				"@types/react": ">=16"
-			}
-		},
-		"@ndelangen/get-tarball": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/@ndelangen/get-tarball/-/get-tarball-3.0.9.tgz",
-			"integrity": "sha512-9JKTEik4vq+yGosHYhZ1tiH/3WpUS0Nh0kej4Agndhox8pAdWhEx5knFVRcb/ya9knCRCs1rPxNrSXTDdfVqpA==",
-			"dev": true,
-			"requires": {
-				"gunzip-maybe": "^1.4.2",
-				"pump": "^3.0.0",
-				"tar-fs": "^2.1.1"
-			},
-			"dependencies": {
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				}
-			}
-		},
-		"@nodelib/fs.scandir": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz",
-			"integrity": "sha512-wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w==",
-			"dev": true,
-			"requires": {
-				"@nodelib/fs.stat": "2.0.2",
-				"run-parallel": "^1.1.9"
-			},
-			"dependencies": {
-				"@nodelib/fs.stat": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz",
-					"integrity": "sha512-z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw==",
-					"dev": true
-				}
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-			"dev": true
-		},
-		"@nodelib/fs.walk": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz",
-			"integrity": "sha512-l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA==",
-			"dev": true,
-			"requires": {
-				"@nodelib/fs.scandir": "2.1.2",
-				"fastq": "^1.6.0"
-			}
-		},
-		"@npmcli/git": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz",
-			"integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==",
-			"dev": true,
-			"requires": {
-				"@npmcli/promise-spawn": "^6.0.0",
-				"lru-cache": "^7.4.4",
-				"npm-pick-manifest": "^8.0.0",
-				"proc-log": "^3.0.0",
-				"promise-inflight": "^1.0.1",
-				"promise-retry": "^2.0.1",
-				"semver": "^7.3.5",
-				"which": "^3.0.0"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"which": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
-					"integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@npmcli/installed-package-contents": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz",
-			"integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==",
-			"dev": true,
-			"requires": {
-				"npm-bundled": "^3.0.0",
-				"npm-normalize-package-bin": "^3.0.0"
-			},
-			"dependencies": {
-				"npm-bundled": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz",
-					"integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==",
-					"dev": true,
-					"requires": {
-						"npm-normalize-package-bin": "^3.0.0"
-					}
-				},
-				"npm-normalize-package-bin": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-					"integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
-					"dev": true
-				}
-			}
-		},
-		"@npmcli/node-gyp": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
-			"integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
-			"dev": true
-		},
-		"@npmcli/promise-spawn": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz",
-			"integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==",
-			"dev": true,
-			"requires": {
-				"which": "^3.0.0"
-			},
-			"dependencies": {
-				"which": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
-					"integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@npmcli/run-script": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz",
-			"integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==",
-			"dev": true,
-			"requires": {
-				"@npmcli/node-gyp": "^3.0.0",
-				"@npmcli/promise-spawn": "^6.0.0",
-				"node-gyp": "^9.0.0",
-				"read-package-json-fast": "^3.0.0",
-				"which": "^3.0.0"
-			},
-			"dependencies": {
-				"which": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
-					"integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@nrwl/devkit": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.6.0.tgz",
-			"integrity": "sha512-xZEN6wfA1uJwv+FVRQFOHsCcpvGvIYGx2zutbzungDodWkfzlJ3tzIGqYjIpPCBVT83erM6Gscnka2W46AuKfA==",
-			"dev": true,
-			"requires": {
-				"@nx/devkit": "16.6.0"
-			}
-		},
-		"@nrwl/tao": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-16.6.0.tgz",
-			"integrity": "sha512-NQkDhmzlR1wMuYzzpl4XrKTYgyIzELdJ+dVrNKf4+p4z5WwKGucgRBj60xMQ3kdV25IX95/fmMDB8qVp/pNQ0Q==",
-			"dev": true,
-			"requires": {
-				"nx": "16.6.0",
-				"tslib": "^2.3.0"
-			}
-		},
-		"@nx/devkit": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-16.6.0.tgz",
-			"integrity": "sha512-rhJ0y+MSPHDuoZPxsOYdj/n5ks+gK74TIMgTb8eZgPT/uR86a4oxf62wUQXgECedR5HzLE2HunbnoLhhJXmpJw==",
-			"dev": true,
-			"requires": {
-				"@nrwl/devkit": "16.6.0",
-				"ejs": "^3.1.7",
-				"ignore": "^5.0.4",
-				"semver": "7.5.3",
-				"tmp": "~0.2.1",
-				"tslib": "^2.3.0"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.5.3",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-					"integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"tmp": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-					"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-					"dev": true,
-					"requires": {
-						"rimraf": "^3.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				}
-			}
-		},
-		"@nx/nx-darwin-arm64": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.6.0.tgz",
-			"integrity": "sha512-8nJuqcWG/Ob39rebgPLpv2h/V46b9Rqqm/AGH+bYV9fNJpxgMXclyincbMIWvfYN2tW+Vb9DusiTxV6RPrLapA==",
-			"dev": true,
-			"optional": true
-		},
-		"@nx/nx-darwin-x64": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.6.0.tgz",
-			"integrity": "sha512-T4DV0/2PkPZjzjmsmQEyjPDNBEKc4Rhf7mbIZlsHXj27BPoeNjEcbjtXKuOZHZDIpGFYECGT/sAF6C2NVYgmxw==",
-			"dev": true,
-			"optional": true
-		},
-		"@nx/nx-freebsd-x64": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.6.0.tgz",
-			"integrity": "sha512-Ck/yejYgp65dH9pbExKN/X0m22+xS3rWF1DBr2LkP6j1zJaweRc3dT83BWgt5mCjmcmZVk3J8N01AxULAzUAqA==",
-			"dev": true,
-			"optional": true
-		},
-		"@nx/nx-linux-arm-gnueabihf": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.6.0.tgz",
-			"integrity": "sha512-eyk/R1mBQ3X0PCSS+Cck3onvr3wmZVmM/+x0x9Ai02Vm6q9Eq6oZ1YtZGQsklNIyw1vk2WV9rJCStfu9mLecEw==",
-			"dev": true,
-			"optional": true
-		},
-		"@nx/nx-linux-arm64-gnu": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.6.0.tgz",
-			"integrity": "sha512-S0qFFdQFDmBIEZqBAJl4K47V3YuMvDvthbYE0enXrXApWgDApmhtxINXSOjSus7DNq9kMrgtSDGkBmoBot61iw==",
-			"dev": true,
-			"optional": true
-		},
-		"@nx/nx-linux-arm64-musl": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.6.0.tgz",
-			"integrity": "sha512-TXWY5VYtg2wX/LWxyrUkDVpqCyJHF7fWoVMUSlFe+XQnk9wp/yIbq2s0k3h8I4biYb6AgtcVqbR4ID86lSNuMA==",
-			"dev": true,
-			"optional": true
-		},
-		"@nx/nx-linux-x64-gnu": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.6.0.tgz",
-			"integrity": "sha512-qQIpSVN8Ij4oOJ5v+U+YztWJ3YQkeCIevr4RdCE9rDilfq9RmBD94L4VDm7NRzYBuQL8uQxqWzGqb7ZW4mfHpw==",
-			"dev": true,
-			"optional": true
-		},
-		"@nx/nx-linux-x64-musl": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.6.0.tgz",
-			"integrity": "sha512-EYOHe11lfVfEfZqSAIa1c39mx2Obr4mqd36dBZx+0UKhjrcmWiOdsIVYMQSb3n0TqB33BprjI4p9ZcFSDuoNbA==",
-			"dev": true,
-			"optional": true
-		},
-		"@nx/nx-win32-arm64-msvc": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.6.0.tgz",
-			"integrity": "sha512-f1BmuirOrsAGh5+h/utkAWNuqgohvBoekQgMxYcyJxSkFN+pxNG1U68P59Cidn0h9mkyonxGVCBvWwJa3svVFA==",
-			"dev": true,
-			"optional": true
-		},
-		"@nx/nx-win32-x64-msvc": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.6.0.tgz",
-			"integrity": "sha512-UmTTjFLpv4poVZE3RdUHianU8/O9zZYBiAnTRq5spwSDwxJHnLTZBUxFFf3ztCxeHOUIfSyW9utpGfCMCptzvQ==",
-			"dev": true,
-			"optional": true
-		},
-		"@octokit/auth-token": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
-			"integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
-			"dev": true,
-			"requires": {
-				"@octokit/types": "^6.0.3"
-			}
-		},
-		"@octokit/core": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-			"integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
-			"dev": true,
-			"requires": {
-				"@octokit/auth-token": "^2.4.4",
-				"@octokit/graphql": "^4.5.8",
-				"@octokit/request": "^5.6.3",
-				"@octokit/request-error": "^2.0.5",
-				"@octokit/types": "^6.0.3",
-				"before-after-hook": "^2.2.0",
-				"universal-user-agent": "^6.0.0"
-			},
-			"dependencies": {
-				"@octokit/endpoint": {
-					"version": "6.0.12",
-					"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
-					"integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
-					"dev": true,
-					"requires": {
-						"@octokit/types": "^6.0.3",
-						"is-plain-object": "^5.0.0",
-						"universal-user-agent": "^6.0.0"
-					}
-				},
-				"@octokit/request": {
-					"version": "5.6.3",
-					"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-					"integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
-					"dev": true,
-					"requires": {
-						"@octokit/endpoint": "^6.0.1",
-						"@octokit/request-error": "^2.1.0",
-						"@octokit/types": "^6.16.1",
-						"is-plain-object": "^5.0.0",
-						"node-fetch": "^2.6.7",
-						"universal-user-agent": "^6.0.0"
-					}
-				},
-				"before-after-hook": {
-					"version": "2.2.3",
-					"resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
-					"integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
-					"dev": true
-				},
-				"node-fetch": {
-					"version": "2.6.12",
-					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-					"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-					"dev": true,
-					"requires": {
-						"whatwg-url": "^5.0.0"
-					}
-				},
-				"universal-user-agent": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-					"integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-					"dev": true
-				}
-			}
-		},
-		"@octokit/endpoint": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.1.2.tgz",
-			"integrity": "sha512-bBGGmcRFq1x0jrB29G/9KjYmO3cdHfk3476B2JOHRvLsNw1Pn3l+ZvbiqtcO9qAS4Ti+zFedLB84ziHZRZclQA==",
-			"dev": true,
-			"requires": {
-				"deepmerge": "3.2.0",
-				"is-plain-object": "^3.0.0",
-				"universal-user-agent": "^2.1.0",
-				"url-template": "^2.0.8"
-			},
-			"dependencies": {
-				"deepmerge": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.2.0.tgz",
-					"integrity": "sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==",
-					"dev": true
-				},
-				"is-plain-object": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
-					"integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
-					"dev": true
-				}
-			}
-		},
-		"@octokit/graphql": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
-			"integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
-			"dev": true,
-			"requires": {
-				"@octokit/request": "^5.6.0",
-				"@octokit/types": "^6.0.3",
-				"universal-user-agent": "^6.0.0"
-			},
-			"dependencies": {
-				"@octokit/endpoint": {
-					"version": "6.0.12",
-					"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
-					"integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
-					"dev": true,
-					"requires": {
-						"@octokit/types": "^6.0.3",
-						"is-plain-object": "^5.0.0",
-						"universal-user-agent": "^6.0.0"
-					}
-				},
-				"@octokit/request": {
-					"version": "5.6.3",
-					"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-					"integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
-					"dev": true,
-					"requires": {
-						"@octokit/endpoint": "^6.0.1",
-						"@octokit/request-error": "^2.1.0",
-						"@octokit/types": "^6.16.1",
-						"is-plain-object": "^5.0.0",
-						"node-fetch": "^2.6.7",
-						"universal-user-agent": "^6.0.0"
-					}
-				},
-				"node-fetch": {
-					"version": "2.6.12",
-					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-					"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-					"dev": true,
-					"requires": {
-						"whatwg-url": "^5.0.0"
-					}
-				},
-				"universal-user-agent": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-					"integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-					"dev": true
-				}
-			}
-		},
-		"@octokit/openapi-types": {
-			"version": "11.2.0",
-			"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-			"integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==",
-			"dev": true
-		},
-		"@octokit/plugin-enterprise-rest": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz",
-			"integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==",
-			"dev": true
-		},
-		"@octokit/plugin-paginate-rest": {
-			"version": "2.21.3",
-			"resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz",
-			"integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==",
-			"dev": true,
-			"requires": {
-				"@octokit/types": "^6.40.0"
-			},
-			"dependencies": {
-				"@octokit/openapi-types": {
-					"version": "12.11.0",
-					"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
-					"integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==",
-					"dev": true
-				},
-				"@octokit/types": {
-					"version": "6.41.0",
-					"resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
-					"integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
-					"dev": true,
-					"requires": {
-						"@octokit/openapi-types": "^12.11.0"
-					}
-				}
-			}
-		},
-		"@octokit/plugin-request-log": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
-			"integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
-			"dev": true
-		},
-		"@octokit/plugin-rest-endpoint-methods": {
-			"version": "5.16.2",
-			"resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz",
-			"integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==",
-			"dev": true,
-			"requires": {
-				"@octokit/types": "^6.39.0",
-				"deprecation": "^2.3.1"
-			},
-			"dependencies": {
-				"@octokit/openapi-types": {
-					"version": "12.11.0",
-					"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
-					"integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==",
-					"dev": true
-				},
-				"@octokit/types": {
-					"version": "6.41.0",
-					"resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
-					"integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
-					"dev": true,
-					"requires": {
-						"@octokit/openapi-types": "^12.11.0"
-					}
-				}
-			}
-		},
-		"@octokit/request": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-4.1.1.tgz",
-			"integrity": "sha512-LOyL0i3oxRo418EXRSJNk/3Q4I0/NKawTn6H/CQp+wnrG1UFLGu080gSsgnWobhPo5BpUNgSQ5BRk5FOOJhD1Q==",
-			"dev": true,
-			"requires": {
-				"@octokit/endpoint": "^5.1.0",
-				"@octokit/request-error": "^1.0.1",
-				"deprecation": "^2.0.0",
-				"is-plain-object": "^3.0.0",
-				"node-fetch": "^2.3.0",
-				"once": "^1.4.0",
-				"universal-user-agent": "^2.1.0"
-			},
-			"dependencies": {
-				"@octokit/request-error": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz",
-					"integrity": "sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==",
-					"dev": true,
-					"requires": {
-						"@octokit/types": "^2.0.0",
-						"deprecation": "^2.0.0",
-						"once": "^1.4.0"
-					}
-				},
-				"@octokit/types": {
-					"version": "2.16.2",
-					"resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
-					"integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
-					"dev": true,
-					"requires": {
-						"@types/node": ">= 8"
-					}
-				},
-				"is-plain-object": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
-					"integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
-					"dev": true
-				}
-			}
-		},
-		"@octokit/request-error": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
-			"integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
-			"dev": true,
-			"requires": {
-				"@octokit/types": "^6.0.3",
-				"deprecation": "^2.0.0",
-				"once": "^1.4.0"
-			}
-		},
-		"@octokit/rest": {
-			"version": "16.26.0",
-			"resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.26.0.tgz",
-			"integrity": "sha512-NBpzre44ZAQWZhlH+zUYTgqI0pHN+c9rNj4d+pCydGEiKTGc1HKmoTghEUyr9GxazDyoAvmpx9nL0I7QS1Olvg==",
-			"dev": true,
-			"requires": {
-				"@octokit/request": "^4.0.1",
-				"@octokit/request-error": "^1.0.2",
-				"atob-lite": "^2.0.0",
-				"before-after-hook": "^1.4.0",
-				"btoa-lite": "^1.0.0",
-				"deprecation": "^2.0.0",
-				"lodash.get": "^4.4.2",
-				"lodash.set": "^4.3.2",
-				"lodash.uniq": "^4.5.0",
-				"octokit-pagination-methods": "^1.1.0",
-				"once": "^1.4.0",
-				"universal-user-agent": "^2.0.0",
-				"url-template": "^2.0.8"
-			},
-			"dependencies": {
-				"@octokit/request-error": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz",
-					"integrity": "sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==",
-					"dev": true,
-					"requires": {
-						"@octokit/types": "^2.0.0",
-						"deprecation": "^2.0.0",
-						"once": "^1.4.0"
-					}
-				},
-				"@octokit/types": {
-					"version": "2.16.2",
-					"resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
-					"integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
-					"dev": true,
-					"requires": {
-						"@types/node": ">= 8"
-					}
-				}
-			}
-		},
-		"@octokit/tsconfig": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@octokit/tsconfig/-/tsconfig-1.0.2.tgz",
-			"integrity": "sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA==",
-			"dev": true
-		},
-		"@octokit/types": {
-			"version": "6.34.0",
-			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-			"integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
-			"dev": true,
-			"requires": {
-				"@octokit/openapi-types": "^11.2.0"
-			}
-		},
-		"@octokit/webhooks": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-7.1.0.tgz",
-			"integrity": "sha512-kHyYkJkqY/wiP/hp0IT9FhkY5PhnV01co16V2YMRP/Zgnk3Vsy3U5iLAaP6U/0eRIlz5T4LSvkrcfNlfSb3cVQ==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.0.0"
-			}
-		},
-		"@octokit/webhooks-types": {
-			"version": "5.6.0",
-			"resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-5.6.0.tgz",
-			"integrity": "sha512-y3MqE6N6Ksg1+YV0sXVpW2WP7Y24h7rUp2hDJuzoqWdKGr7owmRDyHC72INwfCYNzura/vsNPXvc6Xbfp4wGGw==",
-			"dev": true
-		},
-		"@parcel/watcher": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz",
-			"integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==",
-			"dev": true,
-			"requires": {
-				"node-addon-api": "^3.2.1",
-				"node-gyp-build": "^4.3.0"
-			}
-		},
-		"@pkgjs/parseargs": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-			"integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-			"dev": true,
-			"optional": true
-		},
-		"@pkgr/utils": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz",
-			"integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==",
-			"dev": true,
-			"requires": {
-				"cross-spawn": "^7.0.3",
-				"fast-glob": "^3.3.0",
-				"is-glob": "^4.0.3",
-				"open": "^9.1.0",
-				"picocolors": "^1.0.0",
-				"tslib": "^2.6.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"define-lazy-prop": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-					"integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-					"dev": true
-				},
-				"fast-glob": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-					"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-					"dev": true,
-					"requires": {
-						"@nodelib/fs.stat": "^2.0.2",
-						"@nodelib/fs.walk": "^1.2.3",
-						"glob-parent": "^5.1.2",
-						"merge2": "^1.3.0",
-						"micromatch": "^4.0.4"
-					}
-				},
-				"glob-parent": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				},
-				"is-wsl": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-					"dev": true,
-					"requires": {
-						"is-docker": "^2.0.0"
-					}
-				},
-				"open": {
-					"version": "9.1.0",
-					"resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz",
-					"integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==",
-					"dev": true,
-					"requires": {
-						"default-browser": "^4.0.0",
-						"define-lazy-prop": "^3.0.0",
-						"is-inside-container": "^1.0.0",
-						"is-wsl": "^2.2.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@playwright/test": {
-			"version": "1.39.0",
-			"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.39.0.tgz",
-			"integrity": "sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==",
-			"dev": true,
-			"requires": {
-				"playwright": "1.39.0"
-			}
-		},
-		"@pmmmwh/react-refresh-webpack-plugin": {
-			"version": "0.5.11",
-			"resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.11.tgz",
-			"integrity": "sha512-7j/6vdTym0+qZ6u4XbSAxrWBGYSdCfTzySkj7WAFgDLmSyWlOrWvpyzxlFh5jtw9dn0oL/jtW+06XfFiisN3JQ==",
-			"dev": true,
-			"requires": {
-				"ansi-html-community": "^0.0.8",
-				"common-path-prefix": "^3.0.0",
-				"core-js-pure": "^3.23.3",
-				"error-stack-parser": "^2.0.6",
-				"find-up": "^5.0.0",
-				"html-entities": "^2.1.0",
-				"loader-utils": "^2.0.4",
-				"schema-utils": "^3.0.0",
-				"source-map": "^0.7.3"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-					"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
-				},
-				"source-map": {
-					"version": "0.7.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-					"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-					"dev": true
-				}
-			}
-		},
-		"@polka/url": {
-			"version": "1.0.0-next.23",
-			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.23.tgz",
-			"integrity": "sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==",
-			"dev": true
-		},
-		"@popperjs/core": {
-			"version": "2.11.7",
-			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
-			"integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw=="
-		},
-		"@preact/signals": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.1.3.tgz",
-			"integrity": "sha512-N09DuAVvc90bBZVRwD+aFhtGyHAmJLhS3IFoawO/bYJRcil4k83nBOchpCEoS0s5+BXBpahgp0Mjf+IOqP57Og==",
-			"requires": {
-				"@preact/signals-core": "^1.2.3"
-			}
-		},
-		"@preact/signals-core": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.4.0.tgz",
-			"integrity": "sha512-5iYoZBhELLIhUQceZI7sDTQWPb+xcVSn2qk8T/aNl/VMh+A4AiPX9YRSh4XO7fZ6pncrVxl1Iln82poVqYVbbw=="
-		},
-		"@puppeteer/browsers": {
-			"version": "1.4.6",
-			"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.6.tgz",
-			"integrity": "sha512-x4BEjr2SjOPowNeiguzjozQbsc6h437ovD/wu+JpaenxVLm3jkgzHY2xOslMTp50HoTvQreMjiexiGQw1sqZlQ==",
-			"dev": true,
-			"requires": {
-				"debug": "4.3.4",
-				"extract-zip": "2.0.1",
-				"progress": "2.0.3",
-				"proxy-agent": "6.3.0",
-				"tar-fs": "3.0.4",
-				"unbzip2-stream": "1.4.3",
-				"yargs": "17.7.1"
-			},
-			"dependencies": {
-				"cliui": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.1",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"extract-zip": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-					"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-					"dev": true,
-					"requires": {
-						"@types/yauzl": "^2.9.1",
-						"debug": "^4.1.1",
-						"get-stream": "^5.1.0",
-						"yauzl": "^2.10.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"tar-fs": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
-					"integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
-					"dev": true,
-					"requires": {
-						"mkdirp-classic": "^0.5.2",
-						"pump": "^3.0.0",
-						"tar-stream": "^3.1.5"
-					}
-				},
-				"tar-stream": {
-					"version": "3.1.6",
-					"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-					"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
-					"dev": true,
-					"requires": {
-						"b4a": "^1.6.4",
-						"fast-fifo": "^1.2.0",
-						"streamx": "^2.15.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "17.7.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-					"integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-					"dev": true,
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-					"dev": true
-				}
-			}
-		},
-		"@radix-ui/number": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.0.1.tgz",
-			"integrity": "sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@radix-ui/primitive": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.0.tgz",
-			"integrity": "sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==",
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@radix-ui/react-arrow": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.2.tgz",
-			"integrity": "sha512-fqYwhhI9IarZ0ll2cUSfKuXHlJK0qE4AfnRrPBbRwEH/4mGQn04/QFGomLi8TXWIdv9WJk//KgGm+aDxVIr1wA==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-primitive": "1.0.2"
-			},
-			"dependencies": {
-				"@radix-ui/react-primitive": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-					"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-slot": "1.0.1"
-					}
-				},
-				"@radix-ui/react-slot": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-					"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.0"
-					}
-				}
-			}
-		},
-		"@radix-ui/react-collection": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.0.2.tgz",
-			"integrity": "sha512-s8WdQQ6wNXpaxdZ308KSr8fEWGrg4un8i4r/w7fhiS4ElRNjk5rRcl0/C6TANG2LvLOGIxtzo/jAg6Qf73TEBw==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-slot": "1.0.1"
-			},
-			"dependencies": {
-				"@radix-ui/react-primitive": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-					"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-slot": "1.0.1"
-					}
-				},
-				"@radix-ui/react-slot": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-					"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.0"
-					}
-				}
-			}
-		},
-		"@radix-ui/react-compose-refs": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz",
-			"integrity": "sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==",
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@radix-ui/react-context": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.0.tgz",
-			"integrity": "sha512-1pVM9RfOQ+n/N5PJK33kRSKsr1glNxomxONs5c49MliinBY6Yw2Q995qfBUUo0/Mbg05B/sGA0gkgPI7kmSHBg==",
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@radix-ui/react-dialog": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.0.tgz",
-			"integrity": "sha512-Yn9YU+QlHYLWwV1XfKiqnGVpWYWk6MeBVM6x/bcoyPvxgjQGoeT35482viLPctTMWoMw0PoHgqfSox7Ig+957Q==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-dismissable-layer": "1.0.0",
-				"@radix-ui/react-focus-guards": "1.0.0",
-				"@radix-ui/react-focus-scope": "1.0.0",
-				"@radix-ui/react-id": "1.0.0",
-				"@radix-ui/react-portal": "1.0.0",
-				"@radix-ui/react-presence": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.0",
-				"@radix-ui/react-slot": "1.0.0",
-				"@radix-ui/react-use-controllable-state": "1.0.0",
-				"aria-hidden": "^1.1.1",
-				"react-remove-scroll": "2.5.4"
-			}
-		},
-		"@radix-ui/react-direction": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.0.tgz",
-			"integrity": "sha512-2HV05lGUgYcA6xgLQ4BKPDmtL+QbIZYH5fCOTAOOcJ5O0QbWS3i9lKaurLzliYUDhORI2Qr3pyjhJh44lKA3rQ==",
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@radix-ui/react-dismissable-layer": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.0.tgz",
-			"integrity": "sha512-n7kDRfx+LB1zLueRDvZ1Pd0bxdJWDUZNQ/GWoxDn2prnuJKRdxsjulejX/ePkOsLi2tTm6P24mDqlMSgQpsT6g==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.0",
-				"@radix-ui/react-use-callback-ref": "1.0.0",
-				"@radix-ui/react-use-escape-keydown": "1.0.0"
-			}
-		},
-		"@radix-ui/react-dropdown-menu": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.0.4.tgz",
-			"integrity": "sha512-y6AT9+MydyXcByivdK1+QpjWoKaC7MLjkS/cH1Q3keEyMvDkiY85m8o2Bi6+Z1PPUlCsMULopxagQOSfN0wahg==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-id": "1.0.0",
-				"@radix-ui/react-menu": "2.0.4",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-use-controllable-state": "1.0.0"
-			},
-			"dependencies": {
-				"@radix-ui/react-primitive": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-					"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-slot": "1.0.1"
-					}
-				},
-				"@radix-ui/react-slot": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-					"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.0"
-					}
-				}
-			}
-		},
-		"@radix-ui/react-focus-guards": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.0.tgz",
-			"integrity": "sha512-UagjDk4ijOAnGu4WMUPj9ahi7/zJJqNZ9ZAiGPp7waUWJO0O1aWXi/udPphI0IUjvrhBsZJGSN66dR2dsueLWQ==",
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@radix-ui/react-focus-scope": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.0.tgz",
-			"integrity": "sha512-C4SWtsULLGf/2L4oGeIHlvWQx7Rf+7cX/vKOAD2dXW0A1b5QXwi3wWeaEgW+wn+SEVrraMUk05vLU9fZZz5HbQ==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.0",
-				"@radix-ui/react-use-callback-ref": "1.0.0"
-			}
-		},
-		"@radix-ui/react-id": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.0.tgz",
-			"integrity": "sha512-Q6iAB/U7Tq3NTolBBQbHTgclPmGWE3OlktGGqrClPozSw4vkQ1DfQAOtzgRPecKsMdJINE05iaoDUG8tRzCBjw==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-layout-effect": "1.0.0"
-			}
-		},
-		"@radix-ui/react-menu": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.0.4.tgz",
-			"integrity": "sha512-mzKR47tZ1t193trEqlQoJvzY4u9vYfVH16ryBrVrCAGZzkgyWnMQYEZdUkM7y8ak9mrkKtJiqB47TlEnubeOFQ==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-collection": "1.0.2",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-direction": "1.0.0",
-				"@radix-ui/react-dismissable-layer": "1.0.3",
-				"@radix-ui/react-focus-guards": "1.0.0",
-				"@radix-ui/react-focus-scope": "1.0.2",
-				"@radix-ui/react-id": "1.0.0",
-				"@radix-ui/react-popper": "1.1.1",
-				"@radix-ui/react-portal": "1.0.2",
-				"@radix-ui/react-presence": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-roving-focus": "1.0.3",
-				"@radix-ui/react-slot": "1.0.1",
-				"@radix-ui/react-use-callback-ref": "1.0.0",
-				"aria-hidden": "^1.1.1",
-				"react-remove-scroll": "2.5.5"
-			},
-			"dependencies": {
-				"@radix-ui/react-dismissable-layer": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.3.tgz",
-					"integrity": "sha512-nXZOvFjOuHS1ovumntGV7NNoLaEp9JEvTht3MBjP44NSW5hUKj/8OnfN3+8WmB+CEhN44XaGhpHoSsUIEl5P7Q==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/primitive": "1.0.0",
-						"@radix-ui/react-compose-refs": "1.0.0",
-						"@radix-ui/react-primitive": "1.0.2",
-						"@radix-ui/react-use-callback-ref": "1.0.0",
-						"@radix-ui/react-use-escape-keydown": "1.0.2"
-					}
-				},
-				"@radix-ui/react-focus-scope": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.2.tgz",
-					"integrity": "sha512-spwXlNTfeIprt+kaEWE/qYuYT3ZAqJiAGjN/JgdvgVDTu8yc+HuX+WOWXrKliKnLnwck0F6JDkqIERncnih+4A==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.0",
-						"@radix-ui/react-primitive": "1.0.2",
-						"@radix-ui/react-use-callback-ref": "1.0.0"
-					}
-				},
-				"@radix-ui/react-portal": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.2.tgz",
-					"integrity": "sha512-swu32idoCW7KA2VEiUZGBSu9nB6qwGdV6k6HYhUoOo3M1FFpD+VgLzUqtt3mwL1ssz7r2x8MggpLSQach2Xy/Q==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-primitive": "1.0.2"
-					}
-				},
-				"@radix-ui/react-primitive": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-					"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-slot": "1.0.1"
-					}
-				},
-				"@radix-ui/react-slot": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-					"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.0"
-					}
-				},
-				"@radix-ui/react-use-escape-keydown": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.2.tgz",
-					"integrity": "sha512-DXGim3x74WgUv+iMNCF+cAo8xUHHeqvjx8zs7trKf+FkQKPQXLk2sX7Gx1ysH7Q76xCpZuxIJE7HLPxRE+Q+GA==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-use-callback-ref": "1.0.0"
-					}
-				},
-				"react-remove-scroll": {
-					"version": "2.5.5",
-					"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
-					"integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
-					"requires": {
-						"react-remove-scroll-bar": "^2.3.3",
-						"react-style-singleton": "^2.2.1",
-						"tslib": "^2.1.0",
-						"use-callback-ref": "^1.3.0",
-						"use-sidecar": "^1.1.2"
-					}
-				}
-			}
-		},
-		"@radix-ui/react-popper": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.1.1.tgz",
-			"integrity": "sha512-keYDcdMPNMjSC8zTsZ8wezUMiWM9Yj14wtF3s0PTIs9srnEPC9Kt2Gny1T3T81mmSeyDjZxsD9N5WCwNNb712w==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@floating-ui/react-dom": "0.7.2",
-				"@radix-ui/react-arrow": "1.0.2",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-use-callback-ref": "1.0.0",
-				"@radix-ui/react-use-layout-effect": "1.0.0",
-				"@radix-ui/react-use-rect": "1.0.0",
-				"@radix-ui/react-use-size": "1.0.0",
-				"@radix-ui/rect": "1.0.0"
-			},
-			"dependencies": {
-				"@floating-ui/core": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.3.tgz",
-					"integrity": "sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg=="
-				},
-				"@floating-ui/dom": {
-					"version": "0.5.4",
-					"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.4.tgz",
-					"integrity": "sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==",
-					"requires": {
-						"@floating-ui/core": "^0.7.3"
-					}
-				},
-				"@floating-ui/react-dom": {
-					"version": "0.7.2",
-					"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-0.7.2.tgz",
-					"integrity": "sha512-1T0sJcpHgX/u4I1OzIEhlcrvkUN8ln39nz7fMoE/2HDHrPiMFoOGR7++GYyfUmIQHkkrTinaeQsO3XWubjSvGg==",
-					"requires": {
-						"@floating-ui/dom": "^0.5.3",
-						"use-isomorphic-layout-effect": "^1.1.1"
-					}
-				},
-				"@radix-ui/react-primitive": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-					"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-slot": "1.0.1"
-					}
-				},
-				"@radix-ui/react-slot": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-					"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.0"
-					}
-				}
-			}
-		},
-		"@radix-ui/react-portal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.0.tgz",
-			"integrity": "sha512-a8qyFO/Xb99d8wQdu4o7qnigNjTPG123uADNecz0eX4usnQEj7o+cG4ZX4zkqq98NYekT7UoEQIjxBNWIFuqTA==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-primitive": "1.0.0"
-			}
-		},
-		"@radix-ui/react-presence": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.0.tgz",
-			"integrity": "sha512-A+6XEvN01NfVWiKu38ybawfHsBjWum42MRPnEuqPsBZ4eV7e/7K321B5VgYMPv3Xx5An6o1/l9ZuDBgmcmWK3w==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-use-layout-effect": "1.0.0"
-			}
-		},
-		"@radix-ui/react-primitive": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.0.tgz",
-			"integrity": "sha512-EyXe6mnRlHZ8b6f4ilTDrXmkLShICIuOTTj0GX4w1rp+wSxf3+TD05u1UOITC8VsJ2a9nwHvdXtOXEOl0Cw/zQ==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-slot": "1.0.0"
-			}
-		},
-		"@radix-ui/react-roving-focus": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.3.tgz",
-			"integrity": "sha512-stjCkIoMe6h+1fWtXlA6cRfikdBzCLp3SnVk7c48cv/uy3DTGoXhN76YaOYUJuy3aEDvDIKwKR5KSmvrtPvQPQ==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/primitive": "1.0.0",
-				"@radix-ui/react-collection": "1.0.2",
-				"@radix-ui/react-compose-refs": "1.0.0",
-				"@radix-ui/react-context": "1.0.0",
-				"@radix-ui/react-direction": "1.0.0",
-				"@radix-ui/react-id": "1.0.0",
-				"@radix-ui/react-primitive": "1.0.2",
-				"@radix-ui/react-use-callback-ref": "1.0.0",
-				"@radix-ui/react-use-controllable-state": "1.0.0"
-			},
-			"dependencies": {
-				"@radix-ui/react-primitive": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
-					"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-slot": "1.0.1"
-					}
-				},
-				"@radix-ui/react-slot": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
-					"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.0"
-					}
-				}
-			}
-		},
-		"@radix-ui/react-select": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-1.2.2.tgz",
-			"integrity": "sha512-zI7McXr8fNaSrUY9mZe4x/HC0jTLY9fWNhO1oLWYMQGDXuV4UCivIGTxwioSzO0ZCYX9iSLyWmAh/1TOmX3Cnw==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/number": "1.0.1",
-				"@radix-ui/primitive": "1.0.1",
-				"@radix-ui/react-collection": "1.0.3",
-				"@radix-ui/react-compose-refs": "1.0.1",
-				"@radix-ui/react-context": "1.0.1",
-				"@radix-ui/react-direction": "1.0.1",
-				"@radix-ui/react-dismissable-layer": "1.0.4",
-				"@radix-ui/react-focus-guards": "1.0.1",
-				"@radix-ui/react-focus-scope": "1.0.3",
-				"@radix-ui/react-id": "1.0.1",
-				"@radix-ui/react-popper": "1.1.2",
-				"@radix-ui/react-portal": "1.0.3",
-				"@radix-ui/react-primitive": "1.0.3",
-				"@radix-ui/react-slot": "1.0.2",
-				"@radix-ui/react-use-callback-ref": "1.0.1",
-				"@radix-ui/react-use-controllable-state": "1.0.1",
-				"@radix-ui/react-use-layout-effect": "1.0.1",
-				"@radix-ui/react-use-previous": "1.0.1",
-				"@radix-ui/react-visually-hidden": "1.0.3",
-				"aria-hidden": "^1.1.1",
-				"react-remove-scroll": "2.5.5"
-			},
-			"dependencies": {
-				"@floating-ui/react-dom": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.1.tgz",
-					"integrity": "sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==",
-					"dev": true,
-					"requires": {
-						"@floating-ui/dom": "^1.3.0"
-					}
-				},
-				"@radix-ui/primitive": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.1.tgz",
-					"integrity": "sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10"
-					}
-				},
-				"@radix-ui/react-arrow": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.3.tgz",
-					"integrity": "sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-primitive": "1.0.3"
-					}
-				},
-				"@radix-ui/react-collection": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.0.3.tgz",
-					"integrity": "sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.1",
-						"@radix-ui/react-context": "1.0.1",
-						"@radix-ui/react-primitive": "1.0.3",
-						"@radix-ui/react-slot": "1.0.2"
-					}
-				},
-				"@radix-ui/react-compose-refs": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz",
-					"integrity": "sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10"
-					}
-				},
-				"@radix-ui/react-context": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.1.tgz",
-					"integrity": "sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10"
-					}
-				},
-				"@radix-ui/react-direction": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.1.tgz",
-					"integrity": "sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10"
-					}
-				},
-				"@radix-ui/react-dismissable-layer": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.4.tgz",
-					"integrity": "sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/primitive": "1.0.1",
-						"@radix-ui/react-compose-refs": "1.0.1",
-						"@radix-ui/react-primitive": "1.0.3",
-						"@radix-ui/react-use-callback-ref": "1.0.1",
-						"@radix-ui/react-use-escape-keydown": "1.0.3"
-					}
-				},
-				"@radix-ui/react-focus-guards": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz",
-					"integrity": "sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10"
-					}
-				},
-				"@radix-ui/react-focus-scope": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.3.tgz",
-					"integrity": "sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.1",
-						"@radix-ui/react-primitive": "1.0.3",
-						"@radix-ui/react-use-callback-ref": "1.0.1"
-					}
-				},
-				"@radix-ui/react-id": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.1.tgz",
-					"integrity": "sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-use-layout-effect": "1.0.1"
-					}
-				},
-				"@radix-ui/react-popper": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.1.2.tgz",
-					"integrity": "sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@floating-ui/react-dom": "^2.0.0",
-						"@radix-ui/react-arrow": "1.0.3",
-						"@radix-ui/react-compose-refs": "1.0.1",
-						"@radix-ui/react-context": "1.0.1",
-						"@radix-ui/react-primitive": "1.0.3",
-						"@radix-ui/react-use-callback-ref": "1.0.1",
-						"@radix-ui/react-use-layout-effect": "1.0.1",
-						"@radix-ui/react-use-rect": "1.0.1",
-						"@radix-ui/react-use-size": "1.0.1",
-						"@radix-ui/rect": "1.0.1"
-					}
-				},
-				"@radix-ui/react-portal": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.3.tgz",
-					"integrity": "sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-primitive": "1.0.3"
-					}
-				},
-				"@radix-ui/react-primitive": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz",
-					"integrity": "sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-slot": "1.0.2"
-					}
-				},
-				"@radix-ui/react-slot": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
-					"integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.1"
-					}
-				},
-				"@radix-ui/react-use-callback-ref": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz",
-					"integrity": "sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10"
-					}
-				},
-				"@radix-ui/react-use-controllable-state": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz",
-					"integrity": "sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-use-callback-ref": "1.0.1"
-					}
-				},
-				"@radix-ui/react-use-escape-keydown": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz",
-					"integrity": "sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-use-callback-ref": "1.0.1"
-					}
-				},
-				"@radix-ui/react-use-layout-effect": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz",
-					"integrity": "sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10"
-					}
-				},
-				"@radix-ui/react-use-rect": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.1.tgz",
-					"integrity": "sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/rect": "1.0.1"
-					}
-				},
-				"@radix-ui/react-use-size": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.1.tgz",
-					"integrity": "sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-use-layout-effect": "1.0.1"
-					}
-				},
-				"@radix-ui/rect": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.1.tgz",
-					"integrity": "sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10"
-					}
-				},
-				"react-remove-scroll": {
-					"version": "2.5.5",
-					"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
-					"integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
-					"dev": true,
-					"requires": {
-						"react-remove-scroll-bar": "^2.3.3",
-						"react-style-singleton": "^2.2.1",
-						"tslib": "^2.1.0",
-						"use-callback-ref": "^1.3.0",
-						"use-sidecar": "^1.1.2"
-					}
-				}
-			}
-		},
-		"@radix-ui/react-slot": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.0.tgz",
-			"integrity": "sha512-3mrKauI/tWXo1Ll+gN5dHcxDPdm/Df1ufcDLCecn+pnCIVcdWE7CujXo8QaXOWRJyZyQWWbpB8eFwHzWXlv5mQ==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-compose-refs": "1.0.0"
-			}
-		},
-		"@radix-ui/react-use-callback-ref": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.0.tgz",
-			"integrity": "sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg==",
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@radix-ui/react-use-controllable-state": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.0.tgz",
-			"integrity": "sha512-FohDoZvk3mEXh9AWAVyRTYR4Sq7/gavuofglmiXB2g1aKyboUD4YtgWxKj8O5n+Uak52gXQ4wKz5IFST4vtJHg==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-callback-ref": "1.0.0"
-			}
-		},
-		"@radix-ui/react-use-escape-keydown": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.0.tgz",
-			"integrity": "sha512-JwfBCUIfhXRxKExgIqGa4CQsiMemo1Xt0W/B4ei3fpzpvPENKpMKQ8mZSB6Acj3ebrAEgi2xiQvcI1PAAodvyg==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-callback-ref": "1.0.0"
-			}
-		},
-		"@radix-ui/react-use-layout-effect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.0.tgz",
-			"integrity": "sha512-6Tpkq+R6LOlmQb1R5NNETLG0B4YP0wc+klfXafpUCj6JGyaUc8il7/kUZ7m59rGbXGczE9Bs+iz2qloqsZBduQ==",
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@radix-ui/react-use-previous": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.0.1.tgz",
-			"integrity": "sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@radix-ui/react-use-rect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.0.tgz",
-			"integrity": "sha512-TB7pID8NRMEHxb/qQJpvSt3hQU4sqNPM1VCTjTRjEOa7cEop/QMuq8S6fb/5Tsz64kqSvB9WnwsDHtjnrM9qew==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/rect": "1.0.0"
-			}
-		},
-		"@radix-ui/react-use-size": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.0.tgz",
-			"integrity": "sha512-imZ3aYcoYCKhhgNpkNDh/aTiU05qw9hX+HHI1QDBTyIlcFjgeFlKKySNGMwTp7nYFLQg/j0VA2FmCY4WPDDHMg==",
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-use-layout-effect": "1.0.0"
-			}
-		},
-		"@radix-ui/react-visually-hidden": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.3.tgz",
-			"integrity": "sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.13.10",
-				"@radix-ui/react-primitive": "1.0.3"
-			},
-			"dependencies": {
-				"@radix-ui/react-compose-refs": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz",
-					"integrity": "sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10"
-					}
-				},
-				"@radix-ui/react-primitive": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz",
-					"integrity": "sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-slot": "1.0.2"
-					}
-				},
-				"@radix-ui/react-slot": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
-					"integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.13.10",
-						"@radix-ui/react-compose-refs": "1.0.1"
-					}
-				}
-			}
-		},
-		"@radix-ui/rect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.0.tgz",
-			"integrity": "sha512-d0O68AYy/9oeEy1DdC07bz1/ZXX+DqCskRd3i4JzLSTXwefzaepQrKjXC7aNM8lTHjFLDO0pDgaEiQ7jEk+HVg==",
-			"requires": {
-				"@babel/runtime": "^7.13.10"
-			}
-		},
-		"@react-native-clipboard/clipboard": {
-			"version": "1.11.2",
-			"resolved": "https://registry.npmjs.org/@react-native-clipboard/clipboard/-/clipboard-1.11.2.tgz",
-			"integrity": "sha512-bHyZVW62TuleiZsXNHS1Pv16fWc0fh8O9WvBzl4h2fykqZRW9a+Pv/RGTH56E3X2PqzHP38K5go8zmCZUoIsoQ=="
-		},
-		"@react-native-community/blur": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/@react-native-community/blur/-/blur-4.2.0.tgz",
-			"integrity": "sha512-StgP5zQJOCHqDRjmcKnzVkJ920S6DYBKRJfigSUnlkNQp+HzZtVtyKq0j5a7x84NtHcV7j8Uy5mz1Lx9ZKRKfA=="
-		},
-		"@react-native-community/cli-clean": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-10.1.1.tgz",
-			"integrity": "sha512-iNsrjzjIRv9yb5y309SWJ8NDHdwYtnCpmxZouQDyOljUdC9MwdZ4ChbtA4rwQyAwgOVfS9F/j56ML3Cslmvrxg==",
-			"requires": {
-				"@react-native-community/cli-tools": "^10.1.1",
-				"chalk": "^4.1.2",
-				"execa": "^1.0.0",
-				"prompts": "^2.4.0"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@react-native-community/cli-config": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-10.1.1.tgz",
-			"integrity": "sha512-p4mHrjC+s/ayiNVG6T35GdEGdP6TuyBUg5plVGRJfTl8WT6LBfLYLk+fz/iETrEZ/YkhQIsQcEUQC47MqLNHog==",
-			"requires": {
-				"@react-native-community/cli-tools": "^10.1.1",
-				"chalk": "^4.1.2",
-				"cosmiconfig": "^5.1.0",
-				"deepmerge": "^3.2.0",
-				"glob": "^7.1.3",
-				"joi": "^17.2.1"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cosmiconfig": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-					"integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-					"requires": {
-						"import-fresh": "^2.0.0",
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.13.1",
-						"parse-json": "^4.0.0"
-					}
-				},
-				"deepmerge": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz",
-					"integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"import-fresh": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-					"integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
-					"requires": {
-						"caller-path": "^2.0.0",
-						"resolve-from": "^3.0.0"
-					}
-				},
-				"parse-json": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-					"integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-					"requires": {
-						"error-ex": "^1.3.1",
-						"json-parse-better-errors": "^1.0.1"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@react-native-community/cli-debugger-ui": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-10.0.0.tgz",
-			"integrity": "sha512-8UKLcvpSNxnUTRy8CkCl27GGLqZunQ9ncGYhSrWyKrU9SWBJJGeZwi2k2KaoJi5FvF2+cD0t8z8cU6lsq2ZZmA==",
-			"requires": {
-				"serve-static": "^1.13.1"
-			}
-		},
-		"@react-native-community/cli-doctor": {
-			"version": "10.2.5",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-10.2.5.tgz",
-			"integrity": "sha512-1YbzXvsldBmSw1MmBsXB74bKiHXKNCjlb2ByLgkfTiarpSvETYam3g5vex0N+qc0Cdkzkq+8NznE744LFhnUpw==",
-			"requires": {
-				"@react-native-community/cli-config": "^10.1.1",
-				"@react-native-community/cli-platform-ios": "^10.2.5",
-				"@react-native-community/cli-tools": "^10.1.1",
-				"chalk": "^4.1.2",
-				"command-exists": "^1.2.8",
-				"envinfo": "^7.7.2",
-				"execa": "^1.0.0",
-				"hermes-profile-transformer": "^0.0.6",
-				"ip": "^1.1.5",
-				"node-stream-zip": "^1.9.1",
-				"ora": "^5.4.1",
-				"prompts": "^2.4.0",
-				"semver": "^6.3.0",
-				"strip-ansi": "^5.2.0",
-				"sudo-prompt": "^9.0.0",
-				"wcwidth": "^1.0.1"
-			},
-			"dependencies": {
-				"@react-native-community/cli-platform-ios": {
-					"version": "10.2.5",
-					"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.5.tgz",
-					"integrity": "sha512-hq+FZZuSBK9z82GLQfzdNDl8vbFx5UlwCLFCuTtNCROgBoapFtVZQKRP2QBftYNrQZ0dLAb01gkwxagHsQCFyg==",
-					"requires": {
-						"@react-native-community/cli-tools": "^10.1.1",
-						"chalk": "^4.1.2",
-						"execa": "^1.0.0",
-						"fast-xml-parser": "^4.0.12",
-						"glob": "^7.1.3",
-						"ora": "^5.4.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					},
-					"dependencies": {
-						"semver": {
-							"version": "5.7.2",
-							"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-							"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-						}
-					}
-				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"ora": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-					"integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-					"requires": {
-						"bl": "^4.1.0",
-						"chalk": "^4.1.0",
-						"cli-cursor": "^3.1.0",
-						"cli-spinners": "^2.5.0",
-						"is-interactive": "^1.0.0",
-						"is-unicode-supported": "^0.1.0",
-						"log-symbols": "^4.1.0",
-						"strip-ansi": "^6.0.0",
-						"wcwidth": "^1.0.1"
-					},
-					"dependencies": {
-						"strip-ansi": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-							"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-							"requires": {
-								"ansi-regex": "^5.0.1"
-							}
-						}
-					}
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				},
-				"strip-ansi": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-					"requires": {
-						"ansi-regex": "^4.1.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-							"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
-						}
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@react-native-community/cli-hermes": {
-			"version": "10.2.0",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-hermes/-/cli-hermes-10.2.0.tgz",
-			"integrity": "sha512-urfmvNeR8IiO/Sd92UU3xPO+/qI2lwCWQnxOkWaU/i2EITFekE47MD6MZrfVulRVYRi5cuaFqKZO/ccOdOB/vQ==",
-			"requires": {
-				"@react-native-community/cli-platform-android": "^10.2.0",
-				"@react-native-community/cli-tools": "^10.1.1",
-				"chalk": "^4.1.2",
-				"hermes-profile-transformer": "^0.0.6",
-				"ip": "^1.1.5"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@react-native-community/cli-platform-android": {
-			"version": "10.2.0",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-10.2.0.tgz",
-			"integrity": "sha512-CBenYwGxwFdObZTn1lgxWtMGA5ms2G/ALQhkS+XTAD7KHDrCxFF9yT/fnAjFZKM6vX/1TqGI1RflruXih3kAhw==",
-			"requires": {
-				"@react-native-community/cli-tools": "^10.1.1",
-				"chalk": "^4.1.2",
-				"execa": "^1.0.0",
-				"glob": "^7.1.3",
-				"logkitty": "^0.7.1"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@react-native-community/cli-platform-ios": {
-			"version": "10.2.4",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.4.tgz",
-			"integrity": "sha512-/6K+jeRhcGojFIJMWMXV2eY5n/In+YUzBr/DKWQOeHBOHkESRNheG310xSAIjgB46YniSSUKhSyeuhalTbm9OQ==",
-			"requires": {
-				"@react-native-community/cli-tools": "^10.1.1",
-				"chalk": "^4.1.2",
-				"execa": "^1.0.0",
-				"fast-xml-parser": "^4.0.12",
-				"glob": "^7.1.3",
-				"ora": "^5.4.1"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"ora": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-					"integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-					"requires": {
-						"bl": "^4.1.0",
-						"chalk": "^4.1.0",
-						"cli-cursor": "^3.1.0",
-						"cli-spinners": "^2.5.0",
-						"is-interactive": "^1.0.0",
-						"is-unicode-supported": "^0.1.0",
-						"log-symbols": "^4.1.0",
-						"strip-ansi": "^6.0.0",
-						"wcwidth": "^1.0.1"
-					}
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@react-native-community/cli-plugin-metro": {
-			"version": "10.2.3",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-10.2.3.tgz",
-			"integrity": "sha512-jHi2oDuTePmW4NEyVT8JEGNlIYcnFXCSV2ZMp4rnDrUk4TzzyvS3IMvDlESEmG8Kry8rvP0KSUx/hTpy37Sbkw==",
-			"requires": {
-				"@react-native-community/cli-server-api": "^10.1.1",
-				"@react-native-community/cli-tools": "^10.1.1",
-				"chalk": "^4.1.2",
-				"execa": "^1.0.0",
-				"metro": "0.73.10",
-				"metro-config": "0.73.10",
-				"metro-core": "0.73.10",
-				"metro-react-native-babel-transformer": "0.73.10",
-				"metro-resolver": "0.73.10",
-				"metro-runtime": "0.73.10",
-				"readline": "^1.3.0"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@react-native-community/cli-server-api": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-10.1.1.tgz",
-			"integrity": "sha512-NZDo/wh4zlm8as31UEBno2bui8+ufzsZV+KN7QjEJWEM0levzBtxaD+4je0OpfhRIIkhaRm2gl/vVf7OYAzg4g==",
-			"requires": {
-				"@react-native-community/cli-debugger-ui": "^10.0.0",
-				"@react-native-community/cli-tools": "^10.1.1",
-				"compression": "^1.7.1",
-				"connect": "^3.6.5",
-				"errorhandler": "^1.5.0",
-				"nocache": "^3.0.1",
-				"pretty-format": "^26.6.2",
-				"serve-static": "^1.13.1",
-				"ws": "^7.5.1"
-			},
-			"dependencies": {
-				"@jest/types": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-					"integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
-					"requires": {
-						"@types/istanbul-lib-coverage": "^2.0.0",
-						"@types/istanbul-reports": "^3.0.0",
-						"@types/node": "*",
-						"@types/yargs": "^15.0.0",
-						"chalk": "^4.0.0"
-					}
-				},
-				"@types/yargs": {
-					"version": "15.0.15",
-					"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz",
-					"integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==",
-					"requires": {
-						"@types/yargs-parser": "*"
-					}
-				},
-				"pretty-format": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-					"integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
-					"requires": {
-						"@jest/types": "^26.6.2",
-						"ansi-regex": "^5.0.0",
-						"ansi-styles": "^4.0.0",
-						"react-is": "^17.0.1"
-					}
-				},
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-				}
-			}
-		},
-		"@react-native-community/cli-tools": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-10.1.1.tgz",
-			"integrity": "sha512-+FlwOnZBV+ailEzXjcD8afY2ogFEBeHOw/8+XXzMgPaquU2Zly9B+8W089tnnohO3yfiQiZqkQlElP423MY74g==",
-			"requires": {
-				"appdirsjs": "^1.2.4",
-				"chalk": "^4.1.2",
-				"find-up": "^5.0.0",
-				"mime": "^2.4.1",
-				"node-fetch": "^2.6.0",
-				"open": "^6.2.0",
-				"ora": "^5.4.1",
-				"semver": "^6.3.0",
-				"shell-quote": "^1.7.3"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"mime": {
-					"version": "2.6.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-					"integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"ora": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-					"integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-					"requires": {
-						"bl": "^4.1.0",
-						"chalk": "^4.1.0",
-						"cli-cursor": "^3.1.0",
-						"cli-spinners": "^2.5.0",
-						"is-interactive": "^1.0.0",
-						"is-unicode-supported": "^0.1.0",
-						"log-symbols": "^4.1.0",
-						"strip-ansi": "^6.0.0",
-						"wcwidth": "^1.0.1"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@react-native-community/cli-types": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-10.0.0.tgz",
-			"integrity": "sha512-31oUM6/rFBZQfSmDQsT1DX/5fjqfxg7sf2u8kTPJK7rXVya5SRpAMaCXsPAG0omsmJxXt+J9HxUi3Ic+5Ux5Iw==",
-			"requires": {
-				"joi": "^17.2.1"
-			}
-		},
-		"@react-native-community/slider": {
-			"version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz",
-			"integrity": "sha512-BrfAehlhFSUN0kzIhpeF8X4BvCJp6Rtxqfr+1Kpfn2B4kCuRmJoaqIDc+igPCl8ya99vzV1Uifw30P16NTMhuQ=="
-		},
-		"@react-native-masked-view/masked-view": {
-			"version": "0.2.9",
-			"resolved": "https://registry.npmjs.org/@react-native-masked-view/masked-view/-/masked-view-0.2.9.tgz",
-			"integrity": "sha512-Hs4vKBKj+15VxHZHFtMaFWSBxXoOE5Ea8saoigWhahp8Mepssm0ezU+2pTl7DK9z8Y9s5uOl/aPb4QmBZ3R3Zw=="
-		},
-		"@react-native/assets": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@react-native/assets/-/assets-1.0.0.tgz",
-			"integrity": "sha512-KrwSpS1tKI70wuKl68DwJZYEvXktDHdZMG0k2AXD/rJVSlB23/X2CB2cutVR0HwNMJIal9HOUOBB2rVfa6UGtQ=="
-		},
-		"@react-native/gradle-plugin": {
-			"version": "0.72.11",
-			"resolved": "https://registry.npmjs.org/@react-native/gradle-plugin/-/gradle-plugin-0.72.11.tgz",
-			"integrity": "sha512-P9iRnxiR2w7EHcZ0mJ+fmbPzMby77ZzV6y9sJI3lVLJzF7TLSdbwcQyD3lwMsiL+q5lKUHoZJS4sYmih+P2HXw=="
-		},
-		"@react-native/normalize-color": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/@react-native/normalize-color/-/normalize-color-2.1.0.tgz",
-			"integrity": "sha512-Z1jQI2NpdFJCVgpY+8Dq/Bt3d+YUi1928Q+/CZm/oh66fzM0RUl54vvuXlPJKybH4pdCZey1eDTPaLHkMPNgWA=="
-		},
-		"@react-native/polyfills": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@react-native/polyfills/-/polyfills-2.0.0.tgz",
-			"integrity": "sha512-K0aGNn1TjalKj+65D7ycc1//H9roAQ51GJVk5ZJQFb2teECGmzd86bYDC0aYdbRf7gtovescq4Zt6FR0tgXiHQ=="
-		},
-		"@react-navigation/core": {
-			"version": "5.12.0",
-			"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.12.0.tgz",
-			"integrity": "sha512-CTmYrFXCZwInN40CpEzkPxhrpzujj20qvsUgpH05+oO1flwsnaJsyBfYawIcTS62/1/Z6SAM7iW5PbKk+qw9iQ==",
-			"requires": {
-				"@react-navigation/routers": "^5.4.9",
-				"escape-string-regexp": "^4.0.0",
-				"nanoid": "^3.1.9",
-				"query-string": "^6.13.1",
-				"react-is": "^16.13.0",
-				"use-subscription": "^1.4.0"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-				}
-			}
-		},
-		"@react-navigation/elements": {
-			"version": "1.3.18",
-			"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.18.tgz",
-			"integrity": "sha512-/0hwnJkrr415yP0Hf4PjUKgGyfshrvNUKFXN85Mrt1gY49hy9IwxZgrrxlh0THXkPeq8q4VWw44eHDfAcQf20Q=="
-		},
-		"@react-navigation/native": {
-			"version": "6.0.14",
-			"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.14.tgz",
-			"integrity": "sha512-Z95bJrRkZerBJq6Qc/xjA/kibPpB+UvPeMWS1CBhRF8FaX1483UdHqPqSbW879tPwjP2R4XfoA4dtoEHswrOjA==",
-			"requires": {
-				"@react-navigation/core": "^6.4.1",
-				"escape-string-regexp": "^4.0.0",
-				"fast-deep-equal": "^3.1.3",
-				"nanoid": "^3.1.23"
-			},
-			"dependencies": {
-				"@react-navigation/core": {
-					"version": "6.4.9",
-					"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.9.tgz",
-					"integrity": "sha512-G9GH7bP9x0qqupxZnkSftnkn4JoXancElTvFc8FVGfEvxnxP+gBo3wqcknyBi7M5Vad4qecsYjCOa9wqsftv9g==",
-					"requires": {
-						"@react-navigation/routers": "^6.1.9",
-						"escape-string-regexp": "^4.0.0",
-						"nanoid": "^3.1.23",
-						"query-string": "^7.1.3",
-						"react-is": "^16.13.0",
-						"use-latest-callback": "^0.1.5"
-					}
-				},
-				"@react-navigation/routers": {
-					"version": "6.1.9",
-					"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.9.tgz",
-					"integrity": "sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA==",
-					"requires": {
-						"nanoid": "^3.1.23"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-				},
-				"query-string": {
-					"version": "7.1.3",
-					"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz",
-					"integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==",
-					"requires": {
-						"decode-uri-component": "^0.2.2",
-						"filter-obj": "^1.1.0",
-						"split-on-first": "^1.0.0",
-						"strict-uri-encode": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@react-navigation/routers": {
-			"version": "5.4.9",
-			"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.4.9.tgz",
-			"integrity": "sha512-dYD5qrIKUmuBEp+O98hB0tDYpEsGQgCQFQgMEoFKBmVVhx2JnJJ1zxRjU7xWcCU4VdBA8IOowgHQHJsVNKYyrg==",
-			"requires": {
-				"nanoid": "^3.1.9"
-			}
-		},
-		"@react-navigation/stack": {
-			"version": "6.3.5",
-			"resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.3.5.tgz",
-			"integrity": "sha512-G706Ow+8fhiLT5Cf48566YsjboU5h5ll9nva90xX3br7V6x0JMoGMvXjvbORZyzLuUytQO3mf0T3nVUuO52vZQ==",
-			"requires": {
-				"@react-navigation/elements": "^1.3.7",
-				"color": "^4.2.3",
-				"warn-once": "^0.1.0"
-			}
-		},
-		"@react-spring/animated": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.5.5.tgz",
-			"integrity": "sha512-glzViz7syQ3CE6BQOwAyr75cgh0qsihm5lkaf24I0DfU63cMm/3+br299UEYkuaHNmfDfM414uktiPlZCNJbQA==",
-			"requires": {
-				"@react-spring/shared": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
-			}
-		},
-		"@react-spring/core": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.5.5.tgz",
-			"integrity": "sha512-shaJYb3iX18Au6gkk8ahaF0qx0LpS0Yd+ajb4asBaAQf6WPGuEdJsbsNSgei1/O13JyEATsJl20lkjeslJPMYA==",
-			"requires": {
-				"@react-spring/animated": "~9.5.5",
-				"@react-spring/rafz": "~9.5.5",
-				"@react-spring/shared": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
-			}
-		},
-		"@react-spring/rafz": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.5.5.tgz",
-			"integrity": "sha512-F/CLwB0d10jL6My5vgzRQxCNY2RNyDJZedRBK7FsngdCmzoq3V4OqqNc/9voJb9qRC2wd55oGXUeXv2eIaFmsw=="
-		},
-		"@react-spring/shared": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.5.5.tgz",
-			"integrity": "sha512-YwW70Pa/YXPOwTutExHZmMQSHcNC90kJOnNR4G4mCDNV99hE98jWkIPDOsgqbYx3amIglcFPiYKMaQuGdr8dyQ==",
-			"requires": {
-				"@react-spring/rafz": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
-			}
-		},
-		"@react-spring/types": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.5.5.tgz",
-			"integrity": "sha512-7I/qY8H7Enwasxr4jU6WmtNK+RZ4Z/XvSlDvjXFVe7ii1x0MoSlkw6pD7xuac8qrHQRm9BTcbZNyeeKApYsvCg=="
-		},
-		"@react-spring/web": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.5.5.tgz",
-			"integrity": "sha512-+moT8aDX/ho/XAhU+HRY9m0LVV9y9CK6NjSRaI+30Re150pB3iEip6QfnF4qnhSCQ5drpMF0XRXHgOTY/xbtFw==",
-			"requires": {
-				"@react-spring/animated": "~9.5.5",
-				"@react-spring/core": "~9.5.5",
-				"@react-spring/shared": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
-			}
-		},
-		"@samverschueren/stream-to-observable": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
-			"integrity": "sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==",
-			"dev": true,
-			"requires": {
-				"any-observable": "^0.3.0"
-			}
-		},
-		"@sentry/core": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.19.7.tgz",
-			"integrity": "sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==",
-			"dev": true,
-			"requires": {
-				"@sentry/hub": "6.19.7",
-				"@sentry/minimal": "6.19.7",
-				"@sentry/types": "6.19.7",
-				"@sentry/utils": "6.19.7",
-				"tslib": "^1.9.3"
-			},
-			"dependencies": {
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
-			}
-		},
-		"@sentry/hub": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.19.7.tgz",
-			"integrity": "sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA==",
-			"dev": true,
-			"requires": {
-				"@sentry/types": "6.19.7",
-				"@sentry/utils": "6.19.7",
-				"tslib": "^1.9.3"
-			},
-			"dependencies": {
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
-			}
-		},
-		"@sentry/minimal": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.19.7.tgz",
-			"integrity": "sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ==",
-			"dev": true,
-			"requires": {
-				"@sentry/hub": "6.19.7",
-				"@sentry/types": "6.19.7",
-				"tslib": "^1.9.3"
-			},
-			"dependencies": {
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
-			}
-		},
-		"@sentry/node": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.19.7.tgz",
-			"integrity": "sha512-gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg==",
-			"dev": true,
-			"requires": {
-				"@sentry/core": "6.19.7",
-				"@sentry/hub": "6.19.7",
-				"@sentry/types": "6.19.7",
-				"@sentry/utils": "6.19.7",
-				"cookie": "^0.4.1",
-				"https-proxy-agent": "^5.0.0",
-				"lru_map": "^0.3.3",
-				"tslib": "^1.9.3"
-			},
-			"dependencies": {
-				"cookie": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-					"integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-					"dev": true
-				},
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
-			}
-		},
-		"@sentry/types": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.19.7.tgz",
-			"integrity": "sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==",
-			"dev": true
-		},
-		"@sentry/utils": {
-			"version": "6.19.7",
-			"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.19.7.tgz",
-			"integrity": "sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA==",
-			"dev": true,
-			"requires": {
-				"@sentry/types": "6.19.7",
-				"tslib": "^1.9.3"
-			},
-			"dependencies": {
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
-			}
-		},
-		"@sideway/address": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
-			"integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
-			"requires": {
-				"@hapi/hoek": "^9.0.0"
-			}
-		},
-		"@sideway/formula": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
-			"integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
-		},
-		"@sideway/pinpoint": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
-			"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
-		},
-		"@sidvind/better-ajv-errors": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/@sidvind/better-ajv-errors/-/better-ajv-errors-2.1.0.tgz",
-			"integrity": "sha512-JuIb009FhHuL9priFBho2kv7QmZOydj0LgYvj+h1t0mMCmhM/YmQNRlJR5wVtBZya6wrVFK5Hi5TIbv5BKEx7w==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.16.0",
-				"chalk": "^4.1.0"
-			}
-		},
-		"@sigstore/bundle": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.0.0.tgz",
-			"integrity": "sha512-yLvrWDOh6uMOUlFCTJIZEnwOT9Xte7NPXUqVexEKGSF5XtBAuSg5du0kn3dRR0p47a4ah10Y0mNt8+uyeQXrBQ==",
-			"dev": true,
-			"requires": {
-				"@sigstore/protobuf-specs": "^0.2.0"
-			}
-		},
-		"@sigstore/protobuf-specs": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.0.tgz",
-			"integrity": "sha512-8ZhZKAVfXjIspDWwm3D3Kvj0ddbJ0HqDZ/pOs5cx88HpT8mVsotFrg7H1UMnXOuDHz6Zykwxn4mxG3QLuN+RUg==",
-			"dev": true
-		},
-		"@sigstore/tuf": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz",
-			"integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==",
-			"dev": true,
-			"requires": {
-				"@sigstore/protobuf-specs": "^0.2.0",
-				"tuf-js": "^1.1.7"
-			}
-		},
-		"@sinclair/typebox": {
-			"version": "0.27.8",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
-		},
-		"@sindresorhus/is": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-			"integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-			"dev": true
-		},
-		"@sinonjs/commons": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
-			"integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
-			"requires": {
-				"type-detect": "4.0.8"
-			}
-		},
-		"@sinonjs/fake-timers": {
-			"version": "10.3.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
-			"requires": {
-				"@sinonjs/commons": "^3.0.0"
-			}
-		},
-		"@sliphua/lilconfig-ts-loader": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/@sliphua/lilconfig-ts-loader/-/lilconfig-ts-loader-3.2.2.tgz",
-			"integrity": "sha512-nX2aBwAykiG50fSUzK9eyA5UvWcrEKzA0ZzCq9mLwHMwpKxM+U05YH8PHba1LJrbeZ7R1HSjJagWKMqFyq8cxw==",
-			"dev": true,
-			"requires": {
-				"lodash.get": "^4",
-				"make-error": "^1",
-				"ts-node": "^9",
-				"tslib": "^2"
-			}
-		},
-		"@storybook/addon-a11y": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-7.2.2.tgz",
-			"integrity": "sha512-gMGP5GdnTENdv5M1+1buk2n9md43jx6S8ZCsXlRagpVM57+jE9WyKtV6R+BPwfX2lBY45nhAj7Qmiy+OrUHarA==",
-			"dev": true,
-			"requires": {
-				"@storybook/addon-highlight": "7.2.2",
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"axe-core": "^4.2.0",
-				"lodash": "^4.17.21",
-				"react-resize-detector": "^7.1.2"
-			},
-			"dependencies": {
-				"@storybook/channels": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-					"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/core-events": "7.2.2",
-						"@storybook/global": "^5.0.0",
-						"qs": "^6.10.0",
-						"telejson": "^7.0.3",
-						"tiny-invariant": "^1.3.1"
-					}
-				},
-				"telejson": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-					"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-					"dev": true,
-					"requires": {
-						"memoizerific": "^1.11.3"
-					}
-				}
-			}
-		},
-		"@storybook/addon-actions": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-7.2.2.tgz",
-			"integrity": "sha512-Ev9oGlpxrt7tCpCmAYA04hsZYKnZIiksaQDCgKAf6I2+yUZBBkZh490yBPkMExpH5bLk7fAgjCMZP9gOyzaq3A==",
-			"dev": true,
-			"requires": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"dequal": "^2.0.2",
-				"lodash": "^4.17.21",
-				"polished": "^4.2.2",
-				"prop-types": "^15.7.2",
-				"react-inspector": "^6.0.0",
-				"telejson": "^7.0.3",
-				"ts-dedent": "^2.0.0",
-				"uuid": "^9.0.0"
-			},
-			"dependencies": {
-				"telejson": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-					"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-					"dev": true,
-					"requires": {
-						"memoizerific": "^1.11.3"
-					}
-				}
-			}
-		},
-		"@storybook/addon-controls": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-7.2.2.tgz",
-			"integrity": "sha512-kcFG7RMQJVz3fNvQO+9vjAodKbRrobsdr3WJYN6zmugh+qxEdUvHUUe093t0MpMKp2njY6c9eAbfjN+PrLSCJQ==",
-			"dev": true,
-			"requires": {
-				"@storybook/blocks": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"lodash": "^4.17.21",
-				"ts-dedent": "^2.0.0"
-			}
-		},
-		"@storybook/addon-docs": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-7.2.2.tgz",
-			"integrity": "sha512-rQZ/LAC1oAQityI/NNwntLellAT2yrT7vQAPhHBpaVi/AOdT87wTkCyxnFJj/y3XYDAs4XgUqgbIKSIcRni/eA==",
-			"dev": true,
-			"requires": {
-				"@jest/transform": "^29.3.1",
-				"@mdx-js/react": "^2.1.5",
-				"@storybook/blocks": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/csf-plugin": "7.2.2",
-				"@storybook/csf-tools": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/mdx2-csf": "^1.0.0",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/postinstall": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/react-dom-shim": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"fs-extra": "^11.1.0",
-				"remark-external-links": "^8.0.0",
-				"remark-slug": "^6.0.0",
-				"ts-dedent": "^2.0.0"
-			},
-			"dependencies": {
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/addon-highlight": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-7.2.2.tgz",
-			"integrity": "sha512-jyuxPPTg3q021GYBzA+JoBO2ece6B4gt4ZqtWjKbOpTHpUyzkH6IBcBuWGtgGcQgrCGlmb5B8QCLAb8Cmy6VJg==",
-			"dev": true,
-			"requires": {
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/preview-api": "7.2.2"
-			}
-		},
-		"@storybook/addon-toolbars": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-7.2.2.tgz",
-			"integrity": "sha512-KQkFwLEqi/Xm9wq6mqaqO6VEW7+Sgbr8BUtVRAB9sSpy2mlhZEzZpcWKjuHmyMb9/eiRvnicM9kXxz0tHAF0jA==",
-			"dev": true,
-			"requires": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2"
-			}
-		},
-		"@storybook/addon-viewport": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-7.2.2.tgz",
-			"integrity": "sha512-6qjtkFSV+9Fxw/nS5X7b5xC1kbk+CMGUEZhzmqM+iYtijHZmK0K1+x6AoR/mOul/rLL2YT73U3OYCCKWV9lemQ==",
-			"dev": true,
-			"requires": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"memoizerific": "^1.11.3",
-				"prop-types": "^15.7.2"
-			}
-		},
-		"@storybook/blocks": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-7.2.2.tgz",
-			"integrity": "sha512-VgO46E5zA8oo/Cn8kT9o3xiFtnqxlqsRRGp5t8A1YqgN2OvYTtg5/PLS16XH8Qui/m9EvOoT7DlOmcqlp3Z78w==",
-			"dev": true,
-			"requires": {
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/docs-tools": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/lodash": "^4.14.167",
-				"color-convert": "^2.0.1",
-				"dequal": "^2.0.2",
-				"lodash": "^4.17.21",
-				"markdown-to-jsx": "^7.1.8",
-				"memoizerific": "^1.11.3",
-				"polished": "^4.2.2",
-				"react-colorful": "^5.1.2",
-				"telejson": "^7.0.3",
-				"tocbot": "^4.20.1",
-				"ts-dedent": "^2.0.0",
-				"util-deprecate": "^1.0.2"
-			},
-			"dependencies": {
-				"@storybook/channels": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-					"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/core-events": "7.2.2",
-						"@storybook/global": "^5.0.0",
-						"qs": "^6.10.0",
-						"telejson": "^7.0.3",
-						"tiny-invariant": "^1.3.1"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"telejson": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-					"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-					"dev": true,
-					"requires": {
-						"memoizerific": "^1.11.3"
-					}
-				}
-			}
-		},
-		"@storybook/builder-manager": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/builder-manager/-/builder-manager-7.2.2.tgz",
-			"integrity": "sha512-19LqtL5/Yos9/wXqTxg+zOOK6M312eHXAdaYt2REGk1iqJzQXoy4wnmE2rbjBMmD5bUTzWm2vkmHGtkzAjwzzA==",
-			"dev": true,
-			"requires": {
-				"@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/manager": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@types/ejs": "^3.1.1",
-				"@types/find-cache-dir": "^3.2.1",
-				"@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10",
-				"browser-assert": "^1.2.1",
-				"ejs": "^3.1.8",
-				"esbuild": "^0.18.0",
-				"esbuild-plugin-alias": "^0.2.1",
-				"express": "^4.17.3",
-				"find-cache-dir": "^3.0.0",
-				"fs-extra": "^11.1.0",
-				"process": "^0.11.10",
-				"util": "^0.12.4"
-			},
-			"dependencies": {
-				"find-cache-dir": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-					"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-					"dev": true,
-					"requires": {
-						"commondir": "^1.0.1",
-						"make-dir": "^3.0.2",
-						"pkg-dir": "^4.1.0"
-					},
-					"dependencies": {
-						"find-up": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-							"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-							"dev": true,
-							"requires": {
-								"locate-path": "^5.0.0",
-								"path-exists": "^4.0.0"
-							}
-						},
-						"locate-path": {
-							"version": "5.0.0",
-							"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-							"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-							"dev": true,
-							"requires": {
-								"p-locate": "^4.1.0"
-							}
-						},
-						"p-limit": {
-							"version": "2.3.0",
-							"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-							"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-							"dev": true,
-							"requires": {
-								"p-try": "^2.0.0"
-							}
-						},
-						"p-locate": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-							"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-							"dev": true,
-							"requires": {
-								"p-limit": "^2.2.0"
-							}
-						},
-						"pkg-dir": {
-							"version": "4.2.0",
-							"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-							"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-							"dev": true,
-							"requires": {
-								"find-up": "^4.0.0"
-							}
-						}
-					}
-				},
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"make-dir": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-					"dev": true,
-					"requires": {
-						"semver": "^6.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				},
-				"util": {
-					"version": "0.12.5",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-					"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"is-arguments": "^1.0.4",
-						"is-generator-function": "^1.0.7",
-						"is-typed-array": "^1.1.3",
-						"which-typed-array": "^1.1.2"
-					}
-				}
-			}
-		},
-		"@storybook/builder-webpack5": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-7.2.2.tgz",
-			"integrity": "sha512-+f2H3tXPZfn3q/eruXCmWPVAopd1MMEAAvneZ4iqlSHPC5HK2dcX/zj3yPar6rjfHHvZBXNm5sSi4WuD5Pw9MA==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.22.9",
-				"@storybook/addons": "7.2.2",
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-api": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/components": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/core-webpack": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager-api": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/preview": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/router": "7.2.2",
-				"@storybook/store": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@swc/core": "^1.3.49",
-				"@types/node": "^16.0.0",
-				"@types/semver": "^7.3.4",
-				"babel-loader": "^9.0.0",
-				"babel-plugin-named-exports-order": "^0.0.2",
-				"browser-assert": "^1.2.1",
-				"case-sensitive-paths-webpack-plugin": "^2.4.0",
-				"constants-browserify": "^1.0.0",
-				"css-loader": "^6.7.1",
-				"express": "^4.17.3",
-				"fork-ts-checker-webpack-plugin": "^8.0.0",
-				"fs-extra": "^11.1.0",
-				"html-webpack-plugin": "^5.5.0",
-				"path-browserify": "^1.0.1",
-				"process": "^0.11.10",
-				"semver": "^7.3.7",
-				"style-loader": "^3.3.1",
-				"swc-loader": "^0.2.3",
-				"terser-webpack-plugin": "^5.3.1",
-				"ts-dedent": "^2.0.0",
-				"url": "^0.11.0",
-				"util": "^0.12.4",
-				"util-deprecate": "^1.0.2",
-				"webpack": "5",
-				"webpack-dev-middleware": "^6.1.1",
-				"webpack-hot-middleware": "^2.25.1",
-				"webpack-virtual-modules": "^0.5.0"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"dev": true,
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					},
-					"dependencies": {
-						"semver": {
-							"version": "6.3.1",
-							"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-							"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-							"dev": true
-						}
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"@storybook/addons": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-7.2.2.tgz",
-					"integrity": "sha512-yWBBpBcRyPP1deAjzWV9OAXrPfeRd/vRpJw09dWHzuD3xtnd3jZ2h+t1r9a5yTSQbP5GO1YdS/WOK5Uf9hcsuw==",
-					"dev": true,
-					"requires": {
-						"@storybook/manager-api": "7.2.2",
-						"@storybook/preview-api": "7.2.2",
-						"@storybook/types": "7.2.2"
-					}
-				},
-				"@storybook/channels": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-					"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/core-events": "7.2.2",
-						"@storybook/global": "^5.0.0",
-						"qs": "^6.10.0",
-						"telejson": "^7.0.3",
-						"tiny-invariant": "^1.3.1"
-					}
-				},
-				"@storybook/client-api": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-7.2.2.tgz",
-					"integrity": "sha512-47WDNZ5FdvtQuSijg3IexxFve2aBrBih6VHdKKcel2SSiS0W01043fNMsP1T+m6kJr4jdnp0J5GVQpTQFi8Kxg==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/preview-api": "7.2.2"
-					}
-				},
-				"@storybook/router": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/router/-/router-7.2.2.tgz",
-					"integrity": "sha512-cnJg43dm3dVifKkRBUsQ4wXC4sJOm46JAS95yRPeGACoHpJTcbCWk1n5GLYA7ozO+KFQSNdxHxPIjNqvnzMFiA==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"memoizerific": "^1.11.3",
-						"qs": "^6.10.0"
-					}
-				},
-				"@storybook/store": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/store/-/store-7.2.2.tgz",
-					"integrity": "sha512-4Z0iFdD6u9u9rDvr0ekLXOx1tIcmS1OU3xhk92RFWbGpAx4+bb1JDWmO7T04l+uPvLvYpWn5NrSV1ZdgyTVxUg==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/preview-api": "7.2.2"
-					}
-				},
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"babel-loader": {
-					"version": "9.1.3",
-					"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
-					"integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
-					"dev": true,
-					"requires": {
-						"find-cache-dir": "^4.0.0",
-						"schema-utils": "^4.0.0"
-					},
-					"dependencies": {
-						"find-cache-dir": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
-							"integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
-							"dev": true,
-							"requires": {
-								"common-path-prefix": "^3.0.0",
-								"pkg-dir": "^7.0.0"
-							}
-						},
-						"find-up": {
-							"version": "6.3.0",
-							"resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
-							"integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
-							"dev": true,
-							"requires": {
-								"locate-path": "^7.1.0",
-								"path-exists": "^5.0.0"
-							}
-						},
-						"locate-path": {
-							"version": "7.2.0",
-							"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
-							"integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
-							"dev": true,
-							"requires": {
-								"p-locate": "^6.0.0"
-							}
-						},
-						"p-limit": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-							"integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-							"dev": true,
-							"requires": {
-								"yocto-queue": "^1.0.0"
-							}
-						},
-						"p-locate": {
-							"version": "6.0.0",
-							"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
-							"integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
-							"dev": true,
-							"requires": {
-								"p-limit": "^4.0.0"
-							}
-						},
-						"path-exists": {
-							"version": "5.0.0",
-							"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-							"integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
-							"dev": true
-						},
-						"pkg-dir": {
-							"version": "7.0.0",
-							"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
-							"integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
-							"dev": true,
-							"requires": {
-								"find-up": "^6.3.0"
-							}
-						}
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"colorette": {
-					"version": "2.0.20",
-					"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-					"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-					"dev": true
-				},
-				"css-loader": {
-					"version": "6.8.1",
-					"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-					"integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
-					"dev": true,
-					"requires": {
-						"icss-utils": "^5.1.0",
-						"postcss": "^8.4.21",
-						"postcss-modules-extract-imports": "^3.0.0",
-						"postcss-modules-local-by-default": "^4.0.3",
-						"postcss-modules-scope": "^3.0.0",
-						"postcss-modules-values": "^4.0.0",
-						"postcss-value-parser": "^4.2.0",
-						"semver": "^7.3.8"
-					}
-				},
-				"fork-ts-checker-webpack-plugin": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-8.0.0.tgz",
-					"integrity": "sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.16.7",
-						"chalk": "^4.1.2",
-						"chokidar": "^3.5.3",
-						"cosmiconfig": "^7.0.1",
-						"deepmerge": "^4.2.2",
-						"fs-extra": "^10.0.0",
-						"memfs": "^3.4.1",
-						"minimatch": "^3.0.4",
-						"node-abort-controller": "^3.0.1",
-						"schema-utils": "^3.1.1",
-						"semver": "^7.3.5",
-						"tapable": "^2.2.1"
-					},
-					"dependencies": {
-						"ajv": {
-							"version": "6.12.6",
-							"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-							"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-							"dev": true,
-							"requires": {
-								"fast-deep-equal": "^3.1.1",
-								"fast-json-stable-stringify": "^2.0.0",
-								"json-schema-traverse": "^0.4.1",
-								"uri-js": "^4.2.2"
-							}
-						},
-						"fs-extra": {
-							"version": "10.1.0",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-							"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.2.0",
-								"jsonfile": "^6.0.1",
-								"universalify": "^2.0.0"
-							}
-						},
-						"json-schema-traverse": {
-							"version": "0.4.1",
-							"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-							"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-							"dev": true
-						},
-						"schema-utils": {
-							"version": "3.3.0",
-							"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-							"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-							"dev": true,
-							"requires": {
-								"@types/json-schema": "^7.0.8",
-								"ajv": "^6.12.5",
-								"ajv-keywords": "^3.5.2"
-							}
-						}
-					}
-				},
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"path-browserify": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-					"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "8.4.27",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
-					"integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
-					"dev": true,
-					"requires": {
-						"nanoid": "^3.3.6",
-						"picocolors": "^1.0.0",
-						"source-map-js": "^1.0.2"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-					"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.9.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.1.0"
-					},
-					"dependencies": {
-						"ajv-keywords": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-							"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-							"dev": true,
-							"requires": {
-								"fast-deep-equal": "^3.1.3"
-							}
-						}
-					}
-				},
-				"source-map-js": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-					"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-					"dev": true
-				},
-				"style-loader": {
-					"version": "3.3.3",
-					"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
-					"integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"tapable": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-					"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-					"dev": true
-				},
-				"telejson": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-					"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-					"dev": true,
-					"requires": {
-						"memoizerific": "^1.11.3"
-					}
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				},
-				"util": {
-					"version": "0.12.5",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-					"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"is-arguments": "^1.0.4",
-						"is-generator-function": "^1.0.7",
-						"is-typed-array": "^1.1.3",
-						"which-typed-array": "^1.1.2"
-					}
-				},
-				"webpack-dev-middleware": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz",
-					"integrity": "sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==",
-					"dev": true,
-					"requires": {
-						"colorette": "^2.0.10",
-						"memfs": "^3.4.12",
-						"mime-types": "^2.1.31",
-						"range-parser": "^1.2.1",
-						"schema-utils": "^4.0.0"
-					}
-				},
-				"webpack-virtual-modules": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
-					"integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
-					"dev": true
-				},
-				"yocto-queue": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-					"integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/cli": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/cli/-/cli-7.2.2.tgz",
-			"integrity": "sha512-YoXRCRICj4NEqUvYvgVRmk5IJadou6feCymI5r94z7XHQiObMoZd3p6QjyEp8ayi8XpxoJM/Hrddu3hddxUvyw==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.22.9",
-				"@babel/preset-env": "^7.22.9",
-				"@babel/types": "^7.22.5",
-				"@ndelangen/get-tarball": "^3.0.7",
-				"@storybook/codemod": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/core-server": "7.2.2",
-				"@storybook/csf-tools": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/telemetry": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/semver": "^7.3.4",
-				"@yarnpkg/fslib": "2.10.3",
-				"@yarnpkg/libzip": "2.3.0",
-				"chalk": "^4.1.0",
-				"commander": "^6.2.1",
-				"cross-spawn": "^7.0.3",
-				"detect-indent": "^6.1.0",
-				"envinfo": "^7.7.3",
-				"execa": "^5.0.0",
-				"express": "^4.17.3",
-				"find-up": "^5.0.0",
-				"fs-extra": "^11.1.0",
-				"get-npm-tarball-url": "^2.0.3",
-				"get-port": "^5.1.1",
-				"giget": "^1.0.0",
-				"globby": "^11.0.2",
-				"jscodeshift": "^0.14.0",
-				"leven": "^3.1.0",
-				"ora": "^5.4.1",
-				"prettier": "^2.8.0",
-				"prompts": "^2.4.0",
-				"puppeteer-core": "^2.1.1",
-				"read-pkg-up": "^7.0.1",
-				"semver": "^7.3.7",
-				"simple-update-notifier": "^2.0.0",
-				"strip-json-comments": "^3.0.1",
-				"tempy": "^1.0.1",
-				"ts-dedent": "^2.0.0",
-				"util-deprecate": "^1.0.2"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"dev": true,
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					},
-					"dependencies": {
-						"semver": {
-							"version": "6.3.1",
-							"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-							"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-							"dev": true
-						}
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"agent-base": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
-					"integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
-					"dev": true
-				},
-				"ast-types": {
-					"version": "0.15.2",
-					"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz",
-					"integrity": "sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==",
-					"dev": true,
-					"requires": {
-						"tslib": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"commander": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-					"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"detect-indent": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
-					"integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
-					"dev": true
-				},
-				"execa": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"https-proxy-agent": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
-					"integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
-					"dev": true,
-					"requires": {
-						"agent-base": "5",
-						"debug": "4"
-					}
-				},
-				"human-signals": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-					"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"jscodeshift": {
-					"version": "0.14.0",
-					"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
-					"integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
-					"dev": true,
-					"requires": {
-						"@babel/core": "^7.13.16",
-						"@babel/parser": "^7.13.16",
-						"@babel/plugin-proposal-class-properties": "^7.13.0",
-						"@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-						"@babel/plugin-proposal-optional-chaining": "^7.13.12",
-						"@babel/plugin-transform-modules-commonjs": "^7.13.8",
-						"@babel/preset-flow": "^7.13.13",
-						"@babel/preset-typescript": "^7.13.0",
-						"@babel/register": "^7.13.16",
-						"babel-core": "^7.0.0-bridge.0",
-						"chalk": "^4.1.2",
-						"flow-parser": "0.*",
-						"graceful-fs": "^4.2.4",
-						"micromatch": "^4.0.4",
-						"neo-async": "^2.5.0",
-						"node-dir": "^0.1.17",
-						"recast": "^0.21.0",
-						"temp": "^0.8.4",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"mime": {
-					"version": "2.6.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-					"integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"ora": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-					"integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-					"dev": true,
-					"requires": {
-						"bl": "^4.1.0",
-						"chalk": "^4.1.0",
-						"cli-cursor": "^3.1.0",
-						"cli-spinners": "^2.5.0",
-						"is-interactive": "^1.0.0",
-						"is-unicode-supported": "^0.1.0",
-						"log-symbols": "^4.1.0",
-						"strip-ansi": "^6.0.0",
-						"wcwidth": "^1.0.1"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"prettier": {
-					"version": "2.8.8",
-					"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-					"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-					"dev": true
-				},
-				"puppeteer-core": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-2.1.1.tgz",
-					"integrity": "sha512-n13AWriBMPYxnpbb6bnaY5YoY6rGj8vPLrz6CZF3o0qJNEwlcfJVxBzYZ0NJsQ21UbdJoijPCDrM++SUVEz7+w==",
-					"dev": true,
-					"requires": {
-						"@types/mime-types": "^2.1.0",
-						"debug": "^4.1.0",
-						"extract-zip": "^1.6.6",
-						"https-proxy-agent": "^4.0.0",
-						"mime": "^2.0.3",
-						"mime-types": "^2.1.25",
-						"progress": "^2.0.1",
-						"proxy-from-env": "^1.0.0",
-						"rimraf": "^2.6.1",
-						"ws": "^6.1.0"
-					}
-				},
-				"recast": {
-					"version": "0.21.5",
-					"resolved": "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz",
-					"integrity": "sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==",
-					"dev": true,
-					"requires": {
-						"ast-types": "0.15.2",
-						"esprima": "~4.0.0",
-						"source-map": "~0.6.1",
-						"tslib": "^2.0.1"
-					}
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"dev": true,
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"rimraf": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "7.2.3",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-							"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-							"dev": true,
-							"requires": {
-								"fs.realpath": "^1.0.0",
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "^3.1.1",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						}
-					}
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"strip-json-comments": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-					"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"temp": {
-					"version": "0.8.4",
-					"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
-					"integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
-					"dev": true,
-					"requires": {
-						"rimraf": "~2.6.2"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "7.2.3",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-							"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-							"dev": true,
-							"requires": {
-								"fs.realpath": "^1.0.0",
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "^3.1.1",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						},
-						"rimraf": {
-							"version": "2.6.3",
-							"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-							"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-							"dev": true,
-							"requires": {
-								"glob": "^7.1.3"
-							}
-						}
-					}
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				},
-				"ws": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-					"integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0"
-					}
-				}
-			}
-		},
-		"@storybook/client-logger": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-7.2.2.tgz",
-			"integrity": "sha512-ULqPNTJsJdlWTQt5V/hEv4CUq7GgrLzLvcjhKB9IYbp4a0gjhinfq7jBFIcXRE8BSOQLui2PDGE3SzElzOp5/g==",
-			"dev": true,
-			"requires": {
-				"@storybook/global": "^5.0.0"
-			}
-		},
-		"@storybook/codemod": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-7.2.2.tgz",
-			"integrity": "sha512-i8WY3PJeJalVWTjLChlJREYHp42mGw0GXLqTH/q0hbAwzuVBBTrsMqy+oXOWRCAeCGbK5uP10GOLN23s+zuNTQ==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.22.9",
-				"@babel/preset-env": "^7.22.9",
-				"@babel/types": "^7.22.5",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/csf-tools": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/cross-spawn": "^6.0.2",
-				"cross-spawn": "^7.0.3",
-				"globby": "^11.0.2",
-				"jscodeshift": "^0.14.0",
-				"lodash": "^4.17.21",
-				"prettier": "^2.8.0",
-				"recast": "^0.23.1"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"dev": true,
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"assert": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-					"integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
-					"dev": true,
-					"requires": {
-						"es6-object-assign": "^1.1.0",
-						"is-nan": "^1.2.1",
-						"object-is": "^1.0.1",
-						"util": "^0.12.0"
-					}
-				},
-				"ast-types": {
-					"version": "0.16.1",
-					"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz",
-					"integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
-					"dev": true,
-					"requires": {
-						"tslib": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"jscodeshift": {
-					"version": "0.14.0",
-					"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
-					"integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
-					"dev": true,
-					"requires": {
-						"@babel/core": "^7.13.16",
-						"@babel/parser": "^7.13.16",
-						"@babel/plugin-proposal-class-properties": "^7.13.0",
-						"@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-						"@babel/plugin-proposal-optional-chaining": "^7.13.12",
-						"@babel/plugin-transform-modules-commonjs": "^7.13.8",
-						"@babel/preset-flow": "^7.13.13",
-						"@babel/preset-typescript": "^7.13.0",
-						"@babel/register": "^7.13.16",
-						"babel-core": "^7.0.0-bridge.0",
-						"chalk": "^4.1.2",
-						"flow-parser": "0.*",
-						"graceful-fs": "^4.2.4",
-						"micromatch": "^4.0.4",
-						"neo-async": "^2.5.0",
-						"node-dir": "^0.1.17",
-						"recast": "^0.21.0",
-						"temp": "^0.8.4",
-						"write-file-atomic": "^2.3.0"
-					},
-					"dependencies": {
-						"ast-types": {
-							"version": "0.15.2",
-							"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz",
-							"integrity": "sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==",
-							"dev": true,
-							"requires": {
-								"tslib": "^2.0.1"
-							}
-						},
-						"recast": {
-							"version": "0.21.5",
-							"resolved": "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz",
-							"integrity": "sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==",
-							"dev": true,
-							"requires": {
-								"ast-types": "0.15.2",
-								"esprima": "~4.0.0",
-								"source-map": "~0.6.1",
-								"tslib": "^2.0.1"
-							}
-						}
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"prettier": {
-					"version": "2.8.8",
-					"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-					"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-					"dev": true
-				},
-				"recast": {
-					"version": "0.23.3",
-					"resolved": "https://registry.npmjs.org/recast/-/recast-0.23.3.tgz",
-					"integrity": "sha512-HbCVFh2ANP6a09nzD4lx7XthsxMOJWKX5pIcUwtLrmeEIl3I0DwjCoVXDE0Aobk+7k/mS3H50FK4iuYArpcT6Q==",
-					"dev": true,
-					"requires": {
-						"assert": "^2.0.0",
-						"ast-types": "^0.16.1",
-						"esprima": "~4.0.0",
-						"source-map": "~0.6.1",
-						"tslib": "^2.0.1"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"temp": {
-					"version": "0.8.4",
-					"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
-					"integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
-					"dev": true,
-					"requires": {
-						"rimraf": "~2.6.2"
-					}
-				},
-				"util": {
-					"version": "0.12.5",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-					"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"is-arguments": "^1.0.4",
-						"is-generator-function": "^1.0.7",
-						"is-typed-array": "^1.1.3",
-						"which-typed-array": "^1.1.2"
-					}
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@storybook/components": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/components/-/components-7.2.2.tgz",
-			"integrity": "sha512-A2SavROGKFK76w4pfMGr0Zf3A2QaQrnJqPZOfVB6dKrXBwgwM3VhdUj6N8cI9X4W7VaEvEyUWXVTCv+bG+yZtQ==",
-			"dev": true,
-			"requires": {
-				"@radix-ui/react-select": "^1.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/global": "^5.0.0",
-				"@storybook/icons": "^1.1.0",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"memoizerific": "^1.11.3",
-				"use-resize-observer": "^9.1.0",
-				"util-deprecate": "^1.0.2"
-			}
-		},
-		"@storybook/core-common": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-7.2.2.tgz",
-			"integrity": "sha512-evLV0oRLhByHVhrncRXdSmQL5VP8jLXUOBPiM63oCnSWDsw4GMt37JrmCYBNM4E1YiJ7zSllmvcFCBmyChcPFA==",
-			"dev": true,
-			"requires": {
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/find-cache-dir": "^3.2.1",
-				"@types/node": "^16.0.0",
-				"@types/node-fetch": "^2.6.4",
-				"@types/pretty-hrtime": "^1.0.0",
-				"chalk": "^4.1.0",
-				"esbuild": "^0.18.0",
-				"esbuild-register": "^3.4.0",
-				"file-system-cache": "2.3.0",
-				"find-cache-dir": "^3.0.0",
-				"find-up": "^5.0.0",
-				"fs-extra": "^11.1.0",
-				"glob": "^10.0.0",
-				"handlebars": "^4.7.7",
-				"lazy-universal-dotenv": "^4.0.0",
-				"node-fetch": "^2.0.0",
-				"picomatch": "^2.3.0",
-				"pkg-dir": "^5.0.0",
-				"pretty-hrtime": "^1.0.3",
-				"resolve-from": "^5.0.0",
-				"ts-dedent": "^2.0.0"
-			},
-			"dependencies": {
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"find-cache-dir": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-					"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-					"dev": true,
-					"requires": {
-						"commondir": "^1.0.1",
-						"make-dir": "^3.0.2",
-						"pkg-dir": "^4.1.0"
-					},
-					"dependencies": {
-						"find-up": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-							"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-							"dev": true,
-							"requires": {
-								"locate-path": "^5.0.0",
-								"path-exists": "^4.0.0"
-							}
-						},
-						"locate-path": {
-							"version": "5.0.0",
-							"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-							"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-							"dev": true,
-							"requires": {
-								"p-locate": "^4.1.0"
-							}
-						},
-						"p-limit": {
-							"version": "2.3.0",
-							"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-							"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-							"dev": true,
-							"requires": {
-								"p-try": "^2.0.0"
-							}
-						},
-						"p-locate": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-							"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-							"dev": true,
-							"requires": {
-								"p-limit": "^2.2.0"
-							}
-						},
-						"pkg-dir": {
-							"version": "4.2.0",
-							"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-							"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-							"dev": true,
-							"requires": {
-								"find-up": "^4.0.0"
-							}
-						}
-					}
-				},
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"foreground-child": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-					"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"signal-exit": "^4.0.1"
-					}
-				},
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"glob": {
-					"version": "10.3.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-					"integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
-					"dev": true,
-					"requires": {
-						"foreground-child": "^3.1.0",
-						"jackspeak": "^2.0.3",
-						"minimatch": "^9.0.1",
-						"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-						"path-scurry": "^1.10.1"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"make-dir": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-					"dev": true,
-					"requires": {
-						"semver": "^6.0.0"
-					}
-				},
-				"minimatch": {
-					"version": "9.0.3",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-					"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				},
-				"minipass": {
-					"version": "7.0.2",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.2.tgz",
-					"integrity": "sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==",
-					"dev": true
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
-					"integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
-					"dev": true,
-					"requires": {
-						"find-up": "^5.0.0"
-					}
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"signal-exit": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-					"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-					"dev": true
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@storybook/core-events": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-7.2.2.tgz",
-			"integrity": "sha512-0MUsOygFSyYRIWHrVAA7Y7zBoehdILgK2AbnV42qescmPD48YyovkSRiGq0BwSWvuvMRq+094dp7sh2tkfSGHg==",
-			"dev": true
-		},
-		"@storybook/core-server": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-7.2.2.tgz",
-			"integrity": "sha512-djtZIe/dFvjppuUMuTSHq51NW4dgkKAercfHwyyzcvN3m+ZBZdUENCUzBfwsS0+Pn64lVgppg6otm8ckMFilMQ==",
-			"dev": true,
-			"requires": {
-				"@aw-web-design/x-default-browser": "1.4.126",
-				"@discoveryjs/json-ext": "^0.5.3",
-				"@storybook/builder-manager": "7.2.2",
-				"@storybook/channels": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/csf-tools": "7.2.2",
-				"@storybook/docs-mdx": "^0.1.0",
-				"@storybook/global": "^5.0.0",
-				"@storybook/manager": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/telemetry": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/detect-port": "^1.3.0",
-				"@types/node": "^16.0.0",
-				"@types/pretty-hrtime": "^1.0.0",
-				"@types/semver": "^7.3.4",
-				"better-opn": "^3.0.2",
-				"chalk": "^4.1.0",
-				"cli-table3": "^0.6.1",
-				"compression": "^1.7.4",
-				"detect-port": "^1.3.0",
-				"express": "^4.17.3",
-				"fs-extra": "^11.1.0",
-				"globby": "^11.0.2",
-				"ip": "^2.0.0",
-				"lodash": "^4.17.21",
-				"open": "^8.4.0",
-				"pretty-hrtime": "^1.0.3",
-				"prompts": "^2.4.0",
-				"read-pkg-up": "^7.0.1",
-				"semver": "^7.3.7",
-				"serve-favicon": "^2.5.0",
-				"telejson": "^7.0.3",
-				"tiny-invariant": "^1.3.1",
-				"ts-dedent": "^2.0.0",
-				"util": "^0.12.4",
-				"util-deprecate": "^1.0.2",
-				"watchpack": "^2.2.0",
-				"ws": "^8.2.3"
-			},
-			"dependencies": {
-				"@storybook/channels": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-					"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/core-events": "7.2.2",
-						"@storybook/global": "^5.0.0",
-						"qs": "^6.10.0",
-						"telejson": "^7.0.3",
-						"tiny-invariant": "^1.3.1"
-					}
-				},
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"ip": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-					"integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
-					"dev": true
-				},
-				"is-wsl": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-					"dev": true,
-					"requires": {
-						"is-docker": "^2.0.0"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"open": {
-					"version": "8.4.2",
-					"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-					"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-					"dev": true,
-					"requires": {
-						"define-lazy-prop": "^2.0.0",
-						"is-docker": "^2.1.1",
-						"is-wsl": "^2.2.0"
-					}
-				},
-				"telejson": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-					"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-					"dev": true,
-					"requires": {
-						"memoizerific": "^1.11.3"
-					}
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				},
-				"util": {
-					"version": "0.12.5",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-					"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"is-arguments": "^1.0.4",
-						"is-generator-function": "^1.0.7",
-						"is-typed-array": "^1.1.3",
-						"which-typed-array": "^1.1.2"
-					}
-				},
-				"watchpack": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-					"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-					"dev": true,
-					"requires": {
-						"glob-to-regexp": "^0.4.1",
-						"graceful-fs": "^4.1.2"
-					}
-				},
-				"ws": {
-					"version": "8.13.0",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-					"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/core-webpack": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-7.2.2.tgz",
-			"integrity": "sha512-KwdY+mFTWclIJM+qF25u0d4gQ/951uOZkgrsiRheKI5BKwD9omuF2OfLexWKnMEWz+UHzHKoN0QFlxcKs/rddw==",
-			"dev": true,
-			"requires": {
-				"@storybook/core-common": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/node": "^16.0.0",
-				"ts-dedent": "^2.0.0"
-			}
-		},
-		"@storybook/csf": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.1.tgz",
-			"integrity": "sha512-4hE3AlNVxR60Wc5KSC68ASYzUobjPqtSKyhV6G+ge0FIXU55N5nTY7dXGRZHQGDBPq+XqchMkIdlkHPRs8nTHg==",
-			"dev": true,
-			"requires": {
-				"type-fest": "^2.19.0"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-					"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/csf-plugin": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-7.2.2.tgz",
-			"integrity": "sha512-8iHeK0zfcCIXbcwQm89Bj6Ejqak/dXBwQUMFmgmKzJ4VdyzKdhLgRO3T3EYGsX4AvH0dnuAPONP5uVrGEF8iLw==",
-			"dev": true,
-			"requires": {
-				"@storybook/csf-tools": "7.2.2",
-				"unplugin": "^1.3.1"
-			}
-		},
-		"@storybook/csf-tools": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-7.2.2.tgz",
-			"integrity": "sha512-uO9AXtc64tpEpnoqHk5eYCUUL6nMwo1xHTXgIst9NKOdNSBL1/wvRgaT+rW+AzyXGsBjMwvDNjX/HIptqsoNgw==",
-			"dev": true,
-			"requires": {
-				"@babel/generator": "^7.22.9",
-				"@babel/parser": "^7.22.7",
-				"@babel/traverse": "^7.22.8",
-				"@babel/types": "^7.22.5",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/types": "7.2.2",
-				"fs-extra": "^11.1.0",
-				"recast": "^0.23.1",
-				"ts-dedent": "^2.0.0"
-			},
-			"dependencies": {
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"assert": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
-					"integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
-					"dev": true,
-					"requires": {
-						"es6-object-assign": "^1.1.0",
-						"is-nan": "^1.2.1",
-						"object-is": "^1.0.1",
-						"util": "^0.12.0"
-					}
-				},
-				"ast-types": {
-					"version": "0.16.1",
-					"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz",
-					"integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
-					"dev": true,
-					"requires": {
-						"tslib": "^2.0.1"
-					}
-				},
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-					"dev": true
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"recast": {
-					"version": "0.23.3",
-					"resolved": "https://registry.npmjs.org/recast/-/recast-0.23.3.tgz",
-					"integrity": "sha512-HbCVFh2ANP6a09nzD4lx7XthsxMOJWKX5pIcUwtLrmeEIl3I0DwjCoVXDE0Aobk+7k/mS3H50FK4iuYArpcT6Q==",
-					"dev": true,
-					"requires": {
-						"assert": "^2.0.0",
-						"ast-types": "^0.16.1",
-						"esprima": "~4.0.0",
-						"source-map": "~0.6.1",
-						"tslib": "^2.0.1"
-					}
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				},
-				"util": {
-					"version": "0.12.5",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-					"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"is-arguments": "^1.0.4",
-						"is-generator-function": "^1.0.7",
-						"is-typed-array": "^1.1.3",
-						"which-typed-array": "^1.1.2"
-					}
-				}
-			}
-		},
-		"@storybook/docs-mdx": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@storybook/docs-mdx/-/docs-mdx-0.1.0.tgz",
-			"integrity": "sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg==",
-			"dev": true
-		},
-		"@storybook/docs-tools": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-7.2.2.tgz",
-			"integrity": "sha512-57PiramTgJio0J8HyKQI8cjb/5pTFvKxWBji8UdM6WUe1EqLIwZbymUcOQZDQWr3H+6bdrm4pgYxj7XglcUa5A==",
-			"dev": true,
-			"requires": {
-				"@storybook/core-common": "7.2.2",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/doctrine": "^0.0.3",
-				"doctrine": "^3.0.0",
-				"lodash": "^4.17.21"
-			},
-			"dependencies": {
-				"doctrine": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-					"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-					"dev": true,
-					"requires": {
-						"esutils": "^2.0.2"
-					}
-				}
-			}
-		},
-		"@storybook/global": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@storybook/global/-/global-5.0.0.tgz",
-			"integrity": "sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==",
-			"dev": true
-		},
-		"@storybook/icons": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/@storybook/icons/-/icons-1.1.6.tgz",
-			"integrity": "sha512-co5gDCYPojRAc5lRMnWxbjrR1V37/rTmAo9Vok4a1hDpHZIwkGTWesdzvYivSQXYFxZTpxdM1b5K3W87brnahw==",
-			"dev": true
-		},
-		"@storybook/manager": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/manager/-/manager-7.2.2.tgz",
-			"integrity": "sha512-a7pGZMj5r5vk39IfB7Ca32DNkSTM6SEp+BZhqc4jMDHwSEsGKOZ+GZtWJipUlB1fEnHtdA3LH6IKTKbcpYP+Rg==",
-			"dev": true
-		},
-		"@storybook/manager-api": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-7.2.2.tgz",
-			"integrity": "sha512-7EI7TABGGB3VOTc4q7byC5dW/9A1xUJyR1gfCPU+7XiSNItnCz+seBJMSaf6Em/9wYxSAL6PQAGhrwTHGzgWAA==",
-			"dev": true,
-			"requires": {
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/global": "^5.0.0",
-				"@storybook/router": "7.2.2",
-				"@storybook/theming": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"dequal": "^2.0.2",
-				"lodash": "^4.17.21",
-				"memoizerific": "^1.11.3",
-				"semver": "^7.3.7",
-				"store2": "^2.14.2",
-				"telejson": "^7.0.3",
-				"ts-dedent": "^2.0.0"
-			},
-			"dependencies": {
-				"@storybook/channels": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-					"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/core-events": "7.2.2",
-						"@storybook/global": "^5.0.0",
-						"qs": "^6.10.0",
-						"telejson": "^7.0.3",
-						"tiny-invariant": "^1.3.1"
-					}
-				},
-				"@storybook/router": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/router/-/router-7.2.2.tgz",
-					"integrity": "sha512-cnJg43dm3dVifKkRBUsQ4wXC4sJOm46JAS95yRPeGACoHpJTcbCWk1n5GLYA7ozO+KFQSNdxHxPIjNqvnzMFiA==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"memoizerific": "^1.11.3",
-						"qs": "^6.10.0"
-					}
-				},
-				"telejson": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-					"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-					"dev": true,
-					"requires": {
-						"memoizerific": "^1.11.3"
-					}
-				}
-			}
-		},
-		"@storybook/mdx2-csf": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@storybook/mdx2-csf/-/mdx2-csf-1.1.0.tgz",
-			"integrity": "sha512-TXJJd5RAKakWx4BtpwvSNdgTDkKM6RkXU8GK34S/LhidQ5Pjz3wcnqb0TxEkfhK/ztbP8nKHqXFwLfa2CYkvQw==",
-			"dev": true
-		},
-		"@storybook/node-logger": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-7.2.2.tgz",
-			"integrity": "sha512-Pn6NJ349S+6tkzaFc1j3qOniDR9DyFPRfZsnAT85APKQaXyzNB3b1xwAhxnVjiCHIfp/a+SLOAdfXa+F8ALFQQ==",
-			"dev": true
-		},
-		"@storybook/postinstall": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/postinstall/-/postinstall-7.2.2.tgz",
-			"integrity": "sha512-tGFZAFu5QFnuzhmzGMpasETVpzD1CVskok4+Dns/3iBWb8fZsFWaC0ZKazO+vHBtWZYO4uvrUbFSDTX2yPhtTQ==",
-			"dev": true
-		},
-		"@storybook/preset-react-webpack": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-7.2.2.tgz",
-			"integrity": "sha512-com92dj2rAvGG5xrx35kXZDawQr0GwfNJD8xoyZwzd+XjaguBU/DJNdjYwmJLscHx0wg+Vt5oK+hS1ICq82Ujg==",
-			"dev": true,
-			"requires": {
-				"@babel/preset-flow": "^7.22.5",
-				"@babel/preset-react": "^7.22.5",
-				"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
-				"@storybook/core-webpack": "7.2.2",
-				"@storybook/docs-tools": "7.2.2",
-				"@storybook/node-logger": "7.2.2",
-				"@storybook/react": "7.2.2",
-				"@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0",
-				"@types/node": "^16.0.0",
-				"@types/semver": "^7.3.4",
-				"babel-plugin-add-react-displayname": "^0.0.5",
-				"babel-plugin-react-docgen": "^4.2.1",
-				"fs-extra": "^11.1.0",
-				"react-refresh": "^0.11.0",
-				"semver": "^7.3.7",
-				"webpack": "5"
-			},
-			"dependencies": {
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"react-refresh": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
-					"integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
-					"dev": true
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/preview": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-7.2.2.tgz",
-			"integrity": "sha512-F3S3yK+RmpriADWnfVZsRN36WRT6LaFjD0sNrUkX8duxdnxNDaLFfJ3Cbxwyv/2lZ48uByIQbX2LC5HieVI0KA==",
-			"dev": true
-		},
-		"@storybook/preview-api": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-7.2.2.tgz",
-			"integrity": "sha512-II0EioQCGS2zTSoHbXNKyI1rwk2X7MBi2/tJerj4w4Qwi2fDQlwM0LKsIWlRjXTxBpOAsOoTelh24wSBoZu4bg==",
-			"dev": true,
-			"requires": {
-				"@storybook/channels": "7.2.2",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-events": "7.2.2",
-				"@storybook/csf": "^0.1.0",
-				"@storybook/global": "^5.0.0",
-				"@storybook/types": "7.2.2",
-				"@types/qs": "^6.9.5",
-				"dequal": "^2.0.2",
-				"lodash": "^4.17.21",
-				"memoizerific": "^1.11.3",
-				"qs": "^6.10.0",
-				"synchronous-promise": "^2.0.15",
-				"ts-dedent": "^2.0.0",
-				"util-deprecate": "^1.0.2"
-			},
-			"dependencies": {
-				"@storybook/channels": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-					"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/core-events": "7.2.2",
-						"@storybook/global": "^5.0.0",
-						"qs": "^6.10.0",
-						"telejson": "^7.0.3",
-						"tiny-invariant": "^1.3.1"
-					}
-				},
-				"telejson": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-					"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-					"dev": true,
-					"requires": {
-						"memoizerific": "^1.11.3"
-					}
-				}
-			}
-		},
-		"@storybook/react": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/react/-/react-7.2.2.tgz",
-			"integrity": "sha512-41vOR9mCPGeO4YBVfej+X+Fge+igelqSFCJF/koZDdYxOVehsz3bK++TNrKo2utF69evhwSmIU1iEMEjesmbNg==",
-			"dev": true,
-			"requires": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-client": "7.2.2",
-				"@storybook/docs-tools": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"@storybook/preview-api": "7.2.2",
-				"@storybook/react-dom-shim": "7.2.2",
-				"@storybook/types": "7.2.2",
-				"@types/escodegen": "^0.0.6",
-				"@types/estree": "^0.0.51",
-				"@types/node": "^16.0.0",
-				"acorn": "^7.4.1",
-				"acorn-jsx": "^5.3.1",
-				"acorn-walk": "^7.2.0",
-				"escodegen": "^2.0.0",
-				"html-tags": "^3.1.0",
-				"lodash": "^4.17.21",
-				"prop-types": "^15.7.2",
-				"react-element-to-jsx-string": "^15.0.0",
-				"ts-dedent": "^2.0.0",
-				"type-fest": "~2.19",
-				"util-deprecate": "^1.0.2"
-			},
-			"dependencies": {
-				"@storybook/core-client": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/core-client/-/core-client-7.2.2.tgz",
-					"integrity": "sha512-RbtXvSiT7kunM6oz5svbp/IeastWz+40qZpdidkRLZ9QUpttU5NSKNUu+MPlfaMHT3A38VfZakk5cRAEztbu2w==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/preview-api": "7.2.2"
-					}
-				},
-				"@types/estree": {
-					"version": "0.0.51",
-					"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-					"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-					"dev": true
-				},
-				"acorn": {
-					"version": "7.4.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-					"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-					"dev": true
-				},
-				"type-fest": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-					"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/react-docgen-typescript-plugin": {
-			"version": "1.0.6--canary.9.0c3f3b7.0",
-			"resolved": "https://registry.npmjs.org/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.6--canary.9.0c3f3b7.0.tgz",
-			"integrity": "sha512-KUqXC3oa9JuQ0kZJLBhVdS4lOneKTOopnNBK4tUAgoxWQ3u/IjzdueZjFr7gyBrXMoU6duutk3RQR9u8ZpYJ4Q==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.1",
-				"endent": "^2.0.1",
-				"find-cache-dir": "^3.3.1",
-				"flat-cache": "^3.0.4",
-				"micromatch": "^4.0.2",
-				"react-docgen-typescript": "^2.2.2",
-				"tslib": "^2.0.0"
-			},
-			"dependencies": {
-				"find-cache-dir": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-					"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-					"dev": true,
-					"requires": {
-						"commondir": "^1.0.1",
-						"make-dir": "^3.0.2",
-						"pkg-dir": "^4.1.0"
-					}
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"make-dir": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-					"dev": true,
-					"requires": {
-						"semver": "^6.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-					"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-					"dev": true,
-					"requires": {
-						"find-up": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/react-dom-shim": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-7.2.2.tgz",
-			"integrity": "sha512-H/yHlWl94vbUv1NNolcB3vCy1S185XKicswljJRC9o/AFCJK+a7d9wDVGTPKF6oy7ujrgpANLQyq02d+OuoO7w==",
-			"dev": true
-		},
-		"@storybook/react-webpack5": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-7.2.2.tgz",
-			"integrity": "sha512-VBFOO4LUuX/DVqaVBHpSTNT1NcIUlt1RpHX371NM0IcPSAj4EjHu3fLK4GjPMNJSqjnT7i6cthwPPe4hATTldg==",
-			"dev": true,
-			"requires": {
-				"@storybook/builder-webpack5": "7.2.2",
-				"@storybook/preset-react-webpack": "7.2.2",
-				"@storybook/react": "7.2.2",
-				"@types/node": "^16.0.0"
-			}
-		},
-		"@storybook/source-loader": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/source-loader/-/source-loader-7.2.2.tgz",
-			"integrity": "sha512-kzUhihfnOWKekEw9eX7BNhjuVj4gvcU3F2Fe/GrtyCOilB8fgTOla47SEbqJ2WIPamp91ZI1VoSjSNy5BhG9Ow==",
-			"dev": true,
-			"requires": {
-				"@storybook/csf": "^0.1.0",
-				"@storybook/types": "7.2.2",
-				"estraverse": "^5.2.0",
-				"lodash": "^4.17.21",
-				"prettier": "^2.8.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				},
-				"prettier": {
-					"version": "2.8.8",
-					"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-					"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/telemetry": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/telemetry/-/telemetry-7.2.2.tgz",
-			"integrity": "sha512-pJ8oQ++QD7hLezARp+3PR0JAw3FH6cmOrSs4KAB+IhNgACs8gehaEdy7TAikor5tlAUCWvqPetnNXDrrDIZhTQ==",
-			"dev": true,
-			"requires": {
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/core-common": "7.2.2",
-				"@storybook/csf-tools": "7.2.2",
-				"chalk": "^4.1.0",
-				"detect-package-manager": "^2.0.1",
-				"fetch-retry": "^5.0.2",
-				"fs-extra": "^11.1.0",
-				"read-pkg-up": "^7.0.1"
-			},
-			"dependencies": {
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/theming": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-7.2.2.tgz",
-			"integrity": "sha512-B4nxcxl4IyVvB1NXwRi4yopAS73zl052f2zJi3kVghJbZ3tgPwgvi3CVpOs2D4pgmxOrKCgiLnzLrGTH+13+0A==",
-			"dev": true,
-			"requires": {
-				"@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
-				"@storybook/client-logger": "7.2.2",
-				"@storybook/global": "^5.0.0",
-				"memoizerific": "^1.11.3"
-			}
-		},
-		"@storybook/types": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@storybook/types/-/types-7.2.2.tgz",
-			"integrity": "sha512-yrL0+KD+dsusQvDmNKQGv36WjvdhoiUxMDEBgsZkP047kRc3b8/zEbD3Tu7iMDsWnpgwip1Frgy29Ro3UtK57Q==",
-			"dev": true,
-			"requires": {
-				"@storybook/channels": "7.2.2",
-				"@types/babel__core": "^7.0.0",
-				"@types/express": "^4.7.0",
-				"file-system-cache": "2.3.0"
-			},
-			"dependencies": {
-				"@storybook/channels": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-7.2.2.tgz",
-					"integrity": "sha512-FkH5QzKkq7smtPlaKTWalJ+sN13H4dWtxdZ+ePFAXaubsBqGqo3Dw3e/hrbjrMqFjTwiKnmj5K5bjhdJcvzi1A==",
-					"dev": true,
-					"requires": {
-						"@storybook/client-logger": "7.2.2",
-						"@storybook/core-events": "7.2.2",
-						"@storybook/global": "^5.0.0",
-						"qs": "^6.10.0",
-						"telejson": "^7.0.3",
-						"tiny-invariant": "^1.3.1"
-					}
-				},
-				"telejson": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz",
-					"integrity": "sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==",
-					"dev": true,
-					"requires": {
-						"memoizerific": "^1.11.3"
-					}
-				}
-			}
-		},
-		"@svgr/babel-plugin-add-jsx-attribute": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz",
-			"integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-remove-jsx-attribute": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz",
-			"integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-remove-jsx-empty-expression": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz",
-			"integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-replace-jsx-attribute-value": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz",
-			"integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-svg-dynamic-title": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz",
-			"integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-svg-em-dimensions": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz",
-			"integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-transform-react-native-svg": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.0.0.tgz",
-			"integrity": "sha512-UKrY3860AQICgH7g+6h2zkoxeVEPLYwX/uAjmqo4PIq2FIHppwhIqZstIyTz0ZtlwreKR41O3W3BzsBBiJV2Aw==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-transform-svg-component": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz",
-			"integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==",
-			"dev": true
-		},
-		"@svgr/babel-preset": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.0.0.tgz",
-			"integrity": "sha512-KLcjiZychInVrhs86OvcYPLTFu9L5XV2vj0XAaE1HwE3J3jLmIzRY8ttdeAg/iFyp8nhavJpafpDZTt+1LIpkQ==",
-			"dev": true,
-			"requires": {
-				"@svgr/babel-plugin-add-jsx-attribute": "8.0.0",
-				"@svgr/babel-plugin-remove-jsx-attribute": "8.0.0",
-				"@svgr/babel-plugin-remove-jsx-empty-expression": "8.0.0",
-				"@svgr/babel-plugin-replace-jsx-attribute-value": "8.0.0",
-				"@svgr/babel-plugin-svg-dynamic-title": "8.0.0",
-				"@svgr/babel-plugin-svg-em-dimensions": "8.0.0",
-				"@svgr/babel-plugin-transform-react-native-svg": "8.0.0",
-				"@svgr/babel-plugin-transform-svg-component": "8.0.0"
-			}
-		},
-		"@svgr/core": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.0.0.tgz",
-			"integrity": "sha512-aJKtc+Pie/rFYsVH/unSkDaZGvEeylNv/s2cP+ta9/rYWxRVvoV/S4Qw65Kmrtah4CBK5PM6ISH9qUH7IJQCng==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.21.3",
-				"@svgr/babel-preset": "8.0.0",
-				"camelcase": "^6.2.0",
-				"cosmiconfig": "^8.1.3",
-				"snake-case": "^3.0.4"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"dev": true,
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"camelcase": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-					"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-					"dev": true
-				},
-				"cosmiconfig": {
-					"version": "8.2.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-					"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^3.2.1",
-						"js-yaml": "^4.1.0",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-					"dev": true
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"path-type": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-					"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"@svgr/hast-util-to-babel-ast": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz",
-			"integrity": "sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.21.3",
-				"entities": "^4.4.0"
-			},
-			"dependencies": {
-				"entities": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-					"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-					"dev": true
-				}
-			}
-		},
-		"@svgr/plugin-jsx": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.0.1.tgz",
-			"integrity": "sha512-bfCFb+4ZsM3UuKP2t7KmDwn6YV8qVn9HIQJmau6xeQb/iV65Rpi7NBNBWA2hcCd4GKoCqG8hpaaDk5FDR0eH+g==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.21.3",
-				"@svgr/babel-preset": "8.0.0",
-				"@svgr/hast-util-to-babel-ast": "8.0.0",
-				"svg-parser": "^2.0.4"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"dev": true,
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"@svgr/plugin-svgo": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-8.0.1.tgz",
-			"integrity": "sha512-29OJ1QmJgnohQHDAgAuY2h21xWD6TZiXji+hnx+W635RiXTAlHTbjrZDktfqzkN0bOeQEtNe+xgq73/XeWFfSg==",
-			"dev": true,
-			"requires": {
-				"cosmiconfig": "^8.1.3",
-				"deepmerge": "^4.3.1",
-				"svgo": "^3.0.2"
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"cosmiconfig": {
-					"version": "8.2.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-					"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^3.2.1",
-						"js-yaml": "^4.1.0",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0"
-					}
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"path-type": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-					"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-					"dev": true
-				}
-			}
-		},
-		"@svgr/webpack": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-8.0.1.tgz",
-			"integrity": "sha512-zSoeKcbCmfMXjA11uDuCJb+1LWNb3vy6Qw/VHj0Nfcl3UuqwuoZWknHsBIhCWvi4wU9vPui3aq054qjVyZqY4A==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.21.3",
-				"@babel/plugin-transform-react-constant-elements": "^7.21.3",
-				"@babel/preset-env": "^7.20.2",
-				"@babel/preset-react": "^7.18.6",
-				"@babel/preset-typescript": "^7.21.0",
-				"@svgr/core": "8.0.0",
-				"@svgr/plugin-jsx": "8.0.1",
-				"@svgr/plugin-svgo": "8.0.1"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"dev": true,
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"@swc/core": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.76.tgz",
-			"integrity": "sha512-aYYTA2aVYkwJAZepQXtPnkUthhOfn8qd6rsh+lrJxonFrjmpI7RHt2tMDVTXP6XDX7fvnvrVtT1bwZfmBFPh0Q==",
-			"dev": true,
-			"requires": {
-				"@swc/core-darwin-arm64": "1.3.76",
-				"@swc/core-darwin-x64": "1.3.76",
-				"@swc/core-linux-arm-gnueabihf": "1.3.76",
-				"@swc/core-linux-arm64-gnu": "1.3.76",
-				"@swc/core-linux-arm64-musl": "1.3.76",
-				"@swc/core-linux-x64-gnu": "1.3.76",
-				"@swc/core-linux-x64-musl": "1.3.76",
-				"@swc/core-win32-arm64-msvc": "1.3.76",
-				"@swc/core-win32-ia32-msvc": "1.3.76",
-				"@swc/core-win32-x64-msvc": "1.3.76"
-			}
-		},
-		"@swc/core-darwin-arm64": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.76.tgz",
-			"integrity": "sha512-ovviEhZ/1E81Z9OGrO0ivLWk4VCa3I3ZzM+cd3gugglRRwVwtlIaoIYqY5S3KiCAupDd1+UCl5X7Vbio7a/V8g==",
-			"dev": true,
-			"optional": true
-		},
-		"@swc/core-darwin-x64": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.76.tgz",
-			"integrity": "sha512-tcySTDqs0SHCebtW35sCdcLWsmTEo7bEwx0gNL/spetqVT9fpFi6qU8qcnt7i2KaZHbeNl9g1aadu+Yrni+GzA==",
-			"dev": true,
-			"optional": true
-		},
-		"@swc/core-linux-arm-gnueabihf": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.76.tgz",
-			"integrity": "sha512-apgzpGWy1AwoMF4urAAASsAjE7rEzZFIF+p6utuxhS7cNHzE0AyEVDYJbo+pzBdlZ8orBdzzsHtFwoEgKOjebA==",
-			"dev": true,
-			"optional": true
-		},
-		"@swc/core-linux-arm64-gnu": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.76.tgz",
-			"integrity": "sha512-c3c0zz6S0eludqidDpuqbadE0WT3OZczyQxe9Vw8lFFXES85mvNGtwYzyGK2o7TICpsuHrndwDIoYpmpWk879g==",
-			"dev": true,
-			"optional": true
-		},
-		"@swc/core-linux-arm64-musl": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.76.tgz",
-			"integrity": "sha512-Is3bpq7F2qtlnkzEeOD6HIZJPpOmu3q6c82lKww90Q0NnrlSluVMozTHJgwVoFZyizH7uLnk0LuNcEAWLnmJIw==",
-			"dev": true,
-			"optional": true
-		},
-		"@swc/core-linux-x64-gnu": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.76.tgz",
-			"integrity": "sha512-iwCeRzd9oSvUzqt7nU6p/ztceAWfnO9XVxBn502R5gs6QCBbE1HCKrWHDO77aKPK7ss+0NcIGHvXTd9L8/wRzw==",
-			"dev": true,
-			"optional": true
-		},
-		"@swc/core-linux-x64-musl": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.76.tgz",
-			"integrity": "sha512-a671g4tW8kyFeuICsgq4uB9ukQfiIyXJT4V6YSnmqhCTz5mazWuDxZ5wKnx/1g5nXTl+U5cWH2TZaCJatp4GKA==",
-			"dev": true,
-			"optional": true
-		},
-		"@swc/core-win32-arm64-msvc": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.76.tgz",
-			"integrity": "sha512-+swEFtjdMezS0vKUhJC3psdSDtOJGY5pEOt4e8XOPvn7aQpKQ9LfF49XVtIwDSk5SGuWtVoLFzkSY3reWUJCyg==",
-			"dev": true,
-			"optional": true
-		},
-		"@swc/core-win32-ia32-msvc": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.76.tgz",
-			"integrity": "sha512-5CqwAykpGBJ3PqGLOlWGLGIPpBAG1IwWVDUfro3hhjQ7XJxV5Z1aQf5V5OJ90HJVtrEAVx2xx59UV/Dh081LOg==",
-			"dev": true,
-			"optional": true
-		},
-		"@swc/core-win32-x64-msvc": {
-			"version": "1.3.76",
-			"resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.76.tgz",
-			"integrity": "sha512-CiMpWLLlR3Cew9067E7XxaLBwYYJ90r9EhGSO6V1pvYSWj7ET/Ppmtj1ZhzPJMqRXAP6xflfl5R5o4ee1m4WLA==",
-			"dev": true,
-			"optional": true
-		},
-		"@szmarczak/http-timer": {
-			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-			"integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-			"dev": true,
-			"requires": {
-				"defer-to-connect": "^2.0.0"
-			}
-		},
-		"@tannin/compile": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@tannin/compile/-/compile-1.1.0.tgz",
-			"integrity": "sha512-n8m9eNDfoNZoxdvWiTfW/hSPhehzLJ3zW7f8E7oT6mCROoMNWCB4TYtv041+2FMAxweiE0j7i1jubQU4MEC/Gg==",
-			"requires": {
-				"@tannin/evaluate": "^1.2.0",
-				"@tannin/postfix": "^1.1.0"
-			}
-		},
-		"@tannin/evaluate": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@tannin/evaluate/-/evaluate-1.2.0.tgz",
-			"integrity": "sha512-3ioXvNowbO/wSrxsDG5DKIMxC81P0QrQTYai8zFNY+umuoHWRPbQ/TuuDEOju9E+jQDXmj6yI5GyejNuh8I+eg=="
-		},
-		"@tannin/plural-forms": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@tannin/plural-forms/-/plural-forms-1.1.0.tgz",
-			"integrity": "sha512-xl9R2mDZO/qiHam1AgMnAES6IKIg7OBhcXqy6eDsRCdXuxAFPcjrej9HMjyCLE0DJ/8cHf0i5OQTstuBRhpbHw==",
-			"requires": {
-				"@tannin/compile": "^1.1.0"
-			}
-		},
-		"@tannin/postfix": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@tannin/postfix/-/postfix-1.1.0.tgz",
-			"integrity": "sha512-oocsqY7g0cR+Gur5jRQLSrX2OtpMLMse1I10JQBm8CdGMrDkh1Mg2gjsiquMHRtBs4Qwu5wgEp5GgIYHk4SNPw=="
-		},
-		"@tanstack/react-table": {
-			"version": "8.10.3",
-			"resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.10.3.tgz",
-			"integrity": "sha512-Qya1cJ+91arAlW7IRDWksRDnYw28O446jJ/ljkRSc663EaftJoBCAU10M+VV1K6MpCBLrXq1BD5IQc1zj/ZEjA==",
-			"requires": {
-				"@tanstack/table-core": "8.10.3"
-			}
-		},
-		"@tanstack/table-core": {
-			"version": "8.10.3",
-			"resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.10.3.tgz",
-			"integrity": "sha512-hJ55YfJlWbfzRROfcyA/kC1aZr/shsLA8XNAwN8jXylhYWGLnPmiJJISrUfj4dMMWRiFi0xBlnlC7MLH+zSrcw=="
-		},
-		"@testing-library/dom": {
-			"version": "9.3.1",
-			"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
-			"integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.10.4",
-				"@babel/runtime": "^7.12.5",
-				"@types/aria-query": "^5.0.1",
-				"aria-query": "5.1.3",
-				"chalk": "^4.1.0",
-				"dom-accessibility-api": "^0.5.9",
-				"lz-string": "^1.5.0",
-				"pretty-format": "^27.0.2"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-					"dev": true
-				},
-				"aria-query": {
-					"version": "5.1.3",
-					"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-					"integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
-					"dev": true,
-					"requires": {
-						"deep-equal": "^2.0.5"
-					}
-				},
-				"deep-equal": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz",
-					"integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==",
-					"dev": true,
-					"requires": {
-						"array-buffer-byte-length": "^1.0.0",
-						"call-bind": "^1.0.2",
-						"es-get-iterator": "^1.1.3",
-						"get-intrinsic": "^1.2.1",
-						"is-arguments": "^1.1.1",
-						"is-array-buffer": "^3.0.2",
-						"is-date-object": "^1.0.5",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"isarray": "^2.0.5",
-						"object-is": "^1.1.5",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.5.0",
-						"side-channel": "^1.0.4",
-						"which-boxed-primitive": "^1.0.2",
-						"which-collection": "^1.0.1",
-						"which-typed-array": "^1.1.9"
-					}
-				},
-				"isarray": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-					"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-					"dev": true
-				},
-				"pretty-format": {
-					"version": "27.5.1",
-					"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-					"integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1",
-						"ansi-styles": "^5.0.0",
-						"react-is": "^17.0.1"
-					}
-				},
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-					"dev": true
-				}
-			}
-		},
-		"@testing-library/jest-dom": {
-			"version": "5.16.5",
-			"resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz",
-			"integrity": "sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==",
-			"dev": true,
-			"requires": {
-				"@adobe/css-tools": "^4.0.1",
-				"@babel/runtime": "^7.9.2",
-				"@types/testing-library__jest-dom": "^5.9.1",
-				"aria-query": "^5.0.0",
-				"chalk": "^3.0.0",
-				"css.escape": "^1.5.1",
-				"dom-accessibility-api": "^0.5.6",
-				"lodash": "^4.17.15",
-				"redent": "^3.0.0"
-			},
-			"dependencies": {
-				"aria-query": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-					"integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
-					"dev": true,
-					"requires": {
-						"dequal": "^2.0.3"
-					}
-				},
-				"chalk": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@testing-library/react": {
-			"version": "14.0.0",
-			"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.0.0.tgz",
-			"integrity": "sha512-S04gSNJbYE30TlIMLTzv6QCTzt9AqIF5y6s6SzVFILNcNvbV/jU96GeiTPillGQo+Ny64M/5PV7klNYYgv5Dfg==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.12.5",
-				"@testing-library/dom": "^9.0.0",
-				"@types/react-dom": "^18.0.0"
-			}
-		},
-		"@testing-library/react-native": {
-			"version": "12.1.2",
-			"resolved": "https://registry.npmjs.org/@testing-library/react-native/-/react-native-12.1.2.tgz",
-			"integrity": "sha512-5rQMQpbSQAuJc4TxjTt1IoeT1a5eVXaa61hf/YcjV2QtGqCoyhuW8DvhTowrL7y2Ds4NzuYBmbVxjNPR6GIblw==",
-			"dev": true,
-			"requires": {
-				"pretty-format": "^29.0.0"
-			}
-		},
-		"@testing-library/user-event": {
-			"version": "14.4.3",
-			"resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.4.3.tgz",
-			"integrity": "sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==",
-			"dev": true
-		},
-		"@tootallnate/quickjs-emscripten": {
-			"version": "0.23.0",
-			"resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
-			"integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
-			"dev": true
-		},
-		"@trysound/sax": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-			"dev": true
-		},
-		"@tsconfig/node14": {
-			"version": "14.1.0",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-14.1.0.tgz",
-			"integrity": "sha512-VmsCG04YR58ciHBeJKBDNMWWfYbyP8FekWVuTlpstaUPlat1D0x/tXzkWP7yCMU0eSz9V4OZU0LBWTFJ3xZf6w==",
-			"dev": true
-		},
-		"@tufjs/canonical-json": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz",
-			"integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==",
-			"dev": true
-		},
-		"@tufjs/models": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz",
-			"integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==",
-			"dev": true,
-			"requires": {
-				"@tufjs/canonical-json": "1.0.0",
-				"minimatch": "^9.0.0"
-			},
-			"dependencies": {
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"minimatch": {
-					"version": "9.0.3",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-					"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				}
-			}
-		},
-		"@types/archiver": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-5.3.3.tgz",
-			"integrity": "sha512-0ABdVcXL6jOwNGY+hjWPqrxUvKelBEwNLcuv/SV2vZ4YCH8w9NttFCt+/QqI5zgMX+iX/XqVy89/r7EmLJmMpQ==",
-			"dev": true,
-			"requires": {
-				"@types/readdir-glob": "*"
-			}
-		},
-		"@types/argparse": {
-			"version": "2.0.10",
-			"resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-2.0.10.tgz",
-			"integrity": "sha512-C4wahC3gz3vQtvPazrJ5ONwmK1zSDllQboiWvpMM/iOswCYfBREFnjFbq/iWKIVOCl8+m5Pk6eva6/ZSsDuIGA==",
-			"dev": true
-		},
-		"@types/aria-query": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
-			"integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
-			"dev": true
-		},
-		"@types/async-lock": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@types/async-lock/-/async-lock-1.4.0.tgz",
-			"integrity": "sha512-2+rYSaWrpdbQG3SA0LmMT6YxWLrI81AqpMlSkw3QtFc2HGDufkweQSn30Eiev7x9LL0oyFrBqk1PXOnB9IEgKg==",
-			"dev": true
-		},
-		"@types/babel__core": {
-			"version": "7.20.0",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
-			"integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
-			"dev": true,
-			"requires": {
-				"@babel/parser": "^7.20.7",
-				"@babel/types": "^7.20.7",
-				"@types/babel__generator": "*",
-				"@types/babel__template": "*",
-				"@types/babel__traverse": "*"
-			}
-		},
-		"@types/babel__generator": {
-			"version": "7.6.4",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@types/babel__template": {
-			"version": "7.4.1",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-			"dev": true,
-			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@types/babel__traverse": {
-			"version": "7.0.11",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz",
-			"integrity": "sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.3.0"
-			}
-		},
-		"@types/base64-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@types/base64-stream/-/base64-stream-1.0.3.tgz",
-			"integrity": "sha512-cbLPBuRLRq7l2+syfKT3byML5C/UNK/6hkcDDMxwttE+NtpXvQxhgXj0PNbcLCwUCmfEWMm3eRBpDmpieLegDQ==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/bluebird": {
-			"version": "3.5.38",
-			"resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.38.tgz",
-			"integrity": "sha512-yR/Kxc0dd4FfwtEoLZMoqJbM/VE/W7hXn/MIjb+axcwag0iFmSPK7OBUZq1YWLynJUoWQkfUrI7T0HDqGApNSg==",
-			"dev": true
-		},
-		"@types/body-parser": {
-			"version": "1.19.2",
-			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-			"integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-			"dev": true,
-			"requires": {
-				"@types/connect": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/bonjour": {
-			"version": "3.5.11",
-			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.11.tgz",
-			"integrity": "sha512-isGhjmBtLIxdHBDl2xGwUzEM8AOyOvWsADWq7rqirdi/ZQoHnLWErHvsThcEzTX8juDRiZtzp2Qkv5bgNh6mAg==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/cacheable-request": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-			"integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-			"dev": true,
-			"requires": {
-				"@types/http-cache-semantics": "*",
-				"@types/keyv": "^3.1.4",
-				"@types/node": "*",
-				"@types/responselike": "^1.0.0"
-			}
-		},
-		"@types/connect": {
-			"version": "3.4.35",
-			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/connect-history-api-fallback": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.1.tgz",
-			"integrity": "sha512-iaQslNbARe8fctL5Lk+DsmgWOM83lM+7FzP0eQUJs1jd3kBE8NWqBTIT2S8SqQOJjxvt2eyIjpOuYeRXq2AdMw==",
-			"dev": true,
-			"requires": {
-				"@types/express-serve-static-core": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/cross-spawn": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.2.tgz",
-			"integrity": "sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/detect-port": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/@types/detect-port/-/detect-port-1.3.3.tgz",
-			"integrity": "sha512-bV/jQlAJ/nPY3XqSatkGpu+nGzou+uSwrH1cROhn+jBFg47yaNH+blW4C7p9KhopC7QxCv/6M86s37k8dMk0Yg==",
-			"dev": true
-		},
-		"@types/doctrine": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz",
-			"integrity": "sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==",
-			"dev": true
-		},
-		"@types/ejs": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.2.tgz",
-			"integrity": "sha512-ZmiaE3wglXVWBM9fyVC17aGPkLo/UgaOjEiI2FXQfyczrCefORPxIe+2dVmnmk3zkVIbizjrlQzmPGhSYGXG5g==",
-			"dev": true
-		},
-		"@types/emscripten": {
-			"version": "1.39.7",
-			"resolved": "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.39.7.tgz",
-			"integrity": "sha512-tLqYV94vuqDrXh515F/FOGtBcRMTPGvVV1LzLbtYDcQmmhtpf/gLYf+hikBbQk8MzOHNz37wpFfJbYAuSn8HqA==",
-			"dev": true
-		},
-		"@types/escodegen": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/@types/escodegen/-/escodegen-0.0.6.tgz",
-			"integrity": "sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig==",
-			"dev": true
-		},
-		"@types/eslint": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz",
-			"integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==",
-			"dev": true,
-			"requires": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
-			}
-		},
-		"@types/eslint-scope": {
-			"version": "3.7.4",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-			"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-			"dev": true,
-			"requires": {
-				"@types/eslint": "*",
-				"@types/estree": "*"
-			}
-		},
-		"@types/estree": {
-			"version": "0.0.50",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-			"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
-			"dev": true
-		},
-		"@types/events": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-			"integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-			"dev": true
-		},
-		"@types/express": {
-			"version": "4.17.17",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
-			"integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
-			"dev": true,
-			"requires": {
-				"@types/body-parser": "*",
-				"@types/express-serve-static-core": "^4.17.33",
-				"@types/qs": "*",
-				"@types/serve-static": "*"
-			}
-		},
-		"@types/express-serve-static-core": {
-			"version": "4.17.35",
-			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
-			"integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/qs": "*",
-				"@types/range-parser": "*",
-				"@types/send": "*"
-			}
-		},
-		"@types/fancy-log": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-2.0.0.tgz",
-			"integrity": "sha512-g39Vp8ZJ3D0gXhhkhDidVvdy4QajkF7/PV6HGn23FMaMqE/tLC1JNHUeQ7SshKLsBjucakZsXBLkWULbGLdL5g==",
-			"dev": true
-		},
-		"@types/find-cache-dir": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/@types/find-cache-dir/-/find-cache-dir-3.2.1.tgz",
-			"integrity": "sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==",
-			"dev": true
-		},
-		"@types/find-root": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@types/find-root/-/find-root-1.1.2.tgz",
-			"integrity": "sha512-lGuMq71TL466jtCpvh7orGd+mrdBmo2h8ozvtOOTbq3ByfWpuN+UVxv4sOv3YpsD4NhW2k6ESGhnT/FIg4Ouzw==",
-			"dev": true
-		},
-		"@types/glob": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-			"integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
-			"dev": true,
-			"requires": {
-				"@types/events": "*",
-				"@types/minimatch": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/graceful-fs": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
-			"integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/hammerjs": {
-			"version": "2.0.41",
-			"resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz",
-			"integrity": "sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA=="
-		},
-		"@types/highlight-words-core": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/highlight-words-core/-/highlight-words-core-1.2.1.tgz",
-			"integrity": "sha512-9VZUA5omXBfn+hDxFjUDu1FOJTBM3LmvqfDey+Z6Aa8B8/JmF5SMj6FBrjfgJ/Q3YXOZd3qyTDfJyMZSs/wCUA=="
-		},
-		"@types/html-minifier-terser": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-			"integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-			"dev": true
-		},
-		"@types/http-cache-semantics": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz",
-			"integrity": "sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw==",
-			"dev": true
-		},
-		"@types/http-errors": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
-			"integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
-			"dev": true
-		},
-		"@types/http-proxy": {
-			"version": "1.17.12",
-			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz",
-			"integrity": "sha512-kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/istanbul-lib-coverage": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-			"integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg=="
-		},
-		"@types/istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-			"requires": {
-				"@types/istanbul-lib-coverage": "*"
-			}
-		},
-		"@types/istanbul-reports": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-			"integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-			"requires": {
-				"@types/istanbul-lib-report": "*"
-			}
-		},
-		"@types/jest": {
-			"version": "29.4.0",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.4.0.tgz",
-			"integrity": "sha512-VaywcGQ9tPorCX/Jkkni7RWGFfI11whqzs8dvxF41P17Z+z872thvEvlIbznjPJ02kl1HMX3LmLOonsj2n7HeQ==",
-			"dev": true,
-			"requires": {
-				"expect": "^29.0.0",
-				"pretty-format": "^29.0.0"
-			}
-		},
-		"@types/jsdom": {
-			"version": "20.0.1",
-			"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
-			"integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/tough-cookie": "*",
-				"parse5": "^7.0.0"
-			}
-		},
-		"@types/jsftp": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/@types/jsftp/-/jsftp-2.1.3.tgz",
-			"integrity": "sha512-R5rP70tkPnH+rhz0s6VuMKqMrkA7ET1AfU3FDGKNhYBgU/XTIbzsYNCgTByo60eitl0mI5OoEA9+MW/t/5iVzA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/json-schema": {
-			"version": "7.0.12",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-			"integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
-			"dev": true
-		},
-		"@types/json5": {
-			"version": "0.0.29",
-			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-			"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-			"dev": true
-		},
-		"@types/keyv": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-			"integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/klaw": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/@types/klaw/-/klaw-3.0.4.tgz",
-			"integrity": "sha512-0M5F/WMU9yu2MyRued1VTQvUSwZ3siqYsX6MU7JF7VXRF5RzL0FXWFUrmdrWuGDWmuN6W+SyLhhg1Wp/sXkjtg==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/lockfile": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@types/lockfile/-/lockfile-1.0.2.tgz",
-			"integrity": "sha512-jD5VbvhfMhaYN4M3qPJuhMVUg3Dfc4tvPvLEAXn6GXbs/ajDFtCQahX37GIE65ipTI3I+hEvNaXS3MYAn9Ce3Q==",
-			"dev": true
-		},
-		"@types/lodash": {
-			"version": "4.14.199",
-			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz",
-			"integrity": "sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==",
-			"dev": true
-		},
-		"@types/mdx": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.6.tgz",
-			"integrity": "sha512-sVcwEG10aFU2KcM7cIA0M410UPv/DesOPyG8zMVk0QUDexHA3lYmGucpEpZ2dtWWhi2ip3CG+5g/iH0PwoW4Fw==",
-			"dev": true
-		},
-		"@types/method-override": {
-			"version": "0.0.33",
-			"resolved": "https://registry.npmjs.org/@types/method-override/-/method-override-0.0.33.tgz",
-			"integrity": "sha512-H6hK7AZdUOCmboTTUlhfDG3uT0XDljjrk3vIb+GJ3ylkogXu5s/NncGB85r3rtCz6sxZBWF62dlf7I04sIQA5A==",
-			"dev": true,
-			"requires": {
-				"@types/express": "*"
-			}
-		},
-		"@types/mime": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz",
-			"integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==",
-			"dev": true
-		},
-		"@types/mime-types": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
-			"integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
-			"dev": true
-		},
-		"@types/minimatch": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-			"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-			"dev": true
-		},
-		"@types/minimist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
-			"integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
-			"dev": true
-		},
-		"@types/mousetrap": {
-			"version": "1.6.8",
-			"resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.8.tgz",
-			"integrity": "sha512-zTqjvgCUT5EoXqbqmd8iJMb4NJqyV/V7pK7AIKq7qcaAsJIpGlTVJS1HQM6YkdHCdnkNSbhcQI7MXYxFfE3iCA=="
-		},
-		"@types/mv": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/@types/mv/-/mv-2.1.2.tgz",
-			"integrity": "sha512-IvAjPuiQ2exDicnTrMidt1m+tj3gZ60BM0PaoRsU0m9Cn+lrOyemuO9Tf8CvHFmXlxMjr1TVCfadi9sfwbSuKg==",
-			"dev": true
-		},
-		"@types/ncp": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.6.tgz",
-			"integrity": "sha512-A5CcYVkrcbRD+5ghRzn+LjEYUNT+YpjcPfnpYte6fBNfq3rXJRYA03cATV0XfVbSnOZa2Yp5sXYI1fIkjAF/UA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/node": {
-			"version": "16.18.40",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.40.tgz",
-			"integrity": "sha512-+yno3ItTEwGxXiS/75Q/aHaa5srkpnJaH+kdkTVJ3DtJEwv92itpKbxU+FjPoh2m/5G9zmUQfrL4A4C13c+iGA=="
-		},
-		"@types/node-fetch": {
-			"version": "2.6.4",
-			"resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.4.tgz",
-			"integrity": "sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"form-data": "^3.0.0"
-			},
-			"dependencies": {
-				"form-data": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-					"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-					"dev": true,
-					"requires": {
-						"asynckit": "^0.4.0",
-						"combined-stream": "^1.0.8",
-						"mime-types": "^2.1.12"
-					}
-				}
-			}
-		},
-		"@types/normalize-package-data": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-			"integrity": "sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==",
-			"dev": true
-		},
-		"@types/npm-package-arg": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/@types/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
-			"integrity": "sha512-452/1Kp9IdM/oR10AyqAgZOxUt7eLbm+EMJ194L6oarMYdZNiFIFAOJ7IIr0OrZXTySgfHjJezh2oiyk2kc3ag==",
-			"dev": true
-		},
-		"@types/npmlog": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/@types/npmlog/-/npmlog-4.1.4.tgz",
-			"integrity": "sha512-WKG4gTr8przEZBiJ5r3s8ZIAoMXNbOgQ+j/d5O4X3x6kZJRLNvyUJuUK/KoG3+8BaOHPhp2m7WC6JKKeovDSzQ==",
-			"dev": true
-		},
-		"@types/offscreencanvas": {
-			"version": "2019.7.0",
-			"resolved": "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.7.0.tgz",
-			"integrity": "sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg=="
-		},
-		"@types/parse-json": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
-		},
-		"@types/pluralize": {
-			"version": "0.0.31",
-			"resolved": "https://registry.npmjs.org/@types/pluralize/-/pluralize-0.0.31.tgz",
-			"integrity": "sha512-MQh69PPwFlYAL2qz/Mw5Zc34VTdt7pTck0Xbb6pbPSzdt5oaLB87iyJJxEMS5Dco/s7lXHunEezAvQurZZdrsQ==",
-			"dev": true
-		},
-		"@types/prettier": {
-			"version": "2.4.4",
-			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.4.tgz",
-			"integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA==",
-			"dev": true
-		},
-		"@types/pretty-hrtime": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz",
-			"integrity": "sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==",
-			"dev": true
-		},
-		"@types/prop-types": {
-			"version": "15.7.4",
-			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-			"integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
-		},
-		"@types/qs": {
-			"version": "6.9.7",
-			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-			"dev": true
-		},
-		"@types/range-parser": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-			"dev": true
-		},
-		"@types/react": {
-			"version": "18.0.21",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.21.tgz",
-			"integrity": "sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==",
-			"requires": {
-				"@types/prop-types": "*",
-				"@types/scheduler": "*",
-				"csstype": "^3.0.2"
-			}
-		},
-		"@types/react-dates": {
-			"version": "21.8.3",
-			"resolved": "https://registry.npmjs.org/@types/react-dates/-/react-dates-21.8.3.tgz",
-			"integrity": "sha512-MSG/A5UCXepPw5a9BtdOXfCCSMcQ5+oQIkm0K2u39sf4EJbsgngUg1zcoY3amxa6Hz0EWZkZOiExK/92J6hxUw==",
-			"dev": true,
-			"requires": {
-				"@types/react": "*",
-				"@types/react-outside-click-handler": "*",
-				"moment": "^2.26.0"
-			}
-		},
-		"@types/react-dom": {
-			"version": "18.0.6",
-			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.6.tgz",
-			"integrity": "sha512-/5OFZgfIPSwy+YuIBP/FgJnQnsxhZhjjrnxudMddeblOouIodEQ75X14Rr4wGSG/bknL+Omy9iWlLo1u/9GzAA==",
-			"requires": {
-				"@types/react": "*"
-			}
-		},
-		"@types/react-outside-click-handler": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/@types/react-outside-click-handler/-/react-outside-click-handler-1.3.1.tgz",
-			"integrity": "sha512-0BNan5zIIDyO5k9LFSG+60ZxQ/0wf+LTF9BJx3oOUdOaJlZk6RCe52jRB75mlvLLJx2YLa61+NidOwBfptWMKw==",
-			"dev": true,
-			"requires": {
-				"@types/react": "*"
-			}
-		},
-		"@types/readdir-glob": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.2.tgz",
-			"integrity": "sha512-vwAYrNN/8yhp/FJRU6HUSD0yk6xfoOS8HrZa8ZL7j+X8hJpaC1hTcAiXX2IxaAkkvrz9mLyoEhYZTE3cEYvA9Q==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/requestidlecallback": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/@types/requestidlecallback/-/requestidlecallback-0.3.4.tgz",
-			"integrity": "sha512-aTSyiZuRemRLTQkJPb25L7A4/eR2Teo5l4yJ1V6P3+MFxEZckTDkNKNtr/V1zEOMzS6H8DgxF22U6jPAPrzQvw==",
-			"dev": true
-		},
-		"@types/responselike": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-			"integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/retry": {
-			"version": "0.12.1",
-			"resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-			"integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==",
-			"dev": true
-		},
-		"@types/scheduler": {
-			"version": "0.16.2",
-			"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-			"integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
-		},
-		"@types/semver": {
-			"version": "7.3.8",
-			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz",
-			"integrity": "sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==",
-			"dev": true
-		},
-		"@types/send": {
-			"version": "0.17.1",
-			"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
-			"integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
-			"dev": true,
-			"requires": {
-				"@types/mime": "^1",
-				"@types/node": "*"
-			},
-			"dependencies": {
-				"@types/mime": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-					"integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-					"dev": true
-				}
-			}
-		},
-		"@types/serve-favicon": {
-			"version": "2.5.5",
-			"resolved": "https://registry.npmjs.org/@types/serve-favicon/-/serve-favicon-2.5.5.tgz",
-			"integrity": "sha512-E/P1MhsGcalASnOVUPr9QQ4BIXyqQoGtLscG4fcMcEpZ7Z7tl6S4uSJnBJzWj7bj6rRZLIFOv0dR1YcepLNFFA==",
-			"dev": true,
-			"requires": {
-				"@types/express": "*"
-			}
-		},
-		"@types/serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-			"dev": true,
-			"requires": {
-				"@types/express": "*"
-			}
-		},
-		"@types/serve-static": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
-			"integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
-			"dev": true,
-			"requires": {
-				"@types/http-errors": "*",
-				"@types/mime": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/shell-quote": {
-			"version": "1.7.2",
-			"resolved": "https://registry.npmjs.org/@types/shell-quote/-/shell-quote-1.7.2.tgz",
-			"integrity": "sha512-p3SZxGp6LXB6RPdMpJmquKjaxQlN/ijyBLTKGPg9IJK6J2g2sJsMmtXP9kNR+Axxi6MDKN2e/76HCOUmvkIpcw==",
-			"dev": true
-		},
-		"@types/simple-peer": {
-			"version": "9.11.6",
-			"resolved": "https://registry.npmjs.org/@types/simple-peer/-/simple-peer-9.11.6.tgz",
-			"integrity": "sha512-6kD6yWzHJrVwx+N3RcC+5H9x/rZ7vRTDMrLl40eowvxXEKwvOW2W/ST5GlSQ/6j9yubSzaMj02LdNFTTfscQ3w==",
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/sockjs": {
-			"version": "0.3.33",
-			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-			"integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/source-list-map": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-			"dev": true
-		},
-		"@types/sprintf-js": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.2.tgz",
-			"integrity": "sha512-hkgzYF+qnIl8uTO8rmUSVSfQ8BIfMXC4yJAF4n8BE758YsKBZvFC4NumnAegj7KmylP0liEZNpb9RRGFMbFejA==",
-			"dev": true
-		},
-		"@types/stack-utils": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-			"integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
-		},
-		"@types/supports-color": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
-			"dev": true
-		},
-		"@types/tapable": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.5.tgz",
-			"integrity": "sha512-/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ==",
-			"dev": true
-		},
-		"@types/teen_process": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@types/teen_process/-/teen_process-2.0.0.tgz",
-			"integrity": "sha512-Kb0NjBT9cJXg0mjkmYJbA1WM+4EcEpbUfLXxzKhyAihNU0ipuqRyOolTEB2nDU8D8aCI6EcBLaHbSVefED8lGQ==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/testing-library__jest-dom": {
-			"version": "5.14.5",
-			"resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz",
-			"integrity": "sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==",
-			"dev": true,
-			"requires": {
-				"@types/jest": "*"
-			}
-		},
-		"@types/tough-cookie": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
-			"integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
-			"dev": true
-		},
-		"@types/triple-beam": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.3.tgz",
-			"integrity": "sha512-6tOUG+nVHn0cJbVp25JFayS5UE6+xlbcNF9Lo9mU7U0zk3zeUShZied4YEQZjy1JBF043FSkdXw8YkUJuVtB5g==",
-			"dev": true
-		},
-		"@types/uglify-js": {
-			"version": "3.9.2",
-			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.2.tgz",
-			"integrity": "sha512-d6dIfpPbF+8B7WiCi2ELY7m0w1joD8cRW4ms88Emdb2w062NeEpbNCeWwVCgzLRpVG+5e74VFSg4rgJ2xXjEiQ==",
-			"dev": true,
-			"requires": {
-				"source-map": "^0.6.1"
-			}
-		},
-		"@types/unist": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-			"integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
-			"dev": true
-		},
-		"@types/uuid": {
-			"version": "8.3.1",
-			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz",
-			"integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==",
-			"dev": true
-		},
-		"@types/vfile": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@types/vfile/-/vfile-3.0.2.tgz",
-			"integrity": "sha512-b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/unist": "*",
-				"@types/vfile-message": "*"
-			}
-		},
-		"@types/vfile-message": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-1.0.1.tgz",
-			"integrity": "sha512-mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/unist": "*"
-			}
-		},
-		"@types/webpack": {
-			"version": "4.41.33",
-			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz",
-			"integrity": "sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/tapable": "^1",
-				"@types/uglify-js": "*",
-				"@types/webpack-sources": "*",
-				"anymatch": "^3.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"@types/webpack-sources": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz",
-			"integrity": "sha512-XyaHrJILjK1VHVC4aVlKsdNN5KBTwufMb43cQs+flGxtPAf/1Qwl8+Q0tp5BwEGaI8D6XT1L+9bSWXckgkjTLw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/source-list-map": "*",
-				"source-map": "^0.6.1"
-			}
-		},
-		"@types/which": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.0.tgz",
-			"integrity": "sha512-ASCxdbsrwNfSMXALlC3Decif9rwDMu+80KGp5zI2RLRotfMsTv7fHL8W8VDp24wymzDyIFudhUeSCugrgRFfHQ==",
-			"dev": true
-		},
-		"@types/wrap-ansi": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
-			"integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==",
-			"dev": true
-		},
-		"@types/ws": {
-			"version": "8.5.5",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
-			"integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/yargs": {
-			"version": "17.0.24",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
-			"integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
-			"requires": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"@types/yargs-parser": {
-			"version": "13.1.0",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz",
-			"integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg=="
-		},
-		"@types/yauzl": {
-			"version": "2.10.0",
-			"resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-			"integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@typescript-eslint/eslint-plugin": {
-			"version": "6.4.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.1.tgz",
-			"integrity": "sha512-3F5PtBzUW0dYlq77Lcqo13fv+58KDwUib3BddilE8ajPJT+faGgxmI9Sw+I8ZS22BYwoir9ZhNXcLi+S+I2bkw==",
-			"dev": true,
-			"requires": {
-				"@eslint-community/regexpp": "^4.5.1",
-				"@typescript-eslint/scope-manager": "6.4.1",
-				"@typescript-eslint/type-utils": "6.4.1",
-				"@typescript-eslint/utils": "6.4.1",
-				"@typescript-eslint/visitor-keys": "6.4.1",
-				"debug": "^4.3.4",
-				"graphemer": "^1.4.0",
-				"ignore": "^5.2.4",
-				"natural-compare": "^1.4.0",
-				"semver": "^7.5.4",
-				"ts-api-utils": "^1.0.1"
-			},
-			"dependencies": {
-				"@types/semver": {
-					"version": "7.5.0",
-					"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-					"integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-					"dev": true
-				},
-				"@typescript-eslint/scope-manager": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
-					"integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
-					"dev": true,
-					"requires": {
-						"@typescript-eslint/types": "6.4.1",
-						"@typescript-eslint/visitor-keys": "6.4.1"
-					}
-				},
-				"@typescript-eslint/types": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
-					"integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
-					"dev": true
-				},
-				"@typescript-eslint/typescript-estree": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
-					"integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
-					"dev": true,
-					"requires": {
-						"@typescript-eslint/types": "6.4.1",
-						"@typescript-eslint/visitor-keys": "6.4.1",
-						"debug": "^4.3.4",
-						"globby": "^11.1.0",
-						"is-glob": "^4.0.3",
-						"semver": "^7.5.4",
-						"ts-api-utils": "^1.0.1"
-					}
-				},
-				"@typescript-eslint/utils": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
-					"integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
-					"dev": true,
-					"requires": {
-						"@eslint-community/eslint-utils": "^4.4.0",
-						"@types/json-schema": "^7.0.12",
-						"@types/semver": "^7.5.0",
-						"@typescript-eslint/scope-manager": "6.4.1",
-						"@typescript-eslint/types": "6.4.1",
-						"@typescript-eslint/typescript-estree": "6.4.1",
-						"semver": "^7.5.4"
-					}
-				},
-				"@typescript-eslint/visitor-keys": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
-					"integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
-					"dev": true,
-					"requires": {
-						"@typescript-eslint/types": "6.4.1",
-						"eslint-visitor-keys": "^3.4.1"
-					}
-				},
-				"eslint-visitor-keys": {
-					"version": "3.4.3",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-					"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-					"dev": true
-				}
-			}
-		},
-		"@typescript-eslint/parser": {
-			"version": "6.4.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.1.tgz",
-			"integrity": "sha512-610G6KHymg9V7EqOaNBMtD1GgpAmGROsmfHJPXNLCU9bfIuLrkdOygltK784F6Crboyd5tBFayPB7Sf0McrQwg==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/scope-manager": "6.4.1",
-				"@typescript-eslint/types": "6.4.1",
-				"@typescript-eslint/typescript-estree": "6.4.1",
-				"@typescript-eslint/visitor-keys": "6.4.1",
-				"debug": "^4.3.4"
-			},
-			"dependencies": {
-				"@typescript-eslint/scope-manager": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
-					"integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
-					"dev": true,
-					"requires": {
-						"@typescript-eslint/types": "6.4.1",
-						"@typescript-eslint/visitor-keys": "6.4.1"
-					}
-				},
-				"@typescript-eslint/types": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
-					"integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
-					"dev": true
-				},
-				"@typescript-eslint/typescript-estree": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
-					"integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
-					"dev": true,
-					"requires": {
-						"@typescript-eslint/types": "6.4.1",
-						"@typescript-eslint/visitor-keys": "6.4.1",
-						"debug": "^4.3.4",
-						"globby": "^11.1.0",
-						"is-glob": "^4.0.3",
-						"semver": "^7.5.4",
-						"ts-api-utils": "^1.0.1"
-					}
-				},
-				"@typescript-eslint/visitor-keys": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
-					"integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
-					"dev": true,
-					"requires": {
-						"@typescript-eslint/types": "6.4.1",
-						"eslint-visitor-keys": "^3.4.1"
-					}
-				},
-				"eslint-visitor-keys": {
-					"version": "3.4.3",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-					"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-					"dev": true
-				}
-			}
-		},
-		"@typescript-eslint/scope-manager": {
-			"version": "5.62.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-			"integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/types": "5.62.0",
-				"@typescript-eslint/visitor-keys": "5.62.0"
-			}
-		},
-		"@typescript-eslint/type-utils": {
-			"version": "6.4.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.1.tgz",
-			"integrity": "sha512-7ON8M8NXh73SGZ5XvIqWHjgX2f+vvaOarNliGhjrJnv1vdjG0LVIz+ToYfPirOoBi56jxAKLfsLm40+RvxVVXA==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/typescript-estree": "6.4.1",
-				"@typescript-eslint/utils": "6.4.1",
-				"debug": "^4.3.4",
-				"ts-api-utils": "^1.0.1"
-			},
-			"dependencies": {
-				"@types/semver": {
-					"version": "7.5.0",
-					"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-					"integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-					"dev": true
-				},
-				"@typescript-eslint/scope-manager": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
-					"integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
-					"dev": true,
-					"requires": {
-						"@typescript-eslint/types": "6.4.1",
-						"@typescript-eslint/visitor-keys": "6.4.1"
-					}
-				},
-				"@typescript-eslint/types": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
-					"integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
-					"dev": true
-				},
-				"@typescript-eslint/typescript-estree": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
-					"integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
-					"dev": true,
-					"requires": {
-						"@typescript-eslint/types": "6.4.1",
-						"@typescript-eslint/visitor-keys": "6.4.1",
-						"debug": "^4.3.4",
-						"globby": "^11.1.0",
-						"is-glob": "^4.0.3",
-						"semver": "^7.5.4",
-						"ts-api-utils": "^1.0.1"
-					}
-				},
-				"@typescript-eslint/utils": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
-					"integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
-					"dev": true,
-					"requires": {
-						"@eslint-community/eslint-utils": "^4.4.0",
-						"@types/json-schema": "^7.0.12",
-						"@types/semver": "^7.5.0",
-						"@typescript-eslint/scope-manager": "6.4.1",
-						"@typescript-eslint/types": "6.4.1",
-						"@typescript-eslint/typescript-estree": "6.4.1",
-						"semver": "^7.5.4"
-					}
-				},
-				"@typescript-eslint/visitor-keys": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
-					"integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
-					"dev": true,
-					"requires": {
-						"@typescript-eslint/types": "6.4.1",
-						"eslint-visitor-keys": "^3.4.1"
-					}
-				},
-				"eslint-visitor-keys": {
-					"version": "3.4.3",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-					"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-					"dev": true
-				}
-			}
-		},
-		"@typescript-eslint/types": {
-			"version": "5.62.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-			"integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
-			"dev": true
-		},
-		"@typescript-eslint/typescript-estree": {
-			"version": "5.62.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-			"integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/types": "5.62.0",
-				"@typescript-eslint/visitor-keys": "5.62.0",
-				"debug": "^4.3.4",
-				"globby": "^11.1.0",
-				"is-glob": "^4.0.3",
-				"semver": "^7.3.7",
-				"tsutils": "^3.21.0"
-			}
-		},
-		"@typescript-eslint/utils": {
-			"version": "5.62.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-			"integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
-			"dev": true,
-			"requires": {
-				"@eslint-community/eslint-utils": "^4.2.0",
-				"@types/json-schema": "^7.0.9",
-				"@types/semver": "^7.3.12",
-				"@typescript-eslint/scope-manager": "5.62.0",
-				"@typescript-eslint/types": "5.62.0",
-				"@typescript-eslint/typescript-estree": "5.62.0",
-				"eslint-scope": "^5.1.1",
-				"semver": "^7.3.7"
-			},
-			"dependencies": {
-				"@types/semver": {
-					"version": "7.5.0",
-					"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-					"integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-					"dev": true
-				},
-				"eslint-scope": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-					"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-					"dev": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^4.1.1"
-					}
-				}
-			}
-		},
-		"@typescript-eslint/visitor-keys": {
-			"version": "5.62.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-			"integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/types": "5.62.0",
-				"eslint-visitor-keys": "^3.3.0"
-			},
-			"dependencies": {
-				"eslint-visitor-keys": {
-					"version": "3.4.2",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-					"integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-					"dev": true
-				}
-			}
-		},
-		"@use-gesture/core": {
-			"version": "10.2.24",
-			"resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.24.tgz",
-			"integrity": "sha512-ZL7F9mgOn3Qlnp6QLI9jaOfcvqrx6JPE/BkdVSd8imveaFTm/a3udoO6f5Us/1XtqnL4347PsIiK6AtCvMHk2Q=="
-		},
-		"@use-gesture/react": {
-			"version": "10.2.24",
-			"resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.24.tgz",
-			"integrity": "sha512-rAZ8Nnpu1g4eFzqCPlaq+TppJpMy0dTpYOQx5KpfoBF4P3aWnCqwj7eKxcmdIb1NJKpIJj50DPugUH4mq5cpBg==",
-			"requires": {
-				"@use-gesture/core": "10.2.24"
-			}
-		},
-		"@wdio/config": {
-			"version": "8.16.20",
-			"resolved": "https://registry.npmjs.org/@wdio/config/-/config-8.16.20.tgz",
-			"integrity": "sha512-JFD7aYs3nGF2kNhc0eV03mWFQMJku42NCBl+aedb1jzP3z6tBWV3n1a0ETS4MTLps8lFXBDZWvWEnl+ZvVrHZw==",
-			"dev": true,
-			"requires": {
-				"@wdio/logger": "8.16.17",
-				"@wdio/types": "8.16.12",
-				"@wdio/utils": "8.16.17",
-				"decamelize": "^6.0.0",
-				"deepmerge-ts": "^5.0.0",
-				"glob": "^10.2.2",
-				"import-meta-resolve": "^3.0.0",
-				"read-pkg-up": "^10.0.0"
-			},
-			"dependencies": {
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"decamelize": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
-					"integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
-					"dev": true
-				},
-				"find-up": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
-					"integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^7.1.0",
-						"path-exists": "^5.0.0"
-					}
-				},
-				"foreground-child": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-					"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"signal-exit": "^4.0.1"
-					}
-				},
-				"glob": {
-					"version": "10.3.10",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-					"integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
-					"dev": true,
-					"requires": {
-						"foreground-child": "^3.1.0",
-						"jackspeak": "^2.3.5",
-						"minimatch": "^9.0.1",
-						"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-						"path-scurry": "^1.10.1"
-					}
-				},
-				"hosted-git-info": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz",
-					"integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^10.0.1"
-					}
-				},
-				"json-parse-even-better-errors": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
-					"integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==",
-					"dev": true
-				},
-				"lines-and-columns": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz",
-					"integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==",
-					"dev": true
-				},
-				"locate-path": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
-					"integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^6.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "10.0.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz",
-					"integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "9.0.3",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-					"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				},
-				"minipass": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-					"integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz",
-					"integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^7.0.0",
-						"is-core-module": "^2.8.1",
-						"semver": "^7.3.5",
-						"validate-npm-package-license": "^3.0.4"
-					}
-				},
-				"p-limit": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-					"integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-					"dev": true,
-					"requires": {
-						"yocto-queue": "^1.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
-					"integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^4.0.0"
-					}
-				},
-				"parse-json": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.0.tgz",
-					"integrity": "sha512-ihtdrgbqdONYD156Ap6qTcaGcGdkdAxodO1wLqQ/j7HP1u2sFYppINiq4jyC8F+Nm+4fVufylCV00QmkTHkSUg==",
-					"dev": true,
-					"requires": {
-						"@babel/code-frame": "^7.21.4",
-						"error-ex": "^1.3.2",
-						"json-parse-even-better-errors": "^3.0.0",
-						"lines-and-columns": "^2.0.3",
-						"type-fest": "^3.8.0"
-					},
-					"dependencies": {
-						"type-fest": {
-							"version": "3.13.1",
-							"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-							"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-							"dev": true
-						}
-					}
-				},
-				"path-exists": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-					"integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"read-pkg": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz",
-					"integrity": "sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==",
-					"dev": true,
-					"requires": {
-						"@types/normalize-package-data": "^2.4.1",
-						"normalize-package-data": "^6.0.0",
-						"parse-json": "^7.0.0",
-						"type-fest": "^4.2.0"
-					}
-				},
-				"read-pkg-up": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-10.1.0.tgz",
-					"integrity": "sha512-aNtBq4jR8NawpKJQldrQcSW9y/d+KWH4v24HWkHljOZ7H0av+YTGANBzRh9A5pw7v/bLVsLVPpOhJ7gHNVy8lA==",
-					"dev": true,
-					"requires": {
-						"find-up": "^6.3.0",
-						"read-pkg": "^8.1.0",
-						"type-fest": "^4.2.0"
-					}
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"signal-exit": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-					"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-					"dev": true
-				},
-				"type-fest": {
-					"version": "4.3.3",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.3.3.tgz",
-					"integrity": "sha512-bxhiFii6BBv6UiSDq7uKTMyADT9unXEl3ydGefndVLxFeB44LRbT4K7OJGDYSyDrKnklCC1Pre68qT2wbUl2Aw==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				},
-				"yocto-queue": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-					"integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-					"dev": true
-				}
-			}
-		},
-		"@wdio/logger": {
-			"version": "8.16.17",
-			"resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-8.16.17.tgz",
-			"integrity": "sha512-zeQ41z3T+b4IsrriZZipayXxLNDuGsm7TdExaviNGojPVrIsQUCSd/FvlLHM32b7ZrMyInHenu/zx1cjAZO71g==",
-			"dev": true,
-			"requires": {
-				"chalk": "^5.1.2",
-				"loglevel": "^1.6.0",
-				"loglevel-plugin-prefix": "^0.8.4",
-				"strip-ansi": "^7.1.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-					"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-					"integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-					"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^6.0.1"
-					}
-				}
-			}
-		},
-		"@wdio/protocols": {
-			"version": "8.16.5",
-			"resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.16.5.tgz",
-			"integrity": "sha512-u9I57hIqmcOgrDH327ZCc2GTXv2YFN5bg6UaA3OUoJU7eJgGYHFB6RrjiNjLXer68iIx07wwVM70V/1xzijd3Q==",
-			"dev": true
-		},
-		"@wdio/repl": {
-			"version": "8.10.1",
-			"resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-8.10.1.tgz",
-			"integrity": "sha512-VZ1WFHTNKjR8Ga97TtV2SZM6fvRjWbYI2i/f4pJB4PtusorKvONAMJf2LQcUBIyzbVobqr7KSrcjmSwRolI+yw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "^20.1.0"
-			},
-			"dependencies": {
-				"@types/node": {
-					"version": "20.8.2",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-					"integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-					"dev": true
-				}
-			}
-		},
-		"@wdio/types": {
-			"version": "8.16.12",
-			"resolved": "https://registry.npmjs.org/@wdio/types/-/types-8.16.12.tgz",
-			"integrity": "sha512-TjCZJ3P9ual21G0dRv0lC9QgHGd3Igv+guEINevBKf/oD4/N84PvQ2eZG1nSbZ3xh8X/dvi+O64A6VEv43gx2w==",
-			"dev": true,
-			"requires": {
-				"@types/node": "^20.1.0"
-			},
-			"dependencies": {
-				"@types/node": {
-					"version": "20.8.2",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-					"integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-					"dev": true
-				}
-			}
-		},
-		"@wdio/utils": {
-			"version": "8.16.17",
-			"resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-8.16.17.tgz",
-			"integrity": "sha512-jDyOrxbQRDJO0OPt9UBgnwpUIKqtRn4+R0gR5VSDrIG/in5ZZg28yer8urrIVY4yY9ut5r/22VaMHZI9LEXF5w==",
-			"dev": true,
-			"requires": {
-				"@puppeteer/browsers": "^1.6.0",
-				"@wdio/logger": "8.16.17",
-				"@wdio/types": "8.16.12",
-				"decamelize": "^6.0.0",
-				"deepmerge-ts": "^5.1.0",
-				"edgedriver": "^5.3.5",
-				"geckodriver": "^4.2.0",
-				"get-port": "^7.0.0",
-				"got": "^13.0.0",
-				"import-meta-resolve": "^3.0.0",
-				"locate-app": "^2.1.0",
-				"safaridriver": "^0.1.0",
-				"split2": "^4.2.0",
-				"wait-port": "^1.0.4"
-			},
-			"dependencies": {
-				"@puppeteer/browsers": {
-					"version": "1.7.1",
-					"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.7.1.tgz",
-					"integrity": "sha512-nIb8SOBgDEMFY2iS2MdnUZOg2ikcYchRrBoF+wtdjieRFKR2uGRipHY/oFLo+2N6anDualyClPzGywTHRGrLfw==",
-					"dev": true,
-					"requires": {
-						"debug": "4.3.4",
-						"extract-zip": "2.0.1",
-						"progress": "2.0.3",
-						"proxy-agent": "6.3.1",
-						"tar-fs": "3.0.4",
-						"unbzip2-stream": "1.4.3",
-						"yargs": "17.7.1"
-					}
-				},
-				"@sindresorhus/is": {
-					"version": "5.6.0",
-					"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
-					"integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
-					"dev": true
-				},
-				"@szmarczak/http-timer": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
-					"integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
-					"dev": true,
-					"requires": {
-						"defer-to-connect": "^2.0.1"
-					}
-				},
-				"agent-base": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-					"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.3.4"
-					}
-				},
-				"cacheable-lookup": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
-					"integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
-					"dev": true
-				},
-				"cacheable-request": {
-					"version": "10.2.14",
-					"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
-					"integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
-					"dev": true,
-					"requires": {
-						"@types/http-cache-semantics": "^4.0.2",
-						"get-stream": "^6.0.1",
-						"http-cache-semantics": "^4.1.1",
-						"keyv": "^4.5.3",
-						"mimic-response": "^4.0.0",
-						"normalize-url": "^8.0.0",
-						"responselike": "^3.0.0"
-					},
-					"dependencies": {
-						"get-stream": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-							"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-							"dev": true
-						}
-					}
-				},
-				"cliui": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.1",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"decamelize": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
-					"integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"extract-zip": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-					"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-					"dev": true,
-					"requires": {
-						"@types/yauzl": "^2.9.1",
-						"debug": "^4.1.1",
-						"get-stream": "^5.1.0",
-						"yauzl": "^2.10.0"
-					}
-				},
-				"get-port": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/get-port/-/get-port-7.0.0.tgz",
-					"integrity": "sha512-mDHFgApoQd+azgMdwylJrv2DX47ywGq1i5VFJE7fZ0dttNq3iQMfsU4IvEgBHojA3KqEudyu7Vq+oN8kNaNkWw==",
-					"dev": true
-				},
-				"got": {
-					"version": "13.0.0",
-					"resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz",
-					"integrity": "sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==",
-					"dev": true,
-					"requires": {
-						"@sindresorhus/is": "^5.2.0",
-						"@szmarczak/http-timer": "^5.0.1",
-						"cacheable-lookup": "^7.0.0",
-						"cacheable-request": "^10.2.8",
-						"decompress-response": "^6.0.0",
-						"form-data-encoder": "^2.1.2",
-						"get-stream": "^6.0.1",
-						"http2-wrapper": "^2.1.10",
-						"lowercase-keys": "^3.0.0",
-						"p-cancelable": "^3.0.0",
-						"responselike": "^3.0.0"
-					},
-					"dependencies": {
-						"get-stream": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-							"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-							"dev": true
-						}
-					}
-				},
-				"http-proxy-agent": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-					"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.1.0",
-						"debug": "^4.3.4"
-					}
-				},
-				"http2-wrapper": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz",
-					"integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==",
-					"dev": true,
-					"requires": {
-						"quick-lru": "^5.1.1",
-						"resolve-alpn": "^1.2.0"
-					}
-				},
-				"https-proxy-agent": {
-					"version": "7.0.2",
-					"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-					"integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.0.2",
-						"debug": "4"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"lowercase-keys": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
-					"integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
-					"dev": true
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"mimic-response": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
-					"integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
-					"dev": true
-				},
-				"normalize-url": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz",
-					"integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==",
-					"dev": true
-				},
-				"p-cancelable": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
-					"integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
-					"dev": true
-				},
-				"proxy-agent": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
-					"integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.0.2",
-						"debug": "^4.3.4",
-						"http-proxy-agent": "^7.0.0",
-						"https-proxy-agent": "^7.0.2",
-						"lru-cache": "^7.14.1",
-						"pac-proxy-agent": "^7.0.1",
-						"proxy-from-env": "^1.1.0",
-						"socks-proxy-agent": "^8.0.2"
-					}
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"quick-lru": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-					"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-					"dev": true
-				},
-				"responselike": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
-					"integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
-					"dev": true,
-					"requires": {
-						"lowercase-keys": "^3.0.0"
-					}
-				},
-				"socks-proxy-agent": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
-					"integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.0.2",
-						"debug": "^4.3.4",
-						"socks": "^2.7.1"
-					}
-				},
-				"split2": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
-					"integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"tar-fs": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
-					"integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
-					"dev": true,
-					"requires": {
-						"mkdirp-classic": "^0.5.2",
-						"pump": "^3.0.0",
-						"tar-stream": "^3.1.5"
-					}
-				},
-				"tar-stream": {
-					"version": "3.1.6",
-					"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-					"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
-					"dev": true,
-					"requires": {
-						"b4a": "^1.6.4",
-						"fast-fifo": "^1.2.0",
-						"streamx": "^2.15.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "17.7.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-					"integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-					"dev": true,
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-					"dev": true
-				}
-			}
-		},
-		"@webassemblyjs/ast": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-			"integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/helper-module-context": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/wast-parser": "1.9.0"
-			}
-		},
-		"@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-			"integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
-			"dev": true
-		},
-		"@webassemblyjs/helper-api-error": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-			"integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
-			"dev": true
-		},
-		"@webassemblyjs/helper-buffer": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-			"integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
-			"dev": true
-		},
-		"@webassemblyjs/helper-code-frame": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-			"integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/wast-printer": "1.9.0"
-			}
-		},
-		"@webassemblyjs/helper-fsm": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-			"integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-			"dev": true
-		},
-		"@webassemblyjs/helper-module-context": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-			"integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0"
-			}
-		},
-		"@webassemblyjs/helper-numbers": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-			"integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/floating-point-hex-parser": "1.11.6",
-				"@webassemblyjs/helper-api-error": "1.11.6",
-				"@xtuc/long": "4.2.2"
-			},
-			"dependencies": {
-				"@webassemblyjs/floating-point-hex-parser": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-					"integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-					"dev": true
-				},
-				"@webassemblyjs/helper-api-error": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-					"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-					"dev": true
-				}
-			}
-		},
-		"@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-			"integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
-			"dev": true
-		},
-		"@webassemblyjs/helper-wasm-section": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-			"integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-buffer": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/wasm-gen": "1.9.0"
-			}
-		},
-		"@webassemblyjs/ieee754": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-			"integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
-			"dev": true,
-			"requires": {
-				"@xtuc/ieee754": "^1.2.0"
-			}
-		},
-		"@webassemblyjs/leb128": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-			"integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
-			"dev": true,
-			"requires": {
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"@webassemblyjs/utf8": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-			"integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
-			"dev": true
-		},
-		"@webassemblyjs/wasm-edit": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-			"integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-buffer": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/helper-wasm-section": "1.9.0",
-				"@webassemblyjs/wasm-gen": "1.9.0",
-				"@webassemblyjs/wasm-opt": "1.9.0",
-				"@webassemblyjs/wasm-parser": "1.9.0",
-				"@webassemblyjs/wast-printer": "1.9.0"
-			}
-		},
-		"@webassemblyjs/wasm-gen": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-			"integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/ieee754": "1.9.0",
-				"@webassemblyjs/leb128": "1.9.0",
-				"@webassemblyjs/utf8": "1.9.0"
-			}
-		},
-		"@webassemblyjs/wasm-opt": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-			"integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-buffer": "1.9.0",
-				"@webassemblyjs/wasm-gen": "1.9.0",
-				"@webassemblyjs/wasm-parser": "1.9.0"
-			}
-		},
-		"@webassemblyjs/wasm-parser": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-			"integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/helper-api-error": "1.9.0",
-				"@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-				"@webassemblyjs/ieee754": "1.9.0",
-				"@webassemblyjs/leb128": "1.9.0",
-				"@webassemblyjs/utf8": "1.9.0"
-			}
-		},
-		"@webassemblyjs/wast-parser": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-			"integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/floating-point-hex-parser": "1.9.0",
-				"@webassemblyjs/helper-api-error": "1.9.0",
-				"@webassemblyjs/helper-code-frame": "1.9.0",
-				"@webassemblyjs/helper-fsm": "1.9.0",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"@webassemblyjs/wast-printer": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-			"integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.9.0",
-				"@webassemblyjs/wast-parser": "1.9.0",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"@webpack-cli/configtest": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
-			"integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
-			"dev": true
-		},
-		"@webpack-cli/info": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
-			"integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
-			"dev": true
-		},
-		"@webpack-cli/serve": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
-			"integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
-			"dev": true
-		},
-		"@wordpress/a11y": {
-			"version": "file:packages/a11y",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/dom-ready": "file:../dom-ready",
-				"@wordpress/i18n": "file:../i18n"
-			}
-		},
-		"@wordpress/annotations": {
-			"version": "file:packages/annotations",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/data": "file:../data",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/rich-text": "file:../rich-text",
-				"rememo": "^4.0.2",
-				"uuid": "^9.0.1"
-			},
-			"dependencies": {
-				"uuid": {
-					"version": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-				}
-			}
-		},
-		"@wordpress/api-fetch": {
-			"version": "file:packages/api-fetch",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/url": "file:../url"
-			}
-		},
-		"@wordpress/autop": {
-			"version": "file:packages/autop",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/babel-plugin-import-jsx-pragma": {
-			"version": "file:packages/babel-plugin-import-jsx-pragma"
-		},
-		"@wordpress/babel-plugin-makepot": {
-			"version": "file:packages/babel-plugin-makepot",
-			"requires": {
-				"deepmerge": "^4.3.0",
-				"gettext-parser": "^1.3.1",
-				"is-plain-object": "^5.0.0"
-			}
-		},
-		"@wordpress/babel-preset-default": {
-			"version": "file:packages/babel-preset-default",
-			"requires": {
-				"@babel/core": "^7.16.0",
-				"@babel/plugin-transform-react-jsx": "^7.16.0",
-				"@babel/plugin-transform-runtime": "^7.16.0",
-				"@babel/preset-env": "^7.16.0",
-				"@babel/preset-typescript": "^7.16.0",
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/babel-plugin-import-jsx-pragma": "file:../babel-plugin-import-jsx-pragma",
-				"@wordpress/browserslist-config": "file:../browserslist-config",
-				"@wordpress/warning": "file:../warning",
-				"browserslist": "^4.21.10",
-				"core-js": "^3.31.0",
-				"react": "^18.2.0"
-			}
-		},
-		"@wordpress/base-styles": {
-			"version": "file:packages/base-styles"
-		},
-		"@wordpress/blob": {
-			"version": "file:packages/blob",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/block-directory": {
-			"version": "file:packages/block-directory",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/edit-post": "file:../edit-post",
-				"@wordpress/editor": "file:../editor",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url",
-				"change-case": "^4.1.2"
-			}
-		},
-		"@wordpress/block-editor": {
-			"version": "file:packages/block-editor",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@emotion/react": "^11.7.1",
-				"@emotion/styled": "^11.6.0",
-				"@react-spring/web": "^9.4.5",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/style-engine": "file:../style-engine",
-				"@wordpress/token-list": "file:../token-list",
-				"@wordpress/url": "file:../url",
-				"@wordpress/warning": "file:../warning",
-				"@wordpress/wordcount": "file:../wordcount",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.7.0",
-				"deepmerge": "^4.3.0",
-				"diff": "^4.0.2",
-				"dom-scroll-into-view": "^1.2.1",
-				"fast-deep-equal": "^3.1.3",
-				"memize": "^2.1.0",
-				"postcss": "^8.4.21",
-				"postcss-prefixwrap": "^1.41.0",
-				"postcss-urlrebase": "^1.0.0",
-				"react-autosize-textarea": "^7.1.0",
-				"react-easy-crop": "^4.5.1",
-				"rememo": "^4.0.2",
-				"remove-accents": "^0.5.0"
-			},
-			"dependencies": {
-				"postcss": {
-					"version": "8.4.30",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
-					"integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
-					"requires": {
-						"nanoid": "^3.3.6",
-						"picocolors": "^1.0.0",
-						"source-map-js": "^1.0.2"
-					}
-				},
-				"source-map-js": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-					"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
-				}
-			}
-		},
-		"@wordpress/block-library": {
-			"version": "file:packages/block-library",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/autop": "file:../autop",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interactivity": "file:../interactivity",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/primitives": "file:../primitives",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/reusable-blocks": "file:../reusable-blocks",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/server-side-render": "file:../server-side-render",
-				"@wordpress/url": "file:../url",
-				"@wordpress/viewport": "file:../viewport",
-				"@wordpress/wordcount": "file:../wordcount",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.7.0",
-				"escape-html": "^1.0.3",
-				"fast-average-color": "^9.1.1",
-				"fast-deep-equal": "^3.1.3",
-				"memize": "^2.1.0",
-				"remove-accents": "^0.5.0",
-				"uuid": "^9.0.1"
-			},
-			"dependencies": {
-				"uuid": {
-					"version": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-				}
-			}
-		},
-		"@wordpress/block-serialization-default-parser": {
-			"version": "file:packages/block-serialization-default-parser",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/block-serialization-spec-parser": {
-			"version": "file:packages/block-serialization-spec-parser",
-			"requires": {
-				"pegjs": "^0.10.0",
-				"phpegjs": "^1.0.0-beta7"
-			}
-		},
-		"@wordpress/blocks": {
-			"version": "file:packages/blocks",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/autop": "file:../autop",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/block-serialization-default-parser": "file:../block-serialization-default-parser",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/shortcode": "file:../shortcode",
-				"change-case": "^4.1.2",
-				"colord": "^2.7.0",
-				"fast-deep-equal": "^3.1.3",
-				"hpq": "^1.3.0",
-				"is-plain-object": "^5.0.0",
-				"memize": "^2.1.0",
-				"rememo": "^4.0.2",
-				"remove-accents": "^0.5.0",
-				"showdown": "^1.9.1",
-				"simple-html-tokenizer": "^0.5.7",
-				"uuid": "^9.0.1"
-			},
-			"dependencies": {
-				"uuid": {
-					"version": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-				}
-			}
-		},
-		"@wordpress/browserslist-config": {
-			"version": "file:packages/browserslist-config"
-		},
-		"@wordpress/commands": {
-			"version": "file:packages/commands",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/components": "file:../components",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/private-apis": "file:../private-apis",
-				"classnames": "^2.3.1",
-				"cmdk": "^0.2.0",
-				"rememo": "^4.0.2"
-			}
-		},
-		"@wordpress/components": {
-			"version": "file:packages/components",
-			"requires": {
-				"@ariakit/react": "^0.3.5",
-				"@babel/runtime": "^7.16.0",
-				"@emotion/cache": "^11.7.1",
-				"@emotion/css": "^11.7.1",
-				"@emotion/react": "^11.7.1",
-				"@emotion/serialize": "^1.0.2",
-				"@emotion/styled": "^11.6.0",
-				"@emotion/utils": "^1.0.0",
-				"@floating-ui/react-dom": "^2.0.1",
-				"@radix-ui/react-dropdown-menu": "2.0.4",
-				"@types/gradient-parser": "0.1.3",
-				"@types/highlight-words-core": "1.2.1",
-				"@use-gesture/react": "^10.2.24",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/primitives": "file:../primitives",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/warning": "file:../warning",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.7.0",
-				"date-fns": "^2.28.0",
-				"deepmerge": "^4.3.0",
-				"dom-scroll-into-view": "^1.2.1",
-				"downshift": "^6.0.15",
-				"fast-deep-equal": "^3.1.3",
-				"framer-motion": "^10.13.0",
-				"gradient-parser": "^0.1.5",
-				"highlight-words-core": "^1.2.2",
-				"is-plain-object": "^5.0.0",
-				"memize": "^2.1.0",
-				"path-to-regexp": "^6.2.1",
-				"re-resizable": "^6.4.0",
-				"react-colorful": "^5.3.1",
-				"reakit": "^1.3.11",
-				"remove-accents": "^0.5.0",
-				"use-lilius": "^2.0.1",
-				"uuid": "^9.0.1",
-				"valtio": "1.7.0"
-			},
-			"dependencies": {
-				"@floating-ui/react-dom": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.1.tgz",
-					"integrity": "sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==",
-					"requires": {
-						"@floating-ui/dom": "^1.3.0"
-					}
-				},
-				"@types/gradient-parser": {
-					"version": "0.1.3",
-					"resolved": "https://registry.npmjs.org/@types/gradient-parser/-/gradient-parser-0.1.3.tgz",
-					"integrity": "sha512-XDbrTSBlQV9nxE1GiDL3FaOPy4G/KaJkhDutBX48Kg8CYZMBARyyDFGCWfWJn4pobmInmwud1xxH7VJMAr0CKQ=="
-				},
-				"framer-motion": {
-					"version": "10.13.0",
-					"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.13.0.tgz",
-					"integrity": "sha512-xKhw9VCizmwEHbopOfluaoVunGHSZyMztGbTvsgOYqCjaKu6qtlwWY1J+6GhL41NY1P157JgEikjDm67XCFnvQ==",
-					"requires": {
-						"@emotion/is-prop-valid": "^0.8.2",
-						"tslib": "^2.4.0"
-					}
-				},
-				"path-to-regexp": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
-					"integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
-				},
-				"uuid": {
-					"version": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-				}
-			}
-		},
-		"@wordpress/compose": {
-			"version": "file:packages/compose",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@types/mousetrap": "^1.6.8",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/priority-queue": "file:../priority-queue",
-				"@wordpress/undo-manager": "file:../undo-manager",
-				"change-case": "^4.1.2",
-				"clipboard": "^2.0.8",
-				"mousetrap": "^1.6.5",
-				"use-memo-one": "^1.1.1"
-			}
-		},
-		"@wordpress/core-commands": {
-			"version": "file:packages/core-commands",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/router": "file:../router",
-				"@wordpress/url": "file:../url"
-			}
-		},
-		"@wordpress/core-data": {
-			"version": "file:packages/core-data",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/sync": "file:../sync",
-				"@wordpress/undo-manager": "file:../undo-manager",
-				"@wordpress/url": "file:../url",
-				"change-case": "^4.1.2",
-				"equivalent-key-map": "^0.2.2",
-				"fast-deep-equal": "^3.1.3",
-				"memize": "^2.1.0",
-				"rememo": "^4.0.2",
-				"uuid": "^9.0.1"
-			},
-			"dependencies": {
-				"uuid": {
-					"version": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-				}
-			}
-		},
-		"@wordpress/create-block": {
-			"version": "file:packages/create-block",
-			"requires": {
-				"@wordpress/lazy-import": "file:../lazy-import",
-				"chalk": "^4.0.0",
-				"change-case": "^4.1.2",
-				"check-node-version": "^4.1.0",
-				"commander": "^9.2.0",
-				"execa": "^4.0.2",
-				"fast-glob": "^3.2.7",
-				"inquirer": "^7.1.0",
-				"make-dir": "^3.0.0",
-				"mustache": "^4.0.0",
-				"npm-package-arg": "^8.1.5",
-				"rimraf": "^3.0.2",
-				"write-pkg": "^4.0.0"
-			}
-		},
-		"@wordpress/create-block-tutorial-template": {
-			"version": "file:packages/create-block-tutorial-template"
-		},
-		"@wordpress/customize-widgets": {
-			"version": "file:packages/customize-widgets",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interface": "file:../interface",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/widgets": "file:../widgets",
-				"classnames": "^2.3.1",
-				"fast-deep-equal": "^3.1.3"
-			}
-		},
-		"@wordpress/data": {
-			"version": "file:packages/data",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"@wordpress/priority-queue": "file:../priority-queue",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/redux-routine": "file:../redux-routine",
-				"deepmerge": "^4.3.0",
-				"equivalent-key-map": "^0.2.2",
-				"is-plain-object": "^5.0.0",
-				"is-promise": "^4.0.0",
-				"redux": "^4.1.2",
-				"rememo": "^4.0.2",
-				"use-memo-one": "^1.1.1"
-			}
-		},
-		"@wordpress/data-controls": {
-			"version": "file:packages/data-controls",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated"
-			}
-		},
-		"@wordpress/dataviews": {
-			"version": "file:packages/dataviews",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@tanstack/react-table": "^8.10.3",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/private-apis": "file:../private-apis",
-				"classnames": "^2.3.1",
-				"remove-accents": "^0.5.0"
-			}
-		},
-		"@wordpress/date": {
-			"version": "file:packages/date",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/deprecated": "file:../deprecated",
-				"moment": "^2.29.4",
-				"moment-timezone": "^0.5.40"
-			}
-		},
-		"@wordpress/dependency-extraction-webpack-plugin": {
-			"version": "file:packages/dependency-extraction-webpack-plugin",
-			"requires": {
-				"json2php": "^0.0.7",
-				"webpack-sources": "^3.2.2"
-			}
-		},
-		"@wordpress/deprecated": {
-			"version": "file:packages/deprecated",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "file:../hooks"
-			}
-		},
-		"@wordpress/docgen": {
-			"version": "file:packages/docgen",
-			"requires": {
-				"@babel/core": "^7.16.0",
-				"comment-parser": "^1.1.1",
-				"mdast-util-inject": "1.1.0",
-				"optionator": "0.8.2",
-				"remark": "10.0.1",
-				"remark-parse": "6.0.3",
-				"unified": "7.1.0"
-			}
-		},
-		"@wordpress/dom": {
-			"version": "file:packages/dom",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/deprecated": "file:../deprecated"
-			}
-		},
-		"@wordpress/dom-ready": {
-			"version": "file:packages/dom-ready",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/e2e-test-utils": {
-			"version": "file:packages/e2e-test-utils",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/url": "file:../url",
-				"change-case": "^4.1.2",
-				"form-data": "^4.0.0",
-				"node-fetch": "^2.6.0"
-			}
-		},
-		"@wordpress/e2e-test-utils-playwright": {
-			"version": "file:packages/e2e-test-utils-playwright",
-			"requires": {
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/url": "file:../url",
-				"change-case": "^4.1.2",
-				"form-data": "^4.0.0",
-				"get-port": "^5.1.1",
-				"lighthouse": "^10.4.0",
-				"mime": "^3.0.0",
-				"web-vitals": "^3.5.0"
-			}
-		},
-		"@wordpress/e2e-tests": {
-			"version": "file:packages/e2e-tests",
-			"requires": {
-				"@wordpress/e2e-test-utils": "file:../e2e-test-utils",
-				"@wordpress/interactivity": "file:../interactivity",
-				"@wordpress/jest-console": "file:../jest-console",
-				"@wordpress/jest-puppeteer-axe": "file:../jest-puppeteer-axe",
-				"@wordpress/scripts": "file:../scripts",
-				"@wordpress/url": "file:../url",
-				"chalk": "^4.0.0",
-				"expect-puppeteer": "^4.4.0",
-				"filenamify": "^4.2.0",
-				"jest-message-util": "^29.6.2",
-				"jest-snapshot": "^29.6.2",
-				"puppeteer-testing-library": "^0.5.0",
-				"uuid": "^9.0.1"
-			},
-			"dependencies": {
-				"uuid": {
-					"version": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-					"dev": true
-				}
-			}
-		},
-		"@wordpress/edit-post": {
-			"version": "file:packages/edit-post",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-commands": "file:../core-commands",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/editor": "file:../editor",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interface": "file:../interface",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url",
-				"@wordpress/viewport": "file:../viewport",
-				"@wordpress/warning": "file:../warning",
-				"@wordpress/widgets": "file:../widgets",
-				"classnames": "^2.3.1",
-				"memize": "^2.1.0",
-				"rememo": "^4.0.2"
-			}
-		},
-		"@wordpress/edit-site": {
-			"version": "file:packages/edit-site",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-commands": "file:../core-commands",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/dataviews": "file:../dataviews",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/editor": "file:../editor",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interface": "file:../interface",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/patterns": "file:../patterns",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/primitives": "file:../primitives",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/reusable-blocks": "file:../reusable-blocks",
-				"@wordpress/router": "file:../router",
-				"@wordpress/style-engine": "file:../style-engine",
-				"@wordpress/url": "file:../url",
-				"@wordpress/viewport": "file:../viewport",
-				"@wordpress/widgets": "file:../widgets",
-				"@wordpress/wordcount": "file:../wordcount",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.9.2",
-				"deepmerge": "^4.3.0",
-				"fast-deep-equal": "^3.1.3",
-				"is-plain-object": "^5.0.0",
-				"memize": "^2.1.0",
-				"react-autosize-textarea": "^7.1.0",
-				"rememo": "^4.0.2",
-				"remove-accents": "^0.5.0"
-			}
-		},
-		"@wordpress/edit-widgets": {
-			"version": "file:packages/edit-widgets",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/interface": "file:../interface",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/patterns": "file:../patterns",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/reusable-blocks": "file:../reusable-blocks",
-				"@wordpress/url": "file:../url",
-				"@wordpress/widgets": "file:../widgets",
-				"classnames": "^2.3.1"
-			}
-		},
-		"@wordpress/editor": {
-			"version": "file:packages/editor",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/commands": "file:../commands",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/date": "file:../date",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/dom": "file:../dom",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-				"@wordpress/keycodes": "file:../keycodes",
-				"@wordpress/media-utils": "file:../media-utils",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/patterns": "file:../patterns",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/reusable-blocks": "file:../reusable-blocks",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/server-side-render": "file:../server-side-render",
-				"@wordpress/url": "file:../url",
-				"@wordpress/wordcount": "file:../wordcount",
-				"classnames": "^2.3.1",
-				"date-fns": "^2.28.0",
-				"memize": "^2.1.0",
-				"react-autosize-textarea": "^7.1.0",
-				"rememo": "^4.0.2",
-				"remove-accents": "^0.5.0"
-			}
-		},
-		"@wordpress/element": {
-			"version": "file:packages/element",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@types/react": "^18.0.21",
-				"@types/react-dom": "^18.0.6",
-				"@wordpress/escape-html": "file:../escape-html",
-				"change-case": "^4.1.2",
-				"is-plain-object": "^5.0.0",
-				"react": "^18.2.0",
-				"react-dom": "^18.2.0"
-			}
-		},
-		"@wordpress/env": {
-			"version": "file:packages/env",
-			"requires": {
-				"chalk": "^4.0.0",
-				"copy-dir": "^1.3.0",
-				"docker-compose": "^0.24.3",
-				"extract-zip": "^1.6.7",
-				"got": "^11.8.5",
-				"inquirer": "^7.1.0",
-				"js-yaml": "^3.13.1",
-				"ora": "^4.0.2",
-				"rimraf": "^3.0.2",
-				"simple-git": "^3.5.0",
-				"terminal-link": "^2.0.0",
-				"yargs": "^17.3.0"
-			},
-			"dependencies": {
-				"cliui": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.1",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"docker-compose": {
-					"version": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.2.tgz",
-					"integrity": "sha512-2/WLvA7UZ6A2LDLQrYW0idKipmNBWhtfvrn2yzjC5PnHDzuFVj1zAZN6MJxVMKP0zZH8uzAK6OwVZYHGuyCmTw==",
-					"dev": true,
-					"requires": {
-						"yaml": "^2.2.2"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yaml": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz",
-					"integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "17.7.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-					"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-					"dev": true,
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-					"dev": true
-				}
-			}
-		},
-		"@wordpress/escape-html": {
-			"version": "file:packages/escape-html",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/eslint-plugin": {
-			"version": "file:packages/eslint-plugin",
-			"requires": {
-				"@babel/eslint-parser": "^7.16.0",
-				"@typescript-eslint/eslint-plugin": "^6.4.1",
-				"@typescript-eslint/parser": "^6.4.1",
-				"@wordpress/babel-preset-default": "file:../babel-preset-default",
-				"@wordpress/prettier-config": "file:../prettier-config",
-				"cosmiconfig": "^7.0.0",
-				"eslint-config-prettier": "^8.3.0",
-				"eslint-plugin-import": "^2.25.2",
-				"eslint-plugin-jest": "^27.2.3",
-				"eslint-plugin-jsdoc": "^46.4.6",
-				"eslint-plugin-jsx-a11y": "^6.5.1",
-				"eslint-plugin-playwright": "^0.15.3",
-				"eslint-plugin-prettier": "^5.0.0",
-				"eslint-plugin-react": "^7.27.0",
-				"eslint-plugin-react-hooks": "^4.3.0",
-				"globals": "^13.12.0",
-				"requireindex": "^1.2.0"
-			}
-		},
-		"@wordpress/format-library": {
-			"version": "file:packages/format-library",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/rich-text": "file:../rich-text",
-				"@wordpress/url": "file:../url"
-			}
-		},
-		"@wordpress/hooks": {
-			"version": "file:packages/hooks",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/html-entities": {
-			"version": "file:packages/html-entities",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/i18n": {
-			"version": "file:packages/i18n",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "file:../hooks",
-				"gettext-parser": "^1.3.1",
-				"memize": "^2.1.0",
-				"sprintf-js": "^1.1.1",
-				"tannin": "^1.2.0"
-			}
-		},
-		"@wordpress/icons": {
-			"version": "file:packages/icons",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "file:../element",
-				"@wordpress/primitives": "file:../primitives"
-			}
-		},
-		"@wordpress/interactivity": {
-			"version": "file:packages/interactivity",
-			"requires": {
-				"@preact/signals": "^1.1.3",
-				"deepsignal": "^1.3.6",
-				"preact": "^10.13.2"
-			}
-		},
-		"@wordpress/interface": {
-			"version": "file:packages/interface",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/plugins": "file:../plugins",
-				"@wordpress/preferences": "file:../preferences",
-				"@wordpress/viewport": "file:../viewport",
-				"classnames": "^2.3.1"
-			}
-		},
-		"@wordpress/is-shallow-equal": {
-			"version": "file:packages/is-shallow-equal",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/jest-console": {
-			"version": "file:packages/jest-console",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"jest-matcher-utils": "^29.6.2"
-			}
-		},
-		"@wordpress/jest-preset-default": {
-			"version": "file:packages/jest-preset-default",
-			"requires": {
-				"@wordpress/jest-console": "file:../jest-console",
-				"babel-jest": "^29.6.2"
-			}
-		},
-		"@wordpress/jest-puppeteer-axe": {
-			"version": "file:packages/jest-puppeteer-axe",
-			"requires": {
-				"@axe-core/puppeteer": "^4.0.0",
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/keyboard-shortcuts": {
-			"version": "file:packages/keyboard-shortcuts",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/keycodes": "file:../keycodes",
-				"rememo": "^4.0.2"
-			}
-		},
-		"@wordpress/keycodes": {
-			"version": "file:packages/keycodes",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/i18n": "file:../i18n",
-				"change-case": "^4.1.2"
-			}
-		},
-		"@wordpress/lazy-import": {
-			"version": "file:packages/lazy-import",
-			"requires": {
-				"execa": "^4.0.2",
-				"npm-package-arg": "^8.1.5",
-				"semver": "^7.3.5"
-			}
-		},
-		"@wordpress/list-reusable-blocks": {
-			"version": "file:packages/list-reusable-blocks",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"change-case": "^4.1.2"
-			}
-		},
-		"@wordpress/media-utils": {
-			"version": "file:packages/media-utils",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blob": "file:../blob",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n"
-			}
-		},
-		"@wordpress/notices": {
-			"version": "file:packages/notices",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/data": "file:../data"
-			}
-		},
-		"@wordpress/npm-package-json-lint-config": {
-			"version": "file:packages/npm-package-json-lint-config"
-		},
-		"@wordpress/nux": {
-			"version": "file:packages/nux",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"rememo": "^4.0.2"
-			}
-		},
-		"@wordpress/patterns": {
-			"version": "file:packages/patterns",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/html-entities": "file:../html-entities",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url",
-				"nanoid": "^3.3.4"
-			}
-		},
-		"@wordpress/plugins": {
-			"version": "file:packages/plugins",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-				"memize": "^2.0.1"
-			}
-		},
-		"@wordpress/postcss-plugins-preset": {
-			"version": "file:packages/postcss-plugins-preset",
-			"requires": {
-				"@wordpress/base-styles": "file:../base-styles",
-				"autoprefixer": "^10.2.5"
-			}
-		},
-		"@wordpress/postcss-themes": {
-			"version": "file:packages/postcss-themes"
-		},
-		"@wordpress/preferences": {
-			"version": "file:packages/preferences",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/components": "file:../components",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"classnames": "^2.3.1"
-			}
-		},
-		"@wordpress/preferences-persistence": {
-			"version": "file:packages/preferences-persistence",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch"
-			}
-		},
-		"@wordpress/prettier-config": {
-			"version": "file:packages/prettier-config"
-		},
-		"@wordpress/primitives": {
-			"version": "file:packages/primitives",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "file:../element",
-				"classnames": "^2.3.1"
-			}
-		},
-		"@wordpress/priority-queue": {
-			"version": "file:packages/priority-queue",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"requestidlecallback": "^0.3.0"
-			}
-		},
-		"@wordpress/private-apis": {
-			"version": "file:packages/private-apis",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/project-management-automation": {
-			"version": "file:packages/project-management-automation",
-			"requires": {
-				"@actions/core": "1.9.1",
-				"@actions/github": "^5.0.0",
-				"@babel/runtime": "^7.16.0",
-				"@octokit/request-error": "^2.1.0",
-				"@octokit/webhooks": "7.1.0"
-			}
-		},
-		"@wordpress/react-i18n": {
-			"version": "file:packages/react-i18n",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"utility-types": "^3.10.0"
-			}
-		},
-		"@wordpress/react-native-aztec": {
-			"version": "file:packages/react-native-aztec",
-			"requires": {
-				"@wordpress/element": "file:../element",
-				"@wordpress/keycodes": "file:../keycodes"
-			}
-		},
-		"@wordpress/react-native-bridge": {
-			"version": "file:packages/react-native-bridge",
-			"requires": {
-				"@wordpress/react-native-aztec": "file:../react-native-aztec"
-			}
-		},
-		"@wordpress/react-native-editor": {
-			"version": "file:packages/react-native-editor",
-			"requires": {
-				"@babel/runtime": "^7.20.0",
-				"@react-native-clipboard/clipboard": "1.11.2",
-				"@react-native-community/blur": "4.2.0",
-				"@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz",
-				"@react-native-masked-view/masked-view": "0.2.9",
-				"@react-native/gradle-plugin": "0.72.11",
-				"@react-navigation/core": "5.12.0",
-				"@react-navigation/native": "6.0.14",
-				"@react-navigation/routers": "5.4.9",
-				"@react-navigation/stack": "6.3.5",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/block-library": "file:../block-library",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/data": "file:../data",
-				"@wordpress/edit-post": "file:../edit-post",
-				"@wordpress/element": "file:../element",
-				"@wordpress/hooks": "file:../hooks",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/react-native-aztec": "file:../react-native-aztec",
-				"@wordpress/react-native-bridge": "file:../react-native-bridge",
-				"core-js": "^3.31.0",
-				"fast-average-color": "^9.1.1",
-				"gettext-parser": "^1.3.1",
-				"jed": "^1.1.1",
-				"jsdom-jscore-rn": "0.1.8",
-				"node-fetch": "^2.6.0",
-				"react-native": "0.71.11",
-				"react-native-fast-image": "8.5.11",
-				"react-native-gesture-handler": "2.10.2",
-				"react-native-get-random-values": "1.4.0",
-				"react-native-linear-gradient": "2.7.3",
-				"react-native-modal": "13.0.1",
-				"react-native-reanimated": "2.17.0",
-				"react-native-safe-area": "^0.5.0",
-				"react-native-safe-area-context": "4.6.3",
-				"react-native-sass-transformer": "^1.1.1",
-				"react-native-screens": "3.22.0",
-				"react-native-svg": "13.9.0",
-				"react-native-url-polyfill": "1.3.0",
-				"react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz",
-				"react-native-webview": "11.26.1"
-			},
-			"dependencies": {
-				"buffer": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-					"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-					"requires": {
-						"base64-js": "^1.3.1",
-						"ieee754": "^1.1.13"
-					}
-				},
-				"react-native-url-polyfill": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz",
-					"integrity": "sha512-w9JfSkvpqqlix9UjDvJjm1EjSt652zVQ6iwCIj1cVVkwXf4jQhQgTNXY6EVTwuAmUjg6BC6k9RHCBynoLFo3IQ==",
-					"requires": {
-						"whatwg-url-without-unicode": "8.0.0-3"
-					}
-				},
-				"webidl-conversions": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="
-				},
-				"whatwg-url-without-unicode": {
-					"version": "8.0.0-3",
-					"resolved": "https://registry.npmjs.org/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-3.tgz",
-					"integrity": "sha512-HoKuzZrUlgpz35YO27XgD28uh/WJH4B0+3ttFqRo//lmq+9T/mIOJ6kqmINI9HpUpz1imRC/nR/lxKpJiv0uig==",
-					"requires": {
-						"buffer": "^5.4.3",
-						"punycode": "^2.1.1",
-						"webidl-conversions": "^5.0.0"
-					}
-				}
-			}
-		},
-		"@wordpress/readable-js-assets-webpack-plugin": {
-			"version": "file:packages/readable-js-assets-webpack-plugin"
-		},
-		"@wordpress/redux-routine": {
-			"version": "file:packages/redux-routine",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"is-plain-object": "^5.0.0",
-				"is-promise": "^4.0.0",
-				"rungen": "^0.3.2"
-			}
-		},
-		"@wordpress/report-flaky-tests": {
-			"version": "file:packages/report-flaky-tests",
-			"requires": {
-				"@actions/core": "^1.8.0",
-				"@actions/github": "^5.0.1",
-				"jest-message-util": "^29.6.2"
-			},
-			"dependencies": {
-				"@actions/github": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
-					"integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
-					"dev": true,
-					"requires": {
-						"@actions/http-client": "^2.0.1",
-						"@octokit/core": "^3.6.0",
-						"@octokit/plugin-paginate-rest": "^2.17.0",
-						"@octokit/plugin-rest-endpoint-methods": "^5.13.0"
-					}
-				}
-			}
-		},
-		"@wordpress/reusable-blocks": {
-			"version": "file:packages/reusable-blocks",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/notices": "file:../notices",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url"
-			}
-		},
-		"@wordpress/rich-text": {
-			"version": "file:packages/rich-text",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "file:../a11y",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/escape-html": "file:../escape-html",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/keycodes": "file:../keycodes",
-				"memize": "^2.1.0",
-				"rememo": "^4.0.2"
-			}
-		},
-		"@wordpress/router": {
-			"version": "file:packages/router",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "file:../element",
-				"@wordpress/private-apis": "file:../private-apis",
-				"@wordpress/url": "file:../url",
-				"history": "^5.1.0"
-			}
-		},
-		"@wordpress/scripts": {
-			"version": "file:packages/scripts",
-			"requires": {
-				"@babel/core": "^7.16.0",
-				"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
-				"@svgr/webpack": "^8.0.1",
-				"@wordpress/babel-preset-default": "file:../babel-preset-default",
-				"@wordpress/browserslist-config": "file:../browserslist-config",
-				"@wordpress/dependency-extraction-webpack-plugin": "file:../dependency-extraction-webpack-plugin",
-				"@wordpress/e2e-test-utils-playwright": "file:../e2e-test-utils-playwright",
-				"@wordpress/eslint-plugin": "file:../eslint-plugin",
-				"@wordpress/jest-preset-default": "file:../jest-preset-default",
-				"@wordpress/npm-package-json-lint-config": "file:../npm-package-json-lint-config",
-				"@wordpress/postcss-plugins-preset": "file:../postcss-plugins-preset",
-				"@wordpress/prettier-config": "file:../prettier-config",
-				"@wordpress/stylelint-config": "file:../stylelint-config",
-				"adm-zip": "^0.5.9",
-				"babel-jest": "^29.6.2",
-				"babel-loader": "^8.2.3",
-				"browserslist": "^4.21.10",
-				"chalk": "^4.0.0",
-				"check-node-version": "^4.1.0",
-				"clean-webpack-plugin": "^3.0.0",
-				"copy-webpack-plugin": "^10.2.0",
-				"cross-spawn": "^5.1.0",
-				"css-loader": "^6.2.0",
-				"cssnano": "^6.0.1",
-				"cwd": "^0.10.0",
-				"dir-glob": "^3.0.1",
-				"eslint": "^8.3.0",
-				"expect-puppeteer": "^4.4.0",
-				"fast-glob": "^3.2.7",
-				"filenamify": "^4.2.0",
-				"jest": "^29.6.2",
-				"jest-dev-server": "^9.0.1",
-				"jest-environment-jsdom": "^29.6.2",
-				"jest-environment-node": "^29.6.2",
-				"markdownlint-cli": "^0.31.1",
-				"merge-deep": "^3.0.3",
-				"mini-css-extract-plugin": "^2.5.1",
-				"minimist": "^1.2.0",
-				"npm-package-json-lint": "^6.4.0",
-				"npm-packlist": "^3.0.0",
-				"playwright-core": "1.39.0",
-				"postcss": "^8.4.5",
-				"postcss-loader": "^6.2.1",
-				"prettier": "npm:wp-prettier@3.0.3",
-				"puppeteer-core": "^13.2.0",
-				"react-refresh": "^0.14.0",
-				"read-pkg-up": "^7.0.1",
-				"resolve-bin": "^0.4.0",
-				"sass": "^1.35.2",
-				"sass-loader": "^12.1.0",
-				"source-map-loader": "^3.0.0",
-				"stylelint": "^14.2.0",
-				"terser-webpack-plugin": "^5.3.9",
-				"url-loader": "^4.1.1",
-				"webpack": "^5.88.2",
-				"webpack-bundle-analyzer": "^4.9.1",
-				"webpack-cli": "^5.1.4",
-				"webpack-dev-server": "^4.15.1"
-			},
-			"dependencies": {
-				"axios": {
-					"version": "1.6.2",
-					"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-					"integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
-					"dev": true,
-					"requires": {
-						"follow-redirects": "^1.15.0",
-						"form-data": "^4.0.0",
-						"proxy-from-env": "^1.1.0"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"jest-dev-server": {
-					"version": "9.0.1",
-					"resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-9.0.1.tgz",
-					"integrity": "sha512-eqpJKSvVl4M0ojHZUPNbka8yEzLNbIMiINXDsuMF3lYfIdRO2iPqy+ASR4wBQ6nUyR3OT24oKPWhpsfLhgAVyg==",
-					"dev": true,
-					"requires": {
-						"chalk": "^4.1.2",
-						"cwd": "^0.10.0",
-						"find-process": "^1.4.7",
-						"prompts": "^2.4.2",
-						"spawnd": "^9.0.1",
-						"tree-kill": "^1.2.2",
-						"wait-on": "^7.0.1"
-					}
-				},
-				"joi": {
-					"version": "17.11.0",
-					"resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz",
-					"integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==",
-					"dev": true,
-					"requires": {
-						"@hapi/hoek": "^9.0.0",
-						"@hapi/topo": "^5.0.0",
-						"@sideway/address": "^4.1.3",
-						"@sideway/formula": "^3.0.1",
-						"@sideway/pinpoint": "^2.0.0"
-					}
-				},
-				"playwright-core": {
-					"version": "1.39.0",
-					"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.39.0.tgz",
-					"integrity": "sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "7.8.1",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-					"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-					"dev": true,
-					"requires": {
-						"tslib": "^2.1.0"
-					}
-				},
-				"signal-exit": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-					"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-					"dev": true
-				},
-				"spawnd": {
-					"version": "9.0.1",
-					"resolved": "https://registry.npmjs.org/spawnd/-/spawnd-9.0.1.tgz",
-					"integrity": "sha512-vaMk8E9CpbjTYToBxLXowDeArGf1+yI7A6PU6Nr57b2g8BVY8nRi5vTBj3bMF8UkCrMdTMyf/Lh+lrcrW2z7pw==",
-					"dev": true,
-					"requires": {
-						"signal-exit": "^4.1.0",
-						"tree-kill": "^1.2.2"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"wait-on": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz",
-					"integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==",
-					"dev": true,
-					"requires": {
-						"axios": "^1.6.1",
-						"joi": "^17.11.0",
-						"lodash": "^4.17.21",
-						"minimist": "^1.2.8",
-						"rxjs": "^7.8.1"
-					}
-				}
-			}
-		},
-		"@wordpress/server-side-render": {
-			"version": "file:packages/server-side-render",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/deprecated": "file:../deprecated",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/url": "file:../url",
-				"fast-deep-equal": "^3.1.3"
-			}
-		},
-		"@wordpress/shortcode": {
-			"version": "file:packages/shortcode",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"memize": "^2.0.1"
-			}
-		},
-		"@wordpress/style-engine": {
-			"version": "file:packages/style-engine",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"change-case": "^4.1.2"
-			}
-		},
-		"@wordpress/stylelint-config": {
-			"version": "file:packages/stylelint-config",
-			"requires": {
-				"stylelint-config-recommended": "^6.0.0",
-				"stylelint-config-recommended-scss": "^5.0.2"
-			}
-		},
-		"@wordpress/sync": {
-			"version": "file:packages/sync",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@types/simple-peer": "^9.11.5",
-				"@wordpress/url": "file:../url",
-				"import-locals": "^2.0.0",
-				"lib0": "^0.2.42",
-				"simple-peer": "^9.11.0",
-				"y-indexeddb": "~9.0.11",
-				"y-protocols": "^1.0.5",
-				"y-webrtc": "~10.2.5",
-				"yjs": "~13.6.6"
-			}
-		},
-		"@wordpress/token-list": {
-			"version": "file:packages/token-list",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@wordpress/undo-manager": {
-			"version": "file:packages/undo-manager",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/is-shallow-equal": "file:../is-shallow-equal"
-			}
-		},
-		"@wordpress/url": {
-			"version": "file:packages/url",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"remove-accents": "^0.5.0"
-			}
-		},
-		"@wordpress/viewport": {
-			"version": "file:packages/viewport",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element"
-			}
-		},
-		"@wordpress/warning": {
-			"version": "file:packages/warning"
-		},
-		"@wordpress/widgets": {
-			"version": "file:packages/widgets",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "file:../api-fetch",
-				"@wordpress/block-editor": "file:../block-editor",
-				"@wordpress/blocks": "file:../blocks",
-				"@wordpress/components": "file:../components",
-				"@wordpress/compose": "file:../compose",
-				"@wordpress/core-data": "file:../core-data",
-				"@wordpress/data": "file:../data",
-				"@wordpress/element": "file:../element",
-				"@wordpress/i18n": "file:../i18n",
-				"@wordpress/icons": "file:../icons",
-				"@wordpress/notices": "file:../notices",
-				"classnames": "^2.3.1"
-			}
-		},
-		"@wordpress/wordcount": {
-			"version": "file:packages/wordcount",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
-		},
-		"@xmldom/xmldom": {
-			"version": "0.8.10",
-			"resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
-			"integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
-			"dev": true
-		},
-		"@xtuc/ieee754": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-			"dev": true
-		},
-		"@xtuc/long": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-			"dev": true
-		},
-		"@yarnpkg/esbuild-plugin-pnp": {
-			"version": "3.0.0-rc.15",
-			"resolved": "https://registry.npmjs.org/@yarnpkg/esbuild-plugin-pnp/-/esbuild-plugin-pnp-3.0.0-rc.15.tgz",
-			"integrity": "sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==",
-			"dev": true,
-			"requires": {
-				"tslib": "^2.4.0"
-			}
-		},
-		"@yarnpkg/fslib": {
-			"version": "2.10.3",
-			"resolved": "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.10.3.tgz",
-			"integrity": "sha512-41H+Ga78xT9sHvWLlFOZLIhtU6mTGZ20pZ29EiZa97vnxdohJD2AF42rCoAoWfqUz486xY6fhjMH+DYEM9r14A==",
-			"dev": true,
-			"requires": {
-				"@yarnpkg/libzip": "^2.3.0",
-				"tslib": "^1.13.0"
-			},
-			"dependencies": {
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
-			}
-		},
-		"@yarnpkg/libzip": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.3.0.tgz",
-			"integrity": "sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==",
-			"dev": true,
-			"requires": {
-				"@types/emscripten": "^1.39.6",
-				"tslib": "^1.13.0"
-			},
-			"dependencies": {
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
-			}
-		},
-		"@yarnpkg/lockfile": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-			"integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-			"dev": true
-		},
-		"@yarnpkg/parsers": {
-			"version": "3.0.0-rc.46",
-			"resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz",
-			"integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==",
-			"dev": true,
-			"requires": {
-				"js-yaml": "^3.10.0",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@zkochan/js-yaml": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz",
-			"integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==",
-			"dev": true,
-			"requires": {
-				"argparse": "^2.0.1"
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				}
-			}
-		},
-		"abab": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-			"dev": true
-		},
-		"abbrev": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-			"dev": true
-		},
-		"abort-controller": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-			"integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-			"requires": {
-				"event-target-shim": "^5.0.0"
-			}
-		},
-		"absolute-path": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/absolute-path/-/absolute-path-0.0.0.tgz",
-			"integrity": "sha512-HQiug4c+/s3WOvEnDRxXVmNtSG5s2gJM9r19BTcqjp7BWcE48PB+Y2G6jE65kqI0LpsQeMZygt/b60Gi4KxGyA=="
-		},
-		"accepts": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-			"requires": {
-				"mime-types": "~2.1.34",
-				"negotiator": "0.6.3"
-			}
-		},
-		"acorn": {
-			"version": "6.4.2",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-			"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-			"dev": true
-		},
-		"acorn-import-assertions": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-			"dev": true
-		},
-		"acorn-jsx": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-			"integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-			"dev": true
-		},
-		"acorn-walk": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-			"dev": true
-		},
-		"add-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
-			"integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==",
-			"dev": true
-		},
-		"address": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
-			"integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
-			"dev": true
-		},
-		"adm-zip": {
-			"version": "0.5.9",
-			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz",
-			"integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==",
-			"dev": true
-		},
-		"agent-base": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-			"dev": true,
-			"requires": {
-				"debug": "4"
-			}
-		},
-		"agentkeepalive": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
-			"integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
-			"dev": true,
-			"requires": {
-				"humanize-ms": "^1.2.1"
-			}
-		},
-		"aggregate-error": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.0.tgz",
-			"integrity": "sha512-yKD9kEoJIR+2IFqhMwayIBgheLYbB3PS2OBhWae1L/ODTd/JF/30cW0bc9TqzRL3k4U41Dieu3BF4I29p8xesA==",
-			"dev": true,
-			"requires": {
-				"clean-stack": "^2.0.0",
-				"indent-string": "^3.2.0"
-			}
-		},
-		"ajv": {
-			"version": "8.7.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.7.1.tgz",
-			"integrity": "sha512-gPpOObTO1QjbnN1sVMjJcp1TF9nggMfO4MBR5uQl6ZVTOaEPq5i4oq/6R9q2alMMPB3eg53wFv1RuJBLuxf3Hw==",
-			"dev": true,
-			"requires": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			},
-			"dependencies": {
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				}
-			}
-		},
-		"ajv-draft-04": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz",
-			"integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==",
-			"dev": true
-		},
-		"ajv-errors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-			"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-			"dev": true
-		},
-		"ajv-formats": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-			"dev": true,
-			"requires": {
-				"ajv": "^8.0.0"
-			}
-		},
-		"ajv-keywords": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-			"dev": true
-		},
-		"anser": {
-			"version": "1.4.10",
-			"resolved": "https://registry.npmjs.org/anser/-/anser-1.4.10.tgz",
-			"integrity": "sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww=="
-		},
-		"ansi-colors": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-			"integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-			"dev": true
-		},
-		"ansi-escapes": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-			"dev": true,
-			"requires": {
-				"type-fest": "^0.21.3"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.21.3",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-					"dev": true
-				}
-			}
-		},
-		"ansi-fragments": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-fragments/-/ansi-fragments-0.2.1.tgz",
-			"integrity": "sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w==",
-			"requires": {
-				"colorette": "^1.0.7",
-				"slice-ansi": "^2.0.0",
-				"strip-ansi": "^5.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-					"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
-				},
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"slice-ansi": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-					"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"astral-regex": "^1.0.0",
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-					"requires": {
-						"ansi-regex": "^4.1.0"
-					}
-				}
-			}
-		},
-		"ansi-html-community": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-			"integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-			"dev": true
-		},
-		"ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-		},
-		"ansi-sequence-parser": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-sequence-parser/-/ansi-sequence-parser-1.1.1.tgz",
-			"integrity": "sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==",
-			"dev": true
-		},
-		"ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"requires": {
-				"color-convert": "^2.0.1"
-			},
-			"dependencies": {
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-				}
-			}
-		},
-		"any-observable": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz",
-			"integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==",
-			"dev": true
-		},
-		"anymatch": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-			"requires": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			}
-		},
-		"app-root-dir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz",
-			"integrity": "sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==",
-			"dev": true
-		},
-		"app-root-path": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
-			"integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA=="
-		},
-		"appdirsjs": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/appdirsjs/-/appdirsjs-1.2.7.tgz",
-			"integrity": "sha512-Quji6+8kLBC3NnBeo14nPDq0+2jUs5s3/xEye+udFHumHhRk4M7aAMXp/PBJqkKYGuuyR9M/6Dq7d2AViiGmhw=="
-		},
-		"appium": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/appium/-/appium-2.0.0.tgz",
-			"integrity": "sha512-SfpaYI35aM2KcShL0gOMDcni9CIev4X+WfEFfncsoM+S3dyPd++FjwoH2pmRDk4yHTDNz8gCTbUizQN8fJgYpw==",
-			"dev": true,
-			"requires": {
-				"@appium/base-driver": "^9.3.15",
-				"@appium/base-plugin": "^2.2.15",
-				"@appium/docutils": "^0.4.4",
-				"@appium/schema": "^0.3.1",
-				"@appium/support": "^4.1.2",
-				"@appium/types": "^0.13.2",
-				"@sidvind/better-ajv-errors": "2.1.0",
-				"@types/argparse": "2.0.10",
-				"@types/bluebird": "3.5.38",
-				"@types/fancy-log": "2.0.0",
-				"@types/semver": "7.5.0",
-				"@types/teen_process": "2.0.0",
-				"@types/wrap-ansi": "3.0.0",
-				"ajv": "8.12.0",
-				"ajv-formats": "2.1.1",
-				"argparse": "2.0.1",
-				"async-lock": "1.4.0",
-				"asyncbox": "2.9.4",
-				"axios": "1.4.0",
-				"bluebird": "3.7.2",
-				"cross-env": "7.0.3",
-				"find-up": "5.0.0",
-				"glob": "8.1.0",
-				"lilconfig": "2.1.0",
-				"lodash": "4.17.21",
-				"npmlog": "7.0.1",
-				"ora": "5.4.1",
-				"package-changed": "3.0.0",
-				"resolve-from": "5.0.0",
-				"semver": "7.5.3",
-				"source-map-support": "0.5.21",
-				"teen_process": "2.0.2",
-				"type-fest": "3.11.1",
-				"winston": "3.9.0",
-				"wrap-ansi": "7.0.0",
-				"yaml": "2.3.1"
-			},
-			"dependencies": {
-				"@types/semver": {
-					"version": "7.5.0",
-					"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-					"integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-					"dev": true
-				},
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"are-we-there-yet": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.1.tgz",
-					"integrity": "sha512-2zuA+jpOYBRgoBCfa+fB87Rk0oGJjDX6pxGzqH6f33NzUhG25Xur6R0u0Z9VVAq8Z5JvQpQI6j6rtonuivC8QA==",
-					"dev": true,
-					"requires": {
-						"delegates": "^1.0.0",
-						"readable-stream": "^4.1.0"
-					}
-				},
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"axios": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
-					"integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
-					"dev": true,
-					"requires": {
-						"follow-redirects": "^1.15.0",
-						"form-data": "^4.0.0",
-						"proxy-from-env": "^1.1.0"
-					}
-				},
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"buffer": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-					"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-					"dev": true,
-					"requires": {
-						"base64-js": "^1.3.1",
-						"ieee754": "^1.2.1"
-					}
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"cross-env": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
-					"integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.1"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"gauge": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.1.tgz",
-					"integrity": "sha512-CmykPMJGuNan/3S4kZOpvvPYSNqSHANiWnh9XcMU2pSjtBfF0XzZ2p1bFAxTbnFxyBuPxQYHhzwaoOmUdqzvxQ==",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.0.3 || ^2.0.0",
-						"color-support": "^1.1.3",
-						"console-control-strings": "^1.1.0",
-						"has-unicode": "^2.0.1",
-						"signal-exit": "^4.0.1",
-						"string-width": "^4.2.3",
-						"strip-ansi": "^6.0.1",
-						"wide-align": "^1.1.5"
-					}
-				},
-				"glob": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-					"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^5.0.1",
-						"once": "^1.3.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "5.1.6",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-					"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				},
-				"npmlog": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-7.0.1.tgz",
-					"integrity": "sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==",
-					"dev": true,
-					"requires": {
-						"are-we-there-yet": "^4.0.0",
-						"console-control-strings": "^1.1.0",
-						"gauge": "^5.0.0",
-						"set-blocking": "^2.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"ora": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-					"integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-					"dev": true,
-					"requires": {
-						"bl": "^4.1.0",
-						"chalk": "^4.1.0",
-						"cli-cursor": "^3.1.0",
-						"cli-spinners": "^2.5.0",
-						"is-interactive": "^1.0.0",
-						"is-unicode-supported": "^0.1.0",
-						"log-symbols": "^4.1.0",
-						"strip-ansi": "^6.0.0",
-						"wcwidth": "^1.0.1"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "4.4.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz",
-					"integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==",
-					"dev": true,
-					"requires": {
-						"abort-controller": "^3.0.0",
-						"buffer": "^6.0.3",
-						"events": "^3.3.0",
-						"process": "^0.11.10",
-						"string_decoder": "^1.3.0"
-					}
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"dev": true,
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					},
-					"dependencies": {
-						"signal-exit": {
-							"version": "3.0.7",
-							"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-							"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-							"dev": true
-						}
-					}
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				},
-				"semver": {
-					"version": "7.5.3",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-					"integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"signal-exit": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-					"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-					"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "~5.2.0"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"type-fest": {
-					"version": "3.11.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.11.1.tgz",
-					"integrity": "sha512-aCuRNRERRVh33lgQaJRlUxZqzfhzwTrsE98Mc3o3VXqmiaQdHacgUtJ0esp+7MvZ92qhtzKPeusaX6vIEcoreA==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				},
-				"yaml": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-					"integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
-					"dev": true
-				}
-			}
-		},
-		"aproba": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-			"dev": true
-		},
-		"archiver": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/archiver/-/archiver-6.0.1.tgz",
-			"integrity": "sha512-CXGy4poOLBKptiZH//VlWdFuUC1RESbdZjGjILwBuZ73P7WkAUN0htfSfBq/7k6FRFlpu7bg4JOkj1vU9G6jcQ==",
-			"dev": true,
-			"requires": {
-				"archiver-utils": "^4.0.1",
-				"async": "^3.2.4",
-				"buffer-crc32": "^0.2.1",
-				"readable-stream": "^3.6.0",
-				"readdir-glob": "^1.1.2",
-				"tar-stream": "^3.0.0",
-				"zip-stream": "^5.0.1"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"tar-stream": {
-					"version": "3.1.6",
-					"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-					"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
-					"dev": true,
-					"requires": {
-						"b4a": "^1.6.4",
-						"fast-fifo": "^1.2.0",
-						"streamx": "^2.15.0"
-					}
-				}
-			}
-		},
-		"archiver-utils": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-4.0.1.tgz",
-			"integrity": "sha512-Q4Q99idbvzmgCTEAAhi32BkOyq8iVI5EwdO0PmBDSGIzzjYNdcFn7Q7k3OzbLy4kLUPXfJtG6fO2RjftXbobBg==",
-			"dev": true,
-			"requires": {
-				"glob": "^8.0.0",
-				"graceful-fs": "^4.2.0",
-				"lazystream": "^1.0.0",
-				"lodash": "^4.17.15",
-				"normalize-path": "^3.0.0",
-				"readable-stream": "^3.6.0"
-			},
-			"dependencies": {
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"glob": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-					"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^5.0.1",
-						"once": "^1.3.0"
-					}
-				},
-				"minimatch": {
-					"version": "5.1.6",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-					"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				},
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"are-docs-informative": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
-			"integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
-			"dev": true
-		},
-		"are-we-there-yet": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
-			"integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
-			"dev": true,
-			"requires": {
-				"delegates": "^1.0.0",
-				"readable-stream": "^3.6.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"arg": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-			"dev": true
-		},
-		"argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-			"requires": {
-				"sprintf-js": "~1.0.2"
-			},
-			"dependencies": {
-				"sprintf-js": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-					"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-				}
-			}
-		},
-		"aria-hidden": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.3.tgz",
-			"integrity": "sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==",
-			"requires": {
-				"tslib": "^2.0.0"
-			}
-		},
-		"aria-query": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-			"integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.10.2",
-				"@babel/runtime-corejs3": "^7.10.2"
-			}
-		},
-		"arr-diff": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-			"integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="
-		},
-		"arr-flatten": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
-		},
-		"arr-union": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-			"integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="
-		},
-		"array-buffer-byte-length": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-			"integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"is-array-buffer": "^3.0.1"
-			}
-		},
-		"array-differ": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-			"integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-			"dev": true
-		},
-		"array-flatten": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-			"dev": true
-		},
-		"array-ify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
-			"integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==",
-			"dev": true
-		},
-		"array-includes": {
-			"version": "3.1.6",
-			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-			"integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4",
-				"get-intrinsic": "^1.1.3",
-				"is-string": "^1.0.7"
-			}
-		},
-		"array-iterate": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.2.tgz",
-			"integrity": "sha512-1hWSHTIlG/8wtYD+PPX5AOBtKWngpDFjrsrHgZpe+JdgNGz0udYu6ZIkAa/xuenIUEqFv7DvE2Yr60jxweJSrQ==",
-			"dev": true
-		},
-		"array-union": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-			"integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
-			"dev": true,
-			"requires": {
-				"array-uniq": "^1.0.1"
-			}
-		},
-		"array-uniq": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-			"integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-			"dev": true
-		},
-		"array-unique": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-			"integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
-		},
-		"array.prototype.flat": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-			"integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4",
-				"es-shim-unscopables": "^1.0.0"
-			}
-		},
-		"array.prototype.flatmap": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-			"integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4",
-				"es-shim-unscopables": "^1.0.0"
-			}
-		},
-		"arraybuffer.prototype.slice": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-			"integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
-			"dev": true,
-			"requires": {
-				"array-buffer-byte-length": "^1.0.0",
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.2.0",
-				"get-intrinsic": "^1.2.1",
-				"is-array-buffer": "^3.0.2",
-				"is-shared-array-buffer": "^1.0.2"
-			}
-		},
-		"arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-			"dev": true
-		},
-		"asap": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-			"integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
-		},
-		"asn1.js": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-			"dev": true,
-			"requires": {
-				"bn.js": "^4.0.0",
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"safer-buffer": "^2.1.0"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
-			}
-		},
-		"assert": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-			"integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-			"dev": true,
-			"requires": {
-				"object-assign": "^4.1.1",
-				"util": "0.10.3"
-			},
-			"dependencies": {
-				"inherits": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-					"integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-					"dev": true
-				},
-				"util": {
-					"version": "0.10.3",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-					"integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
-					"dev": true,
-					"requires": {
-						"inherits": "2.0.1"
-					}
-				}
-			}
-		},
-		"assign-symbols": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-			"integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="
-		},
-		"ast-types": {
-			"version": "0.14.2",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz",
-			"integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==",
-			"requires": {
-				"tslib": "^2.0.1"
-			}
-		},
-		"ast-types-flow": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-			"integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
-			"dev": true
-		},
-		"astral-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-			"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
-		},
-		"async": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-			"integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
-		},
-		"async-each": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-			"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-			"dev": true,
-			"optional": true
-		},
-		"async-limiter": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-			"integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
-		},
-		"async-lock": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.4.0.tgz",
-			"integrity": "sha512-coglx5yIWuetakm3/1dsX9hxCNox22h7+V80RQOu2XUUMidtArxKoZoOtHUPuR84SycKTXzgGzAUR5hJxujyJQ==",
-			"dev": true
-		},
-		"asyncbox": {
-			"version": "2.9.4",
-			"resolved": "https://registry.npmjs.org/asyncbox/-/asyncbox-2.9.4.tgz",
-			"integrity": "sha512-TCuA73K6Gvn+5tFGsWf4jc+PsR9RmYXw/AF0mv+CRB3VhHLjqHh/w9gPvYILnV0RcRFfjADHtzZexpxWlsP3Tg==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.0.0",
-				"@types/bluebird": "^3.5.37",
-				"bluebird": "^3.5.1",
-				"lodash": "^4.17.4",
-				"source-map-support": "^0.5.5"
-			}
-		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-			"dev": true
-		},
-		"atob": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
-		},
-		"atob-lite": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz",
-			"integrity": "sha512-LEeSAWeh2Gfa2FtlQE1shxQ8zi5F9GHarrGKz08TMdODD5T4eH6BMsvtnhbWZ+XQn+Gb6om/917ucvRu7l7ukw==",
-			"dev": true
-		},
-		"autoprefixer": {
-			"version": "10.4.14",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
-			"integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.5",
-				"caniuse-lite": "^1.0.30001464",
-				"fraction.js": "^4.2.0",
-				"normalize-range": "^0.1.2",
-				"picocolors": "^1.0.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"autosize": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.2.tgz",
-			"integrity": "sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA=="
-		},
-		"available-typed-arrays": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-			"dev": true
-		},
-		"axe-core": {
-			"version": "4.7.2",
-			"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
-			"integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
-			"dev": true
-		},
-		"axobject-query": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-			"integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-			"dev": true
-		},
-		"b4a": {
-			"version": "1.6.4",
-			"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
-			"integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==",
-			"dev": true
-		},
-		"babel-core": {
-			"version": "7.0.0-bridge.0",
-			"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz",
-			"integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg=="
-		},
-		"babel-jest": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
-			"integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
-			"dev": true,
-			"requires": {
-				"@jest/transform": "^29.6.2",
-				"@types/babel__core": "^7.1.14",
-				"babel-plugin-istanbul": "^6.1.1",
-				"babel-preset-jest": "^29.5.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"slash": "^3.0.0"
-			}
-		},
-		"babel-loader": {
-			"version": "8.2.3",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-			"integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
-			"dev": true,
-			"requires": {
-				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^1.4.0",
-				"make-dir": "^3.1.0",
-				"schema-utils": "^2.6.5"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"find-cache-dir": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-					"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-					"dev": true,
-					"requires": {
-						"commondir": "^1.0.1",
-						"make-dir": "^3.0.2",
-						"pkg-dir": "^4.1.0"
-					}
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"json5": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-					"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				},
-				"loader-utils": {
-					"version": "1.4.2",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-					"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-					"dev": true,
-					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^3.0.0",
-						"json5": "^1.0.1"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"make-dir": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-					"dev": true,
-					"requires": {
-						"semver": "^6.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-					"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-					"dev": true,
-					"requires": {
-						"find-up": "^4.0.0"
-					}
-				},
-				"schema-utils": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-					"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.5",
-						"ajv": "^6.12.4",
-						"ajv-keywords": "^3.5.2"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"babel-plugin-add-react-displayname": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz",
-			"integrity": "sha512-LY3+Y0XVDYcShHHorshrDbt4KFWL4bSeniCtl4SYZbask+Syngk1uMPCeN9+nSiZo6zX5s0RTq/J9Pnaaf/KHw==",
-			"dev": true
-		},
-		"babel-plugin-inline-json-import": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/babel-plugin-inline-json-import/-/babel-plugin-inline-json-import-0.3.2.tgz",
-			"integrity": "sha512-QNNJx08KjmMT25Cw7rAPQ6dlREDPiZGDyApHL8KQ9vrQHbrr4PTi7W8g1tMMZPz0jEMd39nx/eH7xjnDNxq5sA==",
-			"dev": true,
-			"requires": {
-				"decache": "^4.5.1"
-			}
-		},
-		"babel-plugin-istanbul": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-instrument": "^5.0.4",
-				"test-exclude": "^6.0.0"
-			}
-		},
-		"babel-plugin-jest-hoist": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
-			"integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
-			"dev": true,
-			"requires": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.1.14",
-				"@types/babel__traverse": "^7.0.6"
-			}
-		},
-		"babel-plugin-macros": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
-			"integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
-			"requires": {
-				"@babel/runtime": "^7.7.2",
-				"cosmiconfig": "^6.0.0",
-				"resolve": "^1.12.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-					"integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-					"requires": {
-						"@types/parse-json": "^4.0.0",
-						"import-fresh": "^3.1.0",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0",
-						"yaml": "^1.7.2"
-					}
-				},
-				"path-type": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-					"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
-				}
-			}
-		},
-		"babel-plugin-named-exports-order": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/babel-plugin-named-exports-order/-/babel-plugin-named-exports-order-0.0.2.tgz",
-			"integrity": "sha512-OgOYHOLoRK+/mvXU9imKHlG6GkPLYrUCvFXG/CM93R/aNNO8pOOF4aS+S8CCHMDQoNSeiOYEZb/G6RwL95Jktw==",
-			"dev": true
-		},
-		"babel-plugin-polyfill-corejs2": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz",
-			"integrity": "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==",
-			"requires": {
-				"@babel/compat-data": "^7.13.11",
-				"@babel/helper-define-polyfill-provider": "^0.2.4",
-				"semver": "^6.1.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"babel-plugin-polyfill-corejs3": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz",
-			"integrity": "sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg==",
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.2.4",
-				"core-js-compat": "^3.18.0"
-			}
-		},
-		"babel-plugin-polyfill-regenerator": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz",
-			"integrity": "sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==",
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.2.4"
-			}
-		},
-		"babel-plugin-react-docgen": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz",
-			"integrity": "sha512-UQ0NmGHj/HAqi5Bew8WvNfCk8wSsmdgNd8ZdMjBCICtyCJCq9LiqgqvjCYe570/Wg7AQArSq1VQ60Dd/CHN7mQ==",
-			"dev": true,
-			"requires": {
-				"ast-types": "^0.14.2",
-				"lodash": "^4.17.15",
-				"react-docgen": "^5.0.0"
-			}
-		},
-		"babel-plugin-react-native-classname-to-style": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/babel-plugin-react-native-classname-to-style/-/babel-plugin-react-native-classname-to-style-1.2.2.tgz",
-			"integrity": "sha512-kavZRZ56YoYmrwuCRMY0UuCYfMPszoN7v0DLST1D+rTqkl+cFWVW3W8l//AfWsyMNHkY+UTX+RrB5K7GY9mq3w==",
-			"dev": true
-		},
-		"babel-plugin-react-native-platform-specific-extensions": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-react-native-platform-specific-extensions/-/babel-plugin-react-native-platform-specific-extensions-1.1.1.tgz",
-			"integrity": "sha512-ZNN2ImlUlcaPMfzaCw9fWmTc/Ht5ARI0n9RUqiyCdK7LalPJ7yKc+F60BcSHvMHcmA2BgVO8TpSot+dpeZPAMQ==",
-			"dev": true,
-			"requires": {
-				"@babel/template": "^7.0.0-beta.49"
-			}
-		},
-		"babel-plugin-syntax-trailing-function-commas": {
-			"version": "7.0.0-beta.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz",
-			"integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ=="
-		},
-		"babel-plugin-transform-remove-console": {
-			"version": "6.9.4",
-			"resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
-			"integrity": "sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==",
-			"dev": true
-		},
-		"babel-preset-current-node-syntax": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-			"dev": true,
-			"requires": {
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-bigint": "^7.8.3",
-				"@babel/plugin-syntax-class-properties": "^7.8.3",
-				"@babel/plugin-syntax-import-meta": "^7.8.3",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-top-level-await": "^7.8.3"
-			}
-		},
-		"babel-preset-fbjs": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz",
-			"integrity": "sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==",
-			"requires": {
-				"@babel/plugin-proposal-class-properties": "^7.0.0",
-				"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-				"@babel/plugin-syntax-class-properties": "^7.0.0",
-				"@babel/plugin-syntax-flow": "^7.0.0",
-				"@babel/plugin-syntax-jsx": "^7.0.0",
-				"@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-				"@babel/plugin-transform-arrow-functions": "^7.0.0",
-				"@babel/plugin-transform-block-scoped-functions": "^7.0.0",
-				"@babel/plugin-transform-block-scoping": "^7.0.0",
-				"@babel/plugin-transform-classes": "^7.0.0",
-				"@babel/plugin-transform-computed-properties": "^7.0.0",
-				"@babel/plugin-transform-destructuring": "^7.0.0",
-				"@babel/plugin-transform-flow-strip-types": "^7.0.0",
-				"@babel/plugin-transform-for-of": "^7.0.0",
-				"@babel/plugin-transform-function-name": "^7.0.0",
-				"@babel/plugin-transform-literals": "^7.0.0",
-				"@babel/plugin-transform-member-expression-literals": "^7.0.0",
-				"@babel/plugin-transform-modules-commonjs": "^7.0.0",
-				"@babel/plugin-transform-object-super": "^7.0.0",
-				"@babel/plugin-transform-parameters": "^7.0.0",
-				"@babel/plugin-transform-property-literals": "^7.0.0",
-				"@babel/plugin-transform-react-display-name": "^7.0.0",
-				"@babel/plugin-transform-react-jsx": "^7.0.0",
-				"@babel/plugin-transform-shorthand-properties": "^7.0.0",
-				"@babel/plugin-transform-spread": "^7.0.0",
-				"@babel/plugin-transform-template-literals": "^7.0.0",
-				"babel-plugin-syntax-trailing-function-commas": "^7.0.0-beta.0"
-			}
-		},
-		"babel-preset-jest": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
-			"integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
-			"dev": true,
-			"requires": {
-				"babel-plugin-jest-hoist": "^29.5.0",
-				"babel-preset-current-node-syntax": "^1.0.0"
-			}
-		},
-		"bail": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz",
-			"integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==",
-			"dev": true
-		},
-		"balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-		},
-		"base": {
-			"version": "0.11.2",
-			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-			"requires": {
-				"cache-base": "^1.0.1",
-				"class-utils": "^0.3.5",
-				"component-emitter": "^1.2.1",
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.1",
-				"mixin-deep": "^1.2.0",
-				"pascalcase": "^0.1.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
-			}
-		},
-		"base64-js": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-		},
-		"base64-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/base64-stream/-/base64-stream-1.0.0.tgz",
-			"integrity": "sha512-BQQZftaO48FcE1Kof9CmXMFaAdqkcNorgc8CxesZv9nMbbTF1EFyQe89UOuh//QMmdtfUDXyO8rgUalemL5ODA==",
-			"dev": true
-		},
-		"basic-auth": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
-			"integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "5.1.2"
-			}
-		},
-		"basic-ftp": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz",
-			"integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==",
-			"dev": true
-		},
-		"batch": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-			"dev": true
-		},
-		"before-after-hook": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-1.4.0.tgz",
-			"integrity": "sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg==",
-			"dev": true
-		},
-		"benchmark": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz",
-			"integrity": "sha512-l9MlfN4M1K/H2fbhfMy3B7vJd6AGKJVQn2h6Sg/Yx+KckoUA7ewS5Vv6TjSq18ooE1kS9hhAlQRH3AkXIh/aOQ==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.4",
-				"platform": "^1.3.3"
-			}
-		},
-		"better-opn": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/better-opn/-/better-opn-3.0.2.tgz",
-			"integrity": "sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==",
-			"dev": true,
-			"requires": {
-				"open": "^8.0.4"
-			},
-			"dependencies": {
-				"is-wsl": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-					"dev": true,
-					"requires": {
-						"is-docker": "^2.0.0"
-					}
-				},
-				"open": {
-					"version": "8.4.2",
-					"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-					"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-					"dev": true,
-					"requires": {
-						"define-lazy-prop": "^2.0.0",
-						"is-docker": "^2.1.1",
-						"is-wsl": "^2.2.0"
-					}
-				}
-			}
-		},
-		"big-integer": {
-			"version": "1.6.51",
-			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-			"integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
-			"dev": true
-		},
-		"big.js": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-			"dev": true
-		},
-		"binary": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-			"integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
-			"dev": true,
-			"requires": {
-				"buffers": "~0.1.1",
-				"chainsaw": "~0.1.0"
-			}
-		},
-		"binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-			"dev": true
-		},
-		"bindings": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-			"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"file-uri-to-path": "1.0.0"
-			}
-		},
-		"bl": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-			"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-			"requires": {
-				"buffer": "^5.5.0",
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.4.0"
-			},
-			"dependencies": {
-				"buffer": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-					"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-					"requires": {
-						"base64-js": "^1.3.1",
-						"ieee754": "^1.1.13"
-					}
-				},
-				"inherits": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-					"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-				},
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"bluebird": {
-			"version": "3.7.2",
-			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-			"dev": true
-		},
-		"bn.js": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-			"integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-			"dev": true
-		},
-		"body-parser": {
-			"version": "1.20.1",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-			"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-			"dev": true,
-			"requires": {
-				"bytes": "3.1.2",
-				"content-type": "~1.0.4",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"on-finished": "2.4.1",
-				"qs": "6.11.0",
-				"raw-body": "2.5.1",
-				"type-is": "~1.6.18",
-				"unpipe": "1.0.0"
-			},
-			"dependencies": {
-				"bytes": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-					"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-					"dev": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-					"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-					"dev": true
-				},
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				},
-				"on-finished": {
-					"version": "2.4.1",
-					"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-					"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-					"dev": true,
-					"requires": {
-						"ee-first": "1.1.1"
-					}
-				}
-			}
-		},
-		"body-scroll-lock": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz",
-			"integrity": "sha512-Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg=="
-		},
-		"bonjour-service": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
-			"integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
-			"dev": true,
-			"requires": {
-				"array-flatten": "^2.1.2",
-				"dns-equal": "^1.0.0",
-				"fast-deep-equal": "^3.1.3",
-				"multicast-dns": "^7.2.5"
-			},
-			"dependencies": {
-				"array-flatten": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-					"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-					"dev": true
-				}
-			}
-		},
-		"boolbase": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
-		},
-		"bplist-creator": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.1.tgz",
-			"integrity": "sha512-Ese7052fdWrxp/vqSJkydgx/1MdBnNOCV2XVfbmdGWD2H6EYza+Q4pyYSuVSnCUD22hfI/BFI4jHaC3NLXLlJQ==",
-			"dev": true,
-			"requires": {
-				"stream-buffers": "2.2.x"
-			}
-		},
-		"bplist-parser": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
-			"integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
-			"dev": true,
-			"requires": {
-				"big-integer": "^1.6.44"
-			}
-		},
-		"brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"requires": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-			"requires": {
-				"fill-range": "^7.0.1"
-			}
-		},
-		"brorand": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-			"integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-			"dev": true
-		},
-		"browser-assert": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/browser-assert/-/browser-assert-1.2.1.tgz",
-			"integrity": "sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==",
-			"dev": true
-		},
-		"browserify-aes": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-			"dev": true,
-			"requires": {
-				"buffer-xor": "^1.0.3",
-				"cipher-base": "^1.0.0",
-				"create-hash": "^1.1.0",
-				"evp_bytestokey": "^1.0.3",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"browserify-cipher": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-			"dev": true,
-			"requires": {
-				"browserify-aes": "^1.0.4",
-				"browserify-des": "^1.0.0",
-				"evp_bytestokey": "^1.0.0"
-			}
-		},
-		"browserify-des": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-			"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-			"dev": true,
-			"requires": {
-				"cipher-base": "^1.0.1",
-				"des.js": "^1.0.0",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.1.2"
-			}
-		},
-		"browserify-rsa": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-			"dev": true,
-			"requires": {
-				"bn.js": "^5.0.0",
-				"randombytes": "^2.0.1"
-			}
-		},
-		"browserify-sign": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-			"dev": true,
-			"requires": {
-				"bn.js": "^5.1.1",
-				"browserify-rsa": "^4.0.1",
-				"create-hash": "^1.2.0",
-				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.3",
-				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.5",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
-			},
-			"dependencies": {
-				"inherits": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-					"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				}
-			}
-		},
-		"browserify-zlib": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-			"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-			"dev": true,
-			"requires": {
-				"pako": "~1.0.5"
-			}
-		},
-		"browserslist": {
-			"version": "4.21.10",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-			"integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
-			"requires": {
-				"caniuse-lite": "^1.0.30001517",
-				"electron-to-chromium": "^1.4.477",
-				"node-releases": "^2.0.13",
-				"update-browserslist-db": "^1.0.11"
-			}
-		},
-		"bser": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
-			"integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
-			"requires": {
-				"node-int64": "^0.4.0"
-			}
-		},
-		"btoa-lite": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz",
-			"integrity": "sha512-gvW7InbIyF8AicrqWoptdW08pUxuhq8BEgowNajy9RhiE86fmGAGl+bLKo6oB8QP0CkqHLowfN0oJdKC/J6LbA==",
-			"dev": true
-		},
-		"buffer": {
-			"version": "4.9.2",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-			"integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-			"dev": true,
-			"requires": {
-				"base64-js": "^1.0.2",
-				"ieee754": "^1.1.4",
-				"isarray": "^1.0.0"
-			}
-		},
-		"buffer-crc32": {
-			"version": "0.2.13",
-			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-			"integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-			"dev": true
-		},
-		"buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-		},
-		"buffer-indexof-polyfill": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
-			"integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
-			"dev": true
-		},
-		"buffer-xor": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-			"integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-			"dev": true
-		},
-		"buffers": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-			"integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
-			"dev": true
-		},
-		"builtin-modules": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
-			"dev": true
-		},
-		"builtin-status-codes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-			"integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-			"dev": true
-		},
-		"builtins": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-			"integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==",
-			"dev": true
-		},
-		"bundle-name": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz",
-			"integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==",
-			"dev": true,
-			"requires": {
-				"run-applescript": "^5.0.0"
-			}
-		},
-		"byte-size": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/byte-size/-/byte-size-8.1.1.tgz",
-			"integrity": "sha512-tUkzZWK0M/qdoLEqikxBWe4kumyuwjl3HO6zHTr4yEI23EojPtLYXdG1+AQY7MN0cGyNDvEaJ8wiYQm6P2bPxg==",
-			"dev": true
-		},
-		"bytes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
-		},
-		"c8": {
-			"version": "7.14.0",
-			"resolved": "https://registry.npmjs.org/c8/-/c8-7.14.0.tgz",
-			"integrity": "sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==",
-			"dev": true,
-			"requires": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@istanbuljs/schema": "^0.1.3",
-				"find-up": "^5.0.0",
-				"foreground-child": "^2.0.0",
-				"istanbul-lib-coverage": "^3.2.0",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-reports": "^3.1.4",
-				"rimraf": "^3.0.2",
-				"test-exclude": "^6.0.0",
-				"v8-to-istanbul": "^9.0.0",
-				"yargs": "^16.2.0",
-				"yargs-parser": "^20.2.9"
-			},
-			"dependencies": {
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				}
-			}
-		},
-		"cacache": {
-			"version": "12.0.4",
-			"resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-			"integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-			"dev": true,
-			"requires": {
-				"bluebird": "^3.5.5",
-				"chownr": "^1.1.1",
-				"figgy-pudding": "^3.5.1",
-				"glob": "^7.1.4",
-				"graceful-fs": "^4.1.15",
-				"infer-owner": "^1.0.3",
-				"lru-cache": "^5.1.1",
-				"mississippi": "^3.0.0",
-				"mkdirp": "^0.5.1",
-				"move-concurrently": "^1.0.1",
-				"promise-inflight": "^1.0.1",
-				"rimraf": "^2.6.3",
-				"ssri": "^6.0.1",
-				"unique-filename": "^1.1.1",
-				"y18n": "^4.0.0"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.6",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-					"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.6"
-					}
-				},
-				"rimraf": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"yallist": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-					"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-					"dev": true
-				}
-			}
-		},
-		"cache-base": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-			"requires": {
-				"collection-visit": "^1.0.0",
-				"component-emitter": "^1.2.1",
-				"get-value": "^2.0.6",
-				"has-value": "^1.0.0",
-				"isobject": "^3.0.1",
-				"set-value": "^2.0.0",
-				"to-object-path": "^0.3.0",
-				"union-value": "^1.0.0",
-				"unset-value": "^1.0.0"
-			}
-		},
-		"cacheable-lookup": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-			"integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-			"dev": true
-		},
-		"cacheable-request": {
-			"version": "7.0.4",
-			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
-			"integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
-			"dev": true,
-			"requires": {
-				"clone-response": "^1.0.2",
-				"get-stream": "^5.1.0",
-				"http-cache-semantics": "^4.0.0",
-				"keyv": "^4.0.0",
-				"lowercase-keys": "^2.0.0",
-				"normalize-url": "^6.0.1",
-				"responselike": "^2.0.0"
-			}
-		},
-		"call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"dev": true,
-			"requires": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
-			}
-		},
-		"caller-callsite": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-			"integrity": "sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==",
-			"requires": {
-				"callsites": "^2.0.0"
-			},
-			"dependencies": {
-				"callsites": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-					"integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ=="
-				}
-			}
-		},
-		"caller-path": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-			"integrity": "sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==",
-			"requires": {
-				"caller-callsite": "^2.0.0"
-			}
-		},
-		"callsite": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-			"integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==",
-			"dev": true
-		},
-		"callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-		},
-		"camel-case": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-			"integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-			"requires": {
-				"pascal-case": "^3.1.2",
-				"tslib": "^2.0.3"
-			}
-		},
-		"camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-		},
-		"camelcase-keys": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^5.3.1",
-				"map-obj": "^4.0.0",
-				"quick-lru": "^4.0.1"
-			},
-			"dependencies": {
-				"map-obj": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-					"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-					"dev": true
-				}
-			}
-		},
-		"camelize": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-			"integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
-		},
-		"caniuse-api": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-lite": "^1.0.0",
-				"lodash.memoize": "^4.1.2",
-				"lodash.uniq": "^4.5.0"
-			}
-		},
-		"caniuse-lite": {
-			"version": "1.0.30001538",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
-			"integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw=="
-		},
-		"capital-case": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz",
-			"integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==",
-			"requires": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3",
-				"upper-case-first": "^2.0.2"
-			}
-		},
-		"case-sensitive-paths-webpack-plugin": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
-			"integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
-			"dev": true
-		},
-		"ccount": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz",
-			"integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==",
-			"dev": true
-		},
-		"chainsaw": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-			"integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
-			"dev": true,
-			"requires": {
-				"traverse": ">=0.3.0 <0.4"
-			},
-			"dependencies": {
-				"traverse": {
-					"version": "0.3.9",
-					"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-					"integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
-					"dev": true
-				}
-			}
-		},
-		"chalk": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-			"requires": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"change-case": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz",
-			"integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==",
-			"requires": {
-				"camel-case": "^4.1.2",
-				"capital-case": "^1.0.4",
-				"constant-case": "^3.0.4",
-				"dot-case": "^3.0.4",
-				"header-case": "^2.0.4",
-				"no-case": "^3.0.4",
-				"param-case": "^3.0.4",
-				"pascal-case": "^3.1.2",
-				"path-case": "^3.0.4",
-				"sentence-case": "^3.0.4",
-				"snake-case": "^3.0.4",
-				"tslib": "^2.0.3"
-			}
-		},
-		"char-regex": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true
-		},
-		"character-entities": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
-			"integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==",
-			"dev": true
-		},
-		"character-entities-html4": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz",
-			"integrity": "sha512-sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==",
-			"dev": true
-		},
-		"character-entities-legacy": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz",
-			"integrity": "sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==",
-			"dev": true
-		},
-		"character-reference-invalid": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz",
-			"integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==",
-			"dev": true
-		},
-		"chardet": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-			"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-			"dev": true
-		},
-		"check-node-version": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-4.1.0.tgz",
-			"integrity": "sha512-TSXGsyfW5/xY2QseuJn8/hleO2AU7HxVCdkc900jp1vcfzF840GkjvRT7CHl8sRtWn23n3X3k0cwH9RXeRwhfw==",
-			"dev": true,
-			"requires": {
-				"chalk": "^3.0.0",
-				"map-values": "^1.0.1",
-				"minimist": "^1.2.0",
-				"object-filter": "^1.0.2",
-				"run-parallel": "^1.1.4",
-				"semver": "^6.3.0"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-			"dev": true,
-			"requires": {
-				"anymatch": "~3.1.2",
-				"braces": "~3.0.2",
-				"fsevents": "~2.3.2",
-				"glob-parent": "~5.1.2",
-				"is-binary-path": "~2.1.0",
-				"is-glob": "~4.0.1",
-				"normalize-path": "~3.0.0",
-				"readdirp": "~3.6.0"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				}
-			}
-		},
-		"chownr": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-			"dev": true
-		},
-		"chrome-launcher": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.2.tgz",
-			"integrity": "sha512-zdLEwNo3aUVzIhKhTtXfxhdvZhUghrnmkvcAq2NoDd+LeOHKf03H5jwZ8T/STsAlzyALkBVK552iaG1fGf1xVQ==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"escape-string-regexp": "^4.0.0",
-				"is-wsl": "^2.2.0",
-				"lighthouse-logger": "^1.0.0"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
-				},
-				"is-wsl": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-					"dev": true,
-					"requires": {
-						"is-docker": "^2.0.0"
-					}
-				}
-			}
-		},
-		"chrome-trace-event": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-			"dev": true
-		},
-		"chromium-bidi": {
-			"version": "0.4.16",
-			"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.16.tgz",
-			"integrity": "sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==",
-			"dev": true,
-			"requires": {
-				"mitt": "3.0.0"
-			}
-		},
-		"ci-info": {
-			"version": "3.8.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-			"integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="
-		},
-		"cipher-base": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"cjs-module-lexer": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
-			"integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
-			"dev": true
-		},
-		"class-utils": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-			"requires": {
-				"arr-union": "^3.1.0",
-				"define-property": "^0.2.5",
-				"isobject": "^3.0.0",
-				"static-extend": "^0.1.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				}
-			}
-		},
-		"classnames": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-			"integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
-		},
-		"clean-css": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
-			"integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
-			"dev": true,
-			"requires": {
-				"source-map": "~0.6.0"
-			}
-		},
-		"clean-stack": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-			"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-			"dev": true
-		},
-		"clean-webpack-plugin": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz",
-			"integrity": "sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A==",
-			"dev": true,
-			"requires": {
-				"@types/webpack": "^4.4.31",
-				"del": "^4.1.1"
-			}
-		},
-		"cli-cursor": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-			"integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
-			"dev": true,
-			"requires": {
-				"restore-cursor": "^2.0.0"
-			}
-		},
-		"cli-spinners": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-			"integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="
-		},
-		"cli-table3": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
-			"integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
-			"dev": true,
-			"requires": {
-				"@colors/colors": "1.5.0",
-				"string-width": "^4.2.0"
-			},
-			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
-			}
-		},
-		"cli-truncate": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
-			"integrity": "sha512-f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg==",
-			"dev": true,
-			"requires": {
-				"slice-ansi": "0.0.4",
-				"string-width": "^1.0.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
-					"dev": true,
-					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				}
-			}
-		},
-		"cli-width": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-			"dev": true
-		},
-		"clipboard": {
-			"version": "2.0.8",
-			"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
-			"integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
-			"requires": {
-				"good-listener": "^1.2.2",
-				"select": "^1.1.2",
-				"tiny-emitter": "^2.0.0"
-			}
-		},
-		"cliui": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-			"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-			"requires": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.0",
-				"wrap-ansi": "^6.2.0"
-			},
-			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
-			}
-		},
-		"clone": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-			"integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="
-		},
-		"clone-deep": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-			"requires": {
-				"is-plain-object": "^2.0.4",
-				"kind-of": "^6.0.2",
-				"shallow-clone": "^3.0.0"
-			},
-			"dependencies": {
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"clone-regexp": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-			"integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-			"dev": true,
-			"requires": {
-				"is-regexp": "^2.0.0"
-			},
-			"dependencies": {
-				"is-regexp": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-					"integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-					"dev": true
-				}
-			}
-		},
-		"clone-response": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-			"integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-			"dev": true,
-			"requires": {
-				"mimic-response": "^1.0.0"
-			}
-		},
-		"cmd-shim": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz",
-			"integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==",
-			"dev": true
-		},
-		"cmdk": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cmdk/-/cmdk-0.2.0.tgz",
-			"integrity": "sha512-JQpKvEOb86SnvMZbYaFKYhvzFntWBeSZdyii0rZPhKJj9uwJBxu4DaVYDrRN7r3mPop56oPhRw+JYWTKs66TYw==",
-			"requires": {
-				"@radix-ui/react-dialog": "1.0.0",
-				"command-score": "0.1.2"
-			}
-		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-			"dev": true
-		},
-		"code-point-at": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
-			"dev": true
-		},
-		"collapse-white-space": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
-			"integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==",
-			"dev": true
-		},
-		"collect-v8-coverage": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-			"dev": true
-		},
-		"collection-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-			"integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
-			"requires": {
-				"map-visit": "^1.0.0",
-				"object-visit": "^1.0.0"
-			}
-		},
-		"color": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-			"integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
-			"requires": {
-				"color-convert": "^2.0.1",
-				"color-string": "^1.9.0"
-			},
-			"dependencies": {
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-				}
-			}
-		},
-		"color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"requires": {
-				"color-name": "1.1.3"
-			}
-		},
-		"color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-		},
-		"color-string": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-			"integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-			"requires": {
-				"color-name": "^1.0.0",
-				"simple-swizzle": "^0.2.2"
-			}
-		},
-		"color-support": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-			"dev": true
-		},
-		"colord": {
-			"version": "2.9.3",
-			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
-		},
-		"colorette": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
-			"integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="
-		},
-		"colorspace": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
-			"integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
-			"dev": true,
-			"requires": {
-				"color": "^3.1.3",
-				"text-hex": "1.0.x"
-			},
-			"dependencies": {
-				"color": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
-					"integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.3",
-						"color-string": "^1.6.0"
-					}
-				}
-			}
-		},
-		"columnify": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz",
-			"integrity": "sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==",
-			"dev": true,
-			"requires": {
-				"strip-ansi": "^6.0.1",
-				"wcwidth": "^1.0.0"
-			}
-		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
-		"command-exists": {
-			"version": "1.2.9",
-			"resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-			"integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
-		},
-		"command-score": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/command-score/-/command-score-0.1.2.tgz",
-			"integrity": "sha512-VtDvQpIJBvBatnONUsPzXYFVKQQAhuf3XTNOAsdBxCNO/QCtUUd8LSgjn0GVarBkCad6aJCZfXgrjYbl/KRr7w=="
-		},
-		"commander": {
-			"version": "9.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-9.2.0.tgz",
-			"integrity": "sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w==",
-			"dev": true
-		},
-		"comment-parser": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.0.tgz",
-			"integrity": "sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==",
-			"dev": true
-		},
-		"common-path-prefix": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-			"integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-			"dev": true
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
-		},
-		"compare-func": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
-			"integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
-			"dev": true,
-			"requires": {
-				"array-ify": "^1.0.0",
-				"dot-prop": "^5.1.0"
-			}
-		},
-		"complex.js": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.1.1.tgz",
-			"integrity": "sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg==",
-			"dev": true
-		},
-		"component-emitter": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
-		},
-		"compress-commons": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-5.0.1.tgz",
-			"integrity": "sha512-MPh//1cERdLtqwO3pOFLeXtpuai0Y2WCd5AhtKxznqM7WtaMYaOEMSgn45d9D10sIHSfIKE603HlOp8OPGrvag==",
-			"dev": true,
-			"requires": {
-				"crc-32": "^1.2.0",
-				"crc32-stream": "^5.0.0",
-				"normalize-path": "^3.0.0",
-				"readable-stream": "^3.6.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"compressible": {
-			"version": "2.0.18",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-			"integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-			"requires": {
-				"mime-db": ">= 1.43.0 < 2"
-			}
-		},
-		"compression": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.16",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.2",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"compute-scroll-into-view": {
-			"version": "1.0.16",
-			"resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz",
-			"integrity": "sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ=="
-		},
-		"computed-style": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/computed-style/-/computed-style-0.1.4.tgz",
-			"integrity": "sha512-WpAmaKbMNmS3OProfHIdJiNleNJdgUrJfbKArXua28QF7+0CoZjlLn0lp6vlc+dl5r2/X9GQiQRQQU4BzSa69w=="
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-		},
-		"concat-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
-			}
-		},
-		"concurrently": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-3.5.0.tgz",
-			"integrity": "sha512-Z2iVM5+c0VxKmENTXrG/kp+MUhWEEH+wI5wV/L8CTFJDb/uae1zSVIkNM7o3W4Tdt42pv7RGsOICaskWy9bqSA==",
-			"dev": true,
-			"requires": {
-				"chalk": "0.5.1",
-				"commander": "2.6.0",
-				"date-fns": "^1.23.0",
-				"lodash": "^4.5.1",
-				"rx": "2.3.24",
-				"spawn-command": "^0.0.2-1",
-				"supports-color": "^3.2.3",
-				"tree-kill": "^1.1.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-					"integrity": "sha512-sGwIGMjhYdW26/IhwK2gkWWI8DRCVO6uj3hYgHT+zD+QL1pa37tM3ujhyfcJIYSbsxp7Gxhy7zrRW/1AHm4BmA==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-					"integrity": "sha512-f2PKUkN5QngiSemowa6Mrk9MPCdtFiOSmibjZ+j1qhLGHHYsqZwmBMRF3IRMVXo8sybDqx2fJl2d/8OphBoWkA==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-					"integrity": "sha512-bIKA54hP8iZhyDT81TOsJiQvR1gW+ZYSXFaZUAvoD4wCHdbHY2actmpTE4x344ZlFqHbvoxKOaESULTZN2gstg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^1.1.0",
-						"escape-string-regexp": "^1.0.0",
-						"has-ansi": "^0.1.0",
-						"strip-ansi": "^0.3.0",
-						"supports-color": "^0.2.0"
-					},
-					"dependencies": {
-						"supports-color": {
-							"version": "0.2.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-							"integrity": "sha512-tdCZ28MnM7k7cJDJc7Eq80A9CsRFAAOZUy41npOZCs++qSjfIy7o5Rh46CBk+Dk5FbKJ33X3Tqg4YrV07N5RaA==",
-							"dev": true
-						}
-					}
-				},
-				"commander": {
-					"version": "2.6.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
-					"integrity": "sha512-PhbTMT+ilDXZKqH8xbvuUY2ZEQNef0Q7DKxgoEKb4ccytsdvVVJmYqR0sGbi96nxU6oGrwEIQnclpK2NBZuQlg==",
-					"dev": true
-				},
-				"date-fns": {
-					"version": "1.30.1",
-					"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
-					"integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
-					"dev": true
-				},
-				"has-ansi": {
-					"version": "0.1.0",
-					"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-					"integrity": "sha512-1YsTg1fk2/6JToQhtZkArMkurq8UoWU1Qe0aR3VUHjgij4nOylSWLWAtBXoZ4/dXOmugfLGm1c+QhuD0JyedFA==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^0.2.0"
-					}
-				},
-				"has-flag": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-					"integrity": "sha512-DerhZL7j6i6/nEnVG0qViKXI0OKouvvpsAiaj7c+LfqZZZxdwZtv8+UiA/w4VUJpT8UzX0pR1dcHOii1GbmruQ==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^0.2.1"
-					}
-				},
-				"supports-color": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^1.0.0"
-					}
-				}
-			}
-		},
-		"configstore": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-			"integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-			"dev": true,
-			"requires": {
-				"dot-prop": "^5.2.0",
-				"graceful-fs": "^4.1.2",
-				"make-dir": "^3.0.0",
-				"unique-string": "^2.0.0",
-				"write-file-atomic": "^3.0.0",
-				"xdg-basedir": "^4.0.0"
-			},
-			"dependencies": {
-				"write-file-atomic": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-					"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-					"dev": true,
-					"requires": {
-						"imurmurhash": "^0.1.4",
-						"is-typedarray": "^1.0.0",
-						"signal-exit": "^3.0.2",
-						"typedarray-to-buffer": "^3.1.5"
-					}
-				}
-			}
-		},
-		"connect": {
-			"version": "3.7.0",
-			"resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-			"integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-			"requires": {
-				"debug": "2.6.9",
-				"finalhandler": "1.1.2",
-				"parseurl": "~1.3.3",
-				"utils-merge": "1.0.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"connect-history-api-fallback": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-			"integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-			"dev": true
-		},
-		"consola": {
-			"version": "2.15.3",
-			"resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
-			"integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
-			"dev": true
-		},
-		"console-browserify": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-			"integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-			"dev": true
-		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
-			"dev": true
-		},
-		"constant-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz",
-			"integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==",
-			"requires": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3",
-				"upper-case": "^2.0.2"
-			}
-		},
-		"constants-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-			"integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-			"dev": true
-		},
-		"content-disposition": {
-			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "5.2.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				}
-			}
-		},
-		"content-type": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-			"dev": true
-		},
-		"conventional-changelog-angular": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz",
-			"integrity": "sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg==",
-			"dev": true,
-			"requires": {
-				"compare-func": "^2.0.0"
-			}
-		},
-		"conventional-changelog-core": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-5.0.1.tgz",
-			"integrity": "sha512-Rvi5pH+LvgsqGwZPZ3Cq/tz4ty7mjijhr3qR4m9IBXNbxGGYgTVVO+duXzz9aArmHxFtwZ+LRkrNIMDQzgoY4A==",
-			"dev": true,
-			"requires": {
-				"add-stream": "^1.0.0",
-				"conventional-changelog-writer": "^6.0.0",
-				"conventional-commits-parser": "^4.0.0",
-				"dateformat": "^3.0.3",
-				"get-pkg-repo": "^4.2.1",
-				"git-raw-commits": "^3.0.0",
-				"git-remote-origin-url": "^2.0.0",
-				"git-semver-tags": "^5.0.0",
-				"normalize-package-data": "^3.0.3",
-				"read-pkg": "^3.0.0",
-				"read-pkg-up": "^3.0.0"
-			},
-			"dependencies": {
-				"load-json-file": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-					"integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^4.0.0",
-						"pify": "^3.0.0",
-						"strip-bom": "^3.0.0"
-					}
-				},
-				"normalize-package-data": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-					"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^4.0.1",
-						"is-core-module": "^2.5.0",
-						"semver": "^7.3.4",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"parse-json": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-					"integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.3.1",
-						"json-parse-better-errors": "^1.0.1"
-					}
-				},
-				"pify": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-					"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-					"dev": true
-				},
-				"read-pkg": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-					"integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
-					"dev": true,
-					"requires": {
-						"load-json-file": "^4.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^3.0.0"
-					},
-					"dependencies": {
-						"hosted-git-info": {
-							"version": "2.8.9",
-							"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-							"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-							"dev": true
-						},
-						"normalize-package-data": {
-							"version": "2.5.0",
-							"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-							"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-							"dev": true,
-							"requires": {
-								"hosted-git-info": "^2.1.4",
-								"resolve": "^1.10.0",
-								"semver": "2 || 3 || 4 || 5",
-								"validate-npm-package-license": "^3.0.1"
-							}
-						},
-						"semver": {
-							"version": "5.7.2",
-							"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-							"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-							"dev": true
-						}
-					}
-				},
-				"read-pkg-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-					"integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^3.0.0"
-					}
-				},
-				"strip-bom": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-					"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-					"dev": true
-				}
-			}
-		},
-		"conventional-changelog-preset-loader": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-3.0.0.tgz",
-			"integrity": "sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA==",
-			"dev": true
-		},
-		"conventional-changelog-writer": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-6.0.1.tgz",
-			"integrity": "sha512-359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ==",
-			"dev": true,
-			"requires": {
-				"conventional-commits-filter": "^3.0.0",
-				"dateformat": "^3.0.3",
-				"handlebars": "^4.7.7",
-				"json-stringify-safe": "^5.0.1",
-				"meow": "^8.1.2",
-				"semver": "^7.0.0",
-				"split": "^1.0.1"
-			}
-		},
-		"conventional-commits-filter": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-3.0.0.tgz",
-			"integrity": "sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q==",
-			"dev": true,
-			"requires": {
-				"lodash.ismatch": "^4.4.0",
-				"modify-values": "^1.0.1"
-			}
-		},
-		"conventional-commits-parser": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz",
-			"integrity": "sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg==",
-			"dev": true,
-			"requires": {
-				"is-text-path": "^1.0.1",
-				"JSONStream": "^1.3.5",
-				"meow": "^8.1.2",
-				"split2": "^3.2.2"
-			}
-		},
-		"conventional-recommended-bump": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz",
-			"integrity": "sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA==",
-			"dev": true,
-			"requires": {
-				"concat-stream": "^2.0.0",
-				"conventional-changelog-preset-loader": "^3.0.0",
-				"conventional-commits-filter": "^3.0.0",
-				"conventional-commits-parser": "^4.0.0",
-				"git-raw-commits": "^3.0.0",
-				"git-semver-tags": "^5.0.0",
-				"meow": "^8.1.2"
-			},
-			"dependencies": {
-				"concat-stream": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-					"integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
-					"dev": true,
-					"requires": {
-						"buffer-from": "^1.0.0",
-						"inherits": "^2.0.3",
-						"readable-stream": "^3.0.2",
-						"typedarray": "^0.0.6"
-					}
-				},
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"convert-source-map": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-		},
-		"cookie": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-			"dev": true
-		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-			"dev": true
-		},
-		"copy-concurrently": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-			"dev": true,
-			"requires": {
-				"aproba": "^1.1.1",
-				"fs-write-stream-atomic": "^1.0.8",
-				"iferr": "^0.1.5",
-				"mkdirp": "^0.5.1",
-				"rimraf": "^2.5.4",
-				"run-queue": "^1.0.0"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.6",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-					"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.6"
-					}
-				},
-				"rimraf": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
-			}
-		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw=="
-		},
-		"copy-dir": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/copy-dir/-/copy-dir-1.3.0.tgz",
-			"integrity": "sha512-Q4+qBFnN4bwGwvtXXzbp4P/4iNk0MaiGAzvQ8OiMtlLjkIKjmNN689uVzShSM0908q7GoFHXIPx4zi75ocoaHw==",
-			"dev": true
-		},
-		"copy-webpack-plugin": {
-			"version": "10.2.0",
-			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.0.tgz",
-			"integrity": "sha512-my6iXII95c78w14HzYCNya5TlJYa44lOppAge5GSTMM1SyDxNsVGCJvhP4/ld6snm8lzjn3XOonMZD6s1L86Og==",
-			"dev": true,
-			"requires": {
-				"fast-glob": "^3.2.7",
-				"glob-parent": "^6.0.1",
-				"globby": "^12.0.2",
-				"normalize-path": "^3.0.0",
-				"schema-utils": "^4.0.0",
-				"serialize-javascript": "^6.0.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"array-union": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
-					"integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
-					"dev": true
-				},
-				"glob-parent": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.3"
-					}
-				},
-				"globby": {
-					"version": "12.2.0",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
-					"integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
-					"dev": true,
-					"requires": {
-						"array-union": "^3.0.1",
-						"dir-glob": "^3.0.1",
-						"fast-glob": "^3.2.7",
-						"ignore": "^5.1.9",
-						"merge2": "^1.4.1",
-						"slash": "^4.0.0"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-					"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.9.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.1.0"
-					}
-				},
-				"serialize-javascript": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-					"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-					"dev": true,
-					"requires": {
-						"randombytes": "^2.1.0"
-					}
-				},
-				"slash": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-					"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-					"dev": true
-				}
-			}
-		},
-		"core-js": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
-			"integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ=="
-		},
-		"core-js-builder": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.31.0.tgz",
-			"integrity": "sha512-qx8vgRM3U4+IjlMqNQl7Vj53ectTm1FpzJ+nJSQuT865StCXvusxCO+HuASWIKlkoc+96AfnFa2MEdqvGep9nA==",
-			"dev": true,
-			"requires": {
-				"core-js": "3.31.0",
-				"core-js-compat": "3.31.0",
-				"mkdirp": ">=0.5.5 <1",
-				"webpack": ">=4.46.0 <5"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"commander": {
-					"version": "2.20.3",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-					"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-					"dev": true
-				},
-				"fill-range": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-					"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-					"dev": true,
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-number": "^3.0.0",
-						"repeat-string": "^1.6.1",
-						"to-regex-range": "^2.1.0"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"json5": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-					"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				},
-				"loader-utils": {
-					"version": "1.4.2",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-					"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-					"dev": true,
-					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^3.0.0",
-						"json5": "^1.0.1"
-					}
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.6",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-					"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.6"
-					}
-				},
-				"terser": {
-					"version": "4.8.1",
-					"resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
-					"integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
-					"dev": true,
-					"requires": {
-						"commander": "^2.20.0",
-						"source-map": "~0.6.1",
-						"source-map-support": "~0.5.12"
-					}
-				},
-				"terser-webpack-plugin": {
-					"version": "1.4.5",
-					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-					"integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-					"dev": true,
-					"requires": {
-						"cacache": "^12.0.2",
-						"find-cache-dir": "^2.1.0",
-						"is-wsl": "^1.1.0",
-						"schema-utils": "^1.0.0",
-						"serialize-javascript": "^4.0.0",
-						"source-map": "^0.6.1",
-						"terser": "^4.1.2",
-						"webpack-sources": "^1.4.0",
-						"worker-farm": "^1.7.0"
-					}
-				},
-				"webpack": {
-					"version": "4.46.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
-					"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
-					"dev": true,
-					"requires": {
-						"@webassemblyjs/ast": "1.9.0",
-						"@webassemblyjs/helper-module-context": "1.9.0",
-						"@webassemblyjs/wasm-edit": "1.9.0",
-						"@webassemblyjs/wasm-parser": "1.9.0",
-						"acorn": "^6.4.1",
-						"ajv": "^6.10.2",
-						"ajv-keywords": "^3.4.1",
-						"chrome-trace-event": "^1.0.2",
-						"enhanced-resolve": "^4.5.0",
-						"eslint-scope": "^4.0.3",
-						"json-parse-better-errors": "^1.0.2",
-						"loader-runner": "^2.4.0",
-						"loader-utils": "^1.2.3",
-						"memory-fs": "^0.4.1",
-						"micromatch": "^3.1.10",
-						"mkdirp": "^0.5.3",
-						"neo-async": "^2.6.1",
-						"node-libs-browser": "^2.2.1",
-						"schema-utils": "^1.0.0",
-						"tapable": "^1.1.3",
-						"terser-webpack-plugin": "^1.4.3",
-						"watchpack": "^1.7.4",
-						"webpack-sources": "^1.4.1"
-					}
-				},
-				"webpack-sources": {
-					"version": "1.4.3",
-					"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-					"integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-					"dev": true,
-					"requires": {
-						"source-list-map": "^2.0.0",
-						"source-map": "~0.6.1"
-					}
-				}
-			}
-		},
-		"core-js-compat": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-			"integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
-			"requires": {
-				"browserslist": "^4.21.5"
-			}
-		},
-		"core-js-pure": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.31.0.tgz",
-			"integrity": "sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg==",
-			"dev": true
-		},
-		"core-util-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
-		},
-		"cosmiconfig": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-			"requires": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.2.1",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.10.0"
-			},
-			"dependencies": {
-				"path-type": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-					"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
-				}
-			}
-		},
-		"crc-32": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
-			"integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
-			"dev": true
-		},
-		"crc32-stream": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-5.0.0.tgz",
-			"integrity": "sha512-B0EPa1UK+qnpBZpG+7FgPCu0J2ETLpXq09o9BkLkEAhdB6Z61Qo4pJ3JYu0c+Qi+/SAL7QThqnzS06pmSSyZaw==",
-			"dev": true,
-			"requires": {
-				"crc-32": "^1.2.0",
-				"readable-stream": "^3.4.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"create-ecdh": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-			"integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-			"dev": true,
-			"requires": {
-				"bn.js": "^4.1.0",
-				"elliptic": "^6.5.3"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
-			}
-		},
-		"create-hash": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-			"dev": true,
-			"requires": {
-				"cipher-base": "^1.0.1",
-				"inherits": "^2.0.1",
-				"md5.js": "^1.3.4",
-				"ripemd160": "^2.0.1",
-				"sha.js": "^2.4.0"
-			}
-		},
-		"create-hmac": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-			"dev": true,
-			"requires": {
-				"cipher-base": "^1.0.3",
-				"create-hash": "^1.1.0",
-				"inherits": "^2.0.1",
-				"ripemd160": "^2.0.0",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
-			}
-		},
-		"create-require": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-			"dev": true
-		},
-		"cross-env": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-3.2.4.tgz",
-			"integrity": "sha512-T8AFEAiuJ0w53ou6rnu3Fipaiu1W6ZO9GYfd33uxe1kAIiXM0fD8QnIm7orcJBOt7WQC5Ply63E7WZW/jSM+FA==",
-			"dev": true,
-			"requires": {
-				"cross-spawn": "^5.1.0",
-				"is-windows": "^1.0.0"
-			}
-		},
-		"cross-fetch": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-			"integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
-			"dev": true,
-			"requires": {
-				"node-fetch": "2.6.7"
-			},
-			"dependencies": {
-				"node-fetch": {
-					"version": "2.6.7",
-					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-					"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-					"dev": true,
-					"requires": {
-						"whatwg-url": "^5.0.0"
-					}
-				}
-			}
-		},
-		"cross-spawn": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-			"integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
-			"dev": true,
-			"requires": {
-				"lru-cache": "^4.0.1",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
-			}
-		},
-		"crypto-browserify": {
-			"version": "3.12.0",
-			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-			"dev": true,
-			"requires": {
-				"browserify-cipher": "^1.0.0",
-				"browserify-sign": "^4.0.0",
-				"create-ecdh": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"create-hmac": "^1.1.0",
-				"diffie-hellman": "^5.0.0",
-				"inherits": "^2.0.1",
-				"pbkdf2": "^3.0.3",
-				"public-encrypt": "^4.0.0",
-				"randombytes": "^2.0.0",
-				"randomfill": "^1.0.3"
-			}
-		},
-		"crypto-random-string": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-			"integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-			"dev": true
-		},
-		"csp_evaluator": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/csp_evaluator/-/csp_evaluator-1.1.1.tgz",
-			"integrity": "sha512-N3ASg0C4kNPUaNxt1XAvzHIVuzdtr8KLgfk1O8WDyimp1GisPAHESupArO2ieHk9QWbrJ/WkQODyh21Ps/xhxw==",
-			"dev": true
-		},
-		"css": {
-			"version": "2.2.4",
-			"resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-			"integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-			"requires": {
-				"inherits": "^2.0.3",
-				"source-map": "^0.6.1",
-				"source-map-resolve": "^0.5.2",
-				"urix": "^0.1.0"
-			}
-		},
-		"css-color-keywords": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-			"integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg=="
-		},
-		"css-declaration-sorter": {
-			"version": "6.4.1",
-			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
-			"integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
-			"dev": true
-		},
-		"css-loader": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.2.0.tgz",
-			"integrity": "sha512-/rvHfYRjIpymZblf49w8jYcRo2y9gj6rV8UroHGmBxKrIyGLokpycyKzp9OkitvqT29ZSpzJ0Ic7SpnJX3sC8g==",
-			"dev": true,
-			"requires": {
-				"icss-utils": "^5.1.0",
-				"postcss": "^8.2.15",
-				"postcss-modules-extract-imports": "^3.0.0",
-				"postcss-modules-local-by-default": "^4.0.0",
-				"postcss-modules-scope": "^3.0.0",
-				"postcss-modules-values": "^4.0.0",
-				"postcss-value-parser": "^4.1.0",
-				"semver": "^7.3.5"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"css-mediaquery": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/css-mediaquery/-/css-mediaquery-0.1.2.tgz",
-			"integrity": "sha512-COtn4EROW5dBGlE/4PiKnh6rZpAPxDeFLaEEwt4i10jpDMFt2EhQGS79QmmrO+iKCHv0PU/HrOWEhijFd1x99Q=="
-		},
-		"css-select": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-			"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-			"requires": {
-				"boolbase": "^1.0.0",
-				"css-what": "^6.1.0",
-				"domhandler": "^5.0.2",
-				"domutils": "^3.0.1",
-				"nth-check": "^2.0.1"
-			},
-			"dependencies": {
-				"dom-serializer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-					"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-					"requires": {
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.2",
-						"entities": "^4.2.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-				},
-				"domhandler": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-					"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-					"requires": {
-						"domelementtype": "^2.3.0"
-					}
-				},
-				"domutils": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-					"integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-					"requires": {
-						"dom-serializer": "^2.0.0",
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.3"
-					}
-				},
-				"entities": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-					"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
-				}
-			}
-		},
-		"css-shorthand-properties": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz",
-			"integrity": "sha512-Md+Juc7M3uOdbAFwOYlTrccIZ7oCFuzrhKYQjdeUEW/sE1hv17Jp/Bws+ReOPpGVBTYCBoYo+G17V5Qo8QQ75A==",
-			"dev": true
-		},
-		"css-to-react-native": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz",
-			"integrity": "sha512-VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw==",
-			"requires": {
-				"camelize": "^1.0.0",
-				"css-color-keywords": "^1.0.0",
-				"postcss-value-parser": "^3.3.0"
-			}
-		},
-		"css-to-react-native-transform": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/css-to-react-native-transform/-/css-to-react-native-transform-1.9.0.tgz",
-			"integrity": "sha512-darzotx5xx+Q0bzASkvNBasztLCssNerzf9jpMZx0H4CTY6J/y2Wh50ZtYAJ3FmESEux1bJcGa6T0zfISTuFqw==",
-			"requires": {
-				"css": "^2.2.4",
-				"css-mediaquery": "^0.1.2",
-				"css-to-react-native": "^2.3.0"
-			}
-		},
-		"css-tree": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-			"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-			"requires": {
-				"mdn-data": "2.0.14",
-				"source-map": "^0.6.1"
-			}
-		},
-		"css-value": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
-			"integrity": "sha512-FUV3xaJ63buRLgHrLQVlVgQnQdR4yqdLGaDu7g8CQcWjInDfM9plBTPI9FRfpahju1UBSaMckeb2/46ApS/V1Q==",
-			"dev": true
-		},
-		"css-what": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
-		},
-		"css.escape": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-			"integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
-			"dev": true
-		},
-		"cssesc": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-			"dev": true
-		},
-		"cssnano": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz",
-			"integrity": "sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==",
-			"dev": true,
-			"requires": {
-				"cssnano-preset-default": "^6.0.1",
-				"lilconfig": "^2.1.0"
-			}
-		},
-		"cssnano-preset-default": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz",
-			"integrity": "sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==",
-			"dev": true,
-			"requires": {
-				"css-declaration-sorter": "^6.3.1",
-				"cssnano-utils": "^4.0.0",
-				"postcss-calc": "^9.0.0",
-				"postcss-colormin": "^6.0.0",
-				"postcss-convert-values": "^6.0.0",
-				"postcss-discard-comments": "^6.0.0",
-				"postcss-discard-duplicates": "^6.0.0",
-				"postcss-discard-empty": "^6.0.0",
-				"postcss-discard-overridden": "^6.0.0",
-				"postcss-merge-longhand": "^6.0.0",
-				"postcss-merge-rules": "^6.0.1",
-				"postcss-minify-font-values": "^6.0.0",
-				"postcss-minify-gradients": "^6.0.0",
-				"postcss-minify-params": "^6.0.0",
-				"postcss-minify-selectors": "^6.0.0",
-				"postcss-normalize-charset": "^6.0.0",
-				"postcss-normalize-display-values": "^6.0.0",
-				"postcss-normalize-positions": "^6.0.0",
-				"postcss-normalize-repeat-style": "^6.0.0",
-				"postcss-normalize-string": "^6.0.0",
-				"postcss-normalize-timing-functions": "^6.0.0",
-				"postcss-normalize-unicode": "^6.0.0",
-				"postcss-normalize-url": "^6.0.0",
-				"postcss-normalize-whitespace": "^6.0.0",
-				"postcss-ordered-values": "^6.0.0",
-				"postcss-reduce-initial": "^6.0.0",
-				"postcss-reduce-transforms": "^6.0.0",
-				"postcss-svgo": "^6.0.0",
-				"postcss-unique-selectors": "^6.0.0"
-			}
-		},
-		"cssnano-utils": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.0.tgz",
-			"integrity": "sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==",
-			"dev": true
-		},
-		"csso": {
-			"version": "5.0.5",
-			"resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
-			"integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
-			"dev": true,
-			"requires": {
-				"css-tree": "~2.2.0"
-			},
-			"dependencies": {
-				"css-tree": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
-					"integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
-					"dev": true,
-					"requires": {
-						"mdn-data": "2.0.28",
-						"source-map-js": "^1.0.1"
-					}
-				},
-				"mdn-data": {
-					"version": "2.0.28",
-					"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-					"integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
-					"dev": true
-				},
-				"source-map-js": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-					"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-					"dev": true
-				}
-			}
-		},
-		"cssstyle": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
-			"integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
-			"dev": true,
-			"requires": {
-				"rrweb-cssom": "^0.6.0"
-			}
-		},
-		"csstype": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-			"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
-		},
-		"cwd": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
-			"integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
-			"dev": true,
-			"requires": {
-				"find-pkg": "^0.1.2",
-				"fs-exists-sync": "^0.1.0"
-			}
-		},
-		"cyclist": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-			"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
-			"dev": true
-		},
-		"damerau-levenshtein": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-			"integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-			"dev": true
-		},
-		"dargs": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz",
-			"integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==",
-			"dev": true
-		},
-		"data-uri-to-buffer": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz",
-			"integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==",
-			"dev": true
-		},
-		"data-urls": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
-			"integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.6",
-				"whatwg-mimetype": "^3.0.0",
-				"whatwg-url": "^12.0.0"
-			},
-			"dependencies": {
-				"tr46": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-					"integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
-					"dev": true,
-					"requires": {
-						"punycode": "^2.3.0"
-					}
-				},
-				"webidl-conversions": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-					"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-					"dev": true
-				},
-				"whatwg-url": {
-					"version": "12.0.1",
-					"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-					"integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
-					"dev": true,
-					"requires": {
-						"tr46": "^4.1.1",
-						"webidl-conversions": "^7.0.0"
-					}
-				}
-			}
-		},
-		"date-fns": {
-			"version": "2.30.0",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-			"integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-			"requires": {
-				"@babel/runtime": "^7.21.0"
-			}
-		},
-		"dateformat": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-			"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-			"dev": true
-		},
-		"dayjs": {
-			"version": "1.11.9",
-			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz",
-			"integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA=="
-		},
-		"debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-			"requires": {
-				"ms": "2.1.2"
-			},
-			"dependencies": {
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-				}
-			}
-		},
-		"decache": {
-			"version": "4.5.1",
-			"resolved": "https://registry.npmjs.org/decache/-/decache-4.5.1.tgz",
-			"integrity": "sha512-5J37nATc6FmOTLbcsr9qx7Nm28qQyg1SK4xyEHqM0IBkNhWFp0Sm+vKoWYHD8wq+OUEb9jLyaKFfzzd1A9hcoA==",
-			"dev": true,
-			"requires": {
-				"callsite": "^1.0.0"
-			}
-		},
-		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
-		},
-		"decamelize-keys": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-			"dev": true,
-			"requires": {
-				"decamelize": "^1.1.0",
-				"map-obj": "^1.0.0"
-			}
-		},
-		"decimal.js": {
-			"version": "10.4.3",
-			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-			"integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-			"dev": true
-		},
-		"decode-uri-component": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-			"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
-		},
-		"decompress-response": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-			"integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-			"dev": true,
-			"requires": {
-				"mimic-response": "^3.1.0"
-			},
-			"dependencies": {
-				"mimic-response": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-					"integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-					"dev": true
-				}
-			}
-		},
-		"dedent": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-			"integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
-			"dev": true
-		},
-		"deep-extend": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-			"dev": true
-		},
-		"deep-freeze": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz",
-			"integrity": "sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg==",
-			"dev": true
-		},
-		"deep-is": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-			"dev": true
-		},
-		"deepmerge": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
-		},
-		"deepmerge-ts": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-5.1.0.tgz",
-			"integrity": "sha512-eS8dRJOckyo9maw9Tu5O5RUi/4inFLrnoLkBe3cPfDMx3WZioXtmOew4TXQaxq7Rhl4xjDtR7c6x8nNTxOvbFw==",
-			"dev": true
-		},
-		"deepsignal": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/deepsignal/-/deepsignal-1.3.6.tgz",
-			"integrity": "sha512-yjd+vtiznL6YaMptOsKnEKkPr60OEApa+LRe+Qe6Ile/RfCOrELKk/YM3qVpXFZiyOI3Ng67GDEyjAlqVc697g=="
-		},
-		"default-browser": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz",
-			"integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==",
-			"dev": true,
-			"requires": {
-				"bundle-name": "^3.0.0",
-				"default-browser-id": "^3.0.0",
-				"execa": "^7.1.1",
-				"titleize": "^3.0.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
-					"integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.1",
-						"human-signals": "^4.3.0",
-						"is-stream": "^3.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^5.1.0",
-						"onetime": "^6.0.0",
-						"signal-exit": "^3.0.7",
-						"strip-final-newline": "^3.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"human-signals": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
-					"integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-					"integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-					"integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-					"integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
-					"dev": true,
-					"requires": {
-						"path-key": "^4.0.0"
-					},
-					"dependencies": {
-						"path-key": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-							"integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-							"dev": true
-						}
-					}
-				},
-				"onetime": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-					"integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^4.0.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"strip-final-newline": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-					"integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"default-browser-id": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz",
-			"integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==",
-			"dev": true,
-			"requires": {
-				"bplist-parser": "^0.2.0",
-				"untildify": "^4.0.0"
-			}
-		},
-		"default-gateway": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-			"integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-			"dev": true,
-			"requires": {
-				"execa": "^5.0.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"human-signals": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-					"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"defaults": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-			"integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-			"requires": {
-				"clone": "^1.0.2"
-			}
-		},
-		"defer-to-connect": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-			"integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-			"dev": true
-		},
-		"define-lazy-prop": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-			"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-			"dev": true
-		},
-		"define-properties": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-			"integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-			"dev": true,
-			"requires": {
-				"has-property-descriptors": "^1.0.0",
-				"object-keys": "^1.1.1"
-			}
-		},
-		"define-property": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-			"requires": {
-				"is-descriptor": "^1.0.2",
-				"isobject": "^3.0.1"
-			},
-			"dependencies": {
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
-			}
-		},
-		"defu": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/defu/-/defu-6.1.2.tgz",
-			"integrity": "sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==",
-			"dev": true
-		},
-		"degenerator": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
-			"integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
-			"dev": true,
-			"requires": {
-				"ast-types": "^0.13.4",
-				"escodegen": "^2.1.0",
-				"esprima": "^4.0.1"
-			},
-			"dependencies": {
-				"ast-types": {
-					"version": "0.13.4",
-					"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
-					"integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
-					"dev": true,
-					"requires": {
-						"tslib": "^2.0.1"
-					}
-				}
-			}
-		},
-		"del": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-			"integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-			"dev": true,
-			"requires": {
-				"@types/glob": "^7.1.1",
-				"globby": "^6.1.0",
-				"is-path-cwd": "^2.0.0",
-				"is-path-in-cwd": "^2.0.0",
-				"p-map": "^2.0.0",
-				"pify": "^4.0.1",
-				"rimraf": "^2.6.3"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"globby": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-					"integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"glob": "^7.0.3",
-						"object-assign": "^4.0.1",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "2.3.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-							"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-							"dev": true
-						}
-					}
-				},
-				"p-map": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-					"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-					"dev": true
-				},
-				"pify": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-					"dev": true
-				},
-				"rimraf": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
-			}
-		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-			"dev": true
-		},
-		"delegate": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-			"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-		},
-		"delegates": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-			"integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-			"dev": true
-		},
-		"denodeify": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz",
-			"integrity": "sha512-KNTihKNmQENUZeKu5fzfpzRqR5S2VMp4gl9RFHiWzj9DfvYQPMJ6XHKNaQxaGCXwPk6y9yme3aUoaiAe+KX+vg=="
-		},
-		"depd": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-			"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-			"dev": true
-		},
-		"deprecated-react-native-prop-types": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/deprecated-react-native-prop-types/-/deprecated-react-native-prop-types-2.3.0.tgz",
-			"integrity": "sha512-pWD0voFtNYxrVqvBMYf5gq3NA2GCpfodS1yNynTPc93AYA/KEMGeWDqqeUB6R2Z9ZofVhks2aeJXiuQqKNpesA==",
-			"requires": {
-				"@react-native/normalize-color": "*",
-				"invariant": "*",
-				"prop-types": "*"
-			}
-		},
-		"deprecation": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-			"integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
-			"dev": true
-		},
-		"dequal": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-			"integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
-			"dev": true
-		},
-		"des.js": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0"
-			}
-		},
-		"destroy": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-		},
-		"detect-indent": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
-			"integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==",
-			"dev": true
-		},
-		"detect-libc": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
-			"integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
-			"dev": true,
-			"optional": true
-		},
-		"detect-newline": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true
-		},
-		"detect-node": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-			"dev": true
-		},
-		"detect-node-es": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
-			"integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="
-		},
-		"detect-package-manager": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/detect-package-manager/-/detect-package-manager-2.0.1.tgz",
-			"integrity": "sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==",
-			"dev": true,
-			"requires": {
-				"execa": "^5.1.1"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"human-signals": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-					"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"detect-port": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.5.1.tgz",
-			"integrity": "sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==",
-			"dev": true,
-			"requires": {
-				"address": "^1.0.1",
-				"debug": "4"
-			}
-		},
-		"devtools-protocol": {
-			"version": "0.0.981744",
-			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
-			"integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
-			"dev": true
-		},
-		"diff": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
-		},
-		"diff-sequences": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
-			"integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
-			"dev": true
-		},
-		"diffie-hellman": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-			"dev": true,
-			"requires": {
-				"bn.js": "^4.1.0",
-				"miller-rabin": "^4.0.0",
-				"randombytes": "^2.0.0"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
-			}
-		},
-		"dir-glob": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-			"dev": true,
-			"requires": {
-				"path-type": "^4.0.0"
-			},
-			"dependencies": {
-				"path-type": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-					"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-					"dev": true
-				}
-			}
-		},
-		"dns-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-			"dev": true
-		},
-		"dns-packet": {
-			"version": "5.6.1",
-			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
-			"integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
-			"dev": true,
-			"requires": {
-				"@leichtgewicht/ip-codec": "^2.0.1"
-			}
-		},
-		"doctrine": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-			"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-			"dev": true,
-			"requires": {
-				"esutils": "^2.0.2"
-			}
-		},
-		"dom-accessibility-api": {
-			"version": "0.5.14",
-			"resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz",
-			"integrity": "sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg==",
-			"dev": true
-		},
-		"dom-converter": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-			"integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-			"dev": true,
-			"requires": {
-				"utila": "~0.4"
-			}
-		},
-		"dom-scroll-into-view": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz",
-			"integrity": "sha512-LwNVg3GJOprWDO+QhLL1Z9MMgWe/KAFLxVWKzjRTxNSPn8/LLDIfmuG71YHznXCqaqTjvHJDYO1MEAgX6XCNbQ=="
-		},
-		"dom-serializer": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-			"integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-			"requires": {
-				"domelementtype": "^2.0.1",
-				"entities": "^2.0.0"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-				},
-				"entities": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-					"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
-				}
-			}
-		},
-		"domain-browser": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-			"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-			"dev": true
-		},
-		"domelementtype": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-			"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-		},
-		"domexception": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-			"integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-			"dev": true,
-			"requires": {
-				"webidl-conversions": "^7.0.0"
-			},
-			"dependencies": {
-				"webidl-conversions": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-					"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-					"dev": true
-				}
-			}
-		},
-		"domhandler": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-			"integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-			"requires": {
-				"domelementtype": "1"
-			}
-		},
-		"domutils": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-			"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-			"requires": {
-				"dom-serializer": "0",
-				"domelementtype": "1"
-			}
-		},
-		"dot-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-			"integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-			"requires": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3"
-			}
-		},
-		"dot-prop": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-			"integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-			"dev": true,
-			"requires": {
-				"is-obj": "^2.0.0"
-			},
-			"dependencies": {
-				"is-obj": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-					"integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-					"dev": true
-				}
-			}
-		},
-		"dotenv": {
-			"version": "16.3.1",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
-			"integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
-			"dev": true
-		},
-		"dotenv-expand": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
-			"integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
-			"dev": true
-		},
-		"downshift": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.0.tgz",
-			"integrity": "sha512-MnEJERij+1pTVAsOPsH3q9MJGNIZuu2sT90uxOCEOZYH6sEzkVGtUcTBVDRQkE8y96zpB7uEbRn24aE9VpHnZg==",
-			"requires": {
-				"@babel/runtime": "^7.12.5",
-				"compute-scroll-into-view": "^1.0.16",
-				"prop-types": "^15.7.2",
-				"react-is": "^17.0.1"
-			},
-			"dependencies": {
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-				}
-			}
-		},
-		"duplexer": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-			"dev": true
-		},
-		"duplexer2": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-			"integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
-			"dev": true,
-			"requires": {
-				"readable-stream": "^2.0.2"
-			}
-		},
-		"duplexify": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
-			"integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "^1.0.0",
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0",
-				"stream-shift": "^1.0.0"
-			}
-		},
-		"eastasianwidth": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-			"integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-			"dev": true
-		},
-		"edge-paths": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-3.0.5.tgz",
-			"integrity": "sha512-sB7vSrDnFa4ezWQk9nZ/n0FdpdUuC6R1EOrlU3DL+bovcNFK28rqu2emmAUjujYEJTWIgQGqgVVWUZXMnc8iWg==",
-			"dev": true,
-			"requires": {
-				"@types/which": "^2.0.1",
-				"which": "^2.0.2"
-			},
-			"dependencies": {
-				"@types/which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"edgedriver": {
-			"version": "5.3.7",
-			"resolved": "https://registry.npmjs.org/edgedriver/-/edgedriver-5.3.7.tgz",
-			"integrity": "sha512-E1qNFEA9NbaCPSvGaeZhyd7mEZLar+oFS0NRAe5TehJcQ3cayoUdJE5uOFrbxdv/rM4NEPH7aK9a9kgG09rszA==",
-			"dev": true,
-			"requires": {
-				"@wdio/logger": "^8.11.0",
-				"decamelize": "^6.0.0",
-				"edge-paths": "^3.0.5",
-				"node-fetch": "^3.3.2",
-				"unzipper": "^0.10.14",
-				"which": "^4.0.0"
-			},
-			"dependencies": {
-				"data-uri-to-buffer": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
-					"integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
-					"dev": true
-				},
-				"decamelize": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
-					"integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
-					"dev": true
-				},
-				"isexe": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-					"integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-					"dev": true
-				},
-				"node-fetch": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
-					"integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
-					"dev": true,
-					"requires": {
-						"data-uri-to-buffer": "^4.0.0",
-						"fetch-blob": "^3.1.4",
-						"formdata-polyfill": "^4.0.10"
-					}
-				},
-				"which": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-					"integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
-					"dev": true,
-					"requires": {
-						"isexe": "^3.1.1"
-					}
-				}
-			}
-		},
-		"ee-first": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-		},
-		"ejs": {
-			"version": "3.1.9",
-			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-			"integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
-			"dev": true,
-			"requires": {
-				"jake": "^10.8.5"
-			}
-		},
-		"electron-to-chromium": {
-			"version": "1.4.525",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.525.tgz",
-			"integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA=="
-		},
-		"elegant-spinner": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
-			"integrity": "sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ==",
-			"dev": true
-		},
-		"elliptic": {
-			"version": "6.5.4",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-			"dev": true,
-			"requires": {
-				"bn.js": "^4.11.9",
-				"brorand": "^1.1.0",
-				"hash.js": "^1.0.0",
-				"hmac-drbg": "^1.0.1",
-				"inherits": "^2.0.4",
-				"minimalistic-assert": "^1.0.1",
-				"minimalistic-crypto-utils": "^1.0.1"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				},
-				"inherits": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-					"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-					"dev": true
-				}
-			}
-		},
-		"emittery": {
-			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-			"dev": true
-		},
-		"emoji-regex": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-		},
-		"emojis-list": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-			"dev": true
-		},
-		"enabled": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
-			"integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==",
-			"dev": true
-		},
-		"encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-		},
-		"encoding": {
-			"version": "0.1.13",
-			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-			"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-			"requires": {
-				"iconv-lite": "^0.6.2"
-			}
-		},
-		"end-of-stream": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-			"requires": {
-				"once": "^1.4.0"
-			}
-		},
-		"endent": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/endent/-/endent-2.1.0.tgz",
-			"integrity": "sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w==",
-			"dev": true,
-			"requires": {
-				"dedent": "^0.7.0",
-				"fast-json-parse": "^1.0.3",
-				"objectorarray": "^1.0.5"
-			}
-		},
-		"enhanced-resolve": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
-			"integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"memory-fs": "^0.5.0",
-				"tapable": "^1.0.0"
-			},
-			"dependencies": {
-				"memory-fs": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-					"integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				}
-			}
-		},
-		"enquirer": {
-			"version": "2.3.6",
-			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-			"dev": true,
-			"requires": {
-				"ansi-colors": "^4.1.1"
-			}
-		},
-		"entities": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-			"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
-		},
-		"env-paths": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-			"integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-			"dev": true
-		},
-		"envinfo": {
-			"version": "7.10.0",
-			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz",
-			"integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw=="
-		},
-		"equivalent-key-map": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/equivalent-key-map/-/equivalent-key-map-0.2.2.tgz",
-			"integrity": "sha512-xvHeyCDbZzkpN4VHQj/n+j2lOwL0VWszG30X4cOrc9Y7Tuo2qCdZK/0AMod23Z5dCtNUbaju6p0rwOhHUk05ew=="
-		},
-		"err-code": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-			"integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
-			"dev": true
-		},
-		"errno": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-			"integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-			"dev": true,
-			"requires": {
-				"prr": "~1.0.1"
-			}
-		},
-		"error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"requires": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
-		"error-stack-parser": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz",
-			"integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==",
-			"requires": {
-				"stackframe": "^1.1.1"
-			}
-		},
-		"errorhandler": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz",
-			"integrity": "sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==",
-			"requires": {
-				"accepts": "~1.3.7",
-				"escape-html": "~1.0.3"
-			}
-		},
-		"es-abstract": {
-			"version": "1.22.1",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-			"integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
-			"dev": true,
-			"requires": {
-				"array-buffer-byte-length": "^1.0.0",
-				"arraybuffer.prototype.slice": "^1.0.1",
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"es-set-tostringtag": "^2.0.1",
-				"es-to-primitive": "^1.2.1",
-				"function.prototype.name": "^1.1.5",
-				"get-intrinsic": "^1.2.1",
-				"get-symbol-description": "^1.0.0",
-				"globalthis": "^1.0.3",
-				"gopd": "^1.0.1",
-				"has": "^1.0.3",
-				"has-property-descriptors": "^1.0.0",
-				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3",
-				"internal-slot": "^1.0.5",
-				"is-array-buffer": "^3.0.2",
-				"is-callable": "^1.2.7",
-				"is-negative-zero": "^2.0.2",
-				"is-regex": "^1.1.4",
-				"is-shared-array-buffer": "^1.0.2",
-				"is-string": "^1.0.7",
-				"is-typed-array": "^1.1.10",
-				"is-weakref": "^1.0.2",
-				"object-inspect": "^1.12.3",
-				"object-keys": "^1.1.1",
-				"object.assign": "^4.1.4",
-				"regexp.prototype.flags": "^1.5.0",
-				"safe-array-concat": "^1.0.0",
-				"safe-regex-test": "^1.0.0",
-				"string.prototype.trim": "^1.2.7",
-				"string.prototype.trimend": "^1.0.6",
-				"string.prototype.trimstart": "^1.0.6",
-				"typed-array-buffer": "^1.0.0",
-				"typed-array-byte-length": "^1.0.0",
-				"typed-array-byte-offset": "^1.0.0",
-				"typed-array-length": "^1.0.4",
-				"unbox-primitive": "^1.0.2",
-				"which-typed-array": "^1.1.10"
-			}
-		},
-		"es-get-iterator": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-			"integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.3",
-				"has-symbols": "^1.0.3",
-				"is-arguments": "^1.1.1",
-				"is-map": "^2.0.2",
-				"is-set": "^2.0.2",
-				"is-string": "^1.0.7",
-				"isarray": "^2.0.5",
-				"stop-iteration-iterator": "^1.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-					"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-					"dev": true
-				}
-			}
-		},
-		"es-module-lexer": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
-			"integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
-			"dev": true
-		},
-		"es-module-shims": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.2.tgz",
-			"integrity": "sha512-7vIYVzpOhXtpc3Yn03itB+GSgVZFW7oL4kdydA+iL+IEi7HiSLBUxM05QFw4SxTl6e++pMpGqZPo2+vdNs3TbA=="
-		},
-		"es-set-tostringtag": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-			"integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-			"dev": true,
-			"requires": {
-				"get-intrinsic": "^1.1.3",
-				"has": "^1.0.3",
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"es-shim-unscopables": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-			"integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-			"dev": true,
-			"requires": {
-				"has": "^1.0.3"
-			}
-		},
-		"es-to-primitive": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-			"dev": true,
-			"requires": {
-				"is-callable": "^1.1.4",
-				"is-date-object": "^1.0.1",
-				"is-symbol": "^1.0.2"
-			}
-		},
-		"es6-error": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-			"integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-			"dev": true
-		},
-		"es6-object-assign": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-			"integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
-			"dev": true
-		},
-		"esbuild": {
-			"version": "0.18.20",
-			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
-			"integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
-			"dev": true,
-			"requires": {
-				"@esbuild/android-arm": "0.18.20",
-				"@esbuild/android-arm64": "0.18.20",
-				"@esbuild/android-x64": "0.18.20",
-				"@esbuild/darwin-arm64": "0.18.20",
-				"@esbuild/darwin-x64": "0.18.20",
-				"@esbuild/freebsd-arm64": "0.18.20",
-				"@esbuild/freebsd-x64": "0.18.20",
-				"@esbuild/linux-arm": "0.18.20",
-				"@esbuild/linux-arm64": "0.18.20",
-				"@esbuild/linux-ia32": "0.18.20",
-				"@esbuild/linux-loong64": "0.18.20",
-				"@esbuild/linux-mips64el": "0.18.20",
-				"@esbuild/linux-ppc64": "0.18.20",
-				"@esbuild/linux-riscv64": "0.18.20",
-				"@esbuild/linux-s390x": "0.18.20",
-				"@esbuild/linux-x64": "0.18.20",
-				"@esbuild/netbsd-x64": "0.18.20",
-				"@esbuild/openbsd-x64": "0.18.20",
-				"@esbuild/sunos-x64": "0.18.20",
-				"@esbuild/win32-arm64": "0.18.20",
-				"@esbuild/win32-ia32": "0.18.20",
-				"@esbuild/win32-x64": "0.18.20"
-			}
-		},
-		"esbuild-plugin-alias": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz",
-			"integrity": "sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==",
-			"dev": true
-		},
-		"esbuild-register": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.4.2.tgz",
-			"integrity": "sha512-kG/XyTDyz6+YDuyfB9ZoSIOOmgyFCH+xPRtsCa8W85HLRV5Csp+o3jWVbOSHgSLfyLc5DmP+KFDNwty4mEjC+Q==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.3.4"
-			}
-		},
-		"escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-		},
-		"escape-html": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-		},
-		"escape-latex": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz",
-			"integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==",
-			"dev": true
-		},
-		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-		},
-		"escodegen": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-			"integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-			"dev": true,
-			"requires": {
-				"esprima": "^4.0.1",
-				"estraverse": "^5.2.0",
-				"esutils": "^2.0.2",
-				"source-map": "~0.6.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				}
-			}
-		},
-		"eslint": {
-			"version": "8.3.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.3.0.tgz",
-			"integrity": "sha512-aIay56Ph6RxOTC7xyr59Kt3ewX185SaGnAr8eWukoPLeriCrvGjvAubxuvaXOfsxhtwV5g0uBOsyhAom4qJdww==",
-			"dev": true,
-			"requires": {
-				"@eslint/eslintrc": "^1.0.4",
-				"@humanwhocodes/config-array": "^0.6.0",
-				"ajv": "^6.10.0",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.2",
-				"debug": "^4.3.2",
-				"doctrine": "^3.0.0",
-				"enquirer": "^2.3.5",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^7.1.0",
-				"eslint-utils": "^3.0.0",
-				"eslint-visitor-keys": "^3.1.0",
-				"espree": "^9.1.0",
-				"esquery": "^1.4.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^6.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.6.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"js-yaml": "^4.1.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.4.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.0.4",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.1",
-				"progress": "^2.0.0",
-				"regexpp": "^3.2.0",
-				"semver": "^7.2.1",
-				"strip-ansi": "^6.0.1",
-				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0",
-				"v8-compile-cache": "^2.0.3"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"doctrine": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-					"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-					"dev": true,
-					"requires": {
-						"esutils": "^2.0.2"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
-				},
-				"eslint-scope": {
-					"version": "7.2.2",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-					"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-					"dev": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^5.2.0"
-					}
-				},
-				"eslint-visitor-keys": {
-					"version": "3.4.2",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-					"integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-					"dev": true
-				},
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				},
-				"glob-parent": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.3"
-					}
-				},
-				"ignore": {
-					"version": "4.0.6",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-					"dev": true
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"levn": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-					"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-					"dev": true,
-					"requires": {
-						"prelude-ls": "^1.2.1",
-						"type-check": "~0.4.0"
-					}
-				},
-				"optionator": {
-					"version": "0.9.3",
-					"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-					"integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-					"dev": true,
-					"requires": {
-						"@aashutoshrathi/word-wrap": "^1.2.3",
-						"deep-is": "^0.1.3",
-						"fast-levenshtein": "^2.0.6",
-						"levn": "^0.4.1",
-						"prelude-ls": "^1.2.1",
-						"type-check": "^0.4.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"prelude-ls": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-					"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"strip-json-comments": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-					"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-					"dev": true
-				},
-				"type-check": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-					"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-					"dev": true,
-					"requires": {
-						"prelude-ls": "^1.2.1"
-					}
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"eslint-config-prettier": {
-			"version": "8.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
-			"integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
-			"dev": true
-		},
-		"eslint-import-resolver-node": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-			"integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
-			"dev": true,
-			"requires": {
-				"debug": "^2.6.9",
-				"resolve": "^1.13.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"eslint-module-utils": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz",
-			"integrity": "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==",
-			"dev": true,
-			"requires": {
-				"debug": "^3.2.7",
-				"find-up": "^2.1.0",
-				"pkg-dir": "^2.0.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-plugin-eslint-comments": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.2.tgz",
-			"integrity": "sha512-QexaqrNeteFfRTad96W+Vi4Zj1KFbkHHNMMaHZEYcovKav6gdomyGzaxSDSL3GoIyUOo078wRAdYlu1caiauIQ==",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^1.0.5",
-				"ignore": "^5.0.5"
-			}
-		},
-		"eslint-plugin-import": {
-			"version": "2.25.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz",
-			"integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==",
-			"dev": true,
-			"requires": {
-				"array-includes": "^3.1.4",
-				"array.prototype.flat": "^1.2.5",
-				"debug": "^2.6.9",
-				"doctrine": "^2.1.0",
-				"eslint-import-resolver-node": "^0.3.6",
-				"eslint-module-utils": "^2.7.0",
-				"has": "^1.0.3",
-				"is-core-module": "^2.7.0",
-				"is-glob": "^4.0.3",
-				"minimatch": "^3.0.4",
-				"object.values": "^1.1.5",
-				"resolve": "^1.20.0",
-				"tsconfig-paths": "^3.11.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"eslint-import-resolver-node": {
-					"version": "0.3.9",
-					"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-					"integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.2.7",
-						"is-core-module": "^2.13.0",
-						"resolve": "^1.22.4"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.7",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-							"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"ms": {
-							"version": "2.1.3",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-							"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-							"dev": true
-						}
-					}
-				}
-			}
-		},
-		"eslint-plugin-jest": {
-			"version": "27.2.3",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.2.3.tgz",
-			"integrity": "sha512-sRLlSCpICzWuje66Gl9zvdF6mwD5X86I4u55hJyFBsxYOsBCmT5+kSUjf+fkFWVMMgpzNEupjW8WzUqi83hJAQ==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/utils": "^5.10.0"
-			}
-		},
-		"eslint-plugin-jest-dom": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-5.0.2.tgz",
-			"integrity": "sha512-zfNOwQOrOOGcxb3tcOgB2fEiqmgEbXKcPrNC+NlNSWCi3wg/m+DWVqrrshp4gOjhpP1R/1X7kkHumnf8PLUFhw==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.16.3",
-				"requireindex": "^1.2.0"
-			}
-		},
-		"eslint-plugin-jsdoc": {
-			"version": "46.4.6",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.4.6.tgz",
-			"integrity": "sha512-z4SWYnJfOqftZI+b3RM9AtWL1vF/sLWE/LlO9yOKDof9yN2+n3zOdOJTGX/pRE/xnPsooOLG2Rq6e4d+XW3lNw==",
-			"dev": true,
-			"requires": {
-				"@es-joy/jsdoccomment": "~0.40.1",
-				"are-docs-informative": "^0.0.2",
-				"comment-parser": "1.4.0",
-				"debug": "^4.3.4",
-				"escape-string-regexp": "^4.0.0",
-				"esquery": "^1.5.0",
-				"is-builtin-module": "^3.2.1",
-				"semver": "^7.5.4",
-				"spdx-expression-parse": "^3.0.1"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-plugin-jsx-a11y": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
-			"integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.16.3",
-				"aria-query": "^4.2.2",
-				"array-includes": "^3.1.4",
-				"ast-types-flow": "^0.0.7",
-				"axe-core": "^4.3.5",
-				"axobject-query": "^2.2.0",
-				"damerau-levenshtein": "^1.0.7",
-				"emoji-regex": "^9.2.2",
-				"has": "^1.0.3",
-				"jsx-ast-utils": "^3.2.1",
-				"language-tags": "^1.0.5",
-				"minimatch": "^3.0.4"
-			},
-			"dependencies": {
-				"emoji-regex": {
-					"version": "9.2.2",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-					"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-plugin-playwright": {
-			"version": "0.15.3",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-0.15.3.tgz",
-			"integrity": "sha512-LQMW5y0DLK5Fnpya7JR1oAYL2/7Y9wDiYw6VZqlKqcRGSgjbVKNqxraphk7ra1U3Bb5EK444xMgUlQPbMg2M1g==",
-			"dev": true
-		},
-		"eslint-plugin-prettier": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz",
-			"integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==",
-			"dev": true,
-			"requires": {
-				"prettier-linter-helpers": "^1.0.0",
-				"synckit": "^0.8.5"
-			}
-		},
-		"eslint-plugin-react": {
-			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.0.tgz",
-			"integrity": "sha512-0Ut+CkzpppgFtoIhdzi2LpdpxxBvgFf99eFqWxJnUrO7mMe0eOiNpou6rvNYeVVV6lWZvTah0BFne7k5xHjARg==",
-			"dev": true,
-			"requires": {
-				"array-includes": "^3.1.4",
-				"array.prototype.flatmap": "^1.2.5",
-				"doctrine": "^2.1.0",
-				"estraverse": "^5.3.0",
-				"jsx-ast-utils": "^2.4.1 || ^3.0.0",
-				"minimatch": "^3.0.4",
-				"object.entries": "^1.1.5",
-				"object.fromentries": "^2.0.5",
-				"object.hasown": "^1.1.0",
-				"object.values": "^1.1.5",
-				"prop-types": "^15.7.2",
-				"resolve": "^2.0.0-next.3",
-				"semver": "^6.3.0",
-				"string.prototype.matchall": "^4.0.6"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				},
-				"resolve": {
-					"version": "2.0.0-next.4",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-					"integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-					"dev": true,
-					"requires": {
-						"is-core-module": "^2.9.0",
-						"path-parse": "^1.0.7",
-						"supports-preserve-symlinks-flag": "^1.0.0"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-plugin-react-hooks": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz",
-			"integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
-			"dev": true
-		},
-		"eslint-plugin-ssr-friendly": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-ssr-friendly/-/eslint-plugin-ssr-friendly-1.0.6.tgz",
-			"integrity": "sha512-O1S/0Q8FYTl1c4vwIr0cg59u37mL5qe7sxpMzjdIo2v8l0LjCugU699trmkgOheQINTq7R9yhfCo6YaAb4tYUQ==",
-			"dev": true,
-			"requires": {
-				"globals": "^13.8.0"
-			}
-		},
-		"eslint-plugin-storybook": {
-			"version": "0.6.13",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-0.6.13.tgz",
-			"integrity": "sha512-smd+CS0WH1jBqUEJ3znGS7DU4ayBE9z6lkQAK2yrSUv1+rq8BT/tiI5C/rKE7rmiqiAfojtNYZRhzo5HrulccQ==",
-			"dev": true,
-			"requires": {
-				"@storybook/csf": "^0.0.1",
-				"@typescript-eslint/utils": "^5.45.0",
-				"requireindex": "^1.1.0",
-				"ts-dedent": "^2.2.0"
-			},
-			"dependencies": {
-				"@storybook/csf": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.1.tgz",
-					"integrity": "sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==",
-					"dev": true,
-					"requires": {
-						"lodash": "^4.17.15"
-					}
-				}
-			}
-		},
-		"eslint-plugin-testing-library": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-6.0.2.tgz",
-			"integrity": "sha512-3BV6FWtLbpKFb4Y1obSdt8PC9xSqz6T+7EHB/6pSCXqVjKPoS67ck903feKMKQphd5VhrX+N51yHuVaPa7elsw==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/utils": "^5.58.0"
-			}
-		},
-		"eslint-scope": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-			"dev": true,
-			"requires": {
-				"esrecurse": "^4.1.0",
-				"estraverse": "^4.1.1"
-			}
-		},
-		"eslint-utils": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-			"dev": true,
-			"requires": {
-				"eslint-visitor-keys": "^2.0.0"
-			}
-		},
-		"eslint-visitor-keys": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-			"dev": true
-		},
-		"espree": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.1.0.tgz",
-			"integrity": "sha512-ZgYLvCS1wxOczBYGcQT9DDWgicXwJ4dbocr9uYN+/eresBAUuBu+O4WzB21ufQ/JqQT8gyp7hJ3z8SHii32mTQ==",
-			"dev": true,
-			"requires": {
-				"acorn": "^8.6.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^3.1.0"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "8.10.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-					"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-					"dev": true
-				},
-				"eslint-visitor-keys": {
-					"version": "3.4.2",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-					"integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-					"dev": true
-				}
-			}
-		},
-		"esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-		},
-		"esquery": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-			"integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-			"dev": true,
-			"requires": {
-				"estraverse": "^5.1.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				}
-			}
-		},
-		"esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-			"dev": true,
-			"requires": {
-				"estraverse": "^5.2.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				}
-			}
-		},
-		"estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-			"dev": true
-		},
-		"estree-to-babel": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/estree-to-babel/-/estree-to-babel-3.2.1.tgz",
-			"integrity": "sha512-YNF+mZ/Wu2FU/gvmzuWtYc8rloubL7wfXCTgouFrnjGVXPA/EeYYA7pupXWrb3Iv1cTBeSSxxJIbK23l4MRNqg==",
-			"dev": true,
-			"requires": {
-				"@babel/traverse": "^7.1.6",
-				"@babel/types": "^7.2.0",
-				"c8": "^7.6.0"
-			}
-		},
-		"esutils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-			"dev": true
-		},
-		"etag": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
-		},
-		"event-target-shim": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-			"integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
-		},
-		"eventemitter2": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-1.0.5.tgz",
-			"integrity": "sha512-EUFhWUYzqqBZlzBMI+dPU8rnKXfQZEUnitnccQuEIAnvWFHCpt3+4fts2+4dpxLtlsiseVXCMFg37KjYChSxpg=="
-		},
-		"eventemitter3": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-			"dev": true
-		},
-		"events": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-			"dev": true
-		},
-		"evp_bytestokey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-			"dev": true,
-			"requires": {
-				"md5.js": "^1.3.4",
-				"safe-buffer": "^5.1.1"
-			}
-		},
-		"execa": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz",
-			"integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==",
-			"dev": true,
-			"requires": {
-				"cross-spawn": "^7.0.0",
-				"get-stream": "^5.0.0",
-				"human-signals": "^1.1.1",
-				"is-stream": "^2.0.0",
-				"merge-stream": "^2.0.0",
-				"npm-run-path": "^4.0.0",
-				"onetime": "^5.1.0",
-				"signal-exit": "^3.0.2",
-				"strip-final-newline": "^2.0.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"execall": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-			"integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-			"dev": true,
-			"requires": {
-				"clone-regexp": "^2.1.0"
-			}
-		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-			"dev": true
-		},
-		"expand-brackets": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-			"integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-			"requires": {
-				"debug": "^2.3.3",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"posix-character-classes": "^0.1.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
-			}
-		},
-		"expand-template": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-			"dev": true,
-			"optional": true
-		},
-		"expand-tilde": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-			"integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
-			"dev": true,
-			"requires": {
-				"os-homedir": "^1.0.1"
-			}
-		},
-		"expect": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
-			"integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
-			"dev": true,
-			"requires": {
-				"@jest/expect-utils": "^29.6.2",
-				"@types/node": "*",
-				"jest-get-type": "^29.4.3",
-				"jest-matcher-utils": "^29.6.2",
-				"jest-message-util": "^29.6.2",
-				"jest-util": "^29.6.2"
-			}
-		},
-		"expect-puppeteer": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-4.4.0.tgz",
-			"integrity": "sha512-6Ey4Xy2xvmuQu7z7YQtMsaMV0EHJRpVxIDOd5GRrm04/I3nkTKIutELfECsLp6le+b3SSa3cXhPiw6PgqzxYWA==",
-			"dev": true
-		},
-		"exponential-backoff": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-			"integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
-			"dev": true
-		},
-		"express": {
-			"version": "4.18.2",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-			"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-			"dev": true,
-			"requires": {
-				"accepts": "~1.3.8",
-				"array-flatten": "1.1.1",
-				"body-parser": "1.20.1",
-				"content-disposition": "0.5.4",
-				"content-type": "~1.0.4",
-				"cookie": "0.5.0",
-				"cookie-signature": "1.0.6",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"finalhandler": "1.2.0",
-				"fresh": "0.5.2",
-				"http-errors": "2.0.0",
-				"merge-descriptors": "1.0.1",
-				"methods": "~1.1.2",
-				"on-finished": "2.4.1",
-				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.7",
-				"proxy-addr": "~2.0.7",
-				"qs": "6.11.0",
-				"range-parser": "~1.2.1",
-				"safe-buffer": "5.2.1",
-				"send": "0.18.0",
-				"serve-static": "1.15.0",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"type-is": "~1.6.18",
-				"utils-merge": "1.0.1",
-				"vary": "~1.1.2"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-					"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-					"dev": true
-				},
-				"finalhandler": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-					"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"on-finished": "2.4.1",
-						"parseurl": "~1.3.3",
-						"statuses": "2.0.1",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"on-finished": {
-					"version": "2.4.1",
-					"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-					"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-					"dev": true,
-					"requires": {
-						"ee-first": "1.1.1"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				},
-				"statuses": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-					"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-					"dev": true
-				}
-			}
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true
-		},
-		"extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
-			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"external-editor": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
-			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
-			"dev": true,
-			"requires": {
-				"chardet": "^0.7.0",
-				"iconv-lite": "^0.4.24",
-				"tmp": "^0.0.33"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
-			}
-		},
-		"extglob": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-			"requires": {
-				"array-unique": "^0.3.2",
-				"define-property": "^1.0.0",
-				"expand-brackets": "^2.1.4",
-				"extend-shallow": "^2.0.1",
-				"fragment-cache": "^0.2.1",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
-			}
-		},
-		"extract-zip": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
-			"integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
-			"dev": true,
-			"requires": {
-				"concat-stream": "^1.6.2",
-				"debug": "^2.6.9",
-				"mkdirp": "^0.5.4",
-				"yauzl": "^2.10.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.6",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-					"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.6"
-					}
-				}
-			}
-		},
-		"fast-average-color": {
-			"version": "9.1.1",
-			"resolved": "https://registry.npmjs.org/fast-average-color/-/fast-average-color-9.1.1.tgz",
-			"integrity": "sha512-PJizLBcGb/jqUzrH66385te4+GcOK7wcUiCDvBUszdpzc/pvV1kwifvvsFygV3mS+7qwnWmK9/BrZniaOOC9ag==",
-			"requires": {
-				"@types/offscreencanvas": "^2019.7.0"
-			}
-		},
-		"fast-base64-decode": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fast-base64-decode/-/fast-base64-decode-1.0.0.tgz",
-			"integrity": "sha512-qwaScUgUGBYeDNRnbc/KyllVU88Jk1pRHPStuF/lO7B0/RTRLj7U0lkdTAutlBblY08rwZDff6tNU9cjv6j//Q=="
-		},
-		"fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-		},
-		"fast-diff": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-			"integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-			"dev": true
-		},
-		"fast-fifo": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.0.tgz",
-			"integrity": "sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw==",
-			"dev": true
-		},
-		"fast-glob": {
-			"version": "3.2.7",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-			"integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-			"dev": true,
-			"requires": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.2",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.4"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				}
-			}
-		},
-		"fast-json-parse": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
-			"integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==",
-			"dev": true
-		},
-		"fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
-		},
-		"fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-			"dev": true
-		},
-		"fast-memoize": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz",
-			"integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="
-		},
-		"fast-xml-parser": {
-			"version": "4.2.6",
-			"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.6.tgz",
-			"integrity": "sha512-Xo1qV++h/Y3Ng8dphjahnYe+rGHaaNdsYOBWL9Y9GCPKpNKilJtilvWkLcI9f9X2DoKTLsZsGYAls5+JL5jfLA==",
-			"requires": {
-				"strnum": "^1.0.5"
-			}
-		},
-		"fastest-levenshtein": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-			"integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-			"dev": true
-		},
-		"fastq": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz",
-			"integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==",
-			"dev": true,
-			"requires": {
-				"reusify": "^1.0.0"
-			}
-		},
-		"faye-websocket": {
-			"version": "0.11.4",
-			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-			"integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-			"dev": true,
-			"requires": {
-				"websocket-driver": ">=0.5.1"
-			}
-		},
-		"fb-watchman": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
-			"integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
-			"requires": {
-				"bser": "^2.0.0"
-			}
-		},
-		"fd-slicer": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-			"integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-			"dev": true,
-			"requires": {
-				"pend": "~1.2.0"
-			}
-		},
-		"fecha": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
-			"integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==",
-			"dev": true
-		},
-		"fetch-blob": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
-			"integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
-			"dev": true,
-			"requires": {
-				"node-domexception": "^1.0.0",
-				"web-streams-polyfill": "^3.0.3"
-			}
-		},
-		"fetch-retry": {
-			"version": "5.0.6",
-			"resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-5.0.6.tgz",
-			"integrity": "sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ==",
-			"dev": true
-		},
-		"figgy-pudding": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-			"integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
-			"dev": true
-		},
-		"figures": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-			"integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^1.0.5"
-			}
-		},
-		"file-entry-cache": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-			"dev": true,
-			"requires": {
-				"flat-cache": "^3.0.4"
-			}
-		},
-		"file-system-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/file-system-cache/-/file-system-cache-2.3.0.tgz",
-			"integrity": "sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ==",
-			"dev": true,
-			"requires": {
-				"fs-extra": "11.1.1",
-				"ramda": "0.29.0"
-			},
-			"dependencies": {
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				}
-			}
-		},
-		"file-uri-to-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-			"dev": true,
-			"optional": true
-		},
-		"filelist": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-			"integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-			"dev": true,
-			"requires": {
-				"minimatch": "^5.0.1"
-			},
-			"dependencies": {
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"minimatch": {
-					"version": "5.1.6",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-					"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				}
-			}
-		},
-		"filename-reserved-regex": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
-			"integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
-			"dev": true
-		},
-		"filenamify": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.2.0.tgz",
-			"integrity": "sha512-pkgE+4p7N1n7QieOopmn3TqJaefjdWXwEkj2XLZJLKfOgcQKkn11ahvGNgTD8mLggexLiDFQxeTs14xVU22XPA==",
-			"dev": true,
-			"requires": {
-				"filename-reserved-regex": "^2.0.0",
-				"strip-outer": "^1.0.1",
-				"trim-repeated": "^1.0.0"
-			}
-		},
-		"fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-			"requires": {
-				"to-regex-range": "^5.0.1"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
-			}
-		},
-		"filter-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-			"integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ=="
-		},
-		"finalhandler": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-			"integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-			"requires": {
-				"debug": "2.6.9",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"on-finished": "~2.3.0",
-				"parseurl": "~1.3.3",
-				"statuses": "~1.5.0",
-				"unpipe": "~1.0.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"find-cache-dir": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-			"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-			"requires": {
-				"commondir": "^1.0.1",
-				"make-dir": "^2.0.0",
-				"pkg-dir": "^3.0.0"
-			},
-			"dependencies": {
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"make-dir": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-					"requires": {
-						"pify": "^4.0.1",
-						"semver": "^5.6.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-				},
-				"pify": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"requires": {
-						"find-up": "^3.0.0"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-				}
-			}
-		},
-		"find-file-up": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
-			"integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
-			"dev": true,
-			"requires": {
-				"fs-exists-sync": "^0.1.0",
-				"resolve-dir": "^0.1.0"
-			}
-		},
-		"find-parent-dir": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
-			"integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
-			"dev": true
-		},
-		"find-pkg": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
-			"integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
-			"dev": true,
-			"requires": {
-				"find-file-up": "^0.1.2"
-			}
-		},
-		"find-process": {
-			"version": "1.4.7",
-			"resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
-			"integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"commander": "^5.1.0",
-				"debug": "^4.1.1"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-					"integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-					"dev": true
-				}
-			}
-		},
-		"find-root": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-			"integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
-		},
-		"find-up": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-			"integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
-			"dev": true,
-			"requires": {
-				"locate-path": "^2.0.0"
-			}
-		},
-		"find-yarn-workspace-root": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz",
-			"integrity": "sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==",
-			"dev": true,
-			"requires": {
-				"fs-extra": "^4.0.3",
-				"micromatch": "^3.1.4"
-			},
-			"dependencies": {
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"fill-range": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-					"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-					"dev": true,
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-number": "^3.0.0",
-						"repeat-string": "^1.6.1",
-						"to-regex-range": "^2.1.0"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"fs-extra": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				}
-			}
-		},
-		"flat": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-			"dev": true
-		},
-		"flat-cache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-			"dev": true,
-			"requires": {
-				"flatted": "^3.1.0",
-				"rimraf": "^3.0.2"
-			}
-		},
-		"flatted": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz",
-			"integrity": "sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==",
-			"dev": true
-		},
-		"flow-parser": {
-			"version": "0.185.2",
-			"resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.185.2.tgz",
-			"integrity": "sha512-2hJ5ACYeJCzNtiVULov6pljKOLygy0zddoqSI1fFetM+XRPpRshFdGEijtqlamA1XwyZ+7rhryI6FQFzvtLWUQ=="
-		},
-		"flush-write-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.4"
-			}
-		},
-		"fn.name": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
-			"integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==",
-			"dev": true
-		},
-		"follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-			"dev": true
-		},
-		"for-each": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-			"dev": true,
-			"requires": {
-				"is-callable": "^1.1.3"
-			}
-		},
-		"for-in": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="
-		},
-		"for-own": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-			"integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
-			"dev": true,
-			"requires": {
-				"for-in": "^1.0.1"
-			}
-		},
-		"foreground-child": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-			"integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
-			"dev": true,
-			"requires": {
-				"cross-spawn": "^7.0.0",
-				"signal-exit": "^3.0.2"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"form-data": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-			"dev": true,
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.8",
-				"mime-types": "^2.1.12"
-			}
-		},
-		"form-data-encoder": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
-			"integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
-			"dev": true
-		},
-		"formdata-polyfill": {
-			"version": "4.0.10",
-			"resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
-			"integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
-			"dev": true,
-			"requires": {
-				"fetch-blob": "^3.1.2"
-			}
-		},
-		"forwarded": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-			"dev": true
-		},
-		"fraction.js": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-			"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-			"dev": true
-		},
-		"fragment-cache": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-			"integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
-			"requires": {
-				"map-cache": "^0.2.2"
-			}
-		},
-		"fresh": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
-		},
-		"from2": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-			"integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0"
-			}
-		},
-		"fs-constants": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-			"dev": true
-		},
-		"fs-exists-sync": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-			"integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
-			"dev": true
-		},
-		"fs-extra": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-			"requires": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
-			}
-		},
-		"fs-minipass": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-			"integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0"
-			}
-		},
-		"fs-monkey": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
-			"integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
-			"dev": true
-		},
-		"fs-write-stream-atomic": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-			"integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"iferr": "^0.1.5",
-				"imurmurhash": "^0.1.4",
-				"readable-stream": "1 || 2"
-			}
-		},
-		"fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-		},
-		"fsevents": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-			"optional": true
-		},
-		"fstream": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"inherits": "~2.0.0",
-				"mkdirp": ">=0.5 0",
-				"rimraf": "2"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.6",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-					"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.6"
-					}
-				},
-				"rimraf": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
-			}
-		},
-		"ftp-response-parser": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/ftp-response-parser/-/ftp-response-parser-1.0.1.tgz",
-			"integrity": "sha512-++Ahlo2hs/IC7UVQzjcSAfeUpCwTTzs4uvG5XfGnsinIFkWUYF4xWwPd5qZuK8MJrmUIxFMuHcfqaosCDjvIWw==",
-			"dev": true,
-			"requires": {
-				"readable-stream": "^1.0.31"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.1",
-						"isarray": "0.0.1",
-						"string_decoder": "~0.10.x"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-					"dev": true
-				}
-			}
-		},
-		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-		},
-		"function.prototype.name": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-			"integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.0",
-				"functions-have-names": "^1.2.2"
-			}
-		},
-		"functional-red-black-tree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
-		},
-		"functions-have-names": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-			"dev": true
-		},
-		"gauge": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
-			"integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
-			"dev": true,
-			"requires": {
-				"aproba": "^1.0.3 || ^2.0.0",
-				"color-support": "^1.1.3",
-				"console-control-strings": "^1.1.0",
-				"has-unicode": "^2.0.1",
-				"signal-exit": "^3.0.7",
-				"string-width": "^4.2.3",
-				"strip-ansi": "^6.0.1",
-				"wide-align": "^1.1.5"
-			},
-			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
-			}
-		},
-		"geckodriver": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/geckodriver/-/geckodriver-4.2.1.tgz",
-			"integrity": "sha512-4m/CRk0OI8MaANRuFIahvOxYTSjlNAO2p9JmE14zxueknq6cdtB5M9UGRQ8R9aMV0bLGNVHHDnDXmoXdOwJfWg==",
-			"dev": true,
-			"requires": {
-				"@wdio/logger": "^8.11.0",
-				"decamelize": "^6.0.0",
-				"http-proxy-agent": "^7.0.0",
-				"https-proxy-agent": "^7.0.1",
-				"node-fetch": "^3.3.1",
-				"tar-fs": "^3.0.4",
-				"unzipper": "^0.10.14",
-				"which": "^4.0.0"
-			},
-			"dependencies": {
-				"agent-base": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-					"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.3.4"
-					}
-				},
-				"data-uri-to-buffer": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
-					"integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
-					"dev": true
-				},
-				"decamelize": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
-					"integrity": "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
-					"dev": true
-				},
-				"http-proxy-agent": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-					"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.1.0",
-						"debug": "^4.3.4"
-					}
-				},
-				"https-proxy-agent": {
-					"version": "7.0.2",
-					"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-					"integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.0.2",
-						"debug": "4"
-					}
-				},
-				"isexe": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-					"integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-					"dev": true
-				},
-				"node-fetch": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
-					"integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
-					"dev": true,
-					"requires": {
-						"data-uri-to-buffer": "^4.0.0",
-						"fetch-blob": "^3.1.4",
-						"formdata-polyfill": "^4.0.10"
-					}
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"tar-fs": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
-					"integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
-					"dev": true,
-					"requires": {
-						"mkdirp-classic": "^0.5.2",
-						"pump": "^3.0.0",
-						"tar-stream": "^3.1.5"
-					}
-				},
-				"tar-stream": {
-					"version": "3.1.6",
-					"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-					"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
-					"dev": true,
-					"requires": {
-						"b4a": "^1.6.4",
-						"fast-fifo": "^1.2.0",
-						"streamx": "^2.15.0"
-					}
-				},
-				"which": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-					"integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
-					"dev": true,
-					"requires": {
-						"isexe": "^3.1.1"
-					}
-				}
-			}
-		},
-		"gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
-		},
-		"get-browser-rtc": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz",
-			"integrity": "sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ=="
-		},
-		"get-caller-file": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-		},
-		"get-intrinsic": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-			"integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-			"dev": true,
-			"requires": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3"
-			}
-		},
-		"get-nonce": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
-			"integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q=="
-		},
-		"get-npm-tarball-url": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
-			"integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
-			"dev": true
-		},
-		"get-own-enumerable-property-symbols": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-			"integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
-			"dev": true
-		},
-		"get-pkg-repo": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz",
-			"integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==",
-			"dev": true,
-			"requires": {
-				"@hutson/parse-repository-url": "^3.0.0",
-				"hosted-git-info": "^4.0.0",
-				"through2": "^2.0.0",
-				"yargs": "^16.2.0"
-			}
-		},
-		"get-port": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
-			"integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
-			"dev": true
-		},
-		"get-stream": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-			"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-			"dev": true,
-			"requires": {
-				"pump": "^3.0.0"
-			},
-			"dependencies": {
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				}
-			}
-		},
-		"get-symbol-description": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-			"integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.1"
-			}
-		},
-		"get-uri": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz",
-			"integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==",
-			"dev": true,
-			"requires": {
-				"basic-ftp": "^5.0.2",
-				"data-uri-to-buffer": "^5.0.1",
-				"debug": "^4.3.4",
-				"fs-extra": "^8.1.0"
-			}
-		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="
-		},
-		"gettext-parser": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.4.0.tgz",
-			"integrity": "sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA==",
-			"requires": {
-				"encoding": "^0.1.12",
-				"safe-buffer": "^5.1.1"
-			}
-		},
-		"giget": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/giget/-/giget-1.1.2.tgz",
-			"integrity": "sha512-HsLoS07HiQ5oqvObOI+Qb2tyZH4Gj5nYGfF9qQcZNrPw+uEFhdXtgJr01aO2pWadGHucajYDLxxbtQkm97ON2A==",
-			"dev": true,
-			"requires": {
-				"colorette": "^2.0.19",
-				"defu": "^6.1.2",
-				"https-proxy-agent": "^5.0.1",
-				"mri": "^1.2.0",
-				"node-fetch-native": "^1.0.2",
-				"pathe": "^1.1.0",
-				"tar": "^6.1.13"
-			},
-			"dependencies": {
-				"chownr": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-					"integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-					"dev": true
-				},
-				"colorette": {
-					"version": "2.0.20",
-					"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-					"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-					"dev": true
-				},
-				"minipass": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-					"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-					"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-					"dev": true
-				},
-				"tar": {
-					"version": "6.1.15",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
-					"integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
-					"dev": true,
-					"requires": {
-						"chownr": "^2.0.0",
-						"fs-minipass": "^2.0.0",
-						"minipass": "^5.0.0",
-						"minizlib": "^2.1.1",
-						"mkdirp": "^1.0.3",
-						"yallist": "^4.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				}
-			}
-		},
-		"git-raw-commits": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-3.0.0.tgz",
-			"integrity": "sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw==",
-			"dev": true,
-			"requires": {
-				"dargs": "^7.0.0",
-				"meow": "^8.1.2",
-				"split2": "^3.2.2"
-			}
-		},
-		"git-remote-origin-url": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
-			"integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==",
-			"dev": true,
-			"requires": {
-				"gitconfiglocal": "^1.0.0",
-				"pify": "^2.3.0"
-			}
-		},
-		"git-semver-tags": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-5.0.1.tgz",
-			"integrity": "sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA==",
-			"dev": true,
-			"requires": {
-				"meow": "^8.1.2",
-				"semver": "^7.0.0"
-			}
-		},
-		"git-up": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz",
-			"integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==",
-			"dev": true,
-			"requires": {
-				"is-ssh": "^1.4.0",
-				"parse-url": "^8.1.0"
-			}
-		},
-		"git-url-parse": {
-			"version": "13.1.0",
-			"resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz",
-			"integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==",
-			"dev": true,
-			"requires": {
-				"git-up": "^7.0.0"
-			}
-		},
-		"gitconfiglocal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
-			"integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==",
-			"dev": true,
-			"requires": {
-				"ini": "^1.3.2"
-			}
-		},
-		"github-from-package": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-			"integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
-			"dev": true,
-			"optional": true
-		},
-		"github-slugger": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz",
-			"integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
-			"dev": true
-		},
-		"glob": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-			"dev": true,
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
-		"glob-parent": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-			"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"is-glob": "^3.1.0",
-				"path-dirname": "^1.0.0"
-			},
-			"dependencies": {
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"is-extglob": "^2.1.0"
-					}
-				}
-			}
-		},
-		"glob-to-regexp": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-			"dev": true
-		},
-		"global-modules": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-			"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-			"dev": true,
-			"requires": {
-				"global-prefix": "^3.0.0"
-			}
-		},
-		"global-prefix": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-			"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-			"dev": true,
-			"requires": {
-				"ini": "^1.3.5",
-				"kind-of": "^6.0.2",
-				"which": "^1.3.1"
-			}
-		},
-		"globals": {
-			"version": "13.20.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-			"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-			"dev": true,
-			"requires": {
-				"type-fest": "^0.20.2"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.20.2",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-					"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-					"dev": true
-				}
-			}
-		},
-		"globalthis": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-			"integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-			"dev": true,
-			"requires": {
-				"define-properties": "^1.1.3"
-			}
-		},
-		"globby": {
-			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-			"dev": true,
-			"requires": {
-				"array-union": "^2.1.0",
-				"dir-glob": "^3.0.1",
-				"fast-glob": "^3.2.9",
-				"ignore": "^5.2.0",
-				"merge2": "^1.4.1",
-				"slash": "^3.0.0"
-			},
-			"dependencies": {
-				"array-union": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-					"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-					"dev": true
-				},
-				"fast-glob": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-					"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-					"dev": true,
-					"requires": {
-						"@nodelib/fs.stat": "^2.0.2",
-						"@nodelib/fs.walk": "^1.2.3",
-						"glob-parent": "^5.1.2",
-						"merge2": "^1.3.0",
-						"micromatch": "^4.0.4"
-					}
-				},
-				"glob-parent": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				}
-			}
-		},
-		"globjoin": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-			"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
-			"dev": true
-		},
-		"good-listener": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-			"integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
-			"requires": {
-				"delegate": "^3.1.2"
-			}
-		},
-		"gopd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-			"dev": true,
-			"requires": {
-				"get-intrinsic": "^1.1.3"
-			}
-		},
-		"got": {
-			"version": "11.8.6",
-			"resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-			"integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-			"dev": true,
-			"requires": {
-				"@sindresorhus/is": "^4.0.0",
-				"@szmarczak/http-timer": "^4.0.5",
-				"@types/cacheable-request": "^6.0.1",
-				"@types/responselike": "^1.0.0",
-				"cacheable-lookup": "^5.0.3",
-				"cacheable-request": "^7.0.2",
-				"decompress-response": "^6.0.0",
-				"http2-wrapper": "^1.0.0-beta.5.2",
-				"lowercase-keys": "^2.0.0",
-				"p-cancelable": "^2.0.0",
-				"responselike": "^2.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.2.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-		},
-		"gradient-parser": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/gradient-parser/-/gradient-parser-0.1.5.tgz",
-			"integrity": "sha512-+uPlcVbjrKOnTzvz0MjTj7BfACj8OmxIa1moIjJV7btvhUMSJk0D47RfDCgDrZE3dYMz9Cf5xKJwnrKLjUq0KQ=="
-		},
-		"grapheme-splitter": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-			"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-			"dev": true
-		},
-		"graphemer": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-			"dev": true
-		},
-		"gunzip-maybe": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz",
-			"integrity": "sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==",
-			"dev": true,
-			"requires": {
-				"browserify-zlib": "^0.1.4",
-				"is-deflate": "^1.0.0",
-				"is-gzip": "^1.0.0",
-				"peek-stream": "^1.1.0",
-				"pumpify": "^1.3.3",
-				"through2": "^2.0.3"
-			},
-			"dependencies": {
-				"browserify-zlib": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-					"integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
-					"dev": true,
-					"requires": {
-						"pako": "~0.2.0"
-					}
-				},
-				"pako": {
-					"version": "0.2.9",
-					"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-					"integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
-					"dev": true
-				}
-			}
-		},
-		"handle-thing": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-			"dev": true
-		},
-		"handlebars": {
-			"version": "4.7.8",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-			"integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
-			"dev": true,
-			"requires": {
-				"minimist": "^1.2.5",
-				"neo-async": "^2.6.2",
-				"source-map": "^0.6.1",
-				"uglify-js": "^3.1.4",
-				"wordwrap": "^1.0.0"
-			}
-		},
-		"hard-rejection": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-			"dev": true
-		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"requires": {
-				"function-bind": "^1.1.1"
-			}
-		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "^2.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				}
-			}
-		},
-		"has-bigints": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-			"integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-			"dev": true
-		},
-		"has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-		},
-		"has-property-descriptors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-			"dev": true,
-			"requires": {
-				"get-intrinsic": "^1.1.1"
-			}
-		},
-		"has-proto": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-			"dev": true
-		},
-		"has-symbols": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-			"dev": true
-		},
-		"has-tostringtag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-			"dev": true,
-			"requires": {
-				"has-symbols": "^1.0.2"
-			}
-		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
-			"dev": true
-		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
-			}
-		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"hash-base": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
-			},
-			"dependencies": {
-				"inherits": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-					"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				}
-			}
-		},
-		"hash.js": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"minimalistic-assert": "^1.0.1"
-			}
-		},
-		"he": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-			"dev": true
-		},
-		"header-case": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz",
-			"integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==",
-			"requires": {
-				"capital-case": "^1.0.4",
-				"tslib": "^2.0.3"
-			}
-		},
-		"hermes-estree": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.8.0.tgz",
-			"integrity": "sha512-W6JDAOLZ5pMPMjEiQGLCXSSV7pIBEgRR5zGkxgmzGSXHOxqV5dC/M1Zevqpbm9TZDE5tu358qZf8Vkzmsc+u7Q=="
-		},
-		"hermes-parser": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.8.0.tgz",
-			"integrity": "sha512-yZKalg1fTYG5eOiToLUaw69rQfZq/fi+/NtEXRU7N87K/XobNRhRWorh80oSge2lWUiZfTgUvRJH+XgZWrhoqA==",
-			"requires": {
-				"hermes-estree": "0.8.0"
-			}
-		},
-		"hermes-profile-transformer": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/hermes-profile-transformer/-/hermes-profile-transformer-0.0.6.tgz",
-			"integrity": "sha512-cnN7bQUm65UWOy6cbGcCcZ3rpwW8Q/j4OP5aWRhEry4Z2t2aR1cjrbp0BS+KiBN0smvP1caBgAuxutvyvJILzQ==",
-			"requires": {
-				"source-map": "^0.7.3"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.7.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-					"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
-				}
-			}
-		},
-		"highlight-words-core": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/highlight-words-core/-/highlight-words-core-1.2.2.tgz",
-			"integrity": "sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg=="
-		},
-		"history": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/history/-/history-5.1.0.tgz",
-			"integrity": "sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==",
-			"requires": {
-				"@babel/runtime": "^7.7.6"
-			}
-		},
-		"hmac-drbg": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-			"integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-			"dev": true,
-			"requires": {
-				"hash.js": "^1.0.3",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.1"
-			}
-		},
-		"hoist-non-react-statics": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-			"integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-			"requires": {
-				"react-is": "^16.7.0"
-			}
-		},
-		"homedir-polyfill": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-			"dev": true,
-			"requires": {
-				"parse-passwd": "^1.0.0"
-			}
-		},
-		"hosted-git-info": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-			"integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-			"dev": true,
-			"requires": {
-				"lru-cache": "^6.0.0"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				}
-			}
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
-			}
-		},
-		"hpq": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/hpq/-/hpq-1.3.0.tgz",
-			"integrity": "sha512-fvYTvdCFOWQupGxqkahrkA+ERBuMdzkxwtUdKrxR6rmMd4Pfl+iZ1QiQYoaZ0B/v0y59MOMnz3XFUWbT50/NWA=="
-		},
-		"html-encoding-sniffer": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-			"integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-			"dev": true,
-			"requires": {
-				"whatwg-encoding": "^2.0.0"
-			}
-		},
-		"html-entities": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-			"integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
-			"dev": true
-		},
-		"html-escaper": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz",
-			"integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==",
-			"dev": true
-		},
-		"html-minifier-terser": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-			"integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-			"dev": true,
-			"requires": {
-				"camel-case": "^4.1.2",
-				"clean-css": "^5.2.2",
-				"commander": "^8.3.0",
-				"he": "^1.2.0",
-				"param-case": "^3.0.4",
-				"relateurl": "^0.2.7",
-				"terser": "^5.10.0"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "8.3.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-					"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-					"dev": true
-				}
-			}
-		},
-		"html-tags": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
-			"integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
-			"dev": true
-		},
-		"html-webpack-plugin": {
-			"version": "5.5.3",
-			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
-			"integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
-			"dev": true,
-			"requires": {
-				"@types/html-minifier-terser": "^6.0.0",
-				"html-minifier-terser": "^6.0.2",
-				"lodash": "^4.17.21",
-				"pretty-error": "^4.0.0",
-				"tapable": "^2.0.0"
-			},
-			"dependencies": {
-				"tapable": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-					"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-					"dev": true
-				}
-			}
-		},
-		"htmlparser2": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^2.0.1",
-				"domhandler": "^4.0.0",
-				"domutils": "^2.5.2",
-				"entities": "^2.0.0"
-			},
-			"dependencies": {
-				"dom-serializer": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-					"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.2.0",
-						"entities": "^2.0.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domhandler": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-					"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.2.0"
-					}
-				},
-				"domutils": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.2.0",
-						"domhandler": "^4.2.0"
-					}
-				},
-				"entities": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-					"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-					"dev": true
-				}
-			}
-		},
-		"htmlparser2-without-node-native": {
-			"version": "3.9.2",
-			"resolved": "https://registry.npmjs.org/htmlparser2-without-node-native/-/htmlparser2-without-node-native-3.9.2.tgz",
-			"integrity": "sha512-+FplQXqmY5fRx6vCIp2P5urWaoBCpTNJMXnKP/6mNCcyb+AZWWJzA8D03peXfozlxDL+vpgLK5dJblqEgu8j6A==",
-			"requires": {
-				"domelementtype": "^1.3.0",
-				"domhandler": "^2.3.0",
-				"domutils": "^1.5.1",
-				"entities": "^1.1.1",
-				"eventemitter2": "^1.0.0",
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.2"
-			}
-		},
-		"http-cache-semantics": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-			"integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-			"dev": true
-		},
-		"http-deceiver": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-			"dev": true
-		},
-		"http-errors": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-			"requires": {
-				"depd": "2.0.0",
-				"inherits": "2.0.4",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"toidentifier": "1.0.1"
-			},
-			"dependencies": {
-				"depd": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-					"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-				},
-				"inherits": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-					"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-				},
-				"statuses": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-					"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-				}
-			}
-		},
-		"http-link-header": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/http-link-header/-/http-link-header-1.1.1.tgz",
-			"integrity": "sha512-mW3N/rTYpCn99s1do0zx6nzFZSwLH9HGfUM4ZqLWJ16ylmYaC2v5eYGqrNTQlByx8AzUgGI+V/32gXPugs1+Sw==",
-			"dev": true
-		},
-		"http-parser-js": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-			"integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
-			"dev": true
-		},
-		"http-proxy": {
-			"version": "1.18.1",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-			"dev": true,
-			"requires": {
-				"eventemitter3": "^4.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
-			}
-		},
-		"http-proxy-agent": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-			"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-			"dev": true,
-			"requires": {
-				"@tootallnate/once": "2",
-				"agent-base": "6",
-				"debug": "4"
-			},
-			"dependencies": {
-				"@tootallnate/once": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-					"integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-					"dev": true
-				}
-			}
-		},
-		"http-proxy-middleware": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-			"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-			"dev": true,
-			"requires": {
-				"@types/http-proxy": "^1.17.8",
-				"http-proxy": "^1.18.1",
-				"is-glob": "^4.0.1",
-				"is-plain-obj": "^3.0.0",
-				"micromatch": "^4.0.2"
-			}
-		},
-		"http-status-codes": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.3.0.tgz",
-			"integrity": "sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA==",
-			"dev": true
-		},
-		"http2-wrapper": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-			"integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-			"dev": true,
-			"requires": {
-				"quick-lru": "^5.1.1",
-				"resolve-alpn": "^1.0.0"
-			},
-			"dependencies": {
-				"quick-lru": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-					"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-					"dev": true
-				}
-			}
-		},
-		"https-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-			"integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-			"dev": true
-		},
-		"https-proxy-agent": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-			"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-			"dev": true,
-			"requires": {
-				"agent-base": "6",
-				"debug": "4"
-			}
-		},
-		"human-signals": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-			"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-			"dev": true
-		},
-		"humanize-ms": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-			"integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-			"dev": true,
-			"requires": {
-				"ms": "^2.0.0"
-			}
-		},
-		"husky": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/husky/-/husky-7.0.0.tgz",
-			"integrity": "sha512-xK7lO0EtSzfFPiw+oQncQVy/XqV7UVVjxBByc+Iv5iK3yhW9boDoWgvZy3OGo48QKg/hUtZkzz0hi2HXa0kn7w==",
-			"dev": true
-		},
-		"iconv-lite": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3.0.0"
-			}
-		},
-		"icss-utils": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-			"dev": true
-		},
-		"ieee754": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-		},
-		"iferr": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-			"integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==",
-			"dev": true
-		},
-		"ignore": {
-			"version": "5.2.4",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-			"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-			"dev": true
-		},
-		"ignore-walk": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz",
-			"integrity": "sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==",
-			"dev": true,
-			"requires": {
-				"minimatch": "^3.0.4"
-			}
-		},
-		"image-size": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz",
-			"integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA=="
-		},
-		"image-ssim": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/image-ssim/-/image-ssim-0.2.0.tgz",
-			"integrity": "sha512-W7+sO6/yhxy83L0G7xR8YAc5Z5QFtYEXXRV6EaE8tuYBZJnA3gVgp3q7X7muhLZVodeb9UfvjSbwt9VJwjIYAg==",
-			"dev": true
-		},
-		"import-fresh": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"requires": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			},
-			"dependencies": {
-				"resolve-from": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-					"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-				}
-			}
-		},
-		"import-lazy": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-			"dev": true
-		},
-		"import-local": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-			"dev": true,
-			"requires": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
-			},
-			"dependencies": {
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-					"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-					"dev": true,
-					"requires": {
-						"find-up": "^4.0.0"
-					}
-				}
-			}
-		},
-		"import-locals": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/import-locals/-/import-locals-2.0.0.tgz",
-			"integrity": "sha512-1/bPE89IZhyf7dr5Pkz7b4UyVXy5pEt7PTEfye15UEn3AK8+2zwcDCfKk9Pwun4ltfhOSszOrReSsFcDKw/yoA=="
-		},
-		"import-meta-resolve": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz",
-			"integrity": "sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==",
-			"dev": true
-		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
-		},
-		"indent-string": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-			"integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
-			"dev": true
-		},
-		"infer-owner": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-			"integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-			"dev": true
-		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-			"requires": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"inherits": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-		},
-		"ini": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-			"dev": true
-		},
-		"init-package-json": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-5.0.0.tgz",
-			"integrity": "sha512-kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw==",
-			"dev": true,
-			"requires": {
-				"npm-package-arg": "^10.0.0",
-				"promzard": "^1.0.0",
-				"read": "^2.0.0",
-				"read-package-json": "^6.0.0",
-				"semver": "^7.3.5",
-				"validate-npm-package-license": "^3.0.4",
-				"validate-npm-package-name": "^5.0.0"
-			},
-			"dependencies": {
-				"builtins": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-					"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-					"dev": true,
-					"requires": {
-						"semver": "^7.0.0"
-					}
-				},
-				"hosted-git-info": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-					"integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^7.5.1"
-					}
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"npm-package-arg": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
-					"integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^6.0.0",
-						"proc-log": "^3.0.0",
-						"semver": "^7.3.5",
-						"validate-npm-package-name": "^5.0.0"
-					}
-				},
-				"validate-npm-package-name": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-					"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-					"dev": true,
-					"requires": {
-						"builtins": "^5.0.0"
-					}
-				}
-			}
-		},
-		"inquirer": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-			"integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-			"dev": true,
-			"requires": {
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^3.0.0",
-				"cli-cursor": "^3.1.0",
-				"cli-width": "^2.0.0",
-				"external-editor": "^3.0.3",
-				"figures": "^3.0.0",
-				"lodash": "^4.17.15",
-				"mute-stream": "0.0.8",
-				"run-async": "^2.4.0",
-				"rxjs": "^6.5.3",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0",
-				"through": "^2.3.6"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"dev": true,
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"internal-slot": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-			"integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
-			"dev": true,
-			"requires": {
-				"get-intrinsic": "^1.2.0",
-				"has": "^1.0.3",
-				"side-channel": "^1.0.4"
-			}
-		},
-		"interpret": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-			"dev": true
-		},
-		"intl-messageformat": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-4.4.0.tgz",
-			"integrity": "sha512-z+Bj2rS3LZSYU4+sNitdHrwnBhr0wO80ZJSW8EzKDBowwUe3Q/UsvgCGjrwa+HPzoGCLEb9HAjfJgo4j2Sac8w==",
-			"dev": true,
-			"requires": {
-				"intl-messageformat-parser": "^1.8.1"
-			}
-		},
-		"intl-messageformat-parser": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.8.1.tgz",
-			"integrity": "sha512-IMSCKVf0USrM/959vj3xac7s8f87sc+80Y/ipBzdKy4ifBv5Gsj2tZ41EAaURVg01QU71fYr77uA8Meh6kELbg==",
-			"dev": true
-		},
-		"invariant": {
-			"version": "2.2.4",
-			"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-			"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-			"requires": {
-				"loose-envify": "^1.0.0"
-			}
-		},
-		"ip": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-			"integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
-		},
-		"ipaddr.js": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-			"dev": true
-		},
-		"irregular-plurals": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.2.0.tgz",
-			"integrity": "sha512-YqTdPLfwP7YFN0SsD3QUVCkm9ZG2VzOXv3DOrw5G5mkMbVwptTwVcFv7/C0vOpBmgTxAeTG19XpUs1E522LW9Q==",
-			"dev": true
-		},
-		"is-absolute-url": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-			"integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-			"dev": true
-		},
-		"is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"is-alphabetical": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-			"integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-			"dev": true
-		},
-		"is-alphanumeric": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-			"integrity": "sha512-ZmRL7++ZkcMOfDuWZuMJyIVLr2keE1o/DeNWh1EmgqGhUcV+9BIVsx0BcSBOHTZqzjs4+dISzr2KAeBEWGgXeA==",
-			"dev": true
-		},
-		"is-alphanumerical": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz",
-			"integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
-			"dev": true,
-			"requires": {
-				"is-alphabetical": "^1.0.0",
-				"is-decimal": "^1.0.0"
-			}
-		},
-		"is-arguments": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-array-buffer": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-			"integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.2.0",
-				"is-typed-array": "^1.1.10"
-			}
-		},
-		"is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-		},
-		"is-bigint": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-			"dev": true,
-			"requires": {
-				"has-bigints": "^1.0.1"
-			}
-		},
-		"is-binary-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-			"dev": true,
-			"requires": {
-				"binary-extensions": "^2.0.0"
-			}
-		},
-		"is-boolean-object": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-		},
-		"is-builtin-module": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
-			"integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
-			"dev": true,
-			"requires": {
-				"builtin-modules": "^3.3.0"
-			}
-		},
-		"is-callable": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-			"dev": true
-		},
-		"is-ci": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-			"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-			"dev": true,
-			"requires": {
-				"ci-info": "^2.0.0"
-			},
-			"dependencies": {
-				"ci-info": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-					"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-					"dev": true
-				}
-			}
-		},
-		"is-core-module": {
-			"version": "2.13.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-			"integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
-			"requires": {
-				"has": "^1.0.3"
-			}
-		},
-		"is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"is-date-object": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-			"dev": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-decimal": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz",
-			"integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==",
-			"dev": true
-		},
-		"is-deflate": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz",
-			"integrity": "sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==",
-			"dev": true
-		},
-		"is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-			"requires": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-					"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-				}
-			}
-		},
-		"is-directory": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-			"integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw=="
-		},
-		"is-docker": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-			"dev": true
-		},
-		"is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
-		},
-		"is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-			"dev": true
-		},
-		"is-fullwidth-code-point": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-			"integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
-		},
-		"is-generator-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true
-		},
-		"is-generator-function": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-			"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-			"dev": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"dev": true,
-			"requires": {
-				"is-extglob": "^2.1.1"
-			}
-		},
-		"is-gzip": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
-			"integrity": "sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==",
-			"dev": true
-		},
-		"is-hexadecimal": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz",
-			"integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==",
-			"dev": true
-		},
-		"is-inside-container": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
-			"integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
-			"dev": true,
-			"requires": {
-				"is-docker": "^3.0.0"
-			},
-			"dependencies": {
-				"is-docker": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-					"integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-					"dev": true
-				}
-			}
-		},
-		"is-interactive": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-			"integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
-		},
-		"is-lambda": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-			"integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-			"dev": true
-		},
-		"is-map": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-			"integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-			"dev": true
-		},
-		"is-nan": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
-			"integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.0",
-				"define-properties": "^1.1.3"
-			}
-		},
-		"is-negative-zero": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-			"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-			"dev": true
-		},
-		"is-number": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-			"integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"is-number-object": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-			"integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-			"dev": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
-			"dev": true
-		},
-		"is-observable": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz",
-			"integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==",
-			"dev": true,
-			"requires": {
-				"symbol-observable": "^1.1.0"
-			}
-		},
-		"is-path-cwd": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-			"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-			"integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "^2.1.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-			"integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "^1.0.2"
-			}
-		},
-		"is-plain-obj": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-			"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-			"dev": true
-		},
-		"is-plain-object": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-			"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-		},
-		"is-potential-custom-element-name": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
-			"integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
-		},
-		"is-regex": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-regexp": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-			"integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
-			"dev": true
-		},
-		"is-set": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-			"integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
-			"dev": true
-		},
-		"is-shared-array-buffer": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-			"integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2"
-			}
-		},
-		"is-ssh": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
-			"integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
-			"dev": true,
-			"requires": {
-				"protocols": "^2.0.1"
-			}
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="
-		},
-		"is-string": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-			"dev": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
-			}
-		},
-		"is-symbol": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-			"integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-			"dev": true,
-			"requires": {
-				"has-symbols": "^1.0.2"
-			}
-		},
-		"is-text-path": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
-			"integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==",
-			"dev": true,
-			"requires": {
-				"text-extensions": "^1.0.0"
-			}
-		},
-		"is-typed-array": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-			"integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
-			"dev": true,
-			"requires": {
-				"which-typed-array": "^1.1.11"
-			}
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-			"dev": true
-		},
-		"is-unicode-supported": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="
-		},
-		"is-weakmap": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-			"integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
-			"dev": true
-		},
-		"is-weakref": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-			"integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2"
-			}
-		},
-		"is-weakset": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-			"integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.1"
-			}
-		},
-		"is-whitespace-character": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-			"integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-			"dev": true
-		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-		},
-		"is-word-character": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-			"integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-			"dev": true
-		},
-		"is-wsl": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-			"integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw=="
-		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
-		},
-		"isomorphic.js": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/isomorphic.js/-/isomorphic.js-0.2.5.tgz",
-			"integrity": "sha512-PIeMbHqMt4DnUP3MA/Flc0HElYjMXArsw1qwJZcm9sqR8mq3l8NYizFMty0pWwE/tzIGH3EKK5+jes5mAr85yw=="
-		},
-		"istanbul-lib-coverage": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-			"dev": true
-		},
-		"istanbul-lib-instrument": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.12.3",
-				"@babel/parser": "^7.14.7",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^6.3.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-			"dev": true,
-			"requires": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^3.0.0",
-				"supports-color": "^7.1.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"istanbul-lib-source-maps": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
-			}
-		},
-		"istanbul-reports": {
-			"version": "3.1.6",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
-			"integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
-			"dev": true,
-			"requires": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			}
-		},
-		"jackspeak": {
-			"version": "2.3.6",
-			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
-			"integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
-			"dev": true,
-			"requires": {
-				"@isaacs/cliui": "^8.0.2",
-				"@pkgjs/parseargs": "^0.11.0"
-			}
-		},
-		"jake": {
-			"version": "10.8.7",
-			"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
-			"integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
-			"dev": true,
-			"requires": {
-				"async": "^3.2.3",
-				"chalk": "^4.0.2",
-				"filelist": "^1.0.4",
-				"minimatch": "^3.1.2"
-			}
-		},
-		"javascript-natural-sort": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-			"integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
-			"dev": true
-		},
-		"jed": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz",
-			"integrity": "sha512-z35ZSEcXHxLW4yumw0dF6L464NT36vmx3wxJw8MDpraBcWuNVgUPZgPJKcu1HekNgwlMFNqol7i/IpSbjhqwqA=="
-		},
-		"jest": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
-			"integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
-			"dev": true,
-			"requires": {
-				"@jest/core": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"import-local": "^3.0.2",
-				"jest-cli": "^29.6.2"
-			}
-		},
-		"jest-changed-files": {
-			"version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
-			"integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
-			"dev": true,
-			"requires": {
-				"execa": "^5.0.0",
-				"p-limit": "^3.1.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"human-signals": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-					"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"jest-circus": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
-			"integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^29.6.2",
-				"@jest/expect": "^29.6.2",
-				"@jest/test-result": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"dedent": "^1.0.0",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^29.6.2",
-				"jest-matcher-utils": "^29.6.2",
-				"jest-message-util": "^29.6.2",
-				"jest-runtime": "^29.6.2",
-				"jest-snapshot": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"p-limit": "^3.1.0",
-				"pretty-format": "^29.6.2",
-				"pure-rand": "^6.0.0",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
-			},
-			"dependencies": {
-				"dedent": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
-					"integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
-					"dev": true
-				}
-			}
-		},
-		"jest-cli": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
-			"integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
-			"dev": true,
-			"requires": {
-				"@jest/core": "^29.6.2",
-				"@jest/test-result": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.9",
-				"import-local": "^3.0.2",
-				"jest-config": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"jest-validate": "^29.6.2",
-				"prompts": "^2.0.1",
-				"yargs": "^17.3.1"
-			},
-			"dependencies": {
-				"cliui": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.1",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "17.7.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-					"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-					"dev": true,
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-					"dev": true
-				}
-			}
-		},
-		"jest-config": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
-			"integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.11.6",
-				"@jest/test-sequencer": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"babel-jest": "^29.6.2",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"deepmerge": "^4.2.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"jest-circus": "^29.6.2",
-				"jest-environment-node": "^29.6.2",
-				"jest-get-type": "^29.4.3",
-				"jest-regex-util": "^29.4.3",
-				"jest-resolve": "^29.6.2",
-				"jest-runner": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"jest-validate": "^29.6.2",
-				"micromatch": "^4.0.4",
-				"parse-json": "^5.2.0",
-				"pretty-format": "^29.6.2",
-				"slash": "^3.0.0",
-				"strip-json-comments": "^3.1.1"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"strip-json-comments": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-					"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-					"dev": true
-				}
-			}
-		},
-		"jest-diff": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
-			"integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^29.4.3",
-				"jest-get-type": "^29.4.3",
-				"pretty-format": "^29.6.2"
-			}
-		},
-		"jest-docblock": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
-			"integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
-			"dev": true,
-			"requires": {
-				"detect-newline": "^3.0.0"
-			}
-		},
-		"jest-each": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
-			"integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^29.6.1",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^29.4.3",
-				"jest-util": "^29.6.2",
-				"pretty-format": "^29.6.2"
-			}
-		},
-		"jest-environment-jsdom": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.2.tgz",
-			"integrity": "sha512-7oa/+266AAEgkzae8i1awNEfTfjwawWKLpiw2XesZmaoVVj9u9t8JOYx18cG29rbPNtkUlZ8V4b5Jb36y/VxoQ==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^29.6.2",
-				"@jest/fake-timers": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/jsdom": "^20.0.0",
-				"@types/node": "*",
-				"jest-mock": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"jsdom": "22.1.0"
-			}
-		},
-		"jest-environment-node": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
-			"integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
-			"requires": {
-				"@jest/environment": "^29.6.2",
-				"@jest/fake-timers": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"jest-mock": "^29.6.2",
-				"jest-util": "^29.6.2"
-			}
-		},
-		"jest-get-type": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
-			"integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
-			"dev": true
-		},
-		"jest-haste-map": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
-			"integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^29.6.1",
-				"@types/graceful-fs": "^4.1.3",
-				"@types/node": "*",
-				"anymatch": "^3.0.3",
-				"fb-watchman": "^2.0.0",
-				"fsevents": "^2.3.2",
-				"graceful-fs": "^4.2.9",
-				"jest-regex-util": "^29.4.3",
-				"jest-util": "^29.6.2",
-				"jest-worker": "^29.6.2",
-				"micromatch": "^4.0.4",
-				"walker": "^1.0.8"
-			}
-		},
-		"jest-jasmine2": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-29.6.2.tgz",
-			"integrity": "sha512-g8IF0MHkDYeDYt9eseYx3nx8cn86zCuP49G72f19oXcuCu8b46rt293RRLErLUTbTubRP7zl/ev5+p4I5XPc9g==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^29.6.2",
-				"@jest/expect": "^29.6.2",
-				"@jest/source-map": "^29.6.0",
-				"@jest/test-result": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^29.6.2",
-				"jest-matcher-utils": "^29.6.2",
-				"jest-message-util": "^29.6.2",
-				"jest-runtime": "^29.6.2",
-				"jest-snapshot": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"p-limit": "^3.1.0",
-				"pretty-format": "^29.6.2"
-			}
-		},
-		"jest-junit": {
-			"version": "13.0.0",
-			"resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-13.0.0.tgz",
-			"integrity": "sha512-JSHR+Dhb32FGJaiKkqsB7AR3OqWKtldLd6ZH2+FJ8D4tsweb8Id8zEVReU4+OlrRO1ZluqJLQEETm+Q6/KilBg==",
-			"dev": true,
-			"requires": {
-				"mkdirp": "^1.0.4",
-				"strip-ansi": "^6.0.1",
-				"uuid": "^8.3.2",
-				"xml": "^1.0.1"
-			},
-			"dependencies": {
-				"mkdirp": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-					"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-					"dev": true
-				},
-				"uuid": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-					"dev": true
-				}
-			}
-		},
-		"jest-leak-detector": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
-			"integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
-			"dev": true,
-			"requires": {
-				"jest-get-type": "^29.4.3",
-				"pretty-format": "^29.6.2"
-			}
-		},
-		"jest-matcher-utils": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
-			"integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^29.6.2",
-				"jest-get-type": "^29.4.3",
-				"pretty-format": "^29.6.2"
-			}
-		},
-		"jest-message-util": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz",
-			"integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==",
-			"requires": {
-				"@babel/code-frame": "^7.12.13",
-				"@jest/types": "^29.6.1",
-				"@types/stack-utils": "^2.0.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^29.6.2",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
-			}
-		},
-		"jest-mock": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
-			"integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
-			"requires": {
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"jest-util": "^29.6.2"
-			}
-		},
-		"jest-pnp-resolver": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-			"dev": true
-		},
-		"jest-regex-util": {
-			"version": "29.4.3",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
-			"integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
-			"dev": true
-		},
-		"jest-resolve": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
-			"integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.6.2",
-				"jest-pnp-resolver": "^1.2.2",
-				"jest-util": "^29.6.2",
-				"jest-validate": "^29.6.2",
-				"resolve": "^1.20.0",
-				"resolve.exports": "^2.0.0",
-				"slash": "^3.0.0"
-			}
-		},
-		"jest-resolve-dependencies": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
-			"integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
-			"dev": true,
-			"requires": {
-				"jest-regex-util": "^29.4.3",
-				"jest-snapshot": "^29.6.2"
-			}
-		},
-		"jest-runner": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
-			"integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^29.6.2",
-				"@jest/environment": "^29.6.2",
-				"@jest/test-result": "^29.6.2",
-				"@jest/transform": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"emittery": "^0.13.1",
-				"graceful-fs": "^4.2.9",
-				"jest-docblock": "^29.4.3",
-				"jest-environment-node": "^29.6.2",
-				"jest-haste-map": "^29.6.2",
-				"jest-leak-detector": "^29.6.2",
-				"jest-message-util": "^29.6.2",
-				"jest-resolve": "^29.6.2",
-				"jest-runtime": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"jest-watcher": "^29.6.2",
-				"jest-worker": "^29.6.2",
-				"p-limit": "^3.1.0",
-				"source-map-support": "0.5.13"
-			},
-			"dependencies": {
-				"source-map-support": {
-					"version": "0.5.13",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-					"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-					"dev": true,
-					"requires": {
-						"buffer-from": "^1.0.0",
-						"source-map": "^0.6.0"
-					}
-				}
-			}
-		},
-		"jest-runtime": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
-			"integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^29.6.2",
-				"@jest/fake-timers": "^29.6.2",
-				"@jest/globals": "^29.6.2",
-				"@jest/source-map": "^29.6.0",
-				"@jest/test-result": "^29.6.2",
-				"@jest/transform": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"cjs-module-lexer": "^1.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.6.2",
-				"jest-message-util": "^29.6.2",
-				"jest-mock": "^29.6.2",
-				"jest-regex-util": "^29.4.3",
-				"jest-resolve": "^29.6.2",
-				"jest-snapshot": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"slash": "^3.0.0",
-				"strip-bom": "^4.0.0"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
-			}
-		},
-		"jest-serializer": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-			"integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-			"requires": {
-				"@types/node": "*",
-				"graceful-fs": "^4.2.9"
-			}
-		},
-		"jest-snapshot": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
-			"integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.11.6",
-				"@babel/generator": "^7.7.2",
-				"@babel/plugin-syntax-jsx": "^7.7.2",
-				"@babel/plugin-syntax-typescript": "^7.7.2",
-				"@babel/types": "^7.3.3",
-				"@jest/expect-utils": "^29.6.2",
-				"@jest/transform": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"babel-preset-current-node-syntax": "^1.0.0",
-				"chalk": "^4.0.0",
-				"expect": "^29.6.2",
-				"graceful-fs": "^4.2.9",
-				"jest-diff": "^29.6.2",
-				"jest-get-type": "^29.4.3",
-				"jest-matcher-utils": "^29.6.2",
-				"jest-message-util": "^29.6.2",
-				"jest-util": "^29.6.2",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^29.6.2",
-				"semver": "^7.5.3"
-			}
-		},
-		"jest-util": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
-			"integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
-			"requires": {
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.9",
-				"picomatch": "^2.2.3"
-			}
-		},
-		"jest-validate": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
-			"integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^29.6.1",
-				"camelcase": "^6.2.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^29.4.3",
-				"leven": "^3.1.0",
-				"pretty-format": "^29.6.2"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-					"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-watch-typeahead": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-2.2.2.tgz",
-			"integrity": "sha512-+QgOFW4o5Xlgd6jGS5X37i08tuuXNW8X0CV9WNFi+3n8ExCIP+E1melYhvYLjv5fE6D0yyzk74vsSO8I6GqtvQ==",
-			"dev": true,
-			"requires": {
-				"ansi-escapes": "^6.0.0",
-				"chalk": "^5.2.0",
-				"jest-regex-util": "^29.0.0",
-				"jest-watcher": "^29.0.0",
-				"slash": "^5.0.0",
-				"string-length": "^5.0.1",
-				"strip-ansi": "^7.0.1"
-			},
-			"dependencies": {
-				"ansi-escapes": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz",
-					"integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==",
-					"dev": true,
-					"requires": {
-						"type-fest": "^3.0.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-					"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-					"integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-					"dev": true
-				},
-				"char-regex": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
-					"integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
-					"dev": true
-				},
-				"slash": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
-					"integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
-					"dev": true
-				},
-				"string-length": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-					"integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-					"dev": true,
-					"requires": {
-						"char-regex": "^2.0.0",
-						"strip-ansi": "^7.0.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-					"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^6.0.1"
-					}
-				},
-				"type-fest": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-					"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-					"dev": true
-				}
-			}
-		},
-		"jest-watcher": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
-			"integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
-			"dev": true,
-			"requires": {
-				"@jest/test-result": "^29.6.2",
-				"@jest/types": "^29.6.1",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"emittery": "^0.13.1",
-				"jest-util": "^29.6.2",
-				"string-length": "^4.0.1"
-			}
-		},
-		"jest-worker": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
-			"integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"jest-util": "^29.6.2",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"joi": {
-			"version": "17.5.0",
-			"resolved": "https://registry.npmjs.org/joi/-/joi-17.5.0.tgz",
-			"integrity": "sha512-R7hR50COp7StzLnDi4ywOXHrBrgNXuUUfJWIR5lPY5Bm/pOD3jZaTwpluUXVLRWcoWZxkrHBBJ5hLxgnlehbdw==",
-			"requires": {
-				"@hapi/hoek": "^9.0.0",
-				"@hapi/topo": "^5.0.0",
-				"@sideway/address": "^4.1.3",
-				"@sideway/formula": "^3.0.0",
-				"@sideway/pinpoint": "^2.0.0"
-			}
-		},
-		"jpeg-js": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
-			"integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==",
-			"dev": true
-		},
-		"js-library-detector": {
-			"version": "6.7.0",
-			"resolved": "https://registry.npmjs.org/js-library-detector/-/js-library-detector-6.7.0.tgz",
-			"integrity": "sha512-c80Qupofp43y4cJ7+8TTDN/AsDwLi5oOm/plBrWI+iQt485vKXCco+yVmOwEgdo9VOdsYTuV0UlTeetVPTriXA==",
-			"dev": true
-		},
-		"js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-		},
-		"js-yaml": {
-			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			}
-		},
-		"jsc-android": {
-			"version": "250231.0.0",
-			"resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-250231.0.0.tgz",
-			"integrity": "sha512-rS46PvsjYmdmuz1OAWXY/1kCYG7pnf1TBqeTiOJr1iDz7s5DLxxC9n/ZMknLDxzYzNVfI7R95MH10emSSG1Wuw=="
-		},
-		"jsc-safe-url": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz",
-			"integrity": "sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q=="
-		},
-		"jscodeshift": {
-			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.13.1.tgz",
-			"integrity": "sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ==",
-			"requires": {
-				"@babel/core": "^7.13.16",
-				"@babel/parser": "^7.13.16",
-				"@babel/plugin-proposal-class-properties": "^7.13.0",
-				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-				"@babel/plugin-proposal-optional-chaining": "^7.13.12",
-				"@babel/plugin-transform-modules-commonjs": "^7.13.8",
-				"@babel/preset-flow": "^7.13.13",
-				"@babel/preset-typescript": "^7.13.0",
-				"@babel/register": "^7.13.16",
-				"babel-core": "^7.0.0-bridge.0",
-				"chalk": "^4.1.2",
-				"flow-parser": "0.*",
-				"graceful-fs": "^4.2.4",
-				"micromatch": "^3.1.10",
-				"neo-async": "^2.5.0",
-				"node-dir": "^0.1.17",
-				"recast": "^0.20.4",
-				"temp": "^0.8.4",
-				"write-file-atomic": "^2.3.0"
-			},
-			"dependencies": {
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"fill-range": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-					"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-number": "^3.0.0",
-						"repeat-string": "^1.6.1",
-						"to-regex-range": "^2.1.0"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"temp": {
-					"version": "0.8.4",
-					"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
-					"integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
-					"requires": {
-						"rimraf": "~2.6.2"
-					}
-				}
-			}
-		},
-		"jsdoc-type-pratt-parser": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
-			"integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
-			"dev": true
-		},
-		"jsdom": {
-			"version": "22.1.0",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
-			"integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.6",
-				"cssstyle": "^3.0.0",
-				"data-urls": "^4.0.0",
-				"decimal.js": "^10.4.3",
-				"domexception": "^4.0.0",
-				"form-data": "^4.0.0",
-				"html-encoding-sniffer": "^3.0.0",
-				"http-proxy-agent": "^5.0.0",
-				"https-proxy-agent": "^5.0.1",
-				"is-potential-custom-element-name": "^1.0.1",
-				"nwsapi": "^2.2.4",
-				"parse5": "^7.1.2",
-				"rrweb-cssom": "^0.6.0",
-				"saxes": "^6.0.0",
-				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^4.1.2",
-				"w3c-xmlserializer": "^4.0.0",
-				"webidl-conversions": "^7.0.0",
-				"whatwg-encoding": "^2.0.0",
-				"whatwg-mimetype": "^3.0.0",
-				"whatwg-url": "^12.0.1",
-				"ws": "^8.13.0",
-				"xml-name-validator": "^4.0.0"
-			},
-			"dependencies": {
-				"tough-cookie": {
-					"version": "4.1.3",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-					"integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-					"dev": true,
-					"requires": {
-						"psl": "^1.1.33",
-						"punycode": "^2.1.1",
-						"universalify": "^0.2.0",
-						"url-parse": "^1.5.3"
-					}
-				},
-				"tr46": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-					"integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
-					"dev": true,
-					"requires": {
-						"punycode": "^2.3.0"
-					}
-				},
-				"universalify": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-					"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-					"dev": true
-				},
-				"webidl-conversions": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-					"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-					"dev": true
-				},
-				"whatwg-url": {
-					"version": "12.0.1",
-					"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-					"integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
-					"dev": true,
-					"requires": {
-						"tr46": "^4.1.1",
-						"webidl-conversions": "^7.0.0"
-					}
-				},
-				"ws": {
-					"version": "8.13.0",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-					"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-					"dev": true
-				}
-			}
-		},
-		"jsdom-jscore-rn": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/jsdom-jscore-rn/-/jsdom-jscore-rn-0.1.8.tgz",
-			"integrity": "sha512-Sm0BCCQL3RRmJwztZa9B4QIOxgFOiu7vpsJjLsjG55HlRzOgUdmTOHrhV4SZkjXef5sBF+E8qKnrhsBUO7Gxjg==",
-			"requires": {
-				"htmlparser2-without-node-native": "^3.9.2",
-				"querystring": "^0.2.0"
-			}
-		},
-		"jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-		},
-		"jsftp": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/jsftp/-/jsftp-2.1.3.tgz",
-			"integrity": "sha512-r79EVB8jaNAZbq8hvanL8e8JGu2ZNr2bXdHC4ZdQhRImpSPpnWwm5DYVzQ5QxJmtGtKhNNuvqGgbNaFl604fEQ==",
-			"dev": true,
-			"requires": {
-				"debug": "^3.1.0",
-				"ftp-response-parser": "^1.0.1",
-				"once": "^1.4.0",
-				"parse-listing": "^1.1.3",
-				"stream-combiner": "^0.2.2",
-				"unorm": "^1.4.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-					"dev": true
-				}
-			}
-		},
-		"json-buffer": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-			"dev": true
-		},
-		"json-parse-better-errors": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-		},
-		"json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-		},
-		"json-schema": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-			"integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-			"dev": true
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
-		},
-		"json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-			"dev": true
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-			"dev": true
-		},
-		"json2php": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/json2php/-/json2php-0.0.7.tgz",
-			"integrity": "sha512-dnSoUiLAoVaMXxFsVi4CrPVYMKOuDBXTghXSmMINX44RZ8WM9cXlY7UqrQnlAcODCVO7FV3+8t/5nDKAjimLfg==",
-			"dev": true
-		},
-		"json5": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
-		},
-		"jsonc-parser": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-			"integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-			"dev": true
-		},
-		"jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-			"requires": {
-				"graceful-fs": "^4.1.6"
-			}
-		},
-		"jsonparse": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-			"integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-			"dev": true
-		},
-		"JSONStream": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-			"integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-			"dev": true,
-			"requires": {
-				"jsonparse": "^1.2.0",
-				"through": ">=2.2.7 <3"
-			}
-		},
-		"jsx-ast-utils": {
-			"version": "3.3.5",
-			"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-			"integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-			"dev": true,
-			"requires": {
-				"array-includes": "^3.1.6",
-				"array.prototype.flat": "^1.3.1",
-				"object.assign": "^4.1.4",
-				"object.values": "^1.1.6"
-			}
-		},
-		"keyv": {
-			"version": "4.5.3",
-			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
-			"integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
-			"dev": true,
-			"requires": {
-				"json-buffer": "3.0.1"
-			}
-		},
-		"kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-		},
-		"klaw": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/klaw/-/klaw-4.1.0.tgz",
-			"integrity": "sha512-1zGZ9MF9H22UnkpVeuaGKOjfA2t6WrfdrJmGjy16ykcjnKQDmHVX+KI477rpbGevz/5FD4MC3xf1oxylBgcaQw==",
-			"dev": true
-		},
-		"klaw-sync": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
-			"integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.11"
-			}
-		},
-		"kleur": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
-		},
-		"klona": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
-			"integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
-			"dev": true
-		},
-		"known-css-properties": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
-			"integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
-			"dev": true
-		},
-		"kuler": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
-			"integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==",
-			"dev": true
-		},
-		"ky": {
-			"version": "0.33.3",
-			"resolved": "https://registry.npmjs.org/ky/-/ky-0.33.3.tgz",
-			"integrity": "sha512-CasD9OCEQSFIam2U8efFK81Yeg8vNMTBUqtMOHlrcWQHqUX3HeCl9Dr31u4toV7emlH8Mymk5+9p0lL6mKb/Xw==",
-			"dev": true
-		},
-		"language-subtag-registry": {
-			"version": "0.3.21",
-			"resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-			"integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-			"dev": true
-		},
-		"language-tags": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-			"integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
-			"dev": true,
-			"requires": {
-				"language-subtag-registry": "~0.3.2"
-			}
-		},
-		"launch-editor": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
-			"integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
-			"dev": true,
-			"requires": {
-				"picocolors": "^1.0.0",
-				"shell-quote": "^1.7.3"
-			}
-		},
-		"lazy-cache": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-			"integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-			"dev": true
-		},
-		"lazy-universal-dotenv": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/lazy-universal-dotenv/-/lazy-universal-dotenv-4.0.0.tgz",
-			"integrity": "sha512-aXpZJRnTkpK6gQ/z4nk+ZBLd/Qdp118cvPruLSIQzQNRhKwEcdXCOzXuF55VDqIiuAaY3UGZ10DJtvZzDcvsxg==",
-			"dev": true,
-			"requires": {
-				"app-root-dir": "^1.0.2",
-				"dotenv": "^16.0.0",
-				"dotenv-expand": "^10.0.0"
-			}
-		},
-		"lazystream": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
-			"integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
-			"dev": true,
-			"requires": {
-				"readable-stream": "^2.0.5"
-			}
-		},
-		"lerna": {
-			"version": "7.1.4",
-			"resolved": "https://registry.npmjs.org/lerna/-/lerna-7.1.4.tgz",
-			"integrity": "sha512-/cabvmTTkmayyALIZx7OpHRex72i8xSOkiJchEkrKxAZHoLNaGSwqwKkj+x6WtmchhWl/gLlqwQXGRuxrJKiBw==",
-			"dev": true,
-			"requires": {
-				"@lerna/child-process": "7.1.4",
-				"@lerna/create": "7.1.4",
-				"@npmcli/run-script": "6.0.2",
-				"@nx/devkit": ">=16.5.1 < 17",
-				"@octokit/plugin-enterprise-rest": "6.0.1",
-				"@octokit/rest": "19.0.11",
-				"byte-size": "8.1.1",
-				"chalk": "4.1.0",
-				"clone-deep": "4.0.1",
-				"cmd-shim": "6.0.1",
-				"columnify": "1.6.0",
-				"conventional-changelog-angular": "6.0.0",
-				"conventional-changelog-core": "5.0.1",
-				"conventional-recommended-bump": "7.0.1",
-				"cosmiconfig": "^8.2.0",
-				"dedent": "0.7.0",
-				"envinfo": "7.8.1",
-				"execa": "5.0.0",
-				"fs-extra": "^11.1.1",
-				"get-port": "5.1.1",
-				"get-stream": "6.0.0",
-				"git-url-parse": "13.1.0",
-				"glob-parent": "5.1.2",
-				"globby": "11.1.0",
-				"graceful-fs": "4.2.11",
-				"has-unicode": "2.0.1",
-				"import-local": "3.1.0",
-				"ini": "^1.3.8",
-				"init-package-json": "5.0.0",
-				"inquirer": "^8.2.4",
-				"is-ci": "3.0.1",
-				"is-stream": "2.0.0",
-				"jest-diff": ">=29.4.3 < 30",
-				"js-yaml": "4.1.0",
-				"libnpmaccess": "7.0.2",
-				"libnpmpublish": "7.3.0",
-				"load-json-file": "6.2.0",
-				"lodash": "^4.17.21",
-				"make-dir": "3.1.0",
-				"minimatch": "3.0.5",
-				"multimatch": "5.0.0",
-				"node-fetch": "2.6.7",
-				"npm-package-arg": "8.1.1",
-				"npm-packlist": "5.1.1",
-				"npm-registry-fetch": "^14.0.5",
-				"npmlog": "^6.0.2",
-				"nx": ">=16.5.1 < 17",
-				"p-map": "4.0.0",
-				"p-map-series": "2.1.0",
-				"p-pipe": "3.1.0",
-				"p-queue": "6.6.2",
-				"p-reduce": "2.1.0",
-				"p-waterfall": "2.1.1",
-				"pacote": "^15.2.0",
-				"pify": "5.0.0",
-				"read-cmd-shim": "4.0.0",
-				"read-package-json": "6.0.4",
-				"resolve-from": "5.0.0",
-				"rimraf": "^4.4.1",
-				"semver": "^7.3.8",
-				"signal-exit": "3.0.7",
-				"slash": "3.0.0",
-				"ssri": "^9.0.1",
-				"strong-log-transformer": "2.1.0",
-				"tar": "6.1.11",
-				"temp-dir": "1.0.0",
-				"typescript": ">=3 < 6",
-				"upath": "2.0.1",
-				"uuid": "^9.0.0",
-				"validate-npm-package-license": "3.0.4",
-				"validate-npm-package-name": "5.0.0",
-				"write-file-atomic": "5.0.1",
-				"write-pkg": "4.0.0",
-				"yargs": "16.2.0",
-				"yargs-parser": "20.2.4"
-			},
-			"dependencies": {
-				"@octokit/auth-token": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz",
-					"integrity": "sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==",
-					"dev": true
-				},
-				"@octokit/core": {
-					"version": "4.2.4",
-					"resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz",
-					"integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==",
-					"dev": true,
-					"requires": {
-						"@octokit/auth-token": "^3.0.0",
-						"@octokit/graphql": "^5.0.0",
-						"@octokit/request": "^6.0.0",
-						"@octokit/request-error": "^3.0.0",
-						"@octokit/types": "^9.0.0",
-						"before-after-hook": "^2.2.0",
-						"universal-user-agent": "^6.0.0"
-					}
-				},
-				"@octokit/endpoint": {
-					"version": "7.0.6",
-					"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.6.tgz",
-					"integrity": "sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==",
-					"dev": true,
-					"requires": {
-						"@octokit/types": "^9.0.0",
-						"is-plain-object": "^5.0.0",
-						"universal-user-agent": "^6.0.0"
-					}
-				},
-				"@octokit/graphql": {
-					"version": "5.0.6",
-					"resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.6.tgz",
-					"integrity": "sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==",
-					"dev": true,
-					"requires": {
-						"@octokit/request": "^6.0.0",
-						"@octokit/types": "^9.0.0",
-						"universal-user-agent": "^6.0.0"
-					}
-				},
-				"@octokit/openapi-types": {
-					"version": "18.0.0",
-					"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz",
-					"integrity": "sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw==",
-					"dev": true
-				},
-				"@octokit/plugin-paginate-rest": {
-					"version": "6.1.2",
-					"resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz",
-					"integrity": "sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ==",
-					"dev": true,
-					"requires": {
-						"@octokit/tsconfig": "^1.0.2",
-						"@octokit/types": "^9.2.3"
-					}
-				},
-				"@octokit/plugin-rest-endpoint-methods": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz",
-					"integrity": "sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA==",
-					"dev": true,
-					"requires": {
-						"@octokit/types": "^10.0.0"
-					},
-					"dependencies": {
-						"@octokit/types": {
-							"version": "10.0.0",
-							"resolved": "https://registry.npmjs.org/@octokit/types/-/types-10.0.0.tgz",
-							"integrity": "sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg==",
-							"dev": true,
-							"requires": {
-								"@octokit/openapi-types": "^18.0.0"
-							}
-						}
-					}
-				},
-				"@octokit/request": {
-					"version": "6.2.8",
-					"resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.8.tgz",
-					"integrity": "sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==",
-					"dev": true,
-					"requires": {
-						"@octokit/endpoint": "^7.0.0",
-						"@octokit/request-error": "^3.0.0",
-						"@octokit/types": "^9.0.0",
-						"is-plain-object": "^5.0.0",
-						"node-fetch": "^2.6.7",
-						"universal-user-agent": "^6.0.0"
-					}
-				},
-				"@octokit/request-error": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz",
-					"integrity": "sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==",
-					"dev": true,
-					"requires": {
-						"@octokit/types": "^9.0.0",
-						"deprecation": "^2.0.0",
-						"once": "^1.4.0"
-					}
-				},
-				"@octokit/rest": {
-					"version": "19.0.11",
-					"resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.11.tgz",
-					"integrity": "sha512-m2a9VhaP5/tUw8FwfnW2ICXlXpLPIqxtg3XcAiGMLj/Xhw3RSBfZ8le/466ktO1Gcjr8oXudGnHhxV1TXJgFxw==",
-					"dev": true,
-					"requires": {
-						"@octokit/core": "^4.2.1",
-						"@octokit/plugin-paginate-rest": "^6.1.2",
-						"@octokit/plugin-request-log": "^1.0.4",
-						"@octokit/plugin-rest-endpoint-methods": "^7.1.2"
-					}
-				},
-				"@octokit/types": {
-					"version": "9.3.2",
-					"resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
-					"integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
-					"dev": true,
-					"requires": {
-						"@octokit/openapi-types": "^18.0.0"
-					}
-				},
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"before-after-hook": {
-					"version": "2.2.3",
-					"resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
-					"integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"cli-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-					"integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-					"dev": true
-				},
-				"cosmiconfig": {
-					"version": "8.2.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-					"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^3.2.1",
-						"js-yaml": "^4.1.0",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"envinfo": {
-					"version": "7.8.1",
-					"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-					"integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-					"dev": true
-				},
-				"execa": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
-					"integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
-					"integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
-					"dev": true
-				},
-				"glob": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-					"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^5.0.1",
-						"once": "^1.3.0"
-					},
-					"dependencies": {
-						"brace-expansion": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-							"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-							"dev": true,
-							"requires": {
-								"balanced-match": "^1.0.0"
-							}
-						},
-						"minimatch": {
-							"version": "5.1.6",
-							"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-							"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-							"dev": true,
-							"requires": {
-								"brace-expansion": "^2.0.1"
-							}
-						}
-					}
-				},
-				"glob-parent": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"hosted-git-info": {
-					"version": "3.0.8",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
-					"integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"human-signals": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-					"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-					"dev": true
-				},
-				"ignore-walk": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz",
-					"integrity": "sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==",
-					"dev": true,
-					"requires": {
-						"minimatch": "^5.0.1"
-					},
-					"dependencies": {
-						"brace-expansion": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-							"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-							"dev": true,
-							"requires": {
-								"balanced-match": "^1.0.0"
-							}
-						},
-						"minimatch": {
-							"version": "5.1.6",
-							"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-							"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-							"dev": true,
-							"requires": {
-								"brace-expansion": "^2.0.1"
-							}
-						}
-					}
-				},
-				"inquirer": {
-					"version": "8.2.6",
-					"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz",
-					"integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==",
-					"dev": true,
-					"requires": {
-						"ansi-escapes": "^4.2.1",
-						"chalk": "^4.1.1",
-						"cli-cursor": "^3.1.0",
-						"cli-width": "^3.0.0",
-						"external-editor": "^3.0.3",
-						"figures": "^3.0.0",
-						"lodash": "^4.17.21",
-						"mute-stream": "0.0.8",
-						"ora": "^5.4.1",
-						"run-async": "^2.4.0",
-						"rxjs": "^7.5.5",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0",
-						"through": "^2.3.6",
-						"wrap-ansi": "^6.0.1"
-					},
-					"dependencies": {
-						"chalk": {
-							"version": "4.1.2",
-							"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-							"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-							"dev": true,
-							"requires": {
-								"ansi-styles": "^4.1.0",
-								"supports-color": "^7.1.0"
-							}
-						}
-					}
-				},
-				"is-ci": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-					"integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-					"dev": true,
-					"requires": {
-						"ci-info": "^3.2.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-					"integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-					"dev": true
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"load-json-file": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz",
-					"integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.15",
-						"parse-json": "^5.0.0",
-						"strip-bom": "^4.0.0",
-						"type-fest": "^0.6.0"
-					}
-				},
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"make-dir": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-					"dev": true,
-					"requires": {
-						"semver": "^6.0.0"
-					},
-					"dependencies": {
-						"semver": {
-							"version": "6.3.1",
-							"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-							"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-							"dev": true
-						}
-					}
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "3.0.5",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
-					"integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"node-fetch": {
-					"version": "2.6.7",
-					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-					"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-					"dev": true,
-					"requires": {
-						"whatwg-url": "^5.0.0"
-					}
-				},
-				"npm-package-arg": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz",
-					"integrity": "sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^3.0.6",
-						"semver": "^7.0.0",
-						"validate-npm-package-name": "^3.0.0"
-					},
-					"dependencies": {
-						"validate-npm-package-name": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-							"integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
-							"dev": true,
-							"requires": {
-								"builtins": "^1.0.3"
-							}
-						}
-					}
-				},
-				"npm-packlist": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz",
-					"integrity": "sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==",
-					"dev": true,
-					"requires": {
-						"glob": "^8.0.1",
-						"ignore-walk": "^5.0.1",
-						"npm-bundled": "^1.1.2",
-						"npm-normalize-package-bin": "^1.0.1"
-					}
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"ora": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-					"integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-					"dev": true,
-					"requires": {
-						"bl": "^4.1.0",
-						"chalk": "^4.1.0",
-						"cli-cursor": "^3.1.0",
-						"cli-spinners": "^2.5.0",
-						"is-interactive": "^1.0.0",
-						"is-unicode-supported": "^0.1.0",
-						"log-symbols": "^4.1.0",
-						"strip-ansi": "^6.0.0",
-						"wcwidth": "^1.0.1"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"path-type": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-					"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-					"dev": true
-				},
-				"pify": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-					"integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
-					"dev": true
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"dev": true,
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"rimraf": {
-					"version": "4.4.1",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz",
-					"integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==",
-					"dev": true,
-					"requires": {
-						"glob": "^9.2.0"
-					},
-					"dependencies": {
-						"brace-expansion": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-							"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-							"dev": true,
-							"requires": {
-								"balanced-match": "^1.0.0"
-							}
-						},
-						"glob": {
-							"version": "9.3.5",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
-							"integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
-							"dev": true,
-							"requires": {
-								"fs.realpath": "^1.0.0",
-								"minimatch": "^8.0.2",
-								"minipass": "^4.2.4",
-								"path-scurry": "^1.6.1"
-							}
-						},
-						"minimatch": {
-							"version": "8.0.4",
-							"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
-							"integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
-							"dev": true,
-							"requires": {
-								"brace-expansion": "^2.0.1"
-							}
-						},
-						"minipass": {
-							"version": "4.2.8",
-							"resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
-							"integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
-							"dev": true
-						}
-					}
-				},
-				"rxjs": {
-					"version": "7.8.1",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-					"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-					"dev": true,
-					"requires": {
-						"tslib": "^2.1.0"
-					}
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"ssri": {
-					"version": "9.0.1",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
-					"integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
-					"dev": true,
-					"requires": {
-						"minipass": "^3.1.1"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"universal-user-agent": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-					"integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-					"dev": true
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				},
-				"upath": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz",
-					"integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==",
-					"dev": true
-				},
-				"validate-npm-package-name": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-					"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-					"dev": true,
-					"requires": {
-						"builtins": "^5.0.0"
-					},
-					"dependencies": {
-						"builtins": {
-							"version": "5.0.1",
-							"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-							"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-							"dev": true,
-							"requires": {
-								"semver": "^7.0.0"
-							}
-						}
-					}
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				},
-				"write-file-atomic": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-					"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-					"dev": true,
-					"requires": {
-						"imurmurhash": "^0.1.4",
-						"signal-exit": "^4.0.1"
-					},
-					"dependencies": {
-						"signal-exit": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-							"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-							"dev": true
-						}
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				},
-				"yargs-parser": {
-					"version": "20.2.4",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-					"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-					"dev": true
-				}
-			}
-		},
-		"leven": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
-		},
-		"levn": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-			"integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2"
-			}
-		},
-		"lib0": {
-			"version": "0.2.79",
-			"resolved": "https://registry.npmjs.org/lib0/-/lib0-0.2.79.tgz",
-			"integrity": "sha512-fIdPbxzMVq10wt3ou1lp3/f9n5ciHZ6t+P1vyGy3XXr018AntTYM4eg24sNFcNq8SYDQwmhhoGdS58IlYBzfBw==",
-			"requires": {
-				"isomorphic.js": "^0.2.4"
-			}
-		},
-		"libnpmaccess": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-7.0.2.tgz",
-			"integrity": "sha512-vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw==",
-			"dev": true,
-			"requires": {
-				"npm-package-arg": "^10.1.0",
-				"npm-registry-fetch": "^14.0.3"
-			},
-			"dependencies": {
-				"builtins": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-					"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-					"dev": true,
-					"requires": {
-						"semver": "^7.0.0"
-					}
-				},
-				"hosted-git-info": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-					"integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^7.5.1"
-					}
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"npm-package-arg": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
-					"integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^6.0.0",
-						"proc-log": "^3.0.0",
-						"semver": "^7.3.5",
-						"validate-npm-package-name": "^5.0.0"
-					}
-				},
-				"validate-npm-package-name": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-					"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-					"dev": true,
-					"requires": {
-						"builtins": "^5.0.0"
-					}
-				}
-			}
-		},
-		"libnpmpublish": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-7.3.0.tgz",
-			"integrity": "sha512-fHUxw5VJhZCNSls0KLNEG0mCD2PN1i14gH5elGOgiVnU3VgTcRahagYP2LKI1m0tFCJ+XrAm0zVYyF5RCbXzcg==",
-			"dev": true,
-			"requires": {
-				"ci-info": "^3.6.1",
-				"normalize-package-data": "^5.0.0",
-				"npm-package-arg": "^10.1.0",
-				"npm-registry-fetch": "^14.0.3",
-				"proc-log": "^3.0.0",
-				"semver": "^7.3.7",
-				"sigstore": "^1.4.0",
-				"ssri": "^10.0.1"
-			},
-			"dependencies": {
-				"builtins": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-					"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-					"dev": true,
-					"requires": {
-						"semver": "^7.0.0"
-					}
-				},
-				"hosted-git-info": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-					"integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^7.5.1"
-					}
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"minipass": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-					"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",
-					"integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^6.0.0",
-						"is-core-module": "^2.8.1",
-						"semver": "^7.3.5",
-						"validate-npm-package-license": "^3.0.4"
-					}
-				},
-				"npm-package-arg": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
-					"integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^6.0.0",
-						"proc-log": "^3.0.0",
-						"semver": "^7.3.5",
-						"validate-npm-package-name": "^5.0.0"
-					}
-				},
-				"ssri": {
-					"version": "10.0.4",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz",
-					"integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==",
-					"dev": true,
-					"requires": {
-						"minipass": "^5.0.0"
-					}
-				},
-				"validate-npm-package-name": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-					"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-					"dev": true,
-					"requires": {
-						"builtins": "^5.0.0"
-					}
-				}
-			}
-		},
-		"lighthouse": {
-			"version": "10.4.0",
-			"resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-10.4.0.tgz",
-			"integrity": "sha512-XQWHEWkJ8YxSPsxttBJORy5+hQrzbvGkYfeP3fJjyYKioWkF2MXfFqNK4ZuV4jL8pBu7Z91qnQP6In0bq1yXww==",
-			"dev": true,
-			"requires": {
-				"@sentry/node": "^6.17.4",
-				"axe-core": "4.7.2",
-				"chrome-launcher": "^0.15.2",
-				"configstore": "^5.0.1",
-				"csp_evaluator": "1.1.1",
-				"devtools-protocol": "0.0.1155343",
-				"enquirer": "^2.3.6",
-				"http-link-header": "^1.1.1",
-				"intl-messageformat": "^4.4.0",
-				"jpeg-js": "^0.4.4",
-				"js-library-detector": "^6.6.0",
-				"lighthouse-logger": "^1.4.1",
-				"lighthouse-stack-packs": "1.11.0",
-				"lodash": "^4.17.21",
-				"lookup-closest-locale": "6.2.0",
-				"metaviewport-parser": "0.3.0",
-				"open": "^8.4.0",
-				"parse-cache-control": "1.0.1",
-				"ps-list": "^8.0.0",
-				"puppeteer-core": "^20.8.0",
-				"robots-parser": "^3.0.0",
-				"semver": "^5.3.0",
-				"speedline-core": "^1.4.3",
-				"third-party-web": "^0.23.3",
-				"ws": "^7.0.0",
-				"yargs": "^17.3.1",
-				"yargs-parser": "^21.0.0"
-			},
-			"dependencies": {
-				"cliui": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.1",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"cross-fetch": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
-					"integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
-					"dev": true,
-					"requires": {
-						"node-fetch": "^2.6.12"
-					}
-				},
-				"devtools-protocol": {
-					"version": "0.0.1155343",
-					"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1155343.tgz",
-					"integrity": "sha512-oD9vGBV2wTc7fAzAM6KC0chSgs234V8+qDEeK+mcbRj2UvcuA7lgBztGi/opj/iahcXD3BSj8Ymvib628yy9FA==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"is-wsl": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-					"dev": true,
-					"requires": {
-						"is-docker": "^2.0.0"
-					}
-				},
-				"node-fetch": {
-					"version": "2.6.12",
-					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-					"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-					"dev": true,
-					"requires": {
-						"whatwg-url": "^5.0.0"
-					}
-				},
-				"open": {
-					"version": "8.4.2",
-					"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-					"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-					"dev": true,
-					"requires": {
-						"define-lazy-prop": "^2.0.0",
-						"is-docker": "^2.1.1",
-						"is-wsl": "^2.2.0"
-					}
-				},
-				"puppeteer-core": {
-					"version": "20.9.0",
-					"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.9.0.tgz",
-					"integrity": "sha512-H9fYZQzMTRrkboEfPmf7m3CLDN6JvbxXA3qTtS+dFt27tR+CsFHzPsT6pzp6lYL6bJbAPaR0HaPO6uSi+F94Pg==",
-					"dev": true,
-					"requires": {
-						"@puppeteer/browsers": "1.4.6",
-						"chromium-bidi": "0.4.16",
-						"cross-fetch": "4.0.0",
-						"debug": "4.3.4",
-						"devtools-protocol": "0.0.1147663",
-						"ws": "8.13.0"
-					},
-					"dependencies": {
-						"devtools-protocol": {
-							"version": "0.0.1147663",
-							"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1147663.tgz",
-							"integrity": "sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ==",
-							"dev": true
-						},
-						"ws": {
-							"version": "8.13.0",
-							"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-							"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-							"dev": true
-						}
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "17.7.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-					"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-					"dev": true,
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-					"dev": true
-				}
-			}
-		},
-		"lighthouse-logger": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz",
-			"integrity": "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==",
-			"dev": true,
-			"requires": {
-				"debug": "^2.6.9",
-				"marky": "^1.2.2"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"lighthouse-stack-packs": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/lighthouse-stack-packs/-/lighthouse-stack-packs-1.11.0.tgz",
-			"integrity": "sha512-sRr0z1S/I26VffRLq9KJsKtLk856YrJlNGmcJmbLX8dFn3MuzVPUbstuChEhqnSxZb8TZmVfthuXuwhG9vRoSw==",
-			"dev": true
-		},
-		"lilconfig": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-			"integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
-			"dev": true
-		},
-		"line-height": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/line-height/-/line-height-0.3.1.tgz",
-			"integrity": "sha512-YExecgqPwnp5gplD2+Y8e8A5+jKpr25+DzMbFdI1/1UAr0FJrTFv4VkHLf8/6B590i1wUPJWMKKldkd/bdQ//w==",
-			"requires": {
-				"computed-style": "~0.1.3"
-			}
-		},
-		"lines-and-columns": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
-		},
-		"linkify-it": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-			"integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
-			"dev": true,
-			"requires": {
-				"uc.micro": "^1.0.1"
-			}
-		},
-		"lint-staged": {
-			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.0.1.tgz",
-			"integrity": "sha512-Qk48GmcMX8zFzhuJsf0ZquILxnnDkY56Y+/y1TGxEe4S5P+RetnisiF0Z15t+Gwa5PMNAG4dPxqGHabW7L4zwg==",
-			"dev": true,
-			"requires": {
-				"chalk": "^3.0.0",
-				"commander": "^4.0.1",
-				"cosmiconfig": "^6.0.0",
-				"debug": "^4.1.1",
-				"dedent": "^0.7.0",
-				"execa": "^3.4.0",
-				"listr": "^0.14.3",
-				"log-symbols": "^3.0.0",
-				"micromatch": "^4.0.2",
-				"normalize-path": "^3.0.0",
-				"please-upgrade-node": "^3.2.0",
-				"stringify-object": "^3.3.0"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"commander": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-					"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-					"dev": true
-				},
-				"cosmiconfig": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-					"integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-					"dev": true,
-					"requires": {
-						"@types/parse-json": "^4.0.0",
-						"import-fresh": "^3.1.0",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0",
-						"yaml": "^1.7.2"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
-					"integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"get-stream": "^5.0.0",
-						"human-signals": "^1.1.1",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.0",
-						"onetime": "^5.1.0",
-						"p-finally": "^2.0.0",
-						"signal-exit": "^3.0.2",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"log-symbols": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-					"integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.2"
-					},
-					"dependencies": {
-						"ansi-styles": {
-							"version": "3.2.1",
-							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-							"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-							"dev": true,
-							"requires": {
-								"color-convert": "^1.9.0"
-							}
-						},
-						"chalk": {
-							"version": "2.4.2",
-							"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-							"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-							"dev": true,
-							"requires": {
-								"ansi-styles": "^3.2.1",
-								"escape-string-regexp": "^1.0.5",
-								"supports-color": "^5.3.0"
-							}
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						}
-					}
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"p-finally": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
-					"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"path-type": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-					"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"listenercount": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
-			"integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==",
-			"dev": true
-		},
-		"listr": {
-			"version": "0.14.3",
-			"resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz",
-			"integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==",
-			"dev": true,
-			"requires": {
-				"@samverschueren/stream-to-observable": "^0.3.0",
-				"is-observable": "^1.1.0",
-				"is-promise": "^2.1.0",
-				"is-stream": "^1.1.0",
-				"listr-silent-renderer": "^1.1.1",
-				"listr-update-renderer": "^0.5.0",
-				"listr-verbose-renderer": "^0.5.0",
-				"p-map": "^2.0.0",
-				"rxjs": "^6.3.3"
-			},
-			"dependencies": {
-				"is-promise": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-					"integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-					"dev": true
-				},
-				"p-map": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-					"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-					"dev": true
-				}
-			}
-		},
-		"listr-silent-renderer": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
-			"integrity": "sha512-L26cIFm7/oZeSNVhWB6faeorXhMg4HNlb/dS/7jHhr708jxlXrtrBWo4YUxZQkc6dGoxEAe6J/D3juTRBUzjtA==",
-			"dev": true
-		},
-		"listr-update-renderer": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz",
-			"integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==",
-			"dev": true,
-			"requires": {
-				"chalk": "^1.1.3",
-				"cli-truncate": "^0.2.1",
-				"elegant-spinner": "^1.0.1",
-				"figures": "^1.7.0",
-				"indent-string": "^3.0.0",
-				"log-symbols": "^1.0.2",
-				"log-update": "^2.3.0",
-				"strip-ansi": "^3.0.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"figures": {
-					"version": "1.7.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-					"integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5",
-						"object-assign": "^4.1.0"
-					}
-				},
-				"log-symbols": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-					"integrity": "sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==",
-					"dev": true,
-					"requires": {
-						"chalk": "^1.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-					"dev": true
-				}
-			}
-		},
-		"listr-verbose-renderer": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz",
-			"integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.4.1",
-				"cli-cursor": "^2.1.0",
-				"date-fns": "^1.27.2",
-				"figures": "^2.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"date-fns": {
-					"version": "1.30.1",
-					"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
-					"integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
-					"dev": true
-				}
-			}
-		},
-		"loader-runner": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-			"integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-			"dev": true
-		},
-		"loader-utils": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-			"dev": true,
-			"requires": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^2.1.2"
-			}
-		},
-		"locate-app": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/locate-app/-/locate-app-2.1.0.tgz",
-			"integrity": "sha512-rcVo/iLUxrd9d0lrmregK/Z5Y5NCpSwf9KlMbPpOHmKmdxdQY1Fj8NDQ5QymJTryCsBLqwmniFv2f3JKbk9Bvg==",
-			"dev": true,
-			"requires": {
-				"n12": "0.4.0",
-				"type-fest": "2.13.0",
-				"userhome": "1.0.0"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "2.13.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.0.tgz",
-					"integrity": "sha512-lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw==",
-					"dev": true
-				}
-			}
-		},
-		"locate-path": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-			"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-			"dev": true,
-			"requires": {
-				"p-locate": "^2.0.0",
-				"path-exists": "^3.0.0"
-			}
-		},
-		"lockfile": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz",
-			"integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==",
-			"dev": true,
-			"requires": {
-				"signal-exit": "^3.0.2"
-			}
-		},
-		"lodash": {
-			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-		},
-		"lodash.clonedeep": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-			"integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
-			"dev": true
-		},
-		"lodash.debounce": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
-		},
-		"lodash.escape": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-			"integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==",
-			"dev": true
-		},
-		"lodash.flatten": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-			"integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-			"dev": true
-		},
-		"lodash.get": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-			"integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-			"dev": true
-		},
-		"lodash.invokemap": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz",
-			"integrity": "sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w==",
-			"dev": true
-		},
-		"lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-		},
-		"lodash.ismatch": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz",
-			"integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==",
-			"dev": true
-		},
-		"lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-			"dev": true
-		},
-		"lodash.merge": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"dev": true
-		},
-		"lodash.pullall": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/lodash.pullall/-/lodash.pullall-4.2.0.tgz",
-			"integrity": "sha512-VhqxBKH0ZxPpLhiu68YD1KnHmbhQJQctcipvmFnqIBDYzcIHzf3Zpu0tpeOKtR4x76p9yohc506eGdOjTmyIBg==",
-			"dev": true
-		},
-		"lodash.set": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-			"integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==",
-			"dev": true
-		},
-		"lodash.throttle": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-			"integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
-		},
-		"lodash.truncate": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-			"integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-			"dev": true
-		},
-		"lodash.uniq": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-			"dev": true
-		},
-		"lodash.uniqby": {
-			"version": "4.7.0",
-			"resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
-			"integrity": "sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==",
-			"dev": true
-		},
-		"lodash.zip": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
-			"integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==",
-			"dev": true
-		},
-		"log-symbols": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-			"requires": {
-				"chalk": "^4.1.0",
-				"is-unicode-supported": "^0.1.0"
-			}
-		},
-		"log-update": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz",
-			"integrity": "sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==",
-			"dev": true,
-			"requires": {
-				"ansi-escapes": "^3.0.0",
-				"cli-cursor": "^2.0.0",
-				"wrap-ansi": "^3.0.1"
-			},
-			"dependencies": {
-				"ansi-escapes": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-					"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
-					"integrity": "sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					}
-				}
-			}
-		},
-		"logform": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz",
-			"integrity": "sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==",
-			"dev": true,
-			"requires": {
-				"@colors/colors": "1.5.0",
-				"@types/triple-beam": "^1.3.2",
-				"fecha": "^4.2.0",
-				"ms": "^2.1.1",
-				"safe-stable-stringify": "^2.3.1",
-				"triple-beam": "^1.3.0"
-			},
-			"dependencies": {
-				"ms": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-					"dev": true
-				}
-			}
-		},
-		"logkitty": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/logkitty/-/logkitty-0.7.1.tgz",
-			"integrity": "sha512-/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ==",
-			"requires": {
-				"ansi-fragments": "^0.2.1",
-				"dayjs": "^1.8.15",
-				"yargs": "^15.1.0"
-			},
-			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"yargs": {
-					"version": "15.4.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-					"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-					"requires": {
-						"cliui": "^6.0.0",
-						"decamelize": "^1.2.0",
-						"find-up": "^4.1.0",
-						"get-caller-file": "^2.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^2.0.0",
-						"set-blocking": "^2.0.0",
-						"string-width": "^4.2.0",
-						"which-module": "^2.0.0",
-						"y18n": "^4.0.0",
-						"yargs-parser": "^18.1.2"
-					}
-				},
-				"yargs-parser": {
-					"version": "18.1.3",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-					"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
-					}
-				}
-			}
-		},
-		"loglevel": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
-			"integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
-			"dev": true
-		},
-		"loglevel-plugin-prefix": {
-			"version": "0.8.4",
-			"resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz",
-			"integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==",
-			"dev": true
-		},
-		"longest-streak": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
-			"integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
-			"dev": true
-		},
-		"lookup-closest-locale": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/lookup-closest-locale/-/lookup-closest-locale-6.2.0.tgz",
-			"integrity": "sha512-/c2kL+Vnp1jnV6K6RpDTHK3dgg0Tu2VVp+elEiJpjfS1UyY7AjOYHohRug6wT0OpoX2qFgNORndE9RqesfVxWQ==",
-			"dev": true
-		},
-		"loose-envify": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-			"requires": {
-				"js-tokens": "^3.0.0 || ^4.0.0"
-			}
-		},
-		"lower-case": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-			"integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-			"requires": {
-				"tslib": "^2.0.3"
-			}
-		},
-		"lowercase-keys": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-			"integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-			"dev": true
-		},
-		"lru_map": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
-			"integrity": "sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==",
-			"dev": true
-		},
-		"lru-cache": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
-			"integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-			"dev": true,
-			"requires": {
-				"pseudomap": "^1.0.2",
-				"yallist": "^2.1.2"
-			}
-		},
-		"lunr": {
-			"version": "2.3.9",
-			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
-			"integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
-			"dev": true
-		},
-		"lz-string": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
-			"integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
-			"dev": true
-		},
-		"macos-release": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.2.0.tgz",
-			"integrity": "sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==",
-			"dev": true
-		},
-		"make-dir": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz",
-			"integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
-			"dev": true,
-			"requires": {
-				"semver": "^6.0.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"make-error": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-			"dev": true
-		},
-		"make-fetch-happen": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
-			"integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
-			"dev": true,
-			"requires": {
-				"agentkeepalive": "^4.2.1",
-				"cacache": "^17.0.0",
-				"http-cache-semantics": "^4.1.1",
-				"http-proxy-agent": "^5.0.0",
-				"https-proxy-agent": "^5.0.0",
-				"is-lambda": "^1.0.1",
-				"lru-cache": "^7.7.1",
-				"minipass": "^5.0.0",
-				"minipass-fetch": "^3.0.0",
-				"minipass-flush": "^1.0.5",
-				"minipass-pipeline": "^1.2.4",
-				"negotiator": "^0.6.3",
-				"promise-retry": "^2.0.1",
-				"socks-proxy-agent": "^7.0.0",
-				"ssri": "^10.0.0"
-			},
-			"dependencies": {
-				"@npmcli/fs": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
-					"integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
-					"dev": true,
-					"requires": {
-						"semver": "^7.3.5"
-					}
-				},
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"cacache": {
-					"version": "17.1.3",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz",
-					"integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==",
-					"dev": true,
-					"requires": {
-						"@npmcli/fs": "^3.1.0",
-						"fs-minipass": "^3.0.0",
-						"glob": "^10.2.2",
-						"lru-cache": "^7.7.1",
-						"minipass": "^5.0.0",
-						"minipass-collect": "^1.0.2",
-						"minipass-flush": "^1.0.5",
-						"minipass-pipeline": "^1.2.4",
-						"p-map": "^4.0.0",
-						"ssri": "^10.0.0",
-						"tar": "^6.1.11",
-						"unique-filename": "^3.0.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"foreground-child": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-					"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"signal-exit": "^4.0.1"
-					}
-				},
-				"fs-minipass": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz",
-					"integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==",
-					"dev": true,
-					"requires": {
-						"minipass": "^5.0.0"
-					}
-				},
-				"glob": {
-					"version": "10.3.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-					"integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
-					"dev": true,
-					"requires": {
-						"foreground-child": "^3.1.0",
-						"jackspeak": "^2.0.3",
-						"minimatch": "^9.0.1",
-						"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-						"path-scurry": "^1.10.1"
-					}
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "9.0.3",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-					"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				},
-				"minipass": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-					"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"signal-exit": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-					"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-					"dev": true
-				},
-				"ssri": {
-					"version": "10.0.4",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz",
-					"integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==",
-					"dev": true,
-					"requires": {
-						"minipass": "^5.0.0"
-					}
-				},
-				"unique-filename": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-					"integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
-					"dev": true,
-					"requires": {
-						"unique-slug": "^4.0.0"
-					}
-				},
-				"unique-slug": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-					"integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
-					"dev": true,
-					"requires": {
-						"imurmurhash": "^0.1.4"
-					}
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"makeerror": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-			"requires": {
-				"tmpl": "1.0.5"
-			}
-		},
-		"map-cache": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-			"integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="
-		},
-		"map-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-			"integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-			"dev": true
-		},
-		"map-or-similar": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz",
-			"integrity": "sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==",
-			"dev": true
-		},
-		"map-values": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/map-values/-/map-values-1.0.1.tgz",
-			"integrity": "sha512-BbShUnr5OartXJe1GeccAWtfro11hhgNJg6G9/UtWKjVGvV5U4C09cg5nk8JUevhXODaXY+hQ3xxMUKSs62ONQ==",
-			"dev": true
-		},
-		"map-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-			"integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
-			"requires": {
-				"object-visit": "^1.0.0"
-			}
-		},
-		"markdown-builder": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/markdown-builder/-/markdown-builder-0.9.0.tgz",
-			"integrity": "sha512-UovCyEEzMeKE7l88fbOk9SIJkOG7KXkg+TdudN8rvOtCtBO5uu1X27HSnM7LS/xH+vaShJLGpkBcYYcojWNx/g==",
-			"dev": true,
-			"requires": {
-				"husky": "^1.0.0-rc.14"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-					"integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^2.0.0",
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.13.1",
-						"parse-json": "^4.0.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"get-stdin": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
-					"integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
-					"dev": true
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"husky": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz",
-					"integrity": "sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==",
-					"dev": true,
-					"requires": {
-						"cosmiconfig": "^5.0.7",
-						"execa": "^1.0.0",
-						"find-up": "^3.0.0",
-						"get-stdin": "^6.0.0",
-						"is-ci": "^2.0.0",
-						"pkg-dir": "^3.0.0",
-						"please-upgrade-node": "^3.1.1",
-						"read-pkg": "^4.0.1",
-						"run-node": "^1.0.0",
-						"slash": "^2.0.0"
-					}
-				},
-				"import-fresh": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-					"integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
-					"dev": true,
-					"requires": {
-						"caller-path": "^2.0.0",
-						"resolve-from": "^3.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"parse-json": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-					"integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.3.1",
-						"json-parse-better-errors": "^1.0.1"
-					}
-				},
-				"pify": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-					"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"read-pkg": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz",
-					"integrity": "sha512-+UBirHHDm5J+3WDmLBZYSklRYg82nMlz+enn+GMZ22nSR2f4bzxmhso6rzQW/3mT2PVzpzDTiYIZahk8UmZ44w==",
-					"dev": true,
-					"requires": {
-						"normalize-package-data": "^2.3.2",
-						"parse-json": "^4.0.0",
-						"pify": "^3.0.0"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-					"dev": true
-				},
-				"slash": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-					"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-					"dev": true
-				}
-			}
-		},
-		"markdown-escapes": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
-			"integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
-			"dev": true
-		},
-		"markdown-it": {
-			"version": "12.3.2",
-			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-			"integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
-			"dev": true,
-			"requires": {
-				"argparse": "^2.0.1",
-				"entities": "~2.1.0",
-				"linkify-it": "^3.0.1",
-				"mdurl": "^1.0.1",
-				"uc.micro": "^1.0.5"
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"entities": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-					"integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-					"dev": true
-				}
-			}
-		},
-		"markdown-table": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz",
-			"integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==",
-			"dev": true
-		},
-		"markdown-to-jsx": {
-			"version": "7.3.2",
-			"resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.3.2.tgz",
-			"integrity": "sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q==",
-			"dev": true
-		},
-		"markdownlint": {
-			"version": "0.25.1",
-			"resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.25.1.tgz",
-			"integrity": "sha512-AG7UkLzNa1fxiOv5B+owPsPhtM4D6DoODhsJgiaNg1xowXovrYgOnLqAgOOFQpWOlHFVQUzjMY5ypNNTeov92g==",
-			"dev": true,
-			"requires": {
-				"markdown-it": "12.3.2"
-			}
-		},
-		"markdownlint-cli": {
-			"version": "0.31.1",
-			"resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.31.1.tgz",
-			"integrity": "sha512-keIOMwQn+Ch7MoBwA+TdkyVMuxAeZFEGmIIlvwgV0Z1TGS5MxPnRr29XCLhkNzCHU+uNKGjU+VEjLX+Z9kli6g==",
-			"dev": true,
-			"requires": {
-				"commander": "~9.0.0",
-				"get-stdin": "~9.0.0",
-				"glob": "~7.2.0",
-				"ignore": "~5.2.0",
-				"js-yaml": "^4.1.0",
-				"jsonc-parser": "~3.0.0",
-				"markdownlint": "~0.25.1",
-				"markdownlint-rule-helpers": "~0.16.0",
-				"minimatch": "~3.0.5",
-				"run-con": "~1.2.10"
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"commander": {
-					"version": "9.0.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-9.0.0.tgz",
-					"integrity": "sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==",
-					"dev": true
-				},
-				"get-stdin": {
-					"version": "9.0.0",
-					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
-					"integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
-					"dev": true
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					},
-					"dependencies": {
-						"minimatch": {
-							"version": "3.1.2",
-							"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-							"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-							"dev": true,
-							"requires": {
-								"brace-expansion": "^1.1.7"
-							}
-						}
-					}
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"minimatch": {
-					"version": "3.0.8",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
-					"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				}
-			}
-		},
-		"markdownlint-rule-helpers": {
-			"version": "0.16.0",
-			"resolved": "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.16.0.tgz",
-			"integrity": "sha512-oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w==",
-			"dev": true
-		},
-		"marked": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
-			"integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
-			"dev": true
-		},
-		"marky": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
-			"integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
-			"dev": true
-		},
-		"mathjs": {
-			"version": "10.6.4",
-			"resolved": "https://registry.npmjs.org/mathjs/-/mathjs-10.6.4.tgz",
-			"integrity": "sha512-omQyvRE1jIy+3k2qsqkWASOcd45aZguXZDckr3HtnTYyXk5+2xpVfC3kATgbO2Srjxlqww3TVdhD0oUdZ/hiFA==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.18.6",
-				"complex.js": "^2.1.1",
-				"decimal.js": "^10.3.1",
-				"escape-latex": "^1.2.0",
-				"fraction.js": "^4.2.0",
-				"javascript-natural-sort": "^0.7.1",
-				"seedrandom": "^3.0.5",
-				"tiny-emitter": "^2.1.0",
-				"typed-function": "^2.1.0"
-			}
-		},
-		"mathml-tag-names": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-			"integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-			"dev": true
-		},
-		"md5.js": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-			"dev": true,
-			"requires": {
-				"hash-base": "^3.0.0",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.1.2"
-			}
-		},
-		"mdast-util-compact": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
-			"integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-			"dev": true,
-			"requires": {
-				"unist-util-modify-children": "^1.0.0",
-				"unist-util-visit": "^1.1.0"
-			}
-		},
-		"mdast-util-definitions": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz",
-			"integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==",
-			"dev": true,
-			"requires": {
-				"unist-util-visit": "^2.0.0"
-			},
-			"dependencies": {
-				"unist-util-is": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-					"integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-					"dev": true
-				},
-				"unist-util-visit": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-					"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-					"dev": true,
-					"requires": {
-						"@types/unist": "^2.0.0",
-						"unist-util-is": "^4.0.0",
-						"unist-util-visit-parents": "^3.0.0"
-					}
-				},
-				"unist-util-visit-parents": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-					"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-					"dev": true,
-					"requires": {
-						"@types/unist": "^2.0.0",
-						"unist-util-is": "^4.0.0"
-					}
-				}
-			}
-		},
-		"mdast-util-inject": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz",
-			"integrity": "sha512-CcJ0mHa36QYumDKiZ2OIR+ClhfOM7zIzN+Wfy8tRZ1hpH9DKLCS+Mh4DyK5bCxzE9uxMWcbIpeNFWsg1zrj/2g==",
-			"dev": true,
-			"requires": {
-				"mdast-util-to-string": "^1.0.0"
-			}
-		},
-		"mdast-util-to-string": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.5.tgz",
-			"integrity": "sha512-2qLt/DEOo5F6nc2VFScQiHPzQ0XXcabquRJxKMhKte8nt42o08HUxNDPk7tt0YPxnWjAT11I1SYi0X0iPnfI5A==",
-			"dev": true
-		},
-		"mdn-data": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-		},
-		"mdurl": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-			"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-			"dev": true
-		},
-		"media-typer": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-			"dev": true
-		},
-		"memfs": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-			"integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
-			"dev": true,
-			"requires": {
-				"fs-monkey": "^1.0.4"
-			}
-		},
-		"memize": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/memize/-/memize-2.1.0.tgz",
-			"integrity": "sha512-yywVJy8ctVlN5lNPxsep5urnZ6TTclwPEyigM9M3Bi8vseJBOfqNrGWN/r8NzuIt3PovM323W04blJfGQfQSVg=="
-		},
-		"memoize-one": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-			"integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
-		},
-		"memoizerific": {
-			"version": "1.11.3",
-			"resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
-			"integrity": "sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==",
-			"dev": true,
-			"requires": {
-				"map-or-similar": "^1.5.0"
-			}
-		},
-		"memory-fs": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-			"integrity": "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==",
-			"dev": true,
-			"requires": {
-				"errno": "^0.1.3",
-				"readable-stream": "^2.0.1"
-			}
-		},
-		"memorystream": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
-			"integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==",
-			"dev": true
-		},
-		"meow": {
-			"version": "8.1.2",
-			"resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
-			"integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==",
-			"dev": true,
-			"requires": {
-				"@types/minimist": "^1.2.0",
-				"camelcase-keys": "^6.2.2",
-				"decamelize-keys": "^1.1.0",
-				"hard-rejection": "^2.1.0",
-				"minimist-options": "4.1.0",
-				"normalize-package-data": "^3.0.0",
-				"read-pkg-up": "^7.0.1",
-				"redent": "^3.0.0",
-				"trim-newlines": "^3.0.0",
-				"type-fest": "^0.18.0",
-				"yargs-parser": "^20.2.3"
-			},
-			"dependencies": {
-				"normalize-package-data": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-					"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^4.0.1",
-						"is-core-module": "^2.5.0",
-						"semver": "^7.3.4",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"type-fest": {
-					"version": "0.18.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-					"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-					"dev": true
-				}
-			}
-		},
-		"merge-deep": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
-			"integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
-			"dev": true,
-			"requires": {
-				"arr-union": "^3.1.0",
-				"clone-deep": "^0.2.4",
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"clone-deep": {
-					"version": "0.2.4",
-					"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-					"integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==",
-					"dev": true,
-					"requires": {
-						"for-own": "^0.1.3",
-						"is-plain-object": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"lazy-cache": "^1.0.3",
-						"shallow-clone": "^0.1.2"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"dev": true,
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				},
-				"shallow-clone": {
-					"version": "0.1.2",
-					"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-					"integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.1",
-						"kind-of": "^2.0.1",
-						"lazy-cache": "^0.2.3",
-						"mixin-object": "^2.0.1"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-							"integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.0.2"
-							}
-						},
-						"lazy-cache": {
-							"version": "0.2.7",
-							"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-							"integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
-							"dev": true
-						}
-					}
-				}
-			}
-		},
-		"merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-			"dev": true
-		},
-		"merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-		},
-		"merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true
-		},
-		"metaviewport-parser": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/metaviewport-parser/-/metaviewport-parser-0.3.0.tgz",
-			"integrity": "sha512-EoYJ8xfjQ6kpe9VbVHvZTZHiOl4HL1Z18CrZ+qahvLXT7ZO4YTC2JMyt5FaUp9JJp6J4Ybb/z7IsCXZt86/QkQ==",
-			"dev": true
-		},
-		"method-override": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/method-override/-/method-override-3.0.0.tgz",
-			"integrity": "sha512-IJ2NNN/mSl9w3kzWB92rcdHpz+HjkxhDJWNDBqSlas+zQdP8wBiJzITPg08M/k2uVvMow7Sk41atndNtt/PHSA==",
-			"dev": true,
-			"requires": {
-				"debug": "3.1.0",
-				"methods": "~1.1.2",
-				"parseurl": "~1.3.2",
-				"vary": "~1.1.2"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"methods": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-			"dev": true
-		},
-		"metro": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro/-/metro-0.73.10.tgz",
-			"integrity": "sha512-J2gBhNHFtc/Z48ysF0B/bfTwUwaRDLjNv7egfhQCc+934dpXcjJG2KZFeuybF+CvA9vo4QUi56G2U+RSAJ5tsA==",
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/core": "^7.20.0",
-				"@babel/generator": "^7.20.0",
-				"@babel/parser": "^7.20.0",
-				"@babel/template": "^7.0.0",
-				"@babel/traverse": "^7.20.0",
-				"@babel/types": "^7.20.0",
-				"absolute-path": "^0.0.0",
-				"accepts": "^1.3.7",
-				"async": "^3.2.2",
-				"chalk": "^4.0.0",
-				"ci-info": "^2.0.0",
-				"connect": "^3.6.5",
-				"debug": "^2.2.0",
-				"denodeify": "^1.2.1",
-				"error-stack-parser": "^2.0.6",
-				"graceful-fs": "^4.2.4",
-				"hermes-parser": "0.8.0",
-				"image-size": "^0.6.0",
-				"invariant": "^2.2.4",
-				"jest-worker": "^27.2.0",
-				"jsc-safe-url": "^0.2.2",
-				"lodash.throttle": "^4.1.1",
-				"metro-babel-transformer": "0.73.10",
-				"metro-cache": "0.73.10",
-				"metro-cache-key": "0.73.10",
-				"metro-config": "0.73.10",
-				"metro-core": "0.73.10",
-				"metro-file-map": "0.73.10",
-				"metro-hermes-compiler": "0.73.10",
-				"metro-inspector-proxy": "0.73.10",
-				"metro-minify-terser": "0.73.10",
-				"metro-minify-uglify": "0.73.10",
-				"metro-react-native-babel-preset": "0.73.10",
-				"metro-resolver": "0.73.10",
-				"metro-runtime": "0.73.10",
-				"metro-source-map": "0.73.10",
-				"metro-symbolicate": "0.73.10",
-				"metro-transform-plugins": "0.73.10",
-				"metro-transform-worker": "0.73.10",
-				"mime-types": "^2.1.27",
-				"node-fetch": "^2.2.0",
-				"nullthrows": "^1.1.1",
-				"rimraf": "^3.0.2",
-				"serialize-error": "^2.1.0",
-				"source-map": "^0.5.6",
-				"strip-ansi": "^6.0.0",
-				"temp": "0.8.3",
-				"throat": "^5.0.0",
-				"ws": "^7.5.1",
-				"yargs": "^17.5.1"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.3.4",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-							"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-							"requires": {
-								"ms": "2.1.2"
-							}
-						}
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.3.4",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-							"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-							"requires": {
-								"ms": "2.1.2"
-							}
-						}
-					}
-				},
-				"ci-info": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-					"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-				},
-				"cliui": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.1",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					},
-					"dependencies": {
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-						}
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-				},
-				"jest-worker": {
-					"version": "27.5.1",
-					"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-					"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-					"requires": {
-						"@types/node": "*",
-						"merge-stream": "^2.0.0",
-						"supports-color": "^8.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-				},
-				"yargs": {
-					"version": "17.7.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-					"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
-				}
-			}
-		},
-		"metro-babel-transformer": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.73.10.tgz",
-			"integrity": "sha512-Yv2myTSnpzt/lTyurLvqYbBkytvUJcLHN8XD3t7W6rGiLTQPzmf1zypHQLphvcAXtCWBOXFtH7KLOSi2/qMg+A==",
-			"requires": {
-				"@babel/core": "^7.20.0",
-				"hermes-parser": "0.8.0",
-				"metro-source-map": "0.73.10",
-				"nullthrows": "^1.1.1"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"metro-cache": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.73.10.tgz",
-			"integrity": "sha512-wPGlQZpdVlM404m7MxJqJ+hTReDr5epvfPbt2LerUAHY9RN99w61FeeAe25BMZBwgUgDtAsfGlJ51MBHg8MAqw==",
-			"requires": {
-				"metro-core": "0.73.10",
-				"rimraf": "^3.0.2"
-			}
-		},
-		"metro-cache-key": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.73.10.tgz",
-			"integrity": "sha512-JMVDl/EREDiUW//cIcUzRjKSwE2AFxVWk47cFBer+KA4ohXIG2CQPEquT56hOw1Y1s6gKNxxs1OlAOEsubrFjw=="
-		},
-		"metro-config": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.73.10.tgz",
-			"integrity": "sha512-wIlybd1Z9I8K2KcStTiJxTB7OK529dxFgogNpKCTU/3DxkgAASqSkgXnZP6kVyqjh5EOWAKFe5U6IPic7kXDdQ==",
-			"requires": {
-				"cosmiconfig": "^5.0.5",
-				"jest-validate": "^26.5.2",
-				"metro": "0.73.10",
-				"metro-cache": "0.73.10",
-				"metro-core": "0.73.10",
-				"metro-runtime": "0.73.10"
-			},
-			"dependencies": {
-				"@jest/types": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-					"integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
-					"requires": {
-						"@types/istanbul-lib-coverage": "^2.0.0",
-						"@types/istanbul-reports": "^3.0.0",
-						"@types/node": "*",
-						"@types/yargs": "^15.0.0",
-						"chalk": "^4.0.0"
-					}
-				},
-				"@types/yargs": {
-					"version": "15.0.15",
-					"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz",
-					"integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==",
-					"requires": {
-						"@types/yargs-parser": "*"
-					}
-				},
-				"camelcase": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-					"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
-				},
-				"cosmiconfig": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-					"integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-					"requires": {
-						"import-fresh": "^2.0.0",
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.13.1",
-						"parse-json": "^4.0.0"
-					}
-				},
-				"import-fresh": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-					"integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
-					"requires": {
-						"caller-path": "^2.0.0",
-						"resolve-from": "^3.0.0"
-					}
-				},
-				"jest-get-type": {
-					"version": "26.3.0",
-					"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-					"integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
-				},
-				"jest-validate": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
-					"integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
-					"requires": {
-						"@jest/types": "^26.6.2",
-						"camelcase": "^6.0.0",
-						"chalk": "^4.0.0",
-						"jest-get-type": "^26.3.0",
-						"leven": "^3.1.0",
-						"pretty-format": "^26.6.2"
-					}
-				},
-				"parse-json": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-					"integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-					"requires": {
-						"error-ex": "^1.3.1",
-						"json-parse-better-errors": "^1.0.1"
-					}
-				},
-				"pretty-format": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-					"integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
-					"requires": {
-						"@jest/types": "^26.6.2",
-						"ansi-regex": "^5.0.0",
-						"ansi-styles": "^4.0.0",
-						"react-is": "^17.0.1"
-					}
-				},
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-				}
-			}
-		},
-		"metro-core": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.73.10.tgz",
-			"integrity": "sha512-5uYkajIxKyL6W45iz/ftNnYPe1l92CvF2QJeon1CHsMXkEiOJxEjo41l+iSnO/YodBGrmMCyupSO4wOQGUc0lw==",
-			"requires": {
-				"lodash.throttle": "^4.1.1",
-				"metro-resolver": "0.73.10"
-			}
-		},
-		"metro-file-map": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.73.10.tgz",
-			"integrity": "sha512-XOMWAybeaXyD6zmVZPnoCCL2oO3rp4ta76oUlqWP0skBzhFxVtkE/UtDwApEMUY361JeBBago647gnKiARs+1g==",
-			"requires": {
-				"abort-controller": "^3.0.0",
-				"anymatch": "^3.0.3",
-				"debug": "^2.2.0",
-				"fb-watchman": "^2.0.0",
-				"fsevents": "^2.3.2",
-				"graceful-fs": "^4.2.4",
-				"invariant": "^2.2.4",
-				"jest-regex-util": "^27.0.6",
-				"jest-serializer": "^27.0.6",
-				"jest-util": "^27.2.0",
-				"jest-worker": "^27.2.0",
-				"micromatch": "^4.0.4",
-				"nullthrows": "^1.1.1",
-				"walker": "^1.0.7"
-			},
-			"dependencies": {
-				"@jest/types": {
-					"version": "27.5.1",
-					"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-					"integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-					"requires": {
-						"@types/istanbul-lib-coverage": "^2.0.0",
-						"@types/istanbul-reports": "^3.0.0",
-						"@types/node": "*",
-						"@types/yargs": "^16.0.0",
-						"chalk": "^4.0.0"
-					}
-				},
-				"@types/yargs": {
-					"version": "16.0.5",
-					"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
-					"integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
-					"requires": {
-						"@types/yargs-parser": "*"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"jest-regex-util": {
-					"version": "27.5.1",
-					"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-					"integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="
-				},
-				"jest-util": {
-					"version": "27.5.1",
-					"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-					"integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-					"requires": {
-						"@jest/types": "^27.5.1",
-						"@types/node": "*",
-						"chalk": "^4.0.0",
-						"ci-info": "^3.2.0",
-						"graceful-fs": "^4.2.9",
-						"picomatch": "^2.2.3"
-					}
-				},
-				"jest-worker": {
-					"version": "27.5.1",
-					"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-					"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-					"requires": {
-						"@types/node": "*",
-						"merge-stream": "^2.0.0",
-						"supports-color": "^8.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"metro-hermes-compiler": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-hermes-compiler/-/metro-hermes-compiler-0.73.10.tgz",
-			"integrity": "sha512-rTRWEzkVrwtQLiYkOXhSdsKkIObnL+Jqo+IXHI7VEK2aSLWRAbtGNqECBs44kbOUypDYTFFE+WLtoqvUWqYkWg=="
-		},
-		"metro-inspector-proxy": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.73.10.tgz",
-			"integrity": "sha512-CEEvocYc5xCCZBtGSIggMCiRiXTrnBbh8pmjKQqm9TtJZALeOGyt5pXUaEkKGnhrXETrexsg6yIbsQHhEvVfvQ==",
-			"requires": {
-				"connect": "^3.6.5",
-				"debug": "^2.2.0",
-				"ws": "^7.5.1",
-				"yargs": "^17.5.1"
-			},
-			"dependencies": {
-				"cliui": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.1",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-				},
-				"yargs": {
-					"version": "17.7.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-					"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
-				}
-			}
-		},
-		"metro-minify-terser": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.73.10.tgz",
-			"integrity": "sha512-uG7TSKQ/i0p9kM1qXrwbmY3v+6BrMItsOcEXcSP8Z+68bb+t9HeVK0T/hIfUu1v1PEnonhkhfzVsaP8QyTd5lQ==",
-			"requires": {
-				"terser": "^5.15.0"
-			}
-		},
-		"metro-minify-uglify": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.73.10.tgz",
-			"integrity": "sha512-eocnSeJKnLz/UoYntVFhCJffED7SLSgbCHgNvI6ju6hFb6EFHGJT9OLbkJWeXaWBWD3Zw5mYLS8GGqGn/CHZPA==",
-			"requires": {
-				"uglify-es": "^3.1.9"
-			}
-		},
-		"metro-react-native-babel-preset": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.10.tgz",
-			"integrity": "sha512-1/dnH4EHwFb2RKEKx34vVDpUS3urt2WEeR8FYim+ogqALg4sTpG7yeQPxWpbgKATezt4rNfqAANpIyH19MS4BQ==",
-			"requires": {
-				"@babel/core": "^7.20.0",
-				"@babel/plugin-proposal-async-generator-functions": "^7.0.0",
-				"@babel/plugin-proposal-class-properties": "^7.0.0",
-				"@babel/plugin-proposal-export-default-from": "^7.0.0",
-				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-				"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-				"@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
-				"@babel/plugin-proposal-optional-chaining": "^7.0.0",
-				"@babel/plugin-syntax-dynamic-import": "^7.0.0",
-				"@babel/plugin-syntax-export-default-from": "^7.0.0",
-				"@babel/plugin-syntax-flow": "^7.18.0",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
-				"@babel/plugin-syntax-optional-chaining": "^7.0.0",
-				"@babel/plugin-transform-arrow-functions": "^7.0.0",
-				"@babel/plugin-transform-async-to-generator": "^7.0.0",
-				"@babel/plugin-transform-block-scoping": "^7.0.0",
-				"@babel/plugin-transform-classes": "^7.0.0",
-				"@babel/plugin-transform-computed-properties": "^7.0.0",
-				"@babel/plugin-transform-destructuring": "^7.0.0",
-				"@babel/plugin-transform-flow-strip-types": "^7.0.0",
-				"@babel/plugin-transform-function-name": "^7.0.0",
-				"@babel/plugin-transform-literals": "^7.0.0",
-				"@babel/plugin-transform-modules-commonjs": "^7.0.0",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
-				"@babel/plugin-transform-parameters": "^7.0.0",
-				"@babel/plugin-transform-react-display-name": "^7.0.0",
-				"@babel/plugin-transform-react-jsx": "^7.0.0",
-				"@babel/plugin-transform-react-jsx-self": "^7.0.0",
-				"@babel/plugin-transform-react-jsx-source": "^7.0.0",
-				"@babel/plugin-transform-runtime": "^7.0.0",
-				"@babel/plugin-transform-shorthand-properties": "^7.0.0",
-				"@babel/plugin-transform-spread": "^7.0.0",
-				"@babel/plugin-transform-sticky-regex": "^7.0.0",
-				"@babel/plugin-transform-template-literals": "^7.0.0",
-				"@babel/plugin-transform-typescript": "^7.5.0",
-				"@babel/plugin-transform-unicode-regex": "^7.0.0",
-				"@babel/template": "^7.0.0",
-				"react-refresh": "^0.4.0"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				},
-				"react-refresh": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
-					"integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA=="
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"metro-react-native-babel-transformer": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.10.tgz",
-			"integrity": "sha512-4G/upwqKdmKEjmsNa92/NEgsOxUWOygBVs+FXWfXWKgybrmcjh3NoqdRYrROo9ZRA/sB9Y/ZXKVkWOGKHtGzgg==",
-			"requires": {
-				"@babel/core": "^7.20.0",
-				"babel-preset-fbjs": "^3.4.0",
-				"hermes-parser": "0.8.0",
-				"metro-babel-transformer": "0.73.10",
-				"metro-react-native-babel-preset": "0.73.10",
-				"metro-source-map": "0.73.10",
-				"nullthrows": "^1.1.1"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"metro-resolver": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.73.10.tgz",
-			"integrity": "sha512-HeXbs+0wjakaaVQ5BI7eT7uqxlZTc9rnyw6cdBWWMgUWB++KpoI0Ge7Hi6eQAOoVAzXC3m26mPFYLejpzTWjng==",
-			"requires": {
-				"absolute-path": "^0.0.0"
-			}
-		},
-		"metro-runtime": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.73.10.tgz",
-			"integrity": "sha512-EpVKm4eN0Fgx2PEWpJ5NiMArV8zVoOin866jIIvzFLpmkZz1UEqgjf2JAfUJnjgv3fjSV3JqeGG2vZCaGQBTow==",
-			"requires": {
-				"@babel/runtime": "^7.0.0",
-				"react-refresh": "^0.4.0"
-			},
-			"dependencies": {
-				"react-refresh": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
-					"integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA=="
-				}
-			}
-		},
-		"metro-source-map": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.73.10.tgz",
-			"integrity": "sha512-NAGv14701p/YaFZ76KzyPkacBw/QlEJF1f8elfs23N1tC33YyKLDKvPAzFJiYqjdcFvuuuDCA8JCXd2TgLxNPw==",
-			"requires": {
-				"@babel/traverse": "^7.20.0",
-				"@babel/types": "^7.20.0",
-				"invariant": "^2.2.4",
-				"metro-symbolicate": "0.73.10",
-				"nullthrows": "^1.1.1",
-				"ob1": "0.73.10",
-				"source-map": "^0.5.6",
-				"vlq": "^1.0.0"
-			},
-			"dependencies": {
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-				}
-			}
-		},
-		"metro-symbolicate": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.73.10.tgz",
-			"integrity": "sha512-PmCe3TOe1c/NVwMlB+B17me951kfkB3Wve5RqJn+ErPAj93od1nxicp6OJe7JT4QBRnpUP8p9tw2sHKqceIzkA==",
-			"requires": {
-				"invariant": "^2.2.4",
-				"metro-source-map": "0.73.10",
-				"nullthrows": "^1.1.1",
-				"source-map": "^0.5.6",
-				"through2": "^2.0.1",
-				"vlq": "^1.0.0"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-				}
-			}
-		},
-		"metro-transform-plugins": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.73.10.tgz",
-			"integrity": "sha512-D4AgD3Vsrac+4YksaPmxs/0ocT67bvwTkFSIgWWeDvWwIG0U1iHzTS9f8Bvb4PITnXryDoFtjI6OWF7uOpGxpA==",
-			"requires": {
-				"@babel/core": "^7.20.0",
-				"@babel/generator": "^7.20.0",
-				"@babel/template": "^7.0.0",
-				"@babel/traverse": "^7.20.0",
-				"nullthrows": "^1.1.1"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"metro-transform-worker": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.73.10.tgz",
-			"integrity": "sha512-IySvVubudFxahxOljWtP0QIMMpgUrCP0bW16cz2Enof0PdumwmR7uU3dTbNq6S+XTzuMHR+076aIe4VhPAWsIQ==",
-			"requires": {
-				"@babel/core": "^7.20.0",
-				"@babel/generator": "^7.20.0",
-				"@babel/parser": "^7.20.0",
-				"@babel/types": "^7.20.0",
-				"babel-preset-fbjs": "^3.4.0",
-				"metro": "0.73.10",
-				"metro-babel-transformer": "0.73.10",
-				"metro-cache": "0.73.10",
-				"metro-cache-key": "0.73.10",
-				"metro-hermes-compiler": "0.73.10",
-				"metro-source-map": "0.73.10",
-				"metro-transform-plugins": "0.73.10",
-				"nullthrows": "^1.1.1"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-					"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-					"requires": {
-						"@ampproject/remapping": "^2.2.0",
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-compilation-targets": "^7.22.10",
-						"@babel/helper-module-transforms": "^7.22.9",
-						"@babel/helpers": "^7.22.10",
-						"@babel/parser": "^7.22.10",
-						"@babel/template": "^7.22.5",
-						"@babel/traverse": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.2",
-						"json5": "^2.2.2",
-						"semver": "^6.3.1"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.22.10",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-					"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-					"requires": {
-						"@babel/code-frame": "^7.22.10",
-						"@babel/generator": "^7.22.10",
-						"@babel/helper-environment-visitor": "^7.22.5",
-						"@babel/helper-function-name": "^7.22.5",
-						"@babel/helper-hoist-variables": "^7.22.5",
-						"@babel/helper-split-export-declaration": "^7.22.6",
-						"@babel/parser": "^7.22.10",
-						"@babel/types": "^7.22.10",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-			"requires": {
-				"braces": "^3.0.2",
-				"picomatch": "^2.3.1"
-			}
-		},
-		"miller-rabin": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-			"dev": true,
-			"requires": {
-				"bn.js": "^4.0.0",
-				"brorand": "^1.0.1"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
-			}
-		},
-		"mime": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
-			"integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
-			"dev": true
-		},
-		"mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-		},
-		"mime-types": {
-			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-			"requires": {
-				"mime-db": "1.52.0"
-			}
-		},
-		"mimic-fn": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-			"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-			"dev": true
-		},
-		"mimic-response": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-			"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-			"dev": true
-		},
-		"min-indent": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz",
-			"integrity": "sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=",
-			"dev": true
-		},
-		"mini-css-extract-plugin": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.1.tgz",
-			"integrity": "sha512-CRC6E2yedNjfOA3nQjpqAkpnranxhxmilhBPYtldnXcPT/QZb3aJFzvt0pp8W1jhuLR/E0zDa+QEHuC/HhhaLQ==",
-			"dev": true,
-			"requires": {
-				"schema-utils": "^4.0.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-					"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.9.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.1.0"
-					}
-				}
-			}
-		},
-		"minimalistic-assert": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-			"dev": true
-		},
-		"minimalistic-crypto-utils": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-			"integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-			"dev": true
-		},
-		"minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"requires": {
-				"brace-expansion": "^1.1.7"
-			}
-		},
-		"minimist": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
-		},
-		"minimist-options": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-			"dev": true,
-			"requires": {
-				"arrify": "^1.0.1",
-				"is-plain-obj": "^1.1.0",
-				"kind-of": "^6.0.3"
-			},
-			"dependencies": {
-				"is-plain-obj": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-					"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-					"dev": true
-				}
-			}
-		},
-		"minipass": {
-			"version": "3.3.6",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-			"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-			"dev": true,
-			"requires": {
-				"yallist": "^4.0.0"
-			},
-			"dependencies": {
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				}
-			}
-		},
-		"minipass-collect": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-			"integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0"
-			}
-		},
-		"minipass-fetch": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz",
-			"integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==",
-			"dev": true,
-			"requires": {
-				"encoding": "^0.1.13",
-				"minipass": "^5.0.0",
-				"minipass-sized": "^1.0.3",
-				"minizlib": "^2.1.2"
-			},
-			"dependencies": {
-				"minipass": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-					"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-					"dev": true
-				}
-			}
-		},
-		"minipass-flush": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-			"integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0"
-			}
-		},
-		"minipass-json-stream": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
-			"integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
-			"dev": true,
-			"requires": {
-				"jsonparse": "^1.3.1",
-				"minipass": "^3.0.0"
-			}
-		},
-		"minipass-pipeline": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-			"integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0"
-			}
-		},
-		"minipass-sized": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-			"integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0"
-			}
-		},
-		"minizlib": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-			"integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-			"dev": true,
-			"requires": {
-				"minipass": "^3.0.0",
-				"yallist": "^4.0.0"
-			},
-			"dependencies": {
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				}
-			}
-		},
-		"mississippi": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-			"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-			"dev": true,
-			"requires": {
-				"concat-stream": "^1.5.0",
-				"duplexify": "^3.4.2",
-				"end-of-stream": "^1.1.0",
-				"flush-write-stream": "^1.0.0",
-				"from2": "^2.1.0",
-				"parallel-transform": "^1.1.0",
-				"pump": "^3.0.0",
-				"pumpify": "^1.3.3",
-				"stream-each": "^1.1.0",
-				"through2": "^2.0.0"
-			},
-			"dependencies": {
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				}
-			}
-		},
-		"mitt": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
-			"integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
-			"dev": true
-		},
-		"mixin-deep": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-			"requires": {
-				"for-in": "^1.0.2",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"mixin-object": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-			"integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
-			"dev": true,
-			"requires": {
-				"for-in": "^0.1.3",
-				"is-extendable": "^0.1.1"
-			},
-			"dependencies": {
-				"for-in": {
-					"version": "0.1.8",
-					"resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-					"integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==",
-					"dev": true
-				}
-			}
-		},
-		"mkdirp": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-			"integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
-			"dev": true
-		},
-		"mkdirp-classic": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-			"dev": true
-		},
-		"mock-match-media": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/mock-match-media/-/mock-match-media-0.4.2.tgz",
-			"integrity": "sha512-1Q/Z7cfqWVTZd5Iz0bLxqzl6/8vaPl4KxxciRSRu+TCeGxRlxGDgjwWre0KkHlfS01r1iGCUWuF0n3ftvS/C/A==",
-			"dev": true,
-			"requires": {
-				"css-mediaquery": "^0.1.2"
-			}
-		},
-		"modify-values": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
-			"integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
-			"dev": true
-		},
-		"moment": {
-			"version": "2.29.4",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
-		},
-		"moment-timezone": {
-			"version": "0.5.43",
-			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
-			"integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
-			"requires": {
-				"moment": "^2.29.4"
-			}
-		},
-		"moment-timezone-data-webpack-plugin": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/moment-timezone-data-webpack-plugin/-/moment-timezone-data-webpack-plugin-1.5.1.tgz",
-			"integrity": "sha512-1le6a35GgYdWMVYFzrfpE/F6Pk4bj0M3QKD6Iv6ba9LqWGoVqHQRHyCTLvLis5E1J98Sz40ET6yhZzMVakwpjg==",
-			"dev": true,
-			"requires": {
-				"find-cache-dir": "^3.0.0",
-				"make-dir": "^3.0.0"
-			},
-			"dependencies": {
-				"find-cache-dir": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-					"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-					"dev": true,
-					"requires": {
-						"commondir": "^1.0.1",
-						"make-dir": "^3.0.2",
-						"pkg-dir": "^4.1.0"
-					}
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"make-dir": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-					"dev": true,
-					"requires": {
-						"semver": "^6.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-					"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-					"dev": true,
-					"requires": {
-						"find-up": "^4.0.0"
-					}
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-					"dev": true
-				}
-			}
-		},
-		"morgan": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
-			"integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
-			"dev": true,
-			"requires": {
-				"basic-auth": "~2.0.1",
-				"debug": "2.6.9",
-				"depd": "~2.0.0",
-				"on-finished": "~2.3.0",
-				"on-headers": "~1.0.2"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-					"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-					"dev": true
-				}
-			}
-		},
-		"mousetrap": {
-			"version": "1.6.5",
-			"resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz",
-			"integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA=="
-		},
-		"move-concurrently": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-			"integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==",
-			"dev": true,
-			"requires": {
-				"aproba": "^1.1.1",
-				"copy-concurrently": "^1.0.0",
-				"fs-write-stream-atomic": "^1.0.8",
-				"mkdirp": "^0.5.1",
-				"rimraf": "^2.5.4",
-				"run-queue": "^1.0.3"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.6",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-					"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.6"
-					}
-				},
-				"rimraf": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
-			}
-		},
-		"mri": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
-			"integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
-			"dev": true
-		},
-		"mrmime": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
-			"integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
-			"dev": true
-		},
-		"ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-		},
-		"multicast-dns": {
-			"version": "7.2.5",
-			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-			"integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-			"dev": true,
-			"requires": {
-				"dns-packet": "^5.2.2",
-				"thunky": "^1.0.2"
-			}
-		},
-		"multimatch": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
-			"integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
-			"dev": true,
-			"requires": {
-				"@types/minimatch": "^3.0.3",
-				"array-differ": "^3.0.0",
-				"array-union": "^2.1.0",
-				"arrify": "^2.0.1",
-				"minimatch": "^3.0.4"
-			},
-			"dependencies": {
-				"array-union": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-					"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-					"dev": true
-				},
-				"arrify": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-					"integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-					"dev": true
-				}
-			}
-		},
-		"mustache": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.0.tgz",
-			"integrity": "sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA==",
-			"dev": true
-		},
-		"mute-stream": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-			"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-			"dev": true
-		},
-		"mv": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
-			"integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
-			"dev": true,
-			"requires": {
-				"mkdirp": "~0.5.1",
-				"ncp": "~2.0.0",
-				"rimraf": "~2.4.0"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "6.0.4",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-					"integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
-					"dev": true,
-					"requires": {
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "2 || 3",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.6",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-					"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.6"
-					}
-				},
-				"rimraf": {
-					"version": "2.4.5",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
-					"integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
-					"dev": true,
-					"requires": {
-						"glob": "^6.0.1"
-					}
-				}
-			}
-		},
-		"n12": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/n12/-/n12-0.4.0.tgz",
-			"integrity": "sha512-p/hj4zQ8d3pbbFLQuN1K9honUxiDDhueOWyFLw/XgBv+wZCE44bcLH4CIcsolOceJQduh4Jf7m/LfaTxyGmGtQ==",
-			"dev": true
-		},
-		"nan": {
-			"version": "2.14.2",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-			"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-			"dev": true,
-			"optional": true
-		},
-		"nanoid": {
-			"version": "3.3.6",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-			"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
-		},
-		"nanomatch": {
-			"version": "1.2.13",
-			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-			"requires": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"fragment-cache": "^0.2.1",
-				"is-windows": "^1.0.2",
-				"kind-of": "^6.0.2",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			}
-		},
-		"napi-build-utils": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-			"integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-			"dev": true,
-			"optional": true
-		},
-		"natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-			"dev": true
-		},
-		"ncp": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-			"integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
-			"dev": true
-		},
-		"negotiator": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
-		},
-		"neo-async": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-		},
-		"netmask": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
-			"integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
-			"dev": true
-		},
-		"nice-try": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-		},
-		"no-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-			"integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-			"requires": {
-				"lower-case": "^2.0.2",
-				"tslib": "^2.0.3"
-			}
-		},
-		"nocache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/nocache/-/nocache-3.0.4.tgz",
-			"integrity": "sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw=="
-		},
-		"nock": {
-			"version": "12.0.3",
-			"resolved": "https://registry.npmjs.org/nock/-/nock-12.0.3.tgz",
-			"integrity": "sha512-QNb/j8kbFnKCiyqi9C5DD0jH/FubFGj5rt9NQFONXwQm3IPB0CULECg/eS3AU1KgZb/6SwUa4/DTRKhVxkGABw==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.0",
-				"json-stringify-safe": "^5.0.1",
-				"lodash": "^4.17.13",
-				"propagate": "^2.0.0"
-			}
-		},
-		"node-abi": {
-			"version": "3.47.0",
-			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz",
-			"integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"semver": "^7.3.5"
-			}
-		},
-		"node-abort-controller": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
-			"integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
-			"dev": true
-		},
-		"node-addon-api": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-			"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-			"dev": true
-		},
-		"node-dir": {
-			"version": "0.1.17",
-			"resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-			"integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==",
-			"requires": {
-				"minimatch": "^3.0.2"
-			}
-		},
-		"node-domexception": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-			"integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
-			"dev": true
-		},
-		"node-fetch": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
-		},
-		"node-fetch-native": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.2.0.tgz",
-			"integrity": "sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==",
-			"dev": true
-		},
-		"node-forge": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-			"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-			"dev": true
-		},
-		"node-gyp": {
-			"version": "9.4.0",
-			"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz",
-			"integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==",
-			"dev": true,
-			"requires": {
-				"env-paths": "^2.2.0",
-				"exponential-backoff": "^3.1.1",
-				"glob": "^7.1.4",
-				"graceful-fs": "^4.2.6",
-				"make-fetch-happen": "^11.0.3",
-				"nopt": "^6.0.0",
-				"npmlog": "^6.0.0",
-				"rimraf": "^3.0.2",
-				"semver": "^7.3.5",
-				"tar": "^6.1.2",
-				"which": "^2.0.2"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"node-gyp-build": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-			"integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==",
-			"dev": true
-		},
-		"node-int64": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-			"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-		},
-		"node-libs-browser": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-			"integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-			"dev": true,
-			"requires": {
-				"assert": "^1.1.1",
-				"browserify-zlib": "^0.2.0",
-				"buffer": "^4.3.0",
-				"console-browserify": "^1.1.0",
-				"constants-browserify": "^1.0.0",
-				"crypto-browserify": "^3.11.0",
-				"domain-browser": "^1.1.1",
-				"events": "^3.0.0",
-				"https-browserify": "^1.0.0",
-				"os-browserify": "^0.3.0",
-				"path-browserify": "0.0.1",
-				"process": "^0.11.10",
-				"punycode": "^1.2.4",
-				"querystring-es3": "^0.2.0",
-				"readable-stream": "^2.3.3",
-				"stream-browserify": "^2.0.1",
-				"stream-http": "^2.7.2",
-				"string_decoder": "^1.0.0",
-				"timers-browserify": "^2.0.4",
-				"tty-browserify": "0.0.0",
-				"url": "^0.11.0",
-				"util": "^0.11.0",
-				"vm-browserify": "^1.0.1"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-					"dev": true
-				}
-			}
-		},
-		"node-machine-id": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
-			"integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
-			"dev": true
-		},
-		"node-releases": {
-			"version": "2.0.13",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-			"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
-		},
-		"node-stream-zip": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz",
-			"integrity": "sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw=="
-		},
-		"node-watch": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.7.0.tgz",
-			"integrity": "sha512-OOBiglke5SlRQT5WYfwXTmYqTfXjcTNBHpalyHLtLxDpQYVpVRkJqabcch1kmwJsjV/J4OZuzEafeb4soqtFZA==",
-			"dev": true
-		},
-		"nopt": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
-			"integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
-			"dev": true,
-			"requires": {
-				"abbrev": "^1.0.0"
-			}
-		},
-		"normalize-package-data": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-			"dev": true,
-			"requires": {
-				"hosted-git-info": "^2.1.4",
-				"resolve": "^1.10.0",
-				"semver": "2 || 3 || 4 || 5",
-				"validate-npm-package-license": "^3.0.1"
-			},
-			"dependencies": {
-				"hosted-git-info": {
-					"version": "2.8.9",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-					"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-					"dev": true
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-					"dev": true
-				}
-			}
-		},
-		"normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-		},
-		"normalize-range": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-			"dev": true
-		},
-		"normalize-selector": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-			"integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-			"dev": true
-		},
-		"normalize-url": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-			"dev": true
-		},
-		"normalize-wheel": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-			"integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
-		},
-		"npm-bundled": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
-			"integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
-			"dev": true,
-			"requires": {
-				"npm-normalize-package-bin": "^1.0.1"
-			}
-		},
-		"npm-install-checks": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.1.1.tgz",
-			"integrity": "sha512-dH3GmQL4vsPtld59cOn8uY0iOqRmqKvV+DLGwNXV/Q7MDgD2QfOADWd/mFXcIE5LVhYYGjA3baz6W9JneqnuCw==",
-			"dev": true,
-			"requires": {
-				"semver": "^7.1.1"
-			}
-		},
-		"npm-normalize-package-bin": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-			"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
-			"dev": true
-		},
-		"npm-package-arg": {
-			"version": "8.1.5",
-			"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
-			"integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
-			"dev": true,
-			"requires": {
-				"hosted-git-info": "^4.0.1",
-				"semver": "^7.3.4",
-				"validate-npm-package-name": "^3.0.0"
-			}
-		},
-		"npm-package-json-lint": {
-			"version": "6.4.0",
-			"resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-6.4.0.tgz",
-			"integrity": "sha512-cuXAJJB1Rdqz0UO6w524matlBqDBjcNt7Ru+RDIu4y6RI1gVqiWBnylrK8sPRk81gGBA0X8hJbDXolVOoTc+sA==",
-			"dev": true,
-			"requires": {
-				"ajv": "^6.12.6",
-				"ajv-errors": "^1.0.1",
-				"chalk": "^4.1.2",
-				"cosmiconfig": "^8.0.0",
-				"debug": "^4.3.4",
-				"globby": "^11.1.0",
-				"ignore": "^5.2.0",
-				"is-plain-obj": "^3.0.0",
-				"jsonc-parser": "^3.2.0",
-				"log-symbols": "^4.1.0",
-				"meow": "^9.0.0",
-				"plur": "^4.0.0",
-				"semver": "^7.3.8",
-				"slash": "^3.0.0",
-				"strip-json-comments": "^3.1.1",
-				"type-fest": "^3.2.0",
-				"validate-npm-package-name": "^5.0.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"builtins": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-					"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-					"dev": true,
-					"requires": {
-						"semver": "^7.0.0"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cosmiconfig": {
-					"version": "8.2.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-					"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^3.2.1",
-						"js-yaml": "^4.1.0",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"jsonc-parser": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-					"integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-					"dev": true
-				},
-				"meow": {
-					"version": "9.0.0",
-					"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-					"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-					"dev": true,
-					"requires": {
-						"@types/minimist": "^1.2.0",
-						"camelcase-keys": "^6.2.2",
-						"decamelize": "^1.2.0",
-						"decamelize-keys": "^1.1.0",
-						"hard-rejection": "^2.1.0",
-						"minimist-options": "4.1.0",
-						"normalize-package-data": "^3.0.0",
-						"read-pkg-up": "^7.0.1",
-						"redent": "^3.0.0",
-						"trim-newlines": "^3.0.0",
-						"type-fest": "^0.18.0",
-						"yargs-parser": "^20.2.3"
-					},
-					"dependencies": {
-						"type-fest": {
-							"version": "0.18.1",
-							"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-							"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-							"dev": true
-						}
-					}
-				},
-				"normalize-package-data": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-					"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^4.0.1",
-						"is-core-module": "^2.5.0",
-						"semver": "^7.3.4",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"path-type": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-					"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-					"dev": true
-				},
-				"strip-json-comments": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-					"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"type-fest": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-					"integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-					"dev": true
-				},
-				"validate-npm-package-name": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-					"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-					"dev": true,
-					"requires": {
-						"builtins": "^5.0.0"
-					}
-				}
-			}
-		},
-		"npm-packlist": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-3.0.0.tgz",
-			"integrity": "sha512-L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ==",
-			"dev": true,
-			"requires": {
-				"glob": "^7.1.6",
-				"ignore-walk": "^4.0.1",
-				"npm-bundled": "^1.1.1",
-				"npm-normalize-package-bin": "^1.0.1"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
-			}
-		},
-		"npm-pick-manifest": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz",
-			"integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==",
-			"dev": true,
-			"requires": {
-				"npm-install-checks": "^6.0.0",
-				"npm-normalize-package-bin": "^3.0.0",
-				"npm-package-arg": "^10.0.0",
-				"semver": "^7.3.5"
-			},
-			"dependencies": {
-				"builtins": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-					"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-					"dev": true,
-					"requires": {
-						"semver": "^7.0.0"
-					}
-				},
-				"hosted-git-info": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-					"integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^7.5.1"
-					}
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"npm-normalize-package-bin": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-					"integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
-					"dev": true
-				},
-				"npm-package-arg": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
-					"integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^6.0.0",
-						"proc-log": "^3.0.0",
-						"semver": "^7.3.5",
-						"validate-npm-package-name": "^5.0.0"
-					}
-				},
-				"validate-npm-package-name": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-					"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-					"dev": true,
-					"requires": {
-						"builtins": "^5.0.0"
-					}
-				}
-			}
-		},
-		"npm-registry-fetch": {
-			"version": "14.0.5",
-			"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz",
-			"integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==",
-			"dev": true,
-			"requires": {
-				"make-fetch-happen": "^11.0.0",
-				"minipass": "^5.0.0",
-				"minipass-fetch": "^3.0.0",
-				"minipass-json-stream": "^1.0.1",
-				"minizlib": "^2.1.2",
-				"npm-package-arg": "^10.0.0",
-				"proc-log": "^3.0.0"
-			},
-			"dependencies": {
-				"builtins": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-					"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-					"dev": true,
-					"requires": {
-						"semver": "^7.0.0"
-					}
-				},
-				"hosted-git-info": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-					"integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^7.5.1"
-					}
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"minipass": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-					"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-					"dev": true
-				},
-				"npm-package-arg": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
-					"integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^6.0.0",
-						"proc-log": "^3.0.0",
-						"semver": "^7.3.5",
-						"validate-npm-package-name": "^5.0.0"
-					}
-				},
-				"validate-npm-package-name": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-					"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-					"dev": true,
-					"requires": {
-						"builtins": "^5.0.0"
-					}
-				}
-			}
-		},
-		"npm-run-all": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
-			"integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "^3.2.1",
-				"chalk": "^2.4.1",
-				"cross-spawn": "^6.0.5",
-				"memorystream": "^0.3.1",
-				"minimatch": "^3.0.4",
-				"pidtree": "^0.3.0",
-				"read-pkg": "^3.0.0",
-				"shell-quote": "^1.6.1",
-				"string.prototype.padend": "^3.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"load-json-file": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-					"integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^4.0.0",
-						"pify": "^3.0.0",
-						"strip-bom": "^3.0.0"
-					}
-				},
-				"parse-json": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-					"integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.3.1",
-						"json-parse-better-errors": "^1.0.1"
-					}
-				},
-				"pify": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-					"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-					"dev": true
-				},
-				"read-pkg": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-					"integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
-					"dev": true,
-					"requires": {
-						"load-json-file": "^4.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^3.0.0"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-					"dev": true
-				},
-				"strip-bom": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-					"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-					"dev": true
-				}
-			}
-		},
-		"npm-run-path": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-			"integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
-			"requires": {
-				"path-key": "^2.0.0"
-			}
-		},
-		"npmlog": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
-			"integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
-			"dev": true,
-			"requires": {
-				"are-we-there-yet": "^3.0.0",
-				"console-control-strings": "^1.1.0",
-				"gauge": "^4.0.3",
-				"set-blocking": "^2.0.0"
-			}
-		},
-		"nth-check": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-			"requires": {
-				"boolbase": "^1.0.0"
-			}
-		},
-		"nullthrows": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
-			"integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
-		},
-		"number-is-nan": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
-			"dev": true
-		},
-		"nwsapi": {
-			"version": "2.2.7",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-			"integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
-			"dev": true
-		},
-		"nx": {
-			"version": "16.6.0",
-			"resolved": "https://registry.npmjs.org/nx/-/nx-16.6.0.tgz",
-			"integrity": "sha512-4UaS9nRakpZs45VOossA7hzSQY2dsr035EoPRGOc81yoMFW6Sqn1Rgq4hiLbHZOY8MnWNsLMkgolNMz1jC8YUQ==",
-			"dev": true,
-			"requires": {
-				"@nrwl/tao": "16.6.0",
-				"@nx/nx-darwin-arm64": "16.6.0",
-				"@nx/nx-darwin-x64": "16.6.0",
-				"@nx/nx-freebsd-x64": "16.6.0",
-				"@nx/nx-linux-arm-gnueabihf": "16.6.0",
-				"@nx/nx-linux-arm64-gnu": "16.6.0",
-				"@nx/nx-linux-arm64-musl": "16.6.0",
-				"@nx/nx-linux-x64-gnu": "16.6.0",
-				"@nx/nx-linux-x64-musl": "16.6.0",
-				"@nx/nx-win32-arm64-msvc": "16.6.0",
-				"@nx/nx-win32-x64-msvc": "16.6.0",
-				"@parcel/watcher": "2.0.4",
-				"@yarnpkg/lockfile": "^1.1.0",
-				"@yarnpkg/parsers": "3.0.0-rc.46",
-				"@zkochan/js-yaml": "0.0.6",
-				"axios": "^1.0.0",
-				"chalk": "^4.1.0",
-				"cli-cursor": "3.1.0",
-				"cli-spinners": "2.6.1",
-				"cliui": "^7.0.2",
-				"dotenv": "~10.0.0",
-				"enquirer": "~2.3.6",
-				"fast-glob": "3.2.7",
-				"figures": "3.2.0",
-				"flat": "^5.0.2",
-				"fs-extra": "^11.1.0",
-				"glob": "7.1.4",
-				"ignore": "^5.0.4",
-				"js-yaml": "4.1.0",
-				"jsonc-parser": "3.2.0",
-				"lines-and-columns": "~2.0.3",
-				"minimatch": "3.0.5",
-				"node-machine-id": "1.1.12",
-				"npm-run-path": "^4.0.1",
-				"open": "^8.4.0",
-				"semver": "7.5.3",
-				"string-width": "^4.2.3",
-				"strong-log-transformer": "^2.1.0",
-				"tar-stream": "~2.2.0",
-				"tmp": "~0.2.1",
-				"tsconfig-paths": "^4.1.2",
-				"tslib": "^2.3.0",
-				"v8-compile-cache": "2.3.0",
-				"yargs": "^17.6.2",
-				"yargs-parser": "21.1.1"
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"axios": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
-					"integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
-					"dev": true,
-					"requires": {
-						"follow-redirects": "^1.15.0",
-						"form-data": "^4.0.0",
-						"proxy-from-env": "^1.1.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"cliui": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-					"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"dotenv": {
-					"version": "10.0.0",
-					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
-					"integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"fs-extra": {
-					"version": "11.1.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-					"integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"glob": {
-					"version": "7.1.4",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-					"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.0.4",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"is-wsl": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-					"dev": true,
-					"requires": {
-						"is-docker": "^2.0.0"
-					}
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"jsonc-parser": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-					"integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-					"dev": true
-				},
-				"jsonfile": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.6",
-						"universalify": "^2.0.0"
-					}
-				},
-				"lines-and-columns": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz",
-					"integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==",
-					"dev": true
-				},
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "3.0.5",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
-					"integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"open": {
-					"version": "8.4.2",
-					"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-					"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-					"dev": true,
-					"requires": {
-						"define-lazy-prop": "^2.0.0",
-						"is-docker": "^2.1.1",
-						"is-wsl": "^2.2.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"dev": true,
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"semver": {
-					"version": "7.5.3",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-					"integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"strip-bom": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-					"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-					"dev": true
-				},
-				"tmp": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-					"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-					"dev": true,
-					"requires": {
-						"rimraf": "^3.0.0"
-					}
-				},
-				"tsconfig-paths": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
-					"integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
-					"dev": true,
-					"requires": {
-						"json5": "^2.2.2",
-						"minimist": "^1.2.6",
-						"strip-bom": "^3.0.0"
-					}
-				},
-				"universalify": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-					"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-					"dev": true
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "17.7.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-					"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-					"dev": true,
-					"requires": {
-						"cliui": "^8.0.1",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.3",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^21.1.1"
-					},
-					"dependencies": {
-						"cliui": {
-							"version": "8.0.1",
-							"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-							"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-							"dev": true,
-							"requires": {
-								"string-width": "^4.2.0",
-								"strip-ansi": "^6.0.1",
-								"wrap-ansi": "^7.0.0"
-							}
-						}
-					}
-				},
-				"yargs-parser": {
-					"version": "21.1.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-					"dev": true
-				}
-			}
-		},
-		"ob1": {
-			"version": "0.73.10",
-			"resolved": "https://registry.npmjs.org/ob1/-/ob1-0.73.10.tgz",
-			"integrity": "sha512-aO6EYC+QRRCkZxVJhCWhLKgVjhNuD6Gu1riGjxrIm89CqLsmKgxzYDDEsktmKsoDeRdWGQM5EdMzXDl5xcVfsw=="
-		},
-		"object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-		},
-		"object-copy": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-			"integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
-			"requires": {
-				"copy-descriptor": "^0.1.0",
-				"define-property": "^0.2.5",
-				"kind-of": "^3.0.3"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"object-filter": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/object-filter/-/object-filter-1.0.2.tgz",
-			"integrity": "sha512-NahvP2vZcy1ZiiYah30CEPw0FpDcSkSePJBMpzl5EQgCmISijiGuJm3SPYp7U+Lf2TljyaIw3E5EgkEx/TNEVA==",
-			"dev": true
-		},
-		"object-inspect": {
-			"version": "1.12.3",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-			"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-			"dev": true
-		},
-		"object-is": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3"
-			}
-		},
-		"object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"dev": true
-		},
-		"object-visit": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-			"integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
-			"requires": {
-				"isobject": "^3.0.0"
-			}
-		},
-		"object.assign": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"has-symbols": "^1.0.3",
-				"object-keys": "^1.1.1"
-			}
-		},
-		"object.entries": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-			"integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4"
-			}
-		},
-		"object.fromentries": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-			"integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4"
-			}
-		},
-		"object.hasown": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.0.tgz",
-			"integrity": "sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==",
-			"dev": true,
-			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
-			}
-		},
-		"object.pick": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-			"integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
-			"requires": {
-				"isobject": "^3.0.1"
-			}
-		},
-		"object.values": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-			"integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4"
-			}
-		},
-		"objectorarray": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz",
-			"integrity": "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==",
-			"dev": true
-		},
-		"obuf": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-			"dev": true
-		},
-		"octokit-pagination-methods": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz",
-			"integrity": "sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==",
-			"dev": true
-		},
-		"on-finished": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-			"integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-			"requires": {
-				"ee-first": "1.1.1"
-			}
-		},
-		"on-headers": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-		},
-		"once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-			"requires": {
-				"wrappy": "1"
-			}
-		},
-		"one-time": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
-			"integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
-			"dev": true,
-			"requires": {
-				"fn.name": "1.x.x"
-			}
-		},
-		"onetime": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-			"integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
-			"dev": true,
-			"requires": {
-				"mimic-fn": "^1.0.0"
-			}
-		},
-		"open": {
-			"version": "6.4.0",
-			"resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
-			"integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
-			"requires": {
-				"is-wsl": "^1.1.0"
-			}
-		},
-		"opencv-bindings": {
-			"version": "4.5.5",
-			"resolved": "https://registry.npmjs.org/opencv-bindings/-/opencv-bindings-4.5.5.tgz",
-			"integrity": "sha512-FdYE9uqnoPKbAkZFEOpIh6RTtJIz1lz+W27xPCo1Ov6+d0OOgg+Hm9OT2MIGIG8V1Dp3fWlLvi7SIjDOpqO2XA==",
-			"dev": true
-		},
-		"opener": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-			"dev": true
-		},
-		"optionator": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-			"integrity": "sha512-oCOQ8AIC2ciLy/sE2ehafRBleBgDLvzGhBRRev87sP7ovnbvQfqpc3XFI0DhHey2OfVoNV91W+GPC6B3540/5Q==",
-			"dev": true,
-			"requires": {
-				"deep-is": "~0.1.3",
-				"fast-levenshtein": "~2.0.4",
-				"levn": "~0.3.0",
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2",
-				"wordwrap": "~1.0.0"
-			}
-		},
-		"ora": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz",
-			"integrity": "sha512-sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A==",
-			"dev": true,
-			"requires": {
-				"chalk": "^3.0.0",
-				"cli-cursor": "^3.1.0",
-				"cli-spinners": "^2.2.0",
-				"is-interactive": "^1.0.0",
-				"log-symbols": "^3.0.0",
-				"mute-stream": "0.0.8",
-				"strip-ansi": "^6.0.0",
-				"wcwidth": "^1.0.1"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cli-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^3.1.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"log-symbols": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-					"integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.2"
-					},
-					"dependencies": {
-						"ansi-styles": {
-							"version": "3.2.1",
-							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-							"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-							"dev": true,
-							"requires": {
-								"color-convert": "^1.9.0"
-							}
-						},
-						"chalk": {
-							"version": "2.4.2",
-							"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-							"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-							"dev": true,
-							"requires": {
-								"ansi-styles": "^3.2.1",
-								"escape-string-regexp": "^1.0.5",
-								"supports-color": "^5.3.0"
-							}
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						}
-					}
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"restore-cursor": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-					"dev": true,
-					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"os-browserify": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-			"integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-			"dev": true
-		},
-		"os-homedir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-			"integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-			"dev": true
-		},
-		"os-name": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-			"integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
-			"dev": true,
-			"requires": {
-				"macos-release": "^2.2.0",
-				"windows-release": "^3.1.0"
-			}
-		},
-		"os-tmpdir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-			"integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="
-		},
-		"p-cancelable": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-			"integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-			"dev": true
-		},
-		"p-finally": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-			"integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
-		},
-		"p-limit": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-			"requires": {
-				"yocto-queue": "^0.1.0"
-			}
-		},
-		"p-locate": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-			"integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
-			"dev": true,
-			"requires": {
-				"p-limit": "^1.1.0"
-			},
-			"dependencies": {
-				"p-limit": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-					"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-					"dev": true,
-					"requires": {
-						"p-try": "^1.0.0"
-					}
-				}
-			}
-		},
-		"p-map": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-			"integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-			"dev": true,
-			"requires": {
-				"aggregate-error": "^3.0.0"
-			}
-		},
-		"p-map-series": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz",
-			"integrity": "sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==",
-			"dev": true
-		},
-		"p-pipe": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz",
-			"integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==",
-			"dev": true
-		},
-		"p-queue": {
-			"version": "6.6.2",
-			"resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
-			"integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
-			"dev": true,
-			"requires": {
-				"eventemitter3": "^4.0.4",
-				"p-timeout": "^3.2.0"
-			}
-		},
-		"p-reduce": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz",
-			"integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==",
-			"dev": true
-		},
-		"p-retry": {
-			"version": "4.6.1",
-			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
-			"integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
-			"dev": true,
-			"requires": {
-				"@types/retry": "^0.12.0",
-				"retry": "^0.13.1"
-			},
-			"dependencies": {
-				"retry": {
-					"version": "0.13.1",
-					"resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-					"integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-					"dev": true
-				}
-			}
-		},
-		"p-timeout": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-			"integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
-			"dev": true,
-			"requires": {
-				"p-finally": "^1.0.0"
-			}
-		},
-		"p-try": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-			"integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
-			"dev": true
-		},
-		"p-waterfall": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz",
-			"integrity": "sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==",
-			"dev": true,
-			"requires": {
-				"p-reduce": "^2.0.0"
-			}
-		},
-		"pac-proxy-agent": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz",
-			"integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==",
-			"dev": true,
-			"requires": {
-				"@tootallnate/quickjs-emscripten": "^0.23.0",
-				"agent-base": "^7.0.2",
-				"debug": "^4.3.4",
-				"get-uri": "^6.0.1",
-				"http-proxy-agent": "^7.0.0",
-				"https-proxy-agent": "^7.0.2",
-				"pac-resolver": "^7.0.0",
-				"socks-proxy-agent": "^8.0.2"
-			},
-			"dependencies": {
-				"agent-base": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-					"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.3.4"
-					}
-				},
-				"http-proxy-agent": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-					"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.1.0",
-						"debug": "^4.3.4"
-					}
-				},
-				"https-proxy-agent": {
-					"version": "7.0.2",
-					"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-					"integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.0.2",
-						"debug": "4"
-					}
-				},
-				"socks-proxy-agent": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
-					"integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.0.2",
-						"debug": "^4.3.4",
-						"socks": "^2.7.1"
-					}
-				}
-			}
-		},
-		"pac-resolver": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz",
-			"integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==",
-			"dev": true,
-			"requires": {
-				"degenerator": "^5.0.0",
-				"ip": "^1.1.8",
-				"netmask": "^2.0.2"
-			}
-		},
-		"package-changed": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/package-changed/-/package-changed-3.0.0.tgz",
-			"integrity": "sha512-HSRbrO+Ab5AuqqYGSevtKJ1Yt96jW1VKV7wrp8K4SKj5tyDp/7D96uPCQyCPiNtWTEH/7nA3hZ4z2slbc9yFxg==",
-			"dev": true,
-			"requires": {
-				"commander": "^6.2.0"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-					"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-					"dev": true
-				}
-			}
-		},
-		"pacote": {
-			"version": "15.2.0",
-			"resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz",
-			"integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==",
-			"dev": true,
-			"requires": {
-				"@npmcli/git": "^4.0.0",
-				"@npmcli/installed-package-contents": "^2.0.1",
-				"@npmcli/promise-spawn": "^6.0.1",
-				"@npmcli/run-script": "^6.0.0",
-				"cacache": "^17.0.0",
-				"fs-minipass": "^3.0.0",
-				"minipass": "^5.0.0",
-				"npm-package-arg": "^10.0.0",
-				"npm-packlist": "^7.0.0",
-				"npm-pick-manifest": "^8.0.0",
-				"npm-registry-fetch": "^14.0.0",
-				"proc-log": "^3.0.0",
-				"promise-retry": "^2.0.1",
-				"read-package-json": "^6.0.0",
-				"read-package-json-fast": "^3.0.0",
-				"sigstore": "^1.3.0",
-				"ssri": "^10.0.0",
-				"tar": "^6.1.11"
-			},
-			"dependencies": {
-				"@npmcli/fs": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
-					"integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
-					"dev": true,
-					"requires": {
-						"semver": "^7.3.5"
-					}
-				},
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"builtins": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-					"integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-					"dev": true,
-					"requires": {
-						"semver": "^7.0.0"
-					}
-				},
-				"cacache": {
-					"version": "17.1.3",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz",
-					"integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==",
-					"dev": true,
-					"requires": {
-						"@npmcli/fs": "^3.1.0",
-						"fs-minipass": "^3.0.0",
-						"glob": "^10.2.2",
-						"lru-cache": "^7.7.1",
-						"minipass": "^5.0.0",
-						"minipass-collect": "^1.0.2",
-						"minipass-flush": "^1.0.5",
-						"minipass-pipeline": "^1.2.4",
-						"p-map": "^4.0.0",
-						"ssri": "^10.0.0",
-						"tar": "^6.1.11",
-						"unique-filename": "^3.0.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"foreground-child": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-					"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"signal-exit": "^4.0.1"
-					}
-				},
-				"fs-minipass": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz",
-					"integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==",
-					"dev": true,
-					"requires": {
-						"minipass": "^5.0.0"
-					}
-				},
-				"glob": {
-					"version": "10.3.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-					"integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
-					"dev": true,
-					"requires": {
-						"foreground-child": "^3.1.0",
-						"jackspeak": "^2.0.3",
-						"minimatch": "^9.0.1",
-						"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-						"path-scurry": "^1.10.1"
-					}
-				},
-				"hosted-git-info": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-					"integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^7.5.1"
-					}
-				},
-				"ignore-walk": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz",
-					"integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==",
-					"dev": true,
-					"requires": {
-						"minimatch": "^9.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "9.0.3",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-					"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				},
-				"minipass": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-					"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-					"dev": true
-				},
-				"npm-package-arg": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
-					"integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^6.0.0",
-						"proc-log": "^3.0.0",
-						"semver": "^7.3.5",
-						"validate-npm-package-name": "^5.0.0"
-					}
-				},
-				"npm-packlist": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz",
-					"integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==",
-					"dev": true,
-					"requires": {
-						"ignore-walk": "^6.0.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"signal-exit": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-					"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-					"dev": true
-				},
-				"ssri": {
-					"version": "10.0.4",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz",
-					"integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==",
-					"dev": true,
-					"requires": {
-						"minipass": "^5.0.0"
-					}
-				},
-				"unique-filename": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-					"integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
-					"dev": true,
-					"requires": {
-						"unique-slug": "^4.0.0"
-					}
-				},
-				"unique-slug": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-					"integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
-					"dev": true,
-					"requires": {
-						"imurmurhash": "^0.1.4"
-					}
-				},
-				"validate-npm-package-name": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
-					"integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
-					"dev": true,
-					"requires": {
-						"builtins": "^5.0.0"
-					}
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"pako": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-			"dev": true
-		},
-		"parallel-transform": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-			"integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
-			"dev": true,
-			"requires": {
-				"cyclist": "~0.2.2",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.1.5"
-			}
-		},
-		"param-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-			"integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-			"requires": {
-				"dot-case": "^3.0.4",
-				"tslib": "^2.0.3"
-			}
-		},
-		"parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"requires": {
-				"callsites": "^3.0.0"
-			}
-		},
-		"parse-asn1": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-			"dev": true,
-			"requires": {
-				"asn1.js": "^5.2.0",
-				"browserify-aes": "^1.0.0",
-				"evp_bytestokey": "^1.0.0",
-				"pbkdf2": "^3.0.3",
-				"safe-buffer": "^5.1.1"
-			}
-		},
-		"parse-cache-control": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz",
-			"integrity": "sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==",
-			"dev": true
-		},
-		"parse-entities": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz",
-			"integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==",
-			"dev": true,
-			"requires": {
-				"character-entities": "^1.0.0",
-				"character-entities-legacy": "^1.0.0",
-				"character-reference-invalid": "^1.0.0",
-				"is-alphanumerical": "^1.0.0",
-				"is-decimal": "^1.0.0",
-				"is-hexadecimal": "^1.0.0"
-			}
-		},
-		"parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			}
-		},
-		"parse-listing": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/parse-listing/-/parse-listing-1.1.3.tgz",
-			"integrity": "sha512-a1p1i+9Qyc8pJNwdrSvW1g5TPxRH0sywVi6OzVvYHRo6xwF9bDWBxtH0KkxeOOvhUE8vAMtiSfsYQFOuK901eA==",
-			"dev": true
-		},
-		"parse-passwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-			"integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
-			"dev": true
-		},
-		"parse-path": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
-			"integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
-			"dev": true,
-			"requires": {
-				"protocols": "^2.0.0"
-			}
-		},
-		"parse-url": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
-			"integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
-			"dev": true,
-			"requires": {
-				"parse-path": "^7.0.0"
-			}
-		},
-		"parse5": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-			"integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-			"dev": true,
-			"requires": {
-				"entities": "^4.4.0"
-			},
-			"dependencies": {
-				"entities": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-					"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-					"dev": true
-				}
-			}
-		},
-		"parseurl": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-		},
-		"pascal-case": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-			"integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-			"requires": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3"
-			}
-		},
-		"pascalcase": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-			"integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="
-		},
-		"patch-package": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz",
-			"integrity": "sha512-YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg==",
-			"dev": true,
-			"requires": {
-				"@yarnpkg/lockfile": "^1.1.0",
-				"chalk": "^2.4.2",
-				"cross-spawn": "^6.0.5",
-				"find-yarn-workspace-root": "^1.2.1",
-				"fs-extra": "^7.0.1",
-				"is-ci": "^2.0.0",
-				"klaw-sync": "^6.0.0",
-				"minimist": "^1.2.0",
-				"rimraf": "^2.6.3",
-				"semver": "^5.6.0",
-				"slash": "^2.0.0",
-				"tmp": "^0.0.33"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"fs-extra": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-					"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"rimraf": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-					"dev": true
-				},
-				"slash": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-					"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-					"dev": true
-				}
-			}
-		},
-		"path-browserify": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-			"integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-			"dev": true
-		},
-		"path-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz",
-			"integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==",
-			"requires": {
-				"dot-case": "^3.0.4",
-				"tslib": "^2.0.3"
-			}
-		},
-		"path-dirname": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-			"integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
-			"dev": true,
-			"optional": true
-		},
-		"path-exists": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-			"integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
-		},
-		"path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-		},
-		"path-is-inside": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-			"integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-			"dev": true
-		},
-		"path-key": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-			"integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
-		},
-		"path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-		},
-		"path-scurry": {
-			"version": "1.10.1",
-			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
-			"integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
-			"dev": true,
-			"requires": {
-				"lru-cache": "^9.1.1 || ^10.0.0",
-				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "10.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.0.tgz",
-					"integrity": "sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==",
-					"dev": true
-				},
-				"minipass": {
-					"version": "7.0.2",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.2.tgz",
-					"integrity": "sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==",
-					"dev": true
-				}
-			}
-		},
-		"path-to-regexp": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-			"dev": true
-		},
-		"path-type": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-			"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-			"dev": true,
-			"requires": {
-				"pify": "^3.0.0"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-					"integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-					"dev": true
-				}
-			}
-		},
-		"pathe": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-			"integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
-			"dev": true
-		},
-		"pbkdf2": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-			"dev": true,
-			"requires": {
-				"create-hash": "^1.1.2",
-				"create-hmac": "^1.1.4",
-				"ripemd160": "^2.0.1",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
-			}
-		},
-		"peek-stream": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz",
-			"integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"duplexify": "^3.5.0",
-				"through2": "^2.0.3"
-			}
-		},
-		"pegjs": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz",
-			"integrity": "sha512-qI5+oFNEGi3L5HAxDwN2LA4Gg7irF70Zs25edhjld9QemOgp0CbvMtbFcMvFtEo1OityPrcCzkQFB8JP/hxgow=="
-		},
-		"pend": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-			"integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-			"dev": true
-		},
-		"phpegjs": {
-			"version": "1.0.0-beta7",
-			"resolved": "https://registry.npmjs.org/phpegjs/-/phpegjs-1.0.0-beta7.tgz",
-			"integrity": "sha512-SO+NP5argMoJVCWcYiOofPUeEWDIM47FNCBJtp6uJ8PpjtBcudYJTzCbCMit5dzmfSLCoijzEwIXOqPqD45xQg=="
-		},
-		"picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-		},
-		"picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
-		},
-		"pidtree": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
-			"integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
-			"dev": true
-		},
-		"pify": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-			"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-			"dev": true
-		},
-		"pinkie": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-			"integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-			"dev": true
-		},
-		"pinkie-promise": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-			"integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-			"dev": true,
-			"requires": {
-				"pinkie": "^2.0.0"
-			}
-		},
-		"pirates": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-			"integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
-		},
-		"pkg-dir": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-			"integrity": "sha512-ojakdnUgL5pzJYWw2AIDEupaQCX5OPbM688ZevubICjdIX01PRSYKqm33fJoCOJBRseYCTUlQRnBNX+Pchaejw==",
-			"dev": true,
-			"requires": {
-				"find-up": "^2.1.0"
-			}
-		},
-		"platform": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz",
-			"integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==",
-			"dev": true
-		},
-		"playwright": {
-			"version": "1.39.0",
-			"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.39.0.tgz",
-			"integrity": "sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==",
-			"dev": true,
-			"requires": {
-				"fsevents": "2.3.2",
-				"playwright-core": "1.39.0"
-			},
-			"dependencies": {
-				"playwright-core": {
-					"version": "1.39.0",
-					"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.39.0.tgz",
-					"integrity": "sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==",
-					"dev": true
-				}
-			}
-		},
-		"please-upgrade-node": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
-			"integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
-			"dev": true,
-			"requires": {
-				"semver-compare": "^1.0.0"
-			}
-		},
-		"plist": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
-			"integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
-			"dev": true,
-			"requires": {
-				"@xmldom/xmldom": "^0.8.8",
-				"base64-js": "^1.5.1",
-				"xmlbuilder": "^15.1.1"
-			}
-		},
-		"plur": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
-			"integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
-			"dev": true,
-			"requires": {
-				"irregular-plurals": "^3.2.0"
-			}
-		},
-		"pluralize": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
-			"integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-			"dev": true
-		},
-		"polished": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/polished/-/polished-4.2.2.tgz",
-			"integrity": "sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.17.8"
-			}
-		},
-		"posix-character-classes": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-			"integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="
-		},
-		"postcss": {
-			"version": "8.4.16",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-			"integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
-			"dev": true,
-			"requires": {
-				"nanoid": "^3.3.4",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
-			},
-			"dependencies": {
-				"source-map-js": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-					"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-calc": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
-			"integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.11",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-colormin": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.0.tgz",
-			"integrity": "sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.4",
-				"caniuse-api": "^3.0.0",
-				"colord": "^2.9.1",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-convert-values": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz",
-			"integrity": "sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.4",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-discard-comments": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz",
-			"integrity": "sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==",
-			"dev": true
-		},
-		"postcss-discard-duplicates": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz",
-			"integrity": "sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==",
-			"dev": true
-		},
-		"postcss-discard-empty": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz",
-			"integrity": "sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==",
-			"dev": true
-		},
-		"postcss-discard-overridden": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz",
-			"integrity": "sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==",
-			"dev": true
-		},
-		"postcss-loader": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
-			"integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
-			"dev": true,
-			"requires": {
-				"cosmiconfig": "^7.0.0",
-				"klona": "^2.0.5",
-				"semver": "^7.3.5"
-			}
-		},
-		"postcss-media-query-parser": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-			"integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-			"dev": true
-		},
-		"postcss-merge-longhand": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz",
-			"integrity": "sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0",
-				"stylehacks": "^6.0.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-merge-rules": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz",
-			"integrity": "sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.4",
-				"caniuse-api": "^3.0.0",
-				"cssnano-utils": "^4.0.0",
-				"postcss-selector-parser": "^6.0.5"
-			}
-		},
-		"postcss-minify-font-values": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz",
-			"integrity": "sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-minify-gradients": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz",
-			"integrity": "sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==",
-			"dev": true,
-			"requires": {
-				"colord": "^2.9.1",
-				"cssnano-utils": "^4.0.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-minify-params": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz",
-			"integrity": "sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.4",
-				"cssnano-utils": "^4.0.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-minify-selectors": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz",
-			"integrity": "sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.5"
-			}
-		},
-		"postcss-modules-extract-imports": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-			"dev": true
-		},
-		"postcss-modules-local-by-default": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-			"integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
-			"dev": true,
-			"requires": {
-				"icss-utils": "^5.0.0",
-				"postcss-selector-parser": "^6.0.2",
-				"postcss-value-parser": "^4.1.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-modules-scope": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.4"
-			}
-		},
-		"postcss-modules-values": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-			"dev": true,
-			"requires": {
-				"icss-utils": "^5.0.0"
-			}
-		},
-		"postcss-normalize-charset": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz",
-			"integrity": "sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==",
-			"dev": true
-		},
-		"postcss-normalize-display-values": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz",
-			"integrity": "sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-normalize-positions": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz",
-			"integrity": "sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-normalize-repeat-style": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz",
-			"integrity": "sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-normalize-string": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz",
-			"integrity": "sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-normalize-timing-functions": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz",
-			"integrity": "sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-normalize-unicode": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz",
-			"integrity": "sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.4",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-normalize-url": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz",
-			"integrity": "sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-normalize-whitespace": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz",
-			"integrity": "sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-ordered-values": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz",
-			"integrity": "sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==",
-			"dev": true,
-			"requires": {
-				"cssnano-utils": "^4.0.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-prefixwrap": {
-			"version": "1.41.0",
-			"resolved": "https://registry.npmjs.org/postcss-prefixwrap/-/postcss-prefixwrap-1.41.0.tgz",
-			"integrity": "sha512-gmwwAEE+ci3/ZKjUZppTETINlh1QwihY8gCstInuS7ohk353KYItU4d64hvnUvO2GUy29hBGPHz4Ce+qJRi90A=="
-		},
-		"postcss-reduce-initial": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz",
-			"integrity": "sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.4",
-				"caniuse-api": "^3.0.0"
-			}
-		},
-		"postcss-reduce-transforms": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz",
-			"integrity": "sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-resolve-nested-selector": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-			"integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
-			"dev": true
-		},
-		"postcss-safe-parser": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-			"integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-			"dev": true
-		},
-		"postcss-selector-parser": {
-			"version": "6.0.13",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-			"integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
-			"dev": true,
-			"requires": {
-				"cssesc": "^3.0.0",
-				"util-deprecate": "^1.0.2"
-			}
-		},
-		"postcss-svgo": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz",
-			"integrity": "sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0",
-				"svgo": "^3.0.2"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"postcss-unique-selectors": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz",
-			"integrity": "sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.5"
-			}
-		},
-		"postcss-urlrebase": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/postcss-urlrebase/-/postcss-urlrebase-1.3.0.tgz",
-			"integrity": "sha512-LOFN43n1IewKriXiypMNNinXeptttSyGGRLPbBMdQzuTvvCEo5mz/gG06y/HqrkN7p3ayHQf2R2bTBv639FOaQ==",
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
-				}
-			}
-		},
-		"postcss-value-parser": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-		},
-		"preact": {
-			"version": "10.13.2",
-			"resolved": "https://registry.npmjs.org/preact/-/preact-10.13.2.tgz",
-			"integrity": "sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw=="
-		},
-		"prebuild-install": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
-			"integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"detect-libc": "^2.0.0",
-				"expand-template": "^2.0.3",
-				"github-from-package": "0.0.0",
-				"minimist": "^1.2.3",
-				"mkdirp-classic": "^0.5.3",
-				"napi-build-utils": "^1.0.1",
-				"node-abi": "^3.3.0",
-				"pump": "^3.0.0",
-				"rc": "^1.2.7",
-				"simple-get": "^4.0.0",
-				"tar-fs": "^2.0.0",
-				"tunnel-agent": "^0.6.0"
-			},
-			"dependencies": {
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				}
-			}
-		},
-		"prelude-ls": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-			"integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-			"dev": true
-		},
-		"prettier": {
-			"version": "npm:wp-prettier@3.0.3",
-			"resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-3.0.3.tgz",
-			"integrity": "sha512-X4UlrxDTH8oom9qXlcjnydsjAOD2BmB6yFmvS4Z2zdTzqqpRWb+fbqrH412+l+OUXmbzJlSXjlMFYPgYG12IAA==",
-			"dev": true
-		},
-		"prettier-linter-helpers": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-			"integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-			"dev": true,
-			"requires": {
-				"fast-diff": "^1.1.2"
-			}
-		},
-		"pretty-error": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-			"integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.20",
-				"renderkid": "^3.0.0"
-			}
-		},
-		"pretty-format": {
-			"version": "29.6.2",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
-			"integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
-			"requires": {
-				"@jest/schemas": "^29.6.0",
-				"ansi-styles": "^5.0.0",
-				"react-is": "^18.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-				},
-				"react-is": {
-					"version": "18.2.0",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-					"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-				}
-			}
-		},
-		"pretty-hrtime": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-			"integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-			"dev": true
-		},
-		"proc-log": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
-			"integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
-			"dev": true
-		},
-		"process": {
-			"version": "0.11.10",
-			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-			"integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-			"dev": true
-		},
-		"process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-		},
-		"progress": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-			"dev": true
-		},
-		"promise": {
-			"version": "8.3.0",
-			"resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
-			"integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
-			"requires": {
-				"asap": "~2.0.6"
-			}
-		},
-		"promise-inflight": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-			"integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-			"dev": true
-		},
-		"promise-retry": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-			"integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-			"dev": true,
-			"requires": {
-				"err-code": "^2.0.2",
-				"retry": "^0.12.0"
-			}
-		},
-		"prompts": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-			"requires": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.5"
-			}
-		},
-		"promzard": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/promzard/-/promzard-1.0.0.tgz",
-			"integrity": "sha512-KQVDEubSUHGSt5xLakaToDFrSoZhStB8dXLzk2xvwR67gJktrHFvpR63oZgHyK19WKbHFLXJqCPXdVR3aBP8Ig==",
-			"dev": true,
-			"requires": {
-				"read": "^2.0.0"
-			}
-		},
-		"prop-types": {
-			"version": "15.7.2",
-			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-			"integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-			"requires": {
-				"loose-envify": "^1.4.0",
-				"object-assign": "^4.1.1",
-				"react-is": "^16.8.1"
-			}
-		},
-		"propagate": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
-			"integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==",
-			"dev": true
-		},
-		"protocols": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
-			"integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==",
-			"dev": true
-		},
-		"proxy-addr": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-			"dev": true,
-			"requires": {
-				"forwarded": "0.2.0",
-				"ipaddr.js": "1.9.1"
-			}
-		},
-		"proxy-agent": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.0.tgz",
-			"integrity": "sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==",
-			"dev": true,
-			"requires": {
-				"agent-base": "^7.0.2",
-				"debug": "^4.3.4",
-				"http-proxy-agent": "^7.0.0",
-				"https-proxy-agent": "^7.0.0",
-				"lru-cache": "^7.14.1",
-				"pac-proxy-agent": "^7.0.0",
-				"proxy-from-env": "^1.1.0",
-				"socks-proxy-agent": "^8.0.1"
-			},
-			"dependencies": {
-				"agent-base": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-					"integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.3.4"
-					}
-				},
-				"http-proxy-agent": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-					"integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.1.0",
-						"debug": "^4.3.4"
-					}
-				},
-				"https-proxy-agent": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz",
-					"integrity": "sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.0.2",
-						"debug": "4"
-					}
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"socks-proxy-agent": {
-					"version": "8.0.1",
-					"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz",
-					"integrity": "sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^7.0.1",
-						"debug": "^4.3.4",
-						"socks": "^2.7.1"
-					}
-				}
-			}
-		},
-		"proxy-compare": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/proxy-compare/-/proxy-compare-2.3.0.tgz",
-			"integrity": "sha512-c3L2CcAi7f7pvlD0D7xsF+2CQIW8C3HaYx2Pfgq8eA4HAl3GAH6/dVYsyBbYF/0XJs2ziGLrzmz5fmzPm6A0pQ=="
-		},
-		"proxy-from-env": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-			"dev": true
-		},
-		"prr": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-			"integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
-			"dev": true
-		},
-		"ps-list": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/ps-list/-/ps-list-8.1.1.tgz",
-			"integrity": "sha512-OPS9kEJYVmiO48u/B9qneqhkMvgCxT+Tm28VCEJpheTpl8cJ0ffZRRNgS5mrQRTrX5yRTpaJ+hRDeefXYmmorQ==",
-			"dev": true
-		},
-		"pseudomap": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-			"integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-			"dev": true
-		},
-		"psl": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-			"integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-			"dev": true
-		},
-		"public-encrypt": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-			"dev": true,
-			"requires": {
-				"bn.js": "^4.1.0",
-				"browserify-rsa": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"parse-asn1": "^5.0.0",
-				"randombytes": "^2.0.1",
-				"safe-buffer": "^5.1.2"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.12.0",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-					"dev": true
-				}
-			}
-		},
-		"pump": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-			"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
-			}
-		},
-		"pumpify": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-			"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-			"dev": true,
-			"requires": {
-				"duplexify": "^3.6.0",
-				"inherits": "^2.0.3",
-				"pump": "^2.0.0"
-			}
-		},
-		"punycode": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-			"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
-		},
-		"puppeteer-core": {
-			"version": "13.7.0",
-			"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.7.0.tgz",
-			"integrity": "sha512-rXja4vcnAzFAP1OVLq/5dWNfwBGuzcOARJ6qGV7oAZhnLmVRU8G5MsdeQEAOy332ZhkIOnn9jp15R89LKHyp2Q==",
-			"dev": true,
-			"requires": {
-				"cross-fetch": "3.1.5",
-				"debug": "4.3.4",
-				"devtools-protocol": "0.0.981744",
-				"extract-zip": "2.0.1",
-				"https-proxy-agent": "5.0.1",
-				"pkg-dir": "4.2.0",
-				"progress": "2.0.3",
-				"proxy-from-env": "1.1.0",
-				"rimraf": "3.0.2",
-				"tar-fs": "2.1.1",
-				"unbzip2-stream": "1.4.3",
-				"ws": "8.5.0"
-			},
-			"dependencies": {
-				"extract-zip": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-					"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-					"dev": true,
-					"requires": {
-						"@types/yauzl": "^2.9.1",
-						"debug": "^4.1.1",
-						"get-stream": "^5.1.0",
-						"yauzl": "^2.10.0"
-					}
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"pkg-dir": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-					"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-					"dev": true,
-					"requires": {
-						"find-up": "^4.0.0"
-					}
-				},
-				"ws": {
-					"version": "8.5.0",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-					"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-					"dev": true
-				}
-			}
-		},
-		"puppeteer-testing-library": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/puppeteer-testing-library/-/puppeteer-testing-library-0.5.0.tgz",
-			"integrity": "sha512-x72CJwpbdJaGEjBEpUHqeNVdDu36Hoqt6yodnyL/msNN7IoioKS+3ZmwLw/DIiDZJujUAtq3qltbIehA+uGWHQ==",
-			"dev": true,
-			"requires": {
-				"jest-diff": "^26.6.2"
-			},
-			"dependencies": {
-				"@jest/types": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-					"integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
-					"dev": true,
-					"requires": {
-						"@types/istanbul-lib-coverage": "^2.0.0",
-						"@types/istanbul-reports": "^3.0.0",
-						"@types/node": "*",
-						"@types/yargs": "^15.0.0",
-						"chalk": "^4.0.0"
-					}
-				},
-				"@types/yargs": {
-					"version": "15.0.15",
-					"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz",
-					"integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==",
-					"dev": true,
-					"requires": {
-						"@types/yargs-parser": "*"
-					}
-				},
-				"diff-sequences": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
-					"integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
-					"dev": true
-				},
-				"jest-diff": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-					"integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
-					"dev": true,
-					"requires": {
-						"chalk": "^4.0.0",
-						"diff-sequences": "^26.6.2",
-						"jest-get-type": "^26.3.0",
-						"pretty-format": "^26.6.2"
-					}
-				},
-				"jest-get-type": {
-					"version": "26.3.0",
-					"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-					"integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-					"dev": true
-				},
-				"pretty-format": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-					"integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
-					"dev": true,
-					"requires": {
-						"@jest/types": "^26.6.2",
-						"ansi-regex": "^5.0.0",
-						"ansi-styles": "^4.0.0",
-						"react-is": "^17.0.1"
-					}
-				},
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-					"dev": true
-				}
-			}
-		},
-		"pure-rand": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
-			"integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
-			"dev": true
-		},
-		"qs": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-			"dev": true,
-			"requires": {
-				"side-channel": "^1.0.4"
-			}
-		},
-		"query-selector-shadow-dom": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.1.tgz",
-			"integrity": "sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw==",
-			"dev": true
-		},
-		"query-string": {
-			"version": "6.14.1",
-			"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
-			"integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
-			"requires": {
-				"decode-uri-component": "^0.2.0",
-				"filter-obj": "^1.1.0",
-				"split-on-first": "^1.0.0",
-				"strict-uri-encode": "^2.0.0"
-			}
-		},
-		"querystring": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-			"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-		},
-		"querystring-es3": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-			"integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-			"dev": true
-		},
-		"querystringify": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-			"dev": true
-		},
-		"queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
-		},
-		"queue-tick": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-			"integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-			"dev": true
-		},
-		"quick-lru": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-			"dev": true
-		},
-		"ramda": {
-			"version": "0.29.0",
-			"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.29.0.tgz",
-			"integrity": "sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==",
-			"dev": true
-		},
-		"randombytes": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-			"requires": {
-				"safe-buffer": "^5.1.0"
-			}
-		},
-		"randomfill": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-			"dev": true,
-			"requires": {
-				"randombytes": "^2.0.5",
-				"safe-buffer": "^5.1.0"
-			}
-		},
-		"range-parser": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-		},
-		"raw-body": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-			"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-			"dev": true,
-			"requires": {
-				"bytes": "3.1.2",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"unpipe": "1.0.0"
-			},
-			"dependencies": {
-				"bytes": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-					"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-					"dev": true
-				},
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
-			}
-		},
-		"rc": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"deep-extend": "^0.6.0",
-				"ini": "~1.3.0",
-				"minimist": "^1.2.0",
-				"strip-json-comments": "~2.0.1"
-			},
-			"dependencies": {
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-					"dev": true,
-					"optional": true
-				}
-			}
-		},
-		"re-resizable": {
-			"version": "6.9.0",
-			"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.0.tgz",
-			"integrity": "sha512-3cUDG81ylyqI0Pdgle/RHwwRYq0ORZzsUaySOCO8IbEtNyaRtrIHYm/jMQ5pjcNiKCxR3vsSymIQZHwJq4gg2Q==",
-			"requires": {
-				"fast-memoize": "^2.5.1"
-			}
-		},
-		"react": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-			"integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-			"requires": {
-				"loose-envify": "^1.1.0"
-			}
-		},
-		"react-autosize-textarea": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/react-autosize-textarea/-/react-autosize-textarea-7.1.0.tgz",
-			"integrity": "sha512-BHpjCDkuOlllZn3nLazY2F8oYO1tS2jHnWhcjTWQdcKiiMU6gHLNt/fzmqMSyerR0eTdKtfSIqtSeTtghNwS+g==",
-			"requires": {
-				"autosize": "^4.0.2",
-				"line-height": "^0.3.1",
-				"prop-types": "^15.5.6"
-			}
-		},
-		"react-colorful": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.3.1.tgz",
-			"integrity": "sha512-nkP1w1LGe8PzhtOQO10xSDTsMWAYVj/Wm5c7ORk7CBngjCE7hHsknFRtosT5qMYkwWs8wSiU0sBwZ8dyzRbNEQ=="
-		},
-		"react-devtools-core": {
-			"version": "4.28.0",
-			"resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.0.tgz",
-			"integrity": "sha512-E3C3X1skWBdBzwpOUbmXG8SgH6BtsluSMe+s6rRcujNKG1DGi8uIfhdhszkgDpAsMoE55hwqRUzeXCmETDBpTg==",
-			"requires": {
-				"shell-quote": "^1.6.1",
-				"ws": "^7"
-			}
-		},
-		"react-docgen": {
-			"version": "5.4.3",
-			"resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.4.3.tgz",
-			"integrity": "sha512-xlLJyOlnfr8lLEEeaDZ+X2J/KJoe6Nr9AzxnkdQWush5hz2ZSu66w6iLMOScMmxoSHWpWMn+k3v5ZiyCfcWsOA==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.7.5",
-				"@babel/generator": "^7.12.11",
-				"@babel/runtime": "^7.7.6",
-				"ast-types": "^0.14.2",
-				"commander": "^2.19.0",
-				"doctrine": "^3.0.0",
-				"estree-to-babel": "^3.1.0",
-				"neo-async": "^2.6.1",
-				"node-dir": "^0.1.10",
-				"strip-indent": "^3.0.0"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "2.20.3",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-					"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-					"dev": true
-				},
-				"doctrine": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-					"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-					"dev": true,
-					"requires": {
-						"esutils": "^2.0.2"
-					}
-				}
-			}
-		},
-		"react-docgen-typescript": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz",
-			"integrity": "sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==",
-			"dev": true
-		},
-		"react-dom": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-			"integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-			"requires": {
-				"loose-envify": "^1.1.0",
-				"scheduler": "^0.23.0"
-			}
-		},
-		"react-easy-crop": {
-			"version": "4.5.1",
-			"resolved": "https://registry.npmjs.org/react-easy-crop/-/react-easy-crop-4.5.1.tgz",
-			"integrity": "sha512-MVzCWmKXTwZTK0iYqlF/gPLdLqvUGrLGX7SQ4g+DO3b/lCiVAwxZKLeZ1wjDfG+r/yEWUoL7At5a0kkDJeU+rQ==",
-			"requires": {
-				"normalize-wheel": "^1.0.1",
-				"tslib": "2.0.1"
-			},
-			"dependencies": {
-				"tslib": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-					"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
-				}
-			}
-		},
-		"react-element-to-jsx-string": {
-			"version": "15.0.0",
-			"resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-15.0.0.tgz",
-			"integrity": "sha512-UDg4lXB6BzlobN60P8fHWVPX3Kyw8ORrTeBtClmIlGdkOOE+GYQSFvmEU5iLLpwp/6v42DINwNcwOhOLfQ//FQ==",
-			"dev": true,
-			"requires": {
-				"@base2/pretty-print-object": "1.0.1",
-				"is-plain-object": "5.0.0",
-				"react-is": "18.1.0"
-			},
-			"dependencies": {
-				"react-is": {
-					"version": "18.1.0",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-					"integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-					"dev": true
-				}
-			}
-		},
-		"react-freeze": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.3.tgz",
-			"integrity": "sha512-ZnXwLQnGzrDpHBHiC56TXFXvmolPeMjTn1UOm610M4EXGzbEDR7oOIyS2ZiItgbs6eZc4oU/a0hpk8PrcKvv5g=="
-		},
-		"react-inspector": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-6.0.2.tgz",
-			"integrity": "sha512-x+b7LxhmHXjHoU/VrFAzw5iutsILRoYyDq97EDYdFpPLcvqtEzk4ZSZSQjnFPbr5T57tLXnHcqFYoN1pI6u8uQ==",
-			"dev": true
-		},
-		"react-is": {
-			"version": "16.13.1",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-		},
-		"react-native": {
-			"version": "0.71.11",
-			"resolved": "https://registry.npmjs.org/react-native/-/react-native-0.71.11.tgz",
-			"integrity": "sha512-++8IxgUe4Ev+bTiFlLfJCdSoE5cReVP1DTpVJ8f/QtzaxA3h1008Y3Xah1Q5vsR4rZcYMO7Pn3af+wOshdQFug==",
-			"requires": {
-				"@jest/create-cache-key-function": "^29.2.1",
-				"@react-native-community/cli": "10.2.4",
-				"@react-native-community/cli-platform-android": "10.2.0",
-				"@react-native-community/cli-platform-ios": "10.2.4",
-				"@react-native/assets": "1.0.0",
-				"@react-native/normalize-color": "2.1.0",
-				"@react-native/polyfills": "2.0.0",
-				"abort-controller": "^3.0.0",
-				"anser": "^1.4.9",
-				"base64-js": "^1.1.2",
-				"deprecated-react-native-prop-types": "^3.0.1",
-				"event-target-shim": "^5.0.1",
-				"invariant": "^2.2.4",
-				"jest-environment-node": "^29.2.1",
-				"jsc-android": "^250231.0.0",
-				"memoize-one": "^5.0.0",
-				"metro-react-native-babel-transformer": "0.73.10",
-				"metro-runtime": "0.73.10",
-				"metro-source-map": "0.73.10",
-				"mkdirp": "^0.5.1",
-				"nullthrows": "^1.1.1",
-				"pretty-format": "^26.5.2",
-				"promise": "^8.3.0",
-				"react-devtools-core": "^4.26.1",
-				"react-native-codegen": "^0.71.5",
-				"react-native-gradle-plugin": "^0.71.19",
-				"react-refresh": "^0.4.0",
-				"react-shallow-renderer": "^16.15.0",
-				"regenerator-runtime": "^0.13.2",
-				"scheduler": "^0.23.0",
-				"stacktrace-parser": "^0.1.3",
-				"use-sync-external-store": "^1.0.0",
-				"whatwg-fetch": "^3.0.0",
-				"ws": "^6.2.2"
-			},
-			"dependencies": {
-				"@jest/types": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-					"integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
-					"requires": {
-						"@types/istanbul-lib-coverage": "^2.0.0",
-						"@types/istanbul-reports": "^3.0.0",
-						"@types/node": "*",
-						"@types/yargs": "^15.0.0",
-						"chalk": "^4.0.0"
-					}
-				},
-				"@react-native-community/cli": {
-					"version": "10.2.4",
-					"resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-10.2.4.tgz",
-					"integrity": "sha512-E9BUDHfLEsnjkjeJqECuCjl4E/1Ox9Nl6hkQBhEqjZm4AaQxgU7M6AyFfOgaXn5v3am16/R4ZOUTrJnGJWS3GA==",
-					"requires": {
-						"@react-native-community/cli-clean": "^10.1.1",
-						"@react-native-community/cli-config": "^10.1.1",
-						"@react-native-community/cli-debugger-ui": "^10.0.0",
-						"@react-native-community/cli-doctor": "^10.2.4",
-						"@react-native-community/cli-hermes": "^10.2.0",
-						"@react-native-community/cli-plugin-metro": "^10.2.3",
-						"@react-native-community/cli-server-api": "^10.1.1",
-						"@react-native-community/cli-tools": "^10.1.1",
-						"@react-native-community/cli-types": "^10.0.0",
-						"chalk": "^4.1.2",
-						"commander": "^9.4.1",
-						"execa": "^1.0.0",
-						"find-up": "^4.1.0",
-						"fs-extra": "^8.1.0",
-						"graceful-fs": "^4.1.3",
-						"prompts": "^2.4.0",
-						"semver": "^6.3.0"
-					}
-				},
-				"@types/yargs": {
-					"version": "15.0.15",
-					"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz",
-					"integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==",
-					"requires": {
-						"@types/yargs-parser": "*"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"commander": {
-					"version": "9.5.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-					"integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					},
-					"dependencies": {
-						"semver": {
-							"version": "5.7.2",
-							"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-							"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-						}
-					}
-				},
-				"deprecated-react-native-prop-types": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/deprecated-react-native-prop-types/-/deprecated-react-native-prop-types-3.0.1.tgz",
-					"integrity": "sha512-J0jCJcsk4hMlIb7xwOZKLfMpuJn6l8UtrPEzzQV5ewz5gvKNYakhBuq9h2rWX7YwHHJZFhU5W8ye7dB9oN8VcQ==",
-					"requires": {
-						"@react-native/normalize-color": "*",
-						"invariant": "*",
-						"prop-types": "*"
-					}
-				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.6",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-					"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-					"requires": {
-						"minimist": "^1.2.6"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-				},
-				"pretty-format": {
-					"version": "26.6.2",
-					"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-					"integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
-					"requires": {
-						"@jest/types": "^26.6.2",
-						"ansi-regex": "^5.0.0",
-						"ansi-styles": "^4.0.0",
-						"react-is": "^17.0.1"
-					}
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-				},
-				"react-refresh": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
-					"integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA=="
-				},
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"ws": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-					"integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
-					"requires": {
-						"async-limiter": "~1.0.0"
-					}
-				}
-			}
-		},
-		"react-native-animatable": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/react-native-animatable/-/react-native-animatable-1.3.3.tgz",
-			"integrity": "sha512-2ckIxZQAsvWn25Ho+DK3d1mXIgj7tITkrS4pYDvx96WyOttSvzzFeQnM2od0+FUMzILbdHDsDEqZvnz1DYNQ1w==",
-			"requires": {
-				"prop-types": "^15.7.2"
-			}
-		},
-		"react-native-codegen": {
-			"version": "0.71.5",
-			"resolved": "https://registry.npmjs.org/react-native-codegen/-/react-native-codegen-0.71.5.tgz",
-			"integrity": "sha512-rfsuc0zkuUuMjFnrT55I1mDZ+pBRp2zAiRwxck3m6qeGJBGK5OV5JH66eDQ4aa+3m0of316CqrJDRzVlYufzIg==",
-			"requires": {
-				"@babel/parser": "^7.14.0",
-				"flow-parser": "^0.185.0",
-				"jscodeshift": "^0.13.1",
-				"nullthrows": "^1.1.1"
-			}
-		},
-		"react-native-fast-image": {
-			"version": "8.5.11",
-			"resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-8.5.11.tgz",
-			"integrity": "sha512-cNW4bIJg3nvKaheG8vGMfqCt5LMWX9MS5+wMudgKIHbGO51spRr4sgnlhVgwHLcZ5aeNOVJ8CPRxDIWKRq/0QA=="
-		},
-		"react-native-gesture-handler": {
-			"version": "2.10.2",
-			"resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.10.2.tgz",
-			"integrity": "sha512-yUwTrgLinaGRdJN3igL5/QP+09B294EKgoCH7QJ4ABKb4W2mUvSDbbuGMaYBNnwMKAD87Ns2q/qibLWy3E3LTw==",
-			"requires": {
-				"@egjs/hammerjs": "^2.0.17",
-				"hoist-non-react-statics": "^3.3.0",
-				"invariant": "^2.2.4",
-				"lodash": "^4.17.21",
-				"prop-types": "^15.7.2"
-			}
-		},
-		"react-native-get-random-values": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/react-native-get-random-values/-/react-native-get-random-values-1.4.0.tgz",
-			"integrity": "sha512-NnmEZcC5zfz+QEytFPM/fw818Hodw/BNbv7jGxU4pla4K2K9DCzG83IReMJqQ2wo552AYKguqrBG2SSn/U6rbA==",
-			"requires": {
-				"fast-base64-decode": "^1.0.0"
-			}
-		},
-		"react-native-gradle-plugin": {
-			"version": "0.71.19",
-			"resolved": "https://registry.npmjs.org/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.19.tgz",
-			"integrity": "sha512-1dVk9NwhoyKHCSxcrM6vY6cxmojeATsBobDicX0ZKr7DgUF2cBQRTKsimQFvzH8XhOVXyH8p4HyDSZNIFI8OlQ=="
-		},
-		"react-native-linear-gradient": {
-			"version": "2.7.3",
-			"resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.7.3.tgz",
-			"integrity": "sha512-iyJszlZ1Ech2c+2qV+isMvvJKyoctR9ashDkhJg1/cuSF0vQaeLV1FAYTT3qW9doxChJGxVAFfYoxotH0yi3Iw=="
-		},
-		"react-native-modal": {
-			"version": "13.0.1",
-			"resolved": "https://registry.npmjs.org/react-native-modal/-/react-native-modal-13.0.1.tgz",
-			"integrity": "sha512-UB+mjmUtf+miaG/sDhOikRfBOv0gJdBU2ZE1HtFWp6UixW9jCk/bhGdHUgmZljbPpp0RaO/6YiMmQSSK3kkMaw==",
-			"requires": {
-				"prop-types": "^15.6.2",
-				"react-native-animatable": "1.3.3"
-			}
-		},
-		"react-native-reanimated": {
-			"version": "2.17.0",
-			"resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.17.0.tgz",
-			"integrity": "sha512-bVy+FUEaHXq4i+aPPqzGeor1rG4scgVNBbBz21ohvC7iMpB9IIgvGsmy1FAoodZhZ5sa3EPF67Rcec76F1PXlQ==",
-			"requires": {
-				"@babel/plugin-transform-object-assign": "^7.16.7",
-				"@babel/preset-typescript": "^7.16.7",
-				"invariant": "^2.2.4",
-				"lodash.isequal": "^4.5.0",
-				"setimmediate": "^1.0.5",
-				"string-hash-64": "^1.0.3"
-			}
-		},
-		"react-native-safe-area": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/react-native-safe-area/-/react-native-safe-area-0.5.1.tgz",
-			"integrity": "sha512-gBLv93P90sM6hk5HzUwTXzFuSDazTpg2ONi5iL9pnUsUfwdw2L9SKgjgVroxX10leGB9+0zz6/ycV+mItqr8OQ==",
-			"requires": {
-				"@types/react": "^16.8.8"
-			},
-			"dependencies": {
-				"@types/react": {
-					"version": "16.14.44",
-					"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.44.tgz",
-					"integrity": "sha512-TvEx2X0MrSioYQpUSiWe122KeHNmOm5cZd4czKroIc7/cST4IaIgoCplQQ87xucEpOmRtNykq7vR6/4fo93Y+g==",
-					"requires": {
-						"@types/prop-types": "*",
-						"@types/scheduler": "*",
-						"csstype": "^3.0.2"
-					}
-				}
-			}
-		},
-		"react-native-safe-area-context": {
-			"version": "4.6.3",
-			"resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.6.3.tgz",
-			"integrity": "sha512-3CeZM9HFXkuqiU9HqhOQp1yxhXw6q99axPWrT+VJkITd67gnPSU03+U27Xk2/cr9XrLUnakM07kj7H0hdPnFiQ=="
-		},
-		"react-native-sass-transformer": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/react-native-sass-transformer/-/react-native-sass-transformer-1.4.0.tgz",
-			"integrity": "sha512-PlRiaJIcDzYpIVDH0OQuabkMGy/zp7N/A14rqhBrFqhADXC0xR2W53Cb7CicL9CsOL4y7Sh2dv4pgMvqgMdwqQ==",
-			"requires": {
-				"app-root-path": "^2.1.0",
-				"css-to-react-native-transform": "^1.8.1",
-				"semver": "^5.6.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-				}
-			}
-		},
-		"react-native-screens": {
-			"version": "3.22.0",
-			"resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.22.0.tgz",
-			"integrity": "sha512-csLypBSXIt/egh37YJmokETptZJCtZdoZBsZNLR9n31GesDyVogprT+MM22dEPDuxPxt/mFWq+lSpVwk7khuTw==",
-			"requires": {
-				"react-freeze": "^1.0.0",
-				"warn-once": "^0.1.0"
-			}
-		},
-		"react-native-svg": {
-			"version": "13.9.0",
-			"resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.9.0.tgz",
-			"integrity": "sha512-Ey18POH0dA0ob/QiwCBVrxIiwflhYuw0P0hBlOHeY4J5cdbs8ngdKHeWC/Kt9+ryP6fNoEQ1PUgPYw2Bs/rp5Q==",
-			"requires": {
-				"css-select": "^5.1.0",
-				"css-tree": "^1.1.3"
-			}
-		},
-		"react-native-url-polyfill": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-1.1.2.tgz",
-			"integrity": "sha512-RPYwjW+4udnAf26xUCQP2dn4t2tnRFo3Ii4s/hy7Ivpe7xYtXp7CMVX505CR8X3p0f8NKmOJ4MQEFMMnbd/Y/Q==",
-			"dev": true,
-			"requires": {
-				"buffer": "^5.4.3",
-				"whatwg-url-without-unicode": "8.0.0-1"
-			},
-			"dependencies": {
-				"buffer": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-					"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-					"dev": true,
-					"requires": {
-						"base64-js": "^1.3.1",
-						"ieee754": "^1.1.13"
-					}
-				}
-			}
-		},
-		"react-native-video": {
-			"version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz",
-			"integrity": "sha512-3MZ9UsoagCWc5qiQzd2tG5qQbLT+PF8BXjoahEIptQ5mNPX9P4OkJOE3cyoGEDhby6ZYwWvUQNnwhhObhlP0DQ==",
-			"requires": {
-				"deprecated-react-native-prop-types": "^2.2.0",
-				"prop-types": "^15.7.2"
-			}
-		},
-		"react-native-webview": {
-			"version": "11.26.1",
-			"resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.26.1.tgz",
-			"integrity": "sha512-hC7BkxOpf+z0UKhxFSFTPAM4shQzYmZHoELa6/8a/MspcjEP7ukYKpuSUTLDywQditT8yI9idfcKvfZDKQExGw==",
-			"requires": {
-				"escape-string-regexp": "2.0.0",
-				"invariant": "2.2.4"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
-				}
-			}
-		},
-		"react-refresh": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-			"integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
-			"dev": true
-		},
-		"react-remove-scroll": {
-			"version": "2.5.4",
-			"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.4.tgz",
-			"integrity": "sha512-xGVKJJr0SJGQVirVFAUZ2k1QLyO6m+2fy0l8Qawbp5Jgrv3DeLalrfMNBFSlmz5kriGGzsVBtGVnf4pTKIhhWA==",
-			"requires": {
-				"react-remove-scroll-bar": "^2.3.3",
-				"react-style-singleton": "^2.2.1",
-				"tslib": "^2.1.0",
-				"use-callback-ref": "^1.3.0",
-				"use-sidecar": "^1.1.2"
-			}
-		},
-		"react-remove-scroll-bar": {
-			"version": "2.3.4",
-			"resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz",
-			"integrity": "sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==",
-			"requires": {
-				"react-style-singleton": "^2.2.1",
-				"tslib": "^2.0.0"
-			}
-		},
-		"react-resize-detector": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-7.1.2.tgz",
-			"integrity": "sha512-zXnPJ2m8+6oq9Nn8zsep/orts9vQv3elrpA+R8XTcW7DVVUJ9vwDwMXaBtykAYjMnkCIaOoK9vObyR7ZgFNlOw==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.21"
-			}
-		},
-		"react-shallow-renderer": {
-			"version": "16.15.0",
-			"resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz",
-			"integrity": "sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==",
-			"requires": {
-				"object-assign": "^4.1.1",
-				"react-is": "^16.12.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
-		"react-style-singleton": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
-			"integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==",
-			"requires": {
-				"get-nonce": "^1.0.0",
-				"invariant": "^2.2.4",
-				"tslib": "^2.0.0"
-			}
-		},
-		"react-test-renderer": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.2.0.tgz",
-			"integrity": "sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==",
-			"dev": true,
-			"requires": {
-				"react-is": "^18.2.0",
-				"react-shallow-renderer": "^16.15.0",
-				"scheduler": "^0.23.0"
-			},
-			"dependencies": {
-				"react-is": {
-					"version": "18.2.0",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-					"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-					"dev": true
-				}
-			}
-		},
-		"read": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/read/-/read-2.1.0.tgz",
-			"integrity": "sha512-bvxi1QLJHcaywCAEsAk4DG3nVoqiY2Csps3qzWalhj5hFqRn1d/OixkFXtLO1PrgHUcAP0FNaSY/5GYNfENFFQ==",
-			"dev": true,
-			"requires": {
-				"mute-stream": "~1.0.0"
-			},
-			"dependencies": {
-				"mute-stream": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-					"integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
-					"dev": true
-				}
-			}
-		},
-		"read-cmd-shim": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz",
-			"integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==",
-			"dev": true
-		},
-		"read-package-json": {
-			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz",
-			"integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==",
-			"dev": true,
-			"requires": {
-				"glob": "^10.2.2",
-				"json-parse-even-better-errors": "^3.0.0",
-				"normalize-package-data": "^5.0.0",
-				"npm-normalize-package-bin": "^3.0.0"
-			},
-			"dependencies": {
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"foreground-child": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-					"integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"signal-exit": "^4.0.1"
-					}
-				},
-				"glob": {
-					"version": "10.3.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-					"integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
-					"dev": true,
-					"requires": {
-						"foreground-child": "^3.1.0",
-						"jackspeak": "^2.0.3",
-						"minimatch": "^9.0.1",
-						"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-						"path-scurry": "^1.10.1"
-					}
-				},
-				"hosted-git-info": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-					"integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^7.5.1"
-					}
-				},
-				"json-parse-even-better-errors": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
-					"integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==",
-					"dev": true
-				},
-				"lru-cache": {
-					"version": "7.18.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-					"integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "9.0.3",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-					"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				},
-				"minipass": {
-					"version": "7.0.2",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.2.tgz",
-					"integrity": "sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",
-					"integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^6.0.0",
-						"is-core-module": "^2.8.1",
-						"semver": "^7.3.5",
-						"validate-npm-package-license": "^3.0.4"
-					}
-				},
-				"npm-normalize-package-bin": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-					"integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"signal-exit": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-					"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"read-package-json-fast": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz",
-			"integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==",
-			"dev": true,
-			"requires": {
-				"json-parse-even-better-errors": "^3.0.0",
-				"npm-normalize-package-bin": "^3.0.0"
-			},
-			"dependencies": {
-				"json-parse-even-better-errors": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
-					"integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==",
-					"dev": true
-				},
-				"npm-normalize-package-bin": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-					"integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
-					"dev": true
-				}
-			}
-		},
-		"read-pkg": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-			"dev": true,
-			"requires": {
-				"@types/normalize-package-data": "^2.4.0",
-				"normalize-package-data": "^2.5.0",
-				"parse-json": "^5.0.0",
-				"type-fest": "^0.6.0"
-			}
-		},
-		"read-pkg-up": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-			"dev": true,
-			"requires": {
-				"find-up": "^4.1.0",
-				"read-pkg": "^5.2.0",
-				"type-fest": "^0.8.1"
-			},
-			"dependencies": {
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"dev": true,
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"type-fest": {
-					"version": "0.8.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-					"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-					"dev": true
-				}
-			}
-		},
-		"readable-stream": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-			"requires": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
-			}
-		},
-		"readdir-glob": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
-			"integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
-			"dev": true,
-			"requires": {
-				"minimatch": "^5.1.0"
-			},
-			"dependencies": {
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"minimatch": {
-					"version": "5.1.6",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-					"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				}
-			}
-		},
-		"readdirp": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-			"dev": true,
-			"requires": {
-				"picomatch": "^2.2.1"
-			}
-		},
-		"readline": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz",
-			"integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="
-		},
-		"reakit": {
-			"version": "1.3.11",
-			"resolved": "https://registry.npmjs.org/reakit/-/reakit-1.3.11.tgz",
-			"integrity": "sha512-mYxw2z0fsJNOQKAEn5FJCPTU3rcrY33YZ/HzoWqZX0G7FwySp1wkCYW79WhuYMNIUFQ8s3Baob1RtsEywmZSig==",
-			"requires": {
-				"@popperjs/core": "^2.5.4",
-				"body-scroll-lock": "^3.1.5",
-				"reakit-system": "^0.15.2",
-				"reakit-utils": "^0.15.2",
-				"reakit-warning": "^0.6.2"
-			}
-		},
-		"reakit-system": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/reakit-system/-/reakit-system-0.15.2.tgz",
-			"integrity": "sha512-TvRthEz0DmD0rcJkGamMYx+bATwnGNWJpe/lc8UV2Js8nnPvkaxrHk5fX9cVASFrWbaIyegZHCWUBfxr30bmmA==",
-			"requires": {
-				"reakit-utils": "^0.15.2"
-			}
-		},
-		"reakit-utils": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/reakit-utils/-/reakit-utils-0.15.2.tgz",
-			"integrity": "sha512-i/RYkq+W6hvfFmXw5QW7zvfJJT/K8a4qZ0hjA79T61JAFPGt23DsfxwyBbyK91GZrJ9HMrXFVXWMovsKBc1qEQ=="
-		},
-		"reakit-warning": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/reakit-warning/-/reakit-warning-0.6.2.tgz",
-			"integrity": "sha512-z/3fvuc46DJyD3nJAUOto6inz2EbSQTjvI/KBQDqxwB0y02HDyeP8IWOJxvkuAUGkWpeSx+H3QWQFSNiPcHtmw==",
-			"requires": {
-				"reakit-utils": "^0.15.2"
-			}
-		},
-		"reassure": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/reassure/-/reassure-0.7.1.tgz",
-			"integrity": "sha512-dCDo4AInl48Q66PAbF3JzV5WVGIQu2AiCNAy+zhcZ0ESalb4zsVuAvhLdgXCsWr9DhPju63rEGgoNWl9noDVKg==",
-			"dev": true,
-			"requires": {
-				"@callstack/reassure-cli": "0.6.1",
-				"@callstack/reassure-danger": "0.1.1",
-				"@callstack/reassure-measure": "0.3.1"
-			}
-		},
-		"recast": {
-			"version": "0.20.5",
-			"resolved": "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz",
-			"integrity": "sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==",
-			"requires": {
-				"ast-types": "0.14.2",
-				"esprima": "~4.0.0",
-				"source-map": "~0.6.1",
-				"tslib": "^2.0.1"
-			}
-		},
-		"rechoir": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
-			"dev": true,
-			"requires": {
-				"resolve": "^1.20.0"
-			}
-		},
-		"redent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-			"dev": true,
-			"requires": {
-				"indent-string": "^4.0.0",
-				"strip-indent": "^3.0.0"
-			},
-			"dependencies": {
-				"indent-string": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-					"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-					"dev": true
-				}
-			}
-		},
-		"redux": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz",
-			"integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==",
-			"requires": {
-				"@babel/runtime": "^7.9.2"
-			}
-		},
-		"regenerate": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
-		},
-		"regenerate-unicode-properties": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-			"integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-			"requires": {
-				"regenerate": "^1.4.2"
-			}
-		},
-		"regenerator-runtime": {
-			"version": "0.13.11",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-			"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-		},
-		"regenerator-transform": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-			"integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.8.4"
-			}
-		},
-		"regex-not": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-			"requires": {
-				"extend-shallow": "^3.0.2",
-				"safe-regex": "^1.1.0"
-			}
-		},
-		"regexp.prototype.flags": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-			"integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.2.0",
-				"functions-have-names": "^1.2.3"
-			}
-		},
-		"regexpp": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-			"dev": true
-		},
-		"regexpu-core": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-			"integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
-			"requires": {
-				"@babel/regjsgen": "^0.8.0",
-				"regenerate": "^1.4.2",
-				"regenerate-unicode-properties": "^10.1.0",
-				"regjsparser": "^0.9.1",
-				"unicode-match-property-ecmascript": "^2.0.0",
-				"unicode-match-property-value-ecmascript": "^2.1.0"
-			}
-		},
-		"regjsparser": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-			"requires": {
-				"jsesc": "~0.5.0"
-			},
-			"dependencies": {
-				"jsesc": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-					"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
-				}
-			}
-		},
-		"relateurl": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-			"integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-			"dev": true
-		},
-		"remark": {
-			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/remark/-/remark-10.0.1.tgz",
-			"integrity": "sha512-E6lMuoLIy2TyiokHprMjcWNJ5UxfGQjaMSMhV+f4idM625UjjK4j798+gPs5mfjzDE6vL0oFKVeZM6gZVSVrzQ==",
-			"dev": true,
-			"requires": {
-				"remark-parse": "^6.0.0",
-				"remark-stringify": "^6.0.0",
-				"unified": "^7.0.0"
-			}
-		},
-		"remark-external-links": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/remark-external-links/-/remark-external-links-8.0.0.tgz",
-			"integrity": "sha512-5vPSX0kHoSsqtdftSHhIYofVINC8qmp0nctkeU9YoJwV3YfiBRiI6cbFRJ0oI/1F9xS+bopXG0m2KS8VFscuKA==",
-			"dev": true,
-			"requires": {
-				"extend": "^3.0.0",
-				"is-absolute-url": "^3.0.0",
-				"mdast-util-definitions": "^4.0.0",
-				"space-separated-tokens": "^1.0.0",
-				"unist-util-visit": "^2.0.0"
-			},
-			"dependencies": {
-				"unist-util-is": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-					"integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-					"dev": true
-				},
-				"unist-util-visit": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-					"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-					"dev": true,
-					"requires": {
-						"@types/unist": "^2.0.0",
-						"unist-util-is": "^4.0.0",
-						"unist-util-visit-parents": "^3.0.0"
-					}
-				},
-				"unist-util-visit-parents": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-					"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-					"dev": true,
-					"requires": {
-						"@types/unist": "^2.0.0",
-						"unist-util-is": "^4.0.0"
-					}
-				}
-			}
-		},
-		"remark-parse": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-6.0.3.tgz",
-			"integrity": "sha512-QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg==",
-			"dev": true,
-			"requires": {
-				"collapse-white-space": "^1.0.2",
-				"is-alphabetical": "^1.0.0",
-				"is-decimal": "^1.0.0",
-				"is-whitespace-character": "^1.0.0",
-				"is-word-character": "^1.0.0",
-				"markdown-escapes": "^1.0.0",
-				"parse-entities": "^1.1.0",
-				"repeat-string": "^1.5.4",
-				"state-toggle": "^1.0.0",
-				"trim": "0.0.1",
-				"trim-trailing-lines": "^1.0.0",
-				"unherit": "^1.0.4",
-				"unist-util-remove-position": "^1.0.0",
-				"vfile-location": "^2.0.0",
-				"xtend": "^4.0.1"
-			}
-		},
-		"remark-slug": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/remark-slug/-/remark-slug-6.1.0.tgz",
-			"integrity": "sha512-oGCxDF9deA8phWvxFuyr3oSJsdyUAxMFbA0mZ7Y1Sas+emILtO+e5WutF9564gDsEN4IXaQXm5pFo6MLH+YmwQ==",
-			"dev": true,
-			"requires": {
-				"github-slugger": "^1.0.0",
-				"mdast-util-to-string": "^1.0.0",
-				"unist-util-visit": "^2.0.0"
-			},
-			"dependencies": {
-				"unist-util-is": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-					"integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-					"dev": true
-				},
-				"unist-util-visit": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-					"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-					"dev": true,
-					"requires": {
-						"@types/unist": "^2.0.0",
-						"unist-util-is": "^4.0.0",
-						"unist-util-visit-parents": "^3.0.0"
-					}
-				},
-				"unist-util-visit-parents": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-					"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-					"dev": true,
-					"requires": {
-						"@types/unist": "^2.0.0",
-						"unist-util-is": "^4.0.0"
-					}
-				}
-			}
-		},
-		"remark-stringify": {
-			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-6.0.4.tgz",
-			"integrity": "sha512-eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg==",
-			"dev": true,
-			"requires": {
-				"ccount": "^1.0.0",
-				"is-alphanumeric": "^1.0.0",
-				"is-decimal": "^1.0.0",
-				"is-whitespace-character": "^1.0.0",
-				"longest-streak": "^2.0.1",
-				"markdown-escapes": "^1.0.0",
-				"markdown-table": "^1.1.0",
-				"mdast-util-compact": "^1.0.0",
-				"parse-entities": "^1.0.2",
-				"repeat-string": "^1.5.4",
-				"state-toggle": "^1.0.0",
-				"stringify-entities": "^1.0.1",
-				"unherit": "^1.0.4",
-				"xtend": "^4.0.1"
-			}
-		},
-		"rememo": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/rememo/-/rememo-4.0.2.tgz",
-			"integrity": "sha512-NVfSP9NstE3QPNs/TnegQY0vnJnstKQSpcrsI2kBTB3dB2PkdfKdTa+abbjMIDqpc63fE5LfjLgfMst0ULMFxQ=="
-		},
-		"remove-accents": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
-			"integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A=="
-		},
-		"remove-trailing-separator": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-			"integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
-			"dev": true,
-			"optional": true
-		},
-		"renderkid": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-			"integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-			"dev": true,
-			"requires": {
-				"css-select": "^4.1.3",
-				"dom-converter": "^0.2.0",
-				"htmlparser2": "^6.1.0",
-				"lodash": "^4.17.21",
-				"strip-ansi": "^6.0.1"
-			},
-			"dependencies": {
-				"css-select": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-					"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0",
-						"css-what": "^6.0.1",
-						"domhandler": "^4.3.1",
-						"domutils": "^2.8.0",
-						"nth-check": "^2.0.1"
-					}
-				},
-				"dom-serializer": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-					"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.2.0",
-						"entities": "^2.0.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domhandler": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-					"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.2.0"
-					}
-				},
-				"domutils": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.2.0",
-						"domhandler": "^4.2.0"
-					}
-				},
-				"entities": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-					"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-					"dev": true
-				}
-			}
-		},
-		"repeat-element": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
-		},
-		"repeat-string": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="
-		},
-		"replace-ext": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-			"integrity": "sha512-vuNYXC7gG7IeVNBC1xUllqCcZKRbJoSPOBhnTEcAIiKCsbuef6zO3F0Rve3isPMMoNoQRWjQwbAgAjHUHniyEA==",
-			"dev": true
-		},
-		"requestidlecallback": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/requestidlecallback/-/requestidlecallback-0.3.0.tgz",
-			"integrity": "sha512-TWHFkT7S9p7IxLC5A1hYmAYQx2Eb9w1skrXmQ+dS1URyvR8tenMLl4lHbqEOUnpEYxNKpkVMXUgknVpBZWXXfQ=="
-		},
-		"require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-		},
-		"require-from-string": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true
-		},
-		"require-main-filename": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-		},
-		"requireindex": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
-			"integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
-			"dev": true
-		},
-		"requires-port": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-			"dev": true
-		},
-		"resize-observer-polyfill": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-			"integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
-			"dev": true
-		},
-		"resolve": {
-			"version": "1.22.4",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
-			"integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
-			"requires": {
-				"is-core-module": "^2.13.0",
-				"path-parse": "^1.0.7",
-				"supports-preserve-symlinks-flag": "^1.0.0"
-			}
-		},
-		"resolve-alpn": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-			"integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-			"dev": true
-		},
-		"resolve-bin": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/resolve-bin/-/resolve-bin-0.4.0.tgz",
-			"integrity": "sha1-RxMiSYkRAa+xmZH+k3ywpfBy5dk=",
-			"dev": true,
-			"requires": {
-				"find-parent-dir": "~0.3.0"
-			}
-		},
-		"resolve-cwd": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-			"dev": true,
-			"requires": {
-				"resolve-from": "^5.0.0"
-			},
-			"dependencies": {
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				}
-			}
-		},
-		"resolve-dir": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-			"integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "^1.2.2",
-				"global-modules": "^0.2.3"
-			},
-			"dependencies": {
-				"global-modules": {
-					"version": "0.2.3",
-					"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-					"integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
-					"dev": true,
-					"requires": {
-						"global-prefix": "^0.1.4",
-						"is-windows": "^0.2.0"
-					}
-				},
-				"global-prefix": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-					"integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
-					"dev": true,
-					"requires": {
-						"homedir-polyfill": "^1.0.0",
-						"ini": "^1.3.4",
-						"is-windows": "^0.2.0",
-						"which": "^1.2.12"
-					}
-				},
-				"is-windows": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-					"integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
-					"dev": true
-				}
-			}
-		},
-		"resolve-from": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-			"integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw=="
-		},
-		"resolve-url": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
-		},
-		"resolve.exports": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
-			"integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
-			"dev": true
-		},
-		"responselike": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-			"integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-			"dev": true,
-			"requires": {
-				"lowercase-keys": "^2.0.0"
-			}
-		},
-		"resq": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/resq/-/resq-1.11.0.tgz",
-			"integrity": "sha512-G10EBz+zAAy3zUd/CDoBbXRL6ia9kOo3xRHrMDsHljI0GDkhYlyjwoCx5+3eCC4swi1uCoZQhskuJkj7Gp57Bw==",
-			"dev": true,
-			"requires": {
-				"fast-deep-equal": "^2.0.1"
-			},
-			"dependencies": {
-				"fast-deep-equal": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-					"integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==",
-					"dev": true
-				}
-			}
-		},
-		"restore-cursor": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-			"integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
-			"dev": true,
-			"requires": {
-				"onetime": "^2.0.0",
-				"signal-exit": "^3.0.2"
-			}
-		},
-		"ret": {
-			"version": "0.1.15",
-			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
-		},
-		"retry": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-			"integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
-			"dev": true
-		},
-		"reusify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true
-		},
-		"rgb2hex": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz",
-			"integrity": "sha512-22MOP1Rh7sAo1BZpDG6R5RFYzR2lYEgwq7HEmyW2qcsOqR2lQKmn+O//xV3YG/0rrhMC6KVX2hU+ZXuaw9a5bw==",
-			"dev": true
-		},
-		"rimraf": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"requires": {
-				"glob": "^7.1.3"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
-			}
-		},
-		"ripemd160": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-			"dev": true,
-			"requires": {
-				"hash-base": "^3.0.0",
-				"inherits": "^2.0.1"
-			}
-		},
-		"robots-parser": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/robots-parser/-/robots-parser-3.0.1.tgz",
-			"integrity": "sha512-s+pyvQeIKIZ0dx5iJiQk1tPLJAWln39+MI5jtM8wnyws+G5azk+dMnMX0qfbqNetKKNgcWWOdi0sfm+FbQbgdQ==",
-			"dev": true
-		},
-		"rrweb-cssom": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
-			"integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
-			"dev": true
-		},
-		"rtlcss": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.0.0.tgz",
-			"integrity": "sha512-j6oypPP+mgFwDXL1JkLCtm6U/DQntMUqlv5SOhpgHhdIE+PmBcjrtAHIpXfbIup47kD5Sgja9JDsDF1NNOsBwQ==",
-			"dev": true,
-			"requires": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0",
-				"postcss": "^8.4.6",
-				"strip-json-comments": "^3.1.1"
-			},
-			"dependencies": {
-				"strip-json-comments": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-					"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-					"dev": true
-				}
-			}
-		},
-		"run-applescript": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz",
-			"integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==",
-			"dev": true,
-			"requires": {
-				"execa": "^5.0.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"human-signals": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-					"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"mimic-fn": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"onetime": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^2.1.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"run-async": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-			"integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-			"dev": true
-		},
-		"run-con": {
-			"version": "1.2.10",
-			"resolved": "https://registry.npmjs.org/run-con/-/run-con-1.2.10.tgz",
-			"integrity": "sha512-n7PZpYmMM26ZO21dd8y3Yw1TRtGABjRtgPSgFS/nhzfvbJMXFtJhJVyEgayMiP+w/23craJjsnfDvx4W4ue/HQ==",
-			"dev": true,
-			"requires": {
-				"deep-extend": "^0.6.0",
-				"ini": "~2.0.0",
-				"minimist": "^1.2.5",
-				"strip-json-comments": "~3.1.1"
-			},
-			"dependencies": {
-				"ini": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-					"integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-					"dev": true
-				},
-				"strip-json-comments": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-					"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-					"dev": true
-				}
-			}
-		},
-		"run-node": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz",
-			"integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==",
-			"dev": true
-		},
-		"run-parallel": {
-			"version": "1.1.9",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-			"integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
-			"dev": true
-		},
-		"run-queue": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-			"integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==",
-			"dev": true,
-			"requires": {
-				"aproba": "^1.1.1"
-			}
-		},
-		"rungen": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/rungen/-/rungen-0.3.2.tgz",
-			"integrity": "sha512-zWl10xu2D7zoR8zSC2U6bg5bYF6T/Wk7rxwp8IPaJH7f0Ge21G03kNHVgHR7tyVkSSfAOG0Rqf/Cl38JftSmtw=="
-		},
-		"rx": {
-			"version": "2.3.24",
-			"resolved": "https://registry.npmjs.org/rx/-/rx-2.3.24.tgz",
-			"integrity": "sha512-Ue4ZB7Dzbn2I9sIj8ws536nOP2S53uypyCkCz9q0vlYD5Kn6/pu4dE+wt2ZfFzd9m73hiYKnnCb1OyKqc+MRkg==",
-			"dev": true
-		},
-		"rxjs": {
-			"version": "6.6.7",
-			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-			"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-			"dev": true,
-			"requires": {
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
-			}
-		},
-		"safaridriver": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/safaridriver/-/safaridriver-0.1.0.tgz",
-			"integrity": "sha512-azzzIP3gR1TB9bVPv7QO4Zjw0rR1BWEU/s2aFdUMN48gxDjxEB13grAEuXDmkKPgE74cObymDxmAmZnL3clj4w==",
-			"dev": true
-		},
-		"safe-array-concat": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-			"integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.2.0",
-				"has-symbols": "^1.0.3",
-				"isarray": "^2.0.5"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-					"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-					"dev": true
-				}
-			}
-		},
-		"safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-		},
-		"safe-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-			"integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
-			"requires": {
-				"ret": "~0.1.10"
-			}
-		},
-		"safe-regex-test": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-			"integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.3",
-				"is-regex": "^1.1.4"
-			}
-		},
-		"safe-stable-stringify": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
-			"integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
-			"dev": true
-		},
-		"safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-		},
-		"sanitize-filename": {
-			"version": "1.6.3",
-			"resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz",
-			"integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==",
-			"dev": true,
-			"requires": {
-				"truncate-utf8-bytes": "^1.0.0"
-			}
-		},
-		"sass": {
-			"version": "1.35.2",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.35.2.tgz",
-			"integrity": "sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==",
-			"dev": true,
-			"requires": {
-				"chokidar": ">=3.0.0 <4.0.0"
-			}
-		},
-		"sass-loader": {
-			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.1.0.tgz",
-			"integrity": "sha512-FVJZ9kxVRYNZTIe2xhw93n3xJNYZADr+q69/s98l9nTCrWASo+DR2Ot0s5xTKQDDEosUkatsGeHxcH4QBp5bSg==",
-			"dev": true,
-			"requires": {
-				"klona": "^2.0.4",
-				"neo-async": "^2.6.2"
-			}
-		},
-		"saxes": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
-			"integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
-			"dev": true,
-			"requires": {
-				"xmlchars": "^2.2.0"
-			}
-		},
-		"scheduler": {
-			"version": "0.23.0",
-			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-			"integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
-			"requires": {
-				"loose-envify": "^1.1.0"
-			}
-		},
-		"schema-utils": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-			"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-			"dev": true,
-			"requires": {
-				"ajv": "^6.1.0",
-				"ajv-errors": "^1.0.0",
-				"ajv-keywords": "^3.1.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				}
-			}
-		},
-		"seedrandom": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-			"integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
-			"dev": true
-		},
-		"select": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-			"integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
-		},
-		"select-hose": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-			"dev": true
-		},
-		"selfsigned": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-			"integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-			"dev": true,
-			"requires": {
-				"node-forge": "^1"
-			}
-		},
-		"semver": {
-			"version": "7.5.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-			"dev": true,
-			"requires": {
-				"lru-cache": "^6.0.0"
-			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"dev": true,
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				}
-			}
-		},
-		"semver-compare": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-			"integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-			"dev": true
-		},
-		"send": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-			"requires": {
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"fresh": "0.5.2",
-				"http-errors": "2.0.0",
-				"mime": "1.6.0",
-				"ms": "2.1.3",
-				"on-finished": "2.4.1",
-				"range-parser": "~1.2.1",
-				"statuses": "2.0.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					},
-					"dependencies": {
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-						}
-					}
-				},
-				"depd": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-					"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-				},
-				"mime": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-					"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-				},
-				"ms": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-				},
-				"on-finished": {
-					"version": "2.4.1",
-					"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-					"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-					"requires": {
-						"ee-first": "1.1.1"
-					}
-				},
-				"statuses": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-					"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-				}
-			}
-		},
-		"sentence-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz",
-			"integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==",
-			"requires": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3",
-				"upper-case-first": "^2.0.2"
-			}
-		},
-		"serialize-error": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
-			"integrity": "sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw=="
-		},
-		"serialize-javascript": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-			"integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-			"dev": true,
-			"requires": {
-				"randombytes": "^2.1.0"
-			}
-		},
-		"serve-favicon": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz",
-			"integrity": "sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==",
-			"dev": true,
-			"requires": {
-				"etag": "~1.8.1",
-				"fresh": "0.5.2",
-				"ms": "2.1.1",
-				"parseurl": "~1.3.2",
-				"safe-buffer": "5.1.1"
-			},
-			"dependencies": {
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-					"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-					"dev": true
-				}
-			}
-		},
-		"serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-			"dev": true,
-			"requires": {
-				"accepts": "~1.3.4",
-				"batch": "0.6.1",
-				"debug": "2.6.9",
-				"escape-html": "~1.0.3",
-				"http-errors": "~1.6.2",
-				"mime-types": "~2.1.17",
-				"parseurl": "~1.3.2"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-					"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-					"dev": true,
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-					"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-					"dev": true
-				}
-			}
-		},
-		"serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-			"requires": {
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"parseurl": "~1.3.3",
-				"send": "0.18.0"
-			}
-		},
-		"set-blocking": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-			"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
-		},
-		"set-value": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-extendable": "^0.1.1",
-				"is-plain-object": "^2.0.3",
-				"split-string": "^3.0.1"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-plain-object": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-					"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-					"requires": {
-						"isobject": "^3.0.1"
-					}
-				}
-			}
-		},
-		"setimmediate": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
-		},
-		"setprototypeof": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-		},
-		"sha.js": {
-			"version": "2.4.11",
-			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"shallow-clone": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-			"requires": {
-				"kind-of": "^6.0.2"
-			}
-		},
-		"sharp": {
-			"version": "0.32.6",
-			"resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
-			"integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"color": "^4.2.3",
-				"detect-libc": "^2.0.2",
-				"node-addon-api": "^6.1.0",
-				"prebuild-install": "^7.1.1",
-				"semver": "^7.5.4",
-				"simple-get": "^4.0.1",
-				"tar-fs": "^3.0.4",
-				"tunnel-agent": "^0.6.0"
-			},
-			"dependencies": {
-				"node-addon-api": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
-					"integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
-					"dev": true,
-					"optional": true
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"tar-fs": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
-					"integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"mkdirp-classic": "^0.5.2",
-						"pump": "^3.0.0",
-						"tar-stream": "^3.1.5"
-					}
-				},
-				"tar-stream": {
-					"version": "3.1.6",
-					"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-					"integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"b4a": "^1.6.4",
-						"fast-fifo": "^1.2.0",
-						"streamx": "^2.15.0"
-					}
-				}
-			}
-		},
-		"shebang-command": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-			"integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-			"requires": {
-				"shebang-regex": "^1.0.0"
-			}
-		},
-		"shebang-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-			"integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
-		},
-		"shell-quote": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-			"integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="
-		},
-		"shiki": {
-			"version": "0.14.4",
-			"resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.4.tgz",
-			"integrity": "sha512-IXCRip2IQzKwxArNNq1S+On4KPML3Yyn8Zzs/xRgcgOWIr8ntIK3IKzjFPfjy/7kt9ZMjc+FItfqHRBg8b6tNQ==",
-			"dev": true,
-			"requires": {
-				"ansi-sequence-parser": "^1.1.0",
-				"jsonc-parser": "^3.2.0",
-				"vscode-oniguruma": "^1.7.0",
-				"vscode-textmate": "^8.0.0"
-			},
-			"dependencies": {
-				"jsonc-parser": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-					"integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-					"dev": true
-				}
-			}
-		},
-		"showdown": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz",
-			"integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==",
-			"requires": {
-				"yargs": "^14.2"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-					"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
-				},
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"cliui": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-					"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-					"requires": {
-						"string-width": "^3.1.0",
-						"strip-ansi": "^5.2.0",
-						"wrap-ansi": "^5.1.0"
-					}
-				},
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-					"requires": {
-						"p-try": "^2.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-				},
-				"string-width": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-					"requires": {
-						"ansi-regex": "^4.1.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-					"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"yargs": {
-					"version": "14.2.3",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
-					"integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
-					"requires": {
-						"cliui": "^5.0.0",
-						"decamelize": "^1.2.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^2.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^2.0.0",
-						"set-blocking": "^2.0.0",
-						"string-width": "^3.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^4.0.0",
-						"yargs-parser": "^15.0.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "15.0.3",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz",
-					"integrity": "sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==",
-					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
-					}
-				}
-			}
-		},
-		"side-channel": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.0",
-				"get-intrinsic": "^1.0.2",
-				"object-inspect": "^1.9.0"
-			}
-		},
-		"signal-exit": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-		},
-		"sigstore": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.8.0.tgz",
-			"integrity": "sha512-ogU8qtQ3VFBawRJ8wjsBEX/vIFeHuGs1fm4jZtjWQwjo8pfAt7T/rh+udlAN4+QUe0IzA8qRSc/YZ7dHP6kh+w==",
-			"dev": true,
-			"requires": {
-				"@sigstore/bundle": "^1.0.0",
-				"@sigstore/protobuf-specs": "^0.2.0",
-				"@sigstore/tuf": "^1.0.3",
-				"make-fetch-happen": "^11.0.1"
-			}
-		},
-		"simple-concat": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-			"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-			"dev": true,
-			"optional": true
-		},
-		"simple-get": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-			"integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"decompress-response": "^6.0.0",
-				"once": "^1.3.1",
-				"simple-concat": "^1.0.0"
-			}
-		},
-		"simple-git": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz",
-			"integrity": "sha512-fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA==",
-			"dev": true,
-			"requires": {
-				"@kwsites/file-exists": "^1.1.1",
-				"@kwsites/promise-deferred": "^1.1.1",
-				"debug": "^4.3.3"
-			}
-		},
-		"simple-html-tokenizer": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/simple-html-tokenizer/-/simple-html-tokenizer-0.5.7.tgz",
-			"integrity": "sha512-APW9iYbkJ5cijjX4Ljhf3VG8SwYPUJT5gZrwci/wieMabQxWFiV5VwsrP5c6GMRvXKEQMGkAB1d9dvW66dTqpg=="
-		},
-		"simple-peer": {
-			"version": "9.11.1",
-			"resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-9.11.1.tgz",
-			"integrity": "sha512-D1SaWpOW8afq1CZGWB8xTfrT3FekjQmPValrqncJMX7QFl8YwhrPTZvMCANLtgBwwdS+7zURyqxDDEmY558tTw==",
-			"requires": {
-				"buffer": "^6.0.3",
-				"debug": "^4.3.2",
-				"err-code": "^3.0.1",
-				"get-browser-rtc": "^1.1.0",
-				"queue-microtask": "^1.2.3",
-				"randombytes": "^2.1.0",
-				"readable-stream": "^3.6.0"
-			},
-			"dependencies": {
-				"buffer": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-					"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-					"requires": {
-						"base64-js": "^1.3.1",
-						"ieee754": "^1.2.1"
-					}
-				},
-				"err-code": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/err-code/-/err-code-3.0.1.tgz",
-					"integrity": "sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA=="
-				},
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"simple-swizzle": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-			"integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-			"requires": {
-				"is-arrayish": "^0.3.1"
-			},
-			"dependencies": {
-				"is-arrayish": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-					"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-				}
-			}
-		},
-		"simple-update-notifier": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
-			"integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
-			"dev": true,
-			"requires": {
-				"semver": "^7.5.3"
-			}
-		},
-		"sirv": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.3.tgz",
-			"integrity": "sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==",
-			"dev": true,
-			"requires": {
-				"@polka/url": "^1.0.0-next.20",
-				"mrmime": "^1.0.0",
-				"totalist": "^3.0.0"
-			}
-		},
-		"sisteransi": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
-		},
-		"slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
-		},
-		"slice-ansi": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-			"integrity": "sha512-up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==",
-			"dev": true
-		},
-		"smart-buffer": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-			"integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-			"dev": true
-		},
-		"snake-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz",
-			"integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==",
-			"requires": {
-				"dot-case": "^3.0.4",
-				"tslib": "^2.0.3"
-			}
-		},
-		"snapdragon": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-			"requires": {
-				"base": "^0.11.1",
-				"debug": "^2.2.0",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"map-cache": "^0.2.2",
-				"source-map": "^0.5.6",
-				"source-map-resolve": "^0.5.0",
-				"use": "^3.1.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-				}
-			}
-		},
-		"snapdragon-node": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-			"requires": {
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.0",
-				"snapdragon-util": "^3.0.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
-			}
-		},
-		"snapdragon-util": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-			"requires": {
-				"kind-of": "^3.2.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"snapshot-diff": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/snapshot-diff/-/snapshot-diff-0.10.0.tgz",
-			"integrity": "sha512-tbThBMguEG4TQNPfYD5VDAYbmxsSnu+VQSLElWfDBdebLKqXZa14hap8LqxAwD9w8CT4dfS+Ga9+7JMmHMU98g==",
-			"dev": true,
-			"requires": {
-				"jest-diff": "^29.0.0",
-				"jest-snapshot": "^29.0.0",
-				"pretty-format": "^29.0.0"
-			}
-		},
-		"sockjs": {
-			"version": "0.3.24",
-			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-			"dev": true,
-			"requires": {
-				"faye-websocket": "^0.11.3",
-				"uuid": "^8.3.2",
-				"websocket-driver": "^0.7.4"
-			},
-			"dependencies": {
-				"uuid": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-					"dev": true
-				}
-			}
-		},
-		"socks": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-			"integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-			"dev": true,
-			"requires": {
-				"ip": "^2.0.0",
-				"smart-buffer": "^4.2.0"
-			},
-			"dependencies": {
-				"ip": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-					"integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
-					"dev": true
-				}
-			}
-		},
-		"socks-proxy-agent": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
-			"integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
-			"dev": true,
-			"requires": {
-				"agent-base": "^6.0.2",
-				"debug": "^4.3.3",
-				"socks": "^2.6.2"
-			}
-		},
-		"sort-keys": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-			"integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
-			"dev": true,
-			"requires": {
-				"is-plain-obj": "^1.0.0"
-			},
-			"dependencies": {
-				"is-plain-obj": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-					"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-					"dev": true
-				}
-			}
-		},
-		"source-list-map": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-			"integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
-			"dev": true
-		},
-		"source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-		},
-		"source-map-js": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
-			"integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
-			"dev": true
-		},
-		"source-map-loader": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.0.tgz",
-			"integrity": "sha512-GKGWqWvYr04M7tn8dryIWvb0s8YM41z82iQv01yBtIylgxax0CwvSy6gc2Y02iuXwEfGWRlMicH0nvms9UZphw==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.5",
-				"iconv-lite": "^0.6.2",
-				"source-map-js": "^0.6.2"
-			}
-		},
-		"source-map-resolve": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-			"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-			"requires": {
-				"atob": "^2.1.1",
-				"decode-uri-component": "^0.2.0",
-				"resolve-url": "^0.2.1",
-				"source-map-url": "^0.4.0",
-				"urix": "^0.1.0"
-			}
-		},
-		"source-map-support": {
-			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"source-map-url": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
-		},
-		"space-separated-tokens": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-			"integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
-			"dev": true
-		},
-		"spawn-command": {
-			"version": "0.0.2-1",
-			"resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-			"integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==",
-			"dev": true
-		},
-		"spdx-correct": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
-			"integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-			"dev": true,
-			"requires": {
-				"spdx-expression-parse": "^3.0.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"spdx-exceptions": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
-			"integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
-			"dev": true
-		},
-		"spdx-expression-parse": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-			"dev": true,
-			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"spdx-license-ids": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
-			"integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
-			"dev": true
-		},
-		"spdy": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.0",
-				"handle-thing": "^2.0.0",
-				"http-deceiver": "^1.2.7",
-				"select-hose": "^2.0.0",
-				"spdy-transport": "^3.0.0"
-			}
-		},
-		"spdy-transport": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.0",
-				"detect-node": "^2.0.4",
-				"hpack.js": "^2.1.6",
-				"obuf": "^1.1.2",
-				"readable-stream": "^3.0.6",
-				"wbuf": "^1.7.3"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"specificity": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-			"integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
-			"dev": true
-		},
-		"speedline-core": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/speedline-core/-/speedline-core-1.4.3.tgz",
-			"integrity": "sha512-DI7/OuAUD+GMpR6dmu8lliO2Wg5zfeh+/xsdyJZCzd8o5JgFUjCeLsBDuZjIQJdwXS3J0L/uZYrELKYqx+PXog==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"image-ssim": "^0.2.0",
-				"jpeg-js": "^0.4.1"
-			}
-		},
-		"split": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-			"integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-			"dev": true,
-			"requires": {
-				"through": "2"
-			}
-		},
-		"split-on-first": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-			"integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
-		},
-		"split-string": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-			"requires": {
-				"extend-shallow": "^3.0.0"
-			}
-		},
-		"split2": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-			"integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-			"dev": true,
-			"requires": {
-				"readable-stream": "^3.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"sprintf-js": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
-			"integrity": "sha512-h/U+VScR2Ft+aXDjGTLtguUEIrYuOjTj79BAOElUvdahYMaaa7SNLjJpOIn+Uzt0hsgHfYvlbcno3e9yXOSo8Q=="
-		},
-		"ssri": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-			"integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
-			"dev": true,
-			"requires": {
-				"figgy-pudding": "^3.5.1"
-			}
-		},
-		"stack-trace": {
-			"version": "0.0.10",
-			"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-			"integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
-			"dev": true
-		},
-		"stack-utils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-			"integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
-			"requires": {
-				"escape-string-regexp": "^2.0.0"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
-				}
-			}
-		},
-		"stackframe": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz",
-			"integrity": "sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA=="
-		},
-		"stacktrace-parser": {
-			"version": "0.1.10",
-			"resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz",
-			"integrity": "sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==",
-			"requires": {
-				"type-fest": "^0.7.1"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.7.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
-					"integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg=="
-				}
-			}
-		},
-		"state-toggle": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz",
-			"integrity": "sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==",
-			"dev": true
-		},
-		"static-extend": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-			"integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
-			"requires": {
-				"define-property": "^0.2.5",
-				"object-copy": "^0.1.0"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				}
-			}
-		},
-		"statuses": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-			"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
-		},
-		"stop-iteration-iterator": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-			"integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
-			"dev": true,
-			"requires": {
-				"internal-slot": "^1.0.4"
-			}
-		},
-		"store2": {
-			"version": "2.14.2",
-			"resolved": "https://registry.npmjs.org/store2/-/store2-2.14.2.tgz",
-			"integrity": "sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==",
-			"dev": true
-		},
-		"storybook": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/storybook/-/storybook-7.2.2.tgz",
-			"integrity": "sha512-JT4CtVagLi7B5CKFUX/ozRpW3X7z4ffdXaXr4g6uBQjPN8NmvQCCftVIntpiXPKIbQa+cqyOTCNiprGvFnQQfg==",
-			"dev": true,
-			"requires": {
-				"@storybook/cli": "7.2.2"
-			}
-		},
-		"storybook-source-link": {
-			"version": "2.0.9",
-			"resolved": "https://registry.npmjs.org/storybook-source-link/-/storybook-source-link-2.0.9.tgz",
-			"integrity": "sha512-ysQRQ3e6CtJp9uKPRmb6lfQBDl34DrBftKGU4zycHQYESlqOFYRBQ1GgUwN5kL8un2suDqtMc5IHh50fEAmXqg==",
-			"dev": true
-		},
-		"stream-browserify": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-			"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-			"dev": true,
-			"requires": {
-				"inherits": "~2.0.1",
-				"readable-stream": "^2.0.2"
-			}
-		},
-		"stream-buffers": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
-			"integrity": "sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==",
-			"dev": true
-		},
-		"stream-combiner": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-			"integrity": "sha512-6yHMqgLYDzQDcAkL+tjJDC5nSNuNIx0vZtRZeiPh7Saef7VHX9H5Ijn9l2VIol2zaNYlYEX6KyuT/237A58qEQ==",
-			"dev": true,
-			"requires": {
-				"duplexer": "~0.1.1",
-				"through": "~2.3.4"
-			}
-		},
-		"stream-each": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
-			"integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "^1.1.0",
-				"stream-shift": "^1.0.0"
-			}
-		},
-		"stream-http": {
-			"version": "2.8.3",
-			"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-			"integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-			"dev": true,
-			"requires": {
-				"builtin-status-codes": "^3.0.0",
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.3.6",
-				"to-arraybuffer": "^1.0.0",
-				"xtend": "^4.0.0"
-			}
-		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-			"dev": true
-		},
-		"streamx": {
-			"version": "2.15.1",
-			"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz",
-			"integrity": "sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==",
-			"dev": true,
-			"requires": {
-				"fast-fifo": "^1.1.0",
-				"queue-tick": "^1.0.1"
-			}
-		},
-		"strict-uri-encode": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-			"integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="
-		},
-		"string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"requires": {
-				"safe-buffer": "~5.1.0"
-			}
-		},
-		"string-hash-64": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz",
-			"integrity": "sha512-D5OKWKvDhyVWWn2x5Y9b+37NUllks34q1dCDhk/vYcso9fmhs+Tl3KR/gE4v5UNj2UA35cnX4KdVVGkG1deKqw=="
-		},
-		"string-length": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-			"dev": true,
-			"requires": {
-				"char-regex": "^1.0.2",
-				"strip-ansi": "^6.0.0"
-			}
-		},
-		"string-width": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-			"dev": true,
-			"requires": {
-				"is-fullwidth-code-point": "^2.0.0",
-				"strip-ansi": "^4.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
-			}
-		},
-		"string-width-cjs": {
-			"version": "npm:string-width@4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"requires": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				}
-			}
-		},
-		"string.prototype.matchall": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-			"integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4",
-				"get-intrinsic": "^1.1.3",
-				"has-symbols": "^1.0.3",
-				"internal-slot": "^1.0.3",
-				"regexp.prototype.flags": "^1.4.3",
-				"side-channel": "^1.0.4"
-			}
-		},
-		"string.prototype.padend": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz",
-			"integrity": "sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
-			}
-		},
-		"string.prototype.trim": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-			"integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4"
-			}
-		},
-		"string.prototype.trimend": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-			"integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4"
-			}
-		},
-		"string.prototype.trimstart": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-			"integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.20.4"
-			}
-		},
-		"stringify-entities": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz",
-			"integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==",
-			"dev": true,
-			"requires": {
-				"character-entities-html4": "^1.0.0",
-				"character-entities-legacy": "^1.0.0",
-				"is-alphanumerical": "^1.0.0",
-				"is-hexadecimal": "^1.0.0"
-			}
-		},
-		"stringify-object": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-			"integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-			"dev": true,
-			"requires": {
-				"get-own-enumerable-property-symbols": "^3.0.0",
-				"is-obj": "^1.0.1",
-				"is-regexp": "^1.0.0"
-			}
-		},
-		"strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"requires": {
-				"ansi-regex": "^5.0.1"
-			}
-		},
-		"strip-ansi-cjs": {
-			"version": "npm:strip-ansi@6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "^5.0.1"
-			}
-		},
-		"strip-bom": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true
-		},
-		"strip-eof": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-			"integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="
-		},
-		"strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true
-		},
-		"strip-indent": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-			"dev": true,
-			"requires": {
-				"min-indent": "^1.0.0"
-			}
-		},
-		"strip-json-comments": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
-			"integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
-			"dev": true
-		},
-		"strip-outer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
-			"integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^1.0.2"
-			}
-		},
-		"strnum": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
-			"integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
-		},
-		"strong-log-transformer": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
-			"integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==",
-			"dev": true,
-			"requires": {
-				"duplexer": "^0.1.1",
-				"minimist": "^1.2.0",
-				"through": "^2.3.4"
-			}
-		},
-		"style-loader": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.2.1.tgz",
-			"integrity": "sha512-1k9ZosJCRFaRbY6hH49JFlRB0fVSbmnyq1iTPjNxUmGVjBNEmwrrHPenhlp+Lgo51BojHSf6pl2FcqYaN3PfVg==",
-			"dev": true
-		},
-		"style-search": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-			"integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
-			"dev": true
-		},
-		"stylehacks": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.0.tgz",
-			"integrity": "sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.4",
-				"postcss-selector-parser": "^6.0.4"
-			}
-		},
-		"stylelint": {
-			"version": "14.2.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz",
-			"integrity": "sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==",
-			"dev": true,
-			"requires": {
-				"balanced-match": "^2.0.0",
-				"colord": "^2.9.2",
-				"cosmiconfig": "^7.0.1",
-				"debug": "^4.3.3",
-				"execall": "^2.0.0",
-				"fast-glob": "^3.2.7",
-				"fastest-levenshtein": "^1.0.12",
-				"file-entry-cache": "^6.0.1",
-				"get-stdin": "^8.0.0",
-				"global-modules": "^2.0.0",
-				"globby": "^11.0.4",
-				"globjoin": "^0.1.4",
-				"html-tags": "^3.1.0",
-				"ignore": "^5.2.0",
-				"import-lazy": "^4.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-plain-object": "^5.0.0",
-				"known-css-properties": "^0.24.0",
-				"mathml-tag-names": "^2.1.3",
-				"meow": "^9.0.0",
-				"micromatch": "^4.0.4",
-				"normalize-path": "^3.0.0",
-				"normalize-selector": "^0.2.0",
-				"picocolors": "^1.0.0",
-				"postcss": "^8.3.11",
-				"postcss-media-query-parser": "^0.2.3",
-				"postcss-resolve-nested-selector": "^0.1.1",
-				"postcss-safe-parser": "^6.0.0",
-				"postcss-selector-parser": "^6.0.7",
-				"postcss-value-parser": "^4.1.0",
-				"resolve-from": "^5.0.0",
-				"specificity": "^0.4.1",
-				"string-width": "^4.2.3",
-				"strip-ansi": "^6.0.1",
-				"style-search": "^0.1.0",
-				"svg-tags": "^1.0.0",
-				"table": "^6.7.5",
-				"v8-compile-cache": "^2.3.0",
-				"write-file-atomic": "^3.0.3"
-			},
-			"dependencies": {
-				"balanced-match": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-					"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"fast-glob": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-					"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-					"dev": true,
-					"requires": {
-						"@nodelib/fs.stat": "^2.0.2",
-						"@nodelib/fs.walk": "^1.2.3",
-						"glob-parent": "^5.1.2",
-						"merge2": "^1.3.0",
-						"micromatch": "^4.0.4"
-					}
-				},
-				"get-stdin": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-					"integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-					"dev": true
-				},
-				"glob-parent": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"meow": {
-					"version": "9.0.0",
-					"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-					"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-					"dev": true,
-					"requires": {
-						"@types/minimist": "^1.2.0",
-						"camelcase-keys": "^6.2.2",
-						"decamelize": "^1.2.0",
-						"decamelize-keys": "^1.1.0",
-						"hard-rejection": "^2.1.0",
-						"minimist-options": "4.1.0",
-						"normalize-package-data": "^3.0.0",
-						"read-pkg-up": "^7.0.1",
-						"redent": "^3.0.0",
-						"trim-newlines": "^3.0.0",
-						"type-fest": "^0.18.0",
-						"yargs-parser": "^20.2.3"
-					}
-				},
-				"normalize-package-data": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-					"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^4.0.1",
-						"is-core-module": "^2.5.0",
-						"semver": "^7.3.4",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"type-fest": {
-					"version": "0.18.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-					"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-					"dev": true
-				},
-				"write-file-atomic": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-					"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-					"dev": true,
-					"requires": {
-						"imurmurhash": "^0.1.4",
-						"is-typedarray": "^1.0.0",
-						"signal-exit": "^3.0.2",
-						"typedarray-to-buffer": "^3.1.5"
-					}
-				}
-			}
-		},
-		"stylelint-config-recommended": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
-			"integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-			"dev": true
-		},
-		"stylelint-config-recommended-scss": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
-			"integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
-			"dev": true,
-			"requires": {
-				"postcss-scss": "^4.0.2",
-				"stylelint-config-recommended": "^6.0.0",
-				"stylelint-scss": "^4.0.0"
-			},
-			"dependencies": {
-				"postcss-scss": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
-					"integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
-					"dev": true
-				}
-			}
-		},
-		"stylelint-scss": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.1.0.tgz",
-			"integrity": "sha512-BNYTo7MMamhFOlcaAWp2dMpjg6hPyM/FFqfDIYzmYVLMmQJqc8lWRIiTqP4UX5bresj9Vo0dKC6odSh43VP2NA==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.21",
-				"postcss-media-query-parser": "^0.2.3",
-				"postcss-resolve-nested-selector": "^0.1.1",
-				"postcss-selector-parser": "^6.0.6",
-				"postcss-value-parser": "^4.1.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
-			}
-		},
-		"stylis": {
-			"version": "4.0.13",
-			"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",
-			"integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="
-		},
-		"sudo-prompt": {
-			"version": "9.2.1",
-			"resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz",
-			"integrity": "sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw=="
-		},
-		"supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"requires": {
-				"has-flag": "^3.0.0"
-			}
-		},
-		"supports-hyperlinks": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.0.0.tgz",
-			"integrity": "sha512-bFhn0MQ8qefLyJ3K7PpHiPUTuTVPWw6RXfaMeV6xgJLXtBbszyboz1bvGTVv4R0YpQm2DqlXXn0fFHhxUHVE5w==",
-			"dev": true,
-			"requires": {
-				"has-flag": "^4.0.0",
-				"supports-color": "^7.0.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"supports-preserve-symlinks-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
-		},
-		"svg-parser": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
-			"integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
-			"dev": true
-		},
-		"svg-tags": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-			"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-			"dev": true
-		},
-		"svgo": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz",
-			"integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==",
-			"dev": true,
-			"requires": {
-				"@trysound/sax": "0.2.0",
-				"commander": "^7.2.0",
-				"css-select": "^5.1.0",
-				"css-tree": "^2.2.1",
-				"csso": "^5.0.5",
-				"picocolors": "^1.0.0"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-					"dev": true
-				},
-				"css-tree": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-					"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-					"dev": true,
-					"requires": {
-						"mdn-data": "2.0.30",
-						"source-map-js": "^1.0.1"
-					}
-				},
-				"mdn-data": {
-					"version": "2.0.30",
-					"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-					"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-					"dev": true
-				},
-				"source-map-js": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-					"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-					"dev": true
-				}
-			}
-		},
-		"swc-loader": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/swc-loader/-/swc-loader-0.2.3.tgz",
-			"integrity": "sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==",
-			"dev": true
-		},
-		"symbol-observable": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-			"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-			"dev": true
-		},
-		"symbol-tree": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-			"dev": true
-		},
-		"synchronous-promise": {
-			"version": "2.0.15",
-			"resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.15.tgz",
-			"integrity": "sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg==",
-			"dev": true
-		},
-		"synckit": {
-			"version": "0.8.5",
-			"resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz",
-			"integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==",
-			"dev": true,
-			"requires": {
-				"@pkgr/utils": "^2.3.1",
-				"tslib": "^2.5.0"
-			}
-		},
-		"table": {
-			"version": "6.8.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-			"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
-			"dev": true,
-			"requires": {
-				"ajv": "^8.0.1",
-				"lodash.truncate": "^4.4.2",
-				"slice-ansi": "^4.0.0",
-				"string-width": "^4.2.3",
-				"strip-ansi": "^6.0.1"
-			},
-			"dependencies": {
-				"astral-regex": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-					"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"slice-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-					"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"astral-regex": "^2.0.0",
-						"is-fullwidth-code-point": "^3.0.0"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
-			}
-		},
-		"tannin": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/tannin/-/tannin-1.2.0.tgz",
-			"integrity": "sha512-U7GgX/RcSeUETbV7gYgoz8PD7Ni4y95pgIP/Z6ayI3CfhSujwKEBlGFTCRN+Aqnuyf4AN2yHL+L8x+TCGjb9uA==",
-			"requires": {
-				"@tannin/plural-forms": "^1.1.0"
-			}
-		},
-		"tapable": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-			"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-			"dev": true
-		},
-		"tar": {
-			"version": "6.1.11",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-			"integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-			"dev": true,
-			"requires": {
-				"chownr": "^2.0.0",
-				"fs-minipass": "^2.0.0",
-				"minipass": "^3.0.0",
-				"minizlib": "^2.1.1",
-				"mkdirp": "^1.0.3",
-				"yallist": "^4.0.0"
-			},
-			"dependencies": {
-				"chownr": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-					"integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-					"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-					"dev": true
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-					"dev": true
-				}
-			}
-		},
-		"tar-fs": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-			"dev": true,
-			"requires": {
-				"chownr": "^1.1.1",
-				"mkdirp-classic": "^0.5.2",
-				"pump": "^3.0.0",
-				"tar-stream": "^2.1.4"
-			},
-			"dependencies": {
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				}
-			}
-		},
-		"tar-stream": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-			"integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-			"dev": true,
-			"requires": {
-				"bl": "^4.0.3",
-				"end-of-stream": "^1.4.1",
-				"fs-constants": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^3.1.1"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
-			}
-		},
-		"teen_process": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.0.2.tgz",
-			"integrity": "sha512-8Be+s0d3XIs6rosilYTYR8/TY4JfAl8Der8ItWhI/o/MTYGLTcjvNUNk5AU8c1eTpJ98MF0xextE8VJtqhtUcg==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "7.19.0",
-				"bluebird": "3.7.2",
-				"lodash": "4.17.21",
-				"shell-quote": "1.7.3",
-				"source-map-support": "0.5.21",
-				"which": "2.0.2"
-			},
-			"dependencies": {
-				"@babel/runtime": {
-					"version": "7.19.0",
-					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
-					"integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
-					"dev": true,
-					"requires": {
-						"regenerator-runtime": "^0.13.4"
-					}
-				},
-				"shell-quote": {
-					"version": "1.7.3",
-					"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
-					"integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"temp": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz",
-			"integrity": "sha512-jtnWJs6B1cZlHs9wPG7BrowKxZw/rf6+UpGAkr8AaYmiTyTO7zQlLoST8zx/8TcUPnZmeBoB+H8ARuHZaSijVw==",
-			"requires": {
-				"os-tmpdir": "^1.0.0",
-				"rimraf": "~2.2.6"
-			},
-			"dependencies": {
-				"rimraf": {
-					"version": "2.2.8",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-					"integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg=="
-				}
-			}
-		},
-		"temp-dir": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
-			"integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==",
-			"dev": true
-		},
-		"tempy": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/tempy/-/tempy-1.0.1.tgz",
-			"integrity": "sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==",
-			"dev": true,
-			"requires": {
-				"del": "^6.0.0",
-				"is-stream": "^2.0.0",
-				"temp-dir": "^2.0.0",
-				"type-fest": "^0.16.0",
-				"unique-string": "^2.0.0"
-			},
-			"dependencies": {
-				"del": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
-					"integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
-					"dev": true,
-					"requires": {
-						"globby": "^11.0.1",
-						"graceful-fs": "^4.2.4",
-						"is-glob": "^4.0.1",
-						"is-path-cwd": "^2.2.0",
-						"is-path-inside": "^3.0.2",
-						"p-map": "^4.0.0",
-						"rimraf": "^3.0.2",
-						"slash": "^3.0.0"
-					}
-				},
-				"is-path-inside": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-					"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"temp-dir": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
-					"integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
-					"dev": true
-				},
-				"type-fest": {
-					"version": "0.16.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-					"integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
-					"dev": true
-				}
-			}
-		},
-		"terminal-link": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.0.0.tgz",
-			"integrity": "sha512-rdBAY35jUvVapqCuhehjenLbYY73cVgRQ6podD6u9EDBomBBHjCOtmq2InPgPpTysOIOsQ5PdBzwSC/sKjv6ew==",
-			"dev": true,
-			"requires": {
-				"ansi-escapes": "^4.2.1",
-				"supports-hyperlinks": "^2.0.0"
-			}
-		},
-		"terser": {
-			"version": "5.19.2",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-			"integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
-			"requires": {
-				"@jridgewell/source-map": "^0.3.3",
-				"acorn": "^8.8.2",
-				"commander": "^2.20.0",
-				"source-map-support": "~0.5.20"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "8.10.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-					"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
-				},
-				"commander": {
-					"version": "2.20.3",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-					"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-				}
-			}
-		},
-		"terser-webpack-plugin": {
-			"version": "5.3.9",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
-			"integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
-			"dev": true,
-			"requires": {
-				"@jridgewell/trace-mapping": "^0.3.17",
-				"jest-worker": "^27.4.5",
-				"schema-utils": "^3.1.1",
-				"serialize-javascript": "^6.0.1",
-				"terser": "^5.16.8"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"jest-worker": {
-					"version": "27.5.1",
-					"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-					"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-					"dev": true,
-					"requires": {
-						"@types/node": "*",
-						"merge-stream": "^2.0.0",
-						"supports-color": "^8.0.0"
-					}
-				},
-				"schema-utils": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-					"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
-				},
-				"serialize-javascript": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-					"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-					"dev": true,
-					"requires": {
-						"randombytes": "^2.1.0"
-					}
-				},
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"test-exclude": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-			"dev": true,
-			"requires": {
-				"@istanbuljs/schema": "^0.1.2",
-				"glob": "^7.1.4",
-				"minimatch": "^3.0.4"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
-			}
-		},
-		"text-extensions": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
-			"integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
-			"dev": true
-		},
-		"text-hex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
-			"integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
-			"dev": true
-		},
-		"text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-			"dev": true
-		},
-		"third-party-web": {
-			"version": "0.23.4",
-			"resolved": "https://registry.npmjs.org/third-party-web/-/third-party-web-0.23.4.tgz",
-			"integrity": "sha512-kwYnSZRhEvv0SBW2fp8SBBKRglMoBjV8xz6C31m0ewqOtknB5UL+Ihg+M81hyFY5ldkZuGWPb+e4GVDkzf/gYg==",
-			"dev": true
-		},
-		"throat": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
-			"integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA=="
-		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-			"dev": true
-		},
-		"through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-			"requires": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
-			}
-		},
-		"thunky": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-			"dev": true
-		},
-		"timers-browserify": {
-			"version": "2.0.12",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-			"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-			"dev": true,
-			"requires": {
-				"setimmediate": "^1.0.4"
-			}
-		},
-		"tiny-emitter": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-			"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-		},
-		"tiny-invariant": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
-			"integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==",
-			"dev": true
-		},
-		"titleize": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz",
-			"integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==",
-			"dev": true
-		},
-		"tmp": {
-			"version": "0.0.33",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "~1.0.2"
-			}
-		},
-		"tmpl": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
-		},
-		"to-arraybuffer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-			"integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
-			"dev": true
-		},
-		"to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
-		},
-		"to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			}
-		},
-		"to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
-			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
-			}
-		},
-		"tocbot": {
-			"version": "4.21.1",
-			"resolved": "https://registry.npmjs.org/tocbot/-/tocbot-4.21.1.tgz",
-			"integrity": "sha512-IfajhBTeg0HlMXu1f+VMbPef05QpDTsZ9X2Yn1+8npdaXsXg/+wrm9Ze1WG5OS1UDC3qJ5EQN/XOZ3gfXjPFCw==",
-			"dev": true
-		},
-		"toidentifier": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
-		},
-		"totalist": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
-			"integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
-			"dev": true
-		},
-		"tr46": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-			"dev": true
-		},
-		"tree-kill": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-			"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-			"dev": true
-		},
-		"trim": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-			"integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==",
-			"dev": true
-		},
-		"trim-newlines": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-			"dev": true
-		},
-		"trim-repeated": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
-			"integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^1.0.2"
-			}
-		},
-		"trim-trailing-lines": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz",
-			"integrity": "sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==",
-			"dev": true
-		},
-		"triple-beam": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz",
-			"integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==",
-			"dev": true
-		},
-		"trough": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz",
-			"integrity": "sha512-fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw==",
-			"dev": true
-		},
-		"truncate-utf8-bytes": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
-			"integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==",
-			"dev": true,
-			"requires": {
-				"utf8-byte-length": "^1.0.1"
-			}
-		},
-		"ts-api-utils": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.2.tgz",
-			"integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==",
-			"dev": true
-		},
-		"ts-dedent": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
-			"integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
-			"dev": true
-		},
-		"ts-node": {
-			"version": "9.1.1",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
-			"integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
-			"dev": true,
-			"requires": {
-				"arg": "^4.1.0",
-				"create-require": "^1.1.0",
-				"diff": "^4.0.1",
-				"make-error": "^1.1.1",
-				"source-map-support": "^0.5.17",
-				"yn": "3.1.1"
-			}
-		},
-		"tsconfig-paths": {
-			"version": "3.11.0",
-			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz",
-			"integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
-			"dev": true,
-			"requires": {
-				"@types/json5": "^0.0.29",
-				"json5": "^1.0.1",
-				"minimist": "^1.2.0",
-				"strip-bom": "^3.0.0"
-			},
-			"dependencies": {
-				"json5": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-					"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				},
-				"strip-bom": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-					"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-					"dev": true
-				}
-			}
-		},
-		"tslib": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-			"integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
-		},
-		"tsutils": {
-			"version": "3.21.0",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-			"dev": true,
-			"requires": {
-				"tslib": "^1.8.1"
-			},
-			"dependencies": {
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
-			}
-		},
-		"tty-browserify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-			"integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
-			"dev": true
-		},
-		"tuf-js": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz",
-			"integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==",
-			"dev": true,
-			"requires": {
-				"@tufjs/models": "1.0.4",
-				"debug": "^4.3.4",
-				"make-fetch-happen": "^11.1.1"
-			}
-		},
-		"tunnel": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-			"integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-			"dev": true
-		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2"
-			}
-		},
-		"type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
-		},
-		"type-fest": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-			"dev": true
-		},
-		"type-is": {
-			"version": "1.6.18",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-			"dev": true,
-			"requires": {
-				"media-typer": "0.3.0",
-				"mime-types": "~2.1.24"
-			}
-		},
-		"typed-array-buffer": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-			"integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.2.1",
-				"is-typed-array": "^1.1.10"
-			}
-		},
-		"typed-array-byte-length": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-			"integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"for-each": "^0.3.3",
-				"has-proto": "^1.0.1",
-				"is-typed-array": "^1.1.10"
-			}
-		},
-		"typed-array-byte-offset": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-			"integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
-			"dev": true,
-			"requires": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"for-each": "^0.3.3",
-				"has-proto": "^1.0.1",
-				"is-typed-array": "^1.1.10"
-			}
-		},
-		"typed-array-length": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-			"integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"for-each": "^0.3.3",
-				"is-typed-array": "^1.1.9"
-			}
-		},
-		"typed-function": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/typed-function/-/typed-function-2.1.0.tgz",
-			"integrity": "sha512-bctQIOqx2iVbWGDGPWwIm18QScpu2XRmkC19D8rQGFsjKSgteq/o1hTZvIG/wuDq8fanpBDrLkLq+aEN/6y5XQ==",
-			"dev": true
-		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-			"dev": true
-		},
-		"typedarray-to-buffer": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-			"dev": true,
-			"requires": {
-				"is-typedarray": "^1.0.0"
-			}
-		},
-		"typedoc": {
-			"version": "0.23.28",
-			"resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.23.28.tgz",
-			"integrity": "sha512-9x1+hZWTHEQcGoP7qFmlo4unUoVJLB0H/8vfO/7wqTnZxg4kPuji9y3uRzEu0ZKez63OJAUmiGhUrtukC6Uj3w==",
-			"dev": true,
-			"requires": {
-				"lunr": "^2.3.9",
-				"marked": "^4.2.12",
-				"minimatch": "^7.1.3",
-				"shiki": "^0.14.1"
-			},
-			"dependencies": {
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"minimatch": {
-					"version": "7.4.6",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz",
-					"integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				}
-			}
-		},
-		"typedoc-plugin-markdown": {
-			"version": "3.14.0",
-			"resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.14.0.tgz",
-			"integrity": "sha512-UyQLkLRkfTFhLdhSf3RRpA3nNInGn+k6sll2vRXjflaMNwQAAiB61SYbisNZTg16t4K1dt1bPQMMGLrxS0GZ0Q==",
-			"dev": true,
-			"requires": {
-				"handlebars": "^4.7.7"
-			}
-		},
-		"typedoc-plugin-resolve-crossmodule-references": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/typedoc-plugin-resolve-crossmodule-references/-/typedoc-plugin-resolve-crossmodule-references-0.3.3.tgz",
-			"integrity": "sha512-ZWWBy2WR8z9a6iXYGlyB3KrpV+JDdZv1mndYU6Eh6mInrfMCrQJi3Y5K9ihMBfuaBGB//le1nEmQLgzU3IO+dw==",
-			"dev": true
-		},
-		"typescript": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-			"integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
-			"dev": true
-		},
-		"uc.micro": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-			"dev": true
-		},
-		"uglify-es": {
-			"version": "3.3.9",
-			"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
-			"integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
-			"requires": {
-				"commander": "~2.13.0",
-				"source-map": "~0.6.1"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "2.13.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-					"integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="
-				}
-			}
-		},
-		"uglify-js": {
-			"version": "3.13.7",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.7.tgz",
-			"integrity": "sha512-1Psi2MmnZJbnEsgJJIlfnd7tFlJfitusmR7zDI8lXlFI0ACD4/Rm/xdrU8bh6zF0i74aiVoBtkRiFulkrmh3AA==",
-			"dev": true
-		},
-		"unbox-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-			"integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-bigints": "^1.0.2",
-				"has-symbols": "^1.0.3",
-				"which-boxed-primitive": "^1.0.2"
-			}
-		},
-		"unbzip2-stream": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-			"integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-			"dev": true,
-			"requires": {
-				"buffer": "^5.2.1",
-				"through": "^2.3.8"
-			},
-			"dependencies": {
-				"buffer": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-					"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-					"dev": true,
-					"requires": {
-						"base64-js": "^1.3.1",
-						"ieee754": "^1.1.13"
-					}
-				}
-			}
-		},
-		"unherit": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz",
-			"integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"xtend": "^4.0.1"
-			}
-		},
-		"unicode-canonical-property-names-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
-		},
-		"unicode-match-property-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-			"requires": {
-				"unicode-canonical-property-names-ecmascript": "^2.0.0",
-				"unicode-property-aliases-ecmascript": "^2.0.0"
-			}
-		},
-		"unicode-match-property-value-ecmascript": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="
-		},
-		"unicode-property-aliases-ecmascript": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
-		},
-		"unified": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/unified/-/unified-7.1.0.tgz",
-			"integrity": "sha512-lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw==",
-			"dev": true,
-			"requires": {
-				"@types/unist": "^2.0.0",
-				"@types/vfile": "^3.0.0",
-				"bail": "^1.0.0",
-				"extend": "^3.0.0",
-				"is-plain-obj": "^1.1.0",
-				"trough": "^1.0.0",
-				"vfile": "^3.0.0",
-				"x-is-string": "^0.1.0"
-			},
-			"dependencies": {
-				"is-plain-obj": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-					"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-					"dev": true
-				}
-			}
-		},
-		"union-value": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^2.0.1"
-			}
-		},
-		"unique-filename": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-			"dev": true,
-			"requires": {
-				"unique-slug": "^2.0.0"
-			}
-		},
-		"unique-slug": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-			"integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-			"dev": true,
-			"requires": {
-				"imurmurhash": "^0.1.4"
-			}
-		},
-		"unique-string": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-			"integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-			"dev": true,
-			"requires": {
-				"crypto-random-string": "^2.0.0"
-			}
-		},
-		"unist-util-is": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
-			"integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==",
-			"dev": true
-		},
-		"unist-util-modify-children": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.2.tgz",
-			"integrity": "sha512-GRi04yhng1WqBf5RBzPkOtWAadcZS2gvuOgNn/cyJBYNxtTuyYqTKN0eg4rC1YJwGnzrqfRB3dSKm8cNCjNirg==",
-			"dev": true,
-			"requires": {
-				"array-iterate": "^1.0.0"
-			}
-		},
-		"unist-util-remove-position": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz",
-			"integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==",
-			"dev": true,
-			"requires": {
-				"unist-util-visit": "^1.1.0"
-			}
-		},
-		"unist-util-stringify-position": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
-			"integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==",
-			"dev": true
-		},
-		"unist-util-visit": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
-			"integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
-			"dev": true,
-			"requires": {
-				"unist-util-visit-parents": "^2.0.0"
-			}
-		},
-		"unist-util-visit-parents": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz",
-			"integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==",
-			"dev": true,
-			"requires": {
-				"unist-util-is": "^3.0.0"
-			}
-		},
-		"universal-user-agent": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.1.0.tgz",
-			"integrity": "sha512-8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q==",
-			"dev": true,
-			"requires": {
-				"os-name": "^3.0.0"
-			}
-		},
-		"universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-		},
-		"unorm": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
-			"integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==",
-			"dev": true
-		},
-		"unpipe": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
-		},
-		"unplugin": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.4.0.tgz",
-			"integrity": "sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==",
-			"dev": true,
-			"requires": {
-				"acorn": "^8.9.0",
-				"chokidar": "^3.5.3",
-				"webpack-sources": "^3.2.3",
-				"webpack-virtual-modules": "^0.5.0"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "8.10.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-					"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-					"dev": true
-				},
-				"webpack-virtual-modules": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
-					"integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
-					"dev": true
-				}
-			}
-		},
-		"unset-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
-			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ=="
-				}
-			}
-		},
-		"untildify": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-			"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-			"dev": true
-		},
-		"unzipper": {
-			"version": "0.10.14",
-			"resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.14.tgz",
-			"integrity": "sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==",
-			"dev": true,
-			"requires": {
-				"big-integer": "^1.6.17",
-				"binary": "~0.3.0",
-				"bluebird": "~3.4.1",
-				"buffer-indexof-polyfill": "~1.0.0",
-				"duplexer2": "~0.1.4",
-				"fstream": "^1.0.12",
-				"graceful-fs": "^4.2.2",
-				"listenercount": "~1.0.1",
-				"readable-stream": "~2.3.6",
-				"setimmediate": "~1.0.4"
-			},
-			"dependencies": {
-				"bluebird": {
-					"version": "3.4.7",
-					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-					"integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
-					"dev": true
-				}
-			}
-		},
-		"upath": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-			"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-			"dev": true,
-			"optional": true
-		},
-		"update-browserslist-db": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-			"integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
-			"requires": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
-			}
-		},
-		"upper-case": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz",
-			"integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==",
-			"requires": {
-				"tslib": "^2.0.3"
-			}
-		},
-		"upper-case-first": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz",
-			"integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==",
-			"requires": {
-				"tslib": "^2.0.3"
-			}
-		},
-		"uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"dev": true,
-			"requires": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="
-		},
-		"url": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
-			"integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
-			"dev": true,
-			"requires": {
-				"punycode": "^1.4.1",
-				"qs": "^6.11.0"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-					"dev": true
-				}
-			}
-		},
-		"url-loader": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
-			"integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
-			"dev": true,
-			"requires": {
-				"loader-utils": "^2.0.0",
-				"mime-types": "^2.1.27",
-				"schema-utils": "^3.0.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"schema-utils": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-					"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
-				}
-			}
-		},
-		"url-parse": {
-			"version": "1.5.10",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-			"dev": true,
-			"requires": {
-				"querystringify": "^2.1.1",
-				"requires-port": "^1.0.0"
-			}
-		},
-		"url-template": {
-			"version": "2.0.8",
-			"resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
-			"integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==",
-			"dev": true
-		},
-		"use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-		},
-		"use-callback-ref": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.0.tgz",
-			"integrity": "sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==",
-			"requires": {
-				"tslib": "^2.0.0"
-			}
-		},
-		"use-isomorphic-layout-effect": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
-			"integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA=="
-		},
-		"use-latest-callback": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.1.6.tgz",
-			"integrity": "sha512-VO/P91A/PmKH9bcN9a7O3duSuxe6M14ZoYXgA6a8dab8doWNdhiIHzEkX/jFeTTRBsX0Ubk6nG4q2NIjNsj+bg=="
-		},
-		"use-lilius": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/use-lilius/-/use-lilius-2.0.1.tgz",
-			"integrity": "sha512-Dque7ax/91znesQWz2wM95O5iTHWzAsKQa2e7qvyPhXev/UAfgQIiXSqiB96tfiwQ+8+371FDK7oftuzw0Awhg==",
-			"requires": {
-				"date-fns": "^2.28.0"
-			}
-		},
-		"use-memo-one": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.1.tgz",
-			"integrity": "sha512-oFfsyun+bP7RX8X2AskHNTxu+R3QdE/RC5IefMbqptmACAA/gfol1KDD5KRzPsGMa62sWxGZw+Ui43u6x4ddoQ=="
-		},
-		"use-resize-observer": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/use-resize-observer/-/use-resize-observer-9.1.0.tgz",
-			"integrity": "sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==",
-			"dev": true,
-			"requires": {
-				"@juggle/resize-observer": "^3.3.1"
-			}
-		},
-		"use-sidecar": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
-			"integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==",
-			"requires": {
-				"detect-node-es": "^1.1.0",
-				"tslib": "^2.0.0"
-			}
-		},
-		"use-subscription": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/use-subscription/-/use-subscription-1.5.0.tgz",
-			"integrity": "sha512-/FVRiB2I7NDjzWoNBYPt6YkkvleMm/lFtxj1hH6nX2TVrJ/5UTbovw9OE1efv2Zl0HoAYuTjM7zHd9OsABn5sg==",
-			"requires": {
-				"object-assign": "^4.1.1"
-			}
-		},
-		"use-sync-external-store": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-			"integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA=="
-		},
-		"userhome": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/userhome/-/userhome-1.0.0.tgz",
-			"integrity": "sha512-ayFKY3H+Pwfy4W98yPdtH1VqH4psDeyW8lYYFzfecR9d6hqLpqhecktvYR3SEEXt7vG0S1JEpciI3g94pMErig==",
-			"dev": true
-		},
-		"utf8-byte-length": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
-			"integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==",
-			"dev": true
-		},
-		"util": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-			"dev": true,
-			"requires": {
-				"inherits": "2.0.3"
-			}
-		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-		},
-		"utila": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-			"integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-			"dev": true
-		},
-		"utility-types": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz",
-			"integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="
-		},
-		"utils-merge": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
-		},
-		"uuid": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-			"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-			"dev": true
-		},
-		"v8-compile-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-			"dev": true
-		},
-		"v8-to-istanbul": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
-			"integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
-			"dev": true,
-			"requires": {
-				"@jridgewell/trace-mapping": "^0.3.12",
-				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^1.6.0"
+		"packages/scripts/node_modules/babel-loader/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-			"dev": true,
-			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
-			}
+		"packages/scripts/node_modules/babel-loader/node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"license": "MIT"
 		},
-		"validate-npm-package-name": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-			"integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
-			"dev": true,
-			"requires": {
-				"builtins": "^1.0.3"
+		"packages/scripts/node_modules/babel-loader/node_modules/schema-utils": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.5",
+				"ajv": "^6.12.4",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"validate.js": {
-			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/validate.js/-/validate.js-0.13.1.tgz",
-			"integrity": "sha512-PnFM3xiZ+kYmLyTiMgTYmU7ZHkjBZz2/+F0DaALc/uUtVzdCt1wAosvYJ5hFQi/hz8O4zb52FQhHZRC+uVkJ+g==",
-			"dev": true
-		},
-		"valtio": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/valtio/-/valtio-1.7.0.tgz",
-			"integrity": "sha512-3Tnix66EERwMcrl1rfB3ylcewOcL5L/GiPmC3FlVNreQzqf2jufEeqlNmgnLgSGchkEmH3WYVtS+x6Qw4r+yzQ==",
-			"requires": {
-				"proxy-compare": "2.3.0",
-				"use-sync-external-store": "1.2.0"
+		"packages/scripts/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"vary": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
-		},
-		"vfile": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz",
-			"integrity": "sha512-y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ==",
-			"dev": true,
-			"requires": {
-				"is-buffer": "^2.0.0",
-				"replace-ext": "1.0.0",
-				"unist-util-stringify-position": "^1.0.0",
-				"vfile-message": "^1.0.0"
-			},
+		"packages/scripts/node_modules/find-cache-dir": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
 			"dependencies": {
-				"is-buffer": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-					"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-					"dev": true
-				}
+				"commondir": "^1.0.1",
+				"make-dir": "^3.0.2",
+				"pkg-dir": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
 			}
 		},
-		"vfile-location": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz",
-			"integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==",
-			"dev": true
-		},
-		"vfile-message": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz",
-			"integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==",
-			"dev": true,
-			"requires": {
-				"unist-util-stringify-position": "^1.1.1"
+		"packages/scripts/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"vlq": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/vlq/-/vlq-1.0.1.tgz",
-			"integrity": "sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="
-		},
-		"vm-browserify": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-			"dev": true
-		},
-		"vscode-oniguruma": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
-			"integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==",
-			"dev": true
-		},
-		"vscode-textmate": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-8.0.0.tgz",
-			"integrity": "sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==",
-			"dev": true
-		},
-		"w3c-xmlserializer": {
+		"packages/scripts/node_modules/has-flag": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-			"integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
-			"dev": true,
-			"requires": {
-				"xml-name-validator": "^4.0.0"
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"wait-port": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/wait-port/-/wait-port-1.1.0.tgz",
-			"integrity": "sha512-3e04qkoN3LxTMLakdqeWth8nih8usyg+sf1Bgdf9wwUkp05iuK1eSY/QpLvscT/+F/gA89+LpUmmgBtesbqI2Q==",
-			"dev": true,
-			"requires": {
+		"packages/scripts/node_modules/jest-dev-server": {
+			"version": "9.0.1",
+			"resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-9.0.1.tgz",
+			"integrity": "sha512-eqpJKSvVl4M0ojHZUPNbka8yEzLNbIMiINXDsuMF3lYfIdRO2iPqy+ASR4wBQ6nUyR3OT24oKPWhpsfLhgAVyg==",
+			"dependencies": {
 				"chalk": "^4.1.2",
-				"commander": "^9.3.0",
-				"debug": "^4.3.4"
+				"cwd": "^0.10.0",
+				"find-process": "^1.4.7",
+				"prompts": "^2.4.2",
+				"spawnd": "^9.0.1",
+				"tree-kill": "^1.2.2",
+				"wait-on": "^7.0.1"
 			},
-			"dependencies": {
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"commander": {
-					"version": "9.5.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-					"integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"walker": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-			"requires": {
-				"makeerror": "1.0.12"
-			}
-		},
-		"warn-once": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.1.tgz",
-			"integrity": "sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q=="
-		},
-		"watchpack": {
-			"version": "1.7.5",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-			"integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
-			"dev": true,
-			"requires": {
-				"chokidar": "^3.4.1",
-				"graceful-fs": "^4.1.2",
-				"neo-async": "^2.5.0",
-				"watchpack-chokidar2": "^2.0.1"
+			"engines": {
+				"node": ">=16"
 			}
 		},
-		"watchpack-chokidar2": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-			"integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"chokidar": "^2.1.8"
-			},
+		"packages/scripts/node_modules/joi": {
+			"version": "17.11.0",
+			"resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz",
+			"integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==",
 			"dependencies": {
-				"anymatch": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-					"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"micromatch": "^3.1.4",
-						"normalize-path": "^2.1.1"
-					},
-					"dependencies": {
-						"normalize-path": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-							"integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"remove-trailing-separator": "^1.0.1"
-							}
-						}
-					}
-				},
-				"binary-extensions": {
-					"version": "1.13.1",
-					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-					"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-					"dev": true,
-					"optional": true
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"chokidar": {
-					"version": "2.1.8",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.1",
-						"braces": "^2.3.2",
-						"fsevents": "^1.2.7",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.3",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"normalize-path": "^3.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.2.1",
-						"upath": "^1.1.1"
-					}
-				},
-				"fill-range": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-					"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-number": "^3.0.0",
-						"repeat-string": "^1.6.1",
-						"to-regex-range": "^2.1.0"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"fsevents": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-					"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"bindings": "^1.5.0",
-						"nan": "^2.12.1"
-					}
-				},
-				"is-binary-path": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-					"integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"binary-extensions": "^1.0.0"
-					}
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"readdirp": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-					"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"graceful-fs": "^4.1.11",
-						"micromatch": "^3.1.10",
-						"readable-stream": "^2.0.2"
-					}
-				}
-			}
-		},
-		"wbuf": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-			"dev": true,
-			"requires": {
-				"minimalistic-assert": "^1.0.0"
-			}
-		},
-		"wcwidth": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-			"integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-			"requires": {
-				"defaults": "^1.0.3"
+				"@hapi/hoek": "^9.0.0",
+				"@hapi/topo": "^5.0.0",
+				"@sideway/address": "^4.1.3",
+				"@sideway/formula": "^3.0.1",
+				"@sideway/pinpoint": "^2.0.0"
 			}
 		},
-		"web-streams-polyfill": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
-			"integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
-			"dev": true
-		},
-		"web-vitals": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.0.tgz",
-			"integrity": "sha512-f5YnCHVG9Y6uLCePD4tY8bO/Ge15NPEQWtvm3tPzDKygloiqtb4SVqRHBcrIAqo2ztqX5XueqDn97zHF0LdT6w==",
-			"dev": true
+		"packages/scripts/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"license": "MIT"
 		},
-		"webdriver": {
-			"version": "8.16.20",
-			"resolved": "https://registry.npmjs.org/webdriver/-/webdriver-8.16.20.tgz",
-			"integrity": "sha512-3Dynj9pfTqmbDadqmMmD/sQgGFwho92zQPGgpAqLUMebE/qEkraoIfRWdbi2tw1ityiThOJVPTXfwsY/bpvknw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "^20.1.0",
-				"@types/ws": "^8.5.3",
-				"@wdio/config": "8.16.20",
-				"@wdio/logger": "8.16.17",
-				"@wdio/protocols": "8.16.5",
-				"@wdio/types": "8.16.12",
-				"@wdio/utils": "8.16.17",
-				"deepmerge-ts": "^5.1.0",
-				"got": "^ 12.6.1",
-				"ky": "^0.33.0",
-				"ws": "^8.8.0"
-			},
-			"dependencies": {
-				"@sindresorhus/is": {
-					"version": "5.6.0",
-					"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
-					"integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
-					"dev": true
-				},
-				"@szmarczak/http-timer": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
-					"integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
-					"dev": true,
-					"requires": {
-						"defer-to-connect": "^2.0.1"
-					}
-				},
-				"@types/node": {
-					"version": "20.8.2",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-					"integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-					"dev": true
-				},
-				"cacheable-lookup": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
-					"integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
-					"dev": true
-				},
-				"cacheable-request": {
-					"version": "10.2.14",
-					"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
-					"integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
-					"dev": true,
-					"requires": {
-						"@types/http-cache-semantics": "^4.0.2",
-						"get-stream": "^6.0.1",
-						"http-cache-semantics": "^4.1.1",
-						"keyv": "^4.5.3",
-						"mimic-response": "^4.0.0",
-						"normalize-url": "^8.0.0",
-						"responselike": "^3.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"got": {
-					"version": "12.6.1",
-					"resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
-					"integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
-					"dev": true,
-					"requires": {
-						"@sindresorhus/is": "^5.2.0",
-						"@szmarczak/http-timer": "^5.0.1",
-						"cacheable-lookup": "^7.0.0",
-						"cacheable-request": "^10.2.8",
-						"decompress-response": "^6.0.0",
-						"form-data-encoder": "^2.1.2",
-						"get-stream": "^6.0.1",
-						"http2-wrapper": "^2.1.10",
-						"lowercase-keys": "^3.0.0",
-						"p-cancelable": "^3.0.0",
-						"responselike": "^3.0.0"
-					}
-				},
-				"http2-wrapper": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz",
-					"integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==",
-					"dev": true,
-					"requires": {
-						"quick-lru": "^5.1.1",
-						"resolve-alpn": "^1.2.0"
-					}
-				},
-				"lowercase-keys": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
-					"integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
-					"dev": true
-				},
-				"mimic-response": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
-					"integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
-					"dev": true
-				},
-				"normalize-url": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz",
-					"integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==",
-					"dev": true
-				},
-				"p-cancelable": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
-					"integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
-					"dev": true
-				},
-				"quick-lru": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-					"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-					"dev": true
-				},
-				"responselike": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
-					"integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
-					"dev": true,
-					"requires": {
-						"lowercase-keys": "^3.0.0"
-					}
-				},
-				"ws": {
-					"version": "8.14.2",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-					"integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
-					"dev": true
-				}
-			}
+		"packages/scripts/node_modules/json2php": {
+			"version": "0.0.9",
+			"resolved": "https://registry.npmjs.org/json2php/-/json2php-0.0.9.tgz",
+			"integrity": "sha512-fQMYwvPsQt8hxRnCGyg1r2JVi6yL8Um0DIIawiKiMK9yhAAkcRNj5UsBWoaFvFzPpcWbgw9L6wzj+UMYA702Mw==",
+			"license": "BSD"
 		},
-		"webdriverio": {
-			"version": "8.16.20",
-			"resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-8.16.20.tgz",
-			"integrity": "sha512-2xSJDrMxwPF1kucB/r7Wc8yF689GGi7iSKrog7vkkoIiRY25vd3U129iN2mTYgNDyM6SM0kw+GP5W1s73khpYw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "^20.1.0",
-				"@wdio/config": "8.16.20",
-				"@wdio/logger": "8.16.17",
-				"@wdio/protocols": "8.16.5",
-				"@wdio/repl": "8.10.1",
-				"@wdio/types": "8.16.12",
-				"@wdio/utils": "8.16.17",
-				"archiver": "^6.0.0",
-				"aria-query": "^5.0.0",
-				"css-shorthand-properties": "^1.1.1",
-				"css-value": "^0.0.1",
-				"devtools-protocol": "^0.0.1203626",
-				"grapheme-splitter": "^1.0.2",
-				"import-meta-resolve": "^3.0.0",
-				"is-plain-obj": "^4.1.0",
-				"lodash.clonedeep": "^4.5.0",
-				"lodash.zip": "^4.2.0",
-				"minimatch": "^9.0.0",
-				"puppeteer-core": "^20.9.0",
-				"query-selector-shadow-dom": "^1.0.0",
-				"resq": "^1.9.1",
-				"rgb2hex": "0.2.5",
-				"serialize-error": "^11.0.1",
-				"webdriver": "8.16.20"
-			},
+		"packages/scripts/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dependencies": {
-				"@types/node": {
-					"version": "20.8.2",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
-					"integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
-					"dev": true
-				},
-				"aria-query": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-					"integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
-					"dev": true,
-					"requires": {
-						"dequal": "^2.0.3"
-					}
-				},
-				"brace-expansion": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-					"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-					"dev": true,
-					"requires": {
-						"balanced-match": "^1.0.0"
-					}
-				},
-				"cross-fetch": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
-					"integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
-					"dev": true,
-					"requires": {
-						"node-fetch": "^2.6.12"
-					}
-				},
-				"devtools-protocol": {
-					"version": "0.0.1203626",
-					"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1203626.tgz",
-					"integrity": "sha512-nEzHZteIUZfGCZtTiS1fRpC8UZmsfD1SiyPvaUNvS13dvKf666OAm8YTi0+Ca3n1nLEyu49Cy4+dPWpaHFJk9g==",
-					"dev": true
-				},
-				"is-plain-obj": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-					"integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "9.0.3",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-					"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^2.0.1"
-					}
-				},
-				"node-fetch": {
-					"version": "2.7.0",
-					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-					"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-					"dev": true,
-					"requires": {
-						"whatwg-url": "^5.0.0"
-					}
-				},
-				"puppeteer-core": {
-					"version": "20.9.0",
-					"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.9.0.tgz",
-					"integrity": "sha512-H9fYZQzMTRrkboEfPmf7m3CLDN6JvbxXA3qTtS+dFt27tR+CsFHzPsT6pzp6lYL6bJbAPaR0HaPO6uSi+F94Pg==",
-					"dev": true,
-					"requires": {
-						"@puppeteer/browsers": "1.4.6",
-						"chromium-bidi": "0.4.16",
-						"cross-fetch": "4.0.0",
-						"debug": "4.3.4",
-						"devtools-protocol": "0.0.1147663",
-						"ws": "8.13.0"
-					},
-					"dependencies": {
-						"devtools-protocol": {
-							"version": "0.0.1147663",
-							"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1147663.tgz",
-							"integrity": "sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ==",
-							"dev": true
-						}
-					}
-				},
-				"serialize-error": {
-					"version": "11.0.2",
-					"resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.2.tgz",
-					"integrity": "sha512-o43i0jLcA0LXA5Uu+gI1Vj+lF66KR9IAcy0ThbGq1bAMPN+k5IgSHsulfnqf/ddKAz6dWf+k8PD5hAr9oCSHEQ==",
-					"dev": true,
-					"requires": {
-						"type-fest": "^2.12.2"
-					}
-				},
-				"type-fest": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-					"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-					"dev": true
-				},
-				"ws": {
-					"version": "8.13.0",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-					"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-					"dev": true
-				}
-			}
-		},
-		"webidl-conversions": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-			"dev": true
-		},
-		"webpack": {
-			"version": "5.88.2",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
-			"integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
-			"dev": true,
-			"requires": {
-				"@types/eslint-scope": "^3.7.3",
-				"@types/estree": "^1.0.0",
-				"@webassemblyjs/ast": "^1.11.5",
-				"@webassemblyjs/wasm-edit": "^1.11.5",
-				"@webassemblyjs/wasm-parser": "^1.11.5",
-				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.9.0",
-				"browserslist": "^4.14.5",
-				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.15.0",
-				"es-module-lexer": "^1.2.1",
-				"eslint-scope": "5.1.1",
-				"events": "^3.2.0",
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.9",
-				"json-parse-even-better-errors": "^2.3.1",
-				"loader-runner": "^4.2.0",
-				"mime-types": "^2.1.27",
-				"neo-async": "^2.6.2",
-				"schema-utils": "^3.2.0",
-				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.3.7",
-				"watchpack": "^2.4.0",
-				"webpack-sources": "^3.2.3"
+				"p-locate": "^4.1.0"
 			},
-			"dependencies": {
-				"@types/estree": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
-					"integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
-					"dev": true
-				},
-				"@webassemblyjs/ast": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-					"integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
-					"dev": true,
-					"requires": {
-						"@webassemblyjs/helper-numbers": "1.11.6",
-						"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
-					}
-				},
-				"@webassemblyjs/helper-api-error": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-					"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-					"dev": true
-				},
-				"@webassemblyjs/helper-buffer": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-					"integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
-					"dev": true
-				},
-				"@webassemblyjs/helper-wasm-bytecode": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-					"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-					"dev": true
-				},
-				"@webassemblyjs/helper-wasm-section": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-					"integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
-					"dev": true,
-					"requires": {
-						"@webassemblyjs/ast": "1.11.6",
-						"@webassemblyjs/helper-buffer": "1.11.6",
-						"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-						"@webassemblyjs/wasm-gen": "1.11.6"
-					}
-				},
-				"@webassemblyjs/ieee754": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-					"integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
-					"dev": true,
-					"requires": {
-						"@xtuc/ieee754": "^1.2.0"
-					}
-				},
-				"@webassemblyjs/leb128": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-					"integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
-					"dev": true,
-					"requires": {
-						"@xtuc/long": "4.2.2"
-					}
-				},
-				"@webassemblyjs/utf8": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-					"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-					"dev": true
-				},
-				"@webassemblyjs/wasm-edit": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-					"integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
-					"dev": true,
-					"requires": {
-						"@webassemblyjs/ast": "1.11.6",
-						"@webassemblyjs/helper-buffer": "1.11.6",
-						"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-						"@webassemblyjs/helper-wasm-section": "1.11.6",
-						"@webassemblyjs/wasm-gen": "1.11.6",
-						"@webassemblyjs/wasm-opt": "1.11.6",
-						"@webassemblyjs/wasm-parser": "1.11.6",
-						"@webassemblyjs/wast-printer": "1.11.6"
-					}
-				},
-				"@webassemblyjs/wasm-gen": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-					"integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
-					"dev": true,
-					"requires": {
-						"@webassemblyjs/ast": "1.11.6",
-						"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-						"@webassemblyjs/ieee754": "1.11.6",
-						"@webassemblyjs/leb128": "1.11.6",
-						"@webassemblyjs/utf8": "1.11.6"
-					}
-				},
-				"@webassemblyjs/wasm-opt": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-					"integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
-					"dev": true,
-					"requires": {
-						"@webassemblyjs/ast": "1.11.6",
-						"@webassemblyjs/helper-buffer": "1.11.6",
-						"@webassemblyjs/wasm-gen": "1.11.6",
-						"@webassemblyjs/wasm-parser": "1.11.6"
-					}
-				},
-				"@webassemblyjs/wasm-parser": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-					"integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
-					"dev": true,
-					"requires": {
-						"@webassemblyjs/ast": "1.11.6",
-						"@webassemblyjs/helper-api-error": "1.11.6",
-						"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-						"@webassemblyjs/ieee754": "1.11.6",
-						"@webassemblyjs/leb128": "1.11.6",
-						"@webassemblyjs/utf8": "1.11.6"
-					}
-				},
-				"@webassemblyjs/wast-printer": {
-					"version": "1.11.6",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-					"integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
-					"dev": true,
-					"requires": {
-						"@webassemblyjs/ast": "1.11.6",
-						"@xtuc/long": "4.2.2"
-					}
-				},
-				"acorn": {
-					"version": "8.10.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-					"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-					"dev": true
-				},
-				"ajv": {
-					"version": "6.12.6",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"enhanced-resolve": {
-					"version": "5.15.0",
-					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-					"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.4",
-						"tapable": "^2.2.0"
-					}
-				},
-				"eslint-scope": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-					"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-					"dev": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^4.1.1"
-					}
-				},
-				"loader-runner": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-					"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-					"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
-				},
-				"tapable": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-					"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-					"dev": true
-				},
-				"watchpack": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-					"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-					"dev": true,
-					"requires": {
-						"glob-to-regexp": "^0.4.1",
-						"graceful-fs": "^4.1.2"
-					}
-				}
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"webpack-bundle-analyzer": {
-			"version": "4.9.1",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz",
-			"integrity": "sha512-jnd6EoYrf9yMxCyYDPj8eutJvtjQNp8PHmni/e/ulydHBWhT5J3menXt3HEkScsu9YqMAcG4CfFjs3rj5pVU1w==",
-			"dev": true,
-			"requires": {
-				"@discoveryjs/json-ext": "0.5.7",
-				"acorn": "^8.0.4",
-				"acorn-walk": "^8.0.0",
-				"commander": "^7.2.0",
-				"escape-string-regexp": "^4.0.0",
-				"gzip-size": "^6.0.0",
-				"is-plain-object": "^5.0.0",
-				"lodash.debounce": "^4.0.8",
-				"lodash.escape": "^4.0.1",
-				"lodash.flatten": "^4.4.0",
-				"lodash.invokemap": "^4.6.0",
-				"lodash.pullall": "^4.2.0",
-				"lodash.uniqby": "^4.7.0",
-				"opener": "^1.5.2",
-				"picocolors": "^1.0.0",
-				"sirv": "^2.0.3",
-				"ws": "^7.3.1"
-			},
+		"packages/scripts/node_modules/make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
 			"dependencies": {
-				"acorn": {
-					"version": "8.10.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-					"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-					"dev": true
-				},
-				"acorn-walk": {
-					"version": "8.2.0",
-					"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-					"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-					"dev": true
-				},
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-					"dev": true
-				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
-				},
-				"gzip-size": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-					"integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
-					"dev": true,
-					"requires": {
-						"duplexer": "^0.1.2"
-					}
-				}
-			}
-		},
-		"webpack-cli": {
-			"version": "5.1.4",
-			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
-			"integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
-			"dev": true,
-			"requires": {
-				"@discoveryjs/json-ext": "^0.5.0",
-				"@webpack-cli/configtest": "^2.1.1",
-				"@webpack-cli/info": "^2.0.2",
-				"@webpack-cli/serve": "^2.0.5",
-				"colorette": "^2.0.14",
-				"commander": "^10.0.1",
-				"cross-spawn": "^7.0.3",
-				"envinfo": "^7.7.3",
-				"fastest-levenshtein": "^1.0.12",
-				"import-local": "^3.0.2",
-				"interpret": "^3.1.1",
-				"rechoir": "^0.8.0",
-				"webpack-merge": "^5.7.3"
+				"semver": "^6.0.0"
 			},
-			"dependencies": {
-				"colorette": {
-					"version": "2.0.20",
-					"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-					"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-					"dev": true
-				},
-				"commander": {
-					"version": "10.0.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-					"integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"webpack-dev-server": {
-			"version": "4.15.1",
-			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
-			"integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
-			"dev": true,
-			"requires": {
-				"@types/bonjour": "^3.5.9",
-				"@types/connect-history-api-fallback": "^1.3.5",
-				"@types/express": "^4.17.13",
-				"@types/serve-index": "^1.9.1",
-				"@types/serve-static": "^1.13.10",
-				"@types/sockjs": "^0.3.33",
-				"@types/ws": "^8.5.5",
-				"ansi-html-community": "^0.0.8",
-				"bonjour-service": "^1.0.11",
-				"chokidar": "^3.5.3",
-				"colorette": "^2.0.10",
-				"compression": "^1.7.4",
-				"connect-history-api-fallback": "^2.0.0",
-				"default-gateway": "^6.0.3",
-				"express": "^4.17.3",
-				"graceful-fs": "^4.2.6",
-				"html-entities": "^2.3.2",
-				"http-proxy-middleware": "^2.0.3",
-				"ipaddr.js": "^2.0.1",
-				"launch-editor": "^2.6.0",
-				"open": "^8.0.9",
-				"p-retry": "^4.5.0",
-				"rimraf": "^3.0.2",
-				"schema-utils": "^4.0.0",
-				"selfsigned": "^2.1.1",
-				"serve-index": "^1.9.1",
-				"sockjs": "^0.3.24",
-				"spdy": "^4.0.2",
-				"webpack-dev-middleware": "^5.3.1",
-				"ws": "^8.13.0"
+			"engines": {
+				"node": ">=8"
 			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"colorette": {
-					"version": "2.0.20",
-					"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-					"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-					"dev": true
-				},
-				"ipaddr.js": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
-					"integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
-					"dev": true
-				},
-				"is-wsl": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-					"dev": true,
-					"requires": {
-						"is-docker": "^2.0.0"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"open": {
-					"version": "8.4.2",
-					"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-					"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-					"dev": true,
-					"requires": {
-						"define-lazy-prop": "^2.0.0",
-						"is-docker": "^2.1.1",
-						"is-wsl": "^2.2.0"
-					}
-				},
-				"schema-utils": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-					"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.9.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.1.0"
-					}
-				},
-				"webpack-dev-middleware": {
-					"version": "5.3.3",
-					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-					"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
-					"dev": true,
-					"requires": {
-						"colorette": "^2.0.10",
-						"memfs": "^3.4.3",
-						"mime-types": "^2.1.31",
-						"range-parser": "^1.2.1",
-						"schema-utils": "^4.0.0"
-					}
-				},
-				"ws": {
-					"version": "8.13.0",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-					"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-					"dev": true
-				}
-			}
-		},
-		"webpack-hot-middleware": {
-			"version": "2.25.1",
-			"resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.1.tgz",
-			"integrity": "sha512-Koh0KyU/RPYwel/khxbsDz9ibDivmUbrRuKSSQvW42KSDdO4w23WI3SkHpSUKHE76LrFnnM/L7JCrpBwu8AXYw==",
-			"dev": true,
-			"requires": {
-				"ansi-html-community": "0.0.8",
-				"html-entities": "^2.1.0",
-				"querystring": "^0.2.0",
-				"strip-ansi": "^6.0.0"
-			}
-		},
-		"webpack-merge": {
-			"version": "5.8.0",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-			"integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-			"dev": true,
-			"requires": {
-				"clone-deep": "^4.0.1",
-				"wildcard": "^2.0.0"
-			}
-		},
-		"webpack-sources": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-			"dev": true
-		},
-		"websocket-driver": {
-			"version": "0.7.4",
-			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-			"dev": true,
-			"requires": {
-				"http-parser-js": ">=0.5.1",
-				"safe-buffer": ">=5.1.0",
-				"websocket-extensions": ">=0.1.1"
-			}
-		},
-		"websocket-extensions": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-			"dev": true
-		},
-		"whatwg-encoding": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-			"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-			"dev": true,
-			"requires": {
-				"iconv-lite": "0.6.3"
-			}
-		},
-		"whatwg-fetch": {
-			"version": "3.6.17",
-			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz",
-			"integrity": "sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ=="
-		},
-		"whatwg-mimetype": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-			"integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-			"dev": true
-		},
-		"whatwg-url": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-			"dev": true,
-			"requires": {
-				"tr46": "~0.0.3",
-				"webidl-conversions": "^3.0.0"
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"whatwg-url-without-unicode": {
-			"version": "8.0.0-1",
-			"resolved": "https://registry.npmjs.org/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-1.tgz",
-			"integrity": "sha512-0Uy8mjsG5O8Y53327XL+ZqsrMdxO1CL/6m840SmW5iyRWFvU2zlxS2RzpD3pFFVKYOKCmsKn5JKzWxQ+bImnWA==",
-			"dev": true,
-			"requires": {
-				"webidl-conversions": "^5.0.0"
-			},
+		"packages/scripts/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dependencies": {
-				"webidl-conversions": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-					"dev": true
-				}
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"which": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-			"requires": {
-				"isexe": "^2.0.0"
+		"packages/scripts/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"which-boxed-primitive": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-			"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-			"dev": true,
-			"requires": {
-				"is-bigint": "^1.0.1",
-				"is-boolean-object": "^1.1.0",
-				"is-number-object": "^1.0.4",
-				"is-string": "^1.0.5",
-				"is-symbol": "^1.0.3"
+		"packages/scripts/node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"which-collection": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-			"integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-			"dev": true,
-			"requires": {
-				"is-map": "^2.0.1",
-				"is-set": "^2.0.1",
-				"is-weakmap": "^2.0.1",
-				"is-weakset": "^2.0.1"
+		"packages/scripts/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"which-module": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
-			"integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
+		"packages/scripts/node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"which-typed-array": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-			"integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
-			"dev": true,
-			"requires": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.2",
-				"for-each": "^0.3.3",
-				"gopd": "^1.0.1",
-				"has-tostringtag": "^1.0.0"
+		"packages/scripts/node_modules/rxjs": {
+			"version": "7.8.1",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+			"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+			"dependencies": {
+				"tslib": "^2.1.0"
 			}
 		},
-		"wicg-inert": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.2.tgz",
-			"integrity": "sha512-Ba9tGNYxXwaqKEi9sJJvPMKuo063umUPsHN0JJsjrs2j8KDSzkWLMZGZ+MH1Jf1Fq4OWZ5HsESJID6nRza2ang=="
+		"packages/scripts/node_modules/schema-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
 		},
-		"wide-align": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-			"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-			"dev": true,
-			"requires": {
-				"string-width": "^1.0.2 || 2 || 3 || 4"
+		"packages/scripts/node_modules/schema-utils/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
 			}
 		},
-		"wildcard": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-			"integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-			"dev": true
+		"packages/scripts/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
 		},
-		"windows-release": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz",
-			"integrity": "sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==",
-			"dev": true,
-			"requires": {
-				"execa": "^1.0.0"
+		"packages/scripts/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"engines": {
+				"node": ">=14"
 			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-					"dev": true
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"winston": {
-			"version": "3.9.0",
-			"resolved": "https://registry.npmjs.org/winston/-/winston-3.9.0.tgz",
-			"integrity": "sha512-jW51iW/X95BCW6MMtZWr2jKQBP4hV5bIDq9QrIjfDk6Q9QuxvTKEAlpUNAzP+HYHFFCeENhph16s0zEunu4uuQ==",
-			"dev": true,
-			"requires": {
-				"@colors/colors": "1.5.0",
-				"@dabh/diagnostics": "^2.0.2",
-				"async": "^3.2.3",
-				"is-stream": "^2.0.0",
-				"logform": "^2.4.0",
-				"one-time": "^1.0.0",
-				"readable-stream": "^3.4.0",
-				"safe-stable-stringify": "^2.3.1",
-				"stack-trace": "0.0.x",
-				"triple-beam": "^1.3.0",
-				"winston-transport": "^4.5.0"
-			},
+		"packages/scripts/node_modules/spawnd": {
+			"version": "9.0.1",
+			"resolved": "https://registry.npmjs.org/spawnd/-/spawnd-9.0.1.tgz",
+			"integrity": "sha512-vaMk8E9CpbjTYToBxLXowDeArGf1+yI7A6PU6Nr57b2g8BVY8nRi5vTBj3bMF8UkCrMdTMyf/Lh+lrcrW2z7pw==",
 			"dependencies": {
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"signal-exit": "^4.1.0",
+				"tree-kill": "^1.2.2"
+			},
+			"engines": {
+				"node": ">=16"
 			}
 		},
-		"winston-transport": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz",
-			"integrity": "sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==",
-			"dev": true,
-			"requires": {
-				"logform": "^2.3.2",
-				"readable-stream": "^3.6.0",
-				"triple-beam": "^1.3.0"
-			},
+		"packages/scripts/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"wordwrap": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-			"integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-			"dev": true
-		},
-		"worker-farm": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-			"integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-			"dev": true,
-			"requires": {
-				"errno": "~0.1.7"
+		"packages/scripts/node_modules/wait-on": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz",
+			"integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==",
+			"dependencies": {
+				"axios": "^1.6.1",
+				"joi": "^17.11.0",
+				"lodash": "^4.17.21",
+				"minimist": "^1.2.8",
+				"rxjs": "^7.8.1"
+			},
+			"bin": {
+				"wait-on": "bin/wait-on"
+			},
+			"engines": {
+				"node": ">=12.0.0"
 			}
 		},
-		"wrap-ansi": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-			"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-			"requires": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
+		"packages/server-side-render": {
+			"name": "@wordpress/server-side-render",
+			"version": "5.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/deprecated": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/url": "*",
+				"fast-deep-equal": "^3.1.3"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"wrap-ansi-cjs": {
-			"version": "npm:wrap-ansi@7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
+		"packages/shortcode": {
+			"name": "@wordpress/shortcode",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
+				"@babel/runtime": "7.25.7",
+				"memize": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-		},
-		"write-file-atomic": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-			"integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
-			"requires": {
-				"graceful-fs": "^4.1.11",
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^3.0.2"
+		"packages/style-engine": {
+			"name": "@wordpress/style-engine",
+			"version": "2.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"change-case": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"write-json-file": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz",
-			"integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==",
-			"dev": true,
-			"requires": {
-				"detect-indent": "^5.0.0",
-				"graceful-fs": "^4.1.15",
-				"make-dir": "^2.1.0",
-				"pify": "^4.0.1",
-				"sort-keys": "^2.0.0",
-				"write-file-atomic": "^2.4.2"
-			},
+		"packages/stylelint-config": {
+			"name": "@wordpress/stylelint-config",
+			"version": "23.2.0",
+			"license": "MIT",
 			"dependencies": {
-				"make-dir": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-					"dev": true,
-					"requires": {
-						"pify": "^4.0.1",
-						"semver": "^5.6.0"
-					}
-				},
-				"pify": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-					"dev": true
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-					"dev": true
-				}
+				"@stylistic/stylelint-plugin": "^3.0.1",
+				"stylelint-config-recommended": "^14.0.1",
+				"stylelint-config-recommended-scss": "^14.1.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"stylelint": "^16.8.2"
 			}
 		},
-		"write-pkg": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz",
-			"integrity": "sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==",
-			"dev": true,
-			"requires": {
-				"sort-keys": "^2.0.0",
-				"type-fest": "^0.4.1",
-				"write-json-file": "^3.2.0"
-			},
+		"packages/stylelint-config/node_modules/css-tree": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
 			"dependencies": {
-				"type-fest": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz",
-					"integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==",
-					"dev": true
-				}
+				"mdn-data": "2.0.30",
+				"source-map-js": "^1.0.1"
+			},
+			"engines": {
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
 			}
 		},
-		"ws": {
-			"version": "7.5.9",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-			"integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="
-		},
-		"x-is-string": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
-			"integrity": "sha512-GojqklwG8gpzOVEVki5KudKNoq7MbbjYZCbyWzEz7tyPA7eleiE0+ePwOWQQRb5fm86rD3S8Tc0tSFf3AOv50w==",
-			"dev": true
-		},
-		"xdg-basedir": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-			"integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-			"dev": true
-		},
-		"xml": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-			"integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
-			"dev": true
-		},
-		"xml-name-validator": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-			"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-			"dev": true
+		"packages/stylelint-config/node_modules/mdn-data": {
+			"version": "2.0.30",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="
 		},
-		"xmlbuilder": {
-			"version": "15.1.1",
-			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
-			"integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
-			"dev": true
+		"packages/stylelint-config/node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
-		"xmlchars": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-			"dev": true
+		"packages/stylelint-config/node_modules/source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"xtend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+		"packages/stylelint-config/node_modules/stylelint-config-recommended": {
+			"version": "14.0.1",
+			"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz",
+			"integrity": "sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/stylelint"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/stylelint"
+				}
+			],
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"peerDependencies": {
+				"stylelint": "^16.1.0"
+			}
 		},
-		"y-indexeddb": {
-			"version": "9.0.11",
-			"resolved": "https://registry.npmjs.org/y-indexeddb/-/y-indexeddb-9.0.11.tgz",
-			"integrity": "sha512-HOKQ70qW1h2WJGtOKu9rE8fbX86ExVZedecndMuhwax3yM4DQsQzCTGHt/jvTrFZr/9Ahvd8neD6aZ4dMMjtdg==",
-			"requires": {
-				"lib0": "^0.2.74"
+		"packages/stylelint-config/node_modules/stylelint-config-recommended-scss": {
+			"version": "14.1.0",
+			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-14.1.0.tgz",
+			"integrity": "sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==",
+			"dependencies": {
+				"postcss-scss": "^4.0.9",
+				"stylelint-config-recommended": "^14.0.1",
+				"stylelint-scss": "^6.4.0"
+			},
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.3.3",
+				"stylelint": "^16.6.1"
+			},
+			"peerDependenciesMeta": {
+				"postcss": {
+					"optional": true
+				}
 			}
 		},
-		"y-protocols": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/y-protocols/-/y-protocols-1.0.5.tgz",
-			"integrity": "sha512-Wil92b7cGk712lRHDqS4T90IczF6RkcvCwAD0A2OPg+adKmOe+nOiT/N2hvpQIWS3zfjmtL4CPaH5sIW1Hkm/A==",
-			"requires": {
-				"lib0": "^0.2.42"
+		"packages/stylelint-config/node_modules/stylelint-scss": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.5.1.tgz",
+			"integrity": "sha512-ZLqdqihm6uDYkrsOeD6YWb+stZI8Wn92kUNDhE4M+g9g1aCnRv0JlOrttFiAJJwaNzpdQgX3YJb5vDQXVuO9Ww==",
+			"dependencies": {
+				"css-tree": "2.3.1",
+				"is-plain-object": "5.0.0",
+				"known-css-properties": "^0.34.0",
+				"postcss-media-query-parser": "^0.2.3",
+				"postcss-resolve-nested-selector": "^0.1.4",
+				"postcss-selector-parser": "^6.1.1",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"peerDependencies": {
+				"stylelint": "^16.0.2"
 			}
 		},
-		"y-webrtc": {
-			"version": "10.2.5",
-			"resolved": "https://registry.npmjs.org/y-webrtc/-/y-webrtc-10.2.5.tgz",
-			"integrity": "sha512-ZyBNvTI5L28sQ2PQI0T/JvyWgvuTq05L21vGkIlcvNLNSJqAaLCBJRe3FHEqXoaogqWmRcEAKGfII4ErNXMnNw==",
-			"requires": {
+		"packages/sync": {
+			"name": "@wordpress/sync",
+			"version": "1.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@types/simple-peer": "^9.11.5",
+				"@wordpress/url": "*",
+				"import-locals": "^2.0.0",
 				"lib0": "^0.2.42",
 				"simple-peer": "^9.11.0",
-				"ws": "^7.2.0",
-				"y-protocols": "^1.0.5"
+				"y-indexeddb": "~9.0.11",
+				"y-protocols": "^1.0.5",
+				"y-webrtc": "~10.2.5",
+				"yjs": "~13.6.6"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"y18n": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-			"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
-		},
-		"yallist": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-			"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-			"dev": true
-		},
-		"yaml": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
-		},
-		"yargs": {
-			"version": "16.2.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-			"dev": true,
-			"requires": {
-				"cliui": "^7.0.2",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.0",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^20.2.2"
-			},
+		"packages/token-list": {
+			"name": "@wordpress/token-list",
+			"version": "3.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"cliui": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-					"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				}
+				"@babel/runtime": "7.25.7"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"yargs-parser": {
-			"version": "20.2.9",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-			"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-			"dev": true
+		"packages/undo-manager": {
+			"name": "@wordpress/undo-manager",
+			"version": "1.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/is-shallow-equal": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			}
 		},
-		"yauzl": {
-			"version": "2.10.0",
-			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-			"integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-			"dev": true,
-			"requires": {
-				"buffer-crc32": "~0.2.3",
-				"fd-slicer": "~1.1.0"
+		"packages/url": {
+			"name": "@wordpress/url",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"remove-accents": "^0.5.0"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
 			}
 		},
-		"yjs": {
-			"version": "13.6.7",
-			"resolved": "https://registry.npmjs.org/yjs/-/yjs-13.6.7.tgz",
-			"integrity": "sha512-mCZTh4kjvUS2DnaktsYN6wLH3WZCJBLqrTdkWh1bIDpA/sB/GNFaLA/dyVJj2Hc7KwONuuoC/vWe9bwBBosZLQ==",
-			"requires": {
-				"lib0": "^0.2.74"
+		"packages/viewport": {
+			"name": "@wordpress/viewport",
+			"version": "6.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7",
+				"@wordpress/compose": "*",
+				"@wordpress/data": "*",
+				"@wordpress/element": "*"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
 			}
 		},
-		"yn": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-			"dev": true
+		"packages/vips": {
+			"name": "@wordpress/vips",
+			"version": "1.0.0-prerelease",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"wasm-vips": "^0.0.10"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			}
 		},
-		"yocto-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
+		"packages/warning": {
+			"name": "@wordpress/warning",
+			"version": "3.10.0",
+			"license": "GPL-2.0-or-later",
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			}
 		},
-		"zip-stream": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-5.0.1.tgz",
-			"integrity": "sha512-UfZ0oa0C8LI58wJ+moL46BDIMgCQbnsb+2PoiJYtonhBsMh2bq1eRBVkvjfVsqbEHd9/EgKPUuL9saSSsec8OA==",
-			"dev": true,
-			"requires": {
-				"archiver-utils": "^4.0.1",
-				"compress-commons": "^5.0.1",
-				"readable-stream": "^3.6.0"
-			},
+		"packages/widgets": {
+			"name": "@wordpress/widgets",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.2",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-					"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"@babel/runtime": "7.25.7",
+				"@wordpress/api-fetch": "*",
+				"@wordpress/block-editor": "*",
+				"@wordpress/blocks": "*",
+				"@wordpress/components": "*",
+				"@wordpress/compose": "*",
+				"@wordpress/core-data": "*",
+				"@wordpress/data": "*",
+				"@wordpress/element": "*",
+				"@wordpress/i18n": "*",
+				"@wordpress/icons": "*",
+				"@wordpress/notices": "*",
+				"clsx": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
-		"zod": {
-			"version": "3.20.2",
-			"resolved": "https://registry.npmjs.org/zod/-/zod-3.20.2.tgz",
-			"integrity": "sha512-1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ==",
-			"dev": true
+		"packages/wordcount": {
+			"name": "@wordpress/wordcount",
+			"version": "4.10.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@babel/runtime": "7.25.7"
+			},
+			"engines": {
+				"node": ">=18.12.0",
+				"npm": ">=8.19.2"
+			}
 		}
 	}
 }
diff --git a/package.json b/package.json
index 8f6a3baeeb283f..06a73c51cc940d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "17.2.0-rc.1",
+	"version": "19.5.0",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",
@@ -15,176 +15,79 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=16.0.0",
-		"npm": ">=8 <9"
+		"node": ">=20.10.0",
+		"npm": ">=10.2.3"
 	},
 	"config": {
 		"IS_GUTENBERG_PLUGIN": true
 	},
-	"dependencies": {
-		"@wordpress/a11y": "file:packages/a11y",
-		"@wordpress/annotations": "file:packages/annotations",
-		"@wordpress/api-fetch": "file:packages/api-fetch",
-		"@wordpress/autop": "file:packages/autop",
-		"@wordpress/blob": "file:packages/blob",
-		"@wordpress/block-directory": "file:packages/block-directory",
-		"@wordpress/block-editor": "file:packages/block-editor",
-		"@wordpress/block-library": "file:packages/block-library",
-		"@wordpress/block-serialization-default-parser": "file:packages/block-serialization-default-parser",
-		"@wordpress/block-serialization-spec-parser": "file:packages/block-serialization-spec-parser",
-		"@wordpress/blocks": "file:packages/blocks",
-		"@wordpress/commands": "file:packages/commands",
-		"@wordpress/components": "file:packages/components",
-		"@wordpress/compose": "file:packages/compose",
-		"@wordpress/core-commands": "file:packages/core-commands",
-		"@wordpress/core-data": "file:packages/core-data",
-		"@wordpress/customize-widgets": "file:packages/customize-widgets",
-		"@wordpress/data": "file:packages/data",
-		"@wordpress/data-controls": "file:packages/data-controls",
-		"@wordpress/dataviews": "file:packages/dataviews",
-		"@wordpress/date": "file:packages/date",
-		"@wordpress/deprecated": "file:packages/deprecated",
-		"@wordpress/dom": "file:packages/dom",
-		"@wordpress/dom-ready": "file:packages/dom-ready",
-		"@wordpress/edit-post": "file:packages/edit-post",
-		"@wordpress/edit-site": "file:packages/edit-site",
-		"@wordpress/edit-widgets": "file:packages/edit-widgets",
-		"@wordpress/editor": "file:packages/editor",
-		"@wordpress/element": "file:packages/element",
-		"@wordpress/escape-html": "file:packages/escape-html",
-		"@wordpress/format-library": "file:packages/format-library",
-		"@wordpress/hooks": "file:packages/hooks",
-		"@wordpress/html-entities": "file:packages/html-entities",
-		"@wordpress/i18n": "file:packages/i18n",
-		"@wordpress/icons": "file:packages/icons",
-		"@wordpress/interactivity": "file:packages/interactivity",
-		"@wordpress/interface": "file:packages/interface",
-		"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
-		"@wordpress/keyboard-shortcuts": "file:packages/keyboard-shortcuts",
-		"@wordpress/keycodes": "file:packages/keycodes",
-		"@wordpress/list-reusable-blocks": "file:packages/list-reusable-blocks",
-		"@wordpress/media-utils": "file:packages/media-utils",
-		"@wordpress/notices": "file:packages/notices",
-		"@wordpress/nux": "file:packages/nux",
-		"@wordpress/patterns": "file:packages/patterns",
-		"@wordpress/plugins": "file:packages/plugins",
-		"@wordpress/preferences": "file:packages/preferences",
-		"@wordpress/preferences-persistence": "file:packages/preferences-persistence",
-		"@wordpress/primitives": "file:packages/primitives",
-		"@wordpress/priority-queue": "file:packages/priority-queue",
-		"@wordpress/private-apis": "file:packages/private-apis",
-		"@wordpress/react-i18n": "file:packages/react-i18n",
-		"@wordpress/react-native-aztec": "file:packages/react-native-aztec",
-		"@wordpress/react-native-bridge": "file:packages/react-native-bridge",
-		"@wordpress/react-native-editor": "file:packages/react-native-editor",
-		"@wordpress/redux-routine": "file:packages/redux-routine",
-		"@wordpress/reusable-blocks": "file:packages/reusable-blocks",
-		"@wordpress/rich-text": "file:packages/rich-text",
-		"@wordpress/router": "file:packages/router",
-		"@wordpress/server-side-render": "file:packages/server-side-render",
-		"@wordpress/shortcode": "file:packages/shortcode",
-		"@wordpress/style-engine": "file:packages/style-engine",
-		"@wordpress/sync": "file:packages/sync",
-		"@wordpress/token-list": "file:packages/token-list",
-		"@wordpress/undo-manager": "file:packages/undo-manager",
-		"@wordpress/url": "file:packages/url",
-		"@wordpress/viewport": "file:packages/viewport",
-		"@wordpress/warning": "file:packages/warning",
-		"@wordpress/widgets": "file:packages/widgets",
-		"@wordpress/wordcount": "file:packages/wordcount",
-		"es-module-shims": "^1.8.2",
-		"wicg-inert": "3.1.2"
-	},
 	"devDependencies": {
 		"@actions/core": "1.9.1",
 		"@actions/github": "5.0.0",
-		"@ariakit/test": "^0.3.0",
-		"@babel/core": "7.16.0",
-		"@babel/plugin-proposal-export-namespace-from": "7.18.9",
-		"@babel/plugin-syntax-jsx": "7.16.0",
-		"@babel/runtime-corejs3": "7.16.0",
-		"@babel/traverse": "7.16.0",
-		"@emotion/babel-plugin": "11.3.0",
+		"@apidevtools/json-schema-ref-parser": "11.6.4",
+		"@ariakit/test": "^0.4.2",
+		"@babel/core": "7.25.7",
+		"@babel/plugin-syntax-jsx": "7.25.7",
+		"@babel/runtime-corejs3": "7.25.7",
+		"@babel/traverse": "7.25.7",
+		"@emotion/babel-plugin": "11.11.0",
 		"@emotion/jest": "11.7.1",
 		"@emotion/native": "11.0.0",
+		"@geometricpanda/storybook-addon-badges": "2.0.1",
 		"@octokit/rest": "16.26.0",
 		"@octokit/types": "6.34.0",
-		"@octokit/webhooks-types": "5.6.0",
-		"@playwright/test": "1.39.0",
+		"@octokit/webhooks-types": "5.8.0",
+		"@playwright/test": "1.48.1",
 		"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
-		"@storybook/addon-a11y": "7.2.2",
-		"@storybook/addon-actions": "7.2.2",
-		"@storybook/addon-controls": "7.2.2",
-		"@storybook/addon-docs": "7.2.2",
-		"@storybook/addon-toolbars": "7.2.2",
-		"@storybook/addon-viewport": "7.2.2",
-		"@storybook/react": "7.2.2",
-		"@storybook/react-webpack5": "7.2.2",
-		"@storybook/source-loader": "7.2.2",
-		"@storybook/theming": "7.2.2",
+		"@react-native/babel-preset": "0.73.10",
+		"@react-native/metro-babel-transformer": "0.73.10",
+		"@react-native/metro-config": "0.73.4",
+		"@storybook/addon-a11y": "7.6.15",
+		"@storybook/addon-actions": "7.6.15",
+		"@storybook/addon-controls": "7.6.15",
+		"@storybook/addon-docs": "7.6.15",
+		"@storybook/addon-toolbars": "7.6.15",
+		"@storybook/addon-viewport": "7.6.15",
+		"@storybook/react": "7.6.15",
+		"@storybook/react-webpack5": "7.6.15",
+		"@storybook/source-loader": "7.6.15",
+		"@storybook/theming": "7.6.15",
 		"@testing-library/jest-dom": "5.16.5",
-		"@testing-library/react": "14.0.0",
-		"@testing-library/react-native": "12.1.2",
+		"@testing-library/react": "14.3.0",
+		"@testing-library/react-native": "12.4.3",
 		"@testing-library/user-event": "14.4.3",
-		"@types/eslint": "7.28.0",
-		"@types/estree": "0.0.50",
+		"@types/eslint": "8.56.9",
+		"@types/estree": "1.0.5",
 		"@types/istanbul-lib-report": "3.0.0",
 		"@types/mime": "2.0.3",
 		"@types/npm-package-arg": "6.1.1",
 		"@types/prettier": "2.4.4",
 		"@types/qs": "6.9.7",
-		"@types/react": "18.0.21",
+		"@types/react": "18.3.1",
 		"@types/react-dates": "21.8.3",
-		"@types/react-dom": "18.0.6",
+		"@types/react-dom": "18.3.0",
 		"@types/requestidlecallback": "0.3.4",
 		"@types/semver": "7.3.8",
 		"@types/sprintf-js": "1.1.2",
 		"@types/uuid": "8.3.1",
-		"@wordpress/babel-plugin-import-jsx-pragma": "file:packages/babel-plugin-import-jsx-pragma",
-		"@wordpress/babel-plugin-makepot": "file:packages/babel-plugin-makepot",
-		"@wordpress/babel-preset-default": "file:packages/babel-preset-default",
-		"@wordpress/base-styles": "file:packages/base-styles",
-		"@wordpress/browserslist-config": "file:packages/browserslist-config",
-		"@wordpress/create-block": "file:packages/create-block",
-		"@wordpress/create-block-tutorial-template": "file:packages/create-block-tutorial-template",
-		"@wordpress/dependency-extraction-webpack-plugin": "file:packages/dependency-extraction-webpack-plugin",
-		"@wordpress/docgen": "file:packages/docgen",
-		"@wordpress/e2e-test-utils": "file:packages/e2e-test-utils",
-		"@wordpress/e2e-test-utils-playwright": "file:packages/e2e-test-utils-playwright",
-		"@wordpress/e2e-tests": "file:packages/e2e-tests",
-		"@wordpress/env": "file:packages/env",
-		"@wordpress/eslint-plugin": "file:packages/eslint-plugin",
-		"@wordpress/jest-console": "file:packages/jest-console",
-		"@wordpress/jest-preset-default": "file:packages/jest-preset-default",
-		"@wordpress/jest-puppeteer-axe": "file:packages/jest-puppeteer-axe",
-		"@wordpress/lazy-import": "file:packages/lazy-import",
-		"@wordpress/npm-package-json-lint-config": "file:packages/npm-package-json-lint-config",
-		"@wordpress/postcss-plugins-preset": "file:packages/postcss-plugins-preset",
-		"@wordpress/postcss-themes": "file:packages/postcss-themes",
-		"@wordpress/prettier-config": "file:packages/prettier-config",
-		"@wordpress/project-management-automation": "file:packages/project-management-automation",
-		"@wordpress/readable-js-assets-webpack-plugin": "file:packages/readable-js-assets-webpack-plugin",
-		"@wordpress/report-flaky-tests": "file:packages/report-flaky-tests",
-		"@wordpress/scripts": "file:packages/scripts",
-		"@wordpress/stylelint-config": "file:packages/stylelint-config",
 		"ajv": "8.7.1",
-		"ajv-draft-04": "1.0.0",
 		"appium": "2.0.0",
-		"babel-jest": "29.6.2",
-		"babel-loader": "8.2.3",
+		"babel-jest": "29.7.0",
+		"babel-loader": "9.2.1",
 		"babel-plugin-inline-json-import": "0.3.2",
 		"babel-plugin-react-native-classname-to-style": "1.2.2",
 		"babel-plugin-react-native-platform-specific-extensions": "1.1.1",
 		"babel-plugin-transform-remove-console": "6.9.4",
 		"benchmark": "2.1.4",
-		"browserslist": "4.21.10",
-		"caniuse-lite": "1.0.30001538",
+		"browserslist": "4.24.0",
+		"caniuse-lite": "1.0.30001667",
 		"chalk": "4.1.1",
 		"change-case": "4.1.2",
+		"client-zip": "^2.4.5",
 		"commander": "9.2.0",
 		"concurrently": "3.5.0",
 		"copy-webpack-plugin": "10.2.0",
-		"core-js-builder": "3.31.0",
+		"core-js-builder": "3.38.1",
 		"cross-env": "3.2.4",
 		"css-loader": "6.2.0",
 		"cssnano": "6.0.1",
@@ -212,29 +115,33 @@
 		"jest-junit": "13.0.0",
 		"jest-message-util": "29.6.2",
 		"jest-watch-typeahead": "2.2.2",
+		"json2md": "2.0.1",
 		"lerna": "7.1.4",
-		"lint-staged": "10.0.1",
+		"lint-staged": "10.0.2",
 		"make-dir": "3.0.0",
-		"metro-react-native-babel-preset": "0.73.10",
-		"metro-react-native-babel-transformer": "0.73.10",
 		"mkdirp": "3.0.1",
 		"mock-match-media": "0.4.2",
 		"moment-timezone-data-webpack-plugin": "1.5.1",
 		"nock": "12.0.3",
-		"node-fetch": "2.6.1",
+		"node-fetch": "2.7.0",
 		"node-watch": "0.7.0",
 		"npm-run-all": "4.1.5",
-		"patch-package": "6.2.2",
-		"postcss": "8.4.16",
+		"patch-package": "8.0.0",
+		"postcss": "8.4.38",
+		"postcss-import": "16.1.0",
 		"postcss-loader": "6.2.1",
+		"postcss-local-keyframes": "^0.0.2",
 		"prettier": "npm:wp-prettier@3.0.3",
 		"progress": "2.0.3",
-		"react": "18.2.0",
-		"react-dom": "18.2.0",
-		"react-native": "0.71.11",
+		"puppeteer-core": "23.1.0",
+		"raw-loader": "4.0.2",
+		"react": "18.3.1",
+		"react-docgen-typescript": "2.2.2",
+		"react-dom": "18.3.1",
+		"react-native": "0.73.3",
 		"react-native-url-polyfill": "1.1.2",
 		"react-refresh": "0.14.0",
-		"react-test-renderer": "18.2.0",
+		"react-test-renderer": "18.3.1",
 		"reassure": "0.7.1",
 		"redux": "4.1.2",
 		"resize-observer-polyfill": "1.5.1",
@@ -243,43 +150,44 @@
 		"sass": "1.35.2",
 		"sass-loader": "12.1.0",
 		"semver": "7.5.4",
-		"simple-git": "3.5.0",
+		"simple-git": "3.24.0",
 		"snapshot-diff": "0.10.0",
 		"source-map-loader": "3.0.0",
 		"sprintf-js": "1.1.1",
-		"storybook": "7.2.2",
+		"storybook": "7.6.15",
 		"storybook-source-link": "2.0.9",
 		"strip-json-comments": "5.0.0",
 		"style-loader": "3.2.1",
-		"terser-webpack-plugin": "5.3.9",
-		"typescript": "5.1.6",
-		"uglify-js": "3.13.7",
+		"terser": "5.32.0",
+		"terser-webpack-plugin": "5.3.10",
+		"typescript": "5.5.3",
 		"uuid": "9.0.1",
 		"webdriverio": "8.16.20",
-		"webpack": "5.88.2",
+		"webpack": "5.95.0",
 		"webpack-bundle-analyzer": "4.9.1",
 		"worker-farm": "1.7.0"
 	},
 	"overrides": {
-		"jsdom": "22.1.0"
+		"jsdom": "25.0.1"
 	},
 	"scripts": {
 		"build": "npm run build:packages && wp-scripts build",
 		"build:analyze-bundles": "npm run build -- --webpack-bundle-analyzer",
-		"build:package-types": "node ./bin/packages/validate-typescript-version.js && tsc --build && node ./bin/packages/check-build-type-declaration-files.js",
-		"prebuild:packages": "npm run clean:packages && lerna run build",
-		"build:packages": "npm run build:package-types && node ./bin/packages/build.js",
+		"build:package-types": "node ./bin/packages/validate-typescript-version.js && ( tsc --build || ( echo 'tsc failed. Try cleaning up first: `npm run clean:package-types`'; exit 1 ) ) && node ./bin/packages/check-build-type-declaration-files.js",
+		"prebuild:packages": "npm run clean:packages && npm run --if-present --workspaces build",
+		"build:packages": "npm run --silent build:package-types && node ./bin/packages/build.js",
 		"build:plugin-zip": "bash ./bin/build-plugin-zip.sh",
-		"clean:package-types": "tsc --build --clean",
+		"clean:package-types": "tsc --build --clean && rimraf \"./packages/*/build-types\"",
 		"clean:packages": "rimraf \"./packages/*/@(build|build-module|build-style)\"",
-		"dev": "npm run build:packages && concurrently \"wp-scripts start\" \"npm run dev:packages\"",
-		"dev:packages": "concurrently \"node ./bin/packages/watch.js\" \"tsc --build --watch\"",
-		"distclean": "rimraf node_modules packages/*/node_modules",
+		"dev": "cross-env NODE_ENV=development npm run build:packages && concurrently \"wp-scripts start\" \"npm run dev:packages\"",
+		"dev:packages": "cross-env NODE_ENV=development concurrently \"node ./bin/packages/watch.js\" \"tsc --build --watch\"",
+		"distclean": "git clean --force -d -X",
 		"docs:api-ref": "node ./bin/api-docs/update-api-docs.js",
 		"docs:blocks": "node ./bin/api-docs/gen-block-lib-list.js",
-		"docs:build": "npm-run-all docs:gen docs:blocks docs:api-ref docs:theme-ref",
+		"docs:build": "npm-run-all docs:components docs:gen docs:blocks docs:api-ref docs:theme-ref",
+		"docs:components": "node ./bin/api-docs/gen-components-docs/index.mjs",
 		"docs:gen": "node ./docs/tool/index.js",
-		"docs:theme-ref": "node ./bin/api-docs/gen-theme-reference.js",
+		"docs:theme-ref": "node ./bin/api-docs/gen-theme-reference.mjs",
 		"env": "wp-env",
 		"fixtures:clean": "rimraf \"test/integration/fixtures/blocks/*.+(json|serialized.html)\"",
 		"fixtures:generate": "cross-env GENERATE_MISSING_FIXTURES=y npm run test:unit test/integration/full-content/ && npm run format test/integration/fixtures/blocks/*.json",
@@ -300,10 +208,11 @@
 		"lint:pkg-json": "wp-scripts lint-pkg-json . 'packages/*/package.json'",
 		"native": "npm run --prefix packages/react-native-editor",
 		"other:changelog": "node ./bin/plugin/cli.js changelog",
-		"other:check-licenses": "concurrently \"wp-scripts check-licenses --prod --gpl2 --ignore=@react-native-community/cli,@react-native-community/cli-platform-ios\" \"wp-scripts check-licenses --dev\"",
+		"other:check-licenses": "concurrently \"node ./bin/check-licenses.mjs\" \"wp-scripts check-licenses --dev\"",
 		"preother:check-local-changes": "npm run docs:build",
 		"other:check-local-changes": "node ./bin/check-local-changes.js",
 		"other:cherry-pick": "node ./bin/cherry-pick.mjs",
+		"other:generate-php-sync-issue": "node ./bin/generate-php-sync-issue.mjs",
 		"other:update-packages:php": "wp-env run --env-cwd='wp-content/plugins/gutenberg' cli composer update --no-interaction",
 		"postinstall": "patch-package && node ./patches/patch-xcode.js",
 		"prepare": "husky install",
@@ -316,9 +225,10 @@
 		"storybook:e2e:dev": "concurrently \"npm run dev:packages\" \"storybook dev -c test/storybook-playwright/storybook -p 50241\"",
 		"test": "npm-run-all lint test:unit",
 		"test:create-block": "bash ./bin/test-create-block.sh",
-		"test:e2e": "wp-scripts test-e2e --config packages/e2e-tests/jest.config.js",
-		"test:e2e:debug": "wp-scripts --inspect-brk test-e2e  --runInBand --no-cache --verbose --config packages/e2e-tests/jest.config.js --puppeteer-devtools",
-		"test:e2e:playwright": "wp-scripts test-playwright --config test/e2e/playwright.config.ts",
+		"test:e2e": "wp-scripts test-playwright --config test/e2e/playwright.config.ts",
+		"test:e2e:debug": "wp-scripts test-playwright --config test/e2e/playwright.config.ts --ui",
+		"test:e2e:playwright": "npm run test:e2e",
+		"test:e2e:playwright:debug": "npm run test:e2e:debug",
 		"test:e2e:storybook": "playwright test --config test/storybook-playwright/playwright.config.ts",
 		"test:e2e:watch": "npm run test:e2e -- --watch",
 		"test:native": "cross-env NODE_ENV=test jest --config test/native/jest.config.js",
@@ -359,8 +269,7 @@
 			"wp-scripts lint-style"
 		],
 		"package-lock.json": [
-			"npm run lint:lockfile",
-			"node ./bin/check-latest-npm.js"
+			"npm run lint:lockfile"
 		],
 		"packages/*/package.json": [
 			"wp-scripts lint-pkg-json"
@@ -379,17 +288,7 @@
 			"npm run lint:tsconfig"
 		]
 	},
-	"wp-env": {
-		"plugin-dir": "gutenberg",
-		"plugin-name": "Gutenberg",
-		"docker-template": "./bin/docker-compose.override.yml.template",
-		"welcome-logo": [
-			",⁻⁻⁻·       .                 |",
-			"|  ،⁓’.   . |---  ,---. ,---. |---. ,---. ,---. ,---.",
-			"|   | |   | |     |---' |   | |   | |---' |     |   |",
-			"`---' `---' `---’ `---’ '   ` `---' `---’ `     `---|",
-			"                                                `---'"
-		],
-		"welcome-build-command": "npm run dev"
-	}
+	"workspaces": [
+		"packages/*"
+	]
 }
diff --git a/packages/README.md b/packages/README.md
index a17b36dbc10bf9..cc2f34e38ac055 100644
--- a/packages/README.md
+++ b/packages/README.md
@@ -1,13 +1,14 @@
 # Managing Packages
 
-This repository uses [monorepo] to manage WordPress modules and publish them with [lerna] as packages to [npm].
+This repository uses [npm workspaces](https://docs.npmjs.com/cli/v10/using-npm/workspaces) to manage WordPress packages and [lerna](https://lerna.js.org/) to publish them with to [npm](https://www.npmjs.com/).
 
 ## Creating a New Package
 
-When creating a new package, you need to provide at least the following:
+When creating a new package, you need to provide at least the following. Packages bundled in Gutenberg or WordPress must include a `wpScript` and or `wpScriptModuleExports` field in their `package.json` file. See the details below.
 
 1. `package.json` based on the template:
-    ```json
+
+    ```jsonc
     {
     	"name": "@wordpress/package-name",
     	"version": "1.0.0-prerelease",
@@ -28,19 +29,44 @@ When creating a new package, you need to provide at least the following:
     	"module": "build-module/index.js",
     	"react-native": "src/index",
     	"dependencies": {
-    		"@babel/runtime": "^7.16.0"
+    		"@babel/runtime": "7.25.7"
     	},
     	"publishConfig": {
     		"access": "public"
-    	}
+    	},
+    	// Include this line to include the package as a WordPress script.
+    	"wpScript": true,
+    	// Include this line to include the package as a WordPress script module.
+    	"wpScriptModuleExports": "./build-module/index.js"
     }
     ```
+
     This assumes that your code is located in the `src` folder and will be transpiled with `Babel`.
-2. `.npmrc` file which disables creating `package-lock.json` file for the package:
-    ```
-    package-lock=false
+
+    For packages that should ship as a WordPress script, include `wpScript: true` in the `package.json` file. This tells the build system to bundle the package for use as a WordPress script.
+
+    For packages that should ship as a WordPress script module, include a `wpScriptModuleExports` field the `package.json` file. The value of this field can be a string to expose a single script module, or an object with a [shape like the standard `exports` object](https://nodejs.org/docs/latest-v20.x/api/packages.html#subpath-exports) to expose multiple script modules from a single package:
+
+    ```jsonc
+    {
+    	"name": "@wordpress/example",
+
+    	// The string form exposes the `@wordpress/example` script module.
+    	"wpScriptModuleExports": "./build-module/index.js",
+
+    	// Multiple sub-modules can be exposed by providing an object:
+    	"wpScriptModuleExports": {
+    		// Exposed as `@wordpress/example` script module.
+    		".": "./build-module/index.js",
+    		// Exposed as `@wordpress/example/demo-block/view` script module.
+    		"./demo-block/view": "./build-module/index.js"
+    	}
+    }
     ```
-3. `README.md` file containing at least:
+
+    Both `wpScript` and `wpScriptModuleExports` may be included if the package exposes both a script and a script module.
+
+1. `README.md` file containing at least:
     - Package name
     - Package description
     - Installation details
@@ -48,7 +74,7 @@ When creating a new package, you need to provide at least the following:
     - API documentation, if applicable ([more info](#maintaining-api-documentation))
     - A link to the contributing guidelines ([here's an example](https://github.com/WordPress/gutenberg/tree/HEAD/packages/a11y/README.md#contributing-to-this-package) from the a11y package)
     - `Code is Poetry` logo (`<br/><br/><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>`)
-4. `CHANGELOG.md` file containing at least:
+1. `CHANGELOG.md` file containing at least:
 
     ```
     <!-- Learn how to maintain this file at https://github.com/WordPress/gutenberg/tree/HEAD/packages#maintaining-changelogs. -->
@@ -58,7 +84,7 @@ When creating a new package, you need to provide at least the following:
     Initial release.
     ```
 
-To ensure your package is recognised, you should also _manually_ add your new package to the root `package.json` file and then run `npm install` to update the dependencies.
+To ensure your package is recognized, you should also _manually_ add your new package to the root `package.json` file and then run `npm install` to update the dependencies.
 
 ## Managing Dependencies
 
@@ -70,41 +96,38 @@ Production dependencies are stored in the `dependencies` section of the package
 
 #### Adding New Dependencies
 
-The simplest way to add a production dependency to one of the packages is to run a very convenient [lerna add](https://github.com/lerna/lerna/tree/HEAD/commands/add#readme) command from the root of the project.
+The simplest way to add a production dependency to one of the packages is to run a command like the following from the root of the project.
 
 _Example:_
 
 ```bash
-lerna add change-case packages/a11y
+npm install change-case -w packages/a11y
 ```
 
-This command adds the latest version of `change-case` as a dependency to the `@wordpress/a11y` package, which is located in `packages/a11y` folder.
+This command adds the `change-case` as a dependency to the `@wordpress/a11y` package, which is located in `packages/a11y` folder. If there was the same dependency installed then the version specified in the `package-lock.json` file is going to be reused. If you want to enforce a different version, you can do so by adding the `@` suffix to the package name.
+
+_Example:_
+
+```bash
+npm install change-case@latest -w packages/a11y
+```
 
 #### Removing Existing Dependencies
 
-Removing a dependency from one of the WordPress packages requires some manual work. You need to remove the line in the corresponding `dependencies` section of the `package.json` file.
+Removing a dependency from one of the WordPress packages is similar to installation. You need to run a command like the following from the root of the project.
 
 _Example:_
 
-```diff
-+++ b/packages/scripts/package.json
-@@ -43,7 +43,6 @@
-                "check-node-version": "^4.1.0",
-                "cross-spawn": "^5.1.0",
-                "eslint": "^7.1.0",
--               "jest": "^29.6.2",
-                "minimist": "^1.2.0",
-                "npm-package-json-lint": "^6.4.0",
+```bash
+npm uninstall change-case -w packages/a11y
 ```
 
-Next, you need to run `npm install` in the root of the project to ensure that `package-lock.json` file gets properly regenerated.
-
 #### Updating Existing Dependencies
 
 This is the most confusing part of working with [monorepo] which causes a lot of hassles for contributors. The most successful strategy so far is to do the following:
 
 1.  First, remove the existing dependency as described in the previous section.
-2.  Next, add the same dependency back as described in the first section of this chapter. This time it wil get the latest version applied unless you enforce a different version explicitly.
+2.  Next, add the same dependency back as described in the first section of this chapter. This time it will get the latest version applied unless you enforce a different version explicitly.
 
 ### Development Dependencies
 
@@ -152,9 +175,9 @@ It's very important to have a good plan for what a new package will include. All
 
 ## Maintaining Changelogs
 
-In maintaining dozens of npm packages, it can be tough to keep track of changes. To simplify the release process, each package includes a `CHANGELOG.md` file which details all published releases and the unreleased ("Unreleased") changes, if any exist.
+When maintaining dozens of npm packages, it can be tough to keep track of changes. To simplify the release process, each package includes a `CHANGELOG.md` file which details all published releases and the unreleased ("Unreleased") changes, if any exist.
 
-For each pull request, you should always include relevant changes in a "Unreleased" heading at the top of the file. You should add the heading if it doesn't already exist.
+For each pull request, you should always include relevant changes under an "Unreleased" heading at the top of the file. You should add the heading if it doesn't already exist.
 
 _Example:_
 
@@ -170,10 +193,11 @@ _Example:_
 
 There are a number of common release subsections you can follow. Each is intended to align to a specific meaning in the context of the [Semantic Versioning (`semver`) specification](https://semver.org/) the project adheres to. It is important that you describe your changes accurately, since this is used in the packages release process to help determine the version of the next release.
 
--   "Breaking Change" - A backwards-incompatible change which requires specific attention of the impacted developers to reconcile (requires a major version bump).
--   "New Feature" - The addition of a new backwards-compatible function or feature to the existing public API (requires a minor version bump).
--   "Enhancement" - Backwards-compatible improvements to existing functionality (requires a minor version bump).
--   "Bug Fix" - Resolutions to existing buggy behavior (requires a patch version bump).
+-   "Breaking Changes" - A backwards-incompatible change which requires specific attention of the impacted developers to reconcile (requires a major version bump).
+-   "New Features" - The addition of a new backwards-compatible function or feature to the existing public API (requires a minor version bump).
+-   "Enhancements" - Backwards-compatible improvements to existing functionality (requires a minor version bump).
+-   "Deprecations" - Deprecation notices. These do not impact the public interface or behavior of the module (requires a minor version bump).
+-   "Bug Fixes" - Resolutions to existing buggy behavior (requires a patch version bump).
 -   "Internal" - Changes which do not have an impact on the public interface or behavior of the module (requires a patch version bump).
 
 While other section naming can be used when appropriate, it's important that are expressed clearly to avoid confusion for both the packages releaser and third-party consumers.
@@ -199,7 +223,7 @@ Gutenberg uses TypeScript by running the TypeScript compiler (`tsc`) on select p
 These packages benefit from type checking and produced type declarations in the published packages.
 
 To opt-in to TypeScript tooling, packages should include a `tsconfig.json` file in the package root and add an entry to the root `tsconfig.json` references.
-The changes will indicate that the package has opted-in and will be included in the TypeScript build process.
+The changes will indicate that the package has opted in and will be included in the TypeScript build process.
 
 A `tsconfig.json` file should look like the following (comments are not necessary):
 
@@ -238,10 +262,6 @@ For consumers to use the published type declarations, we'll set the `types` fiel
 
 Ensure that the `build-types` directory will be included in the published package, for example if a `files` field is declared.
 
-[lerna]: https://lerna.js.org/
-[monorepo]: https://monorepo.tools
-[npm]: https://www.npmjs.com/
-
 ## Optimizing for bundlers
 
 In order for bundlers to tree-shake packages effectively, they often need to know whether a package includes side effects in its code. This is done through the `sideEffects` field in the package's `package.json`.
diff --git a/packages/a11y/CHANGELOG.md b/packages/a11y/CHANGELOG.md
index 2e25cf3d19bcb0..08ac31b560ca87 100644
--- a/packages/a11y/CHANGELOG.md
+++ b/packages/a11y/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -107,22 +155,22 @@
 
 ## 2.9.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
 
 ## 1.1.0 (2018-07-12)
 
-### New feature
+### New Features
 
 -   Updated build to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
-### Polish
+### Internal
 
 -   Moved `@WordPress/packages` repository to `@WordPress/gutenberg` ([#7805](https://github.com/WordPress/gutenberg/pull/7805))
diff --git a/packages/a11y/README.md b/packages/a11y/README.md
index 202bbdf0735bc5..755396d2bb8f09 100644
--- a/packages/a11y/README.md
+++ b/packages/a11y/README.md
@@ -39,7 +39,7 @@ speak( 'The message you want to send to the ARIA live region', 'assertive' );
 _Parameters_
 
 -   _message_ `string`: The message to be announced by assistive technologies.
--   _ariaLive_ `[string]`: The politeness level for aria-live; default: 'polite'.
+-   _ariaLive_ `['polite'|'assertive']`: The politeness level for aria-live; default: 'polite'.
 
 <!-- END TOKEN(Autogenerated API docs) -->
 
@@ -67,7 +67,7 @@ For context I’ll quote [this article on WordPress.org](https://make.wordpress.
 
 ## Browser support
 
-See <https://make.wordpress.org/design/handbook/design-guide/browser-support/>
+See <https://make.wordpress.org/core/handbook/best-practices/browser-support/>
 
 ## Contributing to this package
 
diff --git a/packages/a11y/package.json b/packages/a11y/package.json
index 61362916dd66f4..a506cb940e7765 100644
--- a/packages/a11y/package.json
+++ b/packages/a11y/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/a11y",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "Accessibility (a11y) utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,18 +21,21 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
+	"wpScriptModuleExports": "./build-module/module/index.js",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/dom-ready": "file:../dom-ready",
-		"@wordpress/i18n": "file:../i18n"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/dom-ready": "*",
+		"@wordpress/i18n": "*"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/a11y/src/index.js b/packages/a11y/src/index.js
index 957c76500c4344..cdc3be10545155 100644
--- a/packages/a11y/src/index.js
+++ b/packages/a11y/src/index.js
@@ -6,10 +6,10 @@ import domReady from '@wordpress/dom-ready';
 /**
  * Internal dependencies
  */
-import addIntroText from './add-intro-text';
-import addContainer from './add-container';
-import clear from './clear';
-import filterMessage from './filter-message';
+import addContainer from './script/add-container';
+import addIntroText from './script/add-intro-text';
+
+export { speak } from './shared/index';
 
 /**
  * Create the live regions.
@@ -38,51 +38,3 @@ export function setup() {
  * Run setup on domReady.
  */
 domReady( setup );
-
-/**
- * Allows you to easily announce dynamic interface updates to screen readers using ARIA live regions.
- * This module is inspired by the `speak` function in `wp-a11y.js`.
- *
- * @param {string} message    The message to be announced by assistive technologies.
- * @param {string} [ariaLive] The politeness level for aria-live; default: 'polite'.
- *
- * @example
- * ```js
- * import { speak } from '@wordpress/a11y';
- *
- * // For polite messages that shouldn't interrupt what screen readers are currently announcing.
- * speak( 'The message you want to send to the ARIA live region' );
- *
- * // For assertive messages that should interrupt what screen readers are currently announcing.
- * speak( 'The message you want to send to the ARIA live region', 'assertive' );
- * ```
- */
-export function speak( message, ariaLive ) {
-	/*
-	 * Clear previous messages to allow repeated strings being read out and hide
-	 * the explanatory text from assistive technologies.
-	 */
-	clear();
-
-	message = filterMessage( message );
-
-	const introText = document.getElementById( 'a11y-speak-intro-text' );
-	const containerAssertive = document.getElementById(
-		'a11y-speak-assertive'
-	);
-	const containerPolite = document.getElementById( 'a11y-speak-polite' );
-
-	if ( containerAssertive && ariaLive === 'assertive' ) {
-		containerAssertive.textContent = message;
-	} else if ( containerPolite ) {
-		containerPolite.textContent = message;
-	}
-
-	/*
-	 * Make the explanatory text available to assistive technologies by removing
-	 * the 'hidden' HTML attribute.
-	 */
-	if ( introText ) {
-		introText.removeAttribute( 'hidden' );
-	}
-}
diff --git a/packages/a11y/src/index.native.js b/packages/a11y/src/index.native.js
index f6f53b6343adb0..e17597a8b2747d 100644
--- a/packages/a11y/src/index.native.js
+++ b/packages/a11y/src/index.native.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import filterMessage from './filter-message';
+import filterMessage from './shared/filter-message';
 
 /**
  * Update the ARIA live notification area text node.
diff --git a/packages/a11y/src/module/index.ts b/packages/a11y/src/module/index.ts
new file mode 100644
index 00000000000000..a06882f068dd3a
--- /dev/null
+++ b/packages/a11y/src/module/index.ts
@@ -0,0 +1,11 @@
+/**
+ * Internal dependencies
+ */
+export { speak } from '../shared/index';
+
+/**
+ * This no-op function is exported to provide compatibility with the `wp-a11y` Script.
+ *
+ * Filters should inject the relevant HTML on page load instead of requiring setup.
+ */
+export const setup = () => {};
diff --git a/packages/a11y/src/add-container.js b/packages/a11y/src/script/add-container.js
similarity index 100%
rename from packages/a11y/src/add-container.js
rename to packages/a11y/src/script/add-container.js
diff --git a/packages/a11y/src/add-intro-text.js b/packages/a11y/src/script/add-intro-text.ts
similarity index 100%
rename from packages/a11y/src/add-intro-text.js
rename to packages/a11y/src/script/add-intro-text.ts
diff --git a/packages/a11y/src/test/add-container.test.js b/packages/a11y/src/script/test/add-container.test.js
similarity index 100%
rename from packages/a11y/src/test/add-container.test.js
rename to packages/a11y/src/script/test/add-container.test.js
diff --git a/packages/a11y/src/clear.js b/packages/a11y/src/shared/clear.js
similarity index 100%
rename from packages/a11y/src/clear.js
rename to packages/a11y/src/shared/clear.js
diff --git a/packages/a11y/src/filter-message.js b/packages/a11y/src/shared/filter-message.js
similarity index 100%
rename from packages/a11y/src/filter-message.js
rename to packages/a11y/src/shared/filter-message.js
diff --git a/packages/a11y/src/shared/index.js b/packages/a11y/src/shared/index.js
new file mode 100644
index 00000000000000..2b6353720d0add
--- /dev/null
+++ b/packages/a11y/src/shared/index.js
@@ -0,0 +1,53 @@
+/**
+ * Internal dependencies
+ */
+import clear from './clear';
+import filterMessage from './filter-message';
+
+/**
+ * Allows you to easily announce dynamic interface updates to screen readers using ARIA live regions.
+ * This module is inspired by the `speak` function in `wp-a11y.js`.
+ *
+ * @param {string}               message    The message to be announced by assistive technologies.
+ * @param {'polite'|'assertive'} [ariaLive] The politeness level for aria-live; default: 'polite'.
+ *
+ * @example
+ * ```js
+ * import { speak } from '@wordpress/a11y';
+ *
+ * // For polite messages that shouldn't interrupt what screen readers are currently announcing.
+ * speak( 'The message you want to send to the ARIA live region' );
+ *
+ * // For assertive messages that should interrupt what screen readers are currently announcing.
+ * speak( 'The message you want to send to the ARIA live region', 'assertive' );
+ * ```
+ */
+export function speak( message, ariaLive ) {
+	/*
+	 * Clear previous messages to allow repeated strings being read out and hide
+	 * the explanatory text from assistive technologies.
+	 */
+	clear();
+
+	message = filterMessage( message );
+
+	const introText = document.getElementById( 'a11y-speak-intro-text' );
+	const containerAssertive = document.getElementById(
+		'a11y-speak-assertive'
+	);
+	const containerPolite = document.getElementById( 'a11y-speak-polite' );
+
+	if ( containerAssertive && ariaLive === 'assertive' ) {
+		containerAssertive.textContent = message;
+	} else if ( containerPolite ) {
+		containerPolite.textContent = message;
+	}
+
+	/*
+	 * Make the explanatory text available to assistive technologies by removing
+	 * the 'hidden' HTML attribute.
+	 */
+	if ( introText ) {
+		introText.removeAttribute( 'hidden' );
+	}
+}
diff --git a/packages/a11y/src/test/clear.test.js b/packages/a11y/src/shared/test/clear.test.js
similarity index 100%
rename from packages/a11y/src/test/clear.test.js
rename to packages/a11y/src/shared/test/clear.test.js
diff --git a/packages/a11y/src/test/filter-message.test.js b/packages/a11y/src/shared/test/filter-message.test.js
similarity index 100%
rename from packages/a11y/src/test/filter-message.test.js
rename to packages/a11y/src/shared/test/filter-message.test.js
diff --git a/packages/a11y/src/test/index.test.js b/packages/a11y/src/test/index.test.js
index 4815baa2205047..0f6b9d0bd572ed 100644
--- a/packages/a11y/src/test/index.test.js
+++ b/packages/a11y/src/test/index.test.js
@@ -7,10 +7,10 @@ import domReady from '@wordpress/dom-ready';
  * Internal dependencies
  */
 import { setup, speak } from '../';
-import clear from '../clear';
-import filterMessage from '../filter-message';
+import clear from '../shared/clear';
+import filterMessage from '../shared/filter-message';
 
-jest.mock( '../clear', () => {
+jest.mock( '../shared/clear', () => {
 	return jest.fn();
 } );
 jest.mock( '@wordpress/dom-ready', () => {
@@ -18,7 +18,7 @@ jest.mock( '@wordpress/dom-ready', () => {
 		callback();
 	} );
 } );
-jest.mock( '../filter-message', () => {
+jest.mock( '../shared/filter-message', () => {
 	return jest.fn( ( message ) => {
 		return message;
 	} );
diff --git a/packages/a11y/tsconfig.json b/packages/a11y/tsconfig.json
index 1fbcb11147444b..093c2775f96d66 100644
--- a/packages/a11y/tsconfig.json
+++ b/packages/a11y/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/annotations/.npmrc b/packages/annotations/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/annotations/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/annotations/CHANGELOG.md b/packages/annotations/CHANGELOG.md
index 525f9b99dbcdb9..0f4795b11f109a 100644
--- a/packages/annotations/CHANGELOG.md
+++ b/packages/annotations/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 3.10.0 (2024-10-16)
+
+## 3.9.0 (2024-10-03)
+
+## 3.8.0 (2024-09-19)
+
+## 3.7.0 (2024-09-05)
+
+## 3.6.0 (2024-08-21)
+
+## 3.5.0 (2024-08-07)
+
+## 3.4.0 (2024-07-24)
+
+## 3.3.0 (2024-07-10)
+
+## 3.2.0 (2024-06-26)
+
+## 3.1.0 (2024-06-15)
+
+## 3.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 2.58.0 (2024-05-16)
+
+## 2.57.0 (2024-05-02)
+
+## 2.56.0 (2024-04-19)
+
+## 2.55.0 (2024-04-03)
+
+## 2.54.0 (2024-03-21)
+
+## 2.53.0 (2024-03-06)
+
+## 2.52.0 (2024-02-21)
+
+## 2.51.0 (2024-02-09)
+
+## 2.50.0 (2024-01-24)
+
+## 2.49.0 (2024-01-10)
+
+## 2.48.0 (2023-12-13)
+
 ## 2.47.0 (2023-11-29)
 
 ## 2.46.0 (2023-11-16)
@@ -107,7 +155,7 @@
 
 ## 1.24.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the annotations namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
diff --git a/packages/annotations/package.json b/packages/annotations/package.json
index ece531d439d31e..4a1f0fe2b771b5 100644
--- a/packages/annotations/package.json
+++ b/packages/annotations/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/annotations",
-	"version": "2.47.0",
+	"version": "3.10.0",
 	"description": "Annotate content in the Gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,18 +19,18 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/data": "file:../data",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/rich-text": "file:../rich-text",
-		"rememo": "^4.0.2",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/data": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/rich-text": "*",
 		"uuid": "^9.0.1"
 	},
 	"peerDependencies": {
@@ -38,5 +38,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/annotations/src/store/selectors.js b/packages/annotations/src/store/selectors.js
index 8ec24e0541e6fa..463c00439e77ef 100644
--- a/packages/annotations/src/store/selectors.js
+++ b/packages/annotations/src/store/selectors.js
@@ -1,7 +1,7 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import createSelector from 'rememo';
+import { createSelector } from '@wordpress/data';
 
 /**
  * Shared reference to an empty array for cases where it is important to avoid
diff --git a/packages/api-fetch/.npmrc b/packages/api-fetch/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/api-fetch/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/api-fetch/CHANGELOG.md b/packages/api-fetch/CHANGELOG.md
index f098d18f5b204b..dc654223da9e9f 100644
--- a/packages/api-fetch/CHANGELOG.md
+++ b/packages/api-fetch/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 7.10.0 (2024-10-16)
+
+## 7.9.0 (2024-10-03)
+
+## 7.8.0 (2024-09-19)
+
+## 7.7.0 (2024-09-05)
+
+## 7.6.0 (2024-08-21)
+
+## 7.5.0 (2024-08-07)
+
+## 7.4.0 (2024-07-24)
+
+## 7.3.0 (2024-07-10)
+
+## 7.2.0 (2024-06-26)
+
+## 7.1.0 (2024-06-15)
+
+## 7.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 6.55.0 (2024-05-16)
+
+## 6.54.0 (2024-05-02)
+
+## 6.53.0 (2024-04-19)
+
+## 6.52.0 (2024-04-03)
+
+## 6.51.0 (2024-03-21)
+
+## 6.50.0 (2024-03-06)
+
+## 6.49.0 (2024-02-21)
+
+## 6.48.0 (2024-02-09)
+
+## 6.47.0 (2024-01-24)
+
+## 6.46.0 (2024-01-10)
+
+## 6.45.0 (2023-12-13)
+
 ## 6.44.0 (2023-11-29)
 
 ## 6.43.0 (2023-11-16)
@@ -92,9 +140,9 @@
 
 ## 6.0.0 (2022-01-27)
 
-### Breaking changes
+### Breaking Changes
 
-   `OPTIONS` requests handled by the preloading middleware are now resolved as `window.Response` objects if you explicitly set `parse: false` (for consistency with how GET requests are resolved). They used to be resolved as `Plain Old JavaScript Objects`.
+`OPTIONS` requests handled by the preloading middleware are now resolved as `window.Response` objects if you explicitly set `parse: false` (for consistency with how GET requests are resolved). They used to be resolved as `Plain Old JavaScript Objects`.
 
 ## 5.2.5 (2021-11-07)
 
@@ -104,7 +152,7 @@
 
 ## 5.2.0 (2021-07-21)
 
-### New feature
+### New Features
 
 -   `AbortError` being thrown by the default fetch handler can now be caught and handled separately in user-land. Add documentation about aborting a request ([#32530](https://github.com/WordPress/gutenberg/pull/32530)).
 
@@ -131,7 +179,7 @@
 
 ## 3.23.0 (2021-04-06)
 
-### New Feature
+### New Features
 
 -   Publish TypeScript definitions.
 
@@ -154,7 +202,7 @@
 
 -   A created nonce middleware will no longer automatically listen for `heartbeat.tick` actions. Assign to the new `nonce` middleware property instead.
 
-### New Feature
+### New Features
 
 -   The function returned by `createNonceMiddleware` includes an assignable `nonce` property corresponding to the active nonce to be used.
 -   Default fetch handler can be overridden with a custom fetch handler
@@ -173,18 +221,18 @@
 
 ## 2.2.0 (2018-10-29)
 
-### New Feature
+### New Features
 
 -   Always request data in the user's locale ([#10862](https://github.com/WordPress/gutenberg/pull/10862)).
 
 ## 2.1.0 (2018-10-22)
 
-### New Feature
+### New Features
 
 -   Support `per_page=-1` paginated requests.
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/api-fetch/package.json b/packages/api-fetch/package.json
index ae71a5ead84805..79968c31d1043a 100644
--- a/packages/api-fetch/package.json
+++ b/packages/api-fetch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/api-fetch",
-	"version": "6.44.0",
+	"version": "7.10.0",
 	"description": "Utility to make WordPress REST API requests.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,18 +20,20 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/url": "file:../url"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/i18n": "*",
+		"@wordpress/url": "*"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/api-fetch/src/middlewares/media-upload.js b/packages/api-fetch/src/middlewares/media-upload.js
index 417abf775db636..ddd0be4e4ab436 100644
--- a/packages/api-fetch/src/middlewares/media-upload.js
+++ b/packages/api-fetch/src/middlewares/media-upload.js
@@ -63,6 +63,11 @@ const mediaUploadMiddleware = ( options, next ) => {
 
 	return next( { ...options, parse: false } )
 		.catch( ( response ) => {
+			// `response` could actually be an error thrown by `defaultFetchHandler`.
+			if ( ! response.headers ) {
+				return Promise.reject( response );
+			}
+
 			const attachmentId = response.headers.get(
 				'x-wp-upload-attachment-id'
 			);
diff --git a/packages/api-fetch/src/middlewares/theme-preview.js b/packages/api-fetch/src/middlewares/theme-preview.js
index 8ab21fc3284763..56098c88cb351f 100644
--- a/packages/api-fetch/src/middlewares/theme-preview.js
+++ b/packages/api-fetch/src/middlewares/theme-preview.js
@@ -1,32 +1,39 @@
 /**
  * WordPress dependencies
  */
-import { addQueryArgs, hasQueryArg } from '@wordpress/url';
+import { addQueryArgs, getQueryArg, removeQueryArgs } from '@wordpress/url';
 
 /**
  * This appends a `wp_theme_preview` parameter to the REST API request URL if
  * the admin URL contains a `theme` GET parameter.
  *
+ * If the REST API request URL has contained the `wp_theme_preview` parameter as `''`,
+ * then bypass this middleware.
+ *
  * @param {Record<string, any>} themePath
  * @return {import('../types').APIFetchMiddleware} Preloading middleware.
  */
 const createThemePreviewMiddleware = ( themePath ) => ( options, next ) => {
-	if (
-		typeof options.url === 'string' &&
-		! hasQueryArg( options.url, 'wp_theme_preview' )
-	) {
-		options.url = addQueryArgs( options.url, {
-			wp_theme_preview: themePath,
-		} );
+	if ( typeof options.url === 'string' ) {
+		const wpThemePreview = getQueryArg( options.url, 'wp_theme_preview' );
+		if ( wpThemePreview === undefined ) {
+			options.url = addQueryArgs( options.url, {
+				wp_theme_preview: themePath,
+			} );
+		} else if ( wpThemePreview === '' ) {
+			options.url = removeQueryArgs( options.url, 'wp_theme_preview' );
+		}
 	}
 
-	if (
-		typeof options.path === 'string' &&
-		! hasQueryArg( options.path, 'wp_theme_preview' )
-	) {
-		options.path = addQueryArgs( options.path, {
-			wp_theme_preview: themePath,
-		} );
+	if ( typeof options.path === 'string' ) {
+		const wpThemePreview = getQueryArg( options.path, 'wp_theme_preview' );
+		if ( wpThemePreview === undefined ) {
+			options.path = addQueryArgs( options.path, {
+				wp_theme_preview: themePath,
+			} );
+		} else if ( wpThemePreview === '' ) {
+			options.path = removeQueryArgs( options.path, 'wp_theme_preview' );
+		}
 	}
 
 	return next( options );
diff --git a/packages/api-fetch/tsconfig.json b/packages/api-fetch/tsconfig.json
index 2dcfb6b4ff479e..f9d517286a102f 100644
--- a/packages/api-fetch/tsconfig.json
+++ b/packages/api-fetch/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/autop/.npmrc b/packages/autop/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/autop/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/autop/CHANGELOG.md b/packages/autop/CHANGELOG.md
index edc06ebf114c5d..0a4a27cfbed808 100644
--- a/packages/autop/CHANGELOG.md
+++ b/packages/autop/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+### Internal
+
+-   Refactor to TypeScript ([#62583](https://github.com/WordPress/gutenberg/pull/62583)).
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -107,31 +159,31 @@
 
 ## 2.7.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#20669](https://github.com/WordPress/gutenberg/pull/20669))
 
 ## 2.3.0 (2019-05-21)
 
-### Bug Fix
+### Bug Fixes
 
 -   `removep` will correctly preserve multi-line paragraph tags where attributes are present.
 
 ## 2.1.0 (2019-03-06)
 
-### Bug Fix
+### Bug Fixes
 
 -   `autop` correctly matches whitespace preceding and following block-level elements.
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
 
 ## 1.1.0 (2018-07-12)
 
-### New Feature
+### New Features
 
 -   Updated build to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
@@ -141,6 +193,6 @@
 
 ## 1.0.6 (2018-05-08)
 
-### Polish
+### Internal
 
 -   Documentation: Fix API method typo for `removep`. ([#120](https://github.com/WordPress/packages/pull/120))
diff --git a/packages/autop/package.json b/packages/autop/package.json
index 28673b8a203b5e..aea14b2c666e14 100644
--- a/packages/autop/package.json
+++ b/packages/autop/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/autop",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "WordPress's automatic paragraph functions `autop` and `removep`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,9 +28,10 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/autop/src/index.js b/packages/autop/src/index.js
deleted file mode 100644
index 596a028f461643..00000000000000
--- a/packages/autop/src/index.js
+++ /dev/null
@@ -1,488 +0,0 @@
-/**
- * The regular expression for an HTML element.
- *
- * @type {RegExp}
- */
-const htmlSplitRegex = ( () => {
-	/* eslint-disable no-multi-spaces */
-	const comments =
-		'!' + // Start of comment, after the <.
-		'(?:' + // Unroll the loop: Consume everything until --> is found.
-		'-(?!->)' + // Dash not followed by end of comment.
-		'[^\\-]*' + // Consume non-dashes.
-		')*' + // Loop possessively.
-		'(?:-->)?'; // End of comment. If not found, match all input.
-
-	const cdata =
-		'!\\[CDATA\\[' + // Start of comment, after the <.
-		'[^\\]]*' + // Consume non-].
-		'(?:' + // Unroll the loop: Consume everything until ]]> is found.
-		'](?!]>)' + // One ] not followed by end of comment.
-		'[^\\]]*' + // Consume non-].
-		')*?' + // Loop possessively.
-		'(?:]]>)?'; // End of comment. If not found, match all input.
-
-	const escaped =
-		'(?=' + // Is the element escaped?
-		'!--' +
-		'|' +
-		'!\\[CDATA\\[' +
-		')' +
-		'((?=!-)' + // If yes, which type?
-		comments +
-		'|' +
-		cdata +
-		')';
-
-	const regex =
-		'(' + // Capture the entire match.
-		'<' + // Find start of element.
-		'(' + // Conditional expression follows.
-		escaped + // Find end of escaped element.
-		'|' + // ... else ...
-		'[^>]*>?' + // Find end of normal element.
-		')' +
-		')';
-
-	return new RegExp( regex );
-	/* eslint-enable no-multi-spaces */
-} )();
-
-/**
- * Separate HTML elements and comments from the text.
- *
- * @param {string} input The text which has to be formatted.
- *
- * @return {string[]} The formatted text.
- */
-function htmlSplit( input ) {
-	const parts = [];
-	let workingInput = input;
-
-	let match;
-	while ( ( match = workingInput.match( htmlSplitRegex ) ) ) {
-		// The `match` result, when invoked on a RegExp with the `g` flag (`/foo/g`) will not include `index`.
-		// If the `g` flag is omitted, `index` is included.
-		// `htmlSplitRegex` does not have the `g` flag so we can assert it will have an index number.
-		// Assert `match.index` is a number.
-		const index = /** @type {number} */ ( match.index );
-
-		parts.push( workingInput.slice( 0, index ) );
-		parts.push( match[ 0 ] );
-		workingInput = workingInput.slice( index + match[ 0 ].length );
-	}
-
-	if ( workingInput.length ) {
-		parts.push( workingInput );
-	}
-
-	return parts;
-}
-
-/**
- * Replace characters or phrases within HTML elements only.
- *
- * @param {string}                haystack     The text which has to be formatted.
- * @param {Record<string,string>} replacePairs In the form {from: 'to', …}.
- *
- * @return {string} The formatted text.
- */
-function replaceInHtmlTags( haystack, replacePairs ) {
-	// Find all elements.
-	const textArr = htmlSplit( haystack );
-	let changed = false;
-
-	// Extract all needles.
-	const needles = Object.keys( replacePairs );
-
-	// Loop through delimiters (elements) only.
-	for ( let i = 1; i < textArr.length; i += 2 ) {
-		for ( let j = 0; j < needles.length; j++ ) {
-			const needle = needles[ j ];
-			if ( -1 !== textArr[ i ].indexOf( needle ) ) {
-				textArr[ i ] = textArr[ i ].replace(
-					new RegExp( needle, 'g' ),
-					replacePairs[ needle ]
-				);
-				changed = true;
-				// After one strtr() break out of the foreach loop and look at next element.
-				break;
-			}
-		}
-	}
-
-	if ( changed ) {
-		haystack = textArr.join( '' );
-	}
-
-	return haystack;
-}
-
-/**
- * Replaces double line-breaks with paragraph elements.
- *
- * A group of regex replaces used to identify text formatted with newlines and
- * replace double line-breaks with HTML paragraph tags. The remaining line-
- * breaks after conversion become `<br />` tags, unless br is set to 'false'.
- *
- * @param {string}  text The text which has to be formatted.
- * @param {boolean} br   Optional. If set, will convert all remaining line-
- *                       breaks after paragraphing. Default true.
- *
- * @example
- *```js
- * import { autop } from '@wordpress/autop';
- * autop( 'my text' ); // "<p>my text</p>"
- * ```
- *
- * @return {string} Text which has been converted into paragraph tags.
- */
-export function autop( text, br = true ) {
-	const preTags = [];
-
-	if ( text.trim() === '' ) {
-		return '';
-	}
-
-	// Just to make things a little easier, pad the end.
-	text = text + '\n';
-
-	/*
-	 * Pre tags shouldn't be touched by autop.
-	 * Replace pre tags with placeholders and bring them back after autop.
-	 */
-	if ( text.indexOf( '<pre' ) !== -1 ) {
-		const textParts = text.split( '</pre>' );
-		const lastText = textParts.pop();
-		text = '';
-
-		for ( let i = 0; i < textParts.length; i++ ) {
-			const textPart = textParts[ i ];
-			const start = textPart.indexOf( '<pre' );
-
-			// Malformed html?
-			if ( start === -1 ) {
-				text += textPart;
-				continue;
-			}
-
-			const name = '<pre wp-pre-tag-' + i + '></pre>';
-			preTags.push( [ name, textPart.substr( start ) + '</pre>' ] );
-
-			text += textPart.substr( 0, start ) + name;
-		}
-
-		text += lastText;
-	}
-	// Change multiple <br>s into two line breaks, which will turn into paragraphs.
-	text = text.replace( /<br\s*\/?>\s*<br\s*\/?>/g, '\n\n' );
-
-	const allBlocks =
-		'(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
-
-	// Add a double line break above block-level opening tags.
-	text = text.replace(
-		new RegExp( '(<' + allBlocks + '[\\s/>])', 'g' ),
-		'\n\n$1'
-	);
-
-	// Add a double line break below block-level closing tags.
-	text = text.replace(
-		new RegExp( '(</' + allBlocks + '>)', 'g' ),
-		'$1\n\n'
-	);
-
-	// Standardize newline characters to "\n".
-	text = text.replace( /\r\n|\r/g, '\n' );
-
-	// Find newlines in all elements and add placeholders.
-	text = replaceInHtmlTags( text, { '\n': ' <!-- wpnl --> ' } );
-
-	// Collapse line breaks before and after <option> elements so they don't get autop'd.
-	if ( text.indexOf( '<option' ) !== -1 ) {
-		text = text.replace( /\s*<option/g, '<option' );
-		text = text.replace( /<\/option>\s*/g, '</option>' );
-	}
-
-	/*
-	 * Collapse line breaks inside <object> elements, before <param> and <embed> elements
-	 * so they don't get autop'd.
-	 */
-	if ( text.indexOf( '</object>' ) !== -1 ) {
-		text = text.replace( /(<object[^>]*>)\s*/g, '$1' );
-		text = text.replace( /\s*<\/object>/g, '</object>' );
-		text = text.replace( /\s*(<\/?(?:param|embed)[^>]*>)\s*/g, '$1' );
-	}
-
-	/*
-	 * Collapse line breaks inside <audio> and <video> elements,
-	 * before and after <source> and <track> elements.
-	 */
-	if ( text.indexOf( '<source' ) !== -1 || text.indexOf( '<track' ) !== -1 ) {
-		text = text.replace( /([<\[](?:audio|video)[^>\]]*[>\]])\s*/g, '$1' );
-		text = text.replace( /\s*([<\[]\/(?:audio|video)[>\]])/g, '$1' );
-		text = text.replace( /\s*(<(?:source|track)[^>]*>)\s*/g, '$1' );
-	}
-
-	// Collapse line breaks before and after <figcaption> elements.
-	if ( text.indexOf( '<figcaption' ) !== -1 ) {
-		text = text.replace( /\s*(<figcaption[^>]*>)/, '$1' );
-		text = text.replace( /<\/figcaption>\s*/, '</figcaption>' );
-	}
-
-	// Remove more than two contiguous line breaks.
-	text = text.replace( /\n\n+/g, '\n\n' );
-
-	// Split up the contents into an array of strings, separated by double line breaks.
-	const texts = text.split( /\n\s*\n/ ).filter( Boolean );
-
-	// Reset text prior to rebuilding.
-	text = '';
-
-	// Rebuild the content as a string, wrapping every bit with a <p>.
-	texts.forEach( ( textPiece ) => {
-		text += '<p>' + textPiece.replace( /^\n*|\n*$/g, '' ) + '</p>\n';
-	} );
-
-	// Under certain strange conditions it could create a P of entirely whitespace.
-	text = text.replace( /<p>\s*<\/p>/g, '' );
-
-	// Add a closing <p> inside <div>, <address>, or <form> tag if missing.
-	text = text.replace(
-		/<p>([^<]+)<\/(div|address|form)>/g,
-		'<p>$1</p></$2>'
-	);
-
-	// If an opening or closing block element tag is wrapped in a <p>, unwrap it.
-	text = text.replace(
-		new RegExp( '<p>\\s*(</?' + allBlocks + '[^>]*>)\\s*</p>', 'g' ),
-		'$1'
-	);
-
-	// In some cases <li> may get wrapped in <p>, fix them.
-	text = text.replace( /<p>(<li.+?)<\/p>/g, '$1' );
-
-	// If a <blockquote> is wrapped with a <p>, move it inside the <blockquote>.
-	text = text.replace( /<p><blockquote([^>]*)>/gi, '<blockquote$1><p>' );
-	text = text.replace( /<\/blockquote><\/p>/g, '</p></blockquote>' );
-
-	// If an opening or closing block element tag is preceded by an opening <p> tag, remove it.
-	text = text.replace(
-		new RegExp( '<p>\\s*(</?' + allBlocks + '[^>]*>)', 'g' ),
-		'$1'
-	);
-
-	// If an opening or closing block element tag is followed by a closing <p> tag, remove it.
-	text = text.replace(
-		new RegExp( '(</?' + allBlocks + '[^>]*>)\\s*</p>', 'g' ),
-		'$1'
-	);
-
-	// Optionally insert line breaks.
-	if ( br ) {
-		// Replace newlines that shouldn't be touched with a placeholder.
-		text = text.replace( /<(script|style).*?<\/\\1>/g, ( match ) =>
-			match[ 0 ].replace( /\n/g, '<WPPreserveNewline />' )
-		);
-
-		// Normalize <br>
-		text = text.replace( /<br>|<br\/>/g, '<br />' );
-
-		// Replace any new line characters that aren't preceded by a <br /> with a <br />.
-		text = text.replace( /(<br \/>)?\s*\n/g, ( a, b ) =>
-			b ? a : '<br />\n'
-		);
-
-		// Replace newline placeholders with newlines.
-		text = text.replace( /<WPPreserveNewline \/>/g, '\n' );
-	}
-
-	// If a <br /> tag is after an opening or closing block tag, remove it.
-	text = text.replace(
-		new RegExp( '(</?' + allBlocks + '[^>]*>)\\s*<br />', 'g' ),
-		'$1'
-	);
-
-	// If a <br /> tag is before a subset of opening or closing block tags, remove it.
-	text = text.replace(
-		/<br \/>(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)/g,
-		'$1'
-	);
-	text = text.replace( /\n<\/p>$/g, '</p>' );
-
-	// Replace placeholder <pre> tags with their original content.
-	preTags.forEach( ( preTag ) => {
-		const [ name, original ] = preTag;
-		text = text.replace( name, original );
-	} );
-
-	// Restore newlines in all elements.
-	if ( -1 !== text.indexOf( '<!-- wpnl -->' ) ) {
-		text = text.replace( /\s?<!-- wpnl -->\s?/g, '\n' );
-	}
-
-	return text;
-}
-
-/**
- * Replaces `<p>` tags with two line breaks. "Opposite" of autop().
- *
- * Replaces `<p>` tags with two line breaks except where the `<p>` has attributes.
- * Unifies whitespace. Indents `<li>`, `<dt>` and `<dd>` for better readability.
- *
- * @param {string} html The content from the editor.
- *
- * @example
- * ```js
- * import { removep } from '@wordpress/autop';
- * removep( '<p>my text</p>' ); // "my text"
- * ```
- *
- * @return {string} The content with stripped paragraph tags.
- */
-export function removep( html ) {
-	const blocklist =
-		'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset|figure';
-	const blocklist1 = blocklist + '|div|p';
-	const blocklist2 = blocklist + '|pre';
-	/** @type {string[]} */
-	const preserve = [];
-	let preserveLinebreaks = false;
-	let preserveBr = false;
-
-	if ( ! html ) {
-		return '';
-	}
-
-	// Protect script and style tags.
-	if ( html.indexOf( '<script' ) !== -1 || html.indexOf( '<style' ) !== -1 ) {
-		html = html.replace(
-			/<(script|style)[^>]*>[\s\S]*?<\/\1>/g,
-			( match ) => {
-				preserve.push( match );
-				return '<wp-preserve>';
-			}
-		);
-	}
-
-	// Protect pre tags.
-	if ( html.indexOf( '<pre' ) !== -1 ) {
-		preserveLinebreaks = true;
-		html = html.replace( /<pre[^>]*>[\s\S]+?<\/pre>/g, ( a ) => {
-			a = a.replace( /<br ?\/?>(\r\n|\n)?/g, '<wp-line-break>' );
-			a = a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '<wp-line-break>' );
-			return a.replace( /\r?\n/g, '<wp-line-break>' );
-		} );
-	}
-
-	// Remove line breaks but keep <br> tags inside image captions.
-	if ( html.indexOf( '[caption' ) !== -1 ) {
-		preserveBr = true;
-		html = html.replace( /\[caption[\s\S]+?\[\/caption\]/g, ( a ) => {
-			return a
-				.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' )
-				.replace( /[\r\n\t]+/, '' );
-		} );
-	}
-
-	// Normalize white space characters before and after block tags.
-	html = html.replace(
-		new RegExp( '\\s*</(' + blocklist1 + ')>\\s*', 'g' ),
-		'</$1>\n'
-	);
-	html = html.replace(
-		new RegExp( '\\s*<((?:' + blocklist1 + ')(?: [^>]*)?)>', 'g' ),
-		'\n<$1>'
-	);
-
-	// Mark </p> if it has any attributes.
-	html = html.replace( /(<p [^>]+>[\s\S]*?)<\/p>/g, '$1</p#>' );
-
-	// Preserve the first <p> inside a <div>.
-	html = html.replace( /<div( [^>]*)?>\s*<p>/gi, '<div$1>\n\n' );
-
-	// Remove paragraph tags.
-	html = html.replace( /\s*<p>/gi, '' );
-	html = html.replace( /\s*<\/p>\s*/gi, '\n\n' );
-
-	// Normalize white space chars and remove multiple line breaks.
-	html = html.replace( /\n[\s\u00a0]+\n/g, '\n\n' );
-
-	// Replace <br> tags with line breaks.
-	html = html.replace( /(\s*)<br ?\/?>\s*/gi, ( _, space ) => {
-		if ( space && space.indexOf( '\n' ) !== -1 ) {
-			return '\n\n';
-		}
-
-		return '\n';
-	} );
-
-	// Fix line breaks around <div>.
-	html = html.replace( /\s*<div/g, '\n<div' );
-	html = html.replace( /<\/div>\s*/g, '</div>\n' );
-
-	// Fix line breaks around caption shortcodes.
-	html = html.replace(
-		/\s*\[caption([^\[]+)\[\/caption\]\s*/gi,
-		'\n\n[caption$1[/caption]\n\n'
-	);
-	html = html.replace( /caption\]\n\n+\[caption/g, 'caption]\n\n[caption' );
-
-	// Pad block elements tags with a line break.
-	html = html.replace(
-		new RegExp( '\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ),
-		'\n<$1>'
-	);
-	html = html.replace(
-		new RegExp( '\\s*</(' + blocklist2 + ')>\\s*', 'g' ),
-		'</$1>\n'
-	);
-
-	// Indent <li>, <dt> and <dd> tags.
-	html = html.replace( /<((li|dt|dd)[^>]*)>/g, ' \t<$1>' );
-
-	// Fix line breaks around <select> and <option>.
-	if ( html.indexOf( '<option' ) !== -1 ) {
-		html = html.replace( /\s*<option/g, '\n<option' );
-		html = html.replace( /\s*<\/select>/g, '\n</select>' );
-	}
-
-	// Pad <hr> with two line breaks.
-	if ( html.indexOf( '<hr' ) !== -1 ) {
-		html = html.replace( /\s*<hr( [^>]*)?>\s*/g, '\n\n<hr$1>\n\n' );
-	}
-
-	// Remove line breaks in <object> tags.
-	if ( html.indexOf( '<object' ) !== -1 ) {
-		html = html.replace( /<object[\s\S]+?<\/object>/g, ( a ) => {
-			return a.replace( /[\r\n]+/g, '' );
-		} );
-	}
-
-	// Unmark special paragraph closing tags.
-	html = html.replace( /<\/p#>/g, '</p>\n' );
-
-	// Pad remaining <p> tags whit a line break.
-	html = html.replace( /\s*(<p [^>]+>[\s\S]*?<\/p>)/g, '\n$1' );
-
-	// Trim.
-	html = html.replace( /^\s+/, '' );
-	html = html.replace( /[\s\u00a0]+$/, '' );
-
-	if ( preserveLinebreaks ) {
-		html = html.replace( /<wp-line-break>/g, '\n' );
-	}
-
-	if ( preserveBr ) {
-		html = html.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
-	}
-
-	// Restore preserved tags.
-	if ( preserve.length ) {
-		html = html.replace( /<wp-preserve>/g, () => {
-			return /** @type {string} */ ( preserve.shift() );
-		} );
-	}
-
-	return html;
-}
diff --git a/packages/autop/src/index.ts b/packages/autop/src/index.ts
new file mode 100644
index 00000000000000..e4a4b7ff27cb2a
--- /dev/null
+++ b/packages/autop/src/index.ts
@@ -0,0 +1,488 @@
+/**
+ * The regular expression for an HTML element.
+ */
+const htmlSplitRegex: RegExp = ( () => {
+	/* eslint-disable no-multi-spaces */
+	const comments =
+		'!' + // Start of comment, after the <.
+		'(?:' + // Unroll the loop: Consume everything until --> is found.
+		'-(?!->)' + // Dash not followed by end of comment.
+		'[^\\-]*' + // Consume non-dashes.
+		')*' + // Loop possessively.
+		'(?:-->)?'; // End of comment. If not found, match all input.
+
+	const cdata =
+		'!\\[CDATA\\[' + // Start of comment, after the <.
+		'[^\\]]*' + // Consume non-].
+		'(?:' + // Unroll the loop: Consume everything until ]]> is found.
+		'](?!]>)' + // One ] not followed by end of comment.
+		'[^\\]]*' + // Consume non-].
+		')*?' + // Loop possessively.
+		'(?:]]>)?'; // End of comment. If not found, match all input.
+
+	const escaped =
+		'(?=' + // Is the element escaped?
+		'!--' +
+		'|' +
+		'!\\[CDATA\\[' +
+		')' +
+		'((?=!-)' + // If yes, which type?
+		comments +
+		'|' +
+		cdata +
+		')';
+
+	const regex =
+		'(' + // Capture the entire match.
+		'<' + // Find start of element.
+		'(' + // Conditional expression follows.
+		escaped + // Find end of escaped element.
+		'|' + // ... else ...
+		'[^>]*>?' + // Find end of normal element.
+		')' +
+		')';
+
+	return new RegExp( regex );
+	/* eslint-enable no-multi-spaces */
+} )();
+
+/**
+ * Separate HTML elements and comments from the text.
+ *
+ * @param input The text which has to be formatted.
+ *
+ * @return The formatted text.
+ */
+function htmlSplit( input: string ): string[] {
+	const parts = [];
+	let workingInput = input;
+
+	let match;
+	while ( ( match = workingInput.match( htmlSplitRegex ) ) ) {
+		// The `match` result, when invoked on a RegExp with the `g` flag (`/foo/g`) will not include `index`.
+		// If the `g` flag is omitted, `index` is included.
+		// `htmlSplitRegex` does not have the `g` flag so we can assert it will have an index number.
+		// Assert `match.index` is a number.
+		const index = match.index as number;
+
+		parts.push( workingInput.slice( 0, index ) );
+		parts.push( match[ 0 ] );
+		workingInput = workingInput.slice( index + match[ 0 ].length );
+	}
+
+	if ( workingInput.length ) {
+		parts.push( workingInput );
+	}
+
+	return parts;
+}
+
+/**
+ * Replace characters or phrases within HTML elements only.
+ *
+ * @param haystack     The text which has to be formatted.
+ * @param replacePairs In the form {from: 'to', …}.
+ *
+ * @return The formatted text.
+ */
+function replaceInHtmlTags(
+	haystack: string,
+	replacePairs: Record< string, string >
+): string {
+	// Find all elements.
+	const textArr = htmlSplit( haystack );
+	let changed = false;
+
+	// Extract all needles.
+	const needles = Object.keys( replacePairs );
+
+	// Loop through delimiters (elements) only.
+	for ( let i = 1; i < textArr.length; i += 2 ) {
+		for ( let j = 0; j < needles.length; j++ ) {
+			const needle = needles[ j ];
+			if ( -1 !== textArr[ i ].indexOf( needle ) ) {
+				textArr[ i ] = textArr[ i ].replace(
+					new RegExp( needle, 'g' ),
+					replacePairs[ needle ]
+				);
+				changed = true;
+				// After one strtr() break out of the foreach loop and look at next element.
+				break;
+			}
+		}
+	}
+
+	if ( changed ) {
+		haystack = textArr.join( '' );
+	}
+
+	return haystack;
+}
+
+/**
+ * Replaces double line-breaks with paragraph elements.
+ *
+ * A group of regex replaces used to identify text formatted with newlines and
+ * replace double line-breaks with HTML paragraph tags. The remaining line-
+ * breaks after conversion become `<br />` tags, unless br is set to 'false'.
+ *
+ * @param text The text which has to be formatted.
+ * @param br   Optional. If set, will convert all remaining line-
+ *             breaks after paragraphing. Default true.
+ *
+ * @example
+ *```js
+ * import { autop } from '@wordpress/autop';
+ * autop( 'my text' ); // "<p>my text</p>"
+ * ```
+ *
+ * @return Text which has been converted into paragraph tags.
+ */
+export function autop( text: string, br: boolean = true ): string {
+	const preTags: Array< [ string, string ] > = [];
+
+	if ( text.trim() === '' ) {
+		return '';
+	}
+
+	// Just to make things a little easier, pad the end.
+	text = text + '\n';
+
+	/*
+	 * Pre tags shouldn't be touched by autop.
+	 * Replace pre tags with placeholders and bring them back after autop.
+	 */
+	if ( text.indexOf( '<pre' ) !== -1 ) {
+		const textParts = text.split( '</pre>' );
+		const lastText = textParts.pop();
+		text = '';
+
+		for ( let i = 0; i < textParts.length; i++ ) {
+			const textPart = textParts[ i ];
+			const start = textPart.indexOf( '<pre' );
+
+			// Malformed html?
+			if ( start === -1 ) {
+				text += textPart;
+				continue;
+			}
+
+			const name = '<pre wp-pre-tag-' + i + '></pre>';
+			preTags.push( [ name, textPart.substr( start ) + '</pre>' ] );
+
+			text += textPart.substr( 0, start ) + name;
+		}
+
+		text += lastText;
+	}
+	// Change multiple <br>s into two line breaks, which will turn into paragraphs.
+	text = text.replace( /<br\s*\/?>\s*<br\s*\/?>/g, '\n\n' );
+
+	const allBlocks =
+		'(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
+
+	// Add a double line break above block-level opening tags.
+	text = text.replace(
+		new RegExp( '(<' + allBlocks + '[\\s/>])', 'g' ),
+		'\n\n$1'
+	);
+
+	// Add a double line break below block-level closing tags.
+	text = text.replace(
+		new RegExp( '(</' + allBlocks + '>)', 'g' ),
+		'$1\n\n'
+	);
+
+	// Standardize newline characters to "\n".
+	text = text.replace( /\r\n|\r/g, '\n' );
+
+	// Find newlines in all elements and add placeholders.
+	text = replaceInHtmlTags( text, { '\n': ' <!-- wpnl --> ' } );
+
+	// Collapse line breaks before and after <option> elements so they don't get autop'd.
+	if ( text.indexOf( '<option' ) !== -1 ) {
+		text = text.replace( /\s*<option/g, '<option' );
+		text = text.replace( /<\/option>\s*/g, '</option>' );
+	}
+
+	/*
+	 * Collapse line breaks inside <object> elements, before <param> and <embed> elements
+	 * so they don't get autop'd.
+	 */
+	if ( text.indexOf( '</object>' ) !== -1 ) {
+		text = text.replace( /(<object[^>]*>)\s*/g, '$1' );
+		text = text.replace( /\s*<\/object>/g, '</object>' );
+		text = text.replace( /\s*(<\/?(?:param|embed)[^>]*>)\s*/g, '$1' );
+	}
+
+	/*
+	 * Collapse line breaks inside <audio> and <video> elements,
+	 * before and after <source> and <track> elements.
+	 */
+	if ( text.indexOf( '<source' ) !== -1 || text.indexOf( '<track' ) !== -1 ) {
+		text = text.replace( /([<\[](?:audio|video)[^>\]]*[>\]])\s*/g, '$1' );
+		text = text.replace( /\s*([<\[]\/(?:audio|video)[>\]])/g, '$1' );
+		text = text.replace( /\s*(<(?:source|track)[^>]*>)\s*/g, '$1' );
+	}
+
+	// Collapse line breaks before and after <figcaption> elements.
+	if ( text.indexOf( '<figcaption' ) !== -1 ) {
+		text = text.replace( /\s*(<figcaption[^>]*>)/, '$1' );
+		text = text.replace( /<\/figcaption>\s*/, '</figcaption>' );
+	}
+
+	// Remove more than two contiguous line breaks.
+	text = text.replace( /\n\n+/g, '\n\n' );
+
+	// Split up the contents into an array of strings, separated by double line breaks.
+	const texts = text.split( /\n\s*\n/ ).filter( Boolean );
+
+	// Reset text prior to rebuilding.
+	text = '';
+
+	// Rebuild the content as a string, wrapping every bit with a <p>.
+	texts.forEach( ( textPiece ) => {
+		text += '<p>' + textPiece.replace( /^\n*|\n*$/g, '' ) + '</p>\n';
+	} );
+
+	// Under certain strange conditions it could create a P of entirely whitespace.
+	text = text.replace( /<p>\s*<\/p>/g, '' );
+
+	// Add a closing <p> inside <div>, <address>, or <form> tag if missing.
+	text = text.replace(
+		/<p>([^<]+)<\/(div|address|form)>/g,
+		'<p>$1</p></$2>'
+	);
+
+	// If an opening or closing block element tag is wrapped in a <p>, unwrap it.
+	text = text.replace(
+		new RegExp( '<p>\\s*(</?' + allBlocks + '[^>]*>)\\s*</p>', 'g' ),
+		'$1'
+	);
+
+	// In some cases <li> may get wrapped in <p>, fix them.
+	text = text.replace( /<p>(<li.+?)<\/p>/g, '$1' );
+
+	// If a <blockquote> is wrapped with a <p>, move it inside the <blockquote>.
+	text = text.replace( /<p><blockquote([^>]*)>/gi, '<blockquote$1><p>' );
+	text = text.replace( /<\/blockquote><\/p>/g, '</p></blockquote>' );
+
+	// If an opening or closing block element tag is preceded by an opening <p> tag, remove it.
+	text = text.replace(
+		new RegExp( '<p>\\s*(</?' + allBlocks + '[^>]*>)', 'g' ),
+		'$1'
+	);
+
+	// If an opening or closing block element tag is followed by a closing <p> tag, remove it.
+	text = text.replace(
+		new RegExp( '(</?' + allBlocks + '[^>]*>)\\s*</p>', 'g' ),
+		'$1'
+	);
+
+	// Optionally insert line breaks.
+	if ( br ) {
+		// Replace newlines that shouldn't be touched with a placeholder.
+		text = text.replace( /<(script|style).*?<\/\\1>/g, ( match ) =>
+			match[ 0 ].replace( /\n/g, '<WPPreserveNewline />' )
+		);
+
+		// Normalize <br>
+		text = text.replace( /<br>|<br\/>/g, '<br />' );
+
+		// Replace any new line characters that aren't preceded by a <br /> with a <br />.
+		text = text.replace( /(<br \/>)?\s*\n/g, ( a, b ) =>
+			b ? a : '<br />\n'
+		);
+
+		// Replace newline placeholders with newlines.
+		text = text.replace( /<WPPreserveNewline \/>/g, '\n' );
+	}
+
+	// If a <br /> tag is after an opening or closing block tag, remove it.
+	text = text.replace(
+		new RegExp( '(</?' + allBlocks + '[^>]*>)\\s*<br />', 'g' ),
+		'$1'
+	);
+
+	// If a <br /> tag is before a subset of opening or closing block tags, remove it.
+	text = text.replace(
+		/<br \/>(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)/g,
+		'$1'
+	);
+	text = text.replace( /\n<\/p>$/g, '</p>' );
+
+	// Replace placeholder <pre> tags with their original content.
+	preTags.forEach( ( preTag ) => {
+		const [ name, original ] = preTag;
+		text = text.replace( name, original );
+	} );
+
+	// Restore newlines in all elements.
+	if ( -1 !== text.indexOf( '<!-- wpnl -->' ) ) {
+		text = text.replace( /\s?<!-- wpnl -->\s?/g, '\n' );
+	}
+
+	return text;
+}
+
+/**
+ * Replaces `<p>` tags with two line breaks. "Opposite" of autop().
+ *
+ * Replaces `<p>` tags with two line breaks except where the `<p>` has attributes.
+ * Unifies whitespace. Indents `<li>`, `<dt>` and `<dd>` for better readability.
+ *
+ * @param html The content from the editor.
+ *
+ * @example
+ * ```js
+ * import { removep } from '@wordpress/autop';
+ * removep( '<p>my text</p>' ); // "my text"
+ * ```
+ *
+ * @return The content with stripped paragraph tags.
+ */
+export function removep( html: string ): string {
+	const blocklist =
+		'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset|figure';
+	const blocklist1 = blocklist + '|div|p';
+	const blocklist2 = blocklist + '|pre';
+	const preserve: string[] = [];
+	let preserveLinebreaks = false;
+	let preserveBr = false;
+
+	if ( ! html ) {
+		return '';
+	}
+
+	// Protect script and style tags.
+	if ( html.indexOf( '<script' ) !== -1 || html.indexOf( '<style' ) !== -1 ) {
+		html = html.replace(
+			/<(script|style)[^>]*>[\s\S]*?<\/\1>/g,
+			( match ) => {
+				preserve.push( match );
+				return '<wp-preserve>';
+			}
+		);
+	}
+
+	// Protect pre tags.
+	if ( html.indexOf( '<pre' ) !== -1 ) {
+		preserveLinebreaks = true;
+		html = html.replace( /<pre[^>]*>[\s\S]+?<\/pre>/g, ( a ) => {
+			a = a.replace( /<br ?\/?>(\r\n|\n)?/g, '<wp-line-break>' );
+			a = a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '<wp-line-break>' );
+			return a.replace( /\r?\n/g, '<wp-line-break>' );
+		} );
+	}
+
+	// Remove line breaks but keep <br> tags inside image captions.
+	if ( html.indexOf( '[caption' ) !== -1 ) {
+		preserveBr = true;
+		html = html.replace( /\[caption[\s\S]+?\[\/caption\]/g, ( a ) => {
+			return a
+				.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' )
+				.replace( /[\r\n\t]+/, '' );
+		} );
+	}
+
+	// Normalize white space characters before and after block tags.
+	html = html.replace(
+		new RegExp( '\\s*</(' + blocklist1 + ')>\\s*', 'g' ),
+		'</$1>\n'
+	);
+	html = html.replace(
+		new RegExp( '\\s*<((?:' + blocklist1 + ')(?: [^>]*)?)>', 'g' ),
+		'\n<$1>'
+	);
+
+	// Mark </p> if it has any attributes.
+	html = html.replace( /(<p [^>]+>[\s\S]*?)<\/p>/g, '$1</p#>' );
+
+	// Preserve the first <p> inside a <div>.
+	html = html.replace( /<div( [^>]*)?>\s*<p>/gi, '<div$1>\n\n' );
+
+	// Remove paragraph tags.
+	html = html.replace( /\s*<p>/gi, '' );
+	html = html.replace( /\s*<\/p>\s*/gi, '\n\n' );
+
+	// Normalize white space chars and remove multiple line breaks.
+	html = html.replace( /\n[\s\u00a0]+\n/g, '\n\n' );
+
+	// Replace <br> tags with line breaks.
+	html = html.replace( /(\s*)<br ?\/?>\s*/gi, ( _, space ) => {
+		if ( space && space.indexOf( '\n' ) !== -1 ) {
+			return '\n\n';
+		}
+
+		return '\n';
+	} );
+
+	// Fix line breaks around <div>.
+	html = html.replace( /\s*<div/g, '\n<div' );
+	html = html.replace( /<\/div>\s*/g, '</div>\n' );
+
+	// Fix line breaks around caption shortcodes.
+	html = html.replace(
+		/\s*\[caption([^\[]+)\[\/caption\]\s*/gi,
+		'\n\n[caption$1[/caption]\n\n'
+	);
+	html = html.replace( /caption\]\n\n+\[caption/g, 'caption]\n\n[caption' );
+
+	// Pad block elements tags with a line break.
+	html = html.replace(
+		new RegExp( '\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ),
+		'\n<$1>'
+	);
+	html = html.replace(
+		new RegExp( '\\s*</(' + blocklist2 + ')>\\s*', 'g' ),
+		'</$1>\n'
+	);
+
+	// Indent <li>, <dt> and <dd> tags.
+	html = html.replace( /<((li|dt|dd)[^>]*)>/g, ' \t<$1>' );
+
+	// Fix line breaks around <select> and <option>.
+	if ( html.indexOf( '<option' ) !== -1 ) {
+		html = html.replace( /\s*<option/g, '\n<option' );
+		html = html.replace( /\s*<\/select>/g, '\n</select>' );
+	}
+
+	// Pad <hr> with two line breaks.
+	if ( html.indexOf( '<hr' ) !== -1 ) {
+		html = html.replace( /\s*<hr( [^>]*)?>\s*/g, '\n\n<hr$1>\n\n' );
+	}
+
+	// Remove line breaks in <object> tags.
+	if ( html.indexOf( '<object' ) !== -1 ) {
+		html = html.replace( /<object[\s\S]+?<\/object>/g, ( a ) => {
+			return a.replace( /[\r\n]+/g, '' );
+		} );
+	}
+
+	// Unmark special paragraph closing tags.
+	html = html.replace( /<\/p#>/g, '</p>\n' );
+
+	// Pad remaining <p> tags whit a line break.
+	html = html.replace( /\s*(<p [^>]+>[\s\S]*?<\/p>)/g, '\n$1' );
+
+	// Trim.
+	html = html.replace( /^\s+/, '' );
+	html = html.replace( /[\s\u00a0]+$/, '' );
+
+	if ( preserveLinebreaks ) {
+		html = html.replace( /<wp-line-break>/g, '\n' );
+	}
+
+	if ( preserveBr ) {
+		html = html.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
+	}
+
+	// Restore preserved tags.
+	if ( preserve.length ) {
+		html = html.replace( /<wp-preserve>/g, () => {
+			return preserve.shift() as string;
+		} );
+	}
+
+	return html;
+}
diff --git a/packages/autop/src/test/index.test.js b/packages/autop/src/test/index.test.js
deleted file mode 100644
index 734a20ff37be2b..00000000000000
--- a/packages/autop/src/test/index.test.js
+++ /dev/null
@@ -1,519 +0,0 @@
-/**
- * Internal dependencies
- */
-import { autop, removep } from '../';
-
-test( 'empty string', () => {
-	expect( autop( '' ) ).toBe( '' );
-} );
-
-test( 'first post', () => {
-	const expected = `<p>Welcome to WordPress!  This post contains important information.  After you read it, you can make it private to hide it from visitors but still have the information handy for future reference.</p>
-<p>First things first:</p>
-<ul>
-<li><a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Subscribe to the WordPress mailing list for release notifications</a></li>
-</ul>
-<p>As a subscriber, you will receive an email every time an update is available (and only then).  This will make it easier to keep your site up to date, and secure from evildoers.<br />
-When a new version is released, <a href="%2$s" title="If you are already logged in, this will take you directly to the Dashboard">log in to the Dashboard</a> and follow the instructions.<br />
-Upgrading is a couple of clicks!</p>
-<p>Then you can start enjoying the WordPress experience:</p>
-<ul>
-<li>Edit your personal information at <a href="%3$s" title="Edit settings like your password, your display name and your contact information">Users &#8250; Your Profile</a></li>
-<li>Start publishing at <a href="%4$s" title="Create a new post">Posts &#8250; Add New</a> and at <a href="%5$s" title="Create a new page">Pages &#8250; Add New</a></li>
-<li>Browse and install plugins at <a href="%6$s" title="Browse and install plugins at the official WordPress repository directly from your Dashboard">Plugins &#8250; Add New</a></li>
-<li>Browse and install themes at <a href="%7$s" title="Browse and install themes at the official WordPress repository directly from your Dashboard">Appearance &#8250; Add New Themes</a></li>
-<li>Modify and prettify your website&#8217;s links at <a href="%8$s" title="For example, select a link structure like: http://example.com/1999/12/post-name">Settings &#8250; Permalinks</a></li>
-<li>Import content from another system or WordPress site at <a href="%9$s" title="WordPress comes with importers for the most common publishing systems">Tools &#8250; Import</a></li>
-<li>Find answers to your questions at the <a href="%10$s" title="The official WordPress documentation, maintained by the WordPress community">WordPress Codex</a></li>
-</ul>
-<p>To keep this post for reference, <a href="%11$s" title="Click to edit the content and settings of this post">click to edit it</a>, go to the Publish box and change its Visibility from Public to Private.</p>
-<p>Thank you for selecting WordPress.  We wish you happy publishing!</p>
-<p>PS.  Not yet subscribed for update notifications?  <a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Do it now!</a></p>
-`;
-	const testData = `Welcome to WordPress!  This post contains important information.  After you read it, you can make it private to hide it from visitors but still have the information handy for future reference.
-
-First things first:
-<ul>
-<li><a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Subscribe to the WordPress mailing list for release notifications</a></li>
-</ul>
-As a subscriber, you will receive an email every time an update is available (and only then).  This will make it easier to keep your site up to date, and secure from evildoers.
-When a new version is released, <a href="%2$s" title="If you are already logged in, this will take you directly to the Dashboard">log in to the Dashboard</a> and follow the instructions.
-Upgrading is a couple of clicks!
-
-Then you can start enjoying the WordPress experience:
-<ul>
-<li>Edit your personal information at <a href="%3$s" title="Edit settings like your password, your display name and your contact information">Users &#8250; Your Profile</a></li>
-<li>Start publishing at <a href="%4$s" title="Create a new post">Posts &#8250; Add New</a> and at <a href="%5$s" title="Create a new page">Pages &#8250; Add New</a></li>
-<li>Browse and install plugins at <a href="%6$s" title="Browse and install plugins at the official WordPress repository directly from your Dashboard">Plugins &#8250; Add New</a></li>
-<li>Browse and install themes at <a href="%7$s" title="Browse and install themes at the official WordPress repository directly from your Dashboard">Appearance &#8250; Add New Themes</a></li>
-<li>Modify and prettify your website&#8217;s links at <a href="%8$s" title="For example, select a link structure like: http://example.com/1999/12/post-name">Settings &#8250; Permalinks</a></li>
-<li>Import content from another system or WordPress site at <a href="%9$s" title="WordPress comes with importers for the most common publishing systems">Tools &#8250; Import</a></li>
-<li>Find answers to your questions at the <a href="%10$s" title="The official WordPress documentation, maintained by the WordPress community">WordPress Codex</a></li>
-</ul>
-To keep this post for reference, <a href="%11$s" title="Click to edit the content and settings of this post">click to edit it</a>, go to the Publish box and change its Visibility from Public to Private.
-
-Thank you for selecting WordPress.  We wish you happy publishing!
-
-PS.  Not yet subscribed for update notifications?  <a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Do it now!</a>
-`;
-
-	expect( autop( testData ) ).toBe( expected );
-} );
-
-test( 'skip pre elements', () => {
-	const code = `(function(){
-
-done = 0;
-});`;
-
-	// Not wrapped in <p> tags.
-	let str = `<pre>${ code }</pre>`;
-	expect( autop( str ).trim() ).toBe( str );
-
-	// Text before/after is wrapped in <p> tags.
-	str = `Look at this code\n\n<pre>${ code }</pre>\n\nIsn't that cool?`;
-
-	// Expected text after autop.
-	let expected = `<p>Look at this code</p>\n<pre>${ code }</pre>\n<p>Isn't that cool?</p>`;
-	expect( autop( str ).trim() ).toBe( expected );
-
-	// Make sure HTML breaks are maintained if manually inserted.
-	str =
-		'Look at this code\n\n<pre>Line1<br />Line2<br>Line3<br/>Line4\nActual Line 2\nActual Line 3</pre>\n\nCool, huh?';
-	expected =
-		'<p>Look at this code</p>\n<pre>Line1<br />Line2<br>Line3<br/>Line4\nActual Line 2\nActual Line 3</pre>\n<p>Cool, huh?</p>';
-	expect( autop( str ).trim() ).toBe( expected );
-} );
-
-test( 'skip input elements', () => {
-	const str =
-		'Username: <input type="text" id="username" name="username" /><br />Password: <input type="password" id="password1" name="password1" />';
-	expect( autop( str ).trim() ).toBe( '<p>' + str + '</p>' );
-} );
-
-test( 'source_track_elements', () => {
-	const content = `Paragraph one.
-
-<video class="wp-video-shortcode" id="video-0-1" width="640" height="360" preload="metadata" controls="controls">
-	<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4" />
-	<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->
-	<source type="video/webm" src="myvideo.webm" />
-	<!-- Ogg/Vorbis for older Firefox and Opera versions -->
-	<source type="video/ogg" src="myvideo.ogv" />
-	<!-- Optional: Add subtitles for each language -->
-	<track kind="subtitles" src="subtitles.srt" srclang="en" />
-	<!-- Optional: Add chapters -->
-	<track kind="chapters" src="chapters.srt" srclang="en" />
-	<a href="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4">http://domain.tld/wp-content/uploads/2013/12/xyz.mp4</a>
-</video>
-
-Paragraph two.`;
-
-	const content2 = `Paragraph one.
-
-<video class="wp-video-shortcode" id="video-0-1" width="640" height="360" preload="metadata" controls="controls">
-
-<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4" />
-
-<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->
-<source type="video/webm" src="myvideo.webm" />
-
-<!-- Ogg/Vorbis for older Firefox and Opera versions -->
-<source type="video/ogg" src="myvideo.ogv" />
-
-<!-- Optional: Add subtitles for each language -->
-<track kind="subtitles" src="subtitles.srt" srclang="en" />
-
-<!-- Optional: Add chapters -->
-<track kind="chapters" src="chapters.srt" srclang="en" />
-
-<a href="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4">http://domain.tld/wp-content/uploads/2013/12/xyz.mp4</a>
-
-</video>
-
-Paragraph two.`;
-
-	const expected =
-		'<p>Paragraph one.</p>\n' + // Line breaks only after <p>
-		'<p><video class="wp-video-shortcode" id="video-0-1" width="640" height="360" preload="metadata" controls="controls">' +
-		'<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4" />' +
-		'<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->' +
-		'<source type="video/webm" src="myvideo.webm" />' +
-		'<!-- Ogg/Vorbis for older Firefox and Opera versions -->' +
-		'<source type="video/ogg" src="myvideo.ogv" />' +
-		'<!-- Optional: Add subtitles for each language -->' +
-		'<track kind="subtitles" src="subtitles.srt" srclang="en" />' +
-		'<!-- Optional: Add chapters -->' +
-		'<track kind="chapters" src="chapters.srt" srclang="en" />' +
-		'<a href="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4">' +
-		'http://domain.tld/wp-content/uploads/2013/12/xyz.mp4</a></video></p>\n' +
-		'<p>Paragraph two.</p>';
-
-	// When running the content through autop() from wp_richedit_pre()
-	const shortcodeContent = `Paragraph one.
-
-[video width="720" height="480" mp4="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4"]
-<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->
-<source type="video/webm" src="myvideo.webm" />
-<!-- Ogg/Vorbis for older Firefox and Opera versions -->
-<source type="video/ogg" src="myvideo.ogv" />
-<!-- Optional: Add subtitles for each language -->
-<track kind="subtitles" src="subtitles.srt" srclang="en" />
-<!-- Optional: Add chapters -->
-<track kind="chapters" src="chapters.srt" srclang="en" />
-[/video]
-
-Paragraph two.`;
-
-	const shortcodeExpected =
-		'<p>Paragraph one.</p>\n' + // Line breaks only after <p>
-		'<p>[video width="720" height="480" mp4="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4"]' +
-		'<!-- WebM/VP8 for Firefox4, Opera, and Chrome --><source type="video/webm" src="myvideo.webm" />' +
-		'<!-- Ogg/Vorbis for older Firefox and Opera versions --><source type="video/ogg" src="myvideo.ogv" />' +
-		'<!-- Optional: Add subtitles for each language --><track kind="subtitles" src="subtitles.srt" srclang="en" />' +
-		'<!-- Optional: Add chapters --><track kind="chapters" src="chapters.srt" srclang="en" />' +
-		'[/video]</p>\n' +
-		'<p>Paragraph two.</p>';
-
-	expect( autop( content ).trim() ).toBe( expected );
-	expect( autop( content2 ).trim() ).toBe( expected );
-	expect( autop( shortcodeContent ).trim() ).toBe( shortcodeExpected );
-} );
-
-test( 'param embed elements', () => {
-	const content1 = `Paragraph one.
-
-<object width="400" height="224" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0">
-	<param name="src" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />
-	<param name="allowfullscreen" value="true" />
-	<param name="allowscriptaccess" value="always" />
-	<param name="overstretch" value="true" />
-	<param name="flashvars" value="isDynamicSeeking=true" />
-
-	<embed width="400" height="224" type="application/x-shockwave-flash" src="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" wmode="direct" seamlesstabbing="true" allowfullscreen="true" overstretch="true" flashvars="isDynamicSeeking=true" />
-</object>
-
-Paragraph two.`;
-
-	const expected1 =
-		'<p>Paragraph one.</p>\n' + // Line breaks only after <p>
-		'<p><object width="400" height="224" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0">' +
-		'<param name="src" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />' +
-		'<param name="allowfullscreen" value="true" />' +
-		'<param name="allowscriptaccess" value="always" />' +
-		'<param name="overstretch" value="true" />' +
-		'<param name="flashvars" value="isDynamicSeeking=true" />' +
-		'<embed width="400" height="224" type="application/x-shockwave-flash" src="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" wmode="direct" seamlesstabbing="true" allowfullscreen="true" overstretch="true" flashvars="isDynamicSeeking=true" />' +
-		'</object></p>\n' +
-		'<p>Paragraph two.</p>';
-
-	const content2 = `Paragraph one.
-
-<div class="video-player" id="x-video-0">
-<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="640" height="360" id="video-0" standby="Standby text">
-<param name="movie" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />
-<param name="quality" value="best" />
-
-<param name="seamlesstabbing" value="true" />
-<param name="allowfullscreen" value="true" />
-<param name="allowscriptaccess" value="always" />
-<param name="overstretch" value="true" />
-
-<!--[if !IE]--><object type="application/x-shockwave-flash" data="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" width="640" height="360" standby="Standby text">
-<param name="quality" value="best" />
-
-<param name="seamlesstabbing" value="true" />
-<param name="allowfullscreen" value="true" />
-<param name="allowscriptaccess" value="always" />
-<param name="overstretch" value="true" />
-</object><!--<![endif]-->
-</object></div>
-
-Paragraph two.`;
-
-	const expected2 =
-		'<p>Paragraph one.</p>\n' + // Line breaks only after block tags.
-		'<div class="video-player" id="x-video-0">\n' +
-		'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="640" height="360" id="video-0" standby="Standby text">' +
-		'<param name="movie" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />' +
-		'<param name="quality" value="best" />' +
-		'<param name="seamlesstabbing" value="true" />' +
-		'<param name="allowfullscreen" value="true" />' +
-		'<param name="allowscriptaccess" value="always" />' +
-		'<param name="overstretch" value="true" />' +
-		'<!--[if !IE]--><object type="application/x-shockwave-flash" data="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" width="640" height="360" standby="Standby text">' +
-		'<param name="quality" value="best" />' +
-		'<param name="seamlesstabbing" value="true" />' +
-		'<param name="allowfullscreen" value="true" />' +
-		'<param name="allowscriptaccess" value="always" />' +
-		'<param name="overstretch" value="true" /></object><!--<![endif]-->' +
-		'</object></div>\n' +
-		'<p>Paragraph two.</p>';
-
-	expect( autop( content1 ).trim() ).toBe( expected1 );
-	expect( autop( content2 ).trim() ).toBe( expected2 );
-} );
-
-test( 'skip select option elements', () => {
-	const str =
-		'Country: <select id="state" name="state"><option value="1">Alabama</option><option value="2">Alaska</option><option value="3">Arizona</option><option value="4">Arkansas</option><option value="5">California</option></select>';
-
-	expect( autop( str ).trim() ).toBe( '<p>' + str + '</p>' );
-} );
-
-test( 'that_autop_treats_block_level_elements_as_blocks', () => {
-	const blocks = [
-		'table',
-		'thead',
-		'tfoot',
-		'caption',
-		'col',
-		'colgroup',
-		'tbody',
-		'tr',
-		'td',
-		'th',
-		'div',
-		'dl',
-		'dd',
-		'dt',
-		'ul',
-		'ol',
-		'li',
-		'pre',
-		'form',
-		'map',
-		'area',
-		'address',
-		'math',
-		'style',
-		'p',
-		'h1',
-		'h2',
-		'h3',
-		'h4',
-		'h5',
-		'h6',
-		'hr',
-		'fieldset',
-		'legend',
-		'section',
-		'article',
-		'aside',
-		'hgroup',
-		'header',
-		'footer',
-		'nav',
-		'figure',
-		'details',
-		'menu',
-		'summary',
-	];
-
-	// Check whitespace normalization.
-	let content = [];
-
-	blocks.forEach( ( block ) => {
-		content.push( `<${ block }>foo</${ block }>` );
-	} );
-
-	let expected = content.join( '\n' );
-	let input = content.join( '\n\n' ); // WS difference.
-
-	expect( autop( input ).trim() ).toBe( expected );
-
-	input = content.join( '' ); // WS difference.
-
-	expect( autop( input ).trim() ).toBe( expected );
-
-	// Check whitespace addition.
-	content = [];
-
-	blocks.forEach( ( block ) => {
-		content.push( `<${ block }/>` );
-	} );
-
-	expected = content.join( '\n' );
-	input = content.join( '' );
-
-	expect( autop( input ).trim() ).toBe( expected );
-
-	// Check whitespace addition with attributes.
-	content = [];
-
-	blocks.forEach( ( block ) => {
-		content.push( `<${ block } attr='value'>foo</${ block }>` );
-	} );
-
-	expected = content.join( '\n' );
-	input = content.join( '' );
-
-	expect( autop( input ).trim() ).toBe( expected );
-} );
-
-test( 'autop does not wrap blockquotes but does autop their contents', () => {
-	const content = '<blockquote>foo</blockquote>';
-	const expected = '<blockquote><p>foo</p></blockquote>';
-
-	expect( autop( content ).trim() ).toBe( expected );
-} );
-
-test( 'that autop treats inline elements as inline', () => {
-	const inlines = [
-		'a',
-		'em',
-		'strong',
-		'small',
-		's',
-		'cite',
-		'q',
-		'dfn',
-		'abbr',
-		'data',
-		'time',
-		'code',
-		'var',
-		'samp',
-		'kbd',
-		'sub',
-		'sup',
-		'i',
-		'b',
-		'u',
-		'mark',
-		'span',
-		'del',
-		'ins',
-		'noscript',
-		'select',
-	];
-
-	let content = [];
-	let expected = [];
-
-	inlines.forEach( ( inline ) => {
-		content.push( `<${ inline }>foo</${ inline }>` );
-		expected.push( `<p><${ inline }>foo</${ inline }></p>` );
-	} );
-
-	content = content.join( '\n\n' );
-	expected = expected.join( '\n' );
-
-	expect( autop( content ).trim() ).toBe( expected );
-} );
-
-test( 'element sanity', () => {
-	[
-		[ 'Hello <a\nhref="world">', '<p>Hello <a\nhref="world"></p>\n' ],
-		[
-			'Hello <!-- a\nhref="world" -->',
-			'<p>Hello <!-- a\nhref="world" --></p>\n',
-		],
-		[
-			'Hello <!-- <object>\n<param>\n<param>\n<embed>\n</embed>\n</object>\n -->',
-			'<p>Hello <!-- <object>\n<param>\n<param>\n<embed>\n</embed>\n</object>\n --></p>\n',
-		],
-		[
-			'Hello <!-- <object>\n<param/>\n<param/>\n<embed>\n</embed>\n</object>\n -->',
-			'<p>Hello <!-- <object>\n<param/>\n<param/>\n<embed>\n</embed>\n</object>\n --></p>\n',
-		],
-		/* Block elements inside comments will fail this test in all versions, it's not a regression.
-		[
-			'Hello <!-- <hr> a\nhref='world' -->',
-			'<p>Hello <!-- <hr> a\nhref='world' --></p>\n',
-		],
-		[
-			'Hello <![CDATA[ <hr> a\nhttps://youtu.be/jgz0uSaOZbE\n ]]>',
-			'<p>Hello <![CDATA[ <hr> a\nhttps://youtu.be/jgz0uSaOZbE\n ]]></p>\n',
-		],
-		*/
-		[
-			'Hello <![CDATA[ a\nhttps://youtu.be/jgz0uSaOZbE\n ]]>',
-			'<p>Hello <![CDATA[ a\nhttps://youtu.be/jgz0uSaOZbE\n ]]></p>\n',
-		],
-		[
-			'Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 ]]> -->',
-			'<p>Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 ]]> --></p>\n',
-		],
-		[
-			'Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 --> a\n9 ]]>',
-			'<p>Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 --> a\n9 ]]></p>\n',
-		],
-	].forEach( ( [ input, output ] ) => {
-		expect( autop( input ) ).toBe( output );
-	} );
-} );
-
-test( 'that autop skips line breaks after br', () => {
-	const content = `
-line 1<br>
-line 2<br/>
-line 3<br />
-line 4
-line 5
-`;
-
-	const expected = `<p>line 1<br />
-line 2<br />
-line 3<br />
-line 4<br />
-line 5</p>`;
-
-	expect( autop( content ).trim() ).toBe( expected );
-} );
-
-test( 'that autop adds a paragraph after multiple br', () => {
-	const content = `
-line 1<br>
-<br/>
-line 2<br/>
-<br />
-`;
-
-	const expected = `<p>line 1</p>
-<p>line 2</p>`;
-
-	expect( autop( content ).trim() ).toBe( expected );
-} );
-
-test( 'that text before blocks is peed', () => {
-	const content = 'a<div>b</div>';
-	const expected = '<p>a</p>\n<div>b</div>';
-
-	expect( autop( content ).trim() ).toBe( expected );
-} );
-
-test( 'that autop doses not add extra closing p in figure', () => {
-	const content1 =
-		'<figure><img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
-	const expected1 = content1;
-
-	const content2 = `<figure>
-<img src="example.jpg" />
-<figcaption>Caption</figcaption>
-</figure>`;
-
-	const expected2 = `<figure>
-<img src="example.jpg" /><figcaption>Caption</figcaption></figure>`;
-
-	expect( autop( content1 ).trim() ).toBe( expected1 );
-	expect( autop( content2 ).trim() ).toBe( expected2 );
-} );
-
-test( 'that autop correctly adds a start and end tag when followed by a div', () => {
-	const content =
-		'Testing autop with a div\n<div class="wp-some-class">content</div>';
-	const expected =
-		'<p>Testing autop with a div</p>\n<div class="wp-some-class">content</div>';
-
-	expect( autop( content ).trim() ).toBe( expected );
-} );
-
-describe( 'removep', () => {
-	test( 'preserves paragraphs with attributes', () => {
-		const content = '<p style="text-align: center">\nHello World\n</p>';
-		const expected = '<p style="text-align: center">\nHello World</p>';
-
-		expect( removep( content ) ).toBe( expected );
-	} );
-} );
diff --git a/packages/autop/src/test/index.test.ts b/packages/autop/src/test/index.test.ts
new file mode 100644
index 00000000000000..466aade0f25f10
--- /dev/null
+++ b/packages/autop/src/test/index.test.ts
@@ -0,0 +1,519 @@
+/**
+ * Internal dependencies
+ */
+import { autop, removep } from '../';
+
+test( 'empty string', () => {
+	expect( autop( '' ) ).toBe( '' );
+} );
+
+test( 'first post', () => {
+	const expected = `<p>Welcome to WordPress!  This post contains important information.  After you read it, you can make it private to hide it from visitors but still have the information handy for future reference.</p>
+<p>First things first:</p>
+<ul>
+<li><a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Subscribe to the WordPress mailing list for release notifications</a></li>
+</ul>
+<p>As a subscriber, you will receive an email every time an update is available (and only then).  This will make it easier to keep your site up to date, and secure from evildoers.<br />
+When a new version is released, <a href="%2$s" title="If you are already logged in, this will take you directly to the Dashboard">log in to the Dashboard</a> and follow the instructions.<br />
+Upgrading is a couple of clicks!</p>
+<p>Then you can start enjoying the WordPress experience:</p>
+<ul>
+<li>Edit your personal information at <a href="%3$s" title="Edit settings like your password, your display name and your contact information">Users &#8250; Your Profile</a></li>
+<li>Start publishing at <a href="%4$s" title="Create a new post">Posts &#8250; Add New</a> and at <a href="%5$s" title="Create a new page">Pages &#8250; Add New</a></li>
+<li>Browse and install plugins at <a href="%6$s" title="Browse and install plugins at the official WordPress repository directly from your Dashboard">Plugins &#8250; Add New</a></li>
+<li>Browse and install themes at <a href="%7$s" title="Browse and install themes at the official WordPress repository directly from your Dashboard">Appearance &#8250; Add New Themes</a></li>
+<li>Modify and prettify your website&#8217;s links at <a href="%8$s" title="For example, select a link structure like: http://example.com/1999/12/post-name">Settings &#8250; Permalinks</a></li>
+<li>Import content from another system or WordPress site at <a href="%9$s" title="WordPress comes with importers for the most common publishing systems">Tools &#8250; Import</a></li>
+<li>Find answers to your questions at the <a href="%10$s" title="The official WordPress documentation, maintained by the WordPress community">WordPress Codex</a></li>
+</ul>
+<p>To keep this post for reference, <a href="%11$s" title="Click to edit the content and settings of this post">click to edit it</a>, go to the Publish box and change its Visibility from Public to Private.</p>
+<p>Thank you for selecting WordPress.  We wish you happy publishing!</p>
+<p>PS.  Not yet subscribed for update notifications?  <a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Do it now!</a></p>
+`;
+	const testData = `Welcome to WordPress!  This post contains important information.  After you read it, you can make it private to hide it from visitors but still have the information handy for future reference.
+
+First things first:
+<ul>
+<li><a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Subscribe to the WordPress mailing list for release notifications</a></li>
+</ul>
+As a subscriber, you will receive an email every time an update is available (and only then).  This will make it easier to keep your site up to date, and secure from evildoers.
+When a new version is released, <a href="%2$s" title="If you are already logged in, this will take you directly to the Dashboard">log in to the Dashboard</a> and follow the instructions.
+Upgrading is a couple of clicks!
+
+Then you can start enjoying the WordPress experience:
+<ul>
+<li>Edit your personal information at <a href="%3$s" title="Edit settings like your password, your display name and your contact information">Users &#8250; Your Profile</a></li>
+<li>Start publishing at <a href="%4$s" title="Create a new post">Posts &#8250; Add New</a> and at <a href="%5$s" title="Create a new page">Pages &#8250; Add New</a></li>
+<li>Browse and install plugins at <a href="%6$s" title="Browse and install plugins at the official WordPress repository directly from your Dashboard">Plugins &#8250; Add New</a></li>
+<li>Browse and install themes at <a href="%7$s" title="Browse and install themes at the official WordPress repository directly from your Dashboard">Appearance &#8250; Add New Themes</a></li>
+<li>Modify and prettify your website&#8217;s links at <a href="%8$s" title="For example, select a link structure like: http://example.com/1999/12/post-name">Settings &#8250; Permalinks</a></li>
+<li>Import content from another system or WordPress site at <a href="%9$s" title="WordPress comes with importers for the most common publishing systems">Tools &#8250; Import</a></li>
+<li>Find answers to your questions at the <a href="%10$s" title="The official WordPress documentation, maintained by the WordPress community">WordPress Codex</a></li>
+</ul>
+To keep this post for reference, <a href="%11$s" title="Click to edit the content and settings of this post">click to edit it</a>, go to the Publish box and change its Visibility from Public to Private.
+
+Thank you for selecting WordPress.  We wish you happy publishing!
+
+PS.  Not yet subscribed for update notifications?  <a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Do it now!</a>
+`;
+
+	expect( autop( testData ) ).toBe( expected );
+} );
+
+test( 'skip pre elements', () => {
+	const code = `(function(){
+
+done = 0;
+});`;
+
+	// Not wrapped in <p> tags.
+	let str = `<pre>${ code }</pre>`;
+	expect( autop( str ).trim() ).toBe( str );
+
+	// Text before/after is wrapped in <p> tags.
+	str = `Look at this code\n\n<pre>${ code }</pre>\n\nIsn't that cool?`;
+
+	// Expected text after autop.
+	let expected = `<p>Look at this code</p>\n<pre>${ code }</pre>\n<p>Isn't that cool?</p>`;
+	expect( autop( str ).trim() ).toBe( expected );
+
+	// Make sure HTML breaks are maintained if manually inserted.
+	str =
+		'Look at this code\n\n<pre>Line1<br />Line2<br>Line3<br/>Line4\nActual Line 2\nActual Line 3</pre>\n\nCool, huh?';
+	expected =
+		'<p>Look at this code</p>\n<pre>Line1<br />Line2<br>Line3<br/>Line4\nActual Line 2\nActual Line 3</pre>\n<p>Cool, huh?</p>';
+	expect( autop( str ).trim() ).toBe( expected );
+} );
+
+test( 'skip input elements', () => {
+	const str =
+		'Username: <input type="text" id="username" name="username" /><br />Password: <input type="password" id="password1" name="password1" />';
+	expect( autop( str ).trim() ).toBe( '<p>' + str + '</p>' );
+} );
+
+test( 'source_track_elements', () => {
+	const content = `Paragraph one.
+
+<video class="wp-video-shortcode" id="video-0-1" width="640" height="360" preload="metadata" controls="controls">
+	<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4" />
+	<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->
+	<source type="video/webm" src="myvideo.webm" />
+	<!-- Ogg/Vorbis for older Firefox and Opera versions -->
+	<source type="video/ogg" src="myvideo.ogv" />
+	<!-- Optional: Add subtitles for each language -->
+	<track kind="subtitles" src="subtitles.srt" srclang="en" />
+	<!-- Optional: Add chapters -->
+	<track kind="chapters" src="chapters.srt" srclang="en" />
+	<a href="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4">http://domain.tld/wp-content/uploads/2013/12/xyz.mp4</a>
+</video>
+
+Paragraph two.`;
+
+	const content2 = `Paragraph one.
+
+<video class="wp-video-shortcode" id="video-0-1" width="640" height="360" preload="metadata" controls="controls">
+
+<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4" />
+
+<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->
+<source type="video/webm" src="myvideo.webm" />
+
+<!-- Ogg/Vorbis for older Firefox and Opera versions -->
+<source type="video/ogg" src="myvideo.ogv" />
+
+<!-- Optional: Add subtitles for each language -->
+<track kind="subtitles" src="subtitles.srt" srclang="en" />
+
+<!-- Optional: Add chapters -->
+<track kind="chapters" src="chapters.srt" srclang="en" />
+
+<a href="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4">http://domain.tld/wp-content/uploads/2013/12/xyz.mp4</a>
+
+</video>
+
+Paragraph two.`;
+
+	const expected =
+		'<p>Paragraph one.</p>\n' + // Line breaks only after <p>
+		'<p><video class="wp-video-shortcode" id="video-0-1" width="640" height="360" preload="metadata" controls="controls">' +
+		'<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4" />' +
+		'<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->' +
+		'<source type="video/webm" src="myvideo.webm" />' +
+		'<!-- Ogg/Vorbis for older Firefox and Opera versions -->' +
+		'<source type="video/ogg" src="myvideo.ogv" />' +
+		'<!-- Optional: Add subtitles for each language -->' +
+		'<track kind="subtitles" src="subtitles.srt" srclang="en" />' +
+		'<!-- Optional: Add chapters -->' +
+		'<track kind="chapters" src="chapters.srt" srclang="en" />' +
+		'<a href="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4">' +
+		'http://domain.tld/wp-content/uploads/2013/12/xyz.mp4</a></video></p>\n' +
+		'<p>Paragraph two.</p>';
+
+	// When running the content through autop() from wp_richedit_pre()
+	const shortcodeContent = `Paragraph one.
+
+[video width="720" height="480" mp4="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4"]
+<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->
+<source type="video/webm" src="myvideo.webm" />
+<!-- Ogg/Vorbis for older Firefox and Opera versions -->
+<source type="video/ogg" src="myvideo.ogv" />
+<!-- Optional: Add subtitles for each language -->
+<track kind="subtitles" src="subtitles.srt" srclang="en" />
+<!-- Optional: Add chapters -->
+<track kind="chapters" src="chapters.srt" srclang="en" />
+[/video]
+
+Paragraph two.`;
+
+	const shortcodeExpected =
+		'<p>Paragraph one.</p>\n' + // Line breaks only after <p>
+		'<p>[video width="720" height="480" mp4="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4"]' +
+		'<!-- WebM/VP8 for Firefox4, Opera, and Chrome --><source type="video/webm" src="myvideo.webm" />' +
+		'<!-- Ogg/Vorbis for older Firefox and Opera versions --><source type="video/ogg" src="myvideo.ogv" />' +
+		'<!-- Optional: Add subtitles for each language --><track kind="subtitles" src="subtitles.srt" srclang="en" />' +
+		'<!-- Optional: Add chapters --><track kind="chapters" src="chapters.srt" srclang="en" />' +
+		'[/video]</p>\n' +
+		'<p>Paragraph two.</p>';
+
+	expect( autop( content ).trim() ).toBe( expected );
+	expect( autop( content2 ).trim() ).toBe( expected );
+	expect( autop( shortcodeContent ).trim() ).toBe( shortcodeExpected );
+} );
+
+test( 'param embed elements', () => {
+	const content1 = `Paragraph one.
+
+<object width="400" height="224" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0">
+	<param name="src" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />
+	<param name="allowfullscreen" value="true" />
+	<param name="allowscriptaccess" value="always" />
+	<param name="overstretch" value="true" />
+	<param name="flashvars" value="isDynamicSeeking=true" />
+
+	<embed width="400" height="224" type="application/x-shockwave-flash" src="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" wmode="direct" seamlesstabbing="true" allowfullscreen="true" overstretch="true" flashvars="isDynamicSeeking=true" />
+</object>
+
+Paragraph two.`;
+
+	const expected1 =
+		'<p>Paragraph one.</p>\n' + // Line breaks only after <p>
+		'<p><object width="400" height="224" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0">' +
+		'<param name="src" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />' +
+		'<param name="allowfullscreen" value="true" />' +
+		'<param name="allowscriptaccess" value="always" />' +
+		'<param name="overstretch" value="true" />' +
+		'<param name="flashvars" value="isDynamicSeeking=true" />' +
+		'<embed width="400" height="224" type="application/x-shockwave-flash" src="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" wmode="direct" seamlesstabbing="true" allowfullscreen="true" overstretch="true" flashvars="isDynamicSeeking=true" />' +
+		'</object></p>\n' +
+		'<p>Paragraph two.</p>';
+
+	const content2 = `Paragraph one.
+
+<div class="video-player" id="x-video-0">
+<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="640" height="360" id="video-0" standby="Standby text">
+<param name="movie" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />
+<param name="quality" value="best" />
+
+<param name="seamlesstabbing" value="true" />
+<param name="allowfullscreen" value="true" />
+<param name="allowscriptaccess" value="always" />
+<param name="overstretch" value="true" />
+
+<!--[if !IE]--><object type="application/x-shockwave-flash" data="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" width="640" height="360" standby="Standby text">
+<param name="quality" value="best" />
+
+<param name="seamlesstabbing" value="true" />
+<param name="allowfullscreen" value="true" />
+<param name="allowscriptaccess" value="always" />
+<param name="overstretch" value="true" />
+</object><!--<![endif]-->
+</object></div>
+
+Paragraph two.`;
+
+	const expected2 =
+		'<p>Paragraph one.</p>\n' + // Line breaks only after block tags.
+		'<div class="video-player" id="x-video-0">\n' +
+		'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="640" height="360" id="video-0" standby="Standby text">' +
+		'<param name="movie" value="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" />' +
+		'<param name="quality" value="best" />' +
+		'<param name="seamlesstabbing" value="true" />' +
+		'<param name="allowfullscreen" value="true" />' +
+		'<param name="allowscriptaccess" value="always" />' +
+		'<param name="overstretch" value="true" />' +
+		'<!--[if !IE]--><object type="application/x-shockwave-flash" data="http://domain.tld/wp-content/uploads/2013/12/xyz.swf" width="640" height="360" standby="Standby text">' +
+		'<param name="quality" value="best" />' +
+		'<param name="seamlesstabbing" value="true" />' +
+		'<param name="allowfullscreen" value="true" />' +
+		'<param name="allowscriptaccess" value="always" />' +
+		'<param name="overstretch" value="true" /></object><!--<![endif]-->' +
+		'</object></div>\n' +
+		'<p>Paragraph two.</p>';
+
+	expect( autop( content1 ).trim() ).toBe( expected1 );
+	expect( autop( content2 ).trim() ).toBe( expected2 );
+} );
+
+test( 'skip select option elements', () => {
+	const str =
+		'Country: <select id="state" name="state"><option value="1">Alabama</option><option value="2">Alaska</option><option value="3">Arizona</option><option value="4">Arkansas</option><option value="5">California</option></select>';
+
+	expect( autop( str ).trim() ).toBe( '<p>' + str + '</p>' );
+} );
+
+test( 'that_autop_treats_block_level_elements_as_blocks', () => {
+	const blocks = [
+		'table',
+		'thead',
+		'tfoot',
+		'caption',
+		'col',
+		'colgroup',
+		'tbody',
+		'tr',
+		'td',
+		'th',
+		'div',
+		'dl',
+		'dd',
+		'dt',
+		'ul',
+		'ol',
+		'li',
+		'pre',
+		'form',
+		'map',
+		'area',
+		'address',
+		'math',
+		'style',
+		'p',
+		'h1',
+		'h2',
+		'h3',
+		'h4',
+		'h5',
+		'h6',
+		'hr',
+		'fieldset',
+		'legend',
+		'section',
+		'article',
+		'aside',
+		'hgroup',
+		'header',
+		'footer',
+		'nav',
+		'figure',
+		'details',
+		'menu',
+		'summary',
+	];
+
+	// Check whitespace normalization.
+	let content: string[] = [];
+
+	blocks.forEach( ( block ) => {
+		content.push( `<${ block }>foo</${ block }>` );
+	} );
+
+	let expected = content.join( '\n' );
+	let input = content.join( '\n\n' ); // WS difference.
+
+	expect( autop( input ).trim() ).toBe( expected );
+
+	input = content.join( '' ); // WS difference.
+
+	expect( autop( input ).trim() ).toBe( expected );
+
+	// Check whitespace addition.
+	content = [];
+
+	blocks.forEach( ( block ) => {
+		content.push( `<${ block }/>` );
+	} );
+
+	expected = content.join( '\n' );
+	input = content.join( '' );
+
+	expect( autop( input ).trim() ).toBe( expected );
+
+	// Check whitespace addition with attributes.
+	content = [];
+
+	blocks.forEach( ( block ) => {
+		content.push( `<${ block } attr='value'>foo</${ block }>` );
+	} );
+
+	expected = content.join( '\n' );
+	input = content.join( '' );
+
+	expect( autop( input ).trim() ).toBe( expected );
+} );
+
+test( 'autop does not wrap blockquotes but does autop their contents', () => {
+	const content = '<blockquote>foo</blockquote>';
+	const expected = '<blockquote><p>foo</p></blockquote>';
+
+	expect( autop( content ).trim() ).toBe( expected );
+} );
+
+test( 'that autop treats inline elements as inline', () => {
+	const inlines = [
+		'a',
+		'em',
+		'strong',
+		'small',
+		's',
+		'cite',
+		'q',
+		'dfn',
+		'abbr',
+		'data',
+		'time',
+		'code',
+		'var',
+		'samp',
+		'kbd',
+		'sub',
+		'sup',
+		'i',
+		'b',
+		'u',
+		'mark',
+		'span',
+		'del',
+		'ins',
+		'noscript',
+		'select',
+	];
+
+	const content: string[] = [];
+	const expected: string[] = [];
+
+	inlines.forEach( ( inline ) => {
+		content.push( `<${ inline }>foo</${ inline }>` );
+		expected.push( `<p><${ inline }>foo</${ inline }></p>` );
+	} );
+
+	const contentString = content.join( '\n\n' );
+	const expectedString = expected.join( '\n' );
+
+	expect( autop( contentString ).trim() ).toBe( expectedString );
+} );
+
+test( 'element sanity', () => {
+	[
+		[ 'Hello <a\nhref="world">', '<p>Hello <a\nhref="world"></p>\n' ],
+		[
+			'Hello <!-- a\nhref="world" -->',
+			'<p>Hello <!-- a\nhref="world" --></p>\n',
+		],
+		[
+			'Hello <!-- <object>\n<param>\n<param>\n<embed>\n</embed>\n</object>\n -->',
+			'<p>Hello <!-- <object>\n<param>\n<param>\n<embed>\n</embed>\n</object>\n --></p>\n',
+		],
+		[
+			'Hello <!-- <object>\n<param/>\n<param/>\n<embed>\n</embed>\n</object>\n -->',
+			'<p>Hello <!-- <object>\n<param/>\n<param/>\n<embed>\n</embed>\n</object>\n --></p>\n',
+		],
+		/* Block elements inside comments will fail this test in all versions, it's not a regression.
+		[
+			'Hello <!-- <hr> a\nhref='world' -->',
+			'<p>Hello <!-- <hr> a\nhref='world' --></p>\n',
+		],
+		[
+			'Hello <![CDATA[ <hr> a\nhttps://youtu.be/jgz0uSaOZbE\n ]]>',
+			'<p>Hello <![CDATA[ <hr> a\nhttps://youtu.be/jgz0uSaOZbE\n ]]></p>\n',
+		],
+		*/
+		[
+			'Hello <![CDATA[ a\nhttps://youtu.be/jgz0uSaOZbE\n ]]>',
+			'<p>Hello <![CDATA[ a\nhttps://youtu.be/jgz0uSaOZbE\n ]]></p>\n',
+		],
+		[
+			'Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 ]]> -->',
+			'<p>Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 ]]> --></p>\n',
+		],
+		[
+			'Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 --> a\n9 ]]>',
+			'<p>Hello <![CDATA[ <!-- a\nhttps://youtu.be/jgz0uSaOZbE\n a\n9 --> a\n9 ]]></p>\n',
+		],
+	].forEach( ( [ input, output ] ) => {
+		expect( autop( input ) ).toBe( output );
+	} );
+} );
+
+test( 'that autop skips line breaks after br', () => {
+	const content = `
+line 1<br>
+line 2<br/>
+line 3<br />
+line 4
+line 5
+`;
+
+	const expected = `<p>line 1<br />
+line 2<br />
+line 3<br />
+line 4<br />
+line 5</p>`;
+
+	expect( autop( content ).trim() ).toBe( expected );
+} );
+
+test( 'that autop adds a paragraph after multiple br', () => {
+	const content = `
+line 1<br>
+<br/>
+line 2<br/>
+<br />
+`;
+
+	const expected = `<p>line 1</p>
+<p>line 2</p>`;
+
+	expect( autop( content ).trim() ).toBe( expected );
+} );
+
+test( 'that text before blocks is peed', () => {
+	const content = 'a<div>b</div>';
+	const expected = '<p>a</p>\n<div>b</div>';
+
+	expect( autop( content ).trim() ).toBe( expected );
+} );
+
+test( 'that autop doses not add extra closing p in figure', () => {
+	const content1 =
+		'<figure><img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
+	const expected1 = content1;
+
+	const content2 = `<figure>
+<img src="example.jpg" />
+<figcaption>Caption</figcaption>
+</figure>`;
+
+	const expected2 = `<figure>
+<img src="example.jpg" /><figcaption>Caption</figcaption></figure>`;
+
+	expect( autop( content1 ).trim() ).toBe( expected1 );
+	expect( autop( content2 ).trim() ).toBe( expected2 );
+} );
+
+test( 'that autop correctly adds a start and end tag when followed by a div', () => {
+	const content =
+		'Testing autop with a div\n<div class="wp-some-class">content</div>';
+	const expected =
+		'<p>Testing autop with a div</p>\n<div class="wp-some-class">content</div>';
+
+	expect( autop( content ).trim() ).toBe( expected );
+} );
+
+describe( 'removep', () => {
+	test( 'preserves paragraphs with attributes', () => {
+		const content = '<p style="text-align: center">\nHello World\n</p>';
+		const expected = '<p style="text-align: center">\nHello World</p>';
+
+		expect( removep( content ) ).toBe( expected );
+	} );
+} );
diff --git a/packages/autop/tsconfig.json b/packages/autop/tsconfig.json
index 1a0a90bc8cb582..a09ec7466c435b 100644
--- a/packages/autop/tsconfig.json
+++ b/packages/autop/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/babel-plugin-import-jsx-pragma/.npmrc b/packages/babel-plugin-import-jsx-pragma/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/babel-plugin-import-jsx-pragma/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
index af37e931573901..6935957675b432 100644
--- a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
+++ b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.41.0 (2024-05-16)
+
+## 4.40.0 (2024-05-02)
+
+## 4.39.0 (2024-04-19)
+
+## 4.38.0 (2024-04-03)
+
+## 4.37.0 (2024-03-21)
+
+## 4.36.0 (2024-03-06)
+
+## 4.35.0 (2024-02-21)
+
+## 4.34.0 (2024-02-09)
+
+## 4.33.0 (2024-01-24)
+
+## 4.32.0 (2024-01-10)
+
+## 4.31.0 (2023-12-13)
+
 ## 4.30.0 (2023-11-29)
 
 ## 4.29.0 (2023-11-16)
@@ -64,7 +112,7 @@
 
 ## 4.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -76,22 +124,22 @@
 
 ## 2.2.0 (2019-05-21)
 
-### New Feature
+### New Features
 
 -   Add Fragment import handling ([#15120](https://github.com/WordPress/gutenberg/pull/15120)).
 
 ## 2.0.0 (2019-03-06)
 
-### Breaking Change
+### Breaking Changes
 
 -   Stop using Babel transpilation internally and set node 8 as a minimal version required ([#13540](https://github.com/WordPress/gutenberg/pull/13540)).
 
-### Enhancement
+### Enhancements
 
 -   Plugin skips now adding import JSX pragma when the scope variable is defined for all JSX elements ([#13809](https://github.com/WordPress/gutenberg/pull/13809)).
 
 ## 1.1.0 (2018-09-05)
 
-### New Feature
+### New Features
 
 -   Plugin updated to work with the stable version of Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)).
diff --git a/packages/babel-plugin-import-jsx-pragma/README.md b/packages/babel-plugin-import-jsx-pragma/README.md
index eb252d501290b7..ebc260277b21ab 100644
--- a/packages/babel-plugin-import-jsx-pragma/README.md
+++ b/packages/babel-plugin-import-jsx-pragma/README.md
@@ -14,7 +14,7 @@ Install the module to your project using [npm](https://www.npmjs.com/).
 npm install @wordpress/babel-plugin-import-jsx-pragma
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Usage
 
diff --git a/packages/babel-plugin-import-jsx-pragma/package.json b/packages/babel-plugin-import-jsx-pragma/package.json
index c2783bb6b87a21..be9dbe0b0fe099 100644
--- a/packages/babel-plugin-import-jsx-pragma/package.json
+++ b/packages/babel-plugin-import-jsx-pragma/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-import-jsx-pragma",
-	"version": "4.30.0",
+	"version": "5.10.0",
 	"description": "Babel transform plugin for automatically injecting an import to be used as the pragma for the React JSX Transform plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -24,14 +24,15 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"index.js"
 	],
 	"main": "index.js",
 	"peerDependencies": {
-		"@babel/core": "^7.12.9"
+		"@babel/core": "^7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
diff --git a/packages/babel-plugin-makepot/.npmrc b/packages/babel-plugin-makepot/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/babel-plugin-makepot/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/babel-plugin-makepot/CHANGELOG.md b/packages/babel-plugin-makepot/CHANGELOG.md
index 60d74f5f387f4c..7fbb829d65a842 100644
--- a/packages/babel-plugin-makepot/CHANGELOG.md
+++ b/packages/babel-plugin-makepot/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 6.10.0 (2024-10-16)
+
+## 6.9.0 (2024-10-03)
+
+## 6.8.0 (2024-09-19)
+
+## 6.7.0 (2024-09-05)
+
+## 6.6.0 (2024-08-21)
+
+## 6.5.0 (2024-08-07)
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 5.42.0 (2024-05-16)
+
+## 5.41.0 (2024-05-02)
+
+## 5.40.0 (2024-04-19)
+
+## 5.39.0 (2024-04-03)
+
+## 5.38.0 (2024-03-21)
+
+## 5.37.0 (2024-03-06)
+
+## 5.36.0 (2024-02-21)
+
+## 5.35.0 (2024-02-09)
+
+## 5.34.0 (2024-01-24)
+
+## 5.33.0 (2024-01-10)
+
+## 5.32.0 (2023-12-13)
+
 ## 5.31.0 (2023-11-29)
 
 ## 5.30.0 (2023-11-16)
@@ -68,13 +116,13 @@
 
 ## 5.1.0 (2022-09-13)
 
-### Bug Fix
+### Bug Fixes
 
 -   Makepot: Fix translations object handling ([#43797](https://github.com/WordPress/gutenberg/pull/43797)).
 
 ## 5.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -86,20 +134,20 @@
 
 ## 2.2.0 (2019-03-06)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fixed Babel plugin for POT file generation to properly handle plural numbers specified in the passed header. ([#13577](https://github.com/WordPress/gutenberg/pull/13577))
 -   Fix extracted translator comments to be written as prefixed by `#.` ([#9440](https://github.com/WordPress/gutenberg/pull/9440))
 
 ## 2.1.0 (2018-09-05)
 
-### New Feature
+### New Features
 
 -   Plugin updated to work with the stable version of Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)).
 
 ## 2.0.0 (2018-07-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   Updated code to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
@@ -109,6 +157,6 @@
 
 ## 1.0.1 (2018-05-18)
 
-### Polish
+### Internal
 
 -   Fix: Standardized `package.json` format ([#119](https://github.com/WordPress/packages/pull/119))
diff --git a/packages/babel-plugin-makepot/README.md b/packages/babel-plugin-makepot/README.md
index 95f52e55d28f52..3824731e72d848 100644
--- a/packages/babel-plugin-makepot/README.md
+++ b/packages/babel-plugin-makepot/README.md
@@ -21,7 +21,7 @@ Install the module:
 npm install @wordpress/babel-plugin-makepot --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Contributing to this package
 
diff --git a/packages/babel-plugin-makepot/package.json b/packages/babel-plugin-makepot/package.json
index e20bd7ca63e7a3..f88a5257b24c8f 100644
--- a/packages/babel-plugin-makepot/package.json
+++ b/packages/babel-plugin-makepot/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-makepot",
-	"version": "5.31.0",
+	"version": "6.10.0",
 	"description": "WordPress Babel internationalization (i18n) plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"index.js"
@@ -33,7 +34,7 @@
 		"is-plain-object": "^5.0.0"
 	},
 	"peerDependencies": {
-		"@babel/core": "^7.12.9"
+		"@babel/core": "^7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
diff --git a/packages/babel-preset-default/.npmrc b/packages/babel-preset-default/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/babel-preset-default/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/babel-preset-default/CHANGELOG.md b/packages/babel-preset-default/CHANGELOG.md
index b26756aaec9eae..c787e176059298 100644
--- a/packages/babel-preset-default/CHANGELOG.md
+++ b/packages/babel-preset-default/CHANGELOG.md
@@ -2,6 +2,74 @@
 
 ## Unreleased
 
+## 8.10.0 (2024-10-16)
+
+### Enhancements
+
+-   The bundled `@babel/core` dependency has been updated from requiring `^7.16.0` to requiring `7.25.7` ([#36244](https://github.com/WordPress/gutenberg/pull/36244)).
+-   The bundled `@babel/plugin-transform-react-jsx` dependency has been updated from requiring `^7.16.0` to requiring `7.25.7` ([#36244](https://github.com/WordPress/gutenberg/pull/36244)).
+-   The bundled `@babel/plugin-transform-runtime` dependency has been updated from requiring `^7.16.0` to requiring `7.25.7` ([#36244](https://github.com/WordPress/gutenberg/pull/36244)).
+-   The bundled `@babel/preset-env` dependency has been updated from requiring `^7.16.0` to requiring `7.25.7` ([#36244](https://github.com/WordPress/gutenberg/pull/36244)).
+-   The bundled `@babel/preset-typescript` dependency has been updated from requiring `^7.16.0` to requiring `7.25.7` ([#36244](https://github.com/WordPress/gutenberg/pull/36244)).
+-   The bundled `@babel/runtime` dependency has been updated from requiring `^7.16.0` to requiring `7.25.7` ([#36244](https://github.com/WordPress/gutenberg/pull/36244)).
+
+## 8.9.0 (2024-10-03)
+
+### Bug Fixes
+
+-   Fix a bug in 8.8.1 due to missing files in the published package ([#65481](https://github.com/WordPress/gutenberg/pull/65481)).
+
+## 8.8.0 (2024-09-19)
+
+### Internal
+
+-   Added `addPolyfillComments` option. When used, it will automatically add magic comments to mark files that need `wp-polyfill` ([#65292](https://github.com/WordPress/gutenberg/pull/65292)).
+
+## 8.7.0 (2024-09-05)
+
+## 8.6.0 (2024-08-21)
+
+## 8.5.0 (2024-08-07)
+
+## 8.4.0 (2024-07-24)
+
+## 8.3.0 (2024-07-10)
+
+## 8.2.0 (2024-06-26)
+
+## 8.1.0 (2024-06-15)
+
+## 8.0.0 (2024-05-31)
+
+### Breaking Changes
+
+**Note** If you're using @wordpress/scripts for building JS scripts to target WordPress 6.5 or earlier, you should not upgrade to this version and continue using @wordpress/babel-preset-default@7.
+
+-   Use React's automatic runtime to transform JSX ([#61692](https://github.com/WordPress/gutenberg/pull/61692)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 7.42.0 (2024-05-16)
+
+## 7.41.0 (2024-05-02)
+
+## 7.40.0 (2024-04-19)
+
+## 7.39.0 (2024-04-03)
+
+## 7.38.0 (2024-03-21)
+
+## 7.37.0 (2024-03-06)
+
+## 7.36.0 (2024-02-21)
+
+## 7.35.0 (2024-02-09)
+
+## 7.34.0 (2024-01-24)
+
+## 7.33.0 (2024-01-10)
+
+## 7.32.0 (2023-12-13)
+
 ## 7.31.0 (2023-11-29)
 
 ## 7.30.0 (2023-11-16)
@@ -16,7 +84,7 @@
 
 -   The bundled `browserslist` dependency has been updated from requiring `^4.21.9` to requiring `^4.21.10` ([#54657](https://github.com/WordPress/gutenberg/pull/54657)).
 
-## Enhancements
+### Enhancements
 
 -   Use `react` as the default scope variable for JSX pragma instead of `@wordpress/element`.
 
@@ -36,7 +104,7 @@
 
 ## 7.19.0 (2023-06-07)
 
-### Enhancement
+### Enhancements
 
 -   Enable the `bugfixes` option in `@babel/preset-env` to remove unneeded transpilation ([#50994](https://github.com/WordPress/gutenberg/pull/50994)).
 
@@ -50,7 +118,7 @@
 
 ## 7.14.0 (2023-03-29)
 
-### Enhancement
+### Enhancements
 
 -   Exclude IE-only `setImmediate`/`clearImmediate` from list of polyfills.
 
@@ -80,7 +148,7 @@
 
 ## 7.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -99,7 +167,7 @@
 
 ## 6.2.0 (2021-05-31)
 
-### New Feature
+### New Features
 
 -   New `build/polyfill.js` (minified version – `build/polyfill.min.js`) file is available that polyfills ECMAScript features missing in the [browsers supported](https://make.wordpress.org/core/handbook/best-practices/browser-support/) by the WordPress project. It's a drop-in replacement for the deprecated `@babel/polyfill` package ([#31279](https://github.com/WordPress/gutenberg/pull/31279)).
 
@@ -162,7 +230,7 @@
 
 ## 4.10.0 (2020-02-04)
 
-### New Feature
+### New Features
 
 -   The bundled `@babel/core` dependency has been updated from requiring `^7.4.4` to requiring `^7.8.3`. All other Babel plugins were updated to the latest version. `@babel/preset-env` has now ESMAScript 2020 support enabled by default (see [Highlights](https://babeljs.io/blog/2020/01/11/7.8.0#highlights)).
 
@@ -193,25 +261,25 @@
 -   Removed `babel-core` dependency acting as Babel 7 bridge ([#13922](https://github.com/WordPress/gutenberg/pull/13922). Ensure all references to `babel-core` are replaced with `@babel/core` .
 -   Preset updated to include `@wordpress/babel-plugin-import-jsx-pragma` plugin integration ([#13540](https://github.com/WordPress/gutenberg/pull/13540)). It should no longer be explicitly included in your Babel config.
 
-### Bug Fix
+### Bug Fixes
 
 -   The runtime transform no longer disables [the `regenerator` option](https://babeljs.io/docs/en/babel-plugin-transform-runtime#regenerator). This should resolve issues where a file generated using the preset would assume the presence of a `regeneratorRuntime` object in the global scope. While this is not considered a breaking change, you may be mindful to consider that with transformed output now explicitly importing the runtime regenerator, bundle sizes may increase if you do not otherwise mitigate the additional import by either (a) overriding the option in your own Babel configuration extensions or (b) redefining the resolved value of `@babel/runtime/regenerator` using a feature like [Webpack's `externals` option](https://webpack.js.org/configuration/externals/).
 
 ## 3.0.0 (2018-09-30)
 
-### Breaking Change
+### Breaking Changes
 
 -   The configured `@babel/preset-env` preset will no longer pass `useBuiltIns: 'usage'` as an option. It is therefore expected that a polyfill serve in its place, if necessary.
 
 ## 2.1.0 (2018-09-05)
 
-### New Feature
+### New Features
 
 -   Plugin updated to work with the stable version of Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)).
 
 ## 2.0.0 (2018-07-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   Updated code to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
@@ -221,12 +289,12 @@
 
 ## 1.3.0 (2018-05-22)
 
-### New Feature
+### New Features
 
 -   Added support for async generator functions ([#126](https://github.com/WordPress/packages/pull/126))
 
 ## 1.2.1 (2018-05-18)
 
-### Polish
+### Internal
 
 -   Fix: Standardized `package.json` format ([#119](https://github.com/WordPress/packages/pull/119))
diff --git a/packages/babel-preset-default/README.md b/packages/babel-preset-default/README.md
index ff98eb4e526e7f..de2e417d80e1e7 100644
--- a/packages/babel-preset-default/README.md
+++ b/packages/babel-preset-default/README.md
@@ -2,7 +2,7 @@
 
 Default [Babel](https://babeljs.io/) preset for WordPress development.
 
-The preset includes configuration which enable language features and syntax extensions targeted for support by WordPress. This includes [ECMAScript proposals](https://github.com/tc39/proposals) which have reached [Stage 4 ("Finished")](https://tc39.es/process-document/), as well as the [JSX syntax extension](https://reactjs.org/docs/introducing-jsx.html). For more information, refer to the [JavaScript Coding Guidelines](https://github.com/WordPress/gutenberg/blob/HEAD/docs/contributors/coding-guidelines.md#javascript).
+The preset includes configuration which enable language features and syntax extensions targeted for support by WordPress. This includes [ECMAScript proposals](https://github.com/tc39/proposals) which have reached [Stage 4 ("Finished")](https://tc39.es/process-document/), as well as the [JSX syntax extension](https://react.dev/learn/writing-markup-with-jsx). For more information, refer to the [JavaScript Coding Guidelines](https://github.com/WordPress/gutenberg/blob/HEAD/docs/contributors/code/coding-guidelines.md#javascript).
 
 ## Installation
 
@@ -12,7 +12,7 @@ Install the module
 npm install @wordpress/babel-preset-default --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ### Usage
 
@@ -35,7 +35,7 @@ For example, if you'd like to use a new language feature proposal which has not
 ```json
 {
 	"presets": [ "@wordpress/babel-preset-default" ],
-	"plugins": [ "@babel/plugin-proposal-class-properties" ]
+	"plugins": [ "@babel/plugin-transform-class-properties" ]
 }
 ```
 
@@ -43,7 +43,7 @@ For example, if you'd like to use a new language feature proposal which has not
 
 There is a complementary `build/polyfill.js` (minified version – `build/polyfill.min.js`) file available that polyfills ECMAScript features missing in the [browsers supported](https://make.wordpress.org/core/handbook/best-practices/browser-support/) by the WordPress project ([#31279](https://github.com/WordPress/gutenberg/pull/31279)). It's a drop-in replacement for the deprecated `@babel/polyfill` package, and it's also based on [`core-js`](https://github.com/zloirock/core-js) project.
 
-This needs to be included before all your compiled Babel code. You can either prepend it to your compiled code or include it in a `<script>` before it.
+This needs to be included in some cases, if the features being used require polyfills. You can either prepend it to your compiled code or include it in a `<script>` before it.
 
 #### TC39 Proposals
 
diff --git a/packages/babel-preset-default/bin/index.js b/packages/babel-preset-default/bin/index.js
index a2d86233565138..041ab0143a5ae4 100755
--- a/packages/babel-preset-default/bin/index.js
+++ b/packages/babel-preset-default/bin/index.js
@@ -4,33 +4,30 @@
  * External dependencies
  */
 const builder = require( 'core-js-builder' );
-const { minify } = require( 'uglify-js' );
+const { minify } = require( 'terser' );
 const { writeFile } = require( 'fs' ).promises;
 
+/**
+ * Internal dependencies
+ */
+const exclusions = require( '../polyfill-exclusions' );
+
 builder( {
-	modules: [ 'es', 'web' ],
-	exclude: [
-		// core-js is extremely conservative in which polyfills to include.
-		// Since we don't care about the tiny browser implementation bugs behind its decision
-		// to polyfill these features, we forcefully prevent them from being included.
-		// @see https://github.com/WordPress/gutenberg/pull/31279
-		'es.promise',
-		// This is an IE-only feature which we don't use, and don't want to polyfill.
-		// @see https://github.com/WordPress/gutenberg/pull/49234
-		'web.immediate',
-	],
+	modules: [ 'es.', 'web.' ],
+	exclude: exclusions,
+	summary: { console: { size: true, modules: true } },
 	targets: require( '@wordpress/browserslist-config' ),
 	filename: './build/polyfill.js',
 } )
-	.then( async ( code ) => {
-		const output = minify( code, {
+	.then( ( code ) =>
+		minify( code, {
 			output: {
 				comments: ( node, comment ) =>
-					comment.value.indexOf( 'License' ) >= 0,
+					comment.value.toLowerCase().includes( 'license' ),
 			},
-		} );
-		await writeFile( './build/polyfill.min.js', output.code );
-	} )
+		} )
+	)
+	.then( ( output ) => writeFile( './build/polyfill.min.js', output.code ) )
 	.catch( ( error ) => {
 		// eslint-disable-next-line no-console
 		console.log( error );
diff --git a/packages/babel-preset-default/index.js b/packages/babel-preset-default/index.js
index 40f7c31bb3c25b..468c2cce812f69 100644
--- a/packages/babel-preset-default/index.js
+++ b/packages/babel-preset-default/index.js
@@ -3,6 +3,12 @@
  */
 const browserslist = require( 'browserslist' );
 
+/**
+ * Internal dependencies
+ */
+const exclusions = require( './polyfill-exclusions' );
+const replacePolyfills = require( './replace-polyfills' );
+
 module.exports = ( api ) => {
 	let wpBuildOpts = {};
 	const isWPBuild = ( name ) =>
@@ -27,6 +33,13 @@ module.exports = ( api ) => {
 				'proposal-nullish-coalescing-operator',
 				'proposal-logical-assignment-operators',
 			],
+			...( wpBuildOpts.addPolyfillComments
+				? {
+						useBuiltIns: 'usage',
+						exclude: exclusions,
+						corejs: require( 'core-js/package.json' ).version,
+				  }
+				: {} ),
 		};
 
 		if ( isTestEnv ) {
@@ -75,24 +88,14 @@ module.exports = ( api ) => {
 		],
 		plugins: [
 			require.resolve( '@wordpress/warning/babel-plugin' ),
-			[
-				require.resolve( '@wordpress/babel-plugin-import-jsx-pragma' ),
-				{
-					scopeVariable: 'createElement',
-					scopeVariableFrag: 'Fragment',
-					source: 'react',
-					isDefault: false,
-				},
-			],
 			[
 				require.resolve( '@babel/plugin-transform-react-jsx' ),
 				{
-					pragma: 'createElement',
-					pragmaFrag: 'Fragment',
-					useSpread: true,
+					runtime: 'automatic',
 				},
 			],
 			maybeGetPluginTransformRuntime(),
+			wpBuildOpts.addPolyfillComments && replacePolyfills,
 		].filter( Boolean ),
 	};
 };
diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json
index 7cb8f46ec26587..777a40012d67f7 100644
--- a/packages/babel-preset-default/package.json
+++ b/packages/babel-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-preset-default",
-	"version": "7.31.0",
+	"version": "8.10.0",
 	"description": "Default Babel preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,26 +21,28 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"build",
-		"index.js"
+		"index.js",
+		"polyfill-exclusions.js",
+		"replace-polyfills.js"
 	],
 	"main": "index.js",
 	"dependencies": {
-		"@babel/core": "^7.16.0",
-		"@babel/plugin-transform-react-jsx": "^7.16.0",
-		"@babel/plugin-transform-runtime": "^7.16.0",
-		"@babel/preset-env": "^7.16.0",
-		"@babel/preset-typescript": "^7.16.0",
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/babel-plugin-import-jsx-pragma": "file:../babel-plugin-import-jsx-pragma",
-		"@wordpress/browserslist-config": "file:../browserslist-config",
-		"@wordpress/warning": "file:../warning",
+		"@babel/core": "7.25.7",
+		"@babel/plugin-transform-react-jsx": "7.25.7",
+		"@babel/plugin-transform-runtime": "7.25.7",
+		"@babel/preset-env": "7.25.7",
+		"@babel/preset-typescript": "7.25.7",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/browserslist-config": "*",
+		"@wordpress/warning": "*",
 		"browserslist": "^4.21.10",
 		"core-js": "^3.31.0",
-		"react": "^18.2.0"
+		"react": "^18.3.0"
 	},
 	"publishConfig": {
 		"access": "public"
diff --git a/packages/babel-preset-default/polyfill-exclusions.js b/packages/babel-preset-default/polyfill-exclusions.js
new file mode 100644
index 00000000000000..507396c930b99c
--- /dev/null
+++ b/packages/babel-preset-default/polyfill-exclusions.js
@@ -0,0 +1,10 @@
+module.exports = [
+	// Ignore excessively strict polyfilling of `Array.prototype.push` to work
+	// around an obscure bug involving non-writable arrays.
+	// See https://issues.chromium.org/issues/42202623 for the details of the
+	// bug that leads to the polyfilling, and which we are choosing to ignore.
+	'es.array.push',
+	// This is an IE-only feature which we don't use, and don't want to polyfill.
+	// @see https://github.com/WordPress/gutenberg/pull/49234
+	'web.immediate',
+];
diff --git a/packages/babel-preset-default/replace-polyfills.js b/packages/babel-preset-default/replace-polyfills.js
new file mode 100644
index 00000000000000..a3a68cc5f84e90
--- /dev/null
+++ b/packages/babel-preset-default/replace-polyfills.js
@@ -0,0 +1,59 @@
+// Babel plugin that looks for `core-js` imports (or requires)
+// and replaces them with magic comments to mark the file as
+// depending on wp-polyfill.
+function replacePolyfills() {
+	return {
+		pre() {
+			this.hasAddedPolyfills = false;
+		},
+		visitor: {
+			Program: {
+				exit( path ) {
+					if ( this.hasAddedPolyfills ) {
+						// Add magic comment to top of file.
+						path.addComment( 'leading', ' wp:polyfill ' );
+					}
+				},
+			},
+			// Handle `import` syntax.
+			ImportDeclaration( path ) {
+				const source = path?.node?.source;
+				const name = source?.value || '';
+
+				// Look for imports from `core-js`.
+				if ( name.startsWith( 'core-js/' ) ) {
+					// Remove import.
+					path.remove();
+					this.hasAddedPolyfills = true;
+				}
+			},
+
+			// Handle `require` syntax.
+			CallExpression( path ) {
+				const callee = path?.node?.callee;
+				const arg = path?.node?.arguments[ 0 ];
+
+				if (
+					! callee ||
+					! arg ||
+					callee.type !== 'Identifier' ||
+					callee.name !== 'require'
+				) {
+					return;
+				}
+
+				// Look for requires for `core-js`.
+				if (
+					arg.type === 'StringLiteral' &&
+					arg.value.startsWith( 'core-js/' )
+				) {
+					// Remove import.
+					path.remove();
+					this.hasAddedPolyfills = true;
+				}
+			},
+		},
+	};
+}
+
+module.exports = replacePolyfills;
diff --git a/packages/babel-preset-default/test/fixtures/polyfill.js b/packages/babel-preset-default/test/fixtures/polyfill.js
new file mode 100644
index 00000000000000..14a4fb20f14fa4
--- /dev/null
+++ b/packages/babel-preset-default/test/fixtures/polyfill.js
@@ -0,0 +1,6 @@
+// Note: this fixture may need to be updated when the browserslist or the
+// core-js dependencies are updated.
+// It should always test a feature that is supported, but requires
+// a polyfill to work across all supported browsers.
+const foo = new URLSearchParams();
+window.fooSize = foo.size;
diff --git a/packages/babel-preset-default/test/index.js b/packages/babel-preset-default/test/index.js
index 0a411cd4247975..4a23d13544b278 100644
--- a/packages/babel-preset-default/test/index.js
+++ b/packages/babel-preset-default/test/index.js
@@ -24,4 +24,22 @@ describe( 'Babel preset default', () => {
 
 		expect( output.code ).toMatchSnapshot();
 	} );
+
+	test( 'transpilation includes magic comment when using the addPolyfillComments option', () => {
+		const filename = path.join( __dirname, '/fixtures/polyfill.js' );
+		const input = readFileSync( filename );
+
+		const output = transform( input, {
+			filename,
+			configFile: false,
+			envName: 'production',
+			presets: [ babelPresetDefault ],
+			caller: {
+				name: 'WP_BUILD_MAIN',
+				addPolyfillComments: true,
+			},
+		} );
+
+		expect( output.code ).toContain( '/* wp:polyfill */' );
+	} );
 } );
diff --git a/packages/base-styles/.npmrc b/packages/base-styles/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/base-styles/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/base-styles/CHANGELOG.md b/packages/base-styles/CHANGELOG.md
index 6fba6e0f84f018..7535112c5a5c11 100644
--- a/packages/base-styles/CHANGELOG.md
+++ b/packages/base-styles/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.49.0 (2024-05-16)
+
+## 4.48.0 (2024-05-02)
+
+## 4.47.0 (2024-04-19)
+
+## 4.46.0 (2024-04-03)
+
+## 4.45.0 (2024-03-21)
+
+## 4.44.0 (2024-03-06)
+
+## 4.43.0 (2024-02-21)
+
+## 4.42.0 (2024-02-09)
+
+## 4.41.0 (2024-01-24)
+
+## 4.40.0 (2024-01-10)
+
+## 4.39.0 (2023-12-13)
+
 ## 4.38.0 (2023-11-29)
 
 ## 4.37.0 (2023-11-16)
@@ -68,7 +116,7 @@
 
 ## 4.0.0 (2021-09-09)
 
-### Breaking Change
+### Breaking Changes
 
 -   Remove the background-colors, foreground-colors, and gradient-colors mixins.
 
@@ -81,6 +129,6 @@
 
 ## 1.2.0 (2020-01-13)
 
-### Bug Fix
+### Bug Fixes
 
 -   Import `colors` into `variables` since the latter depends on the former.
diff --git a/packages/base-styles/_animations.scss b/packages/base-styles/_animations.scss
index b5e6655e660cbb..ae5de9a803008c 100644
--- a/packages/base-styles/_animations.scss
+++ b/packages/base-styles/_animations.scss
@@ -1,5 +1,48 @@
-@mixin edit-post__fade-in-animation($speed: 0.2s, $delay: 0s) {
-	animation: edit-post__fade-in-animation $speed ease-out $delay;
+@mixin keyframes($name) {
+	@keyframes #{$name} {
+		@content;
+	}
+}
+
+@mixin animation__fade-in($speed: 0.08s, $delay: 0s, $easing: linear) {
+	@include keyframes(__wp-base-styles-fade-in) {
+		from {
+			opacity: 0;
+		}
+		to {
+			opacity: 1;
+		}
+	}
+
+
+	animation: __wp-base-styles-fade-in $speed $easing $delay;
+	animation-fill-mode: forwards;
+	@include reduce-motion("animation");
+}
+
+@mixin animation__fade-out($speed: 0.08s, $delay: 0s, $easing: linear) {
+	@include keyframes(__wp-base-styles-fade-out) {
+		from {
+			opacity: 1;
+		}
+		to {
+			opacity: 0;
+		}
+	}
+
+
+	animation: __wp-base-styles-fade-out $speed $easing $delay;
 	animation-fill-mode: forwards;
 	@include reduce-motion("animation");
 }
+
+// Deprecated
+@mixin edit-post__fade-in-animation($speed: 0.08s, $delay: 0s) {
+	@warn "The `edit-post__fade-in-animation` mixin is deprecated. Use `animation__fade-in` instead.";
+	@include animation__fade-in($speed, $delay);
+}
+
+@mixin editor-canvas-resize-animation($additional-transition-rules...) {
+	transition: all 400ms cubic-bezier(0.46, 0.03, 0.52, 0.96), $additional-transition-rules;
+	@include reduce-motion("transition");
+}
diff --git a/packages/base-styles/_colors.scss b/packages/base-styles/_colors.scss
index 2ce58b64e43b8c..bba7fd5c8ec141 100644
--- a/packages/base-styles/_colors.scss
+++ b/packages/base-styles/_colors.scss
@@ -8,7 +8,7 @@
 $black: #000;			// Use only when you truly need pure black. For UI, use $gray-900.
 $gray-900: #1e1e1e;
 $gray-800: #2f2f2f;
-$gray-700: #757575;		// Meets 4.6:1 text contrast against white.
+$gray-700: #757575;		// Meets 4.6:1 (4.5:1 is minimum) text contrast against white.
 $gray-600: #949494;		// Meets 3:1 UI or large text contrast against white.
 $gray-400: #ccc;
 $gray-300: #ddd;		// Used for most borders.
@@ -17,7 +17,6 @@ $gray-100: #f0f0f0;		// Used for light gray backgrounds.
 $white: #fff;
 
 // Opacities & additional colors.
-$dark-theme-focus: $white;	// Focus color when the theme is dark.
 $dark-gray-placeholder: rgba($gray-900, 0.62);
 $medium-gray-placeholder: rgba($gray-900, 0.55);
 $light-gray-placeholder: rgba($white, 0.65);
@@ -26,3 +25,6 @@ $light-gray-placeholder: rgba($white, 0.65);
 $alert-yellow: #f0b849;
 $alert-red: #cc1818;
 $alert-green: #4ab866;
+
+// Deprecated, please avoid using these.
+$dark-theme-focus: $white;	// Focus color when the theme is dark.
diff --git a/packages/base-styles/_default-custom-properties.scss b/packages/base-styles/_default-custom-properties.scss
index 52dfeb3899d772..98bb9ae75ea674 100644
--- a/packages/base-styles/_default-custom-properties.scss
+++ b/packages/base-styles/_default-custom-properties.scss
@@ -1,4 +1,3 @@
-
 // It is important to include these styles in all built stylesheets.
 // This allows to CSS variables post CSS plugin to generate fallbacks.
 // It also provides default CSS variables for npm package consumers.
@@ -6,4 +5,7 @@
 	@include admin-scheme(#007cba);
 	--wp-block-synced-color: #7a00df;
 	--wp-block-synced-color--rgb: #{hex-to-rgb(#7a00df)};
+	// This CSS variable is not used in Gutenberg project,
+	// but is maintained for backwards compatibility.
+	--wp-bound-block-color: var(--wp-block-synced-color);
 }
diff --git a/packages/base-styles/_mixins.scss b/packages/base-styles/_mixins.scss
index b988c0499f1fb8..65f98bf6f15bfc 100644
--- a/packages/base-styles/_mixins.scss
+++ b/packages/base-styles/_mixins.scss
@@ -1,6 +1,74 @@
 @import "./functions";
 @import "./long-content-fade";
 
+/**
+ * Typography
+ */
+
+@mixin _text-heading() {
+	font-family: $font-family-headings;
+	font-weight: $font-weight-medium;
+}
+
+@mixin _text-body() {
+	font-family: $font-family-body;
+	font-weight: $font-weight-regular;
+}
+
+@mixin heading-small() {
+	@include _text-heading();
+	font-size: $font-size-x-small;
+	line-height: $line-height-x-small;
+}
+
+@mixin heading-medium() {
+	@include _text-heading();
+	font-size: $font-size-medium;
+	line-height: $line-height-small;
+}
+
+@mixin heading-large() {
+	@include _text-heading();
+	font-size: $font-size-large;
+	line-height: $line-height-small;
+}
+
+@mixin heading-x-large() {
+	@include _text-heading();
+	font-size: $font-size-x-large;
+	line-height: $line-height-medium;
+}
+
+@mixin heading-2x-large() {
+	@include _text-heading();
+	font-size: $font-size-2x-large;
+	line-height: $font-line-height-2x-large;
+}
+
+@mixin body-small() {
+	@include _text-body();
+	font-size: $font-size-small;
+	line-height: $line-height-x-small;
+}
+
+@mixin body-medium() {
+	@include _text-body();
+	font-size: $font-size-medium;
+	line-height: $line-height-small;
+}
+
+@mixin body-large() {
+	@include _text-body();
+	font-size: $font-size-large;
+	line-height: $line-height-medium;
+}
+
+@mixin body-x-large() {
+	@include _text-body();
+	font-size: $font-size-x-large;
+	line-height: $line-height-x-large;
+}
+
 /**
  * Breakpoint mixins
  */
@@ -64,7 +132,7 @@
  */
 
 @mixin block-toolbar-button-style__focus() {
-	box-shadow: inset 0 0 0 $border-width var(--wp-components-color-background, $white), 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+	box-shadow: inset 0 0 0 $border-width $white, 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 
 	// Windows High Contrast mode will show this outline, but not the box-shadow.
 	outline: 2px solid transparent;
@@ -74,7 +142,7 @@
 @mixin input-style__neutral() {
 	box-shadow: 0 0 0 transparent;
 	transition: box-shadow 0.1s linear;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	border: $border-width solid $gray-600;
 	@include reduce-motion("transition");
 }
@@ -162,22 +230,6 @@
 	}
 }
 
-@mixin placeholder-style() {
-	border-radius: $radius-block-ui;
-
-	&::before {
-		content: "";
-		position: absolute;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		pointer-events: none;
-		background: currentColor;
-		opacity: 0.1;
-	}
-}
-
 /**
  * Allows users to opt-out of animations via OS-level preferences.
  */
@@ -243,7 +295,7 @@
 	border: $border-width solid $gray-900;
 	margin-right: $grid-unit-15;
 	transition: none;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 
 	&:focus {
 		box-shadow: 0 0 0 ($border-width * 2) $white, 0 0 0 ($border-width * 2 + $border-width-focus-fallback) var(--wp-admin-theme-color);
@@ -284,9 +336,8 @@
 			display: inline-block;
 			vertical-align: middle;
 			width: 16px;
-			/* stylelint-disable */
+			/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword -- dashicons don't need a generic family keyword. */
 			font: normal 30px/1 dashicons;
-			/* stylelint-enable */
 			speak: none;
 			-webkit-font-smoothing: antialiased;
 			-moz-osx-font-smoothing: grayscale;
@@ -297,6 +348,16 @@
 			}
 		}
 	}
+
+	&[aria-disabled="true"],
+	&:disabled {
+		background: $gray-100;
+		border-color: $gray-300;
+		cursor: default;
+
+		// Override style inherited from wp-admin. Required to avoid degraded appearance on different backgrounds.
+		opacity: 1;
+	}
 }
 
 @mixin radio-control {
@@ -307,17 +368,25 @@
 	border-radius: $radius-round;
 	width: $radio-input-size-sm;
 	height: $radio-input-size-sm;
+	min-width: $radio-input-size-sm;
+	max-width: $radio-input-size-sm;
+	position: relative;
 
 	@include break-small() {
 		height: $radio-input-size;
 		width: $radio-input-size;
+		min-width: $radio-input-size;
+		max-width: $radio-input-size;
 	}
 
 	&:checked::before {
 		box-sizing: inherit;
-		width: 8px;
-		height: 8px;
-		transform: translate(7px, 7px);
+		width: math.div($radio-input-size-sm, 2);
+		height: math.div($radio-input-size-sm, 2);
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
 		margin: 0;
 		background-color: $white;
 
@@ -325,7 +394,8 @@
 		border: 4px solid $white;
 
 		@include break-small() {
-			transform: translate(5px, 5px);
+			width: math.div($radio-input-size, 2);
+			height: math.div($radio-input-size, 2);
 		}
 	}
 
@@ -338,7 +408,7 @@
 
 	&:checked {
 		background: var(--wp-admin-theme-color);
-		border-color: var(--wp-admin-theme-color);
+		border: none;
 	}
 }
 
@@ -357,6 +427,14 @@
 	}
 }
 
+@mixin link-reset {
+	&:focus {
+		color: var(--wp-admin-theme-color--rgb);
+		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color, #007cba);
+		border-radius: $radius-small;
+	}
+}
+
 // The editor input reset with increased specificity to avoid theme styles bleeding in.
 @mixin editor-input-reset() {
 	font-family: $editor-html-font !important;
@@ -365,7 +443,7 @@
 	padding: $grid-unit-15 !important;
 	border: $border-width solid $gray-900 !important;
 	box-shadow: none !important;
-	border-radius: $radius-block-ui !important;
+	border-radius: $radius-small !important;
 
 	// Fonts smaller than 16px causes mobile safari to zoom.
 	font-size: $mobile-text-min-font-size !important;
@@ -500,12 +578,9 @@
 
 // Deprecated from UI, kept for back-compat.
 @mixin gradient-colors-deprecated() {
-	/*
-	 * Our classes uses the same values we set for gradient value attributes,
-	 * and we can not use spacing because of WP multi site kses rule.
-	 */
+	// Our classes uses the same values we set for gradient value attributes.
 
-	/* stylelint-disable function-comma-space-after */
+	/* stylelint-disable @stylistic/function-comma-space-after -- We can not use spacing because of WP multi site kses rule. */
 	.has-vivid-green-cyan-to-vivid-cyan-blue-gradient-background {
 		background: linear-gradient(135deg,rgba(0,208,132,1) 0%,rgba(6,147,227,1) 100%);
 	}
@@ -533,7 +608,7 @@
 	.has-midnight-gradient-background {
 		background: linear-gradient(135deg,rgb(2,3,129) 0%,rgb(40,116,252) 100%);
 	}
-	/* stylelint-enable function-comma-space-after */
+	/* stylelint-enable @stylistic/function-comma-space-after */
 }
 
 @mixin custom-scrollbars-on-hover($handle-color, $handle-color-hover) {
@@ -579,3 +654,21 @@
 		}
 	}
 }
+
+@mixin selected-block-outline($widthRatio: 1) {
+	outline-color: var(--wp-admin-theme-color);
+	outline-style: solid;
+	outline-width: calc(#{$widthRatio} * (var(--wp-admin-border-width-focus) / var(--wp-block-editor-iframe-zoom-out-scale, 1)));
+	outline-offset: calc(#{$widthRatio} * ((-1 * var(--wp-admin-border-width-focus) ) / var(--wp-block-editor-iframe-zoom-out-scale, 1)));
+}
+
+@mixin selected-block-focus($widthRatio: 1) {
+	content: "";
+	position: absolute;
+	pointer-events: none;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	@include selected-block-outline($widthRatio);
+}
diff --git a/packages/base-styles/_variables.scss b/packages/base-styles/_variables.scss
index d47f6e95b6265e..ec0bdf91f2489d 100644
--- a/packages/base-styles/_variables.scss
+++ b/packages/base-styles/_variables.scss
@@ -12,16 +12,37 @@
  * Fonts & basic variables.
  */
 
-$default-font: -apple-system, BlinkMacSystemFont,"Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell,"Helvetica Neue", sans-serif;
-$default-font-size: 13px;
-$default-line-height: 1.4;
-$editor-html-font: Menlo, Consolas, monaco, monospace;
-$editor-font-size: 16px;
-$default-block-margin: 28px; // This value provides a consistent, contiguous spacing between blocks.
-$text-editor-font-size: 15px;
-$editor-line-height: 1.8;
-$mobile-text-min-font-size: 16px; // Any font size below 16px will cause Mobile Safari to "zoom in".
+$default-font: -apple-system, BlinkMacSystemFont,"Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell,"Helvetica Neue", sans-serif; // Todo: deprecate in favor of $family variables
+$default-line-height: 1.4; // Todo: deprecate in favor of $line-height tokens
+
+/**
+ * Typography
+ */
 
+// Sizes
+$font-size-x-small: 11px;
+$font-size-small: 12px;
+$font-size-medium: 13px;
+$font-size-large: 15px;
+$font-size-x-large: 20px;
+$font-size-2x-large: 32px;
+
+// Line heights
+$font-line-height-x-small: 16px;
+$font-line-height-small: 20px;
+$font-line-height-medium: 24px;
+$font-line-height-large: 28px;
+$font-line-height-x-large: 32px;
+$font-line-height-2x-large: 40px;
+
+// Weights
+$font-weight-regular: 400;
+$font-weight-medium: 500;
+
+// Families
+$font-family-headings: -apple-system, "system-ui", "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+$font-family-body: -apple-system, "system-ui", "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+$font-family-mono: Menlo, Consolas, monaco, monospace;
 
 /**
  * Grid System.
@@ -40,6 +61,33 @@ $grid-unit-60: 6 * $grid-unit;		// 48px
 $grid-unit-70: 7 * $grid-unit;		// 56px
 $grid-unit-80: 8 * $grid-unit;		// 64px
 
+/**
+ * Radius scale.
+ */
+
+$radius-x-small: 1px;   // Applied to elements like buttons nested within primitives like inputs.
+$radius-small: 2px;     // Applied to most primitives.
+$radius-medium: 4px;    // Applied to containers with smaller padding.
+$radius-large: 8px;     // Applied to containers with larger padding.
+$radius-full: 9999px;   // For pills.
+$radius-round: 50%;     // For circles and ovals.
+
+/**
+ * Elevation scale.
+ */
+
+// For sections and containers that group related content and controls, which may overlap other content. Example: Preview Frame.
+$elevation-x-small: 0 1px 1px rgba($black, 0.03), 0 1px 2px rgba($black, 0.02), 0 3px 3px rgba($black, 0.02), 0 4px 4px rgba($black, 0.01);
+
+// For components that provide contextual feedback without being intrusive. Generally non-interruptive. Example: Tooltips, Snackbar.
+$elevation-small: 0 1px 2px rgba($black, 0.05), 0 2px 3px rgba($black, 0.04), 0 6px 6px rgba($black, 0.03), 0 8px 8px rgba($black, 0.02);
+
+// For components that offer additional actions. Example: Menus, Command Palette
+$elevation-medium: 0 2px 3px rgba($black, 0.05), 0 4px 5px rgba($black, 0.04), 0 12px 12px rgba($black, 0.03), 0 16px 16px rgba($black, 0.02);
+
+// For components that confirm decisions or handle necessary interruptions. Example: Modals.
+$elevation-large: 0 5px 15px rgba($black, 0.08), 0 15px 27px rgba($black, 0.07), 0 30px 36px rgba($black, 0.04), 0 50px 43px rgba($black, 0.02);
+
 /**
  * Dimensions.
  */
@@ -51,7 +99,7 @@ $button-size-small: 24px;
 $button-size-compact: 32px;
 $header-height: 60px;
 $panel-header-height: $grid-unit-60;
-$nav-sidebar-width: 360px;
+$nav-sidebar-width: 300px;
 $admin-bar-height: 32px;
 $admin-bar-height-big: 46px;
 $admin-sidebar-width: 160px;
@@ -62,25 +110,27 @@ $modal-width-small: 384px;
 $modal-width-medium: 512px;
 $modal-width-large: 840px;
 $spinner-size: 16px;
-$canvas-padding: $grid-unit-30;
-
+$canvas-padding: $grid-unit-20;
 
 /**
- * Shadows.
+ * Mobile specific styles
  */
-
-$shadow-popover: 0 0.7px 1px rgba($black, 0.1), 0 1.2px 1.7px -0.2px rgba($black, 0.1), 0 2.3px 3.3px -0.5px rgba($black, 0.1);
-$shadow-modal: 0 0.7px 1px rgba($black, 0.15), 0 2.7px 3.8px -0.2px rgba($black, 0.15), 0 5.5px 7.8px -0.3px rgba($black, 0.15), 0.1px 11.5px 16.4px -0.5px rgba($black, 0.15);
+$mobile-text-min-font-size: 16px; // Any font size below 16px will cause Mobile Safari to "zoom in".
 
 /**
- * Editor widths.
+ * Editor styles.
  */
 
 $sidebar-width: 280px;
 $content-width: 840px;
 $wide-content-width: 1100px;
 $widget-area-width: 700px;
-
+$secondary-sidebar-width: 350px;
+$editor-font-size: 16px;
+$default-block-margin: 28px; // This value provides a consistent, contiguous spacing between blocks.
+$text-editor-font-size: 15px;
+$editor-line-height: 1.8;
+$editor-html-font: $font-family-mono;
 
 /**
  * Block & Editor UI.
@@ -91,14 +141,15 @@ $border-width: 1px;
 $border-width-focus-fallback: 2px; // This exists as a fallback, and is ideally overridden by var(--wp-admin-border-width-focus) unless in some SASS math cases.
 $border-width-tab: 1.5px;
 $helptext-font-size: 12px;
-$radius-round: 50%;
-$radius-block-ui: 2px;
-$radio-input-size: 20px;
+$radio-input-size: 16px;
 $radio-input-size-sm: 24px; // Width & height for small viewports.
 
 // Deprecated, please avoid using these.
 $block-padding: 14px; // Used to define space between block footprint and surrouding borders.
-
+$radius-block-ui: $radius-small;
+$shadow-popover: $elevation-x-small;
+$shadow-modal: $elevation-large;
+$default-font-size: $font-size-medium;
 
 /**
  * Block paddings.
diff --git a/packages/base-styles/_z-index.scss b/packages/base-styles/_z-index.scss
index 536d07ec4da34b..7bb71732546053 100644
--- a/packages/base-styles/_z-index.scss
+++ b/packages/base-styles/_z-index.scss
@@ -4,13 +4,12 @@
 
 $z-layers: (
 	".block-editor-block-list__block::before": 0,
+	".block-editor-block-list__block.is-selected": 20,
 	".block-editor-block-switcher__arrow": 1,
 	".block-editor-block-list__block {core/image aligned wide or fullwide}": 20,
 	".block-library-classic__toolbar": 31, // When scrolled to top this toolbar needs to sit over block-editor-block-toolbar
-	".block-editor-block-list__block-selection-button": 22,
 	".components-form-toggle__input": 1,
-	".edit-post-text-editor__toolbar": 1,
-	".edit-site-code-editor__toolbar": 1,
+	".editor-text-editor__toolbar": 1,
 
 	// These next three share a stacking context
 	".block-library-template-part__selection-search": 2, // higher sticky element
@@ -32,7 +31,6 @@ $z-layers: (
 	".interface-interface-skeleton__header": 30,
 	".interface-interface-skeleton__content": 20,
 	".edit-widgets-header": 30,
-	".block-library-button__inline-link .block-editor-url-input__suggestions": 6, // URL suggestions for button block above sibling inserter
 	".wp-block-cover__inner-container": 1, // InnerBlocks area inside cover image block.
 	".wp-block-cover.is-placeholder .components-placeholder.is-large": 1, // Cover block resizer component inside a large placeholder.
 	".wp-block-cover.has-background-dim::before": 1, // Overlay area inside block cover need to be higher than the video background.
@@ -66,12 +64,10 @@ $z-layers: (
 	// Needs to be below media library that has a z-index of 160000.
 	"{core/video track editor popover}": 160000 - 10,
 
-	// Needs to be below media library that has a z-index of 160000.
+	// Needs to be below media library (.media-model) that has a z-index of 160000.
 	".block-editor-format-toolbar__image-popover": 160000 - 10,
-
-	// Small screen inner blocks overlay must be displayed above drop zone,
-	// settings menu, and movers.
-	".block-editor-block-list__layout.has-overlay::after": 60,
+	// Below the media library backdrop (.media-modal-backdrop), which has a z-index of 159900.
+	".block-editor-global-styles-background-panel__popover": 159900 - 10,
 
 	// The toolbar, when contextual, should be above any adjacent nested block click overlays.
 	".block-editor-block-contextual-toolbar": 61,
@@ -87,12 +83,12 @@ $z-layers: (
 	// Show sidebar above wp-admin navigation bar for mobile viewports:
 	// #wpadminbar { z-index: 99999 }
 	".interface-interface-skeleton__sidebar": 100000,
-	".edit-post-layout__toggle-sidebar-panel": 100000,
+	".editor-layout__toggle-sidebar-panel": 100000,
 	".edit-widgets-sidebar": 100000,
-	".edit-post-layout .edit-post-post-publish-panel": 100001,
+	".editor-post-publish-panel": 100001,
 	// For larger views, the wp-admin navbar dropdown should be at top of
 	// the Publish Post sidebar.
-	".edit-post-layout .edit-post-post-publish-panel {greater than small}": 99998,
+	".editor-post-publish-panel {greater than small}": 99998,
 
 	// For larger views, the wp-admin navbar dropdown should be on top of
 	// the multi-entity saving sidebar.
@@ -109,6 +105,9 @@ $z-layers: (
 	// Above the block list and the header.
 	".block-editor-block-popover": 31,
 
+	// Below the block toolbar.
+	".block-editor-grid-visualizer": 30,
+
 	// Show snackbars above everything (similar to popovers)
 	".components-snackbar-list": 100000,
 
@@ -122,13 +121,14 @@ $z-layers: (
 	// Should be above the popover (dropdown)
 	".reusable-blocks-menu-items__convert-modal": 1000001,
 	".patterns-menu-items__convert-modal": 1000001,
-	".edit-site-create-template-part-modal": 1000001,
+	".editor-create-template-part-modal": 1000001,
 	".block-editor-block-lock-modal": 1000001,
 	".block-editor-template-part__selection-modal": 1000001,
 	".block-editor-block-rename-modal": 1000001,
 	".edit-site-list__rename-modal": 1000001,
 	".dataviews-action-modal": 1000001,
-	".edit-site-swap-template-modal": 1000001,
+	".editor-action-modal": 1000001,
+	".editor-post-template__swap-template-modal": 1000001,
 	".edit-site-template-panel__replace-template-modal": 1000001,
 
 	// Note: The ConfirmDialog component's z-index is being set to 1000001 in packages/components/src/confirm-dialog/styles.ts
@@ -138,6 +138,7 @@ $z-layers: (
 	".components-popover.block-editor-inserter__popover": 99999,
 	".components-popover.table-of-contents__popover": 99998,
 	".components-popover.interface-more-menu__content": 99998,
+	".components-popover.more-menu__content": 99998,
 	".components-popover.block-editor-rich-text__inline-format-toolbar": 99998,
 	".components-popover.block-editor-warning__dropdown": 99998,
 
@@ -156,18 +157,15 @@ $z-layers: (
 	// Show tooltips above NUX tips, wp-admin menus, submenus, and sidebar:
 	".components-tooltip": 1000002,
 
-	// Keep template popover underneath 'Create custom template' modal overlay.
-	".edit-post-post-template__dialog": 99999,
-
 	// Make sure corner handles are above side handles for ResizableBox component
 	".components-resizable-box__handle": 2,
 	".components-resizable-box__side-handle": 2,
 	".components-resizable-box__corner-handle": 2,
 
 	// Make sure block manager sticky category titles appear above the options
-	".edit-post-block-manager__category-title": 1,
+	".editor-block-manager__category-title": 1,
 	// And block manager sticky disabled block count is higher still
-	".edit-post-block-manager__disabled-blocks-count": 2,
+	".editor-block-manager__disabled-blocks-count": 2,
 
 	// Needs to appear below other color circular picker related UI elements.
 	".components-circular-option-picker__option-wrapper::before": -1,
@@ -188,13 +186,9 @@ $z-layers: (
 	".customize-widgets__block-toolbar": 7,
 
 	// Site editor layout
-	".edit-site-layout__header-container": 4,
-	".edit-site-layout__hub": 3,
-	".edit-site-layout__header": 2,
 	".edit-site-page-header": 2,
 	".edit-site-page-content": 1,
-	".edit-site-patterns__header": 2,
-	".edit-site-patterns__grid-pagination": 2,
+	".edit-site-templates__dataviews-list-pagination": 2,
 	".edit-site-layout__canvas-container": 2,
 	".edit-site-layout__sidebar": 1,
 	".edit-site-layout__canvas-container.is-resizing::after": 100,
@@ -202,7 +196,19 @@ $z-layers: (
 	".edit-site-sidebar-navigation-screen__title-icon": 1,
 
 	// Ensure modal footer actions appear above modal contents
-	".edit-site-start-template-options__modal__actions": 1,
+	".editor-start-template-options__modal__actions": 1,
+
+	// Ensure checkbox + actions don't overlap table header
+	".dataviews-view-table thead": 1,
+
+	// Ensure selection checkbox stays above the preview field.
+	".dataviews-view-grid__card .dataviews-selection-checkbox": 1,
+
+	// Ensure footer stays above the preview field.
+	".dataviews-footer": 2,
+
+	// Needs to be below media library (.media-model) that has a z-index of 160000.
+	".components-popover.components-dropdown__content.dataforms-layouts-panel__field-dropdown": 160000 - 10,
 );
 
 @function z-index( $key ) {
diff --git a/packages/base-styles/package.json b/packages/base-styles/package.json
index 9035296c46b492..04d1bb5e2d41ba 100644
--- a/packages/base-styles/package.json
+++ b/packages/base-styles/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/base-styles",
-	"version": "4.38.0",
+	"version": "5.10.0",
 	"description": "Base SCSS utilities and variables for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,6 +20,10 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
 	"publishConfig": {
 		"access": "public"
 	}
diff --git a/packages/blob/.npmrc b/packages/blob/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/blob/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/blob/CHANGELOG.md b/packages/blob/CHANGELOG.md
index 45eb062c71626b..c168f9698e68bd 100644
--- a/packages/blob/CHANGELOG.md
+++ b/packages/blob/CHANGELOG.md
@@ -2,11 +2,63 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+### Internal
+
+-   Refactor to TypeScript ([#62569](https://github.com/WordPress/gutenberg/pull/62569)).
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
 
-### New feature
+### New Features
 
 -   Add `downloadBlob` function and remove `downloadjs` dependency ([#56024](https://github.com/WordPress/gutenberg/pull/56024)).
 
@@ -111,13 +163,13 @@
 
 ## 2.11.0 (2020-10-19)
 
-### New feature
+### New Features
 
 -   Added a new `getBlobTypeByURL` function. Returns the file type of the blob or undefined if not a blob.
 
 ## 2.8.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
@@ -131,6 +183,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/blob/README.md b/packages/blob/README.md
index 64520a98bd6a79..d315cdab5e4a48 100644
--- a/packages/blob/README.md
+++ b/packages/blob/README.md
@@ -61,7 +61,7 @@ _Parameters_
 
 _Returns_
 
--   `File|undefined`: The file for the blob URL.
+-   `File | undefined`: The file for the blob URL.
 
 ### getBlobTypeByURL
 
@@ -73,7 +73,7 @@ _Parameters_
 
 _Returns_
 
--   `string|undefined`: The blob type.
+-   `string | undefined`: The blob type.
 
 ### isBlobURL
 
@@ -81,7 +81,7 @@ Check whether a url is a blob url.
 
 _Parameters_
 
--   _url_ `string|undefined`: The URL.
+-   _url_ `string | undefined`: The URL.
 
 _Returns_
 
diff --git a/packages/blob/package.json b/packages/blob/package.json
index b976ab10159f72..183e6aca33dc0c 100644
--- a/packages/blob/package.json
+++ b/packages/blob/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blob",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "Blob utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,9 +28,10 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/blob/src/index.js b/packages/blob/src/index.js
deleted file mode 100644
index 2493f81fc4c65b..00000000000000
--- a/packages/blob/src/index.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * @type {Record<string, File|undefined>}
- */
-const cache = {};
-
-/**
- * Create a blob URL from a file.
- *
- * @param {File} file The file to create a blob URL for.
- *
- * @return {string} The blob URL.
- */
-export function createBlobURL( file ) {
-	const url = window.URL.createObjectURL( file );
-
-	cache[ url ] = file;
-
-	return url;
-}
-
-/**
- * Retrieve a file based on a blob URL. The file must have been created by
- * `createBlobURL` and not removed by `revokeBlobURL`, otherwise it will return
- * `undefined`.
- *
- * @param {string} url The blob URL.
- *
- * @return {File|undefined} The file for the blob URL.
- */
-export function getBlobByURL( url ) {
-	return cache[ url ];
-}
-
-/**
- * Retrieve a blob type based on URL. The file must have been created by
- * `createBlobURL` and not removed by `revokeBlobURL`, otherwise it will return
- * `undefined`.
- *
- * @param {string} url The blob URL.
- *
- * @return {string|undefined} The blob type.
- */
-export function getBlobTypeByURL( url ) {
-	return getBlobByURL( url )?.type.split( '/' )[ 0 ]; // 0: media type , 1: file extension eg ( type: 'image/jpeg' ).
-}
-
-/**
- * Remove the resource and file cache from memory.
- *
- * @param {string} url The blob URL.
- */
-export function revokeBlobURL( url ) {
-	if ( cache[ url ] ) {
-		window.URL.revokeObjectURL( url );
-	}
-
-	delete cache[ url ];
-}
-
-/**
- * Check whether a url is a blob url.
- *
- * @param {string|undefined} url The URL.
- *
- * @return {boolean} Is the url a blob url?
- */
-export function isBlobURL( url ) {
-	if ( ! url || ! url.indexOf ) {
-		return false;
-	}
-	return url.indexOf( 'blob:' ) === 0;
-}
-
-/**
- * Downloads a file, e.g., a text or readable stream, in the browser.
- * Appropriate for downloading smaller file sizes, e.g., < 5 MB.
- *
- * Example usage:
- *
- * ```js
- * 	const fileContent = JSON.stringify(
- * 		{
- * 			"title": "My Post",
- * 		},
- * 		null,
- * 		2
- * 	);
- * 	const filename = 'file.json';
- *
- * 	downloadBlob( filename, fileContent, 'application/json' );
- * ```
- *
- * @param {string}   filename    File name.
- * @param {BlobPart} content     File content (BufferSource | Blob | string).
- * @param {string}   contentType (Optional) File mime type. Default is `''`.
- */
-export function downloadBlob( filename, content, contentType = '' ) {
-	if ( ! filename || ! content ) {
-		return;
-	}
-
-	const file = new window.Blob( [ content ], { type: contentType } );
-	const url = window.URL.createObjectURL( file );
-	const anchorElement = document.createElement( 'a' );
-	anchorElement.href = url;
-	anchorElement.download = filename;
-	anchorElement.style.display = 'none';
-	document.body.appendChild( anchorElement );
-	anchorElement.click();
-	document.body.removeChild( anchorElement );
-	window.URL.revokeObjectURL( url );
-}
diff --git a/packages/blob/src/index.ts b/packages/blob/src/index.ts
new file mode 100644
index 00000000000000..62a6671db61544
--- /dev/null
+++ b/packages/blob/src/index.ts
@@ -0,0 +1,113 @@
+const cache: Record< string, File > = {};
+
+/**
+ * Create a blob URL from a file.
+ *
+ * @param file The file to create a blob URL for.
+ *
+ * @return The blob URL.
+ */
+export function createBlobURL( file: File ): string {
+	const url = window.URL.createObjectURL( file );
+
+	cache[ url ] = file;
+
+	return url;
+}
+
+/**
+ * Retrieve a file based on a blob URL. The file must have been created by
+ * `createBlobURL` and not removed by `revokeBlobURL`, otherwise it will return
+ * `undefined`.
+ *
+ * @param url The blob URL.
+ *
+ * @return The file for the blob URL.
+ */
+export function getBlobByURL( url: string ): File | undefined {
+	return cache[ url ];
+}
+
+/**
+ * Retrieve a blob type based on URL. The file must have been created by
+ * `createBlobURL` and not removed by `revokeBlobURL`, otherwise it will return
+ * `undefined`.
+ *
+ * @param url The blob URL.
+ *
+ * @return The blob type.
+ */
+export function getBlobTypeByURL( url: string ): string | undefined {
+	return getBlobByURL( url )?.type.split( '/' )[ 0 ]; // 0: media type , 1: file extension eg ( type: 'image/jpeg' ).
+}
+
+/**
+ * Remove the resource and file cache from memory.
+ *
+ * @param url The blob URL.
+ */
+export function revokeBlobURL( url: string ): void {
+	if ( cache[ url ] ) {
+		window.URL.revokeObjectURL( url );
+	}
+
+	delete cache[ url ];
+}
+
+/**
+ * Check whether a url is a blob url.
+ *
+ * @param url The URL.
+ *
+ * @return Is the url a blob url?
+ */
+export function isBlobURL( url: string | undefined ): boolean {
+	if ( ! url || ! url.indexOf ) {
+		return false;
+	}
+	return url.indexOf( 'blob:' ) === 0;
+}
+
+/**
+ * Downloads a file, e.g., a text or readable stream, in the browser.
+ * Appropriate for downloading smaller file sizes, e.g., < 5 MB.
+ *
+ * Example usage:
+ *
+ * ```js
+ * 	const fileContent = JSON.stringify(
+ * 		{
+ * 			"title": "My Post",
+ * 		},
+ * 		null,
+ * 		2
+ * 	);
+ * 	const filename = 'file.json';
+ *
+ * 	downloadBlob( filename, fileContent, 'application/json' );
+ * ```
+ *
+ * @param filename    File name.
+ * @param content     File content (BufferSource | Blob | string).
+ * @param contentType (Optional) File mime type. Default is `''`.
+ */
+export function downloadBlob(
+	filename: string,
+	content: BlobPart,
+	contentType: string = ''
+): void {
+	if ( ! filename || ! content ) {
+		return;
+	}
+
+	const file = new window.Blob( [ content ], { type: contentType } );
+	const url = window.URL.createObjectURL( file );
+	const anchorElement = document.createElement( 'a' );
+	anchorElement.href = url;
+	anchorElement.download = filename;
+	anchorElement.style.display = 'none';
+	document.body.appendChild( anchorElement );
+	anchorElement.click();
+	document.body.removeChild( anchorElement );
+	window.URL.revokeObjectURL( url );
+}
diff --git a/packages/blob/src/test/index.js b/packages/blob/src/test/index.js
deleted file mode 100644
index 47dcb5019ee25e..00000000000000
--- a/packages/blob/src/test/index.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Internal dependencies
- */
-import { isBlobURL, getBlobTypeByURL, downloadBlob } from '../';
-
-describe( 'isBlobURL', () => {
-	it( 'returns true if the url starts with "blob:"', () => {
-		expect( isBlobURL( 'blob:thisbitdoesnotmatter' ) ).toBe( true );
-	} );
-
-	it( 'returns false if the url does not start with "blob:"', () => {
-		expect( isBlobURL( 'https://www.example.com' ) ).toBe( false );
-	} );
-
-	it( 'returns false if the url is not defined', () => {
-		expect( isBlobURL() ).toBe( false );
-	} );
-} );
-
-describe( 'getBlobTypeByURL', () => {
-	it( 'returns undefined if the blob is not found', () => {
-		expect( getBlobTypeByURL( 'blob:notexisting' ) ).toBe( undefined );
-	} );
-
-	it( 'returns undefined if the url is not defined', () => {
-		expect( getBlobTypeByURL() ).toBe( undefined );
-	} );
-} );
-
-describe( 'downloadBlob', () => {
-	const originalURL = window.URL;
-	const createObjectURL = jest.fn().mockReturnValue( 'blob:pannacotta' );
-	const revokeObjectURL = jest.fn().mockReturnValue( false );
-	const mockAnchorElement = document.createElement( 'a' );
-	mockAnchorElement.click = jest.fn();
-	const createElementSpy = jest
-		.spyOn( global.document, 'createElement' )
-		.mockReturnValue( mockAnchorElement );
-	const mockBlob = jest.fn();
-	const blobSpy = jest.spyOn( window, 'Blob' ).mockReturnValue( mockBlob );
-	jest.spyOn( document.body, 'appendChild' );
-	jest.spyOn( document.body, 'removeChild' );
-	beforeEach( () => {
-		// Can't seem to spy on these static methods. They are `undefined`.
-		// Possibly overwritten: https://github.com/WordPress/gutenberg/blob/trunk/packages/jest-preset-default/scripts/setup-globals.js#L5
-		window.URL = {
-			createObjectURL,
-			revokeObjectURL,
-		};
-	} );
-
-	afterAll( () => {
-		window.URL = originalURL;
-	} );
-
-	it( 'requires a filename argument', () => {
-		downloadBlob( '', '{}', 'application/json' );
-		expect( blobSpy ).not.toHaveBeenCalled();
-	} );
-
-	it( 'requires a content argument', () => {
-		downloadBlob( 'text.txt', '', 'text/plain' );
-		expect( blobSpy ).not.toHaveBeenCalled();
-	} );
-
-	it( 'constructs an anchor element with attributes and removes it', () => {
-		downloadBlob( 'filename.json', '{}', 'application/json' );
-		expect( blobSpy ).toHaveBeenCalledWith( [ '{}' ], {
-			type: 'application/json',
-		} );
-		expect( createObjectURL ).toHaveBeenCalledWith( mockBlob );
-		expect( createElementSpy ).toHaveBeenCalledWith( 'a' );
-		expect( mockAnchorElement.download ).toBe( 'filename.json' );
-		expect( mockAnchorElement.href ).toBe( 'blob:pannacotta' );
-		expect( mockAnchorElement ).toHaveStyle( 'display:none' );
-		expect( document.body.appendChild ).toHaveBeenCalledWith(
-			mockAnchorElement
-		);
-		expect( mockAnchorElement.click ).toHaveBeenCalledTimes( 1 );
-		expect( document.body.removeChild ).toHaveBeenCalledWith(
-			mockAnchorElement
-		);
-		expect( revokeObjectURL ).toHaveBeenCalled();
-	} );
-} );
diff --git a/packages/blob/src/test/index.ts b/packages/blob/src/test/index.ts
new file mode 100644
index 00000000000000..381b04fd817a6b
--- /dev/null
+++ b/packages/blob/src/test/index.ts
@@ -0,0 +1,95 @@
+/**
+ * Internal dependencies
+ */
+import { isBlobURL, getBlobTypeByURL, downloadBlob } from '..';
+
+describe( 'isBlobURL', () => {
+	it( 'returns true if the url starts with "blob:"', () => {
+		expect( isBlobURL( 'blob:thisbitdoesnotmatter' ) ).toBe( true );
+	} );
+
+	it( 'returns false if the url does not start with "blob:"', () => {
+		expect( isBlobURL( 'https://www.example.com' ) ).toBe( false );
+	} );
+
+	it( 'returns false if the url is not defined', () => {
+		expect(
+			// @ts-expect-error This is not a valid call according to types.
+			isBlobURL()
+		).toBe( false );
+	} );
+} );
+
+describe( 'getBlobTypeByURL', () => {
+	it( 'returns undefined if the blob is not found', () => {
+		expect( getBlobTypeByURL( 'blob:notexisting' ) ).toBeUndefined();
+	} );
+
+	it( 'returns undefined if the url is not defined', () => {
+		expect(
+			// @ts-expect-error This is not a valid call according to types.
+			getBlobTypeByURL()
+		).toBeUndefined();
+	} );
+} );
+
+describe( 'downloadBlob', () => {
+	const originalURL = window.URL;
+	const createObjectURL = jest.fn().mockReturnValue( 'blob:pannacotta' );
+	const revokeObjectURL = jest.fn().mockReturnValue( false );
+	const mockAnchorElement = document.createElement( 'a' );
+	mockAnchorElement.click = jest.fn();
+	const createElementSpy = jest
+		.spyOn( global.document, 'createElement' )
+		.mockReturnValue( mockAnchorElement );
+
+	const mockBlob = jest.fn();
+	const blobSpy = jest
+		.spyOn( window, 'Blob' )
+		.mockReturnValue( mockBlob as unknown as Blob );
+	jest.spyOn( document.body, 'appendChild' );
+	jest.spyOn( document.body, 'removeChild' );
+	beforeEach( () => {
+		// Can't seem to spy on these static methods. They are `undefined`.
+		// Possibly overwritten: https://github.com/WordPress/gutenberg/blob/trunk/packages/jest-preset-default/scripts/setup-globals.js#L5
+		// @ts-expect-error This is not a valid URL object.
+		window.URL = {
+			createObjectURL,
+			revokeObjectURL,
+		};
+	} );
+
+	afterAll( () => {
+		window.URL = originalURL;
+	} );
+
+	it( 'requires a filename argument', () => {
+		downloadBlob( '', '{}', 'application/json' );
+		expect( blobSpy ).not.toHaveBeenCalled();
+	} );
+
+	it( 'requires a content argument', () => {
+		downloadBlob( 'text.txt', '', 'text/plain' );
+		expect( blobSpy ).not.toHaveBeenCalled();
+	} );
+
+	it( 'constructs an anchor element with attributes and removes it', () => {
+		downloadBlob( 'filename.json', '{}', 'application/json' );
+		expect( blobSpy ).toHaveBeenCalledWith( [ '{}' ], {
+			type: 'application/json',
+		} );
+		expect( createObjectURL ).toHaveBeenCalledWith( mockBlob );
+		expect( createElementSpy ).toHaveBeenCalledWith( 'a' );
+		expect( mockAnchorElement.download ).toBe( 'filename.json' );
+		expect( mockAnchorElement.href ).toBe( 'blob:pannacotta' );
+		expect( mockAnchorElement ).toHaveStyle( 'display:none' );
+		expect( document.body.appendChild ).toHaveBeenCalledWith(
+			mockAnchorElement
+		);
+		expect( mockAnchorElement.click ).toHaveBeenCalledTimes( 1 );
+		expect( document.body.removeChild ).toHaveBeenCalledWith(
+			mockAnchorElement
+		);
+		expect( revokeObjectURL ).toHaveBeenCalled();
+	} );
+} );
diff --git a/packages/blob/tsconfig.json b/packages/blob/tsconfig.json
index 3c2c31f506f132..6e33d8ff82d47e 100644
--- a/packages/blob/tsconfig.json
+++ b/packages/blob/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/block-directory/.npmrc b/packages/block-directory/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/block-directory/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/block-directory/CHANGELOG.md b/packages/block-directory/CHANGELOG.md
index b8ff14ec3adea2..7c2e092139b0ee 100644
--- a/packages/block-directory/CHANGELOG.md
+++ b/packages/block-directory/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.35.0 (2024-05-16)
+
+## 4.34.0 (2024-05-02)
+
+## 4.33.0 (2024-04-19)
+
+## 4.32.0 (2024-04-03)
+
+## 4.31.0 (2024-03-21)
+
+## 4.30.0 (2024-03-06)
+
+## 4.29.0 (2024-02-21)
+
+## 4.28.0 (2024-02-09)
+
+## 4.27.0 (2024-01-24)
+
+## 4.26.0 (2024-01-10)
+
+## 4.25.0 (2023-12-13)
+
 ## 4.24.0 (2023-11-29)
 
 ## 4.23.0 (2023-11-16)
@@ -96,7 +144,7 @@
 
 ## 3.1.1 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/url` dependency ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -104,7 +152,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -123,7 +171,7 @@
 
 ## 1.18.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the block directory namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
diff --git a/packages/block-directory/package.json b/packages/block-directory/package.json
index 147f58dd719e13..6ff9ad7d510861 100644
--- a/packages/block-directory/package.json
+++ b/packages/block-directory/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-directory",
-	"version": "4.24.0",
+	"version": "5.10.0",
 	"description": "Extend editor with block directory features to search, download and install blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,33 +19,34 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/edit-post": "file:../edit-post",
-		"@wordpress/editor": "file:../editor",
-		"@wordpress/element": "file:../element",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/notices": "file:../notices",
-		"@wordpress/plugins": "file:../plugins",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/url": "file:../url",
-		"change-case": "^4.1.2"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/editor": "*",
+		"@wordpress/element": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/plugins": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/url": "*",
+		"change-case": "^4.1.2",
+		"clsx": "^2.1.1"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -53,5 +54,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/block-directory/src/components/downloadable-block-icon/style.scss b/packages/block-directory/src/components/downloadable-block-icon/style.scss
index 57a792b3f7f6e3..e11c1f05e864f8 100644
--- a/packages/block-directory/src/components/downloadable-block-icon/style.scss
+++ b/packages/block-directory/src/components/downloadable-block-icon/style.scss
@@ -3,5 +3,5 @@
 	width: $button-size * 1.5;
 	height: $button-size * 1.5;
 	vertical-align: middle;
-	border: 1px solid $gray-300;
+	border: $border-width solid $gray-300;
 }
diff --git a/packages/block-directory/src/components/downloadable-block-list-item/index.js b/packages/block-directory/src/components/downloadable-block-list-item/index.js
index e3a770925551cb..7a5f479174ab25 100644
--- a/packages/block-directory/src/components/downloadable-block-list-item/index.js
+++ b/packages/block-directory/src/components/downloadable-block-list-item/index.js
@@ -1,12 +1,17 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
 /**
  * WordPress dependencies
  */
 import { __, _n, sprintf } from '@wordpress/i18n';
 import {
-	Button,
+	Tooltip,
 	Spinner,
 	VisuallyHidden,
-	privateApis as componentsPrivateApis,
+	Composite,
 } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { decodeEntities } from '@wordpress/html-entities';
@@ -20,9 +25,6 @@ import BlockRatings from '../block-ratings';
 import DownloadableBlockIcon from '../downloadable-block-icon';
 import DownloadableBlockNotice from '../downloadable-block-notice';
 import { store as blockDirectoryStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-
-const { CompositeItemV2: CompositeItem } = unlock( componentsPrivateApis );
 
 // Return the appropriate block item label, given the block data and status.
 function getDownloadableBlockLabel(
@@ -65,7 +67,7 @@ function getDownloadableBlockLabel(
 	);
 }
 
-function DownloadableBlockListItem( { composite, item, onClick } ) {
+function DownloadableBlockListItem( { item, onClick } ) {
 	const { author, description, icon, rating, title } = item;
 	// getBlockType returns a block object if this block exists, or null if not.
 	const isInstalled = !! getBlockType( item.name );
@@ -92,76 +94,75 @@ function DownloadableBlockListItem( { composite, item, onClick } ) {
 		statusText = __( 'Installing…' );
 	}
 
+	const itemLabel = getDownloadableBlockLabel( item, {
+		hasNotice,
+		isInstalled,
+		isInstalling,
+	} );
+
 	return (
-		<CompositeItem
-			render={
-				<Button
-					__experimentalIsFocusable
-					type="button"
-					role="option"
-					className="block-directory-downloadable-block-list-item"
-					isBusy={ isInstalling }
-					onClick={ ( event ) => {
-						event.preventDefault();
-						onClick();
-					} }
-					label={ getDownloadableBlockLabel( item, {
-						hasNotice,
-						isInstalled,
-						isInstalling,
-					} ) }
-					showTooltip
-					tooltipPosition="top center"
-				/>
-			}
-			store={ composite }
-			disabled={ isInstalling || ! isInstallable }
-		>
-			<div className="block-directory-downloadable-block-list-item__icon">
-				<DownloadableBlockIcon icon={ icon } title={ title } />
-				{ isInstalling ? (
-					<span className="block-directory-downloadable-block-list-item__spinner">
-						<Spinner />
-					</span>
-				) : (
-					<BlockRatings rating={ rating } />
+		<Tooltip placement="top" text={ itemLabel }>
+			<Composite.Item
+				className={ clsx(
+					'block-directory-downloadable-block-list-item',
+					isInstalling && 'is-installing'
 				) }
-			</div>
-			<span className="block-directory-downloadable-block-list-item__details">
-				<span className="block-directory-downloadable-block-list-item__title">
-					{ createInterpolateElement(
-						sprintf(
-							/* translators: %1$s: block title, %2$s: author name. */
-							__( '%1$s <span>by %2$s</span>' ),
-							decodeEntities( title ),
-							author
-						),
-						{
-							span: (
-								<span className="block-directory-downloadable-block-list-item__author" />
+				accessibleWhenDisabled
+				disabled={ isInstalling || ! isInstallable }
+				onClick={ ( event ) => {
+					event.preventDefault();
+					onClick();
+				} }
+				aria-label={ itemLabel }
+				type="button"
+				role="option"
+			>
+				<div className="block-directory-downloadable-block-list-item__icon">
+					<DownloadableBlockIcon icon={ icon } title={ title } />
+					{ isInstalling ? (
+						<span className="block-directory-downloadable-block-list-item__spinner">
+							<Spinner />
+						</span>
+					) : (
+						<BlockRatings rating={ rating } />
+					) }
+				</div>
+				<span className="block-directory-downloadable-block-list-item__details">
+					<span className="block-directory-downloadable-block-list-item__title">
+						{ createInterpolateElement(
+							sprintf(
+								/* translators: %1$s: block title, %2$s: author name. */
+								__( '%1$s <span>by %2$s</span>' ),
+								decodeEntities( title ),
+								author
 							),
-						}
+							{
+								span: (
+									<span className="block-directory-downloadable-block-list-item__author" />
+								),
+							}
+						) }
+					</span>
+					{ hasNotice ? (
+						<DownloadableBlockNotice block={ item } />
+					) : (
+						<>
+							<span className="block-directory-downloadable-block-list-item__desc">
+								{ !! statusText
+									? statusText
+									: decodeEntities( description ) }
+							</span>
+							{ isInstallable &&
+								! ( isInstalled || isInstalling ) && (
+									<VisuallyHidden>
+										{ __( 'Install block' ) }
+									</VisuallyHidden>
+								) }
+						</>
 					) }
 				</span>
-				{ hasNotice ? (
-					<DownloadableBlockNotice block={ item } />
-				) : (
-					<>
-						<span className="block-directory-downloadable-block-list-item__desc">
-							{ !! statusText
-								? statusText
-								: decodeEntities( description ) }
-						</span>
-						{ isInstallable &&
-							! ( isInstalled || isInstalling ) && (
-								<VisuallyHidden>
-									{ __( 'Install block' ) }
-								</VisuallyHidden>
-							) }
-					</>
-				) }
-			</span>
-		</CompositeItem>
+			</Composite.Item>
+		</Tooltip>
 	);
 }
 
diff --git a/packages/block-directory/src/components/downloadable-block-list-item/style.scss b/packages/block-directory/src/components/downloadable-block-list-item/style.scss
index beee32bc90db91..e13e46ef8d8786 100644
--- a/packages/block-directory/src/components/downloadable-block-list-item/style.scss
+++ b/packages/block-directory/src/components/downloadable-block-list-item/style.scss
@@ -1,37 +1,46 @@
 .block-directory-downloadable-block-list-item {
-	padding: $grid-unit-15;
+	& + & {
+		margin-top: $grid-unit-05;
+	}
+
+	display: grid;
+	grid-template-columns: auto 1fr;
+
 	width: 100%;
 	height: auto;
+	padding: $grid-unit-15;
+	margin: 0;
+
+	appearance: none;
+	background: none;
+	border: 0;
 	text-align: left;
-	display: grid;
-	grid-template-columns: auto 1fr;
+	transition: box-shadow 0.1s linear;
+
+	// The item contains absolutely positioned items.
+	// Set `position: relative` on the parent to prevent overflow issues
+	// in scroll containers.
+	// See: https://github.com/WordPress/gutenberg/issues/63384
+	position: relative;
+
+
+	&:not([aria-disabled="true"]) {
+		cursor: pointer;
+	}
 
 	&:hover {
 		@include button-style__focus();
 	}
 
-	&.is-busy {
-		background: transparent;
+	&[data-focus-visible] {
+		@include button-style__focus();
+	}
 
+	&.is-installing {
 		.block-directory-downloadable-block-list-item__author {
-			border: 0;
-			clip: rect(1px, 1px, 1px, 1px);
-			-webkit-clip-path: inset(50%);
-			clip-path: inset(50%);
-			height: 1px;
-			margin: -1px;
-			overflow: hidden;
-			padding: 0;
-			position: absolute;
-			width: 1px;
-			word-wrap: normal !important;
+			display: none;
 		}
 	}
-
-	&:disabled,
-	&[aria-disabled] {
-		opacity: 1;
-	}
 }
 
 .block-directory-downloadable-block-list-item__icon {
@@ -50,6 +59,11 @@
 		align-items: center;
 		justify-content: center;
 	}
+
+	.is-installing & {
+		// Adding an extra 6px to avoid the UI from jumping when the rating bar gets hidden
+		margin-right: $grid-unit-20 + 6px;
+	}
 }
 
 .block-directory-block-ratings {
diff --git a/packages/block-directory/src/components/downloadable-blocks-list/index.js b/packages/block-directory/src/components/downloadable-blocks-list/index.js
index 09f509c4ed49c9..3e44aa423bfa5e 100644
--- a/packages/block-directory/src/components/downloadable-blocks-list/index.js
+++ b/packages/block-directory/src/components/downloadable-blocks-list/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { privateApis as componentsPrivateApis } from '@wordpress/components';
+import { Composite } from '@wordpress/components';
 import { getBlockType } from '@wordpress/blocks';
 import { useDispatch } from '@wordpress/data';
 
@@ -11,14 +11,10 @@ import { useDispatch } from '@wordpress/data';
  */
 import DownloadableBlockListItem from '../downloadable-block-list-item';
 import { store as blockDirectoryStore } from '../../store';
-import { unlock } from '../../lock-unlock';
 
-const { CompositeV2: Composite, useCompositeStoreV2: useCompositeStore } =
-	unlock( componentsPrivateApis );
 const noop = () => {};
 
 function DownloadableBlocksList( { items, onHover = noop, onSelect } ) {
-	const composite = useCompositeStore();
 	const { installBlockType } = useDispatch( blockDirectoryStore );
 
 	if ( ! items.length ) {
@@ -27,7 +23,6 @@ function DownloadableBlocksList( { items, onHover = noop, onSelect } ) {
 
 	return (
 		<Composite
-			store={ composite }
 			role="listbox"
 			className="block-directory-downloadable-blocks-list"
 			aria-label={ __( 'Blocks available for install' ) }
@@ -36,7 +31,6 @@ function DownloadableBlocksList( { items, onHover = noop, onSelect } ) {
 				return (
 					<DownloadableBlockListItem
 						key={ item.id }
-						composite={ composite }
 						onClick={ () => {
 							// Check if the block is registered (`getBlockType`
 							// will return an object). If so, insert the block.
diff --git a/packages/block-directory/src/components/downloadable-blocks-panel/index.js b/packages/block-directory/src/components/downloadable-blocks-panel/index.js
index 46866003128513..4ceee3ddcb16e6 100644
--- a/packages/block-directory/src/components/downloadable-blocks-panel/index.js
+++ b/packages/block-directory/src/components/downloadable-blocks-panel/index.js
@@ -3,9 +3,8 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Spinner } from '@wordpress/components';
-import { compose } from '@wordpress/compose';
 import { store as coreStore } from '@wordpress/core-data';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { getBlockType } from '@wordpress/blocks';
 
 /**
@@ -18,16 +17,71 @@ import { store as blockDirectoryStore } from '../../store';
 
 const EMPTY_ARRAY = [];
 
-function DownloadableBlocksPanel( {
-	downloadableItems,
+const useDownloadableBlocks = ( filterValue ) =>
+	useSelect(
+		( select ) => {
+			const {
+				getDownloadableBlocks,
+				isRequestingDownloadableBlocks,
+				getInstalledBlockTypes,
+			} = select( blockDirectoryStore );
+
+			const hasPermission = select( coreStore ).canUser(
+				'read',
+				'block-directory/search'
+			);
+
+			let downloadableBlocks = EMPTY_ARRAY;
+			if ( hasPermission ) {
+				downloadableBlocks = getDownloadableBlocks( filterValue );
+
+				// Filter out blocks that are already installed.
+				const installedBlockTypes = getInstalledBlockTypes();
+				const installableBlocks = downloadableBlocks.filter(
+					( { name } ) => {
+						// Check if the block has just been installed, in which case it
+						// should still show in the list to avoid suddenly disappearing.
+						// `installedBlockTypes` only returns blocks stored in state
+						// immediately after installation, not all installed blocks.
+						const isJustInstalled = installedBlockTypes.some(
+							( blockType ) => blockType.name === name
+						);
+						const isPreviouslyInstalled = getBlockType( name );
+						return isJustInstalled || ! isPreviouslyInstalled;
+					}
+				);
+
+				// Keep identity of the `downloadableBlocks` array if nothing was filtered out
+				if ( installableBlocks.length !== downloadableBlocks.length ) {
+					downloadableBlocks = installableBlocks;
+				}
+
+				// Return identical empty array when there are no blocks
+				if ( downloadableBlocks.length === 0 ) {
+					downloadableBlocks = EMPTY_ARRAY;
+				}
+			}
+
+			return {
+				hasPermission,
+				downloadableBlocks,
+				isLoading: isRequestingDownloadableBlocks( filterValue ),
+			};
+		},
+		[ filterValue ]
+	);
+
+export default function DownloadableBlocksPanel( {
 	onSelect,
 	onHover,
 	hasLocalBlocks,
-	hasPermission,
-	isLoading,
 	isTyping,
+	filterValue,
 } ) {
-	if ( typeof hasPermission === 'undefined' || isLoading || isTyping ) {
+	const { hasPermission, downloadableBlocks, isLoading } =
+		useDownloadableBlocks( filterValue );
+
+	if ( hasPermission === undefined || isLoading || isTyping ) {
 		return (
 			<>
 				{ hasPermission && ! hasLocalBlocks && (
@@ -55,71 +109,20 @@ function DownloadableBlocksPanel( {
 		return null;
 	}
 
-	return !! downloadableItems.length ? (
+	if ( downloadableBlocks.length === 0 ) {
+		return hasLocalBlocks ? null : <DownloadableBlocksNoResults />;
+	}
+
+	return (
 		<DownloadableBlocksInserterPanel
-			downloadableItems={ downloadableItems }
+			downloadableItems={ downloadableBlocks }
 			hasLocalBlocks={ hasLocalBlocks }
 		>
 			<DownloadableBlocksList
-				items={ downloadableItems }
+				items={ downloadableBlocks }
 				onSelect={ onSelect }
 				onHover={ onHover }
 			/>
 		</DownloadableBlocksInserterPanel>
-	) : (
-		! hasLocalBlocks && <DownloadableBlocksNoResults />
 	);
 }
-
-export default compose( [
-	withSelect( ( select, { filterValue } ) => {
-		const {
-			getDownloadableBlocks,
-			isRequestingDownloadableBlocks,
-			getInstalledBlockTypes,
-		} = select( blockDirectoryStore );
-
-		const hasPermission = select( coreStore ).canUser(
-			'read',
-			'block-directory/search'
-		);
-
-		function getInstallableBlocks( term ) {
-			const downloadableBlocks = getDownloadableBlocks( term );
-			const installedBlockTypes = getInstalledBlockTypes();
-			// Filter out blocks that are already installed.
-			const installableBlocks = downloadableBlocks.filter( ( block ) => {
-				// Check if the block has just been installed, in which case it
-				// should still show in the list to avoid suddenly disappearing.
-				// `installedBlockTypes` only returns blocks stored in state
-				// immediately after installation, not all installed blocks.
-				const isJustInstalled = !! installedBlockTypes.find(
-					( blockType ) => blockType.name === block.name
-				);
-				const isPreviouslyInstalled = getBlockType( block.name );
-				return isJustInstalled || ! isPreviouslyInstalled;
-			} );
-
-			if ( downloadableBlocks.length === installableBlocks.length ) {
-				return downloadableBlocks;
-			}
-			return installableBlocks;
-		}
-
-		let downloadableItems = hasPermission
-			? getInstallableBlocks( filterValue )
-			: [];
-
-		if ( downloadableItems.length === 0 ) {
-			downloadableItems = EMPTY_ARRAY;
-		}
-
-		const isLoading = isRequestingDownloadableBlocks( filterValue );
-
-		return {
-			downloadableItems,
-			hasPermission,
-			isLoading,
-		};
-	} ),
-] )( DownloadableBlocksPanel );
diff --git a/packages/block-directory/src/components/downloadable-blocks-panel/style.scss b/packages/block-directory/src/components/downloadable-blocks-panel/style.scss
index ff3fdb9ea8e319..f4df5ad4abda53 100644
--- a/packages/block-directory/src/components/downloadable-blocks-panel/style.scss
+++ b/packages/block-directory/src/components/downloadable-blocks-panel/style.scss
@@ -32,6 +32,3 @@
 	margin-top: 0;
 }
 
-.block-directory-downloadable-blocks-panel button {
-	margin-top: $grid-unit-05;
-}
diff --git a/packages/block-directory/src/lock-unlock.js b/packages/block-directory/src/lock-unlock.js
index a6cc2fe3440f61..79b82edbc0fc78 100644
--- a/packages/block-directory/src/lock-unlock.js
+++ b/packages/block-directory/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/block-directory'
 	);
diff --git a/packages/block-directory/src/plugins/get-install-missing/index.js b/packages/block-directory/src/plugins/get-install-missing/index.js
index 58d6cdb1a188cb..43c051cb9aa371 100644
--- a/packages/block-directory/src/plugins/get-install-missing/index.js
+++ b/packages/block-directory/src/plugins/get-install-missing/index.js
@@ -100,7 +100,12 @@ const ModifiedWarning = ( { originalBlock, ...props } ) => {
 			originalBlock.title || originalName
 		);
 		actions.push(
-			<Button key="convert" onClick={ convertToHTML } variant="tertiary">
+			<Button
+				__next40pxDefaultSize
+				key="convert"
+				onClick={ convertToHTML }
+				variant="tertiary"
+			>
 				{ __( 'Keep as HTML' ) }
 			</Button>
 		);
diff --git a/packages/block-directory/src/plugins/get-install-missing/install-button.js b/packages/block-directory/src/plugins/get-install-missing/install-button.js
index 2dc01184bdeb4a..ec4a48dd39bf53 100644
--- a/packages/block-directory/src/plugins/get-install-missing/install-button.js
+++ b/packages/block-directory/src/plugins/get-install-missing/install-button.js
@@ -22,6 +22,7 @@ export default function InstallButton( { attributes, block, clientId } ) {
 
 	return (
 		<Button
+			__next40pxDefaultSize
 			onClick={ () =>
 				installBlockType( block ).then( ( success ) => {
 					if ( success ) {
@@ -42,6 +43,7 @@ export default function InstallButton( { attributes, block, clientId } ) {
 					}
 				} )
 			}
+			accessibleWhenDisabled
 			disabled={ isInstallingBlock }
 			isBusy={ isInstallingBlock }
 			variant="primary"
diff --git a/packages/block-directory/src/plugins/inserter-menu-downloadable-blocks-panel/index.js b/packages/block-directory/src/plugins/inserter-menu-downloadable-blocks-panel/index.js
index badcc407c78cb5..34fc9011b9a1cf 100644
--- a/packages/block-directory/src/plugins/inserter-menu-downloadable-blocks-panel/index.js
+++ b/packages/block-directory/src/plugins/inserter-menu-downloadable-blocks-panel/index.js
@@ -16,13 +16,7 @@ function InserterMenuDownloadableBlocksPanel() {
 
 	return (
 		<__unstableInserterMenuExtension>
-			{ ( {
-				onSelect,
-				onHover,
-				filterValue,
-				hasItems,
-				rootClientId,
-			} ) => {
+			{ ( { onSelect, onHover, filterValue, hasItems } ) => {
 				if ( debouncedFilterValue !== filterValue ) {
 					debouncedSetFilterValue( filterValue );
 				}
@@ -35,7 +29,6 @@ function InserterMenuDownloadableBlocksPanel() {
 					<DownloadableBlocksPanel
 						onSelect={ onSelect }
 						onHover={ onHover }
-						rootClientId={ rootClientId }
 						filterValue={ debouncedFilterValue }
 						hasLocalBlocks={ hasItems }
 						isTyping={ filterValue !== debouncedFilterValue }
diff --git a/packages/block-directory/src/plugins/installed-blocks-pre-publish-panel/index.js b/packages/block-directory/src/plugins/installed-blocks-pre-publish-panel/index.js
index f0d46b7d1e1dec..17630c9904e8bd 100644
--- a/packages/block-directory/src/plugins/installed-blocks-pre-publish-panel/index.js
+++ b/packages/block-directory/src/plugins/installed-blocks-pre-publish-panel/index.js
@@ -4,6 +4,7 @@
 import { _n, sprintf } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { blockDefault } from '@wordpress/icons';
+import { PluginPrePublishPanel } from '@wordpress/editor';
 
 /**
  * Internal dependencies
@@ -11,10 +12,6 @@ import { blockDefault } from '@wordpress/icons';
 import CompactList from '../../components/compact-list';
 import { store as blockDirectoryStore } from '../../store';
 
-// We shouldn't import the edit-post package directly
-// because it would include the wp-edit-post in all pages loading the block-directory script.
-const { PluginPrePublishPanel } = window?.wp?.editPost ?? {};
-
 export default function InstalledBlocksPrePublishPanel() {
 	const newBlockTypes = useSelect(
 		( select ) => select( blockDirectoryStore ).getNewBlockTypes(),
@@ -37,7 +34,7 @@ export default function InstalledBlocksPrePublishPanel() {
 				),
 				newBlockTypes.length
 			) }
-			initialOpen={ true }
+			initialOpen
 		>
 			<p className="installed-blocks-pre-publish-panel__copy">
 				{ _n(
diff --git a/packages/block-directory/src/store/selectors.js b/packages/block-directory/src/store/selectors.js
index e9b73b51f4544d..f7e541dd14ed82 100644
--- a/packages/block-directory/src/store/selectors.js
+++ b/packages/block-directory/src/store/selectors.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createRegistrySelector } from '@wordpress/data';
+import { createSelector, createRegistrySelector } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
@@ -53,15 +53,21 @@ export function getInstalledBlockTypes( state ) {
  *
  * @return {Array} Block type items.
  */
-export const getNewBlockTypes = createRegistrySelector(
-	( select ) => ( state ) => {
-		const usedBlockTree = select( blockEditorStore ).getBlocks();
-		const installedBlockTypes = getInstalledBlockTypes( state );
+export const getNewBlockTypes = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state ) => {
+			const usedBlockTree = select( blockEditorStore ).getBlocks();
+			const installedBlockTypes = getInstalledBlockTypes( state );
 
-		return installedBlockTypes.filter( ( blockType ) =>
-			hasBlockType( blockType, usedBlockTree )
-		);
-	}
+			return installedBlockTypes.filter( ( blockType ) =>
+				hasBlockType( blockType, usedBlockTree )
+			);
+		},
+		( state ) => [
+			getInstalledBlockTypes( state ),
+			select( blockEditorStore ).getBlocks(),
+		]
+	)
 );
 
 /**
@@ -72,15 +78,21 @@ export const getNewBlockTypes = createRegistrySelector(
  *
  * @return {Array} Block type items.
  */
-export const getUnusedBlockTypes = createRegistrySelector(
-	( select ) => ( state ) => {
-		const usedBlockTree = select( blockEditorStore ).getBlocks();
-		const installedBlockTypes = getInstalledBlockTypes( state );
+export const getUnusedBlockTypes = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state ) => {
+			const usedBlockTree = select( blockEditorStore ).getBlocks();
+			const installedBlockTypes = getInstalledBlockTypes( state );
 
-		return installedBlockTypes.filter(
-			( blockType ) => ! hasBlockType( blockType, usedBlockTree )
-		);
-	}
+			return installedBlockTypes.filter(
+				( blockType ) => ! hasBlockType( blockType, usedBlockTree )
+			);
+		},
+		( state ) => [
+			getInstalledBlockTypes( state ),
+			select( blockEditorStore ).getBlocks(),
+		]
+	)
 );
 
 /**
diff --git a/packages/block-editor/.npmrc b/packages/block-editor/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/block-editor/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/block-editor/CHANGELOG.md b/packages/block-editor/CHANGELOG.md
index b53b86140f5a34..1483fe1da9d5c9 100644
--- a/packages/block-editor/CHANGELOG.md
+++ b/packages/block-editor/CHANGELOG.md
@@ -2,6 +2,71 @@
 
 ## Unreleased
 
+## 14.5.0 (2024-10-16)
+
+## 14.4.0 (2024-10-03)
+
+## 14.3.0 (2024-09-19)
+
+## 14.2.0 (2024-09-05)
+
+## 14.1.0 (2024-08-21)
+
+## 14.0.0 (2024-08-07)
+
+### Breaking Changes
+
+-   `URLInput`: Remove deprecated `__nextHasNoMarginBottom` prop and promote to default behavior ([#64282](https://github.com/WordPress/gutenberg/pull/64282)).
+-   `LineHeightControl`: Remove deprecated `__nextHasNoMarginBottom` prop and promote to default behavior ([#64281](https://github.com/WordPress/gutenberg/pull/64281)).
+
+### Enhancements
+
+-   `FontFamilyControl`: Add `__nextHasNoMarginBottom` prop for opting into the new margin-free styles ([#64280](https://github.com/WordPress/gutenberg/pull/64280)).
+
+## 13.4.0 (2024-07-24)
+
+## 13.3.0 (2024-07-10)
+
+## 13.2.0 (2024-06-26)
+
+## 13.1.0 (2024-06-15)
+
+## 13.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 12.26.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 12.25.0 (2024-05-02)
+
+## 12.24.0 (2024-04-19)
+
+## 12.23.0 (2024-04-03)
+
+## 12.22.0 (2024-03-21)
+
+## 12.21.0 (2024-03-06)
+
+## 12.20.0 (2024-02-21)
+
+## 12.19.0 (2024-02-09)
+
+-   `FontSizePicker`: Remove deprecated `__nextHasNoMarginBottom` prop and promote to default behavior ([#58702](https://github.com/WordPress/gutenberg/pull/58702)).
+
+## 12.18.0 (2024-01-24)
+
+-   Deprecated `__experimentalRecursionProvider` and `__experimentalUseHasRecursion` in favor of their new stable counterparts `RecursionProvider` and `useHasRecursion`.
+
+## 12.17.0 (2024-01-10)
+
+## 12.16.0 (2023-12-13)
+
 ## 12.15.0 (2023-11-29)
 
 ## 12.14.0 (2023-11-16)
@@ -42,7 +107,7 @@
 
 -   Add `HeadingLevelDropdown` component for selecting H1-H6 and paragraph HTML tags from the block toolbar.
 
-### Bug Fix
+### Bug Fixes
 
 -   Fluid typography: custom font-sizes should use max viewport width ([#51516](https://github.com/WordPress/gutenberg/pull/51516)).
 
@@ -70,13 +135,13 @@
 
 ## 11.5.0 (2023-03-01)
 
-### Bug Fix
+### Bug Fixes
 
 -   `SpacingSizesControl`: fix white dot on thumb ([#48574](https://github.com/WordPress/gutenberg/pull/48574)).
 
 ## 11.4.0 (2023-02-15)
 
-### Bug Fix
+### Bug Fixes
 
 -   `LinkControl`: fix scrollbar displayed on toggle link settings ([#47986](https://github.com/WordPress/gutenberg/pull/47986)).
 
@@ -84,7 +149,7 @@
 
 ## 11.2.0 (2023-01-11)
 
-### Bug Fix
+### Bug Fixes
 
 -   `BlockInspector`: Fix browser warning error when block is not selected ([#46875](https://github.com/WordPress/gutenberg/pull/46875)).
 -   Move component styles needed for iframes to content styles ([#47103](https://github.com/WordPress/gutenberg/pull/47103)).
@@ -105,33 +170,33 @@
 -   Fluid typography: add configurable fluid typography settings for minimum font size to theme.json ([#42489](https://github.com/WordPress/gutenberg/pull/42489)).
 -   `URLInput`: Add `__nextHasNoMarginBottom` prop for opting into the new margin-free styles ([46692](https://github.com/WordPress/gutenberg/pull/46692)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `SpacingSizesControl`: Change ARIA role from `region` to `group` to avoid unwanted ARIA landmark regions ([#46530](https://github.com/WordPress/gutenberg/pull/46530)).
 -   `FocalPointPicker`: Fix layout misalignment when placed in the `BlockInspector` ([#46631](https://github.com/WordPress/gutenberg/pull/46631)).
 
 ## 10.5.0 (2022-11-16)
 
-### Enhancement
+### Enhancements
 
 -   `BlockLockModal`: Move Icon component out of CheckboxControl label ([#45535](https://github.com/WordPress/gutenberg/pull/45535))
 -   Fluid typography: adjust font size min and max rules ([#45536](https://github.com/WordPress/gutenberg/pull/45536)).
 
 ## 10.4.0 (2022-11-02)
 
-### Bug Fix
+### Bug Fixes
 
 -   `InserterListItem`: Fix dragging and dropping in Firefox. ([#44631](https://github.com/WordPress/gutenberg/pull/44631))
 
 ## 10.3.0 (2022-10-19)
 
-### Bug Fix
+### Bug Fixes
 
 -   `FontSizePicker`: Update fluid utils so that only string, floats and integers are treated as valid font sizes for the purposes of fluid typography ([#44847](https://github.com/WordPress/gutenberg/pull/44847))
 -   `getTypographyClassesAndStyles()`: Ensure that font sizes are transformed into fluid values if fluid typography is activated ([#44852](https://github.com/WordPress/gutenberg/pull/44852))
 -   `BlockPopover`: Ensure that padding and margin visualizers display in correct position even when scrolling past block. ([#44998](https://github.com/WordPress/gutenberg/pull/44998))
 
-### New features
+### New Features
 
 -   You can now drop files/blocks/HTML on unmodified default blocks to transform them into corresponding blocks ([#44647](https://github.com/WordPress/gutenberg/pull/44647)).
 
@@ -141,7 +206,7 @@
 
 ## 10.0.0 (2022-09-13)
 
-### Breaking change
+### Breaking Changes
 
 -   `FontSizePicker`: Deprecate bottom margin style. Add a `__nextHasNoMarginBottom` prop to start opting into the margin-free styles that will become the default in a future version, currently scheduled to be WordPress 6.4 ([#43870](https://github.com/WordPress/gutenberg/pull/43870)).
 
@@ -157,7 +222,7 @@
 
 ## 9.3.0 (2022-06-15)
 
-### Bug fix
+### Bug Fixes
 
 -   Fix focus trap on certain `input` elements when navigating within a block with the left/right arrow keys ([#41538](https://github.com/WordPress/gutenberg/pull/41538)).
 
@@ -167,7 +232,7 @@
 
 ## 9.0.0 (2022-05-04)
 
-### Breaking change
+### Breaking Changes
 
 -   `BlockNavigationDropdown` is now deprecated. Use the `Dropdown` component from the `@wordpress/components` package and the `ListView` component from this package ([#40777](https://github.com/WordPress/gutenberg/pull/40777)).
 -   `ListView` no longer accepts the `__experimentalFeatures`, `__experimentalPersistentListViewFeatures`, `__experimentalHideContainerBlockActions`, and `showNestedBlocks` props. Passing additional undocumented props through to `ListView` is also now disallowed. ([#40777](https://github.com/WordPress/gutenberg/pull/40777)).
@@ -188,7 +253,7 @@
 
 ## 8.1.1 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/block-serialization-default-parser`, `css-mediaquery`, `memize` and `redux-multi` dependencies ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -205,13 +270,13 @@
 -   Avoid re-rendering all List View items on block focus [#35706](https://github.com/WordPress/gutenberg/pull/35706). When List View is open Block focus time is 4 times faster in large posts.
 -   Render fixed number of items in List View [#35706](https://github.com/WordPress/gutenberg/pull/35230). Opening List View is 13 times faster in large posts.
 
-### Breaking change
+### Breaking Changes
 
 -   List View no longer supports the `showOnlyCurrentHierarchy` flag [#35706](https://github.com/WordPress/gutenberg/pull/35706). To display a subset of blocks, use the `blocks` parameter instead.
 
 ## 7.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -227,8 +292,8 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 
 ## 5.3.0 (2021-03-17)
 
@@ -236,7 +301,7 @@
 
 ## 5.2.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the block editor namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
@@ -265,7 +330,7 @@
 
 -   Added a `label` prop to `URLInput`. This allows the label to be set without needing to wrap the `URLInput` in a `BaseControl`.
 
-### Deprecation
+### Deprecations
 
 -   `dropZoneUIOnly` prop in `MediaPlaceholder` component has been deprecated in favor of `disableMediaButtons` prop.
 
diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md
index 2d6a5627a52a44..a0f75683914408 100644
--- a/packages/block-editor/README.md
+++ b/packages/block-editor/README.md
@@ -17,10 +17,9 @@ _This package assumes that your code will run in an **ES2015+** environment. If
 ```js
 import { useState } from 'react';
 import {
+	BlockCanvas,
 	BlockEditorProvider,
 	BlockList,
-	BlockTools,
-	WritingFlow,
 } from '@wordpress/block-editor';
 
 function MyEditorComponent() {
@@ -32,9 +31,7 @@ function MyEditorComponent() {
 			onInput={ ( blocks ) => updateBlocks( blocks ) }
 			onChange={ ( blocks ) => updateBlocks( blocks ) }
 		>
-			<BlockTools>
-				<BlockCanvas height="400px" />
-			</BlockTools>
+			<BlockCanvas height="400px" />
 		</BlockEditorProvider>
 	);
 }
@@ -48,7 +45,7 @@ In this example, we're instantiating a block editor. A block editor is composed
 
 Inside `BlockEditorProvider`, you can nest any of the available `@wordpress/block-editor` UI components to build the UI of your editor.
 
-In the example above we're rendering the `BlockList` to show and edit the block list. For instance we could add a custom sidebar and use the `BlockInspector` component to be able to edit the advanced settings for the currently selected block. (See the [API](#API) for the list of all the available components).
+In the example above we're rendering the `BlockList` to show and edit the block list. For instance we could add a custom sidebar and use the `BlockInspector` component to be able to edit the advanced settings for the currently selected block. (See the [API](#api) for the list of all the available components).
 
 The `BlockTools` component is used to render the toolbar for a selected block.
 
@@ -69,7 +66,7 @@ registerCoreBlocks();
 
 Any components in this package that have a counterpart in [@wordpress/components](/packages/components/README.md) are an extension of those components.
 
-Unless you're [creating an editor](docs/how-to-guides/platform/custom-block-editor/README.md), it is recommended that the components in @wordpress/components should be used rather than the ones in this package as these components have been customized for use in an editor and may result in unexpected behaviour if used outside of this context.
+Unless you're [creating an editor](/docs/how-to-guides/platform/custom-block-editor.md), it is recommended that the components in @wordpress/components should be used rather than the ones in this package as these components have been customized for use in an editor and may result in unexpected behaviour if used outside of this context.
 
 <!-- START TOKEN(Autogenerated API docs) -->
 
@@ -210,6 +207,12 @@ _Related_
 
 Undocumented declaration.
 
+### BlockPopover
+
+_Related_
+
+-   <https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/block-popover/README.md>
+
 ### BlockPreview
 
 BlockPreview renders a preview of a block or array of blocks.
@@ -280,10 +283,18 @@ _Returns_
 
 ### BlockToolbar
 
+Renders the block toolbar.
+
 _Related_
 
 -   <https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/block-toolbar/README.md>
 
+_Parameters_
+
+-   _props_ `Object`: Components props.
+-   _props.hideDragHandle_ `boolean`: Show or hide the Drag Handle for drag and drop functionality.
+-   _props.variant_ `string`: Style variant of the toolbar, also passed to the Dropdowns rendered from Block Toolbar Buttons.
+
 ### BlockTools
 
 Renders block tools (the block toolbar, select/navigation mode toolbar, the insertion point and a slot for the inline rich text toolbar). Must be wrapped around the block content and editor styles wrapper or iframe.
@@ -534,16 +545,13 @@ _Returns_
 
 ### getPxFromCssUnit
 
-Returns the px value of a cssUnit. The memoized version of getPxFromCssUnit;
-
-_Parameters_
+> **Deprecated**
 
--   _cssUnit_ `string`:
--   _options_ `Object`:
+This function was accidentally exposed for mobile/native usage.
 
 _Returns_
 
--   `string`: returns the cssUnit value in a simple px format.
+-   `string`: Empty string.
 
 ### getSpacingPresetCssVar
 
@@ -705,9 +713,22 @@ _Related_
 
 Private @wordpress/block-editor APIs.
 
-### ReusableBlocksRenameHint
+### RecursionProvider
 
-Undocumented declaration.
+A React context provider for use with the `useHasRecursion` hook to prevent recursive renders.
+
+Wrap block content with this provider and provide the same `uniqueId` prop as used with `useHasRecursion`.
+
+_Parameters_
+
+-   _props_ `Object`:
+-   _props.uniqueId_ `*`: Any value that acts as a unique identifier for a block instance.
+-   _props.blockName_ `string`: Optional block name.
+-   _props.children_ `JSX.Element`: React children.
+
+_Returns_
+
+-   `JSX.Element`: A React element.
 
 ### RichText
 
@@ -755,7 +776,6 @@ _Properties_
 -   _\_\_experimentalBlockDirectory_ `boolean`: Whether the user has enabled the Block Directory
 -   _\_\_experimentalBlockPatterns_ `Array`: Array of objects representing the block patterns
 -   _\_\_experimentalBlockPatternCategories_ `Array`: Array of objects representing the block pattern categories
--   _\_\_unstableGalleryWithImageBlocks_ `boolean`: Whether the user has enabled the refactored gallery block which uses InnerBlocks
 
 ### SkipToSelectedBlock
 
@@ -791,21 +811,12 @@ _Parameters_
 
 -   _styles_ `EditorStyle[]`: CSS rules.
 -   _wrapperSelector_ `string`: Wrapper selector.
+-   _transformOptions_ `TransformOptions`: Additional options for style transformation.
 
 _Returns_
 
 -   `Array`: converted rules.
 
-_Type Definition_
-
--   _EditorStyle_ `Object`
-
-_Properties_
-
--   _css_ `string`: the CSS block(s), as a single string.
--   _baseURL_ `?string`: the base URL to be used as the reference when rewritting urls.
--   _ignoredSelectors_ `?string[]`: the selectors not to wrap.
-
 ### Typewriter
 
 Ensures that the text selection keeps the same vertical distance from the viewport during keyboard events within this component. The vertical distance can vary. It is the last clicked or scrolled to position.
@@ -828,6 +839,56 @@ _Related_
 
 -   <https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/url-popover/README.md>
 
+### useBlockBindingsUtils
+
+Retrieves the existing utils needed to update the block `bindings` metadata. They can be used to create, modify, or remove connections from the existing block attributes.
+
+It contains the following utils:
+
+-   `updateBlockBindings`: Updates the value of the bindings connected to block attributes. It can be used to remove a specific binding by setting the value to `undefined`.
+-   `removeAllBlockBindings`: Removes the bindings property of the `metadata` attribute.
+
+_Usage_
+
+```js
+import { useBlockBindingsUtils } from '@wordpress/block-editor';
+const { updateBlockBindings, removeAllBlockBindings } = useBlockBindingsUtils();
+
+// Update url and alt attributes.
+updateBlockBindings( {
+	url: {
+		source: 'core/post-meta',
+		args: {
+			key: 'url_custom_field',
+		},
+	},
+	alt: {
+		source: 'core/post-meta',
+		args: {
+			key: 'text_custom_field',
+		},
+	},
+} );
+
+// Remove binding from url attribute.
+updateBlockBindings( { url: undefined } );
+
+// Remove bindings from all attributes.
+removeAllBlockBindings();
+```
+
+_Parameters_
+
+-   _clientId_ `?string`: Optional block client ID. If not set, it will use the current block client ID from the context.
+
+_Returns_
+
+-   `?WPBlockBindingsUtils`: Object containing the block bindings utils.
+
+_Changelog_
+
+`6.7.0` Introduced in WordPress core.
+
 ### useBlockCommands
 
 Undocumented declaration.
@@ -900,20 +961,15 @@ _Usage_
 import { useBlockProps } from '@wordpress/block-editor';
 
 export default function Edit() {
-
-  const blockProps = useBlockProps(
-    className: 'my-custom-class',
-    style: {
-      color: '#222222',
-      backgroundColor: '#eeeeee'
-    }
-  )
-
-  return (
-    <div { ...blockProps }>
-
-    </div>
-  )
+	const blockProps = useBlockProps( {
+		className: 'my-custom-class',
+		style: {
+			color: '#222222',
+			backgroundColor: '#eeeeee',
+		},
+	} );
+
+	return <div { ...blockProps }></div>;
 }
 ```
 
@@ -939,6 +995,21 @@ _Returns_
 
 -   `any`: value
 
+### useHasRecursion
+
+A React hook for keeping track of blocks previously rendered up in the block tree. Blocks susceptible to recursion can use this hook in their `Edit` function to prevent said recursion.
+
+Use this with the `RecursionProvider` component, using the same `uniqueId` value for both the hook and the provider.
+
+_Parameters_
+
+-   _uniqueId_ `*`: Any value that acts as a unique identifier for a block instance.
+-   _blockName_ `string`: Optional block name.
+
+_Returns_
+
+-   `boolean`: A boolean describing whether the provided id has already been rendered.
+
 ### useInnerBlocksProps
 
 This hook is used to lightly mark an element as an inner blocks wrapper element. Call this hook and pass the returned props to the element to mark as an inner blocks wrapper, automatically rendering inner blocks as children. If you define a ref for the element, it is important to pass the ref to this hook, which the hook in turn will pass to the component through the props it returns. Optionally, you can also pass any other props through this hook, and they will be merged and returned.
@@ -994,6 +1065,16 @@ _Returns_
 
 -   `any[]`: Returns the values defined for the settings.
 
+### useStyleOverride
+
+Override a block editor settings style. Leave the ID blank to create a new style.
+
+_Parameters_
+
+-   _override_ `Object`: Override object.
+-   _override.id_ `?string`: Id of the style override, leave blank to create a new style.
+-   _override.css_ `string`: CSS to apply.
+
 ### Warning
 
 _Related_
diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index ec173413693822..b798e626c2e90f 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "12.15.0",
+	"version": "14.5.0",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -31,53 +32,53 @@
 		"{src,build,build-module}/{index.js,store/index.js,hooks/**}"
 	],
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"@emotion/react": "^11.7.1",
 		"@emotion/styled": "^11.6.0",
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/blob": "file:../blob",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/commands": "file:../commands",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/data": "file:../data",
-		"@wordpress/date": "file:../date",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/element": "file:../element",
-		"@wordpress/escape-html": "file:../escape-html",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/notices": "file:../notices",
-		"@wordpress/preferences": "file:../preferences",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/rich-text": "file:../rich-text",
-		"@wordpress/style-engine": "file:../style-engine",
-		"@wordpress/token-list": "file:../token-list",
-		"@wordpress/url": "file:../url",
-		"@wordpress/warning": "file:../warning",
-		"@wordpress/wordcount": "file:../wordcount",
+		"@wordpress/a11y": "*",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/blob": "*",
+		"@wordpress/block-serialization-default-parser": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/commands": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/date": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/element": "*",
+		"@wordpress/escape-html": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/is-shallow-equal": "*",
+		"@wordpress/keyboard-shortcuts": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/preferences": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/rich-text": "*",
+		"@wordpress/style-engine": "*",
+		"@wordpress/token-list": "*",
+		"@wordpress/url": "*",
+		"@wordpress/warning": "*",
+		"@wordpress/wordcount": "*",
 		"change-case": "^4.1.2",
-		"classnames": "^2.3.1",
+		"clsx": "^2.1.1",
 		"colord": "^2.7.0",
 		"deepmerge": "^4.3.0",
 		"diff": "^4.0.2",
-		"dom-scroll-into-view": "^1.2.1",
 		"fast-deep-equal": "^3.1.3",
 		"memize": "^2.1.0",
+		"parsel-js": "^1.1.2",
 		"postcss": "^8.4.21",
-		"postcss-prefixwrap": "^1.41.0",
-		"postcss-urlrebase": "^1.0.0",
+		"postcss-prefix-selector": "^1.16.0",
+		"postcss-urlrebase": "^1.4.0",
 		"react-autosize-textarea": "^7.1.0",
-		"react-easy-crop": "^4.5.1",
-		"rememo": "^4.0.2",
+		"react-easy-crop": "^5.0.6",
 		"remove-accents": "^0.5.0"
 	},
 	"peerDependencies": {
@@ -86,5 +87,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/block-editor/src/autocompleters/block.js b/packages/block-editor/src/autocompleters/block.js
index bc06c9de5aaaff..859ae11036c82a 100644
--- a/packages/block-editor/src/autocompleters/block.js
+++ b/packages/block-editor/src/autocompleters/block.js
@@ -60,7 +60,8 @@ function createBlockCompleter() {
 				}, [] );
 			const [ items, categories, collections ] = useBlockTypesState(
 				rootClientId,
-				noop
+				noop,
+				true
 			);
 
 			const filteredItems = useMemo( () => {
diff --git a/packages/block-editor/src/autocompleters/link.js b/packages/block-editor/src/autocompleters/link.js
index ce9af28f19d000..fb64cb151294d6 100644
--- a/packages/block-editor/src/autocompleters/link.js
+++ b/packages/block-editor/src/autocompleters/link.js
@@ -6,6 +6,7 @@
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
 import { Icon, page, post } from '@wordpress/icons';
+import { decodeEntities } from '@wordpress/html-entities';
 
 const SHOWN_SUGGESTIONS = 10;
 
@@ -46,7 +47,7 @@ function createLinkCompleter() {
 						key="icon"
 						icon={ item.subtype === 'page' ? page : post }
 					/>
-					{ item.title }
+					{ decodeEntities( item.title ) }
 				</>
 			);
 		},
diff --git a/packages/block-editor/src/autocompleters/style.scss b/packages/block-editor/src/autocompleters/style.scss
index 5380ddcfbe48b2..43acc4efc16a5e 100644
--- a/packages/block-editor/src/autocompleters/style.scss
+++ b/packages/block-editor/src/autocompleters/style.scss
@@ -4,6 +4,10 @@
 	.block-editor-block-icon {
 		margin-right: $grid-unit-10;
 	}
+
+	&[aria-selected="true"] .block-editor-block-icon {
+		color: inherit !important;
+	}
 }
 
 .block-editor-autocompleters__link {
diff --git a/packages/block-editor/src/components/alignment-control/README.md b/packages/block-editor/src/components/alignment-control/README.md
index 5f52e19de8b979..c51da803c77aef 100644
--- a/packages/block-editor/src/components/alignment-control/README.md
+++ b/packages/block-editor/src/components/alignment-control/README.md
@@ -6,11 +6,6 @@ This component is mostly used for blocks that display text, such as Heading, Par
 
 ![Post Title block alignment options](https://make.wordpress.org/core/files/2020/09/post-title-block-alignment-options.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/alignment-control/test/index.js b/packages/block-editor/src/components/alignment-control/test/index.js
index de72e92489be31..178ba294127c31 100644
--- a/packages/block-editor/src/components/alignment-control/test/index.js
+++ b/packages/block-editor/src/components/alignment-control/test/index.js
@@ -133,7 +133,7 @@ describe( 'AlignmentUI', () => {
 		const { container } = render(
 			<AlignmentUI
 				isToolbar
-				value={ 'custom-right' }
+				value="custom-right"
 				onChange={ onChangeSpy }
 				isCollapsed={ false }
 				alignmentControls={ [
diff --git a/packages/block-editor/src/components/alignment-control/ui.js b/packages/block-editor/src/components/alignment-control/ui.js
index b41cb4b0d2520e..6b423a79aa9e06 100644
--- a/packages/block-editor/src/components/alignment-control/ui.js
+++ b/packages/block-editor/src/components/alignment-control/ui.js
@@ -32,7 +32,7 @@ function AlignmentUI( {
 	onChange,
 	alignmentControls = DEFAULT_ALIGNMENT_CONTROLS,
 	label = __( 'Align text' ),
-	describedBy = __( 'Change text alignment' ),
+	description = __( 'Change text alignment' ),
 	isCollapsed = true,
 	isToolbar,
 } ) {
@@ -45,7 +45,9 @@ function AlignmentUI( {
 	);
 
 	function setIcon() {
-		if ( activeAlignment ) return activeAlignment.icon;
+		if ( activeAlignment ) {
+			return activeAlignment.icon;
+		}
 		return isRTL() ? alignRight : alignLeft;
 	}
 
@@ -54,7 +56,7 @@ function AlignmentUI( {
 		? { isCollapsed }
 		: {
 				toggleProps: {
-					describedBy,
+					description,
 				},
 				popoverProps: POPOVER_PROPS,
 		  };
diff --git a/packages/components/src/mobile/audio-player/audio-url-parser.native.js b/packages/block-editor/src/components/audio-player/audio-url-parser.native.js
similarity index 100%
rename from packages/components/src/mobile/audio-player/audio-url-parser.native.js
rename to packages/block-editor/src/components/audio-player/audio-url-parser.native.js
diff --git a/packages/block-editor/src/components/audio-player/index.native.js b/packages/block-editor/src/components/audio-player/index.native.js
new file mode 100644
index 00000000000000..bee31ea5872ef5
--- /dev/null
+++ b/packages/block-editor/src/components/audio-player/index.native.js
@@ -0,0 +1,221 @@
+/**
+ * External dependencies
+ */
+import {
+	Text,
+	TouchableWithoutFeedback,
+	Linking,
+	Alert,
+	Platform,
+} from 'react-native';
+import { default as VideoPlayer } from 'react-native-video';
+
+/**
+ * WordPress dependencies
+ */
+import { View } from '@wordpress/primitives';
+import { Icon } from '@wordpress/components';
+import { withPreferredColorScheme } from '@wordpress/compose';
+import { __ } from '@wordpress/i18n';
+import { audio, warning } from '@wordpress/icons';
+import {
+	requestImageFailedRetryDialog,
+	requestImageUploadCancelDialog,
+} from '@wordpress/react-native-bridge';
+import { getProtocol } from '@wordpress/url';
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import styles from './styles.scss';
+import { parseAudioUrl } from './audio-url-parser.native';
+import { useEditorColorScheme } from '../global-styles/use-global-styles-context';
+
+const isIOS = Platform.OS === 'ios';
+
+function Player( {
+	isUploadInProgress,
+	isUploadFailed,
+	attributes,
+	isSelected,
+} ) {
+	const { id, src } = attributes;
+	const [ paused, setPaused ] = useState( true );
+
+	const onPressListen = () => {
+		if ( src ) {
+			if ( isIOS && this.player ) {
+				this.player.presentFullscreenPlayer();
+				return;
+			}
+
+			Linking.canOpenURL( src )
+				.then( ( supported ) => {
+					if ( ! supported ) {
+						Alert.alert(
+							__( 'Problem opening the audio' ),
+							__( 'No application can handle this request.' )
+						);
+					} else {
+						return Linking.openURL( src );
+					}
+				} )
+				.catch( () => {
+					Alert.alert(
+						__( 'Problem opening the audio' ),
+						__( 'An unknown error occurred. Please try again.' )
+					);
+				} );
+		}
+	};
+
+	const containerStyle = useEditorColorScheme(
+		styles.container,
+		styles.containerDark
+	);
+
+	const iconStyle = useEditorColorScheme( styles.icon, styles.iconDark );
+
+	const iconDisabledStyle = useEditorColorScheme(
+		styles.iconDisabled,
+		styles.iconDisabledDark
+	);
+
+	const isDisabled = isUploadFailed || isUploadInProgress;
+
+	const finalIconStyle = {
+		...iconStyle,
+		...( isDisabled && iconDisabledStyle ),
+	};
+
+	const iconContainerStyle = useEditorColorScheme(
+		styles.iconContainer,
+		styles.iconContainerDark
+	);
+
+	const titleContainerStyle = {
+		...styles.titleContainer,
+		...( isIOS ? styles.titleContainerIOS : styles.titleContainerAndroid ),
+	};
+
+	const titleStyle = useEditorColorScheme( styles.title, styles.titleDark );
+
+	const uploadFailedStyle = useEditorColorScheme(
+		styles.uploadFailed,
+		styles.uploadFailedDark
+	);
+
+	const subtitleStyle = useEditorColorScheme(
+		styles.subtitle,
+		styles.subtitleDark
+	);
+
+	const finalSubtitleStyle = {
+		...subtitleStyle,
+		...( isUploadFailed && uploadFailedStyle ),
+	};
+
+	const buttonBackgroundStyle = useEditorColorScheme(
+		styles.buttonBackground,
+		styles.buttonBackgroundDark
+	);
+
+	let title = '';
+	let extension = '';
+
+	if ( src ) {
+		const result = parseAudioUrl( src );
+		extension = result.extension;
+		title = result.title;
+	}
+
+	const getSubtitleValue = () => {
+		if ( isUploadInProgress ) {
+			return __( 'Uploading…' );
+		}
+		if ( isUploadFailed ) {
+			return __( 'Failed to insert audio file. Please tap for options.' );
+		}
+		return (
+			extension +
+			// translators: displays audio file extension. e.g. MP3 audio file
+			__( 'audio file' )
+		);
+	};
+
+	function onAudioUploadCancelDialog() {
+		if ( isUploadInProgress ) {
+			requestImageUploadCancelDialog( id );
+		} else if ( id && getProtocol( src ) === 'file:' ) {
+			requestImageFailedRetryDialog( id );
+		}
+	}
+
+	return (
+		<TouchableWithoutFeedback
+			accessible={ ! isSelected }
+			disabled={ ! isSelected }
+			onPress={ onAudioUploadCancelDialog }
+		>
+			<View style={ containerStyle }>
+				<View style={ iconContainerStyle }>
+					<Icon icon={ audio } style={ finalIconStyle } size={ 24 } />
+				</View>
+				<View style={ titleContainerStyle }>
+					<Text style={ titleStyle }>{ title }</Text>
+					<View style={ styles.subtitleContainer }>
+						{ isUploadFailed && (
+							<Icon
+								icon={ warning }
+								style={ {
+									...styles.errorIcon,
+									...uploadFailedStyle,
+								} }
+								size={ 16 }
+							/>
+						) }
+						<Text style={ finalSubtitleStyle }>
+							{ getSubtitleValue() }
+						</Text>
+					</View>
+				</View>
+				{ ! isDisabled && (
+					<TouchableWithoutFeedback
+						accessibilityLabel={ __( 'Audio Player' ) }
+						accessibilityRole="button"
+						accessibilityHint={ __(
+							'Double tap to listen the audio file'
+						) }
+						onPress={ onPressListen }
+					>
+						<View style={ buttonBackgroundStyle }>
+							<Text style={ styles.buttonText }>
+								{ __( 'OPEN' ) }
+							</Text>
+						</View>
+					</TouchableWithoutFeedback>
+				) }
+				{ isIOS && (
+					<VideoPlayer
+						source={ { uri: src } }
+						paused={ paused }
+						ref={ ( ref ) => {
+							this.player = ref;
+						} }
+						controls={ false }
+						ignoreSilentSwitch="ignore"
+						onFullscreenPlayerWillPresent={ () => {
+							setPaused( false );
+						} }
+						onFullscreenPlayerDidDismiss={ () => {
+							setPaused( true );
+						} }
+					/>
+				) }
+			</View>
+		</TouchableWithoutFeedback>
+	);
+}
+
+export default withPreferredColorScheme( Player );
diff --git a/packages/components/src/mobile/audio-player/styles.scss b/packages/block-editor/src/components/audio-player/styles.native.scss
similarity index 100%
rename from packages/components/src/mobile/audio-player/styles.scss
rename to packages/block-editor/src/components/audio-player/styles.native.scss
diff --git a/packages/components/src/mobile/audio-player/test/audio-url-parser.native.js b/packages/block-editor/src/components/audio-player/test/audio-url-parser.native.js
similarity index 100%
rename from packages/components/src/mobile/audio-player/test/audio-url-parser.native.js
rename to packages/block-editor/src/components/audio-player/test/audio-url-parser.native.js
diff --git a/packages/block-editor/src/components/background-image-control/index.js b/packages/block-editor/src/components/background-image-control/index.js
new file mode 100644
index 00000000000000..2703aa3988d64e
--- /dev/null
+++ b/packages/block-editor/src/components/background-image-control/index.js
@@ -0,0 +1,741 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	ToggleControl,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
+	__experimentalUnitControl as UnitControl,
+	__experimentalVStack as VStack,
+	DropZone,
+	FlexItem,
+	FocalPointPicker,
+	MenuItem,
+	VisuallyHidden,
+	__experimentalItemGroup as ItemGroup,
+	__experimentalHStack as HStack,
+	__experimentalTruncate as Truncate,
+	Dropdown,
+	Placeholder,
+	Spinner,
+	__experimentalDropdownContentWrapper as DropdownContentWrapper,
+} from '@wordpress/components';
+import { __, _x, sprintf } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import { getFilename } from '@wordpress/url';
+import { useRef, useState, useEffect, useMemo } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { focus } from '@wordpress/dom';
+import { isBlobURL } from '@wordpress/blob';
+
+/**
+ * Internal dependencies
+ */
+import { getResolvedValue } from '../global-styles/utils';
+import { hasBackgroundImageValue } from '../global-styles/background-panel';
+import { setImmutably } from '../../utils/object';
+import MediaReplaceFlow from '../media-replace-flow';
+import { store as blockEditorStore } from '../../store';
+
+import {
+	globalStylesDataKey,
+	globalStylesLinksDataKey,
+} from '../../store/private-keys';
+
+const IMAGE_BACKGROUND_TYPE = 'image';
+
+const BACKGROUND_POPOVER_PROPS = {
+	placement: 'left-start',
+	offset: 36,
+	shift: true,
+	className: 'block-editor-global-styles-background-panel__popover',
+};
+const noop = () => {};
+
+/**
+ * Get the help text for the background size control.
+ *
+ * @param {string} value backgroundSize value.
+ * @return {string}      Translated help text.
+ */
+function backgroundSizeHelpText( value ) {
+	if ( value === 'cover' || value === undefined ) {
+		return __( 'Image covers the space evenly.' );
+	}
+	if ( value === 'contain' ) {
+		return __( 'Image is contained without distortion.' );
+	}
+	return __( 'Image has a fixed width.' );
+}
+
+/**
+ * Converts decimal x and y coords from FocalPointPicker to percentage-based values
+ * to use as backgroundPosition value.
+ *
+ * @param {{x?:number, y?:number}} value FocalPointPicker coords.
+ * @return {string}      				 backgroundPosition value.
+ */
+export const coordsToBackgroundPosition = ( value ) => {
+	if ( ! value || ( isNaN( value.x ) && isNaN( value.y ) ) ) {
+		return undefined;
+	}
+
+	const x = isNaN( value.x ) ? 0.5 : value.x;
+	const y = isNaN( value.y ) ? 0.5 : value.y;
+
+	return `${ x * 100 }% ${ y * 100 }%`;
+};
+
+/**
+ * Converts backgroundPosition value to x and y coords for FocalPointPicker.
+ *
+ * @param {string} value backgroundPosition value.
+ * @return {{x?:number, y?:number}}       FocalPointPicker coords.
+ */
+export const backgroundPositionToCoords = ( value ) => {
+	if ( ! value ) {
+		return { x: undefined, y: undefined };
+	}
+
+	let [ x, y ] = value.split( ' ' ).map( ( v ) => parseFloat( v ) / 100 );
+	x = isNaN( x ) ? undefined : x;
+	y = isNaN( y ) ? x : y;
+
+	return { x, y };
+};
+
+function InspectorImagePreviewItem( {
+	as = 'span',
+	imgUrl,
+	toggleProps = {},
+	filename,
+	label,
+	className,
+	onToggleCallback = noop,
+} ) {
+	useEffect( () => {
+		if ( typeof toggleProps?.isOpen !== 'undefined' ) {
+			onToggleCallback( toggleProps?.isOpen );
+		}
+	}, [ toggleProps?.isOpen, onToggleCallback ] );
+	return (
+		<ItemGroup as={ as } className={ className } { ...toggleProps }>
+			<HStack
+				justify="flex-start"
+				as="span"
+				className="block-editor-global-styles-background-panel__inspector-preview-inner"
+			>
+				{ imgUrl && (
+					<span
+						className="block-editor-global-styles-background-panel__inspector-image-indicator-wrapper"
+						aria-hidden
+					>
+						<span
+							className="block-editor-global-styles-background-panel__inspector-image-indicator"
+							style={ {
+								backgroundImage: `url(${ imgUrl })`,
+							} }
+						/>
+					</span>
+				) }
+				<FlexItem as="span" style={ imgUrl ? {} : { flexGrow: 1 } }>
+					<Truncate
+						numberOfLines={ 1 }
+						className="block-editor-global-styles-background-panel__inspector-media-replace-title"
+					>
+						{ label }
+					</Truncate>
+					<VisuallyHidden as="span">
+						{ imgUrl
+							? sprintf(
+									/* translators: %s: file name */
+									__( 'Background image: %s' ),
+									filename || label
+							  )
+							: __( 'No background image selected' ) }
+					</VisuallyHidden>
+				</FlexItem>
+			</HStack>
+		</ItemGroup>
+	);
+}
+
+function BackgroundControlsPanel( {
+	label,
+	filename,
+	url: imgUrl,
+	children,
+	onToggle: onToggleCallback = noop,
+	hasImageValue,
+} ) {
+	if ( ! hasImageValue ) {
+		return;
+	}
+
+	const imgLabel =
+		label || getFilename( imgUrl ) || __( 'Add background image' );
+
+	return (
+		<Dropdown
+			popoverProps={ BACKGROUND_POPOVER_PROPS }
+			renderToggle={ ( { onToggle, isOpen } ) => {
+				const toggleProps = {
+					onClick: onToggle,
+					className:
+						'block-editor-global-styles-background-panel__dropdown-toggle',
+					'aria-expanded': isOpen,
+					'aria-label': __(
+						'Background size, position and repeat options.'
+					),
+					isOpen,
+				};
+				return (
+					<InspectorImagePreviewItem
+						imgUrl={ imgUrl }
+						filename={ filename }
+						label={ imgLabel }
+						toggleProps={ toggleProps }
+						as="button"
+						onToggleCallback={ onToggleCallback }
+					/>
+				);
+			} }
+			renderContent={ () => (
+				<DropdownContentWrapper
+					className="block-editor-global-styles-background-panel__dropdown-content-wrapper"
+					paddingSize="medium"
+				>
+					{ children }
+				</DropdownContentWrapper>
+			) }
+		/>
+	);
+}
+
+function LoadingSpinner() {
+	return (
+		<Placeholder className="block-editor-global-styles-background-panel__loading">
+			<Spinner />
+		</Placeholder>
+	);
+}
+
+function BackgroundImageControls( {
+	onChange,
+	style,
+	inheritedValue,
+	onRemoveImage = noop,
+	onResetImage = noop,
+	displayInPanel,
+	defaultValues,
+} ) {
+	const [ isUploading, setIsUploading ] = useState( false );
+	const { getSettings } = useSelect( blockEditorStore );
+
+	const { id, title, url } = style?.background?.backgroundImage || {
+		...inheritedValue?.background?.backgroundImage,
+	};
+	const replaceContainerRef = useRef();
+	const { createErrorNotice } = useDispatch( noticesStore );
+	const onUploadError = ( message ) => {
+		createErrorNotice( message, { type: 'snackbar' } );
+		setIsUploading( false );
+	};
+
+	const resetBackgroundImage = () =>
+		onChange(
+			setImmutably(
+				style,
+				[ 'background', 'backgroundImage' ],
+				undefined
+			)
+		);
+
+	const onSelectMedia = ( media ) => {
+		if ( ! media || ! media.url ) {
+			resetBackgroundImage();
+			setIsUploading( false );
+			return;
+		}
+
+		if ( isBlobURL( media.url ) ) {
+			setIsUploading( true );
+			return;
+		}
+
+		// For media selections originated from a file upload.
+		if (
+			( media.media_type &&
+				media.media_type !== IMAGE_BACKGROUND_TYPE ) ||
+			( ! media.media_type &&
+				media.type &&
+				media.type !== IMAGE_BACKGROUND_TYPE )
+		) {
+			onUploadError(
+				__( 'Only images can be used as a background image.' )
+			);
+			return;
+		}
+
+		const sizeValue =
+			style?.background?.backgroundSize || defaultValues?.backgroundSize;
+		const positionValue = style?.background?.backgroundPosition;
+		onChange(
+			setImmutably( style, [ 'background' ], {
+				...style?.background,
+				backgroundImage: {
+					url: media.url,
+					id: media.id,
+					source: 'file',
+					title: media.title || undefined,
+				},
+				backgroundPosition:
+					/*
+					 * A background image uploaded and set in the editor receives a default background position of '50% 0',
+					 * when the background image size is the equivalent of "Tile".
+					 * This is to increase the chance that the image's focus point is visible.
+					 * This is in-editor only to assist with the user experience.
+					 */
+					! positionValue && ( 'auto' === sizeValue || ! sizeValue )
+						? '50% 0'
+						: positionValue,
+				backgroundSize: sizeValue,
+			} )
+		);
+		setIsUploading( false );
+	};
+
+	// Drag and drop callback, restricting image to one.
+	const onFilesDrop = ( filesList ) => {
+		if ( filesList?.length > 1 ) {
+			onUploadError(
+				__( 'Only one image can be used as a background image.' )
+			);
+			return;
+		}
+		getSettings().mediaUpload( {
+			allowedTypes: [ IMAGE_BACKGROUND_TYPE ],
+			filesList,
+			onFileChange( [ image ] ) {
+				onSelectMedia( image );
+			},
+			onError: onUploadError,
+		} );
+	};
+
+	const hasValue = hasBackgroundImageValue( style );
+
+	const closeAndFocus = () => {
+		const [ toggleButton ] = focus.tabbable.find(
+			replaceContainerRef.current
+		);
+		// Focus the toggle button and close the dropdown menu.
+		// This ensures similar behaviour as to selecting an image, where the dropdown is
+		// closed and focus is redirected to the dropdown toggle button.
+		toggleButton?.focus();
+		toggleButton?.click();
+	};
+
+	const onRemove = () =>
+		onChange(
+			setImmutably( style, [ 'background' ], {
+				backgroundImage: 'none',
+			} )
+		);
+	const canRemove = ! hasValue && hasBackgroundImageValue( inheritedValue );
+	const imgLabel =
+		title || getFilename( url ) || __( 'Add background image' );
+
+	return (
+		<div
+			ref={ replaceContainerRef }
+			className="block-editor-global-styles-background-panel__image-tools-panel-item"
+		>
+			{ isUploading && <LoadingSpinner /> }
+			<MediaReplaceFlow
+				mediaId={ id }
+				mediaURL={ url }
+				allowedTypes={ [ IMAGE_BACKGROUND_TYPE ] }
+				accept="image/*"
+				onSelect={ onSelectMedia }
+				popoverProps={ {
+					className: clsx( {
+						'block-editor-global-styles-background-panel__media-replace-popover':
+							displayInPanel,
+					} ),
+				} }
+				name={
+					<InspectorImagePreviewItem
+						className="block-editor-global-styles-background-panel__image-preview"
+						imgUrl={ url }
+						filename={ title }
+						label={ imgLabel }
+					/>
+				}
+				variant="secondary"
+				onError={ onUploadError }
+				onReset={ () => {
+					closeAndFocus();
+					onResetImage();
+				} }
+			>
+				{ canRemove && (
+					<MenuItem
+						onClick={ () => {
+							closeAndFocus();
+							onRemove();
+							onRemoveImage();
+						} }
+					>
+						{ __( 'Remove' ) }
+					</MenuItem>
+				) }
+			</MediaReplaceFlow>
+			<DropZone
+				onFilesDrop={ onFilesDrop }
+				label={ __( 'Drop to upload' ) }
+			/>
+		</div>
+	);
+}
+
+function BackgroundSizeControls( {
+	onChange,
+	style,
+	inheritedValue,
+	defaultValues,
+} ) {
+	const sizeValue =
+		style?.background?.backgroundSize ||
+		inheritedValue?.background?.backgroundSize;
+	const repeatValue =
+		style?.background?.backgroundRepeat ||
+		inheritedValue?.background?.backgroundRepeat;
+	const imageValue =
+		style?.background?.backgroundImage?.url ||
+		inheritedValue?.background?.backgroundImage?.url;
+	const isUploadedImage = style?.background?.backgroundImage?.id;
+	const positionValue =
+		style?.background?.backgroundPosition ||
+		inheritedValue?.background?.backgroundPosition;
+	const attachmentValue =
+		style?.background?.backgroundAttachment ||
+		inheritedValue?.background?.backgroundAttachment;
+
+	/*
+	 * Set default values for uploaded images.
+	 * The default values are passed by the consumer.
+	 * Block-level controls may have different defaults to root-level controls.
+	 * A falsy value is treated by default as `auto` (Tile).
+	 */
+	let currentValueForToggle =
+		! sizeValue && isUploadedImage
+			? defaultValues?.backgroundSize
+			: sizeValue || 'auto';
+	/*
+	 * The incoming value could be a value + unit, e.g. '20px'.
+	 * In this case set the value to 'tile'.
+	 */
+	currentValueForToggle = ! [ 'cover', 'contain', 'auto' ].includes(
+		currentValueForToggle
+	)
+		? 'auto'
+		: currentValueForToggle;
+	/*
+	 * If the current value is `cover` and the repeat value is `undefined`, then
+	 * the toggle should be unchecked as the default state. Otherwise, the toggle
+	 * should reflect the current repeat value.
+	 */
+	const repeatCheckedValue = ! (
+		repeatValue === 'no-repeat' ||
+		( currentValueForToggle === 'cover' && repeatValue === undefined )
+	);
+
+	const updateBackgroundSize = ( next ) => {
+		// When switching to 'contain' toggle the repeat off.
+		let nextRepeat = repeatValue;
+		let nextPosition = positionValue;
+
+		if ( next === 'contain' ) {
+			nextRepeat = 'no-repeat';
+			nextPosition = undefined;
+		}
+
+		if ( next === 'cover' ) {
+			nextRepeat = undefined;
+			nextPosition = undefined;
+		}
+
+		if (
+			( currentValueForToggle === 'cover' ||
+				currentValueForToggle === 'contain' ) &&
+			next === 'auto'
+		) {
+			nextRepeat = undefined;
+			/*
+			 * A background image uploaded and set in the editor (an image with a record id),
+			 * receives a default background position of '50% 0',
+			 * when the toggle switches to "Tile". This is to increase the chance that
+			 * the image's focus point is visible.
+			 * This is in-editor only to assist with the user experience.
+			 */
+			if ( !! style?.background?.backgroundImage?.id ) {
+				nextPosition = '50% 0';
+			}
+		}
+
+		/*
+		 * Next will be null when the input is cleared,
+		 * in which case the value should be 'auto'.
+		 */
+		if ( ! next && currentValueForToggle === 'auto' ) {
+			next = 'auto';
+		}
+
+		onChange(
+			setImmutably( style, [ 'background' ], {
+				...style?.background,
+				backgroundPosition: nextPosition,
+				backgroundRepeat: nextRepeat,
+				backgroundSize: next,
+			} )
+		);
+	};
+
+	const updateBackgroundPosition = ( next ) => {
+		onChange(
+			setImmutably(
+				style,
+				[ 'background', 'backgroundPosition' ],
+				coordsToBackgroundPosition( next )
+			)
+		);
+	};
+
+	const toggleIsRepeated = () =>
+		onChange(
+			setImmutably(
+				style,
+				[ 'background', 'backgroundRepeat' ],
+				repeatCheckedValue === true ? 'no-repeat' : 'repeat'
+			)
+		);
+
+	const toggleScrollWithPage = () =>
+		onChange(
+			setImmutably(
+				style,
+				[ 'background', 'backgroundAttachment' ],
+				attachmentValue === 'fixed' ? 'scroll' : 'fixed'
+			)
+		);
+
+	// Set a default background position for non-site-wide, uploaded images with a size of 'contain'.
+	const backgroundPositionValue =
+		! positionValue && isUploadedImage && 'contain' === sizeValue
+			? defaultValues?.backgroundPosition
+			: positionValue;
+
+	return (
+		<VStack spacing={ 3 } className="single-column">
+			<FocalPointPicker
+				__nextHasNoMarginBottom
+				label={ __( 'Focal point' ) }
+				url={ imageValue }
+				value={ backgroundPositionToCoords( backgroundPositionValue ) }
+				onChange={ updateBackgroundPosition }
+			/>
+			<ToggleControl
+				__nextHasNoMarginBottom
+				label={ __( 'Fixed background' ) }
+				checked={ attachmentValue === 'fixed' }
+				onChange={ toggleScrollWithPage }
+			/>
+			<ToggleGroupControl
+				__nextHasNoMarginBottom
+				size="__unstable-large"
+				label={ __( 'Size' ) }
+				value={ currentValueForToggle }
+				onChange={ updateBackgroundSize }
+				isBlock
+				help={ backgroundSizeHelpText(
+					sizeValue || defaultValues?.backgroundSize
+				) }
+			>
+				<ToggleGroupControlOption
+					key="cover"
+					value="cover"
+					label={ _x(
+						'Cover',
+						'Size option for background image control'
+					) }
+				/>
+				<ToggleGroupControlOption
+					key="contain"
+					value="contain"
+					label={ _x(
+						'Contain',
+						'Size option for background image control'
+					) }
+				/>
+				<ToggleGroupControlOption
+					key="tile"
+					value="auto"
+					label={ _x(
+						'Tile',
+						'Size option for background image control'
+					) }
+				/>
+			</ToggleGroupControl>
+			<HStack justify="flex-start" spacing={ 2 } as="span">
+				<UnitControl
+					aria-label={ __( 'Background image width' ) }
+					onChange={ updateBackgroundSize }
+					value={ sizeValue }
+					size="__unstable-large"
+					__unstableInputWidth="100px"
+					min={ 0 }
+					placeholder={ __( 'Auto' ) }
+					disabled={
+						currentValueForToggle !== 'auto' ||
+						currentValueForToggle === undefined
+					}
+				/>
+				<ToggleControl
+					__nextHasNoMarginBottom
+					label={ __( 'Repeat' ) }
+					checked={ repeatCheckedValue }
+					onChange={ toggleIsRepeated }
+					disabled={ currentValueForToggle === 'cover' }
+				/>
+			</HStack>
+		</VStack>
+	);
+}
+
+export default function BackgroundImagePanel( {
+	value,
+	onChange,
+	inheritedValue = value,
+	settings,
+	defaultValues = {},
+} ) {
+	/*
+	 * Resolve any inherited "ref" pointers.
+	 * Should the block editor need resolved, inherited values
+	 * across all controls, this could be abstracted into a hook,
+	 * e.g., useResolveGlobalStyle
+	 */
+	const { globalStyles, _links } = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+		const _settings = getSettings();
+		return {
+			globalStyles: _settings[ globalStylesDataKey ],
+			_links: _settings[ globalStylesLinksDataKey ],
+		};
+	}, [] );
+	const resolvedInheritedValue = useMemo( () => {
+		const resolvedValues = {
+			background: {},
+		};
+
+		if ( ! inheritedValue?.background ) {
+			return inheritedValue;
+		}
+
+		Object.entries( inheritedValue?.background ).forEach(
+			( [ key, backgroundValue ] ) => {
+				resolvedValues.background[ key ] = getResolvedValue(
+					backgroundValue,
+					{
+						styles: globalStyles,
+						_links,
+					}
+				);
+			}
+		);
+		return resolvedValues;
+	}, [ globalStyles, _links, inheritedValue ] );
+
+	const resetBackground = () =>
+		onChange( setImmutably( value, [ 'background' ], {} ) );
+
+	const { title, url } = value?.background?.backgroundImage || {
+		...resolvedInheritedValue?.background?.backgroundImage,
+	};
+	const hasImageValue =
+		hasBackgroundImageValue( value ) ||
+		hasBackgroundImageValue( resolvedInheritedValue );
+
+	const imageValue =
+		value?.background?.backgroundImage ||
+		inheritedValue?.background?.backgroundImage;
+
+	const shouldShowBackgroundImageControls =
+		hasImageValue &&
+		'none' !== imageValue &&
+		( settings?.background?.backgroundSize ||
+			settings?.background?.backgroundPosition ||
+			settings?.background?.backgroundRepeat );
+
+	const [ isDropDownOpen, setIsDropDownOpen ] = useState( false );
+
+	return (
+		<div
+			className={ clsx(
+				'block-editor-global-styles-background-panel__inspector-media-replace-container',
+				{
+					'is-open': isDropDownOpen,
+				}
+			) }
+		>
+			{ shouldShowBackgroundImageControls ? (
+				<BackgroundControlsPanel
+					label={ title }
+					filename={ title }
+					url={ url }
+					onToggle={ setIsDropDownOpen }
+					hasImageValue={ hasImageValue }
+				>
+					<VStack spacing={ 3 } className="single-column">
+						<BackgroundImageControls
+							onChange={ onChange }
+							style={ value }
+							inheritedValue={ resolvedInheritedValue }
+							displayInPanel
+							onResetImage={ () => {
+								setIsDropDownOpen( false );
+								resetBackground();
+							} }
+							onRemoveImage={ () => setIsDropDownOpen( false ) }
+							defaultValues={ defaultValues }
+						/>
+						<BackgroundSizeControls
+							onChange={ onChange }
+							style={ value }
+							defaultValues={ defaultValues }
+							inheritedValue={ resolvedInheritedValue }
+						/>
+					</VStack>
+				</BackgroundControlsPanel>
+			) : (
+				<BackgroundImageControls
+					onChange={ onChange }
+					style={ value }
+					inheritedValue={ resolvedInheritedValue }
+					defaultValues={ defaultValues }
+					onResetImage={ () => {
+						setIsDropDownOpen( false );
+						resetBackground();
+					} }
+					onRemoveImage={ () => setIsDropDownOpen( false ) }
+				/>
+			) }
+		</div>
+	);
+}
diff --git a/packages/block-editor/src/components/background-image-control/style.scss b/packages/block-editor/src/components/background-image-control/style.scss
new file mode 100644
index 00000000000000..cde8044c24c121
--- /dev/null
+++ b/packages/block-editor/src/components/background-image-control/style.scss
@@ -0,0 +1,170 @@
+.block-editor-global-styles-background-panel__inspector-media-replace-container {
+	border: $border-width solid $gray-300;
+	border-radius: $radius-small;
+	// Full width. ToolsPanel lays out children in a grid.
+	grid-column: 1 / -1;
+
+	&.is-open {
+		background-color: $gray-100;
+	}
+
+	.block-editor-global-styles-background-panel__image-tools-panel-item {
+		flex-grow: 1;
+		border: 0;
+
+		.components-dropdown {
+			display: block;
+		}
+	}
+
+	.block-editor-global-styles-background-panel__inspector-preview-inner {
+		height: 100%;
+	}
+
+	.components-dropdown {
+		display: block;
+		height: 36px;
+	}
+}
+
+.block-editor-global-styles-background-panel__image-tools-panel-item {
+	border: $border-width solid $gray-300;
+
+	// Full width. ToolsPanel lays out children in a grid.
+	grid-column: 1 / -1;
+
+	// Ensure the dropzone is positioned to the size of the item.
+	position: relative;
+
+	// Since there is no option to skip rendering the drag'n'drop icon in drop
+	// zone, we hide it for now.
+	.components-drop-zone__content-icon {
+		display: none;
+	}
+
+	.components-dropdown {
+		display: block;
+		height: 36px;
+	}
+
+	button.components-button {
+		color: $gray-900;
+		width: 100%;
+		display: block;
+
+		&:hover {
+			color: var(--wp-admin-theme-color);
+		}
+
+		&:focus {
+			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+		}
+	}
+
+	.block-editor-global-styles-background-panel__loading {
+		height: 100%;
+		position: absolute;
+		z-index: 1;
+		width: 100%;
+		padding: 10px 0 0 0;
+
+		svg {
+			margin: 0;
+		}
+	}
+}
+
+.block-editor-global-styles-background-panel__image-preview-content,
+.block-editor-global-styles-background-panel__dropdown-toggle {
+	height: 100%;
+	width: 100%;
+	padding-left: $grid-unit-15;
+}
+
+.block-editor-global-styles-background-panel__dropdown-toggle {
+	cursor: pointer;
+	background: transparent;
+	border: none;
+}
+
+.block-editor-global-styles-background-panel__inspector-media-replace-title {
+	word-break: break-all;
+	// The Button component is white-space: nowrap, and that won't work with line-clamp.
+	white-space: normal;
+
+	// Without this, the ellipsis can sometimes be partially hidden by the Button padding.
+	text-align: start;
+	text-align-last: center;
+}
+
+.block-editor-global-styles-background-panel__inspector-preview-inner {
+	.block-editor-global-styles-background-panel__inspector-image-indicator-wrapper {
+		width: 20px;
+		height: 20px;
+		min-width: auto;
+	}
+}
+
+.block-editor-global-styles-background-panel__inspector-image-indicator {
+	background-size: cover;
+	border-radius: $radius-round;
+	width: 20px;
+	height: 20px;
+	display: block;
+	position: relative;
+}
+
+.block-editor-global-styles-background-panel__inspector-image-indicator::after {
+	content: "";
+	position: absolute;
+	top: -1px;
+	left: -1px;
+	bottom: -1px;
+	right: -1px;
+	border-radius: $radius-round;
+	box-shadow: inset 0 0 0 $border-width rgba(0, 0, 0, 0.2);
+	// Show a thin outline in Windows high contrast mode, otherwise the button is invisible.
+	border: 1px solid transparent;
+	box-sizing: inherit;
+}
+
+.block-editor-global-styles-background-panel__dropdown-content-wrapper {
+	min-width: 260px;
+	overflow-x: hidden;
+
+	.components-focal-point-picker-wrapper {
+		background-color: $gray-100;
+		width: 100%;
+		border-radius: $radius-small;
+		border: $border-width solid $gray-300;
+	}
+
+	.components-focal-point-picker__media--image {
+		max-height: 180px;
+	}
+
+	// Override focal picker to avoid a double border.
+	.components-focal-point-picker::after {
+		content: none;
+	}
+}
+
+// Push control panel into the background when the media modal is open.
+.modal-open .block-editor-global-styles-background-panel__popover {
+	z-index: z-index(".block-editor-global-styles-background-panel__popover");
+}
+
+.block-editor-global-styles-background-panel__media-replace-popover {
+	.components-popover__content {
+		// width of block-editor-global-styles-background-panel__dropdown-content-wrapper minus padding.
+		width: 226px;
+	}
+
+	.components-button {
+		padding: 0 $grid-unit-10;
+	}
+
+	.components-button .components-menu-items__item-icon.has-icon-right {
+		margin-left: $grid-unit-30 - $grid-unit-10;
+	}
+}
diff --git a/packages/block-editor/src/components/background-image-control/test/index.js b/packages/block-editor/src/components/background-image-control/test/index.js
new file mode 100644
index 00000000000000..ebadad97eda022
--- /dev/null
+++ b/packages/block-editor/src/components/background-image-control/test/index.js
@@ -0,0 +1,47 @@
+/**
+ * Internal dependencies
+ */
+
+import { backgroundPositionToCoords, coordsToBackgroundPosition } from '../';
+
+describe( 'backgroundPositionToCoords', () => {
+	it( 'should return the correct coordinates for a percentage value using 2-value syntax', () => {
+		expect( backgroundPositionToCoords( '25% 75%' ) ).toEqual( {
+			x: 0.25,
+			y: 0.75,
+		} );
+	} );
+
+	it( 'should return the correct coordinates for a percentage using 1-value syntax', () => {
+		expect( backgroundPositionToCoords( '50%' ) ).toEqual( {
+			x: 0.5,
+			y: 0.5,
+		} );
+	} );
+
+	it( 'should return undefined coords in given an empty value', () => {
+		expect( backgroundPositionToCoords( '' ) ).toEqual( {
+			x: undefined,
+			y: undefined,
+		} );
+	} );
+
+	it( 'should return undefined coords in given a string that cannot be converted', () => {
+		expect( backgroundPositionToCoords( 'apples' ) ).toEqual( {
+			x: undefined,
+			y: undefined,
+		} );
+	} );
+} );
+
+describe( 'coordsToBackgroundPosition', () => {
+	it( 'should return the correct background position for a set of coordinates', () => {
+		expect( coordsToBackgroundPosition( { x: 0.25, y: 0.75 } ) ).toBe(
+			'25% 75%'
+		);
+	} );
+
+	it( 'should return undefined if no coordinates are provided', () => {
+		expect( coordsToBackgroundPosition( {} ) ).toBeUndefined();
+	} );
+} );
diff --git a/packages/block-editor/src/components/block-actions/index.js b/packages/block-editor/src/components/block-actions/index.js
index 5d942d2b25c708..f06c8addedad50 100644
--- a/packages/block-editor/src/components/block-actions/index.js
+++ b/packages/block-editor/src/components/block-actions/index.js
@@ -20,42 +20,52 @@ export default function BlockActions( {
 	children,
 	__experimentalUpdateSelection: updateSelection,
 } ) {
-	const {
-		canInsertBlockType,
-		getBlockRootClientId,
-		getBlocksByClientId,
-		canMoveBlocks,
-		canRemoveBlocks,
-	} = useSelect( blockEditorStore );
 	const { getDefaultBlockName, getGroupingBlockName } =
 		useSelect( blocksStore );
-
-	const blocks = getBlocksByClientId( clientIds );
-	const rootClientId = getBlockRootClientId( clientIds[ 0 ] );
-
-	const canCopyStyles = blocks.every( ( block ) => {
-		return (
-			!! block &&
-			( hasBlockSupport( block.name, 'color' ) ||
-				hasBlockSupport( block.name, 'typography' ) )
-		);
-	} );
-
-	const canDuplicate = blocks.every( ( block ) => {
-		return (
-			!! block &&
-			hasBlockSupport( block.name, 'multiple', true ) &&
-			canInsertBlockType( block.name, rootClientId )
-		);
-	} );
-
-	const canInsertDefaultBlock = canInsertBlockType(
-		getDefaultBlockName(),
-		rootClientId
+	const selected = useSelect(
+		( select ) => {
+			const {
+				canInsertBlockType,
+				getBlockRootClientId,
+				getBlocksByClientId,
+				getDirectInsertBlock,
+				canRemoveBlocks,
+			} = select( blockEditorStore );
+
+			const blocks = getBlocksByClientId( clientIds );
+			const rootClientId = getBlockRootClientId( clientIds[ 0 ] );
+			const canInsertDefaultBlock = canInsertBlockType(
+				getDefaultBlockName(),
+				rootClientId
+			);
+			const directInsertBlock = rootClientId
+				? getDirectInsertBlock( rootClientId )
+				: null;
+
+			return {
+				canRemove: canRemoveBlocks( clientIds ),
+				canInsertBlock: canInsertDefaultBlock || !! directInsertBlock,
+				canCopyStyles: blocks.every( ( block ) => {
+					return (
+						!! block &&
+						( hasBlockSupport( block.name, 'color' ) ||
+							hasBlockSupport( block.name, 'typography' ) )
+					);
+				} ),
+				canDuplicate: blocks.every( ( block ) => {
+					return (
+						!! block &&
+						hasBlockSupport( block.name, 'multiple', true ) &&
+						canInsertBlockType( block.name, rootClientId )
+					);
+				} ),
+			};
+		},
+		[ clientIds, getDefaultBlockName ]
 	);
+	const { getBlocksByClientId, getBlocks } = useSelect( blockEditorStore );
 
-	const canMove = canMoveBlocks( clientIds, rootClientId );
-	const canRemove = canRemoveBlocks( clientIds, rootClientId );
+	const { canRemove, canInsertBlock, canCopyStyles, canDuplicate } = selected;
 
 	const {
 		removeBlocks,
@@ -64,9 +74,6 @@ export default function BlockActions( {
 		insertAfterBlock,
 		insertBeforeBlock,
 		flashBlock,
-		setBlockMovingClientId,
-		setNavigationMode,
-		selectBlock,
 	} = useDispatch( blockEditorStore );
 
 	const notifyCopy = useNotifyCopy();
@@ -75,11 +82,8 @@ export default function BlockActions( {
 	return children( {
 		canCopyStyles,
 		canDuplicate,
-		canInsertDefaultBlock,
-		canMove,
+		canInsertBlock,
 		canRemove,
-		rootClientId,
-		blocks,
 		onDuplicate() {
 			return duplicateBlocks( clientIds, updateSelection );
 		},
@@ -87,31 +91,23 @@ export default function BlockActions( {
 			return removeBlocks( clientIds, updateSelection );
 		},
 		onInsertBefore() {
-			const clientId = Array.isArray( clientIds )
-				? clientIds[ 0 ]
-				: clientId;
-			insertBeforeBlock( clientId );
+			insertBeforeBlock( clientIds[ 0 ] );
 		},
 		onInsertAfter() {
-			const clientId = Array.isArray( clientIds )
-				? clientIds[ clientIds.length - 1 ]
-				: clientId;
-			insertAfterBlock( clientId );
-		},
-		onMoveTo() {
-			setNavigationMode( true );
-			selectBlock( clientIds[ 0 ] );
-			setBlockMovingClientId( clientIds[ 0 ] );
+			insertAfterBlock( clientIds[ clientIds.length - 1 ] );
 		},
 		onGroup() {
-			if ( ! blocks.length ) {
+			if ( ! clientIds.length ) {
 				return;
 			}
 
 			const groupingBlockName = getGroupingBlockName();
 
 			// Activate the `transform` on `core/group` which does the conversion.
-			const newBlocks = switchToBlockType( blocks, groupingBlockName );
+			const newBlocks = switchToBlockType(
+				getBlocksByClientId( clientIds ),
+				groupingBlockName
+			);
 
 			if ( ! newBlocks ) {
 				return;
@@ -119,12 +115,11 @@ export default function BlockActions( {
 			replaceBlocks( clientIds, newBlocks );
 		},
 		onUngroup() {
-			if ( ! blocks.length ) {
+			if ( ! clientIds.length ) {
 				return;
 			}
 
-			const innerBlocks = blocks[ 0 ].innerBlocks;
-
+			const innerBlocks = getBlocks( clientIds[ 0 ] );
 			if ( ! innerBlocks.length ) {
 				return;
 			}
@@ -132,16 +127,13 @@ export default function BlockActions( {
 			replaceBlocks( clientIds, innerBlocks );
 		},
 		onCopy() {
-			const selectedBlockClientIds = blocks.map(
-				( { clientId } ) => clientId
-			);
-			if ( blocks.length === 1 ) {
-				flashBlock( selectedBlockClientIds[ 0 ] );
+			if ( clientIds.length === 1 ) {
+				flashBlock( clientIds[ 0 ] );
 			}
-			notifyCopy( 'copy', selectedBlockClientIds );
+			notifyCopy( 'copy', clientIds );
 		},
 		async onPasteStyles() {
-			await pasteStyles( blocks );
+			await pasteStyles( getBlocksByClientId( clientIds ) );
 		},
 	} );
 }
diff --git a/packages/block-editor/src/components/block-alignment-control/README.md b/packages/block-editor/src/components/block-alignment-control/README.md
index 14f08d1dda9ce6..22b5df9af9bd42 100644
--- a/packages/block-editor/src/components/block-alignment-control/README.md
+++ b/packages/block-editor/src/components/block-alignment-control/README.md
@@ -4,11 +4,6 @@ The `BlockAlignmentToolbar` component is used to render block alignment options
 
 ![Image block alignment options](https://make.wordpress.org/core/files/2020/09/image-block-alignment-options.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-alignment-control/ui.js b/packages/block-editor/src/components/block-alignment-control/ui.js
index 9356e59ef465a3..87c5c7b0275a22 100644
--- a/packages/block-editor/src/components/block-alignment-control/ui.js
+++ b/packages/block-editor/src/components/block-alignment-control/ui.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -64,7 +64,7 @@ function BlockAlignmentUI( {
 				} ),
 		  }
 		: {
-				toggleProps: { describedBy: __( 'Change alignment' ) },
+				toggleProps: { description: __( 'Change alignment' ) },
 				children: ( { onClose } ) => {
 					return (
 						<>
@@ -85,7 +85,7 @@ function BlockAlignmentUI( {
 												key={ controlName }
 												icon={ icon }
 												iconPosition="left"
-												className={ classNames(
+												className={ clsx(
 													'components-dropdown-menu__menu-item',
 													{
 														'is-active': isSelected,
diff --git a/packages/block-editor/src/components/block-alignment-control/ui.native.js b/packages/block-editor/src/components/block-alignment-control/ui.native.js
index 8faa8fe3e0d596..9234f50ccccb62 100644
--- a/packages/block-editor/src/components/block-alignment-control/ui.native.js
+++ b/packages/block-editor/src/components/block-alignment-control/ui.native.js
@@ -77,7 +77,7 @@ function BlockAlignmentUI( {
 					};
 				} ),
 				popoverProps: POPOVER_PROPS,
-				toggleProps: { describedBy: __( 'Change alignment' ) },
+				toggleProps: { description: __( 'Change alignment' ) },
 		  };
 
 	return <UIComponent { ...commonProps } { ...extraProps } />;
diff --git a/packages/block-editor/src/components/block-alignment-matrix-control/README.md b/packages/block-editor/src/components/block-alignment-matrix-control/README.md
index 377f9f368dae4d..dfb38e15964124 100644
--- a/packages/block-editor/src/components/block-alignment-matrix-control/README.md
+++ b/packages/block-editor/src/components/block-alignment-matrix-control/README.md
@@ -4,16 +4,6 @@ The alignment matrix control allows users to quickly adjust inner block alignmen
 
 ![Button components](https://i.imgur.com/PxYkgL5.png)
 
-## Table of contents
-
--   [Alignment Matrix Control](#alignment-matrix-control)
-    -   [Table of contents](#table-of-contents)
-    -   [Design guidelines](#design-guidelines)
-        -   [Usage](#usage)
-    -   [Development guidelines](#development-guidelines)
-        -   [Usage](#usage-1)
-        -   [Props](#props)
-
 ## Design guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-alignment-matrix-control/index.js b/packages/block-editor/src/components/block-alignment-matrix-control/index.js
index 53baa97421e6c1..cdec41dfc7b978 100644
--- a/packages/block-editor/src/components/block-alignment-matrix-control/index.js
+++ b/packages/block-editor/src/components/block-alignment-matrix-control/index.js
@@ -6,7 +6,7 @@ import { DOWN } from '@wordpress/keycodes';
 import {
 	ToolbarButton,
 	Dropdown,
-	__experimentalAlignmentMatrixControl as AlignmentMatrixControl,
+	AlignmentMatrixControl,
 } from '@wordpress/components';
 
 const noop = () => {};
diff --git a/packages/block-editor/src/components/block-breadcrumb/README.md b/packages/block-editor/src/components/block-breadcrumb/README.md
index 298ff8fdf5ea61..c1ffe43472b0c1 100644
--- a/packages/block-editor/src/components/block-breadcrumb/README.md
+++ b/packages/block-editor/src/components/block-breadcrumb/README.md
@@ -6,11 +6,6 @@ The block breadcrumb trail displays the hierarchy of the current block selection
 
 ![Image in column block breadcrumb](https://make.wordpress.org/core/files/2020/08/gutenberg-image-in-column-block-breadcrumb.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 #### Props
diff --git a/packages/block-editor/src/components/block-breadcrumb/index.js b/packages/block-editor/src/components/block-breadcrumb/index.js
index b1fd13dbf3475a..440d9611d278be 100644
--- a/packages/block-editor/src/components/block-breadcrumb/index.js
+++ b/packages/block-editor/src/components/block-breadcrumb/index.js
@@ -5,6 +5,7 @@ import { Button } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { chevronRightSmall, Icon } from '@wordpress/icons';
+import { useRef } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -12,6 +13,8 @@ import { chevronRightSmall, Icon } from '@wordpress/icons';
 import BlockTitle from '../block-title';
 import { store as blockEditorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
+import { useBlockElementRef } from '../block-list/use-block-props/use-block-refs';
+import getEditorRegion from '../../utils/get-editor-region';
 
 /**
  * Block breadcrumb component, displaying the hierarchy of the current block selection as a breadcrumb.
@@ -37,6 +40,11 @@ function BlockBreadcrumb( { rootLabelText } ) {
 	}, [] );
 	const rootLabel = rootLabelText || __( 'Document' );
 
+	// We don't care about this specific ref, but this is a way
+	// to get a ref within the editor canvas so we can focus it later.
+	const blockRef = useRef();
+	useBlockElementRef( clientId, blockRef );
+
 	/*
 	 * Disable reason: The `list` ARIA role is redundant but
 	 * Safari+VoiceOver won't announce the list otherwise.
@@ -58,9 +66,18 @@ function BlockBreadcrumb( { rootLabelText } ) {
 			>
 				{ hasSelection && (
 					<Button
+						size="small"
 						className="block-editor-block-breadcrumb__button"
-						variant="tertiary"
-						onClick={ clearSelectedBlock }
+						onClick={ () => {
+							// Find the block editor wrapper for the selected block
+							const blockEditor = blockRef.current?.closest(
+								'.editor-styles-wrapper'
+							);
+
+							clearSelectedBlock();
+
+							getEditorRegion( blockEditor )?.focus();
+						} }
 					>
 						{ rootLabel }
 					</Button>
@@ -77,8 +94,8 @@ function BlockBreadcrumb( { rootLabelText } ) {
 			{ parents.map( ( parentClientId ) => (
 				<li key={ parentClientId }>
 					<Button
+						size="small"
 						className="block-editor-block-breadcrumb__button"
-						variant="tertiary"
 						onClick={ () => selectBlock( parentClientId ) }
 					>
 						<BlockTitle
diff --git a/packages/block-editor/src/components/block-breadcrumb/style.scss b/packages/block-editor/src/components/block-breadcrumb/style.scss
index 5d2e3154dc2d90..af56971fe4c5c9 100644
--- a/packages/block-editor/src/components/block-breadcrumb/style.scss
+++ b/packages/block-editor/src/components/block-breadcrumb/style.scss
@@ -22,40 +22,11 @@
 	}
 }
 
-.block-editor-block-breadcrumb__button.components-button {
-	height: $button-size-small;
-	line-height: $button-size-small;
-	padding: 0;
-	position: relative;
-
-	&:hover:not(:disabled) {
-		text-decoration: underline;
-		box-shadow: none;
-	}
-
-	&:focus {
-		box-shadow: none;
-	}
-
-	&:focus::before {
-		content: "";
-		display: block;
-		position: absolute;
-		border-radius: $radius-block-ui;
-		top: $border-width;
-		right: $border-width;
-		bottom: $border-width;
-		left: $border-width;
-
-		@include button-style__focus();
-	}
-}
-
 .block-editor-block-breadcrumb__current {
 	cursor: default;
 }
 
-.block-editor-block-breadcrumb__button.components-button,
+.block-editor-block-breadcrumb__button.block-editor-block-breadcrumb__button,
 .block-editor-block-breadcrumb__current {
 	color: $gray-900;
 	padding: 0 $grid-unit-10;
diff --git a/packages/block-editor/src/components/block-canvas/index.js b/packages/block-editor/src/components/block-canvas/index.js
index 97aec461df7d86..c399f38054ed4d 100644
--- a/packages/block-editor/src/components/block-canvas/index.js
+++ b/packages/block-editor/src/components/block-canvas/index.js
@@ -1,17 +1,30 @@
 /**
  * WordPress dependencies
  */
-import { useMergeRefs } from '@wordpress/compose';
+import { useMergeRefs, useViewportMatch } from '@wordpress/compose';
+import { useRef } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import BlockList from '../block-list';
+import BlockTools from '../block-tools';
 import EditorStyles from '../editor-styles';
 import Iframe from '../iframe';
 import WritingFlow from '../writing-flow';
 import { useMouseMoveTypingReset } from '../observe-typing';
 import { useBlockSelectionClearer } from '../block-selection-clearer';
+import { useBlockCommands } from '../use-block-commands';
+import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+// EditorStyles is a memoized component, so avoid passing a new
+// object reference on each render.
+const EDITOR_STYLE_TRANSFORM_OPTIONS = {
+	// Don't transform selectors that already specify `.editor-styles-wrapper`.
+	ignoredSelectors: [ /\.editor-styles-wrapper/gi ],
+};
 
 export function ExperimentalBlockCanvas( {
 	shouldIframe = true,
@@ -21,44 +34,69 @@ export function ExperimentalBlockCanvas( {
 	contentRef: contentRefProp,
 	iframeProps,
 } ) {
+	useBlockCommands();
+	const isTabletViewport = useViewportMatch( 'medium', '<' );
 	const resetTypingRef = useMouseMoveTypingReset();
 	const clearerRef = useBlockSelectionClearer();
-	const contentRef = useMergeRefs( [ contentRefProp, clearerRef ] );
+	const localRef = useRef();
+	const contentRef = useMergeRefs( [ contentRefProp, clearerRef, localRef ] );
+	const zoomLevel = useSelect(
+		( select ) => unlock( select( blockEditorStore ) ).getZoomLevel(),
+		[]
+	);
+	const zoomOutIframeProps =
+		zoomLevel !== 100 && ! isTabletViewport
+			? {
+					scale: zoomLevel,
+					frameSize: '40px',
+			  }
+			: {};
 
 	if ( ! shouldIframe ) {
 		return (
-			<>
+			<BlockTools
+				__unstableContentRef={ localRef }
+				style={ { height, display: 'flex' } }
+			>
 				<EditorStyles
 					styles={ styles }
-					scope=".editor-styles-wrapper"
+					scope=":where(.editor-styles-wrapper)"
+					transformOptions={ EDITOR_STYLE_TRANSFORM_OPTIONS }
 				/>
 				<WritingFlow
 					ref={ contentRef }
 					className="editor-styles-wrapper"
 					tabIndex={ -1 }
-					style={ { height } }
+					style={ {
+						height: '100%',
+						width: '100%',
+					} }
 				>
 					{ children }
 				</WritingFlow>
-			</>
+			</BlockTools>
 		);
 	}
 
 	return (
-		<Iframe
-			{ ...iframeProps }
-			ref={ resetTypingRef }
-			contentRef={ contentRef }
-			style={ {
-				width: '100%',
-				height,
-				...iframeProps?.style,
-			} }
-			name="editor-canvas"
+		<BlockTools
+			__unstableContentRef={ localRef }
+			style={ { height, display: 'flex' } }
 		>
-			<EditorStyles styles={ styles } />
-			{ children }
-		</Iframe>
+			<Iframe
+				{ ...iframeProps }
+				{ ...zoomOutIframeProps }
+				ref={ resetTypingRef }
+				contentRef={ contentRef }
+				style={ {
+					...iframeProps?.style,
+				} }
+				name="editor-canvas"
+			>
+				<EditorStyles styles={ styles } />
+				{ children }
+			</Iframe>
+		</BlockTools>
 	);
 }
 
diff --git a/packages/block-editor/src/components/block-canvas/style.scss b/packages/block-editor/src/components/block-canvas/style.scss
new file mode 100644
index 00000000000000..0b37b4dd1447e2
--- /dev/null
+++ b/packages/block-editor/src/components/block-canvas/style.scss
@@ -0,0 +1,9 @@
+iframe[name="editor-canvas"] {
+	box-sizing: border-box;
+	width: 100%;
+	height: 100%;
+	display: block;
+	background-color: transparent;
+	// Handles transitions between device previews
+	@include editor-canvas-resize-animation;
+}
diff --git a/packages/block-editor/src/components/block-caption/README.md b/packages/block-editor/src/components/block-caption/README.md
index acb53fd4aa4c96..2d3bce1f6d2d4b 100644
--- a/packages/block-editor/src/components/block-caption/README.md
+++ b/packages/block-editor/src/components/block-caption/README.md
@@ -4,11 +4,6 @@ The `BlockCaption` component renders block-level UI for adding and editing capti
 
 `BlockCaption` is used in several native blocks, including `Video`, `Image`, `Audio`, etc.
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-card/README.md b/packages/block-editor/src/components/block-card/README.md
index 8aab2a45f612bd..216cf4e3865a04 100644
--- a/packages/block-editor/src/components/block-card/README.md
+++ b/packages/block-editor/src/components/block-card/README.md
@@ -6,11 +6,6 @@ In the editor, this component is displayed in two different places: in the block
 
 ![Heading block card in the block inspector](https://make.wordpress.org/core/files/2020/09/screenshot-wordpress.org-2020.09.08-14_19_21.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-card/index.js b/packages/block-editor/src/components/block-card/index.js
index fd89697a54c5d7..4d40fe07d55471 100644
--- a/packages/block-editor/src/components/block-card/index.js
+++ b/packages/block-editor/src/components/block-card/index.js
@@ -1,15 +1,19 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import deprecated from '@wordpress/deprecated';
-import { Button } from '@wordpress/components';
+import {
+	Button,
+	__experimentalText as Text,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
 import { chevronLeft, chevronRight } from '@wordpress/icons';
-import { __, isRTL } from '@wordpress/i18n';
+import { __, isRTL, sprintf } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
 
 /**
@@ -18,7 +22,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import BlockIcon from '../block-icon';
 import { store as blockEditorStore } from '../../store';
 
-function BlockCard( { title, icon, description, blockType, className } ) {
+function BlockCard( { title, icon, description, blockType, className, name } ) {
 	if ( blockType ) {
 		deprecated( '`blockType` property in `BlockCard component`', {
 			since: '5.7',
@@ -45,7 +49,7 @@ function BlockCard( { title, icon, description, blockType, className } ) {
 	const { selectBlock } = useDispatch( blockEditorStore );
 
 	return (
-		<div className={ classnames( 'block-editor-block-card', className ) }>
+		<div className={ clsx( 'block-editor-block-card', className ) }>
 			{ parentNavBlockClientId && ( // This is only used by the Navigation block for now. It's not ideal having Navigation block specific code here.
 				<Button
 					onClick={ () => selectBlock( parentNavBlockClientId ) }
@@ -56,18 +60,27 @@ function BlockCard( { title, icon, description, blockType, className } ) {
 						{ minWidth: 24, padding: 0 }
 					}
 					icon={ isRTL() ? chevronRight : chevronLeft }
-					isSmall
+					size="small"
 				/>
 			) }
 			<BlockIcon icon={ icon } showColors />
-			<div className="block-editor-block-card__content">
-				<h2 className="block-editor-block-card__title">{ title }</h2>
+			<VStack spacing={ 1 }>
+				<h2 className="block-editor-block-card__title">
+					{ name?.length
+						? sprintf(
+								// translators:  %1$s: Custom block name. %2$s: Block title.
+								__( '%1$s (%2$s)' ),
+								name,
+								title
+						  )
+						: title }
+				</h2>
 				{ description && (
-					<span className="block-editor-block-card__description">
+					<Text className="block-editor-block-card__description">
 						{ description }
-					</span>
+					</Text>
 				) }
-			</div>
+			</VStack>
 		</div>
 	);
 }
diff --git a/packages/block-editor/src/components/block-card/style.scss b/packages/block-editor/src/components/block-card/style.scss
index 282161f0ec519f..42cf77aa4b0a84 100644
--- a/packages/block-editor/src/components/block-card/style.scss
+++ b/packages/block-editor/src/components/block-card/style.scss
@@ -5,26 +5,17 @@
 	padding: $grid-unit-20;
 }
 
-.block-editor-block-card__content {
-	flex-grow: 1;
-}
-
 .block-editor-block-card__title {
 	font-weight: 500;
 
 	&.block-editor-block-card__title {
 		font-size: $default-font-size;
-		line-height: $button-size-small;
+		line-height: $default-line-height;
 		margin: 0;
+		padding: 3px 0; // This makes the title as high as the icon.
 	}
 }
 
-.block-editor-block-card__description {
-	display: block;
-	font-size: $default-font-size;
-	margin-top: $grid-unit-05;
-}
-
 .block-editor-block-card .block-editor-block-icon {
 	flex: 0 0 $button-size-small;
 	margin-left: 0;
diff --git a/packages/block-editor/src/components/block-compare/block-view.js b/packages/block-editor/src/components/block-compare/block-view.js
index 3c4839931e10fe..48a13540e78425 100644
--- a/packages/block-editor/src/components/block-compare/block-view.js
+++ b/packages/block-editor/src/components/block-compare/block-view.js
@@ -30,7 +30,12 @@ export default function BlockView( {
 			</div>
 
 			<div className="block-editor-block-compare__action">
-				<Button variant="secondary" tabIndex="0" onClick={ action }>
+				<Button
+					__next40pxDefaultSize
+					variant="secondary"
+					tabIndex="0"
+					onClick={ action }
+				>
 					{ actionText }
 				</Button>
 			</div>
diff --git a/packages/block-editor/src/components/block-compare/index.js b/packages/block-editor/src/components/block-compare/index.js
index 46454f82a070d1..4b9b6db596864e 100644
--- a/packages/block-editor/src/components/block-compare/index.js
+++ b/packages/block-editor/src/components/block-compare/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 // diff doesn't tree-shake correctly, so we import from the individual
 // module here, to avoid including too much of the library
 import { diffChars } from 'diff/lib/diff/character';
@@ -28,7 +28,7 @@ function BlockCompare( {
 		const difference = diffChars( originalContent, newContent );
 
 		return difference.map( ( item, pos ) => {
-			const classes = classnames( {
+			const classes = clsx( {
 				'block-editor-block-compare__added': item.added,
 				'block-editor-block-compare__removed': item.removed,
 			} );
diff --git a/packages/block-editor/src/components/block-compare/test/__snapshots__/block-view.js.snap b/packages/block-editor/src/components/block-compare/test/__snapshots__/block-view.js.snap
index f8abe9753c0310..c90f2bac7365ab 100644
--- a/packages/block-editor/src/components/block-compare/test/__snapshots__/block-view.js.snap
+++ b/packages/block-editor/src/components/block-compare/test/__snapshots__/block-view.js.snap
@@ -30,7 +30,7 @@ exports[`BlockView should match snapshot 1`] = `
       class="block-editor-block-compare__action"
     >
       <button
-        class="components-button is-secondary"
+        class="components-button is-next-40px-default-size is-secondary"
         tabindex="0"
         type="button"
       >
diff --git a/packages/block-editor/src/components/block-content-overlay/content.scss b/packages/block-editor/src/components/block-content-overlay/content.scss
index 41ed71e0b4c27c..088ae40940d402 100644
--- a/packages/block-editor/src/components/block-content-overlay/content.scss
+++ b/packages/block-editor/src/components/block-content-overlay/content.scss
@@ -1,46 +1,13 @@
 .block-editor-block-list__block.has-block-overlay {
 	cursor: default;
 
-	&::before {
-		content: "";
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: transparent;
-		border: none;
-		border-radius: $radius-block-ui;
-		z-index: z-index(".block-editor-block-list__block.has-block-overlay");
-	}
-
-	&:not(.is-multi-selected)::after {
-		content: none !important;
-	}
-
-	&:hover:not(.is-dragging-blocks):not(.is-multi-selected)::before {
-		background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
-		box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color) inset;
-	}
-
-	&.is-reusable:hover:not(.is-dragging-blocks):not(.is-multi-selected)::before,
-	&.wp-block-template-part:hover:not(.is-dragging-blocks):not(.is-multi-selected)::before {
-		background: rgba(var(--wp-block-synced-color--rgb), 0.04);
-		box-shadow: 0 0 0 $border-width var(--wp-block-synced-color) inset;
-	}
-
-	&.is-selected:not(.is-dragging-blocks)::before {
-		box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color) inset;
-	}
-
 	.block-editor-block-list__block {
 		pointer-events: none;
 	}
 
-	.block-editor-iframe__body.is-zoomed-out &::before {
-		// Unfortunately because of the vw unit, this is not always going to be exact
-		// When the scrollbar is visible, the frame exceeds the canvas by a few pixels.
-		width: calc(100vw);
-		left: calc(( 100% - 100vw ) / 2);
+	.block-editor-block-list__block.has-block-overlay::before {
+		left: 0;
+		right: 0;
+		width: auto;
 	}
 }
diff --git a/packages/block-editor/src/components/block-context/README.md b/packages/block-editor/src/components/block-context/README.md
index 581517466d3c0c..dd6fd22de757a7 100644
--- a/packages/block-editor/src/components/block-context/README.md
+++ b/packages/block-editor/src/components/block-context/README.md
@@ -1,12 +1,12 @@
 # Block Context
 
-Block Context is a React implementation of WordPress's block context. Block context, much like [React's context](https://reactjs.org/docs/context.html), is a method for passing and inheriting values deeply through a hierarchy of blocks. Because of the similarities with React's context, the client-side implementation here is quite minimal. It is complemented by equivalent behaviors in the server-side rendering of a block.
+Block Context is a React implementation of WordPress's block context. Block context, much like [React's context](https://react.dev/learn/passing-data-deeply-with-context), is a method for passing and inheriting values deeply through a hierarchy of blocks. Because of the similarities with React's context, the client-side implementation here is quite minimal. It is complemented by equivalent behaviors in the server-side rendering of a block.
 
 Note that the implementation of Block Context is distinct from [the `BlockEdit` context](../block-edit). While it is true that both provide context relevant for the editing of a block, Block Context is implemented separately so as to prioritize it as most identifiable amongst the machinery of block context, and not amongst other client-side editing context of a block.
 
 ## Usage
 
-Currently, only the [Provider component](https://reactjs.org/docs/context.html#contextprovider) is made available on the public interface of the `@wordpress/block-editor` module. This can be used to add or override context which can then be consumed by blocks rendered within that context in the block editor.
+Currently, only the [Provider component](https://react.dev/reference/react/createContext#provider) is made available on the public interface of the `@wordpress/block-editor` module. This can be used to add or override context which can then be consumed by blocks rendered within that context in the block editor.
 
 ```js
 import { BlockContextProvider } from '@wordpress/block-editor';
@@ -20,7 +20,7 @@ function MyCustomPostEditor() {
 }
 ```
 
-Internal to the `@wordpress/block-editor` module, a component can access the [full Context object](https://reactjs.org/docs/context.html#api), typically for use in combination with [`useContext`](https://reactjs.org/docs/hooks-reference.html#usecontext).
+Internal to the `@wordpress/block-editor` module, a component can access the [full Context object](https://react.dev/reference/react/createContext), typically for use in combination with [`useContext`](https://react.dev/reference/react/useContext).
 
 ```js
 import { useContext } from 'react';
@@ -39,7 +39,7 @@ The reason `BlockContext` is only internally available within the `@wordpress/bl
 
 ## Props
 
-`BlockContextProvider` behaves like a standard [`Context.Provider` component](https://reactjs.org/docs/context.html#contextprovider). It receives `value` and `children` props. The `value` is merged with the current block context value.
+`BlockContextProvider` behaves like a standard [`Context.Provider` component](https://react.dev/reference/react/createContext#provider). It receives `value` and `children` props. The `value` is merged with the current block context value.
 
 ### `value`
 
diff --git a/packages/block-editor/src/components/block-controls/README.md b/packages/block-editor/src/components/block-controls/README.md
index ee02e96e08b4d3..58daea482ef395 100644
--- a/packages/block-editor/src/components/block-controls/README.md
+++ b/packages/block-editor/src/components/block-controls/README.md
@@ -49,7 +49,7 @@ export default function MyBlockEdit( { attributes, setAttributes } ) {
 <MyBlockEdit />;
 ```
 
-See [this custom block tutorial page](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md) for more information and block controls examples.
+See [this custom block tutorial page](/docs/getting-started/fundamentals/block-in-the-editor.md) for more information and block controls examples.
 
 Furthermore, the READMEs of various components inside the block editor package and the components package include examples that also utilize `BlockControls` and can be a good reference.
 
@@ -69,7 +69,7 @@ Group of the block controls. Allows you to create and render multiple groups of
 
 Allows overriding the default `controls` if the `default` group is used. 
 
-See [this custom block tutorial page](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md) for more details and examples with block controls.
+See [this custom block tutorial page](/docs/getting-started/fundamentals/block-in-the-editor.md) for more details and examples with block controls.
 
 - Type: `array`
 
diff --git a/packages/block-editor/src/components/block-controls/hook.js b/packages/block-editor/src/components/block-controls/hook.js
index 18a38e245e58ab..4e9592471cb298 100644
--- a/packages/block-editor/src/components/block-controls/hook.js
+++ b/packages/block-editor/src/components/block-controls/hook.js
@@ -1,45 +1,23 @@
 /**
  * WordPress dependencies
  */
-import { store as blocksStore } from '@wordpress/blocks';
-import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import groups from './groups';
-import { store as blockEditorStore } from '../../store';
-import { useBlockEditContext } from '../block-edit/context';
-import useDisplayBlockControls from '../use-display-block-controls';
+import {
+	useBlockEditContext,
+	mayDisplayControlsKey,
+	mayDisplayParentControlsKey,
+} from '../block-edit/context';
 
 export default function useBlockControlsFill( group, shareWithChildBlocks ) {
-	const isDisplayed = useDisplayBlockControls();
-	const { clientId } = useBlockEditContext();
-	const isParentDisplayed = useSelect(
-		( select ) => {
-			if ( ! shareWithChildBlocks ) {
-				return false;
-			}
-
-			const { getBlockName, hasSelectedInnerBlock } =
-				select( blockEditorStore );
-			const { hasBlockSupport } = select( blocksStore );
-
-			return (
-				hasBlockSupport(
-					getBlockName( clientId ),
-					'__experimentalExposeControlsToChildren',
-					false
-				) && hasSelectedInnerBlock( clientId )
-			);
-		},
-		[ shareWithChildBlocks, clientId ]
-	);
-
-	if ( isDisplayed ) {
+	const context = useBlockEditContext();
+	if ( context[ mayDisplayControlsKey ] ) {
 		return groups[ group ]?.Fill;
 	}
-	if ( isParentDisplayed ) {
+	if ( context[ mayDisplayParentControlsKey ] && shareWithChildBlocks ) {
 		return groups.parent.Fill;
 	}
 	return null;
diff --git a/packages/block-editor/src/components/block-controls/test/index.js b/packages/block-editor/src/components/block-controls/test/index.js
index cbfcb3c1873a75..bbd987cbeb20e8 100644
--- a/packages/block-editor/src/components/block-controls/test/index.js
+++ b/packages/block-editor/src/components/block-controls/test/index.js
@@ -59,7 +59,7 @@ describe( 'BlockControls', () => {
 	it( 'should render a dynamic toolbar of controls', () => {
 		render(
 			<SlotFillProvider>
-				<BlockEdit name="core/test-block" isSelected>
+				<BlockEdit name="core/test-block" mayDisplayControls>
 					<BlockControls controls={ controls }>
 						<p>Child</p>
 					</BlockControls>
@@ -84,7 +84,7 @@ describe( 'BlockControls', () => {
 	it( 'should render its children', () => {
 		render(
 			<SlotFillProvider>
-				<BlockEdit name="core/test-block" isSelected>
+				<BlockEdit name="core/test-block" mayDisplayControls>
 					<BlockControls controls={ controls }>
 						<p>Child</p>
 					</BlockControls>
@@ -99,7 +99,7 @@ describe( 'BlockControls', () => {
 	it( 'should a dynamic toolbar when passed as children', () => {
 		render(
 			<SlotFillProvider>
-				<BlockEdit name="core/test-block" isSelected>
+				<BlockEdit name="core/test-block" mayDisplayControls>
 					<BlockControls>
 						<ToolbarGroup controls={ controls } />
 					</BlockControls>
diff --git a/packages/block-editor/src/components/block-controls/use-has-block-controls.js b/packages/block-editor/src/components/block-controls/use-has-block-controls.js
deleted file mode 100644
index f7884cc1882ed5..00000000000000
--- a/packages/block-editor/src/components/block-controls/use-has-block-controls.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __experimentalUseSlotFills as useSlotFills } from '@wordpress/components';
-import warning from '@wordpress/warning';
-
-/**
- * Internal dependencies
- */
-import groups from './groups';
-
-export function useHasAnyBlockControls() {
-	let hasAnyBlockControls = false;
-	for ( const group in groups ) {
-		// It is safe to violate the rules of hooks here as the `groups` object
-		// is static and will not change length between renders. Do not return
-		// early as that will cause the hook to be called a different number of
-		// times between renders.
-		// eslint-disable-next-line react-hooks/rules-of-hooks
-		if ( useHasBlockControls( group ) ) {
-			hasAnyBlockControls = true;
-		}
-	}
-	return hasAnyBlockControls;
-}
-
-export function useHasBlockControls( group = 'default' ) {
-	const Slot = groups[ group ]?.Slot;
-	const fills = useSlotFills( Slot?.__unstableName );
-	if ( ! Slot ) {
-		warning( `Unknown BlockControls group "${ group }" provided.` );
-		return null;
-	}
-	return !! fills?.length;
-}
diff --git a/packages/block-editor/src/components/block-draggable/content.scss b/packages/block-editor/src/components/block-draggable/content.scss
index f1318daebd5a04..102230168e2133 100644
--- a/packages/block-editor/src/components/block-draggable/content.scss
+++ b/packages/block-editor/src/components/block-draggable/content.scss
@@ -3,7 +3,7 @@
 .block-editor-block-list__layout .is-dragging {
 	background-color: currentColor !important;
 	opacity: 0.05 !important;
-	border-radius: $radius-block-ui !important;
+	border-radius: $radius-small !important;
 
 	// Disabling pointer events during the drag event is necessary,
 	// lest the block might affect your drag operation.
diff --git a/packages/block-editor/src/components/block-draggable/draggable-chip.js b/packages/block-editor/src/components/block-draggable/draggable-chip.js
index d7d053be179fa6..cca21e7e0b7858 100644
--- a/packages/block-editor/src/components/block-draggable/draggable-chip.js
+++ b/packages/block-editor/src/components/block-draggable/draggable-chip.js
@@ -10,7 +10,12 @@ import { dragHandle } from '@wordpress/icons';
  */
 import BlockIcon from '../block-icon';
 
-export default function BlockDraggableChip( { count, icon, isPattern } ) {
+export default function BlockDraggableChip( {
+	count,
+	icon,
+	isPattern,
+	fadeWhenDisabled,
+} ) {
 	const patternLabel = isPattern && __( 'Pattern' );
 	return (
 		<div className="block-editor-block-draggable-chip-wrapper">
@@ -37,6 +42,11 @@ export default function BlockDraggableChip( { count, icon, isPattern } ) {
 					<FlexItem>
 						<BlockIcon icon={ dragHandle } />
 					</FlexItem>
+					{ fadeWhenDisabled && (
+						<FlexItem className="block-editor-block-draggable-chip__disabled">
+							<span className="block-editor-block-draggable-chip__disabled-icon"></span>
+						</FlexItem>
+					) }
 				</Flex>
 			</div>
 		</div>
diff --git a/packages/block-editor/src/components/block-draggable/index.js b/packages/block-editor/src/components/block-draggable/index.js
index 0b8f3c2d87f520..5bb328f7cf9f58 100644
--- a/packages/block-editor/src/components/block-draggable/index.js
+++ b/packages/block-editor/src/components/block-draggable/index.js
@@ -5,6 +5,7 @@ import { store as blocksStore } from '@wordpress/blocks';
 import { Draggable } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { useEffect, useRef } from '@wordpress/element';
+import { throttle } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -12,23 +13,36 @@ import { useEffect, useRef } from '@wordpress/element';
 import BlockDraggableChip from './draggable-chip';
 import useScrollWhenDragging from './use-scroll-when-dragging';
 import { store as blockEditorStore } from '../../store';
+import { useBlockElement } from '../block-list/use-block-props/use-block-refs';
+import { isDropTargetValid } from '../use-block-drop-zone';
 
 const BlockDraggable = ( {
+	appendToOwnerDocument,
 	children,
 	clientIds,
 	cloneClassname,
+	elementId,
 	onDragStart,
 	onDragEnd,
+	fadeWhenDisabled = false,
+	dragComponent,
 } ) => {
-	const { srcRootClientId, isDraggable, icon } = useSelect(
+	const {
+		srcRootClientId,
+		isDraggable,
+		icon,
+		visibleInserter,
+		getBlockType,
+	} = useSelect(
 		( select ) => {
 			const {
 				canMoveBlocks,
 				getBlockRootClientId,
 				getBlockName,
 				getBlockAttributes,
+				isBlockInsertionPointVisible,
 			} = select( blockEditorStore );
-			const { getBlockType, getActiveBlockVariation } =
+			const { getBlockType: _getBlockType, getActiveBlockVariation } =
 				select( blocksStore );
 			const rootClientId = getBlockRootClientId( clientIds[ 0 ] );
 			const blockName = getBlockName( clientIds[ 0 ] );
@@ -39,28 +53,125 @@ const BlockDraggable = ( {
 
 			return {
 				srcRootClientId: rootClientId,
-				isDraggable: canMoveBlocks( clientIds, rootClientId ),
-				icon: variation?.icon || getBlockType( blockName )?.icon,
+				isDraggable: canMoveBlocks( clientIds ),
+				icon: variation?.icon || _getBlockType( blockName )?.icon,
+				visibleInserter: isBlockInsertionPointVisible(),
+				getBlockType: _getBlockType,
 			};
 		},
 		[ clientIds ]
 	);
-	const isDragging = useRef( false );
+
+	const isDraggingRef = useRef( false );
 	const [ startScrolling, scrollOnDragOver, stopScrolling ] =
 		useScrollWhenDragging();
 
+	const { getAllowedBlocks, getBlockNamesByClientId, getBlockRootClientId } =
+		useSelect( blockEditorStore );
+
 	const { startDraggingBlocks, stopDraggingBlocks } =
 		useDispatch( blockEditorStore );
 
 	// Stop dragging blocks if the block draggable is unmounted.
 	useEffect( () => {
 		return () => {
-			if ( isDragging.current ) {
+			if ( isDraggingRef.current ) {
 				stopDraggingBlocks();
 			}
 		};
 	}, [] );
 
+	// Find the root of the editor iframe.
+	const blockEl = useBlockElement( clientIds[ 0 ] );
+	const editorRoot = blockEl?.closest( 'body' );
+
+	/*
+	 * Add a dragover event listener to the editor root to track the blocks being dragged over.
+	 * The listener has to be inside the editor iframe otherwise the target isn't accessible.
+	 */
+	useEffect( () => {
+		if ( ! editorRoot || ! fadeWhenDisabled ) {
+			return;
+		}
+
+		const onDragOver = ( event ) => {
+			if ( ! event.target.closest( '[data-block]' ) ) {
+				return;
+			}
+			const draggedBlockNames = getBlockNamesByClientId( clientIds );
+			const targetClientId = event.target
+				.closest( '[data-block]' )
+				.getAttribute( 'data-block' );
+
+			const allowedBlocks = getAllowedBlocks( targetClientId );
+			const targetBlockName = getBlockNamesByClientId( [
+				targetClientId,
+			] )[ 0 ];
+
+			/*
+			 * Check if the target is valid to drop in.
+			 * If the target's allowedBlocks is an empty array,
+			 * it isn't a container block, in which case we check
+			 * its parent's validity instead.
+			 */
+			let dropTargetValid;
+			if ( allowedBlocks?.length === 0 ) {
+				const targetRootClientId =
+					getBlockRootClientId( targetClientId );
+				const targetRootBlockName = getBlockNamesByClientId( [
+					targetRootClientId,
+				] )[ 0 ];
+				const rootAllowedBlocks =
+					getAllowedBlocks( targetRootClientId );
+				dropTargetValid = isDropTargetValid(
+					getBlockType,
+					rootAllowedBlocks,
+					draggedBlockNames,
+					targetRootBlockName
+				);
+			} else {
+				dropTargetValid = isDropTargetValid(
+					getBlockType,
+					allowedBlocks,
+					draggedBlockNames,
+					targetBlockName
+				);
+			}
+
+			/*
+			 * Update the body class to reflect if drop target is valid.
+			 * This has to be done on the document body because the draggable
+			 * chip is rendered outside of the editor iframe.
+			 */
+			if ( ! dropTargetValid && ! visibleInserter ) {
+				window?.document?.body?.classList?.add(
+					'block-draggable-invalid-drag-token'
+				);
+			} else {
+				window?.document?.body?.classList?.remove(
+					'block-draggable-invalid-drag-token'
+				);
+			}
+		};
+
+		const throttledOnDragOver = throttle( onDragOver, 200 );
+
+		editorRoot.addEventListener( 'dragover', throttledOnDragOver );
+
+		return () => {
+			editorRoot.removeEventListener( 'dragover', throttledOnDragOver );
+		};
+	}, [
+		clientIds,
+		editorRoot,
+		fadeWhenDisabled,
+		getAllowedBlocks,
+		getBlockNamesByClientId,
+		getBlockRootClientId,
+		getBlockType,
+		visibleInserter,
+	] );
+
 	if ( ! isDraggable ) {
 		return children( { draggable: false } );
 	}
@@ -73,6 +184,7 @@ const BlockDraggable = ( {
 
 	return (
 		<Draggable
+			appendToOwnerDocument={ appendToOwnerDocument }
 			cloneClassname={ cloneClassname }
 			__experimentalTransferDataType="wp-blocks"
 			transferData={ transferData }
@@ -81,7 +193,7 @@ const BlockDraggable = ( {
 				// frame to enable dragging.
 				window.requestAnimationFrame( () => {
 					startDraggingBlocks( clientIds );
-					isDragging.current = true;
+					isDraggingRef.current = true;
 
 					startScrolling( event );
 
@@ -93,7 +205,7 @@ const BlockDraggable = ( {
 			onDragOver={ scrollOnDragOver }
 			onDragEnd={ () => {
 				stopDraggingBlocks();
-				isDragging.current = false;
+				isDraggingRef.current = false;
 
 				stopScrolling();
 
@@ -102,8 +214,19 @@ const BlockDraggable = ( {
 				}
 			} }
 			__experimentalDragComponent={
-				<BlockDraggableChip count={ clientIds.length } icon={ icon } />
+				// Check against `undefined` so that `null` can be used to disable
+				// the default drag component.
+				dragComponent !== undefined ? (
+					dragComponent
+				) : (
+					<BlockDraggableChip
+						count={ clientIds.length }
+						icon={ icon }
+						fadeWhenDisabled
+					/>
+				)
 			}
+			elementId={ elementId }
 		>
 			{ ( { onDraggableStart, onDraggableEnd } ) => {
 				return children( {
diff --git a/packages/block-editor/src/components/block-draggable/index.native.js b/packages/block-editor/src/components/block-draggable/index.native.js
index d153843cae6a40..6128bf0cb179a2 100644
--- a/packages/block-editor/src/components/block-draggable/index.native.js
+++ b/packages/block-editor/src/components/block-draggable/index.native.js
@@ -9,7 +9,6 @@ import {
 import Animated, {
 	runOnJS,
 	runOnUI,
-	useAnimatedRef,
 	useAnimatedStyle,
 	useSharedValue,
 	withDelay,
@@ -39,7 +38,6 @@ import RCTAztecView from '@wordpress/react-native-aztec';
 import useScrollWhenDragging from './use-scroll-when-dragging';
 import DraggableChip from './draggable-chip';
 import { store as blockEditorStore } from '../../store';
-import { useBlockListContext } from '../block-list/block-list-context';
 import DroppingInsertionPoint from './dropping-insertion-point';
 import useBlockDropZone from '../use-block-drop-zone';
 import styles from './style.scss';
@@ -74,13 +72,10 @@ const BlockDraggableWrapper = ( { children, isRTL } ) => {
 	const { selectBlock, startDraggingBlocks, stopDraggingBlocks } =
 		useDispatch( blockEditorStore );
 
-	const { scrollRef } = useBlockListContext();
-	const animatedScrollRef = useAnimatedRef();
 	const { left, right } = useSafeAreaInsets();
 	const { width } = useSafeAreaFrame();
 	const safeAreaOffset = left + right;
 	const contentWidth = width - safeAreaOffset;
-	animatedScrollRef( scrollRef );
 
 	const scroll = {
 		offsetY: useSharedValue( 0 ),
diff --git a/packages/block-editor/src/components/block-draggable/style.scss b/packages/block-editor/src/components/block-draggable/style.scss
index a27d4c4caf2f29..f716f2d32a1d40 100644
--- a/packages/block-editor/src/components/block-draggable/style.scss
+++ b/packages/block-editor/src/components/block-draggable/style.scss
@@ -7,13 +7,14 @@
 
 .block-editor-block-draggable-chip {
 	background-color: $gray-900;
-	border-radius: $radius-block-ui;
-	box-shadow: 0 6px 8px rgba($black, 0.3);
+	border-radius: $radius-small;
+	box-shadow: $elevation-small;
 	color: $white;
 	cursor: grabbing;
 	display: inline-flex;
 	height: $block-toolbar-height;
 	padding: 0 ( $grid-unit-15 + $border-width );
+	position: relative;
 	user-select: none;
 	width: max-content;
 
@@ -45,3 +46,37 @@
 		font-size: $default-font-size;
 	}
 }
+
+// Specificity bump to override native component style.
+.block-editor-block-draggable-chip__disabled.block-editor-block-draggable-chip__disabled {
+	opacity: 0;
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	bottom: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: transparent;
+	transition: all 0.1s linear 0.1s;
+
+	.block-editor-block-draggable-chip__disabled-icon {
+		width: $grid-unit-50 * 0.5;
+		height: $grid-unit-50 * 0.5;
+		box-shadow: inset 0 0 0 1.5px $white;
+		border-radius: 50%;
+		display: inline-block;
+		padding: 0;
+		background: transparent linear-gradient(-45deg, transparent 47.5%, $white 47.5%, $white 52.5%, transparent 52.5%);
+
+	}
+}
+
+.block-draggable-invalid-drag-token {
+	.block-editor-block-draggable-chip__disabled.block-editor-block-draggable-chip__disabled {
+		background-color: $gray-700;
+		opacity: 1;
+		box-shadow: $elevation-small;
+	}
+}
diff --git a/packages/block-editor/src/components/block-draggable/test/helpers.native.js b/packages/block-editor/src/components/block-draggable/test/helpers.native.js
index 1d8e4fbb2afb6d..eb0689c13cfa1c 100644
--- a/packages/block-editor/src/components/block-draggable/test/helpers.native.js
+++ b/packages/block-editor/src/components/block-draggable/test/helpers.native.js
@@ -3,11 +3,12 @@
  */
 import {
 	act,
+	advanceAnimationByFrames,
 	fireEvent,
 	initializeEditor,
+	screen,
 	waitForStoreResolvers,
 	within,
-	advanceAnimationByFrames,
 } from 'test/helpers';
 import { fireGestureHandler } from 'react-native-gesture-handler/jest-utils';
 import { State } from 'react-native-gesture-handler';
@@ -52,15 +53,15 @@ const DEFAULT_TOUCH_EVENTS = [
 export const initializeWithBlocksLayouts = async ( blocks ) => {
 	const initialHtml = blocks.map( ( block ) => block.html ).join( '\n' );
 
-	const screen = await initializeEditor( { initialHtml } );
-	const { getAllByLabelText } = screen;
+	await initializeEditor( { initialHtml } );
 
 	const waitPromises = [];
+	const blockListItems = screen.getAllByTestId( 'block-list-item-cell' );
+	// Check that rendered block list items match expected block count.
+	expect( blockListItems.length ).toBe( blocks.length );
+
 	blocks.forEach( ( block, index ) => {
-		const a11yLabel = new RegExp(
-			`${ block.name } Block\\. Row ${ index + 1 }`
-		);
-		const [ element ] = getAllByLabelText( a11yLabel );
+		const element = blockListItems[ index ];
 		// "onLayout" event will populate the blocks layouts data.
 		fireEvent( element, 'layout', {
 			nativeEvent: { layout: block.layout },
diff --git a/packages/block-editor/src/components/block-draggable/test/index.native.js b/packages/block-editor/src/components/block-draggable/test/index.native.js
index 7f3234b2ba2239..3611f6669ef5d5 100644
--- a/packages/block-editor/src/components/block-draggable/test/index.native.js
+++ b/packages/block-editor/src/components/block-draggable/test/index.native.js
@@ -382,7 +382,7 @@ describe( 'BlockDraggable', () => {
 			// activate the gesture. Since this not available in tests, the library
 			// displays a warning message.
 			expect( console ).toHaveWarnedWith(
-				'[Reanimated] You can not use setGestureState in non-worklet function.'
+				'[Reanimated] setGestureState() cannot be used with Jest.'
 			);
 			expect( getEditorHtml() ).toMatchSnapshot(
 				'Paragraph block moved from first to second position'
@@ -410,7 +410,7 @@ describe( 'BlockDraggable', () => {
 			// activate the gesture. Since this not available in tests, the library
 			// displays a warning message.
 			expect( console ).toHaveWarnedWith(
-				'[Reanimated] You can not use setGestureState in non-worklet function.'
+				'[Reanimated] setGestureState() cannot be used with Jest.'
 			);
 			expect( getEditorHtml() ).toMatchSnapshot(
 				'Spacer block moved from third to first position'
diff --git a/packages/block-editor/src/components/block-draggable/use-scroll-when-dragging.js b/packages/block-editor/src/components/block-draggable/use-scroll-when-dragging.js
index a01db4927b6525..515f3002de9344 100644
--- a/packages/block-editor/src/components/block-draggable/use-scroll-when-dragging.js
+++ b/packages/block-editor/src/components/block-draggable/use-scroll-when-dragging.js
@@ -18,36 +18,36 @@ const VELOCITY_MULTIPLIER =
  *                      and `onDragEnd` events respectively.
  */
 export default function useScrollWhenDragging() {
-	const dragStartY = useRef( null );
-	const velocityY = useRef( null );
-	const scrollParentY = useRef( null );
-	const scrollEditorInterval = useRef( null );
+	const dragStartYRef = useRef( null );
+	const velocityYRef = useRef( null );
+	const scrollParentYRef = useRef( null );
+	const scrollEditorIntervalRef = useRef( null );
 
 	// Clear interval when unmounting.
 	useEffect(
 		() => () => {
-			if ( scrollEditorInterval.current ) {
-				clearInterval( scrollEditorInterval.current );
-				scrollEditorInterval.current = null;
+			if ( scrollEditorIntervalRef.current ) {
+				clearInterval( scrollEditorIntervalRef.current );
+				scrollEditorIntervalRef.current = null;
 			}
 		},
 		[]
 	);
 
 	const startScrolling = useCallback( ( event ) => {
-		dragStartY.current = event.clientY;
+		dragStartYRef.current = event.clientY;
 
 		// Find nearest parent(s) to scroll.
-		scrollParentY.current = getScrollContainer( event.target );
+		scrollParentYRef.current = getScrollContainer( event.target );
 
-		scrollEditorInterval.current = setInterval( () => {
-			if ( scrollParentY.current && velocityY.current ) {
+		scrollEditorIntervalRef.current = setInterval( () => {
+			if ( scrollParentYRef.current && velocityYRef.current ) {
 				const newTop =
-					scrollParentY.current.scrollTop + velocityY.current;
+					scrollParentYRef.current.scrollTop + velocityYRef.current;
 
 				// Setting `behavior: 'smooth'` as a scroll property seems to hurt performance.
 				// Better to use a small scroll interval.
-				scrollParentY.current.scroll( {
+				scrollParentYRef.current.scroll( {
 					top: newTop,
 				} );
 			}
@@ -55,14 +55,14 @@ export default function useScrollWhenDragging() {
 	}, [] );
 
 	const scrollOnDragOver = useCallback( ( event ) => {
-		if ( ! scrollParentY.current ) {
+		if ( ! scrollParentYRef.current ) {
 			return;
 		}
-		const scrollParentHeight = scrollParentY.current.offsetHeight;
+		const scrollParentHeight = scrollParentYRef.current.offsetHeight;
 		const offsetDragStartPosition =
-			dragStartY.current - scrollParentY.current.offsetTop;
+			dragStartYRef.current - scrollParentYRef.current.offsetTop;
 		const offsetDragPosition =
-			event.clientY - scrollParentY.current.offsetTop;
+			event.clientY - scrollParentYRef.current.offsetTop;
 
 		if ( event.clientY > offsetDragStartPosition ) {
 			// User is dragging downwards.
@@ -82,7 +82,7 @@ export default function useScrollWhenDragging() {
 				moveableDistance === 0 || dragDistance === 0
 					? 0
 					: dragDistance / moveableDistance;
-			velocityY.current = VELOCITY_MULTIPLIER * distancePercentage;
+			velocityYRef.current = VELOCITY_MULTIPLIER * distancePercentage;
 		} else if ( event.clientY < offsetDragStartPosition ) {
 			// User is dragging upwards.
 			const moveableDistance = Math.max(
@@ -99,19 +99,19 @@ export default function useScrollWhenDragging() {
 				moveableDistance === 0 || dragDistance === 0
 					? 0
 					: dragDistance / moveableDistance;
-			velocityY.current = -VELOCITY_MULTIPLIER * distancePercentage;
+			velocityYRef.current = -VELOCITY_MULTIPLIER * distancePercentage;
 		} else {
-			velocityY.current = 0;
+			velocityYRef.current = 0;
 		}
 	}, [] );
 
 	const stopScrolling = () => {
-		dragStartY.current = null;
-		scrollParentY.current = null;
+		dragStartYRef.current = null;
+		scrollParentYRef.current = null;
 
-		if ( scrollEditorInterval.current ) {
-			clearInterval( scrollEditorInterval.current );
-			scrollEditorInterval.current = null;
+		if ( scrollEditorIntervalRef.current ) {
+			clearInterval( scrollEditorIntervalRef.current );
+			scrollEditorIntervalRef.current = null;
 		}
 	};
 
diff --git a/packages/block-editor/src/components/block-draggable/use-scroll-when-dragging.native.js b/packages/block-editor/src/components/block-draggable/use-scroll-when-dragging.native.js
index ef5c437206bbd1..75e6c04ffa33b2 100644
--- a/packages/block-editor/src/components/block-draggable/use-scroll-when-dragging.native.js
+++ b/packages/block-editor/src/components/block-draggable/use-scroll-when-dragging.native.js
@@ -34,7 +34,7 @@ const VELOCITY_MULTIPLIER = 5000;
 export default function useScrollWhenDragging() {
 	const { scrollRef } = useBlockListContext();
 	const animatedScrollRef = useAnimatedRef();
-	animatedScrollRef( scrollRef );
+	animatedScrollRef( scrollRef?.scrollViewRef );
 
 	const { height: windowHeight } = useWindowDimensions();
 
diff --git a/packages/block-editor/src/components/block-edit/context.js b/packages/block-editor/src/components/block-edit/context.js
index d8b9c829484102..6bb1861abd0a2b 100644
--- a/packages/block-editor/src/components/block-edit/context.js
+++ b/packages/block-editor/src/components/block-edit/context.js
@@ -3,6 +3,12 @@
  */
 import { createContext, useContext } from '@wordpress/element';
 
+export const mayDisplayControlsKey = Symbol( 'mayDisplayControls' );
+export const mayDisplayParentControlsKey = Symbol( 'mayDisplayParentControls' );
+export const blockEditingModeKey = Symbol( 'blockEditingMode' );
+export const blockBindingsKey = Symbol( 'blockBindings' );
+export const isPreviewModeKey = Symbol( 'isPreviewMode' );
+
 export const DEFAULT_BLOCK_EDIT_CONTEXT = {
 	name: '',
 	isSelected: false,
diff --git a/packages/block-editor/src/components/block-edit/edit.js b/packages/block-editor/src/components/block-edit/edit.js
index 31344b54337935..83d0e3f406f829 100644
--- a/packages/block-editor/src/components/block-edit/edit.js
+++ b/packages/block-editor/src/components/block-edit/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -75,7 +75,7 @@ const EditWithGeneratedProps = ( props ) => {
 	const generatedClassName = hasBlockSupport( blockType, 'className', true )
 		? getBlockDefaultClassName( name )
 		: null;
-	const className = classnames(
+	const className = clsx(
 		generatedClassName,
 		attributes.className,
 		props.className
diff --git a/packages/block-editor/src/components/block-edit/index.js b/packages/block-editor/src/components/block-edit/index.js
index 6faefbc6261929..0c29c0e98b1bfd 100644
--- a/packages/block-editor/src/components/block-edit/index.js
+++ b/packages/block-editor/src/components/block-edit/index.js
@@ -1,14 +1,24 @@
 /**
  * WordPress dependencies
  */
-import { useMemo } from '@wordpress/element';
-
+import { useMemo, useContext } from '@wordpress/element';
 import { hasBlockSupport } from '@wordpress/blocks';
+
 /**
  * Internal dependencies
  */
 import Edit from './edit';
-import { BlockEditContextProvider, useBlockEditContext } from './context';
+import {
+	BlockEditContextProvider,
+	useBlockEditContext,
+	mayDisplayControlsKey,
+	mayDisplayParentControlsKey,
+	blockEditingModeKey,
+	blockBindingsKey,
+	isPreviewModeKey,
+} from './context';
+import { MultipleUsageWarning } from './multiple-usage-warning';
+import { PrivateBlockContext } from '../block-list/private-block-context';
 
 /**
  * The `useBlockEditContext` hook provides information about the block this hook is being used in.
@@ -20,7 +30,15 @@ import { BlockEditContextProvider, useBlockEditContext } from './context';
  */
 export { useBlockEditContext };
 
-export default function BlockEdit( props ) {
+export default function BlockEdit( {
+	mayDisplayControls,
+	mayDisplayParentControls,
+	blockEditingMode,
+	isPreviewMode,
+	// The remaining props are passed through the BlockEdit filters and are thus
+	// public API!
+	...props
+} ) {
 	const {
 		name,
 		isSelected,
@@ -28,25 +46,56 @@ export default function BlockEdit( props ) {
 		attributes = {},
 		__unstableLayoutClassNames,
 	} = props;
-	const { layout = null } = attributes;
+	const { layout = null, metadata = {} } = attributes;
+	const { bindings } = metadata;
 	const layoutSupport =
 		hasBlockSupport( name, 'layout', false ) ||
 		hasBlockSupport( name, '__experimentalLayout', false );
-	const context = {
-		name,
-		isSelected,
-		clientId,
-		layout: layoutSupport ? layout : null,
-		__unstableLayoutClassNames,
-	};
+	const { originalBlockClientId } = useContext( PrivateBlockContext );
+
 	return (
 		<BlockEditContextProvider
 			// It is important to return the same object if props haven't
 			// changed to avoid  unnecessary rerenders.
 			// See https://reactjs.org/docs/context.html#caveats.
-			value={ useMemo( () => context, Object.values( context ) ) }
+			value={ useMemo(
+				() => ( {
+					name,
+					isSelected,
+					clientId,
+					layout: layoutSupport ? layout : null,
+					__unstableLayoutClassNames,
+					// We use symbols in favour of an __unstable prefix to avoid
+					// usage outside of the package (this context is exposed).
+					[ mayDisplayControlsKey ]: mayDisplayControls,
+					[ mayDisplayParentControlsKey ]: mayDisplayParentControls,
+					[ blockEditingModeKey ]: blockEditingMode,
+					[ blockBindingsKey ]: bindings,
+					[ isPreviewModeKey ]: isPreviewMode,
+				} ),
+				[
+					name,
+					isSelected,
+					clientId,
+					layoutSupport,
+					layout,
+					__unstableLayoutClassNames,
+					mayDisplayControls,
+					mayDisplayParentControls,
+					blockEditingMode,
+					bindings,
+					isPreviewMode,
+				]
+			) }
 		>
 			<Edit { ...props } />
+			{ originalBlockClientId && (
+				<MultipleUsageWarning
+					originalBlockClientId={ originalBlockClientId }
+					name={ name }
+					onReplace={ props.onReplace }
+				/>
+			) }
 		</BlockEditContextProvider>
 	);
 }
diff --git a/packages/block-editor/src/components/block-edit/multiple-usage-warning.js b/packages/block-editor/src/components/block-edit/multiple-usage-warning.js
new file mode 100644
index 00000000000000..ac83b0e5c11315
--- /dev/null
+++ b/packages/block-editor/src/components/block-edit/multiple-usage-warning.js
@@ -0,0 +1,48 @@
+/**
+ * WordPress dependencies
+ */
+import { getBlockType } from '@wordpress/blocks';
+import { Button } from '@wordpress/components';
+import { useDispatch } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import Warning from '../warning';
+
+export function MultipleUsageWarning( {
+	originalBlockClientId,
+	name,
+	onReplace,
+} ) {
+	const { selectBlock } = useDispatch( blockEditorStore );
+	const blockType = getBlockType( name );
+
+	return (
+		<Warning
+			actions={ [
+				<Button
+					__next40pxDefaultSize
+					key="find-original"
+					variant="secondary"
+					onClick={ () => selectBlock( originalBlockClientId ) }
+				>
+					{ __( 'Find original' ) }
+				</Button>,
+				<Button
+					__next40pxDefaultSize
+					key="remove"
+					variant="secondary"
+					onClick={ () => onReplace( [] ) }
+				>
+					{ __( 'Remove' ) }
+				</Button>,
+			] }
+		>
+			<strong>{ blockType?.title }: </strong>
+			{ __( 'This block can only be used once.' ) }
+		</Warning>
+	);
+}
diff --git a/packages/block-editor/src/components/block-editing-mode/index.js b/packages/block-editor/src/components/block-editing-mode/index.js
index 5d916d9816e606..7cb500af1e9c05 100644
--- a/packages/block-editor/src/components/block-editing-mode/index.js
+++ b/packages/block-editor/src/components/block-editing-mode/index.js
@@ -2,13 +2,16 @@
  * WordPress dependencies
  */
 import { useSelect, useDispatch } from '@wordpress/data';
-import { useContext, useEffect } from '@wordpress/element';
+import { useEffect } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-import { BlockListBlockContext } from '../block-list/block-list-block-context';
+import {
+	useBlockEditContext,
+	blockEditingModeKey,
+} from '../block-edit/context';
 
 /**
  * @typedef {'disabled'|'contentOnly'|'default'} BlockEditingMode
@@ -45,14 +48,16 @@ import { BlockListBlockContext } from '../block-list/block-list-block-context';
  * @return {BlockEditingMode} The current editing mode.
  */
 export function useBlockEditingMode( mode ) {
-	const { clientId = '' } = useContext( BlockListBlockContext ) ?? {};
-	const blockEditingMode = useSelect(
+	const context = useBlockEditContext();
+	const { clientId = '' } = context;
+	const { setBlockEditingMode, unsetBlockEditingMode } =
+		useDispatch( blockEditorStore );
+	const globalBlockEditingMode = useSelect(
 		( select ) =>
-			select( blockEditorStore ).getBlockEditingMode( clientId ),
+			// Avoid adding the subscription if not needed!
+			clientId ? null : select( blockEditorStore ).getBlockEditingMode(),
 		[ clientId ]
 	);
-	const { setBlockEditingMode, unsetBlockEditingMode } =
-		useDispatch( blockEditorStore );
 	useEffect( () => {
 		if ( mode ) {
 			setBlockEditingMode( clientId, mode );
@@ -63,5 +68,5 @@ export function useBlockEditingMode( mode ) {
 			}
 		};
 	}, [ clientId, mode, setBlockEditingMode, unsetBlockEditingMode ] );
-	return blockEditingMode;
+	return clientId ? context[ blockEditingModeKey ] : globalBlockEditingMode;
 }
diff --git a/packages/block-editor/src/components/block-heading-level-dropdown/README.md b/packages/block-editor/src/components/block-heading-level-dropdown/README.md
index 8e0676669b66aa..b718bf6b25339d 100644
--- a/packages/block-editor/src/components/block-heading-level-dropdown/README.md
+++ b/packages/block-editor/src/components/block-heading-level-dropdown/README.md
@@ -28,23 +28,23 @@ const MyHeadingLevelToolbar = () => (
 
 #### options
 
-The list of available HTML tags, passed from the block.
+The list of available heading levels, passed from the block.
 
 -   Type: `Object`
 -   Required: no
 
 #### value
 
-The chosen HTML tag.
+The chosen heading level.
 
--   Type: `string`
+-   Type: `number`
 -   Required: no
 
 #### onChange
 
-Callback to run when toolbar value is changed.
+Function called with the selected value changes.
 
--   Type: `string`
+-   Type: `() => number`
 -   Required: yes
 
 ## Related components
diff --git a/packages/block-editor/src/components/block-heading-level-dropdown/index.js b/packages/block-editor/src/components/block-heading-level-dropdown/index.js
index a8296d48ad2683..6b9bad09978a50 100644
--- a/packages/block-editor/src/components/block-heading-level-dropdown/index.js
+++ b/packages/block-editor/src/components/block-heading-level-dropdown/index.js
@@ -22,10 +22,10 @@ const POPOVER_PROPS = {
  *
  * @typedef WPHeadingLevelDropdownProps
  *
- * @property {number}                 value    The chosen heading level.
- * @property {number[]}               options  An array of supported heading levels.
- * @property {(newValue:number)=>any} onChange Callback to run when
- *                                             toolbar value is changed.
+ * @property {number}     value    The chosen heading level.
+ * @property {number[]}   options  An array of supported heading levels.
+ * @property {()=>number} onChange Function called with
+ *                                 the selected value changes.
  */
 
 /**
@@ -40,37 +40,35 @@ export default function HeadingLevelDropdown( {
 	value,
 	onChange,
 } ) {
+	const validOptions = options
+		.filter(
+			( option ) => option === 0 || HEADING_LEVELS.includes( option )
+		)
+		.sort( ( a, b ) => a - b ); // Sorts numerically in ascending order;
+
 	return (
 		<ToolbarDropdownMenu
 			popoverProps={ POPOVER_PROPS }
 			icon={ <HeadingLevelIcon level={ value } /> }
 			label={ __( 'Change level' ) }
-			controls={ options.map( ( targetLevel ) => {
-				{
-					const isActive = targetLevel === value;
-
-					return {
-						icon: (
-							<HeadingLevelIcon
-								level={ targetLevel }
-								isPressed={ isActive }
-							/>
-						),
-						title:
-							targetLevel === 0
-								? __( 'Paragraph' )
-								: sprintf(
-										// translators: %s: heading level e.g: "1", "2", "3"
-										__( 'Heading %d' ),
-										targetLevel
-								  ),
-						isActive,
-						onClick() {
-							onChange( targetLevel );
-						},
-						role: 'menuitemradio',
-					};
-				}
+			controls={ validOptions.map( ( targetLevel ) => {
+				const isActive = targetLevel === value;
+				return {
+					icon: <HeadingLevelIcon level={ targetLevel } />,
+					title:
+						targetLevel === 0
+							? __( 'Paragraph' )
+							: sprintf(
+									// translators: %d: heading level e.g: "1", "2", "3"
+									__( 'Heading %d' ),
+									targetLevel
+							  ),
+					isActive,
+					onClick() {
+						onChange( targetLevel );
+					},
+					role: 'menuitemradio',
+				};
 			} ) }
 		/>
 	);
diff --git a/packages/block-editor/src/components/block-heading-level-dropdown/index.native.js b/packages/block-editor/src/components/block-heading-level-dropdown/index.native.js
index 25516da29cf106..d1a87fe542d41f 100644
--- a/packages/block-editor/src/components/block-heading-level-dropdown/index.native.js
+++ b/packages/block-editor/src/components/block-heading-level-dropdown/index.native.js
@@ -18,9 +18,10 @@ const HEADING_LEVELS = [ 1, 2, 3, 4, 5, 6 ];
  *
  * @typedef WPHeadingLevelDropdownProps
  *
- * @property {number}                 selectedLevel The chosen heading level.
- * @property {(newValue:number)=>any} onChange      Callback to run when
- *                                                  toolbar value is changed.
+ * @property {number}     value    The chosen heading level.
+ * @property {number[]}   options  An array of supported heading levels.
+ * @property {()=>number} onChange Function called with
+ *                                 the selected value changes.
  */
 
 /**
@@ -48,7 +49,7 @@ export default function HeadingLevelDropdown( {
 					isPressed={ isActive }
 				/>
 			),
-			// translators: %s: heading level e.g: "1", "2", "3"
+			// translators: %d: heading level e.g: "1", "2", "3"
 			title: sprintf( __( 'Heading %d' ), targetLevel ),
 			isActive,
 			onClick: () => onChangeCallback( targetLevel ),
diff --git a/packages/block-editor/src/components/block-icon/README.md b/packages/block-editor/src/components/block-icon/README.md
index 4d7178032b366f..638d7956831988 100644
--- a/packages/block-editor/src/components/block-icon/README.md
+++ b/packages/block-editor/src/components/block-icon/README.md
@@ -6,11 +6,6 @@ The rendered an [Icon](https://github.com/WordPress/gutenberg/tree/HEAD/packages
 
 ![Image block icons in various places](https://make.wordpress.org/core/files/2020/08/image-block-icons-in-various-places.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-icon/index.js b/packages/block-editor/src/components/block-icon/index.js
index 58d7b3a04adb9e..023a903d39cb6c 100644
--- a/packages/block-editor/src/components/block-icon/index.js
+++ b/packages/block-editor/src/components/block-icon/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -30,7 +30,7 @@ function BlockIcon( { icon, showColors = false, className, context } ) {
 	return (
 		<span
 			style={ style }
-			className={ classnames( 'block-editor-block-icon', className, {
+			className={ clsx( 'block-editor-block-icon', className, {
 				'has-colors': showColors,
 			} ) }
 		>
diff --git a/packages/block-editor/src/components/block-info-slot-fill/index.js b/packages/block-editor/src/components/block-info-slot-fill/index.js
index db7919b6ef5eab..8c9503313d754c 100644
--- a/packages/block-editor/src/components/block-info-slot-fill/index.js
+++ b/packages/block-editor/src/components/block-info-slot-fill/index.js
@@ -7,14 +7,17 @@ import { privateApis as componentsPrivateApis } from '@wordpress/components';
  * Internal dependencies
  */
 import { unlock } from '../../lock-unlock';
-import useDisplayBlockControls from '../use-display-block-controls';
+import {
+	useBlockEditContext,
+	mayDisplayControlsKey,
+} from '../block-edit/context';
 
 const { createPrivateSlotFill } = unlock( componentsPrivateApis );
 const { Fill, Slot } = createPrivateSlotFill( 'BlockInformation' );
 
 const BlockInfo = ( props ) => {
-	const isDisplayed = useDisplayBlockControls();
-	if ( ! isDisplayed ) {
+	const context = useBlockEditContext();
+	if ( ! context[ mayDisplayControlsKey ] ) {
 		return null;
 	}
 	return <Fill { ...props } />;
diff --git a/packages/block-editor/src/components/block-inspector/README.md b/packages/block-editor/src/components/block-inspector/README.md
index 1f9d52482eb210..4c2fd2a06a61bf 100644
--- a/packages/block-editor/src/components/block-inspector/README.md
+++ b/packages/block-editor/src/components/block-inspector/README.md
@@ -4,11 +4,6 @@ The Block inspector is one of the panels that is displayed in the editor; it is
 
 ![Paragraph block inspector](https://make.wordpress.org/core/files/2020/08/paragraph-block-inspector.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js
index 18cd72cde057dc..475d4f6a4b8c2e 100644
--- a/packages/block-editor/src/components/block-inspector/index.js
+++ b/packages/block-editor/src/components/block-inspector/index.js
@@ -5,7 +5,6 @@ import { __ } from '@wordpress/i18n';
 import {
 	getBlockType,
 	getUnregisteredTypeHandlerName,
-	hasBlockSupport,
 	store as blocksStore,
 } from '@wordpress/blocks';
 import { PanelBody, __unstableMotion as motion } from '@wordpress/components';
@@ -21,7 +20,6 @@ import BlockVariationTransforms from '../block-variation-transforms';
 import useBlockDisplayInformation from '../use-block-display-information';
 import { store as blockEditorStore } from '../../store';
 import BlockStyles from '../block-styles';
-import DefaultStylePicker from '../default-style-picker';
 import { default as InspectorControls } from '../inspector-controls';
 import { default as InspectorControlsTabs } from '../inspector-controls-tabs';
 import useInspectorControlsTabs from '../inspector-controls-tabs/use-inspector-controls-tabs';
@@ -30,36 +28,15 @@ import PositionControls from '../inspector-controls-tabs/position-controls-panel
 import useBlockInspectorAnimationSettings from './useBlockInspectorAnimationSettings';
 import BlockInfo from '../block-info-slot-fill';
 import BlockQuickNavigation from '../block-quick-navigation';
+import { useBorderPanelLabel } from '../../hooks/border';
 
-function BlockInspectorLockedBlocks( { topLevelLockedBlock } ) {
-	const contentClientIds = useSelect(
-		( select ) => {
-			const {
-				getClientIdsOfDescendants,
-				getBlockName,
-				getBlockEditingMode,
-			} = select( blockEditorStore );
-			return getClientIdsOfDescendants( topLevelLockedBlock ).filter(
-				( clientId ) =>
-					getBlockName( clientId ) !== 'core/list-item' &&
-					getBlockEditingMode( clientId ) === 'contentOnly'
-			);
-		},
-		[ topLevelLockedBlock ]
-	);
-	const blockInformation = useBlockDisplayInformation( topLevelLockedBlock );
+import { unlock } from '../../lock-unlock';
+
+function BlockStylesPanel( { clientId } ) {
 	return (
-		<div className="block-editor-block-inspector">
-			<BlockCard
-				{ ...blockInformation }
-				className={ blockInformation.isSynced && 'is-synced' }
-			/>
-			<BlockVariationTransforms blockClientId={ topLevelLockedBlock } />
-			<BlockInfo.Slot />
-			<PanelBody title={ __( 'Content' ) }>
-				<BlockQuickNavigation clientIds={ contentClientIds } />
-			</PanelBody>
-		</div>
+		<PanelBody title={ __( 'Styles' ) }>
+			<BlockStyles clientId={ clientId } />
+		</PanelBody>
 	);
 }
 
@@ -69,32 +46,30 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 		selectedBlockName,
 		selectedBlockClientId,
 		blockType,
-		topLevelLockedBlock,
+		isSectionBlock,
 	} = useSelect( ( select ) => {
 		const {
 			getSelectedBlockClientId,
 			getSelectedBlockCount,
 			getBlockName,
-			__unstableGetContentLockingParent,
-			getTemplateLock,
-		} = select( blockEditorStore );
-
+			getParentSectionBlock,
+			isSectionBlock: _isSectionBlock,
+		} = unlock( select( blockEditorStore ) );
 		const _selectedBlockClientId = getSelectedBlockClientId();
+		const renderedBlockClientId =
+			getParentSectionBlock( _selectedBlockClientId ) ||
+			getSelectedBlockClientId();
 		const _selectedBlockName =
-			_selectedBlockClientId && getBlockName( _selectedBlockClientId );
+			renderedBlockClientId && getBlockName( renderedBlockClientId );
 		const _blockType =
 			_selectedBlockName && getBlockType( _selectedBlockName );
 
 		return {
 			count: getSelectedBlockCount(),
-			selectedBlockClientId: _selectedBlockClientId,
+			selectedBlockClientId: renderedBlockClientId,
 			selectedBlockName: _selectedBlockName,
 			blockType: _blockType,
-			topLevelLockedBlock:
-				__unstableGetContentLockingParent( _selectedBlockClientId ) ||
-				( getTemplateLock( _selectedBlockClientId ) === 'contentOnly'
-					? _selectedBlockClientId
-					: undefined ),
+			isSectionBlock: _isSectionBlock( renderedBlockClientId ),
 		};
 	}, [] );
 
@@ -107,12 +82,14 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 	// displays based on the relationship between the selected block
 	// and its parent, and only enable it if the parent is controlling
 	// its children blocks.
-	const blockInspectorAnimationSettings = useBlockInspectorAnimationSettings(
-		blockType,
-		selectedBlockClientId
-	);
+	const blockInspectorAnimationSettings =
+		useBlockInspectorAnimationSettings( blockType );
 
-	if ( count > 1 ) {
+	const borderPanelLabel = useBorderPanelLabel( {
+		blockName: selectedBlockName,
+	} );
+
+	if ( count > 1 && ! isSectionBlock ) {
 		return (
 			<div className="block-editor-block-inspector">
 				<MultiSelectionInspector />
@@ -126,6 +103,10 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 							label={ __( 'Color' ) }
 							className="color-block-support-panel__inner-wrapper"
 						/>
+						<InspectorControls.Slot
+							group="background"
+							label={ __( 'Background image' ) }
+						/>
 						<InspectorControls.Slot
 							group="typography"
 							label={ __( 'Typography' ) }
@@ -136,7 +117,7 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 						/>
 						<InspectorControls.Slot
 							group="border"
-							label={ __( 'Border' ) }
+							label={ borderPanelLabel }
 						/>
 						<InspectorControls.Slot group="styles" />
 					</>
@@ -166,13 +147,6 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 		}
 		return null;
 	}
-	if ( topLevelLockedBlock ) {
-		return (
-			<BlockInspectorLockedBlocks
-				topLevelLockedBlock={ topLevelLockedBlock }
-			/>
-		);
-	}
 
 	return (
 		<BlockInspectorSingleBlockWrapper
@@ -191,6 +165,7 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 			<BlockInspectorSingleBlock
 				clientId={ selectedBlockClientId }
 				blockName={ blockType.name }
+				isSectionBlock={ isSectionBlock }
 			/>
 		</BlockInspectorSingleBlockWrapper>
 	);
@@ -232,9 +207,13 @@ const AnimatedContainer = ( {
 	);
 };
 
-const BlockInspectorSingleBlock = ( { clientId, blockName } ) => {
+const BlockInspectorSingleBlock = ( {
+	clientId,
+	blockName,
+	isSectionBlock,
+} ) => {
 	const availableTabs = useInspectorControlsTabs( blockName );
-	const showTabs = availableTabs?.length > 1;
+	const showTabs = ! isSectionBlock && availableTabs?.length > 1;
 
 	const hasBlockStyles = useSelect(
 		( select ) => {
@@ -245,6 +224,27 @@ const BlockInspectorSingleBlock = ( { clientId, blockName } ) => {
 		[ blockName ]
 	);
 	const blockInformation = useBlockDisplayInformation( clientId );
+	const borderPanelLabel = useBorderPanelLabel( { blockName } );
+	const contentClientIds = useSelect(
+		( select ) => {
+			// Avoid unnecessary subscription.
+			if ( ! isSectionBlock ) {
+				return;
+			}
+
+			const {
+				getClientIdsOfDescendants,
+				getBlockName,
+				getBlockEditingMode,
+			} = select( blockEditorStore );
+			return getClientIdsOfDescendants( clientId ).filter(
+				( current ) =>
+					getBlockName( current ) !== 'core/list-item' &&
+					getBlockEditingMode( current ) === 'contentOnly'
+			);
+		},
+		[ isSectionBlock, clientId ]
+	);
 
 	return (
 		<div className="block-editor-block-inspector">
@@ -265,49 +265,50 @@ const BlockInspectorSingleBlock = ( { clientId, blockName } ) => {
 			{ ! showTabs && (
 				<>
 					{ hasBlockStyles && (
-						<div>
-							<PanelBody title={ __( 'Styles' ) }>
-								<BlockStyles clientId={ clientId } />
-								{ hasBlockSupport(
-									blockName,
-									'defaultStylePicker',
-									true
-								) && (
-									<DefaultStylePicker
-										blockName={ blockName }
-									/>
-								) }
-							</PanelBody>
-						</div>
+						<BlockStylesPanel clientId={ clientId } />
+					) }
+
+					{ contentClientIds && contentClientIds?.length > 0 && (
+						<PanelBody title={ __( 'Content' ) }>
+							<BlockQuickNavigation
+								clientIds={ contentClientIds }
+							/>
+						</PanelBody>
+					) }
+
+					{ ! isSectionBlock && (
+						<>
+							<InspectorControls.Slot />
+							<InspectorControls.Slot group="list" />
+							<InspectorControls.Slot
+								group="color"
+								label={ __( 'Color' ) }
+								className="color-block-support-panel__inner-wrapper"
+							/>
+							<InspectorControls.Slot
+								group="background"
+								label={ __( 'Background image' ) }
+							/>
+							<InspectorControls.Slot
+								group="typography"
+								label={ __( 'Typography' ) }
+							/>
+							<InspectorControls.Slot
+								group="dimensions"
+								label={ __( 'Dimensions' ) }
+							/>
+							<InspectorControls.Slot
+								group="border"
+								label={ borderPanelLabel }
+							/>
+							<InspectorControls.Slot group="styles" />
+							<PositionControls />
+							<InspectorControls.Slot group="bindings" />
+							<div>
+								<AdvancedControls />
+							</div>
+						</>
 					) }
-					<InspectorControls.Slot />
-					<InspectorControls.Slot group="list" />
-					<InspectorControls.Slot
-						group="color"
-						label={ __( 'Color' ) }
-						className="color-block-support-panel__inner-wrapper"
-					/>
-					<InspectorControls.Slot
-						group="typography"
-						label={ __( 'Typography' ) }
-					/>
-					<InspectorControls.Slot
-						group="dimensions"
-						label={ __( 'Dimensions' ) }
-					/>
-					<InspectorControls.Slot
-						group="border"
-						label={ __( 'Border' ) }
-					/>
-					<InspectorControls.Slot group="styles" />
-					<InspectorControls.Slot
-						group="background"
-						label={ __( 'Background' ) }
-					/>
-					<PositionControls />
-					<div>
-						<AdvancedControls />
-					</div>
 				</>
 			) }
 			<SkipToSelectedBlock key="back" />
diff --git a/packages/block-editor/src/components/block-inspector/style.scss b/packages/block-editor/src/components/block-inspector/style.scss
index cf7131722722c1..e04dfd8e9a480a 100644
--- a/packages/block-editor/src/components/block-inspector/style.scss
+++ b/packages/block-editor/src/components/block-inspector/style.scss
@@ -11,10 +11,8 @@
 	}
 
 	.components-base-control {
-		margin-bottom: #{ $grid-unit-30 };
-
-		&:last-child {
-			margin-bottom: $grid-unit-10;
+		&:where(:not(:last-child)) {
+			margin-bottom: $grid-unit-20;
 		}
 	}
 
@@ -48,7 +46,3 @@
 .block-editor-block-inspector__no-block-tools {
 	border-top: $border-width solid $gray-300;
 }
-
-.block-editor-block-inspector__tab-item {
-	flex: 1 1 0px;
-}
diff --git a/packages/block-editor/src/components/block-inspector/useBlockInspectorAnimationSettings.js b/packages/block-editor/src/components/block-inspector/useBlockInspectorAnimationSettings.js
index 6be7d3fe18667e..d89639c4b9ac8c 100644
--- a/packages/block-editor/src/components/block-inspector/useBlockInspectorAnimationSettings.js
+++ b/packages/block-editor/src/components/block-inspector/useBlockInspectorAnimationSettings.js
@@ -8,10 +8,7 @@ import { useSelect } from '@wordpress/data';
  */
 import { store as blockEditorStore } from '../../store';
 
-export default function useBlockInspectorAnimationSettings(
-	blockType,
-	selectedBlockClientId
-) {
+export default function useBlockInspectorAnimationSettings( blockType ) {
 	return useSelect(
 		( select ) => {
 			if ( blockType ) {
@@ -48,6 +45,6 @@ export default function useBlockInspectorAnimationSettings(
 			}
 			return null;
 		},
-		[ selectedBlockClientId, blockType ]
+		[ blockType ]
 	);
 }
diff --git a/packages/block-editor/src/components/block-list-appender/index.js b/packages/block-editor/src/components/block-list-appender/index.js
index 68f36f7dd25058..4c65ead6b4e62c 100644
--- a/packages/block-editor/src/components/block-list-appender/index.js
+++ b/packages/block-editor/src/components/block-list-appender/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -39,77 +39,12 @@ function DefaultAppender( { rootClientId } ) {
 	);
 }
 
-function useAppender( rootClientId, CustomAppender ) {
-	const isVisible = useSelect(
-		( select ) => {
-			const {
-				getTemplateLock,
-				getSelectedBlockClientId,
-				__unstableGetEditorMode,
-				getBlockEditingMode,
-			} = select( blockEditorStore );
-
-			if ( ! CustomAppender ) {
-				const selectedBlockClientId = getSelectedBlockClientId();
-				const isParentSelected =
-					rootClientId === selectedBlockClientId ||
-					( ! rootClientId && ! selectedBlockClientId );
-				if ( ! isParentSelected ) {
-					return false;
-				}
-			}
-
-			if (
-				getTemplateLock( rootClientId ) ||
-				getBlockEditingMode( rootClientId ) === 'disabled' ||
-				__unstableGetEditorMode() === 'zoom-out'
-			) {
-				return false;
-			}
-
-			return true;
-		},
-		[ rootClientId, CustomAppender ]
-	);
-
-	if ( ! isVisible ) {
-		return null;
-	}
-
-	return CustomAppender ? (
-		<CustomAppender />
-	) : (
-		<DefaultAppender rootClientId={ rootClientId } />
-	);
-}
-
-function BlockListAppender( {
+export default function BlockListAppender( {
 	rootClientId,
-	renderAppender,
+	CustomAppender,
 	className,
 	tagName: TagName = 'div',
 } ) {
-	if ( renderAppender === false ) {
-		return null;
-	}
-
-	return (
-		<BlockListAppenderInner
-			rootClientId={ rootClientId }
-			renderAppender={ renderAppender }
-			className={ className }
-			tagName={ TagName }
-		/>
-	);
-}
-
-function BlockListAppenderInner( {
-	rootClientId,
-	renderAppender,
-	className,
-	tagName: TagName,
-} ) {
-	const appender = useAppender( rootClientId, renderAppender );
 	const isDragOver = useSelect(
 		( select ) => {
 			const {
@@ -130,10 +65,6 @@ function BlockListAppenderInner( {
 		[ rootClientId ]
 	);
 
-	if ( ! appender ) {
-		return null;
-	}
-
 	return (
 		<TagName
 			// A `tabIndex` is used on the wrapping `div` element in order to
@@ -145,7 +76,7 @@ function BlockListAppenderInner( {
 			//
 			// See: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#Clicking_and_focus
 			tabIndex={ -1 }
-			className={ classnames( 'block-list-appender wp-block', className, {
+			className={ clsx( 'block-list-appender wp-block', className, {
 				'is-drag-over': isDragOver,
 			} ) }
 			// Needed in case the whole editor is content editable (for multi
@@ -162,9 +93,11 @@ function BlockListAppenderInner( {
 			// have commonly targeted that attribute for margins.
 			data-block
 		>
-			{ appender }
+			{ CustomAppender ? (
+				<CustomAppender />
+			) : (
+				<DefaultAppender rootClientId={ rootClientId } />
+			) }
 		</TagName>
 	);
 }
-
-export default BlockListAppender;
diff --git a/packages/block-editor/src/components/block-list/block-crash-boundary.native.js b/packages/block-editor/src/components/block-list/block-crash-boundary.native.js
new file mode 100644
index 00000000000000..d50d26878d04a7
--- /dev/null
+++ b/packages/block-editor/src/components/block-list/block-crash-boundary.native.js
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { Component } from '@wordpress/element';
+import { logException } from '@wordpress/react-native-bridge';
+
+class BlockCrashBoundary extends Component {
+	constructor() {
+		super( ...arguments );
+
+		this.state = {
+			error: null,
+		};
+	}
+
+	static getDerivedStateFromError( error ) {
+		return { error };
+	}
+
+	componentDidCatch( error ) {
+		const { blockName } = this.props;
+
+		logException( error, {
+			context: {
+				component_stack: error.componentStack,
+				block_name: blockName,
+			},
+			isHandled: true,
+			handledBy: 'Block-level Error Boundary',
+		} );
+	}
+
+	render() {
+		const { error } = this.state;
+		if ( ! error ) {
+			return this.props.children;
+		}
+
+		return this.props.fallback;
+	}
+}
+
+export default BlockCrashBoundary;
diff --git a/packages/block-editor/src/components/block-list/block-crash-warning.native.js b/packages/block-editor/src/components/block-list/block-crash-warning.native.js
new file mode 100644
index 00000000000000..4736938b9d74f2
--- /dev/null
+++ b/packages/block-editor/src/components/block-list/block-crash-warning.native.js
@@ -0,0 +1,19 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import Warning from '../warning';
+
+const warning = (
+	<Warning
+		message={ __(
+			'This block has encountered an error and cannot be previewed.'
+		) }
+	/>
+);
+
+export default () => warning;
diff --git a/packages/block-editor/src/components/block-list/block-invalid-warning.js b/packages/block-editor/src/components/block-list/block-invalid-warning.js
index a3ece994916a43..a35ecaf6bae8eb 100644
--- a/packages/block-editor/src/components/block-list/block-invalid-warning.js
+++ b/packages/block-editor/src/components/block-list/block-invalid-warning.js
@@ -101,16 +101,17 @@ export default function BlockInvalidWarning( { clientId } ) {
 			<Warning
 				actions={ [
 					<Button
+						__next40pxDefaultSize
 						key="recover"
 						onClick={ convert.toRecoveredBlock }
 						variant="primary"
 					>
-						{ __( 'Attempt Block Recovery' ) }
+						{ __( 'Attempt recovery' ) }
 					</Button>,
 				] }
 				secondaryActions={ secondaryActions }
 			>
-				{ __( 'This block contains unexpected or invalid content.' ) }
+				{ __( 'Block contains unexpected or invalid content.' ) }
 			</Warning>
 			{ compare && (
 				<Modal
diff --git a/packages/block-editor/src/components/block-list/block-invalid-warning.native.js b/packages/block-editor/src/components/block-list/block-invalid-warning.native.js
index ae6da81e4d007f..8734f6f8804f03 100644
--- a/packages/block-editor/src/components/block-list/block-invalid-warning.native.js
+++ b/packages/block-editor/src/components/block-list/block-invalid-warning.native.js
@@ -53,8 +53,8 @@ export default function BlockInvalidWarning( { clientId } ) {
 	return (
 		<TouchableWithoutFeedback
 			onPress={ attemptBlockRecovery }
-			accessible={ true }
-			accessibilityRole={ 'button' }
+			accessible
+			accessibilityRole="button"
 		>
 			<Warning
 				title={ blockTitle }
diff --git a/packages/block-editor/src/components/block-list/block-list-block-context.js b/packages/block-editor/src/components/block-list/block-list-block-context.js
deleted file mode 100644
index 6fa09c6969ec59..00000000000000
--- a/packages/block-editor/src/components/block-list/block-list-block-context.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createContext } from '@wordpress/element';
-
-export const BlockListBlockContext = createContext( null );
diff --git a/packages/block-editor/src/components/block-list/block-list-item-cell.native.js b/packages/block-editor/src/components/block-list/block-list-item-cell.native.js
index 80aa2589eb64f5..e15a3e1063cad2 100644
--- a/packages/block-editor/src/components/block-list/block-list-item-cell.native.js
+++ b/packages/block-editor/src/components/block-list/block-list-item-cell.native.js
@@ -52,7 +52,11 @@ function BlockListItemCell( { children, item: clientId, onLayout } ) {
 		[ clientId, rootClientId, updateBlocksLayouts, onLayout ]
 	);
 
-	return <View onLayout={ onCellLayout }>{ children }</View>;
+	return (
+		<View testID="block-list-item-cell" onLayout={ onCellLayout }>
+			{ children }
+		</View>
+	);
 }
 
 export default BlockListItemCell;
diff --git a/packages/block-editor/src/components/block-list/block-list-item.native.js b/packages/block-editor/src/components/block-list/block-list-item.native.js
index c91bee36a10c4a..769e634b6741c2 100644
--- a/packages/block-editor/src/components/block-list/block-list-item.native.js
+++ b/packages/block-editor/src/components/block-list/block-list-item.native.js
@@ -98,7 +98,7 @@ function BlockListItemContent( {
 			const name = getBlockName( clientId );
 			const parentName = getBlockName( rootClientId );
 			const { align } = getBlockAttributes( clientId ) || {};
-			const { align: parentBlockAlign } =
+			const { textAlign: parentBlockAlign } =
 				getBlockAttributes( rootClientId ) || {};
 
 			return {
diff --git a/packages/block-editor/src/components/block-list/block-outline.native.js b/packages/block-editor/src/components/block-list/block-outline.native.js
index 76f0f8cb947941..92146816eb1529 100644
--- a/packages/block-editor/src/components/block-list/block-outline.native.js
+++ b/packages/block-editor/src/components/block-list/block-outline.native.js
@@ -14,16 +14,11 @@ import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 import styles from './block.scss';
 
 const TEXT_BLOCKS_WITH_OUTLINE = [ 'core/missing', 'core/freeform' ];
+const DESIGN_BLOCKS_WITHOUT_OUTLINE = [ 'core/button', 'core/spacer' ];
+const MEDIA_BLOCKS_WITH_OUTLINE = [ 'core/audio', 'core/file' ];
 
-function BlockOutline( {
-	blockCategory,
-	hasInnerBlocks,
-	isRootList,
-	isSelected,
-	name,
-} ) {
+function BlockOutline( { blockCategory, hasInnerBlocks, isSelected, name } ) {
 	const textBlockWithOutline = TEXT_BLOCKS_WITH_OUTLINE.includes( name );
-	const socialBlockWithOutline = name.includes( 'core/social-link' );
 
 	const hasBlockTextCategory =
 		blockCategory === 'text' && ! textBlockWithOutline;
@@ -44,19 +39,39 @@ function BlockOutline( {
 		hasBlockTextCategory && styles.solidBorderTextContent,
 	];
 
-	const shoudlShowOutline =
-		isSelected &&
-		( ( hasBlockTextCategory && hasInnerBlocks ) ||
-			( ! hasBlockTextCategory && hasInnerBlocks ) ||
-			( ! hasBlockTextCategory && isRootList ) ||
-			socialBlockWithOutline ||
-			textBlockWithOutline );
-
-	return (
-		shoudlShowOutline && (
-			<View pointerEvents="box-none" style={ styleSolidBorder } />
-		)
-	);
+	if ( ! isSelected ) {
+		return null;
+	}
+
+	let shouldShowOutline = true;
+	if ( hasBlockTextCategory && ! hasInnerBlocks ) {
+		shouldShowOutline = false;
+	} else if (
+		blockCategory === 'media' &&
+		! hasInnerBlocks &&
+		! MEDIA_BLOCKS_WITH_OUTLINE.includes( name )
+	) {
+		shouldShowOutline = false;
+	} else if ( blockCategory === 'media' && name === 'core/cover' ) {
+		shouldShowOutline = false;
+	} else if (
+		blockCategory === 'design' &&
+		DESIGN_BLOCKS_WITHOUT_OUTLINE.includes( name )
+	) {
+		shouldShowOutline = false;
+	}
+
+	if ( shouldShowOutline ) {
+		return (
+			<View
+				pointerEvents="box-none"
+				style={ styleSolidBorder }
+				testID="block-outline"
+			/>
+		);
+	}
+
+	return null;
 }
 
 export default BlockOutline;
diff --git a/packages/block-editor/src/components/block-list/block-selection-button.native.js b/packages/block-editor/src/components/block-list/block-selection-button.native.js
index 5bcf61cf54cb39..264c09a2612e6b 100644
--- a/packages/block-editor/src/components/block-list/block-selection-button.native.js
+++ b/packages/block-editor/src/components/block-list/block-selection-button.native.js
@@ -40,9 +40,7 @@ const BlockSelectionButton = ( {
 				onPress={ () => {
 					/* Open BottomSheet with markup. */
 				} }
-				disabled={
-					true
-				} /* Disable temporarily since onPress function is empty. */
+				disabled /* Disable temporarily since onPress function is empty. */
 			>
 				{ rootClientId &&
 					rootBlockIcon && [
diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
index ff5915981acdf9..2215625596dc5c 100644
--- a/packages/block-editor/src/components/block-list/block.js
+++ b/packages/block-editor/src/components/block-list/block.js
@@ -1,12 +1,18 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { useMemo, useCallback, RawHTML } from '@wordpress/element';
+import {
+	memo,
+	useCallback,
+	RawHTML,
+	useContext,
+	useMemo,
+} from '@wordpress/element';
 import {
 	getBlockType,
 	getSaveContent,
@@ -15,15 +21,15 @@ import {
 	switchToBlockType,
 	getDefaultBlockName,
 	isUnmodifiedBlock,
+	isReusableBlock,
+	getBlockDefaultClassName,
+	hasBlockSupport,
+	store as blocksStore,
+	privateApis as blocksPrivateApis,
 } from '@wordpress/blocks';
 import { withFilters } from '@wordpress/components';
-import {
-	withDispatch,
-	withSelect,
-	useDispatch,
-	useSelect,
-} from '@wordpress/data';
-import { compose, pure, ifCondition } from '@wordpress/compose';
+import { withDispatch, useDispatch, useSelect } from '@wordpress/data';
+import { compose } from '@wordpress/compose';
 import { safeHTML } from '@wordpress/dom';
 
 /**
@@ -37,7 +43,11 @@ import BlockHtml from './block-html';
 import { useBlockProps } from './use-block-props';
 import { store as blockEditorStore } from '../../store';
 import { useLayout } from './layout';
-import { BlockListBlockContext } from './block-list-block-context';
+import { PrivateBlockContext } from './private-block-context';
+
+import { unlock } from '../../lock-unlock';
+
+const { isUnmodifiedBlockContent } = unlock( blocksPrivateApis );
 
 /**
  * Merges wrapper props with special handling for classNames and styles.
@@ -53,10 +63,18 @@ function mergeWrapperProps( propsA, propsB ) {
 		...propsB,
 	};
 
-	if ( propsA?.className && propsB?.className ) {
-		newProps.className = classnames( propsA.className, propsB.className );
+	// May be set to undefined, so check if the property is set!
+	if (
+		propsA?.hasOwnProperty( 'className' ) &&
+		propsB?.hasOwnProperty( 'className' )
+	) {
+		newProps.className = clsx( propsA.className, propsB.className );
 	}
-	if ( propsA?.style && propsB?.style ) {
+
+	if (
+		propsA?.hasOwnProperty( 'style' ) &&
+		propsB?.hasOwnProperty( 'style' )
+	) {
 		newProps.style = { ...propsA.style, ...propsB.style };
 	}
 
@@ -92,27 +110,16 @@ function BlockListBlock( {
 	toggleSelection,
 } ) {
 	const {
+		mayDisplayControls,
+		mayDisplayParentControls,
 		themeSupportsLayout,
-		isTemporarilyEditingAsBlocks,
-		blockEditingMode,
-	} = useSelect(
-		( select ) => {
-			const {
-				getSettings,
-				__unstableGetTemporarilyEditingAsBlocks,
-				getBlockEditingMode,
-			} = select( blockEditorStore );
-			return {
-				themeSupportsLayout: getSettings().supportsLayout,
-				isTemporarilyEditingAsBlocks:
-					__unstableGetTemporarilyEditingAsBlocks() === clientId,
-				blockEditingMode: getBlockEditingMode( clientId ),
-			};
-		},
-		[ clientId ]
-	);
+		...context
+	} = useContext( PrivateBlockContext );
 	const { removeBlock } = useDispatch( blockEditorStore );
-	const onRemove = useCallback( () => removeBlock( clientId ), [ clientId ] );
+	const onRemove = useCallback(
+		() => removeBlock( clientId ),
+		[ clientId, removeBlock ]
+	);
 
 	const parentLayout = useLayout() || {};
 
@@ -137,17 +144,15 @@ function BlockListBlock( {
 			__unstableParentLayout={
 				Object.keys( parentLayout ).length ? parentLayout : undefined
 			}
+			mayDisplayControls={ mayDisplayControls }
+			mayDisplayParentControls={ mayDisplayParentControls }
+			blockEditingMode={ context.blockEditingMode }
+			isPreviewMode={ context.isPreviewMode }
 		/>
 	);
 
 	const blockType = getBlockType( name );
 
-	if ( blockEditingMode === 'disabled' ) {
-		wrapperProps = {
-			...wrapperProps,
-			tabIndex: -1,
-		};
-	}
 	// Determine whether the block has props to apply to the wrapper.
 	if ( blockType?.getEditWrapperProps ) {
 		wrapperProps = mergeWrapperProps(
@@ -176,7 +181,7 @@ function BlockListBlock( {
 	if ( isAligned ) {
 		blockEdit = (
 			<div
-				className={ classnames( 'wp-block', isSticky && className ) }
+				className={ clsx( 'wp-block', isSticky && className ) }
 				data-align={ wrapperProps[ 'data-align' ] }
 			>
 				{ blockEdit }
@@ -211,30 +216,35 @@ function BlockListBlock( {
 	} else if ( blockType?.apiVersion > 1 ) {
 		block = blockEdit;
 	} else {
-		block = <Block { ...wrapperProps }>{ blockEdit }</Block>;
+		block = <Block>{ blockEdit }</Block>;
 	}
 
 	const { 'data-align': dataAlign, ...restWrapperProps } = wrapperProps ?? {};
-
-	const value = {
-		clientId,
-		className: classnames(
-			{
-				'is-editing-disabled': blockEditingMode === 'disabled',
-				'is-content-locked-temporarily-editing-as-blocks':
-					isTemporarilyEditingAsBlocks,
-			},
+	const updatedWrapperProps = {
+		...restWrapperProps,
+		className: clsx(
+			restWrapperProps.className,
 			dataAlign && themeSupportsLayout && `align${ dataAlign }`,
 			! ( dataAlign && isSticky ) && className
 		),
-		wrapperProps: restWrapperProps,
-		isAligned,
 	};
 
-	const memoizedValue = useMemo( () => value, Object.values( value ) );
-
+	// We set a new context with the adjusted and filtered wrapperProps (through
+	// `editor.BlockListBlock`), which the `BlockListBlockProvider` did not have
+	// access to.
+	// Note that the context value doesn't have to be memoized in this case
+	// because when it changes, this component will be re-rendered anyway, and
+	// none of the consumers (BlockListBlock and useBlockProps) are memoized or
+	// "pure". This is different from the public BlockEditContext, where
+	// consumers might be memoized or "pure".
 	return (
-		<BlockListBlockContext.Provider value={ memoizedValue }>
+		<PrivateBlockContext.Provider
+			value={ {
+				wrapperProps: updatedWrapperProps,
+				isAligned,
+				...context,
+			} }
+		>
 			<BlockCrashBoundary
 				fallback={
 					<Block className="has-warning">
@@ -244,52 +254,10 @@ function BlockListBlock( {
 			>
 				{ block }
 			</BlockCrashBoundary>
-		</BlockListBlockContext.Provider>
+		</PrivateBlockContext.Provider>
 	);
 }
 
-const applyWithSelect = withSelect( ( select, { clientId, rootClientId } ) => {
-	const {
-		isBlockSelected,
-		getBlockMode,
-		isSelectionEnabled,
-		getTemplateLock,
-		__unstableGetBlockWithoutInnerBlocks,
-		canRemoveBlock,
-		canMoveBlock,
-	} = select( blockEditorStore );
-	const block = __unstableGetBlockWithoutInnerBlocks( clientId );
-	const isSelected = isBlockSelected( clientId );
-	const templateLock = getTemplateLock( rootClientId );
-	const canRemove = canRemoveBlock( clientId, rootClientId );
-	const canMove = canMoveBlock( clientId, rootClientId );
-
-	// The fallback to `{}` is a temporary fix.
-	// This function should never be called when a block is not present in
-	// the state. It happens now because the order in withSelect rendering
-	// is not correct.
-	const { name, attributes, isValid } = block || {};
-
-	// Do not add new properties here, use `useSelect` instead to avoid
-	// leaking new props to the public API (editor.BlockListBlock filter).
-	return {
-		mode: getBlockMode( clientId ),
-		isSelectionEnabled: isSelectionEnabled(),
-		isLocked: !! templateLock,
-		canRemove,
-		canMove,
-		// Users of the editor.BlockListBlock filter used to be able to
-		// access the block prop.
-		// Ideally these blocks would rely on the clientId prop only.
-		// This is kept for backward compatibility reasons.
-		block,
-		name,
-		attributes,
-		isValid,
-		isSelected,
-	};
-} );
-
 const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 	const {
 		updateBlockAttributes,
@@ -300,6 +268,7 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 		__unstableMarkLastChangeAsPersistent,
 		moveBlocksToPosition,
 		removeBlock,
+		selectBlock,
 	} = dispatch( blockEditorStore );
 
 	// Do not add new properties here, use `useDispatch` instead to avoid
@@ -341,6 +310,28 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 				canInsertBlockType,
 			} = registry.select( blockEditorStore );
 
+			function switchToDefaultOrRemove() {
+				const block = getBlock( clientId );
+				const defaultBlockName = getDefaultBlockName();
+				if ( getBlockName( clientId ) !== defaultBlockName ) {
+					const replacement = switchToBlockType(
+						block,
+						defaultBlockName
+					);
+					if ( replacement && replacement.length ) {
+						replaceBlocks( clientId, replacement );
+					}
+				} else if ( isUnmodifiedDefaultBlock( block ) ) {
+					const nextBlockClientId = getNextBlockClientId( clientId );
+					if ( nextBlockClientId ) {
+						registry.batch( () => {
+							removeBlock( clientId );
+							selectBlock( nextBlockClientId );
+						} );
+					}
+				}
+			}
+
 			/**
 			 * Moves the block with clientId up one level. If the block type
 			 * cannot be inserted at the new location, it will be attempted to
@@ -362,12 +353,48 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 					removeBlock( _clientId );
 				} else {
 					registry.batch( () => {
+						const firstBlock = getBlock( firstClientId );
+						const isFirstBlockContentUnmodified =
+							isUnmodifiedBlockContent( firstBlock );
+						const defaultBlockName = getDefaultBlockName();
+						const replacement = switchToBlockType(
+							firstBlock,
+							defaultBlockName
+						);
+						const canTransformToDefaultBlock =
+							!! replacement?.length &&
+							replacement.every( ( block ) =>
+								canInsertBlockType( block.name, _clientId )
+							);
+
 						if (
+							isFirstBlockContentUnmodified &&
+							canTransformToDefaultBlock
+						) {
+							// Step 1: If the block is empty and can be transformed to the default block type.
+							replaceBlocks(
+								firstClientId,
+								replacement,
+								changeSelection
+							);
+						} else if (
+							isFirstBlockContentUnmodified &&
+							firstBlock.name === defaultBlockName
+						) {
+							// Step 2: If the block is empty and is already the default block type.
+							removeBlock( firstClientId );
+							const nextBlockClientId =
+								getNextBlockClientId( clientId );
+							if ( nextBlockClientId ) {
+								selectBlock( nextBlockClientId );
+							}
+						} else if (
 							canInsertBlockType(
-								getBlockName( firstClientId ),
+								firstBlock.name,
 								targetRootClientId
 							)
 						) {
+							// Step 3: If the block can be moved up.
 							moveBlocksToPosition(
 								[ firstClientId ],
 								_clientId,
@@ -375,12 +402,17 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 								getBlockIndex( _clientId )
 							);
 						} else {
-							const replacement = switchToBlockType(
-								getBlock( firstClientId ),
-								getDefaultBlockName()
-							);
+							const canLiftAndTransformToDefaultBlock =
+								!! replacement?.length &&
+								replacement.every( ( block ) =>
+									canInsertBlockType(
+										block.name,
+										targetRootClientId
+									)
+								);
 
-							if ( replacement && replacement.length ) {
+							if ( canLiftAndTransformToDefaultBlock ) {
+								// Step 4: If the block can be transformed to the default block type and moved up.
 								insertBlocks(
 									replacement,
 									getBlockIndex( _clientId ),
@@ -388,6 +420,9 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 									changeSelection
 								);
 								removeBlock( firstClientId, false );
+							} else {
+								// Step 5: Continue the default behavior.
+								switchToDefaultOrRemove();
 							}
 						}
 
@@ -499,7 +534,7 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 
 					moveFirstItemUp( rootClientId );
 				} else {
-					removeBlock( clientId );
+					switchToDefaultOrRemove();
 				}
 			}
 		},
@@ -528,13 +563,297 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 	};
 } );
 
-export default compose(
-	pure,
-	applyWithSelect,
+// This component is used by the BlockListBlockProvider component below. It will
+// add the props necessary for the `editor.BlockListBlock` filters.
+BlockListBlock = compose(
 	applyWithDispatch,
-	// Block is sometimes not mounted at the right time, causing it be undefined
-	// see issue for more info
-	// https://github.com/WordPress/gutenberg/issues/17013
-	ifCondition( ( { block } ) => !! block ),
 	withFilters( 'editor.BlockListBlock' )
 )( BlockListBlock );
+
+// This component provides all the information we need through a single store
+// subscription (useSelect mapping). Only the necessary props are passed down
+// to the BlockListBlock component, which is a filtered component, so these
+// props are public API. To avoid adding to the public API, we use a private
+// context to pass the rest of the information to the filtered BlockListBlock
+// component, and useBlockProps.
+function BlockListBlockProvider( props ) {
+	const { clientId, rootClientId } = props;
+	const selectedProps = useSelect(
+		( select ) => {
+			const {
+				isBlockSelected,
+				getBlockMode,
+				isSelectionEnabled,
+				getTemplateLock,
+				isSectionBlock: _isSectionBlock,
+				getBlockWithoutAttributes,
+				getBlockAttributes,
+				canRemoveBlock,
+				canMoveBlock,
+
+				getSettings,
+				getTemporarilyEditingAsBlocks,
+				getBlockEditingMode,
+				getBlockName,
+				isFirstMultiSelectedBlock,
+				getMultiSelectedBlockClientIds,
+				hasSelectedInnerBlock,
+				getBlocksByName,
+
+				getBlockIndex,
+				isBlockMultiSelected,
+				isBlockSubtreeDisabled,
+				isBlockHighlighted,
+				__unstableIsFullySelected,
+				__unstableSelectionHasUnmergeableBlock,
+				isBlockBeingDragged,
+				isDragging,
+				__unstableHasActiveBlockOverlayActive,
+				getSelectedBlocksInitialCaretPosition,
+			} = unlock( select( blockEditorStore ) );
+			const blockWithoutAttributes =
+				getBlockWithoutAttributes( clientId );
+
+			// This is a temporary fix.
+			// This function should never be called when a block is not
+			// present in the state. It happens now because the order in
+			// withSelect rendering is not correct.
+			if ( ! blockWithoutAttributes ) {
+				return;
+			}
+
+			const {
+				hasBlockSupport: _hasBlockSupport,
+				getActiveBlockVariation,
+			} = select( blocksStore );
+			const attributes = getBlockAttributes( clientId );
+			const { name: blockName, isValid } = blockWithoutAttributes;
+			const blockType = getBlockType( blockName );
+			const { supportsLayout, isPreviewMode } = getSettings();
+			const hasLightBlockWrapper = blockType?.apiVersion > 1;
+			const previewContext = {
+				isPreviewMode,
+				blockWithoutAttributes,
+				name: blockName,
+				attributes,
+				isValid,
+				themeSupportsLayout: supportsLayout,
+				index: getBlockIndex( clientId ),
+				isReusable: isReusableBlock( blockType ),
+				className: hasLightBlockWrapper
+					? attributes.className
+					: undefined,
+				defaultClassName: hasLightBlockWrapper
+					? getBlockDefaultClassName( blockName )
+					: undefined,
+				blockTitle: blockType?.title,
+			};
+
+			// When in preview mode, we can avoid a lot of selection and
+			// editing related selectors.
+			if ( isPreviewMode ) {
+				return previewContext;
+			}
+
+			const _isSelected = isBlockSelected( clientId );
+			const canRemove = canRemoveBlock( clientId );
+			const canMove = canMoveBlock( clientId );
+			const match = getActiveBlockVariation( blockName, attributes );
+			const isMultiSelected = isBlockMultiSelected( clientId );
+			const checkDeep = true;
+			const isAncestorOfSelectedBlock = hasSelectedInnerBlock(
+				clientId,
+				checkDeep
+			);
+			const blockEditingMode = getBlockEditingMode( clientId );
+
+			const multiple = hasBlockSupport( blockName, 'multiple', true );
+
+			// For block types with `multiple` support, there is no "original
+			// block" to be found in the content, as the block itself is valid.
+			const blocksWithSameName = multiple
+				? []
+				: getBlocksByName( blockName );
+			const isInvalid =
+				blocksWithSameName.length &&
+				blocksWithSameName[ 0 ] !== clientId;
+
+			return {
+				...previewContext,
+				mode: getBlockMode( clientId ),
+				isSelectionEnabled: isSelectionEnabled(),
+				isLocked: !! getTemplateLock( rootClientId ),
+				isSectionBlock: _isSectionBlock( clientId ),
+				canRemove,
+				canMove,
+				isSelected: _isSelected,
+				isTemporarilyEditingAsBlocks:
+					getTemporarilyEditingAsBlocks() === clientId,
+				blockEditingMode,
+				mayDisplayControls:
+					_isSelected ||
+					( isFirstMultiSelectedBlock( clientId ) &&
+						getMultiSelectedBlockClientIds().every(
+							( id ) => getBlockName( id ) === blockName
+						) ),
+				mayDisplayParentControls:
+					_hasBlockSupport(
+						getBlockName( clientId ),
+						'__experimentalExposeControlsToChildren',
+						false
+					) && hasSelectedInnerBlock( clientId ),
+				blockApiVersion: blockType?.apiVersion || 1,
+				blockTitle: match?.title || blockType?.title,
+				isSubtreeDisabled:
+					blockEditingMode === 'disabled' &&
+					isBlockSubtreeDisabled( clientId ),
+				hasOverlay:
+					__unstableHasActiveBlockOverlayActive( clientId ) &&
+					! isDragging(),
+				initialPosition: _isSelected
+					? getSelectedBlocksInitialCaretPosition()
+					: undefined,
+				isHighlighted: isBlockHighlighted( clientId ),
+				isMultiSelected,
+				isPartiallySelected:
+					isMultiSelected &&
+					! __unstableIsFullySelected() &&
+					! __unstableSelectionHasUnmergeableBlock(),
+				isDragging: isBlockBeingDragged( clientId ),
+				hasChildSelected: isAncestorOfSelectedBlock,
+				isEditingDisabled: blockEditingMode === 'disabled',
+				hasEditableOutline:
+					blockEditingMode !== 'disabled' &&
+					getBlockEditingMode( rootClientId ) === 'disabled',
+				originalBlockClientId: isInvalid
+					? blocksWithSameName[ 0 ]
+					: false,
+			};
+		},
+		[ clientId, rootClientId ]
+	);
+
+	const {
+		isPreviewMode,
+		// Fill values that end up as a public API and may not be defined in
+		// preview mode.
+		mode = 'visual',
+		isSelectionEnabled = false,
+		isLocked = false,
+		canRemove = false,
+		canMove = false,
+		blockWithoutAttributes,
+		name,
+		attributes,
+		isValid,
+		isSelected = false,
+		themeSupportsLayout,
+		isTemporarilyEditingAsBlocks,
+		blockEditingMode,
+		mayDisplayControls,
+		mayDisplayParentControls,
+		index,
+		blockApiVersion,
+		blockTitle,
+		isSubtreeDisabled,
+		hasOverlay,
+		initialPosition,
+		isHighlighted,
+		isMultiSelected,
+		isPartiallySelected,
+		isReusable,
+		isDragging,
+		hasChildSelected,
+		isSectionBlock,
+		isEditingDisabled,
+		hasEditableOutline,
+		className,
+		defaultClassName,
+		originalBlockClientId,
+	} = selectedProps;
+
+	// Users of the editor.BlockListBlock filter used to be able to
+	// access the block prop.
+	// Ideally these blocks would rely on the clientId prop only.
+	// This is kept for backward compatibility reasons.
+	const block = useMemo(
+		() => ( { ...blockWithoutAttributes, attributes } ),
+		[ blockWithoutAttributes, attributes ]
+	);
+
+	// Block is sometimes not mounted at the right time, causing it be
+	// undefined see issue for more info
+	// https://github.com/WordPress/gutenberg/issues/17013
+	if ( ! selectedProps ) {
+		return null;
+	}
+
+	const privateContext = {
+		isPreviewMode,
+		clientId,
+		className,
+		index,
+		mode,
+		name,
+		blockApiVersion,
+		blockTitle,
+		isSelected,
+		isSubtreeDisabled,
+		hasOverlay,
+		initialPosition,
+		blockEditingMode,
+		isHighlighted,
+		isMultiSelected,
+		isPartiallySelected,
+		isReusable,
+		isDragging,
+		hasChildSelected,
+		isSectionBlock,
+		isEditingDisabled,
+		hasEditableOutline,
+		isTemporarilyEditingAsBlocks,
+		defaultClassName,
+		mayDisplayControls,
+		mayDisplayParentControls,
+		originalBlockClientId,
+		themeSupportsLayout,
+	};
+
+	// Here we separate between the props passed to BlockListBlock and any other
+	// information we selected for internal use. BlockListBlock is a filtered
+	// component and thus ALL the props are PUBLIC API.
+
+	// Note that the context value doesn't have to be memoized in this case
+	// because when it changes, this component will be re-rendered anyway, and
+	// none of the consumers (BlockListBlock and useBlockProps) are memoized or
+	// "pure". This is different from the public BlockEditContext, where
+	// consumers might be memoized or "pure".
+	return (
+		<PrivateBlockContext.Provider value={ privateContext }>
+			<BlockListBlock
+				{ ...props }
+				// WARNING: all the following props are public API (through the
+				// editor.BlockListBlock filter) and normally nothing new should
+				// be added to it.
+				{ ...{
+					mode,
+					isSelectionEnabled,
+					isLocked,
+					canRemove,
+					canMove,
+					// Users of the editor.BlockListBlock filter used to be able
+					// to access the block prop. Ideally these blocks would rely
+					// on the clientId prop only. This is kept for backward
+					// compatibility reasons.
+					block,
+					name,
+					attributes,
+					isValid,
+					isSelected,
+				} }
+			/>
+		</PrivateBlockContext.Provider>
+	);
+}
+
+export default memo( BlockListBlockProvider );
diff --git a/packages/block-editor/src/components/block-list/block.native.js b/packages/block-editor/src/components/block-list/block.native.js
index 03a84d530ba12a..9f34195e50e040 100644
--- a/packages/block-editor/src/components/block-list/block.native.js
+++ b/packages/block-editor/src/components/block-list/block.native.js
@@ -2,17 +2,19 @@
  * External dependencies
  */
 import { Pressable, View } from 'react-native';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { useCallback, useMemo, useState } from '@wordpress/element';
 import {
-	GlobalStylesContext,
-	getMergedGlobalStyles,
-	useMobileGlobalStylesColors,
-	useGlobalStyles,
-} from '@wordpress/components';
+	useCallback,
+	useMemo,
+	useState,
+	useRef,
+	memo,
+} from '@wordpress/element';
+import { withFilters } from '@wordpress/components';
 import {
 	__experimentalGetAccessibleBlockLabel as getAccessibleBlockLabel,
 	getBlockType,
@@ -27,7 +29,7 @@ import {
 	withDispatch,
 	withSelect,
 } from '@wordpress/data';
-import { compose, ifCondition, pure } from '@wordpress/compose';
+import { compose, ifCondition } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -38,24 +40,50 @@ import BlockInvalidWarning from './block-invalid-warning';
 import BlockOutline from './block-outline';
 import { store as blockEditorStore } from '../../store';
 import { useLayout } from './layout';
+import useScrollUponInsertion from './use-scroll-upon-insertion';
 import { useSettings } from '../use-settings';
+import { unlock } from '../../lock-unlock';
+import BlockCrashBoundary from './block-crash-boundary';
+import BlockCrashWarning from './block-crash-warning';
+import {
+	getMergedGlobalStyles,
+	GlobalStylesContext,
+	useGlobalStyles,
+	useMobileGlobalStylesColors,
+} from '../global-styles/use-global-styles-context';
 
 const EMPTY_ARRAY = [];
 
-// Helper function to memoize the wrapperProps since getEditWrapperProps always returns a new reference.
-const wrapperPropsCache = new WeakMap();
-const emptyObj = {};
-function getWrapperProps( value, getWrapperPropsFunction ) {
-	if ( ! getWrapperPropsFunction ) {
-		return emptyObj;
+/**
+ * Merges wrapper props with special handling for classNames and styles.
+ *
+ * @param {Object} propsA
+ * @param {Object} propsB
+ *
+ * @return {Object} Merged props.
+ */
+function mergeWrapperProps( propsA, propsB ) {
+	const newProps = {
+		...propsA,
+		...propsB,
+	};
+
+	// May be set to undefined, so check if the property is set!
+	if (
+		propsA?.hasOwnProperty( 'className' ) &&
+		propsB?.hasOwnProperty( 'className' )
+	) {
+		newProps.className = clsx( propsA.className, propsB.className );
 	}
-	const cachedValue = wrapperPropsCache.get( value );
-	if ( ! cachedValue ) {
-		const wrapperProps = getWrapperPropsFunction( value );
-		wrapperPropsCache.set( value, wrapperProps );
-		return wrapperProps;
+
+	if (
+		propsA?.hasOwnProperty( 'style' ) &&
+		propsB?.hasOwnProperty( 'style' )
+	) {
+		newProps.style = { ...propsA.style, ...propsB.style };
 	}
-	return cachedValue;
+
+	return newProps;
 }
 
 function BlockWrapper( {
@@ -67,7 +95,6 @@ function BlockWrapper( {
 	draggingEnabled,
 	hasInnerBlocks,
 	isDescendentBlockSelected,
-	isRootList,
 	isSelected,
 	isTouchable,
 	marginHorizontal,
@@ -85,6 +112,18 @@ function BlockWrapper( {
 	];
 	const accessible = ! ( isSelected || isDescendentBlockSelected );
 
+	const ref = useRef();
+	const [ isLayoutCalculated, setIsLayoutCalculated ] = useState();
+	useScrollUponInsertion( {
+		clientId,
+		isSelected,
+		isLayoutCalculated,
+		elementRef: ref,
+	} );
+	const onLayout = useCallback( () => {
+		setIsLayoutCalculated( true );
+	}, [] );
+
 	return (
 		<Pressable
 			accessibilityLabel={ accessibilityLabel }
@@ -93,22 +132,28 @@ function BlockWrapper( {
 			disabled={ ! isTouchable }
 			onPress={ onFocus }
 			style={ blockWrapperStyle }
+			ref={ ref }
+			onLayout={ onLayout }
 		>
 			<BlockOutline
 				blockCategory={ blockCategory }
 				hasInnerBlocks={ hasInnerBlocks }
-				isRootList={ isRootList }
 				isSelected={ isSelected }
 				name={ name }
 			/>
-			<BlockDraggable
-				clientId={ clientId }
-				draggingClientId={ draggingClientId }
-				enabled={ draggingEnabled }
-				testID="draggable-trigger-content"
+			<BlockCrashBoundary
+				blockName={ name }
+				fallback={ <BlockCrashWarning /> }
 			>
-				{ children }
-			</BlockDraggable>
+				<BlockDraggable
+					clientId={ clientId }
+					draggingClientId={ draggingClientId }
+					enabled={ draggingEnabled }
+					testID="draggable-trigger-content"
+				>
+					{ children }
+				</BlockDraggable>
+			</BlockCrashBoundary>
 		</Pressable>
 	);
 }
@@ -136,6 +181,7 @@ function BlockListBlock( {
 	rootClientId,
 	setAttributes,
 	toggleSelection,
+	wrapperProps,
 } ) {
 	const {
 		baseGlobalStyles,
@@ -148,6 +194,8 @@ function BlockListBlock( {
 		isDescendentBlockSelected,
 		isParentSelected,
 		order,
+		mayDisplayControls,
+		blockEditingMode,
 	} = useSelect(
 		( select ) => {
 			const {
@@ -158,6 +206,10 @@ function BlockListBlock( {
 				getSelectedBlockClientId,
 				getSettings,
 				hasSelectedInnerBlock,
+				getBlockName,
+				isFirstMultiSelectedBlock,
+				getMultiSelectedBlockClientIds,
+				getBlockEditingMode,
 			} = select( blockEditorStore );
 			const currentBlockType = getBlockType( name || 'core/missing' );
 			const currentBlockCategory = currentBlockType?.category;
@@ -205,6 +257,13 @@ function BlockListBlock( {
 				isDescendentBlockSelected: descendentBlockSelected,
 				isParentSelected: parentSelected,
 				order: blockOrder,
+				mayDisplayControls:
+					isSelected ||
+					( isFirstMultiSelectedBlock( clientId ) &&
+						getMultiSelectedBlockClientIds().every(
+							( id ) => getBlockName( id ) === name
+						) ),
+				blockEditingMode: getBlockEditingMode( clientId ),
 			};
 		},
 		[ clientId, isSelected, name, rootClientId ]
@@ -242,24 +301,25 @@ function BlockListBlock( {
 		[ blockWidth, setBlockWidth ]
 	);
 
-	// Block level styles.
-	const wrapperProps = getWrapperProps(
-		attributes,
-		blockType.getEditWrapperProps
-	);
+	// Determine whether the block has props to apply to the wrapper.
+	if ( blockType?.getEditWrapperProps ) {
+		wrapperProps = mergeWrapperProps(
+			wrapperProps,
+			blockType.getEditWrapperProps( attributes )
+		);
+	}
 
 	// Inherited styles merged with block level styles.
 	const mergedStyle = useMemo( () => {
 		return getMergedGlobalStyles(
 			baseGlobalStyles,
 			globalStyle,
-			wrapperProps.style,
+			wrapperProps?.style,
 			attributes,
 			defaultColors,
 			name,
 			fontSizes || EMPTY_ARRAY
 		);
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [
 		// It is crucial to keep the dependencies array minimal to prevent unnecessary calls that could negatively impact performance.
 		// JSON.stringify is used for the following purposes:
@@ -268,11 +328,8 @@ function BlockListBlock( {
 		// 2. To filter the attributes object, ensuring that only the relevant attributes (included in
 		//    GlobalStylesContext.BLOCK_STYLE_ATTRIBUTES) are considered as dependencies. This reduces the likelihood of
 		//    unnecessary useMemo calls when other, unrelated attributes change.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 		JSON.stringify( globalStyle ),
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		JSON.stringify( wrapperProps.style ),
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		JSON.stringify( wrapperProps?.style ),
 		JSON.stringify(
 			Object.fromEntries(
 				Object.entries( attributes ?? {} ).filter( ( [ key ] ) =>
@@ -305,7 +362,6 @@ function BlockListBlock( {
 			hasInnerBlocks={ hasInnerBlocks }
 			isDescendentBlockSelected={ isDescendentBlockSelected }
 			isFocused={ isFocused }
-			isRootList={ ! rootClientId }
 			isSelected={ isSelected }
 			isStackedHorizontally={ isStackedHorizontally }
 			isTouchable={ isTouchable }
@@ -346,6 +402,8 @@ function BlockListBlock( {
 									: undefined
 							}
 							wrapperProps={ wrapperProps }
+							mayDisplayControls={ mayDisplayControls }
+							blockEditingMode={ blockEditingMode }
 						/>
 						<View onLayout={ onLayout } />
 					</GlobalStylesContext.Provider>
@@ -361,21 +419,23 @@ const applyWithSelect = withSelect( ( select, { clientId, rootClientId } ) => {
 		getBlockMode,
 		isSelectionEnabled,
 		getTemplateLock,
-		__unstableGetBlockWithoutInnerBlocks,
+		getBlockWithoutAttributes,
+		getBlockAttributes,
 		canRemoveBlock,
 		canMoveBlock,
-	} = select( blockEditorStore );
-	const block = __unstableGetBlockWithoutInnerBlocks( clientId );
+	} = unlock( select( blockEditorStore ) );
+	const block = getBlockWithoutAttributes( clientId );
+	const attributes = getBlockAttributes( clientId );
 	const isSelected = isBlockSelected( clientId );
 	const templateLock = getTemplateLock( rootClientId );
-	const canRemove = canRemoveBlock( clientId, rootClientId );
-	const canMove = canMoveBlock( clientId, rootClientId );
+	const canRemove = canRemoveBlock( clientId );
+	const canMove = canMoveBlock( clientId );
 
 	// The fallback to `{}` is a temporary fix.
 	// This function should never be called when a block is not present in
 	// the state. It happens now because the order in withSelect rendering
 	// is not correct.
-	const { name, attributes, isValid } = block || {};
+	const { name, isValid } = block || {};
 
 	// Do not add new properties here, use `useSelect` instead to avoid
 	// leaking new props to the public API (editor.BlockListBlock filter).
@@ -605,12 +665,20 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 					}
 
 					moveFirstItemUp( rootClientId );
-				} else {
-					removeBlock( clientId );
+				} else if (
+					getBlockName( clientId ) !== getDefaultBlockName()
+				) {
+					const replacement = switchToBlockType(
+						getBlock( clientId ),
+						getDefaultBlockName()
+					);
+					if ( replacement && replacement.length ) {
+						replaceBlocks( clientId, replacement );
+					}
 				}
 			}
 		},
-		onReplace( blocks, indexToSelect, initialPosition ) {
+		onReplace( blocks, indexToSelect, initialPosition, meta ) {
 			if (
 				blocks.length &&
 				! isUnmodifiedDefaultBlock( blocks[ blocks.length - 1 ] )
@@ -621,7 +689,8 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 				[ ownProps.clientId ],
 				blocks,
 				indexToSelect,
-				initialPosition
+				initialPosition,
+				meta
 			);
 		},
 		toggleSelection( selectionEnabled ) {
@@ -631,11 +700,12 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 } );
 
 export default compose(
-	pure,
+	memo,
 	applyWithSelect,
 	applyWithDispatch,
 	// Block is sometimes not mounted at the right time, causing it be undefined
 	// see issue for more info
 	// https://github.com/WordPress/gutenberg/issues/17013
-	ifCondition( ( { block } ) => !! block )
+	ifCondition( ( { block } ) => !! block ),
+	withFilters( 'editor.BlockListBlock' )
 )( BlockListBlock );
diff --git a/packages/block-editor/src/components/block-list/content.scss b/packages/block-editor/src/components/block-list/content.scss
index 3e87ba317d1350..3d3b8517ca09c3 100644
--- a/packages/block-editor/src/components/block-list/content.scss
+++ b/packages/block-editor/src/components/block-list/content.scss
@@ -17,6 +17,19 @@
 	}
 }
 
+// Hide selections on this element, otherwise Safari will include it stacked
+// under your actual selection.
+// This uses a CSS hack to show the rules to Safari only. Failing here is okay,
+// it just makes the selection indication slightly less precise. That makes this
+// hack a progressive enhancement.
+/* stylelint-disable -- Stylelint is disabled to allow the hack to work. */
+_::-webkit-full-page-media, _:future, :root .block-editor-block-list__layout::selection,
+_::-webkit-full-page-media, _:future, :root [data-has-multi-selection="true"] .block-editor-block-list__layout::selection {
+	background-color: transparent;
+}
+/* stylelint-enable */
+
+
 // Note to developers refactoring this, please test navigation mode, and
 // multi selection and hovering the block switcher to highlight the block.
 // Also be sure to test partial selections in Safari, as it draws the
@@ -24,23 +37,7 @@
 .block-editor-block-list__layout {
 	position: relative;
 
-	// Hide selections on this element, otherwise Safari will include it stacked
-	// under your actual selection.
-	&::selection {
-		background: transparent;
-	}
-
-	.has-multi-selection &::selection {
-		background: transparent;
-	}
-
 	// Block multi selection
-	// Apply a rounded radius to the entire block when multi selected, but with low specificity
-	// so explicit radii set by tools are preserved.
-	&:where(.block-editor-block-list__block.is-multi-selected:not(.is-partially-selected)) {
-		border-radius: $radius-block-ui;
-	}
-
 	.block-editor-block-list__block.is-multi-selected:not(.is-partially-selected) {
 		// Hide the native selection indicator, for the selection, and children.
 		&::selection,
@@ -60,7 +57,6 @@
 			left: 0;
 			background: var(--wp-admin-theme-color);
 			opacity: 0.4;
-			border-radius: $radius-block-ui;
 
 			// Animate.
 			animation: selection-overlay__fade-in-animation 0.1s ease-out;
@@ -73,7 +69,7 @@
 
 		// Don't show the highlight focus style when multi selected.
 		&.is-highlighted::after {
-			box-shadow: none;
+			outline-color: transparent;
 		}
 	}
 
@@ -84,82 +80,23 @@
 	// since things like border-radius need to be able to be set on the block itself.
 	.block-editor-block-list__block.is-highlighted,
 	.block-editor-block-list__block.is-highlighted ~ .is-multi-selected,
-	&.is-navigate-mode .block-editor-block-list__block.is-selected,
-	.block-editor-block-list__block:not([contenteditable]):focus {
+	.block-editor-block-list__block:not([contenteditable="true"]):focus {
 		outline: none;
 
 		// We're using a pseudo element to overflow placeholder borders
 		// and any border inside the block itself.
 		&::after {
-			content: "";
-			position: absolute;
+			@include selected-block-focus();
 			z-index: 1;
-			pointer-events: none;
-			top: $border-width;
-			right: $border-width;
-			bottom: $border-width;
-			left: $border-width;
-			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-			border-radius: $radius-block-ui - $border-width; // Border is outset, so subtract the width to achieve correct radius.
-			outline: 2px solid transparent; // This shows up in Windows High Contrast Mode.
-
-			// Show a light color for dark themes.
-			.is-dark-theme & {
-				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) $dark-theme-focus;
-			}
 		}
 	}
 
-	// Moving blocks using keyboard (Ellipsis > Move).
-	& .is-block-moving-mode.block-editor-block-list__block.is-selected {
-
-		&::after {
-			content: "";
-			position: absolute;
-			z-index: 0;
-			pointer-events: none;
-			transition:
-				border-color 0.1s linear,
-				border-style 0.1s linear,
-				box-shadow 0.1s linear;
-			right: 0;
-			left: 0;
-			top: -$default-block-margin * 0.5;
-			border-radius: $radius-block-ui;
-			border-top: 4px solid $gray-400;
-			bottom: auto;
-			box-shadow: none;
-		}
-	}
-
-	& .is-block-moving-mode.can-insert-moving-block.block-editor-block-list__block.is-selected {
-		&::after {
-			border-color: var(--wp-admin-theme-color);
-		}
-	}
-
-	// Ensure an accurate partial text selection.
-	// To do this, we disable text selection on the main container, then re-enable it only on the
-	// elements that actually get selected.
-	// To keep in mind: user-select is currently inherited to all nodes inside.
-	.has-multi-selection & {
-		user-select: none;
-	}
-
 	// Re-enable it on components inside.
 	[class^="components-"] {
 		user-select: text;
 	}
 }
 
-.is-block-moving-mode.block-editor-block-list__block-selection-button {
-	// Should be invisible but not unfocusable.
-	opacity: 0;
-	font-size: 1px;
-	height: 1px;
-	padding: 0;
-}
-
 .block-editor-block-list__layout .block-editor-block-list__block {
 	// With `position: static`, Safari marks a full-width selection rectangle, including margins.
 	// With `position: relative`, Safari marks an inline selection rectangle, similar to that of
@@ -172,11 +109,17 @@
 	overflow-wrap: break-word;
 
 	pointer-events: auto;
-	user-select: text;
 
 	&.is-editing-disabled {
 		pointer-events: none;
-		user-select: none;
+	}
+
+	&.has-negative-margin {
+		&.is-selected,
+		&.has-child-selected {
+			// Bring the selected block forward so we can see it.
+			z-index: z-index(".block-editor-block-list__block.is-selected");
+		}
 	}
 
 	.reusable-block-edit-panel * {
@@ -195,9 +138,6 @@
 		width: 100%;
 
 		.components-notice {
-			margin-left: 0;
-			margin-right: 0;
-
 			.components-notice__content {
 				font-size: $default-font-size;
 			}
@@ -228,7 +168,6 @@
 		right: 0;
 		bottom: 0;
 		left: 0;
-		border-radius: $radius-block-ui;
 		background-color: rgba($white, 0.4);
 	}
 
@@ -237,19 +176,6 @@
 		background-color: transparent;
 	}
 
-	// Reusable blocks clickthrough overlays.
-	&.is-reusable > .block-editor-inner-blocks > .block-editor-block-list__layout.has-overlay {
-		// Remove only the top click overlay.
-		&::after {
-			display: none;
-		}
-
-		// Restore it for subsequent.
-		.block-editor-block-list__layout.has-overlay::after {
-			display: block;
-		}
-	}
-
 	// Reusable blocks parent border.
 	&.is-reusable.has-child-selected::after {
 		box-shadow: 0 0 0 1px var(--wp-admin-theme-color);
@@ -262,43 +188,86 @@
 }
 
 .is-outline-mode .block-editor-block-list__block:not(.remove-outline) {
+
+	&.is-selected,
 	&.is-hovered {
 		cursor: default;
 
-		&::after {
-			content: "";
-			position: absolute;
-			pointer-events: none;
-			top: $border-width;
-			left: $border-width;
-			right: $border-width;
-			bottom: $border-width;
-			box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color);
-			border-radius: $radius-block-ui - $border-width;
+		&.rich-text,
+		.rich-text {
+			cursor: auto;
 		}
 	}
 
-	&.is-selected {
-		cursor: default;
+	&.is-hovered:not(.is-selected),
+	&:not(.rich-text):not([contenteditable="true"]).is-selected {
 
-		&.rich-text {
-			cursor: unset;
+		&::after {
+			@include selected-block-focus();
 		}
+	}
+}
+
+// Colorize outlines for template parts and synced patterns (.is-reusable).
+.is-outline-mode .block-editor-block-list__block:not(.remove-outline).wp-block-template-part,
+.is-outline-mode .block-editor-block-list__block:not(.remove-outline).is-reusable {
+
+	&.is-hovered::after,
+	&.is-selected::after,
+	&.is-highlighted::after {
+		outline-color: var(--wp-block-synced-color);
+	}
 
+	&.block-editor-block-list__block:not([contenteditable]):focus {
 		&::after {
-			content: "";
-			position: absolute;
-			pointer-events: none;
-			top: $border-width;
-			left: $border-width;
-			right: $border-width;
-			bottom: $border-width;
-			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-			border-radius: $radius-block-ui;
+			outline-color: var(--wp-block-synced-color);
 		}
 	}
 }
 
+// Add fade in/out background for editable blocks in synced patterns.
+@keyframes block-editor-is-editable__animation {
+	from {
+		background-color: rgba(var(--wp-admin-theme-color--rgb), 0.1);
+	}
+	to {
+		background-color: rgba(var(--wp-admin-theme-color--rgb), 0);
+	}
+}
+
+@keyframes block-editor-is-editable__animation_reduce-motion {
+	0% {
+		background-color: rgba(var(--wp-admin-theme-color--rgb), 0.1);
+	}
+	99% {
+		background-color: rgba(var(--wp-admin-theme-color--rgb), 0.1);
+	}
+	100% {
+		background-color: rgba(var(--wp-admin-theme-color--rgb), 0);
+	}
+}
+
+.is-root-container:not([inert]) .block-editor-block-list__block.is-selected .block-editor-block-list__block.has-editable-outline::after {
+	animation-name: block-editor-is-editable__animation;
+	animation-duration: 0.8s;
+	animation-timing-function: ease-out;
+	animation-delay: 0.1s;
+	animation-fill-mode: backwards;
+	bottom: 0;
+	content: "";
+	left: 0;
+	pointer-events: none;
+	position: absolute;
+	right: 0;
+	top: 0;
+
+	// Unique reduced-motion affordance to ensure the effect is still visible when reduce motion is enabled.
+	@media (prefers-reduced-motion: reduce) {
+		animation-name: block-editor-is-editable__animation_reduce-motion;
+		animation-delay: 0s;
+	}
+}
+
 // Spotlight mode. Fade out blocks unless they contain a selected block.
 .is-focus-mode .block-editor-block-list__block:not(.has-child-selected) {
 	opacity: 0.2;
@@ -391,7 +360,7 @@
 	width: 100%;
 	border: none;
 	outline: none;
-	border-radius: 2px;
+	border-radius: $radius-small;
 	box-shadow: inset 0 0 0 $border-width $gray-900;
 	resize: none;
 	overflow: hidden;
@@ -425,7 +394,36 @@
 	}
 }
 
-.block-editor-iframe__body {
-	transition: all 0.3s;
-	transform-origin: top center;
+.block-editor-block-list__zoom-out-separator {
+	/* same color as the iframe's background */
+	background: $gray-300;
+	// Additional -1px is required to avoid sub pixel rounding errors allowing background to show.
+	margin-left: -1px;
+	margin-right: -1px;
+	transition: background-color 0.3s ease;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	overflow: hidden;
+	font-size: $default-font-size;
+	font-family: $default-font;
+	color: $black;
+	font-weight: normal;
+
+	.is-zoomed-out & {
+		// Maintains an absolute font-size by counter-scaling based on the zoom level.
+		font-size: calc(#{$default-font-size} / var(--wp-block-editor-iframe-zoom-out-scale));
+	}
+
+	&.is-dragged-over {
+		background: $gray-400;
+	}
+}
+
+// In Post Editor allow the separator to occupy the full width by ignoring (cancelling out) the global padding.
+.has-global-padding > .block-editor-block-list__zoom-out-separator,
+.block-editor-block-list__layout.is-root-container.has-global-padding > .block-editor-block-list__zoom-out-separator {
+	max-width: none;
+	// Additional -1px is required to avoid sub pixel rounding errors allowing background to show.
+	margin: 0 calc(-1 * var(--wp--style--root--padding-right) - 1px) 0 calc(-1 * var(--wp--style--root--padding-left) - 1px) !important;
 }
diff --git a/packages/block-editor/src/components/block-list/index.js b/packages/block-editor/src/components/block-list/index.js
index ab57605563e1d6..2d91108ccb4123 100644
--- a/packages/block-editor/src/components/block-list/index.js
+++ b/packages/block-editor/src/components/block-list/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -17,7 +17,12 @@ import {
 	useMergeRefs,
 	useDebounce,
 } from '@wordpress/compose';
-import { createContext, useMemo, useCallback } from '@wordpress/element';
+import {
+	createContext,
+	useMemo,
+	useCallback,
+	useEffect,
+} from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -34,25 +39,25 @@ import {
 	DEFAULT_BLOCK_EDIT_CONTEXT,
 } from '../block-edit/context';
 import { useTypingObserver } from '../observe-typing';
+import { ZoomOutSeparator } from './zoom-out-separator';
+import { unlock } from '../../lock-unlock';
 
 export const IntersectionObserver = createContext();
 const pendingBlockVisibilityUpdatesPerRegistry = new WeakMap();
 
 function Root( { className, ...settings } ) {
 	const isLargeViewport = useViewportMatch( 'medium' );
-	const { isOutlineMode, isFocusMode, editorMode } = useSelect(
-		( select ) => {
-			const { getSettings, __unstableGetEditorMode } =
-				select( blockEditorStore );
+	const { isOutlineMode, isFocusMode, temporarilyEditingAsBlocks } =
+		useSelect( ( select ) => {
+			const { getSettings, getTemporarilyEditingAsBlocks, isTyping } =
+				unlock( select( blockEditorStore ) );
 			const { outlineMode, focusMode } = getSettings();
 			return {
-				isOutlineMode: outlineMode,
+				isOutlineMode: outlineMode && ! isTyping(),
 				isFocusMode: focusMode,
-				editorMode: __unstableGetEditorMode(),
+				temporarilyEditingAsBlocks: getTemporarilyEditingAsBlocks(),
 			};
-		},
-		[]
-	);
+		}, [] );
 	const registry = useRegistry();
 	const { setBlockVisibility } = useDispatch( blockEditorStore );
 
@@ -98,10 +103,9 @@ function Root( { className, ...settings } ) {
 				useInBetweenInserter(),
 				useTypingObserver(),
 			] ),
-			className: classnames( 'is-root-container', className, {
+			className: clsx( 'is-root-container', className, {
 				'is-outline-mode': isOutlineMode,
 				'is-focus-mode': isFocusMode && isLargeViewport,
-				'is-navigate-mode': editorMode === 'navigation',
 			} ),
 		},
 		settings
@@ -109,10 +113,36 @@ function Root( { className, ...settings } ) {
 	return (
 		<IntersectionObserver.Provider value={ intersectionObserver }>
 			<div { ...innerBlocksProps } />
+			{ !! temporarilyEditingAsBlocks && (
+				<StopEditingAsBlocksOnOutsideSelect
+					clientId={ temporarilyEditingAsBlocks }
+				/>
+			) }
 		</IntersectionObserver.Provider>
 	);
 }
 
+function StopEditingAsBlocksOnOutsideSelect( { clientId } ) {
+	const { stopEditingAsBlocks } = unlock( useDispatch( blockEditorStore ) );
+	const isBlockOrDescendantSelected = useSelect(
+		( select ) => {
+			const { isBlockSelected, hasSelectedInnerBlock } =
+				select( blockEditorStore );
+			return (
+				isBlockSelected( clientId ) ||
+				hasSelectedInnerBlock( clientId, true )
+			);
+		},
+		[ clientId ]
+	);
+	useEffect( () => {
+		if ( ! isBlockOrDescendantSelected ) {
+			stopEditingAsBlocks( clientId );
+		}
+	}, [ isBlockOrDescendantSelected, clientId, stopEditingAsBlocks ] );
+	return null;
+}
+
 export default function BlockList( settings ) {
 	return (
 		<BlockEditContextProvider value={ DEFAULT_BLOCK_EDIT_CONTEXT }>
@@ -121,27 +151,70 @@ export default function BlockList( settings ) {
 	);
 }
 
+const EMPTY_ARRAY = [];
+const EMPTY_SET = new Set();
+
 function Items( {
 	placeholder,
 	rootClientId,
-	renderAppender,
+	renderAppender: CustomAppender,
 	__experimentalAppenderTagName,
 	layout = defaultLayout,
 } ) {
-	const { order, selectedBlocks, visibleBlocks } = useSelect(
+	// Avoid passing CustomAppender to useSelect because it could be a new
+	// function on every render.
+	const hasAppender = CustomAppender !== false;
+	const hasCustomAppender = !! CustomAppender;
+	const {
+		order,
+		isZoomOut,
+		selectedBlocks,
+		visibleBlocks,
+		shouldRenderAppender,
+	} = useSelect(
 		( select ) => {
 			const {
+				getSettings,
 				getBlockOrder,
+				getSelectedBlockClientId,
 				getSelectedBlockClientIds,
 				__unstableGetVisibleBlocks,
-			} = select( blockEditorStore );
+				getTemplateLock,
+				getBlockEditingMode,
+				isSectionBlock,
+				isZoomOut: _isZoomOut,
+			} = unlock( select( blockEditorStore ) );
+
+			const _order = getBlockOrder( rootClientId );
+
+			if ( getSettings().isPreviewMode ) {
+				return {
+					order: _order,
+					selectedBlocks: EMPTY_ARRAY,
+					visibleBlocks: EMPTY_SET,
+				};
+			}
+
+			const selectedBlockClientId = getSelectedBlockClientId();
 			return {
-				order: getBlockOrder( rootClientId ),
+				order: _order,
 				selectedBlocks: getSelectedBlockClientIds(),
 				visibleBlocks: __unstableGetVisibleBlocks(),
+				isZoomOut: _isZoomOut(),
+				shouldRenderAppender:
+					! isSectionBlock( rootClientId ) &&
+					getBlockEditingMode( rootClientId ) !== 'disabled' &&
+					! getTemplateLock( rootClientId ) &&
+					hasAppender &&
+					! _isZoomOut() &&
+					( hasCustomAppender ||
+						rootClientId === selectedBlockClientId ||
+						( ! rootClientId &&
+							! selectedBlockClientId &&
+							! _order.length ) ),
 			};
 		},
-		[ rootClientId ]
+		[ rootClientId, hasAppender, hasCustomAppender ]
 	);
 
 	return (
@@ -156,18 +229,34 @@ function Items( {
 						! selectedBlocks.includes( clientId )
 					}
 				>
+					{ isZoomOut && (
+						<ZoomOutSeparator
+							clientId={ clientId }
+							rootClientId={ rootClientId }
+							position="top"
+						/>
+					) }
 					<BlockListBlock
 						rootClientId={ rootClientId }
 						clientId={ clientId }
 					/>
+					{ isZoomOut && (
+						<ZoomOutSeparator
+							clientId={ clientId }
+							rootClientId={ rootClientId }
+							position="bottom"
+						/>
+					) }
 				</AsyncModeProvider>
 			) ) }
 			{ order.length < 1 && placeholder }
-			<BlockListAppender
-				tagName={ __experimentalAppenderTagName }
-				rootClientId={ rootClientId }
-				renderAppender={ renderAppender }
-			/>
+			{ shouldRenderAppender && (
+				<BlockListAppender
+					tagName={ __experimentalAppenderTagName }
+					rootClientId={ rootClientId }
+					CustomAppender={ CustomAppender }
+				/>
+			) }
 		</LayoutProvider>
 	);
 }
diff --git a/packages/block-editor/src/components/block-list/index.native.js b/packages/block-editor/src/components/block-list/index.native.js
index 810e23e4c1442a..830b7ffec02f4d 100644
--- a/packages/block-editor/src/components/block-list/index.native.js
+++ b/packages/block-editor/src/components/block-list/index.native.js
@@ -139,7 +139,7 @@ export default function BlockList( {
 		insertBlock( newBlock, blockCount );
 	};
 
-	const scrollViewRef = useRef( null );
+	const scrollRef = useRef( null );
 
 	const shouldFlatListPreventAutomaticScroll = () =>
 		blockInsertionPointIsVisible;
@@ -211,7 +211,7 @@ export default function BlockList( {
 		);
 	};
 
-	const { blockToolbar, headerToolbar, floatingToolbar } = styles;
+	const { blockToolbar, floatingToolbar } = styles;
 
 	const containerStyle = {
 		flex: isRootList ? 1 : 0,
@@ -224,7 +224,6 @@ export default function BlockList( {
 	const isMultiBlocks = blockClientIds.length > 1;
 	const { isWider } = alignmentHelpers;
 	const extraScrollHeight =
-		headerToolbar.height +
 		blockToolbar.height +
 		( isFloatingToolbarVisible ? floatingToolbar.height : 0 );
 
@@ -239,22 +238,16 @@ export default function BlockList( {
 				<BlockListProvider
 					value={ {
 						...DEFAULT_BLOCK_LIST_CONTEXT,
-						scrollRef: scrollViewRef.current,
+						scrollRef: scrollRef.current,
 					} }
 				>
 					<BlockDraggableWrapper isRTL={ isRTL }>
 						{ ( { onScroll } ) => (
 							<KeyboardAwareFlatList
-								{ ...( Platform.OS === 'android'
-									? { removeClippedSubviews: false }
-									: {} ) } // Disable clipping on Android to fix focus losing. See https://github.com/wordpress-mobile/gutenberg-mobile/pull/741#issuecomment-472746541
 								accessibilityLabel="block-list"
-								innerRef={ ( ref ) => {
-									scrollViewRef.current = ref;
-								} }
+								ref={ scrollRef }
 								extraScrollHeight={ extraScrollHeight }
 								keyboardShouldPersistTaps="always"
-								scrollViewStyle={ { flex: 1 } }
 								extraData={ getExtraData() }
 								scrollEnabled={ isRootList }
 								contentContainerStyle={ [
diff --git a/packages/block-editor/src/components/block-list/private-block-context.js b/packages/block-editor/src/components/block-list/private-block-context.js
new file mode 100644
index 00000000000000..4ff3caa43a7241
--- /dev/null
+++ b/packages/block-editor/src/components/block-list/private-block-context.js
@@ -0,0 +1,6 @@
+/**
+ * WordPress dependencies
+ */
+import { createContext } from '@wordpress/element';
+
+export const PrivateBlockContext = createContext( {} );
diff --git a/packages/block-editor/src/components/block-list/test/block-outline.native.js b/packages/block-editor/src/components/block-list/test/block-outline.native.js
new file mode 100644
index 00000000000000..6e549542ad6672
--- /dev/null
+++ b/packages/block-editor/src/components/block-list/test/block-outline.native.js
@@ -0,0 +1,255 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from 'test/helpers';
+
+/**
+ * Internal dependencies
+ */
+import BlockOutline from '../block-outline';
+
+describe( 'BlockOutline', () => {
+	describe( 'containing an unselected block', () => {
+		it( 'should not render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected={ false }
+					blockCategory="design"
+					name="core/group"
+				/>
+			);
+
+			expect( screen.queryByTestId( 'block-outline' ) ).toBeNull();
+		} );
+	} );
+
+	describe( 'containing a block with inner blocks', () => {
+		it( 'should render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="design"
+					name="core/group"
+					hasInnerBlocks
+				/>
+			);
+
+			expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+		} );
+	} );
+
+	describe( 'containing a design category block', () => {
+		it( 'should render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="design"
+					name="core/group"
+				/>
+			);
+
+			expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+		} );
+	} );
+
+	describe( 'containing a text category block', () => {
+		it( 'should not render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="text"
+					name="core/paragraph"
+				/>
+			);
+
+			expect( screen.queryByTestId( 'block-outline' ) ).toBeNull();
+		} );
+
+		describe( 'with inner blocks', () => {
+			it( 'should render an outline', async () => {
+				render(
+					<BlockOutline
+						isSelected
+						blockCategory="text"
+						name="core/list"
+						hasInnerBlocks
+					/>
+				);
+
+				expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+			} );
+		} );
+	} );
+
+	describe( 'containing a widget category block', () => {
+		it( 'should render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="widgets"
+					name="core/latest-posts"
+				/>
+			);
+
+			expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+		} );
+	} );
+
+	describe( 'containing a spacer block', () => {
+		it( 'should not render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="design"
+					name="core/spacer"
+				/>
+			);
+
+			expect( screen.queryByTestId( 'block-outline' ) ).toBeNull();
+		} );
+	} );
+
+	describe( 'containing a button block', () => {
+		it( 'should not render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="design"
+					name="core/button"
+				/>
+			);
+
+			expect( screen.queryByTestId( 'block-outline' ) ).toBeNull();
+		} );
+	} );
+
+	describe( 'containing a social link block', () => {
+		it( 'should render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="embed"
+					name="core/social-link"
+				/>
+			);
+
+			expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+		} );
+
+		describe( 'when platform specific', () => {
+			it( 'should render an outline', async () => {
+				render(
+					<BlockOutline
+						isSelected
+						blockCategory="embed"
+						name="core/social-link-amazon"
+					/>
+				);
+
+				expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+			} );
+		} );
+	} );
+
+	describe( 'containing a media block', () => {
+		it( 'should not render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="media"
+					name="core/image"
+				/>
+			);
+
+			expect( screen.queryByTestId( 'block-outline' ) ).toBeNull();
+		} );
+
+		describe( 'with inner blocks', () => {
+			it( 'should render an outline', async () => {
+				render(
+					<BlockOutline
+						isSelected
+						blockCategory="media"
+						name="core/gallery"
+						hasInnerBlocks
+					/>
+				);
+
+				expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+			} );
+
+			describe( 'when cover block', () => {
+				it( 'should not render an outline', async () => {
+					render(
+						<BlockOutline
+							isSelected
+							blockCategory="media"
+							name="core/cover"
+							hasInnerBlocks
+						/>
+					);
+
+					expect(
+						screen.queryByTestId( 'block-outline' )
+					).toBeNull();
+				} );
+			} );
+		} );
+
+		describe( 'when a file block', () => {
+			it( 'should render an outline', async () => {
+				render(
+					<BlockOutline
+						isSelected
+						blockCategory="media"
+						name="core/file"
+					/>
+				);
+
+				expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+			} );
+		} );
+
+		describe( 'when an audio block', () => {
+			it( 'should render an outline', async () => {
+				render(
+					<BlockOutline
+						isSelected
+						blockCategory="media"
+						name="core/audio"
+					/>
+				);
+
+				expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+			} );
+		} );
+	} );
+
+	describe( 'containing a freeform block', () => {
+		it( 'should render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="text"
+					name="core/freeform"
+				/>
+			);
+
+			expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+		} );
+	} );
+
+	describe( 'containing a missing block', () => {
+		it( 'should render an outline', async () => {
+			render(
+				<BlockOutline
+					isSelected
+					blockCategory="text"
+					name="core/missing"
+				/>
+			);
+
+			expect( screen.getByTestId( 'block-outline' ) ).toBeVisible();
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/components/block-list/use-block-props/index.js b/packages/block-editor/src/components/block-list/use-block-props/index.js
index d5f4e7608255db..25b9a21f0d2867 100644
--- a/packages/block-editor/src/components/block-list/use-block-props/index.js
+++ b/packages/block-editor/src/components/block-list/use-block-props/index.js
@@ -1,48 +1,35 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { useContext } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
-import {
-	__unstableGetBlockProps as getBlockProps,
-	getBlockType,
-	store as blocksStore,
-} from '@wordpress/blocks';
+import { __unstableGetBlockProps as getBlockProps } from '@wordpress/blocks';
 import { useMergeRefs, useDisabled } from '@wordpress/compose';
-import { useSelect } from '@wordpress/data';
 import warning from '@wordpress/warning';
 
 /**
  * Internal dependencies
  */
 import useMovingAnimation from '../../use-moving-animation';
-import { BlockListBlockContext } from '../block-list-block-context';
+import { PrivateBlockContext } from '../private-block-context';
 import { useFocusFirstElement } from './use-focus-first-element';
 import { useIsHovered } from './use-is-hovered';
-import { useBlockEditContext } from '../../block-edit/context';
-import { useBlockClassNames } from './use-block-class-names';
-import { useBlockDefaultClassName } from './use-block-default-class-name';
-import { useBlockCustomClassName } from './use-block-custom-class-name';
-import { useBlockMovingModeClassNames } from './use-block-moving-mode-class-names';
+import {
+	blockBindingsKey,
+	useBlockEditContext,
+} from '../../block-edit/context';
 import { useFocusHandler } from './use-focus-handler';
 import { useEventHandlers } from './use-selected-block-event-handlers';
-import { useNavModeExit } from './use-nav-mode-exit';
 import { useBlockRefProvider } from './use-block-refs';
 import { useIntersectionObserver } from './use-intersection-observer';
-import { store as blockEditorStore } from '../../../store';
-import useBlockOverlayActive from '../../block-content-overlay';
-import { unlock } from '../../../lock-unlock';
-
-/**
- * If the block count exceeds the threshold, we disable the reordering animation
- * to avoid laginess.
- */
-const BLOCK_ANIMATION_THRESHOLD = 200;
+import { useScrollIntoView } from './use-scroll-into-view';
+import { useFlashEditableBlocks } from '../../use-flash-editable-blocks';
+import { canBindBlock } from '../../../hooks/use-bindings-attributes';
 
 /**
  * This hook is used to lightly mark an element as a block element. The element
@@ -61,13 +48,13 @@ const BLOCK_ANIMATION_THRESHOLD = 200;
  *
  * export default function Edit() {
  *
- *   const blockProps = useBlockProps(
+ *   const blockProps = useBlockProps( {
  *     className: 'my-custom-class',
  *     style: {
  *       color: '#222222',
  *       backgroundColor: '#eeeeee'
  *     }
- *   )
+ *   } )
  *
  *   return (
  *	    <div { ...blockProps }>
@@ -92,84 +79,60 @@ export function useBlockProps( props = {}, { __unstableIsHtml } = {} ) {
 		className,
 		wrapperProps = {},
 		isAligned,
-	} = useContext( BlockListBlockContext );
-	const {
 		index,
 		mode,
 		name,
 		blockApiVersion,
 		blockTitle,
-		isPartOfSelection,
-		adjustScrolling,
-		enableAnimation,
+		isSelected,
 		isSubtreeDisabled,
-	} = useSelect(
-		( select ) => {
-			const {
-				getBlockAttributes,
-				getBlockIndex,
-				getBlockMode,
-				getBlockName,
-				isTyping,
-				getGlobalBlockCount,
-				isBlockSelected,
-				isBlockMultiSelected,
-				isAncestorMultiSelected,
-				isFirstMultiSelectedBlock,
-				isBlockSubtreeDisabled,
-			} = unlock( select( blockEditorStore ) );
-			const { getActiveBlockVariation } = select( blocksStore );
-			const isSelected = isBlockSelected( clientId );
-			const isPartOfMultiSelection =
-				isBlockMultiSelected( clientId ) ||
-				isAncestorMultiSelected( clientId );
-			const blockName = getBlockName( clientId );
-			const blockType = getBlockType( blockName );
-			const attributes = getBlockAttributes( clientId );
-			const match = getActiveBlockVariation( blockName, attributes );
-
-			return {
-				index: getBlockIndex( clientId ),
-				mode: getBlockMode( clientId ),
-				name: blockName,
-				blockApiVersion: blockType?.apiVersion || 1,
-				blockTitle: match?.title || blockType?.title,
-				isPartOfSelection: isSelected || isPartOfMultiSelection,
-				adjustScrolling:
-					isSelected || isFirstMultiSelectedBlock( clientId ),
-				enableAnimation:
-					! isTyping() &&
-					getGlobalBlockCount() <= BLOCK_ANIMATION_THRESHOLD,
-				isSubtreeDisabled: isBlockSubtreeDisabled( clientId ),
-			};
-		},
-		[ clientId ]
-	);
-
-	const hasOverlay = useBlockOverlayActive( clientId );
+		hasOverlay,
+		initialPosition,
+		blockEditingMode,
+		isHighlighted,
+		isMultiSelected,
+		isPartiallySelected,
+		isReusable,
+		isDragging,
+		hasChildSelected,
+		isEditingDisabled,
+		hasEditableOutline,
+		isTemporarilyEditingAsBlocks,
+		defaultClassName,
+		isSectionBlock,
+	} = useContext( PrivateBlockContext );
 
 	// translators: %s: Type of block (i.e. Text, Image etc)
 	const blockLabel = sprintf( __( 'Block: %s' ), blockTitle );
 	const htmlSuffix = mode === 'html' && ! __unstableIsHtml ? '-visual' : '';
 	const mergedRefs = useMergeRefs( [
 		props.ref,
-		useFocusFirstElement( clientId ),
+		useFocusFirstElement( { clientId, initialPosition } ),
 		useBlockRefProvider( clientId ),
 		useFocusHandler( clientId ),
-		useEventHandlers( clientId ),
-		useNavModeExit( clientId ),
-		useIsHovered(),
+		useEventHandlers( { clientId, isSelected } ),
+		useIsHovered( { clientId } ),
 		useIntersectionObserver(),
-		useMovingAnimation( {
-			isSelected: isPartOfSelection,
-			adjustScrolling,
-			enableAnimation,
-			triggerAnimationOnChange: index,
-		} ),
+		useMovingAnimation( { triggerAnimationOnChange: index, clientId } ),
 		useDisabled( { isDisabled: ! hasOverlay } ),
+		useFlashEditableBlocks( {
+			clientId,
+			isEnabled: isSectionBlock,
+		} ),
+		useScrollIntoView( { isSelected } ),
 	] );
 
 	const blockEditContext = useBlockEditContext();
+	const hasBlockBindings = !! blockEditContext[ blockBindingsKey ];
+	const bindingsStyle =
+		hasBlockBindings && canBindBlock( name )
+			? {
+					'--wp-admin-theme-color': 'var(--wp-block-synced-color)',
+					'--wp-admin-theme-color--rgb':
+						'var(--wp-block-synced-color--rgb)',
+			  }
+			: {};
+
 	// Ensures it warns only inside the `edit` implementation for the block.
 	if ( blockApiVersion < 2 && clientId === blockEditContext.clientId ) {
 		warning(
@@ -177,8 +140,18 @@ export function useBlockProps( props = {}, { __unstableIsHtml } = {} ) {
 		);
 	}
 
+	let hasNegativeMargin = false;
+	if (
+		wrapperProps?.style?.marginTop?.charAt( 0 ) === '-' ||
+		wrapperProps?.style?.marginBottom?.charAt( 0 ) === '-' ||
+		wrapperProps?.style?.marginLeft?.charAt( 0 ) === '-' ||
+		wrapperProps?.style?.marginRight?.charAt( 0 ) === '-'
+	) {
+		hasNegativeMargin = true;
+	}
+
 	return {
-		tabIndex: 0,
+		tabIndex: blockEditingMode === 'disabled' ? -1 : 0,
 		...wrapperProps,
 		...props,
 		ref: mergedRefs,
@@ -189,21 +162,31 @@ export function useBlockProps( props = {}, { __unstableIsHtml } = {} ) {
 		'data-type': name,
 		'data-title': blockTitle,
 		inert: isSubtreeDisabled ? 'true' : undefined,
-		className: classnames(
-			// The wp-block className is important for editor styles.
-			classnames( 'block-editor-block-list__block', {
+		className: clsx(
+			'block-editor-block-list__block',
+			{
+				// The wp-block className is important for editor styles.
 				'wp-block': ! isAligned,
 				'has-block-overlay': hasOverlay,
-			} ),
+				'is-selected': isSelected,
+				'is-highlighted': isHighlighted,
+				'is-multi-selected': isMultiSelected,
+				'is-partially-selected': isPartiallySelected,
+				'is-reusable': isReusable,
+				'is-dragging': isDragging,
+				'has-child-selected': hasChildSelected,
+				'is-editing-disabled': isEditingDisabled,
+				'has-editable-outline': hasEditableOutline,
+				'has-negative-margin': hasNegativeMargin,
+				'is-content-locked-temporarily-editing-as-blocks':
+					isTemporarilyEditingAsBlocks,
+			},
 			className,
 			props.className,
 			wrapperProps.className,
-			useBlockClassNames( clientId ),
-			useBlockDefaultClassName( clientId ),
-			useBlockCustomClassName( clientId ),
-			useBlockMovingModeClassNames( clientId )
+			defaultClassName
 		),
-		style: { ...wrapperProps.style, ...props.style },
+		style: { ...wrapperProps.style, ...props.style, ...bindingsStyle },
 	};
 }
 
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-block-class-names.js b/packages/block-editor/src/components/block-list/use-block-props/use-block-class-names.js
deleted file mode 100644
index fce94b85f91190..00000000000000
--- a/packages/block-editor/src/components/block-list/use-block-props/use-block-class-names.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { isReusableBlock, getBlockType } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../../store';
-
-/**
- * Returns the class names used for the different states of the block.
- *
- * @param {string} clientId The block client ID.
- *
- * @return {string} The class names.
- */
-export function useBlockClassNames( clientId ) {
-	return useSelect(
-		( select ) => {
-			const {
-				isBlockBeingDragged,
-				isBlockHighlighted,
-				isBlockSelected,
-				isBlockMultiSelected,
-				getBlockName,
-				getSettings,
-				hasSelectedInnerBlock,
-				isTyping,
-				__unstableIsFullySelected,
-				__unstableSelectionHasUnmergeableBlock,
-			} = select( blockEditorStore );
-			const { outlineMode } = getSettings();
-			const isDragging = isBlockBeingDragged( clientId );
-			const isSelected = isBlockSelected( clientId );
-			const name = getBlockName( clientId );
-			const checkDeep = true;
-			// "ancestor" is the more appropriate label due to "deep" check.
-			const isAncestorOfSelectedBlock = hasSelectedInnerBlock(
-				clientId,
-				checkDeep
-			);
-			const isMultiSelected = isBlockMultiSelected( clientId );
-			return classnames( {
-				'is-selected': isSelected,
-				'is-highlighted': isBlockHighlighted( clientId ),
-				'is-multi-selected': isMultiSelected,
-				'is-partially-selected':
-					isMultiSelected &&
-					! __unstableIsFullySelected() &&
-					! __unstableSelectionHasUnmergeableBlock(),
-				'is-reusable': isReusableBlock( getBlockType( name ) ),
-				'is-dragging': isDragging,
-				'has-child-selected': isAncestorOfSelectedBlock,
-				'remove-outline': isSelected && outlineMode && isTyping(),
-			} );
-		},
-		[ clientId ]
-	);
-}
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-block-custom-class-name.js b/packages/block-editor/src/components/block-list/use-block-props/use-block-custom-class-name.js
deleted file mode 100644
index 50372c09a042ca..00000000000000
--- a/packages/block-editor/src/components/block-list/use-block-props/use-block-custom-class-name.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { getBlockType } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../../store';
-
-/**
- * Returns the custom class name if the block is a light block.
- *
- * @param {string} clientId The block client ID.
- *
- * @return {string} The custom class name.
- */
-export function useBlockCustomClassName( clientId ) {
-	// It's good for this to be a separate selector because it will be executed
-	// on every attribute change, while the other selectors are not re-evaluated
-	// as much.
-	return useSelect(
-		( select ) => {
-			const { getBlockName, getBlockAttributes } =
-				select( blockEditorStore );
-			const attributes = getBlockAttributes( clientId );
-
-			if ( ! attributes?.className ) {
-				return;
-			}
-
-			const blockType = getBlockType( getBlockName( clientId ) );
-			const hasLightBlockWrapper = blockType?.apiVersion > 1;
-
-			if ( ! hasLightBlockWrapper ) {
-				return;
-			}
-
-			return attributes.className;
-		},
-		[ clientId ]
-	);
-}
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-block-default-class-name.js b/packages/block-editor/src/components/block-list/use-block-props/use-block-default-class-name.js
deleted file mode 100644
index 7877ceb96490ca..00000000000000
--- a/packages/block-editor/src/components/block-list/use-block-props/use-block-default-class-name.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { getBlockType, getBlockDefaultClassName } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../../store';
-
-/**
- * Returns the default class name if the block is a light block and it supports
- * `className`.
- *
- * @param {string} clientId The block client ID.
- *
- * @return {string} The class name, e.g. `wp-block-paragraph`.
- */
-export function useBlockDefaultClassName( clientId ) {
-	return useSelect(
-		( select ) => {
-			const name = select( blockEditorStore ).getBlockName( clientId );
-			const blockType = getBlockType( name );
-			const hasLightBlockWrapper = blockType?.apiVersion > 1;
-
-			if ( ! hasLightBlockWrapper ) {
-				return;
-			}
-
-			return getBlockDefaultClassName( name );
-		},
-		[ clientId ]
-	);
-}
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-block-moving-mode-class-names.js b/packages/block-editor/src/components/block-list/use-block-props/use-block-moving-mode-class-names.js
deleted file mode 100644
index 686e719196f982..00000000000000
--- a/packages/block-editor/src/components/block-list/use-block-props/use-block-moving-mode-class-names.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../../store';
-
-/**
- * Returns the class names used for block moving mode.
- *
- * @param {string} clientId The block client ID to insert above.
- *
- * @return {string} The class names.
- */
-export function useBlockMovingModeClassNames( clientId ) {
-	return useSelect(
-		( select ) => {
-			const {
-				hasBlockMovingClientId,
-				canInsertBlockType,
-				getBlockName,
-				getBlockRootClientId,
-				isBlockSelected,
-			} = select( blockEditorStore );
-
-			// The classes are only relevant for the selected block. Avoid
-			// re-rendering all blocks!
-			if ( ! isBlockSelected( clientId ) ) {
-				return;
-			}
-
-			const movingClientId = hasBlockMovingClientId();
-
-			if ( ! movingClientId ) {
-				return;
-			}
-
-			return classnames( 'is-block-moving-mode', {
-				'can-insert-moving-block': canInsertBlockType(
-					getBlockName( movingClientId ),
-					getBlockRootClientId( clientId )
-				),
-			} );
-		},
-		[ clientId ]
-	);
-}
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-block-refs.js b/packages/block-editor/src/components/block-list/use-block-props/use-block-refs.js
index 56e424319739e1..16fd3ff1ca81dd 100644
--- a/packages/block-editor/src/components/block-list/use-block-props/use-block-refs.js
+++ b/packages/block-editor/src/components/block-list/use-block-props/use-block-refs.js
@@ -1,13 +1,7 @@
 /**
  * WordPress dependencies
  */
-import {
-	useContext,
-	useLayoutEffect,
-	useMemo,
-	useRef,
-	useState,
-} from '@wordpress/element';
+import { useContext, useState, useLayoutEffect } from '@wordpress/element';
 import { useRefEffect } from '@wordpress/compose';
 
 /**
@@ -16,7 +10,7 @@ import { useRefEffect } from '@wordpress/compose';
 import { BlockRefs } from '../../provider/block-refs-provider';
 
 /** @typedef {import('@wordpress/element').RefCallback} RefCallback */
-/** @typedef {import('@wordpress/element').RefObject} RefObject */
+/** @typedef {import('@wordpress/element').Ref} Ref */
 
 /**
  * Provides a ref to the BlockRefs context.
@@ -26,61 +20,43 @@ import { BlockRefs } from '../../provider/block-refs-provider';
  * @return {RefCallback} Ref callback.
  */
 export function useBlockRefProvider( clientId ) {
-	const { refs, callbacks } = useContext( BlockRefs );
-	const ref = useRef();
-	useLayoutEffect( () => {
-		refs.set( ref, clientId );
-		return () => {
-			refs.delete( ref );
-		};
-	}, [ clientId ] );
+	const { refsMap } = useContext( BlockRefs );
 	return useRefEffect(
 		( element ) => {
-			// Update the ref in the provider.
-			ref.current = element;
-			// Call any update functions.
-			callbacks.forEach( ( id, setElement ) => {
-				if ( clientId === id ) {
-					setElement( element );
-				}
-			} );
+			refsMap.set( clientId, element );
+			return () => refsMap.delete( clientId );
 		},
 		[ clientId ]
 	);
 }
 
+function assignRef( ref, value ) {
+	if ( typeof ref === 'function' ) {
+		ref( value );
+	} else if ( ref ) {
+		ref.current = value;
+	}
+}
+
 /**
- * Gets a ref pointing to the current block element. Continues to return a
- * stable ref even if the block client ID changes.
+ * Tracks the DOM element for the block identified by `clientId` and assigns it to the `ref`
+ * whenever it changes.
  *
- * @param {string} clientId The client ID to get a ref for.
- *
- * @return {RefObject} A ref containing the element.
+ * @param {string} clientId The client ID to track.
+ * @param {Ref}    ref      The ref object/callback to assign to.
  */
-function useBlockRef( clientId ) {
-	const { refs } = useContext( BlockRefs );
-	const freshClientId = useRef();
-	freshClientId.current = clientId;
-	// Always return an object, even if no ref exists for a given client ID, so
-	// that `current` works at a later point.
-	return useMemo(
-		() => ( {
-			get current() {
-				let element = null;
-
-				// Multiple refs may be created for a single block. Find the
-				// first that has an element set.
-				for ( const [ ref, id ] of refs.entries() ) {
-					if ( id === freshClientId.current && ref.current ) {
-						element = ref.current;
-					}
-				}
-
-				return element;
-			},
-		} ),
-		[]
-	);
+export function useBlockElementRef( clientId, ref ) {
+	const { refsMap } = useContext( BlockRefs );
+	useLayoutEffect( () => {
+		assignRef( ref, refsMap.get( clientId ) );
+		const unsubscribe = refsMap.subscribe( clientId, () =>
+			assignRef( ref, refsMap.get( clientId ) )
+		);
+		return () => {
+			unsubscribe();
+			assignRef( ref, null );
+		};
+	}, [ refsMap, clientId, ref ] );
 }
 
 /**
@@ -91,24 +67,8 @@ function useBlockRef( clientId ) {
  *
  * @return {Element|null} The block's wrapper element.
  */
-function useBlockElement( clientId ) {
-	const { callbacks } = useContext( BlockRefs );
-	const ref = useBlockRef( clientId );
-	const [ element, setElement ] = useState( null );
-
-	useLayoutEffect( () => {
-		if ( ! clientId ) {
-			return;
-		}
-
-		callbacks.set( setElement, clientId );
-		return () => {
-			callbacks.delete( setElement );
-		};
-	}, [ clientId ] );
-
-	return ref.current || element;
+export function useBlockElement( clientId ) {
+	const [ blockElement, setBlockElement ] = useState( null );
+	useBlockElementRef( clientId, setBlockElement );
+	return blockElement;
 }
-
-export { useBlockRef as __unstableUseBlockRef };
-export { useBlockElement as __unstableUseBlockElement };
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-focus-first-element.js b/packages/block-editor/src/components/block-list/use-block-props/use-focus-first-element.js
index 21515d74b2ecdb..26f7cca2990d89 100644
--- a/packages/block-editor/src/components/block-list/use-block-props/use-focus-first-element.js
+++ b/packages/block-editor/src/components/block-list/use-block-props/use-focus-first-element.js
@@ -15,41 +15,10 @@ import { useSelect } from '@wordpress/data';
  */
 import { isInsideRootBlock } from '../../../utils/dom';
 import { store as blockEditorStore } from '../../../store';
+import { unlock } from '../../../lock-unlock';
 
 /** @typedef {import('@wordpress/element').RefObject} RefObject */
 
-/**
- * Returns the initial position if the block needs to be focussed, `undefined`
- * otherwise. The initial position is either 0 (start) or -1 (end).
- *
- * @param {string} clientId Block client ID.
- *
- * @return {number} The initial position, either 0 (start) or -1 (end).
- */
-function useInitialPosition( clientId ) {
-	return useSelect(
-		( select ) => {
-			const {
-				getSelectedBlocksInitialCaretPosition,
-				__unstableGetEditorMode,
-				isBlockSelected,
-			} = select( blockEditorStore );
-
-			if ( ! isBlockSelected( clientId ) ) {
-				return;
-			}
-
-			if ( __unstableGetEditorMode() !== 'edit' ) {
-				return;
-			}
-
-			// If there's no initial position, return 0 to focus the start.
-			return getSelectedBlocksInitialCaretPosition();
-		},
-		[ clientId ]
-	);
-}
-
 /**
  * Transitions focus to the block or inner tabbable when the block becomes
  * selected and an initial position is set.
@@ -58,14 +27,19 @@ function useInitialPosition( clientId ) {
  *
  * @return {RefObject} React ref with the block element.
  */
-export function useFocusFirstElement( clientId ) {
+export function useFocusFirstElement( { clientId, initialPosition } ) {
 	const ref = useRef();
-	const initialPosition = useInitialPosition( clientId );
-	const { isBlockSelected, isMultiSelecting } = useSelect( blockEditorStore );
+	const { isBlockSelected, isMultiSelecting, isZoomOut } = unlock(
+		useSelect( blockEditorStore )
+	);
 
 	useEffect( () => {
 		// Check if the block is still selected at the time this effect runs.
-		if ( ! isBlockSelected( clientId ) || isMultiSelecting() ) {
+		if (
+			! isBlockSelected( clientId ) ||
+			isMultiSelecting() ||
+			isZoomOut()
+		) {
 			return;
 		}
 
@@ -113,7 +87,6 @@ export function useFocusFirstElement( clientId ) {
 				return;
 			}
 		}
-
 		placeCaretAtHorizontalEdge( target, isReverse );
 	}, [ initialPosition, clientId ] );
 
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-is-hovered.js b/packages/block-editor/src/components/block-list/use-block-props/use-is-hovered.js
index 653ef3049b1242..7c4b4aae8a70a1 100644
--- a/packages/block-editor/src/components/block-list/use-block-props/use-is-hovered.js
+++ b/packages/block-editor/src/components/block-list/use-block-props/use-is-hovered.js
@@ -1,50 +1,49 @@
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
+import { useDispatch } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../../store';
 
-function listener( event ) {
-	if ( event.defaultPrevented ) {
-		return;
+/*
+ * Adds `is-hovered` class when the block is hovered and in navigation or
+ * outline mode.
+ */
+export function useIsHovered( { clientId } ) {
+	const { hoverBlock } = useDispatch( blockEditorStore );
+
+	function listener( event ) {
+		if ( event.defaultPrevented ) {
+			return;
+		}
+
+		const action = event.type === 'mouseover' ? 'add' : 'remove';
+
+		event.preventDefault();
+		event.currentTarget.classList[ action ]( 'is-hovered' );
+
+		if ( action === 'add' ) {
+			hoverBlock( clientId );
+		} else {
+			hoverBlock( null );
+		}
 	}
 
-	const action = event.type === 'mouseover' ? 'add' : 'remove';
+	return useRefEffect( ( node ) => {
+		node.addEventListener( 'mouseout', listener );
+		node.addEventListener( 'mouseover', listener );
 
-	event.preventDefault();
-	event.currentTarget.classList[ action ]( 'is-hovered' );
-}
+		return () => {
+			node.removeEventListener( 'mouseout', listener );
+			node.removeEventListener( 'mouseover', listener );
 
-/**
- * Adds `is-hovered` class when the block is hovered and in navigation or
- * outline mode.
- */
-export function useIsHovered() {
-	const isEnabled = useSelect( ( select ) => {
-		const { getSettings } = select( blockEditorStore );
-		return getSettings().outlineMode;
+			// Remove class in case it lingers.
+			node.classList.remove( 'is-hovered' );
+			hoverBlock( null );
+		};
 	}, [] );
-
-	return useRefEffect(
-		( node ) => {
-			if ( isEnabled ) {
-				node.addEventListener( 'mouseout', listener );
-				node.addEventListener( 'mouseover', listener );
-
-				return () => {
-					node.removeEventListener( 'mouseout', listener );
-					node.removeEventListener( 'mouseover', listener );
-
-					// Remove class in case it lingers.
-					node.classList.remove( 'is-hovered' );
-				};
-			}
-		},
-		[ isEnabled ]
-	);
 }
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-nav-mode-exit.js b/packages/block-editor/src/components/block-list/use-block-props/use-nav-mode-exit.js
deleted file mode 100644
index aa9c0a630c5bd7..00000000000000
--- a/packages/block-editor/src/components/block-list/use-block-props/use-nav-mode-exit.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useRefEffect } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../../store';
-
-/**
- * Allows navigation mode to be exited by clicking in the selected block.
- *
- * @param {string} clientId Block client ID.
- */
-export function useNavModeExit( clientId ) {
-	const { isNavigationMode, isBlockSelected } = useSelect( blockEditorStore );
-	const { setNavigationMode, selectBlock } = useDispatch( blockEditorStore );
-	return useRefEffect(
-		( node ) => {
-			function onMouseDown( event ) {
-				// Don't select a block if it's already handled by a child
-				// block.
-				if ( isNavigationMode() && ! event.defaultPrevented ) {
-					// Prevent focus from moving to the block.
-					event.preventDefault();
-
-					// When clicking on a selected block, exit navigation mode.
-					if ( isBlockSelected( clientId ) ) {
-						setNavigationMode( false );
-					} else {
-						selectBlock( clientId );
-					}
-				}
-			}
-
-			node.addEventListener( 'mousedown', onMouseDown );
-
-			return () => {
-				node.removeEventListener( 'mousedown', onMouseDown );
-			};
-		},
-		[ clientId, isNavigationMode, isBlockSelected, setNavigationMode ]
-	);
-}
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-scroll-into-view.js b/packages/block-editor/src/components/block-list/use-block-props/use-scroll-into-view.js
new file mode 100644
index 00000000000000..6301dac2c2108e
--- /dev/null
+++ b/packages/block-editor/src/components/block-list/use-block-props/use-scroll-into-view.js
@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import { useReducedMotion, useRefEffect } from '@wordpress/compose';
+
+export function useScrollIntoView( { isSelected } ) {
+	const prefersReducedMotion = useReducedMotion();
+	return useRefEffect(
+		( node ) => {
+			if ( isSelected ) {
+				const { ownerDocument } = node;
+				const { defaultView } = ownerDocument;
+				if ( ! defaultView.IntersectionObserver ) {
+					return;
+				}
+				const observer = new defaultView.IntersectionObserver(
+					( entries ) => {
+						// Once observing starts, we always get an initial
+						// entry with the intersecting state.
+						if ( ! entries[ 0 ].isIntersecting ) {
+							node.scrollIntoView( {
+								behavior: prefersReducedMotion
+									? 'instant'
+									: 'smooth',
+							} );
+						}
+						observer.disconnect();
+					}
+				);
+				observer.observe( node );
+				return () => {
+					observer.disconnect();
+				};
+			}
+		},
+		[ isSelected ]
+	);
+}
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-selected-block-event-handlers.js b/packages/block-editor/src/components/block-list/use-block-props/use-selected-block-event-handlers.js
index bd6566112263f1..68f8a671adbe9a 100644
--- a/packages/block-editor/src/components/block-list/use-block-props/use-selected-block-event-handlers.js
+++ b/packages/block-editor/src/components/block-list/use-block-props/use-selected-block-event-handlers.js
@@ -10,6 +10,7 @@ import { useRefEffect } from '@wordpress/compose';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../../store';
+import { unlock } from '../../../lock-unlock';
 
 /**
  * Adds block behaviour:
@@ -19,14 +20,13 @@ import { store as blockEditorStore } from '../../../store';
  *
  * @param {string} clientId Block client ID.
  */
-export function useEventHandlers( clientId ) {
-	const isSelected = useSelect(
-		( select ) => select( blockEditorStore ).isBlockSelected( clientId ),
-		[ clientId ]
+export function useEventHandlers( { clientId, isSelected } ) {
+	const { getBlockRootClientId, getBlockIndex, isZoomOut } = unlock(
+		useSelect( blockEditorStore )
+	);
+	const { insertAfterBlock, removeBlock, resetZoomLevel } = unlock(
+		useDispatch( blockEditorStore )
 	);
-	const { getBlockRootClientId, getBlockIndex } =
-		useSelect( blockEditorStore );
-	const { insertDefaultBlock, removeBlock } = useDispatch( blockEditorStore );
 
 	return useRefEffect(
 		( node ) => {
@@ -60,12 +60,10 @@ export function useEventHandlers( clientId ) {
 
 				event.preventDefault();
 
-				if ( keyCode === ENTER ) {
-					insertDefaultBlock(
-						{},
-						getBlockRootClientId( clientId ),
-						getBlockIndex( clientId ) + 1
-					);
+				if ( keyCode === ENTER && isZoomOut() ) {
+					resetZoomLevel();
+				} else if ( keyCode === ENTER ) {
+					insertAfterBlock( clientId );
 				} else {
 					removeBlock( clientId );
 				}
@@ -94,8 +92,10 @@ export function useEventHandlers( clientId ) {
 			isSelected,
 			getBlockRootClientId,
 			getBlockIndex,
-			insertDefaultBlock,
+			insertAfterBlock,
 			removeBlock,
+			isZoomOut,
+			resetZoomLevel,
 		]
 	);
 }
diff --git a/packages/block-editor/src/components/block-list/use-in-between-inserter.js b/packages/block-editor/src/components/block-list/use-in-between-inserter.js
index a60453716ff29c..71eda2558f7930 100644
--- a/packages/block-editor/src/components/block-list/use-in-between-inserter.js
+++ b/packages/block-editor/src/components/block-list/use-in-between-inserter.js
@@ -11,13 +11,14 @@ import { isRTL } from '@wordpress/i18n';
  */
 import { store as blockEditorStore } from '../../store';
 import { InsertionPointOpenRef } from '../block-tools/insertion-point';
+import { unlock } from '../../lock-unlock';
 
 export function useInBetweenInserter() {
 	const openRef = useContext( InsertionPointOpenRef );
 	const isInBetweenInserterDisabled = useSelect(
 		( select ) =>
 			select( blockEditorStore ).getSettings().isDistractionFree ||
-			select( blockEditorStore ).__unstableGetEditorMode() === 'zoom-out',
+			unlock( select( blockEditorStore ) ).isZoomOut(),
 		[]
 	);
 	const {
@@ -25,10 +26,14 @@ export function useInBetweenInserter() {
 		getBlockIndex,
 		isMultiSelecting,
 		getSelectedBlockClientIds,
+		getSettings,
 		getTemplateLock,
 		__unstableIsWithinBlockOverlay,
 		getBlockEditingMode,
-	} = useSelect( blockEditorStore );
+		getBlockName,
+		getBlockAttributes,
+		getParentSectionBlock,
+	} = unlock( useSelect( blockEditorStore ) );
 	const { showInsertionPoint, hideInsertionPoint } =
 		useDispatch( blockEditorStore );
 
@@ -39,7 +44,9 @@ export function useInBetweenInserter() {
 			}
 
 			function onMouseMove( event ) {
-				if ( openRef.current ) {
+				// openRef is the reference to the insertion point between blocks.
+				// If the reference is not set or the insertion point is already open, return.
+				if ( openRef === undefined || openRef.current ) {
 					return;
 				}
 
@@ -75,14 +82,20 @@ export function useInBetweenInserter() {
 
 				if (
 					getTemplateLock( rootClientId ) ||
-					getBlockEditingMode( rootClientId ) === 'disabled'
+					getBlockEditingMode( rootClientId ) === 'disabled' ||
+					getBlockName( rootClientId ) === 'core/block' ||
+					( rootClientId &&
+						getBlockAttributes( rootClientId ).layout
+							?.isManualPlacement )
 				) {
 					return;
 				}
 
+				const blockListSettings = getBlockListSettings( rootClientId );
 				const orientation =
-					getBlockListSettings( rootClientId )?.orientation ||
-					'vertical';
+					blockListSettings?.orientation || 'vertical';
+				const captureToolbars =
+					!! blockListSettings?.__experimentalCaptureToolbars;
 				const offsetTop = event.clientY;
 				const offsetLeft = event.clientX;
 
@@ -122,14 +135,24 @@ export function useInBetweenInserter() {
 				const clientId = element.id.slice( 'block-'.length );
 				if (
 					! clientId ||
-					__unstableIsWithinBlockOverlay( clientId )
+					__unstableIsWithinBlockOverlay( clientId ) ||
+					!! getParentSectionBlock( clientId )
 				) {
 					return;
 				}
 
-				// Don't show the inserter when hovering above (conflicts with
-				// block toolbar) or inside selected block(s).
-				if ( getSelectedBlockClientIds().includes( clientId ) ) {
+				// Don't show the inserter if the following conditions are met,
+				// as it conflicts with the block toolbar:
+				// 1. when hovering above or inside selected block(s)
+				// 2. when the orientation is vertical
+				// 3. when the __experimentalCaptureToolbars is not enabled
+				// 4. when the Top Toolbar is not disabled
+				if (
+					getSelectedBlockClientIds().includes( clientId ) &&
+					orientation === 'vertical' &&
+					! captureToolbars &&
+					! getSettings().hasFixedToolbar
+				) {
 					return;
 				}
 				const elementRect = element.getBoundingClientRect();
diff --git a/packages/block-editor/src/components/block-list/use-scroll-upon-insertion.native.js b/packages/block-editor/src/components/block-list/use-scroll-upon-insertion.native.js
new file mode 100644
index 00000000000000..d224c4c7776716
--- /dev/null
+++ b/packages/block-editor/src/components/block-list/use-scroll-upon-insertion.native.js
@@ -0,0 +1,52 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { useBlockListContext } from './block-list-context';
+import { store as blockEditorStore } from '../../store';
+
+const useScrollUponInsertion = ( {
+	clientId,
+	isSelected,
+	isLayoutCalculated,
+	elementRef,
+} ) => {
+	const { scrollRef } = useBlockListContext();
+	const wasBlockJustInserted = useSelect(
+		( select ) =>
+			!! select( blockEditorStore ).wasBlockJustInserted(
+				clientId,
+				'inserter_menu'
+			),
+		[ clientId ]
+	);
+	useEffect( () => {
+		const lastScrollTo = scrollRef?.lastScrollTo.current;
+		const alreadyScrolledTo = lastScrollTo?.clientId === clientId;
+		if (
+			alreadyScrolledTo ||
+			! isSelected ||
+			! scrollRef ||
+			! wasBlockJustInserted ||
+			! isLayoutCalculated
+		) {
+			return;
+		}
+		scrollRef.scrollToElement( elementRef );
+		lastScrollTo.clientId = clientId;
+	}, [
+		isSelected,
+		scrollRef,
+		wasBlockJustInserted,
+		elementRef,
+		isLayoutCalculated,
+		clientId,
+	] );
+};
+
+export default useScrollUponInsertion;
diff --git a/packages/block-editor/src/components/block-list/zoom-out-separator.js b/packages/block-editor/src/components/block-list/zoom-out-separator.js
new file mode 100644
index 00000000000000..f2e6d050141fb5
--- /dev/null
+++ b/packages/block-editor/src/components/block-list/zoom-out-separator.js
@@ -0,0 +1,141 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	__unstableMotion as motion,
+	__unstableAnimatePresence as AnimatePresence,
+} from '@wordpress/components';
+import { useReducedMotion } from '@wordpress/compose';
+import { useSelect } from '@wordpress/data';
+import { useState } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+export function ZoomOutSeparator( {
+	clientId,
+	rootClientId = '',
+	position = 'top',
+} ) {
+	const [ isDraggedOver, setIsDraggedOver ] = useState( false );
+	const {
+		sectionRootClientId,
+		sectionClientIds,
+		insertionPoint,
+		blockInsertionPointVisible,
+		blockInsertionPoint,
+	} = useSelect( ( select ) => {
+		const {
+			getInsertionPoint,
+			getBlockOrder,
+			getSectionRootClientId,
+			isBlockInsertionPointVisible,
+			getBlockInsertionPoint,
+		} = unlock( select( blockEditorStore ) );
+
+		const root = getSectionRootClientId();
+		const sectionRootClientIds = getBlockOrder( root );
+		return {
+			sectionRootClientId: root,
+			sectionClientIds: sectionRootClientIds,
+			blockOrder: getBlockOrder( root ),
+			insertionPoint: getInsertionPoint(),
+			blockInsertionPoint: getBlockInsertionPoint(),
+			blockInsertionPointVisible: isBlockInsertionPointVisible(),
+		};
+	}, [] );
+
+	const isReducedMotion = useReducedMotion();
+
+	if ( ! clientId ) {
+		return;
+	}
+
+	let isVisible = false;
+
+	const isSectionBlock =
+		rootClientId === sectionRootClientId &&
+		sectionClientIds &&
+		sectionClientIds.includes( clientId );
+
+	if ( ! isSectionBlock ) {
+		return null;
+	}
+
+	const hasTopInsertionPoint =
+		insertionPoint?.index === 0 &&
+		clientId === sectionClientIds[ insertionPoint.index ];
+	const hasBottomInsertionPoint =
+		insertionPoint &&
+		insertionPoint.hasOwnProperty( 'index' ) &&
+		clientId === sectionClientIds[ insertionPoint.index - 1 ];
+	// We want to show the zoom out separator in either of these conditions:
+	// 1. If the inserter has an insertion index set
+	// 2. We are dragging a pattern over an insertion point
+	if ( position === 'top' ) {
+		isVisible =
+			hasTopInsertionPoint ||
+			( blockInsertionPointVisible &&
+				blockInsertionPoint.index === 0 &&
+				clientId === sectionClientIds[ blockInsertionPoint.index ] );
+	}
+
+	if ( position === 'bottom' ) {
+		isVisible =
+			hasBottomInsertionPoint ||
+			( blockInsertionPointVisible &&
+				clientId ===
+					sectionClientIds[ blockInsertionPoint.index - 1 ] );
+	}
+
+	return (
+		<AnimatePresence>
+			{ isVisible && (
+				<motion.div
+					initial={ { height: 0 } }
+					animate={ {
+						// Use a height equal to that of the zoom out frame size.
+						height: 'calc(1 * var(--wp-block-editor-iframe-zoom-out-frame-size) / var(--wp-block-editor-iframe-zoom-out-scale)',
+					} }
+					exit={ { height: 0 } }
+					transition={ {
+						type: 'tween',
+						duration: isReducedMotion ? 0 : 0.2,
+						ease: [ 0.6, 0, 0.4, 1 ],
+					} }
+					className={ clsx(
+						'block-editor-block-list__zoom-out-separator',
+						{
+							'is-dragged-over': isDraggedOver,
+						}
+					) }
+					data-is-insertion-point="true"
+					onDragOver={ () => setIsDraggedOver( true ) }
+					onDragLeave={ () => setIsDraggedOver( false ) }
+				>
+					<motion.div
+						initial={ { opacity: 0 } }
+						animate={ { opacity: 1 } }
+						exit={ { opacity: 0, transition: { delay: -0.125 } } }
+						transition={ {
+							ease: 'linear',
+							duration: 0.1,
+							delay: 0.125,
+						} }
+					>
+						{ __( 'Drop pattern.' ) }
+					</motion.div>
+				</motion.div>
+			) }
+		</AnimatePresence>
+	);
+}
diff --git a/packages/block-editor/src/components/block-lock/modal.js b/packages/block-editor/src/components/block-lock/modal.js
index cfafa6c031bbd1..7d09f7b63f8cd0 100644
--- a/packages/block-editor/src/components/block-lock/modal.js
+++ b/packages/block-editor/src/components/block-lock/modal.js
@@ -13,7 +13,6 @@ import {
 	ToggleControl,
 } from '@wordpress/components';
 import { lock as lockIcon, unlock as unlockIcon } from '@wordpress/icons';
-import { useInstanceId } from '@wordpress/compose';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { getBlockType } from '@wordpress/blocks';
 
@@ -64,10 +63,6 @@ export default function BlockLockModal( { clientId, onClose } ) {
 	);
 	const { updateBlockAttributes } = useDispatch( blockEditorStore );
 	const blockInformation = useBlockDisplayInformation( clientId );
-	const instanceId = useInstanceId(
-		BlockLockModal,
-		'block-editor-block-lock-modal__options-title'
-	);
 
 	useEffect( () => {
 		setLock( {
@@ -90,11 +85,6 @@ export default function BlockLockModal( { clientId, onClose } ) {
 			overlayClassName="block-editor-block-lock-modal"
 			onRequestClose={ onClose }
 		>
-			<p>
-				{ __(
-					'Choose specific attributes to restrict or lock all available options.'
-				) }
-			</p>
 			<form
 				onSubmit={ ( event ) => {
 					event.preventDefault();
@@ -107,84 +97,107 @@ export default function BlockLockModal( { clientId, onClose } ) {
 					onClose();
 				} }
 			>
-				<div
-					role="group"
-					aria-labelledby={ instanceId }
-					className="block-editor-block-lock-modal__options"
-				>
-					<CheckboxControl
-						__nextHasNoMarginBottom
-						className="block-editor-block-lock-modal__options-title"
-						label={
-							<span id={ instanceId }>{ __( 'Lock all' ) }</span>
-						}
-						checked={ isAllChecked }
-						indeterminate={ isMixed }
-						onChange={ ( newValue ) =>
-							setLock( {
-								move: newValue,
-								remove: newValue,
-								...( allowsEditLocking
-									? { edit: newValue }
-									: {} ),
-							} )
-						}
-					/>
-					<ul className="block-editor-block-lock-modal__checklist">
-						{ allowsEditLocking && (
-							<li className="block-editor-block-lock-modal__checklist-item">
-								<CheckboxControl
-									__nextHasNoMarginBottom
-									label={ __( 'Restrict editing' ) }
-									checked={ !! lock.edit }
-									onChange={ ( edit ) =>
-										setLock( ( prevLock ) => ( {
-											...prevLock,
-											edit,
-										} ) )
-									}
-								/>
-								<Icon
-									className="block-editor-block-lock-modal__lock-icon"
-									icon={ lock.edit ? lockIcon : unlockIcon }
-								/>
-							</li>
+				<fieldset className="block-editor-block-lock-modal__options">
+					<legend>
+						{ __(
+							'Choose specific attributes to restrict or lock all available options.'
 						) }
-						<li className="block-editor-block-lock-modal__checklist-item">
+					</legend>
+					{ /*
+					 * Disable reason: The `list` ARIA role is redundant but
+					 * Safari+VoiceOver won't announce the list otherwise.
+					 */
+					/* eslint-disable jsx-a11y/no-redundant-roles */ }
+					<ul
+						role="list"
+						className="block-editor-block-lock-modal__checklist"
+					>
+						<li>
 							<CheckboxControl
 								__nextHasNoMarginBottom
-								label={ __( 'Disable movement' ) }
-								checked={ lock.move }
-								onChange={ ( move ) =>
-									setLock( ( prevLock ) => ( {
-										...prevLock,
-										move,
-									} ) )
+								className="block-editor-block-lock-modal__options-all"
+								label={ __( 'Lock all' ) }
+								checked={ isAllChecked }
+								indeterminate={ isMixed }
+								onChange={ ( newValue ) =>
+									setLock( {
+										move: newValue,
+										remove: newValue,
+										...( allowsEditLocking
+											? { edit: newValue }
+											: {} ),
+									} )
 								}
 							/>
-							<Icon
-								className="block-editor-block-lock-modal__lock-icon"
-								icon={ lock.move ? lockIcon : unlockIcon }
-							/>
-						</li>
-						<li className="block-editor-block-lock-modal__checklist-item">
-							<CheckboxControl
-								__nextHasNoMarginBottom
-								label={ __( 'Prevent removal' ) }
-								checked={ lock.remove }
-								onChange={ ( remove ) =>
-									setLock( ( prevLock ) => ( {
-										...prevLock,
-										remove,
-									} ) )
-								}
-							/>
-							<Icon
-								className="block-editor-block-lock-modal__lock-icon"
-								icon={ lock.remove ? lockIcon : unlockIcon }
-							/>
+							<ul
+								role="list"
+								className="block-editor-block-lock-modal__checklist"
+							>
+								{ allowsEditLocking && (
+									<li className="block-editor-block-lock-modal__checklist-item">
+										<CheckboxControl
+											__nextHasNoMarginBottom
+											label={ __( 'Restrict editing' ) }
+											checked={ !! lock.edit }
+											onChange={ ( edit ) =>
+												setLock( ( prevLock ) => ( {
+													...prevLock,
+													edit,
+												} ) )
+											}
+										/>
+										<Icon
+											className="block-editor-block-lock-modal__lock-icon"
+											icon={
+												lock.edit
+													? lockIcon
+													: unlockIcon
+											}
+										/>
+									</li>
+								) }
+								<li className="block-editor-block-lock-modal__checklist-item">
+									<CheckboxControl
+										__nextHasNoMarginBottom
+										label={ __( 'Disable movement' ) }
+										checked={ lock.move }
+										onChange={ ( move ) =>
+											setLock( ( prevLock ) => ( {
+												...prevLock,
+												move,
+											} ) )
+										}
+									/>
+									<Icon
+										className="block-editor-block-lock-modal__lock-icon"
+										icon={
+											lock.move ? lockIcon : unlockIcon
+										}
+									/>
+								</li>
+								<li className="block-editor-block-lock-modal__checklist-item">
+									<CheckboxControl
+										__nextHasNoMarginBottom
+										label={ __( 'Prevent removal' ) }
+										checked={ lock.remove }
+										onChange={ ( remove ) =>
+											setLock( ( prevLock ) => ( {
+												...prevLock,
+												remove,
+											} ) )
+										}
+									/>
+									<Icon
+										className="block-editor-block-lock-modal__lock-icon"
+										icon={
+											lock.remove ? lockIcon : unlockIcon
+										}
+									/>
+								</li>
+							</ul>
 						</li>
 					</ul>
+					{ /* eslint-enable jsx-a11y/no-redundant-roles */ }
 					{ hasTemplateLock && (
 						<ToggleControl
 							__nextHasNoMarginBottom
@@ -197,19 +210,27 @@ export default function BlockLockModal( { clientId, onClose } ) {
 							}
 						/>
 					) }
-				</div>
+				</fieldset>
 				<Flex
 					className="block-editor-block-lock-modal__actions"
 					justify="flex-end"
 					expanded={ false }
 				>
 					<FlexItem>
-						<Button variant="tertiary" onClick={ onClose }>
+						<Button
+							variant="tertiary"
+							onClick={ onClose }
+							__next40pxDefaultSize
+						>
 							{ __( 'Cancel' ) }
 						</Button>
 					</FlexItem>
 					<FlexItem>
-						<Button variant="primary" type="submit">
+						<Button
+							variant="primary"
+							type="submit"
+							__next40pxDefaultSize
+						>
 							{ __( 'Apply' ) }
 						</Button>
 					</FlexItem>
diff --git a/packages/block-editor/src/components/block-lock/style.scss b/packages/block-editor/src/components/block-lock/style.scss
index b61447dcf9dc92..ad59030a8f4405 100644
--- a/packages/block-editor/src/components/block-lock/style.scss
+++ b/packages/block-editor/src/components/block-lock/style.scss
@@ -8,17 +8,23 @@
 	}
 }
 
+.block-editor-block-lock-modal__options legend {
+	margin-bottom: $grid-unit-20;
+	padding: 0;
+}
+
 .block-editor-block-lock-modal__checklist {
 	margin: 0;
 }
 
-.block-editor-block-lock-modal__options-title {
+.block-editor-block-lock-modal__options-all {
 	padding: $grid-unit-15 0;
 
 	.components-checkbox-control__label {
 		font-weight: 600;
 	}
 }
+
 .block-editor-block-lock-modal__checklist-item {
 	display: flex;
 	justify-content: space-between;
@@ -35,14 +41,14 @@
 
 	&:hover {
 		background-color: $gray-100;
-		border-radius: $radius-block-ui;
+		border-radius: $radius-small;
 	}
 }
 
 .block-editor-block-lock-modal__template-lock {
 	border-top: $border-width solid $gray-300;
 	margin-top: $grid-unit-20;
-	padding: $grid-unit-15 0;
+	padding-top: $grid-unit-20;
 }
 
 .block-editor-block-lock-modal__actions {
diff --git a/packages/block-editor/src/components/block-lock/toolbar.js b/packages/block-editor/src/components/block-lock/toolbar.js
index 5ba08b08846a4a..12376a7b56a5ee 100644
--- a/packages/block-editor/src/components/block-lock/toolbar.js
+++ b/packages/block-editor/src/components/block-lock/toolbar.js
@@ -3,9 +3,8 @@
  */
 import { __ } from '@wordpress/i18n';
 import { ToolbarButton, ToolbarGroup } from '@wordpress/components';
-import { focus } from '@wordpress/dom';
 import { useReducer, useRef, useEffect } from '@wordpress/element';
-import { lock } from '@wordpress/icons';
+import { lock, unlock } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -13,55 +12,44 @@ import { lock } from '@wordpress/icons';
 import BlockLockModal from './modal';
 import useBlockLock from './use-block-lock';
 
-export default function BlockLockToolbar( { clientId, wrapperRef } ) {
-	const { canEdit, canMove, canRemove, canLock } = useBlockLock( clientId );
+export default function BlockLockToolbar( { clientId } ) {
+	const { canLock, isLocked } = useBlockLock( clientId );
 
 	const [ isModalOpen, toggleModal ] = useReducer(
 		( isActive ) => ! isActive,
 		false
 	);
 
-	const lockButtonRef = useRef( null );
-	const isFirstRender = useRef( true );
+	const hasLockButtonShownRef = useRef( false );
 
-	const shouldHideBlockLockUI =
-		! canLock || ( canEdit && canMove && canRemove );
-
-	// Restore focus manually on the first focusable element in the toolbar
-	// when the block lock modal is closed and the block is not locked anymore.
-	// See https://github.com/WordPress/gutenberg/issues/51447
+	// If the block lock button has been shown, we don't want to remove it
+	// from the toolbar until the toolbar is rendered again without it.
+	// Removing it beforehand can cause focus loss issues, such as when
+	// unlocking the block from the modal. It needs to return focus from
+	// whence it came, and to do that, we need to leave the button in the toolbar.
 	useEffect( () => {
-		if ( isFirstRender.current ) {
-			isFirstRender.current = false;
-			return;
-		}
-
-		if ( ! isModalOpen && shouldHideBlockLockUI ) {
-			focus.focusable
-				.find( wrapperRef.current, {
-					sequential: false,
-				} )
-				.find(
-					( element ) =>
-						element.tagName === 'BUTTON' &&
-						element !== lockButtonRef.current
-				)
-				?.focus();
+		if ( isLocked ) {
+			hasLockButtonShownRef.current = true;
 		}
-		// wrapperRef is a reference object and should be stable
-	}, [ isModalOpen, shouldHideBlockLockUI, wrapperRef ] );
+	}, [ isLocked ] );
 
-	if ( shouldHideBlockLockUI ) {
+	if ( ! isLocked && ! hasLockButtonShownRef.current ) {
 		return null;
 	}
 
+	let label = isLocked ? __( 'Unlock' ) : __( 'Lock' );
+
+	if ( ! canLock && isLocked ) {
+		label = __( 'Locked' );
+	}
+
 	return (
 		<>
 			<ToolbarGroup className="block-editor-block-lock-toolbar">
 				<ToolbarButton
-					ref={ lockButtonRef }
-					icon={ lock }
-					label={ __( 'Unlock' ) }
+					disabled={ ! canLock }
+					icon={ isLocked ? lock : unlock }
+					label={ label }
 					onClick={ toggleModal }
 					aria-expanded={ isModalOpen }
 					aria-haspopup="dialog"
diff --git a/packages/block-editor/src/components/block-lock/use-block-lock.js b/packages/block-editor/src/components/block-lock/use-block-lock.js
index da6ccc4092096d..9917a739eacd83 100644
--- a/packages/block-editor/src/components/block-lock/use-block-lock.js
+++ b/packages/block-editor/src/components/block-lock/use-block-lock.js
@@ -24,14 +24,12 @@ export default function useBlockLock( clientId ) {
 				canRemoveBlock,
 				canLockBlockType,
 				getBlockName,
-				getBlockRootClientId,
 				getTemplateLock,
 			} = select( blockEditorStore );
-			const rootClientId = getBlockRootClientId( clientId );
 
 			const canEdit = canEditBlock( clientId );
-			const canMove = canMoveBlock( clientId, rootClientId );
-			const canRemove = canRemoveBlock( clientId, rootClientId );
+			const canMove = canMoveBlock( clientId );
+			const canRemove = canRemoveBlock( clientId );
 
 			return {
 				canEdit,
diff --git a/packages/block-editor/src/components/block-mover/README.md b/packages/block-editor/src/components/block-mover/README.md
index 3763b7dbada11f..38520072b4ac86 100644
--- a/packages/block-editor/src/components/block-mover/README.md
+++ b/packages/block-editor/src/components/block-mover/README.md
@@ -4,11 +4,6 @@ Block movers allow moving blocks inside the editor using up and down buttons.
 
 ![Block mover screenshot](https://make.wordpress.org/core/files/2020/08/block-mover-screenshot.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-mover/button.js b/packages/block-editor/src/components/block-mover/button.js
index 2b820a481b5833..76b46701758e8d 100644
--- a/packages/block-editor/src/components/block-mover/button.js
+++ b/packages/block-editor/src/components/block-mover/button.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -65,6 +65,7 @@ const BlockMoverButton = forwardRef(
 			? clientIds
 			: [ clientIds ];
 		const blocksCount = normalizedClientIds.length;
+		const { disabled } = props;
 
 		const {
 			blockType,
@@ -98,7 +99,9 @@ const BlockMoverButton = forwardRef(
 
 				return {
 					blockType: block ? getBlockType( block.name ) : null,
-					isDisabled: direction === 'up' ? isFirstBlock : isLastBlock,
+					isDisabled:
+						disabled ||
+						( direction === 'up' ? isFirstBlock : isLastBlock ),
 					rootClientId: blockRootClientId,
 					firstIndex: firstBlockIndex,
 					isFirst: isFirstBlock,
@@ -126,8 +129,9 @@ const BlockMoverButton = forwardRef(
 		return (
 			<>
 				<Button
+					__next40pxDefaultSize
 					ref={ ref }
-					className={ classnames(
+					className={ clsx(
 						'block-editor-block-mover-button',
 						`is-${ direction }-button`
 					) }
@@ -140,7 +144,7 @@ const BlockMoverButton = forwardRef(
 					{ ...props }
 					onClick={ isDisabled ? null : onClick }
 					disabled={ isDisabled }
-					__experimentalIsFocusable
+					accessibleWhenDisabled
 				/>
 				<VisuallyHidden id={ descriptionId }>
 					{ getBlockMoverDescription(
diff --git a/packages/block-editor/src/components/block-mover/index.js b/packages/block-editor/src/components/block-mover/index.js
index 9b9f32457561e6..4e993252ef974f 100644
--- a/packages/block-editor/src/components/block-mover/index.js
+++ b/packages/block-editor/src/components/block-mover/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -19,8 +19,20 @@ import BlockDraggable from '../block-draggable';
 import { BlockMoverUpButton, BlockMoverDownButton } from './button';
 import { store as blockEditorStore } from '../../store';
 
-function BlockMover( { clientIds, hideDragHandle } ) {
-	const { canMove, rootClientId, isFirst, isLast, orientation } = useSelect(
+function BlockMover( {
+	clientIds,
+	hideDragHandle,
+	isBlockMoverUpButtonDisabled,
+	isBlockMoverDownButtonDisabled,
+} ) {
+	const {
+		canMove,
+		rootClientId,
+		isFirst,
+		isLast,
+		orientation,
+		isManualGrid,
+	} = useSelect(
 		( select ) => {
 			const {
 				getBlockIndex,
@@ -28,6 +40,7 @@ function BlockMover( { clientIds, hideDragHandle } ) {
 				canMoveBlocks,
 				getBlockOrder,
 				getBlockRootClientId,
+				getBlockAttributes,
 			} = select( blockEditorStore );
 			const normalizedClientIds = Array.isArray( clientIds )
 				? clientIds
@@ -39,38 +52,45 @@ function BlockMover( { clientIds, hideDragHandle } ) {
 				normalizedClientIds[ normalizedClientIds.length - 1 ]
 			);
 			const blockOrder = getBlockOrder( _rootClientId );
+			const { layout = {} } = getBlockAttributes( _rootClientId ) ?? {};
 
 			return {
-				canMove: canMoveBlocks( clientIds, _rootClientId ),
+				canMove: canMoveBlocks( clientIds ),
 				rootClientId: _rootClientId,
 				isFirst: firstIndex === 0,
 				isLast: lastIndex === blockOrder.length - 1,
 				orientation: getBlockListSettings( _rootClientId )?.orientation,
+				isManualGrid:
+					layout.type === 'grid' &&
+					layout.isManualPlacement &&
+					window.__experimentalEnableGridInteractivity,
 			};
 		},
 		[ clientIds ]
 	);
 
-	if ( ! canMove || ( isFirst && isLast && ! rootClientId ) ) {
+	if (
+		! canMove ||
+		( isFirst && isLast && ! rootClientId ) ||
+		( hideDragHandle && isManualGrid )
+	) {
 		return null;
 	}
 
-	const dragHandleLabel = __( 'Drag' );
-
 	return (
 		<ToolbarGroup
-			className={ classnames( 'block-editor-block-mover', {
+			className={ clsx( 'block-editor-block-mover', {
 				'is-horizontal': orientation === 'horizontal',
 			} ) }
 		>
 			{ ! hideDragHandle && (
-				<BlockDraggable clientIds={ clientIds }>
+				<BlockDraggable clientIds={ clientIds } fadeWhenDisabled>
 					{ ( draggableProps ) => (
 						<Button
+							__next40pxDefaultSize
 							icon={ dragHandle }
 							className="block-editor-block-mover__drag-handle"
-							aria-hidden="true"
-							label={ dragHandleLabel }
+							label={ __( 'Drag' ) }
 							// Should not be able to tab to drag handle as this
 							// button can only be used with a pointer device.
 							tabIndex="-1"
@@ -79,24 +99,28 @@ function BlockMover( { clientIds, hideDragHandle } ) {
 					) }
 				</BlockDraggable>
 			) }
-			<div className="block-editor-block-mover__move-button-container">
-				<ToolbarItem>
-					{ ( itemProps ) => (
-						<BlockMoverUpButton
-							clientIds={ clientIds }
-							{ ...itemProps }
-						/>
-					) }
-				</ToolbarItem>
-				<ToolbarItem>
-					{ ( itemProps ) => (
-						<BlockMoverDownButton
-							clientIds={ clientIds }
-							{ ...itemProps }
-						/>
-					) }
-				</ToolbarItem>
-			</div>
+			{ ! isManualGrid && (
+				<div className="block-editor-block-mover__move-button-container">
+					<ToolbarItem>
+						{ ( itemProps ) => (
+							<BlockMoverUpButton
+								disabled={ isBlockMoverUpButtonDisabled }
+								clientIds={ clientIds }
+								{ ...itemProps }
+							/>
+						) }
+					</ToolbarItem>
+					<ToolbarItem>
+						{ ( itemProps ) => (
+							<BlockMoverDownButton
+								disabled={ isBlockMoverDownButtonDisabled }
+								clientIds={ clientIds }
+								{ ...itemProps }
+							/>
+						) }
+					</ToolbarItem>
+				</div>
+			) }
 		</ToolbarGroup>
 	);
 }
diff --git a/packages/block-editor/src/components/block-mover/index.native.js b/packages/block-editor/src/components/block-mover/index.native.js
index 06a1a881d14f8e..74a72aec01dbef 100644
--- a/packages/block-editor/src/components/block-mover/index.native.js
+++ b/packages/block-editor/src/components/block-mover/index.native.js
@@ -90,7 +90,9 @@ export const BlockMover = ( {
 		const option = blockPageMoverOptions.find(
 			( el ) => el.value === value
 		);
-		if ( option && option.onSelect ) option.onSelect();
+		if ( option && option.onSelect ) {
+			option.onSelect();
+		}
 	};
 
 	const onLongPressMoveUp = useCallback(
@@ -133,7 +135,7 @@ export const BlockMover = ( {
 				options={ blockPageMoverOptions }
 				onChange={ onPickerSelect }
 				title={ __( 'Change block position' ) }
-				leftAlign={ true }
+				leftAlign
 				hideCancelButton={ Platform.OS !== 'ios' }
 			/>
 		</ToolbarGroup>
@@ -164,7 +166,7 @@ export default compose(
 			numberOfBlocks: blockOrder.length - 1,
 			isFirst: firstIndex === 0,
 			isLast: lastIndex === blockOrder.length - 1,
-			canMove: canMoveBlocks( clientIds, rootClientId ),
+			canMove: canMoveBlocks( clientIds ),
 			rootClientId,
 		};
 	} ),
diff --git a/packages/block-editor/src/components/block-mover/style.scss b/packages/block-editor/src/components/block-mover/style.scss
index c4ad57d673c025..c58ac9f19673fc 100644
--- a/packages/block-editor/src/components/block-mover/style.scss
+++ b/packages/block-editor/src/components/block-mover/style.scss
@@ -2,13 +2,14 @@
 	display: flex;
 	padding: 0;
 	border: none;
+	justify-content: center;
 
 	@include break-small() {
 		.block-editor-block-mover:not(.is-horizontal) & {
 			flex-direction: column;
 
 			> * {
-				height: $block-toolbar-height * 0.5;
+				height: $block-toolbar-height * 0.5 - $grid-unit-05;
 				width: 100%;
 				min-width: 0 !important; // overrides default button width.
 
@@ -19,12 +20,12 @@
 			}
 
 			.block-editor-block-mover-button.is-up-button svg {
-				top: 5px;
+				top: 3px;
 				flex-shrink: 0;
 			}
 
 			.block-editor-block-mover-button.is-down-button svg {
-				bottom: 5px;
+				bottom: 3px;
 				flex-shrink: 0;
 			}
 		}
@@ -75,7 +76,7 @@
 		content: "";
 		position: absolute;
 		display: block;
-		border-radius: $radius-block-ui;
+		border-radius: $radius-small;
 		height: $grid-unit-40;
 
 		// Position the focus rectangle.
diff --git a/packages/block-editor/src/components/block-navigation/dropdown.js b/packages/block-editor/src/components/block-navigation/dropdown.js
index e04589d002c539..0bf8fd05320188 100644
--- a/packages/block-editor/src/components/block-navigation/dropdown.js
+++ b/packages/block-editor/src/components/block-navigation/dropdown.js
@@ -27,6 +27,7 @@ function BlockNavigationDropdownToggle( {
 } ) {
 	return (
 		<Button
+			__next40pxDefaultSize
 			{ ...props }
 			ref={ innerRef }
 			icon={ listView }
diff --git a/packages/block-editor/src/components/block-parent-selector/README.md b/packages/block-editor/src/components/block-parent-selector/README.md
index 181e03a20800b6..e16af799cb66ad 100644
--- a/packages/block-editor/src/components/block-parent-selector/README.md
+++ b/packages/block-editor/src/components/block-parent-selector/README.md
@@ -8,11 +8,6 @@ In practice the BlockParentSelector component renders a <ToolbarButton /> compon
 
 ![Block parent selector test](https://make.wordpress.org/core/files/2020/09/block-parent-selector-test.gif)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-parent-selector/index.js b/packages/block-editor/src/components/block-parent-selector/index.js
index 80b314eeb42e5c..9090de42f8b7d7 100644
--- a/packages/block-editor/src/components/block-parent-selector/index.js
+++ b/packages/block-editor/src/components/block-parent-selector/index.js
@@ -14,6 +14,7 @@ import useBlockDisplayInformation from '../use-block-display-information';
 import BlockIcon from '../block-icon';
 import { useShowHoveredOrFocusedGestures } from '../block-toolbar/utils';
 import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
 /**
  * Block parent selector component, displaying the hierarchy of the
@@ -23,24 +24,26 @@ import { store as blockEditorStore } from '../../store';
  */
 export default function BlockParentSelector() {
 	const { selectBlock } = useDispatch( blockEditorStore );
-	const { firstParentClientId, isVisible } = useSelect( ( select ) => {
+	const { parentClientId, isVisible } = useSelect( ( select ) => {
 		const {
 			getBlockName,
 			getBlockParents,
 			getSelectedBlockClientId,
 			getBlockEditingMode,
-		} = select( blockEditorStore );
+			getParentSectionBlock,
+		} = unlock( select( blockEditorStore ) );
 		const { hasBlockSupport } = select( blocksStore );
 		const selectedBlockClientId = getSelectedBlockClientId();
+		const parentSection = getParentSectionBlock( selectedBlockClientId );
 		const parents = getBlockParents( selectedBlockClientId );
-		const _firstParentClientId = parents[ parents.length - 1 ];
-		const parentBlockName = getBlockName( _firstParentClientId );
+		const _parentClientId = parentSection ?? parents[ parents.length - 1 ];
+		const parentBlockName = getBlockName( _parentClientId );
 		const _parentBlockType = getBlockType( parentBlockName );
 		return {
-			firstParentClientId: _firstParentClientId,
+			parentClientId: _parentClientId,
 			isVisible:
-				_firstParentClientId &&
-				getBlockEditingMode( _firstParentClientId ) === 'default' &&
+				_parentClientId &&
+				getBlockEditingMode( _parentClientId ) !== 'disabled' &&
 				hasBlockSupport(
 					_parentBlockType,
 					'__experimentalParentSelector',
@@ -48,7 +51,7 @@ export default function BlockParentSelector() {
 				),
 		};
 	}, [] );
-	const blockInformation = useBlockDisplayInformation( firstParentClientId );
+	const blockInformation = useBlockDisplayInformation( parentClientId );
 
 	// Allows highlighting the parent block outline when focusing or hovering
 	// the parent block selector within the child.
@@ -65,13 +68,13 @@ export default function BlockParentSelector() {
 	return (
 		<div
 			className="block-editor-block-parent-selector"
-			key={ firstParentClientId }
+			key={ parentClientId }
 			ref={ nodeRef }
 			{ ...showHoveredOrFocusedGestures }
 		>
 			<ToolbarButton
 				className="block-editor-block-parent-selector__button"
-				onClick={ () => selectBlock( firstParentClientId ) }
+				onClick={ () => selectBlock( parentClientId ) }
 				label={ sprintf(
 					/* translators: %s: Name of the block's parent. */
 					__( 'Select parent block: %s' ),
diff --git a/packages/block-editor/src/components/block-parent-selector/style.scss b/packages/block-editor/src/components/block-parent-selector/style.scss
deleted file mode 100644
index c5a1869835188c..00000000000000
--- a/packages/block-editor/src/components/block-parent-selector/style.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.block-editor-block-parent-selector {
-	background: $white;
-	border-radius: $radius-block-ui;
-
-	.block-editor-block-parent-selector__button {
-		width: $grid-unit-60;
-		height: $grid-unit-60;
-		border: $border-width solid $gray-900;
-		border-radius: $radius-block-ui;
-	}
-}
diff --git a/packages/block-editor/src/components/block-pattern-setup/index.js b/packages/block-editor/src/components/block-pattern-setup/index.js
index edd55e90dc3e27..83cceca7a20a79 100644
--- a/packages/block-editor/src/components/block-pattern-setup/index.js
+++ b/packages/block-editor/src/components/block-pattern-setup/index.js
@@ -3,10 +3,7 @@
  */
 import { useDispatch } from '@wordpress/data';
 import { cloneBlock } from '@wordpress/blocks';
-import {
-	VisuallyHidden,
-	privateApis as componentsPrivateApis,
-} from '@wordpress/components';
+import { Composite, VisuallyHidden } from '@wordpress/components';
 
 import { useState } from '@wordpress/element';
 import { useInstanceId } from '@wordpress/compose';
@@ -20,13 +17,6 @@ import BlockPreview from '../block-preview';
 import SetupToolbar from './setup-toolbar';
 import usePatternsSetup from './use-patterns-setup';
 import { VIEWMODES } from './constants';
-import { unlock } from '../../lock-unlock';
-
-const {
-	CompositeV2: Composite,
-	CompositeItemV2: CompositeItem,
-	useCompositeStoreV2: useCompositeStore,
-} = unlock( componentsPrivateApis );
 
 const SetupContent = ( {
 	viewMode,
@@ -35,7 +25,6 @@ const SetupContent = ( {
 	onBlockPatternSelect,
 	showTitles,
 } ) => {
-	const compositeStore = useCompositeStore();
 	const containerClass = 'block-editor-block-pattern-setup__container';
 
 	if ( viewMode === VIEWMODES.carousel ) {
@@ -65,7 +54,6 @@ const SetupContent = ( {
 	return (
 		<div className="block-editor-block-pattern-setup__grid">
 			<Composite
-				store={ compositeStore }
 				role="listbox"
 				className={ containerClass }
 				aria-label={ __( 'Patterns list' ) }
@@ -92,7 +80,7 @@ function BlockPattern( { pattern, onSelect, showTitles } ) {
 	);
 	return (
 		<div className={ `${ baseClassName }__list-item` }>
-			<CompositeItem
+			<Composite.Item
 				render={
 					<div
 						aria-describedby={
@@ -120,7 +108,7 @@ function BlockPattern( { pattern, onSelect, showTitles } ) {
 						{ description }
 					</VisuallyHidden>
 				) }
-			</CompositeItem>
+			</Composite.Item>
 		</div>
 	);
 }
diff --git a/packages/block-editor/src/components/block-pattern-setup/setup-toolbar.js b/packages/block-editor/src/components/block-pattern-setup/setup-toolbar.js
index 91b68456cda71c..d571e0fef5dcc3 100644
--- a/packages/block-editor/src/components/block-pattern-setup/setup-toolbar.js
+++ b/packages/block-editor/src/components/block-pattern-setup/setup-toolbar.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, isRTL } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
 import {
 	chevronRight,
@@ -17,7 +17,11 @@ import { VIEWMODES } from './constants';
 
 const Actions = ( { onBlockPatternSelect } ) => (
 	<div className="block-editor-block-pattern-setup__actions">
-		<Button variant="primary" onClick={ onBlockPatternSelect }>
+		<Button
+			__next40pxDefaultSize
+			variant="primary"
+			onClick={ onBlockPatternSelect }
+		>
 			{ __( 'Choose' ) }
 		</Button>
 	</div>
@@ -31,18 +35,20 @@ const CarouselNavigation = ( {
 } ) => (
 	<div className="block-editor-block-pattern-setup__navigation">
 		<Button
-			icon={ chevronLeft }
+			size="compact"
+			icon={ isRTL() ? chevronRight : chevronLeft }
 			label={ __( 'Previous pattern' ) }
 			onClick={ handlePrevious }
 			disabled={ activeSlide === 0 }
-			__experimentalIsFocusable
+			accessibleWhenDisabled
 		/>
 		<Button
-			icon={ chevronRight }
+			size="compact"
+			icon={ isRTL() ? chevronLeft : chevronRight }
 			label={ __( 'Next pattern' ) }
 			onClick={ handleNext }
 			disabled={ activeSlide === totalSlides - 1 }
-			__experimentalIsFocusable
+			accessibleWhenDisabled
 		/>
 	</div>
 );
@@ -60,12 +66,14 @@ const SetupToolbar = ( {
 	const displayControls = (
 		<div className="block-editor-block-pattern-setup__display-controls">
 			<Button
+				size="compact"
 				icon={ stretchFullWidth }
 				label={ __( 'Carousel view' ) }
 				onClick={ () => setViewMode( VIEWMODES.carousel ) }
 				isPressed={ isCarouselView }
 			/>
 			<Button
+				size="compact"
 				icon={ grid }
 				label={ __( 'Grid view' ) }
 				onClick={ () => setViewMode( VIEWMODES.grid ) }
diff --git a/packages/block-editor/src/components/block-pattern-setup/style.scss b/packages/block-editor/src/components/block-pattern-setup/style.scss
index 3474eed5be5176..10582a7a2ce496 100644
--- a/packages/block-editor/src/components/block-pattern-setup/style.scss
+++ b/packages/block-editor/src/components/block-pattern-setup/style.scss
@@ -4,7 +4,7 @@
 	justify-content: center;
 	align-items: flex-start;
 	width: 100%;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 
 	&.view-mode-grid {
 		padding-top: $grid-unit-05;
@@ -60,7 +60,7 @@
 
 				.block-editor-block-preview__container {
 					min-height: 100px;
-					border-radius: $radius-block-ui;
+					border-radius: $radius-medium;
 					border: $border-width solid $gray-300;
 				}
 
diff --git a/packages/block-editor/src/components/block-patterns-list/README.md b/packages/block-editor/src/components/block-patterns-list/README.md
index 8b798f93b7190a..f63ea449059572 100644
--- a/packages/block-editor/src/components/block-patterns-list/README.md
+++ b/packages/block-editor/src/components/block-patterns-list/README.md
@@ -6,11 +6,6 @@ For more infos about blocks patterns, read [this](https://make.wordpress.org/cor
 
 ![Block patterns sidebar in WordPress 5.5](https://make.wordpress.org/core/files/2020/09/blocks-patterns-sidebar-in-wordpress-5-5.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-patterns-list/index.js b/packages/block-editor/src/components/block-patterns-list/index.js
index a392d2687017ff..2609cc2db97a13 100644
--- a/packages/block-editor/src/components/block-patterns-list/index.js
+++ b/packages/block-editor/src/components/block-patterns-list/index.js
@@ -1,16 +1,17 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { useEffect, useState, forwardRef } from '@wordpress/element';
+import { cloneBlock } from '@wordpress/blocks';
+import { useEffect, useState, forwardRef, useMemo } from '@wordpress/element';
 import {
+	Composite,
 	VisuallyHidden,
 	Tooltip,
-	privateApis as componentsPrivateApis,
 	__experimentalHStack as HStack,
 } from '@wordpress/components';
 import { useInstanceId } from '@wordpress/compose';
@@ -20,17 +21,10 @@ import { Icon, symbol } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { unlock } from '../../lock-unlock';
 import BlockPreview from '../block-preview';
 import InserterDraggableBlocks from '../inserter-draggable-blocks';
 import BlockPatternsPaging from '../block-patterns-paging';
-import { PATTERN_TYPES } from '../inserter/block-patterns-tab/utils';
-
-const {
-	CompositeV2: Composite,
-	CompositeItemV2: CompositeItem,
-	useCompositeStoreV2: useCompositeStore,
-} = unlock( componentsPrivateApis );
+import { INSERTER_PATTERN_TYPES } from '../inserter/block-patterns-tab/utils';
 
 const WithToolTip = ( { showTooltip, title, children } ) => {
 	if ( showTooltip ) {
@@ -45,18 +39,41 @@ function BlockPattern( {
 	pattern,
 	onClick,
 	onHover,
+	showTitle = true,
 	showTooltip,
+	category,
 } ) {
 	const [ isDragging, setIsDragging ] = useState( false );
 	const { blocks, viewportWidth } = pattern;
 	const instanceId = useInstanceId( BlockPattern );
 	const descriptionId = `block-editor-block-patterns-list__item-description-${ instanceId }`;
 
+	// When we have a selected category and the pattern is draggable, we need to update the
+	// pattern's categories in metadata to only contain the selected category, and pass this to
+	// InserterDraggableBlocks component. We do that because we use this information for pattern
+	// shuffling and it makes more sense to show only the ones from the initially selected category during insertion.
+	const patternBlocks = useMemo( () => {
+		if ( ! category || ! isDraggable ) {
+			return blocks;
+		}
+		return ( blocks ?? [] ).map( ( block ) => {
+			const clonedBlock = cloneBlock( block );
+			if (
+				clonedBlock.attributes.metadata?.categories?.includes(
+					category
+				)
+			) {
+				clonedBlock.attributes.metadata.categories = [ category ];
+			}
+			return clonedBlock;
+		} );
+	}, [ blocks, isDraggable, category ] );
+
 	return (
 		<InserterDraggableBlocks
 			isEnabled={ isDraggable }
-			blocks={ blocks }
-			isPattern={ !! pattern }
+			blocks={ patternBlocks }
+			pattern={ pattern }
 		>
 			{ ( { draggable, onDragStart, onDragEnd } ) => (
 				<div
@@ -78,11 +95,12 @@ function BlockPattern( {
 				>
 					<WithToolTip
 						showTooltip={
-							showTooltip && ! pattern.type !== PATTERN_TYPES.user
+							showTooltip &&
+							! pattern.type !== INSERTER_PATTERN_TYPES.user
 						}
 						title={ pattern.title }
 					>
-						<CompositeItem
+						<Composite.Item
 							render={
 								<div
 									role="option"
@@ -92,12 +110,12 @@ function BlockPattern( {
 											? descriptionId
 											: undefined
 									}
-									className={ classnames(
+									className={ clsx(
 										'block-editor-block-patterns-list__item',
 										{
 											'block-editor-block-patterns-list__list-item-synced':
 												pattern.type ===
-													PATTERN_TYPES.user &&
+													INSERTER_PATTERN_TYPES.user &&
 												! pattern.syncStatus,
 										}
 									) }
@@ -121,30 +139,37 @@ function BlockPattern( {
 								viewportWidth={ viewportWidth }
 							/>
 
-							<HStack className="block-editor-patterns__pattern-details">
-								{ pattern.type === PATTERN_TYPES.user &&
-									! pattern.syncStatus && (
-										<div className="block-editor-patterns__pattern-icon-wrapper">
-											<Icon
-												className="block-editor-patterns__pattern-icon"
-												icon={ symbol }
-											/>
+							{ showTitle && (
+								<HStack
+									className="block-editor-patterns__pattern-details"
+									spacing={ 2 }
+								>
+									{ pattern.type ===
+										INSERTER_PATTERN_TYPES.user &&
+										! pattern.syncStatus && (
+											<div className="block-editor-patterns__pattern-icon-wrapper">
+												<Icon
+													className="block-editor-patterns__pattern-icon"
+													icon={ symbol }
+												/>
+											</div>
+										) }
+									{ ( ! showTooltip ||
+										pattern.type ===
+											INSERTER_PATTERN_TYPES.user ) && (
+										<div className="block-editor-block-patterns-list__item-title">
+											{ pattern.title }
 										</div>
 									) }
-								{ ( ! showTooltip ||
-									pattern.type === PATTERN_TYPES.user ) && (
-									<div className="block-editor-block-patterns-list__item-title">
-										{ pattern.title }
-									</div>
-								) }
-							</HStack>
+								</HStack>
+							) }
 
 							{ !! pattern.description && (
 								<VisuallyHidden id={ descriptionId }>
 									{ pattern.description }
 								</VisuallyHidden>
 							) }
-						</CompositeItem>
+						</Composite.Item>
 					</WithToolTip>
 				</div>
 			) }
@@ -167,24 +192,30 @@ function BlockPatternsList(
 		onClickPattern,
 		orientation,
 		label = __( 'Block patterns' ),
+		category,
+		showTitle = true,
 		showTitlesAsTooltip,
 		pagingProps,
 	},
 	ref
 ) {
-	const compositeStore = useCompositeStore( { orientation } );
-	const { setActiveId } = compositeStore;
+	const [ activeCompositeId, setActiveCompositeId ] = useState( undefined );
 
 	useEffect( () => {
-		// We reset the active composite item whenever the
-		// available patterns change, to make sure that
-		// focus is put back to the start.
-		setActiveId( undefined );
-	}, [ setActiveId, shownPatterns, blockPatterns ] );
+		// Reset the active composite item whenever the available patterns change,
+		// to make sure that Composite widget can receive focus correctly when its
+		// composite items change. The first composite item will receive focus.
+		const firstCompositeItemId = blockPatterns.find( ( pattern ) =>
+			shownPatterns.includes( pattern )
+		)?.name;
+		setActiveCompositeId( firstCompositeItemId );
+	}, [ shownPatterns, blockPatterns ] );
 
 	return (
 		<Composite
-			store={ compositeStore }
+			orientation={ orientation }
+			activeId={ activeCompositeId }
+			setActiveId={ setActiveCompositeId }
 			role="listbox"
 			className="block-editor-block-patterns-list"
 			aria-label={ label }
@@ -200,7 +231,9 @@ function BlockPatternsList(
 						onClick={ onClickPattern }
 						onHover={ onHover }
 						isDraggable={ isDraggable }
+						showTitle={ showTitle }
 						showTooltip={ showTitlesAsTooltip }
+						category={ category }
 					/>
 				) : (
 					<BlockPatternPlaceholder key={ pattern.name } />
diff --git a/packages/block-editor/src/components/block-patterns-list/stories/fixtures.js b/packages/block-editor/src/components/block-patterns-list/stories/fixtures.js
new file mode 100644
index 00000000000000..0fd895bbe1716d
--- /dev/null
+++ b/packages/block-editor/src/components/block-patterns-list/stories/fixtures.js
@@ -0,0 +1,834 @@
+export default [
+	{
+		name: 'test/1',
+		title: 'Centered image with two-tone background color',
+		blocks: [
+			{
+				clientId: '035ea9e6-cf5a-4631-a11e-29f3f696f836',
+				name: 'core/cover',
+				isValid: true,
+				attributes: {
+					useFeaturedImage: false,
+					alt: '',
+					hasParallax: false,
+					isRepeated: false,
+					dimRatio: 100,
+					backgroundType: 'image',
+					minHeight: 66,
+					minHeightUnit: 'vh',
+					customGradient:
+						'linear-gradient(90deg,rgb(35,74,20) 50%,rgb(225,137,116) 50%)',
+					isDark: false,
+					tagName: 'div',
+					align: 'full',
+					style: {
+						spacing: {
+							padding: {
+								top: '5vw',
+								right: '5vw',
+								bottom: '5vw',
+								left: '5vw',
+							},
+							margin: {
+								top: '0',
+							},
+						},
+					},
+				},
+				innerBlocks: [
+					{
+						clientId: '57c3e044-137d-456d-8426-20768e07f09f',
+						name: 'core/group',
+						isValid: true,
+						attributes: {
+							tagName: 'div',
+							style: {
+								spacing: {
+									blockGap: '0px',
+								},
+								layout: {
+									selfStretch: 'fill',
+									flexSize: null,
+								},
+							},
+							layout: {
+								type: 'constrained',
+								contentSize: '600px',
+								wideSize: '1200px',
+							},
+						},
+						innerBlocks: [
+							{
+								clientId:
+									'9e251315-0ea5-4849-9e1a-974de0981f51',
+								name: 'core/spacer',
+								isValid: true,
+								attributes: {
+									height: '100px',
+								},
+								innerBlocks: [],
+								originalContent:
+									'<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'd83373a3-bdc3-44d6-9f6f-5a36ef8d637c',
+								name: 'core/image',
+								isValid: true,
+								attributes: {
+									url: 'https://pd.w.org/2022/03/3866241b433db4ee2.96648572.jpeg',
+									alt: '',
+									caption: '',
+									sizeSlug: 'large',
+									className: 'is-style-default',
+									style: {
+										color: {
+											duotone: [ '#000000', '#ffffff' ],
+										},
+									},
+								},
+								innerBlocks: [],
+								originalContent:
+									'<figure class="wp-block-image size-large is-style-default"><img src="https://pd.w.org/2022/03/3866241b433db4ee2.96648572.jpeg" alt="" /></figure>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'56e72331-1213-466f-bd14-1131a56b2c95',
+								name: 'core/spacer',
+								isValid: true,
+								attributes: {
+									height: '48px',
+								},
+								innerBlocks: [],
+								originalContent:
+									'<div style="height:48px" aria-hidden="true" class="wp-block-spacer"></div>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'851c15bc-f5cf-4780-838e-6bfea2b09b30',
+								name: 'core/heading',
+								isValid: true,
+								attributes: {
+									textAlign: 'center',
+									content: 'Etcetera',
+									level: 2,
+									align: 'wide',
+									style: {
+										typography: {
+											fontSize: '50px',
+											fontStyle: 'normal',
+											fontWeight: '400',
+											textTransform: 'uppercase',
+											letterSpacing: '32px',
+											lineHeight: '1',
+										},
+										spacing: {
+											padding: {
+												left: '32px',
+											},
+										},
+									},
+									textColor: 'white',
+								},
+								innerBlocks: [],
+								originalContent:
+									'<h2 class="wp-block-heading alignwide has-text-align-center has-white-color has-text-color" style="padding-left:32px;font-size:50px;font-style:normal;font-weight:400;letter-spacing:32px;line-height:1;text-transform:uppercase">Etcetera</h2>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'a734e600-5b98-47c4-982d-c98e8c8b78a2',
+								name: 'core/spacer',
+								isValid: true,
+								attributes: {
+									height: '100px',
+								},
+								innerBlocks: [],
+								originalContent:
+									'<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>',
+								validationIssues: [],
+							},
+						],
+						originalContent:
+							'<div class="wp-block-group">\n\n\n\n\n\n\n\n</div>',
+						validationIssues: [],
+					},
+				],
+				originalContent:
+					'<div class="wp-block-cover alignfull is-light" style="margin-top:0;padding-top:5vw;padding-right:5vw;padding-bottom:5vw;padding-left:5vw;min-height:66vh"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-100 has-background-dim has-background-gradient" style="background:linear-gradient(90deg,rgb(35,74,20) 50%,rgb(225,137,116) 50%)"></span><div class="wp-block-cover__inner-container"></div></div>',
+				validationIssues: [],
+			},
+		],
+	},
+	{
+		name: 'test/2',
+		title: 'Fullwidth, vertically aligned headline on right with description on left',
+		blocks: [
+			{
+				clientId: 'efa29ce0-cf43-421b-b9e6-46f52f17d943',
+				name: 'core/cover',
+				isValid: true,
+				attributes: {
+					alt: '',
+					hasParallax: false,
+					isRepeated: false,
+					dimRatio: 100,
+					customOverlayColor: '#e68b14',
+					backgroundType: 'image',
+					isDark: false,
+					useFeaturedImage: false,
+					tagName: 'div',
+					align: 'full',
+					style: {
+						spacing: {
+							padding: {
+								top: '5vw',
+								right: '5vw',
+								bottom: '5vw',
+								left: '5vw',
+							},
+							margin: {
+								top: '0',
+							},
+						},
+					},
+					isUserOverlayColor: true,
+				},
+				innerBlocks: [
+					{
+						clientId: '4e50914f-9c9c-471a-84ad-4a22b514a393',
+						name: 'core/group',
+						isValid: true,
+						attributes: {
+							tagName: 'div',
+							layout: {
+								type: 'flex',
+								flexWrap: 'wrap',
+								verticalAlignment: 'top',
+							},
+						},
+						innerBlocks: [
+							{
+								clientId:
+									'72b5d32d-35df-4530-8c81-ce67baaf34d1',
+								name: 'core/group',
+								isValid: true,
+								attributes: {
+									tagName: 'div',
+									style: {
+										layout: {
+											selfStretch: 'fixed',
+											flexSize: '320px',
+										},
+										spacing: {
+											blockGap: '24px',
+										},
+									},
+									layout: {
+										type: 'default',
+									},
+								},
+								innerBlocks: [
+									{
+										clientId:
+											'86b7c5b3-2de6-42ff-9d41-d38dd267a122',
+										name: 'core/paragraph',
+										isValid: true,
+										attributes: {
+											content:
+												"Let 'em Roll is an album by American organist Big John Patton recorded in 1965 and released on the Blue Note label.",
+											dropCap: false,
+											style: {
+												layout: {
+													selfStretch: 'fixed',
+													flexSize: '330px',
+												},
+												typography: {
+													fontSize: '17px',
+													fontStyle: 'normal',
+													fontWeight: '300',
+													lineHeight: '1.4',
+													textTransform: 'none',
+													textDecoration: 'none',
+													letterSpacing: '0px',
+												},
+											},
+										},
+										innerBlocks: [],
+										originalContent:
+											'<p style="font-size:17px;font-style:normal;font-weight:300;letter-spacing:0px;line-height:1.4;text-decoration:none;text-transform:none">Let \'em Roll is an album by American organist Big John Patton recorded in 1965 and released on the Blue Note label.</p>',
+										validationIssues: [],
+									},
+									{
+										clientId:
+											'50d8d1c7-05dd-41d4-af67-29449e818ef7',
+										name: 'core/buttons',
+										isValid: true,
+										attributes: {},
+										innerBlocks: [
+											{
+												clientId:
+													'3e26f576-a29a-4947-85f2-1454ea85db60',
+												name: 'core/button',
+												isValid: true,
+												attributes: {
+													tagName: 'a',
+													type: 'button',
+													text: 'Shop Now',
+													backgroundColor: 'black',
+													textColor: 'white',
+													style: {
+														typography: {
+															fontSize: '17px',
+															fontStyle: 'normal',
+															fontWeight: '700',
+															textDecoration:
+																'none',
+															textTransform:
+																'uppercase',
+															letterSpacing:
+																'0px',
+														},
+														spacing: {
+															padding: {
+																top: '14px',
+																bottom: '14px',
+																left: '36px',
+																right: '36px',
+															},
+														},
+														border: {
+															radius: '0px',
+															top: {
+																radius: '0px',
+																width: '0px',
+																style: 'none',
+															},
+															right: {
+																radius: '0px',
+																width: '0px',
+																style: 'none',
+															},
+															bottom: {
+																radius: '0px',
+																width: '0px',
+																style: 'none',
+															},
+															left: {
+																radius: '0px',
+																width: '0px',
+																style: 'none',
+															},
+														},
+													},
+												},
+												innerBlocks: [],
+												originalContent:
+													'<div class="wp-block-button has-custom-font-size" style="font-size:17px;font-style:normal;font-weight:700;letter-spacing:0px;text-decoration:none;text-transform:uppercase"><a class="wp-block-button__link has-white-color has-black-background-color has-text-color has-background wp-element-button" style="border-radius:0px;border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-style:none;border-bottom-width:0px;border-left-style:none;border-left-width:0px;padding-top:14px;padding-right:36px;padding-bottom:14px;padding-left:36px">Shop Now</a></div>',
+												validationIssues: [],
+											},
+										],
+										originalContent:
+											'<div class="wp-block-buttons"></div>',
+										validationIssues: [],
+									},
+								],
+								originalContent:
+									'<div class="wp-block-group">\n\n</div>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'e8176dce-481f-4454-8e01-13bc5382e0fd',
+								name: 'core/group',
+								isValid: true,
+								attributes: {
+									tagName: 'div',
+									style: {
+										spacing: {
+											blockGap: '0px',
+										},
+										layout: {
+											selfStretch: 'fill',
+											flexSize: null,
+										},
+									},
+									layout: {
+										type: 'default',
+									},
+								},
+								innerBlocks: [
+									{
+										clientId:
+											'738291ae-b0d1-4867-90b5-f35b999ca407',
+										name: 'core/paragraph',
+										isValid: true,
+										attributes: {
+											align: 'right',
+											content: "Let<br>'EM<br>Roll",
+											dropCap: false,
+											style: {
+												typography: {
+													fontSize: '148px',
+													textTransform: 'uppercase',
+													fontStyle: 'normal',
+													fontWeight: '700',
+													lineHeight: '0.8',
+													letterSpacing: '-4px',
+												},
+											},
+											textColor: 'black',
+										},
+										innerBlocks: [],
+										originalContent:
+											'<p class="has-text-align-right has-black-color has-text-color" style="font-size:148px;font-style:normal;font-weight:700;letter-spacing:-4px;line-height:0.8;text-transform:uppercase">Let<br>\'EM<br>Roll</p>',
+										validationIssues: [],
+									},
+									{
+										clientId:
+											'331df46f-7623-49a1-8031-7c421bddc15a',
+										name: 'core/paragraph',
+										isValid: true,
+										attributes: {
+											align: 'right',
+											content: 'Big<br>John<br>Patton',
+											dropCap: false,
+											style: {
+												typography: {
+													fontSize: '148px',
+													textTransform: 'uppercase',
+													fontStyle: 'normal',
+													fontWeight: '700',
+													lineHeight: '0.8',
+													letterSpacing: '-4px',
+												},
+											},
+											textColor: 'white',
+										},
+										innerBlocks: [],
+										originalContent:
+											'<p class="has-text-align-right has-white-color has-text-color" style="font-size:148px;font-style:normal;font-weight:700;letter-spacing:-4px;line-height:0.8;text-transform:uppercase">Big<br>John<br>Patton</p>',
+										validationIssues: [],
+									},
+								],
+								originalContent:
+									'<div class="wp-block-group">\n\n</div>',
+								validationIssues: [],
+							},
+						],
+						originalContent:
+							'<div class="wp-block-group">\n\n</div>',
+						validationIssues: [],
+					},
+				],
+				originalContent:
+					'<div class="wp-block-cover alignfull is-light" style="margin-top:0;padding-top:5vw;padding-right:5vw;padding-bottom:5vw;padding-left:5vw"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-100 has-background-dim" style="background-color:#e68b14"></span><div class="wp-block-cover__inner-container"></div></div>',
+				validationIssues: [],
+			},
+		],
+	},
+	{
+		name: 'test/3',
+		title: 'Two columns of text with offset heading',
+		blocks: [
+			{
+				clientId: 'da715d18-2126-4be0-bf13-3328419f220a',
+				name: 'core/group',
+				isValid: true,
+				attributes: {
+					tagName: 'div',
+					align: 'full',
+					style: {
+						color: {
+							background: '#f2f0e9',
+						},
+					},
+				},
+				innerBlocks: [
+					{
+						clientId: '8a89e4af-1f70-4545-9d1e-887ff50a141d',
+						name: 'core/spacer',
+						isValid: true,
+						attributes: {
+							height: '70px',
+						},
+						innerBlocks: [],
+						originalContent:
+							'<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>',
+						validationIssues: [],
+					},
+					{
+						clientId: '4ab42169-0fcd-416a-bd34-487f6a4e33ad',
+						name: 'core/columns',
+						isValid: true,
+						attributes: {
+							verticalAlignment: 'center',
+							isStackedOnMobile: true,
+							align: 'wide',
+						},
+						innerBlocks: [
+							{
+								clientId:
+									'88b53c37-16dc-4396-b9bc-6cc115411d9a',
+								name: 'core/column',
+								isValid: true,
+								attributes: {
+									width: '50%',
+								},
+								innerBlocks: [
+									{
+										clientId:
+											'1b5a12e4-06cf-4f78-b665-7440771d0025',
+										name: 'core/paragraph',
+										isValid: true,
+										attributes: {
+											content:
+												'<strong>Oceanic Inspiration</strong>',
+											dropCap: false,
+											style: {
+												typography: {
+													lineHeight: '1.1',
+													fontSize: '30px',
+												},
+												color: {
+													text: '#000000',
+												},
+											},
+										},
+										innerBlocks: [],
+										originalContent:
+											'<p class="has-text-color" style="color:#000000;font-size:30px;line-height:1.1"><strong>Oceanic Inspiration</strong></p>',
+										validationIssues: [],
+									},
+								],
+								originalContent:
+									'<div class="wp-block-column" style="flex-basis:50%"></div>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'82b7e2aa-dcd8-4b34-a2a9-d239192fed71',
+								name: 'core/column',
+								isValid: true,
+								attributes: {
+									width: '50%',
+								},
+								innerBlocks: [
+									{
+										clientId:
+											'b0fbba51-f3ec-40d5-91d6-64a24ae223f4',
+										name: 'core/separator',
+										isValid: true,
+										attributes: {
+											className: 'is-style-wide',
+											opacity: 'css',
+											style: {
+												color: {
+													background: '#000000',
+												},
+											},
+										},
+										innerBlocks: [],
+										originalContent:
+											'<hr class="wp-block-separator has-text-color has-background is-style-wide" style="background-color:#000000;color:#000000" />',
+										validationIssues: [],
+									},
+								],
+								originalContent:
+									'<div class="wp-block-column" style="flex-basis:50%"></div>',
+								validationIssues: [],
+							},
+						],
+						originalContent:
+							'<div class="wp-block-columns alignwide are-vertically-aligned-center">\n\n</div>',
+						validationIssues: [],
+					},
+					{
+						clientId: '72d3dc7f-bbbe-4088-b556-a32c07191068',
+						name: 'core/columns',
+						isValid: true,
+						attributes: {
+							isStackedOnMobile: true,
+							align: 'wide',
+						},
+						innerBlocks: [
+							{
+								clientId:
+									'cf3abb5c-eee8-4314-af70-022b4f7e5bc4',
+								name: 'core/column',
+								isValid: true,
+								attributes: {},
+								innerBlocks: [],
+								originalContent:
+									'<div class="wp-block-column"></div>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'6978a278-bcf8-4244-9e99-bf5b56fe0f5e',
+								name: 'core/column',
+								isValid: true,
+								attributes: {},
+								innerBlocks: [
+									{
+										clientId:
+											'26a6b210-07b6-49b1-8c0b-41d0760562a5',
+										name: 'core/paragraph',
+										isValid: true,
+										attributes: {
+											content:
+												'Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.',
+											dropCap: false,
+											style: {
+												color: {
+													text: '#000000',
+												},
+											},
+											fontSize: 'extra-small',
+										},
+										innerBlocks: [],
+										originalContent:
+											'<p class="has-text-color has-extra-small-font-size" style="color:#000000">Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.</p>',
+										validationIssues: [],
+									},
+								],
+								originalContent:
+									'<div class="wp-block-column"></div>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'53ac5018-2b60-429e-b893-fce01f8bad24',
+								name: 'core/column',
+								isValid: true,
+								attributes: {},
+								innerBlocks: [
+									{
+										clientId:
+											'10a12c7d-77b5-46c7-8215-ff2f94ed4e27',
+										name: 'core/paragraph',
+										isValid: true,
+										attributes: {
+											content:
+												'No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.',
+											dropCap: false,
+											style: {
+												color: {
+													text: '#000000',
+												},
+											},
+											fontSize: 'extra-small',
+										},
+										innerBlocks: [],
+										originalContent:
+											'<p class="has-text-color has-extra-small-font-size" style="color:#000000">No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.</p>',
+										validationIssues: [],
+									},
+								],
+								originalContent:
+									'<div class="wp-block-column"></div>',
+								validationIssues: [],
+							},
+						],
+						originalContent:
+							'<div class="wp-block-columns alignwide">\n\n\n\n</div>',
+						validationIssues: [],
+					},
+					{
+						clientId: 'f401521c-d5d4-486a-b069-47350b032dc9',
+						name: 'core/spacer',
+						isValid: true,
+						attributes: {
+							height: '40px',
+						},
+						innerBlocks: [],
+						originalContent:
+							'<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>',
+						validationIssues: [],
+					},
+				],
+				originalContent:
+					'<div class="wp-block-group alignfull has-background" style="background-color:#f2f0e9">\n\n\n\n\n\n</div>',
+				validationIssues: [],
+			},
+		],
+	},
+	{
+		name: 'test/4',
+		title: 'Offset text with a brutalist design vibe',
+		blocks: [
+			{
+				clientId: 'ac947e62-0568-4fa2-85a0-927b86c8ae42',
+				name: 'core/cover',
+				isValid: true,
+				attributes: {
+					alt: '',
+					hasParallax: false,
+					isRepeated: false,
+					dimRatio: 100,
+					customOverlayColor: '#ffb43c',
+					backgroundType: 'image',
+					minHeight: 66,
+					minHeightUnit: 'vh',
+					isDark: false,
+					useFeaturedImage: false,
+					tagName: 'div',
+					align: 'full',
+					textColor: 'black',
+					style: {
+						spacing: {
+							padding: {
+								top: '48px',
+								right: '48px',
+								bottom: '48px',
+								left: '48px',
+							},
+							margin: {
+								top: '0',
+							},
+						},
+					},
+					isUserOverlayColor: true,
+				},
+				innerBlocks: [
+					{
+						clientId: 'a23ab6aa-b6dc-4148-a7fc-a4ad04deb738',
+						name: 'core/group',
+						isValid: true,
+						attributes: {
+							tagName: 'div',
+							style: {
+								spacing: {
+									blockGap: '0px',
+								},
+							},
+							layout: {
+								type: 'constrained',
+								wideSize: '1200px',
+								contentSize: '800px',
+							},
+						},
+						innerBlocks: [
+							{
+								clientId:
+									'2cd000fa-8e5b-4edc-8238-5912c5e397d2',
+								name: 'core/paragraph',
+								isValid: true,
+								attributes: {
+									align: 'left',
+									content:
+										'<mark style="color:#a65a00" class="has-inline-color">✴︎</mark> Walk',
+									dropCap: false,
+									style: {
+										typography: {
+											fontSize: '148px',
+											textTransform: 'uppercase',
+											fontStyle: 'normal',
+											fontWeight: '700',
+											lineHeight: '0.9',
+											letterSpacing: '-2px',
+										},
+									},
+									textColor: 'black',
+								},
+								innerBlocks: [],
+								originalContent:
+									'<p class="has-text-align-left has-black-color has-text-color" style="font-size:148px;font-style:normal;font-weight:700;letter-spacing:-2px;line-height:0.9;text-transform:uppercase"><mark style="color:#a65a00" class="has-inline-color">✴︎</mark> Walk</p>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'2d747e99-c672-4d7f-91d4-f8f03d295f2b',
+								name: 'core/paragraph',
+								isValid: true,
+								attributes: {
+									align: 'right',
+									content: 'In the',
+									dropCap: false,
+									style: {
+										typography: {
+											fontSize: '148px',
+											textTransform: 'uppercase',
+											fontStyle: 'normal',
+											fontWeight: '700',
+											lineHeight: '0.9',
+											letterSpacing: '-2px',
+										},
+									},
+									textColor: 'black',
+								},
+								innerBlocks: [],
+								originalContent:
+									'<p class="has-text-align-right has-black-color has-text-color" style="font-size:148px;font-style:normal;font-weight:700;letter-spacing:-2px;line-height:0.9;text-transform:uppercase">In the</p>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'd63e34e7-8943-49ff-bc05-8749809f4117',
+								name: 'core/paragraph',
+								isValid: true,
+								attributes: {
+									align: 'left',
+									content: 'Park',
+									dropCap: false,
+									style: {
+										typography: {
+											fontSize: '148px',
+											textTransform: 'uppercase',
+											fontStyle: 'normal',
+											fontWeight: '700',
+											lineHeight: '0.9',
+											letterSpacing: '-2px',
+										},
+									},
+									textColor: 'black',
+								},
+								innerBlocks: [],
+								originalContent:
+									'<p class="has-text-align-left has-black-color has-text-color" style="font-size:148px;font-style:normal;font-weight:700;letter-spacing:-2px;line-height:0.9;text-transform:uppercase">Park</p>',
+								validationIssues: [],
+							},
+							{
+								clientId:
+									'e996575b-4ada-43b1-8ae1-a6dbb2ec0ecc',
+								name: 'core/paragraph',
+								isValid: true,
+								attributes: {
+									align: 'center',
+									content: '—01.03',
+									dropCap: false,
+									style: {
+										typography: {
+											fontSize: '140px',
+											textTransform: 'uppercase',
+											fontStyle: 'italic',
+											fontWeight: '200',
+											letterSpacing: '0px',
+											lineHeight: '0.9',
+										},
+										color: {
+											text: '#a65a00',
+										},
+									},
+								},
+								innerBlocks: [],
+								originalContent:
+									'<p class="has-text-align-center has-text-color" style="color:#a65a00;font-size:140px;font-style:italic;font-weight:200;letter-spacing:0px;line-height:0.9;text-transform:uppercase">—01.03</p>',
+								validationIssues: [],
+							},
+						],
+						originalContent:
+							'<div class="wp-block-group">\n\n\n\n\n\n</div>',
+						validationIssues: [],
+					},
+				],
+				originalContent:
+					'<div class="wp-block-cover alignfull is-light has-black-color has-text-color" style="margin-top:0;padding-top:48px;padding-right:48px;padding-bottom:48px;padding-left:48px;min-height:66vh"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-100 has-background-dim" style="background-color:#ffb43c"></span><div class="wp-block-cover__inner-container"></div></div>',
+				validationIssues: [],
+			},
+		],
+	},
+];
diff --git a/packages/block-editor/src/components/block-patterns-list/stories/index.story.js b/packages/block-editor/src/components/block-patterns-list/stories/index.story.js
new file mode 100644
index 00000000000000..9eb393ea13e762
--- /dev/null
+++ b/packages/block-editor/src/components/block-patterns-list/stories/index.story.js
@@ -0,0 +1,81 @@
+/**
+ * External dependencies
+ */
+import blockLibraryStyles from '!!raw-loader!../../../../../block-library/build-style/style.css';
+
+/**
+ * WordPress dependencies
+ */
+import { useAsyncList } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import BlockPatternsList from '../';
+import { ExperimentalBlockEditorProvider } from '../../provider';
+import patterns from './fixtures';
+
+const blockEditorSettings = {
+	styles: [ { css: blockLibraryStyles } ],
+};
+
+export default {
+	component: BlockPatternsList,
+	title: 'BlockEditor/BlockPatternsList',
+};
+
+export const Default = {
+	render: function Template( props ) {
+		const shownPatterns = useAsyncList( props.blockPatterns );
+		return (
+			<ExperimentalBlockEditorProvider settings={ blockEditorSettings }>
+				<BlockPatternsList
+					shownPatterns={ shownPatterns }
+					{ ...props }
+				/>
+			</ExperimentalBlockEditorProvider>
+		);
+	},
+	args: {
+		blockPatterns: patterns,
+		isDraggable: false,
+		label: 'Block patterns story',
+		showTitle: true,
+		showTitlesAsTooltip: false,
+	},
+	argTypes: {
+		blockPatterns: { description: 'The patterns to render.' },
+		shownPatterns: {
+			description:
+				'Usually this component is used with `useAsyncList` for performance reasons and you should provide the returned list from that hook. Alternatively it should have the same value with `blockPatterns`.',
+		},
+		showTitle: {
+			description: 'Whether to render the title of each pattern.',
+			table: {
+				defaultValue: { summary: true },
+				type: { summary: 'boolean' },
+			},
+		},
+		onClickPattern: { type: 'function' },
+		onHover: { type: 'function' },
+		showTitlesAsTooltip: {
+			description:
+				'Whether to render the title of each pattern as a tooltip. If enabled, it takes precedence over `showTitle` prop.',
+		},
+		orientation: {
+			description: 'Orientation for the underlying composite widget.',
+			table: {
+				defaultValue: { summary: 'both' },
+				type: { summary: 'string' },
+			},
+		},
+		category: { description: 'The currently selected pattern category.' },
+		isDraggable: {
+			description: 'Whether the pattern list item should be draggable.',
+		},
+	},
+	parameters: {
+		actions: { argTypesRegex: '^on.*' },
+		controls: { expanded: true },
+	},
+};
diff --git a/packages/block-editor/src/components/block-patterns-list/style.scss b/packages/block-editor/src/components/block-patterns-list/style.scss
index 8009dfbcce1f23..c46bb49b9a9016 100644
--- a/packages/block-editor/src/components/block-patterns-list/style.scss
+++ b/packages/block-editor/src/components/block-patterns-list/style.scss
@@ -1,6 +1,6 @@
 .block-editor-block-patterns-list__list-item {
 	cursor: pointer;
-	margin-bottom: $grid-unit-30;
+	margin-bottom: $grid-unit-20;
 
 	// The list item contains absolutely positioned visually hidden text,
 	// so make this container relative. This prevents the bug experienced in
@@ -26,40 +26,43 @@
 	// the bottom margin set on `...__list-item` above
 	scroll-margin-bottom: ($grid-unit-40 + $grid-unit-30);
 
-	.block-editor-block-preview__container {
-		display: flex;
-		align-items: center;
-		overflow: hidden;
-		border-radius: 4px;
-	}
+	outline: 0;
 
 	.block-editor-block-patterns-list__item-title {
-		text-align: left;
 		flex-grow: 1;
+		font-size: $helptext-font-size;
+		text-align: left;
 	}
 
-	&:hover .block-editor-block-preview__container {
-		box-shadow: 0 0 0 2px $gray-900;
+	.block-editor-block-preview__container {
+		display: flex;
+		align-items: center;
+		overflow: hidden;
+		border-radius: $radius-medium;
+
+		&::after {
+			outline: $border-width solid rgba($black, 0.1);
+			outline-offset: -$border-width;
+			border-radius: $radius-medium;
+		}
 	}
 
-	&:focus .block-editor-block-preview__container {
-		@include button-style-outset__focus($gray-900);
+	&:hover:not(:focus) .block-editor-block-preview__container::after {
+		outline-color: rgba($black, 0.3);
 	}
 
-	&.block-editor-block-patterns-list__list-item-synced {
-		&:hover,
-		&:focus {
-			.block-editor-block-preview__container {
-				box-shadow:
-					0 0 0 2px var(--wp-block-synced-color),
-					0 15px 25px rgb(0 0 0 / 7%);
-			}
-		}
+	&:focus .block-editor-block-preview__container::after {
+		outline-color: var(--wp-admin-theme-color);
+		outline-width: var(--wp-admin-border-width-focus);
+		outline-offset: calc((-1 * var(--wp-admin-border-width-focus)));
+		transition: outline 0.1s linear;
+		@include reduce-motion("transition");
 	}
 
-	.block-editor-patterns__pattern-details {
+	.block-editor-patterns__pattern-details:not(:empty) {
 		align-items: center;
 		margin-top: $grid-unit-10;
+		padding-bottom: $grid-unit-05; // Add more space for labels on user-created patterns.
 	}
 
 	.block-editor-patterns__pattern-icon-wrapper {
diff --git a/packages/block-editor/src/components/block-patterns-paging/index.js b/packages/block-editor/src/components/block-patterns-paging/index.js
index 76f99e24bf244f..e4d7ce49b90f3e 100644
--- a/packages/block-editor/src/components/block-patterns-paging/index.js
+++ b/packages/block-editor/src/components/block-patterns-paging/index.js
@@ -18,14 +18,11 @@ export default function Pagination( {
 	return (
 		<VStack className="block-editor-patterns__grid-pagination-wrapper">
 			<Text variant="muted">
-				{
+				{ sprintf(
 					// translators: %s: Total number of patterns.
-					sprintf(
-						// translators: %s: Total number of patterns.
-						_n( '%s item', '%s items', totalItems ),
-						totalItems
-					)
-				}
+					_n( '%s item', '%s items', totalItems ),
+					totalItems
+				) }
 			</Text>
 
 			{ numPages > 1 && (
@@ -45,6 +42,9 @@ export default function Pagination( {
 							onClick={ () => changePage( 1 ) }
 							disabled={ currentPage === 1 }
 							aria-label={ __( 'First page' ) }
+							size="compact"
+							accessibleWhenDisabled
+							className="block-editor-patterns__grid-pagination-button"
 						>
 							<span>«</span>
 						</Button>
@@ -53,6 +53,9 @@ export default function Pagination( {
 							onClick={ () => changePage( currentPage - 1 ) }
 							disabled={ currentPage === 1 }
 							aria-label={ __( 'Previous page' ) }
+							size="compact"
+							accessibleWhenDisabled
+							className="block-editor-patterns__grid-pagination-button"
 						>
 							<span>‹</span>
 						</Button>
@@ -75,6 +78,9 @@ export default function Pagination( {
 							onClick={ () => changePage( currentPage + 1 ) }
 							disabled={ currentPage === numPages }
 							aria-label={ __( 'Next page' ) }
+							size="compact"
+							accessibleWhenDisabled
+							className="block-editor-patterns__grid-pagination-button"
 						>
 							<span>›</span>
 						</Button>
@@ -83,7 +89,9 @@ export default function Pagination( {
 							onClick={ () => changePage( numPages ) }
 							disabled={ currentPage === numPages }
 							aria-label={ __( 'Last page' ) }
-							size="default"
+							size="compact"
+							accessibleWhenDisabled
+							className="block-editor-patterns__grid-pagination-button"
 						>
 							<span>»</span>
 						</Button>
diff --git a/packages/block-editor/src/components/block-patterns-paging/style.scss b/packages/block-editor/src/components/block-patterns-paging/style.scss
index ce57f96cd327a5..85d39f9a36577c 100644
--- a/packages/block-editor/src/components/block-patterns-paging/style.scss
+++ b/packages/block-editor/src/components/block-patterns-paging/style.scss
@@ -4,42 +4,20 @@
 		border-top: 1px solid $gray-800;
 		padding: $grid-unit-05;
 		justify-content: center;
-		.components-button.is-tertiary {
-			width: auto;
-			height: $button-size-compact;
-			justify-content: center;
-
-			&:disabled {
-				color: $gray-600;
-				background: none;
-			}
-
-			&:hover:not(:disabled) {
-				color: $white;
-				background-color: $gray-700;
-			}
-		}
 	}
 }
 
 .show-icon-labels {
-	.block-editor-patterns__grid-pagination {
-		flex-direction: column;
-		.block-editor-patterns__grid-pagination-previous,
-		.block-editor-patterns__grid-pagination-next {
-			flex-direction: column;
+	.block-editor-patterns__grid-pagination-button {
+		width: auto;
+		// Hide the button icons when labels are set to display...
+		span {
+			display: none;
 		}
-		.components-button {
-			width: auto;
-			// Hide the button icons when labels are set to display...
-			span {
-				display: none;
-			}
-			// ... and display labels.
-			// Uses ::before as ::after is already used for active tab styling.
-			&::before {
-				content: attr(aria-label);
-			}
+		// ... and display labels.
+		// Uses ::before as ::after is already used for active tab styling.
+		&::before {
+			content: attr(aria-label);
 		}
 	}
 }
diff --git a/packages/block-editor/src/components/block-popover/README.md b/packages/block-editor/src/components/block-popover/README.md
index c60da7a982ae87..c50e8c90647f69 100644
--- a/packages/block-editor/src/components/block-popover/README.md
+++ b/packages/block-editor/src/components/block-popover/README.md
@@ -30,7 +30,7 @@ This determines whether the block popover always shifts into the viewport or rem
 -	Required: No
 -	Default: `true`
 
-## BlockPopoverInbetween
+## BlockPopoverInbetween - Private Component
 
 ### Props
 
diff --git a/packages/block-editor/src/components/block-popover/cover.js b/packages/block-editor/src/components/block-popover/cover.js
new file mode 100644
index 00000000000000..401431defe4fd5
--- /dev/null
+++ b/packages/block-editor/src/components/block-popover/cover.js
@@ -0,0 +1,78 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect, useState, useMemo, forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { useBlockElement } from '../block-list/use-block-props/use-block-refs';
+import { PrivateBlockPopover } from '.';
+
+function BlockPopoverCover(
+	{
+		clientId,
+		bottomClientId,
+		children,
+		shift = false,
+		additionalStyles,
+		...props
+	},
+	ref
+) {
+	bottomClientId ??= clientId;
+
+	const selectedElement = useBlockElement( clientId );
+
+	return (
+		<PrivateBlockPopover
+			ref={ ref }
+			clientId={ clientId }
+			bottomClientId={ bottomClientId }
+			shift={ shift }
+			{ ...props }
+		>
+			{ selectedElement && clientId === bottomClientId ? (
+				<CoverContainer
+					selectedElement={ selectedElement }
+					additionalStyles={ additionalStyles }
+				>
+					{ children }
+				</CoverContainer>
+			) : (
+				children
+			) }
+		</PrivateBlockPopover>
+	);
+}
+
+function CoverContainer( {
+	selectedElement,
+	additionalStyles = {},
+	children,
+} ) {
+	const [ width, setWidth ] = useState( selectedElement.offsetWidth );
+	const [ height, setHeight ] = useState( selectedElement.offsetHeight );
+
+	useEffect( () => {
+		const observer = new window.ResizeObserver( () => {
+			setWidth( selectedElement.offsetWidth );
+			setHeight( selectedElement.offsetHeight );
+		} );
+		observer.observe( selectedElement, { box: 'border-box' } );
+		return () => observer.disconnect();
+	}, [ selectedElement ] );
+
+	const style = useMemo( () => {
+		return {
+			position: 'absolute',
+			width,
+			height,
+			...additionalStyles,
+		};
+	}, [ width, height, additionalStyles ] );
+
+	return <div style={ style }>{ children }</div>;
+}
+
+export default forwardRef( BlockPopoverCover );
diff --git a/packages/block-editor/src/components/block-popover/drop-zone.js b/packages/block-editor/src/components/block-popover/drop-zone.js
index c26f28127022d6..1174c619cb3f43 100644
--- a/packages/block-editor/src/components/block-popover/drop-zone.js
+++ b/packages/block-editor/src/components/block-popover/drop-zone.js
@@ -9,7 +9,7 @@ import { __unstableMotion as motion } from '@wordpress/components';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-import BlockPopover from './index';
+import BlockPopoverCover from './cover';
 
 const animateVariants = {
 	hide: { opacity: 0, scaleY: 0.75 },
@@ -38,9 +38,8 @@ function BlockDropZonePopover( {
 	const reducedMotion = useReducedMotion();
 
 	return (
-		<BlockPopover
+		<BlockPopoverCover
 			clientId={ clientId }
-			__unstableCoverTarget
 			__unstablePopoverSlot={ __unstablePopoverSlot }
 			__unstableContentRef={ __unstableContentRef }
 			className="block-editor-block-popover__drop-zone"
@@ -56,7 +55,7 @@ function BlockDropZonePopover( {
 				}
 				className="block-editor-block-popover__drop-zone-foreground"
 			/>
-		</BlockPopover>
+		</BlockPopoverCover>
 	);
 }
 
diff --git a/packages/block-editor/src/components/block-popover/inbetween.js b/packages/block-editor/src/components/block-popover/inbetween.js
index a0175c4d4ae584..2ed9ee0bcb284f 100644
--- a/packages/block-editor/src/components/block-popover/inbetween.js
+++ b/packages/block-editor/src/components/block-popover/inbetween.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -20,7 +20,7 @@ import { isRTL } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-import { __unstableUseBlockElement as useBlockElement } from '../block-list/use-block-props/use-block-refs';
+import { useBlockElement } from '../block-list/use-block-props/use-block-refs';
 import usePopoverScroll from './use-popover-scroll';
 
 const MAX_POPOVER_RECOMPUTE_COUNTER = Number.MAX_SAFE_INTEGER;
@@ -33,6 +33,8 @@ function BlockPopoverInbetween( {
 	children,
 	__unstablePopoverSlot,
 	__unstableContentRef,
+	operation = 'insert',
+	nearestSide = 'right',
 	...props
 } ) {
 	// This is a temporary hack to get the inbetween inserter to recompute properly.
@@ -81,7 +83,10 @@ function BlockPopoverInbetween( {
 			return undefined;
 		}
 
-		const contextElement = previousElement || nextElement;
+		const contextElement =
+			operation === 'group'
+				? nextElement || previousElement
+				: previousElement || nextElement;
 
 		return {
 			contextElement,
@@ -98,7 +103,20 @@ function BlockPopoverInbetween( {
 				let width = 0;
 				let height = 0;
 
-				if ( isVertical ) {
+				if ( operation === 'group' ) {
+					const targetRect = nextRect || previousRect;
+					top = targetRect.top;
+					// No spacing is likely around blocks in this operation.
+					// So width of the inserter containing rect is set to 0.
+					width = 0;
+					height = targetRect.bottom - targetRect.top;
+					// Popover calculates its distance from mid-block so some
+					// adjustments are needed to make it appear in the right place.
+					left =
+						nearestSide === 'left'
+							? targetRect.left - 2
+							: targetRect.right - 2;
+				} else if ( isVertical ) {
 					// vertical
 					top = previousRect ? previousRect.bottom : nextRect.top;
 					width = previousRect ? previousRect.width : nextRect.width;
@@ -141,6 +159,8 @@ function BlockPopoverInbetween( {
 		popoverRecomputeCounter,
 		isVertical,
 		isVisible,
+		operation,
+		nearestSide,
 	] );
 
 	const popoverScrollRef = usePopoverScroll( __unstableContentRef );
@@ -221,7 +241,7 @@ function BlockPopoverInbetween( {
 			// This makes sure the popover doesn't animate from its previous position.
 			key={ nextClientId + '--' + rootClientId }
 			{ ...props }
-			className={ classnames(
+			className={ clsx(
 				'block-editor-block-popover',
 				'block-editor-block-popover__inbetween',
 				props.className
diff --git a/packages/block-editor/src/components/block-popover/index.js b/packages/block-editor/src/components/block-popover/index.js
index 13e6ba4d9e7f81..f01c43ef26a71d 100644
--- a/packages/block-editor/src/components/block-popover/index.js
+++ b/packages/block-editor/src/components/block-popover/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -18,8 +18,9 @@ import {
 /**
  * Internal dependencies
  */
-import { __unstableUseBlockElement as useBlockElement } from '../block-list/use-block-props/use-block-refs';
+import { useBlockElement } from '../block-list/use-block-props/use-block-refs';
 import usePopoverScroll from './use-popover-scroll';
+import { rectUnion, getVisibleElementBounds } from '../../utils/dom';
 
 const MAX_POPOVER_RECOMPUTE_COUNTER = Number.MAX_SAFE_INTEGER;
 
@@ -28,8 +29,6 @@ function BlockPopover(
 		clientId,
 		bottomClientId,
 		children,
-		__unstableRefreshSize,
-		__unstableCoverTarget = false,
 		__unstablePopoverSlot,
 		__unstableContentRef,
 		shift = true,
@@ -75,30 +74,6 @@ function BlockPopover(
 		};
 	}, [ selectedElement ] );
 
-	const style = useMemo( () => {
-		if (
-			// popoverDimensionsRecomputeCounter is by definition always equal or greater
-			// than 0. This check is only there to satisfy the correctness of the
-			// exhaustive-deps rule for the `useMemo` hook.
-			popoverDimensionsRecomputeCounter < 0 ||
-			! selectedElement ||
-			lastSelectedElement !== selectedElement
-		) {
-			return {};
-		}
-
-		return {
-			position: 'absolute',
-			width: selectedElement.offsetWidth,
-			height: selectedElement.offsetHeight,
-		};
-	}, [
-		selectedElement,
-		lastSelectedElement,
-		__unstableRefreshSize,
-		popoverDimensionsRecomputeCounter,
-	] );
-
 	const popoverAnchor = useMemo( () => {
 		if (
 			// popoverDimensionsRecomputeCounter is by definition always equal or greater
@@ -113,42 +88,20 @@ function BlockPopover(
 
 		return {
 			getBoundingClientRect() {
-				const selectedBCR = selectedElement.getBoundingClientRect();
-				const lastSelectedBCR =
-					lastSelectedElement?.getBoundingClientRect();
-
-				// Get the biggest rectangle that encompasses completely the currently
-				// selected element and the last selected element:
-				// - for top/left coordinates, use the smaller numbers
-				// - for the bottom/right coordinates, use the largest numbers
-				const left = Math.min(
-					selectedBCR.left,
-					lastSelectedBCR?.left ?? Infinity
-				);
-				const top = Math.min(
-					selectedBCR.top,
-					lastSelectedBCR?.top ?? Infinity
-				);
-				const right = Math.max(
-					selectedBCR.right,
-					lastSelectedBCR.right ?? -Infinity
-				);
-				const bottom = Math.max(
-					selectedBCR.bottom,
-					lastSelectedBCR.bottom ?? -Infinity
-				);
-				const width = right - left;
-				const height = bottom - top;
-
-				return new window.DOMRect( left, top, width, height );
+				return lastSelectedElement
+					? rectUnion(
+							getVisibleElementBounds( selectedElement ),
+							getVisibleElementBounds( lastSelectedElement )
+					  )
+					: getVisibleElementBounds( selectedElement );
 			},
 			contextElement: selectedElement,
 		};
 	}, [
+		popoverDimensionsRecomputeCounter,
+		selectedElement,
 		bottomClientId,
 		lastSelectedElement,
-		selectedElement,
-		popoverDimensionsRecomputeCounter,
 	] );
 
 	if ( ! selectedElement || ( bottomClientId && ! lastSelectedElement ) ) {
@@ -170,16 +123,33 @@ function BlockPopover(
 			flip={ false }
 			shift={ shift }
 			{ ...props }
-			className={ classnames(
-				'block-editor-block-popover',
-				props.className
-			) }
+			className={ clsx( 'block-editor-block-popover', props.className ) }
 			variant="unstyled"
 		>
-			{ __unstableCoverTarget && <div style={ style }>{ children }</div> }
-			{ ! __unstableCoverTarget && children }
+			{ children }
 		</Popover>
 	);
 }
 
-export default forwardRef( BlockPopover );
+export const PrivateBlockPopover = forwardRef( BlockPopover );
+
+const PublicBlockPopover = (
+	{ clientId, bottomClientId, children, ...props },
+	ref
+) => (
+	<PrivateBlockPopover
+		{ ...props }
+		bottomClientId={ bottomClientId }
+		clientId={ clientId }
+		__unstableContentRef={ undefined }
+		__unstablePopoverSlot={ undefined }
+		ref={ ref }
+	>
+		{ children }
+	</PrivateBlockPopover>
+);
+
+/**
+ * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/block-popover/README.md
+ */
+export default forwardRef( PublicBlockPopover );
diff --git a/packages/block-editor/src/components/block-popover/style.scss b/packages/block-editor/src/components/block-popover/style.scss
index e393e77c63b056..c49538378a12ca 100644
--- a/packages/block-editor/src/components/block-popover/style.scss
+++ b/packages/block-editor/src/components/block-popover/style.scss
@@ -57,6 +57,6 @@
 		position: absolute;
 		inset: 0;
 		background-color: var(--wp-admin-theme-color);
-		border-radius: 2px;
+		border-radius: $radius-small;
 	}
 }
diff --git a/packages/block-editor/src/components/block-preview/auto.js b/packages/block-editor/src/components/block-preview/auto.js
index 8972370cac6897..835f379c09b987 100644
--- a/packages/block-editor/src/components/block-preview/auto.js
+++ b/packages/block-editor/src/components/block-preview/auto.js
@@ -1,9 +1,9 @@
 /**
  * WordPress dependencies
  */
-import { useResizeObserver, pure, useRefEffect } from '@wordpress/compose';
+import { useResizeObserver, useRefEffect } from '@wordpress/compose';
 import { useSelect } from '@wordpress/data';
-import { useMemo } from '@wordpress/element';
+import { memo, useMemo } from '@wordpress/element';
 import { Disabled } from '@wordpress/components';
 
 /**
@@ -15,15 +15,16 @@ import EditorStyles from '../editor-styles';
 import { store } from '../../store';
 
 // This is used to avoid rendering the block list if the sizes change.
-let MemoizedBlockList;
+const MemoizedBlockList = memo( BlockList );
 
 const MAX_HEIGHT = 2000;
+const EMPTY_ADDITIONAL_STYLES = [];
 
 function ScaledBlockPreview( {
 	viewportWidth,
 	containerWidth,
 	minHeight,
-	additionalStyles = [],
+	additionalStyles = EMPTY_ADDITIONAL_STYLES,
 } ) {
 	if ( ! viewportWidth ) {
 		viewportWidth = containerWidth;
@@ -54,9 +55,6 @@ function ScaledBlockPreview( {
 		return styles;
 	}, [ styles, additionalStyles ] );
 
-	// Initialize on render instead of module top level, to avoid circular dependency issues.
-	MemoizedBlockList = MemoizedBlockList || pure( BlockList );
-
 	const scale = containerWidth / viewportWidth;
 	const aspectRatio = contentHeight
 		? containerWidth / ( contentHeight * scale )
diff --git a/packages/block-editor/src/components/block-preview/index.js b/packages/block-editor/src/components/block-preview/index.js
index 0fb7f55b9955d2..9eef0f1dc2abd5 100644
--- a/packages/block-editor/src/components/block-preview/index.js
+++ b/packages/block-editor/src/components/block-preview/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -20,11 +20,13 @@ import EditorStyles from '../editor-styles';
 import { store as blockEditorStore } from '../../store';
 import { BlockListItems } from '../block-list';
 
+const EMPTY_ADDITIONAL_STYLES = [];
+
 export function BlockPreview( {
 	blocks,
 	viewportWidth = 1200,
 	minHeight,
-	additionalStyles = [],
+	additionalStyles = EMPTY_ADDITIONAL_STYLES,
 	// Deprecated props:
 	__experimentalMinHeight,
 	__experimentalPadding,
@@ -54,7 +56,11 @@ export function BlockPreview( {
 		[]
 	);
 	const settings = useMemo(
-		() => ( { ...originalSettings, __unstableIsPreviewMode: true } ),
+		() => ( {
+			...originalSettings,
+			focusMode: false, // Disable "Spotlight mode".
+			isPreviewMode: true,
+		} ),
 		[ originalSettings ]
 	);
 	const renderedBlocks = useMemo(
@@ -117,7 +123,8 @@ export function useBlockPreview( { blocks, props = {}, layout } ) {
 		() => ( {
 			...originalSettings,
 			styles: undefined, // Clear styles included by the parent settings, as they are already output by the parent's EditorStyles.
-			__unstableIsPreviewMode: true,
+			focusMode: false, // Disable "Spotlight mode".
+			isPreviewMode: true,
 		} ),
 		[ originalSettings ]
 	);
@@ -141,7 +148,7 @@ export function useBlockPreview( { blocks, props = {}, layout } ) {
 	return {
 		...props,
 		ref,
-		className: classnames(
+		className: clsx(
 			props.className,
 			'block-editor-block-preview__live-content',
 			'components-disabled'
diff --git a/packages/block-editor/src/components/block-quick-navigation/index.js b/packages/block-editor/src/components/block-quick-navigation/index.js
index 7a0e7984b83cb7..fdb3475b3e180f 100644
--- a/packages/block-editor/src/components/block-quick-navigation/index.js
+++ b/packages/block-editor/src/components/block-quick-navigation/index.js
@@ -10,18 +10,16 @@ import {
 	FlexBlock,
 	FlexItem,
 } from '@wordpress/components';
-import {
-	__experimentalGetBlockLabel,
-	store as blocksStore,
-} from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
 import BlockIcon from '../block-icon';
+import useBlockDisplayInformation from '../use-block-display-information';
+import useBlockDisplayTitle from '../block-title/use-block-display-title';
 
-export default function BlockQuickNavigation( { clientIds } ) {
+export default function BlockQuickNavigation( { clientIds, onSelect } ) {
 	if ( ! clientIds.length ) {
 		return null;
 	}
@@ -29,6 +27,7 @@ export default function BlockQuickNavigation( { clientIds } ) {
 		<VStack spacing={ 1 }>
 			{ clientIds.map( ( clientId ) => (
 				<BlockQuickNavigationItem
+					onSelect={ onSelect }
 					key={ clientId }
 					clientId={ clientId }
 				/>
@@ -37,29 +36,18 @@ export default function BlockQuickNavigation( { clientIds } ) {
 	);
 }
 
-function BlockQuickNavigationItem( { clientId } ) {
-	const { name, icon, isSelected } = useSelect(
+function BlockQuickNavigationItem( { clientId, onSelect } ) {
+	const blockInformation = useBlockDisplayInformation( clientId );
+	const blockTitle = useBlockDisplayTitle( {
+		clientId,
+		context: 'list-view',
+	} );
+	const { isSelected } = useSelect(
 		( select ) => {
-			const {
-				getBlockName,
-				getBlockAttributes,
-				isBlockSelected,
-				hasSelectedInnerBlock,
-			} = select( blockEditorStore );
-			const { getBlockType } = select( blocksStore );
-
-			const blockType = getBlockType( getBlockName( clientId ) );
-			const attributes = getBlockAttributes( clientId );
+			const { isBlockSelected, hasSelectedInnerBlock } =
+				select( blockEditorStore );
 
 			return {
-				name:
-					blockType &&
-					__experimentalGetBlockLabel(
-						blockType,
-						attributes,
-						'list-view'
-					),
-				icon: blockType?.icon,
 				isSelected:
 					isBlockSelected( clientId ) ||
 					hasSelectedInnerBlock( clientId, /* deep: */ true ),
@@ -71,15 +59,21 @@ function BlockQuickNavigationItem( { clientId } ) {
 
 	return (
 		<Button
+			__next40pxDefaultSize
 			isPressed={ isSelected }
-			onClick={ () => selectBlock( clientId ) }
+			onClick={ async () => {
+				await selectBlock( clientId );
+				if ( onSelect ) {
+					onSelect( clientId );
+				}
+			} }
 		>
 			<Flex>
 				<FlexItem>
-					<BlockIcon icon={ icon } />
+					<BlockIcon icon={ blockInformation?.icon } />
 				</FlexItem>
 				<FlexBlock style={ { textAlign: 'left' } }>
-					<Truncate>{ name }</Truncate>
+					<Truncate>{ blockTitle }</Truncate>
 				</FlexBlock>
 			</Flex>
 		</Button>
diff --git a/packages/block-editor/src/components/block-removal-warning-modal/index.js b/packages/block-editor/src/components/block-removal-warning-modal/index.js
index 08f3deccb5ae08..2f716e875fb604 100644
--- a/packages/block-editor/src/components/block-removal-warning-modal/index.js
+++ b/packages/block-editor/src/components/block-removal-warning-modal/index.js
@@ -17,9 +17,8 @@ import { store as blockEditorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 
 export function BlockRemovalWarningModal( { rules } ) {
-	const { clientIds, selectPrevious, blockNamesForPrompt } = useSelect(
-		( select ) =>
-			unlock( select( blockEditorStore ) ).getRemovalPromptData()
+	const { clientIds, selectPrevious, message } = useSelect( ( select ) =>
+		unlock( select( blockEditorStore ) ).getRemovalPromptData()
 	);
 
 	const {
@@ -37,7 +36,7 @@ export function BlockRemovalWarningModal( { rules } ) {
 		};
 	}, [ rules, setBlockRemovalRules ] );
 
-	if ( ! blockNamesForPrompt ) {
+	if ( ! message ) {
 		return;
 	}
 
@@ -48,28 +47,24 @@ export function BlockRemovalWarningModal( { rules } ) {
 
 	return (
 		<Modal
-			title={ __( 'Are you sure?' ) }
+			title={ __( 'Be careful!' ) }
 			onRequestClose={ clearBlockRemovalPrompt }
+			size="medium"
 		>
-			{ blockNamesForPrompt.length === 1 ? (
-				<p>{ rules[ blockNamesForPrompt[ 0 ] ] }</p>
-			) : (
-				<ul style={ { listStyleType: 'disc', paddingLeft: '1rem' } }>
-					{ blockNamesForPrompt.map( ( name ) => (
-						<li key={ name }>{ rules[ name ] }</li>
-					) ) }
-				</ul>
-			) }
-			<p>
-				{ blockNamesForPrompt.length > 1
-					? __( 'Removing these blocks is not advised.' )
-					: __( 'Removing this block is not advised.' ) }
-			</p>
+			<p>{ message }</p>
 			<HStack justify="right">
-				<Button variant="tertiary" onClick={ clearBlockRemovalPrompt }>
+				<Button
+					variant="tertiary"
+					onClick={ clearBlockRemovalPrompt }
+					__next40pxDefaultSize
+				>
 					{ __( 'Cancel' ) }
 				</Button>
-				<Button variant="primary" onClick={ onConfirmRemoval }>
+				<Button
+					variant="primary"
+					onClick={ onConfirmRemoval }
+					__next40pxDefaultSize
+				>
 					{ __( 'Delete' ) }
 				</Button>
 			</HStack>
diff --git a/packages/block-editor/src/components/block-rename/modal.js b/packages/block-editor/src/components/block-rename/modal.js
index a1e9193f348fd0..2679c8157cc0a2 100644
--- a/packages/block-editor/src/components/block-rename/modal.js
+++ b/packages/block-editor/src/components/block-rename/modal.js
@@ -8,7 +8,6 @@ import {
 	TextControl,
 	Modal,
 } from '@wordpress/components';
-import { useInstanceId } from '@wordpress/compose';
 import { __, sprintf } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
 import { speak } from '@wordpress/a11y';
@@ -23,6 +22,9 @@ export default function BlockRenameModal( {
 	originalBlockName,
 	onClose,
 	onSave,
+	// Pattern Overrides is a WordPress-only feature but it also uses the Block Binding API.
+	// Ideally this should not be inside the block editor package, but we keep it here for simplicity.
+	hasOverridesWarning,
 } ) {
 	const [ editedBlockName, setEditedBlockName ] = useState( blockName );
 
@@ -34,11 +36,6 @@ export default function BlockRenameModal( {
 
 	const autoSelectInputText = ( event ) => event.target.select();
 
-	const dialogDescription = useInstanceId(
-		BlockRenameModal,
-		`block-editor-rename-modal__description`
-	);
-
 	const handleSubmit = () => {
 		const message =
 			nameIsOriginal || nameIsEmpty
@@ -66,14 +63,9 @@ export default function BlockRenameModal( {
 			title={ __( 'Rename' ) }
 			onRequestClose={ onClose }
 			overlayClassName="block-editor-block-rename-modal"
-			aria={ {
-				describedby: dialogDescription,
-			} }
 			focusOnMount="firstContentElement"
+			size="small"
 		>
-			<p id={ dialogDescription }>
-				{ __( 'Enter a custom name for this block.' ) }
-			</p>
 			<form
 				onSubmit={ ( e ) => {
 					e.preventDefault();
@@ -88,19 +80,31 @@ export default function BlockRenameModal( {
 				<VStack spacing="3">
 					<TextControl
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 						value={ editedBlockName }
-						label={ __( 'Block name' ) }
-						hideLabelFromVision={ true }
+						label={ __( 'Name' ) }
+						help={
+							hasOverridesWarning
+								? __(
+										'This block allows overrides. Changing the name can cause problems with content entered into instances of this pattern.'
+								  )
+								: undefined
+						}
 						placeholder={ originalBlockName }
 						onChange={ setEditedBlockName }
 						onFocus={ autoSelectInputText }
 					/>
 					<HStack justify="right">
-						<Button variant="tertiary" onClick={ onClose }>
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ onClose }
+						>
 							{ __( 'Cancel' ) }
 						</Button>
 
 						<Button
+							__next40pxDefaultSize
 							aria-disabled={ ! isNameValid }
 							variant="primary"
 							type="submit"
diff --git a/packages/block-editor/src/components/block-rename/rename-control.js b/packages/block-editor/src/components/block-rename/rename-control.js
index 1f646126d14a4b..fb6b446782aa78 100644
--- a/packages/block-editor/src/components/block-rename/rename-control.js
+++ b/packages/block-editor/src/components/block-rename/rename-control.js
@@ -32,11 +32,17 @@ export default function BlockRenameControl( { clientId } ) {
 	const { updateBlockAttributes } = useDispatch( blockEditorStore );
 
 	const customName = metadata?.name;
+	const hasPatternOverrides =
+		!! customName &&
+		!! metadata?.bindings &&
+		Object.values( metadata.bindings ).some(
+			( binding ) => binding.source === 'core/pattern-overrides'
+		);
 
 	function onChange( newName ) {
 		updateBlockAttributes( [ clientId ], {
 			metadata: {
-				...( metadata && metadata ),
+				...metadata,
 				name: newName,
 			},
 		} );
@@ -59,6 +65,7 @@ export default function BlockRenameControl( { clientId } ) {
 				<BlockRenameModal
 					blockName={ customName || '' }
 					originalBlockName={ blockInformation?.title }
+					hasOverridesWarning={ hasPatternOverrides }
 					onClose={ () => setRenamingBlock( false ) }
 					onSave={ ( newName ) => {
 						// If the new value is the block's original name (e.g. `Group`)
diff --git a/packages/block-editor/src/components/block-settings-menu-controls/README.md b/packages/block-editor/src/components/block-settings-menu-controls/README.md
index 4537f4de987a5d..84c3cc5e44ed21 100644
--- a/packages/block-editor/src/components/block-settings-menu-controls/README.md
+++ b/packages/block-editor/src/components/block-settings-menu-controls/README.md
@@ -16,12 +16,3 @@ function ReusableBlocksMenuItems() {
 	);
 }
 ```
-
-## Props
-
-### `__unstableDisplayLocation`
-
--   **Type:** `String`
--   **Default:** `undefined`
-
-A string representing the location where the component is being displayed within the UI. This can be used to conditionalize certain behaviors including the display of associated components. This behaviour will likely be refactored to a React.Context implementation.
diff --git a/packages/block-editor/src/components/block-settings-menu-controls/index.js b/packages/block-editor/src/components/block-settings-menu-controls/index.js
index d7a0b001c294da..4ebce4172e9b37 100644
--- a/packages/block-editor/src/components/block-settings-menu-controls/index.js
+++ b/packages/block-editor/src/components/block-settings-menu-controls/index.js
@@ -4,12 +4,9 @@
 import {
 	createSlotFill,
 	MenuGroup,
-	MenuItem,
 	__experimentalStyleProvider as StyleProvider,
 } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
-import { pipe } from '@wordpress/compose';
-import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -21,25 +18,26 @@ import {
 import { BlockLockMenuItem, useBlockLock } from '../block-lock';
 import { store as blockEditorStore } from '../../store';
 import BlockModeToggle from '../block-settings-menu/block-mode-toggle';
-
+import { ModifyContentLockMenuItem } from '../content-lock';
 import { BlockRenameControl, useBlockRename } from '../block-rename';
 
 const { Fill, Slot } = createSlotFill( 'BlockSettingsMenuControls' );
 
-const BlockSettingsMenuControlsSlot = ( {
-	fillProps,
-	clientIds = null,
-	__unstableDisplayLocation,
-} ) => {
-	const { selectedBlocks, selectedClientIds } = useSelect(
+const BlockSettingsMenuControlsSlot = ( { fillProps, clientIds = null } ) => {
+	const { selectedBlocks, selectedClientIds, isContentOnly } = useSelect(
 		( select ) => {
-			const { getBlockNamesByClientId, getSelectedBlockClientIds } =
-				select( blockEditorStore );
+			const {
+				getBlockNamesByClientId,
+				getSelectedBlockClientIds,
+				getBlockEditingMode,
+			} = select( blockEditorStore );
 			const ids =
 				clientIds !== null ? clientIds : getSelectedBlockClientIds();
 			return {
 				selectedBlocks: getBlockNamesByClientId( ids ),
 				selectedClientIds: ids,
+				isContentOnly:
+					getBlockEditingMode( ids[ 0 ] ) === 'contentOnly',
 			};
 		},
 		[ clientIds ]
@@ -47,8 +45,10 @@ const BlockSettingsMenuControlsSlot = ( {
 
 	const { canLock } = useBlockLock( selectedClientIds[ 0 ] );
 	const { canRename } = useBlockRename( selectedBlocks[ 0 ] );
-	const showLockButton = selectedClientIds.length === 1 && canLock;
-	const showRenameButton = selectedClientIds.length === 1 && canRename;
+	const showLockButton =
+		selectedClientIds.length === 1 && canLock && ! isContentOnly;
+	const showRenameButton =
+		selectedClientIds.length === 1 && canRename && ! isContentOnly;
 
 	// Check if current selection of blocks is Groupable or Ungroupable
 	// and pass this props down to ConvertToGroupButton.
@@ -61,7 +61,6 @@ const BlockSettingsMenuControlsSlot = ( {
 		<Slot
 			fillProps={ {
 				...fillProps,
-				__unstableDisplayLocation,
 				selectedBlocks,
 				selectedClientIds,
 			} }
@@ -94,17 +93,13 @@ const BlockSettingsMenuControlsSlot = ( {
 							/>
 						) }
 						{ fills }
-						{ fillProps?.canMove && ! fillProps?.onlyBlock && (
-							<MenuItem
-								onClick={ pipe(
-									fillProps?.onClose,
-									fillProps?.onMoveTo
-								) }
-							>
-								{ __( 'Move to' ) }
-							</MenuItem>
+						{ selectedClientIds.length === 1 && (
+							<ModifyContentLockMenuItem
+								clientId={ selectedClientIds[ 0 ] }
+								onClose={ fillProps?.onClose }
+							/>
 						) }
-						{ fillProps?.count === 1 && (
+						{ fillProps?.count === 1 && ! isContentOnly && (
 							<BlockModeToggle
 								clientId={ fillProps?.firstBlockClientId }
 								onToggle={ fillProps?.onClose }
diff --git a/packages/block-editor/src/components/block-settings-menu/block-mode-toggle.js b/packages/block-editor/src/components/block-settings-menu/block-mode-toggle.js
index 6810a21581f12e..7ca294a2894158 100644
--- a/packages/block-editor/src/components/block-settings-menu/block-mode-toggle.js
+++ b/packages/block-editor/src/components/block-settings-menu/block-mode-toggle.js
@@ -4,8 +4,7 @@
 import { __ } from '@wordpress/i18n';
 import { MenuItem } from '@wordpress/components';
 import { getBlockType, hasBlockSupport } from '@wordpress/blocks';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
+import { useDispatch, useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -14,13 +13,23 @@ import { store as blockEditorStore } from '../../store';
 
 const noop = () => {};
 
-export function BlockModeToggle( {
-	blockType,
-	mode,
-	onToggleMode,
-	small = false,
-	isCodeEditingEnabled = true,
-} ) {
+export default function BlockModeToggle( { clientId, onToggle = noop } ) {
+	const { blockType, mode, isCodeEditingEnabled } = useSelect(
+		( select ) => {
+			const { getBlock, getBlockMode, getSettings } =
+				select( blockEditorStore );
+			const block = getBlock( clientId );
+
+			return {
+				mode: getBlockMode( clientId ),
+				blockType: block ? getBlockType( block.name ) : null,
+				isCodeEditingEnabled: getSettings().codeEditingEnabled,
+			};
+		},
+		[ clientId ]
+	);
+	const { toggleBlockMode } = useDispatch( blockEditorStore );
+
 	if (
 		! blockType ||
 		! hasBlockSupport( blockType, 'html', true ) ||
@@ -32,26 +41,14 @@ export function BlockModeToggle( {
 	const label =
 		mode === 'visual' ? __( 'Edit as HTML' ) : __( 'Edit visually' );
 
-	return <MenuItem onClick={ onToggleMode }>{ ! small && label }</MenuItem>;
+	return (
+		<MenuItem
+			onClick={ () => {
+				toggleBlockMode( clientId );
+				onToggle();
+			} }
+		>
+			{ label }
+		</MenuItem>
+	);
 }
-
-export default compose( [
-	withSelect( ( select, { clientId } ) => {
-		const { getBlock, getBlockMode, getSettings } =
-			select( blockEditorStore );
-		const block = getBlock( clientId );
-		const isCodeEditingEnabled = getSettings().codeEditingEnabled;
-
-		return {
-			mode: getBlockMode( clientId ),
-			blockType: block ? getBlockType( block.name ) : null,
-			isCodeEditingEnabled,
-		};
-	} ),
-	withDispatch( ( dispatch, { onToggle = noop, clientId } ) => ( {
-		onToggleMode() {
-			dispatch( blockEditorStore ).toggleBlockMode( clientId );
-			onToggle();
-		},
-	} ) ),
-] )( BlockModeToggle );
diff --git a/packages/block-editor/src/components/block-settings-menu/block-parent-selector-menu-item.js b/packages/block-editor/src/components/block-settings-menu/block-parent-selector-menu-item.js
new file mode 100644
index 00000000000000..4ba65e41ae7324
--- /dev/null
+++ b/packages/block-editor/src/components/block-settings-menu/block-parent-selector-menu-item.js
@@ -0,0 +1,50 @@
+/**
+ * WordPress dependencies
+ */
+import { useRef } from '@wordpress/element';
+import { MenuItem } from '@wordpress/components';
+import { useViewportMatch } from '@wordpress/compose';
+import { useDispatch } from '@wordpress/data';
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import BlockIcon from '../block-icon';
+import { useShowHoveredOrFocusedGestures } from '../block-toolbar/utils';
+import { store as blockEditorStore } from '../../store';
+
+export default function BlockParentSelectorMenuItem( {
+	parentClientId,
+	parentBlockType,
+} ) {
+	const isSmallViewport = useViewportMatch( 'medium', '<' );
+	const { selectBlock } = useDispatch( blockEditorStore );
+
+	// Allows highlighting the parent block outline when focusing or hovering
+	// the parent block selector within the child.
+	const menuItemRef = useRef();
+	const gesturesProps = useShowHoveredOrFocusedGestures( {
+		ref: menuItemRef,
+		highlightParent: true,
+	} );
+
+	if ( ! isSmallViewport ) {
+		return null;
+	}
+
+	return (
+		<MenuItem
+			{ ...gesturesProps }
+			ref={ menuItemRef }
+			icon={ <BlockIcon icon={ parentBlockType.icon } /> }
+			onClick={ () => selectBlock( parentClientId ) }
+		>
+			{ sprintf(
+				/* translators: %s: Name of the block's parent. */
+				__( 'Select parent block (%s)' ),
+				parentBlockType.title
+			) }
+		</MenuItem>
+	);
+}
diff --git a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
index 4d43865a7f83a2..5b5360cc48a8fe 100644
--- a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
+++ b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
@@ -9,72 +9,39 @@ import {
 import { DropdownMenu, MenuGroup, MenuItem } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { moreVertical } from '@wordpress/icons';
-import {
-	Children,
-	cloneElement,
-	useCallback,
-	useRef,
-} from '@wordpress/element';
-import { __, sprintf } from '@wordpress/i18n';
-import {
-	store as keyboardShortcutsStore,
-	__unstableUseShortcutEventMatch,
-} from '@wordpress/keyboard-shortcuts';
-import { pipe, useCopyToClipboard, useViewportMatch } from '@wordpress/compose';
+import { Children, cloneElement } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import { displayShortcut } from '@wordpress/keycodes';
+import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
+import { pipe, useCopyToClipboard } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import BlockActions from '../block-actions';
-import BlockIcon from '../block-icon';
+import __unstableCommentIconFill from '../../components/collab/block-comment-icon-slot';
 import BlockHTMLConvertButton from './block-html-convert-button';
 import __unstableBlockSettingsMenuFirstItem from './block-settings-menu-first-item';
 import BlockSettingsMenuControls from '../block-settings-menu-controls';
+import BlockParentSelectorMenuItem from './block-parent-selector-menu-item';
 import { store as blockEditorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
-import { useShowHoveredOrFocusedGestures } from '../block-toolbar/utils';
 
 const POPOVER_PROPS = {
 	className: 'block-editor-block-settings-menu__popover',
 	placement: 'bottom-start',
 };
 
-function CopyMenuItem( { blocks, onCopy, label } ) {
-	const ref = useCopyToClipboard( () => serialize( blocks ), onCopy );
-	const copyMenuItemBlocksLabel =
-		blocks.length > 1 ? __( 'Copy blocks' ) : __( 'Copy' );
-	const copyMenuItemLabel = label ? label : copyMenuItemBlocksLabel;
-	return <MenuItem ref={ ref }>{ copyMenuItemLabel }</MenuItem>;
-}
-
-function ParentSelectorMenuItem( { parentClientId, parentBlockType } ) {
-	const isSmallViewport = useViewportMatch( 'medium', '<' );
-	const { selectBlock } = useDispatch( blockEditorStore );
-
-	// Allows highlighting the parent block outline when focusing or hovering
-	// the parent block selector within the child.
-	const menuItemRef = useRef();
-	const gesturesProps = useShowHoveredOrFocusedGestures( {
-		ref: menuItemRef,
-		highlightParent: true,
-	} );
-
-	if ( ! isSmallViewport ) {
-		return null;
-	}
-
+function CopyMenuItem( { clientIds, onCopy, label, shortcut } ) {
+	const { getBlocksByClientId } = useSelect( blockEditorStore );
+	const ref = useCopyToClipboard(
+		() => serialize( getBlocksByClientId( clientIds ) ),
+		onCopy
+	);
+	const copyMenuItemLabel = label ? label : __( 'Copy' );
 	return (
-		<MenuItem
-			{ ...gesturesProps }
-			ref={ menuItemRef }
-			icon={ <BlockIcon icon={ parentBlockType.icon } /> }
-			onClick={ () => selectBlock( parentClientId ) }
-		>
-			{ sprintf(
-				/* translators: %s: Name of the block's parent. */
-				__( 'Select parent block (%s)' ),
-				parentBlockType.title
-			) }
+		<MenuItem ref={ ref } shortcut={ shortcut }>
+			{ copyMenuItemLabel }
 		</MenuItem>
 	);
 }
@@ -82,34 +49,32 @@ function ParentSelectorMenuItem( { parentClientId, parentBlockType } ) {
 export function BlockSettingsDropdown( {
 	block,
 	clientIds,
-	__experimentalSelectBlock,
 	children,
-	__unstableDisplayLocation,
+	__experimentalSelectBlock,
 	...props
 } ) {
 	// Get the client id of the current block for this menu, if one is set.
 	const currentClientId = block?.clientId;
-	const blockClientIds = Array.isArray( clientIds )
-		? clientIds
-		: [ clientIds ];
-	const count = blockClientIds.length;
-	const firstBlockClientId = blockClientIds[ 0 ];
+	const count = clientIds.length;
+	const firstBlockClientId = clientIds[ 0 ];
 	const {
 		firstParentClientId,
-		onlyBlock,
 		parentBlockType,
 		previousBlockClientId,
 		selectedBlockClientIds,
+		openedBlockSettingsMenu,
+		isContentOnly,
 	} = useSelect(
 		( select ) => {
 			const {
-				getBlockCount,
 				getBlockName,
 				getBlockRootClientId,
 				getPreviousBlockClientId,
 				getSelectedBlockClientIds,
 				getBlockAttributes,
-			} = select( blockEditorStore );
+				getOpenedBlockSettingsMenu,
+				getBlockEditingMode,
+			} = unlock( select( blockEditorStore ) );
 
 			const { getActiveBlockVariation } = select( blocksStore );
 
@@ -120,7 +85,6 @@ export function BlockSettingsDropdown( {
 
 			return {
 				firstParentClientId: _firstParentClientId,
-				onlyBlock: 1 === getBlockCount( _firstParentClientId ),
 				parentBlockType:
 					_firstParentClientId &&
 					( getActiveBlockVariation(
@@ -131,6 +95,9 @@ export function BlockSettingsDropdown( {
 				previousBlockClientId:
 					getPreviousBlockClientId( firstBlockClientId ),
 				selectedBlockClientIds: getSelectedBlockClientIds(),
+				openedBlockSettingsMenu: getOpenedBlockSettingsMenu(),
+				isContentOnly:
+					getBlockEditingMode( firstBlockClientId ) === 'contentOnly',
 			};
 		},
 		[ firstBlockClientId ]
@@ -138,12 +105,6 @@ export function BlockSettingsDropdown( {
 	const { getBlockOrder, getSelectedBlockClientIds } =
 		useSelect( blockEditorStore );
 
-	const openedBlockSettingsMenu = useSelect(
-		( select ) =>
-			unlock( select( blockEditorStore ) ).getOpenedBlockSettingsMenu(),
-		[]
-	);
-
 	const { setOpenedBlockSettingsMenu } = unlock(
 		useDispatch( blockEditorStore )
 	);
@@ -163,47 +124,37 @@ export function BlockSettingsDropdown( {
 			),
 		};
 	}, [] );
-	const isMatch = __unstableUseShortcutEventMatch();
 	const hasSelectedBlocks = selectedBlockClientIds.length > 0;
 
-	const updateSelectionAfterDuplicate = useCallback(
-		async ( clientIdsPromise ) => {
-			if ( __experimentalSelectBlock ) {
-				const ids = await clientIdsPromise;
-				if ( ids && ids[ 0 ] ) {
-					__experimentalSelectBlock( ids[ 0 ], false );
-				}
-			}
-		},
-		[ __experimentalSelectBlock ]
-	);
+	async function updateSelectionAfterDuplicate( clientIdsPromise ) {
+		if ( ! __experimentalSelectBlock ) {
+			return;
+		}
 
-	const updateSelectionAfterRemove = useCallback( () => {
-		if ( __experimentalSelectBlock ) {
-			let blockToFocus = previousBlockClientId || firstParentClientId;
+		const ids = await clientIdsPromise;
+		if ( ids && ids[ 0 ] ) {
+			__experimentalSelectBlock( ids[ 0 ], false );
+		}
+	}
 
-			// Focus the first block if there's no previous block nor parent block.
-			if ( ! blockToFocus ) {
-				blockToFocus = getBlockOrder()[ 0 ];
-			}
+	function updateSelectionAfterRemove() {
+		if ( ! __experimentalSelectBlock ) {
+			return;
+		}
 
-			// Only update the selection if the original selection is removed.
-			const shouldUpdateSelection =
-				hasSelectedBlocks && getSelectedBlockClientIds().length === 0;
+		let blockToFocus = previousBlockClientId || firstParentClientId;
 
-			__experimentalSelectBlock( blockToFocus, shouldUpdateSelection );
+		// Focus the first block if there's no previous block nor parent block.
+		if ( ! blockToFocus ) {
+			blockToFocus = getBlockOrder()[ 0 ];
 		}
-	}, [
-		__experimentalSelectBlock,
-		previousBlockClientId,
-		firstParentClientId,
-		getBlockOrder,
-		hasSelectedBlocks,
-		getSelectedBlockClientIds,
-	] );
 
-	const removeBlockLabel =
-		count === 1 ? __( 'Delete' ) : __( 'Delete blocks' );
+		// Only update the selection if the original selection is removed.
+		const shouldUpdateSelection =
+			hasSelectedBlocks && getSelectedBlockClientIds().length === 0;
+
+		__experimentalSelectBlock( blockToFocus, shouldUpdateSelection );
+	}
 
 	// This can occur when the selected block (the parent)
 	// displays child blocks within a List View.
@@ -221,20 +172,20 @@ export function BlockSettingsDropdown( {
 		? undefined
 		: openedBlockSettingsMenu === currentClientId || false;
 
-	const onToggle = useCallback(
-		( localOpen ) => {
-			if ( localOpen && openedBlockSettingsMenu !== currentClientId ) {
-				setOpenedBlockSettingsMenu( currentClientId );
-			} else if (
-				! localOpen &&
-				openedBlockSettingsMenu &&
-				openedBlockSettingsMenu === currentClientId
-			) {
-				setOpenedBlockSettingsMenu( undefined );
-			}
-		},
-		[ currentClientId, openedBlockSettingsMenu, setOpenedBlockSettingsMenu ]
-	);
+	function onToggle( localOpen ) {
+		if ( localOpen && openedBlockSettingsMenu !== currentClientId ) {
+			setOpenedBlockSettingsMenu( currentClientId );
+		} else if (
+			! localOpen &&
+			openedBlockSettingsMenu &&
+			openedBlockSettingsMenu === currentClientId
+		) {
+			setOpenedBlockSettingsMenu( undefined );
+		}
+	}
+
+	const shouldShowBlockParentMenuItem =
+		! parentBlockIsSelected && !! firstParentClientId;
 
 	return (
 		<BlockActions
@@ -244,8 +195,7 @@ export function BlockSettingsDropdown( {
 			{ ( {
 				canCopyStyles,
 				canDuplicate,
-				canInsertDefaultBlock,
-				canMove,
+				canInsertBlock,
 				canRemove,
 				onDuplicate,
 				onInsertAfter,
@@ -253,172 +203,146 @@ export function BlockSettingsDropdown( {
 				onRemove,
 				onCopy,
 				onPasteStyles,
-				onMoveTo,
-				blocks,
-			} ) => (
-				<DropdownMenu
-					icon={ moreVertical }
-					label={ __( 'Options' ) }
-					className="block-editor-block-settings-menu"
-					popoverProps={ POPOVER_PROPS }
-					open={ open }
-					onToggle={ onToggle }
-					noIcons
-					menuProps={ {
-						/**
-						 * @param {KeyboardEvent} event
-						 */
-						onKeyDown( event ) {
-							if ( event.defaultPrevented ) return;
+			} ) => {
+				// It is possible that some plugins register fills for this menu
+				// even if Core doesn't render anything in the block settings menu.
+				// in which case, we may want to render the menu anyway.
+				// That said for now, we can start more conservative.
+				const isEmpty =
+					! canRemove &&
+					! canDuplicate &&
+					! canInsertBlock &&
+					isContentOnly;
 
-							if (
-								isMatch( 'core/block-editor/remove', event ) &&
-								canRemove
-							) {
-								event.preventDefault();
-								updateSelectionAfterRemove( onRemove() );
-							} else if (
-								isMatch(
-									'core/block-editor/duplicate',
-									event
-								) &&
-								canDuplicate
-							) {
-								event.preventDefault();
-								updateSelectionAfterDuplicate( onDuplicate() );
-							} else if (
-								isMatch(
-									'core/block-editor/insert-after',
-									event
-								) &&
-								canInsertDefaultBlock
-							) {
-								event.preventDefault();
-								setOpenedBlockSettingsMenu( undefined );
-								onInsertAfter();
-							} else if (
-								isMatch(
-									'core/block-editor/insert-before',
-									event
-								) &&
-								canInsertDefaultBlock
-							) {
-								event.preventDefault();
-								setOpenedBlockSettingsMenu( undefined );
-								onInsertBefore();
-							}
-						},
-					} }
-					{ ...props }
-				>
-					{ ( { onClose } ) => (
-						<>
-							<MenuGroup>
-								<__unstableBlockSettingsMenuFirstItem.Slot
-									fillProps={ { onClose } }
-								/>
-								{ ! parentBlockIsSelected &&
-									!! firstParentClientId && (
-										<ParentSelectorMenuItem
+				if ( isEmpty ) {
+					return null;
+				}
+
+				return (
+					<DropdownMenu
+						icon={ moreVertical }
+						label={ __( 'Options' ) }
+						className="block-editor-block-settings-menu"
+						popoverProps={ POPOVER_PROPS }
+						open={ open }
+						onToggle={ onToggle }
+						noIcons
+						{ ...props }
+					>
+						{ ( { onClose } ) => (
+							<>
+								<MenuGroup>
+									<__unstableBlockSettingsMenuFirstItem.Slot
+										fillProps={ { onClose } }
+									/>
+									{ shouldShowBlockParentMenuItem && (
+										<BlockParentSelectorMenuItem
 											parentClientId={
 												firstParentClientId
 											}
 											parentBlockType={ parentBlockType }
 										/>
 									) }
-								{ count === 1 && (
-									<BlockHTMLConvertButton
-										clientId={ firstBlockClientId }
-									/>
-								) }
-								<CopyMenuItem
-									blocks={ blocks }
-									onCopy={ onCopy }
-								/>
-								{ canDuplicate && (
-									<MenuItem
-										onClick={ pipe(
-											onClose,
-											onDuplicate,
-											updateSelectionAfterDuplicate
-										) }
-										shortcut={ shortcuts.duplicate }
-									>
-										{ __( 'Duplicate' ) }
-									</MenuItem>
-								) }
-								{ canInsertDefaultBlock && (
-									<>
+									{ count === 1 && (
+										<BlockHTMLConvertButton
+											clientId={ firstBlockClientId }
+										/>
+									) }
+									{ ! isContentOnly && (
+										<CopyMenuItem
+											clientIds={ clientIds }
+											onCopy={ onCopy }
+											shortcut={ displayShortcut.primary(
+												'c'
+											) }
+										/>
+									) }
+									{ canDuplicate && (
 										<MenuItem
 											onClick={ pipe(
 												onClose,
-												onInsertBefore
+												onDuplicate,
+												updateSelectionAfterDuplicate
 											) }
-											shortcut={ shortcuts.insertBefore }
+											shortcut={ shortcuts.duplicate }
 										>
-											{ __( 'Add before' ) }
+											{ __( 'Duplicate' ) }
+										</MenuItem>
+									) }
+									{ canInsertBlock && ! isContentOnly && (
+										<>
+											<MenuItem
+												onClick={ pipe(
+													onClose,
+													onInsertBefore
+												) }
+												shortcut={
+													shortcuts.insertBefore
+												}
+											>
+												{ __( 'Add before' ) }
+											</MenuItem>
+											<MenuItem
+												onClick={ pipe(
+													onClose,
+													onInsertAfter
+												) }
+												shortcut={
+													shortcuts.insertAfter
+												}
+											>
+												{ __( 'Add after' ) }
+											</MenuItem>
+										</>
+									) }
+									<__unstableCommentIconFill.Slot
+										fillProps={ { onClose } }
+									/>
+								</MenuGroup>
+								{ canCopyStyles && ! isContentOnly && (
+									<MenuGroup>
+										<CopyMenuItem
+											clientIds={ clientIds }
+											onCopy={ onCopy }
+											label={ __( 'Copy styles' ) }
+										/>
+										<MenuItem onClick={ onPasteStyles }>
+											{ __( 'Paste styles' ) }
 										</MenuItem>
+									</MenuGroup>
+								) }
+								<BlockSettingsMenuControls.Slot
+									fillProps={ {
+										onClose,
+										count,
+										firstBlockClientId,
+									} }
+									clientIds={ clientIds }
+								/>
+								{ typeof children === 'function'
+									? children( { onClose } )
+									: Children.map( ( child ) =>
+											cloneElement( child, { onClose } )
+									  ) }
+								{ canRemove && (
+									<MenuGroup>
 										<MenuItem
 											onClick={ pipe(
 												onClose,
-												onInsertAfter
+												onRemove,
+												updateSelectionAfterRemove
 											) }
-											shortcut={ shortcuts.insertAfter }
+											shortcut={ shortcuts.remove }
 										>
-											{ __( 'Add after' ) }
+											{ __( 'Delete' ) }
 										</MenuItem>
-									</>
+									</MenuGroup>
 								) }
-							</MenuGroup>
-							{ canCopyStyles && (
-								<MenuGroup>
-									<CopyMenuItem
-										blocks={ blocks }
-										onCopy={ onCopy }
-										label={ __( 'Copy styles' ) }
-									/>
-									<MenuItem onClick={ onPasteStyles }>
-										{ __( 'Paste styles' ) }
-									</MenuItem>
-								</MenuGroup>
-							) }
-							<BlockSettingsMenuControls.Slot
-								fillProps={ {
-									onClose,
-									canMove,
-									onMoveTo,
-									onlyBlock,
-									count,
-									firstBlockClientId,
-								} }
-								clientIds={ clientIds }
-								__unstableDisplayLocation={
-									__unstableDisplayLocation
-								}
-							/>
-							{ typeof children === 'function'
-								? children( { onClose } )
-								: Children.map( ( child ) =>
-										cloneElement( child, { onClose } )
-								  ) }
-							{ canRemove && (
-								<MenuGroup>
-									<MenuItem
-										onClick={ pipe(
-											onClose,
-											onRemove,
-											updateSelectionAfterRemove
-										) }
-										shortcut={ shortcuts.remove }
-									>
-										{ removeBlockLabel }
-									</MenuItem>
-								</MenuGroup>
-							) }
-						</>
-					) }
-				</DropdownMenu>
-			) }
+							</>
+						) }
+					</DropdownMenu>
+				);
+			} }
 		</BlockActions>
 	);
 }
diff --git a/packages/block-editor/src/components/block-settings-menu/index.js b/packages/block-editor/src/components/block-settings-menu/index.js
index 0b0b1a775e736f..50e8abe09d018b 100644
--- a/packages/block-editor/src/components/block-settings-menu/index.js
+++ b/packages/block-editor/src/components/block-settings-menu/index.js
@@ -7,10 +7,13 @@ import { ToolbarGroup, ToolbarItem } from '@wordpress/components';
  * Internal dependencies
  */
 import BlockSettingsDropdown from './block-settings-dropdown';
+import __unstableCommentIconToolbarFill from '../../components/collab/block-comment-icon-toolbar-slot';
 
 export function BlockSettingsMenu( { clientIds, ...props } ) {
 	return (
 		<ToolbarGroup>
+			<__unstableCommentIconToolbarFill.Slot />
+
 			<ToolbarItem>
 				{ ( toggleProps ) => (
 					<BlockSettingsDropdown
diff --git a/packages/block-editor/src/components/block-settings-menu/style.scss b/packages/block-editor/src/components/block-settings-menu/style.scss
deleted file mode 100644
index bea2242fc59d4e..00000000000000
--- a/packages/block-editor/src/components/block-settings-menu/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.block-editor-block-settings-menu__popover .components-dropdown-menu__menu {
-	padding: 0;
-}
diff --git a/packages/block-editor/src/components/block-settings-menu/test/block-mode-toggle.js b/packages/block-editor/src/components/block-settings-menu/test/block-mode-toggle.js
index c297bad15f29ea..67d88125e3429c 100644
--- a/packages/block-editor/src/components/block-settings-menu/test/block-mode-toggle.js
+++ b/packages/block-editor/src/components/block-settings-menu/test/block-mode-toggle.js
@@ -3,16 +3,32 @@
  */
 import { render, screen } from '@testing-library/react';
 
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
-import { BlockModeToggle } from '../block-mode-toggle';
+import BlockModeToggle from '../block-mode-toggle';
+
+jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
+
+function setupUseSelectMock( mode, blockType, codeEditingEnabled = true ) {
+	useSelect.mockImplementation( () => {
+		return {
+			mode,
+			blockType,
+			isCodeEditingEnabled: codeEditingEnabled,
+		};
+	} );
+}
 
 describe( 'BlockModeToggle', () => {
 	it( "should not render the HTML mode button if the block doesn't support it", () => {
-		render(
-			<BlockModeToggle blockType={ { supports: { html: false } } } />
-		);
+		setupUseSelectMock( undefined, { supports: { html: false } } );
+		render( <BlockModeToggle /> );
 
 		expect(
 			screen.queryByRole( 'menuitem', { name: 'Edit as HTML' } )
@@ -20,12 +36,8 @@ describe( 'BlockModeToggle', () => {
 	} );
 
 	it( 'should render the HTML mode button', () => {
-		render(
-			<BlockModeToggle
-				blockType={ { supports: { html: true } } }
-				mode="visual"
-			/>
-		);
+		setupUseSelectMock( 'visual', { supports: { html: true } } );
+		render( <BlockModeToggle /> );
 
 		expect(
 			screen.getByRole( 'menuitem', { name: 'Edit as HTML' } )
@@ -33,12 +45,8 @@ describe( 'BlockModeToggle', () => {
 	} );
 
 	it( 'should render the Visual mode button', () => {
-		render(
-			<BlockModeToggle
-				blockType={ { supports: { html: true } } }
-				mode="html"
-			/>
-		);
+		setupUseSelectMock( 'html', { supports: { html: true } } );
+		render( <BlockModeToggle /> );
 
 		expect(
 			screen.getByRole( 'menuitem', { name: 'Edit visually' } )
@@ -46,13 +54,8 @@ describe( 'BlockModeToggle', () => {
 	} );
 
 	it( 'should not render the Visual mode button if code editing is disabled', () => {
-		render(
-			<BlockModeToggle
-				blockType={ { supports: { html: true } } }
-				mode="html"
-				isCodeEditingEnabled={ false }
-			/>
-		);
+		setupUseSelectMock( 'html', { supports: { html: true } }, false );
+		render( <BlockModeToggle /> );
 
 		expect(
 			screen.queryByRole( 'menuitem', { name: 'Edit visually' } )
diff --git a/packages/block-editor/src/components/block-settings/container.native.js b/packages/block-editor/src/components/block-settings/container.native.js
index 0947ac61ca6cf1..aa2583c960559e 100644
--- a/packages/block-editor/src/components/block-settings/container.native.js
+++ b/packages/block-editor/src/components/block-settings/container.native.js
@@ -1,15 +1,10 @@
 /**
  * WordPress dependencies
  */
-import {
-	InspectorControls,
-	useMultipleOriginColorsAndGradients,
-} from '@wordpress/block-editor';
 import {
 	BottomSheet,
 	ColorSettings,
 	FocalPointSettingsPanel,
-	ImageLinkDestinationsScreen,
 	LinkPickerScreen,
 } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
@@ -18,6 +13,11 @@ import { useDispatch, useSelect } from '@wordpress/data';
  * Internal dependencies
  */
 import styles from './container.native.scss';
+import InspectorControls from '../inspector-controls';
+import ImageLinkDestinationsScreen from '../image-link-destinations';
+import useMultipleOriginColorsAndGradients from '../colors-gradients/use-multiple-origin-colors-and-gradients';
+import { useMobileGlobalStylesColors } from '../global-styles/use-global-styles-context';
+import AdvancedControls from '../inspector-controls-tabs/advanced-controls-panel';
 
 export const blockSettingsScreens = {
 	settings: 'Settings',
@@ -29,6 +29,7 @@ export const blockSettingsScreens = {
 
 export default function BottomSheetSettings( props ) {
 	const colorSettings = useMultipleOriginColorsAndGradients();
+	colorSettings.allAvailableColors = useMobileGlobalStylesColors();
 	const { closeGeneralSidebar } = useDispatch( 'core/edit-post' );
 	const editorSidebarOpened = useSelect( ( select ) =>
 		select( 'core/edit-post' ).isEditorSidebarOpened()
@@ -48,7 +49,10 @@ export default function BottomSheetSettings( props ) {
 				<BottomSheet.NavigationScreen
 					name={ blockSettingsScreens.settings }
 				>
-					<InspectorControls.Slot />
+					<>
+						<InspectorControls.Slot />
+						<AdvancedControls />
+					</>
 				</BottomSheet.NavigationScreen>
 				<BottomSheet.NavigationScreen
 					name={ BottomSheet.SubSheet.screenName }
diff --git a/packages/block-editor/src/components/block-styles/index.js b/packages/block-editor/src/components/block-styles/index.js
index a9fdbe94356ef6..951c6d13c52f43 100644
--- a/packages/block-editor/src/components/block-styles/index.js
+++ b/packages/block-editor/src/components/block-styles/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -68,7 +68,7 @@ function BlockStyles( { clientId, onSwitch = noop, onHoverClassName = noop } ) {
 					return (
 						<Button
 							__next40pxDefaultSize
-							className={ classnames(
+							className={ clsx(
 								'block-editor-block-styles__item',
 								{
 									'is-active':
diff --git a/packages/block-editor/src/components/block-styles/index.native.js b/packages/block-editor/src/components/block-styles/index.native.js
index 7967e79c2c1cd8..40e29476287ffb 100644
--- a/packages/block-editor/src/components/block-styles/index.native.js
+++ b/packages/block-editor/src/components/block-styles/index.native.js
@@ -19,14 +19,16 @@ import StylePreview from './preview';
 import containerStyles from './style.scss';
 import { store as blockEditorStore } from '../../store';
 
+const EMPTY_ARRAY = [];
+
 function BlockStyles( { clientId, url } ) {
 	const selector = ( select ) => {
 		const { getBlock } = select( blockEditorStore );
 		const { getBlockStyles } = select( blocksStore );
 		const block = getBlock( clientId );
 		return {
-			styles: getBlockStyles( block.name ),
-			className: block.attributes.className || '',
+			styles: getBlockStyles( block?.name ) || EMPTY_ARRAY,
+			className: block?.attributes?.className || '',
 		};
 	};
 
diff --git a/packages/block-editor/src/components/block-styles/style.scss b/packages/block-editor/src/components/block-styles/style.scss
index b2747df04c1c05..a83adb25c6ae15 100644
--- a/packages/block-editor/src/components/block-styles/style.scss
+++ b/packages/block-editor/src/components/block-styles/style.scss
@@ -1,7 +1,3 @@
-.block-editor-block-styles + .default-style-picker__default-switcher {
-	margin-top: $grid-unit-20;
-}
-
 .block-editor-block-styles__preview-panel {
 	display: none;
 	// Same layer as the sidebar from which it's triggered.
diff --git a/packages/block-editor/src/components/block-switcher/block-transformations-menu.js b/packages/block-editor/src/components/block-switcher/block-transformations-menu.js
index 033201d7facadb..271b7fabd51731 100644
--- a/packages/block-editor/src/components/block-switcher/block-transformations-menu.js
+++ b/packages/block-editor/src/components/block-switcher/block-transformations-menu.js
@@ -37,7 +37,7 @@ function useGroupedTransforms( possibleBlockTransformations ) {
 		const priorityTextTranformsNames = Object.keys(
 			priorityContentTranformationBlocks
 		);
-		return possibleBlockTransformations.reduce(
+		const groupedPossibleTransforms = possibleBlockTransformations.reduce(
 			( accumulator, item ) => {
 				const { name } = item;
 				if ( priorityTextTranformsNames.includes( name ) ) {
@@ -49,6 +49,23 @@ function useGroupedTransforms( possibleBlockTransformations ) {
 			},
 			{ priorityTextTransformations: [], restTransformations: [] }
 		);
+		/**
+		 * If there is only one priority text transformation and it's a Quote,
+		 * is should move to the rest transformations. This is because Quote can
+		 * be a container for any block type, so in multi-block selection it will
+		 * always be suggested, even for non-text blocks.
+		 */
+		if (
+			groupedPossibleTransforms.priorityTextTransformations.length ===
+				1 &&
+			groupedPossibleTransforms.priorityTextTransformations[ 0 ].name ===
+				'core/quote'
+		) {
+			const singleQuote =
+				groupedPossibleTransforms.priorityTextTransformations.pop();
+			groupedPossibleTransforms.restTransformations.push( singleQuote );
+		}
+		return groupedPossibleTransforms;
 	}, [ possibleBlockTransformations ] );
 
 	// Order the priority text transformations.
diff --git a/packages/block-editor/src/components/block-switcher/block-transformations-menu.native.js b/packages/block-editor/src/components/block-switcher/block-transformations-menu.native.js
index 33952378f601f5..4b95af2c59d523 100644
--- a/packages/block-editor/src/components/block-switcher/block-transformations-menu.native.js
+++ b/packages/block-editor/src/components/block-switcher/block-transformations-menu.native.js
@@ -80,7 +80,7 @@ const BlockTransformationsMenu = ( {
 			options={ pickerOptions() }
 			onChange={ onPickerSelect }
 			hideCancelButton={ Platform.OS !== 'ios' }
-			leftAlign={ true }
+			leftAlign
 			getAnchor={ getAnchor }
 			// translators: %s: block title e.g: "Paragraph".
 			title={ sprintf( __( 'Transform %s to' ), blockTitle ) }
diff --git a/packages/block-editor/src/components/block-switcher/block-variation-transformations.js b/packages/block-editor/src/components/block-switcher/block-variation-transformations.js
index c2ec449dc61f94..b2ecdb7622209f 100644
--- a/packages/block-editor/src/components/block-switcher/block-variation-transformations.js
+++ b/packages/block-editor/src/components/block-switcher/block-variation-transformations.js
@@ -22,17 +22,12 @@ const EMPTY_OBJECT = {};
 export function useBlockVariationTransforms( { clientIds, blocks } ) {
 	const { activeBlockVariation, blockVariationTransformations } = useSelect(
 		( select ) => {
-			const {
-				getBlockRootClientId,
-				getBlockAttributes,
-				canRemoveBlocks,
-			} = select( blockEditorStore );
+			const { getBlockAttributes, canRemoveBlocks } =
+				select( blockEditorStore );
 			const { getActiveBlockVariation, getBlockVariations } =
 				select( blocksStore );
-			const rootClientId = getBlockRootClientId(
-				Array.isArray( clientIds ) ? clientIds[ 0 ] : clientIds
-			);
-			const canRemove = canRemoveBlocks( clientIds, rootClientId );
+
+			const canRemove = canRemoveBlocks( clientIds );
 			// Only handle single selected blocks for now.
 			if ( blocks.length !== 1 || ! canRemove ) {
 				return EMPTY_OBJECT;
diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
index 0960dc87eaa499..79f33bd30d7537 100644
--- a/packages/block-editor/src/components/block-switcher/index.js
+++ b/packages/block-editor/src/components/block-switcher/index.js
@@ -1,12 +1,14 @@
 /**
  * WordPress dependencies
  */
-import { __, _n, sprintf } from '@wordpress/i18n';
+import { __, _n, sprintf, _x } from '@wordpress/i18n';
 import {
 	DropdownMenu,
 	ToolbarButton,
 	ToolbarGroup,
 	ToolbarItem,
+	__experimentalText as Text,
+	MenuGroup,
 } from '@wordpress/components';
 import {
 	switchToBlockType,
@@ -21,7 +23,6 @@ import { copy } from '@wordpress/icons';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-import useBlockDisplayInformation from '../use-block-display-information';
 import BlockIcon from '../block-icon';
 import BlockTransformationsMenu from './block-transformations-menu';
 import { useBlockVariationTransforms } from './block-variation-transformations';
@@ -29,75 +30,49 @@ import BlockStylesMenu from './block-styles-menu';
 import PatternTransformationsMenu from './pattern-transformations-menu';
 import useBlockDisplayTitle from '../block-title/use-block-display-title';
 
-export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
+function BlockSwitcherDropdownMenuContents( {
+	onClose,
+	clientIds,
+	hasBlockStyles,
+	canRemove,
+} ) {
 	const { replaceBlocks, multiSelect, updateBlockAttributes } =
 		useDispatch( blockEditorStore );
-	const blockInformation = useBlockDisplayInformation( blocks[ 0 ].clientId );
-	const {
-		possibleBlockTransformations,
-		canRemove,
-		hasBlockStyles,
-		icon,
-		patterns,
-	} = useSelect(
-		( select ) => {
-			const {
-				getBlockRootClientId,
-				getBlockTransformItems,
-				__experimentalGetPatternTransformItems,
-				canRemoveBlocks,
-			} = select( blockEditorStore );
-			const { getBlockStyles, getBlockType } = select( blocksStore );
-			const rootClientId = getBlockRootClientId(
-				Array.isArray( clientIds ) ? clientIds[ 0 ] : clientIds
-			);
-			const [ { name: firstBlockName } ] = blocks;
-			const _isSingleBlockSelected = blocks.length === 1;
-			const styles =
-				_isSingleBlockSelected && getBlockStyles( firstBlockName );
-			let _icon;
-			if ( _isSingleBlockSelected ) {
-				_icon = blockInformation?.icon; // Take into account active block variations.
-			} else {
-				const isSelectionOfSameType =
-					new Set( blocks.map( ( { name } ) => name ) ).size === 1;
-				// When selection consists of blocks of multiple types, display an
-				// appropriate icon to communicate the non-uniformity.
-				_icon = isSelectionOfSameType
-					? getBlockType( firstBlockName )?.icon
-					: copy;
-			}
-			return {
-				possibleBlockTransformations: getBlockTransformItems(
-					blocks,
-					rootClientId
-				),
-				canRemove: canRemoveBlocks( clientIds, rootClientId ),
-				hasBlockStyles: !! styles?.length,
-				icon: _icon,
-				patterns: __experimentalGetPatternTransformItems(
-					blocks,
-					rootClientId
-				),
-			};
-		},
-		[ clientIds, blocks, blockInformation?.icon ]
-	);
-
+	const { possibleBlockTransformations, patterns, blocks, isUsingBindings } =
+		useSelect(
+			( select ) => {
+				const {
+					getBlockAttributes,
+					getBlocksByClientId,
+					getBlockRootClientId,
+					getBlockTransformItems,
+					__experimentalGetPatternTransformItems,
+				} = select( blockEditorStore );
+				const rootClientId = getBlockRootClientId( clientIds[ 0 ] );
+				const _blocks = getBlocksByClientId( clientIds );
+				return {
+					blocks: _blocks,
+					possibleBlockTransformations: getBlockTransformItems(
+						_blocks,
+						rootClientId
+					),
+					patterns: __experimentalGetPatternTransformItems(
+						_blocks,
+						rootClientId
+					),
+					isUsingBindings: clientIds.every(
+						( clientId ) =>
+							!! getBlockAttributes( clientId )?.metadata
+								?.bindings
+					),
+				};
+			},
+			[ clientIds ]
+		);
 	const blockVariationTransformations = useBlockVariationTransforms( {
 		clientIds,
 		blocks,
 	} );
-
-	const blockTitle = useBlockDisplayTitle( {
-		clientId: Array.isArray( clientIds ) ? clientIds[ 0 ] : clientIds,
-		maximumLength: 35,
-	} );
-
-	const isSingleBlock = blocks.length === 1;
-	const isReusable = isSingleBlock && isReusableBlock( blocks[ 0 ] );
-	const isTemplate = isSingleBlock && isTemplatePart( blocks[ 0 ] );
-
 	function selectForMultipleBlocks( insertedBlocks ) {
 		if ( insertedBlocks.length > 1 ) {
 			multiSelect(
@@ -106,14 +81,12 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 			);
 		}
 	}
-
 	// Simple block tranformation based on the `Block Transforms` API.
 	function onBlockTransform( name ) {
 		const newBlocks = switchToBlockType( blocks, name );
 		replaceBlocks( clientIds, newBlocks );
 		selectForMultipleBlocks( newBlocks );
 	}
-
 	function onBlockVariationTransform( name ) {
 		updateBlockAttributes( blocks[ 0 ].clientId, {
 			...blockVariationTransformations.find(
@@ -121,53 +94,218 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 			).attributes,
 		} );
 	}
-
 	// Pattern transformation through the `Patterns` API.
 	function onPatternTransform( transformedBlocks ) {
 		replaceBlocks( clientIds, transformedBlocks );
 		selectForMultipleBlocks( transformedBlocks );
 	}
-
 	/**
 	 * The `isTemplate` check is a stopgap solution here.
 	 * Ideally, the Transforms API should handle this
 	 * by allowing to exclude blocks from wildcard transformations.
 	 */
+	const isSingleBlock = blocks.length === 1;
+	const isTemplate = isSingleBlock && isTemplatePart( blocks[ 0 ] );
 	const hasPossibleBlockTransformations =
 		!! possibleBlockTransformations.length && canRemove && ! isTemplate;
 	const hasPossibleBlockVariationTransformations =
 		!! blockVariationTransformations?.length;
 	const hasPatternTransformation = !! patterns?.length && canRemove;
-	if (
-		! hasBlockStyles &&
-		! hasPossibleBlockTransformations &&
-		! hasPossibleBlockVariationTransformations
-	) {
+	const hasBlockOrBlockVariationTransforms =
+		hasPossibleBlockTransformations ||
+		hasPossibleBlockVariationTransformations;
+	const hasContents =
+		hasBlockStyles ||
+		hasBlockOrBlockVariationTransforms ||
+		hasPatternTransformation;
+	if ( ! hasContents ) {
+		return (
+			<p className="block-editor-block-switcher__no-transforms">
+				{ __( 'No transforms.' ) }
+			</p>
+		);
+	}
+
+	const connectedBlockDescription = isSingleBlock
+		? _x(
+				'This block is connected.',
+				'block toolbar button label and description'
+		  )
+		: _x(
+				'These blocks are connected.',
+				'block toolbar button label and description'
+		  );
+
+	return (
+		<div className="block-editor-block-switcher__container">
+			{ hasPatternTransformation && (
+				<PatternTransformationsMenu
+					blocks={ blocks }
+					patterns={ patterns }
+					onSelect={ ( transformedBlocks ) => {
+						onPatternTransform( transformedBlocks );
+						onClose();
+					} }
+				/>
+			) }
+			{ hasBlockOrBlockVariationTransforms && (
+				<BlockTransformationsMenu
+					className="block-editor-block-switcher__transforms__menugroup"
+					possibleBlockTransformations={
+						possibleBlockTransformations
+					}
+					possibleBlockVariationTransformations={
+						blockVariationTransformations
+					}
+					blocks={ blocks }
+					onSelect={ ( name ) => {
+						onBlockTransform( name );
+						onClose();
+					} }
+					onSelectVariation={ ( name ) => {
+						onBlockVariationTransform( name );
+						onClose();
+					} }
+				/>
+			) }
+			{ hasBlockStyles && (
+				<BlockStylesMenu
+					hoveredBlock={ blocks[ 0 ] }
+					onSwitch={ onClose }
+				/>
+			) }
+			{ isUsingBindings && (
+				<MenuGroup>
+					<Text className="block-editor-block-switcher__binding-indicator">
+						{ connectedBlockDescription }
+					</Text>
+				</MenuGroup>
+			) }
+		</div>
+	);
+}
+
+const BlockIndicator = ( { icon, showTitle, blockTitle } ) => (
+	<>
+		<BlockIcon
+			className="block-editor-block-switcher__toggle"
+			icon={ icon }
+			showColors
+		/>
+		{ showTitle && blockTitle && (
+			<span className="block-editor-block-switcher__toggle-text">
+				{ blockTitle }
+			</span>
+		) }
+	</>
+);
+
+export const BlockSwitcher = ( { clientIds } ) => {
+	const {
+		hasContentOnlyLocking,
+		canRemove,
+		hasBlockStyles,
+		icon,
+		invalidBlocks,
+		isReusable,
+		isTemplate,
+		isDisabled,
+	} = useSelect(
+		( select ) => {
+			const {
+				getTemplateLock,
+				getBlocksByClientId,
+				getBlockAttributes,
+				canRemoveBlocks,
+				getBlockEditingMode,
+			} = select( blockEditorStore );
+			const { getBlockStyles, getBlockType, getActiveBlockVariation } =
+				select( blocksStore );
+			const _blocks = getBlocksByClientId( clientIds );
+			if ( ! _blocks.length || _blocks.some( ( block ) => ! block ) ) {
+				return { invalidBlocks: true };
+			}
+			const [ { name: firstBlockName } ] = _blocks;
+			const _isSingleBlockSelected = _blocks.length === 1;
+			const blockType = getBlockType( firstBlockName );
+			const editingMode = getBlockEditingMode( clientIds[ 0 ] );
+
+			let _icon;
+			let _hasTemplateLock;
+			if ( _isSingleBlockSelected ) {
+				const match = getActiveBlockVariation(
+					firstBlockName,
+					getBlockAttributes( clientIds[ 0 ] )
+				);
+				// Take into account active block variations.
+				_icon = match?.icon || blockType.icon;
+				_hasTemplateLock =
+					getTemplateLock( clientIds[ 0 ] ) === 'contentOnly';
+			} else {
+				const isSelectionOfSameType =
+					new Set( _blocks.map( ( { name } ) => name ) ).size === 1;
+				_hasTemplateLock = clientIds.some(
+					( id ) => getTemplateLock( id ) === 'contentOnly'
+				);
+				// When selection consists of blocks of multiple types, display an
+				// appropriate icon to communicate the non-uniformity.
+				_icon = isSelectionOfSameType ? blockType.icon : copy;
+			}
+
+			return {
+				canRemove: canRemoveBlocks( clientIds ),
+				hasBlockStyles:
+					_isSingleBlockSelected &&
+					!! getBlockStyles( firstBlockName )?.length,
+				icon: _icon,
+				isReusable:
+					_isSingleBlockSelected && isReusableBlock( _blocks[ 0 ] ),
+				isTemplate:
+					_isSingleBlockSelected && isTemplatePart( _blocks[ 0 ] ),
+				hasContentOnlyLocking: _hasTemplateLock,
+				isDisabled: editingMode !== 'default',
+			};
+		},
+		[ clientIds ]
+	);
+	const blockTitle = useBlockDisplayTitle( {
+		clientId: clientIds?.[ 0 ],
+		maximumLength: 35,
+	} );
+
+	if ( invalidBlocks ) {
+		return null;
+	}
+
+	const isSingleBlock = clientIds.length === 1;
+	const blockSwitcherLabel = isSingleBlock
+		? blockTitle
+		: __( 'Multiple blocks selected' );
+
+	const hideDropdown =
+		isDisabled ||
+		( ! hasBlockStyles && ! canRemove ) ||
+		hasContentOnlyLocking;
+
+	if ( hideDropdown ) {
 		return (
 			<ToolbarGroup>
 				<ToolbarButton
 					disabled
 					className="block-editor-block-switcher__no-switcher-icon"
-					title={ blockTitle }
+					title={ blockSwitcherLabel }
 					icon={
-						<>
-							<BlockIcon icon={ icon } showColors />
-							{ ( isReusable || isTemplate ) && (
-								<span className="block-editor-block-switcher__toggle-text">
-									{ blockTitle }
-								</span>
-							) }
-						</>
+						<BlockIndicator
+							icon={ icon }
+							showTitle={ isReusable || isTemplate }
+							blockTitle={ blockTitle }
+						/>
 					}
 				/>
 			</ToolbarGroup>
 		);
 	}
 
-	const blockSwitcherLabel = isSingleBlock
-		? blockTitle
-		: __( 'Multiple blocks selected' );
-
 	const blockSwitcherDescription = isSingleBlock
 		? __( 'Change block type or style' )
 		: sprintf(
@@ -175,18 +313,10 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 				_n(
 					'Change type of %d block',
 					'Change type of %d blocks',
-					blocks.length
+					clientIds.length
 				),
-				blocks.length
+				clientIds.length
 		  );
-
-	const hasBlockOrBlockVariationTransforms =
-		hasPossibleBlockTransformations ||
-		hasPossibleBlockVariationTransformations;
-	const showDropDown =
-		hasBlockStyles ||
-		hasBlockOrBlockVariationTransforms ||
-		hasPatternTransformation;
 	return (
 		<ToolbarGroup>
 			<ToolbarItem>
@@ -199,73 +329,26 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 							className: 'block-editor-block-switcher__popover',
 						} }
 						icon={
-							<>
-								<BlockIcon
-									icon={ icon }
-									className="block-editor-block-switcher__toggle"
-									showColors
-								/>
-								{ ( isReusable || isTemplate ) && (
-									<span className="block-editor-block-switcher__toggle-text">
-										{ blockTitle }
-									</span>
-								) }
-							</>
+							<BlockIndicator
+								icon={ icon }
+								showTitle={ isReusable || isTemplate }
+								blockTitle={ blockTitle }
+							/>
 						}
 						toggleProps={ {
-							describedBy: blockSwitcherDescription,
+							description: blockSwitcherDescription,
 							...toggleProps,
 						} }
 						menuProps={ { orientation: 'both' } }
 					>
-						{ ( { onClose } ) =>
-							showDropDown && (
-								<div className="block-editor-block-switcher__container">
-									{ hasPatternTransformation && (
-										<PatternTransformationsMenu
-											blocks={ blocks }
-											patterns={ patterns }
-											onSelect={ (
-												transformedBlocks
-											) => {
-												onPatternTransform(
-													transformedBlocks
-												);
-												onClose();
-											} }
-										/>
-									) }
-									{ hasBlockOrBlockVariationTransforms && (
-										<BlockTransformationsMenu
-											className="block-editor-block-switcher__transforms__menugroup"
-											possibleBlockTransformations={
-												possibleBlockTransformations
-											}
-											possibleBlockVariationTransformations={
-												blockVariationTransformations
-											}
-											blocks={ blocks }
-											onSelect={ ( name ) => {
-												onBlockTransform( name );
-												onClose();
-											} }
-											onSelectVariation={ ( name ) => {
-												onBlockVariationTransform(
-													name
-												);
-												onClose();
-											} }
-										/>
-									) }
-									{ hasBlockStyles && (
-										<BlockStylesMenu
-											hoveredBlock={ blocks[ 0 ] }
-											onSwitch={ onClose }
-										/>
-									) }
-								</div>
-							)
-						}
+						{ ( { onClose } ) => (
+							<BlockSwitcherDropdownMenuContents
+								onClose={ onClose }
+								clientIds={ clientIds }
+								hasBlockStyles={ hasBlockStyles }
+								canRemove={ canRemove }
+							/>
+						) }
 					</DropdownMenu>
 				) }
 			</ToolbarItem>
@@ -273,20 +356,4 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 	);
 };
 
-export const BlockSwitcher = ( { clientIds } ) => {
-	const blocks = useSelect(
-		( select ) =>
-			select( blockEditorStore ).getBlocksByClientId( clientIds ),
-		[ clientIds ]
-	);
-
-	if ( ! blocks.length || blocks.some( ( block ) => ! block ) ) {
-		return null;
-	}
-
-	return (
-		<BlockSwitcherDropdownMenu clientIds={ clientIds } blocks={ blocks } />
-	);
-};
-
 export default BlockSwitcher;
diff --git a/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js b/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js
index 84f2d4b6a7a950..7d66e19a214a28 100644
--- a/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js
+++ b/packages/block-editor/src/components/block-switcher/pattern-transformations-menu.js
@@ -3,15 +3,15 @@
  */
 import { __ } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
-import { useInstanceId } from '@wordpress/compose';
+import { useInstanceId, useViewportMatch } from '@wordpress/compose';
 import { chevronRight } from '@wordpress/icons';
 
 import {
+	Composite,
 	MenuGroup,
 	MenuItem,
 	Popover,
 	VisuallyHidden,
-	privateApis as componentsPrivateApis,
 } from '@wordpress/components';
 
 /**
@@ -19,13 +19,6 @@ import {
  */
 import BlockPreview from '../block-preview';
 import useTransformedPatterns from './use-transformed-patterns';
-import { unlock } from '../../lock-unlock';
-
-const {
-	CompositeV2: Composite,
-	CompositeItemV2: CompositeItem,
-	useCompositeStoreV2: useCompositeStore,
-} = unlock( componentsPrivateApis );
 
 function PatternTransformationsMenu( {
 	blocks,
@@ -34,7 +27,10 @@ function PatternTransformationsMenu( {
 } ) {
 	const [ showTransforms, setShowTransforms ] = useState( false );
 	const patterns = useTransformedPatterns( statePatterns, blocks );
-	if ( ! patterns.length ) return null;
+
+	if ( ! patterns.length ) {
+		return null;
+	}
 
 	return (
 		<MenuGroup className="block-editor-block-switcher__pattern__transforms__menugroup">
@@ -58,30 +54,29 @@ function PatternTransformationsMenu( {
 }
 
 function PreviewPatternsPopover( { patterns, onSelect } ) {
+	const isMobile = useViewportMatch( 'medium', '<' );
+
 	return (
-		<div className="block-editor-block-switcher__popover__preview__parent">
-			<div className="block-editor-block-switcher__popover__preview__container">
-				<Popover
-					className="block-editor-block-switcher__preview__popover"
-					position="bottom right"
-				>
-					<div className="block-editor-block-switcher__preview is-pattern-list-preview">
-						<BlockPatternsList
-							patterns={ patterns }
-							onSelect={ onSelect }
-						/>
-					</div>
-				</Popover>
-			</div>
+		<div className="block-editor-block-switcher__popover-preview-container">
+			<Popover
+				className="block-editor-block-switcher__popover-preview"
+				placement={ isMobile ? 'bottom' : 'right-start' }
+				offset={ 16 }
+			>
+				<div className="block-editor-block-switcher__preview is-pattern-list-preview">
+					<BlockPatternsList
+						patterns={ patterns }
+						onSelect={ onSelect }
+					/>
+				</div>
+			</Popover>
 		</div>
 	);
 }
 
 function BlockPatternsList( { patterns, onSelect } ) {
-	const composite = useCompositeStore();
 	return (
 		<Composite
-			store={ composite }
 			role="listbox"
 			className="block-editor-block-switcher__preview-patterns-container"
 			aria-label={ __( 'Patterns list' ) }
@@ -107,7 +102,7 @@ function BlockPattern( { pattern, onSelect } ) {
 	);
 	return (
 		<div className={ `${ baseClassName }-list__list-item` }>
-			<CompositeItem
+			<Composite.Item
 				render={
 					<div
 						role="option"
@@ -127,7 +122,7 @@ function BlockPattern( { pattern, onSelect } ) {
 				<div className={ `${ baseClassName }-list__item-title` }>
 					{ pattern.title }
 				</div>
-			</CompositeItem>
+			</Composite.Item>
 			{ !! pattern.description && (
 				<VisuallyHidden id={ descriptionId }>
 					{ pattern.description }
diff --git a/packages/block-editor/src/components/block-switcher/preview-block-popover.js b/packages/block-editor/src/components/block-switcher/preview-block-popover.js
index 78e29f4ad09fba..f978ed43af1da9 100644
--- a/packages/block-editor/src/components/block-switcher/preview-block-popover.js
+++ b/packages/block-editor/src/components/block-switcher/preview-block-popover.js
@@ -3,6 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Popover } from '@wordpress/components';
+import { useViewportMatch } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -10,22 +11,27 @@ import { Popover } from '@wordpress/components';
 import BlockPreview from '../block-preview';
 
 export default function PreviewBlockPopover( { blocks } ) {
+	const isMobile = useViewportMatch( 'medium', '<' );
+
+	if ( isMobile ) {
+		return null;
+	}
+
 	return (
-		<div className="block-editor-block-switcher__popover__preview__parent">
-			<div className="block-editor-block-switcher__popover__preview__container">
-				<Popover
-					className="block-editor-block-switcher__preview__popover"
-					placement="bottom-start"
-					focusOnMount={ false }
-				>
-					<div className="block-editor-block-switcher__preview">
-						<div className="block-editor-block-switcher__preview-title">
-							{ __( 'Preview' ) }
-						</div>
-						<BlockPreview viewportWidth={ 500 } blocks={ blocks } />
+		<div className="block-editor-block-switcher__popover-preview-container">
+			<Popover
+				className="block-editor-block-switcher__popover-preview"
+				placement="right-start"
+				focusOnMount={ false }
+				offset={ 16 }
+			>
+				<div className="block-editor-block-switcher__preview">
+					<div className="block-editor-block-switcher__preview-title">
+						{ __( 'Preview' ) }
 					</div>
-				</Popover>
-			</div>
+					<BlockPreview viewportWidth={ 500 } blocks={ blocks } />
+				</div>
+			</Popover>
 		</div>
 	);
 }
diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss
index b8503a0811e420..3dc2a7d591c926 100644
--- a/packages/block-editor/src/components/block-switcher/style.scss
+++ b/packages/block-editor/src/components/block-switcher/style.scss
@@ -1,7 +1,7 @@
 .block-editor-block-switcher {
 	position: relative;
 
-	// @todo: override toolbar group inherited paddings from components/block-tools/style.scss.
+	// @todo override toolbar group inherited paddings from components/block-tools/style.scss.
 	// This is best fixed by making the mover control area a proper single toolbar group.
 	// It needs specificity due to style inherited from .components-accessible-toolbar .components-button.has-icon.has-icon.
 	.components-button.components-dropdown-menu__toggle.has-icon.has-icon {
@@ -35,10 +35,6 @@
 	}
 }
 
-.show-icon-labels .block-editor-block-toolbar .block-editor-block-switcher .components-button.has-icon::after {
-	font-size: 14px;
-}
-
 .components-button.block-editor-block-switcher__no-switcher-icon {
 	display: flex;
 
@@ -50,70 +46,36 @@
 }
 
 // Even when the block switcher does not have any transformations, it still serves as a block indicator.
-.components-button.block-editor-block-switcher__no-switcher-icon:disabled {
-	opacity: 1;
+.components-button.block-editor-block-switcher__no-switcher-icon[aria-disabled="true"] {
+	color: $gray-900;
 
 	// Since it's not clickable, though, don't show a hover state.
-	&,
-	.block-editor-block-icon.has-colors {
+	&:hover {
 		color: $gray-900;
 	}
 }
 
-// Style this the same as the block buttons in the library.
-// Needs specificity to override the icon button.
-.block-editor-block-toolbar .components-toolbar-group .components-button.block-editor-block-switcher__no-switcher-icon.has-icon.has-icon,
-.block-editor-block-toolbar .components-toolbar .components-button.block-editor-block-switcher__no-switcher-icon.has-icon.has-icon,
-.block-editor-block-toolbar .components-toolbar-group .components-button.block-editor-block-switcher__toggle.has-icon.has-icon,
-.block-editor-block-toolbar .components-toolbar .components-button.block-editor-block-switcher__toggle.has-icon.has-icon {
-	.block-editor-block-icon {
-		height: 100%;
-		position: relative;
-		margin: 0 auto;
-		display: flex;
-		align-items: center;
-		min-width: 100%;
-	}
-
-	// Position the focus style correctly.
-	&::before {
-		top: $grid-unit-10;
-		right: $grid-unit-10;
-		bottom: $grid-unit-10;
-		left: $grid-unit-10;
-	}
-}
-
 .components-popover.block-editor-block-switcher__popover .components-popover__content {
 	min-width: 300px;
 }
 
-.block-editor-block-switcher__popover__preview__parent {
-	.block-editor-block-switcher__popover__preview__container {
-		position: absolute;
-		top: -$grid-unit-15;
-		left: calc(100% + #{$grid-unit-20});
-	}
+.block-editor-block-switcher__popover-preview-container {
+	left: 0;
+	position: absolute;
+	top: -$border-width;
+	width: 100%;
+	bottom: 0;
+	pointer-events: none;
 }
 
-.block-editor-block-switcher__preview__popover {
-	display: none;
+.block-editor-block-switcher__popover-preview {
 	overflow: hidden;
 
-	// Position correctly. Needs specificity.
-	&.components-popover {
-		margin-top: $grid-unit-15 - $border-width;
-	}
-
-	@include break-medium() {
-		display: block;
-	}
-
 	.components-popover__content {
 		width: 300px;
 		border: $border-width solid $gray-900;
 		background: $white;
-		border-radius: $radius-block-ui;
+		border-radius: $radius-medium;
 		outline: none;
 		box-shadow: none;
 		overflow: auto;
@@ -175,7 +137,7 @@
 
 		.block-editor-block-switcher__preview-patterns-container-list__item {
 			height: 100%;
-			border-radius: $radius-block-ui;
+			border-radius: $radius-small;
 			transition: all 0.05s ease-in-out;
 			position: relative;
 			border: $border-width solid transparent;
@@ -201,3 +163,14 @@
 		}
 	}
 }
+
+.block-editor-block-switcher__no-transforms {
+	color: $gray-700;
+	padding: 6px $grid-unit;
+	margin: 0;
+}
+
+.block-editor-block-switcher__binding-indicator {
+	display: block;
+	padding: $grid-unit;
+}
diff --git a/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap
deleted file mode 100644
index 220815d1a6afd5..00000000000000
--- a/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap
+++ /dev/null
@@ -1,116 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BlockSwitcherDropdownMenu should render disabled block switcher with multi block of different types when no transforms 1`] = `
-<div>
-  <div
-    class="components-toolbar"
-  >
-    <div>
-      <button
-        aria-label="Block Name"
-        class="components-button components-toolbar__control block-editor-block-switcher__no-switcher-icon has-icon"
-        data-toolbar-item="true"
-        disabled=""
-        type="button"
-      >
-        <span
-          class="block-editor-block-icon has-colors"
-        >
-          <svg
-            aria-hidden="true"
-            focusable="false"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              clip-rule="evenodd"
-              d="M5 4.5h11a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5H5a.5.5 0 0 1-.5-.5V5a.5.5 0 0 1 .5-.5ZM3 5a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5Zm17 3v10.75c0 .69-.56 1.25-1.25 1.25H6v1.5h12.75a2.75 2.75 0 0 0 2.75-2.75V8H20Z"
-              fill-rule="evenodd"
-            />
-          </svg>
-        </span>
-      </button>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`BlockSwitcherDropdownMenu should render enabled block switcher with multi block when transforms exist 1`] = `
-<div>
-  <div
-    class="components-toolbar"
-  >
-    <div
-      class="components-dropdown components-dropdown-menu block-editor-block-switcher"
-      tabindex="-1"
-    >
-      <button
-        aria-describedby="components-button__description-2"
-        aria-expanded="false"
-        aria-haspopup="true"
-        aria-label="Multiple blocks selected"
-        class="components-button components-dropdown-menu__toggle has-icon"
-        data-toolbar-item="true"
-        type="button"
-      >
-        <span
-          class="block-editor-block-icon block-editor-block-switcher__toggle has-colors"
-        />
-      </button>
-      <div
-        class="components-visually-hidden emotion-0 emotion-1"
-        data-wp-c16t="true"
-        data-wp-component="VisuallyHidden"
-        style="border: 0px; clip: rect(1px, 1px, 1px, 1px); clip-path: inset( 50% ); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; word-wrap: normal;"
-      >
-        <span
-          id="components-button__description-2"
-        >
-          Change type of 2 blocks
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`BlockSwitcherDropdownMenu should render switcher with blocks 1`] = `
-<div>
-  <div
-    class="components-toolbar"
-  >
-    <div
-      class="components-dropdown components-dropdown-menu block-editor-block-switcher"
-      tabindex="-1"
-    >
-      <button
-        aria-describedby="components-button__description-0"
-        aria-expanded="false"
-        aria-haspopup="true"
-        aria-label="Block Name"
-        class="components-button components-dropdown-menu__toggle has-icon"
-        data-toolbar-item="true"
-        type="button"
-      >
-        <span
-          class="block-editor-block-icon block-editor-block-switcher__toggle has-colors"
-        />
-      </button>
-      <div
-        class="components-visually-hidden emotion-0 emotion-1"
-        data-wp-c16t="true"
-        data-wp-component="VisuallyHidden"
-        style="border: 0px; clip: rect(1px, 1px, 1px, 1px); clip-path: inset( 50% ); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; word-wrap: normal;"
-      >
-        <span
-          id="components-button__description-0"
-        >
-          Change block type or style
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/packages/block-editor/src/components/block-switcher/test/index.js b/packages/block-editor/src/components/block-switcher/test/index.js
index 8882a5369ca014..bc1b7d1a4a3640 100644
--- a/packages/block-editor/src/components/block-switcher/test/index.js
+++ b/packages/block-editor/src/components/block-switcher/test/index.js
@@ -14,7 +14,7 @@ import { copy } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { BlockSwitcher, BlockSwitcherDropdownMenu } from '../';
+import { BlockSwitcher } from '../';
 
 jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
 jest.mock( '../../block-title/use-block-display-title', () =>
@@ -22,23 +22,6 @@ jest.mock( '../../block-title/use-block-display-title', () =>
 );
 
 describe( 'BlockSwitcher', () => {
-	test( 'should not render block switcher without blocks', () => {
-		useSelect.mockImplementation( () => ( {} ) );
-		const { container } = render( <BlockSwitcher /> );
-		expect( container ).toBeEmptyDOMElement();
-	} );
-
-	test( 'should not render block switcher with null blocks', () => {
-		useSelect.mockImplementation( () => ( { blocks: [ null ] } ) );
-		const { container } = render(
-			<BlockSwitcher
-				clientIds={ [ 'a1303fd6-3e60-4fff-a770-0e0ea656c5b9' ] }
-			/>
-		);
-		expect( container ).toBeEmptyDOMElement();
-	} );
-} );
-describe( 'BlockSwitcherDropdownMenu', () => {
 	const headingBlock1 = {
 		attributes: {
 			content: [ 'How are you?' ],
@@ -49,66 +32,46 @@ describe( 'BlockSwitcherDropdownMenu', () => {
 		originalContent: '<h2>How are you?</h2>',
 		clientId: 'a1303fd6-3e60-4fff-a770-0e0ea656c5b9',
 	};
-
-	const textBlock = {
-		attributes: {
-			content: [ 'I am great!' ],
+	const headingBlockType = {
+		category: 'text',
+		title: 'Heading',
+		edit: () => {},
+		save: () => {},
+		transforms: {
+			to: [
+				{
+					type: 'block',
+					blocks: [ 'core/paragraph' ],
+					transform: () => {},
+				},
+				{
+					type: 'block',
+					blocks: [ 'core/paragraph' ],
+					transform: () => {},
+					isMultiBlock: true,
+				},
+			],
 		},
-		isValid: true,
-		name: 'core/paragraph',
-		originalContent: '<p>I am great!</p>',
-		clientId: 'b1303fdb-3e60-43faf-a770-2e1ea656c5b8',
 	};
-
-	const headingBlock2 = {
-		attributes: {
-			content: [ 'I am the greatest!' ],
-			level: 3,
+	const paragraphBlockType = {
+		category: 'text',
+		title: 'Paragraph',
+		edit: () => {},
+		save: () => {},
+		transforms: {
+			to: [
+				{
+					type: 'block',
+					blocks: [ 'core/heading' ],
+					transform: () => {},
+				},
+			],
 		},
-		isValid: true,
-		name: 'core/heading',
-		originalContent: '<h3>I am the greatest!</h3>',
-		clientId: 'c2403fd2-4e63-5ffa-b71c-1e0ea656c5b0',
 	};
 
 	beforeAll( () => {
-		registerBlockType( 'core/heading', {
-			category: 'text',
-			title: 'Heading',
-			edit: () => {},
-			save: () => {},
-			transforms: {
-				to: [
-					{
-						type: 'block',
-						blocks: [ 'core/paragraph' ],
-						transform: () => {},
-					},
-					{
-						type: 'block',
-						blocks: [ 'core/paragraph' ],
-						transform: () => {},
-						isMultiBlock: true,
-					},
-				],
-			},
-		} );
-
-		registerBlockType( 'core/paragraph', {
-			category: 'text',
-			title: 'Paragraph',
-			edit: () => {},
-			save: () => {},
-			transforms: {
-				to: [
-					{
-						type: 'block',
-						blocks: [ 'core/heading' ],
-						transform: () => {},
-					},
-				],
-			},
-		} );
+		registerBlockType( 'core/heading', headingBlockType );
+		registerBlockType( 'core/paragraph', paragraphBlockType );
 	} );
 
 	afterAll( () => {
@@ -116,184 +79,104 @@ describe( 'BlockSwitcherDropdownMenu', () => {
 		unregisterBlockType( 'core/paragraph' );
 	} );
 
-	test( 'should render switcher with blocks', () => {
+	test( 'should render switcher with block transforms', async () => {
 		useSelect.mockImplementation( () => ( {
 			possibleBlockTransformations: [
-				{ name: 'core/heading', frecency: 1 },
-				{ name: 'core/paragraph', frecency: 1 },
+				{
+					name: 'core/heading',
+					title: headingBlockType.title,
+					frecency: 1,
+				},
+				{
+					name: 'core/paragraph',
+					title: paragraphBlockType.title,
+					frecency: 1,
+				},
 			],
+			blocks: [ headingBlock1 ],
 			canRemove: true,
 		} ) );
-		const { container } = render(
-			<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
+		const user = userEvent.setup();
+		render( <BlockSwitcher clientIds={ [ headingBlock1.clientId ] } /> );
+		expect(
+			screen.getByRole( 'button', {
+				name: 'Block Name',
+				expanded: false,
+			} )
+		).toBeVisible();
+		expect(
+			screen.queryByRole( 'menu', {
+				name: 'Block Name',
+			} )
+		).not.toBeInTheDocument();
+		await user.type(
+			screen.getByRole( 'button', {
+				name: 'Block Name',
+				expanded: false,
+			} ),
+			'[ArrowDown]'
 		);
-		expect( container ).toMatchSnapshot();
+		await waitFor( () =>
+			expect(
+				screen.getByRole( 'button', {
+					name: 'Block Name',
+					expanded: true,
+				} )
+			).toBeVisible()
+		);
+		const dropdown = screen.getByRole( 'menu', {
+			name: 'Block Name',
+		} );
+		await waitFor( () => expect( dropdown ).toBeVisible() );
+		const items = within( dropdown ).getAllByRole( 'menuitem' );
+		expect( items ).toHaveLength( 2 );
+		expect( items[ 0 ] ).toHaveTextContent( paragraphBlockType.title );
+		expect( items[ 1 ] ).toHaveTextContent( headingBlockType.title );
 	} );
 
-	test( 'should render disabled block switcher with multi block of different types when no transforms', () => {
+	test( 'should render accessibly disabled block switcher when we have a single selected block without styles and we cannot remove it', () => {
 		useSelect.mockImplementation( () => ( {
-			possibleBlockTransformations: [],
+			blocks: [ headingBlock1 ],
 			icon: copy,
+			hasBlockStyles: false,
+			canRemove: false,
 		} ) );
-		const { container } = render(
-			<BlockSwitcherDropdownMenu
-				blocks={ [ headingBlock1, textBlock ] }
-			/>
-		);
-		expect( container ).toMatchSnapshot();
+		render( <BlockSwitcher clientIds={ [ headingBlock1.clientId ] } /> );
+		const blockSwitcher = screen.getByRole( 'button', {
+			name: 'Block Name',
+		} );
+		expect( blockSwitcher ).toBeEnabled();
+		expect( blockSwitcher ).toHaveAttribute( 'aria-disabled', 'true' );
 	} );
 
-	test( 'should render enabled block switcher with multi block when transforms exist', () => {
+	test( 'should render message for no available transforms', async () => {
 		useSelect.mockImplementation( () => ( {
-			possibleBlockTransformations: [
-				{ name: 'core/heading', frecency: 1 },
-				{ name: 'core/paragraph', frecency: 1 },
-			],
+			possibleBlockTransformations: [],
+			blocks: [ headingBlock1 ],
+			icon: copy,
 			canRemove: true,
 		} ) );
-		const { container } = render(
-			<BlockSwitcherDropdownMenu
-				blocks={ [ headingBlock1, headingBlock2 ] }
-			/>
+		render( <BlockSwitcher clientIds={ [ headingBlock1.clientId ] } /> );
+		const user = userEvent.setup();
+		await user.type(
+			screen.getByRole( 'button', {
+				name: 'Block Name',
+				expanded: false,
+			} ),
+			'[ArrowDown]'
 		);
-		expect( container ).toMatchSnapshot();
-	} );
-
-	describe( 'Dropdown', () => {
-		beforeAll( () => {
-			useSelect.mockImplementation( () => ( {
-				possibleBlockTransformations: [
-					{ name: 'core/paragraph', frecency: 3 },
-				],
-				canRemove: true,
-			} ) );
-		} );
-
-		test( 'should dropdown exist', () => {
-			render(
-				<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
-			);
-
-			expect(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} )
-			).toBeVisible();
-		} );
-
-		test( 'should simulate a keydown event, which should open transform toggle.', async () => {
-			const user = userEvent.setup();
-
-			render(
-				<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
-			);
-
-			expect(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} )
-			).toBeVisible();
-			expect(
-				screen.queryByRole( 'menu', {
-					name: 'Block Name',
-				} )
-			).not.toBeInTheDocument();
-
-			await user.type(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} ),
-				'[ArrowDown]'
-			);
-
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'button', {
-						name: 'Block Name',
-						expanded: true,
-					} )
-				).toBeVisible()
-			);
-
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'menu', {
-						name: 'Block Name',
-					} )
-				).toBeVisible()
-			);
-		} );
-
-		test( 'should simulate a click event, which should call onToggle.', async () => {
-			const user = userEvent.setup();
-
-			render(
-				<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
-			);
-
+		await waitFor( () =>
 			expect(
 				screen.getByRole( 'button', {
 					name: 'Block Name',
-					expanded: false,
+					expanded: true,
 				} )
-			).toBeVisible();
-			expect(
-				screen.queryByRole( 'menu', {
-					name: 'Block Name',
-				} )
-			).not.toBeInTheDocument();
-
-			await user.click(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} )
-			);
-
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'button', {
-						name: 'Block Name',
-						expanded: true,
-					} )
-				).toBeVisible()
-			);
-
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'menu', {
-						name: 'Block Name',
-					} )
-				).toBeVisible()
-			);
-		} );
-
-		test( 'should create the transform items for the chosen block.', async () => {
-			const user = userEvent.setup();
-
-			render(
-				<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
-			);
-
-			await user.click(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} )
-			);
-
-			await waitFor( () =>
-				expect(
-					within(
-						screen.getByRole( 'menu', {
-							name: 'Block Name',
-						} )
-					).getByRole( 'menuitem' )
-				).toBeInTheDocument()
-			);
-		} );
+			).toBeVisible()
+		);
+		expect(
+			screen.getByRole( 'menu', {
+				name: 'Block Name',
+			} )
+		).toHaveTextContent( 'No transforms.' );
 	} );
 } );
diff --git a/packages/block-editor/src/components/block-switcher/test/use-transformed.patterns.js b/packages/block-editor/src/components/block-switcher/test/use-transformed.patterns.js
index 05ce545667d464..4d63c763174791 100644
--- a/packages/block-editor/src/components/block-switcher/test/use-transformed.patterns.js
+++ b/packages/block-editor/src/components/block-switcher/test/use-transformed.patterns.js
@@ -20,15 +20,15 @@ describe( 'use-transformed-patterns', () => {
 				},
 				content: {
 					type: 'boolean',
-					__experimentalRole: 'content',
+					role: 'content',
 				},
 				level: {
 					type: 'number',
-					__experimentalRole: 'content',
+					role: 'content',
 				},
 				color: {
 					type: 'string',
-					__experimentalRole: 'other',
+					role: 'other',
 				},
 			},
 			save() {},
diff --git a/packages/block-editor/src/components/block-switcher/test/utils.js b/packages/block-editor/src/components/block-switcher/test/utils.js
index 38009601e16468..eafe5e8a4d9378 100644
--- a/packages/block-editor/src/components/block-switcher/test/utils.js
+++ b/packages/block-editor/src/components/block-switcher/test/utils.js
@@ -18,15 +18,15 @@ describe( 'BlockSwitcher - utils', () => {
 					},
 					content: {
 						type: 'boolean',
-						__experimentalRole: 'content',
+						role: 'content',
 					},
 					level: {
 						type: 'number',
-						__experimentalRole: 'content',
+						role: 'content',
 					},
 					color: {
 						type: 'string',
-						__experimentalRole: 'other',
+						role: 'other',
 					},
 				},
 				save() {},
diff --git a/packages/block-editor/src/components/block-switcher/use-transformed-patterns.js b/packages/block-editor/src/components/block-switcher/use-transformed-patterns.js
index ba340f62d5e835..86055d5425255b 100644
--- a/packages/block-editor/src/components/block-switcher/use-transformed-patterns.js
+++ b/packages/block-editor/src/components/block-switcher/use-transformed-patterns.js
@@ -62,7 +62,9 @@ export const getPatternTransformedBlocks = (
 				selectedBlock.name,
 				consumedBlocks
 			);
-			if ( ! match ) continue;
+			if ( ! match ) {
+				continue;
+			}
 			isMatch = true;
 			consumedBlocks.add( match.clientId );
 			// We update (mutate) the matching pattern block.
@@ -71,7 +73,9 @@ export const getPatternTransformedBlocks = (
 			break;
 		}
 		// Bail eary if a selected block has not been matched.
-		if ( ! isMatch ) return;
+		if ( ! isMatch ) {
+			return;
+		}
 	}
 	return _patternBlocks;
 };
diff --git a/packages/block-editor/src/components/block-switcher/utils.js b/packages/block-editor/src/components/block-switcher/utils.js
index d74f9199aff6ef..49257a2126cbe5 100644
--- a/packages/block-editor/src/components/block-switcher/utils.js
+++ b/packages/block-editor/src/components/block-switcher/utils.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { __experimentalGetBlockAttributesNamesByRole as getBlockAttributesNamesByRole } from '@wordpress/blocks';
+import { getBlockAttributesNamesByRole } from '@wordpress/blocks';
 
 /**
  * Try to find a matching block by a block's name in a provided
@@ -22,8 +22,12 @@ export const getMatchingBlockByName = (
 ) => {
 	const { clientId, name, innerBlocks = [] } = block;
 	// Check if block has been consumed already.
-	if ( consumedBlocks.has( clientId ) ) return;
-	if ( name === selectedBlockName ) return block;
+	if ( consumedBlocks.has( clientId ) ) {
+		return;
+	}
+	if ( name === selectedBlockName ) {
+		return block;
+	}
 	// Try to find a matching block from InnerBlocks recursively.
 	for ( const innerBlock of innerBlocks ) {
 		const match = getMatchingBlockByName(
@@ -31,7 +35,9 @@ export const getMatchingBlockByName = (
 			selectedBlockName,
 			consumedBlocks
 		);
-		if ( match ) return match;
+		if ( match ) {
+			return match;
+		}
 	}
 };
 
@@ -47,11 +53,14 @@ export const getMatchingBlockByName = (
  */
 export const getRetainedBlockAttributes = ( name, attributes ) => {
 	const contentAttributes = getBlockAttributesNamesByRole( name, 'content' );
-	if ( ! contentAttributes?.length ) return attributes;
+	if ( ! contentAttributes?.length ) {
+		return attributes;
+	}
 
 	return contentAttributes.reduce( ( _accumulator, attribute ) => {
-		if ( attributes[ attribute ] )
+		if ( attributes[ attribute ] ) {
 			_accumulator[ attribute ] = attributes[ attribute ];
+		}
 		return _accumulator;
 	}, {} );
 };
diff --git a/packages/block-editor/src/components/block-title/test/index.js b/packages/block-editor/src/components/block-title/test/index.js
index 7031b0b197bf41..8a4d3c2f52fd7e 100644
--- a/packages/block-editor/src/components/block-title/test/index.js
+++ b/packages/block-editor/src/components/block-title/test/index.js
@@ -13,65 +13,40 @@ import { useSelect } from '@wordpress/data';
  */
 import BlockTitle from '../';
 
+const blockTypeMap = {
+	'name-not-exists': null,
+	'name-exists': { title: 'Block Title' },
+	'name-with-label': { title: 'Block With Label' },
+	'name-with-custom-label': { title: 'Block With Custom Label' },
+	'name-with-long-label': { title: 'Block With Long Label' },
+	'reusable-block': { title: 'Reusable Block' },
+};
+
+const blockLabelMap = {
+	'Block With Label': 'Test Label',
+	'Block With Long Label':
+		'This is a longer label than typical for blocks to have.',
+	'Block With Custom Label': 'A Custom Label like a Block Variation Label',
+	'Reusable Block': 'Reuse me!',
+};
+
 jest.mock( '@wordpress/blocks', () => {
 	return {
-		getBlockType( name ) {
-			switch ( name ) {
-				case 'name-not-exists':
-					return null;
-
-				case 'name-exists':
-					return { title: 'Block Title' };
-
-				case 'name-with-label':
-					return { title: 'Block With Label' };
-
-				case 'name-with-custom-label':
-					return { title: 'Block With Custom Label' };
-
-				case 'name-with-long-label':
-					return { title: 'Block With Long Label' };
-			}
+		isReusableBlock( { title } ) {
+			return title === 'Reusable Block';
 		},
 		__experimentalGetBlockLabel( { title } ) {
-			switch ( title ) {
-				case 'Block With Label':
-					return 'Test Label';
-
-				case 'Block With Long Label':
-					return 'This is a longer label than typical for blocks to have.';
-
-				case 'Block With Custom Label':
-					return 'A Custom Label like a Block Variation Label';
-
-				default:
-					return title;
-			}
+			return blockLabelMap[ title ] || title;
 		},
 	};
 } );
 
-jest.mock( '../../use-block-display-information', () => {
-	const resultsMap = {
-		'id-name-exists': { title: 'Block Title' },
-		'id-name-with-label': { title: 'Block With Label' },
-		'id-name-with-long-label': { title: 'Block With Long Label' },
-	};
-	return jest.fn( ( clientId ) => resultsMap[ clientId ] );
-} );
-
-jest.mock( '@wordpress/data/src/components/use-select', () => {
-	// This allows us to tweak the returned value on each test.
-	const mock = jest.fn();
-	return mock;
-} );
+// This allows us to tweak the returned value on each test.
+jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
 
 describe( 'BlockTitle', () => {
 	it( 'renders nothing if name is falsey', () => {
-		useSelect.mockImplementation( () => ( {
-			name: null,
-			attributes: null,
-		} ) );
+		useSelect.mockImplementation( () => null );
 
 		const { container } = render( <BlockTitle /> );
 
@@ -79,10 +54,12 @@ describe( 'BlockTitle', () => {
 	} );
 
 	it( 'renders nothing if block type does not exist', () => {
-		useSelect.mockImplementation( () => ( {
-			name: 'name-not-exists',
-			attributes: null,
-		} ) );
+		useSelect.mockImplementation( ( mapSelect ) =>
+			mapSelect( () => ( {
+				getBlockName: () => 'name-not-exists',
+				getBlockType: () => null,
+			} ) )
+		);
 
 		const { container } = render(
 			<BlockTitle clientId="afd1cb17-2c08-4e7a-91be-007ba7ddc3a1" />
@@ -92,10 +69,14 @@ describe( 'BlockTitle', () => {
 	} );
 
 	it( 'renders title if block type exists', () => {
-		useSelect.mockImplementation( () => ( {
-			name: 'name-exists',
-			attributes: null,
-		} ) );
+		useSelect.mockImplementation( ( mapSelect ) =>
+			mapSelect( () => ( {
+				getBlockName: () => 'name-exists',
+				getBlockType: ( name ) => blockTypeMap[ name ],
+				getBlockAttributes: () => null,
+				getActiveBlockVariation: () => null,
+			} ) )
+		);
 
 		render( <BlockTitle clientId="id-name-exists" /> );
 
@@ -103,10 +84,13 @@ describe( 'BlockTitle', () => {
 	} );
 
 	it( 'renders label if it is set', () => {
-		useSelect.mockImplementation( () => ( {
-			name: 'name-with-label',
-			attributes: null,
-		} ) );
+		useSelect.mockImplementation( ( mapSelect ) =>
+			mapSelect( () => ( {
+				getBlockName: () => 'name-with-label',
+				getBlockType: ( name ) => blockTypeMap[ name ],
+				getBlockAttributes: () => null,
+			} ) )
+		);
 
 		render( <BlockTitle clientId="id-name-with-label" /> );
 
@@ -114,23 +98,28 @@ describe( 'BlockTitle', () => {
 	} );
 
 	it( 'should prioritize reusable block title over title', () => {
-		useSelect.mockImplementation( () => ( {
-			name: 'name-with-label',
-			reusableBlockTitle: 'Reuse me!',
-			attributes: null,
-		} ) );
+		useSelect.mockImplementation( ( mapSelect ) =>
+			mapSelect( () => ( {
+				getBlockName: () => 'reusable-block',
+				getBlockType: ( name ) => blockTypeMap[ name ],
+				getBlockAttributes: () => ( { ref: 1 } ),
+			} ) )
+		);
 
-		render( <BlockTitle clientId="id-name-with-label" /> );
+		render( <BlockTitle clientId="id-reusable-block" /> );
 
 		expect( screen.queryByText( 'Test Label' ) ).not.toBeInTheDocument();
 		expect( screen.getByText( 'Reuse me!' ) ).toBeVisible();
 	} );
 
 	it( 'should prioritize block label over title', () => {
-		useSelect.mockImplementation( () => ( {
-			name: 'name-with-custom-label',
-			attributes: null,
-		} ) );
+		useSelect.mockImplementation( ( mapSelect ) =>
+			mapSelect( () => ( {
+				getBlockName: () => 'name-with-custom-label',
+				getBlockType: ( name ) => blockTypeMap[ name ],
+				getBlockAttributes: () => null,
+			} ) )
+		);
 
 		render( <BlockTitle clientId="id-name-with-label" /> );
 
@@ -140,22 +129,31 @@ describe( 'BlockTitle', () => {
 		).toBeVisible();
 	} );
 
-	it( 'should default to block information title if no reusable title or block name is available', () => {
-		useSelect.mockImplementation( () => ( {
-			name: 'some-rando-name',
-			attributes: null,
-		} ) );
+	it( 'should default to block variation title if no reusable title or block name is available', () => {
+		useSelect.mockImplementation( ( mapSelect ) =>
+			mapSelect( () => ( {
+				getBlockName: () => 'name-exists',
+				getBlockType: ( name ) => blockTypeMap[ name ],
+				getBlockAttributes: () => null,
+				getActiveBlockVariation: () => ( {
+					title: 'Block Variation Label',
+				} ),
+			} ) )
+		);
 
-		render( <BlockTitle clientId="id-name-with-label" /> );
+		render( <BlockTitle clientId="id-name-exists" /> );
 
-		expect( screen.getByText( 'Block With Label' ) ).toBeVisible();
+		expect( screen.getByText( 'Block Variation Label' ) ).toBeVisible();
 	} );
 
 	it( 'truncates the label with custom truncate length', () => {
-		useSelect.mockImplementation( () => ( {
-			name: 'name-with-long-label',
-			attributes: null,
-		} ) );
+		useSelect.mockImplementation( ( mapSelect ) =>
+			mapSelect( () => ( {
+				getBlockName: () => 'name-with-long-label',
+				getBlockType: ( name ) => blockTypeMap[ name ],
+				getBlockAttributes: () => null,
+			} ) )
+		);
 
 		render(
 			<BlockTitle
@@ -168,10 +166,13 @@ describe( 'BlockTitle', () => {
 	} );
 
 	it( 'should not truncate the label if maximum length is undefined', () => {
-		useSelect.mockImplementation( () => ( {
-			name: 'name-with-long-label',
-			attributes: null,
-		} ) );
+		useSelect.mockImplementation( ( mapSelect ) =>
+			mapSelect( () => ( {
+				getBlockName: () => 'name-with-long-label',
+				getBlockType: ( name ) => blockTypeMap[ name ],
+				getBlockAttributes: () => null,
+			} ) )
+		);
 
 		render( <BlockTitle clientId="id-name-with-long-label" /> );
 
diff --git a/packages/block-editor/src/components/block-title/use-block-display-title.js b/packages/block-editor/src/components/block-title/use-block-display-title.js
index be1e26319d671c..a51b336554a2a7 100644
--- a/packages/block-editor/src/components/block-title/use-block-display-title.js
+++ b/packages/block-editor/src/components/block-title/use-block-display-title.js
@@ -3,15 +3,13 @@
  */
 import { useSelect } from '@wordpress/data';
 import {
-	getBlockType,
 	__experimentalGetBlockLabel as getBlockLabel,
-	isReusableBlock,
+	store as blocksStore,
 } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
-import useBlockDisplayInformation from '../use-block-display-information';
 import { store as blockEditorStore } from '../../store';
 
 /**
@@ -35,49 +33,40 @@ export default function useBlockDisplayTitle( {
 	maximumLength,
 	context,
 } ) {
-	const { attributes, name, reusableBlockTitle } = useSelect(
+	const blockTitle = useSelect(
 		( select ) => {
 			if ( ! clientId ) {
-				return {};
+				return null;
 			}
-			const {
-				getBlockName,
-				getBlockAttributes,
-				__experimentalGetReusableBlockTitle,
-			} = select( blockEditorStore );
+
+			const { getBlockName, getBlockAttributes } =
+				select( blockEditorStore );
+			const { getBlockType, getActiveBlockVariation } =
+				select( blocksStore );
+
 			const blockName = getBlockName( clientId );
-			if ( ! blockName ) {
-				return {};
+			const blockType = getBlockType( blockName );
+			if ( ! blockType ) {
+				return null;
+			}
+
+			const attributes = getBlockAttributes( clientId );
+			const label = getBlockLabel( blockType, attributes, context );
+			// If the label is defined we prioritize it over a possible block variation title match.
+			if ( label !== blockType.title ) {
+				return label;
 			}
-			const isReusable = isReusableBlock( getBlockType( blockName ) );
-			return {
-				attributes: getBlockAttributes( clientId ),
-				name: blockName,
-				reusableBlockTitle:
-					isReusable &&
-					__experimentalGetReusableBlockTitle(
-						getBlockAttributes( clientId ).ref
-					),
-			};
+
+			const match = getActiveBlockVariation( blockName, attributes );
+			// Label will fallback to the title if no label is defined for the current label context.
+			return match?.title || blockType.title;
 		},
-		[ clientId ]
+		[ clientId, context ]
 	);
 
-	const blockInformation = useBlockDisplayInformation( clientId );
-	if ( ! name || ! blockInformation ) {
+	if ( ! blockTitle ) {
 		return null;
 	}
-	const blockType = getBlockType( name );
-	const blockLabel = blockType
-		? getBlockLabel( blockType, attributes, context )
-		: null;
-
-	const label = reusableBlockTitle || blockLabel;
-	// Label will fallback to the title if no label is defined for the current
-	// label context. If the label is defined we prioritize it over a
-	// possible block variation title match.
-	const blockTitle =
-		label && label !== blockType.title ? label : blockInformation.title;
 
 	if (
 		maximumLength &&
diff --git a/packages/block-editor/src/components/block-toolbar/README.md b/packages/block-editor/src/components/block-toolbar/README.md
index be4c8e15abe097..7a8a0543e179e1 100644
--- a/packages/block-editor/src/components/block-toolbar/README.md
+++ b/packages/block-editor/src/components/block-toolbar/README.md
@@ -6,11 +6,6 @@ The `BlockToolbar` component is used to render a toolbar that serves as a wrappe
 
 ![Image block toolbar](https://make.wordpress.org/core/files/2020/09/image-block-toolbar.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-toolbar/block-toolbar-menu.native.js b/packages/block-editor/src/components/block-toolbar/block-toolbar-menu.native.js
index c8d220fedfb35c..c68e4be1c40545 100644
--- a/packages/block-editor/src/components/block-toolbar/block-toolbar-menu.native.js
+++ b/packages/block-editor/src/components/block-toolbar/block-toolbar-menu.native.js
@@ -256,7 +256,7 @@ const BlockActionsMenu = ( {
 				<ToolbarButton
 					title={ __( 'Open Block Actions Menu' ) }
 					icon={ moreHorizontalMobile }
-					disabled={ true }
+					disabled
 				/>
 			</ToolbarGroup>
 		);
@@ -311,7 +311,7 @@ const BlockActionsMenu = ( {
 				destructiveButtonIndex={ options.length }
 				disabledButtonIndices={ disabledButtonIndices }
 				hideCancelButton={ Platform.OS !== 'ios' }
-				leftAlign={ true }
+				leftAlign
 				getAnchor={ getAnchor }
 				// translators: %s: block title e.g: "Paragraph".
 				title={ sprintf( __( '%s block options' ), blockTitle ) }
diff --git a/packages/block-editor/src/components/block-toolbar/change-design.js b/packages/block-editor/src/components/block-toolbar/change-design.js
new file mode 100644
index 00000000000000..ecfeff6cb1ed3e
--- /dev/null
+++ b/packages/block-editor/src/components/block-toolbar/change-design.js
@@ -0,0 +1,133 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	ToolbarButton,
+	ToolbarGroup,
+	Dropdown,
+	__experimentalDropdownContentWrapper as DropdownContentWrapper,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { cloneBlock } from '@wordpress/blocks';
+import { useMemo } from '@wordpress/element';
+import { useAsyncList } from '@wordpress/compose';
+import { useSelect, useDispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import BlockPatternsList from '../block-patterns-list';
+
+const EMPTY_ARRAY = [];
+const MAX_PATTERNS_TO_SHOW = 6;
+const POPOVER_PROPS = {
+	placement: 'bottom-start',
+};
+
+export default function ChangeDesign( { clientId } ) {
+	const { categories, currentPatternName, patterns } = useSelect(
+		( select ) => {
+			const {
+				getBlockAttributes,
+				getBlockRootClientId,
+				__experimentalGetAllowedPatterns,
+			} = select( blockEditorStore );
+			const attributes = getBlockAttributes( clientId );
+			const _categories = attributes?.metadata?.categories || EMPTY_ARRAY;
+			const rootBlock = getBlockRootClientId( clientId );
+
+			// Calling `__experimentalGetAllowedPatterns` is expensive.
+			// Checking if the block can be changed prevents unnecessary selector calls.
+			// See: https://github.com/WordPress/gutenberg/pull/64736.
+			const _patterns =
+				_categories.length > 0
+					? __experimentalGetAllowedPatterns( rootBlock )
+					: EMPTY_ARRAY;
+			return {
+				categories: _categories,
+				currentPatternName: attributes?.metadata?.patternName,
+				patterns: _patterns,
+			};
+		},
+		[ clientId ]
+	);
+	const { replaceBlocks } = useDispatch( blockEditorStore );
+	const sameCategoryPatternsWithSingleWrapper = useMemo( () => {
+		if ( categories.length === 0 || ! patterns || patterns.length === 0 ) {
+			return EMPTY_ARRAY;
+		}
+		return patterns
+			.filter( ( pattern ) => {
+				const isCorePattern =
+					pattern.source === 'core' ||
+					( pattern.source?.startsWith( 'pattern-directory' ) &&
+						pattern.source !== 'pattern-directory/theme' );
+				return (
+					// Check if the pattern has only one top level block,
+					// otherwise we may switch to a pattern that doesn't have replacement suggestions.
+					pattern.blocks.length === 1 &&
+					// We exclude the core patterns and pattern directory patterns that are not theme patterns.
+					! isCorePattern &&
+					// Exclude current pattern.
+					currentPatternName !== pattern.name &&
+					pattern.categories?.some( ( category ) => {
+						return categories.includes( category );
+					} ) &&
+					// Check if the pattern is not a synced pattern.
+					( pattern.syncStatus === 'unsynced' || ! pattern.id )
+				);
+			} )
+			.slice( 0, MAX_PATTERNS_TO_SHOW );
+	}, [ categories, currentPatternName, patterns ] );
+
+	const currentShownPatterns = useAsyncList(
+		sameCategoryPatternsWithSingleWrapper
+	);
+
+	if ( sameCategoryPatternsWithSingleWrapper.length < 2 ) {
+		return null;
+	}
+
+	const onClickPattern = ( pattern ) => {
+		const newBlocks = ( pattern.blocks ?? [] ).map( ( block ) => {
+			return cloneBlock( block );
+		} );
+		newBlocks[ 0 ].attributes.metadata = {
+			...newBlocks[ 0 ].attributes.metadata,
+			categories,
+		};
+		replaceBlocks( clientId, newBlocks );
+	};
+
+	return (
+		<Dropdown
+			popoverProps={ POPOVER_PROPS }
+			renderToggle={ ( { onToggle, isOpen } ) => {
+				return (
+					<ToolbarGroup>
+						<ToolbarButton
+							onClick={ () => onToggle( ! isOpen ) }
+							aria-expanded={ isOpen }
+						>
+							{ __( 'Change design' ) }
+						</ToolbarButton>
+					</ToolbarGroup>
+				);
+			} }
+			renderContent={ () => (
+				<DropdownContentWrapper
+					className="block-editor-block-toolbar-change-design-content-wrapper"
+					paddingSize="none"
+				>
+					<BlockPatternsList
+						shownPatterns={ currentShownPatterns }
+						blockPatterns={ sameCategoryPatternsWithSingleWrapper }
+						onClickPattern={ onClickPattern }
+						showTitle={ false }
+					/>
+				</DropdownContentWrapper>
+			) }
+		/>
+	);
+}
diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
index 963cd8a475328a..b3bf7e94accb08 100644
--- a/packages/block-editor/src/components/block-toolbar/index.js
+++ b/packages/block-editor/src/components/block-toolbar/index.js
@@ -1,11 +1,12 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
+import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { useRef } from '@wordpress/element';
 import { useViewportMatch } from '@wordpress/compose';
@@ -32,38 +33,116 @@ import BlockEditVisuallyButton from '../block-edit-visually-button';
 import { useShowHoveredOrFocusedGestures } from './utils';
 import { store as blockEditorStore } from '../../store';
 import __unstableBlockNameContext from './block-name-context';
+import NavigableToolbar from '../navigable-toolbar';
+import { useHasBlockToolbar } from './use-has-block-toolbar';
+import ChangeDesign from './change-design';
+import { unlock } from '../../lock-unlock';
 
-const BlockToolbar = ( { hideDragHandle } ) => {
-	const { blockClientIds, blockType, isValid, isVisual, blockEditingMode } =
-		useSelect( ( select ) => {
-			const {
-				getBlockName,
-				getBlockMode,
-				getSelectedBlockClientIds,
-				isBlockValid,
-				getBlockRootClientId,
-				getBlockEditingMode,
-			} = select( blockEditorStore );
-			const selectedBlockClientIds = getSelectedBlockClientIds();
-			const selectedBlockClientId = selectedBlockClientIds[ 0 ];
-			const blockRootClientId = getBlockRootClientId(
-				selectedBlockClientId
-			);
-			return {
-				blockClientIds: selectedBlockClientIds,
-				blockType:
-					selectedBlockClientId &&
-					getBlockType( getBlockName( selectedBlockClientId ) ),
-				rootClientId: blockRootClientId,
-				isValid: selectedBlockClientIds.every( ( id ) =>
-					isBlockValid( id )
-				),
-				isVisual: selectedBlockClientIds.every(
-					( id ) => getBlockMode( id ) === 'visual'
-				),
-				blockEditingMode: getBlockEditingMode( selectedBlockClientId ),
-			};
-		}, [] );
+/**
+ * Renders the block toolbar.
+ *
+ * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/block-toolbar/README.md
+ *
+ * @param {Object}   props                             Components props.
+ * @param {boolean}  props.hideDragHandle              Show or hide the Drag Handle for drag and drop functionality.
+ * @param {boolean}  props.focusOnMount                Focus the toolbar when mounted.
+ * @param {number}   props.__experimentalInitialIndex  The initial index of the toolbar item to focus.
+ * @param {Function} props.__experimentalOnIndexChange Callback function to be called when the index of the focused toolbar item changes.
+ * @param {string}   props.variant                     Style variant of the toolbar, also passed to the Dropdowns rendered from Block Toolbar Buttons.
+ */
+export function PrivateBlockToolbar( {
+	hideDragHandle,
+	focusOnMount,
+	__experimentalInitialIndex,
+	__experimentalOnIndexChange,
+	variant = 'unstyled',
+} ) {
+	const {
+		blockClientId,
+		blockClientIds,
+		isDefaultEditingMode,
+		blockType,
+		toolbarKey,
+		shouldShowVisualToolbar,
+		showParentSelector,
+		isUsingBindings,
+		hasParentPattern,
+		hasContentOnlyLocking,
+		showShuffleButton,
+		showSlots,
+		showGroupButtons,
+		showLockButtons,
+	} = useSelect( ( select ) => {
+		const {
+			getBlockName,
+			getBlockMode,
+			getBlockParents,
+			getSelectedBlockClientIds,
+			isBlockValid,
+			getBlockEditingMode,
+			getBlockAttributes,
+			getBlockParentsByBlockName,
+			getTemplateLock,
+			getParentSectionBlock,
+			isZoomOut,
+		} = unlock( select( blockEditorStore ) );
+		const selectedBlockClientIds = getSelectedBlockClientIds();
+		const selectedBlockClientId = selectedBlockClientIds[ 0 ];
+		const parents = getBlockParents( selectedBlockClientId );
+		const parentSection = getParentSectionBlock( selectedBlockClientId );
+		const parentClientId = parentSection ?? parents[ parents.length - 1 ];
+		const parentBlockName = getBlockName( parentClientId );
+		const parentBlockType = getBlockType( parentBlockName );
+		const editingMode = getBlockEditingMode( selectedBlockClientId );
+		const _isDefaultEditingMode = editingMode === 'default';
+		const _blockName = getBlockName( selectedBlockClientId );
+		const isValid = selectedBlockClientIds.every( ( id ) =>
+			isBlockValid( id )
+		);
+		const isVisual = selectedBlockClientIds.every(
+			( id ) => getBlockMode( id ) === 'visual'
+		);
+		const _isUsingBindings = selectedBlockClientIds.every(
+			( clientId ) =>
+				!! getBlockAttributes( clientId )?.metadata?.bindings
+		);
+
+		const _hasParentPattern = selectedBlockClientIds.every(
+			( clientId ) =>
+				getBlockParentsByBlockName( clientId, 'core/block', true )
+					.length > 0
+		);
+
+		// If one or more selected blocks are locked, do not show the BlockGroupToolbar.
+		const _hasTemplateLock = selectedBlockClientIds.some(
+			( id ) => getTemplateLock( id ) === 'contentOnly'
+		);
+		return {
+			blockClientId: selectedBlockClientId,
+			blockClientIds: selectedBlockClientIds,
+			isDefaultEditingMode: _isDefaultEditingMode,
+			blockType: selectedBlockClientId && getBlockType( _blockName ),
+			shouldShowVisualToolbar: isValid && isVisual,
+			toolbarKey: `${ selectedBlockClientId }${ parentClientId }`,
+			showParentSelector:
+				! isZoomOut() &&
+				parentBlockType &&
+				getBlockEditingMode( parentClientId ) !== 'disabled' &&
+				hasBlockSupport(
+					parentBlockType,
+					'__experimentalParentSelector',
+					true
+				) &&
+				selectedBlockClientIds.length === 1,
+			isUsingBindings: _isUsingBindings,
+			hasParentPattern: _hasParentPattern,
+			hasContentOnlyLocking: _hasTemplateLock,
+			showShuffleButton: isZoomOut(),
+			showSlots: ! isZoomOut(),
+			showGroupButtons: ! isZoomOut(),
+			showLockButtons: ! isZoomOut(),
+		};
+	}, [] );
 
 	const toolbarWrapperRef = useRef( null );
 
@@ -76,86 +155,123 @@ const BlockToolbar = ( { hideDragHandle } ) => {
 
 	const isLargeViewport = ! useViewportMatch( 'medium', '<' );
 
-	if ( blockType ) {
-		if ( ! hasBlockSupport( blockType, '__experimentalToolbar', true ) ) {
-			return null;
-		}
-	}
-
-	if ( blockClientIds.length === 0 ) {
+	const hasBlockToolbar = useHasBlockToolbar();
+	if ( ! hasBlockToolbar ) {
 		return null;
 	}
 
-	const shouldShowVisualToolbar = isValid && isVisual;
 	const isMultiToolbar = blockClientIds.length > 1;
 	const isSynced =
 		isReusableBlock( blockType ) || isTemplatePart( blockType );
 
-	const classes = classnames( 'block-editor-block-toolbar', {
+	// Shifts the toolbar to make room for the parent block selector.
+	const classes = clsx( 'block-editor-block-contextual-toolbar', {
+		'has-parent': showParentSelector,
+	} );
+
+	const innerClasses = clsx( 'block-editor-block-toolbar', {
 		'is-synced': isSynced,
+		'is-connected': isUsingBindings,
 	} );
 
 	return (
-		<div className={ classes } ref={ toolbarWrapperRef }>
-			{ ! isMultiToolbar &&
-				isLargeViewport &&
-				blockEditingMode === 'default' && <BlockParentSelector /> }
-			{ ( shouldShowVisualToolbar || isMultiToolbar ) &&
-				blockEditingMode === 'default' && (
-					<div ref={ nodeRef } { ...showHoveredOrFocusedGestures }>
-						<ToolbarGroup className="block-editor-block-toolbar__block-controls">
-							<BlockSwitcher clientIds={ blockClientIds } />
-							{ ! isMultiToolbar && (
-								<BlockLockToolbar
-									clientId={ blockClientIds[ 0 ] }
-									wrapperRef={ toolbarWrapperRef }
+		<NavigableToolbar
+			focusEditorOnEscape
+			className={ classes }
+			/* translators: accessibility text for the block toolbar */
+			aria-label={ __( 'Block tools' ) }
+			// The variant is applied as "toolbar" when undefined, which is the black border style of the dropdown from the toolbar popover.
+			variant={ variant === 'toolbar' ? undefined : variant }
+			focusOnMount={ focusOnMount }
+			__experimentalInitialIndex={ __experimentalInitialIndex }
+			__experimentalOnIndexChange={ __experimentalOnIndexChange }
+			// Resets the index whenever the active block changes so
+			// this is not persisted. See https://github.com/WordPress/gutenberg/pull/25760#issuecomment-717906169
+			key={ toolbarKey }
+		>
+			<div ref={ toolbarWrapperRef } className={ innerClasses }>
+				{ showParentSelector && ! isMultiToolbar && isLargeViewport && (
+					<BlockParentSelector />
+				) }
+				{ ( shouldShowVisualToolbar || isMultiToolbar ) &&
+					! hasParentPattern && (
+						<div
+							ref={ nodeRef }
+							{ ...showHoveredOrFocusedGestures }
+						>
+							<ToolbarGroup className="block-editor-block-toolbar__block-controls">
+								<BlockSwitcher clientIds={ blockClientIds } />
+								{ ! isMultiToolbar &&
+									isDefaultEditingMode &&
+									showLockButtons && (
+										<BlockLockToolbar
+											clientId={ blockClientId }
+										/>
+									) }
+								<BlockMover
+									clientIds={ blockClientIds }
+									hideDragHandle={ hideDragHandle }
 								/>
-							) }
-							<BlockMover
-								clientIds={ blockClientIds }
-								hideDragHandle={ hideDragHandle }
-							/>
-						</ToolbarGroup>
-					</div>
+							</ToolbarGroup>
+						</div>
+					) }
+				{ ! hasContentOnlyLocking &&
+					shouldShowVisualToolbar &&
+					isMultiToolbar &&
+					showGroupButtons && <BlockGroupToolbar /> }
+				{ showShuffleButton && (
+					<ChangeDesign clientId={ blockClientIds[ 0 ] } />
 				) }
-			{ shouldShowVisualToolbar && isMultiToolbar && (
-				<BlockGroupToolbar />
-			) }
-			{ shouldShowVisualToolbar && (
-				<>
-					<BlockControls.Slot
-						group="parent"
-						className="block-editor-block-toolbar__slot"
-					/>
-					<BlockControls.Slot
-						group="block"
-						className="block-editor-block-toolbar__slot"
-					/>
-					<BlockControls.Slot className="block-editor-block-toolbar__slot" />
-					<BlockControls.Slot
-						group="inline"
-						className="block-editor-block-toolbar__slot"
-					/>
-					<BlockControls.Slot
-						group="other"
-						className="block-editor-block-toolbar__slot"
-					/>
-					<__unstableBlockNameContext.Provider
-						value={ blockType?.name }
-					>
-						<__unstableBlockToolbarLastItem.Slot />
-					</__unstableBlockNameContext.Provider>
-				</>
-			) }
-			<BlockEditVisuallyButton clientIds={ blockClientIds } />
-			{ blockEditingMode === 'default' && (
+				{ shouldShowVisualToolbar && showSlots && (
+					<>
+						<BlockControls.Slot
+							group="parent"
+							className="block-editor-block-toolbar__slot"
+						/>
+						<BlockControls.Slot
+							group="block"
+							className="block-editor-block-toolbar__slot"
+						/>
+						<BlockControls.Slot className="block-editor-block-toolbar__slot" />
+						<BlockControls.Slot
+							group="inline"
+							className="block-editor-block-toolbar__slot"
+						/>
+						<BlockControls.Slot
+							group="other"
+							className="block-editor-block-toolbar__slot"
+						/>
+						<__unstableBlockNameContext.Provider
+							value={ blockType?.name }
+						>
+							<__unstableBlockToolbarLastItem.Slot />
+						</__unstableBlockNameContext.Provider>
+					</>
+				) }
+				<BlockEditVisuallyButton clientIds={ blockClientIds } />
 				<BlockSettingsMenu clientIds={ blockClientIds } />
-			) }
-		</div>
+			</div>
+		</NavigableToolbar>
 	);
-};
+}
 
 /**
+ * Renders the block toolbar.
+ *
  * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/block-toolbar/README.md
+ *
+ * @param {Object}  props                Components props.
+ * @param {boolean} props.hideDragHandle Show or hide the Drag Handle for drag and drop functionality.
+ * @param {string}  props.variant        Style variant of the toolbar, also passed to the Dropdowns rendered from Block Toolbar Buttons.
  */
-export default BlockToolbar;
+export default function BlockToolbar( { hideDragHandle, variant } ) {
+	return (
+		<PrivateBlockToolbar
+			hideDragHandle={ hideDragHandle }
+			variant={ variant }
+			focusOnMount={ undefined }
+			__experimentalInitialIndex={ undefined }
+			__experimentalOnIndexChange={ undefined }
+		/>
+	);
+}
diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss
index 3f8a7057aef84f..26bf71356925e9 100644
--- a/packages/block-editor/src/components/block-toolbar/style.scss
+++ b/packages/block-editor/src/components/block-toolbar/style.scss
@@ -24,8 +24,6 @@
 	.components-toolbar-group,
 	.components-toolbar {
 		background: none;
-		// IE11 has thick paddings without this.
-		line-height: 0;
 
 		// These margins make the buttons themselves overlap the chrome of the toolbar.
 		// This helps make them square, and maximize the hit area.
@@ -39,74 +37,108 @@
 		border-right: $border-width solid $gray-300;
 	}
 
-	&.is-synced .block-editor-block-switcher .components-button .block-editor-block-icon {
-		color: var(--wp-block-synced-color);
+	&.is-connected {
+		.block-editor-block-switcher .components-button::before {
+			background: color-mix(in srgb, var(--wp-block-synced-color) 10%, transparent);
+			border-radius: $radius-small;
+		}
 	}
 
-	&.is-synced .components-toolbar-button.block-editor-block-switcher__no-switcher-icon {
-		&:disabled .block-editor-block-icon.has-colors {
+	&.is-synced,
+	&.is-connected {
+		.block-editor-block-switcher .components-button .block-editor-block-icon {
 			color: var(--wp-block-synced-color);
 		}
+
+		.components-toolbar-button.block-editor-block-switcher__no-switcher-icon {
+			&:disabled .block-editor-block-icon.has-colors {
+				color: var(--wp-block-synced-color);
+			}
+		}
 	}
 
 	> :last-child,
 	> :last-child .components-toolbar-group,
-	> :last-child .components-toolbar {
+	> :last-child .components-toolbar,
+	// If the last toolbar group is empty,
+	// we need to remove the double border from the penultimate one.
+	&:has(> :last-child:empty) > :nth-last-child(2),
+	&:has(> :last-child:empty) > :nth-last-child(2) .components-toolbar-group,
+	&:has(> :last-child:empty) > :nth-last-child(2) .components-toolbar {
 		border-right: none;
 	}
+
+	.components-toolbar-group:empty {
+		display: none;
+	}
 }
 
-.block-editor-block-contextual-toolbar.is-fixed {
+.block-editor-block-contextual-toolbar {
 	position: sticky;
 	top: 0;
 	z-index: z-index(".block-editor-block-popover");
 	display: block;
 	width: 100%;
-}
+	// Block UI appearance.
+	background-color: $white;
+	flex-shrink: 3;
+
+	// Raise the specificity.
+	&.components-accessible-toolbar {
+		border: none;
+		border-radius: 0;
+	}
 
-// on desktop browsers the fixed toolbar has tweaked borders
-@include break-medium() {
-	.block-editor-block-contextual-toolbar.is-fixed {
-		.block-editor-block-toolbar {
-			.components-toolbar-group,
-			.components-toolbar {
-				border-right: none;
-
-				&::after {
-					content: "";
-					width: $border-width;
-					margin-top: $grid-unit + $grid-unit-05;
-					margin-bottom: $grid-unit + $grid-unit-05;
-					background-color: $gray-300;
-					margin-left: $grid-unit;
-				}
-
-				& .components-toolbar-group.components-toolbar-group {
-					&::after {
-						display: none;
-					}
-				}
-			}
+	&.is-unstyled {
+		box-shadow: 0 $border-width 0 0 rgba($color: #000, $alpha: 0.133); // 0.133 = $gray-200 but with alpha.
+	}
+
+	.block-editor-block-toolbar {
+		overflow: auto;
+		overflow-y: hidden;
+		@include custom-scrollbars-on-hover($gray-200, $gray-600);
 
-			> :last-child,
-			> :last-child .components-toolbar-group,
-			> :last-child .components-toolbar {
-				&::after {
-					display: none;
-				}
+		// Prevents padding from being applied to the left and right sides of the element.
+		scrollbar-gutter: auto;
+
+		> :last-child,
+		> :last-child .components-toolbar-group,
+		> :last-child .components-toolbar {
+			&::after {
+				display: none;
 			}
 		}
 	}
-}
 
-.block-editor-block-contextual-toolbar.has-parent:not(.is-fixed) {
-	margin-left: calc(#{$grid-unit-60} + #{$grid-unit-10});
+	& > .block-editor-block-toolbar {
+		flex-grow: initial;
+		width: initial;
+	}
+
+	.block-editor-block-parent-selector {
+		position: relative;
+		// Must use the same negative margins of the .components-toolbar-group
+		// https://github.com/WordPress/gutenberg/blob/73a4716f429b5dce0190638049f5bd30f0b242f6/packages/block-editor/src/components/block-toolbar/style.scss#L32-L33
+		margin-top: -$border-width;
+		margin-bottom: -$border-width;
 
-	.show-icon-labels & {
-		margin-left: 0;
+		// Parent selector dot divider
+		&::after {
+			align-items: center;
+			background-color: $gray-900;
+			border-radius: 100%;
+			content: "";
+			display: inline-flex;
+			height: 2px;
+			position: absolute;
+			right: 0;
+			top: $grid-unit-20 - $border-width;
+			width: 2px;
+		}
 	}
 }
 
+
 // Block controls.
 .block-editor-block-toolbar__block-controls {
 	// Switcher.
@@ -118,7 +150,7 @@
 		}
 	}
 
-	// @todo: override toolbar group inherited paddings from components/block-tools/style.scss.
+	// @todo override toolbar group inherited paddings from components/block-tools/style.scss.
 	// This is best fixed by making the mover control area a proper single toolbar group.
 	.components-toolbar-group {
 		padding: 0;
@@ -136,15 +168,7 @@
 }
 
 .block-editor-block-toolbar__slot {
-	// Required for IE11.
-	display: inline-block;
-	// Fix for toolbar button misalignment on IE11
-	line-height: 0;
-
-	// IE11 doesn't read rules inside this query. They are applied only to modern browsers.
-	@supports (position: sticky) {
-		display: inline-flex;
-	}
+	display: inline-flex;
 }
 
 .show-icon-labels {
@@ -165,7 +189,6 @@
 	}
 
 	// Padding overrides.
-
 	.components-accessible-toolbar .components-toolbar-group > div:first-child:last-child > .components-button.has-icon {
 		padding-left: 6px;
 		padding-right: 6px;
@@ -181,18 +204,43 @@
 	}
 
 	// Parent selector overrides
-
-	.block-editor-block-parent-selector__button {
+	.block-editor-block-parent-selector .block-editor-block-parent-selector__button {
 		border-top-right-radius: 0;
 		border-bottom-right-radius: 0;
+		padding-left: $grid-unit-15;
+		padding-right: $grid-unit-15;
+		text-wrap: nowrap;
 
 		.block-editor-block-icon {
 			width: 0;
 		}
 	}
 
-	.block-editor-block-mover .block-editor-block-mover__move-button-container {
-		width: auto;
+	.block-editor-block-mover {
+		.block-editor-block-mover__move-button-container {
+			width: auto;
+			position: relative;
+		}
+
+		&:not(.is-horizontal) .block-editor-block-mover__move-button-container::before {
+			@include break-small() {
+				content: "";
+				height: $border-width;
+				width: 100%;
+				background: $gray-200;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				// With Top toolbar enabled, this separator has a smaller width. Translating the
+				// X axis allows to make the separator always centered regardless of its width.
+				transform: translate(-50%, 0);
+				margin-top: -$border-width * 0.5;
+			}
+
+			@include break-medium {
+				background: $gray-900;
+			}
+		}
 	}
 
 	.block-editor-block-mover.is-horizontal {
@@ -210,46 +258,17 @@
 
 	// Mover overrides.
 	.block-editor-block-toolbar__block-controls .block-editor-block-mover {
-		border-left: 1px solid $gray-900;
+		border-left: 1px solid $gray-300;
 		margin-left: 6px;
 		margin-right: -6px;
 		white-space: nowrap;
 	}
 
-	.block-editor-block-contextual-toolbar.is-fixed .block-editor-block-toolbar__block-controls .block-editor-block-mover {
-		border-left-color: $gray-200;
-	}
-
 	.block-editor-block-mover .block-editor-block-mover__drag-handle.has-icon {
 		padding-left: $grid-unit-15;
 		padding-right: $grid-unit-15;
 	}
 
-	.block-editor-block-contextual-toolbar.is-fixed .block-editor-block-mover__move-button-container {
-		border-width: 0;
-	}
-
-	@include break-small() {
-		// Specificity override for https://github.com/WordPress/gutenberg/blob/try/block-toolbar-labels/packages/block-editor/src/components/block-mover/style.scss#L69
-		.is-up-button.is-up-button.is-up-button {
-			margin-right: 0;
-			border-radius: 0;
-			order: 1;
-		}
-
-		.block-editor-block-mover__move-button-container {
-			border-left: 1px solid $gray-900;
-		}
-
-		.is-down-button.is-down-button.is-down-button {
-			order: 2;
-		}
-
-		.block-editor-block-contextual-toolbar.is-fixed .block-editor-block-mover__move-button-container::before {
-			background: $gray-300;
-		}
-	}
-
 	.block-editor-block-contextual-toolbar .block-editor-block-mover.is-horizontal .block-editor-block-mover-button.block-editor-block-mover-button {
 		width: auto;
 	}
@@ -260,19 +279,25 @@
 		flex-shrink: 1;
 	}
 
-	@include break-medium() {
-		.block-editor-block-contextual-toolbar.is-fixed {
-			.components-toolbar,
-			.components-toolbar-group {
-				flex-shrink: 0;
-			}
-		}
-	}
-
-
 	.block-editor-rich-text__inline-format-toolbar-group {
 		.components-button + .components-button {
 			margin-left: 6px;
 		}
 	}
 }
+
+.block-editor-block-toolbar-change-design-content-wrapper {
+	padding: $grid-unit-15;
+	width: 320px;
+	.block-editor-block-patterns-list {
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+		grid-gap: $grid-unit-15;
+		.block-editor-block-patterns-list__list-item {
+			margin-bottom: 0;
+		}
+		.block-editor-inserter__media-list__list-item {
+			min-height: 100px;
+		}
+	}
+}
diff --git a/packages/block-editor/src/components/block-toolbar/test/index.native.js b/packages/block-editor/src/components/block-toolbar/test/index.native.js
index 473e1a40bb966a..cac41845b06993 100644
--- a/packages/block-editor/src/components/block-toolbar/test/index.native.js
+++ b/packages/block-editor/src/components/block-toolbar/test/index.native.js
@@ -15,13 +15,7 @@ describe( 'Block Toolbar', () => {
 	it( "doesn't render the block settings button if there aren't any settings for the current selected block", async () => {
 		// Arrange
 		const screen = await initializeEditor();
-		await addBlock( screen, 'Image' );
-
-		// Act
-		fireEvent(
-			screen.getByTestId( 'media-options-picker' ),
-			'backdropPress'
-		);
+		await addBlock( screen, 'Shortcode' );
 
 		// Assert
 		expect( screen.queryByLabelText( 'Open Settings' ) ).toBeNull();
diff --git a/packages/block-editor/src/components/block-toolbar/use-has-block-toolbar.js b/packages/block-editor/src/components/block-toolbar/use-has-block-toolbar.js
new file mode 100644
index 00000000000000..80ce3691147834
--- /dev/null
+++ b/packages/block-editor/src/components/block-toolbar/use-has-block-toolbar.js
@@ -0,0 +1,44 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { getBlockType, hasBlockSupport } from '@wordpress/blocks';
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+
+/**
+ * Returns true if the block toolbar should be shown.
+ *
+ * @return {boolean} Whether the block toolbar component will be rendered.
+ */
+export function useHasBlockToolbar() {
+	const { isToolbarEnabled, isBlockDisabled } = useSelect( ( select ) => {
+		const { getBlockEditingMode, getBlockName, getBlockSelectionStart } =
+			select( blockEditorStore );
+
+		// we only care about the 1st selected block
+		// for the toolbar, so we use getBlockSelectionStart
+		// instead of getSelectedBlockClientIds
+		const selectedBlockClientId = getBlockSelectionStart();
+
+		const blockType =
+			selectedBlockClientId &&
+			getBlockType( getBlockName( selectedBlockClientId ) );
+
+		return {
+			isToolbarEnabled:
+				blockType &&
+				hasBlockSupport( blockType, '__experimentalToolbar', true ),
+			isBlockDisabled:
+				getBlockEditingMode( selectedBlockClientId ) === 'disabled',
+		};
+	}, [] );
+
+	if ( ! isToolbarEnabled || isBlockDisabled ) {
+		return false;
+	}
+
+	return true;
+}
diff --git a/packages/block-editor/src/components/block-tools/back-compat.js b/packages/block-editor/src/components/block-tools/back-compat.js
deleted file mode 100644
index 029419926e9ed5..00000000000000
--- a/packages/block-editor/src/components/block-tools/back-compat.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useContext } from '@wordpress/element';
-import { Disabled } from '@wordpress/components';
-import deprecated from '@wordpress/deprecated';
-
-/**
- * Internal dependencies
- */
-import InsertionPoint, { InsertionPointOpenRef } from './insertion-point';
-import BlockPopover from './selected-block-tools';
-
-export default function BlockToolsBackCompat( { children } ) {
-	const openRef = useContext( InsertionPointOpenRef );
-	const isDisabled = useContext( Disabled.Context );
-
-	// If context is set, `BlockTools` is a parent component.
-	if ( openRef || isDisabled ) {
-		return children;
-	}
-
-	deprecated( 'wp.components.Popover.Slot name="block-toolbar"', {
-		alternative: 'wp.blockEditor.BlockTools',
-		since: '5.8',
-		version: '6.3',
-	} );
-
-	return (
-		<InsertionPoint __unstablePopoverSlot="block-toolbar">
-			<BlockPopover __unstablePopoverSlot="block-toolbar" />
-			{ children }
-		</InsertionPoint>
-	);
-}
diff --git a/packages/block-editor/src/components/block-tools/block-contextual-toolbar.js b/packages/block-editor/src/components/block-tools/block-contextual-toolbar.js
deleted file mode 100644
index b24a25ee60ed42..00000000000000
--- a/packages/block-editor/src/components/block-tools/block-contextual-toolbar.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { hasBlockSupport, store as blocksStore } from '@wordpress/blocks';
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import NavigableToolbar from '../navigable-toolbar';
-import BlockToolbar from '../block-toolbar';
-import { store as blockEditorStore } from '../../store';
-import { useHasAnyBlockControls } from '../block-controls/use-has-block-controls';
-
-export default function BlockContextualToolbar( {
-	focusOnMount,
-	isFixed,
-	...props
-} ) {
-	const {
-		blockType,
-		blockEditingMode,
-		hasParents,
-		showParentSelector,
-		selectedBlockClientId,
-	} = useSelect( ( select ) => {
-		const {
-			getBlockName,
-			getBlockParents,
-			getSelectedBlockClientIds,
-			getBlockEditingMode,
-		} = select( blockEditorStore );
-		const { getBlockType } = select( blocksStore );
-		const selectedBlockClientIds = getSelectedBlockClientIds();
-		const _selectedBlockClientId = selectedBlockClientIds[ 0 ];
-		const parents = getBlockParents( _selectedBlockClientId );
-		const firstParentClientId = parents[ parents.length - 1 ];
-		const parentBlockName = getBlockName( firstParentClientId );
-		const parentBlockType = getBlockType( parentBlockName );
-
-		return {
-			selectedBlockClientId: _selectedBlockClientId,
-			blockType:
-				_selectedBlockClientId &&
-				getBlockType( getBlockName( _selectedBlockClientId ) ),
-			blockEditingMode: getBlockEditingMode( _selectedBlockClientId ),
-			hasParents: parents.length,
-			showParentSelector:
-				parentBlockType &&
-				getBlockEditingMode( firstParentClientId ) === 'default' &&
-				hasBlockSupport(
-					parentBlockType,
-					'__experimentalParentSelector',
-					true
-				) &&
-				selectedBlockClientIds.length <= 1 &&
-				getBlockEditingMode( _selectedBlockClientId ) === 'default',
-		};
-	}, [] );
-
-	const isToolbarEnabled =
-		blockType &&
-		hasBlockSupport( blockType, '__experimentalToolbar', true );
-	const hasAnyBlockControls = useHasAnyBlockControls();
-	if (
-		! isToolbarEnabled ||
-		( blockEditingMode !== 'default' && ! hasAnyBlockControls )
-	) {
-		return null;
-	}
-
-	// Shifts the toolbar to make room for the parent block selector.
-	const classes = classnames( 'block-editor-block-contextual-toolbar', {
-		'has-parent': hasParents && showParentSelector,
-		'is-fixed': isFixed,
-	} );
-
-	return (
-		<NavigableToolbar
-			focusOnMount={ focusOnMount }
-			focusEditorOnEscape
-			className={ classes }
-			/* translators: accessibility text for the block toolbar */
-			aria-label={ __( 'Block tools' ) }
-			variant={ isFixed ? 'unstyled' : undefined }
-			// Resets the index whenever the active block changes so
-			// this is not persisted. See https://github.com/WordPress/gutenberg/pull/25760#issuecomment-717906169
-			key={ selectedBlockClientId }
-			{ ...props }
-		>
-			<BlockToolbar hideDragHandle={ isFixed } />
-		</NavigableToolbar>
-	);
-}
diff --git a/packages/block-editor/src/components/block-tools/block-selection-button.js b/packages/block-editor/src/components/block-tools/block-selection-button.js
deleted file mode 100644
index 29cfdf2170817a..00000000000000
--- a/packages/block-editor/src/components/block-tools/block-selection-button.js
+++ /dev/null
@@ -1,301 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { dragHandle } from '@wordpress/icons';
-import { Button, Flex, FlexItem } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useEffect, useRef } from '@wordpress/element';
-import {
-	BACKSPACE,
-	DELETE,
-	UP,
-	DOWN,
-	LEFT,
-	RIGHT,
-	TAB,
-	ESCAPE,
-	ENTER,
-	SPACE,
-} from '@wordpress/keycodes';
-import {
-	getBlockType,
-	__experimentalGetAccessibleBlockLabel as getAccessibleBlockLabel,
-} from '@wordpress/blocks';
-import { speak } from '@wordpress/a11y';
-import { focus } from '@wordpress/dom';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import BlockTitle from '../block-title';
-import BlockIcon from '../block-icon';
-import { store as blockEditorStore } from '../../store';
-import BlockDraggable from '../block-draggable';
-import useBlockDisplayInformation from '../use-block-display-information';
-import { __unstableUseBlockElement as useBlockElement } from '../block-list/use-block-props/use-block-refs';
-import BlockMover from '../block-mover';
-
-/**
- * Block selection button component, displaying the label of the block. If the block
- * descends from a root block, a button is displayed enabling the user to select
- * the root block.
- *
- * @param {string} props          Component props.
- * @param {string} props.clientId Client ID of block.
- *
- * @return {Component} The component to be rendered.
- */
-function BlockSelectionButton( { clientId, rootClientId } ) {
-	const blockInformation = useBlockDisplayInformation( clientId );
-	const selected = useSelect(
-		( select ) => {
-			const {
-				getBlock,
-				getBlockIndex,
-				hasBlockMovingClientId,
-				getBlockListSettings,
-				__unstableGetEditorMode,
-			} = select( blockEditorStore );
-			const index = getBlockIndex( clientId );
-			const { name, attributes } = getBlock( clientId );
-			const blockMovingMode = hasBlockMovingClientId();
-			return {
-				index,
-				name,
-				attributes,
-				blockMovingMode,
-				orientation: getBlockListSettings( rootClientId )?.orientation,
-				editorMode: __unstableGetEditorMode(),
-			};
-		},
-		[ clientId, rootClientId ]
-	);
-	const {
-		index,
-		name,
-		attributes,
-		blockMovingMode,
-		orientation,
-		editorMode,
-	} = selected;
-	const { setNavigationMode, removeBlock } = useDispatch( blockEditorStore );
-	const ref = useRef();
-
-	const blockType = getBlockType( name );
-	const label = getAccessibleBlockLabel(
-		blockType,
-		attributes,
-		index + 1,
-		orientation
-	);
-
-	// Focus the breadcrumb in navigation mode.
-	useEffect( () => {
-		ref.current.focus();
-
-		speak( label );
-	}, [ label ] );
-	const blockElement = useBlockElement( clientId );
-
-	const {
-		hasBlockMovingClientId,
-		getBlockIndex,
-		getBlockRootClientId,
-		getClientIdsOfDescendants,
-		getSelectedBlockClientId,
-		getMultiSelectedBlocksEndClientId,
-		getPreviousBlockClientId,
-		getNextBlockClientId,
-	} = useSelect( blockEditorStore );
-	const {
-		selectBlock,
-		clearSelectedBlock,
-		setBlockMovingClientId,
-		moveBlockToPosition,
-	} = useDispatch( blockEditorStore );
-
-	function onKeyDown( event ) {
-		const { keyCode } = event;
-		const isUp = keyCode === UP;
-		const isDown = keyCode === DOWN;
-		const isLeft = keyCode === LEFT;
-		const isRight = keyCode === RIGHT;
-		const isTab = keyCode === TAB;
-		const isEscape = keyCode === ESCAPE;
-		const isEnter = keyCode === ENTER;
-		const isSpace = keyCode === SPACE;
-		const isShift = event.shiftKey;
-
-		if ( keyCode === BACKSPACE || keyCode === DELETE ) {
-			removeBlock( clientId );
-			event.preventDefault();
-			return;
-		}
-
-		const selectedBlockClientId = getSelectedBlockClientId();
-		const selectionEndClientId = getMultiSelectedBlocksEndClientId();
-		const selectionBeforeEndClientId = getPreviousBlockClientId(
-			selectionEndClientId || selectedBlockClientId
-		);
-		const selectionAfterEndClientId = getNextBlockClientId(
-			selectionEndClientId || selectedBlockClientId
-		);
-
-		const navigateUp = ( isTab && isShift ) || isUp;
-		const navigateDown = ( isTab && ! isShift ) || isDown;
-		// Move out of current nesting level (no effect if at root level).
-		const navigateOut = isLeft;
-		// Move into next nesting level (no effect if the current block has no innerBlocks).
-		const navigateIn = isRight;
-
-		let focusedBlockUid;
-		if ( navigateUp ) {
-			focusedBlockUid = selectionBeforeEndClientId;
-		} else if ( navigateDown ) {
-			focusedBlockUid = selectionAfterEndClientId;
-		} else if ( navigateOut ) {
-			focusedBlockUid =
-				getBlockRootClientId( selectedBlockClientId ) ??
-				selectedBlockClientId;
-		} else if ( navigateIn ) {
-			focusedBlockUid =
-				getClientIdsOfDescendants( selectedBlockClientId )[ 0 ] ??
-				selectedBlockClientId;
-		}
-		const startingBlockClientId = hasBlockMovingClientId();
-		if ( isEscape && startingBlockClientId && ! event.defaultPrevented ) {
-			setBlockMovingClientId( null );
-			event.preventDefault();
-		}
-		if ( ( isEnter || isSpace ) && startingBlockClientId ) {
-			const sourceRoot = getBlockRootClientId( startingBlockClientId );
-			const destRoot = getBlockRootClientId( selectedBlockClientId );
-			const sourceBlockIndex = getBlockIndex( startingBlockClientId );
-			let destinationBlockIndex = getBlockIndex( selectedBlockClientId );
-			if (
-				sourceBlockIndex < destinationBlockIndex &&
-				sourceRoot === destRoot
-			) {
-				destinationBlockIndex -= 1;
-			}
-			moveBlockToPosition(
-				startingBlockClientId,
-				sourceRoot,
-				destRoot,
-				destinationBlockIndex
-			);
-			selectBlock( startingBlockClientId );
-			setBlockMovingClientId( null );
-		}
-		// Prevent the block from being moved into itself.
-		if (
-			startingBlockClientId &&
-			selectedBlockClientId === startingBlockClientId &&
-			navigateIn
-		) {
-			return;
-		}
-		if ( navigateDown || navigateUp || navigateOut || navigateIn ) {
-			if ( focusedBlockUid ) {
-				event.preventDefault();
-				selectBlock( focusedBlockUid );
-			} else if ( isTab && selectedBlockClientId ) {
-				let nextTabbable;
-
-				if ( navigateDown ) {
-					nextTabbable = blockElement;
-					do {
-						nextTabbable = focus.tabbable.findNext( nextTabbable );
-					} while (
-						nextTabbable &&
-						blockElement.contains( nextTabbable )
-					);
-
-					if ( ! nextTabbable ) {
-						nextTabbable =
-							blockElement.ownerDocument.defaultView.frameElement;
-						nextTabbable = focus.tabbable.findNext( nextTabbable );
-					}
-				} else {
-					nextTabbable = focus.tabbable.findPrevious( blockElement );
-				}
-
-				if ( nextTabbable ) {
-					event.preventDefault();
-					nextTabbable.focus();
-					clearSelectedBlock();
-				}
-			}
-		}
-	}
-
-	const classNames = classnames(
-		'block-editor-block-list__block-selection-button',
-		{
-			'is-block-moving-mode': !! blockMovingMode,
-		}
-	);
-
-	const dragHandleLabel = __( 'Drag' );
-
-	return (
-		<div className={ classNames }>
-			<Flex
-				justify="center"
-				className="block-editor-block-list__block-selection-button__content"
-			>
-				<FlexItem>
-					<BlockIcon icon={ blockInformation?.icon } showColors />
-				</FlexItem>
-				<FlexItem>
-					{ editorMode === 'zoom-out' && (
-						<BlockMover clientIds={ [ clientId ] } hideDragHandle />
-					) }
-					{ editorMode === 'navigation' && (
-						<BlockDraggable clientIds={ [ clientId ] }>
-							{ ( draggableProps ) => (
-								<Button
-									icon={ dragHandle }
-									className="block-selection-button_drag-handle"
-									aria-hidden="true"
-									label={ dragHandleLabel }
-									// Should not be able to tab to drag handle as this
-									// button can only be used with a pointer device.
-									tabIndex="-1"
-									{ ...draggableProps }
-								/>
-							) }
-						</BlockDraggable>
-					) }
-				</FlexItem>
-				<FlexItem>
-					<Button
-						ref={ ref }
-						onClick={
-							editorMode === 'navigation'
-								? () => setNavigationMode( false )
-								: undefined
-						}
-						onKeyDown={ onKeyDown }
-						label={ label }
-						showTooltip={ false }
-						className="block-selection-button_select-button"
-					>
-						<BlockTitle
-							clientId={ clientId }
-							maximumLength={ 35 }
-						/>
-					</Button>
-				</FlexItem>
-			</Flex>
-		</div>
-	);
-}
-
-export default BlockSelectionButton;
diff --git a/packages/block-editor/src/components/block-tools/block-toolbar-popover.js b/packages/block-editor/src/components/block-tools/block-toolbar-popover.js
new file mode 100644
index 00000000000000..c6378130b7da42
--- /dev/null
+++ b/packages/block-editor/src/components/block-tools/block-toolbar-popover.js
@@ -0,0 +1,85 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+/**
+ * WordPress dependencies
+ */
+import { useDispatch } from '@wordpress/data';
+import { useEffect, useRef } from '@wordpress/element';
+import { useShortcut } from '@wordpress/keyboard-shortcuts';
+/**
+ * Internal dependencies
+ */
+import BlockPopover from '../block-popover';
+import useBlockToolbarPopoverProps from './use-block-toolbar-popover-props';
+import useSelectedBlockToolProps from './use-selected-block-tool-props';
+import { store as blockEditorStore } from '../../store';
+import { PrivateBlockToolbar } from '../block-toolbar';
+
+export default function BlockToolbarPopover( {
+	clientId,
+	isTyping,
+	__unstableContentRef,
+} ) {
+	const { capturingClientId, isInsertionPointVisible, lastClientId } =
+		useSelectedBlockToolProps( clientId );
+
+	// Stores the active toolbar item index so the block toolbar can return focus
+	// to it when re-mounting.
+	const initialToolbarItemIndexRef = useRef();
+
+	useEffect( () => {
+		// Resets the index whenever the active block changes so this is not
+		// persisted. See https://github.com/WordPress/gutenberg/pull/25760#issuecomment-717906169
+		initialToolbarItemIndexRef.current = undefined;
+	}, [ clientId ] );
+
+	const { stopTyping } = useDispatch( blockEditorStore );
+	const isToolbarForcedRef = useRef( false );
+
+	useShortcut( 'core/block-editor/focus-toolbar', () => {
+		isToolbarForcedRef.current = true;
+		stopTyping( true );
+	} );
+
+	useEffect( () => {
+		isToolbarForcedRef.current = false;
+	} );
+
+	// If the block has a parent with __experimentalCaptureToolbars enabled,
+	// the toolbar should be positioned over the topmost capturing parent.
+	const clientIdToPositionOver = capturingClientId || clientId;
+
+	const popoverProps = useBlockToolbarPopoverProps( {
+		contentElement: __unstableContentRef?.current,
+		clientId: clientIdToPositionOver,
+	} );
+
+	return (
+		! isTyping && (
+			<BlockPopover
+				clientId={ clientIdToPositionOver }
+				bottomClientId={ lastClientId }
+				className={ clsx( 'block-editor-block-list__block-popover', {
+					'is-insertion-point-visible': isInsertionPointVisible,
+				} ) }
+				resize={ false }
+				{ ...popoverProps }
+			>
+				<PrivateBlockToolbar
+					// If the toolbar is being shown because of being forced
+					// it should focus the toolbar right after the mount.
+					focusOnMount={ isToolbarForcedRef.current }
+					__experimentalInitialIndex={
+						initialToolbarItemIndexRef.current
+					}
+					__experimentalOnIndexChange={ ( index ) => {
+						initialToolbarItemIndexRef.current = index;
+					} }
+					variant="toolbar"
+				/>
+			</BlockPopover>
+		)
+	);
+}
diff --git a/packages/block-editor/src/components/block-tools/empty-block-inserter.js b/packages/block-editor/src/components/block-tools/empty-block-inserter.js
index 1d520ed72b1c69..7faeda933f4c48 100644
--- a/packages/block-editor/src/components/block-tools/empty-block-inserter.js
+++ b/packages/block-editor/src/components/block-tools/empty-block-inserter.js
@@ -1,12 +1,12 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
  */
-import BlockPopover from '../block-popover';
+import BlockPopoverCover from '../block-popover/cover';
 import useBlockToolbarPopoverProps from './use-block-toolbar-popover-props';
 import Inserter from '../inserter';
 import useSelectedBlockToolProps from './use-selected-block-tool-props';
@@ -28,19 +28,16 @@ export default function EmptyBlockInserter( {
 	} );
 
 	return (
-		<BlockPopover
+		<BlockPopoverCover
 			clientId={ capturingClientId || clientId }
-			__unstableCoverTarget
 			bottomClientId={ lastClientId }
-			className={ classnames(
+			className={ clsx(
 				'block-editor-block-list__block-side-inserter-popover',
 				{
 					'is-insertion-point-visible': isInsertionPointVisible,
 				}
 			) }
 			__unstableContentRef={ __unstableContentRef }
-			resize={ false }
-			shift={ false }
 			{ ...popoverProps }
 		>
 			<div className="block-editor-block-list__empty-block-inserter">
@@ -51,6 +48,6 @@ export default function EmptyBlockInserter( {
 					__experimentalIsQuick
 				/>
 			</div>
-		</BlockPopover>
+		</BlockPopoverCover>
 	);
 }
diff --git a/packages/block-editor/src/components/block-tools/index.js b/packages/block-editor/src/components/block-tools/index.js
index bc2729fbb15990..700b345be20274 100644
--- a/packages/block-editor/src/components/block-tools/index.js
+++ b/packages/block-editor/src/components/block-tools/index.js
@@ -2,11 +2,13 @@
  * WordPress dependencies
  */
 import { useSelect, useDispatch } from '@wordpress/data';
-import { useViewportMatch } from '@wordpress/compose';
+import { isTextField } from '@wordpress/dom';
 import { Popover } from '@wordpress/components';
 import { __unstableUseShortcutEventMatch as useShortcutEventMatch } from '@wordpress/keyboard-shortcuts';
 import { useRef } from '@wordpress/element';
-import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';
+import { switchToBlockType, store as blocksStore } from '@wordpress/blocks';
+import { speak } from '@wordpress/a11y';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -16,38 +18,32 @@ import {
 	InsertionPointOpenRef,
 	default as InsertionPoint,
 } from './insertion-point';
-import SelectedBlockTools from './selected-block-tools';
+import BlockToolbarPopover from './block-toolbar-popover';
 import { store as blockEditorStore } from '../../store';
-import BlockContextualToolbar from './block-contextual-toolbar';
 import usePopoverScroll from '../block-popover/use-popover-scroll';
 import ZoomOutModeInserters from './zoom-out-mode-inserters';
+import { useShowBlockTools } from './use-show-block-tools';
+import { unlock } from '../../lock-unlock';
 
 function selector( select ) {
 	const {
 		getSelectedBlockClientId,
 		getFirstMultiSelectedBlockClientId,
-		getBlock,
 		getSettings,
-		__unstableGetEditorMode,
 		isTyping,
-	} = select( blockEditorStore );
+		isDragging,
+		isZoomOut,
+	} = unlock( select( blockEditorStore ) );
 
 	const clientId =
 		getSelectedBlockClientId() || getFirstMultiSelectedBlockClientId();
 
-	const { name = '', attributes = {} } = getBlock( clientId ) || {};
-
 	return {
 		clientId,
 		hasFixedToolbar: getSettings().hasFixedToolbar,
-		hasSelectedBlock: clientId && name,
 		isTyping: isTyping(),
-		isZoomOutMode: __unstableGetEditorMode() === 'zoom-out',
-		showEmptyBlockSideInserter:
-			clientId &&
-			! isTyping() &&
-			__unstableGetEditorMode() === 'edit' &&
-			isUnmodifiedDefaultBlock( { name, attributes } ),
+		isZoomOutMode: isZoomOut(),
+		isDragging: isDragging(),
 	};
 }
 
@@ -65,31 +61,36 @@ export default function BlockTools( {
 	__unstableContentRef,
 	...props
 } ) {
-	const isLargeViewport = useViewportMatch( 'medium' );
-	const {
-		clientId,
-		hasFixedToolbar,
-		hasSelectedBlock,
-		isTyping,
-		isZoomOutMode,
-		showEmptyBlockSideInserter,
-	} = useSelect( selector, [] );
+	const { clientId, hasFixedToolbar, isTyping, isZoomOutMode, isDragging } =
+		useSelect( selector, [] );
+
 	const isMatch = useShortcutEventMatch();
-	const { getSelectedBlockClientIds, getBlockRootClientId } =
-		useSelect( blockEditorStore );
+	const {
+		getBlocksByClientId,
+		getSelectedBlockClientIds,
+		getBlockRootClientId,
+		isGroupable,
+	} = useSelect( blockEditorStore );
+	const { getGroupingBlockName } = useSelect( blocksStore );
+	const { showEmptyBlockSideInserter, showBlockToolbarPopover } =
+		useShowBlockTools();
+
 	const {
 		duplicateBlocks,
 		removeBlocks,
+		replaceBlocks,
 		insertAfterBlock,
 		insertBeforeBlock,
-		clearSelectedBlock,
 		selectBlock,
 		moveBlocksUp,
 		moveBlocksDown,
-	} = useDispatch( blockEditorStore );
+		expandBlock,
+	} = unlock( useDispatch( blockEditorStore ) );
 
 	function onKeyDown( event ) {
-		if ( event.defaultPrevented ) return;
+		if ( event.defaultPrevented ) {
+			return;
+		}
 
 		if ( isMatch( 'core/block-editor/move-up', event ) ) {
 			const clientIds = getSelectedBlockClientIds();
@@ -140,48 +141,54 @@ export default function BlockTools( {
 			}
 
 			const clientIds = getSelectedBlockClientIds();
-			if ( clientIds.length ) {
+			if ( clientIds.length > 1 ) {
 				event.preventDefault();
-
 				// If there is more than one block selected, select the first
 				// block so that focus is directed back to the beginning of the selection.
 				// In effect, to the user this feels like deselecting the multi-selection.
-				if ( clientIds.length > 1 ) {
-					selectBlock( clientIds[ 0 ] );
-				} else {
-					clearSelectedBlock();
-				}
-				event.target.ownerDocument.defaultView
-					.getSelection()
-					.removeAllRanges();
-				__unstableContentRef?.current.focus();
+				selectBlock( clientIds[ 0 ] );
+			}
+		} else if ( isMatch( 'core/block-editor/collapse-list-view', event ) ) {
+			// If focus is currently within a text field, such as a rich text block or other editable field,
+			// skip collapsing the list view, and allow the keyboard shortcut to be handled by the text field.
+			// This condition checks for both the active element and the active element within an iframed editor.
+			if (
+				isTextField( event.target ) ||
+				isTextField(
+					event.target?.contentWindow?.document?.activeElement
+				)
+			) {
+				return;
+			}
+			event.preventDefault();
+			expandBlock( clientId );
+		} else if ( isMatch( 'core/block-editor/group', event ) ) {
+			const clientIds = getSelectedBlockClientIds();
+			if ( clientIds.length > 1 && isGroupable( clientIds ) ) {
+				event.preventDefault();
+				const blocks = getBlocksByClientId( clientIds );
+				const groupingBlockName = getGroupingBlockName();
+				const newBlocks = switchToBlockType(
+					blocks,
+					groupingBlockName
+				);
+				replaceBlocks( clientIds, newBlocks );
+				speak( __( 'Selected blocks are grouped.' ) );
 			}
 		}
 	}
-
 	const blockToolbarRef = usePopoverScroll( __unstableContentRef );
 	const blockToolbarAfterRef = usePopoverScroll( __unstableContentRef );
 
-	// Conditions for fixed toolbar
-	// 1. Not zoom out mode
-	// 2. It's a large viewport. If it's a smaller viewport, let the floating toolbar handle it as it already has styles attached to make it render that way.
-	// 3. Fixed toolbar is enabled
-	const isTopToolbar = ! isZoomOutMode && hasFixedToolbar && isLargeViewport;
-
 	return (
 		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
 		<div { ...props } onKeyDown={ onKeyDown }>
 			<InsertionPointOpenRef.Provider value={ useRef( false ) }>
-				{ ! isTyping && (
+				{ ! isTyping && ! isZoomOutMode && (
 					<InsertionPoint
 						__unstableContentRef={ __unstableContentRef }
 					/>
 				) }
-				{ /* If there is no slot available, such as in the standalone block editor, render within the editor */ }
-
-				{ ! isLargeViewport && ( // Small viewports always get a fixed toolbar
-					<BlockContextualToolbar isFixed />
-				) }
 
 				{ showEmptyBlockSideInserter && (
 					<EmptyBlockInserter
@@ -189,17 +196,17 @@ export default function BlockTools( {
 						clientId={ clientId }
 					/>
 				) }
-				{ /* Even if the toolbar is fixed, the block popover is still
-					needed for navigation and zoom-out mode. */ }
-				{ ! showEmptyBlockSideInserter && hasSelectedBlock && (
-					<SelectedBlockTools
+
+				{ showBlockToolbarPopover && (
+					<BlockToolbarPopover
 						__unstableContentRef={ __unstableContentRef }
 						clientId={ clientId }
+						isTyping={ isTyping }
 					/>
 				) }
 
-				{ /* Used for the inline rich text toolbar. */ }
-				{ ! isTopToolbar && (
+				{ /* Used for the inline rich text toolbar. Until this toolbar is combined into BlockToolbar, someone implementing their own BlockToolbar will also need to use this to see the image caption toolbar. */ }
+				{ ! isZoomOutMode && ! hasFixedToolbar && (
 					<Popover.Slot
 						name="block-toolbar"
 						ref={ blockToolbarRef }
@@ -211,7 +218,7 @@ export default function BlockTools( {
 					name="__unstable-block-tools-after"
 					ref={ blockToolbarAfterRef }
 				/>
-				{ isZoomOutMode && (
+				{ isZoomOutMode && ! isDragging && (
 					<ZoomOutModeInserters
 						__unstableContentRef={ __unstableContentRef }
 					/>
diff --git a/packages/block-editor/src/components/block-tools/insertion-point.js b/packages/block-editor/src/components/block-tools/insertion-point.js
index 1caec5f3aee8e0..6c54993b23bcaa 100644
--- a/packages/block-editor/src/components/block-tools/insertion-point.js
+++ b/packages/block-editor/src/components/block-tools/insertion-point.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -18,12 +18,15 @@ import Inserter from '../inserter';
 import { store as blockEditorStore } from '../../store';
 import BlockPopoverInbetween from '../block-popover/inbetween';
 import BlockDropZonePopover from '../block-popover/drop-zone';
+import { unlock } from '../../lock-unlock';
 
 export const InsertionPointOpenRef = createContext();
 
 function InbetweenInsertionPointPopover( {
 	__unstablePopoverSlot,
 	__unstableContentRef,
+	operation = 'insert',
+	nearestSide = 'right',
 } ) {
 	const { selectBlock, hideInsertionPoint } = useDispatch( blockEditorStore );
 	const openRef = useContext( InsertionPointOpenRef );
@@ -35,7 +38,7 @@ function InbetweenInsertionPointPopover( {
 		rootClientId,
 		isInserterShown,
 		isDistractionFree,
-		isNavigationMode,
+		isZoomOutMode,
 	} = useSelect( ( select ) => {
 		const {
 			getBlockOrder,
@@ -45,8 +48,8 @@ function InbetweenInsertionPointPopover( {
 			getPreviousBlockClientId,
 			getNextBlockClientId,
 			getSettings,
-			isNavigationMode: _isNavigationMode,
-		} = select( blockEditorStore );
+			isZoomOut,
+		} = unlock( select( blockEditorStore ) );
 		const insertionPoint = getBlockInsertionPoint();
 		const order = getBlockOrder( insertionPoint.rootClientId );
 
@@ -74,16 +77,21 @@ function InbetweenInsertionPointPopover( {
 				getBlockListSettings( insertionPoint.rootClientId )
 					?.orientation || 'vertical',
 			rootClientId: insertionPoint.rootClientId,
-			isNavigationMode: _isNavigationMode(),
 			isDistractionFree: settings.isDistractionFree,
 			isInserterShown: insertionPoint?.__unstableWithInserter,
+			isZoomOutMode: isZoomOut(),
 		};
 	}, [] );
+	const { getBlockEditingMode } = useSelect( blockEditorStore );
 
 	const disableMotion = useReducedMotion();
 
 	function onClick( event ) {
-		if ( event.target === ref.current && nextClientId ) {
+		if (
+			event.target === ref.current &&
+			nextClientId &&
+			getBlockEditingMode( nextClientId ) !== 'disabled'
+		) {
 			selectBlock( nextClientId, -1 );
 		}
 	}
@@ -134,13 +142,26 @@ function InbetweenInsertionPointPopover( {
 		},
 	};
 
-	if ( isDistractionFree && ! isNavigationMode ) {
+	if ( isDistractionFree ) {
 		return null;
 	}
 
-	const className = classnames(
+	// Zoom out mode should only show the insertion point for the insert operation.
+	// Other operations such as "group" are when the editor tries to create a row
+	// block by grouping the block being dragged with the block it's being dropped
+	// onto.
+	if ( isZoomOutMode && operation !== 'insert' ) {
+		return null;
+	}
+
+	const orientationClassname =
+		orientation === 'horizontal' || operation === 'group'
+			? 'is-horizontal'
+			: 'is-vertical';
+
+	const className = clsx(
 		'block-editor-block-list__insertion-point',
-		'is-' + orientation
+		orientationClassname
 	);
 
 	return (
@@ -149,6 +170,8 @@ function InbetweenInsertionPointPopover( {
 			nextClientId={ nextClientId }
 			__unstablePopoverSlot={ __unstablePopoverSlot }
 			__unstableContentRef={ __unstableContentRef }
+			operation={ operation }
+			nearestSide={ nearestSide }
 		>
 			<motion.div
 				layout={ ! disableMotion }
@@ -161,7 +184,7 @@ function InbetweenInsertionPointPopover( {
 				tabIndex={ -1 }
 				onClick={ onClick }
 				onFocus={ onFocus }
-				className={ classnames( className, {
+				className={ clsx( className, {
 					'is-with-inserter': isInserterShown,
 				} ) }
 				onHoverEnd={ maybeHideInserterPoint }
@@ -174,7 +197,7 @@ function InbetweenInsertionPointPopover( {
 				{ isInserterShown && (
 					<motion.div
 						variants={ inserterVariants }
-						className={ classnames(
+						className={ clsx(
 							'block-editor-block-list__insertion-point-inserter'
 						) }
 					>
@@ -236,6 +259,10 @@ export default function InsertionPoint( props ) {
 			{ ...props }
 		/>
 	) : (
-		<InbetweenInsertionPointPopover { ...props } />
+		<InbetweenInsertionPointPopover
+			operation={ insertionPoint.operation }
+			nearestSide={ insertionPoint.nearestSide }
+			{ ...props }
+		/>
 	);
 }
diff --git a/packages/block-editor/src/components/block-tools/selected-block-tools.js b/packages/block-editor/src/components/block-tools/selected-block-tools.js
deleted file mode 100644
index dfbd3e9ba3ca3c..00000000000000
--- a/packages/block-editor/src/components/block-tools/selected-block-tools.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { useRef, useEffect } from '@wordpress/element';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { useShortcut } from '@wordpress/keyboard-shortcuts';
-
-/**
- * Internal dependencies
- */
-import BlockSelectionButton from './block-selection-button';
-import BlockContextualToolbar from './block-contextual-toolbar';
-import { store as blockEditorStore } from '../../store';
-import BlockPopover from '../block-popover';
-import useBlockToolbarPopoverProps from './use-block-toolbar-popover-props';
-import useSelectedBlockToolProps from './use-selected-block-tool-props';
-import { useShouldContextualToolbarShow } from '../../utils/use-should-contextual-toolbar-show';
-
-export default function SelectedBlockTools( {
-	clientId,
-	showEmptyBlockSideInserter,
-	__unstableContentRef,
-} ) {
-	const {
-		capturingClientId,
-		isInsertionPointVisible,
-		lastClientId,
-		rootClientId,
-	} = useSelectedBlockToolProps( clientId );
-
-	const { shouldShowBreadcrumb } = useSelect( ( select ) => {
-		const { hasMultiSelection, __unstableGetEditorMode } =
-			select( blockEditorStore );
-
-		const editorMode = __unstableGetEditorMode();
-
-		return {
-			shouldShowBreadcrumb:
-				! hasMultiSelection() &&
-				( editorMode === 'navigation' || editorMode === 'zoom-out' ),
-		};
-	}, [] );
-
-	const isToolbarForced = useRef( false );
-	const { shouldShowContextualToolbar, canFocusHiddenToolbar } =
-		useShouldContextualToolbarShow();
-
-	const { stopTyping } = useDispatch( blockEditorStore );
-
-	useShortcut(
-		'core/block-editor/focus-toolbar',
-		() => {
-			isToolbarForced.current = true;
-			stopTyping( true );
-		},
-		{
-			isDisabled: ! canFocusHiddenToolbar,
-		}
-	);
-
-	useEffect( () => {
-		isToolbarForced.current = false;
-	} );
-
-	// Stores the active toolbar item index so the block toolbar can return focus
-	// to it when re-mounting.
-	const initialToolbarItemIndexRef = useRef();
-
-	useEffect( () => {
-		// Resets the index whenever the active block changes so this is not
-		// persisted. See https://github.com/WordPress/gutenberg/pull/25760#issuecomment-717906169
-		initialToolbarItemIndexRef.current = undefined;
-	}, [ clientId ] );
-
-	const popoverProps = useBlockToolbarPopoverProps( {
-		contentElement: __unstableContentRef?.current,
-		clientId,
-	} );
-
-	if ( showEmptyBlockSideInserter ) {
-		return null;
-	}
-
-	if ( shouldShowBreadcrumb || shouldShowContextualToolbar ) {
-		return (
-			<BlockPopover
-				clientId={ capturingClientId || clientId }
-				bottomClientId={ lastClientId }
-				className={ classnames(
-					'block-editor-block-list__block-popover',
-					{
-						'is-insertion-point-visible': isInsertionPointVisible,
-					}
-				) }
-				resize={ false }
-				{ ...popoverProps }
-			>
-				{ shouldShowContextualToolbar && (
-					<BlockContextualToolbar
-						// If the toolbar is being shown because of being forced
-						// it should focus the toolbar right after the mount.
-						focusOnMount={ isToolbarForced.current }
-						__experimentalInitialIndex={
-							initialToolbarItemIndexRef.current
-						}
-						__experimentalOnIndexChange={ ( index ) => {
-							initialToolbarItemIndexRef.current = index;
-						} }
-					/>
-				) }
-				{ shouldShowBreadcrumb && (
-					<BlockSelectionButton
-						clientId={ clientId }
-						rootClientId={ rootClientId }
-					/>
-				) }
-			</BlockPopover>
-		);
-	}
-
-	return null;
-}
diff --git a/packages/block-editor/src/components/block-tools/style.scss b/packages/block-editor/src/components/block-tools/style.scss
index 07f22bb4946ea2..0791dc909d5be4 100644
--- a/packages/block-editor/src/components/block-tools/style.scss
+++ b/packages/block-editor/src/components/block-tools/style.scss
@@ -13,7 +13,7 @@
 .block-editor-block-list__insertion-point-indicator {
 	position: absolute;
 	background: var(--wp-admin-theme-color);
-	border-radius: 2px;
+	border-radius: $radius-small;
 	transform-origin: center;
 	opacity: 0;
 	will-change: transform, opacity;
@@ -63,7 +63,6 @@
 	.block-editor-inserter__toggle.components-button.has-icon {
 		// Basic look
 		background: $gray-900;
-		border-radius: $radius-block-ui;
 		color: $white;
 		padding: 0;
 
@@ -85,256 +84,6 @@
 	}
 }
 
-/**
- * Block Toolbar when contextual.
- */
-
-.block-editor-block-contextual-toolbar {
-	// Block UI appearance.
-	display: inline-flex;
-	border: $border-width solid $gray-900;
-	border-radius: $radius-block-ui;
-	background-color: $white;
-
-	.block-editor-block-toolbar .components-toolbar-group,
-	.block-editor-block-toolbar .components-toolbar {
-		border-right-color: $gray-900;
-	}
-
-	&.is-fixed {
-		overflow: hidden;
-
-		.block-editor-block-toolbar {
-			overflow: auto;
-			overflow-y: hidden;
-		}
-
-		border-bottom: $border-width solid $gray-200;
-		border-radius: 0;
-
-		.block-editor-block-toolbar .components-toolbar-group,
-		.block-editor-block-toolbar .components-toolbar {
-			border-right-color: $gray-200;
-		}
-	}
-
-	@include break-medium() {
-		&.is-fixed {
-			& > .block-editor-block-toolbar {
-				flex-grow: initial;
-				width: initial;
-
-				// Add a border as separator in the block toolbar.
-				&::before {
-					content: "";
-					width: $border-width;
-					height: 3 * $grid-unit;
-					margin-top: $grid-unit + $grid-unit-05;
-					margin-right: 0;
-					background-color: $gray-300;
-					position: relative;
-					left: math.div(-$grid-unit-05, 2);
-					top: -1px;
-				}
-			}
-
-			& > .block-editor-block-toolbar__group-collapse-fixed-toolbar {
-				border: none;
-
-				.show-icon-labels & {
-					.components-button.has-icon {
-						// Hide the button icons when labels are set to display...
-						svg {
-							display: none;
-						}
-						// ... and display labels.
-						&::after {
-							content: attr(aria-label);
-							font-size: $helptext-font-size;
-						}
-					}
-				}
-
-				// Add a border as separator in the block toolbar.
-				&::before {
-					content: "";
-					width: $border-width;
-					height: 3 * $grid-unit;
-					margin-top: $grid-unit + $grid-unit-05;
-					margin-right: $grid-unit-10;
-					background-color: $gray-300;
-					position: relative;
-					left: 0;
-					top: -1px;
-				}
-			}
-
-			& > .block-editor-block-toolbar__group-expand-fixed-toolbar {
-				border: none;
-
-				.show-icon-labels & {
-					width: $grid-unit-80 * 4;
-					.components-button.has-icon {
-						// Hide the button icons when labels are set to display...
-						svg {
-							display: none;
-						}
-						// ... and display labels.
-						&::after {
-							content: attr(aria-label);
-							font-size: $helptext-font-size;
-						}
-					}
-				}
-
-				// Add a border as separator in the block toolbar.
-				&::before {
-					content: "";
-					width: $border-width;
-					margin-top: $grid-unit + $grid-unit-05;
-					margin-bottom: $grid-unit + $grid-unit-05;
-					background-color: $gray-300;
-					position: relative;
-					left: -8px;
-					height: 3 * $grid-unit;
-					top: -1px;
-				}
-			}
-
-			.show-icon-labels & {
-				.block-editor-block-parent-selector .block-editor-block-parent-selector__button::after {
-					left: 0;
-				}
-
-				.block-editor-block-toolbar__block-controls .block-editor-block-mover {
-					border-left: none;
-					&::before {
-						content: "";
-						width: $border-width;
-						margin-top: $grid-unit + $grid-unit-05;
-						margin-bottom: $grid-unit + $grid-unit-05;
-						background-color: $gray-300;
-						position: relative;
-					}
-				}
-			}
-		}
-
-		&.is-fixed .block-editor-block-parent-selector {
-
-			.block-editor-block-parent-selector__button {
-				position: relative;
-				top: -1px;
-				border: 0;
-				padding-right: 6px;
-				padding-left: 6px;
-
-				&::after {
-					content: "\00B7";
-					font-size: 16px;
-					line-height: $grid-unit-40 + $grid-unit-10;
-					position: absolute;
-					left: $grid-unit-40 + $grid-unit-15 + 2px;
-					bottom: $grid-unit-05;
-				}
-			}
-		}
-
-		&:not(.is-fixed) .block-editor-block-parent-selector {
-			position: absolute;
-			top: -$border-width;
-			left: calc(-#{$grid-unit-60} - #{$grid-unit-10} - #{$border-width});
-
-			.show-icon-labels & {
-				position: relative;
-				left: auto;
-				top: auto;
-				margin-top: -$border-width;
-				margin-left: -$border-width;
-				margin-bottom: -$border-width;
-			}
-		}
-	}
-}
-
-/**
- * Block Label for Navigation/Selection Mode
- */
-
-.block-editor-block-list__block-selection-button {
-	display: inline-flex;
-	padding: 0 $grid-unit-15;
-	z-index: z-index(".block-editor-block-list__block-selection-button");
-
-	// Dark block UI appearance.
-	border-radius: $radius-block-ui;
-	background-color: $gray-900;
-
-	font-size: $default-font-size;
-	height: $block-toolbar-height;
-
-	.block-editor-block-list__block-selection-button__content {
-		margin: auto;
-		display: inline-flex;
-		align-items: center;
-
-		> .components-flex__item {
-			margin-right: $grid-unit-15 * 0.5;
-		}
-	}
-	.components-button.has-icon.block-selection-button_drag-handle {
-		cursor: grab;
-		padding: 0;
-		height: $grid-unit-30;
-		min-width: $grid-unit-30;
-		margin-left: -2px;
-
-		// Drag handle is smaller than the others.
-		svg {
-			min-width: 18px;
-			min-height: 18px;
-		}
-	}
-
-	.block-editor-block-icon {
-		font-size: $default-font-size;
-		color: $white;
-		height: $block-toolbar-height;
-	}
-
-	// The button here has a special style to appear as a toolbar.
-	.components-button {
-		min-width: $button-size;
-		color: $white;
-		height: $block-toolbar-height;
-
-		// When button is focused, it receives a box-shadow instead of the border.
-		&:focus {
-			box-shadow: none;
-			border: none;
-		}
-
-		&:active {
-			color: $white;
-		}
-
-		// Make sure the button has no hover style when it's disabled.
-		&[aria-disabled="true"]:hover {
-			color: $white;
-		}
-
-		display: flex;
-	}
-	.block-selection-button_select-button.components-button {
-		padding: 0;
-	}
-
-	.block-editor-block-mover {
-		background: unset;
-		border: none;
-	}
-}
-
 // Hide the popover block editor list while dragging.
 // Using a hacky animation to delay hiding the element.
 // It's needed because if we hide the element immediately upon dragging,
@@ -349,12 +98,33 @@
 }
 
 .components-popover.block-editor-block-list__block-popover {
+
 	// Position the block toolbar.
-	.block-editor-block-list__block-selection-button,
 	.block-editor-block-contextual-toolbar {
 		pointer-events: all;
-		margin-top: $grid-unit-15;
-		margin-bottom: $grid-unit-15;
+		margin-top: $grid-unit-10;
+		margin-bottom: $grid-unit-10;
+		border: $border-width solid $gray-900;
+		border-radius: $radius-small;
+		overflow: visible; // allow the parent selector to be visible
+		position: static;
+		width: auto;
+
+		&.has-parent {
+			margin-left: calc(#{$grid-unit-60} + #{$grid-unit-10});
+			.show-icon-labels & {
+				margin-left: 0;
+			}
+		}
+	}
+
+	.block-editor-block-toolbar {
+		overflow: visible;
+	}
+
+	.block-editor-block-toolbar .components-toolbar-group,
+	.block-editor-block-toolbar .components-toolbar {
+		border-right-color: $gray-900;
 	}
 
 	// Hide the block toolbar if the insertion point is shown.
@@ -368,8 +138,52 @@
 		// It's essential to hide the toolbar/popover so that `dragEnter` events can pass through them to the underlying elements.
 		animation: hide-during-dragging 1ms linear forwards;
 	}
+
+	.block-editor-block-parent-selector {
+		position: absolute;
+		left: calc(-#{$grid-unit-60} - #{$grid-unit-10} - #{$border-width});
+
+		&::before {
+			content: "";
+		}
+
+		.block-editor-block-parent-selector__button {
+			border: $border-width solid $gray-900;
+			padding-right: 6px;
+			padding-left: 6px;
+			background-color: $white;
+
+			.show-icon-labels & {
+				padding-right: $grid-unit-15;
+				padding-left: $grid-unit-15;
+			}
+		}
+	}
+
+	// Show Icon Label Styles
+	.show-icon-labels & {
+
+		.block-editor-block-parent-selector {
+			position: relative;
+			left: auto;
+			margin-left: -$border-width;
+		}
+
+		.block-editor-block-mover__move-button-container,
+		.block-editor-block-toolbar__block-controls .block-editor-block-mover {
+			border-left: 1px solid $gray-900;
+		}
+	}
 }
 
 .is-dragging-components-draggable .components-tooltip {
 	display: none;
 }
+
+.components-popover.block-editor-block-popover__inbetween .block-editor-button-pattern-inserter__button {
+	pointer-events: all;
+	position: absolute;
+	transform: translateX(-50%) translateY(-50%);
+	top: 50%;
+	left: 50%;
+}
diff --git a/packages/block-editor/src/components/block-tools/use-block-toolbar-popover-props.js b/packages/block-editor/src/components/block-tools/use-block-toolbar-popover-props.js
index f99323dd5c80a7..6d64f5a5882cb8 100644
--- a/packages/block-editor/src/components/block-tools/use-block-toolbar-popover-props.js
+++ b/packages/block-editor/src/components/block-tools/use-block-toolbar-popover-props.js
@@ -15,8 +15,9 @@ import {
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-import { __unstableUseBlockElement as useBlockElement } from '../block-list/use-block-props/use-block-refs';
+import { useBlockElement } from '../block-list/use-block-props/use-block-refs';
 import { hasStickyOrFixedPositionValue } from '../../hooks/position';
+import { getVisibleElementBounds } from '../../utils/dom';
 
 const COMMON_PROPS = {
 	placement: 'top-start',
@@ -67,7 +68,7 @@ function getProps(
 	// Get how far the content area has been scrolled.
 	const scrollTop = scrollContainer?.scrollTop || 0;
 
-	const blockRect = selectedBlockElement.getBoundingClientRect();
+	const blockRect = getVisibleElementBounds( selectedBlockElement );
 	const contentRect = contentElement.getBoundingClientRect();
 
 	// Get the vertical position of top of the visible content area.
diff --git a/packages/block-editor/src/components/block-tools/use-show-block-tools.js b/packages/block-editor/src/components/block-tools/use-show-block-tools.js
new file mode 100644
index 00000000000000..61b5be891fd540
--- /dev/null
+++ b/packages/block-editor/src/components/block-tools/use-show-block-tools.js
@@ -0,0 +1,56 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+/**
+ * Source of truth for which block tools are showing in the block editor.
+ *
+ * @return {Object} Object of which block tools will be shown.
+ */
+export function useShowBlockTools() {
+	return useSelect( ( select ) => {
+		const {
+			getSelectedBlockClientId,
+			getFirstMultiSelectedBlockClientId,
+			getBlock,
+			getBlockMode,
+			getSettings,
+			__unstableGetEditorMode,
+			isTyping,
+		} = unlock( select( blockEditorStore ) );
+
+		const clientId =
+			getSelectedBlockClientId() || getFirstMultiSelectedBlockClientId();
+
+		const block = getBlock( clientId );
+		const editorMode = __unstableGetEditorMode();
+		const hasSelectedBlock = !! clientId && !! block;
+		const isEmptyDefaultBlock =
+			hasSelectedBlock &&
+			isUnmodifiedDefaultBlock( block ) &&
+			getBlockMode( clientId ) !== 'html';
+		const _showEmptyBlockSideInserter =
+			clientId &&
+			! isTyping() &&
+			editorMode === 'edit' &&
+			isEmptyDefaultBlock;
+		const _showBlockToolbarPopover =
+			! getSettings().hasFixedToolbar &&
+			! _showEmptyBlockSideInserter &&
+			hasSelectedBlock &&
+			! isEmptyDefaultBlock;
+
+		return {
+			showEmptyBlockSideInserter: _showEmptyBlockSideInserter,
+			showBlockToolbarPopover: _showBlockToolbarPopover,
+		};
+	}, [] );
+}
diff --git a/packages/block-editor/src/components/block-tools/zoom-out-mode-inserter-button.js b/packages/block-editor/src/components/block-tools/zoom-out-mode-inserter-button.js
new file mode 100644
index 00000000000000..961552caa66e01
--- /dev/null
+++ b/packages/block-editor/src/components/block-tools/zoom-out-mode-inserter-button.js
@@ -0,0 +1,32 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { Button } from '@wordpress/components';
+import { plus } from '@wordpress/icons';
+import { _x } from '@wordpress/i18n';
+
+function ZoomOutModeInserterButton( { onClick } ) {
+	return (
+		<Button
+			variant="primary"
+			icon={ plus }
+			size="compact"
+			className={ clsx(
+				'block-editor-button-pattern-inserter__button',
+				'block-editor-block-tools__zoom-out-mode-inserter-button'
+			) }
+			onClick={ onClick }
+			label={ _x(
+				'Add pattern',
+				'Generic label for pattern inserter button'
+			) }
+		/>
+	);
+}
+
+export default ZoomOutModeInserterButton;
diff --git a/packages/block-editor/src/components/block-tools/zoom-out-mode-inserters.js b/packages/block-editor/src/components/block-tools/zoom-out-mode-inserters.js
index 3c42bdcdb4a48d..17af902bf9baf2 100644
--- a/packages/block-editor/src/components/block-tools/zoom-out-mode-inserters.js
+++ b/packages/block-editor/src/components/block-tools/zoom-out-mode-inserters.js
@@ -1,22 +1,49 @@
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { useEffect, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import BlockPopoverInbetween from '../block-popover/inbetween';
+import ZoomOutModeInserterButton from './zoom-out-mode-inserter-button';
 import { store as blockEditorStore } from '../../store';
-import Inserter from '../inserter';
+import { unlock } from '../../lock-unlock';
 
-function ZoomOutModeInserters( { __unstableContentRef } ) {
+function ZoomOutModeInserters() {
 	const [ isReady, setIsReady ] = useState( false );
-	const blockOrder = useSelect( ( select ) => {
-		return select( blockEditorStore ).getBlockOrder();
+	const {
+		hasSelection,
+		blockOrder,
+		setInserterIsOpened,
+		sectionRootClientId,
+		selectedBlockClientId,
+	} = useSelect( ( select ) => {
+		const {
+			getSettings,
+			getBlockOrder,
+			getSelectionStart,
+			getSelectedBlockClientId,
+			getSectionRootClientId,
+		} = unlock( select( blockEditorStore ) );
+
+		const root = getSectionRootClientId();
+
+		return {
+			hasSelection: !! getSelectionStart().clientId,
+			blockOrder: getBlockOrder( root ),
+			sectionRootClientId: root,
+			setInserterIsOpened:
+				getSettings().__experimentalSetIsInserterOpened,
+			selectedBlockClientId: getSelectedBlockClientId(),
+		};
 	}, [] );
 
+	// eslint-disable-next-line @wordpress/no-unused-vars-before-return
+	const { showInsertionPoint } = unlock( useDispatch( blockEditorStore ) );
+
 	// Defer the initial rendering to avoid the jumps due to the animation.
 	useEffect( () => {
 		const timeout = setTimeout( () => {
@@ -27,31 +54,36 @@ function ZoomOutModeInserters( { __unstableContentRef } ) {
 		};
 	}, [] );
 
-	if ( ! isReady ) {
+	if ( ! isReady || ! hasSelection ) {
 		return null;
 	}
 
-	return blockOrder.map( ( clientId, index ) => {
-		if ( index === blockOrder.length - 1 ) {
-			return null;
-		}
-		return (
-			<BlockPopoverInbetween
-				key={ clientId }
-				previousClientId={ clientId }
-				nextClientId={ blockOrder[ index + 1 ] }
-				__unstableContentRef={ __unstableContentRef }
-			>
-				<div className="block-editor-block-list__insertion-point-inserter is-with-inserter">
-					<Inserter
-						position="bottom center"
-						clientId={ blockOrder[ index + 1 ] }
-						__experimentalIsQuick
-					/>
-				</div>
-			</BlockPopoverInbetween>
-		);
-	} );
+	const previousClientId = selectedBlockClientId;
+	const index = blockOrder.findIndex(
+		( clientId ) => selectedBlockClientId === clientId
+	);
+	const nextClientId = blockOrder[ index + 1 ];
+
+	return (
+		<BlockPopoverInbetween
+			previousClientId={ previousClientId }
+			nextClientId={ nextClientId }
+		>
+			<ZoomOutModeInserterButton
+				onClick={ () => {
+					setInserterIsOpened( {
+						rootClientId: sectionRootClientId,
+						insertionIndex: index + 1,
+						tab: 'patterns',
+						category: 'all',
+					} );
+					showInsertionPoint( sectionRootClientId, index + 1, {
+						operation: 'insert',
+					} );
+				} }
+			/>
+		</BlockPopoverInbetween>
+	);
 }
 
 export default ZoomOutModeInserters;
diff --git a/packages/block-editor/src/components/block-types-list/README.md b/packages/block-editor/src/components/block-types-list/README.md
index 68e89573447db8..8740cdbf2c7741 100644
--- a/packages/block-editor/src/components/block-types-list/README.md
+++ b/packages/block-editor/src/components/block-types-list/README.md
@@ -10,11 +10,6 @@ This component is present in the block insertion tab, the reusable blocks tab an
 
 ![Block types list in the quick inserter modal](https://make.wordpress.org/core/files/2020/09/block-types-list-emplacement-3.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-variation-picker/README.md b/packages/block-editor/src/components/block-variation-picker/README.md
index 4816822e535a2a..891cd21b1f50c2 100644
--- a/packages/block-editor/src/components/block-variation-picker/README.md
+++ b/packages/block-editor/src/components/block-variation-picker/README.md
@@ -10,11 +10,6 @@ This component is currently used by "Columns" and "Query Loop" blocks.
 
 ![Columns block variations](https://make.wordpress.org/core/files/2020/09/colums-block-variations.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
@@ -24,9 +19,9 @@ Renders the variations of a block.
 ```jsx
 import { useSelect } from '@wordpress/data';
 import {
-	__experimentalBlockVariationPicker as BlockVariationPicker,
-	store as blockEditorStore,
+	__experimentalBlockVariationPicker as BlockVariationPicker
 } from '@wordpress/block-editor';
+import { store as blocksStore } from '@wordpress/blocks';
 
 const MyBlockVariationPicker = ( { blockName } ) => {
 	const variations = useSelect(
diff --git a/packages/block-editor/src/components/block-variation-picker/content.scss b/packages/block-editor/src/components/block-variation-picker/content.scss
index 882e2748f6c92c..e7dd3e87cb1d55 100644
--- a/packages/block-editor/src/components/block-variation-picker/content.scss
+++ b/packages/block-editor/src/components/block-variation-picker/content.scss
@@ -1,89 +1,39 @@
-.block-editor-block-variation-picker {
-	.components-placeholder__instructions {
-		// Defer to vertical margins applied by template picker options.
-		margin-bottom: 0;
-	}
-
-	.components-placeholder__fieldset {
-		// Options will render horizontally, but the immediate children of the
-		// fieldset are the options and the skip button, oriented vertically.
-		flex-direction: column;
-	}
-
-	&.has-many-variations .components-placeholder__fieldset {
-		// Allow options to occupy a greater amount of the available space if
-		// many options exist.
-		max-width: 90%;
-	}
-}
-
-.block-editor-block-variation-picker__variations.block-editor-block-variation-picker__variations {
+.block-editor-block-variation-picker__variations,
+.block-editor-block-variation-picker__skip,
+.wp-block-group-placeholder__variations {
+	list-style: none;
 	display: flex;
 	justify-content: flex-start;
 	flex-direction: row;
 	flex-wrap: wrap;
 	width: 100%;
-	margin: $grid-unit-20 0;
 	padding: 0;
-	list-style: none;
+	margin: 0;
+	gap: $grid-unit-10;
+	font-size: $helptext-font-size;
 
-	> li {
-		list-style: none;
-		margin: $grid-unit-10 ( $grid-unit-10 + $grid-unit-15 ) 0 0;
-		flex-shrink: 1;
-		width: 75px;
-		text-align: center;
-
-		button {
-			display: inline-flex;
-			margin-right: 0;
-		}
+	svg {
+		fill: $gray-600 !important;
 	}
 
-	.block-editor-block-variation-picker__variation {
-		padding: $grid-unit-10;
+	.components-button {
+		padding: 4px;
 	}
 
-	.block-editor-block-variation-picker__variation-label {
-		font-family: $default-font;
-		font-size: 12px;
-		display: block;
-		line-height: 1.4;
+	.components-button:hover {
+		background: none !important; // !important to simplify the selector.
 	}
-}
 
-.block-editor-block-variation-picker__variation {
-	width: 100%;
-
-	&.components-button.has-icon {
-		// Override default styles inherited from <Button /> to center
-		// icon horizontally.
-		justify-content: center;
-		width: auto;
-
-		&.is-secondary {
-			background-color: $white;
-		}
-	}
-
-	&.components-button {
-		// Override default styles inherited from <Button /> to allow button
-		// to grow vertically.
-		height: auto;
-		padding: 0;
-	}
-
-	&::before {
-		// Use `padding-bottom` trick to style element as perfect square.
-		content: "";
-		padding-bottom: 100%;
-	}
-
-	&:first-child {
-		margin-left: 0;
+	.components-button:hover svg {
+		fill: var(--wp-admin-theme-color) !important;
 	}
 
-	&:last-child {
-		margin-right: 0;
+	& > li {
+		width: auto;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: $grid-unit-05;
 	}
 }
+
diff --git a/packages/block-editor/src/components/block-variation-picker/index.js b/packages/block-editor/src/components/block-variation-picker/index.js
index 6fbad1aab612d3..f3687a305e84fd 100644
--- a/packages/block-editor/src/components/block-variation-picker/index.js
+++ b/packages/block-editor/src/components/block-variation-picker/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -13,12 +13,12 @@ import { layout } from '@wordpress/icons';
 function BlockVariationPicker( {
 	icon = layout,
 	label = __( 'Choose variation' ),
-	instructions = __( 'Select a variation to start with.' ),
+	instructions = __( 'Select a variation to start with:' ),
 	variations,
 	onSelect,
 	allowSkip,
 } ) {
-	const classes = classnames( 'block-editor-block-variation-picker', {
+	const classes = clsx( 'block-editor-block-variation-picker', {
 		'has-many-variations': variations.length > 4,
 	} );
 
@@ -42,7 +42,8 @@ function BlockVariationPicker( {
 				{ variations.map( ( variation ) => (
 					<li key={ variation.name }>
 						<Button
-							variant="secondary"
+							__next40pxDefaultSize
+							variant="tertiary"
 							icon={
 								variation.icon && variation.icon.src
 									? variation.icon.src
@@ -62,7 +63,11 @@ function BlockVariationPicker( {
 			{ /* eslint-enable jsx-a11y/no-redundant-roles */ }
 			{ allowSkip && (
 				<div className="block-editor-block-variation-picker__skip">
-					<Button variant="link" onClick={ () => onSelect() }>
+					<Button
+						__next40pxDefaultSize
+						variant="link"
+						onClick={ () => onSelect() }
+					>
 						{ __( 'Skip' ) }
 					</Button>
 				</div>
diff --git a/packages/block-editor/src/components/block-variation-transforms/README.md b/packages/block-editor/src/components/block-variation-transforms/README.md
index 0eb016d493207a..c9edc9dd1639fe 100644
--- a/packages/block-editor/src/components/block-variation-transforms/README.md
+++ b/packages/block-editor/src/components/block-variation-transforms/README.md
@@ -4,11 +4,6 @@ This component allows to display the selected block's variations which have the
 
 By selecting such a variation an update to the selected block's attributes happen, based on the variation's attributes.
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/block-variation-transforms/index.js b/packages/block-editor/src/components/block-variation-transforms/index.js
index 4c90009ea00006..5850fc52b37b68 100644
--- a/packages/block-editor/src/components/block-variation-transforms/index.js
+++ b/packages/block-editor/src/components/block-variation-transforms/index.js
@@ -8,6 +8,8 @@ import {
 	DropdownMenu,
 	MenuGroup,
 	MenuItemsChoice,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
 	VisuallyHidden,
 } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
@@ -19,6 +21,7 @@ import { chevronDown } from '@wordpress/icons';
  */
 import BlockIcon from '../block-icon';
 import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
 function VariationsButtons( {
 	className,
@@ -33,6 +36,8 @@ function VariationsButtons( {
 			</VisuallyHidden>
 			{ variations.map( ( variation ) => (
 				<Button
+					__next40pxDefaultSize
+					size="compact"
 					key={ variation.name }
 					icon={ <BlockIcon icon={ variation.icon } showColors /> }
 					isPressed={ selectedValue === variation.name }
@@ -95,21 +100,69 @@ function VariationsDropdown( {
 	);
 }
 
+function VariationsToggleGroupControl( {
+	className,
+	onSelectVariation,
+	selectedValue,
+	variations,
+} ) {
+	return (
+		<div className={ className }>
+			<ToggleGroupControl
+				label={ __( 'Transform to variation' ) }
+				value={ selectedValue }
+				hideLabelFromVision
+				onChange={ onSelectVariation }
+				__next40pxDefaultSize
+				__nextHasNoMarginBottom
+			>
+				{ variations.map( ( variation ) => (
+					<ToggleGroupControlOptionIcon
+						key={ variation.name }
+						icon={
+							<BlockIcon icon={ variation.icon } showColors />
+						}
+						value={ variation.name }
+						label={
+							selectedValue === variation.name
+								? variation.title
+								: sprintf(
+										/* translators: %s: Name of the block variation */
+										__( 'Transform to %s' ),
+										variation.title
+								  )
+						}
+					/>
+				) ) }
+			</ToggleGroupControl>
+		</div>
+	);
+}
+
 function __experimentalBlockVariationTransforms( { blockClientId } ) {
 	const { updateBlockAttributes } = useDispatch( blockEditorStore );
-	const { activeBlockVariation, variations } = useSelect(
+	const { activeBlockVariation, variations, isContentOnly } = useSelect(
 		( select ) => {
 			const { getActiveBlockVariation, getBlockVariations } =
 				select( blocksStore );
-			const { getBlockName, getBlockAttributes } =
+
+			const { getBlockName, getBlockAttributes, getBlockEditingMode } =
 				select( blockEditorStore );
+
 			const name = blockClientId && getBlockName( blockClientId );
+
+			const { hasContentRoleAttribute } = unlock( select( blocksStore ) );
+			const isContentBlock = hasContentRoleAttribute( name );
+
 			return {
 				activeBlockVariation: getActiveBlockVariation(
 					name,
 					getBlockAttributes( blockClientId )
 				),
 				variations: name && getBlockVariations( name, 'transform' ),
+				isContentOnly:
+					getBlockEditingMode( blockClientId ) === 'contentOnly' &&
+					! isContentBlock,
 			};
 		},
 		[ blockClientId ]
@@ -138,12 +191,20 @@ function __experimentalBlockVariationTransforms( { blockClientId } ) {
 		} );
 	};
 
+	if ( ! variations?.length || isContentOnly ) {
+		return null;
+	}
+
 	const baseClass = 'block-editor-block-variation-transforms';
 
-	// Skip rendering if there are no variations
-	if ( ! variations?.length ) return null;
+	// Show buttons if there are more than 5 variations because the ToggleGroupControl does not wrap
+	const showButtons = variations.length > 5;
+
+	const ButtonComponent = showButtons
+		? VariationsButtons
+		: VariationsToggleGroupControl;
 
-	const Component = hasUniqueIcons ? VariationsButtons : VariationsDropdown;
+	const Component = hasUniqueIcons ? ButtonComponent : VariationsDropdown;
 
 	return (
 		<Component
diff --git a/packages/block-editor/src/components/block-variation-transforms/style.scss b/packages/block-editor/src/components/block-variation-transforms/style.scss
index b828bc6020bfbe..b8d2a1d4649fa0 100644
--- a/packages/block-editor/src/components/block-variation-transforms/style.scss
+++ b/packages/block-editor/src/components/block-variation-transforms/style.scss
@@ -3,8 +3,8 @@
 	width: 100%;
 
 	.components-dropdown-menu__toggle {
-		border: 1px solid $gray-700;
-		border-radius: $radius-block-ui;
+		border: $border-width solid $gray-700;
+		border-radius: $radius-small;
 		min-height: 30px;
 		width: 100%;
 		position: relative;
diff --git a/packages/block-editor/src/components/block-vertical-alignment-control/icons.js b/packages/block-editor/src/components/block-vertical-alignment-control/icons.js
deleted file mode 100644
index b5c283ffef37db..00000000000000
--- a/packages/block-editor/src/components/block-vertical-alignment-control/icons.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/components';
-
-export const alignBottom = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M15 4H9v11h6V4zM4 18.5V20h16v-1.5H4z" />
-	</SVG>
-);
-
-export const alignCenter = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M20 11h-5V4H9v7H4v1.5h5V20h6v-7.5h5z" />
-	</SVG>
-);
-
-export const alignTop = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M9 20h6V9H9v11zM4 4v1.5h16V4H4z" />
-	</SVG>
-);
-
-export const alignStretch = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M4 4L20 4L20 5.5L4 5.5L4 4ZM10 7L14 7L14 17L10 17L10 7ZM20 18.5L4 18.5L4 20L20 20L20 18.5Z" />
-	</SVG>
-);
-
-export const spaceBetween = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M7 4H17V8L7 8V4ZM7 16L17 16V20L7 20V16ZM20 11.25H4V12.75H20V11.25Z" />
-	</SVG>
-);
diff --git a/packages/block-editor/src/components/block-vertical-alignment-control/ui.js b/packages/block-editor/src/components/block-vertical-alignment-control/ui.js
index d1cacadf0cc49c..26340aa9179d82 100644
--- a/packages/block-editor/src/components/block-vertical-alignment-control/ui.js
+++ b/packages/block-editor/src/components/block-vertical-alignment-control/ui.js
@@ -3,37 +3,33 @@
  */
 import { _x } from '@wordpress/i18n';
 import { ToolbarGroup, ToolbarDropdownMenu } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
 import {
-	alignTop,
-	alignCenter,
-	alignBottom,
-	alignStretch,
-	spaceBetween,
-} from './icons';
+	justifyTop,
+	justifyCenterVertical,
+	justifyBottom,
+	justifyStretchVertical,
+	justifySpaceBetweenVertical,
+} from '@wordpress/icons';
 
 const BLOCK_ALIGNMENTS_CONTROLS = {
 	top: {
-		icon: alignTop,
+		icon: justifyTop,
 		title: _x( 'Align top', 'Block vertical alignment setting' ),
 	},
 	center: {
-		icon: alignCenter,
+		icon: justifyCenterVertical,
 		title: _x( 'Align middle', 'Block vertical alignment setting' ),
 	},
 	bottom: {
-		icon: alignBottom,
+		icon: justifyBottom,
 		title: _x( 'Align bottom', 'Block vertical alignment setting' ),
 	},
 	stretch: {
-		icon: alignStretch,
+		icon: justifyStretchVertical,
 		title: _x( 'Stretch to fill', 'Block vertical alignment setting' ),
 	},
 	'space-between': {
-		icon: spaceBetween,
+		icon: justifySpaceBetweenVertical,
 		title: _x( 'Space between', 'Block vertical alignment setting' ),
 	},
 };
diff --git a/packages/block-editor/src/components/border-radius-control/all-input-control.js b/packages/block-editor/src/components/border-radius-control/all-input-control.js
index 27256f03547f03..14abf3c6c2bc94 100644
--- a/packages/block-editor/src/components/border-radius-control/all-input-control.js
+++ b/packages/block-editor/src/components/border-radius-control/all-input-control.js
@@ -61,7 +61,7 @@ export default function AllInputControl( {
 			onChange={ handleOnChange }
 			onUnitChange={ handleOnUnitChange }
 			placeholder={ allPlaceholder }
-			size={ '__unstable-large' }
+			size="__unstable-large"
 		/>
 	);
 }
diff --git a/packages/block-editor/src/components/border-radius-control/index.js b/packages/block-editor/src/components/border-radius-control/index.js
index 4c614084a7e200..cab9b87b3b29c0 100644
--- a/packages/block-editor/src/components/border-radius-control/index.js
+++ b/packages/block-editor/src/components/border-radius-control/index.js
@@ -104,6 +104,7 @@ export default function BorderRadiusControl( { onChange, values } ) {
 							units={ units }
 						/>
 						<RangeControl
+							__next40pxDefaultSize
 							label={ __( 'Border radius' ) }
 							hideLabelFromVision
 							className="components-border-radius-control__range-control"
diff --git a/packages/block-editor/src/components/border-radius-control/input-controls.js b/packages/block-editor/src/components/border-radius-control/input-controls.js
index c0c5c672d6364f..4529c00b997ac7 100644
--- a/packages/block-editor/src/components/border-radius-control/input-controls.js
+++ b/packages/block-editor/src/components/border-radius-control/input-controls.js
@@ -80,7 +80,7 @@ export default function BoxInputControls( {
 								onUnitChange={ createHandleOnUnitChange(
 									corner
 								) }
-								size={ '__unstable-large' }
+								size="__unstable-large"
 							/>
 						</div>
 					</Tooltip>
diff --git a/packages/block-editor/src/components/border-radius-control/linked-button.js b/packages/block-editor/src/components/border-radius-control/linked-button.js
index 5d8443e57629e2..58afe350b72126 100644
--- a/packages/block-editor/src/components/border-radius-control/linked-button.js
+++ b/packages/block-editor/src/components/border-radius-control/linked-button.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Button, Tooltip } from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { link, linkOff } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 
@@ -9,15 +9,13 @@ export default function LinkedButton( { isLinked, ...props } ) {
 	const label = isLinked ? __( 'Unlink radii' ) : __( 'Link radii' );
 
 	return (
-		<Tooltip text={ label }>
-			<Button
-				{ ...props }
-				className="component-border-radius-control__linked-button"
-				isSmall
-				icon={ isLinked ? link : linkOff }
-				iconSize={ 24 }
-				aria-label={ label }
-			/>
-		</Tooltip>
+		<Button
+			{ ...props }
+			className="component-border-radius-control__linked-button"
+			size="small"
+			icon={ isLinked ? link : linkOff }
+			iconSize={ 24 }
+			label={ label }
+		/>
 	);
 }
diff --git a/packages/block-editor/src/components/border-radius-control/style.scss b/packages/block-editor/src/components/border-radius-control/style.scss
index c94dfbbd0a8fdb..18360cf3162ab1 100644
--- a/packages/block-editor/src/components/border-radius-control/style.scss
+++ b/packages/block-editor/src/components/border-radius-control/style.scss
@@ -20,16 +20,6 @@
 		.components-border-radius-control__range-control {
 			flex: 1;
 			margin-right: $grid-unit-15;
-
-			> div {
-				height: 40px;
-				display: flex;
-				align-items: center;
-			}
-		}
-
-		> span {
-			flex: 0 0 auto;
 		}
 	}
 
diff --git a/packages/block-editor/src/components/button-block-appender/content.scss b/packages/block-editor/src/components/button-block-appender/content.scss
index 50d93234b93f5b..f5486d3f6f6086 100644
--- a/packages/block-editor/src/components/button-block-appender/content.scss
+++ b/packages/block-editor/src/components/button-block-appender/content.scss
@@ -8,11 +8,6 @@
 	color: $gray-900;
 	box-shadow: inset 0 0 0 $border-width $gray-900;
 
-	// Needs specificity to override button styles.
-	&.components-button.components-button {
-		padding: $grid-unit-15;
-	}
-
 	.is-dark-theme & {
 		color: $light-gray-placeholder;
 		box-shadow: inset 0 0 0 $border-width $light-gray-placeholder;
@@ -52,11 +47,14 @@
 			left: 0;
 			pointer-events: none;
 			border: $border-width dashed currentColor;
-			@include placeholder-style();
 		}
 
 		.block-editor-inserter {
-			visibility: hidden;
+			opacity: 0;
+
+			&:focus-within {
+				opacity: 1;
+			}
 		}
 
 		&.is-drag-over {
diff --git a/packages/block-editor/src/components/button-block-appender/index.js b/packages/block-editor/src/components/button-block-appender/index.js
index a1b568c99474ac..53b15e2fd2cfdd 100644
--- a/packages/block-editor/src/components/button-block-appender/index.js
+++ b/packages/block-editor/src/components/button-block-appender/index.js
@@ -1,13 +1,13 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { Button, Tooltip, VisuallyHidden } from '@wordpress/components';
-import { forwardRef } from '@wordpress/element';
+import { Button } from '@wordpress/components';
+import { forwardRef, useRef } from '@wordpress/element';
 import { _x, sprintf } from '@wordpress/i18n';
 import { Icon, plus } from '@wordpress/icons';
 import deprecated from '@wordpress/deprecated';
@@ -16,16 +16,26 @@ import deprecated from '@wordpress/deprecated';
  * Internal dependencies
  */
 import Inserter from '../inserter';
+import { useMergeRefs } from '@wordpress/compose';
 
 function ButtonBlockAppender(
-	{ rootClientId, className, onFocus, tabIndex },
+	{ rootClientId, className, onFocus, tabIndex, onSelect },
 	ref
 ) {
+	const inserterButtonRef = useRef();
+
+	const mergedInserterButtonRef = useMergeRefs( [ inserterButtonRef, ref ] );
 	return (
 		<Inserter
 			position="bottom center"
 			rootClientId={ rootClientId }
 			__experimentalIsQuick
+			onSelectOrClose={ ( ...args ) => {
+				if ( onSelect && typeof onSelect === 'function' ) {
+					onSelect( ...args );
+				}
+				inserterButtonRef.current?.focus();
+			} }
 			renderToggle={ ( {
 				onToggle,
 				disabled,
@@ -33,49 +43,43 @@ function ButtonBlockAppender(
 				blockTitle,
 				hasSingleBlockType,
 			} ) => {
-				let label;
-				if ( hasSingleBlockType ) {
-					label = sprintf(
-						// translators: %s: the name of the block when there is only one
-						_x( 'Add %s', 'directly add the only allowed block' ),
-						blockTitle
-					);
-				} else {
-					label = _x(
-						'Add block',
-						'Generic label for block inserter button'
-					);
-				}
 				const isToggleButton = ! hasSingleBlockType;
+				const label = hasSingleBlockType
+					? sprintf(
+							// translators: %s: the name of the block when there is only one
+							_x(
+								'Add %s',
+								'directly add the only allowed block'
+							),
+							blockTitle
+					  )
+					: _x(
+							'Add block',
+							'Generic label for block inserter button'
+					  );
 
-				let inserterButton = (
+				return (
 					<Button
-						ref={ ref }
+						__next40pxDefaultSize
+						ref={ mergedInserterButtonRef }
 						onFocus={ onFocus }
 						tabIndex={ tabIndex }
-						className={ classnames(
+						className={ clsx(
 							className,
 							'block-editor-button-block-appender'
 						) }
 						onClick={ onToggle }
 						aria-haspopup={ isToggleButton ? 'true' : undefined }
 						aria-expanded={ isToggleButton ? isOpen : undefined }
+						// Disable reason: There shouldn't be a case where this button is disabled but not visually hidden.
+						// eslint-disable-next-line no-restricted-syntax
 						disabled={ disabled }
 						label={ label }
+						showTooltip
 					>
-						{ ! hasSingleBlockType && (
-							<VisuallyHidden as="span">{ label }</VisuallyHidden>
-						) }
 						<Icon icon={ plus } />
 					</Button>
 				);
-
-				if ( isToggleButton || hasSingleBlockType ) {
-					inserterButton = (
-						<Tooltip text={ label }>{ inserterButton }</Tooltip>
-					);
-				}
-				return inserterButton;
 			} }
 			isAppender
 		/>
diff --git a/packages/block-editor/src/components/button-block-appender/index.native.js b/packages/block-editor/src/components/button-block-appender/index.native.js
index ff6391278d0a0b..ba510d07af659b 100644
--- a/packages/block-editor/src/components/button-block-appender/index.native.js
+++ b/packages/block-editor/src/components/button-block-appender/index.native.js
@@ -9,6 +9,7 @@ import { View } from 'react-native';
 import { withPreferredColorScheme } from '@wordpress/compose';
 import { Button } from '@wordpress/components';
 import { Icon, plusCircleFilled } from '@wordpress/icons';
+import { useCallback } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -23,6 +24,20 @@ function ButtonBlockAppender( {
 	isFloating = false,
 	onAddBlock,
 } ) {
+	const onAppenderPress = useCallback(
+		( onToggle ) => () => {
+			if ( onAddBlock ) {
+				onAddBlock();
+				return;
+			}
+
+			if ( onToggle ) {
+				onToggle();
+			}
+		},
+		[ onAddBlock ]
+	);
+
 	const appenderStyle = {
 		...styles.appender,
 		...getStylesFromColorScheme(
@@ -44,7 +59,7 @@ function ButtonBlockAppender( {
 				renderToggle={ ( { onToggle, disabled, isOpen } ) => (
 					<Button
 						testID="appender-button"
-						onClick={ onAddBlock || onToggle }
+						onClick={ onAppenderPress( onToggle ) }
 						aria-expanded={ isOpen }
 						disabled={ disabled }
 						fixedRatio={ false }
diff --git a/packages/block-editor/src/components/caption/README.md b/packages/block-editor/src/components/caption/README.md
index d1f8bcddaaceda..c8cf4ebe8701dd 100644
--- a/packages/block-editor/src/components/caption/README.md
+++ b/packages/block-editor/src/components/caption/README.md
@@ -4,11 +4,6 @@ The `Caption` component renders the [caption part](https://wordpress.org/documen
 
 This component encapsulates the "caption" behaviour and styles over a `<RichText>` so it can be used in other components such as the `BlockCaption` component.
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/caption/index.native.js b/packages/block-editor/src/components/caption/index.native.js
index a1067de655430c..3f944ff5aafa73 100644
--- a/packages/block-editor/src/components/caption/index.native.js
+++ b/packages/block-editor/src/components/caption/index.native.js
@@ -53,7 +53,7 @@ const Caption = ( {
 			__unstableOnSplitAtEnd={ () =>
 				insertBlocksAfter( createBlock( 'core/paragraph' ) )
 			}
-			deleteEnter={ true }
+			deleteEnter
 		/>
 	</View>
 );
diff --git a/packages/block-editor/src/components/child-layout-control/index.js b/packages/block-editor/src/components/child-layout-control/index.js
index 10dffa0eeed8de..022acf2e1074a4 100644
--- a/packages/block-editor/src/components/child-layout-control/index.js
+++ b/packages/block-editor/src/components/child-layout-control/index.js
@@ -5,9 +5,22 @@ import {
 	__experimentalToggleGroupControl as ToggleGroupControl,
 	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 	__experimentalUnitControl as UnitControl,
+	__experimentalInputControl as InputControl,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	__experimentalToolsPanelItem as ToolsPanelItem,
+	Flex,
+	FlexItem,
 } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 import { useEffect } from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { useGetNumberOfBlocksBeforeCell } from '../grid/use-get-number-of-blocks-before-cell';
+import { store as blockEditorStore } from '../../store';
 
 function helpText( selfStretch, parentLayout ) {
 	const { orientation = 'horizontal' } = parentLayout;
@@ -26,19 +39,71 @@ function helpText( selfStretch, parentLayout ) {
 /**
  * Form to edit the child layout value.
  *
- * @param {Object}   props              Props.
- * @param {Object}   props.value        The child layout value.
- * @param {Function} props.onChange     Function to update the child layout value.
- * @param {Object}   props.parentLayout The parent layout value.
+ * @param {Object}   props                  Props.
+ * @param {Object}   props.value            The child layout value.
+ * @param {Function} props.onChange         Function to update the child layout value.
+ * @param {Object}   props.parentLayout     The parent layout value.
  *
+ * @param {boolean}  props.isShownByDefault
+ * @param {string}   props.panelId
  * @return {Element} child layout edit element.
  */
 export default function ChildLayoutControl( {
 	value: childLayout = {},
 	onChange,
 	parentLayout,
+	isShownByDefault,
+	panelId,
+} ) {
+	const {
+		type: parentType,
+		default: { type: defaultParentType = 'default' } = {},
+	} = parentLayout ?? {};
+	const parentLayoutType = parentType || defaultParentType;
+
+	if ( parentLayoutType === 'flex' ) {
+		return (
+			<FlexControls
+				childLayout={ childLayout }
+				onChange={ onChange }
+				parentLayout={ parentLayout }
+				isShownByDefault={ isShownByDefault }
+				panelId={ panelId }
+			/>
+		);
+	} else if ( parentLayoutType === 'grid' ) {
+		return (
+			<GridControls
+				childLayout={ childLayout }
+				onChange={ onChange }
+				parentLayout={ parentLayout }
+				isShownByDefault={ isShownByDefault }
+				panelId={ panelId }
+			/>
+		);
+	}
+
+	return null;
+}
+
+function FlexControls( {
+	childLayout,
+	onChange,
+	parentLayout,
+	isShownByDefault,
+	panelId,
 } ) {
 	const { selfStretch, flexSize } = childLayout;
+	const { orientation = 'horizontal' } = parentLayout ?? {};
+	const hasFlexValue = () => !! selfStretch;
+	const flexResetLabel =
+		orientation === 'horizontal' ? __( 'Width' ) : __( 'Height' );
+	const resetFlex = () => {
+		onChange( {
+			selfStretch: undefined,
+			flexSize: undefined,
+		} );
+	};
 
 	useEffect( () => {
 		if ( selfStretch === 'fixed' && ! flexSize ) {
@@ -50,57 +115,242 @@ export default function ChildLayoutControl( {
 	}, [] );
 
 	return (
-		<>
+		<VStack
+			as={ ToolsPanelItem }
+			spacing={ 2 }
+			hasValue={ hasFlexValue }
+			label={ flexResetLabel }
+			onDeselect={ resetFlex }
+			isShownByDefault={ isShownByDefault }
+			panelId={ panelId }
+		>
 			<ToggleGroupControl
 				__nextHasNoMarginBottom
-				size={ '__unstable-large' }
+				size="__unstable-large"
 				label={ childLayoutOrientation( parentLayout ) }
 				value={ selfStretch || 'fit' }
 				help={ helpText( selfStretch, parentLayout ) }
 				onChange={ ( value ) => {
 					const newFlexSize = value !== 'fixed' ? null : flexSize;
 					onChange( {
-						...childLayout,
 						selfStretch: value,
 						flexSize: newFlexSize,
 					} );
 				} }
-				isBlock={ true }
+				isBlock
 			>
 				<ToggleGroupControlOption
-					key={ 'fit' }
-					value={ 'fit' }
-					label={ __( 'Fit' ) }
+					key="fit"
+					value="fit"
+					label={ _x(
+						'Fit',
+						'Intrinsic block width in flex layout'
+					) }
 				/>
 				<ToggleGroupControlOption
-					key={ 'fill' }
-					value={ 'fill' }
-					label={ __( 'Fill' ) }
+					key="fill"
+					value="fill"
+					label={ _x(
+						'Grow',
+						'Block with expanding width in flex layout'
+					) }
 				/>
 				<ToggleGroupControlOption
-					key={ 'fixed' }
-					value={ 'fixed' }
-					label={ __( 'Fixed' ) }
+					key="fixed"
+					value="fixed"
+					label={ _x(
+						'Fixed',
+						'Block with fixed width in flex layout'
+					) }
 				/>
 			</ToggleGroupControl>
 			{ selfStretch === 'fixed' && (
 				<UnitControl
-					size={ '__unstable-large' }
+					size="__unstable-large"
 					onChange={ ( value ) => {
 						onChange( {
-							...childLayout,
+							selfStretch,
 							flexSize: value,
 						} );
 					} }
 					value={ flexSize }
+					label={ flexResetLabel }
+					hideLabelFromVision
 				/>
 			) }
-		</>
+		</VStack>
 	);
 }
 
 export function childLayoutOrientation( parentLayout ) {
 	const { orientation = 'horizontal' } = parentLayout;
-
 	return orientation === 'horizontal' ? __( 'Width' ) : __( 'Height' );
 }
+
+function GridControls( {
+	childLayout,
+	onChange,
+	parentLayout,
+	isShownByDefault,
+	panelId,
+} ) {
+	const { columnStart, rowStart, columnSpan, rowSpan } = childLayout;
+	const { columnCount = 3, rowCount } = parentLayout ?? {};
+	const rootClientId = useSelect( ( select ) =>
+		select( blockEditorStore ).getBlockRootClientId( panelId )
+	);
+	const { moveBlocksToPosition, __unstableMarkNextChangeAsNotPersistent } =
+		useDispatch( blockEditorStore );
+	const getNumberOfBlocksBeforeCell = useGetNumberOfBlocksBeforeCell(
+		rootClientId,
+		columnCount
+	);
+	const hasStartValue = () => !! columnStart || !! rowStart;
+	const hasSpanValue = () => !! columnSpan || !! rowSpan;
+	const resetGridStarts = () => {
+		onChange( {
+			columnStart: undefined,
+			rowStart: undefined,
+		} );
+	};
+	const resetGridSpans = () => {
+		onChange( {
+			columnSpan: undefined,
+			rowSpan: undefined,
+		} );
+	};
+
+	return (
+		<>
+			<HStack
+				as={ ToolsPanelItem }
+				hasValue={ hasSpanValue }
+				label={ __( 'Grid span' ) }
+				onDeselect={ resetGridSpans }
+				isShownByDefault={ isShownByDefault }
+				panelId={ panelId }
+			>
+				<InputControl
+					size="__unstable-large"
+					label={ __( 'Column span' ) }
+					type="number"
+					onChange={ ( value ) => {
+						// Don't allow unsetting.
+						const newColumnSpan =
+							value === '' ? 1 : parseInt( value, 10 );
+						onChange( {
+							columnStart,
+							rowStart,
+							rowSpan,
+							columnSpan: newColumnSpan,
+						} );
+					} }
+					value={ columnSpan ?? 1 }
+					min={ 1 }
+				/>
+				<InputControl
+					size="__unstable-large"
+					label={ __( 'Row span' ) }
+					type="number"
+					onChange={ ( value ) => {
+						// Don't allow unsetting.
+						const newRowSpan =
+							value === '' ? 1 : parseInt( value, 10 );
+						onChange( {
+							columnStart,
+							rowStart,
+							columnSpan,
+							rowSpan: newRowSpan,
+						} );
+					} }
+					value={ rowSpan ?? 1 }
+					min={ 1 }
+				/>
+			</HStack>
+			{ window.__experimentalEnableGridInteractivity && columnCount && (
+				// Use Flex with an explicit width on the FlexItem instead of HStack to
+				// work around an issue in webkit where inputs with a max attribute are
+				// sized incorrectly.
+				<Flex
+					as={ ToolsPanelItem }
+					hasValue={ hasStartValue }
+					label={ __( 'Grid placement' ) }
+					onDeselect={ resetGridStarts }
+					isShownByDefault={ false }
+					panelId={ panelId }
+				>
+					<FlexItem style={ { width: '50%' } }>
+						<InputControl
+							size="__unstable-large"
+							label={ __( 'Column' ) }
+							type="number"
+							onChange={ ( value ) => {
+								// Don't allow unsetting.
+								const newColumnStart =
+									value === '' ? 1 : parseInt( value, 10 );
+								onChange( {
+									columnStart: newColumnStart,
+									rowStart,
+									columnSpan,
+									rowSpan,
+								} );
+								__unstableMarkNextChangeAsNotPersistent();
+								moveBlocksToPosition(
+									[ panelId ],
+									rootClientId,
+									rootClientId,
+									getNumberOfBlocksBeforeCell(
+										newColumnStart,
+										rowStart
+									)
+								);
+							} }
+							value={ columnStart ?? 1 }
+							min={ 1 }
+							max={
+								columnCount
+									? columnCount - ( columnSpan ?? 1 ) + 1
+									: undefined
+							}
+						/>
+					</FlexItem>
+					<FlexItem style={ { width: '50%' } }>
+						<InputControl
+							size="__unstable-large"
+							label={ __( 'Row' ) }
+							type="number"
+							onChange={ ( value ) => {
+								// Don't allow unsetting.
+								const newRowStart =
+									value === '' ? 1 : parseInt( value, 10 );
+								onChange( {
+									columnStart,
+									rowStart: newRowStart,
+									columnSpan,
+									rowSpan,
+								} );
+								__unstableMarkNextChangeAsNotPersistent();
+								moveBlocksToPosition(
+									[ panelId ],
+									rootClientId,
+									rootClientId,
+									getNumberOfBlocksBeforeCell(
+										columnStart,
+										newRowStart
+									)
+								);
+							} }
+							value={ rowStart ?? 1 }
+							min={ 1 }
+							max={
+								rowCount
+									? rowCount - ( rowSpan ?? 1 ) + 1
+									: undefined
+							}
+						/>
+					</FlexItem>
+				</Flex>
+			) }
+		</>
+	);
+}
diff --git a/packages/block-editor/src/components/collab/block-comment-icon-slot.js b/packages/block-editor/src/components/collab/block-comment-icon-slot.js
new file mode 100644
index 00000000000000..600db904b28741
--- /dev/null
+++ b/packages/block-editor/src/components/collab/block-comment-icon-slot.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { createSlotFill } from '@wordpress/components';
+
+const { Fill: __unstableCommentIconFill, Slot } = createSlotFill(
+	'__unstableCommentIconFill'
+);
+
+__unstableCommentIconFill.Slot = Slot;
+
+export default __unstableCommentIconFill;
diff --git a/packages/block-editor/src/components/collab/block-comment-icon-toolbar-slot.js b/packages/block-editor/src/components/collab/block-comment-icon-toolbar-slot.js
new file mode 100644
index 00000000000000..dd84b284f082ae
--- /dev/null
+++ b/packages/block-editor/src/components/collab/block-comment-icon-toolbar-slot.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { createSlotFill } from '@wordpress/components';
+
+const { Fill: __unstableCommentIconToolbarFill, Slot } = createSlotFill(
+	'__unstableCommentIconToolbarFill'
+);
+
+__unstableCommentIconToolbarFill.Slot = Slot;
+
+export default __unstableCommentIconToolbarFill;
diff --git a/packages/block-editor/src/components/color-palette/control.js b/packages/block-editor/src/components/color-palette/control.js
index 397c2d85494d06..5b492100adbb86 100644
--- a/packages/block-editor/src/components/color-palette/control.js
+++ b/packages/block-editor/src/components/color-palette/control.js
@@ -14,7 +14,7 @@ export default function ColorPaletteControl( {
 			onColorChange={ onChange }
 			colorValue={ value }
 			gradients={ [] }
-			disableCustomGradients={ true }
+			disableCustomGradients
 		/>
 	);
 }
diff --git a/packages/block-editor/src/components/color-palette/test/__snapshots__/control.js.snap b/packages/block-editor/src/components/color-palette/test/__snapshots__/control.js.snap
index 3942c05ce96f11..3c4cef664a3103 100644
--- a/packages/block-editor/src/components/color-palette/test/__snapshots__/control.js.snap
+++ b/packages/block-editor/src/components/color-palette/test/__snapshots__/control.js.snap
@@ -45,7 +45,7 @@ exports[`ColorPaletteControl matches the snapshot 1`] = `
   font-weight: 500;
   line-height: 1.4;
   text-transform: uppercase;
-  display: inline-block;
+  display: block;
   margin-bottom: calc(4px * 2);
   padding: 0;
 }
@@ -220,8 +220,7 @@ exports[`ColorPaletteControl matches the snapshot 1`] = `
                           aria-label="Color: red"
                           aria-selected="true"
                           class="components-button components-circular-option-picker__option"
-                          data-active-item=""
-                          data-command=""
+                          data-active-item="true"
                           id="components-circular-option-picker-0-0"
                           role="option"
                           style="background-color: rgb(255, 0, 0); color: rgb(255, 0, 0);"
diff --git a/packages/block-editor/src/components/color-palette/test/control.js b/packages/block-editor/src/components/color-palette/test/control.js
index 3a5dcc657a94c4..e1a5529544f791 100644
--- a/packages/block-editor/src/components/color-palette/test/control.js
+++ b/packages/block-editor/src/components/color-palette/test/control.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { render } from '@testing-library/react';
+import { render, waitFor, queryByAttribute } from '@testing-library/react';
 
 /**
  * Internal dependencies
@@ -10,9 +10,22 @@ import ColorPaletteControl from '../control';
 
 const noop = () => {};
 
+async function renderAndValidate( ...renderArgs ) {
+	const view = render( ...renderArgs );
+	await waitFor( () => {
+		const activeButton = queryByAttribute(
+			'data-active-item',
+			view.baseElement,
+			'true'
+		);
+		expect( activeButton ).not.toBeNull();
+	} );
+	return view;
+}
+
 describe( 'ColorPaletteControl', () => {
 	it( 'matches the snapshot', async () => {
-		const { container } = render(
+		const { container } = await renderAndValidate(
 			<ColorPaletteControl
 				label="Test Color"
 				value="#f00"
diff --git a/packages/block-editor/src/components/colors-gradients/control.js b/packages/block-editor/src/components/colors-gradients/control.js
index 51912e0a74e9d1..d6b34876c8eaad 100644
--- a/packages/block-editor/src/components/colors-gradients/control.js
+++ b/packages/block-editor/src/components/colors-gradients/control.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -10,16 +10,18 @@ import { __ } from '@wordpress/i18n';
 import {
 	BaseControl,
 	__experimentalVStack as VStack,
-	TabPanel,
 	ColorPalette,
 	GradientPicker,
+	privateApis as componentsPrivateApis,
 } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import { useSettings } from '../use-settings';
+import { unlock } from '../../lock-unlock';
 
+const { Tabs } = unlock( componentsPrivateApis );
 const colorsAndGradientKeys = [
 	'colors',
 	'disableCustomColors',
@@ -27,18 +29,7 @@ const colorsAndGradientKeys = [
 	'disableCustomGradients',
 ];
 
-const TAB_COLOR = {
-	name: 'color',
-	title: __( 'Solid' ),
-	value: 'color',
-};
-const TAB_GRADIENT = {
-	name: 'gradient',
-	title: __( 'Gradient' ),
-	value: 'gradient',
-};
-
-const TABS_SETTINGS = [ TAB_COLOR, TAB_GRADIENT ];
+const TAB_IDS = { color: 'color', gradient: 'gradient' };
 
 function ColorGradientControlInner( {
 	colors,
@@ -69,7 +60,7 @@ function ColorGradientControlInner( {
 	}
 
 	const tabPanels = {
-		[ TAB_COLOR.value ]: (
+		[ TAB_IDS.color ]: (
 			<ColorPalette
 				value={ colorValue }
 				onChange={
@@ -89,9 +80,8 @@ function ColorGradientControlInner( {
 				headingLevel={ headingLevel }
 			/>
 		),
-		[ TAB_GRADIENT.value ]: (
+		[ TAB_IDS.gradient ]: (
 			<GradientPicker
-				__nextHasNoMargin
 				value={ gradientValue }
 				onChange={
 					canChooseAColor
@@ -120,7 +110,7 @@ function ColorGradientControlInner( {
 	return (
 		<BaseControl
 			__nextHasNoMarginBottom
-			className={ classnames(
+			className={ clsx(
 				'block-editor-color-gradient-control',
 				className
 			) }
@@ -137,22 +127,42 @@ function ColorGradientControlInner( {
 						</legend>
 					) }
 					{ canChooseAColor && canChooseAGradient && (
-						<TabPanel
-							className="block-editor-color-gradient-control__tabs"
-							tabs={ TABS_SETTINGS }
-							initialTabName={
-								gradientValue
-									? TAB_GRADIENT.value
-									: !! canChooseAColor && TAB_COLOR.value
-							}
-						>
-							{ ( tab ) => renderPanelType( tab.value ) }
-						</TabPanel>
+						<div>
+							<Tabs
+								defaultTabId={
+									gradientValue
+										? TAB_IDS.gradient
+										: !! canChooseAColor && TAB_IDS.color
+								}
+							>
+								<Tabs.TabList>
+									<Tabs.Tab tabId={ TAB_IDS.color }>
+										{ __( 'Color' ) }
+									</Tabs.Tab>
+									<Tabs.Tab tabId={ TAB_IDS.gradient }>
+										{ __( 'Gradient' ) }
+									</Tabs.Tab>
+								</Tabs.TabList>
+								<Tabs.TabPanel
+									tabId={ TAB_IDS.color }
+									className="block-editor-color-gradient-control__panel"
+									focusable={ false }
+								>
+									{ tabPanels.color }
+								</Tabs.TabPanel>
+								<Tabs.TabPanel
+									tabId={ TAB_IDS.gradient }
+									className="block-editor-color-gradient-control__panel"
+									focusable={ false }
+								>
+									{ tabPanels.gradient }
+								</Tabs.TabPanel>
+							</Tabs>
+						</div>
 					) }
-					{ ! canChooseAGradient &&
-						renderPanelType( TAB_COLOR.value ) }
-					{ ! canChooseAColor &&
-						renderPanelType( TAB_GRADIENT.value ) }
+
+					{ ! canChooseAGradient && renderPanelType( TAB_IDS.color ) }
+					{ ! canChooseAColor && renderPanelType( TAB_IDS.gradient ) }
 				</VStack>
 			</fieldset>
 		</BaseControl>
diff --git a/packages/block-editor/src/components/colors-gradients/dropdown.js b/packages/block-editor/src/components/colors-gradients/dropdown.js
index eb78b8b29a41ba..71b27c06e7ccfc 100644
--- a/packages/block-editor/src/components/colors-gradients/dropdown.js
+++ b/packages/block-editor/src/components/colors-gradients/dropdown.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -80,7 +80,7 @@ const renderToggle =
 
 		const toggleProps = {
 			onClick: onToggle,
-			className: classnames(
+			className: clsx(
 				'block-editor-panel-color-gradient-settings__dropdown',
 				{ 'is-open': isOpen }
 			),
@@ -88,7 +88,7 @@ const renderToggle =
 		};
 
 		return (
-			<Button { ...toggleProps }>
+			<Button __next40pxDefaultSize { ...toggleProps }>
 				<LabeledColorIndicator
 					colorValue={ colorValue }
 					label={ label }
diff --git a/packages/block-editor/src/components/colors-gradients/panel-color-gradient-settings.js b/packages/block-editor/src/components/colors-gradients/panel-color-gradient-settings.js
index 1ee60a5ccc6040..4e581046585663 100644
--- a/packages/block-editor/src/components/colors-gradients/panel-color-gradient-settings.js
+++ b/packages/block-editor/src/components/colors-gradients/panel-color-gradient-settings.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -61,7 +61,7 @@ export const PanelColorGradientSettingsInner = ( {
 
 	return (
 		<ToolsPanel
-			className={ classnames(
+			className={ clsx(
 				'block-editor-panel-color-gradient-settings',
 				className
 			) }
diff --git a/packages/block-editor/src/components/colors-gradients/style.scss b/packages/block-editor/src/components/colors-gradients/style.scss
index 6cade124b7fe46..fc1b1a4d469033 100644
--- a/packages/block-editor/src/components/colors-gradients/style.scss
+++ b/packages/block-editor/src/components/colors-gradients/style.scss
@@ -15,12 +15,6 @@ $swatch-gap: 12px;
 	min-width: 0;
 }
 
-.block-editor-color-gradient-control__tabs {
-	.block-editor-color-gradient-control__panel {
-		padding: $grid-unit-20;
-	}
-}
-
 .block-editor-panel-color-gradient-settings.block-editor-panel-color-gradient-settings {
 	&,
 	& > div:not(:first-of-type) {
@@ -33,7 +27,6 @@ $swatch-gap: 12px;
 		.components-circular-option-picker__swatches {
 			display: grid;
 			grid-template-columns: repeat(6, $swatch-size);
-			justify-content: space-between;
 		}
 	}
 
@@ -80,15 +73,15 @@ $swatch-gap: 12px;
 	// Identify the first visible instance as placeholder items will not have this class.
 	&:nth-child(1 of &) {
 		margin-top: $grid-unit-30;
-		border-top-left-radius: $radius-block-ui;
-		border-top-right-radius: $radius-block-ui;
+		border-top-left-radius: $radius-small;
+		border-top-right-radius: $radius-small;
 		border-top: 1px solid $gray-300;
 	}
 
 	// Identify the last visible instance as placeholder items will not have this class.
 	&:nth-last-child(1 of &) {
-		border-bottom-left-radius: $radius-block-ui;
-		border-bottom-right-radius: $radius-block-ui;
+		border-bottom-left-radius: $radius-small;
+		border-bottom-right-radius: $radius-small;
 	}
 
 	> div,
diff --git a/packages/block-editor/src/components/colors-gradients/test/control.js b/packages/block-editor/src/components/colors-gradients/test/control.js
index 3c6e4a77b57413..19640d41daeb35 100644
--- a/packages/block-editor/src/components/colors-gradients/test/control.js
+++ b/packages/block-editor/src/components/colors-gradients/test/control.js
@@ -1,7 +1,8 @@
 /**
  * External dependencies
  */
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
+import { render } from '@ariakit/test/react';
 
 /**
  * Internal dependencies
@@ -12,7 +13,7 @@ const noop = () => {};
 
 describe( 'ColorPaletteControl', () => {
 	it( 'renders tabs if it is possible to select a color and a gradient rendering a color picker at the start', async () => {
-		render(
+		await render(
 			<ColorGradientControl
 				label="Test Color Gradient"
 				colorValue="#f00"
@@ -43,7 +44,7 @@ describe( 'ColorPaletteControl', () => {
 
 		// Is showing the two tab buttons.
 		expect(
-			screen.getByRole( 'tab', { name: 'Solid' } )
+			screen.getByRole( 'tab', { name: 'Color' } )
 		).toBeInTheDocument();
 		expect(
 			screen.getByRole( 'tab', { name: 'Gradient' } )
@@ -64,7 +65,7 @@ describe( 'ColorPaletteControl', () => {
 				] }
 				gradients={ [] }
 				disableCustomColors={ false }
-				disableCustomGradients={ true }
+				disableCustomGradients
 				onColorChange={ noop }
 				onGradientChange={ noop }
 			/>
@@ -72,7 +73,7 @@ describe( 'ColorPaletteControl', () => {
 
 		// Is not showing the two tab buttons.
 		expect(
-			screen.queryByRole( 'tab', { name: 'Solid' } )
+			screen.queryByRole( 'tab', { name: 'Color' } )
 		).not.toBeInTheDocument();
 		expect(
 			screen.queryByRole( 'tab', { name: 'Gradient' } )
@@ -102,7 +103,7 @@ describe( 'ColorPaletteControl', () => {
 						slug: 'light-green-cyan-to-vivid-green-cyan',
 					},
 				] }
-				disableCustomColors={ true }
+				disableCustomColors
 				disableCustomGradients={ false }
 				onColorChange={ noop }
 				onGradientChange={ noop }
@@ -111,7 +112,7 @@ describe( 'ColorPaletteControl', () => {
 
 		// Is not showing the two tab buttons.
 		expect(
-			screen.queryByRole( 'tab', { name: 'Solid' } )
+			screen.queryByRole( 'tab', { name: 'Color' } )
 		).not.toBeInTheDocument();
 		expect(
 			screen.queryByRole( 'tab', { name: 'Gradient' } )
diff --git a/packages/block-editor/src/components/colors-gradients/use-multiple-origin-colors-and-gradients.js b/packages/block-editor/src/components/colors-gradients/use-multiple-origin-colors-and-gradients.js
index ee27960529ede3..cfa5930ba7034c 100644
--- a/packages/block-editor/src/components/colors-gradients/use-multiple-origin-colors-and-gradients.js
+++ b/packages/block-editor/src/components/colors-gradients/use-multiple-origin-colors-and-gradients.js
@@ -55,6 +55,7 @@ export default function useMultipleOriginColorsAndGradients() {
 					'Theme',
 					'Indicates this palette comes from the theme.'
 				),
+				slug: 'theme',
 				colors: themeColors,
 			} );
 		}
@@ -68,6 +69,7 @@ export default function useMultipleOriginColorsAndGradients() {
 					'Default',
 					'Indicates this palette comes from WordPress.'
 				),
+				slug: 'default',
 				colors: defaultColors,
 			} );
 		}
@@ -75,8 +77,9 @@ export default function useMultipleOriginColorsAndGradients() {
 			result.push( {
 				name: _x(
 					'Custom',
-					'Indicates this palette comes from the theme.'
+					'Indicates this palette is created by the user.'
 				),
+				slug: 'custom',
 				colors: customColors,
 			} );
 		}
@@ -96,6 +99,7 @@ export default function useMultipleOriginColorsAndGradients() {
 					'Theme',
 					'Indicates this palette comes from the theme.'
 				),
+				slug: 'theme',
 				gradients: themeGradients,
 			} );
 		}
@@ -109,6 +113,7 @@ export default function useMultipleOriginColorsAndGradients() {
 					'Default',
 					'Indicates this palette comes from WordPress.'
 				),
+				slug: 'default',
 				gradients: defaultGradients,
 			} );
 		}
@@ -118,6 +123,7 @@ export default function useMultipleOriginColorsAndGradients() {
 					'Custom',
 					'Indicates this palette is created by the user.'
 				),
+				slug: 'custom',
 				gradients: customGradients,
 			} );
 		}
diff --git a/packages/block-editor/src/components/colors/utils.js b/packages/block-editor/src/components/colors/utils.js
index 1c1947bfc947cc..5ec42a6bae7007 100644
--- a/packages/block-editor/src/components/colors/utils.js
+++ b/packages/block-editor/src/components/colors/utils.js
@@ -5,13 +5,20 @@ import { colord, extend } from 'colord';
 import namesPlugin from 'colord/plugins/names';
 import a11yPlugin from 'colord/plugins/a11y';
 
+/**
+ * WordPress dependencies
+ */
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
+
 /**
  * Internal dependencies
  */
-import { kebabCase } from '../../utils/object';
+import { unlock } from '../../lock-unlock';
 
 extend( [ namesPlugin, a11yPlugin ] );
 
+const { kebabCase } = unlock( componentsPrivateApis );
+
 /**
  * Provided an array of color objects as set by the theme or by the editor defaults,
  * and the values of the defined color or custom color returns a color object describing the color.
diff --git a/packages/block-editor/src/components/colors/with-colors.js b/packages/block-editor/src/components/colors/with-colors.js
index 5946ca90d8bbde..680521fb6519c3 100644
--- a/packages/block-editor/src/components/colors/with-colors.js
+++ b/packages/block-editor/src/components/colors/with-colors.js
@@ -3,6 +3,7 @@
  */
 import { useMemo, Component } from '@wordpress/element';
 import { compose, createHigherOrderComponent } from '@wordpress/compose';
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -14,7 +15,9 @@ import {
 	getMostReadableColor,
 } from './utils';
 import { useSettings } from '../use-settings';
-import { kebabCase } from '../../utils/object';
+import { unlock } from '../../lock-unlock';
+
+const { kebabCase } = unlock( componentsPrivateApis );
 
 /**
  * Capitalizes the first letter in a string.
diff --git a/packages/block-editor/src/components/content-lock/index.js b/packages/block-editor/src/components/content-lock/index.js
new file mode 100644
index 00000000000000..651bf885a7d1e9
--- /dev/null
+++ b/packages/block-editor/src/components/content-lock/index.js
@@ -0,0 +1 @@
+export { ModifyContentLockMenuItem } from './modify-content-lock-menu-item';
diff --git a/packages/block-editor/src/components/content-lock/modify-content-lock-menu-item.js b/packages/block-editor/src/components/content-lock/modify-content-lock-menu-item.js
new file mode 100644
index 00000000000000..18c4d0763cd52d
--- /dev/null
+++ b/packages/block-editor/src/components/content-lock/modify-content-lock-menu-item.js
@@ -0,0 +1,58 @@
+/**
+ * WordPress dependencies
+ */
+import { MenuItem } from '@wordpress/components';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { _x } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+// The implementation of content locking is mainly in this file, although the mechanism
+// to stop temporarily editing as blocks when an outside block is selected is on component StopEditingAsBlocksOnOutsideSelect
+// at block-editor/src/components/block-list/index.js.
+// Besides the components on this file and the file referenced above the implementation
+// also includes artifacts on the store (actions, reducers, and selector).
+
+export function ModifyContentLockMenuItem( { clientId, onClose } ) {
+	const { templateLock, isLockedByParent, isEditingAsBlocks } = useSelect(
+		( select ) => {
+			const {
+				getContentLockingParent,
+				getTemplateLock,
+				getTemporarilyEditingAsBlocks,
+			} = unlock( select( blockEditorStore ) );
+			return {
+				templateLock: getTemplateLock( clientId ),
+				isLockedByParent: !! getContentLockingParent( clientId ),
+				isEditingAsBlocks: getTemporarilyEditingAsBlocks() === clientId,
+			};
+		},
+		[ clientId ]
+	);
+	const blockEditorActions = useDispatch( blockEditorStore );
+	const isContentLocked =
+		! isLockedByParent && templateLock === 'contentOnly';
+	if ( ! isContentLocked && ! isEditingAsBlocks ) {
+		return null;
+	}
+
+	const { modifyContentLockBlock } = unlock( blockEditorActions );
+	const showStartEditingAsBlocks = ! isEditingAsBlocks && isContentLocked;
+
+	return (
+		showStartEditingAsBlocks && (
+			<MenuItem
+				onClick={ () => {
+					modifyContentLockBlock( clientId );
+					onClose();
+				} }
+			>
+				{ _x( 'Modify', 'Unlock content locked blocks' ) }
+			</MenuItem>
+		)
+	);
+}
diff --git a/packages/block-editor/src/components/contrast-checker/README.md b/packages/block-editor/src/components/contrast-checker/README.md
index 6f3b41ecb7d0cf..cb9d18252a04c9 100644
--- a/packages/block-editor/src/components/contrast-checker/README.md
+++ b/packages/block-editor/src/components/contrast-checker/README.md
@@ -6,10 +6,6 @@ ContrastChecker also accounts for font sizes.
 
 A notice will be rendered if the color combination of text and background colors are low.
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-
 ## Developer guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/contrast-checker/style.scss b/packages/block-editor/src/components/contrast-checker/style.scss
deleted file mode 100644
index b3b08d6230d05d..00000000000000
--- a/packages/block-editor/src/components/contrast-checker/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.block-editor-contrast-checker > .components-notice {
-	margin: 0;
-}
diff --git a/packages/block-editor/src/components/contrast-checker/test/index.js b/packages/block-editor/src/components/contrast-checker/test/index.js
index af5c0b62bbc67e..9abd7d7f7e2e6a 100644
--- a/packages/block-editor/src/components/contrast-checker/test/index.js
+++ b/packages/block-editor/src/components/contrast-checker/test/index.js
@@ -221,7 +221,7 @@ describe( 'ContrastChecker', () => {
 			<ContrastChecker
 				backgroundColor="#C44B4B"
 				textColor="#000000"
-				isLargeText={ true }
+				isLargeText
 			/>
 		);
 
@@ -263,7 +263,7 @@ describe( 'ContrastChecker', () => {
 				backgroundColor="#C44B4B"
 				textColor="#000000"
 				fontSize={ 23 }
-				isLargeText={ true }
+				isLargeText
 			/>
 		);
 
@@ -363,7 +363,7 @@ describe( 'ContrastChecker', () => {
 				backgroundColor={ backgroundColor }
 				textColor={ textColor }
 				isLargeText={ isLargeText }
-				enableAlphaChecker={ true }
+				enableAlphaChecker
 			/>
 		);
 
@@ -375,10 +375,10 @@ describe( 'ContrastChecker', () => {
 		render(
 			<ContrastChecker
 				backgroundColor={ backgroundColor }
-				textColor={ 'rgba(0,0,0,0.9)' }
+				textColor="rgba(0,0,0,0.9)"
 				linkColor={ linkColor }
 				isLargeText={ isLargeText }
-				enableAlphaChecker={ true }
+				enableAlphaChecker
 			/>
 		);
 
@@ -396,10 +396,10 @@ describe( 'ContrastChecker', () => {
 		render(
 			<ContrastChecker
 				backgroundColor={ backgroundColor }
-				linkColor={ 'rgba(0,0,0,0.9)' }
+				linkColor="rgba(0,0,0,0.9)"
 				textColor={ textColor }
 				isLargeText={ isLargeText }
-				enableAlphaChecker={ true }
+				enableAlphaChecker
 			/>
 		);
 
@@ -416,11 +416,11 @@ describe( 'ContrastChecker', () => {
 	test( 'should render nothing when the colors meet AA WCAG guidelines but the background color only has alpha transparency with alpha checker enabled.', () => {
 		const { container } = render(
 			<ContrastChecker
-				backgroundColor={ 'rgba(255,255,255,0.7)' }
+				backgroundColor="rgba(255,255,255,0.7)"
 				textColor={ textColor }
 				linkColor={ linkColor }
 				isLargeText={ isLargeText }
-				enableAlphaChecker={ true }
+				enableAlphaChecker
 			/>
 		);
 
@@ -437,7 +437,7 @@ describe( 'ContrastChecker', () => {
 				isLargeText={ isLargeText }
 				fallbackBackgroundColor={ fallbackBackgroundColor }
 				fallbackTextColor={ fallbackTextColor }
-				enableAlphaChecker={ true }
+				enableAlphaChecker
 			/>
 		);
 
@@ -450,11 +450,11 @@ describe( 'ContrastChecker', () => {
 			<ContrastChecker
 				backgroundColor={ colorWithTransparency }
 				textColor={ sameShade }
-				linkColor={ 'rgba(0,0,0,0.9)' }
+				linkColor="rgba(0,0,0,0.9)"
 				isLargeText={ isLargeText }
 				fallbackBackgroundColor={ fallbackBackgroundColor }
 				fallbackTextColor={ fallbackTextColor }
-				enableAlphaChecker={ true }
+				enableAlphaChecker
 			/>
 		);
 
@@ -472,12 +472,12 @@ describe( 'ContrastChecker', () => {
 		render(
 			<ContrastChecker
 				backgroundColor={ sameShade }
-				textColor={ 'rgba(0,0,0,0.9)' }
+				textColor="rgba(0,0,0,0.9)"
 				linkColor={ sameShade }
 				isLargeText={ isLargeText }
 				fallbackBackgroundColor={ fallbackBackgroundColor }
 				fallbackTextColor={ fallbackTextColor }
-				enableAlphaChecker={ true }
+				enableAlphaChecker
 			/>
 		);
 
@@ -494,11 +494,11 @@ describe( 'ContrastChecker', () => {
 	test( 'should render component when the colors meet AA WCAG guidelines but all colors have alpha transparency with alpha checker enabled.', () => {
 		render(
 			<ContrastChecker
-				backgroundColor={ 'rgba(255,255,255,0.7)' }
-				linkColor={ 'rgba(0,0,0,0.7)' }
-				textColor={ 'rgba(0,0,0,0.7)' }
+				backgroundColor="rgba(255,255,255,0.7)"
+				linkColor="rgba(0,0,0,0.7)"
+				textColor="rgba(0,0,0,0.7)"
 				isLargeText={ isLargeText }
-				enableAlphaChecker={ true }
+				enableAlphaChecker
 			/>
 		);
 
diff --git a/packages/block-editor/src/components/convert-to-group-buttons/index.js b/packages/block-editor/src/components/convert-to-group-buttons/index.js
index c2bb3fb25b8452..d2e5fda1e96b7c 100644
--- a/packages/block-editor/src/components/convert-to-group-buttons/index.js
+++ b/packages/block-editor/src/components/convert-to-group-buttons/index.js
@@ -4,7 +4,8 @@
 import { MenuItem } from '@wordpress/components';
 import { _x } from '@wordpress/i18n';
 import { switchToBlockType } from '@wordpress/blocks';
-import { useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { displayShortcut } from '@wordpress/keycodes';
 
 /**
  * Internal dependencies
@@ -22,6 +23,7 @@ function ConvertToGroupButton( {
 	groupingBlockName,
 	onClose = () => {},
 } ) {
+	const { getSelectedBlockClientIds } = useSelect( blockEditorStore );
 	const { replaceBlocks } = useDispatch( blockEditorStore );
 	const onConvertToGroup = () => {
 		// Activate the `transform` on the Grouping Block which does the conversion.
@@ -52,10 +54,17 @@ function ConvertToGroupButton( {
 		return null;
 	}
 
+	const selectedBlockClientIds = getSelectedBlockClientIds();
+
 	return (
 		<>
 			{ isGroupable && (
 				<MenuItem
+					shortcut={
+						selectedBlockClientIds.length > 1
+							? displayShortcut.primary( 'g' )
+							: undefined
+					}
 					onClick={ () => {
 						onConvertToGroup();
 						onClose();
@@ -73,7 +82,7 @@ function ConvertToGroupButton( {
 				>
 					{ _x(
 						'Ungroup',
-						'Ungrouping blocks from within a grouping block back into individual blocks within the Editor '
+						'Ungrouping blocks from within a grouping block back into individual blocks within the Editor'
 					) }
 				</MenuItem>
 			) }
diff --git a/packages/block-editor/src/components/convert-to-group-buttons/toolbar.js b/packages/block-editor/src/components/convert-to-group-buttons/toolbar.js
index 38405fe3ee6abb..b82205d0c46616 100644
--- a/packages/block-editor/src/components/convert-to-group-buttons/toolbar.js
+++ b/packages/block-editor/src/components/convert-to-group-buttons/toolbar.js
@@ -4,7 +4,7 @@
 import { useDispatch, useSelect } from '@wordpress/data';
 import { switchToBlockType, store as blocksStore } from '@wordpress/blocks';
 import { ToolbarButton, ToolbarGroup } from '@wordpress/components';
-import { group, row, stack } from '@wordpress/icons';
+import { group, row, stack, grid } from '@wordpress/icons';
 import { _x } from '@wordpress/i18n';
 
 /**
@@ -17,6 +17,7 @@ const layouts = {
 	group: { type: 'constrained' },
 	row: { type: 'flex', flexWrap: 'nowrap' },
 	stack: { type: 'flex', orientation: 'vertical' },
+	grid: { type: 'grid' },
 };
 
 function BlockGroupToolbar() {
@@ -60,6 +61,7 @@ function BlockGroupToolbar() {
 
 	const onConvertToRow = () => onConvertToGroup( 'row' );
 	const onConvertToStack = () => onConvertToGroup( 'stack' );
+	const onConvertToGrid = () => onConvertToGroup( 'grid' );
 
 	// Don't render the button if the current selection cannot be grouped.
 	// A good example is selecting multiple button blocks within a Buttons block:
@@ -75,28 +77,38 @@ function BlockGroupToolbar() {
 	const canInsertStack = !! variations.find(
 		( { name } ) => name === 'group-stack'
 	);
+	const canInsertGrid = !! variations.find(
+		( { name } ) => name === 'group-grid'
+	);
 
 	return (
 		<ToolbarGroup>
 			<ToolbarButton
 				icon={ group }
-				label={ _x( 'Group', 'verb' ) }
+				label={ _x( 'Group', 'action: convert blocks to group' ) }
 				onClick={ onConvertToGroup }
 			/>
 			{ canInsertRow && (
 				<ToolbarButton
 					icon={ row }
-					label={ _x( 'Row', 'single horizontal line' ) }
+					label={ _x( 'Row', 'action: convert blocks to row' ) }
 					onClick={ onConvertToRow }
 				/>
 			) }
 			{ canInsertStack && (
 				<ToolbarButton
 					icon={ stack }
-					label={ _x( 'Stack', 'verb' ) }
+					label={ _x( 'Stack', 'action: convert blocks to stack' ) }
 					onClick={ onConvertToStack }
 				/>
 			) }
+			{ canInsertGrid && (
+				<ToolbarButton
+					icon={ grid }
+					label={ _x( 'Grid', 'action: convert blocks to grid' ) }
+					onClick={ onConvertToGrid }
+				/>
+			) }
 		</ToolbarGroup>
 	);
 }
diff --git a/packages/block-editor/src/components/copy-handler/README.md b/packages/block-editor/src/components/copy-handler/README.md
index b70c841ce0ea53..1e9883d9a2b3b3 100644
--- a/packages/block-editor/src/components/copy-handler/README.md
+++ b/packages/block-editor/src/components/copy-handler/README.md
@@ -8,16 +8,6 @@ Concretely, it handles the display of success messages and takes care of copying
 
 ![Copy/cut behaviours](https://user-images.githubusercontent.com/150562/81698101-6e341d80-945d-11ea-9bfb-b20781f55033.gif)
 
-## Table of contents
-
-- [Copy Handler](#copy-handler)
-	- [Table of contents](#table-of-contents)
-	- [Development guidelines](#development-guidelines)
-		- [Usage](#usage)
-		- [Props](#props)
-		- [`children`](#children)
-	- [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/date-format-picker/index.js b/packages/block-editor/src/components/date-format-picker/index.js
index 7a2ed46b4a9b04..eb269e03ca5abc 100644
--- a/packages/block-editor/src/components/date-format-picker/index.js
+++ b/packages/block-editor/src/components/date-format-picker/index.js
@@ -2,22 +2,26 @@
  * WordPress dependencies
  */
 import { _x, __ } from '@wordpress/i18n';
-import { dateI18n } from '@wordpress/date';
+import { dateI18n, humanTimeDiff } from '@wordpress/date';
 import { useState, createInterpolateElement } from '@wordpress/element';
 import {
 	TextControl,
 	ExternalLink,
 	VisuallyHidden,
-	CustomSelectControl,
 	ToggleControl,
 	__experimentalVStack as VStack,
+	CustomSelectControl,
 } from '@wordpress/components';
 
-// So that we can illustrate the different formats in the dropdown properly,
-// show a date that has a day greater than 12 and a month with more than three
-// letters. Here we're using 2022-01-25 which is when WordPress 5.9 was
-// released.
-const EXAMPLE_DATE = new Date( 2022, 0, 25 );
+// So that we illustrate the different formats in the dropdown properly, show a date that is
+// somwhat recent, has a day greater than 12, and a month with more than three letters.
+const exampleDate = new Date();
+exampleDate.setDate( 20 );
+exampleDate.setMonth( exampleDate.getMonth() - 3 );
+if ( exampleDate.getMonth() === 4 ) {
+	// May has three letters, so use March.
+	exampleDate.setMonth( 3 );
+}
 
 /**
  * The `DateFormatPicker` component renders controls that let the user choose a
@@ -54,7 +58,7 @@ export default function DateFormatPicker( {
 				label={ __( 'Default format' ) }
 				help={ `${ __( 'Example:' ) }  ${ dateI18n(
 					defaultFormat,
-					EXAMPLE_DATE
+					exampleDate
 				) }` }
 				checked={ ! format }
 				onChange={ ( checked ) =>
@@ -95,29 +99,37 @@ function NonDefaultControls( { format, onChange } ) {
 		] ),
 	];
 
-	const suggestedOptions = suggestedFormats.map(
-		( suggestedFormat, index ) => ( {
+	const suggestedOptions = [
+		...suggestedFormats.map( ( suggestedFormat, index ) => ( {
 			key: `suggested-${ index }`,
-			name: dateI18n( suggestedFormat, EXAMPLE_DATE ),
+			name: dateI18n( suggestedFormat, exampleDate ),
 			format: suggestedFormat,
-		} )
-	);
+		} ) ),
+		{
+			key: 'human-diff',
+			name: humanTimeDiff( exampleDate ),
+			format: 'human-diff',
+		},
+	];
+
 	const customOption = {
 		key: 'custom',
 		name: __( 'Custom' ),
 		className:
 			'block-editor-date-format-picker__custom-format-select-control__custom-option',
-		__experimentalHint: __( 'Enter your own date format' ),
+		hint: __( 'Enter your own date format' ),
 	};
 
 	const [ isCustom, setIsCustom ] = useState(
-		() => !! format && ! suggestedFormats.includes( format )
+		() =>
+			!! format &&
+			! suggestedOptions.some( ( option ) => option.format === format )
 	);
 
 	return (
 		<VStack>
 			<CustomSelectControl
-				__nextUnconstrainedWidth
+				__next40pxDefaultSize
 				label={ __( 'Choose a format' ) }
 				options={ [ ...suggestedOptions, customOption ] }
 				value={
@@ -138,6 +150,7 @@ function NonDefaultControls( { format, onChange } ) {
 			/>
 			{ isCustom && (
 				<TextControl
+					__next40pxDefaultSize
 					__nextHasNoMarginBottom
 					label={ __( 'Custom format' ) }
 					hideLabelFromVision
diff --git a/packages/block-editor/src/components/date-format-picker/style.scss b/packages/block-editor/src/components/date-format-picker/style.scss
index d1ad52408d3502..748e43bb8db94a 100644
--- a/packages/block-editor/src/components/date-format-picker/style.scss
+++ b/packages/block-editor/src/components/date-format-picker/style.scss
@@ -4,13 +4,4 @@
 
 .block-editor-date-format-picker__custom-format-select-control__custom-option {
 	border-top: 1px solid $gray-300;
-
-	&.has-hint {
-		grid-template-columns: auto 30px;
-	}
-
-	.components-custom-select-control__item-hint {
-		grid-row: 2;
-		text-align: left;
-	}
 }
diff --git a/packages/block-editor/src/components/default-block-appender/content.scss b/packages/block-editor/src/components/default-block-appender/content.scss
index 48aac077096c2a..51e0b4381a15d5 100644
--- a/packages/block-editor/src/components/default-block-appender/content.scss
+++ b/packages/block-editor/src/components/default-block-appender/content.scss
@@ -29,12 +29,15 @@
 	// In "constrained" layout containers, the first and last paragraphs have their margins zeroed out.
 	// In the case of this appender, it needs to apply those same rules to avoid layout shifts.
 	// Such shifts happen when the bottom margin of the Title block has been set to less than the default 1em margin of paragraphs.
-	:where(body .is-layout-constrained) & {
-		> :first-child:first-child {
+	:where(body .is-layout-constrained) &,
+	:where(.wp-site-blocks) & {
+		> :first-child {
 			margin-block-start: 0;
+			margin-block-end: 0;
 		}
 
-		// Since this particular appender will only ever appear on an entirely empty document, we don't account for last-child.
+		// Since this appender will only ever appear on an entirely empty document, we don't account for last-child.
+		// This is also because it will never be the last child, the block inserter that sits in this appender is the last child.
 	}
 
 	// Dropzone.
@@ -45,7 +48,6 @@
 	.block-editor-inserter__toggle.components-button.has-icon {
 		// Basic look
 		background: $gray-900;
-		border-radius: $radius-block-ui;
 		color: $white;
 		padding: 0;
 
@@ -98,7 +100,7 @@
 		height: $button-size-small;
 	}
 
-	// @todo: these are currently two separate components. Since we're now
+	// @todo these are currently two separate components. Since we're now
 	// treating them the same, one or both can be retired.
 	.block-editor-inserter__toggle.components-button.has-icon,
 	.block-list-appender__toggle {
@@ -131,7 +133,7 @@
 
 	// These could be avoided by employing a :not(:only-child) on the parent,
 	// but this should be more performant.
-	// @todo: These styles can almost certainly be refactored away we refactor
+	// @todo These styles can almost certainly be refactored away we refactor
 	// the markup and classes of the component itself. The rules provide some
 	// baseline styles for when the block is the only one inside.
 	&:only-child {
diff --git a/packages/block-editor/src/components/default-block-appender/index.js b/packages/block-editor/src/components/default-block-appender/index.js
index 07ce2609d571f9..fbc2c7c08821d4 100644
--- a/packages/block-editor/src/components/default-block-appender/index.js
+++ b/packages/block-editor/src/components/default-block-appender/index.js
@@ -1,15 +1,14 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { compose } from '@wordpress/compose';
 import { decodeEntities } from '@wordpress/html-entities';
-import { withSelect, withDispatch } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { ENTER, SPACE } from '@wordpress/keycodes';
 
 /**
@@ -24,24 +23,49 @@ import { store as blockEditorStore } from '../../store';
  */
 export const ZWNBSP = '\ufeff';
 
-export function DefaultBlockAppender( {
-	isLocked,
-	onAppend,
-	showPrompt,
-	placeholder,
-	rootClientId,
-} ) {
-	if ( isLocked ) {
+export default function DefaultBlockAppender( { rootClientId } ) {
+	const { showPrompt, isLocked, placeholder, isManualGrid } = useSelect(
+		( select ) => {
+			const {
+				getBlockCount,
+				getSettings,
+				getTemplateLock,
+				getBlockAttributes,
+			} = select( blockEditorStore );
+
+			const isEmpty = ! getBlockCount( rootClientId );
+			const { bodyPlaceholder } = getSettings();
+
+			return {
+				showPrompt: isEmpty,
+				isLocked: !! getTemplateLock( rootClientId ),
+				placeholder: bodyPlaceholder,
+				isManualGrid:
+					getBlockAttributes( rootClientId )?.layout
+						?.isManualPlacement,
+			};
+		},
+		[ rootClientId ]
+	);
+
+	const { insertDefaultBlock, startTyping } = useDispatch( blockEditorStore );
+
+	if ( isLocked || isManualGrid ) {
 		return null;
 	}
 
 	const value =
 		decodeEntities( placeholder ) || __( 'Type / to choose a block' );
 
+	const onAppend = () => {
+		insertDefaultBlock( undefined, rootClientId );
+		startTyping();
+	};
+
 	return (
 		<div
 			data-root-client-id={ rootClientId || '' }
-			className={ classnames( 'block-editor-default-block-appender', {
+			className={ clsx( 'block-editor-default-block-appender', {
 				'has-visible-prompt': showPrompt,
 			} ) }
 		>
@@ -76,32 +100,3 @@ export function DefaultBlockAppender( {
 		</div>
 	);
 }
-
-export default compose(
-	withSelect( ( select, ownProps ) => {
-		const { getBlockCount, getSettings, getTemplateLock } =
-			select( blockEditorStore );
-
-		const isEmpty = ! getBlockCount( ownProps.rootClientId );
-		const { bodyPlaceholder } = getSettings();
-
-		return {
-			showPrompt: isEmpty,
-			isLocked: !! getTemplateLock( ownProps.rootClientId ),
-			placeholder: bodyPlaceholder,
-		};
-	} ),
-	withDispatch( ( dispatch, ownProps ) => {
-		const { insertDefaultBlock, startTyping } =
-			dispatch( blockEditorStore );
-
-		return {
-			onAppend() {
-				const { rootClientId } = ownProps;
-
-				insertDefaultBlock( undefined, rootClientId );
-				startTyping();
-			},
-		};
-	} )
-)( DefaultBlockAppender );
diff --git a/packages/block-editor/src/components/default-block-appender/test/index.js b/packages/block-editor/src/components/default-block-appender/test/index.js
index d8c993ee426679..7495620594ac1a 100644
--- a/packages/block-editor/src/components/default-block-appender/test/index.js
+++ b/packages/block-editor/src/components/default-block-appender/test/index.js
@@ -7,26 +7,36 @@ import userEvent from '@testing-library/user-event';
 /**
  * Internal dependencies
  */
-import { DefaultBlockAppender, ZWNBSP } from '../';
+import DefaultBlockAppender, { ZWNBSP } from '../';
+import * as blockEditorActions from '../../../store/actions';
+import * as blockEditorSelectors from '../../../store/selectors';
+jest.mock( '../../../store/actions', () => {
+	const actions = jest.requireActual( '../../../store/actions' );
+	return {
+		...actions,
+		startTyping: jest.fn( actions.startTyping ),
+	};
+} );
+jest.mock( '../../../store/selectors', () => {
+	const selectors = jest.requireActual( '../../../store/selectors' );
+	return {
+		...selectors,
+		getBlockCount: jest.fn( selectors.getBlockCount ),
+	};
+} );
 
 describe( 'DefaultBlockAppender', () => {
 	it( 'should match snapshot', () => {
-		const onAppend = jest.fn();
-
-		const { container } = render(
-			<DefaultBlockAppender onAppend={ onAppend } showPrompt />
-		);
+		const { container } = render( <DefaultBlockAppender /> );
 
 		expect( container ).toMatchSnapshot();
 	} );
 
 	it( 'should append a default block when input focused', async () => {
+		const startTyping = jest.spyOn( blockEditorActions, 'startTyping' );
 		const user = userEvent.setup();
-		const onAppend = jest.fn();
 
-		const { container } = render(
-			<DefaultBlockAppender onAppend={ onAppend } showPrompt />
-		);
+		const { container } = render( <DefaultBlockAppender /> );
 
 		await user.click(
 			screen.getByRole( 'button', { name: 'Add default block' } )
@@ -35,17 +45,15 @@ describe( 'DefaultBlockAppender', () => {
 		expect( container ).toMatchSnapshot();
 
 		// Called once for focusing and once for clicking.
-		expect( onAppend ).toHaveBeenCalledTimes( 2 );
-		expect( onAppend ).toHaveBeenCalledWith();
+		expect( startTyping ).toHaveBeenCalledTimes( 2 );
+		expect( startTyping ).toHaveBeenCalledWith();
 	} );
 
 	it( 'should optionally show without prompt', async () => {
+		blockEditorSelectors.getBlockCount.mockImplementation( () => 1 );
 		const user = userEvent.setup();
-		const onAppend = jest.fn();
 
-		const { container } = render(
-			<DefaultBlockAppender onAppend={ onAppend } showPrompt={ false } />
-		);
+		const { container } = render( <DefaultBlockAppender /> );
 
 		const appender = screen.getByRole( 'button', {
 			name: 'Add default block',
diff --git a/packages/block-editor/src/components/default-style-picker/index.js b/packages/block-editor/src/components/default-style-picker/index.js
deleted file mode 100644
index 0f3190a7a24f72..00000000000000
--- a/packages/block-editor/src/components/default-style-picker/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { store as blocksStore } from '@wordpress/blocks';
-import { useMemo, useCallback } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { SelectControl } from '@wordpress/components';
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../store';
-import { getDefaultStyle } from '../block-styles/utils';
-
-export default function DefaultStylePicker( { blockName } ) {
-	const { preferredStyle, onUpdatePreferredStyleVariations, styles } =
-		useSelect(
-			( select ) => {
-				const settings = select( blockEditorStore ).getSettings();
-				const preferredStyleVariations =
-					settings.__experimentalPreferredStyleVariations;
-				return {
-					preferredStyle:
-						preferredStyleVariations?.value?.[ blockName ],
-					onUpdatePreferredStyleVariations:
-						preferredStyleVariations?.onChange ?? null,
-					styles: select( blocksStore ).getBlockStyles( blockName ),
-				};
-			},
-			[ blockName ]
-		);
-	const selectOptions = useMemo(
-		() => [
-			{ label: __( 'Not set' ), value: '' },
-			...styles.map( ( { label, name } ) => ( { label, value: name } ) ),
-		],
-		[ styles ]
-	);
-	const defaultStyleName = useMemo(
-		() => getDefaultStyle( styles )?.name,
-		[ styles ]
-	);
-	const selectOnChange = useCallback(
-		( blockStyle ) => {
-			onUpdatePreferredStyleVariations( blockName, blockStyle );
-		},
-		[ blockName, onUpdatePreferredStyleVariations ]
-	);
-
-	// Until the functionality is migrated to global styles,
-	// only show the default style picker if a non-default style has already been selected.
-	if ( ! preferredStyle || preferredStyle === defaultStyleName ) {
-		return null;
-	}
-
-	return (
-		onUpdatePreferredStyleVariations && (
-			<div className="default-style-picker__default-switcher">
-				<SelectControl
-					__nextHasNoMarginBottom
-					options={ selectOptions }
-					value={ preferredStyle || '' }
-					label={ __( 'Default Style' ) }
-					onChange={ selectOnChange }
-				/>
-			</div>
-		)
-	);
-}
diff --git a/packages/block-editor/src/components/dimensions-tool/aspect-ratio-tool.js b/packages/block-editor/src/components/dimensions-tool/aspect-ratio-tool.js
index 988c6b5c286869..d963e71289cb0f 100644
--- a/packages/block-editor/src/components/dimensions-tool/aspect-ratio-tool.js
+++ b/packages/block-editor/src/components/dimensions-tool/aspect-ratio-tool.js
@@ -6,75 +6,14 @@ import {
 	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
 import { __, _x } from '@wordpress/i18n';
-
 /**
- * @typedef {import('@wordpress/components/build-types/select-control/types').SelectControlProps} SelectControlProps
+ * Internal dependencies
  */
+import { useSettings } from '../use-settings';
 
 /**
- * @type {SelectControlProps[]}
+ * @typedef {import('@wordpress/components/build-types/select-control/types').SelectControlProps} SelectControlProps
  */
-export const DEFAULT_ASPECT_RATIO_OPTIONS = [
-	{
-		label: _x( 'Original', 'Aspect ratio option for dimensions control' ),
-		value: 'auto',
-	},
-	{
-		label: _x(
-			'Square - 1:1',
-			'Aspect ratio option for dimensions control'
-		),
-		value: '1',
-	},
-	{
-		label: _x(
-			'Standard - 4:3',
-			'Aspect ratio option for dimensions control'
-		),
-		value: '4/3',
-	},
-	{
-		label: _x(
-			'Portrait - 3:4',
-			'Aspect ratio option for dimensions control'
-		),
-		value: '3/4',
-	},
-	{
-		label: _x(
-			'Classic - 3:2',
-			'Aspect ratio option for dimensions control'
-		),
-		value: '3/2',
-	},
-	{
-		label: _x(
-			'Classic Portrait - 2:3',
-			'Aspect ratio option for dimensions control'
-		),
-		value: '2/3',
-	},
-	{
-		label: _x(
-			'Wide - 16:9',
-			'Aspect ratio option for dimensions control'
-		),
-		value: '16/9',
-	},
-	{
-		label: _x(
-			'Tall - 9:16',
-			'Aspect ratio option for dimensions control'
-		),
-		value: '9/16',
-	},
-	{
-		label: _x( 'Custom', 'Aspect ratio option for dimensions control' ),
-		value: 'custom',
-		disabled: true,
-		hidden: true,
-	},
-];
 
 /**
  * @callback AspectRatioToolPropsOnChange
@@ -96,16 +35,53 @@ export default function AspectRatioTool( {
 	panelId,
 	value,
 	onChange = () => {},
-	options = DEFAULT_ASPECT_RATIO_OPTIONS,
-	defaultValue = DEFAULT_ASPECT_RATIO_OPTIONS[ 0 ].value,
+	options,
+	defaultValue = 'auto',
+	hasValue,
 	isShownByDefault = true,
 } ) {
 	// Match the CSS default so if the value is used directly in CSS it will look correct in the control.
 	const displayValue = value ?? 'auto';
 
+	const [ defaultRatios, themeRatios, showDefaultRatios ] = useSettings(
+		'dimensions.aspectRatios.default',
+		'dimensions.aspectRatios.theme',
+		'dimensions.defaultAspectRatios'
+	);
+
+	const themeOptions = themeRatios?.map( ( { name, ratio } ) => ( {
+		label: name,
+		value: ratio,
+	} ) );
+
+	const defaultOptions = defaultRatios?.map( ( { name, ratio } ) => ( {
+		label: name,
+		value: ratio,
+	} ) );
+
+	const aspectRatioOptions = [
+		{
+			label: _x(
+				'Original',
+				'Aspect ratio option for dimensions control'
+			),
+			value: 'auto',
+		},
+		...( showDefaultRatios ? defaultOptions : [] ),
+		...( themeOptions ? themeOptions : [] ),
+		{
+			label: _x( 'Custom', 'Aspect ratio option for dimensions control' ),
+			value: 'custom',
+			disabled: true,
+			hidden: true,
+		},
+	];
+
 	return (
 		<ToolsPanelItem
-			hasValue={ () => displayValue !== defaultValue }
+			hasValue={
+				hasValue ? hasValue : () => displayValue !== defaultValue
+			}
 			label={ __( 'Aspect ratio' ) }
 			onDeselect={ () => onChange( undefined ) }
 			isShownByDefault={ isShownByDefault }
@@ -114,9 +90,9 @@ export default function AspectRatioTool( {
 			<SelectControl
 				label={ __( 'Aspect ratio' ) }
 				value={ displayValue }
-				options={ options }
+				options={ options ?? aspectRatioOptions }
 				onChange={ onChange }
-				size={ '__unstable-large' }
+				size="__unstable-large"
 				__nextHasNoMarginBottom
 			/>
 		</ToolsPanelItem>
diff --git a/packages/block-editor/src/components/dimensions-tool/index.js b/packages/block-editor/src/components/dimensions-tool/index.js
index bbd3ac5ffb86e4..49d0fe03b4cb48 100644
--- a/packages/block-editor/src/components/dimensions-tool/index.js
+++ b/packages/block-editor/src/components/dimensions-tool/index.js
@@ -58,6 +58,7 @@ function DimensionsTool( {
 	scaleOptions, // Default options handled by ScaleTool.
 	defaultScale = 'fill', // Match CSS default value for object-fit.
 	unitsOptions, // Default options handled by UnitControl.
+	tools = [ 'aspectRatio', 'widthHeight', 'scale' ],
 } ) {
 	// Coerce undefined and CSS default values to be null.
 	const width =
@@ -92,95 +93,102 @@ function DimensionsTool( {
 
 	return (
 		<>
-			<AspectRatioTool
-				panelId={ panelId }
-				options={ aspectRatioOptions }
-				defaultValue={ defaultAspectRatio }
-				value={ aspectRatioValue }
-				onChange={ ( nextAspectRatio ) => {
-					const nextValue = { ...value };
-
-					// 'auto' is CSS default, so it gets treated as null.
-					nextAspectRatio =
-						nextAspectRatio === 'auto' ? null : nextAspectRatio;
-
-					setLastAspectRatio( nextAspectRatio );
-
-					// Update aspectRatio.
-					if ( ! nextAspectRatio ) {
-						delete nextValue.aspectRatio;
-					} else {
-						nextValue.aspectRatio = nextAspectRatio;
-					}
-
-					// Auto-update scale.
-					if ( ! nextAspectRatio ) {
-						delete nextValue.scale;
-					} else if ( lastScale ) {
-						nextValue.scale = lastScale;
-					} else {
-						nextValue.scale = defaultScale;
-						setLastScale( defaultScale );
-					}
-
-					// Auto-update width and height.
-					if ( 'custom' !== nextAspectRatio && width && height ) {
-						delete nextValue.height;
-					}
-
-					onChange( nextValue );
-				} }
-			/>
-			<WidthHeightTool
-				panelId={ panelId }
-				units={ unitsOptions }
-				value={ { width, height } }
-				onChange={ ( { width: nextWidth, height: nextHeight } ) => {
-					const nextValue = { ...value };
-
-					// 'auto' is CSS default, so it gets treated as null.
-					nextWidth = nextWidth === 'auto' ? null : nextWidth;
-					nextHeight = nextHeight === 'auto' ? null : nextHeight;
-
-					// Update width.
-					if ( ! nextWidth ) {
-						delete nextValue.width;
-					} else {
-						nextValue.width = nextWidth;
-					}
-
-					// Update height.
-					if ( ! nextHeight ) {
-						delete nextValue.height;
-					} else {
-						nextValue.height = nextHeight;
-					}
-
-					// Auto-update aspectRatio.
-					if ( nextWidth && nextHeight ) {
-						delete nextValue.aspectRatio;
-					} else if ( lastAspectRatio ) {
-						nextValue.aspectRatio = lastAspectRatio;
-					} else {
-						// No setting defaultAspectRatio here, because
-						// aspectRatio is optional in this scenario,
-						// unlike scale.
-					}
-
-					// Auto-update scale.
-					if ( ! lastAspectRatio && !! nextWidth !== !! nextHeight ) {
-						delete nextValue.scale;
-					} else if ( lastScale ) {
-						nextValue.scale = lastScale;
-					} else {
-						nextValue.scale = defaultScale;
-						setLastScale( defaultScale );
-					}
-
-					onChange( nextValue );
-				} }
-			/>
-			{ showScaleControl && (
+			{ tools.includes( 'aspectRatio' ) && (
+				<AspectRatioTool
+					panelId={ panelId }
+					options={ aspectRatioOptions }
+					defaultValue={ defaultAspectRatio }
+					value={ aspectRatioValue }
+					onChange={ ( nextAspectRatio ) => {
+						const nextValue = { ...value };
+
+						// 'auto' is CSS default, so it gets treated as null.
+						nextAspectRatio =
+							nextAspectRatio === 'auto' ? null : nextAspectRatio;
+
+						setLastAspectRatio( nextAspectRatio );
+
+						// Update aspectRatio.
+						if ( ! nextAspectRatio ) {
+							delete nextValue.aspectRatio;
+						} else {
+							nextValue.aspectRatio = nextAspectRatio;
+						}
+
+						// Auto-update scale.
+						if ( ! nextAspectRatio ) {
+							delete nextValue.scale;
+						} else if ( lastScale ) {
+							nextValue.scale = lastScale;
+						} else {
+							nextValue.scale = defaultScale;
+							setLastScale( defaultScale );
+						}
+
+						// Auto-update width and height.
+						if ( 'custom' !== nextAspectRatio && width && height ) {
+							delete nextValue.height;
+						}
+
+						onChange( nextValue );
+					} }
+				/>
+			) }
+			{ tools.includes( 'widthHeight' ) && (
+				<WidthHeightTool
+					panelId={ panelId }
+					units={ unitsOptions }
+					value={ { width, height } }
+					onChange={ ( { width: nextWidth, height: nextHeight } ) => {
+						const nextValue = { ...value };
+
+						// 'auto' is CSS default, so it gets treated as null.
+						nextWidth = nextWidth === 'auto' ? null : nextWidth;
+						nextHeight = nextHeight === 'auto' ? null : nextHeight;
+
+						// Update width.
+						if ( ! nextWidth ) {
+							delete nextValue.width;
+						} else {
+							nextValue.width = nextWidth;
+						}
+
+						// Update height.
+						if ( ! nextHeight ) {
+							delete nextValue.height;
+						} else {
+							nextValue.height = nextHeight;
+						}
+
+						// Auto-update aspectRatio.
+						if ( nextWidth && nextHeight ) {
+							delete nextValue.aspectRatio;
+						} else if ( lastAspectRatio ) {
+							nextValue.aspectRatio = lastAspectRatio;
+						} else {
+							// No setting defaultAspectRatio here, because
+							// aspectRatio is optional in this scenario,
+							// unlike scale.
+						}
+
+						// Auto-update scale.
+						if (
+							! lastAspectRatio &&
+							!! nextWidth !== !! nextHeight
+						) {
+							delete nextValue.scale;
+						} else if ( lastScale ) {
+							nextValue.scale = lastScale;
+						} else {
+							nextValue.scale = defaultScale;
+							setLastScale( defaultScale );
+						}
+
+						onChange( nextValue );
+					} }
+				/>
+			) }
+			{ tools.includes( 'scale' ) && showScaleControl && (
 				<ScaleTool
 					panelId={ panelId }
 					options={ scaleOptions }
diff --git a/packages/block-editor/src/components/dimensions-tool/scale-tool.js b/packages/block-editor/src/components/dimensions-tool/scale-tool.js
index e3ef91745aa53d..a23fad586d4705 100644
--- a/packages/block-editor/src/components/dimensions-tool/scale-tool.js
+++ b/packages/block-editor/src/components/dimensions-tool/scale-tool.js
@@ -105,12 +105,13 @@ export default function ScaleTool( {
 			panelId={ panelId }
 		>
 			<ToggleGroupControl
+				__nextHasNoMarginBottom
 				label={ __( 'Scale' ) }
 				isBlock
 				help={ scaleHelp[ displayValue ] }
 				value={ displayValue }
 				onChange={ onChange }
-				size={ '__unstable-large' }
+				size="__unstable-large"
 			>
 				{ options.map( ( option ) => (
 					<ToggleGroupControlOption
diff --git a/packages/block-editor/src/components/dimensions-tool/test/index.js b/packages/block-editor/src/components/dimensions-tool/test/index.js
index 6bfa2af057f7c6..f6f7d71eb2dcbf 100644
--- a/packages/block-editor/src/components/dimensions-tool/test/index.js
+++ b/packages/block-editor/src/components/dimensions-tool/test/index.js
@@ -33,6 +33,16 @@ function Example( { initialValue, onChange, ...props } ) {
 				} }
 				defaultScale="cover"
 				defaultAspectRatio="auto"
+				aspectRatioOptions={ [
+					{ label: 'Original', value: 'auto' },
+					{ label: '16/9', value: '16/9' },
+					{
+						label: 'Custom',
+						value: 'custom',
+						disabled: true,
+						hidden: true,
+					},
+				] }
 				value={ value }
 				{ ...props }
 			/>
diff --git a/packages/block-editor/src/components/dimensions-tool/width-height-tool.js b/packages/block-editor/src/components/dimensions-tool/width-height-tool.js
index 6a4609f9a0bf2d..4c45dd6feca8c1 100644
--- a/packages/block-editor/src/components/dimensions-tool/width-height-tool.js
+++ b/packages/block-editor/src/components/dimensions-tool/width-height-tool.js
@@ -87,7 +87,7 @@ export default function WidthHeightTool( {
 					min={ 0 }
 					value={ width }
 					onChange={ onDimensionChange( 'width' ) }
-					size={ '__unstable-large' }
+					size="__unstable-large"
 				/>
 			</SingleColumnToolsPanelItem>
 			<SingleColumnToolsPanelItem
@@ -105,7 +105,7 @@ export default function WidthHeightTool( {
 					min={ 0 }
 					value={ height }
 					onChange={ onDimensionChange( 'height' ) }
-					size={ '__unstable-large' }
+					size="__unstable-large"
 				/>
 			</SingleColumnToolsPanelItem>
 		</>
diff --git a/packages/block-editor/src/components/duotone-control/index.js b/packages/block-editor/src/components/duotone-control/index.js
index e110286976b1a6..247e0c51354b0e 100644
--- a/packages/block-editor/src/components/duotone-control/index.js
+++ b/packages/block-editor/src/components/duotone-control/index.js
@@ -65,14 +65,11 @@ function DuotoneControl( {
 			} }
 			renderContent={ () => (
 				<MenuGroup label={ __( 'Duotone' ) }>
-					<div
-						id={ descriptionId }
-						className="block-editor-duotone-control__description"
-					>
+					<p>
 						{ __(
 							'Create a two-tone color effect without losing your original image.'
 						) }
-					</div>
+					</p>
 					<DuotonePicker
 						aria-label={ actionLabel }
 						aria-describedby={ descriptionId }
diff --git a/packages/block-editor/src/components/duotone-control/style.scss b/packages/block-editor/src/components/duotone-control/style.scss
index d80f7c4628c35f..3a3a5a143289b8 100644
--- a/packages/block-editor/src/components/duotone-control/style.scss
+++ b/packages/block-editor/src/components/duotone-control/style.scss
@@ -3,7 +3,7 @@
 $swatch-size: 28px;
 $swatch-gap: 12px;
 
-$popover-width: $sidebar-width;
+$popover-width: 260px;
 $popover-padding: $grid-unit-20;
 
 $swatch-columns: math.floor(math.div($popover-width + $swatch-gap - 2 * $popover-padding, $swatch-size + $swatch-gap));
@@ -26,11 +26,6 @@ $swatch-columns: math.floor(math.div($popover-width + $swatch-gap - 2 * $popover
 	}
 }
 
-.block-editor-duotone-control__description {
-	margin: $grid-unit-20 0;
-	font-size: $helptext-font-size;
-}
-
 .block-editor-duotone-control__unset-indicator {
 	// Show a diagonal line (crossed out) for empty swatches.
 	background: linear-gradient(-45deg, transparent 48%, $gray-300 48%, $gray-300 52%, transparent 52%);
diff --git a/packages/block-editor/src/components/editable-text/README.md b/packages/block-editor/src/components/editable-text/README.md
index aa5a2f4b1962b8..fda19ba52b1144 100644
--- a/packages/block-editor/src/components/editable-text/README.md
+++ b/packages/block-editor/src/components/editable-text/README.md
@@ -25,10 +25,6 @@ _Optional._ `Text` won't insert line breaks on `Enter` if set to `true`.
 _Optional._ Placeholder text to show when the field is empty, similar to the
 [`input` and `textarea` attribute of the same name](https://developer.mozilla.org/en-US/docs/Learn/HTML/Forms/HTML5_updates#The_placeholder_attribute).
 
-### `onSplit( value: String ): Function`
-
-_Optional._ Called when the content can be split, where `value` is a piece of content being split off. Here you should create a new block with that content and return it. Note that you also need to provide `onReplace` in order for this to take any effect.
-
 ### `onReplace( blocks: Array ): Function`
 
 _Optional._ Called when the `Text` instance can be replaced with the given blocks.
diff --git a/packages/block-editor/src/components/editor-styles/index.js b/packages/block-editor/src/components/editor-styles/index.js
index 85c54109d0231b..a59ac310bcd303 100644
--- a/packages/block-editor/src/components/editor-styles/index.js
+++ b/packages/block-editor/src/components/editor-styles/index.js
@@ -9,7 +9,7 @@ import a11yPlugin from 'colord/plugins/a11y';
  * WordPress dependencies
  */
 import { SVG } from '@wordpress/components';
-import { useCallback, useMemo } from '@wordpress/element';
+import { useCallback, useMemo, memo } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 
 /**
@@ -67,7 +67,7 @@ function useDarkThemeBodyClassName( styles, scope ) {
 	);
 }
 
-export default function EditorStyles( { styles, scope } ) {
+function EditorStyles( { styles, scope, transformOptions } ) {
 	const overrides = useSelect(
 		( select ) => unlock( select( blockEditorStore ) ).getStyleOverrides(),
 		[]
@@ -88,14 +88,15 @@ export default function EditorStyles( { styles, scope } ) {
 		return [
 			transformStyles(
 				_styles.filter( ( style ) => style?.css ),
-				scope
+				scope,
+				transformOptions
 			),
 			_styles
 				.filter( ( style ) => style.__unstableType === 'svgs' )
 				.map( ( style ) => style.assets )
 				.join( '' ),
 		];
-	}, [ styles, overrides, scope ] );
+	}, [ styles, overrides, scope, transformOptions ] );
 
 	return (
 		<>
@@ -124,3 +125,5 @@ export default function EditorStyles( { styles, scope } ) {
 		</>
 	);
 }
+
+export default memo( EditorStyles );
diff --git a/packages/block-editor/src/components/floating-toolbar/index.native.js b/packages/block-editor/src/components/floating-toolbar/index.native.js
index f4ebf1d9ebe8da..d78262fb01f27d 100644
--- a/packages/block-editor/src/components/floating-toolbar/index.native.js
+++ b/packages/block-editor/src/components/floating-toolbar/index.native.js
@@ -47,8 +47,9 @@ const FloatingToolbar = ( {
 	}, [ showFloatingToolbar ] );
 
 	useEffect( () => {
-		if ( showFloatingToolbar )
+		if ( showFloatingToolbar ) {
 			setPreviousSelection( { clientId: selectedClientId, parentId } );
+		}
 	}, [ selectedClientId ] );
 
 	const translationRange =
@@ -115,7 +116,9 @@ export default compose( [
 
 		const selectedClientId = getSelectedBlockClientId();
 
-		if ( ! selectedClientId ) return;
+		if ( ! selectedClientId ) {
+			return;
+		}
 
 		const rootBlockId = getBlockHierarchyRootClientId( selectedClientId );
 
diff --git a/packages/block-editor/src/components/font-appearance-control/index.js b/packages/block-editor/src/components/font-appearance-control/index.js
index b635cb71d39a5e..38cb42e394a3bd 100644
--- a/packages/block-editor/src/components/font-appearance-control/index.js
+++ b/packages/block-editor/src/components/font-appearance-control/index.js
@@ -3,57 +3,12 @@
  */
 import { CustomSelectControl } from '@wordpress/components';
 import { useMemo } from '@wordpress/element';
-import { __, _x, sprintf } from '@wordpress/i18n';
-
-const FONT_STYLES = [
-	{
-		name: _x( 'Regular', 'font style' ),
-		value: 'normal',
-	},
-	{
-		name: _x( 'Italic', 'font style' ),
-		value: 'italic',
-	},
-];
-
-const FONT_WEIGHTS = [
-	{
-		name: _x( 'Thin', 'font weight' ),
-		value: '100',
-	},
-	{
-		name: _x( 'Extra Light', 'font weight' ),
-		value: '200',
-	},
-	{
-		name: _x( 'Light', 'font weight' ),
-		value: '300',
-	},
-	{
-		name: _x( 'Regular', 'font weight' ),
-		value: '400',
-	},
-	{
-		name: _x( 'Medium', 'font weight' ),
-		value: '500',
-	},
-	{
-		name: _x( 'Semi Bold', 'font weight' ),
-		value: '600',
-	},
-	{
-		name: _x( 'Bold', 'font weight' ),
-		value: '700',
-	},
-	{
-		name: _x( 'Extra Bold', 'font weight' ),
-		value: '800',
-	},
-	{
-		name: _x( 'Black', 'font weight' ),
-		value: '900',
-	},
-];
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { getFontStylesAndWeights } from '../../utils/get-font-styles-and-weights';
 
 /**
  * Adjusts font appearance field label in case either font styles or weights
@@ -76,7 +31,7 @@ const getFontAppearanceLabel = ( hasFontStyles, hasFontWeights ) => {
 };
 
 /**
- * Control to display unified font style and weight options.
+ * Control to display font style and weight options of the active font.
  *
  * @param {Object} props Component props.
  *
@@ -84,9 +39,12 @@ const getFontAppearanceLabel = ( hasFontStyles, hasFontWeights ) => {
  */
 export default function FontAppearanceControl( props ) {
 	const {
+		/** Start opting into the larger default height that will become the default size in a future version. */
+		__next40pxDefaultSize = false,
 		onChange,
 		hasFontStyles = true,
 		hasFontWeights = true,
+		fontFamilyFaces,
 		value: { fontStyle, fontWeight },
 		...otherProps
 	} = props;
@@ -97,43 +55,22 @@ export default function FontAppearanceControl( props ) {
 		name: __( 'Default' ),
 		style: { fontStyle: undefined, fontWeight: undefined },
 	};
+	const { fontStyles, fontWeights, combinedStyleAndWeightOptions } =
+		getFontStylesAndWeights( fontFamilyFaces );
 
-	// Combines both font style and weight options into a single dropdown.
+	// Generates select options for combined font styles and weights.
 	const combineOptions = () => {
 		const combinedOptions = [ defaultOption ];
-
-		FONT_STYLES.forEach( ( { name: styleName, value: styleValue } ) => {
-			FONT_WEIGHTS.forEach(
-				( { name: weightName, value: weightValue } ) => {
-					const optionName =
-						styleValue === 'normal'
-							? weightName
-							: sprintf(
-									/* translators: 1: Font weight name. 2: Font style name. */
-									__( '%1$s %2$s' ),
-									weightName,
-									styleName
-							  );
-
-					combinedOptions.push( {
-						key: `${ styleValue }-${ weightValue }`,
-						name: optionName,
-						style: {
-							fontStyle: styleValue,
-							fontWeight: weightValue,
-						},
-					} );
-				}
-			);
-		} );
-
+		if ( combinedStyleAndWeightOptions ) {
+			combinedOptions.push( ...combinedStyleAndWeightOptions );
+		}
 		return combinedOptions;
 	};
 
 	// Generates select options for font styles only.
 	const styleOptions = () => {
 		const combinedOptions = [ defaultOption ];
-		FONT_STYLES.forEach( ( { name, value } ) => {
+		fontStyles.forEach( ( { name, value } ) => {
 			combinedOptions.push( {
 				key: value,
 				name,
@@ -146,7 +83,7 @@ export default function FontAppearanceControl( props ) {
 	// Generates select options for font weights only.
 	const weightOptions = () => {
 		const combinedOptions = [ defaultOption ];
-		FONT_WEIGHTS.forEach( ( { name, value } ) => {
+		fontWeights.forEach( ( { name, value } ) => {
 			combinedOptions.push( {
 				key: value,
 				name,
@@ -158,12 +95,19 @@ export default function FontAppearanceControl( props ) {
 
 	// Map font styles and weights to select options.
 	const selectOptions = useMemo( () => {
+		// Display combined available font style and weight options.
 		if ( hasFontStyles && hasFontWeights ) {
 			return combineOptions();
 		}
 
+		// Display only font style options or font weight options.
 		return hasFontStyles ? styleOptions() : weightOptions();
-	}, [ props.options ] );
+	}, [
+		props.options,
+		fontStyles,
+		fontWeights,
+		combinedStyleAndWeightOptions,
+	] );
 
 	// Find current selection by comparing font style & weight against options,
 	// and fall back to the Default option if there is no matching option.
@@ -208,6 +152,7 @@ export default function FontAppearanceControl( props ) {
 			<CustomSelectControl
 				{ ...otherProps }
 				className="components-font-appearance-control"
+				__next40pxDefaultSize={ __next40pxDefaultSize }
 				label={ label }
 				describedBy={ getDescribedBy() }
 				options={ selectOptions }
@@ -215,7 +160,6 @@ export default function FontAppearanceControl( props ) {
 				onChange={ ( { selectedItem } ) =>
 					onChange( selectedItem.style )
 				}
-				__nextUnconstrainedWidth
 			/>
 		)
 	);
diff --git a/packages/block-editor/src/components/font-appearance-control/style.scss b/packages/block-editor/src/components/font-appearance-control/style.scss
index d9af9f29a456c8..d1db850a410110 100644
--- a/packages/block-editor/src/components/font-appearance-control/style.scss
+++ b/packages/block-editor/src/components/font-appearance-control/style.scss
@@ -1,8 +1,6 @@
 .components-font-appearance-control {
-	ul {
-		li {
-			color: $gray-900;
-			text-transform: capitalize;
-		}
+	[role="option"] {
+		color: $gray-900;
+		text-transform: capitalize;
 	}
 }
diff --git a/packages/block-editor/src/components/font-family/README.md b/packages/block-editor/src/components/font-family/README.md
index 5300873ab83459..57697f595cc800 100644
--- a/packages/block-editor/src/components/font-family/README.md
+++ b/packages/block-editor/src/components/font-family/README.md
@@ -1,5 +1,9 @@
 # FontFamilyControl
 
+<div class="callout callout-alert">
+This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
+</div>
+
 FontFamilyControl is a React component that renders a UI that allows users to select a font family.
 The component renders a user interface that allows the user to select from a set of predefined font families as defined by the `typography.fontFamilies` presets.
 Optionally, you can provide a `fontFamilies` prop that overrides the predefined font families.
@@ -10,7 +14,7 @@ Optionally, you can provide a `fontFamilies` prop that overrides the predefined
 
 ```jsx
 import { useState } from 'react';
-import { FontFamilyControl } from '@wordpress/block-editor';
+import { __experimentalFontFamilyControl as FontFamilyControl } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 
 // ...
@@ -24,6 +28,7 @@ const MyFontFamilyControl = () => {
 			onChange={ ( newFontFamily ) => {
 				setFontFamily( newFontFamily );
 			} }
+			__nextHasNoMarginBottom
 		/>
 	);
 };
@@ -69,3 +74,19 @@ The current font family value.
 - Default: ''
 
 The rest of the props are passed down to the underlying `<SelectControl />` instance.
+
+#### `__next40pxDefaultSize`
+
+- Type: `boolean`
+- Required: No
+- Default: `false`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+#### `__nextHasNoMarginBottom`
+
+- Type: `boolean`
+- Required: No
+- Default: `false`
+
+Start opting into the new margin-free styles that will become the default in a future version.
diff --git a/packages/block-editor/src/components/font-family/index.js b/packages/block-editor/src/components/font-family/index.js
index 4a40a880e537cb..c87a52b4c676d2 100644
--- a/packages/block-editor/src/components/font-family/index.js
+++ b/packages/block-editor/src/components/font-family/index.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { SelectControl } from '@wordpress/components';
+import deprecated from '@wordpress/deprecated';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -10,6 +11,10 @@ import { __ } from '@wordpress/i18n';
 import { useSettings } from '../use-settings';
 
 export default function FontFamilyControl( {
+	/** Start opting into the larger default height that will become the default size in a future version. */
+	__next40pxDefaultSize = false,
+	/** Start opting into the new margin-free styles that will become the default in a future version. */
+	__nextHasNoMarginBottom = false,
 	value = '',
 	onChange,
 	fontFamilies,
@@ -33,8 +38,22 @@ export default function FontFamilyControl( {
 			};
 		} ),
 	];
+
+	if ( ! __nextHasNoMarginBottom ) {
+		deprecated(
+			'Bottom margin styles for wp.blockEditor.FontFamilyControl',
+			{
+				since: '6.7',
+				version: '7.0',
+				hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version',
+			}
+		);
+	}
+
 	return (
 		<SelectControl
+			__next40pxDefaultSize={ __next40pxDefaultSize }
+			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
 			label={ __( 'Font' ) }
 			options={ options }
 			value={ value }
diff --git a/packages/block-editor/src/components/font-family/stories/index.story.js b/packages/block-editor/src/components/font-family/stories/index.story.js
new file mode 100644
index 00000000000000..54dadeb213f12c
--- /dev/null
+++ b/packages/block-editor/src/components/font-family/stories/index.story.js
@@ -0,0 +1,54 @@
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import FontFamilyControl from '..';
+
+export default {
+	component: FontFamilyControl,
+	title: 'BlockEditor/FontFamilyControl',
+};
+
+export const Default = {
+	render: function Template( props ) {
+		const [ value, setValue ] = useState();
+		return (
+			<FontFamilyControl
+				onChange={ setValue }
+				value={ value }
+				{ ...props }
+			/>
+		);
+	},
+	args: {
+		fontFamilies: [
+			{
+				fontFace: [
+					{
+						fontFamily: 'Inter',
+						fontStretch: 'normal',
+						fontStyle: 'normal',
+						fontWeight: '200 900',
+						src: [
+							'file:./assets/fonts/inter/Inter-VariableFont_slnt,wght.ttf',
+						],
+					},
+				],
+				fontFamily: '"Inter", sans-serif',
+				name: 'Inter',
+				slug: 'inter',
+			},
+			{
+				fontFamily:
+					'-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif',
+				name: 'System Font',
+				slug: 'system-font',
+			},
+		],
+		__nextHasNoMarginBottom: true,
+	},
+};
diff --git a/packages/block-editor/src/components/font-sizes/README.MD b/packages/block-editor/src/components/font-sizes/README.MD
deleted file mode 100644
index adfe0ca8853d8d..00000000000000
--- a/packages/block-editor/src/components/font-sizes/README.MD
+++ /dev/null
@@ -1,90 +0,0 @@
-# FontSizePicker
-
-FontSizePicker is a React component that renders a UI that allows users to select a font size.
-The component renders a user interface that allows the user to select predefined (common) font sizes and contains an option that allows users to select custom font sizes (by choosing the value) if that functionality is enabled.
-There is an equivalent component exposed under @wordpress/components. The difference between this component and the @wordpress components one is that this component does not require the `fontSizes` and `disableCustomFontSizes` properties. The editor settings are used to compute the value of these props.
-
-## Usage
-
-
-```jsx
-import { FontSizePicker } from '@wordpress/block-editor';
-import { useState } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-
-...
-const MyFontSizePicker = () => {
-	const [ fontSize, setFontSize ] = useState( 16 );
-	const fontSizes = [
-		{
-			name: __( 'Small' ),
-			slug: 'small',
-			size: 12,
-		},
-		{
-			name: __( 'Big' ),
-			slug: 'big',
-			size: 26,
-		},
-	];
-	const fallbackFontSize = 16;
-
-	return (
-		<FontSizePicker
-			__nextHasNoMarginBottom
-			value={ fontSize }
-			fallbackFontSize={ fallbackFontSize }
-			onChange={ ( newFontSize ) => {
-				setFontSize( newFontSize );
-			} }
-		/>
-	);
-} );
-
-...
-
-<MyFontSizePicker />
-```
-
-## Props
-
-The component accepts the following props:
-
-
-### fallbackFontSize
-
-If no value exists, this prop defines the starting position for the font size picker slider. Only relevant if `withSlider` is `true`.
-
-- Type: `Number`
-- Required: No
-
-### onChange
-
-A function that receives the new font size value.
-If onChange is called without any parameter, it should reset the value, attending to what reset means in that context, e.g., set the font size to undefined or set the font size a starting value.
-
-- Type: `function`
-- Required: Yes
-
-### value
-
-The current font size value.
-
-- Type: `Number`
-- Required: No
-
-### withSlider
-
-If `true`, the UI will contain a slider, instead of a numeric text input field. If `false`, no slider will be present.
-
-- Type: `Boolean`
-- Required: no
-- Default: `false`
-
-### __nextHasNoMarginBottom
-
-Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 6.4. (The prop can be safely removed once this happens.)
-
--   Type: `Boolean`
--   Required: no
--   Default: `false`
diff --git a/packages/block-editor/src/components/font-sizes/README.md b/packages/block-editor/src/components/font-sizes/README.md
new file mode 100644
index 00000000000000..69354b90f2a351
--- /dev/null
+++ b/packages/block-editor/src/components/font-sizes/README.md
@@ -0,0 +1,81 @@
+# FontSizePicker
+
+FontSizePicker is a React component that renders a UI that allows users to select a font size.
+The component renders a user interface that allows the user to select predefined (common) font sizes and contains an option that allows users to select custom font sizes (by choosing the value) if that functionality is enabled.
+There is an equivalent component exposed under @wordpress/components. The difference between this component and the @wordpress components one is that this component does not require the `fontSizes` and `disableCustomFontSizes` properties. The editor settings are used to compute the value of these props.
+
+## Usage
+
+
+```jsx
+import { FontSizePicker } from '@wordpress/block-editor';
+import { useState } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+
+...
+const MyFontSizePicker = () => {
+	const [ fontSize, setFontSize ] = useState( 16 );
+	const fontSizes = [
+		{
+			name: __( 'Small' ),
+			slug: 'small',
+			size: 12,
+		},
+		{
+			name: __( 'Big' ),
+			slug: 'big',
+			size: 26,
+		},
+	];
+	const fallbackFontSize = 16;
+
+	return (
+		<FontSizePicker
+			value={ fontSize }
+			fallbackFontSize={ fallbackFontSize }
+			onChange={ ( newFontSize ) => {
+				setFontSize( newFontSize );
+			} }
+		/>
+	);
+} );
+
+...
+
+<MyFontSizePicker />
+```
+
+## Props
+
+The component accepts the following props:
+
+
+### fallbackFontSize
+
+If no value exists, this prop defines the starting position for the font size picker slider. Only relevant if `withSlider` is `true`.
+
+- Type: `Number`
+- Required: No
+
+### onChange
+
+A function that receives the new font size value.
+If onChange is called without any parameter, it should reset the value, attending to what reset means in that context, e.g., set the font size to undefined or set the font size a starting value.
+
+- Type: `function`
+- Required: Yes
+
+### value
+
+The current font size value.
+
+- Type: `Number`
+- Required: No
+
+### withSlider
+
+If `true`, the UI will contain a slider, instead of a numeric text input field. If `false`, no slider will be present.
+
+- Type: `Boolean`
+- Required: no
+- Default: `false`
diff --git a/packages/block-editor/src/components/font-sizes/fluid-utils.js b/packages/block-editor/src/components/font-sizes/fluid-utils.js
index b26d542708c375..595011b68bafb6 100644
--- a/packages/block-editor/src/components/font-sizes/fluid-utils.js
+++ b/packages/block-editor/src/components/font-sizes/fluid-utils.js
@@ -181,6 +181,13 @@ export function getComputedFluidTypographyValue( {
 		return null;
 	}
 
+	// Calculates the linear factor denominator. If it's 0, we cannot calculate a fluid value.
+	const linearDenominator =
+		maximumViewportWidthParsed.value - minimumViewportWidthParsed.value;
+	if ( ! linearDenominator ) {
+		return null;
+	}
+
 	// Build CSS rule.
 	// Borrowed from https://websemantics.uk/tools/responsive-font-calculator/.
 	const minViewportWidthOffsetValue = roundToPrecision(
@@ -193,8 +200,7 @@ export function getComputedFluidTypographyValue( {
 	const linearFactor =
 		100 *
 		( ( maximumFontSizeParsed.value - minimumFontSizeParsed.value ) /
-			( maximumViewportWidthParsed.value -
-				minimumViewportWidthParsed.value ) );
+			linearDenominator );
 	const linearFactorScaled = roundToPrecision(
 		( linearFactor || 1 ) * scaleFactor,
 		3
diff --git a/packages/block-editor/src/components/font-sizes/test/fluid-utils.js b/packages/block-editor/src/components/font-sizes/test/fluid-utils.js
index 0a1092a1d8128c..27b1cfe8c994a0 100644
--- a/packages/block-editor/src/components/font-sizes/test/fluid-utils.js
+++ b/packages/block-editor/src/components/font-sizes/test/fluid-utils.js
@@ -64,6 +64,15 @@ describe( 'getComputedFluidTypographyValue()', () => {
 		);
 	} );
 
+	it( 'should return `null` when maximum and minimum viewport width are equal', () => {
+		const fluidTypographyValues = getComputedFluidTypographyValue( {
+			fontSize: '30px',
+			minimumViewportWidth: '500px',
+			maximumViewportWidth: '500px',
+		} );
+		expect( fluidTypographyValues ).toBeNull();
+	} );
+
 	it( 'should return a fluid font size when given a scale factor', () => {
 		const fluidTypographyValues = getComputedFluidTypographyValue( {
 			fontSize: '30px',
diff --git a/packages/block-editor/src/components/font-sizes/utils.js b/packages/block-editor/src/components/font-sizes/utils.js
index 2f874f6665f8f3..b43ed049507aa4 100644
--- a/packages/block-editor/src/components/font-sizes/utils.js
+++ b/packages/block-editor/src/components/font-sizes/utils.js
@@ -1,7 +1,14 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
+
 /**
  * Internal dependencies
  */
-import { kebabCase } from '../../utils/object';
+import { unlock } from '../../lock-unlock';
+
+const { kebabCase } = unlock( componentsPrivateApis );
 
 /**
  *  Returns the font size object based on an array of named font sizes and the namedFontSize and customFontSize values.
diff --git a/packages/block-editor/src/components/global-styles/advanced-panel.js b/packages/block-editor/src/components/global-styles/advanced-panel.js
index af43552c0a3eba..bbb756cd78247d 100644
--- a/packages/block-editor/src/components/global-styles/advanced-panel.js
+++ b/packages/block-editor/src/components/global-styles/advanced-panel.js
@@ -3,12 +3,11 @@
  */
 import {
 	TextareaControl,
-	Tooltip,
+	Notice,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { Icon, info } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -29,9 +28,12 @@ export default function AdvancedPanel( {
 			css: newValue,
 		} );
 		if ( cssError ) {
+			// Check if the new value is valid CSS, and pass a wrapping selector
+			// to ensure that `transformStyles` validates the CSS. Note that the
+			// wrapping selector here is not used in the actual output of any styles.
 			const [ transformed ] = transformStyles(
 				[ { css: newValue } ],
-				'.editor-styles-wrapper'
+				'.for-validation-only'
 			);
 			if ( transformed ) {
 				setCSSError( null );
@@ -44,9 +46,12 @@ export default function AdvancedPanel( {
 			return;
 		}
 
+		// Check if the new value is valid CSS, and pass a wrapping selector
+		// to ensure that `transformStyles` validates the CSS. Note that the
+		// wrapping selector here is not used in the actual output of any styles.
 		const [ transformed ] = transformStyles(
 			[ { css: event.target.value } ],
-			'.editor-styles-wrapper'
+			'.for-validation-only'
 		);
 
 		setCSSError(
@@ -58,6 +63,11 @@ export default function AdvancedPanel( {
 
 	return (
 		<VStack spacing={ 3 }>
+			{ cssError && (
+				<Notice status="error" onRemove={ () => setCSSError( null ) }>
+					{ cssError }
+				</Notice>
+			) }
 			<TextareaControl
 				label={ __( 'Additional CSS' ) }
 				__nextHasNoMarginBottom
@@ -67,16 +77,6 @@ export default function AdvancedPanel( {
 				className="block-editor-global-styles-advanced-panel__custom-css-input"
 				spellCheck={ false }
 			/>
-			{ cssError && (
-				<Tooltip text={ cssError }>
-					<div className="block-editor-global-styles-advanced-panel__custom-css-validation-wrapper">
-						<Icon
-							icon={ info }
-							className="block-editor-global-styles-advanced-panel__custom-css-validation-icon"
-						/>
-					</div>
-				</Tooltip>
-			) }
 		</VStack>
 	);
 }
diff --git a/packages/block-editor/src/components/global-styles/background-panel.js b/packages/block-editor/src/components/global-styles/background-panel.js
new file mode 100644
index 00000000000000..c66ea01bce5498
--- /dev/null
+++ b/packages/block-editor/src/components/global-styles/background-panel.js
@@ -0,0 +1,139 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalToolsPanel as ToolsPanel,
+	__experimentalToolsPanelItem as ToolsPanelItem,
+} from '@wordpress/components';
+import { useCallback, Platform } from '@wordpress/element';
+/**
+ * Internal dependencies
+ */
+import BackgroundImageControl from '../background-image-control';
+import { useToolsPanelDropdownMenuProps } from './utils';
+import { setImmutably } from '../../utils/object';
+import { __ } from '@wordpress/i18n';
+
+const DEFAULT_CONTROLS = {
+	backgroundImage: true,
+};
+
+/**
+ * Checks site settings to see if the background panel may be used.
+ * `settings.background.backgroundSize` exists also,
+ * but can only be used if settings?.background?.backgroundImage is `true`.
+ *
+ * @param {Object} settings Site settings
+ * @return {boolean}        Whether site settings has activated background panel.
+ */
+export function useHasBackgroundPanel( settings ) {
+	return Platform.OS === 'web' && settings?.background?.backgroundImage;
+}
+
+/**
+ * Checks if there is a current value in the background size block support
+ * attributes. Background size values include background size as well
+ * as background position.
+ *
+ * @param {Object} style Style attribute.
+ * @return {boolean}     Whether the block has a background size value set.
+ */
+export function hasBackgroundSizeValue( style ) {
+	return (
+		style?.background?.backgroundPosition !== undefined ||
+		style?.background?.backgroundSize !== undefined
+	);
+}
+
+/**
+ * Checks if there is a current value in the background image block support
+ * attributes.
+ *
+ * @param {Object} style Style attribute.
+ * @return {boolean}     Whether the block has a background image value set.
+ */
+export function hasBackgroundImageValue( style ) {
+	return (
+		!! style?.background?.backgroundImage?.id ||
+		// Supports url() string values in theme.json.
+		'string' === typeof style?.background?.backgroundImage ||
+		!! style?.background?.backgroundImage?.url
+	);
+}
+
+function BackgroundToolsPanel( {
+	resetAllFilter,
+	onChange,
+	value,
+	panelId,
+	children,
+	headerLabel,
+} ) {
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
+	const resetAll = () => {
+		const updatedValue = resetAllFilter( value );
+		onChange( updatedValue );
+	};
+
+	return (
+		<ToolsPanel
+			label={ headerLabel }
+			resetAll={ resetAll }
+			panelId={ panelId }
+			dropdownMenuProps={ dropdownMenuProps }
+		>
+			{ children }
+		</ToolsPanel>
+	);
+}
+
+export default function BackgroundImagePanel( {
+	as: Wrapper = BackgroundToolsPanel,
+	value,
+	onChange,
+	inheritedValue,
+	settings,
+	panelId,
+	defaultControls = DEFAULT_CONTROLS,
+	defaultValues = {},
+	headerLabel = __( 'Background image' ),
+} ) {
+	const showBackgroundImageControl = useHasBackgroundPanel( settings );
+	const resetBackground = () =>
+		onChange( setImmutably( value, [ 'background' ], {} ) );
+	const resetAllFilter = useCallback( ( previousValue ) => {
+		return {
+			...previousValue,
+			background: {},
+		};
+	}, [] );
+
+	return (
+		<Wrapper
+			resetAllFilter={ resetAllFilter }
+			value={ value }
+			onChange={ onChange }
+			panelId={ panelId }
+			headerLabel={ headerLabel }
+		>
+			{ showBackgroundImageControl && (
+				<ToolsPanelItem
+					hasValue={ () => !! value?.background }
+					label={ __( 'Image' ) }
+					onDeselect={ resetBackground }
+					isShownByDefault={ defaultControls.backgroundImage }
+					panelId={ panelId }
+				>
+					<BackgroundImageControl
+						value={ value }
+						onChange={ onChange }
+						settings={ settings }
+						inheritedValue={ inheritedValue }
+						defaultControls={ defaultControls }
+						defaultValues={ defaultValues }
+					/>
+				</ToolsPanelItem>
+			) }
+		</Wrapper>
+	);
+}
diff --git a/packages/block-editor/src/components/global-styles/border-panel.js b/packages/block-editor/src/components/global-styles/border-panel.js
index 63ff223f782722..aea8e67f5b5944 100644
--- a/packages/block-editor/src/components/global-styles/border-panel.js
+++ b/packages/block-editor/src/components/global-styles/border-panel.js
@@ -2,11 +2,13 @@
  * WordPress dependencies
  */
 import {
-	__experimentalBorderBoxControl as BorderBoxControl,
+	BorderBoxControl,
 	__experimentalHasSplitBorders as hasSplitBorders,
 	__experimentalIsDefinedBorder as isDefinedBorder,
 	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
+	__experimentalItemGroup as ItemGroup,
+	BaseControl,
 } from '@wordpress/components';
 import { useCallback, useMemo } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
@@ -16,19 +18,28 @@ import { __ } from '@wordpress/i18n';
  */
 import BorderRadiusControl from '../border-radius-control';
 import { useColorsPerOrigin } from './hooks';
-import { getValueFromVariable } from './utils';
+import { getValueFromVariable, useToolsPanelDropdownMenuProps } from './utils';
+import { setImmutably } from '../../utils/object';
+import { useBorderPanelLabel } from '../../hooks/border';
+import { ShadowPopover, useShadowPresets } from './shadow-panel-components';
 
 export function useHasBorderPanel( settings ) {
-	const controls = [
-		useHasBorderColorControl( settings ),
-		useHasBorderRadiusControl( settings ),
-		useHasBorderStyleControl( settings ),
-		useHasBorderWidthControl( settings ),
-	];
-
+	const controls = Object.values( useHasBorderPanelControls( settings ) );
 	return controls.some( Boolean );
 }
 
+export function useHasBorderPanelControls( settings ) {
+	const controls = {
+		hasBorderColor: useHasBorderColorControl( settings ),
+		hasBorderRadius: useHasBorderRadiusControl( settings ),
+		hasBorderStyle: useHasBorderStyleControl( settings ),
+		hasBorderWidth: useHasBorderWidthControl( settings ),
+		hasShadow: useHasShadowControl( settings ),
+	};
+
+	return controls;
+}
+
 function useHasBorderColorControl( settings ) {
 	return settings?.border?.color;
 }
@@ -45,13 +56,20 @@ function useHasBorderWidthControl( settings ) {
 	return settings?.border?.width;
 }
 
+function useHasShadowControl( settings ) {
+	const shadows = useShadowPresets( settings );
+	return !! settings?.shadow && shadows.length > 0;
+}
+
 function BorderToolsPanel( {
 	resetAllFilter,
 	onChange,
 	value,
 	panelId,
 	children,
+	label,
 } ) {
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 	const resetAll = () => {
 		const updatedValue = resetAllFilter( value );
 		onChange( updatedValue );
@@ -59,9 +77,10 @@ function BorderToolsPanel( {
 
 	return (
 		<ToolsPanel
-			label={ __( 'Border' ) }
+			label={ label }
 			resetAll={ resetAll }
 			panelId={ panelId }
+			dropdownMenuProps={ dropdownMenuProps }
 		>
 			{ children }
 		</ToolsPanel>
@@ -72,6 +91,7 @@ const DEFAULT_CONTROLS = {
 	radius: true,
 	color: true,
 	width: true,
+	shadow: true,
 };
 
 export default function BorderPanel( {
@@ -81,11 +101,14 @@ export default function BorderPanel( {
 	inheritedValue = value,
 	settings,
 	panelId,
+	name,
 	defaultControls = DEFAULT_CONTROLS,
 } ) {
 	const colors = useColorsPerOrigin( settings );
-	const decodeValue = ( rawValue ) =>
-		getValueFromVariable( { settings }, '', rawValue );
+	const decodeValue = useCallback(
+		( rawValue ) => getValueFromVariable( { settings }, '', rawValue ),
+		[ settings ]
+	);
 	const encodeColorValue = ( colorValue ) => {
 		const allColors = colors.flatMap(
 			( { colors: originColors } ) => originColors
@@ -97,25 +120,13 @@ export default function BorderPanel( {
 			? 'var:preset|color|' + colorObject.slug
 			: colorValue;
 	};
-	const decodeColorValue = useCallback(
-		( colorValue ) => {
-			const allColors = colors.flatMap(
-				( { colors: originColors } ) => originColors
-			);
-			const colorObject = allColors.find(
-				( { slug } ) => colorValue === 'var:preset|color|' + slug
-			);
-			return colorObject ? colorObject.color : colorValue;
-		},
-		[ colors ]
-	);
 	const border = useMemo( () => {
 		if ( hasSplitBorders( inheritedValue?.border ) ) {
 			const borderValue = { ...inheritedValue?.border };
 			[ 'top', 'right', 'bottom', 'left' ].forEach( ( side ) => {
 				borderValue[ side ] = {
 					...borderValue[ side ],
-					color: decodeColorValue( borderValue[ side ]?.color ),
+					color: decodeValue( borderValue[ side ]?.color ),
 				};
 			} );
 			return borderValue;
@@ -123,10 +134,10 @@ export default function BorderPanel( {
 		return {
 			...inheritedValue?.border,
 			color: inheritedValue?.border?.color
-				? decodeColorValue( inheritedValue?.border?.color )
+				? decodeValue( inheritedValue?.border?.color )
 				: undefined,
 		};
-	}, [ inheritedValue?.border, decodeColorValue ] );
+	}, [ inheritedValue?.border, decodeValue ] );
 	const setBorder = ( newBorder ) =>
 		onChange( { ...value, border: newBorder } );
 	const showBorderColor = useHasBorderColorControl( settings );
@@ -145,6 +156,31 @@ export default function BorderPanel( {
 		}
 		return !! borderValues;
 	};
+	const hasShadowControl = useHasShadowControl( settings );
+
+	// Shadow
+	const shadow = decodeValue( inheritedValue?.shadow );
+	const shadowPresets = settings?.shadow?.presets ?? {};
+	const mergedShadowPresets =
+		shadowPresets.custom ??
+		shadowPresets.theme ??
+		shadowPresets.default ??
+		[];
+	const setShadow = ( newValue ) => {
+		const slug = mergedShadowPresets?.find(
+			( { shadow: shadowName } ) => shadowName === newValue
+		)?.slug;
+
+		onChange(
+			setImmutably(
+				value,
+				[ 'shadow' ],
+				slug ? `var:preset|shadow|${ slug }` : newValue || undefined
+			)
+		);
+	};
+	const hasShadow = () => !! value?.shadow;
+	const resetShadow = () => setShadow( undefined );
 
 	const resetBorder = () => {
 		if ( hasBorderRadius() ) {
@@ -182,18 +218,32 @@ export default function BorderPanel( {
 		return {
 			...previousValue,
 			border: undefined,
+			shadow: undefined,
 		};
 	}, [] );
 
 	const showBorderByDefault =
 		defaultControls?.color || defaultControls?.width;
 
+	const hasBorderControl =
+		showBorderColor ||
+		showBorderStyle ||
+		showBorderWidth ||
+		showBorderRadius;
+
+	const label = useBorderPanelLabel( {
+		blockName: name,
+		hasShadowControl,
+		hasBorderControl,
+	} );
+
 	return (
 		<Wrapper
 			resetAllFilter={ resetAllFilter }
 			value={ value }
 			onChange={ onChange }
 			panelId={ panelId }
+			label={ label }
 		>
 			{ ( showBorderWidth || showBorderColor ) && (
 				<ToolsPanelItem
@@ -205,14 +255,16 @@ export default function BorderPanel( {
 				>
 					<BorderBoxControl
 						colors={ colors }
-						enableAlpha={ true }
+						enableAlpha
 						enableStyle={ showBorderStyle }
 						onChange={ onBorderChange }
 						popoverOffset={ 40 }
 						popoverPlacement="left-start"
 						value={ border }
-						__experimentalIsRenderedInSidebar={ true }
-						size={ '__unstable-large' }
+						__experimentalIsRenderedInSidebar
+						size="__unstable-large"
+						hideLabelFromVision={ ! hasShadowControl }
+						label={ __( 'Border' ) }
 					/>
 				</ToolsPanelItem>
 			) }
@@ -232,6 +284,29 @@ export default function BorderPanel( {
 					/>
 				</ToolsPanelItem>
 			) }
+			{ hasShadowControl && (
+				<ToolsPanelItem
+					label={ __( 'Shadow' ) }
+					hasValue={ hasShadow }
+					onDeselect={ resetShadow }
+					isShownByDefault={ defaultControls.shadow }
+					panelId={ panelId }
+				>
+					{ hasBorderControl ? (
+						<BaseControl.VisualLabel as="legend">
+							{ __( 'Shadow' ) }
+						</BaseControl.VisualLabel>
+					) : null }
+
+					<ItemGroup isBordered isSeparated>
+						<ShadowPopover
+							shadow={ shadow }
+							onShadowChange={ setShadow }
+							settings={ settings }
+						/>
+					</ItemGroup>
+				</ToolsPanelItem>
+			) }
 		</Wrapper>
 	);
 }
diff --git a/packages/block-editor/src/components/global-styles/color-panel.js b/packages/block-editor/src/components/global-styles/color-panel.js
index 3b55ec36fc91db..7c5257ae93bfaa 100644
--- a/packages/block-editor/src/components/global-styles/color-panel.js
+++ b/packages/block-editor/src/components/global-styles/color-panel.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,27 +12,28 @@ import {
 	__experimentalHStack as HStack,
 	__experimentalZStack as ZStack,
 	__experimentalDropdownContentWrapper as DropdownContentWrapper,
-	TabPanel,
 	ColorIndicator,
 	Flex,
 	FlexItem,
 	Dropdown,
 	Button,
+	privateApis as componentsPrivateApis,
 } from '@wordpress/components';
 import { useCallback } from '@wordpress/element';
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import ColorGradientControl from '../colors-gradients/control';
 import { useColorsPerOrigin, useGradientsPerOrigin } from './hooks';
-import { getValueFromVariable } from './utils';
+import { getValueFromVariable, useToolsPanelDropdownMenuProps } from './utils';
 import { setImmutably } from '../../utils/object';
+import { unlock } from '../../lock-unlock';
 
 export function useHasColorPanel( settings ) {
 	const hasTextPanel = useHasTextPanel( settings );
-	const hasBackgroundPanel = useHasBackgroundPanel( settings );
+	const hasBackgroundPanel = useHasBackgroundColorPanel( settings );
 	const hasLinkPanel = useHasLinkPanel( settings );
 	const hasHeadingPanel = useHasHeadingPanel( settings );
 	const hasButtonPanel = useHasButtonPanel( settings );
@@ -96,7 +97,7 @@ export function useHasButtonPanel( settings ) {
 	);
 }
 
-export function useHasBackgroundPanel( settings ) {
+export function useHasBackgroundColorPanel( settings ) {
 	const colors = useColorsPerOrigin( settings );
 	const gradients = useGradientsPerOrigin( settings );
 	return (
@@ -115,6 +116,7 @@ function ColorToolsPanel( {
 	panelId,
 	children,
 } ) {
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 	const resetAll = () => {
 		const updatedValue = resetAllFilter( value );
 		onChange( updatedValue );
@@ -122,13 +124,15 @@ function ColorToolsPanel( {
 
 	return (
 		<ToolsPanel
-			label={ __( 'Color' ) }
+			label={ __( 'Elements' ) }
 			resetAll={ resetAll }
 			panelId={ panelId }
 			hasInnerWrapper
+			headingLevel={ 3 }
 			className="color-block-support-panel"
 			__experimentalFirstVisibleItemClass="first"
 			__experimentalLastVisibleItemClass="last"
+			dropdownMenuProps={ dropdownMenuProps }
 		>
 			<div className="color-block-support-panel__inner-wrapper">
 				{ children }
@@ -152,6 +156,8 @@ const popoverProps = {
 	shift: true,
 };
 
+const { Tabs } = unlock( componentsPrivateApis );
+
 const LabeledColorIndicators = ( { indicators, label } ) => (
 	<HStack justify="flex-start">
 		<ZStack isLayered={ false } offset={ -8 }>
@@ -161,10 +167,7 @@ const LabeledColorIndicators = ( { indicators, label } ) => (
 				</Flex>
 			) ) }
 		</ZStack>
-		<FlexItem
-			className="block-editor-panel-color-gradient-settings__color-name"
-			title={ label }
-		>
+		<FlexItem className="block-editor-panel-color-gradient-settings__color-name">
 			{ label }
 		</FlexItem>
 	</HStack>
@@ -203,13 +206,8 @@ function ColorPanelDropdown( {
 	colorGradientControlSettings,
 	panelId,
 } ) {
-	const tabConfigs = tabs.map( ( { key, label: tabLabel } ) => {
-		return {
-			name: key,
-			title: tabLabel,
-		};
-	} );
-
+	const currentTab = tabs.find( ( tab ) => tab.userValue !== undefined );
+	const { key: firstTabKey, ...firstTab } = tabs[ 0 ] ?? {};
 	return (
 		<ToolsPanelItem
 			className="block-editor-tools-panel-color-gradient-settings__item"
@@ -225,20 +223,15 @@ function ColorPanelDropdown( {
 				renderToggle={ ( { onToggle, isOpen } ) => {
 					const toggleProps = {
 						onClick: onToggle,
-						className: classnames(
+						className: clsx(
 							'block-editor-panel-color-gradient-settings__dropdown',
 							{ 'is-open': isOpen }
 						),
 						'aria-expanded': isOpen,
-						'aria-label': sprintf(
-							/* translators: %s is the type of color property, e.g., "background" */
-							__( 'Color %s styles' ),
-							label
-						),
 					};
 
 					return (
-						<Button { ...toggleProps }>
+						<Button __next40pxDefaultSize { ...toggleProps }>
 							<LabeledColorIndicators
 								indicators={ indicators }
 								label={ label }
@@ -251,33 +244,46 @@ function ColorPanelDropdown( {
 						<div className="block-editor-panel-color-gradient-settings__dropdown-content">
 							{ tabs.length === 1 && (
 								<ColorPanelTab
-									{ ...tabs[ 0 ] }
+									key={ firstTabKey }
+									{ ...firstTab }
 									colorGradientControlSettings={
 										colorGradientControlSettings
 									}
 								/>
 							) }
 							{ tabs.length > 1 && (
-								<TabPanel tabs={ tabConfigs }>
-									{ ( tab ) => {
-										const selectedTab = tabs.find(
-											( t ) => t.key === tab.name
-										);
-
-										if ( ! selectedTab ) {
-											return null;
-										}
-
+								<Tabs defaultTabId={ currentTab?.key }>
+									<Tabs.TabList>
+										{ tabs.map( ( tab ) => (
+											<Tabs.Tab
+												key={ tab.key }
+												tabId={ tab.key }
+											>
+												{ tab.label }
+											</Tabs.Tab>
+										) ) }
+									</Tabs.TabList>
+
+									{ tabs.map( ( tab ) => {
+										const { key: tabKey, ...restTabProps } =
+											tab;
 										return (
-											<ColorPanelTab
-												{ ...selectedTab }
-												colorGradientControlSettings={
-													colorGradientControlSettings
-												}
-											/>
+											<Tabs.TabPanel
+												key={ tabKey }
+												tabId={ tabKey }
+												focusable={ false }
+											>
+												<ColorPanelTab
+													key={ tabKey }
+													{ ...restTabProps }
+													colorGradientControlSettings={
+														colorGradientControlSettings
+													}
+												/>
+											</Tabs.TabPanel>
 										);
-									} }
-								</TabPanel>
+									} ) }
+								</Tabs>
 							) }
 						</div>
 					</DropdownContentWrapper>
@@ -329,7 +335,7 @@ export default function ColorPanel( {
 	};
 
 	// BackgroundColor
-	const showBackgroundPanel = useHasBackgroundPanel( settings );
+	const showBackgroundPanel = useHasBackgroundColorPanel( settings );
 	const backgroundColor = decodeValue( inheritedValue?.color?.background );
 	const userBackgroundColor = decodeValue( value?.color?.background );
 	const gradient = decodeValue( inheritedValue?.color?.gradient );
@@ -534,7 +540,7 @@ export default function ColorPanel( {
 			tabs: [
 				hasSolidColors && {
 					key: 'background',
-					label: __( 'Solid' ),
+					label: __( 'Color' ),
 					inheritedValue: backgroundColor,
 					setValue: setBackgroundColor,
 					userValue: userBackgroundColor,
@@ -576,7 +582,9 @@ export default function ColorPanel( {
 	].filter( Boolean );
 
 	elements.forEach( ( { name, label, showPanel } ) => {
-		if ( ! showPanel ) return;
+		if ( ! showPanel ) {
+			return;
+		}
 
 		const elementBackgroundColor = decodeValue(
 			inheritedValue?.elements?.[ name ]?.color?.background
@@ -699,19 +707,22 @@ export default function ColorPanel( {
 			onChange={ onChange }
 			panelId={ panelId }
 		>
-			{ items.map( ( item ) => (
-				<ColorPanelDropdown
-					key={ item.key }
-					{ ...item }
-					colorGradientControlSettings={ {
-						colors,
-						disableCustomColors: ! areCustomSolidsEnabled,
-						gradients,
-						disableCustomGradients: ! areCustomGradientsEnabled,
-					} }
-					panelId={ panelId }
-				/>
-			) ) }
+			{ items.map( ( item ) => {
+				const { key, ...restItem } = item;
+				return (
+					<ColorPanelDropdown
+						key={ key }
+						{ ...restItem }
+						colorGradientControlSettings={ {
+							colors,
+							disableCustomColors: ! areCustomSolidsEnabled,
+							gradients,
+							disableCustomGradients: ! areCustomGradientsEnabled,
+						} }
+						panelId={ panelId }
+					/>
+				);
+			} ) }
 			{ children }
 		</Wrapper>
 	);
diff --git a/packages/block-editor/src/components/global-styles/color-panel.native.js b/packages/block-editor/src/components/global-styles/color-panel.native.js
index c69c9e26f902c0..87002b5fa3e22f 100644
--- a/packages/block-editor/src/components/global-styles/color-panel.native.js
+++ b/packages/block-editor/src/components/global-styles/color-panel.native.js
@@ -4,7 +4,6 @@
 import { useSelect } from '@wordpress/data';
 import { useEffect, useState, useMemo, useCallback } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { useGlobalStyles } from '@wordpress/components';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
@@ -19,8 +18,9 @@ import InspectorControls from '../inspector-controls';
 import {
 	useHasColorPanel,
 	useHasTextPanel,
-	useHasBackgroundPanel,
+	useHasBackgroundColorPanel,
 } from './color-panel.js';
+import { useGlobalStyles } from './use-global-styles-context';
 
 const ColorPanel = ( {
 	value,
@@ -95,7 +95,7 @@ const ColorPanel = ( {
 	);
 
 	// BackgroundColor
-	const showBackgroundPanel = useHasBackgroundPanel( settings );
+	const showBackgroundPanel = useHasBackgroundColorPanel( settings );
 	const backgroundColor = decodeValue( inheritedValue?.color?.background );
 	const gradient = decodeValue( inheritedValue?.color?.gradient );
 	const setBackgroundColor = useCallback(
diff --git a/packages/block-editor/src/components/global-styles/dimensions-panel.js b/packages/block-editor/src/components/global-styles/dimensions-panel.js
index b5eb6175c8c5e4..4c52de6a3d7d11 100644
--- a/packages/block-editor/src/components/global-styles/dimensions-panel.js
+++ b/packages/block-editor/src/components/global-styles/dimensions-panel.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -10,23 +10,22 @@ import { __ } from '@wordpress/i18n';
 import {
 	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
-	__experimentalBoxControl as BoxControl,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
+	BoxControl,
 	__experimentalUnitControl as UnitControl,
 	__experimentalUseCustomUnits as useCustomUnits,
-	__experimentalView as View,
+	__experimentalInputControlPrefixWrapper as InputControlPrefixWrapper,
 } from '@wordpress/components';
-import { Icon, positionCenter, stretchWide } from '@wordpress/icons';
-import { useCallback, Platform } from '@wordpress/element';
+import { Icon, alignNone, stretchWide } from '@wordpress/icons';
+import { useCallback, useState, Platform } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import { getValueFromVariable } from './utils';
+import { getValueFromVariable, useToolsPanelDropdownMenuProps } from './utils';
 import SpacingSizesControl from '../spacing-sizes-control';
 import HeightControl from '../height-control';
 import ChildLayoutControl from '../child-layout-control';
+import AspectRatioTool from '../dimensions-tool/aspect-ratio-tool';
 import { cleanEmptyObject } from '../../hooks/utils';
 import { setImmutably } from '../../utils/object';
 
@@ -39,6 +38,7 @@ export function useHasDimensionsPanel( settings ) {
 	const hasMargin = useHasMargin( settings );
 	const hasGap = useHasGap( settings );
 	const hasMinHeight = useHasMinHeight( settings );
+	const hasAspectRatio = useHasAspectRatio( settings );
 	const hasChildLayout = useHasChildLayout( settings );
 
 	return (
@@ -49,6 +49,7 @@ export function useHasDimensionsPanel( settings ) {
 			hasMargin ||
 			hasGap ||
 			hasMinHeight ||
+			hasAspectRatio ||
 			hasChildLayout )
 	);
 }
@@ -77,6 +78,10 @@ function useHasMinHeight( settings ) {
 	return settings?.dimensions?.minHeight;
 }
 
+function useHasAspectRatio( settings ) {
+	return settings?.dimensions?.aspectRatio;
+}
+
 function useHasChildLayout( settings ) {
 	const {
 		type: parentLayoutType = 'default',
@@ -85,21 +90,22 @@ function useHasChildLayout( settings ) {
 	} = settings?.parentLayout ?? {};
 
 	const support =
-		( defaultParentLayoutType === 'flex' || parentLayoutType === 'flex' ) &&
+		( defaultParentLayoutType === 'flex' ||
+			parentLayoutType === 'flex' ||
+			defaultParentLayoutType === 'grid' ||
+			parentLayoutType === 'grid' ) &&
 		allowSizingOnChildren;
-
 	return !! settings?.layout && support;
 }
 
 function useHasSpacingPresets( settings ) {
-	const {
-		custom,
-		theme,
-		default: defaultPresets,
-	} = settings?.spacing?.spacingSizes || {};
-	const presets = custom ?? theme ?? defaultPresets ?? [];
-
-	return presets.length > 0;
+	const { defaultSpacingSizes, spacingSizes } = settings?.spacing || {};
+	return (
+		( defaultSpacingSizes !== false &&
+			spacingSizes?.default?.length > 0 ) ||
+		spacingSizes?.theme?.length > 0 ||
+		spacingSizes?.custom?.length > 0
+	);
 }
 
 function filterValuesBySides( values, sides ) {
@@ -168,6 +174,7 @@ function DimensionsToolsPanel( {
 	panelId,
 	children,
 } ) {
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 	const resetAll = () => {
 		const updatedValue = resetAllFilter( value );
 		onChange( updatedValue );
@@ -178,6 +185,7 @@ function DimensionsToolsPanel( {
 			label={ __( 'Dimensions' ) }
 			resetAll={ resetAll }
 			panelId={ panelId }
+			dropdownMenuProps={ dropdownMenuProps }
 		>
 			{ children }
 		</ToolsPanel>
@@ -191,6 +199,7 @@ const DEFAULT_CONTROLS = {
 	margin: true,
 	blockGap: true,
 	minHeight: true,
+	aspectRatio: true,
 	childLayout: true,
 };
 
@@ -238,7 +247,11 @@ export default function DimensionsPanel( {
 		],
 	} );
 
-	// Content Size
+	//Minimum Margin Value
+	const minimumMargin = -Infinity;
+	const [ minMarginValue, setMinMarginValue ] = useState( minimumMargin );
+
+	// Content Width
 	const showContentSizeControl =
 		useHasContentSize( settings ) && includeLayoutControls;
 	const contentSizeValue = decodeValue( inheritedValue?.layout?.contentSize );
@@ -254,7 +267,7 @@ export default function DimensionsPanel( {
 	const hasUserSetContentSizeValue = () => !! value?.layout?.contentSize;
 	const resetContentSizeValue = () => setContentSizeValue( undefined );
 
-	// Wide Size
+	// Wide Width
 	const showWideSizeControl =
 		useHasWideSize( settings ) && includeLayoutControls;
 	const wideSizeValue = decodeValue( inheritedValue?.layout?.wideSize );
@@ -345,8 +358,18 @@ export default function DimensionsPanel( {
 	const showMinHeightControl = useHasMinHeight( settings );
 	const minHeightValue = decodeValue( inheritedValue?.dimensions?.minHeight );
 	const setMinHeightValue = ( newValue ) => {
+		const tempValue = setImmutably(
+			value,
+			[ 'dimensions', 'minHeight' ],
+			newValue
+		);
+		// Apply min-height, while removing any applied aspect ratio.
 		onChange(
-			setImmutably( value, [ 'dimensions', 'minHeight' ], newValue )
+			setImmutably(
+				tempValue,
+				[ 'dimensions', 'aspectRatio' ],
+				undefined
+			)
 		);
 	};
 	const resetMinHeightValue = () => {
@@ -354,28 +377,36 @@ export default function DimensionsPanel( {
 	};
 	const hasMinHeightValue = () => !! value?.dimensions?.minHeight;
 
+	// Aspect Ratio
+	const showAspectRatioControl = useHasAspectRatio( settings );
+	const aspectRatioValue = decodeValue(
+		inheritedValue?.dimensions?.aspectRatio
+	);
+	const setAspectRatioValue = ( newValue ) => {
+		const tempValue = setImmutably(
+			value,
+			[ 'dimensions', 'aspectRatio' ],
+			newValue
+		);
+		// Apply aspect-ratio, while removing any applied min-height.
+		onChange(
+			setImmutably( tempValue, [ 'dimensions', 'minHeight' ], undefined )
+		);
+	};
+	const hasAspectRatioValue = () => !! value?.dimensions?.aspectRatio;
+
 	// Child Layout
 	const showChildLayoutControl = useHasChildLayout( settings );
 	const childLayout = inheritedValue?.layout;
-	const { orientation = 'horizontal' } = settings?.parentLayout ?? {};
-	const childLayoutOrientationLabel =
-		orientation === 'horizontal' ? __( 'Width' ) : __( 'Height' );
+
 	const setChildLayout = ( newChildLayout ) => {
 		onChange( {
 			...value,
 			layout: {
-				...value?.layout,
 				...newChildLayout,
 			},
 		} );
 	};
-	const resetChildLayoutValue = () => {
-		setChildLayout( {
-			selfStretch: undefined,
-			flexSize: undefined,
-		} );
-	};
-	const hasChildLayoutValue = () => !! value?.layout;
 
 	const resetAllFilter = useCallback( ( previousValue ) => {
 		return {
@@ -386,6 +417,10 @@ export default function DimensionsPanel( {
 				wideSize: undefined,
 				selfStretch: undefined,
 				flexSize: undefined,
+				columnStart: undefined,
+				rowStart: undefined,
+				columnSpan: undefined,
+				rowSpan: undefined,
 			} ),
 			spacing: {
 				...previousValue?.spacing,
@@ -396,12 +431,24 @@ export default function DimensionsPanel( {
 			dimensions: {
 				...previousValue?.dimensions,
 				minHeight: undefined,
+				aspectRatio: undefined,
 			},
 		};
 	}, [] );
 
 	const onMouseLeaveControls = () => onVisualize( false );
 
+	const inputProps = {
+		min: minMarginValue,
+		onDragStart: () => {
+			//Reset to 0 in case the value was negative.
+			setMinMarginValue( 0 );
+		},
+		onDragEnd: () => {
+			setMinMarginValue( minimumMargin );
+		},
+	};
+
 	return (
 		<Wrapper
 			resetAllFilter={ resetAllFilter }
@@ -416,8 +463,7 @@ export default function DimensionsPanel( {
 			) }
 			{ showContentSizeControl && (
 				<ToolsPanelItem
-					className="single-column"
-					label={ __( 'Content size' ) }
+					label={ __( 'Content width' ) }
 					hasValue={ hasUserSetContentSizeValue }
 					onDeselect={ resetContentSizeValue }
 					isShownByDefault={
@@ -426,27 +472,26 @@ export default function DimensionsPanel( {
 					}
 					panelId={ panelId }
 				>
-					<HStack alignment="flex-end" justify="flex-start">
-						<UnitControl
-							label={ __( 'Content' ) }
-							labelPosition="top"
-							__unstableInputWidth="80px"
-							value={ contentSizeValue || '' }
-							onChange={ ( nextContentSize ) => {
-								setContentSizeValue( nextContentSize );
-							} }
-							units={ units }
-						/>
-						<View>
-							<Icon icon={ positionCenter } />
-						</View>
-					</HStack>
+					<UnitControl
+						__next40pxDefaultSize
+						label={ __( 'Content width' ) }
+						labelPosition="top"
+						value={ contentSizeValue || '' }
+						onChange={ ( nextContentSize ) => {
+							setContentSizeValue( nextContentSize );
+						} }
+						units={ units }
+						prefix={
+							<InputControlPrefixWrapper variant="icon">
+								<Icon icon={ alignNone } />
+							</InputControlPrefixWrapper>
+						}
+					/>
 				</ToolsPanelItem>
 			) }
 			{ showWideSizeControl && (
 				<ToolsPanelItem
-					className="single-column"
-					label={ __( 'Wide size' ) }
+					label={ __( 'Wide width' ) }
 					hasValue={ hasUserSetWideSizeValue }
 					onDeselect={ resetWideSizeValue }
 					isShownByDefault={
@@ -454,21 +499,21 @@ export default function DimensionsPanel( {
 					}
 					panelId={ panelId }
 				>
-					<HStack alignment="flex-end" justify="flex-start">
-						<UnitControl
-							label={ __( 'Wide' ) }
-							labelPosition="top"
-							__unstableInputWidth="80px"
-							value={ wideSizeValue || '' }
-							onChange={ ( nextWideSize ) => {
-								setWideSizeValue( nextWideSize );
-							} }
-							units={ units }
-						/>
-						<View>
-							<Icon icon={ stretchWide } />
-						</View>
-					</HStack>
+					<UnitControl
+						__next40pxDefaultSize
+						label={ __( 'Wide width' ) }
+						labelPosition="top"
+						value={ wideSizeValue || '' }
+						onChange={ ( nextWideSize ) => {
+							setWideSizeValue( nextWideSize );
+						} }
+						units={ units }
+						prefix={
+							<InputControlPrefixWrapper variant="icon">
+								<Icon icon={ stretchWide } />
+							</InputControlPrefixWrapper>
+						}
+					/>
 				</ToolsPanelItem>
 			) }
 			{ showPaddingControl && (
@@ -479,13 +524,14 @@ export default function DimensionsPanel( {
 					isShownByDefault={
 						defaultControls.padding ?? DEFAULT_CONTROLS.padding
 					}
-					className={ classnames( {
+					className={ clsx( {
 						'tools-panel-item-spacing': showSpacingPresetsControl,
 					} ) }
 					panelId={ panelId }
 				>
 					{ ! showSpacingPresetsControl && (
 						<BoxControl
+							__next40pxDefaultSize
 							values={ paddingValues }
 							onChange={ setPaddingValues }
 							label={ __( 'Padding' ) }
@@ -519,15 +565,17 @@ export default function DimensionsPanel( {
 					isShownByDefault={
 						defaultControls.margin ?? DEFAULT_CONTROLS.margin
 					}
-					className={ classnames( {
+					className={ clsx( {
 						'tools-panel-item-spacing': showSpacingPresetsControl,
 					} ) }
 					panelId={ panelId }
 				>
 					{ ! showSpacingPresetsControl && (
 						<BoxControl
+							__next40pxDefaultSize
 							values={ marginValues }
 							onChange={ setMarginValues }
+							inputProps={ inputProps }
 							label={ __( 'Margin' ) }
 							sides={ marginSides }
 							units={ units }
@@ -541,6 +589,7 @@ export default function DimensionsPanel( {
 						<SpacingSizesControl
 							values={ marginValues }
 							onChange={ setMarginValues }
+							minimumCustomValue={ -Infinity }
 							label={ __( 'Margin' ) }
 							sides={ marginSides }
 							units={ units }
@@ -559,14 +608,18 @@ export default function DimensionsPanel( {
 					isShownByDefault={
 						defaultControls.blockGap ?? DEFAULT_CONTROLS.blockGap
 					}
-					className={ classnames( {
+					className={ clsx( {
 						'tools-panel-item-spacing': showSpacingPresetsControl,
+						'single-column':
+							// If UnitControl is used, should be single-column.
+							! showSpacingPresetsControl && ! isAxialGap,
 					} ) }
 					panelId={ panelId }
 				>
 					{ ! showSpacingPresetsControl &&
 						( isAxialGap ? (
 							<BoxControl
+								__next40pxDefaultSize
 								label={ __( 'Block spacing' ) }
 								min={ 0 }
 								onChange={ setGapValues }
@@ -578,8 +631,8 @@ export default function DimensionsPanel( {
 							/>
 						) : (
 							<UnitControl
+								__next40pxDefaultSize
 								label={ __( 'Block spacing' ) }
-								__unstableInputWidth="80px"
 								min={ 0 }
 								onChange={ setGapValue }
 								units={ units }
@@ -599,10 +652,22 @@ export default function DimensionsPanel( {
 					) }
 				</ToolsPanelItem>
 			) }
+			{ showChildLayoutControl && (
+				<ChildLayoutControl
+					value={ childLayout }
+					onChange={ setChildLayout }
+					parentLayout={ settings?.parentLayout }
+					panelId={ panelId }
+					isShownByDefault={
+						defaultControls.childLayout ??
+						DEFAULT_CONTROLS.childLayout
+					}
+				/>
+			) }
 			{ showMinHeightControl && (
 				<ToolsPanelItem
 					hasValue={ hasMinHeightValue }
-					label={ __( 'Min. height' ) }
+					label={ __( 'Minimum height' ) }
 					onDeselect={ resetMinHeightValue }
 					isShownByDefault={
 						defaultControls.minHeight ?? DEFAULT_CONTROLS.minHeight
@@ -610,31 +675,23 @@ export default function DimensionsPanel( {
 					panelId={ panelId }
 				>
 					<HeightControl
-						label={ __( 'Min. height' ) }
+						label={ __( 'Minimum height' ) }
 						value={ minHeightValue }
 						onChange={ setMinHeightValue }
 					/>
 				</ToolsPanelItem>
 			) }
-			{ showChildLayoutControl && (
-				<VStack
-					as={ ToolsPanelItem }
-					spacing={ 2 }
-					hasValue={ hasChildLayoutValue }
-					label={ childLayoutOrientationLabel }
-					onDeselect={ resetChildLayoutValue }
+			{ showAspectRatioControl && (
+				<AspectRatioTool
+					hasValue={ hasAspectRatioValue }
+					value={ aspectRatioValue }
+					onChange={ setAspectRatioValue }
+					panelId={ panelId }
 					isShownByDefault={
-						defaultControls.childLayout ??
-						DEFAULT_CONTROLS.childLayout
+						defaultControls.aspectRatio ??
+						DEFAULT_CONTROLS.aspectRatio
 					}
-					panelId={ panelId }
-				>
-					<ChildLayoutControl
-						value={ childLayout }
-						onChange={ setChildLayout }
-						parentLayout={ settings?.parentLayout }
-					/>
-				</VStack>
+				/>
 			) }
 		</Wrapper>
 	);
diff --git a/packages/block-editor/src/components/global-styles/effects-panel.js b/packages/block-editor/src/components/global-styles/effects-panel.js
deleted file mode 100644
index cda641e0fb17a0..00000000000000
--- a/packages/block-editor/src/components/global-styles/effects-panel.js
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalToolsPanel as ToolsPanel,
-	__experimentalToolsPanelItem as ToolsPanelItem,
-	__experimentalItemGroup as ItemGroup,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-	__experimentalGrid as Grid,
-	__experimentalHeading as Heading,
-	FlexItem,
-	Dropdown,
-	__experimentalDropdownContentWrapper as DropdownContentWrapper,
-	Button,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useCallback } from '@wordpress/element';
-import { shadow as shadowIcon, Icon, check } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import { getValueFromVariable } from './utils';
-import { setImmutably } from '../../utils/object';
-
-export function useHasEffectsPanel( settings ) {
-	const hasShadowControl = useHasShadowControl( settings );
-	return hasShadowControl;
-}
-
-function useHasShadowControl( settings ) {
-	return !! settings?.shadow;
-}
-
-function EffectsToolsPanel( {
-	resetAllFilter,
-	onChange,
-	value,
-	panelId,
-	children,
-} ) {
-	const resetAll = () => {
-		const updatedValue = resetAllFilter( value );
-		onChange( updatedValue );
-	};
-
-	return (
-		<ToolsPanel
-			label={ __( 'Effects' ) }
-			resetAll={ resetAll }
-			panelId={ panelId }
-		>
-			{ children }
-		</ToolsPanel>
-	);
-}
-
-const DEFAULT_CONTROLS = {
-	shadow: true,
-};
-
-export default function EffectsPanel( {
-	as: Wrapper = EffectsToolsPanel,
-	value,
-	onChange,
-	inheritedValue = value,
-	settings,
-	panelId,
-	defaultControls = DEFAULT_CONTROLS,
-} ) {
-	const decodeValue = ( rawValue ) =>
-		getValueFromVariable( { settings }, '', rawValue );
-
-	// Shadow
-	const hasShadowEnabled = useHasShadowControl( settings );
-	const shadow = decodeValue( inheritedValue?.shadow );
-	const setShadow = ( newValue ) => {
-		onChange( setImmutably( value, [ 'shadow' ], newValue ) );
-	};
-	const hasShadow = () => !! value?.shadow;
-	const resetShadow = () => setShadow( undefined );
-
-	const resetAllFilter = useCallback( ( previousValue ) => {
-		return {
-			...previousValue,
-			shadow: undefined,
-		};
-	}, [] );
-
-	return (
-		<Wrapper
-			resetAllFilter={ resetAllFilter }
-			value={ value }
-			onChange={ onChange }
-			panelId={ panelId }
-		>
-			{ hasShadowEnabled && (
-				<ToolsPanelItem
-					label={ __( 'Shadow' ) }
-					hasValue={ hasShadow }
-					onDeselect={ resetShadow }
-					isShownByDefault={ defaultControls.shadow }
-					panelId={ panelId }
-				>
-					<ItemGroup isBordered isSeparated>
-						<ShadowPopover
-							shadow={ shadow }
-							onShadowChange={ setShadow }
-							settings={ settings }
-						/>
-					</ItemGroup>
-				</ToolsPanelItem>
-			) }
-		</Wrapper>
-	);
-}
-
-const ShadowPopover = ( { shadow, onShadowChange, settings } ) => {
-	const popoverProps = {
-		placement: 'left-start',
-		offset: 36,
-		shift: true,
-	};
-
-	return (
-		<Dropdown
-			popoverProps={ popoverProps }
-			className="block-editor-global-styles-effects-panel__shadow-dropdown"
-			renderToggle={ renderShadowToggle() }
-			renderContent={ () => (
-				<DropdownContentWrapper paddingSize="medium">
-					<ShadowPopoverContainer
-						shadow={ shadow }
-						onShadowChange={ onShadowChange }
-						settings={ settings }
-					/>
-				</DropdownContentWrapper>
-			) }
-		/>
-	);
-};
-
-function renderShadowToggle() {
-	return ( { onToggle, isOpen } ) => {
-		const toggleProps = {
-			onClick: onToggle,
-			className: classnames( { 'is-open': isOpen } ),
-			'aria-expanded': isOpen,
-		};
-
-		return (
-			<Button { ...toggleProps }>
-				<HStack justify="flex-start">
-					<Icon
-						className="block-editor-global-styles-effects-panel__toggle-icon"
-						icon={ shadowIcon }
-						size={ 24 }
-					/>
-					<FlexItem>{ __( 'Shadow' ) }</FlexItem>
-				</HStack>
-			</Button>
-		);
-	};
-}
-
-function ShadowPopoverContainer( { shadow, onShadowChange, settings } ) {
-	const defaultShadows = settings?.shadow?.presets?.default;
-	const themeShadows = settings?.shadow?.presets?.theme;
-	const defaultPresetsEnabled = settings?.shadow?.defaultPresets;
-
-	const shadows = [
-		...( defaultPresetsEnabled ? defaultShadows : [] ),
-		...( themeShadows || [] ),
-	];
-
-	return (
-		<div className="block-editor-global-styles-effects-panel__shadow-popover-container">
-			<VStack spacing={ 4 }>
-				<Heading level={ 5 }>{ __( 'Shadow' ) }</Heading>
-				<ShadowPresets
-					presets={ shadows }
-					activeShadow={ shadow }
-					onSelect={ onShadowChange }
-				/>
-			</VStack>
-		</div>
-	);
-}
-
-function ShadowPresets( { presets, activeShadow, onSelect } ) {
-	return ! presets ? null : (
-		<Grid columns={ 6 } gap={ 0 } align="center" justify="center">
-			{ presets.map( ( { name, slug, shadow } ) => (
-				<ShadowIndicator
-					key={ slug }
-					label={ name }
-					isActive={ shadow === activeShadow }
-					onSelect={ () =>
-						onSelect( shadow === activeShadow ? undefined : shadow )
-					}
-					shadow={ shadow }
-				/>
-			) ) }
-		</Grid>
-	);
-}
-
-function ShadowIndicator( { label, isActive, onSelect, shadow } ) {
-	return (
-		<div className="block-editor-global-styles-effects-panel__shadow-indicator-wrapper">
-			<Button
-				className="block-editor-global-styles-effects-panel__shadow-indicator"
-				onClick={ onSelect }
-				label={ label }
-				style={ { boxShadow: shadow } }
-				showTooltip
-			>
-				{ isActive && <Icon icon={ check } /> }
-			</Button>
-		</div>
-	);
-}
diff --git a/packages/block-editor/src/components/global-styles/filters-panel.js b/packages/block-editor/src/components/global-styles/filters-panel.js
index 6477f354280e12..581661e0c84071 100644
--- a/packages/block-editor/src/components/global-styles/filters-panel.js
+++ b/packages/block-editor/src/components/global-styles/filters-panel.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,9 +12,9 @@ import {
 	__experimentalItemGroup as ItemGroup,
 	__experimentalHStack as HStack,
 	__experimentalZStack as ZStack,
-	__experimentalVStack as VStack,
 	__experimentalDropdownContentWrapper as DropdownContentWrapper,
 	Button,
+	MenuGroup,
 	ColorIndicator,
 	DuotonePicker,
 	DuotoneSwatch,
@@ -28,7 +28,7 @@ import { useCallback, useMemo } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { getValueFromVariable } from './utils';
+import { getValueFromVariable, useToolsPanelDropdownMenuProps } from './utils';
 import { setImmutably } from '../../utils/object';
 
 const EMPTY_ARRAY = [];
@@ -72,6 +72,7 @@ function FiltersToolsPanel( {
 	panelId,
 	children,
 } ) {
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 	const resetAll = () => {
 		const updatedValue = resetAllFilter( value );
 		onChange( updatedValue );
@@ -82,6 +83,7 @@ function FiltersToolsPanel( {
 			label={ _x( 'Filters', 'Name for applying graphical effects' ) }
 			resetAll={ resetAll }
 			panelId={ panelId }
+			dropdownMenuProps={ dropdownMenuProps }
 		>
 			{ children }
 		</ToolsPanel>
@@ -181,13 +183,16 @@ export default function FiltersPanel( {
 						renderToggle={ ( { onToggle, isOpen } ) => {
 							const toggleProps = {
 								onClick: onToggle,
-								className: classnames( { 'is-open': isOpen } ),
+								className: clsx( { 'is-open': isOpen } ),
 								'aria-expanded': isOpen,
 							};
 
 							return (
 								<ItemGroup isBordered isSeparated>
-									<Button { ...toggleProps }>
+									<Button
+										__next40pxDefaultSize
+										{ ...toggleProps }
+									>
 										<LabeledColorIndicator
 											indicator={ duotone }
 											label={ __( 'Duotone' ) }
@@ -197,8 +202,8 @@ export default function FiltersPanel( {
 							);
 						} }
 						renderContent={ () => (
-							<DropdownContentWrapper paddingSize="medium">
-								<VStack>
+							<DropdownContentWrapper paddingSize="small">
+								<MenuGroup label={ __( 'Duotone' ) }>
 									<p>
 										{ __(
 											'Create a two-tone color effect without losing your original image.'
@@ -213,7 +218,7 @@ export default function FiltersPanel( {
 										value={ duotone }
 										onChange={ setDuotone }
 									/>
-								</VStack>
+								</MenuGroup>
 							</DropdownContentWrapper>
 						) }
 					/>
diff --git a/packages/block-editor/src/components/global-styles/get-global-styles-changes.js b/packages/block-editor/src/components/global-styles/get-global-styles-changes.js
new file mode 100644
index 00000000000000..51e9b16d8048f4
--- /dev/null
+++ b/packages/block-editor/src/components/global-styles/get-global-styles-changes.js
@@ -0,0 +1,250 @@
+/**
+ * External dependencies
+ */
+import memoize from 'memize';
+
+/**
+ * WordPress dependencies
+ */
+import { __, _n, sprintf } from '@wordpress/i18n';
+import { getBlockTypes } from '@wordpress/blocks';
+
+const globalStylesChangesCache = new Map();
+const EMPTY_ARRAY = [];
+const translationMap = {
+	caption: __( 'Caption' ),
+	link: __( 'Link' ),
+	button: __( 'Button' ),
+	heading: __( 'Heading' ),
+	h1: __( 'H1' ),
+	h2: __( 'H2' ),
+	h3: __( 'H3' ),
+	h4: __( 'H4' ),
+	h5: __( 'H5' ),
+	h6: __( 'H6' ),
+	'settings.color': __( 'Color' ),
+	'settings.typography': __( 'Typography' ),
+	'styles.color': __( 'Colors' ),
+	'styles.spacing': __( 'Spacing' ),
+	'styles.background': __( 'Background' ),
+	'styles.typography': __( 'Typography' ),
+};
+const getBlockNames = memoize( () =>
+	getBlockTypes().reduce( ( accumulator, { name, title } ) => {
+		accumulator[ name ] = title;
+		return accumulator;
+	}, {} )
+);
+const isObject = ( obj ) => obj !== null && typeof obj === 'object';
+
+/**
+ * Get the translation for a given global styles key.
+ * @param {string} key A key representing a path to a global style property or setting.
+ * @return {string|undefined}                A translated key or undefined if no translation exists.
+ */
+function getTranslation( key ) {
+	if ( translationMap[ key ] ) {
+		return translationMap[ key ];
+	}
+
+	const keyArray = key.split( '.' );
+
+	if ( keyArray?.[ 0 ] === 'blocks' ) {
+		const blockName = getBlockNames()?.[ keyArray[ 1 ] ];
+		return blockName || keyArray[ 1 ];
+	}
+
+	if ( keyArray?.[ 0 ] === 'elements' ) {
+		return translationMap[ keyArray[ 1 ] ] || keyArray[ 1 ];
+	}
+
+	return undefined;
+}
+
+/**
+ * A deep comparison of two objects, optimized for comparing global styles.
+ * @param {Object} changedObject  The changed object to compare.
+ * @param {Object} originalObject The original object to compare against.
+ * @param {string} parentPath     A key/value pair object of block names and their rendered titles.
+ * @return {string[]}             An array of paths whose values have changed.
+ */
+function deepCompare( changedObject, originalObject, parentPath = '' ) {
+	// We have two non-object values to compare.
+	if ( ! isObject( changedObject ) && ! isObject( originalObject ) ) {
+		/*
+		 * Only return a path if the value has changed.
+		 * And then only the path name up to 2 levels deep.
+		 */
+		return changedObject !== originalObject
+			? parentPath.split( '.' ).slice( 0, 2 ).join( '.' )
+			: undefined;
+	}
+
+	// Enable comparison when an object doesn't have a corresponding property to compare.
+	changedObject = isObject( changedObject ) ? changedObject : {};
+	originalObject = isObject( originalObject ) ? originalObject : {};
+
+	const allKeys = new Set( [
+		...Object.keys( changedObject ),
+		...Object.keys( originalObject ),
+	] );
+
+	let diffs = [];
+	for ( const key of allKeys ) {
+		const path = parentPath ? parentPath + '.' + key : key;
+		const changedPath = deepCompare(
+			changedObject[ key ],
+			originalObject[ key ],
+			path
+		);
+		if ( changedPath ) {
+			diffs = diffs.concat( changedPath );
+		}
+	}
+	return diffs;
+}
+
+/**
+ * Returns an array of translated summarized global styles changes.
+ * Results are cached using a Map() key of `JSON.stringify( { next, previous } )`.
+ *
+ * @param {Object} next     The changed object to compare.
+ * @param {Object} previous The original object to compare against.
+ * @return {Array[]}        A 2-dimensional array of tuples: [ "group", "translated change" ].
+ */
+export function getGlobalStylesChangelist( next, previous ) {
+	const cacheKey = JSON.stringify( { next, previous } );
+
+	if ( globalStylesChangesCache.has( cacheKey ) ) {
+		return globalStylesChangesCache.get( cacheKey );
+	}
+
+	/*
+	 * Compare the two changesets with normalized keys.
+	 * The order of these keys determines the order in which
+	 * they'll appear in the results.
+	 */
+	const changedValueTree = deepCompare(
+		{
+			styles: {
+				background: next?.styles?.background,
+				color: next?.styles?.color,
+				typography: next?.styles?.typography,
+				spacing: next?.styles?.spacing,
+			},
+			blocks: next?.styles?.blocks,
+			elements: next?.styles?.elements,
+			settings: next?.settings,
+		},
+		{
+			styles: {
+				background: previous?.styles?.background,
+				color: previous?.styles?.color,
+				typography: previous?.styles?.typography,
+				spacing: previous?.styles?.spacing,
+			},
+			blocks: previous?.styles?.blocks,
+			elements: previous?.styles?.elements,
+			settings: previous?.settings,
+		}
+	);
+
+	if ( ! changedValueTree.length ) {
+		globalStylesChangesCache.set( cacheKey, EMPTY_ARRAY );
+		return EMPTY_ARRAY;
+	}
+
+	// Remove duplicate results.
+	const result = [ ...new Set( changedValueTree ) ]
+		/*
+		 * Translate the keys.
+		 * Remove empty translations.
+		 */
+		.reduce( ( acc, curr ) => {
+			const translation = getTranslation( curr );
+			if ( translation ) {
+				acc.push( [ curr.split( '.' )[ 0 ], translation ] );
+			}
+			return acc;
+		}, [] );
+
+	globalStylesChangesCache.set( cacheKey, result );
+
+	return result;
+}
+
+/**
+ * From a getGlobalStylesChangelist() result, returns an array of translated global styles changes, grouped by type.
+ * The types are 'blocks', 'elements', 'settings', and 'styles'.
+ *
+ * @param {Object}              next     The changed object to compare.
+ * @param {Object}              previous The original object to compare against.
+ * @param {{maxResults:number}} options  Options. maxResults: results to return before truncating.
+ * @return {string[]}                    An array of translated changes.
+ */
+export default function getGlobalStylesChanges( next, previous, options = {} ) {
+	let changeList = getGlobalStylesChangelist( next, previous );
+	const changesLength = changeList.length;
+	const { maxResults } = options;
+
+	if ( changesLength ) {
+		// Truncate to `n` results if necessary.
+		if ( !! maxResults && changesLength > maxResults ) {
+			changeList = changeList.slice( 0, maxResults );
+		}
+		return Object.entries(
+			changeList.reduce( ( acc, curr ) => {
+				const group = acc[ curr[ 0 ] ] || [];
+				if ( ! group.includes( curr[ 1 ] ) ) {
+					acc[ curr[ 0 ] ] = [ ...group, curr[ 1 ] ];
+				}
+				return acc;
+			}, {} )
+		).map( ( [ key, changeValues ] ) => {
+			const changeValuesLength = changeValues.length;
+			const joinedChangesValue = changeValues.join(
+				/* translators: Used between list items, there is a space after the comma. */
+				__( ', ' ) // eslint-disable-line @wordpress/i18n-no-flanking-whitespace
+			);
+			switch ( key ) {
+				case 'blocks': {
+					return sprintf(
+						// translators: %s: a list of block names separated by a comma.
+						_n( '%s block.', '%s blocks.', changeValuesLength ),
+						joinedChangesValue
+					);
+				}
+				case 'elements': {
+					return sprintf(
+						// translators: %s: a list of element names separated by a comma.
+						_n( '%s element.', '%s elements.', changeValuesLength ),
+						joinedChangesValue
+					);
+				}
+				case 'settings': {
+					return sprintf(
+						// translators: %s: a list of theme.json setting labels separated by a comma.
+						__( '%s settings.' ),
+						joinedChangesValue
+					);
+				}
+				case 'styles': {
+					return sprintf(
+						// translators: %s: a list of theme.json top-level styles labels separated by a comma.
+						__( '%s styles.' ),
+						joinedChangesValue
+					);
+				}
+				default: {
+					return sprintf(
+						// translators: %s: a list of global styles changes separated by a comma.
+						__( '%s.' ),
+						joinedChangesValue
+					);
+				}
+			}
+		} );
+	}
+
+	return EMPTY_ARRAY;
+}
diff --git a/packages/block-editor/src/components/global-styles/hooks.js b/packages/block-editor/src/components/global-styles/hooks.js
index 356ff4dce57a90..2be77aec18a2c6 100644
--- a/packages/block-editor/src/components/global-styles/hooks.js
+++ b/packages/block-editor/src/components/global-styles/hooks.js
@@ -24,6 +24,10 @@ const EMPTY_CONFIG = { settings: {}, styles: {} };
 const VALID_SETTINGS = [
 	'appearanceTools',
 	'useRootPaddingAwareAlignments',
+	'background.backgroundImage',
+	'background.backgroundRepeat',
+	'background.backgroundSize',
+	'background.backgroundPosition',
 	'border.color',
 	'border.radius',
 	'border.style',
@@ -46,6 +50,7 @@ const VALID_SETTINGS = [
 	'color.palette',
 	'color.text',
 	'custom',
+	'dimensions.aspectRatio',
 	'dimensions.minHeight',
 	'layout.contentSize',
 	'layout.definitions',
@@ -55,6 +60,7 @@ const VALID_SETTINGS = [
 	'position.fixed',
 	'position.sticky',
 	'spacing.customSpacingSize',
+	'spacing.defaultSpacingSizes',
 	'spacing.spacingSizes',
 	'spacing.spacingScale',
 	'spacing.blockGap',
@@ -63,6 +69,7 @@ const VALID_SETTINGS = [
 	'spacing.units',
 	'typography.fluid',
 	'typography.customFontSize',
+	'typography.defaultFontSizes',
 	'typography.dropCap',
 	'typography.fontFamilies',
 	'typography.fontSizes',
@@ -70,6 +77,7 @@ const VALID_SETTINGS = [
 	'typography.fontWeight',
 	'typography.letterSpacing',
 	'typography.lineHeight',
+	'typography.textAlign',
 	'typography.textColumns',
 	'typography.textDecoration',
 	'typography.textTransform',
@@ -77,14 +85,15 @@ const VALID_SETTINGS = [
 ];
 
 export const useGlobalStylesReset = () => {
-	const { user: config, setUserConfig } = useContext( GlobalStylesContext );
+	const { user, setUserConfig } = useContext( GlobalStylesContext );
+	const config = {
+		settings: user.settings,
+		styles: user.styles,
+	};
 	const canReset = !! config && ! fastDeepEqual( config, EMPTY_CONFIG );
 	return [
 		canReset,
-		useCallback(
-			() => setUserConfig( () => EMPTY_CONFIG ),
-			[ setUserConfig ]
-		),
+		useCallback( () => setUserConfig( EMPTY_CONFIG ), [ setUserConfig ] ),
 	];
 };
 
@@ -235,6 +244,7 @@ export function useSettingsForBlockElement(
 				...updatedSettings.typography,
 				fontSizes: {},
 				customFontSize: false,
+				defaultFontSizes: false,
 			};
 		}
 
@@ -285,6 +295,7 @@ export function useSettingsForBlockElement(
 			'fontStyle',
 			'fontWeight',
 			'letterSpacing',
+			'textAlign',
 			'textTransform',
 			'textDecoration',
 			'writingMode',
@@ -339,12 +350,14 @@ export function useSettingsForBlockElement(
 			}
 		} );
 
-		if ( ! supportedStyles.includes( 'minHeight' ) ) {
-			updatedSettings.dimensions = {
-				...updatedSettings.dimensions,
-				minHeight: false,
-			};
-		}
+		[ 'aspectRatio', 'minHeight' ].forEach( ( key ) => {
+			if ( ! supportedStyles.includes( key ) ) {
+				updatedSettings.dimensions = {
+					...updatedSettings.dimensions,
+					[ key ]: false,
+				};
+			}
+		} );
 
 		[ 'radius', 'color', 'style', 'width' ].forEach( ( key ) => {
 			if (
@@ -359,12 +372,26 @@ export function useSettingsForBlockElement(
 			}
 		} );
 
+		[ 'backgroundImage', 'backgroundSize' ].forEach( ( key ) => {
+			if ( ! supportedStyles.includes( key ) ) {
+				updatedSettings.background = {
+					...updatedSettings.background,
+					[ key ]: false,
+				};
+			}
+		} );
+
 		updatedSettings.shadow = supportedStyles.includes( 'shadow' )
 			? updatedSettings.shadow
 			: false;
 
+		// Text alignment is only available for blocks.
+		if ( element ) {
+			updatedSettings.typography.textAlign = false;
+		}
+
 		return updatedSettings;
-	}, [ parentSettings, supportedStyles, supports ] );
+	}, [ parentSettings, supportedStyles, supports, element ] );
 }
 
 export function useColorsPerOrigin( settings ) {
diff --git a/packages/block-editor/src/components/global-styles/image-settings-panel.js b/packages/block-editor/src/components/global-styles/image-settings-panel.js
index 68054cf129e204..4ebc20ab201983 100644
--- a/packages/block-editor/src/components/global-styles/image-settings-panel.js
+++ b/packages/block-editor/src/components/global-styles/image-settings-panel.js
@@ -8,6 +8,11 @@ import {
 } from '@wordpress/components';
 import { __, _x } from '@wordpress/i18n';
 
+/**
+ * Internal dependencies
+ */
+import { useToolsPanelDropdownMenuProps } from './utils';
+
 export function useHasImageSettingsPanel( name, value, inheritedValue ) {
 	// Note: If lightbox `value` exists, that means it was
 	// defined via the the Global Styles UI and will NOT
@@ -25,6 +30,7 @@ export default function ImageSettingsPanel( {
 	inheritedValue,
 	panelId,
 } ) {
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 	const resetLightbox = () => {
 		onChange( undefined );
 	};
@@ -47,6 +53,7 @@ export default function ImageSettingsPanel( {
 				label={ _x( 'Settings', 'Image settings' ) }
 				resetAll={ resetLightbox }
 				panelId={ panelId }
+				dropdownMenuProps={ dropdownMenuProps }
 			>
 				<ToolsPanelItem
 					// We use the `userSettings` prop instead of `settings`, because `settings`
@@ -56,10 +63,11 @@ export default function ImageSettingsPanel( {
 					hasValue={ () => !! value?.lightbox }
 					label={ __( 'Expand on click' ) }
 					onDeselect={ resetLightbox }
-					isShownByDefault={ true }
+					isShownByDefault
 					panelId={ panelId }
 				>
 					<ToggleControl
+						__nextHasNoMarginBottom
 						label={ __( 'Expand on click' ) }
 						checked={ lightboxChecked }
 						onChange={ onChangeLightbox }
diff --git a/packages/block-editor/src/components/global-styles/index.js b/packages/block-editor/src/components/global-styles/index.js
index 76a95357ba52b4..8096a48569f199 100644
--- a/packages/block-editor/src/components/global-styles/index.js
+++ b/packages/block-editor/src/components/global-styles/index.js
@@ -7,6 +7,8 @@ export {
 export { getBlockCSSSelector } from './get-block-css-selector';
 export {
 	getLayoutStyles,
+	getBlockSelectors,
+	toStyles,
 	useGlobalStylesOutput,
 	useGlobalStylesOutputWithConfig,
 } from './use-global-styles-output';
@@ -19,13 +21,21 @@ export {
 	default as DimensionsPanel,
 	useHasDimensionsPanel,
 } from './dimensions-panel';
-export { default as BorderPanel, useHasBorderPanel } from './border-panel';
+export {
+	default as BorderPanel,
+	useHasBorderPanel,
+	useHasBorderPanelControls,
+} from './border-panel';
 export { default as ColorPanel, useHasColorPanel } from './color-panel';
-export { default as EffectsPanel, useHasEffectsPanel } from './effects-panel';
 export { default as FiltersPanel, useHasFiltersPanel } from './filters-panel';
 export {
 	default as ImageSettingsPanel,
 	useHasImageSettingsPanel,
 } from './image-settings-panel';
 export { default as AdvancedPanel } from './advanced-panel';
+export {
+	default as BackgroundPanel,
+	useHasBackgroundPanel,
+} from './background-panel';
 export { areGlobalStyleConfigsEqual } from './utils';
+export { default as getGlobalStylesChanges } from './get-global-styles-changes';
diff --git a/packages/block-editor/src/components/global-styles/shadow-panel-components.js b/packages/block-editor/src/components/global-styles/shadow-panel-components.js
new file mode 100644
index 00000000000000..1cfdff0be286ee
--- /dev/null
+++ b/packages/block-editor/src/components/global-styles/shadow-panel-components.js
@@ -0,0 +1,188 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import {
+	__experimentalVStack as VStack,
+	__experimentalHeading as Heading,
+	__experimentalHStack as HStack,
+	__experimentalDropdownContentWrapper as DropdownContentWrapper,
+	Button,
+	FlexItem,
+	Dropdown,
+	Composite,
+	Tooltip,
+} from '@wordpress/components';
+import { useMemo } from '@wordpress/element';
+import { shadow as shadowIcon, Icon, check } from '@wordpress/icons';
+
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * Shared reference to an empty array for cases where it is important to avoid
+ * returning a new array reference on every invocation.
+ *
+ * @type {Array}
+ */
+const EMPTY_ARRAY = [];
+
+export function ShadowPopoverContainer( { shadow, onShadowChange, settings } ) {
+	const shadows = useShadowPresets( settings );
+
+	return (
+		<div className="block-editor-global-styles__shadow-popover-container">
+			<VStack spacing={ 4 }>
+				<Heading level={ 5 }>{ __( 'Drop shadow' ) }</Heading>
+				<ShadowPresets
+					presets={ shadows }
+					activeShadow={ shadow }
+					onSelect={ onShadowChange }
+				/>
+				<div className="block-editor-global-styles__clear-shadow">
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ () => onShadowChange( undefined ) }
+					>
+						{ __( 'Clear' ) }
+					</Button>
+				</div>
+			</VStack>
+		</div>
+	);
+}
+
+export function ShadowPresets( { presets, activeShadow, onSelect } ) {
+	return ! presets ? null : (
+		<Composite
+			role="listbox"
+			className="block-editor-global-styles__shadow__list"
+			aria-label={ __( 'Drop shadows' ) }
+		>
+			{ presets.map( ( { name, slug, shadow } ) => (
+				<ShadowIndicator
+					key={ slug }
+					label={ name }
+					isActive={ shadow === activeShadow }
+					type={ slug === 'unset' ? 'unset' : 'preset' }
+					onSelect={ () =>
+						onSelect( shadow === activeShadow ? undefined : shadow )
+					}
+					shadow={ shadow }
+				/>
+			) ) }
+		</Composite>
+	);
+}
+
+export function ShadowIndicator( { type, label, isActive, onSelect, shadow } ) {
+	return (
+		<Tooltip text={ label }>
+			<Composite.Item
+				role="option"
+				aria-label={ label }
+				aria-selected={ isActive }
+				className={ clsx( 'block-editor-global-styles__shadow__item', {
+					'is-active': isActive,
+				} ) }
+				render={
+					<button
+						className={ clsx(
+							'block-editor-global-styles__shadow-indicator',
+							{
+								unset: type === 'unset',
+							}
+						) }
+						onClick={ onSelect }
+						style={ { boxShadow: shadow } }
+						aria-label={ label }
+					>
+						{ isActive && <Icon icon={ check } /> }
+					</button>
+				}
+			/>
+		</Tooltip>
+	);
+}
+
+export function ShadowPopover( { shadow, onShadowChange, settings } ) {
+	const popoverProps = {
+		placement: 'left-start',
+		offset: 36,
+		shift: true,
+	};
+
+	return (
+		<Dropdown
+			popoverProps={ popoverProps }
+			className="block-editor-global-styles__shadow-dropdown"
+			renderToggle={ renderShadowToggle() }
+			renderContent={ () => (
+				<DropdownContentWrapper paddingSize="medium">
+					<ShadowPopoverContainer
+						shadow={ shadow }
+						onShadowChange={ onShadowChange }
+						settings={ settings }
+					/>
+				</DropdownContentWrapper>
+			) }
+		/>
+	);
+}
+
+function renderShadowToggle() {
+	return ( { onToggle, isOpen } ) => {
+		const toggleProps = {
+			onClick: onToggle,
+			className: clsx( { 'is-open': isOpen } ),
+			'aria-expanded': isOpen,
+		};
+
+		return (
+			<Button __next40pxDefaultSize { ...toggleProps }>
+				<HStack justify="flex-start">
+					<Icon
+						className="block-editor-global-styles__toggle-icon"
+						icon={ shadowIcon }
+						size={ 24 }
+					/>
+					<FlexItem>{ __( 'Drop shadow' ) }</FlexItem>
+				</HStack>
+			</Button>
+		);
+	};
+}
+
+export function useShadowPresets( settings ) {
+	return useMemo( () => {
+		if ( ! settings?.shadow ) {
+			return EMPTY_ARRAY;
+		}
+
+		const defaultPresetsEnabled = settings?.shadow?.defaultPresets;
+		const {
+			default: defaultShadows,
+			theme: themeShadows,
+			custom: customShadows,
+		} = settings?.shadow?.presets ?? {};
+		const unsetShadow = {
+			name: __( 'Unset' ),
+			slug: 'unset',
+			shadow: 'none',
+		};
+
+		const shadowPresets = [
+			...( ( defaultPresetsEnabled && defaultShadows ) || EMPTY_ARRAY ),
+			...( themeShadows || EMPTY_ARRAY ),
+			...( customShadows || EMPTY_ARRAY ),
+		];
+		if ( shadowPresets.length ) {
+			shadowPresets.unshift( unsetShadow );
+		}
+
+		return shadowPresets;
+	}, [ settings ] );
+}
diff --git a/packages/block-editor/src/components/global-styles/style.scss b/packages/block-editor/src/components/global-styles/style.scss
index 46429ea5c47765..e0782fdb01b1d0 100644
--- a/packages/block-editor/src/components/global-styles/style.scss
+++ b/packages/block-editor/src/components/global-styles/style.scss
@@ -1,13 +1,27 @@
-.block-editor-global-styles-effects-panel__toggle-icon {
+.block-editor-global-styles__toggle-icon {
 	fill: currentColor;
 }
 
-.block-editor-global-styles-effects-panel__shadow-popover-container {
+// @todo Ideally, popover, swatch size, and gap values should be CSS variables
+// to apply precise grid layouts.
+// https://github.com/WordPress/gutenberg/blob/954ecae571abbddc113d3a4bd8e1a72230180554/packages/block-editor/src/components/duotone-control/style.scss#L3-L9
+.block-editor-global-styles__shadow-popover-container {
 	width: 230px;
 }
 
+.block-editor-global-styles__shadow__list {
+	display: flex;
+	gap: 12px;
+	flex-wrap: wrap;
+	padding-bottom: $grid-unit-10;
+}
+
+.block-editor-global-styles__clear-shadow {
+	text-align: right;
+}
+
 .block-editor-global-styles-filters-panel__dropdown,
-.block-editor-global-styles-effects-panel__shadow-dropdown {
+.block-editor-global-styles__shadow-dropdown {
 	display: block;
 	padding: 0;
 
@@ -21,25 +35,38 @@
 	}
 }
 
-// wrapper to clip the shadow beyond 6px
-.block-editor-global-styles-effects-panel__shadow-indicator-wrapper {
-	padding: 6px;
-	overflow: hidden;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
 // These styles are similar to the color palette.
-.block-editor-global-styles-effects-panel__shadow-indicator {
+.block-editor-global-styles__shadow-indicator {
+	appearance: none;
+	background: none;
 	color: $gray-800;
 	border: $gray-200 $border-width solid;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	cursor: pointer;
+	display: inline-flex;
+	align-items: center;
+
 	padding: 0;
 
-	height: 24px;
-	width: 24px;
+	height: $button-size-small + 2 * $border-width;
+	width: $button-size-small + 2 * $border-width;
+	box-sizing: border-box;
+
+	transform: scale(1);
+	transition: transform 0.1s ease;
+	will-change: transform;
+
+	&:focus {
+		border: #{ $border-width * 2 } solid $gray-700;
+	}
+
+	&:hover {
+		transform: scale(1.2);
+	}
+
+	&.unset {
+		background: linear-gradient(-45deg, transparent 48%, $gray-300 48%, $gray-300 52%, transparent 52%);
+	}
 }
 
 .block-editor-global-styles-advanced-panel__custom-css-input textarea {
@@ -48,13 +75,3 @@
 	/*rtl:ignore*/
 	direction: ltr;
 }
-
-.block-editor-global-styles-advanced-panel__custom-css-validation-wrapper {
-	position: absolute;
-	bottom: $grid-unit-20;
-	right: $grid-unit * 3;
-}
-
-.block-editor-global-styles-advanced-panel__custom-css-validation-icon {
-	fill: $alert-red;
-}
diff --git a/packages/block-editor/src/components/global-styles/test/background-panel.js b/packages/block-editor/src/components/global-styles/test/background-panel.js
new file mode 100644
index 00000000000000..ad2c55e747f705
--- /dev/null
+++ b/packages/block-editor/src/components/global-styles/test/background-panel.js
@@ -0,0 +1,39 @@
+/**
+ * Internal dependencies
+ */
+
+import { hasBackgroundImageValue } from '../background-panel';
+
+describe( 'hasBackgroundImageValue', () => {
+	it( 'should return `true` when id and url exist', () => {
+		expect(
+			hasBackgroundImageValue( {
+				background: { backgroundImage: { id: 1, url: 'url' } },
+			} )
+		).toBe( true );
+	} );
+
+	it( 'should return `true` when only url exists', () => {
+		expect(
+			hasBackgroundImageValue( {
+				background: { backgroundImage: { url: 'url' } },
+			} )
+		).toBe( true );
+	} );
+
+	it( 'should return `true` when only id exists', () => {
+		expect(
+			hasBackgroundImageValue( {
+				background: { backgroundImage: { id: 1 } },
+			} )
+		).toBe( true );
+	} );
+
+	it( 'should return `false` when id and url do not exist', () => {
+		expect(
+			hasBackgroundImageValue( {
+				background: { backgroundImage: {} },
+			} )
+		).toBe( false );
+	} );
+} );
diff --git a/packages/block-editor/src/components/global-styles/test/get-global-styles-changes.js b/packages/block-editor/src/components/global-styles/test/get-global-styles-changes.js
new file mode 100644
index 00000000000000..9c220da7ead12e
--- /dev/null
+++ b/packages/block-editor/src/components/global-styles/test/get-global-styles-changes.js
@@ -0,0 +1,290 @@
+/**
+ * Internal dependencies
+ */
+import getGlobalStylesChanges, {
+	getGlobalStylesChangelist,
+} from '../get-global-styles-changes';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	registerBlockType,
+	unregisterBlockType,
+	getBlockTypes,
+} from '@wordpress/blocks';
+
+describe( 'getGlobalStylesChanges and utils', () => {
+	const next = {
+		styles: {
+			background: {
+				backgroundImage: {
+					url: 'https://example.com/image.jpg',
+				},
+				backgroundSize: 'contain',
+				backgroundPosition: '30% 30%',
+				backgroundRepeat: 'no-repeat',
+			},
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--potato)',
+				fontStyle: 'normal',
+				fontWeight: '600',
+				lineHeight: '1.85',
+				fontFamily: 'var(--wp--preset--font-family--asparagus)',
+			},
+			spacing: {
+				padding: {
+					top: '36px',
+					right: '89px',
+					bottom: '133px',
+					left: 'var(--wp--preset--spacing--20)',
+				},
+				blockGap: '114px',
+			},
+			elements: {
+				heading: {
+					typography: {
+						letterSpacing: '37px',
+					},
+				},
+				h3: {
+					typography: {
+						lineHeight: '1.2',
+					},
+				},
+				caption: {
+					color: {
+						text: 'var(--wp--preset--color--pineapple)',
+					},
+				},
+			},
+			color: {
+				text: 'var(--wp--preset--color--tomato)',
+			},
+			blocks: {
+				'core/test-fiori-di-zucca': {
+					color: {
+						text: '#000000',
+					},
+				},
+			},
+		},
+		settings: {
+			color: {
+				palette: {
+					theme: [
+						{
+							slug: 'one',
+							color: 'pink',
+						},
+					],
+				},
+				gradients: [
+					{
+						name: 'Something something',
+						gradient:
+							'linear-gradient(105deg,rgba(6,147,100,1) 0%,rgb(155,81,100) 100%)',
+						slug: 'something-something',
+					},
+				],
+			},
+		},
+	};
+	const previous = {
+		styles: {
+			background: {
+				backgroundImage: {
+					url: 'https://example.com/image_new.jpg',
+				},
+				backgroundSize: 'contain',
+				backgroundPosition: '40% 77%',
+				backgroundRepeat: 'repeat',
+			},
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--fungus)',
+				fontStyle: 'normal',
+				fontWeight: '600',
+				lineHeight: '1.85',
+				fontFamily: 'var(--wp--preset--font-family--grapes)',
+			},
+			spacing: {
+				padding: {
+					top: '36px',
+					right: '89px',
+					bottom: '133px',
+					left: 'var(--wp--preset--spacing--20)',
+				},
+				blockGap: '114px',
+			},
+			elements: {
+				heading: {
+					typography: {
+						letterSpacing: '37px',
+					},
+				},
+				h3: {
+					typography: {
+						lineHeight: '2',
+					},
+				},
+				h6: {
+					typography: {
+						lineHeight: '1.2',
+					},
+				},
+				caption: {
+					typography: {
+						fontSize: '1.11rem',
+						fontStyle: 'normal',
+						fontWeight: '600',
+					},
+				},
+				link: {
+					typography: {
+						lineHeight: 2,
+						textDecoration: 'line-through',
+					},
+					color: {
+						text: 'var(--wp--preset--color--egg)',
+					},
+				},
+			},
+			color: {
+				text: 'var(--wp--preset--color--tomato)',
+				background: 'var(--wp--preset--color--pumpkin)',
+			},
+			blocks: {
+				'core/test-fiori-di-zucca': {
+					color: {
+						text: '#fff',
+					},
+				},
+			},
+		},
+		settings: {
+			color: {
+				palette: {
+					theme: [
+						{
+							slug: 'one',
+							color: 'blue',
+						},
+					],
+					custom: [
+						{
+							slug: 'one',
+							color: 'tomato',
+						},
+					],
+				},
+				gradients: [
+					{
+						name: 'Vivid cyan blue to vivid purple',
+						gradient:
+							'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
+						slug: 'vivid-cyan-blue-to-vivid-purple',
+					},
+				],
+			},
+			typography: {
+				fluid: true,
+			},
+		},
+	};
+
+	beforeEach( () => {
+		registerBlockType( 'core/test-fiori-di-zucca', {
+			save: () => {},
+			category: 'text',
+			title: 'Test pumpkin flowers',
+			edit: () => {},
+		} );
+	} );
+
+	afterEach( () => {
+		getBlockTypes().forEach( ( block ) => {
+			unregisterBlockType( block.name );
+		} );
+	} );
+
+	describe( 'getGlobalStylesChanges()', () => {
+		it( 'returns a list of changes', () => {
+			const result = getGlobalStylesChanges( next, previous );
+			expect( result ).toEqual( [
+				'Background, Colors, Typography styles.',
+				'Test pumpkin flowers block.',
+				'H3, Caption, H6, Link elements.',
+				'Color, Typography settings.',
+			] );
+		} );
+
+		it( 'returns a list of truncated changes', () => {
+			const resultA = getGlobalStylesChanges( next, previous, {
+				maxResults: 4,
+			} );
+			expect( resultA ).toEqual( [
+				'Background, Colors, Typography styles.',
+				'Test pumpkin flowers block.',
+			] );
+		} );
+
+		it( 'skips unknown and unchanged keys', () => {
+			const result = getGlobalStylesChanges(
+				{
+					styles: {
+						frogs: {
+							legs: 'green',
+						},
+						typography: {
+							fontSize: '1rem',
+						},
+						settings: {
+							'': {
+								'': 'foo',
+							},
+						},
+					},
+				},
+				{
+					styles: {
+						frogs: {
+							legs: 'yellow',
+						},
+						typography: {
+							fontSize: '1rem',
+						},
+						settings: {
+							'': {
+								'': 'bar',
+							},
+						},
+					},
+				}
+			);
+			expect( result ).toEqual( [] );
+		} );
+	} );
+
+	describe( 'getGlobalStylesChangelist()', () => {
+		it( 'compares two objects and returns a cached list of changed keys', () => {
+			const resultA = getGlobalStylesChangelist( next, previous );
+
+			expect( resultA ).toEqual( [
+				[ 'styles', 'Background' ],
+				[ 'styles', 'Colors' ],
+				[ 'styles', 'Typography' ],
+				[ 'blocks', 'Test pumpkin flowers' ],
+				[ 'elements', 'H3' ],
+				[ 'elements', 'Caption' ],
+				[ 'elements', 'H6' ],
+				[ 'elements', 'Link' ],
+				[ 'settings', 'Color' ],
+				[ 'settings', 'Typography' ],
+			] );
+
+			const resultB = getGlobalStylesChangelist( next, previous );
+
+			expect( resultB ).toEqual( resultA );
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/components/global-styles/test/typography-utils.js b/packages/block-editor/src/components/global-styles/test/typography-utils.js
index 79526c2fabb092..b094d1e827783e 100644
--- a/packages/block-editor/src/components/global-styles/test/typography-utils.js
+++ b/packages/block-editor/src/components/global-styles/test/typography-utils.js
@@ -4,6 +4,10 @@
 import {
 	getTypographyFontSizeValue,
 	getFluidTypographyOptionsFromSettings,
+	getMergedFontFamiliesAndFontFamilyFaces,
+	findNearestFontWeight,
+	findNearestFontStyle,
+	findNearestStyleAndWeight,
 } from '../typography-utils';
 
 describe( 'typography utils', () => {
@@ -24,7 +28,9 @@ describe( 'typography utils', () => {
 				preset: {
 					size: 0,
 				},
-				typographySettings: undefined,
+				typographySettings: {
+					fluid: true,
+				},
 				expected: 0,
 			},
 
@@ -33,7 +39,9 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '0',
 				},
-				typographySettings: undefined,
+				typographySettings: {
+					fluid: true,
+				},
 				expected: '0',
 			},
 
@@ -42,7 +50,9 @@ describe( 'typography utils', () => {
 				preset: {
 					size: null,
 				},
-				typographySettings: null,
+				typographySettings: {
+					fluid: true,
+				},
 				expected: null,
 			},
 
@@ -52,20 +62,108 @@ describe( 'typography utils', () => {
 					size: '28px',
 					fluid: false,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
+				},
+				expected: '28px',
+			},
+
+			{
+				message: 'should return value when fluid config is empty`',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: {},
+					},
 				},
 				expected: '28px',
 			},
 
+			{
+				message:
+					'should return  clamp value with `minViewportWidth` override',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: {
+							minViewportWidth: '500px',
+						},
+					},
+				},
+				expected:
+					'clamp(17.905px, 1.119rem + ((1vw - 5px) * 0.918), 28px)',
+			},
+
+			{
+				message:
+					'should return  clamp value with `maxViewportWidth` override',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: {
+							maxViewportWidth: '500px',
+						},
+					},
+				},
+				expected:
+					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 5.608), 28px)',
+			},
+
+			{
+				message:
+					'should return clamp value with `layout.wideSize` override',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: true,
+					},
+					layout: {
+						wideSize: '500px',
+					},
+				},
+				expected:
+					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 5.608), 28px)',
+			},
+
+			{
+				message:
+					'should return clamp value with `maxViewportWidth` preferred over fallback `layout.wideSize` value',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: {
+							maxViewportWidth: '1000px',
+						},
+					},
+					layout: {
+						wideSize: '500px',
+					},
+				},
+				expected:
+					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 1.485), 28px)',
+			},
+
 			{
 				message: 'should return already clamped value',
 				preset: {
 					size: 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
-					fluid: false,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
@@ -75,10 +173,11 @@ describe( 'typography utils', () => {
 				message: 'should return value with unsupported unit',
 				preset: {
 					size: '1000%',
-					fluid: false,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: '1000%',
 			},
@@ -88,8 +187,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '1.75rem',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(1.119rem, 1.119rem + ((1vw - 0.2rem) * 0.789), 1.75rem)',
@@ -101,9 +202,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '1.75rem',
 				},
-				typographySettings: {
-					fluid: {
-						maxViewportWidth: '1200px',
+				settings: {
+					typography: {
+						fluid: {
+							maxViewportWidth: '1200px',
+						},
 					},
 				},
 				expected:
@@ -116,9 +219,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '1.75rem',
 				},
-				typographySettings: {
-					fluid: {
-						minViewportWidth: '800px',
+				settings: {
+					typography: {
+						fluid: {
+							minViewportWidth: '800px',
+						},
 					},
 				},
 				expected:
@@ -130,8 +235,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '1.75em',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(1.119em, 1.119rem + ((1vw - 0.2em) * 0.789), 1.75em)',
@@ -142,8 +249,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '70.175px',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
@@ -156,8 +265,10 @@ describe( 'typography utils', () => {
 					size: 33,
 					fluid: true,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(20.515px, 1.282rem + ((1vw - 3.2px) * 0.975), 33px)',
@@ -169,8 +280,10 @@ describe( 'typography utils', () => {
 					size: 70.175,
 					fluid: true,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
@@ -183,8 +296,10 @@ describe( 'typography utils', () => {
 					size: '28px',
 					fluid: [],
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
@@ -196,8 +311,10 @@ describe( 'typography utils', () => {
 					size: '28px',
 					fluid: null,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
@@ -213,8 +330,10 @@ describe( 'typography utils', () => {
 						max: '125px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(70px, 4.375rem + ((1vw - 3.2px) * 4.297), 125px)',
@@ -230,9 +349,11 @@ describe( 'typography utils', () => {
 						max: '125px',
 					},
 				},
-				typographySettings: {
-					fluid: {
-						maxViewportWidth: '1100px',
+				settings: {
+					typography: {
+						fluid: {
+							maxViewportWidth: '1100px',
+						},
 					},
 				},
 				expected:
@@ -248,8 +369,10 @@ describe( 'typography utils', () => {
 						max: '7.8125rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(4.375rem, 4.375rem + ((1vw - 0.2rem) * 4.298), 7.8125rem)',
@@ -265,8 +388,10 @@ describe( 'typography utils', () => {
 						max: '32px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: 'clamp(5rem, 5rem + ((1vw - 0.2rem) * -3.75), 32px)',
 			},
@@ -280,8 +405,10 @@ describe( 'typography utils', () => {
 						max: '50%',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: '10em',
 			},
@@ -292,8 +419,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '3px',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: '3px',
 			},
@@ -304,8 +433,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '14px',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: '14px',
 			},
@@ -320,8 +451,10 @@ describe( 'typography utils', () => {
 						max: '50rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(20px, 1.25rem + ((1vw - 3.2px) * 60.938), 50rem)',
@@ -336,8 +469,10 @@ describe( 'typography utils', () => {
 						min: '2.6rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(2.6rem, 2.6rem + ((1vw - 0.2rem) * 0.656), 50px)',
@@ -352,8 +487,10 @@ describe( 'typography utils', () => {
 						max: '80px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 4.851), 80px)',
@@ -369,8 +506,10 @@ describe( 'typography utils', () => {
 						max: '5rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(0.5rem, 0.5rem + ((1vw - 0.2rem) * 5.625), 5rem)',
@@ -385,8 +524,10 @@ describe( 'typography utils', () => {
 						min: '12px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(12px, 0.75rem + ((1vw - 3.2px) * 0.625), 20px)',
@@ -401,13 +542,14 @@ describe( 'typography utils', () => {
 						max: '20rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(0.875rem, 0.875rem + ((1vw - 0.2rem) * 23.906), 20rem)',
 			},
-
 			{
 				message:
 					'should return clamp value when min and max font sizes are equal',
@@ -418,8 +560,10 @@ describe( 'typography utils', () => {
 						max: '30px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: 'clamp(30px, 1.875rem + ((1vw - 3.2px) * 1), 30px)',
 			},
@@ -430,9 +574,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '15px',
 				},
-				typographySettings: {
-					fluid: {
-						minFontSize: '16%',
+				settings: {
+					typography: {
+						fluid: {
+							minFontSize: '16%',
+						},
 					},
 				},
 				expected:
@@ -445,9 +591,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '17px',
 				},
-				typographySettings: {
-					fluid: {
-						minFontSize: '16px',
+				settings: {
+					typography: {
+						fluid: {
+							minFontSize: '16px',
+						},
 					},
 				},
 				expected: 'clamp(16px, 1rem + ((1vw - 3.2px) * 0.078), 17px)',
@@ -459,9 +607,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '15px',
 				},
-				typographySettings: {
-					fluid: {
-						minFontSize: '16px',
+				settings: {
+					typography: {
+						fluid: {
+							minFontSize: '16px',
+						},
 					},
 				},
 				expected: '15px',
@@ -473,8 +623,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '12rem',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(5.174rem, 5.174rem + ((1vw - 0.2rem) * 8.533), 12rem)',
@@ -486,8 +638,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '200px',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(85.342px, 5.334rem + ((1vw - 3.2px) * 8.958), 200px)',
@@ -502,8 +656,10 @@ describe( 'typography utils', () => {
 						min: '100px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(100px, 6.25rem + ((1vw - 3.2px) * 7.813), 200px)',
@@ -514,24 +670,703 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '17px',
 				},
-				typographySettings: {
-					fluid: {
-						minFontSize: '16px',
-						maxViewportWidth: '1200px',
-						minViewportWidth: '640px',
+				settings: {
+					typography: {
+						fluid: {
+							minFontSize: '16px',
+							maxViewportWidth: '1200px',
+							minViewportWidth: '640px',
+						},
 					},
 				},
 				expected: 'clamp(16px, 1rem + ((1vw - 6.4px) * 0.179), 17px)',
 			},
-		].forEach( ( { message, preset, typographySettings, expected } ) => {
+
+			// Individual preset settings override global settings.
+			{
+				message:
+					'should convert individual preset size to fluid if fluid is disabled in global settings',
+				preset: {
+					size: '17px',
+					fluid: true,
+				},
+				settings: {
+					typography: {},
+				},
+				expected:
+					'clamp(14px, 0.875rem + ((1vw - 3.2px) * 0.234), 17px)',
+			},
+			{
+				message:
+					'should use individual preset settings if fluid is disabled in global settings',
+				preset: {
+					size: '17px',
+					fluid: {
+						min: '16px',
+						max: '26px',
+					},
+				},
+				settings: {
+					typography: {
+						fluid: false,
+					},
+				},
+				expected: 'clamp(16px, 1rem + ((1vw - 3.2px) * 0.781), 26px)',
+			},
+		].forEach( ( { message, preset, settings, expected } ) => {
+			it( `${ message }`, () => {
+				expect( getTypographyFontSizeValue( preset, settings ) ).toBe(
+					expected
+				);
+			} );
+		} );
+	} );
+
+	describe( 'getMergedFontFamiliesAndFontFamilyFaces', () => {
+		[
+			{
+				message:
+					'should return empty arrays when settings and fontFamily are empty',
+				settings: {},
+				fontFamily: '',
+				expected: {
+					fontFamilies: [],
+					fontFamilyFaces: [],
+				},
+			},
+
+			{
+				message:
+					'should return empty arrays when only settings is `undefined`',
+				settings: undefined,
+				fontFamily: 'ABeeZee, sans-serif',
+				expected: {
+					fontFamilies: [],
+					fontFamilyFaces: [],
+				},
+			},
+
+			{
+				message:
+					'should return fontFamilies array and an empty fontFamilyFaces array when fontfamily is empty',
+				settings: {
+					typography: {
+						fontFamilies: {
+							custom: [
+								{
+									name: 'ABeeZee',
+									slug: 'abeezee',
+									fontFamily: 'ABeeZee, sans-serif',
+									fontFace: [
+										{
+											src: 'http://www.wordpress.org/wp-content/uploads/fonts/esDT31xSG-6AGleN2tCkkJUCGpG-GQ.woff2',
+											fontWeight: '400',
+											fontStyle: 'italic',
+											fontFamily: 'ABeeZee',
+										},
+									],
+								},
+							],
+						},
+					},
+				},
+				fontFamily: '',
+				expected: {
+					fontFamilies: [
+						{
+							fontFace: [
+								{
+									fontFamily: 'ABeeZee',
+									fontStyle: 'italic',
+									fontWeight: '400',
+									src: 'http://www.wordpress.org/wp-content/uploads/fonts/esDT31xSG-6AGleN2tCkkJUCGpG-GQ.woff2',
+								},
+							],
+							fontFamily: 'ABeeZee, sans-serif',
+							name: 'ABeeZee',
+							slug: 'abeezee',
+						},
+					],
+					fontFamilyFaces: [],
+				},
+			},
+
+			{
+				message:
+					'should return font families and font faces when both settings and fontFamily are defined',
+				settings: {
+					typography: {
+						fontFamilies: {
+							theme: [
+								{
+									fontFace: [
+										{
+											fontFamily: 'PT Sans',
+											fontStyle: 'normal',
+											fontWeight: '400',
+											src: [
+												'file:./assets/fonts/pt-sans_normal_400.ttf',
+											],
+										},
+										{
+											fontFamily: 'PT Sans',
+											fontStyle: 'normal',
+											fontWeight: '700',
+											src: [
+												'file:./assets/fonts/pt-sans_normal_700.ttf',
+											],
+										},
+										{
+											fontFamily: 'PT Sans',
+											fontStyle: 'italic',
+											fontWeight: '400',
+											src: [
+												'file:./assets/fonts/pt-sans_italic_400.ttf',
+											],
+										},
+										{
+											fontFamily: 'PT Sans',
+											fontStyle: 'italic',
+											fontWeight: '700',
+											src: [
+												'file:./assets/fonts/pt-sans_italic_700.ttf',
+											],
+										},
+									],
+									fontFamily: 'PT Sans',
+									name: 'PT Sans',
+									slug: 'pt-sans',
+								},
+							],
+							custom: [
+								{
+									name: 'ABeeZee',
+									slug: 'abeezee',
+									fontFamily: 'ABeeZee, sans-serif',
+									fontFace: [
+										{
+											src: 'http://www.wordpress.org/wp-content/uploads/fonts/esDT31xSG-6AGleN2tCkkJUCGpG-GQ.woff2',
+											fontWeight: '400',
+											fontStyle: 'italic',
+											fontFamily: 'ABeeZee',
+										},
+									],
+								},
+							],
+						},
+					},
+				},
+				fontFamily: 'ABeeZee, sans-serif',
+				expected: {
+					fontFamilyFaces: [
+						{
+							fontFamily: 'ABeeZee',
+							fontStyle: 'italic',
+							fontWeight: '400',
+							src: 'http://www.wordpress.org/wp-content/uploads/fonts/esDT31xSG-6AGleN2tCkkJUCGpG-GQ.woff2',
+						},
+					],
+					fontFamilies: [
+						{
+							fontFace: [
+								{
+									fontFamily: 'PT Sans',
+									fontStyle: 'normal',
+									fontWeight: '400',
+									src: [
+										'file:./assets/fonts/pt-sans_normal_400.ttf',
+									],
+								},
+								{
+									fontFamily: 'PT Sans',
+									fontStyle: 'normal',
+									fontWeight: '700',
+									src: [
+										'file:./assets/fonts/pt-sans_normal_700.ttf',
+									],
+								},
+								{
+									fontFamily: 'PT Sans',
+									fontStyle: 'italic',
+									fontWeight: '400',
+									src: [
+										'file:./assets/fonts/pt-sans_italic_400.ttf',
+									],
+								},
+								{
+									fontFamily: 'PT Sans',
+									fontStyle: 'italic',
+									fontWeight: '700',
+									src: [
+										'file:./assets/fonts/pt-sans_italic_700.ttf',
+									],
+								},
+							],
+							fontFamily: 'PT Sans',
+							name: 'PT Sans',
+							slug: 'pt-sans',
+						},
+						{
+							fontFace: [
+								{
+									fontFamily: 'ABeeZee',
+									fontStyle: 'italic',
+									fontWeight: '400',
+									src: 'http://www.wordpress.org/wp-content/uploads/fonts/esDT31xSG-6AGleN2tCkkJUCGpG-GQ.woff2',
+								},
+							],
+							fontFamily: 'ABeeZee, sans-serif',
+							name: 'ABeeZee',
+							slug: 'abeezee',
+						},
+					],
+				},
+			},
+		].forEach( ( { message, settings, fontFamily, expected } ) => {
 			it( `${ message }`, () => {
 				expect(
-					getTypographyFontSizeValue( preset, typographySettings )
-				).toBe( expected );
+					getMergedFontFamiliesAndFontFamilyFaces(
+						settings,
+						fontFamily
+					)
+				).toEqual( expected );
 			} );
 		} );
 	} );
 
+	describe( 'findNearestFontWeight', () => {
+		[
+			{
+				message:
+					'should return empty string when newFontWeightValue is `undefined`',
+				availableFontWeights: undefined,
+				newFontWeightValue: undefined,
+				expected: '',
+			},
+			{
+				message:
+					'should return newFontWeightValue value when availableFontWeights is empty',
+				availableFontWeights: [],
+				newFontWeightValue: '300',
+				expected: '300',
+			},
+			{
+				message: 'should return correct nearest higher font weight',
+				availableFontWeights: [
+					{ name: 'Regular', value: '400' },
+					{ name: 'Bold', value: '700' },
+					{ name: 'Black', value: '900' },
+				],
+				newFontWeightValue: '300',
+				expected: '400',
+			},
+			{
+				message: 'should return correct nearest lower font weight',
+				availableFontWeights: [
+					{ name: 'Thin', value: '100' },
+					{ name: 'Light', value: '300' },
+					{ name: 'Regular', value: '400' },
+				],
+				newFontWeightValue: '900',
+				expected: '400',
+			},
+		].forEach(
+			( {
+				message,
+				availableFontWeights,
+				newFontWeightValue,
+				expected,
+			} ) => {
+				it( `${ message }`, () => {
+					expect(
+						findNearestFontWeight(
+							availableFontWeights,
+							newFontWeightValue
+						)
+					).toEqual( expected );
+				} );
+			}
+		);
+	} );
+
+	describe( 'findNearestFontStyle', () => {
+		[
+			{
+				message:
+					'should return empty string when newFontStyleValue is `undefined`',
+				availableFontStyles: undefined,
+				newFontStyleValue: undefined,
+				expected: '',
+			},
+			{
+				message:
+					'should return newFontStyleValue value when availableFontStyles is empty',
+				availableFontStyles: [],
+				newFontStyleValue: 'italic',
+				expected: 'italic',
+			},
+			{
+				message:
+					'should return empty string if there is no new font style available',
+				availableFontStyles: [ { name: 'Normal', value: 'normal' } ],
+				newFontStyleValue: 'italic',
+				expected: '',
+			},
+			{
+				message:
+					'should return empty string if the new font style is invalid',
+				availableFontStyles: [
+					{ name: 'Regular', value: 'normal' },
+					{ name: 'Italic', value: 'italic' },
+				],
+				newFontStyleValue: 'not-valid',
+				expected: '',
+			},
+			{
+				message: 'should return italic if oblique is not available',
+				availableFontStyles: [
+					{ name: 'Regular', value: 'normal' },
+					{ name: 'Italic', value: 'italic' },
+				],
+				newFontStyleValue: 'oblique',
+				expected: 'italic',
+			},
+			{
+				message: 'should return normal if normal is available',
+				availableFontStyles: [
+					{ name: 'Regular', value: 'normal' },
+					{ name: 'Italic', value: 'italic' },
+				],
+				newFontStyleValue: 'normal',
+				expected: 'normal',
+			},
+		].forEach(
+			( {
+				message,
+				availableFontStyles,
+				newFontStyleValue,
+				expected,
+			} ) => {
+				it( `${ message }`, () => {
+					expect(
+						findNearestFontStyle(
+							availableFontStyles,
+							newFontStyleValue
+						)
+					).toEqual( expected );
+				} );
+			}
+		);
+	} );
+
+	describe( 'findNearestStyleAndWeight', () => {
+		[
+			{
+				message: 'should return empty object when all values are empty',
+				fontFamilyFaces: [],
+				fontStyle: undefined,
+				fontWeight: undefined,
+				expected: {},
+			},
+			{
+				message:
+					'should return original fontStyle and fontWeight when fontFamilyFaces is empty',
+				fontFamilyFaces: [],
+				fontStyle: 'italic',
+				fontWeight: '700',
+				expected: {
+					nearestFontStyle: 'italic',
+					nearestFontWeight: '700',
+				},
+			},
+			{
+				message:
+					'should return undefined values if both fontStyle and fontWeight are not available',
+				fontFamilyFaces: [
+					{
+						fontFamily: 'ABeeZee',
+						fontStyle: 'italic',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/esDT31xSG-6AGleN2tCkkJUCGpG-GQ.woff2',
+						],
+					},
+				],
+				fontStyle: undefined,
+				fontWeight: undefined,
+				expected: {
+					nearestFontStyle: undefined,
+					nearestFontWeight: undefined,
+				},
+			},
+			{
+				message:
+					'should return nearest fontStyle and fontWeight for normal/400',
+				fontFamilyFaces: [
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'italic',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Italic.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '700',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Bold.woff2',
+						],
+					},
+				],
+				fontStyle: 'normal',
+				fontWeight: '400',
+				expected: {
+					nearestFontStyle: 'normal',
+					nearestFontWeight: '400',
+				},
+			},
+			{
+				message:
+					'should return nearest fontStyle and fontWeight for normal/100',
+				fontFamilyFaces: [
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'italic',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Italic.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '700',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Bold.woff2',
+						],
+					},
+				],
+				fontStyle: 'normal',
+				fontWeight: '100',
+				expected: {
+					nearestFontStyle: 'normal',
+					nearestFontWeight: '400',
+				},
+			},
+			{
+				message:
+					'should return nearest fontStyle and fontWeight for italic/900',
+				fontFamilyFaces: [
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'italic',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Italic.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '700',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Bold.woff2',
+						],
+					},
+				],
+				fontStyle: 'italic',
+				fontWeight: '900',
+				expected: {
+					nearestFontStyle: 'italic',
+					nearestFontWeight: '700',
+				},
+			},
+			{
+				message:
+					'should return nearest fontStyle and fontWeight for oblique/600',
+				fontFamilyFaces: [
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'italic',
+						fontWeight: '700',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Bold.woff2',
+						],
+					},
+				],
+				fontStyle: 'oblique',
+				fontWeight: '600',
+				expected: {
+					nearestFontStyle: 'italic',
+					nearestFontWeight: '700',
+				},
+			},
+			{
+				message:
+					'should return nearest fontStyle and fontWeight for 300 font weight and empty font style',
+				fontFamilyFaces: [
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'italic',
+						fontWeight: '700',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Bold.woff2',
+						],
+					},
+				],
+				fontStyle: undefined,
+				fontWeight: '300',
+				expected: {
+					nearestFontStyle: 'normal',
+					nearestFontWeight: '400',
+				},
+			},
+			{
+				message:
+					'should return nearest fontStyle and fontWeight for oblique font style and empty font weight',
+				fontFamilyFaces: [
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'italic',
+						fontWeight: '700',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Bold.woff2',
+						],
+					},
+				],
+				fontStyle: 'oblique',
+				fontWeight: undefined,
+				expected: {
+					nearestFontStyle: 'italic',
+					nearestFontWeight: '400',
+				},
+			},
+			{
+				message:
+					'should return nearest fontStyle and fontWeight for normal/400 when fontFamilyFaces contain numerical fontWeight value',
+				fontFamilyFaces: [
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: 400,
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'italic',
+						fontWeight: '400',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Italic.woff2',
+						],
+					},
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						fontWeight: '700',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Bold.woff2',
+						],
+					},
+				],
+				fontStyle: 'normal',
+				fontWeight: '400',
+				expected: {
+					nearestFontStyle: 'normal',
+					nearestFontWeight: '400',
+				},
+			},
+			{
+				message:
+					'should return nearest fontStyle and fontWeight for normal/400 when fontFamilyFaces contain undefined fontWeight value',
+				fontFamilyFaces: [
+					{
+						fontFamily: 'IBM Plex Mono',
+						fontStyle: 'normal',
+						src: [
+							'file:./assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2',
+						],
+					},
+				],
+				fontStyle: 'normal',
+				fontWeight: '400',
+				expected: {
+					nearestFontStyle: 'normal',
+					nearestFontWeight: '700',
+				},
+			},
+		].forEach(
+			( {
+				message,
+				fontFamilyFaces,
+				fontStyle,
+				fontWeight,
+				expected,
+			} ) => {
+				it( `${ message }`, () => {
+					expect(
+						findNearestStyleAndWeight(
+							fontFamilyFaces,
+							fontStyle,
+							fontWeight
+						)
+					).toEqual( expected );
+				} );
+			}
+		);
+	} );
+
 	describe( 'typography utils', () => {
 		[
 			{
@@ -587,7 +1422,7 @@ describe( 'typography utils', () => {
 
 			{
 				message:
-					'should return fluid settings with merged `layout.wideSize`d',
+					'should return fluid settings with merged `layout.wideSize`',
 				settings: {
 					typography: { fluid: { minFontSize: '16px' } },
 					layout: { wideSize: '1000rem' },
diff --git a/packages/block-editor/src/components/global-styles/test/use-global-styles-context.native.js b/packages/block-editor/src/components/global-styles/test/use-global-styles-context.native.js
new file mode 100644
index 00000000000000..a8b1e9e1bdf1b9
--- /dev/null
+++ b/packages/block-editor/src/components/global-styles/test/use-global-styles-context.native.js
@@ -0,0 +1,435 @@
+/**
+ * Internal dependencies
+ */
+import {
+	getBlockPaddings,
+	getBlockColors,
+	parseStylesVariables,
+	getGlobalStyles,
+} from '../use-global-styles-context';
+
+const DEFAULT_COLORS = [
+	{ color: '#cd2653', name: 'Accent Color', slug: 'accent' },
+	{ color: '#000000', name: 'Primary', slug: 'primary' },
+	{ color: '#6d6d6d', name: 'Secondary', slug: 'secondary' },
+];
+
+const GLOBAL_STYLES_PALETTE = [
+	{
+		slug: 'green',
+		color: '#D1E4DD',
+		name: 'Green',
+	},
+	{
+		slug: 'blue',
+		color: '#D1DFE4',
+		name: 'Blue',
+	},
+	{
+		slug: 'purple',
+		color: '#D1D1E4',
+		name: 'Purple',
+	},
+	{
+		color: '#cf1594',
+		name: 'Color 2 ',
+		slug: 'custom-color-2',
+	},
+];
+
+const GLOBAL_STYLES_GRADIENTS = {
+	default: [
+		{
+			name: 'Vivid cyan blue to vivid purple',
+			gradient:
+				'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
+			slug: 'vivid-cyan-blue-to-vivid-purple',
+		},
+		{
+			name: 'Light green cyan to vivid green cyan',
+			gradient:
+				'linear-gradient(135deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)',
+			slug: 'light-green-cyan-to-vivid-green-cyan',
+		},
+	],
+	theme: [
+		{
+			slug: 'purple-to-blue',
+			gradient:
+				'linear-gradient(160deg, var(--wp--preset--color--purple), var(--wp--preset--color--blue))',
+			name: 'Purple to Blue',
+		},
+		{
+			slug: 'green-to-purple',
+			gradient:
+				'linear-gradient(160deg, var(--wp--preset--color--green), var(--wp--preset--color--purple))',
+			name: 'Green to Purple',
+		},
+	],
+};
+
+const DEFAULT_GLOBAL_STYLES = {
+	color: {
+		background: 'var(--wp--preset--color--green)',
+		text: 'var(--wp--preset--color--blue)',
+	},
+	typography: {
+		fontSize: 'var(--wp--preset--font-size--normal)',
+		lineHeight: 'var(--wp--custom--line-height--body)',
+	},
+	elements: {
+		link: {
+			color: {
+				text: 'var(--wp--preset--color--purple)',
+			},
+		},
+		h1: {
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--gigantic)',
+				lineHeight: 'var(--wp--custom--line-height--page-title)',
+			},
+		},
+		h2: {
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--extra-large)',
+				lineHeight: 'var(--wp--custom--line-height--heading)',
+			},
+		},
+	},
+	blocks: {
+		'core/button': {
+			color: {
+				background: 'var(--wp--preset--color--purple)',
+				text: 'var(--wp--preset--color--green)',
+			},
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--normal)',
+			},
+		},
+		'core/separator': {
+			color: {
+				text: 'var:preset|color|custom-color-2',
+			},
+		},
+	},
+};
+
+const PARSED_GLOBAL_STYLES = {
+	color: {
+		background: '#D1E4DD',
+		text: '#D1DFE4',
+	},
+	typography: {
+		fontSize: '18px',
+		lineHeight: '1.7',
+	},
+	elements: {
+		link: {
+			color: {
+				text: '#D1D1E4',
+			},
+		},
+		h1: {
+			typography: {
+				fontSize: '144px',
+				lineHeight: '1.1',
+			},
+		},
+		h2: {
+			typography: {
+				fontSize: '40px',
+				lineHeight: '1.3',
+			},
+		},
+	},
+	blocks: {
+		'core/button': {
+			color: {
+				background: '#D1D1E4',
+				text: '#D1E4DD',
+			},
+			typography: {
+				fontSize: '18px',
+			},
+		},
+		'core/separator': {
+			color: {
+				text: '#cf1594',
+			},
+		},
+	},
+};
+
+const RAW_FEATURES = {
+	color: {
+		palette: {
+			default: [
+				{
+					name: 'Black',
+					slug: 'black',
+					color: '#000000',
+				},
+				{
+					name: 'Cyan bluish gray',
+					slug: 'cyan-bluish-gray',
+					color: '#abb8c3',
+				},
+				{
+					name: 'White',
+					slug: 'white',
+					color: '#ffffff',
+				},
+			],
+			theme: [
+				{
+					slug: 'green',
+					color: '#D1E4DD',
+					name: 'Green',
+				},
+				{
+					slug: 'blue',
+					color: '#D1DFE4',
+					name: 'Blue',
+				},
+				{
+					slug: 'purple',
+					color: '#D1D1E4',
+					name: 'Purple',
+				},
+			],
+			custom: [
+				{
+					color: '#1bf5c1',
+					name: 'Color 1 ',
+					slug: 'custom-color-1',
+				},
+				{
+					color: '#cf1594',
+					name: 'Color 2 ',
+					slug: 'custom-color-2',
+				},
+			],
+		},
+		gradients: {
+			default: [
+				{
+					name: 'Vivid cyan blue to vivid purple',
+					gradient:
+						'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
+					slug: 'vivid-cyan-blue-to-vivid-purple',
+				},
+				{
+					name: 'Light green cyan to vivid green cyan',
+					gradient:
+						'linear-gradient(135deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)',
+					slug: 'light-green-cyan-to-vivid-green-cyan',
+				},
+			],
+			theme: [
+				{
+					slug: 'purple-to-blue',
+					gradient: 'linear-gradient(160deg, #D1D1E4, #D1DFE4)',
+					name: 'Purple to Blue',
+				},
+				{
+					slug: 'green-to-purple',
+					gradient: 'linear-gradient(160deg, #D1E4DD, #D1D1E4)',
+					name: 'Green to Purple',
+				},
+			],
+		},
+	},
+	typography: {
+		fontSizes: {
+			theme: [
+				{
+					name: 'Normal',
+					slug: 'normal',
+					size: '18px',
+					sizePx: '18px',
+				},
+				{
+					slug: 'extra-large',
+					size: '40px',
+					sizePx: '40px',
+					name: 'Extra large',
+				},
+				{
+					slug: 'gigantic',
+					size: '144px',
+					sizePx: '144px',
+					name: 'Gigantic',
+				},
+			],
+		},
+	},
+	custom: {
+		'line-height': {
+			body: 1.7,
+			heading: 1.3,
+			'page-title': 1.1,
+		},
+	},
+};
+
+const MAPPED_VALUES = {
+	color: {
+		values: GLOBAL_STYLES_PALETTE,
+		slug: 'color',
+	},
+	'font-size': {
+		values: RAW_FEATURES.typography.fontSizes.theme,
+		slug: 'size',
+	},
+};
+
+describe( 'getBlockPaddings', () => {
+	const PADDING = 12;
+
+	it( 'returns no paddings for a block without background color', () => {
+		const paddings = getBlockPaddings(
+			{ color: 'red' },
+			{ backgroundColor: 'red' },
+			{ textColor: 'primary' }
+		);
+		expect( paddings ).toEqual( expect.objectContaining( {} ) );
+	} );
+
+	it( 'returns paddings for a block with background color', () => {
+		const paddings = getBlockPaddings(
+			{ color: 'red' },
+			{},
+			{ backgroundColor: 'red', textColor: 'primary' }
+		);
+		expect( paddings ).toEqual(
+			expect.objectContaining( { padding: PADDING } )
+		);
+	} );
+
+	it( 'returns no paddings for an inner block without background color within a parent block with background color', () => {
+		const paddings = getBlockPaddings(
+			{ backgroundColor: 'blue', color: 'yellow', padding: PADDING },
+			{},
+			{ textColor: 'primary' }
+		);
+
+		expect( paddings ).toEqual(
+			expect.not.objectContaining( { padding: PADDING } )
+		);
+	} );
+} );
+
+describe( 'getBlockColors', () => {
+	it( 'returns the theme colors correctly', () => {
+		const blockColors = getBlockColors(
+			{ backgroundColor: 'accent', textColor: 'secondary' },
+			DEFAULT_COLORS
+		);
+		expect( blockColors ).toEqual(
+			expect.objectContaining( {
+				backgroundColor: '#cd2653',
+				color: '#6d6d6d',
+			} )
+		);
+	} );
+
+	it( 'returns custom background color correctly', () => {
+		const blockColors = getBlockColors(
+			{ backgroundColor: '#222222', textColor: 'accent' },
+			DEFAULT_COLORS
+		);
+		expect( blockColors ).toEqual(
+			expect.objectContaining( {
+				backgroundColor: '#222222',
+				color: '#cd2653',
+			} )
+		);
+	} );
+
+	it( 'returns custom text color correctly', () => {
+		const blockColors = getBlockColors(
+			{ textColor: '#4ddddd' },
+			DEFAULT_COLORS
+		);
+		expect( blockColors ).toEqual(
+			expect.objectContaining( {
+				color: '#4ddddd',
+			} )
+		);
+	} );
+} );
+
+describe( 'parseStylesVariables', () => {
+	it( 'returns the parsed preset values correctly', () => {
+		const customValues = parseStylesVariables(
+			JSON.stringify( RAW_FEATURES.custom ),
+			MAPPED_VALUES
+		);
+		const blockColors = parseStylesVariables(
+			JSON.stringify( DEFAULT_GLOBAL_STYLES ),
+			MAPPED_VALUES,
+			customValues
+		);
+		expect( blockColors ).toEqual(
+			expect.objectContaining( PARSED_GLOBAL_STYLES )
+		);
+	} );
+
+	it( 'returns the parsed custom color values correctly', () => {
+		const defaultStyles = {
+			...DEFAULT_GLOBAL_STYLES,
+			color: {
+				text: 'var(--wp--custom--color--blue)',
+				background: 'var(--wp--custom--color--green)',
+			},
+		};
+		const customValues = parseStylesVariables(
+			JSON.stringify( RAW_FEATURES.custom ),
+			MAPPED_VALUES
+		);
+		const styles = parseStylesVariables(
+			JSON.stringify( defaultStyles ),
+			MAPPED_VALUES,
+			customValues
+		);
+		expect( styles ).toEqual(
+			expect.objectContaining( PARSED_GLOBAL_STYLES )
+		);
+	} );
+} );
+
+describe( 'getGlobalStyles', () => {
+	it( 'returns the global styles data correctly', () => {
+		const rawFeatures = JSON.stringify( RAW_FEATURES );
+		const gradients = parseStylesVariables(
+			JSON.stringify( GLOBAL_STYLES_GRADIENTS ),
+			MAPPED_VALUES
+		);
+
+		const globalStyles = getGlobalStyles(
+			JSON.stringify( DEFAULT_GLOBAL_STYLES ),
+			rawFeatures
+		);
+
+		expect( globalStyles ).toEqual(
+			expect.objectContaining( {
+				__experimentalFeatures: {
+					blocks: {},
+					color: {
+						palette: RAW_FEATURES.color.palette,
+						gradients,
+						text: true,
+						background: true,
+						defaultPalette: true,
+						defaultGradients: true,
+					},
+					typography: {
+						fontSizes: RAW_FEATURES.typography.fontSizes,
+						customLineHeight: RAW_FEATURES.custom[ 'line-height' ],
+					},
+				},
+				__experimentalGlobalStylesBaseStyles: PARSED_GLOBAL_STYLES,
+			} )
+		);
+	} );
+} );
diff --git a/packages/block-editor/src/components/global-styles/test/use-global-styles-output.js b/packages/block-editor/src/components/global-styles/test/use-global-styles-output.js
index b05381a8325b06..5022e8ba591dbb 100644
--- a/packages/block-editor/src/components/global-styles/test/use-global-styles-output.js
+++ b/packages/block-editor/src/components/global-styles/test/use-global-styles-output.js
@@ -16,7 +16,7 @@ import {
 	getStylesDeclarations,
 	processCSSNesting,
 } from '../use-global-styles-output';
-import { ROOT_BLOCK_SELECTOR } from '../utils';
+import { ROOT_BLOCK_SELECTOR, ROOT_CSS_PROPERTIES_SELECTOR } from '../utils';
 
 describe( 'global styles renderer', () => {
 	describe( 'getNodesWithStyles', () => {
@@ -107,6 +107,7 @@ describe( 'global styles renderer', () => {
 						},
 					},
 					selector: ROOT_BLOCK_SELECTOR,
+					skipSelectorWrapper: true,
 				},
 				{
 					styles: {
@@ -128,6 +129,7 @@ describe( 'global styles renderer', () => {
 						},
 					},
 					selector: ELEMENTS.link,
+					skipSelectorWrapper: true,
 				},
 				{
 					styles: {
@@ -169,7 +171,8 @@ describe( 'global styles renderer', () => {
 							},
 						},
 					},
-					selector: '.my-heading1 a, .my-heading2 a',
+					selector:
+						'.my-heading1 a:where(:not(.wp-element-button)), .my-heading2 a:where(:not(.wp-element-button))',
 				},
 				{
 					styles: {
@@ -253,7 +256,7 @@ describe( 'global styles renderer', () => {
 							],
 						},
 					},
-					selector: ROOT_BLOCK_SELECTOR,
+					selector: ROOT_CSS_PROPERTIES_SELECTOR,
 				},
 				{
 					presets: {
@@ -341,7 +344,7 @@ describe( 'global styles renderer', () => {
 			};
 
 			expect( toCustomProperties( tree, blockSelectors ) ).toEqual(
-				'body{--wp--preset--color--white: white;--wp--preset--color--black: black;--wp--preset--color--white-2-black: value;--wp--custom--white-2-black: value;--wp--custom--font-primary: value;--wp--custom--line-height--body: 1.7;--wp--custom--line-height--heading: 1.3;}h1,h2,h3,h4,h5,h6{--wp--preset--font-size--small: 12px;--wp--preset--font-size--medium: 23px;}'
+				':root{--wp--preset--color--white: white;--wp--preset--color--black: black;--wp--preset--color--white-2-black: value;--wp--custom--white-2-black: value;--wp--custom--font-primary: value;--wp--custom--line-height--body: 1.7;--wp--custom--line-height--heading: 1.3;}h1,h2,h3,h4,h5,h6{--wp--preset--font-size--small: 12px;--wp--preset--font-size--medium: 23px;}'
 			);
 		} );
 	} );
@@ -479,10 +482,7 @@ describe( 'global styles renderer', () => {
 			};
 
 			expect( toStyles( tree, blockSelectors ) ).toEqual(
-				'body {margin: 0;}body .is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-constrained > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-constrained > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)) { max-width: var(--wp--style--global--content-size); margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignwide { max-width: var(--wp--style--global--wide-size); }body .is-layout-flex { display:flex; }body .is-layout-flex { flex-wrap: wrap; align-items: center; }body .is-layout-flex > * { margin: 0; }body .is-layout-grid { display:grid; }body .is-layout-grid > * { margin: 0; }' +
-					'body{background-color: red;margin: 10px;padding: 10px;}a{color: blue;}a:hover{color: orange;}a:focus{color: orange;}h1{font-size: 42px;}.wp-block-group{margin-top: 10px;margin-right: 20px;margin-bottom: 30px;margin-left: 40px;padding-top: 11px;padding-right: 22px;padding-bottom: 33px;padding-left: 44px;}h1,h2,h3,h4,h5,h6{color: orange;}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color: hotpink;}h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover,h5 a:hover,h6 a:hover{color: red;}h1 a:focus,h2 a:focus,h3 a:focus,h4 a:focus,h5 a:focus,h6 a:focus{color: red;}' +
-					'.wp-block-image img, .wp-block-image .wp-crop-area{border-radius: 9999px;}.wp-block-image{color: red;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }' +
-					'.has-white-color{color: var(--wp--preset--color--white) !important;}.has-white-background-color{background-color: var(--wp--preset--color--white) !important;}.has-white-border-color{border-color: var(--wp--preset--color--white) !important;}.has-black-color{color: var(--wp--preset--color--black) !important;}.has-black-background-color{background-color: var(--wp--preset--color--black) !important;}.has-black-border-color{border-color: var(--wp--preset--color--black) !important;}h1.has-blue-color,h2.has-blue-color,h3.has-blue-color,h4.has-blue-color,h5.has-blue-color,h6.has-blue-color{color: var(--wp--preset--color--blue) !important;}h1.has-blue-background-color,h2.has-blue-background-color,h3.has-blue-background-color,h4.has-blue-background-color,h5.has-blue-background-color,h6.has-blue-background-color{background-color: var(--wp--preset--color--blue) !important;}h1.has-blue-border-color,h2.has-blue-border-color,h3.has-blue-border-color,h4.has-blue-border-color,h5.has-blue-border-color,h6.has-blue-border-color{border-color: var(--wp--preset--color--blue) !important;}'
+				':where(body) {margin: 0;}.is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }.is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }.is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }.is-layout-constrained > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }.is-layout-constrained > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }.is-layout-constrained > .aligncenter { margin-left: auto !important; margin-right: auto !important; }.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)) { max-width: var(--wp--style--global--content-size); margin-left: auto !important; margin-right: auto !important; }.is-layout-constrained > .alignwide { max-width: var(--wp--style--global--wide-size); }body .is-layout-flex { display:flex; }.is-layout-flex { flex-wrap: wrap; align-items: center; }.is-layout-flex > :is(*, div) { margin: 0; }body .is-layout-grid { display:grid; }.is-layout-grid > :is(*, div) { margin: 0; }body{background-color: red;margin: 10px;padding: 10px;}a:where(:not(.wp-element-button)){color: blue;}:root :where(a:where(:not(.wp-element-button)):hover){color: orange;}:root :where(a:where(:not(.wp-element-button)):focus){color: orange;}h1{font-size: 42px;}:root :where(.wp-block-group){margin-top: 10px;margin-right: 20px;margin-bottom: 30px;margin-left: 40px;padding-top: 11px;padding-right: 22px;padding-bottom: 33px;padding-left: 44px;}:root :where(h1,h2,h3,h4,h5,h6){color: orange;}:root :where(h1 a:where(:not(.wp-element-button)),h2 a:where(:not(.wp-element-button)),h3 a:where(:not(.wp-element-button)),h4 a:where(:not(.wp-element-button)),h5 a:where(:not(.wp-element-button)),h6 a:where(:not(.wp-element-button))){color: hotpink;}:root :where(h1 a:where(:not(.wp-element-button)):hover,h2 a:where(:not(.wp-element-button)):hover,h3 a:where(:not(.wp-element-button)):hover,h4 a:where(:not(.wp-element-button)):hover,h5 a:where(:not(.wp-element-button)):hover,h6 a:where(:not(.wp-element-button)):hover){color: red;}:root :where(h1 a:where(:not(.wp-element-button)):focus,h2 a:where(:not(.wp-element-button)):focus,h3 a:where(:not(.wp-element-button)):focus,h4 a:where(:not(.wp-element-button)):focus,h5 a:where(:not(.wp-element-button)):focus,h6 a:where(:not(.wp-element-button)):focus){color: red;}:root :where(.wp-block-image img, .wp-block-image .wp-crop-area){border-radius: 9999px;}:root :where(.wp-block-image){color: red;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.has-white-color{color: var(--wp--preset--color--white) !important;}.has-white-background-color{background-color: var(--wp--preset--color--white) !important;}.has-white-border-color{border-color: var(--wp--preset--color--white) !important;}.has-black-color{color: var(--wp--preset--color--black) !important;}.has-black-background-color{background-color: var(--wp--preset--color--black) !important;}.has-black-border-color{border-color: var(--wp--preset--color--black) !important;}h1.has-blue-color,h2.has-blue-color,h3.has-blue-color,h4.has-blue-color,h5.has-blue-color,h6.has-blue-color{color: var(--wp--preset--color--blue) !important;}h1.has-blue-background-color,h2.has-blue-background-color,h3.has-blue-background-color,h4.has-blue-background-color,h5.has-blue-background-color,h6.has-blue-background-color{background-color: var(--wp--preset--color--blue) !important;}h1.has-blue-border-color,h2.has-blue-border-color,h3.has-blue-border-color,h4.has-blue-border-color,h5.has-blue-border-color,h6.has-blue-border-color{border-color: var(--wp--preset--color--blue) !important;}'
 			);
 		} );
 
@@ -522,9 +522,7 @@ describe( 'global styles renderer', () => {
 			};
 
 			expect( toStyles( Object.freeze( tree ), blockSelectors ) ).toEqual(
-				'body {margin: 0;}body .is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-constrained > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-constrained > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)) { max-width: var(--wp--style--global--content-size); margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignwide { max-width: var(--wp--style--global--wide-size); }body .is-layout-flex { display:flex; }body .is-layout-flex { flex-wrap: wrap; align-items: center; }body .is-layout-flex > * { margin: 0; }body .is-layout-grid { display:grid; }body .is-layout-grid > * { margin: 0; }' +
-					'.wp-image-spacing{padding-top: 1px;}.wp-image-border-color{border-color: red;}.wp-image-border{border-radius: 9999px;}.wp-image{color: red;}' +
-					'.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }'
+				':where(body) {margin: 0;}.is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }.is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }.is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }.is-layout-constrained > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }.is-layout-constrained > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }.is-layout-constrained > .aligncenter { margin-left: auto !important; margin-right: auto !important; }.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)) { max-width: var(--wp--style--global--content-size); margin-left: auto !important; margin-right: auto !important; }.is-layout-constrained > .alignwide { max-width: var(--wp--style--global--wide-size); }body .is-layout-flex { display:flex; }.is-layout-flex { flex-wrap: wrap; align-items: center; }.is-layout-flex > :is(*, div) { margin: 0; }body .is-layout-grid { display:grid; }.is-layout-grid > :is(*, div) { margin: 0; }:root :where(.wp-image-spacing){padding-top: 1px;}:root :where(.wp-image-border-color){border-color: red;}:root :where(.wp-image-border){border-radius: 9999px;}:root :where(.wp-image){color: red;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }'
 			);
 		} );
 
@@ -569,10 +567,44 @@ describe( 'global styles renderer', () => {
 				},
 			};
 
-			expect( toStyles( Object.freeze( tree ), blockSelectors ) ).toEqual(
-				'body {margin: 0;}body .is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-constrained > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-constrained > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)) { max-width: var(--wp--style--global--content-size); margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignwide { max-width: var(--wp--style--global--wide-size); }body .is-layout-flex { display:flex; }body .is-layout-flex { flex-wrap: wrap; align-items: center; }body .is-layout-flex > * { margin: 0; }body .is-layout-grid { display:grid; }body .is-layout-grid > * { margin: 0; }' +
-					'.is-style-foo.wp-image.wp-image-spacing{padding-top: 2px;}.is-style-foo.wp-image.wp-image-border-color{border-color: blue;}.is-style-foo.wp-image{color: blue;}' +
-					'.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }'
+			const hasBlockGapSupport = false;
+			const hasFallbackGapSupport = true;
+			const disableLayoutStyles = true;
+			const disableRootPadding = true;
+			const styleOptions = {
+				blockGap: false,
+				blockStyles: true,
+				layoutStyles: false,
+				marginReset: false,
+				presets: false,
+				rootPadding: false,
+			};
+
+			// Confirm no variation styles by default.
+			const withoutVariations = toStyles(
+				Object.freeze( tree ),
+				blockSelectors,
+				hasBlockGapSupport,
+				hasFallbackGapSupport,
+				disableLayoutStyles,
+				disableRootPadding,
+				styleOptions
+			);
+			expect( withoutVariations ).toEqual( '' );
+
+			// Includes variation styles when requested.
+			styleOptions.variationStyles = true;
+			const withVariations = toStyles(
+				Object.freeze( tree ),
+				blockSelectors,
+				hasBlockGapSupport,
+				hasFallbackGapSupport,
+				disableLayoutStyles,
+				disableRootPadding,
+				styleOptions
+			);
+			expect( withVariations ).toEqual(
+				':root :where(.is-style-foo.wp-image.wp-image-spacing){padding-top: 2px;}:root :where(.is-style-foo.wp-image.wp-image-border-color){border-color: blue;}:root :where(.is-style-foo.wp-image){color: blue;}'
 			);
 		} );
 
@@ -597,9 +629,7 @@ describe( 'global styles renderer', () => {
 			};
 
 			expect( toStyles( Object.freeze( tree ), blockSelectors ) ).toEqual(
-				'body {margin: 0;}body .is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-constrained > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-constrained > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)) { max-width: var(--wp--style--global--content-size); margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignwide { max-width: var(--wp--style--global--wide-size); }body .is-layout-flex { display:flex; }body .is-layout-flex { flex-wrap: wrap; align-items: center; }body .is-layout-flex > * { margin: 0; }body .is-layout-grid { display:grid; }body .is-layout-grid > * { margin: 0; }' +
-					'.wp-image img{filter: blur(5px);}' +
-					'.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }'
+				':where(body) {margin: 0;}.is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }.is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }.is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }.is-layout-constrained > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }.is-layout-constrained > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }.is-layout-constrained > .aligncenter { margin-left: auto !important; margin-right: auto !important; }.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)) { max-width: var(--wp--style--global--content-size); margin-left: auto !important; margin-right: auto !important; }.is-layout-constrained > .alignwide { max-width: var(--wp--style--global--wide-size); }body .is-layout-flex { display:flex; }.is-layout-flex { flex-wrap: wrap; align-items: center; }.is-layout-flex > :is(*, div) { margin: 0; }body .is-layout-grid { display:grid; }.is-layout-grid > :is(*, div) { margin: 0; }.wp-image img{filter: blur(5px);}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }'
 			);
 		} );
 
@@ -613,7 +643,7 @@ describe( 'global styles renderer', () => {
 				},
 			};
 			expect( toStyles( Object.freeze( tree ), 'body' ) ).toEqual(
-				'body {margin: 0; --wp--style--global--content-size: 840px; --wp--style--global--wide-size: 1100px;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }'
+				':root { --wp--style--global--content-size: 840px; --wp--style--global--wide-size: 1100px;}:where(body) {margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }'
 			);
 		} );
 	} );
@@ -716,7 +746,7 @@ describe( 'global styles renderer', () => {
 			} );
 
 			expect( layoutStyles ).toEqual(
-				':where(.is-layout-flex) { gap: 0.5em; }body .is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-flex { display:flex; }body .is-layout-flex { flex-wrap: wrap; align-items: center; }body .is-layout-flex > * { margin: 0; }'
+				':where(.is-layout-flex) { gap: 0.5em; }.is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }.is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }.is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-flex { display:flex; }.is-layout-flex { flex-wrap: wrap; align-items: center; }.is-layout-flex > * { margin: 0; }'
 			);
 		} );
 
@@ -733,7 +763,7 @@ describe( 'global styles renderer', () => {
 			} );
 
 			expect( layoutStyles ).toEqual(
-				':where(body .is-layout-flow) > * { margin-block-start: 0; margin-block-end: 0; }:where(body .is-layout-flow) > * + * { margin-block-start: 0.5em; margin-block-end: 0; }:where(body .is-layout-flex) { gap: 0.5em; }body { --wp--style--block-gap: 0.5em; }body .is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-flex { display:flex; }body .is-layout-flex { flex-wrap: wrap; align-items: center; }body .is-layout-flex > * { margin: 0; }'
+				':root :where(.is-layout-flow) > * { margin-block-start: 0; margin-block-end: 0; }:root :where(.is-layout-flow) > * + * { margin-block-start: 0.5em; margin-block-end: 0; }:root :where(.is-layout-flex) { gap: 0.5em; }:root { --wp--style--block-gap: 0.5em; }.is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }.is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }.is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-flex { display:flex; }.is-layout-flex { flex-wrap: wrap; align-items: center; }.is-layout-flex > * { margin: 0; }'
 			);
 		} );
 
@@ -750,7 +780,7 @@ describe( 'global styles renderer', () => {
 			} );
 
 			expect( layoutStyles ).toEqual(
-				':where(body .is-layout-flow) > * { margin-block-start: 0; margin-block-end: 0; }:where(body .is-layout-flow) > * + * { margin-block-start: 12px; margin-block-end: 0; }:where(body .is-layout-flex) { gap: 12px; }body { --wp--style--block-gap: 12px; }body .is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-flex { display:flex; }body .is-layout-flex { flex-wrap: wrap; align-items: center; }body .is-layout-flex > * { margin: 0; }'
+				':root :where(.is-layout-flow) > * { margin-block-start: 0; margin-block-end: 0; }:root :where(.is-layout-flow) > * + * { margin-block-start: 12px; margin-block-end: 0; }:root :where(.is-layout-flex) { gap: 12px; }:root { --wp--style--block-gap: 12px; }.is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }.is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }.is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-flex { display:flex; }.is-layout-flex { flex-wrap: wrap; align-items: center; }.is-layout-flex > * { margin: 0; }'
 			);
 		} );
 
@@ -767,7 +797,7 @@ describe( 'global styles renderer', () => {
 			} );
 
 			expect( layoutStyles ).toEqual(
-				'.wp-block-group-is-layout-flow > * { margin-block-start: 0; margin-block-end: 0; }.wp-block-group-is-layout-flow > * + * { margin-block-start: 12px; margin-block-end: 0; }.wp-block-group-is-layout-flex { gap: 12px; }'
+				':root :where(.wp-block-group-is-layout-flow) > * { margin-block-start: 0; margin-block-end: 0; }:root :where(.wp-block-group-is-layout-flow) > * + * { margin-block-start: 12px; margin-block-end: 0; }:root :where(.wp-block-group-is-layout-flex) { gap: 12px; }'
 			);
 		} );
 
@@ -816,7 +846,7 @@ describe( 'global styles renderer', () => {
 						filter: { duotone: 'img' },
 					},
 					styleVariationSelectors: {
-						foo: '.is-style-foo.my-image',
+						foo: '.my-image.is-style-foo',
 					},
 					hasLayoutSupport: false,
 				},
@@ -967,13 +997,105 @@ describe( 'global styles renderer', () => {
 				'font-size: 15px',
 			] );
 		} );
+
+		it( 'should correctly resolve referenced values', () => {
+			const stylesWithRef = {
+				typography: {
+					fontSize: {
+						ref: 'styles.elements.h1.typography.fontSize',
+					},
+					letterSpacing: {
+						ref: 'styles.elements.h1.typography.letterSpacing',
+					},
+				},
+				background: {
+					backgroundImage: {
+						ref: 'styles.background.backgroundImage',
+					},
+					backgroundSize: {
+						ref: 'styles.background.backgroundSize',
+					},
+				},
+			};
+			const tree = {
+				styles: {
+					background: {
+						backgroundImage: {
+							url: 'http://my-image.org/image.gif',
+						},
+						backgroundSize: 'cover',
+					},
+					elements: {
+						h1: {
+							typography: {
+								fontSize: 'var:preset|font-size|xx-large',
+								letterSpacing: '2px',
+							},
+						},
+					},
+				},
+			};
+			expect(
+				getStylesDeclarations( stylesWithRef, '.wp-block', false, tree )
+			).toEqual( [
+				'font-size: var(--wp--preset--font-size--xx-large)',
+				'letter-spacing: 2px',
+				"background-image: url( 'http://my-image.org/image.gif' )",
+				'background-size: cover',
+			] );
+		} );
+		it( 'should set default values for block background styles', () => {
+			const backgroundStyles = {
+				background: {
+					backgroundImage: {
+						url: 'https://wordpress.org/assets/image.jpg',
+						id: 123,
+					},
+				},
+			};
+			expect(
+				getStylesDeclarations( backgroundStyles, '.wp-block-group' )
+			).toEqual( [
+				"background-image: url( 'https://wordpress.org/assets/image.jpg' )",
+				'background-size: cover',
+			] );
+			// Test with root-level styles.
+			expect(
+				getStylesDeclarations( backgroundStyles, ROOT_BLOCK_SELECTOR )
+			).toEqual( [
+				"background-image: url( 'https://wordpress.org/assets/image.jpg' )",
+			] );
+			expect(
+				getStylesDeclarations(
+					{
+						background: {
+							...backgroundStyles.background,
+							backgroundSize: 'contain',
+						},
+					},
+					'.wp-block-group'
+				)
+			).toEqual( [
+				"background-image: url( 'https://wordpress.org/assets/image.jpg' )",
+				'background-position: 50% 50%',
+				'background-size: contain',
+			] );
+		} );
 	} );
 
 	describe( 'processCSSNesting', () => {
+		it( 'should return empty string when supplied css is empty', () => {
+			expect( processCSSNesting( '', '.foo' ) ).toEqual( '' );
+		} );
 		it( 'should return processed CSS without any nested selectors', () => {
 			expect(
 				processCSSNesting( 'color: red; margin: auto;', '.foo' )
-			).toEqual( '.foo{color: red; margin: auto;}' );
+			).toEqual( ':root :where(.foo){color: red; margin: auto;}' );
+		} );
+		it( 'should return processed CSS when there are no root selectors', () => {
+			expect(
+				processCSSNesting( '&::before{color: red;}', '.foo' )
+			).toEqual( ':root :where(.foo)::before{color: red;}' );
 		} );
 		it( 'should return processed CSS with nested selectors', () => {
 			expect(
@@ -982,27 +1104,27 @@ describe( 'global styles renderer', () => {
 					'.foo'
 				)
 			).toEqual(
-				'.foo{color: red; margin: auto;}.foo.one{color: blue;}.foo .two{color: green;}'
+				':root :where(.foo){color: red; margin: auto;}:root :where(.foo.one){color: blue;}:root :where(.foo .two){color: green;}'
 			);
 		} );
 		it( 'should return processed CSS with pseudo elements', () => {
 			expect(
 				processCSSNesting(
-					'color: red; margin: auto; &::before{color: blue;} & ::before{color: green;}  &.one::before{color: yellow;} & .two::before{color: purple;}',
+					'color: red; margin: auto; &::before{color: blue;} & ::before{color: green;}  &.one::before{color: yellow;} & .two::before{color: purple;} & > ::before{color: darkseagreen;}',
 					'.foo'
 				)
 			).toEqual(
-				'.foo{color: red; margin: auto;}.foo::before{color: blue;}.foo ::before{color: green;}.foo.one::before{color: yellow;}.foo .two::before{color: purple;}'
+				':root :where(.foo){color: red; margin: auto;}:root :where(.foo)::before{color: blue;}:root :where(.foo) ::before{color: green;}:root :where(.foo.one)::before{color: yellow;}:root :where(.foo .two)::before{color: purple;}:root :where(.foo) > ::before{color: darkseagreen;}'
 			);
 		} );
 		it( 'should return processed CSS with multiple root selectors', () => {
 			expect(
 				processCSSNesting(
-					'color: red; margin: auto; &.one{color: blue;} & .two{color: green;} &::before{color: yellow;} & ::before{color: purple;}  &.three::before{color: orange;} & .four::before{color: skyblue;}',
+					'color: red; margin: auto; &.one{color: blue;} & .two{color: green;} &::before{color: yellow;} & ::before{color: purple;}  &.three::before{color: orange;} & .four::before{color: skyblue;} & > ::before{color: darkseagreen;}',
 					'.foo, .bar'
 				)
 			).toEqual(
-				'.foo, .bar{color: red; margin: auto;}.foo.one, .bar.one{color: blue;}.foo .two, .bar .two{color: green;}.foo::before, .bar::before{color: yellow;}.foo ::before, .bar ::before{color: purple;}.foo.three::before, .bar.three::before{color: orange;}.foo .four::before, .bar .four::before{color: skyblue;}'
+				':root :where(.foo, .bar){color: red; margin: auto;}:root :where(.foo.one, .bar.one){color: blue;}:root :where(.foo .two, .bar .two){color: green;}:root :where(.foo, .bar)::before{color: yellow;}:root :where(.foo, .bar) ::before{color: purple;}:root :where(.foo.three, .bar.three)::before{color: orange;}:root :where(.foo .four, .bar .four)::before{color: skyblue;}:root :where(.foo, .bar) > ::before{color: darkseagreen;}'
 			);
 		} );
 	} );
diff --git a/packages/block-editor/src/components/global-styles/test/utils.js b/packages/block-editor/src/components/global-styles/test/utils.js
index 0bca8da6f7da96..57a157662969e1 100644
--- a/packages/block-editor/src/components/global-styles/test/utils.js
+++ b/packages/block-editor/src/components/global-styles/test/utils.js
@@ -3,8 +3,13 @@
  */
 import {
 	areGlobalStyleConfigsEqual,
+	getBlockStyleVariationSelector,
 	getPresetVariableFromValue,
 	getValueFromVariable,
+	scopeFeatureSelectors,
+	getResolvedThemeFilePath,
+	getResolvedRefValue,
+	getResolvedValue,
 } from '../utils';
 
 describe( 'editor utils', () => {
@@ -50,6 +55,46 @@ describe( 'editor utils', () => {
 				},
 			},
 		},
+		styles: {
+			background: {
+				backgroundImage: {
+					url: 'file:./assets/image.jpg',
+				},
+				backgroundAttachment: 'fixed',
+				backgroundPosition: 'top left',
+			},
+			blocks: {
+				'core/group': {
+					background: {
+						backgroundImage: {
+							ref: 'styles.background.backgroundImage',
+						},
+					},
+					dimensions: {
+						minHeight: '100px',
+					},
+					spacing: {
+						padding: {
+							top: 0,
+						},
+					},
+				},
+			},
+		},
+		_links: {
+			'wp:theme-file': [
+				{
+					name: 'file:./assets/image.jpg',
+					href: 'https://wordpress.org/assets/image.jpg',
+					target: 'styles.background.backgroundImage.url',
+				},
+				{
+					name: 'file:./assets/other/image.jpg',
+					href: 'https://wordpress.org/assets/other/image.jpg',
+					target: "styles.blocks.['core/group'].background.backgroundImage.url",
+				},
+			],
+		},
 		isGlobalStylesUserThemeJSON: true,
 	};
 
@@ -259,4 +304,196 @@ describe( 'editor utils', () => {
 			}
 		);
 	} );
+
+	describe( 'getBlockStyleVariationSelector', () => {
+		test.each( [
+			{ type: 'empty', selector: '', expected: '.is-style-custom' },
+			{
+				type: 'class',
+				selector: '.wp-block',
+				expected: '.wp-block.is-style-custom',
+			},
+			{
+				type: 'id',
+				selector: '#wp-block',
+				expected: '#wp-block.is-style-custom',
+			},
+			{
+				type: 'element tag',
+				selector: 'p',
+				expected: 'p.is-style-custom',
+			},
+			{
+				type: 'attribute',
+				selector: '[style*="color"]',
+				expected: '[style*="color"].is-style-custom',
+			},
+			{
+				type: 'descendant',
+				selector: '.wp-block .inner',
+				expected: '.wp-block.is-style-custom .inner',
+			},
+			{
+				type: 'comma-separated',
+				selector: '.wp-block .inner, .wp-block .alternative',
+				expected:
+					'.wp-block.is-style-custom .inner, .wp-block.is-style-custom .alternative',
+			},
+			{
+				type: 'pseudo',
+				selector: 'div:first-child',
+				expected: 'div.is-style-custom:first-child',
+			},
+			{
+				type: ':is',
+				selector: '.wp-block:is(.outer .inner:first-child)',
+				expected:
+					'.wp-block.is-style-custom:is(.outer .inner:first-child)',
+			},
+			{
+				type: ':not',
+				selector: '.wp-block:not(.outer .inner:first-child)',
+				expected:
+					'.wp-block.is-style-custom:not(.outer .inner:first-child)',
+			},
+			{
+				type: ':has',
+				selector: '.wp-block:has(.outer .inner:first-child)',
+				expected:
+					'.wp-block.is-style-custom:has(.outer .inner:first-child)',
+			},
+			{
+				type: ':where',
+				selector: '.wp-block:where(.outer .inner:first-child)',
+				expected:
+					'.wp-block.is-style-custom:where(.outer .inner:first-child)',
+			},
+			{
+				type: 'wrapping :where',
+				selector: ':where(.outer .inner:first-child)',
+				expected: ':where(.outer.is-style-custom .inner:first-child)',
+			},
+			{
+				type: 'complex',
+				selector:
+					'.wp:where(.something):is(.test:not(.nothing p)):has(div[style]) .content, .wp:where(.nothing):not(.test:is(.something div)):has(span[style]) .inner',
+				expected:
+					'.wp.is-style-custom:where(.something):is(.test:not(.nothing p)):has(div[style]) .content, .wp.is-style-custom:where(.nothing):not(.test:is(.something div)):has(span[style]) .inner',
+			},
+		] )(
+			'should add variation class to ancestor in $type selector',
+			( { selector, expected } ) => {
+				expect(
+					getBlockStyleVariationSelector( 'custom', selector )
+				).toBe( expected );
+			}
+		);
+	} );
+
+	describe( 'scopeFeatureSelectors', () => {
+		it( 'correctly scopes selectors while maintaining selectors object structure', () => {
+			const actual = scopeFeatureSelectors( '.custom, .secondary', {
+				color: '.my-block h1',
+				typography: {
+					root: '.my-block',
+					lineHeight: '.my-block h1',
+				},
+			} );
+
+			expect( actual ).toEqual( {
+				color: '.custom .my-block h1, .secondary .my-block h1',
+				typography: {
+					root: '.custom .my-block, .secondary .my-block',
+					lineHeight: '.custom .my-block h1, .secondary .my-block h1',
+				},
+			} );
+		} );
+	} );
+
+	describe( 'getResolvedThemeFilePath()', () => {
+		it.each( [
+			[
+				'file:./assets/image.jpg',
+				'https://wordpress.org/assets/image.jpg',
+				'Should return absolute URL if found in themeFileURIs',
+			],
+			[
+				'file:./misc/image.jpg',
+				'file:./misc/image.jpg',
+				'Should return value if not found in themeFileURIs',
+			],
+			[
+				'https://wordpress.org/assets/image.jpg',
+				'https://wordpress.org/assets/image.jpg',
+				'Should not match absolute URLs',
+			],
+		] )(
+			'Given file %s and return value %s: %s',
+			( file, returnedValue ) => {
+				expect(
+					getResolvedThemeFilePath(
+						file,
+						themeJson._links[ 'wp:theme-file' ]
+					) === returnedValue
+				).toBe( true );
+			}
+		);
+	} );
+
+	describe( 'getResolvedRefValue()', () => {
+		it.each( [
+			[ 'blue', 'blue', null ],
+			[ 0, 0, themeJson ],
+			[
+				{ ref: 'styles.background.backgroundImage' },
+				{ url: 'file:./assets/image.jpg' },
+				themeJson,
+			],
+			[
+				{ ref: 'styles.blocks.core/group.spacing.padding.top' },
+				0,
+				themeJson,
+			],
+			[
+				{
+					ref: 'styles.blocks.core/group.background.backgroundImage',
+				},
+				undefined,
+				themeJson,
+			],
+		] )(
+			'Given ruleValue %s return expected value of %s',
+			( ruleValue, returnedValue, tree ) => {
+				expect( getResolvedRefValue( ruleValue, tree ) ).toEqual(
+					returnedValue
+				);
+			}
+		);
+	} );
+
+	describe( 'getResolvedValue()', () => {
+		it.each( [
+			[ 'blue', 'blue', null ],
+			[ 0, 0, themeJson ],
+			[
+				{ ref: 'styles.background.backgroundImage' },
+				{ url: 'https://wordpress.org/assets/image.jpg' },
+				themeJson,
+			],
+			[
+				{
+					ref: 'styles.blocks.core/group.background.backgroundImage',
+				},
+				undefined,
+				themeJson,
+			],
+		] )(
+			'Given ruleValue %s return expected value of %s',
+			( ruleValue, returnedValue, tree ) => {
+				expect( getResolvedValue( ruleValue, tree ) ).toEqual(
+					returnedValue
+				);
+			}
+		);
+	} );
 } );
diff --git a/packages/block-editor/src/components/global-styles/typography-panel.js b/packages/block-editor/src/components/global-styles/typography-panel.js
index 103b1e63b75b5e..9bc875cdc0a308 100644
--- a/packages/block-editor/src/components/global-styles/typography-panel.js
+++ b/packages/block-editor/src/components/global-styles/typography-panel.js
@@ -8,21 +8,25 @@ import {
 	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { useCallback } from '@wordpress/element';
+import { useCallback, useMemo, useEffect } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import { mergeOrigins, hasMergedOrigins } from '../use-settings';
 import FontFamilyControl from '../font-family';
 import FontAppearanceControl from '../font-appearance-control';
 import LineHeightControl from '../line-height-control';
 import LetterSpacingControl from '../letter-spacing-control';
+import TextAlignmentControl from '../text-alignment-control';
 import TextTransformControl from '../text-transform-control';
 import TextDecorationControl from '../text-decoration-control';
 import WritingModeControl from '../writing-mode-control';
-import { getValueFromVariable } from './utils';
+import { getValueFromVariable, useToolsPanelDropdownMenuProps } from './utils';
 import { setImmutably } from '../../utils/object';
+import {
+	getMergedFontFamiliesAndFontFamilyFaces,
+	findNearestStyleAndWeight,
+} from './typography-utils';
 
 const MIN_TEXT_COLUMNS = 1;
 const MAX_TEXT_COLUMNS = 6;
@@ -32,6 +36,7 @@ export function useHasTypographyPanel( settings ) {
 	const hasLineHeight = useHasLineHeightControl( settings );
 	const hasFontAppearance = useHasAppearanceControl( settings );
 	const hasLetterSpacing = useHasLetterSpacingControl( settings );
+	const hasTextAlign = useHasTextAlignmentControl( settings );
 	const hasTextTransform = useHasTextTransformControl( settings );
 	const hasTextDecoration = useHasTextDecorationControl( settings );
 	const hasWritingMode = useHasWritingModeControl( settings );
@@ -43,6 +48,7 @@ export function useHasTypographyPanel( settings ) {
 		hasLineHeight ||
 		hasFontAppearance ||
 		hasLetterSpacing ||
+		hasTextAlign ||
 		hasTextTransform ||
 		hasFontSize ||
 		hasTextDecoration ||
@@ -53,13 +59,18 @@ export function useHasTypographyPanel( settings ) {
 
 function useHasFontSizeControl( settings ) {
 	return (
-		hasMergedOrigins( settings?.typography?.fontSizes ) ||
+		( settings?.typography?.defaultFontSizes !== false &&
+			settings?.typography?.fontSizes?.default?.length ) ||
+		settings?.typography?.fontSizes?.theme?.length ||
+		settings?.typography?.fontSizes?.custom?.length ||
 		settings?.typography?.customFontSize
 	);
 }
 
 function useHasFontFamilyControl( settings ) {
-	return hasMergedOrigins( settings?.typography?.fontFamilies );
+	return [ 'default', 'theme', 'custom' ].some(
+		( key ) => settings?.typography?.fontFamilies?.[ key ]?.length
+	);
 }
 
 function useHasLineHeightControl( settings ) {
@@ -88,6 +99,10 @@ function useHasTextTransformControl( settings ) {
 	return settings?.typography?.textTransform;
 }
 
+function useHasTextAlignmentControl( settings ) {
+	return settings?.typography?.textAlign;
+}
+
 function useHasTextDecorationControl( settings ) {
 	return settings?.typography?.textDecoration;
 }
@@ -100,16 +115,21 @@ function useHasTextColumnsControl( settings ) {
 	return settings?.typography?.textColumns;
 }
 
-function getUniqueFontSizesBySlug( settings ) {
+/**
+ * Concatenate all the font sizes into a single list for the font size picker.
+ *
+ * @param {Object} settings The global styles settings.
+ *
+ * @return {Array} The merged font sizes.
+ */
+function getMergedFontSizes( settings ) {
 	const fontSizes = settings?.typography?.fontSizes;
-	const mergedFontSizes = fontSizes ? mergeOrigins( fontSizes ) : [];
-	const uniqueSizes = [];
-	for ( const currentSize of mergedFontSizes ) {
-		if ( ! uniqueSizes.some( ( { slug } ) => slug === currentSize.slug ) ) {
-			uniqueSizes.push( currentSize );
-		}
-	}
-	return uniqueSizes;
+	const defaultFontSizesEnabled = !! settings?.typography?.defaultFontSizes;
+	return [
+		...( fontSizes?.custom ?? [] ),
+		...( fontSizes?.theme ?? [] ),
+		...( defaultFontSizesEnabled ? fontSizes?.default ?? [] : [] ),
+	];
 }
 
 function TypographyToolsPanel( {
@@ -119,6 +139,7 @@ function TypographyToolsPanel( {
 	panelId,
 	children,
 } ) {
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 	const resetAll = () => {
 		const updatedValue = resetAllFilter( value );
 		onChange( updatedValue );
@@ -129,6 +150,7 @@ function TypographyToolsPanel( {
 			label={ __( 'Typography' ) }
 			resetAll={ resetAll }
 			panelId={ panelId }
+			dropdownMenuProps={ dropdownMenuProps }
 		>
 			{ children }
 		</ToolsPanel>
@@ -141,6 +163,7 @@ const DEFAULT_CONTROLS = {
 	fontAppearance: true,
 	lineHeight: true,
 	letterSpacing: true,
+	textAlign: true,
 	textTransform: true,
 	textDecoration: true,
 	writingMode: true,
@@ -161,11 +184,13 @@ export default function TypographyPanel( {
 
 	// Font Family
 	const hasFontFamilyEnabled = useHasFontFamilyControl( settings );
-	const fontFamilies = settings?.typography?.fontFamilies;
-	const mergedFontFamilies = fontFamilies ? mergeOrigins( fontFamilies ) : [];
 	const fontFamily = decodeValue( inheritedValue?.typography?.fontFamily );
+	const { fontFamilies, fontFamilyFaces } = useMemo( () => {
+		return getMergedFontFamiliesAndFontFamilyFaces( settings, fontFamily );
+	}, [ settings, fontFamily ] );
+
 	const setFontFamily = ( newValue ) => {
-		const slug = mergedFontFamilies?.find(
+		const slug = fontFamilies?.find(
 			( { fontFamily: f } ) => f === newValue
 		)?.slug;
 		onChange(
@@ -184,7 +209,7 @@ export default function TypographyPanel( {
 	// Font Size
 	const hasFontSizeEnabled = useHasFontSizeControl( settings );
 	const disableCustomFontSizes = ! settings?.typography?.customFontSize;
-	const mergedFontSizes = getUniqueFontSizesBySlug( settings );
+	const mergedFontSizes = getMergedFontSizes( settings );
 
 	const fontSize = decodeValue( inheritedValue?.typography?.fontSize );
 	const setFontSize = ( newValue, metadata ) => {
@@ -210,24 +235,50 @@ export default function TypographyPanel( {
 	const hasFontWeights = settings?.typography?.fontWeight;
 	const fontStyle = decodeValue( inheritedValue?.typography?.fontStyle );
 	const fontWeight = decodeValue( inheritedValue?.typography?.fontWeight );
-	const setFontAppearance = ( {
-		fontStyle: newFontStyle,
-		fontWeight: newFontWeight,
-	} ) => {
-		onChange( {
-			...value,
-			typography: {
-				...value?.typography,
-				fontStyle: newFontStyle || undefined,
-				fontWeight: newFontWeight || undefined,
-			},
-		} );
-	};
+	const { nearestFontStyle, nearestFontWeight } = findNearestStyleAndWeight(
+		fontFamilyFaces,
+		fontStyle,
+		fontWeight
+	);
+	const setFontAppearance = useCallback(
+		( { fontStyle: newFontStyle, fontWeight: newFontWeight } ) => {
+			// Only update the font style and weight if they have changed.
+			if ( newFontStyle !== fontStyle || newFontWeight !== fontWeight ) {
+				onChange( {
+					...value,
+					typography: {
+						...value?.typography,
+						fontStyle: newFontStyle || undefined,
+						fontWeight: newFontWeight || undefined,
+					},
+				} );
+			}
+		},
+		[ fontStyle, fontWeight, onChange, value ]
+	);
 	const hasFontAppearance = () =>
 		!! value?.typography?.fontStyle || !! value?.typography?.fontWeight;
-	const resetFontAppearance = () => {
+	const resetFontAppearance = useCallback( () => {
 		setFontAppearance( {} );
-	};
+	}, [ setFontAppearance ] );
+
+	// Check if previous font style and weight values are available in the new font family.
+	useEffect( () => {
+		if ( nearestFontStyle && nearestFontWeight ) {
+			setFontAppearance( {
+				fontStyle: nearestFontStyle,
+				fontWeight: nearestFontWeight,
+			} );
+		} else {
+			// Reset font appearance if there are no available styles or weights.
+			resetFontAppearance();
+		}
+	}, [
+		nearestFontStyle,
+		nearestFontWeight,
+		resetFontAppearance,
+		setFontAppearance,
+	] );
 
 	// Line Height
 	const hasLineHeightEnabled = useHasLineHeightControl( settings );
@@ -325,6 +376,22 @@ export default function TypographyPanel( {
 	const hasWritingMode = () => !! value?.typography?.writingMode;
 	const resetWritingMode = () => setWritingMode( undefined );
 
+	// Text Alignment
+	const hasTextAlignmentControl = useHasTextAlignmentControl( settings );
+
+	const textAlign = decodeValue( inheritedValue?.typography?.textAlign );
+	const setTextAlign = ( newValue ) => {
+		onChange(
+			setImmutably(
+				value,
+				[ 'typography', 'textAlign' ],
+				newValue || undefined
+			)
+		);
+	};
+	const hasTextAlign = () => !! value?.typography?.textAlign;
+	const resetTextAlign = () => setTextAlign( undefined );
+
 	const resetAllFilter = useCallback( ( previousValue ) => {
 		return {
 			...previousValue,
@@ -341,14 +408,14 @@ export default function TypographyPanel( {
 		>
 			{ hasFontFamilyEnabled && (
 				<ToolsPanelItem
-					label={ __( 'Font family' ) }
+					label={ __( 'Font' ) }
 					hasValue={ hasFontFamily }
 					onDeselect={ resetFontFamily }
 					isShownByDefault={ defaultControls.fontFamily }
 					panelId={ panelId }
 				>
 					<FontFamilyControl
-						fontFamilies={ mergedFontFamilies }
+						fontFamilies={ fontFamilies }
 						value={ fontFamily }
 						onChange={ setFontFamily }
 						size="__unstable-large"
@@ -358,7 +425,7 @@ export default function TypographyPanel( {
 			) }
 			{ hasFontSizeEnabled && (
 				<ToolsPanelItem
-					label={ __( 'Font size' ) }
+					label={ __( 'Size' ) }
 					hasValue={ hasFontSize }
 					onDeselect={ resetFontSize }
 					isShownByDefault={ defaultControls.fontSize }
@@ -372,7 +439,6 @@ export default function TypographyPanel( {
 						withReset={ false }
 						withSlider
 						size="__unstable-large"
-						__nextHasNoMarginBottom
 					/>
 				</ToolsPanelItem>
 			) }
@@ -393,8 +459,8 @@ export default function TypographyPanel( {
 						onChange={ setFontAppearance }
 						hasFontStyles={ hasFontStyles }
 						hasFontWeights={ hasFontWeights }
+						fontFamilyFaces={ fontFamilyFaces }
 						size="__unstable-large"
-						__nextHasNoMarginBottom
 					/>
 				</ToolsPanelItem>
 			) }
@@ -408,7 +474,6 @@ export default function TypographyPanel( {
 					panelId={ panelId }
 				>
 					<LineHeightControl
-						__nextHasNoMarginBottom
 						__unstableInputWidth="auto"
 						value={ lineHeight }
 						onChange={ setLineHeight }
@@ -436,14 +501,14 @@ export default function TypographyPanel( {
 			{ hasTextColumnsControl && (
 				<ToolsPanelItem
 					className="single-column"
-					label={ __( 'Text columns' ) }
+					label={ __( 'Columns' ) }
 					hasValue={ hasTextColumns }
 					onDeselect={ resetTextColumns }
 					isShownByDefault={ defaultControls.textColumns }
 					panelId={ panelId }
 				>
 					<NumberControl
-						label={ __( 'Text columns' ) }
+						label={ __( 'Columns' ) }
 						max={ MAX_TEXT_COLUMNS }
 						min={ MIN_TEXT_COLUMNS }
 						onChange={ setTextColumns }
@@ -457,7 +522,7 @@ export default function TypographyPanel( {
 			{ hasTextDecorationControl && (
 				<ToolsPanelItem
 					className="single-column"
-					label={ __( 'Text decoration' ) }
+					label={ __( 'Decoration' ) }
 					hasValue={ hasTextDecoration }
 					onDeselect={ resetTextDecoration }
 					isShownByDefault={ defaultControls.textDecoration }
@@ -474,7 +539,7 @@ export default function TypographyPanel( {
 			{ hasWritingModeControl && (
 				<ToolsPanelItem
 					className="single-column"
-					label={ __( 'Text orientation' ) }
+					label={ __( 'Orientation' ) }
 					hasValue={ hasWritingMode }
 					onDeselect={ resetWritingMode }
 					isShownByDefault={ defaultControls.writingMode }
@@ -506,6 +571,22 @@ export default function TypographyPanel( {
 					/>
 				</ToolsPanelItem>
 			) }
+			{ hasTextAlignmentControl && (
+				<ToolsPanelItem
+					label={ __( 'Text alignment' ) }
+					hasValue={ hasTextAlign }
+					onDeselect={ resetTextAlign }
+					isShownByDefault={ defaultControls.textAlign }
+					panelId={ panelId }
+				>
+					<TextAlignmentControl
+						value={ textAlign }
+						onChange={ setTextAlign }
+						size="__unstable-large"
+						__nextHasNoMarginBottom
+					/>
+				</ToolsPanelItem>
+			) }
 		</Wrapper>
 	);
 }
diff --git a/packages/block-editor/src/components/global-styles/typography-utils.js b/packages/block-editor/src/components/global-styles/typography-utils.js
index cd1340033e3773..4b7c90ae4f222c 100644
--- a/packages/block-editor/src/components/global-styles/typography-utils.js
+++ b/packages/block-editor/src/components/global-styles/typography-utils.js
@@ -11,6 +11,7 @@ import {
 	getComputedFluidTypographyValue,
 	getTypographyValueAndUnit,
 } from '../font-sizes/fluid-utils';
+import { getFontStylesAndWeights } from '../../utils/get-font-styles-and-weights';
 
 /**
  * @typedef {Object} FluidPreset
@@ -39,30 +40,45 @@ import {
  * Returns a font-size value based on a given font-size preset.
  * Takes into account fluid typography parameters and attempts to return a css formula depending on available, valid values.
  *
+ * The Core PHP equivalent is wp_get_typography_font_size_value().
+ *
  * @param {Preset}                     preset
- * @param {Object}                     typographyOptions
- * @param {boolean|TypographySettings} typographyOptions.fluid Whether fluid typography is enabled, and, optionally, fluid font size options.
+ * @param {Object}                     settings
+ * @param {boolean|TypographySettings} settings.typography.fluid  Whether fluid typography is enabled, and, optionally, fluid font size options.
+ * @param {Object?}                    settings.typography.layout Layout options.
  *
  * @return {string|*} A font-size value or the value of preset.size.
  */
-export function getTypographyFontSizeValue( preset, typographyOptions ) {
+export function getTypographyFontSizeValue( preset, settings ) {
 	const { size: defaultSize } = preset;
 
-	if ( ! isFluidTypographyEnabled( typographyOptions ) ) {
+	/*
+	 * Catch falsy values and 0/'0'. Fluid calculations cannot be performed on `0`.
+	 * Also return early when a preset font size explicitly disables fluid typography with `false`.
+	 */
+	if ( ! defaultSize || '0' === defaultSize || false === preset?.fluid ) {
 		return defaultSize;
 	}
+
 	/*
-	 * Checks whether a font size has explicitly bypassed fluid calculations.
-	 * Also catches falsy values and 0/'0'.
-	 * Fluid calculations cannot be performed on `0`.
+	 * Return early when fluid typography is disabled in the settings, and there
+	 * are no local settings to enable it for the individual preset.
+	 *
+	 * If this condition isn't met, either the settings or individual preset settings
+	 * have enabled fluid typography.
 	 */
-	if ( ! defaultSize || '0' === defaultSize || false === preset?.fluid ) {
+	if (
+		! isFluidTypographyEnabled( settings?.typography ) &&
+		! isFluidTypographyEnabled( preset )
+	) {
 		return defaultSize;
 	}
 
-	const fluidTypographySettings =
-		typeof typographyOptions?.fluid === 'object'
-			? typographyOptions?.fluid
+	let fluidTypographySettings =
+		getFluidTypographyOptionsFromSettings( settings );
+	fluidTypographySettings =
+		typeof fluidTypographySettings?.fluid === 'object'
+			? fluidTypographySettings?.fluid
 			: {};
 
 	const fluidFontSizeValue = getComputedFluidTypographyValue( {
@@ -119,3 +135,165 @@ export function getFluidTypographyOptionsFromSettings( settings ) {
 				fluid: typographySettings?.fluid,
 		  };
 }
+
+/**
+ * Returns an object of merged font families and the font faces from the selected font family
+ * based on the theme.json settings object and the currently selected font family.
+ *
+ * @param {Object} settings           Theme.json settings.
+ * @param {string} selectedFontFamily Decoded font family string.
+ * @return {Object} Merged font families and font faces from the selected font family.
+ */
+export function getMergedFontFamiliesAndFontFamilyFaces(
+	settings,
+	selectedFontFamily
+) {
+	const fontFamiliesFromSettings = settings?.typography?.fontFamilies;
+
+	const fontFamilies = [ 'default', 'theme', 'custom' ].flatMap(
+		( key ) => fontFamiliesFromSettings?.[ key ] ?? []
+	);
+
+	const fontFamilyFaces =
+		fontFamilies.find(
+			( family ) => family.fontFamily === selectedFontFamily
+		)?.fontFace ?? [];
+
+	return { fontFamilies, fontFamilyFaces };
+}
+
+/**
+ * Returns the nearest font weight value from the available font weight list based on the new font weight.
+ * The nearest font weight is the one with the smallest difference from the new font weight.
+ *
+ * @param {Array}  availableFontWeights Array of available font weights.
+ * @param {string} newFontWeightValue   New font weight value.
+ * @return {string} Nearest font weight.
+ */
+export function findNearestFontWeight(
+	availableFontWeights,
+	newFontWeightValue
+) {
+	newFontWeightValue =
+		'number' === typeof newFontWeightValue
+			? newFontWeightValue.toString()
+			: newFontWeightValue;
+	if ( ! newFontWeightValue || typeof newFontWeightValue !== 'string' ) {
+		return '';
+	}
+
+	if ( ! availableFontWeights || availableFontWeights.length === 0 ) {
+		return newFontWeightValue;
+	}
+
+	const nearestFontWeight = availableFontWeights?.reduce(
+		( nearest, { value: fw } ) => {
+			const currentDiff = Math.abs(
+				parseInt( fw ) - parseInt( newFontWeightValue )
+			);
+			const nearestDiff = Math.abs(
+				parseInt( nearest ) - parseInt( newFontWeightValue )
+			);
+			return currentDiff < nearestDiff ? fw : nearest;
+		},
+		availableFontWeights[ 0 ]?.value
+	);
+
+	return nearestFontWeight;
+}
+
+/**
+ * Returns the nearest font style based on the new font style.
+ * Defaults to an empty string if the new font style is not valid or available.
+ *
+ * @param {Array}  availableFontStyles Array of available font weights.
+ * @param {string} newFontStyleValue   New font style value.
+ * @return {string} Nearest font style or an empty string.
+ */
+export function findNearestFontStyle( availableFontStyles, newFontStyleValue ) {
+	if ( typeof newFontStyleValue !== 'string' || ! newFontStyleValue ) {
+		return '';
+	}
+
+	const validStyles = [ 'normal', 'italic', 'oblique' ];
+	if ( ! validStyles.includes( newFontStyleValue ) ) {
+		return '';
+	}
+
+	if (
+		! availableFontStyles ||
+		availableFontStyles.length === 0 ||
+		availableFontStyles.find(
+			( style ) => style.value === newFontStyleValue
+		)
+	) {
+		return newFontStyleValue;
+	}
+
+	if (
+		newFontStyleValue === 'oblique' &&
+		! availableFontStyles.find( ( style ) => style.value === 'oblique' )
+	) {
+		return 'italic';
+	}
+
+	return '';
+}
+
+/**
+ * Returns the nearest font style and weight based on the available font family faces and the new font style and weight.
+ *
+ * @param {Array}  fontFamilyFaces Array of available font family faces.
+ * @param {string} fontStyle       New font style. Defaults to previous value.
+ * @param {string} fontWeight      New font weight. Defaults to previous value.
+ * @return {Object} Nearest font style and font weight.
+ */
+export function findNearestStyleAndWeight(
+	fontFamilyFaces,
+	fontStyle,
+	fontWeight
+) {
+	let nearestFontStyle = fontStyle;
+	let nearestFontWeight = fontWeight;
+
+	const { fontStyles, fontWeights, combinedStyleAndWeightOptions } =
+		getFontStylesAndWeights( fontFamilyFaces );
+
+	// Check if the new font style and weight are available in the font family faces.
+	const hasFontStyle = fontStyles?.some(
+		( { value: fs } ) => fs === fontStyle
+	);
+	const hasFontWeight = fontWeights?.some(
+		( { value: fw } ) => fw?.toString() === fontWeight?.toString()
+	);
+
+	if ( ! hasFontStyle ) {
+		/*
+		 * Default to italic if oblique is not available.
+		 * Or find the nearest font style based on the nearest font weight.
+		 */
+		nearestFontStyle = fontStyle
+			? findNearestFontStyle( fontStyles, fontStyle )
+			: combinedStyleAndWeightOptions?.find(
+					( option ) =>
+						option.style.fontWeight ===
+						findNearestFontWeight( fontWeights, fontWeight )
+			  )?.style?.fontStyle;
+	}
+
+	if ( ! hasFontWeight ) {
+		/*
+		 * Find the nearest font weight based on available weights.
+		 * Or find the nearest font weight based on the nearest font style.
+		 */
+		nearestFontWeight = fontWeight
+			? findNearestFontWeight( fontWeights, fontWeight )
+			: combinedStyleAndWeightOptions?.find(
+					( option ) =>
+						option.style.fontStyle ===
+						( nearestFontStyle || fontStyle )
+			  )?.style?.fontWeight;
+	}
+
+	return { nearestFontStyle, nearestFontWeight };
+}
diff --git a/packages/block-editor/src/components/global-styles/use-global-styles-context.native.js b/packages/block-editor/src/components/global-styles/use-global-styles-context.native.js
new file mode 100644
index 00000000000000..f4aedc378e1a73
--- /dev/null
+++ b/packages/block-editor/src/components/global-styles/use-global-styles-context.native.js
@@ -0,0 +1,592 @@
+/**
+ * External dependencies
+ */
+import { camelCase } from 'change-case';
+import { Dimensions } from 'react-native';
+import { colord } from 'colord';
+
+/**
+ * WordPress dependencies
+ */
+import { usePreferredColorSchemeStyle } from '@wordpress/compose';
+import { createContext, useContext } from '@wordpress/element';
+import { getPxFromCssUnit } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import useMultipleOriginColorsAndGradients from '../colors-gradients/use-multiple-origin-colors-and-gradients';
+import { useSettings } from '../use-settings';
+import { SETTINGS_DEFAULTS } from '../../store/defaults';
+
+const BLOCK_STYLE_ATTRIBUTES = [
+	'textColor',
+	'backgroundColor',
+	'style',
+	'color',
+	'fontSize',
+];
+
+export const GlobalStylesContext = createContext( { style: {} } );
+GlobalStylesContext.BLOCK_STYLE_ATTRIBUTES = BLOCK_STYLE_ATTRIBUTES;
+
+// Mapping style properties name to native.
+const BLOCK_STYLE_ATTRIBUTES_MAPPING = {
+	textColor: 'color',
+	text: 'color',
+	background: 'backgroundColor',
+	link: 'linkColor',
+	placeholder: 'placeholderColor',
+};
+
+const PADDING = 12; // $solid-border-space
+const UNKNOWN_VALUE = 'undefined';
+const DEFAULT_FONT_SIZE = 16;
+
+export function getBlockPaddings(
+	mergedStyle,
+	wrapperPropsStyle,
+	blockStyleAttributes,
+	blockColors
+) {
+	const blockPaddings = {};
+
+	if (
+		! mergedStyle.padding &&
+		( wrapperPropsStyle?.backgroundColor ||
+			blockStyleAttributes?.backgroundColor ||
+			blockColors?.backgroundColor )
+	) {
+		blockPaddings.padding = PADDING;
+		return blockPaddings;
+	}
+
+	// Prevent adding extra paddings to inner blocks without background colors.
+	if (
+		mergedStyle?.padding &&
+		! wrapperPropsStyle?.backgroundColor &&
+		! blockStyleAttributes?.backgroundColor &&
+		! blockColors?.backgroundColor
+	) {
+		blockPaddings.padding = undefined;
+	}
+
+	return blockPaddings;
+}
+
+export function getBlockColors(
+	blockStyleAttributes,
+	defaultColors,
+	blockName,
+	baseGlobalStyles
+) {
+	const blockStyles = {};
+	const customBlockStyles = blockStyleAttributes?.style?.color || {};
+	const blockGlobalStyles = baseGlobalStyles?.blocks?.[ blockName ];
+
+	// Global styles colors.
+	if ( blockGlobalStyles?.color ) {
+		Object.entries( blockGlobalStyles.color ).forEach(
+			( [ key, value ] ) => {
+				const styleKey = BLOCK_STYLE_ATTRIBUTES_MAPPING[ key ];
+
+				if ( styleKey && value !== UNKNOWN_VALUE ) {
+					const color = customBlockStyles[ key ] ?? value;
+					blockStyles[ styleKey ] = color;
+				}
+			}
+		);
+	} else if ( baseGlobalStyles?.styles?.color?.text ) {
+		blockStyles[ BLOCK_STYLE_ATTRIBUTES_MAPPING.text ] =
+			baseGlobalStyles?.styles?.color?.text;
+	}
+
+	// Global styles elements.
+	if ( blockGlobalStyles?.elements ) {
+		const linkColor = blockGlobalStyles.elements?.link?.color?.text;
+		const styleKey = BLOCK_STYLE_ATTRIBUTES_MAPPING.link;
+
+		if ( styleKey && linkColor && linkColor !== UNKNOWN_VALUE ) {
+			blockStyles[ styleKey ] = linkColor;
+		}
+	}
+
+	// Custom colors.
+	Object.entries( blockStyleAttributes ).forEach( ( [ key, value ] ) => {
+		const isCustomColor = value?.startsWith?.( '#' );
+		let styleKey = key;
+
+		if ( BLOCK_STYLE_ATTRIBUTES_MAPPING[ styleKey ] ) {
+			styleKey = BLOCK_STYLE_ATTRIBUTES_MAPPING[ styleKey ];
+		}
+
+		if ( ! isCustomColor ) {
+			const mappedColor = Object.values( defaultColors ?? {} ).find(
+				( { slug } ) => slug === value
+			);
+
+			if ( mappedColor ) {
+				blockStyles[ styleKey ] = mappedColor.color;
+			}
+		} else {
+			blockStyles[ styleKey ] = value;
+		}
+	} );
+
+	// Color placeholder.
+	if ( blockStyles?.color ) {
+		blockStyles[ BLOCK_STYLE_ATTRIBUTES_MAPPING.placeholder ] =
+			blockStyles.color;
+	}
+
+	return blockStyles;
+}
+
+function getBlockTypography(
+	blockStyleAttributes,
+	fontSizes,
+	blockName,
+	baseGlobalStyles
+) {
+	const typographyStyles = {};
+	const customBlockStyles = blockStyleAttributes?.style?.typography || {};
+	const blockGlobalStyles = baseGlobalStyles?.blocks?.[ blockName ];
+	const parsedFontSizes = Object.values( fontSizes ?? {} );
+
+	// Global styles.
+	if ( blockGlobalStyles?.typography ) {
+		const fontSize = blockGlobalStyles?.typography?.fontSize;
+		const lineHeight = blockGlobalStyles?.typography?.lineHeight;
+
+		if ( fontSize ) {
+			if ( parseInt( fontSize, 10 ) ) {
+				typographyStyles.fontSize = fontSize;
+			} else {
+				const mappedFontSize = parsedFontSizes.find(
+					( { slug } ) => slug === fontSize
+				);
+
+				if ( mappedFontSize ) {
+					typographyStyles.fontSize = mappedFontSize?.size;
+				}
+			}
+		}
+
+		if ( lineHeight ) {
+			typographyStyles.lineHeight = lineHeight;
+		}
+	}
+
+	if ( blockStyleAttributes?.fontSize && baseGlobalStyles ) {
+		const mappedFontSize = parsedFontSizes.find(
+			( { slug } ) => slug === blockStyleAttributes?.fontSize
+		);
+
+		if ( mappedFontSize ) {
+			typographyStyles.fontSize = mappedFontSize?.size;
+		}
+	}
+
+	// Custom styles.
+	if ( customBlockStyles?.fontSize ) {
+		typographyStyles.fontSize = customBlockStyles?.fontSize;
+	}
+
+	if ( customBlockStyles?.lineHeight ) {
+		typographyStyles.lineHeight = customBlockStyles?.lineHeight;
+	}
+
+	return typographyStyles;
+}
+
+/**
+ * Return a value from a certain path of the object.
+ * Path is specified as an array of properties, like: [ 'parent', 'child' ].
+ *
+ * @param {Object} object Input object.
+ * @param {Array}  path   Path to the object property.
+ * @return {*} Value of the object property at the specified path.
+ */
+const getValueFromObjectPath = ( object, path ) => {
+	let value = object;
+	path.forEach( ( fieldName ) => {
+		value = value?.[ fieldName ];
+	} );
+	return value;
+};
+
+export function parseStylesVariables( styles, mappedValues, customValues ) {
+	let stylesBase = styles;
+	const variables = [ 'preset', 'custom', 'var', 'fontSize' ];
+
+	if ( ! stylesBase ) {
+		return styles;
+	}
+
+	variables.forEach( ( variable ) => {
+		// Examples
+		// var(--wp--preset--color--gray)
+		// var(--wp--custom--body--typography--font-family)
+		// var:preset|color|custom-color-2
+		const regex = new RegExp( `var\\(--wp--${ variable }--(.*?)\\)`, 'g' );
+		const varRegex = /\"var:preset\|color\|(.*?)\"/gm;
+		const fontSizeRegex = /"fontSize":"(.*?)"/gm;
+
+		if ( variable === 'preset' ) {
+			stylesBase = stylesBase.replace( regex, ( _$1, $2 ) => {
+				const path = $2.split( '--' );
+				const mappedPresetValue = mappedValues[ path[ 0 ] ];
+				if ( mappedPresetValue && mappedPresetValue.slug ) {
+					const matchedValue = Object.values(
+						mappedPresetValue.values ?? {}
+					).find( ( { slug } ) => slug === path[ 1 ] );
+					return matchedValue?.[ mappedPresetValue.slug ];
+				}
+				return UNKNOWN_VALUE;
+			} );
+		}
+		if ( variable === 'custom' ) {
+			const customValuesData = customValues ?? JSON.parse( stylesBase );
+			stylesBase = stylesBase.replace( regex, ( _$1, $2 ) => {
+				const path = $2.split( '--' );
+
+				// Supports cases for variables like var(--wp--custom--color--background)
+				if ( path[ 0 ] === 'color' ) {
+					const colorKey = path[ path.length - 1 ];
+					if ( mappedValues?.color ) {
+						const matchedValue = mappedValues.color?.values?.find(
+							( { slug } ) => slug === colorKey
+						);
+						if ( matchedValue ) {
+							return `${ matchedValue?.color }`;
+						}
+					}
+				}
+
+				if (
+					path.reduce(
+						( prev, curr ) => prev && prev[ curr ],
+						customValuesData
+					)
+				) {
+					return getValueFromObjectPath( customValuesData, path );
+				}
+
+				// Check for camelcase properties.
+				return getValueFromObjectPath( customValuesData, [
+					...path.slice( 0, path.length - 1 ),
+					camelCase( path[ path.length - 1 ] ),
+				] );
+			} );
+		}
+
+		if ( variable === 'var' ) {
+			stylesBase = stylesBase.replace( varRegex, ( _$1, $2 ) => {
+				if ( mappedValues?.color ) {
+					const matchedValue = mappedValues.color?.values?.find(
+						( { slug } ) => slug === $2
+					);
+					return `"${ matchedValue?.color }"`;
+				}
+				return UNKNOWN_VALUE;
+			} );
+		}
+
+		if ( variable === 'fontSize' ) {
+			const { width, height } = Dimensions.get( 'window' );
+
+			stylesBase = stylesBase.replace( fontSizeRegex, ( _$1, $2 ) => {
+				const parsedFontSize =
+					getPxFromCssUnit( $2, {
+						width,
+						height,
+						fontSize: DEFAULT_FONT_SIZE,
+					} ) || `${ DEFAULT_FONT_SIZE }px`;
+
+				return `"fontSize":"${ parsedFontSize }"`;
+			} );
+		}
+	} );
+
+	return JSON.parse( stylesBase );
+}
+
+function getMappedValues( features, palette ) {
+	const typography = features?.typography;
+	const colors = [
+		...( palette?.theme || [] ),
+		...( palette?.custom || [] ),
+		...( palette?.default || [] ),
+	];
+
+	const fontSizes = {
+		...typography?.fontSizes?.theme,
+		...typography?.fontSizes?.custom,
+	};
+	const mappedValues = {
+		color: {
+			values: colors,
+			slug: 'color',
+		},
+		'font-size': {
+			values: fontSizes,
+			slug: 'size',
+		},
+	};
+	return mappedValues;
+}
+
+/**
+ * Returns the normalized fontSizes to include the sizePx value for each of the different sizes.
+ *
+ * @param {Object} fontSizes found in global styles.
+ * @return {Object} normalized sizes.
+ */
+function normalizeFontSizes( fontSizes ) {
+	if ( ! fontSizes ) {
+		return fontSizes;
+	}
+
+	const dimensions = Dimensions.get( 'window' );
+	const normalizedFontSizes = {};
+	const keysToProcess = [];
+
+	// Check if 'theme' or 'custom' keys exist and add them to keysToProcess array
+	if ( fontSizes?.theme ) {
+		keysToProcess.push( 'theme' );
+	}
+	if ( fontSizes?.custom ) {
+		keysToProcess.push( 'custom' );
+	}
+
+	// If neither 'theme' nor 'custom' exist, add 'default' if it exists
+	if ( keysToProcess.length === 0 && fontSizes?.default ) {
+		keysToProcess.push( 'default' );
+	}
+
+	keysToProcess.forEach( ( key ) => {
+		normalizedFontSizes[ key ] = fontSizes[ key ].map(
+			( fontSizeObject ) => {
+				fontSizeObject.sizePx = getPxFromCssUnit( fontSizeObject.size, {
+					width: dimensions.width,
+					height: dimensions.height,
+					fontSize: DEFAULT_FONT_SIZE,
+				} );
+				return fontSizeObject;
+			}
+		);
+	} );
+
+	return normalizedFontSizes;
+}
+
+export function useMobileGlobalStylesColors( type = 'colors' ) {
+	const colorGradientSettings = useMultipleOriginColorsAndGradients();
+	const availableThemeColors = colorGradientSettings?.[ type ]?.reduce(
+		( colors, origin ) => colors.concat( origin?.[ type ] ),
+		[]
+	);
+	// Default editor colors/gradients if it's not a block-based theme.
+	const defaultPaletteSetting =
+		type === 'colors' ? 'color.palette' : 'color.gradients';
+	const [ defaultPaletteValue ] = useSettings( defaultPaletteSetting );
+	// In edge cases, the default palette might be undefined. To avoid
+	// exceptions across the editor in that case, we explicitly return
+	// the default editor colors.
+	const defaultPalette = defaultPaletteValue ?? SETTINGS_DEFAULTS.colors;
+
+	return availableThemeColors.length >= 1
+		? availableThemeColors
+		: defaultPalette;
+}
+
+export function getColorsAndGradients(
+	defaultEditorColors = [],
+	defaultEditorGradients = [],
+	rawFeatures
+) {
+	const features = rawFeatures ? JSON.parse( rawFeatures ) : {};
+
+	return {
+		__experimentalGlobalStylesBaseStyles: null,
+		__experimentalFeatures: {
+			// Set an empty object to avoid errors from shared web components relying
+			// upon block settings. E.g., the Gallery block.
+			blocks: {},
+			color: {
+				...( ! features?.color
+					? {
+							text: true,
+							background: true,
+							palette: {
+								default: defaultEditorColors,
+							},
+							gradients: {
+								default: defaultEditorGradients,
+							},
+					  }
+					: features?.color ),
+				defaultPalette: defaultEditorColors?.length > 0,
+				defaultGradients: defaultEditorGradients?.length > 0,
+			},
+		},
+	};
+}
+
+export function getGlobalStyles( rawStyles, rawFeatures ) {
+	const features = rawFeatures ? JSON.parse( rawFeatures ) : {};
+	const mappedValues = getMappedValues( features, features?.color?.palette );
+	const colors = parseStylesVariables(
+		JSON.stringify( features?.color ),
+		mappedValues
+	);
+	const gradients = parseStylesVariables(
+		JSON.stringify( features?.color?.gradients ),
+		mappedValues
+	);
+	const customValues = parseStylesVariables(
+		JSON.stringify( features?.custom ),
+		mappedValues
+	);
+	const globalStyles = parseStylesVariables(
+		rawStyles,
+		mappedValues,
+		customValues
+	);
+
+	const fontSizes = normalizeFontSizes( features?.typography?.fontSizes );
+
+	return {
+		__experimentalFeatures: {
+			// Set an empty object to avoid errors from shared web components relying
+			// upon block settings. E.g., the Gallery block.
+			blocks: {},
+			color: {
+				palette: colors?.palette,
+				gradients,
+				text: features?.color?.text ?? true,
+				background: features?.color?.background ?? true,
+				defaultPalette: features?.color?.defaultPalette ?? true,
+				defaultGradients: features?.color?.defaultGradients ?? true,
+			},
+			typography: {
+				fontSizes,
+				customLineHeight: features?.custom?.[ 'line-height' ],
+			},
+			spacing: features?.spacing,
+		},
+		__experimentalGlobalStylesBaseStyles: globalStyles,
+	};
+}
+
+export const getMergedGlobalStyles = (
+	baseGlobalStyles,
+	globalStyle,
+	wrapperPropsStyle,
+	blockAttributes,
+	defaultColors,
+	blockName,
+	fontSizes
+) => {
+	// Current support for general styles and blocks.
+	const baseGlobalColors = {
+		baseColors: {
+			color: baseGlobalStyles?.color,
+			typography: baseGlobalStyles?.typography,
+			elements: {
+				link: baseGlobalStyles?.elements?.link,
+			},
+			blocks: {
+				'core/button': baseGlobalStyles?.blocks?.[ 'core/button' ],
+			},
+		},
+	};
+
+	const blockStyleAttributes = Object.fromEntries(
+		Object.entries( blockAttributes ?? {} ).filter( ( [ key ] ) =>
+			BLOCK_STYLE_ATTRIBUTES.includes( key )
+		)
+	);
+
+	// This prevents certain wrapper styles from being applied to blocks that
+	// don't support them yet.
+	const wrapperPropsStyleFiltered = Object.fromEntries(
+		Object.entries( wrapperPropsStyle ?? {} ).filter( ( [ key ] ) =>
+			BLOCK_STYLE_ATTRIBUTES.includes( key )
+		)
+	);
+
+	const mergedStyle = {
+		...baseGlobalColors,
+		...globalStyle,
+		...wrapperPropsStyleFiltered,
+	};
+	const blockColors = getBlockColors(
+		blockStyleAttributes,
+		defaultColors,
+		blockName,
+		baseGlobalStyles
+	);
+	const blockPaddings = getBlockPaddings(
+		mergedStyle,
+		wrapperPropsStyle,
+		blockStyleAttributes,
+		blockColors
+	);
+	const blockTypography = getBlockTypography(
+		blockStyleAttributes,
+		fontSizes,
+		blockName,
+		baseGlobalStyles
+	);
+
+	return {
+		...mergedStyle,
+		...blockPaddings,
+		...blockColors,
+		...blockTypography,
+	};
+};
+
+export const useGlobalStyles = () => {
+	const globalStyles = useContext( GlobalStylesContext );
+
+	return globalStyles;
+};
+
+/**
+ * Determine and apply appropriate color scheme based on global styles or device's light/dark mode.
+ *
+ * The function first attempts to retrieve the editor's background color from global styles.
+ * If the detected background color is light, light styles are applied, and dark styles otherwise.
+ * If no custom background color is defined, styles are applied using the device's dark/light setting.
+ *
+ * @param {Object} baseStyle - An object representing the base (light theme) styles for the editor.
+ * @param {Object} darkStyle - An object representing the additional styles to apply when the editor is in dark mode.
+ *
+ * @return {Object} - The combined style object that should be applied to the editor.
+ */
+export const useEditorColorScheme = ( baseStyle, darkStyle ) => {
+	const globalStyles = useGlobalStyles();
+
+	const deviceColorScheme = usePreferredColorSchemeStyle(
+		baseStyle,
+		darkStyle
+	);
+
+	const editorColors = globalStyles?.baseColors?.color;
+	const editorBackgroundColor = editorColors?.background;
+
+	const isBackgroundColorDefined =
+		typeof editorBackgroundColor !== 'undefined' &&
+		editorBackgroundColor !== 'undefined';
+
+	if ( isBackgroundColorDefined ) {
+		const isEditorBackgroundDark = colord( editorBackgroundColor ).isDark();
+		return isEditorBackgroundDark
+			? { ...baseStyle, ...darkStyle }
+			: baseStyle;
+	}
+
+	return deviceColorScheme;
+};
diff --git a/packages/block-editor/src/components/global-styles/use-global-styles-output.js b/packages/block-editor/src/components/global-styles/use-global-styles-output.js
index 7e99eca355b52e..cd4ad0cea50e0d 100644
--- a/packages/block-editor/src/components/global-styles/use-global-styles-output.js
+++ b/packages/block-editor/src/components/global-styles/use-global-styles-output.js
@@ -10,7 +10,8 @@ import {
 } from '@wordpress/blocks';
 import { useSelect } from '@wordpress/data';
 import { useContext, useMemo } from '@wordpress/element';
-import { getCSSRules } from '@wordpress/style-engine';
+import { getCSSRules, getCSSValueFromRawStyle } from '@wordpress/style-engine';
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -18,26 +19,30 @@ import { getCSSRules } from '@wordpress/style-engine';
 import {
 	PRESET_METADATA,
 	ROOT_BLOCK_SELECTOR,
+	ROOT_CSS_PROPERTIES_SELECTOR,
 	scopeSelector,
+	scopeFeatureSelectors,
 	appendToSelector,
+	getBlockStyleVariationSelector,
+	getResolvedValue,
 } from './utils';
 import { getBlockCSSSelector } from './get-block-css-selector';
-import {
-	getTypographyFontSizeValue,
-	getFluidTypographyOptionsFromSettings,
-} from './typography-utils';
+import { getTypographyFontSizeValue } from './typography-utils';
 import { GlobalStylesContext } from './context';
 import { useGlobalSetting } from './hooks';
 import { getDuotoneFilter } from '../duotone/utils';
 import { getGapCSSValue } from '../../hooks/gap';
+import { setBackgroundStyleDefaults } from '../../hooks/background';
 import { store as blockEditorStore } from '../../store';
 import { LAYOUT_DEFINITIONS } from '../../layouts/definitions';
-import {
-	getValueFromObjectPath,
-	kebabCase,
-	setImmutably,
-} from '../../utils/object';
-import BlockContext from '../block-context';
+import { getValueFromObjectPath, setImmutably } from '../../utils/object';
+import { unlock } from '../../lock-unlock';
+
+// Elements that rely on class names in their selectors.
+const ELEMENT_CLASS_NAMES = {
+	button: 'wp-element-button',
+	caption: 'wp-element-caption',
+};
 
 // List of block support features that can have their related styles
 // generated under their own feature level selector rather than the block's.
@@ -47,21 +52,7 @@ const BLOCK_SUPPORT_FEATURE_LEVEL_SELECTORS = {
 	spacing: 'spacing',
 	typography: 'typography',
 };
-
-function compileStyleValue( uncompiledValue ) {
-	const VARIABLE_REFERENCE_PREFIX = 'var:';
-	const VARIABLE_PATH_SEPARATOR_TOKEN_ATTRIBUTE = '|';
-	const VARIABLE_PATH_SEPARATOR_TOKEN_STYLE = '--';
-
-	if ( uncompiledValue?.startsWith?.( VARIABLE_REFERENCE_PREFIX ) ) {
-		const variable = uncompiledValue
-			.slice( VARIABLE_REFERENCE_PREFIX.length )
-			.split( VARIABLE_PATH_SEPARATOR_TOKEN_ATTRIBUTE )
-			.join( VARIABLE_PATH_SEPARATOR_TOKEN_STYLE );
-		return `var(--wp--${ variable })`;
-	}
-	return uncompiledValue;
-}
+const { kebabCase } = unlock( componentsPrivateApis );
 
 /**
  * Transform given preset tree into a set of style declarations.
@@ -311,7 +302,7 @@ const getFeatureDeclarations = ( selectors, styles ) => {
  *
  * @param {Object}  tree                A theme.json tree containing layout definitions.
  *
- * @param {boolean} isTemplate          Whether the entity being edited is a full template or a pattern.
+ * @param {boolean} disableRootPadding  Whether to force disable the root padding styles.
  * @return {Array} An array of style declarations.
  */
 export function getStylesDeclarations(
@@ -319,7 +310,7 @@ export function getStylesDeclarations(
 	selector = '',
 	useRootPaddingAlign,
 	tree = {},
-	isTemplate = true
+	disableRootPadding = false
 ) {
 	const isRoot = ROOT_BLOCK_SELECTOR === selector;
 	const output = Object.entries( STYLE_PROPERTY ).reduce(
@@ -365,7 +356,7 @@ export function getStylesDeclarations(
 						? name
 						: kebabCase( name );
 					declarations.push(
-						`${ cssProperty }: ${ compileStyleValue(
+						`${ cssProperty }: ${ getCSSValueFromRawStyle(
 							getValueFromObjectPath( styleValue, [ prop ] )
 						) }`
 					);
@@ -377,7 +368,7 @@ export function getStylesDeclarations(
 					? key
 					: kebabCase( key );
 				declarations.push(
-					`${ cssProperty }: ${ compileStyleValue(
+					`${ cssProperty }: ${ getCSSValueFromRawStyle(
 						getValueFromObjectPath( blockStyles, pathToValue )
 					) }`
 				);
@@ -388,14 +379,47 @@ export function getStylesDeclarations(
 		[]
 	);
 
-	// The goal is to move everything to server side generated engine styles
-	// This is temporary as we absorb more and more styles into the engine.
+	/*
+	 * Preprocess background image values.
+	 *
+	 * Note: As we absorb more and more styles into the engine, we could simplify this function.
+	 * A refactor is for the style engine to handle ref resolution (and possibly defaults)
+	 * via a public util used internally and externally. Theme.json tree and defaults could be passed
+	 * as options.
+	 */
+	if ( !! blockStyles.background ) {
+		/*
+		 * Resolve dynamic values before they are compiled by the style engine,
+		 * which doesn't (yet) resolve dynamic values.
+		 */
+		if ( blockStyles.background?.backgroundImage ) {
+			blockStyles.background.backgroundImage = getResolvedValue(
+				blockStyles.background.backgroundImage,
+				tree
+			);
+		}
+
+		/*
+		 * Set default values for block background styles.
+		 * Top-level styles are an exception as they are applied to the body.
+		 */
+		if ( ! isRoot && !! blockStyles.background?.backgroundImage?.id ) {
+			blockStyles = {
+				...blockStyles,
+				background: {
+					...blockStyles.background,
+					...setBackgroundStyleDefaults( blockStyles.background ),
+				},
+			};
+		}
+	}
+
 	const extraRules = getCSSRules( blockStyles );
 	extraRules.forEach( ( rule ) => {
 		// Don't output padding properties if padding variables are set or if we're not editing a full template.
 		if (
 			isRoot &&
-			( useRootPaddingAlign || ! isTemplate ) &&
+			( useRootPaddingAlign || disableRootPadding ) &&
 			rule.key.startsWith( 'padding' )
 		) {
 			return;
@@ -404,16 +428,7 @@ export function getStylesDeclarations(
 			? rule.key
 			: kebabCase( rule.key );
 
-		let ruleValue = rule.value;
-		if ( typeof ruleValue !== 'string' && ruleValue?.ref ) {
-			const refPath = ruleValue.ref.split( '.' );
-			ruleValue = getValueFromObjectPath( tree, refPath );
-			// Presence of another ref indicates a reference to another dynamic value.
-			// Pointing to another dynamic value is not supported.
-			if ( ! ruleValue || ruleValue?.ref ) {
-				return;
-			}
-		}
+		let ruleValue = getResolvedValue( rule.value, tree, null );
 
 		// Calculate fluid typography rules where available.
 		if ( cssProperty === 'font-size' ) {
@@ -426,10 +441,16 @@ export function getStylesDeclarations(
 			 */
 			ruleValue = getTypographyFontSizeValue(
 				{ size: ruleValue },
-				getFluidTypographyOptionsFromSettings( tree?.settings )
+				tree?.settings
 			);
 		}
 
+		// For aspect ratio to work, other dimensions rules (and Cover block defaults) must be unset.
+		// This ensures that a fixed height does not override the aspect ratio.
+		if ( cssProperty === 'aspect-ratio' ) {
+			output.push( 'min-height: unset' );
+		}
+
 		output.push( `${ cssProperty }: ${ ruleValue }` );
 	} );
 
@@ -516,10 +537,10 @@ export function getLayoutStyles( {
 							} else {
 								combinedSelector =
 									selector === ROOT_BLOCK_SELECTOR
-										? `:where(${ selector } .${ className })${
+										? `:root :where(.${ className })${
 												spacingStyle?.selector || ''
 										  }`
-										: `${ selector }-${ className }${
+										: `:root :where(${ selector }-${ className })${
 												spacingStyle?.selector || ''
 										  }`;
 							}
@@ -533,7 +554,7 @@ export function getLayoutStyles( {
 		);
 		// For backwards compatibility, ensure the legacy block gap CSS variable is still available.
 		if ( selector === ROOT_BLOCK_SELECTOR && hasBlockGapSupport ) {
-			ruleset += `${ selector } { --wp--style--block-gap: ${ gapValue }; }`;
+			ruleset += `${ ROOT_CSS_PROPERTIES_SELECTOR } { --wp--style--block-gap: ${ gapValue }; }`;
 		}
 	}
 
@@ -564,7 +585,7 @@ export function getLayoutStyles( {
 						}
 
 						if ( declarations.length ) {
-							const combinedSelector = `${ selector } .${ className }${
+							const combinedSelector = `.${ className }${
 								baseStyle?.selector || ''
 							}`;
 							ruleset += `${ combinedSelector } { ${ declarations.join(
@@ -589,6 +610,7 @@ const STYLE_KEYS = [
 	'filter',
 	'outline',
 	'shadow',
+	'background',
 ];
 
 function pickStyleKeys( treeToPickFrom ) {
@@ -620,6 +642,9 @@ export const getNodesWithStyles = ( tree, blockSelectors ) => {
 		nodes.push( {
 			styles,
 			selector: ROOT_BLOCK_SELECTOR,
+			// Root selector (body) styles should not be wrapped in `:root where()` to keep
+			// specificity at (0,0,1) and maintain backwards compatibility.
+			skipSelectorWrapper: true,
 		} );
 	}
 
@@ -628,6 +653,9 @@ export const getNodesWithStyles = ( tree, blockSelectors ) => {
 			nodes.push( {
 				styles: tree.styles?.elements?.[ name ],
 				selector,
+				// Top level elements that don't use a class name should not receive the
+				// `:root :where()` wrapper to maintain backwards compatibility.
+				skipSelectorWrapper: ! ELEMENT_CLASS_NAMES[ name ],
 			} );
 		}
 	} );
@@ -639,14 +667,112 @@ export const getNodesWithStyles = ( tree, blockSelectors ) => {
 
 			if ( node?.variations ) {
 				const variations = {};
-				Object.keys( node.variations ).forEach( ( variation ) => {
-					variations[ variation ] = pickStyleKeys(
-						node.variations[ variation ]
-					);
-				} );
+				Object.entries( node.variations ).forEach(
+					( [ variationName, variation ] ) => {
+						variations[ variationName ] =
+							pickStyleKeys( variation );
+						if ( variation?.css ) {
+							variations[ variationName ].css = variation.css;
+						}
+						const variationSelector =
+							blockSelectors[ blockName ]
+								?.styleVariationSelectors?.[ variationName ];
+
+						// Process the variation's inner element styles.
+						// This comes before the inner block styles so the
+						// element styles within the block type styles take
+						// precedence over these.
+						Object.entries( variation?.elements ?? {} ).forEach(
+							( [ element, elementStyles ] ) => {
+								if ( elementStyles && ELEMENTS[ element ] ) {
+									nodes.push( {
+										styles: elementStyles,
+										selector: scopeSelector(
+											variationSelector,
+											ELEMENTS[ element ]
+										),
+									} );
+								}
+							}
+						);
+
+						// Process the variations inner block type styles.
+						Object.entries( variation?.blocks ?? {} ).forEach(
+							( [
+								variationBlockName,
+								variationBlockStyles,
+							] ) => {
+								const variationBlockSelector = scopeSelector(
+									variationSelector,
+									blockSelectors[ variationBlockName ]
+										?.selector
+								);
+								const variationDuotoneSelector = scopeSelector(
+									variationSelector,
+									blockSelectors[ variationBlockName ]
+										?.duotoneSelector
+								);
+								const variationFeatureSelectors =
+									scopeFeatureSelectors(
+										variationSelector,
+										blockSelectors[ variationBlockName ]
+											?.featureSelectors
+									);
+
+								const variationBlockStyleNodes =
+									pickStyleKeys( variationBlockStyles );
+
+								if ( variationBlockStyles?.css ) {
+									variationBlockStyleNodes.css =
+										variationBlockStyles.css;
+								}
+
+								nodes.push( {
+									selector: variationBlockSelector,
+									duotoneSelector: variationDuotoneSelector,
+									featureSelectors: variationFeatureSelectors,
+									fallbackGapValue:
+										blockSelectors[ variationBlockName ]
+											?.fallbackGapValue,
+									hasLayoutSupport:
+										blockSelectors[ variationBlockName ]
+											?.hasLayoutSupport,
+									styles: variationBlockStyleNodes,
+								} );
+
+								// Process element styles for the inner blocks
+								// of the variation.
+								Object.entries(
+									variationBlockStyles.elements ?? {}
+								).forEach(
+									( [
+										variationBlockElement,
+										variationBlockElementStyles,
+									] ) => {
+										if (
+											variationBlockElementStyles &&
+											ELEMENTS[ variationBlockElement ]
+										) {
+											nodes.push( {
+												styles: variationBlockElementStyles,
+												selector: scopeSelector(
+													variationBlockSelector,
+													ELEMENTS[
+														variationBlockElement
+													]
+												),
+											} );
+										}
+									}
+								);
+							}
+						);
+					}
+				);
 				blockStyles.variations = variations;
 			}
-			if ( blockStyles && blockSelectors?.[ blockName ]?.selector ) {
+
+			if ( blockSelectors?.[ blockName ]?.selector ) {
 				nodes.push( {
 					duotoneSelector:
 						blockSelectors[ blockName ].duotoneSelector,
@@ -718,7 +844,7 @@ export const getNodesWithSettings = ( tree, blockSelectors ) => {
 		nodes.push( {
 			presets,
 			custom,
-			selector: ROOT_BLOCK_SELECTOR,
+			selector: ROOT_CSS_PROPERTIES_SELECTOR,
 		} );
 	}
 
@@ -764,241 +890,294 @@ export const toStyles = (
 	hasBlockGapSupport,
 	hasFallbackGapSupport,
 	disableLayoutStyles = false,
-	isTemplate = true
+	disableRootPadding = false,
+	styleOptions = undefined
 ) => {
+	// These allow opting out of certain sets of styles.
+	const options = {
+		blockGap: true,
+		blockStyles: true,
+		layoutStyles: true,
+		marginReset: true,
+		presets: true,
+		rootPadding: true,
+		variationStyles: false,
+		...styleOptions,
+	};
 	const nodesWithStyles = getNodesWithStyles( tree, blockSelectors );
 	const nodesWithSettings = getNodesWithSettings( tree, blockSelectors );
 	const useRootPaddingAlign = tree?.settings?.useRootPaddingAwareAlignments;
 	const { contentSize, wideSize } = tree?.settings?.layout || {};
+	const hasBodyStyles =
+		options.marginReset || options.rootPadding || options.layoutStyles;
 
-	/*
-	 * Reset default browser margin on the root body element.
-	 * This is set on the root selector **before** generating the ruleset
-	 * from the `theme.json`. This is to ensure that if the `theme.json` declares
-	 * `margin` in its `spacing` declaration for the `body` element then these
-	 * user-generated values take precedence in the CSS cascade.
-	 * @link https://github.com/WordPress/gutenberg/issues/36147.
-	 */
-	let ruleset = 'body {margin: 0;';
-
-	if ( contentSize ) {
-		ruleset += ` --wp--style--global--content-size: ${ contentSize };`;
-	}
+	let ruleset = '';
 
-	if ( wideSize ) {
-		ruleset += ` --wp--style--global--wide-size: ${ wideSize };`;
+	if ( options.presets && ( contentSize || wideSize ) ) {
+		ruleset += `${ ROOT_CSS_PROPERTIES_SELECTOR } {`;
+		ruleset = contentSize
+			? ruleset + ` --wp--style--global--content-size: ${ contentSize };`
+			: ruleset;
+		ruleset = wideSize
+			? ruleset + ` --wp--style--global--wide-size: ${ wideSize };`
+			: ruleset;
+		ruleset += '}';
 	}
 
-	// Root padding styles should only be output for full templates, not patterns or template parts.
-	if ( useRootPaddingAlign && isTemplate ) {
+	if ( hasBodyStyles ) {
 		/*
-		 * These rules reproduce the ones from https://github.com/WordPress/gutenberg/blob/79103f124925d1f457f627e154f52a56228ed5ad/lib/class-wp-theme-json-gutenberg.php#L2508
-		 * almost exactly, but for the selectors that target block wrappers in the front end. This code only runs in the editor, so it doesn't need those selectors.
+		 * Reset default browser margin on the body element.
+		 * This is set on the body selector **before** generating the ruleset
+		 * from the `theme.json`. This is to ensure that if the `theme.json` declares
+		 * `margin` in its `spacing` declaration for the `body` element then these
+		 * user-generated values take precedence in the CSS cascade.
+		 * @link https://github.com/WordPress/gutenberg/issues/36147.
 		 */
-		ruleset += `padding-right: 0; padding-left: 0; padding-top: var(--wp--style--root--padding-top); padding-bottom: var(--wp--style--root--padding-bottom) }
-			.has-global-padding { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }
-			.has-global-padding :where(.has-global-padding:not(.wp-block-block)) { padding-right: 0; padding-left: 0; }
-			.has-global-padding > .alignfull { margin-right: calc(var(--wp--style--root--padding-right) * -1); margin-left: calc(var(--wp--style--root--padding-left) * -1); }
-			.has-global-padding :where(.has-global-padding:not(.wp-block-block)) > .alignfull { margin-right: 0; margin-left: 0; }
-			.has-global-padding > .alignfull:where(:not(.has-global-padding):not(.is-layout-flex):not(.is-layout-grid)) > :where(.wp-block:not(.alignfull),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }
-			.has-global-padding :where(.has-global-padding) > .alignfull:where(:not(.has-global-padding)) > :where(.wp-block:not(.alignfull),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: 0; padding-left: 0;`;
-	}
-
-	ruleset += '}';
-
-	nodesWithStyles.forEach(
-		( {
-			selector,
-			duotoneSelector,
-			styles,
-			fallbackGapValue,
-			hasLayoutSupport,
-			featureSelectors,
-			styleVariationSelectors,
-		} ) => {
-			// Process styles for block support features with custom feature level
-			// CSS selectors set.
-			if ( featureSelectors ) {
-				const featureDeclarations = getFeatureDeclarations(
-					featureSelectors,
-					styles
-				);
+		ruleset += ':where(body) {margin: 0;';
 
-				Object.entries( featureDeclarations ).forEach(
-					( [ cssSelector, declarations ] ) => {
-						if ( declarations.length ) {
-							const rules = declarations.join( ';' );
-							ruleset += `${ cssSelector }{${ rules };}`;
-						}
-					}
-				);
-			}
+		// Root padding styles should be output for full templates, patterns and template parts.
+		if ( options.rootPadding && useRootPaddingAlign ) {
+			/*
+			 * These rules reproduce the ones from https://github.com/WordPress/gutenberg/blob/79103f124925d1f457f627e154f52a56228ed5ad/lib/class-wp-theme-json-gutenberg.php#L2508
+			 * almost exactly, but for the selectors that target block wrappers in the front end. This code only runs in the editor, so it doesn't need those selectors.
+			 */
+			ruleset += `padding-right: 0; padding-left: 0; padding-top: var(--wp--style--root--padding-top); padding-bottom: var(--wp--style--root--padding-bottom) }
+				.has-global-padding { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }
+				.has-global-padding > .alignfull { margin-right: calc(var(--wp--style--root--padding-right) * -1); margin-left: calc(var(--wp--style--root--padding-left) * -1); }
+				.has-global-padding :where(:not(.alignfull.is-layout-flow) > .has-global-padding:not(.wp-block-block, .alignfull)) { padding-right: 0; padding-left: 0; }
+				.has-global-padding :where(:not(.alignfull.is-layout-flow) > .has-global-padding:not(.wp-block-block, .alignfull)) > .alignfull { margin-left: 0; margin-right: 0;
+				`;
+		}
 
-			if ( styleVariationSelectors ) {
-				Object.entries( styleVariationSelectors ).forEach(
-					( [ styleVariationName, styleVariationSelector ] ) => {
-						const styleVariations =
-							styles?.variations?.[ styleVariationName ];
-						if ( styleVariations ) {
-							// If the block uses any custom selectors for block support, add those first.
-							if ( featureSelectors ) {
-								const featureDeclarations =
-									getFeatureDeclarations(
-										featureSelectors,
-										styleVariations
-									);
+		ruleset += '}';
+	}
 
-								Object.entries( featureDeclarations ).forEach(
-									( [ baseSelector, declarations ] ) => {
-										if ( declarations.length ) {
-											const cssSelector =
-												concatFeatureVariationSelectorString(
-													baseSelector,
-													styleVariationSelector
-												);
-											const rules =
-												declarations.join( ';' );
-											ruleset += `${ cssSelector }{${ rules };}`;
-										}
-									}
-								);
-							}
+	if ( options.blockStyles ) {
+		nodesWithStyles.forEach(
+			( {
+				selector,
+				duotoneSelector,
+				styles,
+				fallbackGapValue,
+				hasLayoutSupport,
+				featureSelectors,
+				styleVariationSelectors,
+				skipSelectorWrapper,
+			} ) => {
+				// Process styles for block support features with custom feature level
+				// CSS selectors set.
+				if ( featureSelectors ) {
+					const featureDeclarations = getFeatureDeclarations(
+						featureSelectors,
+						styles
+					);
 
-							// Otherwise add regular selectors.
-							const styleVariationDeclarations =
-								getStylesDeclarations(
-									styleVariations,
-									styleVariationSelector,
-									useRootPaddingAlign,
-									tree
-								);
-							if ( styleVariationDeclarations.length ) {
-								ruleset += `${ styleVariationSelector }{${ styleVariationDeclarations.join(
-									';'
-								) };}`;
+					Object.entries( featureDeclarations ).forEach(
+						( [ cssSelector, declarations ] ) => {
+							if ( declarations.length ) {
+								const rules = declarations.join( ';' );
+								ruleset += `:root :where(${ cssSelector }){${ rules };}`;
 							}
 						}
+					);
+				}
+
+				// Process duotone styles.
+				if ( duotoneSelector ) {
+					const duotoneStyles = {};
+					if ( styles?.filter ) {
+						duotoneStyles.filter = styles.filter;
+						delete styles.filter;
 					}
-				);
-			}
+					const duotoneDeclarations =
+						getStylesDeclarations( duotoneStyles );
+					if ( duotoneDeclarations.length ) {
+						ruleset += `${ duotoneSelector }{${ duotoneDeclarations.join(
+							';'
+						) };}`;
+					}
+				}
 
-			// Process duotone styles.
-			if ( duotoneSelector ) {
-				const duotoneStyles = {};
-				if ( styles?.filter ) {
-					duotoneStyles.filter = styles.filter;
-					delete styles.filter;
+				// Process blockGap and layout styles.
+				if (
+					! disableLayoutStyles &&
+					( ROOT_BLOCK_SELECTOR === selector || hasLayoutSupport )
+				) {
+					ruleset += getLayoutStyles( {
+						style: styles,
+						selector,
+						hasBlockGapSupport,
+						hasFallbackGapSupport,
+						fallbackGapValue,
+					} );
 				}
-				const duotoneDeclarations =
-					getStylesDeclarations( duotoneStyles );
-				if ( duotoneDeclarations.length ) {
-					ruleset += `${ duotoneSelector }{${ duotoneDeclarations.join(
+
+				// Process the remaining block styles (they use either normal block class or __experimentalSelector).
+				const styleDeclarations = getStylesDeclarations(
+					styles,
+					selector,
+					useRootPaddingAlign,
+					tree,
+					disableRootPadding
+				);
+				if ( styleDeclarations?.length ) {
+					const generalSelector = skipSelectorWrapper
+						? selector
+						: `:root :where(${ selector })`;
+					ruleset += `${ generalSelector }{${ styleDeclarations.join(
 						';'
 					) };}`;
 				}
-			}
+				if ( styles?.css ) {
+					ruleset += processCSSNesting(
+						styles.css,
+						`:root :where(${ selector })`
+					);
+				}
 
-			// Process blockGap and layout styles.
-			if (
-				! disableLayoutStyles &&
-				( ROOT_BLOCK_SELECTOR === selector || hasLayoutSupport )
-			) {
-				ruleset += getLayoutStyles( {
-					style: styles,
-					selector,
-					hasBlockGapSupport,
-					hasFallbackGapSupport,
-					fallbackGapValue,
-				} );
-			}
+				if ( options.variationStyles && styleVariationSelectors ) {
+					Object.entries( styleVariationSelectors ).forEach(
+						( [ styleVariationName, styleVariationSelector ] ) => {
+							const styleVariations =
+								styles?.variations?.[ styleVariationName ];
+							if ( styleVariations ) {
+								// If the block uses any custom selectors for block support, add those first.
+								if ( featureSelectors ) {
+									const featureDeclarations =
+										getFeatureDeclarations(
+											featureSelectors,
+											styleVariations
+										);
+
+									Object.entries(
+										featureDeclarations
+									).forEach(
+										( [ baseSelector, declarations ] ) => {
+											if ( declarations.length ) {
+												const cssSelector =
+													concatFeatureVariationSelectorString(
+														baseSelector,
+														styleVariationSelector
+													);
+												const rules =
+													declarations.join( ';' );
+												ruleset += `:root :where(${ cssSelector }){${ rules };}`;
+											}
+										}
+									);
+								}
 
-			// Process the remaining block styles (they use either normal block class or __experimentalSelector).
-			const declarations = getStylesDeclarations(
-				styles,
-				selector,
-				useRootPaddingAlign,
-				tree,
-				isTemplate
-			);
-			if ( declarations?.length ) {
-				ruleset += `${ selector }{${ declarations.join( ';' ) };}`;
-			}
+								// Otherwise add regular selectors.
+								const styleVariationDeclarations =
+									getStylesDeclarations(
+										styleVariations,
+										styleVariationSelector,
+										useRootPaddingAlign,
+										tree
+									);
+								if ( styleVariationDeclarations.length ) {
+									ruleset += `:root :where(${ styleVariationSelector }){${ styleVariationDeclarations.join(
+										';'
+									) };}`;
+								}
+								if ( styleVariations?.css ) {
+									ruleset += processCSSNesting(
+										styleVariations.css,
+										`:root :where(${ styleVariationSelector })`
+									);
+								}
+							}
+						}
+					);
+				}
 
-			// Check for pseudo selector in `styles` and handle separately.
-			const pseudoSelectorStyles = Object.entries( styles ).filter(
-				( [ key ] ) => key.startsWith( ':' )
-			);
+				// Check for pseudo selector in `styles` and handle separately.
+				const pseudoSelectorStyles = Object.entries( styles ).filter(
+					( [ key ] ) => key.startsWith( ':' )
+				);
 
-			if ( pseudoSelectorStyles?.length ) {
-				pseudoSelectorStyles.forEach(
-					( [ pseudoKey, pseudoStyle ] ) => {
-						const pseudoDeclarations =
-							getStylesDeclarations( pseudoStyle );
+				if ( pseudoSelectorStyles?.length ) {
+					pseudoSelectorStyles.forEach(
+						( [ pseudoKey, pseudoStyle ] ) => {
+							const pseudoDeclarations =
+								getStylesDeclarations( pseudoStyle );
 
-						if ( ! pseudoDeclarations?.length ) {
-							return;
-						}
+							if ( ! pseudoDeclarations?.length ) {
+								return;
+							}
 
-						// `selector` maybe provided in a form
-						// where block level selectors have sub element
-						// selectors appended to them as a comma separated
-						// string.
-						// e.g. `h1 a,h2 a,h3 a,h4 a,h5 a,h6 a`;
-						// Split and append pseudo selector to create
-						// the proper rules to target the elements.
-						const _selector = selector
-							.split( ',' )
-							.map( ( sel ) => sel + pseudoKey )
-							.join( ',' );
-
-						const pseudoRule = `${ _selector }{${ pseudoDeclarations.join(
-							';'
-						) };}`;
+							// `selector` may be provided in a form
+							// where block level selectors have sub element
+							// selectors appended to them as a comma separated
+							// string.
+							// e.g. `h1 a,h2 a,h3 a,h4 a,h5 a,h6 a`;
+							// Split and append pseudo selector to create
+							// the proper rules to target the elements.
+							const _selector = selector
+								.split( ',' )
+								.map( ( sel ) => sel + pseudoKey )
+								.join( ',' );
 
-						ruleset += pseudoRule;
-					}
-				);
+							// As pseudo classes such as :hover, :focus etc. have class-level
+							// specificity, they must use the `:root :where()` wrapper. This.
+							// caps the specificity at `0-1-0` to allow proper nesting of variations
+							// and block type element styles.
+							const pseudoRule = `:root :where(${ _selector }){${ pseudoDeclarations.join(
+								';'
+							) };}`;
+
+							ruleset += pseudoRule;
+						}
+					);
+				}
 			}
-		}
-	);
+		);
+	}
 
-	/* Add alignment / layout styles */
-	ruleset =
-		ruleset +
-		'.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }';
-	ruleset =
-		ruleset +
-		'.wp-site-blocks > .alignright { float: right; margin-left: 2em; }';
-	ruleset =
-		ruleset +
-		'.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
-
-	if ( hasBlockGapSupport ) {
+	if ( options.layoutStyles ) {
+		/* Add alignment / layout styles */
+		ruleset =
+			ruleset +
+			'.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }';
+		ruleset =
+			ruleset +
+			'.wp-site-blocks > .alignright { float: right; margin-left: 2em; }';
+		ruleset =
+			ruleset +
+			'.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
+	}
+
+	if ( options.blockGap && hasBlockGapSupport ) {
 		// Use fallback of `0.5em` just in case, however if there is blockGap support, there should nearly always be a real value.
 		const gapValue =
 			getGapCSSValue( tree?.styles?.spacing?.blockGap ) || '0.5em';
 		ruleset =
 			ruleset +
-			`:where(.wp-site-blocks) > * { margin-block-start: ${ gapValue }; margin-block-end: 0; }`;
+			`:root :where(.wp-site-blocks) > * { margin-block-start: ${ gapValue }; margin-block-end: 0; }`;
 		ruleset =
 			ruleset +
-			':where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }';
+			':root :where(.wp-site-blocks) > :first-child { margin-block-start: 0; }';
 		ruleset =
 			ruleset +
-			':where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }';
+			':root :where(.wp-site-blocks) > :last-child { margin-block-end: 0; }';
 	}
 
-	nodesWithSettings.forEach( ( { selector, presets } ) => {
-		if ( ROOT_BLOCK_SELECTOR === selector ) {
-			// Do not add extra specificity for top-level classes.
-			selector = '';
-		}
+	if ( options.presets ) {
+		nodesWithSettings.forEach( ( { selector, presets } ) => {
+			if (
+				ROOT_BLOCK_SELECTOR === selector ||
+				ROOT_CSS_PROPERTIES_SELECTOR === selector
+			) {
+				// Do not add extra specificity for top-level classes.
+				selector = '';
+			}
 
-		const classes = getPresetsClasses( selector, presets );
-		if ( classes.length > 0 ) {
-			ruleset += classes;
-		}
-	} );
+			const classes = getPresetsClasses( selector, presets );
+			if ( classes.length > 0 ) {
+				ruleset += classes;
+			}
+		} );
+	}
 
 	return ruleset;
 };
@@ -1035,7 +1214,11 @@ const getSelectorsConfig = ( blockType, rootSelector ) => {
 	return config;
 };
 
-export const getBlockSelectors = ( blockTypes, getBlockStyles ) => {
+export const getBlockSelectors = (
+	blockTypes,
+	getBlockStyles,
+	variationInstanceId
+) => {
 	const result = {};
 	blockTypes.forEach( ( blockType ) => {
 		const name = blockType.name;
@@ -1065,13 +1248,19 @@ export const getBlockSelectors = ( blockTypes, getBlockStyles ) => {
 
 		const blockStyleVariations = getBlockStyles( name );
 		const styleVariationSelectors = {};
-		if ( blockStyleVariations?.length ) {
-			blockStyleVariations.forEach( ( variation ) => {
-				const styleVariationSelector = `.is-style-${ variation.name }${ selector }`;
-				styleVariationSelectors[ variation.name ] =
-					styleVariationSelector;
-			} );
-		}
+		blockStyleVariations?.forEach( ( variation ) => {
+			const variationSuffix = variationInstanceId
+				? `-${ variationInstanceId }`
+				: '';
+			const variationName = `${ variation.name }${ variationSuffix }`;
+			const styleVariationSelector = getBlockStyleVariationSelector(
+				variationName,
+				selector
+			);
+
+			styleVariationSelectors[ variationName ] = styleVariationSelector;
+		} );
+
 		// For each block support feature add any custom selectors.
 		const featureSelectors = getSelectorsConfig( blockType, selector );
 
@@ -1084,8 +1273,7 @@ export const getBlockSelectors = ( blockTypes, getBlockStyles ) => {
 			hasLayoutSupport,
 			name,
 			selector,
-			styleVariationSelectors: Object.keys( styleVariationSelectors )
-				.length
+			styleVariationSelectors: blockStyleVariations?.length
 				? styleVariationSelectors
 				: undefined,
 		};
@@ -1132,13 +1320,21 @@ function updateConfigWithSeparator( config ) {
 export function processCSSNesting( css, blockSelector ) {
 	let processedCSS = '';
 
+	if ( ! css || css.trim() === '' ) {
+		return processedCSS;
+	}
+
 	// Split CSS nested rules.
 	const parts = css.split( '&' );
 	parts.forEach( ( part ) => {
+		if ( ! part || part.trim() === '' ) {
+			return;
+		}
+
 		const isRootCss = ! part.includes( '{' );
 		if ( isRootCss ) {
 			// If the part doesn't contain braces, it applies to the root level.
-			processedCSS += `${ blockSelector }{${ part.trim() }}`;
+			processedCSS += `:root :where(${ blockSelector }){${ part.trim() }}`;
 		} else {
 			// If the part contains braces, it's a nested CSS rule.
 			const splittedPart = part.replace( '}', '' ).split( '{' );
@@ -1147,11 +1343,32 @@ export function processCSSNesting( css, blockSelector ) {
 			}
 
 			const [ nestedSelector, cssValue ] = splittedPart;
-			const combinedSelector = nestedSelector.startsWith( ' ' )
-				? scopeSelector( blockSelector, nestedSelector )
-				: appendToSelector( blockSelector, nestedSelector );
 
-			processedCSS += `${ combinedSelector }{${ cssValue.trim() }}`;
+			// Handle pseudo elements such as ::before, ::after, etc. Regex will also
+			// capture any leading combinator such as >, +, or ~, as well as spaces.
+			// This allows pseudo elements as descendants e.g. `.parent ::before`.
+			const matches = nestedSelector.match( /([>+~\s]*::[a-zA-Z-]+)/ );
+			const pseudoPart = matches ? matches[ 1 ] : '';
+			const withoutPseudoElement = matches
+				? nestedSelector.replace( pseudoPart, '' ).trim()
+				: nestedSelector.trim();
+
+			let combinedSelector;
+			if ( withoutPseudoElement === '' ) {
+				// Only contained a pseudo element to use the block selector to form
+				// the final `:root :where()` selector.
+				combinedSelector = blockSelector;
+			} else {
+				// If the nested selector is a descendant of the block scope it with the
+				// block selector. Otherwise append it to the block selector.
+				combinedSelector = nestedSelector.startsWith( ' ' )
+					? scopeSelector( blockSelector, withoutPseudoElement )
+					: appendToSelector( blockSelector, withoutPseudoElement );
+			}
+
+			// Build final rule, re-adding any pseudo element outside the `:where()`
+			// to maintain valid CSS selector.
+			processedCSS += `:root :where(${ combinedSelector })${ pseudoPart }{${ cssValue.trim() }}`;
 		}
 	} );
 	return processedCSS;
@@ -1164,10 +1381,15 @@ export function processCSSNesting( css, blockSelector ) {
  * The use case for a custom config is to generate bespoke styles
  * and settings for previews, or other out-of-editor experiences.
  *
- * @param {Object} mergedConfig Global styles configuration.
+ * @param {Object}  mergedConfig       Global styles configuration.
+ * @param {boolean} disableRootPadding Disable root padding styles.
+ *
  * @return {Array} Array of stylesheets and settings.
  */
-export function useGlobalStylesOutputWithConfig( mergedConfig = {} ) {
+export function useGlobalStylesOutputWithConfig(
+	mergedConfig = {},
+	disableRootPadding
+) {
 	const [ blockGap ] = useGlobalSetting( 'spacing.blockGap' );
 	const hasBlockGapSupport = blockGap !== null;
 	const hasFallbackGapSupport = ! hasBlockGapSupport; // This setting isn't useful yet: it exists as a placeholder for a future explicit fallback styles support.
@@ -1176,19 +1398,13 @@ export function useGlobalStylesOutputWithConfig( mergedConfig = {} ) {
 		return !! getSettings().disableLayoutStyles;
 	} );
 
-	const blockContext = useContext( BlockContext );
-
-	const isTemplate = blockContext?.templateSlug !== undefined;
-
-	const getBlockStyles = useSelect( ( select ) => {
-		return select( blocksStore ).getBlockStyles;
-	}, [] );
+	const { getBlockStyles } = useSelect( blocksStore );
 
 	return useMemo( () => {
 		if ( ! mergedConfig?.styles || ! mergedConfig?.settings ) {
 			return [];
 		}
-		mergedConfig = updateConfigWithSeparator( mergedConfig );
+		const updatedConfig = updateConfigWithSeparator( mergedConfig );
 
 		const blockSelectors = getBlockSelectors(
 			getBlockTypes(),
@@ -1196,18 +1412,19 @@ export function useGlobalStylesOutputWithConfig( mergedConfig = {} ) {
 		);
 
 		const customProperties = toCustomProperties(
-			mergedConfig,
+			updatedConfig,
 			blockSelectors
 		);
+
 		const globalStyles = toStyles(
-			mergedConfig,
+			updatedConfig,
 			blockSelectors,
 			hasBlockGapSupport,
 			hasFallbackGapSupport,
 			disableLayoutStyles,
-			isTemplate
+			disableRootPadding
 		);
-		const svgs = toSvgFilters( mergedConfig, blockSelectors );
+		const svgs = toSvgFilters( updatedConfig, blockSelectors );
 
 		const styles = [
 			{
@@ -1220,7 +1437,7 @@ export function useGlobalStylesOutputWithConfig( mergedConfig = {} ) {
 			},
 			// Load custom CSS in own stylesheet so that any invalid CSS entered in the input won't break all the global styles in the editor.
 			{
-				css: mergedConfig.styles.css ?? '',
+				css: updatedConfig.styles.css ?? '',
 				isGlobalStyles: true,
 			},
 			{
@@ -1234,11 +1451,11 @@ export function useGlobalStylesOutputWithConfig( mergedConfig = {} ) {
 		// If there are, get the block selector and push the selector together with
 		// the CSS value to the 'stylesheets' array.
 		getBlockTypes().forEach( ( blockType ) => {
-			if ( mergedConfig.styles.blocks[ blockType.name ]?.css ) {
+			if ( updatedConfig.styles.blocks[ blockType.name ]?.css ) {
 				const selector = blockSelectors[ blockType.name ].selector;
 				styles.push( {
 					css: processCSSNesting(
-						mergedConfig.styles.blocks[ blockType.name ]?.css,
+						updatedConfig.styles.blocks[ blockType.name ]?.css,
 						selector
 					),
 					isGlobalStyles: true,
@@ -1246,21 +1463,25 @@ export function useGlobalStylesOutputWithConfig( mergedConfig = {} ) {
 			}
 		} );
 
-		return [ styles, mergedConfig.settings ];
+		return [ styles, updatedConfig.settings ];
 	}, [
 		hasBlockGapSupport,
 		hasFallbackGapSupport,
 		mergedConfig,
 		disableLayoutStyles,
+		disableRootPadding,
+		getBlockStyles,
 	] );
 }
 
 /**
  * Returns the global styles output based on the current state of global styles config loaded in the editor context.
  *
+ * @param {boolean} disableRootPadding Disable root padding styles.
+ *
  * @return {Array} Array of stylesheets and settings.
  */
-export function useGlobalStylesOutput() {
+export function useGlobalStylesOutput( disableRootPadding = false ) {
 	const { merged: mergedConfig } = useContext( GlobalStylesContext );
-	return useGlobalStylesOutputWithConfig( mergedConfig );
+	return useGlobalStylesOutputWithConfig( mergedConfig, disableRootPadding );
 }
diff --git a/packages/block-editor/src/components/global-styles/utils.js b/packages/block-editor/src/components/global-styles/utils.js
index f4adb7a7903122..f5dc157d1df8eb 100644
--- a/packages/block-editor/src/components/global-styles/utils.js
+++ b/packages/block-editor/src/components/global-styles/utils.js
@@ -3,35 +3,21 @@
  */
 import fastDeepEqual from 'fast-deep-equal/es6';
 
+/**
+ * WordPress dependencies
+ */
+import { useViewportMatch } from '@wordpress/compose';
+import { getCSSValueFromRawStyle } from '@wordpress/style-engine';
+
 /**
  * Internal dependencies
  */
-import {
-	getTypographyFontSizeValue,
-	getFluidTypographyOptionsFromSettings,
-} from './typography-utils';
+import { getTypographyFontSizeValue } from './typography-utils';
 import { getValueFromObjectPath } from '../../utils/object';
 
 /* Supporting data. */
-export const ROOT_BLOCK_NAME = 'root';
 export const ROOT_BLOCK_SELECTOR = 'body';
-export const ROOT_BLOCK_SUPPORTS = [
-	'background',
-	'backgroundColor',
-	'color',
-	'linkColor',
-	'captionColor',
-	'buttonColor',
-	'headingColor',
-	'fontFamily',
-	'fontSize',
-	'fontStyle',
-	'fontWeight',
-	'lineHeight',
-	'textDecoration',
-	'textTransform',
-	'padding',
-];
+export const ROOT_CSS_PROPERTIES_SELECTOR = ':root';
 
 export const PRESET_METADATA = [
 	{
@@ -77,10 +63,7 @@ export const PRESET_METADATA = [
 	{
 		path: [ 'typography', 'fontSizes' ],
 		valueFunc: ( preset, settings ) =>
-			getTypographyFontSizeValue(
-				preset,
-				getFluidTypographyOptionsFromSettings( settings )
-			),
+			getTypographyFontSizeValue( preset, settings ),
 		valueKey: 'size',
 		cssVarInfix: 'font-size',
 		classes: [ { classSuffix: 'font-size', propertyName: 'font-size' } ],
@@ -159,6 +142,19 @@ export const STYLE_PATH_TO_PRESET_BLOCK_ATTRIBUTE = {
 	'typography.fontFamily': 'fontFamily',
 };
 
+export function useToolsPanelDropdownMenuProps() {
+	const isMobile = useViewportMatch( 'medium', '<' );
+	return ! isMobile
+		? {
+				popoverProps: {
+					placement: 'left-start',
+					// For non-mobile, inner sidebar width (248px) - button width (24px) - border (1px) + padding (16px) + spacing (20px)
+					offset: 259,
+				},
+		  }
+		: {};
+}
+
 function findInPresetsBy(
 	features,
 	blockName,
@@ -310,9 +306,8 @@ function getValueFromCustomVariable( features, blockName, variable, path ) {
  */
 export function getValueFromVariable( features, blockName, variable ) {
 	if ( ! variable || typeof variable !== 'string' ) {
-		if ( variable?.ref && typeof variable?.ref === 'string' ) {
-			const refPath = variable.ref.split( '.' );
-			variable = getValueFromObjectPath( features, refPath );
+		if ( typeof variable?.ref === 'string' ) {
+			variable = getValueFromObjectPath( features, variable.ref );
 			// Presence of another ref indicates a reference to another dynamic value.
 			// Pointing to another dynamic value is not supported.
 			if ( ! variable || !! variable?.ref ) {
@@ -380,6 +375,10 @@ export function getValueFromVariable( features, blockName, variable ) {
  * @return {string} Scoped selector.
  */
 export function scopeSelector( scope, selector ) {
+	if ( ! scope || ! selector ) {
+		return selector;
+	}
+
 	const scopes = scope.split( ',' );
 	const selectors = selector.split( ',' );
 
@@ -393,6 +392,57 @@ export function scopeSelector( scope, selector ) {
 	return selectorsScoped.join( ', ' );
 }
 
+/**
+ * Scopes a collection of selectors for features and subfeatures.
+ *
+ * @example
+ * ```js
+ * const scope = '.custom-scope';
+ * const selectors = {
+ *     color: '.wp-my-block p',
+ *     typography: { fontSize: '.wp-my-block caption' },
+ * };
+ * const result = scopeFeatureSelector( scope, selectors );
+ * // result is {
+ * //     color: '.custom-scope .wp-my-block p',
+ * //     typography: { fonSize: '.custom-scope .wp-my-block caption' },
+ * // }
+ * ```
+ *
+ * @param {string} scope     Selector to scope collection of selectors with.
+ * @param {Object} selectors Collection of feature selectors e.g.
+ *
+ * @return {Object|undefined} Scoped collection of feature selectors.
+ */
+export function scopeFeatureSelectors( scope, selectors ) {
+	if ( ! scope || ! selectors ) {
+		return;
+	}
+
+	const featureSelectors = {};
+
+	Object.entries( selectors ).forEach( ( [ feature, selector ] ) => {
+		if ( typeof selector === 'string' ) {
+			featureSelectors[ feature ] = scopeSelector( scope, selector );
+		}
+
+		if ( typeof selector === 'object' ) {
+			featureSelectors[ feature ] = {};
+
+			Object.entries( selector ).forEach(
+				( [ subfeature, subfeatureSelector ] ) => {
+					featureSelectors[ feature ][ subfeature ] = scopeSelector(
+						scope,
+						subfeatureSelector
+					);
+				}
+			);
+		}
+	} );
+
+	return featureSelectors;
+}
+
 /**
  * Appends a sub-selector to an existing one.
  *
@@ -439,3 +489,127 @@ export function areGlobalStyleConfigsEqual( original, variation ) {
 		fastDeepEqual( original?.settings, variation?.settings )
 	);
 }
+
+/**
+ * Generates the selector for a block style variation by creating the
+ * appropriate CSS class and adding it to the ancestor portion of the block's
+ * selector.
+ *
+ * For example, take the Button block which has a compound selector:
+ * `.wp-block-button .wp-block-button__link`. With a variation named 'custom',
+ * the class `.is-style-custom` should be added to the `.wp-block-button`
+ * ancestor only.
+ *
+ * This function will take into account comma separated and complex selectors.
+ *
+ * @param {string} variation     Name for the variation.
+ * @param {string} blockSelector CSS selector for the block.
+ *
+ * @return {string} CSS selector for the block style variation.
+ */
+export function getBlockStyleVariationSelector( variation, blockSelector ) {
+	const variationClass = `.is-style-${ variation }`;
+
+	if ( ! blockSelector ) {
+		return variationClass;
+	}
+
+	const ancestorRegex = /((?::\([^)]+\))?\s*)([^\s:]+)/;
+	const addVariationClass = ( _match, group1, group2 ) => {
+		return group1 + group2 + variationClass;
+	};
+
+	const result = blockSelector
+		.split( ',' )
+		.map( ( part ) => part.replace( ancestorRegex, addVariationClass ) );
+
+	return result.join( ',' );
+}
+
+/**
+ * Looks up a theme file URI based on a relative path.
+ *
+ * @param {string}        file          A relative path.
+ * @param {Array<Object>} themeFileURIs A collection of absolute theme file URIs and their corresponding file paths.
+ * @return {string} A resolved theme file URI, if one is found in the themeFileURIs collection.
+ */
+export function getResolvedThemeFilePath( file, themeFileURIs ) {
+	if ( ! file || ! themeFileURIs || ! Array.isArray( themeFileURIs ) ) {
+		return file;
+	}
+
+	const uri = themeFileURIs.find(
+		( themeFileUri ) => themeFileUri?.name === file
+	);
+
+	if ( ! uri?.href ) {
+		return file;
+	}
+
+	return uri?.href;
+}
+
+/**
+ * Resolves ref values in theme JSON.
+ *
+ * @param {Object|string} ruleValue A block style value that may contain a reference to a theme.json value.
+ * @param {Object}        tree      A theme.json object.
+ * @return {*} The resolved value or incoming ruleValue.
+ */
+export function getResolvedRefValue( ruleValue, tree ) {
+	if ( ! ruleValue || ! tree ) {
+		return ruleValue;
+	}
+
+	/*
+	 * Where the rule value is an object with a 'ref' property pointing
+	 * to a path, this converts that path into the value at that path.
+	 * For example: { "ref": "style.color.background" } => "#fff".
+	 */
+	if ( typeof ruleValue !== 'string' && ruleValue?.ref ) {
+		const resolvedRuleValue = getCSSValueFromRawStyle(
+			getValueFromObjectPath( tree, ruleValue.ref )
+		);
+
+		/*
+		 * Presence of another ref indicates a reference to another dynamic value.
+		 * Pointing to another dynamic value is not supported.
+		 */
+		if ( resolvedRuleValue?.ref ) {
+			return undefined;
+		}
+
+		if ( resolvedRuleValue === undefined ) {
+			return ruleValue;
+		}
+
+		return resolvedRuleValue;
+	}
+	return ruleValue;
+}
+
+/**
+ * Resolves ref and relative path values in theme JSON.
+ *
+ * @param {Object|string} ruleValue A block style value that may contain a reference to a theme.json value.
+ * @param {Object}        tree      A theme.json object.
+ * @return {*} The resolved value or incoming ruleValue.
+ */
+export function getResolvedValue( ruleValue, tree ) {
+	if ( ! ruleValue || ! tree ) {
+		return ruleValue;
+	}
+
+	// Resolve ref values.
+	const resolvedValue = getResolvedRefValue( ruleValue, tree );
+
+	// Resolve relative paths.
+	if ( resolvedValue?.url ) {
+		resolvedValue.url = getResolvedThemeFilePath(
+			resolvedValue.url,
+			tree?._links?.[ 'wp:theme-file' ]
+		);
+	}
+
+	return resolvedValue;
+}
diff --git a/packages/block-editor/src/components/grid/grid-item-movers.js b/packages/block-editor/src/components/grid/grid-item-movers.js
new file mode 100644
index 00000000000000..a7f21181eb9a5f
--- /dev/null
+++ b/packages/block-editor/src/components/grid/grid-item-movers.js
@@ -0,0 +1,184 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __, isRTL } from '@wordpress/i18n';
+import {
+	VisuallyHidden,
+	ToolbarButton,
+	ToolbarGroup,
+} from '@wordpress/components';
+import {
+	chevronLeft,
+	chevronUp,
+	chevronDown,
+	chevronRight,
+} from '@wordpress/icons';
+import { useDispatch } from '@wordpress/data';
+import { useInstanceId } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import BlockControls from '../block-controls';
+import { useGetNumberOfBlocksBeforeCell } from './use-get-number-of-blocks-before-cell';
+import { store as blockEditorStore } from '../../store';
+
+export function GridItemMovers( {
+	layout,
+	parentLayout,
+	onChange,
+	gridClientId,
+	blockClientId,
+} ) {
+	const { moveBlocksToPosition, __unstableMarkNextChangeAsNotPersistent } =
+		useDispatch( blockEditorStore );
+
+	const columnStart = layout?.columnStart ?? 1;
+	const rowStart = layout?.rowStart ?? 1;
+	const columnSpan = layout?.columnSpan ?? 1;
+	const rowSpan = layout?.rowSpan ?? 1;
+	const columnEnd = columnStart + columnSpan - 1;
+	const rowEnd = rowStart + rowSpan - 1;
+	const columnCount = parentLayout?.columnCount;
+	const rowCount = parentLayout?.rowCount;
+
+	const getNumberOfBlocksBeforeCell = useGetNumberOfBlocksBeforeCell(
+		gridClientId,
+		columnCount
+	);
+
+	return (
+		<BlockControls group="parent">
+			<ToolbarGroup className="block-editor-grid-item-mover__move-button-container">
+				<div className="block-editor-grid-item-mover__move-horizontal-button-container is-left">
+					<GridItemMover
+						icon={ isRTL() ? chevronRight : chevronLeft }
+						label={ __( 'Move left' ) }
+						description={ __( 'Move left' ) }
+						isDisabled={ columnStart <= 1 }
+						onClick={ () => {
+							onChange( {
+								columnStart: columnStart - 1,
+							} );
+							__unstableMarkNextChangeAsNotPersistent();
+							moveBlocksToPosition(
+								[ blockClientId ],
+								gridClientId,
+								gridClientId,
+								getNumberOfBlocksBeforeCell(
+									columnStart - 1,
+									rowStart
+								)
+							);
+						} }
+					/>
+				</div>
+				<div className="block-editor-grid-item-mover__move-vertical-button-container">
+					<GridItemMover
+						className="is-up-button"
+						icon={ chevronUp }
+						label={ __( 'Move up' ) }
+						description={ __( 'Move up' ) }
+						isDisabled={ rowStart <= 1 }
+						onClick={ () => {
+							onChange( {
+								rowStart: rowStart - 1,
+							} );
+							__unstableMarkNextChangeAsNotPersistent();
+							moveBlocksToPosition(
+								[ blockClientId ],
+								gridClientId,
+								gridClientId,
+								getNumberOfBlocksBeforeCell(
+									columnStart,
+									rowStart - 1
+								)
+							);
+						} }
+					/>
+					<GridItemMover
+						className="is-down-button"
+						icon={ chevronDown }
+						label={ __( 'Move down' ) }
+						description={ __( 'Move down' ) }
+						isDisabled={ rowCount && rowEnd >= rowCount }
+						onClick={ () => {
+							onChange( {
+								rowStart: rowStart + 1,
+							} );
+							__unstableMarkNextChangeAsNotPersistent();
+							moveBlocksToPosition(
+								[ blockClientId ],
+								gridClientId,
+								gridClientId,
+								getNumberOfBlocksBeforeCell(
+									columnStart,
+									rowStart + 1
+								)
+							);
+						} }
+					/>
+				</div>
+				<div className="block-editor-grid-item-mover__move-horizontal-button-container is-right">
+					<GridItemMover
+						icon={ isRTL() ? chevronLeft : chevronRight }
+						label={ __( 'Move right' ) }
+						description={ __( 'Move right' ) }
+						isDisabled={ columnCount && columnEnd >= columnCount }
+						onClick={ () => {
+							onChange( {
+								columnStart: columnStart + 1,
+							} );
+							__unstableMarkNextChangeAsNotPersistent();
+							moveBlocksToPosition(
+								[ blockClientId ],
+								gridClientId,
+								gridClientId,
+								getNumberOfBlocksBeforeCell(
+									columnStart + 1,
+									rowStart
+								)
+							);
+						} }
+					/>
+				</div>
+			</ToolbarGroup>
+		</BlockControls>
+	);
+}
+
+function GridItemMover( {
+	className,
+	icon,
+	label,
+	isDisabled,
+	onClick,
+	description,
+} ) {
+	const instanceId = useInstanceId( GridItemMover );
+	const descriptionId = `block-editor-grid-item-mover-button__description-${ instanceId }`;
+	return (
+		<>
+			<ToolbarButton
+				className={ clsx(
+					'block-editor-grid-item-mover-button',
+					className
+				) }
+				icon={ icon }
+				label={ label }
+				aria-describedby={ descriptionId }
+				onClick={ isDisabled ? null : onClick }
+				disabled={ isDisabled }
+				accessibleWhenDisabled
+			/>
+			<VisuallyHidden id={ descriptionId }>
+				{ description }
+			</VisuallyHidden>
+		</>
+	);
+}
diff --git a/packages/block-editor/src/components/grid/grid-item-resizer.js b/packages/block-editor/src/components/grid/grid-item-resizer.js
new file mode 100644
index 00000000000000..1277ac2a239531
--- /dev/null
+++ b/packages/block-editor/src/components/grid/grid-item-resizer.js
@@ -0,0 +1,186 @@
+/**
+ * WordPress dependencies
+ */
+import { ResizableBox } from '@wordpress/components';
+import { useState, useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { useBlockElement } from '../block-list/use-block-props/use-block-refs';
+import BlockPopoverCover from '../block-popover/cover';
+import { getComputedCSS, getGridTracks, getClosestTrack } from './utils';
+
+export function GridItemResizer( {
+	clientId,
+	bounds,
+	onChange,
+	parentLayout,
+} ) {
+	const blockElement = useBlockElement( clientId );
+	const rootBlockElement = blockElement?.parentElement;
+	const { isManualPlacement } = parentLayout;
+
+	if ( ! blockElement || ! rootBlockElement ) {
+		return null;
+	}
+
+	return (
+		<GridItemResizerInner
+			clientId={ clientId }
+			bounds={ bounds }
+			blockElement={ blockElement }
+			rootBlockElement={ rootBlockElement }
+			onChange={ onChange }
+			isManualGrid={
+				isManualPlacement &&
+				window.__experimentalEnableGridInteractivity
+			}
+		/>
+	);
+}
+
+function GridItemResizerInner( {
+	clientId,
+	bounds,
+	blockElement,
+	rootBlockElement,
+	onChange,
+	isManualGrid,
+} ) {
+	const [ resizeDirection, setResizeDirection ] = useState( null );
+	const [ enableSide, setEnableSide ] = useState( {
+		top: false,
+		bottom: false,
+		left: false,
+		right: false,
+	} );
+
+	useEffect( () => {
+		const observer = new window.ResizeObserver( () => {
+			const blockClientRect = blockElement.getBoundingClientRect();
+			const rootBlockClientRect =
+				rootBlockElement.getBoundingClientRect();
+			setEnableSide( {
+				top: blockClientRect.top > rootBlockClientRect.top,
+				bottom: blockClientRect.bottom < rootBlockClientRect.bottom,
+				left: blockClientRect.left > rootBlockClientRect.left,
+				right: blockClientRect.right < rootBlockClientRect.right,
+			} );
+		} );
+		observer.observe( blockElement );
+		return () => observer.disconnect();
+	}, [ blockElement, rootBlockElement ] );
+
+	const justification = {
+		right: 'left',
+		left: 'right',
+	};
+
+	const alignment = {
+		top: 'flex-end',
+		bottom: 'flex-start',
+	};
+
+	const styles = {
+		display: 'flex',
+		justifyContent: 'center',
+		alignItems: 'center',
+		...( justification[ resizeDirection ] && {
+			justifyContent: justification[ resizeDirection ],
+		} ),
+		...( alignment[ resizeDirection ] && {
+			alignItems: alignment[ resizeDirection ],
+		} ),
+	};
+
+	return (
+		<BlockPopoverCover
+			className="block-editor-grid-item-resizer"
+			clientId={ clientId }
+			__unstablePopoverSlot="__unstable-block-tools-after"
+			additionalStyles={ styles }
+		>
+			<ResizableBox
+				className="block-editor-grid-item-resizer__box"
+				size={ {
+					width: '100%',
+					height: '100%',
+				} }
+				enable={ {
+					bottom: enableSide.bottom,
+					bottomLeft: false,
+					bottomRight: false,
+					left: enableSide.left,
+					right: enableSide.right,
+					top: enableSide.top,
+					topLeft: false,
+					topRight: false,
+				} }
+				bounds={ bounds }
+				boundsByDirection
+				onPointerDown={ ( { target, pointerId } ) => {
+					/*
+					 * Captures the pointer to avoid hiccups while dragging over objects
+					 * like iframes and ensures that the event to end the drag is
+					 * captured by the target (resize handle) whether or not it’s under
+					 * the pointer.
+					 */
+					target.setPointerCapture( pointerId );
+				} }
+				onResizeStart={ ( event, direction ) => {
+					/*
+					 * The container justification and alignment need to be set
+					 * according to the direction the resizer is being dragged in,
+					 * so that it resizes in the right direction.
+					 */
+					setResizeDirection( direction );
+				} }
+				onResizeStop={ ( event, direction, boxElement ) => {
+					const columnGap = parseFloat(
+						getComputedCSS( rootBlockElement, 'column-gap' )
+					);
+					const rowGap = parseFloat(
+						getComputedCSS( rootBlockElement, 'row-gap' )
+					);
+					const gridColumnTracks = getGridTracks(
+						getComputedCSS(
+							rootBlockElement,
+							'grid-template-columns'
+						),
+						columnGap
+					);
+					const gridRowTracks = getGridTracks(
+						getComputedCSS(
+							rootBlockElement,
+							'grid-template-rows'
+						),
+						rowGap
+					);
+					const rect = new window.DOMRect(
+						blockElement.offsetLeft + boxElement.offsetLeft,
+						blockElement.offsetTop + boxElement.offsetTop,
+						boxElement.offsetWidth,
+						boxElement.offsetHeight
+					);
+					const columnStart =
+						getClosestTrack( gridColumnTracks, rect.left ) + 1;
+					const rowStart =
+						getClosestTrack( gridRowTracks, rect.top ) + 1;
+					const columnEnd =
+						getClosestTrack( gridColumnTracks, rect.right, 'end' ) +
+						1;
+					const rowEnd =
+						getClosestTrack( gridRowTracks, rect.bottom, 'end' ) +
+						1;
+					onChange( {
+						columnSpan: columnEnd - columnStart + 1,
+						rowSpan: rowEnd - rowStart + 1,
+						columnStart: isManualGrid ? columnStart : undefined,
+						rowStart: isManualGrid ? rowStart : undefined,
+					} );
+				} }
+			/>
+		</BlockPopoverCover>
+	);
+}
diff --git a/packages/block-editor/src/components/grid/grid-visualizer.js b/packages/block-editor/src/components/grid/grid-visualizer.js
new file mode 100644
index 00000000000000..81da0457ffc5ca
--- /dev/null
+++ b/packages/block-editor/src/components/grid/grid-visualizer.js
@@ -0,0 +1,399 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useState, useEffect, forwardRef, useMemo } from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { __experimentalUseDropZone as useDropZone } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import { useBlockElement } from '../block-list/use-block-props/use-block-refs';
+import BlockPopoverCover from '../block-popover/cover';
+import { range, GridRect, getGridInfo } from './utils';
+import { store as blockEditorStore } from '../../store';
+import { useGetNumberOfBlocksBeforeCell } from './use-get-number-of-blocks-before-cell';
+import ButtonBlockAppender from '../button-block-appender';
+import { unlock } from '../../lock-unlock';
+
+export function GridVisualizer( { clientId, contentRef, parentLayout } ) {
+	const isDistractionFree = useSelect(
+		( select ) =>
+			select( blockEditorStore ).getSettings().isDistractionFree,
+		[]
+	);
+	const gridElement = useBlockElement( clientId );
+
+	if ( isDistractionFree || ! gridElement ) {
+		return null;
+	}
+
+	const isManualGrid =
+		parentLayout?.isManualPlacement &&
+		window.__experimentalEnableGridInteractivity;
+	return (
+		<GridVisualizerGrid
+			gridClientId={ clientId }
+			gridElement={ gridElement }
+			isManualGrid={ isManualGrid }
+			ref={ contentRef }
+		/>
+	);
+}
+
+const GridVisualizerGrid = forwardRef(
+	( { gridClientId, gridElement, isManualGrid }, ref ) => {
+		const [ gridInfo, setGridInfo ] = useState( () =>
+			getGridInfo( gridElement )
+		);
+		const [ isDroppingAllowed, setIsDroppingAllowed ] = useState( false );
+
+		useEffect( () => {
+			const observers = [];
+			for ( const element of [ gridElement, ...gridElement.children ] ) {
+				const observer = new window.ResizeObserver( () => {
+					setGridInfo( getGridInfo( gridElement ) );
+				} );
+				observer.observe( element );
+				observers.push( observer );
+			}
+			return () => {
+				for ( const observer of observers ) {
+					observer.disconnect();
+				}
+			};
+		}, [ gridElement ] );
+
+		useEffect( () => {
+			function onGlobalDrag() {
+				setIsDroppingAllowed( true );
+			}
+			function onGlobalDragEnd() {
+				setIsDroppingAllowed( false );
+			}
+			document.addEventListener( 'drag', onGlobalDrag );
+			document.addEventListener( 'dragend', onGlobalDragEnd );
+			return () => {
+				document.removeEventListener( 'drag', onGlobalDrag );
+				document.removeEventListener( 'dragend', onGlobalDragEnd );
+			};
+		}, [] );
+
+		return (
+			<BlockPopoverCover
+				className={ clsx( 'block-editor-grid-visualizer', {
+					'is-dropping-allowed': isDroppingAllowed,
+				} ) }
+				clientId={ gridClientId }
+				__unstablePopoverSlot="__unstable-block-tools-after"
+			>
+				<div
+					ref={ ref }
+					className="block-editor-grid-visualizer__grid"
+					style={ gridInfo.style }
+				>
+					{ isManualGrid ? (
+						<ManualGridVisualizer
+							gridClientId={ gridClientId }
+							gridInfo={ gridInfo }
+						/>
+					) : (
+						Array.from( { length: gridInfo.numItems }, ( _, i ) => (
+							<GridVisualizerCell
+								key={ i }
+								color={ gridInfo.currentColor }
+							/>
+						) )
+					) }
+				</div>
+			</BlockPopoverCover>
+		);
+	}
+);
+
+function ManualGridVisualizer( { gridClientId, gridInfo } ) {
+	const [ highlightedRect, setHighlightedRect ] = useState( null );
+
+	const gridItemStyles = useSelect(
+		( select ) => {
+			const { getBlockOrder, getBlockStyles } = unlock(
+				select( blockEditorStore )
+			);
+			const blockOrder = getBlockOrder( gridClientId );
+			return getBlockStyles( blockOrder );
+		},
+		[ gridClientId ]
+	);
+	const occupiedRects = useMemo( () => {
+		const rects = [];
+		for ( const style of Object.values( gridItemStyles ) ) {
+			const {
+				columnStart,
+				rowStart,
+				columnSpan = 1,
+				rowSpan = 1,
+			} = style?.layout ?? {};
+			if ( ! columnStart || ! rowStart ) {
+				continue;
+			}
+			rects.push(
+				new GridRect( {
+					columnStart,
+					rowStart,
+					columnSpan,
+					rowSpan,
+				} )
+			);
+		}
+		return rects;
+	}, [ gridItemStyles ] );
+
+	return range( 1, gridInfo.numRows ).map( ( row ) =>
+		range( 1, gridInfo.numColumns ).map( ( column ) => {
+			const isCellOccupied = occupiedRects.some( ( rect ) =>
+				rect.contains( column, row )
+			);
+			const isHighlighted =
+				highlightedRect?.contains( column, row ) ?? false;
+			return (
+				<GridVisualizerCell
+					key={ `${ row }-${ column }` }
+					color={ gridInfo.currentColor }
+					className={ isHighlighted && 'is-highlighted' }
+				>
+					{ isCellOccupied ? (
+						<GridVisualizerDropZone
+							column={ column }
+							row={ row }
+							gridClientId={ gridClientId }
+							gridInfo={ gridInfo }
+							setHighlightedRect={ setHighlightedRect }
+						/>
+					) : (
+						<GridVisualizerAppender
+							column={ column }
+							row={ row }
+							gridClientId={ gridClientId }
+							gridInfo={ gridInfo }
+							setHighlightedRect={ setHighlightedRect }
+						/>
+					) }
+				</GridVisualizerCell>
+			);
+		} )
+	);
+}
+
+function GridVisualizerCell( { color, children, className } ) {
+	return (
+		<div
+			className={ clsx(
+				'block-editor-grid-visualizer__cell',
+				className
+			) }
+			style={ {
+				boxShadow: `inset 0 0 0 1px color-mix(in srgb, ${ color } 20%, #0000)`,
+				color,
+			} }
+		>
+			{ children }
+		</div>
+	);
+}
+
+function useGridVisualizerDropZone(
+	column,
+	row,
+	gridClientId,
+	gridInfo,
+	setHighlightedRect
+) {
+	const {
+		getBlockAttributes,
+		getBlockRootClientId,
+		canInsertBlockType,
+		getBlockName,
+	} = useSelect( blockEditorStore );
+	const {
+		updateBlockAttributes,
+		moveBlocksToPosition,
+		__unstableMarkNextChangeAsNotPersistent,
+	} = useDispatch( blockEditorStore );
+
+	const getNumberOfBlocksBeforeCell = useGetNumberOfBlocksBeforeCell(
+		gridClientId,
+		gridInfo.numColumns
+	);
+
+	return useDropZoneWithValidation( {
+		validateDrag( srcClientId ) {
+			const blockName = getBlockName( srcClientId );
+			if ( ! canInsertBlockType( blockName, gridClientId ) ) {
+				return false;
+			}
+			const attributes = getBlockAttributes( srcClientId );
+			const rect = new GridRect( {
+				columnStart: column,
+				rowStart: row,
+				columnSpan: attributes.style?.layout?.columnSpan,
+				rowSpan: attributes.style?.layout?.rowSpan,
+			} );
+			const isInBounds = new GridRect( {
+				columnSpan: gridInfo.numColumns,
+				rowSpan: gridInfo.numRows,
+			} ).containsRect( rect );
+			return isInBounds;
+		},
+		onDragEnter( srcClientId ) {
+			const attributes = getBlockAttributes( srcClientId );
+			setHighlightedRect(
+				new GridRect( {
+					columnStart: column,
+					rowStart: row,
+					columnSpan: attributes.style?.layout?.columnSpan,
+					rowSpan: attributes.style?.layout?.rowSpan,
+				} )
+			);
+		},
+		onDragLeave() {
+			// onDragEnter can be called before onDragLeave if the user moves
+			// their mouse quickly, so only clear the highlight if it was set
+			// by this cell.
+			setHighlightedRect( ( prevHighlightedRect ) =>
+				prevHighlightedRect?.columnStart === column &&
+				prevHighlightedRect?.rowStart === row
+					? null
+					: prevHighlightedRect
+			);
+		},
+		onDrop( srcClientId ) {
+			setHighlightedRect( null );
+			const attributes = getBlockAttributes( srcClientId );
+			updateBlockAttributes( srcClientId, {
+				style: {
+					...attributes.style,
+					layout: {
+						...attributes.style?.layout,
+						columnStart: column,
+						rowStart: row,
+					},
+				},
+			} );
+			__unstableMarkNextChangeAsNotPersistent();
+			moveBlocksToPosition(
+				[ srcClientId ],
+				getBlockRootClientId( srcClientId ),
+				gridClientId,
+				getNumberOfBlocksBeforeCell( column, row )
+			);
+		},
+	} );
+}
+
+function GridVisualizerDropZone( {
+	column,
+	row,
+	gridClientId,
+	gridInfo,
+	setHighlightedRect,
+} ) {
+	return (
+		<div
+			className="block-editor-grid-visualizer__drop-zone"
+			ref={ useGridVisualizerDropZone(
+				column,
+				row,
+				gridClientId,
+				gridInfo,
+				setHighlightedRect
+			) }
+		/>
+	);
+}
+
+function GridVisualizerAppender( {
+	column,
+	row,
+	gridClientId,
+	gridInfo,
+	setHighlightedRect,
+} ) {
+	const {
+		updateBlockAttributes,
+		moveBlocksToPosition,
+		__unstableMarkNextChangeAsNotPersistent,
+	} = useDispatch( blockEditorStore );
+
+	const getNumberOfBlocksBeforeCell = useGetNumberOfBlocksBeforeCell(
+		gridClientId,
+		gridInfo.numColumns
+	);
+
+	return (
+		<ButtonBlockAppender
+			rootClientId={ gridClientId }
+			className="block-editor-grid-visualizer__appender"
+			ref={ useGridVisualizerDropZone(
+				column,
+				row,
+				gridClientId,
+				gridInfo,
+				setHighlightedRect
+			) }
+			style={ {
+				color: gridInfo.currentColor,
+			} }
+			onSelect={ ( block ) => {
+				if ( ! block ) {
+					return;
+				}
+				updateBlockAttributes( block.clientId, {
+					style: {
+						layout: {
+							columnStart: column,
+							rowStart: row,
+						},
+					},
+				} );
+				__unstableMarkNextChangeAsNotPersistent();
+				moveBlocksToPosition(
+					[ block.clientId ],
+					gridClientId,
+					gridClientId,
+					getNumberOfBlocksBeforeCell( column, row )
+				);
+			} }
+		/>
+	);
+}
+
+function useDropZoneWithValidation( {
+	validateDrag,
+	onDragEnter,
+	onDragLeave,
+	onDrop,
+} ) {
+	const { getDraggedBlockClientIds } = useSelect( blockEditorStore );
+	return useDropZone( {
+		onDragEnter() {
+			const [ srcClientId ] = getDraggedBlockClientIds();
+			if ( srcClientId && validateDrag( srcClientId ) ) {
+				onDragEnter( srcClientId );
+			}
+		},
+		onDragLeave() {
+			onDragLeave();
+		},
+		onDrop() {
+			const [ srcClientId ] = getDraggedBlockClientIds();
+			if ( srcClientId && validateDrag( srcClientId ) ) {
+				onDrop( srcClientId );
+			}
+		},
+	} );
+}
diff --git a/packages/block-editor/src/components/grid/index.js b/packages/block-editor/src/components/grid/index.js
new file mode 100644
index 00000000000000..a1552610102a06
--- /dev/null
+++ b/packages/block-editor/src/components/grid/index.js
@@ -0,0 +1,4 @@
+export { GridVisualizer } from './grid-visualizer';
+export { GridItemResizer } from './grid-item-resizer';
+export { GridItemMovers } from './grid-item-movers';
+export { useGridLayoutSync } from './use-grid-layout-sync';
diff --git a/packages/block-editor/src/components/grid/style.scss b/packages/block-editor/src/components/grid/style.scss
new file mode 100644
index 00000000000000..3a04eb006e7910
--- /dev/null
+++ b/packages/block-editor/src/components/grid/style.scss
@@ -0,0 +1,262 @@
+.block-editor-grid-visualizer {
+	// Specificity to override the z-index and pointer-events set by .components-popover.
+	&.block-editor-grid-visualizer.block-editor-grid-visualizer {
+		z-index: z-index(".block-editor-grid-visualizer");
+
+		.components-popover__content * {
+			pointer-events: none;
+		}
+
+		&.is-dropping-allowed {
+			.block-editor-grid-visualizer__drop-zone {
+				pointer-events: all;
+			}
+		}
+		.block-editor-inserter * {
+			pointer-events: auto;
+		}
+	}
+}
+
+.block-editor-grid-visualizer__grid {
+	display: grid;
+}
+
+.block-editor-grid-visualizer__cell {
+	display: grid;
+	position: relative;
+
+	.block-editor-inserter {
+		color: inherit;
+		z-index: 32;
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		overflow: hidden;
+
+		.block-editor-grid-visualizer__appender {
+			box-shadow: inset 0 0 0 1px color-mix(in srgb, currentColor  20%, #0000);
+			color: inherit;
+			overflow: hidden;
+			height: 100%;
+			width: 100%;
+			padding: 0 !important;
+			opacity: 0;
+		}
+
+	}
+
+	&.is-highlighted {
+		.block-editor-inserter,
+		.block-editor-grid-visualizer__drop-zone {
+			background: var(--wp-admin-theme-color);
+		}
+	}
+
+	&:hover .block-editor-grid-visualizer__appender,
+	.block-editor-grid-visualizer__appender:focus {
+		opacity: 1;
+		background-color: color-mix(in srgb, currentColor  20%, #0000);
+	}
+}
+
+.block-editor-grid-visualizer__drop-zone {
+	background: rgba($gray-400, 0.1);
+	width: 100%;
+	height: 100%;
+	grid-column: 1;
+	grid-row: 1;
+
+	// Make drop zone 8x8 at minimum so that it's easier to drag into. This will overflow the parent.
+	min-width: $grid-unit-10;
+	min-height: $grid-unit-10;
+}
+
+.block-editor-grid-item-resizer {
+	// Specificity to override the z-index and pointer-events set by .components-popover.
+	&.block-editor-grid-item-resizer.block-editor-grid-item-resizer {
+		z-index: z-index(".block-editor-grid-visualizer");
+
+		.components-popover__content * {
+			pointer-events: none;
+		}
+	}
+}
+
+.block-editor-grid-item-resizer__box {
+	border: $border-width solid var(--wp-admin-theme-color);
+
+	.components-resizable-box__handle {
+		// Specificity to override the pointer-events set by .components-popover.
+		&.components-resizable-box__handle.components-resizable-box__handle {
+			pointer-events: all;
+		}
+	}
+}
+
+.block-editor-grid-item-mover__move-button-container {
+	display: flex;
+	padding: 0;
+	border: none;
+	justify-content: center;
+
+	.block-editor-grid-item-mover-button {
+		width: $block-toolbar-height * 0.5;
+		min-width: 0 !important; // overrides default button width.
+		padding-left: 0;
+		padding-right: 0;
+
+		svg {
+			min-width: $grid-unit-30;
+		}
+
+		// Focus and toggle pseudo elements.
+		&::before {
+			content: "";
+			position: absolute;
+			display: block;
+			border-radius: $radius-small;
+			height: $grid-unit-40;
+
+			// Position the focus rectangle.
+			left: $grid-unit-10;
+			right: $grid-unit-10;
+			z-index: -1;
+
+			// Animate in.
+			animation: components-button__appear-animation 0.1s ease;
+			animation-fill-mode: forwards;
+			@include reduce-motion("animation");
+		}
+
+		// Don't show the focus inherited by the Button component.
+		&:focus,
+		&:focus:enabled,
+		&:focus::before {
+			box-shadow: none;
+			outline: none;
+		}
+
+		&:focus-visible::before {
+			@include block-toolbar-button-style__focus();
+		}
+	}
+}
+
+
+.block-editor-grid-item-mover__move-vertical-button-container {
+	display: flex;
+	position: relative;
+	@include break-small() {
+		flex-direction: column;
+		justify-content: space-around;
+
+		> .block-editor-grid-item-mover-button.block-editor-grid-item-mover-button {
+			height: $block-toolbar-height * 0.5 - $grid-unit-05 !important; // overrides toolbar button height.
+			width: 100%;
+			min-width: 0 !important; // overrides default button width.
+
+			// Focus style.
+			&::before {
+				height: calc(100% - 4px);
+			}
+		}
+
+		.block-editor-grid-item-mover-button.is-up-button svg,
+		.block-editor-grid-item-mover-button.is-down-button svg {
+			flex-shrink: 0;
+			height: $block-toolbar-height * 0.5 - $grid-unit-05;
+		}
+	}
+}
+
+.editor-collapsible-block-toolbar {
+	.block-editor-grid-item-mover__move-vertical-button-container {
+		// Move up a little to prevent the toolbar shift when focus is on the vertical movers.
+		@include break-small() {
+			height: $grid-unit-50;
+			position: relative;
+			top: -5px; // Should be -4px, but that causes scrolling when focus lands on the movers, in a 60px header.
+		}
+	}
+}
+
+.show-icon-labels {
+
+	.block-editor-grid-item-mover__move-horizontal-button-container {
+		position: relative;
+
+		&::before {
+			@include break-small() {
+				content: "";
+				height: 100%;
+				width: $border-width;
+				background: $gray-200;
+				position: absolute;
+				top: 0;
+			}
+
+			@include break-medium() {
+				background: $gray-900;
+			}
+		}
+
+		&.is-left {
+			padding-right: 6px;
+
+			&::before {
+				right: 0;
+			}
+		}
+
+		&.is-right {
+			padding-left: 6px;
+
+			&::before {
+				left: 0;
+			}
+		}
+	}
+
+	.block-editor-grid-item-mover__move-vertical-button-container {
+		&::before {
+			@include break-small() {
+				content: "";
+				height: $border-width;
+				width: 100%;
+				background: $gray-200;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				// With Top toolbar enabled, this separator has a smaller width. Translating the
+				// X axis allows to make the separator always centered regardless of its width.
+				transform: translate(-50%, 0);
+				margin-top: -$border-width * 0.5;
+			}
+
+			@include break-medium {
+				background: $gray-900;
+			}
+		}
+	}
+
+	.block-editor-grid-item-mover-button {
+		white-space: nowrap;
+	}
+
+	.editor-collapsible-block-toolbar {
+		.block-editor-grid-item-mover__move-horizontal-button-container::before {
+			height: $grid-unit-30;
+			background: $gray-300;
+			top: $grid-unit-05;
+		}
+
+		.block-editor-grid-item-mover__move-vertical-button-container::before {
+			background: $gray-300;
+			width: calc(100% - #{$grid-unit-30});
+		}
+	}
+}
+
diff --git a/packages/block-editor/src/components/grid/use-get-number-of-blocks-before-cell.js b/packages/block-editor/src/components/grid/use-get-number-of-blocks-before-cell.js
new file mode 100644
index 00000000000000..11e991c432080d
--- /dev/null
+++ b/packages/block-editor/src/components/grid/use-get-number-of-blocks-before-cell.js
@@ -0,0 +1,30 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+
+export function useGetNumberOfBlocksBeforeCell( gridClientId, numColumns ) {
+	const { getBlockOrder, getBlockAttributes } = useSelect( blockEditorStore );
+
+	const getNumberOfBlocksBeforeCell = ( column, row ) => {
+		const targetIndex = ( row - 1 ) * numColumns + column - 1;
+
+		let count = 0;
+		for ( const clientId of getBlockOrder( gridClientId ) ) {
+			const { columnStart, rowStart } =
+				getBlockAttributes( clientId ).style?.layout ?? {};
+			const cellIndex = ( rowStart - 1 ) * numColumns + columnStart - 1;
+			if ( cellIndex < targetIndex ) {
+				count++;
+			}
+		}
+		return count;
+	};
+
+	return getNumberOfBlocksBeforeCell;
+}
diff --git a/packages/block-editor/src/components/grid/use-grid-layout-sync.js b/packages/block-editor/src/components/grid/use-grid-layout-sync.js
new file mode 100644
index 00000000000000..3e31530d4e526f
--- /dev/null
+++ b/packages/block-editor/src/components/grid/use-grid-layout-sync.js
@@ -0,0 +1,263 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useEffect, useMemo } from '@wordpress/element';
+import { usePrevious } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import { GridRect } from './utils';
+import { setImmutably } from '../../utils/object';
+
+export function useGridLayoutSync( { clientId: gridClientId } ) {
+	const { gridLayout, blockOrder, selectedBlockLayout } = useSelect(
+		( select ) => {
+			const { getBlockAttributes, getBlockOrder } =
+				select( blockEditorStore );
+			const selectedBlock = select( blockEditorStore ).getSelectedBlock();
+			return {
+				gridLayout: getBlockAttributes( gridClientId ).layout ?? {},
+				blockOrder: getBlockOrder( gridClientId ),
+				selectedBlockLayout: selectedBlock?.attributes.style?.layout,
+			};
+		},
+		[ gridClientId ]
+	);
+
+	const { getBlockAttributes, getBlockRootClientId } =
+		useSelect( blockEditorStore );
+	const { updateBlockAttributes, __unstableMarkNextChangeAsNotPersistent } =
+		useDispatch( blockEditorStore );
+
+	const selectedBlockRect = useMemo(
+		() =>
+			selectedBlockLayout ? new GridRect( selectedBlockLayout ) : null,
+		[ selectedBlockLayout ]
+	);
+
+	const previouslySelectedBlockRect = usePrevious( selectedBlockRect );
+	const previousIsManualPlacement = usePrevious(
+		gridLayout.isManualPlacement
+	);
+	const previousBlockOrder = usePrevious( blockOrder );
+
+	useEffect( () => {
+		const updates = {};
+
+		if ( gridLayout.isManualPlacement ) {
+			const occupiedRects = [];
+
+			// Respect the position of blocks that already have a columnStart and rowStart value.
+			for ( const clientId of blockOrder ) {
+				const {
+					columnStart,
+					rowStart,
+					columnSpan = 1,
+					rowSpan = 1,
+				} = getBlockAttributes( clientId ).style?.layout ?? {};
+				if ( ! columnStart || ! rowStart ) {
+					continue;
+				}
+				occupiedRects.push(
+					new GridRect( {
+						columnStart,
+						rowStart,
+						columnSpan,
+						rowSpan,
+					} )
+				);
+			}
+
+			// When in manual mode, ensure that every block has a columnStart and rowStart value.
+			for ( const clientId of blockOrder ) {
+				const attributes = getBlockAttributes( clientId );
+				const {
+					columnStart,
+					rowStart,
+					columnSpan = 1,
+					rowSpan = 1,
+				} = attributes.style?.layout ?? {};
+				if ( columnStart && rowStart ) {
+					continue;
+				}
+				const [ newColumnStart, newRowStart ] = placeBlock(
+					occupiedRects,
+					gridLayout.columnCount,
+					columnSpan,
+					rowSpan,
+					previouslySelectedBlockRect?.columnEnd,
+					previouslySelectedBlockRect?.rowEnd
+				);
+				occupiedRects.push(
+					new GridRect( {
+						columnStart: newColumnStart,
+						rowStart: newRowStart,
+						columnSpan,
+						rowSpan,
+					} )
+				);
+				updates[ clientId ] = {
+					style: {
+						...attributes.style,
+						layout: {
+							...attributes.style?.layout,
+							columnStart: newColumnStart,
+							rowStart: newRowStart,
+						},
+					},
+				};
+			}
+
+			// Ensure there's enough rows to fit all blocks.
+			const bottomMostRow = Math.max(
+				...occupiedRects.map( ( r ) => r.rowEnd )
+			);
+			if (
+				! gridLayout.rowCount ||
+				gridLayout.rowCount < bottomMostRow
+			) {
+				updates[ gridClientId ] = {
+					layout: {
+						...gridLayout,
+						rowCount: bottomMostRow,
+					},
+				};
+			}
+
+			// Unset grid layout attributes for blocks removed from the grid.
+			for ( const clientId of previousBlockOrder ?? [] ) {
+				if ( ! blockOrder.includes( clientId ) ) {
+					const rootClientId = getBlockRootClientId( clientId );
+
+					// Block was removed from the editor, so nothing to do.
+					if ( rootClientId === null ) {
+						continue;
+					}
+
+					// Check if the block is being moved to another grid.
+					// If so, do nothing and let the new grid parent handle
+					// the attributes.
+					const rootAttributes = getBlockAttributes( rootClientId );
+					if ( rootAttributes?.layout?.type === 'grid' ) {
+						continue;
+					}
+
+					const attributes = getBlockAttributes( clientId );
+					const {
+						columnStart,
+						rowStart,
+						columnSpan,
+						rowSpan,
+						...layout
+					} = attributes.style?.layout ?? {};
+
+					if ( columnStart || rowStart || columnSpan || rowSpan ) {
+						const hasEmptyLayoutAttribute =
+							Object.keys( layout ).length === 0;
+
+						updates[ clientId ] = setImmutably(
+							attributes,
+							[ 'style', 'layout' ],
+							hasEmptyLayoutAttribute ? undefined : layout
+						);
+					}
+				}
+			}
+		} else {
+			// Remove all of the columnStart and rowStart values
+			// when switching from manual to auto mode,
+			if ( previousIsManualPlacement === true ) {
+				for ( const clientId of blockOrder ) {
+					const attributes = getBlockAttributes( clientId );
+					const { columnStart, rowStart, ...layout } =
+						attributes.style?.layout ?? {};
+					// Only update attributes if columnStart or rowStart are set.
+					if ( columnStart || rowStart ) {
+						const hasEmptyLayoutAttribute =
+							Object.keys( layout ).length === 0;
+
+						updates[ clientId ] = setImmutably(
+							attributes,
+							[ 'style', 'layout' ],
+							hasEmptyLayoutAttribute ? undefined : layout
+						);
+					}
+				}
+			}
+
+			// Remove row styles in auto mode
+			if ( gridLayout.rowCount ) {
+				updates[ gridClientId ] = {
+					layout: {
+						...gridLayout,
+						rowCount: undefined,
+					},
+				};
+			}
+		}
+
+		if ( Object.keys( updates ).length ) {
+			__unstableMarkNextChangeAsNotPersistent();
+			updateBlockAttributes(
+				Object.keys( updates ),
+				updates,
+				/* uniqueByBlock: */ true
+			);
+		}
+	}, [
+		// Actual deps to sync:
+		gridClientId,
+		gridLayout,
+		previousBlockOrder,
+		blockOrder,
+		previouslySelectedBlockRect,
+		previousIsManualPlacement,
+		// These won't change, but the linter thinks they might:
+		__unstableMarkNextChangeAsNotPersistent,
+		getBlockAttributes,
+		getBlockRootClientId,
+		updateBlockAttributes,
+	] );
+}
+
+/**
+ * @param {GridRect[]} occupiedRects
+ * @param {number}     gridColumnCount
+ * @param {number}     blockColumnSpan
+ * @param {number}     blockRowSpan
+ * @param {number?}    startColumn
+ * @param {number?}    startRow
+ */
+function placeBlock(
+	occupiedRects,
+	gridColumnCount,
+	blockColumnSpan,
+	blockRowSpan,
+	startColumn = 1,
+	startRow = 1
+) {
+	for ( let row = startRow; ; row++ ) {
+		for (
+			let column = row === startRow ? startColumn : 1;
+			column <= gridColumnCount;
+			column++
+		) {
+			const candidateRect = new GridRect( {
+				columnStart: column,
+				rowStart: row,
+				columnSpan: blockColumnSpan,
+				rowSpan: blockRowSpan,
+			} );
+			if (
+				! occupiedRects.some( ( r ) =>
+					r.intersectsRect( candidateRect )
+				)
+			) {
+				return [ column, row ];
+			}
+		}
+	}
+}
diff --git a/packages/block-editor/src/components/grid/utils.js b/packages/block-editor/src/components/grid/utils.js
new file mode 100644
index 00000000000000..fc012c645f0916
--- /dev/null
+++ b/packages/block-editor/src/components/grid/utils.js
@@ -0,0 +1,178 @@
+export function range( start, length ) {
+	return Array.from( { length }, ( _, i ) => start + i );
+}
+
+export class GridRect {
+	constructor( {
+		columnStart,
+		rowStart,
+		columnEnd,
+		rowEnd,
+		columnSpan,
+		rowSpan,
+	} = {} ) {
+		this.columnStart = columnStart ?? 1;
+		this.rowStart = rowStart ?? 1;
+		if ( columnSpan !== undefined ) {
+			this.columnEnd = this.columnStart + columnSpan - 1;
+		} else {
+			this.columnEnd = columnEnd ?? this.columnStart;
+		}
+		if ( rowSpan !== undefined ) {
+			this.rowEnd = this.rowStart + rowSpan - 1;
+		} else {
+			this.rowEnd = rowEnd ?? this.rowStart;
+		}
+	}
+
+	get columnSpan() {
+		return this.columnEnd - this.columnStart + 1;
+	}
+
+	get rowSpan() {
+		return this.rowEnd - this.rowStart + 1;
+	}
+
+	contains( column, row ) {
+		return (
+			column >= this.columnStart &&
+			column <= this.columnEnd &&
+			row >= this.rowStart &&
+			row <= this.rowEnd
+		);
+	}
+
+	containsRect( rect ) {
+		return (
+			this.contains( rect.columnStart, rect.rowStart ) &&
+			this.contains( rect.columnEnd, rect.rowEnd )
+		);
+	}
+
+	intersectsRect( rect ) {
+		return (
+			this.columnStart <= rect.columnEnd &&
+			this.columnEnd >= rect.columnStart &&
+			this.rowStart <= rect.rowEnd &&
+			this.rowEnd >= rect.rowStart
+		);
+	}
+}
+
+export function getComputedCSS( element, property ) {
+	return element.ownerDocument.defaultView
+		.getComputedStyle( element )
+		.getPropertyValue( property );
+}
+
+/**
+ * Given a grid-template-columns or grid-template-rows CSS property value, gets the start and end
+ * position in pixels of each grid track.
+ *
+ * https://css-tricks.com/snippets/css/complete-guide-grid/#aa-grid-track
+ *
+ * @param {string} template The grid-template-columns or grid-template-rows CSS property value.
+ *                          Only supports fixed sizes in pixels.
+ * @param {number} gap      The gap between grid tracks in pixels.
+ *
+ * @return {Array<{start: number, end: number}>} An array of objects with the start and end
+ *                                               position in pixels of each grid track.
+ */
+export function getGridTracks( template, gap ) {
+	const tracks = [];
+	for ( const size of template.split( ' ' ) ) {
+		const previousTrack = tracks[ tracks.length - 1 ];
+		const start = previousTrack ? previousTrack.end + gap : 0;
+		const end = start + parseFloat( size );
+		tracks.push( { start, end } );
+	}
+	return tracks;
+}
+
+/**
+ * Given an array of grid tracks and a position in pixels, gets the index of the closest track to
+ * that position.
+ *
+ * https://css-tricks.com/snippets/css/complete-guide-grid/#aa-grid-track
+ *
+ * @param {Array<{start: number, end: number}>} tracks   An array of objects with the start and end
+ *                                                       position in pixels of each grid track.
+ * @param {number}                              position The position in pixels.
+ * @param {string}                              edge     The edge of the track to compare the
+ *                                                       position to. Either 'start' or 'end'.
+ *
+ * @return {number} The index of the closest track to the position. 0-based, unlike CSS grid which
+ *                  is 1-based.
+ */
+export function getClosestTrack( tracks, position, edge = 'start' ) {
+	return tracks.reduce(
+		( closest, track, index ) =>
+			Math.abs( track[ edge ] - position ) <
+			Math.abs( tracks[ closest ][ edge ] - position )
+				? index
+				: closest,
+		0
+	);
+}
+
+export function getGridRect( gridElement, rect ) {
+	const columnGap = parseFloat( getComputedCSS( gridElement, 'column-gap' ) );
+	const rowGap = parseFloat( getComputedCSS( gridElement, 'row-gap' ) );
+	const gridColumnTracks = getGridTracks(
+		getComputedCSS( gridElement, 'grid-template-columns' ),
+		columnGap
+	);
+	const gridRowTracks = getGridTracks(
+		getComputedCSS( gridElement, 'grid-template-rows' ),
+		rowGap
+	);
+	const columnStart = getClosestTrack( gridColumnTracks, rect.left ) + 1;
+	const rowStart = getClosestTrack( gridRowTracks, rect.top ) + 1;
+	const columnEnd =
+		getClosestTrack( gridColumnTracks, rect.right, 'end' ) + 1;
+	const rowEnd = getClosestTrack( gridRowTracks, rect.bottom, 'end' ) + 1;
+	return new GridRect( {
+		columnStart,
+		columnEnd,
+		rowStart,
+		rowEnd,
+	} );
+}
+
+export function getGridItemRect( gridItemElement ) {
+	return getGridRect(
+		gridItemElement.parentElement,
+		new window.DOMRect(
+			gridItemElement.offsetLeft,
+			gridItemElement.offsetTop,
+			gridItemElement.offsetWidth,
+			gridItemElement.offsetHeight
+		)
+	);
+}
+
+export function getGridInfo( gridElement ) {
+	const gridTemplateColumns = getComputedCSS(
+		gridElement,
+		'grid-template-columns'
+	);
+	const gridTemplateRows = getComputedCSS(
+		gridElement,
+		'grid-template-rows'
+	);
+	const numColumns = gridTemplateColumns.split( ' ' ).length;
+	const numRows = gridTemplateRows.split( ' ' ).length;
+	const numItems = numColumns * numRows;
+	return {
+		numColumns,
+		numRows,
+		numItems,
+		currentColor: getComputedCSS( gridElement, 'color' ),
+		style: {
+			gridTemplateColumns,
+			gridTemplateRows,
+			gap: getComputedCSS( gridElement, 'gap' ),
+			padding: getComputedCSS( gridElement, 'padding' ),
+		},
+	};
+}
diff --git a/packages/block-editor/src/components/height-control/README.md b/packages/block-editor/src/components/height-control/README.md
index 334829ea9cf51f..9be1741e8cdd8e 100644
--- a/packages/block-editor/src/components/height-control/README.md
+++ b/packages/block-editor/src/components/height-control/README.md
@@ -2,12 +2,7 @@
 
 The `HeightControl` component adds a linked unit control and slider component for controlling the height of a block within the block editor. It supports passing a label, and is used for controlling the minimum height dimensions of Group blocks.
 
-_Note:_ It is worth noting that the minimum height option is an opt-in feature. Themes need to declare support for it before it'll be available, and a convenient way to do that is via opting in to the [appearanceTools](/docs/how-to-guides/themes/theme-json/#opt-in-into-ui-controls) UI controls.
-
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
+_Note:_ It is worth noting that the minimum height option is an opt-in feature. Themes need to declare support for it before it'll be available, and a convenient way to do that is via opting in to the [appearanceTools](/docs/how-to-guides/themes/global-settings-and-styles.md#opt-in-into-ui-controls) UI controls.
 
 ## Development guidelines
 
@@ -48,7 +43,7 @@ A callback function that handles the application of the height value.
 -   **Type:** `String`
 -   **Default:** `'Height'`
 
-A label for the height control. This is useful when using the height control for a feature that is controlled in the same way as height, but requires a different label. For example, "Min. height".
+A label for the height control. This is useful when using the height control for a feature that is controlled in the same way as height, but requires a different label. For example, "Minimum height".
 
 ## Related components
 
diff --git a/packages/block-editor/src/components/height-control/index.js b/packages/block-editor/src/components/height-control/index.js
index e1797522497447..5d42e217776d6a 100644
--- a/packages/block-editor/src/components/height-control/index.js
+++ b/packages/block-editor/src/components/height-control/index.js
@@ -156,12 +156,15 @@ export default function HeightControl( {
 						onChange={ onChange }
 						onUnitChange={ handleUnitChange }
 						min={ 0 }
-						size={ '__unstable-large' }
+						size="__unstable-large"
+						label={ label }
+						hideLabelFromVision
 					/>
 				</FlexItem>
 				<FlexItem isBlock>
 					<Spacer marginX={ 2 } marginBottom={ 0 }>
 						<RangeControl
+							__next40pxDefaultSize
 							value={ customRangeValue }
 							min={ 0 }
 							max={
@@ -175,6 +178,8 @@ export default function HeightControl( {
 							withInputField={ false }
 							onChange={ handleSliderChange }
 							__nextHasNoMarginBottom
+							label={ label }
+							hideLabelFromVision
 						/>
 					</Spacer>
 				</FlexItem>
diff --git a/packages/block-editor/src/components/iframe/content.scss b/packages/block-editor/src/components/iframe/content.scss
new file mode 100644
index 00000000000000..596c177eab2f32
--- /dev/null
+++ b/packages/block-editor/src/components/iframe/content.scss
@@ -0,0 +1,58 @@
+.block-editor-iframe__body {
+	position: relative;
+}
+
+.block-editor-iframe__html {
+	transform-origin: top center;
+	// We don't want to animate the transform of the translateX because it is used
+	// to "center" the canvas. Leaving it on causes the canvas to slide around in
+	// odd ways.
+	@include editor-canvas-resize-animation(transform 0s, scale 0s, padding 0s);
+
+	&.zoom-out-animation {
+		// we only want to animate the scaling when entering zoom out. When sidebars
+		// are toggled, the resizing of the iframe handles scaling the canvas as well,
+		// and the doubled animations cause very odd animations.
+		@include editor-canvas-resize-animation(transform 0s);
+	}
+}
+
+.block-editor-iframe__html.is-zoomed-out {
+	$scale: var(--wp-block-editor-iframe-zoom-out-scale);
+	$frame-size: var(--wp-block-editor-iframe-zoom-out-frame-size);
+	$inner-height: var(--wp-block-editor-iframe-zoom-out-inner-height);
+	$content-height: var(--wp-block-editor-iframe-zoom-out-content-height);
+	$scale-container-width: var(--wp-block-editor-iframe-zoom-out-scale-container-width);
+	$container-width: var(--wp-block-editor-iframe-zoom-out-container-width, 100vw);
+	// Apply an X translation to center the scaled content within the available space.
+	transform: translateX(calc((#{$scale-container-width} - #{$container-width}) / 2 / #{$scale}));
+	scale: #{$scale};
+	background-color: $gray-300;
+
+	// Chrome seems to respect that transform scale shouldn't affect the layout size of the element,
+	// so we need to adjust the height of the content to match the scale by using negative margins.
+	$extra-content-height: calc(#{$content-height} * (1 - #{$scale}));
+	$total-frame-height: calc(2 * #{$frame-size} / #{$scale});
+	$total-height: calc(#{$extra-content-height} + #{$total-frame-height} + 2px);
+	margin-bottom: calc(-1 * #{$total-height});
+	// Add the top/bottom frame size. We use scaling to account for the left/right, as
+	// the padding left/right causes the contents to reflow, which breaks the 1:1 scaling
+	// of the content.
+	padding-top: calc(#{$frame-size} / #{$scale});
+	padding-bottom: calc(#{$frame-size} / #{$scale});
+
+	body {
+		min-height: calc((#{$inner-height} - #{$total-frame-height}) / #{$scale});
+
+		> .is-root-container:not(.wp-block-post-content) {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			height: 100%;
+
+			> main {
+				flex: 1;
+			}
+		}
+	}
+}
diff --git a/packages/block-editor/src/components/iframe/get-compatibility-styles.js b/packages/block-editor/src/components/iframe/get-compatibility-styles.js
new file mode 100644
index 00000000000000..0eae82b11e01f8
--- /dev/null
+++ b/packages/block-editor/src/components/iframe/get-compatibility-styles.js
@@ -0,0 +1,125 @@
+let compatibilityStyles = null;
+
+/**
+ * Returns a list of stylesheets that target the editor canvas. A stylesheet is
+ * considered targetting the editor a canvas if it contains the
+ * `editor-styles-wrapper`, `wp-block`, or `wp-block-*` class selectors.
+ *
+ * Ideally, this hook should be removed in the future and styles should be added
+ * explicitly as editor styles.
+ */
+export function getCompatibilityStyles() {
+	if ( compatibilityStyles ) {
+		return compatibilityStyles;
+	}
+
+	// Only memoize the result once on load, since these stylesheets should not
+	// change.
+	compatibilityStyles = Array.from( document.styleSheets ).reduce(
+		( accumulator, styleSheet ) => {
+			try {
+				// May fail for external styles.
+				// eslint-disable-next-line no-unused-expressions
+				styleSheet.cssRules;
+			} catch ( e ) {
+				return accumulator;
+			}
+
+			const { ownerNode, cssRules } = styleSheet;
+
+			// Stylesheet is added by another stylesheet. See
+			// https://developer.mozilla.org/en-US/docs/Web/API/StyleSheet/ownerNode#notes.
+			if ( ownerNode === null ) {
+				return accumulator;
+			}
+
+			if ( ! cssRules ) {
+				return accumulator;
+			}
+
+			// Don't try to add the reset styles, which were removed as a dependency
+			// from `edit-blocks` for the iframe since we don't need to reset admin
+			// styles.
+			if (
+				[
+					'wp-reset-editor-styles-css',
+					'wp-reset-editor-styles-rtl-css',
+				].includes( ownerNode.id )
+			) {
+				return accumulator;
+			}
+
+			// Don't try to add styles without ID. Styles enqueued via the WP dependency system will always have IDs.
+			if ( ! ownerNode.id ) {
+				return accumulator;
+			}
+
+			function matchFromRules( _cssRules ) {
+				return Array.from( _cssRules ).find(
+					( {
+						selectorText,
+						conditionText,
+						cssRules: __cssRules,
+					} ) => {
+						// If the rule is conditional then it will not have selector text.
+						// Recurse into child CSS ruleset to determine selector eligibility.
+						if ( conditionText ) {
+							return matchFromRules( __cssRules );
+						}
+
+						return (
+							selectorText &&
+							( selectorText.includes(
+								'.editor-styles-wrapper'
+							) ||
+								selectorText.includes( '.wp-block' ) )
+						);
+					}
+				);
+			}
+
+			if ( matchFromRules( cssRules ) ) {
+				const isInline = ownerNode.tagName === 'STYLE';
+
+				if ( isInline ) {
+					// If the current target is inline,
+					// it could be a dependency of an existing stylesheet.
+					// Look for that dependency and add it BEFORE the current target.
+					const mainStylesCssId = ownerNode.id.replace(
+						'-inline-css',
+						'-css'
+					);
+					const mainStylesElement =
+						document.getElementById( mainStylesCssId );
+					if ( mainStylesElement ) {
+						accumulator.push( mainStylesElement.cloneNode( true ) );
+					}
+				}
+
+				accumulator.push( ownerNode.cloneNode( true ) );
+
+				if ( ! isInline ) {
+					// If the current target is not inline,
+					// we still look for inline styles that could be relevant for the current target.
+					// If they exist, add them AFTER the current target.
+					const inlineStylesCssId = ownerNode.id.replace(
+						'-css',
+						'-inline-css'
+					);
+					const inlineStylesElement =
+						document.getElementById( inlineStylesCssId );
+					if ( inlineStylesElement ) {
+						accumulator.push(
+							inlineStylesElement.cloneNode( true )
+						);
+					}
+				}
+			}
+
+			return accumulator;
+		},
+		[]
+	);
+
+	return compatibilityStyles;
+}
diff --git a/packages/block-editor/src/components/iframe/index.js b/packages/block-editor/src/components/iframe/index.js
index 1939f75811c8c5..85e1f12a7c0d63 100644
--- a/packages/block-editor/src/components/iframe/index.js
+++ b/packages/block-editor/src/components/iframe/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,6 +12,7 @@ import {
 	forwardRef,
 	useMemo,
 	useEffect,
+	useRef,
 } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import {
@@ -28,7 +29,7 @@ import { useSelect } from '@wordpress/data';
  */
 import { useBlockSelectionClearer } from '../block-selection-clearer';
 import { useWritingFlow } from '../writing-flow';
-import { useCompatibilityStyles } from './use-compatibility-styles';
+import { getCompatibilityStyles } from './get-compatibility-styles';
 import { store as blockEditorStore } from '../../store';
 
 function bubbleEvent( event, Constructor, frame ) {
@@ -106,26 +107,30 @@ function Iframe( {
 	tabIndex = 0,
 	scale = 1,
 	frameSize = 0,
-	expand = false,
 	readonly,
 	forwardedRef: ref,
+	title = __( 'Editor canvas' ),
 	...props
 } ) {
 	const { resolvedAssets, isPreviewMode } = useSelect( ( select ) => {
-		const settings = select( blockEditorStore ).getSettings();
+		const { getSettings } = select( blockEditorStore );
+		const settings = getSettings();
 		return {
 			resolvedAssets: settings.__unstableResolvedAssets,
-			isPreviewMode: settings.__unstableIsPreviewMode,
+			isPreviewMode: settings.isPreviewMode,
 		};
 	}, [] );
 	const { styles = '', scripts = '' } = resolvedAssets;
 	const [ iframeDocument, setIframeDocument ] = useState();
+	const initialContainerWidthRef = useRef( 0 );
 	const [ bodyClasses, setBodyClasses ] = useState( [] );
-	const compatStyles = useCompatibilityStyles();
 	const clearerRef = useBlockSelectionClearer();
 	const [ before, writingFlowRef, after ] = useWritingFlow();
 	const [ contentResizeListener, { height: contentHeight } ] =
 		useResizeObserver();
+	const [ containerResizeListener, { width: containerWidth } ] =
+		useResizeObserver();
+
 	const setRef = useRefEffect( ( node ) => {
 		node._load = () => {
 			setIframeDocument( node.contentDocument );
@@ -140,6 +145,8 @@ function Iframe( {
 			const { documentElement } = contentDocument;
 			iFrameDocument = contentDocument;
 
+			documentElement.classList.add( 'block-editor-iframe__html' );
+
 			clearerRef( documentElement );
 
 			// Ideally ALL classes that are added through get_body_class should
@@ -156,7 +163,7 @@ function Iframe( {
 
 			contentDocument.dir = ownerDocument.dir;
 
-			for ( const compatStyle of compatStyles ) {
+			for ( const compatStyle of getCompatibilityStyles() ) {
 				if ( contentDocument.getElementById( compatStyle.id ) ) {
 					continue;
 				}
@@ -202,6 +209,49 @@ function Iframe( {
 		};
 	}, [] );
 
+	const [ iframeWindowInnerHeight, setIframeWindowInnerHeight ] = useState();
+
+	const iframeResizeRef = useRefEffect( ( node ) => {
+		const nodeWindow = node.ownerDocument.defaultView;
+
+		setIframeWindowInnerHeight( nodeWindow.innerHeight );
+		const onResize = () => {
+			setIframeWindowInnerHeight( nodeWindow.innerHeight );
+		};
+		nodeWindow.addEventListener( 'resize', onResize );
+		return () => {
+			nodeWindow.removeEventListener( 'resize', onResize );
+		};
+	}, [] );
+
+	const [ windowInnerWidth, setWindowInnerWidth ] = useState();
+
+	const windowResizeRef = useRefEffect( ( node ) => {
+		const nodeWindow = node.ownerDocument.defaultView;
+
+		setWindowInnerWidth( nodeWindow.innerWidth );
+		const onResize = () => {
+			setWindowInnerWidth( nodeWindow.innerWidth );
+		};
+		nodeWindow.addEventListener( 'resize', onResize );
+		return () => {
+			nodeWindow.removeEventListener( 'resize', onResize );
+		};
+	}, [] );
+
+	const isZoomedOut = scale !== 1;
+
+	useEffect( () => {
+		if ( ! isZoomedOut ) {
+			initialContainerWidthRef.current = containerWidth;
+		}
+	}, [ containerWidth, isZoomedOut ] );
+
+	const scaleContainerWidth = Math.max(
+		initialContainerWidthRef.current,
+		containerWidth
+	);
+
 	const disabledRef = useDisabled( { isDisabled: ! readonly } );
 	const bodyRef = useMergeRefs( [
 		useBubbleEvents( iframeDocument ),
@@ -209,6 +259,10 @@ function Iframe( {
 		clearerRef,
 		writingFlowRef,
 		disabledRef,
+		// Avoid resize listeners when not needed, these will trigger
+		// unnecessary re-renders when animating the iframe width, or when
+		// expanding preview iframes.
+		isZoomedOut ? iframeResizeRef : null,
 	] );
 
 	// Correct doctype is required to enable rendering in standards
@@ -219,7 +273,19 @@ function Iframe( {
 	<head>
 		<meta charset="utf-8">
 		<script>window.frameElement._load()</script>
-		<style>html{height:auto!important;min-height:100%;}body{margin:0}</style>
+		<style>
+			html{
+				height: auto !important;
+				min-height: 100%;
+			}
+			/* Lowest specificity to not override global styles */
+			:where(body) {
+				margin: 0;
+				/* Default background color in case zoom out mode background
+				colors the html element */
+				background-color: white;
+			}
+		</style>
 		${ styles }
 		${ scripts }
 	</head>
@@ -237,34 +303,132 @@ function Iframe( {
 
 	useEffect( () => cleanup, [ cleanup ] );
 
-	// We need to counter the margin created by scaling the iframe. If the scale
-	// is e.g. 0.45, then the top + bottom margin is 0.55 (1 - scale). Just the
-	// top or bottom margin is 0.55 / 2 ((1 - scale) / 2).
-	const marginFromScaling = ( contentHeight * ( 1 - scale ) ) / 2;
+	const zoomOutAnimationClassnameRef = useRef( null );
 
-	return (
+	// Toggle zoom out CSS Classes only when zoom out mode changes. We could add these into the useEffect
+	// that controls settings the CSS variables, but then we would need to do more work to ensure we're
+	// only toggling these when the zoom out mode changes, as that useEffect is also triggered by a large
+	// number of dependencies.
+	useEffect( () => {
+		if ( ! iframeDocument || ! isZoomedOut ) {
+			return;
+		}
+
+		const handleZoomOutAnimationClassname = () => {
+			clearTimeout( zoomOutAnimationClassnameRef.current );
+
+			iframeDocument.documentElement.classList.add(
+				'zoom-out-animation'
+			);
+
+			zoomOutAnimationClassnameRef.current = setTimeout( () => {
+				iframeDocument.documentElement.classList.remove(
+					'zoom-out-animation'
+				);
+			}, 400 ); // 400ms should match the animation speed used in components/iframe/content.scss
+		};
+
+		handleZoomOutAnimationClassname();
+		iframeDocument.documentElement.classList.add( 'is-zoomed-out' );
+
+		return () => {
+			handleZoomOutAnimationClassname();
+			iframeDocument.documentElement.classList.remove( 'is-zoomed-out' );
+		};
+	}, [ iframeDocument, isZoomedOut ] );
+
+	// Calculate the scaling and CSS variables for the zoom out canvas
+	useEffect( () => {
+		if ( ! iframeDocument || ! isZoomedOut ) {
+			return;
+		}
+
+		const maxWidth = 750;
+		// Note: When we initialize the zoom out when the canvas is smaller (sidebars open),
+		// initialContainerWidthRef will be smaller than the full page, and reflow will happen
+		// when the canvas area becomes larger due to sidebars closing. This is a known but
+		// minor divergence for now.
+
+		// This scaling calculation has to happen within the JS because CSS calc() can
+		// only divide and multiply by a unitless value. I.e. calc( 100px / 2 ) is valid
+		// but calc( 100px / 2px ) is not.
+		iframeDocument.documentElement.style.setProperty(
+			'--wp-block-editor-iframe-zoom-out-scale',
+			scale === 'auto-scaled'
+				? ( Math.min( containerWidth, maxWidth ) -
+						parseInt( frameSize ) * 2 ) /
+						scaleContainerWidth
+				: scale
+		);
+
+		// frameSize has to be a px value for the scaling and frame size to be computed correctly.
+		iframeDocument.documentElement.style.setProperty(
+			'--wp-block-editor-iframe-zoom-out-frame-size',
+			typeof frameSize === 'number' ? `${ frameSize }px` : frameSize
+		);
+		iframeDocument.documentElement.style.setProperty(
+			'--wp-block-editor-iframe-zoom-out-content-height',
+			`${ contentHeight }px`
+		);
+		iframeDocument.documentElement.style.setProperty(
+			'--wp-block-editor-iframe-zoom-out-inner-height',
+			`${ iframeWindowInnerHeight }px`
+		);
+		iframeDocument.documentElement.style.setProperty(
+			'--wp-block-editor-iframe-zoom-out-container-width',
+			`${ containerWidth }px`
+		);
+		iframeDocument.documentElement.style.setProperty(
+			'--wp-block-editor-iframe-zoom-out-scale-container-width',
+			`${ scaleContainerWidth }px`
+		);
+
+		return () => {
+			iframeDocument.documentElement.style.removeProperty(
+				'--wp-block-editor-iframe-zoom-out-scale'
+			);
+			iframeDocument.documentElement.style.removeProperty(
+				'--wp-block-editor-iframe-zoom-out-frame-size'
+			);
+			iframeDocument.documentElement.style.removeProperty(
+				'--wp-block-editor-iframe-zoom-out-content-height'
+			);
+			iframeDocument.documentElement.style.removeProperty(
+				'--wp-block-editor-iframe-zoom-out-inner-height'
+			);
+			iframeDocument.documentElement.style.removeProperty(
+				'--wp-block-editor-iframe-zoom-out-container-width'
+			);
+			iframeDocument.documentElement.style.removeProperty(
+				'--wp-block-editor-iframe-zoom-out-scale-container-width'
+			);
+		};
+	}, [
+		scale,
+		frameSize,
+		iframeDocument,
+		iframeWindowInnerHeight,
+		contentHeight,
+		containerWidth,
+		windowInnerWidth,
+		isZoomedOut,
+		scaleContainerWidth,
+	] );
+
+	// Make sure to not render the before and after focusable div elements in view
+	// mode. They're only needed to capture focus in edit mode.
+	const shouldRenderFocusCaptureElements = tabIndex >= 0 && ! isPreviewMode;
+
+	const iframe = (
 		<>
-			{ tabIndex >= 0 && before }
+			{ shouldRenderFocusCaptureElements && before }
 			{ /* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */ }
 			<iframe
 				{ ...props }
 				style={ {
-					border: 0,
 					...props.style,
-					height: expand ? contentHeight : props.style?.height,
-					marginTop:
-						scale !== 1
-							? -marginFromScaling + frameSize
-							: props.style?.marginTop,
-					marginBottom:
-						scale !== 1
-							? -marginFromScaling + frameSize
-							: props.style?.marginBottom,
-					transform:
-						scale !== 1
-							? `scale( ${ scale } )`
-							: props.style?.transform,
-					transition: 'all .3s',
+					height: props.style?.height,
+					border: 0,
 				} }
 				ref={ useMergeRefs( [ ref, setRef ] ) }
 				tabIndex={ tabIndex }
@@ -272,8 +436,11 @@ function Iframe( {
 				// mode. Also preload the styles to avoid a flash of unstyled
 				// content.
 				src={ src }
-				title={ __( 'Editor canvas' ) }
+				title={ title }
 				onKeyDown={ ( event ) => {
+					if ( props.onKeyDown ) {
+						props.onKeyDown( event );
+					}
 					// If the event originates from inside the iframe, it means
 					// it bubbled through the portal, but only with React
 					// events. We need to to bubble native events as well,
@@ -284,7 +451,15 @@ function Iframe( {
 						event.currentTarget.ownerDocument !==
 						event.target.ownerDocument
 					) {
+						// We should only stop propagation of the React event,
+						// the native event should further bubble inside the
+						// iframe to the document and window.
+						// Alternatively, we could consider redispatching the
+						// native event in the iframe.
+						const { stopPropagation } = event.nativeEvent;
+						event.nativeEvent.stopPropagation = () => {};
 						event.stopPropagation();
+						event.nativeEvent.stopPropagation = stopPropagation;
 						bubbleEvent(
 							event,
 							window.KeyboardEvent,
@@ -300,7 +475,7 @@ function Iframe( {
 						/* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */
 						<body
 							ref={ bodyRef }
-							className={ classnames(
+							className={ clsx(
 								'block-editor-iframe__body',
 								'editor-styles-wrapper',
 								...bodyClasses
@@ -314,9 +489,27 @@ function Iframe( {
 						iframeDocument.documentElement
 					) }
 			</iframe>
-			{ tabIndex >= 0 && after }
+			{ shouldRenderFocusCaptureElements && after }
 		</>
 	);
+
+	return (
+		<div className="block-editor-iframe__container" ref={ windowResizeRef }>
+			{ containerResizeListener }
+			<div
+				className={ clsx(
+					'block-editor-iframe__scale-container',
+					isZoomedOut && 'is-zoomed-out'
+				) }
+				style={ {
+					'--wp-block-editor-iframe-zoom-out-scale-container-width':
+						isZoomedOut && `${ scaleContainerWidth }px`,
+				} }
+			>
+				{ iframe }
+			</div>
+		</div>
+	);
 }
 
 function IframeIfReady( props, ref ) {
diff --git a/packages/block-editor/src/components/iframe/style.scss b/packages/block-editor/src/components/iframe/style.scss
new file mode 100644
index 00000000000000..5dd30c338057e2
--- /dev/null
+++ b/packages/block-editor/src/components/iframe/style.scss
@@ -0,0 +1,18 @@
+.block-editor-iframe__container {
+	width: 100%;
+	height: 100%;
+	overflow-x: hidden;
+}
+
+.block-editor-iframe__scale-container {
+	height: 100%;
+}
+
+.block-editor-iframe__scale-container.is-zoomed-out {
+	$scale-container-width: var(--wp-block-editor-iframe-zoom-out-scale-container-width, 100vw);
+	width: $scale-container-width;
+	// Position the iframe so that it is always aligned with the right side so that
+	// the scrollbar is always visible on the right side
+	position: absolute;
+	right: 0;
+}
diff --git a/packages/block-editor/src/components/iframe/use-compatibility-styles.js b/packages/block-editor/src/components/iframe/use-compatibility-styles.js
deleted file mode 100644
index eb738c7ebefdfe..00000000000000
--- a/packages/block-editor/src/components/iframe/use-compatibility-styles.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useMemo } from '@wordpress/element';
-
-/**
- * Returns a list of stylesheets that target the editor canvas. A stylesheet is
- * considered targetting the editor a canvas if it contains the
- * `editor-styles-wrapper`, `wp-block`, or `wp-block-*` class selectors.
- *
- * Ideally, this hook should be removed in the future and styles should be added
- * explicitly as editor styles.
- */
-export function useCompatibilityStyles() {
-	// Only memoize the result once on load, since these stylesheets should not
-	// change.
-	return useMemo( () => {
-		// Search the document for stylesheets targetting the editor canvas.
-		return Array.from( document.styleSheets ).reduce(
-			( accumulator, styleSheet ) => {
-				try {
-					// May fail for external styles.
-					// eslint-disable-next-line no-unused-expressions
-					styleSheet.cssRules;
-				} catch ( e ) {
-					return accumulator;
-				}
-
-				const { ownerNode, cssRules } = styleSheet;
-
-				// Stylesheet is added by another stylesheet. See
-				// https://developer.mozilla.org/en-US/docs/Web/API/StyleSheet/ownerNode#notes.
-				if ( ownerNode === null ) {
-					return accumulator;
-				}
-
-				if ( ! cssRules ) {
-					return accumulator;
-				}
-
-				// Don't try to add the reset styles, which were removed as a dependency
-				// from `edit-blocks` for the iframe since we don't need to reset admin
-				// styles.
-				if ( ownerNode.id === 'wp-reset-editor-styles-css' ) {
-					return accumulator;
-				}
-
-				// Don't try to add styles without ID. Styles enqueued via the WP dependency system will always have IDs.
-				if ( ! ownerNode.id ) {
-					return accumulator;
-				}
-
-				function matchFromRules( _cssRules ) {
-					return Array.from( _cssRules ).find(
-						( {
-							selectorText,
-							conditionText,
-							cssRules: __cssRules,
-						} ) => {
-							// If the rule is conditional then it will not have selector text.
-							// Recurse into child CSS ruleset to determine selector eligibility.
-							if ( conditionText ) {
-								return matchFromRules( __cssRules );
-							}
-
-							return (
-								selectorText &&
-								( selectorText.includes(
-									'.editor-styles-wrapper'
-								) ||
-									selectorText.includes( '.wp-block' ) )
-							);
-						}
-					);
-				}
-
-				if ( matchFromRules( cssRules ) ) {
-					const isInline = ownerNode.tagName === 'STYLE';
-
-					if ( isInline ) {
-						// If the current target is inline,
-						// it could be a dependency of an existing stylesheet.
-						// Look for that dependency and add it BEFORE the current target.
-						const mainStylesCssId = ownerNode.id.replace(
-							'-inline-css',
-							'-css'
-						);
-						const mainStylesElement =
-							document.getElementById( mainStylesCssId );
-						if ( mainStylesElement ) {
-							accumulator.push(
-								mainStylesElement.cloneNode( true )
-							);
-						}
-					}
-
-					accumulator.push( ownerNode.cloneNode( true ) );
-
-					if ( ! isInline ) {
-						// If the current target is not inline,
-						// we still look for inline styles that could be relevant for the current target.
-						// If they exist, add them AFTER the current target.
-						const inlineStylesCssId = ownerNode.id.replace(
-							'-css',
-							'-inline-css'
-						);
-						const inlineStylesElement =
-							document.getElementById( inlineStylesCssId );
-						if ( inlineStylesElement ) {
-							accumulator.push(
-								inlineStylesElement.cloneNode( true )
-							);
-						}
-					}
-				}
-
-				return accumulator;
-			},
-			[]
-		);
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/image-editor/aspect-ratio-dropdown.js b/packages/block-editor/src/components/image-editor/aspect-ratio-dropdown.js
index a15c9f42b9e8ed..b8432d1669f285 100644
--- a/packages/block-editor/src/components/image-editor/aspect-ratio-dropdown.js
+++ b/packages/block-editor/src/components/image-editor/aspect-ratio-dropdown.js
@@ -8,45 +8,80 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
+import { useSettings } from '../use-settings';
 import { POPOVER_PROPS } from './constants';
 import { useImageEditingContext } from './context';
 
-function AspectGroup( { aspectRatios, isDisabled, label, onClick, value } ) {
+function AspectRatioGroup( {
+	aspectRatios,
+	isDisabled,
+	label,
+	onClick,
+	value,
+} ) {
 	return (
 		<MenuGroup label={ label }>
-			{ aspectRatios.map( ( { title, aspect } ) => (
+			{ aspectRatios.map( ( { name, slug, ratio } ) => (
 				<MenuItem
-					key={ aspect }
+					key={ slug }
 					disabled={ isDisabled }
 					onClick={ () => {
-						onClick( aspect );
+						onClick( ratio );
 					} }
 					role="menuitemradio"
-					isSelected={ aspect === value }
-					icon={ aspect === value ? check : undefined }
+					isSelected={ ratio === value }
+					icon={ ratio === value ? check : undefined }
 				>
-					{ title }
+					{ name }
 				</MenuItem>
 			) ) }
 		</MenuGroup>
 	);
 }
 
+export function ratioToNumber( str ) {
+	// TODO: support two-value aspect ratio?
+	// https://css-tricks.com/almanac/properties/a/aspect-ratio/#aa-it-can-take-two-values
+	const [ a, b, ...rest ] = str.split( '/' ).map( Number );
+	if (
+		a <= 0 ||
+		b <= 0 ||
+		Number.isNaN( a ) ||
+		Number.isNaN( b ) ||
+		rest.length
+	) {
+		return NaN;
+	}
+	return b ? a / b : a;
+}
+
+function presetRatioAsNumber( { ratio, ...rest } ) {
+	return {
+		ratio: ratioToNumber( ratio ),
+		...rest,
+	};
+}
+
 export default function AspectRatioDropdown( { toggleProps } ) {
 	const { isInProgress, aspect, setAspect, defaultAspect } =
 		useImageEditingContext();
 
+	const [ defaultRatios, themeRatios, showDefaultRatios ] = useSettings(
+		'dimensions.aspectRatios.default',
+		'dimensions.aspectRatios.theme',
+		'dimensions.defaultAspectRatios'
+	);
+
 	return (
 		<DropdownMenu
 			icon={ aspectRatioIcon }
 			label={ __( 'Aspect Ratio' ) }
 			popoverProps={ POPOVER_PROPS }
 			toggleProps={ toggleProps }
-			className="wp-block-image__aspect-ratio"
 		>
 			{ ( { onClose } ) => (
 				<>
-					<AspectGroup
+					<AspectRatioGroup
 						isDisabled={ isInProgress }
 						onClick={ ( newAspect ) => {
 							setAspect( newAspect );
@@ -56,61 +91,57 @@ export default function AspectRatioDropdown( { toggleProps } ) {
 						aspectRatios={ [
 							// All ratios should be mirrored in AspectRatioTool in @wordpress/block-editor.
 							{
-								title: __( 'Original' ),
+								slug: 'original',
+								name: __( 'Original' ),
 								aspect: defaultAspect,
 							},
-							{
-								title: __( 'Square' ),
-								aspect: 1,
-							},
-						] }
-					/>
-					<AspectGroup
-						label={ __( 'Landscape' ) }
-						isDisabled={ isInProgress }
-						onClick={ ( newAspect ) => {
-							setAspect( newAspect );
-							onClose();
-						} }
-						value={ aspect }
-						aspectRatios={ [
-							{
-								title: __( '16:9' ),
-								aspect: 16 / 9,
-							},
-							{
-								title: __( '4:3' ),
-								aspect: 4 / 3,
-							},
-							{
-								title: __( '3:2' ),
-								aspect: 3 / 2,
-							},
-						] }
-					/>
-					<AspectGroup
-						label={ __( 'Portrait' ) }
-						isDisabled={ isInProgress }
-						onClick={ ( newAspect ) => {
-							setAspect( newAspect );
-							onClose();
-						} }
-						value={ aspect }
-						aspectRatios={ [
-							{
-								title: __( '9:16' ),
-								aspect: 9 / 16,
-							},
-							{
-								title: __( '3:4' ),
-								aspect: 3 / 4,
-							},
-							{
-								title: __( '2:3' ),
-								aspect: 2 / 3,
-							},
+							...( showDefaultRatios
+								? defaultRatios
+										.map( presetRatioAsNumber )
+										.filter( ( { ratio } ) => ratio === 1 )
+								: [] ),
 						] }
 					/>
+					{ themeRatios?.length > 0 && (
+						<AspectRatioGroup
+							label={ __( 'Theme' ) }
+							isDisabled={ isInProgress }
+							onClick={ ( newAspect ) => {
+								setAspect( newAspect );
+								onClose();
+							} }
+							value={ aspect }
+							aspectRatios={ themeRatios }
+						/>
+					) }
+					{ showDefaultRatios && (
+						<AspectRatioGroup
+							label={ __( 'Landscape' ) }
+							isDisabled={ isInProgress }
+							onClick={ ( newAspect ) => {
+								setAspect( newAspect );
+								onClose();
+							} }
+							value={ aspect }
+							aspectRatios={ defaultRatios
+								.map( presetRatioAsNumber )
+								.filter( ( { ratio } ) => ratio > 1 ) }
+						/>
+					) }
+					{ showDefaultRatios && (
+						<AspectRatioGroup
+							label={ __( 'Portrait' ) }
+							isDisabled={ isInProgress }
+							onClick={ ( newAspect ) => {
+								setAspect( newAspect );
+								onClose();
+							} }
+							value={ aspect }
+							aspectRatios={ defaultRatios
+								.map( presetRatioAsNumber )
+								.filter( ( { ratio } ) => ratio < 1 ) }
+						/>
+					) }
 				</>
 			) }
 		</DropdownMenu>
diff --git a/packages/block-editor/src/components/image-editor/cropper.js b/packages/block-editor/src/components/image-editor/cropper.js
index 9a77145de95a37..d5b0c3b03586e5 100644
--- a/packages/block-editor/src/components/image-editor/cropper.js
+++ b/packages/block-editor/src/components/image-editor/cropper.js
@@ -2,12 +2,13 @@
  * External dependencies
  */
 import Cropper from 'react-easy-crop';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { Spinner } from '@wordpress/components';
+import { useResizeObserver } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -20,7 +21,6 @@ export default function ImageCropper( {
 	url,
 	width,
 	height,
-	clientWidth,
 	naturalHeight,
 	naturalWidth,
 	borderProps,
@@ -36,6 +36,8 @@ export default function ImageCropper( {
 		setZoom,
 		rotation,
 	} = useImageEditingContext();
+	const [ contentResizeListener, { width: clientWidth } ] =
+		useResizeObserver();
 
 	let editedHeight = height || ( clientWidth * naturalHeight ) / naturalWidth;
 
@@ -43,9 +45,9 @@ export default function ImageCropper( {
 		editedHeight = ( clientWidth * naturalWidth ) / naturalHeight;
 	}
 
-	return (
+	const area = (
 		<div
-			className={ classnames(
+			className={ clsx(
 				'wp-block-image__crop-area',
 				borderProps?.className,
 				{
@@ -79,4 +81,11 @@ export default function ImageCropper( {
 			{ isInProgress && <Spinner /> }
 		</div>
 	);
+
+	return (
+		<>
+			{ contentResizeListener }
+			{ area }
+		</>
+	);
 }
diff --git a/packages/block-editor/src/components/image-editor/index.js b/packages/block-editor/src/components/image-editor/index.js
index 0185911feca9c4..133f79732bdbd5 100644
--- a/packages/block-editor/src/components/image-editor/index.js
+++ b/packages/block-editor/src/components/image-editor/index.js
@@ -6,11 +6,11 @@ import { ToolbarGroup, ToolbarItem } from '@wordpress/components';
 /**
  * Internal dependencies
  */
+import AspectRatioDropdown from './aspect-ratio-dropdown';
 import BlockControls from '../block-controls';
 import ImageEditingProvider from './context';
 import Cropper from './cropper';
 import ZoomDropdown from './zoom-dropdown';
-import AspectRatioDropdown from './aspect-ratio-dropdown';
 import RotationButton from './rotation-button';
 import FormControls from './form-controls';
 
@@ -19,7 +19,6 @@ export default function ImageEditor( {
 	url,
 	width,
 	height,
-	clientWidth,
 	naturalHeight,
 	naturalWidth,
 	onSaveImage,
@@ -40,7 +39,6 @@ export default function ImageEditor( {
 				url={ url }
 				width={ width }
 				height={ height }
-				clientWidth={ clientWidth }
 				naturalHeight={ naturalHeight }
 				naturalWidth={ naturalWidth }
 			/>
diff --git a/packages/block-editor/src/components/image-editor/test/index.js b/packages/block-editor/src/components/image-editor/test/index.js
new file mode 100644
index 00000000000000..9f0f3491667a8d
--- /dev/null
+++ b/packages/block-editor/src/components/image-editor/test/index.js
@@ -0,0 +1,22 @@
+/**
+ * Internal dependencies
+ */
+import { ratioToNumber } from '../aspect-ratio-dropdown';
+
+test( 'ratioToNumber', () => {
+	expect( ratioToNumber( '1/1' ) ).toBe( 1 );
+	expect( ratioToNumber( '1' ) ).toBe( 1 );
+	expect( ratioToNumber( '11/11' ) ).toBe( 1 );
+	expect( ratioToNumber( '16/9' ) ).toBe( 16 / 9 );
+	expect( ratioToNumber( '4/3' ) ).toBe( 4 / 3 );
+	expect( ratioToNumber( '3/2' ) ).toBe( 3 / 2 );
+	expect( ratioToNumber( '2/1' ) ).toBe( 2 );
+	expect( ratioToNumber( '1/2' ) ).toBe( 1 / 2 );
+	expect( ratioToNumber( '2/3' ) ).toBe( 2 / 3 );
+	expect( ratioToNumber( '3/4' ) ).toBe( 3 / 4 );
+	expect( ratioToNumber( '9/16' ) ).toBe( 9 / 16 );
+	expect( ratioToNumber( '1/16' ) ).toBe( 1 / 16 );
+	expect( ratioToNumber( '16/1' ) ).toBe( 16 );
+	expect( ratioToNumber( '1/9' ) ).toBe( 1 / 9 );
+	expect( ratioToNumber( 'auto' ) ).toBe( NaN );
+} );
diff --git a/packages/block-editor/src/components/image-editor/use-save-image.js b/packages/block-editor/src/components/image-editor/use-save-image.js
index ff91a9794ca158..094ce1600545b5 100644
--- a/packages/block-editor/src/components/image-editor/use-save-image.js
+++ b/packages/block-editor/src/components/image-editor/use-save-image.js
@@ -54,6 +54,13 @@ export default function useSaveImage( {
 			} );
 		}
 
+		if ( modifiers.length === 0 ) {
+			// No changes to apply.
+			setIsInProgress( false );
+			onFinishEditing();
+			return;
+		}
+
 		apiFetch( {
 			path: `/wp/v2/media/${ id }/edit`,
 			method: 'POST',
diff --git a/packages/block-editor/src/components/image-editor/zoom-dropdown.js b/packages/block-editor/src/components/image-editor/zoom-dropdown.js
index 70baa28b2e112c..5093b11feb6d87 100644
--- a/packages/block-editor/src/components/image-editor/zoom-dropdown.js
+++ b/packages/block-editor/src/components/image-editor/zoom-dropdown.js
@@ -1,7 +1,12 @@
 /**
  * WordPress dependencies
  */
-import { ToolbarButton, RangeControl, Dropdown } from '@wordpress/components';
+import {
+	ToolbarButton,
+	RangeControl,
+	Dropdown,
+	__experimentalDropdownContentWrapper as DropdownContentWrapper,
+} from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { search } from '@wordpress/icons';
 
@@ -27,14 +32,17 @@ export default function ZoomDropdown() {
 				/>
 			) }
 			renderContent={ () => (
-				<RangeControl
-					__nextHasNoMarginBottom
-					label={ __( 'Zoom' ) }
-					min={ MIN_ZOOM }
-					max={ MAX_ZOOM }
-					value={ Math.round( zoom ) }
-					onChange={ setZoom }
-				/>
+				<DropdownContentWrapper paddingSize="medium">
+					<RangeControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
+						label={ __( 'Zoom' ) }
+						min={ MIN_ZOOM }
+						max={ MAX_ZOOM }
+						value={ Math.round( zoom ) }
+						onChange={ setZoom }
+					/>
+				</DropdownContentWrapper>
 			) }
 		/>
 	);
diff --git a/packages/block-editor/src/components/image-link-destinations/index.native.js b/packages/block-editor/src/components/image-link-destinations/index.native.js
new file mode 100644
index 00000000000000..ed815426f4e27d
--- /dev/null
+++ b/packages/block-editor/src/components/image-link-destinations/index.native.js
@@ -0,0 +1,152 @@
+/**
+ * External dependencies
+ */
+import { useNavigation, useRoute } from '@react-navigation/native';
+import { StyleSheet } from 'react-native';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Icon, check, chevronRight } from '@wordpress/icons';
+import { usePreferredColorSchemeStyle } from '@wordpress/compose';
+import { BottomSheet, PanelBody } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import styles from './style.native.scss';
+import { blockSettingsScreens } from '../block-settings';
+
+const LINK_DESTINATION_NONE = 'none';
+const LINK_DESTINATION_MEDIA = 'media';
+const LINK_DESTINATION_ATTACHMENT = 'attachment';
+const LINK_DESTINATION_CUSTOM = 'custom';
+
+function LinkDestination( {
+	children,
+	isSelected,
+	label,
+	onPress,
+	value,
+	valueStyle,
+} ) {
+	const optionIcon = usePreferredColorSchemeStyle(
+		styles.optionIcon,
+		styles.optionIconDark
+	);
+
+	return (
+		<BottomSheet.Cell
+			icon={ check }
+			iconStyle={ StyleSheet.flatten( [
+				optionIcon,
+				! isSelected && styles.unselectedOptionIcon,
+			] ) }
+			label={ label }
+			leftAlign
+			onPress={ onPress }
+			value={ value }
+			valueStyle={ valueStyle }
+			separatorType="leftMargin"
+		>
+			{ children }
+		</BottomSheet.Cell>
+	);
+}
+
+function ImageLinkDestinationsScreen( props ) {
+	const navigation = useNavigation();
+	const route = useRoute();
+	const { url = '' } = props;
+	const {
+		inputValue = url,
+		imageUrl,
+		attachmentPageUrl,
+		linkDestination,
+	} = route.params || {};
+
+	function goToLinkPicker() {
+		navigation.navigate( blockSettingsScreens.linkPicker, {
+			inputValue:
+				linkDestination === LINK_DESTINATION_CUSTOM ? inputValue : '',
+		} );
+	}
+
+	const setLinkDestination = ( newLinkDestination ) => () => {
+		let newUrl;
+		switch ( newLinkDestination ) {
+			case LINK_DESTINATION_MEDIA:
+				newUrl = imageUrl;
+				break;
+			case LINK_DESTINATION_ATTACHMENT:
+				newUrl = attachmentPageUrl;
+				break;
+			default:
+				newUrl = '';
+				break;
+		}
+
+		navigation.navigate( blockSettingsScreens.settings, {
+			// The `inputValue` name is reused from LinkPicker, as it helps avoid
+			// bugs from stale values remaining in the React Navigation route
+			// parameters.
+			inputValue: newUrl,
+			// Clear link text value that may be set from LinkPicker.
+			text: '',
+		} );
+	};
+
+	return (
+		<>
+			<BottomSheet.NavBar>
+				<BottomSheet.NavBar.BackButton onPress={ navigation.goBack } />
+				<BottomSheet.NavBar.Heading>
+					{ __( 'Link To' ) }
+				</BottomSheet.NavBar.Heading>
+			</BottomSheet.NavBar>
+			<PanelBody>
+				<LinkDestination
+					isSelected={ linkDestination === LINK_DESTINATION_NONE }
+					label={ __( 'None' ) }
+					onPress={ setLinkDestination( LINK_DESTINATION_NONE ) }
+				/>
+				<LinkDestination
+					isSelected={ linkDestination === LINK_DESTINATION_MEDIA }
+					label={ __( 'Media File' ) }
+					onPress={ setLinkDestination( LINK_DESTINATION_MEDIA ) }
+				/>
+				{ !! attachmentPageUrl && (
+					<LinkDestination
+						isSelected={
+							linkDestination === LINK_DESTINATION_ATTACHMENT
+						}
+						label={ __( 'Attachment Page' ) }
+						onPress={ setLinkDestination(
+							LINK_DESTINATION_ATTACHMENT
+						) }
+					/>
+				) }
+				<LinkDestination
+					isSelected={ linkDestination === LINK_DESTINATION_CUSTOM }
+					label={ __( 'Custom URL' ) }
+					onPress={ goToLinkPicker }
+					value={
+						linkDestination === LINK_DESTINATION_CUSTOM
+							? inputValue
+							: ''
+					}
+					valueStyle={
+						linkDestination === LINK_DESTINATION_CUSTOM
+							? undefined
+							: styles.placeholderTextColor
+					}
+				>
+					<Icon icon={ chevronRight }></Icon>
+				</LinkDestination>
+			</PanelBody>
+		</>
+	);
+}
+
+export default ImageLinkDestinationsScreen;
diff --git a/packages/block-editor/src/components/image-link-destinations/style.native.scss b/packages/block-editor/src/components/image-link-destinations/style.native.scss
new file mode 100644
index 00000000000000..cc1486efa2487d
--- /dev/null
+++ b/packages/block-editor/src/components/image-link-destinations/style.native.scss
@@ -0,0 +1,16 @@
+// used in both light and dark modes
+.placeholderTextColor {
+	color: #87a6bc;
+}
+
+.optionIcon {
+	color: $blue-50;
+}
+
+.optionIconDark {
+	color: $blue-30;
+}
+
+.unselectedOptionIcon {
+	opacity: 0;
+}
diff --git a/packages/block-editor/src/components/image-size-control/index.js b/packages/block-editor/src/components/image-size-control/index.js
index 46e87de60f2fc8..7a333e98f795a1 100644
--- a/packages/block-editor/src/components/image-size-control/index.js
+++ b/packages/block-editor/src/components/image-size-control/index.js
@@ -87,7 +87,7 @@ export default function ImageSizeControl( {
 								return (
 									<Button
 										key={ scale }
-										isSmall
+										size="small"
 										variant={
 											isCurrent ? 'primary' : undefined
 										}
@@ -104,7 +104,10 @@ export default function ImageSizeControl( {
 								);
 							} ) }
 						</ButtonGroup>
-						<Button isSmall onClick={ () => updateDimensions() }>
+						<Button
+							size="small"
+							onClick={ () => updateDimensions() }
+						>
 							{ __( 'Reset' ) }
 						</Button>
 					</HStack>
diff --git a/packages/block-editor/src/components/index.js b/packages/block-editor/src/components/index.js
index 08247d8cdb014a..29bb71b682e970 100644
--- a/packages/block-editor/src/components/index.js
+++ b/packages/block-editor/src/components/index.js
@@ -152,12 +152,15 @@ export { default as WritingFlow } from './writing-flow';
 export { default as useBlockDisplayInformation } from './use-block-display-information';
 export { default as __unstableIframe } from './iframe';
 export {
-	RecursionProvider as __experimentalRecursionProvider,
-	useHasRecursion as __experimentalUseHasRecursion,
+	RecursionProvider,
+	DeprecatedExperimentalRecursionProvider as __experimentalRecursionProvider,
+	useHasRecursion,
+	DeprecatedExperimentalUseHasRecursion as __experimentalUseHasRecursion,
 } from './recursion-provider';
 export { default as __experimentalBlockPatternsList } from './block-patterns-list';
 export { default as __experimentalPublishDateTimePicker } from './publish-date-time-picker';
 export { default as __experimentalInspectorPopoverHeader } from './inspector-popover-header';
+export { default as BlockPopover } from './block-popover';
 export { useBlockEditingMode } from './block-editing-mode';
 
 /*
@@ -167,8 +170,3 @@ export { useBlockEditingMode } from './block-editing-mode';
 export { default as BlockEditorProvider } from './provider';
 export { useSettings, useSetting } from './use-settings';
 export { useBlockCommands } from './use-block-commands';
-
-/*
- * The following rename hint component can be removed in 6.4.
- */
-export { default as ReusableBlocksRenameHint } from './inserter/reusable-block-rename-hint';
diff --git a/packages/block-editor/src/components/index.native.js b/packages/block-editor/src/components/index.native.js
index 45451908a34472..ae565cd9cc665a 100644
--- a/packages/block-editor/src/components/index.native.js
+++ b/packages/block-editor/src/components/index.native.js
@@ -45,13 +45,14 @@ export {
 	MEDIA_TYPE_AUDIO,
 	MEDIA_TYPE_ANY,
 } from './media-upload/constants';
+export { default as MediaUploadProgress } from './media-upload-progress';
 export {
-	default as MediaUploadProgress,
 	MEDIA_UPLOAD_STATE_UPLOADING,
 	MEDIA_UPLOAD_STATE_SUCCEEDED,
+	MEDIA_UPLOAD_STATE_PAUSED,
 	MEDIA_UPLOAD_STATE_FAILED,
 	MEDIA_UPLOAD_STATE_RESET,
-} from './media-upload-progress';
+} from './media-upload-progress/constants';
 export { default as BlockMediaUpdateProgress } from './block-media-update-progress';
 export { default as URLInput } from './url-input';
 export { default as BlockInvalidWarning } from './block-list/block-invalid-warning';
@@ -61,13 +62,21 @@ export { default as PanelColorSettings } from './panel-color-settings';
 export { default as __experimentalPanelColorGradientSettings } from './colors-gradients/panel-color-gradient-settings';
 export { useSettings, default as useSetting } from './use-settings';
 export {
-	RecursionProvider as __experimentalRecursionProvider,
-	useHasRecursion as __experimentalUseHasRecursion,
+	RecursionProvider,
+	DeprecatedExperimentalRecursionProvider as __experimentalRecursionProvider,
+	useHasRecursion,
+	DeprecatedExperimentalUseHasRecursion as __experimentalUseHasRecursion,
 } from './recursion-provider';
 export { default as Warning } from './warning';
 export { default as ContrastChecker } from './contrast-checker';
 export { default as useMultipleOriginColorsAndGradients } from './colors-gradients/use-multiple-origin-colors-and-gradients';
 export { default as UnsupportedBlockDetails } from './unsupported-block-details';
+export {
+	useGlobalStyles,
+	getGlobalStyles,
+	getColorsAndGradients,
+	useMobileGlobalStylesColors,
+} from './global-styles/use-global-styles-context';
 
 export {
 	BottomSheetSettings,
@@ -75,6 +84,7 @@ export {
 	blockSettingsScreens,
 } from './block-settings';
 export { default as VideoPlayer, VIDEO_ASPECT_RATIO } from './video-player';
+export { default as AudioPlayer } from './audio-player';
 
 export {
 	getSpacingPresetCssVar,
diff --git a/packages/block-editor/src/components/inner-blocks/README.md b/packages/block-editor/src/components/inner-blocks/README.md
index 0f5d303b8c7917..92d4fdb5739cec 100644
--- a/packages/block-editor/src/components/inner-blocks/README.md
+++ b/packages/block-editor/src/components/inner-blocks/README.md
@@ -188,8 +188,19 @@ For example, a button block, deeply nested in several levels of block `X` that u
 
 ### `defaultBlock`
 
-- **Type:** `Array`
-- **Default:** - `undefined`. Determines which block type should be inserted by default and any attributes that should be set by default when the block is inserted. Takes an array in the form of `[ blockname, {blockAttributes} ]`.
+- **Type:** `Object`
+- **Default:** - `undefined`
+
+Determines which block type should be inserted by default and any attributes that should be set by default when the block is inserted. Takes an object in the form of `{ name: blockname, attributes: {blockAttributes} }`.
+
+```jsx
+const DEFAULT_BLOCK = { name: 'core/paragraph', attributes: { content: 'Lorem ipsum...' } };
+...
+<InnerBlocks
+    defaultBlock={ DEFAULT_BLOCK }
+    directInsert={ true }
+/>
+```
 
 ### `directInsert`
 
diff --git a/packages/block-editor/src/components/inner-blocks/button-block-appender.js b/packages/block-editor/src/components/inner-blocks/button-block-appender.js
index 5319b5d4d3c368..5bc788d58582f6 100644
--- a/packages/block-editor/src/components/inner-blocks/button-block-appender.js
+++ b/packages/block-editor/src/components/inner-blocks/button-block-appender.js
@@ -1,24 +1,24 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
  */
 import BaseButtonBlockAppender from '../button-block-appender';
-import withClientId from './with-client-id';
+import { useBlockEditContext } from '../block-edit/context';
 
-export const ButtonBlockAppender = ( {
-	clientId,
+export default function ButtonBlockAppender( {
 	showSeparator,
 	isFloating,
 	onAddBlock,
 	isToggle,
-} ) => {
+} ) {
+	const { clientId } = useBlockEditContext();
 	return (
 		<BaseButtonBlockAppender
-			className={ classnames( {
+			className={ clsx( {
 				'block-list-appender__toggle': isToggle,
 			} ) }
 			rootClientId={ clientId }
@@ -27,6 +27,4 @@ export const ButtonBlockAppender = ( {
 			onAddBlock={ onAddBlock }
 		/>
 	);
-};
-
-export default withClientId( ButtonBlockAppender );
+}
diff --git a/packages/block-editor/src/components/inner-blocks/content.scss b/packages/block-editor/src/components/inner-blocks/content.scss
deleted file mode 100644
index 05259ede35daaa..00000000000000
--- a/packages/block-editor/src/components/inner-blocks/content.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-// Add clickable overlay to blocks with nesting.
-// This makes it easy to select all layers of the block.
-.block-editor-block-list__layout.has-overlay {
-	&::after {
-		content: "";
-		position: absolute;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		z-index: z-index(".block-editor-block-list__layout.has-overlay::after");
-	}
-}
diff --git a/packages/block-editor/src/components/inner-blocks/default-block-appender.js b/packages/block-editor/src/components/inner-blocks/default-block-appender.js
index d2e137004d83bf..91e48a2854b513 100644
--- a/packages/block-editor/src/components/inner-blocks/default-block-appender.js
+++ b/packages/block-editor/src/components/inner-blocks/default-block-appender.js
@@ -1,29 +1,10 @@
-/**
- * WordPress dependencies
- */
-import { compose } from '@wordpress/compose';
-import { withSelect } from '@wordpress/data';
-
 /**
  * Internal dependencies
  */
 import BaseDefaultBlockAppender from '../default-block-appender';
-import withClientId from './with-client-id';
-import { store as blockEditorStore } from '../../store';
+import { useBlockEditContext } from '../block-edit/context';
 
-export const DefaultBlockAppender = ( { clientId } ) => {
+export default function DefaultBlockAppender() {
+	const { clientId } = useBlockEditContext();
 	return <BaseDefaultBlockAppender rootClientId={ clientId } />;
-};
-
-export default compose( [
-	withClientId,
-	withSelect( ( select, { clientId } ) => {
-		const { getBlockOrder } = select( blockEditorStore );
-
-		const blockClientIds = getBlockOrder( clientId );
-
-		return {
-			lastBlockClientId: blockClientIds[ blockClientIds.length - 1 ],
-		};
-	} ),
-] )( DefaultBlockAppender );
+}
diff --git a/packages/block-editor/src/components/inner-blocks/index.js b/packages/block-editor/src/components/inner-blocks/index.js
index d637a16f363602..ae587720278200 100644
--- a/packages/block-editor/src/components/inner-blocks/index.js
+++ b/packages/block-editor/src/components/inner-blocks/index.js
@@ -1,13 +1,13 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { useViewportMatch, useMergeRefs } from '@wordpress/compose';
-import { forwardRef, useMemo } from '@wordpress/element';
+import { useMergeRefs } from '@wordpress/compose';
+import { forwardRef, useMemo, memo } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import {
 	getBlockSupport,
@@ -29,10 +29,21 @@ import { useBlockEditContext } from '../block-edit/context';
 import useBlockSync from '../provider/use-block-sync';
 import { store as blockEditorStore } from '../../store';
 import useBlockDropZone from '../use-block-drop-zone';
-import { useSettings } from '../use-settings';
+import { unlock } from '../../lock-unlock';
 
 const EMPTY_OBJECT = {};
 
+function BlockContext( { children, clientId } ) {
+	const context = useBlockContext( clientId );
+	return (
+		<BlockContextProvider value={ context }>
+			{ children }
+		</BlockContextProvider>
+	);
+}
+
+const BlockListItemsMemo = memo( BlockListItems );
+
 /**
  * InnerBlocks is a component which allows a single block to have multiple blocks
  * as children. The UncontrolledInnerBlocks component is used whenever the inner
@@ -60,10 +71,15 @@ function UncontrolledInnerBlocks( props ) {
 		orientation,
 		placeholder,
 		layout,
+		name,
+		blockType,
+		parentLock,
+		defaultLayout,
 	} = props;
 
 	useNestedSettingsUpdate(
 		clientId,
+		parentLock,
 		allowedBlocks,
 		prioritizedInserterBlocks,
 		defaultBlock,
@@ -83,23 +99,12 @@ function UncontrolledInnerBlocks( props ) {
 		templateInsertUpdatesSelection
 	);
 
-	const context = useBlockContext( clientId );
-	const name = useSelect(
-		( select ) => {
-			return select( blockEditorStore ).getBlock( clientId )?.name;
-		},
-		[ clientId ]
-	);
-
 	const defaultLayoutBlockSupport =
 		getBlockSupport( name, 'layout' ) ||
 		getBlockSupport( name, '__experimentalLayout' ) ||
 		EMPTY_OBJECT;
 
 	const { allowSizingOnChildren = false } = defaultLayoutBlockSupport;
-
-	const [ defaultLayout ] = useSettings( 'layout' );
-
 	const usedLayout = layout || defaultLayoutBlockSupport;
 
 	const memoedLayout = useMemo(
@@ -114,20 +119,27 @@ function UncontrolledInnerBlocks( props ) {
 		[ defaultLayout, usedLayout, allowSizingOnChildren ]
 	);
 
-	// This component needs to always be synchronous as it's the one changing
-	// the async mode depending on the block selection.
-	return (
-		<BlockContextProvider value={ context }>
-			<BlockListItems
-				rootClientId={ clientId }
-				renderAppender={ renderAppender }
-				__experimentalAppenderTagName={ __experimentalAppenderTagName }
-				layout={ memoedLayout }
-				wrapperRef={ wrapperRef }
-				placeholder={ placeholder }
-			/>
-		</BlockContextProvider>
+	// For controlled inner blocks, we don't want a change in blocks to
+	// re-render the blocks list.
+	const items = (
+		<BlockListItemsMemo
+			rootClientId={ clientId }
+			renderAppender={ renderAppender }
+			__experimentalAppenderTagName={ __experimentalAppenderTagName }
+			layout={ memoedLayout }
+			wrapperRef={ wrapperRef }
+			placeholder={ placeholder }
+		/>
 	);
+
+	if (
+		! blockType?.providesContext ||
+		Object.keys( blockType.providesContext ).length === 0
+	) {
+		return items;
+	}
+
+	return <BlockContext clientId={ clientId }>{ items }</BlockContext>;
 }
 
 /**
@@ -179,53 +191,95 @@ export function useInnerBlocksProps( props = {}, options = {} ) {
 		layout = null,
 		__unstableLayoutClassNames: layoutClassNames = '',
 	} = useBlockEditContext();
-	const isSmallScreen = useViewportMatch( 'medium', '<' );
-	const { __experimentalCaptureToolbars, hasOverlay } = useSelect(
+	const selected = useSelect(
 		( select ) => {
+			const {
+				getBlockName,
+				isZoomOut,
+				getTemplateLock,
+				getBlockRootClientId,
+				getBlockEditingMode,
+				getBlockSettings,
+				getSectionRootClientId,
+			} = unlock( select( blockEditorStore ) );
+
 			if ( ! clientId ) {
-				return {};
+				const sectionRootClientId = getSectionRootClientId();
+				// Disable the root drop zone when zoomed out and the section root client id
+				// is not the root block list (represented by an empty string).
+				// This avoids drag handling bugs caused by having two block lists acting as
+				// drop zones - the actual 'root' block list and the section root.
+				return {
+					isDropZoneDisabled:
+						isZoomOut() && sectionRootClientId !== '',
+				};
 			}
 
-			const {
-				getBlockName,
-				isBlockSelected,
-				hasSelectedInnerBlock,
-				__unstableGetEditorMode,
-			} = select( blockEditorStore );
+			const { hasBlockSupport, getBlockType } = select( blocksStore );
 			const blockName = getBlockName( clientId );
-			const enableClickThrough =
-				__unstableGetEditorMode() === 'navigation' || isSmallScreen;
+			const blockEditingMode = getBlockEditingMode( clientId );
+			const parentClientId = getBlockRootClientId( clientId );
+			const [ defaultLayout ] = getBlockSettings( clientId, 'layout' );
+
+			let _isDropZoneDisabled = blockEditingMode === 'disabled';
+
+			if ( isZoomOut() ) {
+				// In zoom out mode, we want to disable the drop zone for the sections.
+				// The inner blocks belonging to the section drop zone is
+				// already disabled by the blocks themselves being disabled.
+				const sectionRootClientId = getSectionRootClientId();
+				_isDropZoneDisabled = clientId !== sectionRootClientId;
+			}
+
 			return {
-				__experimentalCaptureToolbars: select(
-					blocksStore
-				).hasBlockSupport(
+				__experimentalCaptureToolbars: hasBlockSupport(
 					blockName,
 					'__experimentalExposeControlsToChildren',
 					false
 				),
-				hasOverlay:
-					blockName !== 'core/template' &&
-					! isBlockSelected( clientId ) &&
-					! hasSelectedInnerBlock( clientId, true ) &&
-					enableClickThrough,
+				name: blockName,
+				blockType: getBlockType( blockName ),
+				parentLock: getTemplateLock( parentClientId ),
+				parentClientId,
+				isDropZoneDisabled: _isDropZoneDisabled,
+				defaultLayout,
 			};
 		},
-		[ clientId, isSmallScreen ]
+		[ clientId ]
 	);
+	const {
+		__experimentalCaptureToolbars,
+		name,
+		blockType,
+		parentLock,
+		parentClientId,
+		isDropZoneDisabled,
+		defaultLayout,
+	} = selected;
 
 	const blockDropZoneRef = useBlockDropZone( {
 		dropZoneElement,
 		rootClientId: clientId,
+		parentClientId,
 	} );
 
 	const ref = useMergeRefs( [
 		props.ref,
-		__unstableDisableDropZone ? null : blockDropZoneRef,
+		__unstableDisableDropZone ||
+		isDropZoneDisabled ||
+		( layout?.isManualPlacement &&
+			window.__experimentalEnableGridInteractivity )
+			? null
+			: blockDropZoneRef,
 	] );
 
 	const innerBlocksProps = {
 		__experimentalCaptureToolbars,
 		layout,
+		name,
+		blockType,
+		parentLock,
+		defaultLayout,
 		...options,
 	};
 	const InnerBlocks =
@@ -236,13 +290,10 @@ export function useInnerBlocksProps( props = {}, options = {} ) {
 	return {
 		...props,
 		ref,
-		className: classnames(
+		className: clsx(
 			props.className,
 			'block-editor-block-list__layout',
-			__unstableDisableLayoutClassNames ? '' : layoutClassNames,
-			{
-				'has-overlay': hasOverlay,
-			}
+			__unstableDisableLayoutClassNames ? '' : layoutClassNames
 		),
 		children: clientId ? (
 			<InnerBlocks { ...innerBlocksProps } clientId={ clientId } />
diff --git a/packages/block-editor/src/components/inner-blocks/index.native.js b/packages/block-editor/src/components/inner-blocks/index.native.js
index e254eff6c9ef18..1398a5abd51e4b 100644
--- a/packages/block-editor/src/components/inner-blocks/index.native.js
+++ b/packages/block-editor/src/components/inner-blocks/index.native.js
@@ -105,8 +105,21 @@ function UncontrolledInnerBlocks( props ) {
 
 	const context = useBlockContext( clientId );
 
+	const { nestingLevel, parentLock } = useSelect(
+		( select ) => {
+			const { getBlockParents, getTemplateLock, getBlockRootClientId } =
+				select( blockEditorStore );
+			return {
+				nestingLevel: getBlockParents( clientId )?.length,
+				parentLock: getTemplateLock( getBlockRootClientId( clientId ) ),
+			};
+		},
+		[ clientId ]
+	);
+
 	useNestedSettingsUpdate(
 		clientId,
+		parentLock,
 		allowedBlocks,
 		prioritizedInserterBlocks,
 		defaultBlock,
@@ -126,13 +139,6 @@ function UncontrolledInnerBlocks( props ) {
 		templateInsertUpdatesSelection
 	);
 
-	const nestingLevel = useSelect(
-		( select ) => {
-			return select( blockEditorStore ).getBlockParents( clientId )
-				?.length;
-		},
-		[ clientId ]
-	);
 	if ( nestingLevel >= MAX_NESTING_DEPTH ) {
 		return <WarningMaxDepthExceeded clientId={ clientId } />;
 	}
diff --git a/packages/block-editor/src/components/inner-blocks/use-inner-block-template-sync.js b/packages/block-editor/src/components/inner-blocks/use-inner-block-template-sync.js
index 664e696eb44b9c..fd801779372aac 100644
--- a/packages/block-editor/src/components/inner-blocks/use-inner-block-template-sync.js
+++ b/packages/block-editor/src/components/inner-blocks/use-inner-block-template-sync.js
@@ -40,6 +40,9 @@ export default function useInnerBlockTemplateSync(
 	templateLock,
 	templateInsertUpdatesSelection
 ) {
+	// Instead of adding a useSelect mapping here, please add to the useSelect
+	// mapping in InnerBlocks! Every subscription impacts performance.
+
 	const {
 		getBlocks,
 		getSelectedBlocksInitialCaretPosition,
@@ -48,15 +51,8 @@ export default function useInnerBlockTemplateSync(
 	const { replaceInnerBlocks, __unstableMarkNextChangeAsNotPersistent } =
 		useDispatch( blockEditorStore );
 
-	const { innerBlocks } = useSelect(
-		( select ) => ( {
-			innerBlocks: select( blockEditorStore ).getBlocks( clientId ),
-		} ),
-		[ clientId ]
-	);
-
 	// Maintain a reference to the previous value so we can do a deep equality check.
-	const existingTemplate = useRef( null );
+	const existingTemplateRef = useRef( null );
 
 	useLayoutEffect( () => {
 		let isCancelled = false;
@@ -80,14 +76,14 @@ export default function useInnerBlockTemplateSync(
 
 			const hasTemplateChanged = ! fastDeepEqual(
 				template,
-				existingTemplate.current
+				existingTemplateRef.current
 			);
 
 			if ( ! shouldApplyTemplate || ! hasTemplateChanged ) {
 				return;
 			}
 
-			existingTemplate.current = template;
+			existingTemplateRef.current = template;
 			const nextBlocks = synchronizeBlocksWithTemplate(
 				currentInnerBlocks,
 				template
@@ -114,5 +110,5 @@ export default function useInnerBlockTemplateSync(
 		return () => {
 			isCancelled = true;
 		};
-	}, [ innerBlocks, template, templateLock, clientId ] );
+	}, [ template, templateLock, clientId ] );
 }
diff --git a/packages/block-editor/src/components/inner-blocks/use-nested-settings-update.js b/packages/block-editor/src/components/inner-blocks/use-nested-settings-update.js
index 8eba8a1d2223d4..bc07a5a1829e2b 100644
--- a/packages/block-editor/src/components/inner-blocks/use-nested-settings-update.js
+++ b/packages/block-editor/src/components/inner-blocks/use-nested-settings-update.js
@@ -1,8 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { useLayoutEffect, useMemo, useState } from '@wordpress/element';
-import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
+import { useLayoutEffect, useState } from '@wordpress/element';
+import { useRegistry } from '@wordpress/data';
 import deprecated from '@wordpress/deprecated';
 import isShallowEqual from '@wordpress/is-shallow-equal';
 
@@ -16,12 +16,21 @@ import { getLayoutType } from '../../layouts';
 
 const pendingSettingsUpdates = new WeakMap();
 
+// Creates a memoizing caching function that remembers the last value and keeps returning it
+// as long as the new values are shallowly equal. Helps keep dependencies stable.
+function createShallowMemo() {
+	let value;
+	return ( newValue ) => {
+		if ( value === undefined || ! isShallowEqual( value, newValue ) ) {
+			value = newValue;
+		}
+		return value;
+	};
+}
+
 function useShallowMemo( value ) {
-	const [ prevValue, setPrevValue ] = useState( value );
-	if ( ! isShallowEqual( prevValue, value ) ) {
-		setPrevValue( value );
-	}
-	return prevValue;
+	const [ memo ] = useState( createShallowMemo );
+	return memo( value );
 }
 
 /**
@@ -32,15 +41,16 @@ function useShallowMemo( value ) {
  * came from props.
  *
  * @param {string}               clientId                   The client ID of the block to update.
+ * @param {string}               parentLock
  * @param {string[]}             allowedBlocks              An array of block names which are permitted
  *                                                          in inner blocks.
  * @param {string[]}             prioritizedInserterBlocks  Block names and/or block variations to be prioritized in the inserter, in the format {blockName}/{variationName}.
  * @param {?WPDirectInsertBlock} defaultBlock               The default block to insert: [ blockName, { blockAttributes } ].
- * @param {?Function|boolean}    directInsert               If a default block should be inserted directly by the appender.
+ * @param {?boolean}             directInsert               If a default block should be inserted directly by the appender.
  *
  * @param {?WPDirectInsertBlock} __experimentalDefaultBlock A deprecated prop for the default block to insert: [ blockName, { blockAttributes } ]. Use `defaultBlock` instead.
  *
- * @param {?Function|boolean}    __experimentalDirectInsert A deprecated prop for whether a default block should be inserted directly by the appender. Use `directInsert` instead.
+ * @param {?boolean}             __experimentalDirectInsert A deprecated prop for whether a default block should be inserted directly by the appender. Use `directInsert` instead.
  *
  * @param {string}               [templateLock]             The template lock specified for the inner
  *                                                          blocks component. (e.g. "all")
@@ -53,6 +63,7 @@ function useShallowMemo( value ) {
  */
 export default function useNestedSettingsUpdate(
 	clientId,
+	parentLock,
 	allowedBlocks,
 	prioritizedInserterBlocks,
 	defaultBlock,
@@ -64,20 +75,10 @@ export default function useNestedSettingsUpdate(
 	orientation,
 	layout
 ) {
-	const { updateBlockListSettings } = useDispatch( blockEditorStore );
-	const registry = useRegistry();
+	// Instead of adding a useSelect mapping here, please add to the useSelect
+	// mapping in InnerBlocks! Every subscription impacts performance.
 
-	const { parentLock } = useSelect(
-		( select ) => {
-			const rootClientId =
-				select( blockEditorStore ).getBlockRootClientId( clientId );
-			return {
-				parentLock:
-					select( blockEditorStore ).getTemplateLock( rootClientId ),
-			};
-		},
-		[ clientId ]
-	);
+	const registry = useRegistry();
 
 	// Implementors often pass a new array on every render,
 	// and the contents of the arrays are just strings, so the entire array
@@ -85,10 +86,7 @@ export default function useNestedSettingsUpdate(
 	// otherwise if the arrays change length but the first elements are equal the comparison,
 	// does not works as expected.
 	const _allowedBlocks = useShallowMemo( allowedBlocks );
-
-	const _prioritizedInserterBlocks = useMemo(
-		() => prioritizedInserterBlocks,
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+	const _prioritizedInserterBlocks = useShallowMemo(
 		prioritizedInserterBlocks
 	);
 
@@ -145,6 +143,16 @@ export default function useNestedSettingsUpdate(
 			newSettings.directInsert = directInsert;
 		}
 
+		if (
+			newSettings.directInsert !== undefined &&
+			typeof newSettings.directInsert !== 'boolean'
+		) {
+			deprecated( 'Using `Function` as a `directInsert` argument', {
+				alternative: '`boolean` values',
+				since: '6.5',
+			} );
+		}
+
 		// Batch updates to block list settings to avoid triggering cascading renders
 		// for each container block included in a tree and optimize initial render.
 		// To avoid triggering updateBlockListSettings for each container block
@@ -152,21 +160,16 @@ export default function useNestedSettingsUpdate(
 		// we batch all the updatedBlockListSettings in a single "data" batch
 		// which results in a single re-render.
 		if ( ! pendingSettingsUpdates.get( registry ) ) {
-			pendingSettingsUpdates.set( registry, [] );
+			pendingSettingsUpdates.set( registry, {} );
 		}
-		pendingSettingsUpdates
-			.get( registry )
-			.push( [ clientId, newSettings ] );
+		pendingSettingsUpdates.get( registry )[ clientId ] = newSettings;
 		window.queueMicrotask( () => {
-			if ( pendingSettingsUpdates.get( registry )?.length ) {
-				registry.batch( () => {
-					pendingSettingsUpdates
-						.get( registry )
-						.forEach( ( args ) => {
-							updateBlockListSettings( ...args );
-						} );
-					pendingSettingsUpdates.set( registry, [] );
-				} );
+			const settings = pendingSettingsUpdates.get( registry );
+			if ( Object.keys( settings ).length ) {
+				const { updateBlockListSettings } =
+					registry.dispatch( blockEditorStore );
+				updateBlockListSettings( settings );
+				pendingSettingsUpdates.set( registry, {} );
 			}
 		} );
 	}, [
@@ -180,7 +183,6 @@ export default function useNestedSettingsUpdate(
 		__experimentalDirectInsert,
 		captureToolbars,
 		orientation,
-		updateBlockListSettings,
 		layout,
 		registry,
 	] );
diff --git a/packages/block-editor/src/components/inner-blocks/warning-max-depth-exceeded.native.js b/packages/block-editor/src/components/inner-blocks/warning-max-depth-exceeded.native.js
index e363db4961c7c3..f759b0e519fd60 100644
--- a/packages/block-editor/src/components/inner-blocks/warning-max-depth-exceeded.native.js
+++ b/packages/block-editor/src/components/inner-blocks/warning-max-depth-exceeded.native.js
@@ -89,7 +89,7 @@ const WarningMaxDepthExceeded = ( { clientId } ) => {
 		<TouchableWithoutFeedback
 			disabled={ ! isSelected }
 			accessibilityLabel={ __( 'Warning message' ) }
-			accessibilityRole={ 'button' }
+			accessibilityRole="button"
 			accessibilityHint={ __( 'Tap here to show more details.' ) }
 			onPress={ () => setShowDetails( true ) }
 		>
diff --git a/packages/block-editor/src/components/inner-blocks/with-client-id.js b/packages/block-editor/src/components/inner-blocks/with-client-id.js
deleted file mode 100644
index 97c73ae2803934..00000000000000
--- a/packages/block-editor/src/components/inner-blocks/with-client-id.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createHigherOrderComponent } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { useBlockEditContext } from '../block-edit/context';
-
-const withClientId = createHigherOrderComponent(
-	( WrappedComponent ) => ( props ) => {
-		const { clientId } = useBlockEditContext();
-		return <WrappedComponent { ...props } clientId={ clientId } />;
-	},
-	'withClientId'
-);
-
-export default withClientId;
diff --git a/packages/block-editor/src/components/inserter-draggable-blocks/index.js b/packages/block-editor/src/components/inserter-draggable-blocks/index.js
index 42cae8c7bcde98..5a63535be3d3ce 100644
--- a/packages/block-editor/src/components/inserter-draggable-blocks/index.js
+++ b/packages/block-editor/src/components/inserter-draggable-blocks/index.js
@@ -2,19 +2,27 @@
  * WordPress dependencies
  */
 import { Draggable } from '@wordpress/components';
-import { serialize, store as blocksStore } from '@wordpress/blocks';
-import { useSelect } from '@wordpress/data';
+import {
+	createBlock,
+	serialize,
+	store as blocksStore,
+} from '@wordpress/blocks';
+import { useDispatch, useSelect } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
 import BlockDraggableChip from '../block-draggable/draggable-chip';
+import { INSERTER_PATTERN_TYPES } from '../inserter/block-patterns-tab/utils';
+import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
 const InserterDraggableBlocks = ( {
 	isEnabled,
 	blocks,
 	icon,
 	children,
-	isPattern,
+	pattern,
 } ) => {
 	const transferData = {
 		type: 'inserter',
@@ -31,26 +39,50 @@ const InserterDraggableBlocks = ( {
 		[ blocks ]
 	);
 
+	const { startDragging, stopDragging } = unlock(
+		useDispatch( blockEditorStore )
+	);
+
+	if ( ! isEnabled ) {
+		return children( {
+			draggable: false,
+			onDragStart: undefined,
+			onDragEnd: undefined,
+		} );
+	}
+
 	return (
 		<Draggable
 			__experimentalTransferDataType="wp-blocks"
 			transferData={ transferData }
 			onDragStart={ ( event ) => {
-				event.dataTransfer.setData( 'text/html', serialize( blocks ) );
+				startDragging();
+				const parsedBlocks =
+					pattern?.type === INSERTER_PATTERN_TYPES.user &&
+					pattern?.syncStatus !== 'unsynced'
+						? [ createBlock( 'core/block', { ref: pattern.id } ) ]
+						: blocks;
+				event.dataTransfer.setData(
+					'text/html',
+					serialize( parsedBlocks )
+				);
+			} }
+			onDragEnd={ () => {
+				stopDragging();
 			} }
 			__experimentalDragComponent={
 				<BlockDraggableChip
 					count={ blocks.length }
-					icon={ icon || ( ! isPattern && blockTypeIcon ) }
-					isPattern={ isPattern }
+					icon={ icon || ( ! pattern && blockTypeIcon ) }
+					isPattern={ !! pattern }
 				/>
 			}
 		>
 			{ ( { onDraggableStart, onDraggableEnd } ) => {
 				return children( {
-					draggable: isEnabled,
-					onDragStart: isEnabled ? onDraggableStart : undefined,
-					onDragEnd: isEnabled ? onDraggableEnd : undefined,
+					draggable: true,
+					onDragStart: onDraggableStart,
+					onDragEnd: onDraggableEnd,
 				} );
 			} }
 		</Draggable>
diff --git a/packages/block-editor/src/components/inserter-list-item/index.js b/packages/block-editor/src/components/inserter-list-item/index.js
index dc755e87676233..c5bf2110702629 100644
--- a/packages/block-editor/src/components/inserter-list-item/index.js
+++ b/packages/block-editor/src/components/inserter-list-item/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -32,22 +32,23 @@ function InserterListItem( {
 	isDraggable,
 	...props
 } ) {
-	const isDragging = useRef( false );
+	const isDraggingRef = useRef( false );
 	const itemIconStyle = item.icon
 		? {
 				backgroundColor: item.icon.background,
 				color: item.icon.foreground,
 		  }
 		: {};
-	const blocks = useMemo( () => {
-		return [
+	const blocks = useMemo(
+		() => [
 			createBlock(
 				item.name,
 				item.initialAttributes,
 				createBlocksFromInnerBlocksTemplate( item.innerBlocks )
 			),
-		];
-	}, [ item.name, item.initialAttributes, item.initialAttributes ] );
+		],
+		[ item.name, item.initialAttributes, item.innerBlocks ]
+	);
 
 	const isSynced =
 		( isReusableBlock( item ) && item.syncStatus !== 'unsynced' ) ||
@@ -55,29 +56,28 @@ function InserterListItem( {
 
 	return (
 		<InserterDraggableBlocks
-			isEnabled={ isDraggable && ! item.disabled }
+			isEnabled={ isDraggable && ! item.isDisabled }
 			blocks={ blocks }
 			icon={ item.icon }
 		>
 			{ ( { draggable, onDragStart, onDragEnd } ) => (
 				<div
-					className={ classnames(
+					className={ clsx(
 						'block-editor-block-types-list__list-item',
-
 						{
 							'is-synced': isSynced,
 						}
 					) }
 					draggable={ draggable }
 					onDragStart={ ( event ) => {
-						isDragging.current = true;
+						isDraggingRef.current = true;
 						if ( onDragStart ) {
 							onHover( null );
 							onDragStart( event );
 						}
 					} }
 					onDragEnd={ ( event ) => {
-						isDragging.current = false;
+						isDraggingRef.current = false;
 						if ( onDragEnd ) {
 							onDragEnd( event );
 						}
@@ -85,7 +85,7 @@ function InserterListItem( {
 				>
 					<InserterListboxItem
 						isFirst={ isFirst }
-						className={ classnames(
+						className={ clsx(
 							'block-editor-block-types-list__item',
 							className
 						) }
@@ -110,7 +110,7 @@ function InserterListItem( {
 							}
 						} }
 						onMouseEnter={ () => {
-							if ( isDragging.current ) {
+							if ( isDraggingRef.current ) {
 								return;
 							}
 							onHover( item );
diff --git a/packages/block-editor/src/components/inserter-list-item/style.scss b/packages/block-editor/src/components/inserter-list-item/style.scss
index fb15113400522b..435f60ed9e2f14 100644
--- a/packages/block-editor/src/components/inserter-list-item/style.scss
+++ b/packages/block-editor/src/components/inserter-list-item/style.scss
@@ -43,7 +43,6 @@
 	cursor: pointer;
 	background: transparent;
 	word-break: break-word;
-	border-radius: $radius-block-ui;
 	transition: all 0.05s ease-in-out;
 	@include reduce-motion("transition");
 	position: relative;
@@ -72,7 +71,7 @@
 				bottom: 0;
 				left: 0;
 				right: 0;
-				border-radius: $radius-block-ui;
+				border-radius: $radius-small;
 				opacity: 0.04;
 				background: var(--wp-admin-theme-color);
 				// This fixes drag-and-drop in Firefox.
@@ -97,7 +96,6 @@
 
 .block-editor-block-types-list__item-icon {
 	padding: 12px 20px;
-	border-radius: $radius-block-ui;
 	color: $gray-900;
 	transition: all 0.05s ease-in-out;
 	@include reduce-motion("transition");
@@ -120,4 +118,5 @@
 .block-editor-block-types-list__item-title {
 	padding: 4px 2px 8px;
 	font-size: 12px;
+	hyphens: auto;
 }
diff --git a/packages/block-editor/src/components/inserter-listbox/index.js b/packages/block-editor/src/components/inserter-listbox/index.js
index 6af26a1d746bfb..bc833b0e4c36b1 100644
--- a/packages/block-editor/src/components/inserter-listbox/index.js
+++ b/packages/block-editor/src/components/inserter-listbox/index.js
@@ -1,28 +1,19 @@
 /**
  * WordPress dependencies
  */
-import { privateApis as componentsPrivateApis } from '@wordpress/components';
+import { Composite } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
-import { unlock } from '../../lock-unlock';
 
 export { default as InserterListboxGroup } from './group';
 export { default as InserterListboxRow } from './row';
 export { default as InserterListboxItem } from './item';
 
-const { CompositeV2: Composite, useCompositeStoreV2: useCompositeStore } =
-	unlock( componentsPrivateApis );
-
 function InserterListbox( { children } ) {
-	const store = useCompositeStore( {
-		focusShift: true,
-		focusWrap: 'horizontal',
-	} );
-
 	return (
-		<Composite store={ store } render={ <></> }>
+		<Composite focusShift focusWrap="horizontal" render={ <></> }>
 			{ children }
 		</Composite>
 	);
diff --git a/packages/block-editor/src/components/inserter-listbox/item.js b/packages/block-editor/src/components/inserter-listbox/item.js
index 951eb86223ce8f..06c266d793d2ff 100644
--- a/packages/block-editor/src/components/inserter-listbox/item.js
+++ b/packages/block-editor/src/components/inserter-listbox/item.js
@@ -1,28 +1,18 @@
 /**
  * WordPress dependencies
  */
-import {
-	Button,
-	privateApis as componentsPrivateApis,
-} from '@wordpress/components';
+import { Button, Composite } from '@wordpress/components';
 import { forwardRef } from '@wordpress/element';
 
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-
-const { CompositeItemV2: CompositeItem } = unlock( componentsPrivateApis );
-
 function InserterListboxItem(
 	{ isFirst, as: Component, children, ...props },
 	ref
 ) {
 	return (
-		<CompositeItem
+		<Composite.Item
 			ref={ ref }
 			role="option"
-			// Use the CompositeItem `accessibleWhenDisabled` prop
+			// Use the Composite.Item `accessibleWhenDisabled` prop
 			// over Button's `isFocusable`. The latter was shown to
 			// cause an issue with tab order in the inserter list.
 			accessibleWhenDisabled
@@ -42,7 +32,11 @@ function InserterListboxItem(
 				if ( typeof children === 'function' ) {
 					return children( propsWithTabIndex );
 				}
-				return <Button { ...propsWithTabIndex }>{ children }</Button>;
+				return (
+					<Button __next40pxDefaultSize { ...propsWithTabIndex }>
+						{ children }
+					</Button>
+				);
 			} }
 		/>
 	);
diff --git a/packages/block-editor/src/components/inserter-listbox/row.js b/packages/block-editor/src/components/inserter-listbox/row.js
index f9827f08b3fa39..bafdbf8f5593c1 100644
--- a/packages/block-editor/src/components/inserter-listbox/row.js
+++ b/packages/block-editor/src/components/inserter-listbox/row.js
@@ -2,17 +2,10 @@
  * WordPress dependencies
  */
 import { forwardRef } from '@wordpress/element';
-import { privateApis as componentsPrivateApis } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-
-const { CompositeGroupV2: CompositeGroup } = unlock( componentsPrivateApis );
+import { Composite } from '@wordpress/components';
 
 function InserterListboxRow( props, ref ) {
-	return <CompositeGroup role="presentation" ref={ ref } { ...props } />;
+	return <Composite.Group role="presentation" ref={ ref } { ...props } />;
 }
 
 export default forwardRef( InserterListboxRow );
diff --git a/packages/block-editor/src/components/inserter/block-patterns-explorer/index.js b/packages/block-editor/src/components/inserter/block-patterns-explorer/index.js
index 82e8a4435b0324..93a03ee200497e 100644
--- a/packages/block-editor/src/components/inserter/block-patterns-explorer/index.js
+++ b/packages/block-editor/src/components/inserter/block-patterns-explorer/index.js
@@ -14,16 +14,11 @@ import { usePatternCategories } from '../block-patterns-tab/use-pattern-categori
 
 function PatternsExplorer( { initialCategory, rootClientId } ) {
 	const [ searchValue, setSearchValue ] = useState( '' );
-	const [ patternSourceFilter, setPatternSourceFilter ] = useState( 'all' );
-
 	const [ selectedCategory, setSelectedCategory ] = useState(
 		initialCategory?.name
 	);
 
-	const patternCategories = usePatternCategories(
-		rootClientId,
-		patternSourceFilter
-	);
+	const patternCategories = usePatternCategories( rootClientId );
 
 	return (
 		<div className="block-editor-block-patterns-explorer">
@@ -33,14 +28,12 @@ function PatternsExplorer( { initialCategory, rootClientId } ) {
 				onClickCategory={ setSelectedCategory }
 				searchValue={ searchValue }
 				setSearchValue={ setSearchValue }
-				patternSourceFilter={ patternSourceFilter }
-				setPatternSourceFilter={ setPatternSourceFilter }
 			/>
 			<PatternList
 				searchValue={ searchValue }
 				selectedCategory={ selectedCategory }
 				patternCategories={ patternCategories }
-				patternSourceFilter={ patternSourceFilter }
+				rootClientId={ rootClientId }
 			/>
 		</div>
 	);
diff --git a/packages/block-editor/src/components/inserter/block-patterns-explorer/pattern-explorer-sidebar.js b/packages/block-editor/src/components/inserter/block-patterns-explorer/pattern-explorer-sidebar.js
index bc5e4d37ab2c28..89384bc0537143 100644
--- a/packages/block-editor/src/components/inserter/block-patterns-explorer/pattern-explorer-sidebar.js
+++ b/packages/block-editor/src/components/inserter/block-patterns-explorer/pattern-explorer-sidebar.js
@@ -15,6 +15,7 @@ function PatternCategoriesList( {
 			{ patternCategories.map( ( { name, label } ) => {
 				return (
 					<Button
+						__next40pxDefaultSize
 						key={ name }
 						label={ label }
 						className={ `${ baseClassName }__categories-list__item` }
@@ -39,7 +40,7 @@ function PatternsExplorerSearch( { searchValue, setSearchValue } ) {
 				__nextHasNoMarginBottom
 				onChange={ setSearchValue }
 				value={ searchValue }
-				label={ __( 'Search for patterns' ) }
+				label={ __( 'Search' ) }
 				placeholder={ __( 'Search' ) }
 			/>
 		</div>
diff --git a/packages/block-editor/src/components/inserter/block-patterns-explorer/pattern-list.js b/packages/block-editor/src/components/inserter/block-patterns-explorer/pattern-list.js
index bf2867be5cdf3c..709e005b587cea 100644
--- a/packages/block-editor/src/components/inserter/block-patterns-explorer/pattern-list.js
+++ b/packages/block-editor/src/components/inserter/block-patterns-explorer/pattern-list.js
@@ -18,7 +18,7 @@ import { searchItems } from '../search-items';
 import BlockPatternsPaging from '../../block-patterns-paging';
 import usePatternsPaging from '../hooks/use-patterns-paging';
 import {
-	PATTERN_TYPES,
+	INSERTER_PATTERN_TYPES,
 	allPatternsCategory,
 	myPatternsCategory,
 } from '../block-patterns-tab/utils';
@@ -31,7 +31,7 @@ function PatternsListHeader( { filterValue, filteredBlockPatternsLength } ) {
 	return (
 		<Heading
 			level={ 2 }
-			lineHeight={ '48px' }
+			lineHeight="48px"
 			className="block-editor-block-patterns-explorer__search-results-count"
 		>
 			{ sprintf(
@@ -47,15 +47,22 @@ function PatternsListHeader( { filterValue, filteredBlockPatternsLength } ) {
 	);
 }
 
-function PatternList( { searchValue, selectedCategory, patternCategories } ) {
+function PatternList( {
+	searchValue,
+	selectedCategory,
+	patternCategories,
+	rootClientId,
+} ) {
 	const container = useRef();
 	const debouncedSpeak = useDebounce( speak, 500 );
 	const [ destinationRootClientId, onInsertBlocks ] = useInsertionPoint( {
+		rootClientId,
 		shouldFocusBlock: true,
 	} );
 	const [ patterns, , onClickPattern ] = usePatternsState(
 		onInsertBlocks,
-		destinationRootClientId
+		destinationRootClientId,
+		selectedCategory
 	);
 
 	const registeredPatternCategories = useMemo(
@@ -73,7 +80,7 @@ function PatternList( { searchValue, selectedCategory, patternCategories } ) {
 			}
 			if (
 				selectedCategory === myPatternsCategory.name &&
-				pattern.type === PATTERN_TYPES.user
+				pattern.type === INSERTER_PATTERN_TYPES.user
 			) {
 				return true;
 			}
diff --git a/packages/block-editor/src/components/inserter/block-patterns-tab/index.js b/packages/block-editor/src/components/inserter/block-patterns-tab/index.js
index 373b96cf569b0c..141ebf8cc84016 100644
--- a/packages/block-editor/src/components/inserter/block-patterns-tab/index.js
+++ b/packages/block-editor/src/components/inserter/block-patterns-tab/index.js
@@ -2,16 +2,10 @@
  * WordPress dependencies
  */
 import { useState } from '@wordpress/element';
-import { __, isRTL } from '@wordpress/i18n';
 import { useViewportMatch } from '@wordpress/compose';
-import {
-	__experimentalItemGroup as ItemGroup,
-	__experimentalItem as Item,
-	__experimentalHStack as HStack,
-	FlexBlock,
-	Button,
-} from '@wordpress/components';
-import { Icon, chevronRight, chevronLeft } from '@wordpress/icons';
+import { Button, Spinner } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -20,92 +14,80 @@ import PatternsExplorerModal from '../block-patterns-explorer';
 import MobileTabNavigation from '../mobile-tab-navigation';
 import { PatternCategoryPreviews } from './pattern-category-previews';
 import { usePatternCategories } from './use-pattern-categories';
+import CategoryTabs from '../category-tabs';
+import InserterNoResults from '../no-results';
+import { store as blockEditorStore } from '../../../store';
+import { unlock } from '../../../lock-unlock';
 
 function BlockPatternsTab( {
 	onSelectCategory,
 	selectedCategory,
 	onInsert,
 	rootClientId,
+	children,
 } ) {
 	const [ showPatternsExplorer, setShowPatternsExplorer ] = useState( false );
 
 	const categories = usePatternCategories( rootClientId );
 
-	const initialCategory = selectedCategory || categories[ 0 ];
 	const isMobile = useViewportMatch( 'medium', '<' );
+	const isResolvingPatterns = useSelect(
+		( select ) =>
+			unlock( select( blockEditorStore ) ).isResolvingPatterns(),
+		[]
+	);
+
+	if ( isResolvingPatterns ) {
+		return (
+			<div className="block-editor-inserter__patterns-loading">
+				<Spinner />
+			</div>
+		);
+	}
+
+	if ( ! categories.length ) {
+		return <InserterNoResults />;
+	}
+
 	return (
 		<>
 			{ ! isMobile && (
 				<div className="block-editor-inserter__block-patterns-tabs-container">
-					<nav
-						aria-label={ __( 'Block pattern categories' ) }
-						className="block-editor-inserter__block-patterns-tabs"
+					<CategoryTabs
+						categories={ categories }
+						selectedCategory={ selectedCategory }
+						onSelectCategory={ onSelectCategory }
+					>
+						{ children }
+					</CategoryTabs>
+					<Button
+						__next40pxDefaultSize
+						className="block-editor-inserter__patterns-explore-button"
+						onClick={ () => setShowPatternsExplorer( true ) }
+						variant="secondary"
 					>
-						<ItemGroup role="list">
-							{ categories.map( ( category ) => (
-								<Item
-									role="listitem"
-									key={ category.name }
-									onClick={ () =>
-										onSelectCategory( category )
-									}
-									className={
-										category === selectedCategory
-											? 'block-editor-inserter__patterns-category block-editor-inserter__patterns-selected-category'
-											: 'block-editor-inserter__patterns-category'
-									}
-									aria-label={ category.label }
-									aria-current={
-										category === selectedCategory
-											? 'true'
-											: undefined
-									}
-								>
-									<HStack>
-										<FlexBlock>
-											{ category.label }
-										</FlexBlock>
-										<Icon
-											icon={
-												isRTL()
-													? chevronLeft
-													: chevronRight
-											}
-										/>
-									</HStack>
-								</Item>
-							) ) }
-							<div role="listitem">
-								<Button
-									className="block-editor-inserter__patterns-explore-button"
-									onClick={ () =>
-										setShowPatternsExplorer( true )
-									}
-									variant="secondary"
-								>
-									{ __( 'Explore all patterns' ) }
-								</Button>
-							</div>
-						</ItemGroup>
-					</nav>
+						{ __( 'Explore all patterns' ) }
+					</Button>
 				</div>
 			) }
 			{ isMobile && (
 				<MobileTabNavigation categories={ categories }>
 					{ ( category ) => (
-						<PatternCategoryPreviews
-							key={ category.name }
-							onInsert={ onInsert }
-							rootClientId={ rootClientId }
-							category={ category }
-							showTitlesAsTooltip={ false }
-						/>
+						<div className="block-editor-inserter__category-panel">
+							<PatternCategoryPreviews
+								key={ category.name }
+								onInsert={ onInsert }
+								rootClientId={ rootClientId }
+								category={ category }
+								showTitlesAsTooltip={ false }
+							/>
+						</div>
 					) }
 				</MobileTabNavigation>
 			) }
 			{ showPatternsExplorer && (
 				<PatternsExplorerModal
-					initialCategory={ initialCategory }
+					initialCategory={ selectedCategory || categories[ 0 ] }
 					patternCategories={ categories }
 					onModalClose={ () => setShowPatternsExplorer( false ) }
 					rootClientId={ rootClientId }
diff --git a/packages/block-editor/src/components/inserter/block-patterns-tab/pattern-category-preview-panel.js b/packages/block-editor/src/components/inserter/block-patterns-tab/pattern-category-preview-panel.js
deleted file mode 100644
index f548a4632eb357..00000000000000
--- a/packages/block-editor/src/components/inserter/block-patterns-tab/pattern-category-preview-panel.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef, useEffect } from '@wordpress/element';
-
-import { focus } from '@wordpress/dom';
-
-/**
- * Internal dependencies
- */
-
-import { PatternCategoryPreviews } from './pattern-category-previews';
-
-export function PatternCategoryPreviewPanel( {
-	rootClientId,
-	onInsert,
-	onHover,
-	category,
-	showTitlesAsTooltip,
-	patternFilter,
-} ) {
-	const container = useRef();
-
-	useEffect( () => {
-		const timeout = setTimeout( () => {
-			const [ firstTabbable ] = focus.tabbable.find( container.current );
-			firstTabbable?.focus();
-		} );
-		return () => clearTimeout( timeout );
-	}, [ category ] );
-
-	return (
-		<div
-			ref={ container }
-			className="block-editor-inserter__patterns-category-dialog"
-		>
-			<PatternCategoryPreviews
-				key={ category.name }
-				rootClientId={ rootClientId }
-				onInsert={ onInsert }
-				onHover={ onHover }
-				category={ category }
-				showTitlesAsTooltip={ showTitlesAsTooltip }
-				patternFilter={ patternFilter }
-			/>
-		</div>
-	);
-}
diff --git a/packages/block-editor/src/components/inserter/block-patterns-tab/pattern-category-previews.js b/packages/block-editor/src/components/inserter/block-patterns-tab/pattern-category-previews.js
index 9e5b6373e54d8c..fcb6c7601fcf7f 100644
--- a/packages/block-editor/src/components/inserter/block-patterns-tab/pattern-category-previews.js
+++ b/packages/block-editor/src/components/inserter/block-patterns-tab/pattern-category-previews.js
@@ -17,6 +17,7 @@ import {
 	__experimentalText as Text,
 	FlexBlock,
 } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -30,8 +31,10 @@ import {
 	isPatternFiltered,
 	allPatternsCategory,
 	myPatternsCategory,
-	PATTERN_TYPES,
+	INSERTER_PATTERN_TYPES,
 } from './utils';
+import { store as blockEditorStore } from '../../../store';
+import { unlock } from '../../../lock-unlock';
 
 const noop = () => {};
 
@@ -42,9 +45,14 @@ export function PatternCategoryPreviews( {
 	category,
 	showTitlesAsTooltip,
 } ) {
+	const isZoomOutMode = useSelect(
+		( select ) => unlock( select( blockEditorStore ) ).isZoomOut(),
+		[]
+	);
 	const [ allPatterns, , onClickPattern ] = usePatternsState(
 		onInsert,
-		rootClientId
+		rootClientId,
+		category?.name
 	);
 	const [ patternSyncFilter, setPatternSyncFilter ] = useState( 'all' );
 	const [ patternSourceFilter, setPatternSourceFilter ] = useState( 'all' );
@@ -70,27 +78,27 @@ export function PatternCategoryPreviews( {
 				if ( category.name === allPatternsCategory.name ) {
 					return true;
 				}
+
 				if (
 					category.name === myPatternsCategory.name &&
-					pattern.type === PATTERN_TYPES.user
+					pattern.type === INSERTER_PATTERN_TYPES.user
 				) {
 					return true;
 				}
-				if ( category.name !== 'uncategorized' ) {
-					return pattern.categories?.includes( category.name );
-				}
 
-				// The uncategorized category should show all the patterns without any category
-				// or with no available category.
-				const availablePatternCategories =
-					pattern.categories?.filter( ( cat ) =>
-						availableCategories.find(
-							( availableCategory ) =>
-								availableCategory.name === cat
-						)
-					) ?? [];
+				if ( category.name === 'uncategorized' ) {
+					// The uncategorized category should show all the patterns without any category...
+					if ( ! pattern.categories ) {
+						return true;
+					}
 
-				return availablePatternCategories.length === 0;
+					// ...or with no available category.
+					return ! pattern.categories.some( ( catName ) =>
+						availableCategories.some( ( c ) => c.name === catName )
+					);
+				}
+
+				return pattern.categories?.includes( category.name );
 			} ),
 		[
 			allPatterns,
@@ -109,7 +117,6 @@ export function PatternCategoryPreviews( {
 	const { changePage } = pagingProps;
 
 	// Hide block pattern preview on unmount.
-	// eslint-disable-next-line react-hooks/exhaustive-deps
 	useEffect( () => () => onHover( null ), [] );
 
 	const onSetPatternSyncFilter = useCallback(
@@ -128,14 +135,19 @@ export function PatternCategoryPreviews( {
 	);
 
 	return (
-		<div className="block-editor-inserter__patterns-category-panel">
+		<>
 			<VStack
 				spacing={ 2 }
 				className="block-editor-inserter__patterns-category-panel-header"
 			>
 				<HStack>
 					<FlexBlock>
-						<Heading level={ 4 } as="div">
+						<Heading
+							className="block-editor-inserter__patterns-category-panel-title"
+							size={ 13 }
+							level={ 4 }
+							as="div"
+						>
 							{ category.label }
 						</Heading>
 					</FlexBlock>
@@ -157,23 +169,33 @@ export function PatternCategoryPreviews( {
 					</Text>
 				) }
 			</VStack>
-
 			{ currentCategoryPatterns.length > 0 && (
-				<BlockPatternsList
-					ref={ scrollContainerRef }
-					shownPatterns={ pagingProps.categoryPatternsAsyncList }
-					blockPatterns={ pagingProps.categoryPatterns }
-					onClickPattern={ onClickPattern }
-					onHover={ onHover }
-					label={ category.label }
-					orientation="vertical"
-					category={ category.name }
-					isDraggable
-					showTitlesAsTooltip={ showTitlesAsTooltip }
-					patternFilter={ patternSourceFilter }
-					pagingProps={ pagingProps }
-				/>
+				<>
+					{ isZoomOutMode && (
+						<Text
+							size="12"
+							as="p"
+							className="block-editor-inserter__help-text"
+						>
+							{ __( 'Drag and drop patterns into the canvas.' ) }
+						</Text>
+					) }
+					<BlockPatternsList
+						ref={ scrollContainerRef }
+						shownPatterns={ pagingProps.categoryPatternsAsyncList }
+						blockPatterns={ pagingProps.categoryPatterns }
+						onClickPattern={ onClickPattern }
+						onHover={ onHover }
+						label={ category.label }
+						orientation="vertical"
+						category={ category.name }
+						isDraggable
+						showTitlesAsTooltip={ showTitlesAsTooltip }
+						patternFilter={ patternSourceFilter }
+						pagingProps={ pagingProps }
+					/>
+				</>
 			) }
-		</div>
+		</>
 	);
 }
diff --git a/packages/block-editor/src/components/inserter/block-patterns-tab/patterns-filter.js b/packages/block-editor/src/components/inserter/block-patterns-tab/patterns-filter.js
index 04a0f27d162dd4..fd7458a52bf331 100644
--- a/packages/block-editor/src/components/inserter/block-patterns-tab/patterns-filter.js
+++ b/packages/block-editor/src/components/inserter/block-patterns-tab/patterns-filter.js
@@ -16,15 +16,37 @@ import { useMemo, createInterpolateElement } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { myPatternsCategory, SYNC_TYPES, PATTERN_TYPES } from './utils';
+import {
+	myPatternsCategory,
+	INSERTER_SYNC_TYPES,
+	INSERTER_PATTERN_TYPES,
+} from './utils';
 
 const getShouldDisableSyncFilter = ( sourceFilter ) =>
-	sourceFilter !== PATTERN_TYPES.all && sourceFilter !== PATTERN_TYPES.user;
-
-const getShouldDisableNonUserSources = ( category ) => {
+	sourceFilter !== 'all' && sourceFilter !== 'user';
+const getShouldHideSourcesFilter = ( category ) => {
 	return category.name === myPatternsCategory.name;
 };
 
+const PATTERN_SOURCE_MENU_OPTIONS = [
+	{
+		value: 'all',
+		label: _x( 'All', 'patterns' ),
+	},
+	{
+		value: INSERTER_PATTERN_TYPES.directory,
+		label: __( 'Pattern Directory' ),
+	},
+	{
+		value: INSERTER_PATTERN_TYPES.theme,
+		label: __( 'Theme & Plugins' ),
+	},
+	{
+		value: INSERTER_PATTERN_TYPES.user,
+		label: __( 'User' ),
+	},
+];
+
 export function PatternsFilter( {
 	setPatternSyncFilter,
 	setPatternSourceFilter,
@@ -39,7 +61,7 @@ export function PatternsFilter( {
 	// this filter themselves.
 	const currentPatternSourceFilter =
 		category.name === myPatternsCategory.name
-			? PATTERN_TYPES.user
+			? INSERTER_PATTERN_TYPES.user
 			: patternSourceFilter;
 
 	// We need to disable the sync filter option if the source filter is not 'all' or 'user'
@@ -48,66 +70,34 @@ export function PatternsFilter( {
 		currentPatternSourceFilter
 	);
 
-	// We also need to disable the directory and theme source filter options if the category
-	// is `myPatterns` otherwise applying them will also just result in no patterns being shown.
-	const shouldDisableNonUserSources =
-		getShouldDisableNonUserSources( category );
+	// We also hide the directory and theme source filter if the category is `myPatterns`
+	// otherwise there will only be one option available.
+	const shouldHideSourcesFilter = getShouldHideSourcesFilter( category );
 
 	const patternSyncMenuOptions = useMemo(
 		() => [
 			{
-				value: SYNC_TYPES.all,
-				label: _x( 'All', 'Option that shows all patterns' ),
+				value: 'all',
+				label: _x( 'All', 'patterns' ),
 			},
 			{
-				value: SYNC_TYPES.full,
-				label: _x(
-					'Synced',
-					'Option that shows all synchronized patterns'
-				),
+				value: INSERTER_SYNC_TYPES.full,
+				label: _x( 'Synced', 'patterns' ),
 				disabled: shouldDisableSyncFilter,
 			},
 			{
-				value: SYNC_TYPES.unsynced,
-				label: _x(
-					'Not synced',
-					'Option that shows all patterns that are not synchronized'
-				),
+				value: INSERTER_SYNC_TYPES.unsynced,
+				label: _x( 'Not synced', 'patterns' ),
 				disabled: shouldDisableSyncFilter,
 			},
 		],
 		[ shouldDisableSyncFilter ]
 	);
 
-	const patternSourceMenuOptions = useMemo(
-		() => [
-			{
-				value: PATTERN_TYPES.all,
-				label: __( 'All' ),
-				disabled: shouldDisableNonUserSources,
-			},
-			{
-				value: PATTERN_TYPES.directory,
-				label: __( 'Pattern Directory' ),
-				disabled: shouldDisableNonUserSources,
-			},
-			{
-				value: PATTERN_TYPES.theme,
-				label: __( 'Theme & Plugins' ),
-				disabled: shouldDisableNonUserSources,
-			},
-			{
-				value: PATTERN_TYPES.user,
-				label: __( 'User' ),
-			},
-		],
-		[ shouldDisableNonUserSources ]
-	);
-
 	function handleSetSourceFilterChange( newSourceFilter ) {
 		setPatternSourceFilter( newSourceFilter );
 		if ( getShouldDisableSyncFilter( newSourceFilter ) ) {
-			setPatternSyncFilter( SYNC_TYPES.all );
+			setPatternSyncFilter( 'all' );
 		}
 	}
 
@@ -117,7 +107,8 @@ export function PatternsFilter( {
 				popoverProps={ {
 					placement: 'right-end',
 				} }
-				label="Filter patterns"
+				label={ __( 'Filter patterns' ) }
+				toggleProps={ { size: 'compact' } }
 				icon={
 					<Icon
 						icon={
@@ -130,7 +121,7 @@ export function PatternsFilter( {
 							>
 								<Path
 									d="M10 17.5H14V16H10V17.5ZM6 6V7.5H18V6H6ZM8 12.5H16V11H8V12.5Z"
-									fill="#1E1E1E"
+									fill="currentColor"
 								/>
 							</SVG>
 						}
@@ -139,19 +130,21 @@ export function PatternsFilter( {
 			>
 				{ () => (
 					<>
-						<MenuGroup label={ __( 'Source' ) }>
-							<MenuItemsChoice
-								choices={ patternSourceMenuOptions }
-								onSelect={ ( value ) => {
-									handleSetSourceFilterChange( value );
-									scrollContainerRef.current?.scrollTo(
-										0,
-										0
-									);
-								} }
-								value={ currentPatternSourceFilter }
-							/>
-						</MenuGroup>
+						{ ! shouldHideSourcesFilter && (
+							<MenuGroup label={ __( 'Source' ) }>
+								<MenuItemsChoice
+									choices={ PATTERN_SOURCE_MENU_OPTIONS }
+									onSelect={ ( value ) => {
+										handleSetSourceFilterChange( value );
+										scrollContainerRef.current?.scrollTo(
+											0,
+											0
+										);
+									} }
+									value={ currentPatternSourceFilter }
+								/>
+							</MenuGroup>
+						) }
 						<MenuGroup label={ __( 'Type' ) }>
 							<MenuItemsChoice
 								choices={ patternSyncMenuOptions }
diff --git a/packages/block-editor/src/components/inserter/block-patterns-tab/use-pattern-categories.js b/packages/block-editor/src/components/inserter/block-patterns-tab/use-pattern-categories.js
index 12e885954f4bf3..cff5fbf3413820 100644
--- a/packages/block-editor/src/components/inserter/block-patterns-tab/use-pattern-categories.js
+++ b/packages/block-editor/src/components/inserter/block-patterns-tab/use-pattern-categories.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useMemo, useCallback } from '@wordpress/element';
+import { useMemo } from '@wordpress/element';
 import { _x, _n, sprintf } from '@wordpress/i18n';
 
 import { speak } from '@wordpress/a11y';
@@ -14,9 +14,19 @@ import {
 	isPatternFiltered,
 	allPatternsCategory,
 	myPatternsCategory,
-	PATTERN_TYPES,
+	INSERTER_PATTERN_TYPES,
 } from './utils';
 
+function hasRegisteredCategory( pattern, allCategories ) {
+	if ( ! pattern.categories || ! pattern.categories.length ) {
+		return false;
+	}
+
+	return pattern.categories.some( ( cat ) =>
+		allCategories.some( ( category ) => category.name === cat )
+	);
+}
+
 export function usePatternCategories( rootClientId, sourceFilter = 'all' ) {
 	const [ patterns, allCategories ] = usePatternsState(
 		undefined,
@@ -34,19 +44,6 @@ export function usePatternCategories( rootClientId, sourceFilter = 'all' ) {
 		[ sourceFilter, patterns ]
 	);
 
-	const hasRegisteredCategory = useCallback(
-		( pattern ) => {
-			if ( ! pattern.categories || ! pattern.categories.length ) {
-				return false;
-			}
-
-			return pattern.categories.some( ( cat ) =>
-				allCategories.some( ( category ) => category.name === cat )
-			);
-		},
-		[ allCategories ]
-	);
-
 	// Remove any empty categories.
 	const populatedCategories = useMemo( () => {
 		const categories = allCategories
@@ -59,7 +56,7 @@ export function usePatternCategories( rootClientId, sourceFilter = 'all' ) {
 
 		if (
 			filteredPatterns.some(
-				( pattern ) => ! hasRegisteredCategory( pattern )
+				( pattern ) => ! hasRegisteredCategory( pattern, allCategories )
 			) &&
 			! categories.find(
 				( category ) => category.name === 'uncategorized'
@@ -72,7 +69,7 @@ export function usePatternCategories( rootClientId, sourceFilter = 'all' ) {
 		}
 		if (
 			filteredPatterns.some(
-				( pattern ) => pattern.type === PATTERN_TYPES.user
+				( pattern ) => pattern.type === INSERTER_PATTERN_TYPES.user
 			)
 		) {
 			categories.unshift( myPatternsCategory );
@@ -95,7 +92,7 @@ export function usePatternCategories( rootClientId, sourceFilter = 'all' ) {
 			)
 		);
 		return categories;
-	}, [ allCategories, filteredPatterns, hasRegisteredCategory ] );
+	}, [ allCategories, filteredPatterns ] );
 
 	return populatedCategories;
 }
diff --git a/packages/block-editor/src/components/inserter/block-patterns-tab/utils.js b/packages/block-editor/src/components/inserter/block-patterns-tab/utils.js
index b1e5a99bbe6dc6..f8ba47f3790e14 100644
--- a/packages/block-editor/src/components/inserter/block-patterns-tab/utils.js
+++ b/packages/block-editor/src/components/inserter/block-patterns-tab/utils.js
@@ -2,26 +2,22 @@
  * WordPress dependencies
  */
 
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 
-export const PATTERN_TYPES = {
-	all: 'all',
-	synced: 'synced',
-	unsynced: 'unsynced',
+export const INSERTER_PATTERN_TYPES = {
 	user: 'user',
 	theme: 'theme',
 	directory: 'directory',
 };
 
-export const SYNC_TYPES = {
-	all: 'all',
+export const INSERTER_SYNC_TYPES = {
 	full: 'fully',
 	unsynced: 'unsynced',
 };
 
 export const allPatternsCategory = {
 	name: 'allPatterns',
-	label: __( 'All' ),
+	label: _x( 'All', 'patterns' ),
 };
 
 export const myPatternsCategory = {
@@ -38,7 +34,7 @@ export function isPatternFiltered( pattern, sourceFilter, syncFilter ) {
 	// If theme source selected, filter out user created patterns and those from
 	// the core patterns directory.
 	if (
-		sourceFilter === PATTERN_TYPES.theme &&
+		sourceFilter === INSERTER_PATTERN_TYPES.theme &&
 		( isUserPattern || isDirectoryPattern )
 	) {
 		return true;
@@ -47,7 +43,7 @@ export function isPatternFiltered( pattern, sourceFilter, syncFilter ) {
 	// If the directory source is selected, filter out user created patterns
 	// and those bundled with the theme.
 	if (
-		sourceFilter === PATTERN_TYPES.directory &&
+		sourceFilter === INSERTER_PATTERN_TYPES.directory &&
 		( isUserPattern || ! isDirectoryPattern )
 	) {
 		return true;
@@ -55,19 +51,22 @@ export function isPatternFiltered( pattern, sourceFilter, syncFilter ) {
 
 	// If user source selected, filter out theme patterns.
 	if (
-		sourceFilter === PATTERN_TYPES.user &&
-		pattern.type !== PATTERN_TYPES.user
+		sourceFilter === INSERTER_PATTERN_TYPES.user &&
+		pattern.type !== INSERTER_PATTERN_TYPES.user
 	) {
 		return true;
 	}
 
 	// Filter by sync status.
-	if ( syncFilter === SYNC_TYPES.full && pattern.syncStatus !== '' ) {
+	if (
+		syncFilter === INSERTER_SYNC_TYPES.full &&
+		pattern.syncStatus !== ''
+	) {
 		return true;
 	}
 
 	if (
-		syncFilter === SYNC_TYPES.unsynced &&
+		syncFilter === INSERTER_SYNC_TYPES.unsynced &&
 		pattern.syncStatus !== 'unsynced' &&
 		isUserPattern
 	) {
diff --git a/packages/block-editor/src/components/inserter/block-types-tab.js b/packages/block-editor/src/components/inserter/block-types-tab.js
index 60e1ff4beb6d54..844d5dd341437e 100644
--- a/packages/block-editor/src/components/inserter/block-types-tab.js
+++ b/packages/block-editor/src/components/inserter/block-types-tab.js
@@ -2,8 +2,8 @@
  * WordPress dependencies
  */
 import { __, _x } from '@wordpress/i18n';
-import { useMemo, useEffect } from '@wordpress/element';
-import { pipe, useAsyncList } from '@wordpress/compose';
+import { useMemo, useEffect, forwardRef } from '@wordpress/element';
+import { useAsyncList } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -13,6 +13,7 @@ import InserterPanel from './panel';
 import useBlockTypesState from './hooks/use-block-types-state';
 import InserterListbox from '../inserter-listbox';
 import { orderBy } from '../../utils/sorting';
+import InserterNoResults from './no-results';
 
 const getBlockNamespace = ( item ) => item.name.split( '/' )[ 0 ];
 
@@ -26,17 +27,15 @@ const MAX_SUGGESTED_ITEMS = 6;
  */
 const EMPTY_ARRAY = [];
 
-export function BlockTypesTab( {
-	rootClientId,
-	onInsert,
+export function BlockTypesTabPanel( {
+	items,
+	collections,
+	categories,
+	onSelectItem,
 	onHover,
 	showMostUsedBlocks,
+	className,
 } ) {
-	const [ items, categories, collections, onSelectItem ] = useBlockTypesState(
-		rootClientId,
-		onInsert
-	);
-
 	const suggestedItems = useMemo( () => {
 		return orderBy( items, 'frecency', 'desc' ).slice(
 			0,
@@ -48,24 +47,6 @@ export function BlockTypesTab( {
 		return items.filter( ( item ) => ! item.category );
 	}, [ items ] );
 
-	const itemsPerCategory = useMemo( () => {
-		return pipe(
-			( itemList ) =>
-				itemList.filter(
-					( item ) => item.category && item.category !== 'reusable'
-				),
-			( itemList ) =>
-				itemList.reduce( ( acc, item ) => {
-					const { category } = item;
-					if ( ! acc[ category ] ) {
-						acc[ category ] = [];
-					}
-					acc[ category ].push( item );
-					return acc;
-				}, {} )
-		)( items );
-	}, [ items ] );
-
 	const itemsPerCollection = useMemo( () => {
 		// Create a new Object to avoid mutating collection.
 		const result = { ...collections };
@@ -103,9 +84,12 @@ export function BlockTypesTab( {
 	);
 
 	return (
-		<InserterListbox>
-			<div>
-				{ showMostUsedBlocks && !! suggestedItems.length && (
+		<div className={ className }>
+			{ showMostUsedBlocks &&
+				// Only show the most used blocks if the total amount of block
+				// is larger than 1 row, otherwise it is not so useful.
+				items.length > 3 &&
+				!! suggestedItems.length && (
 					<InserterPanel title={ _x( 'Most used', 'blocks' ) }>
 						<BlockTypesList
 							items={ suggestedItems }
@@ -116,67 +100,127 @@ export function BlockTypesTab( {
 					</InserterPanel>
 				) }
 
-				{ currentlyRenderedCategories.map( ( category ) => {
-					const categoryItems = itemsPerCategory[ category.slug ];
-					if ( ! categoryItems || ! categoryItems.length ) {
+			{ currentlyRenderedCategories.map( ( category ) => {
+				const categoryItems = items.filter(
+					( item ) => item.category === category.slug
+				);
+				if ( ! categoryItems || ! categoryItems.length ) {
+					return null;
+				}
+				return (
+					<InserterPanel
+						key={ category.slug }
+						title={ category.title }
+						icon={ category.icon }
+					>
+						<BlockTypesList
+							items={ categoryItems }
+							onSelect={ onSelectItem }
+							onHover={ onHover }
+							label={ category.title }
+						/>
+					</InserterPanel>
+				);
+			} ) }
+
+			{ didRenderAllCategories && uncategorizedItems.length > 0 && (
+				<InserterPanel
+					className="block-editor-inserter__uncategorized-blocks-panel"
+					title={ __( 'Uncategorized' ) }
+				>
+					<BlockTypesList
+						items={ uncategorizedItems }
+						onSelect={ onSelectItem }
+						onHover={ onHover }
+						label={ __( 'Uncategorized' ) }
+					/>
+				</InserterPanel>
+			) }
+
+			{ currentlyRenderedCollections.map(
+				( [ namespace, collection ] ) => {
+					const collectionItems = itemsPerCollection[ namespace ];
+					if ( ! collectionItems || ! collectionItems.length ) {
 						return null;
 					}
+
 					return (
 						<InserterPanel
-							key={ category.slug }
-							title={ category.title }
-							icon={ category.icon }
+							key={ namespace }
+							title={ collection.title }
+							icon={ collection.icon }
 						>
 							<BlockTypesList
-								items={ categoryItems }
+								items={ collectionItems }
 								onSelect={ onSelectItem }
 								onHover={ onHover }
-								label={ category.title }
+								label={ collection.title }
 							/>
 						</InserterPanel>
 					);
-				} ) }
+				}
+			) }
+		</div>
+	);
+}
 
-				{ didRenderAllCategories && uncategorizedItems.length > 0 && (
-					<InserterPanel
-						className="block-editor-inserter__uncategorized-blocks-panel"
-						title={ __( 'Uncategorized' ) }
-					>
-						<BlockTypesList
-							items={ uncategorizedItems }
-							onSelect={ onSelectItem }
+export function BlockTypesTab(
+	{ rootClientId, onInsert, onHover, showMostUsedBlocks },
+	ref
+) {
+	const [ items, categories, collections, onSelectItem ] = useBlockTypesState(
+		rootClientId,
+		onInsert
+	);
+
+	if ( ! items.length ) {
+		return <InserterNoResults />;
+	}
+
+	const itemsForCurrentRoot = [];
+	const itemsRemaining = [];
+
+	for ( const item of items ) {
+		// Skip reusable blocks, they moved to the patterns tab.
+		if ( item.category === 'reusable' ) {
+			continue;
+		}
+
+		if ( rootClientId && item.isAllowedInCurrentRoot ) {
+			itemsForCurrentRoot.push( item );
+		} else {
+			itemsRemaining.push( item );
+		}
+	}
+
+	return (
+		<InserterListbox>
+			<div ref={ ref }>
+				{ !! itemsForCurrentRoot.length && (
+					<>
+						<BlockTypesTabPanel
+							items={ itemsForCurrentRoot }
+							categories={ categories }
+							collections={ collections }
+							onSelectItem={ onSelectItem }
 							onHover={ onHover }
-							label={ __( 'Uncategorized' ) }
+							showMostUsedBlocks={ showMostUsedBlocks }
+							className="block-editor-inserter__insertable-blocks-at-selection"
 						/>
-					</InserterPanel>
-				) }
-
-				{ currentlyRenderedCollections.map(
-					( [ namespace, collection ] ) => {
-						const collectionItems = itemsPerCollection[ namespace ];
-						if ( ! collectionItems || ! collectionItems.length ) {
-							return null;
-						}
-
-						return (
-							<InserterPanel
-								key={ namespace }
-								title={ collection.title }
-								icon={ collection.icon }
-							>
-								<BlockTypesList
-									items={ collectionItems }
-									onSelect={ onSelectItem }
-									onHover={ onHover }
-									label={ collection.title }
-								/>
-							</InserterPanel>
-						);
-					}
+					</>
 				) }
+				<BlockTypesTabPanel
+					items={ itemsRemaining }
+					categories={ categories }
+					collections={ collections }
+					onSelectItem={ onSelectItem }
+					onHover={ onHover }
+					showMostUsedBlocks={ showMostUsedBlocks }
+					className="block-editor-inserter__all-blocks"
+				/>
 			</div>
 		</InserterListbox>
 	);
 }
 
-export default BlockTypesTab;
+export default forwardRef( BlockTypesTab );
diff --git a/packages/block-editor/src/components/inserter/block-types-tab.native.js b/packages/block-editor/src/components/inserter/block-types-tab.native.js
index e6108b95d60c37..e92efde21b1388 100644
--- a/packages/block-editor/src/components/inserter/block-types-tab.native.js
+++ b/packages/block-editor/src/components/inserter/block-types-tab.native.js
@@ -18,7 +18,8 @@ const getBlockNamespace = ( item ) => item.name.split( '/' )[ 0 ];
 function BlockTypesTab( { onSelect, rootClientId, listProps } ) {
 	const [ rawBlockTypes, , collections ] = useBlockTypesState(
 		rootClientId,
-		onSelect
+		onSelect,
+		true
 	);
 	const clipboardBlock = useClipboardBlock( rootClientId );
 	const filteredBlockTypes = filterInserterItems( rawBlockTypes );
diff --git a/packages/block-editor/src/components/inserter/category-tabs/index.js b/packages/block-editor/src/components/inserter/category-tabs/index.js
new file mode 100644
index 00000000000000..2641e2a20c40f6
--- /dev/null
+++ b/packages/block-editor/src/components/inserter/category-tabs/index.js
@@ -0,0 +1,96 @@
+/**
+ * WordPress dependencies
+ */
+import { usePrevious, useReducedMotion } from '@wordpress/compose';
+import {
+	privateApis as componentsPrivateApis,
+	__unstableMotion as motion,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../../lock-unlock';
+
+const { Tabs } = unlock( componentsPrivateApis );
+
+function CategoryTabs( {
+	categories,
+	selectedCategory,
+	onSelectCategory,
+	children,
+} ) {
+	// Copied from InterfaceSkeleton.
+	const ANIMATION_DURATION = 0.25;
+	const disableMotion = useReducedMotion();
+	const defaultTransition = {
+		type: 'tween',
+		duration: disableMotion ? 0 : ANIMATION_DURATION,
+		ease: [ 0.6, 0, 0.4, 1 ],
+	};
+
+	const previousSelectedCategory = usePrevious( selectedCategory );
+
+	return (
+		<Tabs
+			selectOnMove={ false }
+			selectedTabId={ selectedCategory ? selectedCategory.name : null }
+			orientation="vertical"
+			onSelect={ ( categoryId ) => {
+				// Pass the full category object
+				onSelectCategory(
+					categories.find(
+						( category ) => category.name === categoryId
+					)
+				);
+			} }
+		>
+			<Tabs.TabList className="block-editor-inserter__category-tablist">
+				{ categories.map( ( category ) => (
+					<Tabs.Tab
+						key={ category.name }
+						tabId={ category.name }
+						aria-label={ category.label }
+						aria-current={
+							category === selectedCategory ? 'true' : undefined
+						}
+					>
+						{ category.label }
+					</Tabs.Tab>
+				) ) }
+			</Tabs.TabList>
+			{ categories.map( ( category ) => (
+				<Tabs.TabPanel
+					key={ category.name }
+					tabId={ category.name }
+					focusable={ false }
+				>
+					<motion.div
+						className="block-editor-inserter__category-panel"
+						initial={
+							! previousSelectedCategory ? 'closed' : 'open'
+						}
+						animate="open"
+						variants={ {
+							open: {
+								transform: 'translateX( 0 )',
+								transitionEnd: {
+									zIndex: '1',
+								},
+							},
+							closed: {
+								transform: 'translateX( -100% )',
+								zIndex: '-1',
+							},
+						} }
+						transition={ defaultTransition }
+					>
+						{ children }
+					</motion.div>
+				</Tabs.TabPanel>
+			) ) }
+		</Tabs>
+	);
+}
+
+export default CategoryTabs;
diff --git a/packages/block-editor/src/components/inserter/hooks/use-block-types-state.js b/packages/block-editor/src/components/inserter/hooks/use-block-types-state.js
index 2faa5036327831..6f11060c75c494 100644
--- a/packages/block-editor/src/components/inserter/hooks/use-block-types-state.js
+++ b/packages/block-editor/src/components/inserter/hooks/use-block-types-state.js
@@ -2,46 +2,81 @@
  * WordPress dependencies
  */
 import {
+	getBlockType,
 	createBlock,
 	createBlocksFromInnerBlocksTemplate,
 	store as blocksStore,
 	parse,
 } from '@wordpress/blocks';
-import { useSelect } from '@wordpress/data';
-import { useCallback } from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useCallback, useMemo } from '@wordpress/element';
+import { store as noticesStore } from '@wordpress/notices';
+import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../../store';
+import { isFiltered } from '../../../store/utils';
+import { unlock } from '../../../lock-unlock';
 
 /**
  * Retrieves the block types inserter state.
  *
  * @param {string=}  rootClientId Insertion's root client ID.
  * @param {Function} onInsert     function called when inserter a list of blocks.
+ * @param {boolean}  isQuick
  * @return {Array} Returns the block types state. (block types, categories, collections, onSelect handler)
  */
-const useBlockTypesState = ( rootClientId, onInsert ) => {
-	const { categories, collections, items } = useSelect(
-		( select ) => {
-			const { getInserterItems } = select( blockEditorStore );
-			const { getCategories, getCollections } = select( blocksStore );
-
-			return {
-				categories: getCategories(),
-				collections: getCollections(),
-				items: getInserterItems( rootClientId ),
-			};
-		},
-		[ rootClientId ]
+const useBlockTypesState = ( rootClientId, onInsert, isQuick ) => {
+	const options = useMemo(
+		() => ( { [ isFiltered ]: !! isQuick } ),
+		[ isQuick ]
+	);
+	const [ items ] = useSelect(
+		( select ) => [
+			select( blockEditorStore ).getInserterItems(
+				rootClientId,
+				options
+			),
+		],
+		[ rootClientId, options ]
+	);
+	const { getClosestAllowedInsertionPoint } = unlock(
+		useSelect( blockEditorStore )
 	);
+	const { createErrorNotice } = useDispatch( noticesStore );
+
+	const [ categories, collections ] = useSelect( ( select ) => {
+		const { getCategories, getCollections } = select( blocksStore );
+		return [ getCategories(), getCollections() ];
+	}, [] );
 
 	const onSelectItem = useCallback(
 		(
 			{ name, initialAttributes, innerBlocks, syncStatus, content },
 			shouldFocusBlock
 		) => {
+			const destinationClientId = getClosestAllowedInsertionPoint(
+				name,
+				rootClientId
+			);
+			if ( destinationClientId === null ) {
+				const title = getBlockType( name )?.title ?? name;
+				createErrorNotice(
+					sprintf(
+						/* translators: %s: block pattern title. */
+						__( 'Block "%s" can\'t be inserted.' ),
+						title
+					),
+					{
+						type: 'snackbar',
+						id: 'inserter-notice',
+					}
+				);
+				return;
+			}
+
 			const insertedBlock =
 				syncStatus === 'unsynced'
 					? parse( content, {
@@ -52,10 +87,14 @@ const useBlockTypesState = ( rootClientId, onInsert ) => {
 							initialAttributes,
 							createBlocksFromInnerBlocksTemplate( innerBlocks )
 					  );
-
-			onInsert( insertedBlock, undefined, shouldFocusBlock );
+			onInsert(
+				insertedBlock,
+				undefined,
+				shouldFocusBlock,
+				destinationClientId
+			);
 		},
-		[ onInsert ]
+		[ onInsert, getClosestAllowedInsertionPoint, rootClientId ]
 	);
 
 	return [ items, categories, collections, onSelectItem ];
diff --git a/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js b/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js
index 8252de58b49d51..de814152c620b0 100644
--- a/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js
+++ b/packages/block-editor/src/components/inserter/hooks/use-insertion-point.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useRegistry, useSelect } from '@wordpress/data';
 import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';
 import { _n, sprintf } from '@wordpress/i18n';
 import { speak } from '@wordpress/a11y';
@@ -11,6 +11,35 @@ import { useCallback } from '@wordpress/element';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../../store';
+import { unlock } from '../../../lock-unlock';
+
+function getIndex( {
+	destinationRootClientId,
+	destinationIndex,
+	rootClientId,
+	registry,
+} ) {
+	if ( rootClientId === destinationRootClientId ) {
+		return destinationIndex;
+	}
+	const parents = [
+		'',
+		...registry
+			.select( blockEditorStore )
+			.getBlockParents( destinationRootClientId ),
+		destinationRootClientId,
+	];
+	const parentIndex = parents.indexOf( rootClientId );
+	if ( parentIndex !== -1 ) {
+		return (
+			registry
+				.select( blockEditorStore )
+				.getBlockIndex( parents[ parentIndex + 1 ] ) + 1
+		);
+	}
+	return registry.select( blockEditorStore ).getBlockOrder( rootClientId )
+		.length;
+}
 
 /**
  * @typedef WPInserterConfig
@@ -41,7 +70,12 @@ function useInsertionPoint( {
 	shouldFocusBlock = true,
 	selectBlockOnInsert = true,
 } ) {
-	const { getSelectedBlock } = useSelect( blockEditorStore );
+	const registry = useRegistry();
+	const {
+		getSelectedBlock,
+		getClosestAllowedInsertionPoint,
+		isBlockInsertionPointVisible,
+	} = unlock( useSelect( blockEditorStore ) );
 	const { destinationRootClientId, destinationIndex } = useSelect(
 		( select ) => {
 			const {
@@ -49,15 +83,24 @@ function useInsertionPoint( {
 				getBlockRootClientId,
 				getBlockIndex,
 				getBlockOrder,
-			} = select( blockEditorStore );
+				getInsertionPoint,
+			} = unlock( select( blockEditorStore ) );
 			const selectedBlockClientId = getSelectedBlockClientId();
-
 			let _destinationRootClientId = rootClientId;
 			let _destinationIndex;
+			const insertionPoint = getInsertionPoint();
 
 			if ( insertionIndex !== undefined ) {
 				// Insert into a specific index.
 				_destinationIndex = insertionIndex;
+			} else if (
+				insertionPoint &&
+				insertionPoint.hasOwnProperty( 'index' )
+			) {
+				_destinationRootClientId = insertionPoint?.rootClientId
+					? insertionPoint.rootClientId
+					: rootClientId;
+				_destinationIndex = insertionPoint.index;
 			} else if ( clientId ) {
 				// Insert after a specific client ID.
 				_destinationIndex = getBlockIndex( clientId );
@@ -86,10 +129,23 @@ function useInsertionPoint( {
 		insertBlocks,
 		showInsertionPoint,
 		hideInsertionPoint,
-	} = useDispatch( blockEditorStore );
+		setLastFocus,
+	} = unlock( useDispatch( blockEditorStore ) );
 
 	const onInsertBlocks = useCallback(
-		( blocks, meta, shouldForceFocusBlock = false ) => {
+		( blocks, meta, shouldForceFocusBlock = false, _rootClientId ) => {
+			// When we are trying to move focus or select a new block on insert, we also
+			// need to clear the last focus to avoid the focus being set to the wrong block
+			// when tabbing back into the canvas if the block was added from outside the
+			// editor canvas.
+			if (
+				shouldForceFocusBlock ||
+				shouldFocusBlock ||
+				selectBlockOnInsert
+			) {
+				setLastFocus( null );
+			}
+
 			const selectedBlock = getSelectedBlock();
 
 			if (
@@ -107,8 +163,17 @@ function useInsertionPoint( {
 			} else {
 				insertBlocks(
 					blocks,
-					destinationIndex,
-					destinationRootClientId,
+					isAppender || _rootClientId === undefined
+						? destinationIndex
+						: getIndex( {
+								destinationRootClientId,
+								destinationIndex,
+								rootClientId: _rootClientId,
+								registry,
+						  } ),
+					isAppender || _rootClientId === undefined
+						? destinationRootClientId
+						: _rootClientId,
 					selectBlockOnInsert,
 					shouldFocusBlock || shouldForceFocusBlock ? 0 : null,
 					meta
@@ -140,14 +205,31 @@ function useInsertionPoint( {
 	);
 
 	const onToggleInsertionPoint = useCallback(
-		( show ) => {
-			if ( show ) {
-				showInsertionPoint( destinationRootClientId, destinationIndex );
+		( item ) => {
+			if ( item && ! isBlockInsertionPointVisible() ) {
+				const allowedDestinationRootClientId =
+					getClosestAllowedInsertionPoint(
+						item.name,
+						destinationRootClientId
+					);
+				if ( allowedDestinationRootClientId !== null ) {
+					showInsertionPoint(
+						allowedDestinationRootClientId,
+						getIndex( {
+							destinationRootClientId,
+							destinationIndex,
+							rootClientId: allowedDestinationRootClientId,
+							registry,
+						} )
+					);
+				}
 			} else {
 				hideInsertionPoint();
 			}
 		},
 		[
+			getClosestAllowedInsertionPoint,
+			isBlockInsertionPointVisible,
 			showInsertionPoint,
 			hideInsertionPoint,
 			destinationRootClientId,
diff --git a/packages/block-editor/src/components/inserter/hooks/use-patterns-state.js b/packages/block-editor/src/components/inserter/hooks/use-patterns-state.js
index 576768c76abca9..91b34c0ec72c3d 100644
--- a/packages/block-editor/src/components/inserter/hooks/use-patterns-state.js
+++ b/packages/block-editor/src/components/inserter/hooks/use-patterns-state.js
@@ -11,32 +11,52 @@ import { store as noticesStore } from '@wordpress/notices';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../../store';
-import { PATTERN_TYPES } from '../block-patterns-tab/utils';
+import { unlock } from '../../../lock-unlock';
+import { INSERTER_PATTERN_TYPES } from '../block-patterns-tab/utils';
+import { isFiltered } from '../../../store/utils';
 
 /**
  * Retrieves the block patterns inserter state.
  *
- * @param {Function} onInsert     function called when inserter a list of blocks.
- * @param {string=}  rootClientId Insertion's root client ID.
+ * @param {Function} onInsert         function called when inserter a list of blocks.
+ * @param {string=}  rootClientId     Insertion's root client ID.
+ * @param {string}   selectedCategory The selected pattern category.
+ * @param {boolean}  isQuick          For the quick inserter render only allowed patterns.
  *
  * @return {Array} Returns the patterns state. (patterns, categories, onSelect handler)
  */
-const usePatternsState = ( onInsert, rootClientId ) => {
+const usePatternsState = (
+	onInsert,
+	rootClientId,
+	selectedCategory,
+	isQuick
+) => {
+	const options = useMemo(
+		() => ( { [ isFiltered ]: !! isQuick } ),
+		[ isQuick ]
+	);
 	const { patternCategories, patterns, userPatternCategories } = useSelect(
 		( select ) => {
-			const { __experimentalGetAllowedPatterns, getSettings } =
-				select( blockEditorStore );
+			const { getSettings, __experimentalGetAllowedPatterns } = unlock(
+				select( blockEditorStore )
+			);
 			const {
 				__experimentalUserPatternCategories,
 				__experimentalBlockPatternCategories,
 			} = getSettings();
 			return {
-				patterns: __experimentalGetAllowedPatterns( rootClientId ),
+				patterns: __experimentalGetAllowedPatterns(
+					rootClientId,
+					options
+				),
 				userPatternCategories: __experimentalUserPatternCategories,
 				patternCategories: __experimentalBlockPatternCategories,
 			};
 		},
-		[ rootClientId ]
+		[ rootClientId, options ]
+	);
+	const { getClosestAllowedInsertionPointForPattern } = unlock(
+		useSelect( blockEditorStore )
 	);
 
 	const allCategories = useMemo( () => {
@@ -57,14 +77,37 @@ const usePatternsState = ( onInsert, rootClientId ) => {
 	const { createSuccessNotice } = useDispatch( noticesStore );
 	const onClickPattern = useCallback(
 		( pattern, blocks ) => {
+			const destinationRootClientId = isQuick
+				? rootClientId
+				: getClosestAllowedInsertionPointForPattern(
+						pattern,
+						rootClientId
+				  );
+			if ( destinationRootClientId === null ) {
+				return;
+			}
 			const patternBlocks =
-				pattern.type === PATTERN_TYPES.user &&
+				pattern.type === INSERTER_PATTERN_TYPES.user &&
 				pattern.syncStatus !== 'unsynced'
 					? [ createBlock( 'core/block', { ref: pattern.id } ) ]
 					: blocks;
 			onInsert(
-				( patternBlocks ?? [] ).map( ( block ) => cloneBlock( block ) ),
-				pattern.name
+				( patternBlocks ?? [] ).map( ( block ) => {
+					const clonedBlock = cloneBlock( block );
+					if (
+						clonedBlock.attributes.metadata?.categories?.includes(
+							selectedCategory
+						)
+					) {
+						clonedBlock.attributes.metadata.categories = [
+							selectedCategory,
+						];
+					}
+					return clonedBlock;
+				} ),
+				pattern.name,
+				false,
+				destinationRootClientId
 			);
 			createSuccessNotice(
 				sprintf(
@@ -74,11 +117,18 @@ const usePatternsState = ( onInsert, rootClientId ) => {
 				),
 				{
 					type: 'snackbar',
-					id: 'block-pattern-inserted-notice',
+					id: 'inserter-notice',
 				}
 			);
 		},
-		[ createSuccessNotice, onInsert ]
+		[
+			createSuccessNotice,
+			onInsert,
+			selectedCategory,
+			rootClientId,
+			getClosestAllowedInsertionPointForPattern,
+			isQuick,
+		]
 	);
 
 	return [ patterns, allCategories, onClickPattern ];
diff --git a/packages/block-editor/src/components/inserter/index.js b/packages/block-editor/src/components/inserter/index.js
index c048ee7b3b138c..1af81d0231a1a8 100644
--- a/packages/block-editor/src/components/inserter/index.js
+++ b/packages/block-editor/src/components/inserter/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -9,7 +9,7 @@ import classnames from 'classnames';
 import { speak } from '@wordpress/a11y';
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { Dropdown, Button } from '@wordpress/components';
-import { forwardRef, Component } from '@wordpress/element';
+import { Component } from '@wordpress/element';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose, ifCondition } from '@wordpress/compose';
 import { createBlock, store as blocksStore } from '@wordpress/blocks';
@@ -76,7 +76,7 @@ const defaultRenderToggle = ( {
 	);
 };
 
-class PrivateInserter extends Component {
+class Inserter extends Component {
 	constructor() {
 		super( ...arguments );
 
@@ -186,7 +186,6 @@ class PrivateInserter extends Component {
 				clientId={ clientId }
 				isAppender={ isAppender }
 				showInserterHelpPanel={ showInserterHelpPanel }
-				prioritizePatterns={ prioritizePatterns }
 			/>
 		);
 	}
@@ -208,10 +207,9 @@ class PrivateInserter extends Component {
 		return (
 			<Dropdown
 				className="block-editor-inserter"
-				contentClassName={ classnames(
-					'block-editor-inserter__popover',
-					{ 'is-quick': isQuick }
-				) }
+				contentClassName={ clsx( 'block-editor-inserter__popover', {
+					'is-quick': isQuick,
+				} ) }
 				popoverProps={ { position, shift: true } }
 				onToggle={ this.onToggle }
 				expandOnMobile
@@ -224,7 +222,7 @@ class PrivateInserter extends Component {
 	}
 }
 
-export const ComposedPrivateInserter = compose( [
+export default compose( [
 	withSelect(
 		( select, { clientId, rootClientId, shouldDirectInsert = true } ) => {
 			const {
@@ -420,10 +418,4 @@ export const ComposedPrivateInserter = compose( [
 		( { hasItems, isAppender, rootClientId, clientId } ) =>
 			hasItems || ( ! isAppender && ! rootClientId && ! clientId )
 	),
-] )( PrivateInserter );
-
-const Inserter = forwardRef( ( props, ref ) => {
-	return <ComposedPrivateInserter ref={ ref } { ...props } />;
-} );
-
-export default Inserter;
+] )( Inserter );
diff --git a/packages/block-editor/src/components/inserter/library.js b/packages/block-editor/src/components/inserter/library.js
index 3a814638c2f48e..4e10a051996a9f 100644
--- a/packages/block-editor/src/components/inserter/library.js
+++ b/packages/block-editor/src/components/inserter/library.js
@@ -7,7 +7,7 @@ import { forwardRef } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import InserterMenu from './menu';
+import { PrivateInserterMenu } from './menu';
 import { store as blockEditorStore } from '../../store';
 
 const noop = () => {};
@@ -20,31 +20,30 @@ function InserterLibrary(
 		showInserterHelpPanel,
 		showMostUsedBlocks = false,
 		__experimentalInsertionIndex,
+		__experimentalInitialTab,
+		__experimentalInitialCategory,
 		__experimentalFilterValue,
+		onPatternCategorySelection,
 		onSelect = noop,
 		shouldFocusBlock = false,
+		onClose,
 	},
 	ref
 ) {
-	const { destinationRootClientId, prioritizePatterns } = useSelect(
+	const { destinationRootClientId } = useSelect(
 		( select ) => {
-			const { getBlockRootClientId, getSettings } =
-				select( blockEditorStore );
-
+			const { getBlockRootClientId } = select( blockEditorStore );
 			const _rootClientId =
 				rootClientId || getBlockRootClientId( clientId ) || undefined;
 			return {
 				destinationRootClientId: _rootClientId,
-				prioritizePatterns:
-					getSettings().__experimentalPreferPatternsOnRoot &&
-					! _rootClientId,
 			};
 		},
 		[ clientId, rootClientId ]
 	);
 
 	return (
-		<InserterMenu
+		<PrivateInserterMenu
 			onSelect={ onSelect }
 			rootClientId={ destinationRootClientId }
 			clientId={ clientId }
@@ -53,11 +52,26 @@ function InserterLibrary(
 			showMostUsedBlocks={ showMostUsedBlocks }
 			__experimentalInsertionIndex={ __experimentalInsertionIndex }
 			__experimentalFilterValue={ __experimentalFilterValue }
+			onPatternCategorySelection={ onPatternCategorySelection }
+			__experimentalInitialTab={ __experimentalInitialTab }
+			__experimentalInitialCategory={ __experimentalInitialCategory }
 			shouldFocusBlock={ shouldFocusBlock }
-			prioritizePatterns={ prioritizePatterns }
+			ref={ ref }
+			onClose={ onClose }
+		/>
+	);
+}
+
+export const PrivateInserterLibrary = forwardRef( InserterLibrary );
+
+function PublicInserterLibrary( props, ref ) {
+	return (
+		<PrivateInserterLibrary
+			{ ...props }
+			onPatternCategorySelection={ undefined }
 			ref={ ref }
 		/>
 	);
 }
 
-export default forwardRef( InserterLibrary );
+export default forwardRef( PublicInserterLibrary );
diff --git a/packages/block-editor/src/components/inserter/media-tab/hooks.js b/packages/block-editor/src/components/inserter/media-tab/hooks.js
index 3a4c8fa9da7df5..694b321832422a 100644
--- a/packages/block-editor/src/components/inserter/media-tab/hooks.js
+++ b/packages/block-editor/src/components/inserter/media-tab/hooks.js
@@ -31,18 +31,18 @@ export function useMediaResults( category, query = {} ) {
 	// In the future we could use AbortController to cancel previous
 	// requests, but we don't for now as it involves adding support
 	// for this to `core-data` package.
-	const lastRequest = useRef();
+	const lastRequestRef = useRef();
 	useEffect( () => {
 		( async () => {
 			const key = JSON.stringify( {
 				category: category.name,
 				...query,
 			} );
-			lastRequest.current = key;
+			lastRequestRef.current = key;
 			setIsLoading( true );
 			setMediaList( [] ); // Empty the previous results.
 			const _media = await category.fetch?.( query );
-			if ( key === lastRequest.current ) {
+			if ( key === lastRequestRef.current ) {
 				setMediaList( _media );
 				setIsLoading( false );
 			}
diff --git a/packages/block-editor/src/components/inserter/media-tab/index.js b/packages/block-editor/src/components/inserter/media-tab/index.js
index 6e4c518ff63b5e..2a44fd922f5239 100644
--- a/packages/block-editor/src/components/inserter/media-tab/index.js
+++ b/packages/block-editor/src/components/inserter/media-tab/index.js
@@ -1,3 +1,3 @@
 export { default as MediaTab } from './media-tab';
-export { MediaCategoryDialog } from './media-panel';
+export { MediaCategoryPanel } from './media-panel';
 export { useMediaCategories } from './hooks';
diff --git a/packages/block-editor/src/components/inserter/media-tab/media-list.js b/packages/block-editor/src/components/inserter/media-tab/media-list.js
index bfc858bc8c4de7..73f38cfc306fbc 100644
--- a/packages/block-editor/src/components/inserter/media-tab/media-list.js
+++ b/packages/block-editor/src/components/inserter/media-tab/media-list.js
@@ -1,17 +1,13 @@
 /**
  * WordPress dependencies
  */
-import { privateApis as componentsPrivateApis } from '@wordpress/components';
+import { Composite } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { MediaPreview } from './media-preview';
-import { unlock } from '../../../lock-unlock';
-
-const { CompositeV2: Composite, useCompositeStoreV2: useCompositeStore } =
-	unlock( componentsPrivateApis );
 
 function MediaList( {
 	mediaList,
@@ -19,10 +15,8 @@ function MediaList( {
 	onClick,
 	label = __( 'Media List' ),
 } ) {
-	const compositeStore = useCompositeStore();
 	return (
 		<Composite
-			store={ compositeStore }
 			role="listbox"
 			className="block-editor-inserter__media-list"
 			aria-label={ label }
diff --git a/packages/block-editor/src/components/inserter/media-tab/media-panel.js b/packages/block-editor/src/components/inserter/media-tab/media-panel.js
index 49601c9c8ad1bc..cc19403f9d9473 100644
--- a/packages/block-editor/src/components/inserter/media-tab/media-panel.js
+++ b/packages/block-editor/src/components/inserter/media-tab/media-panel.js
@@ -1,9 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useRef, useEffect } from '@wordpress/element';
 import { Spinner, SearchControl } from '@wordpress/components';
-import { focus } from '@wordpress/dom';
 import { __ } from '@wordpress/i18n';
 import { useDebouncedInput } from '@wordpress/compose';
 
@@ -16,26 +14,6 @@ import InserterNoResults from '../no-results';
 
 const INITIAL_MEDIA_ITEMS_PER_PAGE = 10;
 
-export function MediaCategoryDialog( { rootClientId, onInsert, category } ) {
-	const container = useRef();
-	useEffect( () => {
-		const timeout = setTimeout( () => {
-			const [ firstTabbable ] = focus.tabbable.find( container.current );
-			firstTabbable?.focus();
-		} );
-		return () => clearTimeout( timeout );
-	}, [ category ] );
-	return (
-		<div ref={ container } className="block-editor-inserter__media-dialog">
-			<MediaCategoryPanel
-				rootClientId={ rootClientId }
-				onInsert={ onInsert }
-				category={ category }
-			/>
-		</div>
-	);
-}
-
 export function MediaCategoryPanel( { rootClientId, onInsert, category } ) {
 	const [ search, setSearch, debouncedSearch ] = useDebouncedInput();
 	const { mediaList, isLoading } = useMediaResults( category, {
@@ -47,6 +25,7 @@ export function MediaCategoryPanel( { rootClientId, onInsert, category } ) {
 	return (
 		<div className={ baseCssClass }>
 			<SearchControl
+				__nextHasNoMarginBottom
 				className={ `${ baseCssClass }-search` }
 				onChange={ setSearch }
 				value={ search }
diff --git a/packages/block-editor/src/components/inserter/media-tab/media-preview.js b/packages/block-editor/src/components/inserter/media-tab/media-preview.js
index 9efed229f0adf2..319c25c01831c8 100644
--- a/packages/block-editor/src/components/inserter/media-tab/media-preview.js
+++ b/packages/block-editor/src/components/inserter/media-tab/media-preview.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -16,7 +16,7 @@ import {
 	Flex,
 	FlexItem,
 	Button,
-	privateApis as componentsPrivateApis,
+	Composite,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
@@ -26,6 +26,7 @@ import { moreVertical, external } from '@wordpress/icons';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
 import { isBlobURL } from '@wordpress/blob';
+import { getFilename } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -33,7 +34,6 @@ import { isBlobURL } from '@wordpress/blob';
 import InserterDraggableBlocks from '../../inserter-draggable-blocks';
 import { getBlockAndPreviewFromMedia } from './utils';
 import { store as blockEditorStore } from '../../../store';
-import { unlock } from '../../../lock-unlock';
 
 const ALLOWED_MEDIA_TYPES = [ 'image' ];
 const MAXIMUM_TITLE_LENGTH = 25;
@@ -43,8 +43,6 @@ const MEDIA_OPTIONS_POPOVER_PROPS = {
 		'block-editor-inserter__media-list__item-preview-options__popover',
 };
 
-const { CompositeItemV2: CompositeItem } = unlock( componentsPrivateApis );
-
 function MediaPreviewOptions( { category, media } ) {
 	if ( ! category.getReportUrl ) {
 		return null;
@@ -102,12 +100,20 @@ function InsertExternalImageModal( { onClose, onSubmit } ) {
 				expanded={ false }
 			>
 				<FlexItem>
-					<Button variant="tertiary" onClick={ onClose }>
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ onClose }
+					>
 						{ __( 'Cancel' ) }
 					</Button>
 				</FlexItem>
 				<FlexItem>
-					<Button variant="primary" onClick={ onSubmit }>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						onClick={ onSubmit }
+					>
 						{ __( 'Insert' ) }
 					</Button>
 				</FlexItem>
@@ -127,23 +133,32 @@ export function MediaPreview( { media, onClick, category } ) {
 	);
 	const { createErrorNotice, createSuccessNotice } =
 		useDispatch( noticesStore );
-	const mediaUpload = useSelect(
-		( select ) => select( blockEditorStore ).getSettings().mediaUpload,
-		[]
-	);
+	const { getSettings, getBlock } = useSelect( blockEditorStore );
+	const { updateBlockAttributes } = useDispatch( blockEditorStore );
+
 	const onMediaInsert = useCallback(
 		( previewBlock ) => {
 			// Prevent multiple uploads when we're in the process of inserting.
 			if ( isInserting ) {
 				return;
 			}
+
+			const settings = getSettings();
 			const clonedBlock = cloneBlock( previewBlock );
 			const { id, url, caption } = clonedBlock.attributes;
+
+			// User has no permission to upload media.
+			if ( ! id && ! settings.mediaUpload ) {
+				setShowExternalUploadModal( true );
+				return;
+			}
+
 			// Media item already exists in library, so just insert it.
 			if ( !! id ) {
 				onClick( clonedBlock );
 				return;
 			}
+
 			setIsInserting( true );
 			// Media item does not exist in library, so try to upload it.
 			// Fist fetch the image data. This may fail if the image host
@@ -154,30 +169,51 @@ export function MediaPreview( { media, onClick, category } ) {
 				.fetch( url )
 				.then( ( response ) => response.blob() )
 				.then( ( blob ) => {
-					mediaUpload( {
-						filesList: [ blob ],
+					const fileName = getFilename( url ) || 'image.jpg';
+					const file = new File( [ blob ], fileName, {
+						type: blob.type,
+					} );
+
+					settings.mediaUpload( {
+						filesList: [ file ],
 						additionalData: { caption },
 						onFileChange( [ img ] ) {
 							if ( isBlobURL( img.url ) ) {
 								return;
 							}
-							onClick( {
-								...clonedBlock,
-								attributes: {
+
+							if ( ! getBlock( clonedBlock.clientId ) ) {
+								// Ensure the block is only inserted once.
+								onClick( {
+									...clonedBlock,
+									attributes: {
+										...clonedBlock.attributes,
+										id: img.id,
+										url: img.url,
+									},
+								} );
+
+								createSuccessNotice(
+									__( 'Image uploaded and inserted.' ),
+									{ type: 'snackbar', id: 'inserter-notice' }
+								);
+							} else {
+								// For subsequent calls, update the existing block.
+								updateBlockAttributes( clonedBlock.clientId, {
 									...clonedBlock.attributes,
 									id: img.id,
 									url: img.url,
-								},
-							} );
-							createSuccessNotice(
-								__( 'Image uploaded and inserted.' ),
-								{ type: 'snackbar' }
-							);
+								} );
+							}
+
 							setIsInserting( false );
 						},
 						allowedTypes: ALLOWED_MEDIA_TYPES,
 						onError( message ) {
-							createErrorNotice( message, { type: 'snackbar' } );
+							createErrorNotice( message, {
+								type: 'snackbar',
+								id: 'inserter-notice',
+							} );
 							setIsInserting( false );
 						},
 					} );
@@ -189,13 +225,20 @@ export function MediaPreview( { media, onClick, category } ) {
 		},
 		[
 			isInserting,
+			getSettings,
 			onClick,
-			mediaUpload,
-			createErrorNotice,
 			createSuccessNotice,
+			updateBlockAttributes,
+			createErrorNotice,
+			getBlock,
 		]
 	);
-	const title = media.title?.rendered || media.title;
+
+	const title =
+		typeof media.title === 'string'
+			? media.title
+			: media.title?.rendered || __( 'no title' );
+
 	let truncatedTitle;
 	if ( title.length > MAXIMUM_TITLE_LENGTH ) {
 		const omission = '...';
@@ -206,10 +249,10 @@ export function MediaPreview( { media, onClick, category } ) {
 	const onMouseLeave = useCallback( () => setIsHovered( false ), [] );
 	return (
 		<>
-			<InserterDraggableBlocks isEnabled={ true } blocks={ [ block ] }>
+			<InserterDraggableBlocks isEnabled blocks={ [ block ] }>
 				{ ( { draggable, onDragStart, onDragEnd } ) => (
 					<div
-						className={ classnames(
+						className={ clsx(
 							'block-editor-inserter__media-list__list-item',
 							{
 								'is-hovered': isHovered,
@@ -226,7 +269,7 @@ export function MediaPreview( { media, onClick, category } ) {
 							onMouseLeave={ onMouseLeave }
 						>
 							<Tooltip text={ truncatedTitle || title }>
-								<CompositeItem
+								<Composite.Item
 									render={
 										<div
 											aria-label={ title }
@@ -244,7 +287,7 @@ export function MediaPreview( { media, onClick, category } ) {
 											</div>
 										) }
 									</div>
-								</CompositeItem>
+								</Composite.Item>
 							</Tooltip>
 							{ ! isInserting && (
 								<MediaPreviewOptions
@@ -263,6 +306,7 @@ export function MediaPreview( { media, onClick, category } ) {
 						onClick( cloneBlock( block ) );
 						createSuccessNotice( __( 'Image inserted.' ), {
 							type: 'snackbar',
+							id: 'inserter-notice',
 						} );
 						setShowExternalUploadModal( false );
 					} }
diff --git a/packages/block-editor/src/components/inserter/media-tab/media-tab.js b/packages/block-editor/src/components/inserter/media-tab/media-tab.js
index b448ae2a406499..ca901a127e5b42 100644
--- a/packages/block-editor/src/components/inserter/media-tab/media-tab.js
+++ b/packages/block-editor/src/components/inserter/media-tab/media-tab.js
@@ -1,22 +1,10 @@
-/**
- * External dependencies
- */
-import classNames from 'classnames';
-
 /**
  * WordPress dependencies
  */
-import { __, isRTL } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { useViewportMatch } from '@wordpress/compose';
-import {
-	__experimentalItemGroup as ItemGroup,
-	__experimentalItem as Item,
-	__experimentalHStack as HStack,
-	FlexBlock,
-	Button,
-} from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { useCallback, useMemo } from '@wordpress/element';
-import { Icon, chevronRight, chevronLeft } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -27,6 +15,8 @@ import MediaUpload from '../../media-upload';
 import { useMediaCategories } from './hooks';
 import { getBlockAndPreviewFromMedia } from './utils';
 import MobileTabNavigation from '../mobile-tab-navigation';
+import CategoryTabs from '../category-tabs';
+import InserterNoResults from '../no-results';
 
 const ALLOWED_MEDIA_TYPES = [ 'image', 'video', 'audio' ];
 
@@ -35,6 +25,7 @@ function MediaTab( {
 	selectedCategory,
 	onSelectCategory,
 	onInsert,
+	children,
 } ) {
 	const mediaCategories = useMediaCategories( rootClientId );
 	const isMobile = useViewportMatch( 'medium', '<' );
@@ -49,7 +40,7 @@ function MediaTab( {
 		},
 		[ onInsert ]
 	);
-	const mobileMediaCategories = useMemo(
+	const categories = useMemo(
 		() =>
 			mediaCategories.map( ( mediaCategory ) => ( {
 				...mediaCategory,
@@ -57,82 +48,53 @@ function MediaTab( {
 			} ) ),
 		[ mediaCategories ]
 	);
+
+	if ( ! categories.length ) {
+		return <InserterNoResults />;
+	}
+
 	return (
 		<>
 			{ ! isMobile && (
 				<div className={ `${ baseCssClass }-container` }>
-					<nav aria-label={ __( 'Media categories' ) }>
-						<ItemGroup role="list" className={ baseCssClass }>
-							{ mediaCategories.map( ( mediaCategory ) => (
-								<Item
-									role="listitem"
-									key={ mediaCategory.name }
-									onClick={ () =>
-										onSelectCategory( mediaCategory )
-									}
-									className={ classNames(
-										`${ baseCssClass }__media-category`,
-										{
-											'is-selected':
-												selectedCategory ===
-												mediaCategory,
-										}
-									) }
-									aria-label={ mediaCategory.labels.name }
-									aria-current={
-										mediaCategory === selectedCategory
-											? 'true'
-											: undefined
-									}
+					<CategoryTabs
+						categories={ categories }
+						selectedCategory={ selectedCategory }
+						onSelectCategory={ onSelectCategory }
+					>
+						{ children }
+					</CategoryTabs>
+					<MediaUploadCheck>
+						<MediaUpload
+							multiple={ false }
+							onSelect={ onSelectMedia }
+							allowedTypes={ ALLOWED_MEDIA_TYPES }
+							render={ ( { open } ) => (
+								<Button
+									__next40pxDefaultSize
+									onClick={ ( event ) => {
+										// Safari doesn't emit a focus event on button elements when
+										// clicked and we need to manually focus the button here.
+										// The reason is that core's Media Library modal explicitly triggers a
+										// focus event and therefore a `blur` event is triggered on a different
+										// element, which doesn't contain the `data-unstable-ignore-focus-outside-for-relatedtarget`
+										// attribute making the Inserter dialog to close.
+										event.target.focus();
+										open();
+									} }
+									className="block-editor-inserter__media-library-button"
+									variant="secondary"
+									data-unstable-ignore-focus-outside-for-relatedtarget=".media-modal"
 								>
-									<HStack>
-										<FlexBlock>
-											{ mediaCategory.labels.name }
-										</FlexBlock>
-										<Icon
-											icon={
-												isRTL()
-													? chevronLeft
-													: chevronRight
-											}
-										/>
-									</HStack>
-								</Item>
-							) ) }
-							<div role="listitem">
-								<MediaUploadCheck>
-									<MediaUpload
-										multiple={ false }
-										onSelect={ onSelectMedia }
-										allowedTypes={ ALLOWED_MEDIA_TYPES }
-										render={ ( { open } ) => (
-											<Button
-												onClick={ ( event ) => {
-													// Safari doesn't emit a focus event on button elements when
-													// clicked and we need to manually focus the button here.
-													// The reason is that core's Media Library modal explicitly triggers a
-													// focus event and therefore a `blur` event is triggered on a different
-													// element, which doesn't contain the `data-unstable-ignore-focus-outside-for-relatedtarget`
-													// attribute making the Inserter dialog to close.
-													event.target.focus();
-													open();
-												} }
-												className="block-editor-inserter__media-library-button"
-												variant="secondary"
-												data-unstable-ignore-focus-outside-for-relatedtarget=".media-modal"
-											>
-												{ __( 'Open Media Library' ) }
-											</Button>
-										) }
-									/>
-								</MediaUploadCheck>
-							</div>
-						</ItemGroup>
-					</nav>
+									{ __( 'Open Media Library' ) }
+								</Button>
+							) }
+						/>
+					</MediaUploadCheck>
 				</div>
 			) }
 			{ isMobile && (
-				<MobileTabNavigation categories={ mobileMediaCategories }>
+				<MobileTabNavigation categories={ categories }>
 					{ ( category ) => (
 						<MediaCategoryPanel
 							onInsert={ onInsert }
diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js
index a6d752848538e7..8dc2f64063c8e3 100644
--- a/packages/block-editor/src/components/inserter/menu.js
+++ b/packages/block-editor/src/components/inserter/menu.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,13 +11,13 @@ import {
 	useState,
 	useCallback,
 	useMemo,
-	useImperativeHandle,
 	useRef,
+	useLayoutEffect,
 } from '@wordpress/element';
 import { VisuallyHidden, SearchControl, Popover } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
+import { useDebouncedInput, useViewportMatch } from '@wordpress/compose';
 import { useSelect } from '@wordpress/data';
-import { useDebouncedInput } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -26,13 +26,16 @@ import Tips from './tips';
 import InserterPreviewPanel from './preview-panel';
 import BlockTypesTab from './block-types-tab';
 import BlockPatternsTab from './block-patterns-tab';
-import { PatternCategoryPreviewPanel } from './block-patterns-tab/pattern-category-preview-panel';
-import { MediaTab, MediaCategoryDialog, useMediaCategories } from './media-tab';
+import { PatternCategoryPreviews } from './block-patterns-tab/pattern-category-previews';
+import { MediaTab, MediaCategoryPanel } from './media-tab';
 import InserterSearchResults from './search-results';
 import useInsertionPoint from './hooks/use-insertion-point';
-import InserterTabs from './tabs';
 import { store as blockEditorStore } from '../../store';
+import TabbedSidebar from '../tabbed-sidebar';
+import { useZoomOut } from '../../hooks/use-zoom-out';
+import { unlock } from '../../lock-unlock';
 
+const NOOP = () => {};
 function InserterMenu(
 	{
 		rootClientId,
@@ -44,19 +47,42 @@ function InserterMenu(
 		showMostUsedBlocks,
 		__experimentalFilterValue = '',
 		shouldFocusBlock = true,
-		prioritizePatterns,
+		onPatternCategorySelection,
+		onClose,
+		__experimentalInitialTab,
+		__experimentalInitialCategory,
 	},
 	ref
 ) {
+	const isZoomOutMode = useSelect(
+		( select ) => unlock( select( blockEditorStore ) ).isZoomOut(),
+		[]
+	);
 	const [ filterValue, setFilterValue, delayedFilterValue ] =
 		useDebouncedInput( __experimentalFilterValue );
 	const [ hoveredItem, setHoveredItem ] = useState( null );
-	const [ selectedPatternCategory, setSelectedPatternCategory ] =
-		useState( null );
+	const [ selectedPatternCategory, setSelectedPatternCategory ] = useState(
+		__experimentalInitialCategory
+	);
 	const [ patternFilter, setPatternFilter ] = useState( 'all' );
 	const [ selectedMediaCategory, setSelectedMediaCategory ] =
 		useState( null );
-	const [ selectedTab, setSelectedTab ] = useState( null );
+	const isLargeViewport = useViewportMatch( 'large' );
+
+	function getInitialTab() {
+		if ( __experimentalInitialTab ) {
+			return __experimentalInitialTab;
+		}
+
+		if ( isZoomOutMode ) {
+			return 'patterns';
+		}
+	}
+	const [ selectedTab, setSelectedTab ] = useState( getInitialTab() );
+
+	const shouldUseZoomOut =
+		selectedTab === 'patterns' || selectedTab === 'media';
+	useZoomOut( shouldUseZoomOut && isLargeViewport );
 
 	const [ destinationRootClientId, onInsertBlocks, onToggleInsertionPoint ] =
 		useInsertionPoint( {
@@ -66,39 +92,38 @@ function InserterMenu(
 			insertionIndex: __experimentalInsertionIndex,
 			shouldFocusBlock,
 		} );
-	const { showPatterns, inserterItems } = useSelect(
-		( select ) => {
-			const { __experimentalGetAllowedPatterns, getInserterItems } =
-				select( blockEditorStore );
-			return {
-				showPatterns: !! __experimentalGetAllowedPatterns(
-					destinationRootClientId
-				).length,
-				inserterItems: getInserterItems( destinationRootClientId ),
-			};
-		},
-		[ destinationRootClientId ]
-	);
-	const hasReusableBlocks = useMemo( () => {
-		return inserterItems.some(
-			( { category } ) => category === 'reusable'
-		);
-	}, [ inserterItems ] );
-
-	const mediaCategories = useMediaCategories( destinationRootClientId );
-	const showMedia = !! mediaCategories.length;
+	const blockTypesTabRef = useRef();
 
 	const onInsert = useCallback(
-		( blocks, meta, shouldForceFocusBlock ) => {
-			onInsertBlocks( blocks, meta, shouldForceFocusBlock );
-			onSelect();
+		( blocks, meta, shouldForceFocusBlock, _rootClientId ) => {
+			onInsertBlocks(
+				blocks,
+				meta,
+				shouldForceFocusBlock,
+				_rootClientId
+			);
+			onSelect( blocks );
+
+			// Check for focus loss due to filtering blocks by selected block type
+			window.requestAnimationFrame( () => {
+				if (
+					! shouldFocusBlock &&
+					! blockTypesTabRef.current?.contains(
+						ref.current.ownerDocument.activeElement
+					)
+				) {
+					// There has been a focus loss, so focus the first button in the block types tab
+					blockTypesTabRef.current?.querySelector( 'button' ).focus();
+				}
+			} );
 		},
-		[ onInsertBlocks, onSelect ]
+		[ onInsertBlocks, onSelect, shouldFocusBlock ]
 	);
 
 	const onInsertPattern = useCallback(
-		( blocks, patternName ) => {
-			onInsertBlocks( blocks, { patternName } );
+		( blocks, patternName, ...args ) => {
+			onToggleInsertionPoint( false );
+			onInsertBlocks( blocks, { patternName }, ...args );
 			onSelect();
 		},
 		[ onInsertBlocks, onSelect ]
@@ -106,32 +131,88 @@ function InserterMenu(
 
 	const onHover = useCallback(
 		( item ) => {
-			onToggleInsertionPoint( !! item );
+			onToggleInsertionPoint( item );
 			setHoveredItem( item );
 		},
 		[ onToggleInsertionPoint, setHoveredItem ]
 	);
 
-	const onHoverPattern = useCallback(
-		( item ) => {
-			onToggleInsertionPoint( !! item );
-		},
-		[ onToggleInsertionPoint ]
-	);
-
 	const onClickPatternCategory = useCallback(
 		( patternCategory, filter ) => {
 			setSelectedPatternCategory( patternCategory );
 			setPatternFilter( filter );
+			onPatternCategorySelection?.();
 		},
-		[ setSelectedPatternCategory ]
+		[ setSelectedPatternCategory, onPatternCategorySelection ]
 	);
 
-	const blocksTab = useMemo(
-		() => (
+	const showPatternPanel =
+		selectedTab === 'patterns' &&
+		! delayedFilterValue &&
+		!! selectedPatternCategory;
+
+	const showMediaPanel = selectedTab === 'media' && !! selectedMediaCategory;
+
+	const inserterSearch = useMemo( () => {
+		if ( selectedTab === 'media' ) {
+			return null;
+		}
+
+		return (
+			<>
+				<SearchControl
+					__nextHasNoMarginBottom
+					className="block-editor-inserter__search"
+					onChange={ ( value ) => {
+						if ( hoveredItem ) {
+							setHoveredItem( null );
+						}
+						setFilterValue( value );
+					} }
+					value={ filterValue }
+					label={ __( 'Search' ) }
+					placeholder={ __( 'Search' ) }
+				/>
+				{ !! delayedFilterValue && (
+					<InserterSearchResults
+						filterValue={ delayedFilterValue }
+						onSelect={ onSelect }
+						onHover={ onHover }
+						rootClientId={ rootClientId }
+						clientId={ clientId }
+						isAppender={ isAppender }
+						__experimentalInsertionIndex={
+							__experimentalInsertionIndex
+						}
+						showBlockDirectory
+						shouldFocusBlock={ shouldFocusBlock }
+						prioritizePatterns={ selectedTab === 'patterns' }
+					/>
+				) }
+			</>
+		);
+	}, [
+		selectedTab,
+		hoveredItem,
+		setHoveredItem,
+		setFilterValue,
+		filterValue,
+		delayedFilterValue,
+		onSelect,
+		onHover,
+		shouldFocusBlock,
+		clientId,
+		rootClientId,
+		__experimentalInsertionIndex,
+		isAppender,
+	] );
+
+	const blocksTab = useMemo( () => {
+		return (
 			<>
 				<div className="block-editor-inserter__block-list">
 					<BlockTypesTab
+						ref={ blockTypesTabRef }
 						rootClientId={ destinationRootClientId }
 						onInsert={ onInsert }
 						onHover={ onHover }
@@ -147,81 +228,67 @@ function InserterMenu(
 					</div>
 				) }
 			</>
-		),
-		[
-			destinationRootClientId,
-			onInsert,
-			onHover,
-			showMostUsedBlocks,
-			showInserterHelpPanel,
-		]
-	);
+		);
+	}, [
+		destinationRootClientId,
+		onInsert,
+		onHover,
+		showMostUsedBlocks,
+		showInserterHelpPanel,
+	] );
 
-	const patternsTab = useMemo(
-		() => (
+	const patternsTab = useMemo( () => {
+		return (
 			<BlockPatternsTab
 				rootClientId={ destinationRootClientId }
 				onInsert={ onInsertPattern }
 				onSelectCategory={ onClickPatternCategory }
 				selectedCategory={ selectedPatternCategory }
-			/>
-		),
-		[
-			destinationRootClientId,
-			onInsertPattern,
-			onClickPatternCategory,
-			selectedPatternCategory,
-		]
-	);
+			>
+				{ showPatternPanel && (
+					<PatternCategoryPreviews
+						rootClientId={ destinationRootClientId }
+						onInsert={ onInsertPattern }
+						category={ selectedPatternCategory }
+						patternFilter={ patternFilter }
+						showTitlesAsTooltip
+					/>
+				) }
+			</BlockPatternsTab>
+		);
+	}, [
+		destinationRootClientId,
+		onInsertPattern,
+		onClickPatternCategory,
+		patternFilter,
+		selectedPatternCategory,
+		showPatternPanel,
+	] );
 
-	const mediaTab = useMemo(
-		() => (
+	const mediaTab = useMemo( () => {
+		return (
 			<MediaTab
 				rootClientId={ destinationRootClientId }
 				selectedCategory={ selectedMediaCategory }
 				onSelectCategory={ setSelectedMediaCategory }
 				onInsert={ onInsert }
-			/>
-		),
-		[
-			destinationRootClientId,
-			onInsert,
-			selectedMediaCategory,
-			setSelectedMediaCategory,
-		]
-	);
-
-	const getCurrentTab = useCallback(
-		( tab ) => {
-			if ( tab.name === 'blocks' ) {
-				return blocksTab;
-			} else if ( tab.name === 'patterns' ) {
-				return patternsTab;
-			} else if ( tab.name === 'media' ) {
-				return mediaTab;
-			}
-		},
-		[ blocksTab, patternsTab, mediaTab ]
-	);
-
-	const searchRef = useRef();
-	useImperativeHandle( ref, () => ( {
-		focusSearch: () => {
-			searchRef.current.focus();
-		},
-	} ) );
-
-	const showPatternPanel =
-		selectedTab === 'patterns' &&
-		! delayedFilterValue &&
-		selectedPatternCategory;
-	const showAsTabs =
-		! delayedFilterValue &&
-		( showPatterns || hasReusableBlocks || showMedia );
-	const showMediaPanel =
-		selectedTab === 'media' &&
-		! delayedFilterValue &&
-		selectedMediaCategory;
+			>
+				{ showMediaPanel && (
+					<MediaCategoryPanel
+						rootClientId={ destinationRootClientId }
+						onInsert={ onInsert }
+						category={ selectedMediaCategory }
+					/>
+				) }
+			</MediaTab>
+		);
+	}, [
+		destinationRootClientId,
+		onInsert,
+		selectedMediaCategory,
+		setSelectedMediaCategory,
+		showMediaPanel,
+	] );
 
 	const handleSetSelectedTab = ( value ) => {
 		// If no longer on patterns tab remove the category setting.
@@ -231,67 +298,71 @@ function InserterMenu(
 		setSelectedTab( value );
 	};
 
+	// Focus first active tab, if any
+	const tabsRef = useRef();
+	useLayoutEffect( () => {
+		if ( tabsRef.current ) {
+			window.requestAnimationFrame( () => {
+				tabsRef.current
+					.querySelector( '[role="tab"][aria-selected="true"]' )
+					?.focus();
+			} );
+		}
+	}, [] );
+
 	return (
-		<div className="block-editor-inserter__menu">
-			<div
-				className={ classnames( 'block-editor-inserter__main-area', {
-					'show-as-tabs': showAsTabs,
-				} ) }
-			>
-				<SearchControl
-					__nextHasNoMarginBottom
-					className="block-editor-inserter__search"
-					onChange={ ( value ) => {
-						if ( hoveredItem ) setHoveredItem( null );
-						setFilterValue( value );
-					} }
-					value={ filterValue }
-					label={ __( 'Search for blocks and patterns' ) }
-					placeholder={ __( 'Search' ) }
-					ref={ searchRef }
+		<div
+			className={ clsx( 'block-editor-inserter__menu', {
+				'show-panel': showPatternPanel || showMediaPanel,
+				'is-zoom-out': isZoomOutMode,
+			} ) }
+			ref={ ref }
+		>
+			<div className="block-editor-inserter__main-area">
+				<TabbedSidebar
+					ref={ tabsRef }
+					onSelect={ handleSetSelectedTab }
+					onClose={ onClose }
+					selectedTab={ selectedTab }
+					closeButtonLabel={ __( 'Close Block Inserter' ) }
+					tabs={ [
+						{
+							name: 'blocks',
+							title: __( 'Blocks' ),
+							panel: (
+								<>
+									{ inserterSearch }
+									{ selectedTab === 'blocks' &&
+										! delayedFilterValue &&
+										blocksTab }
+								</>
+							),
+						},
+						{
+							name: 'patterns',
+							title: __( 'Patterns' ),
+							panel: (
+								<>
+									{ inserterSearch }
+									{ selectedTab === 'patterns' &&
+										! delayedFilterValue &&
+										patternsTab }
+								</>
+							),
+						},
+						{
+							name: 'media',
+							title: __( 'Media' ),
+							panel: (
+								<>
+									{ inserterSearch }
+									{ mediaTab }
+								</>
+							),
+						},
+					] }
 				/>
-				{ !! delayedFilterValue && (
-					<div className="block-editor-inserter__no-tab-container">
-						<InserterSearchResults
-							filterValue={ delayedFilterValue }
-							onSelect={ onSelect }
-							onHover={ onHover }
-							onHoverPattern={ onHoverPattern }
-							rootClientId={ rootClientId }
-							clientId={ clientId }
-							isAppender={ isAppender }
-							__experimentalInsertionIndex={
-								__experimentalInsertionIndex
-							}
-							showBlockDirectory
-							shouldFocusBlock={ shouldFocusBlock }
-						/>
-					</div>
-				) }
-				{ showAsTabs && (
-					<InserterTabs
-						showPatterns={ showPatterns }
-						showReusableBlocks={ hasReusableBlocks }
-						showMedia={ showMedia }
-						prioritizePatterns={ prioritizePatterns }
-						onSelect={ handleSetSelectedTab }
-					>
-						{ getCurrentTab }
-					</InserterTabs>
-				) }
-				{ ! delayedFilterValue && ! showAsTabs && (
-					<div className="block-editor-inserter__no-tab-container">
-						{ blocksTab }
-					</div>
-				) }
 			</div>
-			{ showMediaPanel && (
-				<MediaCategoryDialog
-					rootClientId={ destinationRootClientId }
-					onInsert={ onInsert }
-					category={ selectedMediaCategory }
-				/>
-			) }
 			{ showInserterHelpPanel && hoveredItem && (
 				<Popover
 					className="block-editor-inserter__preview-container__popover"
@@ -303,18 +374,20 @@ function InserterMenu(
 					<InserterPreviewPanel item={ hoveredItem } />
 				</Popover>
 			) }
-			{ showPatternPanel && (
-				<PatternCategoryPreviewPanel
-					rootClientId={ destinationRootClientId }
-					onInsert={ onInsertPattern }
-					onHover={ onHoverPattern }
-					category={ selectedPatternCategory }
-					patternFilter={ patternFilter }
-					showTitlesAsTooltip
-				/>
-			) }
 		</div>
 	);
 }
 
-export default forwardRef( InserterMenu );
+export const PrivateInserterMenu = forwardRef( InserterMenu );
+
+function PublicInserterMenu( props, ref ) {
+	return (
+		<PrivateInserterMenu
+			{ ...props }
+			onPatternCategorySelection={ NOOP }
+			ref={ ref }
+		/>
+	);
+}
+
+export default forwardRef( PublicInserterMenu );
diff --git a/packages/block-editor/src/components/inserter/menu.native.js b/packages/block-editor/src/components/inserter/menu.native.js
index 01ace49bd2070e..538abd593663d8 100644
--- a/packages/block-editor/src/components/inserter/menu.native.js
+++ b/packages/block-editor/src/components/inserter/menu.native.js
@@ -177,7 +177,7 @@ function InserterMenu( {
 
 	return (
 		<BottomSheet
-			isVisible={ true }
+			isVisible
 			onClose={ onClose }
 			onKeyboardShow={ onKeyboardShow }
 			onKeyboardHide={ onKeyboardHide }
@@ -198,10 +198,10 @@ function InserterMenu( {
 				</>
 			}
 			hasNavigation
-			setMinHeightToMaxHeight={ true }
+			setMinHeightToMaxHeight
 			contentStyle={ styles[ 'inserter-menu__list' ] }
 			isFullScreen={ isFullScreen }
-			allowDragIndicator={ true }
+			allowDragIndicator
 		>
 			<BottomSheetConsumer>
 				{ ( { listProps } ) => (
diff --git a/packages/block-editor/src/components/inserter/mobile-tab-navigation.js b/packages/block-editor/src/components/inserter/mobile-tab-navigation.js
index b3c4edd28ac938..5f34c3c21d832f 100644
--- a/packages/block-editor/src/components/inserter/mobile-tab-navigation.js
+++ b/packages/block-editor/src/components/inserter/mobile-tab-navigation.js
@@ -10,10 +10,7 @@ import {
 	__experimentalSpacer as Spacer,
 	__experimentalHeading as Heading,
 	__experimentalView as View,
-	__experimentalNavigatorProvider as NavigatorProvider,
-	__experimentalNavigatorScreen as NavigatorScreen,
-	__experimentalNavigatorButton as NavigatorButton,
-	__experimentalNavigatorBackButton as NavigatorBackButton,
+	Navigator,
 	FlexBlock,
 } from '@wordpress/components';
 import { Icon, chevronRight, chevronLeft } from '@wordpress/icons';
@@ -24,15 +21,15 @@ function ScreenHeader( { title } ) {
 			<View>
 				<Spacer marginBottom={ 0 } paddingX={ 4 } paddingY={ 3 }>
 					<HStack spacing={ 2 }>
-						<NavigatorBackButton
+						<Navigator.BackButton
 							style={
 								// TODO: This style override is also used in ToolsPanelHeader.
 								// It should be supported out-of-the-box by Button.
 								{ minWidth: 24, padding: 0 }
 							}
 							icon={ isRTL() ? chevronRight : chevronLeft }
-							isSmall
-							aria-label={ __( 'Navigate to the previous view' ) }
+							size="small"
+							label={ __( 'Back' ) }
 						/>
 						<Spacer>
 							<Heading level={ 5 }>{ title }</Heading>
@@ -46,14 +43,14 @@ function ScreenHeader( { title } ) {
 
 export default function MobileTabNavigation( { categories, children } ) {
 	return (
-		<NavigatorProvider
+		<Navigator
 			initialPath="/"
 			className="block-editor-inserter__mobile-tab-navigation"
 		>
-			<NavigatorScreen path="/">
+			<Navigator.Screen path="/">
 				<ItemGroup>
 					{ categories.map( ( category ) => (
-						<NavigatorButton
+						<Navigator.Button
 							key={ category.name }
 							path={ `/category/${ category.name }` }
 							as={ Item }
@@ -67,19 +64,19 @@ export default function MobileTabNavigation( { categories, children } ) {
 									}
 								/>
 							</HStack>
-						</NavigatorButton>
+						</Navigator.Button>
 					) ) }
 				</ItemGroup>
-			</NavigatorScreen>
+			</Navigator.Screen>
 			{ categories.map( ( category ) => (
-				<NavigatorScreen
+				<Navigator.Screen
 					key={ category.name }
 					path={ `/category/${ category.name }` }
 				>
 					<ScreenHeader title={ __( 'Back' ) } />
 					{ children( category ) }
-				</NavigatorScreen>
+				</Navigator.Screen>
 			) ) }
-		</NavigatorProvider>
+		</Navigator>
 	);
 }
diff --git a/packages/block-editor/src/components/inserter/preview-panel.js b/packages/block-editor/src/components/inserter/preview-panel.js
index fa6c08d8c6c352..612b435d06dcc5 100644
--- a/packages/block-editor/src/components/inserter/preview-panel.js
+++ b/packages/block-editor/src/components/inserter/preview-panel.js
@@ -30,6 +30,15 @@ function InserterPreviewPanel( { item } ) {
 			innerBlocks: example.innerBlocks,
 		} );
 	}, [ name, example, initialAttributes ] );
+	// Same as height of BlockPreviewPanel.
+	const previewHeight = 144;
+	const sidebarWidth = 280;
+	const viewportWidth = example?.viewportWidth ?? 500;
+	const scale = sidebarWidth / viewportWidth;
+	const minHeight =
+		scale !== 0 && scale < 1 && previewHeight
+			? previewHeight / scale
+			: previewHeight;
 
 	return (
 		<div className="block-editor-inserter__preview-container">
@@ -38,10 +47,24 @@ function InserterPreviewPanel( { item } ) {
 					<div className="block-editor-inserter__preview-content">
 						<BlockPreview
 							blocks={ blocks }
-							viewportWidth={ example?.viewportWidth ?? 500 }
-							additionalStyles={ [
-								{ css: 'body { padding: 24px; }' },
-							] }
+							viewportWidth={ viewportWidth }
+							minHeight={ previewHeight }
+							additionalStyles={
+								//We want this CSS to be in sync with the one in BlockPreviewPanel.
+								[
+									{
+										css: `
+										body { 
+											padding: 24px;
+											min-height:${ Math.round( minHeight ) }px;
+											display:flex;
+											align-items:center;
+										}
+										.is-root-container { width: 100%; }
+									`,
+									},
+								]
+							}
 						/>
 					</div>
 				) : (
diff --git a/packages/block-editor/src/components/inserter/quick-inserter.js b/packages/block-editor/src/components/inserter/quick-inserter.js
index 540b51a4757e0d..9f393a7ce15202 100644
--- a/packages/block-editor/src/components/inserter/quick-inserter.js
+++ b/packages/block-editor/src/components/inserter/quick-inserter.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -32,6 +32,7 @@ export default function QuickInserter( {
 	isAppender,
 	prioritizePatterns,
 	selectBlockOnInsert,
+	hasSearch = true,
 } ) {
 	const [ filterValue, setFilterValue ] = useState( '' );
 	const [ destinationRootClientId, onInsertBlocks ] = useInsertionPoint( {
@@ -43,12 +44,14 @@ export default function QuickInserter( {
 	} );
 	const [ blockTypes ] = useBlockTypesState(
 		destinationRootClientId,
-		onInsertBlocks
+		onInsertBlocks,
+		true
 	);
-
 	const [ patterns ] = usePatternsState(
 		onInsertBlocks,
-		destinationRootClientId
+		destinationRootClientId,
+		undefined,
+		true
 	);
 
 	const { setInserterIsOpened, insertionIndex } = useSelect(
@@ -70,8 +73,9 @@ export default function QuickInserter( {
 	const showPatterns =
 		patterns.length && ( !! filterValue || prioritizePatterns );
 	const showSearch =
-		( showPatterns && patterns.length > SEARCH_THRESHOLD ) ||
-		blockTypes.length > SEARCH_THRESHOLD;
+		hasSearch &&
+		( ( showPatterns && patterns.length > SEARCH_THRESHOLD ) ||
+			blockTypes.length > SEARCH_THRESHOLD );
 
 	useEffect( () => {
 		if ( setInserterIsOpened ) {
@@ -82,7 +86,12 @@ export default function QuickInserter( {
 	// When clicking Browse All select the appropriate block so as
 	// the insertion point can work as expected.
 	const onBrowseAll = () => {
-		setInserterIsOpened( { rootClientId, insertionIndex, filterValue } );
+		setInserterIsOpened( {
+			filterValue,
+			onSelect,
+			rootClientId,
+			insertionIndex,
+		} );
 	};
 
 	let maxBlockPatterns = 0;
@@ -94,7 +103,7 @@ export default function QuickInserter( {
 
 	return (
 		<div
-			className={ classnames( 'block-editor-inserter__quick-inserter', {
+			className={ clsx( 'block-editor-inserter__quick-inserter', {
 				'has-search': showSearch,
 				'has-expand': setInserterIsOpened,
 			} ) }
@@ -107,7 +116,7 @@ export default function QuickInserter( {
 					onChange={ ( value ) => {
 						setFilterValue( value );
 					} }
-					label={ __( 'Search for blocks and patterns' ) }
+					label={ __( 'Search' ) }
 					placeholder={ __( 'Search' ) }
 				/>
 			) }
@@ -124,11 +133,13 @@ export default function QuickInserter( {
 					isDraggable={ false }
 					prioritizePatterns={ prioritizePatterns }
 					selectBlockOnInsert={ selectBlockOnInsert }
+					isQuick
 				/>
 			</div>
 
 			{ setInserterIsOpened && (
 				<Button
+					__next40pxDefaultSize
 					className="block-editor-inserter__quick-inserter-expand"
 					onClick={ onBrowseAll }
 					aria-label={ __(
diff --git a/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js b/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js
deleted file mode 100644
index 6a3a3d1eec260b..00000000000000
--- a/packages/block-editor/src/components/inserter/reusable-block-rename-hint.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Button } from '@wordpress/components';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { focus } from '@wordpress/dom';
-import { useRef } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { close } from '@wordpress/icons';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-const PREFERENCE_NAME = 'isResuableBlocksrRenameHintVisible';
-/*
- * This hook was added in 6.3 to help users with the transition from Reusable blocks to Patterns.
- * It is only exported for use in the reusable-blocks package as well as block-editor.
- * It will be removed in 6.4. and should not be used in any new code.
- */
-export function useReusableBlocksRenameHint() {
-	return useSelect(
-		( select ) =>
-			select( preferencesStore ).get( 'core', PREFERENCE_NAME ) ?? true,
-		[]
-	);
-}
-
-/*
- * This component was added in 6.3 to help users with the transition from Reusable blocks to Patterns.
- * It is only exported for use in the reusable-blocks package as well as block-editor.
- * It will be removed in 6.4. and should not be used in any new code.
- */
-export default function ReusableBlocksRenameHint() {
-	const isReusableBlocksRenameHint = useSelect(
-		( select ) =>
-			select( preferencesStore ).get( 'core', PREFERENCE_NAME ) ?? true,
-		[]
-	);
-
-	const ref = useRef();
-
-	const { set: setPreference } = useDispatch( preferencesStore );
-	if ( ! isReusableBlocksRenameHint ) {
-		return null;
-	}
-
-	return (
-		<div ref={ ref } className="reusable-blocks-menu-items__rename-hint">
-			<div className="reusable-blocks-menu-items__rename-hint-content">
-				{ __(
-					'Reusable blocks are now synced patterns. A synced pattern will behave in exactly the same way as a reusable block.'
-				) }
-			</div>
-			<Button
-				className="reusable-blocks-menu-items__rename-hint-dismiss"
-				icon={ close }
-				iconSize="16"
-				label={ __( 'Dismiss hint' ) }
-				onClick={ () => {
-					// Retain focus when dismissing the element.
-					const previousElement = focus.tabbable.findPrevious(
-						ref.current
-					);
-					previousElement?.focus();
-					setPreference( 'core', PREFERENCE_NAME, false );
-				} }
-				showTooltip={ false }
-			/>
-		</div>
-	);
-}
diff --git a/packages/block-editor/src/components/inserter/search-items.js b/packages/block-editor/src/components/inserter/search-items.js
index 35346fca09f32d..154098fc1a837b 100644
--- a/packages/block-editor/src/components/inserter/search-items.js
+++ b/packages/block-editor/src/components/inserter/search-items.js
@@ -12,6 +12,17 @@ const defaultGetKeywords = ( item ) => item.keywords || [];
 const defaultGetCategory = ( item ) => item.category;
 const defaultGetCollection = () => null;
 
+// Normalization regexes
+const splitRegexp = [
+	/([\p{Ll}\p{Lo}\p{N}])([\p{Lu}\p{Lt}])/gu, // One lowercase or digit, followed by one uppercase.
+	/([\p{Lu}\p{Lt}])([\p{Lu}\p{Lt}][\p{Ll}\p{Lo}])/gu, // One uppercase followed by one uppercase and one lowercase.
+];
+const stripRegexp = /(\p{C}|\p{P}|\p{S})+/giu; // Anything that's not a punctuation, symbol or control/format character.
+
+// Normalization cache
+const extractedWords = new Map();
+const normalizedStrings = new Map();
+
 /**
  * Extracts words from an input string.
  *
@@ -19,16 +30,21 @@ const defaultGetCollection = () => null;
  *
  * @return {Array} Words, extracted from the input string.
  */
-function extractWords( input = '' ) {
-	return noCase( input, {
-		splitRegexp: [
-			/([\p{Ll}\p{Lo}\p{N}])([\p{Lu}\p{Lt}])/gu, // One lowercase or digit, followed by one uppercase.
-			/([\p{Lu}\p{Lt}])([\p{Lu}\p{Lt}][\p{Ll}\p{Lo}])/gu, // One uppercase followed by one uppercase and one lowercase.
-		],
-		stripRegexp: /(\p{C}|\p{P}|\p{S})+/giu, // Anything that's not a punctuation, symbol or control/format character.
+export function extractWords( input = '' ) {
+	if ( extractedWords.has( input ) ) {
+		return extractedWords.get( input );
+	}
+
+	const result = noCase( input, {
+		splitRegexp,
+		stripRegexp,
 	} )
 		.split( ' ' )
 		.filter( Boolean );
+
+	extractedWords.set( input, result );
+
+	return result;
 }
 
 /**
@@ -38,20 +54,26 @@ function extractWords( input = '' ) {
  *
  * @return {string} The normalized search input.
  */
-function normalizeSearchInput( input = '' ) {
+export function normalizeString( input = '' ) {
+	if ( normalizedStrings.has( input ) ) {
+		return normalizedStrings.get( input );
+	}
+
 	// Disregard diacritics.
 	//  Input: "média"
-	input = removeAccents( input );
+	let result = removeAccents( input );
 
 	// Accommodate leading slash, matching autocomplete expectations.
 	//  Input: "/media"
-	input = input.replace( /^\//, '' );
+	result = result.replace( /^\//, '' );
 
 	// Lowercase.
 	//  Input: "MEDIA"
-	input = input.toLowerCase();
+	result = result.toLowerCase();
+
+	normalizedStrings.set( input, result );
 
-	return input;
+	return result;
 }
 
 /**
@@ -62,7 +84,7 @@ function normalizeSearchInput( input = '' ) {
  * @return {string[]} The normalized list of search terms.
  */
 export const getNormalizedSearchTerms = ( input = '' ) => {
-	return extractWords( normalizeSearchInput( input ) );
+	return extractWords( normalizeString( input ) );
 };
 
 const removeMatchingTerms = ( unmatchedTerms, unprocessedTerms ) => {
@@ -148,8 +170,8 @@ export function getItemSearchRank( item, searchTerm, config = {} ) {
 	const category = getCategory( item );
 	const collection = getCollection( item );
 
-	const normalizedSearchInput = normalizeSearchInput( searchTerm );
-	const normalizedTitle = normalizeSearchInput( title );
+	const normalizedSearchInput = normalizeString( searchTerm );
+	const normalizedTitle = normalizeString( title );
 
 	let rank = 0;
 
diff --git a/packages/block-editor/src/components/inserter/search-results.js b/packages/block-editor/src/components/inserter/search-results.js
index edd99609ea916c..9c001823745e6c 100644
--- a/packages/block-editor/src/components/inserter/search-results.js
+++ b/packages/block-editor/src/components/inserter/search-results.js
@@ -50,6 +50,7 @@ function InserterSearchResults( {
 	shouldFocusBlock = true,
 	prioritizePatterns,
 	selectBlockOnInsert,
+	isQuick,
 } ) {
 	const debouncedSpeak = useDebounce( speak, 500 );
 
@@ -80,7 +81,7 @@ function InserterSearchResults( {
 		blockTypeCategories,
 		blockTypeCollections,
 		onSelectBlockType,
-	] = useBlockTypesState( destinationRootClientId, onInsertBlocks );
+	] = useBlockTypesState( destinationRootClientId, onInsertBlocks, isQuick );
 	const [ patterns, , onClickPattern ] = usePatternsState(
 		onInsertBlocks,
 		destinationRootClientId
diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index 755445246e8596..51228a1c46a248 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -1,5 +1,5 @@
 $block-inserter-preview-height: 350px;
-$block-inserter-width: 350px;
+$block-quick-inserter-width: 350px;
 $block-inserter-tabs-height: 44px;
 
 .block-editor-inserter {
@@ -17,17 +17,18 @@ $block-inserter-tabs-height: 44px;
 }
 
 .block-editor-inserter__main-area {
-	position: relative;
-	display: flex;
-	flex-direction: column;
 	height: 100%;
 	gap: $grid-unit-20;
+	position: relative;
+
 	&.show-as-tabs {
 		gap: 0;
 	}
 
-	@include break-medium {
-		width: $block-inserter-width;
+	.block-editor-tabbed-sidebar {
+		@include break-medium() {
+			width: $secondary-sidebar-width;
+		}
 	}
 }
 
@@ -35,7 +36,7 @@ $block-inserter-tabs-height: 44px;
 	.components-popover__content {
 		border: none;
 		outline: none;
-		box-shadow: $shadow-popover;
+		box-shadow: $elevation-x-small;
 
 		.block-editor-inserter__quick-inserter > * {
 			border-left: $border-width solid $gray-400;
@@ -43,12 +44,12 @@ $block-inserter-tabs-height: 44px;
 
 			&:first-child {
 				border-top: $border-width solid $gray-400;
-				border-radius: $radius-block-ui $radius-block-ui 0 0;
+				border-radius: $radius-medium $radius-medium 0 0;
 			}
 
 			&:last-child {
 				border-bottom: $border-width solid $gray-400;
-				border-radius: 0 0 $radius-block-ui $radius-block-ui;
+				border-radius: 0 0 $radius-medium $radius-medium;
 			}
 
 			&.components-button {
@@ -61,7 +62,7 @@ $block-inserter-tabs-height: 44px;
 .block-editor-inserter__popover .block-editor-inserter__menu {
 	margin: -$grid-unit-15;
 
-	.block-editor-inserter__tabs .components-tab-panel__tabs {
+	.block-editor-inserter__tablist {
 		top: $grid-unit-10 + $grid-unit-20 + $grid-unit-60 - $grid-unit-15;
 	}
 
@@ -90,6 +91,12 @@ $block-inserter-tabs-height: 44px;
 	height: 100%;
 	position: relative;
 	overflow: visible;
+
+	&.show-panel {
+		@include break-medium() {
+			width: $secondary-sidebar-width + $sidebar-width;
+		}
+	}
 }
 
 .block-editor-inserter__inline-elements {
@@ -106,47 +113,22 @@ $block-inserter-tabs-height: 44px;
 
 .block-editor-inserter__search {
 	padding: $grid-unit-20 $grid-unit-20 0 $grid-unit-20;
-
-	.components-search-control__icon {
-		right: $grid-unit-10 + ($grid-unit-60 - $icon-size) * 0.5;
-	}
-}
-
-.block-editor-inserter__tabs {
-	flex-grow: 1;
-	display: flex;
-	flex-direction: column;
-	overflow: hidden;
-
-	.components-tab-panel__tabs {
-		border-bottom: $border-width solid $gray-300;
-
-		.components-tab-panel__tabs-item {
-			flex-grow: 1;
-			margin-bottom: -$border-width;
-			&[id$="reusable"] {
-				flex-grow: inherit;
-				// These are to align the `reusable` icon with the search icon.
-				padding-left: $grid-unit-20;
-				padding-right: $grid-unit-20;
-			}
-		}
-	}
-
-	.components-tab-panel__tab-content {
-		display: flex;
-		flex-grow: 1;
-		flex-direction: column;
-		overflow-y: auto;
-	}
 }
 
 .block-editor-inserter__no-tab-container {
 	overflow-y: auto;
 	flex-grow: 1;
+	// Fixes the editor canvas scrolling on search results https://github.com/WordPress/gutenberg/issues/56811
+	position: relative;
 }
 
 .block-editor-inserter__panel-header {
+	// Use `position: relative` to ensure any absolute positioned child elements are
+	// positioned relative to the panel header.
+	// This makes the overflow rule of the panel work correctly, particularly when the
+	// `VisuallyHidden` component is used within the inserter UI.
+	position: relative;
+
 	display: inline-flex;
 	align-items: center;
 	padding: $grid-unit-20 $grid-unit-20 0;
@@ -179,16 +161,8 @@ $block-inserter-tabs-height: 44px;
 	text-align: right;
 }
 
-.block-editor-inserter__manage-reusable-blocks-container {
-	margin: auto $grid-unit-20 $grid-unit-20;
-}
-
-.block-editor-inserter__manage-reusable-blocks {
-	justify-content: center;
-	width: 100%;
-}
-
-.block-editor-inserter__no-results {
+.block-editor-inserter__no-results,
+.block-editor-inserter__patterns-loading {
 	padding: $grid-unit-40;
 	text-align: center;
 }
@@ -229,7 +203,7 @@ $block-inserter-tabs-height: 44px;
 		display: block;
 	}
 
-	.block-editor-block-preview__container {
+	.block-editor-inserter__media-list__list-item {
 		height: 100%;
 	}
 
@@ -240,115 +214,66 @@ $block-inserter-tabs-height: 44px;
 	}
 }
 
-.block-editor-inserter__patterns-explore-button.components-button {
-	padding: $grid-unit-20;
-	justify-content: center;
-	margin-top: $grid-unit-20;
-	width: 100%;
+.block-editor-inserter__insertable-blocks-at-selection {
+	border-bottom: $border-width solid $gray-200;
 }
 
-.block-editor-inserter__patterns-selected-category.block-editor-inserter__patterns-selected-category {
-	color: var(--wp-admin-theme-color);
-	position: relative;
-
-	.components-flex-item {
-		filter: brightness(0.95);
-	}
-
-	svg {
-		fill: var(--wp-admin-theme-color);
-	}
-
-	&::after {
-		content: "";
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		border-radius: $radius-block-ui;
-		opacity: 0.04;
-		background: var(--wp-admin-theme-color);
-	}
+.block-editor-inserter__media-tabs-container,
+.block-editor-inserter__block-patterns-tabs-container {
+	flex-grow: 1;
+	padding: $grid-unit-20;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
 }
 
-.block-editor-inserter__block-patterns-tabs-container {
-	height: 100%;
-	nav {
-		height: 100%;
-	}
+.block-editor-inserter__category-tablist {
+	margin-bottom: $grid-unit-10;
 }
 
-.block-editor-inserter__block-patterns-tabs {
+.block-editor-inserter__category-panel {
+	outline: 1px solid transparent; // Shown for Windows 10 High Contrast mode.
 	display: flex;
 	flex-direction: column;
-	padding: $grid-unit-20;
-	overflow-y: auto;
-	height: 100%;
-	// Push the listitem wrapping the "explore" button to the bottom of the panel.
-	div[role="listitem"]:last-child {
-		margin-top: auto;
-	}
+	padding: 0 $grid-unit-20;
 
-	.block-editor-inserter__patterns-category {
-		// Account for the icon on the right so that it's visually balanced.
-		padding-right: $grid-unit-05;
+	@include break-medium {
+		border-left: $border-width solid $gray-200;
+		padding: 0;
+		left: $secondary-sidebar-width;
+		width: $sidebar-width;
+		position: absolute;
+		top: -$border-width;
+		height: calc(100% + #{$border-width});
+		background: $gray-100;
+		border-top: $border-width solid $gray-200;
+
+		.block-editor-inserter__media-list,
+		.block-editor-block-patterns-list {
+			padding: 0 $grid-unit-30 $grid-unit-20;
+		}
 	}
 }
 
-.block-editor-inserter__patterns-category-dialog {
-	background: $gray-100;
-	border-left: $border-width solid $gray-200;
-	border-right: $border-width solid $gray-200;
-	position: absolute;
-	top: 0;
-	left: 0;
-	height: 100%;
-	width: 100%;
-
+.block-editor-inserter__patterns-category-panel-header {
+	padding: $grid-unit-10 0;
 	@include break-medium {
-		left: 100%;
-		display: block;
-		width: 300px;
-	}
-
-	.block-editor-block-patterns-list {
-		overflow-y: auto;
-		flex-grow: 1;
-		height: 100%;
-		padding: $grid-unit-20 $grid-unit-30;
+		padding: $grid-unit-10 $grid-unit-30;
 	}
 }
 
-.block-editor-block-patterns-list__list-item {
-	.block-editor-block-preview__container {
-		box-shadow: 0 15px 25px rgb(0 0 0 / 7%);
-	}
-	&:hover {
-		.block-editor-block-preview__container {
-			box-shadow: 0 0 0 2px $gray-900, 0 15px 25px rgb(0 0 0 / 7%);
-		}
-	}
+.block-editor-inserter__patterns-category-no-results {
+	margin-top: $grid-unit-30;
 }
 
-.block-editor-inserter__patterns-category-panel {
-	padding: 0 $grid-unit-20;
-	display: flex;
-	flex-direction: column;
+.block-editor-inserter__media-list,
+.block-editor-block-patterns-list {
+	overflow-y: auto;
+	flex-grow: 1;
 	height: 100%;
-	@include break-medium {
-		padding: 0;
-	}
-	.block-editor-inserter__patterns-category-panel-header {
-		padding: 16px $grid-unit-30;
-	}
-	.block-editor-inserter__patterns-category-no-results {
-		margin-top: $grid-unit-30;
-	}
 }
 
 .block-editor-inserter__preview-content {
-	min-height: $grid-unit-60 * 3;
 	background: $gray-100;
 	display: grid;
 	flex-grow: 1;
@@ -363,7 +288,7 @@ $block-inserter-tabs-height: 44px;
 	min-height: $grid-unit-60 * 3;
 	color: $gray-700;
 	background: $gray-100;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 }
 
 .block-editor-inserter__tips {
@@ -381,7 +306,7 @@ $block-inserter-tabs-height: 44px;
 	max-width: 100%;
 
 	@include break-medium {
-		width: $block-inserter-width;
+		width: $block-quick-inserter-width;
 	}
 }
 
@@ -404,7 +329,7 @@ $block-inserter-tabs-height: 44px;
 		.block-editor-block-patterns-list__list-item {
 			margin-bottom: 0;
 		}
-		.block-editor-block-preview__container {
+		.block-editor-inserter__media-list__list-item {
 			min-height: 100px;
 		}
 	}
@@ -423,7 +348,6 @@ $block-inserter-tabs-height: 44px;
 	background: $gray-900;
 	color: $white;
 	width: 100%;
-	height: ($button-size + $grid-unit-10);
 	border-radius: 0;
 
 	&:hover {
@@ -497,7 +421,7 @@ $block-inserter-tabs-height: 44px;
 			min-height: 240px;
 		}
 
-		.block-editor-block-preview__container {
+		.block-editor-inserter__media-list__list-item {
 			height: inherit;
 			min-height: 100px;
 			max-height: 800px;
@@ -505,18 +429,13 @@ $block-inserter-tabs-height: 44px;
 	}
 }
 
-.block-editor-inserter__patterns-category-panel-title {
-	font-size: calc(1.25 * 13px);
+.components-heading.block-editor-inserter__patterns-category-panel-title {
+	font-weight: 500;
 }
 
-.block-editor-inserter__media-tabs-container {
-	height: 100%;
-
-	nav {
-		height: 100%;
-	}
-
-	.block-editor-inserter__media-library-button {
+.block-editor-inserter__patterns-explore-button,
+.block-editor-inserter__media-library-button {
+	&.components-button {
 		padding: $grid-unit-20;
 		justify-content: center;
 		margin-top: $grid-unit-20;
@@ -524,76 +443,6 @@ $block-inserter-tabs-height: 44px;
 	}
 }
 
-.block-editor-inserter__media-tabs {
-	display: flex;
-	flex-direction: column;
-	padding: $grid-unit-20;
-	overflow-y: auto;
-	height: 100%;
-
-	// Push the listitem wrapping the "open media library" button to the bottom of the panel.
-	div[role="listitem"]:last-child {
-		margin-top: auto;
-	}
-
-	.block-editor-inserter__media-tabs__media-category {
-		// Account for the icon on the right so that it's visually balanced.
-		padding-right: $grid-unit-05;
-
-		&.is-selected {
-			color: var(--wp-admin-theme-color);
-			position: relative;
-
-			.components-flex-item {
-				filter: brightness(0.95);
-			}
-
-			svg {
-				fill: var(--wp-admin-theme-color);
-			}
-
-			&::after {
-				content: "";
-				position: absolute;
-				top: 0;
-				bottom: 0;
-				left: 0;
-				right: 0;
-				border-radius: $radius-block-ui;
-				opacity: 0.04;
-				background: var(--wp-admin-theme-color);
-			}
-		}
-	}
-}
-
-.block-editor-inserter__media-dialog {
-	background: $gray-100;
-	border-left: $border-width solid $gray-200;
-	border-right: $border-width solid $gray-200;
-	position: absolute;
-	padding: $grid-unit-20 $grid-unit-30;
-	top: 0;
-	left: 0;
-	height: 100%;
-	width: 100%;
-	overflow-y: auto;
-	scrollbar-gutter: stable both-edges;
-
-	@include break-medium {
-		left: 100%;
-		display: block;
-		width: 300px;
-	}
-
-	.block-editor-block-preview__container {
-		box-shadow: 0 15px 25px rgb(0 0 0 / 7%);
-		&:hover {
-			box-shadow: 0 0 0 2px $gray-900, 0 15px 25px rgb(0 0 0 / 7%);
-		}
-	}
-}
-
 .block-editor-inserter__media-panel {
 	min-height: 100%;
 	padding: 0 $grid-unit-20;
@@ -613,103 +462,102 @@ $block-inserter-tabs-height: 44px;
 	}
 
 	.block-editor-inserter__media-panel-search {
-		&.components-search-control {
-			input[type="search"].components-search-control__input {
-				background: $white;
-			}
-			button.components-button {
-				min-width: auto;
-				padding-left: $grid-unit-05 * 0.5;
-				padding-right: $grid-unit-05 * 0.5;
+		margin-bottom: $grid-unit-30;
+		// TODO: Consider using the Theme component to automatically adapt to a gray background.
+		@include break-medium() {
+			margin-bottom: 0;
+			padding: $grid-unit-20 $grid-unit-30 $grid-unit-20;
+
+			&:not(:focus-within) {
+				--wp-components-color-background: #{$white};
 			}
 		}
 	}
 }
 
-.block-editor-inserter__media-list {
-	margin-top: $grid-unit-20;
-	.block-editor-inserter__media-list__list-item {
-		position: relative;
-		cursor: pointer;
-		margin-bottom: $grid-unit-30;
+.block-editor-inserter__media-list__list-item {
+	position: relative;
+	cursor: pointer;
+	margin-bottom: $grid-unit-30;
 
-		&.is-placeholder {
-			min-height: 100px;
+	&.is-placeholder {
+		min-height: 100px;
+	}
+
+	&[draggable="true"] .block-editor-inserter__media-list__list-item {
+		cursor: grab;
+	}
+
+	&.is-hovered {
+		.block-editor-inserter__media-list__item-preview > * {
+			outline-color: rgba($black, 0.3);
 		}
 
-		&[draggable="true"] .block-editor-block-preview__container {
-			cursor: grab;
+		.block-editor-inserter__media-list__item-preview-options > button {
+			display: block;
 		}
+	}
 
-		&.is-hovered {
-			.block-editor-inserter__media-list__item-preview {
-				box-shadow: 0 0 0 2px $gray-900, 0 15px 25px rgb(0 0 0 / 7%);
-			}
+	.block-editor-inserter__media-list__item-preview-options {
+		position: absolute;
+		right: $grid-unit-10;
+		top: $grid-unit-10;
 
-			.block-editor-inserter__media-list__item-preview-options > button {
+		> button {
+			background: $white;
+			display: none;
+
+			// These styles are important so as focus isn't lost
+			// when the button is focused and we hover away.
+			&.is-opened,
+			&:focus {
 				display: block;
 			}
-		}
 
-		.block-editor-inserter__media-list__item-preview-options {
-			position: absolute;
-			right: $grid-unit-10;
-			top: $grid-unit-10;
-
-			> button {
-				background: $white;
-				border-radius: $radius-block-ui;
-				display: none;
-
-				// These styles are important so as focus isn't lost
-				// when the button is focused and we hover away.
-				&.is-opened,
-				&:focus {
-					display: block;
-				}
-
-				&:hover {
-					box-shadow: inset 0 0 0 2px $white, 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-
-					// Windows High Contrast mode will show this outline, but not the box-shadow.
-					outline: 2px solid transparent;
-				}
+			&:hover {
+				box-shadow: inset 0 0 0 2px $white, 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+
+				// Windows High Contrast mode will show this outline, but not the box-shadow.
+				outline: 2px solid transparent;
 			}
 		}
 	}
+}
 
-	.block-editor-inserter__media-list__item {
-		height: 100%;
+.block-editor-inserter__media-list__item {
+	height: 100%;
+
+	.block-editor-inserter__media-list__item-preview {
+		display: flex;
+		align-items: center;
+		overflow: hidden;
+		border-radius: $radius-small;
+
+		> * {
+			margin: 0 auto;
+			max-width: 100%;
+			outline: $border-width solid rgba($black, 0.1);
+			outline-offset: -$border-width;
+		}
 
-		.block-editor-inserter__media-list__item-preview {
+		.block-editor-inserter__media-list__item-preview-spinner {
 			display: flex;
+			height: 100%;
+			width: 100%;
+			position: absolute;
+			justify-content: center;
+			background: rgba($white, 0.7);
 			align-items: center;
-			overflow: hidden;
-			border-radius: 2px;
-
-			> * {
-				margin: 0 auto;
-				max-width: 100%;
-			}
-
-			.block-editor-inserter__media-list__item-preview-spinner {
-				display: flex;
-				height: 100%;
-				width: 100%;
-				position: absolute;
-				justify-content: center;
-				background: rgba($white, 0.7);
-				align-items: center;
-				pointer-events: none;
-			}
+			pointer-events: none;
 		}
+	}
 
-		&:focus .block-editor-inserter__media-list__item-preview {
-			box-shadow: inset 0 0 0 2px $white, 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-
-			// Windows High Contrast mode will show this outline, but not the box-shadow.
-			outline: 2px solid transparent;
-		}
+	&:focus .block-editor-inserter__media-list__item-preview > * {
+		outline-color: var(--wp-admin-theme-color);
+		outline-width: var(--wp-admin-border-width-focus);
+		outline-offset: calc((-1 * var(--wp-admin-border-width-focus)));
+		transition: outline 0.1s linear;
+		@include reduce-motion("transition");
 	}
 }
 
@@ -744,34 +592,52 @@ $block-inserter-tabs-height: 44px;
 	margin: $grid-unit-20 $grid-unit-20 0;
 }
 
-.reusable-blocks-menu-items__rename-hint {
-	align-items: top;
-	background: $gray-100;
-	border-radius: $radius-block-ui;
-	color: $gray-900;
-	display: flex;
-	flex-direction: row;
-	max-width: 380px;
+.block-editor-patterns__sync-status-filter {
+	.components-input-control__container {
+		select.components-select-control__input {
+			height: 40px;
+		}
+	}
 }
 
-.reusable-blocks-menu-items__rename-hint-content {
-	margin: $grid-unit-15 0 $grid-unit-15 $grid-unit-15;
+// Only relevant in zoom-out-mode
+.block-editor-inserter__pattern-panel-placeholder {
+	display: none;
 }
 
-.reusable-blocks-menu-items__rename-hint-dismiss {
-	// The dismiss button has a lot of empty space through its padding.
-	// Apply margin to visually align the icon with the top of the text to its left.
-	margin: $grid-unit-05 $grid-unit-05 $grid-unit-05 0;
+.block-editor-inserter__menu.is-zoom-out {
+	display: flex;
+	&.show-panel::after {
+		// Makes space for the inserter flyout panel
+		@include break-medium {
+			content: "";
+			display: block;
+			width: 300px;
+			height: 100%;
+		}
+	}
 }
 
-.components-menu-group .reusable-blocks-menu-items__rename-hint {
-	margin: 0;
-}
+.show-icon-labels {
+	@media (max-width: #{ ($break-large - 1) }) {
+		.block-editor-block-patterns-explorer .block-editor-patterns__grid-pagination {
+			flex-direction: column;
+			.block-editor-patterns__grid-pagination-previous,
+			.block-editor-patterns__grid-pagination-next {
+				flex-direction: column;
+			}
+		}
+	}
 
-.block-editor-patterns__sync-status-filter {
-	.components-input-control__container {
-		select.components-select-control__input {
-			height: 40px;
+	.block-editor-inserter__category-panel .block-editor-patterns__grid-pagination {
+		flex-direction: column;
+		.block-editor-patterns__grid-pagination-previous,
+		.block-editor-patterns__grid-pagination-next {
+			flex-direction: column;
 		}
 	}
 }
+
+.block-editor-tabbed-sidebar__tabpanel .block-editor-inserter__help-text {
+	padding: 0 $grid-unit-30 $grid-unit-20;
+}
diff --git a/packages/block-editor/src/components/inserter/tabs.js b/packages/block-editor/src/components/inserter/tabs.js
deleted file mode 100644
index a75e0029ef4900..00000000000000
--- a/packages/block-editor/src/components/inserter/tabs.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useMemo } from '@wordpress/element';
-import { TabPanel } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-const blocksTab = {
-	name: 'blocks',
-	/* translators: Blocks tab title in the block inserter. */
-	title: __( 'Blocks' ),
-};
-const patternsTab = {
-	name: 'patterns',
-	/* translators: Theme and Directory Patterns tab title in the block inserter. */
-	title: __( 'Patterns' ),
-};
-
-const mediaTab = {
-	name: 'media',
-	/* translators: Media tab title in the block inserter. */
-	title: __( 'Media' ),
-};
-
-function InserterTabs( {
-	children,
-	showPatterns = false,
-	showMedia = false,
-	onSelect,
-	prioritizePatterns,
-} ) {
-	const tabs = useMemo( () => {
-		const tempTabs = [];
-		if ( prioritizePatterns && showPatterns ) {
-			tempTabs.push( patternsTab );
-		}
-		tempTabs.push( blocksTab );
-		if ( ! prioritizePatterns && showPatterns ) {
-			tempTabs.push( patternsTab );
-		}
-		if ( showMedia ) {
-			tempTabs.push( mediaTab );
-		}
-		return tempTabs;
-	}, [ prioritizePatterns, showPatterns, showMedia ] );
-
-	return (
-		<TabPanel
-			className="block-editor-inserter__tabs"
-			tabs={ tabs }
-			onSelect={ onSelect }
-		>
-			{ children }
-		</TabPanel>
-	);
-}
-
-export default InserterTabs;
diff --git a/packages/block-editor/src/components/inserter/test/block-types-tab.native.js b/packages/block-editor/src/components/inserter/test/block-types-tab.native.js
deleted file mode 100644
index 925570130359a6..00000000000000
--- a/packages/block-editor/src/components/inserter/test/block-types-tab.native.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * External dependencies
- */
-import { render } from 'test/helpers';
-
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import items from './fixtures';
-import BlockTypesTab from '../block-types-tab';
-
-jest.mock( '../hooks/use-clipboard-block' );
-jest.mock( '@wordpress/data/src/components/use-select' );
-
-const selectMock = {
-	getCategories: jest.fn().mockReturnValue( [] ),
-	getCollections: jest.fn().mockReturnValue( [] ),
-	getInserterItems: jest.fn().mockReturnValue( [] ),
-	canInsertBlockType: jest.fn(),
-	getBlockType: jest.fn(),
-	getClipboard: jest.fn(),
-	getSettings: jest.fn( () => ( { impressions: {} } ) ),
-};
-
-describe( 'BlockTypesTab component', () => {
-	beforeEach( () => {
-		useSelect.mockImplementation( ( callback ) =>
-			callback( () => selectMock )
-		);
-	} );
-
-	it( 'renders without crashing', () => {
-		const component = render(
-			<BlockTypesTab
-				rootClientId={ 0 }
-				onSelect={ jest.fn() }
-				listProps={ { contentContainerStyle: {} } }
-			/>
-		);
-		expect( component ).toBeTruthy();
-	} );
-
-	it( 'shows block items', () => {
-		selectMock.getInserterItems.mockReturnValue( items );
-
-		const blockItems = items.filter(
-			( { id, category } ) =>
-				category !== 'reusable' && id !== 'core-embed/a-paragraph-embed'
-		);
-		const component = render(
-			<BlockTypesTab
-				rootClientId={ 0 }
-				onSelect={ jest.fn() }
-				listProps={ { contentContainerStyle: {} } }
-			/>
-		);
-
-		blockItems.forEach( ( item ) => {
-			expect( component.getByText( item.title ) ).toBeTruthy();
-		} );
-	} );
-} );
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/advanced-controls-panel.native.js b/packages/block-editor/src/components/inspector-controls-tabs/advanced-controls-panel.native.js
new file mode 100644
index 00000000000000..f0403139f271ae
--- /dev/null
+++ b/packages/block-editor/src/components/inspector-controls-tabs/advanced-controls-panel.native.js
@@ -0,0 +1,31 @@
+/**
+ * WordPress dependencies
+ */
+import { PanelBody } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import groups from '../inspector-controls/groups';
+
+export default function AdvancedControls( props ) {
+	const Slot = groups.advanced?.Slot;
+	if ( ! Slot ) {
+		return null;
+	}
+
+	return (
+		<Slot { ...props }>
+			{ ( fills ) => {
+				if ( ! fills.length ) {
+					return null;
+				}
+
+				return (
+					<PanelBody title={ __( 'Advanced' ) }>{ fills }</PanelBody>
+				);
+			} }
+		</Slot>
+	);
+}
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/index.js b/packages/block-editor/src/components/inspector-controls-tabs/index.js
index de192050d05cb2..12465df0ca467c 100644
--- a/packages/block-editor/src/components/inspector-controls-tabs/index.js
+++ b/packages/block-editor/src/components/inspector-controls-tabs/index.js
@@ -1,7 +1,13 @@
 /**
  * WordPress dependencies
  */
-import { TabPanel } from '@wordpress/components';
+import {
+	Icon,
+	Tooltip,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -11,6 +17,9 @@ import SettingsTab from './settings-tab';
 import StylesTab from './styles-tab';
 import InspectorControls from '../inspector-controls';
 import useIsListViewTabDisabled from './use-is-list-view-tab-disabled';
+import { unlock } from '../../lock-unlock';
+
+const { Tabs } = unlock( componentsPrivateApis );
 
 export default function InspectorControlsTabs( {
 	blockName,
@@ -18,6 +27,10 @@ export default function InspectorControlsTabs( {
 	hasBlockStyles,
 	tabs,
 } ) {
+	const showIconLabels = useSelect( ( select ) => {
+		return select( preferencesStore ).get( 'core', 'showIconLabels' );
+	}, [] );
+
 	// The tabs panel will mount before fills are rendered to the list view
 	// slot. This means the list view tab isn't initially included in the
 	// available tabs so the panel defaults selection to the settings tab
@@ -26,34 +39,42 @@ export default function InspectorControlsTabs( {
 	const initialTabName = ! useIsListViewTabDisabled( blockName )
 		? TAB_LIST_VIEW.name
 		: undefined;
-	return (
-		<TabPanel
-			className="block-editor-block-inspector__tabs"
-			tabs={ tabs }
-			initialTabName={ initialTabName }
-			key={ clientId }
-		>
-			{ ( tab ) => {
-				if ( tab.name === TAB_SETTINGS.name ) {
-					return (
-						<SettingsTab showAdvancedControls={ !! blockName } />
-					);
-				}
 
-				if ( tab.name === TAB_STYLES.name ) {
-					return (
-						<StylesTab
-							blockName={ blockName }
-							clientId={ clientId }
-							hasBlockStyles={ hasBlockStyles }
-						/>
-					);
-				}
-
-				if ( tab.name === TAB_LIST_VIEW.name ) {
-					return <InspectorControls.Slot group="list" />;
-				}
-			} }
-		</TabPanel>
+	return (
+		<div className="block-editor-block-inspector__tabs">
+			<Tabs defaultTabId={ initialTabName } key={ clientId }>
+				<Tabs.TabList>
+					{ tabs.map( ( tab ) =>
+						showIconLabels ? (
+							<Tabs.Tab key={ tab.name } tabId={ tab.name }>
+								{ tab.title }
+							</Tabs.Tab>
+						) : (
+							<Tooltip text={ tab.title } key={ tab.name }>
+								<Tabs.Tab
+									tabId={ tab.name }
+									aria-label={ tab.title }
+								>
+									<Icon icon={ tab.icon } />
+								</Tabs.Tab>
+							</Tooltip>
+						)
+					) }
+				</Tabs.TabList>
+				<Tabs.TabPanel tabId={ TAB_SETTINGS.name } focusable={ false }>
+					<SettingsTab showAdvancedControls={ !! blockName } />
+				</Tabs.TabPanel>
+				<Tabs.TabPanel tabId={ TAB_STYLES.name } focusable={ false }>
+					<StylesTab
+						blockName={ blockName }
+						clientId={ clientId }
+						hasBlockStyles={ hasBlockStyles }
+					/>
+				</Tabs.TabPanel>
+				<Tabs.TabPanel tabId={ TAB_LIST_VIEW.name } focusable={ false }>
+					<InspectorControls.Slot group="list" />
+				</Tabs.TabPanel>
+			</Tabs>
+		</div>
 	);
 }
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/settings-tab-hint.js b/packages/block-editor/src/components/inspector-controls-tabs/settings-tab-hint.js
deleted file mode 100644
index 4fc829817b4e0f..00000000000000
--- a/packages/block-editor/src/components/inspector-controls-tabs/settings-tab-hint.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Button } from '@wordpress/components';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { focus } from '@wordpress/dom';
-import { useRef } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { close } from '@wordpress/icons';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-const PREFERENCE_NAME = 'isInspectorControlsTabsHintVisible';
-
-export default function InspectorControlsTabsHint() {
-	const isInspectorControlsTabsHintVisible = useSelect(
-		( select ) =>
-			select( preferencesStore ).get( 'core', PREFERENCE_NAME ) ?? true,
-		[]
-	);
-
-	const ref = useRef();
-
-	const { set: setPreference } = useDispatch( preferencesStore );
-	if ( ! isInspectorControlsTabsHintVisible ) {
-		return null;
-	}
-
-	return (
-		<div ref={ ref } className="block-editor-inspector-controls-tabs__hint">
-			<div className="block-editor-inspector-controls-tabs__hint-content">
-				{ __(
-					"Looking for other block settings? They've moved to the styles tab."
-				) }
-			</div>
-			<Button
-				className="block-editor-inspector-controls-tabs__hint-dismiss"
-				icon={ close }
-				iconSize="16"
-				label={ __( 'Dismiss hint' ) }
-				onClick={ () => {
-					// Retain focus when dismissing the element.
-					const previousElement = focus.tabbable.findPrevious(
-						ref.current
-					);
-					previousElement?.focus();
-					setPreference( 'core', PREFERENCE_NAME, false );
-				} }
-				showTooltip={ false }
-			/>
-		</div>
-	);
-}
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/settings-tab.js b/packages/block-editor/src/components/inspector-controls-tabs/settings-tab.js
index bd462837442fe9..ea2f45114bf9cf 100644
--- a/packages/block-editor/src/components/inspector-controls-tabs/settings-tab.js
+++ b/packages/block-editor/src/components/inspector-controls-tabs/settings-tab.js
@@ -4,18 +4,17 @@
 import AdvancedControls from './advanced-controls-panel';
 import PositionControls from './position-controls-panel';
 import { default as InspectorControls } from '../inspector-controls';
-import SettingsTabHint from './settings-tab-hint';
 
 const SettingsTab = ( { showAdvancedControls = false } ) => (
 	<>
 		<InspectorControls.Slot />
 		<PositionControls />
+		<InspectorControls.Slot group="bindings" />
 		{ showAdvancedControls && (
 			<div>
 				<AdvancedControls />
 			</div>
 		) }
-		<SettingsTabHint />
 	</>
 );
 
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/style.scss b/packages/block-editor/src/components/inspector-controls-tabs/style.scss
index da83073a45590a..9c9b04f7b84734 100644
--- a/packages/block-editor/src/components/inspector-controls-tabs/style.scss
+++ b/packages/block-editor/src/components/inspector-controls-tabs/style.scss
@@ -1,35 +1,3 @@
-.show-icon-labels {
-	.block-editor-block-inspector__tabs .components-tab-panel__tabs {
-		.components-button.has-icon {
-			// Hide the button icons when labels are set to display...
-			svg {
-				display: none;
-			}
-			// ... and display labels.
-			// Uses ::before as ::after is already used for active tab styling.
-			&::before {
-				content: attr(aria-label);
-			}
-		}
-	}
-}
-
-.block-editor-inspector-controls-tabs__hint {
-	align-items: top;
-	background: $gray-100;
-	border-radius: $radius-block-ui;
-	color: $gray-900;
-	display: flex;
-	flex-direction: row;
-	margin: $grid-unit-20;
-}
-
-.block-editor-inspector-controls-tabs__hint-content {
-	margin: $grid-unit-15 0 $grid-unit-15 $grid-unit-15;
-}
-
-.block-editor-inspector-controls-tabs__hint-dismiss {
-	// The dismiss button has a lot of empty space through its padding.
-	// Apply margin to visually align the icon with the top of the text to its left.
-	margin: $grid-unit-05 $grid-unit-05 $grid-unit-05 0;
+.block-editor-block-inspector__tabs [role="tablist"] {
+	width: 100%;
 }
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js b/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js
index d42b3bffce4ebc..e45805a51391a4 100644
--- a/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js
+++ b/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js
@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import { hasBlockSupport } from '@wordpress/blocks';
 import { PanelBody } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
@@ -9,21 +8,18 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import BlockStyles from '../block-styles';
-import DefaultStylePicker from '../default-style-picker';
 import InspectorControls from '../inspector-controls';
+import { useBorderPanelLabel } from '../../hooks/border';
 
 const StylesTab = ( { blockName, clientId, hasBlockStyles } ) => {
+	const borderPanelLabel = useBorderPanelLabel( { blockName } );
+
 	return (
 		<>
 			{ hasBlockStyles && (
 				<div>
 					<PanelBody title={ __( 'Styles' ) }>
 						<BlockStyles clientId={ clientId } />
-						{ hasBlockSupport(
-							blockName,
-							'defaultStylePicker',
-							true
-						) && <DefaultStylePicker blockName={ blockName } /> }
 					</PanelBody>
 				</div>
 			) }
@@ -34,7 +30,7 @@ const StylesTab = ( { blockName, clientId, hasBlockStyles } ) => {
 			/>
 			<InspectorControls.Slot
 				group="background"
-				label={ __( 'Background' ) }
+				label={ __( 'Background image' ) }
 			/>
 			<InspectorControls.Slot group="filter" />
 			<InspectorControls.Slot
@@ -45,7 +41,7 @@ const StylesTab = ( { blockName, clientId, hasBlockStyles } ) => {
 				group="dimensions"
 				label={ __( 'Dimensions' ) }
 			/>
-			<InspectorControls.Slot group="border" label={ __( 'Border' ) } />
+			<InspectorControls.Slot group="border" label={ borderPanelLabel } />
 			<InspectorControls.Slot group="styles" />
 		</>
 	);
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js b/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js
index 2a47ae5267ca4e..6a80d47f024816 100644
--- a/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js
+++ b/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js
@@ -32,6 +32,7 @@ function getShowTabs( blockName, tabSettings = {} ) {
 export default function useInspectorControlsTabs( blockName ) {
 	const tabs = [];
 	const {
+		bindings: bindingsGroup,
 		border: borderGroup,
 		color: colorGroup,
 		default: defaultGroup,
@@ -40,6 +41,7 @@ export default function useInspectorControlsTabs( blockName ) {
 		position: positionGroup,
 		styles: stylesGroup,
 		typography: typographyGroup,
+		effects: effectsGroup,
 	} = InspectorControlsGroups;
 
 	// List View Tab: If there are any fills for the list group add that tab.
@@ -55,6 +57,7 @@ export default function useInspectorControlsTabs( blockName ) {
 		...( useSlotFills( dimensionsGroup.Slot.__unstableName ) || [] ),
 		...( useSlotFills( stylesGroup.Slot.__unstableName ) || [] ),
 		...( useSlotFills( typographyGroup.Slot.__unstableName ) || [] ),
+		...( useSlotFills( effectsGroup.Slot.__unstableName ) || [] ),
 	];
 	const hasStyleFills = styleFills.length;
 
@@ -62,8 +65,10 @@ export default function useInspectorControlsTabs( blockName ) {
 	// (i.e. both list view and styles), check only the default and position
 	// InspectorControls slots. If we have multiple tabs, we'll need to check
 	// the advanced controls slot as well to ensure they are rendered.
-	const advancedFills =
-		useSlotFills( InspectorAdvancedControls.slotName ) || [];
+	const advancedFills = [
+		...( useSlotFills( InspectorAdvancedControls.slotName ) || [] ),
+		...( useSlotFills( bindingsGroup.Slot.__unstableName ) || [] ),
+	];
 
 	const settingsFills = [
 		...( useSlotFills( defaultGroup.Slot.__unstableName ) || [] ),
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/utils.js b/packages/block-editor/src/components/inspector-controls-tabs/utils.js
index b70eb25e274a9b..ff05e79cbd37cc 100644
--- a/packages/block-editor/src/components/inspector-controls-tabs/utils.js
+++ b/packages/block-editor/src/components/inspector-controls-tabs/utils.js
@@ -9,7 +9,6 @@ export const TAB_SETTINGS = {
 	title: __( 'Settings' ),
 	value: 'settings',
 	icon: cog,
-	className: 'block-editor-block-inspector__tab-item',
 };
 
 export const TAB_STYLES = {
@@ -17,7 +16,6 @@ export const TAB_STYLES = {
 	title: __( 'Styles' ),
 	value: 'styles',
 	icon: styles,
-	className: 'block-editor-block-inspector__tab-item',
 };
 
 export const TAB_LIST_VIEW = {
@@ -25,5 +23,4 @@ export const TAB_LIST_VIEW = {
 	title: __( 'List View' ),
 	value: 'list-view',
 	icon: listView,
-	className: 'block-editor-block-inspector__tab-item',
 };
diff --git a/packages/block-editor/src/components/inspector-controls/README.md b/packages/block-editor/src/components/inspector-controls/README.md
index cc68c7cae7c78e..fd4847f53472b2 100644
--- a/packages/block-editor/src/components/inspector-controls/README.md
+++ b/packages/block-editor/src/components/inspector-controls/README.md
@@ -96,6 +96,7 @@ registerBlockType( 'my-plugin/inspector-controls-example', {
 				<InspectorControls>
 					<PanelBody title={ __( 'Settings' ) }>
 						<CheckboxControl
+							__nextHasNoMarginBottom
 							heading="Checkbox Field"
 							label="Tick Me"
 							help="Additional help text"
@@ -114,6 +115,7 @@ registerBlockType( 'my-plugin/inspector-controls-example', {
 						/>
 
 						<TextControl
+							__nextHasNoMarginBottom
 							label="Text Field"
 							help="Additional help text"
 							value={ textField }
@@ -121,12 +123,14 @@ registerBlockType( 'my-plugin/inspector-controls-example', {
 						/>
 
 						<ToggleControl
+							__nextHasNoMarginBottom
 							label="Toggle Field"
 							checked={ toggleField }
 							onChange={ onChangeToggleField }
 						/>
 
 						<SelectControl
+							__nextHasNoMarginBottom
 							label="Select Control"
 							value={ selectField }
 							options={ [
@@ -203,6 +207,7 @@ function MyBlockEdit( { attributes, setAttributes } ) {
 			</InspectorControls>
 			<InspectorAdvancedControls>
 				<TextControl
+					__nextHasNoMarginBottom
 					label="HTML anchor"
 					value={ attributes.anchor }
 					onChange={ ( nextValue ) => {
diff --git a/packages/block-editor/src/components/inspector-controls/block-support-tools-panel.js b/packages/block-editor/src/components/inspector-controls/block-support-tools-panel.js
index 46ec5839726e6a..3eee7bf1b09574 100644
--- a/packages/block-editor/src/components/inspector-controls/block-support-tools-panel.js
+++ b/packages/block-editor/src/components/inspector-controls/block-support-tools-panel.js
@@ -10,6 +10,7 @@ import { useCallback } from '@wordpress/element';
  */
 import { store as blockEditorStore } from '../../store';
 import { cleanEmptyObject } from '../../hooks/utils';
+import { useToolsPanelDropdownMenuProps } from '../global-styles/utils';
 
 export default function BlockSupportToolsPanel( { children, group, label } ) {
 	const { updateBlockAttributes } = useDispatch( blockEditorStore );
@@ -19,7 +20,7 @@ export default function BlockSupportToolsPanel( { children, group, label } ) {
 		getSelectedBlockClientId,
 		hasMultiSelection,
 	} = useSelect( blockEditorStore );
-
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 	const panelId = getSelectedBlockClientId();
 	const resetAll = useCallback(
 		( resetFilters = [] ) => {
@@ -67,10 +68,11 @@ export default function BlockSupportToolsPanel( { children, group, label } ) {
 			resetAll={ resetAll }
 			key={ panelId }
 			panelId={ panelId }
-			hasInnerWrapper={ true }
-			shouldRenderPlaceholderItems={ true } // Required to maintain fills ordering.
+			hasInnerWrapper
+			shouldRenderPlaceholderItems // Required to maintain fills ordering.
 			__experimentalFirstVisibleItemClass="first"
 			__experimentalLastVisibleItemClass="last"
+			dropdownMenuProps={ dropdownMenuProps }
 		>
 			{ children }
 		</ToolsPanel>
diff --git a/packages/block-editor/src/components/inspector-controls/fill.js b/packages/block-editor/src/components/inspector-controls/fill.js
index f0640a9d31ddc5..456b33af9137fe 100644
--- a/packages/block-editor/src/components/inspector-controls/fill.js
+++ b/packages/block-editor/src/components/inspector-controls/fill.js
@@ -12,7 +12,10 @@ import { useEffect, useContext } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import useDisplayBlockControls from '../use-display-block-controls';
+import {
+	useBlockEditContext,
+	mayDisplayControlsKey,
+} from '../block-edit/context';
 import groups from './groups';
 
 export default function InspectorControlsFill( {
@@ -33,13 +36,13 @@ export default function InspectorControlsFill( {
 		group = __experimentalGroup;
 	}
 
-	const isDisplayed = useDisplayBlockControls();
+	const context = useBlockEditContext();
 	const Fill = groups[ group ]?.Fill;
 	if ( ! Fill ) {
 		warning( `Unknown InspectorControls group "${ group }" provided.` );
 		return null;
 	}
-	if ( ! isDisplayed ) {
+	if ( ! context[ mayDisplayControlsKey ] ) {
 		return null;
 	}
 
diff --git a/packages/block-editor/src/components/inspector-controls/fill.native.js b/packages/block-editor/src/components/inspector-controls/fill.native.js
index d38d865cd15cc0..69da92dd42b378 100644
--- a/packages/block-editor/src/components/inspector-controls/fill.native.js
+++ b/packages/block-editor/src/components/inspector-controls/fill.native.js
@@ -15,7 +15,10 @@ import deprecated from '@wordpress/deprecated';
  * Internal dependencies
  */
 import groups from './groups';
-import useDisplayBlockControls from '../use-display-block-controls';
+import {
+	useBlockEditContext,
+	mayDisplayControlsKey,
+} from '../block-edit/context';
 import { BlockSettingsButton } from '../block-settings';
 
 export default function InspectorControlsFill( {
@@ -35,25 +38,23 @@ export default function InspectorControlsFill( {
 		);
 		group = __experimentalGroup;
 	}
-	const isDisplayed = useDisplayBlockControls();
+	const context = useBlockEditContext();
 
 	const Fill = groups[ group ]?.Fill;
 	if ( ! Fill ) {
 		warning( `Unknown InspectorControls group "${ group }" provided.` );
 		return null;
 	}
-	if ( ! isDisplayed ) {
+	if ( ! context[ mayDisplayControlsKey ] ) {
 		return null;
 	}
 
 	return (
 		<>
 			<Fill { ...props }>
-				{
-					<BottomSheetConsumer>
-						{ () => <View>{ children }</View> }
-					</BottomSheetConsumer>
-				}
+				<BottomSheetConsumer>
+					{ () => <View>{ children }</View> }
+				</BottomSheetConsumer>
 			</Fill>
 			{ Children.count( children ) > 0 && <BlockSettingsButton /> }
 		</>
diff --git a/packages/block-editor/src/components/inspector-controls/groups.js b/packages/block-editor/src/components/inspector-controls/groups.js
index b4eada4b6b4be6..34ec49a5e1cb41 100644
--- a/packages/block-editor/src/components/inspector-controls/groups.js
+++ b/packages/block-editor/src/components/inspector-controls/groups.js
@@ -5,6 +5,7 @@ import { createSlotFill } from '@wordpress/components';
 
 const InspectorControlsDefault = createSlotFill( 'InspectorControls' );
 const InspectorControlsAdvanced = createSlotFill( 'InspectorAdvancedControls' );
+const InspectorControlsBindings = createSlotFill( 'InspectorControlsBindings' );
 const InspectorControlsBackground = createSlotFill(
 	'InspectorControlsBackground'
 );
@@ -20,14 +21,17 @@ const InspectorControlsTypography = createSlotFill(
 );
 const InspectorControlsListView = createSlotFill( 'InspectorControlsListView' );
 const InspectorControlsStyles = createSlotFill( 'InspectorControlsStyles' );
+const InspectorControlsEffects = createSlotFill( 'InspectorControlsEffects' );
 
 const groups = {
 	default: InspectorControlsDefault,
 	advanced: InspectorControlsAdvanced,
 	background: InspectorControlsBackground,
+	bindings: InspectorControlsBindings,
 	border: InspectorControlsBorder,
 	color: InspectorControlsColor,
 	dimensions: InspectorControlsDimensions,
+	effects: InspectorControlsEffects,
 	filter: InspectorControlsFilter,
 	list: InspectorControlsListView,
 	position: InspectorControlsPosition,
diff --git a/packages/block-editor/src/components/inspector-popover-header/index.js b/packages/block-editor/src/components/inspector-popover-header/index.js
index e5f492eddd2b77..cf6bf0d3d6796e 100644
--- a/packages/block-editor/src/components/inspector-popover-header/index.js
+++ b/packages/block-editor/src/components/inspector-popover-header/index.js
@@ -31,6 +31,7 @@ export default function InspectorPopoverHeader( {
 				<Spacer />
 				{ actions.map( ( { label, icon, onClick } ) => (
 					<Button
+						size="small"
 						key={ label }
 						className="block-editor-inspector-popover-header__action"
 						label={ label }
@@ -43,6 +44,7 @@ export default function InspectorPopoverHeader( {
 				) ) }
 				{ onClose && (
 					<Button
+						size="small"
 						className="block-editor-inspector-popover-header__action"
 						label={ __( 'Close' ) }
 						icon={ closeSmall }
diff --git a/packages/block-editor/src/components/inspector-popover-header/style.scss b/packages/block-editor/src/components/inspector-popover-header/style.scss
index ebb76aab23e28a..1ce9ec07f64094 100644
--- a/packages/block-editor/src/components/inspector-popover-header/style.scss
+++ b/packages/block-editor/src/components/inspector-popover-header/style.scss
@@ -1,16 +1,3 @@
 .block-editor-inspector-popover-header {
 	margin-bottom: $grid-unit-20;
 }
-
-[class].block-editor-inspector-popover-header__action {
-	height: $icon-size;
-
-	&.has-icon {
-		min-width: $icon-size;
-		padding: 0;
-	}
-
-	&:not(.has-icon) {
-		text-decoration: underline;
-	}
-}
diff --git a/packages/block-editor/src/components/keyboard-shortcuts/index.js b/packages/block-editor/src/components/keyboard-shortcuts/index.js
index 0e0a57257becca..9b838446469229 100644
--- a/packages/block-editor/src/components/keyboard-shortcuts/index.js
+++ b/packages/block-editor/src/components/keyboard-shortcuts/index.js
@@ -132,6 +132,29 @@ function KeyboardShortcutsRegister() {
 				character: 'y',
 			},
 		} );
+
+		// List view shortcuts.
+		registerShortcut( {
+			name: 'core/block-editor/collapse-list-view',
+			category: 'list-view',
+			description: __( 'Collapse all other items.' ),
+			keyCombination: {
+				modifier: 'alt',
+				character: 'l',
+			},
+		} );
+
+		registerShortcut( {
+			name: 'core/block-editor/group',
+			category: 'block',
+			description: __(
+				'Create a group block from the selected multiple blocks.'
+			),
+			keyCombination: {
+				modifier: 'primary',
+				character: 'g',
+			},
+		} );
 	}, [ registerShortcut ] );
 
 	return null;
diff --git a/packages/block-editor/src/components/letter-spacing-control/README.md b/packages/block-editor/src/components/letter-spacing-control/README.md
index fb4dd4fd23daca..ef119bbc943d2f 100644
--- a/packages/block-editor/src/components/letter-spacing-control/README.md
+++ b/packages/block-editor/src/components/letter-spacing-control/README.md
@@ -5,11 +5,6 @@ The `LetterSpacingControl` component renders a [`UnitControl`](https://github.co
 This component is used for blocks that display text, commonly inside a 
 [`ToolsPanelItem`](https://github.com/WordPress/gutenberg/blob/trunk/packages/components/src/tools-panel/tools-panel-item/README.md).
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
@@ -43,13 +38,20 @@ The current value of the letter spacing setting.
 
 A callback function invoked when the value is changed.
 
-### `_unstableInputWidth`
+### `__unstableInputWidth`
 
 -   **Type:** `string|number|undefined`
 -   **Default:** `undefined`
 
 Input width to pass through to inner UnitControl. Should be a valid CSS value.
 
+#### `__next40pxDefaultSize`
+
+- **Type:** `boolean`
+- **Default:** `false`
+
+Start opting into the larger default height that will become the default size in a future version.
+
 ## Related components
 
 Block Editor components are components that can be used to compose the UI of your block editor. Thus, they can only be used under a [`BlockEditorProvider`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/provider/README.md) in the components tree.
diff --git a/packages/block-editor/src/components/letter-spacing-control/index.js b/packages/block-editor/src/components/letter-spacing-control/index.js
index 2c36e59cd8241c..1577e184c4a06c 100644
--- a/packages/block-editor/src/components/letter-spacing-control/index.js
+++ b/packages/block-editor/src/components/letter-spacing-control/index.js
@@ -15,14 +15,16 @@ import { useSettings } from '../../components/use-settings';
 /**
  * Control for letter-spacing.
  *
- * @param {Object}                  props                      Component props.
- * @param {string}                  props.value                Currently selected letter-spacing.
- * @param {Function}                props.onChange             Handles change in letter-spacing selection.
- * @param {string|number|undefined} props.__unstableInputWidth Input width to pass through to inner UnitControl. Should be a valid CSS value.
+ * @param {Object}                  props                       Component props.
+ * @param {boolean}                 props.__next40pxDefaultSize Start opting into the larger default height that will become the default size in a future version.
+ * @param {string}                  props.value                 Currently selected letter-spacing.
+ * @param {Function}                props.onChange              Handles change in letter-spacing selection.
+ * @param {string|number|undefined} props.__unstableInputWidth  Input width to pass through to inner UnitControl. Should be a valid CSS value.
  *
  * @return {Element} Letter-spacing control.
  */
 export default function LetterSpacingControl( {
+	__next40pxDefaultSize = false,
 	value,
 	onChange,
 	__unstableInputWidth = '60px',
@@ -35,6 +37,7 @@ export default function LetterSpacingControl( {
 	} );
 	return (
 		<UnitControl
+			__next40pxDefaultSize={ __next40pxDefaultSize }
 			{ ...otherProps }
 			label={ __( 'Letter spacing' ) }
 			value={ value }
diff --git a/packages/block-editor/src/components/line-height-control/README.md b/packages/block-editor/src/components/line-height-control/README.md
index 36f9d17f15bd65..89bcc69622367f 100644
--- a/packages/block-editor/src/components/line-height-control/README.md
+++ b/packages/block-editor/src/components/line-height-control/README.md
@@ -6,11 +6,6 @@ The `LineHeightControl` component adds a lineHeight attribute to the core Paragr
 
 _Note:_ It is worth noting that the line height setting option is an opt-in feature. [Themes need to declare support for it](/docs/how-to-guides/themes/theme-support.md#supporting-custom-line-heights) before it'll be available.
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
@@ -23,7 +18,6 @@ const MyLineHeightControl = () => (
 	<LineHeightControl
 		value={ lineHeight }
 		onChange={ onChange }
-		__nextHasNoMarginBottom={ true }
 	/>
 );
 ```
@@ -42,12 +36,12 @@ The value of the line height.
 
 A callback function that handles the application of the line height value.
 
-#### `__nextHasNoMarginBottom`
+#### `__next40pxDefaultSize`
 
--   **Type:** `boolean`
--   **Default:** `false`
+- **Type:** `boolean`
+- **Default:** `false`
 
-Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 6.4. (The prop can be safely removed once this happens.)
+Start opting into the larger default height that will become the default size in a future version.
 
 ## Related components
 
diff --git a/packages/block-editor/src/components/line-height-control/index.js b/packages/block-editor/src/components/line-height-control/index.js
index a57add244cc76d..b2c99c03f87840 100644
--- a/packages/block-editor/src/components/line-height-control/index.js
+++ b/packages/block-editor/src/components/line-height-control/index.js
@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import deprecated from '@wordpress/deprecated';
 import { __ } from '@wordpress/i18n';
 import { __experimentalNumberControl as NumberControl } from '@wordpress/components';
 
@@ -17,10 +16,10 @@ import {
 } from './utils';
 
 const LineHeightControl = ( {
+	/** Start opting into the larger default height that will become the default size in a future version. */
+	__next40pxDefaultSize = false,
 	value: lineHeight,
 	onChange,
-	/** Start opting into the new margin-free styles that will become the default in a future version. */
-	__nextHasNoMarginBottom = false,
 	__unstableInputWidth = '60px',
 	...otherProps
 } ) => {
@@ -28,7 +27,9 @@ const LineHeightControl = ( {
 
 	const adjustNextValue = ( nextValue, wasTypedOrPasted ) => {
 		// Set the next value without modification if lineHeight has been defined.
-		if ( isDefined ) return nextValue;
+		if ( isDefined ) {
+			return nextValue;
+		}
 
 		/**
 		 * The following logic handles the initial spin up/down action
@@ -47,7 +48,9 @@ const LineHeightControl = ( {
 			case '0': {
 				// This means the user explicitly input '0', rather than using the
 				// spin down action from an undefined value state.
-				if ( wasTypedOrPasted ) return nextValue;
+				if ( wasTypedOrPasted ) {
+					return nextValue;
+				}
 				// Decrement by spin value.
 				return BASE_DEFAULT_VALUE - spin;
 			}
@@ -72,20 +75,6 @@ const LineHeightControl = ( {
 
 	const value = isDefined ? lineHeight : RESET_VALUE;
 
-	if ( ! __nextHasNoMarginBottom ) {
-		deprecated(
-			'Bottom margin styles for wp.blockEditor.LineHeightControl',
-			{
-				since: '6.0',
-				version: '6.4',
-				hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version',
-			}
-		);
-	}
-	const deprecatedStyles = __nextHasNoMarginBottom
-		? undefined
-		: { marginBottom: 24 };
-
 	const handleOnChange = ( nextValue, { event } ) => {
 		if ( nextValue === '' ) {
 			onChange();
@@ -101,12 +90,10 @@ const LineHeightControl = ( {
 	};
 
 	return (
-		<div
-			className="block-editor-line-height-control"
-			style={ deprecatedStyles }
-		>
+		<div className="block-editor-line-height-control">
 			<NumberControl
 				{ ...otherProps }
+				__next40pxDefaultSize={ __next40pxDefaultSize }
 				__unstableInputWidth={ __unstableInputWidth }
 				__unstableStateReducer={ stateReducer }
 				onChange={ handleOnChange }
diff --git a/packages/block-editor/src/components/line-height-control/stories/index.story.js b/packages/block-editor/src/components/line-height-control/stories/index.story.js
index 76da83304d4890..6d26fe2220fd23 100644
--- a/packages/block-editor/src/components/line-height-control/stories/index.story.js
+++ b/packages/block-editor/src/components/line-height-control/stories/index.story.js
@@ -22,7 +22,6 @@ const Template = ( props ) => {
 
 export const Default = Template.bind( {} );
 Default.args = {
-	__nextHasNoMarginBottom: true,
 	__unstableInputWidth: '100px',
 };
 
diff --git a/packages/block-editor/src/components/line-height-control/test/index.js b/packages/block-editor/src/components/line-height-control/test/index.js
index 3b997c07e9212c..b98bc93c48a83a 100644
--- a/packages/block-editor/src/components/line-height-control/test/index.js
+++ b/packages/block-editor/src/components/line-height-control/test/index.js
@@ -1,13 +1,13 @@
 /**
  * External dependencies
  */
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 /**
  * WordPress dependencies
  */
 import { useState } from '@wordpress/element';
-import { UP, DOWN } from '@wordpress/keycodes';
 
 /**
  * Internal dependencies
@@ -19,45 +19,41 @@ const SPIN = STEP * SPIN_FACTOR;
 
 const ControlledLineHeightControl = () => {
 	const [ value, setValue ] = useState();
-	return (
-		<LineHeightControl
-			value={ value }
-			onChange={ setValue }
-			__nextHasNoMarginBottom={ true }
-		/>
-	);
+	return <LineHeightControl value={ value } onChange={ setValue } />;
 };
 
 describe( 'LineHeightControl', () => {
-	it( 'should immediately step up from the default value if up-arrowed from an unset state', () => {
+	it( 'should immediately step up from the default value if up-arrowed from an unset state', async () => {
+		const user = userEvent.setup();
 		render( <ControlledLineHeightControl /> );
 		const input = screen.getByRole( 'spinbutton' );
-		act( () => input.focus() );
-		fireEvent.keyDown( input, { keyCode: UP } );
+		await user.click( input );
+		await user.keyboard( '{ArrowUp}' );
 		expect( input ).toHaveValue( BASE_DEFAULT_VALUE + SPIN );
 	} );
 
-	it( 'should immediately step down from the default value if down-arrowed from an unset state', () => {
+	it( 'should immediately step down from the default value if down-arrowed from an unset state', async () => {
+		const user = userEvent.setup();
 		render( <ControlledLineHeightControl /> );
 		const input = screen.getByRole( 'spinbutton' );
-		act( () => input.focus() );
-		fireEvent.keyDown( input, { keyCode: DOWN } );
+		await user.click( input );
+		await user.keyboard( '{ArrowDown}' );
 		expect( input ).toHaveValue( BASE_DEFAULT_VALUE - SPIN );
 	} );
 
-	it( 'should immediately step up from the default value if spin button up was clicked from an unset state', () => {
+	it( 'should immediately step up from the default value if spin button up was clicked from an unset state', async () => {
+		const user = userEvent.setup();
 		render( <ControlledLineHeightControl /> );
 		const input = screen.getByRole( 'spinbutton' );
-		act( () => input.focus() );
-		fireEvent.change( input, { target: { value: 0.1 } } ); // simulates click on spin button up
+		await user.click( screen.getByRole( 'button', { name: 'Increment' } ) );
 		expect( input ).toHaveValue( BASE_DEFAULT_VALUE + SPIN );
 	} );
 
-	it( 'should immediately step down from the default value if spin button down was clicked from an unset state', () => {
+	it( 'should immediately step down from the default value if spin button down was clicked from an unset state', async () => {
+		const user = userEvent.setup();
 		render( <ControlledLineHeightControl /> );
 		const input = screen.getByRole( 'spinbutton' );
-		act( () => input.focus() );
-		fireEvent.change( input, { target: { value: 0 } } ); // simulates click on spin button down
+		await user.click( screen.getByRole( 'button', { name: 'Decrement' } ) );
 		expect( input ).toHaveValue( BASE_DEFAULT_VALUE - SPIN );
 	} );
 } );
diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
index a208fa20d242ff..0f2ae4a0e05d26 100644
--- a/packages/block-editor/src/components/link-control/index.js
+++ b/packages/block-editor/src/components/link-control/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,6 +12,7 @@ import {
 	Notice,
 	TextControl,
 	__experimentalHStack as HStack,
+	__experimentalInputControlSuffixWrapper as InputControlSuffixWrapper,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useRef, useState, useEffect } from '@wordpress/element';
@@ -180,10 +181,10 @@ function LinkControl( {
 	// Therefore a local state is used as a fallback.
 	const isSettingsOpen = advancedSettingsPreference || settingsOpen;
 
-	const isMounting = useRef( true );
+	const isMountingRef = useRef( true );
 	const wrapperNode = useRef();
 	const textInputRef = useRef();
-	const isEndingEditWithFocus = useRef( false );
+	const isEndingEditWithFocusRef = useRef( false );
 
 	const settingsKeys = settings.map( ( { id } ) => id );
 
@@ -219,8 +220,7 @@ function LinkControl( {
 		// We don't auto focus into the Link UI on mount
 		// because otherwise using the keyboard to select text
 		// *within* the link format is not possible.
-		if ( isMounting.current ) {
-			isMounting.current = false;
+		if ( isMountingRef.current ) {
 			return;
 		}
 
@@ -235,9 +235,19 @@ function LinkControl( {
 
 		nextFocusTarget.focus();
 
-		isEndingEditWithFocus.current = false;
+		isEndingEditWithFocusRef.current = false;
 	}, [ isEditingLink, isCreatingPage ] );
 
+	// The component mounting reference is maintained separately
+	// to correctly reset values in `StrictMode`.
+	useEffect( () => {
+		isMountingRef.current = false;
+
+		return () => {
+			isMountingRef.current = true;
+		};
+	}, [] );
+
 	const hasLinkValue = value?.url?.trim()?.length > 0;
 
 	/**
@@ -245,7 +255,7 @@ function LinkControl( {
 	 * the next render, if focus was within the wrapper when editing finished.
 	 */
 	const stopEditing = () => {
-		isEndingEditWithFocus.current = !! wrapperNode.current?.contains(
+		isEndingEditWithFocusRef.current = !! wrapperNode.current?.contains(
 			wrapperNode.current.ownerDocument.activeElement
 		);
 
@@ -359,7 +369,7 @@ function LinkControl( {
 			{ isEditing && (
 				<>
 					<div
-						className={ classnames( {
+						className={ clsx( {
 							'block-editor-link-control__search-input-wrapper': true,
 							'has-text-control': showTextControl,
 							'has-actions': showActions,
@@ -374,7 +384,7 @@ function LinkControl( {
 								value={ internalControlValue?.title }
 								onChange={ setInternalTextInputValue }
 								onKeyDown={ handleSubmitWithEnter }
-								size="__unstable-large"
+								__next40pxDefaultSize
 							/>
 						) }
 						<LinkControlSearchInput
@@ -395,18 +405,23 @@ function LinkControl( {
 								createSuggestionButtonText
 							}
 							hideLabelFromVision={ ! showTextControl }
+							suffix={
+								showActions ? undefined : (
+									<InputControlSuffixWrapper variant="control">
+										<Button
+											onClick={
+												isDisabled ? noop : handleSubmit
+											}
+											label={ __( 'Submit' ) }
+											icon={ keyboardReturn }
+											className="block-editor-link-control__search-submit"
+											aria-disabled={ isDisabled }
+											size="small"
+										/>
+									</InputControlSuffixWrapper>
+								)
+							}
 						/>
-						{ ! showActions && (
-							<div className="block-editor-link-control__search-enter">
-								<Button
-									onClick={ isDisabled ? noop : handleSubmit }
-									label={ __( 'Submit' ) }
-									icon={ keyboardReturn }
-									className="block-editor-link-control__search-submit"
-									aria-disabled={ isDisabled }
-								/>
-							</div>
-						) }
 					</div>
 					{ errorMessage && (
 						<Notice
@@ -427,25 +442,6 @@ function LinkControl( {
 					onEditClick={ () => setIsEditingLink( true ) }
 					hasRichPreviews={ hasRichPreviews }
 					hasUnlinkControl={ shownUnlinkControl }
-					additionalControls={ () => {
-						// Expose the "Opens in new tab" settings in the preview
-						// as it is the most common setting to change.
-						if (
-							settings?.find(
-								( setting ) => setting.id === 'opensInNewTab'
-							)
-						) {
-							return (
-								<LinkSettings
-									value={ internalControlValue }
-									settings={ settings?.filter(
-										( { id } ) => id === 'opensInNewTab'
-									) }
-									onChange={ onChange }
-								/>
-							);
-						}
-					} }
 					onRemove={ () => {
 						onRemove();
 						setIsEditingLink( true );
@@ -477,10 +473,15 @@ function LinkControl( {
 					justify="right"
 					className="block-editor-link-control__search-actions"
 				>
-					<Button variant="tertiary" onClick={ handleCancel }>
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ handleCancel }
+					>
 						{ __( 'Cancel' ) }
 					</Button>
 					<Button
+						__next40pxDefaultSize
 						variant="primary"
 						onClick={ isDisabled ? noop : handleSubmit }
 						className="block-editor-link-control__search-submit"
@@ -491,7 +492,7 @@ function LinkControl( {
 				</HStack>
 			) }
 
-			{ renderControlBottom && renderControlBottom() }
+			{ ! isCreatingPage && renderControlBottom && renderControlBottom() }
 		</div>
 	);
 }
diff --git a/packages/block-editor/src/components/link-control/link-preview.js b/packages/block-editor/src/components/link-control/link-preview.js
index 04a67d44789948..e5de47f0153a82 100644
--- a/packages/block-editor/src/components/link-control/link-preview.js
+++ b/packages/block-editor/src/components/link-control/link-preview.js
@@ -1,21 +1,24 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 import {
 	Button,
 	ExternalLink,
-	__experimentalText as Text,
-	Tooltip,
+	__experimentalTruncate as Truncate,
 } from '@wordpress/components';
+import { useCopyToClipboard } from '@wordpress/compose';
 import { filterURLForDisplay, safeDecodeURI } from '@wordpress/url';
-import { Icon, globe, info, linkOff, edit } from '@wordpress/icons';
+import { Icon, globe, info, linkOff, edit, copySmall } from '@wordpress/icons';
 import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { store as noticesStore } from '@wordpress/notices';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
@@ -24,14 +27,33 @@ import { ViewerSlot } from './viewer-slot';
 
 import useRichUrlData from './use-rich-url-data';
 
+/**
+ * Filters the title for display. Removes the protocol and www prefix.
+ *
+ * @param {string} title The title to be filtered.
+ *
+ * @return {string} The filtered title.
+ */
+function filterTitleForDisplay( title ) {
+	// Derived from `filterURLForDisplay` in `@wordpress/url`.
+	return title
+		.replace( /^[a-z\-.\+]+[0-9]*:(\/\/)?/i, '' )
+		.replace( /^www\./i, '' );
+}
+
 export default function LinkPreview( {
 	value,
 	onEditClick,
 	hasRichPreviews = false,
 	hasUnlinkControl = false,
 	onRemove,
-	additionalControls,
 } ) {
+	const showIconLabels = useSelect(
+		( select ) =>
+			select( preferencesStore ).get( 'core', 'showIconLabels' ),
+		[]
+	);
+
 	// Avoid fetching if rich previews are not desired.
 	const showRichPreviews = hasRichPreviews ? value?.url : null;
 
@@ -41,7 +63,7 @@ export default function LinkPreview( {
 	const hasRichData = richData && Object.keys( richData ).length;
 
 	const displayURL =
-		( value && filterURLForDisplay( safeDecodeURI( value.url ), 16 ) ) ||
+		( value && filterURLForDisplay( safeDecodeURI( value.url ), 24 ) ) ||
 		'';
 
 	// url can be undefined if the href attribute is unset
@@ -51,6 +73,9 @@ export default function LinkPreview( {
 		! isEmptyURL &&
 		stripHTML( richData?.title || value?.title || displayURL );
 
+	const isUrlRedundant =
+		! value?.url || filterTitleForDisplay( displayTitle ) === displayURL;
+
 	let icon;
 
 	if ( richData?.icon ) {
@@ -61,10 +86,18 @@ export default function LinkPreview( {
 		icon = <Icon icon={ globe } />;
 	}
 
+	const { createNotice } = useDispatch( noticesStore );
+	const ref = useCopyToClipboard( value.url, () => {
+		createNotice( 'info', __( 'Link copied to clipboard.' ), {
+			isDismissible: true,
+			type: 'snackbar',
+		} );
+	} );
+
 	return (
 		<div
 			aria-label={ __( 'Currently selected' ) }
-			className={ classnames( 'block-editor-link-control__search-item', {
+			className={ clsx( 'block-editor-link-control__search-item', {
 				'is-current': true,
 				'is-rich': hasRichData,
 				'is-fetching': !! isFetching,
@@ -76,7 +109,7 @@ export default function LinkPreview( {
 			<div className="block-editor-link-control__search-item-top">
 				<span className="block-editor-link-control__search-item-header">
 					<span
-						className={ classnames(
+						className={ clsx(
 							'block-editor-link-control__search-item-icon',
 							{
 								'is-image': richData?.icon,
@@ -88,21 +121,19 @@ export default function LinkPreview( {
 					<span className="block-editor-link-control__search-item-details">
 						{ ! isEmptyURL ? (
 							<>
-								<Tooltip
-									text={ value.url }
-									placement="bottom-start"
+								<ExternalLink
+									className="block-editor-link-control__search-item-title"
+									href={ value.url }
 								>
-									<ExternalLink
-										className="block-editor-link-control__search-item-title"
-										href={ value.url }
-									>
+									<Truncate numberOfLines={ 1 }>
 										{ displayTitle }
-									</ExternalLink>
-								</Tooltip>
-
-								{ value?.url && displayTitle !== displayURL && (
+									</Truncate>
+								</ExternalLink>
+								{ ! isUrlRedundant && (
 									<span className="block-editor-link-control__search-item-info">
-										{ displayURL }
+										<Truncate numberOfLines={ 1 }>
+											{ displayURL }
+										</Truncate>
 									</span>
 								) }
 							</>
@@ -113,69 +144,34 @@ export default function LinkPreview( {
 						) }
 					</span>
 				</span>
-
 				<Button
 					icon={ edit }
-					label={ __( 'Edit' ) }
-					className="block-editor-link-control__search-item-action"
+					label={ __( 'Edit link' ) }
 					onClick={ onEditClick }
-					iconSize={ 24 }
+					size="compact"
 				/>
 				{ hasUnlinkControl && (
 					<Button
 						icon={ linkOff }
-						label={ __( 'Unlink' ) }
-						className="block-editor-link-control__search-item-action block-editor-link-control__unlink"
+						label={ __( 'Remove link' ) }
 						onClick={ onRemove }
-						iconSize={ 24 }
+						size="compact"
 					/>
 				) }
+				<Button
+					icon={ copySmall }
+					label={ sprintf(
+						// Translators: %s is a placeholder for the link URL and an optional colon, (if a Link URL is present).
+						__( 'Copy link%s' ), // Ends up looking like "Copy link: https://example.com".
+						isEmptyURL || showIconLabels ? '' : ': ' + value.url
+					) }
+					ref={ ref }
+					accessibleWhenDisabled
+					disabled={ isEmptyURL }
+					size="compact"
+				/>
 				<ViewerSlot fillProps={ value } />
 			</div>
-
-			{ !! (
-				( hasRichData &&
-					( richData?.image || richData?.description ) ) ||
-				isFetching
-			) && (
-				<div className="block-editor-link-control__search-item-bottom">
-					{ ( richData?.image || isFetching ) && (
-						<div
-							aria-hidden={ ! richData?.image }
-							className={ classnames(
-								'block-editor-link-control__search-item-image',
-								{
-									'is-placeholder': ! richData?.image,
-								}
-							) }
-						>
-							{ richData?.image && (
-								<img src={ richData?.image } alt="" />
-							) }
-						</div>
-					) }
-
-					{ ( richData?.description || isFetching ) && (
-						<div
-							aria-hidden={ ! richData?.description }
-							className={ classnames(
-								'block-editor-link-control__search-item-description',
-								{
-									'is-placeholder': ! richData?.description,
-								}
-							) }
-						>
-							{ richData?.description && (
-								<Text truncate numberOfLines="2">
-									{ richData.description }
-								</Text>
-							) }
-						</div>
-					) }
-				</div>
-			) }
-
-			{ additionalControls && additionalControls() }
 		</div>
 	);
 }
diff --git a/packages/block-editor/src/components/link-control/search-input.js b/packages/block-editor/src/components/link-control/search-input.js
index d6023b9220d630..3f109b8a371552 100644
--- a/packages/block-editor/src/components/link-control/search-input.js
+++ b/packages/block-editor/src/components/link-control/search-input.js
@@ -1,11 +1,6 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useInstanceId } from '@wordpress/compose';
 import { forwardRef, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 
@@ -47,6 +42,7 @@ const LinkControlSearchInput = forwardRef(
 			withURLSuggestion = true,
 			createSuggestionButtonText,
 			hideLabelFromVision = false,
+			suffix,
 		},
 		ref
 	) => {
@@ -61,7 +57,6 @@ const LinkControlSearchInput = forwardRef(
 			? fetchSuggestions || genericSearchHandler
 			: noopSearchHandler;
 
-		const instanceId = useInstanceId( LinkControlSearchInput );
 		const [ focusedSuggestion, setFocusedSuggestion ] = useState();
 
 		/**
@@ -79,7 +74,6 @@ const LinkControlSearchInput = forwardRef(
 		const handleRenderSuggestions = ( props ) =>
 			renderSuggestions( {
 				...props,
-				instanceId,
 				withCreateSuggestion,
 				createSuggestionButtonText,
 				suggestionsQuery,
@@ -119,26 +113,23 @@ const LinkControlSearchInput = forwardRef(
 			}
 		};
 
-		const inputClasses = classnames( className, {
-			// 'has-no-label': ! hideLabelFromVision,
-		} );
+		const inputLabel = placeholder ?? __( 'Search or type URL' );
 
 		return (
 			<div className="block-editor-link-control__search-input-container">
 				<URLInput
 					disableSuggestions={ currentLink?.url === value }
-					__nextHasNoMarginBottom
-					label={ __( 'Link' ) }
+					label={ inputLabel }
 					hideLabelFromVision={ hideLabelFromVision }
-					className={ inputClasses }
+					className={ className }
 					value={ value }
 					onChange={ onInputChange }
-					placeholder={ placeholder ?? __( 'Search or type url' ) }
+					placeholder={ inputLabel }
 					__experimentalRenderSuggestions={
 						showSuggestions ? handleRenderSuggestions : null
 					}
 					__experimentalFetchLinkSuggestions={ searchHandler }
-					__experimentalHandleURLSuggestions={ true }
+					__experimentalHandleURLSuggestions
 					__experimentalShowInitialSuggestions={
 						showInitialSuggestions
 					}
@@ -156,6 +147,7 @@ const LinkControlSearchInput = forwardRef(
 						}
 					} }
 					ref={ ref }
+					suffix={ suffix }
 				/>
 				{ children }
 			</div>
diff --git a/packages/block-editor/src/components/link-control/search-item.js b/packages/block-editor/src/components/link-control/search-item.js
index 7fa8ee1803644c..fa8d1540b3daed 100644
--- a/packages/block-editor/src/components/link-control/search-item.js
+++ b/packages/block-editor/src/components/link-control/search-item.js
@@ -63,7 +63,9 @@ function SearchItemIcon( { isURL, suggestion } ) {
 function addLeadingSlash( url ) {
 	const trimmedURL = url?.trim();
 
-	if ( ! trimmedURL?.length ) return url;
+	if ( ! trimmedURL?.length ) {
+		return url;
+	}
 
 	return url?.replace( /^\/?/, '/' );
 }
@@ -71,7 +73,9 @@ function addLeadingSlash( url ) {
 function removeTrailingSlash( url ) {
 	const trimmedURL = url?.trim();
 
-	if ( ! trimmedURL?.length ) return url;
+	if ( ! trimmedURL?.length ) {
+		return url;
+	}
 
 	return url?.replace( /\/$/, '' );
 }
@@ -95,7 +99,9 @@ const defaultTo = ( d ) => ( v ) => {
  * @return {string} the processed url to display.
  */
 function getURLForDisplay( url ) {
-	if ( ! url ) return url;
+	if ( ! url ) {
+		return url;
+	}
 
 	return pipe(
 		safeDecodeURI,
diff --git a/packages/block-editor/src/components/link-control/search-results.js b/packages/block-editor/src/components/link-control/search-results.js
index 4d5a388a32afb8..29558f69291c57 100644
--- a/packages/block-editor/src/components/link-control/search-results.js
+++ b/packages/block-editor/src/components/link-control/search-results.js
@@ -2,12 +2,12 @@
  * WordPress dependencies
  */
 import { __, sprintf } from '@wordpress/i18n';
-import { VisuallyHidden, MenuGroup } from '@wordpress/components';
+import { MenuGroup } from '@wordpress/components';
 
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
@@ -17,7 +17,6 @@ import LinkControlSearchItem from './search-item';
 import { CREATE_TYPE, LINK_ENTRY_TYPES } from './constants';
 
 export default function LinkControlSearchResults( {
-	instanceId,
 	withCreateSuggestion,
 	currentInputValue,
 	handleSuggestionClick,
@@ -30,7 +29,7 @@ export default function LinkControlSearchResults( {
 	createSuggestionButtonText,
 	suggestionsQuery,
 } ) {
-	const resultsListClasses = classnames(
+	const resultsListClasses = clsx(
 		'block-editor-link-control__search-results',
 		{
 			'is-loading': isLoading,
@@ -47,10 +46,6 @@ export default function LinkControlSearchResults( {
 	// If the query has a specified type, then we can skip showing them in the result. See #24839.
 	const shouldShowSuggestionsTypes = ! suggestionsQuery?.type;
 
-	// According to guidelines aria-label should be added if the label
-	// itself is not visible.
-	// See: https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/listbox_role
-	const searchResultsLabelId = `block-editor-link-control-search-results-label-${ instanceId }`;
 	const labelText = isInitialSuggestions
 		? __( 'Suggestions' )
 		: sprintf(
@@ -58,19 +53,13 @@ export default function LinkControlSearchResults( {
 				__( 'Search results for "%s"' ),
 				currentInputValue
 		  );
-	const searchResultsLabel = (
-		<VisuallyHidden id={ searchResultsLabelId }>
-			{ labelText }
-		</VisuallyHidden>
-	);
 
 	return (
 		<div className="block-editor-link-control__search-results-wrapper">
-			{ searchResultsLabel }
 			<div
 				{ ...suggestionsListProps }
 				className={ resultsListClasses }
-				aria-labelledby={ searchResultsLabelId }
+				aria-label={ labelText }
 			>
 				<MenuGroup>
 					{ suggestions.map( ( suggestion, index ) => {
diff --git a/packages/block-editor/src/components/link-control/settings-drawer.js b/packages/block-editor/src/components/link-control/settings-drawer.js
index 8d0c717b1af6cc..935a50ac99a6f7 100644
--- a/packages/block-editor/src/components/link-control/settings-drawer.js
+++ b/packages/block-editor/src/components/link-control/settings-drawer.js
@@ -25,6 +25,7 @@ function LinkSettingsDrawer( { children, settingsOpen, setSettingsOpen } ) {
 	return (
 		<>
 			<Button
+				__next40pxDefaultSize
 				className="block-editor-link-control__drawer-toggle"
 				aria-expanded={ settingsOpen }
 				onClick={ () => setSettingsOpen( ! settingsOpen ) }
diff --git a/packages/block-editor/src/components/link-control/style.scss b/packages/block-editor/src/components/link-control/style.scss
index 7b6bbff0700a37..16493e1a5aa7f0 100644
--- a/packages/block-editor/src/components/link-control/style.scss
+++ b/packages/block-editor/src/components/link-control/style.scss
@@ -1,5 +1,4 @@
 $block-editor-link-control-number-of-actions: 1;
-$preview-image-height: 140px;
 
 @keyframes loadingpulse {
 	0% {
@@ -35,6 +34,21 @@ $preview-image-height: 140px;
 				content: attr(aria-label);
 			}
 		}
+
+		.block-editor-link-control__search-item-top {
+			gap: $grid-unit-05;
+			flex-wrap: wrap;
+
+			.components-button.has-icon {
+				width: auto;
+				padding: $grid-unit-05;
+			}
+		}
+
+		.is-preview .block-editor-link-control__search-item-header {
+			min-width: 100%;
+			margin-right: 0;
+		}
 	}
 }
 
@@ -51,13 +65,6 @@ $preview-image-height: 140px;
 	position: relative;
 }
 
-// If the input doesn't have a visible label then
-// we need to expand the input itself to occupy
-// the full available horizontal space.
-.block-editor-link-control__search-input.has-no-label .block-editor-url-input__input {
-	flex: 1;
-}
-
 .block-editor-link-control__field {
 	margin: $grid-unit-20; // allow margin collapse for vertical spacing.
 
@@ -65,36 +72,12 @@ $preview-image-height: 140px;
 		color: $gray-900;
 	}
 
-	input[type="text"],
-	// Specificity overide of URLInput defaults.
-	&.block-editor-url-input input[type="text"].block-editor-url-input__input {
-		@include input-control;
-		display: block;
-		border: 1px solid $gray-600;
-		border-radius: $radius-block-ui;
-		height: $button-size-next-default-40px; // components do not properly support unstable-large yet.
-		margin: 0;
-		padding: $grid-unit-10 $grid-unit-20;
-		position: relative;
-		width: 100%;
-	}
 }
 
 .block-editor-link-control__search-error {
 	margin: -$grid-unit-20 * 0.5 $grid-unit-20 $grid-unit-20; // negative margin to bring the error a bit closer to the button
 }
 
-.block-editor-link-control__search-enter {
-	position: absolute;
-	right: 19px; // specific to place the button properly.
-	top: 3px;
-
-	svg {
-		position: relative;
-		top: -2px; // the icon itself is not centered within the bounds; this centers it.
-	}
-}
-
 .block-editor-link-control__search-actions {
 	padding: $grid-unit-10 $grid-unit-20 $grid-unit-20;
 }
@@ -181,8 +164,9 @@ $preview-image-height: 140px;
 	.block-editor-link-control__search-item-header {
 		display: block;
 		flex-direction: row;
-		align-items: flex-start;
+		align-items: center;
 		margin-right: $grid-unit-10;
+		gap: $grid-unit-10;
 
 		// Force text to wrap to improve UX when encountering long lines
 		// of text, particular those with no spaces.
@@ -191,6 +175,9 @@ $preview-image-height: 140px;
 		overflow-wrap: break-word;
 
 		.block-editor-link-control__search-item-info {
+			color: $gray-700;
+			line-height: 1.1;
+			font-size: $helptext-font-size;
 			word-break: break-all;
 		}
 	}
@@ -209,17 +196,29 @@ $preview-image-height: 140px;
 		word-break: break-all;
 	}
 
+	.block-editor-link-control__search-item-details {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		gap: $grid-unit-05;
+	}
+
+	.block-editor-link-control__search-item-header .block-editor-link-control__search-item-icon {
+		background-color: $gray-100;
+		width: $grid-unit-40;
+		height: $grid-unit-40;
+		border-radius: $radius-small;
+	}
+
 	.block-editor-link-control__search-item-icon {
 		position: relative;
-		margin-right: $grid-unit-10;
-		max-height: 24px;
 		flex-shrink: 0;
-		width: 24px;
 		display: flex;
 		justify-content: center;
+		align-items: center;
 
 		img {
-			width: 16px; // favicons often have a source of 32px
+			width: $grid-unit-20; // favicons often have a source of 32px
 		}
 	}
 
@@ -230,10 +229,17 @@ $preview-image-height: 140px;
 	}
 
 	.block-editor-link-control__search-item-title {
-		display: block;
-		font-weight: 500;
-		position: relative;
-		line-height: $grid-unit-30;
+		line-height: 1.1;
+
+
+		&:focus {
+			box-shadow: none;
+		}
+
+		&:focus-visible {
+			@include block-toolbar-button-style__focus();
+			text-decoration: none;
+		}
 
 		mark {
 			font-weight: 600;
@@ -245,60 +251,15 @@ $preview-image-height: 140px;
 			font-weight: normal;
 		}
 
-		svg {
-			display: none; // specifically requested to be removed visually as well.
-		}
-	}
-
-	.block-editor-link-control__search-item-description {
-		padding-top: 12px;
-		margin: 0;
-
-		&.is-placeholder {
-			margin-top: 12px;
-			padding-top: 0;
-			height: 28px;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-around;
-
-			&::before,
-			&::after {
-				display: block;
-				content: "";
-				height: 0.7em;
-				width: 100%;
-				background-color: $gray-100;
-				border-radius: 3px;
-			}
-		}
-
-		.components-text {
-			font-size: 0.9em;
-		}
-	}
-
-	.block-editor-link-control__search-item-image {
-		display: flex;
-		width: 100%;
-		background-color: $gray-100;
-		justify-content: center;
-		height: $preview-image-height; // limit height
-		max-height: $preview-image-height; // limit height
-		overflow: hidden;
-		border-radius: 2px;
-		margin-top: 12px;
-
-		&.is-placeholder {
-			background-color: $gray-100;
-			border-radius: 3px;
-		}
-
-		img {
-			display: block; // remove unwanted space below image
-			width: 100%;
-			height: 100%;
-			object-fit: contain;
+		.components-external-link__icon {
+			position: absolute;
+			width: 1px;
+			height: 1px;
+			padding: 0;
+			margin: -1px;
+			overflow: hidden;
+			clip: rect(0, 0, 0, 0); // specifically requested to be removed visually as well.
+			border: 0;
 		}
 	}
 }
@@ -310,24 +271,7 @@ $preview-image-height: 140px;
 	align-items: center;
 }
 
-.block-editor-link-control__search-item-bottom {
-	transition: opacity 1.5s;
-	width: 100%;
-}
-
 .block-editor-link-control__search-item.is-fetching {
-	.block-editor-link-control__search-item-description {
-		&::before,
-		&::after {
-			animation: loadingpulse 1s linear infinite;
-			animation-delay: 0.5s; // avoid animating for fast network responses
-		}
-	}
-
-	.block-editor-link-control__search-item-image {
-		animation: loadingpulse 1s linear infinite;
-		animation-delay: 0.5s; // avoid animating for fast network responses
-	}
 
 	.block-editor-link-control__search-item-icon {
 		svg,
@@ -390,13 +334,6 @@ $preview-image-height: 140px;
 	}
 }
 
-.block-editor-link-control__drawer {
-	display: flex; // allow for ordering.
-	order: 30;
-	flex-direction: column;
-	flex-basis: 100%; // occupy full width.
-}
-
 // Inner div required to avoid padding/margin
 // causing janky animation.
 .block-editor-link-control__drawer-inner {
@@ -406,11 +343,6 @@ $preview-image-height: 140px;
 	position: relative;
 }
 
-.block-editor-link-control__unlink {
-	padding-left: $grid-unit-20;
-	padding-right: $grid-unit-20;
-}
-
 .block-editor-link-control__setting {
 	margin-bottom: 0;
 	flex: 1;
@@ -479,8 +411,3 @@ $preview-image-height: 140px;
 	top: calc(50% + #{$spinner-size} / 4); // Add top spacing because this input has a visual label.
 	right: $grid-unit-15;
 }
-
-.block-editor-link-control__search-item-action {
-	margin-left: auto; // push to far right hand side
-	flex-shrink: 0;
-}
diff --git a/packages/block-editor/src/components/link-control/test/index.js b/packages/block-editor/src/components/link-control/test/index.js
index e0366a3f27ef5f..e416b9b522a53c 100644
--- a/packages/block-editor/src/components/link-control/test/index.js
+++ b/packages/block-editor/src/components/link-control/test/index.js
@@ -138,7 +138,9 @@ describe( 'Basic rendering', () => {
 		render( <LinkControl /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		expect( searchInput ).toBeVisible();
 	} );
@@ -147,7 +149,9 @@ describe( 'Basic rendering', () => {
 		render( <LinkControl /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		expect( searchInput ).toBeVisible();
 		// Make sure we use the ARIA 1.0 pattern with aria-owns.
@@ -170,7 +174,9 @@ describe( 'Basic rendering', () => {
 		render( <LinkControl /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, 'Hello' );
@@ -283,7 +289,9 @@ describe( 'Basic rendering', () => {
 		render( <LinkControl /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, searchTerm );
@@ -296,7 +304,7 @@ describe( 'Basic rendering', () => {
 			render( <LinkControl value={ { url: 'https://example.com' } } /> );
 
 			expect(
-				screen.queryByRole( 'combobox', { name: 'Link' } )
+				screen.queryByRole( 'combobox', { name: 'Search or type URL' } )
 			).not.toBeInTheDocument();
 		} );
 
@@ -309,7 +317,7 @@ describe( 'Basic rendering', () => {
 			);
 
 			expect(
-				screen.getByRole( 'combobox', { name: 'Link' } )
+				screen.getByRole( 'combobox', { name: 'Search or type URL' } )
 			).toBeVisible();
 		} );
 
@@ -321,13 +329,13 @@ describe( 'Basic rendering', () => {
 
 			// Click the "Edit" button to trigger into the editing mode.
 			const editButton = screen.queryByRole( 'button', {
-				name: 'Edit',
+				name: 'Edit link',
 			} );
 
 			await user.click( editButton );
 
 			expect(
-				screen.getByRole( 'combobox', { name: 'Link' } )
+				screen.getByRole( 'combobox', { name: 'Search or type URL' } )
 			).toBeVisible();
 
 			// If passed `forceIsEditingLink` of `false` while editing, should
@@ -340,7 +348,7 @@ describe( 'Basic rendering', () => {
 			);
 
 			expect(
-				screen.queryByRole( 'combobox', { name: 'Link' } )
+				screen.queryByRole( 'combobox', { name: 'Search or type URL' } )
 			).not.toBeInTheDocument();
 		} );
 
@@ -379,7 +387,7 @@ describe( 'Basic rendering', () => {
 			render( <LinkControl value={ { url: 'https://example.com' } } /> );
 
 			const unLinkButton = screen.queryByRole( 'button', {
-				name: 'Unlink',
+				name: 'Remove link',
 			} );
 
 			expect( unLinkButton ).not.toBeInTheDocument();
@@ -397,7 +405,7 @@ describe( 'Basic rendering', () => {
 			);
 
 			const unLinkButton = screen.queryByRole( 'button', {
-				name: 'Unlink',
+				name: 'Remove link',
 			} );
 			expect( unLinkButton ).toBeVisible();
 
@@ -418,7 +426,7 @@ describe( 'Basic rendering', () => {
 			);
 
 			const unLinkButton = screen.queryByRole( 'button', {
-				name: 'Unlink',
+				name: 'Remove link',
 			} );
 			expect( unLinkButton ).toBeVisible();
 
@@ -428,7 +436,7 @@ describe( 'Basic rendering', () => {
 
 			// Should revert back to editing mode.
 			expect(
-				screen.getByRole( 'combobox', { name: 'Link' } )
+				screen.getByRole( 'combobox', { name: 'Search or type URL' } )
 			).toBeVisible();
 		} );
 	} );
@@ -450,7 +458,9 @@ describe( 'Searching for a link', () => {
 		render( <LinkControl /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, searchTerm );
@@ -475,7 +485,7 @@ describe( 'Searching for a link', () => {
 
 			// Search Input UI.
 			const searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			// Simulate searching for a term.
@@ -526,7 +536,7 @@ describe( 'Searching for a link', () => {
 
 			// Search Input UI.
 			const searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			// Simulate searching for a term.
@@ -558,7 +568,9 @@ describe( 'Searching for a link', () => {
 		render( <LinkControl /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, searchTerm );
@@ -601,7 +613,9 @@ describe( 'Searching for a link', () => {
 		render( <LinkControl showSuggestions={ false } /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, 'anything' );
@@ -618,7 +632,9 @@ describe( 'Searching for a link', () => {
 		render( <LinkControl /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, searchTerm );
@@ -648,7 +664,9 @@ describe( 'Searching for a link', () => {
 		render( <LinkControl noURLSuggestion /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, 'couldbeurlorentitysearchterm' );
@@ -679,7 +697,7 @@ describe( 'Manual link entry', () => {
 
 			// Search Input UI.
 			const searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			// Simulate searching for a term.
@@ -715,7 +733,7 @@ describe( 'Manual link entry', () => {
 
 				// Search Input UI.
 				const searchInput = screen.getByRole( 'combobox', {
-					name: 'Link',
+					name: 'Search or type URL',
 				} );
 
 				if ( searchString.length ) {
@@ -749,7 +767,7 @@ describe( 'Manual link entry', () => {
 
 				// Search Input UI.
 				const searchInput = screen.getByRole( 'combobox', {
-					name: 'Link',
+					name: 'Search or type URL',
 				} );
 
 				// Remove the existing link.
@@ -822,7 +840,7 @@ describe( 'Manual link entry', () => {
 
 			// Click the "Edit" button to trigger into the editing mode.
 			let editButton = screen.queryByRole( 'button', {
-				name: 'Edit',
+				name: 'Edit link',
 			} );
 
 			await user.click( editButton );
@@ -830,7 +848,7 @@ describe( 'Manual link entry', () => {
 			await toggleSettingsDrawer( user );
 
 			let searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			let textInput = screen.getByRole( 'textbox', {
@@ -856,7 +874,7 @@ describe( 'Manual link entry', () => {
 
 			// Re-query the edit button as it's been replaced.
 			editButton = screen.queryByRole( 'button', {
-				name: 'Edit',
+				name: 'Edit link',
 			} );
 
 			await user.click( editButton );
@@ -865,7 +883,7 @@ describe( 'Manual link entry', () => {
 
 			// Re-query the inputs as they have been replaced.
 			searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			textInput = screen.getByRole( 'textbox', {
@@ -913,7 +931,7 @@ describe( 'Manual link entry', () => {
 
 				// Search Input UI.
 				const searchInput = screen.getByRole( 'combobox', {
-					name: 'Link',
+					name: 'Search or type URL',
 				} );
 
 				// Simulate searching for a term.
@@ -949,7 +967,7 @@ describe( 'Link submission', () => {
 		render( <LinkControlConsumer /> );
 
 		const searchInput = screen.getByRole( 'combobox', {
-			name: 'Link',
+			name: 'Search or type URL',
 		} );
 
 		const submitButton = screen.getByRole( 'button', {
@@ -988,7 +1006,7 @@ describe( 'Link submission', () => {
 		render( <LinkControlConsumer /> );
 
 		const searchInput = screen.getByRole( 'combobox', {
-			name: 'Link',
+			name: 'Search or type URL',
 		} );
 
 		const createSubmitButton = screen.queryByRole( 'button', {
@@ -1035,9 +1053,9 @@ describe( 'Default search suggestions', () => {
 		// Verify input has no value has default suggestions should only show
 		// when this does not have a value.
 		// Search Input UI.
-		expect( screen.getByRole( 'combobox', { name: 'Link' } ) ).toHaveValue(
-			''
-		);
+		expect(
+			screen.getByRole( 'combobox', { name: 'Search or type URL' } )
+		).toHaveValue( '' );
 
 		// Ensure only called once as a guard against potential infinite
 		// re-render loop within `componentDidUpdate` calling `updateSuggestions`
@@ -1060,11 +1078,13 @@ describe( 'Default search suggestions', () => {
 		// shown.
 		const currentLinkUI = screen.getByLabelText( 'Currently selected' );
 		const currentLinkBtn = within( currentLinkUI ).getByRole( 'button', {
-			name: 'Edit',
+			name: 'Edit link',
 		} );
 		await user.click( currentLinkBtn );
 
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Search input is set to the URL value.
 		expect( searchInput ).toHaveValue( initialValue.url );
@@ -1086,7 +1106,9 @@ describe( 'Default search suggestions', () => {
 		render( <LinkControl showInitialSuggestions /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, searchTerm );
@@ -1124,7 +1146,9 @@ describe( 'Default search suggestions', () => {
 
 		render( <LinkControl showInitialSuggestions /> );
 
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		const searchResultsField = screen.queryByRole( 'listbox', {
 			name: 'Suggestions',
@@ -1183,7 +1207,7 @@ describe( 'Creating Entities (eg: Posts, Pages)', () => {
 
 			// Search Input UI.
 			const searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			// Simulate searching for a term.
@@ -1250,7 +1274,9 @@ describe( 'Creating Entities (eg: Posts, Pages)', () => {
 		render( <LinkControlConsumer /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, 'Some new page to create' );
@@ -1299,7 +1325,9 @@ describe( 'Creating Entities (eg: Posts, Pages)', () => {
 		render( <LinkControlConsumer /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, entityNameText );
@@ -1342,7 +1370,9 @@ describe( 'Creating Entities (eg: Posts, Pages)', () => {
 		render( <LinkControlConsumer /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, entityNameText );
@@ -1366,7 +1396,7 @@ describe( 'Creating Entities (eg: Posts, Pages)', () => {
 
 				// Search Input UI.
 				const searchInput = screen.getByRole( 'combobox', {
-					name: 'Link',
+					name: 'Search or type URL',
 				} );
 
 				const searchResultsField = screen.queryByRole( 'listbox' );
@@ -1387,7 +1417,7 @@ describe( 'Creating Entities (eg: Posts, Pages)', () => {
 
 			// Search Input UI.
 			const searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			const searchResultsField = screen.queryByRole( 'listbox' );
@@ -1411,7 +1441,7 @@ describe( 'Creating Entities (eg: Posts, Pages)', () => {
 
 				// Search Input UI.
 				const searchInput = screen.getByRole( 'combobox', {
-					name: 'Link',
+					name: 'Search or type URL',
 				} );
 
 				// Simulate searching for a term.
@@ -1445,7 +1475,9 @@ describe( 'Creating Entities (eg: Posts, Pages)', () => {
 			render( <LinkControl createSuggestion={ createSuggestion } /> );
 
 			// Search Input UI.
-			searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+			searchInput = screen.getByRole( 'combobox', {
+				name: 'Search or type URL',
+			} );
 
 			// Simulate searching for a term.
 			await user.type( searchInput, searchText );
@@ -1460,7 +1492,9 @@ describe( 'Creating Entities (eg: Posts, Pages)', () => {
 
 			await user.click( createButton );
 
-			searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+			searchInput = screen.getByRole( 'combobox', {
+				name: 'Search or type URL',
+			} );
 
 			const errorNotice = screen.getAllByText(
 				'API response returned invalid entity.'
@@ -1502,7 +1536,7 @@ describe( 'Selecting links', () => {
 
 		expect( currentLink ).toBeVisible();
 		expect(
-			screen.queryByRole( 'button', { name: 'Edit' } )
+			screen.queryByRole( 'button', { name: 'Edit link' } )
 		).toBeVisible();
 		expect( currentLinkAnchor ).toBeVisible();
 	} );
@@ -1527,13 +1561,15 @@ describe( 'Selecting links', () => {
 		// Required in order to select the button below.
 		let currentLinkUI = screen.getByLabelText( 'Currently selected' );
 		const currentLinkBtn = within( currentLinkUI ).getByRole( 'button', {
-			name: 'Edit',
+			name: 'Edit link',
 		} );
 
 		// Simulate searching for a term.
 		await user.click( currentLinkBtn );
 
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 		currentLinkUI = screen.queryByLabelText( 'Currently selected' );
 
 		// We should be back to showing the search input.
@@ -1574,7 +1610,7 @@ describe( 'Selecting links', () => {
 
 				// Search Input UI.
 				const searchInput = screen.getByRole( 'combobox', {
-					name: 'Link',
+					name: 'Search or type URL',
 				} );
 
 				// Simulate searching for a term.
@@ -1597,7 +1633,7 @@ describe( 'Selecting links', () => {
 
 				// Check that this suggestion is now shown as selected.
 				expect(
-					screen.getByRole( 'button', { name: 'Edit' } )
+					screen.getByRole( 'button', { name: 'Edit link' } )
 				).toBeVisible();
 				expect( currentLinkAnchor ).toBeVisible();
 			}
@@ -1636,7 +1672,7 @@ describe( 'Selecting links', () => {
 
 				// Search Input UI.
 				const searchInput = screen.getByRole( 'combobox', {
-					name: 'Link',
+					name: 'Search or type URL',
 				} );
 
 				// Simulate searching for a term.
@@ -1709,7 +1745,7 @@ describe( 'Selecting links', () => {
 
 				expect( currentLink ).toBeVisible();
 				expect(
-					screen.getByRole( 'button', { name: 'Edit' } )
+					screen.getByRole( 'button', { name: 'Edit link' } )
 				).toBeVisible();
 				expect( currentLinkAnchor ).toBeVisible();
 			}
@@ -1726,7 +1762,7 @@ describe( 'Selecting links', () => {
 
 			// Search Input UI.
 			const searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			// Step down into the search results, highlighting the first result item.
@@ -1784,7 +1820,7 @@ describe( 'Selecting links', () => {
 
 			// focus the search input
 			const searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			fireEvent.focus( searchInput );
@@ -1816,66 +1852,6 @@ describe( 'Selecting links', () => {
 } );
 
 describe( 'Addition Settings UI', () => {
-	it( 'should allow toggling the "Opens in new tab" setting control (only) on the link preview', async () => {
-		const user = userEvent.setup();
-		const selectedLink = fauxEntitySuggestions[ 0 ];
-		const mockOnChange = jest.fn();
-
-		const customSettings = [
-			{
-				id: 'opensInNewTab',
-				title: 'Open in new tab',
-			},
-			{
-				id: 'noFollow',
-				title: 'No follow',
-			},
-		];
-
-		const LinkControlConsumer = () => {
-			const [ link, setLink ] = useState( selectedLink );
-
-			return (
-				<LinkControl
-					value={ link }
-					settings={ customSettings }
-					onChange={ ( newVal ) => {
-						mockOnChange( newVal );
-						setLink( newVal );
-					} }
-				/>
-			);
-		};
-
-		render( <LinkControlConsumer /> );
-
-		const opensInNewTabField = screen.queryByRole( 'checkbox', {
-			name: 'Open in new tab',
-			checked: false,
-		} );
-
-		expect( opensInNewTabField ).toBeInTheDocument();
-
-		// No matter which settings are passed in only the `Opens in new tab`
-		// setting should be shown on the link preview (non-editing) state.
-		const noFollowField = screen.queryByRole( 'checkbox', {
-			name: 'No follow',
-		} );
-		expect( noFollowField ).not.toBeInTheDocument();
-
-		// Check that the link value is updated immediately upon checking
-		// the checkbox.
-		await user.click( opensInNewTabField );
-
-		expect( opensInNewTabField ).toBeChecked();
-
-		expect( mockOnChange ).toHaveBeenCalledTimes( 1 );
-		expect( mockOnChange ).toHaveBeenCalledWith( {
-			...selectedLink,
-			opensInNewTab: true,
-		} );
-	} );
-
 	it( 'should hide advanced link settings and toggle when not editing a link', async () => {
 		const selectedLink = fauxEntitySuggestions[ 0 ];
 
@@ -2056,25 +2032,6 @@ describe( 'Addition Settings UI', () => {
 			} )
 		);
 	} );
-
-	it( 'should show tooltip with full URL alongside filtered display', async () => {
-		const user = userEvent.setup();
-		const url =
-			'http://www.wordpress.org/wp-content/uploads/a-document.pdf';
-		render( <LinkControl value={ { url } } /> );
-
-		const link = screen.getByRole( 'link' );
-
-		expect( link ).toHaveTextContent( 'a-document.pdf' );
-
-		await user.hover( link );
-
-		expect( await screen.findByRole( 'tooltip' ) ).toHaveTextContent( url );
-
-		await user.unhover( link );
-
-		expect( screen.queryByRole( 'tooltip' ) ).not.toBeInTheDocument();
-	} );
 } );
 
 describe( 'Post types', () => {
@@ -2085,7 +2042,9 @@ describe( 'Post types', () => {
 		render( <LinkControl /> );
 
 		// Search Input UI.
-		const searchInput = screen.getByRole( 'combobox', { name: 'Link' } );
+		const searchInput = screen.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
 
 		// Simulate searching for a term.
 		await user.type( searchInput, searchTerm );
@@ -2113,7 +2072,7 @@ describe( 'Post types', () => {
 
 			// Search Input UI.
 			const searchInput = screen.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} );
 
 			// Simulate searching for a term.
@@ -2140,7 +2099,7 @@ describe( 'Post types', () => {
 describe( 'Rich link previews', () => {
 	const selectedLink = {
 		id: '1',
-		title: 'Wordpress.org', // Customize this for differentiation in assertions.
+		title: 'WordPress.org', // Customize this for differentiation in assertions.
 		url: 'https://www.wordpress.org',
 		type: 'URL',
 	};
@@ -2244,7 +2203,8 @@ describe( 'Rich link previews', () => {
 
 		const titlePreview = screen.getByText( selectedLink.title );
 
-		expect( titlePreview ).toHaveClass(
+		// eslint-disable-next-line testing-library/no-node-access
+		expect( titlePreview.parentElement.parentElement ).toHaveClass(
 			'block-editor-link-control__search-item-title'
 		);
 	} );
diff --git a/packages/block-editor/src/components/list-view/README.md b/packages/block-editor/src/components/list-view/README.md
index da0a255d1ac97f..0db077c6412494 100644
--- a/packages/block-editor/src/components/list-view/README.md
+++ b/packages/block-editor/src/components/list-view/README.md
@@ -11,11 +11,6 @@ In addition to presenting the structure of the blocks in the editor, the ListVie
 ![List view](https://make.wordpress.org/core/files/2020/08/block-navigation.png)
 ![View of a group list view](https://make.wordpress.org/core/files/2020/08/view-of-group-block-navigation.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/list-view/appender.js b/packages/block-editor/src/components/list-view/appender.js
index ec46a1d211ab65..8cd515499b1a61 100644
--- a/packages/block-editor/src/components/list-view/appender.js
+++ b/packages/block-editor/src/components/list-view/appender.js
@@ -15,6 +15,7 @@ import useBlockDisplayTitle from '../block-title/use-block-display-title';
 import { useListViewContext } from './context';
 import Inserter from '../inserter';
 import AriaReferencedText from './aria-referenced-text';
+import { unlock } from '../../lock-unlock';
 
 export const Appender = forwardRef(
 	( { nestingLevel, blockCount, clientId, ...props }, ref ) => {
@@ -23,13 +24,11 @@ export const Appender = forwardRef(
 		const instanceId = useInstanceId( Appender );
 		const hideInserter = useSelect(
 			( select ) => {
-				const { getTemplateLock, __unstableGetEditorMode } =
-					select( blockEditorStore );
-
-				return (
-					!! getTemplateLock( clientId ) ||
-					__unstableGetEditorMode() === 'zoom-out'
+				const { getTemplateLock, isZoomOut } = unlock(
+					select( blockEditorStore )
 				);
+
+				return !! getTemplateLock( clientId ) || isZoomOut();
 			},
 			[ clientId ]
 		);
diff --git a/packages/block-editor/src/components/list-view/block-contents.js b/packages/block-editor/src/components/list-view/block-contents.js
index 8d5b03395f3e20..0ed2b162b127b8 100644
--- a/packages/block-editor/src/components/list-view/block-contents.js
+++ b/packages/block-editor/src/components/list-view/block-contents.js
@@ -1,12 +1,6 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
 import { forwardRef } from '@wordpress/element';
 
 /**
@@ -14,7 +8,6 @@ import { forwardRef } from '@wordpress/element';
  */
 import ListViewBlockSelectButton from './block-select-button';
 import BlockDraggable from '../block-draggable';
-import { store as blockEditorStore } from '../../store';
 import { useListViewContext } from './context';
 
 const ListViewBlockContents = forwardRef(
@@ -34,29 +27,9 @@ const ListViewBlockContents = forwardRef(
 		ref
 	) => {
 		const { clientId } = block;
-
-		const { blockMovingClientId, selectedBlockInBlockEditor } = useSelect(
-			( select ) => {
-				const { hasBlockMovingClientId, getSelectedBlockClientId } =
-					select( blockEditorStore );
-				return {
-					blockMovingClientId: hasBlockMovingClientId(),
-					selectedBlockInBlockEditor: getSelectedBlockClientId(),
-				};
-			},
-			[]
-		);
-
 		const { AdditionalBlockContent, insertedBlock, setInsertedBlock } =
 			useListViewContext();
 
-		const isBlockMoveTarget =
-			blockMovingClientId && selectedBlockInBlockEditor === clientId;
-
-		const className = classnames( 'block-editor-list-view-block-contents', {
-			'is-dropping-before': isBlockMoveTarget,
-		} );
-
 		// Only include all selected blocks if the currently clicked on block
 		// is one of the selected blocks. This ensures that if a user attempts
 		// to drag a block that isn't part of the selection, they're still able
@@ -74,11 +47,15 @@ const ListViewBlockContents = forwardRef(
 						setInsertedBlock={ setInsertedBlock }
 					/>
 				) }
-				<BlockDraggable clientIds={ draggableClientIds }>
+				<BlockDraggable
+					appendToOwnerDocument
+					clientIds={ draggableClientIds }
+					cloneClassname="block-editor-list-view-draggable-chip"
+				>
 					{ ( { draggable, onDragStart, onDragEnd } ) => (
 						<ListViewBlockSelectButton
 							ref={ ref }
-							className={ className }
+							className="block-editor-list-view-block-contents"
 							block={ block }
 							onClick={ onClick }
 							onToggleExpanded={ onToggleExpanded }
diff --git a/packages/block-editor/src/components/list-view/block-select-button.js b/packages/block-editor/src/components/list-view/block-select-button.js
index 25de5483f5192e..3b21fd4a04e6d0 100644
--- a/packages/block-editor/src/components/list-view/block-select-button.js
+++ b/packages/block-editor/src/components/list-view/block-select-button.js
@@ -1,25 +1,19 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { hasBlockSupport } from '@wordpress/blocks';
 import {
-	Button,
 	__experimentalHStack as HStack,
 	__experimentalTruncate as Truncate,
-	Tooltip,
 } from '@wordpress/components';
 import { forwardRef } from '@wordpress/element';
 import { Icon, lockSmall as lock, pinSmall } from '@wordpress/icons';
-import { SPACE, ENTER, BACKSPACE, DELETE } from '@wordpress/keycodes';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { __unstableUseShortcutEventMatch as useShortcutEventMatch } from '@wordpress/keyboard-shortcuts';
-import { __, sprintf } from '@wordpress/i18n';
-import isShallowEqual from '@wordpress/is-shallow-equal';
+import { SPACE, ENTER } from '@wordpress/keycodes';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -29,15 +23,16 @@ import useBlockDisplayInformation from '../use-block-display-information';
 import useBlockDisplayTitle from '../block-title/use-block-display-title';
 import ListViewExpander from './expander';
 import { useBlockLock } from '../block-lock';
-import { store as blockEditorStore } from '../../store';
 import useListViewImages from './use-list-view-images';
-import { useListViewContext } from './context';
+import { store as blockEditorStore } from '../../store';
 
 function ListViewBlockSelectButton(
 	{
 		className,
 		block: { clientId },
 		onClick,
+		onContextMenu,
+		onMouseDown,
 		onToggleExpanded,
 		tabIndex,
 		onFocus,
@@ -45,9 +40,7 @@ function ListViewBlockSelectButton(
 		onDragEnd,
 		draggable,
 		isExpanded,
-		ariaLabel,
 		ariaDescribedBy,
-		updateFocusAndSelection,
 	},
 	ref
 ) {
@@ -57,29 +50,17 @@ function ListViewBlockSelectButton(
 		context: 'list-view',
 	} );
 	const { isLocked } = useBlockLock( clientId );
-	const {
-		canInsertBlockType,
-		getSelectedBlockClientIds,
-		getPreviousBlockClientId,
-		getBlockRootClientId,
-		getBlockOrder,
-		getBlocksByClientId,
-		canRemoveBlocks,
-	} = useSelect( blockEditorStore );
-	const { duplicateBlocks, multiSelect, removeBlocks } =
-		useDispatch( blockEditorStore );
-	const isMatch = useShortcutEventMatch();
+	const { isContentOnly } = useSelect(
+		( select ) => ( {
+			isContentOnly:
+				select( blockEditorStore ).getBlockEditingMode( clientId ) ===
+				'contentOnly',
+		} ),
+		[ clientId ]
+	);
+	const shouldShowLockIcon = isLocked && ! isContentOnly;
 	const isSticky = blockInformation?.positionType === 'sticky';
 	const images = useListViewImages( { clientId, isExpanded } );
-	const { rootClientId } = useListViewContext();
-
-	const positionLabel = blockInformation?.positionLabel
-		? sprintf(
-				// translators: 1: Position of selected block, e.g. "Sticky" or "Fixed".
-				__( 'Position: %1$s' ),
-				blockInformation.positionLabel
-		  )
-		: '';
 
 	// The `href` attribute triggers the browser's native HTML drag operations.
 	// When the link is dragged, the element's outerHTML is set in DataTransfer object as text/html.
@@ -90,220 +71,89 @@ function ListViewBlockSelectButton(
 		onDragStart?.( event );
 	};
 
-	// Determine which blocks to update:
-	// If the current (focused) block is part of the block selection, use the whole selection.
-	// If the focused block is not part of the block selection, only update the focused block.
-	function getBlocksToUpdate() {
-		const selectedBlockClientIds = getSelectedBlockClientIds();
-		const isUpdatingSelectedBlocks =
-			selectedBlockClientIds.includes( clientId );
-		const firstBlockClientId = isUpdatingSelectedBlocks
-			? selectedBlockClientIds[ 0 ]
-			: clientId;
-		const firstBlockRootClientId =
-			getBlockRootClientId( firstBlockClientId );
-
-		const blocksToUpdate = isUpdatingSelectedBlocks
-			? selectedBlockClientIds
-			: [ clientId ];
-
-		return {
-			blocksToUpdate,
-			firstBlockClientId,
-			firstBlockRootClientId,
-			selectedBlockClientIds,
-		};
-	}
-
 	/**
 	 * @param {KeyboardEvent} event
 	 */
-	async function onKeyDownHandler( event ) {
+	function onKeyDown( event ) {
 		if ( event.keyCode === ENTER || event.keyCode === SPACE ) {
 			onClick( event );
-		} else if (
-			event.keyCode === BACKSPACE ||
-			event.keyCode === DELETE ||
-			isMatch( 'core/block-editor/remove', event )
-		) {
-			const {
-				blocksToUpdate: blocksToDelete,
-				firstBlockClientId,
-				firstBlockRootClientId,
-				selectedBlockClientIds,
-			} = getBlocksToUpdate();
-
-			// Don't update the selection if the blocks cannot be deleted.
-			if ( ! canRemoveBlocks( blocksToDelete, firstBlockRootClientId ) ) {
-				return;
-			}
-
-			let blockToFocus =
-				getPreviousBlockClientId( firstBlockClientId ) ??
-				// If the previous block is not found (when the first block is deleted),
-				// fallback to focus the parent block.
-				firstBlockRootClientId;
-
-			removeBlocks( blocksToDelete, false );
-
-			// Update the selection if the original selection has been removed.
-			const shouldUpdateSelection =
-				selectedBlockClientIds.length > 0 &&
-				getSelectedBlockClientIds().length === 0;
-
-			// If there's no previous block nor parent block, focus the first block.
-			if ( ! blockToFocus ) {
-				blockToFocus = getBlockOrder()[ 0 ];
-			}
-
-			updateFocusAndSelection( blockToFocus, shouldUpdateSelection );
-		} else if ( isMatch( 'core/block-editor/duplicate', event ) ) {
-			if ( event.defaultPrevented ) {
-				return;
-			}
-			event.preventDefault();
-
-			const { blocksToUpdate, firstBlockRootClientId } =
-				getBlocksToUpdate();
-
-			const canDuplicate = getBlocksByClientId( blocksToUpdate ).every(
-				( block ) => {
-					return (
-						!! block &&
-						hasBlockSupport( block.name, 'multiple', true ) &&
-						canInsertBlockType( block.name, firstBlockRootClientId )
-					);
-				}
-			);
-
-			if ( canDuplicate ) {
-				const updatedBlocks = await duplicateBlocks(
-					blocksToUpdate,
-					false
-				);
-
-				if ( updatedBlocks?.length ) {
-					// If blocks have been duplicated, focus the first duplicated block.
-					updateFocusAndSelection( updatedBlocks[ 0 ], false );
-				}
-			}
-		} else if ( isMatch( 'core/block-editor/select-all', event ) ) {
-			if ( event.defaultPrevented ) {
-				return;
-			}
-			event.preventDefault();
-
-			const { firstBlockRootClientId, selectedBlockClientIds } =
-				getBlocksToUpdate();
-			const blockClientIds = getBlockOrder( firstBlockRootClientId );
-			if ( ! blockClientIds.length ) {
-				return;
-			}
-
-			// If we have selected all sibling nested blocks, try selecting up a level.
-			// This is a similar implementation to that used by `useSelectAll`.
-			// `isShallowEqual` is used for the list view instead of a length check,
-			// as the array of siblings of the currently focused block may be a different
-			// set of blocks from the current block selection if the user is focused
-			// on a different part of the list view from the block selection.
-			if ( isShallowEqual( selectedBlockClientIds, blockClientIds ) ) {
-				// Only select up a level if the first block is not the root block.
-				// This ensures that the block selection can't break out of the root block
-				// used by the list view, if the list view is only showing a partial hierarchy.
-				if (
-					firstBlockRootClientId &&
-					firstBlockRootClientId !== rootClientId
-				) {
-					updateFocusAndSelection( firstBlockRootClientId, true );
-					return;
-				}
-			}
-
-			// Select all while passing `null` to skip focusing to the editor canvas,
-			// and retain focus within the list view.
-			multiSelect(
-				blockClientIds[ 0 ],
-				blockClientIds[ blockClientIds.length - 1 ],
-				null
-			);
 		}
 	}
 
 	return (
-		<>
-			<Button
-				className={ classnames(
-					'block-editor-list-view-block-select-button',
-					className
-				) }
-				onClick={ onClick }
-				onKeyDown={ onKeyDownHandler }
-				ref={ ref }
-				tabIndex={ tabIndex }
-				onFocus={ onFocus }
-				onDragStart={ onDragStartHandler }
-				onDragEnd={ onDragEnd }
-				draggable={ draggable }
-				href={ `#block-${ clientId }` }
-				aria-label={ ariaLabel }
-				aria-describedby={ ariaDescribedBy }
-				aria-expanded={ isExpanded }
+		<a
+			className={ clsx(
+				'block-editor-list-view-block-select-button',
+				className
+			) }
+			onClick={ onClick }
+			onContextMenu={ onContextMenu }
+			onKeyDown={ onKeyDown }
+			onMouseDown={ onMouseDown }
+			ref={ ref }
+			tabIndex={ tabIndex }
+			onFocus={ onFocus }
+			onDragStart={ onDragStartHandler }
+			onDragEnd={ onDragEnd }
+			draggable={ draggable }
+			href={ `#block-${ clientId }` }
+			aria-describedby={ ariaDescribedBy }
+			aria-expanded={ isExpanded }
+		>
+			<ListViewExpander onClick={ onToggleExpanded } />
+			<BlockIcon
+				icon={ blockInformation?.icon }
+				showColors
+				context="list-view"
+			/>
+			<HStack
+				alignment="center"
+				className="block-editor-list-view-block-select-button__label-wrapper"
+				justify="flex-start"
+				spacing={ 1 }
 			>
-				<ListViewExpander onClick={ onToggleExpanded } />
-				<BlockIcon
-					icon={ blockInformation?.icon }
-					showColors
-					context="list-view"
-				/>
-				<HStack
-					alignment="center"
-					className="block-editor-list-view-block-select-button__label-wrapper"
-					justify="flex-start"
-					spacing={ 1 }
-				>
-					<span className="block-editor-list-view-block-select-button__title">
-						<Truncate ellipsizeMode="auto">{ blockTitle }</Truncate>
-					</span>
-					{ blockInformation?.anchor && (
-						<span className="block-editor-list-view-block-select-button__anchor-wrapper">
-							<Truncate
-								className="block-editor-list-view-block-select-button__anchor"
-								ellipsizeMode="auto"
-							>
-								{ blockInformation.anchor }
-							</Truncate>
-						</span>
-					) }
-					{ positionLabel && isSticky && (
-						<Tooltip text={ positionLabel }>
-							<Icon icon={ pinSmall } />
-						</Tooltip>
-					) }
-					{ images.length ? (
-						<span
-							className="block-editor-list-view-block-select-button__images"
-							aria-hidden
+				<span className="block-editor-list-view-block-select-button__title">
+					<Truncate ellipsizeMode="auto">{ blockTitle }</Truncate>
+				</span>
+				{ blockInformation?.anchor && (
+					<span className="block-editor-list-view-block-select-button__anchor-wrapper">
+						<Truncate
+							className="block-editor-list-view-block-select-button__anchor"
+							ellipsizeMode="auto"
 						>
-							{ images.map( ( image, index ) => (
-								<span
-									className="block-editor-list-view-block-select-button__image"
-									key={ image.clientId }
-									style={ {
-										backgroundImage: `url(${ image.url })`,
-										zIndex: images.length - index, // Ensure the first image is on top, and subsequent images are behind.
-									} }
-								/>
-							) ) }
-						</span>
-					) : null }
-					{ isLocked && (
-						<span className="block-editor-list-view-block-select-button__lock">
-							<Icon icon={ lock } />
-						</span>
-					) }
-				</HStack>
-			</Button>
-		</>
+							{ blockInformation.anchor }
+						</Truncate>
+					</span>
+				) }
+				{ isSticky && (
+					<span className="block-editor-list-view-block-select-button__sticky">
+						<Icon icon={ pinSmall } />
+					</span>
+				) }
+				{ images.length ? (
+					<span
+						className="block-editor-list-view-block-select-button__images"
+						aria-hidden
+					>
+						{ images.map( ( image, index ) => (
+							<span
+								className="block-editor-list-view-block-select-button__image"
+								key={ image.clientId }
+								style={ {
+									backgroundImage: `url(${ image.url })`,
+									zIndex: images.length - index, // Ensure the first image is on top, and subsequent images are behind.
+								} }
+							/>
+						) ) }
+					</span>
+				) : null }
+				{ shouldShowLockIcon && (
+					<span className="block-editor-list-view-block-select-button__lock">
+						<Icon icon={ lock } />
+					</span>
+				) }
+			</HStack>
+		</a>
 	);
 }
 
diff --git a/packages/block-editor/src/components/list-view/block.js b/packages/block-editor/src/components/list-view/block.js
index 4957f79fa0d481..f4dcf8caef449d 100644
--- a/packages/block-editor/src/components/list-view/block.js
+++ b/packages/block-editor/src/components/list-view/block.js
@@ -1,22 +1,35 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { hasBlockSupport } from '@wordpress/blocks';
+import {
+	hasBlockSupport,
+	switchToBlockType,
+	store as blocksStore,
+} from '@wordpress/blocks';
 import {
 	__experimentalTreeGridCell as TreeGridCell,
 	__experimentalTreeGridItem as TreeGridItem,
 } from '@wordpress/components';
 import { useInstanceId } from '@wordpress/compose';
 import { moreVertical } from '@wordpress/icons';
-import { useState, useRef, useCallback, memo } from '@wordpress/element';
+import {
+	useCallback,
+	useMemo,
+	useState,
+	useRef,
+	memo,
+} from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
-import { sprintf, __ } from '@wordpress/i18n';
-import { ESCAPE } from '@wordpress/keycodes';
+import { __ } from '@wordpress/i18n';
+import { BACKSPACE, DELETE } from '@wordpress/keycodes';
+import isShallowEqual from '@wordpress/is-shallow-equal';
+import { __unstableUseShortcutEventMatch as useShortcutEventMatch } from '@wordpress/keyboard-shortcuts';
+import { speak } from '@wordpress/a11y';
 
 /**
  * Internal dependencies
@@ -29,15 +42,23 @@ import {
 } from '../block-mover/button';
 import ListViewBlockContents from './block-contents';
 import { useListViewContext } from './context';
-import { getBlockPositionDescription, focusListItem } from './utils';
+import {
+	getBlockPositionDescription,
+	getBlockPropertiesDescription,
+	focusListItem,
+} from './utils';
 import { store as blockEditorStore } from '../../store';
 import useBlockDisplayInformation from '../use-block-display-information';
 import { useBlockLock } from '../block-lock';
 import AriaReferencedText from './aria-referenced-text';
+import { unlock } from '../../lock-unlock';
 
 function ListViewBlock( {
 	block: { clientId },
+	displacement,
+	isAfterDraggedBlocks,
 	isDragged,
+	isNesting,
 	isSelected,
 	isBranchSelected,
 	selectBlock,
@@ -53,9 +74,11 @@ function ListViewBlock( {
 } ) {
 	const cellRef = useRef( null );
 	const rowRef = useRef( null );
+	const settingsRef = useRef( null );
 	const [ isHovered, setIsHovered ] = useState( false );
+	const [ settingsAnchorRect, setSettingsAnchorRect ] = useState();
 
-	const { isLocked, canEdit } = useBlockLock( clientId );
+	const { isLocked, canEdit, canMove } = useBlockLock( clientId );
 
 	const isFirstSelectedBlock =
 		isSelected && selectedClientIds[ 0 ] === clientId;
@@ -63,21 +86,42 @@ function ListViewBlock( {
 		isSelected &&
 		selectedClientIds[ selectedClientIds.length - 1 ] === clientId;
 
-	const { toggleBlockHighlight } = useDispatch( blockEditorStore );
+	const {
+		toggleBlockHighlight,
+		duplicateBlocks,
+		multiSelect,
+		replaceBlocks,
+		removeBlocks,
+		insertAfterBlock,
+		insertBeforeBlock,
+		setOpenedBlockSettingsMenu,
+	} = unlock( useDispatch( blockEditorStore ) );
+
+	const {
+		canInsertBlockType,
+		getSelectedBlockClientIds,
+		getPreviousBlockClientId,
+		getBlockRootClientId,
+		getBlockOrder,
+		getBlockParents,
+		getBlocksByClientId,
+		canRemoveBlocks,
+		isGroupable,
+	} = useSelect( blockEditorStore );
+	const { getGroupingBlockName } = useSelect( blocksStore );
 
 	const blockInformation = useBlockDisplayInformation( clientId );
-	const blockTitle =
-		blockInformation?.name || blockInformation?.title || __( 'Untitled' );
 
-	const { block, blockName, blockEditingMode } = useSelect(
+	const { block, blockName, allowRightClickOverrides } = useSelect(
 		( select ) => {
-			const { getBlock, getBlockName, getBlockEditingMode } =
+			const { getBlock, getBlockName, getSettings } =
 				select( blockEditorStore );
 
 			return {
 				block: getBlock( clientId ),
 				blockName: getBlockName( clientId ),
-				blockEditingMode: getBlockEditingMode( clientId ),
+				allowRightClickOverrides:
+					getSettings().allowRightClickOverrides,
 			};
 		},
 		[ clientId ]
@@ -87,66 +131,225 @@ function ListViewBlock( {
 		// When a block hides its toolbar it also hides the block settings menu,
 		// since that menu is part of the toolbar in the editor canvas.
 		// List View respects this by also hiding the block settings menu.
-		hasBlockSupport( blockName, '__experimentalToolbar', true ) &&
-		// Don't show the settings menu if block is disabled or content only.
-		blockEditingMode === 'default';
+		hasBlockSupport( blockName, '__experimentalToolbar', true );
 	const instanceId = useInstanceId( ListViewBlock );
-	const descriptionId = `list-view-block-select-button__${ instanceId }`;
-	const blockPositionDescription = getBlockPositionDescription(
-		position,
-		siblingBlockCount,
-		level
-	);
-
-	const blockAriaLabel = isLocked
-		? sprintf(
-				// translators: %s: The title of the block. This string indicates a link to select the locked block.
-				__( '%s (locked)' ),
-				blockTitle
-		  )
-		: blockTitle;
-
-	const settingsAriaLabel = sprintf(
-		// translators: %s: The title of the block.
-		__( 'Options for %s' ),
-		blockTitle
-	);
+	const descriptionId = `list-view-block-select-button__description-${ instanceId }`;
 
 	const {
 		expand,
 		collapse,
+		collapseAll,
 		BlockSettingsMenu,
 		listViewInstanceId,
 		expandedState,
 		setInsertedBlock,
 		treeGridElementRef,
+		rootClientId,
 	} = useListViewContext();
+	const isMatch = useShortcutEventMatch();
 
-	const hasSiblings = siblingBlockCount > 0;
-	const hasRenderedMovers = showBlockMovers && hasSiblings;
-	const moverCellClassName = classnames(
-		'block-editor-list-view-block__mover-cell',
-		{ 'is-visible': isHovered || isSelected }
-	);
+	// Determine which blocks to update:
+	// If the current (focused) block is part of the block selection, use the whole selection.
+	// If the focused block is not part of the block selection, only update the focused block.
+	function getBlocksToUpdate() {
+		const selectedBlockClientIds = getSelectedBlockClientIds();
+		const isUpdatingSelectedBlocks =
+			selectedBlockClientIds.includes( clientId );
+		const firstBlockClientId = isUpdatingSelectedBlocks
+			? selectedBlockClientIds[ 0 ]
+			: clientId;
+		const firstBlockRootClientId =
+			getBlockRootClientId( firstBlockClientId );
 
-	const listViewBlockSettingsClassName = classnames(
-		'block-editor-list-view-block__menu-cell',
-		{ 'is-visible': isHovered || isFirstSelectedBlock }
-	);
+		const blocksToUpdate = isUpdatingSelectedBlocks
+			? selectedBlockClientIds
+			: [ clientId ];
+
+		return {
+			blocksToUpdate,
+			firstBlockClientId,
+			firstBlockRootClientId,
+			selectedBlockClientIds,
+		};
+	}
+
+	/**
+	 * @param {KeyboardEvent} event
+	 */
+	async function onKeyDown( event ) {
+		if ( event.defaultPrevented ) {
+			return;
+		}
+
+		// Do not handle events if it comes from modals;
+		// retain the default behavior for these keys.
+		if ( event.target.closest( '[role=dialog]' ) ) {
+			return;
+		}
+
+		const isDeleteKey = [ BACKSPACE, DELETE ].includes( event.keyCode );
 
-	// If multiple blocks are selected, deselect all blocks when the user
-	// presses the escape key.
-	const onKeyDown = ( event ) => {
+		// If multiple blocks are selected, deselect all blocks when the user
+		// presses the escape key.
 		if (
-			event.keyCode === ESCAPE &&
-			! event.defaultPrevented &&
+			isMatch( 'core/block-editor/unselect', event ) &&
 			selectedClientIds.length > 0
 		) {
 			event.stopPropagation();
 			event.preventDefault();
 			selectBlock( event, undefined );
+		} else if (
+			isDeleteKey ||
+			isMatch( 'core/block-editor/remove', event )
+		) {
+			const {
+				blocksToUpdate: blocksToDelete,
+				firstBlockClientId,
+				firstBlockRootClientId,
+				selectedBlockClientIds,
+			} = getBlocksToUpdate();
+
+			// Don't update the selection if the blocks cannot be deleted.
+			if ( ! canRemoveBlocks( blocksToDelete ) ) {
+				return;
+			}
+
+			let blockToFocus =
+				getPreviousBlockClientId( firstBlockClientId ) ??
+				// If the previous block is not found (when the first block is deleted),
+				// fallback to focus the parent block.
+				firstBlockRootClientId;
+
+			removeBlocks( blocksToDelete, false );
+
+			// Update the selection if the original selection has been removed.
+			const shouldUpdateSelection =
+				selectedBlockClientIds.length > 0 &&
+				getSelectedBlockClientIds().length === 0;
+
+			// If there's no previous block nor parent block, focus the first block.
+			if ( ! blockToFocus ) {
+				blockToFocus = getBlockOrder()[ 0 ];
+			}
+
+			updateFocusAndSelection( blockToFocus, shouldUpdateSelection );
+		} else if ( isMatch( 'core/block-editor/duplicate', event ) ) {
+			event.preventDefault();
+
+			const { blocksToUpdate, firstBlockRootClientId } =
+				getBlocksToUpdate();
+
+			const canDuplicate = getBlocksByClientId( blocksToUpdate ).every(
+				( blockToUpdate ) => {
+					return (
+						!! blockToUpdate &&
+						hasBlockSupport(
+							blockToUpdate.name,
+							'multiple',
+							true
+						) &&
+						canInsertBlockType(
+							blockToUpdate.name,
+							firstBlockRootClientId
+						)
+					);
+				}
+			);
+
+			if ( canDuplicate ) {
+				const updatedBlocks = await duplicateBlocks(
+					blocksToUpdate,
+					false
+				);
+
+				if ( updatedBlocks?.length ) {
+					// If blocks have been duplicated, focus the first duplicated block.
+					updateFocusAndSelection( updatedBlocks[ 0 ], false );
+				}
+			}
+		} else if ( isMatch( 'core/block-editor/insert-before', event ) ) {
+			event.preventDefault();
+
+			const { blocksToUpdate } = getBlocksToUpdate();
+			await insertBeforeBlock( blocksToUpdate[ 0 ] );
+			const newlySelectedBlocks = getSelectedBlockClientIds();
+
+			// Focus the first block of the newly inserted blocks, to keep focus within the list view.
+			setOpenedBlockSettingsMenu( undefined );
+			updateFocusAndSelection( newlySelectedBlocks[ 0 ], false );
+		} else if ( isMatch( 'core/block-editor/insert-after', event ) ) {
+			event.preventDefault();
+
+			const { blocksToUpdate } = getBlocksToUpdate();
+			await insertAfterBlock( blocksToUpdate.at( -1 ) );
+			const newlySelectedBlocks = getSelectedBlockClientIds();
+
+			// Focus the first block of the newly inserted blocks, to keep focus within the list view.
+			setOpenedBlockSettingsMenu( undefined );
+			updateFocusAndSelection( newlySelectedBlocks[ 0 ], false );
+		} else if ( isMatch( 'core/block-editor/select-all', event ) ) {
+			event.preventDefault();
+
+			const { firstBlockRootClientId, selectedBlockClientIds } =
+				getBlocksToUpdate();
+			const blockClientIds = getBlockOrder( firstBlockRootClientId );
+			if ( ! blockClientIds.length ) {
+				return;
+			}
+
+			// If we have selected all sibling nested blocks, try selecting up a level.
+			// This is a similar implementation to that used by `useSelectAll`.
+			// `isShallowEqual` is used for the list view instead of a length check,
+			// as the array of siblings of the currently focused block may be a different
+			// set of blocks from the current block selection if the user is focused
+			// on a different part of the list view from the block selection.
+			if ( isShallowEqual( selectedBlockClientIds, blockClientIds ) ) {
+				// Only select up a level if the first block is not the root block.
+				// This ensures that the block selection can't break out of the root block
+				// used by the list view, if the list view is only showing a partial hierarchy.
+				if (
+					firstBlockRootClientId &&
+					firstBlockRootClientId !== rootClientId
+				) {
+					updateFocusAndSelection( firstBlockRootClientId, true );
+					return;
+				}
+			}
+
+			// Select all while passing `null` to skip focusing to the editor canvas,
+			// and retain focus within the list view.
+			multiSelect(
+				blockClientIds[ 0 ],
+				blockClientIds[ blockClientIds.length - 1 ],
+				null
+			);
+		} else if ( isMatch( 'core/block-editor/collapse-list-view', event ) ) {
+			event.preventDefault();
+			const { firstBlockClientId } = getBlocksToUpdate();
+			const blockParents = getBlockParents( firstBlockClientId, false );
+			// Collapse all blocks.
+			collapseAll();
+			// Expand all parents of the current block.
+			expand( blockParents );
+		} else if ( isMatch( 'core/block-editor/group', event ) ) {
+			const { blocksToUpdate } = getBlocksToUpdate();
+			if ( blocksToUpdate.length > 1 && isGroupable( blocksToUpdate ) ) {
+				event.preventDefault();
+				const blocks = getBlocksByClientId( blocksToUpdate );
+				const groupingBlockName = getGroupingBlockName();
+				const newBlocks = switchToBlockType(
+					blocks,
+					groupingBlockName
+				);
+				replaceBlocks( blocksToUpdate, newBlocks );
+				speak( __( 'Selected blocks are grouped.' ) );
+				const newlySelectedBlocks = getSelectedBlockClientIds();
+				// Focus the first block of the newly inserted blocks, to keep focus within the list view.
+				setOpenedBlockSettingsMenu( undefined );
+				updateFocusAndSelection( newlySelectedBlocks[ 0 ], false );
+			}
 		}
-	};
+	}
 
 	const onMouseEnter = useCallback( () => {
 		setIsHovered( true );
@@ -171,7 +374,7 @@ function ListViewBlock( {
 				selectBlock( undefined, focusClientId, null, null );
 			}
 
-			focusListItem( focusClientId, treeGridElementRef );
+			focusListItem( focusClientId, treeGridElementRef?.current );
 		},
 		[ selectBlock, treeGridElementRef ]
 	);
@@ -190,6 +393,95 @@ function ListViewBlock( {
 		[ clientId, expand, collapse, isExpanded ]
 	);
 
+	// Allow right-clicking an item in the List View to open up the block settings dropdown.
+	const onContextMenu = useCallback(
+		( event ) => {
+			if ( showBlockActions && allowRightClickOverrides ) {
+				settingsRef.current?.click();
+				// Ensure the position of the settings dropdown is at the cursor.
+				setSettingsAnchorRect(
+					new window.DOMRect( event.clientX, event.clientY, 0, 0 )
+				);
+				event.preventDefault();
+			}
+		},
+		[ allowRightClickOverrides, settingsRef, showBlockActions ]
+	);
+
+	const onMouseDown = useCallback(
+		( event ) => {
+			// Prevent right-click from focusing the block,
+			// because focus will be handled when opening the block settings dropdown.
+			if ( allowRightClickOverrides && event.button === 2 ) {
+				event.preventDefault();
+			}
+		},
+		[ allowRightClickOverrides ]
+	);
+
+	const settingsPopoverAnchor = useMemo( () => {
+		const { ownerDocument } = rowRef?.current || {};
+
+		// If no custom position is set, the settings dropdown will be anchored to the
+		// DropdownMenu toggle button.
+		if ( ! settingsAnchorRect || ! ownerDocument ) {
+			return undefined;
+		}
+
+		// Position the settings dropdown at the cursor when right-clicking a block.
+		return {
+			ownerDocument,
+			getBoundingClientRect() {
+				return settingsAnchorRect;
+			},
+		};
+	}, [ settingsAnchorRect ] );
+
+	const clearSettingsAnchorRect = useCallback( () => {
+		// Clear the custom position for the settings dropdown so that it is restored back
+		// to being anchored to the DropdownMenu toggle button.
+		setSettingsAnchorRect( undefined );
+	}, [ setSettingsAnchorRect ] );
+
+	// Pass in a ref to the row, so that it can be scrolled
+	// into view when selected. For long lists, the placeholder for the
+	// selected block is also observed, within ListViewLeafPlaceholder.
+	useListViewScrollIntoView( {
+		isSelected,
+		rowItemRef: rowRef,
+		selectedClientIds,
+	} );
+
+	// When switching between rendering modes (such as template preview and content only),
+	// it is possible for a block to temporarily be unavailable. In this case, we should not
+	// render the leaf, to avoid errors further down the tree.
+	if ( ! block ) {
+		return null;
+	}
+
+	const blockPositionDescription = getBlockPositionDescription(
+		position,
+		siblingBlockCount,
+		level
+	);
+
+	const blockPropertiesDescription = getBlockPropertiesDescription(
+		blockInformation,
+		isLocked
+	);
+
+	const hasSiblings = siblingBlockCount > 0;
+	const hasRenderedMovers = showBlockMovers && hasSiblings;
+	const moverCellClassName = clsx(
+		'block-editor-list-view-block__mover-cell',
+		{ 'is-visible': isHovered || isSelected }
+	);
+
+	const listViewBlockSettingsClassName = clsx(
+		'block-editor-list-view-block__menu-cell',
+		{ 'is-visible': isHovered || isFirstSelectedBlock }
+	);
+
 	let colSpan;
 	if ( hasRenderedMovers ) {
 		colSpan = 2;
@@ -197,7 +489,7 @@ function ListViewBlock( {
 		colSpan = 3;
 	}
 
-	const classes = classnames( {
+	const classes = clsx( {
 		'is-selected': isSelected,
 		'is-first-selected': isFirstSelectedBlock,
 		'is-last-selected': isLastSelectedBlock,
@@ -206,6 +498,12 @@ function ListViewBlock( {
 		'is-dragging': isDragged,
 		'has-single-cell': ! showBlockActions,
 		'is-synced': blockInformation?.isSynced,
+		'is-draggable': canMove,
+		'is-displacement-normal': displacement === 'normal',
+		'is-displacement-up': displacement === 'up',
+		'is-displacement-down': displacement === 'down',
+		'is-after-dragged-blocks': isAfterDraggedBlocks,
+		'is-nesting': isNesting,
 	} );
 
 	// Only include all selected blocks if the currently clicked on block
@@ -216,15 +514,6 @@ function ListViewBlock( {
 		? selectedClientIds
 		: [ clientId ];
 
-	// Pass in a ref to the row, so that it can be scrolled
-	// into view when selected. For long lists, the placeholder for the
-	// selected block is also observed, within ListViewLeafPlaceholder.
-	useListViewScrollIntoView( {
-		isSelected,
-		rowItemRef: rowRef,
-		selectedClientIds,
-	} );
-
 	// Detect if there is a block in the canvas currently being edited and multi-selection is not happening.
 	const currentlyEditingBlockInCanvas =
 		isSelected && selectedClientIds.length === 1;
@@ -232,6 +521,7 @@ function ListViewBlock( {
 	return (
 		<ListViewLeaf
 			className={ classes }
+			isDragged={ isDragged }
 			onKeyDown={ onKeyDown }
 			onMouseEnter={ onMouseEnter }
 			onMouseLeave={ onMouseLeave }
@@ -257,6 +547,8 @@ function ListViewBlock( {
 						<ListViewBlockContents
 							block={ block }
 							onClick={ selectEditorBlock }
+							onContextMenu={ onContextMenu }
+							onMouseDown={ onMouseDown }
 							onToggleExpanded={ toggleExpanded }
 							isSelected={ isSelected }
 							position={ position }
@@ -269,12 +561,15 @@ function ListViewBlock( {
 							onFocus={ onFocus }
 							isExpanded={ canEdit ? isExpanded : undefined }
 							selectedClientIds={ selectedClientIds }
-							ariaLabel={ blockAriaLabel }
 							ariaDescribedBy={ descriptionId }
-							updateFocusAndSelection={ updateFocusAndSelection }
 						/>
 						<AriaReferencedText id={ descriptionId }>
-							{ blockPositionDescription }
+							{ [
+								blockPositionDescription,
+								blockPropertiesDescription,
+							]
+								.filter( Boolean )
+								.join( ' ' ) }
 						</AriaReferencedText>
 					</div>
 				) }
@@ -315,17 +610,22 @@ function ListViewBlock( {
 				<TreeGridCell
 					className={ listViewBlockSettingsClassName }
 					aria-selected={ !! isSelected }
+					ref={ settingsRef }
 				>
 					{ ( { ref, tabIndex, onFocus } ) => (
 						<BlockSettingsMenu
 							clientIds={ dropdownClientIds }
 							block={ block }
 							icon={ moreVertical }
-							label={ settingsAriaLabel }
+							label={ __( 'Options' ) }
+							popoverProps={ {
+								anchor: settingsPopoverAnchor, // Used to position the settings at the cursor on right-click.
+							} }
 							toggleProps={ {
 								ref,
 								className: 'block-editor-list-view-block__menu',
 								tabIndex,
+								onClick: clearSettingsAnchorRect,
 								onFocus,
 							} }
 							disableOpenOnArrowDown
diff --git a/packages/block-editor/src/components/list-view/branch.js b/packages/block-editor/src/components/list-view/branch.js
index e2e27f5f2cb5af..5df7134e125cdb 100644
--- a/packages/block-editor/src/components/list-view/branch.js
+++ b/packages/block-editor/src/components/list-view/branch.js
@@ -5,7 +5,7 @@ import {
 	__experimentalTreeGridRow as TreeGridRow,
 	__experimentalTreeGridCell as TreeGridCell,
 } from '@wordpress/components';
-import { memo } from '@wordpress/element';
+import { memo, useRef } from '@wordpress/element';
 import { AsyncModeProvider, useSelect } from '@wordpress/data';
 
 /**
@@ -14,7 +14,7 @@ import { AsyncModeProvider, useSelect } from '@wordpress/data';
 import { Appender } from './appender';
 import ListViewBlock from './block';
 import { useListViewContext } from './context';
-import { isClientIdSelected } from './utils';
+import { getDragDisplacementValues, isClientIdSelected } from './utils';
 import { store as blockEditorStore } from '../../store';
 import useBlockDisplayInformation from '../use-block-display-information';
 
@@ -91,7 +91,6 @@ function ListViewBranch( props ) {
 		selectedClientIds,
 		level = 1,
 		path = '',
-		isBranchDragged = false,
 		isBranchSelected = false,
 		listPosition = 0,
 		fixedListWindow,
@@ -115,7 +114,16 @@ function ListViewBranch( props ) {
 		[ parentId ]
 	);
 
-	const { expandedState, draggedClientIds } = useListViewContext();
+	const {
+		blockDropPosition,
+		blockDropTargetIndex,
+		firstDraggedBlockIndex,
+		blockIndexes,
+		expandedState,
+		draggedClientIds,
+	} = useListViewContext();
+
+	const nextPositionRef = useRef();
 
 	if ( ! canParentExpand ) {
 		return null;
@@ -127,7 +135,7 @@ function ListViewBranch( props ) {
 	const blockCount = filteredBlocks.length;
 	// The appender means an extra row in List View, so add 1 to the row count.
 	const rowCount = showAppender ? blockCount + 1 : blockCount;
-	let nextPosition = listPosition;
+	nextPositionRef.current = listPosition;
 
 	return (
 		<>
@@ -135,7 +143,7 @@ function ListViewBranch( props ) {
 				const { clientId, innerBlocks } = block;
 
 				if ( index > 0 ) {
-					nextPosition += countBlocks(
+					nextPositionRef.current += countBlocks(
 						filteredBlocks[ index - 1 ],
 						expandedState,
 						draggedClientIds,
@@ -143,8 +151,23 @@ function ListViewBranch( props ) {
 					);
 				}
 
+				const isDragged = !! draggedClientIds?.includes( clientId );
+
+				// Determine the displacement of the block while dragging. This
+				// works out whether the current block should be displaced up or
+				// down, relative to the dragged blocks and the drop target.
+				const { displacement, isAfterDraggedBlocks, isNesting } =
+					getDragDisplacementValues( {
+						blockIndexes,
+						blockDropTargetIndex,
+						blockDropPosition,
+						clientId,
+						firstDraggedBlockIndex,
+						isDragged,
+					} );
+
 				const { itemInView } = fixedListWindow;
-				const blockInView = itemInView( nextPosition );
+				const blockInView = itemInView( nextPositionRef.current );
 
 				const position = index + 1;
 				const updatedPath =
@@ -158,8 +181,6 @@ function ListViewBranch( props ) {
 						? expandedState[ clientId ] ?? isExpanded
 						: undefined;
 
-				const isDragged = !! draggedClientIds?.includes( clientId );
-
 				// Make updates to the selected or dragged blocks synchronous,
 				// but asynchronous for any other block.
 				const isSelected = isClientIdSelected(
@@ -175,11 +196,14 @@ function ListViewBranch( props ) {
 				// This prevents the entire tree from being rendered when a branch is
 				// selected, or a user selects all blocks, while still enabling scroll
 				// into view behavior when selecting a block or opening the list view.
+				// The first and last blocks of the list are always rendered, to ensure
+				// that Home and End keys work as expected.
 				const showBlock =
 					isDragged ||
 					blockInView ||
-					isBranchDragged ||
-					( isSelected && clientId === selectedClientIds[ 0 ] );
+					( isSelected && clientId === selectedClientIds[ 0 ] ) ||
+					index === 0 ||
+					index === blockCount - 1;
 				return (
 					<AsyncModeProvider key={ clientId } value={ ! isSelected }>
 						{ showBlock && (
@@ -188,17 +212,20 @@ function ListViewBranch( props ) {
 								selectBlock={ selectBlock }
 								isSelected={ isSelected }
 								isBranchSelected={ isSelectedBranch }
-								isDragged={ isDragged || isBranchDragged }
+								isDragged={ isDragged }
 								level={ level }
 								position={ position }
 								rowCount={ rowCount }
 								siblingBlockCount={ blockCount }
 								showBlockMovers={ showBlockMovers }
 								path={ updatedPath }
-								isExpanded={ shouldExpand }
-								listPosition={ nextPosition }
+								isExpanded={ isDragged ? false : shouldExpand }
+								listPosition={ nextPositionRef.current }
 								selectedClientIds={ selectedClientIds }
 								isSyncedBranch={ syncedBranch }
+								displacement={ displacement }
+								isAfterDraggedBlocks={ isAfterDraggedBlocks }
+								isNesting={ isNesting }
 							/>
 						) }
 						{ ! showBlock && (
@@ -206,7 +233,7 @@ function ListViewBranch( props ) {
 								<td className="block-editor-list-view-placeholder" />
 							</tr>
 						) }
-						{ hasNestedBlocks && shouldExpand && (
+						{ hasNestedBlocks && shouldExpand && ! isDragged && (
 							<ListViewBranch
 								parentId={ clientId }
 								blocks={ innerBlocks }
@@ -214,10 +241,9 @@ function ListViewBranch( props ) {
 								showBlockMovers={ showBlockMovers }
 								level={ level + 1 }
 								path={ updatedPath }
-								listPosition={ nextPosition + 1 }
+								listPosition={ nextPositionRef.current + 1 }
 								fixedListWindow={ fixedListWindow }
 								isBranchSelected={ isSelectedBranch }
-								isBranchDragged={ isDragged || isBranchDragged }
 								selectedClientIds={ selectedClientIds }
 								isExpanded={ isExpanded }
 								isSyncedBranch={ syncedBranch }
@@ -231,7 +257,7 @@ function ListViewBranch( props ) {
 					level={ level }
 					setSize={ rowCount }
 					positionInSet={ rowCount }
-					isExpanded={ true }
+					isExpanded
 				>
 					<TreeGridCell>
 						{ ( treeGridCellProps ) => (
diff --git a/packages/block-editor/src/components/list-view/drop-indicator.js b/packages/block-editor/src/components/list-view/drop-indicator.js
index 04ce87b4a0c8d4..3185bf9fbb2485 100644
--- a/packages/block-editor/src/components/list-view/drop-indicator.js
+++ b/packages/block-editor/src/components/list-view/drop-indicator.js
@@ -1,15 +1,40 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
 /**
  * WordPress dependencies
  */
-import { Popover } from '@wordpress/components';
+import {
+	__experimentalHStack as HStack,
+	__experimentalTruncate as Truncate,
+	Popover,
+} from '@wordpress/components';
+
 import { getScrollContainer } from '@wordpress/dom';
 import { useCallback, useMemo } from '@wordpress/element';
 import { isRTL } from '@wordpress/i18n';
 
-export default function ListViewDropIndicator( {
+/**
+ * Internal dependencies
+ */
+import BlockIcon from '../block-icon';
+import useBlockDisplayInformation from '../use-block-display-information';
+import useBlockDisplayTitle from '../block-title/use-block-display-title';
+import ListViewExpander from './expander';
+
+export default function ListViewDropIndicatorPreview( {
+	draggedBlockClientId,
 	listViewRef,
 	blockDropTarget,
 } ) {
+	const blockInformation = useBlockDisplayInformation( draggedBlockClientId );
+	const blockTitle = useBlockDisplayTitle( {
+		clientId: draggedBlockClientId,
+		context: 'list-view',
+	} );
+
 	const { rootClientId, clientId, dropPosition } = blockDropTarget || {};
 
 	const [ rootBlockElement, blockElement ] = useMemo( () => {
@@ -35,7 +60,7 @@ export default function ListViewDropIndicator( {
 			: undefined;
 
 		return [ _rootBlockElement, _blockElement ];
-	}, [ rootClientId, clientId ] );
+	}, [ listViewRef, rootClientId, clientId ] );
 
 	// The targetElement is the element that the drop indicator will appear
 	// before or after. When dropping into an empty block list, blockElement
@@ -44,27 +69,6 @@ export default function ListViewDropIndicator( {
 
 	const rtl = isRTL();
 
-	const getDropIndicatorIndent = useCallback(
-		( targetElementRect ) => {
-			if ( ! rootBlockElement ) {
-				return 0;
-			}
-
-			// Calculate the indent using the block icon of the root block.
-			// Using a classname selector here might be flaky and could be
-			// improved.
-			const rootBlockIconElement = rootBlockElement.querySelector(
-				'.block-editor-block-icon'
-			);
-			const rootBlockIconRect =
-				rootBlockIconElement.getBoundingClientRect();
-			return rtl
-				? targetElementRect.right - rootBlockIconRect.left
-				: rootBlockIconRect.right - targetElementRect.left;
-		},
-		[ rootBlockElement, rtl ]
-	);
-
 	const getDropIndicatorWidth = useCallback(
 		( targetElementRect, indent ) => {
 			if ( ! targetElement ) {
@@ -143,12 +147,69 @@ export default function ListViewDropIndicator( {
 		}
 
 		const targetElementRect = targetElement.getBoundingClientRect();
-		const indent = getDropIndicatorIndent( targetElementRect );
 
 		return {
-			width: getDropIndicatorWidth( targetElementRect, indent ),
+			width: getDropIndicatorWidth( targetElementRect, 0 ),
 		};
-	}, [ getDropIndicatorIndent, getDropIndicatorWidth, targetElement ] );
+	}, [ getDropIndicatorWidth, targetElement ] );
+
+	const horizontalScrollOffsetStyle = useMemo( () => {
+		if ( ! targetElement ) {
+			return {};
+		}
+
+		const scrollContainer = getScrollContainer( targetElement );
+		const ownerDocument = targetElement.ownerDocument;
+		const windowScroll =
+			scrollContainer === ownerDocument.body ||
+			scrollContainer === ownerDocument.documentElement;
+
+		if ( scrollContainer && ! windowScroll ) {
+			const scrollContainerRect = scrollContainer.getBoundingClientRect();
+			const targetElementRect = targetElement.getBoundingClientRect();
+
+			const distanceBetweenContainerAndTarget = rtl
+				? scrollContainerRect.right - targetElementRect.right
+				: targetElementRect.left - scrollContainerRect.left;
+
+			if ( ! rtl && scrollContainerRect.left > targetElementRect.left ) {
+				return {
+					transform: `translateX( ${ distanceBetweenContainerAndTarget }px )`,
+				};
+			}
+
+			if ( rtl && scrollContainerRect.right < targetElementRect.right ) {
+				return {
+					transform: `translateX( ${
+						distanceBetweenContainerAndTarget * -1
+					}px )`,
+				};
+			}
+		}
+
+		return {};
+	}, [ rtl, targetElement ] );
+
+	const ariaLevel = useMemo( () => {
+		if ( ! rootBlockElement ) {
+			return 1;
+		}
+
+		const _ariaLevel = parseInt(
+			rootBlockElement.getAttribute( 'aria-level' ),
+			10
+		);
+
+		return _ariaLevel ? _ariaLevel + 1 : 1;
+	}, [ rootBlockElement ] );
+
+	const hasAdjacentSelectedBranch = useMemo( () => {
+		if ( ! targetElement ) {
+			return false;
+		}
+
+		return targetElement.classList.contains( 'is-branch-selected' );
+	}, [ targetElement ] );
 
 	const popoverAnchor = useMemo( () => {
 		const isValidDropPosition =
@@ -163,16 +224,15 @@ export default function ListViewDropIndicator( {
 			contextElement: targetElement,
 			getBoundingClientRect() {
 				const rect = targetElement.getBoundingClientRect();
-				const indent = getDropIndicatorIndent( rect );
 				// In RTL languages, the drop indicator should be positioned
 				// to the left of the target element, with the width of the
 				// indicator determining the indent at the right edge of the
 				// target element. In LTR languages, the drop indicator should
 				// end at the right edge of the target element, with the indent
 				// added to the position of the left edge of the target element.
-				let left = rtl ? rect.left : rect.left + indent;
+				// let left = rtl ? rect.left : rect.left + indent;
+				let left = rect.left;
 				let top = 0;
-				let bottom = 0;
 
 				// In deeply nested lists, where a scrollbar is present,
 				// the width of the drop indicator should be the width of
@@ -212,27 +272,19 @@ export default function ListViewDropIndicator( {
 				}
 
 				if ( dropPosition === 'top' ) {
-					top = rect.top;
-					bottom = rect.top;
+					top = rect.top - rect.height * 2;
 				} else {
 					// `dropPosition` is either `bottom` or `inside`
-					top = rect.bottom;
-					bottom = rect.bottom;
+					top = rect.top;
 				}
 
-				const width = getDropIndicatorWidth( rect, indent );
-				const height = bottom - top;
+				const width = getDropIndicatorWidth( rect, 0 );
+				const height = rect.height;
 
 				return new window.DOMRect( left, top, width, height );
 			},
 		};
-	}, [
-		targetElement,
-		dropPosition,
-		getDropIndicatorIndent,
-		getDropIndicatorWidth,
-		rtl,
-	] );
+	}, [ targetElement, dropPosition, getDropIndicatorWidth, rtl ] );
 
 	if ( ! targetElement ) {
 		return null;
@@ -243,13 +295,54 @@ export default function ListViewDropIndicator( {
 			animate={ false }
 			anchor={ popoverAnchor }
 			focusOnMount={ false }
-			className="block-editor-list-view-drop-indicator"
+			className="block-editor-list-view-drop-indicator--preview"
 			variant="unstyled"
+			flip={ false }
+			resize
 		>
 			<div
 				style={ style }
-				className="block-editor-list-view-drop-indicator__line"
-			/>
+				className={ clsx(
+					'block-editor-list-view-drop-indicator__line',
+					{
+						'block-editor-list-view-drop-indicator__line--darker':
+							hasAdjacentSelectedBranch,
+					}
+				) }
+			>
+				<div
+					className="block-editor-list-view-leaf"
+					aria-level={ ariaLevel }
+				>
+					<div
+						className={ clsx(
+							'block-editor-list-view-block-select-button',
+							'block-editor-list-view-block-contents'
+						) }
+						style={ horizontalScrollOffsetStyle }
+					>
+						<ListViewExpander onClick={ () => {} } />
+						<BlockIcon
+							icon={ blockInformation?.icon }
+							showColors
+							context="list-view"
+						/>
+						<HStack
+							alignment="center"
+							className="block-editor-list-view-block-select-button__label-wrapper"
+							justify="flex-start"
+							spacing={ 1 }
+						>
+							<span className="block-editor-list-view-block-select-button__title">
+								<Truncate ellipsizeMode="auto">
+									{ blockTitle }
+								</Truncate>
+							</span>
+						</HStack>
+					</div>
+					<div className="block-editor-list-view-block__menu-cell"></div>
+				</div>
+			</div>
 		</Popover>
 	);
 }
diff --git a/packages/block-editor/src/components/list-view/index.js b/packages/block-editor/src/components/list-view/index.js
index 315a6153839d16..d7961bd6c02f3d 100644
--- a/packages/block-editor/src/components/list-view/index.js
+++ b/packages/block-editor/src/components/list-view/index.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
 /**
  * WordPress dependencies
  */
@@ -28,16 +33,22 @@ import { __ } from '@wordpress/i18n';
  */
 import ListViewBranch from './branch';
 import { ListViewContext } from './context';
-import ListViewDropIndicator from './drop-indicator';
+import ListViewDropIndicatorPreview from './drop-indicator';
 import useBlockSelection from './use-block-selection';
+import useListViewBlockIndexes from './use-list-view-block-indexes';
 import useListViewClientIds from './use-list-view-client-ids';
+import useListViewCollapseItems from './use-list-view-collapse-items';
 import useListViewDropZone from './use-list-view-drop-zone';
 import useListViewExpandSelectedItem from './use-list-view-expand-selected-item';
 import { store as blockEditorStore } from '../../store';
 import { BlockSettingsDropdown } from '../block-settings-menu/block-settings-dropdown';
 import { focusListItem } from './utils';
+import useClipboardHandler from './use-clipboard-handler';
 
 const expanded = ( state, action ) => {
+	if ( action.type === 'clear' ) {
+		return {};
+	}
 	if ( Array.isArray( action.clientIds ) ) {
 		return {
 			...state,
@@ -53,7 +64,7 @@ const expanded = ( state, action ) => {
 	return state;
 };
 
-export const BLOCK_LIST_ITEM_HEIGHT = 36;
+export const BLOCK_LIST_ITEM_HEIGHT = 32;
 
 /** @typedef {import('react').ComponentType} ComponentType */
 /** @typedef {import('react').Ref<HTMLElement>} Ref */
@@ -105,22 +116,19 @@ function ListViewComponent(
 	const instanceId = useInstanceId( ListViewComponent );
 	const { clientIdsTree, draggedClientIds, selectedClientIds } =
 		useListViewClientIds( { blocks, rootClientId } );
+	const blockIndexes = useListViewBlockIndexes( clientIdsTree );
 
 	const { getBlock } = useSelect( blockEditorStore );
-	const { visibleBlockCount, shouldShowInnerBlocks } = useSelect(
+	const { visibleBlockCount } = useSelect(
 		( select ) => {
-			const {
-				getGlobalBlockCount,
-				getClientIdsOfDescendants,
-				__unstableGetEditorMode,
-			} = select( blockEditorStore );
+			const { getGlobalBlockCount, getClientIdsOfDescendants } =
+				select( blockEditorStore );
 			const draggedBlockCount =
 				draggedClientIds?.length > 0
 					? getClientIdsOfDescendants( draggedClientIds ).length + 1
 					: 0;
 			return {
 				visibleBlockCount: getGlobalBlockCount() - draggedBlockCount,
-				shouldShowInnerBlocks: __unstableGetEditorMode() !== 'zoom-out',
 			};
 		},
 		[ draggedClientIds ]
@@ -130,12 +138,6 @@ function ListViewComponent(
 
 	const [ expandedState, setExpandedState ] = useReducer( expanded, {} );
 
-	const { ref: dropZoneRef, target: blockDropTarget } = useListViewDropZone( {
-		dropZoneElement,
-	} );
-	const elementRef = useRef();
-	const treeGridRef = useMergeRefs( [ elementRef, dropZoneRef, ref ] );
-
 	const [ insertedBlock, setInsertedBlock ] = useState( null );
 
 	const { setSelectedTreeId } = useListViewExpandSelectedItem( {
@@ -157,14 +159,33 @@ function ListViewComponent(
 		},
 		[ setSelectedTreeId, updateBlockSelection, onSelect, getBlock ]
 	);
+
+	const { ref: dropZoneRef, target: blockDropTarget } = useListViewDropZone( {
+		dropZoneElement,
+		expandedState,
+		setExpandedState,
+	} );
+	const elementRef = useRef();
+
+	// Allow handling of copy, cut, and paste events.
+	const clipBoardRef = useClipboardHandler( {
+		selectBlock: selectEditorBlock,
+	} );
+
+	const treeGridRef = useMergeRefs( [
+		clipBoardRef,
+		elementRef,
+		dropZoneRef,
+		ref,
+	] );
+
 	useEffect( () => {
 		// If a blocks are already selected when the list view is initially
 		// mounted, shift focus to the first selected block.
 		if ( selectedClientIds?.length ) {
-			focusListItem( selectedClientIds[ 0 ], elementRef );
+			focusListItem( selectedClientIds[ 0 ], elementRef?.current );
 		}
-		// Disable reason: Only focus on the selected item when the list view is mounted.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// Only focus on the selected item when the list view is mounted.
 	}, [] );
 
 	const expand = useCallback(
@@ -172,7 +193,10 @@ function ListViewComponent(
 			if ( ! clientId ) {
 				return;
 			}
-			setExpandedState( { type: 'expand', clientIds: [ clientId ] } );
+			const clientIds = Array.isArray( clientId )
+				? clientId
+				: [ clientId ];
+			setExpandedState( { type: 'expand', clientIds } );
 		},
 		[ setExpandedState ]
 	);
@@ -185,6 +209,9 @@ function ListViewComponent(
 		},
 		[ setExpandedState ]
 	);
+	const collapseAll = useCallback( () => {
+		setExpandedState( { type: 'clear' } );
+	}, [ setExpandedState ] );
 	const expandRow = useCallback(
 		( row ) => {
 			expand( row?.dataset?.block );
@@ -210,12 +237,62 @@ function ListViewComponent(
 		[ updateBlockSelection ]
 	);
 
+	useListViewCollapseItems( {
+		collapseAll,
+		expand,
+	} );
+
+	const firstDraggedBlockClientId = draggedClientIds?.[ 0 ];
+
+	// Convert a blockDropTarget into indexes relative to the blocks in the list view.
+	// These values are used to determine which blocks should be displaced to make room
+	// for the drop indicator. See `ListViewBranch` and `getDragDisplacementValues`.
+	const { blockDropTargetIndex, blockDropPosition, firstDraggedBlockIndex } =
+		useMemo( () => {
+			let _blockDropTargetIndex, _firstDraggedBlockIndex;
+
+			if ( blockDropTarget?.clientId ) {
+				const foundBlockIndex =
+					blockIndexes[ blockDropTarget.clientId ];
+				// If dragging below or inside the block, treat the drop target as the next block.
+				_blockDropTargetIndex =
+					foundBlockIndex === undefined ||
+					blockDropTarget?.dropPosition === 'top'
+						? foundBlockIndex
+						: foundBlockIndex + 1;
+			} else if ( blockDropTarget === null ) {
+				// A `null` value is used to indicate that the user is dragging outside of the list view.
+				_blockDropTargetIndex = null;
+			}
+
+			if ( firstDraggedBlockClientId ) {
+				const foundBlockIndex =
+					blockIndexes[ firstDraggedBlockClientId ];
+				_firstDraggedBlockIndex =
+					foundBlockIndex === undefined ||
+					blockDropTarget?.dropPosition === 'top'
+						? foundBlockIndex
+						: foundBlockIndex + 1;
+			}
+
+			return {
+				blockDropTargetIndex: _blockDropTargetIndex,
+				blockDropPosition: blockDropTarget?.dropPosition,
+				firstDraggedBlockIndex: _firstDraggedBlockIndex,
+			};
+		}, [ blockDropTarget, blockIndexes, firstDraggedBlockClientId ] );
+
 	const contextValue = useMemo(
 		() => ( {
+			blockDropPosition,
+			blockDropTargetIndex,
+			blockIndexes,
 			draggedClientIds,
 			expandedState,
 			expand,
+			firstDraggedBlockIndex,
 			collapse,
+			collapseAll,
 			BlockSettingsMenu,
 			listViewInstanceId: instanceId,
 			AdditionalBlockContent,
@@ -225,10 +302,15 @@ function ListViewComponent(
 			rootClientId,
 		} ),
 		[
+			blockDropPosition,
+			blockDropTargetIndex,
+			blockIndexes,
 			draggedClientIds,
 			expandedState,
 			expand,
+			firstDraggedBlockIndex,
 			collapse,
+			collapseAll,
 			BlockSettingsMenu,
 			instanceId,
 			AdditionalBlockContent,
@@ -266,8 +348,9 @@ function ListViewComponent(
 		description && `block-editor-list-view-description-${ instanceId }`;
 
 	return (
-		<AsyncModeProvider value={ true }>
-			<ListViewDropIndicator
+		<AsyncModeProvider value>
+			<ListViewDropIndicatorPreview
+				draggedBlockClientId={ firstDraggedBlockClientId }
 				listViewRef={ elementRef }
 				blockDropTarget={ blockDropTarget }
 			/>
@@ -278,7 +361,11 @@ function ListViewComponent(
 			) }
 			<TreeGrid
 				id={ id }
-				className="block-editor-list-view-tree"
+				className={ clsx( 'block-editor-list-view-tree', {
+					'is-dragging':
+						draggedClientIds?.length > 0 &&
+						blockDropTargetIndex !== undefined,
+				} ) }
 				aria-label={ __( 'Block navigation structure' ) }
 				ref={ treeGridRef }
 				onCollapseRow={ collapseRow }
@@ -286,6 +373,15 @@ function ListViewComponent(
 				onFocusRow={ focusRow }
 				applicationAriaLabel={ __( 'Block navigation structure' ) }
 				aria-describedby={ describedById }
+				style={ {
+					'--wp-admin--list-view-dragged-items-height':
+						draggedClientIds?.length
+							? `${
+									BLOCK_LIST_ITEM_HEIGHT *
+									( draggedClientIds.length - 1 )
+							  }px`
+							: null,
+				} }
 			>
 				<ListViewContext.Provider value={ contextValue }>
 					<ListViewBranch
@@ -296,7 +392,6 @@ function ListViewComponent(
 						fixedListWindow={ fixedListWindow }
 						selectedClientIds={ selectedClientIds }
 						isExpanded={ isExpanded }
-						shouldShowInnerBlocks={ shouldShowInnerBlocks }
 						showAppender={ showAppender }
 					/>
 				</ListViewContext.Provider>
diff --git a/packages/block-editor/src/components/list-view/leaf.js b/packages/block-editor/src/components/list-view/leaf.js
index c42d696f32b3c1..1e3e6320d2ace3 100644
--- a/packages/block-editor/src/components/list-view/leaf.js
+++ b/packages/block-editor/src/components/list-view/leaf.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { animated } from '@react-spring/web';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -21,6 +21,7 @@ const AnimatedTreeGridRow = animated( TreeGridRow );
 const ListViewLeaf = forwardRef(
 	(
 		{
+			isDragged,
 			isSelected,
 			position,
 			level,
@@ -33,8 +34,7 @@ const ListViewLeaf = forwardRef(
 		ref
 	) => {
 		const animationRef = useMovingAnimation( {
-			isSelected,
-			adjustScrolling: false,
+			clientId: props[ 'data-block' ],
 			enableAnimation: true,
 			triggerAnimationOnChange: path,
 		} );
@@ -44,10 +44,7 @@ const ListViewLeaf = forwardRef(
 		return (
 			<AnimatedTreeGridRow
 				ref={ mergedRef }
-				className={ classnames(
-					'block-editor-list-view-leaf',
-					className
-				) }
+				className={ clsx( 'block-editor-list-view-leaf', className ) }
 				level={ level }
 				positionInSet={ position }
 				setSize={ rowCount }
diff --git a/packages/block-editor/src/components/list-view/style.scss b/packages/block-editor/src/components/list-view/style.scss
index 7afa7a1c984318..2916622efabee9 100644
--- a/packages/block-editor/src/components/list-view/style.scss
+++ b/packages/block-editor/src/components/list-view/style.scss
@@ -7,13 +7,29 @@
 	// Move upwards when in modal.
 	.components-modal__content & {
 		margin: (-$grid-unit-15) (-$grid-unit-15 * 0.5) 0;
-		width: calc(100% + #{ $grid-unit-15 });
+		width: calc(100% + #{$grid-unit-15});
+	}
+
+	// Without setting `pointer-events: none`, when dragging over list view items,
+	// Safari calls onDropZoneLeave causing flickering in the position of the drop indicator.
+	// https://bugs.webkit.org/show_bug.cgi?id=66547
+	// See: https://github.com/WordPress/gutenberg/pull/56625
+	&.is-dragging tbody {
+		pointer-events: none;
 	}
 }
 
 .block-editor-list-view-leaf {
 	// Use position relative for row animation.
 	position: relative;
+	// Set the initial translate position to ensure the UI in Safari doesn't jump
+	// when rows later receive the is-displacement-up or is-displacement-down class.
+	transform: translateY(0);
+
+	&.is-draggable,
+	&.is-draggable .block-editor-list-view-block-contents {
+		cursor: grab;
+	}
 
 	.block-editor-list-view-block-select-button {
 		// When a row is expanded, retain the dark color.
@@ -25,6 +41,15 @@
 		&:hover {
 			color: var(--wp-admin-theme-color);
 		}
+
+		svg {
+			fill: currentColor;
+			// Optimizate for high contrast modes.
+			// See also https://blogs.windows.com/msedgedev/2020/09/17/styling-for-windows-high-contrast-with-new-standards-for-forced-colors/.
+			@media (forced-colors: active) {
+				fill: CanvasText;
+			}
+		}
 	}
 
 	&:not(.is-selected) .block-editor-list-view-block-select-button {
@@ -55,7 +80,8 @@
 		&:focus::after {
 			box-shadow:
 				inset 0 0 0 1px $white,
-				0 0 0 var(--wp-admin-border-width-focus) var(--wp-block-synced-color);
+				0 0 0 var(--wp-admin-border-width-focus)
+				var(--wp-block-synced-color);
 		}
 	}
 	&.is-selected .block-editor-list-view-block-contents,
@@ -66,14 +92,16 @@
 		&::after {
 			box-shadow:
 				inset 0 0 0 1px $white,
-				0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+				0 0 0 var(--wp-admin-border-width-focus)
+				var(--wp-admin-theme-color);
 		}
 	}
 	&.is-selected.is-synced .block-editor-list-view-block-contents:focus {
 		&::after {
 			box-shadow:
 				inset 0 0 0 1px $white,
-				0 0 0 var(--wp-admin-border-width-focus) var(--wp-block-synced-color);
+				0 0 0 var(--wp-admin-border-width-focus)
+				var(--wp-block-synced-color);
 		}
 	}
 	&.is-selected .block-editor-list-view-block__menu:focus {
@@ -82,16 +110,16 @@
 
 	// Border radius for corners of the selected item.
 	&.is-first-selected td:first-child {
-		border-top-left-radius: $radius-block-ui;
+		border-top-left-radius: $radius-small;
 	}
 	&.is-first-selected td:last-child {
-		border-top-right-radius: $radius-block-ui;
+		border-top-right-radius: $radius-small;
 	}
 	&.is-last-selected td:first-child {
-		border-bottom-left-radius: $radius-block-ui;
+		border-bottom-left-radius: $radius-small;
 	}
 	&.is-last-selected td:last-child {
-		border-bottom-right-radius: $radius-block-ui;
+		border-bottom-right-radius: $radius-small;
 	}
 	&.is-branch-selected:not(.is-selected):not(.is-synced-branch) {
 		background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
@@ -100,53 +128,112 @@
 		background: rgba(var(--wp-block-synced-color--rgb), 0.04);
 	}
 	&.is-branch-selected.is-first-selected td:first-child {
-		border-top-left-radius: $radius-block-ui;
+		border-top-left-radius: $radius-small;
 	}
 	&.is-branch-selected.is-first-selected td:last-child {
-		border-top-right-radius: $radius-block-ui;
+		border-top-right-radius: $radius-small;
 	}
 	&[data-expanded="false"] {
 		&.is-branch-selected.is-first-selected td:first-child {
-			border-top-left-radius: $radius-block-ui;
+			border-top-left-radius: $radius-small;
 		}
 		&.is-branch-selected.is-first-selected td:last-child {
-			border-top-right-radius: $radius-block-ui;
+			border-top-right-radius: $radius-small;
 		}
 		&.is-branch-selected.is-last-selected td:first-child {
-			border-bottom-left-radius: $radius-block-ui;
+			border-bottom-left-radius: $radius-small;
 		}
 		&.is-branch-selected.is-last-selected td:last-child {
-			border-bottom-right-radius: $radius-block-ui;
+			border-bottom-right-radius: $radius-small;
 		}
 	}
 	&.is-branch-selected:not(.is-selected) td {
 		border-radius: 0;
 	}
 
-	// List View renders a fixed number of items and relies on each item having a fixed height of 36px.
+	// List view items will be displaced up or down relative to their original position
+	// when a user is dragging a block within the list view. This creates a space for a
+	// visual indicator of where the block will be placed when dropped. The `normal` state
+	// is used to allow rows to smoothly transition back into their original position,
+	// without attaching the transition to the list view leaf itself. This prevents rows
+	// from animating too much once the user has dropped the block.
+	&.is-displacement-normal {
+		transition: transform 0.2s;
+		transform: translateY(0);
+		@include reduce-motion("transition");
+	}
+
+	&.is-displacement-up {
+		transition: transform 0.2s;
+		transform: translateY(-32px);
+		@include reduce-motion("transition");
+	}
+
+	&.is-displacement-down {
+		transition: transform 0.2s;
+		transform: translateY(32px);
+		@include reduce-motion("transition");
+	}
+
+	// Collapse multi-selections down into a single row space while dragging. The following
+	// rules ensure that during a multi-selection, the space for additional blocks is factored in
+	// when displacing up and down. The result is that there should only ever be a single row's
+	// worth of space for the visual indicator of where a block will be placed when dropped.
+	&.is-after-dragged-blocks {
+		transition: transform 0.2s;
+		transform: translateY(calc(var(--wp-admin--list-view-dragged-items-height, 32px) * -1));
+		@include reduce-motion("transition");
+	}
+
+	&.is-after-dragged-blocks.is-displacement-up {
+		transition: transform 0.2s;
+		transform: translateY(calc(-32px + var(--wp-admin--list-view-dragged-items-height, 32px) * -1));
+		@include reduce-motion("transition");
+	}
+
+	&.is-after-dragged-blocks.is-displacement-down {
+		transition: transform 0.2s;
+		transform:
+			translateY(calc(32px + var(--wp-admin--list-view-dragged-items-height, 32px) *
+			-1));
+		@include reduce-motion("transition");
+	}
+
+	// To ensure displaced rows behave correctly, ensure that blocks that are currently being dragged
+	// are visually hidden. The below rules are used in favor of `display: none` to ensure that
+	// there is no flicker when a user begins to drag a block.
+	&.is-dragging {
+		opacity: 0;
+		// The row's left position is set to 0 to ensure that the animation
+		// when dropping a block animates from the correct position.
+		left: 0;
+		// Ensure the dragged element does not otherwise affect dropping to
+		// other positions.
+		pointer-events: none;
+		z-index: -9999;
+	}
+
+	// List View renders a fixed number of items and relies on each item having a fixed height of 32px.
 	// If this value changes, we should also change the itemHeight value set in useFixedWindowList.
 	// See: https://github.com/WordPress/gutenberg/pull/35230 for additional context.
 	.block-editor-list-view-block-contents {
 		display: flex;
 		align-items: center;
 		width: 100%;
-		height: auto;
+		height: $grid-unit-40;
 		padding: ($grid-unit-15 * 0.5) $grid-unit-05 ($grid-unit-15 * 0.5) 0;
 		text-align: left;
-		border-radius: $radius-block-ui;
 		position: relative;
 		white-space: nowrap;
-
-		&.is-dropping-before::before {
-			content: "";
-			position: absolute;
-			pointer-events: none;
-			transition: border-color 0.1s linear, border-style 0.1s linear, box-shadow 0.1s linear;
-			top: -2px;
-			right: 0;
-			left: 0;
-			border-top: 4px solid var(--wp-admin-theme-color);
-		}
+		border-radius: 2px;
+		box-sizing: border-box;
+		color: inherit;
+		font-family: inherit;
+		font-size: 13px;
+		font-weight: 400;
+		margin: 0;
+		text-decoration: none;
+		transition: box-shadow 0.1s linear;
 
 		.components-modal__content & {
 			padding-left: 0;
@@ -154,6 +241,7 @@
 		}
 	}
 
+	&.is-nesting .block-editor-list-view-block-contents,
 	.block-editor-list-view-block-contents:focus {
 		box-shadow: none;
 
@@ -165,14 +253,11 @@
 			bottom: 0;
 			left: 0;
 			border-radius: inherit;
-			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+			box-shadow:
+				inset 0 0 0 var(--wp-admin-border-width-focus)
+				var(--wp-admin-theme-color);
 			z-index: 2;
 			pointer-events: none;
-
-			// Hide focus styles while a user is dragging blocks/files etc.
-			.is-dragging-components-draggable & {
-				box-shadow: none;
-			}
 		}
 	}
 
@@ -181,31 +266,28 @@
 		right: 0;
 	}
 
+	&.is-nesting .block-editor-list-view__menu,
 	.block-editor-list-view-block__menu:focus {
-		box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+		box-shadow:
+			inset 0 0 0 var(--wp-admin-border-width-focus)
+			var(--wp-admin-theme-color);
 		z-index: 1;
-
-		// Hide focus styles while a user is dragging blocks/files etc.
-		.is-dragging-components-draggable & {
-			box-shadow: none;
-		}
 	}
 
 	&.is-visible .block-editor-list-view-block-contents {
 		opacity: 1;
-		@include edit-post__fade-in-animation;
+		@include animation__fade-in;
 	}
 
 	.block-editor-block-icon {
-		margin-right: $grid-unit-10;
+		margin-right: $grid-unit-10 * 0.5; // 6px.
 		flex: 0 0 $icon-size;
 	}
 
 	.block-editor-list-view-block__menu-cell,
 	.block-editor-list-view-block__mover-cell,
 	.block-editor-list-view-block__contents-cell {
-		padding-top: 0;
-		padding-bottom: 0;
+		padding: 0;
 	}
 
 	.block-editor-list-view-block__menu-cell,
@@ -229,8 +311,8 @@
 
 		&,
 		.components-button.has-icon {
-			width: 24px;
-			min-width: 24px;
+			width: $button-size-small;
+			min-width: $button-size-small;
 			padding: 0;
 		}
 	}
@@ -299,8 +381,10 @@
 		}
 	}
 
-	.block-editor-list-view-block-select-button__label-wrapper {
-		min-width: 120px;
+	// Style lock and position icons in line with image previews.
+	.block-editor-list-view-block-select-button__label-wrapper svg {
+		left: $grid-unit-05 * 0.5; // 2px.
+		position: relative;
 	}
 
 	.block-editor-list-view-block-select-button__title {
@@ -325,7 +409,7 @@
 		right: 0;
 		transform: translateY(-50%);
 		background: rgba($black, 0.1);
-		border-radius: $radius-block-ui;
+		border-radius: $radius-x-small;
 		padding: 2px 6px;
 		max-width: 100%;
 		box-sizing: border-box;
@@ -335,7 +419,8 @@
 		background: rgba($black, 0.3);
 	}
 
-	.block-editor-list-view-block-select-button__lock {
+	.block-editor-list-view-block-select-button__lock,
+	.block-editor-list-view-block-select-button__sticky {
 		line-height: 0;
 	}
 
@@ -347,10 +432,10 @@
 		background-size: cover;
 		width: 18px;
 		height: 18px;
-		border-radius: $radius-block-ui;
+		border-radius: $radius-x-small;
 
 		&:not(:only-child) {
-			box-shadow: 0 0 0 $radius-block-ui $white;
+			box-shadow: 0 0 0 $radius-small $white;
 		}
 
 		&:not(:first-child) {
@@ -360,11 +445,19 @@
 
 	&.is-selected .block-editor-list-view-block-select-button__image {
 		&:not(:only-child) {
-			box-shadow: 0 0 0 $radius-block-ui var(--wp-admin-theme-color);
+			box-shadow: 0 0 0 $radius-small var(--wp-admin-theme-color);
 		}
 	}
 }
 
+// First level of indentation is aria-level 2, max indent is 8.
+// Indent is a full icon size, plus 4px which optically aligns child icons to the text label above.
+$block-navigation-max-indent: 8;
+
+.block-editor-list-view-draggable-chip {
+	opacity: 0.8;
+}
+
 .block-editor-list-view-block__contents-cell,
 .block-editor-list-view-appender__cell {
 	.block-editor-list-view-block__contents-container,
@@ -376,33 +469,24 @@
 // Chevron container metrics.
 .block-editor-list-view__expander {
 	height: $icon-size;
-	margin-left: $grid-unit-05;
 	width: $icon-size;
+	cursor: pointer;
 }
 
-// First level of indentation is aria-level 2, max indent is 8.
-// Indent is a full icon size, plus 4px which optically aligns child icons to the text label above.
-$block-navigation-max-indent: 8;
 .block-editor-list-view-leaf[aria-level] .block-editor-list-view__expander {
-	margin-left: ( $icon-size ) * $block-navigation-max-indent + 4 * ( $block-navigation-max-indent - 1 );
-}
-
-.block-editor-list-view-leaf:not([aria-level="1"]) {
-	.block-editor-list-view__expander {
-		margin-right: 4px;
-	}
+	margin-left: ($grid-unit-30 * $block-navigation-max-indent);
 }
 
 // When updating the margin for each indentation level, the corresponding
 // indentation in `use-list-view-drop-zone.js` must be updated as well
 // to ensure the drop zone is aligned with the indentation.
 @for $i from 0 to $block-navigation-max-indent {
-	.block-editor-list-view-leaf[aria-level="#{ $i + 1 }"] .block-editor-list-view__expander {
+	.block-editor-list-view-leaf[aria-level="#{ $i + 1 }"]
+	.block-editor-list-view__expander {
 		@if $i - 1 >= 0 {
-			margin-left: ( $icon-size * $i ) + 4 * ($i - 1);
-		}
-		@else {
-			margin-left: ( $icon-size * $i );
+			margin-left: ($grid-unit-30 * $i); // Effectivly centers the expander below the parent's icon.
+		} @else {
+			margin-left: 0;
 		}
 	}
 }
@@ -412,7 +496,9 @@ $block-navigation-max-indent: 8;
 }
 
 // Point downwards when open.
-.block-editor-list-view-leaf[data-expanded="true"] .block-editor-list-view__expander svg {
+.block-editor-list-view-leaf[data-expanded="true"]
+.block-editor-list-view__expander
+svg {
 	visibility: visible;
 	transition: transform 0.2s ease;
 	transform: rotate(90deg);
@@ -420,7 +506,9 @@ $block-navigation-max-indent: 8;
 }
 
 // Point rightwards when closed
-.block-editor-list-view-leaf[data-expanded="false"] .block-editor-list-view__expander svg {
+.block-editor-list-view-leaf[data-expanded="false"]
+.block-editor-list-view__expander
+svg {
 	visibility: visible;
 	transform: rotate(0deg);
 	transition: transform 0.2s ease;
@@ -437,17 +525,37 @@ $block-navigation-max-indent: 8;
 	}
 }
 
+.block-editor-list-view-drop-indicator--preview {
+	pointer-events: none;
+
+	// If the drop indicator's popover ever extends to the edge of the screen,
+	// avoid any scrollbars by hiding the overflow.
+	.components-popover__content {
+		overflow: hidden !important;
+	}
+
+	.block-editor-list-view-drop-indicator__line {
+		background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
+		height: 32px;
+		border-radius: 4px;
+		overflow: hidden;
+	}
+
+	.block-editor-list-view-drop-indicator__line--darker {
+		background: rgba(var(--wp-admin-theme-color--rgb), 0.09);
+	}
+}
+
 .block-editor-list-view-placeholder {
 	padding: 0;
 	margin: 0;
-	height: 36px;
+	height: 32px;
 }
 
 .list-view-appender .block-editor-inserter__toggle {
 	background-color: #1e1e1e;
 	color: #fff;
 	margin: $grid-unit-10 0 0 24px;
-	border-radius: 2px;
 	height: 24px;
 	min-width: 24px;
 	padding: 0;
diff --git a/packages/block-editor/src/components/list-view/test/use-list-view-drop-zone.js b/packages/block-editor/src/components/list-view/test/use-list-view-drop-zone.js
index 98c2b31132c60e..f1180a9fa27ca1 100644
--- a/packages/block-editor/src/components/list-view/test/use-list-view-drop-zone.js
+++ b/packages/block-editor/src/components/list-view/test/use-list-view-drop-zone.js
@@ -127,6 +127,7 @@ describe( 'getListViewDropTarget', () => {
 
 			expect( target ).toEqual( {
 				blockIndex: 0,
+				clientId: 'block-1',
 				dropPosition: 'inside',
 				rootClientId: 'block-1',
 			} );
@@ -142,6 +143,7 @@ describe( 'getListViewDropTarget', () => {
 
 			expect( target ).toEqual( {
 				blockIndex: 0,
+				clientId: 'block-3',
 				dropPosition: 'inside',
 				rootClientId: 'block-3',
 			} );
@@ -244,6 +246,7 @@ describe( 'getListViewDropTarget', () => {
 
 			expect( target ).toEqual( {
 				blockIndex: 1,
+				clientId: 'block-1',
 				dropPosition: 'inside',
 				rootClientId: 'block-1',
 			} );
@@ -277,6 +280,7 @@ describe( 'getListViewDropTarget', () => {
 
 			expect( target ).toEqual( {
 				blockIndex: 0,
+				clientId: 'block-1',
 				dropPosition: 'inside',
 				rootClientId: 'block-1',
 			} );
diff --git a/packages/block-editor/src/components/list-view/test/utils.js b/packages/block-editor/src/components/list-view/test/utils.js
index 78d78a9d90069c..d603d9ef1bb8b4 100644
--- a/packages/block-editor/src/components/list-view/test/utils.js
+++ b/packages/block-editor/src/components/list-view/test/utils.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { getCommonDepthClientIds } from '../utils';
+import { getCommonDepthClientIds, getDragDisplacementValues } from '../utils';
 
 describe( 'getCommonDepthClientIds', () => {
 	it( 'should return start and end when no depth is provided', () => {
@@ -48,3 +48,220 @@ describe( 'getCommonDepthClientIds', () => {
 		expect( result ).toEqual( { start: 'start-3', end: 'clicked-id' } );
 	} );
 } );
+
+describe( 'getDragDisplacementValues', () => {
+	const blockIndexes = {
+		'block-a': 0,
+		'block-b': 1,
+		'block-c': 2,
+		'block-d': 3,
+		'block-e': 4,
+		'block-f': 5,
+		'block-g': 6,
+		'block-h': 7,
+	};
+
+	it( 'should return displacement of normal when block is after dragged block and drop target', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 3,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: 5,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: true,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of up when block is after dragged block and before the drop target', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 7,
+			blockDropPosition: 'bottom',
+			clientId: 'block-d',
+			firstDraggedBlockIndex: 2,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'up',
+			isAfterDraggedBlocks: true,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of down when block is before dragged block and after the drop target', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 1,
+			blockDropPosition: 'bottom',
+			clientId: 'block-d',
+			firstDraggedBlockIndex: 6,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'down',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return isNesting of true when block is just before the drop target and drop position is inside', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 1,
+			blockDropPosition: 'inside',
+			clientId: 'block-a',
+			firstDraggedBlockIndex: 6,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: false,
+			isNesting: true,
+		} );
+	} );
+
+	it( 'should return isNesting of false when block is not just before the drop target and drop position is inside', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 1,
+			blockDropPosition: 'inside',
+			clientId: 'block-b',
+			firstDraggedBlockIndex: 6,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'down',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of up when drop target index is null and block is after dragged block', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: null,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: 5,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'up',
+			isAfterDraggedBlocks: true,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of normal when drop target index is null and block is before dragged block', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: null,
+			blockDropPosition: 'bottom',
+			clientId: 'block-c',
+			firstDraggedBlockIndex: 5,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of normal when dragging a file (no dragged block) and the block is before the target index', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 3,
+			blockDropPosition: 'bottom',
+			clientId: 'block-b',
+			firstDraggedBlockIndex: undefined,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of down when dragging a file (no dragged block) and the block is after the target index', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 3,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: undefined,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'down',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of normal when dragging a file (no dragged block) and dragging outside the list view (drop target of null)', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: null,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: undefined,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return undefined displacement if the target index is undefined', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: undefined,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: undefined,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: undefined,
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return all undefined values if the block is dragged', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 3,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: 7,
+			isDragged: true,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: undefined,
+			isAfterDraggedBlocks: undefined,
+			isNesting: undefined,
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/components/list-view/use-clipboard-handler.js b/packages/block-editor/src/components/list-view/use-clipboard-handler.js
new file mode 100644
index 00000000000000..e7c3026e70f090
--- /dev/null
+++ b/packages/block-editor/src/components/list-view/use-clipboard-handler.js
@@ -0,0 +1,195 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useRegistry, useSelect } from '@wordpress/data';
+import { useRefEffect } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import { useNotifyCopy } from '../../utils/use-notify-copy';
+import { focusListItem } from './utils';
+import { getPasteBlocks, setClipboardBlocks } from '../writing-flow/utils';
+
+// This hook borrows from useClipboardHandler in ../writing-flow/use-clipboard-handler.js
+// and adds behaviour for the list view, while skipping partial selection.
+export default function useClipboardHandler( { selectBlock } ) {
+	const registry = useRegistry();
+	const {
+		getBlockOrder,
+		getBlockRootClientId,
+		getBlocksByClientId,
+		getPreviousBlockClientId,
+		getSelectedBlockClientIds,
+		getSettings,
+		canInsertBlockType,
+		canRemoveBlocks,
+	} = useSelect( blockEditorStore );
+	const { flashBlock, removeBlocks, replaceBlocks, insertBlocks } =
+		useDispatch( blockEditorStore );
+	const notifyCopy = useNotifyCopy();
+
+	return useRefEffect( ( node ) => {
+		function updateFocusAndSelection( focusClientId, shouldSelectBlock ) {
+			if ( shouldSelectBlock ) {
+				selectBlock( undefined, focusClientId, null, null );
+			}
+
+			focusListItem( focusClientId, node );
+		}
+
+		// Determine which blocks to update:
+		// If the current (focused) block is part of the block selection, use the whole selection.
+		// If the focused block is not part of the block selection, only update the focused block.
+		function getBlocksToUpdate( clientId ) {
+			const selectedBlockClientIds = getSelectedBlockClientIds();
+			const isUpdatingSelectedBlocks =
+				selectedBlockClientIds.includes( clientId );
+			const firstBlockClientId = isUpdatingSelectedBlocks
+				? selectedBlockClientIds[ 0 ]
+				: clientId;
+			const firstBlockRootClientId =
+				getBlockRootClientId( firstBlockClientId );
+
+			const blocksToUpdate = isUpdatingSelectedBlocks
+				? selectedBlockClientIds
+				: [ clientId ];
+
+			return {
+				blocksToUpdate,
+				firstBlockClientId,
+				firstBlockRootClientId,
+				originallySelectedBlockClientIds: selectedBlockClientIds,
+			};
+		}
+
+		function handler( event ) {
+			if ( event.defaultPrevented ) {
+				// This was possibly already handled in rich-text/use-paste-handler.js.
+				return;
+			}
+
+			// Only handle events that occur within the list view.
+			if ( ! node.contains( event.target.ownerDocument.activeElement ) ) {
+				return;
+			}
+
+			// Retrieve the block clientId associated with the focused list view row.
+			// This enables applying copy / cut / paste behavior to the focused block,
+			// rather than just the blocks that are currently selected.
+			const listViewRow =
+				event.target.ownerDocument.activeElement?.closest(
+					'[role=row]'
+				);
+			const clientId = listViewRow?.dataset?.block;
+			if ( ! clientId ) {
+				return;
+			}
+
+			const {
+				blocksToUpdate: selectedBlockClientIds,
+				firstBlockClientId,
+				firstBlockRootClientId,
+				originallySelectedBlockClientIds,
+			} = getBlocksToUpdate( clientId );
+
+			if ( selectedBlockClientIds.length === 0 ) {
+				return;
+			}
+
+			event.preventDefault();
+
+			if ( event.type === 'copy' || event.type === 'cut' ) {
+				if ( selectedBlockClientIds.length === 1 ) {
+					flashBlock( selectedBlockClientIds[ 0 ] );
+				}
+
+				notifyCopy( event.type, selectedBlockClientIds );
+				const blocks = getBlocksByClientId( selectedBlockClientIds );
+				setClipboardBlocks( event, blocks, registry );
+			}
+
+			if ( event.type === 'cut' ) {
+				// Don't update the selection if the blocks cannot be deleted.
+				if ( ! canRemoveBlocks( selectedBlockClientIds ) ) {
+					return;
+				}
+
+				let blockToFocus =
+					getPreviousBlockClientId( firstBlockClientId ) ??
+					// If the previous block is not found (when the first block is deleted),
+					// fallback to focus the parent block.
+					firstBlockRootClientId;
+
+				// Remove blocks, but don't update selection, and it will be handled below.
+				removeBlocks( selectedBlockClientIds, false );
+
+				// Update the selection if the original selection has been removed.
+				const shouldUpdateSelection =
+					originallySelectedBlockClientIds.length > 0 &&
+					getSelectedBlockClientIds().length === 0;
+
+				// If there's no previous block nor parent block, focus the first block.
+				if ( ! blockToFocus ) {
+					blockToFocus = getBlockOrder()[ 0 ];
+				}
+
+				updateFocusAndSelection( blockToFocus, shouldUpdateSelection );
+			} else if ( event.type === 'paste' ) {
+				const {
+					__experimentalCanUserUseUnfilteredHTML:
+						canUserUseUnfilteredHTML,
+				} = getSettings();
+				const blocks = getPasteBlocks(
+					event,
+					canUserUseUnfilteredHTML
+				);
+
+				if ( selectedBlockClientIds.length === 1 ) {
+					const [ selectedBlockClientId ] = selectedBlockClientIds;
+
+					// If a single block is focused, and the blocks to be posted can
+					// be inserted within the block, then append the pasted blocks
+					// within the focused block. For example, if you have copied a paragraph
+					// block and paste it within a single Group block, this will append
+					// the paragraph block within the Group block.
+					if (
+						blocks.every( ( block ) =>
+							canInsertBlockType(
+								block.name,
+								selectedBlockClientId
+							)
+						)
+					) {
+						insertBlocks(
+							blocks,
+							undefined,
+							selectedBlockClientId
+						);
+						updateFocusAndSelection( blocks[ 0 ]?.clientId, false );
+						return;
+					}
+				}
+
+				replaceBlocks(
+					selectedBlockClientIds,
+					blocks,
+					blocks.length - 1,
+					-1
+				);
+				updateFocusAndSelection( blocks[ 0 ]?.clientId, false );
+			}
+		}
+
+		node.ownerDocument.addEventListener( 'copy', handler );
+		node.ownerDocument.addEventListener( 'cut', handler );
+		node.ownerDocument.addEventListener( 'paste', handler );
+
+		return () => {
+			node.ownerDocument.removeEventListener( 'copy', handler );
+			node.ownerDocument.removeEventListener( 'cut', handler );
+			node.ownerDocument.removeEventListener( 'paste', handler );
+		};
+	}, [] );
+}
diff --git a/packages/block-editor/src/components/list-view/use-list-view-block-indexes.js b/packages/block-editor/src/components/list-view/use-list-view-block-indexes.js
new file mode 100644
index 00000000000000..5890e366d7ce9a
--- /dev/null
+++ b/packages/block-editor/src/components/list-view/use-list-view-block-indexes.js
@@ -0,0 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { useMemo } from '@wordpress/element';
+
+export default function useListViewBlockIndexes( blocks ) {
+	const blockIndexes = useMemo( () => {
+		const indexes = {};
+
+		let currentGlobalIndex = 0;
+
+		const traverseBlocks = ( blockList ) => {
+			blockList.forEach( ( block ) => {
+				indexes[ block.clientId ] = currentGlobalIndex;
+				currentGlobalIndex++;
+
+				if ( block.innerBlocks.length > 0 ) {
+					traverseBlocks( block.innerBlocks );
+				}
+			} );
+		};
+
+		traverseBlocks( blocks );
+
+		return indexes;
+	}, [ blocks ] );
+
+	return blockIndexes;
+}
diff --git a/packages/block-editor/src/components/list-view/use-list-view-collapse-items.js b/packages/block-editor/src/components/list-view/use-list-view-collapse-items.js
new file mode 100644
index 00000000000000..930c6424c3b0be
--- /dev/null
+++ b/packages/block-editor/src/components/list-view/use-list-view-collapse-items.js
@@ -0,0 +1,33 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+export default function useListViewCollapseItems( { collapseAll, expand } ) {
+	const { expandedBlock, getBlockParents } = useSelect( ( select ) => {
+		const { getBlockParents: _getBlockParents, getExpandedBlock } = unlock(
+			select( blockEditorStore )
+		);
+		return {
+			expandedBlock: getExpandedBlock(),
+			getBlockParents: _getBlockParents,
+		};
+	}, [] );
+
+	// Collapse all but the specified block when the expanded block client Id changes.
+	useEffect( () => {
+		if ( expandedBlock ) {
+			const blockParents = getBlockParents( expandedBlock, false );
+			// Collapse all blocks and expand the block's parents.
+			collapseAll();
+			expand( blockParents );
+		}
+	}, [ collapseAll, expand, expandedBlock, getBlockParents ] );
+}
diff --git a/packages/block-editor/src/components/list-view/use-list-view-drop-zone.js b/packages/block-editor/src/components/list-view/use-list-view-drop-zone.js
index a1a369d3f94084..64730be6156df9 100644
--- a/packages/block-editor/src/components/list-view/use-list-view-drop-zone.js
+++ b/packages/block-editor/src/components/list-view/use-list-view-drop-zone.js
@@ -2,10 +2,11 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { useState, useCallback } from '@wordpress/element';
+import { useState, useCallback, useEffect } from '@wordpress/element';
 import {
 	useThrottle,
 	__experimentalUseDropZone as useDropZone,
+	usePrevious,
 } from '@wordpress/compose';
 import { isRTL } from '@wordpress/i18n';
 
@@ -61,7 +62,7 @@ import { store as blockEditorStore } from '../../store';
 
 // When the indentation level, the corresponding left margin in `style.scss`
 // must be updated as well to ensure the drop zone is aligned with the indentation.
-export const NESTING_LEVEL_INDENTATION = 28;
+export const NESTING_LEVEL_INDENTATION = 24;
 
 /**
  * Determines whether the user is positioning the dragged block to be
@@ -304,6 +305,7 @@ export function getListViewDropTarget( blocksData, position, rtl = false ) {
 
 		return {
 			rootClientId: candidateBlockData.clientId,
+			clientId: candidateBlockData.clientId,
 			blockIndex: newBlockIndex,
 			dropPosition: 'inside',
 		};
@@ -396,15 +398,30 @@ export function getListViewDropTarget( blocksData, position, rtl = false ) {
 	};
 }
 
+// Throttle options need to be defined outside of the hook to avoid
+// re-creating the object on every render. This is due to a limitation
+// of the `useThrottle` hook, where the options object is included
+// in the dependency array for memoization.
+const EXPAND_THROTTLE_OPTIONS = {
+	leading: false, // Don't call the function immediately on the first call.
+	trailing: true, // Do call the function on the last call.
+};
+
 /**
  * A react hook for implementing a drop zone in list view.
  *
- * @param {Object}       props                   Named parameters.
- * @param {?HTMLElement} [props.dropZoneElement] Optional element to be used as the drop zone.
+ * @param {Object}       props                    Named parameters.
+ * @param {?HTMLElement} [props.dropZoneElement]  Optional element to be used as the drop zone.
+ * @param {Object}       [props.expandedState]    The expanded state of the blocks in the list view.
+ * @param {Function}     [props.setExpandedState] Function to set the expanded state of a list of block clientIds.
  *
  * @return {WPListViewDropZoneTarget} The drop target.
  */
-export default function useListViewDropZone( { dropZoneElement } ) {
+export default function useListViewDropZone( {
+	dropZoneElement,
+	expandedState,
+	setExpandedState,
+} ) {
 	const {
 		getBlockRootClientId,
 		getBlockIndex,
@@ -420,6 +437,55 @@ export default function useListViewDropZone( { dropZoneElement } ) {
 
 	const rtl = isRTL();
 
+	const previousRootClientId = usePrevious( targetRootClientId );
+
+	const maybeExpandBlock = useCallback(
+		( _expandedState, _target ) => {
+			// If the user is attempting to drop a block inside a collapsed block,
+			// that is, using a nesting gesture flagged by 'inside' dropPosition,
+			// expand the block within the list view, if it isn't already.
+			const { rootClientId } = _target || {};
+			if ( ! rootClientId ) {
+				return;
+			}
+			if (
+				_target?.dropPosition === 'inside' &&
+				! _expandedState[ rootClientId ]
+			) {
+				setExpandedState( {
+					type: 'expand',
+					clientIds: [ rootClientId ],
+				} );
+			}
+		},
+		[ setExpandedState ]
+	);
+
+	// Throttle the maybeExpandBlock function to avoid expanding the block
+	// too quickly when the user is dragging over the block. This is to
+	// avoid expanding the block when the user is just passing over it.
+	const throttledMaybeExpandBlock = useThrottle(
+		maybeExpandBlock,
+		500,
+		EXPAND_THROTTLE_OPTIONS
+	);
+
+	useEffect( () => {
+		if (
+			target?.dropPosition !== 'inside' ||
+			previousRootClientId !== target?.rootClientId
+		) {
+			throttledMaybeExpandBlock.cancel();
+			return;
+		}
+		throttledMaybeExpandBlock( expandedState, target );
+	}, [
+		expandedState,
+		previousRootClientId,
+		target,
+		throttledMaybeExpandBlock,
+	] );
+
 	const draggedBlockClientIds = getDraggedBlockClientIds();
 	const throttled = useThrottle(
 		useCallback(
@@ -484,18 +550,26 @@ export default function useListViewDropZone( { dropZoneElement } ) {
 				rtl,
 			]
 		),
-		200
+		50
 	);
 
 	const ref = useDropZone( {
 		dropZoneElement,
 		onDrop( event ) {
+			throttled.cancel();
 			if ( target ) {
 				onBlockDrop( event );
 			}
+			// Use `undefined` value to indicate that the drag has concluded.
+			// This allows styling rules that are active only when a user is
+			// dragging to be removed.
+			setTarget( undefined );
 		},
 		onDragLeave() {
 			throttled.cancel();
+			// Use `null` value to indicate that the drop target is not valid,
+			// but that the drag is still active. This allows for styling rules
+			// that are active only when a user drags outside of the list view.
 			setTarget( null );
 		},
 		onDragOver( event ) {
@@ -506,7 +580,10 @@ export default function useListViewDropZone( { dropZoneElement } ) {
 		},
 		onDragEnd() {
 			throttled.cancel();
-			setTarget( null );
+			// Use `undefined` value to indicate that the drag has concluded.
+			// This allows styling rules that are active only when a user is
+			// dragging to be removed.
+			setTarget( undefined );
 		},
 	} );
 
diff --git a/packages/block-editor/src/components/list-view/utils.js b/packages/block-editor/src/components/list-view/utils.js
index 632173e120691f..2b8454924c5135 100644
--- a/packages/block-editor/src/components/list-view/utils.js
+++ b/packages/block-editor/src/components/list-view/utils.js
@@ -7,12 +7,26 @@ import { focus } from '@wordpress/dom';
 export const getBlockPositionDescription = ( position, siblingCount, level ) =>
 	sprintf(
 		/* translators: 1: The numerical position of the block. 2: The total number of blocks. 3. The level of nesting for the block. */
-		__( 'Block %1$d of %2$d, Level %3$d' ),
+		__( 'Block %1$d of %2$d, Level %3$d.' ),
 		position,
 		siblingCount,
 		level
 	);
 
+export const getBlockPropertiesDescription = ( blockInformation, isLocked ) =>
+	[
+		blockInformation?.positionLabel
+			? `${ sprintf(
+					// translators: %s: Position of selected block, e.g. "Sticky" or "Fixed".
+					__( 'Position: %s' ),
+					blockInformation.positionLabel
+			  ) }.`
+			: undefined,
+		isLocked ? __( 'This block is locked.' ) : undefined,
+	]
+		.filter( Boolean )
+		.join( ' ' );
+
 /**
  * Returns true if the client ID occurs within the block selection or multi-selection,
  * or false otherwise.
@@ -63,15 +77,17 @@ export function getCommonDepthClientIds(
  *
  * @typedef {import('@wordpress/element').RefObject} RefObject
  *
- * @param {string}                 focusClientId      The client ID of the block to focus.
- * @param {RefObject<HTMLElement>} treeGridElementRef The container element to search within.
+ * @param {string}       focusClientId   The client ID of the block to focus.
+ * @param {?HTMLElement} treeGridElement The container element to search within.
  */
-export function focusListItem( focusClientId, treeGridElementRef ) {
+export function focusListItem( focusClientId, treeGridElement ) {
 	const getFocusElement = () => {
-		const row = treeGridElementRef.current?.querySelector(
+		const row = treeGridElement?.querySelector(
 			`[role=row][data-block="${ focusClientId }"]`
 		);
-		if ( ! row ) return null;
+		if ( ! row ) {
+			return null;
+		}
 		// Focus the first focusable in the row, which is the ListViewBlockSelectButton.
 		return focus.focusable.find( row )[ 0 ];
 	};
@@ -93,3 +109,119 @@ export function focusListItem( focusClientId, treeGridElementRef ) {
 		} );
 	}
 }
+
+/**
+ * Get values for the block that flag whether the block should be displaced up or down,
+ * whether the block is being nested, and whether the block appears after the dragged
+ * blocks. These values are used to determine the class names to apply to the block.
+ * The list view rows are displaced visually via CSS rules. Displacement rules:
+ * - `normal`: no displacement — used to apply a translateY of `0` so that the block
+ *  appears in its original position, and moves to that position smoothly when dragging
+ *  outside of the list view area.
+ * - `up`: the block should be displaced up, creating room beneath the block for the drop indicator.
+ * - `down`: the block should be displaced down, creating room above the block for the drop indicator.
+ *
+ * @param {Object}                props
+ * @param {Object}                props.blockIndexes           The indexes of all the blocks in the list view, keyed by clientId.
+ * @param {number|null|undefined} props.blockDropTargetIndex   The index of the block that the user is dropping to.
+ * @param {?string}               props.blockDropPosition      The position relative to the block that the user is dropping to.
+ * @param {string}                props.clientId               The client id for the current block.
+ * @param {?number}               props.firstDraggedBlockIndex The index of the first dragged block.
+ * @param {?boolean}              props.isDragged              Whether the current block is being dragged. Dragged blocks skip displacement.
+ * @return {Object} An object containing the `displacement`, `isAfterDraggedBlocks` and `isNesting` values.
+ */
+export function getDragDisplacementValues( {
+	blockIndexes,
+	blockDropTargetIndex,
+	blockDropPosition,
+	clientId,
+	firstDraggedBlockIndex,
+	isDragged,
+} ) {
+	let displacement;
+	let isNesting;
+	let isAfterDraggedBlocks;
+
+	if ( ! isDragged ) {
+		isNesting = false;
+		const thisBlockIndex = blockIndexes[ clientId ];
+		isAfterDraggedBlocks = thisBlockIndex > firstDraggedBlockIndex;
+
+		// Determine where to displace the position of the current block, relative
+		// to the blocks being dragged (in their original position) and the drop target
+		// (the position where a user is currently dragging the blocks to).
+		if (
+			blockDropTargetIndex !== undefined &&
+			blockDropTargetIndex !== null &&
+			firstDraggedBlockIndex !== undefined
+		) {
+			// If the block is being dragged and there is a valid drop target,
+			// determine if the block being rendered should be displaced up or down.
+
+			if ( thisBlockIndex !== undefined ) {
+				if (
+					thisBlockIndex >= firstDraggedBlockIndex &&
+					thisBlockIndex < blockDropTargetIndex
+				) {
+					// If the current block appears after the set of dragged blocks
+					// (in their original position), but is before the drop target,
+					// then the current block should be displaced up.
+					displacement = 'up';
+				} else if (
+					thisBlockIndex < firstDraggedBlockIndex &&
+					thisBlockIndex >= blockDropTargetIndex
+				) {
+					// If the current block appears before the set of dragged blocks
+					// (in their original position), but is after the drop target,
+					// then the current block should be displaced down.
+					displacement = 'down';
+				} else {
+					displacement = 'normal';
+				}
+				isNesting =
+					typeof blockDropTargetIndex === 'number' &&
+					blockDropTargetIndex - 1 === thisBlockIndex &&
+					blockDropPosition === 'inside';
+			}
+		} else if (
+			blockDropTargetIndex === null &&
+			firstDraggedBlockIndex !== undefined
+		) {
+			// A `null` value for `blockDropTargetIndex` indicates that the
+			// drop target is outside of the valid areas within the list view.
+			// In this case, the drag is still active, but as there is no
+			// valid drop target, we should remove the gap indicating where
+			// the block would be inserted.
+			if (
+				thisBlockIndex !== undefined &&
+				thisBlockIndex >= firstDraggedBlockIndex
+			) {
+				displacement = 'up';
+			} else {
+				displacement = 'normal';
+			}
+		} else if (
+			blockDropTargetIndex !== undefined &&
+			blockDropTargetIndex !== null &&
+			firstDraggedBlockIndex === undefined
+		) {
+			// If the blockdrop target is defined, but there are no dragged blocks,
+			// then the block should be displaced relative to the drop target.
+			if ( thisBlockIndex !== undefined ) {
+				if ( thisBlockIndex < blockDropTargetIndex ) {
+					displacement = 'normal';
+				} else {
+					displacement = 'down';
+				}
+			}
+		} else if ( blockDropTargetIndex === null ) {
+			displacement = 'normal';
+		}
+	}
+
+	return {
+		displacement,
+		isNesting,
+		isAfterDraggedBlocks,
+	};
+}
diff --git a/packages/block-editor/src/components/media-placeholder/README.md b/packages/block-editor/src/components/media-placeholder/README.md
index 6cb00206d93d72..68fcf150c4edc4 100644
--- a/packages/block-editor/src/components/media-placeholder/README.md
+++ b/packages/block-editor/src/components/media-placeholder/README.md
@@ -198,9 +198,9 @@ Callback called when urls can be configured. No media insertion from url will be
 
 ### handleUpload
 
-When set to false the handling of the upload is left to the calling component.
+When the value is set to `false` or returned as `false`, the handling of the upload is left to the consumer component. The function signature accepts an array containing the files to be uploaded.
 
--   Type: `Boolean`
+-   Type: `Boolean|Function`
 -   Required: No
 -   Default: `true`
 -   Platform: Web
diff --git a/packages/block-editor/src/components/media-placeholder/content.scss b/packages/block-editor/src/components/media-placeholder/content.scss
index e8eaa4bf43d94b..2f7bb2e673f12e 100644
--- a/packages/block-editor/src/components/media-placeholder/content.scss
+++ b/packages/block-editor/src/components/media-placeholder/content.scss
@@ -1,38 +1,11 @@
-.block-editor-media-placeholder__url-input-container {
-	// Reset the margin to ensure the url popover is adjacent to the button.
-	.block-editor-media-placeholder__button {
-		margin-bottom: 0;
-	}
-}
-
 .block-editor-media-placeholder__url-input-form {
-	display: flex;
-
-	// Selector requires a lot of specificity to override base styles.
-	input[type="url"].block-editor-media-placeholder__url-input-field {
-		width: 100%;
-		min-width: 200px;
-
-		@include break-small() {
-			width: 300px;
-		}
-
-		flex-grow: 1;
-		border: none;
-		border-radius: 0;
-		margin: 2px;
+	min-width: 260px;
 
+	@include break-small() {
+		width: 300px;
 	}
 }
 
-.block-editor-media-placeholder__url-input-submit-button {
-	flex-shrink: 1;
-}
-
-.block-editor-media-placeholder__button {
-	margin-bottom: 0.5rem;
-}
-
 .block-editor-media-placeholder__cancel-button.is-link {
 	margin: 1em;
 	display: block;
diff --git a/packages/block-editor/src/components/media-placeholder/index.js b/packages/block-editor/src/components/media-placeholder/index.js
index 41b1d3fe37c56a..f16e4317227235 100644
--- a/packages/block-editor/src/components/media-placeholder/index.js
+++ b/packages/block-editor/src/components/media-placeholder/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,6 +11,8 @@ import {
 	FormFileUpload,
 	Placeholder,
 	DropZone,
+	__experimentalInputControl as InputControl,
+	__experimentalInputControlSuffixWrapper as InputControlSuffixWrapper,
 	withFilters,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
@@ -42,46 +44,60 @@ const InsertFromURLPopover = ( {
 			className="block-editor-media-placeholder__url-input-form"
 			onSubmit={ onSubmit }
 		>
-			<input
-				className="block-editor-media-placeholder__url-input-field"
-				type="text"
-				aria-label={ __( 'URL' ) }
+			<InputControl
+				__next40pxDefaultSize
+				label={ __( 'URL' ) }
+				hideLabelFromVision
 				placeholder={ __( 'Paste or type URL' ) }
 				onChange={ onChange }
 				value={ src }
-			/>
-			<Button
-				className="block-editor-media-placeholder__url-input-submit-button"
-				icon={ keyboardReturn }
-				label={ __( 'Apply' ) }
-				type="submit"
+				suffix={
+					<InputControlSuffixWrapper variant="control">
+						<Button
+							size="small"
+							icon={ keyboardReturn }
+							label={ __( 'Apply' ) }
+							type="submit"
+						/>
+					</InputControlSuffixWrapper>
+				}
 			/>
 		</form>
 	</URLPopover>
 );
 
-const URLSelectionUI = ( {
-	isURLInputVisible,
-	src,
-	onChangeSrc,
-	onSubmitSrc,
-	openURLInput,
-	closeURLInput,
-} ) => {
+const URLSelectionUI = ( { src, onChangeSrc, onSelectURL } ) => {
 	// Use internal state instead of a ref to make sure that the component
 	// re-renders when the popover's anchor updates.
 	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	const [ isURLInputVisible, setIsURLInputVisible ] = useState( false );
+
+	const openURLInput = () => {
+		setIsURLInputVisible( true );
+	};
+	const closeURLInput = () => {
+		setIsURLInputVisible( false );
+		popoverAnchor?.focus();
+	};
+
+	const onSubmitSrc = ( event ) => {
+		event.preventDefault();
+		if ( src && onSelectURL ) {
+			onSelectURL( src );
+			closeURLInput();
+		}
+	};
 
 	return (
-		<div
-			className="block-editor-media-placeholder__url-input-container"
-			ref={ setPopoverAnchor }
-		>
+		<div className="block-editor-media-placeholder__url-input-container">
 			<Button
+				__next40pxDefaultSize
 				className="block-editor-media-placeholder__button"
 				onClick={ openURLInput }
 				isPressed={ isURLInputVisible }
-				variant="tertiary"
+				variant="secondary"
+				aria-haspopup="dialog"
+				ref={ setPopoverAnchor }
 			>
 				{ __( 'Insert from URL' ) }
 			</Button>
@@ -138,7 +154,6 @@ export function MediaPlaceholder( {
 		return getSettings().mediaUpload;
 	}, [] );
 	const [ src, setSrc ] = useState( '' );
-	const [ isURLInputVisible, setIsURLInputVisible ] = useState( false );
 
 	useEffect( () => {
 		setSrc( value?.src ?? '' );
@@ -155,27 +170,11 @@ export function MediaPlaceholder( {
 		);
 	};
 
-	const onChangeSrc = ( event ) => {
-		setSrc( event.target.value );
-	};
-
-	const openURLInput = () => {
-		setIsURLInputVisible( true );
-	};
-	const closeURLInput = () => {
-		setIsURLInputVisible( false );
-	};
-
-	const onSubmitSrc = ( event ) => {
-		event.preventDefault();
-		if ( src && onSelectURL ) {
-			onSelectURL( src );
-			closeURLInput();
-		}
-	};
-
 	const onFilesUpload = ( files ) => {
-		if ( ! handleUpload ) {
+		if (
+			! handleUpload ||
+			( typeof handleUpload === 'function' && ! handleUpload( files ) )
+		) {
 			return onSelect( files );
 		}
 		onFilesPreUpload( files );
@@ -323,15 +322,15 @@ export function MediaPlaceholder( {
 
 				if ( isAudio ) {
 					instructions = __(
-						'Upload an audio file, pick one from your media library, or add one with a URL.'
+						'Upload or drag an audio file here, or pick one from your library.'
 					);
 				} else if ( isImage ) {
 					instructions = __(
-						'Upload an image file, pick one from your media library, or add one with a URL.'
+						'Upload or drag an image file here, or pick one from your library.'
 					);
 				} else if ( isVideo ) {
 					instructions = __(
-						'Upload a video file, pick one from your media library, or add one with a URL.'
+						'Upload or drag a video file here, or pick one from your library.'
 					);
 				}
 			}
@@ -349,7 +348,7 @@ export function MediaPlaceholder( {
 			}
 		}
 
-		const placeholderClassName = classnames(
+		const placeholderClassName = clsx(
 			'block-editor-media-placeholder',
 			className,
 			{
@@ -389,6 +388,7 @@ export function MediaPlaceholder( {
 		return (
 			onCancel && (
 				<Button
+					__next40pxDefaultSize
 					className="block-editor-media-placeholder__cancel-button"
 					title={ __( 'Cancel' ) }
 					variant="link"
@@ -404,12 +404,9 @@ export function MediaPlaceholder( {
 		return (
 			onSelectURL && (
 				<URLSelectionUI
-					isURLInputVisible={ isURLInputVisible }
 					src={ src }
-					onChangeSrc={ onChangeSrc }
-					onSubmitSrc={ onSubmitSrc }
-					openURLInput={ openURLInput }
-					closeURLInput={ closeURLInput }
+					onChangeSrc={ setSrc }
+					onSelectURL={ onSelectURL }
 				/>
 			)
 		);
@@ -420,9 +417,10 @@ export function MediaPlaceholder( {
 			onToggleFeaturedImage && (
 				<div className="block-editor-media-placeholder__url-input-container">
 					<Button
+						__next40pxDefaultSize
 						className="block-editor-media-placeholder__button"
 						onClick={ onToggleFeaturedImage }
-						variant="tertiary"
+						variant="secondary"
 					>
 						{ __( 'Use featured image' ) }
 					</Button>
@@ -435,7 +433,8 @@ export function MediaPlaceholder( {
 		const defaultButton = ( { open } ) => {
 			return (
 				<Button
-					variant="tertiary"
+					__next40pxDefaultSize
+					variant="secondary"
 					onClick={ () => {
 						open();
 					} }
@@ -452,7 +451,7 @@ export function MediaPlaceholder( {
 				multiple={ multiple }
 				onSelect={ onSelect }
 				allowedTypes={ allowedTypes }
-				mode={ 'browse' }
+				mode="browse"
 				value={
 					Array.isArray( value )
 						? value.map( ( { id } ) => id )
@@ -474,8 +473,9 @@ export function MediaPlaceholder( {
 							const content = (
 								<>
 									<Button
+										__next40pxDefaultSize
 										variant="primary"
-										className={ classnames(
+										className={ clsx(
 											'block-editor-media-placeholder__button',
 											'block-editor-media-placeholder__upload-button'
 										) }
@@ -501,17 +501,23 @@ export function MediaPlaceholder( {
 				<>
 					{ renderDropZone() }
 					<FormFileUpload
-						variant="primary"
-						className={ classnames(
-							'block-editor-media-placeholder__button',
-							'block-editor-media-placeholder__upload-button'
+						render={ ( { openFileDialog } ) => (
+							<Button
+								__next40pxDefaultSize
+								onClick={ openFileDialog }
+								variant="primary"
+								className={ clsx(
+									'block-editor-media-placeholder__button',
+									'block-editor-media-placeholder__upload-button'
+								) }
+							>
+								{ __( 'Upload' ) }
+							</Button>
 						) }
 						onChange={ onUpload }
 						accept={ accept }
 						multiple={ !! multiple }
-					>
-						{ __( 'Upload' ) }
-					</FormFileUpload>
+					/>
 					{ uploadMediaLibraryButton }
 					{ renderUrlSelectionUI() }
 					{ renderFeaturedImageToggle() }
diff --git a/packages/block-editor/src/components/media-placeholder/index.native.js b/packages/block-editor/src/components/media-placeholder/index.native.js
index e597b65d63b865..bbd9cbad73a4a1 100644
--- a/packages/block-editor/src/components/media-placeholder/index.native.js
+++ b/packages/block-editor/src/components/media-placeholder/index.native.js
@@ -164,7 +164,7 @@ function MediaPlaceholder( props ) {
 						activeOpacity={ 0.5 }
 						accessibilityLabel={ accessibilityLabel }
 						style={ buttonStyles }
-						accessibilityRole={ 'button' }
+						accessibilityRole="button"
 						accessibilityHint={ accessibilityHint }
 						hitSlop={ hitSlop }
 						onPress={ onButtonPress( open ) }
@@ -181,7 +181,7 @@ function MediaPlaceholder( props ) {
 					activeOpacity={ 0.5 }
 					accessibilityLabel={ accessibilityLabel }
 					style={ styles[ 'media-placeholder__appender' ] }
-					accessibilityRole={ 'button' }
+					accessibilityRole="button"
 					accessibilityHint={ accessibilityHint }
 					hitSlop={ hitSlop }
 					onPress={ onButtonPress( open ) }
diff --git a/packages/block-editor/src/components/media-replace-flow/README.md b/packages/block-editor/src/components/media-replace-flow/README.md
index 2f3cffde4b4a79..a5808ab9561980 100644
--- a/packages/block-editor/src/components/media-replace-flow/README.md
+++ b/packages/block-editor/src/components/media-replace-flow/README.md
@@ -91,3 +91,10 @@ Removes a media replace notice.
 -   Required: No
 
 If passed, children are rendered inside the dropdown.
+
+### children
+
+-   Type: `Element | func`
+-   Required: No
+
+If passed, children are rendered inside the dropdown. If a function is provided for this prop, it will receive an object with the `onClose` prop as an argument.
diff --git a/packages/block-editor/src/components/media-replace-flow/index.js b/packages/block-editor/src/components/media-replace-flow/index.js
index 33419676eaab87..0da15033a86bf0 100644
--- a/packages/block-editor/src/components/media-replace-flow/index.js
+++ b/packages/block-editor/src/components/media-replace-flow/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -48,6 +48,7 @@ const MediaReplaceFlow = ( {
 	onError,
 	onSelect,
 	onSelectURL,
+	onReset,
 	onToggleFeaturedImage,
 	useFeaturedImage,
 	onFilesUpload = noop,
@@ -75,7 +76,7 @@ const MediaReplaceFlow = ( {
 		}
 		// We need to set a timeout for showing the notice
 		// so that VoiceOver and possibly other screen readers
-		// can announce the error afer the toolbar button
+		// can announce the error after the toolbar button
 		// regains focus once the upload dialog closes.
 		// Otherwise VO simply skips over the notice and announces
 		// the focused element and the open menu.
@@ -202,12 +203,24 @@ const MediaReplaceFlow = ( {
 								{ __( 'Use featured image' ) }
 							</MenuItem>
 						) }
-						{ children }
+						{ mediaURL && onReset && (
+							<MenuItem
+								onClick={ () => {
+									onReset();
+									onClose();
+								} }
+							>
+								{ __( 'Reset' ) }
+							</MenuItem>
+						) }
+						{ typeof children === 'function'
+							? children( { onClose } )
+							: children }
 					</NavigableMenu>
 					{ onSelectURL && (
 						// eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
 						<form
-							className={ classnames(
+							className={ clsx(
 								'block-editor-media-flow__url-input',
 								{
 									'has-siblings':
diff --git a/packages/block-editor/src/components/media-replace-flow/test/index.js b/packages/block-editor/src/components/media-replace-flow/test/index.js
index 0af3ad1db6684b..dace470aa67b0f 100644
--- a/packages/block-editor/src/components/media-replace-flow/test/index.js
+++ b/packages/block-editor/src/components/media-replace-flow/test/index.js
@@ -105,12 +105,12 @@ describe( 'General media replace flow', () => {
 
 		await user.click(
 			screen.getByRole( 'button', {
-				name: 'Edit',
+				name: 'Edit link',
 			} )
 		);
 
 		const mediaURLInput = screen.getByRole( 'combobox', {
-			name: 'Link',
+			name: 'Search or type URL',
 			expanded: false,
 		} );
 
diff --git a/packages/block-editor/src/components/media-upload-progress/constants.js b/packages/block-editor/src/components/media-upload-progress/constants.js
new file mode 100644
index 00000000000000..4003cd30e44c53
--- /dev/null
+++ b/packages/block-editor/src/components/media-upload-progress/constants.js
@@ -0,0 +1,6 @@
+export const MEDIA_UPLOAD_STATE_IDLE = 0;
+export const MEDIA_UPLOAD_STATE_UPLOADING = 1;
+export const MEDIA_UPLOAD_STATE_SUCCEEDED = 2;
+export const MEDIA_UPLOAD_STATE_FAILED = 3;
+export const MEDIA_UPLOAD_STATE_RESET = 4;
+export const MEDIA_UPLOAD_STATE_PAUSED = 11;
diff --git a/packages/block-editor/src/components/media-upload-progress/index.native.js b/packages/block-editor/src/components/media-upload-progress/index.native.js
index b64b08eec09d8f..b2a63e715ba89a 100644
--- a/packages/block-editor/src/components/media-upload-progress/index.native.js
+++ b/packages/block-editor/src/components/media-upload-progress/index.native.js
@@ -9,29 +9,37 @@ import { View } from 'react-native';
 import { Component } from '@wordpress/element';
 import { Spinner } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { subscribeMediaUpload } from '@wordpress/react-native-bridge';
+import {
+	subscribeMediaUpload,
+	requestImageUploadCancel,
+} from '@wordpress/react-native-bridge';
 
 /**
  * Internal dependencies
  */
 import styles from './styles.scss';
-
-export const MEDIA_UPLOAD_STATE_UPLOADING = 1;
-export const MEDIA_UPLOAD_STATE_SUCCEEDED = 2;
-export const MEDIA_UPLOAD_STATE_FAILED = 3;
-export const MEDIA_UPLOAD_STATE_RESET = 4;
+import {
+	MEDIA_UPLOAD_STATE_IDLE,
+	MEDIA_UPLOAD_STATE_UPLOADING,
+	MEDIA_UPLOAD_STATE_SUCCEEDED,
+	MEDIA_UPLOAD_STATE_FAILED,
+	MEDIA_UPLOAD_STATE_RESET,
+	MEDIA_UPLOAD_STATE_PAUSED,
+} from './constants';
 
 export class MediaUploadProgress extends Component {
 	constructor( props ) {
 		super( props );
 
 		this.state = {
+			uploadState: MEDIA_UPLOAD_STATE_IDLE,
 			progress: 0,
 			isUploadInProgress: false,
 			isUploadFailed: false,
 		};
 
 		this.mediaUpload = this.mediaUpload.bind( this );
+		this.getRetryMessage = this.getRetryMessage.bind( this );
 	}
 
 	componentDidMount() {
@@ -39,13 +47,27 @@ export class MediaUploadProgress extends Component {
 	}
 
 	componentWillUnmount() {
+		const { isUploadInProgress, isUploadFailed } = this.state;
+		const { mediaId } = this.props;
+
+		if ( isUploadInProgress || isUploadFailed ) {
+			requestImageUploadCancel( mediaId );
+		}
 		this.removeMediaUploadListener();
 	}
 
 	mediaUpload( payload ) {
 		const { mediaId } = this.props;
+		if (
+			payload.mediaId !== mediaId ||
+			( payload.state === this.state.uploadState &&
+				payload.progress === this.state.progress )
+		) {
+			return;
+		}
 
-		if ( payload.mediaId !== mediaId ) {
+		if ( payload?.mediaUrl && ! payload.state ) {
+			this.updateMediaThumbnail( payload );
 			return;
 		}
 
@@ -56,6 +78,9 @@ export class MediaUploadProgress extends Component {
 			case MEDIA_UPLOAD_STATE_SUCCEEDED:
 				this.finishMediaUploadWithSuccess( payload );
 				break;
+			case MEDIA_UPLOAD_STATE_PAUSED:
+				this.finishMediaUploadWithPause( payload );
+				break;
 			case MEDIA_UPLOAD_STATE_FAILED:
 				this.finishMediaUploadWithFailure( payload );
 				break;
@@ -68,6 +93,7 @@ export class MediaUploadProgress extends Component {
 	updateMediaProgress( payload ) {
 		this.setState( {
 			progress: payload.progress,
+			uploadState: payload.state,
 			isUploadInProgress: true,
 			isUploadFailed: false,
 		} );
@@ -76,22 +102,56 @@ export class MediaUploadProgress extends Component {
 		}
 	}
 
+	updateMediaThumbnail( payload ) {
+		const { onUpdateMediaProgress } = this.props;
+		if ( onUpdateMediaProgress ) {
+			onUpdateMediaProgress( payload );
+		}
+	}
+
 	finishMediaUploadWithSuccess( payload ) {
-		this.setState( { isUploadInProgress: false } );
+		this.setState( {
+			uploadState: payload.state,
+			isUploadInProgress: false,
+		} );
 		if ( this.props.onFinishMediaUploadWithSuccess ) {
 			this.props.onFinishMediaUploadWithSuccess( payload );
 		}
 	}
 
+	finishMediaUploadWithPause( payload ) {
+		if ( ! this.props.enablePausedUploads ) {
+			this.finishMediaUploadWithFailure( payload );
+			return;
+		}
+
+		this.setState( {
+			uploadState: payload.state,
+			isUploadInProgress: true,
+			isUploadFailed: false,
+		} );
+		if ( this.props.onFinishMediaUploadWithFailure ) {
+			this.props.onFinishMediaUploadWithFailure( payload );
+		}
+	}
+
 	finishMediaUploadWithFailure( payload ) {
-		this.setState( { isUploadInProgress: false, isUploadFailed: true } );
+		this.setState( {
+			uploadState: payload.state,
+			isUploadInProgress: false,
+			isUploadFailed: true,
+		} );
 		if ( this.props.onFinishMediaUploadWithFailure ) {
 			this.props.onFinishMediaUploadWithFailure( payload );
 		}
 	}
 
 	mediaUploadStateReset( payload ) {
-		this.setState( { isUploadInProgress: false, isUploadFailed: false } );
+		this.setState( {
+			uploadState: payload.state,
+			isUploadInProgress: false,
+			isUploadFailed: false,
+		} );
 		if ( this.props.onMediaUploadStateReset ) {
 			this.props.onMediaUploadStateReset( payload );
 		}
@@ -115,15 +175,24 @@ export class MediaUploadProgress extends Component {
 		}
 	}
 
+	getRetryMessage() {
+		if (
+			this.state.uploadState === MEDIA_UPLOAD_STATE_PAUSED &&
+			this.props.enablePausedUploads
+		) {
+			return __( 'Waiting for connection' );
+		}
+
+		// eslint-disable-next-line @wordpress/i18n-no-collapsible-whitespace
+		return __( 'Failed to insert media.\nTap for more info.' );
+	}
+
 	render() {
 		const { renderContent = () => null } = this.props;
-		const { isUploadInProgress, isUploadFailed } = this.state;
+		const { isUploadInProgress, isUploadFailed, uploadState } = this.state;
 		const showSpinner = this.state.isUploadInProgress;
 		const progress = this.state.progress * 100;
-		// eslint-disable-next-line @wordpress/i18n-no-collapsible-whitespace
-		const retryMessage = __(
-			'Failed to insert media.\nTap for more info.'
-		);
+		const retryMessage = this.getRetryMessage();
 
 		const progressBarStyle = [
 			styles.progressBar,
@@ -149,6 +218,9 @@ export class MediaUploadProgress extends Component {
 					) }
 				</View>
 				{ renderContent( {
+					isUploadPaused:
+						uploadState === MEDIA_UPLOAD_STATE_PAUSED &&
+						this.props.enablePausedUploads,
 					isUploadInProgress,
 					isUploadFailed,
 					retryMessage,
diff --git a/packages/block-editor/src/components/media-upload-progress/test/index.native.js b/packages/block-editor/src/components/media-upload-progress/test/index.native.js
index 1185c9c35a8682..e5a6b460d94ef5 100644
--- a/packages/block-editor/src/components/media-upload-progress/test/index.native.js
+++ b/packages/block-editor/src/components/media-upload-progress/test/index.native.js
@@ -14,13 +14,13 @@ import {
 /**
  * Internal dependencies
  */
+import { MediaUploadProgress } from '../';
 import {
-	MediaUploadProgress,
 	MEDIA_UPLOAD_STATE_UPLOADING,
 	MEDIA_UPLOAD_STATE_SUCCEEDED,
 	MEDIA_UPLOAD_STATE_FAILED,
 	MEDIA_UPLOAD_STATE_RESET,
-} from '../';
+} from '../constants';
 
 let uploadCallBack;
 subscribeMediaUpload.mockImplementation( ( callback ) => {
diff --git a/packages/block-editor/src/components/media-upload/README.md b/packages/block-editor/src/components/media-upload/README.md
index 592d64e42f497d..27bbc93d8a2b65 100644
--- a/packages/block-editor/src/components/media-upload/README.md
+++ b/packages/block-editor/src/components/media-upload/README.md
@@ -105,6 +105,8 @@ Callback called when the media modal is closed after media is selected.
 
 This is called subsequent to `onClose` when media is selected. The selected media are passed as an argument.
 
+The `image.sizes.full` resolution does always exist. Other defined sizes are only available when the image is larger and thus could be scaled down.
+
 -   Type: `Function`
 -   Required: Yes
 -   Platform: Web | Mobile
diff --git a/packages/block-editor/src/components/media-upload/index.native.js b/packages/block-editor/src/components/media-upload/index.native.js
index 05a36d7a09bcab..c4871d48ebe129 100644
--- a/packages/block-editor/src/components/media-upload/index.native.js
+++ b/packages/block-editor/src/components/media-upload/index.native.js
@@ -327,6 +327,8 @@ function URLInput( props ) {
 		>
 			<PanelBody style={ styles[ 'media-upload__link-input' ] }>
 				<TextControl
+					// TODO: Switch to `true` (40px size) if possible
+					__next40pxDefaultSize={ false }
 					// eslint-disable-next-line jsx-a11y/no-autofocus
 					autoFocus
 					autoCapitalize="none"
diff --git a/packages/block-editor/src/components/multi-selection-inspector/README.md b/packages/block-editor/src/components/multi-selection-inspector/README.md
index e7edc7ef2f43da..726a4d72d6697d 100644
--- a/packages/block-editor/src/components/multi-selection-inspector/README.md
+++ b/packages/block-editor/src/components/multi-selection-inspector/README.md
@@ -6,11 +6,6 @@ This card contains information on the number of blocks selected, and in the case
 
 ![Multi selection inspector card](https://make.wordpress.org/core/files/2020/09/multi-selection-inspector-card.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/multi-selection-inspector/index.js b/packages/block-editor/src/components/multi-selection-inspector/index.js
index 14eda5f930cada..f5e7f696347686 100644
--- a/packages/block-editor/src/components/multi-selection-inspector/index.js
+++ b/packages/block-editor/src/components/multi-selection-inspector/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { sprintf, _n } from '@wordpress/i18n';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { serialize } from '@wordpress/blocks';
 import { count as wordCount } from '@wordpress/wordcount';
 import { copy } from '@wordpress/icons';
@@ -13,7 +13,13 @@ import { copy } from '@wordpress/icons';
 import BlockIcon from '../block-icon';
 import { store as blockEditorStore } from '../../store';
 
-function MultiSelectionInspector( { blocks } ) {
+export default function MultiSelectionInspector() {
+	const { blocks } = useSelect( ( select ) => {
+		const { getMultiSelectedBlocks } = select( blockEditorStore );
+		return {
+			blocks: getMultiSelectedBlocks(),
+		};
+	}, [] );
 	const words = wordCount( serialize( blocks ), 'words' );
 
 	return (
@@ -38,10 +44,3 @@ function MultiSelectionInspector( { blocks } ) {
 		</div>
 	);
 }
-
-export default withSelect( ( select ) => {
-	const { getMultiSelectedBlocks } = select( blockEditorStore );
-	return {
-		blocks: getMultiSelectedBlocks(),
-	};
-} )( MultiSelectionInspector );
diff --git a/packages/block-editor/src/components/navigable-toolbar/README.md b/packages/block-editor/src/components/navigable-toolbar/README.md
index 30a4d100195f85..317be48f38faa2 100644
--- a/packages/block-editor/src/components/navigable-toolbar/README.md
+++ b/packages/block-editor/src/components/navigable-toolbar/README.md
@@ -8,6 +8,8 @@ The component accepts the following props. Props not included in this set will b
 
 ## `focusOnMount`
 
+_Note: this prop is deprecated._
+
 Whether to immediately focus when the component mounts.
 
 - Type: `Boolean`
diff --git a/packages/block-editor/src/components/navigable-toolbar/index.js b/packages/block-editor/src/components/navigable-toolbar/index.js
index fe216e1058f6f0..f524887fdc0ed4 100644
--- a/packages/block-editor/src/components/navigable-toolbar/index.js
+++ b/packages/block-editor/src/components/navigable-toolbar/index.js
@@ -19,14 +19,17 @@ import { ESCAPE } from '@wordpress/keycodes';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
 function hasOnlyToolbarItem( elements ) {
 	const dataProp = 'toolbarItem';
 	return ! elements.some( ( element ) => ! ( dataProp in element.dataset ) );
 }
 
-function getAllToolbarItemsIn( container ) {
-	return Array.from( container.querySelectorAll( '[data-toolbar-item]' ) );
+function getAllFocusableToolbarItemsIn( container ) {
+	return Array.from(
+		container.querySelectorAll( '[data-toolbar-item]:not([disabled])' )
+	);
 }
 
 function hasFocusWithin( container ) {
@@ -139,9 +142,16 @@ function useToolbarFocus( {
 		// We have to wait for the next browser paint because block controls aren't
 		// rendered right away when the toolbar gets mounted.
 		let raf = 0;
-		if ( ! initialFocusOnMount ) {
+
+		// If the toolbar already had focus before the render, we don't want to move it.
+		// https://github.com/WordPress/gutenberg/issues/58511
+		if (
+			! initialFocusOnMount &&
+			! hasFocusWithin( navigableToolbarRef )
+		) {
 			raf = window.requestAnimationFrame( () => {
-				const items = getAllToolbarItemsIn( navigableToolbarRef );
+				const items =
+					getAllFocusableToolbarItemsIn( navigableToolbarRef );
 				const index = initialIndex || 0;
 				if ( items[ index ] && hasFocusWithin( navigableToolbarRef ) ) {
 					items[ index ].focus( {
@@ -155,21 +165,18 @@ function useToolbarFocus( {
 		}
 		return () => {
 			window.cancelAnimationFrame( raf );
-			if ( ! onIndexChange || ! navigableToolbarRef ) return;
+			if ( ! onIndexChange || ! navigableToolbarRef ) {
+				return;
+			}
 			// When the toolbar element is unmounted and onIndexChange is passed, we
 			// pass the focused toolbar item index so it can be hydrated later.
-			const items = getAllToolbarItemsIn( navigableToolbarRef );
+			const items = getAllFocusableToolbarItemsIn( navigableToolbarRef );
 			const index = items.findIndex( ( item ) => item.tabIndex === 0 );
 			onIndexChange( index );
 		};
-	}, [ initialIndex, initialFocusOnMount, toolbarRef ] );
+	}, [ initialIndex, initialFocusOnMount, onIndexChange, toolbarRef ] );
 
-	const { lastFocus } = useSelect( ( select ) => {
-		const { getLastFocus } = select( blockEditorStore );
-		return {
-			lastFocus: getLastFocus(),
-		};
-	}, [] );
+	const { getLastFocus } = unlock( useSelect( blockEditorStore ) );
 	/**
 	 * Handles returning focus to the block editor canvas when pressing escape.
 	 */
@@ -178,6 +185,7 @@ function useToolbarFocus( {
 
 		if ( focusEditorOnEscape ) {
 			const handleKeyDown = ( event ) => {
+				const lastFocus = getLastFocus();
 				if ( event.keyCode === ESCAPE && lastFocus?.current ) {
 					// Focus the last focused element when pressing escape.
 					event.preventDefault();
@@ -192,7 +200,7 @@ function useToolbarFocus( {
 				);
 			};
 		}
-	}, [ focusEditorOnEscape, lastFocus, toolbarRef ] );
+	}, [ focusEditorOnEscape, getLastFocus, toolbarRef ] );
 }
 
 export default function NavigableToolbar( {
@@ -202,6 +210,7 @@ export default function NavigableToolbar( {
 	shouldUseKeyboardFocusShortcut = true,
 	__experimentalInitialIndex: initialIndex,
 	__experimentalOnIndexChange: onIndexChange,
+	orientation = 'horizontal',
 	...props
 } ) {
 	const toolbarRef = useRef();
@@ -210,9 +219,9 @@ export default function NavigableToolbar( {
 	useToolbarFocus( {
 		toolbarRef,
 		focusOnMount,
-		isAccessibleToolbar,
 		defaultIndex: initialIndex,
 		onIndexChange,
+		isAccessibleToolbar,
 		shouldUseKeyboardFocusShortcut,
 		focusEditorOnEscape,
 	} );
@@ -222,6 +231,7 @@ export default function NavigableToolbar( {
 			<Toolbar
 				label={ props[ 'aria-label' ] }
 				ref={ toolbarRef }
+				orientation={ orientation }
 				{ ...props }
 			>
 				{ children }
@@ -231,7 +241,7 @@ export default function NavigableToolbar( {
 
 	return (
 		<NavigableMenu
-			orientation="horizontal"
+			orientation={ orientation }
 			role="toolbar"
 			ref={ toolbarRef }
 			{ ...props }
diff --git a/packages/block-editor/src/components/observe-typing/index.js b/packages/block-editor/src/components/observe-typing/index.js
index 08764f5939a13f..75afc4bbdf0f96 100644
--- a/packages/block-editor/src/components/observe-typing/index.js
+++ b/packages/block-editor/src/components/observe-typing/index.js
@@ -115,11 +115,10 @@ export function useMouseMoveTypingReset() {
  *   field, presses ESC or TAB, or moves the mouse in the document.
  */
 export function useTypingObserver() {
-	const { isTyping, hasInlineToolbar } = useSelect( ( select ) => {
-		const { isTyping: _isTyping, getSettings } = select( blockEditorStore );
+	const { isTyping } = useSelect( ( select ) => {
+		const { isTyping: _isTyping } = select( blockEditorStore );
 		return {
 			isTyping: _isTyping(),
-			hasInlineToolbar: getSettings().hasInlineToolbar,
 		};
 	}, [] );
 	const { startTyping, stopTyping } = useDispatch( blockEditorStore );
@@ -183,12 +182,10 @@ export function useTypingObserver() {
 				node.addEventListener( 'focus', stopTypingOnNonTextField );
 				node.addEventListener( 'keydown', stopTypingOnEscapeKey );
 
-				if ( ! hasInlineToolbar ) {
-					ownerDocument.addEventListener(
-						'selectionchange',
-						stopTypingOnSelectionUncollapse
-					);
-				}
+				ownerDocument.addEventListener(
+					'selectionchange',
+					stopTypingOnSelectionUncollapse
+				);
 
 				return () => {
 					defaultView.clearTimeout( timerId );
@@ -245,7 +242,7 @@ export function useTypingObserver() {
 				node.removeEventListener( 'keydown', startTypingInTextField );
 			};
 		},
-		[ isTyping, hasInlineToolbar, startTyping, stopTyping ]
+		[ isTyping, startTyping, stopTyping ]
 	);
 
 	return useMergeRefs( [ ref1, ref2 ] );
diff --git a/packages/block-editor/src/components/panel-color-settings/index.js b/packages/block-editor/src/components/panel-color-settings/index.js
index eb235b9877edda..29a444def88a20 100644
--- a/packages/block-editor/src/components/panel-color-settings/index.js
+++ b/packages/block-editor/src/components/panel-color-settings/index.js
@@ -19,7 +19,7 @@ const PanelColorSettings = ( { colorSettings, ...props } ) => {
 		<PanelColorGradientSettings
 			settings={ settings }
 			gradients={ [] }
-			disableCustomGradients={ true }
+			disableCustomGradients
 			{ ...props }
 		/>
 	);
diff --git a/packages/block-editor/src/components/panel-color-settings/test/index.js b/packages/block-editor/src/components/panel-color-settings/test/index.js
index e93c72b89a66e7..52edfa23ce718b 100644
--- a/packages/block-editor/src/components/panel-color-settings/test/index.js
+++ b/packages/block-editor/src/components/panel-color-settings/test/index.js
@@ -16,7 +16,7 @@ describe( 'PanelColorSettings', () => {
 			<PanelColorSettings
 				title="Test Title"
 				colors={ [] }
-				disableCustomColors={ true }
+				disableCustomColors
 				colorSettings={ [
 					{
 						value: '#000',
@@ -39,7 +39,7 @@ describe( 'PanelColorSettings', () => {
 			<PanelColorSettings
 				title="Test Title"
 				colors={ [] }
-				disableCustomColors={ true }
+				disableCustomColors
 				colorSettings={ [
 					{
 						value: '#000',
@@ -63,7 +63,7 @@ describe( 'PanelColorSettings', () => {
 			<PanelColorSettings
 				title="Test Title"
 				colors={ [] }
-				disableCustomColors={ true }
+				disableCustomColors
 				colorSettings={ [
 					{
 						value: '#000',
diff --git a/packages/block-editor/src/components/plain-text/index.js b/packages/block-editor/src/components/plain-text/index.js
index 2a4e1b423e6094..4bd6681f4eb079 100644
--- a/packages/block-editor/src/components/plain-text/index.js
+++ b/packages/block-editor/src/components/plain-text/index.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import TextareaAutosize from 'react-autosize-textarea';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -27,7 +27,7 @@ const PlainText = forwardRef( ( { __experimentalVersion, ...props }, ref ) => {
 	return (
 		<TextareaAutosize
 			ref={ ref }
-			className={ classnames( 'block-editor-plain-text', className ) }
+			className={ clsx( 'block-editor-plain-text', className ) }
 			onChange={ ( event ) => onChange( event.target.value ) }
 			{ ...remainingProps }
 		/>
diff --git a/packages/block-editor/src/components/plain-text/index.native.js b/packages/block-editor/src/components/plain-text/index.native.js
index dc1af954c6e1cd..d61c3647af0184 100644
--- a/packages/block-editor/src/components/plain-text/index.native.js
+++ b/packages/block-editor/src/components/plain-text/index.native.js
@@ -7,7 +7,12 @@ import { TextInput, Platform, Dimensions } from 'react-native';
  * WordPress dependencies
  */
 import { Component } from '@wordpress/element';
-import { RichText, getPxFromCssUnit } from '@wordpress/block-editor';
+import { getPxFromCssUnit } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import RichText from '../rich-text';
 
 /**
  * Internal dependencies
diff --git a/packages/block-editor/src/components/preview-options/README.md b/packages/block-editor/src/components/preview-options/README.md
deleted file mode 100644
index baf886c71bd65b..00000000000000
--- a/packages/block-editor/src/components/preview-options/README.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Preview Options
-
-The `PreviewOptions` component displays the list of different preview options available in the editor.
-
-It returns a [`DropdownMenu`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/components/src/dropdown-menu) component with these different options. The options currently available in the editor are Desktop, Mobile, Tablet and "Preview in new tab".
-
-![Preview options dropdown menu](https://make.wordpress.org/core/files/2020/09/preview-options-dropdown-menu.png)
-
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
-## Development guidelines
-
-### Usage
-
-Renders the previews options of the editor in a dropdown menu.
-
-```jsx
-import { Icon, MenuGroup } from '@wordpress/components';
-import { PostPreviewButton } from '@wordpress/editor';
-import { __experimentalPreviewOptions as PreviewOptions } from '@wordpress/block-editor';
-
-const MyPreviewOptions = () => (
-	<PreviewOptions
-		isEnabled={ true }
-		className="edit-post-post-preview-dropdown"
-		deviceType={ deviceType }
-		setDeviceType={ setPreviewDeviceType }
-	> { ( { onClose } ) => (
-			<MenuGroup>
-				<div className="edit-post-header-preview__grouping-external">
-					<PostPreviewButton
-						className="edit-post-header-preview__button-external"
-						role="menuitem"
-						forceIsAutosaveable={ hasActiveMetaboxes }
-						textContent={
-							<>
-								{ __( 'Preview in new tab' ) }
-								<Icon icon={ external } />
-							</>
-						}
-						onPreview={ onClose }
-					/>
-				</div>
-			</MenuGroup>
-		) }
-	</PreviewOptions>
-);
-```
-
-### Props
-
-#### className
-
-The CSS classes added to the component.
-
--   Type: `String`
--   Required: no
-
-#### isEnabled
-
-Wheter or not the preview options are enabled for the current post.
-And example of when the preview options are not enabled is when the current post is not savable.
-
--   Type: `boolean`
--   Required: no
--   Default: true
-
-#### deviceType
-
-The device type in the preview options. It can be either Desktop or Tablet or Mobile among others.
-
--   Type: `String`
--   Required: yes
-
-#### setDeviceType
-
-Used to set the device type that will be used to display the preview inside the editor.
-
--   Type: `func`
--   Required: yes
-
-#### children
-
-A function that returns nodes to be rendered within the dropdown.
-
--   Type: `Function`
--   Required: No
-
-## Related components
-
-Block Editor components are components that can be used to compose the UI of your block editor. Thus, they can only be used under a [`BlockEditorProvider`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/provider/README.md) in the components tree.
diff --git a/packages/block-editor/src/components/preview-options/index.js b/packages/block-editor/src/components/preview-options/index.js
index 91018cc980bb29..8f540c35f64551 100644
--- a/packages/block-editor/src/components/preview-options/index.js
+++ b/packages/block-editor/src/components/preview-options/index.js
@@ -1,92 +1,11 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
-import { useViewportMatch } from '@wordpress/compose';
-import { DropdownMenu, MenuGroup, MenuItem } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { check, desktop, mobile, tablet } from '@wordpress/icons';
-
-export default function PreviewOptions( {
-	children,
-	viewLabel,
-	className,
-	isEnabled = true,
-	deviceType,
-	setDeviceType,
-	label,
-	showIconLabels,
-} ) {
-	const isMobile = useViewportMatch( 'medium', '<' );
-	if ( isMobile ) return null;
-
-	const popoverProps = {
-		className: classnames(
-			className,
-			'block-editor-post-preview__dropdown-content'
-		),
-		placement: 'bottom-end',
-	};
-	const toggleProps = {
-		className: 'block-editor-post-preview__button-toggle',
-		disabled: ! isEnabled,
-		__experimentalIsFocusable: ! isEnabled,
-		children: viewLabel,
-		size: 'compact',
-		showTooltip: ! showIconLabels,
-	};
-	const menuProps = {
-		'aria-label': __( 'View options' ),
-	};
-
-	const deviceIcons = {
-		mobile,
-		tablet,
-		desktop,
-	};
+import deprecated from '@wordpress/deprecated';
 
-	return (
-		<DropdownMenu
-			className="block-editor-post-preview__dropdown"
-			popoverProps={ popoverProps }
-			toggleProps={ toggleProps }
-			menuProps={ menuProps }
-			icon={ deviceIcons[ deviceType.toLowerCase() ] }
-			label={ label || __( 'Preview' ) }
-			disableOpenOnArrowDown={ ! isEnabled }
-		>
-			{ ( renderProps ) => (
-				<>
-					<MenuGroup>
-						<MenuItem
-							className="block-editor-post-preview__button-resize"
-							onClick={ () => setDeviceType( 'Desktop' ) }
-							icon={ deviceType === 'Desktop' && check }
-						>
-							{ __( 'Desktop' ) }
-						</MenuItem>
-						<MenuItem
-							className="block-editor-post-preview__button-resize"
-							onClick={ () => setDeviceType( 'Tablet' ) }
-							icon={ deviceType === 'Tablet' && check }
-						>
-							{ __( 'Tablet' ) }
-						</MenuItem>
-						<MenuItem
-							className="block-editor-post-preview__button-resize"
-							onClick={ () => setDeviceType( 'Mobile' ) }
-							icon={ deviceType === 'Mobile' && check }
-						>
-							{ __( 'Mobile' ) }
-						</MenuItem>
-					</MenuGroup>
-					{ children?.( renderProps ) }
-				</>
-			) }
-		</DropdownMenu>
-	);
+export default function PreviewOptions() {
+	deprecated( 'wp.blockEditor.PreviewOptions', {
+		version: '6.5',
+	} );
+	return null;
 }
diff --git a/packages/block-editor/src/components/preview-options/style.scss b/packages/block-editor/src/components/preview-options/style.scss
deleted file mode 100644
index fb79926ba1dee9..00000000000000
--- a/packages/block-editor/src/components/preview-options/style.scss
+++ /dev/null
@@ -1,64 +0,0 @@
-.block-editor-post-preview__dropdown {
-	padding: 0;
-}
-
-.block-editor-post-preview__button-resize.block-editor-post-preview__button-resize {
-	padding-left: $button-size-small + $grid-unit-10 + $grid-unit-10;
-
-	&.has-icon {
-		padding-left: $grid-unit-10;
-	}
-}
-
-.block-editor-post-preview__dropdown-content {
-	&.edit-post-post-preview-dropdown {
-		.components-menu-group {
-			&:first-child {
-				padding-bottom: $grid-unit-10;
-			}
-			&:last-child {
-				margin-bottom: 0;
-			}
-		}
-	}
-
-	.components-menu-group + .components-menu-group {
-		padding: $grid-unit-10;
-	}
-}
-
-.edit-post-header__settings,
-.edit-site-header-edit-mode__actions {
-	@include break-small () {
-		.editor-post-preview {
-			display: none;
-		}
-	}
-}
-
-// Reduced UI.
-.edit-post-header.has-reduced-ui {
-	@include break-small() {
-		// Apply transition to first two buttons.
-		.edit-post-header__settings .editor-post-save-draft,
-		.edit-post-header__settings .editor-post-saved-state,
-		.edit-post-header__settings .block-editor-post-preview__button-toggle {
-			transition: opacity 0.1s linear;
-			@include reduce-motion("transition");
-		}
-
-		// Zero out opacity unless hovered.
-		&:not(:hover) {
-			.edit-post-header__settings .editor-post-save-draft,
-			.edit-post-header__settings .editor-post-saved-state,
-			.edit-post-header__settings .block-editor-post-preview__button-toggle {
-				opacity: 0;
-			}
-
-			// ... or opened.
-			.edit-post-header__settings .block-editor-post-preview__button-toggle.is-opened {
-				opacity: 1;
-			}
-		}
-	}
-}
diff --git a/packages/block-editor/src/components/provider/block-refs-provider.js b/packages/block-editor/src/components/provider/block-refs-provider.js
index 3f2d19b658a630..e54680356efda2 100644
--- a/packages/block-editor/src/components/provider/block-refs-provider.js
+++ b/packages/block-editor/src/components/provider/block-refs-provider.js
@@ -2,17 +2,12 @@
  * WordPress dependencies
  */
 import { createContext, useMemo } from '@wordpress/element';
+import { observableMap } from '@wordpress/compose';
 
-export const BlockRefs = createContext( {
-	refs: new Map(),
-	callbacks: new Map(),
-} );
+export const BlockRefs = createContext( { refsMap: observableMap() } );
 
 export function BlockRefsProvider( { children } ) {
-	const value = useMemo(
-		() => ( { refs: new Map(), callbacks: new Map() } ),
-		[]
-	);
+	const value = useMemo( () => ( { refsMap: observableMap() } ), [] );
 	return (
 		<BlockRefs.Provider value={ value }>{ children }</BlockRefs.Provider>
 	);
diff --git a/packages/block-editor/src/components/provider/index.js b/packages/block-editor/src/components/provider/index.js
index 0fa3f042053d08..abbb122ae3a0e0 100644
--- a/packages/block-editor/src/components/provider/index.js
+++ b/packages/block-editor/src/components/provider/index.js
@@ -45,8 +45,8 @@ export const ExperimentalBlockEditorProvider = withRegistryProvider(
 		useBlockSync( props );
 
 		return (
-			<SlotFillProvider>
-				<KeyboardShortcuts.Register />
+			<SlotFillProvider passthrough>
+				{ ! settings?.isPreviewMode && <KeyboardShortcuts.Register /> }
 				<BlockRefsProvider>{ children }</BlockRefsProvider>
 			</SlotFillProvider>
 		);
@@ -55,10 +55,7 @@ export const ExperimentalBlockEditorProvider = withRegistryProvider(
 
 export const BlockEditorProvider = ( props ) => {
 	return (
-		<ExperimentalBlockEditorProvider
-			{ ...props }
-			stripExperimentalSettings={ true }
-		>
+		<ExperimentalBlockEditorProvider { ...props } stripExperimentalSettings>
 			{ props.children }
 		</ExperimentalBlockEditorProvider>
 	);
diff --git a/packages/block-editor/src/components/provider/test/experimental-provider.js b/packages/block-editor/src/components/provider/test/experimental-provider.js
index 2bb2aaadce95cc..8bb94698fffc81 100644
--- a/packages/block-editor/src/components/provider/test/experimental-provider.js
+++ b/packages/block-editor/src/components/provider/test/experimental-provider.js
@@ -5,7 +5,7 @@ import { render } from '@testing-library/react';
 /**
  * WordPress dependencies
  */
-import { useRegistry } from '@wordpress/data';
+import { useRegistry, useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -21,6 +21,20 @@ const HasEditorSetting = ( props ) => {
 	return <p>Test.</p>;
 };
 
+const PreviewModeGetter = () => {
+	const previewModeKeys = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+		const settings = getSettings();
+		return {
+			// This property will be removed in the future. There is a test that asserts we're throwing a deprecation warning.
+			__unstableIsPreviewMode: settings.__unstableIsPreviewMode,
+			isPreviewMode: settings.isPreviewMode,
+		};
+	}, [] );
+
+	return <>{ JSON.stringify( previewModeKeys ) }</>;
+};
+
 describe( 'BlockEditorProvider', () => {
 	let registry;
 	const setRegistry = ( reg ) => {
@@ -58,6 +72,34 @@ describe( 'BlockEditorProvider', () => {
 		const settings = registry.select( blockEditorStore ).getSettings();
 		expect( settings ).toHaveProperty( 'stableSetting' );
 	} );
+	it( 'preserves deprecated getters incoming from the settings reducer', async () => {
+		const consoleWarn = jest
+			.spyOn( global.console, 'warn' )
+			.mockImplementation();
+
+		const { container } = render(
+			<BlockEditorProvider
+				settings={ {
+					isPreviewMode: true,
+				} }
+			>
+				<PreviewModeGetter />
+			</BlockEditorProvider>
+		);
+
+		expect( container ).toHaveTextContent(
+			JSON.stringify( {
+				__unstableIsPreviewMode: true,
+				isPreviewMode: true,
+			} )
+		);
+
+		expect( consoleWarn ).toHaveBeenCalledWith(
+			'__unstableIsPreviewMode is deprecated since version 6.8. Please use isPreviewMode instead.'
+		);
+
+		consoleWarn.mockRestore();
+	} );
 } );
 
 describe( 'ExperimentalBlockEditorProvider', () => {
diff --git a/packages/block-editor/src/components/provider/test/use-block-sync.js b/packages/block-editor/src/components/provider/test/use-block-sync.js
index 09529c197516a3..aae5e517c63029 100644
--- a/packages/block-editor/src/components/provider/test/use-block-sync.js
+++ b/packages/block-editor/src/components/provider/test/use-block-sync.js
@@ -71,6 +71,7 @@ describe( 'useBlockSync hook', () => {
 		expect( onInput ).not.toHaveBeenCalled();
 		expect( replaceInnerBlocks ).not.toHaveBeenCalled();
 		expect( resetBlocks ).toHaveBeenCalledWith( fakeBlocks );
+		expect( resetBlocks ).toHaveBeenCalledTimes( 1 );
 
 		const testBlocks = [
 			{ clientId: 'a', innerBlocks: [], attributes: { foo: 1 } },
@@ -88,6 +89,7 @@ describe( 'useBlockSync hook', () => {
 		expect( onInput ).not.toHaveBeenCalled();
 		expect( replaceInnerBlocks ).not.toHaveBeenCalled();
 		expect( resetBlocks ).toHaveBeenCalledWith( testBlocks );
+		expect( resetBlocks ).toHaveBeenCalledTimes( 2 );
 
 		unmount();
 
@@ -95,6 +97,7 @@ describe( 'useBlockSync hook', () => {
 		expect( onInput ).not.toHaveBeenCalled();
 		expect( replaceInnerBlocks ).not.toHaveBeenCalled();
 		expect( resetBlocks ).toHaveBeenCalledWith( [] );
+		expect( resetBlocks ).toHaveBeenCalledTimes( 3 );
 	} );
 
 	it( 'replaces the inner blocks of a block when the controlled value changes if a clientId is passed', async () => {
@@ -123,6 +126,7 @@ describe( 'useBlockSync hook', () => {
 			'test', // It should use the given client ID.
 			fakeBlocks // It should use the controlled blocks value.
 		);
+		expect( replaceInnerBlocks ).toHaveBeenCalledTimes( 1 );
 
 		const testBlocks = [
 			{
@@ -148,6 +152,7 @@ describe( 'useBlockSync hook', () => {
 		expect( replaceInnerBlocks ).toHaveBeenCalledWith( 'test', [
 			expect.objectContaining( { name: 'test/test-block' } ),
 		] );
+		expect( replaceInnerBlocks ).toHaveBeenCalledTimes( 2 );
 
 		unmount();
 
@@ -155,6 +160,7 @@ describe( 'useBlockSync hook', () => {
 		expect( onInput ).not.toHaveBeenCalled();
 		expect( resetBlocks ).not.toHaveBeenCalled();
 		expect( replaceInnerBlocks ).toHaveBeenCalledWith( 'test', [] );
+		expect( replaceInnerBlocks ).toHaveBeenCalledTimes( 3 );
 	} );
 
 	it( 'does not add the controlled blocks to the block-editor store if the store already contains them', async () => {
@@ -263,13 +269,13 @@ describe( 'useBlockSync hook', () => {
 
 		expect( onInput ).toHaveBeenCalledWith(
 			[ { clientId: 'a', innerBlocks: [], attributes: { foo: 2 } } ],
-			{
+			expect.objectContaining( {
 				selection: {
 					selectionEnd: {},
 					selectionStart: {},
 					initialPosition: null,
 				},
-			}
+			} )
 		);
 		expect( onChange ).not.toHaveBeenCalled();
 	} );
@@ -303,13 +309,13 @@ describe( 'useBlockSync hook', () => {
 
 		expect( onChange ).toHaveBeenCalledWith(
 			[ { clientId: 'a', innerBlocks: [], attributes: { foo: 2 } } ],
-			{
+			expect.objectContaining( {
 				selection: {
 					selectionEnd: {},
 					selectionStart: {},
 					initialPosition: null,
 				},
-			}
+			} )
 		);
 		expect( onInput ).not.toHaveBeenCalled();
 	} );
@@ -354,6 +360,7 @@ describe( 'useBlockSync hook', () => {
 		);
 
 		expect( replaceInnerBlocks ).toHaveBeenCalledWith( 'test', [] );
+		expect( replaceInnerBlocks ).toHaveBeenCalledTimes( 1 );
 		expect( onChange ).not.toHaveBeenCalled();
 		expect( onInput ).not.toHaveBeenCalled();
 	} );
@@ -406,13 +413,13 @@ describe( 'useBlockSync hook', () => {
 					attributes: { foo: 2 },
 				},
 			],
-			{
+			expect.objectContaining( {
 				selection: {
 					selectionEnd: {},
 					selectionStart: {},
 					initialPosition: null,
 				},
-			}
+			} )
 		);
 		expect( onInput ).not.toHaveBeenCalled();
 	} );
@@ -447,13 +454,16 @@ describe( 'useBlockSync hook', () => {
 			{ clientId: 'a', innerBlocks: [], attributes: { foo: 2 } },
 		];
 
-		expect( onChange1 ).toHaveBeenCalledWith( updatedBlocks1, {
-			selection: {
-				initialPosition: null,
-				selectionEnd: {},
-				selectionStart: {},
-			},
-		} );
+		expect( onChange1 ).toHaveBeenCalledWith(
+			updatedBlocks1,
+			expect.objectContaining( {
+				selection: {
+					initialPosition: null,
+					selectionEnd: {},
+					selectionStart: {},
+				},
+			} )
+		);
 
 		const newBlocks = [
 			{ clientId: 'b', innerBlocks: [], attributes: { foo: 1 } },
@@ -485,13 +495,13 @@ describe( 'useBlockSync hook', () => {
 		// The second callback should be called with the new change.
 		expect( onChange2 ).toHaveBeenCalledWith(
 			[ { clientId: 'b', innerBlocks: [], attributes: { foo: 3 } } ],
-			{
+			expect.objectContaining( {
 				selection: {
 					selectionEnd: {},
 					selectionStart: {},
 					initialPosition: null,
 				},
-			}
+			} )
 		);
 	} );
 
@@ -544,13 +554,13 @@ describe( 'useBlockSync hook', () => {
 		// Only the new callback should be called.
 		expect( onChange2 ).toHaveBeenCalledWith(
 			[ { clientId: 'b', innerBlocks: [], attributes: { foo: 3 } } ],
-			{
+			expect.objectContaining( {
 				selection: {
 					selectionEnd: {},
 					selectionStart: {},
 					initialPosition: null,
 				},
-			}
+			} )
 		);
 	} );
 } );
diff --git a/packages/block-editor/src/components/provider/use-block-sync.js b/packages/block-editor/src/components/provider/use-block-sync.js
index 4f2300f380892e..fa148109d510f6 100644
--- a/packages/block-editor/src/components/provider/use-block-sync.js
+++ b/packages/block-editor/src/components/provider/use-block-sync.js
@@ -91,8 +91,8 @@ export default function useBlockSync( {
 		[ clientId ]
 	);
 
-	const pendingChanges = useRef( { incoming: null, outgoing: [] } );
-	const subscribed = useRef( false );
+	const pendingChangesRef = useRef( { incoming: null, outgoing: [] } );
+	const subscribedRef = useRef( false );
 
 	const setControlledBlocks = () => {
 		if ( ! controlledBlocks ) {
@@ -113,15 +113,15 @@ export default function useBlockSync( {
 				const storeBlocks = controlledBlocks.map( ( block ) =>
 					cloneBlock( block )
 				);
-				if ( subscribed.current ) {
-					pendingChanges.current.incoming = storeBlocks;
+				if ( subscribedRef.current ) {
+					pendingChangesRef.current.incoming = storeBlocks;
 				}
 				__unstableMarkNextChangeAsNotPersistent();
 				replaceInnerBlocks( clientId, storeBlocks );
 			} );
 		} else {
-			if ( subscribed.current ) {
-				pendingChanges.current.incoming = controlledBlocks;
+			if ( subscribedRef.current ) {
+				pendingChangesRef.current.incoming = controlledBlocks;
 			}
 			resetBlocks( controlledBlocks );
 		}
@@ -153,7 +153,7 @@ export default function useBlockSync( {
 
 	// Determine if blocks need to be reset when they change.
 	useEffect( () => {
-		if ( pendingChanges.current.outgoing.includes( controlledBlocks ) ) {
+		if ( pendingChangesRef.current.outgoing.includes( controlledBlocks ) ) {
 			// Skip block reset if the value matches expected outbound sync
 			// triggered by this component by a preceding change detection.
 			// Only skip if the value matches expectation, since a reset should
@@ -161,18 +161,18 @@ export default function useBlockSync( {
 			// to allow that the consumer may apply modifications to reflect
 			// back on the editor.
 			if (
-				pendingChanges.current.outgoing[
-					pendingChanges.current.outgoing.length - 1
+				pendingChangesRef.current.outgoing[
+					pendingChangesRef.current.outgoing.length - 1
 				] === controlledBlocks
 			) {
-				pendingChanges.current.outgoing = [];
+				pendingChangesRef.current.outgoing = [];
 			}
 		} else if ( getBlocks( clientId ) !== controlledBlocks ) {
 			// Reset changing value in all other cases than the sync described
 			// above. Since this can be reached in an update following an out-
 			// bound sync, unset the outbound value to avoid considering it in
 			// subsequent renders.
-			pendingChanges.current.outgoing = [];
+			pendingChangesRef.current.outgoing = [];
 			setControlledBlocks();
 
 			if ( controlledSelection ) {
@@ -185,11 +185,19 @@ export default function useBlockSync( {
 		}
 	}, [ controlledBlocks, clientId ] );
 
+	const isMountedRef = useRef( false );
+
 	useEffect( () => {
+		// On mount, controlled blocks are already set in the effect above.
+		if ( ! isMountedRef.current ) {
+			isMountedRef.current = true;
+			return;
+		}
+
 		// When the block becomes uncontrolled, it means its inner state has been reset
 		// we need to take the blocks again from the external value property.
 		if ( ! isControlled ) {
-			pendingChanges.current.outgoing = [];
+			pendingChangesRef.current.outgoing = [];
 			setControlledBlocks();
 		}
 	}, [ isControlled ] );
@@ -206,7 +214,7 @@ export default function useBlockSync( {
 		let isPersistent = isLastBlockChangePersistent();
 		let previousAreBlocksDifferent = false;
 
-		subscribed.current = true;
+		subscribedRef.current = true;
 		const unsubscribe = registry.subscribe( () => {
 			// Sometimes, when changing block lists, lingering subscriptions
 			// might trigger before they are cleaned up. If the block for which
@@ -215,8 +223,9 @@ export default function useBlockSync( {
 			// the subscription is triggering for a block (`clientId !== null`)
 			// and its block name can't be found because it's not on the list.
 			// (`getBlockName( clientId ) === null`).
-			if ( clientId !== null && getBlockName( clientId ) === null )
+			if ( clientId !== null && getBlockName( clientId ) === null ) {
 				return;
+			}
 
 			// When RESET_BLOCKS on parent blocks get called, the controlled blocks
 			// can reset to uncontrolled, in these situations, it means we need to populate
@@ -234,10 +243,10 @@ export default function useBlockSync( {
 			blocks = newBlocks;
 			if (
 				areBlocksDifferent &&
-				( pendingChanges.current.incoming ||
+				( pendingChangesRef.current.incoming ||
 					__unstableIsLastBlockChangeIgnored() )
 			) {
-				pendingChanges.current.incoming = null;
+				pendingChangesRef.current.incoming = null;
 				isPersistent = newIsPersistent;
 				return;
 			}
@@ -257,7 +266,7 @@ export default function useBlockSync( {
 				// We need to be aware that it was caused by an outgoing change
 				// so that we do not treat it as an incoming change later on,
 				// which would cause a block reset.
-				pendingChanges.current.outgoing.push( blocks );
+				pendingChangesRef.current.outgoing.push( blocks );
 
 				// Inform the controlling entity that changes have been made to
 				// the block-editor store they should be aware about.
@@ -277,7 +286,7 @@ export default function useBlockSync( {
 		}, blockEditorStore );
 
 		return () => {
-			subscribed.current = false;
+			subscribedRef.current = false;
 			unsubscribe();
 		};
 	}, [ registry, clientId ] );
diff --git a/packages/block-editor/src/components/provider/with-registry-provider.js b/packages/block-editor/src/components/provider/with-registry-provider.js
index 5c00da6e93eabc..582a9bd547f20e 100644
--- a/packages/block-editor/src/components/provider/with-registry-provider.js
+++ b/packages/block-editor/src/components/provider/with-registry-provider.js
@@ -1,12 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { useState, useEffect } from '@wordpress/element';
-import {
-	withRegistry,
-	createRegistry,
-	RegistryProvider,
-} from '@wordpress/data';
+import { useState } from '@wordpress/element';
+import { useRegistry, createRegistry, RegistryProvider } from '@wordpress/data';
 import { createHigherOrderComponent } from '@wordpress/compose';
 
 /**
@@ -15,41 +11,40 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 import { storeConfig } from '../../store';
 import { STORE_NAME as blockEditorStoreName } from '../../store/constants';
 
-const withRegistryProvider = createHigherOrderComponent(
-	( WrappedComponent ) => {
-		return withRegistry(
-			( { useSubRegistry = true, registry, ...props } ) => {
-				if ( ! useSubRegistry ) {
-					return (
-						<WrappedComponent registry={ registry } { ...props } />
-					);
-				}
-
-				const [ subRegistry, setSubRegistry ] = useState( null );
-				useEffect( () => {
-					const newRegistry = createRegistry( {}, registry );
-					newRegistry.registerStore(
-						blockEditorStoreName,
-						storeConfig
-					);
-					setSubRegistry( newRegistry );
-				}, [ registry ] );
+function getSubRegistry( subRegistries, registry, useSubRegistry ) {
+	if ( ! useSubRegistry ) {
+		return registry;
+	}
+	let subRegistry = subRegistries.get( registry );
+	if ( ! subRegistry ) {
+		subRegistry = createRegistry( {}, registry );
+		subRegistry.registerStore( blockEditorStoreName, storeConfig );
+		subRegistries.set( registry, subRegistry );
+	}
+	return subRegistry;
+}
 
-				if ( ! subRegistry ) {
-					return null;
-				}
+const withRegistryProvider = createHigherOrderComponent(
+	( WrappedComponent ) =>
+		( { useSubRegistry = true, ...props } ) => {
+			const registry = useRegistry();
+			const [ subRegistries ] = useState( () => new WeakMap() );
+			const subRegistry = getSubRegistry(
+				subRegistries,
+				registry,
+				useSubRegistry
+			);
 
-				return (
-					<RegistryProvider value={ subRegistry }>
-						<WrappedComponent
-							registry={ subRegistry }
-							{ ...props }
-						/>
-					</RegistryProvider>
-				);
+			if ( subRegistry === registry ) {
+				return <WrappedComponent registry={ registry } { ...props } />;
 			}
-		);
-	},
+
+			return (
+				<RegistryProvider value={ subRegistry }>
+					<WrappedComponent registry={ subRegistry } { ...props } />
+				</RegistryProvider>
+			);
+		},
 	'withRegistryProvider'
 );
 
diff --git a/packages/block-editor/src/components/publish-date-time-picker/index.js b/packages/block-editor/src/components/publish-date-time-picker/index.js
index 418006cf854c14..eeaa5b2daad6fa 100644
--- a/packages/block-editor/src/components/publish-date-time-picker/index.js
+++ b/packages/block-editor/src/components/publish-date-time-picker/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { DateTimePicker } from '@wordpress/components';
+import { DateTimePicker, TimePicker } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { forwardRef } from '@wordpress/element';
 import { getSettings } from '@wordpress/date';
@@ -11,29 +11,57 @@ import { getSettings } from '@wordpress/date';
  */
 import InspectorPopoverHeader from '../inspector-popover-header';
 
-function PublishDateTimePicker(
-	{ onClose, onChange, ...additionalProps },
+export function PublishDateTimePicker(
+	{
+		onClose,
+		onChange,
+		showPopoverHeaderActions,
+		isCompact,
+		currentDate,
+		...additionalProps
+	},
 	ref
 ) {
+	const datePickerProps = {
+		startOfWeek: getSettings().l10n.startOfWeek,
+		onChange,
+		currentDate: isCompact ? undefined : currentDate,
+		currentTime: isCompact ? currentDate : undefined,
+		...additionalProps,
+	};
+	const DatePickerComponent = isCompact ? TimePicker : DateTimePicker;
 	return (
 		<div ref={ ref } className="block-editor-publish-date-time-picker">
 			<InspectorPopoverHeader
 				title={ __( 'Publish' ) }
-				actions={ [
-					{
-						label: __( 'Now' ),
-						onClick: () => onChange?.( null ),
-					},
-				] }
+				actions={
+					showPopoverHeaderActions
+						? [
+								{
+									label: __( 'Now' ),
+									onClick: () => onChange?.( null ),
+								},
+						  ]
+						: undefined
+				}
 				onClose={ onClose }
 			/>
-			<DateTimePicker
-				startOfWeek={ getSettings().l10n.startOfWeek }
-				onChange={ onChange }
-				{ ...additionalProps }
-			/>
+			<DatePickerComponent { ...datePickerProps } />
 		</div>
 	);
 }
 
-export default forwardRef( PublishDateTimePicker );
+export const PrivatePublishDateTimePicker = forwardRef( PublishDateTimePicker );
+
+function PublicPublishDateTimePicker( props, ref ) {
+	return (
+		<PrivatePublishDateTimePicker
+			{ ...props }
+			showPopoverHeaderActions
+			isCompact={ false }
+			ref={ ref }
+		/>
+	);
+}
+
+export default forwardRef( PublicPublishDateTimePicker );
diff --git a/packages/block-editor/src/components/recursion-provider/README.md b/packages/block-editor/src/components/recursion-provider/README.md
index 4538fd6a7d3507..37af15d75c1914 100644
--- a/packages/block-editor/src/components/recursion-provider/README.md
+++ b/packages/block-editor/src/components/recursion-provider/README.md
@@ -11,8 +11,8 @@ To help with detecting infinite loops on the client, the `RecursionProvider` com
  * WordPress dependencies
  */
 import {
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	useBlockProps,
 	Warning,
 } from '@wordpress/block-editor';
diff --git a/packages/block-editor/src/components/recursion-provider/index.js b/packages/block-editor/src/components/recursion-provider/index.js
index 2c38087a8731d4..98a2b5c546f2bf 100644
--- a/packages/block-editor/src/components/recursion-provider/index.js
+++ b/packages/block-editor/src/components/recursion-provider/index.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { createContext, useContext, useMemo } from '@wordpress/element';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -82,3 +83,19 @@ export function useHasRecursion( uniqueId, blockName = '' ) {
 	blockName = blockName || name;
 	return Boolean( previouslyRenderedBlocks[ blockName ]?.has( uniqueId ) );
 }
+
+export const DeprecatedExperimentalRecursionProvider = ( props ) => {
+	deprecated( 'wp.blockEditor.__experimentalRecursionProvider', {
+		since: '6.5',
+		alternative: 'wp.blockEditor.RecursionProvider',
+	} );
+	return <RecursionProvider { ...props } />;
+};
+
+export const DeprecatedExperimentalUseHasRecursion = ( ...args ) => {
+	deprecated( 'wp.blockEditor.__experimentalUseHasRecursion', {
+		since: '6.5',
+		alternative: 'wp.blockEditor.useHasRecursion',
+	} );
+	return useHasRecursion( ...args );
+};
diff --git a/packages/block-editor/src/components/resizable-box-popover/index.js b/packages/block-editor/src/components/resizable-box-popover/index.js
index 12a61aceaaf38e..61f599663a4f5d 100644
--- a/packages/block-editor/src/components/resizable-box-popover/index.js
+++ b/packages/block-editor/src/components/resizable-box-popover/index.js
@@ -6,7 +6,7 @@ import { ResizableBox } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import BlockPopover from '../block-popover';
+import BlockPopoverCover from '../block-popover/cover';
 
 export default function ResizableBoxPopover( {
 	clientId,
@@ -14,14 +14,12 @@ export default function ResizableBoxPopover( {
 	...props
 } ) {
 	return (
-		<BlockPopover
+		<BlockPopoverCover
 			clientId={ clientId }
-			__unstableCoverTarget
-			__unstablePopoverSlot="__unstable-block-tools-after"
-			shift={ false }
+			__unstablePopoverSlot="block-toolbar"
 			{ ...props }
 		>
 			<ResizableBox { ...resizableBoxProps } />
-		</BlockPopover>
+		</BlockPopoverCover>
 	);
 }
diff --git a/packages/block-editor/src/components/resolution-tool/index.js b/packages/block-editor/src/components/resolution-tool/index.js
index 71c7e508ca3edb..df43cb6acb096d 100644
--- a/packages/block-editor/src/components/resolution-tool/index.js
+++ b/packages/block-editor/src/components/resolution-tool/index.js
@@ -44,12 +44,13 @@ export default function ResolutionTool( {
 			panelId={ panelId }
 		>
 			<SelectControl
+				__nextHasNoMarginBottom
 				label={ __( 'Resolution' ) }
 				value={ displayValue }
 				options={ options }
 				onChange={ onChange }
 				help={ __( 'Select the size of the source image.' ) }
-				size={ '__unstable-large' }
+				size="__unstable-large"
 			/>
 		</ToolsPanelItem>
 	);
diff --git a/packages/block-editor/src/components/responsive-block-control/README.md b/packages/block-editor/src/components/responsive-block-control/README.md
index ec6e1f4beb018d..16183ccd6314f5 100644
--- a/packages/block-editor/src/components/responsive-block-control/README.md
+++ b/packages/block-editor/src/components/responsive-block-control/README.md
@@ -2,7 +2,7 @@
 
 `ResponsiveBlockControl` provides a standardised interface for the creation of Block controls that require **different settings per viewport** (ie: "responsive" settings).
 
-For example, imagine your Block provides a control which affords the ability to change a "padding" value used in the Block display. Consider that whilst this setting may work well on "large" screens, the same value may not work well on smaller screens (it may be too large for example). As a result, you now need to provide a padding control _per viewport/screensize_.
+For example, imagine your Block provides a control which affords the ability to change a "padding" value used in the Block display. Consider that whilst this setting may work well on "large" screens, the same value may not work well on smaller screens (it may be too large for example). As a result, you now need to provide a padding control _per viewport/screen size_.
 
 `ResponsiveBlockControl` provides a standardised component for the creation of such interfaces within Gutenberg.
 
@@ -25,11 +25,8 @@ import { useState } from 'react';
 import { registerBlockType } from '@wordpress/blocks';
 import {
 	InspectorControls,
-	ResponsiveBlockControl,
+	__experimentalResponsiveBlockControl as ResponsiveBlockControl,
 } from '@wordpress/block-editor';
-import {
-	DimensionControl,
-} from '@wordpress/components';
 
 registerBlockType( 'my-plugin/my-block', {
 	// ...
@@ -37,33 +34,13 @@ registerBlockType( 'my-plugin/my-block', {
 	edit( { attributes, setAttributes } ) {
 
 		const [ isResponsive, setIsResponsive ] = useState( false );
-
-		// Used for example purposes only
-		const sizeOptions = [
-			{
-				label: 'Small',
-				value: 'small',
-			},
-			{
-				label: 'Medium',
-				value: 'medium',
-			},
-			{
-				label: 'Large',
-				value: 'large',
-			},
-		];
-
 		const { paddingSize } = attributes;
 
-
 		// Your custom control can be anything you'd like to use.
-		// You are not restricted to `DimensionControl`s, but this
-		// makes life easier if dealing with standard CSS values.
-		// see `packages/components/src/dimension-control/README.md`
 		const paddingControl = ( labelComponent, viewport ) => {
 			return (
-				<DimensionControl
+				<input
+					type="number"
 					label={ viewport.label }
 					onChange={ // handle update to padding value here  }
 					value={ paddingSize }
@@ -154,7 +131,7 @@ const renderDefaultControl = ( labelComponent, viewport ) => {
 	// 	id: 'small',
 	// 	label: 'All'
 	// }
-	return <DimensionControl label={ labelComponent } />;
+	return <SelectControl label={ labelComponent } />;
 };
 ```
 
@@ -194,7 +171,7 @@ const renderResponsiveControls = ( viewports ) => {
 ### `toggleLabel`
 
 -   **Type:** `String`
--   **Default:** `Use the same %s on all screensizes.` (where "%s" is the `property` prop - see above )
+-   **Default:** `Use the same %s on all screen sizes.` (where "%s" is the `property` prop - see above )
 -   **Required:** `false`
 
 Optional label used for the toggle control which switches the interface between showing responsive controls or not.
@@ -213,7 +190,7 @@ Optional label used for the toggle control which switches the interface between
 
 -   **Required:** `false`
 
-Optional object describing the attributes of the default value. By default this is `All` which indicates the control will affect "all viewports/screensizes".
+Optional object describing the attributes of the default value. By default this is `All` which indicates the control will affect "all viewports/screen sizes".
 
 ### `viewports`
 
diff --git a/packages/block-editor/src/components/responsive-block-control/index.js b/packages/block-editor/src/components/responsive-block-control/index.js
index 331f8899213f33..148ba9600f0032 100644
--- a/packages/block-editor/src/components/responsive-block-control/index.js
+++ b/packages/block-editor/src/components/responsive-block-control/index.js
@@ -1,12 +1,12 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { __, sprintf } from '@wordpress/i18n';
+import { __, _x, sprintf } from '@wordpress/i18n';
 import { Fragment } from '@wordpress/element';
 import { ToggleControl } from '@wordpress/components';
 
@@ -26,8 +26,7 @@ function ResponsiveBlockControl( props ) {
 		isResponsive = false,
 		defaultLabel = {
 			id: 'all',
-			/* translators: 'Label. Used to signify a layout property (eg: margin, padding) will apply uniformly to all screensizes.' */
-			label: __( 'All' ),
+			label: _x( 'All', 'screen sizes' ),
 		},
 		viewports = [
 			{
@@ -52,12 +51,11 @@ function ResponsiveBlockControl( props ) {
 	const toggleControlLabel =
 		toggleLabel ||
 		sprintf(
-			/* translators: 'Toggle control label. Should the property be the same across all screen sizes or unique per screen size.'. %s property value for the control (eg: margin, padding...etc) */
-			__( 'Use the same %s on all screensizes.' ),
+			/* translators: %s: Property value for the control (eg: margin, padding, etc.). */
+			__( 'Use the same %s on all screen sizes.' ),
 			property
 		);
 
-	/* translators: 'Help text for the responsive mode toggle control.' */
 	const toggleHelpText = __(
 		'Toggle between using the same value for all screen sizes or using a unique value per screen size.'
 	);
@@ -100,7 +98,7 @@ function ResponsiveBlockControl( props ) {
 					help={ toggleHelpText }
 				/>
 				<div
-					className={ classnames(
+					className={ clsx(
 						'block-editor-responsive-block-control__group',
 						{
 							'is-responsive': isResponsive,
diff --git a/packages/block-editor/src/components/responsive-block-control/style.scss b/packages/block-editor/src/components/responsive-block-control/style.scss
index 7f90e12dd87c66..e840a3bfcf436a 100644
--- a/packages/block-editor/src/components/responsive-block-control/style.scss
+++ b/packages/block-editor/src/components/responsive-block-control/style.scss
@@ -1,6 +1,5 @@
 @mixin screen-reader-text() {
 	border: 0;
-	clip: rect(1px, 1px, 1px, 1px);
 	clip-path: inset(50%);
 	height: 1px;
 	margin: -1px;
diff --git a/packages/block-editor/src/components/responsive-block-control/test/index.js b/packages/block-editor/src/components/responsive-block-control/test/index.js
index 4fdc760f4945f3..ef32c60722f541 100644
--- a/packages/block-editor/src/components/responsive-block-control/test/index.js
+++ b/packages/block-editor/src/components/responsive-block-control/test/index.js
@@ -39,7 +39,12 @@ const sizeOptions = [
 const renderTestDefaultControlComponent = ( labelComponent, device ) => {
 	return (
 		<>
-			<SelectControl label={ labelComponent } options={ sizeOptions } />
+			<SelectControl
+				__next40pxDefaultSize
+				label={ labelComponent }
+				options={ sizeOptions }
+				__nextHasNoMarginBottom
+			/>
 			<p id={ device.id }>
 				{ device.label } is used here for testing purposes to ensure we
 				have access to details about the device.
@@ -81,7 +86,7 @@ describe( 'Basic rendering', () => {
 		} );
 
 		const toggleState = screen.getByRole( 'checkbox', {
-			name: 'Use the same padding on all screensizes.',
+			name: 'Use the same padding on all screen sizes.',
 			checked: true,
 		} );
 
@@ -177,7 +182,7 @@ describe( 'Default and Responsive modes', () => {
 			<ResponsiveBlockControl
 				title="Padding"
 				property="padding"
-				isResponsive={ true }
+				isResponsive
 				renderDefaultControl={ renderTestDefaultControlComponent }
 			/>
 		);
@@ -217,7 +222,7 @@ describe( 'Default and Responsive modes', () => {
 			<ResponsiveBlockControl
 				title="Padding"
 				property="padding"
-				isResponsive={ true }
+				isResponsive
 				renderDefaultControl={ mockRenderDefaultControl }
 				viewports={ customViewportSet }
 			/>
@@ -268,7 +273,7 @@ describe( 'Default and Responsive modes', () => {
 
 		// Select elements based on what the user can see.
 		const toggleInput = screen.getByRole( 'checkbox', {
-			name: 'Use the same padding on all screensizes.',
+			name: 'Use the same padding on all screen sizes.',
 			checked: true,
 		} );
 
@@ -319,7 +324,7 @@ describe( 'Default and Responsive modes', () => {
 			<ResponsiveBlockControl
 				title="Padding"
 				property="padding"
-				isResponsive={ true }
+				isResponsive
 				renderDefaultControl={ spyRenderDefaultControl }
 				renderResponsiveControls={ mockRenderResponsiveControls }
 			/>
diff --git a/packages/block-editor/src/components/rich-text/README.md b/packages/block-editor/src/components/rich-text/README.md
index 4251debfa16c54..11ea1c75204dd7 100644
--- a/packages/block-editor/src/components/rich-text/README.md
+++ b/packages/block-editor/src/components/rich-text/README.md
@@ -12,6 +12,10 @@ _Required._ HTML string to make editable. The HTML should be valid, and valid in
 
 _Required._ Called when the value changes.
 
+### `identifier: String`
+
+_Optional._ If the editable field is bound to a block attribute (through the `value` and `onChange` props) then this prop should specify the attribute name. The field will use this value to set the block editor selection correctly, specifying in which attribute and at what offset does the selection start or end.
+
 ### `tagName: String`
 
 _Default: `div`._ The [tag name](https://www.w3.org/TR/html51/syntax.html#tag-name) of the editable element.
@@ -21,13 +25,9 @@ _Default: `div`._ The [tag name](https://www.w3.org/TR/html51/syntax.html#tag-na
 _Optional._ Placeholder text to show when the field is empty, similar to the
 [`input` and `textarea` attribute of the same name](https://developer.mozilla.org/en-US/docs/Learn/HTML/Forms/HTML5_updates#The_placeholder_attribute).
 
-### `multiline: Boolean | String`
-
-_Optional._ By default, a line break will be inserted on <kbd>Enter</kbd>. If the editable field can contain multiple paragraphs, this property can be set to create new paragraphs on <kbd>Enter</kbd>.
-
-### `onSplit( value: String ): Function`
+### `disableLineBreaks: Boolean`
 
-_Optional._ Called when the content can be split, where `value` is a piece of content being split off. Here you should create a new block with that content and return it. Note that you also need to provide `onReplace` in order for this to take any effect.
+_Optional._  Disables inserting line breaks on `Enter` when it is set to `true`
 
 ### `onReplace( blocks: Array ): Function`
 
@@ -50,6 +50,7 @@ _Optional._ By default, all registered formats are allowed. This setting can be
 ```js
 <RichText
 	tagName="h2"
+	identifier="content"
 	value={ attributes.content }
 	allowedFormats={ [ 'core/bold', 'core/italic' ] } // Allow the content to be made bold or italic, but do not allow othe formatting options
 	onChange={ ( content ) => setAttributes( { content } ) }
@@ -99,6 +100,7 @@ registerBlockType( /* ... */, {
 			<RichText
 				tagName="h2"
 				className={ className }
+				identifier="content"
 				value={ attributes.content }
 				onChange={ ( content ) => setAttributes( { content } ) }
 			/>
diff --git a/packages/block-editor/src/components/rich-text/content.js b/packages/block-editor/src/components/rich-text/content.js
index 9762582f86f141..64f747879c4e9e 100644
--- a/packages/block-editor/src/components/rich-text/content.js
+++ b/packages/block-editor/src/components/rich-text/content.js
@@ -5,13 +5,22 @@ import { RawHTML } from '@wordpress/element';
 import { children as childrenSource } from '@wordpress/blocks';
 import deprecated from '@wordpress/deprecated';
 
+/**
+ * Internal dependencies
+ */
+import RichText from './';
+
 /**
  * Internal dependencies
  */
 import { getMultilineTag } from './utils';
 
-export const Content = ( { value, tagName: Tag, multiline, ...props } ) => {
-	// Handle deprecated `children` and `node` sources.
+export function valueToHTMLString( value, multiline ) {
+	if ( RichText.isEmpty( value ) ) {
+		const multilineTag = getMultilineTag( multiline );
+		return multilineTag ? `<${ multilineTag }></${ multilineTag }>` : '';
+	}
+
 	if ( Array.isArray( value ) ) {
 		deprecated( 'wp.blockEditor.RichText value prop as children type', {
 			since: '6.1',
@@ -19,22 +28,27 @@ export const Content = ( { value, tagName: Tag, multiline, ...props } ) => {
 			alternative: 'value prop as string',
 			link: 'https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields/',
 		} );
-
-		value = childrenSource.toHTML( value );
+		return childrenSource.toHTML( value );
 	}
 
-	const MultilineTag = getMultilineTag( multiline );
-
-	if ( ! value && MultilineTag ) {
-		value = `<${ MultilineTag }></${ MultilineTag }>`;
-	}
-
-	const content = <RawHTML>{ value }</RawHTML>;
-
-	if ( Tag ) {
-		const { format, ...restProps } = props;
-		return <Tag { ...restProps }>{ content }</Tag>;
+	// To do: deprecate string type.
+	if ( typeof value === 'string' ) {
+		return value;
 	}
 
-	return content;
-};
+	// To do: create a toReactComponent method on RichTextData, which we
+	// might in the future also use for the editable tree. See
+	// https://github.com/WordPress/gutenberg/pull/41655.
+	return value.toHTMLString();
+}
+
+export function Content( {
+	value,
+	tagName: Tag,
+	multiline,
+	format,
+	...props
+} ) {
+	value = <RawHTML>{ valueToHTMLString( value, multiline ) }</RawHTML>;
+	return Tag ? <Tag { ...props }>{ value }</Tag> : value;
+}
diff --git a/packages/block-editor/src/components/rich-text/content.scss b/packages/block-editor/src/components/rich-text/content.scss
index 6f6d88c777ea74..6f118479fc6b03 100644
--- a/packages/block-editor/src/components/rich-text/content.scss
+++ b/packages/block-editor/src/components/rich-text/content.scss
@@ -15,7 +15,7 @@
 		outline: none;
 
 		[data-rich-text-format-boundary] {
-			border-radius: 2px;
+			border-radius: $radius-small;
 		}
 	}
 }
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/before-input-rules.js b/packages/block-editor/src/components/rich-text/event-listeners/before-input-rules.js
new file mode 100644
index 00000000000000..e02b059550bd1c
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/before-input-rules.js
@@ -0,0 +1,92 @@
+/**
+ * WordPress dependencies
+ */
+import { insert, isCollapsed } from '@wordpress/rich-text';
+import { applyFilters } from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../../store';
+
+/**
+ * When typing over a selection, the selection will we wrapped by a matching
+ * character pair. The second character is optional, it defaults to the first
+ * character.
+ *
+ * @type {string[]} Array of character pairs.
+ */
+const wrapSelectionSettings = [ '`', '"', "'", '“”', '‘’' ];
+
+export default ( props ) => ( element ) => {
+	function onInput( event ) {
+		const { inputType, data } = event;
+		const { value, onChange, registry } = props.current;
+
+		// Only run the rules when inserting text.
+		if ( inputType !== 'insertText' ) {
+			return;
+		}
+
+		if ( isCollapsed( value ) ) {
+			return;
+		}
+
+		const pair = applyFilters(
+			'blockEditor.wrapSelectionSettings',
+			wrapSelectionSettings
+		).find(
+			( [ startChar, endChar ] ) => startChar === data || endChar === data
+		);
+
+		if ( ! pair ) {
+			return;
+		}
+
+		const [ startChar, endChar = startChar ] = pair;
+		const start = value.start;
+		const end = value.end + startChar.length;
+
+		let newValue = insert( value, startChar, start, start );
+		newValue = insert( newValue, endChar, end, end );
+
+		const {
+			__unstableMarkLastChangeAsPersistent,
+			__unstableMarkAutomaticChange,
+		} = registry.dispatch( blockEditorStore );
+
+		__unstableMarkLastChangeAsPersistent();
+		onChange( newValue );
+		__unstableMarkAutomaticChange();
+
+		const init = {};
+
+		for ( const key in event ) {
+			init[ key ] = event[ key ];
+		}
+
+		init.data = endChar;
+
+		const { ownerDocument } = element;
+		const { defaultView } = ownerDocument;
+		const newEvent = new defaultView.InputEvent( 'input', init );
+
+		// Dispatch an `input` event with the new data. This will trigger the
+		// input rules.
+		// Postpone the `input` to the next event loop tick so that the dispatch
+		// doesn't happen synchronously in the middle of `beforeinput` dispatch.
+		// This is closer to how native `input` event would be timed, and also
+		// makes sure that the `input` event is dispatched only after the `onChange`
+		// call few lines above has fully updated the data store state and rerendered
+		// all affected components.
+		window.queueMicrotask( () => {
+			event.target.dispatchEvent( newEvent );
+		} );
+		event.preventDefault();
+	}
+
+	element.addEventListener( 'beforeinput', onInput );
+	return () => {
+		element.removeEventListener( 'beforeinput', onInput );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/delete.js b/packages/block-editor/src/components/rich-text/event-listeners/delete.js
new file mode 100644
index 00000000000000..ae3fd733bb94e1
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/delete.js
@@ -0,0 +1,53 @@
+/**
+ * WordPress dependencies
+ */
+import { DELETE, BACKSPACE } from '@wordpress/keycodes';
+import { isCollapsed, isEmpty } from '@wordpress/rich-text';
+
+export default ( props ) => ( element ) => {
+	function onKeyDown( event ) {
+		const { keyCode } = event;
+
+		if ( event.defaultPrevented ) {
+			return;
+		}
+
+		const { value, onMerge, onRemove } = props.current;
+
+		if ( keyCode === DELETE || keyCode === BACKSPACE ) {
+			const { start, end, text } = value;
+			const isReverse = keyCode === BACKSPACE;
+			const hasActiveFormats =
+				value.activeFormats && !! value.activeFormats.length;
+
+			// Only process delete if the key press occurs at an uncollapsed edge.
+			if (
+				! isCollapsed( value ) ||
+				hasActiveFormats ||
+				( isReverse && start !== 0 ) ||
+				( ! isReverse && end !== text.length )
+			) {
+				return;
+			}
+
+			if ( onMerge ) {
+				onMerge( ! isReverse );
+			}
+
+			// Only handle remove on Backspace. This serves dual-purpose of being
+			// an intentional user interaction distinguishing between Backspace and
+			// Delete to remove the empty field, but also to avoid merge & remove
+			// causing destruction of two fields (merge, then removed merged).
+			else if ( onRemove && isEmpty( value ) && isReverse ) {
+				onRemove( ! isReverse );
+			}
+
+			event.preventDefault();
+		}
+	}
+
+	element.addEventListener( 'keydown', onKeyDown );
+	return () => {
+		element.removeEventListener( 'keydown', onKeyDown );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/enter.js b/packages/block-editor/src/components/rich-text/event-listeners/enter.js
new file mode 100644
index 00000000000000..63c2145fe7acbc
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/enter.js
@@ -0,0 +1,84 @@
+/**
+ * WordPress dependencies
+ */
+import { ENTER } from '@wordpress/keycodes';
+import { insert, remove } from '@wordpress/rich-text';
+
+export default ( props ) => ( element ) => {
+	function onKeyDownDeprecated( event ) {
+		if ( event.keyCode !== ENTER ) {
+			return;
+		}
+
+		const { onReplace, onSplit } = props.current;
+
+		if ( onReplace && onSplit ) {
+			event.__deprecatedOnSplit = true;
+		}
+	}
+
+	function onKeyDown( event ) {
+		if ( event.defaultPrevented ) {
+			return;
+		}
+
+		// The event listener is attached to the window, so we need to check if
+		// the target is the element.
+		if ( event.target !== element ) {
+			return;
+		}
+
+		if ( event.keyCode !== ENTER ) {
+			return;
+		}
+
+		const {
+			value,
+			onChange,
+			disableLineBreaks,
+			onSplitAtEnd,
+			onSplitAtDoubleLineEnd,
+			registry,
+		} = props.current;
+
+		event.preventDefault();
+
+		const { text, start, end } = value;
+
+		if ( event.shiftKey ) {
+			if ( ! disableLineBreaks ) {
+				onChange( insert( value, '\n' ) );
+			}
+		} else if ( onSplitAtEnd && start === end && end === text.length ) {
+			onSplitAtEnd();
+		} else if (
+			// For some blocks it's desirable to split at the end of the
+			// block when there are two line breaks at the end of the
+			// block, so triple Enter exits the block.
+			onSplitAtDoubleLineEnd &&
+			start === end &&
+			end === text.length &&
+			text.slice( -2 ) === '\n\n'
+		) {
+			registry.batch( () => {
+				const _value = { ...value };
+				_value.start = _value.end - 2;
+				onChange( remove( _value ) );
+				onSplitAtDoubleLineEnd();
+			} );
+		} else if ( ! disableLineBreaks ) {
+			onChange( insert( value, '\n' ) );
+		}
+	}
+
+	const { defaultView } = element.ownerDocument;
+
+	// Attach the listener to the window so parent elements have the chance to
+	// prevent the default behavior.
+	defaultView.addEventListener( 'keydown', onKeyDown );
+	element.addEventListener( 'keydown', onKeyDownDeprecated );
+	return () => {
+		defaultView.removeEventListener( 'keydown', onKeyDown );
+		element.removeEventListener( 'keydown', onKeyDownDeprecated );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/firefox-compat.js b/packages/block-editor/src/components/rich-text/event-listeners/firefox-compat.js
new file mode 100644
index 00000000000000..b6b859d346fd36
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/firefox-compat.js
@@ -0,0 +1,31 @@
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../../store';
+
+export default ( props ) => ( element ) => {
+	function onFocus() {
+		const { registry } = props.current;
+		if ( ! registry.select( blockEditorStore ).isMultiSelecting() ) {
+			return;
+		}
+
+		// This is a little hack to work around focus issues with nested
+		// editable elements in Firefox. For some reason the editable child
+		// element sometimes regains focus, while it should not be focusable
+		// and focus should remain on the editable parent element.
+		// To do: try to find the cause of the shifting focus.
+		const parentEditable = element.parentElement.closest(
+			'[contenteditable="true"]'
+		);
+
+		if ( parentEditable ) {
+			parentEditable.focus();
+		}
+	}
+
+	element.addEventListener( 'focus', onFocus );
+	return () => {
+		element.removeEventListener( 'focus', onFocus );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/index.js b/packages/block-editor/src/components/rich-text/event-listeners/index.js
new file mode 100644
index 00000000000000..46e721dfe5cf7c
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/index.js
@@ -0,0 +1,56 @@
+/**
+ * WordPress dependencies
+ */
+import { useMemo, useRef } from '@wordpress/element';
+import { useRefEffect } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import beforeInputRules from './before-input-rules';
+import inputRules from './input-rules';
+import insertReplacementText from './insert-replacement-text';
+import removeBrowserShortcuts from './remove-browser-shortcuts';
+import shortcuts from './shortcuts';
+import inputEvents from './input-events';
+import undoAutomaticChange from './undo-automatic-change';
+import pasteHandler from './paste-handler';
+import _delete from './delete';
+import enter from './enter';
+import firefoxCompat from './firefox-compat';
+
+const allEventListeners = [
+	beforeInputRules,
+	inputRules,
+	insertReplacementText,
+	removeBrowserShortcuts,
+	shortcuts,
+	inputEvents,
+	undoAutomaticChange,
+	pasteHandler,
+	_delete,
+	enter,
+	firefoxCompat,
+];
+
+export function useEventListeners( props ) {
+	const propsRef = useRef( props );
+	propsRef.current = props;
+	const refEffects = useMemo(
+		() => allEventListeners.map( ( refEffect ) => refEffect( propsRef ) ),
+		[ propsRef ]
+	);
+
+	return useRefEffect(
+		( element ) => {
+			if ( ! props.isSelected ) {
+				return;
+			}
+			const cleanups = refEffects.map( ( effect ) => effect( element ) );
+			return () => {
+				cleanups.forEach( ( cleanup ) => cleanup() );
+			};
+		},
+		[ refEffects, props.isSelected ]
+	);
+}
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/input-events.js b/packages/block-editor/src/components/rich-text/event-listeners/input-events.js
new file mode 100644
index 00000000000000..e16dc8f1dd0f5c
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/input-events.js
@@ -0,0 +1,13 @@
+export default ( props ) => ( element ) => {
+	const { inputEvents } = props.current;
+	function onInput( event ) {
+		for ( const keyboardShortcut of inputEvents.current ) {
+			keyboardShortcut( event );
+		}
+	}
+
+	element.addEventListener( 'input', onInput );
+	return () => {
+		element.removeEventListener( 'input', onInput );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/input-rules.js b/packages/block-editor/src/components/rich-text/event-listeners/input-rules.js
new file mode 100644
index 00000000000000..4a1e8400e35a17
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/input-rules.js
@@ -0,0 +1,146 @@
+/**
+ * WordPress dependencies
+ */
+import { insert, toHTMLString } from '@wordpress/rich-text';
+import { getBlockTransforms, findTransform } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../../store';
+import { preventEventDiscovery } from '../prevent-event-discovery';
+import {
+	retrieveSelectedAttribute,
+	START_OF_SELECTED_AREA,
+} from '../../../utils/selection';
+
+export function findSelection( blocks ) {
+	let i = blocks.length;
+
+	while ( i-- ) {
+		const attributeKey = retrieveSelectedAttribute(
+			blocks[ i ].attributes
+		);
+
+		if ( attributeKey ) {
+			blocks[ i ].attributes[ attributeKey ] = blocks[ i ].attributes[
+				attributeKey
+			]
+				// To do: refactor this to use rich text's selection instead, so
+				// we no longer have to use on this hack inserting a special
+				// character.
+				.toString()
+				.replace( START_OF_SELECTED_AREA, '' );
+			return [ blocks[ i ].clientId, attributeKey, 0, 0 ];
+		}
+
+		const nestedSelection = findSelection( blocks[ i ].innerBlocks );
+
+		if ( nestedSelection ) {
+			return nestedSelection;
+		}
+	}
+
+	return [];
+}
+
+export default ( props ) => ( element ) => {
+	function inputRule() {
+		const { getValue, onReplace, selectionChange, registry } =
+			props.current;
+
+		if ( ! onReplace ) {
+			return;
+		}
+
+		// We must use getValue() here because value may be update
+		// asynchronously.
+		const value = getValue();
+		const { start, text } = value;
+		const characterBefore = text.slice( start - 1, start );
+
+		// The character right before the caret must be a plain space.
+		if ( characterBefore !== ' ' ) {
+			return;
+		}
+
+		const trimmedTextBefore = text.slice( 0, start ).trim();
+		const prefixTransforms = getBlockTransforms( 'from' ).filter(
+			( { type } ) => type === 'prefix'
+		);
+		const transformation = findTransform(
+			prefixTransforms,
+			( { prefix } ) => {
+				return trimmedTextBefore === prefix;
+			}
+		);
+
+		if ( ! transformation ) {
+			return;
+		}
+
+		const content = toHTMLString( {
+			value: insert( value, START_OF_SELECTED_AREA, 0, start ),
+		} );
+		const block = transformation.transform( content );
+
+		selectionChange( ...findSelection( [ block ] ) );
+		onReplace( [ block ] );
+		registry.dispatch( blockEditorStore ).__unstableMarkAutomaticChange();
+
+		return true;
+	}
+
+	function onInput( event ) {
+		const { inputType, type } = event;
+		const {
+			getValue,
+			onChange,
+			__unstableAllowPrefixTransformations,
+			formatTypes,
+			registry,
+		} = props.current;
+
+		// Only run input rules when inserting text.
+		if ( inputType !== 'insertText' && type !== 'compositionend' ) {
+			return;
+		}
+
+		if ( __unstableAllowPrefixTransformations && inputRule() ) {
+			return;
+		}
+
+		const value = getValue();
+		const transformed = formatTypes.reduce(
+			( accumlator, { __unstableInputRule } ) => {
+				if ( __unstableInputRule ) {
+					accumlator = __unstableInputRule( accumlator );
+				}
+
+				return accumlator;
+			},
+			preventEventDiscovery( value )
+		);
+
+		const {
+			__unstableMarkLastChangeAsPersistent,
+			__unstableMarkAutomaticChange,
+		} = registry.dispatch( blockEditorStore );
+
+		if ( transformed !== value ) {
+			__unstableMarkLastChangeAsPersistent();
+			onChange( {
+				...transformed,
+				activeFormats: value.activeFormats,
+			} );
+			__unstableMarkAutomaticChange();
+		}
+	}
+
+	element.addEventListener( 'input', onInput );
+	element.addEventListener( 'compositionend', onInput );
+	return () => {
+		element.removeEventListener( 'input', onInput );
+		element.removeEventListener( 'compositionend', onInput );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/insert-replacement-text.js b/packages/block-editor/src/components/rich-text/event-listeners/insert-replacement-text.js
new file mode 100644
index 00000000000000..78b862eb4ac9e0
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/insert-replacement-text.js
@@ -0,0 +1,28 @@
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../../store';
+
+/**
+ * When the browser is about to auto correct, add an undo level so the user can
+ * revert the change.
+ *
+ * @param {Object} props
+ */
+export default ( props ) => ( element ) => {
+	function onInput( event ) {
+		if ( event.inputType !== 'insertReplacementText' ) {
+			return;
+		}
+
+		const { registry } = props.current;
+		registry
+			.dispatch( blockEditorStore )
+			.__unstableMarkLastChangeAsPersistent();
+	}
+
+	element.addEventListener( 'beforeinput', onInput );
+	return () => {
+		element.removeEventListener( 'beforeinput', onInput );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/paste-handler.js b/packages/block-editor/src/components/rich-text/event-listeners/paste-handler.js
new file mode 100644
index 00000000000000..ef1833bda88e63
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/paste-handler.js
@@ -0,0 +1,132 @@
+/**
+ * WordPress dependencies
+ */
+import { pasteHandler } from '@wordpress/blocks';
+import { isEmpty, insert, create } from '@wordpress/rich-text';
+import { isURL } from '@wordpress/url';
+
+/**
+ * Internal dependencies
+ */
+import { addActiveFormats } from '../utils';
+import { getPasteEventData } from '../../../utils/pasting';
+
+/** @typedef {import('@wordpress/rich-text').RichTextValue} RichTextValue */
+
+export default ( props ) => ( element ) => {
+	function _onPaste( event ) {
+		const {
+			disableFormats,
+			onChange,
+			value,
+			formatTypes,
+			tagName,
+			onReplace,
+			__unstableEmbedURLOnPaste,
+			preserveWhiteSpace,
+			pastePlainText,
+		} = props.current;
+
+		// The event listener is attached to the window, so we need to check if
+		// the target is the element or inside the element.
+		if ( ! element.contains( event.target ) ) {
+			return;
+		}
+
+		if ( event.defaultPrevented ) {
+			return;
+		}
+
+		const { plainText, html } = getPasteEventData( event );
+
+		event.preventDefault();
+
+		// Allows us to ask for this information when we get a report.
+		window.console.log( 'Received HTML:\n\n', html );
+		window.console.log( 'Received plain text:\n\n', plainText );
+
+		if ( disableFormats ) {
+			onChange( insert( value, plainText ) );
+			return;
+		}
+
+		const isInternal =
+			event.clipboardData.getData( 'rich-text' ) === 'true';
+
+		function pasteInline( content ) {
+			const transformed = formatTypes.reduce(
+				( accumulator, { __unstablePasteRule } ) => {
+					// Only allow one transform.
+					if ( __unstablePasteRule && accumulator === value ) {
+						accumulator = __unstablePasteRule( value, {
+							html,
+							plainText,
+						} );
+					}
+
+					return accumulator;
+				},
+				value
+			);
+			if ( transformed !== value ) {
+				onChange( transformed );
+			} else {
+				const valueToInsert = create( { html: content } );
+				addActiveFormats( valueToInsert, value.activeFormats );
+				onChange( insert( value, valueToInsert ) );
+			}
+		}
+
+		// If the data comes from a rich text instance, we can directly use it
+		// without filtering the data. The filters are only meant for externally
+		// pasted content and remove inline styles.
+		if ( isInternal ) {
+			pasteInline( html );
+			return;
+		}
+
+		if ( pastePlainText ) {
+			onChange( insert( value, create( { text: plainText } ) ) );
+			return;
+		}
+
+		let mode = 'INLINE';
+
+		const trimmedPlainText = plainText.trim();
+
+		if (
+			__unstableEmbedURLOnPaste &&
+			isEmpty( value ) &&
+			isURL( trimmedPlainText ) &&
+			// For the link pasting feature, allow only http(s) protocols.
+			/^https?:/.test( trimmedPlainText )
+		) {
+			mode = 'BLOCKS';
+		}
+
+		const content = pasteHandler( {
+			HTML: html,
+			plainText,
+			mode,
+			tagName,
+			preserveWhiteSpace,
+		} );
+
+		if ( typeof content === 'string' ) {
+			pasteInline( content );
+		} else if ( content.length > 0 ) {
+			if ( onReplace && isEmpty( value ) ) {
+				onReplace( content, content.length - 1, -1 );
+			}
+		}
+	}
+
+	const { defaultView } = element.ownerDocument;
+
+	// Attach the listener to the window so parent elements have the chance to
+	// prevent the default behavior.
+	defaultView.addEventListener( 'paste', _onPaste );
+	return () => {
+		defaultView.removeEventListener( 'paste', _onPaste );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/remove-browser-shortcuts.js b/packages/block-editor/src/components/rich-text/event-listeners/remove-browser-shortcuts.js
new file mode 100644
index 00000000000000..7a057022dd2a82
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/remove-browser-shortcuts.js
@@ -0,0 +1,24 @@
+/**
+ * WordPress dependencies
+ */
+import { isKeyboardEvent } from '@wordpress/keycodes';
+
+/**
+ * Hook to prevent default behaviors for key combinations otherwise handled
+ * internally by RichText.
+ */
+export default () => ( node ) => {
+	function onKeydown( event ) {
+		if (
+			isKeyboardEvent.primary( event, 'z' ) ||
+			isKeyboardEvent.primary( event, 'y' ) ||
+			isKeyboardEvent.primaryShift( event, 'z' )
+		) {
+			event.preventDefault();
+		}
+	}
+	node.addEventListener( 'keydown', onKeydown );
+	return () => {
+		node.removeEventListener( 'keydown', onKeydown );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/shortcuts.js b/packages/block-editor/src/components/rich-text/event-listeners/shortcuts.js
new file mode 100644
index 00000000000000..bb51a729588151
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/shortcuts.js
@@ -0,0 +1,13 @@
+export default ( props ) => ( element ) => {
+	const { keyboardShortcuts } = props.current;
+	function onKeyDown( event ) {
+		for ( const keyboardShortcut of keyboardShortcuts.current ) {
+			keyboardShortcut( event );
+		}
+	}
+
+	element.addEventListener( 'keydown', onKeyDown );
+	return () => {
+		element.removeEventListener( 'keydown', onKeyDown );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/event-listeners/undo-automatic-change.js b/packages/block-editor/src/components/rich-text/event-listeners/undo-automatic-change.js
new file mode 100644
index 00000000000000..6bcfd0822f7fe1
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/event-listeners/undo-automatic-change.js
@@ -0,0 +1,45 @@
+/**
+ * WordPress dependencies
+ */
+import { BACKSPACE, ESCAPE } from '@wordpress/keycodes';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../../store';
+
+export default ( props ) => ( element ) => {
+	function onKeyDown( event ) {
+		const { keyCode } = event;
+
+		if ( event.defaultPrevented ) {
+			return;
+		}
+
+		if ( keyCode !== BACKSPACE && keyCode !== ESCAPE ) {
+			return;
+		}
+
+		const { registry } = props.current;
+		const { didAutomaticChange, getSettings } =
+			registry.select( blockEditorStore );
+
+		const { __experimentalUndo } = getSettings();
+
+		if ( ! __experimentalUndo ) {
+			return;
+		}
+
+		if ( ! didAutomaticChange() ) {
+			return;
+		}
+
+		event.preventDefault();
+		__experimentalUndo();
+	}
+
+	element.addEventListener( 'keydown', onKeyDown );
+	return () => {
+		element.removeEventListener( 'keydown', onKeyDown );
+	};
+};
diff --git a/packages/block-editor/src/components/rich-text/format-toolbar-container.js b/packages/block-editor/src/components/rich-text/format-toolbar-container.js
index ffefcd1e302a84..ae98cacaf82cce 100644
--- a/packages/block-editor/src/components/rich-text/format-toolbar-container.js
+++ b/packages/block-editor/src/components/rich-text/format-toolbar-container.js
@@ -3,13 +3,6 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Popover, ToolbarGroup } from '@wordpress/components';
-import { useSelect } from '@wordpress/data';
-import {
-	isCollapsed,
-	getActiveFormats,
-	useAnchor,
-	store as richTextStore,
-} from '@wordpress/rich-text';
 
 /**
  * Internal dependencies
@@ -17,22 +10,6 @@ import {
 import BlockControls from '../block-controls';
 import FormatToolbar from './format-toolbar';
 import NavigableToolbar from '../navigable-toolbar';
-import { store as blockEditorStore } from '../../store';
-
-function InlineSelectionToolbar( { editableContentElement, activeFormats } ) {
-	const lastFormat = activeFormats[ activeFormats.length - 1 ];
-	const lastFormatType = lastFormat?.type;
-	const settings = useSelect(
-		( select ) => select( richTextStore ).getFormatType( lastFormatType ),
-		[ lastFormatType ]
-	);
-	const popoverAnchor = useAnchor( {
-		editableContentElement,
-		settings,
-	} );
-
-	return <InlineToolbar popoverAnchor={ popoverAnchor } />;
-}
 
 function InlineToolbar( { popoverAnchor } ) {
 	return (
@@ -56,35 +33,11 @@ function InlineToolbar( { popoverAnchor } ) {
 	);
 }
 
-const FormatToolbarContainer = ( {
-	inline,
-	editableContentElement,
-	value,
-} ) => {
-	const hasInlineToolbar = useSelect(
-		( select ) => select( blockEditorStore ).getSettings().hasInlineToolbar,
-		[]
-	);
-
+const FormatToolbarContainer = ( { inline, editableContentElement } ) => {
 	if ( inline ) {
 		return <InlineToolbar popoverAnchor={ editableContentElement } />;
 	}
 
-	if ( hasInlineToolbar ) {
-		const activeFormats = getActiveFormats( value );
-
-		if ( isCollapsed( value ) && ! activeFormats.length ) {
-			return null;
-		}
-
-		return (
-			<InlineSelectionToolbar
-				editableContentElement={ editableContentElement }
-				activeFormats={ activeFormats }
-			/>
-		);
-	}
-
 	// Render regular toolbar.
 	return (
 		<BlockControls group="inline">
diff --git a/packages/block-editor/src/components/rich-text/format-toolbar/index.js b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
index 2a8a7a753211f8..811164b0751c5f 100644
--- a/packages/block-editor/src/components/rich-text/format-toolbar/index.js
+++ b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -48,11 +48,11 @@ const FormatToolbar = () => {
 									label={ __( 'More' ) }
 									toggleProps={ {
 										...toggleProps,
-										className: classnames(
+										className: clsx(
 											toggleProps.className,
 											{ 'is-pressed': hasActive }
 										),
-										describedBy: __(
+										description: __(
 											'Displays more block tools'
 										),
 									} }
diff --git a/packages/block-editor/src/components/rich-text/get-rich-text-values.js b/packages/block-editor/src/components/rich-text/get-rich-text-values.js
index bd1c62ea5e6f61..ee2bc638269308 100644
--- a/packages/block-editor/src/components/rich-text/get-rich-text-values.js
+++ b/packages/block-editor/src/components/rich-text/get-rich-text-values.js
@@ -6,6 +6,7 @@ import {
 	getSaveElement,
 	__unstableGetBlockProps as getBlockProps,
 } from '@wordpress/blocks';
+import { RichTextData } from '@wordpress/rich-text';
 
 /**
  * Internal dependencies
@@ -95,5 +96,9 @@ export function getRichTextValues( blocks = [] ) {
 	const values = [];
 	addValuesForBlocks( values, blocks );
 	getBlockProps.skipFilters = false;
-	return values;
+	return values.map( ( value ) =>
+		value instanceof RichTextData
+			? value
+			: RichTextData.fromHTMLString( value )
+	);
 }
diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
index 1a6793ca9efe73..8a5d99a7eb9f0a 100644
--- a/packages/block-editor/src/components/rich-text/index.js
+++ b/packages/block-editor/src/components/rich-text/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,46 +11,42 @@ import {
 	useCallback,
 	forwardRef,
 	createContext,
+	useContext,
 } from '@wordpress/element';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { children as childrenSource } from '@wordpress/blocks';
-import { useInstanceId, useMergeRefs } from '@wordpress/compose';
+import { useDispatch, useRegistry, useSelect } from '@wordpress/data';
+import { useMergeRefs, useInstanceId } from '@wordpress/compose';
 import {
 	__unstableUseRichText as useRichText,
-	__unstableCreateElement,
 	removeFormat,
 } from '@wordpress/rich-text';
-import deprecated from '@wordpress/deprecated';
 import { Popover } from '@wordpress/components';
+import { getBlockBindingsSource } from '@wordpress/blocks';
+import deprecated from '@wordpress/deprecated';
+import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { useBlockEditorAutocompleteProps } from '../autocomplete';
 import { useBlockEditContext } from '../block-edit';
+import { blockBindingsKey, isPreviewModeKey } from '../block-edit/context';
 import FormatToolbarContainer from './format-toolbar-container';
 import { store as blockEditorStore } from '../../store';
-import { useUndoAutomaticChange } from './use-undo-automatic-change';
 import { useMarkPersistent } from './use-mark-persistent';
-import { usePasteHandler } from './use-paste-handler';
-import { useBeforeInputRules } from './use-before-input-rules';
-import { useInputRules } from './use-input-rules';
-import { useDelete } from './use-delete';
-import { useEnter } from './use-enter';
 import { useFormatTypes } from './use-format-types';
-import { useRemoveBrowserShortcuts } from './use-remove-browser-shortcuts';
-import { useShortcuts } from './use-shortcuts';
-import { useInputEvents } from './use-input-events';
-import { useInsertReplacementText } from './use-insert-replacement-text';
-import { useFirefoxCompat } from './use-firefox-compat';
+import { useEventListeners } from './event-listeners';
 import FormatEdit from './format-edit';
 import { getAllowedFormats } from './utils';
-import { Content } from './content';
-import RichTextMultiline from './multiline';
+import { Content, valueToHTMLString } from './content';
+import { withDeprecations } from './with-deprecations';
+import { canBindBlock } from '../../hooks/use-bindings-attributes';
+import BlockContext from '../block-context';
 
 export const keyboardShortcutContext = createContext();
 export const inputEventContext = createContext();
 
+const instanceIdKey = Symbol( 'instanceId' );
+
 /**
  * Removes props used for the native version of RichText so that they are not
  * passed to the DOM element and log warnings.
@@ -74,7 +70,6 @@ function removeNativeProps( props ) {
 		fontStyle,
 		minWidth,
 		maxWidth,
-		setRef,
 		disableSuggestions,
 		disableAutocorrection,
 		...restProps
@@ -109,15 +104,34 @@ export function RichTextWrapper(
 		__unstableDisableFormats: disableFormats,
 		disableLineBreaks,
 		__unstableAllowPrefixTransformations,
+		readOnly,
 		...props
 	},
 	forwardedRef
 ) {
 	props = removeNativeProps( props );
 
+	if ( onSplit ) {
+		deprecated( 'wp.blockEditor.RichText onSplit prop', {
+			since: '6.4',
+			alternative: 'block.json support key: "splitting"',
+		} );
+	}
+
+	const instanceId = useInstanceId( RichTextWrapper );
 	const anchorRef = useRef();
-	const { clientId } = useBlockEditContext();
+	const context = useBlockEditContext();
+	const { clientId, isSelected: isBlockSelected, name: blockName } = context;
+	const blockBindings = context[ blockBindingsKey ];
+	const blockContext = useContext( BlockContext );
+	const registry = useRegistry();
 	const selector = ( select ) => {
+		// Avoid subscribing to the block editor store if the block is not
+		// selected.
+		if ( ! isBlockSelected ) {
+			return { isSelected: false };
+		}
+
 		const { getSelectionStart, getSelectionEnd } =
 			select( blockEditorStore );
 		const selectionStart = getSelectionStart();
@@ -129,7 +143,9 @@ export function RichTextWrapper(
 			isSelected =
 				selectionStart.clientId === clientId &&
 				selectionEnd.clientId === clientId &&
-				selectionStart.attributeKey === identifier;
+				( identifier
+					? selectionStart.attributeKey === identifier
+					: selectionStart[ instanceIdKey ] === instanceId );
 		} else if ( originalIsSelected ) {
 			isSelected = selectionStart.clientId === clientId;
 		}
@@ -140,10 +156,88 @@ export function RichTextWrapper(
 			isSelected,
 		};
 	};
-	// This selector must run on every render so the right selection state is
-	// retrieved from the store on merge.
-	// To do: fix this somehow.
-	const { selectionStart, selectionEnd, isSelected } = useSelect( selector );
+	const { selectionStart, selectionEnd, isSelected } = useSelect( selector, [
+		clientId,
+		identifier,
+		instanceId,
+		originalIsSelected,
+		isBlockSelected,
+	] );
+
+	const { disableBoundBlock, bindingsPlaceholder, bindingsLabel } = useSelect(
+		( select ) => {
+			if (
+				! blockBindings?.[ identifier ] ||
+				! canBindBlock( blockName )
+			) {
+				return {};
+			}
+
+			const relatedBinding = blockBindings[ identifier ];
+			const blockBindingsSource = getBlockBindingsSource(
+				relatedBinding.source
+			);
+			const blockBindingsContext = {};
+			if ( blockBindingsSource?.usesContext?.length ) {
+				for ( const key of blockBindingsSource.usesContext ) {
+					blockBindingsContext[ key ] = blockContext[ key ];
+				}
+			}
+
+			const _disableBoundBlock =
+				! blockBindingsSource?.canUserEditValue?.( {
+					select,
+					context: blockBindingsContext,
+					args: relatedBinding.args,
+				} );
+
+			// Don't modify placeholders if value is not empty.
+			if ( adjustedValue.length > 0 ) {
+				return {
+					disableBoundBlock: _disableBoundBlock,
+					// Null values will make them fall back to the default behavior.
+					bindingsPlaceholder: null,
+					bindingsLabel: null,
+				};
+			}
+
+			const { getBlockAttributes } = select( blockEditorStore );
+			const blockAttributes = getBlockAttributes( clientId );
+			const fieldsList = blockBindingsSource?.getFieldsList?.( {
+				select,
+				context: blockBindingsContext,
+			} );
+			const bindingKey =
+				fieldsList?.[ relatedBinding?.args?.key ]?.label ??
+				blockBindingsSource?.label;
+
+			const _bindingsPlaceholder = _disableBoundBlock
+				? bindingKey
+				: sprintf(
+						/* translators: %s: connected field label or source label */
+						__( 'Add %s' ),
+						bindingKey
+				  );
+			const _bindingsLabel = _disableBoundBlock
+				? relatedBinding?.args?.key || blockBindingsSource?.label
+				: sprintf(
+						/* translators: %s: source label or key */
+						__( 'Empty %s; start writing to edit its value' ),
+						relatedBinding?.args?.key || blockBindingsSource?.label
+				  );
+
+			return {
+				disableBoundBlock: _disableBoundBlock,
+				bindingsPlaceholder:
+					blockAttributes?.placeholder || _bindingsPlaceholder,
+				bindingsLabel: _bindingsLabel,
+			};
+		},
+		[ blockBindings, identifier, blockName, blockContext, adjustedValue ]
+	);
+
+	const shouldDisableEditing = readOnly || disableBoundBlock;
+
 	const { getSelectionStart, getSelectionEnd, getBlockRootClientId } =
 		useSelect( blockEditorStore );
 	const { selectionChange } = useDispatch( blockEditorStore );
@@ -159,6 +253,13 @@ export function RichTextWrapper(
 			const selection = {};
 			const unset = start === undefined && end === undefined;
 
+			const baseSelection = {
+				clientId,
+				[ identifier ? 'attributeKey' : instanceIdKey ]: identifier
+					? identifier
+					: instanceId,
+			};
+
 			if ( typeof start === 'number' || unset ) {
 				// If we are only setting the start (or the end below), which
 				// means a partial selection, and we're not updating a selection
@@ -173,8 +274,7 @@ export function RichTextWrapper(
 				}
 
 				selection.start = {
-					clientId,
-					attributeKey: identifier,
+					...baseSelection,
 					offset: start,
 				};
 			}
@@ -189,15 +289,22 @@ export function RichTextWrapper(
 				}
 
 				selection.end = {
-					clientId,
-					attributeKey: identifier,
+					...baseSelection,
 					offset: end,
 				};
 			}
 
 			selectionChange( selection );
 		},
-		[ clientId, identifier ]
+		[
+			clientId,
+			getBlockRootClientId,
+			getSelectionEnd,
+			getSelectionStart,
+			identifier,
+			instanceId,
+			selectionChange,
+		]
 	);
 
 	const {
@@ -259,7 +366,7 @@ export function RichTextWrapper(
 		selectionStart,
 		selectionEnd,
 		onSelectionChange,
-		placeholder,
+		placeholder: bindingsPlaceholder || placeholder,
 		__unstableIsSelected: isSelected,
 		__unstableDisableFormats: disableFormats,
 		preserveWhiteSpace,
@@ -309,68 +416,55 @@ export function RichTextWrapper(
 				<FormatToolbarContainer
 					inline={ inlineToolbar }
 					editableContentElement={ anchorRef.current }
-					value={ value }
 				/>
 			) }
 			<TagName
 				// Overridable props.
 				role="textbox"
 				aria-multiline={ ! disableLineBreaks }
-				aria-label={ placeholder }
+				aria-readonly={ shouldDisableEditing }
 				{ ...props }
+				aria-label={
+					bindingsLabel || props[ 'aria-label' ] || placeholder
+				}
 				{ ...autocompleteProps }
 				ref={ useMergeRefs( [
+					// Rich text ref must be first because its focus listener
+					// must be set up before any other ref calls .focus() on
+					// mount.
+					richTextRef,
 					forwardedRef,
 					autocompleteProps.ref,
 					props.ref,
-					richTextRef,
-					useBeforeInputRules( { value, onChange } ),
-					useInputRules( {
+					useEventListeners( {
+						registry,
 						getValue,
 						onChange,
 						__unstableAllowPrefixTransformations,
 						formatTypes,
 						onReplace,
 						selectionChange,
-					} ),
-					useInsertReplacementText(),
-					useRemoveBrowserShortcuts(),
-					useShortcuts( keyboardShortcuts ),
-					useInputEvents( inputEvents ),
-					useUndoAutomaticChange(),
-					usePasteHandler( {
 						isSelected,
 						disableFormats,
-						onChange,
 						value,
-						formatTypes,
 						tagName,
-						onReplace,
 						onSplit,
 						__unstableEmbedURLOnPaste,
 						pastePlainText,
-					} ),
-					useDelete( {
-						value,
 						onMerge,
 						onRemove,
-					} ),
-					useEnter( {
 						removeEditorOnlyFormats,
-						value,
-						onReplace,
-						onSplit,
-						onChange,
 						disableLineBreaks,
 						onSplitAtEnd,
 						onSplitAtDoubleLineEnd,
+						keyboardShortcuts,
+						inputEvents,
 					} ),
-					useFirefoxCompat(),
 					anchorRef,
 				] ) }
-				contentEditable={ true }
-				suppressContentEditableWarning={ true }
-				className={ classnames(
+				contentEditable={ ! shouldDisableEditing }
+				suppressContentEditableWarning
+				className={ clsx(
 					'block-editor-rich-text__editable',
 					props.className,
 					'rich-text'
@@ -381,63 +475,87 @@ export function RichTextWrapper(
 				// select blocks when Shift Clicking into an element with
 				// tabIndex because Safari will focus the element. However,
 				// Safari will correctly ignore nested contentEditable elements.
-				tabIndex={ props.tabIndex === 0 ? null : props.tabIndex }
+				tabIndex={
+					props.tabIndex === 0 && ! shouldDisableEditing
+						? null
+						: props.tabIndex
+				}
+				data-wp-block-attribute-key={ identifier }
 			/>
 		</>
 	);
 }
 
-const ForwardedRichTextWrapper = forwardRef( RichTextWrapper );
-
-function RichTextSwitcher( props, ref ) {
-	let value = props.value;
-	let onChange = props.onChange;
+// This is the private API for the RichText component.
+// It allows access to all props, not just the public ones.
+export const PrivateRichText = withDeprecations(
+	forwardRef( RichTextWrapper )
+);
 
-	// Handle deprecated format.
-	if ( Array.isArray( value ) ) {
-		deprecated( 'wp.blockEditor.RichText value prop as children type', {
-			since: '6.1',
-			version: '6.3',
-			alternative: 'value prop as string',
-			link: 'https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields/',
-		} );
+PrivateRichText.Content = Content;
+PrivateRichText.isEmpty = ( value ) => {
+	return ! value || value.length === 0;
+};
 
-		value = childrenSource.toHTML( props.value );
-		onChange = ( newValue ) =>
-			props.onChange(
-				childrenSource.fromDOM(
-					__unstableCreateElement( document, newValue ).childNodes
-				)
-			);
+// This is the public API for the RichText component.
+// We wrap the PrivateRichText component to hide some props from the public API.
+/**
+ * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/rich-text/README.md
+ */
+const PublicForwardedRichTextContainer = forwardRef( ( props, ref ) => {
+	const context = useBlockEditContext();
+	const isPreviewMode = context[ isPreviewModeKey ];
+
+	if ( isPreviewMode ) {
+		// Remove all non-content props.
+		const {
+			children,
+			tagName: Tag = 'div',
+			value,
+			onChange,
+			isSelected,
+			multiline,
+			inlineToolbar,
+			wrapperClassName,
+			autocompleters,
+			onReplace,
+			placeholder,
+			allowedFormats,
+			withoutInteractiveFormatting,
+			onRemove,
+			onMerge,
+			onSplit,
+			__unstableOnSplitAtEnd,
+			__unstableOnSplitAtDoubleLineEnd,
+			identifier,
+			preserveWhiteSpace,
+			__unstablePastePlainText,
+			__unstableEmbedURLOnPaste,
+			__unstableDisableFormats,
+			disableLineBreaks,
+			__unstableAllowPrefixTransformations,
+			readOnly,
+			...contentProps
+		} = removeNativeProps( props );
+		return (
+			<Tag
+				{ ...contentProps }
+				dangerouslySetInnerHTML={ {
+					__html: valueToHTMLString( value, multiline ),
+				} }
+			/>
+		);
 	}
 
-	const Component = props.multiline
-		? RichTextMultiline
-		: ForwardedRichTextWrapper;
-	const instanceId = useInstanceId( RichTextSwitcher );
+	return <PrivateRichText ref={ ref } { ...props } readOnly={ false } />;
+} );
 
-	return (
-		<Component
-			{ ...props }
-			identifier={ props.identifier || instanceId }
-			value={ value }
-			onChange={ onChange }
-			ref={ ref }
-		/>
-	);
-}
-
-const ForwardedRichTextContainer = forwardRef( RichTextSwitcher );
-
-ForwardedRichTextContainer.Content = Content;
-ForwardedRichTextContainer.isEmpty = ( value ) => {
+PublicForwardedRichTextContainer.Content = Content;
+PublicForwardedRichTextContainer.isEmpty = ( value ) => {
 	return ! value || value.length === 0;
 };
 
-/**
- * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/rich-text/README.md
- */
-export default ForwardedRichTextContainer;
+export default PublicForwardedRichTextContainer;
 export { RichTextShortcut } from './shortcut';
 export { RichTextToolbarButton } from './toolbar-button';
 export { __unstableRichTextInputEvent } from './input-event';
diff --git a/packages/block-editor/src/components/rich-text/index.native.js b/packages/block-editor/src/components/rich-text/index.native.js
index 9427962eced198..687c2759c05de2 100644
--- a/packages/block-editor/src/components/rich-text/index.native.js
+++ b/packages/block-editor/src/components/rich-text/index.native.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -24,7 +24,6 @@ import {
 	create,
 	split,
 	toHTMLString,
-	slice,
 } from '@wordpress/rich-text';
 import { isURL } from '@wordpress/url';
 
@@ -39,17 +38,19 @@ import FormatToolbarContainer from './format-toolbar-container';
 import { store as blockEditorStore } from '../../store';
 import {
 	addActiveFormats,
-	getMultilineTag,
 	getAllowedFormats,
 	createLinkInParagraph,
 } from './utils';
 import EmbedHandlerPicker from './embed-handler-picker';
 import { Content } from './content';
 import RichText from './native';
+import { withDeprecations } from './with-deprecations';
+import { findSelection } from './event-listeners/input-rules';
+import { START_OF_SELECTED_AREA } from '../../utils/selection';
 
 const classes = 'block-editor-rich-text__editable';
 
-function RichTextWrapper(
+export function RichTextWrapper(
 	{
 		children,
 		tagName,
@@ -58,7 +59,6 @@ function RichTextWrapper(
 		value: originalValue,
 		onChange: originalOnChange,
 		isSelected: originalIsSelected,
-		multiline,
 		inlineToolbar,
 		wrapperClassName,
 		autocompleters,
@@ -80,8 +80,8 @@ function RichTextWrapper(
 		disableLineBreaks,
 		unstableOnFocus,
 		__unstableAllowPrefixTransformations,
-		__unstableMultilineRootTag,
 		// Native props.
+		__unstableUseSplitSelection,
 		__unstableMobileNoFocusOnMount,
 		deleteEnter,
 		placeholderTextColor,
@@ -96,14 +96,13 @@ function RichTextWrapper(
 		minWidth,
 		maxWidth,
 		onBlur,
-		setRef,
 		disableSuggestions,
 		disableAutocorrection,
 		containerWidth,
 		onEnter: onCustomEnter,
 		...props
 	},
-	forwardedRef
+	providedRef
 ) {
 	const instanceId = useInstanceId( RichTextWrapper );
 
@@ -121,6 +120,7 @@ function RichTextWrapper(
 			getBlock,
 			isMultiSelecting,
 			hasMultiSelection,
+			getSelectedBlockClientId,
 		} = select( blockEditorStore );
 
 		const selectionStart = getSelectionStart();
@@ -157,6 +157,7 @@ function RichTextWrapper(
 			didAutomaticChange: didAutomaticChange(),
 			disabled: isMultiSelecting() || hasMultiSelection(),
 			undo,
+			getSelectedBlockClientId,
 			...extraProps,
 		};
 	};
@@ -167,6 +168,7 @@ function RichTextWrapper(
 		selectionStart,
 		selectionEnd,
 		isSelected,
+		getSelectedBlockClientId,
 		didAutomaticChange,
 		disabled,
 		undo,
@@ -178,8 +180,9 @@ function RichTextWrapper(
 		exitFormattedText,
 		selectionChange,
 		__unstableMarkAutomaticChange,
+		__unstableSplitSelection,
+		clearSelectedBlock,
 	} = useDispatch( blockEditorStore );
-	const multilineTag = getMultilineTag( multiline );
 	const adjustedAllowedFormats = getAllowedFormats( {
 		allowedFormats,
 		disableFormats,
@@ -209,10 +212,15 @@ function RichTextWrapper(
 				selectionChangeEnd
 			);
 		},
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[ clientId, identifier ]
 	);
 
+	const clearCurrentSelectionOnUnmount = useCallback( () => {
+		if ( getSelectedBlockClientId() === clientId ) {
+			clearSelectedBlock();
+		}
+	}, [ clearSelectedBlock, clientId, getSelectedBlockClientId ] );
+
 	const onDelete = useCallback(
 		( { value, isReverse } ) => {
 			if ( onMerge ) {
@@ -261,10 +269,7 @@ function RichTextWrapper(
 			if ( ! hasPastedBlocks || ! isEmpty( before ) ) {
 				blocks.push(
 					onSplit(
-						toHTMLString( {
-							value: before,
-							multilineTag,
-						} ),
+						toHTMLString( { value: before } ),
 						! isAfterOriginal
 					)
 				);
@@ -288,13 +293,7 @@ function RichTextWrapper(
 					: ! onSplitMiddle || ! isEmpty( after )
 			) {
 				blocks.push(
-					onSplit(
-						toHTMLString( {
-							value: after,
-							multilineTag,
-						} ),
-						isAfterOriginal
-					)
+					onSplit( toHTMLString( { value: after } ), isAfterOriginal )
 				);
 			}
 
@@ -308,7 +307,7 @@ function RichTextWrapper(
 
 			onReplace( blocks, indexToSelect, initialPosition );
 		},
-		[ onReplace, onSplit, multilineTag, onSplitMiddle ]
+		[ onReplace, onSplit, onSplitMiddle ]
 	);
 
 	const onEnter = useCallback(
@@ -328,6 +327,7 @@ function RichTextWrapper(
 						transformation.transform( { content: value.text } ),
 					] );
 					__unstableMarkAutomaticChange();
+					return;
 				}
 			}
 
@@ -347,6 +347,8 @@ function RichTextWrapper(
 				}
 			} else if ( canSplit ) {
 				splitValue( value );
+			} else if ( __unstableUseSplitSelection ) {
+				__unstableSplitSelection();
 			} else if ( canSplitAtEnd ) {
 				onSplitAtEnd();
 			} else if (
@@ -365,12 +367,10 @@ function RichTextWrapper(
 				onChange( insert( value, '\n' ) );
 			}
 		},
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[
 			onReplace,
 			onSplit,
 			__unstableMarkAutomaticChange,
-			multiline,
 			splitValue,
 			onSplitAtEnd,
 		]
@@ -392,9 +392,6 @@ function RichTextWrapper(
 			if ( isInternal ) {
 				const pastedValue = create( {
 					html,
-					multilineTag,
-					multilineWrapperTags:
-						multilineTag === 'li' ? [ 'ul', 'ol' ] : undefined,
 					preserveWhiteSpace,
 				} );
 				addActiveFormats( pastedValue, activeFormats );
@@ -478,7 +475,9 @@ function RichTextWrapper(
 						}
 						return;
 					}
-					onReplace( content, content.length - 1, -1 );
+					onReplace( content, content.length - 1, -1, {
+						source: 'clipboard',
+					} );
 				} else {
 					if ( canPasteEmbed ) {
 						onChange(
@@ -496,14 +495,13 @@ function RichTextWrapper(
 			onSplit,
 			splitValue,
 			__unstableEmbedURLOnPaste,
-			multilineTag,
 			preserveWhiteSpace,
 			pastePlainText,
 		]
 	);
 
 	const inputRule = useCallback(
-		( value, valueToFormat ) => {
+		( value ) => {
 			if ( ! onReplace ) {
 				return;
 			}
@@ -519,7 +517,7 @@ function RichTextWrapper(
 				return;
 			}
 
-			const trimmedTextBefore = text.slice( 0, startPosition ).trim();
+			const trimmedTextBefore = text.slice( 0, start ).trim();
 			const prefixTransforms = getBlockTransforms( 'from' ).filter(
 				( { type } ) => type === 'prefix'
 			);
@@ -534,24 +532,25 @@ function RichTextWrapper(
 				return;
 			}
 
-			const content = valueToFormat(
-				slice( value, startPosition, text.length )
-			);
+			const content = toHTMLString( {
+				value: insert( value, START_OF_SELECTED_AREA, 0, start ),
+			} );
 			const block = transformation.transform( content );
-
+			const currentSelection = findSelection( [ block ] );
 			onReplace( [ block ] );
+			selectionChange( ...currentSelection );
 			__unstableMarkAutomaticChange();
 		},
-		[ onReplace, __unstableMarkAutomaticChange ]
+		[ onReplace, start, selectionChange, __unstableMarkAutomaticChange ]
 	);
 
-	const mergedRef = useMergeRefs( [ forwardedRef, fallbackRef ] );
+	const mergedRef = useMergeRefs( [ providedRef, fallbackRef ] );
 
 	return (
 		<RichText
 			clientId={ clientId }
 			identifier={ identifier }
-			ref={ mergedRef }
+			nativeEditorRef={ mergedRef }
 			value={ adjustedValue }
 			onChange={ adjustedOnChange }
 			selectionStart={ selectionStart }
@@ -568,7 +567,6 @@ function RichTextWrapper(
 			onPaste={ onPaste }
 			__unstableIsSelected={ isSelected }
 			__unstableInputRule={ inputRule }
-			__unstableMultilineTag={ multilineTag }
 			__unstableOnEnterFormattedText={ enterFormattedText }
 			__unstableOnExitFormattedText={ exitFormattedText }
 			__unstableOnCreateUndoLevel={ __unstableMarkLastChangeAsPersistent }
@@ -582,7 +580,6 @@ function RichTextWrapper(
 			__unstableAllowPrefixTransformations={
 				__unstableAllowPrefixTransformations
 			}
-			__unstableMultilineRootTag={ __unstableMultilineRootTag }
 			// Native props.
 			blockIsSelected={
 				originalIsSelected !== undefined
@@ -604,10 +601,10 @@ function RichTextWrapper(
 			minWidth={ minWidth }
 			maxWidth={ maxWidth }
 			onBlur={ onBlur }
-			setRef={ setRef }
 			disableSuggestions={ disableSuggestions }
 			disableAutocorrection={ disableAutocorrection }
 			containerWidth={ containerWidth }
+			clearCurrentSelectionOnUnmount={ clearCurrentSelectionOnUnmount }
 			// Props to be set on the editable container are destructured on the
 			// element itself for web (see below), but passed through rich text
 			// for native.
@@ -651,7 +648,7 @@ function RichTextWrapper(
 										  }
 										: editableProps.style
 								}
-								className={ classnames(
+								className={ clsx(
 									classes,
 									props.className,
 									editableProps.className
@@ -675,25 +672,32 @@ function RichTextWrapper(
 	);
 }
 
-const ForwardedRichTextContainer = forwardRef( RichTextWrapper );
+// This export does not actually implement a private API, but was exported
+// under this name for interoperability with the web version of the RichText
+// component.
+export const PrivateRichText = withDeprecations(
+	forwardRef( RichTextWrapper )
+);
 
-ForwardedRichTextContainer.Content = Content;
+PrivateRichText.Content = Content;
 
-ForwardedRichTextContainer.isEmpty = ( value ) => {
+PrivateRichText.isEmpty = ( value ) => {
 	return ! value || value.length === 0;
 };
 
-ForwardedRichTextContainer.Content.defaultProps = {
+PrivateRichText.Content.defaultProps = {
 	format: 'string',
 	value: '',
 };
 
-ForwardedRichTextContainer.Raw = RichText;
+PrivateRichText.Raw = forwardRef( ( props, ref ) => (
+	<RichText { ...props } nativeEditorRef={ ref } />
+) );
 
 /**
  * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/rich-text/README.md
  */
-export default ForwardedRichTextContainer;
+export default PrivateRichText;
 export { RichTextShortcut } from './shortcut';
 export { RichTextToolbarButton } from './toolbar-button';
 export { __unstableRichTextInputEvent } from './input-event';
diff --git a/packages/block-editor/src/components/rich-text/multiline.js b/packages/block-editor/src/components/rich-text/multiline.js
index 760a7718fd864a..1fa77b25a4db9c 100644
--- a/packages/block-editor/src/components/rich-text/multiline.js
+++ b/packages/block-editor/src/components/rich-text/multiline.js
@@ -3,7 +3,9 @@
  */
 import { forwardRef } from '@wordpress/element';
 import deprecated from '@wordpress/deprecated';
-import { useDispatch } from '@wordpress/data';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { ENTER } from '@wordpress/keycodes';
+import { create, split, toHTMLString } from '@wordpress/rich-text';
 
 /**
  * Internal dependencies
@@ -33,6 +35,8 @@ function RichTextMultiline(
 	} );
 
 	const { clientId } = useBlockEditContext();
+	const { getSelectionStart, getSelectionEnd } =
+		useSelect( blockEditorStore );
 	const { selectionChange } = useDispatch( blockEditorStore );
 
 	const multilineTagName = getMultilineTag( multiline );
@@ -68,8 +72,32 @@ function RichTextMultiline(
 							_onChange( newValues );
 						} }
 						isSelected={ undefined }
-						onSplit={ ( v ) => v }
-						onReplace={ ( array ) => {
+						onKeyDown={ ( event ) => {
+							if ( event.keyCode !== ENTER ) {
+								return;
+							}
+
+							event.preventDefault();
+
+							const { offset: start } = getSelectionStart();
+							const { offset: end } = getSelectionEnd();
+
+							// Cannot split if there is no selection.
+							if (
+								typeof start !== 'number' ||
+								typeof end !== 'number'
+							) {
+								return;
+							}
+
+							const richTextValue = create( { html: _value } );
+							richTextValue.start = start;
+							richTextValue.end = end;
+
+							const array = split( richTextValue ).map( ( v ) =>
+								toHTMLString( { value: v } )
+							);
+
 							const newValues = values.slice();
 							newValues.splice( index, 1, ...array );
 							_onChange( newValues );
@@ -84,7 +112,9 @@ function RichTextMultiline(
 							const newValues = values.slice();
 							let offset = 0;
 							if ( forward ) {
-								if ( ! newValues[ index + 1 ] ) return;
+								if ( ! newValues[ index + 1 ] ) {
+									return;
+								}
 								newValues.splice(
 									index,
 									2,
@@ -92,7 +122,9 @@ function RichTextMultiline(
 								);
 								offset = newValues[ index ].length - 1;
 							} else {
-								if ( ! newValues[ index - 1 ] ) return;
+								if ( ! newValues[ index - 1 ] ) {
+									return;
+								}
 								newValues.splice(
 									index - 1,
 									2,
diff --git a/packages/block-editor/src/components/rich-text/native/get-format-colors.native.js b/packages/block-editor/src/components/rich-text/native/get-format-colors.native.js
index b68186246523f9..bd3c9171c8c73f 100644
--- a/packages/block-editor/src/components/rich-text/native/get-format-colors.native.js
+++ b/packages/block-editor/src/components/rich-text/native/get-format-colors.native.js
@@ -27,7 +27,7 @@ export function getFormatColors( formats, colors ) {
 						);
 						const currentStyles = currentFormat?.attributes?.style;
 						if (
-							colorObject &&
+							colorObject?.color &&
 							( ! currentStyles ||
 								currentStyles?.indexOf( colorObject.color ) ===
 									-1 )
diff --git a/packages/block-editor/src/components/rich-text/native/index.native.js b/packages/block-editor/src/components/rich-text/native/index.native.js
index 951d52ece6d694..f30a56fd1268ce 100644
--- a/packages/block-editor/src/components/rich-text/native/index.native.js
+++ b/packages/block-editor/src/components/rich-text/native/index.native.js
@@ -15,7 +15,8 @@ import {
 	showUserSuggestions,
 	showXpostSuggestions,
 } from '@wordpress/react-native-bridge';
-import { BlockFormatControls, getPxFromCssUnit } from '@wordpress/block-editor';
+import { BlockFormatControls } from '@wordpress/block-editor';
+import { getPxFromCssUnit } from '@wordpress/components';
 import { Component } from '@wordpress/element';
 import {
 	compose,
@@ -51,10 +52,6 @@ import { getFormatColors } from './get-format-colors';
 import styles from './style.scss';
 import ToolbarButtonWithOptions from './toolbar-button-with-options';
 
-const unescapeSpaces = ( text ) => {
-	return text.replace( /&nbsp;|&#160;/gi, ' ' );
-};
-
 // The flattened color palettes array is memoized to ensure that the same array instance is
 // returned for the colors palettes. This value might be used as a prop, so having the same
 // instance will prevent unnecessary re-renders of the RichText component.
@@ -105,27 +102,11 @@ const DEFAULT_FONT_SIZE = 16;
 const MIN_LINE_HEIGHT = 1;
 
 export class RichText extends Component {
-	constructor( {
-		value,
-		selectionStart,
-		selectionEnd,
-		__unstableMultilineTag: multiline,
-	} ) {
+	constructor( { value, selectionStart, selectionEnd } ) {
 		super( ...arguments );
 
-		this.isMultiline = false;
-		if ( multiline === true || multiline === 'p' || multiline === 'li' ) {
-			this.multilineTag = multiline === true ? 'p' : multiline;
-			this.isMultiline = true;
-		}
-
-		if ( this.multilineTag === 'li' ) {
-			this.multilineWrapperTags = [ 'ul', 'ol' ];
-		}
-
 		this.isIOS = Platform.OS === 'ios';
 		this.createRecord = this.createRecord.bind( this );
-		this.restoreParagraphTags = this.restoreParagraphTags.bind( this );
 		this.onChangeFromAztec = this.onChangeFromAztec.bind( this );
 		this.onKeyDown = this.onKeyDown.bind( this );
 		this.handleEnter = this.handleEnter.bind( this );
@@ -223,8 +204,6 @@ export class RichText extends Component {
 			...create( {
 				html: this.value,
 				range: null,
-				multilineTag: this.multilineTag,
-				multilineWrapperTags: this.multilineWrapperTags,
 				preserveWhiteSpace,
 			} ),
 		};
@@ -235,12 +214,7 @@ export class RichText extends Component {
 
 	valueToFormat( value ) {
 		// Remove the outer root tags.
-		return this.removeRootTagsProducedByAztec(
-			toHTMLString( {
-				value,
-				multilineTag: this.multilineTag,
-			} )
-		);
+		return this.removeRootTagsProducedByAztec( toHTMLString( { value } ) );
 	}
 
 	getActiveFormatNames( record ) {
@@ -290,7 +264,7 @@ export class RichText extends Component {
 	onCreateUndoLevel() {
 		const { __unstableOnCreateUndoLevel: onCreateUndoLevel } = this.props;
 		// If the content is the same, no level needs to be created.
-		if ( this.lastHistoryValue === this.value ) {
+		if ( this.lastHistoryValue?.toString() === this.value?.toString() ) {
 			return;
 		}
 
@@ -340,10 +314,27 @@ export class RichText extends Component {
 		}
 
 		const contentWithoutRootTag = this.removeRootTagsProducedByAztec(
-			unescapeSpaces( event.nativeEvent.text )
+			event.nativeEvent.text
 		);
+
+		const { __unstableInputRule } = this.props;
+		const currentValuePosition = {
+			end: this.isIOS ? this.selectionEnd : this.selectionEnd + 1,
+			start: this.isIOS ? this.selectionStart : this.selectionStart + 1,
+		};
+
+		if (
+			__unstableInputRule &&
+			__unstableInputRule( {
+				...currentValuePosition,
+				...this.formatToValue( contentWithoutRootTag ),
+			} )
+		) {
+			return;
+		}
+
 		// On iOS, onChange can be triggered after selection changes, even though there are no content changes.
-		if ( contentWithoutRootTag === this.value ) {
+		if ( contentWithoutRootTag === this.value?.toString() ) {
 			return;
 		}
 		this.lastEventCount = event.nativeEvent.eventCount;
@@ -355,33 +346,19 @@ export class RichText extends Component {
 
 	onTextUpdate( event ) {
 		const contentWithoutRootTag = this.removeRootTagsProducedByAztec(
-			unescapeSpaces( event.nativeEvent.text )
+			event.nativeEvent.text
 		);
-		let formattedContent = contentWithoutRootTag;
-		if ( ! this.isIOS ) {
-			formattedContent = this.restoreParagraphTags(
-				contentWithoutRootTag,
-				this.multilineTag
-			);
-		}
 
 		this.debounceCreateUndoLevel();
-		const refresh = this.value !== formattedContent;
-		this.value = formattedContent;
+		const refresh = this.value?.toString() !== contentWithoutRootTag;
+		this.value = contentWithoutRootTag;
 
 		// We don't want to refresh if our goal is just to create a record.
 		if ( refresh ) {
-			this.props.onChange( formattedContent );
+			this.props.onChange( contentWithoutRootTag );
 		}
 	}
 
-	restoreParagraphTags( value, tag ) {
-		if ( tag === 'p' && ( ! value || ! value.startsWith( '<p>' ) ) ) {
-			return '<p>' + value + '</p>';
-		}
-		return value;
-	}
-
 	/*
 	 * Handles any case where the content of the AztecRN instance has changed in size
 	 */
@@ -442,7 +419,8 @@ export class RichText extends Component {
 		this.comesFromAztec = true;
 		this.firedAfterTextChanged = event.nativeEvent.firedAfterTextChanged;
 		const value = this.createRecord();
-		const { start, end, text } = value;
+		const { start, end, text, activeFormats } = value;
+		const hasActiveFormats = activeFormats && !! activeFormats.length;
 		let newValue;
 
 		// Always handle full content deletion ourselves.
@@ -455,15 +433,17 @@ export class RichText extends Component {
 
 		// Only process delete if the key press occurs at an uncollapsed edge.
 		if (
-			! onDelete ||
 			! isCollapsed( value ) ||
+			hasActiveFormats ||
 			( isReverse && start !== 0 ) ||
 			( ! isReverse && end !== text.length )
 		) {
 			return;
 		}
 
-		onDelete( { isReverse, value } );
+		if ( onDelete ) {
+			onDelete( { isReverse, value } );
+		}
 
 		event.preventDefault();
 		this.lastAztecEventType = 'input';
@@ -604,7 +584,7 @@ export class RichText extends Component {
 		// Check if value is up to date with latest state of native AztecView.
 		if (
 			event.nativeEvent.text &&
-			event.nativeEvent.text !== this.props.value
+			event.nativeEvent.text !== this.props.value?.toString()
 		) {
 			this.onTextUpdate( event );
 		}
@@ -629,7 +609,7 @@ export class RichText extends Component {
 		// this approach is not perfectly reliable.
 		const isManual =
 			this.lastAztecEventType !== 'input' &&
-			this.props.value === this.value;
+			this.props.value?.toString() === this.value?.toString();
 		if ( hasChanged && isManual ) {
 			const value = this.createRecord();
 			const activeFormats = getActiveFormats( value );
@@ -696,10 +676,10 @@ export class RichText extends Component {
 
 		// Check and dicsard stray event, where the text and selection is equal to the ones already cached.
 		const contentWithoutRootTag = this.removeRootTagsProducedByAztec(
-			unescapeSpaces( event.nativeEvent.text )
+			event.nativeEvent.text
 		);
 		if (
-			contentWithoutRootTag === this.value &&
+			contentWithoutRootTag === this.value?.toString() &&
 			realStart === this.selectionStart &&
 			realEnd === this.selectionEnd
 		) {
@@ -739,8 +719,6 @@ export class RichText extends Component {
 		if ( Array.isArray( value ) ) {
 			return create( {
 				html: childrenBlock.toHTML( value ),
-				multilineTag: this.multilineTag,
-				multilineWrapperTags: this.multilineWrapperTags,
 				preserveWhiteSpace,
 			} );
 		}
@@ -748,8 +726,6 @@ export class RichText extends Component {
 		if ( this.props.format === 'string' ) {
 			return create( {
 				html: value,
-				multilineTag: this.multilineTag,
-				multilineWrapperTags: this.multilineWrapperTags,
 				preserveWhiteSpace,
 			} );
 		}
@@ -800,7 +776,7 @@ export class RichText extends Component {
 			typeof nextProps.value !== 'undefined' &&
 			typeof this.props.value !== 'undefined' &&
 			( ! this.comesFromAztec || ! this.firedAfterTextChanged ) &&
-			nextProps.value !== this.props.value
+			nextProps.value?.toString() !== this.props.value?.toString()
 		) {
 			// Gutenberg seems to try to mirror the caret state even on events that only change the content so,
 			//  let's force caret update if state has selection set.
@@ -864,17 +840,11 @@ export class RichText extends Component {
 		}
 	}
 
-	componentWillUnmount() {
-		if ( this._editor.isFocused() ) {
-			this._editor.blur();
-		}
-	}
-
 	componentDidUpdate( prevProps ) {
 		const { style, tagName } = this.props;
 		const { currentFontSize } = this.state;
 
-		if ( this.props.value !== this.value ) {
+		if ( this.props.value?.toString() !== this.value?.toString() ) {
 			this.value = this.props.value;
 		}
 		const { __unstableIsSelected: prevIsSelected } = prevProps;
@@ -892,7 +862,7 @@ export class RichText extends Component {
 			// Since this is happening when merging blocks, the selection should be at the last character position.
 			// As a fallback the internal selectionEnd value is used.
 			const lastCharacterPosition =
-				this.value?.length ?? this.selectionEnd;
+				this.value?.toString().length ?? this.selectionEnd;
 			this._editor.focus();
 			this.props.onSelectionChange(
 				lastCharacterPosition,
@@ -923,6 +893,17 @@ export class RichText extends Component {
 		}
 	}
 
+	componentWillUnmount() {
+		const { clearCurrentSelectionOnUnmount } = this.props;
+
+		// There are cases when the component is unmounted e.g. scrolling in a
+		// long post due to virtualization, so the block selection needs to be cleared
+		// so it doesn't auto-focus when it's added back.
+		if ( this._editor?.isFocused() ) {
+			clearCurrentSelectionOnUnmount?.();
+		}
+	}
+
 	getHtmlToRender( record, tagName ) {
 		// Save back to HTML from React tree.
 		let value = this.valueToFormat( record );
@@ -934,7 +915,8 @@ export class RichText extends Component {
 		// On android if content is empty we need to send no content or else the placeholder will not show.
 		if (
 			! this.isIOS &&
-			( value === '' || value === EMPTY_PARAGRAPH_TAGS )
+			( value?.toString() === '' ||
+				value?.toString() === EMPTY_PARAGRAPH_TAGS )
 		) {
 			return '';
 		}
@@ -1271,8 +1253,8 @@ export class RichText extends Component {
 					ref={ ( ref ) => {
 						this._editor = ref;
 
-						if ( this.props.setRef ) {
-							this.props.setRef( ref );
+						if ( this.props.nativeEditorRef ) {
+							this.props.nativeEditorRef( ref );
 						}
 					} }
 					style={ {
@@ -1323,7 +1305,7 @@ export class RichText extends Component {
 					fontWeight={ this.props.fontWeight }
 					fontStyle={ this.props.fontStyle }
 					disableEditingMenu={ disableEditingMenu }
-					isMultiline={ this.isMultiline }
+					isMultiline={ false }
 					textAlign={ this.props.textAlign }
 					{ ...( this.isIOS ? { maxWidth } : {} ) }
 					minWidth={ minWidth }
diff --git a/packages/block-editor/src/components/rich-text/native/test/__snapshots__/index.native.js.snap b/packages/block-editor/src/components/rich-text/native/test/__snapshots__/index.native.js.snap
index c9d3d62e40ce9d..84e9b467132714 100644
--- a/packages/block-editor/src/components/rich-text/native/test/__snapshots__/index.native.js.snap
+++ b/packages/block-editor/src/components/rich-text/native/test/__snapshots__/index.native.js.snap
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<RichText/> Font Size renders component with style and font size 1`] = `
+exports[`<RichText/> when applying the font size renders component with style and font size 1`] = `
 "<!-- wp:paragraph {"style":{"color":{"text":"#fcb900"},"typography":{"fontSize":35.56}}} -->
 <p class="has-text-color" style="color:#fcb900;font-size:35.56px">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed imperdiet ut nibh vitae ornare. Sed auctor nec augue at blandit.</p>
 <!-- /wp:paragraph -->"
 `;
 
-exports[`<RichText/> Font Size should update the font size when style prop with font size property is provided 1`] = `
+exports[`<RichText/> when applying the font size should update the font size when style prop with font size property is provided 1`] = `
 <View
   style={
     [
@@ -42,7 +42,7 @@ exports[`<RichText/> Font Size should update the font size when style prop with
 </View>
 `;
 
-exports[`<RichText/> Font Size should update the font size with decimals when style prop with font size property is provided 1`] = `
+exports[`<RichText/> when applying the font size should update the font size with decimals when style prop with font size property is provided 1`] = `
 <View
   style={
     [
diff --git a/packages/block-editor/src/components/rich-text/native/test/index.native.js b/packages/block-editor/src/components/rich-text/native/test/index.native.js
index 64bfb3b183c6b9..26b6d6c5358ec5 100644
--- a/packages/block-editor/src/components/rich-text/native/test/index.native.js
+++ b/packages/block-editor/src/components/rich-text/native/test/index.native.js
@@ -2,13 +2,23 @@
  * External dependencies
  */
 import { Dimensions } from 'react-native';
-import { getEditorHtml, render, initializeEditor } from 'test/helpers';
+import {
+	fireEvent,
+	getEditorHtml,
+	initializeEditor,
+	render,
+	screen,
+} from 'test/helpers';
 
 /**
  * WordPress dependencies
  */
 import { select } from '@wordpress/data';
-import { store as richTextStore } from '@wordpress/rich-text';
+import {
+	store as richTextStore,
+	RichTextData,
+	__unstableCreateElement,
+} from '@wordpress/rich-text';
 import { coreBlocks } from '@wordpress/block-library';
 import {
 	getBlockTypes,
@@ -78,13 +88,70 @@ describe( '<RichText/>', () => {
 		} );
 	} );
 
-	describe( 'Font Size', () => {
+	describe( 'when the value changes', () => {
+		it( 'should avoid updating attributes when values are equal', async () => {
+			const handleChange = jest.fn();
+			const defaultEmptyValue = RichTextData.empty();
+			render(
+				<RichText
+					onChange={ handleChange }
+					value={ defaultEmptyValue }
+				/>
+			);
+
+			// Simulate an empty string from Aztec
+			fireEvent( screen.getByLabelText( 'Text input. Empty' ), 'change', {
+				nativeEvent: { text: '' },
+			} );
+
+			expect( handleChange ).not.toHaveBeenCalled();
+		} );
+
+		it( 'should preserve non-breaking space HTML entity', () => {
+			const onChange = jest.fn();
+			const onSelectionChange = jest.fn();
+			// The initial value is created using an HTML element to preserve
+			// the HTML entity.
+			const initialValue = RichTextData.fromHTMLElement(
+				__unstableCreateElement( document, '&nbsp;' )
+			);
+			render(
+				<RichText
+					onChange={ onChange }
+					onSelectionChange={ onSelectionChange }
+					value={ initialValue }
+					__unstableIsSelected
+				/>
+			);
+
+			// Trigger selection event with same text value as initial.
+			fireEvent(
+				screen.getByLabelText( /Text input/ ),
+				'onSelectionChange',
+				0,
+				0,
+				initialValue.toString(),
+				{
+					nativeEvent: {
+						eventCount: 0,
+						target: undefined,
+						text: initialValue.toString(),
+					},
+				}
+			);
+
+			expect( onChange ).not.toHaveBeenCalled();
+			expect( onSelectionChange ).toHaveBeenCalled();
+		} );
+	} );
+
+	describe( 'when applying the font size', () => {
 		it( 'should display rich text at the DEFAULT font size.', () => {
 			// Arrange.
 			const expectedFontSize = 16;
 			// Act.
 			const { getByLabelText } = render(
-				<RichText accessibilityLabel={ 'editor' } />
+				<RichText accessibilityLabel="editor" />
 			);
 			// Assert.
 			const actualFontSize = getByLabelText( 'editor' ).props.fontSize;
@@ -97,8 +164,8 @@ describe( '<RichText/>', () => {
 			// Act.
 			const { getByLabelText } = render(
 				<RichText
-					accessibilityLabel={ 'editor' }
-					fontSize={ 'min(2em, 3em)' }
+					accessibilityLabel="editor"
+					fontSize="min(2em, 3em)"
 				/>
 			);
 			// Assert.
@@ -112,7 +179,7 @@ describe( '<RichText/>', () => {
 			// Act.
 			const { getByLabelText } = render(
 				<RichText
-					accessibilityLabel={ 'editor' }
+					accessibilityLabel="editor"
 					style={ { fontSize: 'min(2em, 3em)' } }
 				/>
 			);
@@ -128,7 +195,7 @@ describe( '<RichText/>', () => {
 			mockGlobalSettings( { fontSize: 'min(2em, 3em)' } );
 			// Act.
 			const { getByLabelText } = render(
-				<RichText accessibilityLabel={ 'editor' } tagName="div" />
+				<RichText accessibilityLabel="editor" tagName="div" />
 			);
 			// Assert.
 			const actualFontSize = getByLabelText( 'editor' ).props.fontSize;
@@ -142,7 +209,7 @@ describe( '<RichText/>', () => {
 			mockGlobalSettings( { fontSize: 'min(2em, 3em)' } );
 			// Act.
 			const { getByLabelText } = render(
-				<RichText accessibilityLabel={ 'editor' } tagName="p" />
+				<RichText accessibilityLabel="editor" tagName="p" />
 			);
 			// Assert.
 			const actualFontSize = getByLabelText( 'editor' ).props.fontSize;
@@ -157,7 +224,7 @@ describe( '<RichText/>', () => {
 				mockGlobalSettings( { fontSize: unit } );
 				// Act.
 				const { getByLabelText } = render(
-					<RichText accessibilityLabel={ 'editor' } tagName="p" />
+					<RichText accessibilityLabel="editor" tagName="p" />
 				);
 				// Assert.
 				const actualFontSize =
@@ -174,9 +241,9 @@ describe( '<RichText/>', () => {
 			// Act.
 			const { getByLabelText } = render(
 				<RichText
-					accessibilityLabel={ 'editor' }
+					accessibilityLabel="editor"
 					style={ { fontSize: '1' } }
-					fontSize={ '2' }
+					fontSize="2"
 					tagName="p"
 				/>
 			);
@@ -193,7 +260,7 @@ describe( '<RichText/>', () => {
 			// Act.
 			const { getByLabelText } = render(
 				<RichText
-					accessibilityLabel={ 'editor' }
+					accessibilityLabel="editor"
 					style={ { fontSize: '1' } }
 					tagName="p"
 				/>
@@ -209,7 +276,7 @@ describe( '<RichText/>', () => {
 			Dimensions.set( { window: { ...window, width: 300 } } );
 			// Act.
 			const { getByLabelText } = render(
-				<RichText accessibilityLabel={ 'editor' } fontSize={ '1vw' } />
+				<RichText accessibilityLabel="editor" fontSize="1vw" />
 			);
 			// Assert.
 			const actualFontSize = getByLabelText( 'editor' ).props.fontSize;
@@ -222,7 +289,7 @@ describe( '<RichText/>', () => {
 			Dimensions.set( { window: { ...window, height: 300 } } );
 			// Act.
 			const { getByLabelText } = render(
-				<RichText accessibilityLabel={ 'editor' } fontSize={ '1vh' } />
+				<RichText accessibilityLabel="editor" fontSize="1vh" />
 			);
 			// Assert.
 			const actualFontSize = getByLabelText( 'editor' ).props.fontSize;
@@ -234,7 +301,7 @@ describe( '<RichText/>', () => {
 			const fontSize = '10';
 			const style = { fontSize: '12' };
 			// Act.
-			const screen = render( <RichText fontSize={ fontSize } /> );
+			render( <RichText fontSize={ fontSize } /> );
 			screen.update( <RichText fontSize={ fontSize } style={ style } /> );
 			// Assert.
 			expect( screen.toJSON() ).toMatchSnapshot();
@@ -256,7 +323,7 @@ describe( '<RichText/>', () => {
 			const fontSize = '10';
 			const style = { fontSize: '12.56px' };
 			// Act.
-			const screen = render( <RichText fontSize={ fontSize } /> );
+			render( <RichText fontSize={ fontSize } /> );
 			screen.update( <RichText fontSize={ fontSize } style={ style } /> );
 			// Assert.
 			expect( screen.toJSON() ).toMatchSnapshot();
@@ -268,7 +335,7 @@ describe( '<RichText/>', () => {
 			const style = { lineHeight: 0.2 };
 			// Act.
 			const { getByLabelText } = render(
-				<RichText accessibilityLabel={ 'editor' } style={ style } />
+				<RichText accessibilityLabel="editor" style={ style } />
 			);
 			// Assert.
 			const actualFontSize = getByLabelText( 'editor' ).props.lineHeight;
diff --git a/packages/block-editor/src/components/rich-text/split-value.js b/packages/block-editor/src/components/rich-text/split-value.js
deleted file mode 100644
index 17f54d9c9edd01..00000000000000
--- a/packages/block-editor/src/components/rich-text/split-value.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { isEmpty, split, toHTMLString } from '@wordpress/rich-text';
-
-/*
- * Signals to the RichText owner that the block can be replaced with two blocks
- * as a result of splitting the block by pressing enter, or with blocks as a
- * result of splitting the block by pasting block content in the instance.
- */
-export function splitValue( { value, pastedBlocks = [], onReplace, onSplit } ) {
-	if ( ! onReplace || ! onSplit ) {
-		return;
-	}
-
-	// Ensure the value has a selection. This might happen when trying to split
-	// an empty value before there was a `selectionchange` event.
-	const { start = 0, end = 0 } = value;
-	const valueWithEnsuredSelection = { ...value, start, end };
-	const blocks = [];
-	const [ before, after ] = split( valueWithEnsuredSelection );
-	const hasPastedBlocks = pastedBlocks.length > 0;
-	let lastPastedBlockIndex = -1;
-
-	// Consider the after value to be the original it is not empty and the
-	// before value *is* empty.
-	const isAfterOriginal = isEmpty( before ) && ! isEmpty( after );
-
-	// Create a block with the content before the caret if there's no pasted
-	// blocks, or if there are pasted blocks and the value is not empty. We do
-	// not want a leading empty block on paste, but we do if we split with e.g.
-	// the enter key.
-	if ( ! hasPastedBlocks || ! isEmpty( before ) ) {
-		blocks.push(
-			onSplit( toHTMLString( { value: before } ), ! isAfterOriginal )
-		);
-		lastPastedBlockIndex += 1;
-	}
-
-	if ( hasPastedBlocks ) {
-		blocks.push( ...pastedBlocks );
-		lastPastedBlockIndex += pastedBlocks.length;
-	}
-
-	// Create a block with the content after the caret if there's no pasted
-	// blocks, or if there are pasted blocks and the value is not empty. We do
-	// not want a trailing empty block on paste, but we do if we split with e.g.
-	// the enter key.
-	if ( ! hasPastedBlocks || ! isEmpty( after ) ) {
-		blocks.push(
-			onSplit( toHTMLString( { value: after } ), isAfterOriginal )
-		);
-	}
-
-	// If there are pasted blocks, set the selection to the last one. Otherwise,
-	// set the selection to the second block.
-	const indexToSelect = hasPastedBlocks ? lastPastedBlockIndex : 1;
-
-	// If there are pasted blocks, move the caret to the end of the selected
-	// block Otherwise, retain the default value.
-	const initialPosition = hasPastedBlocks ? -1 : 0;
-
-	onReplace( blocks, indexToSelect, initialPosition );
-}
diff --git a/packages/block-editor/src/components/rich-text/style.scss b/packages/block-editor/src/components/rich-text/style.scss
index a3bb78b2521db8..ba109648df1428 100644
--- a/packages/block-editor/src/components/rich-text/style.scss
+++ b/packages/block-editor/src/components/rich-text/style.scss
@@ -9,10 +9,15 @@
 		margin-bottom: $grid-unit-10;
 		box-shadow: none;
 		outline: none;
+		border-radius: $radius-small;
 	}
 
 	.components-toolbar {
-		border-radius: $radius-block-ui;
+		border-radius: $radius-small;
+	}
+
+	.components-toolbar-group {
+		background: none;
 	}
 
 	.components-toolbar__control,
diff --git a/packages/block-editor/src/components/rich-text/use-before-input-rules.js b/packages/block-editor/src/components/rich-text/use-before-input-rules.js
deleted file mode 100644
index f6f036f039b504..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-before-input-rules.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
-import { insert, isCollapsed } from '@wordpress/rich-text';
-import { useDispatch } from '@wordpress/data';
-import { applyFilters } from '@wordpress/hooks';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../store';
-
-/**
- * When typing over a selection, the selection will we wrapped by a matching
- * character pair. The second character is optional, it defaults to the first
- * character.
- *
- * @type {string[]} Array of character pairs.
- */
-const wrapSelectionSettings = [ '`', '"', "'", '“”', '‘’' ];
-
-export function useBeforeInputRules( props ) {
-	const {
-		__unstableMarkLastChangeAsPersistent,
-		__unstableMarkAutomaticChange,
-	} = useDispatch( blockEditorStore );
-	const propsRef = useRef( props );
-	propsRef.current = props;
-	return useRefEffect( ( element ) => {
-		function onInput( event ) {
-			const { inputType, data } = event;
-			const { value, onChange } = propsRef.current;
-
-			// Only run the rules when inserting text.
-			if ( inputType !== 'insertText' ) {
-				return;
-			}
-
-			if ( isCollapsed( value ) ) {
-				return;
-			}
-
-			const pair = applyFilters(
-				'blockEditor.wrapSelectionSettings',
-				wrapSelectionSettings
-			).find(
-				( [ startChar, endChar ] ) =>
-					startChar === data || endChar === data
-			);
-
-			if ( ! pair ) {
-				return;
-			}
-
-			const [ startChar, endChar = startChar ] = pair;
-			const start = value.start;
-			const end = value.end + startChar.length;
-
-			let newValue = insert( value, startChar, start, start );
-			newValue = insert( newValue, endChar, end, end );
-
-			__unstableMarkLastChangeAsPersistent();
-			onChange( newValue );
-			__unstableMarkAutomaticChange();
-
-			const init = {};
-
-			for ( const key in event ) {
-				init[ key ] = event[ key ];
-			}
-
-			init.data = endChar;
-
-			const { ownerDocument } = element;
-			const { defaultView } = ownerDocument;
-			const newEvent = new defaultView.InputEvent( 'input', init );
-
-			// Dispatch an `input` event with the new data. This will trigger the
-			// input rules.
-			// Postpone the `input` to the next event loop tick so that the dispatch
-			// doesn't happen synchronously in the middle of `beforeinput` dispatch.
-			// This is closer to how native `input` event would be timed, and also
-			// makes sure that the `input` event is dispatched only after the `onChange`
-			// call few lines above has fully updated the data store state and rerendered
-			// all affected components.
-			window.queueMicrotask( () => {
-				event.target.dispatchEvent( newEvent );
-			} );
-			event.preventDefault();
-		}
-
-		element.addEventListener( 'beforeinput', onInput );
-		return () => {
-			element.removeEventListener( 'beforeinput', onInput );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-delete.js b/packages/block-editor/src/components/rich-text/use-delete.js
deleted file mode 100644
index fbf025a5d4ea4d..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-delete.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
-import { DELETE, BACKSPACE } from '@wordpress/keycodes';
-import { isCollapsed, isEmpty } from '@wordpress/rich-text';
-
-export function useDelete( props ) {
-	const propsRef = useRef( props );
-	propsRef.current = props;
-	return useRefEffect( ( element ) => {
-		function onKeyDown( event ) {
-			const { keyCode } = event;
-
-			if ( event.defaultPrevented ) {
-				return;
-			}
-
-			const { value, onMerge, onRemove } = propsRef.current;
-
-			if ( keyCode === DELETE || keyCode === BACKSPACE ) {
-				const { start, end, text } = value;
-				const isReverse = keyCode === BACKSPACE;
-				const hasActiveFormats =
-					value.activeFormats && !! value.activeFormats.length;
-
-				// Only process delete if the key press occurs at an uncollapsed edge.
-				if (
-					! isCollapsed( value ) ||
-					hasActiveFormats ||
-					( isReverse && start !== 0 ) ||
-					( ! isReverse && end !== text.length )
-				) {
-					return;
-				}
-
-				if ( onMerge ) {
-					onMerge( ! isReverse );
-				}
-
-				// Only handle remove on Backspace. This serves dual-purpose of being
-				// an intentional user interaction distinguishing between Backspace and
-				// Delete to remove the empty field, but also to avoid merge & remove
-				// causing destruction of two fields (merge, then removed merged).
-				else if ( onRemove && isEmpty( value ) && isReverse ) {
-					onRemove( ! isReverse );
-				}
-
-				event.preventDefault();
-			}
-		}
-
-		element.addEventListener( 'keydown', onKeyDown );
-		return () => {
-			element.removeEventListener( 'keydown', onKeyDown );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-enter.js b/packages/block-editor/src/components/rich-text/use-enter.js
deleted file mode 100644
index 40d4f9be4759fa..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-enter.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
-import { ENTER } from '@wordpress/keycodes';
-import { insert, remove } from '@wordpress/rich-text';
-import { getBlockTransforms, findTransform } from '@wordpress/blocks';
-import { useDispatch, useRegistry } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../store';
-import { splitValue } from './split-value';
-
-export function useEnter( props ) {
-	const registry = useRegistry();
-	const { __unstableMarkAutomaticChange } = useDispatch( blockEditorStore );
-	const propsRef = useRef( props );
-	propsRef.current = props;
-	return useRefEffect( ( element ) => {
-		function onKeyDown( event ) {
-			if ( event.defaultPrevented ) {
-				return;
-			}
-
-			if ( event.keyCode !== ENTER ) {
-				return;
-			}
-
-			const {
-				removeEditorOnlyFormats,
-				value,
-				onReplace,
-				onSplit,
-				onChange,
-				disableLineBreaks,
-				onSplitAtEnd,
-				onSplitAtDoubleLineEnd,
-			} = propsRef.current;
-
-			event.preventDefault();
-
-			const _value = { ...value };
-			_value.formats = removeEditorOnlyFormats( value );
-			const canSplit = onReplace && onSplit;
-
-			if ( onReplace ) {
-				const transforms = getBlockTransforms( 'from' ).filter(
-					( { type } ) => type === 'enter'
-				);
-				const transformation = findTransform( transforms, ( item ) => {
-					return item.regExp.test( _value.text );
-				} );
-
-				if ( transformation ) {
-					onReplace( [
-						transformation.transform( {
-							content: _value.text,
-						} ),
-					] );
-					__unstableMarkAutomaticChange();
-				}
-			}
-
-			const { text, start, end } = _value;
-
-			if ( event.shiftKey ) {
-				if ( ! disableLineBreaks ) {
-					onChange( insert( _value, '\n' ) );
-				}
-			} else if ( canSplit ) {
-				splitValue( {
-					value: _value,
-					onReplace,
-					onSplit,
-				} );
-			} else if ( onSplitAtEnd && start === end && end === text.length ) {
-				onSplitAtEnd();
-			} else if (
-				// For some blocks it's desirable to split at the end of the
-				// block when there are two line breaks at the end of the
-				// block, so triple Enter exits the block.
-				onSplitAtDoubleLineEnd &&
-				start === end &&
-				end === text.length &&
-				text.slice( -2 ) === '\n\n'
-			) {
-				registry.batch( () => {
-					_value.start = _value.end - 2;
-					onChange( remove( _value ) );
-					onSplitAtDoubleLineEnd();
-				} );
-			} else if ( ! disableLineBreaks ) {
-				onChange( insert( _value, '\n' ) );
-			}
-		}
-
-		element.addEventListener( 'keydown', onKeyDown );
-		return () => {
-			element.removeEventListener( 'keydown', onKeyDown );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-firefox-compat.js b/packages/block-editor/src/components/rich-text/use-firefox-compat.js
deleted file mode 100644
index 59a57185081638..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-firefox-compat.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRefEffect } from '@wordpress/compose';
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../store';
-
-export function useFirefoxCompat() {
-	const { isMultiSelecting } = useSelect( blockEditorStore );
-	return useRefEffect( ( element ) => {
-		function onFocus() {
-			if ( ! isMultiSelecting() ) {
-				return;
-			}
-
-			// This is a little hack to work around focus issues with nested
-			// editable elements in Firefox. For some reason the editable child
-			// element sometimes regains focus, while it should not be focusable
-			// and focus should remain on the editable parent element.
-			// To do: try to find the cause of the shifting focus.
-			const parentEditable = element.parentElement.closest(
-				'[contenteditable="true"]'
-			);
-
-			if ( parentEditable ) {
-				parentEditable.focus();
-			}
-		}
-
-		element.addEventListener( 'focus', onFocus );
-		return () => {
-			element.removeEventListener( 'focus', onFocus );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-format-types.js b/packages/block-editor/src/components/rich-text/use-format-types.js
index 9d26d619432496..3c9b3b62ef78a5 100644
--- a/packages/block-editor/src/components/rich-text/use-format-types.js
+++ b/packages/block-editor/src/components/rich-text/use-format-types.js
@@ -29,7 +29,9 @@ const interactiveContentTags = new Set( [
 ] );
 
 function prefixSelectKeys( selected, prefix ) {
-	if ( typeof selected !== 'object' ) return { [ prefix ]: selected };
+	if ( typeof selected !== 'object' ) {
+		return { [ prefix ]: selected };
+	}
 	return Object.fromEntries(
 		Object.entries( selected ).map( ( [ key, value ] ) => [
 			`${ prefix }.${ key }`,
@@ -39,7 +41,9 @@ function prefixSelectKeys( selected, prefix ) {
 }
 
 function getPrefixedSelectKeys( selected, prefix ) {
-	if ( selected[ prefix ] ) return selected[ prefix ];
+	if ( selected[ prefix ] ) {
+		return selected[ prefix ];
+	}
 	return Object.keys( selected )
 		.filter( ( key ) => key.startsWith( prefix + '.' ) )
 		.reduce( ( accumulator, key ) => {
diff --git a/packages/block-editor/src/components/rich-text/use-input-events.js b/packages/block-editor/src/components/rich-text/use-input-events.js
deleted file mode 100644
index 4305e126fda7e7..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-input-events.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRefEffect } from '@wordpress/compose';
-
-export function useInputEvents( inputEvents ) {
-	return useRefEffect( ( element ) => {
-		function onInput( event ) {
-			for ( const keyboardShortcut of inputEvents.current ) {
-				keyboardShortcut( event );
-			}
-		}
-
-		element.addEventListener( 'input', onInput );
-		return () => {
-			element.removeEventListener( 'input', onInput );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-input-rules.js b/packages/block-editor/src/components/rich-text/use-input-rules.js
deleted file mode 100644
index 5aa47e7c7b4d74..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-input-rules.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
-import { insert, isCollapsed, toHTMLString } from '@wordpress/rich-text';
-import { getBlockTransforms, findTransform } from '@wordpress/blocks';
-import { useDispatch } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../store';
-import { preventEventDiscovery } from './prevent-event-discovery';
-import {
-	retrieveSelectedAttribute,
-	START_OF_SELECTED_AREA,
-} from '../../utils/selection';
-
-function findSelection( blocks ) {
-	let i = blocks.length;
-
-	while ( i-- ) {
-		const attributeKey = retrieveSelectedAttribute(
-			blocks[ i ].attributes
-		);
-
-		if ( attributeKey ) {
-			blocks[ i ].attributes[ attributeKey ] = blocks[ i ].attributes[
-				attributeKey
-			].replace( START_OF_SELECTED_AREA, '' );
-			return [ blocks[ i ].clientId, attributeKey, 0, 0 ];
-		}
-
-		const nestedSelection = findSelection( blocks[ i ].innerBlocks );
-
-		if ( nestedSelection ) {
-			return nestedSelection;
-		}
-	}
-
-	return [];
-}
-
-/**
- * An input rule that replaces two spaces with an en space, and an en space
- * followed by a space with an em space.
- *
- * @param {Object} value Value to replace spaces in.
- *
- * @return {Object} Value with spaces replaced.
- */
-function replacePrecedingSpaces( value ) {
-	if ( ! isCollapsed( value ) ) {
-		return value;
-	}
-
-	const { text, start } = value;
-	const lastTwoCharacters = text.slice( start - 2, start );
-
-	// Replace two spaces with an em space.
-	if ( lastTwoCharacters === '  ' ) {
-		return insert( value, '\u2002', start - 2, start );
-	}
-	// Replace an en space followed by a space with an em space.
-	else if ( lastTwoCharacters === '\u2002 ' ) {
-		return insert( value, '\u2003', start - 2, start );
-	}
-
-	return value;
-}
-
-export function useInputRules( props ) {
-	const {
-		__unstableMarkLastChangeAsPersistent,
-		__unstableMarkAutomaticChange,
-	} = useDispatch( blockEditorStore );
-	const propsRef = useRef( props );
-	propsRef.current = props;
-	return useRefEffect( ( element ) => {
-		function inputRule() {
-			const { getValue, onReplace, selectionChange } = propsRef.current;
-
-			if ( ! onReplace ) {
-				return;
-			}
-
-			// We must use getValue() here because value may be update
-			// asynchronously.
-			const value = getValue();
-			const { start, text } = value;
-			const characterBefore = text.slice( start - 1, start );
-
-			// The character right before the caret must be a plain space.
-			if ( characterBefore !== ' ' ) {
-				return;
-			}
-
-			const trimmedTextBefore = text.slice( 0, start ).trim();
-			const prefixTransforms = getBlockTransforms( 'from' ).filter(
-				( { type } ) => type === 'prefix'
-			);
-			const transformation = findTransform(
-				prefixTransforms,
-				( { prefix } ) => {
-					return trimmedTextBefore === prefix;
-				}
-			);
-
-			if ( ! transformation ) {
-				return;
-			}
-
-			const content = toHTMLString( {
-				value: insert( value, START_OF_SELECTED_AREA, 0, start ),
-			} );
-			const block = transformation.transform( content );
-
-			selectionChange( ...findSelection( [ block ] ) );
-			onReplace( [ block ] );
-			__unstableMarkAutomaticChange();
-
-			return true;
-		}
-
-		function onInput( event ) {
-			const { inputType, type } = event;
-			const {
-				getValue,
-				onChange,
-				__unstableAllowPrefixTransformations,
-				formatTypes,
-			} = propsRef.current;
-
-			// Only run input rules when inserting text.
-			if ( inputType !== 'insertText' && type !== 'compositionend' ) {
-				return;
-			}
-
-			if ( __unstableAllowPrefixTransformations && inputRule ) {
-				if ( inputRule() ) return;
-			}
-
-			const value = getValue();
-			const transformed = formatTypes.reduce(
-				( accumlator, { __unstableInputRule } ) => {
-					if ( __unstableInputRule ) {
-						accumlator = __unstableInputRule( accumlator );
-					}
-
-					return accumlator;
-				},
-				preventEventDiscovery( replacePrecedingSpaces( value ) )
-			);
-
-			if ( transformed !== value ) {
-				__unstableMarkLastChangeAsPersistent();
-				onChange( {
-					...transformed,
-					activeFormats: value.activeFormats,
-				} );
-				__unstableMarkAutomaticChange();
-			}
-		}
-
-		element.addEventListener( 'input', onInput );
-		element.addEventListener( 'compositionend', onInput );
-		return () => {
-			element.removeEventListener( 'input', onInput );
-			element.removeEventListener( 'compositionend', onInput );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-insert-replacement-text.js b/packages/block-editor/src/components/rich-text/use-insert-replacement-text.js
deleted file mode 100644
index e5ec7c23e906b8..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-insert-replacement-text.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRefEffect } from '@wordpress/compose';
-import { useDispatch } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../store';
-
-/**
- * When the browser is about to auto correct, add an undo level so the user can
- * revert the change.
- */
-export function useInsertReplacementText() {
-	const { __unstableMarkLastChangeAsPersistent } =
-		useDispatch( blockEditorStore );
-	return useRefEffect( ( element ) => {
-		function onInput( event ) {
-			if ( event.inputType === 'insertReplacementText' ) {
-				__unstableMarkLastChangeAsPersistent();
-			}
-		}
-
-		element.addEventListener( 'beforeinput', onInput );
-		return () => {
-			element.removeEventListener( 'beforeinput', onInput );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-mark-persistent.js b/packages/block-editor/src/components/rich-text/use-mark-persistent.js
index 9a564dfb7f97e8..0be460fedd92fa 100644
--- a/packages/block-editor/src/components/rich-text/use-mark-persistent.js
+++ b/packages/block-editor/src/components/rich-text/use-mark-persistent.js
@@ -10,27 +10,26 @@ import { useDispatch } from '@wordpress/data';
 import { store as blockEditorStore } from '../../store';
 
 export function useMarkPersistent( { html, value } ) {
-	const previousText = useRef();
-	const hasActiveFormats =
-		value.activeFormats && !! value.activeFormats.length;
+	const previousTextRef = useRef();
+	const hasActiveFormats = !! value.activeFormats?.length;
 	const { __unstableMarkLastChangeAsPersistent } =
 		useDispatch( blockEditorStore );
 
 	// Must be set synchronously to make sure it applies to the last change.
 	useLayoutEffect( () => {
 		// Ignore mount.
-		if ( ! previousText.current ) {
-			previousText.current = value.text;
+		if ( ! previousTextRef.current ) {
+			previousTextRef.current = value.text;
 			return;
 		}
 
 		// Text input, so don't create an undo level for every character.
 		// Create an undo level after 1 second of no input.
-		if ( previousText.current !== value.text ) {
+		if ( previousTextRef.current !== value.text ) {
 			const timeout = window.setTimeout( () => {
 				__unstableMarkLastChangeAsPersistent();
 			}, 1000 );
-			previousText.current = value.text;
+			previousTextRef.current = value.text;
 			return () => {
 				window.clearTimeout( timeout );
 			};
diff --git a/packages/block-editor/src/components/rich-text/use-paste-handler.js b/packages/block-editor/src/components/rich-text/use-paste-handler.js
deleted file mode 100644
index 1302e2d0dce469..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-paste-handler.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
-import {
-	pasteHandler,
-	findTransform,
-	getBlockTransforms,
-} from '@wordpress/blocks';
-import { isEmpty, insert, create } from '@wordpress/rich-text';
-import { isURL } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
-import { addActiveFormats } from './utils';
-import { splitValue } from './split-value';
-import { getPasteEventData } from '../../utils/pasting';
-
-/** @typedef {import('@wordpress/rich-text').RichTextValue} RichTextValue */
-
-export function usePasteHandler( props ) {
-	const propsRef = useRef( props );
-	propsRef.current = props;
-	return useRefEffect( ( element ) => {
-		function _onPaste( event ) {
-			const {
-				isSelected,
-				disableFormats,
-				onChange,
-				value,
-				formatTypes,
-				tagName,
-				onReplace,
-				onSplit,
-				__unstableEmbedURLOnPaste,
-				pastePlainText,
-			} = propsRef.current;
-
-			if ( ! isSelected ) {
-				return;
-			}
-
-			const { plainText, html, files } = getPasteEventData( event );
-
-			event.preventDefault();
-
-			// Allows us to ask for this information when we get a report.
-			window.console.log( 'Received HTML:\n\n', html );
-			window.console.log( 'Received plain text:\n\n', plainText );
-
-			if ( disableFormats ) {
-				onChange( insert( value, plainText ) );
-				return;
-			}
-
-			const isInternal =
-				event.clipboardData.getData( 'rich-text' ) === 'true';
-
-			// If the data comes from a rich text instance, we can directly use it
-			// without filtering the data. The filters are only meant for externally
-			// pasted content and remove inline styles.
-			if ( isInternal ) {
-				const pastedValue = create( { html } );
-				addActiveFormats( pastedValue, value.activeFormats );
-				onChange( insert( value, pastedValue ) );
-				return;
-			}
-
-			if ( pastePlainText ) {
-				onChange( insert( value, create( { text: plainText } ) ) );
-				return;
-			}
-
-			if ( files?.length ) {
-				// Allows us to ask for this information when we get a report.
-				// eslint-disable-next-line no-console
-				window.console.log( 'Received items:\n\n', files );
-
-				const fromTransforms = getBlockTransforms( 'from' );
-				const blocks = files
-					.reduce( ( accumulator, file ) => {
-						const transformation = findTransform(
-							fromTransforms,
-							( transform ) =>
-								transform.type === 'files' &&
-								transform.isMatch( [ file ] )
-						);
-						if ( transformation ) {
-							accumulator.push(
-								transformation.transform( [ file ] )
-							);
-						}
-						return accumulator;
-					}, [] )
-					.flat();
-				if ( ! blocks.length ) {
-					return;
-				}
-
-				if ( onReplace && isEmpty( value ) ) {
-					onReplace( blocks );
-				} else {
-					splitValue( {
-						value,
-						pastedBlocks: blocks,
-						onReplace,
-						onSplit,
-					} );
-				}
-
-				return;
-			}
-
-			let mode = onReplace && onSplit ? 'AUTO' : 'INLINE';
-
-			const trimmedPlainText = plainText.trim();
-
-			if (
-				__unstableEmbedURLOnPaste &&
-				isEmpty( value ) &&
-				isURL( trimmedPlainText ) &&
-				// For the link pasting feature, allow only http(s) protocols.
-				/^https?:/.test( trimmedPlainText )
-			) {
-				mode = 'BLOCKS';
-			}
-
-			const content = pasteHandler( {
-				HTML: html,
-				plainText,
-				mode,
-				tagName,
-			} );
-
-			if ( typeof content === 'string' ) {
-				const transformed = formatTypes.reduce(
-					( accumlator, { __unstablePasteRule } ) => {
-						// Only allow one transform.
-						if ( __unstablePasteRule && accumlator === value ) {
-							accumlator = __unstablePasteRule( value, {
-								html,
-								plainText,
-							} );
-						}
-
-						return accumlator;
-					},
-					value
-				);
-
-				if ( transformed !== value ) {
-					onChange( transformed );
-				} else {
-					const valueToInsert = create( { html: content } );
-					addActiveFormats( valueToInsert, value.activeFormats );
-					onChange( insert( value, valueToInsert ) );
-				}
-			} else if ( content.length > 0 ) {
-				if ( onReplace && isEmpty( value ) ) {
-					onReplace( content, content.length - 1, -1 );
-				} else {
-					splitValue( {
-						value,
-						pastedBlocks: content,
-						onReplace,
-						onSplit,
-					} );
-				}
-			}
-		}
-
-		element.addEventListener( 'paste', _onPaste );
-		return () => {
-			element.removeEventListener( 'paste', _onPaste );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-remove-browser-shortcuts.js b/packages/block-editor/src/components/rich-text/use-remove-browser-shortcuts.js
deleted file mode 100644
index a7e1b6ec48097d..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-remove-browser-shortcuts.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRefEffect } from '@wordpress/compose';
-import { isKeyboardEvent } from '@wordpress/keycodes';
-
-/**
- * Hook to prevent default behaviors for key combinations otherwise handled
- * internally by RichText.
- *
- * @return {import('react').RefObject} The component to be rendered.
- */
-export function useRemoveBrowserShortcuts() {
-	return useRefEffect( ( node ) => {
-		function onKeydown( event ) {
-			if (
-				isKeyboardEvent.primary( event, 'z' ) ||
-				isKeyboardEvent.primary( event, 'y' ) ||
-				isKeyboardEvent.primaryShift( event, 'z' )
-			) {
-				event.preventDefault();
-			}
-		}
-		node.addEventListener( 'keydown', onKeydown );
-		return () => {
-			node.removeEventListener( 'keydown', onKeydown );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-shortcuts.js b/packages/block-editor/src/components/rich-text/use-shortcuts.js
deleted file mode 100644
index 61b2e3f6ce31bc..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-shortcuts.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRefEffect } from '@wordpress/compose';
-
-export function useShortcuts( keyboardShortcuts ) {
-	return useRefEffect( ( element ) => {
-		function onKeyDown( event ) {
-			for ( const keyboardShortcut of keyboardShortcuts.current ) {
-				keyboardShortcut( event );
-			}
-		}
-
-		element.addEventListener( 'keydown', onKeyDown );
-		return () => {
-			element.removeEventListener( 'keydown', onKeyDown );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/use-undo-automatic-change.js b/packages/block-editor/src/components/rich-text/use-undo-automatic-change.js
deleted file mode 100644
index 819f2935806263..00000000000000
--- a/packages/block-editor/src/components/rich-text/use-undo-automatic-change.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { useRefEffect } from '@wordpress/compose';
-import { BACKSPACE, DELETE, ESCAPE } from '@wordpress/keycodes';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../../store';
-
-export function useUndoAutomaticChange() {
-	const { didAutomaticChange, getSettings } = useSelect( blockEditorStore );
-	return useRefEffect( ( element ) => {
-		function onKeyDown( event ) {
-			const { keyCode } = event;
-
-			if ( event.defaultPrevented ) {
-				return;
-			}
-
-			if (
-				keyCode !== DELETE &&
-				keyCode !== BACKSPACE &&
-				keyCode !== ESCAPE
-			) {
-				return;
-			}
-
-			const { __experimentalUndo } = getSettings();
-
-			if ( ! __experimentalUndo ) {
-				return;
-			}
-
-			if ( ! didAutomaticChange() ) {
-				return;
-			}
-
-			event.preventDefault();
-			__experimentalUndo();
-		}
-
-		element.addEventListener( 'keydown', onKeyDown );
-		return () => {
-			element.removeEventListener( 'keydown', onKeyDown );
-		};
-	}, [] );
-}
diff --git a/packages/block-editor/src/components/rich-text/with-deprecations.js b/packages/block-editor/src/components/rich-text/with-deprecations.js
new file mode 100644
index 00000000000000..92a101f84be629
--- /dev/null
+++ b/packages/block-editor/src/components/rich-text/with-deprecations.js
@@ -0,0 +1,48 @@
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+import { children as childrenSource } from '@wordpress/blocks';
+import { __unstableCreateElement } from '@wordpress/rich-text';
+import deprecated from '@wordpress/deprecated';
+
+/**
+ * Internal dependencies
+ */
+import RichTextMultiline from './multiline';
+
+export function withDeprecations( Component ) {
+	return forwardRef( ( props, ref ) => {
+		let value = props.value;
+		let onChange = props.onChange;
+
+		// Handle deprecated format.
+		if ( Array.isArray( value ) ) {
+			deprecated( 'wp.blockEditor.RichText value prop as children type', {
+				since: '6.1',
+				version: '6.3',
+				alternative: 'value prop as string',
+				link: 'https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields/',
+			} );
+
+			value = childrenSource.toHTML( props.value );
+			onChange = ( newValue ) =>
+				props.onChange(
+					childrenSource.fromDOM(
+						__unstableCreateElement( document, newValue ).childNodes
+					)
+				);
+		}
+
+		const NewComponent = props.multiline ? RichTextMultiline : Component;
+
+		return (
+			<NewComponent
+				{ ...props }
+				value={ value }
+				onChange={ onChange }
+				ref={ ref }
+			/>
+		);
+	} );
+}
diff --git a/packages/block-editor/src/components/skip-to-selected-block/index.js b/packages/block-editor/src/components/skip-to-selected-block/index.js
index 584e51176ec306..2b52433480f3e6 100644
--- a/packages/block-editor/src/components/skip-to-selected-block/index.js
+++ b/packages/block-editor/src/components/skip-to-selected-block/index.js
@@ -1,24 +1,34 @@
 /**
  * WordPress dependencies
  */
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
+import { useRef } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-import { __unstableUseBlockRef as useBlockRef } from '../block-list/use-block-props/use-block-refs';
+import { useBlockElementRef } from '../block-list/use-block-props/use-block-refs';
 
-const SkipToSelectedBlock = ( { selectedBlockClientId } ) => {
-	const ref = useBlockRef( selectedBlockClientId );
+/**
+ * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/skip-to-selected-block/README.md
+ */
+export default function SkipToSelectedBlock() {
+	const selectedBlockClientId = useSelect(
+		( select ) => select( blockEditorStore ).getBlockSelectionStart(),
+		[]
+	);
+	const ref = useRef();
+	useBlockElementRef( selectedBlockClientId, ref );
 	const onClick = () => {
-		ref.current.focus();
+		ref.current?.focus();
 	};
 
 	return selectedBlockClientId ? (
 		<Button
+			__next40pxDefaultSize
 			variant="secondary"
 			className="block-editor-skip-to-selected-block"
 			onClick={ onClick }
@@ -26,14 +36,4 @@ const SkipToSelectedBlock = ( { selectedBlockClientId } ) => {
 			{ __( 'Skip to the selected block' ) }
 		</Button>
 	) : null;
-};
-
-/**
- * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/skip-to-selected-block/README.md
- */
-export default withSelect( ( select ) => {
-	return {
-		selectedBlockClientId:
-			select( blockEditorStore ).getBlockSelectionStart(),
-	};
-} )( SkipToSelectedBlock );
+}
diff --git a/packages/block-editor/src/components/skip-to-selected-block/style.scss b/packages/block-editor/src/components/skip-to-selected-block/style.scss
index 075e9d3c522653..8a1933423e2f9e 100644
--- a/packages/block-editor/src/components/skip-to-selected-block/style.scss
+++ b/packages/block-editor/src/components/skip-to-selected-block/style.scss
@@ -3,18 +3,9 @@
 	top: -9999em;
 
 	&:focus {
-		height: auto;
-		width: auto;
-		display: block;
 		font-size: 14px;
 		font-weight: 600;
-		padding: 15px 23px 14px;
 		background: #f1f1f1;
-		color: var(--wp-admin-theme-color);
-		line-height: normal;
-		box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
-		text-decoration: none;
-		outline: none;
 		z-index: z-index(".skip-to-selected-block");
 	}
 }
diff --git a/packages/block-editor/src/components/spacing-sizes-control/hooks/use-spacing-sizes.js b/packages/block-editor/src/components/spacing-sizes-control/hooks/use-spacing-sizes.js
index e75f3519a1ca6c..d822dd200b626d 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/hooks/use-spacing-sizes.js
+++ b/packages/block-editor/src/components/spacing-sizes-control/hooks/use-spacing-sizes.js
@@ -1,28 +1,63 @@
 /**
  * WordPress dependencies
  */
+import { useMemo } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { useSettings } from '../../use-settings';
+import { RANGE_CONTROL_MAX_SIZE } from '../utils';
+
+const EMPTY_ARRAY = [];
+
+const compare = new Intl.Collator( 'und', { numeric: true } ).compare;
 
 export default function useSpacingSizes() {
-	const spacingSizes = [ { name: 0, slug: '0', size: 0 } ];
-
-	const [ settingsSizes ] = useSettings( 'spacing.spacingSizes' );
-	if ( settingsSizes ) {
-		spacingSizes.push( ...settingsSizes );
-	}
-
-	if ( spacingSizes.length > 8 ) {
-		spacingSizes.unshift( {
-			name: __( 'Default' ),
-			slug: 'default',
-			size: undefined,
-		} );
-	}
-
-	return spacingSizes;
+	const [
+		customSpacingSizes,
+		themeSpacingSizes,
+		defaultSpacingSizes,
+		defaultSpacingSizesEnabled,
+	] = useSettings(
+		'spacing.spacingSizes.custom',
+		'spacing.spacingSizes.theme',
+		'spacing.spacingSizes.default',
+		'spacing.defaultSpacingSizes'
+	);
+
+	const customSizes = customSpacingSizes ?? EMPTY_ARRAY;
+
+	const themeSizes = themeSpacingSizes ?? EMPTY_ARRAY;
+
+	const defaultSizes =
+		defaultSpacingSizes && defaultSpacingSizesEnabled !== false
+			? defaultSpacingSizes
+			: EMPTY_ARRAY;
+
+	return useMemo( () => {
+		const sizes = [
+			{ name: __( 'None' ), slug: '0', size: 0 },
+			...customSizes,
+			...themeSizes,
+			...defaultSizes,
+		];
+
+		// Using numeric slugs opts-in to sorting by slug.
+		if ( sizes.every( ( { slug } ) => /^[0-9]/.test( slug ) ) ) {
+			sizes.sort( ( a, b ) => compare( a.slug, b.slug ) );
+		}
+
+		return sizes.length > RANGE_CONTROL_MAX_SIZE
+			? [
+					{
+						name: __( 'Default' ),
+						slug: 'default',
+						size: undefined,
+					},
+					...sizes,
+			  ]
+			: sizes;
+	}, [ customSizes, themeSizes, defaultSizes ] );
 }
diff --git a/packages/block-editor/src/components/spacing-sizes-control/index.js b/packages/block-editor/src/components/spacing-sizes-control/index.js
index 5c26305331dd2d..6ca143d14706ac 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/index.js
+++ b/packages/block-editor/src/components/spacing-sizes-control/index.js
@@ -4,9 +4,10 @@
 import {
 	BaseControl,
 	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
-import { __, _x, sprintf } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -14,7 +15,7 @@ import { __, _x, sprintf } from '@wordpress/i18n';
 import AxialInputControls from './input-controls/axial';
 import SeparatedInputControls from './input-controls/separated';
 import SingleInputControl from './input-controls/single';
-import SidesDropdown from './sides-dropdown';
+import LinkedButton from './linked-button';
 import useSpacingSizes from './hooks/use-spacing-sizes';
 import {
 	ALL_SIDES,
@@ -46,6 +47,10 @@ export default function SpacingSizesControl( {
 
 	const [ view, setView ] = useState( getInitialView( inputValues, sides ) );
 
+	const toggleLinked = () => {
+		setView( view === VIEWS.axial ? VIEWS.custom : VIEWS.axial );
+	};
+
 	const handleOnChange = ( nextValue ) => {
 		const newValues = { ...values, ...nextValue };
 		onChange( newValues );
@@ -90,12 +95,6 @@ export default function SpacingSizesControl( {
 		sideLabel
 	).trim();
 
-	const dropdownLabelText = sprintf(
-		// translators: %s: The current spacing property e.g. "Padding", "Margin".
-		_x( '%s options', 'Button label to reveal side configuration options' ),
-		labelProp
-	);
-
 	return (
 		<fieldset className="spacing-sizes-control">
 			<HStack className="spacing-sizes-control__header">
@@ -106,15 +105,14 @@ export default function SpacingSizesControl( {
 					{ label }
 				</BaseControl.VisualLabel>
 				{ ! hasOneSide && ! hasOnlyAxialSides && (
-					<SidesDropdown
-						label={ dropdownLabelText }
-						onChange={ setView }
-						sides={ sides }
-						value={ view }
+					<LinkedButton
+						label={ labelProp }
+						onClick={ toggleLinked }
+						isLinked={ view === VIEWS.axial }
 					/>
 				) }
 			</HStack>
-			{ renderControls() }
+			<VStack spacing={ 0.5 }>{ renderControls() }</VStack>
 		</fieldset>
 	);
 }
diff --git a/packages/block-editor/src/components/spacing-sizes-control/input-controls/spacing-input-control.js b/packages/block-editor/src/components/spacing-sizes-control/input-controls/spacing-input-control.js
index 7ef5c17f82943c..d00feed704d17a 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/input-controls/spacing-input-control.js
+++ b/packages/block-editor/src/components/spacing-sizes-control/input-controls/spacing-input-control.js
@@ -3,13 +3,13 @@
  */
 import {
 	Button,
-	CustomSelectControl,
 	Icon,
 	RangeControl,
 	__experimentalHStack as HStack,
 	__experimentalUnitControl as UnitControl,
 	__experimentalUseCustomUnits as useCustomUnits,
 	__experimentalParseQuantityAndUnitFromRawValue as parseQuantityAndUnitFromRawValue,
+	CustomSelectControl,
 } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { useState, useMemo } from '@wordpress/element';
@@ -23,6 +23,7 @@ import { settings } from '@wordpress/icons';
 import { useSettings } from '../../use-settings';
 import { store as blockEditorStore } from '../../../store';
 import {
+	RANGE_CONTROL_MAX_SIZE,
 	ALL_SIDES,
 	LABELS,
 	getSliderValueFromPreset,
@@ -79,7 +80,7 @@ export default function SpacingInputControl( {
 	value = getPresetValueFromCustomValue( value, spacingSizes );
 
 	let selectListSizes = spacingSizes;
-	const showRangeControl = spacingSizes.length <= 8;
+	const showRangeControl = spacingSizes.length <= RANGE_CONTROL_MAX_SIZE;
 
 	const disableCustomSpacingSizes = useSelect( ( select ) => {
 		const editorSettings = select( blockEditorStore ).getSettings();
@@ -92,6 +93,8 @@ export default function SpacingInputControl( {
 			! isValueSpacingPreset( value )
 	);
 
+	const [ minValue, setMinValue ] = useState( minimumCustomValue );
+
 	const previousValue = usePrevious( value );
 	if (
 		!! value &&
@@ -185,10 +188,12 @@ export default function SpacingInputControl( {
 		name: size.name,
 	} ) );
 
-	const marks = spacingSizes.map( ( _newValue, index ) => ( {
-		value: index,
-		label: undefined,
-	} ) );
+	const marks = spacingSizes
+		.slice( 1, spacingSizes.length - 1 )
+		.map( ( _newValue, index ) => ( {
+			value: index + 1,
+			label: undefined,
+		} ) );
 
 	const sideLabel =
 		ALL_SIDES.includes( side ) && showSideInLabel ? LABELS[ side ] : '';
@@ -222,15 +227,29 @@ export default function SpacingInputControl( {
 						}
 						value={ currentValue }
 						units={ units }
-						min={ minimumCustomValue }
+						min={ minValue }
 						placeholder={ allPlaceholder }
 						disableUnits={ isMixed }
 						label={ ariaLabel }
-						hideLabelFromVision={ true }
+						hideLabelFromVision
 						className="spacing-sizes-control__custom-value-input"
-						size={ '__unstable-large' }
+						size="__unstable-large"
+						onDragStart={ () => {
+							if ( value?.charAt( 0 ) === '-' ) {
+								setMinValue( 0 );
+							}
+						} }
+						onDrag={ () => {
+							if ( value?.charAt( 0 ) === '-' ) {
+								setMinValue( 0 );
+							}
+						} }
+						onDragEnd={ () => {
+							setMinValue( minimumCustomValue );
+						} }
 					/>
 					<RangeControl
+						__next40pxDefaultSize
 						onMouseOver={ onMouseOver }
 						onMouseOut={ onMouseOut }
 						onFocus={ onMouseOver }
@@ -245,11 +264,14 @@ export default function SpacingInputControl( {
 						onChange={ handleCustomValueSliderChange }
 						className="spacing-sizes-control__custom-value-range"
 						__nextHasNoMarginBottom
+						label={ ariaLabel }
+						hideLabelFromVision
 					/>
 				</>
 			) }
 			{ showRangeControl && ! showCustomValueControl && (
 				<RangeControl
+					__next40pxDefaultSize
 					onMouseOver={ onMouseOver }
 					onMouseOut={ onMouseOut }
 					className="spacing-sizes-control__range-control"
@@ -272,8 +294,8 @@ export default function SpacingInputControl( {
 					max={ spacingSizes.length - 1 }
 					marks={ marks }
 					label={ ariaLabel }
-					hideLabelFromVision={ true }
-					__nextHasNoMarginBottom={ true }
+					hideLabelFromVision
+					__nextHasNoMarginBottom
 					onFocus={ onMouseOver }
 					onBlur={ onMouseOut }
 				/>
@@ -282,9 +304,11 @@ export default function SpacingInputControl( {
 				<CustomSelectControl
 					className="spacing-sizes-control__custom-select-control"
 					value={
+						// passing empty string as a fallback to continue using the
+						// component in controlled mode
 						options.find(
 							( option ) => option.key === currentValue
-						) || '' // passing undefined here causes a downshift controlled/uncontrolled warning
+						) || ''
 					}
 					onChange={ ( selection ) => {
 						onChange(
@@ -296,9 +320,8 @@ export default function SpacingInputControl( {
 					} }
 					options={ options }
 					label={ ariaLabel }
-					hideLabelFromVision={ true }
-					__nextUnconstrainedWidth={ true }
-					size={ '__unstable-large' }
+					hideLabelFromVision
+					size="__unstable-large"
 					onMouseOver={ onMouseOver }
 					onMouseOut={ onMouseOut }
 					onFocus={ onMouseOver }
@@ -317,7 +340,7 @@ export default function SpacingInputControl( {
 						setShowCustomValueControl( ! showCustomValueControl );
 					} }
 					isPressed={ showCustomValueControl }
-					isSmall
+					size="small"
 					className="spacing-sizes-control__custom-toggle"
 					iconSize={ 24 }
 				/>
diff --git a/packages/block-editor/src/components/spacing-sizes-control/linked-button.js b/packages/block-editor/src/components/spacing-sizes-control/linked-button.js
new file mode 100644
index 00000000000000..f6d56be66072ad
--- /dev/null
+++ b/packages/block-editor/src/components/spacing-sizes-control/linked-button.js
@@ -0,0 +1,22 @@
+/**
+ * WordPress dependencies
+ */
+import { Button, Tooltip } from '@wordpress/components';
+import { link, linkOff } from '@wordpress/icons';
+import { __ } from '@wordpress/i18n';
+
+export default function LinkedButton( { isLinked, ...props } ) {
+	const label = isLinked ? __( 'Unlink sides' ) : __( 'Link sides' );
+
+	return (
+		<Tooltip text={ label }>
+			<Button
+				{ ...props }
+				size="small"
+				icon={ isLinked ? link : linkOff }
+				iconSize={ 24 }
+				aria-label={ label }
+			/>
+		</Tooltip>
+	);
+}
diff --git a/packages/block-editor/src/components/spacing-sizes-control/sides-dropdown/index.js b/packages/block-editor/src/components/spacing-sizes-control/sides-dropdown/index.js
deleted file mode 100644
index 0f83a8db1c831e..00000000000000
--- a/packages/block-editor/src/components/spacing-sizes-control/sides-dropdown/index.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { DropdownMenu, Icon, MenuGroup, MenuItem } from '@wordpress/components';
-import { check } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import { getSupportedMenuItems, VIEWS } from '../utils';
-
-const checkIcon = <Icon icon={ check } size={ 24 } />;
-
-export default function SidesDropdown( {
-	label: labelProp,
-	onChange,
-	sides,
-	value,
-} ) {
-	if ( ! sides || ! sides.length ) {
-		return;
-	}
-
-	const supportedItems = getSupportedMenuItems( sides );
-	const sideIcon = supportedItems[ value ].icon;
-	const { custom: customItem, ...menuItems } = supportedItems;
-
-	return (
-		<DropdownMenu
-			icon={ sideIcon }
-			label={ labelProp }
-			className="spacing-sizes-control__dropdown"
-			toggleProps={ { isSmall: true } }
-		>
-			{ ( { onClose } ) => {
-				return (
-					<>
-						<MenuGroup>
-							{ Object.entries( menuItems ).map(
-								( [ slug, { label, icon } ] ) => {
-									const isSelected = value === slug;
-									return (
-										<MenuItem
-											key={ slug }
-											icon={ icon }
-											iconPosition="left"
-											isSelected={ isSelected }
-											role="menuitemradio"
-											onClick={ () => {
-												onChange( slug );
-												onClose();
-											} }
-											suffix={
-												isSelected
-													? checkIcon
-													: undefined
-											}
-										>
-											{ label }
-										</MenuItem>
-									);
-								}
-							) }
-						</MenuGroup>
-						{ !! customItem && (
-							<MenuGroup>
-								<MenuItem
-									icon={ customItem.icon }
-									iconPosition="left"
-									isSelected={ value === VIEWS.custom }
-									role="menuitemradio"
-									onClick={ () => {
-										onChange( VIEWS.custom );
-										onClose();
-									} }
-									suffix={
-										value === VIEWS.custom
-											? checkIcon
-											: undefined
-									}
-								>
-									{ customItem.label }
-								</MenuItem>
-							</MenuGroup>
-						) }
-					</>
-				);
-			} }
-		</DropdownMenu>
-	);
-}
diff --git a/packages/block-editor/src/components/spacing-sizes-control/style.scss b/packages/block-editor/src/components/spacing-sizes-control/style.scss
index 2fb33b5c565fba..a387e5369d01ed 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/style.scss
+++ b/packages/block-editor/src/components/spacing-sizes-control/style.scss
@@ -4,34 +4,35 @@
 		margin-bottom: 0;
 	}
 
+	.is-marked {
+		.components-range-control__track {
+			transition: width ease 0.1s;
+			@include reduce-motion("transition");
+		}
+
+		.components-range-control__thumb-wrapper {
+			transition: left ease 0.1s;
+			@include reduce-motion("transition");
+		}
+	}
+
 	.spacing-sizes-control__range-control,
 	.spacing-sizes-control__custom-value-range {
-		height: 40px;
-		/* Vertically center the RangeControl until it has true 40px height. */
-		display: flex;
-		align-items: center;
-		margin-bottom: 0;
 		flex: 1;
-
-		> .components-base-control__field {
-			/* Fixes RangeControl contents when the outer wrapper is flex */
-			flex: 1;
-		}
+		margin-bottom: 0; // Needed for some instances of the range control, such as the Spacer block.
 	}
 
 	.components-range-control__mark {
+		transform: translateX(-50%);
 		height: $grid-unit-05;
-		width: 3px;
-		background-color: #fff;
+		width: math.div($grid-unit-05, 2);
+		background-color: $white;
 		z-index: 1;
+		top: -#{$grid-unit-05};
 	}
 
 	.components-range-control__marks {
 		margin-top: 17px;
-
-		:first-child {
-			display: none;
-		}
 	}
 
 	.components-range-control__thumb-wrapper {
diff --git a/packages/block-editor/src/components/spacing-sizes-control/test/utils.js b/packages/block-editor/src/components/spacing-sizes-control/test/utils.js
index a631cbfcff3ef1..a8440bb5be8caf 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/test/utils.js
+++ b/packages/block-editor/src/components/spacing-sizes-control/test/utils.js
@@ -373,47 +373,39 @@ describe( 'getInitialView', () => {
 				getInitialView( { top: '1em', right: '10px' }, ALL_SIDES )
 			).toBe( VIEWS.custom );
 		} );
-		it( 'should not return custom view if there is only a single side value', () => {
-			expect( getInitialView( { top: '1em' }, ALL_SIDES ) ).not.toBe(
-				VIEWS.custom
-			);
-		} );
-	} );
-
-	describe( 'Single side view', () => {
-		it( 'should return single side when only single side supported', () => {
-			expect( getInitialView( { top: '1em' }, [ 'top' ] ) ).toBe(
-				VIEWS.top
-			);
-		} );
-
-		it( 'should return the single side view if there is only a single side value set and supported sides > 1', () => {
+		it( 'should return custom view if there is only a single side value', () => {
 			expect( getInitialView( { top: '1em' }, ALL_SIDES ) ).toBe(
-				VIEWS.top
-			);
-			expect( getInitialView( { right: '1em' }, ALL_SIDES ) ).toBe(
-				VIEWS.right
-			);
-			expect( getInitialView( { bottom: '1em' }, ALL_SIDES ) ).toBe(
-				VIEWS.bottom
-			);
-			expect( getInitialView( { left: '1em' }, ALL_SIDES ) ).toBe(
-				VIEWS.left
+				VIEWS.custom
 			);
 		} );
-		it( 'should return single side view when only one side is supported', () => {
+		it( 'should return custom view even if only single side supported', () => {
 			expect( getInitialView( { top: '1em' }, [ 'top' ] ) ).toBe(
-				VIEWS.top
+				VIEWS.custom
 			);
 			expect( getInitialView( { right: '1em' }, [ 'right' ] ) ).toBe(
-				VIEWS.right
+				VIEWS.custom
 			);
 			expect( getInitialView( { bottom: '1em' }, [ 'bottom' ] ) ).toBe(
-				VIEWS.bottom
+				VIEWS.custom
 			);
 			expect( getInitialView( { left: '1em' }, [ 'left' ] ) ).toBe(
-				VIEWS.left
+				VIEWS.custom
 			);
 		} );
 	} );
+
+	describe( 'Single side view', () => {
+		it( 'should return single side when only single side supported and no value defined', () => {
+			expect( getInitialView( {}, [ 'top' ] ) ).toBe( VIEWS.top );
+		} );
+
+		it( 'should return single side when only single side supported and has only axial sides', () => {
+			expect(
+				getInitialView( { top: '1em' }, [ 'horizontal', 'vertical' ] )
+			).toBe( VIEWS.top );
+			expect(
+				getInitialView( { left: '4em' }, [ 'horizontal', 'vertical' ] )
+			).toBe( VIEWS.left );
+		} );
+	} );
 } );
diff --git a/packages/block-editor/src/components/spacing-sizes-control/utils.js b/packages/block-editor/src/components/spacing-sizes-control/utils.js
index 32f0dbc59ac466..046bee98761bf2 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/utils.js
+++ b/packages/block-editor/src/components/spacing-sizes-control/utils.js
@@ -12,6 +12,8 @@ import {
 	sidesVertical,
 } from '@wordpress/icons';
 
+export const RANGE_CONTROL_MAX_SIZE = 8;
+
 export const ALL_SIDES = [ 'top', 'right', 'bottom', 'left' ];
 
 export const DEFAULT_VALUES = {
@@ -361,6 +363,10 @@ export function getInitialView( values = {}, sides ) {
 		top === bottom && left === right && ( !! top || !! left );
 	const hasNoValuesAndBalancedSides =
 		! sideValues.length && hasBalancedSidesSupport( sides );
+	const hasOnlyAxialSides =
+		sides?.includes( 'horizontal' ) &&
+		sides?.includes( 'vertical' ) &&
+		sides?.length === 2;
 
 	if (
 		hasAxisSupport( sides ) &&
@@ -369,9 +375,9 @@ export function getInitialView( values = {}, sides ) {
 		return VIEWS.axial;
 	}
 
-	// Single side.
+	// Only axial sides are supported and single value defined.
 	// - Ensure the side returned is the first side that has a value.
-	if ( sideValues.length === 1 ) {
+	if ( hasOnlyAxialSides && sideValues.length === 1 ) {
 		let side;
 
 		Object.entries( values ).some( ( [ key, value ] ) => {
diff --git a/packages/block-editor/src/components/tabbed-sidebar/README.md b/packages/block-editor/src/components/tabbed-sidebar/README.md
new file mode 100644
index 00000000000000..42001dbfc79cb0
--- /dev/null
+++ b/packages/block-editor/src/components/tabbed-sidebar/README.md
@@ -0,0 +1,76 @@
+# Tabbed Panel
+
+The `TabbedPanel` component is used to create the secondary panels in the editor.
+
+## Development guidelines
+
+This acts as a wrapper for the `Tabs` component, but adding conventions that can be shared between all secondary panels, for example:
+
+-   A close button
+-   Tabs that fill the panel
+-   Custom scollbars
+
+### Usage
+
+Renders a block alignment toolbar with alignments options.
+
+```jsx
+import { TabbedSidebar } from '@wordpress/components';
+
+const MyTabbedSidebar = () => (
+	<TabbedSidebar
+		tabs={ [
+			{
+				name: 'slug-1',
+				title: _x( 'Title 1', 'context' ),
+				panel: <PanelContents>,
+				panelRef: useRef('an-optional-ref'),
+			},
+			{
+				name: 'slug-2',
+				title: _x( 'Title 2', 'context' ),
+				panel: <PanelContents />,
+			},
+		] }
+		onClose={ onClickCloseButton }
+		onSelect={ onSelectTab }
+		defaultTabId="slug-1"
+		ref={ tabsRef }
+	/>
+);
+```
+
+### Props
+
+### `defaultTabId`
+
+-   **Type:** `String`
+-   **Default:** `undefined`
+
+This is passed to the `Tabs` component so it can handle the tab to select by default when it component renders.
+
+### `onClose`
+
+-   **Type:** `Function`
+
+The function that is called when the close button is clicked.
+
+### `onSelect`
+
+-   **Type:** `Function`
+
+This is passed to the `Tabs` component - it will be called when a tab has been selected. It is passed the selected tab's ID as an argument.
+
+### `selectedTab`
+
+-   **Type:** `String`
+-   **Default:** `undefined`
+
+This is passed to the `Tabs` component - it will display this tab as selected.
+
+### `tabs`
+
+-   **Type:** `Array`
+-   **Default:** `undefined`
+
+An array of tabs which will be rendered as `TabList` and `TabPanel` components.
diff --git a/packages/block-editor/src/components/tabbed-sidebar/index.js b/packages/block-editor/src/components/tabbed-sidebar/index.js
new file mode 100644
index 00000000000000..a0cb510c720904
--- /dev/null
+++ b/packages/block-editor/src/components/tabbed-sidebar/index.js
@@ -0,0 +1,70 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	Button,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
+import { forwardRef } from '@wordpress/element';
+import { closeSmall } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { Tabs } = unlock( componentsPrivateApis );
+
+function TabbedSidebar(
+	{ defaultTabId, onClose, onSelect, selectedTab, tabs, closeButtonLabel },
+	ref
+) {
+	return (
+		<div className="block-editor-tabbed-sidebar">
+			<Tabs
+				selectOnMove={ false }
+				defaultTabId={ defaultTabId }
+				onSelect={ onSelect }
+				selectedTabId={ selectedTab }
+			>
+				<div className="block-editor-tabbed-sidebar__tablist-and-close-button">
+					<Button
+						className="block-editor-tabbed-sidebar__close-button"
+						icon={ closeSmall }
+						label={ closeButtonLabel }
+						onClick={ () => onClose() }
+						size="small"
+					/>
+
+					<Tabs.TabList
+						className="block-editor-tabbed-sidebar__tablist"
+						ref={ ref }
+					>
+						{ tabs.map( ( tab ) => (
+							<Tabs.Tab
+								key={ tab.name }
+								tabId={ tab.name }
+								className="block-editor-tabbed-sidebar__tab"
+							>
+								{ tab.title }
+							</Tabs.Tab>
+						) ) }
+					</Tabs.TabList>
+				</div>
+				{ tabs.map( ( tab ) => (
+					<Tabs.TabPanel
+						key={ tab.name }
+						tabId={ tab.name }
+						focusable={ false }
+						className="block-editor-tabbed-sidebar__tabpanel"
+						ref={ tab.panelRef }
+					>
+						{ tab.panel }
+					</Tabs.TabPanel>
+				) ) }
+			</Tabs>
+		</div>
+	);
+}
+
+export default forwardRef( TabbedSidebar );
diff --git a/packages/block-editor/src/components/tabbed-sidebar/style.scss b/packages/block-editor/src/components/tabbed-sidebar/style.scss
new file mode 100644
index 00000000000000..f7fba1c0003467
--- /dev/null
+++ b/packages/block-editor/src/components/tabbed-sidebar/style.scss
@@ -0,0 +1,35 @@
+.block-editor-tabbed-sidebar {
+	background-color: $white;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	flex-grow: 1;
+	overflow: hidden;
+}
+
+.block-editor-tabbed-sidebar__tablist-and-close-button {
+	border-bottom: $border-width solid $gray-300;
+	display: flex;
+	justify-content: space-between;
+	padding-right: $grid-unit-15;
+}
+
+
+.block-editor-tabbed-sidebar__close-button {
+	background: $white;
+	/* stylelint-disable-next-line property-disallowed-list -- This should be removed when https://github.com/WordPress/gutenberg/issues/59013 is fixed. */
+	order: 1;
+	align-self: center;
+}
+
+.block-editor-tabbed-sidebar__tablist {
+	margin-bottom: -$border-width;
+}
+
+.block-editor-tabbed-sidebar__tabpanel {
+	display: flex;
+	flex-grow: 1;
+	flex-direction: column;
+	overflow-y: auto;
+	scrollbar-gutter: auto;
+}
diff --git a/packages/block-editor/src/components/text-alignment-control/index.js b/packages/block-editor/src/components/text-alignment-control/index.js
new file mode 100644
index 00000000000000..6eeaad784db0f0
--- /dev/null
+++ b/packages/block-editor/src/components/text-alignment-control/index.js
@@ -0,0 +1,103 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import {
+	alignLeft,
+	alignCenter,
+	alignRight,
+	alignJustify,
+} from '@wordpress/icons';
+import { useMemo } from '@wordpress/element';
+import {
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
+} from '@wordpress/components';
+
+const TEXT_ALIGNMENT_OPTIONS = [
+	{
+		label: __( 'Align text left' ),
+		value: 'left',
+		icon: alignLeft,
+	},
+	{
+		label: __( 'Align text center' ),
+		value: 'center',
+		icon: alignCenter,
+	},
+	{
+		label: __( 'Align text right' ),
+		value: 'right',
+		icon: alignRight,
+	},
+	{
+		label: __( 'Justify text' ),
+		value: 'justify',
+		icon: alignJustify,
+	},
+];
+
+const DEFAULT_OPTIONS = [ 'left', 'center', 'right' ];
+
+/**
+ * Control to facilitate text alignment selections.
+ *
+ * @param {Object}   props           Component props.
+ * @param {string}   props.className Class name to add to the control.
+ * @param {string}   props.value     Currently selected text alignment.
+ * @param {Function} props.onChange  Handles change in text alignment selection.
+ * @param {string[]} props.options   Array of text alignment options to display.
+ *
+ * @return {Element} Text alignment control.
+ */
+export default function TextAlignmentControl( {
+	className,
+	value,
+	onChange,
+	options = DEFAULT_OPTIONS,
+} ) {
+	const validOptions = useMemo(
+		() =>
+			TEXT_ALIGNMENT_OPTIONS.filter( ( option ) =>
+				options.includes( option.value )
+			),
+		[ options ]
+	);
+
+	if ( ! validOptions.length ) {
+		return null;
+	}
+
+	return (
+		<ToggleGroupControl
+			isDeselectable
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			label={ __( 'Text alignment' ) }
+			className={ clsx(
+				'block-editor-text-alignment-control',
+				className
+			) }
+			value={ value }
+			onChange={ ( newValue ) => {
+				onChange( newValue === value ? undefined : newValue );
+			} }
+		>
+			{ validOptions.map( ( option ) => {
+				return (
+					<ToggleGroupControlOptionIcon
+						key={ option.value }
+						value={ option.value }
+						icon={ option.icon }
+						label={ option.label }
+					/>
+				);
+			} ) }
+		</ToggleGroupControl>
+	);
+}
diff --git a/packages/block-editor/src/components/text-alignment-control/stories/index.story.js b/packages/block-editor/src/components/text-alignment-control/stories/index.story.js
new file mode 100644
index 00000000000000..b2c171497acb0a
--- /dev/null
+++ b/packages/block-editor/src/components/text-alignment-control/stories/index.story.js
@@ -0,0 +1,39 @@
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import TextAlignmentControl from '../';
+
+export default {
+	title: 'BlockEditor/TextAlignmentControl',
+	component: TextAlignmentControl,
+	argTypes: {
+		onChange: { action: 'onChange' },
+		className: { control: 'text' },
+		options: {
+			control: 'check',
+			options: [ 'left', 'center', 'right', 'justify' ],
+		},
+		value: { control: { type: null } },
+	},
+};
+
+const Template = ( { onChange, ...args } ) => {
+	const [ value, setValue ] = useState();
+	return (
+		<TextAlignmentControl
+			{ ...args }
+			onChange={ ( ...changeArgs ) => {
+				onChange( ...changeArgs );
+				setValue( ...changeArgs );
+			} }
+			value={ value }
+		/>
+	);
+};
+
+export const Default = Template.bind( {} );
diff --git a/packages/block-editor/src/components/text-decoration-control/README.md b/packages/block-editor/src/components/text-decoration-control/README.md
new file mode 100644
index 00000000000000..a606140baa330e
--- /dev/null
+++ b/packages/block-editor/src/components/text-decoration-control/README.md
@@ -0,0 +1,40 @@
+# TextDecorationControl
+
+<div class="callout callout-alert">
+This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
+</div>
+<br />
+
+![TextDecorationControl Element in Inspector Control](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/text-decoration-component.png?raw=true)
+
+
+## Usage
+
+```jsx
+import { __experimentalTextDecorationControl as TextDecorationControl } from '@wordpress/block-editor';
+```
+
+Then, you can use the component in your block editor UI:
+
+```jsx
+<TextDecorationControl
+  value={textDecorationValue}
+  onChange={(newValue) => setAttributes({ textDecoration: newValue })}
+/>
+```
+
+### Props
+
+### `value`
+
+-   **Type:** `String`
+-   **Default:** `none`
+-   **Options:** `none`, `underline`, `line-through`
+
+The current value of the Text Decoration setting. You may only choose from the `Options` listed above.
+
+### `onChange`
+
+-   **Type:** `Function`
+
+A callback function invoked when the Text Decoration value is changed via an interaction with any of the buttons. Called with the Text Decoration value (`none`, `underline`, `line-through`) as the only argument.
\ No newline at end of file
diff --git a/packages/block-editor/src/components/text-decoration-control/index.js b/packages/block-editor/src/components/text-decoration-control/index.js
index 973fb71a7448f1..720f3d2d9558eb 100644
--- a/packages/block-editor/src/components/text-decoration-control/index.js
+++ b/packages/block-editor/src/components/text-decoration-control/index.js
@@ -1,28 +1,31 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { BaseControl, Button } from '@wordpress/components';
 import { reset, formatStrikethrough, formatUnderline } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
+import {
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
+} from '@wordpress/components';
 
 const TEXT_DECORATIONS = [
 	{
-		name: __( 'None' ),
+		label: __( 'None' ),
 		value: 'none',
 		icon: reset,
 	},
 	{
-		name: __( 'Underline' ),
+		label: __( 'Underline' ),
 		value: 'underline',
 		icon: formatUnderline,
 	},
 	{
-		name: __( 'Strikethrough' ),
+		label: __( 'Strikethrough' ),
 		value: 'line-through',
 		icon: formatStrikethrough,
 	},
@@ -31,10 +34,10 @@ const TEXT_DECORATIONS = [
 /**
  * Control to facilitate text decoration selections.
  *
- * @param {Object}   props             Component props.
- * @param {string}   props.value       Currently selected text decoration.
- * @param {Function} props.onChange    Handles change in text decoration selection.
- * @param {string}   [props.className] Additional class name to apply.
+ * @param {Object}   props           Component props.
+ * @param {string}   props.value     Currently selected text decoration.
+ * @param {Function} props.onChange  Handles change in text decoration selection.
+ * @param {string}   props.className Additional class name to apply.
  *
  * @return {Element} Text decoration control.
  */
@@ -44,34 +47,30 @@ export default function TextDecorationControl( {
 	className,
 } ) {
 	return (
-		<fieldset
-			className={ classnames(
+		<ToggleGroupControl
+			isDeselectable
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			label={ __( 'Decoration' ) }
+			className={ clsx(
 				'block-editor-text-decoration-control',
 				className
 			) }
+			value={ value }
+			onChange={ ( newValue ) => {
+				onChange( newValue === value ? undefined : newValue );
+			} }
 		>
-			<BaseControl.VisualLabel as="legend">
-				{ __( 'Decoration' ) }
-			</BaseControl.VisualLabel>
-			<div className="block-editor-text-decoration-control__buttons">
-				{ TEXT_DECORATIONS.map( ( textDecoration ) => {
-					return (
-						<Button
-							key={ textDecoration.value }
-							icon={ textDecoration.icon }
-							label={ textDecoration.name }
-							isPressed={ textDecoration.value === value }
-							onClick={ () => {
-								onChange(
-									textDecoration.value === value
-										? undefined
-										: textDecoration.value
-								);
-							} }
-						/>
-					);
-				} ) }
-			</div>
-		</fieldset>
+			{ TEXT_DECORATIONS.map( ( option ) => {
+				return (
+					<ToggleGroupControlOptionIcon
+						key={ option.value }
+						value={ option.value }
+						icon={ option.icon }
+						label={ option.label }
+					/>
+				);
+			} ) }
+		</ToggleGroupControl>
 	);
 }
diff --git a/packages/block-editor/src/components/text-decoration-control/stories/index.story.js b/packages/block-editor/src/components/text-decoration-control/stories/index.story.js
index cb50e4cd6c6f73..2212b484185cde 100644
--- a/packages/block-editor/src/components/text-decoration-control/stories/index.story.js
+++ b/packages/block-editor/src/components/text-decoration-control/stories/index.story.js
@@ -13,10 +13,6 @@ export default {
 	component: TextDecorationControl,
 	argTypes: {
 		onChange: { action: 'onChange' },
-		size: {
-			options: [ 'default', '__unstable-large' ],
-			control: { type: 'radio' },
-		},
 	},
 };
 
diff --git a/packages/block-editor/src/components/text-decoration-control/style.scss b/packages/block-editor/src/components/text-decoration-control/style.scss
deleted file mode 100644
index 689707a66b7ca9..00000000000000
--- a/packages/block-editor/src/components/text-decoration-control/style.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.block-editor-text-decoration-control {
-	border: 0;
-	margin: 0;
-	padding: 0;
-
-	.block-editor-text-decoration-control__buttons {
-		// 4px of padding makes the row 40px high, same as an input.
-		padding: $grid-unit-05 0;
-		display: flex;
-	}
-
-	.components-button.has-icon {
-		height: $grid-unit-40;
-		margin-right: $grid-unit-05;
-		min-width: $grid-unit-40;
-		padding: 0;
-	}
-}
diff --git a/packages/block-editor/src/components/text-transform-control/README.md b/packages/block-editor/src/components/text-transform-control/README.md
index 511b73b0ec696b..2d40cc16ba86f8 100644
--- a/packages/block-editor/src/components/text-transform-control/README.md
+++ b/packages/block-editor/src/components/text-transform-control/README.md
@@ -4,10 +4,6 @@ The `TextTransformControl` component is responsible for rendering a control elem
  
 ![TextTransformConrol Element in Inspector Control](https://raw.githubusercontent.com/WordPress/gutenberg/HEAD/docs/assets/text-transform-component.png?raw=true)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/text-transform-control/index.js b/packages/block-editor/src/components/text-transform-control/index.js
index c5d0ce37e9acd1..a3183e630c328a 100644
--- a/packages/block-editor/src/components/text-transform-control/index.js
+++ b/packages/block-editor/src/components/text-transform-control/index.js
@@ -1,12 +1,11 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { BaseControl, Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import {
 	reset,
@@ -14,25 +13,29 @@ import {
 	formatLowercase,
 	formatUppercase,
 } from '@wordpress/icons';
+import {
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
+} from '@wordpress/components';
 
 const TEXT_TRANSFORMS = [
 	{
-		name: __( 'None' ),
+		label: __( 'None' ),
 		value: 'none',
 		icon: reset,
 	},
 	{
-		name: __( 'Uppercase' ),
+		label: __( 'Uppercase' ),
 		value: 'uppercase',
 		icon: formatUppercase,
 	},
 	{
-		name: __( 'Lowercase' ),
+		label: __( 'Lowercase' ),
 		value: 'lowercase',
 		icon: formatLowercase,
 	},
 	{
-		name: __( 'Capitalize' ),
+		label: __( 'Capitalize' ),
 		value: 'capitalize',
 		icon: formatCapitalize,
 	},
@@ -50,34 +53,30 @@ const TEXT_TRANSFORMS = [
  */
 export default function TextTransformControl( { className, value, onChange } ) {
 	return (
-		<fieldset
-			className={ classnames(
+		<ToggleGroupControl
+			isDeselectable
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			label={ __( 'Letter case' ) }
+			className={ clsx(
 				'block-editor-text-transform-control',
 				className
 			) }
+			value={ value }
+			onChange={ ( newValue ) => {
+				onChange( newValue === value ? undefined : newValue );
+			} }
 		>
-			<BaseControl.VisualLabel as="legend">
-				{ __( 'Letter case' ) }
-			</BaseControl.VisualLabel>
-			<div className="block-editor-text-transform-control__buttons">
-				{ TEXT_TRANSFORMS.map( ( textTransform ) => {
-					return (
-						<Button
-							key={ textTransform.value }
-							icon={ textTransform.icon }
-							label={ textTransform.name }
-							isPressed={ textTransform.value === value }
-							onClick={ () => {
-								onChange(
-									textTransform.value === value
-										? undefined
-										: textTransform.value
-								);
-							} }
-						/>
-					);
-				} ) }
-			</div>
-		</fieldset>
+			{ TEXT_TRANSFORMS.map( ( option ) => {
+				return (
+					<ToggleGroupControlOptionIcon
+						key={ option.value }
+						value={ option.value }
+						icon={ option.icon }
+						label={ option.label }
+					/>
+				);
+			} ) }
+		</ToggleGroupControl>
 	);
 }
diff --git a/packages/block-editor/src/components/text-transform-control/stories/index.story.js b/packages/block-editor/src/components/text-transform-control/stories/index.story.js
index 3219d714257e81..96dd8ed479dc4e 100644
--- a/packages/block-editor/src/components/text-transform-control/stories/index.story.js
+++ b/packages/block-editor/src/components/text-transform-control/stories/index.story.js
@@ -13,10 +13,6 @@ export default {
 	component: TextTransformControl,
 	argTypes: {
 		onChange: { action: 'onChange' },
-		size: {
-			options: [ 'default', '__unstable-large' ],
-			control: { type: 'radio' },
-		},
 	},
 };
 
diff --git a/packages/block-editor/src/components/text-transform-control/style.scss b/packages/block-editor/src/components/text-transform-control/style.scss
deleted file mode 100644
index 0e097405e332b7..00000000000000
--- a/packages/block-editor/src/components/text-transform-control/style.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.block-editor-text-transform-control {
-	border: 0;
-	margin: 0;
-	padding: 0;
-
-	.block-editor-text-transform-control__buttons {
-		// 4px of padding makes the row 40px high, same as an input.
-		padding: $grid-unit-05 0;
-		display: flex;
-	}
-
-	.components-button.has-icon {
-		height: $grid-unit-40;
-		margin-right: $grid-unit-05;
-		min-width: $grid-unit-40;
-		padding: 0;
-	}
-}
diff --git a/packages/block-editor/src/components/tool-selector/index.js b/packages/block-editor/src/components/tool-selector/index.js
index 1e93a18cf6bb9e..8c4b5c86c40828 100644
--- a/packages/block-editor/src/components/tool-selector/index.js
+++ b/packages/block-editor/src/components/tool-selector/index.js
@@ -41,9 +41,10 @@ function ToolSelector( props, ref ) {
 		<Dropdown
 			renderToggle={ ( { isOpen, onToggle } ) => (
 				<Button
+					size="compact"
 					{ ...props }
 					ref={ ref }
-					icon={ mode === 'navigation' ? selectIcon : editIcon }
+					icon={ mode === 'navigation' ? editIcon : selectIcon }
 					aria-expanded={ isOpen }
 					aria-haspopup="true"
 					onClick={ onToggle }
@@ -54,37 +55,47 @@ function ToolSelector( props, ref ) {
 			popoverProps={ { placement: 'bottom-start' } }
 			renderContent={ () => (
 				<>
-					<NavigableMenu role="menu" aria-label={ __( 'Tools' ) }>
+					<NavigableMenu
+						className="block-editor-tool-selector__menu"
+						role="menu"
+						aria-label={ __( 'Tools' ) }
+					>
 						<MenuItemsChoice
 							value={
 								mode === 'navigation' ? 'navigation' : 'edit'
 							}
-							onSelect={ __unstableSetEditorMode }
+							onSelect={ ( newMode ) => {
+								__unstableSetEditorMode( newMode );
+							} }
 							choices={ [
 								{
-									value: 'edit',
+									value: 'navigation',
 									label: (
 										<>
 											<Icon icon={ editIcon } />
-											{ __( 'Edit' ) }
+											{ __( 'Write' ) }
 										</>
 									),
+									info: __( 'Focus on content.' ),
+									'aria-label': __( 'Write' ),
 								},
 								{
-									value: 'navigation',
+									value: 'edit',
 									label: (
 										<>
 											{ selectIcon }
-											{ __( 'Select' ) }
+											{ __( 'Design' ) }
 										</>
 									),
+									info: __( 'Edit layout and styles.' ),
+									'aria-label': __( 'Design' ),
 								},
 							] }
 						/>
 					</NavigableMenu>
 					<div className="block-editor-tool-selector__help">
 						{ __(
-							'Tools provide different interactions for selecting, navigating, and editing blocks. Toggle between select and edit by pressing Escape and Enter.'
+							'Tools provide different sets of interactions for blocks. Toggle between simplified content tools (Write) and advanced visual editing tools (Design).'
 						) }
 					</div>
 				</>
diff --git a/packages/block-editor/src/components/tool-selector/style.scss b/packages/block-editor/src/components/tool-selector/style.scss
index 03774fe0f6b9d3..07ca91d346d907 100644
--- a/packages/block-editor/src/components/tool-selector/style.scss
+++ b/packages/block-editor/src/components/tool-selector/style.scss
@@ -8,3 +8,8 @@
 	color: $gray-700;
 	min-width: 280px;
 }
+
+.block-editor-tool-selector__menu .components-menu-item__info {
+	margin-left: $grid-unit-30 + $grid-unit-15; // icon size + margin
+	text-align: left;
+}
diff --git a/packages/block-editor/src/components/ungroup-button/README.md b/packages/block-editor/src/components/ungroup-button/README.md
index e869e6266f5b85..fe1985535b103e 100644
--- a/packages/block-editor/src/components/ungroup-button/README.md
+++ b/packages/block-editor/src/components/ungroup-button/README.md
@@ -6,11 +6,6 @@ This only happens in the mobile WordPress apps.
 
 ![Ungroup button icon](https://user-images.githubusercontent.com/21242757/65593577-11006000-df91-11e9-8460-1179e9ef46d2.png)
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/unit-control/README.md b/packages/block-editor/src/components/unit-control/README.md
index e5126e7bf45242..7cd5269f00d032 100644
--- a/packages/block-editor/src/components/unit-control/README.md
+++ b/packages/block-editor/src/components/unit-control/README.md
@@ -15,10 +15,6 @@ UnitControl component allows the user to set a value as well as a unit (e.g. `px
 }
 ```
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-
 ## Developer guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/url-input/README.md b/packages/block-editor/src/components/url-input/README.md
index 9d3e340371a608..714f7f062990f6 100644
--- a/packages/block-editor/src/components/url-input/README.md
+++ b/packages/block-editor/src/components/url-input/README.md
@@ -130,10 +130,6 @@ When hiding the URLInput using CSS (as is sometimes done for accessibility purpo
 
 This prop allows the suggestions list to be programmatically not rendered by passing a boolean—it can be `true` to make sure suggestions aren't rendered, or `false`/`undefined` to fall back to the default behaviour of showing suggestions when matching autocompletion items are found.
 
-### `__nextHasNoMarginBottom: Boolean`
-
-Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 6.4. (The prop can be safely removed once this happens.)
-
 ## Example
 
 
@@ -156,7 +152,6 @@ registerBlockType( /* ... */, {
 	edit( { className, attributes, setAttributes } ) {
 		return (
 			<URLInput
-				__nextHasNoMarginBottom
 				className={ className }
 				value={ attributes.url }
 				onChange={ ( url, post ) => setAttributes( { url, text: (post && post.title) || 'Click here' } ) }
diff --git a/packages/block-editor/src/components/url-input/button.js b/packages/block-editor/src/components/url-input/button.js
index fca054993e7c3c..560f5cd7d3d5db 100644
--- a/packages/block-editor/src/components/url-input/button.js
+++ b/packages/block-editor/src/components/url-input/button.js
@@ -3,7 +3,10 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Component } from '@wordpress/element';
-import { Button } from '@wordpress/components';
+import {
+	Button,
+	__experimentalInputControlSuffixWrapper as InputControlSuffixWrapper,
+} from '@wordpress/components';
 import { link, keyboardReturn, arrowLeft } from '@wordpress/icons';
 
 /**
@@ -38,6 +41,7 @@ class URLInputButton extends Component {
 		return (
 			<div className="block-editor-url-input__button">
 				<Button
+					size="compact"
 					icon={ link }
 					label={ buttonLabel }
 					onClick={ this.toggle }
@@ -51,20 +55,25 @@ class URLInputButton extends Component {
 					>
 						<div className="block-editor-url-input__button-modal-line">
 							<Button
+								__next40pxDefaultSize
 								className="block-editor-url-input__back"
 								icon={ arrowLeft }
 								label={ __( 'Close' ) }
 								onClick={ this.toggle }
 							/>
 							<URLInput
-								__nextHasNoMarginBottom
 								value={ url || '' }
 								onChange={ onChange }
-							/>
-							<Button
-								icon={ keyboardReturn }
-								label={ __( 'Submit' ) }
-								type="submit"
+								suffix={
+									<InputControlSuffixWrapper variant="control">
+										<Button
+											size="small"
+											icon={ keyboardReturn }
+											label={ __( 'Submit' ) }
+											type="submit"
+										/>
+									</InputControlSuffixWrapper>
+								}
 							/>
 						</div>
 					</form>
diff --git a/packages/block-editor/src/components/url-input/index.js b/packages/block-editor/src/components/url-input/index.js
index 1451397ce68e5f..cb058be5c932f6 100644
--- a/packages/block-editor/src/components/url-input/index.js
+++ b/packages/block-editor/src/components/url-input/index.js
@@ -1,19 +1,18 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
-import scrollIntoView from 'dom-scroll-into-view';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import deprecated from '@wordpress/deprecated';
 import { __, sprintf, _n } from '@wordpress/i18n';
 import { Component, createRef } from '@wordpress/element';
 import { UP, DOWN, ENTER, TAB } from '@wordpress/keycodes';
 import {
 	BaseControl,
 	Button,
+	__experimentalInputControl as InputControl,
 	Spinner,
 	withSpokenMessages,
 	Popover,
@@ -66,7 +65,6 @@ class URLInput extends Component {
 		this.state = {
 			suggestions: [],
 			showSuggestions: false,
-			isUpdatingSuggestions: false,
 			suggestionsValue: null,
 			selectedSuggestion: null,
 			suggestionsListboxId: '',
@@ -84,29 +82,17 @@ class URLInput extends Component {
 		if (
 			showSuggestions &&
 			selectedSuggestion !== null &&
-			this.suggestionNodes[ selectedSuggestion ] &&
-			! this.scrollingIntoView
+			this.suggestionNodes[ selectedSuggestion ]
 		) {
-			this.scrollingIntoView = true;
-			scrollIntoView(
-				this.suggestionNodes[ selectedSuggestion ],
-				this.autocompleteRef.current,
-				{
-					onlyScrollIfNeeded: true,
-				}
-			);
-
-			this.props.setTimeout( () => {
-				this.scrollingIntoView = false;
-			}, 100 );
+			this.suggestionNodes[ selectedSuggestion ].scrollIntoView( {
+				behavior: 'instant',
+				block: 'nearest',
+				inline: 'nearest',
+			} );
 		}
 
 		// Update suggestions when the value changes.
-		if (
-			prevProps.value !== value &&
-			! this.props.disableSuggestions &&
-			! this.state.isUpdatingSuggestions
-		) {
+		if ( prevProps.value !== value && ! this.props.disableSuggestions ) {
 			if ( value?.length ) {
 				// If the new value is not empty we need to update with suggestions for it.
 				this.updateSuggestions( value );
@@ -183,7 +169,6 @@ class URLInput extends Component {
 		}
 
 		this.setState( {
-			isUpdatingSuggestions: true,
 			selectedSuggestion: null,
 			loading: true,
 		} );
@@ -203,7 +188,6 @@ class URLInput extends Component {
 
 				this.setState( {
 					suggestions,
-					isUpdatingSuggestions: false,
 					suggestionsValue: value,
 					loading: false,
 					showSuggestions: !! suggestions.length,
@@ -235,9 +219,15 @@ class URLInput extends Component {
 				}
 
 				this.setState( {
-					isUpdatingSuggestions: false,
 					loading: false,
 				} );
+			} )
+			.finally( () => {
+				// If this is the current promise then reset the reference
+				// to allow for checking if a new request is made.
+				if ( this.suggestionsRequest === request ) {
+					this.suggestionsRequest = null;
+				}
 			} );
 
 		// Note that this assignment is handled *before* the async search request
@@ -245,8 +235,8 @@ class URLInput extends Component {
 		this.suggestionsRequest = request;
 	}
 
-	onChange( event ) {
-		this.props.onChange( event.target.value );
+	onChange( newValue ) {
+		this.props.onChange( newValue );
 	}
 
 	onFocus() {
@@ -255,11 +245,12 @@ class URLInput extends Component {
 
 		// When opening the link editor, if there's a value present, we want to load the suggestions pane with the results for this input search value
 		// Don't re-run the suggestions on focus if there are already suggestions present (prevents searching again when tabbing between the input and buttons)
+		// or there is already a request in progress.
 		if (
 			value &&
 			! disableSuggestions &&
-			! this.state.isUpdatingSuggestions &&
-			! ( suggestions && suggestions.length )
+			! ( suggestions && suggestions.length ) &&
+			this.suggestionsRequest === null
 		) {
 			// Ensure the suggestions are updated with the current input value.
 			this.updateSuggestions( value );
@@ -425,8 +416,6 @@ class URLInput extends Component {
 
 	renderControl() {
 		const {
-			/** Start opting into the new margin-free styles that will become the default in a future version. */
-			__nextHasNoMarginBottom = false,
 			label = null,
 			className,
 			isFullWidth,
@@ -450,7 +439,7 @@ class URLInput extends Component {
 		const controlProps = {
 			id: inputId, // Passes attribute to label for the for attribute
 			label,
-			className: classnames( 'block-editor-url-input', className, {
+			className: clsx( 'block-editor-url-input', className, {
 				'is-full-width': isFullWidth,
 			} ),
 			hideLabelFromVision,
@@ -460,7 +449,6 @@ class URLInput extends Component {
 			id: inputId,
 			value,
 			required: true,
-			className: 'block-editor-url-input__input',
 			type: 'text',
 			onChange: this.onChange,
 			onFocus: this.onFocus,
@@ -476,26 +464,16 @@ class URLInput extends Component {
 					? `${ suggestionOptionIdPrefix }-${ selectedSuggestion }`
 					: undefined,
 			ref: this.inputRef,
+			suffix: this.props.suffix,
 		};
 
 		if ( renderControl ) {
 			return renderControl( controlProps, inputProps, loading );
 		}
 
-		if ( ! __nextHasNoMarginBottom ) {
-			deprecated( 'Bottom margin styles for wp.blockEditor.URLInput', {
-				since: '6.2',
-				version: '6.5',
-				hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version',
-			} );
-		}
-
 		return (
-			<BaseControl
-				__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
-				{ ...controlProps }
-			>
-				<input { ...inputProps } />
+			<BaseControl __nextHasNoMarginBottom { ...controlProps }>
+				<InputControl { ...inputProps } __next40pxDefaultSize />
 				{ loading && <Spinner /> }
 			</BaseControl>
 		);
@@ -555,16 +533,17 @@ class URLInput extends Component {
 			<Popover placement="bottom" focusOnMount={ false }>
 				<div
 					{ ...suggestionsListProps }
-					className={ classnames(
+					className={ clsx(
 						'block-editor-url-input__suggestions',
 						`${ className }__suggestions`
 					) }
 				>
 					{ suggestions.map( ( suggestion, index ) => (
 						<Button
+							__next40pxDefaultSize
 							{ ...buildSuggestionItemProps( suggestion, index ) }
 							key={ suggestion.id }
-							className={ classnames(
+							className={ clsx(
 								'block-editor-url-input__suggestion',
 								{
 									'is-selected': index === selectedSuggestion,
diff --git a/packages/block-editor/src/components/url-input/style.scss b/packages/block-editor/src/components/url-input/style.scss
index 214866ccbab183..ef37566f8e34e0 100644
--- a/packages/block-editor/src/components/url-input/style.scss
+++ b/packages/block-editor/src/components/url-input/style.scss
@@ -9,35 +9,14 @@ $input-size: 300px;
 	position: relative;
 	padding: 1px;
 
-	input[type="text"] {
-		width: 100%;
-		@include break-small() {
-			width: $input-size;
-		}
-		padding: $input-padding;
-		border: none;
-		border-radius: 0;
-		margin-left: 0;
-		margin-right: 0;
-
-		/* Fonts smaller than 16px causes mobile safari to zoom. */
-		font-size: $mobile-text-min-font-size;
-		@include break-small {
-			font-size: $default-font-size;
-		}
-
-		&::-ms-clear {
-			display: none;
-		}
+	@include break-small() {
+		min-width: $input-size;
+		width: auto;
 	}
 
 	&.is-full-width {
 		width: 100%;
 
-		.block-editor-url-input__input[type="text"] {
-			width: 100%;
-		}
-
 		&__suggestions {
 			width: 100%;
 		}
@@ -51,10 +30,6 @@ $input-size: 300px;
 	}
 }
 
-.block-editor-url-input__input[type="text"] {
-	@include input-control;
-}
-
 // Suggestions
 .block-editor-url-input__suggestions {
 	max-height: 200px;
@@ -122,8 +97,8 @@ $input-size: 300px;
 }
 
 .block-editor-url-input__button-modal {
-	box-shadow: $shadow-popover;
-	border: 1px solid $gray-300;
+	box-shadow: $elevation-x-small;
+	border: $border-width solid $gray-300;
 	background: $white;
 }
 
@@ -134,10 +109,4 @@ $input-size: 300px;
 	flex-shrink: 1;
 	min-width: 0;
 	align-items: flex-start;
-
-	.components-button {
-		flex-shrink: 0;
-		width: $button-size;
-		height: $button-size;
-	}
 }
diff --git a/packages/block-editor/src/components/url-popover/image-url-input-ui.js b/packages/block-editor/src/components/url-popover/image-url-input-ui.js
index 7caa218658b24c..c68cf5e58b9530 100644
--- a/packages/block-editor/src/components/url-popover/image-url-input-ui.js
+++ b/packages/block-editor/src/components/url-popover/image-url-input-ui.js
@@ -2,19 +2,25 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useRef, useState } from '@wordpress/element';
+import { useRef, useEffect, useState } from '@wordpress/element';
+import { focus } from '@wordpress/dom';
 import {
 	ToolbarButton,
-	Button,
 	NavigableMenu,
+	Button,
 	MenuItem,
 	ToggleControl,
 	TextControl,
-	SVG,
-	Path,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
-import { link as linkIcon, close } from '@wordpress/icons';
+import {
+	Icon,
+	link as linkIcon,
+	image,
+	page,
+	fullscreen,
+	linkOff,
+} from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -27,14 +33,6 @@ const LINK_DESTINATION_MEDIA = 'media';
 const LINK_DESTINATION_ATTACHMENT = 'attachment';
 const NEW_TAB_REL = [ 'noreferrer', 'noopener' ];
 
-const icon = (
-	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-		<Path d="M0,0h24v24H0V0z" fill="none" />
-		<Path d="m19 5v14h-14v-14h14m0-2h-14c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2v-14c0-1.1-0.9-2-2-2z" />
-		<Path d="m14.14 11.86l-3 3.87-2.14-2.59-3 3.86h12l-3.86-5.14z" />
-	</SVG>
-);
-
 const ImageURLInputUI = ( {
 	linkDestination,
 	onChangeUrl,
@@ -45,6 +43,10 @@ const ImageURLInputUI = ( {
 	linkTarget,
 	linkClass,
 	rel,
+	showLightboxSetting,
+	lightboxEnabled,
+	onSetLightbox,
+	resetLightbox,
 } ) => {
 	const [ isOpen, setIsOpen ] = useState( false );
 	// Use internal state instead of a ref to make sure that the component
@@ -58,6 +60,17 @@ const ImageURLInputUI = ( {
 	const [ urlInput, setUrlInput ] = useState( null );
 
 	const autocompleteRef = useRef( null );
+	const wrapperRef = useRef();
+
+	useEffect( () => {
+		if ( ! wrapperRef.current ) {
+			return;
+		}
+		const nextFocusTarget =
+			focus.focusable.find( wrapperRef.current )[ 0 ] ||
+			wrapperRef.current;
+		nextFocusTarget.focus();
+	}, [ isEditingLink, url, lightboxEnabled ] );
 
 	const startEditLink = () => {
 		if (
@@ -138,6 +151,7 @@ const ImageURLInputUI = ( {
 				onChangeUrl( {
 					href: urlInput,
 					linkDestination: selectedDestination,
+					lightbox: { enabled: false },
 				} );
 			}
 			stopEditLink();
@@ -157,22 +171,17 @@ const ImageURLInputUI = ( {
 		const linkDestinations = [
 			{
 				linkDestination: LINK_DESTINATION_MEDIA,
-				title: __( 'Media File' ),
+				title: __( 'Link to image file' ),
 				url: mediaType === 'image' ? mediaUrl : undefined,
-				icon,
+				icon: image,
 			},
 		];
 		if ( mediaType === 'image' && mediaLink ) {
 			linkDestinations.push( {
 				linkDestination: LINK_DESTINATION_ATTACHMENT,
-				title: __( 'Attachment Page' ),
+				title: __( 'Link to attachment page' ),
 				url: mediaType === 'image' ? mediaLink : undefined,
-				icon: (
-					<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-						<Path d="M0 0h24v24H0V0z" fill="none" />
-						<Path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zM6 20V4h7v5h5v11H6z" />
-					</SVG>
-				),
+				icon: page,
 			} );
 		}
 		return linkDestinations;
@@ -218,14 +227,16 @@ const ImageURLInputUI = ( {
 				checked={ linkTarget === '_blank' }
 			/>
 			<TextControl
+				__next40pxDefaultSize
 				__nextHasNoMarginBottom
 				label={ __( 'Link rel' ) }
 				value={ rel ?? '' }
 				onChange={ onSetLinkRel }
 			/>
 			<TextControl
+				__next40pxDefaultSize
 				__nextHasNoMarginBottom
-				label={ __( 'Link CSS Class' ) }
+				label={ __( 'Link CSS class' ) }
 				value={ linkClass || '' }
 				onChange={ onSetLinkClass }
 			/>
@@ -233,6 +244,9 @@ const ImageURLInputUI = ( {
 	);
 
 	const linkEditorValue = urlInput !== null ? urlInput : url;
+	const hideLightboxPanel =
+		! lightboxEnabled || ( lightboxEnabled && ! showLightboxSetting );
+	const showLinkEditor = ! linkEditorValue && hideLightboxPanel;
 
 	const urlLabel = (
 		getLinkDestinations().find(
@@ -240,30 +254,95 @@ const ImageURLInputUI = ( {
 		) || {}
 	).title;
 
+	const PopoverChildren = () => {
+		if (
+			lightboxEnabled &&
+			showLightboxSetting &&
+			! url &&
+			! isEditingLink
+		) {
+			return (
+				<div className="block-editor-url-popover__expand-on-click">
+					<Icon icon={ fullscreen } />
+					<div className="text">
+						<p>{ __( 'Expand on click' ) }</p>
+						<p className="description">
+							{ __( 'Scales the image with a lightbox effect' ) }
+						</p>
+					</div>
+					<Button
+						icon={ linkOff }
+						label={ __( 'Disable expand on click' ) }
+						onClick={ () => {
+							onSetLightbox?.( false );
+						} }
+						size="compact"
+					/>
+				</div>
+			);
+		} else if ( ! url || isEditingLink ) {
+			return (
+				<URLPopover.LinkEditor
+					className="block-editor-format-toolbar__link-container-content"
+					value={ linkEditorValue }
+					onChangeInputValue={ setUrlInput }
+					onSubmit={ onSubmitLinkChange() }
+					autocompleteRef={ autocompleteRef }
+				/>
+			);
+		} else if ( url && ! isEditingLink ) {
+			return (
+				<>
+					<URLPopover.LinkViewer
+						className="block-editor-format-toolbar__link-container-content"
+						url={ url }
+						onEditLinkClick={ startEditLink }
+						urlLabel={ urlLabel }
+					/>
+					<Button
+						icon={ linkOff }
+						label={ __( 'Remove link' ) }
+						onClick={ () => {
+							onLinkRemove();
+							resetLightbox?.();
+						} }
+						size="compact"
+					/>
+				</>
+			);
+		}
+	};
+
 	return (
 		<>
 			<ToolbarButton
 				icon={ linkIcon }
 				className="components-toolbar__control"
-				label={ url ? __( 'Edit link' ) : __( 'Insert link' ) }
+				label={ __( 'Link' ) }
 				aria-expanded={ isOpen }
 				onClick={ openLinkUI }
 				ref={ setPopoverAnchor }
-				isActive={ !! url }
+				isActive={
+					!! url || ( lightboxEnabled && showLightboxSetting )
+				}
 			/>
 			{ isOpen && (
 				<URLPopover
+					ref={ wrapperRef }
 					anchor={ popoverAnchor }
 					onFocusOutside={ onFocusOutside() }
 					onClose={ closeLinkUI }
-					renderSettings={ () => advancedOptions }
+					renderSettings={
+						hideLightboxPanel ? () => advancedOptions : null
+					}
 					additionalControls={
-						! linkEditorValue && (
+						showLinkEditor && (
 							<NavigableMenu>
 								{ getLinkDestinations().map( ( link ) => (
 									<MenuItem
 										key={ link.linkDestination }
 										icon={ link.icon }
+										iconPosition="left"
 										onClick={ () => {
 											setUrlInput( null );
 											onSetHref( link.url );
@@ -273,34 +352,35 @@ const ImageURLInputUI = ( {
 										{ link.title }
 									</MenuItem>
 								) ) }
+								{ showLightboxSetting && (
+									<MenuItem
+										key="expand-on-click"
+										className="block-editor-url-popover__expand-on-click"
+										icon={ fullscreen }
+										info={ __(
+											'Scale the image with a lightbox effect.'
+										) }
+										iconPosition="left"
+										onClick={ () => {
+											setUrlInput( null );
+											onChangeUrl( {
+												linkDestination:
+													LINK_DESTINATION_NONE,
+												href: '',
+											} );
+											onSetLightbox?.( true );
+											stopEditLink();
+										} }
+									>
+										{ __( 'Expand on click' ) }
+									</MenuItem>
+								) }
 							</NavigableMenu>
 						)
 					}
+					offset={ 13 }
 				>
-					{ ( ! url || isEditingLink ) && (
-						<URLPopover.LinkEditor
-							className="block-editor-format-toolbar__link-container-content"
-							value={ linkEditorValue }
-							onChangeInputValue={ setUrlInput }
-							onSubmit={ onSubmitLinkChange() }
-							autocompleteRef={ autocompleteRef }
-						/>
-					) }
-					{ url && ! isEditingLink && (
-						<>
-							<URLPopover.LinkViewer
-								className="block-editor-format-toolbar__link-container-content"
-								url={ url }
-								onEditLinkClick={ startEditLink }
-								urlLabel={ urlLabel }
-							/>
-							<Button
-								icon={ close }
-								label={ __( 'Remove link' ) }
-								onClick={ onLinkRemove }
-							/>
-						</>
-					) }
+					{ PopoverChildren() }
 				</URLPopover>
 			) }
 		</>
diff --git a/packages/block-editor/src/components/url-popover/index.js b/packages/block-editor/src/components/url-popover/index.js
index 071d2c7e00b8bd..db71d8127e7a48 100644
--- a/packages/block-editor/src/components/url-popover/index.js
+++ b/packages/block-editor/src/components/url-popover/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useState } from '@wordpress/element';
+import { forwardRef, useState } from '@wordpress/element';
 import {
 	Button,
 	Popover,
@@ -24,81 +24,92 @@ const { __experimentalPopoverLegacyPositionToPlacement } = unlock(
 
 const DEFAULT_PLACEMENT = 'bottom';
 
-function URLPopover( {
-	additionalControls,
-	children,
-	renderSettings,
-	// The DEFAULT_PLACEMENT value is assigned inside the function's body
-	placement,
-	focusOnMount = 'firstElement',
-	// Deprecated
-	position,
-	// Rest
-	...popoverProps
-} ) {
-	if ( position !== undefined ) {
-		deprecated( '`position` prop in wp.blockEditor.URLPopover', {
-			since: '6.2',
-			alternative: '`placement` prop',
-		} );
-	}
+const URLPopover = forwardRef(
+	(
+		{
+			additionalControls,
+			children,
+			renderSettings,
+			// The DEFAULT_PLACEMENT value is assigned inside the function's body
+			placement,
+			focusOnMount = 'firstElement',
+			// Deprecated
+			position,
+			// Rest
+			...popoverProps
+		},
+		ref
+	) => {
+		if ( position !== undefined ) {
+			deprecated( '`position` prop in wp.blockEditor.URLPopover', {
+				since: '6.2',
+				alternative: '`placement` prop',
+			} );
+		}
 
-	// Compute popover's placement:
-	// - give priority to `placement` prop, if defined
-	// - otherwise, compute it from the legacy `position` prop (if defined)
-	// - finally, fallback to the DEFAULT_PLACEMENT.
-	let computedPlacement;
-	if ( placement !== undefined ) {
-		computedPlacement = placement;
-	} else if ( position !== undefined ) {
-		computedPlacement =
-			__experimentalPopoverLegacyPositionToPlacement( position );
-	}
-	computedPlacement = computedPlacement || DEFAULT_PLACEMENT;
+		// Compute popover's placement:
+		// - give priority to `placement` prop, if defined
+		// - otherwise, compute it from the legacy `position` prop (if defined)
+		// - finally, fallback to the DEFAULT_PLACEMENT.
+		let computedPlacement;
+		if ( placement !== undefined ) {
+			computedPlacement = placement;
+		} else if ( position !== undefined ) {
+			computedPlacement =
+				__experimentalPopoverLegacyPositionToPlacement( position );
+		}
+		computedPlacement = computedPlacement || DEFAULT_PLACEMENT;
 
-	const [ isSettingsExpanded, setIsSettingsExpanded ] = useState( false );
+		const [ isSettingsExpanded, setIsSettingsExpanded ] = useState( false );
 
-	const showSettings = !! renderSettings && isSettingsExpanded;
+		const showSettings = !! renderSettings && isSettingsExpanded;
 
-	const toggleSettingsVisibility = () => {
-		setIsSettingsExpanded( ! isSettingsExpanded );
-	};
+		const toggleSettingsVisibility = () => {
+			setIsSettingsExpanded( ! isSettingsExpanded );
+		};
 
-	return (
-		<Popover
-			className="block-editor-url-popover"
-			focusOnMount={ focusOnMount }
-			placement={ computedPlacement }
-			shift
-			{ ...popoverProps }
-		>
-			<div className="block-editor-url-popover__input-container">
-				<div className="block-editor-url-popover__row">
-					{ children }
-					{ !! renderSettings && (
-						<Button
-							className="block-editor-url-popover__settings-toggle"
-							icon={ chevronDown }
-							label={ __( 'Link settings' ) }
-							onClick={ toggleSettingsVisibility }
-							aria-expanded={ isSettingsExpanded }
-						/>
-					) }
+		return (
+			<Popover
+				ref={ ref }
+				role="dialog"
+				aria-modal="true"
+				aria-label={ __( 'Edit URL' ) }
+				className="block-editor-url-popover"
+				focusOnMount={ focusOnMount }
+				placement={ computedPlacement }
+				shift
+				variant="toolbar"
+				{ ...popoverProps }
+			>
+				<div className="block-editor-url-popover__input-container">
+					<div className="block-editor-url-popover__row">
+						{ children }
+						{ !! renderSettings && (
+							<Button
+								className="block-editor-url-popover__settings-toggle"
+								icon={ chevronDown }
+								label={ __( 'Link settings' ) }
+								onClick={ toggleSettingsVisibility }
+								aria-expanded={ isSettingsExpanded }
+								size="compact"
+							/>
+						) }
+					</div>
 				</div>
 				{ showSettings && (
-					<div className="block-editor-url-popover__row block-editor-url-popover__settings">
+					<div className="block-editor-url-popover__settings">
 						{ renderSettings() }
 					</div>
 				) }
-			</div>
-			{ additionalControls && ! showSettings && (
-				<div className="block-editor-url-popover__additional-controls">
-					{ additionalControls }
-				</div>
-			) }
-		</Popover>
-	);
-}
+				{ additionalControls && ! showSettings && (
+					<div className="block-editor-url-popover__additional-controls">
+						{ additionalControls }
+					</div>
+				) }
+			</Popover>
+		);
+	}
+);
 
 URLPopover.LinkEditor = LinkEditor;
 
diff --git a/packages/block-editor/src/components/url-popover/link-editor.js b/packages/block-editor/src/components/url-popover/link-editor.js
index b0502fbb2a402d..e7d39eed764b84 100644
--- a/packages/block-editor/src/components/url-popover/link-editor.js
+++ b/packages/block-editor/src/components/url-popover/link-editor.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -24,14 +24,13 @@ export default function LinkEditor( {
 } ) {
 	return (
 		<form
-			className={ classnames(
+			className={ clsx(
 				'block-editor-url-popover__link-editor',
 				className
 			) }
 			{ ...props }
 		>
 			<URLInput
-				__nextHasNoMarginBottom
 				value={ value }
 				onChange={ onChangeInputValue }
 				autocompleteRef={ autocompleteRef }
@@ -40,6 +39,7 @@ export default function LinkEditor( {
 				icon={ keyboardReturn }
 				label={ __( 'Apply' ) }
 				type="submit"
+				size="compact"
 			/>
 		</form>
 	);
diff --git a/packages/block-editor/src/components/url-popover/link-viewer-url.js b/packages/block-editor/src/components/url-popover/link-viewer-url.js
index 5cf710f2030097..c465cd5ad50ebe 100644
--- a/packages/block-editor/src/components/url-popover/link-viewer-url.js
+++ b/packages/block-editor/src/components/url-popover/link-viewer-url.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -10,7 +10,7 @@ import { ExternalLink } from '@wordpress/components';
 import { safeDecodeURI, filterURLForDisplay } from '@wordpress/url';
 
 export default function LinkViewerURL( { url, urlLabel, className } ) {
-	const linkClassName = classnames(
+	const linkClassName = clsx(
 		className,
 		'block-editor-url-popover__link-viewer-url'
 	);
diff --git a/packages/block-editor/src/components/url-popover/link-viewer.js b/packages/block-editor/src/components/url-popover/link-viewer.js
index d34c9baa377340..2b3249b7ba0aac 100644
--- a/packages/block-editor/src/components/url-popover/link-viewer.js
+++ b/packages/block-editor/src/components/url-popover/link-viewer.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -25,7 +25,7 @@ export default function LinkViewer( {
 } ) {
 	return (
 		<div
-			className={ classnames(
+			className={ clsx(
 				'block-editor-url-popover__link-viewer',
 				className
 			) }
@@ -41,6 +41,7 @@ export default function LinkViewer( {
 					icon={ edit }
 					label={ __( 'Edit' ) }
 					onClick={ onEditLinkClick }
+					size="compact"
 				/>
 			) }
 		</div>
diff --git a/packages/block-editor/src/components/url-popover/stories/index.story.js b/packages/block-editor/src/components/url-popover/stories/index.story.js
index 5d548f964062a4..ceed23eed6b841 100644
--- a/packages/block-editor/src/components/url-popover/stories/index.story.js
+++ b/packages/block-editor/src/components/url-popover/stories/index.story.js
@@ -22,7 +22,12 @@ const TestURLPopover = () => {
 
 	return (
 		<>
-			<Button onClick={ () => setVisiblility( true ) }>Edit URL</Button>
+			<Button
+				__next40pxDefaultSize
+				onClick={ () => setVisiblility( true ) }
+			>
+				Edit URL
+			</Button>
 			{ isVisible && (
 				<URLPopover
 					onClose={ close }
@@ -37,6 +42,7 @@ const TestURLPopover = () => {
 					<form onSubmit={ close }>
 						<input type="url" value={ url } onChange={ setUrl } />
 						<Button
+							__next40pxDefaultSize
 							icon={ keyboardReturn }
 							label={ __( 'Apply' ) }
 							type="submit"
diff --git a/packages/block-editor/src/components/url-popover/style.scss b/packages/block-editor/src/components/url-popover/style.scss
index b0aacc5ff6e41e..8c9d867071017d 100644
--- a/packages/block-editor/src/components/url-popover/style.scss
+++ b/packages/block-editor/src/components/url-popover/style.scss
@@ -1,53 +1,39 @@
 .block-editor-url-popover__additional-controls {
-	border-top: $border-width solid $gray-300;
+	border-top: $border-width solid $gray-900;
+	padding: $grid-unit-10 $grid-unit-10;
 }
 
-.block-editor-url-popover__additional-controls > div[role="menu"] .components-button:not(:disabled):not([aria-disabled="true"]):not(.is-secondary) > svg {
-	box-shadow: none;
-}
-
-.block-editor-url-popover__additional-controls div[role="menu"] > .components-button {
-	padding-left: $grid-unit-15;
+.block-editor-url-popover__input-container {
+	padding: $grid-unit-10;
 }
 
 .block-editor-url-popover__row {
 	display: flex;
+	gap: $grid-unit-05;
+	align-items: center;
 }
 
 // Any children of the popover-row that are not the settings-toggle
 // should take up as much space as possible.
 .block-editor-url-popover__row > :not(.block-editor-url-popover__settings-toggle) {
 	flex-grow: 1;
+	gap: $grid-unit-10;
 }
 
-// Mimic toolbar component styles for the icons in this popover.
-.block-editor-url-popover .components-button.has-icon {
-	padding: 3px;
+.block-editor-url-popover__additional-controls .components-button.has-icon {
+	padding-left: $grid-unit-10;
+	padding-right: $grid-unit-10;
+	height: auto;
+	text-align: left;
 
 	> svg {
-		padding: 5px;
-		border-radius: $radius-block-ui;
-		height: 30px;
-		width: 30px;
-	}
-
-	&:not(:disabled):focus {
-		box-shadow: none;
-
-		> svg {
-			@include block-toolbar-button-style__focus();
-		}
+		margin-right: $grid-unit-10;
 	}
 }
 
 .block-editor-url-popover__settings-toggle {
 	flex-shrink: 0;
 
-	// Add a left divider to the toggle button.
-	border-radius: 0;
-	border-left: $border-width solid $gray-300;
-	margin-left: 1px;
-
 	&[aria-expanded="true"] .dashicon {
 		transform: rotate(180deg);
 	}
@@ -56,7 +42,7 @@
 .block-editor-url-popover__settings {
 	display: block;
 	padding: $grid-unit-20;
-	border-top: $border-width solid $gray-300;
+	border-top: $border-width solid $gray-900;
 }
 
 .block-editor-url-popover__link-editor,
@@ -65,16 +51,43 @@
 }
 
 .block-editor-url-popover__link-viewer-url {
-	margin: $grid-unit-10 - $border-width;
+	display: flex;
+	align-items: center;
 	flex-grow: 1;
 	flex-shrink: 1;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
+	margin-right: $grid-unit-10;
 	min-width: 150px;
-	max-width: 500px;
+	// Avoids the popover from growing too wide when the URL is long.
+	// See https://github.com/WordPress/gutenberg/issues/58599
+	max-width: $modal-min-width;
 
 	&.has-invalid-link {
 		color: $alert-red;
 	}
 }
+
+.block-editor-url-popover__expand-on-click {
+	display: flex;
+	align-items: center;
+	min-width: $modal-min-width;
+	white-space: nowrap;
+
+	.text {
+		flex-grow: 1;
+
+		p {
+			margin: 0;
+			// This ensures the text and help text is 32px, which with
+			// padding makes the popover same height as the block toolbar.
+			line-height: $grid-unit-20;
+
+			&.description {
+				color: $gray-700;
+				font-size: $helptext-font-size;
+			}
+		}
+	}
+}
diff --git a/packages/block-editor/src/components/use-block-commands/index.js b/packages/block-editor/src/components/use-block-commands/index.js
index 0ef1a83411026a..c88ec4e5378926 100644
--- a/packages/block-editor/src/components/use-block-commands/index.js
+++ b/packages/block-editor/src/components/use-block-commands/index.js
@@ -16,7 +16,6 @@ import {
 	plus as add,
 	group,
 	ungroup,
-	moveTo as move,
 } from '@wordpress/icons';
 
 /**
@@ -26,41 +25,56 @@ import BlockIcon from '../block-icon';
 import { store as blockEditorStore } from '../../store';
 
 export const useTransformCommands = () => {
-	const { clientIds } = useSelect( ( select ) => {
-		const { getSelectedBlockClientIds } = select( blockEditorStore );
+	const { replaceBlocks, multiSelect } = useDispatch( blockEditorStore );
+	const {
+		blocks,
+		clientIds,
+		canRemove,
+		possibleBlockTransformations,
+		invalidSelection,
+	} = useSelect( ( select ) => {
+		const {
+			getBlockRootClientId,
+			getBlockTransformItems,
+			getSelectedBlockClientIds,
+			getBlocksByClientId,
+			canRemoveBlocks,
+		} = select( blockEditorStore );
+
 		const selectedBlockClientIds = getSelectedBlockClientIds();
+		const selectedBlocks = getBlocksByClientId( selectedBlockClientIds );
 
+		// selectedBlocks can have `null`s when something tries to call `selectBlock` with an inexistent clientId.
+		// These nulls will cause fatal errors down the line.
+		// In order to prevent discrepancies between selectedBlockClientIds and selectedBlocks, we effectively treat the entire selection as invalid.
+		// @see https://github.com/WordPress/gutenberg/pull/59410#issuecomment-2006304536
+		if ( selectedBlocks.filter( ( block ) => ! block ).length > 0 ) {
+			return {
+				invalidSelection: true,
+			};
+		}
+
+		const rootClientId = getBlockRootClientId(
+			selectedBlockClientIds[ 0 ]
+		);
 		return {
+			blocks: selectedBlocks,
 			clientIds: selectedBlockClientIds,
+			possibleBlockTransformations: getBlockTransformItems(
+				selectedBlocks,
+				rootClientId
+			),
+			canRemove: canRemoveBlocks( selectedBlockClientIds ),
+			invalidSelection: false,
 		};
 	}, [] );
-	const blocks = useSelect(
-		( select ) =>
-			select( blockEditorStore ).getBlocksByClientId( clientIds ),
-		[ clientIds ]
-	);
-	const { replaceBlocks, multiSelect } = useDispatch( blockEditorStore );
-	const { possibleBlockTransformations, canRemove } = useSelect(
-		( select ) => {
-			const {
-				getBlockRootClientId,
-				getBlockTransformItems,
-				canRemoveBlocks,
-			} = select( blockEditorStore );
-			const rootClientId = getBlockRootClientId(
-				Array.isArray( clientIds ) ? clientIds[ 0 ] : clientIds
-			);
-			return {
-				possibleBlockTransformations: getBlockTransformItems(
-					blocks,
-					rootClientId
-				),
-				canRemove: canRemoveBlocks( clientIds, rootClientId ),
-			};
-		},
-		[ clientIds, blocks ]
-	);
 
+	if ( invalidSelection ) {
+		return {
+			isLoading: false,
+			commands: [],
+		};
+	}
 	const isTemplate = blocks.length === 1 && isTemplatePart( blocks[ 0 ] );
 
 	function selectForMultipleBlocks( insertedBlocks ) {
@@ -112,60 +126,6 @@ export const useTransformCommands = () => {
 	return { isLoading: false, commands };
 };
 
-const useActionsCommands = () => {
-	const { clientIds } = useSelect( ( select ) => {
-		const { getSelectedBlockClientIds } = select( blockEditorStore );
-		const selectedBlockClientIds = getSelectedBlockClientIds();
-
-		return {
-			clientIds: selectedBlockClientIds,
-		};
-	}, [] );
-
-	const { getBlockRootClientId, canMoveBlocks, getBlockCount } =
-		useSelect( blockEditorStore );
-
-	const { setBlockMovingClientId, setNavigationMode, selectBlock } =
-		useDispatch( blockEditorStore );
-
-	if ( ! clientIds || clientIds.length < 1 ) {
-		return { isLoading: false, commands: [] };
-	}
-
-	const rootClientId = getBlockRootClientId( clientIds[ 0 ] );
-
-	const canMove =
-		canMoveBlocks( clientIds, rootClientId ) &&
-		getBlockCount( rootClientId ) !== 1;
-
-	const commands = [];
-
-	if ( canMove ) {
-		commands.push( {
-			name: 'move-to',
-			label: __( 'Move to' ),
-			callback: () => {
-				setNavigationMode( true );
-				selectBlock( clientIds[ 0 ] );
-				setBlockMovingClientId( clientIds[ 0 ] );
-			},
-			icon: move,
-		} );
-	}
-
-	return {
-		isLoading: false,
-		commands: commands.map( ( command ) => ( {
-			...command,
-			name: 'core/block-editor/action-' + command.name,
-			callback: ( { close } ) => {
-				command.callback();
-				close();
-			},
-		} ) ),
-	};
-};
-
 const useQuickActionsCommands = () => {
 	const { clientIds, isUngroupable, isGroupable } = useSelect( ( select ) => {
 		const {
@@ -245,7 +205,7 @@ const useQuickActionsCommands = () => {
 			canInsertBlockType( block.name, rootClientId )
 		);
 	} );
-	const canRemove = canRemoveBlocks( clientIds, rootClientId );
+	const canRemove = canRemoveBlocks( clientIds );
 
 	const commands = [];
 
@@ -330,10 +290,6 @@ export const useBlockCommands = () => {
 		name: 'core/block-editor/blockTransforms',
 		hook: useTransformCommands,
 	} );
-	useCommandLoader( {
-		name: 'core/block-editor/blockActions',
-		hook: useActionsCommands,
-	} );
 	useCommandLoader( {
 		name: 'core/block-editor/blockQuickActions',
 		hook: useQuickActionsCommands,
diff --git a/packages/block-editor/src/components/use-block-display-information/index.js b/packages/block-editor/src/components/use-block-display-information/index.js
index 68e9abf8936741..0da99d415f53f1 100644
--- a/packages/block-editor/src/components/use-block-display-information/index.js
+++ b/packages/block-editor/src/components/use-block-display-information/index.js
@@ -6,6 +6,7 @@ import {
 	store as blocksStore,
 	isReusableBlock,
 	isTemplatePart,
+	__experimentalGetBlockLabel as getBlockLabel,
 } from '@wordpress/blocks';
 import { __ } from '@wordpress/i18n';
 
@@ -67,25 +68,26 @@ function getPositionTypeLabel( attributes ) {
 export default function useBlockDisplayInformation( clientId ) {
 	return useSelect(
 		( select ) => {
-			if ( ! clientId ) return null;
-			const {
-				getBlockName,
-				getBlockAttributes,
-				__experimentalGetReusableBlockTitle,
-			} = select( blockEditorStore );
+			if ( ! clientId ) {
+				return null;
+			}
+			const { getBlockName, getBlockAttributes } =
+				select( blockEditorStore );
 			const { getBlockType, getActiveBlockVariation } =
 				select( blocksStore );
 			const blockName = getBlockName( clientId );
 			const blockType = getBlockType( blockName );
-			if ( ! blockType ) return null;
+			if ( ! blockType ) {
+				return null;
+			}
 			const attributes = getBlockAttributes( clientId );
 			const match = getActiveBlockVariation( blockName, attributes );
-			const isReusable = isReusableBlock( blockType );
-			const resusableTitle = isReusable
-				? __experimentalGetReusableBlockTitle( attributes.ref )
+			const isSynced =
+				isReusableBlock( blockType ) || isTemplatePart( blockType );
+			const syncedTitle = isSynced
+				? getBlockLabel( blockType, attributes )
 				: undefined;
-			const title = resusableTitle || blockType.title;
-			const isSynced = isReusable || isTemplatePart( blockType );
+			const title = syncedTitle || blockType.title;
 			const positionLabel = getPositionTypeLabel( attributes );
 			const blockTypeInfo = {
 				isSynced,
@@ -97,7 +99,9 @@ export default function useBlockDisplayInformation( clientId ) {
 				positionType: attributes?.style?.position?.type,
 				name: attributes?.metadata?.name,
 			};
-			if ( ! match ) return blockTypeInfo;
+			if ( ! match ) {
+				return blockTypeInfo;
+			}
 
 			return {
 				isSynced,
diff --git a/packages/block-editor/src/components/use-block-drop-zone/index.js b/packages/block-editor/src/components/use-block-drop-zone/index.js
index 25dc6ee408982f..2a3e4948d40b3b 100644
--- a/packages/block-editor/src/components/use-block-drop-zone/index.js
+++ b/packages/block-editor/src/components/use-block-drop-zone/index.js
@@ -8,7 +8,10 @@ import {
 	__experimentalUseDropZone as useDropZone,
 } from '@wordpress/compose';
 import { isRTL } from '@wordpress/i18n';
-import { isUnmodifiedDefaultBlock as getIsUnmodifiedDefaultBlock } from '@wordpress/blocks';
+import {
+	isUnmodifiedDefaultBlock as getIsUnmodifiedDefaultBlock,
+	store as blocksStore,
+} from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -17,8 +20,14 @@ import useOnBlockDrop from '../use-on-block-drop';
 import {
 	getDistanceToNearestEdge,
 	isPointContainedByRect,
+	isPointWithinTopAndBottomBoundariesOfRect,
 } from '../../utils/math';
 import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const THRESHOLD_DISTANCE = 30;
+const MINIMUM_HEIGHT_FOR_THRESHOLD = 120;
+const MINIMUM_WIDTH_FOR_THRESHOLD = 120;
 
 /** @typedef {import('../../utils/math').WPPoint} WPPoint */
 /** @typedef {import('../use-on-block-drop/types').WPDropOperation} WPDropOperation */
@@ -48,26 +57,95 @@ import { store as blockEditorStore } from '../../store';
  * @param {WPBlockData[]}          blocksData  The block data list.
  * @param {WPPoint}                position    The position of the item being dragged.
  * @param {WPBlockListOrientation} orientation The orientation of the block list.
+ * @param {Object}                 options     Additional options.
  * @return {[number, WPDropOperation]} The drop target position.
  */
 export function getDropTargetPosition(
 	blocksData,
 	position,
-	orientation = 'vertical'
+	orientation = 'vertical',
+	options = {}
 ) {
 	const allowedEdges =
 		orientation === 'horizontal'
 			? [ 'left', 'right' ]
 			: [ 'top', 'bottom' ];
 
-	const isRightToLeft = isRTL();
-
 	let nearestIndex = 0;
 	let insertPosition = 'before';
 	let minDistance = Infinity;
+	let targetBlockIndex = null;
+	let nearestSide = 'right';
+
+	const {
+		dropZoneElement,
+		parentBlockOrientation,
+		rootBlockIndex = 0,
+	} = options;
+
+	// Allow before/after when dragging over the top/bottom edges of the drop zone.
+	if ( dropZoneElement && parentBlockOrientation !== 'horizontal' ) {
+		const rect = dropZoneElement.getBoundingClientRect();
+		const [ distance, edge ] = getDistanceToNearestEdge( position, rect, [
+			'top',
+			'bottom',
+		] );
+
+		// If dragging over the top or bottom of the drop zone, insert the block
+		// before or after the parent block. This only applies to blocks that use
+		// a drop zone element, typically container blocks such as Group or Cover.
+		if (
+			rect.height > MINIMUM_HEIGHT_FOR_THRESHOLD &&
+			distance < THRESHOLD_DISTANCE
+		) {
+			if ( edge === 'top' ) {
+				return [ rootBlockIndex, 'before' ];
+			}
+			if ( edge === 'bottom' ) {
+				return [ rootBlockIndex + 1, 'after' ];
+			}
+		}
+	}
+
+	const isRightToLeft = isRTL();
+
+	// Allow before/after when dragging over the left/right edges of the drop zone.
+	if ( dropZoneElement && parentBlockOrientation === 'horizontal' ) {
+		const rect = dropZoneElement.getBoundingClientRect();
+		const [ distance, edge ] = getDistanceToNearestEdge( position, rect, [
+			'left',
+			'right',
+		] );
+
+		// If dragging over the left or right of the drop zone, insert the block
+		// before or after the parent block. This only applies to blocks that use
+		// a drop zone element, typically container blocks such as Group.
+		if (
+			rect.width > MINIMUM_WIDTH_FOR_THRESHOLD &&
+			distance < THRESHOLD_DISTANCE
+		) {
+			if (
+				( isRightToLeft && edge === 'right' ) ||
+				( ! isRightToLeft && edge === 'left' )
+			) {
+				return [ rootBlockIndex, 'before' ];
+			}
+			if (
+				( isRightToLeft && edge === 'left' ) ||
+				( ! isRightToLeft && edge === 'right' )
+			) {
+				return [ rootBlockIndex + 1, 'after' ];
+			}
+		}
+	}
 
 	blocksData.forEach(
-		( { isUnmodifiedDefaultBlock, getBoundingClientRect, blockIndex } ) => {
+		( {
+			isUnmodifiedDefaultBlock,
+			getBoundingClientRect,
+			blockIndex,
+			blockOrientation,
+		} ) => {
 			const rect = getBoundingClientRect();
 
 			let [ distance, edge ] = getDistanceToNearestEdge(
@@ -75,12 +153,35 @@ export function getDropTargetPosition(
 				rect,
 				allowedEdges
 			);
+			// If the the point is close to a side, prioritize that side.
+			const [ sideDistance, sideEdge ] = getDistanceToNearestEdge(
+				position,
+				rect,
+				[ 'left', 'right' ]
+			);
+
+			const isPointInsideRect = isPointContainedByRect( position, rect );
+
 			// Prioritize the element if the point is inside of an unmodified default block.
-			if (
-				isUnmodifiedDefaultBlock &&
-				isPointContainedByRect( position, rect )
-			) {
+			if ( isUnmodifiedDefaultBlock && isPointInsideRect ) {
 				distance = 0;
+			} else if (
+				orientation === 'vertical' &&
+				blockOrientation !== 'horizontal' &&
+				( ( isPointInsideRect && sideDistance < THRESHOLD_DISTANCE ) ||
+					( ! isPointInsideRect &&
+						isPointWithinTopAndBottomBoundariesOfRect(
+							position,
+							rect
+						) ) )
+			) {
+				/**
+				 * This condition should only apply when the layout is vertical (otherwise there's
+				 * no need to create a Row) and dropzones should only activate when the block is
+				 * either within and close to the sides of the target block or on its outer sides.
+				 */
+				targetBlockIndex = blockIndex;
+				nearestSide = sideEdge;
 			}
 
 			if ( distance < minDistance ) {
@@ -106,6 +207,10 @@ export function getDropTargetPosition(
 	const isAdjacentBlockUnmodifiedDefaultBlock =
 		!! blocksData[ adjacentIndex ]?.isUnmodifiedDefaultBlock;
 
+	// If the target index is set then group with the block at that index.
+	if ( targetBlockIndex !== null ) {
+		return [ targetBlockIndex, 'group', nearestSide ];
+	}
 	// If both blocks are not unmodified default blocks then just insert between them.
 	if (
 		! isNearestBlockUnmodifiedDefaultBlock &&
@@ -125,6 +230,67 @@ export function getDropTargetPosition(
 	];
 }
 
+/**
+ * Check if the dragged blocks can be dropped on the target.
+ * @param {Function} getBlockType
+ * @param {Object[]} allowedBlocks
+ * @param {string[]} draggedBlockNames
+ * @param {string}   targetBlockName
+ * @return {boolean} Whether the dragged blocks can be dropped on the target.
+ */
+export function isDropTargetValid(
+	getBlockType,
+	allowedBlocks,
+	draggedBlockNames,
+	targetBlockName
+) {
+	// At root level allowedBlocks is undefined and all blocks are allowed.
+	// Otherwise, check if all dragged blocks are allowed.
+	let areBlocksAllowed = true;
+	if ( allowedBlocks ) {
+		const allowedBlockNames = allowedBlocks?.map( ( { name } ) => name );
+
+		areBlocksAllowed = draggedBlockNames.every( ( name ) =>
+			allowedBlockNames?.includes( name )
+		);
+	}
+
+	// Work out if dragged blocks have an allowed parent and if so
+	// check target block matches the allowed parent.
+	const draggedBlockTypes = draggedBlockNames.map( ( name ) =>
+		getBlockType( name )
+	);
+	const targetMatchesDraggedBlockParents = draggedBlockTypes.every(
+		( block ) => {
+			const [ allowedParentName ] = block?.parent || [];
+			if ( ! allowedParentName ) {
+				return true;
+			}
+
+			return allowedParentName === targetBlockName;
+		}
+	);
+
+	return areBlocksAllowed && targetMatchesDraggedBlockParents;
+}
+
+/**
+ * Checks if the given element is an insertion point.
+ *
+ * @param {EventTarget|null} targetToCheck - The element to check.
+ * @param {Document}         ownerDocument - The owner document of the element.
+ * @return {boolean} True if the element is a insertion point, false otherwise.
+ */
+function isInsertionPoint( targetToCheck, ownerDocument ) {
+	const { defaultView } = ownerDocument;
+
+	return !! (
+		defaultView &&
+		targetToCheck instanceof defaultView.HTMLElement &&
+		targetToCheck.closest( '[data-is-insertion-point]' )
+	);
+}
+
 /**
  * @typedef  {Object} WPBlockDropZoneConfig
  * @property {?HTMLElement} dropZoneElement Optional element to be used as the drop zone.
@@ -143,6 +309,8 @@ export default function useBlockDropZone( {
 	// values returned by the `getRootBlockClientId` selector, which also uses
 	// an empty string to represent top-level blocks.
 	rootClientId: targetRootClientId = '',
+	parentClientId: parentBlockClientId = '',
+	isDisabled = false,
 } = {} ) {
 	const registry = useRegistry();
 	const [ dropTarget, setDropTarget ] = useState( {
@@ -150,34 +318,77 @@ export default function useBlockDropZone( {
 		operation: 'insert',
 	} );
 
-	const isDisabled = useSelect(
-		( select ) => {
-			const {
-				__unstableIsWithinBlockOverlay,
-				__unstableHasActiveBlockOverlayActive,
-				getBlockEditingMode,
-			} = select( blockEditorStore );
-			const blockEditingMode = getBlockEditingMode( targetRootClientId );
-			return (
-				blockEditingMode !== 'default' ||
-				__unstableHasActiveBlockOverlayActive( targetRootClientId ) ||
-				__unstableIsWithinBlockOverlay( targetRootClientId )
-			);
-		},
-		[ targetRootClientId ]
-	);
-
-	const { getBlockListSettings, getBlocks, getBlockIndex } =
-		useSelect( blockEditorStore );
-	const { showInsertionPoint, hideInsertionPoint } =
-		useDispatch( blockEditorStore );
+	const { getBlockType, getBlockVariations, getGroupingBlockName } =
+		useSelect( blocksStore );
+	const {
+		canInsertBlockType,
+		getBlockListSettings,
+		getBlocks,
+		getBlockIndex,
+		getDraggedBlockClientIds,
+		getBlockNamesByClientId,
+		getAllowedBlocks,
+		isDragging,
+		isGroupable,
+		isZoomOut,
+		getSectionRootClientId,
+	} = unlock( useSelect( blockEditorStore ) );
+	const {
+		showInsertionPoint,
+		hideInsertionPoint,
+		startDragging,
+		stopDragging,
+	} = unlock( useDispatch( blockEditorStore ) );
 
-	const onBlockDrop = useOnBlockDrop( targetRootClientId, dropTarget.index, {
-		operation: dropTarget.operation,
-	} );
+	const onBlockDrop = useOnBlockDrop(
+		dropTarget.operation === 'before' || dropTarget.operation === 'after'
+			? parentBlockClientId
+			: targetRootClientId,
+		dropTarget.index,
+		{
+			operation: dropTarget.operation,
+			nearestSide: dropTarget.nearestSide,
+		}
+	);
 	const throttled = useThrottle(
 		useCallback(
 			( event, ownerDocument ) => {
+				if ( ! isDragging() ) {
+					// When dragging from the desktop, no drag start event is fired.
+					// So, ensure that the drag state is set when the user drags over a drop zone.
+					startDragging();
+				}
+				const allowedBlocks = getAllowedBlocks( targetRootClientId );
+				const targetBlockName = getBlockNamesByClientId( [
+					targetRootClientId,
+				] )[ 0 ];
+
+				const draggedBlockNames = getBlockNamesByClientId(
+					getDraggedBlockClientIds()
+				);
+				const isBlockDroppingAllowed = isDropTargetValid(
+					getBlockType,
+					allowedBlocks,
+					draggedBlockNames,
+					targetBlockName
+				);
+
+				if ( ! isBlockDroppingAllowed ) {
+					return;
+				}
+
+				const sectionRootClientId = getSectionRootClientId();
+
+				// In Zoom Out mode, if the target is not the section root provided by settings then
+				// do not allow dropping as the drop target is not within the root (that which is
+				// treated as "the content" by Zoom Out Mode).
+				if (
+					isZoomOut() &&
+					sectionRootClientId !== targetRootClientId
+				) {
+					return;
+				}
+
 				const blocks = getBlocks( targetRootClientId );
 
 				// The block list is empty, don't show the insertion point but still allow dropping.
@@ -205,32 +416,117 @@ export default function useBlockDropZone( {
 								.getElementById( `block-${ clientId }` )
 								.getBoundingClientRect(),
 						blockIndex: getBlockIndex( clientId ),
+						blockOrientation:
+							getBlockListSettings( clientId )?.orientation,
 					};
 				} );
 
-				const [ targetIndex, operation ] = getDropTargetPosition(
+				const dropTargetPosition = getDropTargetPosition(
 					blocksData,
 					{ x: event.clientX, y: event.clientY },
-					getBlockListSettings( targetRootClientId )?.orientation
+					getBlockListSettings( targetRootClientId )?.orientation,
+					{
+						dropZoneElement,
+						parentBlockClientId,
+						parentBlockOrientation: parentBlockClientId
+							? getBlockListSettings( parentBlockClientId )
+									?.orientation
+							: undefined,
+						rootBlockIndex: getBlockIndex( targetRootClientId ),
+					}
 				);
 
+				const [ targetIndex, operation, nearestSide ] =
+					dropTargetPosition;
+
+				if ( isZoomOut() && operation !== 'insert' ) {
+					return;
+				}
+
+				if ( operation === 'group' ) {
+					const targetBlock = blocks[ targetIndex ];
+					const areAllImages = [
+						targetBlock.name,
+						...draggedBlockNames,
+					].every( ( name ) => name === 'core/image' );
+					const canInsertGalleryBlock = canInsertBlockType(
+						'core/gallery',
+						targetRootClientId
+					);
+					const areGroupableBlocks = isGroupable( [
+						targetBlock.clientId,
+						getDraggedBlockClientIds(),
+					] );
+					const groupBlockVariations = getBlockVariations(
+						getGroupingBlockName(),
+						'block'
+					);
+					const canInsertRow =
+						groupBlockVariations &&
+						groupBlockVariations.find(
+							( { name } ) => name === 'group-row'
+						);
+
+					// If the dragged blocks and the target block are all images,
+					// check if it is creatable either a Row variation or a Gallery block.
+					if (
+						areAllImages &&
+						! canInsertGalleryBlock &&
+						( ! areGroupableBlocks || ! canInsertRow )
+					) {
+						return;
+					}
+					// If the dragged blocks and the target block are not all images,
+					// check if it is creatable a Row variation.
+					if (
+						! areAllImages &&
+						( ! areGroupableBlocks || ! canInsertRow )
+					) {
+						return;
+					}
+				}
+
 				registry.batch( () => {
 					setDropTarget( {
 						index: targetIndex,
 						operation,
+						nearestSide,
 					} );
-					showInsertionPoint( targetRootClientId, targetIndex, {
+
+					const insertionPointClientId = [
+						'before',
+						'after',
+					].includes( operation )
+						? parentBlockClientId
+						: targetRootClientId;
+
+					showInsertionPoint( insertionPointClientId, targetIndex, {
 						operation,
+						nearestSide,
 					} );
 				} );
 			},
 			[
-				getBlocks,
+				isDragging,
+				getAllowedBlocks,
 				targetRootClientId,
+				getBlockNamesByClientId,
+				getDraggedBlockClientIds,
+				getBlockType,
+				getSectionRootClientId,
+				isZoomOut,
+				getBlocks,
 				getBlockListSettings,
+				dropZoneElement,
+				parentBlockClientId,
+				getBlockIndex,
 				registry,
+				startDragging,
 				showInsertionPoint,
-				getBlockIndex,
+				canInsertBlockType,
+				isGroupable,
+				getBlockVariations,
+				getGroupingBlockName,
 			]
 		),
 		200
@@ -246,12 +542,24 @@ export default function useBlockDropZone( {
 			// https://developer.mozilla.org/en-US/docs/Web/API/Event/currentTarget
 			throttled( event, event.currentTarget.ownerDocument );
 		},
-		onDragLeave() {
+		onDragLeave( event ) {
+			const { ownerDocument } = event.currentTarget;
+
+			// If the drag event is leaving the drop zone and entering an insertion point,
+			// do not hide the insertion point as it is conceptually within the dropzone.
+			if (
+				isInsertionPoint( event.relatedTarget, ownerDocument ) ||
+				isInsertionPoint( event.target, ownerDocument )
+			) {
+				return;
+			}
+
 			throttled.cancel();
 			hideInsertionPoint();
 		},
 		onDragEnd() {
 			throttled.cancel();
+			stopDragging();
 			hideInsertionPoint();
 		},
 	} );
diff --git a/packages/block-editor/src/components/use-block-drop-zone/index.native.js b/packages/block-editor/src/components/use-block-drop-zone/index.native.js
index 4f00880873c2fa..f40900ec7db970 100644
--- a/packages/block-editor/src/components/use-block-drop-zone/index.native.js
+++ b/packages/block-editor/src/components/use-block-drop-zone/index.native.js
@@ -132,7 +132,6 @@ export default function useBlockDropZone( {
 	const getSortedBlocksLayouts = useCallback( () => {
 		return getBlockLayoutsOrderedByYCoord( blocksLayouts.current );
 		// We use the value of `blocksLayouts` as the dependency.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ blocksLayouts.current ] );
 
 	const isRTL = getSettings().isRTL;
diff --git a/packages/block-editor/src/components/use-block-drop-zone/test/index.js b/packages/block-editor/src/components/use-block-drop-zone/test/index.js
index f5560c1cfdf13a..e6614b3fafc133 100644
--- a/packages/block-editor/src/components/use-block-drop-zone/test/index.js
+++ b/packages/block-editor/src/components/use-block-drop-zone/test/index.js
@@ -22,13 +22,6 @@ const elementData = [
 		bottom: 900,
 		right: 400,
 	},
-	// Fourth block wraps to the next row/column.
-	{
-		top: 0,
-		left: 400,
-		bottom: 300,
-		right: 800,
-	},
 ];
 
 const mapElements =
@@ -73,7 +66,7 @@ describe( 'getDropTargetPosition', () => {
 		const orientation = 'vertical';
 
 		it( 'returns `0` when the position is nearest to the start of the first block', () => {
-			const position = { x: 0, y: 0 };
+			const position = { x: 32, y: 0 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -85,7 +78,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `1` when the position is nearest to the end of the first block', () => {
-			const position = { x: 0, y: 190 };
+			const position = { x: 32, y: 190 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -97,7 +90,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `1` when the position is nearest to the start of the second block', () => {
-			const position = { x: 0, y: 210 };
+			const position = { x: 32, y: 210 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -109,7 +102,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `2` when the position is nearest to the end of the second block', () => {
-			const position = { x: 0, y: 450 };
+			const position = { x: 32, y: 450 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -121,7 +114,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `2` when the position is nearest to the start of the third block', () => {
-			const position = { x: 0, y: 510 };
+			const position = { x: 32, y: 510 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -133,7 +126,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `3` when the position is nearest to the end of the third block', () => {
-			const position = { x: 0, y: 880 };
+			const position = { x: 32, y: 880 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -145,7 +138,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `3` when the position is past the end of the third block', () => {
-			const position = { x: 0, y: 920 };
+			const position = { x: 32, y: 920 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -155,9 +148,8 @@ describe( 'getDropTargetPosition', () => {
 
 			expect( result ).toEqual( [ 3, 'insert' ] );
 		} );
-
-		it( 'returns `4` when the position is nearest to the start of the fourth block', () => {
-			const position = { x: 401, y: 0 };
+		it( 'returns group with index 0 when position is close to the right of the first block', () => {
+			const position = { x: 372, y: 0 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -165,11 +157,10 @@ describe( 'getDropTargetPosition', () => {
 				orientation
 			);
 
-			expect( result ).toEqual( [ 3, 'insert' ] );
+			expect( result ).toEqual( [ 0, 'group', 'right' ] );
 		} );
-
-		it( 'returns `5` when the position is nearest to the end of the fourth block', () => {
-			const position = { x: 401, y: 300 };
+		it( 'returns group with index 1 when position is close to the left of the second block', () => {
+			const position = { x: 12, y: 212 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -177,7 +168,7 @@ describe( 'getDropTargetPosition', () => {
 				orientation
 			);
 
-			expect( result ).toEqual( [ 4, 'insert' ] );
+			expect( result ).toEqual( [ 1, 'group', 'left' ] );
 		} );
 	} );
 
@@ -267,30 +258,6 @@ describe( 'getDropTargetPosition', () => {
 
 			expect( result ).toEqual( [ 3, 'insert' ] );
 		} );
-
-		it( 'returns `3` when the position is nearest to the start of the last block', () => {
-			const position = { x: 0, y: 401 };
-
-			const result = getDropTargetPosition(
-				horizontalBlocksData,
-				position,
-				orientation
-			);
-
-			expect( result ).toEqual( [ 3, 'insert' ] );
-		} );
-
-		it( 'returns `4` when the position is nearest to the end of the last block', () => {
-			const position = { x: 300, y: 401 };
-
-			const result = getDropTargetPosition(
-				horizontalBlocksData,
-				position,
-				orientation
-			);
-
-			expect( result ).toEqual( [ 4, 'insert' ] );
-		} );
 	} );
 
 	describe( 'Unmodified default blocks', () => {
@@ -316,14 +283,18 @@ describe( 'getDropTargetPosition', () => {
 
 			// Dropping above the first block.
 			expect(
-				getDropTargetPosition( blocksData, { x: 0, y: 0 }, orientation )
+				getDropTargetPosition(
+					blocksData,
+					{ x: 32, y: 0 },
+					orientation
+				)
 			).toEqual( [ 0, 'replace' ] );
 
 			// Dropping on the top half of the first block.
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 20 },
+					{ x: 32, y: 20 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -332,7 +303,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 200 },
+					{ x: 32, y: 200 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -341,7 +312,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 211 },
+					{ x: 32, y: 211 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -350,7 +321,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 219 },
+					{ x: 32, y: 219 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -359,7 +330,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 230 },
+					{ x: 32, y: 230 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -368,7 +339,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 410 },
+					{ x: 32, y: 410 },
 					orientation
 				)
 			).toEqual( [ 2, 'insert' ] );
@@ -377,7 +348,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 421 },
+					{ x: 32, y: 421 },
 					orientation
 				)
 			).toEqual( [ 2, 'insert' ] );
@@ -410,7 +381,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 20 },
+					{ x: 32, y: 20 },
 					orientation
 				)
 			).toEqual( [ 0, 'insert' ] );
@@ -419,7 +390,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 200 },
+					{ x: 32, y: 200 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -428,7 +399,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 211 },
+					{ x: 32, y: 211 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -437,7 +408,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 219 },
+					{ x: 32, y: 219 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -446,7 +417,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 230 },
+					{ x: 32, y: 230 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -455,7 +426,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 410 },
+					{ x: 32, y: 410 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -464,7 +435,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 421 },
+					{ x: 32, y: 421 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
diff --git a/packages/block-editor/src/components/use-display-block-controls/index.js b/packages/block-editor/src/components/use-display-block-controls/index.js
deleted file mode 100644
index 605556f295b968..00000000000000
--- a/packages/block-editor/src/components/use-display-block-controls/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { useBlockEditContext } from '../block-edit/context';
-import { store as blockEditorStore } from '../../store';
-
-export default function useDisplayBlockControls() {
-	const { isSelected, clientId, name } = useBlockEditContext();
-	return useSelect(
-		( select ) => {
-			if ( isSelected ) {
-				return true;
-			}
-
-			const {
-				getBlockName,
-				isFirstMultiSelectedBlock,
-				getMultiSelectedBlockClientIds,
-			} = select( blockEditorStore );
-
-			if ( isFirstMultiSelectedBlock( clientId ) ) {
-				return getMultiSelectedBlockClientIds().every(
-					( id ) => getBlockName( id ) === name
-				);
-			}
-
-			return false;
-		},
-		[ clientId, isSelected, name ]
-	);
-}
diff --git a/packages/block-editor/src/components/use-display-block-controls/index.native.js b/packages/block-editor/src/components/use-display-block-controls/index.native.js
deleted file mode 100644
index e8a198e1592e82..00000000000000
--- a/packages/block-editor/src/components/use-display-block-controls/index.native.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { hasBlockSupport } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { useBlockEditContext } from '../block-edit/context';
-import { store as blockEditorStore } from '../../store';
-
-export default function useDisplayBlockControls() {
-	const { isSelected, clientId, name } = useBlockEditContext();
-	return useSelect(
-		( select ) => {
-			const { getBlockName, getBlockRootClientId } =
-				select( blockEditorStore );
-
-			const parentId = getBlockRootClientId( clientId );
-			const parentBlockName = getBlockName( parentId );
-
-			const hideControls = hasBlockSupport(
-				parentBlockName,
-				'__experimentalHideChildBlockControls',
-				false
-			);
-
-			if ( ! hideControls && isSelected ) {
-				return true;
-			}
-
-			return false;
-		},
-		[ clientId, isSelected, name ]
-	);
-}
diff --git a/packages/block-editor/src/components/use-flash-editable-blocks/index.js b/packages/block-editor/src/components/use-flash-editable-blocks/index.js
new file mode 100644
index 00000000000000..34386ea8eadf3b
--- /dev/null
+++ b/packages/block-editor/src/components/use-flash-editable-blocks/index.js
@@ -0,0 +1,62 @@
+/**
+ * WordPress dependencies
+ */
+import { useRefEffect } from '@wordpress/compose';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+export function useFlashEditableBlocks( {
+	clientId = '',
+	isEnabled = true,
+} = {} ) {
+	const { getEnabledClientIdsTree } = unlock( useSelect( blockEditorStore ) );
+
+	return useRefEffect(
+		( element ) => {
+			if ( ! isEnabled ) {
+				return;
+			}
+
+			const flashEditableBlocks = () => {
+				getEnabledClientIdsTree( clientId ).forEach(
+					( { clientId: id } ) => {
+						const block = element.querySelector(
+							`[data-block="${ id }"]`
+						);
+						if ( ! block ) {
+							return;
+						}
+						block.classList.remove( 'has-editable-outline' );
+						// Force reflow to trigger the animation.
+						// eslint-disable-next-line no-unused-expressions
+						block.offsetWidth;
+						block.classList.add( 'has-editable-outline' );
+					}
+				);
+			};
+
+			const handleClick = ( event ) => {
+				const shouldFlash =
+					event.target === element ||
+					event.target.classList.contains( 'is-root-container' );
+				if ( ! shouldFlash ) {
+					return;
+				}
+				if ( event.defaultPrevented ) {
+					return;
+				}
+				event.preventDefault();
+				flashEditableBlocks();
+			};
+
+			element.addEventListener( 'click', handleClick );
+			return () => element.removeEventListener( 'click', handleClick );
+		},
+		[ isEnabled ]
+	);
+}
diff --git a/packages/block-editor/src/components/use-moving-animation/index.js b/packages/block-editor/src/components/use-moving-animation/index.js
index e6c888330fca71..602b683150d0cc 100644
--- a/packages/block-editor/src/components/use-moving-animation/index.js
+++ b/packages/block-editor/src/components/use-moving-animation/index.js
@@ -1,35 +1,32 @@
 /**
  * External dependencies
  */
-import { useSpring } from '@react-spring/web';
+import { Controller } from '@react-spring/web';
 
 /**
  * WordPress dependencies
  */
-import {
-	useState,
-	useLayoutEffect,
-	useReducer,
-	useMemo,
-	useRef,
-} from '@wordpress/element';
-import { useReducedMotion } from '@wordpress/compose';
+import { useLayoutEffect, useMemo, useRef } from '@wordpress/element';
 import { getScrollContainer } from '@wordpress/dom';
+import { useSelect } from '@wordpress/data';
 
 /**
- * Simple reducer used to increment a counter.
- *
- * @param {number} state Previous counter value.
- * @return {number} New state value.
+ * Internal dependencies
  */
-const counterReducer = ( state ) => state + 1;
+import { store as blockEditorStore } from '../../store';
 
-const getAbsolutePosition = ( element ) => {
+/**
+ * If the block count exceeds the threshold, we disable the reordering animation
+ * to avoid laginess.
+ */
+const BLOCK_ANIMATION_THRESHOLD = 200;
+
+function getAbsolutePosition( element ) {
 	return {
 		top: element.offsetTop,
 		left: element.offsetLeft,
 	};
-};
+}
 
 /**
  * Hook used to compute the styles required to move a div into a new position.
@@ -42,114 +39,121 @@ const getAbsolutePosition = ( element ) => {
  *  - It uses the "resetAnimation" flag to reset the animation
  *    from the beginning in order to animate to the new destination point.
  *
- * @param {Object}  $1                          Options
- * @param {boolean} $1.isSelected               Whether it's the current block or not.
- * @param {boolean} $1.adjustScrolling          Adjust the scroll position to the current block.
- * @param {boolean} $1.enableAnimation          Enable/Disable animation.
- * @param {*}       $1.triggerAnimationOnChange Variable used to trigger the animation if it changes.
+ * @param {Object} $1                          Options
+ * @param {*}      $1.triggerAnimationOnChange Variable used to trigger the animation if it changes.
+ * @param {string} $1.clientId
  */
-function useMovingAnimation( {
-	isSelected,
-	adjustScrolling,
-	enableAnimation,
-	triggerAnimationOnChange,
-} ) {
+function useMovingAnimation( { triggerAnimationOnChange, clientId } ) {
 	const ref = useRef();
-	const prefersReducedMotion = useReducedMotion() || ! enableAnimation;
-	const [ triggeredAnimation, triggerAnimation ] = useReducer(
-		counterReducer,
-		0
-	);
-	const [ finishedAnimation, endAnimation ] = useReducer( counterReducer, 0 );
-	const [ transform, setTransform ] = useState( { x: 0, y: 0 } );
-	const previous = useMemo(
-		() => ( ref.current ? getAbsolutePosition( ref.current ) : null ),
+	const {
+		isTyping,
+		getGlobalBlockCount,
+		isBlockSelected,
+		isFirstMultiSelectedBlock,
+		isBlockMultiSelected,
+		isAncestorMultiSelected,
+	} = useSelect( blockEditorStore );
+
+	// Whenever the trigger changes, we need to take a snapshot of the current
+	// position of the block to use it as a destination point for the animation.
+	const { previous, prevRect } = useMemo(
+		() => ( {
+			previous: ref.current && getAbsolutePosition( ref.current ),
+			prevRect: ref.current && ref.current.getBoundingClientRect(),
+		} ),
 		[ triggerAnimationOnChange ]
 	);
 
-	// Calculate the previous position of the block relative to the viewport and
-	// return a function to maintain that position by scrolling.
-	const preserveScrollPosition = useMemo( () => {
-		if ( ! adjustScrolling || ! ref.current ) {
-			return () => {};
+	useLayoutEffect( () => {
+		if ( ! previous || ! ref.current ) {
+			return;
 		}
 
 		const scrollContainer = getScrollContainer( ref.current );
-
-		if ( ! scrollContainer ) {
-			return () => {};
-		}
-
-		const prevRect = ref.current.getBoundingClientRect();
-		return () => {
-			const blockRect = ref.current.getBoundingClientRect();
-			const diff = blockRect.top - prevRect.top;
-
-			if ( diff ) {
-				scrollContainer.scrollTop += diff;
+		const isSelected = isBlockSelected( clientId );
+		const adjustScrolling =
+			isSelected || isFirstMultiSelectedBlock( clientId );
+
+		function preserveScrollPosition() {
+			if ( adjustScrolling && prevRect ) {
+				const blockRect = ref.current.getBoundingClientRect();
+				const diff = blockRect.top - prevRect.top;
+
+				if ( diff ) {
+					scrollContainer.scrollTop += diff;
+				}
 			}
-		};
-	}, [ triggerAnimationOnChange, adjustScrolling ] );
-
-	useLayoutEffect( () => {
-		if ( triggeredAnimation ) {
-			endAnimation();
-		}
-	}, [ triggeredAnimation ] );
-	useLayoutEffect( () => {
-		if ( ! previous ) {
-			return;
 		}
 
-		if ( prefersReducedMotion ) {
+		// We disable the animation if the user has a preference for reduced
+		// motion, if the user is typing (insertion by Enter), or if the block
+		// count exceeds the threshold (insertion caused all the blocks that
+		// follow to animate).
+		// To do: consider enableing the _moving_ animation even for large
+		// posts, while only disabling the _insertion_ animation?
+		const disableAnimation =
+			window.matchMedia( '(prefers-reduced-motion: reduce)' ).matches ||
+			isTyping() ||
+			getGlobalBlockCount() > BLOCK_ANIMATION_THRESHOLD;
+
+		if ( disableAnimation ) {
 			// If the animation is disabled and the scroll needs to be adjusted,
 			// just move directly to the final scroll position.
 			preserveScrollPosition();
-
 			return;
 		}
 
+		const isPartOfSelection =
+			isSelected ||
+			isBlockMultiSelected( clientId ) ||
+			isAncestorMultiSelected( clientId );
+		// Make sure the other blocks move under the selected block(s).
+		const zIndex = isPartOfSelection ? '1' : '';
+
+		const controller = new Controller( {
+			x: 0,
+			y: 0,
+			config: { mass: 5, tension: 2000, friction: 200 },
+			onChange( { value } ) {
+				if ( ! ref.current ) {
+					return;
+				}
+				let { x, y } = value;
+				x = Math.round( x );
+				y = Math.round( y );
+				const finishedMoving = x === 0 && y === 0;
+				ref.current.style.transformOrigin = 'center center';
+				ref.current.style.transform = finishedMoving
+					? null // Set to `null` to explicitly remove the transform.
+					: `translate3d(${ x }px,${ y }px,0)`;
+				ref.current.style.zIndex = zIndex;
+				preserveScrollPosition();
+			},
+		} );
+
 		ref.current.style.transform = undefined;
 		const destination = getAbsolutePosition( ref.current );
 
-		triggerAnimation();
-		setTransform( {
-			x: Math.round( previous.left - destination.left ),
-			y: Math.round( previous.top - destination.top ),
-		} );
-	}, [ triggerAnimationOnChange ] );
+		const x = Math.round( previous.left - destination.left );
+		const y = Math.round( previous.top - destination.top );
 
-	function onChange( { value } ) {
-		if ( ! ref.current ) {
-			return;
-		}
-		let { x, y } = value;
-		x = Math.round( x );
-		y = Math.round( y );
-		const finishedMoving = x === 0 && y === 0;
-		ref.current.style.transformOrigin = 'center center';
-		ref.current.style.transform = finishedMoving
-			? null // Set to `null` to explicitly remove the transform.
-			: `translate3d(${ x }px,${ y }px,0)`;
-		ref.current.style.zIndex = isSelected ? '1' : '';
-
-		preserveScrollPosition();
-	}
-
-	useSpring( {
-		from: {
-			x: transform.x,
-			y: transform.y,
-		},
-		to: {
-			x: 0,
-			y: 0,
-		},
-		reset: triggeredAnimation !== finishedAnimation,
-		config: { mass: 5, tension: 2000, friction: 200 },
-		immediate: prefersReducedMotion,
-		onChange,
-	} );
+		controller.start( { x: 0, y: 0, from: { x, y } } );
+
+		return () => {
+			controller.stop();
+			controller.set( { x: 0, y: 0 } );
+		};
+	}, [
+		previous,
+		prevRect,
+		clientId,
+		isTyping,
+		getGlobalBlockCount,
+		isBlockSelected,
+		isFirstMultiSelectedBlock,
+		isBlockMultiSelected,
+		isAncestorMultiSelected,
+	] );
 
 	return ref;
 }
diff --git a/packages/block-editor/src/components/use-on-block-drop/index.js b/packages/block-editor/src/components/use-on-block-drop/index.js
index 72ea6a698c3439..75b9a44e166f5c 100644
--- a/packages/block-editor/src/components/use-on-block-drop/index.js
+++ b/packages/block-editor/src/components/use-on-block-drop/index.js
@@ -4,9 +4,11 @@
 import { useCallback } from '@wordpress/element';
 import {
 	cloneBlock,
+	createBlock,
 	findTransform,
 	getBlockTransforms,
 	pasteHandler,
+	store as blocksStore,
 } from '@wordpress/blocks';
 import { useDispatch, useSelect, useRegistry } from '@wordpress/data';
 import { getFilesFromDataTransfer } from '@wordpress/dom';
@@ -61,6 +63,8 @@ export function parseDropEvent( event ) {
  * @param {Function} moveBlocks                A function that moves blocks.
  * @param {Function} insertOrReplaceBlocks     A function that inserts or replaces blocks.
  * @param {Function} clearSelectedBlock        A function that clears block selection.
+ * @param {string}   operation                 The type of operation to perform on drop. Could be `insert` or `replace` or `group`.
+ * @param {Function} getBlock                  A function that returns a block given its client id.
  * @return {Function} The event handler for a block drop event.
  */
 export function onBlockDrop(
@@ -70,7 +74,9 @@ export function onBlockDrop(
 	getClientIdsOfDescendants,
 	moveBlocks,
 	insertOrReplaceBlocks,
-	clearSelectedBlock
+	clearSelectedBlock,
+	operation,
+	getBlock
 ) {
 	return ( event ) => {
 		const {
@@ -113,6 +119,21 @@ export function onBlockDrop(
 				return;
 			}
 
+			// If the user is dropping a block over another block, replace both blocks
+			// with a group block containing them
+			if ( operation === 'group' ) {
+				const blocksToInsert = sourceClientIds.map( ( clientId ) =>
+					getBlock( clientId )
+				);
+				insertOrReplaceBlocks(
+					blocksToInsert,
+					true,
+					null,
+					sourceClientIds
+				);
+				return;
+			}
+
 			const isAtSameLevel = sourceRootClientId === targetRootClientId;
 			const draggedBlockCount = sourceClientIds.length;
 
@@ -133,8 +154,7 @@ export function onBlockDrop(
  * A function that returns an event handler function for block-related file drop events.
  *
  * @param {string}   targetRootClientId    The root client id where the block(s) will be inserted.
- * @param {number}   targetBlockIndex      The index where the block(s) will be inserted.
- * @param {boolean}  hasUploadPermissions  Whether the user has upload permissions.
+ * @param {Function} getSettings           A function that gets the block editor settings.
  * @param {Function} updateBlockAttributes A function that updates a block's attributes.
  * @param {Function} canInsertBlockType    A function that returns checks whether a block type can be inserted.
  * @param {Function} insertOrReplaceBlocks A function that inserts or replaces blocks.
@@ -143,14 +163,13 @@ export function onBlockDrop(
  */
 export function onFilesDrop(
 	targetRootClientId,
-	targetBlockIndex,
-	hasUploadPermissions,
+	getSettings,
 	updateBlockAttributes,
 	canInsertBlockType,
 	insertOrReplaceBlocks
 ) {
 	return ( files ) => {
-		if ( ! hasUploadPermissions ) {
+		if ( ! getSettings().mediaUpload ) {
 			return;
 		}
 
@@ -175,17 +194,11 @@ export function onFilesDrop(
 /**
  * A function that returns an event handler function for block-related HTML drop events.
  *
- * @param {string}   targetRootClientId    The root client id where the block(s) will be inserted.
- * @param {number}   targetBlockIndex      The index where the block(s) will be inserted.
  * @param {Function} insertOrReplaceBlocks A function that inserts or replaces blocks.
  *
  * @return {Function} The event handler for a block-related HTML drop event.
  */
-export function onHTMLDrop(
-	targetRootClientId,
-	targetBlockIndex,
-	insertOrReplaceBlocks
-) {
+export function onHTMLDrop( insertOrReplaceBlocks ) {
 	return ( HTML ) => {
 		const blocks = pasteHandler( { HTML, mode: 'BLOCKS' } );
 
@@ -210,18 +223,17 @@ export default function useOnBlockDrop(
 	targetBlockIndex,
 	options = {}
 ) {
-	const { operation = 'insert' } = options;
-	const hasUploadPermissions = useSelect(
-		( select ) => select( blockEditorStore ).getSettings().mediaUpload,
-		[]
-	);
+	const { operation = 'insert', nearestSide = 'right' } = options;
 	const {
 		canInsertBlockType,
 		getBlockIndex,
 		getClientIdsOfDescendants,
 		getBlockOrder,
 		getBlocksByClientId,
+		getSettings,
+		getBlock,
 	} = useSelect( blockEditorStore );
+	const { getGroupingBlockName } = useSelect( blocksStore );
 	const {
 		insertBlocks,
 		moveBlocksToPosition,
@@ -233,12 +245,65 @@ export default function useOnBlockDrop(
 	const registry = useRegistry();
 
 	const insertOrReplaceBlocks = useCallback(
-		( blocks, updateSelection = true, initialPosition = 0 ) => {
+		(
+			blocks,
+			updateSelection = true,
+			initialPosition = 0,
+			clientIdsToReplace = []
+		) => {
+			if ( ! Array.isArray( blocks ) ) {
+				blocks = [ blocks ];
+			}
+			const clientIds = getBlockOrder( targetRootClientId );
+			const clientId = clientIds[ targetBlockIndex ];
 			if ( operation === 'replace' ) {
-				const clientIds = getBlockOrder( targetRootClientId );
-				const clientId = clientIds[ targetBlockIndex ];
-
 				replaceBlocks( clientId, blocks, undefined, initialPosition );
+			} else if ( operation === 'group' ) {
+				const targetBlock = getBlock( clientId );
+				if ( nearestSide === 'left' ) {
+					blocks.push( targetBlock );
+				} else {
+					blocks.unshift( targetBlock );
+				}
+
+				const groupInnerBlocks = blocks.map( ( block ) => {
+					return createBlock(
+						block.name,
+						block.attributes,
+						block.innerBlocks
+					);
+				} );
+
+				const areAllImages = blocks.every( ( block ) => {
+					return block.name === 'core/image';
+				} );
+
+				const galleryBlock = canInsertBlockType(
+					'core/gallery',
+					targetRootClientId
+				);
+
+				const wrappedBlocks = createBlock(
+					areAllImages && galleryBlock
+						? 'core/gallery'
+						: getGroupingBlockName(),
+					{
+						layout: {
+							type: 'flex',
+							flexWrap:
+								areAllImages && galleryBlock ? null : 'nowrap',
+						},
+					},
+					groupInnerBlocks
+				);
+				// Need to make sure both the target block and the block being dragged are replaced
+				// otherwise the dragged block will be duplicated.
+				replaceBlocks(
+					[ clientId, ...clientIdsToReplace ],
+					wrappedBlocks,
+					undefined,
+					initialPosition
+				);
 			} else {
 				insertBlocks(
 					blocks,
@@ -250,12 +315,16 @@ export default function useOnBlockDrop(
 			}
 		},
 		[
-			operation,
 			getBlockOrder,
-			insertBlocks,
-			replaceBlocks,
-			targetBlockIndex,
 			targetRootClientId,
+			targetBlockIndex,
+			operation,
+			replaceBlocks,
+			getBlock,
+			nearestSide,
+			canInsertBlockType,
+			getGroupingBlockName,
+			insertBlocks,
 		]
 	);
 
@@ -292,9 +361,10 @@ export default function useOnBlockDrop(
 			operation,
 			getBlockOrder,
 			getBlocksByClientId,
-			insertBlocks,
 			moveBlocksToPosition,
+			registry,
 			removeBlocks,
+			replaceBlocks,
 			targetBlockIndex,
 			targetRootClientId,
 		]
@@ -307,21 +377,18 @@ export default function useOnBlockDrop(
 		getClientIdsOfDescendants,
 		moveBlocks,
 		insertOrReplaceBlocks,
-		clearSelectedBlock
+		clearSelectedBlock,
+		operation,
+		getBlock
 	);
 	const _onFilesDrop = onFilesDrop(
 		targetRootClientId,
-		targetBlockIndex,
-		hasUploadPermissions,
+		getSettings,
 		updateBlockAttributes,
 		canInsertBlockType,
 		insertOrReplaceBlocks
 	);
-	const _onHTMLDrop = onHTMLDrop(
-		targetRootClientId,
-		targetBlockIndex,
-		insertOrReplaceBlocks
-	);
+	const _onHTMLDrop = onHTMLDrop( insertOrReplaceBlocks );
 
 	return ( event ) => {
 		const files = getFilesFromDataTransfer( event.dataTransfer );
diff --git a/packages/block-editor/src/components/use-on-block-drop/test/index.js b/packages/block-editor/src/components/use-on-block-drop/test/index.js
index 1b95cc0085a79e..cd4ef2ad4a8894 100644
--- a/packages/block-editor/src/components/use-on-block-drop/test/index.js
+++ b/packages/block-editor/src/components/use-on-block-drop/test/index.js
@@ -306,13 +306,11 @@ describe( 'onFilesDrop', () => {
 		const canInsertBlockType = noop;
 		const insertOrReplaceBlocks = jest.fn();
 		const targetRootClientId = '1';
-		const targetBlockIndex = 0;
-		const uploadPermissions = false;
+		const getSettings = jest.fn( () => ( {} ) );
 
 		const onFileDropHandler = onFilesDrop(
 			targetRootClientId,
-			targetBlockIndex,
-			uploadPermissions,
+			getSettings,
 			updateBlockAttributes,
 			canInsertBlockType,
 			insertOrReplaceBlocks
@@ -331,13 +329,13 @@ describe( 'onFilesDrop', () => {
 		const insertOrReplaceBlocks = jest.fn();
 		const canInsertBlockType = noop;
 		const targetRootClientId = '1';
-		const targetBlockIndex = 0;
-		const uploadPermissions = true;
+		const getSettings = jest.fn( () => ( {
+			mediaUpload: true,
+		} ) );
 
 		const onFileDropHandler = onFilesDrop(
 			targetRootClientId,
-			targetBlockIndex,
-			uploadPermissions,
+			getSettings,
 			updateBlockAttributes,
 			canInsertBlockType,
 			insertOrReplaceBlocks
@@ -359,13 +357,13 @@ describe( 'onFilesDrop', () => {
 		const canInsertBlockType = noop;
 		const insertOrReplaceBlocks = jest.fn();
 		const targetRootClientId = '1';
-		const targetBlockIndex = 0;
-		const uploadPermissions = true;
+		const getSettings = jest.fn( () => ( {
+			mediaUpload: true,
+		} ) );
 
 		const onFileDropHandler = onFilesDrop(
 			targetRootClientId,
-			targetBlockIndex,
-			uploadPermissions,
+			getSettings,
 			updateBlockAttributes,
 			canInsertBlockType,
 			insertOrReplaceBlocks
@@ -385,15 +383,9 @@ describe( 'onFilesDrop', () => {
 describe( 'onHTMLDrop', () => {
 	it( 'does nothing if the HTML cannot be converted into blocks', () => {
 		pasteHandler.mockImplementation( () => [] );
-		const targetRootClientId = '1';
-		const targetBlockIndex = 0;
 		const insertOrReplaceBlocks = jest.fn();
 
-		const eventHandler = onHTMLDrop(
-			targetRootClientId,
-			targetBlockIndex,
-			insertOrReplaceBlocks
-		);
+		const eventHandler = onHTMLDrop( insertOrReplaceBlocks );
 		eventHandler();
 
 		expect( insertOrReplaceBlocks ).not.toHaveBeenCalled();
@@ -402,15 +394,9 @@ describe( 'onHTMLDrop', () => {
 	it( 'inserts blocks if the HTML can be converted into blocks', () => {
 		const blocks = [ 'blocks' ];
 		pasteHandler.mockImplementation( () => blocks );
-		const targetRootClientId = '1';
-		const targetBlockIndex = 0;
 		const insertOrReplaceBlocks = jest.fn();
 
-		const eventHandler = onHTMLDrop(
-			targetRootClientId,
-			targetBlockIndex,
-			insertOrReplaceBlocks
-		);
+		const eventHandler = onHTMLDrop( insertOrReplaceBlocks );
 		eventHandler();
 
 		expect( insertOrReplaceBlocks ).toHaveBeenCalledWith( blocks );
diff --git a/packages/block-editor/src/components/use-paste-styles/index.js b/packages/block-editor/src/components/use-paste-styles/index.js
index 9150776ad1158b..1c2a844488b862 100644
--- a/packages/block-editor/src/components/use-paste-styles/index.js
+++ b/packages/block-editor/src/components/use-paste-styles/index.js
@@ -15,6 +15,7 @@ import {
 	hasAlignSupport,
 	hasBorderSupport,
 	hasBackgroundColorSupport,
+	hasTextAlignSupport,
 	hasTextColorSupport,
 	hasGradientSupport,
 	hasCustomClassNameSupport,
@@ -59,6 +60,7 @@ const STYLE_ATTRIBUTES = {
 	align: hasAlignSupport,
 	borderColor: ( nameOrType ) => hasBorderSupport( nameOrType, 'color' ),
 	backgroundColor: hasBackgroundColorSupport,
+	textAlign: hasTextAlignSupport,
 	textColor: hasTextColorSupport,
 	gradient: hasGradientSupport,
 	className: hasCustomClassNameSupport,
diff --git a/packages/block-editor/src/components/use-resize-canvas/README.md b/packages/block-editor/src/components/use-resize-canvas/README.md
index 18d28df7b3e3af..a34958c56c4542 100644
--- a/packages/block-editor/src/components/use-resize-canvas/README.md
+++ b/packages/block-editor/src/components/use-resize-canvas/README.md
@@ -1,27 +1,23 @@
 # useResizeCanvas
 
-This React hook generates inline CSS suitable for resizing a container to fit a device's dimensions. It adjusts the CSS according to the current device dimensions. It has no effect on desktop.
+This React hook generates inline CSS suitable for resizing a container to fit a device's dimensions. It adjusts the CSS according to the current device dimensions.
 
 On-page CSS media queries are also updated to match the width of the device.
 
 Note that this is currently experimental, and is available as `__experimentalUseResizeCanvas`.
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-
 ## Development guidelines
 
 ### Usage
 
-The hook returns a style object which can be applied to a container. It is passed the current device type, which can be obtained from `__experimentalGetPreviewDeviceType`.
+The hook returns a style object which can be applied to a container. It is passed the current device type, which can be obtained from `getDeviceType`.
 
 ```jsx
 import { __experimentalUseResizeCanvas as useResizeCanvas } from '@wordpress/block-editor';
 
 function ResizedContainer() {
 	const deviceType = useSelect( ( select ) => {
-		return select( 'core/edit-post' ).__experimentalGetPreviewDeviceType();
+		return select( 'core/editor' ).getDeviceType();
 	}, [] );
 	const inlineStyles = useResizeCanvas( deviceType );
 
diff --git a/packages/block-editor/src/components/use-resize-canvas/index.js b/packages/block-editor/src/components/use-resize-canvas/index.js
index fab0b7a15e2afd..3b4d97a097964c 100644
--- a/packages/block-editor/src/components/use-resize-canvas/index.js
+++ b/packages/block-editor/src/components/use-resize-canvas/index.js
@@ -43,11 +43,9 @@ export default function useResizeCanvas( deviceType ) {
 		return deviceWidth < actualWidth ? deviceWidth : actualWidth;
 	};
 
-	const marginValue = () => ( window.innerHeight < 800 ? 36 : 72 );
-
 	const contentInlineStyles = ( device ) => {
 		const height = device === 'Mobile' ? '768px' : '1024px';
-		const marginVertical = marginValue() + 'px';
+		const marginVertical = '40px';
 		const marginHorizontal = 'auto';
 
 		switch ( device ) {
@@ -62,12 +60,13 @@ export default function useResizeCanvas( deviceType ) {
 					marginLeft: marginHorizontal,
 					marginRight: marginHorizontal,
 					height,
-					borderRadius: '2px 2px 2px 2px',
-					border: '1px solid #ddd',
 					overflowY: 'auto',
 				};
 			default:
-				return null;
+				return {
+					marginLeft: marginHorizontal,
+					marginRight: marginHorizontal,
+				};
 		}
 	};
 
diff --git a/packages/block-editor/src/components/use-settings/README.md b/packages/block-editor/src/components/use-settings/README.md
index 83ab802edea83c..68f580aa357bea 100644
--- a/packages/block-editor/src/components/use-settings/README.md
+++ b/packages/block-editor/src/components/use-settings/README.md
@@ -9,10 +9,6 @@ It does the lookup of the settings in the following order:
 3. If that doesn't prove to be successful in getting a value, then it falls back to the settings from the block editor store.
 4. If none of the above steps prove to be successful, then it's likely to be a deprecated setting and the deprecated setting is used instead.
 
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-
 ## Development guidelines
 
 ### Usage
diff --git a/packages/block-editor/src/components/use-settings/index.js b/packages/block-editor/src/components/use-settings/index.js
index 6f791a42bf1fe3..072653b913c304 100644
--- a/packages/block-editor/src/components/use-settings/index.js
+++ b/packages/block-editor/src/components/use-settings/index.js
@@ -1,133 +1,15 @@
 /**
  * WordPress dependencies
  */
-import {
-	__EXPERIMENTAL_PATHS_WITH_MERGE as PATHS_WITH_MERGE,
-	hasBlockSupport,
-} from '@wordpress/blocks';
 import { useSelect } from '@wordpress/data';
 import deprecated from '@wordpress/deprecated';
-import { useMemo } from '@wordpress/element';
-import { applyFilters } from '@wordpress/hooks';
 
 /**
  * Internal dependencies
  */
 import { useBlockEditContext } from '../block-edit';
 import { store as blockEditorStore } from '../../store';
-import { getValueFromObjectPath } from '../../utils/object';
-
-const blockedPaths = [
-	'color',
-	'border',
-	'dimensions',
-	'typography',
-	'spacing',
-];
-
-const deprecatedFlags = {
-	'color.palette': ( settings ) => settings.colors,
-	'color.gradients': ( settings ) => settings.gradients,
-	'color.custom': ( settings ) =>
-		settings.disableCustomColors === undefined
-			? undefined
-			: ! settings.disableCustomColors,
-	'color.customGradient': ( settings ) =>
-		settings.disableCustomGradients === undefined
-			? undefined
-			: ! settings.disableCustomGradients,
-	'typography.fontSizes': ( settings ) => settings.fontSizes,
-	'typography.customFontSize': ( settings ) =>
-		settings.disableCustomFontSizes === undefined
-			? undefined
-			: ! settings.disableCustomFontSizes,
-	'typography.lineHeight': ( settings ) => settings.enableCustomLineHeight,
-	'spacing.units': ( settings ) => {
-		if ( settings.enableCustomUnits === undefined ) {
-			return;
-		}
-
-		if ( settings.enableCustomUnits === true ) {
-			return [ 'px', 'em', 'rem', 'vh', 'vw', '%' ];
-		}
-
-		return settings.enableCustomUnits;
-	},
-	'spacing.padding': ( settings ) => settings.enableCustomSpacing,
-};
-
-const prefixedFlags = {
-	/*
-	 * These were only available in the plugin
-	 * and can be removed when the minimum WordPress version
-	 * for the plugin is 5.9.
-	 */
-	'border.customColor': 'border.color',
-	'border.customStyle': 'border.style',
-	'border.customWidth': 'border.width',
-	'typography.customFontStyle': 'typography.fontStyle',
-	'typography.customFontWeight': 'typography.fontWeight',
-	'typography.customLetterSpacing': 'typography.letterSpacing',
-	'typography.customTextDecorations': 'typography.textDecoration',
-	'typography.customTextTransforms': 'typography.textTransform',
-	/*
-	 * These were part of WordPress 5.8 and we need to keep them.
-	 */
-	'border.customRadius': 'border.radius',
-	'spacing.customMargin': 'spacing.margin',
-	'spacing.customPadding': 'spacing.padding',
-	'typography.customLineHeight': 'typography.lineHeight',
-};
-
-/**
- * Remove `custom` prefixes for flags that did not land in 5.8.
- *
- * This provides continued support for `custom` prefixed properties. It will
- * be removed once third party devs have had sufficient time to update themes,
- * plugins, etc.
- *
- * @see https://github.com/WordPress/gutenberg/pull/34485
- *
- * @param {string} path Path to desired value in settings.
- * @return {string}     The value for defined setting.
- */
-const removeCustomPrefixes = ( path ) => {
-	return prefixedFlags[ path ] || path;
-};
-
-/**
- * For settings like `color.palette`, which have a value that is an object
- * with `default`, `theme`, `custom`, with field values that are arrays of
- * items, merge these three arrays into one and return it. The calculation
- * is memoized so that identical input values produce identical output.
- * @param {Object} value Object to merge
- * @return {Array} Array of merged items
- */
-export function mergeOrigins( value ) {
-	let result = mergeCache.get( value );
-	if ( ! result ) {
-		result = [ 'default', 'theme', 'custom' ].flatMap(
-			( key ) => value[ key ] ?? []
-		);
-		mergeCache.set( value, result );
-	}
-	return result;
-}
-const mergeCache = new WeakMap();
-
-/**
- * For settings like `color.palette`, which have a value that is an object
- * with `default`, `theme`, `custom`, with field values that are arrays of
- * items, see if any of the three origins have values.
- *
- * @param {Object} value Object to check
- * @return {boolean} Whether the object has values in any of the three origins
- */
-export function hasMergedOrigins( value ) {
-	return [ 'default', 'theme', 'custom' ].some(
-		( key ) => value?.[ key ]?.length
-	);
-}
+import { unlock } from '../../lock-unlock';
 
 /**
  * Hook that retrieves the given settings for the block instance in use.
@@ -143,120 +25,14 @@ export function hasMergedOrigins( value ) {
  * ```
  */
 export function useSettings( ...paths ) {
-	const { name: blockName, clientId = null } = useBlockEditContext();
-
-	// eslint-disable-next-line react-hooks/exhaustive-deps
-	paths = useMemo( () => paths, paths );
-
+	const { clientId = null } = useBlockEditContext();
 	return useSelect(
-		( select ) => {
-			const candidates = clientId
-				? [
-						clientId,
-						...select( blockEditorStore ).getBlockParents(
-							clientId,
-							/* ascending */ true
-						),
-				  ].filter( ( candidateClientId ) => {
-						const candidateBlockName =
-							select( blockEditorStore ).getBlockName(
-								candidateClientId
-							);
-						return hasBlockSupport(
-							candidateBlockName,
-							'__experimentalSettings',
-							false
-						);
-				  } )
-				: [];
-
-			return paths.map( ( path ) => {
-				if ( blockedPaths.includes( path ) ) {
-					// eslint-disable-next-line no-console
-					console.warn(
-						'Top level useSetting paths are disabled. Please use a subpath to query the information needed.'
-					);
-					return undefined;
-				}
-
-				// 0. Allow third parties to filter the block's settings at runtime.
-				let result = applyFilters(
-					'blockEditor.useSetting.before',
-					undefined,
-					path,
-					clientId,
-					blockName
-				);
-
-				if ( undefined !== result ) {
-					return result;
-				}
-
-				const normalizedPath = removeCustomPrefixes( path );
-
-				// 1. Take settings from the block instance or its ancestors.
-				// Start from the current block and work our way up the ancestors.
-				for ( const candidateClientId of candidates ) {
-					const candidateAtts =
-						select( blockEditorStore ).getBlockAttributes(
-							candidateClientId
-						);
-					result =
-						getValueFromObjectPath(
-							candidateAtts.settings?.blocks?.[ blockName ],
-							normalizedPath
-						) ??
-						getValueFromObjectPath(
-							candidateAtts.settings,
-							normalizedPath
-						);
-					if ( result !== undefined ) {
-						// Stop the search for more distant ancestors and move on.
-						break;
-					}
-				}
-
-				// 2. Fall back to the settings from the block editor store (__experimentalFeatures).
-				const settings = select( blockEditorStore ).getSettings();
-				if ( result === undefined && blockName ) {
-					result = getValueFromObjectPath(
-						settings.__experimentalFeatures?.blocks?.[ blockName ],
-						normalizedPath
-					);
-				}
-
-				if ( result === undefined ) {
-					result = getValueFromObjectPath(
-						settings.__experimentalFeatures,
-						normalizedPath
-					);
-				}
-
-				// Return if the setting was found in either the block instance or the store.
-				if ( result !== undefined ) {
-					if ( PATHS_WITH_MERGE[ normalizedPath ] ) {
-						return mergeOrigins( result );
-					}
-					return result;
-				}
-
-				// 3. Otherwise, use deprecated settings.
-				const deprecatedSettingsValue =
-					deprecatedFlags[ normalizedPath ]?.( settings );
-				if ( deprecatedSettingsValue !== undefined ) {
-					return deprecatedSettingsValue;
-				}
-
-				// 4. Fallback for typography.dropCap:
-				// This is only necessary to support typography.dropCap.
-				// when __experimentalFeatures are not present (core without plugin).
-				// To remove when __experimentalFeatures are ported to core.
-				return normalizedPath === 'typography.dropCap'
-					? true
-					: undefined;
-			} );
-		},
-		[ blockName, clientId, paths ]
+		( select ) =>
+			unlock( select( blockEditorStore ) ).getBlockSettings(
+				clientId,
+				...paths
+			),
+		[ clientId, ...paths ]
 	);
 }
 
@@ -266,9 +42,10 @@ export function useSettings( ...paths ) {
  * It looks up the setting first in the block instance hierarchy.
  * If none is found, it'll look it up in the block editor settings.
  *
+ * @deprecated 6.5.0 Use useSettings instead.
+ *
  * @param {string} path The path to the setting.
  * @return {any} Returns the value defined for the setting.
- * @deprecated 6.5.0 Use useSettings instead.
  * @example
  * ```js
  * const isEnabled = useSetting( 'typography.dropCap' );
diff --git a/packages/block-editor/src/components/use-settings/test/index.js b/packages/block-editor/src/components/use-settings/test/index.js
deleted file mode 100644
index c9174cf35df5f7..00000000000000
--- a/packages/block-editor/src/components/use-settings/test/index.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * External dependencies
- */
-import { render } from '@testing-library/react';
-
-/**
- * WordPress dependencies
- */
-import { addFilter, removeFilter } from '@wordpress/hooks';
-import { useSelect } from '@wordpress/data';
-import { useEffect } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { useSettings, useSetting } from '..';
-import * as BlockEditContext from '../../block-edit/context';
-
-// Mock useSelect() functions used by useSettings()
-jest.mock( '@wordpress/data/src/components/use-select' );
-
-let selectMock = {};
-const setupSelectMock = () => {
-	selectMock = {
-		getSettings: () => ( {} ),
-		getBlockParents: () => [],
-		getBlockName: () => '',
-	};
-};
-
-useSelect.mockImplementation( ( callback ) => callback( () => selectMock ) );
-
-const mockSettings = ( settings ) => {
-	selectMock.getSettings = () => ( {
-		__experimentalFeatures: settings,
-	} );
-};
-
-const mockCurrentBlockContext = (
-	blockContext = { name: '', isSelected: false }
-) => {
-	jest.spyOn( BlockEditContext, 'useBlockEditContext' ).mockReturnValue(
-		blockContext
-	);
-};
-
-function runHook( hookCb ) {
-	let storedResult;
-	function TestHook() {
-		const result = hookCb();
-		useEffect( () => {
-			storedResult = result;
-		}, [ result ] );
-	}
-	render( <TestHook /> );
-	return storedResult;
-}
-
-describe( 'useSettings', () => {
-	beforeEach( () => {
-		setupSelectMock();
-		mockCurrentBlockContext();
-	} );
-
-	it( 'uses block setting', () => {
-		mockSettings( {
-			blocks: {
-				'core/test-block': {
-					layout: {
-						contentSize: '840px',
-					},
-				},
-			},
-		} );
-
-		mockCurrentBlockContext( {
-			name: 'core/test-block',
-		} );
-
-		const result = runHook( () => useSettings( 'layout.contentSize' ) );
-		expect( result ).toEqual( [ '840px' ] );
-	} );
-
-	it( 'uses blockEditor.useSetting.before hook override', () => {
-		mockSettings( {
-			blocks: {
-				'core/test-block': {
-					layout: {
-						contentSize: '840px',
-					},
-				},
-			},
-		} );
-
-		mockCurrentBlockContext( {
-			name: 'core/test-block',
-		} );
-
-		addFilter(
-			'blockEditor.useSetting.before',
-			'test/useSetting.before',
-			( result, path, clientId, blockName ) => {
-				if ( blockName === 'core/test-block' ) {
-					return '960px';
-				}
-
-				return result;
-			}
-		);
-
-		const result = runHook( () => useSettings( 'layout.contentSize' ) );
-		expect( result ).toEqual( [ '960px' ] );
-
-		removeFilter(
-			'blockEditor.useSetting.before',
-			'test/useSetting.before'
-		);
-	} );
-
-	it( 'supports also the deprecated useSetting function', () => {
-		mockSettings( {
-			blocks: {
-				'core/test-block': {
-					layout: {
-						contentSize: '840px',
-					},
-				},
-			},
-		} );
-
-		mockCurrentBlockContext( {
-			name: 'core/test-block',
-		} );
-
-		const result = runHook( () => useSetting( 'layout.contentSize' ) );
-		expect( result ).toBe( '840px' );
-		expect( console ).toHaveWarnedWith(
-			'wp.blockEditor.useSetting is deprecated since version 6.5. Please use wp.blockEditor.useSettings instead.'
-		);
-	} );
-} );
diff --git a/packages/block-editor/src/components/video-player/index.native.js b/packages/block-editor/src/components/video-player/index.native.js
index a409c1d4ad99fc..3c9de8758579b6 100644
--- a/packages/block-editor/src/components/video-player/index.native.js
+++ b/packages/block-editor/src/components/video-player/index.native.js
@@ -99,7 +99,7 @@ class Video extends Component {
 					// So we are setting controls=false and adding a play button that
 					// will trigger presentFullscreenPlayer()
 					controls={ false }
-					ignoreSilentSwitch={ 'ignore' }
+					ignoreSilentSwitch="ignore"
 					paused={ ! isFullScreen }
 					onLayout={ this.onVideoLayout }
 					onFullscreenPlayerWillPresent={ () => {
diff --git a/packages/block-editor/src/components/warning/content.scss b/packages/block-editor/src/components/warning/content.scss
index f4eeb253c1c2fb..9380a224b2ff95 100644
--- a/packages/block-editor/src/components/warning/content.scss
+++ b/packages/block-editor/src/components/warning/content.scss
@@ -7,7 +7,7 @@
 
 	// Block UI appearance.
 	border: $border-width solid $gray-900;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	background-color: $white;
 
 	.block-editor-warning__message {
@@ -30,21 +30,14 @@
 		flex-wrap: wrap;
 		align-items: baseline;
 		width: 100%;
+		gap: $grid-unit-15;
 	}
 
 	.block-editor-warning__actions {
 		align-items: center;
 		display: flex;
-		margin-top: 1em;
+		gap: $grid-unit-10;
 	}
-
-	.block-editor-warning__action {
-		margin: 0 $grid-unit-10 0 0;
-	}
-}
-
-.block-editor-warning__secondary {
-	margin: auto 0 auto $grid-unit-10;
 }
 
 .components-popover.block-editor-warning__dropdown {
diff --git a/packages/block-editor/src/components/warning/index.js b/packages/block-editor/src/components/warning/index.js
index 914f04e4fc80e8..8b6279bef6044d 100644
--- a/packages/block-editor/src/components/warning/index.js
+++ b/packages/block-editor/src/components/warning/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -14,7 +14,7 @@ import { moreVertical } from '@wordpress/icons';
 function Warning( { className, actions, children, secondaryActions } ) {
 	return (
 		<div style={ { display: 'contents', all: 'initial' } }>
-			<div className={ classnames( className, 'block-editor-warning' ) }>
+			<div className={ clsx( className, 'block-editor-warning' ) }>
 				<div className="block-editor-warning__contents">
 					<p className="block-editor-warning__message">
 						{ children }
diff --git a/packages/block-editor/src/components/warning/index.native.js b/packages/block-editor/src/components/warning/index.native.js
index cda7f13a68405d..9c825abed271b7 100644
--- a/packages/block-editor/src/components/warning/index.native.js
+++ b/packages/block-editor/src/components/warning/index.native.js
@@ -16,33 +16,36 @@ import { normalizeIconObject } from '@wordpress/blocks';
 import styles from './style.scss';
 
 function Warning( {
+	actions,
 	title,
 	message,
 	icon,
 	iconClass,
 	preferredColorScheme,
 	getStylesFromColorScheme,
+	containerStyle: extraContainerStyle,
+	titleStyle: extraTitleStyle,
+	messageStyle: extraMessageStyle,
 	...viewProps
 } ) {
 	icon = icon && normalizeIconObject( icon );
 	const internalIconClass = 'warning-icon' + '-' + preferredColorScheme;
-	const titleStyle = getStylesFromColorScheme(
-		styles.title,
-		styles.titleDark
-	);
-	const messageStyle = getStylesFromColorScheme(
-		styles.message,
-		styles.messageDark
-	);
+
+	const containerStyle = [
+		getStylesFromColorScheme( styles.container, styles.containerDark ),
+		extraContainerStyle,
+	];
+	const titleStyle = [
+		getStylesFromColorScheme( styles.title, styles.titleDark ),
+		extraTitleStyle,
+	];
+	const messageStyle = [
+		getStylesFromColorScheme( styles.message, styles.messageDark ),
+		extraMessageStyle,
+	];
 
 	return (
-		<View
-			style={ getStylesFromColorScheme(
-				styles.container,
-				styles.containerDark
-			) }
-			{ ...viewProps }
-		>
+		<View style={ containerStyle } { ...viewProps }>
 			{ icon && (
 				<View style={ styles.icon }>
 					<Icon
@@ -53,6 +56,7 @@ function Warning( {
 			) }
 			{ title && <Text style={ titleStyle }>{ title }</Text> }
 			{ message && <Text style={ messageStyle }>{ message }</Text> }
+			{ actions }
 		</View>
 	);
 }
diff --git a/packages/block-editor/src/components/writing-flow/index.js b/packages/block-editor/src/components/writing-flow/index.js
index f15c1dac0267fd..cb789bdd7035b4 100644
--- a/packages/block-editor/src/components/writing-flow/index.js
+++ b/packages/block-editor/src/components/writing-flow/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -47,20 +47,21 @@ export function useWritingFlow() {
 			useRefEffect(
 				( node ) => {
 					node.tabIndex = 0;
-					node.contentEditable = hasMultiSelection;
+					node.dataset.hasMultiSelection = hasMultiSelection;
 
 					if ( ! hasMultiSelection ) {
-						return;
+						return () => {
+							delete node.dataset.hasMultiSelection;
+						};
 					}
 
-					node.classList.add( 'has-multi-selection' );
 					node.setAttribute(
 						'aria-label',
 						__( 'Multiple selected blocks' )
 					);
 
 					return () => {
-						node.classList.remove( 'has-multi-selection' );
+						delete node.dataset.hasMultiSelection;
 						node.removeAttribute( 'aria-label' );
 					};
 				},
@@ -79,7 +80,7 @@ function WritingFlow( { children, ...props }, forwardedRef ) {
 			<div
 				{ ...props }
 				ref={ useMergeRefs( [ ref, forwardedRef ] ) }
-				className={ classNames(
+				className={ clsx(
 					props.className,
 					'block-editor-writing-flow'
 				) }
diff --git a/packages/block-editor/src/components/writing-flow/use-clipboard-handler.js b/packages/block-editor/src/components/writing-flow/use-clipboard-handler.js
index 5b78d2f8656b61..bed07b183cc0cc 100644
--- a/packages/block-editor/src/components/writing-flow/use-clipboard-handler.js
+++ b/packages/block-editor/src/components/writing-flow/use-clipboard-handler.js
@@ -2,38 +2,41 @@
  * WordPress dependencies
  */
 import {
-	serialize,
 	pasteHandler,
-	createBlock,
 	findTransform,
 	getBlockTransforms,
+	hasBlockSupport,
+	switchToBlockType,
 } from '@wordpress/blocks';
 import {
 	documentHasSelection,
 	documentHasUncollapsedSelection,
-	__unstableStripHTML as stripHTML,
 } from '@wordpress/dom';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useRegistry, useSelect } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
-import { getPasteEventData } from '../../utils/pasting';
 import { store as blockEditorStore } from '../../store';
 import { useNotifyCopy } from '../../utils/use-notify-copy';
+import { setClipboardBlocks } from './utils';
+import { getPasteEventData } from '../../utils/pasting';
 
 export default function useClipboardHandler() {
+	const registry = useRegistry();
 	const {
 		getBlocksByClientId,
 		getSelectedBlockClientIds,
 		hasMultiSelection,
 		getSettings,
+		getBlockName,
 		__unstableIsFullySelected,
 		__unstableIsSelectionCollapsed,
 		__unstableIsSelectionMergeable,
 		__unstableGetSelectedBlocksWithPartialSelection,
 		canInsertBlockType,
+		getBlockRootClientId,
 	} = useSelect( blockEditorStore );
 	const {
 		flashBlock,
@@ -41,7 +44,7 @@ export default function useClipboardHandler() {
 		replaceBlocks,
 		__unstableDeleteSelection,
 		__unstableExpandSelection,
-		insertBlocks,
+		__unstableSplitSelection,
 	} = useDispatch( blockEditorStore );
 	const notifyCopy = useNotifyCopy();
 
@@ -58,7 +61,8 @@ export default function useClipboardHandler() {
 				return;
 			}
 
-			// Always handle multiple selected blocks.
+			// Let native copy/paste behaviour take over in input fields.
+			// But always handle multiple selected blocks.
 			if ( ! hasMultiSelection() ) {
 				const { target } = event;
 				const { ownerDocument } = target;
@@ -67,7 +71,8 @@ export default function useClipboardHandler() {
 				const hasSelection =
 					event.type === 'copy' || event.type === 'cut'
 						? documentHasUncollapsedSelection( ownerDocument )
-						: documentHasSelection( ownerDocument );
+						: documentHasSelection( ownerDocument ) &&
+						  ! ownerDocument.activeElement.isContentEditable;
 
 				// Let native copy behaviour take over in input fields.
 				if ( hasSelection ) {
@@ -75,18 +80,20 @@ export default function useClipboardHandler() {
 				}
 			}
 
-			if ( ! node.contains( event.target.ownerDocument.activeElement ) ) {
+			const { activeElement } = event.target.ownerDocument;
+
+			if ( ! node.contains( activeElement ) ) {
 				return;
 			}
 
-			event.preventDefault();
-
 			const isSelectionMergeable = __unstableIsSelectionMergeable();
 			const shouldHandleWholeBlocks =
 				__unstableIsSelectionCollapsed() || __unstableIsFullySelected();
 			const expandSelectionIsNeeded =
 				! shouldHandleWholeBlocks && ! isSelectionMergeable;
 			if ( event.type === 'copy' || event.type === 'cut' ) {
+				event.preventDefault();
+
 				if ( selectedBlockClientIds.length === 1 ) {
 					flashBlock( selectedBlockClientIds[ 0 ] );
 				}
@@ -112,29 +119,7 @@ export default function useClipboardHandler() {
 						blocks = [ head, ...inBetweenBlocks, tail ];
 					}
 
-					const wrapperBlockName = event.clipboardData.getData(
-						'__unstableWrapperBlockName'
-					);
-
-					if ( wrapperBlockName ) {
-						blocks = createBlock(
-							wrapperBlockName,
-							JSON.parse(
-								event.clipboardData.getData(
-									'__unstableWrapperBlockAttributes'
-								)
-							),
-							blocks
-						);
-					}
-
-					const serialized = serialize( blocks );
-
-					event.clipboardData.setData(
-						'text/plain',
-						toPlainText( serialized )
-					);
-					event.clipboardData.setData( 'text/html', serialized );
+					setClipboardBlocks( event, blocks, registry );
 				}
 			}
 
@@ -153,7 +138,13 @@ export default function useClipboardHandler() {
 					__experimentalCanUserUseUnfilteredHTML:
 						canUserUseUnfilteredHTML,
 				} = getSettings();
+				const isInternal =
+					event.clipboardData.getData( 'rich-text' ) === 'true';
+				if ( isInternal ) {
+					return;
+				}
 				const { plainText, html, files } = getPasteEventData( event );
+				const isFullySelected = __unstableIsFullySelected();
 				let blocks = [];
 
 				if ( files.length ) {
@@ -178,37 +169,77 @@ export default function useClipboardHandler() {
 					blocks = pasteHandler( {
 						HTML: html,
 						plainText,
-						mode: 'BLOCKS',
+						mode: isFullySelected ? 'BLOCKS' : 'AUTO',
 						canUserUseUnfilteredHTML,
 					} );
 				}
 
-				if ( selectedBlockClientIds.length === 1 ) {
-					const [ selectedBlockClientId ] = selectedBlockClientIds;
+				// Inline paste: let rich text handle it.
+				if ( typeof blocks === 'string' ) {
+					return;
+				}
 
-					if (
-						blocks.every( ( block ) =>
-							canInsertBlockType(
-								block.name,
-								selectedBlockClientId
-							)
-						)
-					) {
-						insertBlocks(
-							blocks,
-							undefined,
-							selectedBlockClientId
-						);
-						return;
-					}
+				if ( isFullySelected ) {
+					replaceBlocks(
+						selectedBlockClientIds,
+						blocks,
+						blocks.length - 1,
+						-1
+					);
+					event.preventDefault();
+					return;
+				}
+
+				// If a block doesn't support splitting, let rich text paste
+				// inline.
+				if (
+					! hasMultiSelection() &&
+					! hasBlockSupport(
+						getBlockName( selectedBlockClientIds[ 0 ] ),
+						'splitting',
+						false
+					) &&
+					! event.__deprecatedOnSplit
+				) {
+					return;
 				}
 
-				replaceBlocks(
-					selectedBlockClientIds,
-					blocks,
-					blocks.length - 1,
-					-1
+				const [ firstSelectedClientId ] = selectedBlockClientIds;
+				const rootClientId = getBlockRootClientId(
+					firstSelectedClientId
 				);
+
+				const newBlocks = [];
+
+				for ( const block of blocks ) {
+					if ( canInsertBlockType( block.name, rootClientId ) ) {
+						newBlocks.push( block );
+					} else {
+						// If a block cannot be inserted in a root block, try
+						// converting it to that root block type and insert the
+						// inner blocks.
+						// Example: paragraphs cannot be inserted into a list,
+						// so convert the paragraphs to a list for list items.
+						const rootBlockName = getBlockName( rootClientId );
+						const switchedBlocks =
+							block.name !== rootBlockName
+								? switchToBlockType( block, rootBlockName )
+								: [ block ];
+
+						if ( ! switchedBlocks ) {
+							return;
+						}
+
+						for ( const switchedBlock of switchedBlocks ) {
+							for ( const innerBlock of switchedBlock.innerBlocks ) {
+								newBlocks.push( innerBlock );
+							}
+						}
+					}
+				}
+
+				__unstableSplitSelection( newBlocks );
+				event.preventDefault();
 			}
 		}
 
@@ -223,20 +254,3 @@ export default function useClipboardHandler() {
 		};
 	}, [] );
 }
-
-/**
- * Given a string of HTML representing serialized blocks, returns the plain
- * text extracted after stripping the HTML of any tags and fixing line breaks.
- *
- * @param {string} html Serialized blocks.
- * @return {string} The plain-text content with any html removed.
- */
-function toPlainText( html ) {
-	// Manually handle BR tags as line breaks prior to `stripHTML` call
-	html = html.replace( /<br>/g, '\n' );
-
-	const plainText = stripHTML( html ).trim();
-
-	// Merge any consecutive line breaks
-	return plainText.replace( /\n\n+/g, '\n\n' );
-}
diff --git a/packages/block-editor/src/components/writing-flow/use-drag-selection.js b/packages/block-editor/src/components/writing-flow/use-drag-selection.js
index e013776e49c7a8..1569c45a7c6769 100644
--- a/packages/block-editor/src/components/writing-flow/use-drag-selection.js
+++ b/packages/block-editor/src/components/writing-flow/use-drag-selection.js
@@ -18,7 +18,9 @@ import { store as blockEditorStore } from '../../store';
 function setContentEditableWrapper( node, value ) {
 	node.contentEditable = value;
 	// Firefox doesn't automatically move focus.
-	if ( value ) node.focus();
+	if ( value ) {
+		node.focus();
+	}
 }
 
 /**
@@ -27,8 +29,12 @@ function setContentEditableWrapper( node, value ) {
 export default function useDragSelection() {
 	const { startMultiSelect, stopMultiSelect } =
 		useDispatch( blockEditorStore );
-	const { isSelectionEnabled, hasMultiSelection, isDraggingBlocks } =
-		useSelect( blockEditorStore );
+	const {
+		isSelectionEnabled,
+		hasSelectedBlock,
+		isDraggingBlocks,
+		isMultiSelecting,
+	} = useSelect( blockEditorStore );
 	return useRefEffect(
 		( node ) => {
 			const { ownerDocument } = node;
@@ -45,7 +51,7 @@ export default function useDragSelection() {
 				// so wait until the next animation frame to get the browser
 				// selection.
 				rafId = defaultView.requestAnimationFrame( () => {
-					if ( hasMultiSelection() ) {
+					if ( ! hasSelectedBlock() ) {
 						return;
 					}
 
@@ -59,19 +65,28 @@ export default function useDragSelection() {
 					const selection = defaultView.getSelection();
 
 					if ( selection.rangeCount ) {
-						const { commonAncestorContainer } =
-							selection.getRangeAt( 0 );
+						const range = selection.getRangeAt( 0 );
+						const { commonAncestorContainer } = range;
+						const clonedRange = range.cloneRange();
 
 						if (
 							anchorElement.contains( commonAncestorContainer )
 						) {
 							anchorElement.focus();
+							selection.removeAllRanges();
+							selection.addRange( clonedRange );
 						}
 					}
 				} );
 			}
 
-			function onMouseLeave( { buttons, target } ) {
+			function onMouseLeave( { buttons, target, relatedTarget } ) {
+				// If we're moving into a child element, ignore. We're tracking
+				// the mouse leaving the element to a parent, no a child.
+				if ( target.contains( relatedTarget ) ) {
+					return;
+				}
+
 				// Avoid triggering a multi-selection if the user is already
 				// dragging blocks.
 				if ( isDraggingBlocks() ) {
@@ -84,6 +99,16 @@ export default function useDragSelection() {
 					return;
 				}
 
+				// Abort if we are already multi-selecting.
+				if ( isMultiSelecting() ) {
+					return;
+				}
+
+				// Abort if selection is leaving writing flow.
+				if ( node === target ) {
+					return;
+				}
+
 				// Check the attribute, not the contentEditable attribute. All
 				// child elements of the content editable wrapper are editable
 				// and return true for this property. We only want to start
@@ -127,7 +152,7 @@ export default function useDragSelection() {
 			startMultiSelect,
 			stopMultiSelect,
 			isSelectionEnabled,
-			hasMultiSelection,
+			hasSelectedBlock,
 		]
 	);
 }
diff --git a/packages/block-editor/src/components/writing-flow/use-input.js b/packages/block-editor/src/components/writing-flow/use-input.js
index f9baf216885ecf..0f10cc9c2d1c75 100644
--- a/packages/block-editor/src/components/writing-flow/use-input.js
+++ b/packages/block-editor/src/components/writing-flow/use-input.js
@@ -4,7 +4,13 @@
 import { useSelect, useDispatch } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
 import { ENTER, BACKSPACE, DELETE } from '@wordpress/keycodes';
-import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
+import {
+	createBlock,
+	getDefaultBlockName,
+	hasBlockSupport,
+	getBlockTransforms,
+	findTransform,
+} from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -18,8 +24,15 @@ export default function useInput() {
 	const {
 		__unstableIsFullySelected,
 		getSelectedBlockClientIds,
+		getSelectedBlockClientId,
 		__unstableIsSelectionMergeable,
 		hasMultiSelection,
+		getBlockName,
+		canInsertBlockType,
+		getBlockRootClientId,
+		getSelectionStart,
+		getSelectionEnd,
+		getBlockAttributes,
 	} = useSelect( blockEditorStore );
 	const {
 		replaceBlocks,
@@ -27,6 +40,7 @@ export default function useInput() {
 		removeBlocks,
 		__unstableDeleteSelection,
 		__unstableExpandSelection,
+		__unstableMarkAutomaticChange,
 	} = useDispatch( blockEditorStore );
 
 	return useRefEffect( ( node ) => {
@@ -45,6 +59,66 @@ export default function useInput() {
 			}
 
 			if ( ! hasMultiSelection() ) {
+				if ( event.keyCode === ENTER ) {
+					if ( event.shiftKey || __unstableIsFullySelected() ) {
+						return;
+					}
+
+					const clientId = getSelectedBlockClientId();
+					const blockName = getBlockName( clientId );
+					const selectionStart = getSelectionStart();
+					const selectionEnd = getSelectionEnd();
+
+					if (
+						selectionStart.attributeKey ===
+						selectionEnd.attributeKey
+					) {
+						const selectedAttributeValue =
+							getBlockAttributes( clientId )[
+								selectionStart.attributeKey
+							];
+						const transforms = getBlockTransforms( 'from' ).filter(
+							( { type } ) => type === 'enter'
+						);
+						const transformation = findTransform(
+							transforms,
+							( item ) => {
+								return item.regExp.test(
+									selectedAttributeValue
+								);
+							}
+						);
+
+						if ( transformation ) {
+							replaceBlocks(
+								clientId,
+								transformation.transform( {
+									content: selectedAttributeValue,
+								} )
+							);
+							__unstableMarkAutomaticChange();
+							return;
+						}
+					}
+
+					if (
+						! hasBlockSupport( blockName, 'splitting', false ) &&
+						! event.__deprecatedOnSplit
+					) {
+						return;
+					}
+
+					// Ensure template is not locked.
+					if (
+						canInsertBlockType(
+							blockName,
+							getBlockRootClientId( clientId )
+						)
+					) {
+						__unstableSplitSelection();
+						event.preventDefault();
+					}
+				}
 				return;
 			}
 
diff --git a/packages/block-editor/src/components/writing-flow/use-selection-observer.js b/packages/block-editor/src/components/writing-flow/use-selection-observer.js
index b780950dae0ea2..c7ce5d259d875a 100644
--- a/packages/block-editor/src/components/writing-flow/use-selection-observer.js
+++ b/packages/block-editor/src/components/writing-flow/use-selection-observer.js
@@ -3,6 +3,8 @@
  */
 import { useSelect, useDispatch } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
+import { create } from '@wordpress/rich-text';
+import { isSelectionForward } from '@wordpress/dom';
 
 /**
  * Internal dependencies
@@ -52,6 +54,14 @@ function extractSelectionEndNode( selection ) {
 		return focusNode;
 	}
 
+	// When the selection is forward (the selection ends with the focus node),
+	// the selection may extend into the next element with an offset of 0. This
+	// may trigger multi selection even though the selection does not visually
+	// end in the next block.
+	if ( focusOffset === 0 && isSelectionForward( selection ) ) {
+		return focusNode.previousSibling ?? focusNode.parentElement;
+	}
+
 	return focusNode.childNodes[ focusOffset ];
 }
 
@@ -75,10 +85,20 @@ function setContentEditableWrapper( node, value ) {
 	// Since we are calling this on every selection change, check if the value
 	// needs to be updated first because it trigger the browser to recalculate
 	// style.
-	if ( node.contentEditable !== String( value ) )
+	if ( node.contentEditable !== String( value ) ) {
 		node.contentEditable = value;
-	// Firefox doesn't automatically move focus.
-	if ( value ) node.focus();
+
+		// Firefox doesn't automatically move focus.
+		if ( value ) {
+			node.focus();
+		}
+	}
+}
+
+function getRichTextElement( node ) {
+	const element =
+		node.nodeType === node.ELEMENT_NODE ? node : node.parentElement;
+	return element?.closest( '[data-wp-block-attribute-key]' );
 }
 
 /**
@@ -87,7 +107,7 @@ function setContentEditableWrapper( node, value ) {
 export default function useSelectionObserver() {
 	const { multiSelect, selectBlock, selectionChange } =
 		useDispatch( blockEditorStore );
-	const { getBlockParents, getBlockSelectionStart } =
+	const { getBlockParents, getBlockSelectionStart, isMultiSelecting } =
 		useSelect( blockEditorStore );
 	return useRefEffect(
 		( node ) => {
@@ -101,6 +121,16 @@ export default function useSelectionObserver() {
 					return;
 				}
 
+				const startNode = extractSelectionStartNode( selection );
+				const endNode = extractSelectionEndNode( selection );
+
+				if (
+					! node.contains( startNode ) ||
+					! node.contains( endNode )
+				) {
+					return;
+				}
+
 				// If selection is collapsed and we haven't used `shift+click`,
 				// end multi selection and disable the contentEditable wrapper.
 				// We have to check about `shift+click` case because elements
@@ -109,16 +139,24 @@ export default function useSelectionObserver() {
 				// For now we check if the event is a `mouse` event.
 				const isClickShift = event.shiftKey && event.type === 'mouseup';
 				if ( selection.isCollapsed && ! isClickShift ) {
-					setContentEditableWrapper( node, false );
+					if (
+						node.contentEditable === 'true' &&
+						! isMultiSelecting()
+					) {
+						setContentEditableWrapper( node, false );
+						let element =
+							startNode.nodeType === startNode.ELEMENT_NODE
+								? startNode
+								: startNode.parentElement;
+						element = element?.closest( '[contenteditable]' );
+						element?.focus();
+					}
 					return;
 				}
 
-				let startClientId = getBlockClientId(
-					extractSelectionStartNode( selection )
-				);
-				let endClientId = getBlockClientId(
-					extractSelectionEndNode( selection )
-				);
+				let startClientId = getBlockClientId( startNode );
+				let endClientId = getBlockClientId( endNode );
+
 				// If the selection has changed and we had pressed `shift+click`,
 				// we need to check if in an element that doesn't support
 				// text selection has been clicked.
@@ -155,7 +193,11 @@ export default function useSelectionObserver() {
 
 				const isSingularSelection = startClientId === endClientId;
 				if ( isSingularSelection ) {
-					selectBlock( startClientId );
+					if ( ! isMultiSelecting() ) {
+						selectBlock( startClientId );
+					} else {
+						multiSelect( startClientId, startClientId );
+					}
 				} else {
 					const startPath = [
 						...getBlockParents( startClientId ),
@@ -167,39 +209,68 @@ export default function useSelectionObserver() {
 					];
 					const depth = findDepth( startPath, endPath );
 
-					multiSelect( startPath[ depth ], endPath[ depth ] );
-				}
-			}
+					if (
+						startPath[ depth ] !== startClientId ||
+						endPath[ depth ] !== endClientId
+					) {
+						multiSelect( startPath[ depth ], endPath[ depth ] );
+						return;
+					}
 
-			function addListeners() {
-				ownerDocument.addEventListener(
-					'selectionchange',
-					onSelectionChange
-				);
-				defaultView.addEventListener( 'mouseup', onSelectionChange );
+					const richTextElementStart =
+						getRichTextElement( startNode );
+					const richTextElementEnd = getRichTextElement( endNode );
+
+					if ( richTextElementStart && richTextElementEnd ) {
+						const range = selection.getRangeAt( 0 );
+						const richTextDataStart = create( {
+							element: richTextElementStart,
+							range,
+							__unstableIsEditableTree: true,
+						} );
+						const richTextDataEnd = create( {
+							element: richTextElementEnd,
+							range,
+							__unstableIsEditableTree: true,
+						} );
+
+						const startOffset =
+							richTextDataStart.start ?? richTextDataStart.end;
+						const endOffset =
+							richTextDataEnd.start ?? richTextDataEnd.end;
+						selectionChange( {
+							start: {
+								clientId: startClientId,
+								attributeKey:
+									richTextElementStart.dataset
+										.wpBlockAttributeKey,
+								offset: startOffset,
+							},
+							end: {
+								clientId: endClientId,
+								attributeKey:
+									richTextElementEnd.dataset
+										.wpBlockAttributeKey,
+								offset: endOffset,
+							},
+						} );
+					} else {
+						multiSelect( startClientId, endClientId );
+					}
+				}
 			}
 
-			function removeListeners() {
+			ownerDocument.addEventListener(
+				'selectionchange',
+				onSelectionChange
+			);
+			defaultView.addEventListener( 'mouseup', onSelectionChange );
+			return () => {
 				ownerDocument.removeEventListener(
 					'selectionchange',
 					onSelectionChange
 				);
 				defaultView.removeEventListener( 'mouseup', onSelectionChange );
-			}
-
-			function resetListeners() {
-				removeListeners();
-				addListeners();
-			}
-
-			addListeners();
-			// We must allow rich text to set selection first. This ensures that
-			// our `selectionchange` listener is always reset to be called after
-			// the rich text one.
-			node.addEventListener( 'focusin', resetListeners );
-			return () => {
-				removeListeners();
-				node.removeEventListener( 'focusin', resetListeners );
 			};
 		},
 		[ multiSelect, selectBlock, selectionChange, getBlockParents ]
diff --git a/packages/block-editor/src/components/writing-flow/use-tab-nav.js b/packages/block-editor/src/components/writing-flow/use-tab-nav.js
index b1fb1800a53ea2..16a18358fb2ede 100644
--- a/packages/block-editor/src/components/writing-flow/use-tab-nav.js
+++ b/packages/block-editor/src/components/writing-flow/use-tab-nav.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { focus, isFormElement } from '@wordpress/dom';
-import { TAB, ESCAPE } from '@wordpress/keycodes';
+import { TAB } from '@wordpress/keycodes';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { useRefEffect, useMergeRefs } from '@wordpress/compose';
 import { useRef } from '@wordpress/element';
@@ -12,43 +12,64 @@ import { useRef } from '@wordpress/element';
  */
 import { store as blockEditorStore } from '../../store';
 import { isInSameBlock, isInsideRootBlock } from '../../utils/dom';
+import { unlock } from '../../lock-unlock';
 
 export default function useTabNav() {
 	const container = useRef();
 	const focusCaptureBeforeRef = useRef();
 	const focusCaptureAfterRef = useRef();
 
-	const { hasMultiSelection, getSelectedBlockClientId, getBlockCount } =
-		useSelect( blockEditorStore );
-	const { setNavigationMode, setLastFocus } = useDispatch( blockEditorStore );
-	const isNavigationMode = useSelect(
-		( select ) => select( blockEditorStore ).isNavigationMode(),
-		[]
-	);
-
-	const lastFocus = useSelect(
-		( select ) => select( blockEditorStore ).getLastFocus(),
-		[]
-	);
-
-	// Don't allow tabbing to this element in Navigation mode.
-	const focusCaptureTabIndex = ! isNavigationMode ? '0' : undefined;
+	const {
+		hasMultiSelection,
+		getSelectedBlockClientId,
+		getBlockCount,
+		getBlockOrder,
+		getLastFocus,
+		getSectionRootClientId,
+		isZoomOut,
+	} = unlock( useSelect( blockEditorStore ) );
+	const { setLastFocus } = unlock( useDispatch( blockEditorStore ) );
 
 	// Reference that holds the a flag for enabling or disabling
 	// capturing on the focus capture elements.
-	const noCapture = useRef();
+	const noCaptureRef = useRef();
 
 	function onFocusCapture( event ) {
 		// Do not capture incoming focus if set by us in WritingFlow.
-		if ( noCapture.current ) {
-			noCapture.current = null;
+		if ( noCaptureRef.current ) {
+			noCaptureRef.current = null;
 		} else if ( hasMultiSelection() ) {
 			container.current.focus();
 		} else if ( getSelectedBlockClientId() ) {
-			lastFocus.current.focus();
+			if ( getLastFocus()?.current ) {
+				getLastFocus().current.focus();
+			} else {
+				// Handles when the last focus has not been set yet, or has been cleared by new blocks being added via the inserter.
+				container.current
+					.querySelector(
+						`[data-block="${ getSelectedBlockClientId() }"]`
+					)
+					.focus();
+			}
+		}
+		// In "compose" mode without a selected ID, we want to place focus on the section root when tabbing to the canvas.
+		else if ( isZoomOut() ) {
+			const sectionRootClientId = getSectionRootClientId();
+			const sectionBlocks = getBlockOrder( sectionRootClientId );
+
+			// If we have section within the section root, focus the first one.
+			if ( sectionBlocks.length ) {
+				container.current
+					.querySelector( `[data-block="${ sectionBlocks[ 0 ] }"]` )
+					.focus();
+			}
+			// If we don't have any section blocks, focus the section root.
+			else {
+				container.current
+					.querySelector( `[data-block="${ sectionRootClientId }"]` )
+					.focus();
+			}
 		} else {
-			setNavigationMode( true );
-
 			const canvasElement =
 				container.current.ownerDocument === event.target.ownerDocument
 					? container.current
@@ -64,7 +85,6 @@ export default function useTabNav() {
 				const next = isBefore
 					? tabbables[ 0 ]
 					: tabbables[ tabbables.length - 1 ];
-
 				next.focus();
 			}
 		}
@@ -73,7 +93,7 @@ export default function useTabNav() {
 	const before = (
 		<div
 			ref={ focusCaptureBeforeRef }
-			tabIndex={ focusCaptureTabIndex }
+			tabIndex="0"
 			onFocus={ onFocusCapture }
 		/>
 	);
@@ -81,7 +101,7 @@ export default function useTabNav() {
 	const after = (
 		<div
 			ref={ focusCaptureAfterRef }
-			tabIndex={ focusCaptureTabIndex }
+			tabIndex="0"
 			onFocus={ onFocusCapture }
 		/>
 	);
@@ -92,12 +112,6 @@ export default function useTabNav() {
 				return;
 			}
 
-			if ( event.keyCode === ESCAPE && ! hasMultiSelection() ) {
-				event.preventDefault();
-				setNavigationMode( true );
-				return;
-			}
-
 			// In Edit mode, Tab should focus the first tabbable element after
 			// the content, which is normally the sidebar (with block controls)
 			// and Shift+Tab should focus the first tabbable element before the
@@ -110,18 +124,6 @@ export default function useTabNav() {
 
 			const isShift = event.shiftKey;
 			const direction = isShift ? 'findPrevious' : 'findNext';
-
-			if ( ! hasMultiSelection() && ! getSelectedBlockClientId() ) {
-				// Preserve the behaviour of entering navigation mode when
-				// tabbing into the content without a block selection.
-				// `onFocusCapture` already did this previously, but we need to
-				// do it again here because after clearing block selection,
-				// focus land on the writing flow container and pressing Tab
-				// will no longer send focus through the focus capture element.
-				if ( event.target === node ) setNavigationMode( true );
-				return;
-			}
-
 			const nextTabbable = focus.tabbable[ direction ]( event.target );
 
 			// We want to constrain the tabbing to the block and its child blocks.
@@ -154,7 +156,7 @@ export default function useTabNav() {
 			// Disable focus capturing on the focus capture element, so it
 			// doesn't refocus this block and so it allows default behaviour
 			// (moving focus to the next tabbable element).
-			noCapture.current = true;
+			noCaptureRef.current = true;
 
 			// Focusing the focus capture element, which is located above and
 			// below the editor, should not scroll the page all the way up or
@@ -163,7 +165,7 @@ export default function useTabNav() {
 		}
 
 		function onFocusOut( event ) {
-			setLastFocus( { ...lastFocus, current: event.target } );
+			setLastFocus( { ...getLastFocus(), current: event.target } );
 
 			const { ownerDocument } = node;
 
diff --git a/packages/block-editor/src/components/writing-flow/utils.js b/packages/block-editor/src/components/writing-flow/utils.js
new file mode 100644
index 00000000000000..2a2010854ed205
--- /dev/null
+++ b/packages/block-editor/src/components/writing-flow/utils.js
@@ -0,0 +1,118 @@
+/**
+ * WordPress dependencies
+ */
+import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
+import {
+	serialize,
+	createBlock,
+	pasteHandler,
+	findTransform,
+	getBlockTransforms,
+	store as blocksStore,
+} from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { getPasteEventData } from '../../utils/pasting';
+import { store as blockEditorStore } from '../../store';
+
+export const requiresWrapperOnCopy = Symbol( 'requiresWrapperOnCopy' );
+
+/**
+ * Sets the clipboard data for the provided blocks, with both HTML and plain
+ * text representations.
+ *
+ * @param {ClipboardEvent} event    Clipboard event.
+ * @param {WPBlock[]}      blocks   Blocks to set as clipboard data.
+ * @param {Object}         registry The registry to select from.
+ */
+export function setClipboardBlocks( event, blocks, registry ) {
+	let _blocks = blocks;
+
+	const [ firstBlock ] = blocks;
+
+	if ( firstBlock ) {
+		const firstBlockType = registry
+			.select( blocksStore )
+			.getBlockType( firstBlock.name );
+
+		if ( firstBlockType[ requiresWrapperOnCopy ] ) {
+			const { getBlockRootClientId, getBlockName, getBlockAttributes } =
+				registry.select( blockEditorStore );
+			const wrapperBlockClientId = getBlockRootClientId(
+				firstBlock.clientId
+			);
+			const wrapperBlockName = getBlockName( wrapperBlockClientId );
+
+			if ( wrapperBlockName ) {
+				_blocks = createBlock(
+					wrapperBlockName,
+					getBlockAttributes( wrapperBlockClientId ),
+					_blocks
+				);
+			}
+		}
+	}
+
+	const serialized = serialize( _blocks );
+
+	event.clipboardData.setData( 'text/plain', toPlainText( serialized ) );
+	event.clipboardData.setData( 'text/html', serialized );
+}
+
+/**
+ * Returns the blocks to be pasted from the clipboard event.
+ *
+ * @param {ClipboardEvent} event                    The clipboard event.
+ * @param {boolean}        canUserUseUnfilteredHTML Whether the user can or can't post unfiltered HTML.
+ * @return {Array|string} A list of blocks or a string, depending on `handlerMode`.
+ */
+export function getPasteBlocks( event, canUserUseUnfilteredHTML ) {
+	const { plainText, html, files } = getPasteEventData( event );
+	let blocks = [];
+
+	if ( files.length ) {
+		const fromTransforms = getBlockTransforms( 'from' );
+		blocks = files
+			.reduce( ( accumulator, file ) => {
+				const transformation = findTransform(
+					fromTransforms,
+					( transform ) =>
+						transform.type === 'files' &&
+						transform.isMatch( [ file ] )
+				);
+				if ( transformation ) {
+					accumulator.push( transformation.transform( [ file ] ) );
+				}
+				return accumulator;
+			}, [] )
+			.flat();
+	} else {
+		blocks = pasteHandler( {
+			HTML: html,
+			plainText,
+			mode: 'BLOCKS',
+			canUserUseUnfilteredHTML,
+		} );
+	}
+
+	return blocks;
+}
+
+/**
+ * Given a string of HTML representing serialized blocks, returns the plain
+ * text extracted after stripping the HTML of any tags and fixing line breaks.
+ *
+ * @param {string} html Serialized blocks.
+ * @return {string} The plain-text content with any html removed.
+ */
+function toPlainText( html ) {
+	// Manually handle BR tags as line breaks prior to `stripHTML` call
+	html = html.replace( /<br>/g, '\n' );
+
+	const plainText = stripHTML( html ).trim();
+
+	// Merge any consecutive line breaks
+	return plainText.replace( /\n\n+/g, '\n\n' );
+}
diff --git a/packages/block-editor/src/components/writing-mode-control/index.js b/packages/block-editor/src/components/writing-mode-control/index.js
index 2adf8be14ad395..bffccfd579c6b0 100644
--- a/packages/block-editor/src/components/writing-mode-control/index.js
+++ b/packages/block-editor/src/components/writing-mode-control/index.js
@@ -1,23 +1,26 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { BaseControl, Button } from '@wordpress/components';
 import { __, isRTL } from '@wordpress/i18n';
 import { textHorizontal, textVertical } from '@wordpress/icons';
+import {
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
+} from '@wordpress/components';
 
 const WRITING_MODES = [
 	{
-		name: __( 'Horizontal' ),
+		label: __( 'Horizontal' ),
 		value: 'horizontal-tb',
 		icon: textHorizontal,
 	},
 	{
-		name: __( 'Vertical' ),
+		label: __( 'Vertical' ),
 		value: isRTL() ? 'vertical-lr' : 'vertical-rl',
 		icon: textVertical,
 	},
@@ -35,34 +38,27 @@ const WRITING_MODES = [
  */
 export default function WritingModeControl( { className, value, onChange } ) {
 	return (
-		<fieldset
-			className={ classnames(
-				'block-editor-writing-mode-control',
-				className
-			) }
+		<ToggleGroupControl
+			isDeselectable
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			label={ __( 'Orientation' ) }
+			className={ clsx( 'block-editor-writing-mode-control', className ) }
+			value={ value }
+			onChange={ ( newValue ) => {
+				onChange( newValue === value ? undefined : newValue );
+			} }
 		>
-			<BaseControl.VisualLabel as="legend">
-				{ __( 'Orientation' ) }
-			</BaseControl.VisualLabel>
-			<div className="block-editor-writing-mode-control__buttons">
-				{ WRITING_MODES.map( ( writingMode ) => {
-					return (
-						<Button
-							key={ writingMode.value }
-							icon={ writingMode.icon }
-							label={ writingMode.name }
-							isPressed={ writingMode.value === value }
-							onClick={ () => {
-								onChange(
-									writingMode.value === value
-										? undefined
-										: writingMode.value
-								);
-							} }
-						/>
-					);
-				} ) }
-			</div>
-		</fieldset>
+			{ WRITING_MODES.map( ( option ) => {
+				return (
+					<ToggleGroupControlOptionIcon
+						key={ option.value }
+						value={ option.value }
+						icon={ option.icon }
+						label={ option.label }
+					/>
+				);
+			} ) }
+		</ToggleGroupControl>
 	);
 }
diff --git a/packages/block-editor/src/components/writing-mode-control/style.scss b/packages/block-editor/src/components/writing-mode-control/style.scss
deleted file mode 100644
index 4b865dc0282c08..00000000000000
--- a/packages/block-editor/src/components/writing-mode-control/style.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.block-editor-writing-mode-control {
-	border: 0;
-	margin: 0;
-	padding: 0;
-
-	.block-editor-writing-mode-control__buttons {
-		// 4px of padding makes the row 40px high, same as an input.
-		padding: $grid-unit-05 0;
-		display: flex;
-	}
-
-	.components-button.has-icon {
-		height: $grid-unit-40;
-		margin-right: $grid-unit-05;
-		min-width: $grid-unit-40;
-		padding: 0;
-	}
-}
diff --git a/packages/block-editor/src/content.scss b/packages/block-editor/src/content.scss
index fa78f2d41f9f9f..1ef4e118fb1bbe 100644
--- a/packages/block-editor/src/content.scss
+++ b/packages/block-editor/src/content.scss
@@ -7,7 +7,7 @@
 @import "./components/block-variation-picker/content.scss";
 @import "./components/button-block-appender/content.scss";
 @import "./components/default-block-appender/content.scss";
-@import "./components/inner-blocks/content.scss";
+@import "./components/iframe/content.scss";
 @import "./components/media-placeholder/content.scss";
 @import "./components/plain-text/content.scss";
 @import "./components/rich-text/content.scss";
diff --git a/packages/block-editor/src/hooks/align.js b/packages/block-editor/src/hooks/align.js
index 563c7bae6cde93..faaf5bb7f03ce1 100644
--- a/packages/block-editor/src/hooks/align.js
+++ b/packages/block-editor/src/hooks/align.js
@@ -1,12 +1,11 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { createHigherOrderComponent } from '@wordpress/compose';
 import { addFilter } from '@wordpress/hooks';
 import {
 	getBlockSupport,
@@ -108,9 +107,9 @@ export function addAttribute( settings ) {
 	return settings;
 }
 
-function BlockEditAlignmentToolbarControls( {
-	blockName,
-	attributes,
+function BlockEditAlignmentToolbarControlsPure( {
+	name: blockName,
+	align,
 	setAttributes,
 } ) {
 	// Compute the block valid alignments by taking into account,
@@ -144,7 +143,7 @@ function BlockEditAlignmentToolbarControls( {
 	return (
 		<BlockControls group="block" __experimentalShareWithChildBlocks>
 			<BlockAlignmentControl
-				value={ attributes.align }
+				value={ align }
 				onChange={ updateAlignment }
 				controls={ validAlignments }
 			/>
@@ -152,80 +151,31 @@ function BlockEditAlignmentToolbarControls( {
 	);
 }
 
-/**
- * Override the default edit UI to include new toolbar controls for block
- * alignment, if block defines support.
- *
- * @param {Function} BlockEdit Original component.
- *
- * @return {Function} Wrapped component.
- */
-export const withAlignmentControls = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const hasAlignmentSupport = hasBlockSupport(
-			props.name,
-			'align',
-			false
-		);
-
-		return (
-			<>
-				{ hasAlignmentSupport && (
-					<BlockEditAlignmentToolbarControls
-						blockName={ props.name }
-						attributes={ props.attributes }
-						setAttributes={ props.setAttributes }
-					/>
-				) }
-				<BlockEdit key="edit" { ...props } />
-			</>
-		);
+export default {
+	shareWithChildBlocks: true,
+	edit: BlockEditAlignmentToolbarControlsPure,
+	useBlockProps,
+	addSaveProps: addAssignedAlign,
+	attributeKeys: [ 'align' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, 'align', false );
 	},
-	'withAlignmentControls'
-);
+};
 
-function BlockListBlockWithDataAlign( { block: BlockListBlock, props } ) {
-	const { name, attributes } = props;
-	const { align } = attributes;
+function useBlockProps( { name, align } ) {
 	const blockAllowedAlignments = getValidAlignments(
 		getBlockSupport( name, 'align' ),
 		hasBlockSupport( name, 'alignWide', true )
 	);
 	const validAlignments = useAvailableAlignments( blockAllowedAlignments );
 
-	let wrapperProps = props.wrapperProps;
 	if ( validAlignments.some( ( alignment ) => alignment.name === align ) ) {
-		wrapperProps = { ...wrapperProps, 'data-align': align };
+		return { 'data-align': align };
 	}
 
-	return <BlockListBlock { ...props } wrapperProps={ wrapperProps } />;
+	return {};
 }
 
-/**
- * Override the default block element to add alignment wrapper props.
- *
- * @param {Function} BlockListBlock Original component.
- *
- * @return {Function} Wrapped component.
- */
-export const withDataAlign = createHigherOrderComponent(
-	( BlockListBlock ) => ( props ) => {
-		// If an alignment is not assigned, there's no need to go through the
-		// effort to validate or assign its value.
-		if ( props.attributes.align === undefined ) {
-			return <BlockListBlock { ...props } />;
-		}
-
-		return (
-			<BlockListBlockWithDataAlign
-				block={ BlockListBlock }
-				props={ props }
-			/>
-		);
-	},
-	'withDataAlign'
-);
-
 /**
  * Override props assigned to save component to inject alignment class name if
  * block supports it.
@@ -249,7 +199,7 @@ export function addAssignedAlign( props, blockType, attributes ) {
 		hasWideBlockSupport
 	).includes( align );
 	if ( isAlignValid ) {
-		props.className = classnames( `align${ align }`, props.className );
+		props.className = clsx( `align${ align }`, props.className );
 	}
 
 	return props;
@@ -260,18 +210,3 @@ addFilter(
 	'core/editor/align/addAttribute',
 	addAttribute
 );
-addFilter(
-	'editor.BlockListBlock',
-	'core/editor/align/with-data-align',
-	withDataAlign
-);
-addFilter(
-	'editor.BlockEdit',
-	'core/editor/align/with-toolbar-controls',
-	withAlignmentControls
-);
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/editor/align/addAssignedAlign',
-	addAssignedAlign
-);
diff --git a/packages/block-editor/src/hooks/align.native.js b/packages/block-editor/src/hooks/align.native.js
index 1bf375b654ad40..7a229e79870a80 100644
--- a/packages/block-editor/src/hooks/align.native.js
+++ b/packages/block-editor/src/hooks/align.native.js
@@ -8,6 +8,7 @@ import { WIDE_ALIGNMENTS } from '@wordpress/components';
 const ALIGNMENTS = [ 'left', 'center', 'right' ];
 
 export * from './align.js';
+export { default } from './align.js';
 
 // Used to filter out blocks that don't support wide/full alignment on mobile
 addFilter(
diff --git a/packages/block-editor/src/hooks/anchor.js b/packages/block-editor/src/hooks/anchor.js
index 3d404c4a868116..e08bea1adf78eb 100644
--- a/packages/block-editor/src/hooks/anchor.js
+++ b/packages/block-editor/src/hooks/anchor.js
@@ -2,10 +2,9 @@
  * WordPress dependencies
  */
 import { addFilter } from '@wordpress/hooks';
-import { PanelBody, TextControl, ExternalLink } from '@wordpress/components';
+import { TextControl, ExternalLink } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { hasBlockSupport } from '@wordpress/blocks';
-import { createHigherOrderComponent } from '@wordpress/compose';
 import { Platform } from '@wordpress/element';
 
 /**
@@ -52,95 +51,64 @@ export function addAttribute( settings ) {
 	return settings;
 }
 
-function BlockEditAnchorControl( { blockName, attributes, setAttributes } ) {
+function BlockEditAnchorControlPure( { anchor, setAttributes } ) {
 	const blockEditingMode = useBlockEditingMode();
 
-	const isWeb = Platform.OS === 'web';
-	const textControl = (
-		<TextControl
-			__nextHasNoMarginBottom
-			__next40pxDefaultSize
-			className="html-anchor-control"
-			label={ __( 'HTML anchor' ) }
-			help={
-				<>
-					{ __(
-						'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.'
-					) }
+	if ( blockEditingMode !== 'default' ) {
+		return null;
+	}
 
-					{ isWeb && (
-						<ExternalLink
-							href={ __(
-								'https://wordpress.org/documentation/article/page-jumps/'
-							) }
-						>
-							{ __( 'Learn more about anchors' ) }
-						</ExternalLink>
-					) }
-				</>
-			}
-			value={ attributes.anchor || '' }
-			placeholder={ ! isWeb ? __( 'Add an anchor' ) : null }
-			onChange={ ( nextValue ) => {
-				nextValue = nextValue.replace( ANCHOR_REGEX, '-' );
-				setAttributes( {
-					anchor: nextValue,
-				} );
-			} }
-			autoCapitalize="none"
-			autoComplete="off"
-		/>
-	);
+	const isWeb = Platform.OS === 'web';
 
 	return (
-		<>
-			{ isWeb && blockEditingMode === 'default' && (
-				<InspectorControls group="advanced">
-					{ textControl }
-				</InspectorControls>
-			) }
-			{ /*
-			 * We plan to remove scoping anchors to 'core/heading' to support
-			 * anchors for all eligble blocks. Additionally we plan to explore
-			 * leveraging InspectorAdvancedControls instead of a custom
-			 * PanelBody title. https://github.com/WordPress/gutenberg/issues/28363
-			 */ }
-			{ ! isWeb && blockName === 'core/heading' && (
-				<InspectorControls>
-					<PanelBody title={ __( 'Heading settings' ) }>
-						{ textControl }
-					</PanelBody>
-				</InspectorControls>
-			) }
-		</>
+		<InspectorControls group="advanced">
+			<TextControl
+				__nextHasNoMarginBottom
+				__next40pxDefaultSize
+				className="html-anchor-control"
+				label={ __( 'HTML anchor' ) }
+				help={
+					<>
+						{ __(
+							'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor”. Then, you’ll be able to link directly to this section of your page.'
+						) }
+						{ isWeb && (
+							<>
+								{ ' ' }
+								<ExternalLink
+									href={ __(
+										'https://wordpress.org/documentation/article/page-jumps/'
+									) }
+								>
+									{ __( 'Learn more about anchors' ) }
+								</ExternalLink>
+							</>
+						) }
+					</>
+				}
+				value={ anchor || '' }
+				placeholder={ ! isWeb ? __( 'Add an anchor' ) : null }
+				onChange={ ( nextValue ) => {
+					nextValue = nextValue.replace( ANCHOR_REGEX, '-' );
+					setAttributes( {
+						anchor: nextValue,
+					} );
+				} }
+				autoCapitalize="none"
+				autoComplete="off"
+			/>
+		</InspectorControls>
 	);
 }
 
-/**
- * Override the default edit UI to include a new block inspector control for
- * assigning the anchor ID, if block supports anchor.
- *
- * @param {Component} BlockEdit Original component.
- *
- * @return {Component} Wrapped component.
- */
-export const withAnchorControls = createHigherOrderComponent( ( BlockEdit ) => {
-	return ( props ) => {
-		return (
-			<>
-				<BlockEdit { ...props } />
-				{ props.isSelected &&
-					hasBlockSupport( props.name, 'anchor' ) && (
-						<BlockEditAnchorControl
-							blockName={ props.name }
-							attributes={ props.attributes }
-							setAttributes={ props.setAttributes }
-						/>
-					) }
-			</>
-		);
-	};
-}, 'withAnchorControls' );
+export default {
+	addSaveProps,
+	edit: BlockEditAnchorControlPure,
+	attributeKeys: [ 'anchor' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, 'anchor' );
+	},
+};
 
 /**
  * Override props assigned to save component to inject anchor ID, if block
@@ -162,13 +130,3 @@ export function addSaveProps( extraProps, blockType, attributes ) {
 }
 
 addFilter( 'blocks.registerBlockType', 'core/anchor/attribute', addAttribute );
-addFilter(
-	'editor.BlockEdit',
-	'core/editor/anchor/with-inspector-controls',
-	withAnchorControls
-);
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/editor/anchor/save-props',
-	addSaveProps
-);
diff --git a/packages/block-editor/src/hooks/anchor.scss b/packages/block-editor/src/hooks/anchor.scss
deleted file mode 100644
index 32d8557c08ac30..00000000000000
--- a/packages/block-editor/src/hooks/anchor.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.html-anchor-control .components-external-link {
-	display: block;
-	margin-top: $grid-unit-10;
-}
diff --git a/packages/block-editor/src/hooks/aria-label.js b/packages/block-editor/src/hooks/aria-label.js
index c4387daab71137..7f93aa4ff8c8b2 100644
--- a/packages/block-editor/src/hooks/aria-label.js
+++ b/packages/block-editor/src/hooks/aria-label.js
@@ -55,13 +55,16 @@ export function addSaveProps( extraProps, blockType, attributes ) {
 	return extraProps;
 }
 
+export default {
+	addSaveProps,
+	attributeKeys: [ 'ariaLabel' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, 'ariaLabel' );
+	},
+};
+
 addFilter(
 	'blocks.registerBlockType',
 	'core/ariaLabel/attribute',
 	addAttribute
 );
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/ariaLabel/save-props',
-	addSaveProps
-);
diff --git a/packages/block-editor/src/hooks/background.js b/packages/block-editor/src/hooks/background.js
index 342db267ff3315..3755aecbcb9d0b 100644
--- a/packages/block-editor/src/hooks/background.js
+++ b/packages/block-editor/src/hooks/background.js
@@ -1,57 +1,30 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
-import { isBlobURL } from '@wordpress/blob';
 import { getBlockSupport } from '@wordpress/blocks';
-import { focus } from '@wordpress/dom';
-import {
-	__experimentalToolsPanelItem as ToolsPanelItem,
-	DropZone,
-	FlexItem,
-	MenuItem,
-	VisuallyHidden,
-	__experimentalItemGroup as ItemGroup,
-	__experimentalHStack as HStack,
-	__experimentalTruncate as Truncate,
-} from '@wordpress/components';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { Platform, useCallback, useRef } from '@wordpress/element';
-import { __, sprintf } from '@wordpress/i18n';
-import { store as noticesStore } from '@wordpress/notices';
-import { getFilename } from '@wordpress/url';
-import { pure } from '@wordpress/compose';
+import { useSelect } from '@wordpress/data';
+import { useCallback } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import InspectorControls from '../components/inspector-controls';
-import MediaReplaceFlow from '../components/media-replace-flow';
-import { useSettings } from '../components/use-settings';
 import { cleanEmptyObject } from './utils';
 import { store as blockEditorStore } from '../store';
+import {
+	default as StylesBackgroundPanel,
+	useHasBackgroundPanel,
+	hasBackgroundImageValue,
+} from '../components/global-styles/background-panel';
+import { globalStylesDataKey } from '../store/private-keys';
 
 export const BACKGROUND_SUPPORT_KEY = 'background';
-export const IMAGE_BACKGROUND_TYPE = 'image';
-
-/**
- * Checks if there is a current value in the background image block support
- * attributes.
- *
- * @param {Object} style Style attribute.
- * @return {boolean}     Whether or not the block has a background image value set.
- */
-export function hasBackgroundImageValue( style ) {
-	const hasValue =
-		!! style?.background?.backgroundImage?.id ||
-		!! style?.background?.backgroundImage?.url;
 
-	return hasValue;
-}
+// Initial control values.
+export const BACKGROUND_BLOCK_DEFAULT_VALUES = {
+	backgroundSize: 'cover',
+	backgroundPosition: '50% 50%', // used only when backgroundSize is 'contain'.
+};
 
 /**
  * Determine whether there is block support for background.
@@ -62,10 +35,6 @@ export function hasBackgroundImageValue( style ) {
  * @return {boolean} Whether there is support.
  */
 export function hasBackgroundSupport( blockName, feature = 'any' ) {
-	if ( Platform.OS !== 'web' ) {
-		return false;
-	}
-
 	const support = getBlockSupport( blockName, BACKGROUND_SUPPORT_KEY );
 
 	if ( support === true ) {
@@ -73,249 +42,156 @@ export function hasBackgroundSupport( blockName, feature = 'any' ) {
 	}
 
 	if ( feature === 'any' ) {
-		return !! support?.backgroundImage;
+		return (
+			!! support?.backgroundImage ||
+			!! support?.backgroundSize ||
+			!! support?.backgroundRepeat
+		);
 	}
 
 	return !! support?.[ feature ];
 }
 
-/**
- * Resets the background image block support attributes. This can be used when disabling
- * the background image controls for a block via a `ToolsPanel`.
- *
- * @param {Object}   style         Style attribute.
- * @param {Function} setAttributes Function to set block's attributes.
- */
-export function resetBackgroundImage( style = {}, setAttributes ) {
-	setAttributes( {
-		style: cleanEmptyObject( {
-			...style,
-			background: {
-				...style?.background,
-				backgroundImage: undefined,
-			},
-		} ),
-	} );
-}
-
-function InspectorImagePreview( { label, filename, url: imgUrl } ) {
-	const imgLabel = label || getFilename( imgUrl );
-	return (
-		<ItemGroup as="span">
-			<HStack justify="flex-start" as="span">
-				<span
-					className={ classnames(
-						'block-editor-hooks__background__inspector-image-indicator-wrapper',
-						{
-							'has-image': imgUrl,
-						}
-					) }
-					aria-hidden
-				>
-					{ imgUrl && (
-						<span
-							className="block-editor-hooks__background__inspector-image-indicator"
-							style={ {
-								backgroundImage: `url(${ imgUrl })`,
-							} }
-						/>
-					) }
-				</span>
-				<FlexItem as="span">
-					<Truncate
-						numberOfLines={ 1 }
-						className="block-editor-hooks__background__inspector-media-replace-title"
-					>
-						{ imgLabel }
-					</Truncate>
-					<VisuallyHidden as="span">
-						{ filename
-							? sprintf(
-									/* translators: %s: file name */
-									__( 'Selected image: %s' ),
-									filename
-							  )
-							: __( 'No image selected' ) }
-					</VisuallyHidden>
-				</FlexItem>
-			</HStack>
-		</ItemGroup>
-	);
-}
-
-function BackgroundImagePanelItem( { clientId, setAttributes } ) {
-	const style = useSelect(
-		( select ) =>
-			select( blockEditorStore ).getBlockAttributes( clientId )?.style,
-		[ clientId ]
-	);
-	const { id, title, url } = style?.background?.backgroundImage || {};
+export function setBackgroundStyleDefaults( backgroundStyle ) {
+	if ( ! backgroundStyle || ! backgroundStyle?.backgroundImage?.url ) {
+		return;
+	}
 
-	const replaceContainerRef = useRef();
+	let backgroundStylesWithDefaults;
 
-	const { mediaUpload } = useSelect( ( select ) => {
-		return {
-			mediaUpload: select( blockEditorStore ).getSettings().mediaUpload,
+	// Set block background defaults.
+	if ( ! backgroundStyle?.backgroundSize ) {
+		backgroundStylesWithDefaults = {
+			backgroundSize: BACKGROUND_BLOCK_DEFAULT_VALUES.backgroundSize,
 		};
-	} );
-
-	const { createErrorNotice } = useDispatch( noticesStore );
-	const onUploadError = ( message ) => {
-		createErrorNotice( message, { type: 'snackbar' } );
-	};
-
-	const onSelectMedia = ( media ) => {
-		if ( ! media || ! media.url ) {
-			const newStyle = {
-				...style,
-				background: {
-					...style?.background,
-					backgroundImage: undefined,
-				},
-			};
-
-			const newAttributes = {
-				style: cleanEmptyObject( newStyle ),
-			};
-
-			setAttributes( newAttributes );
-			return;
-		}
+	}
 
-		if ( isBlobURL( media.url ) ) {
-			return;
-		}
+	if (
+		'contain' === backgroundStyle?.backgroundSize &&
+		! backgroundStyle?.backgroundPosition
+	) {
+		backgroundStylesWithDefaults = {
+			backgroundPosition:
+				BACKGROUND_BLOCK_DEFAULT_VALUES.backgroundPosition,
+		};
+	}
+	return backgroundStylesWithDefaults;
+}
 
-		// For media selections originated from a file upload.
-		if (
-			( media.media_type &&
-				media.media_type !== IMAGE_BACKGROUND_TYPE ) ||
-			( ! media.media_type &&
-				media.type &&
-				media.type !== IMAGE_BACKGROUND_TYPE )
-		) {
-			onUploadError(
-				__( 'Only images can be used as a background image.' )
-			);
-			return;
-		}
+function useBlockProps( { name, style } ) {
+	if (
+		! hasBackgroundSupport( name ) ||
+		! style?.background?.backgroundImage
+	) {
+		return;
+	}
 
-		const newStyle = {
-			...style,
-			background: {
-				...style?.background,
-				backgroundImage: {
-					url: media.url,
-					id: media.id,
-					source: 'file',
-					title: media.title || undefined,
-				},
-			},
-		};
+	const backgroundStyles = setBackgroundStyleDefaults( style?.background );
 
-		const newAttributes = {
-			style: cleanEmptyObject( newStyle ),
-		};
+	if ( ! backgroundStyles ) {
+		return;
+	}
 
-		setAttributes( newAttributes );
+	return {
+		style: {
+			...backgroundStyles,
+		},
 	};
+}
 
-	const onFilesDrop = ( filesList ) => {
-		mediaUpload( {
-			allowedTypes: [ 'image' ],
-			filesList,
-			onFileChange( [ image ] ) {
-				if ( isBlobURL( image?.url ) ) {
-					return;
-				}
-				onSelectMedia( image );
-			},
-			onError: onUploadError,
-		} );
-	};
+/**
+ * Generates a CSS class name if an background image is set.
+ *
+ * @param {Object} style A block's style attribute.
+ *
+ * @return {string} CSS class name.
+ */
+export function getBackgroundImageClasses( style ) {
+	return hasBackgroundImageValue( style ) ? 'has-background' : '';
+}
 
-	const resetAllFilter = useCallback( ( previousValue ) => {
+function BackgroundInspectorControl( { children } ) {
+	const resetAllFilter = useCallback( ( attributes ) => {
 		return {
-			...previousValue,
+			...attributes,
 			style: {
-				...previousValue.style,
+				...attributes.style,
 				background: undefined,
 			},
 		};
 	}, [] );
-
-	const hasValue = hasBackgroundImageValue( style );
-
 	return (
-		<ToolsPanelItem
-			className="single-column"
-			hasValue={ () => hasValue }
-			label={ __( 'Background image' ) }
-			onDeselect={ () => resetBackgroundImage( style, setAttributes ) }
-			isShownByDefault={ true }
-			resetAllFilter={ resetAllFilter }
-			panelId={ clientId }
-		>
-			<div
-				className="block-editor-hooks__background__inspector-media-replace-container"
-				ref={ replaceContainerRef }
-			>
-				<MediaReplaceFlow
-					mediaId={ id }
-					mediaURL={ url }
-					allowedTypes={ [ IMAGE_BACKGROUND_TYPE ] }
-					accept="image/*"
-					onSelect={ onSelectMedia }
-					name={
-						<InspectorImagePreview
-							label={ __( 'Background image' ) }
-							filename={ title }
-							url={ url }
-						/>
-					}
-					variant="secondary"
-				>
-					{ hasValue && (
-						<MenuItem
-							onClick={ () => {
-								const [ toggleButton ] = focus.tabbable.find(
-									replaceContainerRef.current
-								);
-								// Focus the toggle button and close the dropdown menu.
-								// This ensures similar behaviour as to selecting an image, where the dropdown is
-								// closed and focus is redirected to the dropdown toggle button.
-								toggleButton?.focus();
-								toggleButton?.click();
-								resetBackgroundImage( style, setAttributes );
-							} }
-						>
-							{ __( 'Reset ' ) }
-						</MenuItem>
-					) }
-				</MediaReplaceFlow>
-				<DropZone
-					onFilesDrop={ onFilesDrop }
-					label={ __( 'Drop to upload' ) }
-				/>
-			</div>
-		</ToolsPanelItem>
+		<InspectorControls group="background" resetAllFilter={ resetAllFilter }>
+			{ children }
+		</InspectorControls>
 	);
 }
 
-function BackgroundImagePanelPure( props ) {
-	const [ backgroundImage ] = useSettings( 'background.backgroundImage' );
+export function BackgroundImagePanel( {
+	clientId,
+	name,
+	setAttributes,
+	settings,
+} ) {
+	const { style, inheritedValue } = useSelect(
+		( select ) => {
+			const { getBlockAttributes, getSettings } =
+				select( blockEditorStore );
+			const _settings = getSettings();
+			return {
+				style: getBlockAttributes( clientId )?.style,
+				/*
+				 * To ensure we pass down the right inherited values:
+				 * @TODO 1. Pass inherited value down to all block style controls,
+				 *   See: packages/block-editor/src/hooks/style.js
+				 * @TODO 2. Add support for block style variations,
+				 *   See implementation: packages/block-editor/src/hooks/block-style-variation.js
+				 */
+				inheritedValue:
+					_settings[ globalStylesDataKey ]?.blocks?.[ name ],
+			};
+		},
+		[ clientId, name ]
+	);
+
 	if (
-		! backgroundImage ||
-		! hasBackgroundSupport( props.name, 'backgroundImage' )
+		! useHasBackgroundPanel( settings ) ||
+		! hasBackgroundSupport( name, 'backgroundImage' )
 	) {
 		return null;
 	}
 
+	const onChange = ( newStyle ) => {
+		setAttributes( {
+			style: cleanEmptyObject( newStyle ),
+		} );
+	};
+
+	const updatedSettings = {
+		...settings,
+		background: {
+			...settings.background,
+			backgroundSize:
+				settings?.background?.backgroundSize &&
+				hasBackgroundSupport( name, 'backgroundSize' ),
+		},
+	};
+
 	return (
-		<InspectorControls group="background">
-			<BackgroundImagePanelItem { ...props } />
-		</InspectorControls>
+		<StylesBackgroundPanel
+			inheritedValue={ inheritedValue }
+			as={ BackgroundInspectorControl }
+			panelId={ clientId }
+			defaultValues={ BACKGROUND_BLOCK_DEFAULT_VALUES }
+			settings={ updatedSettings }
+			onChange={ onChange }
+			value={ style }
+		/>
 	);
 }
 
-export const BackgroundImagePanel = pure( BackgroundImagePanelPure );
+export default {
+	useBlockProps,
+	attributeKeys: [ 'style' ],
+	hasSupport: hasBackgroundSupport,
+};
diff --git a/packages/block-editor/src/hooks/background.scss b/packages/block-editor/src/hooks/background.scss
deleted file mode 100644
index a81b6acfce2de7..00000000000000
--- a/packages/block-editor/src/hooks/background.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-.block-editor-hooks__background__inspector-media-replace-container {
-	position: relative;
-	// Since there is no option to skip rendering the drag'n'drop icon in drop
-	// zone, we hide it for now.
-	.components-drop-zone__content-icon {
-		display: none;
-	}
-
-	button.components-button {
-		color: $gray-900;
-		box-shadow: inset 0 0 0 $border-width $gray-300;
-		width: 100%;
-		display: block;
-		height: $grid-unit-50;
-
-		&:hover {
-			color: var(--wp-admin-theme-color);
-		}
-
-		&:focus {
-			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-		}
-	}
-
-	.block-editor-hooks__background__inspector-media-replace-title {
-		word-break: break-all;
-		// The Button component is white-space: nowrap, and that won't work with line-clamp.
-		white-space: normal;
-
-		// Without this, the ellipsis can sometimes be partially hidden by the Button padding.
-		text-align: start;
-		text-align-last: center;
-	}
-
-	.components-dropdown {
-		display: block;
-	}
-}
-
-.block-editor-hooks__background__inspector-image-indicator-wrapper {
-	background: #fff linear-gradient(-45deg, transparent 48%, $gray-300 48%, $gray-300 52%, transparent 52%); // Show a diagonal line (crossed out) for empty background image.
-	border-radius: $radius-round !important; // Override the default border-radius inherited from FlexItem.
-	box-shadow: inset 0 0 0 $border-width rgba(0, 0, 0, 0.2);
-	display: block;
-	width: 20px;
-	height: 20px;
-	flex: none;
-
-	&.has-image {
-		background: #fff; // No diagonal line for non-empty background image. A background color is in use to account for partially transparent images.
-	}
-}
-
-.block-editor-hooks__background__inspector-image-indicator {
-	background-size: cover;
-	border-radius: $radius-round;
-	width: 20px;
-	height: 20px;
-	display: block;
-	position: relative;
-}
-
-.block-editor-hooks__background__inspector-image-indicator::after {
-	content: "";
-	position: absolute;
-	top: -1px;
-	left: -1px;
-	bottom: -1px;
-	right: -1px;
-	border-radius: $radius-round;
-	box-shadow: inset 0 0 0 $border-width rgba(0, 0, 0, 0.2);
-	// Show a thin outline in Windows high contrast mode, otherwise the button is invisible.
-	border: 1px solid transparent;
-	box-sizing: inherit;
-}
diff --git a/packages/block-editor/src/hooks/block-bindings.js b/packages/block-editor/src/hooks/block-bindings.js
new file mode 100644
index 00000000000000..694c9c1c0bb3cc
--- /dev/null
+++ b/packages/block-editor/src/hooks/block-bindings.js
@@ -0,0 +1,321 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import {
+	getBlockBindingsSource,
+	getBlockBindingsSources,
+	getBlockType,
+} from '@wordpress/blocks';
+import {
+	__experimentalItemGroup as ItemGroup,
+	__experimentalItem as Item,
+	__experimentalText as Text,
+	__experimentalToolsPanel as ToolsPanel,
+	__experimentalToolsPanelItem as ToolsPanelItem,
+	__experimentalVStack as VStack,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { useContext, Fragment } from '@wordpress/element';
+import { useViewportMatch } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import {
+	canBindAttribute,
+	getBindableAttributes,
+} from '../hooks/use-bindings-attributes';
+import { unlock } from '../lock-unlock';
+import InspectorControls from '../components/inspector-controls';
+import BlockContext from '../components/block-context';
+import { useBlockEditContext } from '../components/block-edit';
+import { useBlockBindingsUtils } from '../utils/block-bindings';
+import { store as blockEditorStore } from '../store';
+
+const { DropdownMenuV2 } = unlock( componentsPrivateApis );
+
+const EMPTY_OBJECT = {};
+
+const useToolsPanelDropdownMenuProps = () => {
+	const isMobile = useViewportMatch( 'medium', '<' );
+	return ! isMobile
+		? {
+				popoverProps: {
+					placement: 'left-start',
+					// For non-mobile, inner sidebar width (248px) - button width (24px) - border (1px) + padding (16px) + spacing (20px)
+					offset: 259,
+				},
+		  }
+		: {};
+};
+
+function BlockBindingsPanelDropdown( { fieldsList, attribute, binding } ) {
+	const { clientId } = useBlockEditContext();
+	const registeredSources = getBlockBindingsSources();
+	const { updateBlockBindings } = useBlockBindingsUtils();
+	const currentKey = binding?.args?.key;
+	const attributeType = useSelect(
+		( select ) => {
+			const { name: blockName } =
+				select( blockEditorStore ).getBlock( clientId );
+			const _attributeType =
+				getBlockType( blockName ).attributes?.[ attribute ]?.type;
+			return _attributeType === 'rich-text' ? 'string' : _attributeType;
+		},
+		[ clientId, attribute ]
+	);
+	return (
+		<>
+			{ Object.entries( fieldsList ).map( ( [ name, fields ], i ) => (
+				<Fragment key={ name }>
+					<DropdownMenuV2.Group>
+						{ Object.keys( fieldsList ).length > 1 && (
+							<DropdownMenuV2.GroupLabel>
+								{ registeredSources[ name ].label }
+							</DropdownMenuV2.GroupLabel>
+						) }
+						{ Object.entries( fields )
+							.filter(
+								( [ , args ] ) => args?.type === attributeType
+							)
+							.map( ( [ key, args ] ) => (
+								<DropdownMenuV2.RadioItem
+									key={ key }
+									onChange={ () =>
+										updateBlockBindings( {
+											[ attribute ]: {
+												source: name,
+												args: { key },
+											},
+										} )
+									}
+									name={ attribute + '-binding' }
+									value={ key }
+									checked={ key === currentKey }
+								>
+									<DropdownMenuV2.ItemLabel>
+										{ args?.label }
+									</DropdownMenuV2.ItemLabel>
+									<DropdownMenuV2.ItemHelpText>
+										{ args?.value }
+									</DropdownMenuV2.ItemHelpText>
+								</DropdownMenuV2.RadioItem>
+							) ) }
+					</DropdownMenuV2.Group>
+					{ i !== Object.keys( fieldsList ).length - 1 && (
+						<DropdownMenuV2.Separator />
+					) }
+				</Fragment>
+			) ) }
+		</>
+	);
+}
+
+function BlockBindingsAttribute( { attribute, binding, fieldsList } ) {
+	const { source: sourceName, args } = binding || {};
+	const sourceProps = getBlockBindingsSource( sourceName );
+	const isSourceInvalid = ! sourceProps;
+	return (
+		<VStack className="block-editor-bindings__item" spacing={ 0 }>
+			<Text truncate>{ attribute }</Text>
+			{ !! binding && (
+				<Text
+					truncate
+					variant={ ! isSourceInvalid && 'muted' }
+					isDestructive={ isSourceInvalid }
+				>
+					{ isSourceInvalid
+						? __( 'Invalid source' )
+						: fieldsList?.[ sourceName ]?.[ args?.key ]?.label ||
+						  sourceProps?.label ||
+						  sourceName }
+				</Text>
+			) }
+		</VStack>
+	);
+}
+
+function ReadOnlyBlockBindingsPanelItems( { bindings, fieldsList } ) {
+	return (
+		<>
+			{ Object.entries( bindings ).map( ( [ attribute, binding ] ) => (
+				<Item key={ attribute }>
+					<BlockBindingsAttribute
+						attribute={ attribute }
+						binding={ binding }
+						fieldsList={ fieldsList }
+					/>
+				</Item>
+			) ) }
+		</>
+	);
+}
+
+function EditableBlockBindingsPanelItems( {
+	attributes,
+	bindings,
+	fieldsList,
+} ) {
+	const { updateBlockBindings } = useBlockBindingsUtils();
+	const isMobile = useViewportMatch( 'medium', '<' );
+	return (
+		<>
+			{ attributes.map( ( attribute ) => {
+				const binding = bindings[ attribute ];
+				return (
+					<ToolsPanelItem
+						key={ attribute }
+						hasValue={ () => !! binding }
+						label={ attribute }
+						onDeselect={ () => {
+							updateBlockBindings( {
+								[ attribute ]: undefined,
+							} );
+						} }
+					>
+						<DropdownMenuV2
+							placement={
+								isMobile ? 'bottom-start' : 'left-start'
+							}
+							gutter={ isMobile ? 8 : 36 }
+							trigger={
+								<Item>
+									<BlockBindingsAttribute
+										attribute={ attribute }
+										binding={ binding }
+										fieldsList={ fieldsList }
+									/>
+								</Item>
+							}
+						>
+							<BlockBindingsPanelDropdown
+								fieldsList={ fieldsList }
+								attribute={ attribute }
+								binding={ binding }
+							/>
+						</DropdownMenuV2>
+					</ToolsPanelItem>
+				);
+			} ) }
+		</>
+	);
+}
+
+export const BlockBindingsPanel = ( { name: blockName, metadata } ) => {
+	const blockContext = useContext( BlockContext );
+	const { removeAllBlockBindings } = useBlockBindingsUtils();
+	const bindableAttributes = getBindableAttributes( blockName );
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
+
+	// `useSelect` is used purposely here to ensure `getFieldsList`
+	// is updated whenever there are updates in block context.
+	// `source.getFieldsList` may also call a selector via `select`.
+	const _fieldsList = {};
+	const { fieldsList, canUpdateBlockBindings } = useSelect(
+		( select ) => {
+			if ( ! bindableAttributes || bindableAttributes.length === 0 ) {
+				return EMPTY_OBJECT;
+			}
+			const registeredSources = getBlockBindingsSources();
+			Object.entries( registeredSources ).forEach(
+				( [ sourceName, { getFieldsList, usesContext } ] ) => {
+					if ( getFieldsList ) {
+						// Populate context.
+						const context = {};
+						if ( usesContext?.length ) {
+							for ( const key of usesContext ) {
+								context[ key ] = blockContext[ key ];
+							}
+						}
+						const sourceList = getFieldsList( {
+							select,
+							context,
+						} );
+						// Only add source if the list is not empty.
+						if ( Object.keys( sourceList || {} ).length ) {
+							_fieldsList[ sourceName ] = { ...sourceList };
+						}
+					}
+				}
+			);
+			return {
+				fieldsList:
+					Object.values( _fieldsList ).length > 0
+						? _fieldsList
+						: EMPTY_OBJECT,
+				canUpdateBlockBindings:
+					select( blockEditorStore ).getSettings()
+						.canUpdateBlockBindings,
+			};
+		},
+		[ blockContext, bindableAttributes ]
+	);
+	// Return early if there are no bindable attributes.
+	if ( ! bindableAttributes || bindableAttributes.length === 0 ) {
+		return null;
+	}
+	// Filter bindings to only show bindable attributes and remove pattern overrides.
+	const { bindings } = metadata || {};
+	const filteredBindings = { ...bindings };
+	Object.keys( filteredBindings ).forEach( ( key ) => {
+		if (
+			! canBindAttribute( blockName, key ) ||
+			filteredBindings[ key ].source === 'core/pattern-overrides'
+		) {
+			delete filteredBindings[ key ];
+		}
+	} );
+
+	// Lock the UI when the user can't update bindings or there are no fields to connect to.
+	const readOnly =
+		! canUpdateBlockBindings || ! Object.keys( fieldsList ).length;
+
+	if ( readOnly && Object.keys( filteredBindings ).length === 0 ) {
+		return null;
+	}
+
+	return (
+		<InspectorControls group="bindings">
+			<ToolsPanel
+				label={ __( 'Attributes' ) }
+				resetAll={ () => {
+					removeAllBlockBindings();
+				} }
+				dropdownMenuProps={ dropdownMenuProps }
+				className="block-editor-bindings__panel"
+			>
+				<ItemGroup isBordered isSeparated>
+					{ readOnly ? (
+						<ReadOnlyBlockBindingsPanelItems
+							bindings={ filteredBindings }
+							fieldsList={ fieldsList }
+						/>
+					) : (
+						<EditableBlockBindingsPanelItems
+							attributes={ bindableAttributes }
+							bindings={ filteredBindings }
+							fieldsList={ fieldsList }
+						/>
+					) }
+				</ItemGroup>
+				<ItemGroup>
+					<Text variant="muted">
+						{ __(
+							'Attributes connected to custom fields or other dynamic data.'
+						) }
+					</Text>
+				</ItemGroup>
+			</ToolsPanel>
+		</InspectorControls>
+	);
+};
+
+export default {
+	edit: BlockBindingsPanel,
+	attributeKeys: [ 'metadata' ],
+	hasSupport() {
+		return true;
+	},
+};
diff --git a/packages/block-editor/src/hooks/block-bindings.scss b/packages/block-editor/src/hooks/block-bindings.scss
new file mode 100644
index 00000000000000..e8f05895922f0f
--- /dev/null
+++ b/packages/block-editor/src/hooks/block-bindings.scss
@@ -0,0 +1,6 @@
+div.block-editor-bindings__panel {
+	grid-template-columns: repeat(auto-fit, minmax(100%, 1fr));
+	button:hover .block-editor-bindings__item span {
+		color: inherit;
+	}
+}
diff --git a/packages/block-editor/src/hooks/block-hooks.js b/packages/block-editor/src/hooks/block-hooks.js
index 0d75999192e5bf..04a2313b629ba7 100644
--- a/packages/block-editor/src/hooks/block-hooks.js
+++ b/packages/block-editor/src/hooks/block-hooks.js
@@ -2,71 +2,58 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { addFilter } from '@wordpress/hooks';
 import { Fragment, useMemo } from '@wordpress/element';
-import {
-	__experimentalHStack as HStack,
-	PanelBody,
-	ToggleControl,
-} from '@wordpress/components';
-import { createHigherOrderComponent } from '@wordpress/compose';
+import { PanelBody, ToggleControl } from '@wordpress/components';
 import { createBlock, store as blocksStore } from '@wordpress/blocks';
 import { useDispatch, useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
-import { BlockIcon, InspectorControls } from '../components';
+import { InspectorControls } from '../components';
 import { store as blockEditorStore } from '../store';
 
 const EMPTY_OBJECT = {};
 
-function BlockHooksControl( props ) {
+function BlockHooksControlPure( {
+	name,
+	clientId,
+	metadata: { ignoredHookedBlocks = [] } = {},
+} ) {
 	const blockTypes = useSelect(
 		( select ) => select( blocksStore ).getBlockTypes(),
 		[]
 	);
 
+	// A hooked block added via a filter will not be exposed through a block
+	// type's `blockHooks` property; however, if the containing layout has been
+	// modified, it will be present in the anchor block's `ignoredHookedBlocks`
+	// metadata.
 	const hookedBlocksForCurrentBlock = useMemo(
 		() =>
 			blockTypes?.filter(
-				( { blockHooks } ) =>
-					blockHooks && props.blockName in blockHooks
+				( { name: blockName, blockHooks } ) =>
+					( blockHooks && name in blockHooks ) ||
+					ignoredHookedBlocks.includes( blockName )
 			),
-		[ blockTypes, props.blockName ]
-	);
-
-	const { blockIndex, rootClientId, innerBlocksLength } = useSelect(
-		( select ) => {
-			const { getBlock, getBlockIndex, getBlockRootClientId } =
-				select( blockEditorStore );
-
-			return {
-				blockIndex: getBlockIndex( props.clientId ),
-				innerBlocksLength: getBlock( props.clientId )?.innerBlocks
-					?.length,
-				rootClientId: getBlockRootClientId( props.clientId ),
-			};
-		},
-		[ props.clientId ]
+		[ blockTypes, name, ignoredHookedBlocks ]
 	);
 
 	const hookedBlockClientIds = useSelect(
 		( select ) => {
-			const { getBlock, getGlobalBlockCount } =
+			const { getBlocks, getBlockRootClientId, getGlobalBlockCount } =
 				select( blockEditorStore );
 
+			const rootClientId = getBlockRootClientId( clientId );
 			const _hookedBlockClientIds = hookedBlocksForCurrentBlock.reduce(
 				( clientIds, block ) => {
 					// If the block doesn't exist anywhere in the block tree,
-					// we know that we have to display the toggle for it, and set
-					// it to disabled.
+					// we know that we have to set the toggle to disabled.
 					if ( getGlobalBlockCount( block.name ) === 0 ) {
 						return clientIds;
 					}
 
-					const relativePosition =
-						block?.blockHooks?.[ props.blockName ];
+					const relativePosition = block?.blockHooks?.[ name ];
 					let candidates;
 
 					switch ( relativePosition ) {
@@ -75,7 +62,7 @@ function BlockHooksControl( props ) {
 							// Any of the current block's siblings (with the right block type) qualifies
 							// as a hooked block (inserted `before` or `after` the current one), as the block
 							// might've been automatically inserted and then moved around a bit by the user.
-							candidates = getBlock( rootClientId )?.innerBlocks;
+							candidates = getBlocks( rootClientId );
 							break;
 
 						case 'first_child':
@@ -83,12 +70,22 @@ function BlockHooksControl( props ) {
 							// Any of the current block's child blocks (with the right block type) qualifies
 							// as a hooked first or last child block, as the block might've been automatically
 							// inserted and then moved around a bit by the user.
-							candidates = getBlock( props.clientId ).innerBlocks;
+							candidates = getBlocks( clientId );
+							break;
+
+						case undefined:
+							// If we haven't found a blockHooks field with a relative position for the hooked
+							// block, it means that it was added by a filter. In this case, we look for the block
+							// both among the current block's siblings and its children.
+							candidates = [
+								...getBlocks( rootClientId ),
+								...getBlocks( clientId ),
+							];
 							break;
 					}
 
 					const hookedBlock = candidates?.find(
-						( { name } ) => name === block.name
+						( candidate ) => candidate.name === block.name
 					);
 
 					// If the block exists in the designated location, we consider it hooked
@@ -101,13 +98,8 @@ function BlockHooksControl( props ) {
 					}
 
 					// If no hooked block was found in any of its designated locations,
-					// but it exists elsewhere in the block tree, we consider it manually inserted.
-					// In this case, we take note and will remove the corresponding toggle from the
-					// block inspector panel.
-					return {
-						...clientIds,
-						[ block.name ]: false,
-					};
+					// we set the toggle to disabled.
+					return clientIds;
 				},
 				{}
 			);
@@ -118,23 +110,14 @@ function BlockHooksControl( props ) {
 
 			return EMPTY_OBJECT;
 		},
-		[
-			hookedBlocksForCurrentBlock,
-			props.blockName,
-			props.clientId,
-			rootClientId,
-		]
+		[ hookedBlocksForCurrentBlock, name, clientId ]
 	);
 
+	const { getBlockIndex, getBlockCount, getBlockRootClientId } =
+		useSelect( blockEditorStore );
 	const { insertBlock, removeBlock } = useDispatch( blockEditorStore );
 
-	// Remove toggle if block isn't present in the designated location but elsewhere in the block tree.
-	const hookedBlocksForCurrentBlockIfNotPresentElsewhere =
-		hookedBlocksForCurrentBlock?.filter(
-			( block ) => hookedBlockClientIds?.[ block.name ] !== false
-		);
-
-	if ( ! hookedBlocksForCurrentBlockIfNotPresentElsewhere.length ) {
+	if ( ! hookedBlocksForCurrentBlock.length ) {
 		return null;
 	}
 
@@ -152,6 +135,10 @@ function BlockHooksControl( props ) {
 	);
 
 	const insertBlockIntoDesignatedLocation = ( block, relativePosition ) => {
+		const blockIndex = getBlockIndex( clientId );
+		const innerBlocksLength = getBlockCount( clientId );
+		const rootClientId = getBlockRootClientId( clientId );
+
 		switch ( relativePosition ) {
 			case 'before':
 			case 'after':
@@ -169,7 +156,19 @@ function BlockHooksControl( props ) {
 					block,
 					// TODO: It'd be great if insertBlock() would accept negative indices for insertion.
 					relativePosition === 'first_child' ? 0 : innerBlocksLength,
-					props.clientId, // Insert as a child of the current block.
+					clientId, // Insert as a child of the current block.
+					false
+				);
+				break;
+
+			case undefined:
+				// If we do not know the relative position, it is because the block was
+				// added via a filter. In this case, we default to inserting it after the
+				// current block.
+				insertBlock(
+					block,
+					blockIndex + 1,
+					rootClientId, // Insert as a child of the current block's parent
 					false
 				);
 				break;
@@ -181,8 +180,13 @@ function BlockHooksControl( props ) {
 			<PanelBody
 				className="block-editor-hooks__block-hooks"
 				title={ __( 'Plugins' ) }
-				initialOpen={ true }
+				initialOpen
 			>
+				<p className="block-editor-hooks__block-hooks-helptext">
+					{ __(
+						'Manage the inclusion of blocks added automatically by plugins.'
+					) }
+				</p>
 				{ Object.keys( groupedHookedBlocks ).map( ( vendor ) => {
 					return (
 						<Fragment key={ vendor }>
@@ -193,23 +197,15 @@ function BlockHooksControl( props ) {
 
 								return (
 									<ToggleControl
+										__nextHasNoMarginBottom
 										checked={ checked }
 										key={ block.title }
-										label={
-											<HStack justify="flex-start">
-												<BlockIcon
-													icon={ block.icon }
-												/>
-												<span>{ block.title }</span>
-											</HStack>
-										}
+										label={ block.title }
 										onChange={ () => {
 											if ( ! checked ) {
 												// Create and insert block.
 												const relativePosition =
-													block.blockHooks[
-														props.blockName
-													];
+													block.blockHooks[ name ];
 												insertBlockIntoDesignatedLocation(
 													createBlock( block.name ),
 													relativePosition
@@ -218,11 +214,12 @@ function BlockHooksControl( props ) {
 											}
 
 											// Remove block.
-											const clientId =
+											removeBlock(
 												hookedBlockClientIds[
 													block.name
-												];
-											removeBlock( clientId, false );
+												],
+												false
+											);
 										} }
 									/>
 								);
@@ -235,27 +232,10 @@ function BlockHooksControl( props ) {
 	);
 }
 
-export const withBlockHooksControls = createHigherOrderComponent(
-	( BlockEdit ) => {
-		return ( props ) => {
-			return (
-				<>
-					<BlockEdit key="edit" { ...props } />
-					{ props.isSelected && (
-						<BlockHooksControl
-							blockName={ props.name }
-							clientId={ props.clientId }
-						/>
-					) }
-				</>
-			);
-		};
+export default {
+	edit: BlockHooksControlPure,
+	attributeKeys: [ 'metadata' ],
+	hasSupport() {
+		return true;
 	},
-	'withBlockHooksControls'
-);
-
-addFilter(
-	'editor.BlockEdit',
-	'core/editor/block-hooks/with-inspector-controls',
-	withBlockHooksControls
-);
+};
diff --git a/packages/block-editor/src/hooks/block-hooks.scss b/packages/block-editor/src/hooks/block-hooks.scss
index dc05d6e6947bb0..03cabd638d8684 100644
--- a/packages/block-editor/src/hooks/block-hooks.scss
+++ b/packages/block-editor/src/hooks/block-hooks.scss
@@ -1,16 +1,14 @@
 .block-editor-hooks__block-hooks {
-	/**
-	 * Since we're displaying the block icon alongside the block name,
-	 * we need to right-align the toggle.
-	 */
-	.components-toggle-control .components-h-stack {
-		flex-direction: row-reverse;
-	}
-
 	/**
 	 * Un-reverse the flex direction for the toggle's label.
 	 */
 	.components-toggle-control .components-h-stack .components-h-stack {
 		flex-direction: row;
 	}
+
+	.block-editor-hooks__block-hooks-helptext {
+		color: $gray-700;
+		font-size: $helptext-font-size;
+		margin-bottom: $grid-unit-20;
+	}
 }
diff --git a/packages/block-editor/src/hooks/block-renaming.js b/packages/block-editor/src/hooks/block-renaming.js
index 48e3b801d4eb91..5db06d1a652d41 100644
--- a/packages/block-editor/src/hooks/block-renaming.js
+++ b/packages/block-editor/src/hooks/block-renaming.js
@@ -3,15 +3,6 @@
  */
 import { addFilter } from '@wordpress/hooks';
 import { hasBlockSupport } from '@wordpress/blocks';
-import { createHigherOrderComponent } from '@wordpress/compose';
-import { __ } from '@wordpress/i18n';
-import { TextControl } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import { InspectorControls } from '../components';
-import { useBlockRename } from '../components/block-rename';
 
 /**
  * Filters registered block settings, adding an `__experimentalLabel` callback if one does not already exist.
@@ -47,44 +38,6 @@ export function addLabelCallback( settings ) {
 	return settings;
 }
 
-export const withBlockRenameControl = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const { name, attributes, setAttributes, isSelected } = props;
-
-		const { canRename } = useBlockRename( name );
-
-		return (
-			<>
-				{ isSelected && canRename && (
-					<InspectorControls group="advanced">
-						<TextControl
-							__nextHasNoMarginBottom
-							label={ __( 'Block name' ) }
-							value={ attributes?.metadata?.name || '' }
-							onChange={ ( newName ) => {
-								setAttributes( {
-									metadata: {
-										...attributes?.metadata,
-										name: newName,
-									},
-								} );
-							} }
-						/>
-					</InspectorControls>
-				) }
-				<BlockEdit key="edit" { ...props } />
-			</>
-		);
-	},
-	'withToolbarControls'
-);
-
-addFilter(
-	'editor.BlockEdit',
-	'core/block-rename-ui/with-block-rename-control',
-	withBlockRenameControl
-);
-
 addFilter(
 	'blocks.registerBlockType',
 	'core/metadata/addLabelCallback',
diff --git a/packages/block-editor/src/hooks/block-style-variation.js b/packages/block-editor/src/hooks/block-style-variation.js
new file mode 100644
index 00000000000000..65582d0c0cf948
--- /dev/null
+++ b/packages/block-editor/src/hooks/block-style-variation.js
@@ -0,0 +1,373 @@
+/**
+ * WordPress dependencies
+ */
+import { getBlockTypes, store as blocksStore } from '@wordpress/blocks';
+import { useSelect } from '@wordpress/data';
+import { useContext, useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import {
+	GlobalStylesContext,
+	toStyles,
+	getBlockSelectors,
+} from '../components/global-styles';
+import { usePrivateStyleOverride } from './utils';
+import { getValueFromObjectPath } from '../utils/object';
+import { store as blockEditorStore } from '../store';
+import { globalStylesDataKey } from '../store/private-keys';
+import { unlock } from '../lock-unlock';
+
+const VARIATION_PREFIX = 'is-style-';
+
+function getVariationMatches( className ) {
+	if ( ! className ) {
+		return [];
+	}
+	return className.split( /\s+/ ).reduce( ( matches, name ) => {
+		if ( name.startsWith( VARIATION_PREFIX ) ) {
+			const match = name.slice( VARIATION_PREFIX.length );
+			if ( match !== 'default' ) {
+				matches.push( match );
+			}
+		}
+		return matches;
+	}, [] );
+}
+
+/**
+ * Get the first block style variation that has been registered from the class string.
+ *
+ * @param {string} className        CSS class string for a block.
+ * @param {Array}  registeredStyles Currently registered block styles.
+ *
+ * @return {string|null} The name of the first registered variation.
+ */
+function getVariationNameFromClass( className, registeredStyles = [] ) {
+	// The global flag affects how capturing groups work in JS. So the regex
+	// below will only return full CSS classes not just the variation name.
+	const matches = getVariationMatches( className );
+
+	if ( ! matches ) {
+		return null;
+	}
+
+	for ( const variation of matches ) {
+		if ( registeredStyles.some( ( style ) => style.name === variation ) ) {
+			return variation;
+		}
+	}
+	return null;
+}
+
+// A helper component to apply a style override using the useStyleOverride hook.
+function OverrideStyles( { override } ) {
+	usePrivateStyleOverride( override );
+}
+
+/**
+ * This component is used to generate new block style variation overrides
+ * based on an incoming theme config. If a matching style is found in the config,
+ * a new override is created and returned. The overrides can be used in conjunction with
+ * useStyleOverride to apply the new styles to the editor. Its use is
+ * subject to change.
+ *
+ * @param {Object} props        Props.
+ * @param {Object} props.config A global styles object, containing settings and styles.
+ * @return {JSX.Element|undefined} An array of new block variation overrides.
+ */
+export function __unstableBlockStyleVariationOverridesWithConfig( { config } ) {
+	const { getBlockStyles, overrides } = useSelect(
+		( select ) => ( {
+			getBlockStyles: select( blocksStore ).getBlockStyles,
+			overrides: unlock( select( blockEditorStore ) ).getStyleOverrides(),
+		} ),
+		[]
+	);
+	const { getBlockName } = useSelect( blockEditorStore );
+
+	const overridesWithConfig = useMemo( () => {
+		if ( ! overrides?.length ) {
+			return;
+		}
+		const newOverrides = [];
+		const overriddenClientIds = [];
+		for ( const [ , override ] of overrides ) {
+			if (
+				override?.variation &&
+				override?.clientId &&
+				/*
+				 * Because this component overwrites existing style overrides,
+				 * filter out any overrides that are already present in the store.
+				 */
+				! overriddenClientIds.includes( override.clientId )
+			) {
+				const blockName = getBlockName( override.clientId );
+				const configStyles =
+					config?.styles?.blocks?.[ blockName ]?.variations?.[
+						override.variation
+					];
+				if ( configStyles ) {
+					const variationConfig = {
+						settings: config?.settings,
+						// The variation style data is all that is needed to generate
+						// the styles for the current application to a block. The variation
+						// name is updated to match the instance specific class name.
+						styles: {
+							blocks: {
+								[ blockName ]: {
+									variations: {
+										[ `${ override.variation }-${ override.clientId }` ]:
+											configStyles,
+									},
+								},
+							},
+						},
+					};
+					const blockSelectors = getBlockSelectors(
+						getBlockTypes(),
+						getBlockStyles,
+						override.clientId
+					);
+					const hasBlockGapSupport = false;
+					const hasFallbackGapSupport = true;
+					const disableLayoutStyles = true;
+					const disableRootPadding = true;
+					const variationStyles = toStyles(
+						variationConfig,
+						blockSelectors,
+						hasBlockGapSupport,
+						hasFallbackGapSupport,
+						disableLayoutStyles,
+						disableRootPadding,
+						{
+							blockGap: false,
+							blockStyles: true,
+							layoutStyles: false,
+							marginReset: false,
+							presets: false,
+							rootPadding: false,
+							variationStyles: true,
+						}
+					);
+					newOverrides.push( {
+						id: `${ override.variation }-${ override.clientId }`,
+						css: variationStyles,
+						__unstableType: 'variation',
+						variation: override.variation,
+						// The clientId will be stored with the override and used to ensure
+						// the order of overrides matches the order of blocks so that the
+						// correct CSS cascade is maintained.
+						clientId: override.clientId,
+					} );
+					overriddenClientIds.push( override.clientId );
+				}
+			}
+		}
+		return newOverrides;
+	}, [ config, overrides, getBlockStyles, getBlockName ] );
+
+	if ( ! overridesWithConfig || ! overridesWithConfig.length ) {
+		return;
+	}
+
+	return (
+		<>
+			{ overridesWithConfig.map( ( override ) => (
+				<OverrideStyles key={ override.id } override={ override } />
+			) ) }
+		</>
+	);
+}
+
+/**
+ * Retrieves any variation styles data and resolves any referenced values.
+ *
+ * @param {Object}    globalStyles A complete global styles object, containing settings and styles.
+ * @param {string}    name         The name of the desired block type.
+ * @param {variation} variation    The of the block style variation to retrieve data for.
+ *
+ * @return {Object|undefined} The global styles data for the specified variation.
+ */
+export function getVariationStylesWithRefValues(
+	globalStyles,
+	name,
+	variation
+) {
+	if ( ! globalStyles?.styles?.blocks?.[ name ]?.variations?.[ variation ] ) {
+		return;
+	}
+
+	// Helper to recursively look for `ref` values to resolve.
+	const replaceRefs = ( variationStyles ) => {
+		Object.keys( variationStyles ).forEach( ( key ) => {
+			const value = variationStyles[ key ];
+
+			// Only process objects.
+			if ( typeof value === 'object' && value !== null ) {
+				// Process `ref` value if present.
+				if ( value.ref !== undefined ) {
+					if (
+						typeof value.ref !== 'string' ||
+						value.ref.trim() === ''
+					) {
+						// Remove invalid ref.
+						delete variationStyles[ key ];
+					} else {
+						// Resolve `ref` value.
+						const refValue = getValueFromObjectPath(
+							globalStyles,
+							value.ref
+						);
+
+						if ( refValue ) {
+							variationStyles[ key ] = refValue;
+						} else {
+							delete variationStyles[ key ];
+						}
+					}
+				} else {
+					// Recursively resolve `ref` values in nested objects.
+					replaceRefs( value );
+
+					// After recursion, if value is empty due to explicitly
+					// `undefined` ref value, remove it.
+					if ( Object.keys( value ).length === 0 ) {
+						delete variationStyles[ key ];
+					}
+				}
+			}
+		} );
+	};
+
+	// Deep clone variation node to avoid mutating it within global styles and losing refs.
+	const styles = JSON.parse(
+		JSON.stringify(
+			globalStyles.styles.blocks[ name ].variations[ variation ]
+		)
+	);
+	replaceRefs( styles );
+
+	return styles;
+}
+
+function useBlockStyleVariation( name, variation, clientId ) {
+	// Prefer global styles data in GlobalStylesContext, which are available
+	// if in the site editor. Otherwise fall back to whatever is in the
+	// editor settings and available in the post editor.
+	const { merged: mergedConfig } = useContext( GlobalStylesContext );
+	const { globalSettings, globalStyles } = useSelect( ( select ) => {
+		const settings = select( blockEditorStore ).getSettings();
+		return {
+			globalSettings: settings.__experimentalFeatures,
+			globalStyles: settings[ globalStylesDataKey ],
+		};
+	}, [] );
+
+	return useMemo( () => {
+		const variationStyles = getVariationStylesWithRefValues(
+			{
+				settings: mergedConfig?.settings ?? globalSettings,
+				styles: mergedConfig?.styles ?? globalStyles,
+			},
+			name,
+			variation
+		);
+
+		return {
+			settings: mergedConfig?.settings ?? globalSettings,
+			// The variation style data is all that is needed to generate
+			// the styles for the current application to a block. The variation
+			// name is updated to match the instance specific class name.
+			styles: {
+				blocks: {
+					[ name ]: {
+						variations: {
+							[ `${ variation }-${ clientId }` ]: variationStyles,
+						},
+					},
+				},
+			},
+		};
+	}, [
+		mergedConfig,
+		globalSettings,
+		globalStyles,
+		variation,
+		clientId,
+		name,
+	] );
+}
+
+// Rather than leveraging `useInstanceId` here, the `clientId` is used.
+// This is so that the variation style override's ID is predictable
+// when the order of applied style variations changes.
+function useBlockProps( { name, className, clientId } ) {
+	const { getBlockStyles } = useSelect( blocksStore );
+
+	const registeredStyles = getBlockStyles( name );
+	const variation = getVariationNameFromClass( className, registeredStyles );
+	const variationClass = `${ VARIATION_PREFIX }${ variation }-${ clientId }`;
+
+	const { settings, styles } = useBlockStyleVariation(
+		name,
+		variation,
+		clientId
+	);
+
+	const variationStyles = useMemo( () => {
+		if ( ! variation ) {
+			return;
+		}
+
+		const variationConfig = { settings, styles };
+		const blockSelectors = getBlockSelectors(
+			getBlockTypes(),
+			getBlockStyles,
+			clientId
+		);
+		const hasBlockGapSupport = false;
+		const hasFallbackGapSupport = true;
+		const disableLayoutStyles = true;
+		const disableRootPadding = true;
+
+		return toStyles(
+			variationConfig,
+			blockSelectors,
+			hasBlockGapSupport,
+			hasFallbackGapSupport,
+			disableLayoutStyles,
+			disableRootPadding,
+			{
+				blockGap: false,
+				blockStyles: true,
+				layoutStyles: false,
+				marginReset: false,
+				presets: false,
+				rootPadding: false,
+				variationStyles: true,
+			}
+		);
+	}, [ variation, settings, styles, getBlockStyles, clientId ] );
+
+	usePrivateStyleOverride( {
+		id: `variation-${ clientId }`,
+		css: variationStyles,
+		__unstableType: 'variation',
+		variation,
+		// The clientId will be stored with the override and used to ensure
+		// the order of overrides matches the order of blocks so that the
+		// correct CSS cascade is maintained.
+		clientId,
+	} );
+
+	return variation ? { className: variationClass } : {};
+}
+
+export default {
+	hasSupport: () => true,
+	attributeKeys: [ 'className' ],
+	isMatch: ( { className } ) => getVariationMatches( className ).length > 0,
+	useBlockProps,
+};
diff --git a/packages/block-editor/src/hooks/border.js b/packages/block-editor/src/hooks/border.js
index 29e4afd2f018ca..4ab4c69a41f311 100644
--- a/packages/block-editor/src/hooks/border.js
+++ b/packages/block-editor/src/hooks/border.js
@@ -1,14 +1,13 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { getBlockSupport } from '@wordpress/blocks';
+import { hasBlockSupport, getBlockSupport } from '@wordpress/blocks';
 import { __experimentalHasSplitBorders as hasSplitBorders } from '@wordpress/components';
-import { createHigherOrderComponent, pure } from '@wordpress/compose';
 import { Platform, useCallback, useMemo } from '@wordpress/element';
 import { addFilter } from '@wordpress/hooks';
 import { useSelect } from '@wordpress/data';
@@ -26,11 +25,14 @@ import {
 } from './utils';
 import {
 	useHasBorderPanel,
+	useHasBorderPanelControls,
 	BorderPanel as StylesBorderPanel,
 } from '../components/global-styles';
 import { store as blockEditorStore } from '../store';
+import { __ } from '@wordpress/i18n';
 
 export const BORDER_SUPPORT_KEY = '__experimentalBorder';
+export const SHADOW_SUPPORT_KEY = 'shadow';
 
 const getColorByProperty = ( colors, property, value ) => {
 	let matchedColor;
@@ -114,7 +116,7 @@ function attributesToStyle( attributes ) {
 	};
 }
 
-function BordersInspectorControl( { children, resetAllFilter } ) {
+function BordersInspectorControl( { label, children, resetAllFilter } ) {
 	const attributesResetAllFilter = useCallback(
 		( attributes ) => {
 			const existingStyle = attributesToStyle( attributes );
@@ -131,14 +133,14 @@ function BordersInspectorControl( { children, resetAllFilter } ) {
 		<InspectorControls
 			group="border"
 			resetAllFilter={ attributesResetAllFilter }
+			label={ label }
 		>
 			{ children }
 		</InspectorControls>
 	);
 }
 
-function BorderPanelPure( { clientId, name, setAttributes } ) {
-	const settings = useBlockSettings( name );
+export function BorderPanel( { clientId, name, setAttributes, settings } ) {
 	const isEnabled = useHasBorderPanel( settings );
 	function selector( select ) {
 		const { style, borderColor } =
@@ -158,10 +160,16 @@ function BorderPanelPure( { clientId, name, setAttributes } ) {
 		return null;
 	}
 
-	const defaultControls = getBlockSupport( name, [
-		BORDER_SUPPORT_KEY,
-		'__experimentalDefaultControls',
-	] );
+	const defaultControls = {
+		...getBlockSupport( name, [
+			BORDER_SUPPORT_KEY,
+			'__experimentalDefaultControls',
+		] ),
+		...getBlockSupport( name, [
+			SHADOW_SUPPORT_KEY,
+			'__experimentalDefaultControls',
+		] ),
+	};
 
 	return (
 		<StylesBorderPanel
@@ -175,8 +183,6 @@ function BorderPanelPure( { clientId, name, setAttributes } ) {
 	);
 }
 
-export const BorderPanel = pure( BorderPanelPure );
-
 /**
  * Determine whether there is block support for border properties.
  *
@@ -208,6 +214,45 @@ export function hasBorderSupport( blockName, feature = 'any' ) {
 	return !! support?.[ feature ];
 }
 
+/**
+ * Determine whether there is block support for shadow properties.
+ *
+ * @param {string} blockName Block name.
+ *
+ * @return {boolean} Whether there is support.
+ */
+export function hasShadowSupport( blockName ) {
+	return hasBlockSupport( blockName, SHADOW_SUPPORT_KEY );
+}
+
+export function useBorderPanelLabel( {
+	blockName,
+	hasBorderControl,
+	hasShadowControl,
+} = {} ) {
+	const settings = useBlockSettings( blockName );
+	const controls = useHasBorderPanelControls( settings );
+
+	if ( ! hasBorderControl && ! hasShadowControl && blockName ) {
+		hasBorderControl =
+			controls?.hasBorderColor ||
+			controls?.hasBorderStyle ||
+			controls?.hasBorderWidth ||
+			controls?.hasBorderRadius;
+		hasShadowControl = controls?.hasShadow;
+	}
+
+	if ( hasBorderControl && hasShadowControl ) {
+		return __( 'Border & Shadow' );
+	}
+
+	if ( hasShadowControl ) {
+		return __( 'Shadow' );
+	}
+
+	return __( 'Border' );
+}
+
 /**
  * Returns a new style object where the specified border attribute has been
  * removed.
@@ -260,22 +305,22 @@ function addAttributes( settings ) {
 /**
  * Override props assigned to save component to inject border color.
  *
- * @param {Object} props      Additional props applied to save element.
- * @param {Object} blockType  Block type definition.
- * @param {Object} attributes Block's attributes.
+ * @param {Object}        props           Additional props applied to save element.
+ * @param {Object|string} blockNameOrType Block type definition.
+ * @param {Object}        attributes      Block's attributes.
  *
  * @return {Object} Filtered props to apply to save element.
  */
-function addSaveProps( props, blockType, attributes ) {
+function addSaveProps( props, blockNameOrType, attributes ) {
 	if (
-		! hasBorderSupport( blockType, 'color' ) ||
-		shouldSkipSerialization( blockType, BORDER_SUPPORT_KEY, 'color' )
+		! hasBorderSupport( blockNameOrType, 'color' ) ||
+		shouldSkipSerialization( blockNameOrType, BORDER_SUPPORT_KEY, 'color' )
 	) {
 		return props;
 	}
 
 	const borderClasses = getBorderClasses( attributes );
-	const newClassName = classnames( props.className, borderClasses );
+	const newClassName = clsx( props.className, borderClasses );
 
 	// If we are clearing the last of the previous classes in `className`
 	// set it to `undefined` to avoid rendering empty DOM attributes.
@@ -296,129 +341,69 @@ export function getBorderClasses( attributes ) {
 	const { borderColor, style } = attributes;
 	const borderColorClass = getColorClassName( 'border-color', borderColor );
 
-	return classnames( {
+	return clsx( {
 		'has-border-color': borderColor || style?.border?.color,
 		[ borderColorClass ]: !! borderColorClass,
 	} );
 }
 
-/**
- * Filters the registered block settings to apply border color styles and
- * classnames to the block edit wrapper.
- *
- * @param {Object} settings Original block settings.
- *
- * @return {Object} Filtered block settings.
- */
-function addEditProps( settings ) {
+function useBlockProps( { name, borderColor, style } ) {
+	const { colors } = useMultipleOriginColorsAndGradients();
+
 	if (
-		! hasBorderSupport( settings, 'color' ) ||
-		shouldSkipSerialization( settings, BORDER_SUPPORT_KEY, 'color' )
+		! hasBorderSupport( name, 'color' ) ||
+		shouldSkipSerialization( name, BORDER_SUPPORT_KEY, 'color' )
 	) {
-		return settings;
+		return {};
 	}
 
-	const existingGetEditWrapperProps = settings.getEditWrapperProps;
-	settings.getEditWrapperProps = ( attributes ) => {
-		let props = {};
+	const { color: borderColorValue } = getMultiOriginColor( {
+		colors,
+		namedColor: borderColor,
+	} );
+	const { color: borderTopColor } = getMultiOriginColor( {
+		colors,
+		namedColor: getColorSlugFromVariable( style?.border?.top?.color ),
+	} );
+	const { color: borderRightColor } = getMultiOriginColor( {
+		colors,
+		namedColor: getColorSlugFromVariable( style?.border?.right?.color ),
+	} );
 
-		if ( existingGetEditWrapperProps ) {
-			props = existingGetEditWrapperProps( attributes );
-		}
+	const { color: borderBottomColor } = getMultiOriginColor( {
+		colors,
+		namedColor: getColorSlugFromVariable( style?.border?.bottom?.color ),
+	} );
+	const { color: borderLeftColor } = getMultiOriginColor( {
+		colors,
+		namedColor: getColorSlugFromVariable( style?.border?.left?.color ),
+	} );
 
-		return addSaveProps( props, settings, attributes );
+	const extraStyles = {
+		borderTopColor: borderTopColor || borderColorValue,
+		borderRightColor: borderRightColor || borderColorValue,
+		borderBottomColor: borderBottomColor || borderColorValue,
+		borderLeftColor: borderLeftColor || borderColorValue,
 	};
 
-	return settings;
+	return addSaveProps(
+		{ style: cleanEmptyObject( extraStyles ) || {} },
+		name,
+		{ borderColor, style }
+	);
 }
 
-/**
- * This adds inline styles for color palette colors.
- * Ideally, this is not needed and themes should load their palettes on the editor.
- *
- * @param {Function} BlockListBlock Original component.
- *
- * @return {Function} Wrapped component.
- */
-export const withBorderColorPaletteStyles = createHigherOrderComponent(
-	( BlockListBlock ) => ( props ) => {
-		const { name, attributes } = props;
-		const { borderColor, style } = attributes;
-		const { colors } = useMultipleOriginColorsAndGradients();
-
-		if (
-			! hasBorderSupport( name, 'color' ) ||
-			shouldSkipSerialization( name, BORDER_SUPPORT_KEY, 'color' )
-		) {
-			return <BlockListBlock { ...props } />;
-		}
-
-		const { color: borderColorValue } = getMultiOriginColor( {
-			colors,
-			namedColor: borderColor,
-		} );
-		const { color: borderTopColor } = getMultiOriginColor( {
-			colors,
-			namedColor: getColorSlugFromVariable( style?.border?.top?.color ),
-		} );
-		const { color: borderRightColor } = getMultiOriginColor( {
-			colors,
-			namedColor: getColorSlugFromVariable( style?.border?.right?.color ),
-		} );
-
-		const { color: borderBottomColor } = getMultiOriginColor( {
-			colors,
-			namedColor: getColorSlugFromVariable(
-				style?.border?.bottom?.color
-			),
-		} );
-		const { color: borderLeftColor } = getMultiOriginColor( {
-			colors,
-			namedColor: getColorSlugFromVariable( style?.border?.left?.color ),
-		} );
-
-		const extraStyles = {
-			borderTopColor: borderTopColor || borderColorValue,
-			borderRightColor: borderRightColor || borderColorValue,
-			borderBottomColor: borderBottomColor || borderColorValue,
-			borderLeftColor: borderLeftColor || borderColorValue,
-		};
-		const cleanedExtraStyles = cleanEmptyObject( extraStyles ) || {};
-
-		let wrapperProps = props.wrapperProps;
-		wrapperProps = {
-			...props.wrapperProps,
-			style: {
-				...props.wrapperProps?.style,
-				...cleanedExtraStyles,
-			},
-		};
-
-		return <BlockListBlock { ...props } wrapperProps={ wrapperProps } />;
+export default {
+	useBlockProps,
+	addSaveProps,
+	attributeKeys: [ 'borderColor', 'style' ],
+	hasSupport( name ) {
+		return hasBorderSupport( name, 'color' );
 	},
-	'withBorderColorPaletteStyles'
-);
+};
 
 addFilter(
 	'blocks.registerBlockType',
 	'core/border/addAttributes',
 	addAttributes
 );
-
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/border/addSaveProps',
-	addSaveProps
-);
-
-addFilter(
-	'blocks.registerBlockType',
-	'core/border/addEditProps',
-	addEditProps
-);
-
-addFilter(
-	'editor.BlockListBlock',
-	'core/border/with-border-color-palette-styles',
-	withBorderColorPaletteStyles
-);
diff --git a/packages/block-editor/src/hooks/color.js b/packages/block-editor/src/hooks/color.js
index 94bcc599dd6371..ef8984c9367853 100644
--- a/packages/block-editor/src/hooks/color.js
+++ b/packages/block-editor/src/hooks/color.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -9,7 +9,6 @@ import classnames from 'classnames';
 import { addFilter } from '@wordpress/hooks';
 import { getBlockSupport } from '@wordpress/blocks';
 import { useMemo, Platform, useCallback } from '@wordpress/element';
-import { createHigherOrderComponent, pure } from '@wordpress/compose';
 import { useSelect } from '@wordpress/data';
 
 /**
@@ -24,8 +23,8 @@ import {
 	cleanEmptyObject,
 	transformStyles,
 	shouldSkipSerialization,
-	useBlockSettings,
 } from './utils';
+import { getBackgroundImageClasses } from './background';
 import { useSettings } from '../components/use-settings';
 import InspectorControls from '../components/inspector-controls';
 import {
@@ -37,8 +36,8 @@ import { store as blockEditorStore } from '../store';
 
 export const COLOR_SUPPORT_KEY = 'color';
 
-const hasColorSupport = ( blockType ) => {
-	const colorSupport = getBlockSupport( blockType, COLOR_SUPPORT_KEY );
+const hasColorSupport = ( blockNameOrType ) => {
+	const colorSupport = getBlockSupport( blockNameOrType, COLOR_SUPPORT_KEY );
 	return (
 		colorSupport &&
 		( colorSupport.link === true ||
@@ -62,8 +61,8 @@ const hasLinkColorSupport = ( blockType ) => {
 	);
 };
 
-const hasGradientSupport = ( blockType ) => {
-	const colorSupport = getBlockSupport( blockType, COLOR_SUPPORT_KEY );
+const hasGradientSupport = ( blockNameOrType ) => {
+	const colorSupport = getBlockSupport( blockNameOrType, COLOR_SUPPORT_KEY );
 
 	return (
 		colorSupport !== null &&
@@ -127,27 +126,31 @@ function addAttributes( settings ) {
 /**
  * Override props assigned to save component to inject colors classnames.
  *
- * @param {Object} props      Additional props applied to save element.
- * @param {Object} blockType  Block type.
- * @param {Object} attributes Block attributes.
+ * @param {Object}        props           Additional props applied to save element.
+ * @param {Object|string} blockNameOrType Block type.
+ * @param {Object}        attributes      Block attributes.
  *
  * @return {Object} Filtered props applied to save element.
  */
-export function addSaveProps( props, blockType, attributes ) {
+export function addSaveProps( props, blockNameOrType, attributes ) {
 	if (
-		! hasColorSupport( blockType ) ||
-		shouldSkipSerialization( blockType, COLOR_SUPPORT_KEY )
+		! hasColorSupport( blockNameOrType ) ||
+		shouldSkipSerialization( blockNameOrType, COLOR_SUPPORT_KEY )
 	) {
 		return props;
 	}
 
-	const hasGradient = hasGradientSupport( blockType );
+	const hasGradient = hasGradientSupport( blockNameOrType );
 
 	// I'd have preferred to avoid the "style" attribute usage here
 	const { backgroundColor, textColor, gradient, style } = attributes;
 
 	const shouldSerialize = ( feature ) =>
-		! shouldSkipSerialization( blockType, COLOR_SUPPORT_KEY, feature );
+		! shouldSkipSerialization(
+			blockNameOrType,
+			COLOR_SUPPORT_KEY,
+			feature
+		);
 
 	// Primary color classes must come before the `has-text-color`,
 	// `has-background` and `has-link-color` classes to maintain backwards
@@ -171,55 +174,21 @@ export function addSaveProps( props, blockType, attributes ) {
 		style?.color?.background ||
 		( hasGradient && ( gradient || style?.color?.gradient ) );
 
-	const newClassName = classnames(
-		props.className,
-		textClass,
-		gradientClass,
-		{
-			// Don't apply the background class if there's a custom gradient.
-			[ backgroundClass ]:
-				( ! hasGradient || ! style?.color?.gradient ) &&
-				!! backgroundClass,
-			'has-text-color':
-				shouldSerialize( 'text' ) &&
-				( textColor || style?.color?.text ),
-			'has-background': serializeHasBackground && hasBackground,
-			'has-link-color':
-				shouldSerialize( 'link' ) && style?.elements?.link?.color,
-		}
-	);
+	const newClassName = clsx( props.className, textClass, gradientClass, {
+		// Don't apply the background class if there's a custom gradient.
+		[ backgroundClass ]:
+			( ! hasGradient || ! style?.color?.gradient ) && !! backgroundClass,
+		'has-text-color':
+			shouldSerialize( 'text' ) && ( textColor || style?.color?.text ),
+		'has-background': serializeHasBackground && hasBackground,
+		'has-link-color':
+			shouldSerialize( 'link' ) && style?.elements?.link?.color,
+	} );
 	props.className = newClassName ? newClassName : undefined;
 
 	return props;
 }
 
-/**
- * Filters registered block settings to extend the block edit wrapper
- * to apply the desired styles and classnames properly.
- *
- * @param {Object} settings Original block settings.
- *
- * @return {Object} Filtered block settings.
- */
-export function addEditProps( settings ) {
-	if (
-		! hasColorSupport( settings ) ||
-		shouldSkipSerialization( settings, COLOR_SUPPORT_KEY )
-	) {
-		return settings;
-	}
-	const existingGetEditWrapperProps = settings.getEditWrapperProps;
-	settings.getEditWrapperProps = ( attributes ) => {
-		let props = {};
-		if ( existingGetEditWrapperProps ) {
-			props = existingGetEditWrapperProps( attributes );
-		}
-		return addSaveProps( props, settings, attributes );
-	};
-
-	return settings;
-}
-
 function styleToAttributes( style ) {
 	const textColorValue = style?.color?.text;
 	const textColorSlug = textColorValue?.startsWith( 'var:preset|color|' )
@@ -291,8 +260,7 @@ function ColorInspectorControl( { children, resetAllFilter } ) {
 	);
 }
 
-function ColorEditPure( { clientId, name, setAttributes } ) {
-	const settings = useBlockSettings( name );
+export function ColorEdit( { clientId, name, setAttributes, settings } ) {
 	const isEnabled = useHasColorPanel( settings );
 	function selector( select ) {
 		const { style, textColor, backgroundColor, gradient } =
@@ -361,74 +329,83 @@ function ColorEditPure( { clientId, name, setAttributes } ) {
 	);
 }
 
-export const ColorEdit = pure( ColorEditPure );
+function useBlockProps( {
+	name,
+	backgroundColor,
+	textColor,
+	gradient,
+	style,
+} ) {
+	const [ userPalette, themePalette, defaultPalette ] = useSettings(
+		'color.palette.custom',
+		'color.palette.theme',
+		'color.palette.default'
+	);
 
-/**
- * This adds inline styles for color palette colors.
- * Ideally, this is not needed and themes should load their palettes on the editor.
- *
- * @param {Function} BlockListBlock Original component.
- *
- * @return {Function} Wrapped component.
- */
-export const withColorPaletteStyles = createHigherOrderComponent(
-	( BlockListBlock ) => ( props ) => {
-		const { name, attributes } = props;
-		const { backgroundColor, textColor } = attributes;
-		const [ userPalette, themePalette, defaultPalette ] = useSettings(
-			'color.palette.custom',
-			'color.palette.theme',
-			'color.palette.default'
-		);
+	const colors = useMemo(
+		() => [
+			...( userPalette || [] ),
+			...( themePalette || [] ),
+			...( defaultPalette || [] ),
+		],
+		[ userPalette, themePalette, defaultPalette ]
+	);
+	if (
+		! hasColorSupport( name ) ||
+		shouldSkipSerialization( name, COLOR_SUPPORT_KEY )
+	) {
+		return {};
+	}
+	const extraStyles = {};
 
-		const colors = useMemo(
-			() => [
-				...( userPalette || [] ),
-				...( themePalette || [] ),
-				...( defaultPalette || [] ),
-			],
-			[ userPalette, themePalette, defaultPalette ]
-		);
-		if (
-			! hasColorSupport( name ) ||
-			shouldSkipSerialization( name, COLOR_SUPPORT_KEY )
-		) {
-			return <BlockListBlock { ...props } />;
-		}
-		const extraStyles = {};
-
-		if (
-			textColor &&
-			! shouldSkipSerialization( name, COLOR_SUPPORT_KEY, 'text' )
-		) {
-			extraStyles.color = getColorObjectByAttributeValues(
-				colors,
-				textColor
-			)?.color;
-		}
-		if (
-			backgroundColor &&
-			! shouldSkipSerialization( name, COLOR_SUPPORT_KEY, 'background' )
-		) {
-			extraStyles.backgroundColor = getColorObjectByAttributeValues(
-				colors,
-				backgroundColor
-			)?.color;
-		}
-
-		let wrapperProps = props.wrapperProps;
-		wrapperProps = {
-			...props.wrapperProps,
-			style: {
-				...extraStyles,
-				...props.wrapperProps?.style,
-			},
-		};
+	if (
+		textColor &&
+		! shouldSkipSerialization( name, COLOR_SUPPORT_KEY, 'text' )
+	) {
+		extraStyles.color = getColorObjectByAttributeValues(
+			colors,
+			textColor
+		)?.color;
+	}
+	if (
+		backgroundColor &&
+		! shouldSkipSerialization( name, COLOR_SUPPORT_KEY, 'background' )
+	) {
+		extraStyles.backgroundColor = getColorObjectByAttributeValues(
+			colors,
+			backgroundColor
+		)?.color;
+	}
 
-		return <BlockListBlock { ...props } wrapperProps={ wrapperProps } />;
-	},
-	'withColorPaletteStyles'
-);
+	const saveProps = addSaveProps( { style: extraStyles }, name, {
+		textColor,
+		backgroundColor,
+		gradient,
+		style,
+	} );
+
+	const hasBackgroundValue =
+		backgroundColor ||
+		style?.color?.background ||
+		gradient ||
+		style?.color?.gradient;
+
+	return {
+		...saveProps,
+		className: clsx(
+			saveProps.className,
+			// Add background image classes in the editor, if not already handled by background color values.
+			! hasBackgroundValue && getBackgroundImageClasses( style )
+		),
+	};
+}
+
+export default {
+	useBlockProps,
+	addSaveProps,
+	attributeKeys: [ 'backgroundColor', 'textColor', 'gradient', 'style' ],
+	hasSupport: hasColorSupport,
+};
 
 const MIGRATION_PATHS = {
 	linkColor: [ [ 'style', 'elements', 'link', 'color', 'text' ] ],
@@ -464,24 +441,6 @@ addFilter(
 	addAttributes
 );
 
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/color/addSaveProps',
-	addSaveProps
-);
-
-addFilter(
-	'blocks.registerBlockType',
-	'core/color/addEditProps',
-	addEditProps
-);
-
-addFilter(
-	'editor.BlockListBlock',
-	'core/color/with-color-palette-styles',
-	withColorPaletteStyles
-);
-
 addFilter(
 	'blocks.switchToBlockType.transformedBlock',
 	'core/color/addTransforms',
diff --git a/packages/block-editor/src/hooks/color.scss b/packages/block-editor/src/hooks/color.scss
index f9b7898f941b75..8be620bf40d938 100644
--- a/packages/block-editor/src/hooks/color.scss
+++ b/packages/block-editor/src/hooks/color.scss
@@ -5,6 +5,7 @@
 		 * injected color controls can appear as a single item group without
 		 * the contrast checkers suddenly appearing between items.
 		 */
+		/* stylelint-disable-next-line property-disallowed-list -- This should be removed when https://github.com/WordPress/gutenberg/issues/58936 is fixed. */
 		order: 9999;
 		grid-column: span 2;
 		margin-top: $grid-unit-20;
diff --git a/packages/block-editor/src/hooks/content-lock-ui.js b/packages/block-editor/src/hooks/content-lock-ui.js
index 5d277d6a516d2d..f5e3bde31ce509 100644
--- a/packages/block-editor/src/hooks/content-lock-ui.js
+++ b/packages/block-editor/src/hooks/content-lock-ui.js
@@ -1,165 +1,69 @@
 /**
  * WordPress dependencies
  */
-import { ToolbarButton, MenuItem } from '@wordpress/components';
-import { createHigherOrderComponent } from '@wordpress/compose';
+import { ToolbarButton } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
-import { addFilter } from '@wordpress/hooks';
 import { __ } from '@wordpress/i18n';
-import { useEffect, useRef, useCallback } from '@wordpress/element';
+import { useCallback } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../store';
-import { BlockControls, BlockSettingsMenuControls } from '../components';
+import { BlockControls } from '../components';
+import { unlock } from '../lock-unlock';
 
-function StopEditingAsBlocksOnOutsideSelect( {
-	clientId,
-	stopEditingAsBlock,
-} ) {
-	const isBlockOrDescendantSelected = useSelect(
+// The implementation of content locking is mainly in this file, although the mechanism
+// to stop temporarily editing as blocks when an outside block is selected is on component StopEditingAsBlocksOnOutsideSelect
+// at block-editor/src/components/block-list/index.js.
+// Besides the components on this file and the file referenced above the implementation
+// also includes artifacts on the store (actions, reducers, and selector).
+
+function ContentLockControlsPure( { clientId } ) {
+	const { templateLock, isLockedByParent, isEditingAsBlocks } = useSelect(
 		( select ) => {
-			const { isBlockSelected, hasSelectedInnerBlock } =
-				select( blockEditorStore );
-			return (
-				isBlockSelected( clientId ) ||
-				hasSelectedInnerBlock( clientId, true )
-			);
+			const {
+				getContentLockingParent,
+				getTemplateLock,
+				getTemporarilyEditingAsBlocks,
+			} = unlock( select( blockEditorStore ) );
+			return {
+				templateLock: getTemplateLock( clientId ),
+				isLockedByParent: !! getContentLockingParent( clientId ),
+				isEditingAsBlocks: getTemporarilyEditingAsBlocks() === clientId,
+			};
 		},
 		[ clientId ]
 	);
-	useEffect( () => {
-		if ( ! isBlockOrDescendantSelected ) {
-			stopEditingAsBlock();
-		}
-	}, [ isBlockOrDescendantSelected, stopEditingAsBlock ] );
-	return null;
-}
 
-export const withContentLockControls = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const { getBlockListSettings, getSettings } =
-			useSelect( blockEditorStore );
-		const focusModeToRevert = useRef();
-		const { templateLock, isLockedByParent, isEditingAsBlocks } = useSelect(
-			( select ) => {
-				const {
-					__unstableGetContentLockingParent,
-					getTemplateLock,
-					__unstableGetTemporarilyEditingAsBlocks,
-				} = select( blockEditorStore );
-				return {
-					templateLock: getTemplateLock( props.clientId ),
-					isLockedByParent: !! __unstableGetContentLockingParent(
-						props.clientId
-					),
-					isEditingAsBlocks:
-						__unstableGetTemporarilyEditingAsBlocks() ===
-						props.clientId,
-				};
-			},
-			[ props.clientId ]
-		);
+	const { stopEditingAsBlocks } = unlock( useDispatch( blockEditorStore ) );
+	const isContentLocked =
+		! isLockedByParent && templateLock === 'contentOnly';
 
-		const {
-			updateSettings,
-			updateBlockListSettings,
-			__unstableSetTemporarilyEditingAsBlocks,
-		} = useDispatch( blockEditorStore );
-		const isContentLocked =
-			! isLockedByParent && templateLock === 'contentOnly';
-		const {
-			__unstableMarkNextChangeAsNotPersistent,
-			updateBlockAttributes,
-		} = useDispatch( blockEditorStore );
+	const stopEditingAsBlockCallback = useCallback( () => {
+		stopEditingAsBlocks( clientId );
+	}, [ clientId, stopEditingAsBlocks ] );
 
-		const stopEditingAsBlock = useCallback( () => {
-			__unstableMarkNextChangeAsNotPersistent();
-			updateBlockAttributes( props.clientId, {
-				templateLock: 'contentOnly',
-			} );
-			updateBlockListSettings( props.clientId, {
-				...getBlockListSettings( props.clientId ),
-				templateLock: 'contentOnly',
-			} );
-			updateSettings( { focusMode: focusModeToRevert.current } );
-			__unstableSetTemporarilyEditingAsBlocks();
-		}, [
-			props.clientId,
-			updateSettings,
-			updateBlockListSettings,
-			getBlockListSettings,
-			__unstableMarkNextChangeAsNotPersistent,
-			updateBlockAttributes,
-			__unstableSetTemporarilyEditingAsBlocks,
-		] );
+	if ( ! isContentLocked && ! isEditingAsBlocks ) {
+		return null;
+	}
 
-		if ( ! isContentLocked && ! isEditingAsBlocks ) {
-			return <BlockEdit key="edit" { ...props } />;
-		}
+	const showStopEditingAsBlocks = isEditingAsBlocks && ! isContentLocked;
 
-		const showStopEditingAsBlocks = isEditingAsBlocks && ! isContentLocked;
-		const showStartEditingAsBlocks =
-			! isEditingAsBlocks && isContentLocked && props.isSelected;
+	return (
+		showStopEditingAsBlocks && (
+			<BlockControls group="other">
+				<ToolbarButton onClick={ stopEditingAsBlockCallback }>
+					{ __( 'Done' ) }
+				</ToolbarButton>
+			</BlockControls>
+		)
+	);
+}
 
-		return (
-			<>
-				{ showStopEditingAsBlocks && (
-					<>
-						<StopEditingAsBlocksOnOutsideSelect
-							clientId={ props.clientId }
-							stopEditingAsBlock={ stopEditingAsBlock }
-						/>
-						<BlockControls group="other">
-							<ToolbarButton
-								onClick={ () => {
-									stopEditingAsBlock();
-								} }
-							>
-								{ __( 'Done' ) }
-							</ToolbarButton>
-						</BlockControls>
-					</>
-				) }
-				{ showStartEditingAsBlocks && (
-					<BlockSettingsMenuControls>
-						{ ( { onClose } ) => (
-							<MenuItem
-								onClick={ () => {
-									__unstableMarkNextChangeAsNotPersistent();
-									updateBlockAttributes( props.clientId, {
-										templateLock: undefined,
-									} );
-									updateBlockListSettings( props.clientId, {
-										...getBlockListSettings(
-											props.clientId
-										),
-										templateLock: false,
-									} );
-									focusModeToRevert.current =
-										getSettings().focusMode;
-									updateSettings( { focusMode: true } );
-									__unstableSetTemporarilyEditingAsBlocks(
-										props.clientId
-									);
-									onClose();
-								} }
-							>
-								{ __( 'Modify' ) }
-							</MenuItem>
-						) }
-					</BlockSettingsMenuControls>
-				) }
-				<BlockEdit key="edit" { ...props } />
-			</>
-		);
+export default {
+	edit: ContentLockControlsPure,
+	hasSupport() {
+		return true;
 	},
-	'withContentLockControls'
-);
-
-addFilter(
-	'editor.BlockEdit',
-	'core/content-lock-ui/with-block-controls',
-	withContentLockControls
-);
+};
diff --git a/packages/block-editor/src/hooks/contrast-checker.js b/packages/block-editor/src/hooks/contrast-checker.js
index ef04da63e4946b..368e2e75264858 100644
--- a/packages/block-editor/src/hooks/contrast-checker.js
+++ b/packages/block-editor/src/hooks/contrast-checker.js
@@ -7,7 +7,7 @@ import { useState, useEffect } from '@wordpress/element';
  * Internal dependencies
  */
 import ContrastChecker from '../components/contrast-checker';
-import { __unstableUseBlockRef as useBlockRef } from '../components/block-list/use-block-props/use-block-refs';
+import { useBlockElement } from '../components/block-list/use-block-props/use-block-refs';
 
 function getComputedStyle( node ) {
 	return node.ownerDocument.defaultView.getComputedStyle( node );
@@ -17,23 +17,22 @@ export default function BlockColorContrastChecker( { clientId } ) {
 	const [ detectedBackgroundColor, setDetectedBackgroundColor ] = useState();
 	const [ detectedColor, setDetectedColor ] = useState();
 	const [ detectedLinkColor, setDetectedLinkColor ] = useState();
-	const ref = useBlockRef( clientId );
+	const blockEl = useBlockElement( clientId );
 
 	// There are so many things that can change the color of a block
 	// So we perform this check on every render.
-	// eslint-disable-next-line react-hooks/exhaustive-deps
 	useEffect( () => {
-		if ( ! ref.current ) {
+		if ( ! blockEl ) {
 			return;
 		}
-		setDetectedColor( getComputedStyle( ref.current ).color );
+		setDetectedColor( getComputedStyle( blockEl ).color );
 
-		const firstLinkElement = ref.current?.querySelector( 'a' );
+		const firstLinkElement = blockEl.querySelector( 'a' );
 		if ( firstLinkElement && !! firstLinkElement.innerText ) {
 			setDetectedLinkColor( getComputedStyle( firstLinkElement ).color );
 		}
 
-		let backgroundColorNode = ref.current;
+		let backgroundColorNode = blockEl;
 		let backgroundColor =
 			getComputedStyle( backgroundColorNode ).backgroundColor;
 		while (
@@ -48,7 +47,7 @@ export default function BlockColorContrastChecker( { clientId } ) {
 		}
 
 		setDetectedBackgroundColor( backgroundColor );
-	} );
+	}, [ blockEl ] );
 
 	return (
 		<ContrastChecker
diff --git a/packages/block-editor/src/hooks/custom-class-name.js b/packages/block-editor/src/hooks/custom-class-name.js
index 8a3becc8691421..91ef07506fd95c 100644
--- a/packages/block-editor/src/hooks/custom-class-name.js
+++ b/packages/block-editor/src/hooks/custom-class-name.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -10,7 +10,6 @@ import { addFilter } from '@wordpress/hooks';
 import { TextControl } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { hasBlockSupport } from '@wordpress/blocks';
-import { createHigherOrderComponent } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -39,7 +38,7 @@ export function addAttribute( settings ) {
 	return settings;
 }
 
-function CustomClassNameControls( { attributes, setAttributes } ) {
+function CustomClassNameControlsPure( { className, setAttributes } ) {
 	const blockEditingMode = useBlockEditingMode();
 	if ( blockEditingMode !== 'default' ) {
 		return null;
@@ -52,7 +51,7 @@ function CustomClassNameControls( { attributes, setAttributes } ) {
 				__next40pxDefaultSize
 				autoComplete="off"
 				label={ __( 'Additional CSS class(es)' ) }
-				value={ attributes.className || '' }
+				value={ className || '' }
 				onChange={ ( nextValue ) => {
 					setAttributes( {
 						className: nextValue !== '' ? nextValue : undefined,
@@ -64,39 +63,14 @@ function CustomClassNameControls( { attributes, setAttributes } ) {
 	);
 }
 
-/**
- * Override the default edit UI to include a new block inspector control for
- * assigning the custom class name, if block supports custom class name.
- * The control is displayed within the Advanced panel in the block inspector.
- *
- * @param {Component} BlockEdit Original component.
- *
- * @return {Component} Wrapped component.
- */
-export const withCustomClassNameControls = createHigherOrderComponent(
-	( BlockEdit ) => {
-		return ( props ) => {
-			const hasCustomClassName = hasBlockSupport(
-				props.name,
-				'customClassName',
-				true
-			);
-
-			return (
-				<>
-					<BlockEdit { ...props } />
-					{ hasCustomClassName && props.isSelected && (
-						<CustomClassNameControls
-							attributes={ props.attributes }
-							setAttributes={ props.setAttributes }
-						/>
-					) }
-				</>
-			);
-		};
+export default {
+	edit: CustomClassNameControlsPure,
+	addSaveProps,
+	attributeKeys: [ 'className' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, 'customClassName', true );
 	},
-	'withCustomClassNameControls'
-);
+};
 
 /**
  * Override props assigned to save component to inject the className, if block
@@ -114,7 +88,7 @@ export function addSaveProps( extraProps, blockType, attributes ) {
 		hasBlockSupport( blockType, 'customClassName', true ) &&
 		attributes.className
 	) {
-		extraProps.className = classnames(
+		extraProps.className = clsx(
 			extraProps.className,
 			attributes.className
 		);
@@ -167,16 +141,6 @@ addFilter(
 	'core/editor/custom-class-name/attribute',
 	addAttribute
 );
-addFilter(
-	'editor.BlockEdit',
-	'core/editor/custom-class-name/with-inspector-controls',
-	withCustomClassNameControls
-);
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/editor/custom-class-name/save-props',
-	addSaveProps
-);
 
 addFilter(
 	'blocks.switchToBlockType.transformedBlock',
diff --git a/packages/block-editor/src/hooks/custom-class-name.native.js b/packages/block-editor/src/hooks/custom-class-name.native.js
index 65ba2505053755..b3f153b2bdad13 100644
--- a/packages/block-editor/src/hooks/custom-class-name.native.js
+++ b/packages/block-editor/src/hooks/custom-class-name.native.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -46,7 +46,7 @@ export function addSaveProps( extraProps, blockType, attributes ) {
 		hasBlockSupport( blockType, 'customClassName', true ) &&
 		attributes.className
 	) {
-		extraProps.className = classnames(
+		extraProps.className = clsx(
 			extraProps.className,
 			attributes.className
 		);
@@ -60,8 +60,11 @@ addFilter(
 	'core/custom-class-name/attribute',
 	addAttribute
 );
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/custom-class-name/save-props',
-	addSaveProps
-);
+
+export default {
+	addSaveProps,
+	attributeKeys: [ 'className' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, 'customClassName', true );
+	},
+};
diff --git a/packages/block-editor/src/hooks/custom-fields.js b/packages/block-editor/src/hooks/custom-fields.js
deleted file mode 100644
index 8ab816abc7352a..00000000000000
--- a/packages/block-editor/src/hooks/custom-fields.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { addFilter } from '@wordpress/hooks';
-import { PanelBody, TextControl } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
-import { hasBlockSupport } from '@wordpress/blocks';
-import { createHigherOrderComponent } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { InspectorControls } from '../components';
-import { useBlockEditingMode } from '../components/block-editing-mode';
-
-/**
- * Filters registered block settings, extending attributes to include `connections`.
- *
- * @param {Object} settings Original block settings.
- *
- * @return {Object} Filtered block settings.
- */
-function addAttribute( settings ) {
-	if ( hasBlockSupport( settings, '__experimentalConnections', true ) ) {
-		// Gracefully handle if settings.attributes.connections is undefined.
-		settings.attributes = {
-			...settings.attributes,
-			connections: {
-				type: 'object',
-			},
-		};
-	}
-
-	return settings;
-}
-
-function CustomFieldsControl( props ) {
-	const blockEditingMode = useBlockEditingMode();
-	if ( blockEditingMode !== 'default' ) {
-		return null;
-	}
-
-	// If the block is a paragraph or image block, we need to know which
-	// attribute to use for the connection. Only the `content` attribute
-	// of the paragraph block and the `url` attribute of the image block are supported.
-	let attributeName;
-	if ( props.name === 'core/paragraph' ) attributeName = 'content';
-	if ( props.name === 'core/image' ) attributeName = 'url';
-
-	return (
-		<InspectorControls>
-			<PanelBody title={ __( 'Connections' ) } initialOpen={ true }>
-				<TextControl
-					__nextHasNoMarginBottom
-					autoComplete="off"
-					label={ __( 'Custom field meta_key' ) }
-					value={
-						props.attributes?.connections?.attributes?.[
-							attributeName
-						]?.value || ''
-					}
-					onChange={ ( nextValue ) => {
-						if ( nextValue === '' ) {
-							props.setAttributes( {
-								connections: undefined,
-								[ attributeName ]: undefined,
-								placeholder: undefined,
-							} );
-						} else {
-							props.setAttributes( {
-								connections: {
-									attributes: {
-										// The attributeName will be either `content` or `url`.
-										[ attributeName ]: {
-											// Source will be variable, could be post_meta, user_meta, term_meta, etc.
-											// Could even be a custom source like a social media attribute.
-											source: 'meta_fields',
-											value: nextValue,
-										},
-									},
-								},
-								[ attributeName ]: undefined,
-								placeholder: sprintf(
-									'This content will be replaced on the frontend by the value of "%s" custom field.',
-									nextValue
-								),
-							} );
-						}
-					} }
-				/>
-			</PanelBody>
-		</InspectorControls>
-	);
-}
-
-/**
- * Override the default edit UI to include a new block inspector control for
- * assigning a connection to blocks that has support for connections.
- * Currently, only the `core/paragraph` block is supported and there is only a relation
- * between paragraph content and a custom field.
- *
- * @param {Component} BlockEdit Original component.
- *
- * @return {Component} Wrapped component.
- */
-const withCustomFieldsControls = createHigherOrderComponent( ( BlockEdit ) => {
-	return ( props ) => {
-		const hasCustomFieldsSupport = hasBlockSupport(
-			props.name,
-			'__experimentalConnections',
-			false
-		);
-
-		// Check if the current block is a paragraph or image block.
-		// Currently, only these two blocks are supported.
-		if ( ! [ 'core/paragraph', 'core/image' ].includes( props.name ) ) {
-			return <BlockEdit key="edit" { ...props } />;
-		}
-
-		return (
-			<>
-				<BlockEdit key="edit" { ...props } />
-				{ hasCustomFieldsSupport && props.isSelected && (
-					<CustomFieldsControl { ...props } />
-				) }
-			</>
-		);
-	};
-}, 'withCustomFieldsControls' );
-
-if (
-	window.__experimentalConnections ||
-	window.__experimentalPatternPartialSyncing
-) {
-	addFilter(
-		'blocks.registerBlockType',
-		'core/editor/connections/attribute',
-		addAttribute
-	);
-}
-if ( window.__experimentalConnections ) {
-	addFilter(
-		'editor.BlockEdit',
-		'core/editor/connections/with-inspector-controls',
-		withCustomFieldsControls
-	);
-}
diff --git a/packages/block-editor/src/hooks/dimensions.js b/packages/block-editor/src/hooks/dimensions.js
index 4e2b17f363bddf..ffa4048b7740e3 100644
--- a/packages/block-editor/src/hooks/dimensions.js
+++ b/packages/block-editor/src/hooks/dimensions.js
@@ -1,11 +1,15 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
 /**
  * WordPress dependencies
  */
-import { useState, useEffect, useCallback } from '@wordpress/element';
+import { Platform, useState, useEffect, useCallback } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { getBlockSupport } from '@wordpress/blocks';
 import deprecated from '@wordpress/deprecated';
-import { pure } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -15,12 +19,10 @@ import {
 	DimensionsPanel as StylesDimensionsPanel,
 	useHasDimensionsPanel,
 } from '../components/global-styles';
-import { MarginVisualizer } from './margin';
-import { PaddingVisualizer } from './padding';
+import { MarginVisualizer, PaddingVisualizer } from './spacing-visualizer';
 import { store as blockEditorStore } from '../store';
 import { unlock } from '../lock-unlock';
-
-import { cleanEmptyObject, useBlockSettings } from './utils';
+import { cleanEmptyObject, shouldSkipSerialization } from './utils';
 
 export const DIMENSIONS_SUPPORT_KEY = 'dimensions';
 export const SPACING_SUPPORT_KEY = 'spacing';
@@ -66,13 +68,7 @@ function DimensionsInspectorControl( { children, resetAllFilter } ) {
 	);
 }
 
-function DimensionsPanelPure( {
-	clientId,
-	name,
-	setAttributes,
-	__unstableParentLayout,
-} ) {
-	const settings = useBlockSettings( name, __unstableParentLayout );
+export function DimensionsPanel( { clientId, name, setAttributes, settings } ) {
 	const isEnabled = useHasDimensionsPanel( settings );
 	const value = useSelect(
 		( select ) =>
@@ -132,7 +128,72 @@ function DimensionsPanelPure( {
 	);
 }
 
-export const DimensionsPanel = pure( DimensionsPanelPure );
+/**
+ * Determine whether there is block support for dimensions.
+ *
+ * @param {string} blockName Block name.
+ * @param {string} feature   Background image feature to check for.
+ *
+ * @return {boolean} Whether there is support.
+ */
+export function hasDimensionsSupport( blockName, feature = 'any' ) {
+	if ( Platform.OS !== 'web' ) {
+		return false;
+	}
+
+	const support = getBlockSupport( blockName, DIMENSIONS_SUPPORT_KEY );
+
+	if ( support === true ) {
+		return true;
+	}
+
+	if ( feature === 'any' ) {
+		return !! ( support?.aspectRatio || !! support?.minHeight );
+	}
+
+	return !! support?.[ feature ];
+}
+
+export default {
+	useBlockProps,
+	attributeKeys: [ 'minHeight', 'style' ],
+	hasSupport( name ) {
+		return hasDimensionsSupport( name, 'aspectRatio' );
+	},
+};
+
+function useBlockProps( { name, minHeight, style } ) {
+	if (
+		! hasDimensionsSupport( name, 'aspectRatio' ) ||
+		shouldSkipSerialization( name, DIMENSIONS_SUPPORT_KEY, 'aspectRatio' )
+	) {
+		return {};
+	}
+
+	const className = clsx( {
+		'has-aspect-ratio': !! style?.dimensions?.aspectRatio,
+	} );
+
+	// Allow dimensions-based inline style overrides to override any global styles rules that
+	// might be set for the block, and therefore affect the display of the aspect ratio.
+	const inlineStyleOverrides = {};
+
+	// Apply rules to unset incompatible styles.
+	// Note that a set `aspectRatio` will win out if both an aspect ratio and a minHeight are set.
+	// This is because the aspect ratio is a newer block support, so (in theory) any aspect ratio
+	// that is set should be intentional and should override any existing minHeight. The Cover block
+	// and dimensions controls have logic that will manually clear the aspect ratio if a minHeight
+	// is set.
+	if ( style?.dimensions?.aspectRatio ) {
+		// To ensure the aspect ratio does not get overridden by `minHeight` unset any existing rule.
+		inlineStyleOverrides.minHeight = 'unset';
+	} else if ( minHeight || style?.dimensions?.minHeight ) {
+		// To ensure the minHeight does not get overridden by `aspectRatio` unset any existing rule.
+		inlineStyleOverrides.aspectRatio = 'unset';
+	}
+
+	return { className, style: inlineStyleOverrides };
+}
 
 /**
  * @deprecated
diff --git a/packages/block-editor/src/hooks/duotone.js b/packages/block-editor/src/hooks/duotone.js
index 5442e394e68c78..dbd47831c42668 100644
--- a/packages/block-editor/src/hooks/duotone.js
+++ b/packages/block-editor/src/hooks/duotone.js
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
 import { extend } from 'colord';
 import namesPlugin from 'colord/plugins/names';
 
@@ -13,7 +12,7 @@ import {
 	getBlockType,
 	hasBlockSupport,
 } from '@wordpress/blocks';
-import { createHigherOrderComponent, useInstanceId } from '@wordpress/compose';
+import { useInstanceId } from '@wordpress/compose';
 import { addFilter } from '@wordpress/hooks';
 import { useMemo, useEffect } from '@wordpress/element';
 
@@ -33,10 +32,10 @@ import {
 } from '../components/duotone/utils';
 import { getBlockCSSSelector } from '../components/global-styles/get-block-css-selector';
 import { scopeSelector } from '../components/global-styles/utils';
-import { useBlockSettings, useStyleOverride } from './utils';
+import { useBlockSettings, usePrivateStyleOverride } from './utils';
 import { default as StylesFiltersPanel } from '../components/global-styles/filters-panel';
 import { useBlockEditingMode } from '../components/block-editing-mode';
-import { __unstableUseBlockElement as useBlockElement } from '../components/block-list/use-block-props/use-block-refs';
+import { useBlockElement } from '../components/block-list/use-block-props/use-block-refs';
 
 const EMPTY_ARRAY = [];
 
@@ -95,8 +94,7 @@ export function getDuotonePresetFromColors( colors, duotonePalette ) {
 	return preset ? `var:preset|duotone|${ preset.slug }` : undefined;
 }
 
-function DuotonePanel( { attributes, setAttributes, name } ) {
-	const style = attributes?.style;
+function DuotonePanelPure( { style, setAttributes, name } ) {
 	const duotoneStyle = style?.color?.duotone;
 	const settings = useBlockSettings( name );
 	const blockEditingMode = useBlockEditingMode();
@@ -176,6 +174,16 @@ function DuotonePanel( { attributes, setAttributes, name } ) {
 	);
 }
 
+export default {
+	shareWithChildBlocks: true,
+	edit: DuotonePanelPure,
+	useBlockProps,
+	attributeKeys: [ 'style' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, 'filter.duotone' );
+	},
+};
+
 /**
  * Filters registered block settings, extending attributes to include
  * the `duotone` attribute.
@@ -204,38 +212,7 @@ function addDuotoneAttributes( settings ) {
 	return settings;
 }
 
-/**
- * Override the default edit UI to include toolbar controls for duotone if the
- * block supports duotone.
- *
- * @param {Function} BlockEdit Original component.
- *
- * @return {Function} Wrapped component.
- */
-const withDuotoneControls = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		// Previous `color.__experimentalDuotone` support flag is migrated via
-		// block_type_metadata_settings filter in `lib/block-supports/duotone.php`.
-		const hasDuotoneSupport = hasBlockSupport(
-			props.name,
-			'filter.duotone'
-		);
-
-		// CAUTION: code added before this line will be executed
-		// for all blocks, not just those that support duotone. Code added
-		// above this line should be carefully evaluated for its impact on
-		// performance.
-		return (
-			<>
-				{ hasDuotoneSupport && <DuotonePanel { ...props } /> }
-				<BlockEdit { ...props } />
-			</>
-		);
-	},
-	'withDuotoneControls'
-);
-
-function DuotoneStyles( {
+function useDuotoneStyles( {
 	clientId,
 	id: filterId,
 	selector: duotoneSelector,
@@ -274,10 +251,6 @@ function DuotoneStyles( {
 	const selectors = duotoneSelector.split( ',' );
 
 	const selectorsScoped = selectors.map( ( selectorPart ) => {
-		// Extra .editor-styles-wrapper specificity is needed in the editor
-		// since we're not using inline styles to apply the filter. We need to
-		// override duotone applied by global styles and theme.json.
-
 		// Assuming the selector part is a subclass selector (not a tag name)
 		// so we can prepend the filter id class. If we want to support elements
 		// such as `img` or namespaces, we'll need to add a case for that here.
@@ -288,7 +261,7 @@ function DuotoneStyles( {
 
 	const isValidFilter = Array.isArray( colors ) || colors === 'unset';
 
-	useStyleOverride(
+	usePrivateStyleOverride(
 		isValidFilter
 			? {
 					css:
@@ -299,7 +272,7 @@ function DuotoneStyles( {
 			  }
 			: undefined
 	);
-	useStyleOverride(
+	usePrivateStyleOverride(
 		isValidFilter
 			? {
 					assets:
@@ -314,122 +287,97 @@ function DuotoneStyles( {
 	const blockElement = useBlockElement( clientId );
 
 	useEffect( () => {
-		if ( ! isValidFilter ) return;
+		if ( ! isValidFilter ) {
+			return;
+		}
 
-		// Safari does not always update the duotone filter when the duotone colors
-		// are changed. When using Safari, force the block element to be repainted by
-		// the browser to ensure any changes are reflected visually. This logic matches
-		// that used on the site frontend in `block-supports/duotone.php`.
+		// Safari does not always update the duotone filter when the duotone
+		// colors are changed. When using Safari, force the block element to be
+		// repainted by the browser to ensure any changes are reflected
+		// visually. This logic matches that used on the site frontend in
+		// `block-supports/duotone.php`.
 		if ( blockElement && isSafari ) {
 			const display = blockElement.style.display;
-			// Switch to `inline-block` to force a repaint. In the editor, `inline-block`
-			// is used instead of `none` to ensure that scroll position is not affected,
-			// as `none` results in the editor scrolling to the top of the block.
+			// Switch to `inline-block` to force a repaint. In the editor,
+			// `inline-block` is used instead of `none` to ensure that scroll
+			// position is not affected, as `none` results in the editor
+			// scrolling to the top of the block.
 			blockElement.style.display = 'inline-block';
-			// Simply accessing el.offsetHeight flushes layout and style
-			// changes in WebKit without having to wait for setTimeout.
+			// Simply accessing el.offsetHeight flushes layout and style changes
+			// in WebKit without having to wait for setTimeout.
 			// eslint-disable-next-line no-unused-expressions
 			blockElement.offsetHeight;
 			blockElement.style.display = display;
 		}
-	}, [ isValidFilter, blockElement ] );
-
-	return null;
+		// `colors` must be a dependency so this effect runs when the colors
+		// change in Safari.
+	}, [ isValidFilter, blockElement, colors ] );
 }
 
-/**
- * Override the default block element to include duotone styles.
- *
- * @param {Function} BlockListBlock Original component.
- *
- * @return {Function} Wrapped component.
- */
-const withDuotoneStyles = createHigherOrderComponent(
-	( BlockListBlock ) => ( props ) => {
-		const id = useInstanceId( BlockListBlock );
-
-		const selector = useMemo( () => {
-			const blockType = getBlockType( props.name );
-
-			if ( blockType ) {
-				// Backwards compatibility for `supports.color.__experimentalDuotone`
-				// is provided via the `block_type_metadata_settings` filter. If
-				// `supports.filter.duotone` has not been set and the
-				// experimental property has been, the experimental property
-				// value is copied into `supports.filter.duotone`.
-				const duotoneSupport = getBlockSupport(
-					blockType,
-					'filter.duotone',
-					false
-				);
-				if ( ! duotoneSupport ) {
-					return null;
-				}
-
-				// If the experimental duotone support was set, that value is
-				// to be treated as a selector and requires scoping.
-				const experimentalDuotone = getBlockSupport(
-					blockType,
-					'color.__experimentalDuotone',
-					false
-				);
-				if ( experimentalDuotone ) {
-					const rootSelector = getBlockCSSSelector( blockType );
-					return typeof experimentalDuotone === 'string'
-						? scopeSelector( rootSelector, experimentalDuotone )
-						: rootSelector;
-				}
-
-				// Regular filter.duotone support uses filter.duotone selectors with fallbacks.
-				return getBlockCSSSelector( blockType, 'filter.duotone', {
-					fallback: true,
-				} );
+// Used for generating the instance ID
+const DUOTONE_BLOCK_PROPS_REFERENCE = {};
+
+function useBlockProps( { clientId, name, style } ) {
+	const id = useInstanceId( DUOTONE_BLOCK_PROPS_REFERENCE );
+	const selector = useMemo( () => {
+		const blockType = getBlockType( name );
+
+		if ( blockType ) {
+			// Backwards compatibility for `supports.color.__experimentalDuotone`
+			// is provided via the `block_type_metadata_settings` filter. If
+			// `supports.filter.duotone` has not been set and the
+			// experimental property has been, the experimental property
+			// value is copied into `supports.filter.duotone`.
+			const duotoneSupport = getBlockSupport(
+				blockType,
+				'filter.duotone',
+				false
+			);
+			if ( ! duotoneSupport ) {
+				return null;
 			}
-		}, [ props.name ] );
-
-		const attribute = props?.attributes?.style?.color?.duotone;
-
-		const filterClass = `wp-duotone-${ id }`;
-
-		const shouldRender = selector && attribute;
-
-		const className = shouldRender
-			? classnames( props?.className, filterClass )
-			: props?.className;
-
-		// CAUTION: code added before this line will be executed
-		// for all blocks, not just those that support duotone. Code added
-		// above this line should be carefully evaluated for its impact on
-		// performance.
-		return (
-			<>
-				{ shouldRender && (
-					<DuotoneStyles
-						clientId={ props.clientId }
-						id={ filterClass }
-						selector={ selector }
-						attribute={ attribute }
-					/>
-				) }
-				<BlockListBlock { ...props } className={ className } />
-			</>
-		);
-	},
-	'withDuotoneStyles'
-);
+
+			// If the experimental duotone support was set, that value is
+			// to be treated as a selector and requires scoping.
+			const experimentalDuotone = getBlockSupport(
+				blockType,
+				'color.__experimentalDuotone',
+				false
+			);
+			if ( experimentalDuotone ) {
+				const rootSelector = getBlockCSSSelector( blockType );
+				return typeof experimentalDuotone === 'string'
+					? scopeSelector( rootSelector, experimentalDuotone )
+					: rootSelector;
+			}
+
+			// Regular filter.duotone support uses filter.duotone selectors with fallbacks.
+			return getBlockCSSSelector( blockType, 'filter.duotone', {
+				fallback: true,
+			} );
+		}
+	}, [ name ] );
+
+	const attribute = style?.color?.duotone;
+
+	const filterClass = `wp-duotone-${ id }`;
+
+	const shouldRender = selector && attribute;
+
+	useDuotoneStyles( {
+		clientId,
+		id: filterClass,
+		selector,
+		attribute,
+	} );
+
+	return {
+		className: shouldRender ? filterClass : '',
+	};
+}
 
 addFilter(
 	'blocks.registerBlockType',
 	'core/editor/duotone/add-attributes',
 	addDuotoneAttributes
 );
-addFilter(
-	'editor.BlockEdit',
-	'core/editor/duotone/with-editor-controls',
-	withDuotoneControls
-);
-addFilter(
-	'editor.BlockListBlock',
-	'core/editor/duotone/with-styles',
-	withDuotoneStyles
-);
diff --git a/packages/block-editor/src/hooks/font-family.js b/packages/block-editor/src/hooks/font-family.js
index 0988b285564d3e..ba9a66a8bcf04f 100644
--- a/packages/block-editor/src/hooks/font-family.js
+++ b/packages/block-editor/src/hooks/font-family.js
@@ -4,15 +4,17 @@
 import { addFilter } from '@wordpress/hooks';
 import { hasBlockSupport } from '@wordpress/blocks';
 import TokenList from '@wordpress/token-list';
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import { shouldSkipSerialization } from './utils';
 import { TYPOGRAPHY_SUPPORT_KEY } from './typography';
-import { kebabCase } from '../utils/object';
+import { unlock } from '../lock-unlock';
 
 export const FONT_FAMILY_SUPPORT_KEY = 'typography.__experimentalFontFamily';
+const { kebabCase } = unlock( componentsPrivateApis );
 
 /**
  * Filters registered block settings, extending attributes to include
@@ -74,31 +76,19 @@ function addSaveProps( props, blockType, attributes ) {
 	return props;
 }
 
-/**
- * Filters registered block settings to expand the block edit wrapper
- * by applying the desired styles and classnames.
- *
- * @param {Object} settings Original block settings.
- *
- * @return {Object} Filtered block settings.
- */
-function addEditProps( settings ) {
-	if ( ! hasBlockSupport( settings, FONT_FAMILY_SUPPORT_KEY ) ) {
-		return settings;
-	}
-
-	const existingGetEditWrapperProps = settings.getEditWrapperProps;
-	settings.getEditWrapperProps = ( attributes ) => {
-		let props = {};
-		if ( existingGetEditWrapperProps ) {
-			props = existingGetEditWrapperProps( attributes );
-		}
-		return addSaveProps( props, settings, attributes );
-	};
-
-	return settings;
+function useBlockProps( { name, fontFamily } ) {
+	return addSaveProps( {}, name, { fontFamily } );
 }
 
+export default {
+	useBlockProps,
+	addSaveProps,
+	attributeKeys: [ 'fontFamily' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, FONT_FAMILY_SUPPORT_KEY );
+	},
+};
+
 /**
  * Resets the font family block support attribute. This can be used when
  * disabling the font family support controls for a block via a progressive
@@ -116,15 +106,3 @@ addFilter(
 	'core/fontFamily/addAttribute',
 	addAttributes
 );
-
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/fontFamily/addSaveProps',
-	addSaveProps
-);
-
-addFilter(
-	'blocks.registerBlockType',
-	'core/fontFamily/addEditProps',
-	addEditProps
-);
diff --git a/packages/block-editor/src/hooks/font-size.js b/packages/block-editor/src/hooks/font-size.js
index 146abe1d1f72f6..e0f8c47c163b07 100644
--- a/packages/block-editor/src/hooks/font-size.js
+++ b/packages/block-editor/src/hooks/font-size.js
@@ -4,8 +4,6 @@
 import { addFilter } from '@wordpress/hooks';
 import { hasBlockSupport } from '@wordpress/blocks';
 import TokenList from '@wordpress/token-list';
-import { createHigherOrderComponent } from '@wordpress/compose';
-import { select } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -23,11 +21,7 @@ import {
 	shouldSkipSerialization,
 } from './utils';
 import { useSettings } from '../components/use-settings';
-import { store as blockEditorStore } from '../store';
-import {
-	getTypographyFontSizeValue,
-	getFluidTypographyOptionsFromSettings,
-} from '../components/global-styles/typography-utils';
+import { getTypographyFontSizeValue } from '../components/global-styles/typography-utils';
 
 export const FONT_SIZE_SUPPORT_KEY = 'typography.fontSize';
 
@@ -59,19 +53,23 @@ function addAttributes( settings ) {
 /**
  * Override props assigned to save component to inject font size.
  *
- * @param {Object} props      Additional props applied to save element.
- * @param {Object} blockType  Block type.
- * @param {Object} attributes Block attributes.
+ * @param {Object} props           Additional props applied to save element.
+ * @param {Object} blockNameOrType Block type.
+ * @param {Object} attributes      Block attributes.
  *
  * @return {Object} Filtered props applied to save element.
  */
-function addSaveProps( props, blockType, attributes ) {
-	if ( ! hasBlockSupport( blockType, FONT_SIZE_SUPPORT_KEY ) ) {
+function addSaveProps( props, blockNameOrType, attributes ) {
+	if ( ! hasBlockSupport( blockNameOrType, FONT_SIZE_SUPPORT_KEY ) ) {
 		return props;
 	}
 
 	if (
-		shouldSkipSerialization( blockType, TYPOGRAPHY_SUPPORT_KEY, 'fontSize' )
+		shouldSkipSerialization(
+			blockNameOrType,
+			TYPOGRAPHY_SUPPORT_KEY,
+			'fontSize'
+		)
 	) {
 		return props;
 	}
@@ -85,31 +83,6 @@ function addSaveProps( props, blockType, attributes ) {
 	return props;
 }
 
-/**
- * Filters registered block settings to expand the block edit wrapper
- * by applying the desired styles and classnames.
- *
- * @param {Object} settings Original block settings.
- *
- * @return {Object} Filtered block settings.
- */
-function addEditProps( settings ) {
-	if ( ! hasBlockSupport( settings, FONT_SIZE_SUPPORT_KEY ) ) {
-		return settings;
-	}
-
-	const existingGetEditWrapperProps = settings.getEditWrapperProps;
-	settings.getEditWrapperProps = ( attributes ) => {
-		let props = {};
-		if ( existingGetEditWrapperProps ) {
-			props = existingGetEditWrapperProps( attributes );
-		}
-		return addSaveProps( props, settings, attributes );
-	};
-
-	return settings;
-}
-
 /**
  * Inspector control panel containing the font size related configuration
  *
@@ -155,7 +128,6 @@ export function FontSizeEdit( props ) {
 			withReset={ false }
 			withSlider
 			size="__unstable-large"
-			__nextHasNoMarginBottom
 		/>
 	);
 }
@@ -175,62 +147,71 @@ export function useIsFontSizeDisabled( { name: blockName } = {} ) {
 	);
 }
 
-/**
- * Add inline styles for font sizes.
- * Ideally, this is not needed and themes load the font-size classes on the
- * editor.
- *
- * @param {Function} BlockListBlock Original component.
- *
- * @return {Function} Wrapped component.
- */
-const withFontSizeInlineStyles = createHigherOrderComponent(
-	( BlockListBlock ) => ( props ) => {
-		const [ fontSizes ] = useSettings( 'typography.fontSizes' );
-		const {
-			name: blockName,
-			attributes: { fontSize, style },
-			wrapperProps,
-		} = props;
+function useBlockProps( { name, fontSize, style } ) {
+	const [ fontSizes, fluidTypographySettings, layoutSettings ] = useSettings(
+		'typography.fontSizes',
+		'typography.fluid',
+		'layout'
+	);
 
-		// Only add inline styles if the block supports font sizes,
-		// doesn't skip serialization of font sizes,
-		// doesn't already have an inline font size,
-		// and does have a class to extract the font size from.
-		if (
-			! hasBlockSupport( blockName, FONT_SIZE_SUPPORT_KEY ) ||
-			shouldSkipSerialization(
-				blockName,
-				TYPOGRAPHY_SUPPORT_KEY,
-				'fontSize'
-			) ||
-			! fontSize ||
-			style?.typography?.fontSize
-		) {
-			return <BlockListBlock { ...props } />;
-		}
+	/*
+	 * Only add inline styles if the block supports font sizes,
+	 * doesn't skip serialization of font sizes,
+	 * and has either a custom font size or a preset font size.
+	 */
+	if (
+		! hasBlockSupport( name, FONT_SIZE_SUPPORT_KEY ) ||
+		shouldSkipSerialization( name, TYPOGRAPHY_SUPPORT_KEY, 'fontSize' ) ||
+		( ! fontSize && ! style?.typography?.fontSize )
+	) {
+		return;
+	}
 
-		const fontSizeValue = getFontSize(
-			fontSizes,
-			fontSize,
-			style?.typography?.fontSize
-		).size;
+	let props;
 
-		const newProps = {
-			...props,
-			wrapperProps: {
-				...wrapperProps,
-				style: {
-					fontSize: fontSizeValue,
-					...wrapperProps?.style,
-				},
+	if ( style?.typography?.fontSize ) {
+		props = {
+			style: {
+				fontSize: getTypographyFontSizeValue(
+					{ size: style.typography.fontSize },
+					{
+						typography: {
+							fluid: fluidTypographySettings,
+						},
+						layout: layoutSettings,
+					}
+				),
 			},
 		};
+	}
+
+	if ( fontSize ) {
+		props = {
+			style: {
+				fontSize: getFontSize(
+					fontSizes,
+					fontSize,
+					style?.typography?.fontSize
+				).size,
+			},
+		};
+	}
+
+	if ( ! props ) {
+		return;
+	}
+
+	return addSaveProps( props, name, { fontSize } );
+}
 
-		return <BlockListBlock { ...newProps } />;
+export default {
+	useBlockProps,
+	addSaveProps,
+	attributeKeys: [ 'fontSize', 'style' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, FONT_SIZE_SUPPORT_KEY );
 	},
-	'withFontSizeInlineStyles'
-);
+};
 
 const MIGRATION_PATHS = {
 	fontSize: [ [ 'fontSize' ], [ 'style', 'typography', 'fontSize' ] ],
@@ -254,101 +235,14 @@ function addTransforms( result, source, index, results ) {
 	);
 }
 
-/**
- * Allow custom font sizes to appear fluid when fluid typography is enabled at
- * the theme level.
- *
- * Adds a custom getEditWrapperProps() callback to all block types that support
- * font sizes. Then, if fluid typography is enabled, this callback will swap any
- * custom font size in style.fontSize with a fluid font size (i.e. one that uses
- * clamp()).
- *
- * It's important that this hook runs after 'core/style/addEditProps' sets
- * style.fontSize as otherwise fontSize will be overwritten.
- *
- * @param {Object} blockType Block settings object.
- */
-function addEditPropsForFluidCustomFontSizes( blockType ) {
-	if (
-		! hasBlockSupport( blockType, FONT_SIZE_SUPPORT_KEY ) ||
-		shouldSkipSerialization( blockType, TYPOGRAPHY_SUPPORT_KEY, 'fontSize' )
-	) {
-		return blockType;
-	}
-
-	const existingGetEditWrapperProps = blockType.getEditWrapperProps;
-
-	blockType.getEditWrapperProps = ( attributes ) => {
-		const wrapperProps = existingGetEditWrapperProps
-			? existingGetEditWrapperProps( attributes )
-			: {};
-
-		const fontSize = wrapperProps?.style?.fontSize;
-
-		// TODO: This sucks! We should be using useSetting( 'typography.fluid' )
-		// or even useSelect( blockEditorStore ). We can't do either here
-		// because getEditWrapperProps is a plain JavaScript function called by
-		// BlockListBlock and not a React component rendered within
-		// BlockListContext.Provider. If we set fontSize using editor.
-		// BlockListBlock instead of using getEditWrapperProps then the value is
-		// clobbered when the core/style/addEditProps filter runs.
-		const fluidTypographySettings = getFluidTypographyOptionsFromSettings(
-			select( blockEditorStore ).getSettings().__experimentalFeatures
-		);
-		const newFontSize = fontSize
-			? getTypographyFontSizeValue(
-					{ size: fontSize },
-					fluidTypographySettings
-			  )
-			: null;
-
-		if ( newFontSize === null ) {
-			return wrapperProps;
-		}
-
-		return {
-			...wrapperProps,
-			style: {
-				...wrapperProps?.style,
-				fontSize: newFontSize,
-			},
-		};
-	};
-
-	return blockType;
-}
-
 addFilter(
 	'blocks.registerBlockType',
 	'core/font/addAttribute',
 	addAttributes
 );
 
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/font/addSaveProps',
-	addSaveProps
-);
-
-addFilter( 'blocks.registerBlockType', 'core/font/addEditProps', addEditProps );
-
-addFilter(
-	'editor.BlockListBlock',
-	'core/font-size/with-font-size-inline-styles',
-	withFontSizeInlineStyles
-);
-
 addFilter(
 	'blocks.switchToBlockType.transformedBlock',
 	'core/font-size/addTransforms',
 	addTransforms
 );
-
-addFilter(
-	'blocks.registerBlockType',
-	'core/font-size/addEditPropsForFluidCustomFontSizes',
-	addEditPropsForFluidCustomFontSizes,
-	// Run after 'core/style/addEditProps' so that the style object has already
-	// been translated into inline CSS.
-	11
-);
diff --git a/packages/block-editor/src/hooks/grid-visualizer.js b/packages/block-editor/src/hooks/grid-visualizer.js
new file mode 100644
index 00000000000000..26650c85ea5094
--- /dev/null
+++ b/packages/block-editor/src/hooks/grid-visualizer.js
@@ -0,0 +1,76 @@
+/**
+ * WordPress dependencies
+ */
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { addFilter } from '@wordpress/hooks';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { GridVisualizer, useGridLayoutSync } from '../components/grid';
+import { store as blockEditorStore } from '../store';
+
+function GridLayoutSync( props ) {
+	useGridLayoutSync( props );
+}
+
+function GridTools( { clientId, layout } ) {
+	const isVisible = useSelect(
+		( select ) => {
+			const {
+				isBlockSelected,
+				isDraggingBlocks,
+				getTemplateLock,
+				getBlockEditingMode,
+			} = select( blockEditorStore );
+
+			// These calls are purposely ordered from least expensive to most expensive.
+			// Hides the visualizer in cases where the user is not or cannot interact with it.
+			if (
+				( ! isDraggingBlocks() && ! isBlockSelected( clientId ) ) ||
+				getTemplateLock( clientId ) ||
+				getBlockEditingMode( clientId ) !== 'default'
+			) {
+				return false;
+			}
+
+			return true;
+		},
+		[ clientId ]
+	);
+
+	return (
+		<>
+			<GridLayoutSync clientId={ clientId } />
+			{ isVisible && (
+				<GridVisualizer clientId={ clientId } parentLayout={ layout } />
+			) }
+		</>
+	);
+}
+
+const addGridVisualizerToBlockEdit = createHigherOrderComponent(
+	( BlockEdit ) => ( props ) => {
+		if ( props.attributes.layout?.type !== 'grid' ) {
+			return <BlockEdit key="edit" { ...props } />;
+		}
+
+		return (
+			<>
+				<GridTools
+					clientId={ props.clientId }
+					layout={ props.attributes.layout }
+				/>
+				<BlockEdit key="edit" { ...props } />
+			</>
+		);
+	},
+	'addGridVisualizerToBlockEdit'
+);
+
+addFilter(
+	'editor.BlockEdit',
+	'core/editor/grid-visualizer',
+	addGridVisualizerToBlockEdit
+);
diff --git a/packages/block-editor/src/hooks/index.js b/packages/block-editor/src/hooks/index.js
index c088216c0645cb..66ff60b691b66f 100644
--- a/packages/block-editor/src/hooks/index.js
+++ b/packages/block-editor/src/hooks/index.js
@@ -1,33 +1,94 @@
 /**
  * Internal dependencies
  */
+import {
+	createBlockEditFilter,
+	createBlockListBlockFilter,
+	createBlockSaveFilter,
+} from './utils';
 import './compat';
-import './align';
+import align from './align';
+import background from './background';
 import './lock';
-import './anchor';
-import './aria-label';
-import './custom-class-name';
+import anchor from './anchor';
+import ariaLabel from './aria-label';
+import customClassName from './custom-class-name';
 import './generated-class-name';
-import './style';
+import style from './style';
 import './settings';
-import './color';
-import './duotone';
-import './font-family';
-import './font-size';
-import './border';
-import './position';
-import './layout';
-import './content-lock-ui';
+import color from './color';
+import dimensions from './dimensions';
+import duotone from './duotone';
+import fontFamily from './font-family';
+import fontSize from './font-size';
+import textAlign from './text-align';
+import border from './border';
+import position from './position';
+import blockStyleVariation from './block-style-variation';
+import layout from './layout';
+import childLayout from './layout-child';
+import contentLockUI from './content-lock-ui';
 import './metadata';
-import './custom-fields';
-import './block-hooks';
+import blockHooks from './block-hooks';
+import blockBindingsPanel from './block-bindings';
 import './block-renaming';
+import './use-bindings-attributes';
+import './grid-visualizer';
+
+createBlockEditFilter(
+	[
+		align,
+		textAlign,
+		anchor,
+		customClassName,
+		style,
+		duotone,
+		position,
+		layout,
+		contentLockUI,
+		blockHooks,
+		blockBindingsPanel,
+		childLayout,
+	].filter( Boolean )
+);
+createBlockListBlockFilter( [
+	align,
+	textAlign,
+	background,
+	style,
+	color,
+	dimensions,
+	duotone,
+	fontFamily,
+	fontSize,
+	border,
+	position,
+	blockStyleVariation,
+	childLayout,
+] );
+createBlockSaveFilter( [
+	align,
+	textAlign,
+	anchor,
+	ariaLabel,
+	customClassName,
+	border,
+	color,
+	style,
+	fontFamily,
+	fontSize,
+] );
 
 export { useCustomSides } from './dimensions';
 export { useLayoutClasses, useLayoutStyles } from './layout';
 export { getBorderClassesAndStyles, useBorderProps } from './use-border-props';
+export { getShadowClassesAndStyles } from './use-shadow-props';
 export { getColorClassesAndStyles, useColorProps } from './use-color-props';
 export { getSpacingClassesAndStyles } from './use-spacing-props';
 export { getTypographyClassesAndStyles } from './use-typography-props';
 export { getGapCSSValue } from './gap';
 export { useCachedTruthy } from './use-cached-truthy';
+export { setBackgroundStyleDefaults } from './background';
+export { useZoomOut } from './use-zoom-out';
+export { __unstableBlockStyleVariationOverridesWithConfig } from './block-style-variation';
+export { useStyleOverride } from './utils';
diff --git a/packages/block-editor/src/hooks/index.native.js b/packages/block-editor/src/hooks/index.native.js
index 42bda25bfe1ccf..c7f9df868f2bd7 100644
--- a/packages/block-editor/src/hooks/index.native.js
+++ b/packages/block-editor/src/hooks/index.native.js
@@ -1,17 +1,34 @@
 /**
  * Internal dependencies
  */
+import {
+	createBlockEditFilter,
+	createBlockListBlockFilter,
+	createBlockSaveFilter,
+} from './utils';
 import './compat';
-import './align';
-import './anchor';
-import './custom-class-name';
+import align from './align';
+import anchor from './anchor';
+import customClassName from './custom-class-name';
 import './generated-class-name';
-import './style';
-import './color';
-import './font-size';
+import style from './style';
+import color from './color';
+import fontSize from './font-size';
 import './layout';
 
+createBlockEditFilter( [ align, anchor, style ] );
+createBlockListBlockFilter( [ align, style, color, fontSize ] );
+createBlockSaveFilter( [
+	align,
+	anchor,
+	customClassName,
+	color,
+	style,
+	fontSize,
+] );
+
 export { getBorderClassesAndStyles, useBorderProps } from './use-border-props';
+export { getShadowClassesAndStyles } from './use-shadow-props';
 export { getColorClassesAndStyles, useColorProps } from './use-color-props';
 export { getSpacingClassesAndStyles } from './use-spacing-props';
 export { useCachedTruthy } from './use-cached-truthy';
diff --git a/packages/block-editor/src/hooks/layout-child.js b/packages/block-editor/src/hooks/layout-child.js
new file mode 100644
index 00000000000000..7a8e039c689690
--- /dev/null
+++ b/packages/block-editor/src/hooks/layout-child.js
@@ -0,0 +1,286 @@
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId } from '@wordpress/compose';
+import { useSelect } from '@wordpress/data';
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../store';
+import { useStyleOverride } from './utils';
+import { useLayout } from '../components/block-list/layout';
+import {
+	GridVisualizer,
+	GridItemResizer,
+	GridItemMovers,
+} from '../components/grid';
+
+// Used for generating the instance ID
+const LAYOUT_CHILD_BLOCK_PROPS_REFERENCE = {};
+
+function useBlockPropsChildLayoutStyles( { style } ) {
+	const shouldRenderChildLayoutStyles = useSelect( ( select ) => {
+		return ! select( blockEditorStore ).getSettings().disableLayoutStyles;
+	} );
+	const layout = style?.layout ?? {};
+	const {
+		selfStretch,
+		flexSize,
+		columnStart,
+		rowStart,
+		columnSpan,
+		rowSpan,
+	} = layout;
+	const parentLayout = useLayout() || {};
+	const { columnCount, minimumColumnWidth } = parentLayout;
+	const id = useInstanceId( LAYOUT_CHILD_BLOCK_PROPS_REFERENCE );
+	const selector = `.wp-container-content-${ id }`;
+
+	// Check that the grid layout attributes are of the correct type, so that we don't accidentally
+	// write code that stores a string attribute instead of a number.
+	if ( process.env.NODE_ENV === 'development' ) {
+		if ( columnStart && typeof columnStart !== 'number' ) {
+			throw new Error( 'columnStart must be a number' );
+		}
+		if ( rowStart && typeof rowStart !== 'number' ) {
+			throw new Error( 'rowStart must be a number' );
+		}
+		if ( columnSpan && typeof columnSpan !== 'number' ) {
+			throw new Error( 'columnSpan must be a number' );
+		}
+		if ( rowSpan && typeof rowSpan !== 'number' ) {
+			throw new Error( 'rowSpan must be a number' );
+		}
+	}
+
+	let css = '';
+	if ( shouldRenderChildLayoutStyles ) {
+		if ( selfStretch === 'fixed' && flexSize ) {
+			css = `${ selector } {
+				flex-basis: ${ flexSize };
+				box-sizing: border-box;
+			}`;
+		} else if ( selfStretch === 'fill' ) {
+			css = `${ selector } {
+				flex-grow: 1;
+			}`;
+		} else if ( columnStart && columnSpan ) {
+			css = `${ selector } {
+				grid-column: ${ columnStart } / span ${ columnSpan };
+			}`;
+		} else if ( columnStart ) {
+			css = `${ selector } {
+				grid-column: ${ columnStart };
+			}`;
+		} else if ( columnSpan ) {
+			css = `${ selector } {
+				grid-column: span ${ columnSpan };
+			}`;
+		}
+		if ( rowStart && rowSpan ) {
+			css += `${ selector } {
+				grid-row: ${ rowStart } / span ${ rowSpan };
+			}`;
+		} else if ( rowStart ) {
+			css += `${ selector } {
+				grid-row: ${ rowStart };
+			}`;
+		} else if ( rowSpan ) {
+			css += `${ selector } {
+				grid-row: span ${ rowSpan };
+			}`;
+		}
+		/**
+		 * If minimumColumnWidth is set on the parent, or if no
+		 * columnCount is set, the grid is responsive so a
+		 * container query is needed for the span to resize.
+		 */
+		if (
+			( columnSpan || columnStart ) &&
+			( minimumColumnWidth || ! columnCount )
+		) {
+			let parentColumnValue = parseFloat( minimumColumnWidth );
+			/**
+			 * 12rem is the default minimumColumnWidth value.
+			 * If parentColumnValue is not a number, default to 12.
+			 */
+			if ( isNaN( parentColumnValue ) ) {
+				parentColumnValue = 12;
+			}
+
+			let parentColumnUnit = minimumColumnWidth?.replace(
+				parentColumnValue,
+				''
+			);
+			/**
+			 * Check that parent column unit is either 'px', 'rem' or 'em'.
+			 * If not, default to 'rem'.
+			 */
+			if ( ! [ 'px', 'rem', 'em' ].includes( parentColumnUnit ) ) {
+				parentColumnUnit = 'rem';
+			}
+
+			let numColsToBreakAt = 2;
+
+			if ( columnSpan && columnStart ) {
+				numColsToBreakAt = columnSpan + columnStart - 1;
+			} else if ( columnSpan ) {
+				numColsToBreakAt = columnSpan;
+			} else {
+				numColsToBreakAt = columnStart;
+			}
+
+			const defaultGapValue = parentColumnUnit === 'px' ? 24 : 1.5;
+			const containerQueryValue =
+				numColsToBreakAt * parentColumnValue +
+				( numColsToBreakAt - 1 ) * defaultGapValue;
+			// For blocks that only span one column, we want to remove any rowStart values as
+			// the container reduces in size, so that blocks are still arranged in markup order.
+			const minimumContainerQueryValue =
+				parentColumnValue * 2 + defaultGapValue - 1;
+			// If a span is set we want to preserve it as long as possible, otherwise we just reset the value.
+			const gridColumnValue =
+				columnSpan && columnSpan > 1 ? '1/-1' : 'auto';
+
+			css += `@container (max-width: ${ Math.max(
+				containerQueryValue,
+				minimumContainerQueryValue
+			) }${ parentColumnUnit }) {
+				${ selector } {
+					grid-column: ${ gridColumnValue };
+					grid-row: auto;
+				}
+			}`;
+		}
+	}
+
+	useStyleOverride( { css } );
+
+	// Only attach a container class if there is generated CSS to be attached.
+	if ( ! css ) {
+		return;
+	}
+
+	// Attach a `wp-container-content` id-based classname.
+	return { className: `wp-container-content-${ id }` };
+}
+
+function ChildLayoutControlsPure( { clientId, style, setAttributes } ) {
+	const parentLayout = useLayout() || {};
+	const {
+		type: parentLayoutType = 'default',
+		allowSizingOnChildren = false,
+		isManualPlacement,
+	} = parentLayout;
+
+	if ( parentLayoutType !== 'grid' ) {
+		return null;
+	}
+
+	return (
+		<GridTools
+			clientId={ clientId }
+			style={ style }
+			setAttributes={ setAttributes }
+			allowSizingOnChildren={ allowSizingOnChildren }
+			isManualPlacement={ isManualPlacement }
+			parentLayout={ parentLayout }
+		/>
+	);
+}
+
+function GridTools( {
+	clientId,
+	style,
+	setAttributes,
+	allowSizingOnChildren,
+	isManualPlacement,
+	parentLayout,
+} ) {
+	const { rootClientId, isVisible } = useSelect(
+		( select ) => {
+			const {
+				getBlockRootClientId,
+				getBlockEditingMode,
+				getTemplateLock,
+			} = select( blockEditorStore );
+
+			const _rootClientId = getBlockRootClientId( clientId );
+
+			if (
+				getTemplateLock( _rootClientId ) ||
+				getBlockEditingMode( _rootClientId ) !== 'default'
+			) {
+				return {
+					rootClientId: _rootClientId,
+					isVisible: false,
+				};
+			}
+
+			return {
+				rootClientId: _rootClientId,
+				isVisible: true,
+			};
+		},
+		[ clientId ]
+	);
+
+	// Use useState() instead of useRef() so that GridItemResizer updates when ref is set.
+	const [ resizerBounds, setResizerBounds ] = useState();
+
+	if ( ! isVisible ) {
+		return null;
+	}
+
+	function updateLayout( layout ) {
+		setAttributes( {
+			style: {
+				...style,
+				layout: {
+					...style?.layout,
+					...layout,
+				},
+			},
+		} );
+	}
+
+	return (
+		<>
+			<GridVisualizer
+				clientId={ rootClientId }
+				contentRef={ setResizerBounds }
+				parentLayout={ parentLayout }
+			/>
+			{ allowSizingOnChildren && (
+				<GridItemResizer
+					clientId={ clientId }
+					// Don't allow resizing beyond the grid visualizer.
+					bounds={ resizerBounds }
+					onChange={ updateLayout }
+					parentLayout={ parentLayout }
+				/>
+			) }
+			{ isManualPlacement &&
+				window.__experimentalEnableGridInteractivity && (
+					<GridItemMovers
+						layout={ style?.layout }
+						parentLayout={ parentLayout }
+						onChange={ updateLayout }
+						gridClientId={ rootClientId }
+						blockClientId={ clientId }
+					/>
+				) }
+		</>
+	);
+}
+
+export default {
+	useBlockProps: useBlockPropsChildLayoutStyles,
+	edit: ChildLayoutControlsPure,
+	attributeKeys: [ 'style' ],
+	hasSupport() {
+		return true;
+	},
+};
diff --git a/packages/block-editor/src/hooks/layout.js b/packages/block-editor/src/hooks/layout.js
index 171290e180ee95..54a376a0c6a4f7 100644
--- a/packages/block-editor/src/hooks/layout.js
+++ b/packages/block-editor/src/hooks/layout.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,10 +11,11 @@ import { addFilter } from '@wordpress/hooks';
 import { getBlockSupport, hasBlockSupport } from '@wordpress/blocks';
 import { useSelect } from '@wordpress/data';
 import {
-	Button,
-	ButtonGroup,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 	ToggleControl,
 	PanelBody,
+	privateApis as componentsPrivateApis,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
@@ -27,10 +28,11 @@ import { useSettings } from '../components/use-settings';
 import { getLayoutType, getLayoutTypes } from '../layouts';
 import { useBlockEditingMode } from '../components/block-editing-mode';
 import { LAYOUT_DEFINITIONS } from '../layouts/definitions';
-import { kebabCase } from '../utils/object';
 import { useBlockSettings, useStyleOverride } from './utils';
+import { unlock } from '../lock-unlock';
 
 const layoutBlockSupportKey = 'layout';
+const { kebabCase } = unlock( componentsPrivateApis );
 
 function hasLayoutBlockSupport( blockName ) {
 	return (
@@ -48,13 +50,7 @@ function hasLayoutBlockSupport( blockName ) {
  * @return { Array } Array of CSS classname strings.
  */
 export function useLayoutClasses( blockAttributes = {}, blockName = '' ) {
-	const rootPaddingAlignment = useSelect( ( select ) => {
-		const { getSettings } = select( blockEditorStore );
-		return getSettings().__experimentalFeatures
-			?.useRootPaddingAwareAlignments;
-	}, [] );
 	const { layout } = blockAttributes;
-
 	const { default: defaultBlockLayout } =
 		getBlockSupport( blockName, layoutBlockSupportKey ) || {};
 	const usedLayout =
@@ -76,12 +72,20 @@ export function useLayoutClasses( blockAttributes = {}, blockName = '' ) {
 		layoutClassnames.push( baseClassName, compoundClassName );
 	}
 
-	if (
-		( usedLayout?.inherit ||
-			usedLayout?.contentSize ||
-			usedLayout?.type === 'constrained' ) &&
-		rootPaddingAlignment
-	) {
+	const hasGlobalPadding = useSelect(
+		( select ) => {
+			return (
+				( usedLayout?.inherit ||
+					usedLayout?.contentSize ||
+					usedLayout?.type === 'constrained' ) &&
+				select( blockEditorStore ).getSettings().__experimentalFeatures
+					?.useRootPaddingAwareAlignments
+			);
+		},
+		[ usedLayout?.contentSize, usedLayout?.inherit, usedLayout?.type ]
+	);
+
+	if ( hasGlobalPadding ) {
 		layoutClassnames.push( 'has-global-padding' );
 	}
 
@@ -123,23 +127,24 @@ export function useLayoutStyles( blockAttributes = {}, blockName, selector ) {
 	const fullLayoutType = getLayoutType( usedLayout?.type || 'default' );
 	const [ blockGapSupport ] = useSettings( 'spacing.blockGap' );
 	const hasBlockGapSupport = blockGapSupport !== null;
-	const css = fullLayoutType?.getLayoutStyle?.( {
+	return fullLayoutType?.getLayoutStyle?.( {
 		blockName,
 		selector,
 		layout,
 		style,
 		hasBlockGapSupport,
 	} );
-	return css;
 }
 
-function LayoutPanel( { setAttributes, attributes, name: blockName } ) {
+function LayoutPanelPure( {
+	layout,
+	setAttributes,
+	name: blockName,
+	clientId,
+} ) {
 	const settings = useBlockSettings( blockName );
 	// Block settings come from theme.json under settings.[blockName].
 	const { layout: layoutSettings } = settings;
-	// Layout comes from block attributes.
-	const { layout } = attributes;
-	const [ defaultThemeLayout ] = useSettings( 'layout' );
 	const { themeSupportsLayout } = useSelect( ( select ) => {
 		const { getSettings } = select( blockEditorStore );
 		return {
@@ -173,36 +178,43 @@ function LayoutPanel( { setAttributes, attributes, name: blockName } ) {
 		return null;
 	}
 
+	/*
+	 * Try to find the layout type from either the
+	 * block's layout settings or any saved layout config.
+	 */
+	const blockSupportAndLayout = {
+		...layoutBlockSupport,
+		...layout,
+	};
+	const { type, default: { type: defaultType = 'default' } = {} } =
+		blockSupportAndLayout;
+	const blockLayoutType = type || defaultType;
+
 	// Only show the inherit toggle if it's supported,
-	// a default theme layout is set (e.g. one that provides `contentSize` and/or `wideSize` values),
 	// and either the default / flow or the constrained layout type is in use, as the toggle switches from one to the other.
 	const showInheritToggle = !! (
 		allowInheriting &&
-		!! defaultThemeLayout &&
-		( ! layout?.type ||
-			layout?.type === 'default' ||
-			layout?.type === 'constrained' ||
-			layout?.inherit )
+		( ! blockLayoutType ||
+			blockLayoutType === 'default' ||
+			blockLayoutType === 'constrained' ||
+			blockSupportAndLayout.inherit )
 	);
 
 	const usedLayout = layout || defaultBlockLayout || {};
-	const {
-		inherit = false,
-		type = 'default',
-		contentSize = null,
-	} = usedLayout;
+	const { inherit = false, contentSize = null } = usedLayout;
 	/**
 	 * `themeSupportsLayout` is only relevant to the `default/flow` or
 	 * `constrained` layouts and it should not be taken into account when other
 	 * `layout` types are used.
 	 */
 	if (
-		( type === 'default' || type === 'constrained' ) &&
+		( blockLayoutType === 'default' ||
+			blockLayoutType === 'constrained' ) &&
 		! themeSupportsLayout
 	) {
 		return null;
 	}
-	const layoutType = getLayoutType( type );
+	const layoutType = getLayoutType( blockLayoutType );
 	const constrainedType = getLayoutType( 'constrained' );
 	const displayControlsForLegacyLayouts =
 		! usedLayout.type && ( contentSize || inherit );
@@ -221,7 +233,6 @@ function LayoutPanel( { setAttributes, attributes, name: blockName } ) {
 						<>
 							<ToggleControl
 								__nextHasNoMarginBottom
-								className="block-editor-hooks__toggle-control"
 								label={ __( 'Inner blocks use content width' ) }
 								checked={
 									layoutType?.name === 'constrained' ||
@@ -255,7 +266,7 @@ function LayoutPanel( { setAttributes, attributes, name: blockName } ) {
 
 					{ ! inherit && allowSwitching && (
 						<LayoutTypeSwitcher
-							type={ type }
+							type={ blockLayoutType }
 							onChange={ onChangeType }
 						/>
 					) }
@@ -265,6 +276,8 @@ function LayoutPanel( { setAttributes, attributes, name: blockName } ) {
 							layout={ usedLayout }
 							onChange={ onChangeLayout }
 							layoutBlockSupport={ blockSupportAndThemeSettings }
+							name={ blockName }
+							clientId={ clientId }
 						/>
 					) }
 					{ constrainedType && displayControlsForLegacyLayouts && (
@@ -272,6 +285,8 @@ function LayoutPanel( { setAttributes, attributes, name: blockName } ) {
 							layout={ usedLayout }
 							onChange={ onChangeLayout }
 							layoutBlockSupport={ blockSupportAndThemeSettings }
+							name={ blockName }
+							clientId={ clientId }
 						/>
 					) }
 				</PanelBody>
@@ -281,27 +296,45 @@ function LayoutPanel( { setAttributes, attributes, name: blockName } ) {
 					layout={ usedLayout }
 					onChange={ onChangeLayout }
 					layoutBlockSupport={ layoutBlockSupport }
+					name={ blockName }
+					clientId={ clientId }
 				/>
 			) }
 		</>
 	);
 }
 
+export default {
+	shareWithChildBlocks: true,
+	edit: LayoutPanelPure,
+	attributeKeys: [ 'layout' ],
+	hasSupport( name ) {
+		return hasLayoutBlockSupport( name );
+	},
+};
+
 function LayoutTypeSwitcher( { type, onChange } ) {
 	return (
-		<ButtonGroup>
+		<ToggleGroupControl
+			__next40pxDefaultSize
+			isBlock
+			label={ __( 'Layout type' ) }
+			__nextHasNoMarginBottom
+			hideLabelFromVision
+			isAdaptiveWidth
+			value={ type }
+			onChange={ onChange }
+		>
 			{ getLayoutTypes().map( ( { name, label } ) => {
 				return (
-					<Button
+					<ToggleGroupControlOption
 						key={ name }
-						isPressed={ type === name }
-						onClick={ () => onChange( name ) }
-					>
-						{ label }
-					</Button>
+						value={ name }
+						label={ label }
+					/>
 				);
 			} ) }
-		</ButtonGroup>
+		</ToggleGroupControl>
 	);
 }
 
@@ -328,26 +361,12 @@ export function addAttribute( settings ) {
 	return settings;
 }
 
-/**
- * Override the default edit UI to include layout controls
- *
- * @param {Function} BlockEdit Original component.
- *
- * @return {Function} Wrapped component.
- */
-export const withLayoutControls = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const supportLayout = hasLayoutBlockSupport( props.name );
-
-		return [
-			supportLayout && <LayoutPanel key="layout" { ...props } />,
-			<BlockEdit key="edit" { ...props } />,
-		];
-	},
-	'withLayoutControls'
-);
-
-function BlockWithLayoutStyles( { block: BlockListBlock, props } ) {
+function BlockWithLayoutStyles( {
+	block: BlockListBlock,
+	props,
+	blockGapSupport,
+	layoutClasses,
+} ) {
 	const { name, attributes } = props;
 	const id = useInstanceId( BlockListBlock );
 	const { layout } = attributes;
@@ -357,12 +376,10 @@ function BlockWithLayoutStyles( { block: BlockListBlock, props } ) {
 		layout?.inherit || layout?.contentSize || layout?.wideSize
 			? { ...layout, type: 'constrained' }
 			: layout || defaultBlockLayout || {};
-	const layoutClasses = useLayoutClasses( attributes, name );
 
-	const selectorPrefix = `wp-container-${ kebabCase( name ) }-layout-`;
+	const selectorPrefix = `wp-container-${ kebabCase( name ) }-is-layout-`;
 	// Higher specificity to override defaults from theme.json.
-	const selector = `.${ selectorPrefix }${ id }.${ selectorPrefix }${ id }`;
-	const [ blockGapSupport ] = useSettings( 'spacing.blockGap' );
+	const selector = `.${ selectorPrefix }${ id }`;
 	const hasBlockGapSupport = blockGapSupport !== null;
 
 	// Get CSS string for the current layout type.
@@ -377,7 +394,7 @@ function BlockWithLayoutStyles( { block: BlockListBlock, props } ) {
 	} );
 
 	// Attach a `wp-container-` id-based class name as well as a layout class name such as `is-layout-flex`.
-	const layoutClassNames = classnames(
+	const layoutClassNames = clsx(
 		{
 			[ `${ selectorPrefix }${ id }` ]: !! css, // Only attach a container class if there is generated CSS to be attached.
 		},
@@ -403,86 +420,56 @@ function BlockWithLayoutStyles( { block: BlockListBlock, props } ) {
  */
 export const withLayoutStyles = createHigherOrderComponent(
 	( BlockListBlock ) => ( props ) => {
-		const blockSupportsLayout = hasLayoutBlockSupport( props.name );
-		const shouldRenderLayoutStyles = useSelect(
+		const { clientId, name, attributes } = props;
+		const blockSupportsLayout = hasLayoutBlockSupport( name );
+		const layoutClasses = useLayoutClasses( attributes, name );
+		const extraProps = useSelect(
 			( select ) => {
 				// The callback returns early to avoid block editor subscription.
 				if ( ! blockSupportsLayout ) {
-					return false;
+					return;
 				}
 
-				return ! select( blockEditorStore ).getSettings()
-					.disableLayoutStyles;
-			},
-			[ blockSupportsLayout ]
-		);
-
-		if ( ! shouldRenderLayoutStyles ) {
-			return <BlockListBlock { ...props } />;
-		}
-
-		return (
-			<BlockWithLayoutStyles block={ BlockListBlock } props={ props } />
-		);
-	},
-	'withLayoutStyles'
-);
-
-function BlockWithChildLayoutStyles( { block: BlockListBlock, props } ) {
-	const layout = props.attributes.style?.layout ?? {};
-	const { selfStretch, flexSize } = layout;
-
-	const id = useInstanceId( BlockListBlock );
-	const selector = `.wp-container-content-${ id }`;
-
-	let css = '';
-	if ( selfStretch === 'fixed' && flexSize ) {
-		css = `${ selector } {
-				flex-basis: ${ flexSize };
-				box-sizing: border-box;
-			}`;
-	} else if ( selfStretch === 'fill' ) {
-		css = `${ selector } {
-				flex-grow: 1;
-			}`;
-	}
-
-	// Attach a `wp-container-content` id-based classname.
-	const className = classnames( props.className, {
-		[ `wp-container-content-${ id }` ]: !! css, // Only attach a container class if there is generated CSS to be attached.
-	} );
+				const { getSettings, getBlockSettings } = unlock(
+					select( blockEditorStore )
+				);
+				const { disableLayoutStyles } = getSettings();
 
-	useStyleOverride( { css } );
+				if ( disableLayoutStyles ) {
+					return;
+				}
 
-	return <BlockListBlock { ...props } className={ className } />;
-}
+				const [ blockGapSupport ] = getBlockSettings(
+					clientId,
+					'spacing.blockGap'
+				);
 
-/**
- * Override the default block element to add the child layout styles.
- *
- * @param {Function} BlockListBlock Original component.
- *
- * @return {Function} Wrapped component.
- */
-export const withChildLayoutStyles = createHigherOrderComponent(
-	( BlockListBlock ) => ( props ) => {
-		const shouldRenderChildLayoutStyles = useSelect( ( select ) => {
-			return ! select( blockEditorStore ).getSettings()
-				.disableLayoutStyles;
-		} );
+				return { blockGapSupport };
+			},
+			[ blockSupportsLayout, clientId ]
+		);
 
-		if ( ! shouldRenderChildLayoutStyles ) {
-			return <BlockListBlock { ...props } />;
+		if ( ! extraProps ) {
+			return (
+				<BlockListBlock
+					{ ...props }
+					__unstableLayoutClassNames={
+						blockSupportsLayout ? layoutClasses : undefined
+					}
+				/>
+			);
 		}
 
 		return (
-			<BlockWithChildLayoutStyles
+			<BlockWithLayoutStyles
 				block={ BlockListBlock }
 				props={ props }
+				layoutClasses={ layoutClasses }
+				{ ...extraProps }
 			/>
 		);
 	},
-	'withChildLayoutStyles'
+	'withLayoutStyles'
 );
 
 addFilter(
@@ -495,13 +482,3 @@ addFilter(
 	'core/editor/layout/with-layout-styles',
 	withLayoutStyles
 );
-addFilter(
-	'editor.BlockListBlock',
-	'core/editor/layout/with-child-layout-styles',
-	withChildLayoutStyles
-);
-addFilter(
-	'editor.BlockEdit',
-	'core/editor/layout/with-inspector-controls',
-	withLayoutControls
-);
diff --git a/packages/block-editor/src/hooks/layout.scss b/packages/block-editor/src/hooks/layout.scss
index 83a044e3cdca75..400b09490bbe51 100644
--- a/packages/block-editor/src/hooks/layout.scss
+++ b/packages/block-editor/src/hooks/layout.scss
@@ -1,31 +1,13 @@
-.block-editor-hooks__layout-controls {
-	display: flex;
-	margin-bottom: $grid-unit-10;
-
-	.block-editor-hooks__layout-controls-unit {
-		display: flex;
-		margin-right: $grid-unit-30;
-
-		svg {
-			margin: auto 0 $grid-unit-05 $grid-unit-10;
-		}
+.block-editor-hooks__layout-constrained {
+	.components-base-control {
+		margin-bottom: 0; // Cancel out margins added by block inspector
 	}
 }
 
-.block-editor-block-inspector .block-editor-hooks__layout-controls-unit-input {
-	margin-bottom: 0;
-}
-
-.block-editor-hooks__layout-controls-reset {
-	display: flex;
-	justify-content: flex-end;
-	margin-bottom: $grid-unit-30;
-}
-
-.block-editor-hooks__layout-controls-helptext {
+.block-editor-hooks__layout-constrained-helptext {
 	color: $gray-700;
 	font-size: $helptext-font-size;
-	margin-bottom: $grid-unit-20;
+	margin-bottom: 0; // Cancel out margins added by common.css
 }
 
 .block-editor-hooks__flex-layout-justification-controls,
@@ -35,7 +17,3 @@
 		margin-bottom: $grid-unit-10;
 	}
 }
-
-.block-editor-hooks__toggle-control.block-editor-hooks__toggle-control {
-	margin-bottom: $grid-unit-20;
-}
diff --git a/packages/block-editor/src/hooks/line-height.js b/packages/block-editor/src/hooks/line-height.js
index 5f8df2549cc4b1..9c27b9d0269722 100644
--- a/packages/block-editor/src/hooks/line-height.js
+++ b/packages/block-editor/src/hooks/line-height.js
@@ -39,7 +39,6 @@ export function LineHeightEdit( props ) {
 	return (
 		<LineHeightControl
 			__unstableInputWidth="100%"
-			__nextHasNoMarginBottom={ true }
 			value={ style?.typography?.lineHeight }
 			onChange={ onChange }
 			size="__unstable-large"
diff --git a/packages/block-editor/src/hooks/margin.js b/packages/block-editor/src/hooks/margin.js
deleted file mode 100644
index 8f723b3f8c97de..00000000000000
--- a/packages/block-editor/src/hooks/margin.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useState, useRef, useEffect } from '@wordpress/element';
-import isShallowEqual from '@wordpress/is-shallow-equal';
-
-/**
- * Internal dependencies
- */
-import BlockPopover from '../components/block-popover';
-import { __unstableUseBlockElement as useBlockElement } from '../components/block-list/use-block-props/use-block-refs';
-
-function getComputedCSS( element, property ) {
-	return element.ownerDocument.defaultView
-		.getComputedStyle( element )
-		.getPropertyValue( property );
-}
-
-export function MarginVisualizer( { clientId, attributes, forceShow } ) {
-	const blockElement = useBlockElement( clientId );
-	const [ style, setStyle ] = useState();
-
-	const margin = attributes?.style?.spacing?.margin;
-
-	useEffect( () => {
-		if (
-			! blockElement ||
-			null === blockElement.ownerDocument.defaultView
-		) {
-			return;
-		}
-
-		const top = getComputedCSS( blockElement, 'margin-top' );
-		const right = getComputedCSS( blockElement, 'margin-right' );
-		const bottom = getComputedCSS( blockElement, 'margin-bottom' );
-		const left = getComputedCSS( blockElement, 'margin-left' );
-
-		setStyle( {
-			borderTopWidth: top,
-			borderRightWidth: right,
-			borderBottomWidth: bottom,
-			borderLeftWidth: left,
-			top: top ? `-${ top }` : 0,
-			right: right ? `-${ right }` : 0,
-			bottom: bottom ? `-${ bottom }` : 0,
-			left: left ? `-${ left }` : 0,
-		} );
-	}, [ blockElement, margin ] );
-
-	const [ isActive, setIsActive ] = useState( false );
-	const valueRef = useRef( margin );
-	const timeoutRef = useRef();
-
-	const clearTimer = () => {
-		if ( timeoutRef.current ) {
-			window.clearTimeout( timeoutRef.current );
-		}
-	};
-
-	useEffect( () => {
-		if ( ! isShallowEqual( margin, valueRef.current ) && ! forceShow ) {
-			setIsActive( true );
-			valueRef.current = margin;
-
-			timeoutRef.current = setTimeout( () => {
-				setIsActive( false );
-			}, 400 );
-		}
-
-		return () => {
-			setIsActive( false );
-			clearTimer();
-		};
-	}, [ margin, forceShow ] );
-
-	if ( ! isActive && ! forceShow ) {
-		return null;
-	}
-
-	return (
-		<BlockPopover
-			clientId={ clientId }
-			__unstableCoverTarget
-			__unstableRefreshSize={ margin }
-			__unstablePopoverSlot="block-toolbar"
-			shift={ false }
-		>
-			<div className="block-editor__padding-visualizer" style={ style } />
-		</BlockPopover>
-	);
-}
diff --git a/packages/block-editor/src/hooks/padding.js b/packages/block-editor/src/hooks/padding.js
deleted file mode 100644
index ca4436153d122c..00000000000000
--- a/packages/block-editor/src/hooks/padding.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useState, useRef, useEffect } from '@wordpress/element';
-import isShallowEqual from '@wordpress/is-shallow-equal';
-
-/**
- * Internal dependencies
- */
-import BlockPopover from '../components/block-popover';
-import { __unstableUseBlockElement as useBlockElement } from '../components/block-list/use-block-props/use-block-refs';
-
-function getComputedCSS( element, property ) {
-	return element.ownerDocument.defaultView
-		.getComputedStyle( element )
-		.getPropertyValue( property );
-}
-
-export function PaddingVisualizer( { clientId, value, forceShow } ) {
-	const blockElement = useBlockElement( clientId );
-	const [ style, setStyle ] = useState();
-
-	const padding = value?.spacing?.padding;
-
-	useEffect( () => {
-		if (
-			! blockElement ||
-			null === blockElement.ownerDocument.defaultView
-		) {
-			return;
-		}
-
-		setStyle( {
-			borderTopWidth: getComputedCSS( blockElement, 'padding-top' ),
-			borderRightWidth: getComputedCSS( blockElement, 'padding-right' ),
-			borderBottomWidth: getComputedCSS( blockElement, 'padding-bottom' ),
-			borderLeftWidth: getComputedCSS( blockElement, 'padding-left' ),
-		} );
-	}, [ blockElement, padding ] );
-
-	const [ isActive, setIsActive ] = useState( false );
-	const valueRef = useRef( padding );
-	const timeoutRef = useRef();
-
-	const clearTimer = () => {
-		if ( timeoutRef.current ) {
-			window.clearTimeout( timeoutRef.current );
-		}
-	};
-
-	useEffect( () => {
-		if ( ! isShallowEqual( padding, valueRef.current ) && ! forceShow ) {
-			setIsActive( true );
-			valueRef.current = padding;
-
-			timeoutRef.current = setTimeout( () => {
-				setIsActive( false );
-			}, 400 );
-		}
-
-		return () => {
-			setIsActive( false );
-			clearTimer();
-		};
-	}, [ padding, forceShow ] );
-
-	if ( ! isActive && ! forceShow ) {
-		return null;
-	}
-
-	return (
-		<BlockPopover
-			clientId={ clientId }
-			__unstableCoverTarget
-			__unstableRefreshSize={ padding }
-			__unstablePopoverSlot="block-toolbar"
-			shift={ false }
-		>
-			<div className="block-editor__padding-visualizer" style={ style } />
-		</BlockPopover>
-	);
-}
diff --git a/packages/block-editor/src/hooks/padding.scss b/packages/block-editor/src/hooks/padding.scss
deleted file mode 100644
index dbb99919881893..00000000000000
--- a/packages/block-editor/src/hooks/padding.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.block-editor__padding-visualizer {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	opacity: 0.5;
-	border-color: var(--wp-admin-theme-color);
-	border-style: solid;
-	pointer-events: none;
-	box-sizing: border-box;
-}
diff --git a/packages/block-editor/src/hooks/position.js b/packages/block-editor/src/hooks/position.js
index 710dbfaf5ace04..bf1b730cd67d1a 100644
--- a/packages/block-editor/src/hooks/position.js
+++ b/packages/block-editor/src/hooks/position.js
@@ -1,21 +1,17 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { getBlockSupport, hasBlockSupport } from '@wordpress/blocks';
-import {
-	BaseControl,
-	privateApis as componentsPrivateApis,
-} from '@wordpress/components';
-import { createHigherOrderComponent, useInstanceId } from '@wordpress/compose';
+import { BaseControl, CustomSelectControl } from '@wordpress/components';
+import { useInstanceId } from '@wordpress/compose';
 import { useSelect } from '@wordpress/data';
 import { useMemo, Platform } from '@wordpress/element';
-import { addFilter } from '@wordpress/hooks';
 
 /**
  * Internal dependencies
@@ -24,29 +20,21 @@ import { useSettings } from '../components/use-settings';
 import InspectorControls from '../components/inspector-controls';
 import useBlockDisplayInformation from '../components/use-block-display-information';
 import { cleanEmptyObject, useStyleOverride } from './utils';
-import { unlock } from '../lock-unlock';
 import { store as blockEditorStore } from '../store';
 
-const { CustomSelectControl } = unlock( componentsPrivateApis );
-
 const POSITION_SUPPORT_KEY = 'position';
 
-const OPTION_CLASSNAME =
-	'block-editor-hooks__position-selection__select-control__option';
-
 const DEFAULT_OPTION = {
 	key: 'default',
 	value: '',
 	name: __( 'Default' ),
-	className: OPTION_CLASSNAME,
 };
 
 const STICKY_OPTION = {
 	key: 'sticky',
 	value: 'sticky',
 	name: _x( 'Sticky', 'Name for the value of the CSS position property' ),
-	className: OPTION_CLASSNAME,
-	__experimentalHint: __(
+	hint: __(
 		'The block will stick to the top of the window instead of scrolling.'
 	),
 };
@@ -55,10 +43,7 @@ const FIXED_OPTION = {
 	key: 'fixed',
 	value: 'fixed',
 	name: _x( 'Fixed', 'Name for the value of the CSS position property' ),
-	className: OPTION_CLASSNAME,
-	__experimentalHint: __(
-		'The block will not move when the page is scrolled.'
-	),
+	hint: __( 'The block will not move when the page is scrolled.' ),
 };
 
 const POSITION_SIDES = [ 'top', 'right', 'bottom', 'left' ];
@@ -153,7 +138,7 @@ export function hasPositionValue( props ) {
  * @return {boolean} Whether or not the block is set to a sticky or fixed position.
  */
 export function hasStickyOrFixedPositionValue( attributes ) {
-	const positionType = attributes.style?.position?.type;
+	const positionType = attributes?.style?.position?.type;
 	return positionType === 'sticky' || positionType === 'fixed';
 }
 
@@ -207,14 +192,12 @@ export function useIsPositionDisabled( { name: blockName } = {} ) {
  *
  * @return {Element} Position panel.
  */
-export function PositionPanel( props ) {
-	const {
-		attributes: { style = {} },
-		clientId,
-		name: blockName,
-		setAttributes,
-	} = props;
-
+export function PositionPanelPure( {
+	style = {},
+	clientId,
+	name: blockName,
+	setAttributes,
+} ) {
 	const allowFixed = hasFixedPositionSupport( blockName );
 	const allowSticky = hasStickyPositionSupport( blockName );
 	const value = style?.position?.type;
@@ -286,14 +269,11 @@ export function PositionPanel( props ) {
 			options.length > 1 ? (
 				<InspectorControls group="position">
 					<BaseControl
-						className="block-editor-hooks__position-selection"
 						__nextHasNoMarginBottom
 						help={ stickyHelpText }
 					>
 						<CustomSelectControl
-							__nextUnconstrainedWidth
 							__next40pxDefaultSize
-							className="block-editor-hooks__position-selection__select-control"
 							label={ __( 'Position' ) }
 							hideLabelFromVision
 							describedBy={ sprintf(
@@ -303,11 +283,10 @@ export function PositionPanel( props ) {
 							) }
 							options={ options }
 							value={ selectedOption }
-							__experimentalShowSelectedHint
 							onChange={ ( { selectedItem } ) => {
 								onChangeType( selectedItem.value );
 							} }
-							size={ '__unstable-large' }
+							size="__unstable-large"
 						/>
 					</BaseControl>
 				</InspectorControls>
@@ -316,89 +295,55 @@ export function PositionPanel( props ) {
 	} );
 }
 
-/**
- * Override the default edit UI to include position controls.
- *
- * @param {Function} BlockEdit Original component.
- *
- * @return {Function} Wrapped component.
- */
-export const withPositionControls = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const { name: blockName } = props;
-		const positionSupport = hasBlockSupport(
-			blockName,
-			POSITION_SUPPORT_KEY
-		);
+export default {
+	edit: function Edit( props ) {
 		const isPositionDisabled = useIsPositionDisabled( props );
-		const showPositionControls = positionSupport && ! isPositionDisabled;
-
-		return [
-			showPositionControls && (
-				<PositionPanel key="position" { ...props } />
-			),
-			<BlockEdit key="edit" { ...props } />,
-		];
+		if ( isPositionDisabled ) {
+			return null;
+		}
+		return <PositionPanelPure { ...props } />;
 	},
-	'withPositionControls'
-);
+	useBlockProps,
+	attributeKeys: [ 'style' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, POSITION_SUPPORT_KEY );
+	},
+};
 
-/**
- * Override the default block element to add the position styles.
- *
- * @param {Function} BlockListBlock Original component.
- *
- * @return {Function} Wrapped component.
- */
-export const withPositionStyles = createHigherOrderComponent(
-	( BlockListBlock ) => ( props ) => {
-		const { name, attributes } = props;
-		const hasPositionBlockSupport = hasBlockSupport(
-			name,
-			POSITION_SUPPORT_KEY
-		);
-		const isPositionDisabled = useIsPositionDisabled( props );
-		const allowPositionStyles =
-			hasPositionBlockSupport && ! isPositionDisabled;
-
-		const id = useInstanceId( BlockListBlock );
-
-		// Higher specificity to override defaults in editor UI.
-		const positionSelector = `.wp-container-${ id }.wp-container-${ id }`;
-
-		// Get CSS string for the current position values.
-		let css;
-		if ( allowPositionStyles ) {
-			css =
-				getPositionCSS( {
-					selector: positionSelector,
-					style: attributes?.style,
-				} ) || '';
-		}
+// Used for generating the instance ID
+const POSITION_BLOCK_PROPS_REFERENCE = {};
 
-		// Attach a `wp-container-` id-based class name.
-		const className = classnames( props?.className, {
-			[ `wp-container-${ id }` ]: allowPositionStyles && !! css, // Only attach a container class if there is generated CSS to be attached.
-			[ `is-position-${ attributes?.style?.position?.type }` ]:
-				allowPositionStyles &&
-				!! css &&
-				!! attributes?.style?.position?.type,
-		} );
+function useBlockProps( { name, style } ) {
+	const hasPositionBlockSupport = hasBlockSupport(
+		name,
+		POSITION_SUPPORT_KEY
+	);
+	const isPositionDisabled = useIsPositionDisabled( { name } );
+	const allowPositionStyles = hasPositionBlockSupport && ! isPositionDisabled;
+
+	const id = useInstanceId( POSITION_BLOCK_PROPS_REFERENCE );
+
+	// Higher specificity to override defaults in editor UI.
+	const positionSelector = `.wp-container-${ id }.wp-container-${ id }`;
+
+	// Get CSS string for the current position values.
+	let css;
+	if ( allowPositionStyles ) {
+		css =
+			getPositionCSS( {
+				selector: positionSelector,
+				style,
+			} ) || '';
+	}
+
+	// Attach a `wp-container-` id-based class name.
+	const className = clsx( {
+		[ `wp-container-${ id }` ]: allowPositionStyles && !! css, // Only attach a container class if there is generated CSS to be attached.
+		[ `is-position-${ style?.position?.type }` ]:
+			allowPositionStyles && !! css && !! style?.position?.type,
+	} );
 
-		useStyleOverride( { css } );
+	useStyleOverride( { css } );
 
-		return <BlockListBlock { ...props } className={ className } />;
-	},
-	'withPositionStyles'
-);
-
-addFilter(
-	'editor.BlockListBlock',
-	'core/editor/position/with-position-styles',
-	withPositionStyles
-);
-addFilter(
-	'editor.BlockEdit',
-	'core/editor/position/with-inspector-controls',
-	withPositionControls
-);
+	return { className };
+}
diff --git a/packages/block-editor/src/hooks/position.scss b/packages/block-editor/src/hooks/position.scss
deleted file mode 100644
index b3bd6b1b9ef041..00000000000000
--- a/packages/block-editor/src/hooks/position.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.block-editor-hooks__position-selection__select-control {
-	.components-custom-select-control__hint {
-		display: none;
-	}
-}
-
-.block-editor-hooks__position-selection__select-control__option {
-	&.has-hint {
-		grid-template-columns: auto 30px;
-		line-height: $default-line-height;
-		margin-bottom: 0;
-	}
-
-	.components-custom-select-control__item-hint {
-		grid-row: 2;
-		text-align: left;
-	}
-}
diff --git a/packages/block-editor/src/hooks/spacing-visualizer.js b/packages/block-editor/src/hooks/spacing-visualizer.js
new file mode 100644
index 00000000000000..2f0abe8e0d293d
--- /dev/null
+++ b/packages/block-editor/src/hooks/spacing-visualizer.js
@@ -0,0 +1,126 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	useState,
+	useRef,
+	useLayoutEffect,
+	useEffect,
+	useReducer,
+} from '@wordpress/element';
+import isShallowEqual from '@wordpress/is-shallow-equal';
+
+/**
+ * Internal dependencies
+ */
+import BlockPopoverCover from '../components/block-popover/cover';
+import { useBlockElement } from '../components/block-list/use-block-props/use-block-refs';
+
+function SpacingVisualizer( { clientId, value, computeStyle, forceShow } ) {
+	const blockElement = useBlockElement( clientId );
+	const [ style, updateStyle ] = useReducer( () =>
+		computeStyle( blockElement )
+	);
+
+	useLayoutEffect( () => {
+		if ( ! blockElement ) {
+			return;
+		}
+		// It's not sufficient to read the computed spacing value when value.spacing changes as
+		// useEffect may run before the browser recomputes CSS. We therefore combine
+		// useLayoutEffect and two rAF calls to ensure that we read the spacing after the current
+		// paint but before the next paint.
+		// See https://github.com/WordPress/gutenberg/pull/59227.
+		window.requestAnimationFrame( () =>
+			window.requestAnimationFrame( updateStyle )
+		);
+	}, [ blockElement, value ] );
+
+	const previousValueRef = useRef( value );
+	const [ isActive, setIsActive ] = useState( false );
+
+	useEffect( () => {
+		if ( isShallowEqual( value, previousValueRef.current ) || forceShow ) {
+			return;
+		}
+
+		setIsActive( true );
+		previousValueRef.current = value;
+
+		const timeout = setTimeout( () => {
+			setIsActive( false );
+		}, 400 );
+
+		return () => {
+			setIsActive( false );
+			clearTimeout( timeout );
+		};
+	}, [ value, forceShow ] );
+
+	if ( ! isActive && ! forceShow ) {
+		return null;
+	}
+
+	return (
+		<BlockPopoverCover
+			clientId={ clientId }
+			__unstablePopoverSlot="block-toolbar"
+		>
+			<div className="block-editor__spacing-visualizer" style={ style } />
+		</BlockPopoverCover>
+	);
+}
+
+function getComputedCSS( element, property ) {
+	return element.ownerDocument.defaultView
+		.getComputedStyle( element )
+		.getPropertyValue( property );
+}
+
+export function MarginVisualizer( { clientId, value, forceShow } ) {
+	return (
+		<SpacingVisualizer
+			clientId={ clientId }
+			value={ value?.spacing?.margin }
+			computeStyle={ ( blockElement ) => {
+				const top = getComputedCSS( blockElement, 'margin-top' );
+				const right = getComputedCSS( blockElement, 'margin-right' );
+				const bottom = getComputedCSS( blockElement, 'margin-bottom' );
+				const left = getComputedCSS( blockElement, 'margin-left' );
+				return {
+					borderTopWidth: top,
+					borderRightWidth: right,
+					borderBottomWidth: bottom,
+					borderLeftWidth: left,
+					top: top ? `-${ top }` : 0,
+					right: right ? `-${ right }` : 0,
+					bottom: bottom ? `-${ bottom }` : 0,
+					left: left ? `-${ left }` : 0,
+				};
+			} }
+			forceShow={ forceShow }
+		/>
+	);
+}
+
+export function PaddingVisualizer( { clientId, value, forceShow } ) {
+	return (
+		<SpacingVisualizer
+			clientId={ clientId }
+			value={ value?.spacing?.padding }
+			computeStyle={ ( blockElement ) => ( {
+				borderTopWidth: getComputedCSS( blockElement, 'padding-top' ),
+				borderRightWidth: getComputedCSS(
+					blockElement,
+					'padding-right'
+				),
+				borderBottomWidth: getComputedCSS(
+					blockElement,
+					'padding-bottom'
+				),
+				borderLeftWidth: getComputedCSS( blockElement, 'padding-left' ),
+			} ) }
+			forceShow={ forceShow }
+		/>
+	);
+}
diff --git a/packages/block-editor/src/hooks/spacing.scss b/packages/block-editor/src/hooks/spacing.scss
new file mode 100644
index 00000000000000..52894d8ff2ba62
--- /dev/null
+++ b/packages/block-editor/src/hooks/spacing.scss
@@ -0,0 +1,12 @@
+.block-editor__spacing-visualizer {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	opacity: 0.5;
+	border-color: var(--wp-admin-theme-color);
+	border-style: solid;
+	pointer-events: none;
+	box-sizing: border-box;
+}
diff --git a/packages/block-editor/src/hooks/style.js b/packages/block-editor/src/hooks/style.js
index 8b3a475e1babe5..998d13cfd22247 100644
--- a/packages/block-editor/src/hooks/style.js
+++ b/packages/block-editor/src/hooks/style.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
@@ -13,14 +8,14 @@ import {
 	hasBlockSupport,
 	__EXPERIMENTAL_ELEMENTS as ELEMENTS,
 } from '@wordpress/blocks';
-import { createHigherOrderComponent, useInstanceId } from '@wordpress/compose';
+import { useInstanceId } from '@wordpress/compose';
 import { getCSSRules, compileCSS } from '@wordpress/style-engine';
 
 /**
  * Internal dependencies
  */
 import { BACKGROUND_SUPPORT_KEY, BackgroundImagePanel } from './background';
-import { BORDER_SUPPORT_KEY, BorderPanel } from './border';
+import { BORDER_SUPPORT_KEY, BorderPanel, SHADOW_SUPPORT_KEY } from './border';
 import { COLOR_SUPPORT_KEY, ColorEdit } from './color';
 import {
 	TypographyPanel,
@@ -32,8 +27,11 @@ import {
 	SPACING_SUPPORT_KEY,
 	DimensionsPanel,
 } from './dimensions';
-import useDisplayBlockControls from '../components/use-display-block-controls';
-import { shouldSkipSerialization, useStyleOverride } from './utils';
+import {
+	shouldSkipSerialization,
+	useStyleOverride,
+	useBlockSettings,
+} from './utils';
 import { scopeSelector } from '../components/global-styles/utils';
 import { useBlockEditingMode } from '../components/block-editing-mode';
 
@@ -44,6 +42,7 @@ const styleSupportKeys = [
 	DIMENSIONS_SUPPORT_KEY,
 	BACKGROUND_SUPPORT_KEY,
 	SPACING_SUPPORT_KEY,
+	SHADOW_SUPPORT_KEY,
 ];
 
 const hasStyleSupport = ( nameOrType ) =>
@@ -112,6 +111,9 @@ const skipSerializationPathsEdit = {
 	[ `${ SPACING_SUPPORT_KEY }.__experimentalSkipSerialization` ]: [
 		SPACING_SUPPORT_KEY,
 	],
+	[ `${ SHADOW_SUPPORT_KEY }.__experimentalSkipSerialization` ]: [
+		SHADOW_SUPPORT_KEY,
+	],
 };
 
 /**
@@ -128,10 +130,14 @@ const skipSerializationPathsEdit = {
  */
 const skipSerializationPathsSave = {
 	...skipSerializationPathsEdit,
+	[ `${ DIMENSIONS_SUPPORT_KEY }.aspectRatio` ]: [
+		`${ DIMENSIONS_SUPPORT_KEY }.aspectRatio`,
+	], // Skip serialization of aspect ratio in save mode.
 	[ `${ BACKGROUND_SUPPORT_KEY }` ]: [ BACKGROUND_SUPPORT_KEY ], // Skip serialization of background support in save mode.
 };
 
 const skipSerializationPathsSaveChecks = {
+	[ `${ DIMENSIONS_SUPPORT_KEY }.aspectRatio` ]: true,
 	[ `${ BACKGROUND_SUPPORT_KEY }` ]: true,
 };
 
@@ -271,20 +277,20 @@ export function omitStyle( style, paths, preserveReference = false ) {
 /**
  * Override props assigned to save component to inject the CSS variables definition.
  *
- * @param {Object}                    props      Additional props applied to save element.
- * @param {Object}                    blockType  Block type.
- * @param {Object}                    attributes Block attributes.
- * @param {?Record<string, string[]>} skipPaths  An object of keys and paths to skip serialization.
+ * @param {Object}                    props           Additional props applied to save element.
+ * @param {Object|string}             blockNameOrType Block type.
+ * @param {Object}                    attributes      Block attributes.
+ * @param {?Record<string, string[]>} skipPaths       An object of keys and paths to skip serialization.
  *
  * @return {Object} Filtered props applied to save element.
  */
 export function addSaveProps(
 	props,
-	blockType,
+	blockNameOrType,
 	attributes,
 	skipPaths = skipSerializationPathsSave
 ) {
-	if ( ! hasStyleSupport( blockType ) ) {
+	if ( ! hasStyleSupport( blockNameOrType ) ) {
 		return props;
 	}
 
@@ -292,7 +298,7 @@ export function addSaveProps(
 	Object.entries( skipPaths ).forEach( ( [ indicator, path ] ) => {
 		const skipSerialization =
 			skipSerializationPathsSaveChecks[ indicator ] ||
-			getBlockSupport( blockType, indicator );
+			getBlockSupport( blockNameOrType, indicator );
 
 		if ( skipSerialization === true ) {
 			style = omitStyle( style, path );
@@ -314,94 +320,49 @@ export function addSaveProps(
 	return props;
 }
 
-/**
- * Filters registered block settings to extend the block edit wrapper
- * to apply the desired styles and classnames properly.
- *
- * @param {Object} settings Original block settings.
- *
- * @return {Object}.Filtered block settings.
- */
-export function addEditProps( settings ) {
-	if ( ! hasStyleSupport( settings ) ) {
-		return settings;
-	}
-
-	const existingGetEditWrapperProps = settings.getEditWrapperProps;
-	settings.getEditWrapperProps = ( attributes ) => {
-		let props = {};
-		if ( existingGetEditWrapperProps ) {
-			props = existingGetEditWrapperProps( attributes );
-		}
-
-		return addSaveProps(
-			props,
-			settings,
-			attributes,
-			skipSerializationPathsEdit
-		);
+function BlockStyleControls( {
+	clientId,
+	name,
+	setAttributes,
+	__unstableParentLayout,
+} ) {
+	const settings = useBlockSettings( name, __unstableParentLayout );
+	const blockEditingMode = useBlockEditingMode();
+	const passedProps = {
+		clientId,
+		name,
+		setAttributes,
+		settings: {
+			...settings,
+			typography: {
+				...settings.typography,
+				// The text alignment UI for individual blocks is rendered in
+				// the block toolbar, so disable it here.
+				textAlign: false,
+			},
+		},
 	};
-
-	return settings;
+	if ( blockEditingMode !== 'default' ) {
+		return null;
+	}
+	return (
+		<>
+			<ColorEdit { ...passedProps } />
+			<BackgroundImagePanel { ...passedProps } />
+			<TypographyPanel { ...passedProps } />
+			<BorderPanel { ...passedProps } />
+			<DimensionsPanel { ...passedProps } />
+		</>
+	);
 }
 
-/**
- * Override the default edit UI to include new inspector controls for
- * all the custom styles configs.
- *
- * @param {Function} BlockEdit Original component.
- *
- * @return {Function} Wrapped component.
- */
-export const withBlockStyleControls = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		if ( ! hasStyleSupport( props.name ) ) {
-			return <BlockEdit key="edit" { ...props } />;
-		}
-
-		const shouldDisplayControls = useDisplayBlockControls();
-		const blockEditingMode = useBlockEditingMode();
-		const { clientId, name, setAttributes, __unstableParentLayout } = props;
-
-		return (
-			<>
-				{ shouldDisplayControls && blockEditingMode === 'default' && (
-					<>
-						<ColorEdit
-							clientId={ clientId }
-							name={ name }
-							setAttributes={ setAttributes }
-						/>
-						<BackgroundImagePanel
-							clientId={ clientId }
-							name={ name }
-							setAttributes={ setAttributes }
-						/>
-						<TypographyPanel
-							clientId={ clientId }
-							name={ name }
-							setAttributes={ setAttributes }
-							__unstableParentLayout={ __unstableParentLayout }
-						/>
-						<BorderPanel
-							clientId={ clientId }
-							name={ name }
-							setAttributes={ setAttributes }
-						/>
-						<DimensionsPanel
-							clientId={ clientId }
-							name={ name }
-							setAttributes={ setAttributes }
-							__unstableParentLayout={ __unstableParentLayout }
-						/>
-					</>
-				) }
-				<BlockEdit key="edit" { ...props } />
-			</>
-		);
-	},
-	'withBlockStyleControls'
-);
+export default {
+	edit: BlockStyleControls,
+	hasSupport: hasStyleSupport,
+	addSaveProps,
+	attributeKeys: [ 'style' ],
+	useBlockProps,
+};
 
 // Defines which element types are supported, including their hover styles or
 // any other elements that have been included under a single element type
@@ -415,142 +376,100 @@ const elementTypes = [
 	},
 ];
 
-/**
- * Override the default block element to include elements styles.
- *
- * @param {Function} BlockListBlock Original component
- * @return {Function}                Wrapped component
- */
-const withElementsStyles = createHigherOrderComponent(
-	( BlockListBlock ) => ( props ) => {
-		const blockElementsContainerIdentifier = `wp-elements-${ useInstanceId(
-			BlockListBlock
-		) }`;
-
-		// The .editor-styles-wrapper selector is required on elements styles. As it is
-		// added to all other editor styles, not providing it causes reset and global
-		// styles to override element styles because of higher specificity.
-		const baseElementSelector = `.editor-styles-wrapper .${ blockElementsContainerIdentifier }`;
-		const blockElementStyles = props.attributes.style?.elements;
-
-		const styles = useMemo( () => {
-			if ( ! blockElementStyles ) {
+// Used for generating the instance ID
+const STYLE_BLOCK_PROPS_REFERENCE = {};
+
+function useBlockProps( { name, style } ) {
+	const blockElementsContainerIdentifier = useInstanceId(
+		STYLE_BLOCK_PROPS_REFERENCE,
+		'wp-elements'
+	);
+
+	const baseElementSelector = `.${ blockElementsContainerIdentifier }`;
+	const blockElementStyles = style?.elements;
+
+	const styles = useMemo( () => {
+		if ( ! blockElementStyles ) {
+			return;
+		}
+
+		const elementCSSRules = [];
+
+		elementTypes.forEach( ( { elementType, pseudo, elements } ) => {
+			const skipSerialization = shouldSkipSerialization(
+				name,
+				COLOR_SUPPORT_KEY,
+				elementType
+			);
+
+			if ( skipSerialization ) {
 				return;
 			}
 
-			const elementCSSRules = [];
+			const elementStyles = blockElementStyles?.[ elementType ];
 
-			elementTypes.forEach( ( { elementType, pseudo, elements } ) => {
-				const skipSerialization = shouldSkipSerialization(
-					props.name,
-					COLOR_SUPPORT_KEY,
-					elementType
+			// Process primary element type styles.
+			if ( elementStyles ) {
+				const selector = scopeSelector(
+					baseElementSelector,
+					ELEMENTS[ elementType ]
 				);
 
-				if ( skipSerialization ) {
-					return;
-				}
-
-				const elementStyles = blockElementStyles?.[ elementType ];
-
-				// Process primary element type styles.
-				if ( elementStyles ) {
-					const selector = scopeSelector(
-						baseElementSelector,
-						ELEMENTS[ elementType ]
-					);
-
-					elementCSSRules.push(
-						compileCSS( elementStyles, { selector } )
-					);
-
-					// Process any interactive states for the element type.
-					if ( pseudo ) {
-						pseudo.forEach( ( pseudoSelector ) => {
-							if ( elementStyles[ pseudoSelector ] ) {
-								elementCSSRules.push(
-									compileCSS(
-										elementStyles[ pseudoSelector ],
-										{
-											selector: scopeSelector(
-												baseElementSelector,
-												`${ ELEMENTS[ elementType ] }${ pseudoSelector }`
-											),
-										}
-									)
-								);
-							}
-						} );
-					}
-				}
+				elementCSSRules.push(
+					compileCSS( elementStyles, { selector } )
+				);
 
-				// Process related elements e.g. h1-h6 for headings
-				if ( elements ) {
-					elements.forEach( ( element ) => {
-						if ( blockElementStyles[ element ] ) {
+				// Process any interactive states for the element type.
+				if ( pseudo ) {
+					pseudo.forEach( ( pseudoSelector ) => {
+						if ( elementStyles[ pseudoSelector ] ) {
 							elementCSSRules.push(
-								compileCSS( blockElementStyles[ element ], {
+								compileCSS( elementStyles[ pseudoSelector ], {
 									selector: scopeSelector(
 										baseElementSelector,
-										ELEMENTS[ element ]
+										`${ ELEMENTS[ elementType ] }${ pseudoSelector }`
 									),
 								} )
 							);
 						}
 					} );
 				}
-			} );
-
-			return elementCSSRules.length > 0
-				? elementCSSRules.join( '' )
-				: undefined;
-		}, [ baseElementSelector, blockElementStyles, props.name ] );
-
-		useStyleOverride( { css: styles } );
-
-		return (
-			<BlockListBlock
-				{ ...props }
-				className={
-					props.attributes.style?.elements
-						? classnames(
-								props.className,
-								blockElementsContainerIdentifier
-						  )
-						: props.className
-				}
-			/>
-		);
-	},
-	'withElementsStyles'
-);
+			}
 
-addFilter(
-	'blocks.registerBlockType',
-	'core/style/addAttribute',
-	addAttribute
-);
+			// Process related elements e.g. h1-h6 for headings
+			if ( elements ) {
+				elements.forEach( ( element ) => {
+					if ( blockElementStyles[ element ] ) {
+						elementCSSRules.push(
+							compileCSS( blockElementStyles[ element ], {
+								selector: scopeSelector(
+									baseElementSelector,
+									ELEMENTS[ element ]
+								),
+							} )
+						);
+					}
+				} );
+			}
+		} );
 
-addFilter(
-	'blocks.getSaveContent.extraProps',
-	'core/style/addSaveProps',
-	addSaveProps
-);
+		return elementCSSRules.length > 0
+			? elementCSSRules.join( '' )
+			: undefined;
+	}, [ baseElementSelector, blockElementStyles, name ] );
 
-addFilter(
-	'blocks.registerBlockType',
-	'core/style/addEditProps',
-	addEditProps
-);
+	useStyleOverride( { css: styles } );
 
-addFilter(
-	'editor.BlockEdit',
-	'core/style/with-block-controls',
-	withBlockStyleControls
-);
+	return addSaveProps(
+		{ className: blockElementsContainerIdentifier },
+		name,
+		{ style },
+		skipSerializationPathsEdit
+	);
+}
 
 addFilter(
-	'editor.BlockListBlock',
-	'core/editor/with-elements-styles',
-	withElementsStyles
+	'blocks.registerBlockType',
+	'core/style/addAttribute',
+	addAttribute
 );
diff --git a/packages/block-editor/src/hooks/supports.js b/packages/block-editor/src/hooks/supports.js
index 2cf08d46fa8fe2..75f2bdf2dc219e 100644
--- a/packages/block-editor/src/hooks/supports.js
+++ b/packages/block-editor/src/hooks/supports.js
@@ -20,6 +20,11 @@ const FONT_STYLE_SUPPORT_KEY = 'typography.__experimentalFontStyle';
  * Key within block settings' support array indicating support for font weight.
  */
 const FONT_WEIGHT_SUPPORT_KEY = 'typography.__experimentalFontWeight';
+/**
+ * Key within block settings' supports array indicating support for text
+ * align e.g. settings found in `block.json`.
+ */
+const TEXT_ALIGN_SUPPORT_KEY = 'typography.textAlign';
 /**
  * Key within block settings' supports array indicating support for text
  * columns e.g. settings found in `block.json`.
@@ -53,14 +58,17 @@ const TYPOGRAPHY_SUPPORT_KEYS = [
 	FONT_STYLE_SUPPORT_KEY,
 	FONT_WEIGHT_SUPPORT_KEY,
 	FONT_FAMILY_SUPPORT_KEY,
+	TEXT_ALIGN_SUPPORT_KEY,
 	TEXT_COLUMNS_SUPPORT_KEY,
 	TEXT_DECORATION_SUPPORT_KEY,
 	TEXT_TRANSFORM_SUPPORT_KEY,
 	WRITING_MODE_SUPPORT_KEY,
 	LETTER_SPACING_SUPPORT_KEY,
 ];
+const EFFECTS_SUPPORT_KEYS = [ 'shadow' ];
 const SPACING_SUPPORT_KEY = 'spacing';
 const styleSupportKeys = [
+	...EFFECTS_SUPPORT_KEYS,
 	...TYPOGRAPHY_SUPPORT_KEYS,
 	BORDER_SUPPORT_KEY,
 	COLOR_SUPPORT_KEY,
@@ -210,6 +218,24 @@ export const hasBackgroundColorSupport = ( nameOrType ) => {
 	return colorSupport && colorSupport.background !== false;
 };
 
+/**
+ * Returns true if the block defines support for text-align.
+ *
+ * @param {string|Object} nameOrType Block name or type object.
+ * @return {boolean} Whether the block supports the feature.
+ */
+export const hasTextAlignSupport = ( nameOrType ) =>
+	hasBlockSupport( nameOrType, TEXT_ALIGN_SUPPORT_KEY );
+
+/**
+ * Returns the block support value for text-align, if defined.
+ *
+ * @param {string|Object} nameOrType Block name or type object.
+ * @return {unknown} The block support value.
+ */
+export const getTextAlignSupport = ( nameOrType ) =>
+	getBlockSupport( nameOrType, TEXT_ALIGN_SUPPORT_KEY );
+
 /**
  * Returns true if the block defines support for background color.
  *
diff --git a/packages/block-editor/src/hooks/test/__snapshots__/anchor.native.js.snap b/packages/block-editor/src/hooks/test/__snapshots__/anchor.native.js.snap
new file mode 100644
index 00000000000000..03407a1fe55d85
--- /dev/null
+++ b/packages/block-editor/src/hooks/test/__snapshots__/anchor.native.js.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`anchor should set the ID attribute on the block 1`] = `
+"<!-- wp:paragraph -->
+<p id="my-anchor"></p>
+<!-- /wp:paragraph -->"
+`;
diff --git a/packages/block-editor/src/hooks/test/align.js b/packages/block-editor/src/hooks/test/align.js
index b928e6eafc8b2d..73c55133a4b29b 100644
--- a/packages/block-editor/src/hooks/test/align.js
+++ b/packages/block-editor/src/hooks/test/align.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { render, screen } from '@testing-library/react';
-
 /**
  * WordPress dependencies
  */
@@ -12,20 +7,11 @@ import {
 	registerBlockType,
 	unregisterBlockType,
 } from '@wordpress/blocks';
-import { SlotFillProvider } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
-import BlockControls from '../../components/block-controls';
-import BlockEdit from '../../components/block-edit';
-import BlockEditorProvider from '../../components/provider';
-import {
-	getValidAlignments,
-	withAlignmentControls,
-	withDataAlign,
-	addAssignedAlign,
-} from '../align';
+import { getValidAlignments, addAssignedAlign } from '../align';
 
 const noop = () => {};
 
@@ -157,169 +143,6 @@ describe( 'align', () => {
 		} );
 	} );
 
-	describe( 'withAlignControls', () => {
-		const componentProps = {
-			name: 'core/foo',
-			attributes: {},
-			isSelected: true,
-		};
-
-		it( 'should do nothing if no valid alignments', () => {
-			registerBlockType( 'core/foo', blockSettings );
-
-			const EnhancedComponent = withAlignmentControls(
-				( { wrapperProps } ) => <div { ...wrapperProps } />
-			);
-
-			render(
-				<SlotFillProvider>
-					<BlockEdit { ...componentProps }>
-						<EnhancedComponent { ...componentProps } />
-					</BlockEdit>
-					<BlockControls.Slot group="block" />
-				</SlotFillProvider>
-			);
-
-			expect(
-				screen.queryByRole( 'button', {
-					name: 'Align',
-					expanded: false,
-				} )
-			).not.toBeInTheDocument();
-		} );
-
-		it( 'should render toolbar controls if valid alignments', () => {
-			registerBlockType( 'core/foo', {
-				...blockSettings,
-				supports: {
-					align: true,
-					alignWide: false,
-				},
-			} );
-
-			const EnhancedComponent = withAlignmentControls(
-				( { wrapperProps } ) => <div { ...wrapperProps } />
-			);
-
-			render(
-				<SlotFillProvider>
-					<BlockEdit { ...componentProps }>
-						<EnhancedComponent { ...componentProps } />
-					</BlockEdit>
-					<BlockControls.Slot group="block" />
-				</SlotFillProvider>
-			);
-
-			expect(
-				screen.getAllByRole( 'button', {
-					name: 'Align',
-					expanded: false,
-				} )
-			).toHaveLength( 2 );
-		} );
-	} );
-
-	describe( 'withDataAlign', () => {
-		it( 'should render with wrapper props', () => {
-			registerBlockType( 'core/foo', {
-				...blockSettings,
-				supports: {
-					align: true,
-					alignWide: true,
-				},
-			} );
-
-			const EnhancedComponent = withDataAlign( ( { wrapperProps } ) => (
-				<button { ...wrapperProps } />
-			) );
-
-			render(
-				<BlockEditorProvider
-					settings={ { alignWide: true, supportsLayout: false } }
-					value={ [] }
-				>
-					<EnhancedComponent
-						attributes={ {
-							align: 'wide',
-						} }
-						name="core/foo"
-					/>
-				</BlockEditorProvider>
-			);
-
-			expect( screen.getByRole( 'button' ) ).toHaveAttribute(
-				'data-align',
-				'wide'
-			);
-		} );
-
-		it( 'should not render wide/full wrapper props if wide controls are not enabled', () => {
-			registerBlockType( 'core/foo', {
-				...blockSettings,
-				supports: {
-					align: true,
-					alignWide: true,
-				},
-			} );
-
-			const EnhancedComponent = withDataAlign( ( { wrapperProps } ) => (
-				<button { ...wrapperProps } />
-			) );
-
-			render(
-				<BlockEditorProvider
-					settings={ { alignWide: false } }
-					value={ [] }
-				>
-					<EnhancedComponent
-						name="core/foo"
-						attributes={ {
-							align: 'wide',
-						} }
-					/>
-				</BlockEditorProvider>
-			);
-
-			expect( screen.getByRole( 'button' ) ).not.toHaveAttribute(
-				'data-align',
-				'wide'
-			);
-		} );
-
-		it( 'should not render invalid align', () => {
-			registerBlockType( 'core/foo', {
-				...blockSettings,
-				supports: {
-					align: true,
-					alignWide: false,
-				},
-			} );
-
-			const EnhancedComponent = withDataAlign( ( { wrapperProps } ) => (
-				<button { ...wrapperProps } />
-			) );
-
-			render(
-				<BlockEditorProvider
-					settings={ { alignWide: true } }
-					value={ [] }
-				>
-					<EnhancedComponent
-						name="core/foo"
-						attributes={ {
-							align: 'wide',
-						} }
-					/>
-				</BlockEditorProvider>
-			);
-
-			expect( screen.getByRole( 'button' ) ).not.toHaveAttribute(
-				'data-align',
-				'wide'
-			);
-		} );
-	} );
-
 	describe( 'addAssignedAlign', () => {
 		it( 'should do nothing if block does not support align', () => {
 			registerBlockType( 'core/foo', blockSettings );
diff --git a/packages/block-editor/src/hooks/test/anchor.js b/packages/block-editor/src/hooks/test/anchor.js
index a919fad575312e..557789b1c088f3 100644
--- a/packages/block-editor/src/hooks/test/anchor.js
+++ b/packages/block-editor/src/hooks/test/anchor.js
@@ -6,7 +6,7 @@ import { applyFilters } from '@wordpress/hooks';
 /**
  * Internal dependencies
  */
-import '../anchor';
+import anchor from '../anchor';
 
 const noop = () => {};
 
@@ -62,14 +62,9 @@ describe( 'anchor', () => {
 	} );
 
 	describe( 'addSaveProps', () => {
-		const getSaveContentExtraProps = applyFilters.bind(
-			null,
-			'blocks.getSaveContent.extraProps'
-		);
-
 		it( 'should do nothing if the block settings do not define anchor support', () => {
 			const attributes = { anchor: 'foo' };
-			const extraProps = getSaveContentExtraProps(
+			const extraProps = anchor.addSaveProps(
 				{},
 				blockSettings,
 				attributes
@@ -80,7 +75,7 @@ describe( 'anchor', () => {
 
 		it( 'should inject anchor attribute ID', () => {
 			const attributes = { anchor: 'foo' };
-			const extraProps = getSaveContentExtraProps(
+			const extraProps = anchor.addSaveProps(
 				{},
 				{
 					...blockSettings,
@@ -96,7 +91,7 @@ describe( 'anchor', () => {
 
 		it( 'should remove an anchor attribute ID when field is cleared', () => {
 			const attributes = { anchor: '' };
-			const extraProps = getSaveContentExtraProps(
+			const extraProps = anchor.addSaveProps(
 				{},
 				{
 					...blockSettings,
diff --git a/packages/block-editor/src/hooks/test/anchor.native.js b/packages/block-editor/src/hooks/test/anchor.native.js
new file mode 100644
index 00000000000000..d6d2de845cbf48
--- /dev/null
+++ b/packages/block-editor/src/hooks/test/anchor.native.js
@@ -0,0 +1,32 @@
+/**
+ * External dependencies
+ */
+import {
+	addBlock,
+	changeTextOfTextInput,
+	getEditorHtml,
+	initializeEditor,
+	openBlockSettings,
+	screen,
+	setupCoreBlocks,
+} from 'test/helpers';
+
+setupCoreBlocks( [ 'core/paragraph' ] );
+
+describe( 'anchor', () => {
+	it( 'should set the ID attribute on the block', async () => {
+		// Arrange
+		await initializeEditor();
+		const block = await addBlock( screen, 'Paragraph' );
+		await openBlockSettings( screen, block );
+
+		// Act
+		await changeTextOfTextInput(
+			await screen.getByPlaceholderText( 'Add an anchor' ),
+			'my-anchor'
+		);
+
+		// Assert
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+} );
diff --git a/packages/block-editor/src/hooks/test/background.js b/packages/block-editor/src/hooks/test/background.js
new file mode 100644
index 00000000000000..030e88ae67fbd8
--- /dev/null
+++ b/packages/block-editor/src/hooks/test/background.js
@@ -0,0 +1,60 @@
+/**
+ * Internal dependencies
+ */
+import {
+	setBackgroundStyleDefaults,
+	BACKGROUND_BLOCK_DEFAULT_VALUES,
+} from '../background';
+
+describe( 'background', () => {
+	describe( 'setBackgroundStyleDefaults', () => {
+		const backgroundStyles = {
+			backgroundImage: { id: 123, url: 'image.png' },
+		};
+		const backgroundStylesContain = {
+			backgroundImage: { id: 123, url: 'image.png' },
+			backgroundSize: 'contain',
+		};
+		const backgroundStylesNoURL = { backgroundImage: { id: 123 } };
+		it.each( [
+			[
+				'return background size default',
+				backgroundStyles,
+				{
+					backgroundSize:
+						BACKGROUND_BLOCK_DEFAULT_VALUES.backgroundSize,
+				},
+			],
+			[ 'return early if no styles are passed', undefined, undefined ],
+			[
+				'return early if images has no id',
+				backgroundStylesNoURL,
+				undefined,
+			],
+			[
+				'return early if images has no URL',
+				backgroundStylesNoURL,
+				undefined,
+			],
+			[
+				'return background position default',
+				backgroundStylesContain,
+				{
+					backgroundPosition:
+						BACKGROUND_BLOCK_DEFAULT_VALUES.backgroundPosition,
+				},
+			],
+			[
+				'not apply background position value if one already exists in styles',
+				{
+					...backgroundStylesContain,
+					backgroundPosition: 'center',
+				},
+				undefined,
+			],
+		] )( 'should %s', ( message, styles, expected ) => {
+			const result = setBackgroundStyleDefaults( styles );
+			expect( result ).toEqual( expected );
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/hooks/test/color.js b/packages/block-editor/src/hooks/test/color.js
deleted file mode 100644
index 179ad21f913df4..00000000000000
--- a/packages/block-editor/src/hooks/test/color.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * External dependencies
- */
-import { render } from '@testing-library/react';
-
-/**
- * WordPress dependencies
- */
-import { registerBlockType, unregisterBlockType } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import BlockEditorProvider from '../../components/provider';
-import { withColorPaletteStyles } from '../color';
-
-describe( 'withColorPaletteStyles', () => {
-	const settings = {
-		__experimentalFeatures: {
-			color: {
-				palette: {
-					default: [
-						{
-							name: 'Pale pink',
-							slug: 'pale-pink',
-							color: '#f78da7',
-						},
-						{
-							name: 'Vivid green cyan',
-							slug: 'vivid-green-cyan',
-							color: '#00d084',
-						},
-					],
-				},
-			},
-		},
-	};
-
-	const EnhancedComponent = withColorPaletteStyles(
-		( { getStyleObj, wrapperProps } ) => (
-			<div>{ getStyleObj( wrapperProps.style ) }</div>
-		)
-	);
-
-	beforeAll( () => {
-		registerBlockType( 'core/test-block', {
-			save: () => undefined,
-			edit: () => undefined,
-			category: 'text',
-			title: 'test block',
-			supports: {
-				color: {
-					text: true,
-					background: true,
-				},
-			},
-		} );
-	} );
-
-	afterAll( () => {
-		unregisterBlockType( 'core/test-block' );
-	} );
-
-	it( 'should add color styles from attributes', () => {
-		const getStyleObj = jest.fn();
-
-		render(
-			<BlockEditorProvider settings={ settings } value={ [] }>
-				<EnhancedComponent
-					attributes={ {
-						backgroundColor: 'vivid-green-cyan',
-						textColor: 'pale-pink',
-					} }
-					name="core/test-block"
-					getStyleObj={ getStyleObj }
-				/>
-			</BlockEditorProvider>
-		);
-
-		expect( getStyleObj ).toHaveBeenLastCalledWith( {
-			color: '#f78da7',
-			backgroundColor: '#00d084',
-		} );
-	} );
-
-	it( 'should not add undefined style values', () => {
-		// This test ensures that undefined `color` and `backgroundColor` styles
-		// are not added to the styles object. An undefined `backgroundColor`
-		// style causes a React warning when gradients are used, as the gradient
-		// style currently uses the `background` shorthand syntax.
-		// See: https://github.com/WordPress/gutenberg/issues/36899.
-		const getStyleObj = jest.fn();
-
-		render(
-			<BlockEditorProvider settings={ settings } value={ [] }>
-				<EnhancedComponent
-					attributes={ {
-						backgroundColor: undefined,
-						textColor: undefined,
-					} }
-					name="core/test-block"
-					getStyleObj={ getStyleObj }
-				/>
-			</BlockEditorProvider>
-		);
-		// Check explictly for the object used in the call, because
-		// `toHaveBeenCalledWith` does not check for empty keys.
-		expect(
-			getStyleObj.mock.calls[ getStyleObj.mock.calls.length - 1 ][ 0 ]
-		).toStrictEqual( {} );
-	} );
-} );
diff --git a/packages/block-editor/src/hooks/test/custom-class-name.js b/packages/block-editor/src/hooks/test/custom-class-name.js
index 5a662a99d59aec..29d5d836bce8f7 100644
--- a/packages/block-editor/src/hooks/test/custom-class-name.js
+++ b/packages/block-editor/src/hooks/test/custom-class-name.js
@@ -6,7 +6,7 @@ import { applyFilters } from '@wordpress/hooks';
 /**
  * Internal dependencies
  */
-import '../custom-class-name';
+import customClassName from '../custom-class-name';
 
 describe( 'custom className', () => {
 	const blockSettings = {
@@ -40,14 +40,9 @@ describe( 'custom className', () => {
 	} );
 
 	describe( 'addSaveProps', () => {
-		const addSaveProps = applyFilters.bind(
-			null,
-			'blocks.getSaveContent.extraProps'
-		);
-
 		it( 'should do nothing if the block settings do not define custom className support', () => {
 			const attributes = { className: 'foo' };
-			const extraProps = addSaveProps(
+			const extraProps = customClassName.addSaveProps(
 				{},
 				{
 					...blockSettings,
@@ -63,7 +58,7 @@ describe( 'custom className', () => {
 
 		it( 'should inject the custom className', () => {
 			const attributes = { className: 'bar' };
-			const extraProps = addSaveProps(
+			const extraProps = customClassName.addSaveProps(
 				{ className: 'foo' },
 				blockSettings,
 				attributes
diff --git a/packages/block-editor/src/hooks/test/font-size.js b/packages/block-editor/src/hooks/test/font-size.js
new file mode 100644
index 00000000000000..11cd024bf8a285
--- /dev/null
+++ b/packages/block-editor/src/hooks/test/font-size.js
@@ -0,0 +1,164 @@
+/**
+ * External dependencies
+ */
+import { renderHook } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import { addFilter, removeFilter } from '@wordpress/hooks';
+import {
+	getBlockTypes,
+	registerBlockType,
+	unregisterBlockType,
+} from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import _fontSize from '../font-size';
+
+const noop = () => {};
+
+function addUseSettingFilter( callback ) {
+	addFilter(
+		'blockEditor.useSetting.before',
+		'test/useSetting.before',
+		callback
+	);
+}
+
+describe( 'useBlockProps', () => {
+	const blockSettings = {
+		save: () => noop,
+		category: 'text',
+		title: 'font size title',
+		name: 'test/font-size',
+		supports: {
+			typography: {
+				fontSize: true,
+			},
+		},
+	};
+
+	afterEach( () => {
+		getBlockTypes().forEach( ( block ) => {
+			unregisterBlockType( block.name );
+		} );
+		removeFilter(
+			'blockEditor.useSetting.before',
+			'test/useSetting.before'
+		);
+	} );
+
+	it( 'should return preset classname', () => {
+		registerBlockType( blockSettings.name, blockSettings );
+		addUseSettingFilter( ( result, path ) => {
+			if ( 'typography.fontSizes' === path ) {
+				return [
+					{
+						name: 'A larger font',
+						size: '32px',
+						slug: 'larger',
+					},
+				];
+			}
+
+			if ( 'typography.fluid' === path ) {
+				return false;
+			}
+
+			if ( 'layout' === path ) {
+				return {};
+			}
+
+			return result;
+		} );
+
+		const { result } = renderHook( () =>
+			_fontSize.useBlockProps( {
+				name: blockSettings.name,
+				fontSize: 'larger',
+			} )
+		);
+		const { style, className } = result.current;
+		expect( className ).toBe( 'has-larger-font-size' );
+		expect( style.fontSize ).toBe( '32px' );
+
+		removeFilter(
+			'blockEditor.useSetting.before',
+			'test/useSetting.before'
+		);
+	} );
+
+	it( 'should return custom font size', () => {
+		registerBlockType( blockSettings.name, blockSettings );
+		addUseSettingFilter( ( result, path ) => {
+			if ( 'typography.fontSizes' === path ) {
+				return [];
+			}
+
+			if ( 'typography.fluid' === path ) {
+				return false;
+			}
+
+			if ( 'layout' === path ) {
+				return {};
+			}
+
+			return result;
+		} );
+
+		const { result } = renderHook( () =>
+			_fontSize.useBlockProps( {
+				name: blockSettings.name,
+				style: {
+					typography: {
+						fontSize: '28px',
+					},
+				},
+			} )
+		);
+		const { style } = result.current;
+		expect( style.fontSize ).toBe( '28px' );
+
+		removeFilter(
+			'blockEditor.useSetting.before',
+			'test/useSetting.before'
+		);
+	} );
+
+	it( 'should convert custom font sizes to fluid', () => {
+		registerBlockType( blockSettings.name, blockSettings );
+		addUseSettingFilter( ( result, path ) => {
+			if ( 'typography.fontSizes' === path ) {
+				return [];
+			}
+
+			if ( 'typography.fluid' === path ) {
+				return true;
+			}
+
+			if ( 'layout' === path ) {
+				return {};
+			}
+
+			return result;
+		} );
+
+		const { result } = renderHook( () =>
+			_fontSize.useBlockProps( {
+				name: blockSettings.name,
+				style: {
+					typography: {
+						fontSize: '28px',
+					},
+				},
+			} )
+		);
+		const { style } = result.current;
+		expect( style.fontSize ).toBe(
+			'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)'
+		);
+	} );
+} );
diff --git a/packages/block-editor/src/hooks/test/get-variation-styles-with-ref-values.js b/packages/block-editor/src/hooks/test/get-variation-styles-with-ref-values.js
new file mode 100644
index 00000000000000..e42fcef06122b8
--- /dev/null
+++ b/packages/block-editor/src/hooks/test/get-variation-styles-with-ref-values.js
@@ -0,0 +1,91 @@
+/**
+ * Internal dependencies
+ */
+import { getVariationStylesWithRefValues } from '../block-style-variation';
+
+describe( 'getVariationStylesWithRefValues', () => {
+	it( 'should resolve ref values correctly', () => {
+		const globalStyles = {
+			styles: {
+				color: { background: 'red' },
+				blocks: {
+					'core/heading': {
+						color: { text: 'blue' },
+					},
+					'core/group': {
+						variations: {
+							custom: {
+								color: {
+									text: { ref: 'styles.does-not-exist' },
+									background: {
+										ref: 'styles.color.background',
+									},
+								},
+								blocks: {
+									'core/heading': {
+										color: {
+											text: {
+												ref: 'styles.blocks.core/heading.color.text',
+											},
+											background: { ref: '' },
+										},
+									},
+								},
+								elements: {
+									link: {
+										color: {
+											text: {
+												ref: 'styles.elements.link.color.text',
+											},
+											background: { ref: undefined },
+										},
+										':hover': {
+											color: {
+												text: {
+													ref: 'styles.elements.link.:hover.color.text',
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+				elements: {
+					link: {
+						color: { text: 'green' },
+						':hover': {
+							color: { text: 'yellow' },
+						},
+					},
+				},
+			},
+		};
+
+		expect(
+			getVariationStylesWithRefValues(
+				globalStyles,
+				'core/group',
+				'custom'
+			)
+		).toEqual( {
+			color: { background: 'red' },
+			blocks: {
+				'core/heading': {
+					color: { text: 'blue' },
+				},
+			},
+			elements: {
+				link: {
+					color: {
+						text: 'green',
+					},
+					':hover': {
+						color: { text: 'yellow' },
+					},
+				},
+			},
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/hooks/test/style.js b/packages/block-editor/src/hooks/test/style.js
index 544361a47f1156..2cfe299b8c8d91 100644
--- a/packages/block-editor/src/hooks/test/style.js
+++ b/packages/block-editor/src/hooks/test/style.js
@@ -1,12 +1,7 @@
-/**
- * WordPress dependencies
- */
-import { applyFilters } from '@wordpress/hooks';
-
 /**
  * Internal dependencies
  */
-import { getInlineStyles, omitStyle } from '../style';
+import _style, { getInlineStyles, omitStyle } from '../style';
 
 describe( 'getInlineStyles', () => {
 	it( 'should return an empty object when called with undefined', () => {
@@ -120,11 +115,6 @@ describe( 'getInlineStyles', () => {
 } );
 
 describe( 'addSaveProps', () => {
-	const addSaveProps = applyFilters.bind(
-		null,
-		'blocks.getSaveContent.extraProps'
-	);
-
 	const blockSettings = {
 		save: () => <div className="default" />,
 		category: 'text',
@@ -166,7 +156,7 @@ describe( 'addSaveProps', () => {
 	};
 
 	it( 'should serialize all styles by default', () => {
-		const extraProps = addSaveProps( {}, blockSettings, attributes );
+		const extraProps = _style.addSaveProps( {}, blockSettings, attributes );
 
 		expect( extraProps.style ).toEqual( {
 			background:
@@ -183,7 +173,7 @@ describe( 'addSaveProps', () => {
 		const settings = applySkipSerialization( {
 			typography: true,
 		} );
-		const extraProps = addSaveProps( {}, settings, attributes );
+		const extraProps = _style.addSaveProps( {}, settings, attributes );
 
 		expect( extraProps.style ).toEqual( {
 			background:
@@ -198,7 +188,7 @@ describe( 'addSaveProps', () => {
 			color: [ 'gradient' ],
 			typography: [ 'textDecoration', 'textTransform' ],
 		} );
-		const extraProps = addSaveProps( {}, settings, attributes );
+		const extraProps = _style.addSaveProps( {}, settings, attributes );
 
 		expect( extraProps.style ).toEqual( {
 			color: '#d92828',
diff --git a/packages/block-editor/src/hooks/test/text-align.js b/packages/block-editor/src/hooks/test/text-align.js
new file mode 100644
index 00000000000000..3b7d338193b30b
--- /dev/null
+++ b/packages/block-editor/src/hooks/test/text-align.js
@@ -0,0 +1,114 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	getBlockTypes,
+	registerBlockType,
+	unregisterBlockType,
+} from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { getValidTextAlignments, addAssignedTextAlign } from '../text-align';
+
+const noop = () => {};
+
+describe( 'textAlign', () => {
+	const blockSettings = {
+		save: noop,
+		category: 'text',
+		title: 'block title',
+		edit: ( { children } ) => <>{ children }</>,
+	};
+
+	afterEach( () => {
+		getBlockTypes().forEach( ( block ) => {
+			unregisterBlockType( block.name );
+		} );
+	} );
+
+	describe( 'getValidTextAlignments()', () => {
+		it( 'should return an empty array if block does not define align support', () => {
+			expect( getValidTextAlignments() ).toEqual( [] );
+		} );
+
+		it( 'should return all custom text aligns set', () => {
+			expect( getValidTextAlignments( [ 'left', 'right' ] ) ).toEqual( [
+				'left',
+				'right',
+			] );
+		} );
+
+		it( 'should return all text aligns sorted when provided in the random order', () => {
+			expect(
+				getValidTextAlignments( [ 'right', 'center', 'left' ] )
+			).toEqual( [ 'left', 'center', 'right' ] );
+		} );
+
+		it( 'should return all text aligns if block defines text align support as true', () => {
+			expect( getValidTextAlignments( true ) ).toEqual( [
+				'left',
+				'center',
+				'right',
+			] );
+		} );
+
+		it( 'should remove incorrect text aligns', () => {
+			expect(
+				getValidTextAlignments( [ 'left', 'right', 'justify' ] )
+			).toEqual( [ 'left', 'right' ] );
+		} );
+	} );
+
+	describe( 'addAssignedTextAlign', () => {
+		it( 'should do nothing if block does not support text align', () => {
+			registerBlockType( 'core/foo', blockSettings );
+
+			const props = addAssignedTextAlign(
+				{
+					className: 'foo',
+				},
+				'core/foo',
+				{
+					typography: {
+						textAlign: 'center',
+					},
+				}
+			);
+
+			expect( props ).toEqual( {
+				className: 'foo',
+			} );
+		} );
+
+		it( 'should do add text align classname if block supports text align', () => {
+			registerBlockType( 'core/foo', {
+				...blockSettings,
+				supports: {
+					typography: {
+						textAlign: true,
+					},
+				},
+			} );
+
+			const props = addAssignedTextAlign(
+				{
+					className: 'foo',
+				},
+				'core/foo',
+				{
+					style: {
+						typography: {
+							textAlign: 'center',
+						},
+					},
+				}
+			);
+
+			expect( props ).toEqual( {
+				className: 'has-text-align-center foo',
+			} );
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/hooks/test/use-typography-props.js b/packages/block-editor/src/hooks/test/use-typography-props.js
index 77b2e0cdf33cb7..c226b7f8199b9f 100644
--- a/packages/block-editor/src/hooks/test/use-typography-props.js
+++ b/packages/block-editor/src/hooks/test/use-typography-props.js
@@ -12,13 +12,15 @@ describe( 'getTypographyClassesAndStyles', () => {
 				typography: {
 					letterSpacing: '22px',
 					fontSize: '2rem',
+					textAlign: 'center',
 					textColumns: 3,
 					textTransform: 'uppercase',
 				},
 			},
 		};
 		expect( getTypographyClassesAndStyles( attributes ) ).toEqual( {
-			className: 'has-tofu-font-family has-large-font-size',
+			className:
+				'has-tofu-font-family has-text-align-center has-large-font-size',
 			style: {
 				columnCount: 3,
 				letterSpacing: '22px',
diff --git a/packages/block-editor/src/hooks/text-align.js b/packages/block-editor/src/hooks/text-align.js
new file mode 100644
index 00000000000000..af20404d79eccf
--- /dev/null
+++ b/packages/block-editor/src/hooks/text-align.js
@@ -0,0 +1,184 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { getBlockSupport, hasBlockSupport } from '@wordpress/blocks';
+import { alignLeft, alignRight, alignCenter } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import { AlignmentControl, BlockControls } from '../components';
+import { useBlockEditingMode } from '../components/block-editing-mode';
+import {
+	cleanEmptyObject,
+	shouldSkipSerialization,
+	useBlockSettings,
+} from './utils';
+import { TYPOGRAPHY_SUPPORT_KEY } from './typography';
+
+export const TEXT_ALIGN_SUPPORT_KEY = 'typography.textAlign';
+
+const TEXT_ALIGNMENT_OPTIONS = [
+	{
+		icon: alignLeft,
+		title: __( 'Align text left' ),
+		align: 'left',
+	},
+	{
+		icon: alignCenter,
+		title: __( 'Align text center' ),
+		align: 'center',
+	},
+	{
+		icon: alignRight,
+		title: __( 'Align text right' ),
+		align: 'right',
+	},
+];
+
+const VALID_TEXT_ALIGNMENTS = [ 'left', 'center', 'right' ];
+const NO_TEXT_ALIGNMENTS = [];
+
+/**
+ * Returns the valid text alignments.
+ * Takes into consideration the text aligns supported by a block.
+ * Exported just for testing purposes, not exported outside the module.
+ *
+ * @param {?boolean|string[]} blockTextAlign Text aligns supported by the block.
+ *
+ * @return {string[]} Valid text alignments.
+ */
+export function getValidTextAlignments( blockTextAlign ) {
+	if ( Array.isArray( blockTextAlign ) ) {
+		return VALID_TEXT_ALIGNMENTS.filter( ( textAlign ) =>
+			blockTextAlign.includes( textAlign )
+		);
+	}
+
+	return blockTextAlign === true ? VALID_TEXT_ALIGNMENTS : NO_TEXT_ALIGNMENTS;
+}
+
+function BlockEditTextAlignmentToolbarControlsPure( {
+	style,
+	name: blockName,
+	setAttributes,
+} ) {
+	const settings = useBlockSettings( blockName );
+	const hasTextAlignControl = settings?.typography?.textAlign;
+	const blockEditingMode = useBlockEditingMode();
+
+	if ( ! hasTextAlignControl || blockEditingMode !== 'default' ) {
+		return null;
+	}
+
+	const validTextAlignments = getValidTextAlignments(
+		getBlockSupport( blockName, TEXT_ALIGN_SUPPORT_KEY )
+	);
+	if ( ! validTextAlignments.length ) {
+		return null;
+	}
+
+	const textAlignmentControls = TEXT_ALIGNMENT_OPTIONS.filter( ( control ) =>
+		validTextAlignments.includes( control.align )
+	);
+
+	const onChange = ( newTextAlignValue ) => {
+		const newStyle = {
+			...style,
+			typography: {
+				...style?.typography,
+				textAlign: newTextAlignValue,
+			},
+		};
+
+		setAttributes( { style: cleanEmptyObject( newStyle ) } );
+	};
+
+	return (
+		<BlockControls group="block">
+			<AlignmentControl
+				value={ style?.typography?.textAlign }
+				onChange={ onChange }
+				alignmentControls={ textAlignmentControls }
+			/>
+		</BlockControls>
+	);
+}
+
+export default {
+	edit: BlockEditTextAlignmentToolbarControlsPure,
+	useBlockProps,
+	addSaveProps: addAssignedTextAlign,
+	attributeKeys: [ 'style' ],
+	hasSupport( name ) {
+		return hasBlockSupport( name, TEXT_ALIGN_SUPPORT_KEY, false );
+	},
+};
+
+function useBlockProps( { name, style } ) {
+	if ( ! style?.typography?.textAlign ) {
+		return null;
+	}
+
+	const validTextAlignments = getValidTextAlignments(
+		getBlockSupport( name, TEXT_ALIGN_SUPPORT_KEY )
+	);
+
+	if ( ! validTextAlignments.length ) {
+		return null;
+	}
+
+	if (
+		shouldSkipSerialization( name, TYPOGRAPHY_SUPPORT_KEY, 'textAlign' )
+	) {
+		return null;
+	}
+
+	const textAlign = style.typography.textAlign;
+
+	const className = clsx( {
+		[ `has-text-align-${ textAlign }` ]: textAlign,
+	} );
+	return { className };
+}
+
+/**
+ * Override props assigned to save component to inject text alignment class
+ * name if block supports it.
+ *
+ * @param {Object} props      Additional props applied to save element.
+ * @param {Object} blockType  Block type.
+ * @param {Object} attributes Block attributes.
+ *
+ * @return {Object} Filtered props applied to save element.
+ */
+export function addAssignedTextAlign( props, blockType, attributes ) {
+	if ( ! attributes?.style?.typography?.textAlign ) {
+		return props;
+	}
+
+	const { textAlign } = attributes.style.typography;
+	const blockTextAlign = getBlockSupport( blockType, TEXT_ALIGN_SUPPORT_KEY );
+	const isTextAlignValid =
+		getValidTextAlignments( blockTextAlign ).includes( textAlign );
+	if (
+		isTextAlignValid &&
+		! shouldSkipSerialization(
+			blockType,
+			TYPOGRAPHY_SUPPORT_KEY,
+			'textAlign'
+		)
+	) {
+		props.className = clsx(
+			`has-text-align-${ textAlign }`,
+			props.className
+		);
+	}
+	return props;
+}
diff --git a/packages/block-editor/src/hooks/typography.js b/packages/block-editor/src/hooks/typography.js
index 7d0e5e1c318d56..cf3f4327c8f034 100644
--- a/packages/block-editor/src/hooks/typography.js
+++ b/packages/block-editor/src/hooks/typography.js
@@ -4,7 +4,6 @@
 import { getBlockSupport, hasBlockSupport } from '@wordpress/blocks';
 import { useMemo, useCallback } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
-import { pure } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -18,7 +17,8 @@ import {
 import { LINE_HEIGHT_SUPPORT_KEY } from './line-height';
 import { FONT_FAMILY_SUPPORT_KEY } from './font-family';
 import { FONT_SIZE_SUPPORT_KEY } from './font-size';
-import { cleanEmptyObject, useBlockSettings } from './utils';
+import { TEXT_ALIGN_SUPPORT_KEY } from './text-align';
+import { cleanEmptyObject } from './utils';
 import { store as blockEditorStore } from '../store';
 
 function omit( object, keys ) {
@@ -41,6 +41,7 @@ export const TYPOGRAPHY_SUPPORT_KEYS = [
 	FONT_STYLE_SUPPORT_KEY,
 	FONT_WEIGHT_SUPPORT_KEY,
 	FONT_FAMILY_SUPPORT_KEY,
+	TEXT_ALIGN_SUPPORT_KEY,
 	TEXT_COLUMNS_SUPPORT_KEY,
 	TEXT_DECORATION_SUPPORT_KEY,
 	WRITING_MODE_SUPPORT_KEY,
@@ -109,19 +110,13 @@ function TypographyInspectorControl( { children, resetAllFilter } ) {
 	);
 }
 
-function TypographyPanelPure( {
-	clientId,
-	name,
-	setAttributes,
-	__unstableParentLayout,
-} ) {
+export function TypographyPanel( { clientId, name, setAttributes, settings } ) {
 	function selector( select ) {
 		const { style, fontFamily, fontSize } =
 			select( blockEditorStore ).getBlockAttributes( clientId ) || {};
 		return { style, fontFamily, fontSize };
 	}
 	const { style, fontFamily, fontSize } = useSelect( selector, [ clientId ] );
-	const settings = useBlockSettings( name, __unstableParentLayout );
 	const isEnabled = useHasTypographyPanel( settings );
 	const value = useMemo(
 		() => attributesToStyle( { style, fontFamily, fontSize } ),
@@ -153,8 +148,6 @@ function TypographyPanelPure( {
 	);
 }
 
-export const TypographyPanel = pure( TypographyPanelPure );
-
 export const hasTypographySupport = ( blockName ) => {
 	return TYPOGRAPHY_SUPPORT_KEYS.some( ( key ) =>
 		hasBlockSupport( blockName, key )
diff --git a/packages/block-editor/src/hooks/typography.native.js b/packages/block-editor/src/hooks/typography.native.js
index f6fe58edb28703..f0e9c9c10913d7 100644
--- a/packages/block-editor/src/hooks/typography.native.js
+++ b/packages/block-editor/src/hooks/typography.native.js
@@ -1,10 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { hasBlockSupport } from '@wordpress/blocks';
-/**
- * External dependencies
- */
+import { useSelect } from '@wordpress/data';
+import { memo } from '@wordpress/element';
 import { PanelBody } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
@@ -12,17 +10,12 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import InspectorControls from '../components/inspector-controls';
+import { useHasTypographyPanel } from '../components/global-styles/typography-panel';
 
-import {
-	LINE_HEIGHT_SUPPORT_KEY,
-	LineHeightEdit,
-	useIsLineHeightDisabled,
-} from './line-height';
-import {
-	FONT_SIZE_SUPPORT_KEY,
-	FontSizeEdit,
-	useIsFontSizeDisabled,
-} from './font-size';
+import { store as blockEditorStore } from '../store';
+
+import { LINE_HEIGHT_SUPPORT_KEY, LineHeightEdit } from './line-height';
+import { FONT_SIZE_SUPPORT_KEY, FontSizeEdit } from './font-size';
 
 export const TYPOGRAPHY_SUPPORT_KEY = 'typography';
 export const TYPOGRAPHY_SUPPORT_KEYS = [
@@ -30,11 +23,26 @@ export const TYPOGRAPHY_SUPPORT_KEYS = [
 	FONT_SIZE_SUPPORT_KEY,
 ];
 
-export function TypographyPanel( props ) {
-	const isDisabled = useIsTypographyDisabled( props );
-	const isSupported = hasTypographySupport( props.name );
-
-	if ( isDisabled || ! isSupported ) return null;
+function TypographyPanelPure( { clientId, setAttributes, settings } ) {
+	function selector( select ) {
+		const { style, fontFamily, fontSize } =
+			select( blockEditorStore ).getBlockAttributes( clientId ) || {};
+		return { style, fontFamily, fontSize };
+	}
+	const { style, fontSize } = useSelect( selector, [ clientId ] );
+	const isEnabled = useHasTypographyPanel( settings );
+
+	if ( ! isEnabled ) {
+		return null;
+	}
+
+	const props = {
+		attributes: {
+			fontSize,
+			style,
+		},
+		setAttributes,
+	};
 
 	return (
 		<InspectorControls>
@@ -46,17 +54,7 @@ export function TypographyPanel( props ) {
 	);
 }
 
-const hasTypographySupport = ( blockName ) => {
-	return TYPOGRAPHY_SUPPORT_KEYS.some( ( key ) =>
-		hasBlockSupport( blockName, key )
-	);
-};
-
-function useIsTypographyDisabled( props = {} ) {
-	const configs = [
-		useIsFontSizeDisabled( props ),
-		useIsLineHeightDisabled( props ),
-	];
-
-	return configs.filter( Boolean ).length === configs.length;
-}
+// We don't want block controls to re-render when typing inside a block. `pure`
+// will prevent re-renders unless props change, so only pass the needed props
+// and not the whole attributes object.
+export const TypographyPanel = memo( TypographyPanelPure );
diff --git a/packages/block-editor/src/hooks/use-bindings-attributes.js b/packages/block-editor/src/hooks/use-bindings-attributes.js
new file mode 100644
index 00000000000000..fdc617fda20c05
--- /dev/null
+++ b/packages/block-editor/src/hooks/use-bindings-attributes.js
@@ -0,0 +1,322 @@
+/**
+ * WordPress dependencies
+ */
+import { store as blocksStore } from '@wordpress/blocks';
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { useRegistry, useSelect } from '@wordpress/data';
+import { useCallback, useMemo, useContext } from '@wordpress/element';
+import { addFilter } from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import isURLLike from '../components/link-control/is-url-like';
+import { unlock } from '../lock-unlock';
+import BlockContext from '../components/block-context';
+
+/** @typedef {import('@wordpress/compose').WPHigherOrderComponent} WPHigherOrderComponent */
+/** @typedef {import('@wordpress/blocks').WPBlockSettings} WPBlockSettings */
+
+/**
+ * Given a binding of block attributes, returns a higher order component that
+ * overrides its `attributes` and `setAttributes` props to sync any changes needed.
+ *
+ * @return {WPHigherOrderComponent} Higher-order component.
+ */
+
+const BLOCK_BINDINGS_ALLOWED_BLOCKS = {
+	'core/paragraph': [ 'content' ],
+	'core/heading': [ 'content' ],
+	'core/image': [ 'id', 'url', 'title', 'alt' ],
+	'core/button': [ 'url', 'text', 'linkTarget', 'rel' ],
+};
+
+const DEFAULT_ATTRIBUTE = '__default';
+
+/**
+ * Returns the bindings with the `__default` binding for pattern overrides
+ * replaced with the full-set of supported attributes. e.g.:
+ *
+ * bindings passed in: `{ __default: { source: 'core/pattern-overrides' } }`
+ * bindings returned: `{ content: { source: 'core/pattern-overrides' } }`
+ *
+ * @param {string} blockName The block name (e.g. 'core/paragraph').
+ * @param {Object} bindings  A block's bindings from the metadata attribute.
+ *
+ * @return {Object} The bindings with default replaced for pattern overrides.
+ */
+function replacePatternOverrideDefaultBindings( blockName, bindings ) {
+	// The `__default` binding currently only works for pattern overrides.
+	if (
+		bindings?.[ DEFAULT_ATTRIBUTE ]?.source === 'core/pattern-overrides'
+	) {
+		const supportedAttributes = BLOCK_BINDINGS_ALLOWED_BLOCKS[ blockName ];
+		const bindingsWithDefaults = {};
+		for ( const attributeName of supportedAttributes ) {
+			// If the block has mixed binding sources, retain any non pattern override bindings.
+			const bindingSource = bindings[ attributeName ]
+				? bindings[ attributeName ]
+				: { source: 'core/pattern-overrides' };
+			bindingsWithDefaults[ attributeName ] = bindingSource;
+		}
+
+		return bindingsWithDefaults;
+	}
+
+	return bindings;
+}
+
+/**
+ * Based on the given block name,
+ * check if it is possible to bind the block.
+ *
+ * @param {string} blockName - The block name.
+ * @return {boolean} Whether it is possible to bind the block to sources.
+ */
+export function canBindBlock( blockName ) {
+	return blockName in BLOCK_BINDINGS_ALLOWED_BLOCKS;
+}
+
+/**
+ * Based on the given block name and attribute name,
+ * check if it is possible to bind the block attribute.
+ *
+ * @param {string} blockName     - The block name.
+ * @param {string} attributeName - The attribute name.
+ * @return {boolean} Whether it is possible to bind the block attribute.
+ */
+export function canBindAttribute( blockName, attributeName ) {
+	return (
+		canBindBlock( blockName ) &&
+		BLOCK_BINDINGS_ALLOWED_BLOCKS[ blockName ].includes( attributeName )
+	);
+}
+
+export function getBindableAttributes( blockName ) {
+	return BLOCK_BINDINGS_ALLOWED_BLOCKS[ blockName ];
+}
+
+export const withBlockBindingSupport = createHigherOrderComponent(
+	( BlockEdit ) => ( props ) => {
+		const registry = useRegistry();
+		const blockContext = useContext( BlockContext );
+		const sources = useSelect( ( select ) =>
+			unlock( select( blocksStore ) ).getAllBlockBindingsSources()
+		);
+		const { name, clientId, context, setAttributes } = props;
+		const blockBindings = useMemo(
+			() =>
+				replacePatternOverrideDefaultBindings(
+					name,
+					props.attributes.metadata?.bindings
+				),
+			[ props.attributes.metadata?.bindings, name ]
+		);
+
+		// While this hook doesn't directly call any selectors, `useSelect` is
+		// used purposely here to ensure `boundAttributes` is updated whenever
+		// there are attribute updates.
+		// `source.getValues` may also call a selector via `registry.select`.
+		const updatedContext = {};
+		const boundAttributes = useSelect(
+			( select ) => {
+				if ( ! blockBindings ) {
+					return;
+				}
+
+				const attributes = {};
+
+				const blockBindingsBySource = new Map();
+
+				for ( const [ attributeName, binding ] of Object.entries(
+					blockBindings
+				) ) {
+					const { source: sourceName, args: sourceArgs } = binding;
+					const source = sources[ sourceName ];
+					if (
+						! source ||
+						! canBindAttribute( name, attributeName )
+					) {
+						continue;
+					}
+
+					// Populate context.
+					for ( const key of source.usesContext || [] ) {
+						updatedContext[ key ] = blockContext[ key ];
+					}
+
+					blockBindingsBySource.set( source, {
+						...blockBindingsBySource.get( source ),
+						[ attributeName ]: {
+							args: sourceArgs,
+						},
+					} );
+				}
+
+				if ( blockBindingsBySource.size ) {
+					for ( const [
+						source,
+						bindings,
+					] of blockBindingsBySource ) {
+						// Get values in batch if the source supports it.
+						let values = {};
+						if ( ! source.getValues ) {
+							Object.keys( bindings ).forEach( ( attr ) => {
+								// Default to the the source label when `getValues` doesn't exist.
+								values[ attr ] = source.label;
+							} );
+						} else {
+							values = source.getValues( {
+								select,
+								context: updatedContext,
+								clientId,
+								bindings,
+							} );
+						}
+						for ( const [ attributeName, value ] of Object.entries(
+							values
+						) ) {
+							if (
+								attributeName === 'url' &&
+								( ! value || ! isURLLike( value ) )
+							) {
+								// Return null if value is not a valid URL.
+								attributes[ attributeName ] = null;
+							} else {
+								attributes[ attributeName ] = value;
+							}
+						}
+					}
+				}
+
+				return attributes;
+			},
+			[ blockBindings, name, clientId, updatedContext, sources ]
+		);
+
+		const hasParentPattern = !! updatedContext[ 'pattern/overrides' ];
+		const hasPatternOverridesDefaultBinding =
+			props.attributes.metadata?.bindings?.[ DEFAULT_ATTRIBUTE ]
+				?.source === 'core/pattern-overrides';
+
+		const _setAttributes = useCallback(
+			( nextAttributes ) => {
+				registry.batch( () => {
+					if ( ! blockBindings ) {
+						setAttributes( nextAttributes );
+						return;
+					}
+
+					const keptAttributes = { ...nextAttributes };
+					const blockBindingsBySource = new Map();
+
+					// Loop only over the updated attributes to avoid modifying the bound ones that haven't changed.
+					for ( const [ attributeName, newValue ] of Object.entries(
+						keptAttributes
+					) ) {
+						if (
+							! blockBindings[ attributeName ] ||
+							! canBindAttribute( name, attributeName )
+						) {
+							continue;
+						}
+
+						const binding = blockBindings[ attributeName ];
+						const source = sources[ binding?.source ];
+						if ( ! source?.setValues ) {
+							continue;
+						}
+						blockBindingsBySource.set( source, {
+							...blockBindingsBySource.get( source ),
+							[ attributeName ]: {
+								args: binding.args,
+								newValue,
+							},
+						} );
+						delete keptAttributes[ attributeName ];
+					}
+
+					if ( blockBindingsBySource.size ) {
+						for ( const [
+							source,
+							bindings,
+						] of blockBindingsBySource ) {
+							source.setValues( {
+								select: registry.select,
+								dispatch: registry.dispatch,
+								context: updatedContext,
+								clientId,
+								bindings,
+							} );
+						}
+					}
+
+					if (
+						// Don't update non-connected attributes if the block is using pattern overrides
+						// and the editing is happening while overriding the pattern (not editing the original).
+						! (
+							hasPatternOverridesDefaultBinding &&
+							hasParentPattern
+						) &&
+						Object.keys( keptAttributes ).length
+					) {
+						// Don't update caption and href until they are supported.
+						if ( hasPatternOverridesDefaultBinding ) {
+							delete keptAttributes?.caption;
+							delete keptAttributes?.href;
+						}
+						setAttributes( keptAttributes );
+					}
+				} );
+			},
+			[
+				registry,
+				blockBindings,
+				name,
+				clientId,
+				updatedContext,
+				setAttributes,
+				sources,
+				hasPatternOverridesDefaultBinding,
+				hasParentPattern,
+			]
+		);
+
+		return (
+			<>
+				<BlockEdit
+					{ ...props }
+					attributes={ { ...props.attributes, ...boundAttributes } }
+					setAttributes={ _setAttributes }
+					context={ { ...context, ...updatedContext } }
+				/>
+			</>
+		);
+	},
+	'withBlockBindingSupport'
+);
+
+/**
+ * Filters a registered block's settings to enhance a block's `edit` component
+ * to upgrade bound attributes.
+ *
+ * @param {WPBlockSettings} settings - Registered block settings.
+ * @param {string}          name     - Block name.
+ * @return {WPBlockSettings} Filtered block settings.
+ */
+function shimAttributeSource( settings, name ) {
+	if ( ! canBindBlock( name ) ) {
+		return settings;
+	}
+
+	return {
+		...settings,
+		edit: withBlockBindingSupport( settings.edit ),
+	};
+}
+
+addFilter(
+	'blocks.registerBlockType',
+	'core/editor/custom-sources-backwards-compatibility/shim-attribute-source',
+	shimAttributeSource
+);
diff --git a/packages/block-editor/src/hooks/use-color-props.js b/packages/block-editor/src/hooks/use-color-props.js
index 679f0b7accbf71..5e52b3eb6841fa 100644
--- a/packages/block-editor/src/hooks/use-color-props.js
+++ b/packages/block-editor/src/hooks/use-color-props.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -51,7 +51,7 @@ export function getColorClassesAndStyles( attributes ) {
 	const hasGradient = gradientClass || style?.color?.gradient;
 
 	// Determine color CSS class name list.
-	const className = classnames( textClass, gradientClass, {
+	const className = clsx( textClass, gradientClass, {
 		// Don't apply the background class if there's a gradient.
 		[ backgroundClass ]: ! hasGradient && !! backgroundClass,
 		'has-text-color': textColor || style?.color?.text,
diff --git a/packages/block-editor/src/hooks/use-editor-wrapper-styles.native.scss b/packages/block-editor/src/hooks/use-editor-wrapper-styles.native.scss
index c980253ee64251..2ae4ed8b86144c 100644
--- a/packages/block-editor/src/hooks/use-editor-wrapper-styles.native.scss
+++ b/packages/block-editor/src/hooks/use-editor-wrapper-styles.native.scss
@@ -5,6 +5,7 @@
 }
 
 .use-editor-wrapper-styles--reversed {
+	/* stylelint-disable-next-line declaration-property-value-allowed-list -- This should be refactored to not use the column-reverse value. */
 	flex-direction: column-reverse;
 	width: 100%;
 	max-width: 580;
diff --git a/packages/block-editor/src/hooks/use-shadow-props.js b/packages/block-editor/src/hooks/use-shadow-props.js
new file mode 100644
index 00000000000000..34fb8b45467521
--- /dev/null
+++ b/packages/block-editor/src/hooks/use-shadow-props.js
@@ -0,0 +1,23 @@
+/**
+ * Internal dependencies
+ */
+import { getInlineStyles } from './style';
+
+// This utility is intended to assist where the serialization of the shadow
+// block support is being skipped for a block but the shadow related CSS classes
+// & styles still need to be generated so they can be applied to inner elements.
+
+/**
+ * Provides the CSS class names and inline styles for a block's shadow support
+ * attributes.
+ *
+ * @param {Object} attributes Block attributes.
+ * @return {Object} Shadow block support derived CSS classes & styles.
+ */
+export function getShadowClassesAndStyles( attributes ) {
+	const shadow = attributes.style?.shadow || '';
+
+	return {
+		style: getInlineStyles( { shadow } ),
+	};
+}
diff --git a/packages/block-editor/src/hooks/use-typography-props.js b/packages/block-editor/src/hooks/use-typography-props.js
index 1ed02d4a5835f2..0f1a2caefde048 100644
--- a/packages/block-editor/src/hooks/use-typography-props.js
+++ b/packages/block-editor/src/hooks/use-typography-props.js
@@ -1,18 +1,22 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import { getInlineStyles } from './style';
 import { getFontSizeClass } from '../components/font-sizes';
-import {
-	getTypographyFontSizeValue,
-	getFluidTypographyOptionsFromSettings,
-} from '../components/global-styles/typography-utils';
-import { kebabCase } from '../utils/object';
+import { getTypographyFontSizeValue } from '../components/global-styles/typography-utils';
+import { unlock } from '../lock-unlock';
+
+const { kebabCase } = unlock( componentsPrivateApis );
 
 /*
  * This utility is intended to assist where the serialization of the typography
@@ -30,14 +34,11 @@ import { kebabCase } from '../utils/object';
  */
 export function getTypographyClassesAndStyles( attributes, settings ) {
 	let typographyStyles = attributes?.style?.typography || {};
-	const fluidTypographySettings =
-		getFluidTypographyOptionsFromSettings( settings );
-
 	typographyStyles = {
 		...typographyStyles,
 		fontSize: getTypographyFontSizeValue(
 			{ size: attributes?.style?.typography?.fontSize },
-			fluidTypographySettings
+			settings
 		),
 	};
 
@@ -45,9 +46,12 @@ export function getTypographyClassesAndStyles( attributes, settings ) {
 	const fontFamilyClassName = !! attributes?.fontFamily
 		? `has-${ kebabCase( attributes.fontFamily ) }-font-family`
 		: '';
-
-	const className = classnames(
+	const textAlignClassName = !! attributes?.style?.typography?.textAlign
+		? `has-text-align-${ attributes?.style?.typography?.textAlign }`
+		: '';
+	const className = clsx(
 		fontFamilyClassName,
+		textAlignClassName,
 		getFontSizeClass( attributes?.fontSize )
 	);
 
diff --git a/packages/block-editor/src/hooks/use-zoom-out.js b/packages/block-editor/src/hooks/use-zoom-out.js
new file mode 100644
index 00000000000000..bcf5d9ff882f7b
--- /dev/null
+++ b/packages/block-editor/src/hooks/use-zoom-out.js
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../store';
+import { unlock } from '../lock-unlock';
+
+/**
+ * A hook used to set the editor mode to zoomed out mode, invoking the hook sets the mode.
+ *
+ * @param {boolean} zoomOut If we should enter into zoomOut mode or not
+ */
+export function useZoomOut( zoomOut = true ) {
+	const { setZoomLevel, resetZoomLevel } = unlock(
+		useDispatch( blockEditorStore )
+	);
+	const { isZoomOut } = unlock( useSelect( blockEditorStore ) );
+
+	useEffect( () => {
+		const isZoomOutOnMount = isZoomOut();
+
+		return () => {
+			if ( isZoomOutOnMount ) {
+				setZoomLevel( 'auto-scaled' );
+			} else {
+				resetZoomLevel();
+			}
+		};
+	}, [] );
+
+	useEffect( () => {
+		if ( zoomOut ) {
+			setZoomLevel( 'auto-scaled' );
+		} else {
+			resetZoomLevel();
+		}
+	}, [ zoomOut, setZoomLevel, resetZoomLevel ] );
+}
diff --git a/packages/block-editor/src/hooks/utils.js b/packages/block-editor/src/hooks/utils.js
index 5985b821d00a86..fa710fa7f08eba 100644
--- a/packages/block-editor/src/hooks/utils.js
+++ b/packages/block-editor/src/hooks/utils.js
@@ -2,17 +2,28 @@
  * WordPress dependencies
  */
 import { getBlockSupport } from '@wordpress/blocks';
-import { useMemo, useEffect, useId } from '@wordpress/element';
-import { useDispatch } from '@wordpress/data';
+import { memo, useMemo, useEffect, useId, useState } from '@wordpress/element';
+import { useDispatch, useRegistry } from '@wordpress/data';
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { addFilter } from '@wordpress/hooks';
 
 /**
  * Internal dependencies
  */
+import {
+	useBlockEditContext,
+	mayDisplayControlsKey,
+	mayDisplayParentControlsKey,
+} from '../components/block-edit/context';
 import { useSettings } from '../components';
 import { useSettingsForBlockElement } from '../components/global-styles/hooks';
 import { getValueFromObjectPath, setImmutably } from '../utils/object';
 import { store as blockEditorStore } from '../store';
 import { unlock } from '../lock-unlock';
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
 
 /**
  * Removed falsy values from nested object.
@@ -101,14 +112,18 @@ export function transformStyles(
  * Check whether serialization of specific block support feature or set should
  * be skipped.
  *
- * @param {string|Object} blockType  Block name or block type object.
- * @param {string}        featureSet Name of block support feature set.
- * @param {string}        feature    Name of the individual feature to check.
+ * @param {string|Object} blockNameOrType Block name or block type object.
+ * @param {string}        featureSet      Name of block support feature set.
+ * @param {string}        feature         Name of the individual feature to check.
  *
  * @return {boolean} Whether serialization should occur.
  */
-export function shouldSkipSerialization( blockType, featureSet, feature ) {
-	const support = getBlockSupport( blockType, featureSet );
+export function shouldSkipSerialization(
+	blockNameOrType,
+	featureSet,
+	feature
+) {
+	const support = getBlockSupport( blockNameOrType, featureSet );
 	const skipSerialization = support?.__experimentalSkipSerialization;
 
 	if ( Array.isArray( skipSerialization ) ) {
@@ -118,32 +133,91 @@ export function shouldSkipSerialization( blockType, featureSet, feature ) {
 	return skipSerialization;
 }
 
-export function useStyleOverride( { id, css, assets, __unstableType } = {} ) {
+const pendingStyleOverrides = new WeakMap();
+
+/**
+ * Override a block editor settings style. Leave the ID blank to create a new
+ * style.
+ *
+ * @param {Object}  override     Override object.
+ * @param {?string} override.id  Id of the style override, leave blank to create
+ *                               a new style.
+ * @param {string}  override.css CSS to apply.
+ */
+export function useStyleOverride( { id, css } ) {
+	return usePrivateStyleOverride( { id, css } );
+}
+
+export function usePrivateStyleOverride( {
+	id,
+	css,
+	assets,
+	__unstableType,
+	variation,
+	clientId,
+} = {} ) {
 	const { setStyleOverride, deleteStyleOverride } = unlock(
 		useDispatch( blockEditorStore )
 	);
+	const registry = useRegistry();
 	const fallbackId = useId();
 	useEffect( () => {
 		// Unmount if there is CSS and assets are empty.
-		if ( ! css && ! assets ) return;
+		if ( ! css && ! assets ) {
+			return;
+		}
+
 		const _id = id || fallbackId;
-		setStyleOverride( _id, {
+		const override = {
 			id,
 			css,
 			assets,
 			__unstableType,
+			variation,
+			clientId,
+		};
+		// Batch updates to style overrides to avoid triggering cascading renders
+		// for each style override block included in a tree and optimize initial render.
+		if ( ! pendingStyleOverrides.get( registry ) ) {
+			pendingStyleOverrides.set( registry, [] );
+		}
+		pendingStyleOverrides.get( registry ).push( [ _id, override ] );
+		window.queueMicrotask( () => {
+			if ( pendingStyleOverrides.get( registry )?.length ) {
+				registry.batch( () => {
+					pendingStyleOverrides.get( registry ).forEach( ( args ) => {
+						setStyleOverride( ...args );
+					} );
+					pendingStyleOverrides.set( registry, [] );
+				} );
+			}
 		} );
+
 		return () => {
-			deleteStyleOverride( _id );
+			const isPending = pendingStyleOverrides
+				.get( registry )
+				?.find( ( [ currentId ] ) => currentId === _id );
+			if ( isPending ) {
+				pendingStyleOverrides.set(
+					registry,
+					pendingStyleOverrides
+						.get( registry )
+						.filter( ( [ currentId ] ) => currentId !== _id )
+				);
+			} else {
+				deleteStyleOverride( _id );
+			}
 		};
 	}, [
 		id,
 		css,
+		clientId,
 		assets,
 		__unstableType,
 		fallbackId,
 		setStyleOverride,
 		deleteStyleOverride,
+		registry,
 	] );
 }
 
@@ -159,12 +233,20 @@ export function useStyleOverride( { id, css, assets, __unstableType } = {} ) {
  */
 export function useBlockSettings( name, parentLayout ) {
 	const [
-		fontFamilies,
-		fontSizes,
+		backgroundImage,
+		backgroundSize,
+		customFontFamilies,
+		defaultFontFamilies,
+		themeFontFamilies,
+		defaultFontSizesEnabled,
+		customFontSizes,
+		defaultFontSizes,
+		themeFontSizes,
 		customFontSize,
 		fontStyle,
 		fontWeight,
 		lineHeight,
+		textAlign,
 		textColumns,
 		textDecoration,
 		writingMode,
@@ -173,8 +255,13 @@ export function useBlockSettings( name, parentLayout ) {
 		padding,
 		margin,
 		blockGap,
-		spacingSizes,
+		defaultSpacingSizesEnabled,
+		customSpacingSize,
+		userSpacingSizes,
+		defaultSpacingSizes,
+		themeSpacingSizes,
 		units,
+		aspectRatio,
 		minHeight,
 		layout,
 		borderColor,
@@ -201,13 +288,22 @@ export function useBlockSettings( name, parentLayout ) {
 		isTextEnabled,
 		isHeadingEnabled,
 		isButtonEnabled,
+		shadow,
 	] = useSettings(
-		'typography.fontFamilies',
-		'typography.fontSizes',
+		'background.backgroundImage',
+		'background.backgroundSize',
+		'typography.fontFamilies.custom',
+		'typography.fontFamilies.default',
+		'typography.fontFamilies.theme',
+		'typography.defaultFontSizes',
+		'typography.fontSizes.custom',
+		'typography.fontSizes.default',
+		'typography.fontSizes.theme',
 		'typography.customFontSize',
 		'typography.fontStyle',
 		'typography.fontWeight',
 		'typography.lineHeight',
+		'typography.textAlign',
 		'typography.textColumns',
 		'typography.textDecoration',
 		'typography.writingMode',
@@ -216,8 +312,13 @@ export function useBlockSettings( name, parentLayout ) {
 		'spacing.padding',
 		'spacing.margin',
 		'spacing.blockGap',
-		'spacing.spacingSizes',
+		'spacing.defaultSpacingSizes',
+		'spacing.customSpacingSize',
+		'spacing.spacingSizes.custom',
+		'spacing.spacingSizes.default',
+		'spacing.spacingSizes.theme',
 		'spacing.units',
+		'dimensions.aspectRatio',
 		'dimensions.minHeight',
 		'layout',
 		'border.color',
@@ -243,11 +344,16 @@ export function useBlockSettings( name, parentLayout ) {
 		'color.link',
 		'color.text',
 		'color.heading',
-		'color.button'
+		'color.button',
+		'shadow'
 	);
 
 	const rawSettings = useMemo( () => {
 		return {
+			background: {
+				backgroundImage,
+				backgroundSize,
+			},
 			color: {
 				palette: {
 					custom: customColors,
@@ -278,15 +384,21 @@ export function useBlockSettings( name, parentLayout ) {
 			},
 			typography: {
 				fontFamilies: {
-					custom: fontFamilies,
+					custom: customFontFamilies,
+					default: defaultFontFamilies,
+					theme: themeFontFamilies,
 				},
 				fontSizes: {
-					custom: fontSizes,
+					custom: customFontSizes,
+					default: defaultFontSizes,
+					theme: themeFontSizes,
 				},
 				customFontSize,
+				defaultFontSizes: defaultFontSizesEnabled,
 				fontStyle,
 				fontWeight,
 				lineHeight,
+				textAlign,
 				textColumns,
 				textDecoration,
 				textTransform,
@@ -295,8 +407,12 @@ export function useBlockSettings( name, parentLayout ) {
 			},
 			spacing: {
 				spacingSizes: {
-					custom: spacingSizes,
+					custom: userSpacingSizes,
+					default: defaultSpacingSizes,
+					theme: themeSpacingSizes,
 				},
+				customSpacingSize,
+				defaultSpacingSizes: defaultSpacingSizesEnabled,
 				padding,
 				margin,
 				blockGap,
@@ -309,18 +425,28 @@ export function useBlockSettings( name, parentLayout ) {
 				width: borderWidth,
 			},
 			dimensions: {
+				aspectRatio,
 				minHeight,
 			},
 			layout,
 			parentLayout,
+			shadow,
 		};
 	}, [
-		fontFamilies,
-		fontSizes,
+		backgroundImage,
+		backgroundSize,
+		customFontFamilies,
+		defaultFontFamilies,
+		themeFontFamilies,
+		defaultFontSizesEnabled,
+		customFontSizes,
+		defaultFontSizes,
+		themeFontSizes,
 		customFontSize,
 		fontStyle,
 		fontWeight,
 		lineHeight,
+		textAlign,
 		textColumns,
 		textDecoration,
 		textTransform,
@@ -329,8 +455,13 @@ export function useBlockSettings( name, parentLayout ) {
 		padding,
 		margin,
 		blockGap,
-		spacingSizes,
+		defaultSpacingSizesEnabled,
+		customSpacingSize,
+		userSpacingSizes,
+		defaultSpacingSizes,
+		themeSpacingSizes,
 		units,
+		aspectRatio,
 		minHeight,
 		layout,
 		parentLayout,
@@ -358,7 +489,225 @@ export function useBlockSettings( name, parentLayout ) {
 		isTextEnabled,
 		isHeadingEnabled,
 		isButtonEnabled,
+		shadow,
 	] );
 
 	return useSettingsForBlockElement( rawSettings, name );
 }
+
+export function createBlockEditFilter( features ) {
+	// We don't want block controls to re-render when typing inside a block.
+	// `memo` will prevent re-renders unless props change, so only pass the
+	// needed props and not the whole attributes object.
+	features = features.map( ( settings ) => {
+		return { ...settings, Edit: memo( settings.edit ) };
+	} );
+	const withBlockEditHooks = createHigherOrderComponent(
+		( OriginalBlockEdit ) => ( props ) => {
+			const context = useBlockEditContext();
+			// CAUTION: code added before this line will be executed for all
+			// blocks, not just those that support the feature! Code added
+			// above this line should be carefully evaluated for its impact on
+			// performance.
+			return [
+				...features.map( ( feature, i ) => {
+					const {
+						Edit,
+						hasSupport,
+						attributeKeys = [],
+						shareWithChildBlocks,
+					} = feature;
+					const shouldDisplayControls =
+						context[ mayDisplayControlsKey ] ||
+						( context[ mayDisplayParentControlsKey ] &&
+							shareWithChildBlocks );
+
+					if (
+						! shouldDisplayControls ||
+						! hasSupport( props.name )
+					) {
+						return null;
+					}
+
+					const neededProps = {};
+					for ( const key of attributeKeys ) {
+						if ( props.attributes[ key ] ) {
+							neededProps[ key ] = props.attributes[ key ];
+						}
+					}
+
+					return (
+						<Edit
+							// We can use the index because the array length
+							// is fixed per page load right now.
+							key={ i }
+							name={ props.name }
+							isSelected={ props.isSelected }
+							clientId={ props.clientId }
+							setAttributes={ props.setAttributes }
+							__unstableParentLayout={
+								props.__unstableParentLayout
+							}
+							// This component is pure, so only pass needed
+							// props!!!
+							{ ...neededProps }
+						/>
+					);
+				} ),
+				<OriginalBlockEdit key="edit" { ...props } />,
+			];
+		},
+		'withBlockEditHooks'
+	);
+	addFilter( 'editor.BlockEdit', 'core/editor/hooks', withBlockEditHooks );
+}
+
+function BlockProps( { index, useBlockProps, setAllWrapperProps, ...props } ) {
+	const wrapperProps = useBlockProps( props );
+	const setWrapperProps = ( next ) =>
+		setAllWrapperProps( ( prev ) => {
+			const nextAll = [ ...prev ];
+			nextAll[ index ] = next;
+			return nextAll;
+		} );
+	// Setting state after every render is fine because this component is
+	// pure and will only re-render when needed props change.
+	useEffect( () => {
+		// We could shallow compare the props, but since this component only
+		// changes when needed attributes change, the benefit is probably small.
+		setWrapperProps( wrapperProps );
+		return () => {
+			setWrapperProps( undefined );
+		};
+	} );
+	return null;
+}
+
+const BlockPropsPure = memo( BlockProps );
+
+export function createBlockListBlockFilter( features ) {
+	const withBlockListBlockHooks = createHigherOrderComponent(
+		( BlockListBlock ) => ( props ) => {
+			const [ allWrapperProps, setAllWrapperProps ] = useState(
+				Array( features.length ).fill( undefined )
+			);
+			return [
+				...features.map( ( feature, i ) => {
+					const {
+						hasSupport,
+						attributeKeys = [],
+						useBlockProps,
+						isMatch,
+					} = feature;
+
+					const neededProps = {};
+					for ( const key of attributeKeys ) {
+						if ( props.attributes[ key ] ) {
+							neededProps[ key ] = props.attributes[ key ];
+						}
+					}
+
+					if (
+						// Skip rendering if none of the needed attributes are
+						// set.
+						! Object.keys( neededProps ).length ||
+						! hasSupport( props.name ) ||
+						( isMatch && ! isMatch( neededProps ) )
+					) {
+						return null;
+					}
+
+					return (
+						<BlockPropsPure
+							// We can use the index because the array length
+							// is fixed per page load right now.
+							key={ i }
+							index={ i }
+							useBlockProps={ useBlockProps }
+							// This component is pure, so we must pass a stable
+							// function reference.
+							setAllWrapperProps={ setAllWrapperProps }
+							name={ props.name }
+							clientId={ props.clientId }
+							// This component is pure, so only pass needed
+							// props!!!
+							{ ...neededProps }
+						/>
+					);
+				} ),
+				<BlockListBlock
+					key="edit"
+					{ ...props }
+					wrapperProps={ allWrapperProps
+						.filter( Boolean )
+						.reduce( ( acc, wrapperProps ) => {
+							return {
+								...acc,
+								...wrapperProps,
+								className: clsx(
+									acc.className,
+									wrapperProps.className
+								),
+								style: {
+									...acc.style,
+									...wrapperProps.style,
+								},
+							};
+						}, props.wrapperProps || {} ) }
+				/>,
+			];
+		},
+		'withBlockListBlockHooks'
+	);
+	addFilter(
+		'editor.BlockListBlock',
+		'core/editor/hooks',
+		withBlockListBlockHooks
+	);
+}
+
+export function createBlockSaveFilter( features ) {
+	function extraPropsFromHooks( props, name, attributes ) {
+		return features.reduce( ( accu, feature ) => {
+			const { hasSupport, attributeKeys = [], addSaveProps } = feature;
+
+			const neededAttributes = {};
+			for ( const key of attributeKeys ) {
+				if ( attributes[ key ] ) {
+					neededAttributes[ key ] = attributes[ key ];
+				}
+			}
+
+			if (
+				// Skip rendering if none of the needed attributes are
+				// set.
+				! Object.keys( neededAttributes ).length ||
+				! hasSupport( name )
+			) {
+				return accu;
+			}
+
+			return addSaveProps( accu, name, neededAttributes );
+		}, props );
+	}
+	addFilter(
+		'blocks.getSaveContent.extraProps',
+		'core/editor/hooks',
+		extraPropsFromHooks,
+		0
+	);
+	addFilter(
+		'blocks.getSaveContent.extraProps',
+		'core/editor/hooks',
+		( props ) => {
+			// Previously we had a filter deleting the className if it was an empty
+			// string. That filter is no longer running, so now we need to delete it
+			// here.
+			if ( props.hasOwnProperty( 'className' ) && ! props.className ) {
+				delete props.className;
+			}
+
+			return props;
+		}
+	);
+}
diff --git a/packages/block-editor/src/index.js b/packages/block-editor/src/index.js
index 1dbc4501e92180..d81f23a702b04e 100644
--- a/packages/block-editor/src/index.js
+++ b/packages/block-editor/src/index.js
@@ -11,7 +11,9 @@ export {
 	useCustomSides as __experimentalUseCustomSides,
 	getSpacingClassesAndStyles as __experimentalGetSpacingClassesAndStyles,
 	getGapCSSValue as __experimentalGetGapCSSValue,
+	getShadowClassesAndStyles as __experimentalGetShadowClassesAndStyles,
 	useCachedTruthy,
+	useStyleOverride,
 } from './hooks';
 export * from './components';
 export * from './elements';
diff --git a/packages/block-editor/src/layouts/constrained.js b/packages/block-editor/src/layouts/constrained.js
index f86791391176f9..7bf6badf008709 100644
--- a/packages/block-editor/src/layouts/constrained.js
+++ b/packages/block-editor/src/layouts/constrained.js
@@ -6,11 +6,13 @@ import {
 	__experimentalUnitControl as UnitControl,
 	__experimentalToggleGroupControl as ToggleGroupControl,
 	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
+	__experimentalInputControlPrefixWrapper as InputControlPrefixWrapper,
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import {
 	Icon,
-	positionCenter,
+	alignNone,
 	stretchWide,
 	justifyLeft,
 	justifyCenter,
@@ -24,6 +26,7 @@ import { getCSSRules } from '@wordpress/style-engine';
 import { useSettings } from '../components/use-settings';
 import { appendSelectors, getBlockGapCSS, getAlignmentsInfo } from './utils';
 import { getGapCSSValue } from '../hooks/gap';
+import { BlockControls, JustifyContentControl } from '../components';
 import { shouldSkipSerialization } from '../hooks/utils';
 import { LAYOUT_DEFINITIONS } from './definitions';
 
@@ -68,54 +71,57 @@ export default {
 			availableUnits: availableUnits || [ '%', 'px', 'em', 'rem', 'vw' ],
 		} );
 		return (
-			<>
+			<VStack
+				spacing={ 4 }
+				className="block-editor-hooks__layout-constrained"
+			>
 				{ allowCustomContentAndWideSize && (
 					<>
-						<div className="block-editor-hooks__layout-controls">
-							<div className="block-editor-hooks__layout-controls-unit">
-								<UnitControl
-									className="block-editor-hooks__layout-controls-unit-input"
-									label={ __( 'Content' ) }
-									labelPosition="top"
-									__unstableInputWidth="80px"
-									value={ contentSize || wideSize || '' }
-									onChange={ ( nextWidth ) => {
-										nextWidth =
-											0 > parseFloat( nextWidth )
-												? '0'
-												: nextWidth;
-										onChange( {
-											...layout,
-											contentSize: nextWidth,
-										} );
-									} }
-									units={ units }
-								/>
-								<Icon icon={ positionCenter } />
-							</div>
-							<div className="block-editor-hooks__layout-controls-unit">
-								<UnitControl
-									className="block-editor-hooks__layout-controls-unit-input"
-									label={ __( 'Wide' ) }
-									labelPosition="top"
-									__unstableInputWidth="80px"
-									value={ wideSize || contentSize || '' }
-									onChange={ ( nextWidth ) => {
-										nextWidth =
-											0 > parseFloat( nextWidth )
-												? '0'
-												: nextWidth;
-										onChange( {
-											...layout,
-											wideSize: nextWidth,
-										} );
-									} }
-									units={ units }
-								/>
-								<Icon icon={ stretchWide } />
-							</div>
-						</div>
-						<p className="block-editor-hooks__layout-controls-helptext">
+						<UnitControl
+							__next40pxDefaultSize
+							label={ __( 'Content width' ) }
+							labelPosition="top"
+							value={ contentSize || wideSize || '' }
+							onChange={ ( nextWidth ) => {
+								nextWidth =
+									0 > parseFloat( nextWidth )
+										? '0'
+										: nextWidth;
+								onChange( {
+									...layout,
+									contentSize: nextWidth,
+								} );
+							} }
+							units={ units }
+							prefix={
+								<InputControlPrefixWrapper variant="icon">
+									<Icon icon={ alignNone } />
+								</InputControlPrefixWrapper>
+							}
+						/>
+						<UnitControl
+							__next40pxDefaultSize
+							label={ __( 'Wide width' ) }
+							labelPosition="top"
+							value={ wideSize || contentSize || '' }
+							onChange={ ( nextWidth ) => {
+								nextWidth =
+									0 > parseFloat( nextWidth )
+										? '0'
+										: nextWidth;
+								onChange( {
+									...layout,
+									wideSize: nextWidth,
+								} );
+							} }
+							units={ units }
+							prefix={
+								<InputControlPrefixWrapper variant="icon">
+									<Icon icon={ stretchWide } />
+								</InputControlPrefixWrapper>
+							}
+						/>
+						<p className="block-editor-hooks__layout-constrained-helptext">
 							{ __(
 								'Customize the width for all elements that are assigned to the center or wide columns.'
 							) }
@@ -124,6 +130,7 @@ export default {
 				) }
 				{ allowJustification && (
 					<ToggleGroupControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ __( 'Justification' ) }
 						value={ justifyContent }
@@ -143,11 +150,27 @@ export default {
 						) }
 					</ToggleGroupControl>
 				) }
-			</>
+			</VStack>
 		);
 	},
-	toolBarControls: function DefaultLayoutToolbarControls() {
-		return null;
+	toolBarControls: function DefaultLayoutToolbarControls( {
+		layout = {},
+		onChange,
+		layoutBlockSupport,
+	} ) {
+		const { allowJustification = true } = layoutBlockSupport;
+
+		if ( ! allowJustification ) {
+			return null;
+		}
+		return (
+			<BlockControls group="block" __experimentalShareWithChildBlocks>
+				<DefaultLayoutJustifyContentControl
+					layout={ layout }
+					onChange={ onChange }
+				/>
+			</BlockControls>
+		);
 	},
 	getLayoutStyle: function getLayoutStyle( {
 		selector,
@@ -217,15 +240,23 @@ export default {
 			const paddingValues = getCSSRules( style );
 			paddingValues.forEach( ( rule ) => {
 				if ( rule.key === 'paddingRight' ) {
+					// Add unit if 0, to avoid calc(0 * -1) which is invalid.
+					const paddingRightValue =
+						rule.value === '0' ? '0px' : rule.value;
+
 					output += `
 					${ appendSelectors( selector, '> .alignfull' ) } {
-						margin-right: calc(${ rule.value } * -1);
+						margin-right: calc(${ paddingRightValue } * -1);
 					}
 					`;
 				} else if ( rule.key === 'paddingLeft' ) {
+					// Add unit if 0, to avoid calc(0 * -1) which is invalid.
+					const paddingLeftValue =
+						rule.value === '0' ? '0px' : rule.value;
+
 					output += `
 					${ appendSelectors( selector, '> .alignfull' ) } {
-						margin-left: calc(${ rule.value } * -1);
+						margin-left: calc(${ paddingLeftValue } * -1);
 					}
 					`;
 				}
@@ -278,3 +309,27 @@ export default {
 		return alignments;
 	},
 };
+
+const POPOVER_PROPS = {
+	placement: 'bottom-start',
+};
+
+function DefaultLayoutJustifyContentControl( { layout, onChange } ) {
+	const { justifyContent = 'center' } = layout;
+	const onJustificationChange = ( value ) => {
+		onChange( {
+			...layout,
+			justifyContent: value,
+		} );
+	};
+	const allowedControls = [ 'left', 'center', 'right' ];
+
+	return (
+		<JustifyContentControl
+			allowedControls={ allowedControls }
+			value={ justifyContent }
+			onChange={ onJustificationChange }
+			popoverProps={ POPOVER_PROPS }
+		/>
+	);
+}
diff --git a/packages/block-editor/src/layouts/definitions.js b/packages/block-editor/src/layouts/definitions.js
index 3b1e5c7ab5896a..a5c6d431c50f20 100644
--- a/packages/block-editor/src/layouts/definitions.js
+++ b/packages/block-editor/src/layouts/definitions.js
@@ -34,13 +34,13 @@ export const LAYOUT_DEFINITIONS = {
 		],
 		spacingStyles: [
 			{
-				selector: ' > :first-child:first-child',
+				selector: ' > :first-child',
 				rules: {
 					'margin-block-start': '0',
 				},
 			},
 			{
-				selector: ' > :last-child:last-child',
+				selector: ' > :last-child',
 				rules: {
 					'margin-block-end': '0',
 				},
@@ -100,13 +100,13 @@ export const LAYOUT_DEFINITIONS = {
 		],
 		spacingStyles: [
 			{
-				selector: ' > :first-child:first-child',
+				selector: ' > :first-child',
 				rules: {
 					'margin-block-start': '0',
 				},
 			},
 			{
-				selector: ' > :last-child:last-child',
+				selector: ' > :last-child',
 				rules: {
 					'margin-block-end': '0',
 				},
@@ -134,7 +134,7 @@ export const LAYOUT_DEFINITIONS = {
 				},
 			},
 			{
-				selector: ' > *',
+				selector: ' > :is(*, div)', // :is(*, div) instead of just * increases the specificity by 001.
 				rules: {
 					margin: '0',
 				},
@@ -156,7 +156,7 @@ export const LAYOUT_DEFINITIONS = {
 		displayMode: 'grid',
 		baseStyles: [
 			{
-				selector: ' > *',
+				selector: ' > :is(*, div)', // :is(*, div) instead of just * increases the specificity by 001.
 				rules: {
 					margin: '0',
 				},
diff --git a/packages/block-editor/src/layouts/flex.js b/packages/block-editor/src/layouts/flex.js
index f628a9bf3c3f66..81718449695651 100644
--- a/packages/block-editor/src/layouts/flex.js
+++ b/packages/block-editor/src/layouts/flex.js
@@ -12,7 +12,6 @@ import {
 	arrowDown,
 } from '@wordpress/icons';
 import {
-	Button,
 	ToggleControl,
 	Flex,
 	FlexItem,
@@ -110,7 +109,6 @@ export default {
 					<FlexLayoutVerticalAlignmentControl
 						layout={ layout }
 						onChange={ onChange }
-						isToolbar
 					/>
 				) }
 			</BlockControls>
@@ -190,11 +188,7 @@ export default {
 	},
 };
 
-function FlexLayoutVerticalAlignmentControl( {
-	layout,
-	onChange,
-	isToolbar = false,
-} ) {
+function FlexLayoutVerticalAlignmentControl( { layout, onChange } ) {
 	const { orientation = 'horizontal' } = layout;
 
 	const defaultVerticalAlignment =
@@ -210,52 +204,17 @@ function FlexLayoutVerticalAlignmentControl( {
 			verticalAlignment: value,
 		} );
 	};
-	if ( isToolbar ) {
-		return (
-			<BlockVerticalAlignmentControl
-				onChange={ onVerticalAlignmentChange }
-				value={ verticalAlignment }
-				controls={
-					orientation === 'horizontal'
-						? [ 'top', 'center', 'bottom', 'stretch' ]
-						: [ 'top', 'center', 'bottom', 'space-between' ]
-				}
-			/>
-		);
-	}
-
-	const verticalAlignmentOptions = [
-		{
-			value: 'flex-start',
-			label: __( 'Align items top' ),
-		},
-		{
-			value: 'center',
-			label: __( 'Align items center' ),
-		},
-		{
-			value: 'flex-end',
-			label: __( 'Align items bottom' ),
-		},
-	];
 
 	return (
-		<fieldset className="block-editor-hooks__flex-layout-vertical-alignment-control">
-			<legend>{ __( 'Vertical alignment' ) }</legend>
-			<div>
-				{ verticalAlignmentOptions.map( ( value, icon, label ) => {
-					return (
-						<Button
-							key={ value }
-							label={ label }
-							icon={ icon }
-							isPressed={ verticalAlignment === value }
-							onClick={ () => onVerticalAlignmentChange( value ) }
-						/>
-					);
-				} ) }
-			</div>
-		</fieldset>
+		<BlockVerticalAlignmentControl
+			onChange={ onVerticalAlignmentChange }
+			value={ verticalAlignment }
+			controls={
+				orientation === 'horizontal'
+					? [ 'top', 'center', 'bottom', 'stretch' ]
+					: [ 'top', 'center', 'bottom', 'space-between' ]
+			}
+		/>
 	);
 }
 
@@ -325,6 +284,7 @@ function FlexLayoutJustifyContentControl( {
 
 	return (
 		<ToggleGroupControl
+			__next40pxDefaultSize
 			__nextHasNoMarginBottom
 			label={ __( 'Justification' ) }
 			value={ justifyContent }
@@ -370,6 +330,7 @@ function OrientationControl( { layout, onChange } ) {
 	} = layout;
 	return (
 		<ToggleGroupControl
+			__next40pxDefaultSize
 			__nextHasNoMarginBottom
 			className="block-editor-hooks__flex-layout-orientation-controls"
 			label={ __( 'Orientation' ) }
@@ -403,12 +364,12 @@ function OrientationControl( { layout, onChange } ) {
 		>
 			<ToggleGroupControlOptionIcon
 				icon={ arrowRight }
-				value={ 'horizontal' }
+				value="horizontal"
 				label={ __( 'Horizontal' ) }
 			/>
 			<ToggleGroupControlOptionIcon
 				icon={ arrowDown }
-				value={ 'vertical' }
+				value="vertical"
 				label={ __( 'Vertical' ) }
 			/>
 		</ToggleGroupControl>
diff --git a/packages/block-editor/src/layouts/grid.js b/packages/block-editor/src/layouts/grid.js
index 6dd22cf87ba599..f1573b5c949603 100644
--- a/packages/block-editor/src/layouts/grid.js
+++ b/packages/block-editor/src/layouts/grid.js
@@ -8,9 +8,14 @@ import {
 	Flex,
 	FlexItem,
 	RangeControl,
+	__experimentalNumberControl as NumberControl,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 	__experimentalUnitControl as UnitControl,
 	__experimentalParseQuantityAndUnitFromRawValue as parseQuantityAndUnitFromRawValue,
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
+import { useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -51,23 +56,55 @@ const RANGE_CONTROL_MAX_VALUES = {
 	dvmax: 100,
 };
 
+const units = [
+	{ value: 'px', label: 'px', default: 0 },
+	{ value: 'rem', label: 'rem', default: 0 },
+	{ value: 'em', label: 'em', default: 0 },
+];
+
 export default {
 	name: 'grid',
 	label: __( 'Grid' ),
 	inspectorControls: function GridLayoutInspectorControls( {
 		layout = {},
 		onChange,
+		layoutBlockSupport = {},
 	} ) {
-		return layout?.columnCount ? (
-			<GridLayoutColumnsControl layout={ layout } onChange={ onChange } />
-		) : (
-			<GridLayoutMinimumWidthControl
-				layout={ layout }
-				onChange={ onChange }
-			/>
+		const { allowSizingOnChildren = false } = layoutBlockSupport;
+
+		// In the experiment we want to also show column control in Auto mode, and
+		// the minimum width control in Manual mode.
+		const showColumnsControl =
+			window.__experimentalEnableGridInteractivity ||
+			!! layout?.columnCount;
+		const showMinWidthControl =
+			window.__experimentalEnableGridInteractivity ||
+			! layout?.columnCount;
+		return (
+			<>
+				<GridLayoutTypeControl
+					layout={ layout }
+					onChange={ onChange }
+				/>
+				<VStack spacing={ 4 }>
+					{ showColumnsControl && (
+						<GridLayoutColumnsAndRowsControl
+							layout={ layout }
+							onChange={ onChange }
+							allowSizingOnChildren={ allowSizingOnChildren }
+						/>
+					) }
+					{ showMinWidthControl && (
+						<GridLayoutMinimumWidthControl
+							layout={ layout }
+							onChange={ onChange }
+						/>
+					) }
+				</VStack>
+			</>
 		);
 	},
-	toolBarControls: function DefaultLayoutToolbarControls() {
+	toolBarControls: function GridLayoutToolbarControls() {
 		return null;
 	},
 	getLayoutStyle: function getLayoutStyle( {
@@ -78,7 +115,28 @@ export default {
 		hasBlockGapSupport,
 		layoutDefinitions = LAYOUT_DEFINITIONS,
 	} ) {
-		const { minimumColumnWidth = '12rem', columnCount = null } = layout;
+		const {
+			minimumColumnWidth = null,
+			columnCount = null,
+			rowCount = null,
+		} = layout;
+
+		// Check that the grid layout attributes are of the correct type, so that we don't accidentally
+		// write code that stores a string attribute instead of a number.
+		if ( process.env.NODE_ENV === 'development' ) {
+			if (
+				minimumColumnWidth &&
+				typeof minimumColumnWidth !== 'string'
+			) {
+				throw new Error( 'minimumColumnWidth must be a string' );
+			}
+			if ( columnCount && typeof columnCount !== 'number' ) {
+				throw new Error( 'columnCount must be a number' );
+			}
+			if ( rowCount && typeof rowCount !== 'number' ) {
+				throw new Error( 'rowCount must be a number' );
+			}
+		}
 
 		// If a block's block.json skips serialization for spacing or spacing.blockGap,
 		// don't apply the user-defined value to the styles.
@@ -91,13 +149,34 @@ export default {
 		let output = '';
 		const rules = [];
 
-		if ( columnCount ) {
+		if ( minimumColumnWidth && columnCount > 0 ) {
+			const maxValue = `max(${ minimumColumnWidth }, ( 100% - (${
+				blockGapValue || '1.2rem'
+			}*${ columnCount - 1 }) ) / ${ columnCount })`;
+			rules.push(
+				`grid-template-columns: repeat(auto-fill, minmax(${ maxValue }, 1fr))`,
+				`container-type: inline-size`
+			);
+			if ( rowCount ) {
+				rules.push(
+					`grid-template-rows: repeat(${ rowCount }, minmax(1rem, auto))`
+				);
+			}
+		} else if ( columnCount ) {
 			rules.push(
 				`grid-template-columns: repeat(${ columnCount }, minmax(0, 1fr))`
 			);
-		} else if ( minimumColumnWidth ) {
+			if ( rowCount ) {
+				rules.push(
+					`grid-template-rows: repeat(${ rowCount }, minmax(1rem, auto))`
+				);
+			}
+		} else {
 			rules.push(
-				`grid-template-columns: repeat(auto-fill, minmax(min(${ minimumColumnWidth }, 100%), 1fr))`
+				`grid-template-columns: repeat(auto-fill, minmax(min(${
+					minimumColumnWidth || '12rem'
+				}, 100%), 1fr))`,
+				'container-type: inline-size'
 			);
 		}
 
@@ -130,8 +209,11 @@ export default {
 
 // Enables setting minimum width of grid items.
 function GridLayoutMinimumWidthControl( { layout, onChange } ) {
-	const { minimumColumnWidth: value = '12rem' } = layout;
-	const [ quantity, unit ] = parseQuantityAndUnitFromRawValue( value );
+	const { minimumColumnWidth, columnCount, isManualPlacement } = layout;
+	const defaultValue = isManualPlacement || columnCount ? null : '12rem';
+	const value = minimumColumnWidth || defaultValue;
+	const [ quantity, unit = 'rem' ] =
+		parseQuantityAndUnitFromRawValue( value );
 
 	const handleSliderChange = ( next ) => {
 		onChange( {
@@ -152,38 +234,6 @@ function GridLayoutMinimumWidthControl( { layout, onChange } ) {
 		} else if ( [ 'em', 'rem' ].includes( unit ) && newUnit === 'px' ) {
 			// Convert to pixel value assuming a root size of 16px.
 			newValue = Math.round( quantity * 16 ) + newUnit;
-		} else if (
-			[
-				'vh',
-				'vw',
-				'%',
-				'svw',
-				'lvw',
-				'dvw',
-				'svh',
-				'lvh',
-				'dvh',
-				'vi',
-				'svi',
-				'lvi',
-				'dvi',
-				'vb',
-				'svb',
-				'lvb',
-				'dvb',
-				'vmin',
-				'svmin',
-				'lvmin',
-				'dvmin',
-				'vmax',
-				'svmax',
-				'lvmax',
-				'dvmax',
-			].includes( newUnit ) &&
-			quantity > 100
-		) {
-			// When converting to `%` or viewport-relative units, cap the new value at 100.
-			newValue = 100 + newUnit;
 		}
 
 		onChange( {
@@ -200,25 +250,33 @@ function GridLayoutMinimumWidthControl( { layout, onChange } ) {
 			<Flex gap={ 4 }>
 				<FlexItem isBlock>
 					<UnitControl
-						size={ '__unstable-large' }
+						size="__unstable-large"
 						onChange={ ( newValue ) => {
 							onChange( {
 								...layout,
-								minimumColumnWidth: newValue,
+								minimumColumnWidth:
+									newValue === '' ? undefined : newValue,
 							} );
 						} }
 						onUnitChange={ handleUnitChange }
 						value={ value }
+						units={ units }
 						min={ 0 }
+						label={ __( 'Minimum column width' ) }
+						hideLabelFromVision
 					/>
 				</FlexItem>
 				<FlexItem isBlock>
 					<RangeControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
 						onChange={ handleSliderChange }
-						value={ quantity }
+						value={ quantity || 0 }
 						min={ 0 }
 						max={ RANGE_CONTROL_MAX_VALUES[ unit ] || 600 }
 						withInputField={ false }
+						label={ __( 'Minimum column width' ) }
+						hideLabelFromVision
 					/>
 				</FlexItem>
 			</Flex>
@@ -227,21 +285,201 @@ function GridLayoutMinimumWidthControl( { layout, onChange } ) {
 }
 
 // Enables setting number of grid columns
-function GridLayoutColumnsControl( { layout, onChange } ) {
-	const { columnCount = 3 } = layout;
+function GridLayoutColumnsAndRowsControl( {
+	layout,
+	onChange,
+	allowSizingOnChildren,
+} ) {
+	// If the grid interactivity experiment is enabled, allow unsetting the column count.
+	const defaultColumnCount = window.__experimentalEnableGridInteractivity
+		? undefined
+		: 3;
+	const {
+		columnCount = defaultColumnCount,
+		rowCount,
+		isManualPlacement,
+	} = layout;
 
 	return (
-		<RangeControl
-			label={ __( 'Columns' ) }
-			value={ columnCount }
-			onChange={ ( value ) =>
-				onChange( {
-					...layout,
-					columnCount: value,
-				} )
+		<>
+			<fieldset>
+				{ ( ! window.__experimentalEnableGridInteractivity ||
+					! isManualPlacement ) && (
+					<BaseControl.VisualLabel as="legend">
+						{ __( 'Columns' ) }
+					</BaseControl.VisualLabel>
+				) }
+				<Flex gap={ 4 }>
+					<FlexItem isBlock>
+						<NumberControl
+							size="__unstable-large"
+							onChange={ ( value ) => {
+								if (
+									window.__experimentalEnableGridInteractivity
+								) {
+									// Allow unsetting the column count when in auto mode.
+									const defaultNewColumnCount =
+										isManualPlacement ? 1 : undefined;
+									const newColumnCount =
+										value === '' || value === '0'
+											? defaultNewColumnCount
+											: parseInt( value, 10 );
+									onChange( {
+										...layout,
+										columnCount: newColumnCount,
+									} );
+								} else {
+									// Don't allow unsetting the column count.
+									const newColumnCount =
+										value === '' || value === '0'
+											? 1
+											: parseInt( value, 10 );
+									onChange( {
+										...layout,
+										columnCount: newColumnCount,
+									} );
+								}
+							} }
+							value={ columnCount }
+							min={ 1 }
+							label={ __( 'Columns' ) }
+							hideLabelFromVision={
+								! window.__experimentalEnableGridInteractivity ||
+								! isManualPlacement
+							}
+						/>
+					</FlexItem>
+
+					<FlexItem isBlock>
+						{ window.__experimentalEnableGridInteractivity &&
+						allowSizingOnChildren &&
+						isManualPlacement ? (
+							<NumberControl
+								size="__unstable-large"
+								onChange={ ( value ) => {
+									// Don't allow unsetting the row count.
+									const newRowCount =
+										value === '' || value === '0'
+											? 1
+											: parseInt( value, 10 );
+									onChange( {
+										...layout,
+										rowCount: newRowCount,
+									} );
+								} }
+								value={ rowCount }
+								min={ 1 }
+								label={ __( 'Rows' ) }
+							/>
+						) : (
+							<RangeControl
+								__next40pxDefaultSize
+								__nextHasNoMarginBottom
+								value={ columnCount ?? 1 }
+								onChange={ ( value ) =>
+									onChange( {
+										...layout,
+										columnCount:
+											value === '' || value === '0'
+												? 1
+												: value,
+									} )
+								}
+								min={ 1 }
+								max={ 16 }
+								withInputField={ false }
+								label={ __( 'Columns' ) }
+								hideLabelFromVision
+							/>
+						) }
+					</FlexItem>
+				</Flex>
+			</fieldset>
+		</>
+	);
+}
+
+// Enables switching between grid types
+function GridLayoutTypeControl( { layout, onChange } ) {
+	const { columnCount, rowCount, minimumColumnWidth, isManualPlacement } =
+		layout;
+
+	/**
+	 * When switching, temporarily save any custom values set on the
+	 * previous type so we can switch back without loss.
+	 */
+	const [ tempColumnCount, setTempColumnCount ] = useState(
+		columnCount || 3
+	);
+	const [ tempRowCount, setTempRowCount ] = useState( rowCount );
+	const [ tempMinimumColumnWidth, setTempMinimumColumnWidth ] = useState(
+		minimumColumnWidth || '12rem'
+	);
+
+	const gridPlacement =
+		isManualPlacement ||
+		( !! columnCount && ! window.__experimentalEnableGridInteractivity )
+			? 'manual'
+			: 'auto';
+
+	const onChangeType = ( value ) => {
+		if ( value === 'manual' ) {
+			setTempMinimumColumnWidth( minimumColumnWidth || '12rem' );
+		} else {
+			setTempColumnCount( columnCount || 3 );
+			setTempRowCount( rowCount );
+		}
+		onChange( {
+			...layout,
+			columnCount: value === 'manual' ? tempColumnCount : null,
+			rowCount:
+				value === 'manual' &&
+				window.__experimentalEnableGridInteractivity
+					? tempRowCount
+					: undefined,
+			isManualPlacement:
+				value === 'manual' &&
+				window.__experimentalEnableGridInteractivity
+					? true
+					: undefined,
+			minimumColumnWidth:
+				value === 'auto' ? tempMinimumColumnWidth : null,
+		} );
+	};
+
+	const helpText =
+		gridPlacement === 'manual'
+			? __(
+					'Grid items can be manually placed in any position on the grid.'
+			  )
+			: __(
+					'Grid items are placed automatically depending on their order.'
+			  );
+
+	return (
+		<ToggleGroupControl
+			__next40pxDefaultSize
+			__nextHasNoMarginBottom
+			label={ __( 'Grid item position' ) }
+			value={ gridPlacement }
+			onChange={ onChangeType }
+			isBlock
+			help={
+				window.__experimentalEnableGridInteractivity
+					? helpText
+					: undefined
 			}
-			min={ 1 }
-			max={ 6 }
-		/>
+		>
+			<ToggleGroupControlOption
+				key="auto"
+				value="auto"
+				label={ __( 'Auto' ) }
+			/>
+			<ToggleGroupControlOption
+				key="manual"
+				value="manual"
+				label={ __( 'Manual' ) }
+			/>
+		</ToggleGroupControl>
 	);
 }
diff --git a/packages/block-editor/src/layouts/test/grid.js b/packages/block-editor/src/layouts/test/grid.js
index 634457670f0dfa..ab7b279aaae78c 100644
--- a/packages/block-editor/src/layouts/test/grid.js
+++ b/packages/block-editor/src/layouts/test/grid.js
@@ -4,8 +4,8 @@
 import grid from '../grid';
 
 describe( 'getLayoutStyle', () => {
-	it( 'should return a single `grid-template-columns` property if no non-default params are provided', () => {
-		const expected = `.editor-styles-wrapper .my-container { grid-template-columns: repeat(auto-fill, minmax(min(12rem, 100%), 1fr)); }`;
+	it( 'should return only `grid-template-columns` and `container-type` properties if no non-default params are provided', () => {
+		const expected = `.my-container { grid-template-columns: repeat(auto-fill, minmax(min(12rem, 100%), 1fr)); container-type: inline-size; }`;
 
 		const result = grid.getLayoutStyle( {
 			selector: '.my-container',
@@ -16,6 +16,20 @@ describe( 'getLayoutStyle', () => {
 			layoutDefinitions: undefined,
 		} );
 
+		expect( result ).toBe( expected );
+	} );
+	it( 'should return only `grid-template-columns` if columnCount property is provided', () => {
+		const expected = `.my-container { grid-template-columns: repeat(3, minmax(0, 1fr)); }`;
+
+		const result = grid.getLayoutStyle( {
+			selector: '.my-container',
+			layout: { columnCount: 3 },
+			style: {},
+			blockName: 'test-block',
+			hasBlockGapSupport: false,
+			layoutDefinitions: undefined,
+		} );
+
 		expect( result ).toBe( expected );
 	} );
 } );
diff --git a/packages/block-editor/src/layouts/test/utils.js b/packages/block-editor/src/layouts/test/utils.js
index a2a3ac644d7ba7..09cfef8f48f8ff 100644
--- a/packages/block-editor/src/layouts/test/utils.js
+++ b/packages/block-editor/src/layouts/test/utils.js
@@ -37,7 +37,7 @@ const layoutDefinitions = {
 describe( 'getBlockGapCSS', () => {
 	it( 'should output default blockGap rules', () => {
 		const expected =
-			'.editor-styles-wrapper .my-container > * { margin-block-start: 0; margin-block-end: 0; }.editor-styles-wrapper .my-container > * + * { margin-block-start: 3em; margin-block-end: 0; }';
+			'.my-container > * { margin-block-start: 0; margin-block-end: 0; }.my-container > * + * { margin-block-start: 3em; margin-block-end: 0; }';
 
 		const result = getBlockGapCSS(
 			'.my-container',
@@ -50,7 +50,7 @@ describe( 'getBlockGapCSS', () => {
 	} );
 
 	it( 'should output flex blockGap rules', () => {
-		const expected = '.editor-styles-wrapper .my-container { gap: 3em; }';
+		const expected = '.my-container { gap: 3em; }';
 
 		const result = getBlockGapCSS(
 			'.my-container',
@@ -97,7 +97,7 @@ describe( 'getBlockGapCSS', () => {
 	} );
 
 	it( 'should treat a blockGap string containing 0 as a valid value', () => {
-		const expected = '.editor-styles-wrapper .my-container { gap: 0; }';
+		const expected = '.my-container { gap: 0; }';
 
 		const result = getBlockGapCSS(
 			'.my-container',
@@ -113,21 +113,19 @@ describe( 'getBlockGapCSS', () => {
 describe( 'appendSelectors', () => {
 	it( 'should append a subselector without an appended selector', () => {
 		expect( appendSelectors( '.original-selector' ) ).toBe(
-			'.editor-styles-wrapper .original-selector'
+			'.original-selector'
 		);
 	} );
 
 	it( 'should append a subselector to a single selector', () => {
 		expect( appendSelectors( '.original-selector', '.appended' ) ).toBe(
-			'.editor-styles-wrapper .original-selector .appended'
+			'.original-selector .appended'
 		);
 	} );
 
 	it( 'should append a subselector to multiple selectors', () => {
 		expect(
 			appendSelectors( '.first-selector,.second-selector', '.appended' )
-		).toBe(
-			'.editor-styles-wrapper .first-selector .appended,.editor-styles-wrapper .second-selector .appended'
-		);
+		).toBe( '.first-selector .appended,.second-selector .appended' );
 	} );
 } );
diff --git a/packages/block-editor/src/layouts/utils.js b/packages/block-editor/src/layouts/utils.js
index 30280b8906e7a0..15a8d2cef83732 100644
--- a/packages/block-editor/src/layouts/utils.js
+++ b/packages/block-editor/src/layouts/utils.js
@@ -17,19 +17,11 @@ import { LAYOUT_DEFINITIONS } from './definitions';
  * @return {string} - CSS selector.
  */
 export function appendSelectors( selectors, append = '' ) {
-	// Ideally we shouldn't need the `.editor-styles-wrapper` increased specificity here
-	// The problem though is that we have a `.editor-styles-wrapper p { margin: reset; }` style
-	// it's used to reset the default margin added by wp-admin to paragraphs
-	// so we need this to be higher speficity otherwise, it won't be applied to paragraphs inside containers
-	// When the post editor is fully iframed, this extra classname could be removed.
-
 	return selectors
 		.split( ',' )
 		.map(
 			( subselector ) =>
-				`.editor-styles-wrapper ${ subselector }${
-					append ? ` ${ append }` : ''
-				}`
+				`${ subselector }${ append ? ` ${ append }` : '' }`
 		)
 		.join( ',' );
 }
diff --git a/packages/block-editor/src/lock-unlock.js b/packages/block-editor/src/lock-unlock.js
index 433a61a12aec01..51929a5920b11b 100644
--- a/packages/block-editor/src/lock-unlock.js
+++ b/packages/block-editor/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/block-editor'
 	);
diff --git a/packages/block-editor/src/private-apis.js b/packages/block-editor/src/private-apis.js
index b1d499ae099469..5067317e3f2465 100644
--- a/packages/block-editor/src/private-apis.js
+++ b/packages/block-editor/src/private-apis.js
@@ -5,28 +5,51 @@ import * as globalStyles from './components/global-styles';
 import { ExperimentalBlockEditorProvider } from './components/provider';
 import { lock } from './lock-unlock';
 import { getRichTextValues } from './components/rich-text/get-rich-text-values';
-import { kebabCase } from './utils/object';
 import ResizableBoxPopover from './components/resizable-box-popover';
-import { ComposedPrivateInserter as PrivateInserter } from './components/inserter';
+import { default as PrivateQuickInserter } from './components/inserter/quick-inserter';
+import {
+	extractWords,
+	getNormalizedSearchTerms,
+	normalizeString,
+} from './components/inserter/search-items';
 import { PrivateListView } from './components/list-view';
 import BlockInfo from './components/block-info-slot-fill';
-import BlockContextualToolbar from './components/block-tools/block-contextual-toolbar';
-import { useShouldContextualToolbarShow } from './utils/use-should-contextual-toolbar-show';
-import { cleanEmptyObject, useStyleOverride } from './hooks/utils';
+import { useHasBlockToolbar } from './components/block-toolbar/use-has-block-toolbar';
+import { cleanEmptyObject } from './hooks/utils';
 import BlockQuickNavigation from './components/block-quick-navigation';
 import { LayoutStyle } from './components/block-list/layout';
 import { BlockRemovalWarningModal } from './components/block-removal-warning-modal';
-import { useLayoutClasses, useLayoutStyles } from './hooks';
+import {
+	setBackgroundStyleDefaults,
+	useLayoutClasses,
+	useLayoutStyles,
+	__unstableBlockStyleVariationOverridesWithConfig,
+	useZoomOut,
+} from './hooks';
 import DimensionsTool from './components/dimensions-tool';
 import ResolutionTool from './components/resolution-tool';
-import {
-	default as ReusableBlocksRenameHint,
-	useReusableBlocksRenameHint,
-} from './components/inserter/reusable-block-rename-hint';
+import TextAlignmentControl from './components/text-alignment-control';
 import { usesContextKey } from './components/rich-text/format-edit';
 import { ExperimentalBlockCanvas } from './components/block-canvas';
 import { getDuotoneFilter } from './components/duotone/utils';
-
+import { useFlashEditableBlocks } from './components/use-flash-editable-blocks';
+import {
+	selectBlockPatternsKey,
+	reusableBlocksSelectKey,
+	globalStylesDataKey,
+	globalStylesLinksDataKey,
+	sectionRootClientIdKey,
+} from './store/private-keys';
+import { requiresWrapperOnCopy } from './components/writing-flow/utils';
+import { PrivateRichText } from './components/rich-text/';
+import { PrivateBlockPopover } from './components/block-popover';
+import { PrivateInserterLibrary } from './components/inserter/library';
+import { PrivatePublishDateTimePicker } from './components/publish-date-time-picker';
+import useSpacingSizes from './components/spacing-sizes-control/hooks/use-spacing-sizes';
+import useBlockDisplayTitle from './components/block-title/use-block-display-title';
+import TabbedSidebar from './components/tabbed-sidebar';
+import __unstableCommentIconFill from './components/collab/block-comment-icon-slot';
+import __unstableCommentIconToolbarFill from './components/collab/block-comment-icon-toolbar-slot';
 /**
  * Private @wordpress/block-editor APIs.
  */
@@ -37,15 +60,15 @@ lock( privateApis, {
 	ExperimentalBlockEditorProvider,
 	getDuotoneFilter,
 	getRichTextValues,
-	kebabCase,
-	PrivateInserter,
+	PrivateQuickInserter,
+	extractWords,
+	getNormalizedSearchTerms,
+	normalizeString,
 	PrivateListView,
 	ResizableBoxPopover,
 	BlockInfo,
-	BlockContextualToolbar,
-	useShouldContextualToolbarShow,
+	useHasBlockToolbar,
 	cleanEmptyObject,
-	useStyleOverride,
 	BlockQuickNavigation,
 	LayoutStyle,
 	BlockRemovalWarningModal,
@@ -53,7 +76,25 @@ lock( privateApis, {
 	useLayoutStyles,
 	DimensionsTool,
 	ResolutionTool,
-	ReusableBlocksRenameHint,
-	useReusableBlocksRenameHint,
+	TabbedSidebar,
+	TextAlignmentControl,
 	usesContextKey,
+	useFlashEditableBlocks,
+	useZoomOut,
+	globalStylesDataKey,
+	globalStylesLinksDataKey,
+	selectBlockPatternsKey,
+	requiresWrapperOnCopy,
+	PrivateRichText,
+	PrivateInserterLibrary,
+	reusableBlocksSelectKey,
+	PrivateBlockPopover,
+	PrivatePublishDateTimePicker,
+	useSpacingSizes,
+	useBlockDisplayTitle,
+	__unstableBlockStyleVariationOverridesWithConfig,
+	setBackgroundStyleDefaults,
+	sectionRootClientIdKey,
+	__unstableCommentIconFill,
+	__unstableCommentIconToolbarFill,
 } );
diff --git a/packages/block-editor/src/private-apis.native.js b/packages/block-editor/src/private-apis.native.js
index 17676f634b1cae..f99d523933106b 100644
--- a/packages/block-editor/src/private-apis.native.js
+++ b/packages/block-editor/src/private-apis.native.js
@@ -3,8 +3,9 @@
  */
 import * as globalStyles from './components/global-styles';
 import { ExperimentalBlockEditorProvider } from './components/provider';
-import { kebabCase } from './utils/object';
+import { getRichTextValues } from './components/rich-text/get-rich-text-values';
 import { lock } from './lock-unlock';
+import { PrivateRichText } from './components/rich-text/';
 
 /**
  * Private @wordpress/block-editor APIs.
@@ -12,6 +13,7 @@ import { lock } from './lock-unlock';
 export const privateApis = {};
 lock( privateApis, {
 	...globalStyles,
-	kebabCase,
 	ExperimentalBlockEditorProvider,
+	getRichTextValues,
+	PrivateRichText,
 } );
diff --git a/packages/block-editor/src/store/actions.js b/packages/block-editor/src/store/actions.js
index b21436161cb8c3..6edc5cb4da0393 100644
--- a/packages/block-editor/src/store/actions.js
+++ b/packages/block-editor/src/store/actions.js
@@ -14,17 +14,21 @@ import {
 	synchronizeBlocksWithTemplate,
 	getBlockSupport,
 	isUnmodifiedDefaultBlock,
+	isUnmodifiedBlock,
 } from '@wordpress/blocks';
 import { speak } from '@wordpress/a11y';
 import { __, _n, sprintf } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
 import { create, insert, remove, toHTMLString } from '@wordpress/rich-text';
 import deprecated from '@wordpress/deprecated';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
  */
 import {
 	retrieveSelectedAttribute,
+	findRichTextAttributeKey,
 	START_OF_SELECTED_AREA,
 } from '../utils/selection';
 import {
@@ -208,6 +212,21 @@ export function selectBlock( clientId, initialPosition = 0 ) {
 	};
 }
 
+/**
+ * Returns an action object used in signalling that the block with the
+ * specified client ID has been hovered.
+ *
+ * @param {string} clientId Block client ID.
+ *
+ * @return {Object} Action object.
+ */
+export function hoverBlock( clientId ) {
+	return {
+		type: 'HOVER_BLOCK',
+		clientId,
+	};
+}
+
 /**
  * Yields action objects used in signalling that the block preceding the given
  * clientId (or optionally, its first parent from bottom to top)
@@ -331,36 +350,6 @@ export function toggleSelection( isSelectionEnabled = true ) {
 	};
 }
 
-function getBlocksWithDefaultStylesApplied( blocks, blockEditorSettings ) {
-	const preferredStyleVariations =
-		blockEditorSettings?.__experimentalPreferredStyleVariations?.value ??
-		{};
-	return blocks.map( ( block ) => {
-		const blockName = block.name;
-		if ( ! hasBlockSupport( blockName, 'defaultStylePicker', true ) ) {
-			return block;
-		}
-		if ( ! preferredStyleVariations[ blockName ] ) {
-			return block;
-		}
-		const className = block.attributes?.className;
-		if ( className?.includes( 'is-style-' ) ) {
-			return block;
-		}
-		const { attributes = {} } = block;
-		const blockStyle = preferredStyleVariations[ blockName ];
-		return {
-			...block,
-			attributes: {
-				...attributes,
-				className: `${
-					className || ''
-				} is-style-${ blockStyle }`.trim(),
-			},
-		};
-	} );
-}
-
 /* eslint-disable jsdoc/valid-types */
 /**
  * Action that replaces given blocks with one or more replacement blocks.
@@ -378,10 +367,7 @@ export const replaceBlocks =
 	( { select, dispatch, registry } ) => {
 		/* eslint-enable jsdoc/valid-types */
 		clientIds = castArray( clientIds );
-		blocks = getBlocksWithDefaultStylesApplied(
-			castArray( blocks ),
-			select.getSettings()
-		);
+		blocks = castArray( blocks );
 		const rootClientId = select.getBlockRootClientId( clientIds[ 0 ] );
 		// Replace is valid if the new blocks can be inserted in the root block.
 		for ( let index = 0; index < blocks.length; index++ ) {
@@ -437,7 +423,7 @@ const createOnMove =
 	( clientIds, rootClientId ) =>
 	( { select, dispatch } ) => {
 		// If one of the blocks is locked or the parent is locked, we cannot move any block.
-		const canMoveBlocks = select.canMoveBlocks( clientIds, rootClientId );
+		const canMoveBlocks = select.canMoveBlocks( clientIds );
 		if ( ! canMoveBlocks ) {
 			return;
 		}
@@ -459,10 +445,7 @@ export const moveBlocksUp = createOnMove( 'MOVE_BLOCKS_UP' );
 export const moveBlocksToPosition =
 	( clientIds, fromRootClientId = '', toRootClientId = '', index ) =>
 	( { select, dispatch } ) => {
-		const canMoveBlocks = select.canMoveBlocks(
-			clientIds,
-			fromRootClientId
-		);
+		const canMoveBlocks = select.canMoveBlocks( clientIds );
 
 		// If one of the blocks is locked or the parent is locked, we cannot move any block.
 		if ( ! canMoveBlocks ) {
@@ -471,10 +454,7 @@ export const moveBlocksToPosition =
 
 		// If moving inside the same root block the move is always possible.
 		if ( fromRootClientId !== toRootClientId ) {
-			const canRemoveBlocks = select.canRemoveBlocks(
-				clientIds,
-				fromRootClientId
-			);
+			const canRemoveBlocks = select.canRemoveBlocks( clientIds );
 
 			// If we're moving to another block, it means we're deleting blocks from
 			// the original block, so we need to check if removing is possible.
@@ -594,10 +574,7 @@ export const insertBlocks =
 			);
 		}
 
-		blocks = getBlocksWithDefaultStylesApplied(
-			castArray( blocks ),
-			select.getSettings()
-		);
+		blocks = castArray( blocks );
 		const allowedBlocks = [];
 		for ( const block of blocks ) {
 			const isValid = select.canInsertBlockType(
@@ -640,13 +617,15 @@ export function showInsertionPoint(
 	index,
 	__unstableOptions = {}
 ) {
-	const { __unstableWithInserter, operation } = __unstableOptions;
+	const { __unstableWithInserter, operation, nearestSide } =
+		__unstableOptions;
 	return {
 		type: 'SHOW_INSERTION_POINT',
 		rootClientId,
 		index,
 		__unstableWithInserter,
 		operation,
+		nearestSide,
 	};
 }
 /**
@@ -707,7 +686,9 @@ export const __unstableDeleteSelection =
 		const selectionAnchor = select.getSelectionStart();
 		const selectionFocus = select.getSelectionEnd();
 
-		if ( selectionAnchor.clientId === selectionFocus.clientId ) return;
+		if ( selectionAnchor.clientId === selectionFocus.clientId ) {
+			return;
+		}
 
 		// It's not mergeable if there's no rich text selection.
 		if (
@@ -715,8 +696,9 @@ export const __unstableDeleteSelection =
 			! selectionFocus.attributeKey ||
 			typeof selectionAnchor.offset === 'undefined' ||
 			typeof selectionFocus.offset === 'undefined'
-		)
+		) {
 			return false;
+		}
 
 		const anchorRootClientId = select.getBlockRootClientId(
 			selectionAnchor.clientId
@@ -850,24 +832,13 @@ export const __unstableDeleteSelection =
 
 /**
  * Split the current selection.
+ * @param {?Array} blocks
  */
 export const __unstableSplitSelection =
-	() =>
-	( { select, dispatch } ) => {
+	( blocks = [] ) =>
+	( { registry, select, dispatch } ) => {
 		const selectionAnchor = select.getSelectionStart();
 		const selectionFocus = select.getSelectionEnd();
-
-		if ( selectionAnchor.clientId === selectionFocus.clientId ) return;
-
-		// Can't split if the selection is not set.
-		if (
-			! selectionAnchor.attributeKey ||
-			! selectionFocus.attributeKey ||
-			typeof selectionAnchor.offset === 'undefined' ||
-			typeof selectionFocus.offset === 'undefined'
-		)
-			return;
-
 		const anchorRootClientId = select.getBlockRootClientId(
 			selectionAnchor.clientId
 		);
@@ -898,12 +869,113 @@ export const __unstableSplitSelection =
 
 		const selectionA = selectionStart;
 		const selectionB = selectionEnd;
-
 		const blockA = select.getBlock( selectionA.clientId );
 		const blockB = select.getBlock( selectionB.clientId );
+		const blockAType = getBlockType( blockA.name );
+		const blockBType = getBlockType( blockB.name );
+		const attributeKeyA =
+			typeof selectionA.attributeKey === 'string'
+				? selectionA.attributeKey
+				: findRichTextAttributeKey( blockAType );
+		const attributeKeyB =
+			typeof selectionB.attributeKey === 'string'
+				? selectionB.attributeKey
+				: findRichTextAttributeKey( blockBType );
+		const blockAttributes = select.getBlockAttributes(
+			selectionA.clientId
+		);
+		const bindings = blockAttributes?.metadata?.bindings;
+
+		// If the attribute is bound, don't split the selection and insert a new block instead.
+		if ( bindings?.[ attributeKeyA ] ) {
+			// Show warning if user tries to insert a block into another block with bindings.
+			if ( blocks.length ) {
+				const { createWarningNotice } =
+					registry.dispatch( noticesStore );
+				createWarningNotice(
+					__(
+						"Blocks can't be inserted into other blocks with bindings"
+					),
+					{
+						type: 'snackbar',
+					}
+				);
+				return;
+			}
+			dispatch.insertAfterBlock( selectionA.clientId );
+			return;
+		}
 
-		const htmlA = blockA.attributes[ selectionA.attributeKey ];
-		const htmlB = blockB.attributes[ selectionB.attributeKey ];
+		// Can't split if the selection is not set.
+		if (
+			! attributeKeyA ||
+			! attributeKeyB ||
+			typeof selectionAnchor.offset === 'undefined' ||
+			typeof selectionFocus.offset === 'undefined'
+		) {
+			return;
+		}
+
+		// We can do some short-circuiting if the selection is collapsed.
+		if (
+			selectionA.clientId === selectionB.clientId &&
+			attributeKeyA === attributeKeyB &&
+			selectionA.offset === selectionB.offset
+		) {
+			// If an unmodified default block is selected, replace it. We don't
+			// want to be converting into a default block.
+			if ( blocks.length ) {
+				if ( isUnmodifiedDefaultBlock( blockA ) ) {
+					dispatch.replaceBlocks(
+						[ selectionA.clientId ],
+						blocks,
+						blocks.length - 1,
+						-1
+					);
+					return;
+				}
+			}
+
+			// If selection is at the start or end, we can simply insert an
+			// empty block, provided this block has no inner blocks.
+			else if ( ! select.getBlockOrder( selectionA.clientId ).length ) {
+				function createEmpty() {
+					const defaultBlockName = getDefaultBlockName();
+					return select.canInsertBlockType(
+						defaultBlockName,
+						anchorRootClientId
+					)
+						? createBlock( defaultBlockName )
+						: createBlock(
+								select.getBlockName( selectionA.clientId )
+						  );
+				}
+
+				const length = blockAttributes[ attributeKeyA ].length;
+
+				if ( selectionA.offset === 0 && length ) {
+					dispatch.insertBlocks(
+						[ createEmpty() ],
+						select.getBlockIndex( selectionA.clientId ),
+						anchorRootClientId,
+						false
+					);
+					return;
+				}
+
+				if ( selectionA.offset === length ) {
+					dispatch.insertBlocks(
+						[ createEmpty() ],
+						select.getBlockIndex( selectionA.clientId ) + 1,
+						anchorRootClientId
+					);
+					return;
+				}
+			}
+		}
+
+		const htmlA = blockA.attributes[ attributeKeyA ];
+		const htmlB = blockB.attributes[ attributeKeyB ];
 
 		let valueA = create( { html: htmlA } );
 		let valueB = create( { html: htmlB } );
@@ -911,28 +983,150 @@ export const __unstableSplitSelection =
 		valueA = remove( valueA, selectionA.offset, valueA.text.length );
 		valueB = remove( valueB, 0, selectionB.offset );
 
-		dispatch.replaceBlocks( select.getSelectedBlockClientIds(), [
-			{
-				// Preserve the original client ID.
-				...blockA,
-				attributes: {
-					...blockA.attributes,
-					[ selectionA.attributeKey ]: toHTMLString( {
-						value: valueA,
-					} ),
-				},
+		let head = {
+			// Preserve the original client ID.
+			...blockA,
+			// If both start and end are the same, should only copy innerBlocks
+			// once.
+			innerBlocks:
+				blockA.clientId === blockB.clientId ? [] : blockA.innerBlocks,
+			attributes: {
+				...blockA.attributes,
+				[ attributeKeyA ]: toHTMLString( { value: valueA } ),
 			},
-			{
-				// Preserve the original client ID.
-				...blockB,
+		};
+
+		let tail = {
+			...blockB,
+			// Only preserve the original client ID if the end is different.
+			clientId:
+				blockA.clientId === blockB.clientId
+					? createBlock( blockB.name ).clientId
+					: blockB.clientId,
+			attributes: {
+				...blockB.attributes,
+				[ attributeKeyB ]: toHTMLString( { value: valueB } ),
+			},
+		};
+
+		// When splitting a block, attempt to convert the tail block to the
+		// default block type. For example, when splitting a heading block, the
+		// tail block will be converted to a paragraph block. Note that for
+		// blocks such as a list item and button, this will be skipped because
+		// the default block type cannot be inserted.
+		const defaultBlockName = getDefaultBlockName();
+		if (
+			// A block is only split when the selection is within the same
+			// block.
+			blockA.clientId === blockB.clientId &&
+			defaultBlockName &&
+			tail.name !== defaultBlockName &&
+			select.canInsertBlockType( defaultBlockName, anchorRootClientId )
+		) {
+			const switched = switchToBlockType( tail, defaultBlockName );
+			if ( switched?.length === 1 ) {
+				tail = switched[ 0 ];
+			}
+		}
+
+		if ( ! blocks.length ) {
+			dispatch.replaceBlocks( select.getSelectedBlockClientIds(), [
+				head,
+				tail,
+			] );
+			return;
+		}
+
+		let selection;
+		const output = [];
+		const clonedBlocks = [ ...blocks ];
+		const firstBlock = clonedBlocks.shift();
+		const headType = getBlockType( head.name );
+		const firstBlocks =
+			headType.merge && firstBlock.name === headType.name
+				? [ firstBlock ]
+				: switchToBlockType( firstBlock, headType.name );
+
+		if ( firstBlocks?.length ) {
+			const first = firstBlocks.shift();
+			head = {
+				...head,
 				attributes: {
-					...blockB.attributes,
-					[ selectionB.attributeKey ]: toHTMLString( {
-						value: valueB,
-					} ),
+					...head.attributes,
+					...headType.merge( head.attributes, first.attributes ),
 				},
-			},
-		] );
+			};
+			output.push( head );
+			selection = {
+				clientId: head.clientId,
+				attributeKey: attributeKeyA,
+				offset: create( { html: head.attributes[ attributeKeyA ] } )
+					.text.length,
+			};
+			clonedBlocks.unshift( ...firstBlocks );
+		} else {
+			if ( ! isUnmodifiedBlock( head ) ) {
+				output.push( head );
+			}
+			output.push( firstBlock );
+		}
+
+		const lastBlock = clonedBlocks.pop();
+		const tailType = getBlockType( tail.name );
+
+		if ( clonedBlocks.length ) {
+			output.push( ...clonedBlocks );
+		}
+
+		if ( lastBlock ) {
+			const lastBlocks =
+				tailType.merge && tailType.name === lastBlock.name
+					? [ lastBlock ]
+					: switchToBlockType( lastBlock, tailType.name );
+
+			if ( lastBlocks?.length ) {
+				const last = lastBlocks.pop();
+				output.push( {
+					...tail,
+					attributes: {
+						...tail.attributes,
+						...tailType.merge( last.attributes, tail.attributes ),
+					},
+				} );
+				output.push( ...lastBlocks );
+				selection = {
+					clientId: tail.clientId,
+					attributeKey: attributeKeyB,
+					offset: create( {
+						html: last.attributes[ attributeKeyB ],
+					} ).text.length,
+				};
+			} else {
+				output.push( lastBlock );
+				if ( ! isUnmodifiedBlock( tail ) ) {
+					output.push( tail );
+				}
+			}
+		} else if ( ! isUnmodifiedBlock( tail ) ) {
+			output.push( tail );
+		}
+
+		registry.batch( () => {
+			dispatch.replaceBlocks(
+				select.getSelectedBlockClientIds(),
+				output,
+				output.length - 1,
+				0
+			);
+			if ( selection ) {
+				dispatch.selectionChange(
+					selection.clientId,
+					selection.attributeKey,
+					selection.offset,
+					selection.offset
+				);
+			}
+		} );
 	};
 
 /**
@@ -958,14 +1152,14 @@ export const __unstableExpandSelection =
 export const mergeBlocks =
 	( firstBlockClientId, secondBlockClientId ) =>
 	( { registry, select, dispatch } ) => {
-		const blocks = [ firstBlockClientId, secondBlockClientId ];
-		dispatch( { type: 'MERGE_BLOCKS', blocks } );
-
-		const [ clientIdA, clientIdB ] = blocks;
+		const clientIdA = firstBlockClientId;
+		const clientIdB = secondBlockClientId;
 		const blockA = select.getBlock( clientIdA );
 		const blockAType = getBlockType( blockA.name );
 
-		if ( ! blockAType ) return;
+		if ( ! blockAType ) {
+			return;
+		}
 
 		const blockB = select.getBlock( clientIdB );
 
@@ -1366,11 +1560,18 @@ export const insertDefaultBlock =
 	};
 
 /**
- * Action that changes the nested settings of a given block.
+ * @typedef {Object< string, Object >} SettingsByClientId
+ */
+
+/**
+ * Action that changes the nested settings of the given block(s).
  *
- * @param {string} clientId Client ID of the block whose nested setting are
- *                          being received.
- * @param {Object} settings Object with the new settings for the nested block.
+ * @param {string | SettingsByClientId} clientId Client ID of the block whose
+ *                                               nested setting are being
+ *                                               received, or object of settings
+ *                                               by client ID.
+ * @param {Object}                      settings Object with the new settings
+ *                                               for the nested block.
  *
  * @return {Object} Action object
  */
@@ -1468,56 +1669,35 @@ export const setNavigationMode =
  */
 export const __unstableSetEditorMode =
 	( mode ) =>
-	( { dispatch, select } ) => {
-		// When switching to zoom-out mode, we need to select the root block
-		if ( mode === 'zoom-out' ) {
-			const firstSelectedClientId = select.getBlockSelectionStart();
-			if ( firstSelectedClientId ) {
-				dispatch.selectBlock(
-					select.getBlockHierarchyRootClientId(
-						firstSelectedClientId
-					)
-				);
-			}
-		}
-
-		dispatch( { type: 'SET_EDITOR_MODE', mode } );
+	( { registry } ) => {
+		registry.dispatch( preferencesStore ).set( 'core', 'editorTool', mode );
 
 		if ( mode === 'navigation' ) {
-			speak(
-				__(
-					'You are currently in navigation mode. Navigate blocks using the Tab key and Arrow keys. Use Left and Right Arrow keys to move between nesting levels. To exit navigation mode and edit the selected block, press Enter.'
-				)
-			);
+			speak( __( 'You are currently in Write mode.' ) );
 		} else if ( mode === 'edit' ) {
-			speak(
-				__(
-					'You are currently in edit mode. To return to the navigation mode, press Escape.'
-				)
-			);
-		} else if ( mode === 'zoom-out' ) {
-			speak( __( 'You are currently in zoom-out mode.' ) );
+			speak( __( 'You are currently in Design mode.' ) );
 		}
 	};
 
 /**
- * Action that enables or disables the block moving mode.
+ * Set the block moving client ID.
  *
- * @param {string|null} hasBlockMovingClientId Enable/Disable block moving mode.
+ * @deprecated
+ *
+ * @return {Object} Action object.
  */
-export const setBlockMovingClientId =
-	( hasBlockMovingClientId = null ) =>
-	( { dispatch } ) => {
-		dispatch( { type: 'SET_BLOCK_MOVING_MODE', hasBlockMovingClientId } );
-
-		if ( hasBlockMovingClientId ) {
-			speak(
-				__(
-					'Use the Tab key and Arrow keys to choose new block location. Use Left and Right Arrow keys to move between nesting levels. Once location is selected press Enter or Space to move the block.'
-				)
-			);
+export function setBlockMovingClientId() {
+	deprecated(
+		'wp.data.dispatch( "core/block-editor" ).setBlockMovingClientId',
+		{
+			since: '6.7',
+			hint: 'Block moving mode feature has been removed',
 		}
+	);
+	return {
+		type: 'DO_NOTHING',
 	};
+}
 
 /**
  * Action that duplicates a list of blocks.
@@ -1573,7 +1753,7 @@ export const duplicateBlocks =
 	};
 
 /**
- * Action that inserts an empty block before a given block.
+ * Action that inserts a default block before a given block.
  *
  * @param {string} clientId
  */
@@ -1589,16 +1769,34 @@ export const insertBeforeBlock =
 			return;
 		}
 
-		const firstSelectedIndex = select.getBlockIndex( clientId );
-		return dispatch.insertDefaultBlock(
-			{},
-			rootClientId,
-			firstSelectedIndex
-		);
+		const blockIndex = select.getBlockIndex( clientId );
+		const directInsertBlock = rootClientId
+			? select.getDirectInsertBlock( rootClientId )
+			: null;
+
+		if ( ! directInsertBlock ) {
+			return dispatch.insertDefaultBlock( {}, rootClientId, blockIndex );
+		}
+
+		const copiedAttributes = {};
+		if ( directInsertBlock.attributesToCopy ) {
+			const attributes = select.getBlockAttributes( clientId );
+			directInsertBlock.attributesToCopy.forEach( ( key ) => {
+				if ( attributes[ key ] ) {
+					copiedAttributes[ key ] = attributes[ key ];
+				}
+			} );
+		}
+
+		const block = createBlock( directInsertBlock.name, {
+			...directInsertBlock.attributes,
+			...copiedAttributes,
+		} );
+		return dispatch.insertBlock( block, blockIndex, rootClientId );
 	};
 
 /**
- * Action that inserts an empty block after a given block.
+ * Action that inserts a default block after a given block.
  *
  * @param {string} clientId
  */
@@ -1614,12 +1812,34 @@ export const insertAfterBlock =
 			return;
 		}
 
-		const firstSelectedIndex = select.getBlockIndex( clientId );
-		return dispatch.insertDefaultBlock(
-			{},
-			rootClientId,
-			firstSelectedIndex + 1
-		);
+		const blockIndex = select.getBlockIndex( clientId );
+		const directInsertBlock = rootClientId
+			? select.getDirectInsertBlock( rootClientId )
+			: null;
+
+		if ( ! directInsertBlock ) {
+			return dispatch.insertDefaultBlock(
+				{},
+				rootClientId,
+				blockIndex + 1
+			);
+		}
+
+		const copiedAttributes = {};
+		if ( directInsertBlock.attributesToCopy ) {
+			const attributes = select.getBlockAttributes( clientId );
+			directInsertBlock.attributesToCopy.forEach( ( key ) => {
+				if ( attributes[ key ] ) {
+					copiedAttributes[ key ] = attributes[ key ];
+				}
+			} );
+		}
+
+		const block = createBlock( directInsertBlock.name, {
+			...directInsertBlock.attributes,
+			...copiedAttributes,
+		} );
+		return dispatch.insertBlock( block, blockIndex + 1, rootClientId );
 	};
 
 /**
@@ -1679,20 +1899,23 @@ export function setBlockVisibility( updates ) {
 }
 
 /**
- * Action that sets whether a block is being temporaritly edited as blocks.
+ * Action that sets whether a block is being temporarily edited as blocks.
  *
  * DO-NOT-USE in production.
  * This action is created for internal/experimental only usage and may be
  * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
  *
- * @param {?string} temporarilyEditingAsBlocks The block's clientId being temporaritly edited as blocks.
+ * @param {?string} temporarilyEditingAsBlocks The block's clientId being temporarily edited as blocks.
+ * @param {?string} focusModeToRevert          The focus mode to revert after temporarily edit as blocks finishes.
  */
 export function __unstableSetTemporarilyEditingAsBlocks(
-	temporarilyEditingAsBlocks
+	temporarilyEditingAsBlocks,
+	focusModeToRevert
 ) {
 	return {
 		type: 'SET_TEMPORARILY_EDITING_AS_BLOCKS',
 		temporarilyEditingAsBlocks,
+		focusModeToRevert,
 	};
 }
 
@@ -1775,7 +1998,7 @@ export function __unstableSetTemporarilyEditingAsBlocks(
  * 	 		per_page: 'page_size',
  * 	 		search: 'q',
  * 	 	};
- * 	 	const url = new URL( 'https://api.openverse.engineering/v1/images/' );
+ * 	 	const url = new URL( 'https://api.openverse.org/v1/images/' );
  * 	 	Object.entries( finalQuery ).forEach( ( [ key, value ] ) => {
  * 	 		const queryKey = mapFromInserterMediaRequest[ key ] || key;
  * 	 		url.searchParams.set( queryKey, value );
@@ -1919,18 +2142,3 @@ export function unsetBlockEditingMode( clientId = '' ) {
 		clientId,
 	};
 }
-
-/**
- * Action that sets the element that had focus when focus leaves the editor canvas.
- *
- * @param {Object} lastFocus The last focused element.
- *
- *
- * @return {Object} Action object.
- */
-export function setLastFocus( lastFocus = null ) {
-	return {
-		type: 'LAST_FOCUS',
-		lastFocus,
-	};
-}
diff --git a/packages/block-editor/src/store/defaults.js b/packages/block-editor/src/store/defaults.js
index acd40244cb2604..8314ad872468b2 100644
--- a/packages/block-editor/src/store/defaults.js
+++ b/packages/block-editor/src/store/defaults.js
@@ -33,7 +33,6 @@ export const PREFERENCES_DEFAULTS = {
  * @property {boolean}       __experimentalBlockDirectory           Whether the user has enabled the Block Directory
  * @property {Array}         __experimentalBlockPatterns            Array of objects representing the block patterns
  * @property {Array}         __experimentalBlockPatternCategories   Array of objects representing the block pattern categories
- * @property {boolean}       __unstableGalleryWithImageBlocks       Whether the user has enabled the refactored gallery block which uses InnerBlocks
  */
 export const SETTINGS_DEFAULTS = {
 	alignWide: false,
@@ -168,8 +167,8 @@ export const SETTINGS_DEFAULTS = {
 	__mobileEnablePageTemplates: false,
 	__experimentalBlockPatterns: [],
 	__experimentalBlockPatternCategories: [],
-	__unstableGalleryWithImageBlocks: false,
-	__unstableIsPreviewMode: false,
+
+	isPreviewMode: false,
 
 	// These settings will be completely revamped in the future.
 	// The goal is to evolve this into an API which will instruct
diff --git a/packages/block-editor/src/store/defaults.native.js b/packages/block-editor/src/store/defaults.native.js
index fddf7cdb647b97..e951c39b3d1a41 100644
--- a/packages/block-editor/src/store/defaults.native.js
+++ b/packages/block-editor/src/store/defaults.native.js
@@ -10,9 +10,6 @@ const SETTINGS_DEFAULTS = {
 	...SETTINGS,
 	// Don't add the default font sizes for standard themes
 	fontSizes: undefined,
-	// FOR TESTING ONLY - Later, this will come from a REST API
-	// eslint-disable-next-line no-undef
-	__unstableGalleryWithImageBlocks: __DEV__,
 	alignWide: true,
 	supportsLayout: false,
 	__experimentalFeatures: {
diff --git a/packages/block-editor/src/store/get-block-settings.js b/packages/block-editor/src/store/get-block-settings.js
new file mode 100644
index 00000000000000..9ea8fab15f597a
--- /dev/null
+++ b/packages/block-editor/src/store/get-block-settings.js
@@ -0,0 +1,191 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__EXPERIMENTAL_PATHS_WITH_OVERRIDE as PATHS_WITH_OVERRIDE,
+	hasBlockSupport,
+} from '@wordpress/blocks';
+import { applyFilters } from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import { getValueFromObjectPath } from '../utils/object';
+import { getBlockName, getSettings, getBlockAttributes } from './selectors';
+
+const blockedPaths = [
+	'color',
+	'border',
+	'dimensions',
+	'typography',
+	'spacing',
+];
+
+const deprecatedFlags = {
+	'color.palette': ( settings ) => settings.colors,
+	'color.gradients': ( settings ) => settings.gradients,
+	'color.custom': ( settings ) =>
+		settings.disableCustomColors === undefined
+			? undefined
+			: ! settings.disableCustomColors,
+	'color.customGradient': ( settings ) =>
+		settings.disableCustomGradients === undefined
+			? undefined
+			: ! settings.disableCustomGradients,
+	'typography.fontSizes': ( settings ) => settings.fontSizes,
+	'typography.customFontSize': ( settings ) =>
+		settings.disableCustomFontSizes === undefined
+			? undefined
+			: ! settings.disableCustomFontSizes,
+	'typography.lineHeight': ( settings ) => settings.enableCustomLineHeight,
+	'spacing.units': ( settings ) => {
+		if ( settings.enableCustomUnits === undefined ) {
+			return;
+		}
+
+		if ( settings.enableCustomUnits === true ) {
+			return [ 'px', 'em', 'rem', 'vh', 'vw', '%' ];
+		}
+
+		return settings.enableCustomUnits;
+	},
+	'spacing.padding': ( settings ) => settings.enableCustomSpacing,
+};
+
+const prefixedFlags = {
+	/*
+	 * These were only available in the plugin
+	 * and can be removed when the minimum WordPress version
+	 * for the plugin is 5.9.
+	 */
+	'border.customColor': 'border.color',
+	'border.customStyle': 'border.style',
+	'border.customWidth': 'border.width',
+	'typography.customFontStyle': 'typography.fontStyle',
+	'typography.customFontWeight': 'typography.fontWeight',
+	'typography.customLetterSpacing': 'typography.letterSpacing',
+	'typography.customTextDecorations': 'typography.textDecoration',
+	'typography.customTextTransforms': 'typography.textTransform',
+	/*
+	 * These were part of WordPress 5.8 and we need to keep them.
+	 */
+	'border.customRadius': 'border.radius',
+	'spacing.customMargin': 'spacing.margin',
+	'spacing.customPadding': 'spacing.padding',
+	'typography.customLineHeight': 'typography.lineHeight',
+};
+
+/**
+ * Remove `custom` prefixes for flags that did not land in 5.8.
+ *
+ * This provides continued support for `custom` prefixed properties. It will
+ * be removed once third party devs have had sufficient time to update themes,
+ * plugins, etc.
+ *
+ * @see https://github.com/WordPress/gutenberg/pull/34485
+ *
+ * @param {string} path Path to desired value in settings.
+ * @return {string}     The value for defined setting.
+ */
+const removeCustomPrefixes = ( path ) => {
+	return prefixedFlags[ path ] || path;
+};
+
+export function getBlockSettings( state, clientId, ...paths ) {
+	const blockName = getBlockName( state, clientId );
+	const candidates = [];
+
+	if ( clientId ) {
+		let id = clientId;
+		do {
+			const name = getBlockName( state, id );
+			if ( hasBlockSupport( name, '__experimentalSettings', false ) ) {
+				candidates.push( id );
+			}
+		} while ( ( id = state.blocks.parents.get( id ) ) );
+	}
+
+	return paths.map( ( path ) => {
+		if ( blockedPaths.includes( path ) ) {
+			// eslint-disable-next-line no-console
+			console.warn(
+				'Top level useSetting paths are disabled. Please use a subpath to query the information needed.'
+			);
+			return undefined;
+		}
+
+		// 0. Allow third parties to filter the block's settings at runtime.
+		let result = applyFilters(
+			'blockEditor.useSetting.before',
+			undefined,
+			path,
+			clientId,
+			blockName
+		);
+
+		if ( undefined !== result ) {
+			return result;
+		}
+
+		const normalizedPath = removeCustomPrefixes( path );
+
+		// 1. Take settings from the block instance or its ancestors.
+		// Start from the current block and work our way up the ancestors.
+		for ( const candidateClientId of candidates ) {
+			const candidateAtts = getBlockAttributes(
+				state,
+				candidateClientId
+			);
+			result =
+				getValueFromObjectPath(
+					candidateAtts.settings?.blocks?.[ blockName ],
+					normalizedPath
+				) ??
+				getValueFromObjectPath(
+					candidateAtts.settings,
+					normalizedPath
+				);
+			if ( result !== undefined ) {
+				// Stop the search for more distant ancestors and move on.
+				break;
+			}
+		}
+
+		// 2. Fall back to the settings from the block editor store (__experimentalFeatures).
+		const settings = getSettings( state );
+		if ( result === undefined && blockName ) {
+			result = getValueFromObjectPath(
+				settings.__experimentalFeatures?.blocks?.[ blockName ],
+				normalizedPath
+			);
+		}
+
+		if ( result === undefined ) {
+			result = getValueFromObjectPath(
+				settings.__experimentalFeatures,
+				normalizedPath
+			);
+		}
+
+		// Return if the setting was found in either the block instance or the store.
+		if ( result !== undefined ) {
+			if ( PATHS_WITH_OVERRIDE[ normalizedPath ] ) {
+				return result.custom ?? result.theme ?? result.default;
+			}
+			return result;
+		}
+
+		// 3. Otherwise, use deprecated settings.
+		const deprecatedSettingsValue =
+			deprecatedFlags[ normalizedPath ]?.( settings );
+		if ( deprecatedSettingsValue !== undefined ) {
+			return deprecatedSettingsValue;
+		}
+
+		// 4. Fallback for typography.dropCap:
+		// This is only necessary to support typography.dropCap.
+		// when __experimentalFeatures are not present (core without plugin).
+		// To remove when __experimentalFeatures are ported to core.
+		return normalizedPath === 'typography.dropCap' ? true : undefined;
+	} );
+}
diff --git a/packages/block-editor/src/store/private-actions.js b/packages/block-editor/src/store/private-actions.js
index 1c29948d814165..e79833e0a73da7 100644
--- a/packages/block-editor/src/store/private-actions.js
+++ b/packages/block-editor/src/store/private-actions.js
@@ -2,6 +2,15 @@
  * WordPress dependencies
  */
 import { Platform } from '@wordpress/element';
+import deprecated from '@wordpress/deprecated';
+import { speak } from '@wordpress/a11y';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from './index';
+import { unlock } from '../lock-unlock';
 
 const castArray = ( maybeArray ) =>
 	Array.isArray( maybeArray ) ? maybeArray : [ maybeArray ];
@@ -33,14 +42,32 @@ export function __experimentalUpdateSettings(
 	settings,
 	{ stripExperimentalSettings = false, reset = false } = {}
 ) {
-	let cleanSettings = settings;
+	let incomingSettings = settings;
+
+	if ( Object.hasOwn( incomingSettings, '__unstableIsPreviewMode' ) ) {
+		deprecated(
+			"__unstableIsPreviewMode argument in wp.data.dispatch('core/block-editor').updateSettings",
+			{
+				since: '6.8',
+				alternative: 'isPreviewMode',
+			}
+		);
+
+		incomingSettings = { ...incomingSettings };
+		incomingSettings.isPreviewMode =
+			incomingSettings.__unstableIsPreviewMode;
+		delete incomingSettings.__unstableIsPreviewMode;
+	}
+
+	let cleanSettings = incomingSettings;
+
 	// There are no plugins in the mobile apps, so there is no
 	// need to strip the experimental settings:
 	if ( stripExperimentalSettings && Platform.OS === 'web' ) {
 		cleanSettings = {};
-		for ( const key in settings ) {
+		for ( const key in incomingSettings ) {
 			if ( ! privateSettings.includes( key ) ) {
-				cleanSettings[ key ] = settings[ key ];
+				cleanSettings[ key ] = incomingSettings[ key ];
 			}
 		}
 	}
@@ -98,11 +125,7 @@ export const privateRemoveBlocks =
 		}
 
 		clientIds = castArray( clientIds );
-		const rootClientId = select.getBlockRootClientId( clientIds[ 0 ] );
-		const canRemoveBlocks = select.canRemoveBlocks(
-			clientIds,
-			rootClientId
-		);
+		const canRemoveBlocks = select.canRemoveBlocks( clientIds );
 
 		if ( ! canRemoveBlocks ) {
 			return;
@@ -118,35 +141,36 @@ export const privateRemoveBlocks =
 		//
 		// @see https://github.com/WordPress/gutenberg/pull/51145
 		const rules = ! forceRemove && select.getBlockRemovalRules();
+
 		if ( rules ) {
-			const blockNamesForPrompt = new Set();
-
-			// Given a list of client IDs of blocks that the user intended to
-			// remove, perform a tree search (BFS) to find all block names
-			// corresponding to "important" blocks, i.e. blocks that require a
-			// removal prompt.
-			const queue = [ ...clientIds ];
-			while ( queue.length ) {
-				const clientId = queue.shift();
-				const blockName = select.getBlockName( clientId );
-				if ( rules[ blockName ] ) {
-					blockNamesForPrompt.add( blockName );
+			function flattenBlocks( blocks ) {
+				const result = [];
+				const stack = [ ...blocks ];
+				while ( stack.length ) {
+					const { innerBlocks, ...block } = stack.shift();
+					stack.push( ...innerBlocks );
+					result.push( block );
 				}
-				const innerBlocks = select.getBlockOrder( clientId );
-				queue.push( ...innerBlocks );
+				return result;
 			}
 
-			// If any such blocks were found, trigger the removal prompt and
-			// skip any other steps (thus postponing actual removal).
-			if ( blockNamesForPrompt.size ) {
-				dispatch(
-					displayBlockRemovalPrompt(
-						clientIds,
-						selectPrevious,
-						Array.from( blockNamesForPrompt )
-					)
-				);
-				return;
+			const blockList = clientIds.map( select.getBlock );
+			const flattenedBlocks = flattenBlocks( blockList );
+
+			// Find the first message and use it.
+			let message;
+			for ( const rule of rules ) {
+				message = rule.callback( flattenedBlocks );
+				if ( message ) {
+					dispatch(
+						displayBlockRemovalPrompt(
+							clientIds,
+							selectPrevious,
+							message
+						)
+					);
+					return;
+				}
 			}
 		}
 
@@ -197,28 +221,21 @@ export const ensureDefaultBlock =
  *
  * Contrast with `setBlockRemovalRules`.
  *
- * @param {string|string[]} clientIds           Client IDs of blocks to remove.
- * @param {boolean}         selectPrevious      True if the previous block
- *                                              or the immediate parent
- *                                              (if no previous block exists)
- *                                              should be selected
- *                                              when a block is removed.
- * @param {string[]}        blockNamesForPrompt Names of the blocks that
- *                                              triggered the need for
- *                                              confirmation before removal.
+ * @param {string|string[]} clientIds      Client IDs of blocks to remove.
+ * @param {boolean}         selectPrevious True if the previous block or the
+ *                                         immediate parent (if no previous
+ *                                         block exists) should be selected
+ *                                         when a block is removed.
+ * @param {string}          message        Message to display in the prompt.
  *
  * @return {Object} Action object.
  */
-function displayBlockRemovalPrompt(
-	clientIds,
-	selectPrevious,
-	blockNamesForPrompt
-) {
+function displayBlockRemovalPrompt( clientIds, selectPrevious, message ) {
 	return {
 		type: 'DISPLAY_BLOCK_REMOVAL_PROMPT',
 		clientIds,
 		selectPrevious,
-		blockNamesForPrompt,
+		message,
 	};
 }
 
@@ -291,10 +308,178 @@ export function deleteStyleOverride( id ) {
 	};
 }
 
-export function syncDerivedBlockAttributes( clientId, attributes ) {
+/**
+ * Action that sets the element that had focus when focus leaves the editor canvas.
+ *
+ * @param {Object} lastFocus The last focused element.
+ *
+ *
+ * @return {Object} Action object.
+ */
+export function setLastFocus( lastFocus = null ) {
+	return {
+		type: 'LAST_FOCUS',
+		lastFocus,
+	};
+}
+
+/**
+ * Action that stops temporarily editing as blocks.
+ *
+ * @param {string} clientId The block's clientId.
+ */
+export function stopEditingAsBlocks( clientId ) {
+	return ( { select, dispatch, registry } ) => {
+		const focusModeToRevert = unlock(
+			registry.select( blockEditorStore )
+		).getTemporarilyEditingFocusModeToRevert();
+		dispatch.__unstableMarkNextChangeAsNotPersistent();
+		dispatch.updateBlockAttributes( clientId, {
+			templateLock: 'contentOnly',
+		} );
+		dispatch.updateBlockListSettings( clientId, {
+			...select.getBlockListSettings( clientId ),
+			templateLock: 'contentOnly',
+		} );
+		dispatch.updateSettings( { focusMode: focusModeToRevert } );
+		dispatch.__unstableSetTemporarilyEditingAsBlocks();
+	};
+}
+
+/**
+ * Returns an action object used in signalling that the user has begun to drag.
+ *
+ * @return {Object} Action object.
+ */
+export function startDragging() {
+	return {
+		type: 'START_DRAGGING',
+	};
+}
+
+/**
+ * Returns an action object used in signalling that the user has stopped dragging.
+ *
+ * @return {Object} Action object.
+ */
+export function stopDragging() {
+	return {
+		type: 'STOP_DRAGGING',
+	};
+}
+
+/**
+ * @param {string|null} clientId The block's clientId, or `null` to clear.
+ *
+ * @return  {Object} Action object.
+ */
+export function expandBlock( clientId ) {
+	return {
+		type: 'SET_BLOCK_EXPANDED_IN_LIST_VIEW',
+		clientId,
+	};
+}
+
+/**
+ * @param {Object} value
+ * @param {string} value.rootClientId The root client ID to insert at.
+ * @param {number} value.index        The index to insert at.
+ *
+ * @return {Object} Action object.
+ */
+export function setInsertionPoint( value ) {
+	return {
+		type: 'SET_INSERTION_POINT',
+		value,
+	};
+}
+
+/**
+ * Temporarily modify/unlock the content-only block for editions.
+ *
+ * @param {string} clientId The client id of the block.
+ */
+export const modifyContentLockBlock =
+	( clientId ) =>
+	( { select, dispatch } ) => {
+		dispatch.selectBlock( clientId );
+		dispatch.__unstableMarkNextChangeAsNotPersistent();
+		dispatch.updateBlockAttributes( clientId, {
+			templateLock: undefined,
+		} );
+		dispatch.updateBlockListSettings( clientId, {
+			...select.getBlockListSettings( clientId ),
+			templateLock: false,
+		} );
+		const focusModeToRevert = select.getSettings().focusMode;
+		dispatch.updateSettings( { focusMode: true } );
+		dispatch.__unstableSetTemporarilyEditingAsBlocks(
+			clientId,
+			focusModeToRevert
+		);
+	};
+
+/**
+ * Sets the zoom level.
+ *
+ * @param {number} zoom the new zoom level
+ * @return {Object} Action object.
+ */
+export const setZoomLevel =
+	( zoom = 100 ) =>
+	( { select, dispatch } ) => {
+		// When switching to zoom-out mode, we need to select the parent section
+		if ( zoom !== 100 ) {
+			const firstSelectedClientId = select.getBlockSelectionStart();
+			const sectionRootClientId = select.getSectionRootClientId();
+
+			if ( firstSelectedClientId ) {
+				let sectionClientId;
+
+				if ( sectionRootClientId ) {
+					const sectionClientIds =
+						select.getBlockOrder( sectionRootClientId );
+
+					// If the selected block is a section block, use it.
+					if ( sectionClientIds?.includes( firstSelectedClientId ) ) {
+						sectionClientId = firstSelectedClientId;
+					} else {
+						// If the selected block is not a section block, find
+						// the parent section that contains the selected block.
+						sectionClientId = select
+							.getBlockParents( firstSelectedClientId )
+							.find( ( parent ) =>
+								sectionClientIds.includes( parent )
+							);
+					}
+				} else {
+					sectionClientId = select.getBlockHierarchyRootClientId(
+						firstSelectedClientId
+					);
+				}
+
+				if ( sectionClientId ) {
+					dispatch.selectBlock( sectionClientId );
+				} else {
+					dispatch.clearSelectedBlock();
+				}
+
+				speak( __( 'You are currently in zoom-out mode.' ) );
+			}
+		}
+
+		dispatch( {
+			type: 'SET_ZOOM_LEVEL',
+			zoom,
+		} );
+	};
+
+/**
+ * Resets the Zoom state.
+ * @return {Object} Action object.
+ */
+export function resetZoomLevel() {
 	return {
-		type: 'SYNC_DERIVED_BLOCK_ATTRIBUTES',
-		clientIds: [ clientId ],
-		attributes,
+		type: 'RESET_ZOOM_LEVEL',
 	};
 }
diff --git a/packages/block-editor/src/store/private-keys.js b/packages/block-editor/src/store/private-keys.js
new file mode 100644
index 00000000000000..e24b4a6264e72f
--- /dev/null
+++ b/packages/block-editor/src/store/private-keys.js
@@ -0,0 +1,5 @@
+export const globalStylesDataKey = Symbol( 'globalStylesDataKey' );
+export const globalStylesLinksDataKey = Symbol( 'globalStylesLinks' );
+export const selectBlockPatternsKey = Symbol( 'selectBlockPatternsKey' );
+export const reusableBlocksSelectKey = Symbol( 'reusableBlocksSelect' );
+export const sectionRootClientIdKey = Symbol( 'sectionRootClientIdKey' );
diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js
index c4220e6e7e516c..525aca4c236cbc 100644
--- a/packages/block-editor/src/store/private-selectors.js
+++ b/packages/block-editor/src/store/private-selectors.js
@@ -1,7 +1,7 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import createSelector from 'rememo';
+import { createSelector, createRegistrySelector } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -10,7 +10,30 @@ import {
 	getBlockOrder,
 	getBlockParents,
 	getBlockEditingMode,
+	getSettings,
+	canInsertBlockType,
+	getBlockName,
+	getTemplateLock,
+	getClientIdsWithDescendants,
+	isNavigationMode,
+	getBlockRootClientId,
 } from './selectors';
+import {
+	checkAllowListRecursive,
+	getAllPatternsDependants,
+	getInsertBlockTypeDependants,
+	getGrammar,
+} from './utils';
+import { INSERTER_PATTERN_TYPES } from '../components/inserter/block-patterns-tab/utils';
+import { STORE_NAME } from './constants';
+import { unlock } from '../lock-unlock';
+import {
+	selectBlockPatternsKey,
+	reusableBlocksSelectKey,
+	sectionRootClientIdKey,
+} from './private-keys';
+
+export { getBlockSettings } from './get-block-settings';
 
 /**
  * Returns true if the block interface is hidden, or false otherwise.
@@ -33,37 +56,49 @@ export function getLastInsertedBlocksClientIds( state ) {
 	return state?.lastBlockInserted?.clientIds;
 }
 
+export function getBlockWithoutAttributes( state, clientId ) {
+	return state.blocks.byClientId.get( clientId );
+}
+
 /**
- * Returns true if the block with the given client ID and all of its descendants
+ * Returns true if all of the descendants of a block with the given client ID
  * have an editing mode of 'disabled', or false otherwise.
  *
  * @param {Object} state    Global application state.
  * @param {string} clientId The block client ID.
  *
- * @return {boolean} Whether the block and its descendants are disabled.
+ * @return {boolean} Whether the block descendants are disabled.
  */
-export const isBlockSubtreeDisabled = createSelector(
-	( state, clientId ) => {
-		const isChildSubtreeDisabled = ( childClientId ) => {
-			return (
-				getBlockEditingMode( state, childClientId ) === 'disabled' &&
-				getBlockOrder( state, childClientId ).every(
-					isChildSubtreeDisabled
-				)
-			);
-		};
+export const isBlockSubtreeDisabled = ( state, clientId ) => {
+	const isChildSubtreeDisabled = ( childClientId ) => {
 		return (
-			getBlockEditingMode( state, clientId ) === 'disabled' &&
-			getBlockOrder( state, clientId ).every( isChildSubtreeDisabled )
+			getBlockEditingMode( state, childClientId ) === 'disabled' &&
+			getBlockOrder( state, childClientId ).every(
+				isChildSubtreeDisabled
+			)
 		);
-	},
-	( state ) => [
-		state.blocks.parents,
-		state.blocks.order,
-		state.blockEditingModes,
-		state.blockListSettings,
-	]
-);
+	};
+	return getBlockOrder( state, clientId ).every( isChildSubtreeDisabled );
+};
+
+function getEnabledClientIdsTreeUnmemoized( state, rootClientId ) {
+	const blockOrder = getBlockOrder( state, rootClientId );
+	const result = [];
+
+	for ( const clientId of blockOrder ) {
+		const innerBlocks = getEnabledClientIdsTreeUnmemoized(
+			state,
+			clientId
+		);
+		if ( getBlockEditingMode( state, clientId ) !== 'disabled' ) {
+			result.push( { clientId, innerBlocks } );
+		} else {
+			result.push( ...innerBlocks );
+		}
+	}
+
+	return result;
+}
 
 /**
  * Returns a tree of block objects with only clientID and innerBlocks set.
@@ -75,24 +110,15 @@ export const isBlockSubtreeDisabled = createSelector(
  * @return {Object[]} Tree of block objects with only clientID and innerBlocks set.
  */
 export const getEnabledClientIdsTree = createSelector(
-	( state, rootClientId = '' ) => {
-		return getBlockOrder( state, rootClientId ).flatMap( ( clientId ) => {
-			if ( getBlockEditingMode( state, clientId ) !== 'disabled' ) {
-				return [
-					{
-						clientId,
-						innerBlocks: getEnabledClientIdsTree( state, clientId ),
-					},
-				];
-			}
-			return getEnabledClientIdsTree( state, clientId );
-		} );
-	},
+	getEnabledClientIdsTreeUnmemoized,
 	( state ) => [
 		state.blocks.order,
 		state.blockEditingModes,
 		state.settings.templateLock,
 		state.blockListSettings,
+		state.editorMode,
+		state.zoomLevel,
+		getSectionRootClientId( state ),
 	]
 );
 
@@ -157,13 +183,36 @@ export function getOpenedBlockSettingsMenu( state ) {
 /**
  * Returns all style overrides, intended to be merged with global editor styles.
  *
+ * Overrides are sorted to match the order of the blocks they relate to. This
+ * is useful to maintain correct CSS cascade order.
+ *
  * @param {Object} state Global application state.
  *
- * @return {Map} A map of style IDs to style overrides.
+ * @return {Array} An array of style ID to style override pairs.
  */
-export function getStyleOverrides( state ) {
-	return state.styleOverrides;
-}
+export const getStyleOverrides = createSelector(
+	( state ) => {
+		const clientIds = getClientIdsWithDescendants( state );
+		const clientIdMap = clientIds.reduce( ( acc, clientId, index ) => {
+			acc[ clientId ] = index;
+			return acc;
+		}, {} );
+
+		return [ ...state.styleOverrides ].sort( ( overrideA, overrideB ) => {
+			// Once the overrides Map is spread to an array, the first element
+			// is the key, while the second is the override itself including
+			// the clientId to sort by.
+			const [ , { clientId: clientIdA } ] = overrideA;
+			const [ , { clientId: clientIdB } ] = overrideB;
+
+			const aIndex = clientIdMap[ clientIdA ] ?? -1;
+			const bIndex = clientIdMap[ clientIdB ] ?? -1;
+
+			return aIndex - bIndex;
+		} );
+	},
+	( state ) => [ state.blocks.order, state.styleOverrides ]
+);
 
 /** @typedef {import('./actions').InserterMediaCategory} InserterMediaCategory */
 /**
@@ -236,3 +285,392 @@ export const getInserterMediaCategories = createSelector(
 		state.registeredInserterMediaCategories,
 	]
 );
+
+/**
+ * Returns whether there is at least one allowed pattern for inner blocks children.
+ * This is useful for deferring the parsing of all patterns until needed.
+ *
+ * @param {Object} state               Editor state.
+ * @param {string} [rootClientId=null] Target root client ID.
+ *
+ * @return {boolean} If there is at least one allowed pattern.
+ */
+export const hasAllowedPatterns = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state, rootClientId = null ) => {
+			const { getAllPatterns } = unlock( select( STORE_NAME ) );
+			const patterns = getAllPatterns();
+			const { allowedBlockTypes } = getSettings( state );
+			return patterns.some( ( pattern ) => {
+				const { inserter = true } = pattern;
+				if ( ! inserter ) {
+					return false;
+				}
+				const grammar = getGrammar( pattern );
+				return (
+					checkAllowListRecursive( grammar, allowedBlockTypes ) &&
+					grammar.every( ( { name: blockName } ) =>
+						canInsertBlockType( state, blockName, rootClientId )
+					)
+				);
+			} );
+		},
+		( state, rootClientId ) => [
+			...getAllPatternsDependants( select )( state ),
+			...getInsertBlockTypeDependants( state, rootClientId ),
+		]
+	)
+);
+
+function mapUserPattern(
+	userPattern,
+	__experimentalUserPatternCategories = []
+) {
+	return {
+		name: `core/block/${ userPattern.id }`,
+		id: userPattern.id,
+		type: INSERTER_PATTERN_TYPES.user,
+		title: userPattern.title.raw,
+		categories: userPattern.wp_pattern_category.map( ( catId ) => {
+			const category = __experimentalUserPatternCategories.find(
+				( { id } ) => id === catId
+			);
+			return category ? category.slug : catId;
+		} ),
+		content: userPattern.content.raw,
+		syncStatus: userPattern.wp_pattern_sync_status,
+	};
+}
+
+export const getPatternBySlug = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state, patternName ) => {
+			// Only fetch reusable blocks if we know we need them. To do: maybe
+			// use the entity record API to retrieve the block by slug.
+			if ( patternName?.startsWith( 'core/block/' ) ) {
+				const _id = parseInt(
+					patternName.slice( 'core/block/'.length ),
+					10
+				);
+				const block = unlock( select( STORE_NAME ) )
+					.getReusableBlocks()
+					.find( ( { id } ) => id === _id );
+
+				if ( ! block ) {
+					return null;
+				}
+
+				return mapUserPattern(
+					block,
+					state.settings.__experimentalUserPatternCategories
+				);
+			}
+
+			return [
+				// This setting is left for back compat.
+				...( state.settings.__experimentalBlockPatterns ?? [] ),
+				...( state.settings[ selectBlockPatternsKey ]?.( select ) ??
+					[] ),
+			].find( ( { name } ) => name === patternName );
+		},
+		( state, patternName ) =>
+			patternName?.startsWith( 'core/block/' )
+				? [
+						unlock( select( STORE_NAME ) ).getReusableBlocks(),
+						state.settings.__experimentalReusableBlocks,
+				  ]
+				: [
+						state.settings.__experimentalBlockPatterns,
+						state.settings[ selectBlockPatternsKey ]?.( select ),
+				  ]
+	)
+);
+
+export const getAllPatterns = createRegistrySelector( ( select ) =>
+	createSelector( ( state ) => {
+		return [
+			...unlock( select( STORE_NAME ) )
+				.getReusableBlocks()
+				.map( ( userPattern ) =>
+					mapUserPattern(
+						userPattern,
+						state.settings.__experimentalUserPatternCategories
+					)
+				),
+			// This setting is left for back compat.
+			...( state.settings.__experimentalBlockPatterns ?? [] ),
+			...( state.settings[ selectBlockPatternsKey ]?.( select ) ?? [] ),
+		].filter(
+			( x, index, arr ) =>
+				index === arr.findIndex( ( y ) => x.name === y.name )
+		);
+	}, getAllPatternsDependants( select ) )
+);
+
+export const isResolvingPatterns = createRegistrySelector( ( select ) =>
+	createSelector( ( state ) => {
+		const blockPatternsSelect = state.settings[ selectBlockPatternsKey ];
+		const reusableBlocksSelect = state.settings[ reusableBlocksSelectKey ];
+		return (
+			( blockPatternsSelect
+				? blockPatternsSelect( select ) === undefined
+				: false ) ||
+			( reusableBlocksSelect
+				? reusableBlocksSelect( select ) === undefined
+				: false )
+		);
+	}, getAllPatternsDependants( select ) )
+);
+
+const EMPTY_ARRAY = [];
+
+export const getReusableBlocks = createRegistrySelector(
+	( select ) => ( state ) => {
+		const reusableBlocksSelect = state.settings[ reusableBlocksSelectKey ];
+		return (
+			( reusableBlocksSelect
+				? reusableBlocksSelect( select )
+				: state.settings.__experimentalReusableBlocks ) ?? EMPTY_ARRAY
+		);
+	}
+);
+
+/**
+ * Returns the element of the last element that had focus when focus left the editor canvas.
+ *
+ * @param {Object} state Block editor state.
+ *
+ * @return {Object} Element.
+ */
+export function getLastFocus( state ) {
+	return state.lastFocus;
+}
+
+/**
+ * Returns true if the user is dragging anything, or false otherwise. It is possible for a
+ * user to be dragging data from outside of the editor, so this selector is separate from
+ * the `isDraggingBlocks` selector which only returns true if the user is dragging blocks.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Whether user is dragging.
+ */
+export function isDragging( state ) {
+	return state.isDragging;
+}
+
+/**
+ * Retrieves the expanded block from the state.
+ *
+ * @param {Object} state Block editor state.
+ *
+ * @return {string|null} The client ID of the expanded block, if set.
+ */
+export function getExpandedBlock( state ) {
+	return state.expandedBlock;
+}
+
+/**
+ * Retrieves the client ID of the ancestor block that is content locking the block
+ * with the provided client ID.
+ *
+ * @param {Object} state    Global application state.
+ * @param {string} clientId Client Id of the block.
+ *
+ * @return {?string} Client ID of the ancestor block that is content locking the block.
+ */
+export const getContentLockingParent = ( state, clientId ) => {
+	let current = clientId;
+	let result;
+	while ( ! result && ( current = state.blocks.parents.get( current ) ) ) {
+		if ( getTemplateLock( state, current ) === 'contentOnly' ) {
+			result = current;
+		}
+	}
+	return result;
+};
+
+/**
+ * Retrieves the client ID of the parent section block.
+ *
+ * @param {Object} state    Global application state.
+ * @param {string} clientId Client Id of the block.
+ *
+ * @return {?string} Client ID of the ancestor block that is content locking the block.
+ */
+export const getParentSectionBlock = ( state, clientId ) => {
+	let current = clientId;
+	let result;
+	while ( ! result && ( current = state.blocks.parents.get( current ) ) ) {
+		if ( isSectionBlock( state, current ) ) {
+			result = current;
+		}
+	}
+	return result;
+};
+
+/**
+ * Retrieves the client ID is a content locking parent
+ *
+ * @param {Object} state    Global application state.
+ * @param {string} clientId Client Id of the block.
+ *
+ * @return {boolean} Whether the block is a content locking parent.
+ */
+export function isSectionBlock( state, clientId ) {
+	const sectionRootClientId = getSectionRootClientId( state );
+	const sectionClientIds = getBlockOrder( state, sectionRootClientId );
+	return (
+		getBlockName( state, clientId ) === 'core/block' ||
+		getTemplateLock( state, clientId ) === 'contentOnly' ||
+		( isNavigationMode( state ) && sectionClientIds.includes( clientId ) )
+	);
+}
+
+/**
+ * Retrieves the client ID of the block that is content locked but is
+ * currently being temporarily edited as a non-locked block.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {?string} The client ID of the block being temporarily edited as a non-locked block.
+ */
+export function getTemporarilyEditingAsBlocks( state ) {
+	return state.temporarilyEditingAsBlocks;
+}
+
+/**
+ * Returns the focus mode that should be reapplied when the user stops editing
+ * a content locked blocks as a block without locking.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {?string} The focus mode that should be re-set when temporarily editing as blocks stops.
+ */
+export function getTemporarilyEditingFocusModeToRevert( state ) {
+	return state.temporarilyEditingFocusModeRevert;
+}
+
+/**
+ * Returns the style attributes of multiple blocks.
+ *
+ * @param {Object}   state     Global application state.
+ * @param {string[]} clientIds An array of block client IDs.
+ *
+ * @return {Object} An object where keys are client IDs and values are the corresponding block styles or undefined.
+ */
+export const getBlockStyles = createSelector(
+	( state, clientIds ) =>
+		clientIds.reduce( ( styles, clientId ) => {
+			styles[ clientId ] = state.blocks.attributes.get( clientId )?.style;
+			return styles;
+		}, {} ),
+	( state, clientIds ) => [
+		...clientIds.map(
+			( clientId ) => state.blocks.attributes.get( clientId )?.style
+		),
+	]
+);
+
+/**
+ * Retrieves the client ID of the block which contains the blocks
+ * acting as "sections" in the editor. This is typically the "main content"
+ * of the template/post.
+ *
+ * @param {Object} state Editor state.
+ *
+ * @return {string|undefined} The section root client ID or undefined if not set.
+ */
+export function getSectionRootClientId( state ) {
+	return state.settings?.[ sectionRootClientIdKey ];
+}
+
+/**
+ * Returns whether the editor is considered zoomed out.
+ *
+ * @param {Object} state Global application state.
+ * @return {boolean} Whether the editor is zoomed.
+ */
+export function isZoomOut( state ) {
+	return state.zoomLevel === 'auto-scaled' || state.zoomLevel < 100;
+}
+
+/**
+ * Returns whether the zoom level.
+ *
+ * @param {Object} state Global application state.
+ * @return {number|"auto-scaled"} Zoom level.
+ */
+export function getZoomLevel( state ) {
+	return state.zoomLevel;
+}
+
+/**
+ * Finds the closest block where the block is allowed to be inserted.
+ *
+ * @param {Object}            state    Editor state.
+ * @param {string[] | string} name     Block name or names.
+ * @param {string}            clientId Default insertion point.
+ *
+ * @return {string} clientID of the closest container when the block name can be inserted.
+ */
+export function getClosestAllowedInsertionPoint( state, name, clientId = '' ) {
+	const blockNames = Array.isArray( name ) ? name : [ name ];
+	const areBlockNamesAllowedInClientId = ( id ) =>
+		blockNames.every( ( currentName ) =>
+			canInsertBlockType( state, currentName, id )
+		);
+
+	// If we're trying to insert at the root level and it's not allowed
+	// Try the section root instead.
+	if ( ! clientId ) {
+		if ( areBlockNamesAllowedInClientId( clientId ) ) {
+			return clientId;
+		}
+
+		const sectionRootClientId = getSectionRootClientId( state );
+		if (
+			sectionRootClientId &&
+			areBlockNamesAllowedInClientId( sectionRootClientId )
+		) {
+			return sectionRootClientId;
+		}
+		return null;
+	}
+
+	// Traverse the block tree up until we find a place where we can insert.
+	let current = clientId;
+	while ( current !== null && ! areBlockNamesAllowedInClientId( current ) ) {
+		const parentClientId = getBlockRootClientId( state, current );
+		current = parentClientId;
+	}
+
+	return current;
+}
+
+export function getClosestAllowedInsertionPointForPattern(
+	state,
+	pattern,
+	clientId
+) {
+	const { allowedBlockTypes } = getSettings( state );
+	const isAllowed = checkAllowListRecursive(
+		getGrammar( pattern ),
+		allowedBlockTypes
+	);
+	if ( ! isAllowed ) {
+		return null;
+	}
+	const names = getGrammar( pattern ).map( ( { blockName: name } ) => name );
+	return getClosestAllowedInsertionPoint( state, names, clientId );
+}
+
+/**
+ * Where the point where the next block will be inserted into.
+ *
+ * @param {Object} state
+ * @return {Object} where the insertion point in the block editor is or null if none is set.
+ */
+export function getInsertionPoint( state ) {
+	return state.insertionPoint;
+}
diff --git a/packages/block-editor/src/store/reducer.js b/packages/block-editor/src/store/reducer.js
index 5319a3b2553654..2f0fa70d616fd9 100644
--- a/packages/block-editor/src/store/reducer.js
+++ b/packages/block-editor/src/store/reducer.js
@@ -8,6 +8,7 @@ import fastDeepEqual from 'fast-deep-equal/es6';
  */
 import { pipe } from '@wordpress/compose';
 import { combineReducers, select } from '@wordpress/data';
+import deprecated from '@wordpress/deprecated';
 import { store as blocksStore } from '@wordpress/blocks';
 /**
  * Internal dependencies
@@ -304,20 +305,15 @@ const withBlockTree =
 					action.blocks
 				);
 				newState.tree = new Map( newState.tree );
-				action.replacedClientIds
-					.concat(
-						// Controlled inner blocks are only removed
-						// if the block doesn't move to another position
-						// otherwise their content will be lost.
-						action.replacedClientIds
-							.filter(
-								( clientId ) => ! inserterClientIds[ clientId ]
-							)
-							.map( ( clientId ) => 'controlled||' + clientId )
-					)
-					.forEach( ( key ) => {
-						newState.tree.delete( key );
-					} );
+				action.replacedClientIds.forEach( ( clientId ) => {
+					newState.tree.delete( clientId );
+					// Controlled inner blocks are only removed
+					// if the block doesn't move to another position
+					// otherwise their content will be lost.
+					if ( ! inserterClientIds[ clientId ] ) {
+						newState.tree.delete( 'controlled||' + clientId );
+					}
+				} );
 
 				updateBlockTreeForBlocks( newState, action.blocks );
 				updateParentInnerBlocksInTree(
@@ -329,16 +325,13 @@ const withBlockTree =
 				// If there are no replaced blocks, it means we're removing blocks so we need to update their parent.
 				const parentsOfRemovedBlocks = [];
 				for ( const clientId of action.clientIds ) {
+					const parentId = state.parents.get( clientId );
 					if (
-						state.parents.get( clientId ) !== undefined &&
-						( state.parents.get( clientId ) === '' ||
-							newState.byClientId.get(
-								state.parents.get( clientId )
-							) )
+						parentId !== undefined &&
+						( parentId === '' ||
+							newState.byClientId.get( parentId ) )
 					) {
-						parentsOfRemovedBlocks.push(
-							state.parents.get( clientId )
-						);
+						parentsOfRemovedBlocks.push( parentId );
 					}
 				}
 				updateParentInnerBlocksInTree(
@@ -351,28 +344,20 @@ const withBlockTree =
 			case 'REMOVE_BLOCKS_AUGMENTED_WITH_CHILDREN':
 				const parentsOfRemovedBlocks = [];
 				for ( const clientId of action.clientIds ) {
+					const parentId = state.parents.get( clientId );
 					if (
-						state.parents.get( clientId ) !== undefined &&
-						( state.parents.get( clientId ) === '' ||
-							newState.byClientId.get(
-								state.parents.get( clientId )
-							) )
+						parentId !== undefined &&
+						( parentId === '' ||
+							newState.byClientId.get( parentId ) )
 					) {
-						parentsOfRemovedBlocks.push(
-							state.parents.get( clientId )
-						);
+						parentsOfRemovedBlocks.push( parentId );
 					}
 				}
 				newState.tree = new Map( newState.tree );
-				action.removedClientIds
-					.concat(
-						action.removedClientIds.map(
-							( clientId ) => 'controlled||' + clientId
-						)
-					)
-					.forEach( ( key ) => {
-						newState.tree.delete( key );
-					} );
+				action.removedClientIds.forEach( ( clientId ) => {
+					newState.tree.delete( clientId );
+					newState.tree.delete( 'controlled||' + clientId );
+				} );
 				updateParentInnerBlocksInTree(
 					newState,
 					parentsOfRemovedBlocks,
@@ -453,14 +438,25 @@ const withBlockTree =
 function withPersistentBlockChange( reducer ) {
 	let lastAction;
 	let markNextChangeAsNotPersistent = false;
+	let explicitPersistent;
 
 	return ( state, action ) => {
 		let nextState = reducer( state, action );
 
-		if ( action.type === 'SYNC_DERIVED_BLOCK_ATTRIBUTES' ) {
-			return nextState.isPersistentChange
-				? { ...nextState, isPersistentChange: false }
-				: nextState;
+		let nextIsPersistentChange;
+		if ( action.type === 'SET_EXPLICIT_PERSISTENT' ) {
+			explicitPersistent = action.isPersistentChange;
+			nextIsPersistentChange = state.isPersistentChange ?? true;
+		}
+
+		if ( explicitPersistent !== undefined ) {
+			nextIsPersistentChange = explicitPersistent;
+			return nextIsPersistentChange === nextState.isPersistentChange
+				? nextState
+				: {
+						...nextState,
+						isPersistentChange: nextIsPersistentChange,
+				  };
 		}
 
 		const isExplicitPersistentChange =
@@ -473,7 +469,7 @@ function withPersistentBlockChange( reducer ) {
 			markNextChangeAsNotPersistent =
 				action.type === 'MARK_NEXT_CHANGE_AS_NOT_PERSISTENT';
 
-			const nextIsPersistentChange = state?.isPersistentChange ?? true;
+			nextIsPersistentChange = state?.isPersistentChange ?? true;
 			if ( state.isPersistentChange === nextIsPersistentChange ) {
 				return state;
 			}
@@ -1235,6 +1231,27 @@ export function isTyping( state = false, action ) {
 	return state;
 }
 
+/**
+ * Reducer returning dragging state. It is possible for a user to be dragging
+ * data from outside of the editor, so this state is separate from `draggedBlocks`.
+ *
+ * @param {boolean} state  Current state.
+ * @param {Object}  action Dispatched action.
+ *
+ * @return {boolean} Updated state.
+ */
+export function isDragging( state = false, action ) {
+	switch ( action.type ) {
+		case 'START_DRAGGING':
+			return true;
+
+		case 'STOP_DRAGGING':
+			return false;
+	}
+
+	return state;
+}
+
 /**
  * Reducer returning dragged block client id.
  *
@@ -1489,11 +1506,11 @@ export function isSelectionEnabled( state = true, action ) {
 function removalPromptData( state = false, action ) {
 	switch ( action.type ) {
 		case 'DISPLAY_BLOCK_REMOVAL_PROMPT':
-			const { clientIds, selectPrevious, blockNamesForPrompt } = action;
+			const { clientIds, selectPrevious, message } = action;
 			return {
 				clientIds,
 				selectPrevious,
-				blockNamesForPrompt,
+				message,
 			};
 		case 'CLEAR_BLOCK_REMOVAL_PROMPT':
 			return false;
@@ -1585,16 +1602,22 @@ export function blocksMode( state = {}, action ) {
  *
  * @return {Object} Updated state.
  */
-export function insertionPoint( state = null, action ) {
+export function insertionCue( state = null, action ) {
 	switch ( action.type ) {
 		case 'SHOW_INSERTION_POINT': {
-			const { rootClientId, index, __unstableWithInserter, operation } =
-				action;
+			const {
+				rootClientId,
+				index,
+				__unstableWithInserter,
+				operation,
+				nearestSide,
+			} = action;
 			const nextState = {
 				rootClientId,
 				index,
 				__unstableWithInserter,
 				operation,
+				nearestSide,
 			};
 
 			// Bail out updates if the states are the same.
@@ -1638,17 +1661,30 @@ export function template( state = { isValid: true }, action ) {
  */
 export function settings( state = SETTINGS_DEFAULTS, action ) {
 	switch ( action.type ) {
-		case 'UPDATE_SETTINGS':
-			if ( action.reset ) {
-				return {
-					...SETTINGS_DEFAULTS,
-					...action.settings,
-				};
-			}
-			return {
-				...state,
-				...action.settings,
-			};
+		case 'UPDATE_SETTINGS': {
+			const updatedSettings = action.reset
+				? {
+						...SETTINGS_DEFAULTS,
+						...action.settings,
+				  }
+				: {
+						...state,
+						...action.settings,
+				  };
+
+			Object.defineProperty( updatedSettings, '__unstableIsPreviewMode', {
+				get() {
+					deprecated( '__unstableIsPreviewMode', {
+						since: '6.8',
+						alternative: 'isPreviewMode',
+					} );
+
+					return this.isPreviewMode;
+				},
+			} );
+
+			return updatedSettings;
+		}
 	}
 
 	return state;
@@ -1665,36 +1701,42 @@ export function settings( state = SETTINGS_DEFAULTS, action ) {
 export function preferences( state = PREFERENCES_DEFAULTS, action ) {
 	switch ( action.type ) {
 		case 'INSERT_BLOCKS':
-		case 'REPLACE_BLOCKS':
-			return action.blocks.reduce( ( prevState, block ) => {
-				const { attributes, name: blockName } = block;
-				let id = blockName;
-				// If a block variation match is found change the name to be the same with the
-				// one that is used for block variations in the Inserter (`getItemFromVariation`).
-				const match = select( blocksStore ).getActiveBlockVariation(
-					blockName,
-					attributes
-				);
-				if ( match?.name ) {
-					id += '/' + match.name;
-				}
-				if ( blockName === 'core/block' ) {
-					id += '/' + attributes.ref;
-				}
+		case 'REPLACE_BLOCKS': {
+			const nextInsertUsage = action.blocks.reduce(
+				( prevUsage, block ) => {
+					const { attributes, name: blockName } = block;
+					let id = blockName;
+					// If a block variation match is found change the name to be the same with the
+					// one that is used for block variations in the Inserter (`getItemFromVariation`).
+					const match = select( blocksStore ).getActiveBlockVariation(
+						blockName,
+						attributes
+					);
+					if ( match?.name ) {
+						id += '/' + match.name;
+					}
+					if ( blockName === 'core/block' ) {
+						id += '/' + attributes.ref;
+					}
 
-				return {
-					...prevState,
-					insertUsage: {
-						...prevState.insertUsage,
+					return {
+						...prevUsage,
 						[ id ]: {
 							time: action.time,
-							count: prevState.insertUsage[ id ]
-								? prevState.insertUsage[ id ].count + 1
+							count: prevUsage[ id ]
+								? prevUsage[ id ].count + 1
 								: 1,
 						},
-					},
-				};
-			}, state );
+					};
+				},
+				state.insertUsage
+			);
+
+			return {
+				...state,
+				insertUsage: nextInsertUsage,
+			};
+		}
 	}
 
 	return state;
@@ -1722,70 +1764,42 @@ export const blockListSettings = ( state = {}, action ) => {
 			);
 		}
 		case 'UPDATE_BLOCK_LIST_SETTINGS': {
-			const { clientId } = action;
-			if ( ! action.settings ) {
-				if ( state.hasOwnProperty( clientId ) ) {
-					const { [ clientId ]: removedBlock, ...restBlocks } = state;
-					return restBlocks;
+			const updates =
+				typeof action.clientId === 'string'
+					? { [ action.clientId ]: action.settings }
+					: action.clientId;
+
+			// Remove settings that are the same as the current state.
+			for ( const clientId in updates ) {
+				if ( ! updates[ clientId ] ) {
+					if ( ! state[ clientId ] ) {
+						delete updates[ clientId ];
+					}
+				} else if (
+					fastDeepEqual( state[ clientId ], updates[ clientId ] )
+				) {
+					delete updates[ clientId ];
 				}
+			}
 
+			if ( Object.keys( updates ).length === 0 ) {
 				return state;
 			}
 
-			if ( fastDeepEqual( state[ clientId ], action.settings ) ) {
-				return state;
+			const merged = { ...state, ...updates };
+
+			for ( const clientId in updates ) {
+				if ( ! updates[ clientId ] ) {
+					delete merged[ clientId ];
+				}
 			}
 
-			return {
-				...state,
-				[ clientId ]: action.settings,
-			};
+			return merged;
 		}
 	}
 	return state;
 };
 
-/**
- * Reducer returning which mode is enabled.
- *
- * @param {string} state  Current state.
- * @param {Object} action Dispatched action.
- *
- * @return {string} Updated state.
- */
-export function editorMode( state = 'edit', action ) {
-	// Let inserting block in navigation mode always trigger Edit mode.
-	if ( action.type === 'INSERT_BLOCKS' && state === 'navigation' ) {
-		return 'edit';
-	}
-
-	if ( action.type === 'SET_EDITOR_MODE' ) {
-		return action.mode;
-	}
-
-	return state;
-}
-
-/**
- * Reducer returning whether the block moving mode is enabled or not.
- *
- * @param {string|null} state  Current state.
- * @param {Object}      action Dispatched action.
- *
- * @return {string|null} Updated state.
- */
-export function hasBlockMovingClientId( state = null, action ) {
-	if ( action.type === 'SET_BLOCK_MOVING_MODE' ) {
-		return action.hasBlockMovingClientId;
-	}
-
-	if ( action.type === 'SET_EDITOR_MODE' ) {
-		return null;
-	}
-
-	return state;
-}
-
 /**
  * Reducer return an updated state representing the most recent block attribute
  * update. The state is structured as an object where the keys represent the
@@ -1851,6 +1865,27 @@ export function highlightedBlock( state, action ) {
 	return state;
 }
 
+/**
+ * Reducer returning current expanded block in the list view.
+ *
+ * @param {string|null} state  Current expanded block.
+ * @param {Object}      action Dispatched action.
+ *
+ * @return {string|null} Updated state.
+ */
+export function expandedBlock( state = null, action ) {
+	switch ( action.type ) {
+		case 'SET_BLOCK_EXPANDED_IN_LIST_VIEW':
+			return action.clientId;
+		case 'SELECT_BLOCK':
+			if ( action.clientId !== state ) {
+				return null;
+			}
+	}
+
+	return state;
+}
+
 /**
  * Reducer returning the block insertion event list state.
  *
@@ -1895,6 +1930,21 @@ export function temporarilyEditingAsBlocks( state = '', action ) {
 	return state;
 }
 
+/**
+ * Reducer returning the focus mode that should be used when temporarily edit as blocks finishes.
+ *
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
+ *
+ * @return {Object} Updated state.
+ */
+export function temporarilyEditingFocusModeRevert( state = '', action ) {
+	if ( action.type === 'SET_TEMPORARILY_EDITING_AS_BLOCKS' ) {
+		return action.focusModeToRevert;
+	}
+	return state;
+}
+
 /**
  * Reducer returning a map of block client IDs to block editing modes.
  *
@@ -1991,8 +2041,64 @@ export function lastFocus( state = false, action ) {
 	return state;
 }
 
+/**
+ * Reducer setting currently hovered block.
+ *
+ * @param {boolean} state  Current state.
+ * @param {Object}  action Dispatched action.
+ *
+ * @return {boolean} Updated state.
+ */
+export function hoveredBlockClientId( state = false, action ) {
+	switch ( action.type ) {
+		case 'HOVER_BLOCK':
+			return action.clientId;
+	}
+
+	return state;
+}
+
+/**
+ * Reducer setting zoom out state.
+ *
+ * @param {boolean} state  Current state.
+ * @param {Object}  action Dispatched action.
+ *
+ * @return {number} Updated state.
+ */
+export function zoomLevel( state = 100, action ) {
+	switch ( action.type ) {
+		case 'SET_ZOOM_LEVEL':
+			return action.zoom;
+		case 'RESET_ZOOM_LEVEL':
+			return 100;
+	}
+
+	return state;
+}
+
+/**
+ * Reducer setting the insertion point
+ *
+ * @param {boolean} state  Current state.
+ * @param {Object}  action Dispatched action.
+ *
+ * @return {Object} Updated state.
+ */
+export function insertionPoint( state = null, action ) {
+	switch ( action.type ) {
+		case 'SET_INSERTION_POINT':
+			return action.value;
+		case 'SELECT_BLOCK':
+			return null;
+	}
+
+	return state;
+}
+
 const combinedReducers = combineReducers( {
 	blocks,
+	isDragging,
 	isTyping,
 	isBlockInterfaceHidden,
 	draggedBlocks,
@@ -2003,16 +2109,17 @@ const combinedReducers = combineReducers( {
 	blocksMode,
 	blockListSettings,
 	insertionPoint,
+	insertionCue,
 	template,
 	settings,
 	preferences,
 	lastBlockAttributesChange,
 	lastFocus,
-	editorMode,
-	hasBlockMovingClientId,
+	expandedBlock,
 	highlightedBlock,
 	lastBlockInserted,
 	temporarilyEditingAsBlocks,
+	temporarilyEditingFocusModeRevert,
 	blockVisibility,
 	blockEditingModes,
 	styleOverrides,
@@ -2020,6 +2127,8 @@ const combinedReducers = combineReducers( {
 	blockRemovalRules,
 	openedBlockSettingsMenu,
 	registeredInserterMediaCategories,
+	hoveredBlockClientId,
+	zoomLevel,
 } );
 
 function withAutomaticChangeReset( reducer ) {
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index c0441cd3b3755e..b5afb2891ef1cf 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import createSelector from 'rememo';
-
 /**
  * WordPress dependencies
  */
@@ -12,7 +7,6 @@ import {
 	getBlockVariations,
 	hasBlockSupport,
 	getPossibleBlockTransformations,
-	parse,
 	switchToBlockType,
 	store as blocksStore,
 } from '@wordpress/blocks';
@@ -21,13 +15,34 @@ import { applyFilters } from '@wordpress/hooks';
 import { symbol } from '@wordpress/icons';
 import { create, remove, toHTMLString } from '@wordpress/rich-text';
 import deprecated from '@wordpress/deprecated';
-import { createRegistrySelector } from '@wordpress/data';
+import { createSelector, createRegistrySelector } from '@wordpress/data';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
  */
+import {
+	isFiltered,
+	checkAllowListRecursive,
+	checkAllowList,
+	getAllPatternsDependants,
+	getInsertBlockTypeDependants,
+	getParsedPattern,
+	getGrammar,
+} from './utils';
 import { orderBy } from '../utils/sorting';
-import { PATTERN_TYPES } from '../components/inserter/block-patterns-tab/utils';
+import { STORE_NAME } from './constants';
+import { unlock } from '../lock-unlock';
+
+import {
+	getContentLockingParent,
+	getTemporarilyEditingAsBlocks,
+	getTemporarilyEditingFocusModeToRevert,
+	getSectionRootClientId,
+	isSectionBlock,
+	getParentSectionBlock,
+	isZoomOut,
+} from './private-selectors';
 
 /**
  * A block selection object.
@@ -67,6 +82,10 @@ const EMPTY_ARRAY = [];
  */
 const EMPTY_SET = new Set();
 
+const DEFAULT_INSERTER_OPTIONS = {
+	[ isFiltered ]: true,
+};
+
 /**
  * Returns a block's name given its client ID, or null if no block exists with
  * the client ID.
@@ -151,12 +170,13 @@ export function getBlock( state, clientId ) {
 
 export const __unstableGetBlockWithoutInnerBlocks = createSelector(
 	( state, clientId ) => {
-		if ( ! state.blocks.byClientId.has( clientId ) ) {
+		const block = state.blocks.byClientId.get( clientId );
+		if ( ! block ) {
 			return null;
 		}
 
 		return {
-			...state.blocks.byClientId.get( clientId ),
+			...block,
 			attributes: getBlockAttributes( state, clientId ),
 		};
 	},
@@ -245,24 +265,37 @@ export const __unstableGetClientIdsTree = createSelector(
  * given. Returned ids are ordered first by the order of the ids given, then
  * by the order that they appear in the editor.
  *
- * @param {Object}          state     Global application state.
- * @param {string|string[]} clientIds Client ID(s) for which descendant blocks are to be returned.
+ * @param {Object}          state   Global application state.
+ * @param {string|string[]} rootIds Client ID(s) for which descendant blocks are to be returned.
  *
  * @return {Array} Client IDs of descendants.
  */
 export const getClientIdsOfDescendants = createSelector(
-	( state, clientIds ) => {
-		const givenIds = Array.isArray( clientIds ) ? clientIds : [ clientIds ];
-		const collectedIds = [];
-		for ( const givenId of givenIds ) {
-			for ( const descendantId of getBlockOrder( state, givenId ) ) {
-				collectedIds.push(
-					descendantId,
-					...getClientIdsOfDescendants( state, descendantId )
-				);
+	( state, rootIds ) => {
+		rootIds = Array.isArray( rootIds ) ? [ ...rootIds ] : [ rootIds ];
+		const ids = [];
+
+		// Add the descendants of the root blocks first.
+		for ( const rootId of rootIds ) {
+			const order = state.blocks.order.get( rootId );
+			if ( order ) {
+				ids.push( ...order );
 			}
 		}
-		return collectedIds;
+
+		let index = 0;
+
+		// Add the descendants of the descendants, recursively.
+		while ( index < ids.length ) {
+			const id = ids[ index ];
+			const order = state.blocks.order.get( id );
+			if ( order ) {
+				ids.splice( index + 1, 0, ...order );
+			}
+			index++;
+		}
+
+		return ids;
 	},
 	( state ) => [ state.blocks.order ]
 );
@@ -276,19 +309,8 @@ export const getClientIdsOfDescendants = createSelector(
  *
  * @return {Array} ids of top-level and descendant blocks.
  */
-export const getClientIdsWithDescendants = createSelector(
-	( state ) => {
-		const collectedIds = [];
-		for ( const topLevelId of getBlockOrder( state ) ) {
-			collectedIds.push(
-				topLevelId,
-				...getClientIdsOfDescendants( state, topLevelId )
-			);
-		}
-		return collectedIds;
-	},
-	( state ) => [ state.blocks.order ]
-);
+export const getClientIdsWithDescendants = ( state ) =>
+	getClientIdsOfDescendants( state, '' );
 
 /**
  * Returns the total number of blocks, or the total number of blocks with a specific name in a post.
@@ -305,23 +327,27 @@ export const getGlobalBlockCount = createSelector(
 		if ( ! blockName ) {
 			return clientIds.length;
 		}
-		return clientIds.reduce( ( accumulator, clientId ) => {
+		let count = 0;
+		for ( const clientId of clientIds ) {
 			const block = state.blocks.byClientId.get( clientId );
-			return block.name === blockName ? accumulator + 1 : accumulator;
-		}, 0 );
+			if ( block.name === blockName ) {
+				count++;
+			}
+		}
+		return count;
 	},
 	( state ) => [ state.blocks.order, state.blocks.byClientId ]
 );
 
 /**
- * Returns all global blocks that match a blockName. Results include nested blocks.
+ * Returns all blocks that match a blockName. Results include nested blocks.
  *
- * @param {Object}  state     Global application state.
- * @param {?string} blockName Optional block name, if not specified, returns an empty array.
+ * @param {Object}   state     Global application state.
+ * @param {string[]} blockName Block name(s) for which clientIds are to be returned.
  *
  * @return {Array} Array of clientIds of blocks with name equal to blockName.
  */
-export const __experimentalGetGlobalBlocksByName = createSelector(
+export const getBlocksByName = createSelector(
 	( state, blockName ) => {
 		if ( ! blockName ) {
 			return EMPTY_ARRAY;
@@ -339,6 +365,27 @@ export const __experimentalGetGlobalBlocksByName = createSelector(
 	( state ) => [ state.blocks.order, state.blocks.byClientId ]
 );
 
+/**
+ * Returns all global blocks that match a blockName. Results include nested blocks.
+ *
+ * @deprecated
+ *
+ * @param {Object}   state     Global application state.
+ * @param {string[]} blockName Block name(s) for which clientIds are to be returned.
+ *
+ * @return {Array} Array of clientIds of blocks with name equal to blockName.
+ */
+export function __experimentalGetGlobalBlocksByName( state, blockName ) {
+	deprecated(
+		"wp.data.select( 'core/block-editor' ).__experimentalGetGlobalBlocksByName",
+		{
+			since: '6.5',
+			alternative: `wp.data.select( 'core/block-editor' ).getBlocksByName`,
+		}
+	);
+	return getBlocksByName( state, blockName );
+}
+
 /**
  * Given an array of block client IDs, returns the corresponding array of block
  * objects.
@@ -495,6 +542,39 @@ export function getSelectedBlockClientId( state ) {
  *
  * @param {Object} state Global application state.
  *
+ * @example
+ *
+ *```js
+ * import { select } from '@wordpress/data'
+ * import { store as blockEditorStore } from '@wordpress/block-editor'
+ *
+ * // Set initial active block client ID
+ * let activeBlockClientId = null
+ *
+ * const getActiveBlockData = () => {
+ * 	const activeBlock = select(blockEditorStore).getSelectedBlock()
+ *
+ * 	if (activeBlock && activeBlock.clientId !== activeBlockClientId) {
+ * 		activeBlockClientId = activeBlock.clientId
+ *
+ * 		// Get active block name and attributes
+ * 		const activeBlockName = activeBlock.name
+ * 		const activeBlockAttributes = activeBlock.attributes
+ *
+ * 		// Log active block name and attributes
+ * 		console.log(activeBlockName, activeBlockAttributes)
+ * 		}
+ * 	}
+ *
+ * 	// Subscribe to changes in the editor
+ * 	// wp.data.subscribe(() => {
+ * 		// getActiveBlockData()
+ * 	// })
+ *
+ * 	// Update active block data on click
+ * 	// onclick="getActiveBlockData()"
+ *```
+ *
  * @return {?Object} Selected block.
  */
 export function getSelectedBlock( state ) {
@@ -513,9 +593,7 @@ export function getSelectedBlock( state ) {
  * @return {?string} Root client ID, if exists
  */
 export function getBlockRootClientId( state, clientId ) {
-	return state.blocks.parents.has( clientId )
-		? state.blocks.parents.get( clientId )
-		: null;
+	return state.blocks.parents.get( clientId ) ?? null;
 }
 
 /**
@@ -531,8 +609,7 @@ export const getBlockParents = createSelector(
 	( state, clientId, ascending = false ) => {
 		const parents = [];
 		let current = clientId;
-		while ( !! state.blocks.parents.get( current ) ) {
-			current = state.blocks.parents.get( current );
+		while ( ( current = state.blocks.parents.get( current ) ) ) {
 			parents.push( current );
 		}
 
@@ -997,7 +1074,9 @@ export function __unstableIsSelectionMergeable( state, isForward ) {
 	const selectionFocus = getSelectionEnd( state );
 
 	// It's not mergeable if the start and end are within the same block.
-	if ( selectionAnchor.clientId === selectionFocus.clientId ) return false;
+	if ( selectionAnchor.clientId === selectionFocus.clientId ) {
+		return false;
+	}
 
 	// It's not mergeable if there's no rich text selection.
 	if (
@@ -1005,8 +1084,9 @@ export function __unstableIsSelectionMergeable( state, isForward ) {
 		! selectionFocus.attributeKey ||
 		typeof selectionAnchor.offset === 'undefined' ||
 		typeof selectionFocus.offset === 'undefined'
-	)
+	) {
 		return false;
+	}
 
 	const anchorRootClientId = getBlockRootClientId(
 		state,
@@ -1048,12 +1128,16 @@ export function __unstableIsSelectionMergeable( state, isForward ) {
 	const targetBlockName = getBlockName( state, targetBlockClientId );
 	const targetBlockType = getBlockType( targetBlockName );
 
-	if ( ! targetBlockType.merge ) return false;
+	if ( ! targetBlockType.merge ) {
+		return false;
+	}
 
 	const blockToMerge = getBlock( state, blockToMergeClientId );
 
 	// It's mergeable if the blocks are of the same type.
-	if ( blockToMerge.name === targetBlockName ) return true;
+	if ( blockToMerge.name === targetBlockName ) {
+		return true;
+	}
 
 	// If the blocks are of a different type, try to transform the block being
 	// merged into the same type of block.
@@ -1204,11 +1288,22 @@ export function isBlockSelected( state, clientId ) {
  * @return {boolean} Whether the block has an inner block selected
  */
 export function hasSelectedInnerBlock( state, clientId, deep = false ) {
-	return getBlockOrder( state, clientId ).some(
-		( innerClientId ) =>
-			isBlockSelected( state, innerClientId ) ||
-			isBlockMultiSelected( state, innerClientId ) ||
-			( deep && hasSelectedInnerBlock( state, innerClientId, deep ) )
+	const selectedBlockClientIds = getSelectedBlockClientIds( state );
+
+	if ( ! selectedBlockClientIds.length ) {
+		return false;
+	}
+
+	if ( deep ) {
+		return selectedBlockClientIds.some( ( id ) =>
+			// Pass true because we don't care about order and it's more
+			// performant.
+			getBlockParents( state, id, true ).includes( clientId )
+		);
+	}
+
+	return selectedBlockClientIds.some(
+		( id ) => getBlockRootClientId( state, id ) === clientId
 	);
 }
 
@@ -1394,8 +1489,7 @@ export function isCaretWithinFormattedText() {
 }
 
 /**
- * Returns the insertion point, the index at which the new inserted block would
- * be placed. Defaults to the last index.
+ * Returns the location of the insertion cue. Defaults to the last index.
  *
  * @param {Object} state Editor state.
  *
@@ -1406,11 +1500,11 @@ export const getBlockInsertionPoint = createSelector(
 		let rootClientId, index;
 
 		const {
-			insertionPoint,
+			insertionCue,
 			selection: { selectionEnd },
 		} = state;
-		if ( insertionPoint !== null ) {
-			return insertionPoint;
+		if ( insertionCue !== null ) {
+			return insertionCue;
 		}
 
 		const { clientId } = selectionEnd;
@@ -1425,7 +1519,7 @@ export const getBlockInsertionPoint = createSelector(
 		return { rootClientId, index };
 	},
 	( state ) => [
-		state.insertionPoint,
+		state.insertionCue,
 		state.selection.selectionEnd.clientId,
 		state.blocks.parents,
 		state.blocks.order,
@@ -1433,14 +1527,14 @@ export const getBlockInsertionPoint = createSelector(
 );
 
 /**
- * Returns true if we should show the block insertion point.
+ * Returns true if the block insertion point is visible.
  *
  * @param {Object} state Global application state.
  *
  * @return {?boolean} Whether the insertion point is visible or not.
  */
 export function isBlockInsertionPointVisible( state ) {
-	return state.insertionPoint !== null;
+	return state.insertionCue !== null;
 }
 
 /**
@@ -1481,20 +1575,76 @@ export function getTemplateLock( state, rootClientId ) {
 	return getBlockListSettings( state, rootClientId )?.templateLock ?? false;
 }
 
-const checkAllowList = ( list, item, defaultResult = null ) => {
-	if ( typeof list === 'boolean' ) {
-		return list;
+/**
+ * Determines if the given block type is visible in the inserter.
+ * Note that this is different than whether a block is allowed to be inserted.
+ * In some cases, the block is not allowed in a given position but
+ * it should still be visible in the inserter to be able to add it
+ * to a different position.
+ *
+ * @param {Object}        state           Editor state.
+ * @param {string|Object} blockNameOrType The block type object, e.g., the response
+ *                                        from the block directory; or a string name of
+ *                                        an installed block type, e.g.' core/paragraph'.
+ * @param {Set}           checkedBlocks   Set of block names that have already been checked.
+ *
+ * @return {boolean} Whether the given block type is allowed to be inserted.
+ */
+const isBlockVisibleInTheInserter = (
+	state,
+	blockNameOrType,
+	checkedBlocks = new Set()
+) => {
+	let blockType;
+	let blockName;
+
+	if ( blockNameOrType && 'object' === typeof blockNameOrType ) {
+		blockType = blockNameOrType;
+		blockName = blockNameOrType.name;
+	} else {
+		blockType = getBlockType( blockNameOrType );
+		blockName = blockNameOrType;
 	}
-	if ( Array.isArray( list ) ) {
-		// TODO: when there is a canonical way to detect that we are editing a post
-		// the following check should be changed to something like:
-		// if ( list.includes( 'core/post-content' ) && getEditorMode() === 'post-content' && item === null )
-		if ( list.includes( 'core/post-content' ) && item === null ) {
-			return true;
-		}
-		return list.includes( item );
+
+	if ( ! blockType ) {
+		return false;
 	}
-	return defaultResult;
+
+	const { allowedBlockTypes } = getSettings( state );
+
+	const isBlockAllowedInEditor = checkAllowList(
+		allowedBlockTypes,
+		blockName,
+		true
+	);
+	if ( ! isBlockAllowedInEditor ) {
+		return false;
+	}
+
+	if ( checkedBlocks.has( blockName ) ) {
+		return false;
+	}
+
+	checkedBlocks.add( blockName );
+
+	// If parent blocks are not visible, child blocks should be hidden too.
+	if ( Array.isArray( blockType.parent ) ) {
+		return blockType.parent.some(
+			( name ) =>
+				( blockName !== name &&
+					isBlockVisibleInTheInserter(
+						state,
+						name,
+						checkedBlocks
+					) ) ||
+				// Exception for blocks with post-content parent,
+				// the root level is often consider as "core/post-content".
+				// This exception should only apply to the post editor ideally though.
+				name === 'core/post-content'
+		);
+	}
+
+	return true;
 };
 
 /**
@@ -1515,6 +1665,10 @@ const canInsertBlockTypeUnmemoized = (
 	blockName,
 	rootClientId = null
 ) => {
+	if ( ! isBlockVisibleInTheInserter( state, blockName ) ) {
+		return false;
+	}
+
 	let blockType;
 	if ( blockName && 'object' === typeof blockName ) {
 		blockType = blockName;
@@ -1522,23 +1676,14 @@ const canInsertBlockTypeUnmemoized = (
 	} else {
 		blockType = getBlockType( blockName );
 	}
-	if ( ! blockType ) {
-		return false;
-	}
-
-	const { allowedBlockTypes } = getSettings( state );
 
-	const isBlockAllowedInEditor = checkAllowList(
-		allowedBlockTypes,
-		blockName,
-		true
-	);
-	if ( ! isBlockAllowedInEditor ) {
+	const isLocked = !! getTemplateLock( state, rootClientId );
+	if ( isLocked ) {
 		return false;
 	}
 
-	const isLocked = !! getTemplateLock( state, rootClientId );
-	if ( isLocked ) {
+	const _isSectionBlock = !! isSectionBlock( state, rootClientId );
+	if ( _isSectionBlock ) {
 		return false;
 	}
 
@@ -1554,14 +1699,30 @@ const canInsertBlockTypeUnmemoized = (
 		return false;
 	}
 
-	const parentAllowedBlocks = parentBlockListSettings?.allowedBlocks;
-	const hasParentAllowedBlock = checkAllowList(
-		parentAllowedBlocks,
+	const parentName = getBlockName( state, rootClientId );
+	const parentBlockType = getBlockType( parentName );
+
+	// Look at the `blockType.allowedBlocks` field to determine whether this is an allowed child block.
+	const parentAllowedChildBlocks = parentBlockType?.allowedBlocks;
+	let hasParentAllowedBlock = checkAllowList(
+		parentAllowedChildBlocks,
 		blockName
 	);
 
+	// The `allowedBlocks` block list setting can further limit which blocks are allowed children.
+	if ( hasParentAllowedBlock !== false ) {
+		const parentAllowedBlocks = parentBlockListSettings?.allowedBlocks;
+		const hasParentListAllowedBlock = checkAllowList(
+			parentAllowedBlocks,
+			blockName
+		);
+		// Never downgrade the result from `true` to `null`
+		if ( hasParentListAllowedBlock !== null ) {
+			hasParentAllowedBlock = hasParentListAllowedBlock;
+		}
+	}
+
 	const blockAllowedParentBlocks = blockType.parent;
-	const parentName = getBlockName( state, rootClientId );
 	const hasBlockAllowedParent = checkAllowList(
 		blockAllowedParentBlocks,
 		parentName
@@ -1635,13 +1796,8 @@ const canInsertBlockTypeUnmemoized = (
  */
 export const canInsertBlockType = createSelector(
 	canInsertBlockTypeUnmemoized,
-	( state, blockName, rootClientId ) => [
-		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId.get( rootClientId ),
-		state.settings.allowedBlockTypes,
-		state.settings.templateLock,
-		state.blockEditingModes,
-	]
+	( state, blockName, rootClientId ) =>
+		getInsertBlockTypeDependants( state, rootClientId )
 );
 
 /**
@@ -1663,13 +1819,12 @@ export function canInsertBlocks( state, clientIds, rootClientId = null ) {
 /**
  * Determines if the given block is allowed to be deleted.
  *
- * @param {Object}  state        Editor state.
- * @param {string}  clientId     The block client Id.
- * @param {?string} rootClientId Optional root client ID of block list.
+ * @param {Object} state    Editor state.
+ * @param {string} clientId The block client Id.
  *
  * @return {boolean} Whether the given block is allowed to be removed.
  */
-export function canRemoveBlock( state, clientId, rootClientId = null ) {
+export function canRemoveBlock( state, clientId ) {
 	const attributes = getBlockAttributes( state, clientId );
 	if ( attributes === null ) {
 		return true;
@@ -1677,38 +1832,41 @@ export function canRemoveBlock( state, clientId, rootClientId = null ) {
 	if ( attributes.lock?.remove !== undefined ) {
 		return ! attributes.lock.remove;
 	}
+
+	const rootClientId = getBlockRootClientId( state, clientId );
 	if ( getTemplateLock( state, rootClientId ) ) {
 		return false;
 	}
 
+	const isBlockWithinSection = !! getParentSectionBlock( state, clientId );
+	if ( isBlockWithinSection ) {
+		return false;
+	}
+
 	return getBlockEditingMode( state, rootClientId ) !== 'disabled';
 }
 
 /**
  * Determines if the given blocks are allowed to be removed.
  *
- * @param {Object}  state        Editor state.
- * @param {string}  clientIds    The block client IDs to be removed.
- * @param {?string} rootClientId Optional root client ID of block list.
+ * @param {Object} state     Editor state.
+ * @param {string} clientIds The block client IDs to be removed.
  *
  * @return {boolean} Whether the given blocks are allowed to be removed.
  */
-export function canRemoveBlocks( state, clientIds, rootClientId = null ) {
-	return clientIds.every( ( clientId ) =>
-		canRemoveBlock( state, clientId, rootClientId )
-	);
+export function canRemoveBlocks( state, clientIds ) {
+	return clientIds.every( ( clientId ) => canRemoveBlock( state, clientId ) );
 }
 
 /**
  * Determines if the given block is allowed to be moved.
  *
- * @param {Object}  state        Editor state.
- * @param {string}  clientId     The block client Id.
- * @param {?string} rootClientId Optional root client ID of block list.
+ * @param {Object} state    Editor state.
+ * @param {string} clientId The block client Id.
  *
- * @return {boolean | undefined} Whether the given block is allowed to be moved.
+ * @return {boolean} Whether the given block is allowed to be moved.
  */
-export function canMoveBlock( state, clientId, rootClientId = null ) {
+export function canMoveBlock( state, clientId ) {
 	const attributes = getBlockAttributes( state, clientId );
 	if ( attributes === null ) {
 		return true;
@@ -1716,26 +1874,24 @@ export function canMoveBlock( state, clientId, rootClientId = null ) {
 	if ( attributes.lock?.move !== undefined ) {
 		return ! attributes.lock.move;
 	}
+
+	const rootClientId = getBlockRootClientId( state, clientId );
 	if ( getTemplateLock( state, rootClientId ) === 'all' ) {
 		return false;
 	}
-
 	return getBlockEditingMode( state, rootClientId ) !== 'disabled';
 }
 
 /**
  * Determines if the given blocks are allowed to be moved.
  *
- * @param {Object}  state        Editor state.
- * @param {string}  clientIds    The block client IDs to be moved.
- * @param {?string} rootClientId Optional root client ID of block list.
+ * @param {Object} state     Editor state.
+ * @param {string} clientIds The block client IDs to be moved.
  *
  * @return {boolean} Whether the given blocks are allowed to be moved.
  */
-export function canMoveBlocks( state, clientIds, rootClientId = null ) {
-	return clientIds.every( ( clientId ) =>
-		canMoveBlock( state, clientId, rootClientId )
-	);
+export function canMoveBlocks( state, clientIds ) {
+	return clientIds.every( ( clientId ) => canMoveBlock( state, clientId ) );
 }
 
 /**
@@ -1899,7 +2055,9 @@ const buildBlockTypeItem =
 			isDisabled,
 			frecency: calculateFrecency( time, count ),
 		};
-		if ( buildScope === 'transform' ) return blockItemBase;
+		if ( buildScope === 'transform' ) {
+			return blockItemBase;
+		}
 
 		const inserterVariations = getBlockVariations(
 			blockType.name,
@@ -1911,6 +2069,7 @@ const buildBlockTypeItem =
 			description: blockType.description,
 			category: blockType.category,
 			keywords: blockType.keywords,
+			parent: blockType.parent,
 			variations: inserterVariations,
 			example: blockType.example,
 			utility: 1, // Deprecated.
@@ -1946,95 +2105,128 @@ const buildBlockTypeItem =
  *                                        this item.
  * @property {number}   frecency          Heuristic that combines frequency and recency.
  */
-export const getInserterItems = createSelector(
-	( state, rootClientId = null ) => {
-		const buildReusableBlockInserterItem = ( reusableBlock ) => {
-			const icon = ! reusableBlock.wp_pattern_sync_status
-				? {
-						src: symbol,
-						foreground: 'var(--wp-block-synced-color)',
-				  }
-				: symbol;
-			const id = `core/block/${ reusableBlock.id }`;
-			const { time, count = 0 } = getInsertUsage( state, id ) || {};
-			const frecency = calculateFrecency( time, count );
-
-			return {
-				id,
-				name: 'core/block',
-				initialAttributes: { ref: reusableBlock.id },
-				title: reusableBlock.title?.raw,
-				icon,
-				category: 'reusable',
-				keywords: [ 'reusable' ],
-				isDisabled: false,
-				utility: 1, // Deprecated.
-				frecency,
-				content: reusableBlock.content?.raw,
-				syncStatus: reusableBlock.wp_pattern_sync_status,
+export const getInserterItems = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state, rootClientId = null, options = DEFAULT_INSERTER_OPTIONS ) => {
+			const buildReusableBlockInserterItem = ( reusableBlock ) => {
+				const icon = ! reusableBlock.wp_pattern_sync_status
+					? {
+							src: symbol,
+							foreground: 'var(--wp-block-synced-color)',
+					  }
+					: symbol;
+				const id = `core/block/${ reusableBlock.id }`;
+				const { time, count = 0 } = getInsertUsage( state, id ) || {};
+				const frecency = calculateFrecency( time, count );
+
+				return {
+					id,
+					name: 'core/block',
+					initialAttributes: { ref: reusableBlock.id },
+					title: reusableBlock.title?.raw,
+					icon,
+					category: 'reusable',
+					keywords: [ 'reusable' ],
+					isDisabled: false,
+					utility: 1, // Deprecated.
+					frecency,
+					content: reusableBlock.content?.raw,
+					syncStatus: reusableBlock.wp_pattern_sync_status,
+				};
 			};
-		};
-
-		const syncedPatternInserterItems = canInsertBlockTypeUnmemoized(
-			state,
-			'core/block',
-			rootClientId
-		)
-			? getReusableBlocks( state ).map( buildReusableBlockInserterItem )
-			: [];
-
-		const buildBlockTypeInserterItem = buildBlockTypeItem( state, {
-			buildScope: 'inserter',
-		} );
 
-		const blockTypeInserterItems = getBlockTypes()
-			.filter( ( blockType ) =>
-				canIncludeBlockTypeInInserter( state, blockType, rootClientId )
+			const syncedPatternInserterItems = canInsertBlockTypeUnmemoized(
+				state,
+				'core/block',
+				rootClientId
 			)
-			.map( buildBlockTypeInserterItem );
-
-		const items = blockTypeInserterItems.reduce( ( accumulator, item ) => {
-			const { variations = [] } = item;
-			// Exclude any block type item that is to be replaced by a default variation.
-			if ( ! variations.some( ( { isDefault } ) => isDefault ) ) {
-				accumulator.push( item );
-			}
-			if ( variations.length ) {
-				const variationMapper = getItemFromVariation( state, item );
-				accumulator.push( ...variations.map( variationMapper ) );
+				? unlock( select( STORE_NAME ) )
+						.getReusableBlocks()
+						.map( buildReusableBlockInserterItem )
+				: [];
+
+			const buildBlockTypeInserterItem = buildBlockTypeItem( state, {
+				buildScope: 'inserter',
+			} );
+
+			let blockTypeInserterItems = getBlockTypes()
+				.filter( ( blockType ) =>
+					hasBlockSupport( blockType, 'inserter', true )
+				)
+				.map( buildBlockTypeInserterItem );
+
+			if ( options[ isFiltered ] !== false ) {
+				blockTypeInserterItems = blockTypeInserterItems.filter(
+					( blockType ) =>
+						canIncludeBlockTypeInInserter(
+							state,
+							blockType,
+							rootClientId
+						)
+				);
+			} else {
+				blockTypeInserterItems = blockTypeInserterItems
+					.filter( ( blockType ) =>
+						isBlockVisibleInTheInserter( state, blockType )
+					)
+					.map( ( blockType ) => ( {
+						...blockType,
+						isAllowedInCurrentRoot: canIncludeBlockTypeInInserter(
+							state,
+							blockType,
+							rootClientId
+						),
+					} ) );
 			}
-			return accumulator;
-		}, [] );
 
-		// Ensure core blocks are prioritized in the returned results,
-		// because third party blocks can be registered earlier than
-		// the core blocks (usually by using the `init` action),
-		// thus affecting the display order.
-		// We don't sort reusable blocks as they are handled differently.
-		const groupByType = ( blocks, block ) => {
-			const { core, noncore } = blocks;
-			const type = block.name.startsWith( 'core/' ) ? core : noncore;
-
-			type.push( block );
-			return blocks;
-		};
-		const { core: coreItems, noncore: nonCoreItems } = items.reduce(
-			groupByType,
-			{ core: [], noncore: [] }
-		);
-		const sortedBlockTypes = [ ...coreItems, ...nonCoreItems ];
-		return [ ...sortedBlockTypes, ...syncedPatternInserterItems ];
-	},
-	( state, rootClientId ) => [
-		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
-		state.blocks.order,
-		state.preferences.insertUsage,
-		state.settings.allowedBlockTypes,
-		state.settings.templateLock,
-		getReusableBlocks( state ),
-		getBlockTypes(),
-	]
+			const items = blockTypeInserterItems.reduce(
+				( accumulator, item ) => {
+					const { variations = [] } = item;
+					// Exclude any block type item that is to be replaced by a default variation.
+					if ( ! variations.some( ( { isDefault } ) => isDefault ) ) {
+						accumulator.push( item );
+					}
+					if ( variations.length ) {
+						const variationMapper = getItemFromVariation(
+							state,
+							item
+						);
+						accumulator.push(
+							...variations.map( variationMapper )
+						);
+					}
+					return accumulator;
+				},
+				[]
+			);
+
+			// Ensure core blocks are prioritized in the returned results,
+			// because third party blocks can be registered earlier than
+			// the core blocks (usually by using the `init` action),
+			// thus affecting the display order.
+			// We don't sort reusable blocks as they are handled differently.
+			const groupByType = ( blocks, block ) => {
+				const { core, noncore } = blocks;
+				const type = block.name.startsWith( 'core/' ) ? core : noncore;
+
+				type.push( block );
+				return blocks;
+			};
+			const { core: coreItems, noncore: nonCoreItems } = items.reduce(
+				groupByType,
+				{ core: [], noncore: [] }
+			);
+			const sortedBlockTypes = [ ...coreItems, ...nonCoreItems ];
+			return [ ...sortedBlockTypes, ...syncedPatternInserterItems ];
+		},
+		( state, rootClientId ) => [
+			getBlockTypes(),
+			unlock( select( STORE_NAME ) ).getReusableBlocks(),
+			state.blocks.order,
+			state.preferences.insertUsage,
+			...getInsertBlockTypeDependants( state, rootClientId ),
+		]
+	)
 );
 
 /**
@@ -2097,12 +2289,9 @@ export const getBlockTransformItems = createSelector(
 		);
 	},
 	( state, blocks, rootClientId ) => [
-		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
-		state.preferences.insertUsage,
-		state.settings.allowedBlockTypes,
-		state.settings.templateLock,
 		getBlockTypes(),
+		state.preferences.insertUsage,
+		...getInsertBlockTypeDependants( state, rootClientId ),
 	]
 );
 
@@ -2114,28 +2303,25 @@ export const getBlockTransformItems = createSelector(
  *
  * @return {boolean} Items that appear in inserter.
  */
-export const hasInserterItems = createSelector(
-	( state, rootClientId = null ) => {
-		const hasBlockType = getBlockTypes().some( ( blockType ) =>
-			canIncludeBlockTypeInInserter( state, blockType, rootClientId )
-		);
-		if ( hasBlockType ) {
-			return true;
+export const hasInserterItems = createRegistrySelector(
+	( select ) =>
+		( state, rootClientId = null ) => {
+			const hasBlockType = getBlockTypes().some( ( blockType ) =>
+				canIncludeBlockTypeInInserter( state, blockType, rootClientId )
+			);
+			if ( hasBlockType ) {
+				return true;
+			}
+			const hasReusableBlock =
+				canInsertBlockTypeUnmemoized(
+					state,
+					'core/block',
+					rootClientId
+				) &&
+				unlock( select( STORE_NAME ) ).getReusableBlocks().length > 0;
+
+			return hasReusableBlock;
 		}
-		const hasReusableBlock =
-			canInsertBlockTypeUnmemoized( state, 'core/block', rootClientId ) &&
-			getReusableBlocks( state ).length > 0;
-
-		return hasReusableBlock;
-	},
-	( state, rootClientId ) => [
-		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
-		state.settings.allowedBlockTypes,
-		state.settings.templateLock,
-		getReusableBlocks( state ),
-		getBlockTypes(),
-	]
 );
 
 /**
@@ -2146,32 +2332,37 @@ export const hasInserterItems = createSelector(
  *
  * @return {Array?} The list of allowed block types.
  */
-export const getAllowedBlocks = createSelector(
-	( state, rootClientId = null ) => {
-		if ( ! rootClientId ) {
-			return;
-		}
+export const getAllowedBlocks = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state, rootClientId = null ) => {
+			if ( ! rootClientId ) {
+				return;
+			}
 
-		const blockTypes = getBlockTypes().filter( ( blockType ) =>
-			canIncludeBlockTypeInInserter( state, blockType, rootClientId )
-		);
-		const hasReusableBlock =
-			canInsertBlockTypeUnmemoized( state, 'core/block', rootClientId ) &&
-			getReusableBlocks( state ).length > 0;
+			const blockTypes = getBlockTypes().filter( ( blockType ) =>
+				canIncludeBlockTypeInInserter( state, blockType, rootClientId )
+			);
 
-		return [
-			...blockTypes,
-			...( hasReusableBlock ? [ 'core/block' ] : [] ),
-		];
-	},
-	( state, rootClientId ) => [
-		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
-		state.settings.allowedBlockTypes,
-		state.settings.templateLock,
-		getReusableBlocks( state ),
-		getBlockTypes(),
-	]
+			const hasReusableBlock =
+				canInsertBlockTypeUnmemoized(
+					state,
+					'core/block',
+					rootClientId
+				) &&
+				unlock( select( STORE_NAME ) ).getReusableBlocks().length > 0;
+
+			if ( hasReusableBlock ) {
+				blockTypes.push( 'core/block' );
+			}
+
+			return blockTypes;
+		},
+		( state, rootClientId ) => [
+			getBlockTypes(),
+			unlock( select( STORE_NAME ) ).getReusableBlocks(),
+			...getInsertBlockTypeDependants( state, rootClientId ),
+		]
+	)
 );
 
 export const __experimentalGetAllowedBlocks = createSelector(
@@ -2187,9 +2378,8 @@ export const __experimentalGetAllowedBlocks = createSelector(
 		);
 		return getAllowedBlocks( state, rootClientId );
 	},
-	( state, rootClientId ) => [
-		...getAllowedBlocks.getDependants( state, rootClientId ),
-	]
+	( state, rootClientId ) =>
+		getAllowedBlocks.getDependants( state, rootClientId )
 );
 
 /**
@@ -2198,165 +2388,70 @@ export const __experimentalGetAllowedBlocks = createSelector(
  * @param    {Object}         state            Editor state.
  * @param    {?string}        rootClientId     Optional root client ID of block list.
  *
- * @return {?WPDirectInsertBlock}              The block type to be directly inserted.
+ * @return {WPDirectInsertBlock|undefined}              The block type to be directly inserted.
  *
  * @typedef {Object} WPDirectInsertBlock
  * @property {string}         name             The type of block.
  * @property {?Object}        attributes       Attributes to pass to the newly created block.
  * @property {?Array<string>} attributesToCopy Attributes to be copied from adjecent blocks when inserted.
  */
-export const getDirectInsertBlock = createSelector(
-	( state, rootClientId = null ) => {
-		if ( ! rootClientId ) {
-			return;
-		}
-		const defaultBlock =
-			state.blockListSettings[ rootClientId ]?.defaultBlock;
-		const directInsert =
-			state.blockListSettings[ rootClientId ]?.directInsert;
-		if ( ! defaultBlock || ! directInsert ) {
-			return;
-		}
-		if ( typeof directInsert === 'function' ) {
-			return directInsert( getBlock( state, rootClientId ) )
-				? defaultBlock
-				: null;
-		}
-		return defaultBlock;
-	},
-	( state, rootClientId ) => [
-		state.blockListSettings[ rootClientId ],
-		state.blocks.tree.get( rootClientId ),
-	]
-);
-
-export const __experimentalGetDirectInsertBlock = createSelector(
-	( state, rootClientId = null ) => {
-		deprecated(
-			'wp.data.select( "core/block-editor" ).__experimentalGetDirectInsertBlock',
-			{
-				alternative:
-					'wp.data.select( "core/block-editor" ).getDirectInsertBlock',
-				since: '6.3',
-				version: '6.4',
-			}
-		);
-		return getDirectInsertBlock( state, rootClientId );
-	},
-	( state, rootClientId ) => [
-		state.blockListSettings[ rootClientId ],
-		state.blocks.tree.get( rootClientId ),
-	]
-);
-
-const checkAllowListRecursive = ( blocks, allowedBlockTypes ) => {
-	if ( typeof allowedBlockTypes === 'boolean' ) {
-		return allowedBlockTypes;
+export function getDirectInsertBlock( state, rootClientId = null ) {
+	if ( ! rootClientId ) {
+		return;
 	}
-
-	const blocksQueue = [ ...blocks ];
-	while ( blocksQueue.length > 0 ) {
-		const block = blocksQueue.shift();
-
-		const isAllowed = checkAllowList(
-			allowedBlockTypes,
-			block.name || block.blockName,
-			true
-		);
-		if ( ! isAllowed ) {
-			return false;
-		}
-
-		block.innerBlocks?.forEach( ( innerBlock ) => {
-			blocksQueue.push( innerBlock );
-		} );
+	const { defaultBlock, directInsert } =
+		state.blockListSettings[ rootClientId ] ?? {};
+	if ( ! defaultBlock || ! directInsert ) {
+		return;
 	}
 
-	return true;
-};
+	return defaultBlock;
+}
 
-function getUserPatterns( state ) {
-	const userPatterns =
-		state?.settings?.__experimentalReusableBlocks ?? EMPTY_ARRAY;
-	const userPatternCategories =
-		state?.settings?.__experimentalUserPatternCategories ?? [];
-	const categories = new Map();
-	userPatternCategories.forEach( ( userCategory ) =>
-		categories.set( userCategory.id, userCategory )
+export function __experimentalGetDirectInsertBlock(
+	state,
+	rootClientId = null
+) {
+	deprecated(
+		'wp.data.select( "core/block-editor" ).__experimentalGetDirectInsertBlock',
+		{
+			alternative:
+				'wp.data.select( "core/block-editor" ).getDirectInsertBlock',
+			since: '6.3',
+			version: '6.4',
+		}
 	);
-	return userPatterns.map( ( userPattern ) => {
-		return {
-			name: `core/block/${ userPattern.id }`,
-			id: userPattern.id,
-			type: PATTERN_TYPES.user,
-			title: userPattern.title.raw,
-			categories: userPattern.wp_pattern_category.map( ( catId ) =>
-				categories && categories.get( catId )
-					? categories.get( catId ).slug
-					: catId
-			),
-			content: userPattern.content.raw,
-			syncStatus: userPattern.wp_pattern_sync_status,
-		};
-	} );
+	return getDirectInsertBlock( state, rootClientId );
 }
 
-export const __experimentalUserPatternCategories = createSelector(
-	( state ) => {
-		return state?.settings?.__experimentalUserPatternCategories;
-	},
-	( state ) => [ state.settings.__experimentalUserPatternCategories ]
+export const __experimentalGetParsedPattern = createRegistrySelector(
+	( select ) => ( state, patternName ) => {
+		const pattern = unlock( select( STORE_NAME ) ).getPatternBySlug(
+			patternName
+		);
+		return pattern ? getParsedPattern( pattern ) : null;
+	}
 );
 
-export const __experimentalGetParsedPattern = createSelector(
-	( state, patternName ) => {
-		const patterns = state.settings.__experimentalBlockPatterns;
-		const userPatterns = getUserPatterns( state );
+const getAllowedPatternsDependants = ( select ) => ( state, rootClientId ) => [
+	...getAllPatternsDependants( select )( state ),
+	...getInsertBlockTypeDependants( state, rootClientId ),
+];
 
-		const pattern = [ ...patterns, ...userPatterns ].find(
-			( { name } ) => name === patternName
-		);
-		if ( ! pattern ) {
-			return null;
-		}
-		return {
+const patternsWithParsedBlocks = new WeakMap();
+function enhancePatternWithParsedBlocks( pattern ) {
+	let enhancedPattern = patternsWithParsedBlocks.get( pattern );
+	if ( ! enhancedPattern ) {
+		enhancedPattern = {
 			...pattern,
-			blocks: parse( pattern.content, {
-				__unstableSkipMigrationLogs: true,
-			} ),
+			get blocks() {
+				return getParsedPattern( pattern ).blocks;
+			},
 		};
-	},
-	( state ) => [
-		state.settings.__experimentalBlockPatterns,
-		state.settings.__experimentalReusableBlocks,
-		state?.settings?.__experimentalUserPatternCategories,
-	]
-);
-
-const getAllAllowedPatterns = createSelector(
-	( state ) => {
-		const patterns = state.settings.__experimentalBlockPatterns;
-		const userPatterns = getUserPatterns( state );
-
-		const { allowedBlockTypes } = getSettings( state );
-
-		const parsedPatterns = [ ...userPatterns, ...patterns ]
-			.filter( ( { inserter = true } ) => !! inserter )
-			.map( ( { name } ) =>
-				__experimentalGetParsedPattern( state, name )
-			);
-		const allowedPatterns = parsedPatterns.filter( ( { blocks } ) =>
-			checkAllowListRecursive( blocks, allowedBlockTypes )
-		);
-		return allowedPatterns;
-	},
-	( state ) => [
-		state.settings.__experimentalBlockPatterns,
-		state.settings.__experimentalReusableBlocks,
-		state.settings.allowedBlockTypes,
-		state?.settings?.__experimentalUserPatternCategories,
-	]
-);
+		patternsWithParsedBlocks.set( pattern, enhancedPattern );
+	}
+	return enhancedPattern;
+}
 
 /**
  * Returns the list of allowed patterns for inner blocks children.
@@ -2366,26 +2461,46 @@ const getAllAllowedPatterns = createSelector(
  *
  * @return {Array?} The list of allowed patterns.
  */
-export const __experimentalGetAllowedPatterns = createSelector(
-	( state, rootClientId = null ) => {
-		const availableParsedPatterns = getAllAllowedPatterns( state );
-		const patternsAllowed = availableParsedPatterns.filter(
-			( { blocks } ) =>
-				blocks.every( ( { name } ) =>
-					canInsertBlockType( state, name, rootClientId )
-				)
-		);
+export const __experimentalGetAllowedPatterns = createRegistrySelector(
+	( select ) => {
+		return createSelector(
+			(
+				state,
+				rootClientId = null,
+				options = DEFAULT_INSERTER_OPTIONS
+			) => {
+				const { getAllPatterns } = unlock( select( STORE_NAME ) );
+				const patterns = getAllPatterns();
+				const { allowedBlockTypes } = getSettings( state );
+				const parsedPatterns = patterns
+					.filter( ( { inserter = true } ) => !! inserter )
+					.map( enhancePatternWithParsedBlocks );
+
+				const availableParsedPatterns = parsedPatterns.filter(
+					( pattern ) =>
+						checkAllowListRecursive(
+							getGrammar( pattern ),
+							allowedBlockTypes
+						)
+				);
+				const patternsAllowed = availableParsedPatterns.filter(
+					( pattern ) =>
+						getGrammar( pattern ).every( ( { blockName: name } ) =>
+							options[ isFiltered ] !== false
+								? canInsertBlockType(
+										state,
+										name,
+										rootClientId
+								  )
+								: isBlockVisibleInTheInserter( state, name )
+						)
+				);
 
-		return patternsAllowed;
-	},
-	( state, rootClientId ) => [
-		state.settings.__experimentalBlockPatterns,
-		state.settings.__experimentalReusableBlocks,
-		state.settings.allowedBlockTypes,
-		state.settings.templateLock,
-		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId.get( rootClientId ),
-	]
+				return patternsAllowed;
+			},
+			getAllowedPatternsDependants( select )
+		);
+	}
 );
 
 /**
@@ -2401,36 +2516,36 @@ export const __experimentalGetAllowedPatterns = createSelector(
  *
  * @return {Array} The list of matched block patterns based on declared `blockTypes` and block name.
  */
-export const getPatternsByBlockTypes = createSelector(
-	( state, blockNames, rootClientId = null ) => {
-		if ( ! blockNames ) return EMPTY_ARRAY;
-		const patterns = __experimentalGetAllowedPatterns(
-			state,
-			rootClientId
-		);
-		const normalizedBlockNames = Array.isArray( blockNames )
-			? blockNames
-			: [ blockNames ];
-		const filteredPatterns = patterns.filter( ( pattern ) =>
-			pattern?.blockTypes?.some?.( ( blockName ) =>
-				normalizedBlockNames.includes( blockName )
-			)
-		);
-		if ( filteredPatterns.length === 0 ) {
-			return EMPTY_ARRAY;
-		}
-		return filteredPatterns;
-	},
-	( state, blockNames, rootClientId ) => [
-		...__experimentalGetAllowedPatterns.getDependants(
-			state,
-			rootClientId
-		),
-	]
+export const getPatternsByBlockTypes = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state, blockNames, rootClientId = null ) => {
+			if ( ! blockNames ) {
+				return EMPTY_ARRAY;
+			}
+			const patterns =
+				select( STORE_NAME ).__experimentalGetAllowedPatterns(
+					rootClientId
+				);
+			const normalizedBlockNames = Array.isArray( blockNames )
+				? blockNames
+				: [ blockNames ];
+			const filteredPatterns = patterns.filter( ( pattern ) =>
+				pattern?.blockTypes?.some?.( ( blockName ) =>
+					normalizedBlockNames.includes( blockName )
+				)
+			);
+			if ( filteredPatterns.length === 0 ) {
+				return EMPTY_ARRAY;
+			}
+			return filteredPatterns;
+		},
+		( state, blockNames, rootClientId ) =>
+			getAllowedPatternsDependants( select )( state, rootClientId )
+	)
 );
 
-export const __experimentalGetPatternsByBlockTypes = createSelector(
-	( state, blockNames, rootClientId = null ) => {
+export const __experimentalGetPatternsByBlockTypes = createRegistrySelector(
+	( select ) => {
 		deprecated(
 			'wp.data.select( "core/block-editor" ).__experimentalGetPatternsByBlockTypes',
 			{
@@ -2440,21 +2555,15 @@ export const __experimentalGetPatternsByBlockTypes = createSelector(
 				version: '6.4',
 			}
 		);
-		return getPatternsByBlockTypes( state, blockNames, rootClientId );
-	},
-	( state, blockNames, rootClientId ) => [
-		...__experimentalGetAllowedPatterns.getDependants(
-			state,
-			rootClientId
-		),
-	]
+		return select( STORE_NAME ).getPatternsByBlockTypes;
+	}
 );
 
 /**
  * Determines the items that appear in the available pattern transforms list.
  *
  * For now we only handle blocks without InnerBlocks and take into account
- * the `__experimentalRole` property of blocks' attributes for the transformation.
+ * the `role` property of blocks' attributes for the transformation.
  *
  * We return the first set of possible eligible block patterns,
  * by checking the `blockTypes` property. We still have to recurse through
@@ -2467,45 +2576,48 @@ export const __experimentalGetPatternsByBlockTypes = createSelector(
  *
  * @return {WPBlockPattern[]} Items that are eligible for a pattern transformation.
  */
-export const __experimentalGetPatternTransformItems = createSelector(
-	( state, blocks, rootClientId = null ) => {
-		if ( ! blocks ) return EMPTY_ARRAY;
-		/**
-		 * For now we only handle blocks without InnerBlocks and take into account
-		 * the `__experimentalRole` property of blocks' attributes for the transformation.
-		 * Note that the blocks have been retrieved through `getBlock`, which doesn't
-		 * return the inner blocks of an inner block controller, so we still need
-		 * to check for this case too.
-		 */
-		if (
-			blocks.some(
-				( { clientId, innerBlocks } ) =>
-					innerBlocks.length ||
-					areInnerBlocksControlled( state, clientId )
-			)
-		) {
-			return EMPTY_ARRAY;
-		}
-
-		// Create a Set of the selected block names that is used in patterns filtering.
-		const selectedBlockNames = Array.from(
-			new Set( blocks.map( ( { name } ) => name ) )
-		);
-		/**
-		 * Here we will return first set of possible eligible block patterns,
-		 * by checking the `blockTypes` property. We still have to recurse through
-		 * block pattern's blocks and try to find matches from the selected blocks.
-		 * Now this happens in the consumer to avoid heavy operations in the selector.
-		 */
-		return getPatternsByBlockTypes(
-			state,
-			selectedBlockNames,
-			rootClientId
-		);
-	},
-	( state, blocks, rootClientId ) => [
-		...getPatternsByBlockTypes.getDependants( state, rootClientId ),
-	]
+export const __experimentalGetPatternTransformItems = createRegistrySelector(
+	( select ) =>
+		createSelector(
+			( state, blocks, rootClientId = null ) => {
+				if ( ! blocks ) {
+					return EMPTY_ARRAY;
+				}
+				/**
+				 * For now we only handle blocks without InnerBlocks and take into account
+				 * the `role` property of blocks' attributes for the transformation.
+				 * Note that the blocks have been retrieved through `getBlock`, which doesn't
+				 * return the inner blocks of an inner block controller, so we still need
+				 * to check for this case too.
+				 */
+				if (
+					blocks.some(
+						( { clientId, innerBlocks } ) =>
+							innerBlocks.length ||
+							areInnerBlocksControlled( state, clientId )
+					)
+				) {
+					return EMPTY_ARRAY;
+				}
+
+				// Create a Set of the selected block names that is used in patterns filtering.
+				const selectedBlockNames = Array.from(
+					new Set( blocks.map( ( { name } ) => name ) )
+				);
+				/**
+				 * Here we will return first set of possible eligible block patterns,
+				 * by checking the `blockTypes` property. We still have to recurse through
+				 * block pattern's blocks and try to find matches from the selected blocks.
+				 * Now this happens in the consumer to avoid heavy operations in the selector.
+				 */
+				return select( STORE_NAME ).getPatternsByBlockTypes(
+					selectedBlockNames,
+					rootClientId
+				);
+			},
+			( state, blocks, rootClientId ) =>
+				getAllowedPatternsDependants( select )( state, rootClientId )
+		)
 );
 
 /**
@@ -2577,18 +2689,29 @@ export const __experimentalGetBlockListSettingsForBlocks = createSelector(
  *
  * @return {string} The reusable block saved title.
  */
-export const __experimentalGetReusableBlockTitle = createSelector(
-	( state, ref ) => {
-		const reusableBlock = getReusableBlocks( state ).find(
-			( block ) => block.id === ref
-		);
-		if ( ! reusableBlock ) {
-			return null;
-		}
+export const __experimentalGetReusableBlockTitle = createRegistrySelector(
+	( select ) =>
+		createSelector(
+			( state, ref ) => {
+				deprecated(
+					"wp.data.select( 'core/block-editor' ).__experimentalGetReusableBlockTitle",
+					{
+						since: '6.6',
+						version: '6.8',
+					}
+				);
 
-		return reusableBlock.title?.raw;
-	},
-	( state ) => [ getReusableBlocks( state ) ]
+				const reusableBlock = unlock( select( STORE_NAME ) )
+					.getReusableBlocks()
+					.find( ( block ) => block.id === ref );
+				if ( ! reusableBlock ) {
+					return null;
+				}
+
+				return reusableBlock.title?.raw;
+			},
+			() => [ unlock( select( STORE_NAME ) ).getReusableBlocks() ]
+		)
 );
 
 /**
@@ -2622,17 +2745,6 @@ export function __experimentalGetLastBlockAttributeChanges( state ) {
 	return state.lastBlockAttributesChange;
 }
 
-/**
- * Returns the available reusable blocks
- *
- * @param {Object} state Global application state.
- *
- * @return {Array} Reusable blocks
- */
-function getReusableBlocks( state ) {
-	return state?.settings?.__experimentalReusableBlocks ?? EMPTY_ARRAY;
-}
-
 /**
  * Returns whether the navigation mode is enabled.
  *
@@ -2641,7 +2753,7 @@ function getReusableBlocks( state ) {
  * @return {boolean} Is navigation mode enabled.
  */
 export function isNavigationMode( state ) {
-	return state.editorMode === 'navigation';
+	return __unstableGetEditorMode( state ) === 'navigation';
 }
 
 /**
@@ -2651,19 +2763,26 @@ export function isNavigationMode( state ) {
  *
  * @return {string} the editor mode.
  */
-export function __unstableGetEditorMode( state ) {
-	return state.editorMode;
-}
+export const __unstableGetEditorMode = createRegistrySelector(
+	( select ) => () => {
+		return select( preferencesStore ).get( 'core', 'editorTool' );
+	}
+);
 
 /**
  * Returns whether block moving mode is enabled.
  *
- * @param {Object} state Editor state.
- *
- * @return {string} Client Id of moving block.
+ * @deprecated
  */
-export function hasBlockMovingClientId( state ) {
-	return state.hasBlockMovingClientId;
+export function hasBlockMovingClientId() {
+	deprecated(
+		'wp.data.select( "core/block-editor" ).hasBlockMovingClientId',
+		{
+			since: '6.7',
+			hint: 'Block moving mode feature has been removed',
+		}
+	);
+	return false;
 }
 
 /**
@@ -2773,6 +2892,16 @@ export function isBlockVisible( state, clientId ) {
 	return state.blockVisibility?.[ clientId ] ?? true;
 }
 
+/**
+ * Returns the currently hovered block.
+ *
+ * @param {Object} state Global application state.
+ * @return {Object} Client Id of the hovered block.
+ */
+export function getHoveredBlockClientId( state ) {
+	return state.hoveredBlockClientId;
+}
+
 /**
  * Returns the list of all hidden blocks.
  *
@@ -2794,40 +2923,6 @@ export const __unstableGetVisibleBlocks = createSelector(
 	( state ) => [ state.blockVisibility ]
 );
 
-/**
- * DO-NOT-USE in production.
- * This selector is created for internal/experimental only usage and may be
- * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
- */
-export const __unstableGetContentLockingParent = createSelector(
-	( state, clientId ) => {
-		let current = clientId;
-		let result;
-		while ( state.blocks.parents.has( current ) ) {
-			current = state.blocks.parents.get( current );
-			if (
-				current &&
-				getTemplateLock( state, current ) === 'contentOnly'
-			) {
-				result = current;
-			}
-		}
-		return result;
-	},
-	( state ) => [ state.blocks.parents, state.blockListSettings ]
-);
-
-/**
- * DO-NOT-USE in production.
- * This selector is created for internal/experimental only usage and may be
- * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
- *
- * @param {Object} state Global application state.
- */
-export function __unstableGetTemporarilyEditingAsBlocks( state ) {
-	return state.temporarilyEditingAsBlocks;
-}
-
 export function __unstableHasActiveBlockOverlayActive( state, clientId ) {
 	// Prevent overlay on blocks with a non-default editing mode. If the mdoe is
 	// 'disabled' then the overlay is redundant since the block can't be
@@ -2842,15 +2937,20 @@ export function __unstableHasActiveBlockOverlayActive( state, clientId ) {
 		return true;
 	}
 
-	const editorMode = __unstableGetEditorMode( state );
-
-	// In zoom-out mode, the block overlay is always active for top level blocks.
-	if (
-		editorMode === 'zoom-out' &&
-		clientId &&
-		! getBlockRootClientId( state, clientId )
-	) {
-		return true;
+	// In zoom-out mode, the block overlay is always active for section level blocks.
+	if ( isZoomOut( state ) ) {
+		const sectionRootClientId = getSectionRootClientId( state );
+		if ( sectionRootClientId ) {
+			const sectionClientIds = getBlockOrder(
+				state,
+				sectionRootClientId
+			);
+			if ( sectionClientIds?.includes( clientId ) ) {
+				return true;
+			}
+		} else if ( clientId && ! getBlockRootClientId( state, clientId ) ) {
+			return true;
+		}
 	}
 
 	// In navigation mode, the block overlay is active when the block is not
@@ -2863,11 +2963,9 @@ export function __unstableHasActiveBlockOverlayActive( state, clientId ) {
 		'__experimentalDisableBlockOverlay',
 		false
 	);
-	const shouldEnableIfUnselected =
-		editorMode === 'navigation' ||
-		( blockSupportDisable
-			? false
-			: areInnerBlocksControlled( state, clientId ) );
+	const shouldEnableIfUnselected = blockSupportDisable
+		? false
+		: areInnerBlocksControlled( state, clientId );
 
 	return (
 		shouldEnableIfUnselected &&
@@ -2887,6 +2985,14 @@ export function __unstableIsWithinBlockOverlay( state, clientId ) {
 	return false;
 }
 
+function isWithinBlock( state, clientId, parentClientId ) {
+	let parent = state.blocks.parents.get( clientId );
+	while ( !! parent && parent !== parentClientId ) {
+		parent = state.blocks.parents.get( parent );
+	}
+	return parent === parentClientId;
+}
+
 /**
  * @typedef {import('../components/block-editing-mode').BlockEditingMode} BlockEditingMode
  */
@@ -2922,22 +3028,99 @@ export function __unstableIsWithinBlockOverlay( state, clientId ) {
 export const getBlockEditingMode = createRegistrySelector(
 	( select ) =>
 		( state, clientId = '' ) => {
-			if ( state.blockEditingModes.has( clientId ) ) {
-				return state.blockEditingModes.get( clientId );
+			// Some selectors that call this provide `null` as the default
+			// rootClientId, but the default rootClientId is actually `''`.
+			if ( clientId === null ) {
+				clientId = '';
+			}
+
+			// In zoom-out mode, override the behavior set by
+			// __unstableSetBlockEditingMode to only allow editing the top-level
+			// sections.
+			if ( isZoomOut( state ) ) {
+				const sectionRootClientId = getSectionRootClientId( state );
+
+				if ( clientId === '' /* ROOT_CONTAINER_CLIENT_ID */ ) {
+					return sectionRootClientId ? 'disabled' : 'contentOnly';
+				}
+				if ( clientId === sectionRootClientId ) {
+					return 'contentOnly';
+				}
+				const sectionsClientIds = getBlockOrder(
+					state,
+					sectionRootClientId
+				);
+
+				// Sections are always contentOnly.
+				if ( sectionsClientIds?.includes( clientId ) ) {
+					return 'contentOnly';
+				}
+
+				return 'disabled';
 			}
+
+			const editorMode = __unstableGetEditorMode( state );
+			if ( editorMode === 'navigation' ) {
+				const sectionRootClientId = getSectionRootClientId( state );
+
+				// The root section is "default mode"
+				if ( clientId === sectionRootClientId ) {
+					return 'default';
+				}
+
+				// Sections should always be contentOnly in navigation mode.
+				const sectionsClientIds = getBlockOrder(
+					state,
+					sectionRootClientId
+				);
+				if ( sectionsClientIds.includes( clientId ) ) {
+					return 'contentOnly';
+				}
+
+				// Blocks outside sections should be disabled.
+				const isWithinSectionRoot = isWithinBlock(
+					state,
+					clientId,
+					sectionRootClientId
+				);
+				if ( ! isWithinSectionRoot ) {
+					return 'disabled';
+				}
+
+				// The rest of the blocks depend on whether they are content blocks or not.
+				// This "flattens" the sections tree.
+				const name = getBlockName( state, clientId );
+				const { hasContentRoleAttribute } = unlock(
+					select( blocksStore )
+				);
+				const isContent = hasContentRoleAttribute( name );
+
+				return isContent ? 'contentOnly' : 'disabled';
+			}
+
+			// In normal mode, consider that an explicitely set editing mode takes over.
+			const blockEditingMode = state.blockEditingModes.get( clientId );
+			if ( blockEditingMode ) {
+				return blockEditingMode;
+			}
+
+			// In normal mode, top level is default mode.
 			if ( ! clientId ) {
 				return 'default';
 			}
+
 			const rootClientId = getBlockRootClientId( state, clientId );
 			const templateLock = getTemplateLock( state, rootClientId );
+			// If the parent of the block is contentOnly locked, check whether it's a content block.
 			if ( templateLock === 'contentOnly' ) {
 				const name = getBlockName( state, clientId );
-				const isContent =
-					select( blocksStore ).__experimentalHasContentRoleAttribute(
-						name
-					);
+				const { hasContentRoleAttribute } = unlock(
+					select( blocksStore )
+				);
+				const isContent = hasContentRoleAttribute( name );
 				return isContent ? 'contentOnly' : 'disabled';
 			}
+			// Otherwise, check if there's an ancestor that is contentOnly
 			const parentMode = getBlockEditingMode( state, rootClientId );
 			return parentMode === 'contentOnly' ? 'default' : parentMode;
 		}
@@ -3001,20 +3184,69 @@ export const isGroupable = createRegistrySelector(
 				rootClientId
 			);
 			const _isGroupable = groupingBlockAvailable && _clientIds.length;
-			return (
-				_isGroupable &&
-				canRemoveBlocks( state, _clientIds, rootClientId )
-			);
+			return _isGroupable && canRemoveBlocks( state, _clientIds );
 		}
 );
 
 /**
- * Returns the element of the last element that had focus when focus left the editor canvas.
+ * DO-NOT-USE in production.
+ * This selector is created for internal/experimental only usage and may be
+ * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
  *
- * @param {Object} state Block editor state.
+ * @deprecated
+ *
+ * @param {Object} state    Global application state.
+ * @param {Object} clientId Client Id of the block.
+ *
+ * @return {?string} Client ID of the ancestor block that is content locking the block.
+ */
+export const __unstableGetContentLockingParent = ( state, clientId ) => {
+	deprecated(
+		"wp.data.select( 'core/block-editor' ).__unstableGetContentLockingParent",
+		{
+			since: '6.1',
+			version: '6.7',
+		}
+	);
+	return getContentLockingParent( state, clientId );
+};
+
+/**
+ * DO-NOT-USE in production.
+ * This selector is created for internal/experimental only usage and may be
+ * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
+ *
+ * @deprecated
  *
- * @return {Object} Element.
+ * @param {Object} state Global application state.
  */
-export function getLastFocus( state ) {
-	return state.lastFocus;
+export function __unstableGetTemporarilyEditingAsBlocks( state ) {
+	deprecated(
+		"wp.data.select( 'core/block-editor' ).__unstableGetTemporarilyEditingAsBlocks",
+		{
+			since: '6.1',
+			version: '6.7',
+		}
+	);
+	return getTemporarilyEditingAsBlocks( state );
+}
+
+/**
+ * DO-NOT-USE in production.
+ * This selector is created for internal/experimental only usage and may be
+ * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
+ *
+ * @deprecated
+ *
+ * @param {Object} state Global application state.
+ */
+export function __unstableGetTemporarilyEditingFocusModeToRevert( state ) {
+	deprecated(
+		"wp.data.select( 'core/block-editor' ).__unstableGetTemporarilyEditingFocusModeToRevert",
+		{
+			since: '6.5',
+			version: '6.7',
+		}
+	);
+	return getTemporarilyEditingFocusModeToRevert( state );
 }
diff --git a/packages/block-editor/src/store/test/actions.js b/packages/block-editor/src/store/test/actions.js
index e65921e30a6ce7..ce973e44f4523b 100644
--- a/packages/block-editor/src/store/test/actions.js
+++ b/packages/block-editor/src/store/test/actions.js
@@ -380,107 +380,6 @@ describe( 'actions', () => {
 	} );
 
 	describe( 'insertBlocks', () => {
-		it( 'should apply default styles to blocks if blocks do not contain a style', () => {
-			const ribsBlock = {
-				clientId: 'ribs',
-				name: 'core/test-ribs',
-			};
-			const chickenBlock = {
-				clientId: 'chicken',
-				name: 'core/test-chicken',
-			};
-			const chickenRibsBlock = {
-				clientId: 'chicken-ribs',
-				name: 'core/test-chicken-ribs',
-			};
-			const blocks = [ ribsBlock, chickenBlock, chickenRibsBlock ];
-
-			const select = {
-				getSettings: () => ( {
-					__experimentalPreferredStyleVariations: {
-						value: {
-							'core/test-ribs': 'squared',
-							'core/test-chicken-ribs': 'colorful',
-						},
-					},
-				} ),
-				canInsertBlockType: () => true,
-			};
-			const dispatch = jest.fn();
-
-			insertBlocks(
-				blocks,
-				5,
-				'testrootid',
-				false
-			)( { select, dispatch } );
-
-			expect( dispatch ).toHaveBeenCalledWith( {
-				type: 'INSERT_BLOCKS',
-				blocks: [
-					{
-						...ribsBlock,
-						attributes: { className: 'is-style-squared' },
-					},
-					chickenBlock,
-					{
-						...chickenRibsBlock,
-						attributes: { className: 'is-style-colorful' },
-					},
-				],
-				index: 5,
-				rootClientId: 'testrootid',
-				time: expect.any( Number ),
-				updateSelection: false,
-				initialPosition: null,
-			} );
-		} );
-
-		it( 'should keep styles explicitly set even if different from the default', () => {
-			const ribsWithStyleBlock = {
-				clientId: 'ribs',
-				name: 'core/test-ribs',
-				attributes: {
-					className: 'is-style-colorful',
-				},
-			};
-			const blocks = [ ribsWithStyleBlock ];
-
-			const select = {
-				getSettings: () => ( {
-					__experimentalPreferredStyleVariations: {
-						value: {
-							'core/test-ribs': 'squared',
-						},
-					},
-				} ),
-				canInsertBlockType: () => true,
-			};
-			const dispatch = jest.fn();
-
-			insertBlocks(
-				blocks,
-				5,
-				'testrootid',
-				false
-			)( { select, dispatch } );
-
-			expect( dispatch ).toHaveBeenCalledWith( {
-				type: 'INSERT_BLOCKS',
-				blocks: [
-					{
-						...ribsWithStyleBlock,
-						attributes: { className: 'is-style-colorful' },
-					},
-				],
-				index: 5,
-				rootClientId: 'testrootid',
-				time: expect.any( Number ),
-				updateSelection: false,
-				initialPosition: null,
-			} );
-		} );
-
 		it( 'should filter the allowed blocks in INSERT_BLOCKS action', () => {
 			const ribsBlock = {
 				clientId: 'ribs',
@@ -933,10 +832,6 @@ describe( 'actions', () => {
 				blockB.clientId
 			)( { select, dispatch } );
 
-			expect( dispatch ).toHaveBeenCalledWith( {
-				type: 'MERGE_BLOCKS',
-				blocks: [ blockA.clientId, blockB.clientId ],
-			} );
 			expect( dispatch.selectBlock ).toHaveBeenCalledWith( 'chicken' );
 		} );
 
@@ -1230,6 +1125,47 @@ describe( 'actions', () => {
 		} );
 	} );
 
+	describe( 'updateSettings', () => {
+		it( 'warns when setting the deprecated __unstableIsPreviewMode property and sets the stable property instead', () => {
+			const consoleWarn = jest
+				.spyOn( global.console, 'warn' )
+				.mockImplementation();
+
+			const store = createRegistry().registerStore(
+				blockEditorStoreName,
+				{
+					actions,
+					selectors,
+					reducer,
+				}
+			);
+
+			store.dispatch(
+				updateSettings( {
+					__unstableIsPreviewMode: true,
+				} )
+			);
+
+			expect( consoleWarn ).toHaveBeenCalledWith(
+				"__unstableIsPreviewMode argument in wp.data.dispatch('core/block-editor').updateSettings is deprecated since version 6.8. Please use isPreviewMode instead."
+			);
+
+			consoleWarn.mockClear();
+
+			expect( store.getState().settings.__unstableIsPreviewMode ).toBe(
+				true
+			);
+
+			expect( store.getState().settings.isPreviewMode ).toBe( true );
+
+			expect( consoleWarn ).toHaveBeenCalledWith(
+				'__unstableIsPreviewMode is deprecated since version 6.8. Please use isPreviewMode instead.'
+			);
+
+			consoleWarn.mockRestore();
+		} );
+	} );
+
 	describe( 'registerInserterMediaCategory', () => {
 		describe( 'should log errors when invalid', () => {
 			it( 'valid object', () => {
diff --git a/packages/block-editor/src/store/test/get-block-settings.js b/packages/block-editor/src/store/test/get-block-settings.js
new file mode 100644
index 00000000000000..7154b3edc1d73b
--- /dev/null
+++ b/packages/block-editor/src/store/test/get-block-settings.js
@@ -0,0 +1,90 @@
+/**
+ * WordPress dependencies
+ */
+import { addFilter, removeFilter } from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import { getBlockSettings } from '../get-block-settings';
+
+describe( 'getBlockSettings', () => {
+	it( 'uses block setting', () => {
+		const state = {
+			settings: {
+				__experimentalFeatures: {
+					blocks: {
+						'core/test-block': {
+							layout: {
+								contentSize: '840px',
+							},
+						},
+					},
+				},
+			},
+			blocks: {
+				byClientId: new Map( [
+					[
+						'block-1',
+						{
+							name: 'core/test-block',
+						},
+					],
+				] ),
+				parents: new Map( [ [ 'block-1', '' ] ] ),
+			},
+		};
+
+		expect(
+			getBlockSettings( state, 'block-1', 'layout.contentSize' )
+		).toEqual( [ '840px' ] );
+	} );
+
+	it( 'uses blockEditor.useSetting.before hook override', () => {
+		const state = {
+			settings: {
+				__experimentalFeatures: {
+					blocks: {
+						'core/test-block': {
+							layout: {
+								contentSize: '840px',
+							},
+						},
+					},
+				},
+			},
+			blocks: {
+				byClientId: new Map( [
+					[
+						'block-1',
+						{
+							name: 'core/test-block',
+						},
+					],
+				] ),
+				parents: new Map( [ [ 'block-1', '' ] ] ),
+			},
+		};
+
+		addFilter(
+			'blockEditor.useSetting.before',
+			'test/useSetting.before',
+			( result, path, clientId, blockName ) => {
+				if ( blockName === 'core/test-block' ) {
+					return '960px';
+				}
+
+				return result;
+			}
+		);
+
+		expect(
+			getBlockSettings( state, 'block-1', 'layout.contentSize' )
+		).toEqual( [ '960px' ] );
+
+		removeFilter(
+			'blockEditor.useSetting.before',
+			'test/useSetting.before'
+		);
+	} );
+} );
diff --git a/packages/block-editor/src/store/test/private-actions.js b/packages/block-editor/src/store/test/private-actions.js
index 5763cb382937b2..d54a519c9056b6 100644
--- a/packages/block-editor/src/store/test/private-actions.js
+++ b/packages/block-editor/src/store/test/private-actions.js
@@ -4,8 +4,12 @@
 import {
 	hideBlockInterface,
 	showBlockInterface,
+	expandBlock,
 	__experimentalUpdateSettings,
+	setInsertionPoint,
 	setOpenedBlockSettingsMenu,
+	startDragging,
+	stopDragging,
 } from '../private-actions';
 
 describe( 'private actions', () => {
@@ -95,4 +99,43 @@ describe( 'private actions', () => {
 			} );
 		} );
 	} );
+
+	describe( 'startDragging', () => {
+		it( 'should return the START_DRAGGING action', () => {
+			expect( startDragging() ).toEqual( {
+				type: 'START_DRAGGING',
+			} );
+		} );
+	} );
+
+	describe( 'stopDragging', () => {
+		it( 'should return the STOP_DRAGGING action', () => {
+			expect( stopDragging() ).toEqual( {
+				type: 'STOP_DRAGGING',
+			} );
+		} );
+	} );
+
+	describe( 'expandBlock', () => {
+		it( 'should return the SET_BLOCK_EXPANDED_IN_LIST_VIEW action', () => {
+			expect( expandBlock( 'block-1' ) ).toEqual( {
+				type: 'SET_BLOCK_EXPANDED_IN_LIST_VIEW',
+				clientId: 'block-1',
+			} );
+		} );
+	} );
+
+	describe( 'setInsertionPoint', () => {
+		it( 'should return the SET_INSERTION_POINT action', () => {
+			expect(
+				setInsertionPoint( {
+					rootClientId: '',
+					index: '123',
+				} )
+			).toEqual( {
+				type: 'SET_INSERTION_POINT',
+				value: { rootClientId: '', index: '123' },
+			} );
+		} );
+	} );
 } );
diff --git a/packages/block-editor/src/store/test/private-selectors.js b/packages/block-editor/src/store/test/private-selectors.js
index 746a51b6031101..73c14faa6fd065 100644
--- a/packages/block-editor/src/store/test/private-selectors.js
+++ b/packages/block-editor/src/store/test/private-selectors.js
@@ -7,8 +7,11 @@ import {
 	isBlockSubtreeDisabled,
 	getEnabledClientIdsTree,
 	getEnabledBlockParents,
+	getExpandedBlock,
+	isDragging,
+	getBlockStyles,
 } from '../private-selectors';
-import { getBlockEditingMode } from '../selectors';
+import { getBlockEditingMode, __unstableGetEditorMode } from '../selectors';
 
 describe( 'private selectors', () => {
 	describe( 'isBlockInterfaceHidden', () => {
@@ -121,10 +124,16 @@ describe( 'private selectors', () => {
 			blockEditingModes: new Map( [] ),
 		};
 
-		const __experimentalHasContentRoleAttribute = jest.fn( () => false );
+		const hasContentRoleAttribute = jest.fn( () => false );
+		const get = jest.fn( () => 'edit' );
 		getBlockEditingMode.registry = {
 			select: jest.fn( () => ( {
-				__experimentalHasContentRoleAttribute,
+				hasContentRoleAttribute,
+			} ) ),
+		};
+		__unstableGetEditorMode.registry = {
+			select: jest.fn( () => ( {
+				get,
 			} ) ),
 		};
 
@@ -391,6 +400,10 @@ describe( 'private selectors', () => {
 					parents: new Map( [
 						[ '6cf70164-9097-4460-bcbf-200560546988', '' ],
 					] ),
+					order: new Map( [
+						[ '6cf70164-9097-4460-bcbf-200560546988', [] ],
+						[ '', [ '6cf70164-9097-4460-bcbf-200560546988' ] ],
+					] ),
 				},
 				blockEditingModes: new Map(),
 			};
@@ -421,6 +434,21 @@ describe( 'private selectors', () => {
 							'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c',
 						],
 					] ),
+
+					order: new Map( [
+						[
+							'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337',
+							[
+								'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f',
+								'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c',
+							],
+						],
+						[
+							'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c',
+							[ '4c2b7140-fffd-44b4-b2a7-820c670a6514' ],
+						],
+						[ '', [ 'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337' ] ],
+					] ),
 				},
 				blockEditingModes: new Map( [
 					[ '', 'disabled' ],
@@ -458,6 +486,21 @@ describe( 'private selectors', () => {
 							'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c',
 						],
 					] ),
+					order: new Map( [
+						[
+							'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337',
+							[ '9b9c5c3f-2e46-4f02-9e14-9fe9515b958f' ],
+						],
+						[
+							'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f',
+							[ 'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c' ],
+						],
+						[
+							'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c',
+							[ '4c2b7140-fffd-44b4-b2a7-820c670a6514' ],
+						],
+						[ '', [ 'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337' ] ],
+					] ),
 				},
 				blockEditingModes: new Map( [
 					[ '', 'disabled' ],
@@ -477,4 +520,122 @@ describe( 'private selectors', () => {
 			] );
 		} );
 	} );
+
+	describe( 'isDragging', () => {
+		it( 'should return true if the dragging state is true', () => {
+			const state = {
+				isDragging: true,
+			};
+
+			expect( isDragging( state ) ).toBe( true );
+		} );
+
+		it( 'should return false if the dragging state is false', () => {
+			const state = {
+				isDragging: false,
+			};
+
+			expect( isDragging( state ) ).toBe( false );
+		} );
+	} );
+
+	describe( 'getExpandedBlock', () => {
+		it( 'should return the expanded block', () => {
+			const state = {
+				expandedBlock: '9b9c5c3f-2e46-4f02-9e14-9fe9515b958f',
+			};
+
+			expect( getExpandedBlock( state ) ).toBe(
+				'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f'
+			);
+		} );
+	} );
+
+	describe( 'getBlockStyles', () => {
+		it( 'should return an empty object when no client IDs are provided', () => {
+			const state = {
+				blocks: {
+					attributes: new Map(),
+				},
+			};
+			const result = getBlockStyles( state, [] );
+			expect( result ).toEqual( {} );
+		} );
+
+		it( 'should return styles for a single block', () => {
+			const state = {
+				blocks: {
+					attributes: new Map( [
+						[ 'block-1', { style: { color: 'red' } } ],
+					] ),
+				},
+			};
+			const result = getBlockStyles( state, [ 'block-1' ] );
+			expect( result ).toEqual( {
+				'block-1': { color: 'red' },
+			} );
+		} );
+
+		it( 'should return styles for multiple blocks', () => {
+			const state = {
+				blocks: {
+					attributes: new Map( [
+						[ 'block-1', { style: { color: 'red' } } ],
+						[ 'block-2', { style: { fontSize: '16px' } } ],
+						[ 'block-3', { style: { margin: '10px' } } ],
+					] ),
+				},
+			};
+			const result = getBlockStyles( state, [
+				'block-1',
+				'block-2',
+				'block-3',
+			] );
+			expect( result ).toEqual( {
+				'block-1': { color: 'red' },
+				'block-2': { fontSize: '16px' },
+				'block-3': { margin: '10px' },
+			} );
+		} );
+
+		it( 'should return undefined for blocks without styles', () => {
+			const state = {
+				blocks: {
+					attributes: new Map( [
+						[ 'block-1', { style: { color: 'red' } } ],
+						[ 'block-2', {} ],
+						[ 'block-3', { style: { margin: '10px' } } ],
+					] ),
+				},
+			};
+			const result = getBlockStyles( state, [
+				'block-1',
+				'block-2',
+				'block-3',
+			] );
+			expect( result ).toEqual( {
+				'block-1': { color: 'red' },
+				'block-2': undefined,
+				'block-3': { margin: '10px' },
+			} );
+		} );
+
+		it( 'should return undefined for non-existent blocks', () => {
+			const state = {
+				blocks: {
+					attributes: new Map( [
+						[ 'block-1', { style: { color: 'red' } } ],
+					] ),
+				},
+			};
+			const result = getBlockStyles( state, [
+				'block-1',
+				'non-existent-block',
+			] );
+			expect( result ).toEqual( {
+				'block-1': { color: 'red' },
+				'non-existent-block': undefined,
+			} );
+		} );
+	} );
 } );
diff --git a/packages/block-editor/src/store/test/reducer.js b/packages/block-editor/src/store/test/reducer.js
index 8c82d1c3092b16..c99d639ba8a09e 100644
--- a/packages/block-editor/src/store/test/reducer.js
+++ b/packages/block-editor/src/store/test/reducer.js
@@ -21,19 +21,23 @@ import {
 	blocks,
 	isBlockInterfaceHidden,
 	isTyping,
+	isDragging,
 	draggedBlocks,
 	selection,
 	initialPosition,
 	isMultiSelecting,
 	preferences,
 	blocksMode,
+	insertionCue,
 	insertionPoint,
 	template,
 	blockListSettings,
+	settings,
 	lastBlockAttributesChange,
 	lastBlockInserted,
 	blockEditingModes,
 	openedBlockSettingsMenu,
+	expandedBlock,
 } from '../reducer';
 
 const noop = () => {};
@@ -2376,15 +2380,15 @@ describe( 'state', () => {
 		} );
 	} );
 
-	describe( 'insertionPoint', () => {
+	describe( 'insertionCue', () => {
 		it( 'should default to null', () => {
-			const state = insertionPoint( undefined, {} );
+			const state = insertionCue( undefined, {} );
 
 			expect( state ).toBe( null );
 		} );
 
 		it( 'should set insertion point', () => {
-			const state = insertionPoint( null, {
+			const state = insertionCue( null, {
 				type: 'SHOW_INSERTION_POINT',
 				rootClientId: 'clientId1',
 				index: 0,
@@ -2401,7 +2405,7 @@ describe( 'state', () => {
 				rootClientId: 'clientId1',
 				index: 0,
 			} );
-			const state = insertionPoint( original, {
+			const state = insertionCue( original, {
 				type: 'HIDE_INSERTION_POINT',
 			} );
 
@@ -2445,6 +2449,24 @@ describe( 'state', () => {
 		} );
 	} );
 
+	describe( 'isDragging', () => {
+		it( 'should set the dragging flag to true', () => {
+			const state = isDragging( false, {
+				type: 'START_DRAGGING',
+			} );
+
+			expect( state ).toBe( true );
+		} );
+
+		it( 'should set the dragging flag to false', () => {
+			const state = isDragging( true, {
+				type: 'STOP_DRAGGING',
+			} );
+
+			expect( state ).toBe( false );
+		} );
+	} );
+
 	describe( 'draggedBlocks', () => {
 		it( 'should store the dragged client ids when a user starts dragging blocks', () => {
 			const clientIds = [ 'block-1', 'block-2', 'block-3' ];
@@ -3049,6 +3071,28 @@ describe( 'state', () => {
 		} );
 	} );
 
+	describe( 'settings', () => {
+		it( 'should warn about __unstableIsPreviewMode deprecation', () => {
+			const consoleWarn = jest
+				.spyOn( global.console, 'warn' )
+				.mockImplementation();
+
+			const settingsObject = settings( undefined, {
+				type: 'UPDATE_SETTINGS',
+				reset: true,
+			} );
+
+			expect( settingsObject.__unstableIsPreviewMode ).toBeDefined();
+			expect( settingsObject.isPreviewMode ).toBeDefined();
+
+			expect( consoleWarn ).toHaveBeenCalledWith(
+				'__unstableIsPreviewMode is deprecated since version 6.8. Please use isPreviewMode instead.'
+			);
+
+			consoleWarn.mockRestore();
+		} );
+	} );
+
 	describe( 'blockListSettings', () => {
 		it( 'should add new settings', () => {
 			const original = deepFreeze( {} );
@@ -3440,4 +3484,64 @@ describe( 'state', () => {
 			expect( state ).toBe( null );
 		} );
 	} );
+
+	describe( 'expandedBlock', () => {
+		it( 'should return null by default', () => {
+			expect( expandedBlock( undefined, {} ) ).toBe( null );
+		} );
+
+		it( 'should set client id for expanded block', () => {
+			const state = expandedBlock( null, {
+				type: 'SET_BLOCK_EXPANDED_IN_LIST_VIEW',
+				clientId: '14501cc2-90a6-4f52-aa36-ab6e896135d1',
+			} );
+			expect( state ).toBe( '14501cc2-90a6-4f52-aa36-ab6e896135d1' );
+		} );
+
+		it( 'should clear the state when a block is selected', () => {
+			const state = expandedBlock(
+				'14501cc2-90a6-4f52-aa36-ab6e896135d1',
+				{
+					type: 'SELECT_BLOCK',
+					clientId: 'a-different-block',
+				}
+			);
+			expect( state ).toBe( null );
+		} );
+	} );
+
+	describe( 'insertionPoint', () => {
+		it( 'should default to null', () => {
+			const state = insertionPoint( undefined, {} );
+
+			expect( state ).toBe( null );
+		} );
+
+		it( 'should set insertion point', () => {
+			const state = insertionPoint( null, {
+				type: 'SET_INSERTION_POINT',
+				value: {
+					rootClientId: 'clientId1',
+					index: 4,
+				},
+			} );
+
+			expect( state ).toEqual( {
+				rootClientId: 'clientId1',
+				index: 4,
+			} );
+		} );
+
+		it( 'should clear the insertion point on block selection', () => {
+			const original = deepFreeze( {
+				rootClientId: 'clientId1',
+				index: 4,
+			} );
+			const state = insertionPoint( original, {
+				type: 'SELECT_BLOCK',
+			} );
+
+			expect( state ).toBe( null );
+		} );
+	} );
 } );
diff --git a/packages/block-editor/src/store/test/registry-selectors.js b/packages/block-editor/src/store/test/registry-selectors.js
new file mode 100644
index 00000000000000..89115c75f05144
--- /dev/null
+++ b/packages/block-editor/src/store/test/registry-selectors.js
@@ -0,0 +1,431 @@
+/**
+ * WordPress dependencies
+ */
+import { registerBlockType, unregisterBlockType } from '@wordpress/blocks';
+import { select, dispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store } from '../';
+
+describe( 'selectors', () => {
+	beforeEach( () => {
+		registerBlockType( 'core/test-block-a', {
+			save: ( props ) => props.attributes.text,
+			category: 'design',
+			title: 'Test Block A',
+			icon: 'test',
+			keywords: [ 'testing' ],
+		} );
+
+		registerBlockType( 'core/test-block-b', {
+			save: ( props ) => props.attributes.text,
+			category: 'text',
+			title: 'Test Block B',
+			icon: 'test',
+			keywords: [ 'testing' ],
+			supports: {
+				multiple: false,
+			},
+		} );
+	} );
+
+	afterEach( async () => {
+		unregisterBlockType( 'core/test-block-a' );
+		unregisterBlockType( 'core/test-block-b' );
+	} );
+
+	describe( '__experimentalGetAllowedPatterns', () => {
+		beforeAll( async () => {
+			await dispatch( store ).resetBlocks( [
+				{
+					clientId: 'block1',
+					name: 'core/test-block-a',
+					innerBlocks: [],
+				},
+				{
+					clientId: 'block2',
+					name: 'core/test-block-b',
+					innerBlocks: [],
+				},
+			] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'pattern-a',
+						title: 'pattern with a',
+						content: `<!-- wp:test-block-a --><!-- /wp:test-block-a -->`,
+					},
+					{
+						name: 'pattern-b',
+						title: 'pattern with b',
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+					{
+						name: 'pattern-c',
+						title: 'pattern hidden from UI',
+						inserter: false,
+						content:
+							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
+					},
+				],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {
+				allowedBlocks: [ 'core/test-block-b' ],
+			} );
+		} );
+
+		afterAll( async () => {
+			await dispatch( store ).resetBlocks( [] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {} );
+		} );
+
+		it( 'should return all patterns for root level', () => {
+			expect(
+				select( store ).__experimentalGetAllowedPatterns( null )
+			).toHaveLength( 2 );
+		} );
+		it( 'should return patterns that consists of blocks allowed for the specified client ID', () => {
+			expect(
+				select( store ).__experimentalGetAllowedPatterns( 'block1' )
+			).toHaveLength( 1 );
+			expect(
+				select( store ).__experimentalGetAllowedPatterns( 'block2' )
+			).toHaveLength( 0 );
+		} );
+		it( 'should return empty array if only patterns hidden from UI exist', () => {
+			expect(
+				select( store ).__experimentalGetAllowedPatterns( {
+					blocks: { byClientId: new Map() },
+					blockListSettings: {},
+					settings: {
+						__experimentalBlockPatterns: [
+							{
+								name: 'pattern-c',
+								title: 'pattern hidden from UI',
+								inserter: false,
+								content:
+									'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
+							},
+						],
+					},
+				} )
+			).toHaveLength( 0 );
+		} );
+	} );
+
+	describe( '__experimentalGetParsedPattern', () => {
+		beforeAll( async () => {
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'pattern-a',
+						title: 'pattern with a',
+						content: `<!-- wp:test-block-a --><!-- /wp:test-block-a -->`,
+					},
+					{
+						name: 'pattern-hidden-from-ui',
+						title: 'pattern hidden from UI',
+						inserter: false,
+						content:
+							'<!-- wp:test-block-a --><!-- /wp:test-block-a --><!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+				],
+			} );
+		} );
+
+		afterAll( async () => {
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [],
+			} );
+		} );
+
+		it( 'should return proper results when pattern does not exist', () => {
+			expect(
+				select( store ).__experimentalGetParsedPattern( 'not there' )
+			).toBeNull();
+		} );
+		it( 'should return existing pattern properly parsed', () => {
+			const { name, blocks } =
+				select( store ).__experimentalGetParsedPattern( 'pattern-a' );
+			expect( name ).toEqual( 'pattern-a' );
+			expect( blocks ).toHaveLength( 1 );
+			expect( blocks[ 0 ] ).toEqual(
+				expect.objectContaining( {
+					name: 'core/test-block-a',
+				} )
+			);
+		} );
+		it( 'should return hidden from UI pattern when requested', () => {
+			const { name, blocks, inserter } = select(
+				store
+			).__experimentalGetParsedPattern( 'pattern-hidden-from-ui' );
+			expect( name ).toEqual( 'pattern-hidden-from-ui' );
+			expect( inserter ).toBeFalsy();
+			expect( blocks ).toHaveLength( 2 );
+			expect( blocks[ 0 ] ).toEqual(
+				expect.objectContaining( {
+					name: 'core/test-block-a',
+				} )
+			);
+		} );
+	} );
+
+	describe( 'getPatternsByBlockTypes', () => {
+		beforeAll( async () => {
+			await dispatch( store ).resetBlocks( [
+				{
+					clientId: 'block1',
+					name: 'core/test-block-a',
+					innerBlocks: [],
+				},
+			] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'pattern-a',
+						blockTypes: [ 'test/block-a' ],
+						title: 'pattern a',
+						content:
+							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
+					},
+					{
+						name: 'pattern-b',
+						blockTypes: [ 'test/block-b' ],
+						title: 'pattern b',
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+					{
+						title: 'pattern c',
+						blockTypes: [ 'test/block-a' ],
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+				],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {
+				allowedBlocks: [ 'core/test-block-b' ],
+			} );
+		} );
+
+		afterAll( async () => {
+			await dispatch( store ).resetBlocks( [] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {} );
+		} );
+
+		it( 'should return empty array if no block name is provided', () => {
+			expect( select( store ).getPatternsByBlockTypes() ).toEqual( [] );
+		} );
+		it( 'should return empty array if no match is found', () => {
+			const patterns = select( store ).getPatternsByBlockTypes(
+				'test/block-not-exists'
+			);
+			expect( patterns ).toEqual( [] );
+		} );
+		it( 'should return the same empty array in both empty array cases', () => {
+			const patterns1 = select( store ).getPatternsByBlockTypes();
+			const patterns2 = select( store ).getPatternsByBlockTypes(
+				'test/block-not-exists'
+			);
+			expect( patterns1 ).toBe( patterns2 );
+		} );
+		it( 'should return proper results when there are matched block patterns', () => {
+			const patterns =
+				select( store ).getPatternsByBlockTypes( 'test/block-a' );
+			expect( patterns ).toHaveLength( 2 );
+			expect( patterns ).toEqual(
+				expect.arrayContaining( [
+					expect.objectContaining( { title: 'pattern a' } ),
+					expect.objectContaining( { title: 'pattern c' } ),
+				] )
+			);
+		} );
+		it( 'should return proper result with matched patterns and allowed blocks from rootClientId', () => {
+			const patterns = select( store ).getPatternsByBlockTypes(
+				'test/block-a',
+				'block1'
+			);
+			expect( patterns ).toHaveLength( 1 );
+			expect( patterns[ 0 ] ).toEqual(
+				expect.objectContaining( { title: 'pattern c' } )
+			);
+		} );
+	} );
+
+	describe( '__experimentalGetPatternTransformItems', () => {
+		beforeAll( async () => {
+			await dispatch( store ).resetBlocks( [
+				{
+					clientId: 'block1',
+					name: 'core/test-block-a',
+					innerBlocks: [],
+				},
+				{
+					clientId: 'block2',
+					name: 'core/test-block-b',
+					innerBlocks: [],
+				},
+			] );
+			await dispatch( store ).setHasControlledInnerBlocks(
+				'block2-clientId',
+				true
+			);
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'pattern-a',
+						blockTypes: [ 'test/block-a' ],
+						title: 'pattern a',
+						content:
+							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
+					},
+					{
+						name: 'pattern-b',
+						blockTypes: [ 'test/block-b' ],
+						title: 'pattern b',
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+					{
+						name: 'pattern-c',
+						title: 'pattern c',
+						blockTypes: [ 'test/block-a' ],
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+					{
+						name: 'pattern-mix',
+						title: 'pattern mix',
+						blockTypes: [
+							'core/test-block-a',
+							'core/test-block-b',
+						],
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+				],
+			} );
+		} );
+
+		afterAll( async () => {
+			await dispatch( store ).resetBlocks( [] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {} );
+		} );
+
+		describe( 'should return empty array', () => {
+			it( 'when no blocks are selected', () => {
+				expect(
+					select( store ).__experimentalGetPatternTransformItems()
+				).toEqual( [] );
+			} );
+			it( 'when a selected block has inner blocks', () => {
+				const blocks = [
+					{ name: 'core/test-block-a', innerBlocks: [] },
+					{
+						name: 'core/test-block-b',
+						innerBlocks: [ { name: 'some inner block' } ],
+					},
+				];
+				expect(
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					)
+				).toEqual( [] );
+			} );
+			it( 'when a selected block has controlled inner blocks', () => {
+				const blocks = [
+					{ name: 'core/test-block-a', innerBlocks: [] },
+					{
+						name: 'core/test-block-b',
+						clientId: 'block2-clientId',
+						innerBlocks: [],
+					},
+				];
+				expect(
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					)
+				).toEqual( [] );
+			} );
+			it( 'when no patterns are available based on the selected blocks', () => {
+				const blocks = [
+					{ name: 'block-with-no-patterns', innerBlocks: [] },
+				];
+				expect(
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					)
+				).toEqual( [] );
+			} );
+		} );
+		describe( 'should return proper results', () => {
+			it( 'when a single block is selected', () => {
+				const blocks = [
+					{ name: 'core/test-block-b', innerBlocks: [] },
+				];
+				const patterns =
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					);
+				expect( patterns ).toHaveLength( 1 );
+				expect( patterns[ 0 ] ).toEqual(
+					expect.objectContaining( {
+						name: 'pattern-mix',
+					} )
+				);
+			} );
+			it( 'when different multiple blocks are selected', () => {
+				const blocks = [
+					{ name: 'core/test-block-b', innerBlocks: [] },
+					{ name: 'test/block-b', innerBlocks: [] },
+					{ name: 'some other block', innerBlocks: [] },
+				];
+				const patterns =
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					);
+				expect( patterns ).toHaveLength( 2 );
+				expect( patterns ).toEqual(
+					expect.arrayContaining( [
+						expect.objectContaining( {
+							name: 'pattern-mix',
+						} ),
+						expect.objectContaining( {
+							name: 'pattern-b',
+						} ),
+					] )
+				);
+			} );
+			it( 'when multiple blocks are selected containing multiple times the same block', () => {
+				const blocks = [
+					{ name: 'core/test-block-b', innerBlocks: [] },
+					{ name: 'some other block', innerBlocks: [] },
+					{ name: 'core/test-block-a', innerBlocks: [] },
+					{ name: 'core/test-block-b', innerBlocks: [] },
+				];
+				const patterns =
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					);
+				expect( patterns ).toHaveLength( 1 );
+				expect( patterns[ 0 ] ).toEqual(
+					expect.objectContaining( {
+						name: 'pattern-mix',
+					} )
+				);
+			} );
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/store/test/selectors.js b/packages/block-editor/src/store/test/selectors.js
index 5046b6e5b83d68..00aa085f667093 100644
--- a/packages/block-editor/src/store/test/selectors.js
+++ b/packages/block-editor/src/store/test/selectors.js
@@ -8,11 +8,16 @@ import {
 } from '@wordpress/blocks';
 import { RawHTML } from '@wordpress/element';
 import { symbol } from '@wordpress/icons';
+import { select, dispatch } from '@wordpress/data';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
  */
 import * as selectors from '../selectors';
+import { store } from '../';
+import { sectionRootClientIdKey } from '../private-keys';
+import { lock } from '../../lock-unlock';
 
 const {
 	getBlockName,
@@ -55,7 +60,6 @@ const {
 	isSelectionEnabled,
 	canInsertBlockType,
 	canInsertBlocks,
-	getInserterItems,
 	getBlockTransformItems,
 	isValidTemplate,
 	getTemplate,
@@ -65,14 +69,10 @@ const {
 	__experimentalGetLastBlockAttributeChanges,
 	getLowestCommonAncestorWithSelectedBlock,
 	__experimentalGetActiveBlockIdByBlockNames: getActiveBlockIdByBlockNames,
-	__experimentalGetAllowedPatterns,
-	__experimentalGetParsedPattern,
-	getPatternsByBlockTypes,
 	__unstableGetClientIdWithClientIdsTree,
 	__unstableGetClientIdsTree,
-	__experimentalGetPatternTransformItems,
 	wasBlockJustInserted,
-	__experimentalGetGlobalBlocksByName,
+	getBlocksByName,
 	getBlockEditingMode,
 } = selectors;
 
@@ -975,7 +975,7 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( '__experimentalGetGlobalBlocksByName', () => {
+	describe( 'getBlocksByName', () => {
 		const state = {
 			blocks: {
 				byClientId: new Map(
@@ -1017,31 +1017,25 @@ describe( 'selectors', () => {
 		};
 
 		it( 'should return the clientIds of blocks of a given type', () => {
-			expect(
-				__experimentalGetGlobalBlocksByName( state, 'core/heading' )
-			).toStrictEqual( [ '123' ] );
+			expect( getBlocksByName( state, 'core/heading' ) ).toStrictEqual( [
+				'123',
+			] );
 		} );
 
 		it( 'should return the clientIds of blocks of a given type even if blocks are nested', () => {
-			expect(
-				__experimentalGetGlobalBlocksByName( state, 'core/paragraph' )
-			).toStrictEqual( [ '456', '1415', '1213' ] );
+			expect( getBlocksByName( state, 'core/paragraph' ) ).toStrictEqual(
+				[ '456', '1415', '1213' ]
+			);
 		} );
 
 		it( 'Should return empty array if no blocks match. The empty array should be the same reference', () => {
-			const result = __experimentalGetGlobalBlocksByName(
-				state,
-				'test/missing'
+			const result = getBlocksByName( state, 'test/missing' );
+			expect( getBlocksByName( state, 'test/missing' ) ).toStrictEqual(
+				[]
+			);
+			expect( getBlocksByName( state, 'test/missing2' ) === result ).toBe(
+				true
 			);
-			expect(
-				__experimentalGetGlobalBlocksByName( state, 'test/missing' )
-			).toStrictEqual( [] );
-			expect(
-				__experimentalGetGlobalBlocksByName(
-					state,
-					'test/missing2'
-				) === result
-			).toBe( true );
 		} );
 	} );
 
@@ -2432,7 +2426,7 @@ describe( 'selectors', () => {
 						} )
 					),
 				},
-				insertionPoint: {
+				insertionCue: {
 					rootClientId: undefined,
 					index: 0,
 				},
@@ -2473,7 +2467,7 @@ describe( 'selectors', () => {
 						} )
 					),
 				},
-				insertionPoint: null,
+				insertionCue: null,
 			};
 
 			expect( getBlockInsertionPoint( state ) ).toEqual( {
@@ -2511,7 +2505,7 @@ describe( 'selectors', () => {
 						} )
 					),
 				},
-				insertionPoint: null,
+				insertionCue: null,
 			};
 
 			const insertionPoint1 = getBlockInsertionPoint( state );
@@ -2553,7 +2547,7 @@ describe( 'selectors', () => {
 						} )
 					),
 				},
-				insertionPoint: null,
+				insertionCue: null,
 			};
 
 			expect( getBlockInsertionPoint( state ) ).toEqual( {
@@ -2595,7 +2589,7 @@ describe( 'selectors', () => {
 						} )
 					),
 				},
-				insertionPoint: null,
+				insertionCue: null,
 			};
 
 			expect( getBlockInsertionPoint( state ) ).toEqual( {
@@ -2637,7 +2631,7 @@ describe( 'selectors', () => {
 						} )
 					),
 				},
-				insertionPoint: null,
+				insertionCue: null,
 			};
 
 			expect( getBlockInsertionPoint( state ) ).toEqual( {
@@ -2650,7 +2644,7 @@ describe( 'selectors', () => {
 	describe( 'isBlockInsertionPointVisible', () => {
 		it( 'should return false if no assigned insertion point', () => {
 			const state = {
-				insertionPoint: null,
+				insertionCue: null,
 			};
 
 			expect( isBlockInsertionPointVisible( state ) ).toBe( false );
@@ -2658,7 +2652,7 @@ describe( 'selectors', () => {
 
 		it( 'should return true if assigned insertion point', () => {
 			const state = {
-				insertionPoint: {
+				insertionCue: {
 					rootClientId: undefined,
 					index: 5,
 				},
@@ -2703,6 +2697,7 @@ describe( 'selectors', () => {
 					byClientId: new Map(),
 					attributes: new Map(),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {},
 				settings: {
@@ -2720,6 +2715,7 @@ describe( 'selectors', () => {
 				blocks: {
 					byClientId: new Map(),
 					attributes: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {},
 				settings: {
@@ -2737,6 +2733,7 @@ describe( 'selectors', () => {
 					byClientId: new Map(),
 					attributes: new Map(),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {},
 				settings: {},
@@ -2757,6 +2754,7 @@ describe( 'selectors', () => {
 					byClientId: new Map(),
 					attributes: new Map(),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {},
 				settings: {},
@@ -2781,6 +2779,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {},
 				settings: {},
@@ -2805,6 +2804,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {
 					block1: {},
@@ -2831,6 +2831,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {
 					block1: {},
@@ -2857,6 +2858,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {
 					block1: {
@@ -2885,6 +2887,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {
 					block1: {
@@ -2913,6 +2916,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {},
 				settings: {},
@@ -2941,6 +2945,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {
 					block1: {
@@ -2969,6 +2974,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {},
 				settings: {},
@@ -2985,6 +2991,7 @@ describe( 'selectors', () => {
 					byClientId: new Map(),
 					attributes: new Map(),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {},
 				settings: {},
@@ -3001,7 +3008,7 @@ describe( 'selectors', () => {
 					byClientId: new Map(
 						Object.entries( {
 							block1: { name: 'core/test-block-ancestor' },
-							block2: { name: 'core/block' },
+							block2: { name: 'core/block1' },
 						} )
 					),
 					attributes: new Map(
@@ -3015,6 +3022,10 @@ describe( 'selectors', () => {
 							block2: 'block1',
 						} )
 					),
+					order: new Map( [
+						[ '', [ 'block1' ] ],
+						[ 'block1', [ 'block2' ] ],
+					] ),
 				},
 				blockListSettings: {
 					block1: {},
@@ -3032,6 +3043,37 @@ describe( 'selectors', () => {
 			).toBe( true );
 		} );
 
+		it( 'should prevent blocks from being inserted within sections', () => {
+			const state = {
+				blocks: {
+					byClientId: new Map(
+						Object.entries( {
+							block1: { name: 'core/block' }, // reusable blocks are always sections.
+						} )
+					),
+					attributes: new Map(
+						Object.entries( {
+							block1: {},
+						} )
+					),
+					parents: new Map(
+						Object.entries( {
+							block1: '',
+						} )
+					),
+					order: new Map( [ [ '', [ 'block1' ] ] ] ),
+				},
+				blockListSettings: {
+					block1: {},
+				},
+				settings: {},
+				blockEditingModes: new Map(),
+			};
+			expect(
+				canInsertBlockType( state, 'core/test-block-a', 'block1' )
+			).toBe( false );
+		} );
+
 		it( 'should allow blocks to be inserted if both parent and ancestor restrictions are met', () => {
 			const state = {
 				blocks: {
@@ -3055,6 +3097,11 @@ describe( 'selectors', () => {
 							block3: 'block2',
 						} )
 					),
+					order: new Map( [
+						[ '', [ 'block1' ] ],
+						[ 'block1', [ 'block2' ] ],
+						[ 'block2', [ 'block3' ] ],
+					] ),
 				},
 				blockListSettings: {
 					block1: {},
@@ -3095,6 +3142,11 @@ describe( 'selectors', () => {
 							block3: 'block2',
 						} )
 					),
+					order: new Map( [
+						[ '', [ 'block1' ] ],
+						[ 'block1', [ 'block2' ] ],
+						[ 'block2', [ 'block3' ] ],
+					] ),
 				},
 				blockListSettings: {
 					block1: {},
@@ -3135,6 +3187,11 @@ describe( 'selectors', () => {
 							block3: 'block2',
 						} )
 					),
+					order: new Map( [
+						[ '', [ 'block1' ] ],
+						[ 'block1', [ 'block2' ] ],
+						[ 'block2', [ 'block3' ] ],
+					] ),
 				},
 				blockListSettings: {
 					block1: {},
@@ -3168,11 +3225,14 @@ describe( 'selectors', () => {
 							block2: {},
 						} )
 					),
-					parents: new Map(
-						Object.entries( {
-							block2: 'block1',
-						} )
-					),
+					order: new Map( [
+						[ '', [ 'block1' ] ],
+						[ 'block1', [ 'block2' ] ],
+					] ),
+					parents: new Map( [
+						[ 'block2', 'block1' ],
+						[ 'block1', '' ],
+					] ),
 				},
 				blockListSettings: {
 					block1: {},
@@ -3212,6 +3272,10 @@ describe( 'selectors', () => {
 							block2: 'block1',
 						} )
 					),
+					order: new Map( [
+						[ '', [ 'block1' ] ],
+						[ 'block1', [ 'block2' ] ],
+					] ),
 				},
 				blockListSettings: {
 					block1: {},
@@ -3249,6 +3313,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {
 					1: {
@@ -3282,6 +3347,7 @@ describe( 'selectors', () => {
 						} )
 					),
 					parents: new Map(),
+					order: new Map(),
 				},
 				blockListSettings: {
 					1: {
@@ -3296,41 +3362,26 @@ describe( 'selectors', () => {
 	} );
 
 	describe( 'getInserterItems', () => {
-		it( 'should properly list block type and reusable block items', () => {
-			const state = {
-				blocks: {
-					byClientId: new Map(),
-					attributes: new Map(),
-					order: new Map(),
-					parents: new Map(),
-					tree: new Map(
-						Object.entries( {
-							'': {
-								innerBlocks: [],
-							},
-						} )
-					),
-				},
-				settings: {
-					__experimentalReusableBlocks: [
-						{
-							id: 1,
-							isTemporary: false,
-							clientId: 'block1',
-							title: { raw: 'Reusable Block 1' },
-							content: { raw: '<!-- /wp:test-block-a -->' },
-						},
-					],
-				},
-				// Intentionally include a test case which considers
-				// `insertUsage` as not present within preferences.
-				//
-				// See: https://github.com/WordPress/gutenberg/issues/14580
-				preferences: {},
-				blockListSettings: {},
-				blockEditingModes: new Map(),
-			};
-			const items = getInserterItems( state );
+		afterAll( async () => {
+			await dispatch( store ).updateSettings( {
+				__experimentalReusableBlocks: [],
+			} );
+			await dispatch( store ).resetBlocks( [] );
+		} );
+
+		it( 'should properly list block type and reusable block items', async () => {
+			await dispatch( store ).updateSettings( {
+				__experimentalReusableBlocks: [
+					{
+						id: 1,
+						isTemporary: false,
+						clientId: 'block1',
+						title: { raw: 'Reusable Block 1' },
+						content: { raw: '<!-- /wp:test-block-a -->' },
+					},
+				],
+			} );
+			const items = select( store ).getInserterItems();
 			const testBlockAItem = items.find(
 				( item ) => item.id === 'core/test-block-a'
 			);
@@ -3371,93 +3422,48 @@ describe( 'selectors', () => {
 			} );
 		} );
 
-		it( 'should correctly cache the return values', () => {
-			const state = {
-				blocks: {
-					byClientId: new Map(
-						Object.entries( {
-							block3: { name: 'core/test-block-a' },
-							block4: { name: 'core/test-block-a' },
-						} )
-					),
-					attributes: new Map(
-						Object.entries( {
-							block3: {},
-							block4: {},
-						} )
-					),
-					order: new Map(
-						Object.entries( {
-							'': [ 'block3', 'block4' ],
-						} )
-					),
-					parents: new Map(
-						Object.entries( {
-							block3: '',
-							block4: '',
-						} )
-					),
-					tree: new Map(
-						Object.entries( {
-							block3: {
-								clientId: 'block3',
-								name: 'core/test-block-a',
-								attributes: {},
-								innerBlocks: [],
-							},
-							block4: {
-								clientId: 'block4',
-								name: 'core/test-block-a',
-								attributes: {},
-								innerBlocks: [],
-							},
-						} )
-					),
-					controlledInnerBlocks: {},
-				},
-				settings: {
-					__experimentalReusableBlocks: [
-						{
-							id: 1,
-							isTemporary: false,
-							clientId: 'block1',
-							title: { raw: 'Reusable Block 1' },
-							content: { raw: '<!-- /wp:test-block-a -->' },
-						},
-						{
-							id: 2,
-							isTemporary: false,
-							clientId: 'block2',
-							title: { raw: 'Reusable Block 2' },
-							content: { raw: '<!-- /wp:test-block-b -->' },
-						},
-					],
-				},
-				preferences: {
-					insertUsage: {},
-				},
-				blockListSettings: {
-					block3: {},
-					block4: {},
-				},
-				blockEditingModes: new Map(),
-			};
-
-			const stateSecondBlockRestricted = {
-				...state,
-				blockListSettings: {
-					...state.blockListSettings,
-					block4: {
-						allowedBlocks: [ 'core/test-block-b' ],
+		it( 'should correctly cache the return values', async () => {
+			await dispatch( store ).updateSettings( {
+				__experimentalReusableBlocks: [
+					{
+						id: 1,
+						isTemporary: false,
+						clientId: 'block1',
+						title: { raw: 'Reusable Block 1' },
+						content: { raw: '<!-- /wp:test-block-a -->' },
 					},
+					{
+						id: 2,
+						isTemporary: false,
+						clientId: 'block2',
+						title: { raw: 'Reusable Block 2' },
+						content: { raw: '<!-- /wp:test-block-b -->' },
+					},
+				],
+			} );
+			await dispatch( store ).resetBlocks( [
+				{
+					clientId: 'block3',
+					name: 'core/test-block-a',
+					innerBlocks: [],
 				},
-			};
+				{
+					clientId: 'block4',
+					name: 'core/test-block-a',
+					innerBlocks: [],
+				},
+			] );
+			await dispatch( store ).updateBlockListSettings( 'block3', {} );
+			await dispatch( store ).updateBlockListSettings( 'block4', {} );
 
-			const firstBlockFirstCall = getInserterItems( state, 'block3' );
-			const firstBlockSecondCall = getInserterItems(
-				stateSecondBlockRestricted,
-				'block3'
-			);
+			const firstBlockFirstCall =
+				select( store ).getInserterItems( 'block3' );
+			await dispatch( store ).updateBlockListSettings( 'block4', {
+				allowedBlocks: [ 'core/test-block-b' ],
+			} );
+			const firstBlockSecondCall =
+				select( store ).getInserterItems( 'block3' );
+			await dispatch( store ).updateBlockListSettings( 'block4', {} );
 			expect( firstBlockFirstCall ).toBe( firstBlockSecondCall );
 			expect( firstBlockFirstCall.map( ( item ) => item.id ) ).toEqual( [
 				'core/test-block-a',
@@ -3469,11 +3475,14 @@ describe( 'selectors', () => {
 				'core/block/2',
 			] );
 
-			const secondBlockFirstCall = getInserterItems( state, 'block4' );
-			const secondBlockSecondCall = getInserterItems(
-				stateSecondBlockRestricted,
-				'block4'
-			);
+			const secondBlockFirstCall =
+				select( store ).getInserterItems( 'block4' );
+			await dispatch( store ).updateBlockListSettings( 'block4', {
+				allowedBlocks: [ 'core/test-block-b' ],
+			} );
+			const secondBlockSecondCall =
+				select( store ).getInserterItems( 'block4' );
+			await dispatch( store ).updateBlockListSettings( 'block4', {} );
 			expect( secondBlockFirstCall ).not.toBe( secondBlockSecondCall );
 			expect( secondBlockFirstCall.map( ( item ) => item.id ) ).toEqual( [
 				'core/test-block-a',
@@ -3489,77 +3498,37 @@ describe( 'selectors', () => {
 			);
 		} );
 
-		it( 'should set isDisabled when a block with `multiple: false` has been used', () => {
-			const state = {
-				blocks: {
-					byClientId: new Map(
-						Object.entries( {
-							block1: {
-								clientId: 'block1',
-								name: 'core/test-block-b',
-							},
-						} )
-					),
-					attributes: new Map(
-						Object.entries( {
-							block1: { attribute: {} },
-						} )
-					),
-					order: new Map(
-						Object.entries( {
-							'': [ 'block1' ],
-						} )
-					),
-					tree: new Map(
-						Object.entries( {
-							block1: {
-								clientId: 'block1',
-								name: 'core/test-block-b',
-								attributes: {},
-								innerBlocks: [],
-							},
-						} )
-					),
-					controlledInnerBlocks: {},
-					parents: new Map(),
-				},
-				preferences: {
-					insertUsage: {},
+		it( 'should set isDisabled when a block with `multiple: false` has been used', async () => {
+			await dispatch( store ).resetBlocks( [
+				{
+					clientId: 'block1',
+					name: 'core/test-block-b',
+					innerBlocks: [],
 				},
-				blockListSettings: {},
-				settings: {},
-				blockEditingModes: new Map(),
-			};
-			const items = getInserterItems( state );
+			] );
+			const items = select( store ).getInserterItems();
 			const testBlockBItem = items.find(
 				( item ) => item.id === 'core/test-block-b'
 			);
 			expect( testBlockBItem.isDisabled ).toBe( true );
 		} );
 
-		it( 'should set a frecency', () => {
-			const state = {
-				blocks: {
-					byClientId: new Map(),
-					attributes: new Map(),
-					order: new Map(),
-					parents: new Map(),
-					cache: {},
-				},
-				preferences: {
-					insertUsage: {
-						'core/test-block-b': { count: 10, time: 1000 },
+		it( 'should set a frecency', async () => {
+			for ( let i = 0; i < 10; i++ ) {
+				await dispatch( store ).insertBlocks( [
+					{
+						clientId: 'block1',
+						name: 'core/test-block-b',
+						innerBlocks: [],
 					},
-				},
-				blockListSettings: {},
-				settings: {},
-				blockEditingModes: new Map(),
-			};
-			const items = getInserterItems( state );
+				] );
+			}
+
+			const items = select( store ).getInserterItems();
 			const reusableBlock2Item = items.find(
 				( item ) => item.id === 'core/test-block-b'
 			);
-			expect( reusableBlock2Item.frecency ).toBe( 2.5 );
+			expect( reusableBlock2Item.frecency ).toBe( 40 );
 		} );
 	} );
 
@@ -4205,382 +4174,6 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( '__experimentalGetAllowedPatterns', () => {
-		const state = {
-			blocks: {
-				byClientId: new Map(
-					Object.entries( {
-						block1: { name: 'core/test-block-a' },
-						block2: { name: 'core/test-block-b' },
-					} )
-				),
-				attributes: new Map(
-					Object.entries( {
-						block1: {},
-						block2: {},
-					} )
-				),
-				parents: new Map(
-					Object.entries( {
-						block1: '',
-						block2: '',
-					} )
-				),
-			},
-			blockListSettings: {
-				block1: {
-					allowedBlocks: [ 'core/test-block-b' ],
-				},
-				block2: {
-					allowedBlocks: [],
-				},
-			},
-			settings: {
-				__experimentalBlockPatterns: [
-					{
-						name: 'pattern-a',
-						title: 'pattern with a',
-						content: `<!-- wp:test-block-a --><!-- /wp:test-block-a -->`,
-					},
-					{
-						name: 'pattern-b',
-						title: 'pattern with b',
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-					{
-						name: 'pattern-c',
-						title: 'pattern hidden from UI',
-						inserter: false,
-						content:
-							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
-					},
-				],
-			},
-			blockEditingModes: new Map(),
-		};
-
-		it( 'should return all patterns for root level', () => {
-			expect(
-				__experimentalGetAllowedPatterns( state, null )
-			).toHaveLength( 2 );
-		} );
-
-		it( 'should return patterns that consists of blocks allowed for the specified client ID', () => {
-			expect(
-				__experimentalGetAllowedPatterns( state, 'block1' )
-			).toHaveLength( 1 );
-
-			expect(
-				__experimentalGetAllowedPatterns( state, 'block2' )
-			).toHaveLength( 0 );
-		} );
-		it( 'should return empty array if only patterns hidden from UI exist', () => {
-			expect(
-				__experimentalGetAllowedPatterns( {
-					blocks: { byClientId: new Map() },
-					blockListSettings: {},
-					settings: {
-						__experimentalBlockPatterns: [
-							{
-								name: 'pattern-c',
-								title: 'pattern hidden from UI',
-								inserter: false,
-								content:
-									'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
-							},
-						],
-					},
-				} )
-			).toHaveLength( 0 );
-		} );
-	} );
-	describe( '__experimentalGetParsedPattern', () => {
-		const state = {
-			settings: {
-				__experimentalBlockPatterns: [
-					{
-						name: 'pattern-a',
-						title: 'pattern with a',
-						content: `<!-- wp:test-block-a --><!-- /wp:test-block-a -->`,
-					},
-					{
-						name: 'pattern-hidden-from-ui',
-						title: 'pattern hidden from UI',
-						inserter: false,
-						content:
-							'<!-- wp:test-block-a --><!-- /wp:test-block-a --><!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-				],
-			},
-		};
-		it( 'should return proper results when pattern does not exist', () => {
-			expect(
-				__experimentalGetParsedPattern( state, 'not there' )
-			).toBeNull();
-		} );
-		it( 'should return existing pattern properly parsed', () => {
-			const { name, blocks } = __experimentalGetParsedPattern(
-				state,
-				'pattern-a'
-			);
-			expect( name ).toEqual( 'pattern-a' );
-			expect( blocks ).toHaveLength( 1 );
-			expect( blocks[ 0 ] ).toEqual(
-				expect.objectContaining( {
-					name: 'core/test-block-a',
-				} )
-			);
-		} );
-		it( 'should return hidden from UI pattern when requested', () => {
-			const { name, blocks, inserter } = __experimentalGetParsedPattern(
-				state,
-				'pattern-hidden-from-ui'
-			);
-			expect( name ).toEqual( 'pattern-hidden-from-ui' );
-			expect( inserter ).toBeFalsy();
-			expect( blocks ).toHaveLength( 2 );
-			expect( blocks[ 0 ] ).toEqual(
-				expect.objectContaining( {
-					name: 'core/test-block-a',
-				} )
-			);
-		} );
-	} );
-	describe( 'getPatternsByBlockTypes', () => {
-		const state = {
-			blocks: {
-				byClientId: new Map(
-					Object.entries( {
-						block1: { name: 'core/test-block-a' },
-					} )
-				),
-				parents: new Map(),
-			},
-			blockListSettings: {
-				block1: {
-					allowedBlocks: [ 'core/test-block-b' ],
-				},
-			},
-			settings: {
-				__experimentalBlockPatterns: [
-					{
-						name: 'pattern-a',
-						blockTypes: [ 'test/block-a' ],
-						title: 'pattern a',
-						content:
-							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
-					},
-					{
-						name: 'pattern-b',
-						blockTypes: [ 'test/block-b' ],
-						title: 'pattern b',
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-					{
-						title: 'pattern c',
-						blockTypes: [ 'test/block-a' ],
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-				],
-			},
-			blockEditingModes: new Map(),
-		};
-		it( 'should return empty array if no block name is provided', () => {
-			expect( getPatternsByBlockTypes( state ) ).toEqual( [] );
-		} );
-		it( 'should return empty array if no match is found', () => {
-			const patterns = getPatternsByBlockTypes(
-				state,
-				'test/block-not-exists'
-			);
-			expect( patterns ).toEqual( [] );
-		} );
-		it( 'should return the same empty array in both empty array cases', () => {
-			const patterns1 = getPatternsByBlockTypes( state );
-			const patterns2 = getPatternsByBlockTypes(
-				state,
-				'test/block-not-exists'
-			);
-			expect( patterns1 ).toBe( patterns2 );
-		} );
-		it( 'should return proper results when there are matched block patterns', () => {
-			const patterns = getPatternsByBlockTypes( state, 'test/block-a' );
-			expect( patterns ).toHaveLength( 2 );
-			expect( patterns ).toEqual(
-				expect.arrayContaining( [
-					expect.objectContaining( { title: 'pattern a' } ),
-					expect.objectContaining( { title: 'pattern c' } ),
-				] )
-			);
-		} );
-		it( 'should return proper result with matched patterns and allowed blocks from rootClientId', () => {
-			const patterns = getPatternsByBlockTypes(
-				state,
-				'test/block-a',
-				'block1'
-			);
-			expect( patterns ).toHaveLength( 1 );
-			expect( patterns[ 0 ] ).toEqual(
-				expect.objectContaining( { title: 'pattern c' } )
-			);
-		} );
-	} );
-	describe( '__experimentalGetPatternTransformItems', () => {
-		const state = {
-			blocks: {
-				byClientId: new Map(
-					Object.entries( {
-						block1: { name: 'core/test-block-a' },
-						block2: { name: 'core/test-block-b' },
-					} )
-				),
-				parents: new Map(),
-				controlledInnerBlocks: { 'block2-clientId': true },
-			},
-			blockListSettings: {
-				block1: {
-					allowedBlocks: [ 'core/test-block-b' ],
-				},
-			},
-			settings: {
-				__experimentalBlockPatterns: [
-					{
-						name: 'pattern-a',
-						blockTypes: [ 'test/block-a' ],
-						title: 'pattern a',
-						content:
-							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
-					},
-					{
-						name: 'pattern-b',
-						blockTypes: [ 'test/block-b' ],
-						title: 'pattern b',
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-					{
-						name: 'pattern-c',
-						title: 'pattern c',
-						blockTypes: [ 'test/block-a' ],
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-					{
-						name: 'pattern-mix',
-						title: 'pattern mix',
-						blockTypes: [
-							'core/test-block-a',
-							'core/test-block-b',
-						],
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-				],
-			},
-			blockEditingModes: new Map(),
-		};
-		describe( 'should return empty array', () => {
-			it( 'when no blocks are selected', () => {
-				expect(
-					__experimentalGetPatternTransformItems( state )
-				).toEqual( [] );
-			} );
-			it( 'when a selected block has inner blocks', () => {
-				const blocks = [
-					{ name: 'core/test-block-a', innerBlocks: [] },
-					{
-						name: 'core/test-block-b',
-						innerBlocks: [ { name: 'some inner block' } ],
-					},
-				];
-				expect(
-					__experimentalGetPatternTransformItems( state, blocks )
-				).toEqual( [] );
-			} );
-			it( 'when a selected block has controlled inner blocks', () => {
-				const blocks = [
-					{ name: 'core/test-block-a', innerBlocks: [] },
-					{
-						name: 'core/test-block-b',
-						clientId: 'block2-clientId',
-						innerBlocks: [],
-					},
-				];
-				expect(
-					__experimentalGetPatternTransformItems( state, blocks )
-				).toEqual( [] );
-			} );
-			it( 'when no patterns are available based on the selected blocks', () => {
-				const blocks = [
-					{ name: 'block-with-no-patterns', innerBlocks: [] },
-				];
-				expect(
-					__experimentalGetPatternTransformItems( state, blocks )
-				).toEqual( [] );
-			} );
-		} );
-		describe( 'should return proper results', () => {
-			it( 'when a single block is selected', () => {
-				const blocks = [
-					{ name: 'core/test-block-b', innerBlocks: [] },
-				];
-				const patterns = __experimentalGetPatternTransformItems(
-					state,
-					blocks
-				);
-				expect( patterns ).toHaveLength( 1 );
-				expect( patterns[ 0 ] ).toEqual(
-					expect.objectContaining( {
-						name: 'pattern-mix',
-					} )
-				);
-			} );
-			it( 'when different multiple blocks are selected', () => {
-				const blocks = [
-					{ name: 'core/test-block-b', innerBlocks: [] },
-					{ name: 'test/block-b', innerBlocks: [] },
-					{ name: 'some other block', innerBlocks: [] },
-				];
-				const patterns = __experimentalGetPatternTransformItems(
-					state,
-					blocks
-				);
-				expect( patterns ).toHaveLength( 2 );
-				expect( patterns ).toEqual(
-					expect.arrayContaining( [
-						expect.objectContaining( {
-							name: 'pattern-mix',
-						} ),
-						expect.objectContaining( {
-							name: 'pattern-b',
-						} ),
-					] )
-				);
-			} );
-			it( 'when multiple blocks are selected containing multiple times the same block', () => {
-				const blocks = [
-					{ name: 'core/test-block-b', innerBlocks: [] },
-					{ name: 'some other block', innerBlocks: [] },
-					{ name: 'core/test-block-a', innerBlocks: [] },
-					{ name: 'core/test-block-b', innerBlocks: [] },
-				];
-				const patterns = __experimentalGetPatternTransformItems(
-					state,
-					blocks
-				);
-				expect( patterns ).toHaveLength( 1 );
-				expect( patterns[ 0 ] ).toEqual(
-					expect.objectContaining( {
-						name: 'pattern-mix',
-					} )
-				);
-			} );
-		} );
-	} );
-
 	describe( 'wasBlockJustInserted', () => {
 		it( 'should return true if the client id passed to wasBlockJustInserted is found within the state', () => {
 			const expectedClientId = '62bfef6e-d5e9-43ba-b7f9-c77cf354141f';
@@ -4690,20 +4283,7 @@ describe( 'getInserterItems with core blocks prioritization', () => {
 		].forEach( unregisterBlockType );
 	} );
 	it( 'should prioritize core blocks by sorting them at the top of the returned list', () => {
-		const state = {
-			blocks: {
-				byClientId: new Map(),
-				attributes: new Map(),
-				order: new Map(),
-				parents: new Map(),
-				cache: {},
-			},
-			settings: {},
-			preferences: {},
-			blockListSettings: {},
-			blockEditingModes: new Map(),
-		};
-		const items = getInserterItems( state );
+		const items = select( store ).getInserterItems();
 		const expectedResult = [
 			'core/block',
 			'core/test-block-a',
@@ -4805,12 +4385,28 @@ describe( 'getBlockEditingMode', () => {
 		settings: {},
 		blocks: {
 			byClientId: new Map( [
-				[ '6cf70164-9097-4460-bcbf-200560546988', {} ], // Header
-				[ 'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337', {} ], // Group
-				[ 'b26fc763-417d-4f01-b81c-2ec61e14a972', {} ], // |  Post Title
-				[ '9b9c5c3f-2e46-4f02-9e14-9fe9515b958f', {} ], // |  Post Content
-				[ 'b3247f75-fd94-4fef-97f9-5bfd162cc416', {} ], // | |  Paragraph
-				[ 'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c', {} ], // | |  Paragraph
+				[
+					'6cf70164-9097-4460-bcbf-200560546988',
+					{ name: 'core/template-part' },
+				], // Header
+				[
+					'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337',
+					{ name: 'core/group' },
+				], // Group
+				[
+					'b26fc763-417d-4f01-b81c-2ec61e14a972',
+					{ name: 'core/post-title' },
+				], // |  Post Title
+				[
+					'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f',
+					{ name: 'core/group' },
+				], // |  Group
+				[ 'b3247f75-fd94-4fef-97f9-5bfd162cc416', { name: 'core/p' } ], // | |  Paragraph
+				[ 'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c', { name: 'core/p' } ], // | |  Paragraph
+				[
+					'9b9c5c3f-2e46-4f02-9e14-9fed515b958s',
+					{ name: 'core/group' },
+				], // | | Group
 			] ),
 			order: new Map( [
 				[
@@ -4834,10 +4430,12 @@ describe( 'getBlockEditingMode', () => {
 					[
 						'b3247f75-fd94-4fef-97f9-5bfd162cc416',
 						'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c',
+						'9b9c5c3f-2e46-4f02-9e14-9fed515b958s',
 					],
 				],
 				[ 'b3247f75-fd94-4fef-97f9-5bfd162cc416', [] ],
 				[ 'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c', [] ],
+				[ '9b9c5c3f-2e46-4f02-9e14-9fed515b958s', [] ],
 			] ),
 			parents: new Map( [
 				[ '6cf70164-9097-4460-bcbf-200560546988', '' ],
@@ -4858,6 +4456,10 @@ describe( 'getBlockEditingMode', () => {
 					'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c',
 					'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f',
 				],
+				[
+					'9b9c5c3f-2e46-4f02-9e14-9fed515b958s',
+					'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f',
+				],
 			] ),
 		},
 		blockListSettings: {
@@ -4867,13 +4469,29 @@ describe( 'getBlockEditingMode', () => {
 		blockEditingModes: new Map( [] ),
 	};
 
-	const __experimentalHasContentRoleAttribute = jest.fn( () => false );
+	const navigationModeStateWithRootSection = {
+		...baseState,
+		settings: {
+			[ sectionRootClientIdKey ]: 'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337', // The group is the "main" container
+		},
+	};
+
+	const hasContentRoleAttribute = jest.fn( () => false );
+
+	const fauxPrivateAPIs = {};
+
+	lock( fauxPrivateAPIs, {
+		hasContentRoleAttribute,
+	} );
+
 	getBlockEditingMode.registry = {
-		select: jest.fn( () => ( {
-			__experimentalHasContentRoleAttribute,
-		} ) ),
+		select: jest.fn( () => fauxPrivateAPIs ),
 	};
 
+	afterEach( () => {
+		dispatch( preferencesStore ).set( 'core', 'editorTool', undefined );
+	} );
+
 	it( 'should return default by default', () => {
 		expect(
 			getBlockEditingMode(
@@ -4975,7 +4593,7 @@ describe( 'getBlockEditingMode', () => {
 				},
 			},
 		};
-		__experimentalHasContentRoleAttribute.mockReturnValueOnce( false );
+		hasContentRoleAttribute.mockReturnValueOnce( false );
 		expect(
 			getBlockEditingMode( state, 'b3247f75-fd94-4fef-97f9-5bfd162cc416' )
 		).toBe( 'disabled' );
@@ -4991,9 +4609,74 @@ describe( 'getBlockEditingMode', () => {
 				},
 			},
 		};
-		__experimentalHasContentRoleAttribute.mockReturnValueOnce( true );
+		hasContentRoleAttribute.mockReturnValueOnce( true );
 		expect(
 			getBlockEditingMode( state, 'b3247f75-fd94-4fef-97f9-5bfd162cc416' )
 		).toBe( 'contentOnly' );
 	} );
+
+	it( 'in navigation mode, the root section container is default', () => {
+		dispatch( preferencesStore ).set( 'core', 'editorTool', 'navigation' );
+		expect(
+			getBlockEditingMode(
+				navigationModeStateWithRootSection,
+				'ef45d5fd-5234-4fd5-ac4f-c3736c7f9337'
+			)
+		).toBe( 'default' );
+	} );
+
+	it( 'in navigation mode, anything outside the section container is disabled', () => {
+		dispatch( preferencesStore ).set( 'core', 'editorTool', 'navigation' );
+		expect(
+			getBlockEditingMode(
+				navigationModeStateWithRootSection,
+				'6cf70164-9097-4460-bcbf-200560546988'
+			)
+		).toBe( 'disabled' );
+	} );
+
+	it( 'in navigation mode, sections are contentOnly', () => {
+		dispatch( preferencesStore ).set( 'core', 'editorTool', 'navigation' );
+		expect(
+			getBlockEditingMode(
+				navigationModeStateWithRootSection,
+				'b26fc763-417d-4f01-b81c-2ec61e14a972'
+			)
+		).toBe( 'contentOnly' );
+		expect(
+			getBlockEditingMode(
+				navigationModeStateWithRootSection,
+				'9b9c5c3f-2e46-4f02-9e14-9fe9515b958f'
+			)
+		).toBe( 'contentOnly' );
+	} );
+
+	it( 'in navigation mode, blocks with content attributes within sections are contentOnly', () => {
+		dispatch( preferencesStore ).set( 'core', 'editorTool', 'navigation' );
+		hasContentRoleAttribute.mockReturnValueOnce( true );
+		expect(
+			getBlockEditingMode(
+				navigationModeStateWithRootSection,
+				'b3247f75-fd94-4fef-97f9-5bfd162cc416'
+			)
+		).toBe( 'contentOnly' );
+
+		hasContentRoleAttribute.mockReturnValueOnce( true );
+		expect(
+			getBlockEditingMode(
+				navigationModeStateWithRootSection,
+				'e178812d-ce5e-48c7-a945-8ae4ffcbbb7c'
+			)
+		).toBe( 'contentOnly' );
+	} );
+
+	it( 'in navigation mode, blocks without content attributes within sections are disabled', () => {
+		dispatch( preferencesStore ).set( 'core', 'editorTool', 'navigation' );
+		expect(
+			getBlockEditingMode(
+				navigationModeStateWithRootSection,
+				'9b9c5c3f-2e46-4f02-9e14-9fed515b958s'
+			)
+		).toBe( 'disabled' );
+	} );
 } );
diff --git a/packages/block-editor/src/store/utils.js b/packages/block-editor/src/store/utils.js
new file mode 100644
index 00000000000000..9b83a8f74cf9aa
--- /dev/null
+++ b/packages/block-editor/src/store/utils.js
@@ -0,0 +1,123 @@
+/**
+ * WordPress dependencies
+ */
+import { parse } from '@wordpress/blocks';
+import { parse as grammarParse } from '@wordpress/block-serialization-default-parser';
+
+/**
+ * Internal dependencies
+ */
+import { selectBlockPatternsKey } from './private-keys';
+import { unlock } from '../lock-unlock';
+import { STORE_NAME } from './constants';
+import { getSectionRootClientId } from './private-selectors';
+
+export const isFiltered = Symbol( 'isFiltered' );
+const parsedPatternCache = new WeakMap();
+const grammarMapCache = new WeakMap();
+
+function parsePattern( pattern ) {
+	const blocks = parse( pattern.content, {
+		__unstableSkipMigrationLogs: true,
+	} );
+	if ( blocks.length === 1 ) {
+		blocks[ 0 ].attributes = {
+			...blocks[ 0 ].attributes,
+			metadata: {
+				...( blocks[ 0 ].attributes.metadata || {} ),
+				categories: pattern.categories,
+				patternName: pattern.name,
+				name: blocks[ 0 ].attributes.metadata?.name || pattern.title,
+			},
+		};
+	}
+	return {
+		...pattern,
+		blocks,
+	};
+}
+
+export function getParsedPattern( pattern ) {
+	let parsedPattern = parsedPatternCache.get( pattern );
+	if ( ! parsedPattern ) {
+		parsedPattern = parsePattern( pattern );
+		parsedPatternCache.set( pattern, parsedPattern );
+	}
+	return parsedPattern;
+}
+
+export function getGrammar( pattern ) {
+	let grammarMap = grammarMapCache.get( pattern );
+	if ( ! grammarMap ) {
+		grammarMap = grammarParse( pattern.content );
+		// Block names are null only at the top level for whitespace.
+		grammarMap = grammarMap.filter( ( block ) => block.blockName !== null );
+		grammarMapCache.set( pattern, grammarMap );
+	}
+	return grammarMap;
+}
+
+export const checkAllowList = ( list, item, defaultResult = null ) => {
+	if ( typeof list === 'boolean' ) {
+		return list;
+	}
+	if ( Array.isArray( list ) ) {
+		// TODO: when there is a canonical way to detect that we are editing a post
+		// the following check should be changed to something like:
+		// if ( list.includes( 'core/post-content' ) && getEditorMode() === 'post-content' && item === null )
+		if ( list.includes( 'core/post-content' ) && item === null ) {
+			return true;
+		}
+		return list.includes( item );
+	}
+	return defaultResult;
+};
+
+export const checkAllowListRecursive = ( blocks, allowedBlockTypes ) => {
+	if ( typeof allowedBlockTypes === 'boolean' ) {
+		return allowedBlockTypes;
+	}
+
+	const blocksQueue = [ ...blocks ];
+	while ( blocksQueue.length > 0 ) {
+		const block = blocksQueue.shift();
+
+		const isAllowed = checkAllowList(
+			allowedBlockTypes,
+			block.name || block.blockName,
+			true
+		);
+		if ( ! isAllowed ) {
+			return false;
+		}
+
+		block.innerBlocks?.forEach( ( innerBlock ) => {
+			blocksQueue.push( innerBlock );
+		} );
+	}
+
+	return true;
+};
+
+export const getAllPatternsDependants = ( select ) => ( state ) => {
+	return [
+		state.settings.__experimentalBlockPatterns,
+		state.settings.__experimentalUserPatternCategories,
+		state.settings.__experimentalReusableBlocks,
+		state.settings[ selectBlockPatternsKey ]?.( select ),
+		state.blockPatterns,
+		unlock( select( STORE_NAME ) ).getReusableBlocks(),
+	];
+};
+
+export function getInsertBlockTypeDependants( state, rootClientId ) {
+	return [
+		state.blockListSettings[ rootClientId ],
+		state.blocks.byClientId.get( rootClientId ),
+		state.settings.allowedBlockTypes,
+		state.settings.templateLock,
+		state.blockEditingModes,
+		state.editorMode,
+		getSectionRootClientId( state ),
+	];
+}
diff --git a/packages/block-editor/src/style.scss b/packages/block-editor/src/style.scss
index a55756ae6f53d7..512169351fe1fb 100644
--- a/packages/block-editor/src/style.scss
+++ b/packages/block-editor/src/style.scss
@@ -1,5 +1,7 @@
 @import "./autocompleters/style.scss";
+@import "./components/background-image-control/style.scss";
 @import "./components/block-alignment-control/style.scss";
+@import "./components/block-canvas/style.scss";
 @import "./components/block-icon/style.scss";
 @import "./components/block-inspector/style.scss";
 @import "./components/block-tools/style.scss";
@@ -10,13 +12,11 @@
 @import "./components/block-draggable/style.scss";
 @import "./components/block-mover/style.scss";
 @import "./components/block-navigation/style.scss";
-@import "./components/block-parent-selector/style.scss";
 @import "./components/block-patterns-list/style.scss";
 @import "./components/block-patterns-paging/style.scss";
 @import "./components/block-popover/style.scss";
 @import "./components/block-preview/style.scss";
 @import "./components/block-rename/style.scss";
-@import "./components/block-settings-menu/style.scss";
 @import "./components/block-styles/style.scss";
 @import "./components/block-switcher/style.scss";
 @import "./components/block-types-list/style.scss";
@@ -24,12 +24,13 @@
 @import "./components/block-variation-transforms/style.scss";
 @import "./components/border-radius-control/style.scss";
 @import "./components/colors-gradients/style.scss";
-@import "./components/contrast-checker/style.scss";
 @import "./components/date-format-picker/style.scss";
 @import "./components/duotone-control/style.scss";
 @import "./components/font-appearance-control/style.scss";
 @import "./components/global-styles/style.scss";
+@import "./components/grid/style.scss";
 @import "./components/height-control/style.scss";
+@import "./components/iframe/style.scss";
 @import "./components/image-size-control/style.scss";
 @import "./components/inserter-list-item/style.scss";
 @import "./components/inspector-controls-tabs/style.scss";
@@ -42,25 +43,21 @@
 @import "./components/responsive-block-control/style.scss";
 @import "./components/rich-text/style.scss";
 @import "./components/skip-to-selected-block/style.scss";
-@import "./components/text-decoration-control/style.scss";
-@import "./components/text-transform-control/style.scss";
+@import "./components/tabbed-sidebar/style.scss";
 @import "./components/tool-selector/style.scss";
 @import "./components/url-input/style.scss";
 @import "./components/url-popover/style.scss";
-@import "./hooks/anchor.scss";
 @import "./hooks/block-hooks.scss";
-@import "./hooks/background.scss";
+@import "./hooks/block-bindings.scss";
 @import "./hooks/border.scss";
 @import "./hooks/color.scss";
 @import "./hooks/dimensions.scss";
 @import "./hooks/layout.scss";
-@import "./hooks/padding.scss";
-@import "./hooks/position.scss";
+@import "./hooks/spacing.scss";
 @import "./hooks/typography.scss";
 
 @import "./components/block-toolbar/style.scss";
 @import "./components/inserter/style.scss";
-@import "./components/preview-options/style.scss";
 @import "./components/spacing-sizes-control/style.scss";
 
 @include wordpress-admin-schemes();
diff --git a/packages/block-editor/src/utils/block-bindings.js b/packages/block-editor/src/utils/block-bindings.js
new file mode 100644
index 00000000000000..dcf80d985473b2
--- /dev/null
+++ b/packages/block-editor/src/utils/block-bindings.js
@@ -0,0 +1,149 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useRegistry } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../store';
+import { useBlockEditContext } from '../components/block-edit';
+
+function isObjectEmpty( object ) {
+	return ! object || Object.keys( object ).length === 0;
+}
+
+/**
+ * Contains utils to update the block `bindings` metadata.
+ *
+ * @typedef {Object} WPBlockBindingsUtils
+ *
+ * @property {Function} updateBlockBindings    Updates the value of the bindings connected to block attributes.
+ * @property {Function} removeAllBlockBindings Removes the bindings property of the `metadata` attribute.
+ */
+
+/**
+ * Retrieves the existing utils needed to update the block `bindings` metadata.
+ * They can be used to create, modify, or remove connections from the existing block attributes.
+ *
+ * It contains the following utils:
+ * - `updateBlockBindings`: Updates the value of the bindings connected to block attributes. It can be used to remove a specific binding by setting the value to `undefined`.
+ * - `removeAllBlockBindings`: Removes the bindings property of the `metadata` attribute.
+ *
+ * @since 6.7.0 Introduced in WordPress core.
+ *
+ * @param {?string} clientId Optional block client ID. If not set, it will use the current block client ID from the context.
+ *
+ * @return {?WPBlockBindingsUtils} Object containing the block bindings utils.
+ *
+ * @example
+ * ```js
+ * import { useBlockBindingsUtils } from '@wordpress/block-editor'
+ * const { updateBlockBindings, removeAllBlockBindings } = useBlockBindingsUtils();
+ *
+ * // Update url and alt attributes.
+ * updateBlockBindings( {
+ *     url: {
+ *         source: 'core/post-meta',
+ *         args: {
+ *             key: 'url_custom_field',
+ *         },
+ *     },
+ *     alt: {
+ *         source: 'core/post-meta',
+ *         args: {
+ *             key: 'text_custom_field',
+ *         },
+ *     },
+ * } );
+ *
+ * // Remove binding from url attribute.
+ * updateBlockBindings( { url: undefined } );
+ *
+ * // Remove bindings from all attributes.
+ * removeAllBlockBindings();
+ * ```
+ */
+export function useBlockBindingsUtils( clientId ) {
+	const { clientId: contextClientId } = useBlockEditContext();
+	const blockClientId = clientId || contextClientId;
+	const { updateBlockAttributes } = useDispatch( blockEditorStore );
+	const { getBlockAttributes } = useRegistry().select( blockEditorStore );
+
+	/**
+	 * Updates the value of the bindings connected to block attributes.
+	 * It removes the binding when the new value is `undefined`.
+	 *
+	 * @param {Object} bindings        Bindings including the attributes to update and the new object.
+	 * @param {string} bindings.source The source name to connect to.
+	 * @param {Object} [bindings.args] Object containing the arguments needed by the source.
+	 *
+	 * @example
+	 * ```js
+	 * import { useBlockBindingsUtils } from '@wordpress/block-editor'
+	 *
+	 * const { updateBlockBindings } = useBlockBindingsUtils();
+	 * updateBlockBindings( {
+	 *     url: {
+	 *         source: 'core/post-meta',
+	 *         args: {
+	 *             key: 'url_custom_field',
+	 *         },
+	 * 	   },
+	 *     alt: {
+	 *         source: 'core/post-meta',
+	 *         args: {
+	 *             key: 'text_custom_field',
+	 *         },
+	 * 	   }
+	 * } );
+	 * ```
+	 */
+	const updateBlockBindings = ( bindings ) => {
+		const { metadata: { bindings: currentBindings, ...metadata } = {} } =
+			getBlockAttributes( blockClientId );
+		const newBindings = { ...currentBindings };
+
+		Object.entries( bindings ).forEach( ( [ attribute, binding ] ) => {
+			if ( ! binding && newBindings[ attribute ] ) {
+				delete newBindings[ attribute ];
+				return;
+			}
+			newBindings[ attribute ] = binding;
+		} );
+
+		const newMetadata = {
+			...metadata,
+			bindings: newBindings,
+		};
+
+		if ( isObjectEmpty( newMetadata.bindings ) ) {
+			delete newMetadata.bindings;
+		}
+
+		updateBlockAttributes( blockClientId, {
+			metadata: isObjectEmpty( newMetadata ) ? undefined : newMetadata,
+		} );
+	};
+
+	/**
+	 * Removes the bindings property of the `metadata` attribute.
+	 *
+	 * @example
+	 * ```js
+	 * import { useBlockBindingsUtils } from '@wordpress/block-editor'
+	 *
+	 * const { removeAllBlockBindings } = useBlockBindingsUtils();
+	 * removeAllBlockBindings();
+	 * ```
+	 */
+	const removeAllBlockBindings = () => {
+		const { metadata: { bindings, ...metadata } = {} } =
+			getBlockAttributes( blockClientId );
+		updateBlockAttributes( blockClientId, {
+			metadata: isObjectEmpty( metadata ) ? undefined : metadata,
+		} );
+	};
+
+	return { updateBlockBindings, removeAllBlockBindings };
+}
diff --git a/packages/block-editor/src/utils/block-variation-transforms.js b/packages/block-editor/src/utils/block-variation-transforms.js
deleted file mode 100644
index 15b644bd235ee9..00000000000000
--- a/packages/block-editor/src/utils/block-variation-transforms.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/** @typedef {import('@wordpress/blocks').WPBlockVariation} WPBlockVariation */
-
-function matchesAttributes( blockAttributes, variation ) {
-	return Object.entries( variation ).every( ( [ key, value ] ) => {
-		if (
-			typeof value === 'object' &&
-			typeof blockAttributes[ key ] === 'object'
-		) {
-			return matchesAttributes( blockAttributes[ key ], value );
-		}
-		return blockAttributes[ key ] === value;
-	} );
-}
-
-/**
- * Matches the provided block variations with a block's attributes. If no match
- * or more than one matches are found it returns `undefined`. If a single match is
- * found it returns it.
- *
- * This is a simple implementation for now as it takes into account only the attributes
- * of a block variation and not `InnerBlocks`.
- *
- * @param {Object}             blockAttributes - The block attributes to try to find a match.
- * @param {WPBlockVariation[]} variations      - A list of block variations to test for a match.
- * @return {WPBlockVariation | undefined} - If a match is found returns it. If not or more than one matches are found returns `undefined`.
- */
-export const __experimentalGetMatchingVariation = (
-	blockAttributes,
-	variations
-) => {
-	if ( ! variations || ! blockAttributes ) return;
-	const matches = variations.filter( ( { attributes } ) => {
-		if ( ! attributes || ! Object.keys( attributes ).length ) return false;
-		return matchesAttributes( blockAttributes, attributes );
-	} );
-	if ( matches.length !== 1 ) return;
-	return matches[ 0 ];
-};
diff --git a/packages/block-editor/src/utils/dom.js b/packages/block-editor/src/utils/dom.js
index 6af35aff730155..0603e9bbb1db96 100644
--- a/packages/block-editor/src/utils/dom.js
+++ b/packages/block-editor/src/utils/dom.js
@@ -57,3 +57,140 @@ export function getBlockClientId( node ) {
 
 	return blockNode.id.slice( 'block-'.length );
 }
+
+/**
+ * Calculates the union of two rectangles.
+ *
+ * @param {DOMRect} rect1 First rectangle.
+ * @param {DOMRect} rect2 Second rectangle.
+ * @return {DOMRect} Union of the two rectangles.
+ */
+export function rectUnion( rect1, rect2 ) {
+	const left = Math.min( rect1.left, rect2.left );
+	const right = Math.max( rect1.right, rect2.right );
+	const bottom = Math.max( rect1.bottom, rect2.bottom );
+	const top = Math.min( rect1.top, rect2.top );
+
+	return new window.DOMRectReadOnly( left, top, right - left, bottom - top );
+}
+
+/**
+ * Returns whether an element is visible.
+ *
+ * @param {Element} element Element.
+ * @return {boolean} Whether the element is visible.
+ */
+function isElementVisible( element ) {
+	const viewport = element.ownerDocument.defaultView;
+	if ( ! viewport ) {
+		return false;
+	}
+
+	// Check for <VisuallyHidden> component.
+	if ( element.classList.contains( 'components-visually-hidden' ) ) {
+		return false;
+	}
+
+	const bounds = element.getBoundingClientRect();
+	if ( bounds.width === 0 || bounds.height === 0 ) {
+		return false;
+	}
+
+	// Older browsers, e.g. Safari < 17.4 may not support the `checkVisibility` method.
+	if ( element.checkVisibility ) {
+		return element.checkVisibility?.( {
+			opacityProperty: true,
+			contentVisibilityAuto: true,
+			visibilityProperty: true,
+		} );
+	}
+
+	const style = viewport.getComputedStyle( element );
+
+	if (
+		style.display === 'none' ||
+		style.visibility === 'hidden' ||
+		style.opacity === '0'
+	) {
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Checks if the element is scrollable.
+ *
+ * @param {Element} element Element.
+ * @return {boolean} True if the element is scrollable.
+ */
+function isScrollable( element ) {
+	const style = window.getComputedStyle( element );
+	return (
+		style.overflowX === 'auto' ||
+		style.overflowX === 'scroll' ||
+		style.overflowY === 'auto' ||
+		style.overflowY === 'scroll'
+	);
+}
+
+/**
+ * Returns the rect of the element including all visible nested elements.
+ *
+ * Visible nested elements, including elements that overflow the parent, are
+ * taken into account.
+ *
+ * This function is useful for calculating the visible area of a block that
+ * contains nested elements that overflow the block, e.g. the Navigation block,
+ * which can contain overflowing Submenu blocks.
+ *
+ * The returned rect represents the full extent of the element and its visible
+ * children, which may extend beyond the viewport.
+ *
+ * @param {Element} element Element.
+ * @return {DOMRect} Bounding client rect of the element and its visible children.
+ */
+export function getVisibleElementBounds( element ) {
+	const viewport = element.ownerDocument.defaultView;
+
+	if ( ! viewport ) {
+		return new window.DOMRectReadOnly();
+	}
+
+	let bounds = element.getBoundingClientRect();
+	const stack = [ element ];
+	let currentElement;
+
+	while ( ( currentElement = stack.pop() ) ) {
+		for ( const child of currentElement.children ) {
+			if ( isElementVisible( child ) ) {
+				let childBounds = child.getBoundingClientRect();
+				// If the parent is scrollable, use parent's scrollable bounds.
+				if ( isScrollable( currentElement ) ) {
+					childBounds = currentElement.getBoundingClientRect();
+				}
+				bounds = rectUnion( bounds, childBounds );
+				stack.push( child );
+			}
+		}
+	}
+
+	/*
+	 * Take into account the outer horizontal limits of the container in which
+	 * an element is supposed to be "visible". For example, if an element is
+	 * positioned -10px to the left of the window x value (0), this function
+	 * discounts the negative overhang because it's not visible and therefore
+	 * not to be counted in the visibility calculations. Top and bottom values
+	 * are not accounted for to accommodate vertical scroll.
+	 */
+	const left = Math.max( bounds.left, 0 );
+	const right = Math.min( bounds.right, viewport.innerWidth );
+	bounds = new window.DOMRectReadOnly(
+		left,
+		bounds.top,
+		right - left,
+		bounds.height
+	);
+
+	return bounds;
+}
diff --git a/packages/block-editor/src/utils/format-font-style.js b/packages/block-editor/src/utils/format-font-style.js
new file mode 100644
index 00000000000000..5db52f8a5808f5
--- /dev/null
+++ b/packages/block-editor/src/utils/format-font-style.js
@@ -0,0 +1,40 @@
+/**
+ * WordPress dependencies
+ */
+import { _x } from '@wordpress/i18n';
+
+/**
+ * Formats font styles to human readable names.
+ *
+ * @param {string} fontStyle font style string
+ * @return {Object} new object with formatted font style
+ */
+export function formatFontStyle( fontStyle ) {
+	if ( ! fontStyle ) {
+		return {};
+	}
+
+	if ( typeof fontStyle === 'object' ) {
+		return fontStyle;
+	}
+
+	let name;
+
+	switch ( fontStyle ) {
+		case 'normal':
+			name = _x( 'Regular', 'font style' );
+			break;
+		case 'italic':
+			name = _x( 'Italic', 'font style' );
+			break;
+		case 'oblique':
+			name = _x( 'Oblique', 'font style' );
+			break;
+
+		default:
+			name = fontStyle;
+			break;
+	}
+
+	return { name, value: fontStyle };
+}
diff --git a/packages/block-editor/src/utils/format-font-weight.js b/packages/block-editor/src/utils/format-font-weight.js
new file mode 100644
index 00000000000000..8fc1c9e479a23d
--- /dev/null
+++ b/packages/block-editor/src/utils/format-font-weight.js
@@ -0,0 +1,63 @@
+/**
+ * WordPress dependencies
+ */
+import { _x } from '@wordpress/i18n';
+
+/**
+ * Formats font weights to human readable names.
+ *
+ * @param {string} fontWeight font weight string
+ * @return {Object} new object with formatted font weight
+ */
+export function formatFontWeight( fontWeight ) {
+	if ( ! fontWeight ) {
+		return {};
+	}
+
+	if ( typeof fontWeight === 'object' ) {
+		return fontWeight;
+	}
+
+	let name;
+
+	switch ( fontWeight ) {
+		case 'normal':
+		case '400':
+			name = _x( 'Regular', 'font weight' );
+			break;
+		case 'bold':
+		case '700':
+			name = _x( 'Bold', 'font weight' );
+			break;
+		case '100':
+			name = _x( 'Thin', 'font weight' );
+			break;
+		case '200':
+			name = _x( 'Extra Light', 'font weight' );
+			break;
+		case '300':
+			name = _x( 'Light', 'font weight' );
+			break;
+		case '500':
+			name = _x( 'Medium', 'font weight' );
+			break;
+		case '600':
+			name = _x( 'Semi Bold', 'font weight' );
+			break;
+		case '800':
+			name = _x( 'Extra Bold', 'font weight' );
+			break;
+		case '900':
+			name = _x( 'Black', 'font weight' );
+			break;
+		case '1000':
+			name = _x( 'Extra Black', 'font weight' );
+			break;
+
+		default:
+			name = fontWeight;
+			break;
+	}
+
+	return { name, value: fontWeight };
+}
diff --git a/packages/block-editor/src/utils/get-editor-region.js b/packages/block-editor/src/utils/get-editor-region.js
new file mode 100644
index 00000000000000..16561b26b88aea
--- /dev/null
+++ b/packages/block-editor/src/utils/get-editor-region.js
@@ -0,0 +1,31 @@
+/**
+ * Gets the editor region for a given editor canvas element or
+ * returns the passed element if no region is found
+ *
+ * @param { Object } editor The editor canvas element.
+ * @return { Object } The editor region or given editor element
+ */
+export default function getEditorRegion( editor ) {
+	if ( ! editor ) {
+		return null;
+	}
+
+	// If there are multiple editors, we need to find the iframe that contains our contentRef to make sure
+	// we're focusing the region that contains this editor.
+	const editorCanvas =
+		Array.from(
+			document.querySelectorAll( 'iframe[name="editor-canvas"]' ).values()
+		).find( ( iframe ) => {
+			// Find the iframe that contains our contentRef
+			const iframeDocument =
+				iframe.contentDocument || iframe.contentWindow.document;
+
+			return iframeDocument === editor.ownerDocument;
+		} ) ?? editor;
+
+	// The region is provided by the editor, not the block-editor.
+	// We should send focus to the region if one is available to reuse the
+	// same interface for navigating landmarks. If no region is available,
+	// use the canvas instead.
+	return editorCanvas?.closest( '[role="region"]' ) ?? editorCanvas;
+}
diff --git a/packages/block-editor/src/utils/get-font-styles-and-weights.js b/packages/block-editor/src/utils/get-font-styles-and-weights.js
new file mode 100644
index 00000000000000..dcb56fc86b2673
--- /dev/null
+++ b/packages/block-editor/src/utils/get-font-styles-and-weights.js
@@ -0,0 +1,199 @@
+/**
+ * WordPress dependencies
+ */
+import { _x, __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { formatFontStyle } from './format-font-style';
+import { formatFontWeight } from './format-font-weight';
+
+const FONT_STYLES = [
+	{
+		name: _x( 'Regular', 'font style' ),
+		value: 'normal',
+	},
+	{
+		name: _x( 'Italic', 'font style' ),
+		value: 'italic',
+	},
+];
+
+const FONT_WEIGHTS = [
+	{
+		name: _x( 'Thin', 'font weight' ),
+		value: '100',
+	},
+	{
+		name: _x( 'Extra Light', 'font weight' ),
+		value: '200',
+	},
+	{
+		name: _x( 'Light', 'font weight' ),
+		value: '300',
+	},
+	{
+		name: _x( 'Regular', 'font weight' ),
+		value: '400',
+	},
+	{
+		name: _x( 'Medium', 'font weight' ),
+		value: '500',
+	},
+	{
+		name: _x( 'Semi Bold', 'font weight' ),
+		value: '600',
+	},
+	{
+		name: _x( 'Bold', 'font weight' ),
+		value: '700',
+	},
+	{
+		name: _x( 'Extra Bold', 'font weight' ),
+		value: '800',
+	},
+	{
+		name: _x( 'Black', 'font weight' ),
+		value: '900',
+	},
+	{
+		name: _x( 'Extra Black', 'font weight' ),
+		value: '1000',
+	},
+];
+
+/**
+ * Builds a list of font style and weight options based on font family faces.
+ * Defaults to the standard font styles and weights if no font family faces are provided.
+ *
+ * @param {Array} fontFamilyFaces font family faces array
+ * @return {Object} new object with combined and separated font style and weight properties
+ */
+export function getFontStylesAndWeights( fontFamilyFaces ) {
+	let fontStyles = [];
+	let fontWeights = [];
+	const combinedStyleAndWeightOptions = [];
+	const isSystemFont = ! fontFamilyFaces || fontFamilyFaces?.length === 0;
+	let isVariableFont = false;
+
+	fontFamilyFaces?.forEach( ( face ) => {
+		// Check for variable font by looking for a space in the font weight value. e.g. "100 900"
+		if (
+			'string' === typeof face.fontWeight &&
+			/\s/.test( face.fontWeight.trim() )
+		) {
+			isVariableFont = true;
+
+			// Find font weight start and end values.
+			let [ startValue, endValue ] = face.fontWeight.split( ' ' );
+			startValue = parseInt( startValue.slice( 0, 1 ) );
+			if ( endValue === '1000' ) {
+				endValue = 10;
+			} else {
+				endValue = parseInt( endValue.slice( 0, 1 ) );
+			}
+
+			// Create font weight options for available variable weights.
+			for ( let i = startValue; i <= endValue; i++ ) {
+				const fontWeightValue = `${ i.toString() }00`;
+				if (
+					! fontWeights.some(
+						( weight ) => weight.value === fontWeightValue
+					)
+				) {
+					fontWeights.push( formatFontWeight( fontWeightValue ) );
+				}
+			}
+		}
+
+		// Format font style and weight values.
+		const fontWeight = formatFontWeight(
+			'number' === typeof face.fontWeight
+				? face.fontWeight.toString()
+				: face.fontWeight
+		);
+		const fontStyle = formatFontStyle( face.fontStyle );
+
+		// Create font style and font weight lists without duplicates.
+		if ( fontStyle && Object.keys( fontStyle ).length ) {
+			if (
+				! fontStyles.some(
+					( style ) => style.value === fontStyle.value
+				)
+			) {
+				fontStyles.push( fontStyle );
+			}
+		}
+
+		if ( fontWeight && Object.keys( fontWeight ).length ) {
+			if (
+				! fontWeights.some(
+					( weight ) => weight.value === fontWeight.value
+				)
+			) {
+				if ( ! isVariableFont ) {
+					fontWeights.push( fontWeight );
+				}
+			}
+		}
+	} );
+
+	// If there is no font weight of 600 or above, then include faux bold as an option.
+	if ( ! fontWeights.some( ( weight ) => weight.value >= '600' ) ) {
+		fontWeights.push( {
+			name: _x( 'Bold', 'font weight' ),
+			value: '700',
+		} );
+	}
+
+	// If there is no italic font style, then include faux italic as an option.
+	if ( ! fontStyles.some( ( style ) => style.value === 'italic' ) ) {
+		fontStyles.push( {
+			name: _x( 'Italic', 'font style' ),
+			value: 'italic',
+		} );
+	}
+
+	// Use default font styles and weights for system fonts.
+	if ( isSystemFont ) {
+		fontStyles = FONT_STYLES;
+		fontWeights = FONT_WEIGHTS;
+	}
+
+	// Use default styles and weights if there are no available styles or weights from the provided font faces.
+	fontStyles = fontStyles.length === 0 ? FONT_STYLES : fontStyles;
+	fontWeights = fontWeights.length === 0 ? FONT_WEIGHTS : fontWeights;
+
+	// Generate combined font style and weight options for available fonts.
+	fontStyles.forEach( ( { name: styleName, value: styleValue } ) => {
+		fontWeights.forEach( ( { name: weightName, value: weightValue } ) => {
+			const optionName =
+				styleValue === 'normal'
+					? weightName
+					: sprintf(
+							/* translators: 1: Font weight name. 2: Font style name. */
+							__( '%1$s %2$s' ),
+							weightName,
+							styleName
+					  );
+
+			combinedStyleAndWeightOptions.push( {
+				key: `${ styleValue }-${ weightValue }`,
+				name: optionName,
+				style: {
+					fontStyle: styleValue,
+					fontWeight: weightValue,
+				},
+			} );
+		} );
+	} );
+
+	return {
+		fontStyles,
+		fontWeights,
+		combinedStyleAndWeightOptions,
+		isSystemFont,
+		isVariableFont,
+	};
+}
diff --git a/packages/block-editor/src/utils/get-px-from-css-unit.js b/packages/block-editor/src/utils/get-px-from-css-unit.js
new file mode 100644
index 00000000000000..57e5e9827def85
--- /dev/null
+++ b/packages/block-editor/src/utils/get-px-from-css-unit.js
@@ -0,0 +1,8 @@
+/**
+ * This function was accidentally exposed for mobile/native usage.
+ *
+ * @deprecated
+ *
+ * @return {string} Empty string.
+ */
+export default () => '';
diff --git a/packages/block-editor/src/utils/index.js b/packages/block-editor/src/utils/index.js
index af45111759699c..1b5aa769a13b28 100644
--- a/packages/block-editor/src/utils/index.js
+++ b/packages/block-editor/src/utils/index.js
@@ -1,3 +1,3 @@
 export { default as transformStyles } from './transform-styles';
-export * from './block-variation-transforms';
-export { default as getPxFromCssUnit } from './parse-css-unit-to-px';
+export { default as getPxFromCssUnit } from './get-px-from-css-unit';
+export { useBlockBindingsUtils } from './block-bindings';
diff --git a/packages/block-editor/src/utils/math.js b/packages/block-editor/src/utils/math.js
index 128972e8a400e1..5d8ed97ffefb29 100644
--- a/packages/block-editor/src/utils/math.js
+++ b/packages/block-editor/src/utils/math.js
@@ -106,3 +106,15 @@ export function isPointContainedByRect( point, rect ) {
 		rect.bottom >= point.y
 	);
 }
+
+/**
+ * Is the point within the top and bottom boundaries of the rectangle.
+ *
+ * @param {WPPoint} point The point.
+ * @param {DOMRect} rect  The rectangle.
+ *
+ * @return {boolean} True if the point is within top and bottom of rectangle, false otherwise.
+ */
+export function isPointWithinTopAndBottomBoundariesOfRect( point, rect ) {
+	return rect.top <= point.y && rect.bottom >= point.y;
+}
diff --git a/packages/block-editor/src/utils/object.js b/packages/block-editor/src/utils/object.js
index 52380564264174..c78fe0e656dfef 100644
--- a/packages/block-editor/src/utils/object.js
+++ b/packages/block-editor/src/utils/object.js
@@ -1,38 +1,3 @@
-/**
- * External dependencies
- */
-import { paramCase } from 'change-case';
-
-/**
- * Converts any string to kebab case.
- * Backwards compatible with Lodash's `_.kebabCase()`.
- * Backwards compatible with `_wp_to_kebab_case()`.
- *
- * @see https://lodash.com/docs/4.17.15#kebabCase
- * @see https://developer.wordpress.org/reference/functions/_wp_to_kebab_case/
- *
- * @param {string} str String to convert.
- * @return {string} Kebab-cased string
- */
-export function kebabCase( str ) {
-	let input = str;
-	if ( typeof str !== 'string' ) {
-		input = str?.toString?.() ?? '';
-	}
-
-	// See https://github.com/lodash/lodash/blob/b185fcee26b2133bd071f4aaca14b455c2ed1008/lodash.js#L4970
-	input = input.replace( /['\u2019]/, '' );
-
-	return paramCase( input, {
-		splitRegexp: [
-			/(?!(?:1ST|2ND|3RD|[4-9]TH)(?![a-z]))([a-z0-9])([A-Z])/g, // fooBar => foo-bar, 3Bar => 3-bar
-			/(?!(?:1st|2nd|3rd|[4-9]th)(?![a-z]))([0-9])([a-z])/g, // 3bar => 3-bar
-			/([A-Za-z])([0-9])/g, // Foo3 => foo-3, foo3 => foo-3
-			/([A-Z])([A-Z][a-z])/g, // FOOBar => foo-bar
-		],
-	} );
-}
-
 /**
  * Immutably sets a value inside an object. Like `lodash#set`, but returning a
  * new object. Treats nullish initial values as empty objects. Clones any
@@ -84,3 +49,19 @@ export const getValueFromObjectPath = ( object, path, defaultValue ) => {
 	} );
 	return value ?? defaultValue;
 };
+
+/**
+ * Helper util to filter out objects with duplicate values for a given property.
+ *
+ * @param {Object[]} array    Array of objects to filter.
+ * @param {string}   property Property to filter unique values by.
+ *
+ * @return {Object[]} Array of objects with unique values for the specified property.
+ */
+export function uniqByProperty( array, property ) {
+	const seen = new Set();
+	return array.filter( ( item ) => {
+		const value = item[ property ];
+		return seen.has( value ) ? false : seen.add( value );
+	} );
+}
diff --git a/packages/block-editor/src/utils/order-inserter-block-items.js b/packages/block-editor/src/utils/order-inserter-block-items.js
index 696879b89db5e8..aa2f1acd48c280 100644
--- a/packages/block-editor/src/utils/order-inserter-block-items.js
+++ b/packages/block-editor/src/utils/order-inserter-block-items.js
@@ -17,8 +17,12 @@ export const orderInserterBlockItems = ( items, priority ) => {
 		let aIndex = priority.indexOf( aName );
 		let bIndex = priority.indexOf( bName );
 		// All other block items should come after that.
-		if ( aIndex < 0 ) aIndex = priority.length;
-		if ( bIndex < 0 ) bIndex = priority.length;
+		if ( aIndex < 0 ) {
+			aIndex = priority.length;
+		}
+		if ( bIndex < 0 ) {
+			bIndex = priority.length;
+		}
 		return aIndex - bIndex;
 	} );
 
diff --git a/packages/block-editor/src/utils/pasting.js b/packages/block-editor/src/utils/pasting.js
index 3ce7c20083269c..2e97849904c68b 100644
--- a/packages/block-editor/src/utils/pasting.js
+++ b/packages/block-editor/src/utils/pasting.js
@@ -52,21 +52,14 @@ export function getPasteEventData( { clipboardData } ) {
 	let plainText = '';
 	let html = '';
 
-	// IE11 only supports `Text` as an argument for `getData` and will
-	// otherwise throw an invalid argument error, so we try the standard
-	// arguments first, then fallback to `Text` if they fail.
 	try {
 		plainText = clipboardData.getData( 'text/plain' );
 		html = clipboardData.getData( 'text/html' );
-	} catch ( error1 ) {
-		try {
-			html = clipboardData.getData( 'Text' );
-		} catch ( error2 ) {
-			// Some browsers like UC Browser paste plain text by default and
-			// don't support clipboardData at all, so allow default
-			// behaviour.
-			return;
-		}
+	} catch ( error ) {
+		// Some browsers like UC Browser paste plain text by default and
+		// don't support clipboardData at all, so allow default
+		// behaviour.
+		return;
 	}
 
 	// Remove Windows-specific metadata appended within copied HTML text.
@@ -112,7 +105,9 @@ export function shouldDismissPastedFiles( files, html /*, plainText */ ) {
 		// other elements found, like <figure>, but we assume that the user's
 		// intention is to paste the actual image file.
 		const IMAGE_TAG = /<\s*img\b/gi;
-		if ( html.match( IMAGE_TAG )?.length !== 1 ) return true;
+		if ( html.match( IMAGE_TAG )?.length !== 1 ) {
+			return true;
+		}
 
 		// Even when there is exactly one <img> tag in the HTML payload, we
 		// choose to weed out local images, i.e. those whose source starts with
@@ -121,7 +116,9 @@ export function shouldDismissPastedFiles( files, html /*, plainText */ ) {
 		// text and exactly one image, and pasting that content using Google
 		// Chrome.
 		const IMG_WITH_LOCAL_SRC = /<\s*img\b[^>]*\bsrc="file:\/\//i;
-		if ( html.match( IMG_WITH_LOCAL_SRC ) ) return true;
+		if ( html.match( IMG_WITH_LOCAL_SRC ) ) {
+			return true;
+		}
 	}
 
 	return false;
diff --git a/packages/block-editor/src/utils/selection.js b/packages/block-editor/src/utils/selection.js
index 68c634d591c5e9..57aab8cc0f55dd 100644
--- a/packages/block-editor/src/utils/selection.js
+++ b/packages/block-editor/src/utils/selection.js
@@ -1,3 +1,8 @@
+/**
+ * WordPress dependencies
+ */
+import { RichTextData } from '@wordpress/rich-text';
+
 /**
  * A robust way to retain selection position through various
  * transforms is to insert a special character at the position and
@@ -19,8 +24,18 @@ export function retrieveSelectedAttribute( blockAttributes ) {
 	return Object.keys( blockAttributes ).find( ( name ) => {
 		const value = blockAttributes[ name ];
 		return (
-			typeof value === 'string' &&
-			value.indexOf( START_OF_SELECTED_AREA ) !== -1
+			( typeof value === 'string' || value instanceof RichTextData ) &&
+			// To do: refactor this to use rich text's selection instead, so we
+			// no longer have to use on this hack inserting a special character.
+			value.toString().indexOf( START_OF_SELECTED_AREA ) !== -1
 		);
 	} );
 }
+
+export function findRichTextAttributeKey( blockType ) {
+	for ( const [ key, value ] of Object.entries( blockType.attributes ) ) {
+		if ( value.source === 'rich-text' || value.source === 'html' ) {
+			return key;
+		}
+	}
+}
diff --git a/packages/block-editor/src/utils/test/__snapshots__/transform-styles.js.snap b/packages/block-editor/src/utils/test/__snapshots__/transform-styles.js.snap
deleted file mode 100644
index 28c4202f414a9e..00000000000000
--- a/packages/block-editor/src/utils/test/__snapshots__/transform-styles.js.snap
+++ /dev/null
@@ -1,103 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`transformStyles URL rewrite should not replace absolute paths 1`] = `
-[
-  "h1 { background: url(/images/test.png); }",
-]
-`;
-
-exports[`transformStyles URL rewrite should not replace remote paths 1`] = `
-[
-  "h1 { background: url(http://wp.org/images/test.png); }",
-]
-`;
-
-exports[`transformStyles URL rewrite should replace complex relative paths 1`] = `
-[
-  "h1 { background: url(http://wp-site.local/themes/gut/images/test.png); }",
-]
-`;
-
-exports[`transformStyles URL rewrite should rewrite relative paths 1`] = `
-[
-  "h1 { background: url(http://wp-site.local/themes/gut/css/images/test.png); }",
-]
-`;
-
-exports[`transformStyles selector wrap should ignore font-face selectors 1`] = `
-[
-  "
-			@font-face {
-				font-family: myFirstFont;
-				src: url(sansation_light.woff);
-			}",
-]
-`;
-
-exports[`transformStyles selector wrap should ignore keyframes 1`] = `
-[
-  "
-			@keyframes edit-post__fade-in-animation {
-				from {
-					opacity: 0;
-				}
-			}",
-]
-`;
-
-exports[`transformStyles selector wrap should ignore selectors 1`] = `
-[
-  ".my-namespace h1, body { color: red; }",
-]
-`;
-
-exports[`transformStyles selector wrap should not double wrap selectors 1`] = `
-[
-  " .my-namespace h1, .my-namespace .red { color: red; }",
-]
-`;
-
-exports[`transformStyles selector wrap should replace :root selectors 1`] = `
-[
-  "
-			.my-namespace {
-				--my-color: #ff0000;
-			}",
-]
-`;
-
-exports[`transformStyles selector wrap should replace root tags 1`] = `
-[
-  ".my-namespace, .my-namespace h1 { color: red; }",
-]
-`;
-
-exports[`transformStyles selector wrap should wrap multiple selectors 1`] = `
-[
-  ".my-namespace h1, .my-namespace h2 { color: red; }",
-]
-`;
-
-exports[`transformStyles selector wrap should wrap regular selectors 1`] = `
-[
-  ".my-namespace h1 { color: red; }",
-]
-`;
-
-exports[`transformStyles selector wrap should wrap selectors inside container queries 1`] = `
-[
-  "
-			@container (width > 400px) {
-				  .my-namespace h1 { color: red; }
-			}",
-]
-`;
-
-exports[`transformStyles should not break with data urls 1`] = `
-[
-  ".wp-block-group {
-			background-image: url("data:image/svg+xml,%3Csvg%3E.b%7Bclip-path:url(test);%7D%3C/svg%3E");
-			color: red !important;
-		  }",
-]
-`;
diff --git a/packages/block-editor/src/utils/test/block-variation-transforms.js b/packages/block-editor/src/utils/test/block-variation-transforms.js
deleted file mode 100644
index 47844ba0309426..00000000000000
--- a/packages/block-editor/src/utils/test/block-variation-transforms.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Internal dependencies
- */
-import { __experimentalGetMatchingVariation as getMatchingVariation } from '../block-variation-transforms';
-
-describe( 'getMatchingVariation', () => {
-	describe( 'should not find a match', () => {
-		it( 'when no variations or attributes passed', () => {
-			expect(
-				getMatchingVariation( null, { content: 'hi' } )
-			).toBeUndefined();
-			expect( getMatchingVariation( {} ) ).toBeUndefined();
-		} );
-		it( 'when no variation matched', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1 } },
-				{ name: 'two', attributes: { level: 2 } },
-			];
-			expect(
-				getMatchingVariation( { level: 4 }, variations )
-			).toBeUndefined();
-		} );
-		it( 'when more than one match found', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1 } },
-				{ name: 'two', attributes: { level: 1, content: 'hi' } },
-			];
-			expect(
-				getMatchingVariation(
-					{ level: 1, content: 'hi', other: 'prop' },
-					variations
-				)
-			).toBeUndefined();
-		} );
-		it( 'when variation is a superset of attributes', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1, content: 'hi' } },
-			];
-			expect(
-				getMatchingVariation( { level: 1, other: 'prop' }, variations )
-			).toBeUndefined();
-		} );
-		it( 'when variation has a nested attribute', () => {
-			const variations = [
-				{ name: 'one', attributes: { query: { author: 'somebody' } } },
-				{ name: 'two', attributes: { query: { author: 'nobody' } } },
-			];
-			expect(
-				getMatchingVariation(
-					{ query: { author: 'foobar' }, other: 'prop' },
-					variations
-				)
-			).toBeUndefined();
-		} );
-	} );
-	describe( 'should find a match', () => {
-		it( 'when variation has one attribute', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1 } },
-				{ name: 'two', attributes: { level: 2 } },
-			];
-			expect(
-				getMatchingVariation(
-					{ level: 2, content: 'hi', other: 'prop' },
-					variations
-				).name
-			).toEqual( 'two' );
-		} );
-		it( 'when variation has many attributes', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1, content: 'hi' } },
-				{ name: 'two', attributes: { level: 2 } },
-			];
-			expect(
-				getMatchingVariation(
-					{ level: 1, content: 'hi', other: 'prop' },
-					variations
-				).name
-			).toEqual( 'one' );
-		} );
-		it( 'when variation has a nested attribute', () => {
-			const variations = [
-				{ name: 'one', attributes: { query: { author: 'somebody' } } },
-				{ name: 'two', attributes: { query: { author: 'nobody' } } },
-			];
-			expect(
-				getMatchingVariation(
-					{ query: { author: 'somebody' }, other: 'prop' },
-					variations
-				).name
-			).toEqual( 'one' );
-		} );
-	} );
-} );
diff --git a/packages/block-editor/src/utils/test/format-font-style.js b/packages/block-editor/src/utils/test/format-font-style.js
new file mode 100644
index 00000000000000..f8557143cb4e24
--- /dev/null
+++ b/packages/block-editor/src/utils/test/format-font-style.js
@@ -0,0 +1,34 @@
+/**
+ * Internal dependencies
+ */
+import { formatFontStyle } from '../format-font-style';
+
+describe( 'formatFontStyle', () => {
+	it( 'should return empty object if style is not available', () => {
+		expect( formatFontStyle() ).toEqual( {} );
+	} );
+
+	it( 'should return the same object if style is already an object', () => {
+		const fontStyle = { name: 'Italic', value: 'italic' };
+		expect( formatFontStyle( fontStyle ) ).toEqual( fontStyle );
+	} );
+
+	it( 'should return the formatted font style', () => {
+		expect( formatFontStyle( 'normal' ) ).toEqual( {
+			name: 'Regular',
+			value: 'normal',
+		} );
+		expect( formatFontStyle( 'italic' ) ).toEqual( {
+			name: 'Italic',
+			value: 'italic',
+		} );
+		expect( formatFontStyle( 'oblique' ) ).toEqual( {
+			name: 'Oblique',
+			value: 'oblique',
+		} );
+		expect( formatFontStyle( 'oblique 40deg' ) ).toEqual( {
+			name: 'oblique 40deg',
+			value: 'oblique 40deg',
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/utils/test/format-font-weight.js b/packages/block-editor/src/utils/test/format-font-weight.js
new file mode 100644
index 00000000000000..8830e45532acfe
--- /dev/null
+++ b/packages/block-editor/src/utils/test/format-font-weight.js
@@ -0,0 +1,66 @@
+/**
+ * Internal dependencies
+ */
+import { formatFontWeight } from '../format-font-weight';
+
+describe( 'formatFontWeight', () => {
+	it( 'should return empty object if weight is not available', () => {
+		expect( formatFontWeight() ).toEqual( {} );
+	} );
+
+	it( 'should return the same object if weight is already an object', () => {
+		const fontWeight = { name: 'Thin', value: '100' };
+		expect( formatFontWeight( fontWeight ) ).toEqual( fontWeight );
+	} );
+
+	it( 'should return the formatted font weight', () => {
+		expect( formatFontWeight( '100' ) ).toEqual( {
+			name: 'Thin',
+			value: '100',
+		} );
+		expect( formatFontWeight( '200' ) ).toEqual( {
+			name: 'Extra Light',
+			value: '200',
+		} );
+		expect( formatFontWeight( '300' ) ).toEqual( {
+			name: 'Light',
+			value: '300',
+		} );
+		expect( formatFontWeight( '400' ) ).toEqual( {
+			name: 'Regular',
+			value: '400',
+		} );
+		expect( formatFontWeight( '500' ) ).toEqual( {
+			name: 'Medium',
+			value: '500',
+		} );
+		expect( formatFontWeight( '600' ) ).toEqual( {
+			name: 'Semi Bold',
+			value: '600',
+		} );
+		expect( formatFontWeight( '700' ) ).toEqual( {
+			name: 'Bold',
+			value: '700',
+		} );
+		expect( formatFontWeight( '800' ) ).toEqual( {
+			name: 'Extra Bold',
+			value: '800',
+		} );
+		expect( formatFontWeight( '900' ) ).toEqual( {
+			name: 'Black',
+			value: '900',
+		} );
+		expect( formatFontWeight( '1000' ) ).toEqual( {
+			name: 'Extra Black',
+			value: '1000',
+		} );
+		expect( formatFontWeight( 'normal' ) ).toEqual( {
+			name: 'Regular',
+			value: 'normal',
+		} );
+		expect( formatFontWeight( 'bold' ) ).toEqual( {
+			name: 'Bold',
+			value: 'bold',
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/utils/test/get-font-styles-and-weights.js b/packages/block-editor/src/utils/test/get-font-styles-and-weights.js
new file mode 100644
index 00000000000000..7c50409bae1acc
--- /dev/null
+++ b/packages/block-editor/src/utils/test/get-font-styles-and-weights.js
@@ -0,0 +1,661 @@
+/**
+ * Internal dependencies
+ */
+import { getFontStylesAndWeights } from '../get-font-styles-and-weights';
+
+describe( 'getFontStylesAndWeights', () => {
+	it( 'should return default styles and weights if fontFamilyFaces is not available', () => {
+		expect( getFontStylesAndWeights() ).toEqual( {
+			fontStyles: [
+				{
+					name: 'Regular',
+					value: 'normal',
+				},
+				{
+					name: 'Italic',
+					value: 'italic',
+				},
+			],
+			fontWeights: [
+				{
+					name: 'Thin',
+					value: '100',
+				},
+				{
+					name: 'Extra Light',
+					value: '200',
+				},
+				{
+					name: 'Light',
+					value: '300',
+				},
+				{
+					name: 'Regular',
+					value: '400',
+				},
+				{
+					name: 'Medium',
+					value: '500',
+				},
+				{
+					name: 'Semi Bold',
+					value: '600',
+				},
+				{
+					name: 'Bold',
+					value: '700',
+				},
+				{
+					name: 'Extra Bold',
+					value: '800',
+				},
+				{
+					name: 'Black',
+					value: '900',
+				},
+				{
+					name: 'Extra Black',
+					value: '1000',
+				},
+			],
+			combinedStyleAndWeightOptions: [
+				{
+					key: 'normal-100',
+					name: 'Thin',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '100',
+					},
+				},
+				{
+					key: 'normal-200',
+					name: 'Extra Light',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '200',
+					},
+				},
+				{
+					key: 'normal-300',
+					name: 'Light',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '300',
+					},
+				},
+				{
+					key: 'normal-400',
+					name: 'Regular',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'normal-500',
+					name: 'Medium',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '500',
+					},
+				},
+				{
+					key: 'normal-600',
+					name: 'Semi Bold',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '600',
+					},
+				},
+				{
+					key: 'normal-700',
+					name: 'Bold',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '700',
+					},
+				},
+				{
+					key: 'normal-800',
+					name: 'Extra Bold',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '800',
+					},
+				},
+				{
+					key: 'normal-900',
+					name: 'Black',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '900',
+					},
+				},
+				{
+					key: 'normal-1000',
+					name: 'Extra Black',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '1000',
+					},
+				},
+				{
+					key: 'italic-100',
+					name: 'Thin Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '100',
+					},
+				},
+				{
+					key: 'italic-200',
+					name: 'Extra Light Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '200',
+					},
+				},
+				{
+					key: 'italic-300',
+					name: 'Light Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '300',
+					},
+				},
+				{
+					key: 'italic-400',
+					name: 'Regular Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'italic-500',
+					name: 'Medium Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '500',
+					},
+				},
+				{
+					key: 'italic-600',
+					name: 'Semi Bold Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '600',
+					},
+				},
+				{
+					key: 'italic-700',
+					name: 'Bold Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '700',
+					},
+				},
+				{
+					key: 'italic-800',
+					name: 'Extra Bold Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '800',
+					},
+				},
+				{
+					key: 'italic-900',
+					name: 'Black Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '900',
+					},
+				},
+				{
+					key: 'italic-1000',
+					name: 'Extra Black Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '1000',
+					},
+				},
+			],
+			isSystemFont: true,
+			isVariableFont: false,
+		} );
+	} );
+
+	it( 'should return available styles and weights for a variable font', () => {
+		const fontFamilyFaces = [
+			{
+				fontFamily: 'AR One Sans',
+				fontStyle: 'normal',
+				fontWeight: '400 700',
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/AROneSans-VariableFont_ARRRwght.ttf',
+			},
+		];
+
+		expect( getFontStylesAndWeights( fontFamilyFaces ) ).toEqual( {
+			fontStyles: [
+				{
+					name: 'Regular',
+					value: 'normal',
+				},
+				{
+					name: 'Italic',
+					value: 'italic',
+				},
+			],
+			fontWeights: [
+				{
+					name: 'Regular',
+					value: '400',
+				},
+				{
+					name: 'Medium',
+					value: '500',
+				},
+				{
+					name: 'Semi Bold',
+					value: '600',
+				},
+				{
+					name: 'Bold',
+					value: '700',
+				},
+			],
+			combinedStyleAndWeightOptions: [
+				{
+					key: 'normal-400',
+					name: 'Regular',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'normal-500',
+					name: 'Medium',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '500',
+					},
+				},
+				{
+					key: 'normal-600',
+					name: 'Semi Bold',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '600',
+					},
+				},
+				{
+					key: 'normal-700',
+					name: 'Bold',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '700',
+					},
+				},
+				{
+					key: 'italic-400',
+					name: 'Regular Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'italic-500',
+					name: 'Medium Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '500',
+					},
+				},
+				{
+					key: 'italic-600',
+					name: 'Semi Bold Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '600',
+					},
+				},
+				{
+					key: 'italic-700',
+					name: 'Bold Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '700',
+					},
+				},
+			],
+			isSystemFont: false,
+			isVariableFont: true,
+		} );
+	} );
+
+	it( 'should return available styles and weights for a regular font', () => {
+		const fontFamilyFaces = [
+			{
+				fontFamily: 'Piazzolla',
+				fontStyle: 'normal',
+				fontWeight: '400',
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/N0b52SlTPu5rIkWIZjVKKtYtfxYqZ4RJBFzFfYUjkSDdlqZgy7LYxnL31AHfAAy5.woff2',
+			},
+			{
+				fontFamily: 'Piazzolla',
+				fontStyle: 'normal',
+				fontWeight: 600,
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/N0b52SlTPu5rIkWIZjVKKtYtfxYqZ4RJBFzFfYUjkSDdlqZgy7JxwXL31AHfAAy5.woff2',
+			},
+			{
+				fontFamily: 'Piazzolla',
+				fontStyle: 'normal',
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/N0b52SlTPu5rIkWIZjVKKtYtfxYqZ4RJBFzFfYUjkSDdlqZgy7JxwXL31AHfAAy5.woff2',
+			},
+			{
+				fontFamily: 'Piazzolla',
+				fontStyle: 'normal',
+				fontWeight: '900',
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/N0b52SlTPu5rIkWIZjVKKtYtfxYqZ4RJBFzFfYUjkSDdlqZgy7JxwXL31AHfAAy5.woff2',
+			},
+			{
+				fontFamily: 'Piazzolla',
+				fontStyle: 'italic',
+				fontWeight: '300',
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhcSx3gD9BRy5m5M.woff2',
+			},
+			{
+				fontFamily: 'Piazzolla',
+				fontStyle: 'italic',
+				fontWeight: '900',
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhTO23gD9BRy5m5M.woff2',
+			},
+		];
+		expect( getFontStylesAndWeights( fontFamilyFaces ) ).toEqual( {
+			fontStyles: [
+				{
+					name: 'Regular',
+					value: 'normal',
+				},
+				{
+					name: 'Italic',
+					value: 'italic',
+				},
+			],
+			fontWeights: [
+				{
+					name: 'Regular',
+					value: '400',
+				},
+				{
+					name: 'Semi Bold',
+					value: '600',
+				},
+				{
+					name: 'Black',
+					value: '900',
+				},
+				{
+					name: 'Light',
+					value: '300',
+				},
+			],
+			combinedStyleAndWeightOptions: [
+				{
+					key: 'normal-400',
+					name: 'Regular',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'normal-600',
+					name: 'Semi Bold',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '600',
+					},
+				},
+				{
+					key: 'normal-900',
+					name: 'Black',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '900',
+					},
+				},
+				{
+					key: 'normal-300',
+					name: 'Light',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '300',
+					},
+				},
+				{
+					key: 'italic-400',
+					name: 'Regular Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'italic-600',
+					name: 'Semi Bold Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '600',
+					},
+				},
+				{
+					key: 'italic-900',
+					name: 'Black Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '900',
+					},
+				},
+				{
+					key: 'italic-300',
+					name: 'Light Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '300',
+					},
+				},
+			],
+			isSystemFont: false,
+			isVariableFont: false,
+		} );
+	} );
+
+	it( 'should return available styles and weights for a regular font with faux bold added', () => {
+		const fontFamilyFaces = [
+			{
+				fontFamily: 'Piazzolla',
+				fontStyle: 'normal',
+				fontWeight: '400',
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/N0b52SlTPu5rIkWIZjVKKtYtfxYqZ4RJBFzFfYUjkSDdlqZgy7LYxnL31AHfAAy5.woff2',
+			},
+		];
+		expect( getFontStylesAndWeights( fontFamilyFaces ) ).toEqual( {
+			fontStyles: [
+				{
+					name: 'Regular',
+					value: 'normal',
+				},
+				{
+					name: 'Italic',
+					value: 'italic',
+				},
+			],
+			fontWeights: [
+				{
+					name: 'Regular',
+					value: '400',
+				},
+				{
+					name: 'Bold',
+					value: '700',
+				},
+			],
+			combinedStyleAndWeightOptions: [
+				{
+					key: 'normal-400',
+					name: 'Regular',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'normal-700',
+					name: 'Bold',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '700',
+					},
+				},
+				{
+					key: 'italic-400',
+					name: 'Regular Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'italic-700',
+					name: 'Bold Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '700',
+					},
+				},
+			],
+			isSystemFont: false,
+			isVariableFont: false,
+		} );
+	} );
+
+	it( 'should return available styles and weights for a font without fontWeight', () => {
+		const fontFamilyFaces = [
+			{
+				fontFamily: 'AR One Sans',
+				fontStyle: 'normal',
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/AROneSans-VariableFont_ARRRwght.ttf',
+			},
+		];
+		expect( getFontStylesAndWeights( fontFamilyFaces ) ).toEqual( {
+			fontStyles: [
+				{
+					name: 'Regular',
+					value: 'normal',
+				},
+				{
+					name: 'Italic',
+					value: 'italic',
+				},
+			],
+			fontWeights: [
+				{
+					name: 'Bold',
+					value: '700',
+				},
+			],
+			combinedStyleAndWeightOptions: [
+				{
+					key: 'normal-700',
+					name: 'Bold',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '700',
+					},
+				},
+				{
+					key: 'italic-700',
+					name: 'Bold Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '700',
+					},
+				},
+			],
+			isSystemFont: false,
+			isVariableFont: false,
+		} );
+	} );
+
+	it( 'should return available styles and weights for a font with numeric fontWeight', () => {
+		const fontFamilyFaces = [
+			{
+				fontFamily: 'AR One Sans',
+				fontStyle: 'normal',
+				fontWeight: 400,
+				src: 'http://www.wordpress.org/wp-content/uploads/fonts/AROneSans-VariableFont_ARRRwght.ttf',
+			},
+		];
+		expect( getFontStylesAndWeights( fontFamilyFaces ) ).toEqual( {
+			fontStyles: [
+				{
+					name: 'Regular',
+					value: 'normal',
+				},
+				{
+					name: 'Italic',
+					value: 'italic',
+				},
+			],
+			fontWeights: [
+				{
+					name: 'Regular',
+					value: '400',
+				},
+				{
+					name: 'Bold',
+					value: '700',
+				},
+			],
+			combinedStyleAndWeightOptions: [
+				{
+					key: 'normal-400',
+					name: 'Regular',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'normal-700',
+					name: 'Bold',
+					style: {
+						fontStyle: 'normal',
+						fontWeight: '700',
+					},
+				},
+				{
+					key: 'italic-400',
+					name: 'Regular Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '400',
+					},
+				},
+				{
+					key: 'italic-700',
+					name: 'Bold Italic',
+					style: {
+						fontStyle: 'italic',
+						fontWeight: '700',
+					},
+				},
+			],
+			isSystemFont: false,
+			isVariableFont: false,
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/utils/test/object.js b/packages/block-editor/src/utils/test/object.js
index 87f01375df311d..28f2fc7381cd80 100644
--- a/packages/block-editor/src/utils/test/object.js
+++ b/packages/block-editor/src/utils/test/object.js
@@ -1,102 +1,7 @@
 /**
  * Internal dependencies
  */
-import { kebabCase, setImmutably } from '../object';
-
-describe( 'kebabCase', () => {
-	it( 'separates lowercase letters, followed by uppercase letters', () => {
-		expect( kebabCase( 'fooBar' ) ).toEqual( 'foo-bar' );
-	} );
-
-	it( 'separates numbers, followed by uppercase letters', () => {
-		expect( kebabCase( '123FOO' ) ).toEqual( '123-foo' );
-	} );
-
-	it( 'separates numbers, followed by lowercase characters', () => {
-		expect( kebabCase( '123bar' ) ).toEqual( '123-bar' );
-	} );
-
-	it( 'separates uppercase letters, followed by numbers', () => {
-		expect( kebabCase( 'FOO123' ) ).toEqual( 'foo-123' );
-	} );
-
-	it( 'separates lowercase letters, followed by numbers', () => {
-		expect( kebabCase( 'foo123' ) ).toEqual( 'foo-123' );
-	} );
-
-	it( 'separates uppercase groups from capitalized groups', () => {
-		expect( kebabCase( 'FOOBar' ) ).toEqual( 'foo-bar' );
-	} );
-
-	it( 'removes any non-dash special characters', () => {
-		expect(
-			kebabCase( 'foo±§!@#$%^&*()-_=+/?.>,<\\|{}[]`~\'";:bar' )
-		).toEqual( 'foo-bar' );
-	} );
-
-	it( 'removes any spacing characters', () => {
-		expect( kebabCase( ' foo \t \n \r \f \v bar ' ) ).toEqual( 'foo-bar' );
-	} );
-
-	it( 'groups multiple dashes into a single one', () => {
-		expect( kebabCase( 'foo---bar' ) ).toEqual( 'foo-bar' );
-	} );
-
-	it( 'returns an empty string unchanged', () => {
-		expect( kebabCase( '' ) ).toEqual( '' );
-	} );
-
-	it( 'returns an existing kebab case string unchanged', () => {
-		expect( kebabCase( 'foo-123-bar' ) ).toEqual( 'foo-123-bar' );
-	} );
-
-	it( 'returns an empty string if any nullish type is passed', () => {
-		expect( kebabCase( undefined ) ).toEqual( '' );
-		expect( kebabCase( null ) ).toEqual( '' );
-	} );
-
-	it( 'converts any unexpected non-nullish type to a string', () => {
-		expect( kebabCase( 12345 ) ).toEqual( '12345' );
-		expect( kebabCase( [] ) ).toEqual( '' );
-		expect( kebabCase( {} ) ).toEqual( 'object-object' );
-	} );
-
-	/**
-	 * Should cover all test cases of `_wp_to_kebab_case()`.
-	 *
-	 * @see https://developer.wordpress.org/reference/functions/_wp_to_kebab_case/
-	 * @see https://github.com/WordPress/wordpress-develop/blob/76376fdbc3dc0b3261de377dffc350677345e7ba/tests/phpunit/tests/functions/wpToKebabCase.php#L35-L62
-	 */
-	it.each( [
-		[ 'white', 'white' ],
-		[ 'white+black', 'white-black' ],
-		[ 'white:black', 'white-black' ],
-		[ 'white*black', 'white-black' ],
-		[ 'white.black', 'white-black' ],
-		[ 'white black', 'white-black' ],
-		[ 'white	black', 'white-black' ],
-		[ 'white-to-black', 'white-to-black' ],
-		[ 'white2white', 'white-2-white' ],
-		[ 'white2nd', 'white-2nd' ],
-		[ 'white2ndcolor', 'white-2-ndcolor' ],
-		[ 'white2ndColor', 'white-2nd-color' ],
-		[ 'white2nd_color', 'white-2nd-color' ],
-		[ 'white23color', 'white-23-color' ],
-		[ 'white23', 'white-23' ],
-		[ '23color', '23-color' ],
-		[ 'white4th', 'white-4th' ],
-		[ 'font2xl', 'font-2-xl' ],
-		[ 'whiteToWhite', 'white-to-white' ],
-		[ 'whiteTOwhite', 'white-t-owhite' ],
-		[ 'WHITEtoWHITE', 'whit-eto-white' ],
-		[ 42, '42' ],
-		[ "i've done", 'ive-done' ],
-		[ '#ffffff', 'ffffff' ],
-		[ '$ffffff', 'ffffff' ],
-	] )( 'converts %s properly to %s', ( input, expected ) => {
-		expect( kebabCase( input ) ).toEqual( expected );
-	} );
-} );
+import { setImmutably } from '../object';
 
 describe( 'setImmutably', () => {
 	describe( 'handling falsy values properly', () => {
diff --git a/packages/block-editor/src/utils/test/parse-css-unit-to-px.js b/packages/block-editor/src/utils/test/parse-css-unit-to-px.js
deleted file mode 100644
index 17fd36e1cddcb6..00000000000000
--- a/packages/block-editor/src/utils/test/parse-css-unit-to-px.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Internal dependencies
- */
-import {
-	default as memoizedGetPxFromCssUnit,
-	getPxFromCssUnit,
-} from '../parse-css-unit-to-px';
-
-describe( 'getPxFromCssUnit', () => {
-	// Absolute units.
-	describe( 'absolute unites should return px values', () => {
-		const testData = [
-			[ '25px', '25px' ],
-			[ '25.5', '26px' ],
-			[ '1cm', '38px' ],
-			[ '10mm', '38px' ],
-			[ '1in', '96px' ],
-			[ '12pt', '16px' ],
-			[ '1pc', '16px' ],
-			[ '40Q', '38px' ], // 40 Q should be 1 cm.
-		];
-
-		test.each( testData )( 'getPxFromCssUnit( %s )', ( unit, expected ) => {
-			expect( getPxFromCssUnit( unit ) ).toBe( expected );
-		} );
-		test.each( testData )(
-			'memoizedGetPxFromCssUnit( %s )',
-			( unit, expected ) => {
-				expect( memoizedGetPxFromCssUnit( unit ) ).toBe( expected );
-			}
-		);
-		test.each( testData )(
-			'cached memoizedGetPxFromCssUnit( %s )',
-			( unit, expected ) => {
-				expect( memoizedGetPxFromCssUnit( unit ) ).toBe( expected );
-			}
-		);
-	} );
-
-	describe( 'relative unites should return px values', () => {
-		const settings = {
-			fontSize: 10,
-			width: 100,
-			height: 200,
-			lineHeight: 2,
-			type: 'font',
-		};
-
-		const testData = [
-			[ '2em', '20px' ],
-			[ '2rem', '20px' ],
-			[ '1.125rem', '11px' ],
-			[ '20vw', '20px' ],
-			[ '20vh', '40px' ],
-			[ '20vmin', '20px' ],
-			[ '20vmax', '40px' ],
-			[ '20lh', '40px' ],
-			[ '120%', '12px' ],
-		];
-
-		test.each( testData )( 'getPxFromCssUnit( %s )', ( unit, expected ) => {
-			expect( getPxFromCssUnit( unit, settings ) ).toBe( expected );
-		} );
-		test.each( testData )(
-			'memoizedGetPxFromCssUnit( %s )',
-			( unit, expected ) => {
-				expect( memoizedGetPxFromCssUnit( unit, settings ) ).toBe(
-					expected
-				);
-			}
-		);
-		test.each( testData )(
-			'cached memoizedGetPxFromCssUnit( %s )',
-			( unit, expected ) => {
-				expect( memoizedGetPxFromCssUnit( unit, settings ) ).toBe(
-					expected
-				);
-			}
-		);
-	} );
-
-	// Function units.
-
-	describe( 'function unites should return px values', () => {
-		const settings = {
-			fontSize: 10,
-			width: 100,
-			height: 200,
-			lineHeight: 2,
-			type: 'font',
-		};
-
-		const testData = [
-			[ 'min(20px, 25px)', '20px' ],
-			[ 'min(20px, 9px, 12pt, 25px)', '9px' ],
-			[ 'max(20px, 25px)', '25px' ],
-			[ 'clamp(10px, 9px, 25px)', '10px' ],
-			[ 'clamp(10px, 35px, 25px)', '25px' ],
-			[ 'clamp(10px, 15px, 25px)', '15px' ],
-			[ 'min(max(20px,25px), 35px)', '25px' ],
-			[ 'max(min(20px,25px), 35px)', '35px' ],
-			[ '10px + 25px', '35px' ],
-			[ 'calc(10px + 25px)', '35px' ],
-			[ 'calc( 2 * 20px)', '40px' ],
-			[ 'calc(25px - 10px)', '15px' ],
-			[ 'min(10px + 25px, 55pt)', '35px' ],
-			[ 'calc(12vw * 10px)', '450px' ],
-			[ 'calc(45vw / 10px)', '17px' ],
-			[ '', null ],
-			[ undefined, null ],
-			[ 123, '123px' ],
-			[ 123.456, '123px' ],
-			[ 'abc', null ],
-			[ 'console.log("howdy"); + 10px', null ],
-			[ 'calc(12vw * 10px', null ], // Missing closing bracket.
-			[ 'calc( 1em + 0.875rem )', '30px' ], // Decimals
-			[
-				'clamp(1.8rem, 1.8rem + ((1vw / 0.48rem + 1rem) * 2.885), 3rem)',
-				'48px',
-			],
-			[
-				'clamp(5rem, 5.25rem + ((1vw - 0.48rem) * 9.096), 8rem)',
-				'80px',
-			],
-			[
-				'clamp(2.625rem, calc(2.625rem + ((1vw - 0.48rem) * 8.4135)), 3.25rem)',
-				'42px',
-			],
-			[ 'var:preset|font-size|medium', null ],
-		];
-
-		test.each( testData )( 'getPxFromCssUnit( %s )', ( unit, expected ) => {
-			expect( getPxFromCssUnit( unit, settings ) ).toBe( expected );
-		} );
-		test.each( testData )(
-			'memoizedGetPxFromCssUnit( %s )',
-			( unit, expected ) => {
-				expect( memoizedGetPxFromCssUnit( unit, settings ) ).toBe(
-					expected
-				);
-			}
-		);
-		test.each( testData )(
-			'cached memoizedGetPxFromCssUnit( %s )',
-			( unit, expected ) => {
-				expect( memoizedGetPxFromCssUnit( unit, settings ) ).toBe(
-					expected
-				);
-			}
-		);
-	} );
-	// Skip this test it might be useful in dev.
-	it.skip( 'test performance of memoizedGetPxFromCssUnit function', () => {
-		const start = Date.now();
-		let i = 0;
-		const intervals = 1000;
-		while ( i < intervals ) {
-			getPxFromCssUnit( 'max(25px, 35px)', { width: 200 } );
-			i++;
-		}
-		const rawDuration = Date.now() - start;
-
-		const startM = Date.now();
-		i = 0;
-		// The memoized Version should be at 10X better then the non default one.
-		while ( i < intervals * 10 ) {
-			memoizedGetPxFromCssUnit( 'max(25px, 35px)', { width: 201 } );
-			i++;
-		}
-		expect( rawDuration > Date.now() - startM ).toBe( true );
-	} );
-} );
diff --git a/packages/block-editor/src/utils/test/transform-styles.js b/packages/block-editor/src/utils/test/transform-styles.js
index 38eaa1947d2a8c..efe92cea63d0ff 100644
--- a/packages/block-editor/src/utils/test/transform-styles.js
+++ b/packages/block-editor/src/utils/test/transform-styles.js
@@ -51,6 +51,181 @@ describe( 'transformStyles', () => {
 				//                                                        ^^^^ In PostCSS, a tab is equal four spaces
 			);
 		} );
+
+		it( 'should handle multiple instances of `:root :where(body)`', () => {
+			const input = `:root :where(body) { color: pink; } :root :where(body) { color: orange; }`;
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected =
+				':root :where(body) .my-namespace { color: pink; } :root :where(body) .my-namespace { color: orange; }';
+
+			expect( output ).toEqual( [ expected ] );
+		} );
+	} );
+
+	describe( 'root selectors', () => {
+		it( 'should append prefix after `:root :where(body)` selectors', () => {
+			const input = ':root :where(body) { color: red; }';
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected = ':root :where(body) .my-namespace { color: red; }';
+
+			expect( output ).toEqual( [ expected ] );
+		} );
+
+		it( 'should append prefix after `:where(body)` selectors', () => {
+			const input = ':where(body) { color: red; }';
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected = ':where(body) .my-namespace { color: red; }';
+
+			expect( output ).toEqual( [ expected ] );
+		} );
+
+		it( 'should append prefix after body selectors', () => {
+			const input = `body { color: red; }`;
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected = 'body .my-namespace { color: red; }';
+
+			expect( output ).toEqual( [ expected ] );
+		} );
+
+		it( 'should append prefix after html selectors', () => {
+			const input = `html { color: red; }`;
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected = 'html .my-namespace { color: red; }';
+
+			expect( output ).toEqual( [ expected ] );
+		} );
+
+		it( 'should append prefix after html selectors, but before selectors that contain the word html', () => {
+			const input = `html [data-type="core/html"] .test { color: red; }`;
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected =
+				'html .my-namespace [data-type="core/html"] .test { color: red; }';
+
+			expect( output ).toEqual( [ expected ] );
+		} );
+
+		it( 'should append prefix after :root selectors', () => {
+			const input = ':root { color: red; }';
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected = ':root .my-namespace { color: red; }';
+
+			expect( output ).toEqual( [ expected ] );
+		} );
+
+		it( 'should append prefix after root selector when the selector contains a combinator without spaces around it', () => {
+			const input = `
+				body> .some-style { color: red; }
+				body>.some-style { color: blue; }
+				body >.some-style { color: yellow; }
+				html body > .some-style { color: purple; }
+				html body.with-class+.some-style { color: silver; }
+				html body.with-class~.some-style { color: goldenrod; }
+			`;
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected = `
+				body .my-namespace>.some-style { color: red; }
+				body .my-namespace>.some-style { color: blue; }
+				body .my-namespace>.some-style { color: yellow; }
+				html body .my-namespace>.some-style { color: purple; }
+				html body.with-class .my-namespace+.some-style { color: silver; }
+				html body.with-class .my-namespace~.some-style { color: goldenrod; }
+			`;
+
+			expect( output ).toEqual( [ expected ] );
+		} );
+
+		it( 'appends after multiple root selectors', () => {
+			const input = `
+			    :root html[lang="th"] body { color: red; }
+			    :root html[lang="th"] { color: orange; }
+			    :root html[lang="th"] body .some-class { color: green; }
+			`;
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected = `
+			    :root html[lang="th"] body .my-namespace { color: red; }
+			    :root html[lang="th"] .my-namespace { color: orange; }
+			    :root html[lang="th"] body .my-namespace .some-class { color: green; }
+			`;
+
+			expect( output ).toEqual( [ expected ] );
+		} );
+
+		it( 'should not double prefix a root selector', () => {
+			const input = 'body .my-namespace h1  { color: goldenrod; }';
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+
+			expect( output ).toEqual( [ input ] );
+		} );
 	} );
 
 	describe( 'selector wrap', () => {
@@ -64,8 +239,9 @@ describe( 'transformStyles', () => {
 				],
 				'.my-namespace'
 			);
+			const expected = '.my-namespace h1 { color: red; }';
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ expected ] );
 		} );
 
 		it( 'should wrap multiple selectors', () => {
@@ -78,11 +254,13 @@ describe( 'transformStyles', () => {
 				],
 				'.my-namespace'
 			);
+			const expected =
+				'.my-namespace h1, .my-namespace h2 { color: red; }';
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ expected ] );
 		} );
 
-		it( 'should ignore selectors', () => {
+		it( 'should ignore ignored selectors', () => {
 			const input = `h1, body { color: red; }`;
 			const output = transformStyles(
 				[
@@ -93,12 +271,13 @@ describe( 'transformStyles', () => {
 				],
 				'.my-namespace'
 			);
+			const expected = '.my-namespace h1, body { color: red; }';
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ expected ] );
 		} );
 
-		it( 'should replace root tags', () => {
-			const input = `body, h1 { color: red; }`;
+		it( `should not try to replace 'body' in the middle of a classname`, () => {
+			const input = '.has-body-text { color: red; }';
 			const output = transformStyles(
 				[
 					{
@@ -107,13 +286,14 @@ describe( 'transformStyles', () => {
 				],
 				'.my-namespace'
 			);
+			const expected = '.my-namespace .has-body-text { color: red; }';
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ expected ] );
 		} );
 
 		it( 'should ignore keyframes', () => {
 			const input = `
-			@keyframes edit-post__fade-in-animation {
+			@keyframes __wp-base-styles-fade-in {
 				from {
 					opacity: 0;
 				}
@@ -127,7 +307,7 @@ describe( 'transformStyles', () => {
 				'.my-namespace'
 			);
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ input ] );
 		} );
 
 		it( 'should wrap selectors inside container queries', () => {
@@ -143,8 +323,12 @@ describe( 'transformStyles', () => {
 				],
 				'.my-namespace'
 			);
+			const expected = `
+			@container (width > 400px) {
+				  .my-namespace h1 { color: red; }
+			}`;
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ expected ] );
 		} );
 
 		it( 'should ignore font-face selectors', () => {
@@ -162,14 +346,11 @@ describe( 'transformStyles', () => {
 				'.my-namespace'
 			);
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ input ] );
 		} );
 
-		it( 'should replace :root selectors', () => {
-			const input = `
-			:root {
-				--my-color: #ff0000;
-			}`;
+		it( 'should not double wrap selectors', () => {
+			const input = ' .my-namespace h1, .red { color: red; }';
 			const output = transformStyles(
 				[
 					{
@@ -178,13 +359,82 @@ describe( 'transformStyles', () => {
 				],
 				'.my-namespace'
 			);
+			const expected = ` .my-namespace h1, .my-namespace .red { color: red; }`;
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ expected ] );
 		} );
 
-		it( 'should not double wrap selectors', () => {
-			const input = ` .my-namespace h1, .red { color: red; }`;
+		it( 'should not double wrap selectors when the prefix can be misinterpreted as a regular expression', () => {
+			const input =
+				' :where(.editor-styles-wrapper) h1, .red { color: red; }';
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				':where(.editor-styles-wrapper)'
+			);
+			const expected = ` :where(.editor-styles-wrapper) h1, :where(.editor-styles-wrapper) .red { color: red; }`;
+
+			expect( output ).toEqual( [ expected ] );
+		} );
 
+		it( 'should allow specification of ignoredSelectors per css input', () => {
+			const input = '.ignored { color: red; }';
+			const output = transformStyles(
+				[
+					{
+						css: input,
+						ignoredSelectors: [ '.ignored' ],
+					},
+					{
+						css: input,
+						ignoredSelectors: [ /^\.ignored/ ],
+					},
+					{
+						css: input,
+					},
+				],
+				'.not'
+			);
+			const expected1 = input;
+			const expected2 = input;
+			const expected3 = '.not .ignored { color: red; }';
+
+			expect( output ).toEqual( [ expected1, expected2, expected3 ] );
+		} );
+
+		it( 'allows specification of ignoredSelectors globally via the transformOptions param', () => {
+			const input1 = '.ignored { color: red; }';
+			const input2 = '.modified { color: red; }';
+			const input3 = '.regexed { color: red; }';
+			const output = transformStyles(
+				[
+					{
+						css: input1,
+					},
+					{
+						css: input2,
+					},
+					{
+						css: input3,
+					},
+				],
+				'.prefix',
+				{ ignoredSelectors: [ '.ignored', /\.regexed/ ] }
+			);
+
+			expect( output ).toEqual( [
+				input1,
+				'.prefix .modified { color: red; }',
+				input3,
+			] );
+		} );
+
+		it( 'should not try to wrap items within `:where` selectors', () => {
+			const input =
+				':where(.wp-element-button:active, .wp-block-button__link:active) { color: blue; }';
 			const output = transformStyles(
 				[
 					{
@@ -193,8 +443,27 @@ describe( 'transformStyles', () => {
 				],
 				'.my-namespace'
 			);
+			const expected =
+				'.my-namespace :where(.wp-element-button:active, .wp-block-button__link:active) { color: blue; }';
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ expected ] );
+		} );
+
+		it( 'should not try to prefix pseudo elements on `:where` selectors', () => {
+			const input =
+				':where(.wp-element-button, .wp-block-button__link)::before { color: blue; }';
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				'.my-namespace'
+			);
+			const expected =
+				'.my-namespace :where(.wp-element-button, .wp-block-button__link)::before { color: blue; }';
+
+			expect( output ).toEqual( [ expected ] );
 		} );
 	} );
 
@@ -211,7 +480,7 @@ describe( 'transformStyles', () => {
 			},
 		] );
 
-		expect( output ).toMatchSnapshot();
+		expect( output ).toEqual( [ input ] );
 	} );
 
 	describe( 'URL rewrite', () => {
@@ -223,8 +492,10 @@ describe( 'transformStyles', () => {
 					baseURL: 'http://wp-site.local/themes/gut/css/',
 				},
 			] );
+			const expected =
+				'h1 { background: url(http://wp-site.local/themes/gut/css/images/test.png); }';
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ expected ] );
 		} );
 
 		it( 'should replace complex relative paths', () => {
@@ -235,8 +506,10 @@ describe( 'transformStyles', () => {
 					baseURL: 'http://wp-site.local/themes/gut/css/',
 				},
 			] );
+			const expected =
+				'h1 { background: url(http://wp-site.local/themes/gut/images/test.png); }';
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ expected ] );
 		} );
 
 		it( 'should not replace absolute paths', () => {
@@ -247,8 +520,7 @@ describe( 'transformStyles', () => {
 					baseURL: 'http://wp-site.local/themes/gut/css/',
 				},
 			] );
-
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ input ] );
 		} );
 
 		it( 'should not replace remote paths', () => {
@@ -260,7 +532,7 @@ describe( 'transformStyles', () => {
 				},
 			] );
 
-			expect( output ).toMatchSnapshot();
+			expect( output ).toEqual( [ input ] );
 		} );
 	} );
 } );
diff --git a/packages/block-editor/src/utils/test/use-block-bindings-utils.js b/packages/block-editor/src/utils/test/use-block-bindings-utils.js
new file mode 100644
index 00000000000000..e5e26bd24c20d1
--- /dev/null
+++ b/packages/block-editor/src/utils/test/use-block-bindings-utils.js
@@ -0,0 +1,174 @@
+/**
+ * External dependencies
+ */
+import { renderHook } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { dispatch, select } from '@wordpress/data';
+import {
+	createBlock,
+	getBlockTypes,
+	unregisterBlockType,
+} from '@wordpress/blocks';
+import { registerCoreBlocks } from '@wordpress/block-library';
+
+/**
+ * Internal dependencies
+ */
+import { useBlockBindingsUtils } from '../';
+
+describe( 'useBlockBindingsUtils', () => {
+	beforeAll( () => {
+		// Register all core blocks
+		registerCoreBlocks();
+	} );
+
+	let clientId;
+	beforeEach( async () => {
+		const block = createBlock( 'core/paragraph', {
+			metadata: {
+				name: 'Block name',
+				bindings: {
+					prop1: {
+						source: 'core/post-meta',
+						args: {
+							key: 'initial_key',
+						},
+					},
+					prop2: {
+						source: 'core/post-meta',
+						args: {
+							key: 'initial_key',
+						},
+					},
+				},
+			},
+		} );
+		await dispatch( blockEditorStore ).resetBlocks( [ block ] );
+		clientId = block.clientId;
+	} );
+
+	afterAll( () => {
+		// Remove blocks after all tests.
+		dispatch( blockEditorStore ).resetBlocks( [] );
+
+		// Clean up registered blocks
+		getBlockTypes().forEach( ( block ) => {
+			unregisterBlockType( block.name );
+		} );
+	} );
+
+	it( 'should be possible to update just one connection', async () => {
+		renderHook( () => {
+			const { updateBlockBindings } = useBlockBindingsUtils( clientId );
+			updateBlockBindings( {
+				prop1: {
+					source: 'core/post-meta',
+					args: {
+						key: 'new_key',
+					},
+				},
+			} );
+		} );
+		const { metadata } =
+			await select( blockEditorStore ).getBlockAttributes( clientId );
+		expect( metadata ).toMatchObject( {
+			// Other metadata properties shouldn't change.
+			name: 'Block name',
+			bindings: {
+				prop1: {
+					source: 'core/post-meta',
+					args: {
+						key: 'new_key',
+					},
+				},
+				prop2: {
+					source: 'core/post-meta',
+					args: {
+						key: 'initial_key',
+					},
+				},
+			},
+		} );
+	} );
+
+	it( 'should be possible to update multiple connections at once', async () => {
+		renderHook( () => {
+			const { updateBlockBindings } = useBlockBindingsUtils( clientId );
+			updateBlockBindings( {
+				prop1: {
+					source: 'core/post-meta',
+					args: {
+						key: 'new_key',
+					},
+				},
+				prop2: {
+					source: 'core/post-meta',
+					args: {
+						key: 'new_key',
+					},
+				},
+			} );
+		} );
+		const { metadata } =
+			await select( blockEditorStore ).getBlockAttributes( clientId );
+		expect( metadata ).toMatchObject( {
+			// Other metadata properties shouldn't change.
+			name: 'Block name',
+			bindings: {
+				prop1: {
+					source: 'core/post-meta',
+					args: {
+						key: 'new_key',
+					},
+				},
+				prop2: {
+					source: 'core/post-meta',
+					args: {
+						key: 'new_key',
+					},
+				},
+			},
+		} );
+	} );
+
+	it( 'should be possible to remove connections', async () => {
+		renderHook( () => {
+			const { updateBlockBindings } = useBlockBindingsUtils( clientId );
+			updateBlockBindings( {
+				prop2: undefined,
+			} );
+		} );
+		const { metadata } =
+			await select( blockEditorStore ).getBlockAttributes( clientId );
+		expect( metadata ).toMatchObject( {
+			// Other metadata properties shouldn't change.
+			name: 'Block name',
+			bindings: {
+				prop1: {
+					source: 'core/post-meta',
+					args: {
+						key: 'initial_key',
+					},
+				},
+			},
+		} );
+	} );
+
+	it( 'should be possible to remove all connections', async () => {
+		renderHook( () => {
+			const { removeAllBlockBindings } =
+				useBlockBindingsUtils( clientId );
+			removeAllBlockBindings();
+		} );
+		const { metadata } =
+			await select( blockEditorStore ).getBlockAttributes( clientId );
+		expect( metadata ).toMatchObject( {
+			// Other metadata properties shouldn't change.
+			name: 'Block name',
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/utils/transform-styles/index.js b/packages/block-editor/src/utils/transform-styles/index.js
index 742e3a9becaef3..936ebb016fa1b3 100644
--- a/packages/block-editor/src/utils/transform-styles/index.js
+++ b/packages/block-editor/src/utils/transform-styles/index.js
@@ -1,62 +1,194 @@
 /**
  * External dependencies
  */
+import * as parsel from 'parsel-js';
 import postcss, { CssSyntaxError } from 'postcss';
-import wrap from 'postcss-prefixwrap';
+import prefixSelector from 'postcss-prefix-selector';
 import rebaseUrl from 'postcss-urlrebase';
 
+const cacheByWrapperSelector = new Map();
+
+const ROOT_SELECTOR_TOKENS = [
+	{ type: 'type', content: 'body' },
+	{ type: 'type', content: 'html' },
+	{ type: 'pseudo-class', content: ':root' },
+	{ type: 'pseudo-class', content: ':where(body)' },
+	{ type: 'pseudo-class', content: ':where(:root)' },
+	{ type: 'pseudo-class', content: ':where(html)' },
+];
+
 /**
- * Applies a series of CSS rule transforms to wrap selectors inside a given class and/or rewrite URLs depending on the parameters passed.
+ * Prefixes root selectors in a way that ensures consistent specificity.
+ * This requires special handling, since prefixing a classname before
+ * html, body, or :root will generally result in an invalid selector.
  *
- * @typedef {Object} EditorStyle
- * @property {string}        css              the CSS block(s), as a single string.
- * @property {?string}       baseURL          the base URL to be used as the reference when rewritting urls.
- * @property {?string[]}     ignoredSelectors the selectors not to wrap.
+ * Some libraries will simply replace the root selector with the prefix
+ * instead, but this results in inconsistent specificity.
  *
- * @param    {EditorStyle[]} styles           CSS rules.
- * @param    {string}        wrapperSelector  Wrapper selector.
- * @return {Array} converted rules.
+ * This function instead inserts the prefix after the root tags but before
+ * any other part of the selector. This results in consistent specificity:
+ * - If a `:where()` selector is used for the prefix, all selectors output
+ *   by `transformStyles` will have no specificity increase.
+ * - If a classname, id, or something else is used as the prefix, all selectors
+ *   will have the same specificity bump when transformed.
+ *
+ * @param {string} prefix   The prefix.
+ * @param {string} selector The selector.
+ *
+ * @return {string} The prefixed root selector.
  */
-const transformStyles = ( styles, wrapperSelector = '' ) => {
-	return styles.map( ( { css, ignoredSelectors = [], baseURL } ) => {
-		// When there is no wrapper selector or base URL, there is no need
-		// to transform the CSS. This is most cases because in the default
-		// iframed editor, no wrapping is needed, and not many styles
-		// provide a base URL.
-		if ( ! wrapperSelector && ! baseURL ) {
-			return css;
+function prefixRootSelector( prefix, selector ) {
+	// Use a tokenizer, since regular expressions are unreliable.
+	const tokenized = parsel.tokenize( selector );
+
+	// Find the last token that contains a root selector by walking back
+	// through the tokens.
+	const lastRootIndex = tokenized.findLastIndex( ( { content, type } ) => {
+		return ROOT_SELECTOR_TOKENS.some(
+			( rootSelector ) =>
+				content === rootSelector.content && type === rootSelector.type
+		);
+	} );
+
+	// Walk forwards to find the combinator after the last root.
+	// This is where the root ends and the rest of the selector begins,
+	// and the index to insert before.
+	// Doing it this way takes into account that a root selector like
+	// 'body' may have additional id/class/pseudo-class/attribute-selector
+	// parts chained to it, which is difficult to quantify using a regex.
+	let insertionPoint = -1;
+	for ( let i = lastRootIndex + 1; i < tokenized.length; i++ ) {
+		if ( tokenized[ i ].type === 'combinator' ) {
+			insertionPoint = i;
+			break;
+		}
+	}
+
+	// Tokenize and insert the prefix with a ' ' combinator before it.
+	const tokenizedPrefix = parsel.tokenize( prefix );
+	tokenized.splice(
+		// Insert at the insertion point, or the end.
+		insertionPoint === -1 ? tokenized.length : insertionPoint,
+		0,
+		{
+			type: 'combinator',
+			content: ' ',
+		},
+		...tokenizedPrefix
+	);
+
+	return parsel.stringify( tokenized );
+}
+
+function transformStyle(
+	{ css, ignoredSelectors = [], baseURL },
+	wrapperSelector = '',
+	transformOptions
+) {
+	// When there is no wrapper selector and no base URL, there is no need
+	// to transform the CSS. This is most cases because in the default
+	// iframed editor, no wrapping is needed, and not many styles
+	// provide a base URL.
+	if ( ! wrapperSelector && ! baseURL ) {
+		return css;
+	}
+
+	try {
+		const excludedSelectors = [
+			...ignoredSelectors,
+			...( transformOptions?.ignoredSelectors ?? [] ),
+			wrapperSelector,
+		];
+
+		return postcss(
+			[
+				wrapperSelector &&
+					prefixSelector( {
+						prefix: wrapperSelector,
+						transform( prefix, selector, prefixedSelector ) {
+							// For backwards compatibility, don't use the `exclude` option
+							// of postcss-prefix-selector, instead handle it here to match
+							// the behavior of the old library (postcss-prefix-wrap) that
+							// `transformStyle` previously used.
+							if (
+								excludedSelectors.some( ( excludedSelector ) =>
+									excludedSelector instanceof RegExp
+										? selector.match( excludedSelector )
+										: selector.includes( excludedSelector )
+								)
+							) {
+								return selector;
+							}
+
+							const hasRootSelector = ROOT_SELECTOR_TOKENS.some(
+								( rootSelector ) =>
+									selector.startsWith( rootSelector.content )
+							);
+
+							// Reorganize root selectors such that the root part comes before the prefix,
+							// but the prefix still comes before the remaining part of the selector.
+							if ( hasRootSelector ) {
+								return prefixRootSelector( prefix, selector );
+							}
+
+							return prefixedSelector;
+						},
+					} ),
+				baseURL && rebaseUrl( { rootUrl: baseURL } ),
+			].filter( Boolean )
+		).process( css, {} ).css; // use sync PostCSS API
+	} catch ( error ) {
+		if ( error instanceof CssSyntaxError ) {
+			// eslint-disable-next-line no-console
+			console.warn(
+				'wp.blockEditor.transformStyles Failed to transform CSS.',
+				error.message + '\n' + error.showSourceCode( false )
+			);
+		} else {
+			// eslint-disable-next-line no-console
+			console.warn(
+				'wp.blockEditor.transformStyles Failed to transform CSS.',
+				error
+			);
 		}
 
-		try {
-			return postcss(
-				[
-					wrapperSelector &&
-						wrap( wrapperSelector, {
-							ignoredSelectors: [
-								...ignoredSelectors,
-								wrapperSelector,
-							],
-						} ),
-					baseURL && rebaseUrl( { rootUrl: baseURL } ),
-				].filter( Boolean )
-			).process( css, {} ).css; // use sync PostCSS API
-		} catch ( error ) {
-			if ( error instanceof CssSyntaxError ) {
-				// eslint-disable-next-line no-console
-				console.warn(
-					'wp.blockEditor.transformStyles Failed to transform CSS.',
-					error.message + '\n' + error.showSourceCode( false )
-				);
-			} else {
-				// eslint-disable-next-line no-console
-				console.warn(
-					'wp.blockEditor.transformStyles Failed to transform CSS.',
-					error
-				);
-			}
-
-			return null;
+		return null;
+	}
+}
+
+/**
+ * @typedef {Object} EditorStyle
+ * @property {string}    css              the CSS block(s), as a single string.
+ * @property {?string}   baseURL          the base URL to be used as the reference when rewritting urls.
+ * @property {?string[]} ignoredSelectors the selectors not to wrap.
+ */
+
+/**
+ * @typedef {Object} TransformOptions
+ * @property {?string[]} ignoredSelectors the selectors not to wrap.
+ */
+
+/**
+ * Applies a series of CSS rule transforms to wrap selectors inside a given class and/or rewrite URLs depending on the parameters passed.
+ *
+ * @param {EditorStyle[]}    styles           CSS rules.
+ * @param {string}           wrapperSelector  Wrapper selector.
+ * @param {TransformOptions} transformOptions Additional options for style transformation.
+ * @return {Array} converted rules.
+ */
+const transformStyles = ( styles, wrapperSelector = '', transformOptions ) => {
+	let cache = cacheByWrapperSelector.get( wrapperSelector );
+	if ( ! cache ) {
+		cache = new WeakMap();
+		cacheByWrapperSelector.set( wrapperSelector, cache );
+	}
+	return styles.map( ( style ) => {
+		let css = cache.get( style );
+		if ( ! css ) {
+			css = transformStyle( style, wrapperSelector, transformOptions );
+			cache.set( style, css );
 		}
+		return css;
 	} );
 };
 
diff --git a/packages/block-editor/src/utils/use-should-contextual-toolbar-show.js b/packages/block-editor/src/utils/use-should-contextual-toolbar-show.js
deleted file mode 100644
index 1aae7b99cbf140..00000000000000
--- a/packages/block-editor/src/utils/use-should-contextual-toolbar-show.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';
-import { useViewportMatch } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { store as blockEditorStore } from '../store';
-import { unlock } from '../lock-unlock';
-
-/**
- * Returns true if the contextual block toolbar should show, or false if it should be hidden.
- *
- * @return {boolean} Whether the block toolbar is hidden.
- */
-export function useShouldContextualToolbarShow() {
-	const isLargeViewport = useViewportMatch( 'medium' );
-
-	const {
-		shouldShowContextualToolbar,
-		canFocusHiddenToolbar,
-		fixedToolbarCanBeFocused,
-	} = useSelect(
-		( select ) => {
-			const {
-				__unstableGetEditorMode,
-				isMultiSelecting,
-				isTyping,
-				isBlockInterfaceHidden,
-				getBlock,
-				getSettings,
-				isNavigationMode,
-				getSelectedBlockClientId,
-				getFirstMultiSelectedBlockClientId,
-			} = unlock( select( blockEditorStore ) );
-
-			const isEditMode = __unstableGetEditorMode() === 'edit';
-			const hasFixedToolbar = getSettings().hasFixedToolbar;
-			const isDistractionFree = getSettings().isDistractionFree;
-			const selectedBlockId =
-				getFirstMultiSelectedBlockClientId() ||
-				getSelectedBlockClientId();
-			const hasSelectedBlockId = !! selectedBlockId;
-			const isEmptyDefaultBlock = isUnmodifiedDefaultBlock(
-				getBlock( selectedBlockId ) || {}
-			);
-
-			const _shouldShowContextualToolbar =
-				isEditMode &&
-				! hasFixedToolbar &&
-				( ! isDistractionFree || isNavigationMode() ) &&
-				isLargeViewport &&
-				! isMultiSelecting() &&
-				! isTyping() &&
-				hasSelectedBlockId &&
-				! isEmptyDefaultBlock &&
-				! isBlockInterfaceHidden();
-
-			const _canFocusHiddenToolbar =
-				isEditMode &&
-				hasSelectedBlockId &&
-				! _shouldShowContextualToolbar &&
-				! hasFixedToolbar &&
-				! isDistractionFree &&
-				! isEmptyDefaultBlock;
-
-			return {
-				shouldShowContextualToolbar: _shouldShowContextualToolbar,
-				canFocusHiddenToolbar: _canFocusHiddenToolbar,
-				fixedToolbarCanBeFocused:
-					( hasFixedToolbar || ! isLargeViewport ) && selectedBlockId,
-			};
-		},
-		[ isLargeViewport ]
-	);
-
-	return {
-		shouldShowContextualToolbar,
-		canFocusHiddenToolbar,
-		fixedToolbarCanBeFocused,
-	};
-}
diff --git a/packages/block-editor/tsconfig.json b/packages/block-editor/tsconfig.json
index ed81774f6071c8..37fb61895d252e 100644
--- a/packages/block-editor/tsconfig.json
+++ b/packages/block-editor/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
@@ -7,6 +8,7 @@
 	"references": [
 		{ "path": "../a11y" },
 		{ "path": "../api-fetch" },
+		{ "path": "../block-serialization-default-parser" },
 		{ "path": "../blob" },
 		{ "path": "../components" },
 		{ "path": "../compose" },
diff --git a/packages/block-library/.npmrc b/packages/block-library/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/block-library/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/block-library/CHANGELOG.md b/packages/block-library/CHANGELOG.md
index c9c647c16105f3..b3788917cfbb95 100644
--- a/packages/block-library/CHANGELOG.md
+++ b/packages/block-library/CHANGELOG.md
@@ -2,6 +2,63 @@
 
 ## Unreleased
 
+## 9.10.0 (2024-10-16)
+
+## 9.9.0 (2024-10-03)
+
+## 9.8.0 (2024-09-19)
+
+## 9.7.0 (2024-09-05)
+
+## 9.6.0 (2024-08-21)
+
+## 9.5.0 (2024-08-07)
+
+### New Feature
+
+-   Query Loop Block: Moves per page, offset, and pages controls into Inspector Controls. ([#58207](https://github.com/WordPress/gutenberg/pull/58207))
+
+## 9.4.0 (2024-07-24)
+
+## 9.3.0 (2024-07-10)
+
+## 9.2.0 (2024-06-26)
+
+## 9.1.0 (2024-06-15)
+
+## 9.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 8.35.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 8.34.0 (2024-05-02)
+
+## 8.33.0 (2024-04-19)
+
+## 8.32.0 (2024-04-03)
+
+## 8.31.0 (2024-03-21)
+
+## 8.30.0 (2024-03-06)
+
+## 8.29.0 (2024-02-21)
+
+## 8.28.0 (2024-02-09)
+
+## 8.27.0 (2024-01-24)
+
+## 8.26.0 (2024-01-10)
+
+## 8.25.0 (2023-12-13)
+
 ## 8.24.0 (2023-11-29)
 
 ## 8.23.0 (2023-11-16)
@@ -10,11 +67,10 @@
 
 ## 8.21.0 (2023-10-18)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix Image block lightbox missing alt attribute and improve accessibility. ([#54608](https://github.com/WordPress/gutenberg/pull/55010))
 
-
 ## 8.20.0 (2023-10-05)
 
 ## 8.19.0 (2023-09-20)
@@ -59,7 +115,7 @@
 
 ### Breaking Changes
 
--   Updated dependencies to require React 18 ([45235](https://github.com/WordPress/gutenberg/pull/45235))
+-   Updated dependencies to require React 18 ([#45235](https://github.com/WordPress/gutenberg/pull/45235))
 
 ## 7.19.0 (2022-11-16)
 
@@ -73,13 +129,13 @@
 
 ## 7.14.0 (2022-09-13)
 
-### New Feature
+### New Features
 
 -   Made it possible to import individual blocks ([#42258](https://github.com/WordPress/gutenberg/pull/42258)). Check [README](./README.md#loading-individual-blocks) for more information.
 
 ## 7.13.0 (2022-08-24)
 
-### Bug Fix
+### Bug Fixes
 
 -   Ensure all dependencies allow version ranges ([#43355](https://github.com/WordPress/gutenberg/pull/43355)).
 
@@ -97,7 +153,7 @@
 
 ## 7.6.0 (2022-05-18)
 
-### Enhancement
+### Enhancements
 
 -   Declare blocks as \_\_experimental in block.json to automate syncing Gutenberg packages to WordPress ([#40655](https://github.com/WordPress/gutenberg/pull/40655)).
 
@@ -109,11 +165,11 @@
 
 ## 7.2.0 (2022-03-23)
 
-### Bug Fix
+### Bug Fixes
 
 -   Table block: Fix deprecation eligibility to prevent loss of named (color palette) background color ([#39445](https://github.com/WordPress/gutenberg/pull/39445)).
 
-### Enhancement
+### Enhancements
 
 -   Social Icons: Avoid loss of previously selected background color when switching back from "Logos Only" style ([#39276](https://github.com/WordPress/gutenberg/pull/39276)).
 
@@ -121,11 +177,11 @@
 
 ## 7.0.0 (2022-02-10)
 
-### Breaking Change
+### Breaking Changes
 
 -   The `GUTENBERG_PHASE` environment variable has been renamed to `IS_GUTENBERG_PLUGIN` and is now a boolean ([#38202](https://github.com/WordPress/gutenberg/pull/38202)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Gallery block: disable edit as html support ([#39318](https://github.com/WordPress/gutenberg/pull/39318)).
 -   Removed unused `@wordpress/escape-html` and `@wordpress/is-shallow-equal` dependencies ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
@@ -136,13 +192,13 @@
 
 ## 6.0.0 (2021-09-09)
 
-### Breaking Change
+### Breaking Changes
 
 -   Remove the background-colors, foreground-colors, and gradient-colors mixins.
 
 ## 5.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -168,8 +224,8 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 
 ## 2.29.0 (2021-03-17)
 
@@ -189,7 +245,7 @@
 
 ## 2.27.0 (2020-12-17)
 
-### Enhancement
+### Enhancements
 
 -   File Block: Copy url button is moved to Block toolbar.
 -   Code and Preformatted Blocks: delete on backspace from an empty block.
@@ -201,13 +257,13 @@
     ([#26569](https://github.com/WordPress/gutenberg/pull/26569)).
 -   Fix Image Block, reset image dimensions when replace URL. bug mentioned in ([#26333](https://github.com/WordPress/gutenberg/issues/26333)).
 
-### Enhancement
+### Enhancements
 
 -   File Block: Copy url button is moved to Block toolbar.
 
 ## 2.23.0 (2020-09-03)
 
-### Enhancement
+### Enhancements
 
 -   Site title is now a link.
 
@@ -254,7 +310,7 @@
 
 ## 2.3.0 (2019-03-06)
 
-### New Feature
+### New Features
 
 -   Add background color controls for the table block.
 -   Add new `RSS` block ([#7966](https://github.com/WordPress/gutenberg/pull/7966)).
@@ -286,7 +342,7 @@
 
 ## 2.2.2 (2018-11-12)
 
-### Polish
+### Internal
 
 -   Columns Block: Improve usability while editing columns.
 
@@ -300,7 +356,7 @@
 
 ## 2.1.8 (2018-11-03)
 
-### Polish
+### Internal
 
 -   File Block: Create file blocks when dropping multiple files at once.
 
@@ -334,7 +390,7 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
 
diff --git a/packages/block-library/README.md b/packages/block-library/README.md
index 25c5f9b52c71a4..a6d1984cda98cc 100644
--- a/packages/block-library/README.md
+++ b/packages/block-library/README.md
@@ -66,7 +66,7 @@ To find out more about contributing to this package or Gutenberg as a whole, ple
 
 ⚠️ Adding new blocks to this package **requires** additional steps!
 
-1.  Do not forget to register a new core block in the [`index.js`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/index.js) file of this package. For example, if you were to add the new core block called `core/blinking-paragraph`, you would have to add something like:
+1.  Do not forget to register a new core block in the [`index.js`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/index.js) file of this package. For example, if you were to add the new core block called `core/blinking-paragraph`, you would have to add something like:
 
     ```js
     // packages/block-library/src/index.js
@@ -98,21 +98,26 @@ To find out more about contributing to this package or Gutenberg as a whole, ple
 
     This file is used when using the option to register individual block from the `@wordpress/block-library` package.
 
-4.  If a `view.js` file (or a file prefixed with `view`, e.g. `view-example.js`) is present in the block's directory, this file will be built along other assets, making it available to load from the browser. You only need to reference a `view.min.js` (notice the different file extension) file in the `block.json` file as follows:
+4.  If the block exposes a script module on the front end, it must be included in the package's `package.json` file in the `wpScriptModules` object. This will include the script module when it's bundled for use in WordPress. See [the packages README for more details.](../README.md):
 
     ```json
     {
-    	"viewScript": "file:./view.min.js"
+    	"name": "@wordpress/block-library",
+    	"wpScriptModuleExports": {
+    		"./blinking-paragraph/view": "./build-module/blinking-paragraph/view.js",
+    		"./image/view": "./build-module/image/view.js"
+    		// Add any new script modules here.
+    	}
     }
     ```
 
-    This file will get automatically loaded when the static block is present on the front end. For dynamic block, you need to manually enqueue the view script in `render_callback` of the block, example:
+    For every dynamic block, you need to manually enqueue the view script module in `render_callback` of the block, example:
 
     ```php
     function render_block_core_blinking_paragraph( $attributes, $content ) {
-        $should_load_view_script = ! empty( $attributes['isInteractive'] ) && ! wp_script_is( 'wp-block-blinking-paragraph-view' );
+        $should_load_view_script = ! empty( $attributes['isInteractive'] );
         if ( $should_load_view_script ) {
-    	    wp_enqueue_script( 'wp-block-blinking-paragraph-view' );
+    	    wp_enqueue_script_module( '@wordpress/block-library/blinking-paragraph' );
         }
 
     	return $content;
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index f989e586ec7b83..18ad0e46059c91 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "8.24.0",
+	"version": "9.10.0",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -29,40 +30,50 @@
 		"src/**/*.scss",
 		"{src,build,build-module}/*/init.js"
 	],
+	"wpScriptModuleExports": {
+		"./file/view": "./build-module/file/view.js",
+		"./image/view": "./build-module/image/view.js",
+		"./navigation/view": "./build-module/navigation/view.js",
+		"./query/view": "./build-module/query/view.js",
+		"./search/view": "./build-module/search/view.js"
+	},
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/autop": "file:../autop",
-		"@wordpress/blob": "file:../blob",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/date": "file:../date",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/element": "file:../element",
-		"@wordpress/escape-html": "file:../escape-html",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/interactivity": "file:../interactivity",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/notices": "file:../notices",
-		"@wordpress/primitives": "file:../primitives",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/reusable-blocks": "file:../reusable-blocks",
-		"@wordpress/rich-text": "file:../rich-text",
-		"@wordpress/server-side-render": "file:../server-side-render",
-		"@wordpress/url": "file:../url",
-		"@wordpress/viewport": "file:../viewport",
-		"@wordpress/wordcount": "file:../wordcount",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/autop": "*",
+		"@wordpress/blob": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/date": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/element": "*",
+		"@wordpress/escape-html": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/interactivity": "*",
+		"@wordpress/interactivity-router": "*",
+		"@wordpress/keyboard-shortcuts": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/patterns": "*",
+		"@wordpress/primitives": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/reusable-blocks": "*",
+		"@wordpress/rich-text": "*",
+		"@wordpress/server-side-render": "*",
+		"@wordpress/url": "*",
+		"@wordpress/viewport": "*",
+		"@wordpress/wordcount": "*",
 		"change-case": "^4.1.2",
-		"classnames": "^2.3.1",
+		"clsx": "^2.1.1",
 		"colord": "^2.7.0",
 		"escape-html": "^1.0.3",
 		"fast-average-color": "^9.1.1",
@@ -77,5 +88,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/block-library/src/archives/block.json b/packages/block-library/src/archives/block.json
index 7e0f5181d2c3dd..7fe956a994ed5a 100644
--- a/packages/block-library/src/archives/block.json
+++ b/packages/block-library/src/archives/block.json
@@ -26,6 +26,12 @@
 	},
 	"supports": {
 		"align": true,
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true
+		},
 		"html": false,
 		"spacing": {
 			"margin": true,
@@ -47,6 +53,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-archives-editor"
diff --git a/packages/block-library/src/archives/edit.js b/packages/block-library/src/archives/edit.js
index 4eed206314e427..60b8715988ed94 100644
--- a/packages/block-library/src/archives/edit.js
+++ b/packages/block-library/src/archives/edit.js
@@ -51,8 +51,9 @@ export default function ArchivesEdit( { attributes, setAttributes } ) {
 						}
 					/>
 					<SelectControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
-						label={ __( 'Group by:' ) }
+						label={ __( 'Group by' ) }
 						options={ [
 							{ label: __( 'Year' ), value: 'yearly' },
 							{ label: __( 'Month' ), value: 'monthly' },
diff --git a/packages/block-library/src/archives/editor.scss b/packages/block-library/src/archives/editor.scss
index 6bb1d96431acf7..eb657b595f7141 100644
--- a/packages/block-library/src/archives/editor.scss
+++ b/packages/block-library/src/archives/editor.scss
@@ -1,3 +1,11 @@
 ul.wp-block-archives {
 	padding-left: 2.5em;
 }
+
+// The following styles are to prevent duplicate spacing and borders for the archives
+// block in the editor given it uses server side rendering.
+// See https://github.com/WordPress/gutenberg/pull/63400
+.wp-block-archives .wp-block-archives {
+	margin: 0;
+	border: 0;
+}
diff --git a/packages/block-library/src/archives/index.php b/packages/block-library/src/archives/index.php
index 695affde760a8a..2846b6ca1a03e1 100644
--- a/packages/block-library/src/archives/index.php
+++ b/packages/block-library/src/archives/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/archives` block on server.
  *
+ * @since 5.0.0
+ *
  * @see WP_Widget_Archives
  *
  * @param array $attributes The block attributes.
@@ -106,6 +108,8 @@ function render_block_core_archives( $attributes ) {
 
 /**
  * Register archives block.
+ *
+ * @since 5.0.0
  */
 function register_block_core_archives() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/audio/block.json b/packages/block-library/src/audio/block.json
index a4740e304451ce..9b77efee23cce2 100644
--- a/packages/block-library/src/audio/block.json
+++ b/packages/block-library/src/audio/block.json
@@ -8,22 +8,26 @@
 	"keywords": [ "music", "sound", "podcast", "recording" ],
 	"textdomain": "default",
 	"attributes": {
+		"blob": {
+			"type": "string",
+			"role": "local"
+		},
 		"src": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "audio",
 			"attribute": "src",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"caption": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "figcaption",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"id": {
 			"type": "number",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"autoplay": {
 			"type": "boolean",
@@ -54,6 +58,9 @@
 				"margin": false,
 				"padding": false
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-audio-editor",
diff --git a/packages/block-library/src/audio/edit.js b/packages/block-library/src/audio/edit.js
index 13fe6aa7ba53a5..e3b4ca670f957d 100644
--- a/packages/block-library/src/audio/edit.js
+++ b/packages/block-library/src/audio/edit.js
@@ -1,12 +1,12 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { getBlobByURL, isBlobURL } from '@wordpress/blob';
+import { isBlobURL } from '@wordpress/blob';
 import {
 	Disabled,
 	PanelBody,
@@ -21,18 +21,18 @@ import {
 	MediaPlaceholder,
 	MediaReplaceFlow,
 	useBlockProps,
-	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { useEffect } from '@wordpress/element';
 import { __, _x } from '@wordpress/i18n';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch } from '@wordpress/data';
 import { audio as icon } from '@wordpress/icons';
 import { store as noticesStore } from '@wordpress/notices';
+import { useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { createUpgradedEmbedBlock } from '../embed/util';
+import { useUploadMediaFromBlobURL } from '../utils/hooks';
 import { Caption } from '../utils/caption';
 
 const ALLOWED_MEDIA_TYPES = [ 'audio' ];
@@ -42,30 +42,18 @@ function AudioEdit( {
 	className,
 	setAttributes,
 	onReplace,
-	isSelected,
+	isSelected: isSingleSelected,
 	insertBlocksAfter,
 } ) {
 	const { id, autoplay, loop, preload, src } = attributes;
-	const isTemporaryAudio = ! id && isBlobURL( src );
-	const mediaUpload = useSelect( ( select ) => {
-		const { getSettings } = select( blockEditorStore );
-		return getSettings().mediaUpload;
-	}, [] );
-
-	useEffect( () => {
-		if ( ! id && isBlobURL( src ) ) {
-			const file = getBlobByURL( src );
-
-			if ( file ) {
-				mediaUpload( {
-					filesList: [ file ],
-					onFileChange: ( [ media ] ) => onSelectAudio( media ),
-					onError: ( e ) => onUploadError( e ),
-					allowedTypes: ALLOWED_MEDIA_TYPES,
-				} );
-			}
-		}
-	}, [] );
+	const [ temporaryURL, setTemporaryURL ] = useState( attributes.blob );
+
+	useUploadMediaFromBlobURL( {
+		url: temporaryURL,
+		allowedTypes: ALLOWED_MEDIA_TYPES,
+		onChange: onSelectAudio,
+		onError: onUploadError,
+	} );
 
 	function toggleAttribute( attribute ) {
 		return ( newValue ) => {
@@ -85,7 +73,8 @@ function AudioEdit( {
 				onReplace( embedBlock );
 				return;
 			}
-			setAttributes( { src: newSrc, id: undefined } );
+			setAttributes( { src: newSrc, id: undefined, blob: undefined } );
+			setTemporaryURL();
 		}
 	}
 
@@ -108,27 +97,37 @@ function AudioEdit( {
 				src: undefined,
 				id: undefined,
 				caption: undefined,
+				blob: undefined,
 			} );
+			setTemporaryURL();
 			return;
 		}
+
+		if ( isBlobURL( media.url ) ) {
+			setTemporaryURL( media.url );
+			return;
+		}
+
 		// Sets the block's attribute and updates the edit component from the
 		// selected media, then switches off the editing UI.
 		setAttributes( {
+			blob: undefined,
 			src: media.url,
 			id: media.id,
 			caption: media.caption,
 		} );
+		setTemporaryURL();
 	}
 
-	const classes = classnames( className, {
-		'is-transient': isTemporaryAudio,
+	const classes = clsx( className, {
+		'is-transient': !! temporaryURL,
 	} );
 
 	const blockProps = useBlockProps( {
 		className: classes,
 	} );
 
-	if ( ! src ) {
+	if ( ! src && ! temporaryURL ) {
 		return (
 			<div { ...blockProps }>
 				<MediaPlaceholder
@@ -146,17 +145,20 @@ function AudioEdit( {
 
 	return (
 		<>
-			<BlockControls group="other">
-				<MediaReplaceFlow
-					mediaId={ id }
-					mediaURL={ src }
-					allowedTypes={ ALLOWED_MEDIA_TYPES }
-					accept="audio/*"
-					onSelect={ onSelectAudio }
-					onSelectURL={ onSelectURL }
-					onError={ onUploadError }
-				/>
-			</BlockControls>
+			{ isSingleSelected && (
+				<BlockControls group="other">
+					<MediaReplaceFlow
+						mediaId={ id }
+						mediaURL={ src }
+						allowedTypes={ ALLOWED_MEDIA_TYPES }
+						accept="audio/*"
+						onSelect={ onSelectAudio }
+						onSelectURL={ onSelectURL }
+						onError={ onUploadError }
+						onReset={ () => onSelectAudio( undefined ) }
+					/>
+				</BlockControls>
+			) }
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
 					<ToggleControl
@@ -173,6 +175,7 @@ function AudioEdit( {
 						checked={ loop }
 					/>
 					<SelectControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ _x( 'Preload', 'noun; Audio block parameter' ) }
 						value={ preload || '' }
@@ -196,20 +199,21 @@ function AudioEdit( {
 			</InspectorControls>
 			<figure { ...blockProps }>
 				{ /*
-					Disable the audio tag if the block is not selected
-					so the user clicking on it won't play the
-					file or change the position slider when the controls are enabled.
+				Disable the audio tag if the block is not selected
+				so the user clicking on it won't play the
+				file or change the position slider when the controls are enabled.
 				*/ }
-				<Disabled isDisabled={ ! isSelected }>
-					<audio controls="controls" src={ src } />
+				<Disabled isDisabled={ ! isSingleSelected }>
+					<audio controls="controls" src={ src ?? temporaryURL } />
 				</Disabled>
-				{ isTemporaryAudio && <Spinner /> }
+				{ !! temporaryURL && <Spinner /> }
 				<Caption
 					attributes={ attributes }
 					setAttributes={ setAttributes }
-					isSelected={ isSelected }
+					isSelected={ isSingleSelected }
 					insertBlocksAfter={ insertBlocksAfter }
 					label={ __( 'Audio caption text' ) }
+					showToolbarButton={ isSingleSelected }
 				/>
 			</figure>
 		</>
diff --git a/packages/block-library/src/audio/edit.native.js b/packages/block-library/src/audio/edit.native.js
index cccb692e789c5b..ab2b1b28441286 100644
--- a/packages/block-library/src/audio/edit.native.js
+++ b/packages/block-library/src/audio/edit.native.js
@@ -13,9 +13,9 @@ import {
 	ToggleControl,
 	ToolbarButton,
 	ToolbarGroup,
-	AudioPlayer,
 } from '@wordpress/components';
 import {
+	AudioPlayer,
 	BlockCaption,
 	BlockControls,
 	BlockIcon,
@@ -212,13 +212,13 @@ function AudioEdit( {
 									label: _x( 'None', '"Preload" value' ),
 								},
 							] }
-							hideCancelButton={ true }
+							hideCancelButton
 						/>
 					</PanelBody>
 				</InspectorControls>
 				<MediaUpload
 					allowedTypes={ ALLOWED_MEDIA_TYPES }
-					isReplacingMedia={ true }
+					isReplacingMedia
 					onSelect={ onSelectAudio }
 					onSelectURL={ onSelectURL }
 					render={ ( { open, getMediaOptions } ) => {
@@ -226,7 +226,7 @@ function AudioEdit( {
 					} }
 				/>
 				<BlockCaption
-					accessible={ true }
+					accessible
 					accessibilityLabelCreator={ ( caption ) =>
 						RichText.isEmpty( caption )
 							? /* translators: accessibility text. Empty Audio caption. */
diff --git a/packages/block-library/src/audio/style.scss b/packages/block-library/src/audio/style.scss
index 1b3d705dda019a..340ff3ff65f3f2 100644
--- a/packages/block-library/src/audio/style.scss
+++ b/packages/block-library/src/audio/style.scss
@@ -4,7 +4,7 @@
 	// Supply caption styles to audio blocks, even if the theme hasn't opted in.
 	// Reason being: the new markup, <figcaptions>, are not likely to be styled in the majority of existing themes,
 	// so we supply the styles so as to not appear broken or unstyled in those themes.
-	figcaption {
+	:where(figcaption) {
 		@include caption-style();
 	}
 
diff --git a/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap
index dca3f782efc676..4cf28f7063ad31 100644
--- a/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap
@@ -532,3 +532,15 @@ exports[`Audio block renders placeholder without crashing 1`] = `
   </View>
 </View>
 `;
+
+exports[`Audio block should enable autoplay setting 1`] = `
+"<!-- wp:audio {"id":5} -->
+<figure class="wp-block-audio"><audio controls src="https://cldup.com/59IrU0WJtq.mp3" autoplay></audio></figure>
+<!-- /wp:audio -->"
+`;
+
+exports[`Audio block should enable loop setting 1`] = `
+"<!-- wp:audio {"id":5} -->
+<figure class="wp-block-audio"><audio controls src="https://cldup.com/59IrU0WJtq.mp3" loop></audio></figure>
+<!-- /wp:audio -->"
+`;
diff --git a/packages/block-library/src/audio/test/edit.native.js b/packages/block-library/src/audio/test/edit.native.js
index c191fd2fff7989..7296d595d7aaab 100644
--- a/packages/block-library/src/audio/test/edit.native.js
+++ b/packages/block-library/src/audio/test/edit.native.js
@@ -5,7 +5,10 @@ import {
 	addBlock,
 	dismissModal,
 	fireEvent,
+	getBlock,
+	getEditorHtml,
 	initializeEditor,
+	openBlockSettings,
 	render,
 	screen,
 	setupCoreBlocks,
@@ -31,6 +34,10 @@ jest.unmock( '@wordpress/react-native-aztec' );
 
 const MEDIA_UPLOAD_STATE_FAILED = 3;
 
+const AUDIO_BLOCK = `<!-- wp:audio {"id":5} -->
+<figure class="wp-block-audio"><audio controls src="https://cldup.com/59IrU0WJtq.mp3"></audio></figure>
+<!-- /wp:audio -->`;
+
 let uploadCallBack;
 subscribeMediaUpload.mockImplementation( ( callback ) => {
 	uploadCallBack = callback;
@@ -100,4 +107,26 @@ describe( 'Audio block', () => {
 			screen.getByText( 'Invalid URL. Audio file not found.' )
 		).toBeVisible();
 	} );
+
+	it( 'should enable autoplay setting', async () => {
+		await initializeEditor( { initialHtml: AUDIO_BLOCK } );
+
+		const audioBlock = getBlock( screen, 'Audio' );
+		fireEvent.press( audioBlock );
+		await openBlockSettings( screen );
+
+		fireEvent.press( screen.getByText( 'Autoplay' ) );
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'should enable loop setting', async () => {
+		await initializeEditor( { initialHtml: AUDIO_BLOCK } );
+
+		const audioBlock = getBlock( screen, 'Audio' );
+		fireEvent.press( audioBlock );
+		await openBlockSettings( screen );
+
+		fireEvent.press( screen.getByText( 'Loop' ) );
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
 } );
diff --git a/packages/block-library/src/audio/theme.scss b/packages/block-library/src/audio/theme.scss
index 2744d36e74ca62..0fc32a56592bdb 100644
--- a/packages/block-library/src/audio/theme.scss
+++ b/packages/block-library/src/audio/theme.scss
@@ -1,4 +1,4 @@
-.wp-block-audio figcaption {
+.wp-block-audio :where(figcaption) {
 	@include caption-style-theme();
 }
 
diff --git a/packages/block-library/src/audio/transforms.js b/packages/block-library/src/audio/transforms.js
index 66b6f57977507c..df6be2d2d52c75 100644
--- a/packages/block-library/src/audio/transforms.js
+++ b/packages/block-library/src/audio/transforms.js
@@ -20,7 +20,7 @@ const transforms = {
 				// It's already done as part of the `componentDidMount`
 				// in the audio block.
 				const block = createBlock( 'core/audio', {
-					src: createBlobURL( file ),
+					blob: createBlobURL( file ),
 				} );
 
 				return block;
diff --git a/packages/block-library/src/avatar/block.json b/packages/block-library/src/avatar/block.json
index fa86541b2963f2..f949e60e0ace15 100644
--- a/packages/block-library/src/avatar/block.json
+++ b/packages/block-library/src/avatar/block.json
@@ -50,6 +50,9 @@
 			"text": false,
 			"background": false,
 			"__experimentalDuotone": "img"
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"selectors": {
diff --git a/packages/block-library/src/avatar/edit.js b/packages/block-library/src/avatar/edit.js
index 8b326f4e72d88a..8309bc5e878a0e 100644
--- a/packages/block-library/src/avatar/edit.js
+++ b/packages/block-library/src/avatar/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -58,6 +58,7 @@ const AvatarInspectorControls = ( {
 			/>
 			{ attributes.isLink && (
 				<ToggleControl
+					__nextHasNoMarginBottom
 					label={ __( 'Open in new tab' ) }
 					onChange={ ( value ) =>
 						setAttributes( {
@@ -124,7 +125,7 @@ const ResizableAvatar = ( {
 				<img
 					src={ doubledSizedSrc }
 					alt={ avatar.alt }
-					className={ classnames(
+					className={ clsx(
 						'avatar',
 						'avatar-' + attributes.size,
 						'photo',
@@ -187,27 +188,17 @@ const UserEdit = ( { attributes, context, setAttributes, isSelected } ) => {
 	return (
 		<>
 			<AvatarInspectorControls
-				selectUser={ true }
+				selectUser
 				attributes={ attributes }
 				avatar={ avatar }
 				setAttributes={ setAttributes }
 			/>
-			<div>
-				{ attributes.isLink ? (
-					<a
-						href="#avatar-pseudo-link"
-						className="wp-block-avatar__link"
-						onClick={ ( event ) => event.preventDefault() }
-					>
-						<ResizableAvatar
-							attributes={ attributes }
-							avatar={ avatar }
-							blockProps={ blockProps }
-							isSelected={ isSelected }
-							setAttributes={ setAttributes }
-						/>
-					</a>
-				) : (
+			{ attributes.isLink ? (
+				<a
+					href="#avatar-pseudo-link"
+					className="wp-block-avatar__link"
+					onClick={ ( event ) => event.preventDefault() }
+				>
 					<ResizableAvatar
 						attributes={ attributes }
 						avatar={ avatar }
@@ -215,8 +206,16 @@ const UserEdit = ( { attributes, context, setAttributes, isSelected } ) => {
 						isSelected={ isSelected }
 						setAttributes={ setAttributes }
 					/>
-				) }
-			</div>
+				</a>
+			) : (
+				<ResizableAvatar
+					attributes={ attributes }
+					avatar={ avatar }
+					blockProps={ blockProps }
+					isSelected={ isSelected }
+					setAttributes={ setAttributes }
+				/>
+			) }
 		</>
 	);
 };
diff --git a/packages/block-library/src/avatar/index.js b/packages/block-library/src/avatar/index.js
index d318450aec3903..0b3ad9c62c4e30 100644
--- a/packages/block-library/src/avatar/index.js
+++ b/packages/block-library/src/avatar/index.js
@@ -16,6 +16,7 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/avatar/index.php b/packages/block-library/src/avatar/index.php
index d404fb81ca3576..cc86052af4abe2 100644
--- a/packages/block-library/src/avatar/index.php
+++ b/packages/block-library/src/avatar/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/avatar` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -31,7 +33,18 @@ function render_block_core_avatar( $attributes, $content, $block ) {
 		: '';
 
 	if ( ! isset( $block->context['commentId'] ) ) {
-		$author_id   = isset( $attributes['userId'] ) ? $attributes['userId'] : get_post_field( 'post_author', $block->context['postId'] );
+		if ( isset( $attributes['userId'] ) ) {
+			$author_id = $attributes['userId'];
+		} elseif ( isset( $block->context['postId'] ) ) {
+			$author_id = get_post_field( 'post_author', $block->context['postId'] );
+		} else {
+			$author_id = get_query_var( 'author' );
+		}
+
+		if ( empty( $author_id ) ) {
+			return '';
+		}
+
 		$author_name = get_the_author_meta( 'display_name', $author_id );
 		// translators: %s is the Author name.
 		$alt          = sprintf( __( '%s Avatar' ), $author_name );
@@ -49,7 +62,7 @@ function render_block_core_avatar( $attributes, $content, $block ) {
 			$label = '';
 			if ( '_blank' === $attributes['linkTarget'] ) {
 				// translators: %s is the Author name.
-				$label = 'aria-label="' . sprintf( esc_attr__( '(%s author archive, opens in a new tab)' ), $author_name ) . '"';
+				$label = 'aria-label="' . esc_attr( sprintf( __( '(%s author archive, opens in a new tab)' ), $author_name ) ) . '"';
 			}
 			// translators: %1$s: Author archive link. %2$s: Link target. %3$s Aria label. %4$s Avatar image.
 			$avatar_block = sprintf( '<a href="%1$s" target="%2$s" %3$s class="wp-block-avatar__link">%4$s</a>', esc_url( get_author_posts_url( $author_id ) ), esc_attr( $attributes['linkTarget'] ), $label, $avatar_block );
@@ -76,7 +89,7 @@ function render_block_core_avatar( $attributes, $content, $block ) {
 		$label = '';
 		if ( '_blank' === $attributes['linkTarget'] ) {
 			// translators: %s is the Comment Author name.
-			$label = 'aria-label="' . sprintf( esc_attr__( '(%s website link, opens in a new tab)' ), $comment->comment_author ) . '"';
+			$label = 'aria-label="' . esc_attr( sprintf( __( '(%s website link, opens in a new tab)' ), $comment->comment_author ) ) . '"';
 		}
 		// translators: %1$s: Comment Author website link. %2$s: Link target. %3$s Aria label. %4$s Avatar image.
 		$avatar_block = sprintf( '<a href="%1$s" target="%2$s" %3$s class="wp-block-avatar__link">%4$s</a>', esc_url( $comment->comment_author_url ), esc_attr( $attributes['linkTarget'] ), $label, $avatar_block );
@@ -88,6 +101,8 @@ function render_block_core_avatar( $attributes, $content, $block ) {
  * Generates class names and styles to apply the border support styles for
  * the Avatar block.
  *
+ * @since 6.3.0
+ *
  * @param array $attributes The block attributes.
  * @return array The border-related classnames and styles for the block.
  */
@@ -138,6 +153,8 @@ function get_block_core_avatar_border_attributes( $attributes ) {
 
 /**
  * Registers the `core/avatar` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_avatar() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/avatar/user-control.js b/packages/block-library/src/avatar/user-control.js
index 598c05011eaed7..235202ffec90d7 100644
--- a/packages/block-library/src/avatar/user-control.js
+++ b/packages/block-library/src/avatar/user-control.js
@@ -33,6 +33,7 @@ function UserControl( { value, onChange } ) {
 
 	return (
 		<ComboboxControl
+			__next40pxDefaultSize
 			__nextHasNoMarginBottom
 			label={ __( 'User' ) }
 			help={ __(
diff --git a/packages/block-library/src/block-keyboard-shortcuts/index.js b/packages/block-library/src/block-keyboard-shortcuts/index.js
new file mode 100644
index 00000000000000..6d9cde8364001f
--- /dev/null
+++ b/packages/block-library/src/block-keyboard-shortcuts/index.js
@@ -0,0 +1,113 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect } from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
+import {
+	useShortcut,
+	store as keyboardShortcutsStore,
+} from '@wordpress/keyboard-shortcuts';
+import { __ } from '@wordpress/i18n';
+import { createBlock } from '@wordpress/blocks';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+function BlockKeyboardShortcuts() {
+	const { registerShortcut } = useDispatch( keyboardShortcutsStore );
+	const { replaceBlocks } = useDispatch( blockEditorStore );
+	const { getBlockName, getSelectedBlockClientId, getBlockAttributes } =
+		useSelect( blockEditorStore );
+
+	const handleTransformHeadingAndParagraph = ( event, level ) => {
+		event.preventDefault();
+
+		const currentClientId = getSelectedBlockClientId();
+		if ( currentClientId === null ) {
+			return;
+		}
+
+		const blockName = getBlockName( currentClientId );
+		const isParagraph = blockName === 'core/paragraph';
+		const isHeading = blockName === 'core/heading';
+
+		if ( ! isParagraph && ! isHeading ) {
+			return;
+		}
+
+		const destinationBlockName =
+			level === 0 ? 'core/paragraph' : 'core/heading';
+
+		const attributes = getBlockAttributes( currentClientId );
+
+		// Avoid unnecessary block transform when attempting to transform to
+		// the same block type and/or same level.
+		if (
+			( isParagraph && level === 0 ) ||
+			( isHeading && attributes.level === level )
+		) {
+			return;
+		}
+
+		const textAlign =
+			blockName === 'core/paragraph' ? 'align' : 'textAlign';
+		const destinationTextAlign =
+			destinationBlockName === 'core/paragraph' ? 'align' : 'textAlign';
+
+		replaceBlocks(
+			currentClientId,
+			createBlock( destinationBlockName, {
+				level,
+				content: attributes.content,
+				...{ [ destinationTextAlign ]: attributes[ textAlign ] },
+			} )
+		);
+	};
+
+	useEffect( () => {
+		registerShortcut( {
+			name: 'core/block-editor/transform-heading-to-paragraph',
+			category: 'block-library',
+			description: __( 'Transform heading to paragraph.' ),
+			keyCombination: {
+				modifier: 'access',
+				character: '0',
+			},
+			aliases: [
+				{
+					modifier: 'access',
+					character: '7',
+				},
+			],
+		} );
+
+		[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
+			registerShortcut( {
+				name: `core/block-editor/transform-paragraph-to-heading-${ level }`,
+				category: 'block-library',
+				description: __( 'Transform paragraph to heading.' ),
+				keyCombination: {
+					modifier: 'access',
+					character: `${ level }`,
+				},
+			} );
+		} );
+	}, [] );
+
+	useShortcut(
+		'core/block-editor/transform-heading-to-paragraph',
+		( event ) => handleTransformHeadingAndParagraph( event, 0 )
+	);
+
+	[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
+		//the loop is based off on a constant therefore
+		//the hook will execute the same way every time
+		//eslint-disable-next-line react-hooks/rules-of-hooks
+		useShortcut(
+			`core/block-editor/transform-paragraph-to-heading-${ level }`,
+			( event ) => handleTransformHeadingAndParagraph( event, level )
+		);
+	} );
+
+	return null;
+}
+
+export default BlockKeyboardShortcuts;
diff --git a/packages/block-library/src/block/block.json b/packages/block-library/src/block/block.json
index aeccdbfc1051db..fdce3bcc02e07b 100644
--- a/packages/block-library/src/block/block.json
+++ b/packages/block-library/src/block/block.json
@@ -4,18 +4,28 @@
 	"name": "core/block",
 	"title": "Pattern",
 	"category": "reusable",
-	"description": "Create and save content to reuse across your site. Update the pattern, and the changes apply everywhere it’s used.",
+	"description": "Reuse this design across your site.",
 	"keywords": [ "reusable" ],
 	"textdomain": "default",
 	"attributes": {
 		"ref": {
 			"type": "number"
+		},
+		"content": {
+			"type": "object",
+			"default": {}
 		}
 	},
+	"providesContext": {
+		"pattern/overrides": "content"
+	},
 	"supports": {
 		"customClassName": false,
 		"html": false,
 		"inserter": false,
-		"renaming": false
+		"renaming": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	}
 }
diff --git a/packages/block-library/src/block/deprecated.js b/packages/block-library/src/block/deprecated.js
new file mode 100644
index 00000000000000..f820867fff6271
--- /dev/null
+++ b/packages/block-library/src/block/deprecated.js
@@ -0,0 +1,122 @@
+const isObject = ( obj ) =>
+	typeof obj === 'object' && ! Array.isArray( obj ) && obj !== null;
+
+// v2: Migrate to a more condensed version of the 'content' attribute attribute.
+const v2 = {
+	attributes: {
+		ref: {
+			type: 'number',
+		},
+		content: {
+			type: 'object',
+		},
+	},
+	supports: {
+		customClassName: false,
+		html: false,
+		inserter: false,
+		renaming: false,
+	},
+	// Force this deprecation to run whenever there's a values sub-property that's an object.
+	//
+	// This could fail in the future if a block ever has binding to a `values` attribute.
+	// Some extra protection is added to ensure `values` is an object, but this only reduces
+	// the likelihood, it doesn't solve it completely.
+	isEligible( { content } ) {
+		return (
+			!! content &&
+			Object.keys( content ).every(
+				( contentKey ) =>
+					content[ contentKey ].values &&
+					isObject( content[ contentKey ].values )
+			)
+		);
+	},
+	/*
+	 * Old attribute format:
+	 * content: {
+	 *     "V98q_x": {
+	 * 	   		// The attribute values are now stored as a 'values' sub-property.
+	 *         values: { content: 'My content value' },
+	 * 	       // ... additional metadata, like the block name can be stored here.
+	 *     }
+	 * }
+	 *
+	 * New attribute format:
+	 * content: {
+	 *     "V98q_x": {
+	 *         content: 'My content value',
+	 *     }
+	 * }
+	 */
+	migrate( attributes ) {
+		const { content, ...retainedAttributes } = attributes;
+
+		if ( content && Object.keys( content ).length ) {
+			const updatedContent = { ...content };
+
+			for ( const contentKey in content ) {
+				updatedContent[ contentKey ] = content[ contentKey ].values;
+			}
+
+			return {
+				...retainedAttributes,
+				content: updatedContent,
+			};
+		}
+
+		return attributes;
+	},
+};
+
+// v1: Rename the `overrides` attribute to the `content` attribute.
+const v1 = {
+	attributes: {
+		ref: {
+			type: 'number',
+		},
+		overrides: {
+			type: 'object',
+		},
+	},
+	supports: {
+		customClassName: false,
+		html: false,
+		inserter: false,
+		renaming: false,
+	},
+	// Force this deprecation to run whenever there's an `overrides` object.
+	isEligible( { overrides } ) {
+		return !! overrides;
+	},
+	/*
+	 * Old attribute format:
+	 * overrides: {
+	 *     // An key is an id that represents a block.
+	 *     // The values are the attribute values of the block.
+	 *     "V98q_x": { content: 'My content value' }
+	 * }
+	 *
+	 * New attribute format:
+	 * content: {
+	 *     "V98q_x": { content: 'My content value' }
+	 * }
+	 *
+	 */
+	migrate( attributes ) {
+		const { overrides, ...retainedAttributes } = attributes;
+
+		const content = {};
+
+		Object.keys( overrides ).forEach( ( id ) => {
+			content[ id ] = overrides[ id ];
+		} );
+
+		return {
+			...retainedAttributes,
+			content,
+		};
+	},
+};
+
+export default [ v2, v1 ];
diff --git a/packages/block-library/src/block/edit-title.native.js b/packages/block-library/src/block/edit-title.native.js
index d0c7d981202d99..9c33fd7164cccb 100644
--- a/packages/block-library/src/block/edit-title.native.js
+++ b/packages/block-library/src/block/edit-title.native.js
@@ -6,7 +6,8 @@ import { Text, View } from 'react-native';
 /**
  * WordPress dependencies
  */
-import { Icon, useGlobalStyles } from '@wordpress/components';
+import { Icon } from '@wordpress/components';
+import { useGlobalStyles } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 import { withPreferredColorScheme } from '@wordpress/compose';
 import { help, lock } from '@wordpress/icons';
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index e86ed9b59c62b2..104b07157cba74 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -1,57 +1,48 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { useRegistry, useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { useRef, useMemo, useEffect } from '@wordpress/element';
-import { useEntityProp, useEntityRecord } from '@wordpress/core-data';
+import {
+	useEntityRecord,
+	store as coreStore,
+	useEntityBlockEditor,
+} from '@wordpress/core-data';
 import {
 	Placeholder,
 	Spinner,
-	TextControl,
-	PanelBody,
+	ToolbarButton,
+	ToolbarGroup,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import {
 	useInnerBlocksProps,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
-	InnerBlocks,
-	InspectorControls,
+	RecursionProvider,
+	useHasRecursion,
 	useBlockProps,
 	Warning,
 	privateApis as blockEditorPrivateApis,
 	store as blockEditorStore,
+	BlockControls,
+	InnerBlocks,
 } from '@wordpress/block-editor';
-import { getBlockSupport, parse } from '@wordpress/blocks';
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
+import { getBlockBindingsSource } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
+import { name as patternBlockName } from './index';
 import { unlock } from '../lock-unlock';
 
 const { useLayoutClasses } = unlock( blockEditorPrivateApis );
-
-function isPartiallySynced( block ) {
-	return (
-		!! getBlockSupport( block.name, '__experimentalConnections', false ) &&
-		!! block.attributes.connections?.attributes &&
-		Object.values( block.attributes.connections.attributes ).some(
-			( connection ) => connection.source === 'pattern_attributes'
-		)
-	);
-}
-function getPartiallySyncedAttributes( block ) {
-	return Object.entries( block.attributes.connections.attributes )
-		.filter(
-			( [ , connection ] ) => connection.source === 'pattern_attributes'
-		)
-		.map( ( [ attributeKey ] ) => attributeKey );
-}
+const { isOverridableBlock, hasOverridableBlocks } =
+	unlock( patternsPrivateApis );
 
 const fullAlignments = [ 'full', 'wide', 'left', 'right' ];
 
@@ -84,125 +75,168 @@ const useInferredLayout = ( blocks, parentLayout ) => {
 	}, [ blocks, parentLayout ] );
 };
 
-function applyInitialOverrides( blocks, overrides = {}, defaultValues ) {
-	return blocks.map( ( block ) => {
-		const innerBlocks = applyInitialOverrides(
+function setBlockEditMode( setEditMode, blocks, mode ) {
+	blocks.forEach( ( block ) => {
+		const editMode =
+			mode ||
+			( isOverridableBlock( block ) ? 'contentOnly' : 'disabled' );
+		setEditMode( block.clientId, editMode );
+
+		setBlockEditMode(
+			setEditMode,
 			block.innerBlocks,
-			overrides,
-			defaultValues
+			// Disable editing for nested patterns.
+			block.name === patternBlockName ? 'disabled' : mode
 		);
-		const blockId = block.attributes.metadata?.id;
-		if ( ! isPartiallySynced( block ) || ! blockId )
-			return { ...block, innerBlocks };
-		const attributes = getPartiallySyncedAttributes( block );
-		const newAttributes = { ...block.attributes };
-		for ( const attributeKey of attributes ) {
-			defaultValues[ blockId ] = block.attributes[ attributeKey ];
-			if ( overrides[ blockId ] ) {
-				newAttributes[ attributeKey ] = overrides[ blockId ];
-			}
-		}
-		return {
-			...block,
-			attributes: newAttributes,
-			innerBlocks,
-		};
 	} );
 }
 
-function getOverridesFromBlocks( blocks, defaultValues ) {
-	/** @type {Record<string, unknown>} */
-	const overrides = {};
-	for ( const block of blocks ) {
-		Object.assign(
-			overrides,
-			getOverridesFromBlocks( block.innerBlocks, defaultValues )
-		);
-		const blockId = block.attributes.metadata?.id;
-		if ( ! isPartiallySynced( block ) || ! blockId ) continue;
-		const attributes = getPartiallySyncedAttributes( block );
-		for ( const attributeKey of attributes ) {
-			if (
-				block.attributes[ attributeKey ] !== defaultValues[ blockId ]
-			) {
-				overrides[ blockId ] = block.attributes[ attributeKey ];
-			}
-		}
+function RecursionWarning() {
+	const blockProps = useBlockProps();
+	return (
+		<div { ...blockProps }>
+			<Warning>
+				{ __( 'Block cannot be rendered inside itself.' ) }
+			</Warning>
+		</div>
+	);
+}
+
+const NOOP = () => {};
+
+// Wrap the main Edit function for the pattern block with a recursion wrapper
+// that allows short-circuiting rendering as early as possible, before any
+// of the other effects in the block edit have run.
+export default function ReusableBlockEditRecursionWrapper( props ) {
+	const { ref } = props.attributes;
+	const hasAlreadyRendered = useHasRecursion( ref );
+
+	if ( hasAlreadyRendered ) {
+		return <RecursionWarning />;
 	}
-	return Object.keys( overrides ).length > 0 ? overrides : undefined;
+
+	return (
+		<RecursionProvider uniqueId={ ref }>
+			<ReusableBlockEdit { ...props } />
+		</RecursionProvider>
+	);
+}
+
+function ReusableBlockControl( {
+	recordId,
+	canOverrideBlocks,
+	hasContent,
+	handleEditOriginal,
+	resetContent,
+} ) {
+	const canUserEdit = useSelect(
+		( select ) =>
+			!! select( coreStore ).canUser( 'update', {
+				kind: 'postType',
+				name: 'wp_block',
+				id: recordId,
+			} ),
+		[ recordId ]
+	);
+
+	return (
+		<>
+			{ canUserEdit && !! handleEditOriginal && (
+				<BlockControls>
+					<ToolbarGroup>
+						<ToolbarButton onClick={ handleEditOriginal }>
+							{ __( 'Edit original' ) }
+						</ToolbarButton>
+					</ToolbarGroup>
+				</BlockControls>
+			) }
+
+			{ canOverrideBlocks && (
+				<BlockControls>
+					<ToolbarGroup>
+						<ToolbarButton
+							onClick={ resetContent }
+							disabled={ ! hasContent }
+						>
+							{ __( 'Reset' ) }
+						</ToolbarButton>
+					</ToolbarGroup>
+				</BlockControls>
+			) }
+		</>
+	);
 }
 
-export default function ReusableBlockEdit( {
+function ReusableBlockEdit( {
 	name,
-	attributes: { ref, overrides },
+	attributes: { ref, content },
 	__unstableParentLayout: parentLayout,
 	clientId: patternClientId,
+	setAttributes,
 } ) {
-	const registry = useRegistry();
-	const hasAlreadyRendered = useHasRecursion( ref );
 	const { record, hasResolved } = useEntityRecord(
 		'postType',
 		'wp_block',
 		ref
 	);
+	const [ blocks ] = useEntityBlockEditor( 'postType', 'wp_block', {
+		id: ref,
+	} );
 	const isMissing = hasResolved && ! record;
-	const initialOverrides = useRef( overrides );
-	const defaultValuesRef = useRef( {} );
+
+	const { setBlockEditingMode, __unstableMarkLastChangeAsPersistent } =
+		useDispatch( blockEditorStore );
+
 	const {
-		replaceInnerBlocks,
-		__unstableMarkNextChangeAsNotPersistent,
-		setBlockEditingMode,
-	} = useDispatch( blockEditorStore );
-	const { getBlockEditingMode } = useSelect( blockEditorStore );
+		innerBlocks,
+		onNavigateToEntityRecord,
+		editingMode,
+		hasPatternOverridesSource,
+	} = useSelect(
+		( select ) => {
+			const { getBlocks, getSettings, getBlockEditingMode } =
+				select( blockEditorStore );
+			// For editing link to the site editor if the theme and user permissions support it.
+			return {
+				innerBlocks: getBlocks( patternClientId ),
+				onNavigateToEntityRecord:
+					getSettings().onNavigateToEntityRecord,
+				editingMode: getBlockEditingMode( patternClientId ),
+				hasPatternOverridesSource: !! getBlockBindingsSource(
+					'core/pattern-overrides'
+				),
+			};
+		},
+		[ patternClientId ]
+	);
 
+	// Sync the editing mode of the pattern block with the inner blocks.
 	useEffect( () => {
-		if ( ! record?.content?.raw ) return;
-		const initialBlocks = parse( record.content.raw );
-
-		const editingMode = getBlockEditingMode( patternClientId );
-		registry.batch( () => {
-			setBlockEditingMode( patternClientId, 'default' );
-			__unstableMarkNextChangeAsNotPersistent();
-			replaceInnerBlocks(
-				patternClientId,
-				applyInitialOverrides(
-					initialBlocks,
-					initialOverrides.current,
-					defaultValuesRef.current
-				)
-			);
-			setBlockEditingMode( patternClientId, editingMode );
-		} );
+		setBlockEditMode(
+			setBlockEditingMode,
+			innerBlocks,
+			// Disable editing if the pattern itself is disabled.
+			editingMode === 'disabled' || ! hasPatternOverridesSource
+				? 'disabled'
+				: undefined
+		);
 	}, [
-		__unstableMarkNextChangeAsNotPersistent,
-		patternClientId,
-		record,
-		replaceInnerBlocks,
-		registry,
-		getBlockEditingMode,
+		editingMode,
+		innerBlocks,
 		setBlockEditingMode,
+		hasPatternOverridesSource,
 	] );
 
-	const innerBlocks = useSelect(
-		( select ) => select( blockEditorStore ).getBlocks( patternClientId ),
-		[ patternClientId ]
-	);
-
-	const [ title, setTitle ] = useEntityProp(
-		'postType',
-		'wp_block',
-		'title',
-		ref
+	const canOverrideBlocks = useMemo(
+		() => hasPatternOverridesSource && hasOverridableBlocks( blocks ),
+		[ hasPatternOverridesSource, blocks ]
 	);
 
-	const { alignment, layout } = useInferredLayout(
-		innerBlocks,
-		parentLayout
-	);
+	const { alignment, layout } = useInferredLayout( blocks, parentLayout );
 	const layoutClasses = useLayoutClasses( { layout }, name );
 
 	const blockProps = useBlockProps( {
-		className: classnames(
+		className: clsx(
 			'block-library-block__reusable-block-container',
 			layout && layoutClasses,
 			{ [ `align${ alignment }` ]: alignment }
@@ -210,45 +244,32 @@ export default function ReusableBlockEdit( {
 	} );
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
+		templateLock: 'all',
 		layout,
-		renderAppender: innerBlocks?.length
+		value: blocks,
+		onInput: NOOP,
+		onChange: NOOP,
+		renderAppender: blocks?.length
 			? undefined
 			: InnerBlocks.ButtonBlockAppender,
 	} );
 
-	// Sync the `overrides` attribute from the updated blocks.
-	// `syncDerivedBlockAttributes` is an action that just like `updateBlockAttributes`
-	// but won't create an undo level.
-	// This can be abstracted into a `useSyncDerivedAttributes` hook if needed.
-	useEffect( () => {
-		const { getBlocks } = registry.select( blockEditorStore );
-		const { syncDerivedBlockAttributes } = unlock(
-			registry.dispatch( blockEditorStore )
-		);
-		let prevBlocks = getBlocks( patternClientId );
-		return registry.subscribe( () => {
-			const blocks = getBlocks( patternClientId );
-			if ( blocks !== prevBlocks ) {
-				prevBlocks = blocks;
-				syncDerivedBlockAttributes( patternClientId, {
-					overrides: getOverridesFromBlocks(
-						blocks,
-						defaultValuesRef.current
-					),
-				} );
-			}
-		}, blockEditorStore );
-	}, [ patternClientId, registry ] );
+	const handleEditOriginal = () => {
+		onNavigateToEntityRecord( {
+			postId: ref,
+			postType: 'wp_block',
+		} );
+	};
 
-	let children = null;
+	const resetContent = () => {
+		if ( content ) {
+			// Make sure any previous changes are persisted before resetting.
+			__unstableMarkLastChangeAsPersistent();
+			setAttributes( { content: undefined } );
+		}
+	};
 
-	if ( hasAlreadyRendered ) {
-		children = (
-			<Warning>
-				{ __( 'Block cannot be rendered inside itself.' ) }
-			</Warning>
-		);
-	}
+	let children = null;
 
 	if ( isMissing ) {
 		children = (
@@ -267,23 +288,26 @@ export default function ReusableBlockEdit( {
 	}
 
 	return (
-		<RecursionProvider uniqueId={ ref }>
-			<InspectorControls>
-				<PanelBody>
-					<TextControl
-						label={ __( 'Name' ) }
-						value={ title }
-						onChange={ setTitle }
-						__nextHasNoMarginBottom
-						__next40pxDefaultSize
-					/>
-				</PanelBody>
-			</InspectorControls>
+		<>
+			{ hasResolved && ! isMissing && (
+				<ReusableBlockControl
+					recordId={ ref }
+					canOverrideBlocks={ canOverrideBlocks }
+					hasContent={ !! content }
+					handleEditOriginal={
+						onNavigateToEntityRecord
+							? handleEditOriginal
+							: undefined
+					}
+					resetContent={ resetContent }
+				/>
+			) }
+
 			{ children === null ? (
 				<div { ...innerBlocksProps } />
 			) : (
 				<div { ...blockProps }>{ children }</div>
 			) }
-		</RecursionProvider>
+		</>
 	);
 }
diff --git a/packages/block-library/src/block/edit.native.js b/packages/block-library/src/block/edit.native.js
new file mode 100644
index 00000000000000..6578c12eefc4e0
--- /dev/null
+++ b/packages/block-library/src/block/edit.native.js
@@ -0,0 +1,247 @@
+/**
+ * External dependencies
+ */
+import {
+	ActivityIndicator,
+	Platform,
+	Text,
+	TouchableWithoutFeedback,
+	View,
+} from 'react-native';
+
+/**
+ * WordPress dependencies
+ */
+import { useState, useCallback } from '@wordpress/element';
+import {
+	useEntityBlockEditor,
+	useEntityProp,
+	store as coreStore,
+} from '@wordpress/core-data';
+import {
+	BottomSheet,
+	Icon,
+	Disabled,
+	TextControl,
+} from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { __, sprintf } from '@wordpress/i18n';
+import {
+	RecursionProvider,
+	useHasRecursion,
+	InnerBlocks,
+	Warning,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import { usePreferredColorSchemeStyle } from '@wordpress/compose';
+import { help } from '@wordpress/icons';
+import { store as reusableBlocksStore } from '@wordpress/reusable-blocks';
+import { store as editorStore } from '@wordpress/editor';
+import { store as noticesStore } from '@wordpress/notices';
+
+/**
+ * Internal dependencies
+ */
+import styles from './editor.scss';
+import EditTitle from './edit-title';
+
+export default function ReusableBlockEdit( {
+	attributes: { ref },
+	clientId,
+	isSelected,
+} ) {
+	const hasAlreadyRendered = useHasRecursion( ref );
+
+	const [ showHelp, setShowHelp ] = useState( false );
+	const infoTextStyle = usePreferredColorSchemeStyle(
+		styles.infoText,
+		styles.infoTextDark
+	);
+	const infoTitleStyle = usePreferredColorSchemeStyle(
+		styles.infoTitle,
+		styles.infoTitleDark
+	);
+	const infoSheetIconStyle = usePreferredColorSchemeStyle(
+		styles.infoSheetIcon,
+		styles.infoSheetIconDark
+	);
+	const infoDescriptionStyle = usePreferredColorSchemeStyle(
+		styles.infoDescription,
+		styles.infoDescriptionDark
+	);
+	const actionButtonStyle = usePreferredColorSchemeStyle(
+		styles.actionButton,
+		styles.actionButtonDark
+	);
+	const spinnerStyle = usePreferredColorSchemeStyle(
+		styles.spinner,
+		styles.spinnerDark
+	);
+
+	const { hasResolved, isEditing, isMissing } = useSelect(
+		( select ) => {
+			const persistedBlock = select( coreStore ).getEntityRecord(
+				'postType',
+				'wp_block',
+				ref
+			);
+			const hasResolvedBlock = select( coreStore ).hasFinishedResolution(
+				'getEntityRecord',
+				[ 'postType', 'wp_block', ref ]
+			);
+
+			const { getBlockCount } = select( blockEditorStore );
+
+			return {
+				hasResolved: hasResolvedBlock,
+				isEditing:
+					select(
+						reusableBlocksStore
+					).__experimentalIsEditingReusableBlock( clientId ),
+				isMissing: hasResolvedBlock && ! persistedBlock,
+				innerBlockCount: getBlockCount( clientId ),
+			};
+		},
+		[ ref, clientId ]
+	);
+	const hostAppNamespace = useSelect(
+		( select ) =>
+			select( editorStore ).getEditorSettings().hostAppNamespace,
+		[]
+	);
+
+	const { createSuccessNotice } = useDispatch( noticesStore );
+	const { __experimentalConvertBlockToStatic: convertBlockToStatic } =
+		useDispatch( reusableBlocksStore );
+	const { clearSelectedBlock } = useDispatch( blockEditorStore );
+
+	const [ blocks, onInput, onChange ] = useEntityBlockEditor(
+		'postType',
+		'wp_block',
+		{ id: ref }
+	);
+
+	const [ title ] = useEntityProp( 'postType', 'wp_block', 'title', ref );
+
+	function openSheet() {
+		setShowHelp( true );
+	}
+
+	function closeSheet() {
+		setShowHelp( false );
+	}
+
+	const onConvertToRegularBlocks = useCallback( () => {
+		/* translators: %s: name of the synced block */
+		const successNotice = __( '%s detached' );
+		createSuccessNotice( sprintf( successNotice, title ) );
+
+		clearSelectedBlock();
+		// Convert action is executed at the end of the current JavaScript execution block
+		// to prevent issues related to undo/redo actions.
+		setImmediate( () => convertBlockToStatic( clientId ) );
+	}, [ title, clientId ] );
+
+	function renderSheet() {
+		const infoTitle =
+			Platform.OS === 'android'
+				? sprintf(
+						/* translators: %s: name of the host app (e.g. WordPress) */
+						__(
+							'Editing synced patterns is not yet supported on %s for Android'
+						),
+						hostAppNamespace
+				  )
+				: sprintf(
+						/* translators: %s: name of the host app (e.g. WordPress) */
+						__(
+							'Editing synced patterns is not yet supported on %s for iOS'
+						),
+						hostAppNamespace
+				  );
+
+		return (
+			<BottomSheet
+				isVisible={ showHelp }
+				hideHeader
+				onClose={ closeSheet }
+			>
+				<View style={ styles.infoContainer }>
+					<Icon
+						icon={ help }
+						color={ infoSheetIconStyle.color }
+						size={ styles.infoSheetIcon.size }
+					/>
+					<Text style={ [ infoTextStyle, infoTitleStyle ] }>
+						{ infoTitle }
+					</Text>
+					<Text style={ [ infoTextStyle, infoDescriptionStyle ] }>
+						{ __(
+							'Alternatively, you can detach and edit this block separately by tapping “Detach”.'
+						) }
+					</Text>
+					<TextControl
+						label={ __( 'Detach' ) }
+						separatorType="topFullWidth"
+						onPress={ onConvertToRegularBlocks }
+						labelStyle={ actionButtonStyle }
+					/>
+				</View>
+			</BottomSheet>
+		);
+	}
+
+	if ( hasAlreadyRendered ) {
+		return (
+			<Warning
+				message={ __( 'Block cannot be rendered inside itself.' ) }
+			/>
+		);
+	}
+
+	if ( isMissing ) {
+		return (
+			<Warning
+				message={ __( 'Block has been deleted or is unavailable.' ) }
+			/>
+		);
+	}
+
+	if ( ! hasResolved ) {
+		return (
+			<View style={ spinnerStyle }>
+				<ActivityIndicator animating />
+			</View>
+		);
+	}
+
+	let element = (
+		<InnerBlocks
+			value={ blocks }
+			onChange={ onChange }
+			onInput={ onInput }
+		/>
+	);
+
+	if ( ! isEditing ) {
+		element = <Disabled>{ element }</Disabled>;
+	}
+
+	return (
+		<RecursionProvider uniqueId={ ref }>
+			<TouchableWithoutFeedback
+				disabled={ ! isSelected }
+				accessibilityLabel={ __( 'Help button' ) }
+				accessibilityRole="button"
+				accessibilityHint={ __( 'Tap here to show help' ) }
+				onPress={ openSheet }
+			>
+				<View>
+					{ isSelected && <EditTitle title={ title } /> }
+					{ element }
+					{ renderSheet() }
+				</View>
+			</TouchableWithoutFeedback>
+		</RecursionProvider>
+	);
+}
diff --git a/packages/block-library/src/block/editor.scss b/packages/block-library/src/block/editor.scss
deleted file mode 100644
index c49675392a525e..00000000000000
--- a/packages/block-library/src/block/editor.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-.edit-post-visual-editor .block-library-block__reusable-block-container {
-	// Unset the padding that root containers get when they're actually root containers.
-	.is-root-container {
-		padding-left: 0;
-		padding-right: 0;
-	}
-
-	// Allow vertical paddings to collapse to better fit the flow.
-	.block-editor-writing-flow {
-		display: block;
-	}
-
-	.components-disabled .block-list-appender {
-		display: none;
-	}
-}
-
-.edit-post-visual-editor .block-editor-block-list__block:not(.remove-outline).is-reusable {
-	&.is-highlighted,
-	&.is-selected {
-		box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-block-synced-color);
-	}
-
-	&.block-editor-block-list__block:not([contenteditable]):focus {
-		&::after {
-			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-block-synced-color);
-			// Show a light color for dark themes.
-			.is-dark-theme & {
-				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) $dark-theme-focus;
-			}
-		}
-	}
-}
diff --git a/packages/block-library/src/block/index.js b/packages/block-library/src/block/index.js
index 0d117e6f3938ab..7f1fa7bdab3494 100644
--- a/packages/block-library/src/block/index.js
+++ b/packages/block-library/src/block/index.js
@@ -2,22 +2,42 @@
  * WordPress dependencies
  */
 import { symbol as icon } from '@wordpress/icons';
+import { store as coreStore } from '@wordpress/core-data';
+import { select } from '@wordpress/data';
+import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Internal dependencies
  */
 import initBlock from '../utils/init-block';
 import metadata from './block.json';
-import editV1 from './v1/edit';
-import editV2 from './edit';
+import edit from './edit';
+import deprecated from './deprecated';
 
 const { name } = metadata;
 
 export { metadata, name };
 
 export const settings = {
-	edit: window.__experimentalPatternPartialSyncing ? editV2 : editV1,
+	deprecated,
+	edit,
 	icon,
+	__experimentalLabel: ( { ref } ) => {
+		if ( ! ref ) {
+			return;
+		}
+
+		const entity = select( coreStore ).getEditedEntityRecord(
+			'postType',
+			'wp_block',
+			ref
+		);
+		if ( ! entity?.title ) {
+			return;
+		}
+
+		return decodeEntities( entity.title );
+	},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/block/index.php b/packages/block-library/src/block/index.php
index 54b54fad139ff3..8beef975fad6f3 100644
--- a/packages/block-library/src/block/index.php
+++ b/packages/block-library/src/block/index.php
@@ -8,6 +8,10 @@
 /**
  * Renders the `core/block` block on server.
  *
+ * @since 5.0.0
+ *
+ * @global WP_Embed $wp_embed
+ *
  * @param array $attributes The block attributes.
  *
  * @return string Rendered HTML of the referenced block.
@@ -46,19 +50,38 @@ function render_block_core_block( $attributes ) {
 	$content = $wp_embed->run_shortcode( $reusable_block->post_content );
 	$content = $wp_embed->autoembed( $content );
 
-	$gutenberg_experiments        = get_option( 'gutenberg-experiments' );
-	$has_partial_synced_overrides = $gutenberg_experiments
-		&& array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments )
-		&& isset( $attributes['overrides'] );
+	// Back compat.
+	// For blocks that have not been migrated in the editor, add some back compat
+	// so that front-end rendering continues to work.
+
+	// This matches the `v2` deprecation. Removes the inner `values` property
+	// from every item.
+	if ( isset( $attributes['content'] ) ) {
+		foreach ( $attributes['content'] as &$content_data ) {
+			if ( isset( $content_data['values'] ) ) {
+				$is_assoc_array = is_array( $content_data['values'] ) && ! wp_is_numeric_array( $content_data['values'] );
+
+				if ( $is_assoc_array ) {
+					$content_data = $content_data['values'];
+				}
+			}
+		}
+	}
+
+	// This matches the `v1` deprecation. Rename `overrides` to `content`.
+	if ( isset( $attributes['overrides'] ) && ! isset( $attributes['content'] ) ) {
+		$attributes['content'] = $attributes['overrides'];
+	}
 
 	/**
 	 * We set the `pattern/overrides` context through the `render_block_context`
 	 * filter so that it is available when a pattern's inner blocks are
 	 * rendering via do_blocks given it only receives the inner content.
 	 */
-	if ( $has_partial_synced_overrides ) {
+	$has_pattern_overrides = isset( $attributes['content'] ) && null !== get_block_bindings_source( 'core/pattern-overrides' );
+	if ( $has_pattern_overrides ) {
 		$filter_block_context = static function ( $context ) use ( $attributes ) {
-			$context['pattern/overrides'] = $attributes['overrides'];
+			$context['pattern/overrides'] = $attributes['content'];
 			return $context;
 		};
 		add_filter( 'render_block_context', $filter_block_context, 1 );
@@ -67,7 +90,7 @@ function render_block_core_block( $attributes ) {
 	$content = do_blocks( $content );
 	unset( $seen_refs[ $attributes['ref'] ] );
 
-	if ( $has_partial_synced_overrides ) {
+	if ( $has_pattern_overrides ) {
 		remove_filter( 'render_block_context', $filter_block_context, 1 );
 	}
 
@@ -76,6 +99,8 @@ function render_block_core_block( $attributes ) {
 
 /**
  * Registers the `core/block` block.
+ *
+ * @since 5.3.0
  */
 function register_block_core_block() {
 	register_block_type_from_metadata(
@@ -86,28 +111,3 @@ function register_block_core_block() {
 	);
 }
 add_action( 'init', 'register_block_core_block' );
-
-$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-	/**
-	 * Registers the overrides attribute for core/block.
-	 *
-	 * @param array  $args       Array of arguments for registering a block type.
-	 * @param string $block_name Block name including namespace.
-	 * @return array $args
-	 */
-	function register_block_core_block_args( $args, $block_name ) {
-		if ( 'core/block' === $block_name ) {
-			$args['attributes'] = array_merge(
-				$args['attributes'],
-				array(
-					'overrides' => array(
-						'type' => 'object',
-					),
-				)
-			);
-		}
-		return $args;
-	}
-	add_filter( 'register_block_type_args', 'register_block_core_block_args', 10, 2 );
-}
diff --git a/packages/block-library/src/block/test/edit.native.js b/packages/block-library/src/block/test/edit.native.js
index 724b79c1d85d74..46c6d39034f8b0 100644
--- a/packages/block-library/src/block/test/edit.native.js
+++ b/packages/block-library/src/block/test/edit.native.js
@@ -6,6 +6,8 @@ import {
 	initializeEditor,
 	fireEvent,
 	within,
+	setupApiFetch,
+	triggerBlockListLayout,
 } from 'test/helpers';
 
 /**
@@ -42,6 +44,8 @@ const getMockedReusableBlock = ( id ) => ( {
 	id,
 	title: { raw: `Reusable block - ${ id }` },
 	type: 'wp_block',
+	meta: { footnotes: '' },
+	wp_pattern_category: [],
 } );
 
 beforeAll( () => {
@@ -154,7 +158,9 @@ describe( 'Synced patterns', () => {
 			if ( path.startsWith( endpoint ) ) {
 				response = getMockedReusableBlock( id );
 			}
-			return Promise.resolve( response );
+			return Promise.resolve( {
+				json: () => Promise.resolve( response ),
+			} );
 		} );
 
 		const screen = await initializeEditor( {
@@ -187,4 +193,70 @@ describe( 'Synced patterns', () => {
 		expect( reusableBlock ).toBeDefined();
 		expect( headingInnerBlock ).toBeDefined();
 	} );
+
+	it( 'renders block after content is updated due to a side effect', async () => {
+		// We have to use different ids because entities are cached in memory.
+		const id = 5;
+		const initialHtml = `<!-- wp:block {"ref":${ id }} /-->`;
+		const endpoint = `/wp/v2/blocks/${ id }`;
+		const fetchMedia = {
+			request: {
+				path: `/wp/v2/media/1?context=edit`,
+			},
+			response: {
+				source_url: 'https://cldup.com/cXyG__fTLN.jpg',
+				id: 1,
+				// We need to include the sizes to trigger the side effect.
+				media_details: {
+					sizes: {
+						large: {
+							source_url:
+								'https://cldup.com/cXyG__fTLN.jpg?w=500',
+						},
+					},
+				},
+			},
+		};
+
+		// Return mocked response for the block endpoint.
+		fetchRequest.mockImplementation( ( { path } ) => {
+			let response = {};
+			if ( path.startsWith( endpoint ) ) {
+				response = getMockedReusableBlock( id );
+			}
+			// Replace content with an Image block to trigger a side effect.
+			// The side effect will be produced when the `source` attribute is replaced
+			// with an URL that includes the width query parameter:
+			// https://cldup.com/cXyG__fTLN.jpg => https://cldup.com/cXyG__fTLN.jpg?w=500
+			response.content.raw = `<!-- wp:image {"id":1,"sizeSlug":"large","linkDestination":"none"} -->
+<figure class="wp-block-image size-large"><img src="https://cldup.com/cXyG__fTLN.jpg" alt="" class="wp-image-1"/></figure>
+<!-- /wp:image -->`;
+			return Promise.resolve( {
+				json: () => Promise.resolve( response ),
+			} );
+		} );
+
+		const screen = await initializeEditor( {
+			initialHtml,
+		} );
+
+		const reusableBlock = await screen.findByLabelText(
+			/Pattern Block\. Row 1/
+		);
+
+		// Mock media fetch requests
+		setupApiFetch( [ fetchMedia ] );
+
+		await triggerBlockListLayout(
+			within( reusableBlock ).getByTestId( 'block-list-wrapper' )
+		);
+
+		const imageBlock =
+			await within( reusableBlock ).getByLabelText(
+				'Image Block. Row 1'
+			);
+
+		expect( reusableBlock ).toBeDefined();
+		expect( imageBlock ).toBeDefined();
+	} );
 } );
diff --git a/packages/block-library/src/block/v1/edit.js b/packages/block-library/src/block/v1/edit.js
deleted file mode 100644
index 5975711376c650..00000000000000
--- a/packages/block-library/src/block/v1/edit.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	useEntityBlockEditor,
-	useEntityProp,
-	useEntityRecord,
-} from '@wordpress/core-data';
-import {
-	Placeholder,
-	Spinner,
-	TextControl,
-	PanelBody,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import {
-	useInnerBlocksProps,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
-	InnerBlocks,
-	InspectorControls,
-	useBlockProps,
-	Warning,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import { useRef, useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-
-const { useLayoutClasses } = unlock( blockEditorPrivateApis );
-const fullAlignments = [ 'full', 'wide', 'left', 'right' ];
-
-const useInferredLayout = ( blocks, parentLayout ) => {
-	const initialInferredAlignmentRef = useRef();
-
-	return useMemo( () => {
-		// Exit early if the pattern's blocks haven't loaded yet.
-		if ( ! blocks?.length ) {
-			return {};
-		}
-
-		let alignment = initialInferredAlignmentRef.current;
-
-		// Only track the initial alignment so that temporarily removed
-		// alignments can be reapplied.
-		if ( alignment === undefined ) {
-			const isConstrained = parentLayout?.type === 'constrained';
-			const hasFullAlignment = blocks.some( ( block ) =>
-				fullAlignments.includes( block.attributes.align )
-			);
-
-			alignment = isConstrained && hasFullAlignment ? 'full' : null;
-			initialInferredAlignmentRef.current = alignment;
-		}
-
-		const layout = alignment ? parentLayout : undefined;
-
-		return { alignment, layout };
-	}, [ blocks, parentLayout ] );
-};
-
-export default function ReusableBlockEdit( {
-	name,
-	attributes: { ref },
-	__unstableParentLayout: parentLayout,
-} ) {
-	const hasAlreadyRendered = useHasRecursion( ref );
-	const { record, hasResolved } = useEntityRecord(
-		'postType',
-		'wp_block',
-		ref
-	);
-	const isMissing = hasResolved && ! record;
-
-	const [ blocks, onInput, onChange ] = useEntityBlockEditor(
-		'postType',
-		'wp_block',
-		{ id: ref }
-	);
-
-	const [ title, setTitle ] = useEntityProp(
-		'postType',
-		'wp_block',
-		'title',
-		ref
-	);
-
-	const { alignment, layout } = useInferredLayout( blocks, parentLayout );
-	const layoutClasses = useLayoutClasses( { layout }, name );
-
-	const blockProps = useBlockProps( {
-		className: classnames(
-			'block-library-block__reusable-block-container',
-			layout && layoutClasses,
-			{ [ `align${ alignment }` ]: alignment }
-		),
-	} );
-
-	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		value: blocks,
-		layout,
-		onInput,
-		onChange,
-		renderAppender: blocks?.length
-			? undefined
-			: InnerBlocks.ButtonBlockAppender,
-	} );
-
-	let children = null;
-
-	if ( hasAlreadyRendered ) {
-		children = (
-			<Warning>
-				{ __( 'Block cannot be rendered inside itself.' ) }
-			</Warning>
-		);
-	}
-
-	if ( isMissing ) {
-		children = (
-			<Warning>
-				{ __( 'Block has been deleted or is unavailable.' ) }
-			</Warning>
-		);
-	}
-
-	if ( ! hasResolved ) {
-		children = (
-			<Placeholder>
-				<Spinner />
-			</Placeholder>
-		);
-	}
-
-	return (
-		<RecursionProvider uniqueId={ ref }>
-			<InspectorControls>
-				<PanelBody>
-					<TextControl
-						label={ __( 'Name' ) }
-						value={ title }
-						onChange={ setTitle }
-						__nextHasNoMarginBottom
-						__next40pxDefaultSize
-					/>
-				</PanelBody>
-			</InspectorControls>
-			{ children === null ? (
-				<div { ...innerBlocksProps } />
-			) : (
-				<div { ...blockProps }>{ children }</div>
-			) }
-		</RecursionProvider>
-	);
-}
diff --git a/packages/block-library/src/block/v1/edit.native.js b/packages/block-library/src/block/v1/edit.native.js
deleted file mode 100644
index 3a649921b3dda1..00000000000000
--- a/packages/block-library/src/block/v1/edit.native.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
- * External dependencies
- */
-import {
-	ActivityIndicator,
-	Platform,
-	Text,
-	TouchableWithoutFeedback,
-	View,
-} from 'react-native';
-
-/**
- * WordPress dependencies
- */
-import { useState, useCallback } from '@wordpress/element';
-import {
-	useEntityBlockEditor,
-	useEntityProp,
-	store as coreStore,
-} from '@wordpress/core-data';
-import {
-	BottomSheet,
-	Icon,
-	Disabled,
-	TextControl,
-} from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { __, sprintf } from '@wordpress/i18n';
-import {
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
-	InnerBlocks,
-	Warning,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { usePreferredColorSchemeStyle } from '@wordpress/compose';
-import { help } from '@wordpress/icons';
-import { store as reusableBlocksStore } from '@wordpress/reusable-blocks';
-import { store as editorStore } from '@wordpress/editor';
-import { store as noticesStore } from '@wordpress/notices';
-
-/**
- * Internal dependencies
- */
-import styles from '../editor.scss';
-import EditTitle from '../edit-title';
-
-export default function ReusableBlockEdit( {
-	attributes: { ref },
-	clientId,
-	isSelected,
-} ) {
-	const hasAlreadyRendered = useHasRecursion( ref );
-
-	const [ showHelp, setShowHelp ] = useState( false );
-	const infoTextStyle = usePreferredColorSchemeStyle(
-		styles.infoText,
-		styles.infoTextDark
-	);
-	const infoTitleStyle = usePreferredColorSchemeStyle(
-		styles.infoTitle,
-		styles.infoTitleDark
-	);
-	const infoSheetIconStyle = usePreferredColorSchemeStyle(
-		styles.infoSheetIcon,
-		styles.infoSheetIconDark
-	);
-	const infoDescriptionStyle = usePreferredColorSchemeStyle(
-		styles.infoDescription,
-		styles.infoDescriptionDark
-	);
-	const actionButtonStyle = usePreferredColorSchemeStyle(
-		styles.actionButton,
-		styles.actionButtonDark
-	);
-	const spinnerStyle = usePreferredColorSchemeStyle(
-		styles.spinner,
-		styles.spinnerDark
-	);
-
-	const { hasResolved, isEditing, isMissing } = useSelect(
-		( select ) => {
-			const persistedBlock = select( coreStore ).getEntityRecord(
-				'postType',
-				'wp_block',
-				ref
-			);
-			const hasResolvedBlock = select( coreStore ).hasFinishedResolution(
-				'getEntityRecord',
-				[ 'postType', 'wp_block', ref ]
-			);
-
-			const { getBlockCount } = select( blockEditorStore );
-
-			return {
-				hasResolved: hasResolvedBlock,
-				isEditing:
-					select(
-						reusableBlocksStore
-					).__experimentalIsEditingReusableBlock( clientId ),
-				isMissing: hasResolvedBlock && ! persistedBlock,
-				innerBlockCount: getBlockCount( clientId ),
-			};
-		},
-		[ ref, clientId ]
-	);
-	const hostAppNamespace = useSelect(
-		( select ) =>
-			select( editorStore ).getEditorSettings().hostAppNamespace,
-		[]
-	);
-
-	const { createSuccessNotice } = useDispatch( noticesStore );
-	const { __experimentalConvertBlockToStatic: convertBlockToStatic } =
-		useDispatch( reusableBlocksStore );
-	const { clearSelectedBlock } = useDispatch( blockEditorStore );
-
-	const [ blocks, onInput, onChange ] = useEntityBlockEditor(
-		'postType',
-		'wp_block',
-		{ id: ref }
-	);
-
-	const [ title ] = useEntityProp( 'postType', 'wp_block', 'title', ref );
-
-	function openSheet() {
-		setShowHelp( true );
-	}
-
-	function closeSheet() {
-		setShowHelp( false );
-	}
-
-	const onConvertToRegularBlocks = useCallback( () => {
-		/* translators: %s: name of the synced block */
-		const successNotice = __( '%s detached' );
-		createSuccessNotice( sprintf( successNotice, title ) );
-
-		clearSelectedBlock();
-		// Convert action is executed at the end of the current JavaScript execution block
-		// to prevent issues related to undo/redo actions.
-		setImmediate( () => convertBlockToStatic( clientId ) );
-	}, [ title, clientId ] );
-
-	function renderSheet() {
-		const infoTitle =
-			Platform.OS === 'android'
-				? sprintf(
-						/* translators: %s: name of the host app (e.g. WordPress) */
-						__(
-							'Editing synced patterns is not yet supported on %s for Android'
-						),
-						hostAppNamespace
-				  )
-				: sprintf(
-						/* translators: %s: name of the host app (e.g. WordPress) */
-						__(
-							'Editing synced patterns is not yet supported on %s for iOS'
-						),
-						hostAppNamespace
-				  );
-
-		return (
-			<BottomSheet
-				isVisible={ showHelp }
-				hideHeader
-				onClose={ closeSheet }
-			>
-				<View style={ styles.infoContainer }>
-					<Icon
-						icon={ help }
-						color={ infoSheetIconStyle.color }
-						size={ styles.infoSheetIcon.size }
-					/>
-					<Text style={ [ infoTextStyle, infoTitleStyle ] }>
-						{ infoTitle }
-					</Text>
-					<Text style={ [ infoTextStyle, infoDescriptionStyle ] }>
-						{ __(
-							'Alternatively, you can detach and edit this block separately by tapping “Detach”.'
-						) }
-					</Text>
-					<TextControl
-						label={ __( 'Detach' ) }
-						separatorType="topFullWidth"
-						onPress={ onConvertToRegularBlocks }
-						labelStyle={ actionButtonStyle }
-					/>
-				</View>
-			</BottomSheet>
-		);
-	}
-
-	if ( hasAlreadyRendered ) {
-		return (
-			<Warning
-				message={ __( 'Block cannot be rendered inside itself.' ) }
-			/>
-		);
-	}
-
-	if ( isMissing ) {
-		return (
-			<Warning
-				message={ __( 'Block has been deleted or is unavailable.' ) }
-			/>
-		);
-	}
-
-	if ( ! hasResolved ) {
-		return (
-			<View style={ spinnerStyle }>
-				<ActivityIndicator animating />
-			</View>
-		);
-	}
-
-	let element = (
-		<InnerBlocks
-			value={ blocks }
-			onChange={ onChange }
-			onInput={ onInput }
-		/>
-	);
-
-	if ( ! isEditing ) {
-		element = <Disabled>{ element }</Disabled>;
-	}
-
-	return (
-		<RecursionProvider uniqueId={ ref }>
-			<TouchableWithoutFeedback
-				disabled={ ! isSelected }
-				accessibilityLabel={ __( 'Help button' ) }
-				accessibilityRole={ 'button' }
-				accessibilityHint={ __( 'Tap here to show help' ) }
-				onPress={ openSheet }
-			>
-				<View>
-					{ isSelected && <EditTitle title={ title } /> }
-					{ element }
-					{ renderSheet() }
-				</View>
-			</TouchableWithoutFeedback>
-		</RecursionProvider>
-	);
-}
diff --git a/packages/block-library/src/button/block.json b/packages/block-library/src/button/block.json
index eec327b4ca48e4..2c1c05baa20dd3 100644
--- a/packages/block-library/src/button/block.json
+++ b/packages/block-library/src/button/block.json
@@ -26,34 +26,34 @@
 			"source": "attribute",
 			"selector": "a",
 			"attribute": "href",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"title": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "a,button",
 			"attribute": "title",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"text": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "a,button",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"linkTarget": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "a",
 			"attribute": "target",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"rel": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "a",
 			"attribute": "rel",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"placeholder": {
 			"type": "string"
@@ -73,6 +73,7 @@
 	},
 	"supports": {
 		"anchor": true,
+		"splitting": true,
 		"align": false,
 		"alignWide": false,
 		"color": {
@@ -92,12 +93,15 @@
 			"__experimentalTextTransform": true,
 			"__experimentalTextDecoration": true,
 			"__experimentalLetterSpacing": true,
+			"__experimentalWritingMode": true,
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
 		},
 		"reusable": false,
-		"shadow": true,
+		"shadow": {
+			"__experimentalSkipSerialization": true
+		},
 		"spacing": {
 			"__experimentalSkipSerialization": true,
 			"padding": [ "horizontal", "vertical" ],
@@ -118,7 +122,10 @@
 				"width": true
 			}
 		},
-		"__experimentalSelector": ".wp-block-button .wp-block-button__link"
+		"__experimentalSelector": ".wp-block-button .wp-block-button__link",
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"styles": [
 		{ "name": "fill", "label": "Fill", "isDefault": true },
diff --git a/packages/block-library/src/button/deprecated.js b/packages/block-library/src/button/deprecated.js
index 1ec6fde3fe4a48..8ab83e1b09518f 100644
--- a/packages/block-library/src/button/deprecated.js
+++ b/packages/block-library/src/button/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -58,7 +58,7 @@ function migrateAlign( attributes ) {
 	const { align, ...otherAttributes } = attributes;
 	return {
 		...otherAttributes,
-		className: classnames(
+		className: clsx(
 			otherAttributes.className,
 			`align${ attributes.align }`
 		),
@@ -226,7 +226,7 @@ const v11 = {
 		const borderProps = getBorderClassesAndStyles( attributes );
 		const colorProps = getColorClassesAndStyles( attributes );
 		const spacingProps = getSpacingClassesAndStyles( attributes );
-		const buttonClasses = classnames(
+		const buttonClasses = clsx(
 			'wp-block-button__link',
 			colorProps.className,
 			borderProps.className,
@@ -246,7 +246,7 @@ const v11 = {
 		// if it had already been assigned, for the sake of backward-compatibility.
 		// A title will no longer be assigned for new or updated button block links.
 
-		const wrapperClasses = classnames( className, {
+		const wrapperClasses = clsx( className, {
 			[ `has-custom-width wp-block-button__width-${ width }` ]: width,
 			[ `has-custom-font-size` ]: fontSize || style?.typography?.fontSize,
 		} );
@@ -352,7 +352,7 @@ const v10 = {
 		const borderProps = getBorderClassesAndStyles( attributes );
 		const colorProps = getColorClassesAndStyles( attributes );
 		const spacingProps = getSpacingClassesAndStyles( attributes );
-		const buttonClasses = classnames(
+		const buttonClasses = clsx(
 			'wp-block-button__link',
 			colorProps.className,
 			borderProps.className,
@@ -372,7 +372,7 @@ const v10 = {
 		// if it had already been assigned, for the sake of backward-compatibility.
 		// A title will no longer be assigned for new or updated button block links.
 
-		const wrapperClasses = classnames( className, {
+		const wrapperClasses = clsx( className, {
 			[ `has-custom-width wp-block-button__width-${ width }` ]: width,
 			[ `has-custom-font-size` ]: fontSize || style?.typography?.fontSize,
 		} );
@@ -468,7 +468,7 @@ const deprecated = [
 
 			const borderRadius = style?.border?.radius;
 			const colorProps = getColorClassesAndStyles( attributes );
-			const buttonClasses = classnames(
+			const buttonClasses = clsx(
 				'wp-block-button__link',
 				colorProps.className,
 				{
@@ -484,7 +484,7 @@ const deprecated = [
 			// if it had already been assigned, for the sake of backward-compatibility.
 			// A title will no longer be assigned for new or updated button block links.
 
-			const wrapperClasses = classnames( className, {
+			const wrapperClasses = clsx( className, {
 				[ `has-custom-width wp-block-button__width-${ width }` ]: width,
 				[ `has-custom-font-size` ]:
 					fontSize || style?.typography?.fontSize,
@@ -558,7 +558,7 @@ const deprecated = [
 			const { borderRadius, linkTarget, rel, text, title, url, width } =
 				attributes;
 			const colorProps = getColorClassesAndStyles( attributes );
-			const buttonClasses = classnames(
+			const buttonClasses = clsx(
 				'wp-block-button__link',
 				colorProps.className,
 				{
@@ -574,7 +574,7 @@ const deprecated = [
 			// if it had already been assigned, for the sake of backward-compatibility.
 			// A title will no longer be assigned for new or updated button block links.
 
-			const wrapperClasses = classnames( className, {
+			const wrapperClasses = clsx( className, {
 				[ `has-custom-width wp-block-button__width-${ width }` ]: width,
 			} );
 
@@ -646,7 +646,7 @@ const deprecated = [
 			const { borderRadius, linkTarget, rel, text, title, url, width } =
 				attributes;
 			const colorProps = getColorClassesAndStyles( attributes );
-			const buttonClasses = classnames(
+			const buttonClasses = clsx(
 				'wp-block-button__link',
 				colorProps.className,
 				{
@@ -662,7 +662,7 @@ const deprecated = [
 			// if it had already been assigned, for the sake of backward-compatibility.
 			// A title will no longer be assigned for new or updated button block links.
 
-			const wrapperClasses = classnames( className, {
+			const wrapperClasses = clsx( className, {
 				[ `has-custom-width wp-block-button__width-${ width }` ]: width,
 			} );
 
@@ -725,7 +725,7 @@ const deprecated = [
 		save( { attributes } ) {
 			const { borderRadius, linkTarget, rel, text, title, url } =
 				attributes;
-			const buttonClasses = classnames( 'wp-block-button__link', {
+			const buttonClasses = clsx( 'wp-block-button__link', {
 				'no-border-radius': borderRadius === 0,
 			} );
 			const buttonStyle = {
@@ -823,7 +823,7 @@ const deprecated = [
 				getColorClassName( 'background-color', backgroundColor );
 			const gradientClass = __experimentalGetGradientClass( gradient );
 
-			const buttonClasses = classnames( 'wp-block-button__link', {
+			const buttonClasses = clsx( 'wp-block-button__link', {
 				'has-text-color': textColor || customTextColor,
 				[ textClass ]: textClass,
 				'has-background':
@@ -941,7 +941,7 @@ const deprecated = [
 				backgroundColor
 			);
 
-			const buttonClasses = classnames( 'wp-block-button__link', {
+			const buttonClasses = clsx( 'wp-block-button__link', {
 				'has-text-color': textColor || customTextColor,
 				[ textClass ]: textClass,
 				'has-background': backgroundColor || customBackgroundColor,
@@ -1009,7 +1009,7 @@ const deprecated = [
 				backgroundColor
 			);
 
-			const buttonClasses = classnames( 'wp-block-button__link', {
+			const buttonClasses = clsx( 'wp-block-button__link', {
 				'has-text-color': textColor || customTextColor,
 				[ textClass ]: textClass,
 				'has-background': backgroundColor || customBackgroundColor,
diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
index d41d917d5b8fe1..3539fd54f4eece 100644
--- a/packages/block-library/src/button/edit.js
+++ b/packages/block-library/src/button/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
@@ -32,9 +32,11 @@ import {
 	__experimentalUseBorderProps as useBorderProps,
 	__experimentalUseColorProps as useColorProps,
 	__experimentalGetSpacingClassesAndStyles as useSpacingProps,
+	__experimentalGetShadowClassesAndStyles as useShadowProps,
 	__experimentalLinkControl as LinkControl,
 	__experimentalGetElementClassName,
 	store as blockEditorStore,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import { displayShortcut, isKeyboardEvent, ENTER } from '@wordpress/keycodes';
 import { link, linkOff } from '@wordpress/icons';
@@ -42,6 +44,7 @@ import {
 	createBlock,
 	cloneBlock,
 	getDefaultBlockName,
+	getBlockBindingsSource,
 } from '@wordpress/blocks';
 import { useMergeRefs, useRefEffect } from '@wordpress/compose';
 import { useSelect, useDispatch } from '@wordpress/data';
@@ -120,7 +123,7 @@ function WidthPanel( { selectedWidth, setAttributes } ) {
 	}
 
 	return (
-		<PanelBody title={ __( 'Width settings' ) }>
+		<PanelBody title={ __( 'Settings' ) }>
 			<ButtonGroup aria-label={ __( 'Button width' ) }>
 				{ [ 25, 50, 75, 100 ].map( ( widthValue ) => {
 					return (
@@ -152,6 +155,7 @@ function ButtonEdit( props ) {
 		onReplace,
 		mergeBlocks,
 		clientId,
+		context,
 	} = props;
 	const {
 		tagName,
@@ -163,6 +167,7 @@ function ButtonEdit( props ) {
 		text,
 		url,
 		width,
+		metadata,
 	} = attributes;
 
 	const TagName = tagName || 'a';
@@ -183,12 +188,14 @@ function ButtonEdit( props ) {
 	const borderProps = useBorderProps( attributes );
 	const colorProps = useColorProps( attributes );
 	const spacingProps = useSpacingProps( attributes );
+	const shadowProps = useShadowProps( attributes );
 	const ref = useRef();
 	const richTextRef = useRef();
 	const blockProps = useBlockProps( {
 		ref: useMergeRefs( [ setPopoverAnchor, ref ] ),
 		onKeyDown,
 	} );
+	const blockEditingMode = useBlockEditingMode();
 
 	const [ isEditingURL, setIsEditingURL ] = useState( false );
 	const isURLSet = !! url;
@@ -226,11 +233,34 @@ function ButtonEdit( props ) {
 	const useEnterRef = useEnter( { content: text, clientId } );
 	const mergedRef = useMergeRefs( [ useEnterRef, richTextRef ] );
 
+	const { lockUrlControls = false } = useSelect(
+		( select ) => {
+			if ( ! isSelected ) {
+				return {};
+			}
+
+			const blockBindingsSource = getBlockBindingsSource(
+				metadata?.bindings?.url?.source
+			);
+
+			return {
+				lockUrlControls:
+					!! metadata?.bindings?.url &&
+					! blockBindingsSource?.canUserEditValue?.( {
+						select,
+						context,
+						args: metadata?.bindings?.url?.args,
+					} ),
+			};
+		},
+		[ context, isSelected, metadata?.bindings?.url ]
+	);
+
 	return (
 		<>
 			<div
 				{ ...blockProps }
-				className={ classnames( blockProps.className, {
+				className={ clsx( blockProps.className, {
 					[ `has-custom-width wp-block-button__width-${ width }` ]:
 						width,
 					[ `has-custom-font-size` ]: blockProps.style.fontSize,
@@ -247,7 +277,7 @@ function ButtonEdit( props ) {
 						} )
 					}
 					withoutInteractiveFormatting
-					className={ classnames(
+					className={ clsx(
 						className,
 						'wp-block-button__link',
 						colorProps.className,
@@ -264,26 +294,23 @@ function ButtonEdit( props ) {
 						...borderProps.style,
 						...colorProps.style,
 						...spacingProps.style,
+						...shadowProps.style,
 					} }
-					onSplit={ ( value ) =>
-						createBlock( 'core/button', {
-							...attributes,
-							text: value,
-						} )
-					}
 					onReplace={ onReplace }
 					onMerge={ mergeBlocks }
 					identifier="text"
 				/>
 			</div>
 			<BlockControls group="block">
-				<AlignmentControl
-					value={ textAlign }
-					onChange={ ( nextAlign ) => {
-						setAttributes( { textAlign: nextAlign } );
-					} }
-				/>
-				{ ! isURLSet && isLinkTag && (
+				{ blockEditingMode === 'default' && (
+					<AlignmentControl
+						value={ textAlign }
+						onChange={ ( nextAlign ) => {
+							setAttributes( { textAlign: nextAlign } );
+						} }
+					/>
+				) }
+				{ ! isURLSet && isLinkTag && ! lockUrlControls && (
 					<ToolbarButton
 						name="link"
 						icon={ link }
@@ -292,54 +319,57 @@ function ButtonEdit( props ) {
 						onClick={ startEditing }
 					/>
 				) }
-				{ isURLSet && isLinkTag && (
+				{ isURLSet && isLinkTag && ! lockUrlControls && (
 					<ToolbarButton
 						name="link"
 						icon={ linkOff }
 						title={ __( 'Unlink' ) }
 						shortcut={ displayShortcut.primaryShift( 'k' ) }
 						onClick={ unlink }
-						isActive={ true }
+						isActive
 					/>
 				) }
 			</BlockControls>
-			{ isLinkTag && isSelected && ( isEditingURL || isURLSet ) && (
-				<Popover
-					placement="bottom"
-					onClose={ () => {
-						setIsEditingURL( false );
-						richTextRef.current?.focus();
-					} }
-					anchor={ popoverAnchor }
-					focusOnMount={ isEditingURL ? 'firstElement' : false }
-					__unstableSlotName={ '__unstable-block-tools-after' }
-					shift
-				>
-					<LinkControl
-						value={ linkValue }
-						onChange={ ( {
-							url: newURL,
-							opensInNewTab: newOpensInNewTab,
-							nofollow: newNofollow,
-						} ) =>
-							setAttributes(
-								getUpdatedLinkAttributes( {
-									rel,
-									url: newURL,
-									opensInNewTab: newOpensInNewTab,
-									nofollow: newNofollow,
-								} )
-							)
-						}
-						onRemove={ () => {
-							unlink();
+			{ isLinkTag &&
+				isSelected &&
+				( isEditingURL || isURLSet ) &&
+				! lockUrlControls && (
+					<Popover
+						placement="bottom"
+						onClose={ () => {
+							setIsEditingURL( false );
 							richTextRef.current?.focus();
 						} }
-						forceIsEditingLink={ isEditingURL }
-						settings={ LINK_SETTINGS }
-					/>
-				</Popover>
-			) }
+						anchor={ popoverAnchor }
+						focusOnMount={ isEditingURL ? 'firstElement' : false }
+						__unstableSlotName="__unstable-block-tools-after"
+						shift
+					>
+						<LinkControl
+							value={ linkValue }
+							onChange={ ( {
+								url: newURL,
+								opensInNewTab: newOpensInNewTab,
+								nofollow: newNofollow,
+							} ) =>
+								setAttributes(
+									getUpdatedLinkAttributes( {
+										rel,
+										url: newURL,
+										opensInNewTab: newOpensInNewTab,
+										nofollow: newNofollow,
+									} )
+								)
+							}
+							onRemove={ () => {
+								unlink();
+								richTextRef.current?.focus();
+							} }
+							forceIsEditingLink={ isEditingURL }
+							settings={ LINK_SETTINGS }
+						/>
+					</Popover>
+				) }
 			<InspectorControls>
 				<WidthPanel
 					selectedWidth={ width }
@@ -349,6 +379,7 @@ function ButtonEdit( props ) {
 			<InspectorControls group="advanced">
 				{ isLinkTag && (
 					<TextControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ __( 'Link rel' ) }
 						value={ rel || '' }
diff --git a/packages/block-library/src/button/edit.native.js b/packages/block-library/src/button/edit.native.js
index 214be33c7df2ed..26509a93de6864 100644
--- a/packages/block-library/src/button/edit.native.js
+++ b/packages/block-library/src/button/edit.native.js
@@ -17,6 +17,7 @@ import {
 	getColorObjectByAttributeValues,
 	getGradientValueBySlug,
 	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
+	useMobileGlobalStylesColors,
 } from '@wordpress/block-editor';
 import {
 	PanelBody,
@@ -28,7 +29,6 @@ import {
 	BottomSheetSelectControl,
 	CSS_UNITS,
 	filterUnitsWithSettings,
-	useMobileGlobalStylesColors,
 } from '@wordpress/components';
 import { link } from '@wordpress/icons';
 // eslint-disable-next-line no-restricted-imports
@@ -494,7 +494,7 @@ function ButtonEdit( props ) {
 					<View pointerEvents="none" style={ outLineStyles } />
 				) }
 				<RichText
-					setRef={ onSetRef }
+					ref={ onSetRef }
 					placeholder={ placeholderText }
 					value={ text }
 					onChange={ onChangeText }
diff --git a/packages/block-library/src/button/editor.scss b/packages/block-library/src/button/editor.scss
index 3c36586bbfabdf..8531f810e59e25 100644
--- a/packages/block-library/src/button/editor.scss
+++ b/packages/block-library/src/button/editor.scss
@@ -28,90 +28,7 @@
 	}
 }
 
-.wp-block-button__inline-link {
-	color: $gray-700;
-	height: 0;
-	overflow: hidden;
-	max-width: 290px;
-
-	&-input__suggestions {
-		max-width: 290px;
-	}
-
-	@include break-medium() {
-		max-width: 260px;
-
-		&-input__suggestions {
-			max-width: 260px;
-		}
-
-	}
-	@include break-large() {
-		max-width: 290px;
-
-		&-input__suggestions {
-			max-width: 290px;
-		}
-
-	}
-
-	.is-selected & {
-		height: auto;
-		overflow: visible;
-	}
-}
-
-.wp-button-label__width {
-	.components-button-group {
-		display: block;
-	}
-
-	.components-base-control__field {
-		margin-bottom: 12px;
-	}
-}
-
 // Display "table" is used because the button container should only wrap the content and not takes the full width.
 div[data-type="core/button"] {
 	display: table;
 }
-
-.editor-styles-wrapper .wp-block-button[style*="text-decoration"] .wp-block-button__link {
-	text-decoration: inherit;
-}
-
-.editor-styles-wrapper .wp-block-button .wp-block-button__link {
-	// The following styles ensure a default border is applied when the user selects only a border color or style in the editor,
-	// but no width. They override the `border-width: 0;` applied by core's theme.json via the Elements API button.
-	&:where(.has-border-color) {
-		border-width: initial;
-	}
-	&:where([style*="border-top-color"]) {
-		border-top-width: initial;
-	}
-	&:where([style*="border-right-color"]) {
-		border-right-width: initial;
-	}
-	&:where([style*="border-bottom-color"]) {
-		border-bottom-width: initial;
-	}
-	&:where([style*="border-left-color"]) {
-		border-left-width: initial;
-	}
-
-	&:where([style*="border-style"]) {
-		border-width: initial;
-	}
-	&:where([style*="border-top-style"]) {
-		border-top-width: initial;
-	}
-	&:where([style*="border-right-style"]) {
-		border-right-width: initial;
-	}
-	&:where([style*="border-bottom-style"]) {
-		border-bottom-width: initial;
-	}
-	&:where([style*="border-left-style"]) {
-		border-left-width: initial;
-	}
-}
diff --git a/packages/block-library/src/button/get-updated-link-attributes.js b/packages/block-library/src/button/get-updated-link-attributes.js
index 97b837a8be20bd..0e39a1815a3188 100644
--- a/packages/block-library/src/button/get-updated-link-attributes.js
+++ b/packages/block-library/src/button/get-updated-link-attributes.js
@@ -40,7 +40,7 @@ export function getUpdatedLinkAttributes( {
 	if ( nofollow ) {
 		updatedRel = updatedRel?.includes( NOFOLLOW_REL )
 			? updatedRel
-			: updatedRel + ` ${ NOFOLLOW_REL }`;
+			: ( updatedRel + ` ${ NOFOLLOW_REL }` ).trim();
 	} else {
 		const relRegex = new RegExp( `\\b${ NOFOLLOW_REL }\\s*`, 'g' );
 		updatedRel = updatedRel?.replace( relRegex, '' ).trim();
diff --git a/packages/block-library/src/button/index.php b/packages/block-library/src/button/index.php
new file mode 100644
index 00000000000000..f272fa9eb62b14
--- /dev/null
+++ b/packages/block-library/src/button/index.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Server-side rendering of the `core/button` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/button` block on the server,
+ *
+ * @since 6.6.0
+ *
+ * @param array    $attributes The block attributes.
+ * @param string   $content    The block content.
+ * @param WP_Block $block      The block object.
+ *
+ * @return string The block content.
+ */
+function render_block_core_button( $attributes, $content ) {
+	$p = new WP_HTML_Tag_Processor( $content );
+
+	/*
+	 * The button block can render an `<a>` or `<button>` and also has a
+	 * `<div>` wrapper. Find the a or button tag.
+	 */
+	$tag = null;
+	while ( $p->next_tag() ) {
+		$tag = $p->get_tag();
+		if ( 'A' === $tag || 'BUTTON' === $tag ) {
+			break;
+		}
+	}
+
+	/*
+	 * If this happens, the likelihood is there's no block content,
+	 * or the block has been modified by a plugin.
+	 */
+	if ( null === $tag ) {
+		return $content;
+	}
+
+	// If the next token is the closing tag, the button is empty.
+	$is_empty = true;
+	while ( $p->next_token() && $tag !== $p->get_token_name() && $is_empty ) {
+		if ( '#comment' !== $p->get_token_type() ) {
+			/**
+			 * Anything else implies this is not empty.
+			 * This might include any text content (including a space),
+			 * inline images or other HTML.
+			 */
+			$is_empty = false;
+		}
+	}
+
+	/*
+	 * When there's no text, render nothing for the block.
+	 * See https://github.com/WordPress/gutenberg/issues/17221 for the
+	 * reasoning behind this.
+	 */
+	if ( $is_empty ) {
+		return '';
+	}
+
+	return $content;
+}
+
+/**
+ * Registers the `core/button` block on server.
+ *
+ * @since 6.6.0
+ */
+function register_block_core_button() {
+	register_block_type_from_metadata(
+		__DIR__ . '/button',
+		array(
+			'render_callback' => 'render_block_core_button',
+		)
+	);
+}
+add_action( 'init', 'register_block_core_button' );
diff --git a/packages/block-library/src/button/save.js b/packages/block-library/src/button/save.js
index e12936e8c92457..8cb9da6fbfbc18 100644
--- a/packages/block-library/src/button/save.js
+++ b/packages/block-library/src/button/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,6 +12,7 @@ import {
 	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
 	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
 	__experimentalGetSpacingClassesAndStyles as getSpacingClassesAndStyles,
+	__experimentalGetShadowClassesAndStyles as getShadowClassesAndStyles,
 	__experimentalGetElementClassName,
 } from '@wordpress/block-editor';
 
@@ -30,17 +31,14 @@ export default function save( { attributes, className } ) {
 		width,
 	} = attributes;
 
-	if ( RichText.isEmpty( text ) ) {
-		return null;
-	}
-
 	const TagName = tagName || 'a';
 	const isButtonTag = 'button' === TagName;
 	const buttonType = type || 'button';
 	const borderProps = getBorderClassesAndStyles( attributes );
 	const colorProps = getColorClassesAndStyles( attributes );
 	const spacingProps = getSpacingClassesAndStyles( attributes );
-	const buttonClasses = classnames(
+	const shadowProps = getShadowClassesAndStyles( attributes );
+	const buttonClasses = clsx(
 		'wp-block-button__link',
 		colorProps.className,
 		borderProps.className,
@@ -56,13 +54,14 @@ export default function save( { attributes, className } ) {
 		...borderProps.style,
 		...colorProps.style,
 		...spacingProps.style,
+		...shadowProps.style,
 	};
 
 	// The use of a `title` attribute here is soft-deprecated, but still applied
 	// if it had already been assigned, for the sake of backward-compatibility.
 	// A title will no longer be assigned for new or updated button block links.
 
-	const wrapperClasses = classnames( className, {
+	const wrapperClasses = clsx( className, {
 		[ `has-custom-width wp-block-button__width-${ width }` ]: width,
 		[ `has-custom-font-size` ]: fontSize || style?.typography?.fontSize,
 	} );
diff --git a/packages/block-library/src/button/style.scss b/packages/block-library/src/button/style.scss
index d9efc928c5b1c7..a8f625b95c3923 100644
--- a/packages/block-library/src/button/style.scss
+++ b/packages/block-library/src/button/style.scss
@@ -9,6 +9,9 @@ $blocks-block__margin: 0.5em;
 	text-align: center;
 	word-break: break-word; // overflow-wrap doesn't work well if a link is wrapped in the div, so use word-break here.
 	box-sizing: border-box;
+	height: 100%;
+	width: 100%;
+	align-content: center;
 
 	&.aligncenter {
 		text-align: center;
@@ -86,69 +89,37 @@ $blocks-block__margin: 0.5em;
 	}
 }
 
-// the first selector is required for old buttons markup
+// The follow block style selectors are required for old buttons markup
+// and do not use the `:root :where()` format to match specificity at
+// the time they were deprecated.
 .wp-block-button.is-style-squared,
 .wp-block-button__link.wp-block-button.is-style-squared {
 	border-radius: 0;
 }
-
-// the first selector is required for old buttons markup
 .wp-block-button.no-border-radius,
 .wp-block-button__link.no-border-radius {
 	border-radius: 0 !important;
 }
 
-.wp-block-button.is-style-outline > .wp-block-button__link,
-.wp-block-button .wp-block-button__link.is-style-outline {
-	border: 2px solid currentColor;
-	padding: 0.667em 1.333em;
-}
-
-.wp-block-button.is-style-outline > .wp-block-button__link:not(.has-text-color),
-.wp-block-button .wp-block-button__link.is-style-outline:not(.has-text-color) {
-	color: currentColor;
-}
-
-.wp-block-button.is-style-outline > .wp-block-button__link:not(.has-background),
-.wp-block-button .wp-block-button__link.is-style-outline:not(.has-background) {
-	background-color: transparent;
-	// background-image is required to overwrite a gradient background
-	background-image: none;
-}
-
-.wp-block-button .wp-block-button__link {
-	// The following styles ensure a default border is applied when the user
-	// selects only a border color or style. This overcomes the zero border
-	// width applied by core's theme.json via the elements API.
-	&:where(.has-border-color) {
-		border-width: initial;
-	}
-	&:where([style*="border-top-color"]) {
-		border-top-width: initial;
-	}
-	&:where([style*="border-right-color"]) {
-		border-right-width: initial;
-	}
-	&:where([style*="border-bottom-color"]) {
-		border-bottom-width: initial;
-	}
-	&:where([style*="border-left-color"]) {
-		border-left-width: initial;
+// Selectors here use the `:root :where()` format for maintaining compatibility
+// with global styles and nested block style variations.
+:root {
+	// Outline Block Style Variation.
+	:where(.wp-block-button.is-style-outline > .wp-block-button__link),
+	:where(.wp-block-button .wp-block-button__link.is-style-outline) {
+		border: 2px solid currentColor;
+		padding: 0.667em 1.333em;
 	}
 
-	&:where([style*="border-style"]) {
-		border-width: initial;
-	}
-	&:where([style*="border-top-style"]) {
-		border-top-width: initial;
+	:where(.wp-block-button.is-style-outline > .wp-block-button__link:not(.has-text-color)),
+	:where(.wp-block-button .wp-block-button__link.is-style-outline:not(.has-text-color)) {
+		color: currentColor;
 	}
-	&:where([style*="border-right-style"]) {
-		border-right-width: initial;
-	}
-	&:where([style*="border-bottom-style"]) {
-		border-bottom-width: initial;
-	}
-	&:where([style*="border-left-style"]) {
-		border-left-width: initial;
+
+	:where(.wp-block-button.is-style-outline > .wp-block-button__link:not(.has-background)),
+	:where(.wp-block-button .wp-block-button__link.is-style-outline:not(.has-background)) {
+		background-color: transparent;
+		// background-image is required to overwrite a gradient background
+		background-image: none;
 	}
 }
diff --git a/packages/block-library/src/button/test/get-updated-link-attributes.js b/packages/block-library/src/button/test/get-updated-link-attributes.js
index af0c3da332110c..7349303d178b41 100644
--- a/packages/block-library/src/button/test/get-updated-link-attributes.js
+++ b/packages/block-library/src/button/test/get-updated-link-attributes.js
@@ -79,6 +79,21 @@ describe( 'getUpdatedLinkAttributes method', () => {
 		expect( result.rel ).toEqual( 'rel_value nofollow' );
 	} );
 
+	it( 'should correctly update link attributes with nofollow without spacing', () => {
+		const options = {
+			url: 'example.com',
+			opensInNewTab: false,
+			nofollow: true,
+			rel: '',
+		};
+
+		const result = getUpdatedLinkAttributes( options );
+
+		expect( result.url ).toEqual( 'http://example.com' );
+		expect( result.linkTarget ).toEqual( undefined );
+		expect( result.rel ).toEqual( 'nofollow' );
+	} );
+
 	it( 'should correctly handle rel with existing nofollow values and remove duplicates', () => {
 		const options = {
 			url: 'example.com',
diff --git a/packages/block-library/src/buttons/block.json b/packages/block-library/src/buttons/block.json
index 4dc420bd418855..bb4c370158ad5b 100644
--- a/packages/block-library/src/buttons/block.json
+++ b/packages/block-library/src/buttons/block.json
@@ -4,6 +4,7 @@
 	"name": "core/buttons",
 	"title": "Buttons",
 	"category": "design",
+	"allowedBlocks": [ "core/button" ],
 	"description": "Prompt visitors to take action with a group of button-style links.",
 	"keywords": [ "link" ],
 	"textdomain": "default",
@@ -12,8 +13,16 @@
 		"align": [ "wide", "full" ],
 		"html": false,
 		"__experimentalExposeControlsToChildren": true,
+		"color": {
+			"gradients": true,
+			"text": false,
+			"__experimentalDefaultControls": {
+				"background": true
+			}
+		},
 		"spacing": {
-			"blockGap": true,
+			"blockGap": [ "horizontal", "vertical" ],
+			"padding": true,
 			"margin": [ "top", "bottom" ],
 			"__experimentalDefaultControls": {
 				"blockGap": true
@@ -32,12 +41,27 @@
 				"fontSize": true
 			}
 		},
+		"__experimentalBorder": {
+			"color": true,
+			"radius": true,
+			"style": true,
+			"width": true,
+			"__experimentalDefaultControls": {
+				"color": true,
+				"radius": true,
+				"style": true,
+				"width": true
+			}
+		},
 		"layout": {
 			"allowSwitching": false,
 			"allowInheriting": false,
 			"default": {
 				"type": "flex"
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-buttons-editor",
diff --git a/packages/block-library/src/buttons/deprecated.js b/packages/block-library/src/buttons/deprecated.js
index 469cc14e76439b..da28a6617fb65b 100644
--- a/packages/block-library/src/buttons/deprecated.js
+++ b/packages/block-library/src/buttons/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 /**
  * WordPress dependencies
  */
@@ -63,7 +63,7 @@ const deprecated = [
 			return (
 				<div
 					{ ...useBlockProps.save( {
-						className: classnames( {
+						className: clsx( {
 							[ `is-content-justification-${ contentJustification }` ]:
 								contentJustification,
 							'is-vertical': orientation === 'vertical',
diff --git a/packages/block-library/src/buttons/edit.js b/packages/block-library/src/buttons/edit.js
index dce160dfb2fea8..6fb718475c2cac 100644
--- a/packages/block-library/src/buttons/edit.js
+++ b/packages/block-library/src/buttons/edit.js
@@ -1,28 +1,17 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import {
-	useBlockProps,
-	useInnerBlocksProps,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
+import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
 import { store as blocksStore } from '@wordpress/blocks';
 
-/**
- * Internal dependencies
- */
-import { name as buttonBlockName } from '../button';
-
-const ALLOWED_BLOCKS = [ buttonBlockName ];
-
 const DEFAULT_BLOCK = {
-	name: buttonBlockName,
+	name: 'core/button',
 	attributesToCopy: [
 		'backgroundColor',
 		'border',
@@ -39,36 +28,25 @@ const DEFAULT_BLOCK = {
 function ButtonsEdit( { attributes, className } ) {
 	const { fontSize, layout, style } = attributes;
 	const blockProps = useBlockProps( {
-		className: classnames( className, {
+		className: clsx( className, {
 			'has-custom-font-size': fontSize || style?.typography?.fontSize,
 		} ),
 	} );
-	const { preferredStyle, hasButtonVariations } = useSelect( ( select ) => {
-		const preferredStyleVariations =
-			select( blockEditorStore ).getSettings()
-				.__experimentalPreferredStyleVariations;
+	const { hasButtonVariations } = useSelect( ( select ) => {
 		const buttonVariations = select( blocksStore ).getBlockVariations(
-			buttonBlockName,
+			'core/button',
 			'inserter'
 		);
 		return {
-			preferredStyle:
-				preferredStyleVariations?.value?.[ buttonBlockName ],
 			hasButtonVariations: buttonVariations.length > 0,
 		};
 	}, [] );
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: ALLOWED_BLOCKS,
 		defaultBlock: DEFAULT_BLOCK,
 		// This check should be handled by the `Inserter` internally to be consistent across all blocks that use it.
 		directInsert: ! hasButtonVariations,
-		template: [
-			[
-				buttonBlockName,
-				{ className: preferredStyle && `is-style-${ preferredStyle }` },
-			],
-		],
+		template: [ [ 'core/button' ] ],
 		templateInsertUpdatesSelection: true,
 		orientation: layout?.orientation ?? 'horizontal',
 	} );
diff --git a/packages/block-library/src/buttons/edit.native.js b/packages/block-library/src/buttons/edit.native.js
index bb73d085a8f481..5f741c1de6ee55 100644
--- a/packages/block-library/src/buttons/edit.native.js
+++ b/packages/block-library/src/buttons/edit.native.js
@@ -21,11 +21,8 @@ import { alignmentHelpers } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import { name as buttonBlockName } from '../button/';
 import styles from './editor.scss';
 
-const ALLOWED_BLOCKS = [ buttonBlockName ];
-
 const layoutProp = { type: 'default', alignments: [] };
 
 const POPOVER_PROPS = {
@@ -72,13 +69,6 @@ export default function ButtonsEdit( {
 		[ clientId ]
 	);
 
-	const preferredStyle = useSelect( ( select ) => {
-		const preferredStyleVariations =
-			select( blockEditorStore ).getSettings()
-				.__experimentalPreferredStyleVariations;
-		return preferredStyleVariations?.value?.[ buttonBlockName ];
-	}, [] );
-
 	const { getBlockOrder } = useSelect( blockEditorStore );
 	const { insertBlock, removeBlock, selectBlock } =
 		useDispatch( blockEditorStore );
@@ -116,7 +106,7 @@ export default function ButtonsEdit( {
 	const renderFooterAppender = useRef( () => (
 		<View style={ styles.appenderContainer }>
 			<InnerBlocks.ButtonBlockAppender
-				isFloating={ true }
+				isFloating
 				onAddBlock={ onAddNextButton }
 			/>
 		</View>
@@ -147,17 +137,7 @@ export default function ButtonsEdit( {
 			) }
 			{ resizeObserver }
 			<InnerBlocks
-				allowedBlocks={ ALLOWED_BLOCKS }
-				template={ [
-					[
-						buttonBlockName,
-						{
-							className:
-								preferredStyle &&
-								`is-style-${ preferredStyle }`,
-						},
-					],
-				] }
+				template={ [ [ 'core/button' ] ] }
 				renderFooterAppender={
 					shouldRenderFooterAppender && renderFooterAppender.current
 				}
diff --git a/packages/block-library/src/buttons/editor.scss b/packages/block-library/src/buttons/editor.scss
index 018ca3b7e2f8e8..f0a1e930d40bb8 100644
--- a/packages/block-library/src/buttons/editor.scss
+++ b/packages/block-library/src/buttons/editor.scss
@@ -33,16 +33,14 @@ $blocks-block__margin: 0.5em;
 	//
 	// This back compat rule is ignored if the user decides to use the
 	// newer justification options on the button block, hence the :not.
-	//
-	// Disable the stylelint rule, otherwise this selector is ugly!
-	/* stylelint-disable indentation */
+	/* stylelint-disable @stylistic/indentation -- Disable the stylelint rule, otherwise this selector is ugly! */
 	&:not(
 		.is-content-justification-space-between,
 		.is-content-justification-right,
 		.is-content-justification-left,
 		.is-content-justification-center
 	) .wp-block[data-align="center"] {
-	/* stylelint-enable indentation */
+	/* stylelint-enable @stylistic/indentation */
 		margin-left: auto;
 		margin-right: auto;
 		margin-top: 0;
@@ -54,12 +52,6 @@ $blocks-block__margin: 0.5em;
 			margin-bottom: 0;
 		}
 	}
-
-	.editor-styles-wrapper &.has-custom-font-size {
-		.wp-block-button__link {
-			font-size: inherit;
-		}
-	}
 }
 
 .wp-block[data-align="center"] > .wp-block-buttons {
diff --git a/packages/block-library/src/buttons/index.js b/packages/block-library/src/buttons/index.js
index 810922fbcb839b..a39c6c6a2d6b7f 100644
--- a/packages/block-library/src/buttons/index.js
+++ b/packages/block-library/src/buttons/index.js
@@ -21,6 +21,12 @@ export { metadata, name };
 export const settings = {
 	icon,
 	example: {
+		attributes: {
+			layout: {
+				type: 'flex',
+				justifyContent: 'center',
+			},
+		},
 		innerBlocks: [
 			{
 				name: 'core/button',
diff --git a/packages/block-library/src/buttons/save.js b/packages/block-library/src/buttons/save.js
index 77431ef98829c6..43da258c8d7064 100644
--- a/packages/block-library/src/buttons/save.js
+++ b/packages/block-library/src/buttons/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,7 +11,7 @@ import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
 export default function save( { attributes, className } ) {
 	const { fontSize, style } = attributes;
 	const blockProps = useBlockProps.save( {
-		className: classnames( className, {
+		className: clsx( className, {
 			'has-custom-font-size': fontSize || style?.typography?.fontSize,
 		} ),
 	} );
diff --git a/packages/block-library/src/buttons/style.scss b/packages/block-library/src/buttons/style.scss
index 0f15bdab46fcfb..e563f3957f3746 100644
--- a/packages/block-library/src/buttons/style.scss
+++ b/packages/block-library/src/buttons/style.scss
@@ -2,6 +2,8 @@
 $blocks-block__margin: 0.5em;
 
 .wp-block-buttons {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
 
 	&.is-vertical {
 		flex-direction: column;
@@ -55,16 +57,14 @@ $blocks-block__margin: 0.5em;
 	//
 	// This back compat rule is ignored if the user decides to use the
 	// newer justification options on the button block, hence the :not.
-	//
-	// Disable the stylelint rule, otherwise this selector is ugly!
-	/* stylelint-disable indentation */
+	/* stylelint-disable @stylistic/indentation -- Disable the stylelint rule, otherwise this selector is ugly! */
 	&:not(
 		.is-content-justification-space-between,
 		.is-content-justification-right,
 		.is-content-justification-left,
 		.is-content-justification-center
 	) .wp-block-button.aligncenter {
-	/* stylelint-enable indentation */
+	/* stylelint-enable @stylistic/indentation */
 		margin-left: auto;
 		margin-right: auto;
 		width: 100%;
diff --git a/packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap
index 1a55c807225d9d..a7eebbf97144fa 100644
--- a/packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap
@@ -2,45 +2,69 @@
 
 exports[`Buttons block color customization sets a background color 1`] = `
 "<!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"backgroundColor":"luminous-vivid-amber"} /--></div>
+<div class="wp-block-buttons"><!-- wp:button {"backgroundColor":"luminous-vivid-amber"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-luminous-vivid-amber-background-color has-background wp-element-button" href=""></a></div>
+<!-- /wp:button --></div>
+<!-- /wp:buttons -->"
+`;
+
+exports[`Buttons block color customization sets a custom gradient background color 1`] = `
+"<!-- wp:buttons -->
+<div class="wp-block-buttons"><!-- wp:button {"style":{"color":{"gradient":"linear-gradient(200deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)"}}} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-background wp-element-button" href="" style="background:linear-gradient(200deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)"></a></div>
+<!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;
 
 exports[`Buttons block color customization sets a gradient background color 1`] = `
 "<!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"gradient":"light-green-cyan-to-vivid-green-cyan"} /--></div>
+<div class="wp-block-buttons"><!-- wp:button {"gradient":"light-green-cyan-to-vivid-green-cyan"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-light-green-cyan-to-vivid-green-cyan-gradient-background has-background wp-element-button" href=""></a></div>
+<!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;
 
 exports[`Buttons block color customization sets a text color 1`] = `
 "<!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"textColor":"pale-pink"} /--></div>
+<div class="wp-block-buttons"><!-- wp:button {"textColor":"pale-pink"} -->
+<div class="wp-block-button"><a class="wp-block-button__link has-pale-pink-color has-text-color wp-element-button" href=""></a></div>
+<!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;
 
 exports[`Buttons block justify content sets Justify items center option 1`] = `
 "<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center"}} -->
-<div class="wp-block-buttons"><!-- wp:button /--></div>
+<div class="wp-block-buttons"><!-- wp:button -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button"></a></div>
+<!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;
 
 exports[`Buttons block justify content sets Justify items left option 1`] = `
 "<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"left"}} -->
-<div class="wp-block-buttons"><!-- wp:button /--></div>
+<div class="wp-block-buttons"><!-- wp:button -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button"></a></div>
+<!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;
 
 exports[`Buttons block justify content sets Justify items right option 1`] = `
 "<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"right"}} -->
-<div class="wp-block-buttons"><!-- wp:button /--></div>
+<div class="wp-block-buttons"><!-- wp:button -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button"></a></div>
+<!-- /wp:button --></div>
 <!-- /wp:buttons -->"
 `;
 
 exports[`Buttons block when a button is shown adds another button using the inline appender 1`] = `
 "<!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button /-->
+<div class="wp-block-buttons"><!-- wp:button -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button" href=""></a></div>
+<!-- /wp:button -->
 
-<!-- wp:button /--></div>
+<!-- wp:button -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button" href=""></a></div>
+<!-- /wp:button --></div>
 <!-- /wp:buttons -->
 
 <!-- wp:paragraph -->
@@ -50,7 +74,9 @@ exports[`Buttons block when a button is shown adds another button using the inli
 
 exports[`Buttons block when a button is shown adds another button using the inserter 1`] = `
 "<!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button /-->
+<div class="wp-block-buttons"><!-- wp:button -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button" href=""></a></div>
+<!-- /wp:button -->
 
 <!-- wp:button -->
 <div class="wp-block-button"><a class="wp-block-button__link wp-element-button">Hello!</a></div>
diff --git a/packages/block-library/src/buttons/test/edit.native.js b/packages/block-library/src/buttons/test/edit.native.js
index f393a31c7330ad..fabee59bc5bc6b 100644
--- a/packages/block-library/src/buttons/test/edit.native.js
+++ b/packages/block-library/src/buttons/test/edit.native.js
@@ -10,6 +10,8 @@ import {
 	initializeEditor,
 	triggerBlockListLayout,
 	typeInRichText,
+	screen,
+	openBlockSettings,
 	waitFor,
 } from 'test/helpers';
 
@@ -20,7 +22,9 @@ import { getBlockTypes, unregisterBlockType } from '@wordpress/blocks';
 import { registerCoreBlocks } from '@wordpress/block-library';
 
 const BUTTONS_HTML = `<!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button /--></div>
+<div class="wp-block-buttons"><!-- wp:button -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button"></a></div>
+<!-- /wp:button --></div>
 <!-- /wp:buttons -->`;
 
 beforeAll( () => {
@@ -89,7 +93,7 @@ describe( 'Buttons block', () => {
 		} );
 
 		it( 'adds another button using the inline appender', async () => {
-			const screen = await initializeEditor( {
+			await initializeEditor( {
 				initialHtml: BUTTONS_HTML,
 			} );
 
@@ -140,7 +144,7 @@ describe( 'Buttons block', () => {
 		} );
 
 		it( 'adds another button using the inserter', async () => {
-			const screen = await initializeEditor( {
+			await initializeEditor( {
 				initialHtml: BUTTONS_HTML,
 			} );
 
@@ -199,9 +203,48 @@ describe( 'Buttons block', () => {
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
 
+		it( 'shows only the button block when using the inserter', async () => {
+			await initializeEditor();
+
+			// Add block
+			await addBlock( screen, 'Buttons' );
+
+			// Get block
+			const buttonsBlock = await getBlock( screen, 'Buttons' );
+			fireEvent.press( buttonsBlock );
+			await triggerBlockListLayout( buttonsBlock );
+
+			// Get inner button block
+			const buttonBlock = await getBlock( screen, 'Button' );
+			fireEvent.press( buttonBlock );
+
+			// Open the block inserter
+			fireEvent.press( screen.getByLabelText( 'Add block' ) );
+
+			const inserterList = screen.getByTestId( 'InserterUI-Blocks' );
+			// onScroll event used to force the FlatList to render all items
+			fireEvent.scroll( inserterList, {
+				nativeEvent: {
+					contentOffset: { y: 0, x: 0 },
+					contentSize: { width: 100, height: 100 },
+					layoutMeasurement: { width: 100, height: 100 },
+				},
+			} );
+
+			// Check the Button block is in the list
+			const buttonInserterBlock =
+				await within( inserterList ).findByText( 'Button' );
+			expect( buttonInserterBlock ).toBeVisible();
+
+			// Check the Paragraph core block is not in the list
+			expect(
+				within( inserterList ).queryByLabelText( 'Paragraph block' )
+			).toBeNull();
+		} );
+
 		describe( 'removing button along with buttons block', () => {
 			it( 'removes the button and buttons block when deleting the block using the block delete action', async () => {
-				const screen = await initializeEditor( {
+				await initializeEditor( {
 					initialHtml: BUTTONS_HTML,
 				} );
 
@@ -247,10 +290,9 @@ describe( 'Buttons block', () => {
 			'Justify items right',
 		].forEach( ( justificationOption ) =>
 			it( `sets ${ justificationOption } option`, async () => {
-				const initialHtml = `<!-- wp:buttons -->
-				<div class="wp-block-buttons"><!-- wp:button /--></div>
-				<!-- /wp:buttons -->`;
-				const screen = await initializeEditor( { initialHtml } );
+				await initializeEditor( {
+					initialHtml: BUTTONS_HTML,
+				} );
 
 				const [ block ] = await screen.findAllByLabelText(
 					/Buttons Block\. Row 1/
@@ -274,7 +316,7 @@ describe( 'Buttons block', () => {
 	describe( 'color customization', () => {
 		it( 'sets a text color', async () => {
 			// Arrange
-			const screen = await initializeEditor();
+			await initializeEditor();
 			await addBlock( screen, 'Buttons' );
 
 			// Act
@@ -315,7 +357,7 @@ describe( 'Buttons block', () => {
 
 		it( 'sets a background color', async () => {
 			// Arrange
-			const screen = await initializeEditor();
+			await initializeEditor();
 			await addBlock( screen, 'Buttons' );
 
 			// Act
@@ -352,7 +394,7 @@ describe( 'Buttons block', () => {
 
 		it( 'sets a gradient background color', async () => {
 			// Arrange
-			const screen = await initializeEditor();
+			await initializeEditor();
 			await addBlock( screen, 'Buttons' );
 
 			// Act
@@ -391,5 +433,53 @@ describe( 'Buttons block', () => {
 			// Assert
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
+
+		it( 'sets a custom gradient background color', async () => {
+			// Arrange
+			await initializeEditor();
+			await addBlock( screen, 'Buttons' );
+
+			// Act
+			const buttonsBlock = getBlock( screen, 'Buttons' );
+			fireEvent.press( buttonsBlock );
+
+			// Trigger onLayout for the list
+			await triggerBlockListLayout( buttonsBlock );
+
+			const buttonBlock = await getBlock( screen, 'Button' );
+			fireEvent.press( buttonBlock );
+
+			// Open Block Settings.
+			await openBlockSettings( screen );
+
+			// Open Text color settings
+			fireEvent.press( screen.getByLabelText( 'Background, Default' ) );
+
+			// Tap on the gradient segment
+			fireEvent.press( screen.getByLabelText( 'Gradient' ) );
+
+			// Tap one gradient color
+			fireEvent.press(
+				screen.getByLabelText( 'Light green cyan to vivid green cyan' )
+			);
+
+			// Tap on Customize Gradient
+			fireEvent.press( screen.getByLabelText( /Customize Gradient/ ) );
+
+			// Change the current angle
+			fireEvent.press( screen.getByText( '135', { hidden: true } ) );
+			const angleTextInput = screen.getByDisplayValue( '135', {
+				hidden: true,
+			} );
+			fireEvent.changeText( angleTextInput, '200' );
+
+			// Go back to the settings list.
+			fireEvent.press( await screen.findByLabelText( 'Go back' ) );
+
+			// Assert
+			const customButton = await screen.findByText( 'CUSTOM' );
+			expect( customButton ).toBeVisible();
+			expect( getEditorHtml() ).toMatchSnapshot();
+		} );
 	} );
 } );
diff --git a/packages/block-library/src/buttons/transforms.js b/packages/block-library/src/buttons/transforms.js
index 3e89b4973e3728..9848299f3a99f9 100644
--- a/packages/block-library/src/buttons/transforms.js
+++ b/packages/block-library/src/buttons/transforms.js
@@ -4,6 +4,11 @@
 import { createBlock } from '@wordpress/blocks';
 import { __unstableCreateElement as createElement } from '@wordpress/rich-text';
 
+/**
+ * Internal dependencies
+ */
+import { getTransformedMetadata } from '../utils/get-transformed-metadata';
+
 const transforms = {
 	from: [
 		{
@@ -33,10 +38,8 @@ const transforms = {
 					{},
 					// Loop the selected buttons.
 					buttons.map( ( attributes ) => {
-						const element = createElement(
-							document,
-							attributes.content
-						);
+						const { content, metadata } = attributes;
+						const element = createElement( document, content );
 						// Remove any HTML tags.
 						const text = element.innerText || '';
 						// Get first url.
@@ -46,6 +49,13 @@ const transforms = {
 						return createBlock( 'core/button', {
 							text,
 							url,
+							metadata: getTransformedMetadata(
+								metadata,
+								'core/button',
+								( { content: contentBinding } ) => ( {
+									text: contentBinding,
+								} )
+							),
 						} );
 					} )
 				),
diff --git a/packages/block-library/src/calendar/block.json b/packages/block-library/src/calendar/block.json
index 974d47ff8ec2ca..6ba8f7d725e6e5 100644
--- a/packages/block-library/src/calendar/block.json
+++ b/packages/block-library/src/calendar/block.json
@@ -37,6 +37,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-calendar"
diff --git a/packages/block-library/src/calendar/index.php b/packages/block-library/src/calendar/index.php
index 04b888972b1dd3..44b56af25e4662 100644
--- a/packages/block-library/src/calendar/index.php
+++ b/packages/block-library/src/calendar/index.php
@@ -8,6 +8,11 @@
 /**
  * Renders the `core/calendar` block on server.
  *
+ * @since 5.2.0
+ *
+ * @global int $monthnum.
+ * @global int $year.
+ *
  * @param array $attributes The block attributes.
  *
  * @return string Returns the block content.
@@ -76,6 +81,8 @@ function render_block_core_calendar( $attributes ) {
 
 /**
  * Registers the `core/calendar` block on server.
+ *
+ * @since 5.2.0
  */
 function register_block_core_calendar() {
 	register_block_type_from_metadata(
@@ -94,6 +101,8 @@ function register_block_core_calendar() {
  * Used to hide the calendar block when there are no published posts.
  * This compensates for a known Core bug: https://core.trac.wordpress.org/ticket/12016
  *
+ * @since 5.9.0
+ *
  * @return bool Has any published posts or not.
  */
 function block_core_calendar_has_published_posts() {
@@ -117,6 +126,10 @@ function block_core_calendar_has_published_posts() {
  * Queries the database for any published post and saves
  * a flag whether any published post exists or not.
  *
+ * @since 5.9.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @return bool Has any published posts or not.
  */
 function block_core_calendar_update_has_published_posts() {
@@ -132,6 +145,8 @@ function block_core_calendar_update_has_published_posts() {
 	/**
 	 * Handler for updating the has published posts flag when a post is deleted.
 	 *
+	 * @since 5.9.0
+	 *
 	 * @param int $post_id Deleted post ID.
 	 */
 	function block_core_calendar_update_has_published_post_on_delete( $post_id ) {
@@ -147,6 +162,8 @@ function block_core_calendar_update_has_published_post_on_delete( $post_id ) {
 	/**
 	 * Handler for updating the has published posts flag when a post status changes.
 	 *
+	 * @since 5.9.0
+	 *
 	 * @param string  $new_status The status the post is changing to.
 	 * @param string  $old_status The status the post is changing from.
 	 * @param WP_Post $post       Post object.
diff --git a/packages/block-library/src/categories/block.json b/packages/block-library/src/categories/block.json
index 5014da82980493..3609bdf9ab97c0 100644
--- a/packages/block-library/src/categories/block.json
+++ b/packages/block-library/src/categories/block.json
@@ -2,11 +2,16 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "core/categories",
-	"title": "Categories List",
+	"title": "Terms List",
 	"category": "widgets",
-	"description": "Display a list of all categories.",
+	"description": "Display a list of all terms of a given taxonomy.",
+	"keywords": [ "categories" ],
 	"textdomain": "default",
 	"attributes": {
+		"taxonomy": {
+			"type": "string",
+			"default": "category"
+		},
 		"displayAsDropdown": {
 			"type": "boolean",
 			"default": false
@@ -26,8 +31,17 @@
 		"showEmpty": {
 			"type": "boolean",
 			"default": false
+		},
+		"label": {
+			"type": "string",
+			"role": "content"
+		},
+		"showLabel": {
+			"type": "boolean",
+			"default": true
 		}
 	},
+	"usesContext": [ "enhancedPagination" ],
 	"supports": {
 		"align": true,
 		"html": false,
@@ -51,6 +65,21 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"editorStyle": "wp-block-categories-editor",
diff --git a/packages/block-library/src/categories/edit.js b/packages/block-library/src/categories/edit.js
index 15a526f249cf22..8bd2769b0ec711 100644
--- a/packages/block-library/src/categories/edit.js
+++ b/packages/block-library/src/categories/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -9,14 +9,19 @@ import classnames from 'classnames';
 import {
 	PanelBody,
 	Placeholder,
+	SelectControl,
 	Spinner,
 	ToggleControl,
 	VisuallyHidden,
 } from '@wordpress/components';
 import { useInstanceId } from '@wordpress/compose';
-import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
+import {
+	InspectorControls,
+	useBlockProps,
+	RichText,
+} from '@wordpress/block-editor';
 import { decodeEntities } from '@wordpress/html-entities';
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 import { pin } from '@wordpress/icons';
 import { useEntityRecords } from '@wordpress/core-data';
 
@@ -27,19 +32,35 @@ export default function CategoriesEdit( {
 		showPostCounts,
 		showOnlyTopLevel,
 		showEmpty,
+		label,
+		showLabel,
+		taxonomy: taxonomySlug,
 	},
 	setAttributes,
 	className,
 } ) {
 	const selectId = useInstanceId( CategoriesEdit, 'blocks-category-select' );
+
+	const { records: allTaxonomies, isResolvingTaxonomies } = useEntityRecords(
+		'root',
+		'taxonomy'
+	);
+
+	const taxonomies = allTaxonomies?.filter( ( t ) => t.visibility.public );
+
+	const taxonomy = taxonomies?.find( ( t ) => t.slug === taxonomySlug );
+
+	const isHierarchicalTaxonomy =
+		! isResolvingTaxonomies && taxonomy?.hierarchical;
+
 	const query = { per_page: -1, hide_empty: ! showEmpty, context: 'view' };
-	if ( showOnlyTopLevel ) {
+	if ( isHierarchicalTaxonomy && showOnlyTopLevel ) {
 		query.parent = 0;
 	}
 
 	const { records: categories, isResolving } = useEntityRecords(
 		'taxonomy',
-		'category',
+		taxonomySlug,
 		query
 	);
 
@@ -60,7 +81,7 @@ export default function CategoriesEdit( {
 		! name ? __( '(Untitled)' ) : decodeEntities( name ).trim();
 
 	const renderCategoryList = () => {
-		const parentId = showHierarchy ? 0 : null;
+		const parentId = isHierarchicalTaxonomy && showHierarchy ? 0 : null;
 		const categoriesList = getCategoriesList( parentId );
 		return categoriesList.map( ( category ) =>
 			renderCategoryListItem( category )
@@ -76,27 +97,48 @@ export default function CategoriesEdit( {
 					{ renderCategoryName( name ) }
 				</a>
 				{ showPostCounts && ` (${ count })` }
-				{ showHierarchy && !! childCategories.length && (
-					<ul className="children">
-						{ childCategories.map( ( childCategory ) =>
-							renderCategoryListItem( childCategory )
-						) }
-					</ul>
-				) }
+				{ isHierarchicalTaxonomy &&
+					showHierarchy &&
+					!! childCategories.length && (
+						<ul className="children">
+							{ childCategories.map( ( childCategory ) =>
+								renderCategoryListItem( childCategory )
+							) }
+						</ul>
+					) }
 			</li>
 		);
 	};
 
 	const renderCategoryDropdown = () => {
-		const parentId = showHierarchy ? 0 : null;
+		const parentId = isHierarchicalTaxonomy && showHierarchy ? 0 : null;
 		const categoriesList = getCategoriesList( parentId );
 		return (
 			<>
-				<VisuallyHidden as="label" htmlFor={ selectId }>
-					{ __( 'Categories' ) }
-				</VisuallyHidden>
+				{ showLabel ? (
+					<RichText
+						className="wp-block-categories__label"
+						aria-label={ __( 'Label text' ) }
+						placeholder={ taxonomy.name }
+						withoutInteractiveFormatting
+						value={ label }
+						onChange={ ( html ) =>
+							setAttributes( { label: html } )
+						}
+					/>
+				) : (
+					<VisuallyHidden as="label" htmlFor={ selectId }>
+						{ label ? label : taxonomy.name }
+					</VisuallyHidden>
+				) }
 				<select id={ selectId }>
-					<option>{ __( 'Select Category' ) }</option>
+					<option>
+						{ sprintf(
+							/* translators: %s: taxonomy's singular name */
+							__( 'Select %s' ),
+							taxonomy.labels.singular_name
+						) }
+					</option>
 					{ categoriesList.map( ( category ) =>
 						renderCategoryDropdownItem( category, 0 )
 					) }
@@ -114,7 +156,8 @@ export default function CategoriesEdit( {
 				{ renderCategoryName( name ) }
 				{ showPostCounts && ` (${ count })` }
 			</option>,
-			showHierarchy &&
+			isHierarchicalTaxonomy &&
+				showHierarchy &&
 				!! childCategories.length &&
 				childCategories.map( ( childCategory ) =>
 					renderCategoryDropdownItem( childCategory, level + 1 )
@@ -127,7 +170,7 @@ export default function CategoriesEdit( {
 			? 'ul'
 			: 'div';
 
-	const classes = classnames( className, {
+	const classes = clsx( className, {
 		'wp-block-categories-list':
 			!! categories?.length && ! displayAsDropdown && ! isResolving,
 		'wp-block-categories-dropdown':
@@ -142,31 +185,59 @@ export default function CategoriesEdit( {
 		<TagName { ...blockProps }>
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
+					{ Array.isArray( taxonomies ) && (
+						<SelectControl
+							__nextHasNoMarginBottom
+							__next40pxDefaultSize
+							label={ __( 'Taxonomy' ) }
+							options={ taxonomies.map( ( t ) => ( {
+								label: t.name,
+								value: t.slug,
+							} ) ) }
+							value={ taxonomySlug }
+							onChange={ ( selectedTaxonomy ) =>
+								setAttributes( {
+									taxonomy: selectedTaxonomy,
+								} )
+							}
+						/>
+					) }
 					<ToggleControl
 						__nextHasNoMarginBottom
 						label={ __( 'Display as dropdown' ) }
 						checked={ displayAsDropdown }
 						onChange={ toggleAttribute( 'displayAsDropdown' ) }
 					/>
+					{ displayAsDropdown && (
+						<ToggleControl
+							__nextHasNoMarginBottom
+							className="wp-block-categories__indentation"
+							label={ __( 'Show label' ) }
+							checked={ showLabel }
+							onChange={ toggleAttribute( 'showLabel' ) }
+						/>
+					) }
 					<ToggleControl
 						__nextHasNoMarginBottom
 						label={ __( 'Show post counts' ) }
 						checked={ showPostCounts }
 						onChange={ toggleAttribute( 'showPostCounts' ) }
 					/>
+					{ isHierarchicalTaxonomy && (
+						<ToggleControl
+							__nextHasNoMarginBottom
+							label={ __( 'Show only top level terms' ) }
+							checked={ showOnlyTopLevel }
+							onChange={ toggleAttribute( 'showOnlyTopLevel' ) }
+						/>
+					) }
 					<ToggleControl
 						__nextHasNoMarginBottom
-						label={ __( 'Show only top level categories' ) }
-						checked={ showOnlyTopLevel }
-						onChange={ toggleAttribute( 'showOnlyTopLevel' ) }
-					/>
-					<ToggleControl
-						__nextHasNoMarginBottom
-						label={ __( 'Show empty categories' ) }
+						label={ __( 'Show empty terms' ) }
 						checked={ showEmpty }
 						onChange={ toggleAttribute( 'showEmpty' ) }
 					/>
-					{ ! showOnlyTopLevel && (
+					{ isHierarchicalTaxonomy && ! showOnlyTopLevel && (
 						<ToggleControl
 							__nextHasNoMarginBottom
 							label={ __( 'Show hierarchy' ) }
@@ -177,16 +248,12 @@ export default function CategoriesEdit( {
 				</PanelBody>
 			</InspectorControls>
 			{ isResolving && (
-				<Placeholder icon={ pin } label={ __( 'Categories' ) }>
+				<Placeholder icon={ pin } label={ __( 'Terms' ) }>
 					<Spinner />
 				</Placeholder>
 			) }
 			{ ! isResolving && categories?.length === 0 && (
-				<p>
-					{ __(
-						'Your site does not have any posts, so there is nothing to display here at the moment.'
-					) }
-				</p>
+				<p>{ taxonomy.labels.no_terms }</p>
 			) }
 			{ ! isResolving &&
 				categories?.length > 0 &&
diff --git a/packages/block-library/src/categories/editor.scss b/packages/block-library/src/categories/editor.scss
index 773a65296c06ec..c39fbf69bb981b 100644
--- a/packages/block-library/src/categories/editor.scss
+++ b/packages/block-library/src/categories/editor.scss
@@ -10,3 +10,7 @@
 [data-align="center"] .wp-block-categories {
 	text-align: center;
 }
+
+.wp-block-categories__indentation {
+	padding-left: 16px;
+}
diff --git a/packages/block-library/src/categories/index.js b/packages/block-library/src/categories/index.js
index 8cdcad450862a2..d30c55667d106e 100644
--- a/packages/block-library/src/categories/index.js
+++ b/packages/block-library/src/categories/index.js
@@ -9,6 +9,7 @@ import { category as icon } from '@wordpress/icons';
 import initBlock from '../utils/init-block';
 import metadata from './block.json';
 import edit from './edit';
+import variations from './variations';
 
 const { name } = metadata;
 
@@ -18,6 +19,7 @@ export const settings = {
 	icon,
 	example: {},
 	edit,
+	variations,
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/categories/index.php b/packages/block-library/src/categories/index.php
index c35376505b134f..60a29713b4660d 100644
--- a/packages/block-library/src/categories/index.php
+++ b/packages/block-library/src/categories/index.php
@@ -8,19 +8,27 @@
 /**
  * Renders the `core/categories` block on server.
  *
- * @param array $attributes The block attributes.
+ * @since 5.0.0
+ * @since 6.7.0 Enable client-side rendering if enhancedPagination context is true.
+ *
+ * @param array    $attributes The block attributes.
+ * @param string   $content    Block default content.
+ * @param WP_Block $block      Block instance.
  *
  * @return string Returns the categories list/dropdown markup.
  */
-function render_block_core_categories( $attributes ) {
+function render_block_core_categories( $attributes, $content, $block ) {
 	static $block_id = 0;
 	++$block_id;
 
+	$taxonomy = get_taxonomy( $attributes['taxonomy'] );
+
 	$args = array(
 		'echo'         => false,
 		'hierarchical' => ! empty( $attributes['showHierarchy'] ),
 		'orderby'      => 'name',
 		'show_count'   => ! empty( $attributes['showPostCounts'] ),
+		'taxonomy'     => $attributes['taxonomy'],
 		'title_li'     => '',
 		'hide_empty'   => empty( $attributes['showEmpty'] ),
 	);
@@ -31,10 +39,20 @@ function render_block_core_categories( $attributes ) {
 	if ( ! empty( $attributes['displayAsDropdown'] ) ) {
 		$id                       = 'wp-block-categories-' . $block_id;
 		$args['id']               = $id;
-		$args['show_option_none'] = __( 'Select Category' );
-		$wrapper_markup           = '<div %1$s><label class="screen-reader-text" for="' . esc_attr( $id ) . '">' . __( 'Categories' ) . '</label>%2$s</div>';
-		$items_markup             = wp_dropdown_categories( $args );
-		$type                     = 'dropdown';
+		$args['name']             = $taxonomy->query_var;
+		$args['value_field']      = 'slug';
+		$args['show_option_none'] = sprintf(
+			/* translators: %s: taxonomy's singular name */
+			__( 'Select %s' ),
+			$taxonomy->labels->singular_name
+		);
+
+		$show_label     = empty( $attributes['showLabel'] ) ? ' screen-reader-text' : '';
+		$default_label  = $taxonomy->label;
+		$label_text     = ! empty( $attributes['label'] ) ? wp_kses_post( $attributes['label'] ) : $default_label;
+		$wrapper_markup = '<div %1$s><label class="wp-block-categories__label' . $show_label . '" for="' . esc_attr( $id ) . '">' . $label_text . '</label>%2$s</div>';
+		$items_markup   = wp_dropdown_categories( $args );
+		$type           = 'dropdown';
 
 		if ( ! is_admin() ) {
 			// Inject the dropdown script immediately after the select dropdown.
@@ -46,9 +64,19 @@ function render_block_core_categories( $attributes ) {
 			);
 		}
 	} else {
+		$args['show_option_none'] = $taxonomy->labels->no_terms;
+
 		$wrapper_markup = '<ul %1$s>%2$s</ul>';
 		$items_markup   = wp_list_categories( $args );
 		$type           = 'list';
+
+		if ( ! empty( $block->context['enhancedPagination'] ) ) {
+			$p = new WP_HTML_Tag_Processor( $items_markup );
+			while ( $p->next_tag( 'a' ) ) {
+				$p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
+			}
+			$items_markup = $p->get_updated_html();
+		}
 	}
 
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => "wp-block-categories-{$type}" ) );
@@ -63,6 +91,8 @@ function render_block_core_categories( $attributes ) {
 /**
  * Generates the inline script for a categories dropdown field.
  *
+ * @since 5.0.0
+ *
  * @param string $dropdown_id ID of the dropdown field.
  *
  * @return string Returns the dropdown onChange redirection script.
@@ -74,8 +104,8 @@ function build_dropdown_script_block_core_categories( $dropdown_id ) {
 	( function() {
 		var dropdown = document.getElementById( '<?php echo esc_js( $dropdown_id ); ?>' );
 		function onCatChange() {
-			if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
-				location.href = "<?php echo esc_url( home_url() ); ?>/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
+			if ( dropdown.options[ dropdown.selectedIndex ].value !== -1 ) {
+				location.href = "<?php echo esc_url( home_url() ); ?>/?" + dropdown.name + '=' + dropdown.options[ dropdown.selectedIndex ].value;
 			}
 		}
 		dropdown.onchange = onCatChange;
@@ -87,6 +117,8 @@ function onCatChange() {
 
 /**
  * Registers the `core/categories` block on server.
+ *
+ * @since 5.0.0
  */
 function register_block_core_categories() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/categories/style.scss b/packages/block-library/src/categories/style.scss
index b87e28a80f0f36..319206c51a1f3f 100644
--- a/packages/block-library/src/categories/style.scss
+++ b/packages/block-library/src/categories/style.scss
@@ -14,4 +14,8 @@
 	&.wp-block-categories-dropdown.aligncenter {
 		text-align: center;
 	}
+	& .wp-block-categories__label {
+		width: 100%;
+		display: block;
+	}
 }
diff --git a/packages/block-library/src/categories/variations.js b/packages/block-library/src/categories/variations.js
new file mode 100644
index 00000000000000..94f3fb8efa6b9a
--- /dev/null
+++ b/packages/block-library/src/categories/variations.js
@@ -0,0 +1,40 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { category as icon } from '@wordpress/icons';
+
+const variations = [
+	{
+		name: 'terms',
+		title: __( 'Terms List' ),
+		icon,
+		attributes: {
+			// We need to set an attribute here that will be set when inserting the block.
+			// We cannot leave this empty, as that would be interpreted as the default value,
+			// which is `category` -- for which we're defining a distinct variation below,
+			// for backwards compatibility reasons.
+			// The logical fallback is thus the only other built-in and public taxonomy: Tags.
+			taxonomy: 'post_tag',
+		},
+		isActive: ( blockAttributes ) =>
+			// This variation is used for any taxonomy other than `category`.
+			blockAttributes.taxonomy !== 'category',
+	},
+	{
+		name: 'categories',
+		title: __( 'Categories List' ),
+		description: __( 'Display a list of all categories.' ),
+		icon,
+		attributes: {
+			taxonomy: 'category',
+		},
+		isActive: [ 'taxonomy' ],
+		// The following is needed to prevent "Terms List" from showing up twice in the inserter
+		// (once for the block, once for the variation). Fortunately, it does not collide with
+		// `categories` being the default value of the `taxonomy` attribute.
+		isDefault: true,
+	},
+];
+
+export default variations;
diff --git a/packages/block-library/src/code/block.json b/packages/block-library/src/code/block.json
index 80df74b5062b56..4465c8554fc125 100644
--- a/packages/block-library/src/code/block.json
+++ b/packages/block-library/src/code/block.json
@@ -8,8 +8,8 @@
 	"textdomain": "default",
 	"attributes": {
 		"content": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "code",
 			"__unstablePreserveWhiteSpace": true
 		}
@@ -56,6 +56,9 @@
 				"background": true,
 				"text": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-code"
diff --git a/packages/block-library/src/code/save.js b/packages/block-library/src/code/save.js
index 7dd355f3855a86..977fb074c2a53e 100644
--- a/packages/block-library/src/code/save.js
+++ b/packages/block-library/src/code/save.js
@@ -13,7 +13,16 @@ export default function save( { attributes } ) {
 		<pre { ...useBlockProps.save() }>
 			<RichText.Content
 				tagName="code"
-				value={ escape( attributes.content ) }
+				// To do: `escape` encodes characters in shortcodes and URLs to
+				// prevent embedding in PHP. Ideally checks for the code block,
+				// or pre/code tags, should be made on the PHP side?
+				value={ escape(
+					typeof attributes.content === 'string'
+						? attributes.content
+						: attributes.content.toHTMLString( {
+								preserveWhiteSpace: true,
+						  } )
+				) }
 			/>
 		</pre>
 	);
diff --git a/packages/block-library/src/code/style.scss b/packages/block-library/src/code/style.scss
index 670a4f7f1ef4c8..ccc950d19b552c 100644
--- a/packages/block-library/src/code/style.scss
+++ b/packages/block-library/src/code/style.scss
@@ -9,5 +9,10 @@
 		font-family: inherit;
 		overflow-wrap: break-word;
 		white-space: pre-wrap;
+		// Set direction and avoid inheriting alignment from a parent element.
+		/*!rtl:begin:ignore*/
+		direction: ltr;
+		text-align: initial;
+		/*!rtl:end:ignore*/
 	}
 }
diff --git a/packages/block-library/src/code/theme.native.scss b/packages/block-library/src/code/theme.native.scss
index ee432598dd1c22..44eb9707b86a4b 100644
--- a/packages/block-library/src/code/theme.native.scss
+++ b/packages/block-library/src/code/theme.native.scss
@@ -1,4 +1,4 @@
-/* stylelint-disable font-family-no-missing-generic-family-keyword */
+/* stylelint-disable font-family-no-missing-generic-family-keyword -- iOS will use the Menlo typeface and Android will use monospace, no need for a generic family keyword. */
 
 .blockCode {
 	font-family: $default-monospace-font;
diff --git a/packages/block-library/src/code/transforms.js b/packages/block-library/src/code/transforms.js
index af6d4686af8122..e537db342b8d5c 100644
--- a/packages/block-library/src/code/transforms.js
+++ b/packages/block-library/src/code/transforms.js
@@ -4,6 +4,11 @@
 import { createBlock } from '@wordpress/blocks';
 import { create, toHTMLString } from '@wordpress/rich-text';
 
+/**
+ * Internal dependencies
+ */
+import { getTransformedMetadata } from '../utils/get-transformed-metadata';
+
 const transforms = {
 	from: [
 		{
@@ -14,17 +19,21 @@ const transforms = {
 		{
 			type: 'block',
 			blocks: [ 'core/paragraph' ],
-			transform: ( { content } ) =>
-				createBlock( 'core/code', { content } ),
+			transform: ( { content, metadata } ) =>
+				createBlock( 'core/code', {
+					content,
+					metadata: getTransformedMetadata( metadata, 'core/code' ),
+				} ),
 		},
 		{
 			type: 'block',
 			blocks: [ 'core/html' ],
-			transform: ( { content: text } ) => {
+			transform: ( { content: text, metadata } ) => {
 				return createBlock( 'core/code', {
 					// The HTML is plain text (with plain line breaks), so
 					// convert it to rich text.
 					content: toHTMLString( { value: create( { text } ) } ),
+					metadata: getTransformedMetadata( metadata, 'core/code' ),
 				} );
 			},
 		},
@@ -51,8 +60,14 @@ const transforms = {
 		{
 			type: 'block',
 			blocks: [ 'core/paragraph' ],
-			transform: ( { content } ) =>
-				createBlock( 'core/paragraph', { content } ),
+			transform: ( { content, metadata } ) =>
+				createBlock( 'core/paragraph', {
+					content,
+					metadata: getTransformedMetadata(
+						metadata,
+						'core/paragraph'
+					),
+				} ),
 		},
 	],
 };
diff --git a/packages/block-library/src/column/block.json b/packages/block-library/src/column/block.json
index 7f61f307fab159..33bd528b356880 100644
--- a/packages/block-library/src/column/block.json
+++ b/packages/block-library/src/column/block.json
@@ -37,6 +37,7 @@
 				"text": true
 			}
 		},
+		"shadow": true,
 		"spacing": {
 			"blockGap": true,
 			"padding": true,
@@ -47,10 +48,12 @@
 		},
 		"__experimentalBorder": {
 			"color": true,
+			"radius": true,
 			"style": true,
 			"width": true,
 			"__experimentalDefaultControls": {
 				"color": true,
+				"radius": true,
 				"style": true,
 				"width": true
 			}
@@ -68,6 +71,9 @@
 				"fontSize": true
 			}
 		},
-		"layout": true
+		"layout": true,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	}
 }
diff --git a/packages/block-library/src/column/deprecated.js b/packages/block-library/src/column/deprecated.js
index eabefba86a7981..514ab41dd62a87 100644
--- a/packages/block-library/src/column/deprecated.js
+++ b/packages/block-library/src/column/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -32,7 +32,7 @@ const deprecated = [
 		save( { attributes } ) {
 			const { verticalAlignment, width } = attributes;
 
-			const wrapperClasses = classnames( {
+			const wrapperClasses = clsx( {
 				[ `is-vertically-aligned-${ verticalAlignment }` ]:
 					verticalAlignment,
 			} );
diff --git a/packages/block-library/src/column/edit.js b/packages/block-library/src/column/edit.js
index ce9d971e956574..a0f3cdcf65393d 100644
--- a/packages/block-library/src/column/edit.js
+++ b/packages/block-library/src/column/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -24,20 +24,36 @@ import {
 import { useSelect, useDispatch } from '@wordpress/data';
 import { sprintf, __ } from '@wordpress/i18n';
 
+function ColumnInspectorControls( { width, setAttributes } ) {
+	const [ availableUnits ] = useSettings( 'spacing.units' );
+	const units = useCustomUnits( {
+		availableUnits: availableUnits || [ '%', 'px', 'em', 'rem', 'vw' ],
+	} );
+	return (
+		<PanelBody title={ __( 'Settings' ) }>
+			<UnitControl
+				label={ __( 'Width' ) }
+				__unstableInputWidth="calc(50% - 8px)"
+				__next40pxDefaultSize
+				value={ width || '' }
+				onChange={ ( nextWidth ) => {
+					nextWidth = 0 > parseFloat( nextWidth ) ? '0' : nextWidth;
+					setAttributes( { width: nextWidth } );
+				} }
+				units={ units }
+			/>
+		</PanelBody>
+	);
+}
+
 function ColumnEdit( {
 	attributes: { verticalAlignment, width, templateLock, allowedBlocks },
 	setAttributes,
 	clientId,
 } ) {
-	const classes = classnames( 'block-core-columns', {
+	const classes = clsx( 'block-core-columns', {
 		[ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
 	} );
-
-	const [ availableUnits ] = useSettings( 'spacing.units' );
-	const units = useCustomUnits( {
-		availableUnits: availableUnits || [ '%', 'px', 'em', 'rem', 'vw' ],
-	} );
-
 	const { columnsIds, hasChildBlocks, rootClientId } = useSelect(
 		( select ) => {
 			const { getBlockOrder, getBlockRootClientId } =
@@ -103,20 +119,10 @@ function ColumnEdit( {
 				/>
 			</BlockControls>
 			<InspectorControls>
-				<PanelBody title={ __( 'Settings' ) }>
-					<UnitControl
-						label={ __( 'Width' ) }
-						labelPosition="edge"
-						__unstableInputWidth="80px"
-						value={ width || '' }
-						onChange={ ( nextWidth ) => {
-							nextWidth =
-								0 > parseFloat( nextWidth ) ? '0' : nextWidth;
-							setAttributes( { width: nextWidth } );
-						} }
-						units={ units }
-					/>
-				</PanelBody>
+				<ColumnInspectorControls
+					width={ width }
+					setAttributes={ setAttributes }
+				/>
 			</InspectorControls>
 			<div { ...innerBlocksProps } />
 		</>
diff --git a/packages/block-library/src/column/edit.native.js b/packages/block-library/src/column/edit.native.js
index 871a12c7ee600f..0a88d36beaf960 100644
--- a/packages/block-library/src/column/edit.native.js
+++ b/packages/block-library/src/column/edit.native.js
@@ -220,7 +220,9 @@ function ColumnEditWrapper( props ) {
 	const { verticalAlignment } = props.attributes;
 
 	const getVerticalAlignmentRemap = ( alignment ) => {
-		if ( ! alignment ) return styles.flexBase;
+		if ( ! alignment ) {
+			return styles.flexBase;
+		}
 		return {
 			...styles.flexBase,
 			...styles[ `is-vertically-aligned-${ alignment }` ],
diff --git a/packages/block-library/src/column/save.js b/packages/block-library/src/column/save.js
index 9d52ff19d08236..87806f70f25ff4 100644
--- a/packages/block-library/src/column/save.js
+++ b/packages/block-library/src/column/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,7 +11,7 @@ import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
 export default function save( { attributes } ) {
 	const { verticalAlignment, width } = attributes;
 
-	const wrapperClasses = classnames( {
+	const wrapperClasses = clsx( {
 		[ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
 	} );
 
diff --git a/packages/block-library/src/columns/block.json b/packages/block-library/src/columns/block.json
index dff9c45ae2ddeb..6d49a27e82eb03 100644
--- a/packages/block-library/src/columns/block.json
+++ b/packages/block-library/src/columns/block.json
@@ -4,6 +4,7 @@
 	"name": "core/columns",
 	"title": "Columns",
 	"category": "design",
+	"allowedBlocks": [ "core/column" ],
 	"description": "Display content in multiple columns, with blocks added to each column.",
 	"textdomain": "default",
 	"attributes": {
@@ -78,7 +79,11 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
-		}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"shadow": true
 	},
 	"editorStyle": "wp-block-columns-editor",
 	"style": "wp-block-columns"
diff --git a/packages/block-library/src/columns/deprecated.js b/packages/block-library/src/columns/deprecated.js
index be4527c5b1dab8..21be6d29118ee4 100644
--- a/packages/block-library/src/columns/deprecated.js
+++ b/packages/block-library/src/columns/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -95,7 +95,7 @@ export default [
 
 			const textClass = getColorClassName( 'color', textColor );
 
-			const className = classnames( {
+			const className = clsx( {
 				'has-background': backgroundColor || customBackgroundColor,
 				'has-text-color': textColor || customTextColor,
 				[ backgroundClass ]: backgroundClass,
@@ -210,7 +210,7 @@ export default [
 		save( { attributes } ) {
 			const { verticalAlignment, columns } = attributes;
 
-			const wrapperClasses = classnames( `has-${ columns }-columns`, {
+			const wrapperClasses = clsx( `has-${ columns }-columns`, {
 				[ `are-vertically-aligned-${ verticalAlignment }` ]:
 					verticalAlignment,
 			} );
diff --git a/packages/block-library/src/columns/edit.js b/packages/block-library/src/columns/edit.js
index ec48b50f5b6ad3..f8cf0297302ccd 100644
--- a/packages/block-library/src/columns/edit.js
+++ b/packages/block-library/src/columns/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -23,7 +23,7 @@ import {
 	useBlockProps,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { withDispatch, useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelect, useRegistry } from '@wordpress/data';
 import {
 	createBlock,
 	createBlocksFromInnerBlocksTemplate,
@@ -40,26 +40,15 @@ import {
 	toWidthPrecision,
 } from './utils';
 
-/**
- * Allowed blocks constant is passed to InnerBlocks precisely as specified here.
- * The contents of the array should never change.
- * The array should contain the name of each block that is allowed.
- * In columns block, the only block we allow is 'core/column'.
- *
- * @constant
- * @type {string[]}
- */
-const ALLOWED_BLOCKS = [ 'core/column' ];
+const DEFAULT_BLOCK = {
+	name: 'core/column',
+};
 
-function ColumnsEditContainer( {
-	attributes,
-	setAttributes,
-	updateAlignment,
-	updateColumns,
+function ColumnInspectorControls( {
 	clientId,
+	setAttributes,
+	isStackedOnMobile,
 } ) {
-	const { isStackedOnMobile, verticalAlignment, templateLock } = attributes;
-
 	const { count, canInsertColumnBlock, minCount } = useSelect(
 		( select ) => {
 			const {
@@ -93,8 +82,117 @@ function ColumnsEditContainer( {
 		},
 		[ clientId ]
 	);
+	const { getBlocks } = useSelect( blockEditorStore );
+	const { replaceInnerBlocks } = useDispatch( blockEditorStore );
+
+	/**
+	 * Updates the column count, including necessary revisions to child Column
+	 * blocks to grant required or redistribute available space.
+	 *
+	 * @param {number} previousColumns Previous column count.
+	 * @param {number} newColumns      New column count.
+	 */
+	function updateColumns( previousColumns, newColumns ) {
+		let innerBlocks = getBlocks( clientId );
+		const hasExplicitWidths = hasExplicitPercentColumnWidths( innerBlocks );
+
+		// Redistribute available width for existing inner blocks.
+		const isAddingColumn = newColumns > previousColumns;
+
+		if ( isAddingColumn && hasExplicitWidths ) {
+			// If adding a new column, assign width to the new column equal to
+			// as if it were `1 / columns` of the total available space.
+			const newColumnWidth = toWidthPrecision( 100 / newColumns );
+			const newlyAddedColumns = newColumns - previousColumns;
+
+			// Redistribute in consideration of pending block insertion as
+			// constraining the available working width.
+			const widths = getRedistributedColumnWidths(
+				innerBlocks,
+				100 - newColumnWidth * newlyAddedColumns
+			);
+
+			innerBlocks = [
+				...getMappedColumnWidths( innerBlocks, widths ),
+				...Array.from( {
+					length: newlyAddedColumns,
+				} ).map( () => {
+					return createBlock( 'core/column', {
+						width: `${ newColumnWidth }%`,
+					} );
+				} ),
+			];
+		} else if ( isAddingColumn ) {
+			innerBlocks = [
+				...innerBlocks,
+				...Array.from( {
+					length: newColumns - previousColumns,
+				} ).map( () => {
+					return createBlock( 'core/column' );
+				} ),
+			];
+		} else if ( newColumns < previousColumns ) {
+			// The removed column will be the last of the inner blocks.
+			innerBlocks = innerBlocks.slice(
+				0,
+				-( previousColumns - newColumns )
+			);
+			if ( hasExplicitWidths ) {
+				// Redistribute as if block is already removed.
+				const widths = getRedistributedColumnWidths( innerBlocks, 100 );
+
+				innerBlocks = getMappedColumnWidths( innerBlocks, widths );
+			}
+		}
+
+		replaceInnerBlocks( clientId, innerBlocks );
+	}
+
+	return (
+		<PanelBody title={ __( 'Settings' ) }>
+			{ canInsertColumnBlock && (
+				<>
+					<RangeControl
+						__nextHasNoMarginBottom
+						__next40pxDefaultSize
+						label={ __( 'Columns' ) }
+						value={ count }
+						onChange={ ( value ) =>
+							updateColumns( count, Math.max( minCount, value ) )
+						}
+						min={ Math.max( 1, minCount ) }
+						max={ Math.max( 6, count ) }
+					/>
+					{ count > 6 && (
+						<Notice status="warning" isDismissible={ false }>
+							{ __(
+								'This column count exceeds the recommended amount and may cause visual breakage.'
+							) }
+						</Notice>
+					) }
+				</>
+			) }
+			<ToggleControl
+				__nextHasNoMarginBottom
+				label={ __( 'Stack on mobile' ) }
+				checked={ isStackedOnMobile }
+				onChange={ () =>
+					setAttributes( {
+						isStackedOnMobile: ! isStackedOnMobile,
+					} )
+				}
+			/>
+		</PanelBody>
+	);
+}
+
+function ColumnsEditContainer( { attributes, setAttributes, clientId } ) {
+	const { isStackedOnMobile, verticalAlignment, templateLock } = attributes;
+	const registry = useRegistry();
+	const { getBlockOrder } = useSelect( blockEditorStore );
+	const { updateBlockAttributes } = useDispatch( blockEditorStore );
 
-	const classes = classnames( {
+	const classes = clsx( {
 		[ `are-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
 		[ `is-not-stacked-on-mobile` ]: ! isStackedOnMobile,
 	} );
@@ -103,12 +201,33 @@ function ColumnsEditContainer( {
 		className: classes,
 	} );
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: ALLOWED_BLOCKS,
+		defaultBlock: DEFAULT_BLOCK,
+		directInsert: true,
 		orientation: 'horizontal',
 		renderAppender: false,
 		templateLock,
 	} );
 
+	/**
+	 * Update all child Column blocks with a new vertical alignment setting
+	 * based on whatever alignment is passed in. This allows change to parent
+	 * to overide anything set on a individual column basis.
+	 *
+	 * @param {string} newVerticalAlignment The vertical alignment setting.
+	 */
+	function updateAlignment( newVerticalAlignment ) {
+		const innerBlockClientIds = getBlockOrder( clientId );
+
+		// Update own and child Column block vertical alignments.
+		// This is a single action; the batching prevents creating multiple history records.
+		registry.batch( () => {
+			setAttributes( { verticalAlignment: newVerticalAlignment } );
+			updateBlockAttributes( innerBlockClientIds, {
+				verticalAlignment: newVerticalAlignment,
+			} );
+		} );
+	}
+
 	return (
 		<>
 			<BlockControls>
@@ -118,150 +237,17 @@ function ColumnsEditContainer( {
 				/>
 			</BlockControls>
 			<InspectorControls>
-				<PanelBody>
-					{ canInsertColumnBlock && (
-						<>
-							<RangeControl
-								__nextHasNoMarginBottom
-								__next40pxDefaultSize
-								label={ __( 'Columns' ) }
-								value={ count }
-								onChange={ ( value ) =>
-									updateColumns(
-										count,
-										Math.max( minCount, value )
-									)
-								}
-								min={ Math.max( 1, minCount ) }
-								max={ Math.max( 6, count ) }
-							/>
-							{ count > 6 && (
-								<Notice
-									status="warning"
-									isDismissible={ false }
-								>
-									{ __(
-										'This column count exceeds the recommended amount and may cause visual breakage.'
-									) }
-								</Notice>
-							) }
-						</>
-					) }
-					<ToggleControl
-						__nextHasNoMarginBottom
-						label={ __( 'Stack on mobile' ) }
-						checked={ isStackedOnMobile }
-						onChange={ () =>
-							setAttributes( {
-								isStackedOnMobile: ! isStackedOnMobile,
-							} )
-						}
-					/>
-				</PanelBody>
+				<ColumnInspectorControls
+					clientId={ clientId }
+					setAttributes={ setAttributes }
+					isStackedOnMobile={ isStackedOnMobile }
+				/>
 			</InspectorControls>
 			<div { ...innerBlocksProps } />
 		</>
 	);
 }
 
-const ColumnsEditContainerWrapper = withDispatch(
-	( dispatch, ownProps, registry ) => ( {
-		/**
-		 * Update all child Column blocks with a new vertical alignment setting
-		 * based on whatever alignment is passed in. This allows change to parent
-		 * to overide anything set on a individual column basis.
-		 *
-		 * @param {string} verticalAlignment the vertical alignment setting
-		 */
-		updateAlignment( verticalAlignment ) {
-			const { clientId, setAttributes } = ownProps;
-			const { updateBlockAttributes } = dispatch( blockEditorStore );
-			const { getBlockOrder } = registry.select( blockEditorStore );
-
-			// Update own alignment.
-			setAttributes( { verticalAlignment } );
-
-			// Update all child Column Blocks to match.
-			const innerBlockClientIds = getBlockOrder( clientId );
-			innerBlockClientIds.forEach( ( innerBlockClientId ) => {
-				updateBlockAttributes( innerBlockClientId, {
-					verticalAlignment,
-				} );
-			} );
-		},
-
-		/**
-		 * Updates the column count, including necessary revisions to child Column
-		 * blocks to grant required or redistribute available space.
-		 *
-		 * @param {number} previousColumns Previous column count.
-		 * @param {number} newColumns      New column count.
-		 */
-		updateColumns( previousColumns, newColumns ) {
-			const { clientId } = ownProps;
-			const { replaceInnerBlocks } = dispatch( blockEditorStore );
-			const { getBlocks } = registry.select( blockEditorStore );
-
-			let innerBlocks = getBlocks( clientId );
-			const hasExplicitWidths =
-				hasExplicitPercentColumnWidths( innerBlocks );
-
-			// Redistribute available width for existing inner blocks.
-			const isAddingColumn = newColumns > previousColumns;
-
-			if ( isAddingColumn && hasExplicitWidths ) {
-				// If adding a new column, assign width to the new column equal to
-				// as if it were `1 / columns` of the total available space.
-				const newColumnWidth = toWidthPrecision( 100 / newColumns );
-
-				// Redistribute in consideration of pending block insertion as
-				// constraining the available working width.
-				const widths = getRedistributedColumnWidths(
-					innerBlocks,
-					100 - newColumnWidth
-				);
-
-				innerBlocks = [
-					...getMappedColumnWidths( innerBlocks, widths ),
-					...Array.from( {
-						length: newColumns - previousColumns,
-					} ).map( () => {
-						return createBlock( 'core/column', {
-							width: `${ newColumnWidth }%`,
-						} );
-					} ),
-				];
-			} else if ( isAddingColumn ) {
-				innerBlocks = [
-					...innerBlocks,
-					...Array.from( {
-						length: newColumns - previousColumns,
-					} ).map( () => {
-						return createBlock( 'core/column' );
-					} ),
-				];
-			} else if ( newColumns < previousColumns ) {
-				// The removed column will be the last of the inner blocks.
-				innerBlocks = innerBlocks.slice(
-					0,
-					-( previousColumns - newColumns )
-				);
-				if ( hasExplicitWidths ) {
-					// Redistribute as if block is already removed.
-					const widths = getRedistributedColumnWidths(
-						innerBlocks,
-						100
-					);
-
-					innerBlocks = getMappedColumnWidths( innerBlocks, widths );
-				}
-			}
-
-			replaceInnerBlocks( clientId, innerBlocks );
-		},
-	} )
-)( ColumnsEditContainer );
-
 function Placeholder( { clientId, name, setAttributes } ) {
 	const { blockType, defaultVariation, variations } = useSelect(
 		( select ) => {
@@ -288,6 +274,7 @@ function Placeholder( { clientId, name, setAttributes } ) {
 				icon={ blockType?.icon?.src }
 				label={ blockType?.title }
 				variations={ variations }
+				instructions={ __( 'Divide into columns. Select a layout:' ) }
 				onSelect={ ( nextVariation = defaultVariation ) => {
 					if ( nextVariation.attributes ) {
 						setAttributes( nextVariation.attributes );
@@ -315,9 +302,7 @@ const ColumnsEdit = ( props ) => {
 			select( blockEditorStore ).getBlocks( clientId ).length > 0,
 		[ clientId ]
 	);
-	const Component = hasInnerBlocks
-		? ColumnsEditContainerWrapper
-		: Placeholder;
+	const Component = hasInnerBlocks ? ColumnsEditContainer : Placeholder;
 
 	return <Component { ...props } />;
 };
diff --git a/packages/block-library/src/columns/edit.native.js b/packages/block-library/src/columns/edit.native.js
index 2782085e5e55fc..07655981edcada 100644
--- a/packages/block-library/src/columns/edit.native.js
+++ b/packages/block-library/src/columns/edit.native.js
@@ -13,7 +13,6 @@ import {
 	FooterMessageControl,
 	UnitControl,
 	getValueAndUnit,
-	GlobalStylesContext,
 	alignmentHelpers,
 	__experimentalUseCustomUnits as useCustomUnits,
 } from '@wordpress/components';
@@ -25,12 +24,12 @@ import {
 	BlockVariationPicker,
 	useSettings,
 	store as blockEditorStore,
+	useGlobalStyles,
 } from '@wordpress/block-editor';
 import { withDispatch, useSelect } from '@wordpress/data';
 import {
 	useEffect,
 	useState,
-	useContext,
 	useMemo,
 	useCallback,
 	memo,
@@ -59,17 +58,6 @@ import {
 } from './columnCalculations.native';
 import ColumnsPreview from '../column/column-preview';
 
-/**
- * Allowed blocks constant is passed to InnerBlocks precisely as specified here.
- * The contents of the array should never change.
- * The array should contain the name of each block that is allowed.
- * In columns block, the only block we allow is 'core/column'.
- *
- * @constant
- * @type {string[]}
- */
-const ALLOWED_BLOCKS = [ 'core/column' ];
-
 /**
  * Number of columns to assume for template in case the user opts to skip
  * template option selection.
@@ -101,7 +89,7 @@ function ColumnsEditContainer( {
 	const [ resizeListener, sizes ] = useResizeObserver();
 	const [ columnsInRow, setColumnsInRow ] = useState( MIN_COLUMNS_NUM );
 	const screenWidth = Math.floor( Dimensions.get( 'window' ).width );
-	const globalStyles = useContext( GlobalStylesContext );
+	const globalStyles = useGlobalStyles();
 
 	const { verticalAlignment, align } = attributes;
 	const { width } = sizes || {};
@@ -275,7 +263,6 @@ function ColumnsEditContainer( {
 							columnsInRow > 1 ? 'horizontal' : undefined
 						}
 						horizontal={ columnsInRow > 1 }
-						allowedBlocks={ ALLOWED_BLOCKS }
 						contentResizeMode="stretch"
 						onAddBlock={ onAddBlock }
 						onDeleteBlock={
diff --git a/packages/block-library/src/columns/index.js b/packages/block-library/src/columns/index.js
index 45f7bd70e61ffd..12b0fa6e43b0be 100644
--- a/packages/block-library/src/columns/index.js
+++ b/packages/block-library/src/columns/index.js
@@ -23,7 +23,7 @@ export const settings = {
 	icon,
 	variations,
 	example: {
-		viewportWidth: 600, // Columns collapse "@media (max-width: 599px)".
+		viewportWidth: 782, // Columns collapse "@media (max-width: 781px)".
 		innerBlocks: [
 			{
 				name: 'core/column',
diff --git a/packages/block-library/src/columns/save.js b/packages/block-library/src/columns/save.js
index 0dde5595308536..cdd291f02c67aa 100644
--- a/packages/block-library/src/columns/save.js
+++ b/packages/block-library/src/columns/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,7 +11,7 @@ import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
 export default function save( { attributes } ) {
 	const { isStackedOnMobile, verticalAlignment } = attributes;
 
-	const className = classnames( {
+	const className = clsx( {
 		[ `are-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
 		[ `is-not-stacked-on-mobile` ]: ! isStackedOnMobile,
 	} );
diff --git a/packages/block-library/src/columns/variations.js b/packages/block-library/src/columns/variations.js
index 440175584fcdd5..044ba34b7b8fb1 100644
--- a/packages/block-library/src/columns/variations.js
+++ b/packages/block-library/src/columns/variations.js
@@ -18,16 +18,12 @@ const variations = [
 		description: __( 'One column' ),
 		icon: (
 			<SVG
+				xmlns="http://www.w3.org/2000/svg"
 				width="48"
 				height="48"
 				viewBox="0 0 48 48"
-				xmlns="http://www.w3.org/2000/svg"
 			>
-				<Path
-					fillRule="evenodd"
-					clipRule="evenodd"
-					d="m39.0625 14h-30.0625v20.0938h30.0625zm-30.0625-2c-1.10457 0-2 .8954-2 2v20.0938c0 1.1045.89543 2 2 2h30.0625c1.1046 0 2-.8955 2-2v-20.0938c0-1.1046-.8954-2-2-2z"
-				/>
+				<Path d="M0 10a2 2 0 0 1 2-2h44a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Z" />
 			</SVG>
 		),
 		innerBlocks: [ [ 'core/column' ] ],
@@ -39,16 +35,12 @@ const variations = [
 		description: __( 'Two columns; equal split' ),
 		icon: (
 			<SVG
+				xmlns="http://www.w3.org/2000/svg"
 				width="48"
 				height="48"
 				viewBox="0 0 48 48"
-				xmlns="http://www.w3.org/2000/svg"
 			>
-				<Path
-					fillRule="evenodd"
-					clipRule="evenodd"
-					d="M39 12C40.1046 12 41 12.8954 41 14V34C41 35.1046 40.1046 36 39 36H9C7.89543 36 7 35.1046 7 34V14C7 12.8954 7.89543 12 9 12H39ZM39 34V14H25V34H39ZM23 34H9V14H23V34Z"
-				/>
+				<Path d="M0 10a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Zm25 0a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H27a2 2 0 0 1-2-2V10Z" />
 			</SVG>
 		),
 		isDefault: true,
@@ -61,16 +53,12 @@ const variations = [
 		description: __( 'Two columns; one-third, two-thirds split' ),
 		icon: (
 			<SVG
+				xmlns="http://www.w3.org/2000/svg"
 				width="48"
 				height="48"
 				viewBox="0 0 48 48"
-				xmlns="http://www.w3.org/2000/svg"
 			>
-				<Path
-					fillRule="evenodd"
-					clipRule="evenodd"
-					d="M39 12C40.1046 12 41 12.8954 41 14V34C41 35.1046 40.1046 36 39 36H9C7.89543 36 7 35.1046 7 34V14C7 12.8954 7.89543 12 9 12H39ZM39 34V14H20V34H39ZM18 34H9V14H18V34Z"
-				/>
+				<Path d="M0 10a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Zm17 0a2 2 0 0 1 2-2h27a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H19a2 2 0 0 1-2-2V10Z" />
 			</SVG>
 		),
 		innerBlocks: [
@@ -85,16 +73,12 @@ const variations = [
 		description: __( 'Two columns; two-thirds, one-third split' ),
 		icon: (
 			<SVG
+				xmlns="http://www.w3.org/2000/svg"
 				width="48"
 				height="48"
 				viewBox="0 0 48 48"
-				xmlns="http://www.w3.org/2000/svg"
 			>
-				<Path
-					fillRule="evenodd"
-					clipRule="evenodd"
-					d="M39 12C40.1046 12 41 12.8954 41 14V34C41 35.1046 40.1046 36 39 36H9C7.89543 36 7 35.1046 7 34V14C7 12.8954 7.89543 12 9 12H39ZM39 34V14H30V34H39ZM28 34H9V14H28V34Z"
-				/>
+				<Path d="M0 10a2 2 0 0 1 2-2h27a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Zm33 0a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H35a2 2 0 0 1-2-2V10Z" />
 			</SVG>
 		),
 		innerBlocks: [
@@ -109,15 +93,12 @@ const variations = [
 		description: __( 'Three columns; equal split' ),
 		icon: (
 			<SVG
+				xmlns="http://www.w3.org/2000/svg"
 				width="48"
 				height="48"
 				viewBox="0 0 48 48"
-				xmlns="http://www.w3.org/2000/svg"
 			>
-				<Path
-					fillRule="evenodd"
-					d="M41 14a2 2 0 0 0-2-2H9a2 2 0 0 0-2 2v20a2 2 0 0 0 2 2h30a2 2 0 0 0 2-2V14zM28.5 34h-9V14h9v20zm2 0V14H39v20h-8.5zm-13 0H9V14h8.5v20z"
-				/>
+				<Path d="M0 10a2 2 0 0 1 2-2h10.531c1.105 0 1.969.895 1.969 2v28c0 1.105-.864 2-1.969 2H2a2 2 0 0 1-2-2V10Zm16.5 0c0-1.105.864-2 1.969-2H29.53c1.105 0 1.969.895 1.969 2v28c0 1.105-.864 2-1.969 2H18.47c-1.105 0-1.969-.895-1.969-2V10Zm17 0c0-1.105.864-2 1.969-2H46a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H35.469c-1.105 0-1.969-.895-1.969-2V10Z" />
 			</SVG>
 		),
 		innerBlocks: [
@@ -133,15 +114,12 @@ const variations = [
 		description: __( 'Three columns; wide center column' ),
 		icon: (
 			<SVG
+				xmlns="http://www.w3.org/2000/svg"
 				width="48"
 				height="48"
 				viewBox="0 0 48 48"
-				xmlns="http://www.w3.org/2000/svg"
 			>
-				<Path
-					fillRule="evenodd"
-					d="M41 14a2 2 0 0 0-2-2H9a2 2 0 0 0-2 2v20a2 2 0 0 0 2 2h30a2 2 0 0 0 2-2V14zM31 34H17V14h14v20zm2 0V14h6v20h-6zm-18 0H9V14h6v20z"
-				/>
+				<Path d="M0 10a2 2 0 0 1 2-2h7.531c1.105 0 1.969.895 1.969 2v28c0 1.105-.864 2-1.969 2H2a2 2 0 0 1-2-2V10Zm13.5 0c0-1.105.864-2 1.969-2H32.53c1.105 0 1.969.895 1.969 2v28c0 1.105-.864 2-1.969 2H15.47c-1.105 0-1.969-.895-1.969-2V10Zm23 0c0-1.105.864-2 1.969-2H46a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2h-7.531c-1.105 0-1.969-.895-1.969-2V10Z" />
 			</SVG>
 		),
 		innerBlocks: [
diff --git a/packages/block-library/src/comment-author-avatar/block.json b/packages/block-library/src/comment-author-avatar/block.json
index 050d87c3b4634a..c74b057db2ea3a 100644
--- a/packages/block-library/src/comment-author-avatar/block.json
+++ b/packages/block-library/src/comment-author-avatar/block.json
@@ -39,6 +39,9 @@
 			"__experimentalSkipSerialization": true,
 			"margin": true,
 			"padding": true
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/comment-author-avatar/edit.js b/packages/block-library/src/comment-author-avatar/edit.js
index a8c831db620c8b..3b25bf6916c8b8 100644
--- a/packages/block-library/src/comment-author-avatar/edit.js
+++ b/packages/block-library/src/comment-author-avatar/edit.js
@@ -48,7 +48,7 @@ export default function Edit( {
 
 	const inspectorControls = (
 		<InspectorControls>
-			<PanelBody title={ __( 'Avatar Settings' ) }>
+			<PanelBody title={ __( 'Settings' ) }>
 				<RangeControl
 					__nextHasNoMarginBottom
 					__next40pxDefaultSize
diff --git a/packages/block-library/src/comment-author-name/block.json b/packages/block-library/src/comment-author-name/block.json
index 93350779fc8bd2..1889d054c940e7 100644
--- a/packages/block-library/src/comment-author-name/block.json
+++ b/packages/block-library/src/comment-author-name/block.json
@@ -48,6 +48,22 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
-	}
+	},
+	"style": "wp-block-comment-author-name"
 }
diff --git a/packages/block-library/src/comment-author-name/edit.js b/packages/block-library/src/comment-author-name/edit.js
index 629ff185394c5b..b20816d39b64f7 100644
--- a/packages/block-library/src/comment-author-name/edit.js
+++ b/packages/block-library/src/comment-author-name/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -37,7 +37,7 @@ export default function Edit( {
 	setAttributes,
 } ) {
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/comment-author-name/index.js b/packages/block-library/src/comment-author-name/index.js
index 4d85bbebe047be..5bcb6896564807 100644
--- a/packages/block-library/src/comment-author-name/index.js
+++ b/packages/block-library/src/comment-author-name/index.js
@@ -18,6 +18,7 @@ export const settings = {
 	icon,
 	edit,
 	deprecated,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/comment-author-name/index.php b/packages/block-library/src/comment-author-name/index.php
index d3cd68c0dfbfc6..2f9227964ad448 100644
--- a/packages/block-library/src/comment-author-name/index.php
+++ b/packages/block-library/src/comment-author-name/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comment-author-name` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -53,6 +55,8 @@ function render_block_core_comment_author_name( $attributes, $content, $block )
 
 /**
  * Registers the `core/comment-author-name` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comment_author_name() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comment-author-name/style.scss b/packages/block-library/src/comment-author-name/style.scss
new file mode 100644
index 00000000000000..1e8c5eeb154b05
--- /dev/null
+++ b/packages/block-library/src/comment-author-name/style.scss
@@ -0,0 +1,4 @@
+.wp-block-comment-author-name {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/comment-content/block.json b/packages/block-library/src/comment-content/block.json
index 9ac4b5453365bb..0e812299a45e89 100644
--- a/packages/block-library/src/comment-content/block.json
+++ b/packages/block-library/src/comment-content/block.json
@@ -35,6 +35,18 @@
 				"fontSize": true
 			}
 		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
+		},
 		"spacing": {
 			"padding": [ "horizontal", "vertical" ],
 			"__experimentalDefaultControls": {
@@ -42,5 +54,6 @@
 			}
 		},
 		"html": false
-	}
+	},
+	"style": "wp-block-comment-content"
 }
diff --git a/packages/block-library/src/comment-content/edit.js b/packages/block-library/src/comment-content/edit.js
index a22acd43612b2f..45c2324dfa3873 100644
--- a/packages/block-library/src/comment-content/edit.js
+++ b/packages/block-library/src/comment-content/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -34,7 +34,7 @@ export default function Edit( {
 	context: { commentId },
 } ) {
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/comment-content/index.js b/packages/block-library/src/comment-content/index.js
index 130f1d30125559..aefcef75acf8ae 100644
--- a/packages/block-library/src/comment-content/index.js
+++ b/packages/block-library/src/comment-content/index.js
@@ -16,6 +16,7 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/comment-content/index.php b/packages/block-library/src/comment-content/index.php
index 50bca402acf034..3f7f5e1f4083ba 100644
--- a/packages/block-library/src/comment-content/index.php
+++ b/packages/block-library/src/comment-content/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comment-content` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -69,6 +71,8 @@ function render_block_core_comment_content( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/comment-content` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comment_content() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comment-content/style.scss b/packages/block-library/src/comment-content/style.scss
index dd9c4b22ae99c1..a94048de6014d3 100644
--- a/packages/block-library/src/comment-content/style.scss
+++ b/packages/block-library/src/comment-content/style.scss
@@ -3,3 +3,8 @@
 	font-size: 0.875em;
 	line-height: 1.5;
 }
+
+.wp-block-comment-content {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/comment-date/block.json b/packages/block-library/src/comment-date/block.json
index 7e4776c68ff2fa..1e8110f836d93b 100644
--- a/packages/block-library/src/comment-date/block.json
+++ b/packages/block-library/src/comment-date/block.json
@@ -44,6 +44,22 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
-	}
+	},
+	"style": "wp-block-comment-date"
 }
diff --git a/packages/block-library/src/comment-date/edit.js b/packages/block-library/src/comment-date/edit.js
index 7139abece96397..8ff940a78dd5eb 100644
--- a/packages/block-library/src/comment-date/edit.js
+++ b/packages/block-library/src/comment-date/edit.js
@@ -2,7 +2,11 @@
  * WordPress dependencies
  */
 import { useEntityProp } from '@wordpress/core-data';
-import { dateI18n, getSettings as getDateSettings } from '@wordpress/date';
+import {
+	dateI18n,
+	humanTimeDiff,
+	getSettings as getDateSettings,
+} from '@wordpress/date';
 import {
 	InspectorControls,
 	useBlockProps,
@@ -64,7 +68,9 @@ export default function Edit( {
 	let commentDate =
 		date instanceof Date ? (
 			<time dateTime={ dateI18n( 'c', date ) }>
-				{ dateI18n( format || siteFormat, date ) }
+				{ format === 'human-diff'
+					? humanTimeDiff( date )
+					: dateI18n( format || siteFormat, date ) }
 			</time>
 		) : (
 			<time>{ date }</time>
diff --git a/packages/block-library/src/comment-date/index.js b/packages/block-library/src/comment-date/index.js
index fddae539acfa34..d95c0a958f9ed8 100644
--- a/packages/block-library/src/comment-date/index.js
+++ b/packages/block-library/src/comment-date/index.js
@@ -18,6 +18,7 @@ export const settings = {
 	icon,
 	edit,
 	deprecated,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/comment-date/index.php b/packages/block-library/src/comment-date/index.php
index 0f9c18bf2c0068..bdb6fd5ba42ae3 100644
--- a/packages/block-library/src/comment-date/index.php
+++ b/packages/block-library/src/comment-date/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comment-date` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -26,11 +28,13 @@ function render_block_core_comment_date( $attributes, $content, $block ) {
 	$classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
 
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
-	$formatted_date     = get_comment_date(
-		isset( $attributes['format'] ) ? $attributes['format'] : '',
-		$comment
-	);
-	$link               = get_comment_link( $comment );
+	if ( isset( $attributes['format'] ) && 'human-diff' === $attributes['format'] ) {
+		// translators: %s: human-readable time difference.
+		$formatted_date = sprintf( __( '%s ago' ), human_time_diff( get_comment_date( 'U', $comment ) ) );
+	} else {
+		$formatted_date = get_comment_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $comment );
+	}
+	$link = get_comment_link( $comment );
 
 	if ( ! empty( $attributes['isLink'] ) ) {
 		$formatted_date = sprintf( '<a href="%1s">%2s</a>', esc_url( $link ), $formatted_date );
@@ -46,6 +50,8 @@ function render_block_core_comment_date( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/comment-date` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comment_date() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comment-date/style.scss b/packages/block-library/src/comment-date/style.scss
new file mode 100644
index 00000000000000..9b897defa655b7
--- /dev/null
+++ b/packages/block-library/src/comment-date/style.scss
@@ -0,0 +1,4 @@
+.wp-block-comment-date {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/comment-edit-link/block.json b/packages/block-library/src/comment-edit-link/block.json
index 505305f60987ac..578b284715c2a0 100644
--- a/packages/block-library/src/comment-edit-link/block.json
+++ b/packages/block-library/src/comment-edit-link/block.json
@@ -30,7 +30,11 @@
 		},
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"typography": {
 			"fontSize": true,
@@ -44,6 +48,16 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true
 		}
-	}
+	},
+	"style": "wp-block-comment-edit-link"
 }
diff --git a/packages/block-library/src/comment-edit-link/edit.js b/packages/block-library/src/comment-edit-link/edit.js
index 72de15757560f1..d3cde7f2abeaf0 100644
--- a/packages/block-library/src/comment-edit-link/edit.js
+++ b/packages/block-library/src/comment-edit-link/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -20,7 +20,7 @@ export default function Edit( {
 	setAttributes,
 } ) {
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/comment-edit-link/index.js b/packages/block-library/src/comment-edit-link/index.js
index 6639dda86a7a40..ffe8c98a75dfd9 100644
--- a/packages/block-library/src/comment-edit-link/index.js
+++ b/packages/block-library/src/comment-edit-link/index.js
@@ -16,6 +16,7 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/comment-edit-link/index.php b/packages/block-library/src/comment-edit-link/index.php
index ce7ad9bf207d43..53eaf9a2cda6c6 100644
--- a/packages/block-library/src/comment-edit-link/index.php
+++ b/packages/block-library/src/comment-edit-link/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comment-edit-link` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -48,6 +50,8 @@ function render_block_core_comment_edit_link( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/comment-edit-link` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comment_edit_link() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comment-edit-link/style.scss b/packages/block-library/src/comment-edit-link/style.scss
new file mode 100644
index 00000000000000..1ae7daf55009e4
--- /dev/null
+++ b/packages/block-library/src/comment-edit-link/style.scss
@@ -0,0 +1,4 @@
+.wp-block-comment-edit-link {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/comment-reply-link/block.json b/packages/block-library/src/comment-reply-link/block.json
index c10129412145c8..68aa93c3c1526a 100644
--- a/packages/block-library/src/comment-reply-link/block.json
+++ b/packages/block-library/src/comment-reply-link/block.json
@@ -25,7 +25,11 @@
 		},
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"typography": {
 			"fontSize": true,
@@ -40,6 +44,13 @@
 				"fontSize": true
 			}
 		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true
+		},
 		"html": false
-	}
+	},
+	"style": "wp-block-comment-reply-link"
 }
diff --git a/packages/block-library/src/comment-reply-link/edit.js b/packages/block-library/src/comment-reply-link/edit.js
index 08a4d21de88c7b..a8ef53aaaa25c7 100644
--- a/packages/block-library/src/comment-reply-link/edit.js
+++ b/packages/block-library/src/comment-reply-link/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -25,7 +25,7 @@ import {
  */
 function Edit( { setAttributes, attributes: { textAlign } } ) {
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/comment-reply-link/index.js b/packages/block-library/src/comment-reply-link/index.js
index c04f8ce7b1bba5..a8287f6b08ff35 100644
--- a/packages/block-library/src/comment-reply-link/index.js
+++ b/packages/block-library/src/comment-reply-link/index.js
@@ -16,6 +16,7 @@ export { metadata, name };
 export const settings = {
 	edit,
 	icon,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/comment-reply-link/index.php b/packages/block-library/src/comment-reply-link/index.php
index 3f7b6e48b617c8..7121b6f25a195e 100644
--- a/packages/block-library/src/comment-reply-link/index.php
+++ b/packages/block-library/src/comment-reply-link/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comment-reply-link` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -70,6 +72,8 @@ function render_block_core_comment_reply_link( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/comment-reply-link` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comment_reply_link() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comment-reply-link/style.scss b/packages/block-library/src/comment-reply-link/style.scss
new file mode 100644
index 00000000000000..7eca6cee1aa979
--- /dev/null
+++ b/packages/block-library/src/comment-reply-link/style.scss
@@ -0,0 +1,4 @@
+.wp-block-comment-reply-link {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/comment-template/block.json b/packages/block-library/src/comment-template/block.json
index 7b9bfc5e0340fd..08fd591b42409b 100644
--- a/packages/block-library/src/comment-template/block.json
+++ b/packages/block-library/src/comment-template/block.json
@@ -28,6 +28,21 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"style": "wp-block-comment-template"
diff --git a/packages/block-library/src/comment-template/index.php b/packages/block-library/src/comment-template/index.php
index 915c5880a8f962..ec462e6a050de2 100644
--- a/packages/block-library/src/comment-template/index.php
+++ b/packages/block-library/src/comment-template/index.php
@@ -92,6 +92,8 @@ function block_core_comment_template_render_comments( $comments, $block ) {
 /**
  * Renders the `core/comment-template` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -136,6 +138,8 @@ function render_block_core_comment_template( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/comment-template` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comment_template() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comment-template/util.js b/packages/block-library/src/comment-template/util.js
index 32aab0a568709a..88fc6662049221 100644
--- a/packages/block-library/src/comment-template/util.js
+++ b/packages/block-library/src/comment-template/util.js
@@ -30,7 +30,9 @@
 export const convertToTree = ( data ) => {
 	const table = {};
 
-	if ( ! data ) return [];
+	if ( ! data ) {
+		return [];
+	}
 
 	// First create a hash table of { [id]: { ...comment, children: [] }}
 	data.forEach( ( item ) => {
diff --git a/packages/block-library/src/comments-pagination-next/block.json b/packages/block-library/src/comments-pagination-next/block.json
index d619865ebd6f5e..3f7ebe677328d5 100644
--- a/packages/block-library/src/comments-pagination-next/block.json
+++ b/packages/block-library/src/comments-pagination-next/block.json
@@ -12,6 +12,11 @@
 			"type": "string"
 		}
 	},
+	"example": {
+		"attributes": {
+			"label": "Comments Next Page"
+		}
+	},
 	"usesContext": [ "postId", "comments/paginationArrow" ],
 	"supports": {
 		"reusable": false,
@@ -35,6 +40,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/comments-pagination-next/index.php b/packages/block-library/src/comments-pagination-next/index.php
index 51d1f75c58d477..0fd9519a56d304 100644
--- a/packages/block-library/src/comments-pagination-next/index.php
+++ b/packages/block-library/src/comments-pagination-next/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comments-pagination-next` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -35,7 +37,7 @@ function render_block_core_comments_pagination_next( $attributes, $content, $blo
 		$label .= $pagination_arrow;
 	}
 
-	$next_comments_link = get_next_comments_link( $label, $max_page );
+	$next_comments_link = get_next_comments_link( $label, $max_page, $comment_vars['paged'] ?? null );
 
 	remove_filter( 'next_posts_link_attributes', $filter_link_attributes );
 
@@ -48,6 +50,8 @@ function render_block_core_comments_pagination_next( $attributes, $content, $blo
 
 /**
  * Registers the `core/comments-pagination-next` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comments_pagination_next() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comments-pagination-numbers/block.json b/packages/block-library/src/comments-pagination-numbers/block.json
index fcebb52763870e..9e9017af631978 100644
--- a/packages/block-library/src/comments-pagination-numbers/block.json
+++ b/packages/block-library/src/comments-pagination-numbers/block.json
@@ -30,6 +30,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/comments-pagination-numbers/index.js b/packages/block-library/src/comments-pagination-numbers/index.js
index 3fd903e2d9ef48..f769f54b4ac034 100644
--- a/packages/block-library/src/comments-pagination-numbers/index.js
+++ b/packages/block-library/src/comments-pagination-numbers/index.js
@@ -16,6 +16,7 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/comments-pagination-numbers/index.php b/packages/block-library/src/comments-pagination-numbers/index.php
index b172e0c8d43f86..093a6450930f12 100644
--- a/packages/block-library/src/comments-pagination-numbers/index.php
+++ b/packages/block-library/src/comments-pagination-numbers/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comments-pagination-numbers` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -50,6 +52,8 @@ function render_block_core_comments_pagination_numbers( $attributes, $content, $
 
 /**
  * Registers the `core/comments-pagination-numbers` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comments_pagination_numbers() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comments-pagination-previous/block.json b/packages/block-library/src/comments-pagination-previous/block.json
index 2dab1e9dd73674..eb5203af33c866 100644
--- a/packages/block-library/src/comments-pagination-previous/block.json
+++ b/packages/block-library/src/comments-pagination-previous/block.json
@@ -12,6 +12,11 @@
 			"type": "string"
 		}
 	},
+	"example": {
+		"attributes": {
+			"label": "Comments Previous Page"
+		}
+	},
 	"usesContext": [ "postId", "comments/paginationArrow" ],
 	"supports": {
 		"reusable": false,
@@ -35,6 +40,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/comments-pagination-previous/index.php b/packages/block-library/src/comments-pagination-previous/index.php
index f194e8ab517f57..ba9bef97ad34d9 100644
--- a/packages/block-library/src/comments-pagination-previous/index.php
+++ b/packages/block-library/src/comments-pagination-previous/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comments-pagination-previous` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -27,7 +29,8 @@ function render_block_core_comments_pagination_previous( $attributes, $content,
 	};
 	add_filter( 'previous_comments_link_attributes', $filter_link_attributes );
 
-	$previous_comments_link = get_previous_comments_link( $label );
+	$comment_vars           = build_comment_query_vars_from_block( $block );
+	$previous_comments_link = get_previous_comments_link( $label, $comment_vars['paged'] ?? null );
 
 	remove_filter( 'previous_comments_link_attributes', $filter_link_attributes );
 
@@ -40,6 +43,8 @@ function render_block_core_comments_pagination_previous( $attributes, $content,
 
 /**
  * Registers the `core/comments-pagination-previous` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comments_pagination_previous() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comments-pagination/block.json b/packages/block-library/src/comments-pagination/block.json
index a11decd201e94f..28f6c9fdfdb5d9 100644
--- a/packages/block-library/src/comments-pagination/block.json
+++ b/packages/block-library/src/comments-pagination/block.json
@@ -5,6 +5,11 @@
 	"title": "Comments Pagination",
 	"category": "theme",
 	"parent": [ "core/comments" ],
+	"allowedBlocks": [
+		"core/comments-pagination-previous",
+		"core/comments-pagination-numbers",
+		"core/comments-pagination-next"
+	],
 	"description": "Displays a paginated navigation to next/previous set of comments, when applicable.",
 	"textdomain": "default",
 	"attributes": {
@@ -48,6 +53,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-comments-pagination-editor",
diff --git a/packages/block-library/src/comments-pagination/comments-pagination-arrow-controls.js b/packages/block-library/src/comments-pagination/comments-pagination-arrow-controls.js
index ac3c17a2c4e721..c3a2d1dae648a5 100644
--- a/packages/block-library/src/comments-pagination/comments-pagination-arrow-controls.js
+++ b/packages/block-library/src/comments-pagination/comments-pagination-arrow-controls.js
@@ -10,6 +10,7 @@ import {
 export function CommentsPaginationArrowControls( { value, onChange } ) {
 	return (
 		<ToggleGroupControl
+			__next40pxDefaultSize
 			__nextHasNoMarginBottom
 			label={ __( 'Arrow' ) }
 			value={ value }
diff --git a/packages/block-library/src/comments-pagination/edit.js b/packages/block-library/src/comments-pagination/edit.js
index 9837dda14e6810..aba29233064978 100644
--- a/packages/block-library/src/comments-pagination/edit.js
+++ b/packages/block-library/src/comments-pagination/edit.js
@@ -22,11 +22,6 @@ const TEMPLATE = [
 	[ 'core/comments-pagination-numbers' ],
 	[ 'core/comments-pagination-next' ],
 ];
-const ALLOWED_BLOCKS = [
-	'core/comments-pagination-previous',
-	'core/comments-pagination-numbers',
-	'core/comments-pagination-next',
-];
 
 export default function QueryPaginationEdit( {
 	attributes: { paginationArrow },
@@ -52,7 +47,6 @@ export default function QueryPaginationEdit( {
 	const blockProps = useBlockProps();
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
 		template: TEMPLATE,
-		allowedBlocks: ALLOWED_BLOCKS,
 	} );
 
 	// Get the Discussion settings
diff --git a/packages/block-library/src/comments-pagination/editor.scss b/packages/block-library/src/comments-pagination/editor.scss
index dbf7e60ff65c06..a875c9e0ee21ce 100644
--- a/packages/block-library/src/comments-pagination/editor.scss
+++ b/packages/block-library/src/comments-pagination/editor.scss
@@ -5,7 +5,7 @@ $pagination-margin: 0.5em;
 	justify-content: center;
 }
 
-.editor-styles-wrapper {
+:where(.editor-styles-wrapper) {
 	.wp-block-comments-pagination {
 		max-width: 100%;
 		&.block-editor-block-list__layout {
diff --git a/packages/block-library/src/comments-pagination/index.php b/packages/block-library/src/comments-pagination/index.php
index 2f9cef27f78cf6..1543fc04027eef 100644
--- a/packages/block-library/src/comments-pagination/index.php
+++ b/packages/block-library/src/comments-pagination/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comments-pagination` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array  $attributes Block attributes.
  * @param string $content    Block default content.
  *
@@ -34,6 +36,8 @@ function render_block_core_comments_pagination( $attributes, $content ) {
 
 /**
  * Registers the `core/comments-pagination` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comments_pagination() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comments-title/block.json b/packages/block-library/src/comments-title/block.json
index 12b105afe9a31c..b66b741e1916a0 100644
--- a/packages/block-library/src/comments-title/block.json
+++ b/packages/block-library/src/comments-title/block.json
@@ -5,7 +5,7 @@
 	"title": "Comments Title",
 	"category": "theme",
 	"ancestor": [ "core/comments" ],
-	"description": "Displays a title with the number of comments",
+	"description": "Displays a title with the number of comments.",
 	"textdomain": "default",
 	"usesContext": [ "postId", "postType" ],
 	"attributes": {
@@ -23,6 +23,9 @@
 		"level": {
 			"type": "number",
 			"default": 2
+		},
+		"levelOptions": {
+			"type": "array"
 		}
 	},
 	"supports": {
@@ -61,6 +64,9 @@
 				"__experimentalFontStyle": true,
 				"__experimentalFontWeight": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/comments-title/edit.js b/packages/block-library/src/comments-title/edit.js
index 3765a45d4f8bbe..f2a9d23ddf6cae 100644
--- a/packages/block-library/src/comments-title/edit.js
+++ b/packages/block-library/src/comments-title/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -23,7 +23,13 @@ import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
 
 export default function Edit( {
-	attributes: { textAlign, showPostTitle, showCommentsCount, level },
+	attributes: {
+		textAlign,
+		showPostTitle,
+		showCommentsCount,
+		level,
+		levelOptions,
+	},
 	setAttributes,
 	context: { postType, postId },
 } ) {
@@ -32,7 +38,7 @@ export default function Edit( {
 	const [ rawTitle ] = useEntityProp( 'postType', postType, 'title', postId );
 	const isSiteEditor = typeof postId === 'undefined';
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
@@ -95,6 +101,7 @@ export default function Edit( {
 			/>
 			<HeadingLevelDropdown
 				value={ level }
+				options={ levelOptions }
 				onChange={ ( newLevel ) =>
 					setAttributes( { level: newLevel } )
 				}
diff --git a/packages/block-library/src/comments-title/index.js b/packages/block-library/src/comments-title/index.js
index 86bdab0dbccbff..69b8228eab892b 100644
--- a/packages/block-library/src/comments-title/index.js
+++ b/packages/block-library/src/comments-title/index.js
@@ -18,6 +18,7 @@ export const settings = {
 	icon,
 	edit,
 	deprecated,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/comments-title/index.php b/packages/block-library/src/comments-title/index.php
index 62119fc0c2ca88..130132ec3fa527 100644
--- a/packages/block-library/src/comments-title/index.php
+++ b/packages/block-library/src/comments-title/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/comments-title` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array $attributes Block attributes.
  *
  * @return string Return the post comments title.
@@ -84,6 +86,8 @@ function render_block_core_comments_title( $attributes ) {
 
 /**
  * Registers the `core/comments-title` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_comments_title() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/comments/block.json b/packages/block-library/src/comments/block.json
index b35ea3505c816f..cbdf5b3725b84b 100644
--- a/packages/block-library/src/comments/block.json
+++ b/packages/block-library/src/comments/block.json
@@ -17,7 +17,10 @@
 		}
 	},
 	"supports": {
-		"align": [ "wide", "full" ],
+		"align": [
+			"wide",
+			"full"
+		],
 		"html": false,
 		"color": {
 			"gradients": true,
@@ -45,8 +48,23 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"editorStyle": "wp-block-comments-editor",
-	"usesContext": [ "postId", "postType" ]
-}
+	"usesContext": [
+		"postId",
+		"postType"
+	]
+}
\ No newline at end of file
diff --git a/packages/block-library/src/comments/edit/comments-legacy.js b/packages/block-library/src/comments/edit/comments-legacy.js
index 16ba4d8b1641e2..dbe89a4e3a83e1 100644
--- a/packages/block-library/src/comments/edit/comments-legacy.js
+++ b/packages/block-library/src/comments/edit/comments-legacy.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -29,6 +29,7 @@ export default function CommentsLegacy( {
 
 	const actions = [
 		<Button
+			__next40pxDefaultSize
 			key="convert"
 			onClick={ () => void setAttributes( { legacy: false } ) }
 			variant="primary"
@@ -38,7 +39,7 @@ export default function CommentsLegacy( {
 	];
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/comments/index.php b/packages/block-library/src/comments/index.php
index 48aac15af6fbb6..f61490ab890d9a 100644
--- a/packages/block-library/src/comments/index.php
+++ b/packages/block-library/src/comments/index.php
@@ -16,6 +16,10 @@
  * the block is in legacy mode. If not, the HTML generated in the editor is
  * returned instead.
  *
+ * @since 6.1.0
+ *
+ * @global WP_Post $post Global post object.
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -83,6 +87,8 @@ function render_block_core_comments( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/comments` block on the server.
+ *
+ * @since 6.1.0
  */
 function register_block_core_comments() {
 	register_block_type_from_metadata(
@@ -98,6 +104,8 @@ function register_block_core_comments() {
 /**
  * Use the button block classes for the form-submit button.
  *
+ * @since 6.1.0
+ *
  * @param array $fields The default comment form arguments.
  *
  * @return array Returns the modified fields.
@@ -116,6 +124,8 @@ function comments_block_form_defaults( $fields ) {
  * Enqueues styles from the legacy `core/post-comments` block. These styles are
  * required only by the block's fallback.
  *
+ * @since 6.1.0
+ *
  * @param string $block_name Name of the new block type.
  */
 function enqueue_legacy_post_comments_block_styles( $block_name ) {
@@ -141,6 +151,8 @@ function enqueue_legacy_post_comments_block_styles( $block_name ) {
  * The same approach was followed when core/query-loop was renamed to
  * core/post-template.
  *
+ * @since 6.1.0
+ *
  * @see https://github.com/WordPress/gutenberg/pull/41807
  * @see https://github.com/WordPress/gutenberg/pull/32514
  */
diff --git a/packages/block-library/src/comments/style.scss b/packages/block-library/src/comments/style.scss
index be8cf1e597f49f..081783db098ab1 100644
--- a/packages/block-library/src/comments/style.scss
+++ b/packages/block-library/src/comments/style.scss
@@ -13,7 +13,6 @@
 	}
 
 	/* end utility classes */
-
 	.navigation {
 		&::after {
 			content: "";
@@ -146,3 +145,7 @@
 :where(.wp-block-post-comments input[type="submit"]) {
 	border: none;
 }
+
+.wp-block-comments {
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/common.scss b/packages/block-library/src/common.scss
index 2e1c2b8b706bce..15c2cd52b76aad 100644
--- a/packages/block-library/src/common.scss
+++ b/packages/block-library/src/common.scss
@@ -75,8 +75,6 @@
 
 .screen-reader-text {
 	border: 0;
-	clip: rect(1px, 1px, 1px, 1px);
-	-webkit-clip-path: inset(50%);
 	clip-path: inset(50%);
 	height: 1px;
 	margin: -1px;
@@ -89,7 +87,6 @@
 
 .screen-reader-text:focus {
 	background-color: $gray-300;
-	clip: auto !important;
 	clip-path: none;
 	color: #444;
 	display: block;
@@ -165,8 +162,8 @@ html :where(img[class*="wp-image-"]) {
 // Set the admin bar offset for sticky positioned blocks to the height of the admin bar.
 // This allows sticky positioned blocks to be positioned correctly when the admin bar is visible.
 html :where(.is-position-sticky) {
-	/* stylelint-disable length-zero-no-unit */
-	--wp-admin--admin-bar--position-offset: var(--wp-admin--admin-bar--height, 0px); // 0px is set explicitly so that it can be used in a calc value.
+	/* stylelint-disable length-zero-no-unit -- 0px is set explicitly so that it can be used in a calc value. */
+	--wp-admin--admin-bar--position-offset: var(--wp-admin--admin-bar--height, 0px);
 	/* stylelint-enable length-zero-no-unit */
 }
 
@@ -175,8 +172,8 @@ html :where(.is-position-sticky) {
 // is not fixed to the top on mobile devices, but is fixed on viewports larger than 600px.
 @media screen and (max-width: 600px) {
 	html :where(.is-position-sticky) {
-		/* stylelint-disable length-zero-no-unit */
-		--wp-admin--admin-bar--position-offset: 0px; // 0px is set explicitly so that it can be used in a calc value.
+		/* stylelint-disable length-zero-no-unit -- 0px is set explicitly so that it can be used in a calc value. */
+		--wp-admin--admin-bar--position-offset: 0px;
 		/* stylelint-enable length-zero-no-unit */
 	}
 }
diff --git a/packages/block-library/src/cover/block.json b/packages/block-library/src/cover/block.json
index d2c55dd26b4d74..733dfc12fc9bca 100644
--- a/packages/block-library/src/cover/block.json
+++ b/packages/block-library/src/cover/block.json
@@ -78,6 +78,9 @@
 		"tagName": {
 			"type": "string",
 			"default": "div"
+		},
+		"sizeSlug": {
+			"type": "string"
 		}
 	},
 	"usesContext": [ "postId", "postType" ],
@@ -85,6 +88,7 @@
 		"anchor": true,
 		"align": true,
 		"html": false,
+		"shadow": true,
 		"spacing": {
 			"padding": true,
 			"margin": [ "top", "bottom" ],
@@ -114,6 +118,9 @@
 			"__experimentalSkipSerialization": [ "gradients" ],
 			"enableContrastChecker": false
 		},
+		"dimensions": {
+			"aspectRatio": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
@@ -129,6 +136,9 @@
 		},
 		"layout": {
 			"allowJustification": false
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-cover-editor",
diff --git a/packages/block-library/src/cover/constants.js b/packages/block-library/src/cover/constants.js
new file mode 100644
index 00000000000000..984193dbfb376a
--- /dev/null
+++ b/packages/block-library/src/cover/constants.js
@@ -0,0 +1 @@
+export const DEFAULT_MEDIA_SIZE_SLUG = 'full';
diff --git a/packages/block-library/src/cover/controls.native.js b/packages/block-library/src/cover/controls.native.js
index 252211bfcf17bb..dfcf441f4b7ec9 100644
--- a/packages/block-library/src/cover/controls.native.js
+++ b/packages/block-library/src/cover/controls.native.js
@@ -213,7 +213,7 @@ function Controls( {
 										videoRef?.current.seek( 0 );
 									} }
 									ref={ videoRef }
-									resizeMode={ 'cover' }
+									resizeMode="cover"
 									source={ { uri: url } }
 									style={ videoPreviewStyles }
 								/>
@@ -281,7 +281,7 @@ function Controls( {
 						value={ dimRatio }
 						onChange={ onOpacityChange }
 						style={ styles.rangeCellContainer }
-						separatorType={ 'topFullWidth' }
+						separatorType="topFullWidth"
 					/>
 				</PanelBody>
 			) : null }
diff --git a/packages/block-library/src/cover/deprecated.js b/packages/block-library/src/cover/deprecated.js
index e2e773cace1426..5e5fc64d12c16f 100644
--- a/packages/block-library/src/cover/deprecated.js
+++ b/packages/block-library/src/cover/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -305,7 +305,7 @@ const v13 = {
 
 		const backgroundPosition = mediaPosition( focalPoint );
 
-		const classes = classnames(
+		const classes = clsx(
 			{
 				'is-light': ! isDark,
 				'has-parallax': hasParallax,
@@ -316,7 +316,7 @@ const v13 = {
 			getPositionClassName( contentPosition )
 		);
 
-		const imgClasses = classnames(
+		const imgClasses = clsx(
 			'wp-block-cover__image-background',
 			id ? `wp-image-${ id }` : null,
 			{
@@ -331,7 +331,7 @@ const v13 = {
 			<Tag { ...useBlockProps.save( { className: classes, style } ) }>
 				<span
 					aria-hidden="true"
-					className={ classnames(
+					className={ clsx(
 						'wp-block-cover__background',
 						overlayColorClass,
 						dimRatioToClass( dimRatio ),
@@ -370,7 +370,7 @@ const v13 = {
 					) ) }
 				{ isVideoBackground && url && (
 					<video
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__video-background',
 							'intrinsic-ignore'
 						) }
@@ -400,8 +400,9 @@ const v12 = {
 	supports: v12BlockSupports,
 	isEligible( attributes ) {
 		return (
-			attributes.customOverlayColor !== undefined ||
-			attributes.overlayColor !== undefined
+			( attributes.customOverlayColor !== undefined ||
+				attributes.overlayColor !== undefined ) &&
+			attributes.isUserOverlayColor === undefined
 		);
 	},
 	migrate( attributes ) {
@@ -467,7 +468,7 @@ const v12 = {
 
 		const backgroundPosition = mediaPosition( focalPoint );
 
-		const classes = classnames(
+		const classes = clsx(
 			{
 				'is-light': ! isDark,
 				'has-parallax': hasParallax,
@@ -478,7 +479,7 @@ const v12 = {
 			getPositionClassName( contentPosition )
 		);
 
-		const imgClasses = classnames(
+		const imgClasses = clsx(
 			'wp-block-cover__image-background',
 			id ? `wp-image-${ id }` : null,
 			{
@@ -493,7 +494,7 @@ const v12 = {
 			<Tag { ...useBlockProps.save( { className: classes, style } ) }>
 				<span
 					aria-hidden="true"
-					className={ classnames(
+					className={ clsx(
 						'wp-block-cover__background',
 						overlayColorClass,
 						dimRatioToClass( dimRatio ),
@@ -532,7 +533,7 @@ const v12 = {
 					) ) }
 				{ isVideoBackground && url && (
 					<video
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__video-background',
 							'intrinsic-ignore'
 						) }
@@ -616,7 +617,7 @@ const v11 = {
 
 		const backgroundPosition = mediaPosition( focalPoint );
 
-		const classes = classnames(
+		const classes = clsx(
 			{
 				'is-light': ! isDark,
 				'has-parallax': hasParallax,
@@ -627,7 +628,7 @@ const v11 = {
 			getPositionClassName( contentPosition )
 		);
 
-		const imgClasses = classnames(
+		const imgClasses = clsx(
 			'wp-block-cover__image-background',
 			id ? `wp-image-${ id }` : null,
 			{
@@ -642,7 +643,7 @@ const v11 = {
 			<div { ...useBlockProps.save( { className: classes, style } ) }>
 				<span
 					aria-hidden="true"
-					className={ classnames(
+					className={ clsx(
 						'wp-block-cover__background',
 						overlayColorClass,
 						dimRatioToClass( dimRatio ),
@@ -681,7 +682,7 @@ const v11 = {
 					) ) }
 				{ isVideoBackground && url && (
 					<video
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__video-background',
 							'intrinsic-ignore'
 						) }
@@ -765,7 +766,7 @@ const v10 = {
 				 ? `${ Math.round( focalPoint.x * 100 ) }% ${ Math.round( focalPoint.y * 100 ) }%`
 				 : undefined;
 
-		const classes = classnames(
+		const classes = clsx(
 			{
 				'is-light': ! isDark,
 				'has-parallax': hasParallax,
@@ -782,7 +783,7 @@ const v10 = {
 			<div { ...useBlockProps.save( { className: classes, style } ) }>
 				<span
 					aria-hidden="true"
-					className={ classnames(
+					className={ clsx(
 						'wp-block-cover__background',
 						overlayColorClass,
 						dimRatioToClass( dimRatio ),
@@ -805,7 +806,7 @@ const v10 = {
 					isImgElement &&
 					url && (
 						<img
-							className={ classnames(
+							className={ clsx(
 								'wp-block-cover__image-background',
 								id ? `wp-image-${ id }` : null
 							) }
@@ -818,7 +819,7 @@ const v10 = {
 					) }
 				{ isVideoBackground && url && (
 					<video
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__video-background',
 							'intrinsic-ignore'
 						) }
@@ -900,7 +901,7 @@ const v9 = {
 				 ? `${ Math.round( focalPoint.x * 100 ) }% ${ Math.round( focalPoint.y * 100 ) }%`
 				 : undefined;
 
-		const classes = classnames(
+		const classes = clsx(
 			{
 				'is-light': ! isDark,
 				'has-parallax': hasParallax,
@@ -917,7 +918,7 @@ const v9 = {
 			<div { ...useBlockProps.save( { className: classes, style } ) }>
 				<span
 					aria-hidden="true"
-					className={ classnames(
+					className={ clsx(
 						'wp-block-cover__background',
 						overlayColorClass,
 						dimRatioToClass( dimRatio ),
@@ -937,7 +938,7 @@ const v9 = {
 
 				{ isImageBackground && isImgElement && url && (
 					<img
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__image-background',
 							id ? `wp-image-${ id }` : null
 						) }
@@ -950,7 +951,7 @@ const v9 = {
 				) }
 				{ isVideoBackground && url && (
 					<video
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__video-background',
 							'intrinsic-ignore'
 						) }
@@ -1032,7 +1033,7 @@ const v8 = {
 				 ? `${ Math.round( focalPoint.x * 100 ) }% ${ Math.round( focalPoint.y * 100 ) }%`
 				 : undefined;
 
-		const classes = classnames(
+		const classes = clsx(
 			{
 				'is-light': ! isDark,
 				'has-parallax': hasParallax,
@@ -1047,7 +1048,7 @@ const v8 = {
 			<div { ...useBlockProps.save( { className: classes, style } ) }>
 				<span
 					aria-hidden="true"
-					className={ classnames(
+					className={ clsx(
 						overlayColorClass,
 						dimRatioToClass( dimRatio ),
 						'wp-block-cover__gradient-background',
@@ -1064,7 +1065,7 @@ const v8 = {
 
 				{ isImageBackground && isImgElement && url && (
 					<img
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__image-background',
 							id ? `wp-image-${ id }` : null
 						) }
@@ -1077,7 +1078,7 @@ const v8 = {
 				) }
 				{ isVideoBackground && url && (
 					<video
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__video-background',
 							'intrinsic-ignore'
 						) }
@@ -1182,7 +1183,7 @@ const v7 = {
 					? `${ Math.round( focalPoint.x * 100 ) }% ${ Math.round( focalPoint.y * 100 ) }%`
 					: undefined;
 
-		const classes = classnames(
+		const classes = clsx(
 			dimRatioToClassV1( dimRatio ),
 			overlayColorClass,
 			{
@@ -1202,7 +1203,7 @@ const v7 = {
 				{ url && ( gradient || customGradient ) && dimRatio !== 0 && (
 					<span
 						aria-hidden="true"
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__gradient-background',
 							gradientClass
 						) }
@@ -1215,7 +1216,7 @@ const v7 = {
 				) }
 				{ isImageBackground && isImgElement && url && (
 					<img
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__image-background',
 							id ? `wp-image-${ id }` : null
 						) }
@@ -1228,7 +1229,7 @@ const v7 = {
 				) }
 				{ isVideoBackground && url && (
 					<video
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__video-background',
 							'intrinsic-ignore'
 						) }
@@ -1333,7 +1334,7 @@ const v6 = {
 			}
 		}
 
-		const classes = classnames(
+		const classes = clsx(
 			dimRatioToClassV1( dimRatio ),
 			overlayColorClass,
 			{
@@ -1353,7 +1354,7 @@ const v6 = {
 				{ url && ( gradient || customGradient ) && dimRatio !== 0 && (
 					<span
 						aria-hidden="true"
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__gradient-background',
 							gradientClass
 						) }
@@ -1436,7 +1437,7 @@ const v5 = {
 		}
 		style.minHeight = minHeight || undefined;
 
-		const classes = classnames(
+		const classes = clsx(
 			dimRatioToClassV1( dimRatio ),
 			overlayColorClass,
 			{
@@ -1452,7 +1453,7 @@ const v5 = {
 				{ url && ( gradient || customGradient ) && dimRatio !== 0 && (
 					<span
 						aria-hidden="true"
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__gradient-background',
 							gradientClass
 						) }
@@ -1533,7 +1534,7 @@ const v4 = {
 		}
 		style.minHeight = minHeight || undefined;
 
-		const classes = classnames(
+		const classes = clsx(
 			dimRatioToClassV1( dimRatio ),
 			overlayColorClass,
 			{
@@ -1549,7 +1550,7 @@ const v4 = {
 				{ url && ( gradient || customGradient ) && dimRatio !== 0 && (
 					<span
 						aria-hidden="true"
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__gradient-background',
 							gradientClass
 						) }
@@ -1623,7 +1624,7 @@ const v3 = {
 			}%`;
 		}
 
-		const classes = classnames(
+		const classes = clsx(
 			dimRatioToClassV1( dimRatio ),
 			overlayColorClass,
 			{
@@ -1716,7 +1717,7 @@ const v2 = {
 			style.backgroundColor = customOverlayColor;
 		}
 
-		const classes = classnames(
+		const classes = clsx(
 			'wp-block-cover-image',
 			dimRatioToClassV1( dimRatio ),
 			overlayColorClass,
@@ -1785,7 +1786,7 @@ const v1 = {
 	save( { attributes } ) {
 		const { url, title, hasParallax, dimRatio, align } = attributes;
 		const style = backgroundImageStyles( url );
-		const classes = classnames(
+		const classes = clsx(
 			'wp-block-cover-image',
 			dimRatioToClassV1( dimRatio ),
 			{
diff --git a/packages/block-library/src/cover/edit.native.js b/packages/block-library/src/cover/edit.native.js
index 81ff43128b1a35..99324545bf798e 100644
--- a/packages/block-library/src/cover/edit.native.js
+++ b/packages/block-library/src/cover/edit.native.js
@@ -10,7 +10,7 @@ import {
 	Platform,
 } from 'react-native';
 import Video from 'react-native-video';
-import classnames from 'classnames/dedupe';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -33,7 +33,6 @@ import {
 	ColorPicker,
 	BottomSheetConsumer,
 	useConvertUnitToMobile,
-	useMobileGlobalStylesColors,
 } from '@wordpress/components';
 import {
 	BlockControls,
@@ -47,6 +46,8 @@ import {
 	getColorObjectByAttributeValues,
 	getGradientValueBySlug,
 	store as blockEditorStore,
+	useGlobalStyles,
+	useMobileGlobalStylesColors,
 } from '@wordpress/block-editor';
 import { compose, withPreferredColorScheme } from '@wordpress/compose';
 import { useDispatch, withSelect, withDispatch } from '@wordpress/data';
@@ -156,9 +157,11 @@ const Cover = ( {
 		mediaUploadSync();
 	}, [] );
 
+	const globalStyles = useGlobalStyles();
 	const convertedMinHeight = useConvertUnitToMobile(
 		minHeight || COVER_DEFAULT_HEIGHT,
-		minHeightUnit
+		minHeightUnit,
+		globalStyles
 	);
 
 	const isImage = backgroundType === MEDIA_TYPE_IMAGE;
@@ -218,6 +221,21 @@ const Cover = ( {
 		} );
 	};
 
+	const onUpdateMediaProgress = useCallback(
+		( payload ) => {
+			const { mediaUrl, state } = payload;
+
+			setIsUploadInProgress( true );
+
+			if ( isUploadInProgress && isImage && mediaUrl && ! state ) {
+				setAttributes( {
+					url: mediaUrl,
+				} );
+			}
+		},
+		[ isImage, isUploadInProgress, setAttributes ]
+	);
+
 	const onMediaPressed = () => {
 		if ( isUploadInProgress ) {
 			requestImageUploadCancelDialog( id );
@@ -248,6 +266,12 @@ const Cover = ( {
 		closeSettingsBottomSheet();
 	}, [ closeSettingsBottomSheet ] );
 
+	const onAddMediaButtonPress = useCallback( () => {
+		if ( openMediaOptionsRef?.current ) {
+			openMediaOptionsRef.current();
+		}
+	}, [] );
+
 	function setColor( color ) {
 		const colorValue = getColorObjectByColorValue( colorsDefault, color );
 
@@ -292,7 +316,7 @@ const Cover = ( {
 
 		// Ensure that "is-light" is removed from "className" attribute if cover background is dark.
 		if ( isCoverDark && attributes.className?.includes( 'is-light' ) ) {
-			const className = classnames( attributes.className, {
+			const className = clsx( attributes.className, {
 				'is-light': false,
 			} );
 			setAttributes( {
@@ -352,7 +376,7 @@ const Cover = ( {
 			accessibilityHint={ accessibilityHint }
 			accessibilityLabel={ __( 'Add image or video' ) }
 			accessibilityRole="button"
-			onPress={ openMediaOptionsRef.current }
+			onPress={ onAddMediaButtonPress }
 		>
 			<View style={ styles.selectImageContainer }>
 				<View style={ styles.selectImage }>
@@ -441,9 +465,7 @@ const Cover = ( {
 					toolbarControls( openMediaOptionsRef.current ) }
 				<MediaUploadProgress
 					mediaId={ id }
-					onUpdateMediaProgress={ () => {
-						setIsUploadInProgress( true );
-					} }
+					onUpdateMediaProgress={ onUpdateMediaProgress }
 					onFinishMediaUploadWithSuccess={ ( {
 						mediaServerId,
 						mediaUrl,
@@ -490,7 +512,7 @@ const Cover = ( {
 						muted
 						disableFocus
 						repeat
-						resizeMode={ 'cover' }
+						resizeMode="cover"
 						source={ { uri: url } }
 						onLoad={ onVideoLoad }
 						onLoadStart={ onVideoLoadStart }
@@ -538,6 +560,7 @@ const Cover = ( {
 						<BottomSheetConsumer>
 							{ ( { shouldEnableBottomSheetScroll } ) => (
 								<ColorPalette
+									enableCustomColor
 									customColorIndicatorStyles={
 										styles.paletteColorIndicator
 									}
diff --git a/packages/block-library/src/cover/edit/block-controls.js b/packages/block-library/src/cover/edit/block-controls.js
index 59aaaaffe77d75..041566c0a51971 100644
--- a/packages/block-library/src/cover/edit/block-controls.js
+++ b/packages/block-library/src/cover/edit/block-controls.js
@@ -8,6 +8,7 @@ import {
 	MediaReplaceFlow,
 	__experimentalBlockAlignmentMatrixControl as BlockAlignmentMatrixControl,
 	__experimentalBlockFullHeightAligmentControl as FullHeightAlignmentControl,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 
@@ -15,6 +16,9 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { ALLOWED_MEDIA_TYPES } from '../shared';
+import { unlock } from '../../lock-unlock';
+
+const { cleanEmptyObject } = unlock( blockEditorPrivateApis );
 
 export default function CoverBlockControls( {
 	attributes,
@@ -22,6 +26,7 @@ export default function CoverBlockControls( {
 	onSelectMedia,
 	currentSettings,
 	toggleUseFeaturedImage,
+	onClearMedia,
 } ) {
 	const { contentPosition, id, useFeaturedImage, minHeight, minHeightUnit } =
 		attributes;
@@ -30,7 +35,10 @@ export default function CoverBlockControls( {
 	const [ prevMinHeightValue, setPrevMinHeightValue ] = useState( minHeight );
 	const [ prevMinHeightUnit, setPrevMinHeightUnit ] =
 		useState( minHeightUnit );
-	const isMinFullHeight = minHeightUnit === 'vh' && minHeight === 100;
+	const isMinFullHeight =
+		minHeightUnit === 'vh' &&
+		minHeight === 100 &&
+		! attributes?.style?.dimensions?.aspectRatio;
 	const toggleMinFullHeight = () => {
 		if ( isMinFullHeight ) {
 			// If there aren't previous values, take the default ones.
@@ -51,10 +59,17 @@ export default function CoverBlockControls( {
 		setPrevMinHeightValue( minHeight );
 		setPrevMinHeightUnit( minHeightUnit );
 
-		// Set full height.
+		// Set full height, and clear any aspect ratio value.
 		return setAttributes( {
 			minHeight: 100,
 			minHeightUnit: 'vh',
+			style: cleanEmptyObject( {
+				...attributes?.style,
+				dimensions: {
+					...attributes?.style?.dimensions,
+					aspectRatio: undefined, // Reset aspect ratio when minHeight is set.
+				},
+			} ),
 		} );
 	};
 
@@ -87,6 +102,7 @@ export default function CoverBlockControls( {
 					onToggleFeaturedImage={ toggleUseFeaturedImage }
 					useFeaturedImage={ useFeaturedImage }
 					name={ ! url ? __( 'Add Media' ) : __( 'Replace' ) }
+					onReset={ onClearMedia }
 				/>
 			</BlockControls>
 		</>
diff --git a/packages/block-library/src/cover/edit/index.js b/packages/block-library/src/cover/edit/index.js
index 8c5488584094c6..77ce9e62d9eb09 100644
--- a/packages/block-library/src/cover/edit/index.js
+++ b/packages/block-library/src/cover/edit/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -18,6 +18,7 @@ import {
 	useInnerBlocksProps,
 	__experimentalUseGradient,
 	store as blockEditorStore,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
@@ -46,6 +47,7 @@ import {
 	DEFAULT_BACKGROUND_COLOR,
 	DEFAULT_OVERLAY_COLOR,
 } from './color-utils';
+import { DEFAULT_MEDIA_SIZE_SLUG } from '../constants';
 
 function getInnerBlocksTemplate( attributes ) {
 	return [
@@ -99,6 +101,7 @@ function CoverEdit( {
 		templateLock,
 		tagName: TagName = 'div',
 		isUserOverlayColor,
+		sizeSlug,
 	} = attributes;
 
 	const [ featuredImage ] = useEntityProp(
@@ -107,6 +110,7 @@ function CoverEdit( {
 		'featured_media',
 		postId
 	);
+	const { getSettings } = useSelect( blockEditorStore );
 
 	const { __unstableMarkNextChangeAsNotPersistent } =
 		useDispatch( blockEditorStore );
@@ -143,10 +147,12 @@ function CoverEdit( {
 				averageBackgroundColor
 			);
 			__unstableMarkNextChangeAsNotPersistent();
-			setAttributes( { isDark: newIsDark } );
+			setAttributes( {
+				isDark: newIsDark,
+				isUserOverlayColor: isUserOverlayColor || false,
+			} );
 		} )();
-		// Disable reason: Update the block only when the featured image changes.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// Update the block only when the featured image changes.
 	}, [ mediaUrl ] );
 
 	// instead of destructuring the attributes
@@ -195,12 +201,29 @@ function CoverEdit( {
 			averageBackgroundColor
 		);
 
+		if ( backgroundType === IMAGE_BACKGROUND_TYPE && mediaAttributes.id ) {
+			const { imageDefaultSize } = getSettings();
+
+			// Try to use the previous selected image size if it's available
+			// otherwise try the default image size or fallback to full size.
+			if ( sizeSlug && newMedia?.sizes?.[ sizeSlug ] ) {
+				mediaAttributes.sizeSlug = sizeSlug;
+				mediaAttributes.url = newMedia?.sizes?.[ sizeSlug ]?.url;
+			} else if ( newMedia?.sizes?.[ imageDefaultSize ] ) {
+				mediaAttributes.sizeSlug = imageDefaultSize;
+				mediaAttributes.url = newMedia?.sizes?.[ sizeSlug ]?.url;
+			} else {
+				mediaAttributes.sizeSlug = DEFAULT_MEDIA_SIZE_SLUG;
+			}
+		}
+
 		setAttributes( {
 			...mediaAttributes,
 			focalPoint: undefined,
 			useFeaturedImage: undefined,
 			dimRatio: newDimRatio,
 			isDark: newIsDark,
+			isUserOverlayColor: isUserOverlayColor || false,
 		} );
 	};
 
@@ -274,6 +297,9 @@ function CoverEdit( {
 	const isImageBackground = IMAGE_BACKGROUND_TYPE === backgroundType;
 	const isVideoBackground = VIDEO_BACKGROUND_TYPE === backgroundType;
 
+	const blockEditingMode = useBlockEditingMode();
+	const hasNonContentControls = blockEditingMode === 'default';
+
 	const [ resizeListener, { height, width } ] = useResizeObserver();
 	const resizableBoxDimensions = useMemo( () => {
 		return {
@@ -398,6 +424,7 @@ function CoverEdit( {
 			onSelectMedia={ onSelectMedia }
 			currentSettings={ currentSettings }
 			toggleUseFeaturedImage={ toggleUseFeaturedImage }
+			onClearMedia={ onClearMedia }
 		/>
 	);
 
@@ -431,7 +458,8 @@ function CoverEdit( {
 			toggleSelection( true );
 			setAttributes( { minHeight: newMinHeight } );
 		},
-		showHandle: true,
+		// Hide the resize handle if an aspect ratio is set, as the aspect ratio takes precedence.
+		showHandle: ! attributes.style?.dimensions?.aspectRatio ? true : false,
 		size: resizableBoxDimensions,
 		width,
 	};
@@ -441,15 +469,12 @@ function CoverEdit( {
 			<>
 				{ blockControls }
 				{ inspectorControls }
-				{ isSelected && (
+				{ hasNonContentControls && isSelected && (
 					<ResizableCoverPopover { ...resizableCoverProps } />
 				) }
 				<TagName
 					{ ...blockProps }
-					className={ classnames(
-						'is-placeholder',
-						blockProps.className
-					) }
+					className={ clsx( 'is-placeholder', blockProps.className ) }
 					style={ {
 						...blockProps.style,
 						minHeight: minHeightWithUnit || undefined,
@@ -463,7 +488,7 @@ function CoverEdit( {
 					>
 						<div className="wp-block-cover__placeholder-background-options">
 							<ColorPalette
-								disableCustomColors={ true }
+								disableCustomColors
 								value={ overlayColor.color }
 								onChange={ onSetOverlayColor }
 								clearable={ false }
@@ -475,7 +500,7 @@ function CoverEdit( {
 		);
 	}
 
-	const classes = classnames(
+	const classes = clsx(
 		{
 			'is-dark-theme': isDark,
 			'is-light': ! isDark,
@@ -488,21 +513,24 @@ function CoverEdit( {
 		getPositionClassName( contentPosition )
 	);
 
+	const showOverlay =
+		url || ! useFeaturedImage || ( useFeaturedImage && ! url );
+
 	return (
 		<>
 			{ blockControls }
 			{ inspectorControls }
 			<TagName
 				{ ...blockProps }
-				className={ classnames( classes, blockProps.className ) }
+				className={ clsx( classes, blockProps.className ) }
 				style={ { ...style, ...blockProps.style } }
 				data-url={ url }
 			>
 				{ resizeListener }
-				{ ( ! useFeaturedImage || url ) && (
+				{ showOverlay && (
 					<span
 						aria-hidden="true"
-						className={ classnames(
+						className={ clsx(
 							'wp-block-cover__background',
 							dimRatioToClass( dimRatio ),
 							{
@@ -524,7 +552,7 @@ function CoverEdit( {
 				{ ! url && useFeaturedImage && (
 					<Placeholder
 						className="wp-block-cover__image--placeholder-image"
-						withIllustration={ true }
+						withIllustration
 					/>
 				) }
 
@@ -543,7 +571,7 @@ function CoverEdit( {
 							ref={ mediaElement }
 							role={ alt ? 'img' : undefined }
 							aria-label={ alt ? alt : undefined }
-							className={ classnames(
+							className={ clsx(
 								classes,
 								'wp-block-cover__image-background'
 							) }
@@ -570,7 +598,7 @@ function CoverEdit( {
 				/>
 				<div { ...innerBlocksProps } />
 			</TagName>
-			{ isSelected && (
+			{ hasNonContentControls && isSelected && (
 				<ResizableCoverPopover { ...resizableCoverProps } />
 			) }
 		</>
diff --git a/packages/block-library/src/cover/edit/inspector-controls.js b/packages/block-library/src/cover/edit/inspector-controls.js
index 38757f90c2deec..c0807869ee1a5c 100644
--- a/packages/block-library/src/cover/edit/inspector-controls.js
+++ b/packages/block-library/src/cover/edit/inspector-controls.js
@@ -3,16 +3,14 @@
  */
 import { useMemo } from '@wordpress/element';
 import {
-	Button,
 	ExternalLink,
 	FocalPointPicker,
-	PanelBody,
-	PanelRow,
 	RangeControl,
 	TextareaControl,
 	ToggleControl,
 	SelectControl,
 	__experimentalUseCustomUnits as useCustomUnits,
+	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
 	__experimentalUnitControl as UnitControl,
 	__experimentalParseQuantityAndUnitFromRawValue as parseQuantityAndUnitFromRawValue,
@@ -21,16 +19,25 @@ import { useInstanceId } from '@wordpress/compose';
 import {
 	InspectorControls,
 	useSettings,
+	store as blockEditorStore,
 	__experimentalColorGradientSettingsDropdown as ColorGradientSettingsDropdown,
 	__experimentalUseGradient,
 	__experimentalUseMultipleOriginColorsAndGradients as useMultipleOriginColorsAndGradients,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
 import { COVER_MIN_HEIGHT, mediaPosition } from '../shared';
+import { unlock } from '../../lock-unlock';
+import { useToolsPanelDropdownMenuProps } from '../../utils/hooks';
+import { DEFAULT_MEDIA_SIZE_SLUG } from '../constants';
+
+const { cleanEmptyObject, ResolutionTool } = unlock( blockEditorPrivateApis );
 
 function CoverHeightInput( {
 	onChange,
@@ -69,13 +76,13 @@ function CoverHeightInput( {
 
 	return (
 		<UnitControl
-			label={ __( 'Minimum height of cover' ) }
+			__next40pxDefaultSize
+			label={ __( 'Minimum height' ) }
 			id={ inputId }
 			isResetValueOnUnitChange
 			min={ min }
 			onChange={ handleOnChange }
 			onUnitChange={ onUnitChange }
-			__unstableInputWidth={ '80px' }
 			units={ units }
 			value={ computedValue }
 		/>
@@ -89,10 +96,10 @@ export default function CoverInspectorControls( {
 	coverRef,
 	currentSettings,
 	updateDimRatio,
-	onClearMedia,
 } ) {
 	const {
 		useFeaturedImage,
+		id,
 		dimRatio,
 		focalPoint,
 		hasParallax,
@@ -110,7 +117,38 @@ export default function CoverInspectorControls( {
 		overlayColor,
 	} = currentSettings;
 
+	const sizeSlug = attributes.sizeSlug || DEFAULT_MEDIA_SIZE_SLUG;
+
 	const { gradientValue, setGradient } = __experimentalUseGradient();
+	const { getSettings } = useSelect( blockEditorStore );
+
+	const imageSizes = getSettings()?.imageSizes;
+
+	const image = useSelect(
+		( select ) =>
+			id && isImageBackground
+				? select( coreStore ).getMedia( id, { context: 'view' } )
+				: null,
+		[ id, isImageBackground ]
+	);
+
+	function updateImage( newSizeSlug ) {
+		const newUrl = image?.media_details?.sizes?.[ newSizeSlug ]?.source_url;
+		if ( ! newUrl ) {
+			return null;
+		}
+
+		setAttributes( {
+			url: newUrl,
+			sizeSlug: newSizeSlug,
+		} );
+	}
+
+	const imageSizeOptions = imageSizes
+		?.filter(
+			( { slug } ) => image?.media_details?.sizes?.[ slug ]?.source_url
+		)
+		?.map( ( { name, slug } ) => ( { value: slug, label: name } ) );
 
 	const toggleParallax = () => {
 		setAttributes( {
@@ -159,75 +197,139 @@ export default function CoverInspectorControls( {
 		),
 	};
 
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
+
 	return (
 		<>
 			<InspectorControls>
 				{ !! url && (
-					<PanelBody title={ __( 'Media settings' ) }>
+					<ToolsPanel
+						label={ __( 'Settings' ) }
+						resetAll={ () => {
+							setAttributes( {
+								hasParallax: false,
+								focalPoint: undefined,
+								isRepeated: false,
+								alt: '',
+								sizeSlug: undefined,
+							} );
+						} }
+						dropdownMenuProps={ dropdownMenuProps }
+					>
 						{ isImageBackground && (
 							<>
-								<ToggleControl
-									__nextHasNoMarginBottom
+								<ToolsPanelItem
 									label={ __( 'Fixed background' ) }
-									checked={ hasParallax }
-									onChange={ toggleParallax }
-								/>
+									isShownByDefault
+									hasValue={ () => hasParallax }
+									onDeselect={ () =>
+										setAttributes( {
+											hasParallax: false,
+											focalPoint: undefined,
+										} )
+									}
+								>
+									<ToggleControl
+										__nextHasNoMarginBottom
+										label={ __( 'Fixed background' ) }
+										checked={ hasParallax }
+										onChange={ toggleParallax }
+									/>
+								</ToolsPanelItem>
 
-								<ToggleControl
-									__nextHasNoMarginBottom
+								<ToolsPanelItem
 									label={ __( 'Repeated background' ) }
-									checked={ isRepeated }
-									onChange={ toggleIsRepeated }
-								/>
+									isShownByDefault
+									hasValue={ () => isRepeated }
+									onDeselect={ () =>
+										setAttributes( {
+											isRepeated: false,
+										} )
+									}
+								>
+									<ToggleControl
+										__nextHasNoMarginBottom
+										label={ __( 'Repeated background' ) }
+										checked={ isRepeated }
+										onChange={ toggleIsRepeated }
+									/>
+								</ToolsPanelItem>
 							</>
 						) }
 						{ showFocalPointPicker && (
-							<FocalPointPicker
-								__nextHasNoMarginBottom
-								label={ __( 'Focal point picker' ) }
-								url={ url }
-								value={ focalPoint }
-								onDragStart={ imperativeFocalPointPreview }
-								onDrag={ imperativeFocalPointPreview }
-								onChange={ ( newFocalPoint ) =>
+							<ToolsPanelItem
+								label={ __( 'Focal point' ) }
+								isShownByDefault
+								hasValue={ () => !! focalPoint }
+								onDeselect={ () =>
 									setAttributes( {
-										focalPoint: newFocalPoint,
+										focalPoint: undefined,
 									} )
 								}
-							/>
+							>
+								<FocalPointPicker
+									__nextHasNoMarginBottom
+									label={ __( 'Focal point' ) }
+									url={ url }
+									value={ focalPoint }
+									onDragStart={ imperativeFocalPointPreview }
+									onDrag={ imperativeFocalPointPreview }
+									onChange={ ( newFocalPoint ) =>
+										setAttributes( {
+											focalPoint: newFocalPoint,
+										} )
+									}
+								/>
+							</ToolsPanelItem>
 						) }
 						{ ! useFeaturedImage && url && ! isVideoBackground && (
-							<TextareaControl
-								__nextHasNoMarginBottom
+							<ToolsPanelItem
 								label={ __( 'Alternative text' ) }
-								value={ alt }
-								onChange={ ( newAlt ) =>
-									setAttributes( { alt: newAlt } )
+								isShownByDefault
+								hasValue={ () => !! alt }
+								onDeselect={ () =>
+									setAttributes( { alt: '' } )
 								}
-								help={
-									<>
-										<ExternalLink href="https://www.w3.org/WAI/tutorials/images/decision-tree">
+							>
+								<TextareaControl
+									__nextHasNoMarginBottom
+									label={ __( 'Alternative text' ) }
+									value={ alt }
+									onChange={ ( newAlt ) =>
+										setAttributes( { alt: newAlt } )
+									}
+									help={
+										<>
+											<ExternalLink
+												href={
+													// translators: Localized tutorial, if one exists. W3C Web Accessibility Initiative link has list of existing translations.
+													__(
+														'https://www.w3.org/WAI/tutorials/images/decision-tree/'
+													)
+												}
+											>
+												{ __(
+													'Describe the purpose of the image.'
+												) }
+											</ExternalLink>
+											<br />
 											{ __(
-												'Describe the purpose of the image.'
+												'Leave empty if decorative.'
 											) }
-										</ExternalLink>
-										<br />
-										{ __( 'Leave empty if decorative.' ) }
-									</>
-								}
+										</>
+									}
+								/>
+							</ToolsPanelItem>
+						) }
+						{ ! useFeaturedImage && !! imageSizeOptions?.length && (
+							<ResolutionTool
+								value={ sizeSlug }
+								onChange={ updateImage }
+								options={ imageSizeOptions }
+								defaultValue={ DEFAULT_MEDIA_SIZE_SLUG }
 							/>
 						) }
-						<PanelRow>
-							<Button
-								variant="secondary"
-								isSmall
-								className="block-library-cover__reset-button"
-								onClick={ onClearMedia }
-							>
-								{ __( 'Clear Media' ) }
-							</Button>
-						</PanelRow>
-					</PanelBody>
+					</ToolsPanel>
 				) }
 			</InspectorControls>
 			{ colorGradientSettings.hasColorsOrGradients && (
@@ -248,6 +350,7 @@ export default function CoverInspectorControls( {
 									gradient: undefined,
 									customGradient: undefined,
 								} ),
+								clearable: true,
 							},
 						] }
 						panelId={ clientId }
@@ -287,6 +390,7 @@ export default function CoverInspectorControls( {
 			) }
 			<InspectorControls group="dimensions">
 				<ToolsPanelItem
+					className="single-column"
 					hasValue={ () => !! minHeight }
 					label={ __( 'Minimum height' ) }
 					onDeselect={ () =>
@@ -299,14 +403,27 @@ export default function CoverInspectorControls( {
 						minHeight: undefined,
 						minHeightUnit: undefined,
 					} ) }
-					isShownByDefault={ true }
+					isShownByDefault
 					panelId={ clientId }
 				>
 					<CoverHeightInput
-						value={ minHeight }
+						value={
+							attributes?.style?.dimensions?.aspectRatio
+								? ''
+								: minHeight
+						}
 						unit={ minHeightUnit }
 						onChange={ ( newMinHeight ) =>
-							setAttributes( { minHeight: newMinHeight } )
+							setAttributes( {
+								minHeight: newMinHeight,
+								style: cleanEmptyObject( {
+									...attributes?.style,
+									dimensions: {
+										...attributes?.style?.dimensions,
+										aspectRatio: undefined, // Reset aspect ratio when minHeight is set.
+									},
+								} ),
+							} )
 						}
 						onUnitChange={ ( nextUnit ) =>
 							setAttributes( {
diff --git a/packages/block-library/src/cover/edit/resizable-cover-popover.js b/packages/block-library/src/cover/edit/resizable-cover-popover.js
index 7db8b0cc50b883..a6447d0108c7f8 100644
--- a/packages/block-library/src/cover/edit/resizable-cover-popover.js
+++ b/packages/block-library/src/cover/edit/resizable-cover-popover.js
@@ -1,12 +1,12 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { useMemo, useState } from '@wordpress/element';
+import { useState } from '@wordpress/element';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
 /**
@@ -40,13 +40,9 @@ export default function ResizableCoverPopover( {
 	...props
 } ) {
 	const [ isResizing, setIsResizing ] = useState( false );
-	const dimensions = useMemo(
-		() => ( { height, minHeight, width } ),
-		[ minHeight, height, width ]
-	);
 
 	const resizableBoxProps = {
-		className: classnames( className, { 'is-resizing': isResizing } ),
+		className: clsx( className, { 'is-resizing': isResizing } ),
 		enable: RESIZABLE_BOX_ENABLE_OPTION,
 		onResizeStart: ( _event, _direction, elt ) => {
 			onResizeStart( elt.clientHeight );
@@ -75,7 +71,6 @@ export default function ResizableCoverPopover( {
 	return (
 		<ResizableBoxPopover
 			className="block-library-cover__resizable-box-popover"
-			__unstableRefreshSize={ dimensions }
 			resizableBoxProps={ resizableBoxProps }
 			{ ...props }
 		/>
diff --git a/packages/block-library/src/cover/editor.scss b/packages/block-library/src/cover/editor.scss
index 4e2a07ffe8e4ee..b92c401311beee 100644
--- a/packages/block-library/src/cover/editor.scss
+++ b/packages/block-library/src/cover/editor.scss
@@ -1,9 +1,4 @@
 .wp-block-cover {
-	/* Extra specificity needed because the reset.css applied in the editor context is overriding this rule. */
-	.editor-styles-wrapper & {
-		box-sizing: border-box;
-	}
-
 	// Override default cover styles
 	// because we're not ready yet to show the cover block.
 	&.is-placeholder {
@@ -30,9 +25,18 @@
 	}
 
 	// Applied while media is being uploaded
-	&.is-transient::before {
-		background-color: #fff;
-		opacity: 0.3;
+	&.is-transient {
+		position: relative;
+
+		&::before {
+			background-color: #fff;
+			content: "";
+			height: 100%;
+			opacity: 0.3;
+			position: absolute;
+			width: 100%;
+			z-index: 1;
+		}
 	}
 
 	// Shown while media is being uploaded
@@ -114,10 +118,3 @@
 .color-block-support-panel__inner-wrapper > :not(.block-editor-tools-panel-color-gradient-settings__item) {
 	margin-top: $grid-unit-30;
 }
-
-
-// The frontend style.scss includes a min-height as an IE11 fix.
-// This fix causes extra spacing for the focus style in the editor, so we omit it here.
-.wp-block-cover::after {
-	min-height: auto;
-}
diff --git a/packages/block-library/src/cover/index.php b/packages/block-library/src/cover/index.php
index 5f6b2cadaaa570..1ffe7ab3f4dbc6 100644
--- a/packages/block-library/src/cover/index.php
+++ b/packages/block-library/src/cover/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/cover` block on server.
  *
+ * @since 6.0.0
+ *
  * @param array  $attributes The block attributes.
  * @param string $content    The block rendered content.
  *
@@ -18,29 +20,22 @@ function render_block_core_cover( $attributes, $content ) {
 		return $content;
 	}
 
+	$object_position = isset( $attributes['focalPoint'] )
+		? round( $attributes['focalPoint']['x'] * 100 ) . '% ' . round( $attributes['focalPoint']['y'] * 100 ) . '%'
+		: null;
+
 	if ( ! ( $attributes['hasParallax'] || $attributes['isRepeated'] ) ) {
 		$attr = array(
 			'class'           => 'wp-block-cover__image-background',
 			'data-object-fit' => 'cover',
 		);
 
-		if ( isset( $attributes['focalPoint'] ) ) {
-			$object_position              = round( $attributes['focalPoint']['x'] * 100 ) . '% ' . round( $attributes['focalPoint']['y'] * 100 ) . '%';
+		if ( $object_position ) {
 			$attr['data-object-position'] = $object_position;
-			$attr['style']                = 'object-position: ' . $object_position;
+			$attr['style']                = 'object-position:' . $object_position . ';';
 		}
 
 		$image = get_the_post_thumbnail( null, 'post-thumbnail', $attr );
-
-		/*
-		 * Inserts the featured image between the (1st) cover 'background' `span` and 'inner_container' `div`,
-		 * and removes eventual whitespace characters between the two (typically introduced at template level)
-		 */
-		$inner_container_start = '/<div\b[^>]+wp-block-cover__inner-container[\s|"][^>]*>/U';
-		if ( 1 === preg_match( $inner_container_start, $content, $matches, PREG_OFFSET_CAPTURE ) ) {
-			$offset  = $matches[0][1];
-			$content = substr( $content, 0, $offset ) . $image . substr( $content, $offset );
-		}
 	} else {
 		if ( in_the_loop() ) {
 			update_post_thumbnail_cache();
@@ -50,15 +45,41 @@ function render_block_core_cover( $attributes, $content ) {
 			return $content;
 		}
 
-		$processor = new WP_HTML_Tag_Processor( $content );
+		$current_thumbnail_id = get_post_thumbnail_id();
+
+		$processor = new WP_HTML_Tag_Processor( '<div></div>' );
 		$processor->next_tag();
 
-		$styles         = $processor->get_attribute( 'style' );
-		$merged_styles  = ! empty( $styles ) ? $styles . ';' : '';
-		$merged_styles .= 'background-image:url(' . esc_url( $current_featured_image ) . ');';
+		$current_alt = trim( strip_tags( get_post_meta( $current_thumbnail_id, '_wp_attachment_image_alt', true ) ) );
+		if ( $current_alt ) {
+			$processor->set_attribute( 'role', 'img' );
+			$processor->set_attribute( 'aria-label', $current_alt );
+		}
 
-		$processor->set_attribute( 'style', $merged_styles );
-		$content = $processor->get_updated_html();
+		$processor->add_class( 'wp-block-cover__image-background' );
+		$processor->add_class( 'wp-image-' . $current_thumbnail_id );
+		if ( $attributes['hasParallax'] ) {
+			$processor->add_class( 'has-parallax' );
+		}
+		if ( $attributes['isRepeated'] ) {
+			$processor->add_class( 'is-repeated' );
+		}
+
+		$styles  = 'background-position:' . ( $object_position ?? '50% 50%' ) . ';';
+		$styles .= 'background-image:url(' . esc_url( $current_featured_image ) . ');';
+		$processor->set_attribute( 'style', $styles );
+
+		$image = $processor->get_updated_html();
+	}
+
+	/*
+	 * Inserts the featured image between the (1st) cover 'background' `span` and 'inner_container' `div`,
+	 * and removes eventual whitespace characters between the two (typically introduced at template level)
+	 */
+	$inner_container_start = '/<div\b[^>]+wp-block-cover__inner-container[\s|"][^>]*>/U';
+	if ( 1 === preg_match( $inner_container_start, $content, $matches, PREG_OFFSET_CAPTURE ) ) {
+		$offset  = $matches[0][1];
+		$content = substr( $content, 0, $offset ) . $image . substr( $content, $offset );
 	}
 
 	return $content;
@@ -66,6 +87,8 @@ function render_block_core_cover( $attributes, $content ) {
 
 /**
  * Registers the `core/cover` block renderer on server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_cover() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/cover/overlay-color-settings.native.js b/packages/block-library/src/cover/overlay-color-settings.native.js
index 7a68e207ffb276..a8acf8bf11b102 100644
--- a/packages/block-library/src/cover/overlay-color-settings.native.js
+++ b/packages/block-library/src/cover/overlay-color-settings.native.js
@@ -12,9 +12,9 @@ import {
 	getGradientValueBySlug,
 	getGradientSlugByValue,
 	__experimentalPanelColorGradientSettings as PanelColorGradientSettings,
+	useMobileGlobalStylesColors,
 } from '@wordpress/block-editor';
 import { useMemo } from '@wordpress/element';
-import { useMobileGlobalStylesColors } from '@wordpress/components';
 
 function OverlayColorSettings( {
 	overlayColor,
diff --git a/packages/block-library/src/cover/save.js b/packages/block-library/src/cover/save.js
index 680e92a5f9177b..325ddf2b741f98 100644
--- a/packages/block-library/src/cover/save.js
+++ b/packages/block-library/src/cover/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -45,6 +45,7 @@ export default function save( { attributes } ) {
 		minHeight: minHeightProp,
 		minHeightUnit,
 		tagName: Tag,
+		sizeSlug,
 	} = attributes;
 	const overlayColorClass = getColorClassName(
 		'background-color',
@@ -80,7 +81,7 @@ export default function save( { attributes } ) {
 
 	const backgroundPosition = mediaPosition( focalPoint );
 
-	const classes = classnames(
+	const classes = clsx(
 		{
 			'is-light': ! isDark,
 			'has-parallax': hasParallax,
@@ -91,10 +92,11 @@ export default function save( { attributes } ) {
 		getPositionClassName( contentPosition )
 	);
 
-	const imgClasses = classnames(
+	const imgClasses = clsx(
 		'wp-block-cover__image-background',
 		id ? `wp-image-${ id }` : null,
 		{
+			[ `size-${ sizeSlug }` ]: sizeSlug,
 			'has-parallax': hasParallax,
 			'is-repeated': isRepeated,
 		}
@@ -106,7 +108,7 @@ export default function save( { attributes } ) {
 		<Tag { ...useBlockProps.save( { className: classes, style } ) }>
 			<span
 				aria-hidden="true"
-				className={ classnames(
+				className={ clsx(
 					'wp-block-cover__background',
 					overlayColorClass,
 					dimRatioToClass( dimRatio ),
@@ -146,7 +148,7 @@ export default function save( { attributes } ) {
 				) ) }
 			{ isVideoBackground && url && (
 				<video
-					className={ classnames(
+					className={ clsx(
 						'wp-block-cover__video-background',
 						'intrinsic-ignore'
 					) }
diff --git a/packages/block-library/src/cover/shared.js b/packages/block-library/src/cover/shared.js
index 35a2a6a5a5157e..37390354a37d63 100644
--- a/packages/block-library/src/cover/shared.js
+++ b/packages/block-library/src/cover/shared.js
@@ -103,7 +103,9 @@ export function getPositionClassName( contentPosition ) {
 	/*
 	 * Only render a className if the contentPosition is not center (the default).
 	 */
-	if ( isContentPositionCenter( contentPosition ) ) return '';
+	if ( isContentPositionCenter( contentPosition ) ) {
+		return '';
+	}
 
 	return POSITION_CLASSNAMES[ contentPosition ];
 }
diff --git a/packages/block-library/src/cover/style.scss b/packages/block-library/src/cover/style.scss
index 837e3834e2e1ba..b2c1fe88440235 100644
--- a/packages/block-library/src/cover/style.scss
+++ b/packages/block-library/src/cover/style.scss
@@ -1,12 +1,12 @@
 .wp-block-cover-image,
 .wp-block-cover {
+	min-height: 430px;
+	padding: 1em;
 	position: relative;
 	background-position: center center;
-	min-height: 430px;
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	padding: 1em;
 	// Prevent the `wp-block-cover__background` span from overflowing the container when border-radius is applied.
 	// `overflow: hidden` is provided as a fallback for browsers that don't support `overflow: clip`.
 	overflow: hidden;
@@ -87,20 +87,6 @@
 		width: 100%;
 	}
 
-	// Using flexbox without an assigned height property breaks vertical center alignment in IE11.
-	// Appending an empty ::after element tricks IE11 into giving the cover image an implicit height, which sidesteps this issue.
-	&::after {
-		display: block;
-		content: "";
-		font-size: 0;
-		min-height: inherit;
-
-		// IE doesn't support flex so omit that.
-		@supports (position: sticky) {
-			content: none;
-		}
-	}
-
 	// Aligned cover blocks should not use our global alignment rules
 	&.aligncenter,
 	&.alignleft,
@@ -114,17 +100,11 @@
 		color: inherit;
 		// Reset the fixed LTR direction at the root of the block in RTL languages.
 		/*rtl:raw: direction: rtl; */
-	}
 
-	p,
-	h1,
-	h2,
-	h3,
-	h4,
-	h5,
-	h6 {
-		&:where(:not(.has-text-color)) {
-			color: inherit;
+		// Reset the z-index to auto when the body has a modal open. So when the
+		// modal is inside the cover, it doesn't create a stacking context.
+		@at-root .has-modal-open & {
+			z-index: auto;
 		}
 	}
 
@@ -310,3 +290,15 @@ section.wp-block-cover-image > h2,
 :where(.wp-block-cover-image.is-light:not(.has-text-color)) {
 	color: $black;
 }
+
+:root {
+	:where(.wp-block-cover p:not(.has-text-color)),
+	:where(.wp-block-cover h1:not(.has-text-color)),
+	:where(.wp-block-cover h2:not(.has-text-color)),
+	:where(.wp-block-cover h3:not(.has-text-color)),
+	:where(.wp-block-cover h4:not(.has-text-color)),
+	:where(.wp-block-cover h5:not(.has-text-color)),
+	:where(.wp-block-cover h6:not(.has-text-color)) {
+		color: inherit;
+	}
+}
diff --git a/packages/block-library/src/cover/test/edit.js b/packages/block-library/src/cover/test/edit.js
index 879b77636255a3..348cd88edfd962 100644
--- a/packages/block-library/src/cover/test/edit.js
+++ b/packages/block-library/src/cover/test/edit.js
@@ -155,6 +155,34 @@ describe( 'Cover block', () => {
 				'is-position-top-left'
 			);
 		} );
+
+		test( 'clears media when clear media button clicked', async () => {
+			await setup( {
+				url: 'http://localhost/my-image.jpg',
+			} );
+
+			await selectBlock( 'Block: Cover' );
+			expect(
+				within( screen.getByLabelText( 'Block: Cover' ) ).getByRole(
+					'img'
+				)
+			).toBeInTheDocument();
+
+			await userEvent.click(
+				screen.getByRole( 'button', { name: 'Replace' } )
+			);
+			await userEvent.click(
+				screen.getByRole( 'menuitem', {
+					name: 'Reset',
+				} )
+			);
+
+			expect(
+				within( screen.getByLabelText( 'Block: Cover' ) ).queryByRole(
+					'img'
+				)
+			).not.toBeInTheDocument();
+		} );
 	} );
 
 	describe( 'Inspector controls', () => {
@@ -162,8 +190,8 @@ describe( 'Cover block', () => {
 			test( 'does not display media settings panel if url is not set', async () => {
 				await setup();
 				expect(
-					screen.queryByRole( 'button', {
-						name: 'Media settings',
+					screen.queryByRole( 'heading', {
+						name: 'Settings',
 					} )
 				).not.toBeInTheDocument();
 			} );
@@ -174,8 +202,8 @@ describe( 'Cover block', () => {
 
 				await selectBlock( 'Block: Cover' );
 				expect(
-					screen.getByRole( 'button', {
-						name: 'Media settings',
+					screen.getByRole( 'heading', {
+						name: 'Settings',
 					} )
 				).toBeInTheDocument();
 			} );
@@ -242,30 +270,6 @@ describe( 'Cover block', () => {
 			expect( screen.getByAltText( 'Me' ) ).toBeInTheDocument();
 		} );
 
-		test( 'clears media  when clear media button clicked', async () => {
-			await setup( {
-				url: 'http://localhost/my-image.jpg',
-			} );
-
-			await selectBlock( 'Block: Cover' );
-			expect(
-				within( screen.getByLabelText( 'Block: Cover' ) ).getByRole(
-					'img'
-				)
-			).toBeInTheDocument();
-
-			await userEvent.click(
-				screen.getByRole( 'button', {
-					name: 'Clear Media',
-				} )
-			);
-			expect(
-				within( screen.getByLabelText( 'Block: Cover' ) ).queryByRole(
-					'img'
-				)
-			).not.toBeInTheDocument();
-		} );
-
 		describe( 'Color panel', () => {
 			test( 'applies selected opacity to block when number control value changed', async () => {
 				const { container } = await setup();
@@ -372,10 +376,10 @@ describe( 'Cover block', () => {
 					} )
 				);
 				await userEvent.clear(
-					screen.getByLabelText( 'Minimum height of cover' )
+					screen.getByLabelText( 'Minimum height' )
 				);
 				await userEvent.type(
-					screen.getByLabelText( 'Minimum height of cover' ),
+					screen.getByLabelText( 'Minimum height' ),
 					'300'
 				);
 
diff --git a/packages/block-library/src/cover/test/edit.native.js b/packages/block-library/src/cover/test/edit.native.js
index 3ca2755ee1aebb..6925cfe3f62214 100644
--- a/packages/block-library/src/cover/test/edit.native.js
+++ b/packages/block-library/src/cover/test/edit.native.js
@@ -80,7 +80,13 @@ const MEDIA_OPTIONS = [
 // Simplified tree to render Cover edit within slot.
 const CoverEdit = ( props ) => (
 	<SlotFillProvider>
-		<BlockEdit isSelected name={ cover.name } clientId={ 0 } { ...props } />
+		<BlockEdit
+			isSelected
+			mayDisplayControls
+			name={ cover.name }
+			clientId={ 0 }
+			{ ...props }
+		/>
 		<BottomSheetSettings isVisible />
 	</SlotFillProvider>
 );
diff --git a/packages/block-library/src/details/block.json b/packages/block-library/src/details/block.json
index d449d42e1e10c4..a488ae1fa73a79 100644
--- a/packages/block-library/src/details/block.json
+++ b/packages/block-library/src/details/block.json
@@ -13,12 +13,13 @@
 			"default": false
 		},
 		"summary": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "summary"
 		}
 	},
 	"supports": {
+		"__experimentalOnEnter": true,
 		"align": [ "wide", "full" ],
 		"color": {
 			"gradients": true,
@@ -58,6 +59,9 @@
 		},
 		"layout": {
 			"allowEditing": false
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-details-editor",
diff --git a/packages/block-library/src/details/edit.js b/packages/block-library/src/details/edit.js
index 0d1d675893900f..314556ba6d5919 100644
--- a/packages/block-library/src/details/edit.js
+++ b/packages/block-library/src/details/edit.js
@@ -48,6 +48,7 @@ function DetailsEdit( { attributes, setAttributes, clientId } ) {
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
 					<ToggleControl
+						__nextHasNoMarginBottom
 						label={ __( 'Open by default' ) }
 						checked={ showContent }
 						onChange={ () =>
@@ -64,6 +65,7 @@ function DetailsEdit( { attributes, setAttributes, clientId } ) {
 			>
 				<summary onClick={ ( event ) => event.preventDefault() }>
 					<RichText
+						identifier="summary"
 						aria-label={ __( 'Write summary' ) }
 						placeholder={ __( 'Write summary…' ) }
 						allowedFormats={ [] }
diff --git a/packages/block-library/src/details/index.js b/packages/block-library/src/details/index.js
index e30d1a8e04974f..3ba5efb04e27d2 100644
--- a/packages/block-library/src/details/index.js
+++ b/packages/block-library/src/details/index.js
@@ -11,6 +11,7 @@ import initBlock from '../utils/init-block';
 import metadata from './block.json';
 import edit from './edit';
 import save from './save';
+import transforms from './transforms';
 
 const { name } = metadata;
 export { metadata, name };
@@ -35,6 +36,7 @@ export const settings = {
 	},
 	save,
 	edit,
+	transforms,
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/details/style.scss b/packages/block-library/src/details/style.scss
index 904e056d049de7..94b7043952c78a 100644
--- a/packages/block-library/src/details/style.scss
+++ b/packages/block-library/src/details/style.scss
@@ -1,6 +1,5 @@
 .wp-block-details {
 	box-sizing: border-box;
-	overflow: hidden;
 }
 
 .wp-block-details summary {
diff --git a/packages/block-library/src/details/transforms.js b/packages/block-library/src/details/transforms.js
new file mode 100644
index 00000000000000..e8a30dbe34759c
--- /dev/null
+++ b/packages/block-library/src/details/transforms.js
@@ -0,0 +1,26 @@
+/**
+ * WordPress dependencies
+ */
+import { createBlock, cloneBlock } from '@wordpress/blocks';
+
+export default {
+	from: [
+		{
+			type: 'block',
+			isMultiBlock: true,
+			blocks: [ '*' ],
+			isMatch( {}, blocks ) {
+				return ! (
+					blocks.length === 1 && blocks[ 0 ].name === 'core/details'
+				);
+			},
+			__experimentalConvert( blocks ) {
+				return createBlock(
+					'core/details',
+					{},
+					blocks.map( ( block ) => cloneBlock( block ) )
+				);
+			},
+		},
+	],
+};
diff --git a/packages/block-library/src/editor.scss b/packages/block-library/src/editor.scss
index e3642868034a5a..a16d5a6c2c69c7 100644
--- a/packages/block-library/src/editor.scss
+++ b/packages/block-library/src/editor.scss
@@ -1,7 +1,6 @@
 @import "./archives/editor.scss";
 @import "./audio/editor.scss";
 @import "./avatar/editor.scss";
-@import "./block/editor.scss";
 @import "./button/editor.scss";
 @import "./buttons/editor.scss";
 @import "./categories/editor.scss";
@@ -32,6 +31,7 @@
 @import "./nextpage/editor.scss";
 @import "./page-list/editor.scss";
 @import "./paragraph/editor.scss";
+@import "./post-author/editor.scss";
 @import "./post-excerpt/editor.scss";
 @import "./pullquote/editor.scss";
 @import "./rss/editor.scss";
@@ -45,6 +45,7 @@
 @import "./social-links/editor.scss";
 @import "./spacer/editor.scss";
 @import "./table/editor.scss";
+@import "./tag-cloud/editor.scss";
 @import "./template-part/editor.scss";
 @import "./text-columns/editor.scss";
 @import "./video/editor.scss";
@@ -54,7 +55,6 @@
 @import "./query-pagination-numbers/editor.scss";
 @import "./post-featured-image/editor.scss";
 @import "./post-comments-form/editor.scss";
-
 @import "./editor-elements.scss";
 
 :root .editor-styles-wrapper {
@@ -63,13 +63,6 @@
 	@include gradient-colors-deprecated();
 }
 
-// This CSS Custom Properties aren't used anymore as defaults,
-// but we still need to keep them for backward compatibility.
-:where(.editor-styles-wrapper) {
-	--wp--preset--font-size--normal: 16px;
-	--wp--preset--font-size--huge: 42px;
-}
-
 // Font sizes (not used now, kept because of backward compatibility).
 //
 // The reason we add the editor class wrapper here is
@@ -82,14 +75,6 @@
 	font-size: 42px;
 }
 
-:where(.editor-styles-wrapper) .has-normal-font-size {
-	font-size: var(--wp--preset--font-size--normal);
-}
-
-:where(.editor-styles-wrapper) .has-huge-font-size {
-	font-size: var(--wp--preset--font-size--huge);
-}
-
 /**
  * Editor Normalization Styles
  *
diff --git a/packages/block-library/src/embed/block.json b/packages/block-library/src/embed/block.json
index 9ca54db871db19..5bfb63b0fa9e94 100644
--- a/packages/block-library/src/embed/block.json
+++ b/packages/block-library/src/embed/block.json
@@ -9,21 +9,21 @@
 	"attributes": {
 		"url": {
 			"type": "string",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"caption": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "figcaption",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"type": {
 			"type": "string",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"providerNameSlug": {
 			"type": "string",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"allowResponsive": {
 			"type": "boolean",
@@ -32,18 +32,21 @@
 		"responsive": {
 			"type": "boolean",
 			"default": false,
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"previewable": {
 			"type": "boolean",
 			"default": true,
-			"__experimentalRole": "content"
+			"role": "content"
 		}
 	},
 	"supports": {
 		"align": true,
 		"spacing": {
 			"margin": true
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-embed-editor",
diff --git a/packages/block-library/src/embed/deprecated.js b/packages/block-library/src/embed/deprecated.js
index afa691ecb64e2c..2b55a87a0015b5 100644
--- a/packages/block-library/src/embed/deprecated.js
+++ b/packages/block-library/src/embed/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
@@ -26,7 +26,7 @@ const v2 = {
 			return null;
 		}
 
-		const className = classnames( 'wp-block-embed', {
+		const className = clsx( 'wp-block-embed', {
 			[ `is-type-${ type }` ]: type,
 			[ `is-provider-${ providerNameSlug }` ]: providerNameSlug,
 			[ `wp-block-embed-${ providerNameSlug }` ]: providerNameSlug,
@@ -52,7 +52,7 @@ const v1 = {
 			return null;
 		}
 
-		const embedClassName = classnames( 'wp-block-embed', {
+		const embedClassName = clsx( 'wp-block-embed', {
 			[ `is-type-${ type }` ]: type,
 			[ `is-provider-${ providerNameSlug }` ]: providerNameSlug,
 		} );
diff --git a/packages/block-library/src/embed/edit.js b/packages/block-library/src/embed/edit.js
index 2945fb0fbe888b..c0a10a20e31fc4 100644
--- a/packages/block-library/src/embed/edit.js
+++ b/packages/block-library/src/embed/edit.js
@@ -18,7 +18,7 @@ import EmbedPreview from './embed-preview';
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -30,6 +30,7 @@ import { useBlockProps } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
 import { View } from '@wordpress/primitives';
 import { getAuthority } from '@wordpress/url';
+import { Caption } from '../utils/caption';
 
 const EmbedEdit = ( props ) => {
 	const {
@@ -58,45 +59,51 @@ const EmbedEdit = ( props ) => {
 	const [ isEditingURL, setIsEditingURL ] = useState( false );
 	const { invalidateResolution } = useDispatch( coreStore );
 
-	const { preview, fetching, themeSupportsResponsive, cannotEmbed } =
-		useSelect(
-			( select ) => {
-				const {
-					getEmbedPreview,
-					isPreviewEmbedFallback,
-					isRequestingEmbedPreview,
-					getThemeSupports,
-				} = select( coreStore );
-				if ( ! attributesUrl ) {
-					return { fetching: false, cannotEmbed: false };
-				}
+	const {
+		preview,
+		fetching,
+		themeSupportsResponsive,
+		cannotEmbed,
+		hasResolved,
+	} = useSelect(
+		( select ) => {
+			const {
+				getEmbedPreview,
+				isPreviewEmbedFallback,
+				isRequestingEmbedPreview,
+				getThemeSupports,
+				hasFinishedResolution,
+			} = select( coreStore );
+			if ( ! attributesUrl ) {
+				return { fetching: false, cannotEmbed: false };
+			}
 
-				const embedPreview = getEmbedPreview( attributesUrl );
-				const previewIsFallback =
-					isPreviewEmbedFallback( attributesUrl );
+			const embedPreview = getEmbedPreview( attributesUrl );
+			const previewIsFallback = isPreviewEmbedFallback( attributesUrl );
 
-				// The external oEmbed provider does not exist. We got no type info and no html.
-				const badEmbedProvider =
-					embedPreview?.html === false &&
-					embedPreview?.type === undefined;
-				// Some WordPress URLs that can't be embedded will cause the API to return
-				// a valid JSON response with no HTML and `data.status` set to 404, rather
-				// than generating a fallback response as other embeds do.
-				const wordpressCantEmbed = embedPreview?.data?.status === 404;
-				const validPreview =
-					!! embedPreview &&
-					! badEmbedProvider &&
-					! wordpressCantEmbed;
-				return {
-					preview: validPreview ? embedPreview : undefined,
-					fetching: isRequestingEmbedPreview( attributesUrl ),
-					themeSupportsResponsive:
-						getThemeSupports()[ 'responsive-embeds' ],
-					cannotEmbed: ! validPreview || previewIsFallback,
-				};
-			},
-			[ attributesUrl ]
-		);
+			// The external oEmbed provider does not exist. We got no type info and no html.
+			const badEmbedProvider =
+				embedPreview?.html === false &&
+				embedPreview?.type === undefined;
+			// Some WordPress URLs that can't be embedded will cause the API to return
+			// a valid JSON response with no HTML and `data.status` set to 404, rather
+			// than generating a fallback response as other embeds do.
+			const wordpressCantEmbed = embedPreview?.data?.status === 404;
+			const validPreview =
+				!! embedPreview && ! badEmbedProvider && ! wordpressCantEmbed;
+			return {
+				preview: validPreview ? embedPreview : undefined,
+				fetching: isRequestingEmbedPreview( attributesUrl ),
+				themeSupportsResponsive:
+					getThemeSupports()[ 'responsive-embeds' ],
+				cannotEmbed: ! validPreview || previewIsFallback,
+				hasResolved: hasFinishedResolution( 'getEmbedPreview', [
+					attributesUrl,
+				] ),
+			};
+		},
+		[ attributesUrl ]
+	);
 
 	/**
 	 * Returns the attributes derived from the preview, merged with the current attributes.
@@ -127,16 +134,23 @@ const EmbedEdit = ( props ) => {
 	};
 
 	useEffect( () => {
-		if ( ! preview?.html || ! cannotEmbed || fetching ) {
+		if ( preview?.html || ! cannotEmbed || ! hasResolved ) {
 			return;
 		}
+
 		// At this stage, we're not fetching the preview and know it can't be embedded,
 		// so try removing any trailing slash, and resubmit.
 		const newURL = attributesUrl.replace( /\/$/, '' );
 		setURL( newURL );
 		setIsEditingURL( false );
 		setAttributes( { url: newURL } );
-	}, [ preview?.html, attributesUrl, cannotEmbed, fetching ] );
+	}, [
+		preview?.html,
+		attributesUrl,
+		cannotEmbed,
+		hasResolved,
+		setAttributes,
+	] );
 
 	// Try a different provider in case the embed url is not supported.
 	useEffect( () => {
@@ -212,7 +226,7 @@ const EmbedEdit = ( props ) => {
 					} }
 					value={ url }
 					cannotEmbed={ cannotEmbed }
-					onChange={ ( event ) => setURL( event.target.value ) }
+					onChange={ ( value ) => setURL( value ) }
 					fallback={ () => fallback( url, onReplace ) }
 					tryAgain={ () => {
 						invalidateResolution( 'getEmbedPreview', [ url ] );
@@ -236,7 +250,7 @@ const EmbedEdit = ( props ) => {
 		allowResponsive,
 		className: classFromPreview,
 	} = getMergedAttributes();
-	const className = classnames( classFromPreview, props.className );
+	const className = clsx( classFromPreview, props.className );
 
 	return (
 		<>
@@ -248,7 +262,15 @@ const EmbedEdit = ( props ) => {
 				toggleResponsive={ toggleResponsive }
 				switchBackToURLInput={ () => setIsEditingURL( true ) }
 			/>
-			<View { ...blockProps }>
+			<figure
+				{ ...blockProps }
+				className={ clsx( blockProps.className, className, {
+					[ `is-type-${ type }` ]: type,
+					[ `is-provider-${ providerNameSlug }` ]: providerNameSlug,
+					[ `wp-block-embed-${ providerNameSlug }` ]:
+						providerNameSlug,
+				} ) }
+			>
 				<EmbedPreview
 					preview={ preview }
 					previewable={ previewable }
@@ -263,8 +285,18 @@ const EmbedEdit = ( props ) => {
 					icon={ icon }
 					label={ label }
 					insertBlocksAfter={ insertBlocksAfter }
+					attributes={ attributes }
+					setAttributes={ setAttributes }
 				/>
-			</View>
+				<Caption
+					attributes={ attributes }
+					setAttributes={ setAttributes }
+					isSelected={ isSelected }
+					insertBlocksAfter={ insertBlocksAfter }
+					label={ __( 'Embed caption text' ) }
+					showToolbarButton={ isSelected }
+				/>
+			</figure>
 		</>
 	);
 };
diff --git a/packages/block-library/src/embed/edit.native.js b/packages/block-library/src/embed/edit.native.js
index a04e49fbd6d54e..2144d2f2eba729 100644
--- a/packages/block-library/src/embed/edit.native.js
+++ b/packages/block-library/src/embed/edit.native.js
@@ -19,7 +19,7 @@ import EmbedLinkSettings from './embed-link-settings';
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -246,7 +246,7 @@ const EmbedEdit = ( props ) => {
 		allowResponsive,
 		className: classFromPreview,
 	} = getMergedAttributes();
-	const className = classnames( classFromPreview, props.className );
+	const className = clsx( classFromPreview, props.className );
 
 	const isProviderPreviewable =
 		PREVIEWABLE_PROVIDERS.includes( providerNameSlug ) ||
diff --git a/packages/block-library/src/embed/editor.scss b/packages/block-library/src/embed/editor.scss
index 368784c22f38ab..eda859eee9040c 100644
--- a/packages/block-library/src/embed/editor.scss
+++ b/packages/block-library/src/embed/editor.scss
@@ -12,13 +12,21 @@
 		justify-content: center;
 	}
 
+	.wp-block-embed__placeholder-input {
+		flex: 1 1 auto;
+	}
+
 	// Stops long URLs from breaking out of the no preview available screen
 	.components-placeholder__error {
 		word-break: break-word;
 	}
+}
 
-	.components-placeholder__learn-more {
-		margin-top: 1em;
+.wp-block-embed__learn-more {
+	@at-root .wp-block-post-content & {
+		a {
+			color: var(--wp-admin-theme-color);
+		}
 	}
 }
 
diff --git a/packages/block-library/src/embed/embed-no-preview.native.js b/packages/block-library/src/embed/embed-no-preview.native.js
index cac8c5d1a4c10d..de97ca73a1618a 100644
--- a/packages/block-library/src/embed/embed-no-preview.native.js
+++ b/packages/block-library/src/embed/embed-no-preview.native.js
@@ -124,7 +124,7 @@ const EmbedNoPreview = ( {
 	const embedNoProviderPreview = (
 		<>
 			<TouchableWithoutFeedback
-				accessibilityRole={ 'button' }
+				accessibilityRole="button"
 				accessibilityHint={ previewButtonA11yHint }
 				disabled={ ! isSelected }
 				onPress={ onPressContainer }
@@ -145,7 +145,7 @@ const EmbedNoPreview = ( {
 					<TouchableOpacity
 						accessibilityHint={ __( 'Tap here to show help' ) }
 						accessibilityLabel={ __( 'Help button' ) }
-						accessibilityRole={ 'button' }
+						accessibilityRole="button"
 						disabled={ ! isSelected }
 						onPress={ onPressHelp }
 						style={ helpIconStyle }
diff --git a/packages/block-library/src/embed/embed-placeholder.js b/packages/block-library/src/embed/embed-placeholder.js
index 5b9191c3446a79..1626aca5c9c9cb 100644
--- a/packages/block-library/src/embed/embed-placeholder.js
+++ b/packages/block-library/src/embed/embed-placeholder.js
@@ -2,7 +2,14 @@
  * WordPress dependencies
  */
 import { __, _x } from '@wordpress/i18n';
-import { Button, Placeholder, ExternalLink } from '@wordpress/components';
+import {
+	Button,
+	Placeholder,
+	ExternalLink,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	__experimentalInputControl as InputControl,
+} from '@wordpress/components';
 import { BlockIcon } from '@wordpress/block-editor';
 
 const EmbedPlaceholder = ( {
@@ -25,19 +32,21 @@ const EmbedPlaceholder = ( {
 			) }
 		>
 			<form onSubmit={ onSubmit }>
-				<input
+				<InputControl
+					__next40pxDefaultSize
 					type="url"
 					value={ value || '' }
-					className="components-placeholder__input"
-					aria-label={ label }
+					className="wp-block-embed__placeholder-input"
+					label={ label }
+					hideLabelFromVision
 					placeholder={ __( 'Enter URL to embed here…' ) }
 					onChange={ onChange }
 				/>
-				<Button variant="primary" type="submit">
+				<Button __next40pxDefaultSize variant="primary" type="submit">
 					{ _x( 'Embed', 'button label' ) }
 				</Button>
 			</form>
-			<div className="components-placeholder__learn-more">
+			<div className="wp-block-embed__learn-more">
 				<ExternalLink
 					href={ __(
 						'https://wordpress.org/documentation/article/embeds/'
@@ -47,17 +56,31 @@ const EmbedPlaceholder = ( {
 				</ExternalLink>
 			</div>
 			{ cannotEmbed && (
-				<div className="components-placeholder__error">
+				<VStack spacing={ 3 } className="components-placeholder__error">
 					<div className="components-placeholder__instructions">
 						{ __( 'Sorry, this content could not be embedded.' ) }
 					</div>
-					<Button variant="secondary" onClick={ tryAgain }>
-						{ _x( 'Try again', 'button label' ) }
-					</Button>{ ' ' }
-					<Button variant="secondary" onClick={ fallback }>
-						{ _x( 'Convert to link', 'button label' ) }
-					</Button>
-				</div>
+					<HStack
+						expanded={ false }
+						spacing={ 3 }
+						justify="flex-start"
+					>
+						<Button
+							__next40pxDefaultSize
+							variant="secondary"
+							onClick={ tryAgain }
+						>
+							{ _x( 'Try again', 'button label' ) }
+						</Button>{ ' ' }
+						<Button
+							__next40pxDefaultSize
+							variant="secondary"
+							onClick={ fallback }
+						>
+							{ _x( 'Convert to link', 'button label' ) }
+						</Button>
+					</HStack>
+				</VStack>
 			) }
 		</Placeholder>
 	);
diff --git a/packages/block-library/src/embed/embed-placeholder.native.js b/packages/block-library/src/embed/embed-placeholder.native.js
index 35b71b3ab988e1..9d0dfff3cf2840 100644
--- a/packages/block-library/src/embed/embed-placeholder.native.js
+++ b/packages/block-library/src/embed/embed-placeholder.native.js
@@ -125,7 +125,7 @@ const EmbedPlaceholder = ( {
 						</Text>
 						<TouchableOpacity
 							activeOpacity={ 0.5 }
-							accessibilityRole={ 'button' }
+							accessibilityRole="button"
 							accessibilityHint={ __(
 								'Double tap to view embed options.'
 							) }
@@ -155,7 +155,7 @@ const EmbedPlaceholder = ( {
 						</View>
 						<TouchableOpacity
 							activeOpacity={ 0.5 }
-							accessibilityRole={ 'button' }
+							accessibilityRole="button"
 							accessibilityHint={ __(
 								'Double tap to add a link.'
 							) }
diff --git a/packages/block-library/src/embed/embed-preview.js b/packages/block-library/src/embed/embed-preview.js
index 017fac72f6637e..c0c7d5942d1d78 100644
--- a/packages/block-library/src/embed/embed-preview.js
+++ b/packages/block-library/src/embed/embed-preview.js
@@ -6,162 +6,114 @@ import { getPhotoHtml } from './util';
 /**
  * External dependencies
  */
-import classnames from 'classnames/dedupe';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { __, sprintf } from '@wordpress/i18n';
 import { Placeholder, SandBox } from '@wordpress/components';
-import {
-	RichText,
-	BlockIcon,
-	__experimentalGetElementClassName,
-} from '@wordpress/block-editor';
-import { Component } from '@wordpress/element';
-import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
+import { BlockIcon } from '@wordpress/block-editor';
+import { useState } from '@wordpress/element';
+import { getAuthority } from '@wordpress/url';
 
 /**
  * Internal dependencies
  */
 import WpEmbedPreview from './wp-embed-preview';
 
-class EmbedPreview extends Component {
-	constructor() {
-		super( ...arguments );
-		this.hideOverlay = this.hideOverlay.bind( this );
-		this.state = {
-			interactive: false,
-		};
-	}
-
-	static getDerivedStateFromProps( nextProps, state ) {
-		if ( ! nextProps.isSelected && state.interactive ) {
-			// We only want to change this when the block is not selected, because changing it when
-			// the block becomes selected makes the overlap disappear too early. Hiding the overlay
-			// happens on mouseup when the overlay is clicked.
-			return { interactive: false };
-		}
+export default function EmbedPreview( {
+	preview,
+	previewable,
+	url,
+	type,
+	isSelected,
+	className,
+	icon,
+	label,
+} ) {
+	const [ interactive, setInteractive ] = useState( false );
 
-		return null;
+	if ( ! isSelected && interactive ) {
+		// We only want to change this when the block is not selected, because changing it when
+		// the block becomes selected makes the overlap disappear too early. Hiding the overlay
+		// happens on mouseup when the overlay is clicked.
+		setInteractive( false );
 	}
 
-	hideOverlay() {
+	const hideOverlay = () => {
 		// This is called onMouseUp on the overlay. We can't respond to the `isSelected` prop
 		// changing, because that happens on mouse down, and the overlay immediately disappears,
 		// and the mouse event can end up in the preview content. We can't use onClick on
 		// the overlay to hide it either, because then the editor misses the mouseup event, and
 		// thinks we're multi-selecting blocks.
-		this.setState( { interactive: true } );
-	}
+		setInteractive( true );
+	};
 
-	render() {
-		const {
-			preview,
-			previewable,
-			url,
-			type,
-			caption,
-			onCaptionChange,
-			isSelected,
-			className,
-			icon,
-			label,
-			insertBlocksAfter,
-		} = this.props;
-		const { scripts } = preview;
-		const { interactive } = this.state;
+	const { scripts } = preview;
 
-		const html = 'photo' === type ? getPhotoHtml( preview ) : preview.html;
-		const parsedHost = new URL( url ).host.split( '.' );
-		const parsedHostBaseUrl = parsedHost
-			.splice( parsedHost.length - 2, parsedHost.length - 1 )
-			.join( '.' );
-		const iframeTitle = sprintf(
-			// translators: %s: host providing embed content e.g: www.youtube.com
-			__( 'Embedded content from %s' ),
-			parsedHostBaseUrl
-		);
-		const sandboxClassnames = classnames(
-			type,
-			className,
-			'wp-block-embed__wrapper'
-		);
+	const html = 'photo' === type ? getPhotoHtml( preview ) : preview.html;
+	const embedSourceUrl = getAuthority( url );
+	const iframeTitle = sprintf(
+		// translators: %s: host providing embed content e.g: www.youtube.com
+		__( 'Embedded content from %s' ),
+		embedSourceUrl
+	);
+	const sandboxClassnames = clsx(
+		type,
+		className,
+		'wp-block-embed__wrapper'
+	);
 
-		// Disabled because the overlay div doesn't actually have a role or functionality
-		// as far as the user is concerned. We're just catching the first click so that
-		// the block can be selected without interacting with the embed preview that the overlay covers.
-		/* eslint-disable jsx-a11y/no-static-element-interactions */
-		const embedWrapper =
-			'wp-embed' === type ? (
-				<WpEmbedPreview html={ html } />
-			) : (
-				<div className="wp-block-embed__wrapper">
-					<SandBox
-						html={ html }
-						scripts={ scripts }
-						title={ iframeTitle }
-						type={ sandboxClassnames }
-						onFocus={ this.hideOverlay }
+	// Disabled because the overlay div doesn't actually have a role or functionality
+	// as far as the user is concerned. We're just catching the first click so that
+	// the block can be selected without interacting with the embed preview that the overlay covers.
+	/* eslint-disable jsx-a11y/no-static-element-interactions */
+	const embedWrapper =
+		'wp-embed' === type ? (
+			<WpEmbedPreview html={ html } />
+		) : (
+			<div className="wp-block-embed__wrapper">
+				<SandBox
+					html={ html }
+					scripts={ scripts }
+					title={ iframeTitle }
+					type={ sandboxClassnames }
+					onFocus={ hideOverlay }
+				/>
+				{ ! interactive && (
+					<div
+						className="block-library-embed__interactive-overlay"
+						onMouseUp={ hideOverlay }
 					/>
-					{ ! interactive && (
-						<div
-							className="block-library-embed__interactive-overlay"
-							onMouseUp={ this.hideOverlay }
-						/>
-					) }
-				</div>
-			);
-		/* eslint-enable jsx-a11y/no-static-element-interactions */
-
-		return (
-			<figure
-				className={ classnames( className, 'wp-block-embed', {
-					'is-type-video': 'video' === type,
-				} ) }
-			>
-				{ previewable ? (
-					embedWrapper
-				) : (
-					<Placeholder
-						icon={ <BlockIcon icon={ icon } showColors /> }
-						label={ label }
-					>
-						<p className="components-placeholder__error">
-							<a href={ url }>{ url }</a>
-						</p>
-						<p className="components-placeholder__error">
-							{ sprintf(
-								/* translators: %s: host providing embed content e.g: www.youtube.com */
-								__(
-									"Embedded content from %s can't be previewed in the editor."
-								),
-								parsedHostBaseUrl
-							) }
-						</p>
-					</Placeholder>
 				) }
-				{ ( ! RichText.isEmpty( caption ) || isSelected ) && (
-					<RichText
-						identifier="caption"
-						tagName="figcaption"
-						className={ __experimentalGetElementClassName(
-							'caption'
-						) }
-						placeholder={ __( 'Add caption' ) }
-						value={ caption }
-						onChange={ onCaptionChange }
-						inlineToolbar
-						__unstableOnSplitAtEnd={ () =>
-							insertBlocksAfter(
-								createBlock( getDefaultBlockName() )
-							)
-						}
-					/>
-				) }
-			</figure>
+			</div>
 		);
-	}
-}
+	/* eslint-enable jsx-a11y/no-static-element-interactions */
 
-export default EmbedPreview;
+	return (
+		<>
+			{ previewable ? (
+				embedWrapper
+			) : (
+				<Placeholder
+					icon={ <BlockIcon icon={ icon } showColors /> }
+					label={ label }
+				>
+					<p className="components-placeholder__error">
+						<a href={ url }>{ url }</a>
+					</p>
+					<p className="components-placeholder__error">
+						{ sprintf(
+							/* translators: %s: host providing embed content e.g: www.youtube.com */
+							__(
+								"Embedded content from %s can't be previewed in the editor."
+							),
+							embedSourceUrl
+						) }
+					</p>
+				</Placeholder>
+			) }
+		</>
+	);
+}
diff --git a/packages/block-library/src/embed/embed-preview.native.js b/packages/block-library/src/embed/embed-preview.native.js
index f4baf978710597..d692b6cd58563a 100644
--- a/packages/block-library/src/embed/embed-preview.native.js
+++ b/packages/block-library/src/embed/embed-preview.native.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { TouchableWithoutFeedback } from 'react-native';
-import classnames from 'classnames/dedupe';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -86,7 +86,7 @@ const EmbedPreview = ( {
 		__( 'Embedded content from %s' ),
 		parsedHostBaseUrl
 	);
-	const sandboxClassnames = classnames(
+	const sandboxClassnames = clsx(
 		type,
 		className,
 		'wp-block-embed__wrapper'
diff --git a/packages/block-library/src/embed/icons.js b/packages/block-library/src/embed/icons.js
index 21a3b20ae278ad..2e9386373f083a 100644
--- a/packages/block-library/src/embed/icons.js
+++ b/packages/block-library/src/embed/icons.js
@@ -178,3 +178,12 @@ export const embedPocketCastsIcon = {
 		</SVG>
 	),
 };
+
+export const embedBlueskyIcon = (
+	<SVG viewBox="0 0 24 24">
+		<Path
+			fill="#0a7aff"
+			d="M6.3,4.2c2.3,1.7,4.8,5.3,5.7,7.2.9-1.9,3.4-5.4,5.7-7.2,1.7-1.3,4.3-2.2,4.3.9s-.4,5.2-.6,5.9c-.7,2.6-3.3,3.2-5.6,2.8,4,.7,5.1,3,2.9,5.3-5,5.2-6.7-2.8-6.7-2.8,0,0-1.7,8-6.7,2.8-2.2-2.3-1.2-4.6,2.9-5.3-2.3.4-4.9-.3-5.6-2.8-.2-.7-.6-5.3-.6-5.9,0-3.1,2.7-2.1,4.3-.9h0Z"
+		/>
+	</SVG>
+);
diff --git a/packages/block-library/src/embed/save.js b/packages/block-library/src/embed/save.js
index cb52b22b9b7448..8f825d5cabc040 100644
--- a/packages/block-library/src/embed/save.js
+++ b/packages/block-library/src/embed/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames/dedupe';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -19,7 +19,7 @@ export default function save( { attributes } ) {
 		return null;
 	}
 
-	const className = classnames( 'wp-block-embed', {
+	const className = clsx( 'wp-block-embed', {
 		[ `is-type-${ type }` ]: type,
 		[ `is-provider-${ providerNameSlug }` ]: providerNameSlug,
 		[ `wp-block-embed-${ providerNameSlug }` ]: providerNameSlug,
diff --git a/packages/block-library/src/embed/style.scss b/packages/block-library/src/embed/style.scss
index 31e248ec006dc8..2776b404b853e1 100644
--- a/packages/block-library/src/embed/style.scss
+++ b/packages/block-library/src/embed/style.scss
@@ -25,7 +25,7 @@
 	// Supply caption styles to embeds, even if the theme hasn't opted in.
 	// Reason being: the new markup, figcaptions, are not likely to be styled in the majority of existing themes,
 	// so we supply the styles so as to not appear broken or unstyled in those.
-	figcaption {
+	:where(figcaption) {
 		@include caption-style();
 	}
 
diff --git a/packages/block-library/src/embed/test/__snapshots__/index.native.js.snap b/packages/block-library/src/embed/test/__snapshots__/index.native.js.snap
index 5f1889dfa4aaf7..2979ef0324592f 100644
--- a/packages/block-library/src/embed/test/__snapshots__/index.native.js.snap
+++ b/packages/block-library/src/embed/test/__snapshots__/index.native.js.snap
@@ -106,21 +106,21 @@ exports[`Embed block edit URL sets empty state when setting an empty URL 1`] = `
 
 exports[`Embed block insert via slash inserter insert generic embed block 1`] = `"<!-- wp:embed /-->"`;
 
-exports[`Embed block insert via slash inserter inserts Twitter embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"twitter","responsive":true} /-->"`;
+exports[`Embed block insert via slash inserter inserts Twitter Embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"twitter","responsive":true} /-->"`;
 
-exports[`Embed block insert via slash inserter inserts Vimeo embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"vimeo","responsive":true} /-->"`;
+exports[`Embed block insert via slash inserter inserts Vimeo Embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"vimeo","responsive":true} /-->"`;
 
-exports[`Embed block insert via slash inserter inserts WordPress embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"wordpress"} /-->"`;
+exports[`Embed block insert via slash inserter inserts WordPress Embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"wordpress"} /-->"`;
 
-exports[`Embed block insert via slash inserter inserts YouTube embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"youtube","responsive":true} /-->"`;
+exports[`Embed block insert via slash inserter inserts YouTube Embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"youtube","responsive":true} /-->"`;
 
-exports[`Embed block insertion inserts Twitter embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"twitter","responsive":true} /-->"`;
+exports[`Embed block insertion inserts Twitter Embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"twitter","responsive":true} /-->"`;
 
-exports[`Embed block insertion inserts Vimeo embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"vimeo","responsive":true} /-->"`;
+exports[`Embed block insertion inserts Vimeo Embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"vimeo","responsive":true} /-->"`;
 
-exports[`Embed block insertion inserts WordPress embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"wordpress"} /-->"`;
+exports[`Embed block insertion inserts WordPress Embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"wordpress"} /-->"`;
 
-exports[`Embed block insertion inserts YouTube embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"youtube","responsive":true} /-->"`;
+exports[`Embed block insertion inserts YouTube Embed block 1`] = `"<!-- wp:embed {"providerNameSlug":"youtube","responsive":true} /-->"`;
 
 exports[`Embed block insertion inserts generic embed block 1`] = `"<!-- wp:embed /-->"`;
 
diff --git a/packages/block-library/src/embed/test/index.js b/packages/block-library/src/embed/test/index.js
index 1ae85105ad7c3b..7cc3645611ea78 100644
--- a/packages/block-library/src/embed/test/index.js
+++ b/packages/block-library/src/embed/test/index.js
@@ -200,7 +200,7 @@ describe( 'utils', () => {
 			expect( getEmbedInfoByProvider( 'instagram' ) ).toEqual(
 				expect.objectContaining( {
 					icon: embedInstagramIcon,
-					title: 'Instagram',
+					title: 'Instagram Embed',
 				} )
 			);
 		} );
diff --git a/packages/block-library/src/embed/test/index.native.js b/packages/block-library/src/embed/test/index.native.js
index 1b456c668a9c52..59e4cfe51fccec 100644
--- a/packages/block-library/src/embed/test/index.native.js
+++ b/packages/block-library/src/embed/test/index.native.js
@@ -230,7 +230,7 @@ describe( 'Embed block', () => {
 		} );
 
 		MOST_USED_PROVIDERS.forEach( ( { title } ) =>
-			it( `inserts ${ title } embed block`, async () => {
+			it( `inserts ${ title } block`, async () => {
 				const { block } = await insertEmbedBlock( title );
 				const blockName = within( block ).getByText( title );
 
@@ -285,10 +285,10 @@ describe( 'Embed block', () => {
 			const blockSettingsModal = await editor.findByTestId(
 				'block-settings-modal'
 			);
-			// Get Twitter link field.
+			// Get Twitter Embed link field.
 			const twitterLinkField = within(
 				blockSettingsModal
-			).getByLabelText( `Twitter link, ${ expectedURL }` );
+			).getByLabelText( `Twitter Embed link, ${ expectedURL }` );
 
 			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
@@ -321,10 +321,10 @@ describe( 'Embed block', () => {
 			const blockSettingsModal = await editor.findByTestId(
 				'block-settings-modal'
 			);
-			// Get Twitter link field.
+			// Get Twitter Embed link field.
 			const twitterLinkField = within(
 				blockSettingsModal
-			).getByLabelText( `Twitter link, ${ clipboardURL }` );
+			).getByLabelText( `Twitter Embed link, ${ clipboardURL }` );
 
 			expect( autopastedLinkField ).toBeDefined();
 			expect( twitterLinkField ).toBeDefined();
@@ -383,10 +383,10 @@ describe( 'Embed block', () => {
 			const blockSettingsModal = await editor.findByTestId(
 				'block-settings-modal'
 			);
-			// Get Twitter link field.
+			// Get Twitter Embed link field.
 			const twitterLinkField = within(
 				blockSettingsModal
-			).getByLabelText( `Twitter link, ${ expectedURL }` );
+			).getByLabelText( `Twitter Embed link, ${ expectedURL }` );
 
 			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
@@ -422,10 +422,10 @@ describe( 'Embed block', () => {
 			const blockSettingsModal = await editor.findByTestId(
 				'block-settings-modal'
 			);
-			// Get Twitter link field.
+			// Get Twitter Embed link field.
 			const twitterLinkField = within(
 				blockSettingsModal
-			).getByLabelText( `Twitter link, ${ clipboardURL }` );
+			).getByLabelText( `Twitter Embed link, ${ clipboardURL }` );
 
 			expect( embedLink ).toBeDefined();
 			expect( twitterLinkField ).toBeDefined();
@@ -472,10 +472,10 @@ describe( 'Embed block', () => {
 			);
 			await waitForModalVisible( blockSettingsModal );
 
-			// Start editing link.
+			// Start editing Embed link.
 			fireEvent.press(
 				within( blockSettingsModal ).getByLabelText(
-					`Twitter link, ${ initialURL }`
+					`Twitter Embed link, ${ initialURL }`
 				)
 			);
 
@@ -491,10 +491,10 @@ describe( 'Embed block', () => {
 			await waitFor( () => editor.UNSAFE_getByType( WebView ) );
 			await editor.findByText( 'Media settings' );
 
-			// Get YouTube link field.
+			// Get YouTube Embed link field.
 			const youtubeLinkField = await within(
 				blockSettingsModal
-			).findByLabelText( `YouTube link, ${ expectedURL }` );
+			).findByLabelText( `YouTube Embed link, ${ expectedURL }` );
 
 			expect( youtubeLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
@@ -519,7 +519,7 @@ describe( 'Embed block', () => {
 			// Start editing link.
 			fireEvent.press(
 				within( blockSettingsModal ).getByLabelText(
-					`Twitter link, ${ previousURL }`
+					`Twitter Embed link, ${ previousURL }`
 				)
 			);
 
@@ -557,7 +557,7 @@ describe( 'Embed block', () => {
 			// Start editing link.
 			fireEvent.press(
 				within( blockSettingsModal ).getByLabelText(
-					`Twitter link, ${ previousURL }`
+					`Twitter Embed link, ${ previousURL }`
 				)
 			);
 
@@ -661,10 +661,10 @@ describe( 'Embed block', () => {
 			fireEvent( blockSettingsModal, 'backdropPress' );
 			fireEvent( blockSettingsModal, MODAL_DISMISS_EVENT );
 
-			// Get Twitter link field.
+			// Get Twitter Embed link field.
 			const twitterLinkField = await within(
 				blockSettingsModal
-			).findByLabelText( `Twitter link, ${ expectedURL }` );
+			).findByLabelText( `Twitter Embed link, ${ expectedURL }` );
 
 			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
@@ -728,10 +728,10 @@ describe( 'Embed block', () => {
 			const blockSettingsModal = await editor.findByTestId(
 				'block-settings-modal'
 			);
-			// Get Twitter link field.
+			// Get Twitter Embed link field.
 			const twitterLinkField = within(
 				blockSettingsModal
-			).getByLabelText( `Twitter link, ${ expectedURL }` );
+			).getByLabelText( `Twitter Embed link, ${ expectedURL }` );
 
 			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
@@ -811,10 +811,10 @@ describe( 'Embed block', () => {
 			const blockSettingsModal = await editor.findByTestId(
 				'block-settings-modal'
 			);
-			// Get Twitter link field.
+			// Get Twitter embed link field.
 			const twitterLinkField = within(
 				blockSettingsModal
-			).getByLabelText( `Twitter link, ${ successURL }` );
+			).getByLabelText( `Twitter Embed link, ${ successURL }` );
 
 			expect( twitterLinkField ).toBeDefined();
 			expect( getEditorHtml() ).toMatchSnapshot();
@@ -1000,8 +1000,9 @@ describe( 'Embed block', () => {
 		} );
 
 		MOST_USED_PROVIDERS.forEach( ( { title } ) =>
-			it( `inserts ${ title } embed block`, async () => {
-				const embedBlockSlashInserter = `/${ title }`;
+			it( `inserts ${ title } block`, async () => {
+				// Get just the first word of the title ("Twitter") as the full title ("Twitter Embed") breaks the test.
+				const embedBlockSlashInserter = `/${ title.split( ' ' )[ 0 ] }`;
 				const editor = await initializeEditor( {
 					initialHtml: EMPTY_PARAGRAPH_HTML,
 				} );
diff --git a/packages/block-library/src/embed/theme.scss b/packages/block-library/src/embed/theme.scss
index e809a783b9c810..81bcb9972f3c38 100644
--- a/packages/block-library/src/embed/theme.scss
+++ b/packages/block-library/src/embed/theme.scss
@@ -1,4 +1,4 @@
-.wp-block-embed figcaption {
+.wp-block-embed :where(figcaption) {
 	@include caption-style-theme();
 }
 
diff --git a/packages/block-library/src/embed/util.js b/packages/block-library/src/embed/util.js
index a7a6ea219f2772..eae45cc397e7b7 100644
--- a/packages/block-library/src/embed/util.js
+++ b/packages/block-library/src/embed/util.js
@@ -1,13 +1,13 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames/dedupe';
+import clsx from 'clsx';
 import memoize from 'memize';
 
 /**
  * WordPress dependencies
  */
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
 import { renderToString } from '@wordpress/element';
 import {
 	createBlock,
@@ -23,7 +23,7 @@ import { ASPECT_RATIOS, WP_EMBED_TYPE } from './constants';
 import { unlock } from '../lock-unlock';
 
 const { name: DEFAULT_EMBED_BLOCK } = metadata;
-const { kebabCase } = unlock( blockEditorPrivateApis );
+const { kebabCase } = unlock( componentsPrivateApis );
 
 /** @typedef {import('@wordpress/blocks').WPBlockVariation} WPBlockVariation */
 
@@ -98,7 +98,9 @@ export const createUpgradedEmbedBlock = (
 	const { preview, attributes = {} } = props;
 	const { url, providerNameSlug, type, ...restAttributes } = attributes;
 
-	if ( ! url || ! getBlockType( DEFAULT_EMBED_BLOCK ) ) return;
+	if ( ! url || ! getBlockType( DEFAULT_EMBED_BLOCK ) ) {
+		return;
+	}
 
 	const matchedBlock = findMoreSuitableBlock( url );
 
@@ -176,17 +178,21 @@ export const removeAspectRatioClasses = ( existingClassNames ) => {
 	if ( ! existingClassNames ) {
 		// Avoids extraneous work and also, by returning the same value as
 		// received, ensures the post is not dirtied by a change of the block
-		// attribute from `undefined` to an emtpy string.
+		// attribute from `undefined` to an empty string.
 		return existingClassNames;
 	}
 	const aspectRatioClassNames = ASPECT_RATIOS.reduce(
 		( accumulator, { className } ) => {
-			accumulator[ className ] = false;
+			accumulator.push( className );
 			return accumulator;
 		},
-		{ 'wp-has-aspect-ratio': false }
+		[ 'wp-has-aspect-ratio' ]
 	);
-	return classnames( existingClassNames, aspectRatioClassNames );
+	let outputClassNames = existingClassNames;
+	for ( const className of aspectRatioClassNames ) {
+		outputClassNames = outputClassNames.replace( className, '' );
+	}
+	return outputClassNames.trim();
 };
 
 /**
@@ -229,7 +235,7 @@ export function getClassNames(
 					return removeAspectRatioClasses( existingClassNames );
 				}
 				// Close aspect ratio match found.
-				return classnames(
+				return clsx(
 					removeAspectRatioClasses( existingClassNames ),
 					potentialRatio.className,
 					'wp-has-aspect-ratio'
diff --git a/packages/block-library/src/embed/variations.js b/packages/block-library/src/embed/variations.js
index 66cd266b060d9d..82a4159e13b327 100644
--- a/packages/block-library/src/embed/variations.js
+++ b/packages/block-library/src/embed/variations.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -27,10 +27,19 @@ import {
 	embedPinterestIcon,
 	embedWolframIcon,
 	embedPocketCastsIcon,
+	embedBlueskyIcon,
 } from './icons';
 
 /** @typedef {import('@wordpress/blocks').WPBlockVariation} WPBlockVariation */
 
+function getTitle( providerName ) {
+	return sprintf(
+		/* translators: %s: provider name */
+		__( '%s Embed' ),
+		providerName
+	);
+}
+
 /**
  * The embed provider services.
  *
@@ -39,7 +48,7 @@ import {
 const variations = [
 	{
 		name: 'twitter',
-		title: 'Twitter',
+		title: getTitle( 'Twitter' ),
 		icon: embedTwitterIcon,
 		keywords: [ 'tweet', __( 'social' ) ],
 		description: __( 'Embed a tweet.' ),
@@ -48,7 +57,7 @@ const variations = [
 	},
 	{
 		name: 'youtube',
-		title: 'YouTube',
+		title: getTitle( 'YouTube' ),
 		icon: embedYouTubeIcon,
 		keywords: [ __( 'music' ), __( 'video' ) ],
 		description: __( 'Embed a YouTube video.' ),
@@ -62,7 +71,7 @@ const variations = [
 		// Deprecate Facebook Embed per FB policy
 		// See: https://developers.facebook.com/docs/plugins/oembed-legacy
 		name: 'facebook',
-		title: 'Facebook',
+		title: getTitle( 'Facebook' ),
 		icon: embedFacebookIcon,
 		keywords: [ __( 'social' ) ],
 		description: __( 'Embed a Facebook post.' ),
@@ -78,7 +87,7 @@ const variations = [
 		// Deprecate Instagram per FB policy
 		// See: https://developers.facebook.com/docs/instagram/oembed-legacy
 		name: 'instagram',
-		title: 'Instagram',
+		title: getTitle( 'Instagram' ),
 		icon: embedInstagramIcon,
 		keywords: [ __( 'image' ), __( 'social' ) ],
 		description: __( 'Embed an Instagram post.' ),
@@ -88,7 +97,7 @@ const variations = [
 	},
 	{
 		name: 'wordpress',
-		title: 'WordPress',
+		title: getTitle( 'WordPress' ),
 		icon: embedWordPressIcon,
 		keywords: [ __( 'post' ), __( 'blog' ) ],
 		description: __( 'Embed a WordPress post.' ),
@@ -98,7 +107,7 @@ const variations = [
 	},
 	{
 		name: 'soundcloud',
-		title: 'SoundCloud',
+		title: getTitle( 'SoundCloud' ),
 		icon: embedAudioIcon,
 		keywords: [ __( 'music' ), __( 'audio' ) ],
 		description: __( 'Embed SoundCloud content.' ),
@@ -107,7 +116,7 @@ const variations = [
 	},
 	{
 		name: 'spotify',
-		title: 'Spotify',
+		title: getTitle( 'Spotify' ),
 		icon: embedSpotifyIcon,
 		keywords: [ __( 'music' ), __( 'audio' ) ],
 		description: __( 'Embed Spotify content.' ),
@@ -116,7 +125,7 @@ const variations = [
 	},
 	{
 		name: 'flickr',
-		title: 'Flickr',
+		title: getTitle( 'Flickr' ),
 		icon: embedFlickrIcon,
 		keywords: [ __( 'image' ) ],
 		description: __( 'Embed Flickr content.' ),
@@ -128,7 +137,7 @@ const variations = [
 	},
 	{
 		name: 'vimeo',
-		title: 'Vimeo',
+		title: getTitle( 'Vimeo' ),
 		icon: embedVimeoIcon,
 		keywords: [ __( 'video' ) ],
 		description: __( 'Embed a Vimeo video.' ),
@@ -137,7 +146,7 @@ const variations = [
 	},
 	{
 		name: 'animoto',
-		title: 'Animoto',
+		title: getTitle( 'Animoto' ),
 		icon: embedAnimotoIcon,
 		description: __( 'Embed an Animoto video.' ),
 		patterns: [ /^https?:\/\/(www\.)?(animoto|video214)\.com\/.+/i ],
@@ -145,7 +154,7 @@ const variations = [
 	},
 	{
 		name: 'cloudup',
-		title: 'Cloudup',
+		title: getTitle( 'Cloudup' ),
 		icon: embedContentIcon,
 		description: __( 'Embed Cloudup content.' ),
 		patterns: [ /^https?:\/\/cloudup\.com\/.+/i ],
@@ -154,7 +163,7 @@ const variations = [
 	{
 		// Deprecated since CollegeHumor content is now powered by YouTube.
 		name: 'collegehumor',
-		title: 'CollegeHumor',
+		title: getTitle( 'CollegeHumor' ),
 		icon: embedVideoIcon,
 		description: __( 'Embed CollegeHumor content.' ),
 		scope: [ 'block' ],
@@ -163,7 +172,7 @@ const variations = [
 	},
 	{
 		name: 'crowdsignal',
-		title: 'Crowdsignal',
+		title: getTitle( 'Crowdsignal' ),
 		icon: embedContentIcon,
 		keywords: [ 'polldaddy', __( 'survey' ) ],
 		description: __( 'Embed Crowdsignal (formerly Polldaddy) content.' ),
@@ -174,7 +183,7 @@ const variations = [
 	},
 	{
 		name: 'dailymotion',
-		title: 'Dailymotion',
+		title: getTitle( 'Dailymotion' ),
 		icon: embedDailymotionIcon,
 		keywords: [ __( 'video' ) ],
 		description: __( 'Embed a Dailymotion video.' ),
@@ -183,7 +192,7 @@ const variations = [
 	},
 	{
 		name: 'imgur',
-		title: 'Imgur',
+		title: getTitle( 'Imgur' ),
 		icon: embedPhotoIcon,
 		description: __( 'Embed Imgur content.' ),
 		patterns: [ /^https?:\/\/(.+\.)?imgur\.com\/.+/i ],
@@ -191,7 +200,7 @@ const variations = [
 	},
 	{
 		name: 'issuu',
-		title: 'Issuu',
+		title: getTitle( 'Issuu' ),
 		icon: embedContentIcon,
 		description: __( 'Embed Issuu content.' ),
 		patterns: [ /^https?:\/\/(www\.)?issuu\.com\/.+/i ],
@@ -199,7 +208,7 @@ const variations = [
 	},
 	{
 		name: 'kickstarter',
-		title: 'Kickstarter',
+		title: getTitle( 'Kickstarter' ),
 		icon: embedContentIcon,
 		description: __( 'Embed Kickstarter content.' ),
 		patterns: [
@@ -210,7 +219,7 @@ const variations = [
 	},
 	{
 		name: 'mixcloud',
-		title: 'Mixcloud',
+		title: getTitle( 'Mixcloud' ),
 		icon: embedAudioIcon,
 		keywords: [ __( 'music' ), __( 'audio' ) ],
 		description: __( 'Embed Mixcloud content.' ),
@@ -219,7 +228,7 @@ const variations = [
 	},
 	{
 		name: 'pocket-casts',
-		title: 'Pocket Casts',
+		title: getTitle( 'Pocket Casts' ),
 		icon: embedPocketCastsIcon,
 		keywords: [ __( 'podcast' ), __( 'audio' ) ],
 		description: __( 'Embed a podcast player from Pocket Casts.' ),
@@ -228,7 +237,7 @@ const variations = [
 	},
 	{
 		name: 'reddit',
-		title: 'Reddit',
+		title: getTitle( 'Reddit' ),
 		icon: embedRedditIcon,
 		description: __( 'Embed a Reddit thread.' ),
 		patterns: [ /^https?:\/\/(www\.)?reddit\.com\/.+/i ],
@@ -236,7 +245,7 @@ const variations = [
 	},
 	{
 		name: 'reverbnation',
-		title: 'ReverbNation',
+		title: getTitle( 'ReverbNation' ),
 		icon: embedAudioIcon,
 		description: __( 'Embed ReverbNation content.' ),
 		patterns: [ /^https?:\/\/(www\.)?reverbnation\.com\/.+/i ],
@@ -244,7 +253,7 @@ const variations = [
 	},
 	{
 		name: 'screencast',
-		title: 'Screencast',
+		title: getTitle( 'Screencast' ),
 		icon: embedVideoIcon,
 		description: __( 'Embed Screencast content.' ),
 		patterns: [ /^https?:\/\/(www\.)?screencast\.com\/.+/i ],
@@ -252,23 +261,15 @@ const variations = [
 	},
 	{
 		name: 'scribd',
-		title: 'Scribd',
+		title: getTitle( 'Scribd' ),
 		icon: embedContentIcon,
 		description: __( 'Embed Scribd content.' ),
 		patterns: [ /^https?:\/\/(www\.)?scribd\.com\/.+/i ],
 		attributes: { providerNameSlug: 'scribd', responsive: true },
 	},
-	{
-		name: 'slideshare',
-		title: 'Slideshare',
-		icon: embedContentIcon,
-		description: __( 'Embed Slideshare content.' ),
-		patterns: [ /^https?:\/\/(.+?\.)?slideshare\.net\/.+/i ],
-		attributes: { providerNameSlug: 'slideshare', responsive: true },
-	},
 	{
 		name: 'smugmug',
-		title: 'SmugMug',
+		title: getTitle( 'SmugMug' ),
 		icon: embedPhotoIcon,
 		description: __( 'Embed SmugMug content.' ),
 		patterns: [ /^https?:\/\/(.+\.)?smugmug\.com\/.*/i ],
@@ -280,7 +281,7 @@ const variations = [
 	},
 	{
 		name: 'speaker-deck',
-		title: 'Speaker Deck',
+		title: getTitle( 'Speaker Deck' ),
 		icon: embedContentIcon,
 		description: __( 'Embed Speaker Deck content.' ),
 		patterns: [ /^https?:\/\/(www\.)?speakerdeck\.com\/.+/i ],
@@ -288,7 +289,7 @@ const variations = [
 	},
 	{
 		name: 'tiktok',
-		title: 'TikTok',
+		title: getTitle( 'TikTok' ),
 		icon: embedVideoIcon,
 		keywords: [ __( 'video' ) ],
 		description: __( 'Embed a TikTok video.' ),
@@ -297,7 +298,7 @@ const variations = [
 	},
 	{
 		name: 'ted',
-		title: 'TED',
+		title: getTitle( 'TED' ),
 		icon: embedVideoIcon,
 		description: __( 'Embed a TED video.' ),
 		patterns: [ /^https?:\/\/(www\.|embed\.)?ted\.com\/.+/i ],
@@ -305,7 +306,7 @@ const variations = [
 	},
 	{
 		name: 'tumblr',
-		title: 'Tumblr',
+		title: getTitle( 'Tumblr' ),
 		icon: embedTumblrIcon,
 		keywords: [ __( 'social' ) ],
 		description: __( 'Embed a Tumblr post.' ),
@@ -314,7 +315,7 @@ const variations = [
 	},
 	{
 		name: 'videopress',
-		title: 'VideoPress',
+		title: getTitle( 'VideoPress' ),
 		icon: embedVideoIcon,
 		keywords: [ __( 'video' ) ],
 		description: __( 'Embed a VideoPress video.' ),
@@ -323,7 +324,7 @@ const variations = [
 	},
 	{
 		name: 'wordpress-tv',
-		title: 'WordPress.tv',
+		title: getTitle( 'WordPress.tv' ),
 		icon: embedVideoIcon,
 		description: __( 'Embed a WordPress.tv video.' ),
 		patterns: [ /^https?:\/\/wordpress\.tv\/.+/i ],
@@ -331,7 +332,7 @@ const variations = [
 	},
 	{
 		name: 'amazon-kindle',
-		title: 'Amazon Kindle',
+		title: getTitle( 'Amazon Kindle' ),
 		icon: embedAmazonIcon,
 		keywords: [ __( 'ebook' ) ],
 		description: __( 'Embed Amazon Kindle content.' ),
@@ -343,7 +344,7 @@ const variations = [
 	},
 	{
 		name: 'pinterest',
-		title: 'Pinterest',
+		title: getTitle( 'Pinterest' ),
 		icon: embedPinterestIcon,
 		keywords: [ __( 'social' ), __( 'bookmark' ) ],
 		description: __( 'Embed Pinterest pins, boards, and profiles.' ),
@@ -354,12 +355,20 @@ const variations = [
 	},
 	{
 		name: 'wolfram-cloud',
-		title: 'Wolfram',
+		title: getTitle( 'Wolfram' ),
 		icon: embedWolframIcon,
 		description: __( 'Embed Wolfram notebook content.' ),
 		patterns: [ /^https?:\/\/(www\.)?wolframcloud\.com\/obj\/.+/i ],
 		attributes: { providerNameSlug: 'wolfram-cloud', responsive: true },
 	},
+	{
+		name: 'bluesky',
+		title: getTitle( 'Bluesky' ),
+		icon: embedBlueskyIcon,
+		description: __( 'Embed a Bluesky post.' ),
+		patterns: [ /^https?:\/\/bsky\.app\/profile\/.+\/post\/.+/i ],
+		attributes: { providerNameSlug: 'bluesky' },
+	},
 ];
 
 /**
@@ -368,7 +377,9 @@ const variations = [
  *  Block by providing its attributes.
  */
 variations.forEach( ( variation ) => {
-	if ( variation.isActive ) return;
+	if ( variation.isActive ) {
+		return;
+	}
 	variation.isActive = ( blockAttributes, variationAttributes ) =>
 		blockAttributes.providerNameSlug ===
 		variationAttributes.providerNameSlug;
diff --git a/packages/block-library/src/embed/wp-embed-preview.js b/packages/block-library/src/embed/wp-embed-preview.js
index 1992310217aca4..ad68bc3f7aadd6 100644
--- a/packages/block-library/src/embed/wp-embed-preview.js
+++ b/packages/block-library/src/embed/wp-embed-preview.js
@@ -20,10 +20,14 @@ export default function WpEmbedPreview( { html } ) {
 		const iframe = doc.querySelector( 'iframe' );
 		const iframeProps = {};
 
-		if ( ! iframe ) return iframeProps;
+		if ( ! iframe ) {
+			return iframeProps;
+		}
 
 		Array.from( iframe.attributes ).forEach( ( { name, value } ) => {
-			if ( name === 'style' ) return;
+			if ( name === 'style' ) {
+				return;
+			}
 			iframeProps[ attributeMap[ name ] || name ] = value;
 		} );
 
diff --git a/packages/block-library/src/file/block.json b/packages/block-library/src/file/block.json
index 0cc20b3f501e9b..2c5e888c2aff64 100644
--- a/packages/block-library/src/file/block.json
+++ b/packages/block-library/src/file/block.json
@@ -11,8 +11,13 @@
 		"id": {
 			"type": "number"
 		},
+		"blob": {
+			"type": "string",
+			"role": "local"
+		},
 		"href": {
-			"type": "string"
+			"type": "string",
+			"role": "content"
 		},
 		"fileId": {
 			"type": "string",
@@ -21,15 +26,17 @@
 			"attribute": "id"
 		},
 		"fileName": {
-			"type": "string",
-			"source": "html",
-			"selector": "a:not([download])"
+			"type": "rich-text",
+			"source": "rich-text",
+			"selector": "a:not([download])",
+			"role": "content"
 		},
 		"textLinkHref": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "a:not([download])",
-			"attribute": "href"
+			"attribute": "href",
+			"role": "content"
 		},
 		"textLinkTarget": {
 			"type": "string",
@@ -42,9 +49,10 @@
 			"default": true
 		},
 		"downloadButtonText": {
-			"type": "string",
-			"source": "html",
-			"selector": "a[download]"
+			"type": "rich-text",
+			"source": "rich-text",
+			"selector": "a[download]",
+			"role": "content"
 		},
 		"displayPreview": {
 			"type": "boolean"
@@ -70,9 +78,20 @@
 				"link": true
 			}
 		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
+		},
 		"interactivity": true
 	},
-	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-file-editor",
 	"style": "wp-block-file"
 }
diff --git a/packages/block-library/src/file/deprecated.js b/packages/block-library/src/file/deprecated.js
index ba053cb05019dd..51b3704205b38a 100644
--- a/packages/block-library/src/file/deprecated.js
+++ b/packages/block-library/src/file/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -127,11 +127,11 @@ const v3 = {
 					{ showDownloadButton && (
 						<a
 							href={ href }
-							className={ classnames(
+							className={ clsx(
 								'wp-block-file__button',
 								__experimentalGetElementClassName( 'button' )
 							) }
-							download={ true }
+							download
 							aria-describedby={ describedById }
 						>
 							<RichText.Content value={ downloadButtonText } />
@@ -259,7 +259,7 @@ const v2 = {
 						<a
 							href={ href }
 							className="wp-block-file__button"
-							download={ true }
+							download
 							aria-describedby={ describedById }
 						>
 							<RichText.Content value={ downloadButtonText } />
@@ -372,7 +372,7 @@ const v1 = {
 						<a
 							href={ href }
 							className="wp-block-file__button"
-							download={ true }
+							download
 						>
 							<RichText.Content value={ downloadButtonText } />
 						</a>
diff --git a/packages/block-library/src/file/edit.js b/packages/block-library/src/file/edit.js
index de318aaa35e416..59e660dd3211f1 100644
--- a/packages/block-library/src/file/edit.js
+++ b/packages/block-library/src/file/edit.js
@@ -1,12 +1,12 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { getBlobByURL, isBlobURL, revokeBlobURL } from '@wordpress/blob';
+import { isBlobURL } from '@wordpress/blob';
 import {
 	__unstableGetAnimateClassName as getAnimateClassName,
 	ResizableBox,
@@ -23,7 +23,7 @@ import {
 	store as blockEditorStore,
 	__experimentalGetElementClassName,
 } from '@wordpress/block-editor';
-import { useEffect } from '@wordpress/element';
+import { useEffect, useState } from '@wordpress/element';
 import { useCopyToClipboard } from '@wordpress/compose';
 import { __, _x } from '@wordpress/i18n';
 import { file as icon } from '@wordpress/icons';
@@ -36,6 +36,7 @@ import { store as noticesStore } from '@wordpress/notices';
 import FileBlockInspector from './inspector';
 import { browserSupportsPdfs } from './utils';
 import removeAnchorTag from '../utils/remove-anchor-tag';
+import { useUploadMediaFromBlobURL } from '../utils/hooks';
 
 export const MIN_PREVIEW_HEIGHT = 200;
 export const MAX_PREVIEW_HEIGHT = 2000;
@@ -63,7 +64,6 @@ function ClipboardToolbarButton( { text, disabled } ) {
 function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
 	const {
 		id,
-		fileId,
 		fileName,
 		href,
 		textLinkHref,
@@ -73,13 +73,13 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
 		displayPreview,
 		previewHeight,
 	} = attributes;
-	const { media, mediaUpload } = useSelect(
+	const [ temporaryURL, setTemporaryURL ] = useState( attributes.blob );
+	const { media } = useSelect(
 		( select ) => ( {
 			media:
 				id === undefined
 					? undefined
 					: select( coreStore ).getMedia( id ),
-			mediaUpload: select( blockEditorStore ).getSettings().mediaUpload,
 		} ),
 		[ id ]
 	);
@@ -88,47 +88,57 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
 	const { toggleSelection, __unstableMarkNextChangeAsNotPersistent } =
 		useDispatch( blockEditorStore );
 
-	useEffect( () => {
-		// Upload a file drag-and-dropped into the editor.
-		if ( isBlobURL( href ) ) {
-			const file = getBlobByURL( href );
-
-			mediaUpload( {
-				filesList: [ file ],
-				onFileChange: ( [ newMedia ] ) => onSelectFile( newMedia ),
-				onError: onUploadError,
-			} );
-
-			revokeBlobURL( href );
-		}
+	useUploadMediaFromBlobURL( {
+		url: temporaryURL,
+		onChange: onSelectFile,
+		onError: onUploadError,
+	} );
 
+	// Note: Handle setting a default value for `downloadButtonText` via HTML API
+	// when it supports replacing text content for HTML tags.
+	useEffect( () => {
 		if ( RichText.isEmpty( downloadButtonText ) ) {
+			__unstableMarkNextChangeAsNotPersistent();
 			setAttributes( {
 				downloadButtonText: _x( 'Download', 'button label' ),
 			} );
 		}
+		// This effect should only run on mount.
 	}, [] );
 
-	useEffect( () => {
-		if ( ! fileId && href ) {
-			// Add a unique fileId to each file block.
-			__unstableMarkNextChangeAsNotPersistent();
-			setAttributes( { fileId: `wp-block-file--media-${ clientId }` } );
-		}
-	}, [ href, fileId, clientId ] );
-
 	function onSelectFile( newMedia ) {
-		if ( newMedia && newMedia.url ) {
-			const isPdf = newMedia.url.endsWith( '.pdf' );
+		if ( ! newMedia || ! newMedia.url ) {
+			// Reset attributes.
 			setAttributes( {
-				href: newMedia.url,
-				fileName: newMedia.title,
-				textLinkHref: newMedia.url,
-				id: newMedia.id,
-				displayPreview: isPdf ? true : undefined,
-				previewHeight: isPdf ? 600 : undefined,
+				href: undefined,
+				fileName: undefined,
+				textLinkHref: undefined,
+				id: undefined,
+				fileId: undefined,
+				displayPreview: undefined,
+				previewHeight: undefined,
 			} );
+			setTemporaryURL();
+			return;
+		}
+
+		if ( isBlobURL( newMedia.url ) ) {
+			setTemporaryURL( newMedia.url );
+			return;
 		}
+
+		const isPdf = newMedia.url.endsWith( '.pdf' );
+		setAttributes( {
+			href: newMedia.url,
+			fileName: newMedia.title,
+			textLinkHref: newMedia.url,
+			id: newMedia.id,
+			displayPreview: isPdf ? true : undefined,
+			previewHeight: isPdf ? 600 : undefined,
+			fileId: `wp-block-file--media-${ clientId }`,
+			blob: undefined,
+		} );
+		setTemporaryURL();
 	}
 
 	function onUploadError( message ) {
@@ -173,17 +183,17 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
 	const attachmentPage = media && media.link;
 
 	const blockProps = useBlockProps( {
-		className: classnames(
-			isBlobURL( href ) && getAnimateClassName( { type: 'loading' } ),
+		className: clsx(
+			!! temporaryURL && getAnimateClassName( { type: 'loading' } ),
 			{
-				'is-transient': isBlobURL( href ),
+				'is-transient': !! temporaryURL,
 			}
 		),
 	} );
 
 	const displayPreviewInEditor = browserSupportsPdfs() && displayPreview;
 
-	if ( ! href ) {
+	if ( ! href && ! temporaryURL ) {
 		return (
 			<div { ...blockProps }>
 				<MediaPlaceholder
@@ -205,7 +215,11 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
 	return (
 		<>
 			<FileBlockInspector
-				hrefs={ { href, textLinkHref, attachmentPage } }
+				hrefs={ {
+					href: href || temporaryURL,
+					textLinkHref,
+					attachmentPage,
+				} }
 				{ ...{
 					openInNewWindow: !! textLinkTarget,
 					showDownloadButton,
@@ -225,6 +239,7 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
 					accept="*"
 					onSelect={ onSelectFile }
 					onError={ onUploadError }
+					onReset={ () => onSelectFile( undefined ) }
 				/>
 				<ClipboardToolbarButton
 					text={ href }
@@ -266,8 +281,9 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
 						) }
 					</ResizableBox>
 				) }
-				<div className={ 'wp-block-file__content-wrapper' }>
+				<div className="wp-block-file__content-wrapper">
 					<RichText
+						identifier="fileName"
 						tagName="a"
 						value={ fileName }
 						placeholder={ __( 'Write file name…' ) }
@@ -280,16 +296,13 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
 						href={ textLinkHref }
 					/>
 					{ showDownloadButton && (
-						<div
-							className={
-								'wp-block-file__button-richtext-wrapper'
-							}
-						>
+						<div className="wp-block-file__button-richtext-wrapper">
 							{ /* Using RichText here instead of PlainText so that it can be styled like a button. */ }
 							<RichText
+								identifier="downloadButtonText"
 								tagName="div" // Must be block-level or else cursor disappears.
 								aria-label={ __( 'Download button text' ) }
-								className={ classnames(
+								className={ clsx(
 									'wp-block-file__button',
 									__experimentalGetElementClassName(
 										'button'
diff --git a/packages/block-library/src/file/edit.native.js b/packages/block-library/src/file/edit.native.js
index 9e3d2ef98176d4..a531ba93c40327 100644
--- a/packages/block-library/src/file/edit.native.js
+++ b/packages/block-library/src/file/edit.native.js
@@ -282,7 +282,7 @@ export class FileEdit extends Component {
 						value={ textLinkHref }
 						onChange={ this.onChangeLinkDestinationOption }
 						options={ linkDestinationOptions }
-						hideCancelButton={ true }
+						hideCancelButton
 					/>
 					<ToggleControl
 						icon={ external }
@@ -469,7 +469,7 @@ export class FileEdit extends Component {
 										tagName="p"
 										underlineColorAndroid="transparent"
 										value={ fileName }
-										deleteEnter={ true }
+										deleteEnter
 										textAlign={ this.getTextAlignmentForAlignment(
 											align
 										) }
@@ -505,7 +505,7 @@ export class FileEdit extends Component {
 												textAlign="center"
 												minWidth={ minWidth }
 												maxWidth={ this.state.maxWidth }
-												deleteEnter={ true }
+												deleteEnter
 												style={ styles.buttonText }
 												value={ downloadButtonText }
 												placeholder={ placeholderText }
@@ -565,7 +565,7 @@ export class FileEdit extends Component {
 		return (
 			<MediaUpload
 				allowedTypes={ [ MEDIA_TYPE_ANY ] }
-				isReplacingMedia={ true }
+				isReplacingMedia
 				onSelect={ this.onSelectFile }
 				render={ ( { open, getMediaOptions } ) => {
 					return this.getFileComponent( open, getMediaOptions );
diff --git a/packages/block-library/src/file/editor.scss b/packages/block-library/src/file/editor.scss
index 365ba5ec1dc222..1a38662381447e 100644
--- a/packages/block-library/src/file/editor.scss
+++ b/packages/block-library/src/file/editor.scss
@@ -4,6 +4,9 @@
 		// Stop file block from collapsing when floated.
 		height: auto;
 	}
+	.wp-block[data-align="center"] > & {
+		text-align: center;
+	}
 
 	display: flex;
 	flex-wrap: wrap;
diff --git a/packages/block-library/src/file/index.php b/packages/block-library/src/file/index.php
index 5910a63e6cf182..8ea668d56d8545 100644
--- a/packages/block-library/src/file/index.php
+++ b/packages/block-library/src/file/index.php
@@ -8,96 +8,48 @@
 /**
  * When the `core/file` block is rendering, check if we need to enqueue the `wp-block-file-view` script.
  *
+ * @since 5.8.0
+ *
  * @param array    $attributes The block attributes.
  * @param string   $content    The block content.
  * @param WP_Block $block      The parsed block.
  *
  * @return string Returns the block content.
  */
-function render_block_core_file( $attributes, $content, $block ) {
-	$is_gutenberg_plugin     = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-	$should_load_view_script = ! empty( $attributes['displayPreview'] );
-	$view_js_file            = 'wp-block-file-view';
-	$script_handles          = $block->block_type->view_script_handles;
-
-	if ( $is_gutenberg_plugin ) {
-		if ( $should_load_view_script ) {
-			gutenberg_enqueue_module( '@wordpress/block-library/file-block' );
-		}
-		// Remove the view script because we are using the module.
-		$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-	} else {
-		// If the script already exists, there is no point in removing it from viewScript.
-		if ( ! wp_script_is( $view_js_file ) ) {
-
-			// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-			if ( ! $should_load_view_script && in_array( $view_js_file, $script_handles, true ) ) {
-				$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-			}
-			// If the script is needed, but it was previously removed, add it again.
-			if ( $should_load_view_script && ! in_array( $view_js_file, $script_handles, true ) ) {
-				$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
-			}
-		}
-	}
-
-	// Update object's aria-label attribute if present in block HTML.
-
-	// Match an aria-label attribute from an object tag.
-	$pattern = '@<object.+(?<attribute>aria-label="(?<filename>[^"]+)?")@i';
-	$content = preg_replace_callback(
-		$pattern,
-		static function ( $matches ) {
-			$filename     = ! empty( $matches['filename'] ) ? $matches['filename'] : '';
-			$has_filename = ! empty( $filename ) && 'PDF embed' !== $filename;
-			$label        = $has_filename ?
-				sprintf(
-					/* translators: %s: filename. */
-					__( 'Embed of %s.' ),
-					$filename
-				)
-				: __( 'PDF embed' );
+function render_block_core_file( $attributes, $content ) {
+	// If it's interactive, enqueue the script module and add the directives.
+	if ( ! empty( $attributes['displayPreview'] ) ) {
+		wp_enqueue_script_module( '@wordpress/block-library/file/view' );
 
-			return str_replace( $matches['attribute'], sprintf( 'aria-label="%s"', $label ), $matches[0] );
-		},
-		$content
-	);
-
-	// If it uses the Interactivity API, add the directives.
-	if ( $should_load_view_script ) {
 		$processor = new WP_HTML_Tag_Processor( $content );
 		$processor->next_tag();
-		$processor->set_attribute( 'data-wp-interactive', '{"namespace":"core/file"}' );
+		$processor->set_attribute( 'data-wp-interactive', 'core/file' );
 		$processor->next_tag( 'object' );
 		$processor->set_attribute( 'data-wp-bind--hidden', '!state.hasPdfPreview' );
 		$processor->set_attribute( 'hidden', true );
+
+		$filename     = $processor->get_attribute( 'aria-label' );
+		$has_filename = ! empty( $filename ) && 'PDF embed' !== $filename;
+		$label        = $has_filename ? sprintf(
+			/* translators: %s: filename. */
+			__( 'Embed of %s.' ),
+			$filename
+		) : __( 'PDF embed' );
+
+		// Update object's aria-label attribute if present in block HTML.
+		// Match an aria-label attribute from an object tag.
+		$processor->set_attribute( 'aria-label', $label );
+
 		return $processor->get_updated_html();
 	}
 
 	return $content;
 }
 
-/**
- * Ensure that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_file_ensure_interactivity_dependency() {
-	global $wp_scripts;
-	if (
-		isset( $wp_scripts->registered['wp-block-file-view'] ) &&
-		! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-file-view']->deps, true )
-	) {
-		$wp_scripts->registered['wp-block-file-view']->deps[] = 'wp-interactivity';
-	}
-}
-
-add_action( 'wp_print_scripts', 'block_core_file_ensure_interactivity_dependency' );
-
 /**
  * Registers the `core/file` block on server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_file() {
 	register_block_type_from_metadata(
@@ -106,14 +58,5 @@ function register_block_core_file() {
 			'render_callback' => 'render_block_core_file',
 		)
 	);
-
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/file-block',
-			gutenberg_url( '/build/interactivity/file.min.js' ),
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
 }
 add_action( 'init', 'register_block_core_file' );
diff --git a/packages/block-library/src/file/inspector.js b/packages/block-library/src/file/inspector.js
index 76ed28d124600e..c29f84f60ebace 100644
--- a/packages/block-library/src/file/inspector.js
+++ b/packages/block-library/src/file/inspector.js
@@ -73,6 +73,7 @@ export default function FileBlockInspector( {
 				) }
 				<PanelBody title={ __( 'Settings' ) }>
 					<SelectControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ __( 'Link to' ) }
 						value={ textLinkHref }
diff --git a/packages/block-library/src/file/save.js b/packages/block-library/src/file/save.js
index 6d0684ac76b8ef..34b1046d6d2bbf 100644
--- a/packages/block-library/src/file/save.js
+++ b/packages/block-library/src/file/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -25,7 +25,11 @@ export default function save( { attributes } ) {
 		previewHeight,
 	} = attributes;
 
-	const pdfEmbedLabel = RichText.isEmpty( fileName ) ? 'PDF embed' : fileName;
+	const pdfEmbedLabel = RichText.isEmpty( fileName )
+		? 'PDF embed'
+		: // To do: use toPlainText, but we need ensure it's RichTextData. See
+		  // https://github.com/WordPress/gutenberg/pull/56710.
+		  fileName.toString();
 
 	const hasFilename = ! RichText.isEmpty( fileName );
 
@@ -65,11 +69,11 @@ export default function save( { attributes } ) {
 				{ showDownloadButton && (
 					<a
 						href={ href }
-						className={ classnames(
+						className={ clsx(
 							'wp-block-file__button',
 							__experimentalGetElementClassName( 'button' )
 						) }
-						download={ true }
+						download
 						aria-describedby={ describedById }
 					>
 						<RichText.Content value={ downloadButtonText } />
diff --git a/packages/block-library/src/file/transforms.js b/packages/block-library/src/file/transforms.js
index 35dd9807daddd7..c381a62f783866 100644
--- a/packages/block-library/src/file/transforms.js
+++ b/packages/block-library/src/file/transforms.js
@@ -24,13 +24,32 @@ const transforms = {
 					const blobURL = createBlobURL( file );
 
 					// File will be uploaded in componentDidMount()
-					blocks.push(
-						createBlock( 'core/file', {
-							href: blobURL,
-							fileName: file.name,
-							textLinkHref: blobURL,
-						} )
-					);
+					if ( file.type.startsWith( 'video/' ) ) {
+						blocks.push(
+							createBlock( 'core/video', {
+								blob: createBlobURL( file ),
+							} )
+						);
+					} else if ( file.type.startsWith( 'image/' ) ) {
+						blocks.push(
+							createBlock( 'core/image', {
+								blob: createBlobURL( file ),
+							} )
+						);
+					} else if ( file.type.startsWith( 'audio/' ) ) {
+						blocks.push(
+							createBlock( 'core/audio', {
+								blob: createBlobURL( file ),
+							} )
+						);
+					} else {
+						blocks.push(
+							createBlock( 'core/file', {
+								blob: blobURL,
+								fileName: file.name,
+							} )
+						);
+					}
 				} );
 
 				return blocks;
diff --git a/packages/block-library/src/file/view.js b/packages/block-library/src/file/view.js
index 79340223f007cb..62c31b7b365ff2 100644
--- a/packages/block-library/src/file/view.js
+++ b/packages/block-library/src/file/view.js
@@ -7,10 +7,14 @@ import { store } from '@wordpress/interactivity';
  */
 import { browserSupportsPdfs } from './utils';
 
-store( 'core/file', {
-	state: {
-		get hasPdfPreview() {
-			return browserSupportsPdfs();
+store(
+	'core/file',
+	{
+		state: {
+			get hasPdfPreview() {
+				return browserSupportsPdfs();
+			},
 		},
 	},
-} );
+	{ lock: true }
+);
diff --git a/packages/block-library/src/footnotes/block.json b/packages/block-library/src/footnotes/block.json
index 3192df77969781..1fe74abb471ee5 100644
--- a/packages/block-library/src/footnotes/block.json
+++ b/packages/block-library/src/footnotes/block.json
@@ -55,6 +55,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-footnotes"
diff --git a/packages/block-library/src/footnotes/edit.js b/packages/block-library/src/footnotes/edit.js
index 111e0ba5d3a0ee..88254657ced3c4 100644
--- a/packages/block-library/src/footnotes/edit.js
+++ b/packages/block-library/src/footnotes/edit.js
@@ -14,10 +14,11 @@ export default function FootnotesEdit( { context: { postType, postId } } ) {
 		'meta',
 		postId
 	);
+	const footnotesSupported = 'string' === typeof meta?.footnotes;
 	const footnotes = meta?.footnotes ? JSON.parse( meta.footnotes ) : [];
 	const blockProps = useBlockProps();
 
-	if ( postType !== 'post' && postType !== 'page' ) {
+	if ( ! footnotesSupported ) {
 		return (
 			<div { ...blockProps }>
 				<Placeholder
diff --git a/packages/block-library/src/footnotes/format.js b/packages/block-library/src/footnotes/format.js
index 0197c427412c0c..d160552e294349 100644
--- a/packages/block-library/src/footnotes/format.js
+++ b/packages/block-library/src/footnotes/format.js
@@ -15,6 +15,7 @@ import {
 	privateApis,
 } from '@wordpress/block-editor';
 import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
+import { store as coreDataStore } from '@wordpress/core-data';
 import { createBlock, store as blocksStore } from '@wordpress/blocks';
 
 /**
@@ -38,12 +39,12 @@ export const format = {
 	},
 	interactive: true,
 	contentEditable: false,
-	[ usesContextKey ]: [ 'postType' ],
+	[ usesContextKey ]: [ 'postType', 'postId' ],
 	edit: function Edit( {
 		value,
 		onChange,
 		isObjectActive,
-		context: { postType },
+		context: { postType, postId },
 	} ) {
 		const registry = useRegistry();
 		const {
@@ -53,40 +54,52 @@ export const format = {
 			getBlockName,
 			getBlockParentsByBlockName,
 		} = registry.select( blockEditorStore );
-		const hasFootnotesBlockType = useSelect(
-			( select ) =>
-				!! select( blocksStore ).getBlockType( 'core/footnotes' ),
-			[]
+		const isFootnotesSupported = useSelect(
+			( select ) => {
+				if (
+					! select( blocksStore ).getBlockType( 'core/footnotes' )
+				) {
+					return false;
+				}
+
+				const allowedBlocks =
+					select( blockEditorStore ).getSettings().allowedBlockTypes;
+				if (
+					allowedBlocks === false ||
+					( Array.isArray( allowedBlocks ) &&
+						! allowedBlocks.includes( 'core/footnotes' ) )
+				) {
+					return false;
+				}
+
+				const entityRecord = select( coreDataStore ).getEntityRecord(
+					'postType',
+					postType,
+					postId
+				);
+
+				if ( 'string' !== typeof entityRecord?.meta?.footnotes ) {
+					return false;
+				}
+
+				// Checks if the selected block lives within a pattern.
+				const {
+					getBlockParentsByBlockName: _getBlockParentsByBlockName,
+					getSelectedBlockClientId: _getSelectedBlockClientId,
+				} = select( blockEditorStore );
+				const parentCoreBlocks = _getBlockParentsByBlockName(
+					_getSelectedBlockClientId(),
+					SYNCED_PATTERN_BLOCK_NAME
+				);
+				return ! parentCoreBlocks || parentCoreBlocks.length === 0;
+			},
+			[ postType, postId ]
 		);
-		/*
-		 * This useSelect exists because we need to use its return value
-		 * outside the event callback.
-		 */
-		const isBlockWithinPattern = useSelect( ( select ) => {
-			const {
-				getBlockParentsByBlockName: _getBlockParentsByBlockName,
-				getSelectedBlockClientId: _getSelectedBlockClientId,
-			} = select( blockEditorStore );
-			const parentCoreBlocks = _getBlockParentsByBlockName(
-				_getSelectedBlockClientId(),
-				SYNCED_PATTERN_BLOCK_NAME
-			);
-			return parentCoreBlocks && parentCoreBlocks.length > 0;
-		}, [] );
 
 		const { selectionChange, insertBlock } =
 			useDispatch( blockEditorStore );
 
-		if ( ! hasFootnotesBlockType ) {
-			return null;
-		}
-
-		if ( postType !== 'post' && postType !== 'page' ) {
-			return null;
-		}
-
-		// Checks if the selected block lives within a pattern.
-		if ( isBlockWithinPattern ) {
+		if ( ! isFootnotesSupported ) {
 			return null;
 		}
 
diff --git a/packages/block-library/src/footnotes/index.js b/packages/block-library/src/footnotes/index.js
index c5e851af7e033f..ba5da984fd71ef 100644
--- a/packages/block-library/src/footnotes/index.js
+++ b/packages/block-library/src/footnotes/index.js
@@ -21,8 +21,7 @@ export const settings = {
 	edit,
 };
 
-registerFormatType( formatName, format );
-
 export const init = () => {
+	registerFormatType( formatName, format );
 	initBlock( { name, metadata, settings } );
 };
diff --git a/packages/block-library/src/footnotes/index.php b/packages/block-library/src/footnotes/index.php
index bc6291dd21c38b..380c093c8117ed 100644
--- a/packages/block-library/src/footnotes/index.php
+++ b/packages/block-library/src/footnotes/index.php
@@ -68,18 +68,6 @@ function render_block_core_footnotes( $attributes, $content, $block ) {
  * @since 6.3.0
  */
 function register_block_core_footnotes() {
-	foreach ( array( 'post', 'page' ) as $post_type ) {
-		register_post_meta(
-			$post_type,
-			'footnotes',
-			array(
-				'show_in_rest'      => true,
-				'single'            => true,
-				'type'              => 'string',
-				'revisions_enabled' => true,
-			)
-		);
-	}
 	register_block_type_from_metadata(
 		__DIR__ . '/footnotes',
 		array(
@@ -89,6 +77,40 @@ function register_block_core_footnotes() {
 }
 add_action( 'init', 'register_block_core_footnotes' );
 
+
+/**
+ * Registers the footnotes meta field required for footnotes to work.
+ *
+ * @since 6.5.0
+ */
+function register_block_core_footnotes_post_meta() {
+	$post_types = get_post_types( array( 'show_in_rest' => true ) );
+	foreach ( $post_types as $post_type ) {
+		// Only register the meta field if the post type supports the editor, custom fields, and revisions.
+		if (
+			post_type_supports( $post_type, 'editor' ) &&
+			post_type_supports( $post_type, 'custom-fields' ) &&
+			post_type_supports( $post_type, 'revisions' )
+		) {
+			register_post_meta(
+				$post_type,
+				'footnotes',
+				array(
+					'show_in_rest'      => true,
+					'single'            => true,
+					'type'              => 'string',
+					'revisions_enabled' => true,
+				)
+			);
+		}
+	}
+}
+/*
+ * Most post types are registered at priority 10, so use priority 20 here in
+ * order to catch them.
+*/
+add_action( 'init', 'register_block_core_footnotes_post_meta', 20 );
+
 /**
  * Adds the footnotes field to the revisions display.
  *
diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 067b7ac69430c4..386c90ac207ad4 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -19,11 +19,11 @@
 			"type": "string"
 		},
 		"label": {
-			"type": "string",
+			"type": "rich-text",
 			"default": "Label",
 			"selector": ".wp-block-form-input__label-content",
-			"source": "html",
-			"__experimentalRole": "content"
+			"source": "rich-text",
+			"role": "content"
 		},
 		"inlineLabel": {
 			"type": "boolean",
@@ -41,7 +41,7 @@
 			"selector": ".wp-block-form-input__input",
 			"source": "attribute",
 			"attribute": "placeholder",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"value": {
 			"type": "string",
diff --git a/packages/block-library/src/form-input/deprecated.js b/packages/block-library/src/form-input/deprecated.js
new file mode 100644
index 00000000000000..d974cca387a188
--- /dev/null
+++ b/packages/block-library/src/form-input/deprecated.js
@@ -0,0 +1,255 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+import removeAccents from 'remove-accents';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	RichText,
+	useBlockProps,
+	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
+	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
+} from '@wordpress/block-editor';
+import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
+
+const getNameFromLabelV1 = ( content ) => {
+	return (
+		removeAccents( stripHTML( content ) )
+			// Convert anything that's not a letter or number to a hyphen.
+			.replace( /[^\p{L}\p{N}]+/gu, '-' )
+			// Convert to lowercase
+			.toLowerCase()
+			// Remove any remaining leading or trailing hyphens.
+			.replace( /(^-+)|(-+$)/g, '' )
+	);
+};
+
+const v2 = {
+	attributes: {
+		type: {
+			type: 'string',
+			default: 'text',
+		},
+		name: {
+			type: 'string',
+		},
+		label: {
+			type: 'string',
+			default: 'Label',
+			selector: '.wp-block-form-input__label-content',
+			source: 'html',
+			role: 'content',
+		},
+		inlineLabel: {
+			type: 'boolean',
+			default: false,
+		},
+		required: {
+			type: 'boolean',
+			default: false,
+			selector: '.wp-block-form-input__input',
+			source: 'attribute',
+			attribute: 'required',
+		},
+		placeholder: {
+			type: 'string',
+			selector: '.wp-block-form-input__input',
+			source: 'attribute',
+			attribute: 'placeholder',
+			role: 'content',
+		},
+		value: {
+			type: 'string',
+			default: '',
+			selector: 'input',
+			source: 'attribute',
+			attribute: 'value',
+		},
+		visibilityPermissions: {
+			type: 'string',
+			default: 'all',
+		},
+	},
+	supports: {
+		anchor: true,
+		reusable: false,
+		spacing: {
+			margin: [ 'top', 'bottom' ],
+		},
+		__experimentalBorder: {
+			radius: true,
+			__experimentalSkipSerialization: true,
+			__experimentalDefaultControls: {
+				radius: true,
+			},
+		},
+	},
+	save( { attributes } ) {
+		const { type, name, label, inlineLabel, required, placeholder, value } =
+			attributes;
+
+		const borderProps = getBorderClassesAndStyles( attributes );
+		const colorProps = getColorClassesAndStyles( attributes );
+
+		const inputStyle = {
+			...borderProps.style,
+			...colorProps.style,
+		};
+
+		const inputClasses = clsx(
+			'wp-block-form-input__input',
+			colorProps.className,
+			borderProps.className
+		);
+		const TagName = type === 'textarea' ? 'textarea' : 'input';
+
+		const blockProps = useBlockProps.save();
+
+		if ( 'hidden' === type ) {
+			return <input type={ type } name={ name } value={ value } />;
+		}
+
+		return (
+			<div { ...blockProps }>
+				{ /* eslint-disable jsx-a11y/label-has-associated-control */ }
+				<label
+					className={ clsx( 'wp-block-form-input__label', {
+						'is-label-inline': inlineLabel,
+					} ) }
+				>
+					<span className="wp-block-form-input__label-content">
+						<RichText.Content value={ label } />
+					</span>
+					<TagName
+						className={ inputClasses }
+						type={ 'textarea' === type ? undefined : type }
+						name={ name || getNameFromLabelV1( label ) }
+						required={ required }
+						aria-required={ required }
+						placeholder={ placeholder || undefined }
+						style={ inputStyle }
+					/>
+				</label>
+				{ /* eslint-enable jsx-a11y/label-has-associated-control */ }
+			</div>
+		);
+	},
+};
+
+// Version without wrapper div in saved markup
+// See: https://github.com/WordPress/gutenberg/pull/56507
+const v1 = {
+	attributes: {
+		type: {
+			type: 'string',
+			default: 'text',
+		},
+		name: {
+			type: 'string',
+		},
+		label: {
+			type: 'string',
+			default: 'Label',
+			selector: '.wp-block-form-input__label-content',
+			source: 'html',
+			role: 'content',
+		},
+		inlineLabel: {
+			type: 'boolean',
+			default: false,
+		},
+		required: {
+			type: 'boolean',
+			default: false,
+			selector: '.wp-block-form-input__input',
+			source: 'attribute',
+			attribute: 'required',
+		},
+		placeholder: {
+			type: 'string',
+			selector: '.wp-block-form-input__input',
+			source: 'attribute',
+			attribute: 'placeholder',
+			role: 'content',
+		},
+		value: {
+			type: 'string',
+			default: '',
+			selector: 'input',
+			source: 'attribute',
+			attribute: 'value',
+		},
+		visibilityPermissions: {
+			type: 'string',
+			default: 'all',
+		},
+	},
+	supports: {
+		className: false,
+		anchor: true,
+		reusable: false,
+		spacing: {
+			margin: [ 'top', 'bottom' ],
+		},
+		__experimentalBorder: {
+			radius: true,
+			__experimentalSkipSerialization: true,
+			__experimentalDefaultControls: {
+				radius: true,
+			},
+		},
+	},
+	save( { attributes } ) {
+		const { type, name, label, inlineLabel, required, placeholder, value } =
+			attributes;
+
+		const borderProps = getBorderClassesAndStyles( attributes );
+		const colorProps = getColorClassesAndStyles( attributes );
+
+		const inputStyle = {
+			...borderProps.style,
+			...colorProps.style,
+		};
+
+		const inputClasses = clsx(
+			'wp-block-form-input__input',
+			colorProps.className,
+			borderProps.className
+		);
+		const TagName = type === 'textarea' ? 'textarea' : 'input';
+
+		if ( 'hidden' === type ) {
+			return <input type={ type } name={ name } value={ value } />;
+		}
+
+		/* eslint-disable jsx-a11y/label-has-associated-control */
+		return (
+			<label
+				className={ clsx( 'wp-block-form-input__label', {
+					'is-label-inline': inlineLabel,
+				} ) }
+			>
+				<span className="wp-block-form-input__label-content">
+					<RichText.Content value={ label } />
+				</span>
+				<TagName
+					className={ inputClasses }
+					type={ 'textarea' === type ? undefined : type }
+					name={ name || getNameFromLabelV1( label ) }
+					required={ required }
+					aria-required={ required }
+					placeholder={ placeholder || undefined }
+					style={ inputStyle }
+				/>
+			</label>
+		);
+		/* eslint-enable jsx-a11y/label-has-associated-control */
+	},
+};
+
+const deprecated = [ v2, v1 ];
+
+export default deprecated;
diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 0742c22c22f429..5f3713e83975f1 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -31,13 +31,17 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 		ref.current.focus();
 	}
 
+	// Note: radio inputs aren't implemented yet.
+	const isCheckboxOrRadio = type === 'checkbox' || type === 'radio';
+
 	const controls = (
 		<>
 			{ 'hidden' !== type && (
 				<InspectorControls>
-					<PanelBody title={ __( 'Input settings' ) }>
+					<PanelBody title={ __( 'Settings' ) }>
 						{ 'checkbox' !== type && (
 							<CheckboxControl
+								__nextHasNoMarginBottom
 								label={ __( 'Inline label' ) }
 								checked={ inlineLabel }
 								onChange={ ( newVal ) => {
@@ -48,6 +52,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 							/>
 						) }
 						<CheckboxControl
+							__nextHasNoMarginBottom
 							label={ __( 'Required' ) }
 							checked={ required }
 							onChange={ ( newVal ) => {
@@ -59,8 +64,10 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 					</PanelBody>
 				</InspectorControls>
 			) }
-			<InspectorControls __experimentalGroup="advanced">
+			<InspectorControls group="advanced">
 				<TextControl
+					__next40pxDefaultSize
+					__nextHasNoMarginBottom
 					autoComplete="off"
 					label={ __( 'Name' ) }
 					value={ name }
@@ -77,13 +84,25 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 		</>
 	);
 
+	const content = (
+		<RichText
+			tagName="span"
+			className="wp-block-form-input__label-content"
+			value={ label }
+			onChange={ ( newLabel ) => setAttributes( { label: newLabel } ) }
+			aria-label={ label ? __( 'Label' ) : __( 'Empty label' ) }
+			data-empty={ ! label }
+			placeholder={ __( 'Type the label for this input' ) }
+		/>
+	);
+
 	if ( 'hidden' === type ) {
 		return (
 			<>
 				{ controls }
 				<input
 					type="hidden"
-					className={ classNames(
+					className={ clsx(
 						className,
 						'wp-block-form-input__input',
 						colorProps.className,
@@ -103,24 +122,14 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 		<div { ...blockProps }>
 			{ controls }
 			<span
-				className={ classNames( 'wp-block-form-input__label', {
+				className={ clsx( 'wp-block-form-input__label', {
 					'is-label-inline': inlineLabel || 'checkbox' === type,
 				} ) }
 			>
-				<RichText
-					tagName="span"
-					className="wp-block-form-input__label-content"
-					value={ label }
-					onChange={ ( newLabel ) =>
-						setAttributes( { label: newLabel } )
-					}
-					aria-label={ label ? __( 'Label' ) : __( 'Empty label' ) }
-					data-empty={ label ? false : true }
-					placeholder={ __( 'Type the label for this input' ) }
-				/>
+				{ ! isCheckboxOrRadio && content }
 				<TagName
 					type={ 'textarea' === type ? undefined : type }
-					className={ classNames(
+					className={ clsx(
 						className,
 						'wp-block-form-input__input',
 						colorProps.className,
@@ -143,6 +152,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 						...colorProps.style,
 					} }
 				/>
+				{ isCheckboxOrRadio && content }
 			</span>
 		</div>
 	);
diff --git a/packages/block-library/src/form-input/index.js b/packages/block-library/src/form-input/index.js
index b700e0ade6ca7f..8e0548a6b24dbf 100644
--- a/packages/block-library/src/form-input/index.js
+++ b/packages/block-library/src/form-input/index.js
@@ -2,6 +2,7 @@
  * Internal dependencies
  */
 import initBlock from '../utils/init-block';
+import deprecated from './deprecated';
 import edit from './edit';
 import metadata from './block.json';
 import save from './save';
@@ -12,6 +13,7 @@ const { name } = metadata;
 export { metadata, name };
 
 export const settings = {
+	deprecated,
 	edit,
 	save,
 	variations,
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index 1404e40634e82e..941c23dc2014d1 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 import removeAccents from 'remove-accents';
 
 /**
@@ -9,6 +9,7 @@ import removeAccents from 'remove-accents';
  */
 import {
 	RichText,
+	useBlockProps,
 	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
 	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
 } from '@wordpress/block-editor';
@@ -45,37 +46,51 @@ export default function save( { attributes } ) {
 		...colorProps.style,
 	};
 
-	const inputClasses = classNames(
+	const inputClasses = clsx(
 		'wp-block-form-input__input',
 		colorProps.className,
 		borderProps.className
 	);
 	const TagName = type === 'textarea' ? 'textarea' : 'input';
 
+	const blockProps = useBlockProps.save();
+
+	// Note: radio inputs aren't implemented yet.
+	const isCheckboxOrRadio = type === 'checkbox' || type === 'radio';
+
 	if ( 'hidden' === type ) {
 		return <input type={ type } name={ name } value={ value } />;
 	}
 
-	/* eslint-disable jsx-a11y/label-has-associated-control */
 	return (
-		<label
-			className={ classNames( 'wp-block-form-input__label', {
-				'is-label-inline': inlineLabel,
-			} ) }
-		>
-			<span className="wp-block-form-input__label-content">
-				<RichText.Content value={ label } />
-			</span>
-			<TagName
-				className={ inputClasses }
-				type={ 'textarea' === type ? undefined : type }
-				name={ name || getNameFromLabel( label ) }
-				required={ required }
-				aria-required={ required }
-				placeholder={ placeholder || undefined }
-				style={ inputStyle }
-			/>
-		</label>
+		<div { ...blockProps }>
+			{ /* eslint-disable jsx-a11y/label-has-associated-control */ }
+			<label
+				className={ clsx( 'wp-block-form-input__label', {
+					'is-label-inline': inlineLabel,
+				} ) }
+			>
+				{ ! isCheckboxOrRadio && (
+					<span className="wp-block-form-input__label-content">
+						<RichText.Content value={ label } />
+					</span>
+				) }
+				<TagName
+					className={ inputClasses }
+					type={ 'textarea' === type ? undefined : type }
+					name={ name || getNameFromLabel( label ) }
+					required={ required }
+					aria-required={ required }
+					placeholder={ placeholder || undefined }
+					style={ inputStyle }
+				/>
+				{ isCheckboxOrRadio && (
+					<span className="wp-block-form-input__label-content">
+						<RichText.Content value={ label } />
+					</span>
+				) }
+			</label>
+			{ /* eslint-enable jsx-a11y/label-has-associated-control */ }
+		</div>
 	);
-	/* eslint-enable jsx-a11y/label-has-associated-control */
 }
diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index d45fc8d7f1f729..7b1ac53cc89c01 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -15,15 +15,17 @@
 		}
 	}
 
-	/*
-	Small tweak to left-align the checkbox.
-	Even though `:has` is not currently supported in Firefox, this is a small tweak
-	and does not affect the functionality of the block or the user's experience.
-	There will be a minor inconsistency between browsers. However, it's more important to provide
-	a better experience for 80+% of users, until Firefox catches up and supports `:has`.
-	*/
 	&:has(input[type="checkbox"]) {
+		flex-direction: row;
 		width: fit-content;
+
+		.wp-block-form-input__label-content {
+			margin: 0;
+		}
+	}
+
+	&:has(.wp-block-form-input__label-content + input[type="checkbox"]) {
+		/* stylelint-disable-next-line declaration-property-value-allowed-list -- This style is required for old markup. */
 		flex-direction: row-reverse;
 	}
 }
diff --git a/packages/block-library/src/form-submission-notification/edit.js b/packages/block-library/src/form-submission-notification/edit.js
index 4425a4d9147dfb..01a0c589584dd5 100644
--- a/packages/block-library/src/form-submission-notification/edit.js
+++ b/packages/block-library/src/form-submission-notification/edit.js
@@ -13,7 +13,7 @@ import { useSelect } from '@wordpress/data';
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 const TEMPLATE = [
 	[
@@ -29,7 +29,7 @@ const TEMPLATE = [
 const Edit = ( { attributes, clientId } ) => {
 	const { type } = attributes;
 	const blockProps = useBlockProps( {
-		className: classnames( 'wp-block-form-submission-notification', {
+		className: clsx( 'wp-block-form-submission-notification', {
 			[ `form-notification-type-${ type }` ]: type,
 		} ),
 	} );
diff --git a/packages/block-library/src/form-submission-notification/save.js b/packages/block-library/src/form-submission-notification/save.js
index 7b3c6c895c192a..d2578b85f7eb6c 100644
--- a/packages/block-library/src/form-submission-notification/save.js
+++ b/packages/block-library/src/form-submission-notification/save.js
@@ -6,7 +6,7 @@ import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 export default function save( { attributes } ) {
 	const { type } = attributes;
@@ -15,12 +15,9 @@ export default function save( { attributes } ) {
 		<div
 			{ ...useInnerBlocksProps.save(
 				useBlockProps.save( {
-					className: classnames(
-						'wp-block-form-submission-notification',
-						{
-							[ `form-notification-type-${ type }` ]: type,
-						}
-					),
+					className: clsx( 'wp-block-form-submission-notification', {
+						[ `form-notification-type-${ type }` ]: type,
+					} ),
 				} )
 			) }
 		/>
diff --git a/packages/block-library/src/form-submit-button/block.json b/packages/block-library/src/form-submit-button/block.json
index b3fbd0ccee69c2..97ced49e70b22a 100644
--- a/packages/block-library/src/form-submit-button/block.json
+++ b/packages/block-library/src/form-submit-button/block.json
@@ -7,6 +7,7 @@
 	"category": "common",
 	"icon": "button",
 	"ancestor": [ "core/form" ],
+	"allowedBlocks": [ "core/buttons", "core/button" ],
 	"description": "A submission button for forms.",
 	"keywords": [ "submit", "button", "form" ],
 	"textdomain": "default",
diff --git a/packages/block-library/src/form-submit-button/edit.js b/packages/block-library/src/form-submit-button/edit.js
index 4b22b26fd4755c..e2bcbe067c70ca 100644
--- a/packages/block-library/src/form-submit-button/edit.js
+++ b/packages/block-library/src/form-submit-button/edit.js
@@ -23,7 +23,6 @@ const TEMPLATE = [
 const Edit = () => {
 	const blockProps = useBlockProps();
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: TEMPLATE,
 		template: TEMPLATE,
 		templateLock: 'all',
 	} );
diff --git a/packages/block-library/src/form-submit-button/save.js b/packages/block-library/src/form-submit-button/save.js
index ba361ebe9db209..eb703c4a0a4c54 100644
--- a/packages/block-library/src/form-submit-button/save.js
+++ b/packages/block-library/src/form-submit-button/save.js
@@ -3,12 +3,11 @@
  */
 import { useBlockProps, InnerBlocks } from '@wordpress/block-editor';
 
-const Save = () => {
+export default function save() {
 	const blockProps = useBlockProps.save();
 	return (
 		<div className="wp-block-form-submit-wrapper" { ...blockProps }>
 			<InnerBlocks.Content />
 		</div>
 	);
-};
-export default Save;
+}
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index 0c6451f4959a48..fa5212822cc71e 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -5,6 +5,15 @@
 	"name": "core/form",
 	"title": "Form",
 	"category": "common",
+	"allowedBlocks": [
+		"core/paragraph",
+		"core/heading",
+		"core/form-input",
+		"core/form-submit-button",
+		"core/form-submission-notification",
+		"core/group",
+		"core/columns"
+	],
 	"description": "A form.",
 	"keywords": [ "container", "wrapper", "row", "section" ],
 	"textdomain": "default",
diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 7fded64837de9d..a7260afabedf39 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -20,16 +20,6 @@ import {
 	formSubmissionNotificationError,
 } from './utils.js';
 
-const ALLOWED_BLOCKS = [
-	'core/paragraph',
-	'core/heading',
-	'core/form-input',
-	'core/form-submit-button',
-	'core/form-submission-notification',
-	'core/group',
-	'core/columns',
-];
-
 const TEMPLATE = [
 	formSubmissionNotificationSuccess,
 	formSubmissionNotificationError,
@@ -76,7 +66,6 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 	);
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: ALLOWED_BLOCKS,
 		template: TEMPLATE,
 		renderAppender: hasInnerBlocks
 			? undefined
@@ -88,8 +77,8 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
 					<SelectControl
-						// __nextHasNoMarginBottom
-						// size={ '__unstable-large' }
+						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 						label={ __( 'Submissions method' ) }
 						options={ [
 							// TODO: Allow plugins to add their own submission methods.
@@ -119,6 +108,7 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 					{ submissionMethod === 'email' && (
 						<TextControl
 							__nextHasNoMarginBottom
+							__next40pxDefaultSize
 							autoComplete="off"
 							label={ __( 'Email for form submissions' ) }
 							value={ email }
@@ -140,6 +130,7 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 			{ submissionMethod !== 'email' && (
 				<InspectorControls group="advanced">
 					<SelectControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ __( 'Method' ) }
 						options={ [
@@ -155,6 +146,7 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 						) }
 					/>
 					<TextControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						autoComplete="off"
 						label={ __( 'Form action' ) }
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index b9e3a9c25c6286..c887d46ad86188 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -92,11 +92,11 @@ function block_core_form_send_email() {
 	// Start building the email content.
 	$content = sprintf(
 		/* translators: %s: The request URI. */
-		__( 'Form submission from %1$s', 'gutenberg' ) . '</br>',
+		__( 'Form submission from %1$s' ) . '</br>',
 		'<a href="' . esc_url( get_site_url( null, $params['_wp_http_referer'] ) ) . '">' . get_bloginfo( 'name' ) . '</a>'
 	);
 
-	$skip_fields = array( 'formAction', '_ajax_nonce', 'action' );
+	$skip_fields = array( 'formAction', '_ajax_nonce', 'action', '_wp_http_referer' );
 	foreach ( $params as $key => $value ) {
 		if ( in_array( $key, $skip_fields, true ) ) {
 			continue;
@@ -109,8 +109,8 @@ function block_core_form_send_email() {
 
 	// Send the email.
 	$result = wp_mail(
-		str_replace( 'mailto:', '', $params['wp-email-address'] ),
-		__( 'Form submission', 'gutenberg' ),
+		str_replace( 'mailto:', '', $params['formAction'] ),
+		__( 'Form submission' ),
 		$content
 	);
 
diff --git a/packages/block-library/src/form/save.js b/packages/block-library/src/form/save.js
index a824fc076d2ac3..daeedd3ef67e8c 100644
--- a/packages/block-library/src/form/save.js
+++ b/packages/block-library/src/form/save.js
@@ -3,7 +3,7 @@
  */
 import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
 
-const Save = ( { attributes } ) => {
+export default function save( { attributes } ) {
 	const blockProps = useBlockProps.save();
 	const { submissionMethod } = attributes;
 
@@ -16,5 +16,4 @@ const Save = ( { attributes } ) => {
 			<InnerBlocks.Content />
 		</form>
 	);
-};
-export default Save;
+}
diff --git a/packages/block-library/src/form/view.js b/packages/block-library/src/form/view.js
index 05efe95da545c9..d162d66020f44b 100644
--- a/packages/block-library/src/form/view.js
+++ b/packages/block-library/src/form/view.js
@@ -20,6 +20,8 @@ document.querySelectorAll( 'form.wp-block-form' ).forEach( function ( form ) {
 		formData.formAction = form.action;
 		formData._ajax_nonce = wpBlockFormSettings.nonce;
 		formData.action = wpBlockFormSettings.action;
+		formData._wp_http_referer = window.location.href;
+		formData.formAction = form.action;
 
 		try {
 			const response = await fetch( wpBlockFormSettings.ajaxUrl, {
diff --git a/packages/block-library/src/freeform/edit.js b/packages/block-library/src/freeform/edit.js
index c41a78ca5c0422..b0ba245a6e7021 100644
--- a/packages/block-library/src/freeform/edit.js
+++ b/packages/block-library/src/freeform/edit.js
@@ -75,25 +75,28 @@ function ClassicEdit( {
 	onReplace,
 } ) {
 	const { getMultiSelectedBlockClientIds } = useSelect( blockEditorStore );
-	const didMount = useRef( false );
+	const didMountRef = useRef( false );
 
 	useEffect( () => {
-		if ( ! didMount.current ) {
+		if ( ! didMountRef.current ) {
 			return;
 		}
 
 		const editor = window.tinymce.get( `editor-${ clientId }` );
-		const currentContent = editor?.getContent();
+		if ( ! editor ) {
+			return;
+		}
 
+		const currentContent = editor.getContent();
 		if ( currentContent !== content ) {
 			editor.setContent( content || '' );
 		}
-	}, [ content ] );
+	}, [ clientId, content ] );
 
 	useEffect( () => {
 		const { baseURL, suffix } = window.wpEditorL10n.tinymce;
 
-		didMount.current = true;
+		didMountRef.current = true;
 
 		window.tinymce.EditorManager.overrideDefaults( {
 			base_url: baseURL,
@@ -227,6 +230,7 @@ function ClassicEdit( {
 				onReadyStateChange
 			);
 			wp.oldEditor.remove( `editor-${ clientId }` );
+			didMountRef.current = false;
 		};
 	}, [] );
 
diff --git a/packages/block-library/src/freeform/editor.scss b/packages/block-library/src/freeform/editor.scss
index 7329eb6e5fb064..c2256ecd7a795f 100644
--- a/packages/block-library/src/freeform/editor.scss
+++ b/packages/block-library/src/freeform/editor.scss
@@ -299,7 +299,7 @@ div[data-type="core/freeform"] {
 	top: 0;
 	border: $border-width solid $gray-300;
 	border-bottom: none;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	margin-bottom: $grid-unit-10;
 
 	// On mobile, toolbars go edge to edge.
diff --git a/packages/block-library/src/freeform/modal.js b/packages/block-library/src/freeform/modal.js
index c1b10a61de808d..4ed4ef4d3a07ca 100644
--- a/packages/block-library/src/freeform/modal.js
+++ b/packages/block-library/src/freeform/modal.js
@@ -25,6 +25,7 @@ function ModalAuxiliaryActions( { onClick, isModalFullScreen } ) {
 
 	return (
 		<Button
+			size="small"
 			onClick={ onClick }
 			icon={ fullscreen }
 			isPressed={ isModalFullScreen }
@@ -120,12 +121,17 @@ export default function ModalEdit( props ) {
 						expanded={ false }
 					>
 						<FlexItem>
-							<Button variant="tertiary" onClick={ onClose }>
+							<Button
+								__next40pxDefaultSize
+								variant="tertiary"
+								onClick={ onClose }
+							>
 								{ __( 'Cancel' ) }
 							</Button>
 						</FlexItem>
 						<FlexItem>
 							<Button
+								__next40pxDefaultSize
 								variant="primary"
 								onClick={ () => {
 									setAttributes( {
diff --git a/packages/block-library/src/gallery/block.json b/packages/block-library/src/gallery/block.json
index 0867989af4ec7e..6a2129ec1e056f 100644
--- a/packages/block-library/src/gallery/block.json
+++ b/packages/block-library/src/gallery/block.json
@@ -4,6 +4,7 @@
 	"name": "core/gallery",
 	"title": "Gallery",
 	"category": "media",
+	"allowedBlocks": [ "core/image" ],
 	"description": "Display multiple images in a rich gallery.",
 	"keywords": [ "images", "photos" ],
 	"textdomain": "default",
@@ -46,8 +47,8 @@
 					"attribute": "data-id"
 				},
 				"caption": {
-					"type": "string",
-					"source": "html",
+					"type": "rich-text",
+					"source": "rich-text",
 					"selector": ".blocks-gallery-item__caption"
 				}
 			}
@@ -72,14 +73,18 @@
 			"maximum": 8
 		},
 		"caption": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": ".blocks-gallery-caption"
 		},
 		"imageCrop": {
 			"type": "boolean",
 			"default": true
 		},
+		"randomOrder": {
+			"type": "boolean",
+			"default": false
+		},
 		"fixedHeight": {
 			"type": "boolean",
 			"default": true
@@ -107,6 +112,16 @@
 	"supports": {
 		"anchor": true,
 		"align": true,
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"color": true,
+				"radius": true
+			}
+		},
 		"html": false,
 		"units": [ "px", "em", "rem", "vh", "vw" ],
 		"spacing": {
@@ -132,6 +147,9 @@
 			"default": {
 				"type": "flex"
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-gallery-editor",
diff --git a/packages/block-library/src/gallery/constants.js b/packages/block-library/src/gallery/constants.js
index f4a06914393132..19fc61cac84583 100644
--- a/packages/block-library/src/gallery/constants.js
+++ b/packages/block-library/src/gallery/constants.js
@@ -1,5 +1,6 @@
 export const LINK_DESTINATION_NONE = 'none';
 export const LINK_DESTINATION_MEDIA = 'media';
+export const LINK_DESTINATION_LIGHTBOX = 'lightbox';
 export const LINK_DESTINATION_ATTACHMENT = 'attachment';
 export const LINK_DESTINATION_MEDIA_WP_CORE = 'file';
 export const LINK_DESTINATION_ATTACHMENT_WP_CORE = 'post';
diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index 89df39d48ab1dd..c2d3778d463f8a 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -22,7 +22,6 @@ import {
 	LINK_DESTINATION_MEDIA,
 	LINK_DESTINATION_NONE,
 } from './constants';
-import { isGalleryV2Enabled } from './shared';
 
 const DEPRECATED_LINK_DESTINATION_MEDIA = 'file';
 const DEPRECATED_LINK_DESTINATION_ATTACHMENT = 'post';
@@ -228,7 +227,7 @@ const v7 = {
 	save( { attributes } ) {
 		const { caption, columns, imageCrop } = attributes;
 
-		const className = classnames( 'has-nested-images', {
+		const className = clsx( 'has-nested-images', {
 			[ `columns-${ columns }` ]: columns !== undefined,
 			[ `columns-default` ]: columns === undefined,
 			'is-cropped': imageCrop,
@@ -408,11 +407,7 @@ const v6 = {
 		);
 	},
 	migrate( attributes ) {
-		if ( isGalleryV2Enabled() ) {
-			return runV2Migration( attributes );
-		}
-
-		return attributes;
+		return runV2Migration( attributes );
 	},
 };
 const v5 = {
@@ -498,23 +493,7 @@ const v5 = {
 		return ! linkTo || linkTo === 'attachment' || linkTo === 'media';
 	},
 	migrate( attributes ) {
-		if ( isGalleryV2Enabled() ) {
-			return runV2Migration( attributes );
-		}
-
-		let linkTo = attributes.linkTo;
-
-		if ( ! attributes.linkTo ) {
-			linkTo = 'none';
-		} else if ( attributes.linkTo === 'attachment' ) {
-			linkTo = 'post';
-		} else if ( attributes.linkTo === 'media' ) {
-			linkTo = 'file';
-		}
-		return {
-			...attributes,
-			linkTo,
-		};
+		return runV2Migration( attributes );
 	},
 	save( { attributes } ) {
 		const {
@@ -661,17 +640,7 @@ const v4 = {
 		return ids && ids.some( ( id ) => typeof id === 'string' );
 	},
 	migrate( attributes ) {
-		if ( isGalleryV2Enabled() ) {
-			return runV2Migration( attributes );
-		}
-
-		return {
-			...attributes,
-			ids: ( attributes.ids ?? [] ).map( ( id ) => {
-				const parsedId = parseInt( id, 10 );
-				return Number.isInteger( parsedId ) ? parsedId : null;
-			} ),
-		};
+		return runV2Migration( attributes );
 	},
 	save( { attributes } ) {
 		const {
@@ -867,10 +836,7 @@ const v3 = {
 		);
 	},
 	migrate( attributes ) {
-		if ( isGalleryV2Enabled() ) {
-			return runV2Migration( attributes );
-		}
-		return attributes;
+		return runV2Migration( attributes );
 	},
 };
 const v2 = {
@@ -936,18 +902,7 @@ const v2 = {
 		);
 	},
 	migrate( attributes ) {
-		if ( isGalleryV2Enabled() ) {
-			return runV2Migration( attributes );
-		}
-		return {
-			...attributes,
-			ids: ( attributes.images ?? [] ).map( ( { id } ) => {
-				if ( ! id ) {
-					return null;
-				}
-				return parseInt( id, 10 );
-			} ),
-		};
+		return runV2Migration( attributes );
 	},
 	supports: {
 		align: true,
@@ -1061,7 +1016,7 @@ const v1 = {
 			imageCrop,
 			linkTo,
 		} = attributes;
-		const className = classnames( `columns-${ columns }`, {
+		const className = clsx( `columns-${ columns }`, {
 			alignnone: align === 'none',
 			'is-cropped': imageCrop,
 		} );
@@ -1100,11 +1055,7 @@ const v1 = {
 		);
 	},
 	migrate( attributes ) {
-		if ( isGalleryV2Enabled() ) {
-			return runV2Migration( attributes );
-		}
-
-		return attributes;
+		return runV2Migration( attributes );
 	},
 };
 
diff --git a/packages/block-library/src/gallery/edit-wrapper.js b/packages/block-library/src/gallery/edit-wrapper.js
deleted file mode 100644
index 2c81271902d312..00000000000000
--- a/packages/block-library/src/gallery/edit-wrapper.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { compose } from '@wordpress/compose';
-import { withNotices } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import EditWithInnerBlocks from './edit';
-import EditWithoutInnerBlocks from './v1/edit';
-import { isGalleryV2Enabled } from './shared';
-
-/*
- * Using a wrapper around the logic to load the edit for v1 of Gallery block
- * or the refactored version with InnerBlocks. This is to prevent conditional
- * use of hooks lint errors if adding this logic to the top of the edit component.
- */
-function GalleryEditWrapper( props ) {
-	if ( ! isGalleryV2Enabled() ) {
-		return <EditWithoutInnerBlocks { ...props } />;
-	}
-
-	return <EditWithInnerBlocks { ...props } />;
-}
-
-export default compose( [ withNotices ] )( GalleryEditWrapper );
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index e73e1e76b9c5f0..d3ec2ce007e6a9 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -1,12 +1,11 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { compose } from '@wordpress/compose';
 import {
 	BaseControl,
 	PanelBody,
@@ -14,6 +13,9 @@ import {
 	ToggleControl,
 	RangeControl,
 	Spinner,
+	MenuGroup,
+	MenuItem,
+	ToolbarDropdownMenu,
 } from '@wordpress/components';
 import {
 	store as blockEditorStore,
@@ -23,15 +25,22 @@ import {
 	useInnerBlocksProps,
 	BlockControls,
 	MediaReplaceFlow,
+	useSettings,
 } from '@wordpress/block-editor';
 import { Platform, useEffect, useMemo } from '@wordpress/element';
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
-import { withViewportMatch } from '@wordpress/viewport';
 import { View } from '@wordpress/primitives';
 import { createBlock } from '@wordpress/blocks';
 import { createBlobURL } from '@wordpress/blob';
 import { store as noticesStore } from '@wordpress/notices';
+import {
+	link as linkIcon,
+	customLink,
+	image as imageIcon,
+	linkOff,
+	fullscreen,
+} from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -48,6 +57,7 @@ import {
 	LINK_DESTINATION_ATTACHMENT,
 	LINK_DESTINATION_MEDIA,
 	LINK_DESTINATION_NONE,
+	LINK_DESTINATION_LIGHTBOX,
 } from './constants';
 import useImageSizes from './use-image-sizes';
 import useGetNewImages from './use-get-new-images';
@@ -55,16 +65,34 @@ import useGetMedia from './use-get-media';
 import GapStyles from './gap-styles';
 
 const MAX_COLUMNS = 8;
-const linkOptions = [
-	{ value: LINK_DESTINATION_ATTACHMENT, label: __( 'Attachment Page' ) },
-	{ value: LINK_DESTINATION_MEDIA, label: __( 'Media File' ) },
+const LINK_OPTIONS = [
 	{
-		value: LINK_DESTINATION_NONE,
+		icon: customLink,
+		label: __( 'Link images to attachment pages' ),
+		value: LINK_DESTINATION_ATTACHMENT,
+		noticeText: __( 'Attachment Pages' ),
+	},
+	{
+		icon: imageIcon,
+		label: __( 'Link images to media files' ),
+		value: LINK_DESTINATION_MEDIA,
+		noticeText: __( 'Media Files' ),
+	},
+	{
+		icon: fullscreen,
+		label: __( 'Expand on click' ),
+		value: LINK_DESTINATION_LIGHTBOX,
+		noticeText: __( 'Lightbox effect' ),
+		infoText: __( 'Scale images with a lightbox effect' ),
+	},
+	{
+		icon: linkOff,
 		label: _x( 'None', 'Media item link option' ),
+		value: LINK_DESTINATION_NONE,
+		noticeText: __( 'None' ),
 	},
 ];
 const ALLOWED_MEDIA_TYPES = [ 'image' ];
-const allowedBlocks = [ 'core/image' ];
 
 const PLACEHOLDER_TEXT = Platform.isNative
 	? __( 'Add media' )
@@ -74,7 +102,10 @@ const MOBILE_CONTROL_PROPS_RANGE_CONTROL = Platform.isNative
 	? { type: 'stepper' }
 	: {};
 
-function GalleryEdit( props ) {
+const DEFAULT_BLOCK = { name: 'core/image' };
+const EMPTY_ARRAY = [];
+
+export default function GalleryEdit( props ) {
 	const {
 		setAttributes,
 		attributes,
@@ -86,7 +117,16 @@ function GalleryEdit( props ) {
 		onFocus,
 	} = props;
 
-	const { columns, imageCrop, linkTarget, linkTo, sizeSlug } = attributes;
+	const [ lightboxSetting ] = useSettings( 'blocks.core/image.lightbox' );
+
+	const linkOptions = ! lightboxSetting?.allowEditing
+		? LINK_OPTIONS.filter(
+				( option ) => option.value !== LINK_DESTINATION_LIGHTBOX
+		  )
+		: LINK_OPTIONS;
+
+	const { columns, imageCrop, randomOrder, linkTarget, linkTo, sizeSlug } =
+		attributes;
 
 	const {
 		__unstableMarkNextChangeAsNotPersistent,
@@ -97,33 +137,39 @@ function GalleryEdit( props ) {
 	const { createSuccessNotice, createErrorNotice } =
 		useDispatch( noticesStore );
 
-	const { getBlock, getSettings, preferredStyle } = useSelect( ( select ) => {
-		const settings = select( blockEditorStore ).getSettings();
-		const preferredStyleVariations =
-			settings.__experimentalPreferredStyleVariations;
-		return {
-			getBlock: select( blockEditorStore ).getBlock,
-			getSettings: select( blockEditorStore ).getSettings,
-			preferredStyle: preferredStyleVariations?.value?.[ 'core/image' ],
-		};
-	}, [] );
-
-	const innerBlockImages = useSelect(
-		( select ) => {
-			const innerBlocks =
-				select( blockEditorStore ).getBlock( clientId )?.innerBlocks ??
-				[];
-			return innerBlocks;
-		},
-		[ clientId ]
-	);
-
-	const wasBlockJustInserted = useSelect(
+	const {
+		getBlock,
+		getSettings,
+		innerBlockImages,
+		blockWasJustInserted,
+		multiGallerySelection,
+	} = useSelect(
 		( select ) => {
-			return select( blockEditorStore ).wasBlockJustInserted(
-				clientId,
-				'inserter_menu'
-			);
+			const {
+				getBlockName,
+				getMultiSelectedBlockClientIds,
+				getSettings: _getSettings,
+				getBlock: _getBlock,
+				wasBlockJustInserted,
+			} = select( blockEditorStore );
+			const multiSelectedClientIds = getMultiSelectedBlockClientIds();
+
+			return {
+				getBlock: _getBlock,
+				getSettings: _getSettings,
+				innerBlockImages:
+					_getBlock( clientId )?.innerBlocks ?? EMPTY_ARRAY,
+				blockWasJustInserted: wasBlockJustInserted(
+					clientId,
+					'inserter_menu'
+				),
+				multiGallerySelection:
+					multiSelectedClientIds.length &&
+					multiSelectedClientIds.every(
+						( _clientId ) =>
+							getBlockName( _clientId ) === 'core/gallery'
+					),
+			};
 		},
 		[ clientId ]
 	);
@@ -182,10 +228,6 @@ function GalleryEdit( props ) {
 		let newClassName;
 		if ( imageAttributes.className && imageAttributes.className !== '' ) {
 			newClassName = imageAttributes.className;
-		} else {
-			newClassName = preferredStyle
-				? `is-style-${ preferredStyle }`
-				: undefined;
 		}
 
 		let newLinkTarget;
@@ -232,7 +274,7 @@ function GalleryEdit( props ) {
 		return (
 			ALLOWED_MEDIA_TYPES.some(
 				( mediaType ) => mediaTypeSelector?.indexOf( mediaType ) === 0
-			) || file.url?.indexOf( 'blob:' ) === 0
+			) || file.blob
 		);
 	}
 
@@ -244,9 +286,9 @@ function GalleryEdit( props ) {
 		const imageArray = newFileUploads
 			? Array.from( selectedImages ).map( ( file ) => {
 					if ( ! file.url ) {
-						return pickRelevantMediaFiles( {
-							url: createBlobURL( file ),
-						} );
+						return {
+							blob: createBlobURL( file ),
+						};
 					}
 
 					return file;
@@ -266,9 +308,9 @@ function GalleryEdit( props ) {
 			.filter( ( file ) => file.url || isValidFileType( file ) )
 			.map( ( file ) => {
 				if ( ! file.url ) {
-					return pickRelevantMediaFiles( {
-						url: createBlobURL( file ),
-					} );
+					return {
+						blob: file.blob || createBlobURL( file ),
+					};
 				}
 
 				return file;
@@ -302,6 +344,7 @@ function GalleryEdit( props ) {
 		const newBlocks = newImageList.map( ( image ) => {
 			return createBlock( 'core/image', {
 				id: image.id,
+				blob: image.blob,
 				url: image.url,
 				caption: image.caption,
 				alt: image.alt,
@@ -338,9 +381,13 @@ function GalleryEdit( props ) {
 			const image = block.attributes.id
 				? imageData.find( ( { id } ) => id === block.attributes.id )
 				: null;
+
 			changedAttributes[ block.clientId ] = getHrefAndDestination(
 				image,
-				value
+				value,
+				false,
+				block.attributes,
+				lightboxSetting
 			);
 		} );
 		updateBlockAttributes( blocks, changedAttributes, true );
@@ -352,7 +399,7 @@ function GalleryEdit( props ) {
 			sprintf(
 				/* translators: %s: image size settings */
 				__( 'All gallery image links updated to: %s' ),
-				linkToText.label
+				linkToText.noticeText
 			),
 			{
 				id: 'gallery-attributes-linkTo',
@@ -369,10 +416,8 @@ function GalleryEdit( props ) {
 		setAttributes( { imageCrop: ! imageCrop } );
 	}
 
-	function getImageCropHelp( checked ) {
-		return checked
-			? __( 'Thumbnails are cropped to align.' )
-			: __( 'Thumbnails are not cropped.' );
+	function toggleRandomOrder() {
+		setAttributes( { randomOrder: ! randomOrder } );
 	}
 
 	function toggleOpenInNewTab( openInNewTab ) {
@@ -463,7 +508,7 @@ function GalleryEdit( props ) {
 				( hasImages && ! isSelected ) || imagesUploading,
 			value: hasImageIds ? images : {},
 			autoOpenMediaUpload:
-				! hasImages && isSelected && wasBlockJustInserted,
+				! hasImages && isSelected && blockWasJustInserted,
 			onFocus,
 		},
 	} );
@@ -485,7 +530,7 @@ function GalleryEdit( props ) {
 	);
 
 	const blockProps = useBlockProps( {
-		className: classnames( className, 'has-nested-images' ),
+		className: clsx( className, 'has-nested-images' ),
 	} );
 
 	const nativeInnerBlockProps = Platform.isNative && {
@@ -494,7 +539,8 @@ function GalleryEdit( props ) {
 	};
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks,
+		defaultBlock: DEFAULT_BLOCK,
+		directInsert: true,
 		orientation: 'horizontal',
 		renderAppender: false,
 		...nativeInnerBlockProps,
@@ -532,50 +578,60 @@ function GalleryEdit( props ) {
 							__next40pxDefaultSize
 						/>
 					) }
+					{ imageSizeOptions?.length > 0 && (
+						<SelectControl
+							__nextHasNoMarginBottom
+							label={ __( 'Resolution' ) }
+							help={ __(
+								'Select the size of the source images.'
+							) }
+							value={ sizeSlug }
+							options={ imageSizeOptions }
+							onChange={ updateImagesSize }
+							hideCancelButton
+							size="__unstable-large"
+						/>
+					) }
+					{ Platform.isNative ? (
+						<SelectControl
+							__nextHasNoMarginBottom
+							label={ __( 'Link' ) }
+							value={ linkTo }
+							onChange={ setLinkTo }
+							options={ linkOptions }
+							hideCancelButton
+							size="__unstable-large"
+						/>
+					) : null }
 					<ToggleControl
 						__nextHasNoMarginBottom
-						label={ __( 'Crop images' ) }
+						label={ __( 'Crop images to fit' ) }
 						checked={ !! imageCrop }
 						onChange={ toggleImageCrop }
-						help={ getImageCropHelp }
 					/>
-					<SelectControl
+					<ToggleControl
 						__nextHasNoMarginBottom
-						label={ __( 'Link to' ) }
-						value={ linkTo }
-						onChange={ setLinkTo }
-						options={ linkOptions }
-						hideCancelButton={ true }
-						size="__unstable-large"
+						label={ __( 'Randomize order' ) }
+						checked={ !! randomOrder }
+						onChange={ toggleRandomOrder }
 					/>
 					{ hasLinkTo && (
 						<ToggleControl
 							__nextHasNoMarginBottom
-							label={ __( 'Open in new tab' ) }
+							label={ __( 'Open images in new tab' ) }
 							checked={ linkTarget === '_blank' }
 							onChange={ toggleOpenInNewTab }
 						/>
 					) }
-					{ imageSizeOptions?.length > 0 && (
-						<SelectControl
-							__nextHasNoMarginBottom
-							label={ __( 'Resolution' ) }
-							help={ __(
-								'Select the size of the source images.'
-							) }
-							value={ sizeSlug }
-							options={ imageSizeOptions }
-							onChange={ updateImagesSize }
-							hideCancelButton={ true }
-							size="__unstable-large"
-						/>
-					) }
 					{ Platform.isWeb && ! imageSizeOptions && hasImageIds && (
-						<BaseControl className={ 'gallery-image-sizes' }>
+						<BaseControl
+							className="gallery-image-sizes"
+							__nextHasNoMarginBottom
+						>
 							<BaseControl.VisualLabel>
 								{ __( 'Resolution' ) }
 							</BaseControl.VisualLabel>
-							<View className={ 'gallery-image-sizes__loading' }>
+							<View className="gallery-image-sizes__loading">
 								<Spinner />
 								{ __( 'Loading options…' ) }
 							</View>
@@ -583,22 +639,64 @@ function GalleryEdit( props ) {
 					) }
 				</PanelBody>
 			</InspectorControls>
+			{ Platform.isWeb ? (
+				<BlockControls group="block">
+					<ToolbarDropdownMenu
+						icon={ linkIcon }
+						label={ __( 'Link' ) }
+					>
+						{ ( { onClose } ) => (
+							<MenuGroup>
+								{ linkOptions.map( ( linkItem ) => {
+									const isOptionSelected =
+										linkTo === linkItem.value;
+									return (
+										<MenuItem
+											key={ linkItem.value }
+											isSelected={ isOptionSelected }
+											className={ clsx(
+												'components-dropdown-menu__menu-item',
+												{
+													'is-active':
+														isOptionSelected,
+												}
+											) }
+											iconPosition="left"
+											icon={ linkItem.icon }
+											onClick={ () => {
+												setLinkTo( linkItem.value );
+												onClose();
+											} }
+											role="menuitemradio"
+											info={ linkItem.infoText }
+										>
+											{ linkItem.label }
+										</MenuItem>
+									);
+								} ) }
+							</MenuGroup>
+						) }
+					</ToolbarDropdownMenu>
+				</BlockControls>
+			) : null }
 			{ Platform.isWeb && (
 				<>
-					<BlockControls group="other">
-						<MediaReplaceFlow
-							allowedTypes={ ALLOWED_MEDIA_TYPES }
-							accept="image/*"
-							handleUpload={ false }
-							onSelect={ updateImages }
-							name={ __( 'Add' ) }
-							multiple={ true }
-							mediaIds={ images
-								.filter( ( image ) => image.id )
-								.map( ( image ) => image.id ) }
-							addToGallery={ hasImageIds }
-						/>
-					</BlockControls>
+					{ ! multiGallerySelection && (
+						<BlockControls group="other">
+							<MediaReplaceFlow
+								allowedTypes={ ALLOWED_MEDIA_TYPES }
+								accept="image/*"
+								handleUpload={ false }
+								onSelect={ updateImages }
+								name={ __( 'Add' ) }
+								multiple
+								mediaIds={ images
+									.filter( ( image ) => image.id )
+									.map( ( image ) => image.id ) }
+								addToGallery={ hasImageIds }
+							/>
+						</BlockControls>
+					) }
 					<GapStyles
 						blockGap={ attributes.style?.spacing?.blockGap }
 						clientId={ clientId }
@@ -616,10 +714,8 @@ function GalleryEdit( props ) {
 				}
 				blockProps={ innerBlocksProps }
 				insertBlocksAfter={ insertBlocksAfter }
+				multiGallerySelection={ multiGallerySelection }
 			/>
 		</>
 	);
 }
-export default compose( [ withViewportMatch( { isNarrow: '< small' } ) ] )(
-	GalleryEdit
-);
diff --git a/packages/block-library/src/gallery/editor.scss b/packages/block-library/src/gallery/editor.scss
index ec2b3b08a459cf..61121f3dd866dc 100644
--- a/packages/block-library/src/gallery/editor.scss
+++ b/packages/block-library/src/gallery/editor.scss
@@ -1,4 +1,7 @@
-figure.wp-block-gallery {
+// Adding `figure` to the selector increases the specificity above the global
+// styles specificity, which is levelled at 0-1-0. We should figure out why
+// `figure` is needed.
+:root :where(figure.wp-block-gallery) {
 	// Override the default list style type _only in the editor_
 	// to avoid :not() selector specificity issues.
 	// See https://github.com/WordPress/gutenberg/pull/10358
@@ -27,7 +30,7 @@ figure.wp-block-gallery {
 		}
 	}
 
-	// @todo: this deserves a refactor, by being moved to the toolbar.
+	// @todo this deserves a refactor, by being moved to the toolbar.
 	.block-editor-media-placeholder.is-appender {
 		.components-placeholder__label {
 			display: none;
@@ -67,7 +70,6 @@ figure.wp-block-gallery {
 
 .gallery-image-sizes {
 	.components-base-control__label {
-		display: block;
 		margin-bottom: 4px;
 	}
 
@@ -137,12 +139,12 @@ figure.wp-block-gallery {
 	z-index: z-index(".block-library-gallery-item__inline-menu");
 	transition: box-shadow 0.2s ease-out;
 	@include reduce-motion("transition");
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	background: $white;
 	border: $border-width solid $gray-900;
 
 	&:hover {
-		box-shadow: $shadow-popover;
+		box-shadow: $elevation-x-small;
 	}
 
 	@include break-small() {
diff --git a/packages/block-library/src/gallery/gallery-styles.native.scss b/packages/block-library/src/gallery/gallery-styles.native.scss
index a3073592291b93..f9b4d63c55b815 100644
--- a/packages/block-library/src/gallery/gallery-styles.native.scss
+++ b/packages/block-library/src/gallery/gallery-styles.native.scss
@@ -1,5 +1,3 @@
-@import "./v1/gallery-styles.native.scss";
-
 .galleryAppender {
 	padding-top: $grid-unit-20;
 }
diff --git a/packages/block-library/src/gallery/gallery.js b/packages/block-library/src/gallery/gallery.js
index e898ae2e9fdcb5..96b70cb87a70cc 100644
--- a/packages/block-library/src/gallery/gallery.js
+++ b/packages/block-library/src/gallery/gallery.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -24,6 +24,7 @@ export default function Gallery( props ) {
 		blockProps,
 		__unstableLayoutClassNames: layoutClassNames,
 		isContentLocked,
+		multiGallerySelection,
 	} = props;
 
 	const { align, columns, imageCrop } = attributes;
@@ -31,7 +32,7 @@ export default function Gallery( props ) {
 	return (
 		<figure
 			{ ...blockProps }
-			className={ classnames(
+			className={ clsx(
 				blockProps.className,
 				layoutClassNames,
 				'blocks-gallery-grid',
@@ -54,7 +55,9 @@ export default function Gallery( props ) {
 				setAttributes={ setAttributes }
 				isSelected={ isSelected }
 				insertBlocksAfter={ insertBlocksAfter }
-				showToolbarButton={ ! isContentLocked }
+				showToolbarButton={
+					! multiGallerySelection && ! isContentLocked
+				}
 				className="blocks-gallery-caption"
 				label={ __( 'Gallery caption text' ) }
 				placeholder={ __( 'Add gallery caption' ) }
diff --git a/packages/block-library/src/gallery/gallery.native.js b/packages/block-library/src/gallery/gallery.native.js
index 8979d814a8da00..a5fa2db4fcf029 100644
--- a/packages/block-library/src/gallery/gallery.native.js
+++ b/packages/block-library/src/gallery/gallery.native.js
@@ -22,6 +22,7 @@ import { useState, useEffect } from '@wordpress/element';
 import { mediaUploadSync } from '@wordpress/react-native-bridge';
 import { WIDE_ALIGNMENTS } from '@wordpress/components';
 import { useResizeObserver } from '@wordpress/compose';
+import { withViewportMatch } from '@wordpress/viewport';
 
 const TILE_SPACING = 8;
 
@@ -64,7 +65,6 @@ export const Gallery = ( props ) => {
 		{},
 		{
 			contentResizeMode: 'stretch',
-			allowedBlocks: [ 'core/image' ],
 			orientation: 'horizontal',
 			renderAppender: false,
 			numColumns: displayedColumns,
@@ -101,7 +101,7 @@ export const Gallery = ( props ) => {
 			<BlockCaption
 				clientId={ clientId }
 				isSelected={ isCaptionSelected }
-				accessible={ true }
+				accessible
 				accessibilityLabelCreator={ ( caption ) =>
 					RichText.isEmpty( caption )
 						? /* translators: accessibility text. Empty gallery caption. */
@@ -121,4 +121,4 @@ export const Gallery = ( props ) => {
 	);
 };
 
-export default Gallery;
+export default withViewportMatch( { isNarrow: '< small' } )( Gallery );
diff --git a/packages/block-library/src/gallery/gap-styles.js b/packages/block-library/src/gallery/gap-styles.js
index 4c2002d4b7ddc8..a1ad61f02b9955 100644
--- a/packages/block-library/src/gallery/gap-styles.js
+++ b/packages/block-library/src/gallery/gap-styles.js
@@ -3,16 +3,9 @@
  */
 import {
 	__experimentalGetGapCSSValue as getGapCSSValue,
-	privateApis as blockEditorPrivateApis,
+	useStyleOverride,
 } from '@wordpress/block-editor';
 
-/**
- * Internal dependencies
- */
-import { unlock } from '../lock-unlock';
-
-const { useStyleOverride } = unlock( blockEditorPrivateApis );
-
 export default function GapStyles( { blockGap, clientId } ) {
 	// --gallery-block--gutter-size is deprecated. --wp--style--gallery-gap-default should be used by themes that want to set a default
 	// gap on the gallery.
diff --git a/packages/block-library/src/gallery/index.js b/packages/block-library/src/gallery/index.js
index f865072526098b..65a2cee3c5fec2 100644
--- a/packages/block-library/src/gallery/index.js
+++ b/packages/block-library/src/gallery/index.js
@@ -8,7 +8,7 @@ import { gallery as icon } from '@wordpress/icons';
  */
 import initBlock from '../utils/init-block';
 import deprecated from './deprecated';
-import edit from './edit-wrapper';
+import edit from './edit';
 import metadata from './block.json';
 import save from './save';
 import transforms from './transforms';
diff --git a/packages/block-library/src/gallery/index.php b/packages/block-library/src/gallery/index.php
index edde9b4da101a9..5af6be16d39a2b 100644
--- a/packages/block-library/src/gallery/index.php
+++ b/packages/block-library/src/gallery/index.php
@@ -13,6 +13,8 @@
  * we add a custom `data-id` attribute before rendering the gallery
  * so that the Image Block can pick it up in its render_callback.
  *
+ * @since 5.9.0
+ *
  * @param array $parsed_block The block being rendered.
  * @return array The migrated block object.
  */
@@ -33,17 +35,20 @@ function block_core_gallery_data_id_backcompatibility( $parsed_block ) {
 add_filter( 'render_block_data', 'block_core_gallery_data_id_backcompatibility' );
 
 /**
- * Adds a style tag for the --wp--style--unstable-gallery-gap var.
+ * Renders the `core/gallery` block on the server.
  *
- * The Gallery block needs to recalculate Image block width based on
- * the current gap setting in order to maintain the number of flex columns
- * so a css var is added to allow this.
+ * @since 6.0.0
  *
  * @param array  $attributes Attributes of the block being rendered.
  * @param string $content Content of the block being rendered.
  * @return string The content of the block being rendered.
  */
 function block_core_gallery_render( $attributes, $content ) {
+	// Adds a style tag for the --wp--style--unstable-gallery-gap var.
+	// The Gallery block needs to recalculate Image block width based on
+	// the current gap setting in order to maintain the number of flex columns
+	// so a css var is added to allow this.
+
 	$gap = $attributes['style']['spacing']['blockGap'] ?? null;
 	// Skip if gap value contains unsupported characters.
 	// Regex for CSS value borrowed from `safecss_filter_attr`, and used here
@@ -115,10 +120,56 @@ function block_core_gallery_render( $attributes, $content ) {
 			'context' => 'block-supports',
 		)
 	);
-	return (string) $processed_content;
+
+	// The WP_HTML_Tag_Processor class calls get_updated_html() internally
+	// when the instance is treated as a string, but here we explicitly
+	// convert it to a string.
+	$updated_content = $processed_content->get_updated_html();
+
+	/*
+	 * Randomize the order of image blocks. Ideally we should shuffle
+	 * the `$parsed_block['innerBlocks']` via the `render_block_data` hook.
+	 * However, this hook doesn't apply inner block updates when blocks are
+	 * nested.
+	 * @todo In the future, if this hook supports updating innerBlocks in
+	 * nested blocks, it should be refactored.
+	 *
+	 * @see: https://github.com/WordPress/gutenberg/pull/58733
+	 */
+	if ( empty( $attributes['randomOrder'] ) ) {
+		return $updated_content;
+	}
+
+	// This pattern matches figure elements with the `wp-block-image` class to
+	// avoid the gallery's wrapping `figure` element and extract images only.
+	$pattern = '/<figure[^>]*\bwp-block-image\b[^>]*>.*?<\/figure>/';
+
+	// Find all Image blocks.
+	preg_match_all( $pattern, $updated_content, $matches );
+	if ( ! $matches ) {
+		return $updated_content;
+	}
+	$image_blocks = $matches[0];
+
+	// Randomize the order of Image blocks.
+	shuffle( $image_blocks );
+	$i       = 0;
+	$content = preg_replace_callback(
+		$pattern,
+		static function () use ( $image_blocks, &$i ) {
+			$new_image_block = $image_blocks[ $i ];
+			++$i;
+			return $new_image_block;
+		},
+		$updated_content
+	);
+
+	return $content;
 }
 /**
  * Registers the `core/gallery` block on server.
+ *
+ * @since 5.9.0
  */
 function register_block_core_gallery() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 66253001e64182..cd8d35444285c9 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -13,20 +13,10 @@ import {
 	__experimentalGetElementClassName,
 } from '@wordpress/block-editor';
 
-/**
- * Internal dependencies
- */
-import saveWithoutInnerBlocks from './v1/save';
-import { isGalleryV2Enabled } from './shared';
-
 export default function saveWithInnerBlocks( { attributes } ) {
-	if ( ! isGalleryV2Enabled() ) {
-		return saveWithoutInnerBlocks( { attributes } );
-	}
-
 	const { caption, columns, imageCrop } = attributes;
 
-	const className = classnames( 'has-nested-images', {
+	const className = clsx( 'has-nested-images', {
 		[ `columns-${ columns }` ]: columns !== undefined,
 		[ `columns-default` ]: columns === undefined,
 		'is-cropped': imageCrop,
@@ -40,7 +30,7 @@ export default function saveWithInnerBlocks( { attributes } ) {
 			{ ! RichText.isEmpty( caption ) && (
 				<RichText.Content
 					tagName="figcaption"
-					className={ classnames(
+					className={ clsx(
 						'blocks-gallery-caption',
 						__experimentalGetElementClassName( 'caption' )
 					) }
diff --git a/packages/block-library/src/gallery/shared.js b/packages/block-library/src/gallery/shared.js
index 18fce746a79885..f904a9e13d0d5e 100644
--- a/packages/block-library/src/gallery/shared.js
+++ b/packages/block-library/src/gallery/shared.js
@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { Platform } from '@wordpress/element';
-
 export function defaultColumnsNumber( imageCount ) {
 	return imageCount ? Math.min( 3, imageCount ) : 3;
 }
@@ -27,26 +22,3 @@ export const pickRelevantMediaFiles = ( image, sizeSlug = 'large' ) => {
 	}
 	return imageProps;
 };
-
-function getGalleryBlockV2Enabled() {
-	// We want to fail early here, at least during beta testing phase, to ensure
-	// there aren't instances where undefined values cause false negatives.
-	if ( ! window.wp || typeof window.wp.galleryBlockV2Enabled !== 'boolean' ) {
-		throw 'window.wp.galleryBlockV2Enabled is not defined';
-	}
-	return window.wp.galleryBlockV2Enabled;
-}
-
-/**
- * The new gallery block format is not compatible with the use_BalanceTags option
- * in WP versions <= 5.8 https://core.trac.wordpress.org/ticket/54130. The
- * window.wp.galleryBlockV2Enabled flag is set in lib/compat.php. This method
- * can be removed when minimum supported WP version >=5.9.
- */
-export function isGalleryV2Enabled() {
-	if ( Platform.isNative ) {
-		return getGalleryBlockV2Enabled();
-	}
-
-	return true;
-}
diff --git a/packages/block-library/src/gallery/style.scss b/packages/block-library/src/gallery/style.scss
index afbc3088049858..1c4d5549339e1f 100644
--- a/packages/block-library/src/gallery/style.scss
+++ b/packages/block-library/src/gallery/style.scss
@@ -43,22 +43,44 @@ figure.wp-block-gallery.has-nested-images {
 			width: auto;
 		}
 
+		// Position caption and scrim at the bottom.
+		&:has(figcaption)::before,
 		figcaption {
-			background: linear-gradient(0deg, rgba($color: $black, $alpha: 0.7) 0, rgba($color: $black, $alpha: 0.3) 70%, transparent);
+			position: absolute;
 			bottom: 0;
+			right: 0;
+			left: 0;
+			max-height: 100%;
+		}
+
+		// Create a background blur layer.
+		&:has(figcaption)::before {
+			content: "";
+			height: 100%;
+			max-height: 40%;
+
+			// Blur the background under the gradient scrim.
+			backdrop-filter: blur(3px);
+
+			// Crop the caption so the blur is only on the edge.
+			mask-image: linear-gradient(0deg, $black 20%, transparent 100%);
+		}
+
+		// Place the caption at the bottom.
+		figcaption {
 			color: $white;
+			text-shadow: 0 0 1.5px $black;
 			font-size: $default-font-size;
-			left: 0;
-			margin-bottom: 0;
-			max-height: 60%;
+			margin: 0;
 			overflow: auto;
-			padding: 0 8px 8px;
-			position: absolute;
+			padding: 1em;
 			text-align: center;
-			width: 100%;
 			box-sizing: border-box;
 			@include custom-scrollbars-on-hover(transparent, rgba($white, 0.8));
 
+			// Dark gradient scrim.
+			background: linear-gradient(0deg, rgba($color: $black, $alpha: 0.4) 0%, transparent 100%);
+
 			img {
 				display: inline;
 			}
@@ -85,6 +107,10 @@ figure.wp-block-gallery.has-nested-images {
 				margin: 0;
 				padding: 10px 10px 9px;
 				position: relative;
+				text-shadow: none;
+			}
+			&::before {
+				content: none;
 			}
 		}
 	}
diff --git a/packages/block-library/src/gallery/test/__snapshots__/index.native.js.snap b/packages/block-library/src/gallery/test/__snapshots__/index.native.js.snap
index b79bd7c3877c7e..088a7d25282451 100644
--- a/packages/block-library/src/gallery/test/__snapshots__/index.native.js.snap
+++ b/packages/block-library/src/gallery/test/__snapshots__/index.native.js.snap
@@ -82,7 +82,7 @@ exports[`Gallery block inserts block 1`] = `
 <!-- /wp:gallery -->"
 `;
 
-exports[`Gallery block overrides "Link to" setting of gallery items 1`] = `
+exports[`Gallery block overrides "Link" setting of gallery items 1`] = `
 "<!-- wp:gallery {"linkTo":"media"} -->
 <figure class="wp-block-gallery has-nested-images columns-default is-cropped"><!-- wp:image {"id":1,"linkDestination":"media"} -->
 <figure class="wp-block-image"><img src="file:///local-image-1.jpeg" alt="" class="wp-image-1"/></figure>
diff --git a/packages/block-library/src/gallery/test/index.native.js b/packages/block-library/src/gallery/test/index.native.js
index 7ca9ecb63ea2a5..f294555e41f2c1 100644
--- a/packages/block-library/src/gallery/test/index.native.js
+++ b/packages/block-library/src/gallery/test/index.native.js
@@ -92,7 +92,7 @@ describe( 'Gallery block', () => {
 		expect( getBlock( screen, 'Gallery' ) ).toBeVisible();
 		expect( getEditorHtml() ).toMatchSnapshot();
 
-		getBlockSpy.mockReset();
+		getBlockSpy.mockRestore();
 	} );
 
 	it( 'selects a gallery item', async () => {
@@ -594,9 +594,9 @@ describe( 'Gallery block', () => {
 		expect( getEditorHtml() ).toMatchSnapshot();
 	} );
 
-	// Test case related to TC012 - Settings - Link to
+	// Test case related to TC012 - Settings - Link
 	// Reference: https://github.com/wordpress-mobile/test-cases/blob/trunk/test-cases/gutenberg/gallery.md#tc012
-	it( 'overrides "Link to" setting of gallery items', async () => {
+	it( 'overrides "Link" setting of gallery items', async () => {
 		// Initialize with a gallery that contains two items, the latter includes "linkDestination" attribute
 		const screen = await initializeWithGalleryBlock( {
 			html: `<!-- wp:gallery {"linkTo":"none"} -->
@@ -612,10 +612,10 @@ describe( 'Gallery block', () => {
 		} );
 		const { getByText } = screen;
 
-		// Set "Link to" setting via Gallery block settings
+		// Set "Link" setting via Gallery block settings
 		await openBlockSettings( screen );
-		fireEvent.press( getByText( 'Link to' ) );
-		fireEvent.press( getByText( 'Media File' ) );
+		fireEvent.press( getByText( 'Link' ) );
+		fireEvent.press( getByText( 'Link images to media files' ) );
 
 		expect( getEditorHtml() ).toMatchSnapshot();
 	} );
@@ -694,7 +694,7 @@ describe( 'Gallery block', () => {
 		await openBlockSettings( screen );
 
 		// Disable crop images setting
-		fireEvent.press( getByText( 'Crop images' ) );
+		fireEvent.press( getByText( 'Crop images to fit' ) );
 		expect( getEditorHtml() ).toMatchSnapshot();
 	} );
 } );
diff --git a/packages/block-library/src/gallery/transforms.js b/packages/block-library/src/gallery/transforms.js
index f499b689b2a0df..f040fdb12fb235 100644
--- a/packages/block-library/src/gallery/transforms.js
+++ b/packages/block-library/src/gallery/transforms.js
@@ -13,11 +13,6 @@ import {
 	LINK_DESTINATION_NONE,
 	LINK_DESTINATION_MEDIA,
 } from './constants';
-import {
-	LINK_DESTINATION_ATTACHMENT as DEPRECATED_LINK_DESTINATION_ATTACHMENT,
-	LINK_DESTINATION_MEDIA as DEPRECATED_LINK_DESTINATION_MEDIA,
-} from './v1/constants';
-import { pickRelevantMediaFiles, isGalleryV2Enabled } from './shared';
 
 const parseShortcodeIds = ( ids ) => {
 	if ( ! ids ) {
@@ -43,7 +38,6 @@ const parseShortcodeIds = ( ids ) => {
  */
 function updateThirdPartyTransformToGallery( block ) {
 	if (
-		isGalleryV2Enabled() &&
 		block.name === 'core/gallery' &&
 		block.attributes?.images.length > 0
 	) {
@@ -141,93 +135,27 @@ const transforms = {
 
 				const validImages = attributes.filter( ( { url } ) => url );
 
-				if ( isGalleryV2Enabled() ) {
-					const innerBlocks = validImages.map( ( image ) => {
-						// Gallery images can't currently be resized so make sure height and width are undefined.
-						image.width = undefined;
-						image.height = undefined;
-						return createBlock( 'core/image', image );
-					} );
-
-					return createBlock(
-						'core/gallery',
-						{
-							align,
-							sizeSlug,
-						},
-						innerBlocks
-					);
-				}
-
-				return createBlock( 'core/gallery', {
-					images: validImages.map(
-						( { id, url, alt, caption } ) => ( {
-							id: id.toString(),
-							url,
-							alt,
-							caption,
-						} )
-					),
-					ids: validImages.map( ( { id } ) => parseInt( id, 10 ) ),
-					align,
-					sizeSlug,
+				const innerBlocks = validImages.map( ( image ) => {
+					// Gallery images can't currently be resized so make sure height and width are undefined.
+					image.width = undefined;
+					image.height = undefined;
+					return createBlock( 'core/image', image );
 				} );
+
+				return createBlock(
+					'core/gallery',
+					{
+						align,
+						sizeSlug,
+					},
+					innerBlocks
+				);
 			},
 		},
 		{
 			type: 'shortcode',
 			tag: 'gallery',
-
-			attributes: {
-				images: {
-					type: 'array',
-					shortcode: ( { named: { ids } } ) => {
-						if ( ! isGalleryV2Enabled() ) {
-							return parseShortcodeIds( ids ).map( ( id ) => ( {
-								id: id.toString(),
-							} ) );
-						}
-					},
-				},
-				ids: {
-					type: 'array',
-					shortcode: ( { named: { ids } } ) => {
-						if ( ! isGalleryV2Enabled() ) {
-							return parseShortcodeIds( ids );
-						}
-					},
-				},
-				columns: {
-					type: 'number',
-					shortcode: ( { named: { columns = '3' } } ) => {
-						return parseInt( columns, 10 );
-					},
-				},
-				linkTo: {
-					type: 'string',
-					shortcode: ( { named: { link } } ) => {
-						if ( ! isGalleryV2Enabled() ) {
-							switch ( link ) {
-								case 'post':
-									return DEPRECATED_LINK_DESTINATION_ATTACHMENT;
-								case 'file':
-									return DEPRECATED_LINK_DESTINATION_MEDIA;
-								default:
-									return DEPRECATED_LINK_DESTINATION_ATTACHMENT;
-							}
-						}
-						switch ( link ) {
-							case 'post':
-								return LINK_DESTINATION_ATTACHMENT;
-							case 'file':
-								return LINK_DESTINATION_MEDIA;
-							default:
-								return LINK_DESTINATION_NONE;
-						}
-					},
-				},
-			},
-			transform( { named: { ids, columns = 3, link } } ) {
+			transform( { named: { ids, columns = 3, link, orderby } } ) {
 				const imageIds = parseShortcodeIds( ids ).map( ( id ) =>
 					parseInt( id, 10 )
 				);
@@ -244,6 +172,7 @@ const transforms = {
 					{
 						columns: parseInt( columns, 10 ),
 						linkTo,
+						randomOrder: orderby === 'rand',
 					},
 					imageIds.map( ( imageId ) =>
 						createBlock( 'core/image', { id: imageId } )
@@ -273,23 +202,13 @@ const transforms = {
 				);
 			},
 			transform( files ) {
-				if ( isGalleryV2Enabled() ) {
-					const innerBlocks = files.map( ( file ) =>
-						createBlock( 'core/image', {
-							url: createBlobURL( file ),
-						} )
-					);
+				const innerBlocks = files.map( ( file ) =>
+					createBlock( 'core/image', {
+						blob: createBlobURL( file ),
+					} )
+				);
 
-					return createBlock( 'core/gallery', {}, innerBlocks );
-				}
-				const block = createBlock( 'core/gallery', {
-					images: files.map( ( file ) =>
-						pickRelevantMediaFiles( {
-							url: createBlobURL( file ),
-						} )
-					),
-				} );
-				return block;
+				return createBlock( 'core/gallery', {}, innerBlocks );
 			},
 		},
 	],
@@ -297,57 +216,42 @@ const transforms = {
 		{
 			type: 'block',
 			blocks: [ 'core/image' ],
-			transform: ( { align, images, ids, sizeSlug }, innerBlocks ) => {
-				if ( isGalleryV2Enabled() ) {
-					if ( innerBlocks.length > 0 ) {
-						return innerBlocks.map(
-							( {
-								attributes: {
-									url,
-									alt,
-									caption,
-									title,
-									href,
-									rel,
-									linkClass,
-									id,
-									sizeSlug: imageSizeSlug,
-									linkDestination,
-									linkTarget,
-									anchor,
-									className,
-								},
-							} ) =>
-								createBlock( 'core/image', {
-									align,
-									url,
-									alt,
-									caption,
-									title,
-									href,
-									rel,
-									linkClass,
-									id,
-									sizeSlug: imageSizeSlug,
-									linkDestination,
-									linkTarget,
-									anchor,
-									className,
-								} )
-						);
-					}
-					return createBlock( 'core/image', { align } );
-				}
-				if ( images.length > 0 ) {
-					return images.map( ( { url, alt, caption }, index ) =>
-						createBlock( 'core/image', {
-							id: ids[ index ],
-							url,
-							alt,
-							caption,
-							align,
-							sizeSlug,
-						} )
+			transform: ( { align }, innerBlocks ) => {
+				if ( innerBlocks.length > 0 ) {
+					return innerBlocks.map(
+						( {
+							attributes: {
+								url,
+								alt,
+								caption,
+								title,
+								href,
+								rel,
+								linkClass,
+								id,
+								sizeSlug: imageSizeSlug,
+								linkDestination,
+								linkTarget,
+								anchor,
+								className,
+							},
+						} ) =>
+							createBlock( 'core/image', {
+								align,
+								url,
+								alt,
+								caption,
+								title,
+								href,
+								rel,
+								linkClass,
+								id,
+								sizeSlug: imageSizeSlug,
+								linkDestination,
+								linkTarget,
+								anchor,
+								className,
+							} )
 					);
 				}
 				return createBlock( 'core/image', { align } );
diff --git a/packages/block-library/src/gallery/use-image-sizes.js b/packages/block-library/src/gallery/use-image-sizes.js
index c96cd8dbaf5781..8dcc3eca61115f 100644
--- a/packages/block-library/src/gallery/use-image-sizes.js
+++ b/packages/block-library/src/gallery/use-image-sizes.js
@@ -4,10 +4,10 @@
 import { useMemo } from '@wordpress/element';
 
 /**
- * Calculates the image sizes that are avaible for the current gallery images in order to
+ * Calculates the image sizes that are available for the current gallery images in order to
  * populate the 'Resolution' selector.
  *
- * @param {Array}    images      Basic image block data taken from current gallery innerBlock
+ * @param {Array}    images      Basic image block data taken from current gallery innerBlock.
  * @param {boolean}  isSelected  Is the block currently selected in the editor.
  * @param {Function} getSettings Block editor store selector.
  *
diff --git a/packages/block-library/src/gallery/utils.js b/packages/block-library/src/gallery/utils.js
index 15f2062ea943da..4b2aca81f6ffb3 100644
--- a/packages/block-library/src/gallery/utils.js
+++ b/packages/block-library/src/gallery/utils.js
@@ -7,6 +7,7 @@ import {
 	LINK_DESTINATION_NONE,
 	LINK_DESTINATION_MEDIA_WP_CORE,
 	LINK_DESTINATION_ATTACHMENT_WP_CORE,
+	LINK_DESTINATION_LIGHTBOX,
 } from './constants';
 import {
 	LINK_DESTINATION_ATTACHMENT as IMAGE_LINK_DESTINATION_ATTACHMENT,
@@ -20,13 +21,18 @@ import {
  *
  * @param {Object} image              Gallery image.
  * @param {string} galleryDestination Gallery's selected link destination.
- * @param {Object} imageDestination   Image blocks attributes.
+ * @param {Object} imageDestination   Image block link destination attribute.
+ * @param {Object} attributes         Block attributes.
+ * @param {Object} lightboxSetting    Lightbox setting.
+ *
  * @return {Object}            New attributes to assign to image block.
  */
 export function getHrefAndDestination(
 	image,
 	galleryDestination,
-	imageDestination
+	imageDestination,
+	attributes,
+	lightboxSetting
 ) {
 	// Gutenberg and WordPress use different constants so if image_default_link_type
 	// option is set we need to map from the WP Core values.
@@ -36,17 +42,32 @@ export function getHrefAndDestination(
 			return {
 				href: image?.source_url || image?.url, // eslint-disable-line camelcase
 				linkDestination: IMAGE_LINK_DESTINATION_MEDIA,
+				lightbox: lightboxSetting?.enabled
+					? { ...attributes?.lightbox, enabled: false }
+					: undefined,
 			};
 		case LINK_DESTINATION_ATTACHMENT_WP_CORE:
 		case LINK_DESTINATION_ATTACHMENT:
 			return {
 				href: image?.link,
 				linkDestination: IMAGE_LINK_DESTINATION_ATTACHMENT,
+				lightbox: lightboxSetting?.enabled
+					? { ...attributes?.lightbox, enabled: false }
+					: undefined,
+			};
+		case LINK_DESTINATION_LIGHTBOX:
+			return {
+				href: undefined,
+				lightbox: ! lightboxSetting?.enabled
+					? { ...attributes?.lightbox, enabled: true }
+					: undefined,
+				linkDestination: IMAGE_LINK_DESTINATION_NONE,
 			};
 		case LINK_DESTINATION_NONE:
 			return {
 				href: undefined,
 				linkDestination: IMAGE_LINK_DESTINATION_NONE,
+				lightbox: undefined,
 			};
 	}
 
diff --git a/packages/block-library/src/gallery/v1/constants.js b/packages/block-library/src/gallery/v1/constants.js
deleted file mode 100644
index f4b6e7af56d473..00000000000000
--- a/packages/block-library/src/gallery/v1/constants.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const LINK_DESTINATION_NONE = 'none';
-export const LINK_DESTINATION_MEDIA = 'file';
-export const LINK_DESTINATION_ATTACHMENT = 'post';
diff --git a/packages/block-library/src/gallery/v1/edit.js b/packages/block-library/src/gallery/v1/edit.js
deleted file mode 100644
index 5820fbe0be9487..00000000000000
--- a/packages/block-library/src/gallery/v1/edit.js
+++ /dev/null
@@ -1,450 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { compose } from '@wordpress/compose';
-import {
-	PanelBody,
-	SelectControl,
-	ToggleControl,
-	withNotices,
-	RangeControl,
-} from '@wordpress/components';
-import {
-	MediaPlaceholder,
-	InspectorControls,
-	useBlockProps,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { Platform, useEffect, useState, useMemo } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { getBlobByURL, isBlobURL, revokeBlobURL } from '@wordpress/blob';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { withViewportMatch } from '@wordpress/viewport';
-import { View } from '@wordpress/primitives';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { sharedIcon } from '../shared-icon';
-import { pickRelevantMediaFiles } from './shared';
-import { defaultColumnsNumberV1 } from '../deprecated';
-import Gallery from './gallery';
-import {
-	LINK_DESTINATION_ATTACHMENT,
-	LINK_DESTINATION_MEDIA,
-	LINK_DESTINATION_NONE,
-} from './constants';
-
-const MAX_COLUMNS = 8;
-const linkOptions = [
-	{ value: LINK_DESTINATION_ATTACHMENT, label: __( 'Attachment Page' ) },
-	{ value: LINK_DESTINATION_MEDIA, label: __( 'Media File' ) },
-	{ value: LINK_DESTINATION_NONE, label: __( 'None' ) },
-];
-const ALLOWED_MEDIA_TYPES = [ 'image' ];
-
-const PLACEHOLDER_TEXT = Platform.select( {
-	web: __(
-		'Drag images, upload new ones or select files from your library.'
-	),
-	native: __( 'ADD MEDIA' ),
-} );
-
-const MOBILE_CONTROL_PROPS_RANGE_CONTROL = Platform.select( {
-	web: {},
-	native: { type: 'stepper' },
-} );
-
-function GalleryEdit( props ) {
-	const {
-		attributes,
-		clientId,
-		isSelected,
-		noticeUI,
-		noticeOperations,
-		onFocus,
-	} = props;
-	const {
-		columns = defaultColumnsNumberV1( attributes ),
-		imageCrop,
-		images,
-		linkTo,
-		sizeSlug,
-	} = attributes;
-	const [ selectedImage, setSelectedImage ] = useState();
-	const [ attachmentCaptions, setAttachmentCaptions ] = useState();
-	const { __unstableMarkNextChangeAsNotPersistent } =
-		useDispatch( blockEditorStore );
-
-	const { imageSizes, mediaUpload, getMedia, wasBlockJustInserted } =
-		useSelect( ( select ) => {
-			const settings = select( blockEditorStore ).getSettings();
-
-			return {
-				imageSizes: settings.imageSizes,
-				mediaUpload: settings.mediaUpload,
-				getMedia: select( coreStore ).getMedia,
-				wasBlockJustInserted: select(
-					blockEditorStore
-				).wasBlockJustInserted( clientId, 'inserter_menu' ),
-			};
-		} );
-
-	const resizedImages = useMemo( () => {
-		if ( isSelected ) {
-			return ( attributes.ids ?? [] ).reduce(
-				( currentResizedImages, id ) => {
-					if ( ! id ) {
-						return currentResizedImages;
-					}
-					const image = getMedia( id );
-					const sizes = imageSizes.reduce( ( currentSizes, size ) => {
-						const defaultUrl = image?.sizes?.[ size.slug ]?.url;
-						const mediaDetailsUrl =
-							image?.media_details?.sizes?.[ size.slug ]
-								?.source_url;
-						return {
-							...currentSizes,
-							[ size.slug ]: defaultUrl || mediaDetailsUrl,
-						};
-					}, {} );
-					return {
-						...currentResizedImages,
-						[ parseInt( id, 10 ) ]: sizes,
-					};
-				},
-				{}
-			);
-		}
-		return {};
-	}, [ isSelected, attributes.ids, imageSizes ] );
-
-	function onFocusGalleryCaption() {
-		setSelectedImage();
-	}
-
-	function setAttributes( newAttrs ) {
-		if ( newAttrs.ids ) {
-			throw new Error(
-				'The "ids" attribute should not be changed directly. It is managed automatically when "images" attribute changes'
-			);
-		}
-
-		if ( newAttrs.images ) {
-			newAttrs = {
-				...newAttrs,
-				// Unlike images[ n ].id which is a string, always ensure the
-				// ids array contains numbers as per its attribute type.
-				ids: newAttrs.images.map( ( { id } ) => parseInt( id, 10 ) ),
-			};
-		}
-
-		props.setAttributes( newAttrs );
-	}
-
-	function onSelectImage( index ) {
-		return () => {
-			setSelectedImage( index );
-		};
-	}
-
-	function onDeselectImage() {
-		return () => {
-			setSelectedImage();
-		};
-	}
-
-	function onMove( oldIndex, newIndex ) {
-		const newImages = [ ...images ];
-		newImages.splice( newIndex, 1, images[ oldIndex ] );
-		newImages.splice( oldIndex, 1, images[ newIndex ] );
-		setSelectedImage( newIndex );
-		setAttributes( { images: newImages } );
-	}
-
-	function onMoveForward( oldIndex ) {
-		return () => {
-			if ( oldIndex === images.length - 1 ) {
-				return;
-			}
-			onMove( oldIndex, oldIndex + 1 );
-		};
-	}
-
-	function onMoveBackward( oldIndex ) {
-		return () => {
-			if ( oldIndex === 0 ) {
-				return;
-			}
-			onMove( oldIndex, oldIndex - 1 );
-		};
-	}
-
-	function onRemoveImage( index ) {
-		return () => {
-			const newImages = images.filter( ( img, i ) => index !== i );
-			setSelectedImage();
-			setAttributes( {
-				images: newImages,
-				columns: attributes.columns
-					? Math.min( newImages.length, attributes.columns )
-					: attributes.columns,
-			} );
-		};
-	}
-
-	function selectCaption( newImage ) {
-		// The image id in both the images and attachmentCaptions arrays is a
-		// string, so ensure comparison works correctly by converting the
-		// newImage.id to a string.
-		const newImageId = newImage.id.toString();
-		const currentImage = images.find( ( { id } ) => id === newImageId );
-		const currentImageCaption = currentImage
-			? currentImage.caption
-			: newImage.caption;
-
-		if ( ! attachmentCaptions ) {
-			return currentImageCaption;
-		}
-
-		const attachment = attachmentCaptions.find(
-			( { id } ) => id === newImageId
-		);
-
-		// If the attachment caption is updated.
-		if ( attachment && attachment.caption !== newImage.caption ) {
-			return newImage.caption;
-		}
-
-		return currentImageCaption;
-	}
-
-	function onSelectImages( newImages ) {
-		setAttachmentCaptions(
-			newImages.map( ( newImage ) => ( {
-				// Store the attachmentCaption id as a string for consistency
-				// with the type of the id in the images attribute.
-				id: newImage.id.toString(),
-				caption: newImage.caption,
-			} ) )
-		);
-		setAttributes( {
-			images: newImages.map( ( newImage ) => ( {
-				...pickRelevantMediaFiles( newImage, sizeSlug ),
-				caption: selectCaption( newImage, images, attachmentCaptions ),
-				// The id value is stored in a data attribute, so when the
-				// block is parsed it's converted to a string. Converting
-				// to a string here ensures it's type is consistent.
-				id: newImage.id.toString(),
-			} ) ),
-			columns: attributes.columns
-				? Math.min( newImages.length, attributes.columns )
-				: attributes.columns,
-		} );
-	}
-
-	function onUploadError( message ) {
-		noticeOperations.removeAllNotices();
-		noticeOperations.createErrorNotice( message );
-	}
-
-	function setLinkTo( value ) {
-		setAttributes( { linkTo: value } );
-	}
-
-	function setColumnsNumber( value ) {
-		setAttributes( { columns: value } );
-	}
-
-	function toggleImageCrop() {
-		setAttributes( { imageCrop: ! imageCrop } );
-	}
-
-	function getImageCropHelp( checked ) {
-		return checked
-			? __( 'Thumbnails are cropped to align.' )
-			: __( 'Thumbnails are not cropped.' );
-	}
-
-	function setImageAttributes( index, newAttributes ) {
-		if ( ! images[ index ] ) {
-			return;
-		}
-
-		setAttributes( {
-			images: [
-				...images.slice( 0, index ),
-				{
-					...images[ index ],
-					...newAttributes,
-				},
-				...images.slice( index + 1 ),
-			],
-		} );
-	}
-
-	function getImagesSizeOptions() {
-		const resizedImageSizes = Object.values( resizedImages );
-		return imageSizes
-			.filter( ( { slug } ) =>
-				resizedImageSizes.some( ( sizes ) => sizes[ slug ] )
-			)
-			.map( ( { name, slug } ) => ( { value: slug, label: name } ) );
-	}
-
-	function updateImagesSize( newSizeSlug ) {
-		const updatedImages = ( images ?? [] ).map( ( image ) => {
-			if ( ! image.id ) {
-				return image;
-			}
-			const url =
-				resizedImages[ parseInt( image.id, 10 ) ]?.[ newSizeSlug ];
-			return {
-				...image,
-				...( url && { url } ),
-			};
-		} );
-
-		setAttributes( { images: updatedImages, sizeSlug: newSizeSlug } );
-	}
-
-	useEffect( () => {
-		if (
-			Platform.OS === 'web' &&
-			images &&
-			images.length > 0 &&
-			images.every( ( { url } ) => isBlobURL( url ) )
-		) {
-			const filesList = images.map( ( { url } ) => getBlobByURL( url ) );
-			images.forEach( ( { url } ) => revokeBlobURL( url ) );
-			mediaUpload( {
-				filesList,
-				onFileChange: onSelectImages,
-				allowedTypes: [ 'image' ],
-			} );
-		}
-	}, [] );
-
-	useEffect( () => {
-		// Deselect images when deselecting the block.
-		if ( ! isSelected ) {
-			setSelectedImage();
-		}
-	}, [ isSelected ] );
-
-	useEffect( () => {
-		// linkTo attribute must be saved so blocks don't break when changing
-		// image_default_link_type in options.php.
-		if ( ! linkTo ) {
-			__unstableMarkNextChangeAsNotPersistent();
-			setAttributes( {
-				linkTo:
-					window?.wp?.media?.view?.settings?.defaultProps?.link ||
-					LINK_DESTINATION_NONE,
-			} );
-		}
-	}, [ linkTo ] );
-
-	const hasImages = !! images.length;
-	const hasImageIds = hasImages && images.some( ( image ) => !! image.id );
-
-	const mediaPlaceholder = (
-		<MediaPlaceholder
-			addToGallery={ hasImageIds }
-			isAppender={ hasImages }
-			disableMediaButtons={ hasImages && ! isSelected }
-			icon={ ! hasImages && sharedIcon }
-			labels={ {
-				title: ! hasImages && __( 'Gallery' ),
-				instructions: ! hasImages && PLACEHOLDER_TEXT,
-			} }
-			onSelect={ onSelectImages }
-			accept="image/*"
-			allowedTypes={ ALLOWED_MEDIA_TYPES }
-			multiple
-			value={ hasImageIds ? images : {} }
-			onError={ onUploadError }
-			notices={ hasImages ? undefined : noticeUI }
-			onFocus={ onFocus }
-			autoOpenMediaUpload={
-				! hasImages && isSelected && wasBlockJustInserted
-			}
-		/>
-	);
-
-	const blockProps = useBlockProps();
-
-	if ( ! hasImages ) {
-		return <View { ...blockProps }>{ mediaPlaceholder }</View>;
-	}
-
-	const imageSizeOptions = getImagesSizeOptions();
-	const shouldShowSizeOptions = hasImages && imageSizeOptions.length > 0;
-
-	return (
-		<>
-			<InspectorControls>
-				<PanelBody title={ __( 'Settings' ) }>
-					{ images.length > 1 && (
-						<RangeControl
-							__nextHasNoMarginBottom
-							label={ __( 'Columns' ) }
-							value={ columns }
-							onChange={ setColumnsNumber }
-							min={ 1 }
-							max={ Math.min( MAX_COLUMNS, images.length ) }
-							{ ...MOBILE_CONTROL_PROPS_RANGE_CONTROL }
-							required
-						/>
-					) }
-					<ToggleControl
-						__nextHasNoMarginBottom
-						label={ __( 'Crop images' ) }
-						checked={ !! imageCrop }
-						onChange={ toggleImageCrop }
-						help={ getImageCropHelp }
-					/>
-					<SelectControl
-						__nextHasNoMarginBottom
-						label={ __( 'Link to' ) }
-						value={ linkTo }
-						onChange={ setLinkTo }
-						options={ linkOptions }
-						hideCancelButton={ true }
-					/>
-					{ shouldShowSizeOptions && (
-						<SelectControl
-							__nextHasNoMarginBottom
-							label={ __( 'Image size' ) }
-							value={ sizeSlug }
-							options={ imageSizeOptions }
-							onChange={ updateImagesSize }
-							hideCancelButton={ true }
-						/>
-					) }
-				</PanelBody>
-			</InspectorControls>
-			{ noticeUI }
-			<Gallery
-				{ ...props }
-				selectedImage={ selectedImage }
-				mediaPlaceholder={ mediaPlaceholder }
-				onMoveBackward={ onMoveBackward }
-				onMoveForward={ onMoveForward }
-				onRemoveImage={ onRemoveImage }
-				onSelectImage={ onSelectImage }
-				onDeselectImage={ onDeselectImage }
-				onSetImageAttributes={ setImageAttributes }
-				blockProps={ blockProps }
-				// This prop is used by gallery.native.js.
-				onFocusGalleryCaption={ onFocusGalleryCaption }
-			/>
-		</>
-	);
-}
-
-export default compose( [
-	withNotices,
-	withViewportMatch( { isNarrow: '< small' } ),
-] )( GalleryEdit );
diff --git a/packages/block-library/src/gallery/v1/gallery-button.native.js b/packages/block-library/src/gallery/v1/gallery-button.native.js
deleted file mode 100644
index 8804e99cf2e7e6..00000000000000
--- a/packages/block-library/src/gallery/v1/gallery-button.native.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * External dependencies
- */
-import { StyleSheet, TouchableOpacity } from 'react-native';
-
-/**
- * WordPress dependencies
- */
-import { Icon } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import style from './gallery-image-style.scss';
-
-export function Button( props ) {
-	const {
-		icon,
-		iconSize = 24,
-		onClick,
-		disabled,
-		'aria-disabled': ariaDisabled,
-		accessibilityLabel = 'button',
-		style: customStyle,
-	} = props;
-
-	const buttonStyle = StyleSheet.compose( style.buttonActive, customStyle );
-
-	const isDisabled = disabled || ariaDisabled;
-
-	const { fill } = isDisabled ? style.buttonDisabled : style.button;
-
-	return (
-		<TouchableOpacity
-			style={ buttonStyle }
-			activeOpacity={ 0.7 }
-			accessibilityLabel={ accessibilityLabel }
-			accessibilityRole={ 'button' }
-			onPress={ onClick }
-			disabled={ isDisabled }
-		>
-			<Icon icon={ icon } fill={ fill } size={ iconSize } />
-		</TouchableOpacity>
-	);
-}
-
-export default Button;
diff --git a/packages/block-library/src/gallery/v1/gallery-image-style.native.scss b/packages/block-library/src/gallery/v1/gallery-image-style.native.scss
deleted file mode 100644
index 9b221a56981f6d..00000000000000
--- a/packages/block-library/src/gallery/v1/gallery-image-style.native.scss
+++ /dev/null
@@ -1,109 +0,0 @@
-$gallery-image-container-height: 150px;
-$overlay-border-width: 2px;
-$caption-background-color: rgba(0, 0, 0, 0.4);
-
-.galleryImageContainer {
-	flex: 1;
-	height: $gallery-image-container-height;
-	overflow: hidden;
-	background-color: $gray-lighten-30;
-}
-
-.galleryImageContainerDark {
-	background-color: $gray-90;
-}
-
-.image {
-	height: 100%;
-}
-
-.button {
-	fill: $gray-0;
-	width: 30px;
-}
-
-.buttonDisabled {
-	fill: $gray-30;
-}
-
-.buttonActive {
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-	border-radius: 6px;
-	border-color: $gray-70;
-	background-color: $gray-70;
-}
-
-.moverButtonContainer {
-	flex-direction: row;
-	align-items: center;
-	border-radius: 3px;
-	background-color: $gray-70;
-}
-
-.separator {
-	border-right-color: $gray-30;
-	border-right-width: 1px;
-	height: 20px;
-}
-
-.toolbarContainer {
-	position: absolute;
-}
-
-.toolbar {
-	padding: 5px;
-	flex-direction: row;
-	justify-content: space-between;
-}
-
-.captionContainer {
-	flex: 1;
-	flex-direction: row;
-	align-items: flex-end;
-	position: absolute;
-	bottom: $overlay-border-width;
-	left: $overlay-border-width;
-	right: $overlay-border-width;
-	top: 45;
-}
-
-@mixin caption-shared {
-	font-size: 12px;
-	background-color: #0000;
-	color: #fff;
-	font-family: $default-regular-font;
-	text-align: center;
-}
-
-.caption {
-	@include caption-shared;
-	background-color: $caption-background-color;
-	padding-top: $grid-unit;
-	padding-bottom: $grid-unit;
-}
-
-.captionPlaceholder {
-	color: #ccc;
-}
-
-// expand caption container to compensate for overlay border
-.captionExpandedContainer {
-	// constrain height to gallery image height for caption scroll
-	max-height: $gallery-image-container-height;
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	padding-top: $grid-unit;
-	padding-bottom: $overlay-border-width + $grid-unit;
-	padding-left: $overlay-border-width;
-	padding-right: $overlay-border-width;
-	// use caption background color on container when expanded
-	background-color: $caption-background-color;
-}
-
-.captionExpanded {
-	@include caption-shared;
-}
diff --git a/packages/block-library/src/gallery/v1/gallery-image.js b/packages/block-library/src/gallery/v1/gallery-image.js
deleted file mode 100644
index c9c2bf6cb5bd1d..00000000000000
--- a/packages/block-library/src/gallery/v1/gallery-image.js
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { Component } from '@wordpress/element';
-import { Button, Spinner, ButtonGroup } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { BACKSPACE, DELETE } from '@wordpress/keycodes';
-import { withSelect, withDispatch } from '@wordpress/data';
-import {
-	RichText,
-	MediaPlaceholder,
-	store as blockEditorStore,
-	__experimentalGetElementClassName,
-} from '@wordpress/block-editor';
-import { isBlobURL } from '@wordpress/blob';
-import { compose } from '@wordpress/compose';
-import {
-	closeSmall,
-	chevronLeft,
-	chevronRight,
-	edit,
-	image as imageIcon,
-} from '@wordpress/icons';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { pickRelevantMediaFiles } from './shared';
-import {
-	LINK_DESTINATION_ATTACHMENT,
-	LINK_DESTINATION_MEDIA,
-} from './constants';
-
-const isTemporaryImage = ( id, url ) => ! id && isBlobURL( url );
-
-class GalleryImage extends Component {
-	constructor() {
-		super( ...arguments );
-
-		this.onSelectImage = this.onSelectImage.bind( this );
-		this.onRemoveImage = this.onRemoveImage.bind( this );
-		this.bindContainer = this.bindContainer.bind( this );
-		this.onEdit = this.onEdit.bind( this );
-		this.onSelectImageFromLibrary =
-			this.onSelectImageFromLibrary.bind( this );
-		this.onSelectCustomURL = this.onSelectCustomURL.bind( this );
-		this.state = {
-			isEditing: false,
-		};
-	}
-
-	bindContainer( ref ) {
-		this.container = ref;
-	}
-
-	onSelectImage() {
-		if ( ! this.props.isSelected ) {
-			this.props.onSelect();
-		}
-	}
-
-	onRemoveImage( event ) {
-		if (
-			this.container === this.container.ownerDocument.activeElement &&
-			this.props.isSelected &&
-			[ BACKSPACE, DELETE ].indexOf( event.keyCode ) !== -1
-		) {
-			event.preventDefault();
-			this.props.onRemove();
-		}
-	}
-
-	onEdit() {
-		this.setState( {
-			isEditing: true,
-		} );
-	}
-
-	componentDidUpdate() {
-		const { image, url, __unstableMarkNextChangeAsNotPersistent } =
-			this.props;
-		if ( image && ! url ) {
-			__unstableMarkNextChangeAsNotPersistent();
-			this.props.setAttributes( {
-				url: image.source_url,
-				alt: image.alt_text,
-			} );
-		}
-	}
-
-	deselectOnBlur() {
-		this.props.onDeselect();
-	}
-
-	onSelectImageFromLibrary( media ) {
-		const { setAttributes, id, url, alt, caption, sizeSlug } = this.props;
-		if ( ! media || ! media.url ) {
-			return;
-		}
-
-		let mediaAttributes = pickRelevantMediaFiles( media, sizeSlug );
-
-		// If the current image is temporary but an alt text was meanwhile
-		// written by the user, make sure the text is not overwritten.
-		if ( isTemporaryImage( id, url ) ) {
-			if ( alt ) {
-				const { alt: omittedAlt, ...restMediaAttributes } =
-					mediaAttributes;
-				mediaAttributes = restMediaAttributes;
-			}
-		}
-
-		// If a caption text was meanwhile written by the user,
-		// make sure the text is not overwritten by empty captions.
-		if ( caption && ! mediaAttributes.caption ) {
-			const { caption: omittedCaption, ...restMediaAttributes } =
-				mediaAttributes;
-			mediaAttributes = restMediaAttributes;
-		}
-
-		setAttributes( mediaAttributes );
-		this.setState( {
-			isEditing: false,
-		} );
-	}
-
-	onSelectCustomURL( newURL ) {
-		const { setAttributes, url } = this.props;
-		if ( newURL !== url ) {
-			setAttributes( {
-				url: newURL,
-				id: undefined,
-			} );
-			this.setState( {
-				isEditing: false,
-			} );
-		}
-	}
-
-	render() {
-		const {
-			url,
-			alt,
-			id,
-			linkTo,
-			link,
-			isFirstItem,
-			isLastItem,
-			isSelected,
-			caption,
-			onRemove,
-			onMoveForward,
-			onMoveBackward,
-			setAttributes,
-			'aria-label': ariaLabel,
-		} = this.props;
-		const { isEditing } = this.state;
-
-		let href;
-
-		switch ( linkTo ) {
-			case LINK_DESTINATION_MEDIA:
-				href = url;
-				break;
-			case LINK_DESTINATION_ATTACHMENT:
-				href = link;
-				break;
-		}
-
-		const img = (
-			// Disable reason: Image itself is not meant to be interactive, but should
-			// direct image selection and unfocus caption fields.
-			/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
-			<>
-				<img
-					src={ url }
-					alt={ alt }
-					data-id={ id }
-					onKeyDown={ this.onRemoveImage }
-					tabIndex="0"
-					aria-label={ ariaLabel }
-					ref={ this.bindContainer }
-				/>
-				{ isBlobURL( url ) && <Spinner /> }
-			</>
-			/* eslint-enable jsx-a11y/no-noninteractive-element-interactions */
-		);
-
-		const className = classnames( {
-			'is-selected': isSelected,
-			'is-transient': isBlobURL( url ),
-		} );
-
-		return (
-			// eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions
-			<figure
-				className={ className }
-				onClick={ this.onSelectImage }
-				onFocus={ this.onSelectImage }
-			>
-				{ ! isEditing && ( href ? <a href={ href }>{ img }</a> : img ) }
-				{ isEditing && (
-					<MediaPlaceholder
-						labels={ { title: __( 'Edit gallery image' ) } }
-						icon={ imageIcon }
-						onSelect={ this.onSelectImageFromLibrary }
-						onSelectURL={ this.onSelectCustomURL }
-						accept="image/*"
-						allowedTypes={ [ 'image' ] }
-						value={ { id, src: url } }
-					/>
-				) }
-				<ButtonGroup className="block-library-gallery-item__inline-menu is-left">
-					<Button
-						icon={ chevronLeft }
-						onClick={ isFirstItem ? undefined : onMoveBackward }
-						label={ __( 'Move image backward' ) }
-						aria-disabled={ isFirstItem }
-						disabled={ ! isSelected }
-					/>
-					<Button
-						icon={ chevronRight }
-						onClick={ isLastItem ? undefined : onMoveForward }
-						label={ __( 'Move image forward' ) }
-						aria-disabled={ isLastItem }
-						disabled={ ! isSelected }
-					/>
-				</ButtonGroup>
-				<ButtonGroup className="block-library-gallery-item__inline-menu is-right">
-					<Button
-						icon={ edit }
-						onClick={ this.onEdit }
-						label={ __( 'Replace image' ) }
-						disabled={ ! isSelected }
-					/>
-					<Button
-						icon={ closeSmall }
-						onClick={ onRemove }
-						label={ __( 'Remove image' ) }
-						disabled={ ! isSelected }
-					/>
-				</ButtonGroup>
-				{ ! isEditing && ( isSelected || caption ) && (
-					<RichText
-						tagName="figcaption"
-						className={ __experimentalGetElementClassName(
-							'caption'
-						) }
-						aria-label={ __( 'Image caption text' ) }
-						placeholder={ isSelected ? __( 'Add caption' ) : null }
-						value={ caption }
-						onChange={ ( newCaption ) =>
-							setAttributes( { caption: newCaption } )
-						}
-						inlineToolbar
-					/>
-				) }
-			</figure>
-		);
-	}
-}
-
-export default compose( [
-	withSelect( ( select, ownProps ) => {
-		const { getMedia } = select( coreStore );
-		const { id } = ownProps;
-
-		return {
-			image: id ? getMedia( parseInt( id, 10 ) ) : null,
-		};
-	} ),
-	withDispatch( ( dispatch ) => {
-		const { __unstableMarkNextChangeAsNotPersistent } =
-			dispatch( blockEditorStore );
-		return {
-			__unstableMarkNextChangeAsNotPersistent,
-		};
-	} ),
-] )( GalleryImage );
diff --git a/packages/block-library/src/gallery/v1/gallery-image.native.js b/packages/block-library/src/gallery/v1/gallery-image.native.js
deleted file mode 100644
index b887ca0bbfe04f..00000000000000
--- a/packages/block-library/src/gallery/v1/gallery-image.native.js
+++ /dev/null
@@ -1,348 +0,0 @@
-/**
- * External dependencies
- */
-import {
-	StyleSheet,
-	View,
-	ScrollView,
-	TouchableWithoutFeedback,
-} from 'react-native';
-
-/**
- * WordPress dependencies
- */
-import {
-	requestImageFailedRetryDialog,
-	requestImageUploadCancelDialog,
-	requestImageFullscreenPreview,
-} from '@wordpress/react-native-bridge';
-import { Component } from '@wordpress/element';
-import { Image } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
-import { Caption, MediaUploadProgress } from '@wordpress/block-editor';
-import { getProtocol } from '@wordpress/url';
-import { withPreferredColorScheme } from '@wordpress/compose';
-import { arrowLeft, arrowRight, warning } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import Button from './gallery-button';
-import style from './gallery-image-style.scss';
-
-const { compose } = StyleSheet;
-
-const separatorStyle = compose( style.separator, {
-	borderRightWidth: StyleSheet.hairlineWidth,
-} );
-const buttonStyle = compose( style.button, { aspectRatio: 1 } );
-const ICON_SIZE_ARROW = 15;
-
-class GalleryImage extends Component {
-	constructor() {
-		super( ...arguments );
-
-		this.onSelectImage = this.onSelectImage.bind( this );
-		this.onSelectCaption = this.onSelectCaption.bind( this );
-		this.onMediaPressed = this.onMediaPressed.bind( this );
-		this.onCaptionChange = this.onCaptionChange.bind( this );
-		this.onSelectMedia = this.onSelectMedia.bind( this );
-
-		this.updateMediaProgress = this.updateMediaProgress.bind( this );
-		this.finishMediaUploadWithSuccess =
-			this.finishMediaUploadWithSuccess.bind( this );
-		this.finishMediaUploadWithFailure =
-			this.finishMediaUploadWithFailure.bind( this );
-		this.renderContent = this.renderContent.bind( this );
-
-		this.state = {
-			captionSelected: false,
-			isUploadInProgress: false,
-			didUploadFail: false,
-		};
-	}
-
-	onSelectCaption() {
-		if ( ! this.state.captionSelected ) {
-			this.setState( {
-				captionSelected: true,
-			} );
-		}
-
-		if ( ! this.props.isSelected ) {
-			this.props.onSelect();
-		}
-	}
-
-	onMediaPressed() {
-		const { id, url, isSelected } = this.props;
-		const { captionSelected, isUploadInProgress, didUploadFail } =
-			this.state;
-
-		this.onSelectImage();
-
-		if ( isUploadInProgress ) {
-			requestImageUploadCancelDialog( id );
-		} else if (
-			didUploadFail ||
-			( id && getProtocol( url ) === 'file:' )
-		) {
-			requestImageFailedRetryDialog( id );
-		} else if ( isSelected && ! captionSelected ) {
-			requestImageFullscreenPreview( url );
-		}
-	}
-
-	onSelectImage() {
-		if ( ! this.props.isBlockSelected ) {
-			this.props.onSelectBlock();
-		}
-
-		if ( ! this.props.isSelected ) {
-			this.props.onSelect();
-		}
-
-		if ( this.state.captionSelected ) {
-			this.setState( {
-				captionSelected: false,
-			} );
-		}
-	}
-
-	onSelectMedia( media ) {
-		const { setAttributes } = this.props;
-		setAttributes( media );
-	}
-
-	onCaptionChange( caption ) {
-		const { setAttributes } = this.props;
-		setAttributes( { caption } );
-	}
-
-	componentDidUpdate( prevProps ) {
-		const { isSelected, image, url } = this.props;
-		if ( image && ! url ) {
-			this.props.setAttributes( {
-				url: image.source_url,
-				alt: image.alt_text,
-			} );
-		}
-
-		// Unselect the caption so when the user selects other image and comeback
-		// the caption is not immediately selected.
-		if (
-			this.state.captionSelected &&
-			! isSelected &&
-			prevProps.isSelected
-		) {
-			this.setState( {
-				captionSelected: false,
-			} );
-		}
-	}
-
-	updateMediaProgress() {
-		if ( ! this.state.isUploadInProgress ) {
-			this.setState( { isUploadInProgress: true } );
-		}
-	}
-
-	finishMediaUploadWithSuccess( payload ) {
-		this.setState( {
-			isUploadInProgress: false,
-			didUploadFail: false,
-		} );
-
-		this.props.setAttributes( {
-			id: payload.mediaServerId,
-			url: payload.mediaUrl,
-		} );
-	}
-
-	finishMediaUploadWithFailure() {
-		this.setState( {
-			isUploadInProgress: false,
-			didUploadFail: true,
-		} );
-	}
-
-	renderContent( params ) {
-		const {
-			url,
-			isFirstItem,
-			isLastItem,
-			isSelected,
-			caption,
-			onRemove,
-			onMoveForward,
-			onMoveBackward,
-			'aria-label': ariaLabel,
-			isCropped,
-			getStylesFromColorScheme,
-			isRTL,
-		} = this.props;
-
-		const { isUploadInProgress, captionSelected } = this.state;
-		const { isUploadFailed, retryMessage } = params;
-		const resizeMode = isCropped ? 'cover' : 'contain';
-
-		const captionPlaceholderStyle = getStylesFromColorScheme(
-			style.captionPlaceholder,
-			style.captionPlaceholderDark
-		);
-
-		const shouldShowCaptionEditable = ! isUploadFailed && isSelected;
-		const shouldShowCaptionExpanded =
-			! isUploadFailed && ! isSelected && !! caption;
-
-		const captionContainerStyle = shouldShowCaptionExpanded
-			? style.captionExpandedContainer
-			: style.captionContainer;
-
-		const captionStyle = shouldShowCaptionExpanded
-			? style.captionExpanded
-			: style.caption;
-
-		const mediaPickerOptions = [
-			{
-				destructiveButton: true,
-				id: 'removeImage',
-				label: __( 'Remove' ),
-				onPress: onRemove,
-				separated: true,
-				value: 'removeImage',
-			},
-		];
-
-		return (
-			<>
-				<Image
-					alt={ ariaLabel }
-					height={ style.image.height }
-					isSelected={ isSelected }
-					isUploadFailed={ isUploadFailed }
-					isUploadInProgress={ isUploadInProgress }
-					mediaPickerOptions={ mediaPickerOptions }
-					onSelectMediaUploadOption={ this.onSelectMedia }
-					resizeMode={ resizeMode }
-					url={ url }
-					retryMessage={ retryMessage }
-					retryIcon={ warning }
-				/>
-
-				{ ! isUploadInProgress && isSelected && (
-					<View style={ style.toolbarContainer }>
-						<View style={ style.toolbar }>
-							<View style={ style.moverButtonContainer }>
-								<Button
-									style={ buttonStyle }
-									icon={ isRTL ? arrowRight : arrowLeft }
-									iconSize={ ICON_SIZE_ARROW }
-									onClick={
-										isFirstItem ? undefined : onMoveBackward
-									}
-									accessibilityLabel={ __(
-										'Move Image Backward'
-									) }
-									aria-disabled={ isFirstItem }
-									disabled={ ! isSelected }
-								/>
-								<View style={ separatorStyle } />
-								<Button
-									style={ buttonStyle }
-									icon={ isRTL ? arrowLeft : arrowRight }
-									iconSize={ ICON_SIZE_ARROW }
-									onClick={
-										isLastItem ? undefined : onMoveForward
-									}
-									accessibilityLabel={ __(
-										'Move Image Forward'
-									) }
-									aria-disabled={ isLastItem }
-									disabled={ ! isSelected }
-								/>
-							</View>
-						</View>
-					</View>
-				) }
-
-				{ ! isUploadInProgress &&
-					( shouldShowCaptionEditable ||
-						shouldShowCaptionExpanded ) && (
-						<View style={ captionContainerStyle }>
-							<ScrollView
-								nestedScrollEnabled
-								keyboardShouldPersistTaps="handled"
-								bounces={ false }
-							>
-								<Caption
-									inlineToolbar
-									isSelected={ isSelected && captionSelected }
-									onChange={ this.onCaptionChange }
-									onFocus={ this.onSelectCaption }
-									placeholder={
-										isSelected ? __( 'Add caption' ) : null
-									}
-									placeholderTextColor={
-										captionPlaceholderStyle.color
-									}
-									style={ captionStyle }
-									value={ caption }
-								/>
-							</ScrollView>
-						</View>
-					) }
-			</>
-		);
-	}
-
-	render() {
-		const { id, onRemove, getStylesFromColorScheme, isSelected } =
-			this.props;
-
-		const containerStyle = getStylesFromColorScheme(
-			style.galleryImageContainer,
-			style.galleryImageContainerDark
-		);
-
-		return (
-			<TouchableWithoutFeedback
-				onPress={ this.onMediaPressed }
-				accessible={ ! isSelected } // We need only child views to be accessible after the selection.
-				accessibilityLabel={ this.accessibilityLabelImageContainer() } // if we don't set this explicitly it reads system provided accessibilityLabels of all child components and those include pretty technical words which don't make sense
-				accessibilityRole={ 'imagebutton' } // this makes VoiceOver to read a description of image provided by system on iOS and lets user know this is a button which conveys the message of tappablity
-			>
-				<View style={ containerStyle }>
-					<MediaUploadProgress
-						mediaId={ id }
-						onUpdateMediaProgress={ this.updateMediaProgress }
-						onFinishMediaUploadWithSuccess={
-							this.finishMediaUploadWithSuccess
-						}
-						onFinishMediaUploadWithFailure={
-							this.finishMediaUploadWithFailure
-						}
-						onMediaUploadStateReset={ onRemove }
-						renderContent={ this.renderContent }
-					/>
-				</View>
-			</TouchableWithoutFeedback>
-		);
-	}
-
-	accessibilityLabelImageContainer() {
-		const { caption, 'aria-label': ariaLabel } = this.props;
-
-		return ! caption
-			? ariaLabel
-			: ariaLabel +
-					'. ' +
-					sprintf(
-						/* translators: accessibility text. %s: image caption. */
-						__( 'Image caption. %s' ),
-						caption
-					);
-	}
-}
-
-export default withPreferredColorScheme( GalleryImage );
diff --git a/packages/block-library/src/gallery/v1/gallery-styles.native.scss b/packages/block-library/src/gallery/v1/gallery-styles.native.scss
deleted file mode 100644
index 9b3169da048b22..00000000000000
--- a/packages/block-library/src/gallery/v1/gallery-styles.native.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.galleryTilesContainerSelected {
-	margin-bottom: 16px;
-}
-
-.fullWidth {
-	margin-left: $block-edge-to-content;
-	margin-right: $block-edge-to-content;
-}
diff --git a/packages/block-library/src/gallery/v1/gallery.js b/packages/block-library/src/gallery/v1/gallery.js
deleted file mode 100644
index 7fc587f27911a6..00000000000000
--- a/packages/block-library/src/gallery/v1/gallery.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	RichText,
-	__experimentalGetElementClassName,
-} from '@wordpress/block-editor';
-import { VisuallyHidden } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
-import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import GalleryImage from './gallery-image';
-import { defaultColumnsNumberV1 } from '../deprecated';
-
-export const Gallery = ( props ) => {
-	const {
-		attributes,
-		isSelected,
-		setAttributes,
-		selectedImage,
-		mediaPlaceholder,
-		onMoveBackward,
-		onMoveForward,
-		onRemoveImage,
-		onSelectImage,
-		onDeselectImage,
-		onSetImageAttributes,
-		insertBlocksAfter,
-		blockProps,
-	} = props;
-
-	const {
-		align,
-		columns = defaultColumnsNumberV1( attributes ),
-		caption,
-		imageCrop,
-		images,
-	} = attributes;
-
-	return (
-		<figure
-			{ ...blockProps }
-			className={ classnames( blockProps.className, {
-				[ `align${ align }` ]: align,
-				[ `columns-${ columns }` ]: columns,
-				'is-cropped': imageCrop,
-			} ) }
-		>
-			<ul className="blocks-gallery-grid">
-				{ images.map( ( img, index ) => {
-					const ariaLabel = sprintf(
-						/* translators: 1: the order number of the image. 2: the total number of images. */
-						__( 'image %1$d of %2$d in gallery' ),
-						index + 1,
-						images.length
-					);
-
-					return (
-						<li
-							className="blocks-gallery-item"
-							key={ img.id ? `${ img.id }-${ index }` : img.url }
-						>
-							<GalleryImage
-								url={ img.url }
-								alt={ img.alt }
-								id={ img.id }
-								isFirstItem={ index === 0 }
-								isLastItem={ index + 1 === images.length }
-								isSelected={
-									isSelected && selectedImage === index
-								}
-								onMoveBackward={ onMoveBackward( index ) }
-								onMoveForward={ onMoveForward( index ) }
-								onRemove={ onRemoveImage( index ) }
-								onSelect={ onSelectImage( index ) }
-								onDeselect={ onDeselectImage( index ) }
-								setAttributes={ ( attrs ) =>
-									onSetImageAttributes( index, attrs )
-								}
-								caption={ img.caption }
-								aria-label={ ariaLabel }
-								sizeSlug={ attributes.sizeSlug }
-							/>
-						</li>
-					);
-				} ) }
-			</ul>
-			{ mediaPlaceholder }
-			<RichTextVisibilityHelper
-				isHidden={ ! isSelected && RichText.isEmpty( caption ) }
-				tagName="figcaption"
-				className={ classnames(
-					'blocks-gallery-caption',
-					__experimentalGetElementClassName( 'caption' )
-				) }
-				aria-label={ __( 'Gallery caption text' ) }
-				placeholder={ __( 'Write gallery caption…' ) }
-				value={ caption }
-				onChange={ ( value ) => setAttributes( { caption: value } ) }
-				inlineToolbar
-				__unstableOnSplitAtEnd={ () =>
-					insertBlocksAfter( createBlock( getDefaultBlockName() ) )
-				}
-			/>
-		</figure>
-	);
-};
-
-function RichTextVisibilityHelper( { isHidden, ...richTextProps } ) {
-	return isHidden ? (
-		<VisuallyHidden as={ RichText } { ...richTextProps } />
-	) : (
-		<RichText { ...richTextProps } />
-	);
-}
-
-export default Gallery;
diff --git a/packages/block-library/src/gallery/v1/gallery.native.js b/packages/block-library/src/gallery/v1/gallery.native.js
deleted file mode 100644
index a3d8d314dac3e6..00000000000000
--- a/packages/block-library/src/gallery/v1/gallery.native.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * External dependencies
- */
-import { View } from 'react-native';
-
-/**
- * Internal dependencies
- */
-import GalleryImage from './gallery-image';
-import { defaultColumnsNumberV1 } from '../deprecated';
-import styles from './gallery-styles.scss';
-import Tiles from './tiles';
-
-/**
- * WordPress dependencies
- */
-import { __, sprintf } from '@wordpress/i18n';
-import {
-	BlockCaption,
-	RichText,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { useState, useEffect } from '@wordpress/element';
-import { mediaUploadSync } from '@wordpress/react-native-bridge';
-import { useSelect } from '@wordpress/data';
-import { alignmentHelpers } from '@wordpress/components';
-
-const TILE_SPACING = 15;
-
-// we must limit displayed columns since readable content max-width is 580px
-const MAX_DISPLAYED_COLUMNS = 4;
-const MAX_DISPLAYED_COLUMNS_NARROW = 2;
-
-const { isFullWidth } = alignmentHelpers;
-
-export const Gallery = ( props ) => {
-	const [ isCaptionSelected, setIsCaptionSelected ] = useState( false );
-	useEffect( mediaUploadSync, [] );
-
-	const isRTL = useSelect( ( select ) => {
-		return !! select( blockEditorStore ).getSettings().isRTL;
-	}, [] );
-
-	const {
-		clientId,
-		selectedImage,
-		mediaPlaceholder,
-		onBlur,
-		onMoveBackward,
-		onMoveForward,
-		onRemoveImage,
-		onSelectImage,
-		onSetImageAttributes,
-		onFocusGalleryCaption,
-		attributes,
-		isSelected,
-		isNarrow,
-		onFocus,
-		insertBlocksAfter,
-	} = props;
-
-	const {
-		align,
-		columns = defaultColumnsNumberV1( attributes ),
-		imageCrop,
-		images,
-	} = attributes;
-
-	// limit displayed columns when isNarrow is true (i.e. when viewport width is
-	// less than "small", where small = 600)
-	const displayedColumns = isNarrow
-		? Math.min( columns, MAX_DISPLAYED_COLUMNS_NARROW )
-		: Math.min( columns, MAX_DISPLAYED_COLUMNS );
-
-	const selectImage = ( index ) => {
-		return () => {
-			if ( isCaptionSelected ) {
-				setIsCaptionSelected( false );
-			}
-			// We need to fully invoke the curried function here.
-			onSelectImage( index )();
-		};
-	};
-
-	const focusGalleryCaption = () => {
-		if ( ! isCaptionSelected ) {
-			setIsCaptionSelected( true );
-		}
-		onFocusGalleryCaption();
-	};
-
-	return (
-		<View style={ { flex: 1 } }>
-			<Tiles
-				columns={ displayedColumns }
-				spacing={ TILE_SPACING }
-				style={
-					isSelected
-						? styles.galleryTilesContainerSelected
-						: undefined
-				}
-			>
-				{ images.map( ( img, index ) => {
-					const ariaLabel = sprintf(
-						/* translators: 1: the order number of the image. 2: the total number of images. */
-						__( 'image %1$d of %2$d in gallery' ),
-						index + 1,
-						images.length
-					);
-
-					return (
-						<GalleryImage
-							key={ img.id ? `${ img.id }-${ index }` : img.url }
-							url={ img.url }
-							alt={ img.alt }
-							id={ parseInt( img.id, 10 ) } // make id an integer explicitly
-							isCropped={ imageCrop }
-							isFirstItem={ index === 0 }
-							isLastItem={ index + 1 === images.length }
-							isSelected={ isSelected && selectedImage === index }
-							isBlockSelected={ isSelected }
-							onMoveBackward={ onMoveBackward( index ) }
-							onMoveForward={ onMoveForward( index ) }
-							onRemove={ onRemoveImage( index ) }
-							onSelect={ selectImage( index ) }
-							onSelectBlock={ onFocus }
-							setAttributes={ ( attrs ) =>
-								onSetImageAttributes( index, attrs )
-							}
-							caption={ img.caption }
-							aria-label={ ariaLabel }
-							isRTL={ isRTL }
-						/>
-					);
-				} ) }
-			</Tiles>
-			<View style={ isFullWidth( align ) && styles.fullWidth }>
-				{ mediaPlaceholder }
-			</View>
-			<BlockCaption
-				clientId={ clientId }
-				isSelected={ isCaptionSelected }
-				accessible={ true }
-				accessibilityLabelCreator={ ( caption ) =>
-					RichText.isEmpty( caption )
-						? /* translators: accessibility text. Empty gallery caption. */
-						  'Gallery caption. Empty'
-						: sprintf(
-								/* translators: accessibility text. %s: gallery caption. */
-								__( 'Gallery caption. %s' ),
-								caption
-						  )
-				}
-				onFocus={ focusGalleryCaption }
-				onBlur={ onBlur } // Always assign onBlur as props.
-				insertBlocksAfter={ insertBlocksAfter }
-			/>
-		</View>
-	);
-};
-
-export default Gallery;
diff --git a/packages/block-library/src/gallery/v1/save.js b/packages/block-library/src/gallery/v1/save.js
deleted file mode 100644
index 3c20f0c7c30bf0..00000000000000
--- a/packages/block-library/src/gallery/v1/save.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	RichText,
-	useBlockProps,
-	__experimentalGetElementClassName,
-} from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
-import { defaultColumnsNumberV1 } from '../deprecated';
-import {
-	LINK_DESTINATION_ATTACHMENT,
-	LINK_DESTINATION_MEDIA,
-} from './constants';
-
-export default function saveV1( { attributes } ) {
-	const {
-		images,
-		columns = defaultColumnsNumberV1( attributes ),
-		imageCrop,
-		caption,
-		linkTo,
-	} = attributes;
-	const className = `columns-${ columns } ${ imageCrop ? 'is-cropped' : '' }`;
-
-	return (
-		<figure { ...useBlockProps.save( { className } ) }>
-			<ul className="blocks-gallery-grid">
-				{ images.map( ( image ) => {
-					let href;
-
-					switch ( linkTo ) {
-						case LINK_DESTINATION_MEDIA:
-							href = image.fullUrl || image.url;
-							break;
-						case LINK_DESTINATION_ATTACHMENT:
-							href = image.link;
-							break;
-					}
-
-					const img = (
-						<img
-							src={ image.url }
-							alt={ image.alt }
-							data-id={ image.id }
-							data-full-url={ image.fullUrl }
-							data-link={ image.link }
-							className={
-								image.id ? `wp-image-${ image.id }` : null
-							}
-						/>
-					);
-
-					return (
-						<li
-							key={ image.id || image.url }
-							className="blocks-gallery-item"
-						>
-							<figure>
-								{ href ? <a href={ href }>{ img }</a> : img }
-								{ ! RichText.isEmpty( image.caption ) && (
-									<RichText.Content
-										tagName="figcaption"
-										className={ classnames(
-											'blocks-gallery-item__caption',
-											__experimentalGetElementClassName(
-												'caption'
-											)
-										) }
-										value={ image.caption }
-									/>
-								) }
-							</figure>
-						</li>
-					);
-				} ) }
-			</ul>
-			{ ! RichText.isEmpty( caption ) && (
-				<RichText.Content
-					tagName="figcaption"
-					className={ classnames(
-						'blocks-gallery-caption',
-						__experimentalGetElementClassName( 'caption' )
-					) }
-					value={ caption }
-				/>
-			) }
-		</figure>
-	);
-}
diff --git a/packages/block-library/src/gallery/v1/shared.js b/packages/block-library/src/gallery/v1/shared.js
deleted file mode 100644
index 2facb5db83285f..00000000000000
--- a/packages/block-library/src/gallery/v1/shared.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export const pickRelevantMediaFiles = ( image, sizeSlug = 'large' ) => {
-	const imageProps = Object.fromEntries(
-		Object.entries( image ?? {} ).filter( ( [ key ] ) =>
-			[ 'alt', 'id', 'link', 'caption' ].includes( key )
-		)
-	);
-
-	imageProps.url =
-		image?.sizes?.[ sizeSlug ]?.url ||
-		image?.media_details?.sizes?.[ sizeSlug ]?.source_url ||
-		image?.url;
-	const fullUrl =
-		image?.sizes?.full?.url ||
-		image?.media_details?.sizes?.full?.source_url;
-	if ( fullUrl ) {
-		imageProps.fullUrl = fullUrl;
-	}
-	return imageProps;
-};
diff --git a/packages/block-library/src/gallery/v1/tiles-styles.native.scss b/packages/block-library/src/gallery/v1/tiles-styles.native.scss
deleted file mode 100644
index c2e3d4bad79790..00000000000000
--- a/packages/block-library/src/gallery/v1/tiles-styles.native.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.containerStyle {
-	flex-direction: row;
-	flex-wrap: wrap;
-}
-
-.tileStyle {
-	overflow: hidden;
-	flex-direction: row;
-	align-items: center;
-	border-color: transparent;
-}
diff --git a/packages/block-library/src/gallery/v1/tiles.native.js b/packages/block-library/src/gallery/v1/tiles.native.js
deleted file mode 100644
index 30126ce872593e..00000000000000
--- a/packages/block-library/src/gallery/v1/tiles.native.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * External dependencies
- */
-import { View, StyleSheet } from 'react-native';
-
-/**
- * WordPress dependencies
- */
-import { Children } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import styles from './tiles-styles.scss';
-
-function Tiles( props ) {
-	const { columns, children, spacing = 10, style } = props;
-
-	const { compose } = StyleSheet;
-
-	const tileCount = Children.count( children );
-	const lastTile = tileCount - 1;
-	const lastRow = Math.floor( lastTile / columns );
-
-	const wrappedChildren = Children.map( children, ( child, index ) => {
-		/**
-		 * Since we don't have `calc()`, we must calculate our spacings here in
-		 * order to preserve even spacing between tiles and equal width for tiles
-		 * in a given row.
-		 *
-		 * In order to ensure equal sizing of tile contents, we distribute the
-		 * spacing such that each tile has an equal "share" of the fixed spacing. To
-		 * keep the tiles properly aligned within their rows, we calculate the left
-		 * and right paddings based on the tile's relative position within the row.
-		 *
-		 * Note: we use padding instead of margins so that the fixed spacing is
-		 * included within the relative spacing (i.e. width percentage), and
-		 * wrapping behavior is preserved.
-		 *
-		 *  - The left most tile in a row must have left padding of zero.
-		 *  - The right most tile in a row must have a right padding of zero.
-		 *
-		 * The values of these left and right paddings are interpolated for tiles in
-		 * between. The right padding is complementary with the left padding of the
-		 * next tile (i.e. the right padding of [tile n] + the left padding of
-		 * [tile n + 1] will be equal for all tiles except the last one in a given
-		 * row).
-		 */
-
-		const row = Math.floor( index / columns );
-		const rowLength =
-			row === lastRow ? ( lastTile % columns ) + 1 : columns;
-		const indexInRow = index % columns;
-
-		return (
-			<View
-				style={ [
-					styles.tileStyle,
-					{
-						width: `${ 100 / rowLength }%`,
-						paddingLeft: spacing * ( indexInRow / rowLength ),
-						paddingRight:
-							spacing * ( 1 - ( indexInRow + 1 ) / rowLength ),
-						paddingTop: row === 0 ? 0 : spacing / 2,
-						paddingBottom: row === lastRow ? 0 : spacing / 2,
-					},
-				] }
-			>
-				{ child }
-			</View>
-		);
-	} );
-
-	const containerStyle = compose( styles.containerStyle, style );
-
-	return <View style={ containerStyle }>{ wrappedChildren }</View>;
-}
-
-export default Tiles;
diff --git a/packages/block-library/src/group/block.json b/packages/block-library/src/group/block.json
index 92bbc1b0d11352..3c7d8d3ce1310a 100644
--- a/packages/block-library/src/group/block.json
+++ b/packages/block-library/src/group/block.json
@@ -29,7 +29,11 @@
 		"ariaLabel": true,
 		"html": false,
 		"background": {
-			"backgroundImage": true
+			"backgroundImage": true,
+			"backgroundSize": true,
+			"__experimentalDefaultControls": {
+				"backgroundImage": true
+			}
 		},
 		"color": {
 			"gradients": true,
@@ -41,6 +45,7 @@
 				"text": true
 			}
 		},
+		"shadow": true,
 		"spacing": {
 			"margin": [ "top", "bottom" ],
 			"padding": true,
@@ -83,6 +88,9 @@
 		},
 		"layout": {
 			"allowSizingOnChildren": true
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-group-editor",
diff --git a/packages/block-library/src/group/deprecated.js b/packages/block-library/src/group/deprecated.js
index 4a98de433c5298..ff7ed7e42d093b 100644
--- a/packages/block-library/src/group/deprecated.js
+++ b/packages/block-library/src/group/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -109,15 +109,11 @@ const deprecated = [
 			);
 		},
 		isEligible: ( { layout } ) =>
-			! layout ||
-			layout.inherit ||
-			( layout.contentSize && layout.type !== 'constrained' ),
+			layout?.inherit ||
+			( layout?.contentSize && layout?.type !== 'constrained' ),
 		migrate: ( attributes ) => {
 			const { layout = null } = attributes;
-			if ( ! layout ) {
-				return attributes;
-			}
-			if ( layout.inherit || layout.contentSize ) {
+			if ( layout?.inherit || layout?.contentSize ) {
 				return {
 					...attributes,
 					layout: {
@@ -201,7 +197,7 @@ const deprecated = [
 				backgroundColor
 			);
 			const textClass = getColorClassName( 'color', textColor );
-			const className = classnames( backgroundClass, textClass, {
+			const className = clsx( backgroundClass, textClass, {
 				'has-text-color': textColor || customTextColor,
 				'has-background': backgroundColor || customBackgroundColor,
 			} );
@@ -257,7 +253,7 @@ const deprecated = [
 				backgroundColor
 			);
 			const textClass = getColorClassName( 'color', textColor );
-			const className = classnames( backgroundClass, {
+			const className = clsx( backgroundClass, {
 				'has-text-color': textColor || customTextColor,
 				'has-background': backgroundColor || customBackgroundColor,
 			} );
@@ -301,7 +297,7 @@ const deprecated = [
 				'background-color',
 				backgroundColor
 			);
-			const className = classnames( backgroundClass, {
+			const className = clsx( backgroundClass, {
 				'has-background': backgroundColor || customBackgroundColor,
 			} );
 
diff --git a/packages/block-library/src/group/edit.js b/packages/block-library/src/group/edit.js
index 9c8690c4e0e8e2..352a6fbc77819e 100644
--- a/packages/block-library/src/group/edit.js
+++ b/packages/block-library/src/group/edit.js
@@ -10,6 +10,7 @@ import {
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { SelectControl } from '@wordpress/components';
+import { useRef } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { View } from '@wordpress/primitives';
 
@@ -33,7 +34,7 @@ function GroupEditControls( { tagName, onSelectTagName } ) {
 			'The <header> element should represent introductory content, typically a group of introductory or navigational aids.'
 		),
 		main: __(
-			'The <main> element should be used for the primary content of your document only. '
+			'The <main> element should be used for the primary content of your document only.'
 		),
 		section: __(
 			"The <section> element should represent a standalone portion of the document that can't be better represented by another element."
@@ -97,7 +98,8 @@ function GroupEdit( { attributes, name, setAttributes, clientId } ) {
 		themeSupportsLayout || type === 'flex' || type === 'grid';
 
 	// Hooks.
-	const blockProps = useBlockProps();
+	const ref = useRef();
+	const blockProps = useBlockProps( { ref } );
 
 	const [ showPlaceholder, setShowPlaceholder ] = useShouldShowPlaceHolder( {
 		attributes,
@@ -124,6 +126,7 @@ function GroupEdit( { attributes, name, setAttributes, clientId } ) {
 			? blockProps
 			: { className: 'wp-block-group__inner-container' },
 		{
+			dropZoneElement: ref.current,
 			templateLock,
 			allowedBlocks,
 			renderAppender,
diff --git a/packages/block-library/src/group/editor.scss b/packages/block-library/src/group/editor.scss
index 297658713f4591..12f5028b96ec3d 100644
--- a/packages/block-library/src/group/editor.scss
+++ b/packages/block-library/src/group/editor.scss
@@ -10,6 +10,18 @@
 	}
 }
 
+// Reset user select, but the next rule should take precedence for nested
+// groups.
+:where([data-has-multi-selection]:not([contenteditable="true"]) .wp-block-group > *) {
+	user-select: initial;
+}
+
+// When we are not multi-selecting, prevent children from capturing the
+// selection, which happens when the group is flex and children inlined.
+:where([data-has-multi-selection]:not([contenteditable="true"]) .wp-block-group) {
+	user-select: none;
+}
+
 // Place block list appender in the same place content will appear.
 [data-type="core/group"].is-selected {
 	.block-list-appender {
@@ -39,64 +51,17 @@
 	&::after {
 		content: "";
 		display: flex;
-		flex: 1 0 $grid-unit-60;
+		flex: 1 0 $button-size-next-default-40px;
 		pointer-events: none;
-		min-height: $grid-unit-60 - $border-width - $border-width;
+		min-height: $button-size-next-default-40px - $border-width - $border-width;
 		border: $border-width dashed currentColor;
-		@include placeholder-style();
 	}
 
 	// Let the parent be selectable in the placeholder area.
 	pointer-events: none;
-	.block-editor-inserter {
+	.block-editor-inserter,
+	.block-editor-button-block-appender {
 		pointer-events: all;
 	}
 }
 
-.wp-block-group__placeholder {
-	.wp-block-group-placeholder__variations {
-		list-style: none;
-		display: flex;
-		justify-content: center;
-		flex-direction: row;
-		flex-wrap: wrap;
-		width: 100%;
-		padding: 0;
-		margin: 0;
-	}
-	.components-placeholder__instructions {
-		text-align: center;
-		margin-bottom: 18px;
-	}
-	.wp-block-group-placeholder__variations svg {
-		fill: $gray-400 !important;
-	}
-	.wp-block-group-placeholder__variations svg:hover {
-		fill: var(--wp-admin-theme-color) !important;
-	}
-	.wp-block-group-placeholder__variations > li {
-		margin: 0 $grid-unit-15 $grid-unit-15 $grid-unit-15;
-		width: auto;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-	.wp-block-group-placeholder__variations li > .wp-block-group-placeholder__variation-button {
-		width: 44px;
-		height: 32px;
-		padding: 0;
-		&:hover {
-			box-shadow: none;
-		}
-	}
-	.components-placeholder {
-		min-height: auto;
-		padding: $grid-unit-30;
-	}
-	.is-small,
-	.is-medium {
-		.wp-block-group-placeholder__variations > li {
-			margin: $grid-unit-15;
-		}
-	}
-}
diff --git a/packages/block-library/src/group/index.js b/packages/block-library/src/group/index.js
index 2d06f1a965c521..06ed4aa1001edf 100644
--- a/packages/block-library/src/group/index.js
+++ b/packages/block-library/src/group/index.js
@@ -23,63 +23,52 @@ export const settings = {
 	icon,
 	example: {
 		attributes: {
+			layout: {
+				type: 'constrained',
+				justifyContent: 'center',
+			},
 			style: {
-				color: {
-					text: '#000000',
-					background: '#ffffff',
+				spacing: {
+					padding: {
+						top: '4em',
+						right: '3em',
+						bottom: '4em',
+						left: '3em',
+					},
 				},
 			},
 		},
 		innerBlocks: [
 			{
-				name: 'core/paragraph',
-				attributes: {
-					customTextColor: '#cf2e2e',
-					fontSize: 'large',
-					content: __( 'One.' ),
-				},
-			},
-			{
-				name: 'core/paragraph',
-				attributes: {
-					customTextColor: '#ff6900',
-					fontSize: 'large',
-					content: __( 'Two.' ),
-				},
-			},
-			{
-				name: 'core/paragraph',
+				name: 'core/heading',
 				attributes: {
-					customTextColor: '#fcb900',
-					fontSize: 'large',
-					content: __( 'Three.' ),
+					content: __( 'La Mancha' ),
+					textAlign: 'center',
 				},
 			},
 			{
 				name: 'core/paragraph',
 				attributes: {
-					customTextColor: '#00d084',
-					fontSize: 'large',
-					content: __( 'Four.' ),
+					align: 'center',
+					content: __(
+						'In a village of La Mancha, the name of which I have no desire to call to mind, there lived not long since one of those gentlemen that keep a lance in the lance-rack, an old buckler, a lean hack, and a greyhound for coursing.'
+					),
 				},
 			},
 			{
-				name: 'core/paragraph',
+				name: 'core/spacer',
 				attributes: {
-					customTextColor: '#0693e3',
-					fontSize: 'large',
-					content: __( 'Five.' ),
+					height: '10px',
 				},
 			},
 			{
-				name: 'core/paragraph',
+				name: 'core/button',
 				attributes: {
-					customTextColor: '#9b51e0',
-					fontSize: 'large',
-					content: __( 'Six.' ),
+					text: __( 'Read more' ),
 				},
 			},
 		],
+		viewportWidth: 600,
 	},
 	transforms,
 	edit,
diff --git a/packages/block-library/src/group/placeholder.js b/packages/block-library/src/group/placeholder.js
index 16a99a9287338d..c7c4c6956e7d6a 100644
--- a/packages/block-library/src/group/placeholder.js
+++ b/packages/block-library/src/group/placeholder.js
@@ -20,42 +20,41 @@ const getGroupPlaceholderIcons = ( name = 'group' ) => {
 		group: (
 			<SVG
 				xmlns="http://www.w3.org/2000/svg"
-				width="44"
-				height="32"
-				viewBox="0 0 44 32"
+				width="48"
+				height="48"
+				viewBox="0 0 48 48"
 			>
-				<Path d="M42 0H2C.9 0 0 .9 0 2v28c0 1.1.9 2 2 2h40c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2z" />
+				<Path d="M0 10a2 2 0 0 1 2-2h44a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Z" />
 			</SVG>
 		),
 		'group-row': (
 			<SVG
 				xmlns="http://www.w3.org/2000/svg"
-				width="44"
-				height="32"
-				viewBox="0 0 44 32"
+				width="48"
+				height="48"
+				viewBox="0 0 48 48"
 			>
-				<Path d="M42 0H23.5c-.6 0-1 .4-1 1v30c0 .6.4 1 1 1H42c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zM20.5 0H2C.9 0 0 .9 0 2v28c0 1.1.9 2 2 2h18.5c.6 0 1-.4 1-1V1c0-.6-.4-1-1-1z" />
+				<Path d="M0 10a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Zm25 0a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v28a2 2 0 0 1-2 2H27a2 2 0 0 1-2-2V10Z" />
 			</SVG>
 		),
 		'group-stack': (
 			<SVG
 				xmlns="http://www.w3.org/2000/svg"
-				width="44"
-				height="32"
-				viewBox="0 0 44 32"
+				width="48"
+				height="48"
+				viewBox="0 0 48 48"
 			>
-				<Path d="M42 0H2C.9 0 0 .9 0 2v12.5c0 .6.4 1 1 1h42c.6 0 1-.4 1-1V2c0-1.1-.9-2-2-2zm1 16.5H1c-.6 0-1 .4-1 1V30c0 1.1.9 2 2 2h40c1.1 0 2-.9 2-2V17.5c0-.6-.4-1-1-1z" />
+				<Path d="M0 10a2 2 0 0 1 2-2h44a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Zm0 17a2 2 0 0 1 2-2h44a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V27Z" />
 			</SVG>
 		),
 		'group-grid': (
 			<SVG
 				xmlns="http://www.w3.org/2000/svg"
-				width="44"
-				height="32"
-				viewBox="0 0 44 32"
+				width="48"
+				height="48"
+				viewBox="0 0 48 48"
 			>
-				<Path d="m20.30137,-0.00025l-18.9728,0c-0.86524,0.07234 -1.41711,0.79149 -1.41711,1.89149l0,12.64468c0,0.6 0.73401,0.96383 1.0304,0.96383l19.67469,0.03617c0.29639,0 1.0304,-0.4 1.0304,-1l-0.03576,-12.7532c0,-1.1 -0.76644,-1.78297 -1.30983,-1.78297zm0.52975,16.60851l-19.99654,-0.03617c-0.29639,0 -0.92312,0.36383 -0.92312,0.96383l-0.03576,12.68085c0,1.1 0.8022,1.81915 1.34559,1.81915l19.00857,0c0.54339,0 1.45287,-0.71915 1.45287,-1.81915l0,-12.53617c0,-0.6 -0.5552,-1.07234 -0.8516,-1.07234z" />
-				<Path d="m42.73056,-0.03617l-18.59217,0c-0.84788,0.07234 -1.38868,0.79149 -1.38868,1.89149l0,12.64468c0,0.6 0.71928,0.96383 1.00973,0.96383l19.27997,0.03617c0.29045,0 1.00973,-0.4 1.00973,-1l-0.03504,-12.7532c0,-1.1 -0.75106,-1.78297 -1.28355,-1.78297zm0.51912,16.60851l-19.59537,-0.03617c-0.29045,0 -0.9046,0.36383 -0.9046,0.96383l-0.03504,12.68085c0,1.1 0.78611,1.81915 1.31859,1.81915l18.62721,0c0.53249,0 1.42372,-0.71915 1.42372,-1.81915l0,-12.53617c0,-0.6 -0.54407,-1.07234 -0.83451,-1.07234z" />
+				<Path d="M0 10a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V10Zm25 0a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H27a2 2 0 0 1-2-2V10ZM0 27a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V27Zm25 0a2 2 0 0 1 2-2h19a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H27a2 2 0 0 1-2-2V27Z" />
 			</SVG>
 		),
 	};
@@ -140,6 +139,13 @@ function GroupPlaceHolder( { name, onSelect } ) {
 	const blockProps = useBlockProps( {
 		className: 'wp-block-group__placeholder',
 	} );
+
+	useEffect( () => {
+		if ( variations && variations.length === 1 ) {
+			onSelect( variations[ 0 ] );
+		}
+	}, [ onSelect, variations ] );
+
 	return (
 		<div { ...blockProps }>
 			<Placeholder
@@ -159,11 +165,12 @@ function GroupPlaceHolder( { name, onSelect } ) {
 					{ variations.map( ( variation ) => (
 						<li key={ variation.name }>
 							<Button
+								__next40pxDefaultSize
 								variant="tertiary"
 								icon={ getGroupPlaceholderIcons(
 									variation.name
 								) }
-								iconSize={ 44 }
+								iconSize={ 48 }
 								onClick={ () => onSelect( variation ) }
 								className="wp-block-group-placeholder__variation-button"
 								label={ `${ variation.title }: ${ variation.description }` }
diff --git a/packages/block-library/src/group/style.scss b/packages/block-library/src/group/style.scss
index 3457a12adb6221..018091ffd45644 100644
--- a/packages/block-library/src/group/style.scss
+++ b/packages/block-library/src/group/style.scss
@@ -2,3 +2,8 @@
 	// This block has customizable padding, border-box makes that more predictable.
 	box-sizing: border-box;
 }
+
+// We need this so groups with negative margins overlap as expected.
+:where(.wp-block-group.wp-block-group-is-layout-constrained) {
+	position: relative;
+}
diff --git a/packages/block-library/src/group/variations.js b/packages/block-library/src/group/variations.js
index 3f5dcc0a45a9e4..5ded2c724bfa9b 100644
--- a/packages/block-library/src/group/variations.js
+++ b/packages/block-library/src/group/variations.js
@@ -4,6 +4,59 @@
 import { __, _x } from '@wordpress/i18n';
 import { group, row, stack, grid } from '@wordpress/icons';
 
+const example = {
+	innerBlocks: [
+		{
+			name: 'core/paragraph',
+			attributes: {
+				customTextColor: '#cf2e2e',
+				fontSize: 'large',
+				content: __( 'One.' ),
+			},
+		},
+		{
+			name: 'core/paragraph',
+			attributes: {
+				customTextColor: '#ff6900',
+				fontSize: 'large',
+				content: __( 'Two.' ),
+			},
+		},
+		{
+			name: 'core/paragraph',
+			attributes: {
+				customTextColor: '#fcb900',
+				fontSize: 'large',
+				content: __( 'Three.' ),
+			},
+		},
+		{
+			name: 'core/paragraph',
+			attributes: {
+				customTextColor: '#00d084',
+				fontSize: 'large',
+				content: __( 'Four.' ),
+			},
+		},
+		{
+			name: 'core/paragraph',
+			attributes: {
+				customTextColor: '#0693e3',
+				fontSize: 'large',
+				content: __( 'Five.' ),
+			},
+		},
+		{
+			name: 'core/paragraph',
+			attributes: {
+				customTextColor: '#9b51e0',
+				fontSize: 'large',
+				content: __( 'Six.' ),
+			},
+		},
+	],
+};
+
 const variations = [
 	{
 		name: 'group',
@@ -30,6 +83,7 @@ const variations = [
 			( ! blockAttributes.layout?.orientation ||
 				blockAttributes.layout?.orientation === 'horizontal' ),
 		icon: row,
+		example,
 	},
 	{
 		name: 'group-stack',
@@ -41,11 +95,9 @@ const variations = [
 			blockAttributes.layout?.type === 'flex' &&
 			blockAttributes.layout?.orientation === 'vertical',
 		icon: stack,
+		example,
 	},
-];
-
-if ( window?.__experimentalEnableGroupGridVariation ) {
-	variations.push( {
+	{
 		name: 'group-grid',
 		title: __( 'Grid' ),
 		description: __( 'Arrange blocks in a grid.' ),
@@ -54,7 +106,8 @@ if ( window?.__experimentalEnableGroupGridVariation ) {
 		isActive: ( blockAttributes ) =>
 			blockAttributes.layout?.type === 'grid',
 		icon: grid,
-	} );
-}
+		example,
+	},
+];
 
 export default variations;
diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json
index dfd5bb72b63314..2276bcbbb50172 100644
--- a/packages/block-library/src/heading/block.json
+++ b/packages/block-library/src/heading/block.json
@@ -12,16 +12,18 @@
 			"type": "string"
 		},
 		"content": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "h1,h2,h3,h4,h5,h6",
-			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"level": {
 			"type": "number",
 			"default": 2
 		},
+		"levelOptions": {
+			"type": "array"
+		},
 		"placeholder": {
 			"type": "string"
 		}
@@ -30,6 +32,19 @@
 		"align": [ "wide", "full" ],
 		"anchor": true,
 		"className": true,
+		"splitting": true,
+		"__experimentalBorder": {
+			"color": true,
+			"radius": true,
+			"style": true,
+			"width": true,
+			"__experimentalDefaultControls": {
+				"color": true,
+				"radius": true,
+				"style": true,
+				"width": true
+			}
+		},
 		"color": {
 			"gradients": true,
 			"link": true,
@@ -61,7 +76,10 @@
 			}
 		},
 		"__unstablePasteTextInline": true,
-		"__experimentalSlashInserter": true
+		"__experimentalSlashInserter": true,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-heading-editor",
 	"style": "wp-block-heading"
diff --git a/packages/block-library/src/heading/deprecated.js b/packages/block-library/src/heading/deprecated.js
index 6ea881acbc19f6..76b175ac44fc40 100644
--- a/packages/block-library/src/heading/deprecated.js
+++ b/packages/block-library/src/heading/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -83,7 +83,7 @@ const v1 = {
 
 		const textClass = getColorClassName( 'color', textColor );
 
-		const className = classnames( {
+		const className = clsx( {
 			[ textClass ]: textClass,
 		} );
 
@@ -119,7 +119,7 @@ const v2 = {
 
 		const textClass = getColorClassName( 'color', textColor );
 
-		const className = classnames( {
+		const className = clsx( {
 			[ textClass ]: textClass,
 			[ `has-text-align-${ align }` ]: align,
 		} );
@@ -157,7 +157,7 @@ const v3 = {
 
 		const textClass = getColorClassName( 'color', textColor );
 
-		const className = classnames( {
+		const className = clsx( {
 			[ textClass ]: textClass,
 			'has-text-color': textColor || customTextColor,
 			[ `has-text-align-${ align }` ]: align,
@@ -200,7 +200,7 @@ const v4 = {
 		const { align, content, level } = attributes;
 		const TagName = 'h' + level;
 
-		const className = classnames( {
+		const className = clsx( {
 			[ `has-text-align-${ align }` ]: align,
 		} );
 
@@ -259,7 +259,7 @@ const v5 = {
 			source: 'html',
 			selector: 'h1,h2,h3,h4,h5,h6',
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		level: {
 			type: 'number',
@@ -273,7 +273,7 @@ const v5 = {
 		const { textAlign, content, level } = attributes;
 		const TagName = 'h' + level;
 
-		const className = classnames( {
+		const className = clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} );
 
diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
index b7d1d174264434..ea58a75d51cda5 100644
--- a/packages/block-library/src/heading/edit.js
+++ b/packages/block-library/src/heading/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -9,7 +9,6 @@ import classnames from 'classnames';
 import { __ } from '@wordpress/i18n';
 import { useEffect, Platform } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
-import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
 import {
 	AlignmentControl,
 	BlockControls,
@@ -17,6 +16,7 @@ import {
 	useBlockProps,
 	store as blockEditorStore,
 	HeadingLevelDropdown,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 
 /**
@@ -32,14 +32,16 @@ function HeadingEdit( {
 	style,
 	clientId,
 } ) {
-	const { textAlign, content, level, placeholder, anchor } = attributes;
+	const { textAlign, content, level, levelOptions, placeholder, anchor } =
+		attributes;
 	const tagName = 'h' + level;
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 		style,
 	} );
+	const blockEditingMode = useBlockEditingMode();
 
 	const { canGenerateAnchors } = useSelect( ( select ) => {
 		const { getGlobalBlockCount, getSettings } = select( blockEditorStore );
@@ -90,46 +92,29 @@ function HeadingEdit( {
 
 	return (
 		<>
-			<BlockControls group="block">
-				<HeadingLevelDropdown
-					value={ level }
-					onChange={ ( newLevel ) =>
-						setAttributes( { level: newLevel } )
-					}
-				/>
-				<AlignmentControl
-					value={ textAlign }
-					onChange={ ( nextAlign ) => {
-						setAttributes( { textAlign: nextAlign } );
-					} }
-				/>
-			</BlockControls>
+			{ blockEditingMode === 'default' && (
+				<BlockControls group="block">
+					<HeadingLevelDropdown
+						value={ level }
+						options={ levelOptions }
+						onChange={ ( newLevel ) =>
+							setAttributes( { level: newLevel } )
+						}
+					/>
+					<AlignmentControl
+						value={ textAlign }
+						onChange={ ( nextAlign ) => {
+							setAttributes( { textAlign: nextAlign } );
+						} }
+					/>
+				</BlockControls>
+			) }
 			<RichText
 				identifier="content"
 				tagName={ tagName }
 				value={ content }
 				onChange={ onContentChange }
 				onMerge={ mergeBlocks }
-				onSplit={ ( value, isOriginal ) => {
-					let block;
-
-					if ( isOriginal || value ) {
-						block = createBlock( 'core/heading', {
-							...attributes,
-							content: value,
-						} );
-					} else {
-						block = createBlock(
-							getDefaultBlockName() ?? 'core/heading'
-						);
-					}
-
-					if ( isOriginal ) {
-						block.clientId = clientId;
-					}
-
-					return block;
-				} }
 				onReplace={ onReplace }
 				onRemove={ () => onReplace( [] ) }
 				placeholder={ placeholder || __( 'Heading' ) }
diff --git a/packages/block-library/src/heading/edit.native.js b/packages/block-library/src/heading/edit.native.js
new file mode 100644
index 00000000000000..0946fe5a5ad66b
--- /dev/null
+++ b/packages/block-library/src/heading/edit.native.js
@@ -0,0 +1,144 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useEffect, Platform } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
+import {
+	AlignmentControl,
+	BlockControls,
+	RichText,
+	useBlockProps,
+	store as blockEditorStore,
+	HeadingLevelDropdown,
+} from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { generateAnchor, setAnchor } from './autogenerate-anchors';
+
+function HeadingEdit( {
+	attributes,
+	setAttributes,
+	mergeBlocks,
+	onReplace,
+	style,
+	clientId,
+} ) {
+	const { textAlign, content, level, placeholder, anchor } = attributes;
+	const tagName = 'h' + level;
+	const blockProps = useBlockProps( {
+		className: clsx( {
+			[ `has-text-align-${ textAlign }` ]: textAlign,
+		} ),
+		style,
+	} );
+
+	const { canGenerateAnchors } = useSelect( ( select ) => {
+		const { getGlobalBlockCount, getSettings } = select( blockEditorStore );
+		const settings = getSettings();
+
+		return {
+			canGenerateAnchors:
+				!! settings.generateAnchors ||
+				getGlobalBlockCount( 'core/table-of-contents' ) > 0,
+		};
+	}, [] );
+
+	const { __unstableMarkNextChangeAsNotPersistent } =
+		useDispatch( blockEditorStore );
+
+	// Initially set anchor for headings that have content but no anchor set.
+	// This is used when transforming a block to heading, or for legacy anchors.
+	useEffect( () => {
+		if ( ! canGenerateAnchors ) {
+			return;
+		}
+
+		if ( ! anchor && content ) {
+			// This side-effect should not create an undo level.
+			__unstableMarkNextChangeAsNotPersistent();
+			setAttributes( {
+				anchor: generateAnchor( clientId, content ),
+			} );
+		}
+		setAnchor( clientId, anchor );
+
+		// Remove anchor map when block unmounts.
+		return () => setAnchor( clientId, null );
+	}, [ anchor, content, clientId, canGenerateAnchors ] );
+
+	const onContentChange = ( value ) => {
+		const newAttrs = { content: value };
+		if (
+			canGenerateAnchors &&
+			( ! anchor ||
+				! value ||
+				generateAnchor( clientId, content ) === anchor )
+		) {
+			newAttrs.anchor = generateAnchor( clientId, value );
+		}
+		setAttributes( newAttrs );
+	};
+
+	return (
+		<>
+			<BlockControls group="block">
+				<HeadingLevelDropdown
+					value={ level }
+					onChange={ ( newLevel ) =>
+						setAttributes( { level: newLevel } )
+					}
+				/>
+				<AlignmentControl
+					value={ textAlign }
+					onChange={ ( nextAlign ) => {
+						setAttributes( { textAlign: nextAlign } );
+					} }
+				/>
+			</BlockControls>
+			<RichText
+				identifier="content"
+				tagName={ tagName }
+				value={ content }
+				onChange={ onContentChange }
+				onMerge={ mergeBlocks }
+				onSplit={ ( value, isOriginal ) => {
+					let block;
+
+					if ( isOriginal || value ) {
+						block = createBlock( 'core/heading', {
+							...attributes,
+							content: value,
+						} );
+					} else {
+						block = createBlock(
+							getDefaultBlockName() ?? 'core/heading'
+						);
+					}
+
+					if ( isOriginal ) {
+						block.clientId = clientId;
+					}
+
+					return block;
+				} }
+				onReplace={ onReplace }
+				onRemove={ () => onReplace( [] ) }
+				placeholder={ placeholder || __( 'Heading' ) }
+				textAlign={ textAlign }
+				{ ...( Platform.isNative && { deleteEnter: true } ) } // setup RichText on native mobile to delete the "Enter" key as it's handled by the JS/RN side
+				{ ...blockProps }
+			/>
+		</>
+	);
+}
+
+export default HeadingEdit;
diff --git a/packages/block-library/src/heading/index.js b/packages/block-library/src/heading/index.js
index 3752ca70bc7142..d591dc94ed97d9 100644
--- a/packages/block-library/src/heading/index.js
+++ b/packages/block-library/src/heading/index.js
@@ -24,21 +24,23 @@ export const settings = {
 		attributes: {
 			content: __( 'Code is Poetry' ),
 			level: 2,
+			textAlign: 'center',
 		},
 	},
 	__experimentalLabel( attributes, { context } ) {
 		const { content, level } = attributes;
 
 		const customName = attributes?.metadata?.name;
+		const hasContent = content?.trim().length > 0;
 
 		// In the list view, use the block's content as the label.
 		// If the content is empty, fall back to the default label.
-		if ( context === 'list-view' && ( customName || content ) ) {
-			return attributes?.metadata?.name || content;
+		if ( context === 'list-view' && ( customName || hasContent ) ) {
+			return customName || content;
 		}
 
 		if ( context === 'accessibility' ) {
-			return ! content || content.length === 0
+			return ! hasContent
 				? sprintf(
 						/* translators: accessibility text. %s: heading level. */
 						__( 'Level %s. Empty.' ),
diff --git a/packages/block-library/src/heading/index.php b/packages/block-library/src/heading/index.php
index 5a7e8dbaab43cf..471e31f19f2ee9 100644
--- a/packages/block-library/src/heading/index.php
+++ b/packages/block-library/src/heading/index.php
@@ -14,6 +14,8 @@
  * Would be transformed to:
  *  <h2 class="align-left wp-block-heading">Hello World</h2>
  *
+ * @since 6.2.0
+ *
  * @param array  $attributes Attributes of the block being rendered.
  * @param string $content Content of the block being rendered.
  *
@@ -39,6 +41,8 @@ function block_core_heading_render( $attributes, $content ) {
 
 /**
  * Registers the `core/heading` block on server.
+ *
+ * @since 6.2.0
  */
 function register_block_core_heading() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/heading/save.js b/packages/block-library/src/heading/save.js
index 181f40234444e7..8ae4fa6afd9f6f 100644
--- a/packages/block-library/src/heading/save.js
+++ b/packages/block-library/src/heading/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,7 +12,7 @@ export default function save( { attributes } ) {
 	const { textAlign, content, level } = attributes;
 	const TagName = 'h' + level;
 
-	const className = classnames( {
+	const className = clsx( {
 		[ `has-text-align-${ textAlign }` ]: textAlign,
 	} );
 
diff --git a/packages/block-library/src/heading/test/__snapshots__/index.native.js.snap b/packages/block-library/src/heading/test/__snapshots__/index.native.js.snap
index c0397e823d4511..ceb77e2c8c7f06 100644
--- a/packages/block-library/src/heading/test/__snapshots__/index.native.js.snap
+++ b/packages/block-library/src/heading/test/__snapshots__/index.native.js.snap
@@ -1,11 +1,23 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Heading block changes heading level 1`] = `
+"<!-- wp:heading {"level":6} -->
+<h6 class="wp-block-heading"></h6>
+<!-- /wp:heading -->"
+`;
+
 exports[`Heading block inserts block 1`] = `
 "<!-- wp:heading -->
 <h2 class="wp-block-heading"></h2>
 <!-- /wp:heading -->"
 `;
 
+exports[`Heading block should keep the heading when there is an empty paragraph block before and backspace is pressed at the start 1`] = `
+"<!-- wp:heading -->
+<h2 class="wp-block-heading">A quick brown fox jumps over the lazy dog.</h2>
+<!-- /wp:heading -->"
+`;
+
 exports[`Heading block should merge with an empty Paragraph block and keep being the Heading block 1`] = `
 "<!-- wp:heading -->
 <h2 class="wp-block-heading">A quick brown fox jumps over the lazy dog.</h2>
@@ -23,3 +35,9 @@ exports[`Heading block should set a text color 1`] = `
 <h2 class="wp-block-heading has-pale-pink-color has-text-color">A quick brown fox jumps over the lazy dog.</h2>
 <!-- /wp:heading -->"
 `;
+
+exports[`Heading block should transform to a paragraph block when pressing backspace at the beginning of the first heading block 1`] = `
+"<!-- wp:paragraph -->
+<p>A quick brown fox jumps over the lazy dog.</p>
+<!-- /wp:paragraph -->"
+`;
diff --git a/packages/block-library/src/heading/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/heading/test/__snapshots__/transforms.native.js.snap
index 4f6512b3f86625..c773f863077715 100644
--- a/packages/block-library/src/heading/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/heading/test/__snapshots__/transforms.native.js.snap
@@ -20,7 +20,7 @@ exports[`Heading block transforms to Group block 1`] = `
 
 exports[`Heading block transforms to List block 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Example text</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
diff --git a/packages/block-library/src/heading/test/index.native.js b/packages/block-library/src/heading/test/index.native.js
index 1582e96aae0f4d..b8d93c32f5b4f6 100644
--- a/packages/block-library/src/heading/test/index.native.js
+++ b/packages/block-library/src/heading/test/index.native.js
@@ -2,11 +2,12 @@
  * External dependencies
  */
 import {
+	addBlock,
 	fireEvent,
+	getBlock,
 	getEditorHtml,
 	initializeEditor,
-	addBlock,
-	getBlock,
+	screen,
 	typeInRichText,
 	waitFor,
 	within,
@@ -33,13 +34,13 @@ afterAll( () => {
 
 describe( 'Heading block', () => {
 	it( 'inserts block', async () => {
-		const screen = await initializeEditor();
+		await initializeEditor();
 
 		// Add block
 		await addBlock( screen, 'Heading' );
 
 		// Get block
-		const headingBlock = await getBlock( screen, 'Heading' );
+		const headingBlock = getBlock( screen, 'Heading' );
 		fireEvent.press( headingBlock );
 		expect( headingBlock ).toBeVisible();
 
@@ -48,7 +49,7 @@ describe( 'Heading block', () => {
 
 	it( 'should set a text color', async () => {
 		// Arrange
-		const screen = await initializeEditor();
+		await initializeEditor();
 		await addBlock( screen, 'Heading' );
 
 		// Act
@@ -86,7 +87,7 @@ describe( 'Heading block', () => {
 
 	it( 'should set a background color', async () => {
 		// Arrange
-		const screen = await initializeEditor();
+		await initializeEditor();
 		await addBlock( screen, 'Heading' );
 
 		// Act
@@ -120,9 +121,9 @@ describe( 'Heading block', () => {
 
 	it( 'change level dropdown displays active selection', async () => {
 		// Arrange
-		const screen = await initializeEditor();
+		await initializeEditor();
 		await addBlock( screen, 'Heading' );
-		const headingBlock = await getBlock( screen, 'Heading' );
+		const headingBlock = getBlock( screen, 'Heading' );
 
 		// Act
 		fireEvent.press( headingBlock );
@@ -136,9 +137,23 @@ describe( 'Heading block', () => {
 		).toBeVisible();
 	} );
 
+	it( 'changes heading level', async () => {
+		// Arrange
+		await initializeEditor();
+		await addBlock( screen, 'Heading' );
+
+		// Act
+		fireEvent.press( getBlock( screen, 'Heading' ) );
+		fireEvent.press( screen.getByLabelText( 'Change level' ) );
+		fireEvent.press( screen.getByLabelText( 'Heading 6' ) );
+
+		// Assert
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
 	it( 'should merge with an empty Paragraph block and keep being the Heading block', async () => {
 		// Arrange
-		const screen = await initializeEditor();
+		await initializeEditor();
 		await addBlock( screen, 'Paragraph' );
 
 		// Act
@@ -174,4 +189,69 @@ describe( 'Heading block', () => {
 		// Assert
 		expect( getEditorHtml() ).toMatchSnapshot();
 	} );
+
+	it( 'should transform to a paragraph block when pressing backspace at the beginning of the first heading block', async () => {
+		// Arrange
+		await initializeEditor();
+
+		// Act
+		await addBlock( screen, 'Heading' );
+		const headingBlock = getBlock( screen, 'Heading' );
+		fireEvent.press( headingBlock );
+
+		const headingTextInput =
+			within( headingBlock ).getByPlaceholderText( 'Heading' );
+		typeInRichText(
+			headingTextInput,
+			'A quick brown fox jumps over the lazy dog.',
+			{ finalSelectionStart: 0, finalSelectionEnd: 0 }
+		);
+
+		fireEvent( headingTextInput, 'onKeyDown', {
+			nativeEvent: {},
+			preventDefault() {},
+			keyCode: BACKSPACE,
+		} );
+
+		// Assert
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'should keep the heading when there is an empty paragraph block before and backspace is pressed at the start', async () => {
+		// Arrange
+		await initializeEditor();
+		await addBlock( screen, 'Paragraph' );
+
+		// Act
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		fireEvent( paragraphTextInput, 'onKeyDown', {
+			nativeEvent: {},
+			preventDefault() {},
+			keyCode: ENTER,
+		} );
+
+		await addBlock( screen, 'Heading' );
+		const headingBlock = getBlock( screen, 'Heading', { rowIndex: 2 } );
+		fireEvent.press( headingBlock );
+
+		const headingTextInput =
+			within( headingBlock ).getByPlaceholderText( 'Heading' );
+		typeInRichText(
+			headingTextInput,
+			'A quick brown fox jumps over the lazy dog.',
+			{ finalSelectionStart: 0, finalSelectionEnd: 0 }
+		);
+
+		fireEvent( headingTextInput, 'onKeyDown', {
+			nativeEvent: {},
+			preventDefault() {},
+			keyCode: BACKSPACE,
+		} );
+
+		// Assert
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
 } );
diff --git a/packages/block-library/src/heading/transforms.js b/packages/block-library/src/heading/transforms.js
index a4db7884620963..f040ff06e37e86 100644
--- a/packages/block-library/src/heading/transforms.js
+++ b/packages/block-library/src/heading/transforms.js
@@ -7,6 +7,7 @@ import { createBlock, getBlockAttributes } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { getLevelFromHeadingNodeName } from './shared';
+import { getTransformedMetadata } from '../utils/get-transformed-metadata';
 
 const transforms = {
 	from: [
@@ -15,12 +16,20 @@ const transforms = {
 			isMultiBlock: true,
 			blocks: [ 'core/paragraph' ],
 			transform: ( attributes ) =>
-				attributes.map( ( { content, anchor, align: textAlign } ) =>
-					createBlock( 'core/heading', {
-						content,
-						anchor,
-						textAlign,
-					} )
+				attributes.map(
+					( { content, anchor, align: textAlign, metadata } ) =>
+						createBlock( 'core/heading', {
+							content,
+							anchor,
+							textAlign,
+							metadata: getTransformedMetadata(
+								metadata,
+								'core/heading',
+								( { content: contentBinding } ) => ( {
+									content: contentBinding,
+								} )
+							),
+						} )
 				),
 		},
 		{
@@ -82,8 +91,18 @@ const transforms = {
 			isMultiBlock: true,
 			blocks: [ 'core/paragraph' ],
 			transform: ( attributes ) =>
-				attributes.map( ( { content, textAlign: align } ) =>
-					createBlock( 'core/paragraph', { content, align } )
+				attributes.map( ( { content, textAlign: align, metadata } ) =>
+					createBlock( 'core/paragraph', {
+						content,
+						align,
+						metadata: getTransformedMetadata(
+							metadata,
+							'core/paragraph',
+							( { content: contentBinding } ) => ( {
+								content: contentBinding,
+							} )
+						),
+					} )
 				),
 		},
 	],
diff --git a/packages/block-library/src/home-link/block.json b/packages/block-library/src/home-link/block.json
index a9827b7718b9be..b19fcf43ce6880 100644
--- a/packages/block-library/src/home-link/block.json
+++ b/packages/block-library/src/home-link/block.json
@@ -36,6 +36,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-home-link-editor",
diff --git a/packages/block-library/src/home-link/edit.js b/packages/block-library/src/home-link/edit.js
index 4d13dd1939e4c5..fa6b27a3e2128b 100644
--- a/packages/block-library/src/home-link/edit.js
+++ b/packages/block-library/src/home-link/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -19,20 +19,17 @@ import { useEffect } from '@wordpress/element';
 const preventDefault = ( event ) => event.preventDefault();
 
 export default function HomeEdit( { attributes, setAttributes, context } ) {
-	const { homeUrl } = useSelect( ( select ) => {
-		const {
-			getUnstableBase, // Site index.
-		} = select( coreStore );
-		return {
-			homeUrl: getUnstableBase()?.home,
-		};
+	const homeUrl = useSelect( ( select ) => {
+		// Site index.
+		return select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+			?.home;
 	}, [] );
 	const { __unstableMarkNextChangeAsNotPersistent } =
 		useDispatch( blockEditorStore );
 
 	const { textColor, backgroundColor, style } = context;
 	const blockProps = useBlockProps( {
-		className: classnames( 'wp-block-navigation-item', {
+		className: clsx( 'wp-block-navigation-item', {
 			'has-text-color': !! textColor || !! style?.color?.text,
 			[ `has-${ textColor }-color` ]: !! textColor,
 			'has-background': !! backgroundColor || !! style?.color?.background,
diff --git a/packages/block-library/src/home-link/index.php b/packages/block-library/src/home-link/index.php
index 8fb5ed109019d3..fb7235834459d0 100644
--- a/packages/block-library/src/home-link/index.php
+++ b/packages/block-library/src/home-link/index.php
@@ -9,6 +9,8 @@
  * Build an array with CSS classes and inline styles defining the colors
  * which will be applied to the home link markup in the front-end.
  *
+ * @since 6.0.0
+ *
  * @param  array $context home link block context.
  * @return array Colors CSS classes and inline styles.
  */
@@ -61,6 +63,8 @@ function block_core_home_link_build_css_colors( $context ) {
  * Build an array with CSS classes and inline styles defining the font sizes
  * which will be applied to the home link markup in the front-end.
  *
+ * @since 6.0.0
+ *
  * @param  array $context Home link block context.
  * @return array Font size CSS classes and inline styles.
  */
@@ -88,6 +92,8 @@ function block_core_home_link_build_css_font_sizes( $context ) {
 /**
  * Builds an array with classes and style for the li wrapper
  *
+ * @since 6.0.0
+ *
  * @param  array $context    Home link block context.
  * @return string The li wrapper attributes.
  */
@@ -121,6 +127,8 @@ function block_core_home_link_build_li_wrapper_attributes( $context ) {
 /**
  * Renders the `core/home-link` block.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes The block attributes.
  * @param string   $content    The saved content.
  * @param WP_Block $block      The parsed block.
@@ -129,7 +137,10 @@ function block_core_home_link_build_li_wrapper_attributes( $context ) {
  */
 function render_block_core_home_link( $attributes, $content, $block ) {
 	if ( empty( $attributes['label'] ) ) {
-		return '';
+		// Using a fallback for the label attribute allows rendering the block even if no attributes have been set,
+		// e.g. when using the block as a hooked block.
+		// Note that the fallback value needs to be kept in sync with the one set in `edit.js` (upon first loading the block in the editor).
+		$attributes['label'] = __( 'Home' );
 	}
 	$aria_current = '';
 
@@ -152,6 +163,8 @@ function render_block_core_home_link( $attributes, $content, $block ) {
 /**
  * Register the home block
  *
+ * @since 6.0.0
+ *
  * @uses render_block_core_home_link()
  * @throws WP_Error An WP_Error exception parsing the block definition.
  */
diff --git a/packages/block-library/src/html/block.json b/packages/block-library/src/html/block.json
index b1a2ad60625d12..08587f69bbd460 100644
--- a/packages/block-library/src/html/block.json
+++ b/packages/block-library/src/html/block.json
@@ -16,7 +16,10 @@
 	"supports": {
 		"customClassName": false,
 		"className": false,
-		"html": false
+		"html": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-html-editor"
 }
diff --git a/packages/block-library/src/html/edit.js b/packages/block-library/src/html/edit.js
index 3cf2ee08bb68b2..9a1972d54b7e65 100644
--- a/packages/block-library/src/html/edit.js
+++ b/packages/block-library/src/html/edit.js
@@ -7,6 +7,7 @@ import {
 	BlockControls,
 	PlainText,
 	useBlockProps,
+	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import {
 	ToolbarButton,
@@ -14,6 +15,7 @@ import {
 	ToolbarGroup,
 	VisuallyHidden,
 } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
 import { useInstanceId } from '@wordpress/compose';
 
 /**
@@ -27,6 +29,10 @@ export default function HTMLEdit( { attributes, setAttributes, isSelected } ) {
 
 	const instanceId = useInstanceId( HTMLEdit, 'html-edit-desc' );
 
+	const isPreviewMode = useSelect( ( select ) => {
+		return select( blockEditorStore ).getSettings().isPreviewMode;
+	}, [] );
+
 	function switchToPreview() {
 		setIsPreview( true );
 	}
@@ -45,14 +51,12 @@ export default function HTMLEdit( { attributes, setAttributes, isSelected } ) {
 			<BlockControls>
 				<ToolbarGroup>
 					<ToolbarButton
-						className="components-tab-button"
 						isPressed={ ! isPreview }
 						onClick={ switchToHTML }
 					>
 						HTML
 					</ToolbarButton>
 					<ToolbarButton
-						className="components-tab-button"
 						isPressed={ isPreview }
 						onClick={ switchToPreview }
 					>
@@ -60,7 +64,7 @@ export default function HTMLEdit( { attributes, setAttributes, isSelected } ) {
 					</ToolbarButton>
 				</ToolbarGroup>
 			</BlockControls>
-			{ isPreview || isDisabled ? (
+			{ isPreview || isPreviewMode || isDisabled ? (
 				<>
 					<Preview
 						content={ attributes.content }
diff --git a/packages/block-library/src/html/editor.scss b/packages/block-library/src/html/editor.scss
index d77b1e9bf51450..d3feef0381f729 100644
--- a/packages/block-library/src/html/editor.scss
+++ b/packages/block-library/src/html/editor.scss
@@ -13,5 +13,8 @@
 		box-sizing: border-box;
 		max-height: 250px;
 		@include editor-input-reset();
+		// HTML input is always LTR regardless of language.
+		/*rtl:ignore*/
+		direction: ltr;
 	}
 }
diff --git a/packages/block-library/src/html/preview.js b/packages/block-library/src/html/preview.js
index d515c0119aa8db..eb24b00bc2352b 100644
--- a/packages/block-library/src/html/preview.js
+++ b/packages/block-library/src/html/preview.js
@@ -23,14 +23,15 @@ const DEFAULT_STYLES = `
 
 export default function HTMLEditPreview( { content, isSelected } ) {
 	const settingStyles = useSelect(
-		( select ) => select( blockEditorStore ).getSettings().styles
+		( select ) => select( blockEditorStore ).getSettings().styles,
+		[]
 	);
 
 	const styles = useMemo(
 		() => [
 			DEFAULT_STYLES,
 			...transformStyles(
-				settingStyles.filter( ( style ) => style.css )
+				( settingStyles ?? [] ).filter( ( style ) => style.css )
 			),
 		],
 		[ settingStyles ]
diff --git a/packages/block-library/src/image/block.json b/packages/block-library/src/image/block.json
index cfe91a71ff4f97..f441a6e893290b 100644
--- a/packages/block-library/src/image/block.json
+++ b/packages/block-library/src/image/block.json
@@ -9,12 +9,16 @@
 	"keywords": [ "img", "photo", "picture" ],
 	"textdomain": "default",
 	"attributes": {
+		"blob": {
+			"type": "string",
+			"role": "local"
+		},
 		"url": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "img",
 			"attribute": "src",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"alt": {
 			"type": "string",
@@ -22,13 +26,13 @@
 			"selector": "img",
 			"attribute": "alt",
 			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"caption": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "figcaption",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"lightbox": {
 			"type": "object",
@@ -41,14 +45,14 @@
 			"source": "attribute",
 			"selector": "img",
 			"attribute": "title",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"href": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "figure > a",
 			"attribute": "href",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"rel": {
 			"type": "string",
@@ -64,7 +68,7 @@
 		},
 		"id": {
 			"type": "number",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"width": {
 			"type": "string"
@@ -102,6 +106,9 @@
 		"filter": {
 			"duotone": true
 		},
+		"spacing": {
+			"margin": true
+		},
 		"__experimentalBorder": {
 			"color": true,
 			"radius": true,
@@ -112,10 +119,14 @@
 				"radius": true,
 				"width": true
 			}
+		},
+		"shadow": {
+			"__experimentalSkipSerialization": true
 		}
 	},
 	"selectors": {
 		"border": ".wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder",
+		"shadow": ".wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder",
 		"filter": {
 			"duotone": ".wp-block-image img, .wp-block-image .components-placeholder"
 		}
@@ -129,6 +140,5 @@
 		{ "name": "rounded", "label": "Rounded" }
 	],
 	"editorStyle": "wp-block-image-editor",
-	"style": "wp-block-image",
-	"viewScript": "file:./view.min.js"
+	"style": "wp-block-image"
 }
diff --git a/packages/block-library/src/image/deprecated.js b/packages/block-library/src/image/deprecated.js
index 0365ddcfff5d17..6c1db75c5e2aa5 100644
--- a/packages/block-library/src/image/deprecated.js
+++ b/packages/block-library/src/image/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -207,7 +207,7 @@ const v3 = {
 		const { url, alt, caption, align, href, width, height, id } =
 			attributes;
 
-		const classes = classnames( {
+		const classes = clsx( {
 			[ `align${ align }` ]: align,
 			'is-resized': width || height,
 		} );
@@ -329,7 +329,7 @@ const v4 = {
 
 		const newRel = ! rel ? undefined : rel;
 
-		const classes = classnames( {
+		const classes = clsx( {
 			[ `align${ align }` ]: align,
 			[ `size-${ sizeSlug }` ]: sizeSlug,
 			'is-resized': width || height,
@@ -499,7 +499,7 @@ const v5 = {
 
 		const newRel = ! rel ? undefined : rel;
 
-		const classes = classnames( {
+		const classes = clsx( {
 			[ `align${ align }` ]: align,
 			[ `size-${ sizeSlug }` ]: sizeSlug,
 			'is-resized': width || height,
@@ -559,7 +559,7 @@ const v6 = {
 			source: 'attribute',
 			selector: 'img',
 			attribute: 'src',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		alt: {
 			type: 'string',
@@ -567,27 +567,27 @@ const v6 = {
 			selector: 'img',
 			attribute: 'alt',
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		caption: {
 			type: 'string',
 			source: 'html',
 			selector: 'figcaption',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		title: {
 			type: 'string',
 			source: 'attribute',
 			selector: 'img',
 			attribute: 'title',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		href: {
 			type: 'string',
 			source: 'attribute',
 			selector: 'figure > a',
 			attribute: 'href',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		rel: {
 			type: 'string',
@@ -603,7 +603,7 @@ const v6 = {
 		},
 		id: {
 			type: 'number',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		width: {
 			type: 'number',
@@ -651,6 +651,14 @@ const v6 = {
 			},
 		},
 	},
+	migrate( attributes ) {
+		const { height, width } = attributes;
+		return {
+			...attributes,
+			width: typeof width === 'number' ? `${ width }px` : width,
+			height: typeof height === 'number' ? `${ height }px` : height,
+		};
+	},
 	save( { attributes } ) {
 		const {
 			url,
@@ -673,7 +681,7 @@ const v6 = {
 		const newRel = ! rel ? undefined : rel;
 		const borderProps = getBorderClassesAndStyles( attributes );
 
-		const classes = classnames( {
+		const classes = clsx( {
 			[ `align${ align }` ]: align,
 			[ `size-${ sizeSlug }` ]: sizeSlug,
 			'is-resized': width || height,
@@ -683,7 +691,7 @@ const v6 = {
 					Object.keys( borderProps.style ).length > 0 ),
 		} );
 
-		const imageClasses = classnames( borderProps.className, {
+		const imageClasses = clsx( borderProps.className, {
 			[ `wp-image-${ id }` ]: !! id,
 		} );
 
@@ -754,7 +762,7 @@ const v7 = {
 			source: 'attribute',
 			selector: 'img',
 			attribute: 'src',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		alt: {
 			type: 'string',
@@ -762,27 +770,27 @@ const v7 = {
 			selector: 'img',
 			attribute: 'alt',
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		caption: {
 			type: 'string',
 			source: 'html',
 			selector: 'figcaption',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		title: {
 			type: 'string',
 			source: 'attribute',
 			selector: 'img',
 			attribute: 'title',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		href: {
 			type: 'string',
 			source: 'attribute',
 			selector: 'figure > a',
 			attribute: 'href',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		rel: {
 			type: 'string',
@@ -798,7 +806,7 @@ const v7 = {
 		},
 		id: {
 			type: 'number',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		width: {
 			type: 'number',
@@ -875,7 +883,7 @@ const v7 = {
 		const newRel = ! rel ? undefined : rel;
 		const borderProps = getBorderClassesAndStyles( attributes );
 
-		const classes = classnames( {
+		const classes = clsx( {
 			[ `align${ align }` ]: align,
 			[ `size-${ sizeSlug }` ]: sizeSlug,
 			'is-resized': width || height,
@@ -885,7 +893,7 @@ const v7 = {
 					Object.keys( borderProps.style ).length > 0 ),
 		} );
 
-		const imageClasses = classnames( borderProps.className, {
+		const imageClasses = clsx( borderProps.className, {
 			[ `wp-image-${ id }` ]: !! id,
 		} );
 
@@ -954,7 +962,7 @@ const v8 = {
 			source: 'attribute',
 			selector: 'img',
 			attribute: 'src',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		alt: {
 			type: 'string',
@@ -962,27 +970,27 @@ const v8 = {
 			selector: 'img',
 			attribute: 'alt',
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		caption: {
 			type: 'string',
 			source: 'html',
 			selector: 'figcaption',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		title: {
 			type: 'string',
 			source: 'attribute',
 			selector: 'img',
 			attribute: 'title',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		href: {
 			type: 'string',
 			source: 'attribute',
 			selector: 'figure > a',
 			attribute: 'href',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		rel: {
 			type: 'string',
@@ -998,7 +1006,7 @@ const v8 = {
 		},
 		id: {
 			type: 'number',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		width: {
 			type: 'string',
@@ -1094,7 +1102,7 @@ const v8 = {
 		const newRel = ! rel ? undefined : rel;
 		const borderProps = getBorderClassesAndStyles( attributes );
 
-		const classes = classnames( {
+		const classes = clsx( {
 			[ `align${ align }` ]: align,
 			[ `size-${ sizeSlug }` ]: sizeSlug,
 			'is-resized': width || height,
@@ -1104,7 +1112,7 @@ const v8 = {
 					Object.keys( borderProps.style ).length > 0 ),
 		} );
 
-		const imageClasses = classnames( borderProps.className, {
+		const imageClasses = clsx( borderProps.className, {
 			[ `wp-image-${ id }` ]: !! id,
 		} );
 
diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
index d189af32efcbec..360c4b8e6127b8 100644
--- a/packages/block-library/src/image/edit.js
+++ b/packages/block-library/src/image/edit.js
@@ -1,31 +1,37 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { getBlobByURL, isBlobURL, revokeBlobURL } from '@wordpress/blob';
+import { isBlobURL, createBlobURL } from '@wordpress/blob';
+import { createBlock, getBlockBindingsSource } from '@wordpress/blocks';
 import { Placeholder } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import {
 	BlockIcon,
-	MediaPlaceholder,
 	useBlockProps,
+	MediaPlaceholder,
 	store as blockEditorStore,
 	__experimentalUseBorderProps as useBorderProps,
+	__experimentalGetShadowClassesAndStyles as getShadowClassesAndStyles,
 	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import { useEffect, useRef, useState } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { image as icon } from '@wordpress/icons';
+import { __, sprintf } from '@wordpress/i18n';
+import { image as icon, plugins as pluginsIcon } from '@wordpress/icons';
 import { store as noticesStore } from '@wordpress/notices';
+import { useResizeObserver } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
+import { useUploadMediaFromBlobURL } from '../utils/hooks';
 import Image from './image';
+import { isValidFileType } from './utils';
+import { useMaxWidthObserver } from './use-max-width-observer';
 
 /**
  * Module constants
@@ -52,17 +58,6 @@ export const pickRelevantMediaFiles = ( image, size ) => {
 	return imageProps;
 };
 
-/**
- * Is the URL a temporary blob URL? A blob URL is one that is used temporarily
- * while the image is being uploaded and will not have an id yet allocated.
- *
- * @param {number=} id  The id of the image.
- * @param {string=} url The url of the image.
- *
- * @return {boolean} Is the URL a Blob URL
- */
-const isTemporaryImage = ( id, url ) => ! id && isBlobURL( url );
-
 /**
  * Is the url for the image hosted externally. An externally hosted image has no
  * id and is not a blob url.
@@ -93,12 +88,13 @@ function hasSize( image, size ) {
 export function ImageEdit( {
 	attributes,
 	setAttributes,
-	isSelected,
+	isSelected: isSingleSelected,
 	className,
 	insertBlocksAfter,
 	onReplace,
 	context,
 	clientId,
+	__unstableParentLayout: parentLayout,
 } ) {
 	const {
 		url = '',
@@ -111,8 +107,24 @@ export function ImageEdit( {
 		aspectRatio,
 		scale,
 		align,
+		metadata,
 	} = attributes;
-	const [ temporaryURL, setTemporaryURL ] = useState();
+
+	const [ temporaryURL, setTemporaryURL ] = useState( attributes.blob );
+
+	const containerRef = useRef();
+	// Only observe the max width from the parent container when the parent layout is not flex nor grid.
+	// This won't work for them because the container width changes with the image.
+	// TODO: Find a way to observe the container width for flex and grid layouts.
+	const isMaxWidthContainerWidth =
+		! parentLayout ||
+		( parentLayout.type !== 'flex' && parentLayout.type !== 'grid' );
+	const [ maxWidthObserver, maxContentWidth ] = useMaxWidthObserver();
+
+	const [ placeholderResizeListener, { width: placeholderWidth } ] =
+		useResizeObserver();
+
+	const isSmallContainer = placeholderWidth && placeholderWidth < 160;
 
 	const altRef = useRef();
 	useEffect( () => {
@@ -124,7 +136,7 @@ export function ImageEdit( {
 		captionRef.current = caption;
 	}, [ caption ] );
 
-	const { __unstableMarkNextChangeAsNotPersistent } =
+	const { __unstableMarkNextChangeAsNotPersistent, replaceBlock } =
 		useDispatch( blockEditorStore );
 
 	useEffect( () => {
@@ -137,17 +149,14 @@ export function ImageEdit( {
 				scale: undefined,
 			} );
 		}
-	}, [ align ] );
-
-	const ref = useRef();
-	const { imageDefaultSize, mediaUpload } = useSelect( ( select ) => {
-		const { getSettings } = select( blockEditorStore );
-		const settings = getSettings();
-		return {
-			imageDefaultSize: settings.imageDefaultSize,
-			mediaUpload: settings.mediaUpload,
-		};
-	}, [] );
+	}, [ __unstableMarkNextChangeAsNotPersistent, align, setAttributes ] );
+
+	const {
+		getSettings,
+		getBlockRootClientId,
+		getBlockName,
+		canInsertBlockType,
+	} = useSelect( blockEditorStore );
 	const blockEditingMode = useBlockEditingMode();
 
 	const { createErrorNotice } = useDispatch( noticesStore );
@@ -157,11 +166,56 @@ export function ImageEdit( {
 			src: undefined,
 			id: undefined,
 			url: undefined,
+			blob: undefined,
 		} );
-		setTemporaryURL( undefined );
+	}
+
+	function onSelectImagesList( images ) {
+		const win = containerRef.current?.ownerDocument.defaultView;
+
+		if ( images.every( ( file ) => file instanceof win.File ) ) {
+			/** @type {File[]} */
+			const files = images;
+			const rootClientId = getBlockRootClientId( clientId );
+
+			if ( files.some( ( file ) => ! isValidFileType( file ) ) ) {
+				// Copied from the same notice in the gallery block.
+				createErrorNotice(
+					__(
+						'If uploading to a gallery all files need to be image formats'
+					),
+					{ id: 'gallery-upload-invalid-file', type: 'snackbar' }
+				);
+			}
+
+			const imageBlocks = files
+				.filter( ( file ) => isValidFileType( file ) )
+				.map( ( file ) =>
+					createBlock( 'core/image', {
+						blob: createBlobURL( file ),
+					} )
+				);
+
+			if ( getBlockName( rootClientId ) === 'core/gallery' ) {
+				replaceBlock( clientId, imageBlocks );
+			} else if ( canInsertBlockType( 'core/gallery', rootClientId ) ) {
+				const galleryBlock = createBlock(
+					'core/gallery',
+					{},
+					imageBlocks
+				);
+
+				replaceBlock( clientId, galleryBlock );
+			}
+		}
 	}
 
 	function onSelectImage( media ) {
+		if ( Array.isArray( media ) ) {
+			onSelectImagesList( media );
+			return;
+		}
+
 		if ( ! media || ! media.url ) {
 			setAttributes( {
 				url: undefined,
@@ -169,7 +223,9 @@ export function ImageEdit( {
 				id: undefined,
 				title: undefined,
 				caption: undefined,
+				blob: undefined,
 			} );
+			setTemporaryURL();
 
 			return;
 		}
@@ -179,7 +235,7 @@ export function ImageEdit( {
 			return;
 		}
 
-		setTemporaryURL();
+		const { imageDefaultSize } = getSettings();
 
 		// Try to use the previous selected image size if its available
 		// otherwise try the default image size or fallback to "full"
@@ -252,56 +308,32 @@ export function ImageEdit( {
 		mediaAttributes.href = href;
 
 		setAttributes( {
+			blob: undefined,
 			...mediaAttributes,
 			...additionalAttributes,
 			linkDestination,
 		} );
+		setTemporaryURL();
 	}
 
 	function onSelectURL( newURL ) {
 		if ( newURL !== url ) {
 			setAttributes( {
+				blob: undefined,
 				url: newURL,
 				id: undefined,
-				sizeSlug: imageDefaultSize,
+				sizeSlug: getSettings().imageDefaultSize,
 			} );
+			setTemporaryURL();
 		}
 	}
 
-	let isTemp = isTemporaryImage( id, url );
-
-	// Upload a temporary image on mount.
-	useEffect( () => {
-		if ( ! isTemp ) {
-			return;
-		}
-
-		const file = getBlobByURL( url );
-
-		if ( file ) {
-			mediaUpload( {
-				filesList: [ file ],
-				onFileChange: ( [ img ] ) => {
-					onSelectImage( img );
-				},
-				allowedTypes: ALLOWED_MEDIA_TYPES,
-				onError: ( message ) => {
-					isTemp = false;
-					onUploadError( message );
-				},
-			} );
-		}
-	}, [] );
-
-	// If an image is temporary, revoke the Blob url when it is uploaded (and is
-	// no longer temporary).
-	useEffect( () => {
-		if ( isTemp ) {
-			setTemporaryURL( url );
-			return;
-		}
-		revokeBlobURL( temporaryURL );
-	}, [ isTemp, url ] );
+	useUploadMediaFromBlobURL( {
+		url: temporaryURL,
+		allowedTypes: ALLOWED_MEDIA_TYPES,
+		onChange: onSelectImage,
+		onError: onUploadError,
+	} );
 
 	const isExternal = isExternalImage( id, url );
 	const src = isExternal ? url : undefined;
@@ -309,15 +341,16 @@ export function ImageEdit( {
 		<img
 			alt={ __( 'Edit image' ) }
 			title={ __( 'Edit image' ) }
-			className={ 'edit-image-preview' }
+			className="edit-image-preview"
 			src={ url }
 		/>
 	);
 
 	const borderProps = useBorderProps( attributes );
+	const shadowProps = getShadowClassesAndStyles( attributes );
 
-	const classes = classnames( className, {
-		'is-transient': temporaryURL,
+	const classes = clsx( className, {
+		'is-transient': !! temporaryURL,
 		'is-resized': !! width || !! height,
 		[ `size-${ sizeSlug }` ]: sizeSlug,
 		'has-custom-border':
@@ -327,24 +360,60 @@ export function ImageEdit( {
 	} );
 
 	const blockProps = useBlockProps( {
-		ref,
+		ref: containerRef,
 		className: classes,
 	} );
 
 	// Much of this description is duplicated from MediaPlaceholder.
+	const { lockUrlControls = false, lockUrlControlsMessage } = useSelect(
+		( select ) => {
+			if ( ! isSingleSelected ) {
+				return {};
+			}
+
+			const blockBindingsSource = getBlockBindingsSource(
+				metadata?.bindings?.url?.source
+			);
+
+			return {
+				lockUrlControls:
+					!! metadata?.bindings?.url &&
+					! blockBindingsSource?.canUserEditValue?.( {
+						select,
+						context,
+						args: metadata?.bindings?.url?.args,
+					} ),
+				lockUrlControlsMessage: blockBindingsSource?.label
+					? sprintf(
+							/* translators: %s: Label of the bindings source. */
+							__( 'Connected to %s' ),
+							blockBindingsSource.label
+					  )
+					: __( 'Connected to dynamic data' ),
+			};
+		},
+		[ context, isSingleSelected, metadata?.bindings?.url ]
+	);
 	const placeholder = ( content ) => {
 		return (
 			<Placeholder
-				className={ classnames( 'block-editor-media-placeholder', {
+				className={ clsx( 'block-editor-media-placeholder', {
 					[ borderProps.className ]:
-						!! borderProps.className && ! isSelected,
+						!! borderProps.className && ! isSingleSelected,
 				} ) }
-				withIllustration={ true }
-				icon={ icon }
-				label={ __( 'Image' ) }
-				instructions={ __(
-					'Upload an image file, pick one from your media library, or add one with a URL.'
-				) }
+				icon={
+					! isSmallContainer &&
+					( lockUrlControls ? pluginsIcon : icon )
+				}
+				withIllustration={ ! isSingleSelected || isSmallContainer }
+				label={ ! isSmallContainer && __( 'Image' ) }
+				instructions={
+					! lockUrlControls &&
+					! isSmallContainer &&
+					__(
+						'Upload or drag an image file here, or pick one from your library.'
+					)
+				}
 				style={ {
 					aspectRatio:
 						! ( width && height ) && aspectRatio
@@ -354,43 +423,58 @@ export function ImageEdit( {
 					height: width && aspectRatio ? '100%' : height,
 					objectFit: scale,
 					...borderProps.style,
+					...shadowProps.style,
 				} }
 			>
-				{ content }
+				{ lockUrlControls &&
+					! isSmallContainer &&
+					lockUrlControlsMessage }
+
+				{ ! lockUrlControls && ! isSmallContainer && content }
+				{ placeholderResizeListener }
 			</Placeholder>
 		);
 	};
 
 	return (
-		<figure { ...blockProps }>
-			<Image
-				temporaryURL={ temporaryURL }
-				attributes={ attributes }
-				setAttributes={ setAttributes }
-				isSelected={ isSelected }
-				insertBlocksAfter={ insertBlocksAfter }
-				onReplace={ onReplace }
-				onSelectImage={ onSelectImage }
-				onSelectURL={ onSelectURL }
-				onUploadError={ onUploadError }
-				containerRef={ ref }
-				context={ context }
-				clientId={ clientId }
-				blockEditingMode={ blockEditingMode }
-			/>
-			<MediaPlaceholder
-				icon={ <BlockIcon icon={ icon } /> }
-				onSelect={ onSelectImage }
-				onSelectURL={ onSelectURL }
-				onError={ onUploadError }
-				placeholder={ placeholder }
-				accept="image/*"
-				allowedTypes={ ALLOWED_MEDIA_TYPES }
-				value={ { id, src } }
-				mediaPreview={ mediaPreview }
-				disableMediaButtons={ temporaryURL || url }
-			/>
-		</figure>
+		<>
+			<figure { ...blockProps }>
+				<Image
+					temporaryURL={ temporaryURL }
+					attributes={ attributes }
+					setAttributes={ setAttributes }
+					isSingleSelected={ isSingleSelected }
+					insertBlocksAfter={ insertBlocksAfter }
+					onReplace={ onReplace }
+					onSelectImage={ onSelectImage }
+					onSelectURL={ onSelectURL }
+					onUploadError={ onUploadError }
+					context={ context }
+					clientId={ clientId }
+					blockEditingMode={ blockEditingMode }
+					parentLayoutType={ parentLayout?.type }
+					maxContentWidth={ maxContentWidth }
+				/>
+				<MediaPlaceholder
+					icon={ <BlockIcon icon={ icon } /> }
+					onSelect={ onSelectImage }
+					onSelectURL={ onSelectURL }
+					onError={ onUploadError }
+					placeholder={ placeholder }
+					accept="image/*"
+					allowedTypes={ ALLOWED_MEDIA_TYPES }
+					handleUpload={ ( files ) => files.length === 1 }
+					value={ { id, src } }
+					mediaPreview={ mediaPreview }
+					disableMediaButtons={ temporaryURL || url }
+				/>
+			</figure>
+			{
+				// The listener cannot be placed as the first element as it will break the in-between inserter.
+				// See https://github.com/WordPress/gutenberg/blob/71134165868298fc15e22896d0c28b41b3755ff7/packages/block-editor/src/components/block-list/use-in-between-inserter.js#L120
+				isSingleSelected && isMaxWidthContainerWidth && maxWidthObserver
+			}
+		</>
 	);
 }
 
diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
index 5c5308af5dfc3c..efa526ec0afd5d 100644
--- a/packages/block-library/src/image/edit.native.js
+++ b/packages/block-library/src/image/edit.native.js
@@ -581,7 +581,10 @@ export class ImageEdit extends Component {
 						) }{ ' ' }
 						<FooterMessageLink
 							href={
-								'https://www.w3.org/WAI/tutorials/images/decision-tree/'
+								// translators: Localized tutorial, if one exists. W3C Web Accessibility Initiative link has list of existing translations.
+								__(
+									'https://www.w3.org/WAI/tutorials/images/decision-tree/'
+								)
 							}
 							value={ __( 'What is alt text?' ) }
 						/>
@@ -617,7 +620,7 @@ export class ImageEdit extends Component {
 					styles.removeFeaturedButton,
 				] }
 				cellContainerStyle={ styles.setFeaturedButtonCellContainer }
-				separatorType={ 'none' }
+				separatorType="none"
 				onPress={ () =>
 					this.onSetFeatured( MEDIA_ID_NO_FEATURED_IMAGE_SET )
 				}
@@ -629,7 +632,7 @@ export class ImageEdit extends Component {
 				label={ __( 'Set as Featured Image' ) }
 				labelStyle={ setFeaturedButtonStyle }
 				cellContainerStyle={ styles.setFeaturedButtonCellContainer }
-				separatorType={ 'none' }
+				separatorType="none"
 				onPress={ () => this.onSetFeatured( attributes.id ) }
 			/>
 		);
@@ -812,6 +815,7 @@ export class ImageEdit extends Component {
 						{ ! this.state.isCaptionSelected &&
 							getToolbarEditButton( openMediaOptions ) }
 						<MediaUploadProgress
+							enablePausedUploads
 							coverUrl={ url }
 							mediaId={ id }
 							onUpdateMediaProgress={ this.updateMediaProgress }
@@ -825,6 +829,7 @@ export class ImageEdit extends Component {
 								this.mediaUploadStateReset
 							}
 							renderContent={ ( {
+								isUploadPaused,
 								isUploadInProgress,
 								isUploadFailed,
 								retryMessage,
@@ -843,6 +848,7 @@ export class ImageEdit extends Component {
 												! isCaptionSelected
 											}
 											isUploadFailed={ isUploadFailed }
+											isUploadPaused={ isUploadPaused }
 											isUploadInProgress={
 												isUploadInProgress
 											}
@@ -886,7 +892,7 @@ export class ImageEdit extends Component {
 		return (
 			<MediaUpload
 				allowedTypes={ [ MEDIA_TYPE_IMAGE ] }
-				isReplacingMedia={ true }
+				isReplacingMedia
 				onSelect={ this.onSelectMediaUploadOption }
 				onSelectURL={ this.onSelectURL }
 				render={ ( { open, getMediaOptions } ) => {
diff --git a/packages/block-library/src/image/editor.scss b/packages/block-library/src/image/editor.scss
index 934682ed91b7de..34f65d690d3d74 100644
--- a/packages/block-library/src/image/editor.scss
+++ b/packages/block-library/src/image/editor.scss
@@ -1,44 +1,11 @@
 // Provide special styling for the placeholder.
-// @todo: this particular minimal style of placeholder could be componentized further.
+// @todo this particular minimal style of placeholder could be componentized further.
 .wp-block-image.wp-block-image {
-	// Show Placeholder style on-select.
-	&.is-selected .components-placeholder {
-		// Block UI appearance.
-		color: $gray-900;
-		background-color: $white;
-		box-shadow: inset 0 0 0 $border-width $gray-900;
-		border: none;
-
-		// Disable any duotone filter applied in the selected state.
-		filter: none !important;
-
-		// @todo: this should eventually be overridden by a custom border-radius set in the inspector.
-		border-radius: $radius-block-ui;
-
-		> svg {
-			opacity: 0;
-		}
-
-		.components-placeholder__illustration {
-			display: none;
-		}
-
-		&::before {
-			opacity: 0;
-		}
-	}
-
-	// Remove the transition while we still have a legacy placeholder style.
-	// Otherwise the content jumps between the 1px placeholder border, and any inherited custom
-	// parent border that may get applied when you deselect.
-	.components-placeholder__label,
-	.components-placeholder__instructions,
-	.components-button {
-		transition: none;
+	.block-editor-media-placeholder.is-small {
+		min-height: 60px;
 	}
 }
 
-
 figure.wp-block-image:not(.wp-block) {
 	margin: 0;
 }
@@ -61,6 +28,23 @@ figure.wp-block-image:not(.wp-block) {
 		top: 50%;
 		left: 50%;
 		transform: translate(-50%, -50%);
+		margin: 0;
+	}
+}
+
+// Shown while image is being uploded but cannot be previewed.
+.wp-block-image__placeholder {
+	aspect-ratio: 4 / 3;
+
+	// Make placeholder background white so that you can see the spinner on top of it.
+	&.has-illustration::before {
+		background: $white;
+		opacity: 0.8;
+	}
+
+	// Reduce opacity of diagonal stroke so that it doesn't obscure the spinner.
+	.components-placeholder__illustration {
+		opacity: 0.1;
 	}
 }
 
@@ -129,19 +113,30 @@ figure.wp-block-image:not(.wp-block) {
 	text-align: center;
 }
 
+// Relatively position the alignment container to support the content resizer.
+.wp-block[data-align]:has(> .wp-block-image) {
+	position: relative;
+}
+
 .wp-block-image__crop-area {
 	position: relative;
 	max-width: 100%;
 	width: 100%;
 	overflow: hidden;
 
-	// This removes the border from the img within the image cropper so it
-	// can be applied to the cropper itself. This then allows the image to be
-	// cropped within the visual border providing more accurate editing and
-	// smoother UX.
-	.reactEasyCrop_Container .reactEasyCrop_Image {
-		border: none;
-		border-radius: 0; // Prevent's theme.json radius bleeding into cropper.
+	.reactEasyCrop_Container {
+		// The linked Image block has `pointer-events: none` applied. Override it
+		// here to enable the crop action.
+		pointer-events: auto;
+
+		// This removes the border from the img within the image cropper so it
+		// can be applied to the cropper itself. This then allows the image to be
+		// cropped within the visual border providing more accurate editing and
+		// smoother UX.
+		.reactEasyCrop_Image {
+			border: none;
+			border-radius: 0; // Prevent's theme.json radius bleeding into cropper.
+		}
 	}
 }
 
@@ -164,15 +159,7 @@ figure.wp-block-image:not(.wp-block) {
 	}
 }
 
-.wp-block-image__aspect-ratio {
-	height: $grid-unit-60 - $border-width - $border-width;
-	margin-bottom: -$grid-unit-10;
-	display: flex;
-	align-items: center;
-
-	.components-button {
-		width: $button-size;
-		padding-left: 0;
-		padding-right: 0;
-	}
+.wp-block-image__toolbar_content_textarea {
+	// Corresponds to the size of the textarea in the block inspector.
+	width: 250px;
 }
diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index 768c7272e56dba..89bf31f92664b9 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -7,13 +7,14 @@ import {
 	ResizableBox,
 	Spinner,
 	TextareaControl,
-	ToggleControl,
 	TextControl,
 	ToolbarButton,
 	ToolbarGroup,
+	Dropdown,
 	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
 	__experimentalUseCustomUnits as useCustomUnits,
+	Placeholder,
 } from '@wordpress/components';
 import { useViewportMatch } from '@wordpress/compose';
 import { useSelect, useDispatch } from '@wordpress/data';
@@ -26,12 +27,14 @@ import {
 	useSettings,
 	__experimentalImageEditor as ImageEditor,
 	__experimentalUseBorderProps as useBorderProps,
+	__experimentalGetShadowClassesAndStyles as getShadowClassesAndStyles,
 	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import { useEffect, useMemo, useState, useRef } from '@wordpress/element';
 import { __, _x, sprintf, isRTL } from '@wordpress/i18n';
+import { DOWN } from '@wordpress/keycodes';
 import { getFilename } from '@wordpress/url';
-import { switchToBlockType } from '@wordpress/blocks';
+import { getBlockBindingsSource, switchToBlockType } from '@wordpress/blocks';
 import { crop, overlayText, upload } from '@wordpress/icons';
 import { store as noticesStore } from '@wordpress/notices';
 import { store as coreStore } from '@wordpress/core-data';
@@ -41,13 +44,13 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import { unlock } from '../lock-unlock';
 import { createUpgradedEmbedBlock } from '../embed/util';
-import useClientWidth from './use-client-width';
 import { isExternalImage } from './edit';
 import { Caption } from '../utils/caption';
 
 /**
  * Module constants
  */
+import { useToolsPanelDropdownMenuProps } from '../utils/hooks';
 import { MIN_SIZE, ALLOWED_MEDIA_TYPES } from './constants';
 import { evalAspectRatio } from './utils';
 
@@ -75,7 +78,7 @@ const ImageWrapper = ( { href, children } ) => {
 		<a
 			href={ href }
 			onClick={ ( event ) => event.preventDefault() }
-			aria-disabled={ true }
+			aria-disabled
 			style={ {
 				// When the Image block is linked,
 				// it's wrapped with a disabled <a /> tag.
@@ -95,16 +98,17 @@ export default function Image( {
 	temporaryURL,
 	attributes,
 	setAttributes,
-	isSelected,
+	isSingleSelected,
 	insertBlocksAfter,
 	onReplace,
 	onSelectImage,
 	onSelectURL,
 	onUploadError,
-	containerRef,
 	context,
 	clientId,
 	blockEditingMode,
+	parentLayoutType,
+	maxContentWidth,
 } ) {
 	const {
 		url = '',
@@ -123,6 +127,7 @@ export default function Image( {
 		linkTarget,
 		sizeSlug,
 		lightbox,
+		metadata,
 	} = attributes;
 
 	// The only supported unit is px, so we can parseInt to strip the px here.
@@ -131,54 +136,36 @@ export default function Image( {
 
 	const imageRef = useRef();
 	const { allowResize = true } = context;
-	const { getBlock } = useSelect( blockEditorStore );
+	const { getBlock, getSettings } = useSelect( blockEditorStore );
 
-	const { image, multiImageSelection } = useSelect(
+	const image = useSelect(
+		( select ) =>
+			id && isSingleSelected
+				? select( coreStore ).getMedia( id, { context: 'view' } )
+				: null,
+		[ id, isSingleSelected ]
+	);
+
+	const { canInsertCover, imageEditing, imageSizes, maxWidth } = useSelect(
 		( select ) => {
-			const { getMedia } = select( coreStore );
-			const { getMultiSelectedBlockClientIds, getBlockName } =
+			const { getBlockRootClientId, canInsertBlockType } =
 				select( blockEditorStore );
-			const multiSelectedClientIds = getMultiSelectedBlockClientIds();
+
+			const rootClientId = getBlockRootClientId( clientId );
+			const settings = getSettings();
+
 			return {
-				image:
-					id && isSelected
-						? getMedia( id, { context: 'view' } )
-						: null,
-				multiImageSelection:
-					multiSelectedClientIds.length &&
-					multiSelectedClientIds.every(
-						( _clientId ) =>
-							getBlockName( _clientId ) === 'core/image'
-					),
+				imageEditing: settings.imageEditing,
+				imageSizes: settings.imageSizes,
+				maxWidth: settings.maxWidth,
+				canInsertCover: canInsertBlockType(
+					'core/cover',
+					rootClientId
+				),
 			};
 		},
-		[ id, isSelected ]
+		[ clientId ]
 	);
-	const { canInsertCover, imageEditing, imageSizes, maxWidth, mediaUpload } =
-		useSelect(
-			( select ) => {
-				const {
-					getBlockRootClientId,
-					getSettings,
-					canInsertBlockType,
-				} = select( blockEditorStore );
-
-				const rootClientId = getBlockRootClientId( clientId );
-				const settings = getSettings();
-
-				return {
-					imageEditing: settings.imageEditing,
-					imageSizes: settings.imageSizes,
-					maxWidth: settings.maxWidth,
-					mediaUpload: settings.mediaUpload,
-					canInsertCover: canInsertBlockType(
-						'core/cover',
-						rootClientId
-					),
-				};
-			},
-			[ clientId ]
-		);
 
 	const { replaceBlocks, toggleSelection } = useDispatch( blockEditorStore );
 	const { createErrorNotice, createSuccessNotice } =
@@ -191,18 +178,19 @@ export default function Image( {
 	] = useState( {} );
 	const [ isEditingImage, setIsEditingImage ] = useState( false );
 	const [ externalBlob, setExternalBlob ] = useState();
-	const clientWidth = useClientWidth( containerRef, [ align ] );
+	const [ hasImageErrored, setHasImageErrored ] = useState( false );
 	const hasNonContentControls = blockEditingMode === 'default';
+	const isContentOnlyMode = blockEditingMode === 'contentOnly';
 	const isResizable =
 		allowResize &&
 		hasNonContentControls &&
-		! ( isWideAligned && isLargeViewport );
+		! isWideAligned &&
+		isLargeViewport;
 	const imageSizeOptions = imageSizes
 		.filter(
 			( { slug } ) => image?.media_details?.sizes?.[ slug ]?.source_url
 		)
 		.map( ( { name, slug } ) => ( { value: slug, label: name } ) );
-	const canUploadMedia = !! mediaUpload;
 
 	// If an image is externally hosted, try to fetch the image data. This may
 	// fail if the image host doesn't allow CORS with the domain. If it works,
@@ -210,14 +198,16 @@ export default function Image( {
 	useEffect( () => {
 		if (
 			! isExternalImage( id, url ) ||
-			! isSelected ||
-			! canUploadMedia
+			! isSingleSelected ||
+			! getSettings().mediaUpload
 		) {
 			setExternalBlob();
 			return;
 		}
 
-		if ( externalBlob ) return;
+		if ( externalBlob ) {
+			return;
+		}
 
 		window
 			// Avoid cache, which seems to help avoid CORS problems.
@@ -226,7 +216,7 @@ export default function Image( {
 			.then( ( blob ) => setExternalBlob( blob ) )
 			// Do nothing, cannot upload.
 			.catch( () => {} );
-	}, [ id, url, isSelected, externalBlob, canUploadMedia ] );
+	}, [ id, url, isSingleSelected, externalBlob ] );
 
 	// Get naturalWidth and naturalHeight from image ref, and fall back to loaded natural
 	// width and height. This resolves an issue in Safari where the loaded natural
@@ -258,19 +248,60 @@ export default function Image( {
 	}
 
 	function onImageError() {
+		setHasImageErrored( true );
+
 		// Check if there's an embed block that handles this URL, e.g., instagram URL.
 		// See: https://github.com/WordPress/gutenberg/pull/11472
 		const embedBlock = createUpgradedEmbedBlock( { attributes: { url } } );
-
 		if ( undefined !== embedBlock ) {
 			onReplace( embedBlock );
 		}
 	}
 
+	function onImageLoad( event ) {
+		setHasImageErrored( false );
+		setLoadedNaturalSize( {
+			loadedNaturalWidth: event.target?.naturalWidth,
+			loadedNaturalHeight: event.target?.naturalHeight,
+		} );
+	}
+
 	function onSetHref( props ) {
 		setAttributes( props );
 	}
 
+	function onSetLightbox( enable ) {
+		if ( enable && ! lightboxSetting?.enabled ) {
+			setAttributes( {
+				lightbox: { enabled: true },
+			} );
+		} else if ( ! enable && lightboxSetting?.enabled ) {
+			setAttributes( {
+				lightbox: { enabled: false },
+			} );
+		} else {
+			setAttributes( {
+				lightbox: undefined,
+			} );
+		}
+	}
+
+	function resetLightbox() {
+		// When deleting a link from an image while lightbox settings
+		// are enabled by default, we should disable the lightbox,
+		// otherwise the resulting UX looks like a mistake.
+		// See https://github.com/WordPress/gutenberg/pull/59890/files#r1532286123.
+		if ( lightboxSetting?.enabled && lightboxSetting?.allowEditing ) {
+			setAttributes( {
+				lightbox: { enabled: false },
+			} );
+		} else {
+			setAttributes( {
+				lightbox: undefined,
+			} );
+		}
+	}
+
 	function onSetTitle( value ) {
 		// This is the HTML title attribute, separate from the media object
 		// title.
@@ -294,6 +325,10 @@ export default function Image( {
 	}
 
 	function uploadExternal() {
+		const { mediaUpload } = getSettings();
+		if ( ! mediaUpload ) {
+			return;
+		}
 		mediaUpload( {
 			filesList: [ externalBlob ],
 			onFileChange( [ img ] ) {
@@ -316,13 +351,17 @@ export default function Image( {
 	}
 
 	useEffect( () => {
-		if ( ! isSelected ) {
+		if ( ! isSingleSelected ) {
 			setIsEditingImage( false );
 		}
-	}, [ isSelected ] );
+	}, [ isSingleSelected ] );
 
 	const canEditImage = id && naturalWidth && naturalHeight && imageEditing;
-	const allowCrop = ! multiImageSelection && canEditImage && ! isEditingImage;
+	const allowCrop =
+		isSingleSelected &&
+		canEditImage &&
+		! isEditingImage &&
+		! isContentOnlyMode;
 
 	function switchToCover() {
 		replaceBlocks(
@@ -340,13 +379,16 @@ export default function Image( {
 
 	const [ lightboxSetting ] = useSettings( 'lightbox' );
 
-	const showLightboxToggle =
-		!! lightbox || lightboxSetting?.allowEditing === true;
+	const showLightboxSetting =
+		// If a block-level override is set, we should give users the option to
+		// remove that override, even if the lightbox UI is disabled in the settings.
+		( !! lightbox && lightbox?.enabled !== lightboxSetting?.enabled ) ||
+		lightboxSetting?.allowEditing;
 
 	const lightboxChecked =
 		!! lightbox?.enabled || ( ! lightbox && !! lightboxSetting?.enabled );
 
-	const lightboxToggleDisabled = linkDestination !== 'none';
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 
 	const dimensionsControl = (
 		<DimensionsTool
@@ -378,8 +420,23 @@ export default function Image( {
 		/>
 	);
 
+	const aspectRatioControl = (
+		<DimensionsTool
+			value={ { aspectRatio } }
+			onChange={ ( { aspectRatio: newAspectRatio } ) => {
+				setAttributes( {
+					aspectRatio: newAspectRatio,
+					scale: 'cover',
+				} );
+			} }
+			defaultAspectRatio="auto"
+			tools={ [ 'aspectRatio' ] }
+		/>
+	);
+
 	const resetAll = () => {
 		setAttributes( {
+			alt: undefined,
 			width: undefined,
 			height: undefined,
 			scale: undefined,
@@ -390,149 +447,376 @@ export default function Image( {
 
 	const sizeControls = (
 		<InspectorControls>
-			<ToolsPanel label={ __( 'Settings' ) } resetAll={ resetAll }>
-				{ isResizable && dimensionsControl }
+			<ToolsPanel
+				label={ __( 'Settings' ) }
+				resetAll={ resetAll }
+				dropdownMenuProps={ dropdownMenuProps }
+			>
+				{ isResizable &&
+					( parentLayoutType === 'grid'
+						? aspectRatioControl
+						: dimensionsControl ) }
 			</ToolsPanel>
 		</InspectorControls>
 	);
 
+	const arePatternOverridesEnabled =
+		metadata?.bindings?.__default?.source === 'core/pattern-overrides';
+
+	const {
+		lockUrlControls = false,
+		lockHrefControls = false,
+		lockAltControls = false,
+		lockAltControlsMessage,
+		lockTitleControls = false,
+		lockTitleControlsMessage,
+		lockCaption = false,
+	} = useSelect(
+		( select ) => {
+			if ( ! isSingleSelected ) {
+				return {};
+			}
+			const {
+				url: urlBinding,
+				alt: altBinding,
+				title: titleBinding,
+			} = metadata?.bindings || {};
+			const hasParentPattern = !! context[ 'pattern/overrides' ];
+			const urlBindingSource = getBlockBindingsSource(
+				urlBinding?.source
+			);
+			const altBindingSource = getBlockBindingsSource(
+				altBinding?.source
+			);
+			const titleBindingSource = getBlockBindingsSource(
+				titleBinding?.source
+			);
+			return {
+				lockUrlControls:
+					!! urlBinding &&
+					! urlBindingSource?.canUserEditValue?.( {
+						select,
+						context,
+						args: urlBinding?.args,
+					} ),
+				lockHrefControls:
+					// Disable editing the link of the URL if the image is inside a pattern instance.
+					// This is a temporary solution until we support overriding the link on the frontend.
+					hasParentPattern || arePatternOverridesEnabled,
+				lockCaption:
+					// Disable editing the caption if the image is inside a pattern instance.
+					// This is a temporary solution until we support overriding the caption on the frontend.
+					hasParentPattern,
+				lockAltControls:
+					!! altBinding &&
+					! altBindingSource?.canUserEditValue?.( {
+						select,
+						context,
+						args: altBinding?.args,
+					} ),
+				lockAltControlsMessage: altBindingSource?.label
+					? sprintf(
+							/* translators: %s: Label of the bindings source. */
+							__( 'Connected to %s' ),
+							altBindingSource.label
+					  )
+					: __( 'Connected to dynamic data' ),
+				lockTitleControls:
+					!! titleBinding &&
+					! titleBindingSource?.canUserEditValue?.( {
+						select,
+						context,
+						args: titleBinding?.args,
+					} ),
+				lockTitleControlsMessage: titleBindingSource?.label
+					? sprintf(
+							/* translators: %s: Label of the bindings source. */
+							__( 'Connected to %s' ),
+							titleBindingSource.label
+					  )
+					: __( 'Connected to dynamic data' ),
+			};
+		},
+		[
+			arePatternOverridesEnabled,
+			context,
+			isSingleSelected,
+			metadata?.bindings,
+		]
+	);
+
+	const showUrlInput =
+		isSingleSelected &&
+		! isEditingImage &&
+		! lockHrefControls &&
+		! lockUrlControls;
+
+	const showCoverControls = isSingleSelected && canInsertCover;
+
+	const showBlockControls = showUrlInput || allowCrop || showCoverControls;
+
+	const mediaReplaceFlow = isSingleSelected &&
+		! isEditingImage &&
+		! lockUrlControls && (
+			// For contentOnly mode, put this button in its own area so it has borders around it.
+			<BlockControls group={ isContentOnlyMode ? 'inline' : 'other' }>
+				<MediaReplaceFlow
+					mediaId={ id }
+					mediaURL={ url }
+					allowedTypes={ ALLOWED_MEDIA_TYPES }
+					accept="image/*"
+					onSelect={ onSelectImage }
+					onSelectURL={ onSelectURL }
+					onError={ onUploadError }
+					name={ ! url ? __( 'Add image' ) : __( 'Replace' ) }
+					onReset={ () => onSelectImage( undefined ) }
+				/>
+			</BlockControls>
+		);
+
 	const controls = (
 		<>
-			<BlockControls group="block">
-				{ ! multiImageSelection && ! isEditingImage && (
-					<ImageURLInputUI
-						url={ href || '' }
-						onChangeUrl={ onSetHref }
-						linkDestination={ linkDestination }
-						mediaUrl={ ( image && image.source_url ) || url }
-						mediaLink={ image && image.link }
-						linkTarget={ linkTarget }
-						linkClass={ linkClass }
-						rel={ rel }
-					/>
-				) }
-				{ allowCrop && (
-					<ToolbarButton
-						onClick={ () => setIsEditingImage( true ) }
-						icon={ crop }
-						label={ __( 'Crop' ) }
-					/>
-				) }
-				{ ! multiImageSelection && canInsertCover && (
-					<ToolbarButton
-						icon={ overlayText }
-						label={ __( 'Add text over image' ) }
-						onClick={ switchToCover }
-					/>
-				) }
-			</BlockControls>
-			{ ! multiImageSelection && ! isEditingImage && (
-				<BlockControls group="other">
-					<MediaReplaceFlow
-						mediaId={ id }
-						mediaURL={ url }
-						allowedTypes={ ALLOWED_MEDIA_TYPES }
-						accept="image/*"
-						onSelect={ onSelectImage }
-						onSelectURL={ onSelectURL }
-						onError={ onUploadError }
-					/>
+			{ showBlockControls && (
+				<BlockControls group="block">
+					{ showUrlInput && (
+						<ImageURLInputUI
+							url={ href || '' }
+							onChangeUrl={ onSetHref }
+							linkDestination={ linkDestination }
+							mediaUrl={ ( image && image.source_url ) || url }
+							mediaLink={ image && image.link }
+							linkTarget={ linkTarget }
+							linkClass={ linkClass }
+							rel={ rel }
+							showLightboxSetting={ showLightboxSetting }
+							lightboxEnabled={ lightboxChecked }
+							onSetLightbox={ onSetLightbox }
+							resetLightbox={ resetLightbox }
+						/>
+					) }
+					{ allowCrop && (
+						<ToolbarButton
+							onClick={ () => setIsEditingImage( true ) }
+							icon={ crop }
+							label={ __( 'Crop' ) }
+						/>
+					) }
+					{ showCoverControls && (
+						<ToolbarButton
+							icon={ overlayText }
+							label={ __( 'Add text over image' ) }
+							onClick={ switchToCover }
+						/>
+					) }
 				</BlockControls>
 			) }
-			{ ! multiImageSelection && externalBlob && (
+			{ isSingleSelected && externalBlob && (
 				<BlockControls>
 					<ToolbarGroup>
 						<ToolbarButton
 							onClick={ uploadExternal }
 							icon={ upload }
-							label={ __( 'Upload external image' ) }
+							label={ __( 'Upload to Media Library' ) }
 						/>
 					</ToolbarGroup>
 				</BlockControls>
 			) }
+			{ isContentOnlyMode && (
+				// Add some extra controls for content attributes when content only mode is active.
+				// With content only mode active, the inspector is hidden, so users need another way
+				// to edit these attributes.
+				<BlockControls group="other">
+					<Dropdown
+						popoverProps={ { position: 'bottom right' } }
+						renderToggle={ ( { isOpen, onToggle } ) => (
+							<ToolbarButton
+								onClick={ onToggle }
+								aria-haspopup="true"
+								aria-expanded={ isOpen }
+								onKeyDown={ ( event ) => {
+									if ( ! isOpen && event.keyCode === DOWN ) {
+										event.preventDefault();
+										onToggle();
+									}
+								} }
+							>
+								{ _x(
+									'Alternative text',
+									'Alternative text for an image. Block toolbar label, a low character count is preferred.'
+								) }
+							</ToolbarButton>
+						) }
+						renderContent={ () => (
+							<TextareaControl
+								className="wp-block-image__toolbar_content_textarea"
+								label={ __( 'Alternative text' ) }
+								value={ alt || '' }
+								onChange={ updateAlt }
+								disabled={ lockAltControls }
+								help={
+									lockAltControls ? (
+										<>{ lockAltControlsMessage }</>
+									) : (
+										<>
+											<ExternalLink
+												href={
+													// translators: Localized tutorial, if one exists. W3C Web Accessibility Initiative link has list of existing translations.
+													__(
+														'https://www.w3.org/WAI/tutorials/images/decision-tree/'
+													)
+												}
+											>
+												{ __(
+													'Describe the purpose of the image.'
+												) }
+											</ExternalLink>
+											<br />
+											{ __(
+												'Leave empty if decorative.'
+											) }
+										</>
+									)
+								}
+								__nextHasNoMarginBottom
+							/>
+						) }
+					/>
+					{ title && (
+						<Dropdown
+							popoverProps={ { position: 'bottom right' } }
+							renderToggle={ ( { isOpen, onToggle } ) => (
+								<ToolbarButton
+									onClick={ onToggle }
+									aria-haspopup="true"
+									aria-expanded={ isOpen }
+									onKeyDown={ ( event ) => {
+										if (
+											! isOpen &&
+											event.keyCode === DOWN
+										) {
+											event.preventDefault();
+											onToggle();
+										}
+									} }
+								>
+									{ __( 'Title' ) }
+								</ToolbarButton>
+							) }
+							renderContent={ () => (
+								<TextControl
+									__next40pxDefaultSize
+									className="wp-block-image__toolbar_content_textarea"
+									__nextHasNoMarginBottom
+									label={ __( 'Title attribute' ) }
+									value={ title || '' }
+									onChange={ onSetTitle }
+									disabled={ lockTitleControls }
+									help={
+										lockTitleControls ? (
+											<>{ lockTitleControlsMessage }</>
+										) : (
+											<>
+												{ __(
+													'Describe the role of this image on the page.'
+												) }
+												<ExternalLink href="https://www.w3.org/TR/html52/dom.html#the-title-attribute">
+													{ __(
+														'(Note: many devices and browsers do not display this text.)'
+													) }
+												</ExternalLink>
+											</>
+										)
+									}
+								/>
+							) }
+						/>
+					) }
+				</BlockControls>
+			) }
 			<InspectorControls>
-				<ToolsPanel label={ __( 'Settings' ) } resetAll={ resetAll }>
-					{ ! multiImageSelection && (
+				<ToolsPanel
+					label={ __( 'Settings' ) }
+					resetAll={ resetAll }
+					dropdownMenuProps={ dropdownMenuProps }
+				>
+					{ isSingleSelected && (
 						<ToolsPanelItem
 							label={ __( 'Alternative text' ) }
-							isShownByDefault={ true }
-							hasValue={ () => alt !== '' }
+							isShownByDefault
+							hasValue={ () => !! alt }
 							onDeselect={ () =>
 								setAttributes( { alt: undefined } )
 							}
 						>
 							<TextareaControl
 								label={ __( 'Alternative text' ) }
-								value={ alt }
+								value={ alt || '' }
 								onChange={ updateAlt }
+								readOnly={ lockAltControls }
 								help={
-									<>
-										<ExternalLink href="https://www.w3.org/WAI/tutorials/images/decision-tree">
+									lockAltControls ? (
+										<>{ lockAltControlsMessage }</>
+									) : (
+										<>
+											<ExternalLink
+												href={
+													// translators: Localized tutorial, if one exists. W3C Web Accessibility Initiative link has list of existing translations.
+													__(
+														'https://www.w3.org/WAI/tutorials/images/decision-tree/'
+													)
+												}
+											>
+												{ __(
+													'Describe the purpose of the image.'
+												) }
+											</ExternalLink>
+											<br />
 											{ __(
-												'Describe the purpose of the image.'
+												'Leave empty if decorative.'
 											) }
-										</ExternalLink>
-										<br />
-										{ __( 'Leave empty if decorative.' ) }
-									</>
+										</>
+									)
 								}
 								__nextHasNoMarginBottom
 							/>
 						</ToolsPanelItem>
 					) }
-					{ isResizable && dimensionsControl }
-					<ResolutionTool
-						value={ sizeSlug }
-						onChange={ updateImage }
-						options={ imageSizeOptions }
-					/>
-					{ showLightboxToggle && (
-						<ToolsPanelItem
-							hasValue={ () => !! lightbox }
-							label={ __( 'Expand on click' ) }
-							onDeselect={ () => {
-								setAttributes( { lightbox: undefined } );
-							} }
-							isShownByDefault={ true }
-						>
-							<ToggleControl
-								label={ __( 'Expand on click' ) }
-								checked={ lightboxChecked }
-								onChange={ ( newValue ) => {
-									setAttributes( {
-										lightbox: { enabled: newValue },
-									} );
-								} }
-								disabled={ lightboxToggleDisabled }
-								help={
-									lightboxToggleDisabled
-										? __(
-												'“Expand on click” scales the image up, and can’t be combined with a link.'
-										  )
-										: ''
-								}
-							/>
-						</ToolsPanelItem>
+					{ isResizable &&
+						( parentLayoutType === 'grid'
+							? aspectRatioControl
+							: dimensionsControl ) }
+					{ !! imageSizeOptions.length && (
+						<ResolutionTool
+							value={ sizeSlug }
+							onChange={ updateImage }
+							options={ imageSizeOptions }
+						/>
 					) }
 				</ToolsPanel>
 			</InspectorControls>
 			<InspectorControls group="advanced">
 				<TextControl
 					__nextHasNoMarginBottom
+					__next40pxDefaultSize
 					label={ __( 'Title attribute' ) }
 					value={ title || '' }
 					onChange={ onSetTitle }
+					readOnly={ lockTitleControls }
 					help={
-						<>
-							{ __(
-								'Describe the role of this image on the page.'
-							) }
-							<ExternalLink href="https://www.w3.org/TR/html52/dom.html#the-title-attribute">
+						lockTitleControls ? (
+							<>{ lockTitleControlsMessage }</>
+						) : (
+							<>
 								{ __(
-									'(Note: many devices and browsers do not display this text.)'
+									'Describe the role of this image on the page.'
 								) }
-							</ExternalLink>
-						</>
+								<ExternalLink href="https://www.w3.org/TR/html52/dom.html#the-title-attribute">
+									{ __(
+										'(Note: many devices and browsers do not display this text.)'
+									) }
+								</ExternalLink>
+							</>
+						)
 					}
 				/>
 			</InspectorControls>
@@ -555,42 +839,49 @@ export default function Image( {
 	}
 
 	const borderProps = useBorderProps( attributes );
+	const shadowProps = getShadowClassesAndStyles( attributes );
 	const isRounded = attributes.className?.includes( 'is-style-rounded' );
 
-	let img = (
-		// Disable reason: Image itself is not meant to be interactive, but
-		// should direct focus to block.
-		/* eslint-disable jsx-a11y/no-noninteractive-element-interactions, jsx-a11y/click-events-have-key-events */
-		<>
-			<img
-				src={ temporaryURL || url }
-				alt={ defaultedAlt }
-				onError={ () => onImageError() }
-				onLoad={ ( event ) => {
-					setLoadedNaturalSize( {
-						loadedNaturalWidth: event.target?.naturalWidth,
-						loadedNaturalHeight: event.target?.naturalHeight,
-					} );
-				} }
-				ref={ imageRef }
-				className={ borderProps.className }
-				style={ {
-					width:
-						( width && height ) || aspectRatio ? '100%' : undefined,
-					height:
-						( width && height ) || aspectRatio ? '100%' : undefined,
-					objectFit: scale,
-					...borderProps.style,
-				} }
-			/>
-			{ temporaryURL && <Spinner /> }
-		</>
-		/* eslint-enable jsx-a11y/no-noninteractive-element-interactions, jsx-a11y/click-events-have-key-events */
-	);
-
-	// clientWidth needs to be a number for the image Cropper to work, but sometimes it's 0
-	// So we try using the imageRef width first and fallback to clientWidth.
-	const fallbackClientWidth = imageRef.current?.width || clientWidth;
+	let img =
+		temporaryURL && hasImageErrored ? (
+			// Show a placeholder during upload when the blob URL can't be loaded. This can
+			// happen when the user uploads a HEIC image in a browser that doesn't support them.
+			<Placeholder
+				className="wp-block-image__placeholder"
+				withIllustration
+			>
+				<Spinner />
+			</Placeholder>
+		) : (
+			// Disable reason: Image itself is not meant to be interactive, but
+			// should direct focus to block.
+			/* eslint-disable jsx-a11y/no-noninteractive-element-interactions, jsx-a11y/click-events-have-key-events */
+			<>
+				<img
+					src={ temporaryURL || url }
+					alt={ defaultedAlt }
+					onError={ onImageError }
+					onLoad={ onImageLoad }
+					ref={ imageRef }
+					className={ borderProps.className }
+					style={ {
+						width:
+							( width && height ) || aspectRatio
+								? '100%'
+								: undefined,
+						height:
+							( width && height ) || aspectRatio
+								? '100%'
+								: undefined,
+						objectFit: scale,
+						...borderProps.style,
+						...shadowProps.style,
+					} }
+				/>
+				{ temporaryURL && <Spinner /> }
+			</>
+			/* eslint-enable jsx-a11y/no-noninteractive-element-interactions, jsx-a11y/click-events-have-key-events */
+		);
 
 	if ( canEditImage && isEditingImage ) {
 		img = (
@@ -600,7 +891,6 @@ export default function Image( {
 					url={ url }
 					width={ numericWidth }
 					height={ numericHeight }
-					clientWidth={ fallbackClientWidth }
 					naturalHeight={ naturalHeight }
 					naturalWidth={ naturalWidth }
 					onSaveImage={ ( imageAttributes ) =>
@@ -613,7 +903,7 @@ export default function Image( {
 				/>
 			</ImageWrapper>
 		);
-	} else if ( ! isResizable ) {
+	} else if ( ! isResizable || parentLayoutType === 'grid' ) {
 		img = (
 			<div style={ { width, height, aspectRatio } }>
 				<ImageWrapper href={ href }>{ img }</ImageWrapper>
@@ -648,6 +938,7 @@ export default function Image( {
 		// @todo It would be good to revisit this once a content-width variable
 		// becomes available.
 		const maxWidthBuffer = maxWidth * 2.5;
+		const maxResizeWidth = maxContentWidth || maxWidthBuffer;
 
 		let showRightHandle = false;
 		let showLeftHandle = false;
@@ -691,11 +982,11 @@ export default function Image( {
 					width: currentWidth ?? 'auto',
 					height: currentHeight ?? 'auto',
 				} }
-				showHandle={ isSelected }
+				showHandle={ isSingleSelected }
 				minWidth={ minWidth }
-				maxWidth={ maxWidthBuffer }
+				maxWidth={ maxResizeWidth }
 				minHeight={ minHeight }
-				maxHeight={ maxWidthBuffer / ratio }
+				maxHeight={ maxResizeWidth / ratio }
 				lockAspectRatio={ ratio }
 				enable={ {
 					top: false,
@@ -706,6 +997,22 @@ export default function Image( {
 				onResizeStart={ onResizeStart }
 				onResizeStop={ ( event, direction, elt ) => {
 					onResizeStop();
+
+					// Clear hardcoded width if the resized width is close to the max-content width.
+					if (
+						maxContentWidth &&
+						// Only do this if the image is bigger than the container to prevent it from being squished.
+						// TODO: Remove this check if the image support setting 100% width.
+						naturalWidth >= maxContentWidth &&
+						Math.abs( elt.offsetWidth - maxContentWidth ) < 10
+					) {
+						setAttributes( {
+							width: undefined,
+							height: undefined,
+						} );
+						return;
+					}
+
 					// Since the aspect ratio is locked when resizing, we can
 					// use the width of the resized element to calculate the
 					// height in CSS to prevent stretching when the max-width
@@ -727,22 +1034,33 @@ export default function Image( {
 	}
 
 	if ( ! url && ! temporaryURL ) {
-		return sizeControls;
+		return (
+			<>
+				{ mediaReplaceFlow }
+				{ /* Add all controls if the image attributes are connected. */ }
+				{ metadata?.bindings ? controls : sizeControls }
+			</>
+		);
 	}
 
 	return (
 		<>
-			{ /* Hide controls during upload to avoid component remount,
-				which causes duplicated image upload. */ }
-			{ ! temporaryURL && controls }
+			{ mediaReplaceFlow }
+			{ controls }
 			{ img }
+
 			<Caption
 				attributes={ attributes }
 				setAttributes={ setAttributes }
-				isSelected={ isSelected }
+				isSelected={ isSingleSelected }
 				insertBlocksAfter={ insertBlocksAfter }
 				label={ __( 'Image caption text' ) }
-				showToolbarButton={ hasNonContentControls }
+				showToolbarButton={
+					isSingleSelected &&
+					hasNonContentControls &&
+					! arePatternOverridesEnabled
+				}
+				readOnly={ lockCaption }
 			/>
 		</>
 	);
diff --git a/packages/block-library/src/image/index.js b/packages/block-library/src/image/index.js
index 1477fa99c702c5..68625bd77cc873 100644
--- a/packages/block-library/src/image/index.js
+++ b/packages/block-library/src/image/index.js
@@ -29,6 +29,12 @@ export const settings = {
 		},
 	},
 	__experimentalLabel( attributes, { context } ) {
+		const customName = attributes?.metadata?.name;
+
+		if ( context === 'list-view' && customName ) {
+			return customName;
+		}
+
 		if ( context === 'accessibility' ) {
 			const { caption, alt, url } = attributes;
 
diff --git a/packages/block-library/src/image/index.php b/packages/block-library/src/image/index.php
index 48e6e0585b96ec..1a5fae7ce9cbb7 100644
--- a/packages/block-library/src/image/index.php
+++ b/packages/block-library/src/image/index.php
@@ -9,6 +9,8 @@
  * Renders the `core/image` block on the server,
  * adding a data-id attribute to the element if core/gallery has added on pre-render.
  *
+ * @since 5.9.0
+ *
  * @param array    $attributes The block attributes.
  * @param string   $content    The block content.
  * @param WP_Block $block      The block object.
@@ -20,30 +22,47 @@ function render_block_core_image( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$processor = new WP_HTML_Tag_Processor( $content );
+	$p = new WP_HTML_Tag_Processor( $content );
 
-	if ( ! $processor->next_tag( 'img' ) || null === $processor->get_attribute( 'src' ) ) {
+	if ( ! $p->next_tag( 'img' ) || ! $p->get_attribute( 'src' ) ) {
 		return '';
 	}
 
+	$has_id_binding = isset( $attributes['metadata']['bindings']['id'] ) && isset( $attributes['id'] );
+
+	// Ensure the `wp-image-id` classname on the image block supports block bindings.
+	if ( $has_id_binding ) {
+		// If there's a mismatch with the 'wp-image-' class and the actual id, the id was
+		// probably overridden by block bindings. Update it to the correct value.
+		// See https://github.com/WordPress/gutenberg/issues/62886 for why this is needed.
+		$id                       = $attributes['id'];
+		$image_classnames         = $p->get_attribute( 'class' );
+		$class_with_binding_value = "wp-image-$id";
+		if ( is_string( $image_classnames ) && ! str_contains( $image_classnames, $class_with_binding_value ) ) {
+			$image_classnames = preg_replace( '/wp-image-(\d+)/', $class_with_binding_value, $image_classnames );
+			$p->set_attribute( 'class', $image_classnames );
+		}
+	}
+
+	// For backwards compatibility, the data-id html attribute is only set for
+	// image blocks nested in a gallery. Detect if the image is in a gallery by
+	// checking the data-id attribute.
+	// See the `block_core_gallery_data_id_backcompatibility` function.
 	if ( isset( $attributes['data-id'] ) ) {
-		// Add the data-id="$id" attribute to the img element
-		// to provide backwards compatibility for the Gallery Block,
-		// which now wraps Image Blocks within innerBlocks.
-		// The data-id attribute is added in a core/gallery `render_block_data` hook.
-		$processor->set_attribute( 'data-id', $attributes['data-id'] );
+		// If there's a binding for the `id`, the `id` attribute is used for the
+		// value, since `data-id` does not support block bindings.
+		// Else the `data-id` is used for backwards compatibility, since
+		// third parties may be filtering its value.
+		$data_id = $has_id_binding ? $attributes['id'] : $attributes['data-id'];
+		$p->set_attribute( 'data-id', $data_id );
 	}
 
 	$link_destination  = isset( $attributes['linkDestination'] ) ? $attributes['linkDestination'] : 'none';
 	$lightbox_settings = block_core_image_get_lightbox_settings( $block->parsed_block );
 
-	$is_gutenberg_plugin = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-	$view_js_file_handle = 'wp-block-image-view';
-	$script_handles      = $block->block_type->view_script_handles;
-
 	/*
-	 * If the lightbox is enabled and the image is not linked, add the filter
-	 * and the JavaScript view file.
+	 * If the lightbox is enabled and the image is not linked, adds the filter and
+	 * the JavaScript view file.
 	 */
 	if (
 		isset( $lightbox_settings ) &&
@@ -51,37 +70,25 @@ function render_block_core_image( $attributes, $content, $block ) {
 		isset( $lightbox_settings['enabled'] ) &&
 		true === $lightbox_settings['enabled']
 	) {
-		if ( $is_gutenberg_plugin ) {
-			gutenberg_enqueue_module( '@wordpress/block-library/image' );
-			// Remove the view script because we are using the module.
-			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file_handle ) );
-		} elseif ( ! in_array( $view_js_file_handle, $script_handles, true ) ) {
-			$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file_handle ) );
-		}
+		wp_enqueue_script_module( '@wordpress/block-library/image/view' );
 
 		/*
-		 * This render needs to happen in a filter with priority 15 to ensure
-		 * that it runs after the duotone filter and that duotone styles are
-		 * applied to the image in the lightbox. We also need to ensure that the
-		 * lightbox works with any plugins that might use filters as well. We
-		 * can consider removing this in the future if the way the blocks are
-		 * rendered changes, or if a new kind of filter is introduced.
+		 * This render needs to happen in a filter with priority 15 to ensure that
+		 * it runs after the duotone filter and that duotone styles are applied to
+		 * the image in the lightbox. Lightbox has to work with any plugins that
+		 * might use filters as well. Removing this can be considered in the future
+		 * if the way the blocks are rendered changes, or if a new kind of filter is
+		 * introduced.
 		 */
 		add_filter( 'render_block_core/image', 'block_core_image_render_lightbox', 15, 2 );
 	} else {
 		/*
-		 * Remove the filter and the JavaScript view file if previously added by
-		 * other Image blocks.
+		 * Remove the filter if previously added by other Image blocks.
 		 */
 		remove_filter( 'render_block_core/image', 'block_core_image_render_lightbox', 15 );
-
-		// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-		if ( in_array( $view_js_file_handle, $script_handles, true ) ) {
-			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file_handle ) );
-		}
 	}
 
-	return $processor->get_updated_html();
+	return $p->get_updated_html();
 }
 
 /**
@@ -89,20 +96,16 @@ function render_block_core_image( $attributes, $content, $block ) {
  *
  * This is used to determine whether the lightbox should be rendered or not.
  *
+ * @since 6.4.0
+ *
  * @param array $block Block data.
  *
  * @return array Filtered block data.
  */
 function block_core_image_get_lightbox_settings( $block ) {
-	// Get the lightbox setting from the block attributes.
+	// Gets the lightbox setting from the block attributes.
 	if ( isset( $block['attrs']['lightbox'] ) ) {
 		$lightbox_settings = $block['attrs']['lightbox'];
-		// If the lightbox setting is not set in the block attributes,
-		// check the legacy lightbox settings that are set using the
-		// `gutenberg_should_render_lightbox` filter.
-		// We can remove this elseif statement when the legacy lightbox settings are removed.
-	} elseif ( isset( $block['legacyLightboxSettings'] ) ) {
-		$lightbox_settings = $block['legacyLightboxSettings'];
 	}
 
 	if ( ! isset( $lightbox_settings ) ) {
@@ -111,9 +114,9 @@ function block_core_image_get_lightbox_settings( $block ) {
 		// If not present in global settings, check the top-level global settings.
 		//
 		// NOTE: If no block-level settings are found, the previous call to
-		// `wp_get_global_settings` will return the whole `theme.json`
-		// structure in which case we can check if the "lightbox" key is present at
-		// the top-level of the global settings and use its value.
+		// `wp_get_global_settings` will return the whole `theme.json` structure in
+		// which case we can check if the "lightbox" key is present at the top-level
+		// of the global settings and use its value.
 		if ( isset( $lightbox_settings['lightbox'] ) ) {
 			$lightbox_settings = wp_get_global_settings( array( 'lightbox' ) );
 		}
@@ -125,6 +128,8 @@ function block_core_image_get_lightbox_settings( $block ) {
 /**
  * Adds the directives and layout needed for the lightbox behavior.
  *
+ * @since 6.4.0
+ *
  * @param string $block_content Rendered block content.
  * @param array  $block         Block object.
  *
@@ -132,103 +137,93 @@ function block_core_image_get_lightbox_settings( $block ) {
  */
 function block_core_image_render_lightbox( $block_content, $block ) {
 	/*
-	 * If it's not possible that an IMG element exists then return the given
-	 * block content as-is. It may be that there's no actual image in the block
-	 * or it could be that another plugin already modified this HTML.
+	 * If there's no IMG tag in the block then return the given block content
+	 * as-is. There's nothing that this code can knowingly modify to add the
+	 * lightbox behavior.
 	 */
-	if ( false === stripos( $block_content, '<img' ) ) {
-		return $block_content;
+	$p = new WP_HTML_Tag_Processor( $block_content );
+	if ( $p->next_tag( 'figure' ) ) {
+		$p->set_bookmark( 'figure' );
 	}
-
-	$processor = new WP_HTML_Tag_Processor( $block_content );
-
-	$aria_label = __( 'Enlarge image' );
-
-	/*
-	 * If there's definitely no IMG element in the block then return the given
-	 * block content as-is. There's nothing that this code can knowingly modify
-	 * to add the lightbox behavior.
-	 */
-	if ( ! $processor->next_tag( 'img' ) ) {
+	if ( ! $p->next_tag( 'img' ) ) {
 		return $block_content;
 	}
 
-	$alt_attribute = $processor->get_attribute( 'alt' );
+	$alt              = $p->get_attribute( 'alt' );
+	$img_uploaded_src = $p->get_attribute( 'src' );
+	$img_class_names  = $p->get_attribute( 'class' );
+	$img_styles       = $p->get_attribute( 'style' );
+	$img_width        = 'none';
+	$img_height       = 'none';
+	$aria_label       = __( 'Enlarge image' );
 
-	// An empty alt attribute `alt=""` is valid for decorative images.
-	if ( is_string( $alt_attribute ) ) {
-		$alt_attribute = trim( $alt_attribute );
-	}
-
-	// It only makes sense to append the alt text to the button aria-label when the alt text is non-empty.
-	if ( $alt_attribute ) {
+	if ( $alt ) {
 		/* translators: %s: Image alt text. */
-		$aria_label = sprintf( __( 'Enlarge image: %s' ), $alt_attribute );
+		$aria_label = sprintf( __( 'Enlarge image: %s' ), $alt );
 	}
 
-	// Currently, we are only enabling the zoom animation.
-	$lightbox_animation = 'zoom';
-
-	// Note: We want to store the `src` in the context so we
-	// can set it dynamically when the lightbox is opened.
 	if ( isset( $block['attrs']['id'] ) ) {
 		$img_uploaded_src = wp_get_attachment_url( $block['attrs']['id'] );
 		$img_metadata     = wp_get_attachment_metadata( $block['attrs']['id'] );
 		$img_width        = $img_metadata['width'] ?? 'none';
 		$img_height       = $img_metadata['height'] ?? 'none';
-	} else {
-		$img_uploaded_src = $processor->get_attribute( 'src' );
-		$img_width        = 'none';
-		$img_height       = 'none';
 	}
 
-	if ( isset( $block['attrs']['scale'] ) ) {
-		$scale_attr = $block['attrs']['scale'];
-	} else {
-		$scale_attr = false;
-	}
+	// Figure.
+	$p->seek( 'figure' );
+	$figure_class_names = $p->get_attribute( 'class' );
+	$figure_styles      = $p->get_attribute( 'style' );
 
-	$w = new WP_HTML_Tag_Processor( $block_content );
-	$w->next_tag( 'figure' );
-	$w->add_class( 'wp-lightbox-container' );
-	$w->set_attribute( 'data-wp-interactive', '{"namespace":"core/image"}' );
+	// Create unique id and set the image metadata in the state.
+	$unique_image_id = uniqid();
 
-	$w->set_attribute(
+	wp_interactivity_state(
+		'core/image',
+		array(
+			'metadata' => array(
+				$unique_image_id => array(
+					'uploadedSrc'      => $img_uploaded_src,
+					'figureClassNames' => $figure_class_names,
+					'figureStyles'     => $figure_styles,
+					'imgClassNames'    => $img_class_names,
+					'imgStyles'        => $img_styles,
+					'targetWidth'      => $img_width,
+					'targetHeight'     => $img_height,
+					'scaleAttr'        => $block['attrs']['scale'] ?? false,
+					'ariaLabel'        => $aria_label,
+					'alt'              => $alt,
+				),
+			),
+		)
+	);
+
+	$p->add_class( 'wp-lightbox-container' );
+	$p->set_attribute( 'data-wp-interactive', 'core/image' );
+	$p->set_attribute(
 		'data-wp-context',
-		sprintf(
-			'{  "imageLoaded": false,
-				"initialized": false,
-				"lightboxEnabled": false,
-				"hideAnimationEnabled": false,
-				"preloadInitialized": false,
-				"lightboxAnimation": "%s",
-				"imageUploadedSrc": "%s",
-				"imageCurrentSrc": "",
-				"targetWidth": "%s",
-				"targetHeight": "%s",
-				"scaleAttr": "%s",
-				"dialogLabel": "%s"
-			}',
-			$lightbox_animation,
-			$img_uploaded_src,
-			$img_width,
-			$img_height,
-			$scale_attr,
-			__( 'Enlarged image' )
+		wp_json_encode(
+			array(
+				'imageId' => $unique_image_id,
+			),
+			JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP
 		)
 	);
-	$w->next_tag( 'img' );
-	$w->set_attribute( 'data-wp-init', 'callbacks.initOriginImage' );
-	$w->set_attribute( 'data-wp-on--load', 'actions.handleLoad' );
-	$w->set_attribute( 'data-wp-watch', 'callbacks.setButtonStyles' );
-	// We need to set an event callback on the `img` specifically
-	// because the `figure` element can also contain a caption, and
-	// we don't want to trigger the lightbox when the caption is clicked.
-	$w->set_attribute( 'data-wp-on--click', 'actions.showLightbox' );
-	$w->set_attribute( 'data-wp-watch--setStylesOnResize', 'callbacks.setStylesOnResize' );
-	$body_content = $w->get_updated_html();
-
-	// Add a button alongside image in the body content.
+
+	// Image.
+	$p->next_tag( 'img' );
+	$p->set_attribute( 'data-wp-init', 'callbacks.setButtonStyles' );
+	$p->set_attribute( 'data-wp-on-async--load', 'callbacks.setButtonStyles' );
+	$p->set_attribute( 'data-wp-on-async-window--resize', 'callbacks.setButtonStyles' );
+	// Sets an event callback on the `img` because the `figure` element can also
+	// contain a caption, and we don't want to trigger the lightbox when the
+	// caption is clicked.
+	$p->set_attribute( 'data-wp-on-async--click', 'actions.showLightbox' );
+	$p->set_attribute( 'data-wp-class--hide', 'state.isContentHidden' );
+	$p->set_attribute( 'data-wp-class--show', 'state.isContentVisible' );
+
+	$body_content = $p->get_updated_html();
+
+	// Adds a button alongside image in the body content.
 	$img = null;
 	preg_match( '/<img[^>]+>/', $body_content, $img );
 
@@ -239,9 +234,10 @@ class="lightbox-trigger"
 			type="button"
 			aria-haspopup="dialog"
 			aria-label="' . esc_attr( $aria_label ) . '"
-			data-wp-on--click="actions.showLightbox"
-			data-wp-style--right="context.imageButtonRight"
-			data-wp-style--top="context.imageButtonTop"
+			data-wp-init="callbacks.initTriggerButton"
+			data-wp-on-async--click="actions.showLightbox"
+			data-wp-style--right="state.imageButtonRight"
+			data-wp-style--top="state.imageButtonTop"
 		>
 			<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="none" viewBox="0 0 12 12">
 				<path fill="#fff" d="M2 0a2 2 0 0 0-2 2v2h1.5V2a.5.5 0 0 1 .5-.5h2V0H2Zm2 10.5H2a.5.5 0 0 1-.5-.5V8H0v2a2 2 0 0 0 2 2h2v-1.5ZM8 12v-1.5h2a.5.5 0 0 0 .5-.5V8H12v2a2 2 0 0 1-2 2H8Zm2-12a2 2 0 0 1 2 2v2h-1.5V2a.5.5 0 0 0-.5-.5H8V0h2Z" />
@@ -250,46 +246,20 @@ class="lightbox-trigger"
 
 	$body_content = preg_replace( '/<img[^>]+>/', $button, $body_content );
 
-	// We need both a responsive image and an enlarged image to animate
-	// the zoom seamlessly on slow internet connections; the responsive
-	// image is a copy of the one in the body, which animates immediately
-	// as the lightbox is opened, while the enlarged one is a full-sized
-	// version that will likely still be loading as the animation begins.
-	$m = new WP_HTML_Tag_Processor( $block_content );
-	$m->next_tag( 'figure' );
-	$m->add_class( 'responsive-image' );
-	$m->next_tag( 'img' );
-	// We want to set the 'src' attribute to an empty string in the responsive image
-	// because otherwise, as of this writing, the wp_filter_content_tags() function in
-	// WordPress will automatically add a 'srcset' attribute to the image, which will at
-	// times cause the incorrectly sized image to be loaded in the lightbox on Firefox.
-	// Because of this, we bind the 'src' attribute explicitly the current src to reliably
-	// use the exact same image as in the content when the lightbox is first opened while
-	// we wait for the larger image to load.
-	$m->set_attribute( 'src', '' );
-	$m->set_attribute( 'data-wp-bind--src', 'context.imageCurrentSrc' );
-	$m->set_attribute( 'data-wp-style--object-fit', 'state.lightboxObjectFit' );
-	$initial_image_content = $m->get_updated_html();
-
-	$q = new WP_HTML_Tag_Processor( $block_content );
-	$q->next_tag( 'figure' );
-	$q->add_class( 'enlarged-image' );
-	$q->next_tag( 'img' );
-
-	// We set the 'src' attribute to an empty string to prevent the browser from loading the image
-	// on initial page load, then bind the attribute to a selector that returns the full-sized image src when
-	// the lightbox is opened. We could use 'loading=lazy' in combination with the 'hidden' attribute to
-	// accomplish the same behavior, but that approach breaks progressive loading of the image in Safari
-	// and Chrome (see https://github.com/WordPress/gutenberg/pull/52765#issuecomment-1674008151). Until that
-	// is resolved, manually setting the 'src' seems to be the best solution to load the large image on demand.
-	$q->set_attribute( 'src', '' );
-	$q->set_attribute( 'data-wp-bind--src', 'state.enlargedImgSrc' );
-	$q->set_attribute( 'data-wp-style--object-fit', 'state.lightboxObjectFit' );
-	$enlarged_image_content = $q->get_updated_html();
-
-	// If the current theme does NOT have a `theme.json`, or the colors are not defined,
-	// we need to set the background color & close button color to some default values
-	// because we can't get them from the Global Styles.
+	add_action( 'wp_footer', 'block_core_image_print_lightbox_overlay' );
+
+	return $body_content;
+}
+
+/**
+ * @since 6.5.0
+ */
+function block_core_image_print_lightbox_overlay() {
+	$close_button_label = esc_attr__( 'Close' );
+
+	// If the current theme does NOT have a `theme.json`, or the colors are not
+	// defined, it needs to set the background color & close button color to some
+	// default values because it can't get them from the Global Styles.
 	$background_color   = '#fff';
 	$close_button_color = '#000';
 	if ( wp_theme_has_theme_json() ) {
@@ -302,58 +272,49 @@ class="lightbox-trigger"
 		}
 	}
 
-	$close_button_icon  = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="20" height="20" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg>';
-	$close_button_label = esc_attr__( 'Close' );
-
-	$lightbox_html = <<<HTML
-        <div data-wp-body="" class="wp-lightbox-overlay $lightbox_animation"
-            data-wp-bind--role="state.roleAttribute"
-            data-wp-bind--aria-label="state.dialogLabel"
-            data-wp-class--initialized="context.initialized"
-            data-wp-class--active="context.lightboxEnabled"
-            data-wp-class--hideAnimationEnabled="context.hideAnimationEnabled"
-            data-wp-bind--aria-modal="state.ariaModal"
-            data-wp-watch="callbacks.initLightbox"
-            data-wp-on--keydown="actions.handleKeydown"
-            data-wp-on--touchstart="actions.handleTouchStart"
-            data-wp-on--touchmove="actions.handleTouchMove"
-            data-wp-on--touchend="actions.handleTouchEnd"
-            data-wp-on--click="actions.hideLightbox"
-            tabindex="-1"
-            >
-                <button type="button" aria-label="$close_button_label" style="fill: $close_button_color" class="close-button" data-wp-on--click="actions.hideLightbox">
-                    $close_button_icon
-                </button>
-                <div class="lightbox-image-container">$initial_image_content</div>
-                <div class="lightbox-image-container">$enlarged_image_content</div>
-                <div class="scrim" style="background-color: $background_color" aria-hidden="true"></div>
-        </div>
+	echo <<<HTML
+		<div
+			class="wp-lightbox-overlay zoom"
+			data-wp-interactive="core/image"
+			data-wp-context='{}'
+			data-wp-bind--role="state.roleAttribute"
+			data-wp-bind--aria-label="state.currentImage.ariaLabel"
+			data-wp-bind--aria-modal="state.ariaModal"
+			data-wp-class--active="state.overlayEnabled"
+			data-wp-class--show-closing-animation="state.showClosingAnimation"
+			data-wp-watch="callbacks.setOverlayFocus"
+			data-wp-on--keydown="actions.handleKeydown"
+			data-wp-on-async--touchstart="actions.handleTouchStart"
+			data-wp-on--touchmove="actions.handleTouchMove"
+			data-wp-on-async--touchend="actions.handleTouchEnd"
+			data-wp-on-async--click="actions.hideLightbox"
+			data-wp-on-async-window--resize="callbacks.setOverlayStyles"
+			data-wp-on-async-window--scroll="actions.handleScroll"
+			tabindex="-1"
+			>
+				<button type="button" aria-label="$close_button_label" style="fill: $close_button_color" class="close-button">
+					<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="20" height="20" aria-hidden="true" focusable="false"><path d="m13.06 12 6.47-6.47-1.06-1.06L12 10.94 5.53 4.47 4.47 5.53 10.94 12l-6.47 6.47 1.06 1.06L12 13.06l6.47 6.47 1.06-1.06L13.06 12Z"></path></svg>
+				</button>
+				<div class="lightbox-image-container">
+					<figure data-wp-bind--class="state.currentImage.figureClassNames" data-wp-bind--style="state.figureStyles">
+						<img data-wp-bind--alt="state.currentImage.alt" data-wp-bind--class="state.currentImage.imgClassNames" data-wp-bind--style="state.imgStyles" data-wp-bind--src="state.currentImage.currentSrc">
+					</figure>
+				</div>
+				<div class="lightbox-image-container">
+					<figure data-wp-bind--class="state.currentImage.figureClassNames" data-wp-bind--style="state.figureStyles">
+						<img data-wp-bind--alt="state.currentImage.alt" data-wp-bind--class="state.currentImage.imgClassNames" data-wp-bind--style="state.imgStyles" data-wp-bind--src="state.enlargedSrc">
+					</figure>
+				</div>
+				<div class="scrim" style="background-color: $background_color" aria-hidden="true"></div>
+				<style data-wp-text="state.overlayStyles"></style>
+		</div>
 HTML;
-
-	return str_replace( '</figure>', $lightbox_html . '</figure>', $body_content );
-}
-
-/**
- * Ensures that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_image_ensure_interactivity_dependency() {
-	global $wp_scripts;
-	if (
-		isset( $wp_scripts->registered['wp-block-image-view'] ) &&
-		! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-image-view']->deps, true )
-	) {
-		$wp_scripts->registered['wp-block-image-view']->deps[] = 'wp-interactivity';
-	}
 }
 
-add_action( 'wp_print_scripts', 'block_core_image_ensure_interactivity_dependency' );
-
 /**
  * Registers the `core/image` block on server.
+ *
+ * @since 5.9.0
  */
 function register_block_core_image() {
 	register_block_type_from_metadata(
@@ -362,14 +323,5 @@ function register_block_core_image() {
 			'render_callback' => 'render_block_core_image',
 		)
 	);
-
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/image',
-			gutenberg_url( '/build/interactivity/image.min.js' ),
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
 }
 add_action( 'init', 'register_block_core_image' );
diff --git a/packages/block-library/src/image/save.js b/packages/block-library/src/image/save.js
index 81565af09ababf..69c26cde52a9cd 100644
--- a/packages/block-library/src/image/save.js
+++ b/packages/block-library/src/image/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,6 +11,7 @@ import {
 	useBlockProps,
 	__experimentalGetElementClassName,
 	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
+	__experimentalGetShadowClassesAndStyles as getShadowClassesAndStyles,
 } from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
@@ -34,9 +35,12 @@ export default function save( { attributes } ) {
 
 	const newRel = ! rel ? undefined : rel;
 	const borderProps = getBorderClassesAndStyles( attributes );
+	const shadowProps = getShadowClassesAndStyles( attributes );
 
-	const classes = classnames( {
-		[ `align${ align }` ]: align,
+	const classes = clsx( {
+		// All other align classes are handled by block supports.
+		// `{ align: 'none' }` is unique to transforms for the image block.
+		alignnone: 'none' === align,
 		[ `size-${ sizeSlug }` ]: sizeSlug,
 		'is-resized': width || height,
 		'has-custom-border':
@@ -45,7 +49,7 @@ export default function save( { attributes } ) {
 				Object.keys( borderProps.style ).length > 0 ),
 	} );
 
-	const imageClasses = classnames( borderProps.className, {
+	const imageClasses = clsx( borderProps.className, {
 		[ `wp-image-${ id }` ]: !! id,
 	} );
 
@@ -56,6 +60,7 @@ export default function save( { attributes } ) {
 			className={ imageClasses || undefined }
 			style={ {
 				...borderProps.style,
+				...shadowProps.style,
 				aspectRatio,
 				objectFit: scale,
 				width,
diff --git a/packages/block-library/src/image/style.scss b/packages/block-library/src/image/style.scss
index 303f43ce4ed5f1..da4ccc50dac7f1 100644
--- a/packages/block-library/src/image/style.scss
+++ b/packages/block-library/src/image/style.scss
@@ -1,9 +1,25 @@
 .wp-block-image {
+
+	a {
+		display: inline-block;
+	}
+
 	img {
 		height: auto;
 		max-width: 100%;
 		vertical-align: bottom;
 		box-sizing: border-box;
+		width: fit-content;
+
+		@media (prefers-reduced-motion: no-preference) {
+			&.hide {
+				visibility: hidden;
+			}
+
+			&.show {
+				animation: show-content-image 0.4s;
+			}
+		}
 	}
 
 	// The following style maintains border radius application for deprecated
@@ -27,6 +43,11 @@
 		text-align: center;
 	}
 
+	&.alignfull a,
+	&.alignwide a {
+		width: 100%;
+	}
+
 	&.alignfull img,
 	&.alignwide img {
 		height: auto;
@@ -78,31 +99,23 @@
 	// Supply caption styles to images, even if the theme hasn't opted in.
 	// Reason being: the new markup, <figcaptions>, are not likely to be styled in the majority of existing themes,
 	// so we supply the styles so as to not appear broken or unstyled in those themes.
-	figcaption {
+	:where(figcaption) {
 		@include caption-style();
 	}
 
-	// Variations
-	&.is-style-rounded img,
-	.is-style-rounded img {
-		// We use an absolute pixel to prevent the oval shape that a value of 50% would give
-		// to rectangular images. A pill-shape is better than otherwise.
-		border-radius: 9999px;
-	}
-
 	// The following variation is deprecated.
 	// The CSS is kept here for the time being, to support blocks using the old variation.
+	// The selector is not scoped with `:root :where()` like global styles are to keep its
+	// specificity the same as it was when it was deprecated.
 	&.is-style-circle-mask img {
 		// We use an absolute pixel to prevent the oval shape that a value of 50% would give
 		// to rectangular images. A pill-shape is better than otherwise.
 		border-radius: 9999px;
 
 		// If a browser supports it, we will switch to using a circular SVG mask.
-		// The stylelint override is necessary to use the SVG inline here.
 		@supports (mask-image: none) or (-webkit-mask-image: none) {
-			/* stylelint-disable */
+			/* stylelint-disable-next-line function-url-quotes -- We need quotes for the data URL to use the SVG inline. */
 			mask-image: url('data:image/svg+xml;utf8,<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="50"/></svg>');
-			/* stylelint-enable */
 			mask-mode: alpha;
 			mask-repeat: no-repeat;
 			mask-size: contain;
@@ -110,42 +123,13 @@
 			border-radius: 0;
 		}
 	}
+}
 
-	// The following is required to overcome WP Core applying styles that clear
-	// img borders with a higher specificity than those added by the border
-	// block support to provide a default border-style of solid when a border
-	// color or width has been set.
-	:where(.has-border-color) {
-		border-style: solid;
-	}
-	:where([style*="border-top-color"]) {
-		border-top-style: solid;
-	}
-	:where([style*="border-right-color"]) {
-		border-right-style: solid;
-	}
-	:where([style*="border-bottom-color"]) {
-		border-bottom-style: solid;
-	}
-	:where([style*="border-left-color"]) {
-		border-left-style: solid;
-	}
-
-	:where([style*="border-width"]) {
-		border-style: solid;
-	}
-	:where([style*="border-top-width"]) {
-		border-top-style: solid;
-	}
-	:where([style*="border-right-width"]) {
-		border-right-style: solid;
-	}
-	:where([style*="border-bottom-width"]) {
-		border-bottom-style: solid;
-	}
-	:where([style*="border-left-width"]) {
-		border-left-style: solid;
-	}
+// Variations
+:root :where(.wp-block-image.is-style-rounded img, .wp-block-image .is-style-rounded img) {
+	// We use an absolute pixel to prevent the oval shape that a value of 50% would give
+	// to rectangular images. A pill-shape is better than otherwise.
+	border-radius: 9999px;
 }
 
 .wp-block-image figure {
@@ -301,7 +285,7 @@
 			animation: both turn-on-visibility 0.35s;
 		}
 	}
-	&.hideanimationenabled {
+	&.show-closing-animation {
 		&:not(.active) {
 			animation: both turn-off-visibility 0.35s;
 			img {
@@ -327,7 +311,7 @@
 					animation: turn-on-visibility 0.4s forwards;
 				}
 			}
-			&.hideanimationenabled {
+			&.show-closing-animation {
 				&:not(.active) {
 					animation: none;
 					.lightbox-image-container {
@@ -346,6 +330,18 @@
 	}
 }
 
+@keyframes show-content-image {
+	0% {
+		visibility: hidden;
+	}
+	99% {
+		visibility: hidden;
+	}
+	100% {
+		visibility: visible;
+	}
+}
+
 @keyframes turn-on-visibility {
 	0% {
 		opacity: 0;
diff --git a/packages/block-library/src/image/test/edit.native.js b/packages/block-library/src/image/test/edit.native.js
index 7a0fd15c854470..5cf653321b2be0 100644
--- a/packages/block-library/src/image/test/edit.native.js
+++ b/packages/block-library/src/image/test/edit.native.js
@@ -48,6 +48,7 @@ function mockGetMedia( media ) {
 const FETCH_MEDIA = {
 	request: {
 		path: `/wp/v2/media/1?context=edit`,
+		parse: false,
 	},
 	response: {
 		source_url: 'https://cldup.com/cXyG__fTLN.jpg',
diff --git a/packages/block-library/src/image/theme.scss b/packages/block-library/src/image/theme.scss
index d5b2cfb0e83e94..c89dd3334dd09a 100644
--- a/packages/block-library/src/image/theme.scss
+++ b/packages/block-library/src/image/theme.scss
@@ -1,4 +1,4 @@
-.wp-block-image figcaption {
+:root :where(.wp-block-image figcaption) {
 	@include caption-style-theme();
 }
 
diff --git a/packages/block-library/src/image/transforms.js b/packages/block-library/src/image/transforms.js
index a96a93640292b5..347d2408280170 100644
--- a/packages/block-library/src/image/transforms.js
+++ b/packages/block-library/src/image/transforms.js
@@ -1,11 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { createBlobURL } from '@wordpress/blob';
+import { createBlobURL, isBlobURL } from '@wordpress/blob';
 import { createBlock, getBlockAttributes } from '@wordpress/blocks';
-import { dispatch } from '@wordpress/data';
-import { store as noticesStore } from '@wordpress/notices';
-import { __ } from '@wordpress/i18n';
 
 export function stripFirstImage( attributes, { shortcode } ) {
 	const { body } = document.implementation.createHTMLDocument( '' );
@@ -123,6 +120,12 @@ const transforms = {
 						anchor,
 					}
 				);
+
+				if ( isBlobURL( attributes.url ) ) {
+					attributes.blob = attributes.url;
+					delete attributes.url;
+				}
+
 				return createBlock( 'core/image', attributes );
 			},
 		},
@@ -132,26 +135,6 @@ const transforms = {
 			// creating a new gallery.
 			type: 'files',
 			isMatch( files ) {
-				// The following check is intended to catch non-image files when dropped together with images.
-				if (
-					files.some(
-						( file ) => file.type.indexOf( 'image/' ) === 0
-					) &&
-					files.some(
-						( file ) => file.type.indexOf( 'image/' ) !== 0
-					)
-				) {
-					const { createErrorNotice } = dispatch( noticesStore );
-					createErrorNotice(
-						__(
-							'If uploading to a gallery all files need to be image formats'
-						),
-						{
-							id: 'gallery-transform-invalid-file',
-							type: 'snackbar',
-						}
-					);
-				}
 				return files.every(
 					( file ) => file.type.indexOf( 'image/' ) === 0
 				);
@@ -159,7 +142,7 @@ const transforms = {
 			transform( files ) {
 				const blocks = files.map( ( file ) => {
 					return createBlock( 'core/image', {
-						url: createBlobURL( file ),
+						blob: createBlobURL( file ),
 					} );
 				} );
 				return blocks;
diff --git a/packages/block-library/src/image/use-client-width.js b/packages/block-library/src/image/use-client-width.js
deleted file mode 100644
index ddbc53536bbffa..00000000000000
--- a/packages/block-library/src/image/use-client-width.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useState, useEffect } from '@wordpress/element';
-
-export default function useClientWidth( ref, dependencies ) {
-	const [ clientWidth, setClientWidth ] = useState();
-
-	function calculateClientWidth() {
-		setClientWidth( ref.current?.clientWidth );
-	}
-
-	useEffect( calculateClientWidth, dependencies );
-	useEffect( () => {
-		const { defaultView } = ref.current.ownerDocument;
-
-		defaultView.addEventListener( 'resize', calculateClientWidth );
-
-		return () => {
-			defaultView.removeEventListener( 'resize', calculateClientWidth );
-		};
-	}, [] );
-
-	return clientWidth;
-}
diff --git a/packages/block-library/src/image/use-max-width-observer.js b/packages/block-library/src/image/use-max-width-observer.js
new file mode 100644
index 00000000000000..684392537fac7a
--- /dev/null
+++ b/packages/block-library/src/image/use-max-width-observer.js
@@ -0,0 +1,32 @@
+/**
+ * WordPress dependencies
+ */
+import { useRef } from '@wordpress/element';
+import { useResizeObserver } from '@wordpress/compose';
+
+function useMaxWidthObserver() {
+	const [ contentResizeListener, { width } ] = useResizeObserver();
+	const observerRef = useRef();
+
+	const maxWidthObserver = (
+		<div
+			// Some themes set max-width on blocks.
+			className="wp-block"
+			aria-hidden="true"
+			style={ {
+				position: 'absolute',
+				inset: 0,
+				width: '100%',
+				height: 0,
+				margin: 0,
+			} }
+			ref={ observerRef }
+		>
+			{ contentResizeListener }
+		</div>
+	);
+
+	return [ maxWidthObserver, width ];
+}
+
+export { useMaxWidthObserver };
diff --git a/packages/block-library/src/image/utils.js b/packages/block-library/src/image/utils.js
index 1ef7973b4e57a3..1541c3daac3aab 100644
--- a/packages/block-library/src/image/utils.js
+++ b/packages/block-library/src/image/utils.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { NEW_TAB_REL } from './constants';
+import { NEW_TAB_REL, ALLOWED_MEDIA_TYPES } from './constants';
 
 /**
  * Evaluates a CSS aspect-ratio property value as a number.
@@ -81,3 +81,15 @@ export function getImageSizeAttributes( image, size ) {
 
 	return {};
 }
+
+/**
+ * Checks if the file has a valid file type.
+ *
+ * @param {File} file - The file to check.
+ * @return {boolean} - Returns true if the file has a valid file type, otherwise false.
+ */
+export function isValidFileType( file ) {
+	return ALLOWED_MEDIA_TYPES.some(
+		( mediaType ) => file.type.indexOf( mediaType ) === 0
+	);
+}
diff --git a/packages/block-library/src/image/view.js b/packages/block-library/src/image/view.js
index 315ed995f26cfc..0bc0dfaacea1a2 100644
--- a/packages/block-library/src/image/view.js
+++ b/packages/block-library/src/image/view.js
@@ -3,537 +3,455 @@
  */
 import { store, getContext, getElement } from '@wordpress/interactivity';
 
-const focusableSelectors = [
-	'a[href]',
-	'area[href]',
-	'input:not([disabled]):not([type="hidden"]):not([aria-hidden])',
-	'select:not([disabled]):not([aria-hidden])',
-	'textarea:not([disabled]):not([aria-hidden])',
-	'button:not([disabled]):not([aria-hidden])',
-	'iframe',
-	'object',
-	'embed',
-	'[contenteditable]',
-	'[tabindex]:not([tabindex^="-"])',
-];
-
 /**
- * Stores a context-bound scroll handler.
- *
- * This callback could be defined inline inside of the store
- * object but it's created externally to avoid confusion about
- * how its logic is called. This logic is not referenced directly
- * by the directives in the markup because the scroll event we
- * need to listen to is triggered on the window; so by defining it
- * outside of the store, we signal that the behavior here is different.
- * If we find a compelling reason to move it to the store, feel free.
- *
- * @type {Function}
- */
-let scrollCallback;
-
-/**
- * Tracks whether user is touching screen; used to
- * differentiate behavior for touch and mouse input.
+ * Tracks whether user is touching screen; used to differentiate behavior for
+ * touch and mouse input.
  *
  * @type {boolean}
  */
 let isTouching = false;
 
 /**
- * Tracks the last time the screen was touched; used to
- * differentiate behavior for touch and mouse input.
+ * Tracks the last time the screen was touched; used to differentiate behavior
+ * for touch and mouse input.
  *
  * @type {number}
  */
 let lastTouchTime = 0;
 
-/**
- * Lightbox page-scroll handler: prevents scrolling.
- *
- * This handler is added to prevent scrolling behaviors that
- * trigger content shift while the lightbox is open.
- *
- * It would be better to accomplish this through CSS alone, but
- * using overflow: hidden is currently the only way to do so, and
- * that causes the layout to shift and prevents the zoom animation
- * from working in some cases because we're unable to account for
- * the layout shift when doing the animation calculations. Instead,
- * here we use JavaScript to prevent and reset the scrolling
- * behavior. In the future, we may be able to use CSS or overflow: hidden
- * instead to not rely on JavaScript, but this seems to be the best approach
- * for now that provides the best visual experience.
- *
- * @param {Object} ctx Context object with the `core/image` namespace.
- */
-function handleScroll( ctx ) {
-	// We can't override the scroll behavior on mobile devices
-	// because doing so breaks the pinch to zoom functionality, and we
-	// want to allow users to zoom in further on the high-res image.
-	if ( ! isTouching && Date.now() - lastTouchTime > 450 ) {
-		// We are unable to use event.preventDefault() to prevent scrolling
-		// because the scroll event can't be canceled, so we reset the position instead.
-		window.scrollTo( ctx.scrollLeftReset, ctx.scrollTopReset );
-	}
-}
-
-const { state, actions, callbacks } = store( 'core/image', {
-	state: {
-		windowWidth: window.innerWidth,
-		windowHeight: window.innerHeight,
-		get roleAttribute() {
-			const ctx = getContext();
-			return ctx.lightboxEnabled ? 'dialog' : null;
-		},
-		get ariaModal() {
-			const ctx = getContext();
-			return ctx.lightboxEnabled ? 'true' : null;
-		},
-		get dialogLabel() {
-			const ctx = getContext();
-			return ctx.lightboxEnabled ? ctx.dialogLabel : null;
-		},
-		get lightboxObjectFit() {
-			const ctx = getContext();
-			if ( ctx.initialized ) {
-				return 'cover';
-			}
-		},
-		get enlargedImgSrc() {
-			const ctx = getContext();
-			return ctx.initialized
-				? ctx.imageUploadedSrc
-				: 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
-		},
-	},
-	actions: {
-		showLightbox( event ) {
-			const ctx = getContext();
-			// We can't initialize the lightbox until the reference
-			// image is loaded, otherwise the UX is broken.
-			if ( ! ctx.imageLoaded ) {
-				return;
-			}
-			ctx.initialized = true;
-			ctx.lastFocusedElement = window.document.activeElement;
-			ctx.scrollDelta = 0;
-			ctx.pointerType = event.pointerType;
-
-			ctx.lightboxEnabled = true;
-			setStyles( ctx, ctx.imageRef );
-
-			ctx.scrollTopReset =
-				window.pageYOffset || document.documentElement.scrollTop;
-
-			// In most cases, this value will be 0, but this is included
-			// in case a user has created a page with horizontal scrolling.
-			ctx.scrollLeftReset =
-				window.pageXOffset || document.documentElement.scrollLeft;
-
-			// We define and bind the scroll callback here so
-			// that we can pass the context and as an argument.
-			// We may be able to change this in the future if we
-			// define the scroll callback in the store instead, but
-			// this approach seems to tbe clearest for now.
-			scrollCallback = handleScroll.bind( null, ctx );
-
-			// We need to add a scroll event listener to the window
-			// here because we are unable to otherwise access it via
-			// the Interactivity API directives. If we add a native way
-			// to access the window, we can remove this.
-			window.addEventListener( 'scroll', scrollCallback, false );
-		},
-		hideLightbox() {
-			const ctx = getContext();
-			ctx.hideAnimationEnabled = true;
-			if ( ctx.lightboxEnabled ) {
-				// We want to wait until the close animation is completed
-				// before allowing a user to scroll again. The duration of this
-				// animation is defined in the styles.scss and depends on if the
-				// animation is 'zoom' or 'fade', but in any case we should wait
-				// a few milliseconds longer than the duration, otherwise a user
-				// may scroll too soon and cause the animation to look sloppy.
-				setTimeout( function () {
-					window.removeEventListener( 'scroll', scrollCallback );
-					// If we don't delay before changing the focus,
-					// the focus ring will appear on Firefox before
-					// the image has finished animating, which looks broken.
-					ctx.lightboxTriggerRef.focus( {
-						preventScroll: true,
-					} );
-				}, 450 );
-
-				ctx.lightboxEnabled = false;
-			}
+const { state, actions, callbacks } = store(
+	'core/image',
+	{
+		state: {
+			currentImageId: null,
+			get currentImage() {
+				return state.metadata[ state.currentImageId ];
+			},
+			get overlayOpened() {
+				return state.currentImageId !== null;
+			},
+			get roleAttribute() {
+				return state.overlayOpened ? 'dialog' : null;
+			},
+			get ariaModal() {
+				return state.overlayOpened ? 'true' : null;
+			},
+			get enlargedSrc() {
+				return (
+					state.currentImage.uploadedSrc ||
+					'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='
+				);
+			},
+			get figureStyles() {
+				return (
+					state.overlayOpened &&
+					`${ state.currentImage.figureStyles?.replace(
+						/margin[^;]*;?/g,
+						''
+					) };`
+				);
+			},
+			get imgStyles() {
+				return (
+					state.overlayOpened &&
+					`${ state.currentImage.imgStyles?.replace(
+						/;$/,
+						''
+					) }; object-fit:cover;`
+				);
+			},
+			get imageButtonRight() {
+				const { imageId } = getContext();
+				return state.metadata[ imageId ].imageButtonRight;
+			},
+			get imageButtonTop() {
+				const { imageId } = getContext();
+				return state.metadata[ imageId ].imageButtonTop;
+			},
+			get isContentHidden() {
+				const ctx = getContext();
+				return (
+					state.overlayEnabled && state.currentImageId === ctx.imageId
+				);
+			},
+			get isContentVisible() {
+				const ctx = getContext();
+				return (
+					! state.overlayEnabled &&
+					state.currentImageId === ctx.imageId
+				);
+			},
 		},
-		handleKeydown( event ) {
-			const ctx = getContext();
-			if ( ctx.lightboxEnabled ) {
-				if ( event.key === 'Tab' || event.keyCode === 9 ) {
-					// If shift + tab it change the direction
-					if (
-						event.shiftKey &&
-						window.document.activeElement ===
-							ctx.firstFocusableElement
-					) {
-						event.preventDefault();
-						ctx.lastFocusableElement.focus();
-					} else if (
-						! event.shiftKey &&
-						window.document.activeElement ===
-							ctx.lastFocusableElement
-					) {
+		actions: {
+			showLightbox() {
+				const { imageId } = getContext();
+
+				// Bails out if the image has not loaded yet.
+				if ( ! state.metadata[ imageId ].imageRef?.complete ) {
+					return;
+				}
+
+				// Stores the positions of the scroll to fix it until the overlay is
+				// closed.
+				state.scrollTopReset = document.documentElement.scrollTop;
+				state.scrollLeftReset = document.documentElement.scrollLeft;
+
+				// Sets the current expanded image in the state and enables the overlay.
+				state.overlayEnabled = true;
+				state.currentImageId = imageId;
+
+				// Computes the styles of the overlay for the animation.
+				callbacks.setOverlayStyles();
+			},
+			hideLightbox() {
+				if ( state.overlayEnabled ) {
+					// Starts the overlay closing animation. The showClosingAnimation
+					// class is used to avoid showing it on page load.
+					state.showClosingAnimation = true;
+					state.overlayEnabled = false;
+
+					// Waits until the close animation has completed before allowing a
+					// user to scroll again. The duration of this animation is defined in
+					// the `styles.scss` file, but in any case we should wait a few
+					// milliseconds longer than the duration, otherwise a user may scroll
+					// too soon and cause the animation to look sloppy.
+					setTimeout( function () {
+						// Delays before changing the focus. Otherwise the focus ring will
+						// appear on Firefox before the image has finished animating, which
+						// looks broken.
+						state.currentImage.buttonRef.focus( {
+							preventScroll: true,
+						} );
+
+						// Resets the current image id to mark the overlay as closed.
+						state.currentImageId = null;
+					}, 450 );
+				}
+			},
+			handleKeydown( event ) {
+				if ( state.overlayEnabled ) {
+					// Focuses the close button when the user presses the tab key.
+					if ( event.key === 'Tab' ) {
 						event.preventDefault();
-						ctx.firstFocusableElement.focus();
+						const { ref } = getElement();
+						ref.querySelector( 'button' ).focus();
+					}
+					// Closes the lightbox when the user presses the escape key.
+					if ( event.key === 'Escape' ) {
+						actions.hideLightbox();
 					}
 				}
-
-				if ( event.key === 'Escape' || event.keyCode === 27 ) {
-					actions.hideLightbox( event );
+			},
+			handleTouchMove( event ) {
+				// On mobile devices, prevents triggering the scroll event because
+				// otherwise the page jumps around when it resets the scroll position.
+				// This also means that closing the lightbox requires that a user
+				// perform a simple tap. This may be changed in the future if there is a
+				// better alternative to override or reset the scroll position during
+				// swipe actions.
+				if ( state.overlayEnabled ) {
+					event.preventDefault();
 				}
-			}
-		},
-		// This is fired just by lazily loaded
-		// images on the page, not all images.
-		handleLoad() {
-			const ctx = getContext();
-			const { ref } = getElement();
-			ctx.imageLoaded = true;
-			ctx.imageCurrentSrc = ref.currentSrc;
-			callbacks.setButtonStyles();
-		},
-		handleTouchStart() {
-			isTouching = true;
-		},
-		handleTouchMove( event ) {
-			const ctx = getContext();
-			// On mobile devices, we want to prevent triggering the
-			// scroll event because otherwise the page jumps around as
-			// we reset the scroll position. This also means that closing
-			// the lightbox requires that a user perform a simple tap. This
-			// may be changed in the future if we find a better alternative
-			// to override or reset the scroll position during swipe actions.
-			if ( ctx.lightboxEnabled ) {
-				event.preventDefault();
-			}
-		},
-		handleTouchEnd() {
-			// We need to wait a few milliseconds before resetting
-			// to ensure that pinch to zoom works consistently
-			// on mobile devices when the lightbox is open.
-			lastTouchTime = Date.now();
-			isTouching = false;
-		},
-	},
-	callbacks: {
-		initOriginImage() {
-			const ctx = getContext();
-			const { ref } = getElement();
-			ctx.imageRef = ref;
-			ctx.lightboxTriggerRef =
-				ref.parentElement.querySelector( '.lightbox-trigger' );
-			if ( ref.complete ) {
-				ctx.imageLoaded = true;
-				ctx.imageCurrentSrc = ref.currentSrc;
-			}
-		},
-		initLightbox() {
-			const ctx = getContext();
-			const { ref } = getElement();
-			if ( ctx.lightboxEnabled ) {
-				const focusableElements =
-					ref.querySelectorAll( focusableSelectors );
-				ctx.firstFocusableElement = focusableElements[ 0 ];
-				ctx.lastFocusableElement =
-					focusableElements[ focusableElements.length - 1 ];
-
-				// Move focus to the dialog when opening it.
-				ref.focus();
-			}
+			},
+			handleTouchStart() {
+				isTouching = true;
+			},
+			handleTouchEnd() {
+				// Waits a few milliseconds before resetting to ensure that pinch to
+				// zoom works consistently on mobile devices when the lightbox is open.
+				lastTouchTime = Date.now();
+				isTouching = false;
+			},
+			handleScroll() {
+				// Prevents scrolling behaviors that trigger content shift while the
+				// lightbox is open. It would be better to accomplish through CSS alone,
+				// but using overflow: hidden is currently the only way to do so and
+				// that causes a layout to shift and prevents the zoom animation from
+				// working in some cases because it's not possible to account for the
+				// layout shift when doing the animation calculations. Instead, it uses
+				// JavaScript to prevent and reset the scrolling behavior.
+				if ( state.overlayOpened ) {
+					// Avoids overriding the scroll behavior on mobile devices because
+					// doing so breaks the pinch to zoom functionality, and users should
+					// be able to zoom in further on the high-res image.
+					if ( ! isTouching && Date.now() - lastTouchTime > 450 ) {
+						// It doesn't rely on `event.preventDefault()` to prevent scrolling
+						// because the scroll event can't be canceled, so it resets the
+						// position instead.
+						window.scrollTo(
+							state.scrollLeftReset,
+							state.scrollTopReset
+						);
+					}
+				}
+			},
 		},
-		setButtonStyles() {
-			const { ref } = getElement();
-			const { naturalWidth, naturalHeight, offsetWidth, offsetHeight } =
-				ref;
-
-			// If the image isn't loaded yet, we can't
-			// calculate where the button should be.
-			if ( naturalWidth === 0 || naturalHeight === 0 ) {
-				return;
-			}
-
-			const figure = ref.parentElement;
-			const figureWidth = ref.parentElement.clientWidth;
-
-			// We need special handling for the height because
-			// a caption will cause the figure to be taller than
-			// the image, which means we need to account for that
-			// when calculating the placement of the button in the
-			// top right corner of the image.
-			let figureHeight = ref.parentElement.clientHeight;
-			const caption = figure.querySelector( 'figcaption' );
-			if ( caption ) {
-				const captionComputedStyle = window.getComputedStyle( caption );
+		callbacks: {
+			setOverlayStyles() {
+				if ( ! state.overlayEnabled ) {
+					return;
+				}
+
+				let {
+					naturalWidth,
+					naturalHeight,
+					offsetWidth: originalWidth,
+					offsetHeight: originalHeight,
+				} = state.currentImage.imageRef;
+				let { x: screenPosX, y: screenPosY } =
+					state.currentImage.imageRef.getBoundingClientRect();
+
+				// Natural ratio of the image clicked to open the lightbox.
+				const naturalRatio = naturalWidth / naturalHeight;
+				// Original ratio of the image clicked to open the lightbox.
+				let originalRatio = originalWidth / originalHeight;
+
+				// If it has object-fit: contain, recalculates the original sizes
+				// and the screen position without the blank spaces.
+				if ( state.currentImage.scaleAttr === 'contain' ) {
+					if ( naturalRatio > originalRatio ) {
+						const heightWithoutSpace = originalWidth / naturalRatio;
+						// Recalculates screen position without the top space.
+						screenPosY +=
+							( originalHeight - heightWithoutSpace ) / 2;
+						originalHeight = heightWithoutSpace;
+					} else {
+						const widthWithoutSpace = originalHeight * naturalRatio;
+						// Recalculates screen position without the left space.
+						screenPosX += ( originalWidth - widthWithoutSpace ) / 2;
+						originalWidth = widthWithoutSpace;
+					}
+				}
+				originalRatio = originalWidth / originalHeight;
+
+				// Typically, it uses the image's full-sized dimensions. If those
+				// dimensions have not been set (i.e. an external image with only one
+				// size), the image's dimensions in the lightbox are the same
+				// as those of the image in the content.
+				let imgMaxWidth = parseFloat(
+					state.currentImage.targetWidth !== 'none'
+						? state.currentImage.targetWidth
+						: naturalWidth
+				);
+				let imgMaxHeight = parseFloat(
+					state.currentImage.targetHeight !== 'none'
+						? state.currentImage.targetHeight
+						: naturalHeight
+				);
+
+				// Ratio of the biggest image stored in the database.
+				let imgRatio = imgMaxWidth / imgMaxHeight;
+				let containerMaxWidth = imgMaxWidth;
+				let containerMaxHeight = imgMaxHeight;
+				let containerWidth = imgMaxWidth;
+				let containerHeight = imgMaxHeight;
+
+				// Checks if the target image has a different ratio than the original
+				// one (thumbnail). Recalculates the width and height.
+				if ( naturalRatio.toFixed( 2 ) !== imgRatio.toFixed( 2 ) ) {
+					if ( naturalRatio > imgRatio ) {
+						// If the width is reached before the height, it keeps the maxWidth
+						// and recalculates the height unless the difference between the
+						// maxHeight and the reducedHeight is higher than the maxWidth,
+						// where it keeps the reducedHeight and recalculate the width.
+						const reducedHeight = imgMaxWidth / naturalRatio;
+						if ( imgMaxHeight - reducedHeight > imgMaxWidth ) {
+							imgMaxHeight = reducedHeight;
+							imgMaxWidth = reducedHeight * naturalRatio;
+						} else {
+							imgMaxHeight = imgMaxWidth / naturalRatio;
+						}
+					} else {
+						// If the height is reached before the width, it keeps the maxHeight
+						// and recalculate the width unlesss the difference between the
+						// maxWidth and the reducedWidth is higher than the maxHeight, where
+						// it keeps the reducedWidth and recalculate the height.
+						const reducedWidth = imgMaxHeight * naturalRatio;
+						if ( imgMaxWidth - reducedWidth > imgMaxHeight ) {
+							imgMaxWidth = reducedWidth;
+							imgMaxHeight = reducedWidth / naturalRatio;
+						} else {
+							imgMaxWidth = imgMaxHeight * naturalRatio;
+						}
+					}
+					containerWidth = imgMaxWidth;
+					containerHeight = imgMaxHeight;
+					imgRatio = imgMaxWidth / imgMaxHeight;
+
+					// Calculates the max size of the container.
+					if ( originalRatio > imgRatio ) {
+						containerMaxWidth = imgMaxWidth;
+						containerMaxHeight = containerMaxWidth / originalRatio;
+					} else {
+						containerMaxHeight = imgMaxHeight;
+						containerMaxWidth = containerMaxHeight * originalRatio;
+					}
+				}
+
+				// If the image has been pixelated on purpose, it keeps that size.
 				if (
-					! [ 'absolute', 'fixed' ].includes(
-						captionComputedStyle.position
-					)
+					originalWidth > containerWidth ||
+					originalHeight > containerHeight
 				) {
-					figureHeight =
-						figureHeight -
-						caption.offsetHeight -
-						parseFloat( captionComputedStyle.marginTop ) -
-						parseFloat( captionComputedStyle.marginBottom );
+					containerWidth = originalWidth;
+					containerHeight = originalHeight;
 				}
-			}
 
-			const buttonOffsetTop = figureHeight - offsetHeight;
-			const buttonOffsetRight = figureWidth - offsetWidth;
+				// Calculates the final lightbox image size and the scale factor.
+				// MaxWidth is either the window container (accounting for padding) or
+				// the image resolution.
+				let horizontalPadding = 0;
+				if ( window.innerWidth > 480 ) {
+					horizontalPadding = 80;
+				} else if ( window.innerWidth > 1920 ) {
+					horizontalPadding = 160;
+				}
+				const verticalPadding = 80;
+
+				const targetMaxWidth = Math.min(
+					window.innerWidth - horizontalPadding,
+					containerWidth
+				);
+				const targetMaxHeight = Math.min(
+					window.innerHeight - verticalPadding,
+					containerHeight
+				);
+				const targetContainerRatio = targetMaxWidth / targetMaxHeight;
+
+				if ( originalRatio > targetContainerRatio ) {
+					// If targetMaxWidth is reached before targetMaxHeight.
+					containerWidth = targetMaxWidth;
+					containerHeight = containerWidth / originalRatio;
+				} else {
+					// If targetMaxHeight is reached before targetMaxWidth.
+					containerHeight = targetMaxHeight;
+					containerWidth = containerHeight * originalRatio;
+				}
 
-			const ctx = getContext();
+				const containerScale = originalWidth / containerWidth;
+				const lightboxImgWidth =
+					imgMaxWidth * ( containerWidth / containerMaxWidth );
+				const lightboxImgHeight =
+					imgMaxHeight * ( containerHeight / containerMaxHeight );
+
+				// As of this writing, using the calculations above will render the
+				// lightbox with a small, erroneous whitespace on the left side of the
+				// image in iOS Safari, perhaps due to an inconsistency in how browsers
+				// handle absolute positioning and CSS transformation. In any case,
+				// adding 1 pixel to the container width and height solves the problem,
+				// though this can be removed if the issue is fixed in the future.
+				state.overlayStyles = `
+				:root {
+					--wp--lightbox-initial-top-position: ${ screenPosY }px;
+					--wp--lightbox-initial-left-position: ${ screenPosX }px;
+					--wp--lightbox-container-width: ${ containerWidth + 1 }px;
+					--wp--lightbox-container-height: ${ containerHeight + 1 }px;
+					--wp--lightbox-image-width: ${ lightboxImgWidth }px;
+					--wp--lightbox-image-height: ${ lightboxImgHeight }px;
+					--wp--lightbox-scale: ${ containerScale };
+					--wp--lightbox-scrollbar-width: ${
+						window.innerWidth - document.documentElement.clientWidth
+					}px;
+				}
+			`;
+			},
+			setButtonStyles() {
+				const { imageId } = getContext();
+				const { ref } = getElement();
+
+				state.metadata[ imageId ].imageRef = ref;
+				state.metadata[ imageId ].currentSrc = ref.currentSrc;
+
+				const {
+					naturalWidth,
+					naturalHeight,
+					offsetWidth,
+					offsetHeight,
+				} = ref;
+
+				// If the image isn't loaded yet, it can't calculate where the button
+				// should be.
+				if ( naturalWidth === 0 || naturalHeight === 0 ) {
+					return;
+				}
 
-			// In the case of an image with object-fit: contain, the
-			// size of the <img> element can be larger than the image itself,
-			// so we need to calculate where to place the button.
-			if ( ctx.scaleAttr === 'contain' ) {
-				// Natural ratio of the image.
-				const naturalRatio = naturalWidth / naturalHeight;
-				// Offset ratio of the image.
-				const offsetRatio = offsetWidth / offsetHeight;
-
-				if ( naturalRatio >= offsetRatio ) {
-					// If it reaches the width first, keep
-					// the width and compute the height.
-					const referenceHeight = offsetWidth / naturalRatio;
-					ctx.imageButtonTop =
-						( offsetHeight - referenceHeight ) / 2 +
-						buttonOffsetTop +
-						16;
-					ctx.imageButtonRight = buttonOffsetRight + 16;
-				} else {
-					// If it reaches the height first, keep
-					// the height and compute the width.
-					const referenceWidth = offsetHeight * naturalRatio;
-					ctx.imageButtonTop = buttonOffsetTop + 16;
-					ctx.imageButtonRight =
-						( offsetWidth - referenceWidth ) / 2 +
-						buttonOffsetRight +
-						16;
+				const figure = ref.parentElement;
+				const figureWidth = ref.parentElement.clientWidth;
+
+				// It needs special handling for the height because a caption will cause
+				// the figure to be taller than the image, which means it needs to
+				// account for that when calculating the placement of the button in the
+				// top right corner of the image.
+				let figureHeight = ref.parentElement.clientHeight;
+				const caption = figure.querySelector( 'figcaption' );
+				if ( caption ) {
+					const captionComputedStyle =
+						window.getComputedStyle( caption );
+					if (
+						! [ 'absolute', 'fixed' ].includes(
+							captionComputedStyle.position
+						)
+					) {
+						figureHeight =
+							figureHeight -
+							caption.offsetHeight -
+							parseFloat( captionComputedStyle.marginTop ) -
+							parseFloat( captionComputedStyle.marginBottom );
+					}
 				}
-			} else {
-				ctx.imageButtonTop = buttonOffsetTop + 16;
-				ctx.imageButtonRight = buttonOffsetRight + 16;
-			}
-		},
-		setStylesOnResize() {
-			const ctx = getContext();
-			const { ref } = getElement();
-			if (
-				ctx.lightboxEnabled &&
-				( state.windowWidth || state.windowHeight )
-			) {
-				setStyles( ctx, ref );
-			}
+
+				const buttonOffsetTop = figureHeight - offsetHeight;
+				const buttonOffsetRight = figureWidth - offsetWidth;
+
+				let imageButtonTop = buttonOffsetTop + 16;
+				let imageButtonRight = buttonOffsetRight + 16;
+
+				// In the case of an image with object-fit: contain, the size of the
+				// <img> element can be larger than the image itself, so it needs to
+				// calculate where to place the button.
+				if ( state.metadata[ imageId ].scaleAttr === 'contain' ) {
+					// Natural ratio of the image.
+					const naturalRatio = naturalWidth / naturalHeight;
+					// Offset ratio of the image.
+					const offsetRatio = offsetWidth / offsetHeight;
+
+					if ( naturalRatio >= offsetRatio ) {
+						// If it reaches the width first, it keeps the width and compute the
+						// height.
+						const referenceHeight = offsetWidth / naturalRatio;
+						imageButtonTop =
+							( offsetHeight - referenceHeight ) / 2 +
+							buttonOffsetTop +
+							16;
+						imageButtonRight = buttonOffsetRight + 16;
+					} else {
+						// If it reaches the height first, it keeps the height and compute
+						// the width.
+						const referenceWidth = offsetHeight * naturalRatio;
+						imageButtonTop = buttonOffsetTop + 16;
+						imageButtonRight =
+							( offsetWidth - referenceWidth ) / 2 +
+							buttonOffsetRight +
+							16;
+					}
+				}
+
+				state.metadata[ imageId ].imageButtonTop = imageButtonTop;
+				state.metadata[ imageId ].imageButtonRight = imageButtonRight;
+			},
+			setOverlayFocus() {
+				if ( state.overlayEnabled ) {
+					// Moves the focus to the dialog when it opens.
+					const { ref } = getElement();
+					ref.focus();
+				}
+			},
+			initTriggerButton() {
+				const { imageId } = getContext();
+				const { ref } = getElement();
+				state.metadata[ imageId ].buttonRef = ref;
+			},
 		},
 	},
-} );
-
-window.addEventListener(
-	'resize',
-	debounce( () => {
-		state.windowWidth = window.innerWidth;
-		state.windowHeight = window.innerHeight;
-	} )
+	{ lock: true }
 );
-
-/**
- * Computes styles for the lightbox and adds them to the document.
- *
- * @function
- * @param {Object} ctx - Context for the `core/image` namespace.
- * @param {Object} ref - The element reference.
- */
-function setStyles( ctx, ref ) {
-	// The reference img element lies adjacent
-	// to the event target button in the DOM.
-	let {
-		naturalWidth,
-		naturalHeight,
-		offsetWidth: originalWidth,
-		offsetHeight: originalHeight,
-	} = ref;
-	let { x: screenPosX, y: screenPosY } = ref.getBoundingClientRect();
-
-	// Natural ratio of the image clicked to open the lightbox.
-	const naturalRatio = naturalWidth / naturalHeight;
-	// Original ratio of the image clicked to open the lightbox.
-	let originalRatio = originalWidth / originalHeight;
-
-	// If it has object-fit: contain, recalculate the original sizes
-	// and the screen position without the blank spaces.
-	if ( ctx.scaleAttr === 'contain' ) {
-		if ( naturalRatio > originalRatio ) {
-			const heightWithoutSpace = originalWidth / naturalRatio;
-			// Recalculate screen position without the top space.
-			screenPosY += ( originalHeight - heightWithoutSpace ) / 2;
-			originalHeight = heightWithoutSpace;
-		} else {
-			const widthWithoutSpace = originalHeight * naturalRatio;
-			// Recalculate screen position without the left space.
-			screenPosX += ( originalWidth - widthWithoutSpace ) / 2;
-			originalWidth = widthWithoutSpace;
-		}
-	}
-	originalRatio = originalWidth / originalHeight;
-
-	// Typically, we use the image's full-sized dimensions. If those
-	// dimensions have not been set (i.e. an external image with only one size),
-	// the image's dimensions in the lightbox are the same
-	// as those of the image in the content.
-	let imgMaxWidth = parseFloat(
-		ctx.targetWidth !== 'none' ? ctx.targetWidth : naturalWidth
-	);
-	let imgMaxHeight = parseFloat(
-		ctx.targetHeight !== 'none' ? ctx.targetHeight : naturalHeight
-	);
-
-	// Ratio of the biggest image stored in the database.
-	let imgRatio = imgMaxWidth / imgMaxHeight;
-	let containerMaxWidth = imgMaxWidth;
-	let containerMaxHeight = imgMaxHeight;
-	let containerWidth = imgMaxWidth;
-	let containerHeight = imgMaxHeight;
-	// Check if the target image has a different ratio than the original one (thumbnail).
-	// Recalculate the width and height.
-	if ( naturalRatio.toFixed( 2 ) !== imgRatio.toFixed( 2 ) ) {
-		if ( naturalRatio > imgRatio ) {
-			// If the width is reached before the height, we keep the maxWidth
-			// and recalculate the height.
-			// Unless the difference between the maxHeight and the reducedHeight
-			// is higher than the maxWidth, where we keep the reducedHeight and
-			// recalculate the width.
-			const reducedHeight = imgMaxWidth / naturalRatio;
-			if ( imgMaxHeight - reducedHeight > imgMaxWidth ) {
-				imgMaxHeight = reducedHeight;
-				imgMaxWidth = reducedHeight * naturalRatio;
-			} else {
-				imgMaxHeight = imgMaxWidth / naturalRatio;
-			}
-		} else {
-			// If the height is reached before the width, we keep the maxHeight
-			// and recalculate the width.
-			// Unless the difference between the maxWidth and the reducedWidth
-			// is higher than the maxHeight, where we keep the reducedWidth and
-			// recalculate the height.
-			const reducedWidth = imgMaxHeight * naturalRatio;
-			if ( imgMaxWidth - reducedWidth > imgMaxHeight ) {
-				imgMaxWidth = reducedWidth;
-				imgMaxHeight = reducedWidth / naturalRatio;
-			} else {
-				imgMaxWidth = imgMaxHeight * naturalRatio;
-			}
-		}
-		containerWidth = imgMaxWidth;
-		containerHeight = imgMaxHeight;
-		imgRatio = imgMaxWidth / imgMaxHeight;
-
-		// Calculate the max size of the container.
-		if ( originalRatio > imgRatio ) {
-			containerMaxWidth = imgMaxWidth;
-			containerMaxHeight = containerMaxWidth / originalRatio;
-		} else {
-			containerMaxHeight = imgMaxHeight;
-			containerMaxWidth = containerMaxHeight * originalRatio;
-		}
-	}
-
-	// If the image has been pixelated on purpose, keep that size.
-	if ( originalWidth > containerWidth || originalHeight > containerHeight ) {
-		containerWidth = originalWidth;
-		containerHeight = originalHeight;
-	}
-
-	// Calculate the final lightbox image size and the
-	// scale factor. MaxWidth is either the window container
-	// (accounting for padding) or the image resolution.
-	let horizontalPadding = 0;
-	if ( window.innerWidth > 480 ) {
-		horizontalPadding = 80;
-	} else if ( window.innerWidth > 1920 ) {
-		horizontalPadding = 160;
-	}
-	const verticalPadding = 80;
-
-	const targetMaxWidth = Math.min(
-		window.innerWidth - horizontalPadding,
-		containerWidth
-	);
-	const targetMaxHeight = Math.min(
-		window.innerHeight - verticalPadding,
-		containerHeight
-	);
-	const targetContainerRatio = targetMaxWidth / targetMaxHeight;
-
-	if ( originalRatio > targetContainerRatio ) {
-		// If targetMaxWidth is reached before targetMaxHeight
-		containerWidth = targetMaxWidth;
-		containerHeight = containerWidth / originalRatio;
-	} else {
-		// If targetMaxHeight is reached before targetMaxWidth
-		containerHeight = targetMaxHeight;
-		containerWidth = containerHeight * originalRatio;
-	}
-
-	const containerScale = originalWidth / containerWidth;
-	const lightboxImgWidth =
-		imgMaxWidth * ( containerWidth / containerMaxWidth );
-	const lightboxImgHeight =
-		imgMaxHeight * ( containerHeight / containerMaxHeight );
-
-	// Add the CSS variables needed.
-	let styleTag = document.getElementById( 'wp-lightbox-styles' );
-	if ( ! styleTag ) {
-		styleTag = document.createElement( 'style' );
-		styleTag.id = 'wp-lightbox-styles';
-		document.head.appendChild( styleTag );
-	}
-
-	// As of this writing, using the calculations above will render the lightbox
-	// with a small, erroneous whitespace on the left side of the image in iOS Safari,
-	// perhaps due to an inconsistency in how browsers handle absolute positioning and CSS
-	// transformation. In any case, adding 1 pixel to the container width and height solves
-	// the problem, though this can be removed if the issue is fixed in the future.
-	styleTag.innerHTML = `
-		:root {
-			--wp--lightbox-initial-top-position: ${ screenPosY }px;
-			--wp--lightbox-initial-left-position: ${ screenPosX }px;
-			--wp--lightbox-container-width: ${ containerWidth + 1 }px;
-			--wp--lightbox-container-height: ${ containerHeight + 1 }px;
-			--wp--lightbox-image-width: ${ lightboxImgWidth }px;
-			--wp--lightbox-image-height: ${ lightboxImgHeight }px;
-			--wp--lightbox-scale: ${ containerScale };
-			--wp--lightbox-scrollbar-width: ${
-				window.innerWidth - document.documentElement.clientWidth
-			}px;
-		}
-	`;
-}
-
-/**
- * Debounces a function call.
- *
- * @function
- * @param {Function} func - A function to be called
- * @param {number}   wait - The time to wait before calling the function
- */
-function debounce( func, wait = 50 ) {
-	let timeout;
-	return () => {
-		const later = () => {
-			timeout = null;
-			func();
-		};
-		clearTimeout( timeout );
-		timeout = setTimeout( later, wait );
-	};
-}
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index e2e0fd9e414ef3..56365c87a268fd 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -314,19 +314,21 @@ export const registerCoreBlocks = (
  * __experimentalRegisterExperimentalCoreBlocks( settings );
  * ```
  */
-export const __experimentalRegisterExperimentalCoreBlocks = process.env
-	.IS_GUTENBERG_PLUGIN
-	? ( { enableFSEBlocks } = {} ) => {
-			const enabledExperiments = [ enableFSEBlocks ? 'fse' : null ];
-			getAllBlocks()
-				.filter( ( { metadata } ) =>
-					isBlockMetadataExperimental( metadata )
-				)
-				.filter(
-					( { metadata: { __experimental } } ) =>
-						__experimental === true ||
-						enabledExperiments.includes( __experimental )
-				)
-				.forEach( ( { init } ) => init() );
-	  }
-	: undefined;
+export const __experimentalRegisterExperimentalCoreBlocks =
+	globalThis.IS_GUTENBERG_PLUGIN
+		? ( { enableFSEBlocks } = {} ) => {
+				const enabledExperiments = [ enableFSEBlocks ? 'fse' : null ];
+				getAllBlocks()
+					.filter( ( { metadata } ) =>
+						isBlockMetadataExperimental( metadata )
+					)
+					.filter(
+						( { metadata: { __experimental } } ) =>
+							__experimental === true ||
+							enabledExperiments.includes( __experimental )
+					)
+					.forEach( ( { init } ) => init() );
+		  }
+		: undefined;
+
+export { privateApis } from './private-apis';
diff --git a/packages/block-library/src/latest-comments/block.json b/packages/block-library/src/latest-comments/block.json
index 0b213e9b7903a4..543512ddf3ce7c 100644
--- a/packages/block-library/src/latest-comments/block.json
+++ b/packages/block-library/src/latest-comments/block.json
@@ -29,6 +29,15 @@
 	},
 	"supports": {
 		"align": true,
+		"color": {
+			"gradients": true,
+			"link": true,
+			"__experimentalDefaultControls": {
+				"background": true,
+				"text": true,
+				"link": true
+			}
+		},
 		"html": false,
 		"spacing": {
 			"margin": true,
@@ -46,6 +55,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-latest-comments-editor",
diff --git a/packages/block-library/src/latest-comments/index.php b/packages/block-library/src/latest-comments/index.php
index 830e22ac339c07..5b6023cc46e58f 100644
--- a/packages/block-library/src/latest-comments/index.php
+++ b/packages/block-library/src/latest-comments/index.php
@@ -36,6 +36,8 @@ function wp_latest_comments_draft_or_post_title( $post = 0 ) {
 /**
  * Renders the `core/latest-comments` block on server.
  *
+ * @since 5.1.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string Returns the post content with latest comments added.
@@ -145,6 +147,8 @@ function render_block_core_latest_comments( $attributes = array() ) {
 
 /**
  * Registers the `core/latest-comments` block.
+ *
+ * @since 5.3.0
  */
 function register_block_core_latest_comments() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/latest-posts/block.json b/packages/block-library/src/latest-posts/block.json
index f36164614dd506..bb8c2d24962f3f 100644
--- a/packages/block-library/src/latest-posts/block.json
+++ b/packages/block-library/src/latest-posts/block.json
@@ -110,6 +110,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-latest-posts-editor",
diff --git a/packages/block-library/src/latest-posts/edit.js b/packages/block-library/src/latest-posts/edit.js
index 0efe538b01f629..7914f10be6bde8 100644
--- a/packages/block-library/src/latest-posts/edit.js
+++ b/packages/block-library/src/latest-posts/edit.js
@@ -1,13 +1,12 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import {
-	BaseControl,
 	PanelBody,
 	Placeholder,
 	QueryControls,
@@ -16,19 +15,28 @@ import {
 	Spinner,
 	ToggleControl,
 	ToolbarGroup,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
 } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
+import { __, _x, sprintf } from '@wordpress/i18n';
 import { dateI18n, format, getSettings } from '@wordpress/date';
 import {
 	InspectorControls,
-	BlockAlignmentToolbar,
 	BlockControls,
 	__experimentalImageSizeControl as ImageSizeControl,
 	useBlockProps,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { useSelect, useDispatch } from '@wordpress/data';
-import { pin, list, grid } from '@wordpress/icons';
+import {
+	pin,
+	list,
+	grid,
+	alignNone,
+	positionLeft,
+	positionCenter,
+	positionRight,
+} from '@wordpress/icons';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as noticeStore } from '@wordpress/notices';
 import { useInstanceId } from '@wordpress/compose';
@@ -147,15 +155,11 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 	);
 
 	// If a user clicks to a link prevent redirection and show a warning.
-	const { createWarningNotice, removeNotice } = useDispatch( noticeStore );
-	let noticeId;
+	const { createWarningNotice } = useDispatch( noticeStore );
 	const showRedirectionPreventedNotice = ( event ) => {
 		event.preventDefault();
-		// Remove previous warning if any, to show one at a time per block.
-		removeNotice( noticeId );
-		noticeId = `block-library/core/latest-posts/redirection-prevented/${ instanceId }`;
 		createWarningNotice( __( 'Links are disabled in the editor.' ), {
-			id: noticeId,
+			id: `block-library/core/latest-posts/redirection-prevented/${ instanceId }`,
 			type: 'snackbar',
 		} );
 	};
@@ -197,11 +201,35 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 		setAttributes( { categories: allCategories } );
 	};
 
+	const imageAlignmentOptions = [
+		{
+			value: 'none',
+			icon: alignNone,
+			label: __( 'None' ),
+		},
+		{
+			value: 'left',
+			icon: positionLeft,
+			label: __( 'Left' ),
+		},
+		{
+			value: 'center',
+			icon: positionCenter,
+			label: __( 'Center' ),
+		},
+		{
+			value: 'right',
+			icon: positionRight,
+			label: __( 'Right' ),
+		},
+	];
+
 	const hasPosts = !! latestPosts?.length;
 	const inspectorControls = (
 		<InspectorControls>
 			<PanelBody title={ __( 'Post content' ) }>
 				<ToggleControl
+					__nextHasNoMarginBottom
 					label={ __( 'Post content' ) }
 					checked={ displayPostContent }
 					onChange={ ( value ) =>
@@ -210,7 +238,8 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 				/>
 				{ displayPostContent && (
 					<RadioControl
-						label={ __( 'Show:' ) }
+						className="wp-block-latest-posts__post-content-radio"
+						label={ __( 'Show' ) }
 						selected={ displayPostContentRadio }
 						options={ [
 							{ label: __( 'Excerpt' ), value: 'excerpt' },
@@ -302,21 +331,32 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 								} )
 							}
 						/>
-						<BaseControl className="editor-latest-posts-image-alignment-control">
-							<BaseControl.VisualLabel>
-								{ __( 'Image alignment' ) }
-							</BaseControl.VisualLabel>
-							<BlockAlignmentToolbar
-								value={ featuredImageAlign }
-								onChange={ ( value ) =>
-									setAttributes( {
-										featuredImageAlign: value,
-									} )
+						<ToggleGroupControl
+							className="editor-latest-posts-image-alignment-control"
+							__nextHasNoMarginBottom
+							__next40pxDefaultSize
+							label={ __( 'Image alignment' ) }
+							value={ featuredImageAlign || 'none' }
+							onChange={ ( value ) =>
+								setAttributes( {
+									featuredImageAlign:
+										value !== 'none' ? value : undefined,
+								} )
+							}
+						>
+							{ imageAlignmentOptions.map(
+								( { value, icon, label } ) => {
+									return (
+										<ToggleGroupControlOptionIcon
+											key={ value }
+											value={ value }
+											icon={ icon }
+											label={ label }
+										/>
+									);
 								}
-								controls={ [ 'left', 'center', 'right' ] }
-								isCollapsed={ false }
-							/>
-						</BaseControl>
+							) }
+						</ToggleGroupControl>
 						<ToggleControl
 							__nextHasNoMarginBottom
 							label={ __( 'Add link to featured image' ) }
@@ -383,7 +423,7 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 	);
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			'wp-block-latest-posts__list': true,
 			'is-grid': postLayout === 'grid',
 			'has-dates': displayPostDate,
@@ -416,13 +456,13 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 	const layoutControls = [
 		{
 			icon: list,
-			title: __( 'List view' ),
+			title: _x( 'List view', 'Latest posts block display setting' ),
 			onClick: () => setAttributes( { postLayout: 'list' } ),
 			isActive: postLayout === 'list',
 		},
 		{
 			icon: grid,
-			title: __( 'Grid view' ),
+			title: _x( 'Grid view', 'Latest posts block display setting' ),
 			onClick: () => setAttributes( { postLayout: 'grid' } ),
 			isActive: postLayout === 'grid',
 		},
@@ -431,7 +471,7 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 	const dateFormat = getSettings().formats.date;
 
 	return (
-		<div>
+		<>
 			{ inspectorControls }
 			<BlockControls>
 				<ToolbarGroup controls={ layoutControls } />
@@ -454,7 +494,7 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 
 					const { url: imageSourceUrl, alt: featuredImageAlt } =
 						getFeaturedImageDetails( post, featuredImageSizeSlug );
-					const imageClasses = classnames( {
+					const imageClasses = clsx( {
 						'wp-block-latest-posts__featured-image': true,
 						[ `align${ featuredImageAlign }` ]:
 							!! featuredImageAlign,
@@ -518,7 +558,6 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 								<div className={ imageClasses }>
 									{ addLinkToFeaturedImage ? (
 										<a
-											className="wp-block-latest-posts__post-title"
 											href={ post.link }
 											rel="noreferrer noopener"
 											onClick={
@@ -533,6 +572,7 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 								</div>
 							) }
 							<a
+								className="wp-block-latest-posts__post-title"
 								href={ post.link }
 								rel="noreferrer noopener"
 								dangerouslySetInnerHTML={
@@ -582,6 +622,6 @@ export default function LatestPostsEdit( { attributes, setAttributes } ) {
 					);
 				} ) }
 			</ul>
-		</div>
+		</>
 	);
 }
diff --git a/packages/block-library/src/latest-posts/edit.native.js b/packages/block-library/src/latest-posts/edit.native.js
index c860cadc6b2144..632efa149313f6 100644
--- a/packages/block-library/src/latest-posts/edit.native.js
+++ b/packages/block-library/src/latest-posts/edit.native.js
@@ -201,13 +201,13 @@ class LatestPostsEdit extends Component {
 								value={ featuredImageAlign }
 								onChange={ this.onSetFeaturedImageAlign }
 								controls={ [ 'left', 'center', 'right' ] }
-								isBottomSheetControl={ true }
+								isBottomSheetControl
 							/>
 							<ToggleControl
 								label={ __( 'Add link to featured image' ) }
 								checked={ addLinkToFeaturedImage }
 								onChange={ this.onSetAddLinkToFeaturedImage }
-								separatorType={ 'topFullWidth' }
+								separatorType="topFullWidth"
 							/>
 						</>
 					) }
diff --git a/packages/block-library/src/latest-posts/editor.scss b/packages/block-library/src/latest-posts/editor.scss
index 3c2d6a30f1c077..aaab74cc0ef2d6 100644
--- a/packages/block-library/src/latest-posts/editor.scss
+++ b/packages/block-library/src/latest-posts/editor.scss
@@ -1,9 +1,4 @@
 .wp-block-latest-posts {
-	padding-left: 2.5em;
-	&.is-grid {
-		padding-left: 0;
-	}
-
 	// Apply overflow for post items, so any floated featured images won't crop the focus style.
 	> li {
 		overflow: hidden;
@@ -14,16 +9,23 @@
 	display: inline;
 }
 
-.edit-post-visual-editor .wp-block-latest-posts.is-grid li {
-	margin-bottom: 20px;
+:root :where(.wp-block-latest-posts) {
+	padding-left: 2.5em;
 }
-
-.editor-latest-posts-image-alignment-control {
-	.components-base-control__label {
-		display: block;
+:root {
+	:where(.wp-block-latest-posts.is-grid),
+	:where(.wp-block-latest-posts__list) {
+		padding-left: 0;
 	}
+}
+
+// Apply the same styles that would be applied to
+// ".block-editor-block-inspector .components-base-control"
+// (see packages/block-editor/src/components/block-inspector/style.scss)
+.wp-block-latest-posts__post-content-radio {
+	margin-bottom: #{ $grid-unit-30 };
 
-	.components-toolbar {
-		border-radius: $radius-block-ui;
+	&:last-child {
+		margin-bottom: $grid-unit-10;
 	}
 }
diff --git a/packages/block-library/src/latest-posts/index.php b/packages/block-library/src/latest-posts/index.php
index adc51d0c4fecb9..85c7b58737a1cf 100644
--- a/packages/block-library/src/latest-posts/index.php
+++ b/packages/block-library/src/latest-posts/index.php
@@ -18,6 +18,8 @@
  * Callback for the excerpt_length filter used by
  * the Latest Posts block at render time.
  *
+ * @since 5.4.0
+ *
  * @return int Returns the global $block_core_latest_posts_excerpt_length variable
  *             to allow the excerpt_length filter respect the Latest Block setting.
  */
@@ -29,6 +31,8 @@ function block_core_latest_posts_get_excerpt_length() {
 /**
  * Renders the `core/latest-posts` block on server.
  *
+ * @since 5.0.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string Returns the post content with latest posts added.
@@ -148,12 +152,13 @@ function render_block_core_latest_posts( $attributes ) {
 			 * [&hellip;] is the default excerpt ending from wp_trim_excerpt() in Core.
 			 */
 			if ( str_ends_with( $trimmed_excerpt, ' [&hellip;]' ) ) {
+				/** This filter is documented in wp-includes/formatting.php */
 				$excerpt_length = (int) apply_filters( 'excerpt_length', $block_core_latest_posts_excerpt_length );
 				if ( $excerpt_length <= $block_core_latest_posts_excerpt_length ) {
 					$trimmed_excerpt  = substr( $trimmed_excerpt, 0, -11 );
 					$trimmed_excerpt .= sprintf(
 						/* translators: 1: A URL to a post, 2: Hidden accessibility text: Post title */
-						__( '… <a href="%1$s" rel="noopener noreferrer">Read more<span class="screen-reader-text">: %2$s</span></a>' ),
+						__( '… <a class="wp-block-latest-posts__read-more" href="%1$s" rel="noopener noreferrer">Read more<span class="screen-reader-text">: %2$s</span></a>' ),
 						esc_url( $post_link ),
 						esc_html( $title )
 					);
@@ -218,6 +223,8 @@ function render_block_core_latest_posts( $attributes ) {
 
 /**
  * Registers the `core/latest-posts` block on server.
+ *
+ * @since 5.0.0
  */
 function register_block_core_latest_posts() {
 	register_block_type_from_metadata(
@@ -241,6 +248,8 @@ function register_block_core_latest_posts() {
  * TODO: Remove when and if the bottom client-side deprecation for this block
  * is removed.
  *
+ * @since 5.5.0
+ *
  * @param array $block A single parsed block object.
  *
  * @return array The migrated block object.
diff --git a/packages/block-library/src/latest-posts/style.scss b/packages/block-library/src/latest-posts/style.scss
index 17d92a4ad91b92..2a01d177ef47c4 100644
--- a/packages/block-library/src/latest-posts/style.scss
+++ b/packages/block-library/src/latest-posts/style.scss
@@ -12,17 +12,16 @@
 	}
 	&.wp-block-latest-posts__list {
 		list-style: none;
-		padding-left: 0;
 
 		li {
 			clear: both;
+			overflow-wrap: break-word;
 		}
 	}
 
 	&.is-grid {
 		display: flex;
 		flex-wrap: wrap;
-		padding: 0;
 
 		li {
 			margin: 0 1.25em 1.25em 0;
@@ -33,9 +32,9 @@
 	@include break-small {
 		@for $i from 2 through 6 {
 			&.columns-#{ $i } li {
-				width: calc((100% / #{ $i }) - 1.25em + (1.25em / #{ $i }));
+				width: calc((100% / #{$i}) - 1.25em + (1.25em / #{$i}));
 
-				&:nth-child( #{ $i }n ) {
+				&:nth-child(#{ $i }n) {
 					margin-right: 0;
 				}
 			}
@@ -43,6 +42,15 @@
 	}
 }
 
+:root {
+	:where(.wp-block-latest-posts.is-grid) {
+		padding: 0;
+	}
+	:where(.wp-block-latest-posts.wp-block-latest-posts__list) {
+		padding-left: 0;
+	}
+}
+
 .wp-block-latest-posts__post-date,
 .wp-block-latest-posts__post-author {
 	display: block;
diff --git a/packages/block-library/src/list-item/block.json b/packages/block-library/src/list-item/block.json
index 07797be8623a51..6eb30cfe6d0af0 100644
--- a/packages/block-library/src/list-item/block.json
+++ b/packages/block-library/src/list-item/block.json
@@ -5,23 +5,38 @@
 	"title": "List item",
 	"category": "text",
 	"parent": [ "core/list" ],
-	"description": "Create a list item.",
+	"allowedBlocks": [ "core/list" ],
+	"description": "An individual item within a list.",
 	"textdomain": "default",
 	"attributes": {
 		"placeholder": {
 			"type": "string"
 		},
 		"content": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "li",
-			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		}
 	},
 	"supports": {
+		"anchor": true,
 		"className": false,
-		"__experimentalSelector": "li",
+		"splitting": true,
+		"__experimentalBorder": {
+			"color": true,
+			"radius": true,
+			"style": true,
+			"width": true
+		},
+		"color": {
+			"gradients": true,
+			"link": true,
+			"background": true,
+			"__experimentalDefaultControls": {
+				"text": true
+			}
+		},
 		"spacing": {
 			"margin": true,
 			"padding": true,
@@ -42,6 +57,13 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
+	},
+	"selectors": {
+		"root": ".wp-block-list > li",
+		"border": ".wp-block-list:not(.wp-block-list .wp-block-list) > li"
 	}
 }
diff --git a/packages/block-library/src/list-item/edit.js b/packages/block-library/src/list-item/edit.js
index 3f26840ad345f9..8c5fa7bdc7bf6a 100644
--- a/packages/block-library/src/list-item/edit.js
+++ b/packages/block-library/src/list-item/edit.js
@@ -6,6 +6,7 @@ import {
 	useBlockProps,
 	useInnerBlocksProps,
 	BlockControls,
+	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { isRTL, __ } from '@wordpress/i18n';
 import { ToolbarButton } from '@wordpress/components';
@@ -16,6 +17,7 @@ import {
 	formatIndent,
 } from '@wordpress/icons';
 import { useMergeRefs } from '@wordpress/compose';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -25,30 +27,41 @@ import {
 	useSpace,
 	useIndentListItem,
 	useOutdentListItem,
-	useSplit,
 	useMerge,
-	useCopy,
 } from './hooks';
-import { convertToListItems } from './utils';
 
 export function IndentUI( { clientId } ) {
-	const [ canIndent, indentListItem ] = useIndentListItem( clientId );
-	const [ canOutdent, outdentListItem ] = useOutdentListItem( clientId );
+	const indentListItem = useIndentListItem( clientId );
+	const outdentListItem = useOutdentListItem();
+	const { canIndent, canOutdent } = useSelect(
+		( select ) => {
+			const { getBlockIndex, getBlockRootClientId, getBlockName } =
+				select( blockEditorStore );
+			return {
+				canIndent: getBlockIndex( clientId ) > 0,
+				canOutdent:
+					getBlockName(
+						getBlockRootClientId( getBlockRootClientId( clientId ) )
+					) === 'core/list-item',
+			};
+		},
+		[ clientId ]
+	);
 
 	return (
 		<>
 			<ToolbarButton
 				icon={ isRTL() ? formatOutdentRTL : formatOutdent }
 				title={ __( 'Outdent' ) }
-				describedBy={ __( 'Outdent list item' ) }
+				description={ __( 'Outdent list item' ) }
 				disabled={ ! canOutdent }
 				onClick={ () => outdentListItem() }
 			/>
 			<ToolbarButton
 				icon={ isRTL() ? formatIndentRTL : formatIndent }
 				title={ __( 'Indent' ) }
-				describedBy={ __( 'Indent list item' ) }
-				isDisabled={ ! canIndent }
+				description={ __( 'Indent list item' ) }
+				disabled={ ! canIndent }
 				onClick={ () => indentListItem() }
 			/>
 		</>
@@ -58,20 +71,17 @@ export function IndentUI( { clientId } ) {
 export default function ListItemEdit( {
 	attributes,
 	setAttributes,
-	onReplace,
 	clientId,
 	mergeBlocks,
 } ) {
 	const { placeholder, content } = attributes;
-	const blockProps = useBlockProps( { ref: useCopy( clientId ) } );
+	const blockProps = useBlockProps();
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: [ 'core/list' ],
 		renderAppender: false,
 		__unstableDisableDropZone: true,
 	} );
 	const useEnterRef = useEnter( { content, clientId } );
 	const useSpaceRef = useSpace( clientId );
-	const onSplit = useSplit( clientId );
 	const onMerge = useMerge( clientId, mergeBlocks );
 	return (
 		<>
@@ -86,18 +96,7 @@ export default function ListItemEdit( {
 					value={ content }
 					aria-label={ __( 'List text' ) }
 					placeholder={ placeholder || __( 'List' ) }
-					onSplit={ onSplit }
 					onMerge={ onMerge }
-					onReplace={
-						onReplace
-							? ( blocks, ...args ) => {
-									onReplace(
-										convertToListItems( blocks ),
-										...args
-									);
-							  }
-							: undefined
-					}
 				/>
 				{ innerBlocksProps.children }
 			</li>
diff --git a/packages/block-library/src/list-item/edit.native.js b/packages/block-library/src/list-item/edit.native.js
index cf2e77c08d2e83..2367529242ded1 100644
--- a/packages/block-library/src/list-item/edit.native.js
+++ b/packages/block-library/src/list-item/edit.native.js
@@ -21,8 +21,7 @@ import { useState, useCallback, useRef } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { useSplit, useMerge, useEnter } from './hooks';
-import { convertToListItems } from './utils';
+import { useMerge, useEnter } from './hooks';
 import { IndentUI } from './edit.js';
 import styles from './style.scss';
 import ListStyleType from './list-style-type';
@@ -32,7 +31,6 @@ const OPACITY = '9e';
 export default function ListItemEdit( {
 	attributes,
 	setAttributes,
-	onReplace,
 	clientId,
 	style,
 	mergeBlocks,
@@ -90,7 +88,6 @@ export default function ListItemEdit( {
 	} );
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: [ 'core/list' ],
 		renderAppender: false,
 	} );
 
@@ -119,24 +116,7 @@ export default function ListItemEdit( {
 
 	const preventDefault = useRef( false );
 	const { onEnter } = useEnter( { content, clientId }, preventDefault );
-	const onSplit = useSplit( clientId );
 	const onMerge = useMerge( clientId, mergeBlocks );
-	const onSplitList = useCallback(
-		( value ) => {
-			if ( ! preventDefault.current ) {
-				return onSplit( value );
-			}
-		},
-		[ clientId, onSplit ]
-	);
-	const onReplaceList = useCallback(
-		( blocks, ...args ) => {
-			if ( ! preventDefault.current ) {
-				onReplace( convertToListItems( blocks ), ...args );
-			}
-		},
-		[ clientId, onReplace, convertToListItems ]
-	);
 	const onLayout = useCallback( ( { nativeEvent } ) => {
 		setContentWidth( ( prevState ) => {
 			const { width } = nativeEvent.layout;
@@ -167,6 +147,7 @@ export default function ListItemEdit( {
 					onLayout={ onLayout }
 				>
 					<RichText
+						__unstableUseSplitSelection
 						identifier="content"
 						tagName="p"
 						onChange={ ( nextContent ) =>
@@ -177,12 +158,10 @@ export default function ListItemEdit( {
 						placeholderTextColor={
 							defaultPlaceholderTextColorWithOpacity
 						}
-						onSplit={ onSplitList }
 						onMerge={ onMerge }
-						onReplace={ onReplaceList }
 						onEnter={ onEnter }
 						style={ styleWithPlaceholderOpacity }
-						deleteEnter={ true }
+						deleteEnter
 						containerWidth={ contentWidth }
 					/>
 				</View>
diff --git a/packages/block-library/src/list-item/hooks/index.js b/packages/block-library/src/list-item/hooks/index.js
index 3bbc3167abed32..6220f92851a327 100644
--- a/packages/block-library/src/list-item/hooks/index.js
+++ b/packages/block-library/src/list-item/hooks/index.js
@@ -2,6 +2,4 @@ export { default as useOutdentListItem } from './use-outdent-list-item';
 export { default as useIndentListItem } from './use-indent-list-item';
 export { default as useEnter } from './use-enter';
 export { default as useSpace } from './use-space';
-export { default as useSplit } from './use-split';
 export { default as useMerge } from './use-merge';
-export { default as useCopy } from './use-copy';
diff --git a/packages/block-library/src/list-item/hooks/use-copy.js b/packages/block-library/src/list-item/hooks/use-copy.js
deleted file mode 100644
index 7a76019ad11a4b..00000000000000
--- a/packages/block-library/src/list-item/hooks/use-copy.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRefEffect } from '@wordpress/compose';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { useSelect } from '@wordpress/data';
-
-export default function useCopy( clientId ) {
-	const { getBlockRootClientId, getBlockName, getBlockAttributes } =
-		useSelect( blockEditorStore );
-
-	return useRefEffect( ( node ) => {
-		function onCopy( event ) {
-			// The event propagates through all nested lists, so don't override
-			// when copying nested list items.
-			if ( event.clipboardData.getData( '__unstableWrapperBlockName' ) ) {
-				return;
-			}
-
-			const rootClientId = getBlockRootClientId( clientId );
-			event.clipboardData.setData(
-				'__unstableWrapperBlockName',
-				getBlockName( rootClientId )
-			);
-			event.clipboardData.setData(
-				'__unstableWrapperBlockAttributes',
-				JSON.stringify( getBlockAttributes( rootClientId ) )
-			);
-		}
-
-		node.addEventListener( 'copy', onCopy );
-		node.addEventListener( 'cut', onCopy );
-		return () => {
-			node.removeEventListener( 'copy', onCopy );
-			node.removeEventListener( 'cut', onCopy );
-		};
-	}, [] );
-}
diff --git a/packages/block-library/src/list-item/hooks/use-enter.js b/packages/block-library/src/list-item/hooks/use-enter.js
index 46fdc65cecdd7b..ffe5c55fbbed2e 100644
--- a/packages/block-library/src/list-item/hooks/use-enter.js
+++ b/packages/block-library/src/list-item/hooks/use-enter.js
@@ -19,71 +19,72 @@ import useOutdentListItem from './use-outdent-list-item';
 
 export default function useEnter( props ) {
 	const { replaceBlocks, selectionChange } = useDispatch( blockEditorStore );
-	const { getBlock, getBlockRootClientId, getBlockIndex } =
+	const { getBlock, getBlockRootClientId, getBlockIndex, getBlockName } =
 		useSelect( blockEditorStore );
 	const propsRef = useRef( props );
 	propsRef.current = props;
-	const [ canOutdent, outdentListItem ] = useOutdentListItem(
-		propsRef.current.clientId
-	);
-	return useRefEffect(
-		( element ) => {
-			function onKeyDown( event ) {
-				if ( event.defaultPrevented || event.keyCode !== ENTER ) {
-					return;
-				}
-				const { content, clientId } = propsRef.current;
-				if ( content.length ) {
-					return;
-				}
-				event.preventDefault();
-				if ( canOutdent ) {
-					outdentListItem();
-					return;
-				}
-				// Here we are in top level list so we need to split.
-				const topParentListBlock = getBlock(
-					getBlockRootClientId( clientId )
-				);
-				const blockIndex = getBlockIndex( clientId );
-				const head = cloneBlock( {
-					...topParentListBlock,
-					innerBlocks: topParentListBlock.innerBlocks.slice(
-						0,
-						blockIndex
-					),
-				} );
-				const middle = createBlock( getDefaultBlockName() );
-				// Last list item might contain a `list` block innerBlock
-				// In that case append remaining innerBlocks blocks.
-				const after = [
-					...( topParentListBlock.innerBlocks[ blockIndex ]
-						.innerBlocks[ 0 ]?.innerBlocks || [] ),
-					...topParentListBlock.innerBlocks.slice( blockIndex + 1 ),
-				];
-				const tail = after.length
-					? [
-							cloneBlock( {
-								...topParentListBlock,
-								innerBlocks: after,
-							} ),
-					  ]
-					: [];
-				replaceBlocks(
-					topParentListBlock.clientId,
-					[ head, middle, ...tail ],
-					1
-				);
-				// We manually change the selection here because we are replacing
-				// a different block than the selected one.
-				selectionChange( middle.clientId );
+	const outdentListItem = useOutdentListItem();
+	return useRefEffect( ( element ) => {
+		function onKeyDown( event ) {
+			if ( event.defaultPrevented || event.keyCode !== ENTER ) {
+				return;
 			}
+			const { content, clientId } = propsRef.current;
+			if ( content.length ) {
+				return;
+			}
+			event.preventDefault();
+			const canOutdent =
+				getBlockName(
+					getBlockRootClientId(
+						getBlockRootClientId( propsRef.current.clientId )
+					)
+				) === 'core/list-item';
+			if ( canOutdent ) {
+				outdentListItem();
+				return;
+			}
+			// Here we are in top level list so we need to split.
+			const topParentListBlock = getBlock(
+				getBlockRootClientId( clientId )
+			);
+			const blockIndex = getBlockIndex( clientId );
+			const head = cloneBlock( {
+				...topParentListBlock,
+				innerBlocks: topParentListBlock.innerBlocks.slice(
+					0,
+					blockIndex
+				),
+			} );
+			const middle = createBlock( getDefaultBlockName() );
+			// Last list item might contain a `list` block innerBlock
+			// In that case append remaining innerBlocks blocks.
+			const after = [
+				...( topParentListBlock.innerBlocks[ blockIndex ]
+					.innerBlocks[ 0 ]?.innerBlocks || [] ),
+				...topParentListBlock.innerBlocks.slice( blockIndex + 1 ),
+			];
+			const tail = after.length
+				? [
+						cloneBlock( {
+							...topParentListBlock,
+							innerBlocks: after,
+						} ),
+				  ]
+				: [];
+			replaceBlocks(
+				topParentListBlock.clientId,
+				[ head, middle, ...tail ],
+				1
+			);
+			// We manually change the selection here because we are replacing
+			// a different block than the selected one.
+			selectionChange( middle.clientId );
+		}
 
-			element.addEventListener( 'keydown', onKeyDown );
-			return () => {
-				element.removeEventListener( 'keydown', onKeyDown );
-			};
-		},
-		[ canOutdent ]
-	);
+		element.addEventListener( 'keydown', onKeyDown );
+		return () => {
+			element.removeEventListener( 'keydown', onKeyDown );
+		};
+	}, [] );
 }
diff --git a/packages/block-library/src/list-item/hooks/use-enter.native.js b/packages/block-library/src/list-item/hooks/use-enter.native.js
index d3be5f1ea0e1bb..596dd469d31326 100644
--- a/packages/block-library/src/list-item/hooks/use-enter.native.js
+++ b/packages/block-library/src/list-item/hooks/use-enter.native.js
@@ -17,13 +17,11 @@ import useOutdentListItem from './use-outdent-list-item';
 
 export default function useEnter( props, preventDefault ) {
 	const { replaceBlocks, selectionChange } = useDispatch( blockEditorStore );
-	const { getBlock, getBlockRootClientId, getBlockIndex } =
+	const { getBlock, getBlockRootClientId, getBlockIndex, getBlockName } =
 		useSelect( blockEditorStore );
 	const propsRef = useRef( props );
 	propsRef.current = props;
-	const [ canOutdent, outdentListItem ] = useOutdentListItem(
-		propsRef.current.clientId
-	);
+	const outdentListItem = useOutdentListItem();
 
 	return {
 		onEnter() {
@@ -32,7 +30,13 @@ export default function useEnter( props, preventDefault ) {
 				return;
 			}
 			preventDefault.current = true;
-			if ( canOutdent ) {
+			if (
+				getBlockName(
+					getBlockRootClientId(
+						getBlockRootClientId( propsRef.current.clientId )
+					)
+				) === 'core/list-item'
+			) {
 				outdentListItem();
 				return;
 			}
diff --git a/packages/block-library/src/list-item/hooks/use-indent-list-item.js b/packages/block-library/src/list-item/hooks/use-indent-list-item.js
index b1fd8394be43ce..2cd62d201d61f1 100644
--- a/packages/block-library/src/list-item/hooks/use-indent-list-item.js
+++ b/packages/block-library/src/list-item/hooks/use-indent-list-item.js
@@ -7,10 +7,6 @@ import { store as blockEditorStore } from '@wordpress/block-editor';
 import { createBlock, cloneBlock } from '@wordpress/blocks';
 
 export default function useIndentListItem( clientId ) {
-	const canIndent = useSelect(
-		( select ) => select( blockEditorStore ).getBlockIndex( clientId ) > 0,
-		[ clientId ]
-	);
 	const { replaceBlocks, selectionChange, multiSelect } =
 		useDispatch( blockEditorStore );
 	const {
@@ -21,55 +17,51 @@ export default function useIndentListItem( clientId ) {
 		hasMultiSelection,
 		getMultiSelectedBlockClientIds,
 	} = useSelect( blockEditorStore );
-	return [
-		canIndent,
-		useCallback( () => {
-			const _hasMultiSelection = hasMultiSelection();
-			const clientIds = _hasMultiSelection
-				? getMultiSelectedBlockClientIds()
-				: [ clientId ];
-			const clonedBlocks = clientIds.map( ( _clientId ) =>
-				cloneBlock( getBlock( _clientId ) )
-			);
-			const previousSiblingId = getPreviousBlockClientId( clientId );
-			const newListItem = cloneBlock( getBlock( previousSiblingId ) );
-			// If the sibling has no innerBlocks, create a new `list` block.
-			if ( ! newListItem.innerBlocks?.length ) {
-				newListItem.innerBlocks = [ createBlock( 'core/list' ) ];
-			}
-			// A list item usually has one `list`, but it's possible to have
-			// more. So we need to preserve the previous `list` blocks and
-			// merge the new blocks to the last `list`.
-			newListItem.innerBlocks[
-				newListItem.innerBlocks.length - 1
-			].innerBlocks.push( ...clonedBlocks );
+	return useCallback( () => {
+		const _hasMultiSelection = hasMultiSelection();
+		const clientIds = _hasMultiSelection
+			? getMultiSelectedBlockClientIds()
+			: [ clientId ];
+		const clonedBlocks = clientIds.map( ( _clientId ) =>
+			cloneBlock( getBlock( _clientId ) )
+		);
+		const previousSiblingId = getPreviousBlockClientId( clientId );
+		const newListItem = cloneBlock( getBlock( previousSiblingId ) );
+		// If the sibling has no innerBlocks, create a new `list` block.
+		if ( ! newListItem.innerBlocks?.length ) {
+			newListItem.innerBlocks = [ createBlock( 'core/list' ) ];
+		}
+		// A list item usually has one `list`, but it's possible to have
+		// more. So we need to preserve the previous `list` blocks and
+		// merge the new blocks to the last `list`.
+		newListItem.innerBlocks[
+			newListItem.innerBlocks.length - 1
+		].innerBlocks.push( ...clonedBlocks );
 
-			// We get the selection start/end here, because when
-			// we replace blocks, the selection is updated too.
-			const selectionStart = getSelectionStart();
-			const selectionEnd = getSelectionEnd();
-			// Replace the previous sibling of the block being indented and the indented blocks,
-			// with a new block whose attributes are equal to the ones of the previous sibling and
-			// whose descendants are the children of the previous sibling, followed by the indented blocks.
-			replaceBlocks(
-				[ previousSiblingId, ...clientIds ],
-				[ newListItem ]
+		// We get the selection start/end here, because when
+		// we replace blocks, the selection is updated too.
+		const selectionStart = getSelectionStart();
+		const selectionEnd = getSelectionEnd();
+		// Replace the previous sibling of the block being indented and the indented blocks,
+		// with a new block whose attributes are equal to the ones of the previous sibling and
+		// whose descendants are the children of the previous sibling, followed by the indented blocks.
+		replaceBlocks( [ previousSiblingId, ...clientIds ], [ newListItem ] );
+		if ( ! _hasMultiSelection ) {
+			selectionChange(
+				clonedBlocks[ 0 ].clientId,
+				selectionEnd.attributeKey,
+				selectionEnd.clientId === selectionStart.clientId
+					? selectionStart.offset
+					: selectionEnd.offset,
+				selectionEnd.offset
+			);
+		} else {
+			multiSelect(
+				clonedBlocks[ 0 ].clientId,
+				clonedBlocks[ clonedBlocks.length - 1 ].clientId
 			);
-			if ( ! _hasMultiSelection ) {
-				selectionChange(
-					clonedBlocks[ 0 ].clientId,
-					selectionEnd.attributeKey,
-					selectionEnd.clientId === selectionStart.clientId
-						? selectionStart.offset
-						: selectionEnd.offset,
-					selectionEnd.offset
-				);
-			} else {
-				multiSelect(
-					clonedBlocks[ 0 ].clientId,
-					clonedBlocks[ clonedBlocks.length - 1 ].clientId
-				);
-			}
-		}, [ clientId ] ),
-	];
+		}
+
+		return true;
+	}, [ clientId ] );
 }
diff --git a/packages/block-library/src/list-item/hooks/use-merge.js b/packages/block-library/src/list-item/hooks/use-merge.js
index cda1f0c02d3a88..9ca4d5372ee6e8 100644
--- a/packages/block-library/src/list-item/hooks/use-merge.js
+++ b/packages/block-library/src/list-item/hooks/use-merge.js
@@ -20,7 +20,7 @@ export default function useMerge( clientId, onMerge ) {
 	} = useSelect( blockEditorStore );
 	const { mergeBlocks, moveBlocksToPosition } =
 		useDispatch( blockEditorStore );
-	const [ , outdentListItem ] = useOutdentListItem( clientId );
+	const outdentListItem = useOutdentListItem();
 
 	function getTrailingId( id ) {
 		const order = getBlockOrder( id );
@@ -35,8 +35,12 @@ export default function useMerge( clientId, onMerge ) {
 	function getParentListItemId( id ) {
 		const listId = getBlockRootClientId( id );
 		const parentListItemId = getBlockRootClientId( listId );
-		if ( ! parentListItemId ) return;
-		if ( getBlockName( parentListItemId ) !== 'core/list-item' ) return;
+		if ( ! parentListItemId ) {
+			return;
+		}
+		if ( getBlockName( parentListItemId ) !== 'core/list-item' ) {
+			return;
+		}
 		return parentListItemId;
 	}
 
@@ -49,9 +53,13 @@ export default function useMerge( clientId, onMerge ) {
 	 */
 	function _getNextId( id ) {
 		const next = getNextBlockClientId( id );
-		if ( next ) return next;
+		if ( next ) {
+			return next;
+		}
 		const parentListItemId = getParentListItemId( id );
-		if ( ! parentListItemId ) return;
+		if ( ! parentListItemId ) {
+			return;
+		}
 		return _getNextId( parentListItemId );
 	}
 
@@ -84,11 +92,25 @@ export default function useMerge( clientId, onMerge ) {
 				// list.
 				const [ nestedListClientId ] = getBlockOrder( clientIdB );
 				if ( nestedListClientId ) {
-					moveBlocksToPosition(
-						getBlockOrder( nestedListClientId ),
-						nestedListClientId,
-						getBlockRootClientId( clientIdA )
-					);
+					// If we are merging with the previous list item, and the
+					// previous list item does not have nested list, move the
+					// nested list to the previous list item.
+					if (
+						getPreviousBlockClientId( clientIdB ) === clientIdA &&
+						! getBlockOrder( clientIdA ).length
+					) {
+						moveBlocksToPosition(
+							[ nestedListClientId ],
+							clientIdB,
+							clientIdA
+						);
+					} else {
+						moveBlocksToPosition(
+							getBlockOrder( nestedListClientId ),
+							nestedListClientId,
+							getBlockRootClientId( clientIdA )
+						);
+					}
 				}
 				mergeBlocks( clientIdA, clientIdB );
 			} );
diff --git a/packages/block-library/src/list-item/hooks/use-outdent-list-item.js b/packages/block-library/src/list-item/hooks/use-outdent-list-item.js
index 14598dc7451cfa..48bccc8f2cd4c1 100644
--- a/packages/block-library/src/list-item/hooks/use-outdent-list-item.js
+++ b/packages/block-library/src/list-item/hooks/use-outdent-list-item.js
@@ -6,24 +6,8 @@ import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { cloneBlock } from '@wordpress/blocks';
 
-export default function useOutdentListItem( clientId ) {
+export default function useOutdentListItem() {
 	const registry = useRegistry();
-	const { canOutdent } = useSelect(
-		( innerSelect ) => {
-			const { getBlockRootClientId, getBlockName } =
-				innerSelect( blockEditorStore );
-			const grandParentId = getBlockRootClientId(
-				getBlockRootClientId( clientId )
-			);
-			const grandParentName = getBlockName( grandParentId );
-			const isListItem = grandParentName === 'core/list-item';
-
-			return {
-				canOutdent: isListItem,
-			};
-		},
-		[ clientId ]
-	);
 	const {
 		moveBlocksToPosition,
 		removeBlock,
@@ -43,74 +27,83 @@ export default function useOutdentListItem( clientId ) {
 	function getParentListItemId( id ) {
 		const listId = getBlockRootClientId( id );
 		const parentListItemId = getBlockRootClientId( listId );
-		if ( ! parentListItemId ) return;
-		if ( getBlockName( parentListItemId ) !== 'core/list-item' ) return;
+		if ( ! parentListItemId ) {
+			return;
+		}
+		if ( getBlockName( parentListItemId ) !== 'core/list-item' ) {
+			return;
+		}
 		return parentListItemId;
 	}
 
-	return [
-		canOutdent,
-		useCallback( ( clientIds = getSelectedBlockClientIds() ) => {
-			if ( ! Array.isArray( clientIds ) ) {
-				clientIds = [ clientIds ];
-			}
-
-			if ( ! clientIds.length ) return;
+	return useCallback( ( clientIds = getSelectedBlockClientIds() ) => {
+		if ( ! Array.isArray( clientIds ) ) {
+			clientIds = [ clientIds ];
+		}
 
-			const firstClientId = clientIds[ 0 ];
+		if ( ! clientIds.length ) {
+			return;
+		}
 
-			// Can't outdent if it's not a list item.
-			if ( getBlockName( firstClientId ) !== 'core/list-item' ) return;
+		const firstClientId = clientIds[ 0 ];
 
-			const parentListItemId = getParentListItemId( firstClientId );
+		// Can't outdent if it's not a list item.
+		if ( getBlockName( firstClientId ) !== 'core/list-item' ) {
+			return;
+		}
 
-			// Can't outdent if it's at the top level.
-			if ( ! parentListItemId ) return;
+		const parentListItemId = getParentListItemId( firstClientId );
 
-			const parentListId = getBlockRootClientId( firstClientId );
-			const lastClientId = clientIds[ clientIds.length - 1 ];
-			const order = getBlockOrder( parentListId );
-			const followingListItems = order.slice(
-				getBlockIndex( lastClientId ) + 1
-			);
+		// Can't outdent if it's at the top level.
+		if ( ! parentListItemId ) {
+			return;
+		}
 
-			registry.batch( () => {
-				if ( followingListItems.length ) {
-					let nestedListId = getBlockOrder( firstClientId )[ 0 ];
+		const parentListId = getBlockRootClientId( firstClientId );
+		const lastClientId = clientIds[ clientIds.length - 1 ];
+		const order = getBlockOrder( parentListId );
+		const followingListItems = order.slice(
+			getBlockIndex( lastClientId ) + 1
+		);
 
-					if ( ! nestedListId ) {
-						const nestedListBlock = cloneBlock(
-							getBlock( parentListId ),
-							{},
-							[]
-						);
-						nestedListId = nestedListBlock.clientId;
-						insertBlock( nestedListBlock, 0, firstClientId, false );
-						// Immediately update the block list settings, otherwise
-						// blocks can't be moved here due to canInsert checks.
-						updateBlockListSettings(
-							nestedListId,
-							getBlockListSettings( parentListId )
-						);
-					}
+		registry.batch( () => {
+			if ( followingListItems.length ) {
+				let nestedListId = getBlockOrder( firstClientId )[ 0 ];
 
-					moveBlocksToPosition(
-						followingListItems,
-						parentListId,
-						nestedListId
+				if ( ! nestedListId ) {
+					const nestedListBlock = cloneBlock(
+						getBlock( parentListId ),
+						{},
+						[]
+					);
+					nestedListId = nestedListBlock.clientId;
+					insertBlock( nestedListBlock, 0, firstClientId, false );
+					// Immediately update the block list settings, otherwise
+					// blocks can't be moved here due to canInsert checks.
+					updateBlockListSettings(
+						nestedListId,
+						getBlockListSettings( parentListId )
 					);
 				}
+
 				moveBlocksToPosition(
-					clientIds,
+					followingListItems,
 					parentListId,
-					getBlockRootClientId( parentListItemId ),
-					getBlockIndex( parentListItemId ) + 1
+					nestedListId
 				);
-				if ( ! getBlockOrder( parentListId ).length ) {
-					const shouldSelectParent = false;
-					removeBlock( parentListId, shouldSelectParent );
-				}
-			} );
-		}, [] ),
-	];
+			}
+			moveBlocksToPosition(
+				clientIds,
+				parentListId,
+				getBlockRootClientId( parentListItemId ),
+				getBlockIndex( parentListItemId ) + 1
+			);
+			if ( ! getBlockOrder( parentListId ).length ) {
+				const shouldSelectParent = false;
+				removeBlock( parentListId, shouldSelectParent );
+			}
+		} );
+
+		return true;
+	}, [] );
 }
diff --git a/packages/block-library/src/list-item/hooks/use-space.js b/packages/block-library/src/list-item/hooks/use-space.js
index 6079b2c5edb281..ee4d8bdbf8786e 100644
--- a/packages/block-library/src/list-item/hooks/use-space.js
+++ b/packages/block-library/src/list-item/hooks/use-space.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { useRefEffect } from '@wordpress/compose';
-import { SPACE } from '@wordpress/keycodes';
+import { SPACE, TAB } from '@wordpress/keycodes';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
 
@@ -10,11 +10,13 @@ import { useSelect } from '@wordpress/data';
  * Internal dependencies
  */
 import useIndentListItem from './use-indent-list-item';
+import useOutdentListItem from './use-outdent-list-item';
 
 export default function useSpace( clientId ) {
-	const { getSelectionStart, getSelectionEnd } =
+	const { getSelectionStart, getSelectionEnd, getBlockIndex } =
 		useSelect( blockEditorStore );
-	const [ canIndent, indentListItem ] = useIndentListItem( clientId );
+	const indentListItem = useIndentListItem( clientId );
+	const outdentListItem = useOutdentListItem();
 
 	return useRefEffect(
 		( element ) => {
@@ -23,10 +25,8 @@ export default function useSpace( clientId ) {
 
 				if (
 					event.defaultPrevented ||
-					! canIndent ||
-					keyCode !== SPACE ||
+					( keyCode !== SPACE && keyCode !== TAB ) ||
 					// Only override when no modifiers are pressed.
-					shiftKey ||
 					altKey ||
 					metaKey ||
 					ctrlKey
@@ -40,8 +40,18 @@ export default function useSpace( clientId ) {
 					selectionStart.offset === 0 &&
 					selectionEnd.offset === 0
 				) {
-					event.preventDefault();
-					indentListItem();
+					if ( shiftKey ) {
+						// Note that backspace behaviour in defined in onMerge.
+						if ( keyCode === TAB ) {
+							if ( outdentListItem() ) {
+								event.preventDefault();
+							}
+						}
+					} else if ( getBlockIndex( clientId ) !== 0 ) {
+						if ( indentListItem() ) {
+							event.preventDefault();
+						}
+					}
 				}
 			}
 
@@ -50,6 +60,6 @@ export default function useSpace( clientId ) {
 				element.removeEventListener( 'keydown', onKeyDown );
 			};
 		},
-		[ canIndent, indentListItem ]
+		[ clientId, indentListItem ]
 	);
 }
diff --git a/packages/block-library/src/list-item/hooks/use-split.js b/packages/block-library/src/list-item/hooks/use-split.js
deleted file mode 100644
index 51ede7de45c453..00000000000000
--- a/packages/block-library/src/list-item/hooks/use-split.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useCallback, useRef } from '@wordpress/element';
-import { useSelect } from '@wordpress/data';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { cloneBlock, createBlock } from '@wordpress/blocks';
-
-export default function useSplit( clientId ) {
-	// We can not rely on the isAfterOriginal parameter of the callback,
-	// because if the value after the split is empty isAfterOriginal is false
-	// while the value is in fact after the original. So to avoid that issue we use
-	// a flag where the first execution of the callback is false (it is the before value)
-	// and the second execution is true, it is the after value.
-	const isAfter = useRef( false );
-	const { getBlock } = useSelect( blockEditorStore );
-	return useCallback(
-		( value ) => {
-			const block = getBlock( clientId );
-			if ( isAfter.current ) {
-				return cloneBlock( block, {
-					content: value,
-				} );
-			}
-			isAfter.current = true;
-			return createBlock( block.name, {
-				...block.attributes,
-				content: value,
-			} );
-		},
-		[ clientId, getBlock ]
-	);
-}
diff --git a/packages/block-library/src/list-item/index.js b/packages/block-library/src/list-item/index.js
index 00adc1c2c40266..07c5bb7fda9015 100644
--- a/packages/block-library/src/list-item/index.js
+++ b/packages/block-library/src/list-item/index.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { listItem as icon } from '@wordpress/icons';
+import { privateApis } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -11,6 +12,7 @@ import metadata from './block.json';
 import edit from './edit';
 import save from './save';
 import transforms from './transforms';
+import { unlock } from '../lock-unlock';
 
 const { name } = metadata;
 
@@ -27,6 +29,7 @@ export const settings = {
 		};
 	},
 	transforms,
+	[ unlock( privateApis ).requiresWrapperOnCopy ]: true,
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json
index e2fb9e4c9e3b0d..4a86def8d687b4 100644
--- a/packages/block-library/src/list/block.json
+++ b/packages/block-library/src/list/block.json
@@ -4,14 +4,15 @@
 	"name": "core/list",
 	"title": "List",
 	"category": "text",
-	"description": "Create a bulleted or numbered list.",
+	"allowedBlocks": [ "core/list-item" ],
+	"description": "An organized collection of items displayed in a specific order.",
 	"keywords": [ "bullet list", "ordered list", "numbered list" ],
 	"textdomain": "default",
 	"attributes": {
 		"ordered": {
 			"type": "boolean",
 			"default": false,
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"values": {
 			"type": "string",
@@ -20,7 +21,7 @@
 			"multiline": "li",
 			"__unstableMultilineWrapperTags": [ "ol", "ul" ],
 			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"type": {
 			"type": "string"
@@ -37,7 +38,13 @@
 	},
 	"supports": {
 		"anchor": true,
-		"className": false,
+		"html": false,
+		"__experimentalBorder": {
+			"color": true,
+			"radius": true,
+			"style": true,
+			"width": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
@@ -68,9 +75,14 @@
 			}
 		},
 		"__unstablePasteTextInline": true,
-		"__experimentalSelector": "ol,ul",
 		"__experimentalOnMerge": true,
-		"__experimentalSlashInserter": true
+		"__experimentalSlashInserter": true,
+		"interactivity": {
+			"clientNavigation": true
+		}
+	},
+	"selectors": {
+		"border": ".wp-block-list:not(.wp-block-list .wp-block-list)"
 	},
 	"editorStyle": "wp-block-list-editor",
 	"style": "wp-block-list"
diff --git a/packages/block-library/src/list/deprecated.js b/packages/block-library/src/list/deprecated.js
index cecc17430f65e5..13804b7040ed46 100644
--- a/packages/block-library/src/list/deprecated.js
+++ b/packages/block-library/src/list/deprecated.js
@@ -14,7 +14,7 @@ const v0 = {
 		ordered: {
 			type: 'boolean',
 			default: false,
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		values: {
 			type: 'string',
@@ -23,7 +23,7 @@ const v0 = {
 			multiline: 'li',
 			__unstableMultilineWrapperTags: [ 'ol', 'ul' ],
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		type: {
 			type: 'string',
@@ -74,7 +74,7 @@ const v1 = {
 		ordered: {
 			type: 'boolean',
 			default: false,
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		values: {
 			type: 'string',
@@ -83,7 +83,7 @@ const v1 = {
 			multiline: 'li',
 			__unstableMultilineWrapperTags: [ 'ol', 'ul' ],
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		type: {
 			type: 'string',
@@ -144,7 +144,7 @@ const v2 = {
 		ordered: {
 			type: 'boolean',
 			default: false,
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		values: {
 			type: 'string',
@@ -153,7 +153,7 @@ const v2 = {
 			multiline: 'li',
 			__unstableMultilineWrapperTags: [ 'ol', 'ul' ],
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		type: {
 			type: 'string',
@@ -219,6 +219,93 @@ const v2 = {
 	migrate: migrateTypeToInlineStyle,
 };
 
+// Version without block support 'className: true'.
+const v3 = {
+	attributes: {
+		ordered: {
+			type: 'boolean',
+			default: false,
+			role: 'content',
+		},
+		values: {
+			type: 'string',
+			source: 'html',
+			selector: 'ol,ul',
+			multiline: 'li',
+			__unstableMultilineWrapperTags: [ 'ol', 'ul' ],
+			default: '',
+			role: 'content',
+		},
+		type: {
+			type: 'string',
+		},
+		start: {
+			type: 'number',
+		},
+		reversed: {
+			type: 'boolean',
+		},
+		placeholder: {
+			type: 'string',
+		},
+	},
+	supports: {
+		anchor: true,
+		className: false,
+		typography: {
+			fontSize: true,
+			lineHeight: true,
+			__experimentalFontFamily: true,
+			__experimentalFontWeight: true,
+			__experimentalFontStyle: true,
+			__experimentalTextTransform: true,
+			__experimentalTextDecoration: true,
+			__experimentalLetterSpacing: true,
+			__experimentalDefaultControls: {
+				fontSize: true,
+			},
+		},
+		color: {
+			gradients: true,
+			link: true,
+			__experimentalDefaultControls: {
+				background: true,
+				text: true,
+			},
+		},
+		spacing: {
+			margin: true,
+			padding: true,
+			__experimentalDefaultControls: {
+				margin: false,
+				padding: false,
+			},
+		},
+		__unstablePasteTextInline: true,
+		__experimentalSelector: 'ol,ul',
+		__experimentalOnMerge: 'true',
+		__experimentalSlashInserter: true,
+	},
+	save( { attributes } ) {
+		const { ordered, type, reversed, start } = attributes;
+		const TagName = ordered ? 'ol' : 'ul';
+		return (
+			<TagName
+				{ ...useBlockProps.save( {
+					reversed,
+					start,
+					style: {
+						listStyleType:
+							ordered && type !== 'decimal' ? type : undefined,
+					},
+				} ) }
+			>
+				<InnerBlocks.Content />
+			</TagName>
+		);
+	},
+};
+
 /**
  * New deprecations need to be placed first
  * for them to have higher priority.
@@ -227,4 +314,4 @@ const v2 = {
  *
  * See block-deprecation.md
  */
-export default [ v2, v1, v0 ];
+export default [ v3, v2, v1, v0 ];
diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js
index 569e4182b3ea55..73551cd9cdee80 100644
--- a/packages/block-library/src/list/edit.js
+++ b/packages/block-library/src/list/edit.js
@@ -29,6 +29,9 @@ import OrderedListSettings from './ordered-list-settings';
 import { migrateToListV2 } from './utils';
 import TagName from './tag-name';
 
+const DEFAULT_BLOCK = {
+	name: 'core/list-item',
+};
 const TEMPLATE = [ [ 'core/list-item' ] ];
 const NATIVE_MARGIN_SPACING = 8;
 
@@ -68,54 +71,46 @@ function useMigrateOnLoad( attributes, clientId ) {
 }
 
 function useOutdentList( clientId ) {
-	const { canOutdent } = useSelect(
-		( innerSelect ) => {
-			const { getBlockRootClientId, getBlock } =
-				innerSelect( blockEditorStore );
-			const parentId = getBlockRootClientId( clientId );
-			return {
-				canOutdent:
-					!! parentId &&
-					getBlock( parentId ).name === 'core/list-item',
-			};
-		},
-		[ clientId ]
-	);
 	const { replaceBlocks, selectionChange } = useDispatch( blockEditorStore );
 	const { getBlockRootClientId, getBlockAttributes, getBlock } =
 		useSelect( blockEditorStore );
 
-	return [
-		canOutdent,
-		useCallback( () => {
-			const parentBlockId = getBlockRootClientId( clientId );
-			const parentBlockAttributes = getBlockAttributes( parentBlockId );
-			// Create a new parent block without the inner blocks.
-			const newParentBlock = createBlock(
-				'core/list-item',
-				parentBlockAttributes
-			);
-			const { innerBlocks } = getBlock( clientId );
-			// Replace the parent block with a new parent block without inner blocks,
-			// and make the inner blocks siblings of the parent.
-			replaceBlocks(
-				[ parentBlockId ],
-				[ newParentBlock, ...innerBlocks ]
-			);
-			// Select the last child of the list being outdent.
-			selectionChange( innerBlocks[ innerBlocks.length - 1 ].clientId );
-		}, [ clientId ] ),
-	];
+	return useCallback( () => {
+		const parentBlockId = getBlockRootClientId( clientId );
+		const parentBlockAttributes = getBlockAttributes( parentBlockId );
+		// Create a new parent block without the inner blocks.
+		const newParentBlock = createBlock(
+			'core/list-item',
+			parentBlockAttributes
+		);
+		const { innerBlocks } = getBlock( clientId );
+		// Replace the parent block with a new parent block without inner blocks,
+		// and make the inner blocks siblings of the parent.
+		replaceBlocks( [ parentBlockId ], [ newParentBlock, ...innerBlocks ] );
+		// Select the last child of the list being outdent.
+		selectionChange( innerBlocks[ innerBlocks.length - 1 ].clientId );
+	}, [ clientId ] );
 }
 
 function IndentUI( { clientId } ) {
-	const [ canOutdent, outdentList ] = useOutdentList( clientId );
+	const outdentList = useOutdentList( clientId );
+	const canOutdent = useSelect(
+		( select ) => {
+			const { getBlockRootClientId, getBlockName } =
+				select( blockEditorStore );
+			return (
+				getBlockName( getBlockRootClientId( clientId ) ) ===
+				'core/list-item'
+			);
+		},
+		[ clientId ]
+	);
 	return (
 		<>
 			<ToolbarButton
 				icon={ isRTL() ? formatOutdentRTL : formatOutdent }
 				title={ __( 'Outdent' ) }
-				describedBy={ __( 'Outdent list item' ) }
+				description={ __( 'Outdent list item' ) }
 				disabled={ ! canOutdent }
 				onClick={ outdentList }
 			/>
@@ -133,7 +128,8 @@ export default function Edit( { attributes, setAttributes, clientId, style } ) {
 	} );
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: [ 'core/list-item' ],
+		defaultBlock: DEFAULT_BLOCK,
+		directInsert: true,
 		template: TEMPLATE,
 		templateLock: false,
 		templateInsertUpdatesSelection: true,
@@ -151,7 +147,7 @@ export default function Edit( { attributes, setAttributes, clientId, style } ) {
 			<ToolbarButton
 				icon={ isRTL() ? formatListBulletsRTL : formatListBullets }
 				title={ __( 'Unordered' ) }
-				describedBy={ __( 'Convert to unordered list' ) }
+				description={ __( 'Convert to unordered list' ) }
 				isActive={ ordered === false }
 				onClick={ () => {
 					setAttributes( { ordered: false } );
@@ -160,7 +156,7 @@ export default function Edit( { attributes, setAttributes, clientId, style } ) {
 			<ToolbarButton
 				icon={ isRTL() ? formatListNumberedRTL : formatListNumbered }
 				title={ __( 'Ordered' ) }
-				describedBy={ __( 'Convert to ordered list' ) }
+				description={ __( 'Convert to ordered list' ) }
 				isActive={ ordered === true }
 				onClick={ () => {
 					setAttributes( { ordered: true } );
diff --git a/packages/block-library/src/list/index.php b/packages/block-library/src/list/index.php
new file mode 100644
index 00000000000000..1bffd813248575
--- /dev/null
+++ b/packages/block-library/src/list/index.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Adds the wp-block-list class to the rendered list block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Adds the wp-block-list class to the rendered list block.
+ * Ensures that pre-existing list blocks use the class name on the front.
+ * For example, <ol> is transformed to <ol class="wp-block-list">.
+ *
+ * @since 6.6.0
+ *
+ * @see https://github.com/WordPress/gutenberg/issues/12420
+ *
+ * @param array  $attributes Attributes of the block being rendered.
+ * @param string $content Content of the block being rendered.
+ *
+ * @return string The content of the block being rendered.
+ */
+function block_core_list_render( $attributes, $content ) {
+	if ( ! $content ) {
+		return $content;
+	}
+
+	$processor = new WP_HTML_Tag_Processor( $content );
+
+	$list_tags = array( 'OL', 'UL' );
+	while ( $processor->next_tag() ) {
+		if ( in_array( $processor->get_tag(), $list_tags, true ) ) {
+			$processor->add_class( 'wp-block-list' );
+			break;
+		}
+	}
+
+	return $processor->get_updated_html();
+}
+
+/**
+ * Registers the `core/list` block on server.
+ *
+ * @since 6.6.0
+ */
+function register_block_core_list() {
+	register_block_type_from_metadata(
+		__DIR__ . '/list',
+		array(
+			'render_callback' => 'block_core_list_render',
+		)
+	);
+}
+
+add_action( 'init', 'register_block_core_list' );
diff --git a/packages/block-library/src/list/ordered-list-settings.js b/packages/block-library/src/list/ordered-list-settings.js
index 5d5d9936c73a0a..66817669806233 100644
--- a/packages/block-library/src/list/ordered-list-settings.js
+++ b/packages/block-library/src/list/ordered-list-settings.js
@@ -12,26 +12,11 @@ import {
 
 const OrderedListSettings = ( { setAttributes, reversed, start, type } ) => (
 	<InspectorControls>
-		<PanelBody title={ __( 'Ordered list settings' ) }>
-			<TextControl
-				__nextHasNoMarginBottom
-				label={ __( 'Start value' ) }
-				type="number"
-				onChange={ ( value ) => {
-					const int = parseInt( value, 10 );
-
-					setAttributes( {
-						// It should be possible to unset the value,
-						// e.g. with an empty string.
-						start: isNaN( int ) ? undefined : int,
-					} );
-				} }
-				value={ Number.isInteger( start ) ? start.toString( 10 ) : '' }
-				step="1"
-			/>
+		<PanelBody title={ __( 'Settings' ) }>
 			<SelectControl
+				__next40pxDefaultSize
 				__nextHasNoMarginBottom
-				label={ __( 'Numbering style' ) }
+				label={ __( 'List style' ) }
 				options={ [
 					{
 						label: __( 'Numbers' ),
@@ -57,9 +42,26 @@ const OrderedListSettings = ( { setAttributes, reversed, start, type } ) => (
 				value={ type }
 				onChange={ ( newValue ) => setAttributes( { type: newValue } ) }
 			/>
+			<TextControl
+				__next40pxDefaultSize
+				__nextHasNoMarginBottom
+				label={ __( 'Start value' ) }
+				type="number"
+				onChange={ ( value ) => {
+					const int = parseInt( value, 10 );
+
+					setAttributes( {
+						// It should be possible to unset the value,
+						// e.g. with an empty string.
+						start: isNaN( int ) ? undefined : int,
+					} );
+				} }
+				value={ Number.isInteger( start ) ? start.toString( 10 ) : '' }
+				step="1"
+			/>
 			<ToggleControl
 				__nextHasNoMarginBottom
-				label={ __( 'Reverse list numbering' ) }
+				label={ __( 'Reverse order' ) }
 				checked={ reversed || false }
 				onChange={ ( value ) => {
 					setAttributes( {
diff --git a/packages/block-library/src/list/style.scss b/packages/block-library/src/list/style.scss
index badf1b9e560ebd..c78b0bf1c74c0e 100644
--- a/packages/block-library/src/list/style.scss
+++ b/packages/block-library/src/list/style.scss
@@ -1,8 +1,8 @@
 ol,
 ul {
 	box-sizing: border-box;
+}
 
-	&.has-background {
-		padding: $block-bg-padding--v $block-bg-padding--h;
-	}
+:root :where(.wp-block-list.has-background) {
+	padding: $block-bg-padding--v $block-bg-padding--h;
 }
diff --git a/packages/block-library/src/list/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/list/test/__snapshots__/edit.native.js.snap
index 1bc5cf6ce937f8..058ccc6b9ca635 100644
--- a/packages/block-library/src/list/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/list/test/__snapshots__/edit.native.js.snap
@@ -2,7 +2,7 @@
 
 exports[`List block adds one item to the list 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First list item</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
@@ -10,9 +10,9 @@ exports[`List block adds one item to the list 1`] = `
 
 exports[`List block changes the indentation level 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Item 2</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -22,7 +22,7 @@ exports[`List block changes the indentation level 1`] = `
 
 exports[`List block changes to ordered list 1`] = `
 "<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1</li>
 <!-- /wp:list-item -->
 
@@ -38,7 +38,7 @@ exports[`List block changes to ordered list 1`] = `
 
 exports[`List block changes to reverse ordered list 1`] = `
 "<!-- wp:list {"ordered":true,"reversed":true} -->
-<ol reversed><!-- wp:list-item -->
+<ol reversed class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1</li>
 <!-- /wp:list-item -->
 
@@ -54,7 +54,7 @@ exports[`List block changes to reverse ordered list 1`] = `
 
 exports[`List block inserts block 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
@@ -62,7 +62,7 @@ exports[`List block inserts block 1`] = `
 
 exports[`List block removes the indentation level 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1</li>
 <!-- /wp:list-item -->
 
@@ -74,7 +74,7 @@ exports[`List block removes the indentation level 1`] = `
 
 exports[`List block sets a start value to an ordered list 1`] = `
 "<!-- wp:list {"ordered":true,"start":25} -->
-<ol start="25"><!-- wp:list-item -->
+<ol start="25" class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1</li>
 <!-- /wp:list-item -->
 
@@ -90,19 +90,19 @@ exports[`List block sets a start value to an ordered list 1`] = `
 
 exports[`List block shows different indentation levels 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>List item 1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>List item 2<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>List item nested 1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>List item nested 2<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Extra item 1</li>
 <!-- /wp:list-item -->
 
diff --git a/packages/block-library/src/list/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/list/test/__snapshots__/transforms.native.js.snap
index 723d19a658366f..9e28f1c77de943 100644
--- a/packages/block-library/src/list/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/list/test/__snapshots__/transforms.native.js.snap
@@ -4,7 +4,7 @@ exports[`List block transforms to Columns block 1`] = `
 "<!-- wp:columns -->
 <div class="wp-block-columns"><!-- wp:column {"width":"100%"} -->
 <div class="wp-block-column" style="flex-basis:100%"><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First Item</li>
 <!-- /wp:list-item -->
 
@@ -23,7 +23,7 @@ exports[`List block transforms to Columns block 1`] = `
 exports[`List block transforms to Group block 1`] = `
 "<!-- wp:group {"layout":{"type":"constrained"}} -->
 <div class="wp-block-group"><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First Item</li>
 <!-- /wp:list-item -->
 
@@ -69,7 +69,7 @@ exports[`List block transforms to Paragraph block 1`] = `
 exports[`List block transforms to Quote block 1`] = `
 "<!-- wp:quote -->
 <blockquote class="wp-block-quote"><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First Item</li>
 <!-- /wp:list-item -->
 
diff --git a/packages/block-library/src/list/test/edit.native.js b/packages/block-library/src/list/test/edit.native.js
index 1f7296db98c8c3..2393f2820cfc2e 100644
--- a/packages/block-library/src/list/test/edit.native.js
+++ b/packages/block-library/src/list/test/edit.native.js
@@ -60,7 +60,7 @@ describe( 'List block', () => {
 
 	it( 'adds one item to the list', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li></li><!-- /wp:list-item --></ul>
 		<!-- /wp:list -->`;
 
@@ -88,17 +88,17 @@ describe( 'List block', () => {
 
 	it( 'shows different indentation levels', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>List item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
 		<li>List item 2<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>List item nested 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
 		<li>List item nested 2<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Extra item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -140,7 +140,7 @@ describe( 'List block', () => {
 
 	it( 'changes the indentation level', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -183,9 +183,9 @@ describe( 'List block', () => {
 
 	it( 'removes the indentation level', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 2</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list --></li>
@@ -230,7 +230,7 @@ describe( 'List block', () => {
 
 	it( 'changes to ordered list', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -258,7 +258,7 @@ describe( 'List block', () => {
 
 	it( 'changes to reverse ordered list', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -289,9 +289,7 @@ describe( 'List block', () => {
 			() => screen.getByTestId( 'block-settings-modal' ).props.isVisible
 		);
 
-		const reverseButton = screen.getByLabelText(
-			/Reverse list numbering\. Off/
-		);
+		const reverseButton = screen.getByLabelText( /Reverse order\. Off/ );
 		fireEvent.press( reverseButton );
 
 		expect( getEditorHtml() ).toMatchSnapshot();
@@ -299,7 +297,7 @@ describe( 'List block', () => {
 
 	it( 'sets a start value to an ordered list', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -342,7 +340,7 @@ describe( 'List block', () => {
 	it( 'splits empty list items into paragraphs', async () => {
 		// Arrange
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li><!-- /wp:list-item -->
 		<!-- wp:list-item -->
 		<li>Two</li><!-- /wp:list-item --></ul>
@@ -370,7 +368,7 @@ describe( 'List block', () => {
 		// Assert
 		expect( getEditorHtml() ).toMatchInlineSnapshot( `
 		"<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->
@@ -380,7 +378,7 @@ describe( 'List block', () => {
 		<!-- /wp:paragraph -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Two</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->"
@@ -389,7 +387,7 @@ describe( 'List block', () => {
 
 	it( 'merges paragraphs into list items', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->
@@ -399,7 +397,7 @@ describe( 'List block', () => {
 		<!-- /wp:paragraph -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Three</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->`;
@@ -417,7 +415,7 @@ describe( 'List block', () => {
 		// Assert
 		expect( getEditorHtml() ).toMatchInlineSnapshot( `
 		"<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item -->
 
@@ -435,7 +433,7 @@ describe( 'List block', () => {
 	it( 'merges lists into lists', async () => {
 		// Arrange
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item -->
 
@@ -445,7 +443,7 @@ describe( 'List block', () => {
 		<!-- /wp:list -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Three</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->`;
@@ -466,7 +464,7 @@ describe( 'List block', () => {
 		// Assert
 		expect( getEditorHtml() ).toMatchInlineSnapshot( `
 		"<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item -->
 
@@ -486,7 +484,7 @@ describe( 'List block', () => {
 		<p>A quick brown fox.</p>
 		<!-- /wp:paragraph -->
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li><!-- /wp:list-item --><!-- wp:list-item -->
 		<li>Two</li><!-- /wp:list-item --></ul>
 		<!-- /wp:list -->`;
@@ -527,7 +525,7 @@ describe( 'List block', () => {
 		<!-- /wp:paragraph -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Two</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->"
@@ -539,9 +537,9 @@ describe( 'List block', () => {
 		<p>A quick brown fox.</p>
 		<!-- /wp:paragraph -->
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Two</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -591,7 +589,7 @@ describe( 'List block', () => {
 		<!-- /wp:paragraph -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Two</li>
 		<!-- /wp:list-item -->
 
diff --git a/packages/block-library/src/list/test/transforms.native.js b/packages/block-library/src/list/test/transforms.native.js
index dd8ec5ccd2c772..538d5b7ed0193e 100644
--- a/packages/block-library/src/list/test/transforms.native.js
+++ b/packages/block-library/src/list/test/transforms.native.js
@@ -12,7 +12,7 @@ import {
 const block = 'List';
 const initialHtml = `
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First Item</li>
 <!-- /wp:list-item -->
 
diff --git a/packages/block-library/src/lock-unlock.js b/packages/block-library/src/lock-unlock.js
index 3c18e76b798cda..cc8ef7a811fff8 100644
--- a/packages/block-library/src/lock-unlock.js
+++ b/packages/block-library/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/block-library'
 	);
diff --git a/packages/block-library/src/loginout/block.json b/packages/block-library/src/loginout/block.json
index 59fceec596e37c..f2aaafd60fde05 100644
--- a/packages/block-library/src/loginout/block.json
+++ b/packages/block-library/src/loginout/block.json
@@ -17,8 +17,17 @@
 			"default": true
 		}
 	},
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"className": true,
+		"color": {
+			"background": true,
+			"text": false,
+			"gradients": true,
+			"link": true
+		},
 		"spacing": {
 			"margin": true,
 			"padding": true,
@@ -39,6 +48,16 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
-	}
+	},
+	"style": "wp-block-loginout"
 }
diff --git a/packages/block-library/src/loginout/index.php b/packages/block-library/src/loginout/index.php
index ac10ced20f3d1b..de90ebc12e379a 100644
--- a/packages/block-library/src/loginout/index.php
+++ b/packages/block-library/src/loginout/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/loginout` block on server.
  *
+ * @since 5.8.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string Returns the login-out link or form.
@@ -39,6 +41,8 @@ function render_block_core_loginout( $attributes ) {
 
 /**
  * Registers the `core/loginout` block on server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_loginout() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/loginout/style.scss b/packages/block-library/src/loginout/style.scss
new file mode 100644
index 00000000000000..f13bb5ded552dd
--- /dev/null
+++ b/packages/block-library/src/loginout/style.scss
@@ -0,0 +1,4 @@
+.wp-block-loginout {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/media-text/block.json b/packages/block-library/src/media-text/block.json
index cdeb4ce13e8f51..0c2cfc4a14995a 100644
--- a/packages/block-library/src/media-text/block.json
+++ b/packages/block-library/src/media-text/block.json
@@ -18,7 +18,7 @@
 			"selector": "figure img",
 			"attribute": "alt",
 			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"mediaPosition": {
 			"type": "string",
@@ -26,14 +26,14 @@
 		},
 		"mediaId": {
 			"type": "number",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"mediaUrl": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "figure video,figure img",
 			"attribute": "src",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"mediaLink": {
 			"type": "string"
@@ -52,7 +52,7 @@
 			"source": "attribute",
 			"selector": "figure a",
 			"attribute": "href",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"rel": {
 			"type": "string",
@@ -68,7 +68,7 @@
 		},
 		"mediaType": {
 			"type": "string",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"mediaWidth": {
 			"type": "number",
@@ -92,12 +92,29 @@
 		},
 		"allowedBlocks": {
 			"type": "array"
+		},
+		"useFeaturedImage": {
+			"type": "boolean",
+			"default": false
 		}
 	},
+	"usesContext": [ "postId", "postType" ],
 	"supports": {
 		"anchor": true,
 		"align": [ "wide", "full" ],
 		"html": false,
+		"__experimentalBorder": {
+			"color": true,
+			"radius": true,
+			"style": true,
+			"width": true,
+			"__experimentalDefaultControls": {
+				"color": true,
+				"radius": true,
+				"style": true,
+				"width": true
+			}
+		},
 		"color": {
 			"gradients": true,
 			"heading": true,
@@ -123,6 +140,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-media-text-editor",
diff --git a/packages/block-library/src/media-text/deprecated.js b/packages/block-library/src/media-text/deprecated.js
index d03659022b95b4..24f239a41ed295 100644
--- a/packages/block-library/src/media-text/deprecated.js
+++ b/packages/block-library/src/media-text/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -30,7 +30,7 @@ const v1ToV5ImageFillStyles = ( url, focalPoint ) => {
 		: {};
 };
 
-const v6ImageFillStyles = ( url, focalPoint ) => {
+const v6ToV7ImageFillStyles = ( url, focalPoint ) => {
 	return url
 		? {
 				backgroundImage: `url(${ url })`,
@@ -172,29 +172,43 @@ const v6Attributes = {
 		selector: 'figure img',
 		attribute: 'alt',
 		default: '',
-		__experimentalRole: 'content',
+		role: 'content',
 	},
 	mediaId: {
 		type: 'number',
-		__experimentalRole: 'content',
+		role: 'content',
 	},
 	mediaUrl: {
 		type: 'string',
 		source: 'attribute',
 		selector: 'figure video,figure img',
 		attribute: 'src',
-		__experimentalRole: 'content',
+		role: 'content',
 	},
 	href: {
 		type: 'string',
 		source: 'attribute',
 		selector: 'figure a',
 		attribute: 'href',
-		__experimentalRole: 'content',
+		role: 'content',
 	},
 	mediaType: {
 		type: 'string',
-		__experimentalRole: 'content',
+		role: 'content',
+	},
+};
+
+const v7Attributes = {
+	...v6Attributes,
+	align: {
+		type: 'string',
+		// v7 changed the default for the `align` attribute.
+		default: 'none',
+	},
+	// New attribute.
+	useFeaturedImage: {
+		type: 'boolean',
+		default: false,
 	},
 };
 
@@ -237,6 +251,148 @@ const v6Supports = {
 	},
 };
 
+const v7Supports = {
+	...v6Supports,
+	__experimentalBorder: {
+		color: true,
+		radius: true,
+		style: true,
+		width: true,
+		__experimentalDefaultControls: {
+			color: true,
+			radius: true,
+			style: true,
+			width: true,
+		},
+	},
+	color: {
+		gradients: true,
+		heading: true,
+		link: true,
+		__experimentalDefaultControls: {
+			background: true,
+			text: true,
+		},
+	},
+	interactivity: {
+		clientNavigation: true,
+	},
+};
+
+// Version with 'none' as the default alignment.
+// See: https://github.com/WordPress/gutenberg/pull/64981
+const v7 = {
+	attributes: v7Attributes,
+	supports: v7Supports,
+	usesContext: [ 'postId', 'postType' ],
+	save( { attributes } ) {
+		const {
+			isStackedOnMobile,
+			mediaAlt,
+			mediaPosition,
+			mediaType,
+			mediaUrl,
+			mediaWidth,
+			mediaId,
+			verticalAlignment,
+			imageFill,
+			focalPoint,
+			linkClass,
+			href,
+			linkTarget,
+			rel,
+		} = attributes;
+		const mediaSizeSlug =
+			attributes.mediaSizeSlug || DEFAULT_MEDIA_SIZE_SLUG;
+		const newRel = ! rel ? undefined : rel;
+
+		const imageClasses = clsx( {
+			[ `wp-image-${ mediaId }` ]: mediaId && mediaType === 'image',
+			[ `size-${ mediaSizeSlug }` ]: mediaId && mediaType === 'image',
+		} );
+
+		let image = mediaUrl ? (
+			<img
+				src={ mediaUrl }
+				alt={ mediaAlt }
+				className={ imageClasses || null }
+			/>
+		) : null;
+
+		if ( href ) {
+			image = (
+				<a
+					className={ linkClass }
+					href={ href }
+					target={ linkTarget }
+					rel={ newRel }
+				>
+					{ image }
+				</a>
+			);
+		}
+
+		const mediaTypeRenders = {
+			image: () => image,
+			video: () => <video controls src={ mediaUrl } />,
+		};
+		const className = clsx( {
+			'has-media-on-the-right': 'right' === mediaPosition,
+			'is-stacked-on-mobile': isStackedOnMobile,
+			[ `is-vertically-aligned-${ verticalAlignment }` ]:
+				verticalAlignment,
+			'is-image-fill': imageFill,
+		} );
+		const backgroundStyles = imageFill
+			? v6ToV7ImageFillStyles( mediaUrl, focalPoint )
+			: {};
+
+		let gridTemplateColumns;
+		if ( mediaWidth !== DEFAULT_MEDIA_WIDTH ) {
+			gridTemplateColumns =
+				'right' === mediaPosition
+					? `auto ${ mediaWidth }%`
+					: `${ mediaWidth }% auto`;
+		}
+		const style = {
+			gridTemplateColumns,
+		};
+
+		if ( 'right' === mediaPosition ) {
+			return (
+				<div { ...useBlockProps.save( { className, style } ) }>
+					<div
+						{ ...useInnerBlocksProps.save( {
+							className: 'wp-block-media-text__content',
+						} ) }
+					/>
+					<figure
+						className="wp-block-media-text__media"
+						style={ backgroundStyles }
+					>
+						{ ( mediaTypeRenders[ mediaType ] || noop )() }
+					</figure>
+				</div>
+			);
+		}
+		return (
+			<div { ...useBlockProps.save( { className, style } ) }>
+				<figure
+					className="wp-block-media-text__media"
+					style={ backgroundStyles }
+				>
+					{ ( mediaTypeRenders[ mediaType ] || noop )() }
+				</figure>
+				<div
+					{ ...useInnerBlocksProps.save( {
+						className: 'wp-block-media-text__content',
+					} ) }
+				/>
+			</div>
+		);
+	},
+};
+
 // Version with wide as the default alignment.
 // See: https://github.com/WordPress/gutenberg/pull/48404
 const v6 = {
@@ -263,7 +419,7 @@ const v6 = {
 			attributes.mediaSizeSlug || DEFAULT_MEDIA_SIZE_SLUG;
 		const newRel = ! rel ? undefined : rel;
 
-		const imageClasses = classnames( {
+		const imageClasses = clsx( {
 			[ `wp-image-${ mediaId }` ]: mediaId && mediaType === 'image',
 			[ `size-${ mediaSizeSlug }` ]: mediaId && mediaType === 'image',
 		} );
@@ -293,7 +449,7 @@ const v6 = {
 			image: () => image,
 			video: () => <video controls src={ mediaUrl } />,
 		};
-		const className = classnames( {
+		const className = clsx( {
 			'has-media-on-the-right': 'right' === mediaPosition,
 			'is-stacked-on-mobile': isStackedOnMobile,
 			[ `is-vertically-aligned-${ verticalAlignment }` ]:
@@ -301,7 +457,7 @@ const v6 = {
 			'is-image-fill': imageFill,
 		} );
 		const backgroundStyles = imageFill
-			? v6ImageFillStyles( mediaUrl, focalPoint )
+			? v6ToV7ImageFillStyles( mediaUrl, focalPoint )
 			: {};
 
 		let gridTemplateColumns;
@@ -392,7 +548,7 @@ const v5 = {
 			attributes.mediaSizeSlug || DEFAULT_MEDIA_SIZE_SLUG;
 		const newRel = ! rel ? undefined : rel;
 
-		const imageClasses = classnames( {
+		const imageClasses = clsx( {
 			[ `wp-image-${ mediaId }` ]: mediaId && mediaType === 'image',
 			[ `size-${ mediaSizeSlug }` ]: mediaId && mediaType === 'image',
 		} );
@@ -422,7 +578,7 @@ const v5 = {
 			image: () => image,
 			video: () => <video controls src={ mediaUrl } />,
 		};
-		const className = classnames( {
+		const className = clsx( {
 			'has-media-on-the-right': 'right' === mediaPosition,
 			'is-stacked-on-mobile': isStackedOnMobile,
 			[ `is-vertically-aligned-${ verticalAlignment }` ]:
@@ -506,7 +662,7 @@ const v4 = {
 			attributes.mediaSizeSlug || DEFAULT_MEDIA_SIZE_SLUG;
 		const newRel = ! rel ? undefined : rel;
 
-		const imageClasses = classnames( {
+		const imageClasses = clsx( {
 			[ `wp-image-${ mediaId }` ]: mediaId && mediaType === 'image',
 			[ `size-${ mediaSizeSlug }` ]: mediaId && mediaType === 'image',
 		} );
@@ -537,7 +693,7 @@ const v4 = {
 			video: () => <video controls src={ mediaUrl } />,
 		};
 
-		const className = classnames( {
+		const className = clsx( {
 			'has-media-on-the-right': 'right' === mediaPosition,
 			'is-stacked-on-mobile': isStackedOnMobile,
 			[ `is-vertically-aligned-${ verticalAlignment }` ]:
@@ -688,7 +844,7 @@ const v3 = {
 			'background-color',
 			backgroundColor
 		);
-		const className = classnames( {
+		const className = clsx( {
 			'has-media-on-the-right': 'right' === mediaPosition,
 			'has-background': backgroundClass || customBackgroundColor,
 			[ backgroundClass ]: backgroundClass,
@@ -791,7 +947,7 @@ const v2 = {
 			'background-color',
 			backgroundColor
 		);
-		const className = classnames( {
+		const className = clsx( {
 			'has-media-on-the-right': 'right' === mediaPosition,
 			[ backgroundClass ]: backgroundClass,
 			'is-stacked-on-mobile': isStackedOnMobile,
@@ -870,7 +1026,7 @@ const v1 = {
 			'background-color',
 			backgroundColor
 		);
-		const className = classnames( {
+		const className = clsx( {
 			'has-media-on-the-right': 'right' === mediaPosition,
 			[ backgroundClass ]: backgroundClass,
 			'is-stacked-on-mobile': isStackedOnMobile,
@@ -902,4 +1058,4 @@ const v1 = {
 	},
 };
 
-export default [ v6, v5, v4, v3, v2, v1 ];
+export default [ v7, v6, v5, v4, v3, v2, v1 ];
diff --git a/packages/block-library/src/media-text/edit.js b/packages/block-library/src/media-text/edit.js
index f3baeb8c1756ba..a946a499b26f21 100644
--- a/packages/block-library/src/media-text/edit.js
+++ b/packages/block-library/src/media-text/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -16,22 +16,23 @@ import {
 	InspectorControls,
 	useBlockProps,
 	__experimentalImageURLInputUI as ImageURLInputUI,
-	__experimentalImageSizeControl as ImageSizeControl,
 	store as blockEditorStore,
 	useBlockEditingMode,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import {
-	PanelBody,
 	RangeControl,
 	TextareaControl,
 	ToggleControl,
 	ToolbarButton,
 	ExternalLink,
 	FocalPointPicker,
+	__experimentalToolsPanel as ToolsPanel,
+	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
 import { isBlobURL, getBlobTypeByURL } from '@wordpress/blob';
 import { pullLeft, pullRight } from '@wordpress/icons';
-import { store as coreStore } from '@wordpress/core-data';
+import { useEntityProp, store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -44,6 +45,10 @@ import {
 	LINK_DESTINATION_ATTACHMENT,
 	TEMPLATE,
 } from './constants';
+import { unlock } from '../lock-unlock';
+import { useToolsPanelDropdownMenuProps } from '../utils/hooks';
+
+const { ResolutionTool } = unlock( blockEditorPrivateApis );
 
 // this limits the resize to a safe zone to avoid making broken layouts
 const applyWidthConstraints = ( width ) =>
@@ -127,7 +132,12 @@ function attributesFromMedia( {
 	};
 }
 
-function MediaTextEdit( { attributes, isSelected, setAttributes } ) {
+function MediaTextEdit( {
+	attributes,
+	isSelected,
+	setAttributes,
+	context: { postId, postType },
+} ) {
 	const {
 		focalPoint,
 		href,
@@ -145,9 +155,48 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) {
 		rel,
 		verticalAlignment,
 		allowedBlocks,
+		useFeaturedImage,
 	} = attributes;
 	const mediaSizeSlug = attributes.mediaSizeSlug || DEFAULT_MEDIA_SIZE_SLUG;
 
+	const [ featuredImage ] = useEntityProp(
+		'postType',
+		postType,
+		'featured_media',
+		postId
+	);
+
+	const featuredImageMedia = useSelect(
+		( select ) =>
+			featuredImage &&
+			select( coreStore ).getMedia( featuredImage, { context: 'view' } ),
+		[ featuredImage ]
+	);
+
+	const featuredImageURL = useFeaturedImage
+		? featuredImageMedia?.source_url
+		: '';
+	const featuredImageAlt = useFeaturedImage
+		? featuredImageMedia?.alt_text
+		: '';
+
+	const toggleUseFeaturedImage = () => {
+		setAttributes( {
+			imageFill: false,
+			mediaType: 'image',
+			mediaId: undefined,
+			mediaUrl: undefined,
+			mediaAlt: undefined,
+			mediaLink: undefined,
+			linkDestination: undefined,
+			linkTarget: undefined,
+			linkClass: undefined,
+			rel: undefined,
+			href: undefined,
+			useFeaturedImage: ! useFeaturedImage,
+		} );
+	};
+
 	const { imageSizes, image } = useSelect(
 		( select ) => {
 			const { getSettings } = select( blockEditorStore );
@@ -164,11 +213,11 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) {
 		[ isSelected, mediaId ]
 	);
 
-	const refMediaContainer = useRef();
+	const refMedia = useRef();
 	const imperativeFocalPointPreview = ( value ) => {
-		const { style } = refMediaContainer.current.resizable;
+		const { style } = refMedia.current;
 		const { x, y } = value;
-		style.backgroundPosition = `${ x * 100 }% ${ y * 100 }%`;
+		style.objectPosition = `${ x * 100 }% ${ y * 100 }%`;
 	};
 
 	const [ temporaryMediaWidth, setTemporaryMediaWidth ] = useState( null );
@@ -189,12 +238,12 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) {
 		setTemporaryMediaWidth( null );
 	};
 
-	const classNames = classnames( {
+	const classNames = clsx( {
 		'has-media-on-the-right': 'right' === mediaPosition,
 		'is-selected': isSelected,
 		'is-stacked-on-mobile': isStackedOnMobile,
 		[ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
-		'is-image-fill': imageFill,
+		'is-image-fill-element': imageFill,
 	} );
 	const widthString = `${ temporaryMediaWidth || mediaWidth }%`;
 	const gridTemplateColumns =
@@ -227,83 +276,146 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) {
 			mediaSizeSlug: newMediaSizeSlug,
 		} );
 	};
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 
 	const mediaTextGeneralSettings = (
-		<PanelBody title={ __( 'Settings' ) }>
-			<ToggleControl
-				__nextHasNoMarginBottom
+		<ToolsPanel
+			label={ __( 'Settings' ) }
+			resetAll={ () => {
+				setAttributes( {
+					isStackedOnMobile: true,
+					imageFill: false,
+					mediaAlt: '',
+					focalPoint: undefined,
+					mediaWidth: 50,
+					mediaSizeSlug: undefined,
+				} );
+			} }
+			dropdownMenuProps={ dropdownMenuProps }
+		>
+			<ToolsPanelItem
+				label={ __( 'Media width' ) }
+				isShownByDefault
+				hasValue={ () => mediaWidth !== 50 }
+				onDeselect={ () => setAttributes( { mediaWidth: 50 } ) }
+			>
+				<RangeControl
+					__nextHasNoMarginBottom
+					__next40pxDefaultSize
+					label={ __( 'Media width' ) }
+					value={ temporaryMediaWidth || mediaWidth }
+					onChange={ commitWidthChange }
+					min={ WIDTH_CONSTRAINT_PERCENTAGE }
+					max={ 100 - WIDTH_CONSTRAINT_PERCENTAGE }
+				/>
+			</ToolsPanelItem>
+			<ToolsPanelItem
 				label={ __( 'Stack on mobile' ) }
-				checked={ isStackedOnMobile }
-				onChange={ () =>
-					setAttributes( {
-						isStackedOnMobile: ! isStackedOnMobile,
-					} )
+				isShownByDefault
+				hasValue={ () => ! isStackedOnMobile }
+				onDeselect={ () =>
+					setAttributes( { isStackedOnMobile: true } )
 				}
-			/>
-			{ mediaType === 'image' && (
+			>
 				<ToggleControl
 					__nextHasNoMarginBottom
-					label={ __( 'Crop image to fill entire column' ) }
-					checked={ !! imageFill }
+					label={ __( 'Stack on mobile' ) }
+					checked={ isStackedOnMobile }
 					onChange={ () =>
 						setAttributes( {
-							imageFill: ! imageFill,
+							isStackedOnMobile: ! isStackedOnMobile,
 						} )
 					}
 				/>
-			) }
-			{ imageFill && mediaUrl && mediaType === 'image' && (
-				<FocalPointPicker
-					__nextHasNoMarginBottom
-					label={ __( 'Focal point picker' ) }
-					url={ mediaUrl }
-					value={ focalPoint }
-					onChange={ ( value ) =>
-						setAttributes( { focalPoint: value } )
-					}
-					onDragStart={ imperativeFocalPointPreview }
-					onDrag={ imperativeFocalPointPreview }
-				/>
-			) }
+			</ToolsPanelItem>
 			{ mediaType === 'image' && (
-				<TextareaControl
-					__nextHasNoMarginBottom
-					label={ __( 'Alternative text' ) }
-					value={ mediaAlt }
-					onChange={ onMediaAltChange }
-					help={
-						<>
-							<ExternalLink href="https://www.w3.org/WAI/tutorials/images/decision-tree">
-								{ __( 'Describe the purpose of the image.' ) }
-							</ExternalLink>
-							<br />
-							{ __( 'Leave empty if decorative.' ) }
-						</>
-					}
-				/>
+				<ToolsPanelItem
+					label={ __( 'Crop image to fill' ) }
+					isShownByDefault
+					hasValue={ () => !! imageFill }
+					onDeselect={ () => setAttributes( { imageFill: false } ) }
+				>
+					<ToggleControl
+						__nextHasNoMarginBottom
+						label={ __( 'Crop image to fill' ) }
+						checked={ !! imageFill }
+						onChange={ () =>
+							setAttributes( {
+								imageFill: ! imageFill,
+							} )
+						}
+					/>
+				</ToolsPanelItem>
 			) }
-			{ mediaType === 'image' && (
-				<ImageSizeControl
-					onChangeImage={ updateImage }
-					slug={ mediaSizeSlug }
-					imageSizeOptions={ imageSizeOptions }
-					isResizable={ false }
-					imageSizeHelp={ __(
-						'Select the size of the source image.'
-					) }
-				/>
+			{ imageFill &&
+				( mediaUrl || featuredImageURL ) &&
+				mediaType === 'image' && (
+					<ToolsPanelItem
+						label={ __( 'Focal point' ) }
+						isShownByDefault
+						hasValue={ () => !! focalPoint }
+						onDeselect={ () =>
+							setAttributes( { focalPoint: undefined } )
+						}
+					>
+						<FocalPointPicker
+							__nextHasNoMarginBottom
+							label={ __( 'Focal point' ) }
+							url={
+								useFeaturedImage && featuredImageURL
+									? featuredImageURL
+									: mediaUrl
+							}
+							value={ focalPoint }
+							onChange={ ( value ) =>
+								setAttributes( { focalPoint: value } )
+							}
+							onDragStart={ imperativeFocalPointPreview }
+							onDrag={ imperativeFocalPointPreview }
+						/>
+					</ToolsPanelItem>
+				) }
+			{ mediaType === 'image' && mediaUrl && ! useFeaturedImage && (
+				<ToolsPanelItem
+					label={ __( 'Alternative text' ) }
+					isShownByDefault
+					hasValue={ () => !! mediaAlt }
+					onDeselect={ () => setAttributes( { mediaAlt: '' } ) }
+				>
+					<TextareaControl
+						__nextHasNoMarginBottom
+						label={ __( 'Alternative text' ) }
+						value={ mediaAlt }
+						onChange={ onMediaAltChange }
+						help={
+							<>
+								<ExternalLink
+									href={
+										// translators: Localized tutorial, if one exists. W3C Web Accessibility Initiative link has list of existing translations.
+										__(
+											'https://www.w3.org/WAI/tutorials/images/decision-tree/'
+										)
+									}
+								>
+									{ __(
+										'Describe the purpose of the image.'
+									) }
+								</ExternalLink>
+								<br />
+								{ __( 'Leave empty if decorative.' ) }
+							</>
+						}
+					/>
+				</ToolsPanelItem>
 			) }
-			{ mediaUrl && (
-				<RangeControl
-					__nextHasNoMarginBottom
-					label={ __( 'Media width' ) }
-					value={ temporaryMediaWidth || mediaWidth }
-					onChange={ commitWidthChange }
-					min={ WIDTH_CONSTRAINT_PERCENTAGE }
-					max={ 100 - WIDTH_CONSTRAINT_PERCENTAGE }
+			{ mediaType === 'image' && ! useFeaturedImage && (
+				<ResolutionTool
+					value={ mediaSizeSlug }
+					options={ imageSizeOptions }
+					onChange={ updateImage }
 				/>
 			) }
-		</PanelBody>
+		</ToolsPanel>
 	);
 
 	const blockProps = useBlockProps( {
@@ -347,7 +459,7 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) {
 					</>
 				) }
 
-				{ mediaType === 'image' && (
+				{ mediaType === 'image' && ! useFeaturedImage && (
 					<ImageURLInputUI
 						url={ href || '' }
 						onChangeUrl={ onSetHref }
@@ -368,8 +480,9 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) {
 					onSelectMedia={ onSelectMedia }
 					onWidthChange={ onWidthChange }
 					commitWidthChange={ commitWidthChange }
-					ref={ refMediaContainer }
+					refMedia={ refMedia }
 					enableResize={ blockEditingMode === 'default' }
+					toggleUseFeaturedImage={ toggleUseFeaturedImage }
 					{ ...{
 						focalPoint,
 						imageFill,
@@ -381,6 +494,9 @@ function MediaTextEdit( { attributes, isSelected, setAttributes } ) {
 						mediaType,
 						mediaUrl,
 						mediaWidth,
+						useFeaturedImage,
+						featuredImageURL,
+						featuredImageAlt,
 					} }
 				/>
 				{ mediaPosition !== 'right' && <div { ...innerBlocksProps } /> }
diff --git a/packages/block-library/src/media-text/edit.native.js b/packages/block-library/src/media-text/edit.native.js
index 5ec20ab6f367d4..a5ccb007bdf5c2 100644
--- a/packages/block-library/src/media-text/edit.native.js
+++ b/packages/block-library/src/media-text/edit.native.js
@@ -52,6 +52,7 @@ class MediaTextEdit extends Component {
 
 		this.onSelectMedia = this.onSelectMedia.bind( this );
 		this.onMediaUpdate = this.onMediaUpdate.bind( this );
+		this.onMediaThumbnailUpdate = this.onMediaThumbnailUpdate.bind( this );
 		this.onWidthChange = this.onWidthChange.bind( this );
 		this.commitWidthChange = this.commitWidthChange.bind( this );
 		this.onLayoutChange = this.onLayoutChange.bind( this );
@@ -121,6 +122,14 @@ class MediaTextEdit extends Component {
 		} );
 	}
 
+	onMediaThumbnailUpdate( mediaUrl ) {
+		const { setAttributes } = this.props;
+
+		setAttributes( {
+			mediaUrl,
+		} );
+	}
+
 	onWidthChange( width ) {
 		this.setState( {
 			mediaWidth: applyWidthConstraints( width ),
@@ -182,7 +191,7 @@ class MediaTextEdit extends Component {
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
 					<ToggleControl
-						label={ __( 'Crop image to fill entire column' ) }
+						label={ __( 'Crop image to fill' ) }
 						checked={ imageFill }
 						onChange={ this.onSetImageFill }
 					/>
@@ -221,6 +230,7 @@ class MediaTextEdit extends Component {
 				onFocus={ this.props.onFocus }
 				onMediaSelected={ this.onMediaSelected }
 				onMediaUpdate={ this.onMediaUpdate }
+				onMediaThumbnailUpdate={ this.onMediaThumbnailUpdate }
 				onSelectMedia={ this.onSelectMedia }
 				onSetOpenPickerRef={ this.onSetOpenPickerRef }
 				onWidthChange={ this.onWidthChange }
diff --git a/packages/block-library/src/media-text/editor.scss b/packages/block-library/src/media-text/editor.scss
index 895de65511c131..639ceaed8ea99c 100644
--- a/packages/block-library/src/media-text/editor.scss
+++ b/packages/block-library/src/media-text/editor.scss
@@ -26,7 +26,10 @@
 	width: 100% !important;
 }
 
-.wp-block-media-text.is-image-fill .editor-media-container__resizer {
+.wp-block-media-text.is-image-fill .editor-media-container__resizer,
+.wp-block-media-text.is-image-fill .components-placeholder.has-illustration,
+.wp-block-media-text.is-image-fill-element .editor-media-container__resizer,
+.wp-block-media-text.is-image-fill-element .components-placeholder.has-illustration {
 	// The resizer sets an inline height but for the image fill we set it to full height.
 	height: 100% !important;
 }
@@ -34,3 +37,8 @@
 .wp-block-media-text > .block-editor-block-list__layout > .block-editor-block-list__block {
 	max-width: unset;
 }
+
+/* Make the featured image placeholder the same height as the media selection area. */
+.wp-block-media-text--placeholder-image {
+	min-height: 205px;
+}
diff --git a/packages/block-library/src/media-text/icon-retry.native.js b/packages/block-library/src/media-text/icon-retry.native.js
index 580cd1fff188f5..d9b3d82e796cb0 100644
--- a/packages/block-library/src/media-text/icon-retry.native.js
+++ b/packages/block-library/src/media-text/icon-retry.native.js
@@ -6,6 +6,6 @@ import { Path, SVG } from '@wordpress/components';
 export default (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<Path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z" />
-		<Path d="M0 0h24v24H0z" fill={ 'none' } />
+		<Path d="M0 0h24v24H0z" fill="none" />
 	</SVG>
 );
diff --git a/packages/block-library/src/media-text/image-fill.js b/packages/block-library/src/media-text/image-fill.js
new file mode 100644
index 00000000000000..c277c49b5c310b
--- /dev/null
+++ b/packages/block-library/src/media-text/image-fill.js
@@ -0,0 +1,11 @@
+export function imageFillStyles( url, focalPoint ) {
+	return url
+		? {
+				objectPosition: focalPoint
+					? `${ Math.round( focalPoint.x * 100 ) }% ${ Math.round(
+							focalPoint.y * 100
+					  ) }%`
+					: `50% 50%`,
+		  }
+		: {};
+}
diff --git a/packages/block-library/src/media-text/index.php b/packages/block-library/src/media-text/index.php
new file mode 100644
index 00000000000000..b65137b150ba53
--- /dev/null
+++ b/packages/block-library/src/media-text/index.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Server-side rendering of the `core/media-text` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/media-text` block on server.
+ *
+ * @since 6.6.0
+ *
+ * @param array  $attributes The block attributes.
+ * @param string $content    The block rendered content.
+ *
+ * @return string Returns the Media & Text block markup, if useFeaturedImage is true.
+ */
+function render_block_core_media_text( $attributes, $content ) {
+	if ( false === $attributes['useFeaturedImage'] ) {
+		return $content;
+	}
+
+	if ( in_the_loop() ) {
+		update_post_thumbnail_cache();
+	}
+
+	$current_featured_image = get_the_post_thumbnail_url();
+	if ( ! $current_featured_image ) {
+		return $content;
+	}
+
+	$has_media_on_right = isset( $attributes['mediaPosition'] ) && 'right' === $attributes['mediaPosition'];
+	$image_fill         = isset( $attributes['imageFill'] ) && $attributes['imageFill'];
+	$focal_point        = isset( $attributes['focalPoint'] ) ? round( $attributes['focalPoint']['x'] * 100 ) . '% ' . round( $attributes['focalPoint']['y'] * 100 ) . '%' : '50% 50%';
+	$unique_id          = 'wp-block-media-text__media-' . wp_unique_id();
+
+	$block_tag_processor = new WP_HTML_Tag_Processor( $content );
+	$block_query         = array(
+		'tag_name'   => 'div',
+		'class_name' => 'wp-block-media-text',
+	);
+
+	while ( $block_tag_processor->next_tag( $block_query ) ) {
+		if ( $image_fill ) {
+			// The markup below does not work with the deprecated `is-image-fill` class.
+			$block_tag_processor->remove_class( 'is-image-fill' );
+			$block_tag_processor->add_class( 'is-image-fill-element' );
+		}
+	}
+
+	$content = $block_tag_processor->get_updated_html();
+
+	$media_tag_processor   = new WP_HTML_Tag_Processor( $content );
+	$wrapping_figure_query = array(
+		'tag_name'   => 'figure',
+		'class_name' => 'wp-block-media-text__media',
+	);
+
+	if ( $has_media_on_right ) {
+		// Loop through all the figure tags and set a bookmark on the last figure tag.
+		while ( $media_tag_processor->next_tag( $wrapping_figure_query ) ) {
+			$media_tag_processor->set_bookmark( 'last_figure' );
+		}
+		if ( $media_tag_processor->has_bookmark( 'last_figure' ) ) {
+			$media_tag_processor->seek( 'last_figure' );
+			// Insert a unique ID to identify the figure tag.
+			$media_tag_processor->set_attribute( 'id', $unique_id );
+		}
+	} else {
+		if ( $media_tag_processor->next_tag( $wrapping_figure_query ) ) {
+			// Insert a unique ID to identify the figure tag.
+			$media_tag_processor->set_attribute( 'id', $unique_id );
+		}
+	}
+
+	$content = $media_tag_processor->get_updated_html();
+
+	// Add the image tag inside the figure tag, and update the image attributes
+	// in order to display the featured image.
+	$media_size_slug = isset( $attributes['mediaSizeSlug'] ) ? $attributes['mediaSizeSlug'] : 'full';
+	$image_tag       = '<img class="wp-block-media-text__featured_image">';
+	$content         = preg_replace(
+		'/(<figure\s+id="' . preg_quote( $unique_id, '/' ) . '"\s+class="wp-block-media-text__media"\s*>)/',
+		'$1' . $image_tag,
+		$content
+	);
+
+	$image_tag_processor = new WP_HTML_Tag_Processor( $content );
+	if ( $image_tag_processor->next_tag(
+		array(
+			'tag_name' => 'figure',
+			'id'       => $unique_id,
+		)
+	) ) {
+		// The ID is only used to ensure that the correct figure tag is selected,
+		// and can now be removed.
+		$image_tag_processor->remove_attribute( 'id' );
+		if ( $image_tag_processor->next_tag(
+			array(
+				'tag_name'   => 'img',
+				'class_name' => 'wp-block-media-text__featured_image',
+			)
+		) ) {
+			$image_tag_processor->set_attribute( 'src', esc_url( $current_featured_image ) );
+			$image_tag_processor->set_attribute( 'class', 'wp-image-' . get_post_thumbnail_id() . ' size-' . $media_size_slug );
+			$image_tag_processor->set_attribute( 'alt', trim( strip_tags( get_post_meta( get_post_thumbnail_id(), '_wp_attachment_image_alt', true ) ) ) );
+			if ( $image_fill ) {
+				$image_tag_processor->set_attribute( 'style', 'object-position:' . $focal_point . ';' );
+			}
+
+			$content = $image_tag_processor->get_updated_html();
+		}
+	}
+
+	return $content;
+}
+
+/**
+ * Registers the `core/media-text` block renderer on server.
+ *
+ * @since 6.6.0
+ */
+function register_block_core_media_text() {
+	register_block_type_from_metadata(
+		__DIR__ . '/media-text',
+		array(
+			'render_callback' => 'render_block_core_media_text',
+		)
+	);
+}
+add_action( 'init', 'register_block_core_media_text' );
diff --git a/packages/block-library/src/media-text/media-container.js b/packages/block-library/src/media-text/media-container.js
index 951c0013b76ebc..735aaf73b88aae 100644
--- a/packages/block-library/src/media-text/media-container.js
+++ b/packages/block-library/src/media-text/media-container.js
@@ -1,12 +1,12 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { ResizableBox, Spinner } from '@wordpress/components';
+import { ResizableBox, Spinner, Placeholder } from '@wordpress/components';
 import {
 	BlockControls,
 	BlockIcon,
@@ -22,25 +22,17 @@ import { isBlobURL } from '@wordpress/blob';
 import { store as noticesStore } from '@wordpress/notices';
 import { media as icon } from '@wordpress/icons';
 
+/**
+ * Internal dependencies
+ */
+import { imageFillStyles } from './image-fill';
+
 /**
  * Constants
  */
 const ALLOWED_MEDIA_TYPES = [ 'image', 'video' ];
 const noop = () => {};
 
-export function imageFillStyles( url, focalPoint ) {
-	return url
-		? {
-				backgroundImage: `url(${ url })`,
-				backgroundPosition: focalPoint
-					? `${ Math.round( focalPoint.x * 100 ) }% ${ Math.round(
-							focalPoint.y * 100
-					  ) }%`
-					: `50% 50%`,
-		  }
-		: {};
-}
-
 const ResizableBoxContainer = forwardRef(
 	( { isSelected, isStackedOnMobile, ...props }, ref ) => {
 		const isMobile = useViewportMatch( 'small', '<' );
@@ -56,7 +48,13 @@ const ResizableBoxContainer = forwardRef(
 	}
 );
 
-function ToolbarEditButton( { mediaId, mediaUrl, onSelectMedia } ) {
+function ToolbarEditButton( {
+	mediaId,
+	mediaUrl,
+	onSelectMedia,
+	toggleUseFeaturedImage,
+	useFeaturedImage,
+} ) {
 	return (
 		<BlockControls group="other">
 			<MediaReplaceFlow
@@ -65,12 +63,20 @@ function ToolbarEditButton( { mediaId, mediaUrl, onSelectMedia } ) {
 				allowedTypes={ ALLOWED_MEDIA_TYPES }
 				accept="image/*,video/*"
 				onSelect={ onSelectMedia }
+				onToggleFeaturedImage={ toggleUseFeaturedImage }
+				useFeaturedImage={ useFeaturedImage }
+				onReset={ () => onSelectMedia( undefined ) }
 			/>
 		</BlockControls>
 	);
 }
 
-function PlaceholderContainer( { className, mediaUrl, onSelectMedia } ) {
+function PlaceholderContainer( {
+	className,
+	mediaUrl,
+	onSelectMedia,
+	toggleUseFeaturedImage,
+} ) {
 	const { createErrorNotice } = useDispatch( noticesStore );
 
 	const onUploadError = ( message ) => {
@@ -86,6 +92,7 @@ function PlaceholderContainer( { className, mediaUrl, onSelectMedia } ) {
 			className={ className }
 			onSelect={ onSelectMedia }
 			accept="image/*,video/*"
+			onToggleFeaturedImage={ toggleUseFeaturedImage }
 			allowedTypes={ ALLOWED_MEDIA_TYPES }
 			onError={ onUploadError }
 			disableMediaButtons={ mediaUrl }
@@ -110,13 +117,18 @@ function MediaContainer( props, ref ) {
 		onSelectMedia,
 		onWidthChange,
 		enableResize,
+		toggleUseFeaturedImage,
+		useFeaturedImage,
+		featuredImageURL,
+		featuredImageAlt,
+		refMedia,
 	} = props;
 
 	const isTemporaryMedia = ! mediaId && isBlobURL( mediaUrl );
 
 	const { toggleSelection } = useDispatch( blockEditorStore );
 
-	if ( mediaUrl ) {
+	if ( mediaUrl || featuredImageURL || useFeaturedImage ) {
 		const onResizeStart = () => {
 			toggleSelection( false );
 		};
@@ -132,25 +144,41 @@ function MediaContainer( props, ref ) {
 			left: enableResize && mediaPosition === 'right',
 		};
 
-		const backgroundStyles =
+		const positionStyles =
 			mediaType === 'image' && imageFill
-				? imageFillStyles( mediaUrl, focalPoint )
+				? imageFillStyles( mediaUrl || featuredImageURL, focalPoint )
 				: {};
 
 		const mediaTypeRenderers = {
-			image: () => <img src={ mediaUrl } alt={ mediaAlt } />,
-			video: () => <video controls src={ mediaUrl } />,
+			image: () =>
+				useFeaturedImage && featuredImageURL ? (
+					<img
+						ref={ refMedia }
+						src={ featuredImageURL }
+						alt={ featuredImageAlt }
+						style={ positionStyles }
+					/>
+				) : (
+					mediaUrl && (
+						<img
+							ref={ refMedia }
+							src={ mediaUrl }
+							alt={ mediaAlt }
+							style={ positionStyles }
+						/>
+					)
+				),
+			video: () => <video controls ref={ refMedia } src={ mediaUrl } />,
 		};
 
 		return (
 			<ResizableBoxContainer
 				as="figure"
-				className={ classnames(
+				className={ clsx(
 					className,
 					'editor-media-container__resizer',
 					{ 'is-transient': isTemporaryMedia }
 				) }
-				style={ backgroundStyles }
 				size={ { width: mediaWidth + '%' } }
 				minWidth="10%"
 				maxWidth="100%"
@@ -165,12 +193,24 @@ function MediaContainer( props, ref ) {
 			>
 				<ToolbarEditButton
 					onSelectMedia={ onSelectMedia }
-					mediaUrl={ mediaUrl }
+					mediaUrl={
+						useFeaturedImage && featuredImageURL
+							? featuredImageURL
+							: mediaUrl
+					}
 					mediaId={ mediaId }
+					toggleUseFeaturedImage={ toggleUseFeaturedImage }
 				/>
 				{ ( mediaTypeRenderers[ mediaType ] || noop )() }
 				{ isTemporaryMedia && <Spinner /> }
-				<PlaceholderContainer { ...props } />
+				{ ! useFeaturedImage && <PlaceholderContainer { ...props } /> }
+				{ ! featuredImageURL && useFeaturedImage && (
+					<Placeholder
+						className="wp-block-media-text--placeholder-image"
+						style={ positionStyles }
+						withIllustration
+					/>
+				) }
 			</ResizableBoxContainer>
 		);
 	}
diff --git a/packages/block-library/src/media-text/media-container.native.js b/packages/block-library/src/media-text/media-container.native.js
index dbc30dcf23e7aa..3bf4fbf25d8f2a 100644
--- a/packages/block-library/src/media-text/media-container.native.js
+++ b/packages/block-library/src/media-text/media-container.native.js
@@ -44,8 +44,6 @@ const ICON_TYPE = {
 	RETRY: 'retry',
 };
 
-export { imageFillStyles } from './media-container.js';
-
 class MediaContainer extends Component {
 	constructor() {
 		super( ...arguments );
@@ -130,10 +128,23 @@ class MediaContainer extends Component {
 		return <Icon icon={ icon } { ...iconStyle } />;
 	}
 
-	updateMediaProgress() {
-		if ( ! this.state.isUploadInProgress ) {
+	updateMediaProgress( payload ) {
+		const { isUploadInProgress } = this.state;
+		const { mediaUrl, state } = payload;
+		const { mediaType, onMediaThumbnailUpdate } = this.props;
+
+		if ( ! isUploadInProgress ) {
 			this.setState( { isUploadInProgress: true } );
 		}
+
+		if (
+			isUploadInProgress &&
+			mediaType === MEDIA_TYPE_IMAGE &&
+			mediaUrl &&
+			! state
+		) {
+			onMediaThumbnailUpdate( mediaUrl );
+		}
 	}
 
 	finishMediaUploadWithSuccess( payload ) {
@@ -170,7 +181,7 @@ class MediaContainer extends Component {
 			mediaWidth,
 			shouldStack,
 		} = this.props;
-		const { isUploadFailed, retryMessage } = params;
+		const { isUploadFailed, isUploadPaused, retryMessage } = params;
 		const focalPointValues = ! focalPoint
 			? IMAGE_DEFAULT_FOCAL_POINT
 			: focalPoint;
@@ -203,6 +214,7 @@ class MediaContainer extends Component {
 							focalPoint={ imageFill && focalPointValues }
 							isSelected={ isMediaSelected }
 							isUploadFailed={ isUploadFailed }
+							isUploadPaused={ isUploadPaused }
 							isUploadInProgress={ isUploadInProgress }
 							onSelectMediaUploadOption={
 								this.onSelectMediaUploadOption
@@ -264,7 +276,7 @@ class MediaContainer extends Component {
 										isSelected={ isSelected }
 										style={ styles.video }
 										source={ { uri: mediaUrl } }
-										paused={ true }
+										paused
 									/>
 								</View>
 							) }
@@ -316,7 +328,7 @@ class MediaContainer extends Component {
 				onSelect={ this.onSelectMediaUploadOption }
 				allowedTypes={ ALLOWED_MEDIA_TYPES }
 				onFocus={ this.props.onFocus }
-				className={ 'no-block-outline' }
+				className="no-block-outline"
 			/>
 		);
 	}
@@ -328,7 +340,7 @@ class MediaContainer extends Component {
 		if ( mediaUrl ) {
 			return (
 				<MediaUpload
-					isReplacingMedia={ true }
+					isReplacingMedia
 					onSelect={ this.onSelectMediaUploadOption }
 					allowedTypes={ ALLOWED_MEDIA_TYPES }
 					value={ mediaId }
@@ -340,6 +352,9 @@ class MediaContainer extends Component {
 								{ getMediaOptions() }
 
 								<MediaUploadProgress
+									enablePausedUploads={
+										mediaType === MEDIA_TYPE_IMAGE
+									}
 									coverUrl={ coverUrl }
 									mediaId={ mediaId }
 									onUpdateMediaProgress={
diff --git a/packages/block-library/src/media-text/save.js b/packages/block-library/src/media-text/save.js
index 0a2b1ab3d3946c..3e660d94e789ee 100644
--- a/packages/block-library/src/media-text/save.js
+++ b/packages/block-library/src/media-text/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,7 +11,7 @@ import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
 /**
  * Internal dependencies
  */
-import { imageFillStyles } from './media-container';
+import { imageFillStyles } from './image-fill';
 import { DEFAULT_MEDIA_SIZE_SLUG } from './constants';
 
 const DEFAULT_MEDIA_WIDTH = 50;
@@ -37,18 +37,23 @@ export default function save( { attributes } ) {
 	const mediaSizeSlug = attributes.mediaSizeSlug || DEFAULT_MEDIA_SIZE_SLUG;
 	const newRel = ! rel ? undefined : rel;
 
-	const imageClasses = classnames( {
+	const imageClasses = clsx( {
 		[ `wp-image-${ mediaId }` ]: mediaId && mediaType === 'image',
 		[ `size-${ mediaSizeSlug }` ]: mediaId && mediaType === 'image',
 	} );
 
-	let image = (
+	const positionStyles = imageFill
+		? imageFillStyles( mediaUrl, focalPoint )
+		: {};
+
+	let image = mediaUrl ? (
 		<img
 			src={ mediaUrl }
 			alt={ mediaAlt }
 			className={ imageClasses || null }
+			style={ positionStyles }
 		/>
-	);
+	) : null;
 
 	if ( href ) {
 		image = (
@@ -67,15 +72,12 @@ export default function save( { attributes } ) {
 		image: () => image,
 		video: () => <video controls src={ mediaUrl } />,
 	};
-	const className = classnames( {
+	const className = clsx( {
 		'has-media-on-the-right': 'right' === mediaPosition,
 		'is-stacked-on-mobile': isStackedOnMobile,
 		[ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
-		'is-image-fill': imageFill,
+		'is-image-fill-element': imageFill,
 	} );
-	const backgroundStyles = imageFill
-		? imageFillStyles( mediaUrl, focalPoint )
-		: {};
 
 	let gridTemplateColumns;
 	if ( mediaWidth !== DEFAULT_MEDIA_WIDTH ) {
@@ -96,10 +98,7 @@ export default function save( { attributes } ) {
 						className: 'wp-block-media-text__content',
 					} ) }
 				/>
-				<figure
-					className="wp-block-media-text__media"
-					style={ backgroundStyles }
-				>
+				<figure className="wp-block-media-text__media">
 					{ ( mediaTypeRenders[ mediaType ] || noop )() }
 				</figure>
 			</div>
@@ -107,10 +106,7 @@ export default function save( { attributes } ) {
 	}
 	return (
 		<div { ...useBlockProps.save( { className, style } ) }>
-			<figure
-				className="wp-block-media-text__media"
-				style={ backgroundStyles }
-			>
+			<figure className="wp-block-media-text__media">
 				{ ( mediaTypeRenders[ mediaType ] || noop )() }
 			</figure>
 			<div
diff --git a/packages/block-library/src/media-text/style.native.scss b/packages/block-library/src/media-text/style.native.scss
index 07b584059203ed..4c0f80a5008a8d 100644
--- a/packages/block-library/src/media-text/style.native.scss
+++ b/packages/block-library/src/media-text/style.native.scss
@@ -7,6 +7,7 @@ $media-to-text: 12px;
 }
 
 .has-media-on-the-right {
+	/* stylelint-disable-next-line declaration-property-value-allowed-list -- This should be refactored to not use the row-reverse value. */
 	flex-direction: row-reverse;
 }
 
@@ -14,6 +15,7 @@ $media-to-text: 12px;
 	flex-direction: column;
 
 	&.has-media-on-the-right {
+		/* stylelint-disable-next-line declaration-property-value-allowed-list -- This should be refactored to not use the column-reverse value. */
 		flex-direction: column-reverse;
 	}
 }
diff --git a/packages/block-library/src/media-text/style.scss b/packages/block-library/src/media-text/style.scss
index e43961ac890973..0f7a34f05548c0 100644
--- a/packages/block-library/src/media-text/style.scss
+++ b/packages/block-library/src/media-text/style.scss
@@ -15,27 +15,28 @@
 }
 
 .wp-block-media-text.is-vertically-aligned-top {
-	.wp-block-media-text__content,
-	.wp-block-media-text__media {
+	> .wp-block-media-text__content,
+	> .wp-block-media-text__media {
 		align-self: start;
 	}
 }
+
 .wp-block-media-text,
 .wp-block-media-text.is-vertically-aligned-center {
-	.wp-block-media-text__content,
-	.wp-block-media-text__media {
+	> .wp-block-media-text__content,
+	> .wp-block-media-text__media {
 		align-self: center;
 	}
 }
 
 .wp-block-media-text.is-vertically-aligned-bottom {
-	.wp-block-media-text__content,
-	.wp-block-media-text__media {
+	> .wp-block-media-text__content,
+	> .wp-block-media-text__media {
 		align-self: end;
 	}
 }
 
-.wp-block-media-text .wp-block-media-text__media {
+.wp-block-media-text > .wp-block-media-text__media {
 	/*!rtl:begin:ignore*/
 	grid-column: 1;
 	grid-row: 1;
@@ -43,7 +44,7 @@
 	margin: 0;
 }
 
-.wp-block-media-text .wp-block-media-text__content {
+.wp-block-media-text > .wp-block-media-text__content {
 	direction: ltr;
 	/*!rtl:begin:ignore*/
 	grid-column: 2;
@@ -53,20 +54,24 @@
 	word-break: break-word;
 }
 
-.wp-block-media-text.has-media-on-the-right .wp-block-media-text__media {
+.wp-block-media-text.has-media-on-the-right > .wp-block-media-text__media {
 	/*!rtl:begin:ignore*/
 	grid-column: 2;
 	grid-row: 1;
 	/*!rtl:end:ignore*/
 }
 
-.wp-block-media-text.has-media-on-the-right .wp-block-media-text__content {
+.wp-block-media-text.has-media-on-the-right > .wp-block-media-text__content {
 	/*!rtl:begin:ignore*/
 	grid-column: 1;
 	grid-row: 1;
 	/*!rtl:end:ignore*/
 }
 
+.wp-block-media-text__media a {
+	display: inline-block;
+}
+
 .wp-block-media-text__media img,
 .wp-block-media-text__media video {
 	height: auto;
@@ -75,18 +80,19 @@
 	vertical-align: middle;
 }
 
-.wp-block-media-text.is-image-fill .wp-block-media-text__media {
+/* `is-image-fill` is deprecated and the styles are kept for backwards compatibility. */
+.wp-block-media-text.is-image-fill > .wp-block-media-text__media {
 	height: 100%;
 	min-height: 250px;
 	background-size: cover;
 }
 
-.wp-block-media-text.is-image-fill .wp-block-media-text__media > a {
+.wp-block-media-text.is-image-fill > .wp-block-media-text__media > a {
 	display: block;
 	height: 100%;
 }
 
-.wp-block-media-text.is-image-fill .wp-block-media-text__media img {
+.wp-block-media-text.is-image-fill > .wp-block-media-text__media img {
 	// The image is visually hidden but accessible to assistive technologies.
 	position: absolute;
 	width: 1px;
@@ -97,6 +103,26 @@
 	clip: rect(0, 0, 0, 0);
 	border: 0;
 }
+
+/* Image fill for versions 8 and onwards */
+.wp-block-media-text.is-image-fill-element > .wp-block-media-text__media {
+	position: relative;
+	height: 100%;
+	min-height: 250px;
+}
+
+.wp-block-media-text.is-image-fill-element > .wp-block-media-text__media > a {
+	display: block;
+	height: 100%;
+}
+
+.wp-block-media-text.is-image-fill-element > .wp-block-media-text__media img {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+}
+
 /*
 * Here we here not able to use a mobile first CSS approach.
 * Custom widths are set using inline styles, and on mobile,
@@ -107,11 +133,11 @@
 @media (max-width: #{ ($break-small) }) {
 	.wp-block-media-text.is-stacked-on-mobile {
 		grid-template-columns: 100% !important;
-		.wp-block-media-text__media {
+		> .wp-block-media-text__media {
 			grid-column: 1;
 			grid-row: 1;
 		}
-		.wp-block-media-text__content {
+		> .wp-block-media-text__content {
 			grid-column: 1;
 			grid-row: 2;
 		}
diff --git a/packages/block-library/src/media-text/test/edit.native.js b/packages/block-library/src/media-text/test/edit.native.js
new file mode 100644
index 00000000000000..230005adf8768f
--- /dev/null
+++ b/packages/block-library/src/media-text/test/edit.native.js
@@ -0,0 +1,58 @@
+/**
+ * External dependencies
+ */
+import {
+	addBlock,
+	fireEvent,
+	initializeEditor,
+	screen,
+	setupCoreBlocks,
+} from 'test/helpers';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	requestMediaPicker,
+	sendMediaUpload,
+	subscribeMediaUpload,
+} from '@wordpress/react-native-bridge';
+import { MEDIA_UPLOAD_STATE_PAUSED } from '@wordpress/block-editor';
+
+let uploadCallBack;
+subscribeMediaUpload.mockImplementation( ( callback ) => {
+	uploadCallBack = callback;
+} );
+sendMediaUpload.mockImplementation( ( payload ) => {
+	uploadCallBack( payload );
+} );
+
+setupCoreBlocks( [ 'core/media-text' ] );
+
+describe( 'Media & Text block edit', () => {
+	it( 'should display an error message for failed video uploads', async () => {
+		requestMediaPicker.mockImplementation(
+			( source, filter, multiple, callback ) => {
+				callback( {
+					id: 1,
+					url: 'file://video.mp4',
+					type: 'video',
+				} );
+			}
+		);
+		await initializeEditor();
+		await addBlock( screen, 'Media & Text' );
+		fireEvent.press( screen.getByText( 'Add image or video' ) );
+		fireEvent.press( screen.getByText( 'Choose from device' ) );
+
+		sendMediaUpload( {
+			mediaId: 1,
+			state: MEDIA_UPLOAD_STATE_PAUSED,
+			progress: 0,
+		} );
+
+		expect(
+			screen.getByText( 'Failed to insert media.\nTap for more info.' )
+		).toBeVisible();
+	} );
+} );
diff --git a/packages/block-library/src/media-text/test/image-fill.js b/packages/block-library/src/media-text/test/image-fill.js
new file mode 100644
index 00000000000000..4862fcbfb02453
--- /dev/null
+++ b/packages/block-library/src/media-text/test/image-fill.js
@@ -0,0 +1,19 @@
+/**
+ * Internal dependencies
+ */
+import { imageFillStyles } from '../image-fill';
+
+describe( 'imageFillStyles()', () => {
+	it( 'should return centered object position', () => {
+		const { objectPosition } = imageFillStyles( 'image.jpg' );
+		expect( objectPosition ).toBe( '50% 50%' );
+	} );
+
+	it( 'should return custom object position', () => {
+		const { objectPosition } = imageFillStyles( 'image.jpg', {
+			x: 0.56,
+			y: 0.57,
+		} );
+		expect( objectPosition ).toBe( '56% 57%' );
+	} );
+} );
diff --git a/packages/block-library/src/media-text/test/media-container.js b/packages/block-library/src/media-text/test/media-container.js
deleted file mode 100644
index 582ec2be8d5ad8..00000000000000
--- a/packages/block-library/src/media-text/test/media-container.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Internal dependencies
- */
-import { imageFillStyles } from '../media-container';
-
-describe( 'imageFillStyles()', () => {
-	it( 'should return image url', () => {
-		const { backgroundImage } = imageFillStyles( 'image.jpg' );
-		expect( backgroundImage ).toBe( 'url(image.jpg)' );
-	} );
-
-	it( 'should return centered background position', () => {
-		const { backgroundPosition } = imageFillStyles( 'image.jpg' );
-		expect( backgroundPosition ).toBe( '50% 50%' );
-	} );
-
-	it( 'should return custom background position', () => {
-		const { backgroundPosition } = imageFillStyles( 'image.jpg', {
-			x: 0.56,
-			y: 0.57,
-		} );
-		expect( backgroundPosition ).toBe( '56% 57%' );
-	} );
-} );
diff --git a/packages/block-library/src/missing/block.json b/packages/block-library/src/missing/block.json
index 242a1d2c6b21a8..f9b3efe594753e 100644
--- a/packages/block-library/src/missing/block.json
+++ b/packages/block-library/src/missing/block.json
@@ -23,6 +23,9 @@
 		"customClassName": false,
 		"inserter": false,
 		"html": false,
-		"reusable": false
+		"reusable": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	}
 }
diff --git a/packages/block-library/src/missing/edit.js b/packages/block-library/src/missing/edit.js
index f7aef453b5447c..e7744839b08889 100644
--- a/packages/block-library/src/missing/edit.js
+++ b/packages/block-library/src/missing/edit.js
@@ -5,7 +5,7 @@ import { __, sprintf } from '@wordpress/i18n';
 import { RawHTML } from '@wordpress/element';
 import { Button } from '@wordpress/components';
 import { createBlock } from '@wordpress/blocks';
-import { withDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelect } from '@wordpress/data';
 import {
 	Warning,
 	useBlockProps,
@@ -13,7 +13,7 @@ import {
 } from '@wordpress/block-editor';
 import { safeHTML } from '@wordpress/dom';
 
-function MissingBlockWarning( { attributes, convertToHTML, clientId } ) {
+export default function MissingEdit( { attributes, clientId } ) {
 	const { originalName, originalUndelimitedContent } = attributes;
 	const hasContent = !! originalUndelimitedContent;
 	const { hasFreeformBlock, hasHTMLBlock } = useSelect(
@@ -34,12 +34,27 @@ function MissingBlockWarning( { attributes, convertToHTML, clientId } ) {
 		},
 		[ clientId ]
 	);
+	const { replaceBlock } = useDispatch( blockEditorStore );
+
+	function convertToHTML() {
+		replaceBlock(
+			clientId,
+			createBlock( 'core/html', {
+				content: originalUndelimitedContent,
+			} )
+		);
+	}
 
 	const actions = [];
 	let messageHTML;
 
 	const convertToHtmlButton = (
-		<Button key="convert" onClick={ convertToHTML } variant="primary">
+		<Button
+			__next40pxDefaultSize
+			key="convert"
+			onClick={ convertToHTML }
+			variant="primary"
+		>
 			{ __( 'Keep as HTML' ) }
 		</Button>
 	);
@@ -59,7 +74,7 @@ function MissingBlockWarning( { attributes, convertToHTML, clientId } ) {
 		messageHTML = sprintf(
 			/* translators: %s: block name */
 			__(
-				'Your site doesn’t include support for the "%s" block. You can leave this block intact, convert its content to a Custom HTML block, or remove it entirely.'
+				'Your site doesn’t include support for the "%s" block. You can leave it as-is, convert it to custom HTML, or remove it.'
 			),
 			originalName
 		);
@@ -68,7 +83,7 @@ function MissingBlockWarning( { attributes, convertToHTML, clientId } ) {
 		messageHTML = sprintf(
 			/* translators: %s: block name */
 			__(
-				'Your site doesn’t include support for the "%s" block. You can leave this block intact or remove it entirely.'
+				'Your site doesn’t include support for the "%s" block. You can leave it as-is or remove it.'
 			),
 			originalName
 		);
@@ -81,19 +96,3 @@ function MissingBlockWarning( { attributes, convertToHTML, clientId } ) {
 		</div>
 	);
 }
-
-const MissingEdit = withDispatch( ( dispatch, { clientId, attributes } ) => {
-	const { replaceBlock } = dispatch( blockEditorStore );
-	return {
-		convertToHTML() {
-			replaceBlock(
-				clientId,
-				createBlock( 'core/html', {
-					content: attributes.originalUndelimitedContent,
-				} )
-			);
-		},
-	};
-} )( MissingBlockWarning );
-
-export default MissingEdit;
diff --git a/packages/block-library/src/missing/edit.native.js b/packages/block-library/src/missing/edit.native.js
index a6164f590ca21d..641224cac4e77b 100644
--- a/packages/block-library/src/missing/edit.native.js
+++ b/packages/block-library/src/missing/edit.native.js
@@ -1,12 +1,7 @@
 /**
  * External dependencies
  */
-import {
-	View,
-	Text,
-	TouchableWithoutFeedback,
-	TouchableOpacity,
-} from 'react-native';
+import { View, Text, TouchableOpacity } from 'react-native';
 
 /**
  * WordPress dependencies
@@ -25,6 +20,7 @@ import {
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { store as noticesStore } from '@wordpress/notices';
+import { requestUnsupportedBlockFallback } from '@wordpress/react-native-bridge';
 
 /**
  * Internal dependencies
@@ -48,11 +44,40 @@ export class UnsupportedBlockEdit extends Component {
 	}
 
 	toggleSheet() {
+		const { attributes, block, clientId } = this.props;
+		const { originalName } = attributes;
+		const title = this.getTitle();
+		const blockContent = serialize( block ? [ block ] : [] );
+
+		if ( this.canEditUnsupportedBlock() ) {
+			requestUnsupportedBlockFallback(
+				blockContent,
+				clientId,
+				originalName,
+				title
+			);
+			return;
+		}
+
 		this.setState( {
 			showHelp: ! this.state.showHelp,
 		} );
 	}
 
+	canEditUnsupportedBlock() {
+		const {
+			canEnableUnsupportedBlockEditor,
+			isEditableInUnsupportedBlockEditor,
+			isUnsupportedBlockEditorSupported,
+		} = this.props;
+
+		return (
+			! canEnableUnsupportedBlockEditor &&
+			isUnsupportedBlockEditorSupported &&
+			isEditableInUnsupportedBlockEditor
+		);
+	}
+
 	closeSheet() {
 		this.setState( {
 			showHelp: false,
@@ -88,7 +113,7 @@ export class UnsupportedBlockEdit extends Component {
 				onPress={ this.onHelpButtonPressed }
 				style={ styles.helpIconContainer }
 				accessibilityLabel={ __( 'Help button' ) }
-				accessibilityRole={ 'button' }
+				accessibilityRole="button"
 				accessibilityHint={ __( 'Tap here to show help' ) }
 			>
 				<Icon
@@ -171,7 +196,8 @@ export class UnsupportedBlockEdit extends Component {
 
 	render() {
 		const { originalName } = this.props.attributes;
-		const { getStylesFromColorScheme, preferredColorScheme } = this.props;
+		const { isSelected, getStylesFromColorScheme, preferredColorScheme } =
+			this.props;
 		const blockType = coreBlocks[ originalName ];
 
 		const title = this.getTitle();
@@ -186,7 +212,11 @@ export class UnsupportedBlockEdit extends Component {
 		);
 
 		const subtitle = (
-			<Text style={ subTitleStyle }>{ __( 'Unsupported' ) }</Text>
+			<Text style={ subTitleStyle }>
+				{ this.canEditUnsupportedBlock()
+					? __( 'Tap to edit' )
+					: __( 'Unsupported' ) }
+			</Text>
 		);
 
 		const icon = blockType
@@ -198,10 +228,11 @@ export class UnsupportedBlockEdit extends Component {
 		);
 		const iconClassName = 'unsupported-icon' + '-' + preferredColorScheme;
 		return (
-			<TouchableWithoutFeedback
-				disabled={ ! this.props.isSelected }
+			<TouchableOpacity
+				disabled={ ! isSelected }
+				activeOpacity={ 0.5 }
 				accessibilityLabel={ __( 'Help button' ) }
-				accessibilityRole={ 'button' }
+				accessibilityRole="button"
 				accessibilityHint={ __( 'Tap here to show help' ) }
 				onPress={ this.toggleSheet }
 			>
@@ -211,7 +242,8 @@ export class UnsupportedBlockEdit extends Component {
 						styles.unsupportedBlockDark
 					) }
 				>
-					{ this.renderHelpIcon() }
+					{ ! this.canEditUnsupportedBlock() &&
+						this.renderHelpIcon() }
 					<View style={ styles.unsupportedBlockHeader }>
 						<Icon
 							className={ iconClassName }
@@ -223,7 +255,7 @@ export class UnsupportedBlockEdit extends Component {
 					{ subtitle }
 					{ this.renderSheet( title, originalName ) }
 				</View>
-			</TouchableWithoutFeedback>
+			</TouchableOpacity>
 		);
 	}
 }
diff --git a/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap
index 245410a5c5d570..be91af9e58cc77 100644
--- a/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/missing/test/__snapshots__/edit.native.js.snap
@@ -14,7 +14,16 @@ exports[`Missing block renders without crashing 1`] = `
       "selected": undefined,
     }
   }
+  accessibilityValue={
+    {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
+  collapsable={false}
   focusable={true}
   onClick={[Function]}
   onResponderGrant={[Function]}
@@ -23,72 +32,79 @@ exports[`Missing block renders without crashing 1`] = `
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
+  style={
+    {
+      "opacity": 1,
+    }
+  }
 >
-  <View
-    accessibilityHint="Tap here to show help"
-    accessibilityLabel="Help button"
-    accessibilityRole="button"
-    accessibilityState={
-      {
-        "busy": undefined,
-        "checked": undefined,
-        "disabled": undefined,
-        "expanded": undefined,
-        "selected": undefined,
+  <View>
+    <View
+      accessibilityHint="Tap here to show help"
+      accessibilityLabel="Help button"
+      accessibilityRole="button"
+      accessibilityState={
+        {
+          "busy": undefined,
+          "checked": undefined,
+          "disabled": undefined,
+          "expanded": undefined,
+          "selected": undefined,
+        }
       }
-    }
-    accessibilityValue={
-      {
-        "max": undefined,
-        "min": undefined,
-        "now": undefined,
-        "text": undefined,
+      accessibilityValue={
+        {
+          "max": undefined,
+          "min": undefined,
+          "now": undefined,
+          "text": undefined,
+        }
       }
-    }
-    accessible={true}
-    collapsable={false}
-    focusable={true}
-    onClick={[Function]}
-    onResponderGrant={[Function]}
-    onResponderMove={[Function]}
-    onResponderRelease={[Function]}
-    onResponderTerminate={[Function]}
-    onResponderTerminationRequest={[Function]}
-    onStartShouldSetResponder={[Function]}
-    style={
-      {
-        "opacity": 1,
+      accessible={true}
+      collapsable={false}
+      focusable={true}
+      onClick={[Function]}
+      onResponderGrant={[Function]}
+      onResponderMove={[Function]}
+      onResponderRelease={[Function]}
+      onResponderTerminate={[Function]}
+      onResponderTerminationRequest={[Function]}
+      onStartShouldSetResponder={[Function]}
+      style={
+        {
+          "opacity": 1,
+        }
       }
-    }
-  >
-    <Svg
-      height={24}
-      label="Help icon"
-      style={{}}
-      viewBox="0 0 24 24"
-      width={24}
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      Path
-    </Svg>
-  </View>
-  <View>
-    <Svg
-      fill="white"
-      height={24}
-      style={{}}
-      viewBox="0 0 24 24"
-      width={24}
-      xmlns="http://www.w3.org/2000/svg"
     >
-      Path
-    </Svg>
+      <Svg
+        height={24}
+        label="Help icon"
+        style={{}}
+        viewBox="0 0 24 24"
+        width={24}
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        Path
+      </Svg>
+    </View>
+    <View>
+      <Svg
+        fill="white"
+        height={24}
+        style={{}}
+        viewBox="0 0 24 24"
+        width={24}
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        Path
+      </Svg>
+      <Text>
+        missing/block/title
+      </Text>
+    </View>
     <Text>
-      missing/block/title
+      Unsupported
     </Text>
   </View>
-  <Text>
-    Unsupported
-  </Text>
 </View>
 `;
diff --git a/packages/block-library/src/missing/test/edit-integration.native.js b/packages/block-library/src/missing/test/edit-integration.native.js
index 04b0bce688c3d2..68f5a8606124d4 100644
--- a/packages/block-library/src/missing/test/edit-integration.native.js
+++ b/packages/block-library/src/missing/test/edit-integration.native.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import {
+	act,
 	fireEvent,
 	getBlock,
 	initializeEditor,
@@ -117,7 +118,7 @@ describe( 'Unsupported block', () => {
 				screen.getByTestId( 'bottom-sheet' ),
 				MODAL_DISMISS_EVENT
 			);
-			jest.runOnlyPendingTimers();
+			act( () => jest.runOnlyPendingTimers() );
 		} );
 		expect( requestUnsupportedBlockFallback ).toHaveBeenCalled();
 	} );
diff --git a/packages/block-library/src/more/block.json b/packages/block-library/src/more/block.json
index bfd95652ea1767..d1153ca4f1689d 100644
--- a/packages/block-library/src/more/block.json
+++ b/packages/block-library/src/more/block.json
@@ -9,7 +9,8 @@
 	"textdomain": "default",
 	"attributes": {
 		"customText": {
-			"type": "string"
+			"type": "string",
+			"default": ""
 		},
 		"noTeaser": {
 			"type": "boolean",
@@ -20,7 +21,10 @@
 		"customClassName": false,
 		"className": false,
 		"html": false,
-		"multiple": false
+		"multiple": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-more-editor"
 }
diff --git a/packages/block-library/src/more/edit.js b/packages/block-library/src/more/edit.js
index 7757af5e96ba1c..bcad7ec1b83662 100644
--- a/packages/block-library/src/more/edit.js
+++ b/packages/block-library/src/more/edit.js
@@ -16,8 +16,7 @@ export default function MoreEdit( {
 } ) {
 	const onChangeInput = ( event ) => {
 		setAttributes( {
-			customText:
-				event.target.value !== '' ? event.target.value : undefined,
+			customText: event.target.value,
 		} );
 	};
 
diff --git a/packages/block-library/src/more/index.js b/packages/block-library/src/more/index.js
index 4c1fad3cb67f48..b40bb2123bc727 100644
--- a/packages/block-library/src/more/index.js
+++ b/packages/block-library/src/more/index.js
@@ -20,6 +20,12 @@ export const settings = {
 	icon,
 	example: {},
 	__experimentalLabel( attributes, { context } ) {
+		const customName = attributes?.metadata?.name;
+
+		if ( context === 'list-view' && customName ) {
+			return customName;
+		}
+
 		if ( context === 'accessibility' ) {
 			return attributes.customText;
 		}
diff --git a/packages/block-library/src/navigation-link/block.json b/packages/block-library/src/navigation-link/block.json
index d8f2fe31aef9dd..2762bd24e446a6 100644
--- a/packages/block-library/src/navigation-link/block.json
+++ b/packages/block-library/src/navigation-link/block.json
@@ -5,6 +5,11 @@
 	"title": "Custom Link",
 	"category": "design",
 	"parent": [ "core/navigation" ],
+	"allowedBlocks": [
+		"core/navigation-link",
+		"core/navigation-submenu",
+		"core/page-list"
+	],
 	"description": "Add a page, link, or another item to your navigation.",
 	"textdomain": "default",
 	"attributes": {
@@ -72,7 +77,10 @@
 				"fontSize": true
 			}
 		},
-		"renaming": false
+		"renaming": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-navigation-link-editor",
 	"style": "wp-block-navigation-link"
diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index f6936e8ecfe362..9e2e171975570f 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -16,7 +16,7 @@ import {
 	Tooltip,
 	ToolbarGroup,
 } from '@wordpress/components';
-import { displayShortcut, isKeyboardEvent, ENTER } from '@wordpress/keycodes';
+import { displayShortcut, isKeyboardEvent } from '@wordpress/keycodes';
 import { __ } from '@wordpress/i18n';
 import {
 	BlockControls,
@@ -29,14 +29,11 @@ import {
 } from '@wordpress/block-editor';
 import { isURL, prependHTTP, safeDecodeURI } from '@wordpress/url';
 import { useState, useEffect, useRef } from '@wordpress/element';
-import {
-	placeCaretAtHorizontalEdge,
-	__unstableStripHTML as stripHTML,
-} from '@wordpress/dom';
+import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
 import { decodeEntities } from '@wordpress/html-entities';
 import { link as linkIcon, addSubmenu } from '@wordpress/icons';
 import { store as coreStore } from '@wordpress/core-data';
-import { useMergeRefs } from '@wordpress/compose';
+import { useMergeRefs, usePrevious } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -45,6 +42,8 @@ import { LinkUI } from './link-ui';
 import { updateAttributes } from './update-attributes';
 import { getColors } from '../navigation/edit/utils';
 
+const DEFAULT_BLOCK = { name: 'core/navigation-link' };
+
 /**
  * A React hook to determine if it's dragging within the target element.
  *
@@ -91,7 +90,7 @@ const useIsDraggingWithin = ( elementRef ) => {
 			ownerDocument.removeEventListener( 'dragend', handleDragEnd );
 			ownerDocument.removeEventListener( 'dragenter', handleDragEnter );
 		};
-	}, [] );
+	}, [ elementRef ] );
 
 	return isDraggingWithin;
 };
@@ -154,6 +153,82 @@ function getMissingText( type ) {
 	return missingText;
 }
 
+/*
+ * Warning, this duplicated in
+ * packages/block-library/src/navigation-submenu/edit.js
+ * Consider reuseing this components for both blocks.
+ */
+function Controls( { attributes, setAttributes, setIsLabelFieldFocused } ) {
+	const { label, url, description, title, rel } = attributes;
+	return (
+		<PanelBody title={ __( 'Settings' ) }>
+			<TextControl
+				__nextHasNoMarginBottom
+				__next40pxDefaultSize
+				value={ label ? stripHTML( label ) : '' }
+				onChange={ ( labelValue ) => {
+					setAttributes( { label: labelValue } );
+				} }
+				label={ __( 'Text' ) }
+				autoComplete="off"
+				onFocus={ () => setIsLabelFieldFocused( true ) }
+				onBlur={ () => setIsLabelFieldFocused( false ) }
+			/>
+			<TextControl
+				__nextHasNoMarginBottom
+				__next40pxDefaultSize
+				value={ url ? safeDecodeURI( url ) : '' }
+				onChange={ ( urlValue ) => {
+					updateAttributes(
+						{ url: urlValue },
+						setAttributes,
+						attributes
+					);
+				} }
+				label={ __( 'Link' ) }
+				autoComplete="off"
+			/>
+			<TextareaControl
+				__nextHasNoMarginBottom
+				value={ description || '' }
+				onChange={ ( descriptionValue ) => {
+					setAttributes( { description: descriptionValue } );
+				} }
+				label={ __( 'Description' ) }
+				help={ __(
+					'The description will be displayed in the menu if the current theme supports it.'
+				) }
+			/>
+			<TextControl
+				__nextHasNoMarginBottom
+				__next40pxDefaultSize
+				value={ title || '' }
+				onChange={ ( titleValue ) => {
+					setAttributes( { title: titleValue } );
+				} }
+				label={ __( 'Title attribute' ) }
+				autoComplete="off"
+				help={ __(
+					'Additional information to help clarify the purpose of the link.'
+				) }
+			/>
+			<TextControl
+				__nextHasNoMarginBottom
+				__next40pxDefaultSize
+				value={ rel || '' }
+				onChange={ ( relValue ) => {
+					setAttributes( { rel: relValue } );
+				} }
+				label={ __( 'Rel attribute' ) }
+				autoComplete="off"
+				help={ __(
+					'The relationship of the linked URL as space-separated link types.'
+				) }
+			/>
+		</PanelBody>
+	);
+}
+
 export default function NavigationLinkEdit( {
 	attributes,
 	isSelected,
@@ -164,14 +239,21 @@ export default function NavigationLinkEdit( {
 	context,
 	clientId,
 } ) {
-	const { id, label, type, url, description, rel, title, kind } = attributes;
+	const { id, label, type, url, description, kind } = attributes;
 
 	const [ isInvalid, isDraft ] = useIsInvalidLink( kind, type, id );
 	const { maxNestingLevel } = context;
 
-	const { replaceBlock, __unstableMarkNextChangeAsNotPersistent } =
-		useDispatch( blockEditorStore );
-	const [ isLinkOpen, setIsLinkOpen ] = useState( false );
+	const {
+		replaceBlock,
+		__unstableMarkNextChangeAsNotPersistent,
+		selectBlock,
+		selectPreviousBlock,
+	} = useDispatch( blockEditorStore );
+	// Have the link editing ui open on mount when lacking a url and selected.
+	const [ isLinkOpen, setIsLinkOpen ] = useState( isSelected && ! url );
+	// Store what element opened the popover, so we know where to return focus to (toolbar button vs navigation link text)
+	const [ openedBy, setOpenedBy ] = useState( null );
 	// Use internal state instead of a ref to make sure that the component
 	// re-renders when the popover's anchor updates.
 	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
@@ -179,13 +261,14 @@ export default function NavigationLinkEdit( {
 	const isDraggingWithin = useIsDraggingWithin( listItemRef );
 	const itemLabelPlaceholder = __( 'Add label…' );
 	const ref = useRef();
+	const linkUIref = useRef();
+	const prevUrl = usePrevious( url );
 
 	// Change the label using inspector causes rich text to change focus on firefox.
 	// This is a workaround to keep the focus on the label field when label filed is focused we don't render the rich text.
 	const [ isLabelFieldFocused, setIsLabelFieldFocused ] = useState( false );
 
 	const {
-		innerBlocks,
 		isAtMaxNesting,
 		isTopLevelLink,
 		isParentOfSelectedBlock,
@@ -193,7 +276,6 @@ export default function NavigationLinkEdit( {
 	} = useSelect(
 		( select ) => {
 			const {
-				getBlocks,
 				getBlockCount,
 				getBlockName,
 				getBlockRootClientId,
@@ -202,7 +284,6 @@ export default function NavigationLinkEdit( {
 			} = select( blockEditorStore );
 
 			return {
-				innerBlocks: getBlocks( clientId ),
 				isAtMaxNesting:
 					getBlockParentsByBlockName( clientId, [
 						'core/navigation-link',
@@ -218,32 +299,26 @@ export default function NavigationLinkEdit( {
 				hasChildren: !! getBlockCount( clientId ),
 			};
 		},
-		[ clientId ]
+		[ clientId, maxNestingLevel ]
 	);
+	const { getBlocks } = useSelect( blockEditorStore );
 
 	/**
 	 * Transform to submenu block.
 	 */
-	function transformToSubmenu() {
+	const transformToSubmenu = () => {
+		let innerBlocks = getBlocks( clientId );
+		if ( innerBlocks.length === 0 ) {
+			innerBlocks = [ createBlock( 'core/navigation-link' ) ];
+			selectBlock( innerBlocks[ 0 ].clientId );
+		}
 		const newSubmenu = createBlock(
 			'core/navigation-submenu',
 			attributes,
-			innerBlocks.length > 0
-				? innerBlocks
-				: [ createBlock( 'core/navigation-link' ) ]
+			innerBlocks
 		);
 		replaceBlock( clientId, newSubmenu );
-	}
-
-	useEffect( () => {
-		// Show the LinkControl on mount if the URL is empty
-		// ( When adding a new menu item)
-		// This can't be done in the useState call because it conflicts
-		// with the autofocus behavior of the BlockListBlock component.
-		if ( ! url ) {
-			setIsLinkOpen( true );
-		}
-	}, [ url ] );
+	};
 
 	useEffect( () => {
 		// If block has inner blocks, transform to Submenu.
@@ -255,32 +330,20 @@ export default function NavigationLinkEdit( {
 		}
 	}, [ hasChildren ] );
 
-	/**
-	 * The hook shouldn't be necessary but due to a focus loss happening
-	 * when selecting a suggestion in the link popover, we force close on block unselection.
-	 */
-	useEffect( () => {
-		if ( ! isSelected ) {
-			setIsLinkOpen( false );
-		}
-	}, [ isSelected ] );
-
 	// If the LinkControl popover is open and the URL has changed, close the LinkControl and focus the label text.
 	useEffect( () => {
-		if ( isLinkOpen && url ) {
-			// Does this look like a URL and have something TLD-ish?
-			if (
-				isURL( prependHTTP( label ) ) &&
-				/^.+\.[a-z]+/.test( label )
-			) {
-				// Focus and select the label text.
-				selectLabelText();
-			} else {
-				// Focus it (but do not select).
-				placeCaretAtHorizontalEdge( ref.current, true );
-			}
+		// We only want to do this when the URL has gone from nothing to a new URL AND the label looks like a URL
+		if (
+			! prevUrl &&
+			url &&
+			isLinkOpen &&
+			isURL( prependHTTP( label ) ) &&
+			/^.+\.[a-z]+/.test( label )
+		) {
+			// Focus and select the label text.
+			selectLabelText();
 		}
-	}, [ url ] );
+	}, [ prevUrl, url, isLinkOpen, label ] );
 
 	/**
 	 * Focus the Link label text and select it.
@@ -327,17 +390,21 @@ export default function NavigationLinkEdit( {
 	} = getColors( context, ! isTopLevelLink );
 
 	function onKeyDown( event ) {
-		if (
-			isKeyboardEvent.primary( event, 'k' ) ||
-			( ( ! url || isDraft || isInvalid ) && event.keyCode === ENTER )
-		) {
+		if ( isKeyboardEvent.primary( event, 'k' ) ) {
+			// Required to prevent the command center from opening,
+			// as it shares the CMD+K shortcut.
+			// See https://github.com/WordPress/gutenberg/pull/59845.
+			event.preventDefault();
+			// If this link is a child of a parent submenu item, the parent submenu item event will also open, closing this popover
+			event.stopPropagation();
 			setIsLinkOpen( true );
+			setOpenedBy( ref.current );
 		}
 	}
 
 	const blockProps = useBlockProps( {
 		ref: useMergeRefs( [ setPopoverAnchor, listItemRef ] ),
-		className: classnames( 'wp-block-navigation-item', {
+		className: clsx( 'wp-block-navigation-item', {
 			'is-editing': isSelected || isParentOfSelectedBlock,
 			'is-dragging-within': isDraggingWithin,
 			'has-link': !! url,
@@ -355,22 +422,12 @@ export default function NavigationLinkEdit( {
 		onKeyDown,
 	} );
 
-	const ALLOWED_BLOCKS = [
-		'core/navigation-link',
-		'core/navigation-submenu',
-		'core/page-list',
-	];
-	const DEFAULT_BLOCK = {
-		name: 'core/navigation-link',
-	};
-
 	const innerBlocksProps = useInnerBlocksProps(
 		{
 			...blockProps,
 			className: 'remove-outline', // Remove the outline from the inner blocks container.
 		},
 		{
-			allowedBlocks: ALLOWED_BLOCKS,
 			defaultBlock: DEFAULT_BLOCK,
 			directInsert: true,
 			renderAppender: false,
@@ -378,10 +435,13 @@ export default function NavigationLinkEdit( {
 	);
 
 	if ( ! url || isInvalid || isDraft ) {
-		blockProps.onClick = () => setIsLinkOpen( true );
+		blockProps.onClick = () => {
+			setIsLinkOpen( true );
+			setOpenedBy( ref.current );
+		};
 	}
 
-	const classes = classnames( 'wp-block-navigation-item__content', {
+	const classes = clsx( 'wp-block-navigation-item__content', {
 		'wp-block-navigation-link__placeholder': ! url || isInvalid || isDraft,
 	} );
 
@@ -404,7 +464,10 @@ export default function NavigationLinkEdit( {
 						icon={ linkIcon }
 						title={ __( 'Link' ) }
 						shortcut={ displayShortcut.primary( 'k' ) }
-						onClick={ () => setIsLinkOpen( true ) }
+						onClick={ ( event ) => {
+							setIsLinkOpen( true );
+							setOpenedBy( event.currentTarget );
+						} }
 					/>
 					{ ! isAtMaxNesting && (
 						<ToolbarButton
@@ -418,67 +481,11 @@ export default function NavigationLinkEdit( {
 			</BlockControls>
 			{ /* Warning, this duplicated in packages/block-library/src/navigation-submenu/edit.js */ }
 			<InspectorControls>
-				<PanelBody title={ __( 'Settings' ) }>
-					<TextControl
-						__nextHasNoMarginBottom
-						value={ label ? stripHTML( label ) : '' }
-						onChange={ ( labelValue ) => {
-							setAttributes( { label: labelValue } );
-						} }
-						label={ __( 'Label' ) }
-						autoComplete="off"
-						onFocus={ () => setIsLabelFieldFocused( true ) }
-						onBlur={ () => setIsLabelFieldFocused( false ) }
-					/>
-					<TextControl
-						__nextHasNoMarginBottom
-						value={ url ? safeDecodeURI( url ) : '' }
-						onChange={ ( urlValue ) => {
-							updateAttributes(
-								{ url: urlValue },
-								setAttributes,
-								attributes
-							);
-						} }
-						label={ __( 'URL' ) }
-						autoComplete="off"
-					/>
-					<TextareaControl
-						__nextHasNoMarginBottom
-						value={ description || '' }
-						onChange={ ( descriptionValue ) => {
-							setAttributes( { description: descriptionValue } );
-						} }
-						label={ __( 'Description' ) }
-						help={ __(
-							'The description will be displayed in the menu if the current theme supports it.'
-						) }
-					/>
-					<TextControl
-						__nextHasNoMarginBottom
-						value={ title || '' }
-						onChange={ ( titleValue ) => {
-							setAttributes( { title: titleValue } );
-						} }
-						label={ __( 'Title attribute' ) }
-						autoComplete="off"
-						help={ __(
-							'Additional information to help clarify the purpose of the link.'
-						) }
-					/>
-					<TextControl
-						__nextHasNoMarginBottom
-						value={ rel || '' }
-						onChange={ ( relValue ) => {
-							setAttributes( { rel: relValue } );
-						} }
-						label={ __( 'Rel attribute' ) }
-						autoComplete="off"
-						help={ __(
-							'The relationship of the linked URL as space-separated link types.'
-						) }
-					/>
-				</PanelBody>
+				<Controls
+					attributes={ attributes }
+					setAttributes={ setAttributes }
+					setIsLabelFieldFocused={ setIsLabelFieldFocused }
+				/>
 			</InspectorControls>
 			<div { ...blockProps }>
 				{ /* eslint-disable jsx-a11y/anchor-is-valid */ }
@@ -526,11 +533,6 @@ export default function NavigationLinkEdit( {
 												'core/image',
 												'core/strikethrough',
 											] }
-											onClick={ () => {
-												if ( ! url ) {
-													setIsLinkOpen( true );
-												}
-											} }
 										/>
 										{ description && (
 											<span className="wp-block-navigation-item__description">
@@ -569,9 +571,44 @@ export default function NavigationLinkEdit( {
 					) }
 					{ isLinkOpen && (
 						<LinkUI
+							ref={ linkUIref }
 							clientId={ clientId }
 							link={ attributes }
-							onClose={ () => setIsLinkOpen( false ) }
+							onClose={ () => {
+								// If there is no link then remove the auto-inserted block.
+								// This avoids empty blocks which can provided a poor UX.
+								if ( ! url ) {
+									// Fixes https://github.com/WordPress/gutenberg/issues/61361
+									// There's a chance we're closing due to the user selecting the browse all button.
+									// Only move focus if the focus is still within the popover ui. If it's not within
+									// the popover, it's because something has taken the focus from the popover, and
+									// we don't want to steal it back.
+									if (
+										linkUIref.current.contains(
+											window.document.activeElement
+										)
+									) {
+										// Select the previous block to keep focus nearby
+										selectPreviousBlock( clientId, true );
+									}
+
+									// Remove the link.
+									onReplace( [] );
+									return;
+								}
+
+								setIsLinkOpen( false );
+								if ( openedBy ) {
+									openedBy.focus();
+									setOpenedBy( null );
+								} else if ( ref.current ) {
+									// select the ref when adding a new link
+									ref.current.focus();
+								} else {
+									// Fallback
+									selectPreviousBlock( clientId, true );
+								}
+							} }
 							anchor={ popoverAnchor }
 							onRemove={ removeLink }
 							onChange={ ( updatedValue ) => {
diff --git a/packages/block-library/src/navigation-link/editor.scss b/packages/block-library/src/navigation-link/editor.scss
index 6d1dc32e5310b5..84cd6f6d4ee363 100644
--- a/packages/block-library/src/navigation-link/editor.scss
+++ b/packages/block-library/src/navigation-link/editor.scss
@@ -87,9 +87,6 @@
 		$stop2: 64%;
 
 		--wp-underline-color: var(--wp-admin-theme-color);
-		.is-dark-theme & {
-			--wp-underline-color: #{ $dark-theme-focus };
-		}
 
 		background-image:
 			linear-gradient(45deg, transparent ($stop1 - $blur), var(--wp-underline-color) $stop1, var(--wp-underline-color) ($stop1 + $width), transparent ($stop1 + $width + $blur)),
diff --git a/packages/block-library/src/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
index 1165ce94b5921f..5653e04fca88a3 100644
--- a/packages/block-library/src/navigation-link/index.php
+++ b/packages/block-library/src/navigation-link/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Server-side rendering of the `core/navigation-link` block.
+ * Server-side registering and rendering of the `core/navigation-link` block.
  *
  * @package WordPress
  */
@@ -9,6 +9,8 @@
  * Build an array with CSS classes and inline styles defining the colors
  * which will be applied to the navigation markup in the front-end.
  *
+ * @since 5.9.0
+ *
  * @param  array $context     Navigation block context.
  * @param  array $attributes  Block attributes.
  * @param  bool  $is_sub_menu Whether the link is part of a sub-menu.
@@ -79,6 +81,8 @@ function block_core_navigation_link_build_css_colors( $context, $attributes, $is
  * Build an array with CSS classes and inline styles defining the font sizes
  * which will be applied to the navigation markup in the front-end.
  *
+ * @since 5.9.0
+ *
  * @param  array $context Navigation block context.
  * @return array Font size CSS classes and inline styles.
  */
@@ -113,6 +117,8 @@ function block_core_navigation_link_build_css_font_sizes( $context ) {
 /**
  * Returns the top-level submenu SVG chevron icon.
  *
+ * @since 5.9.0
+ *
  * @return string
  */
 function block_core_navigation_link_render_submenu_icon() {
@@ -122,6 +128,8 @@ function block_core_navigation_link_render_submenu_icon() {
 /**
  * Decodes a url if it's encoded, returning the same url if not.
  *
+ * @since 6.2.0
+ *
  * @param string $url The url to decode.
  *
  * @return string $url Returns the decoded url.
@@ -132,6 +140,10 @@ function block_core_navigation_link_maybe_urldecode( $url ) {
 	$query_params   = wp_parse_args( $query );
 
 	foreach ( $query_params as $query_param ) {
+		$can_query_param_be_encoded = is_string( $query_param ) && ! empty( $query_param );
+		if ( ! $can_query_param_be_encoded ) {
+			continue;
+		}
 		if ( rawurldecode( $query_param ) !== $query_param ) {
 			$is_url_encoded = true;
 			break;
@@ -149,6 +161,8 @@ function block_core_navigation_link_maybe_urldecode( $url ) {
 /**
  * Renders the `core/navigation-link` block.
  *
+ * @since 5.9.0
+ *
  * @param array    $attributes The block attributes.
  * @param string   $content    The saved content.
  * @param WP_Block $block      The parsed block.
@@ -184,6 +198,13 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
 	$kind        = empty( $attributes['kind'] ) ? 'post_type' : str_replace( '-', '_', $attributes['kind'] );
 	$is_active   = ! empty( $attributes['id'] ) && get_queried_object_id() === (int) $attributes['id'] && ! empty( get_queried_object()->$kind );
 
+	if ( is_post_type_archive() ) {
+		$queried_archive_link = get_post_type_archive_link( get_queried_object()->name );
+		if ( $attributes['url'] === $queried_archive_link ) {
+			$is_active = true;
+		}
+	}
+
 	$wrapper_attributes = get_block_wrapper_attributes(
 		array(
 			'class' => $css_classes . ' wp-block-navigation-item' . ( $has_submenu ? ' has-child' : '' ) .
@@ -265,6 +286,8 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
 /**
  * Returns a navigation link variation
  *
+ * @since 5.9.0
+ *
  * @param WP_Taxonomy|WP_Post_Type $entity post type or taxonomy entity.
  * @param string                   $kind string of value 'taxonomy' or 'post-type'.
  *
@@ -323,41 +346,40 @@ function build_variation_for_navigation_link( $entity, $kind ) {
 }
 
 /**
- * Register a variation for a post type / taxonomy for the navigation link block
+ * Filters the registered variations for a block type.
+ * Returns the dynamically built variations for all post-types and taxonomies.
+ *
+ * @since 6.5.0
  *
- * @param array $variation Variation array from build_variation_for_navigation_link.
- * @return void
+ * @param array         $variations Array of registered variations for a block type.
+ * @param WP_Block_Type $block_type The full block type object.
  */
-function register_block_core_navigation_link_variation( $variation ) {
-	// Directly set the variations on the registered block type
-	// because there's no server side registration for variations (see #47170).
-	$navigation_block_type = WP_Block_Type_Registry::get_instance()->get_registered( 'core/navigation-link' );
-	// If the block is not registered yet, bail early.
-	// Variation will be registered in register_block_core_navigation_link then.
-	if ( ! $navigation_block_type ) {
-		return;
+function block_core_navigation_link_filter_variations( $variations, $block_type ) {
+	if ( 'core/navigation-link' !== $block_type->name ) {
+		return $variations;
 	}
 
-	$navigation_block_type->variations[] = $variation;
+	$generated_variations = block_core_navigation_link_build_variations();
+	return array_merge( $variations, $generated_variations );
 }
 
 /**
- * Register the navigation link block.
+ * Returns an array of variations for the navigation link block.
  *
- * @uses render_block_core_navigation()
- * @throws WP_Error An WP_Error exception parsing the block definition.
+ * @since 6.5.0
+ *
+ * @return array
  */
-function register_block_core_navigation_link() {
-	// This will only handle post types and taxonomies registered until this point (init on priority 9).
-	// See action hooks below for other post types and taxonomies.
-	// See https://github.com/WordPress/gutenberg/issues/53826 for details.
+function block_core_navigation_link_build_variations() {
 	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
 	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'objects' );
 
-	// Use two separate arrays as a way to order the variations in the UI.
-	// Known variations (like Post Link and Page Link) are added to the
-	// `built_ins` array. Variations for custom post types and taxonomies are
-	// added to the `variations` array and will always appear after `built-ins.
+	/*
+	 * Use two separate arrays as a way to order the variations in the UI.
+	 * Known variations (like Post Link and Page Link) are added to the
+	 * `built_ins` array. Variations for custom post types and taxonomies are
+	 * added to the `variations` array and will always appear after `built-ins.
+	 */
 	$built_ins  = array();
 	$variations = array();
 
@@ -382,47 +404,28 @@ function register_block_core_navigation_link() {
 		}
 	}
 
+	return array_merge( $built_ins, $variations );
+}
+
+/**
+ * Registers the navigation link block.
+ *
+ * @since 5.9.0
+ *
+ * @uses render_block_core_navigation_link()
+ * @throws WP_Error An WP_Error exception parsing the block definition.
+ */
+function register_block_core_navigation_link() {
 	register_block_type_from_metadata(
 		__DIR__ . '/navigation-link',
 		array(
 			'render_callback' => 'render_block_core_navigation_link',
-			'variations'      => array_merge( $built_ins, $variations ),
 		)
 	);
 }
 add_action( 'init', 'register_block_core_navigation_link' );
-// Register actions for all post types and taxonomies, to add variations when they are registered.
-// All post types/taxonomies registered before register_block_core_navigation_link, will be handled by that function.
-add_action( 'registered_post_type', 'register_block_core_navigation_link_post_type_variation', 10, 2 );
-add_action( 'registered_taxonomy', 'register_block_core_navigation_link_taxonomy_variation', 10, 3 );
-
-/**
- * Register custom post type variations for navigation link on post type registration
- * Handles all post types registered after the block is registered in register_navigation_link_post_type_variations
- *
- * @param string       $post_type The post type name passed from registered_post_type filter.
- * @param WP_Post_Type $post_type_object The post type object passed from registered_post_type.
- * @return void
- */
-function register_block_core_navigation_link_post_type_variation( $post_type, $post_type_object ) {
-	if ( $post_type_object->show_in_nav_menus ) {
-		$variation = build_variation_for_navigation_link( $post_type_object, 'post-type' );
-		register_block_core_navigation_link_variation( $variation );
-	}
-}
-
 /**
- * Register a custom taxonomy variation for navigation link on taxonomy registration
- * Handles all taxonomies registered after the block is registered in register_navigation_link_post_type_variations
- *
- * @param string       $taxonomy Taxonomy slug.
- * @param array|string $object_type Object type or array of object types.
- * @param array        $args Array of taxonomy registration arguments.
- * @return void
+ * Creates all variations for post types / taxonomies dynamically (= each time when variations are requested).
+ * Do not use variation_callback, to also account for unregistering post types/taxonomies later on.
  */
-function register_block_core_navigation_link_taxonomy_variation( $taxonomy, $object_type, $args ) {
-	if ( isset( $args['show_in_nav_menus'] ) && $args['show_in_nav_menus'] ) {
-		$variation = build_variation_for_navigation_link( (object) $args, 'post-type' );
-		register_block_core_navigation_link_variation( $variation );
-	}
-}
+add_action( 'get_block_type_variations', 'block_core_navigation_link_filter_variations', 10, 2 );
diff --git a/packages/block-library/src/navigation-link/link-ui.js b/packages/block-library/src/navigation-link/link-ui.js
index 3c3d91e7b0a052..ee238c71ed28e0 100644
--- a/packages/block-library/src/navigation-link/link-ui.js
+++ b/packages/block-library/src/navigation-link/link-ui.js
@@ -2,21 +2,43 @@
  * WordPress dependencies
  */
 import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
-import { Popover, Button } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
+import {
+	Popover,
+	Button,
+	VisuallyHidden,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { __, sprintf, isRTL } from '@wordpress/i18n';
 import {
 	__experimentalLinkControl as LinkControl,
-	BlockIcon,
 	store as blockEditorStore,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
-import { createInterpolateElement, useMemo } from '@wordpress/element';
+import {
+	createInterpolateElement,
+	useMemo,
+	useState,
+	useRef,
+	useEffect,
+	forwardRef,
+} from '@wordpress/element';
 import {
 	store as coreStore,
 	useResourcePermissions,
 } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
-import { switchToBlockType } from '@wordpress/blocks';
 import { useSelect, useDispatch } from '@wordpress/data';
+import { chevronLeftSmall, chevronRightSmall, plus } from '@wordpress/icons';
+import { useInstanceId, useFocusOnMount } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../lock-unlock';
+
+const { PrivateQuickInserter: QuickInserter } = unlock(
+	blockEditorPrivateApis
+);
 
 /**
  * Given the Link block's type attribute, return the query params to give to
@@ -56,92 +78,87 @@ export function getSuggestionsQuery( type, kind ) {
 	}
 }
 
-/**
- * Add transforms to Link Control
- *
- * @param {Object} props          Component props.
- * @param {string} props.clientId Block client ID.
- */
-function LinkControlTransforms( { clientId } ) {
-	const { getBlock, blockTransforms } = useSelect(
+function LinkUIBlockInserter( { clientId, onBack, onSelectBlock } ) {
+	const { rootBlockClientId } = useSelect(
 		( select ) => {
-			const {
-				getBlock: _getBlock,
-				getBlockRootClientId,
-				getBlockTransformItems,
-			} = select( blockEditorStore );
+			const { getBlockRootClientId } = select( blockEditorStore );
 
 			return {
-				getBlock: _getBlock,
-				blockTransforms: getBlockTransformItems(
-					_getBlock( clientId ),
-					getBlockRootClientId( clientId )
-				),
+				rootBlockClientId: getBlockRootClientId( clientId ),
 			};
 		},
 		[ clientId ]
 	);
 
-	const { replaceBlock } = useDispatch( blockEditorStore );
-
-	const featuredBlocks = [
-		'core/page-list',
-		'core/site-logo',
-		'core/social-links',
-		'core/search',
-	];
+	const focusOnMountRef = useFocusOnMount( 'firstElement' );
 
-	const transforms = blockTransforms.filter( ( item ) => {
-		return featuredBlocks.includes( item.name );
-	} );
-
-	if ( ! transforms?.length ) {
-		return null;
-	}
+	const dialogTitleId = useInstanceId(
+		LinkControl,
+		`link-ui-block-inserter__title`
+	);
+	const dialogDescritionId = useInstanceId(
+		LinkControl,
+		`link-ui-block-inserter__description`
+	);
 
 	if ( ! clientId ) {
 		return null;
 	}
 
 	return (
-		<div className="link-control-transform">
-			<h3 className="link-control-transform__subheading">
-				{ __( 'Transform' ) }
-			</h3>
-			<div className="link-control-transform__items">
-				{ transforms.map( ( item, index ) => {
-					return (
-						<Button
-							key={ `transform-${ index }` }
-							onClick={ () =>
-								replaceBlock(
-									clientId,
-									switchToBlockType(
-										getBlock( clientId ),
-										item.name
-									)
-								)
-							}
-							className="link-control-transform__item"
-						>
-							<BlockIcon icon={ item.icon } />
-							{ item.title }
-						</Button>
-					);
-				} ) }
-			</div>
+		<div
+			className="link-ui-block-inserter"
+			role="dialog"
+			aria-labelledby={ dialogTitleId }
+			aria-describedby={ dialogDescritionId }
+			ref={ focusOnMountRef }
+		>
+			<VisuallyHidden>
+				<h2 id={ dialogTitleId }>{ __( 'Add block' ) }</h2>
+
+				<p id={ dialogDescritionId }>
+					{ __( 'Choose a block to add to your Navigation.' ) }
+				</p>
+			</VisuallyHidden>
+
+			<Button
+				className="link-ui-block-inserter__back"
+				icon={ isRTL() ? chevronRightSmall : chevronLeftSmall }
+				onClick={ ( e ) => {
+					e.preventDefault();
+					onBack();
+				} }
+				size="small"
+			>
+				{ __( 'Back' ) }
+			</Button>
+
+			<QuickInserter
+				rootClientId={ rootBlockClientId }
+				clientId={ clientId }
+				isAppender={ false }
+				prioritizePatterns={ false }
+				selectBlockOnInsert
+				hasSearch={ false }
+				onSelect={ onSelectBlock }
+			/>
 		</div>
 	);
 }
 
-export function LinkUI( props ) {
+function UnforwardedLinkUI( props, ref ) {
+	const { label, url, opensInNewTab, type, kind } = props.link;
+	const postType = type || 'page';
+
+	const [ addingBlock, setAddingBlock ] = useState( false );
+	const [ focusAddBlockButton, setFocusAddBlockButton ] = useState( false );
 	const { saveEntityRecord } = useDispatch( coreStore );
-	const pagesPermissions = useResourcePermissions( 'pages' );
-	const postsPermissions = useResourcePermissions( 'posts' );
+	const permissions = useResourcePermissions( {
+		kind: 'postType',
+		name: postType,
+	} );
 
 	async function handleCreate( pageTitle ) {
-		const postType = props.link.type || 'page';
-
 		const page = await saveEntityRecord( 'postType', postType, {
 			title: pageTitle,
 			status: 'draft',
@@ -166,15 +183,6 @@ export function LinkUI( props ) {
 		};
 	}
 
-	const { label, url, opensInNewTab, type, kind } = props.link;
-
-	let userCanCreate = false;
-	if ( ! type || type === 'page' ) {
-		userCanCreate = pagesPermissions.canCreate;
-	} else if ( type === 'post' ) {
-		userCanCreate = postsPermissions.canCreate;
-	}
-
 	// Memoize link value to avoid overriding the LinkControl's internal state.
 	// This is a temporary fix. See https://github.com/WordPress/gutenberg/issues/50976#issuecomment-1568226407.
 	const link = useMemo(
@@ -186,54 +194,135 @@ export function LinkUI( props ) {
 		[ label, opensInNewTab, url ]
 	);
 
+	const dialogTitleId = useInstanceId(
+		LinkUI,
+		`link-ui-link-control__title`
+	);
+	const dialogDescritionId = useInstanceId(
+		LinkUI,
+		`link-ui-link-control__description`
+	);
+
+	// Selecting a block should close the popover and also remove the (previously) automatically inserted
+	// link block so that the newly selected block can be inserted in its place.
+	const { onClose: onSelectBlock } = props;
+
 	return (
 		<Popover
+			ref={ ref }
 			placement="bottom"
 			onClose={ props.onClose }
 			anchor={ props.anchor }
 			shift
 		>
-			<LinkControl
-				hasTextControl
-				hasRichPreviews
-				value={ link }
-				showInitialSuggestions={ true }
-				withCreateSuggestion={ userCanCreate }
-				createSuggestion={ handleCreate }
-				createSuggestionButtonText={ ( searchTerm ) => {
-					let format;
-
-					if ( type === 'post' ) {
-						/* translators: %s: search term. */
-						format = __( 'Create draft post: <mark>%s</mark>' );
-					} else {
-						/* translators: %s: search term. */
-						format = __( 'Create draft page: <mark>%s</mark>' );
-					}
-
-					return createInterpolateElement(
-						sprintf( format, searchTerm ),
-						{
-							mark: <mark />,
-						}
-					);
-				} }
-				noDirectEntry={ !! type }
-				noURLSuggestion={ !! type }
-				suggestionsQuery={ getSuggestionsQuery( type, kind ) }
-				onChange={ props.onChange }
-				onRemove={ props.onRemove }
-				onCancel={ props.onCancel }
-				renderControlBottom={
-					! url
-						? () => (
-								<LinkControlTransforms
-									clientId={ props.clientId }
+			{ ! addingBlock && (
+				<div
+					role="dialog"
+					aria-labelledby={ dialogTitleId }
+					aria-describedby={ dialogDescritionId }
+				>
+					<VisuallyHidden>
+						<h2 id={ dialogTitleId }>{ __( 'Add link' ) }</h2>
+
+						<p id={ dialogDescritionId }>
+							{ __(
+								'Search for and add a link to your Navigation.'
+							) }
+						</p>
+					</VisuallyHidden>
+					<LinkControl
+						hasTextControl
+						hasRichPreviews
+						value={ link }
+						showInitialSuggestions
+						withCreateSuggestion={ permissions.canCreate }
+						createSuggestion={ handleCreate }
+						createSuggestionButtonText={ ( searchTerm ) => {
+							let format;
+
+							if ( type === 'post' ) {
+								/* translators: %s: search term. */
+								format = __(
+									'Create draft post: <mark>%s</mark>'
+								);
+							} else {
+								/* translators: %s: search term. */
+								format = __(
+									'Create draft page: <mark>%s</mark>'
+								);
+							}
+
+							return createInterpolateElement(
+								sprintf( format, searchTerm ),
+								{
+									mark: <mark />,
+								}
+							);
+						} }
+						noDirectEntry={ !! type }
+						noURLSuggestion={ !! type }
+						suggestionsQuery={ getSuggestionsQuery( type, kind ) }
+						onChange={ props.onChange }
+						onRemove={ props.onRemove }
+						onCancel={ props.onCancel }
+						renderControlBottom={ () =>
+							! link?.url?.length && (
+								<LinkUITools
+									focusAddBlockButton={ focusAddBlockButton }
+									setAddingBlock={ () => {
+										setAddingBlock( true );
+										setFocusAddBlockButton( false );
+									} }
 								/>
-						  )
-						: null
-				}
-			/>
+							)
+						}
+					/>
+				</div>
+			) }
+
+			{ addingBlock && (
+				<LinkUIBlockInserter
+					clientId={ props.clientId }
+					onBack={ () => {
+						setAddingBlock( false );
+						setFocusAddBlockButton( true );
+					} }
+					onSelectBlock={ onSelectBlock }
+				/>
+			) }
 		</Popover>
 	);
 }
+
+export const LinkUI = forwardRef( UnforwardedLinkUI );
+
+const LinkUITools = ( { setAddingBlock, focusAddBlockButton } ) => {
+	const blockInserterAriaRole = 'listbox';
+	const addBlockButtonRef = useRef();
+
+	// Focus the add block button when the popover is opened.
+	useEffect( () => {
+		if ( focusAddBlockButton ) {
+			addBlockButtonRef.current?.focus();
+		}
+	}, [ focusAddBlockButton ] );
+
+	return (
+		<VStack className="link-ui-tools">
+			<Button
+				__next40pxDefaultSize
+				ref={ addBlockButtonRef }
+				icon={ plus }
+				onClick={ ( e ) => {
+					e.preventDefault();
+					setAddingBlock( true );
+				} }
+				aria-haspopup={ blockInserterAriaRole }
+			>
+				{ __( 'Add block' ) }
+			</Button>
+		</VStack>
+	);
+};
+
+export default LinkUITools;
diff --git a/packages/block-library/src/navigation-link/style.scss b/packages/block-library/src/navigation-link/style.scss
index 2a45c3c545d301..f2f7d14f93fce3 100644
--- a/packages/block-library/src/navigation-link/style.scss
+++ b/packages/block-library/src/navigation-link/style.scss
@@ -14,3 +14,17 @@
 		display: none;
 	}
 }
+
+.link-ui-tools {
+	border-top: 1px solid $gray-100;
+	padding: $grid-unit-10;
+}
+
+.link-ui-block-inserter {
+	padding-top: $grid-unit-10;
+}
+
+.link-ui-block-inserter__back {
+	margin-left: $grid-unit-10;
+	text-transform: uppercase;
+}
diff --git a/packages/block-library/src/navigation-submenu/block.json b/packages/block-library/src/navigation-submenu/block.json
index 91364109ea7400..e767b60aec3a6c 100644
--- a/packages/block-library/src/navigation-submenu/block.json
+++ b/packages/block-library/src/navigation-submenu/block.json
@@ -58,7 +58,23 @@
 	],
 	"supports": {
 		"reusable": false,
-		"html": false
+		"html": false,
+		"typography": {
+			"fontSize": true,
+			"lineHeight": true,
+			"__experimentalFontFamily": true,
+			"__experimentalFontWeight": true,
+			"__experimentalFontStyle": true,
+			"__experimentalTextTransform": true,
+			"__experimentalTextDecoration": true,
+			"__experimentalLetterSpacing": true,
+			"__experimentalDefaultControls": {
+				"fontSize": true
+			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-navigation-submenu-editor",
 	"style": "wp-block-navigation-submenu"
diff --git a/packages/block-library/src/navigation-submenu/edit.js b/packages/block-library/src/navigation-submenu/edit.js
index 507ea64940c3a6..acc9510d0d3d30 100644
--- a/packages/block-library/src/navigation-submenu/edit.js
+++ b/packages/block-library/src/navigation-submenu/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -28,9 +28,7 @@ import {
 } from '@wordpress/block-editor';
 import { isURL, prependHTTP } from '@wordpress/url';
 import { useState, useEffect, useRef } from '@wordpress/element';
-import { placeCaretAtHorizontalEdge } from '@wordpress/dom';
 import { link as linkIcon, removeSubmenu } from '@wordpress/icons';
-import { useResourcePermissions } from '@wordpress/core-data';
 import { speak } from '@wordpress/a11y';
 import { createBlock } from '@wordpress/blocks';
 import { useMergeRefs, usePrevious } from '@wordpress/compose';
@@ -135,13 +133,18 @@ export default function NavigationSubmenuEdit( {
 	context,
 	clientId,
 } ) {
-	const { label, type, url, description, rel, title } = attributes;
+	const { label, url, description, rel, title } = attributes;
 
 	const { showSubmenuIcon, maxNestingLevel, openSubmenusOnClick } = context;
 
-	const { __unstableMarkNextChangeAsNotPersistent, replaceBlock } =
-		useDispatch( blockEditorStore );
+	const {
+		__unstableMarkNextChangeAsNotPersistent,
+		replaceBlock,
+		selectBlock,
+	} = useDispatch( blockEditorStore );
 	const [ isLinkOpen, setIsLinkOpen ] = useState( false );
+	// Store what element opened the popover, so we know where to return focus to (toolbar button vs navigation link text)
+	const [ openedBy, setOpenedBy ] = useState( null );
 	// Use internal state instead of a ref to make sure that the component
 	// re-renders when the popover's anchor updates.
 	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
@@ -150,9 +153,6 @@ export default function NavigationSubmenuEdit( {
 	const itemLabelPlaceholder = __( 'Add text…' );
 	const ref = useRef();
 
-	const pagesPermissions = useResourcePermissions( 'pages' );
-	const postsPermissions = useResourcePermissions( 'posts' );
-
 	const {
 		parentCount,
 		isParentOfSelectedBlock,
@@ -241,9 +241,6 @@ export default function NavigationSubmenuEdit( {
 			) {
 				// Focus and select the label text.
 				selectLabelText();
-			} else {
-				// Focus it (but do not select).
-				placeCaretAtHorizontalEdge( ref.current, true );
 			}
 		}
 	}, [ url ] );
@@ -263,13 +260,6 @@ export default function NavigationSubmenuEdit( {
 		selection.addRange( range );
 	}
 
-	let userCanCreate = false;
-	if ( ! type || type === 'page' ) {
-		userCanCreate = pagesPermissions.canCreate;
-	} else if ( type === 'post' ) {
-		userCanCreate = postsPermissions.canCreate;
-	}
-
 	const {
 		textColor,
 		customTextColor,
@@ -279,13 +269,20 @@ export default function NavigationSubmenuEdit( {
 
 	function onKeyDown( event ) {
 		if ( isKeyboardEvent.primary( event, 'k' ) ) {
+			// Required to prevent the command center from opening,
+			// as it shares the CMD+K shortcut.
+			// See https://github.com/WordPress/gutenberg/pull/59845.
+			event.preventDefault();
+			// If we don't stop propogation, this event bubbles up to the parent submenu item
+			event.stopPropagation();
 			setIsLinkOpen( true );
+			setOpenedBy( ref.current );
 		}
 	}
 
 	const blockProps = useBlockProps( {
 		ref: useMergeRefs( [ setPopoverAnchor, listItemRef ] ),
-		className: classnames( 'wp-block-navigation-item', {
+		className: clsx( 'wp-block-navigation-item', {
 			'is-editing': isSelected || isParentOfSelectedBlock,
 			'is-dragging-within': isDraggingWithin,
 			'has-link': !! url,
@@ -366,7 +363,10 @@ export default function NavigationSubmenuEdit( {
 							icon={ linkIcon }
 							title={ __( 'Link' ) }
 							shortcut={ displayShortcut.primary( 'k' ) }
-							onClick={ () => setIsLinkOpen( true ) }
+							onClick={ ( event ) => {
+								setIsLinkOpen( true );
+								setOpenedBy( event.currentTarget );
+							} }
 						/>
 					) }
 
@@ -376,7 +376,7 @@ export default function NavigationSubmenuEdit( {
 						title={ __( 'Convert to Link' ) }
 						onClick={ transformToLink }
 						className="wp-block-navigation__submenu__revert"
-						isDisabled={ ! canConvertToLink }
+						disabled={ ! canConvertToLink }
 					/>
 				</ToolbarGroup>
 			</BlockControls>
@@ -385,20 +385,22 @@ export default function NavigationSubmenuEdit( {
 				<PanelBody title={ __( 'Settings' ) }>
 					<TextControl
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 						value={ label || '' }
 						onChange={ ( labelValue ) => {
 							setAttributes( { label: labelValue } );
 						} }
-						label={ __( 'Label' ) }
+						label={ __( 'Text' ) }
 						autoComplete="off"
 					/>
 					<TextControl
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 						value={ url || '' }
 						onChange={ ( urlValue ) => {
 							setAttributes( { url: urlValue } );
 						} }
-						label={ __( 'URL' ) }
+						label={ __( 'Link' ) }
 						autoComplete="off"
 					/>
 					<TextareaControl
@@ -416,6 +418,7 @@ export default function NavigationSubmenuEdit( {
 					/>
 					<TextControl
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 						value={ title || '' }
 						onChange={ ( titleValue ) => {
 							setAttributes( { title: titleValue } );
@@ -428,6 +431,7 @@ export default function NavigationSubmenuEdit( {
 					/>
 					<TextControl
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 						value={ rel || '' }
 						onChange={ ( relValue ) => {
 							setAttributes( { rel: relValue } );
@@ -444,40 +448,46 @@ export default function NavigationSubmenuEdit( {
 				{ /* eslint-disable jsx-a11y/anchor-is-valid */ }
 				<ParentElement className="wp-block-navigation-item__content">
 					{ /* eslint-enable */ }
-					{
-						<RichText
-							ref={ ref }
-							identifier="label"
-							className="wp-block-navigation-item__label"
-							value={ label }
-							onChange={ ( labelValue ) =>
-								setAttributes( { label: labelValue } )
+					<RichText
+						ref={ ref }
+						identifier="label"
+						className="wp-block-navigation-item__label"
+						value={ label }
+						onChange={ ( labelValue ) =>
+							setAttributes( { label: labelValue } )
+						}
+						onMerge={ mergeBlocks }
+						onReplace={ onReplace }
+						aria-label={ __( 'Navigation link text' ) }
+						placeholder={ itemLabelPlaceholder }
+						withoutInteractiveFormatting
+						allowedFormats={ [
+							'core/bold',
+							'core/italic',
+							'core/image',
+							'core/strikethrough',
+						] }
+						onClick={ () => {
+							if ( ! openSubmenusOnClick && ! url ) {
+								setIsLinkOpen( true );
+								setOpenedBy( ref.current );
 							}
-							onMerge={ mergeBlocks }
-							onReplace={ onReplace }
-							aria-label={ __( 'Navigation link text' ) }
-							placeholder={ itemLabelPlaceholder }
-							withoutInteractiveFormatting
-							allowedFormats={ [
-								'core/bold',
-								'core/italic',
-								'core/image',
-								'core/strikethrough',
-							] }
-							onClick={ () => {
-								if ( ! openSubmenusOnClick && ! url ) {
-									setIsLinkOpen( true );
-								}
-							} }
-						/>
-					}
+						} }
+					/>
 					{ ! openSubmenusOnClick && isLinkOpen && (
 						<LinkUI
 							clientId={ clientId }
 							link={ attributes }
-							onClose={ () => setIsLinkOpen( false ) }
+							onClose={ () => {
+								setIsLinkOpen( false );
+								if ( openedBy ) {
+									openedBy.focus();
+									setOpenedBy( null );
+								} else {
+									selectBlock( clientId );
+								}
+							} }
 							anchor={ popoverAnchor }
-							hasCreateSuggestion={ userCanCreate }
 							onRemove={ () => {
 								setAttributes( { url: '' } );
 								speak( __( 'Link removed.' ), 'assertive' );
diff --git a/packages/block-library/src/navigation-submenu/index.js b/packages/block-library/src/navigation-submenu/index.js
index 2b3691b6e3cada..69e97fb85325a5 100644
--- a/packages/block-library/src/navigation-submenu/index.js
+++ b/packages/block-library/src/navigation-submenu/index.js
@@ -21,16 +21,23 @@ export const settings = {
 		if ( context === 'list-view' ) {
 			return page;
 		}
-
 		return addSubmenu;
 	},
+	__experimentalLabel( attributes, { context } ) {
+		const { label } = attributes;
 
-	__experimentalLabel: ( { label } ) => label,
+		const customName = attributes?.metadata?.name;
 
-	edit,
+		// In the list view, use the block's menu label as the label.
+		// If the menu label is empty, fall back to the default label.
+		if ( context === 'list-view' && ( customName || label ) ) {
+			return attributes?.metadata?.name || label;
+		}
 
+		return label;
+	},
+	edit,
 	save,
-
 	transforms,
 };
 
diff --git a/packages/block-library/src/navigation-submenu/index.php b/packages/block-library/src/navigation-submenu/index.php
index 2ae23a92b69c45..92b55e291606e8 100644
--- a/packages/block-library/src/navigation-submenu/index.php
+++ b/packages/block-library/src/navigation-submenu/index.php
@@ -9,6 +9,8 @@
  * Build an array with CSS classes and inline styles defining the font sizes
  * which will be applied to the navigation markup in the front-end.
  *
+ * @since 5.9.0
+ *
  * @param  array $context Navigation block context.
  * @return array Font size CSS classes and inline styles.
  */
@@ -43,6 +45,8 @@ function block_core_navigation_submenu_build_css_font_sizes( $context ) {
 /**
  * Returns the top-level submenu SVG chevron icon.
  *
+ * @since 5.9.0
+ *
  * @return string
  */
 function block_core_navigation_submenu_render_submenu_icon() {
@@ -52,6 +56,8 @@ function block_core_navigation_submenu_render_submenu_icon() {
 /**
  * Renders the `core/navigation-submenu` block.
  *
+ * @since 5.9.0
+ *
  * @param array    $attributes The block attributes.
  * @param string   $content    The saved content.
  * @param WP_Block $block      The parsed block.
@@ -81,6 +87,13 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 	$kind        = empty( $attributes['kind'] ) ? 'post_type' : str_replace( '-', '_', $attributes['kind'] );
 	$is_active   = ! empty( $attributes['id'] ) && get_queried_object_id() === (int) $attributes['id'] && ! empty( get_queried_object()->$kind );
 
+	if ( is_post_type_archive() ) {
+		$queried_archive_link = get_post_type_archive_link( get_queried_object()->name );
+		if ( $attributes['url'] === $queried_archive_link ) {
+			$is_active = true;
+		}
+	}
+
 	$show_submenu_indicators = isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon'];
 	$open_on_click           = isset( $block->context['openSubmenusOnClick'] ) && $block->context['openSubmenusOnClick'];
 	$open_on_hover_and_click = isset( $block->context['openSubmenusOnClick'] ) && ! $block->context['openSubmenusOnClick'] &&
@@ -238,6 +251,8 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 /**
  * Register the navigation submenu block.
  *
+ * @since 5.9.0
+ *
  * @uses render_block_core_navigation_submenu()
  * @throws WP_Error An WP_Error exception parsing the block definition.
  */
diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json
index 9ec919ae38d1fa..c65e0c6224616e 100644
--- a/packages/block-library/src/navigation/block.json
+++ b/packages/block-library/src/navigation/block.json
@@ -4,6 +4,19 @@
 	"name": "core/navigation",
 	"title": "Navigation",
 	"category": "theme",
+	"allowedBlocks": [
+		"core/navigation-link",
+		"core/search",
+		"core/social-links",
+		"core/page-list",
+		"core/spacer",
+		"core/home-link",
+		"core/site-title",
+		"core/site-logo",
+		"core/navigation-submenu",
+		"core/loginout",
+		"core/buttons"
+	],
 	"description": "A collection of blocks that allow visitors to get around your site.",
 	"keywords": [ "menu", "navigation", "links" ],
 	"textdomain": "default",
@@ -124,19 +137,9 @@
 				"type": "flex"
 			}
 		},
-		"__experimentalStyle": {
-			"elements": {
-				"link": {
-					"color": {
-						"text": "inherit"
-					}
-				}
-			}
-		},
 		"interactivity": true,
 		"renaming": false
 	},
-	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-navigation-editor",
 	"style": "wp-block-navigation"
 }
diff --git a/packages/block-library/src/navigation/constants.js b/packages/block-library/src/navigation/constants.js
index 21fc8bfdfb74d0..154c490e83839b 100644
--- a/packages/block-library/src/navigation/constants.js
+++ b/packages/block-library/src/navigation/constants.js
@@ -2,20 +2,6 @@ export const DEFAULT_BLOCK = {
 	name: 'core/navigation-link',
 };
 
-export const ALLOWED_BLOCKS = [
-	'core/navigation-link',
-	'core/search',
-	'core/social-links',
-	'core/page-list',
-	'core/spacer',
-	'core/home-link',
-	'core/site-title',
-	'core/site-logo',
-	'core/navigation-submenu',
-	'core/loginout',
-	'core/buttons',
-];
-
 export const PRIORITIZED_INSERTER_BLOCKS = [
 	'core/navigation-link/page',
 	'core/navigation-link',
diff --git a/packages/block-library/src/navigation/edit/accessible-menu-description.js b/packages/block-library/src/navigation/edit/accessible-menu-description.js
index c2c0d1ce764a69..d2912cc151eef2 100644
--- a/packages/block-library/src/navigation/edit/accessible-menu-description.js
+++ b/packages/block-library/src/navigation/edit/accessible-menu-description.js
@@ -12,7 +12,7 @@ import AccessibleDescription from './accessible-description';
 export default function AccessibleMenuDescription( { id } ) {
 	const [ menuTitle ] = useEntityProp( 'postType', 'wp_navigation', 'title' );
 	/* translators: %s: Title of a Navigation Menu post. */
-	const description = sprintf( __( `Navigation menu: "%s"` ), menuTitle );
+	const description = sprintf( __( `Navigation Menu: "%s"` ), menuTitle );
 
 	return (
 		<AccessibleDescription id={ id }>{ description }</AccessibleDescription>
diff --git a/packages/block-library/src/navigation/edit/are-blocks-dirty.js b/packages/block-library/src/navigation/edit/are-blocks-dirty.js
index 1d7fa8a7286f26..c4d1a8f76456a4 100644
--- a/packages/block-library/src/navigation/edit/are-blocks-dirty.js
+++ b/packages/block-library/src/navigation/edit/are-blocks-dirty.js
@@ -30,7 +30,9 @@ const isDeepEqual = ( x, y, shouldSkip ) => {
 		y !== null &&
 		y !== undefined
 	) {
-		if ( Object.keys( x ).length !== Object.keys( y ).length ) return false;
+		if ( Object.keys( x ).length !== Object.keys( y ).length ) {
+			return false;
+		}
 
 		for ( const prop in x ) {
 			if ( y.hasOwnProperty( prop ) ) {
@@ -39,9 +41,12 @@ const isDeepEqual = ( x, y, shouldSkip ) => {
 					return true;
 				}
 
-				if ( ! isDeepEqual( x[ prop ], y[ prop ], shouldSkip ) )
+				if ( ! isDeepEqual( x[ prop ], y[ prop ], shouldSkip ) ) {
 					return false;
-			} else return false;
+				}
+			} else {
+				return false;
+			}
 		}
 
 		return true;
diff --git a/packages/block-library/src/navigation/edit/deleted-navigation-warning.js b/packages/block-library/src/navigation/edit/deleted-navigation-warning.js
index 6386cee71431e0..22d1e339c5c004 100644
--- a/packages/block-library/src/navigation/edit/deleted-navigation-warning.js
+++ b/packages/block-library/src/navigation/edit/deleted-navigation-warning.js
@@ -2,22 +2,32 @@
  * WordPress dependencies
  */
 import { Warning } from '@wordpress/block-editor';
-import { Button } from '@wordpress/components';
+import { Button, Notice } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { createInterpolateElement } from '@wordpress/element';
 
-function DeletedNavigationWarning( { onCreateNew } ) {
-	return (
-		<Warning>
-			{ createInterpolateElement(
-				__(
-					'Navigation menu has been deleted or is unavailable. <button>Create a new menu?</button>'
-				),
-				{
-					button: <Button onClick={ onCreateNew } variant="link" />,
-				}
-			) }
-		</Warning>
+function DeletedNavigationWarning( { onCreateNew, isNotice = false } ) {
+	const message = createInterpolateElement(
+		__(
+			'Navigation Menu has been deleted or is unavailable. <button>Create a new Menu?</button>'
+		),
+		{
+			button: (
+				<Button
+					__next40pxDefaultSize
+					onClick={ onCreateNew }
+					variant="link"
+				/>
+			),
+		}
+	);
+
+	return isNotice ? (
+		<Notice status="warning" isDismissible={ false }>
+			{ message }
+		</Notice>
+	) : (
+		<Warning>{ message }</Warning>
 	);
 }
 
diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
index f12d83e2fe2eae..d961f0d8fc93b9 100644
--- a/packages/block-library/src/navigation/edit/index.js
+++ b/packages/block-library/src/navigation/edit/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -16,15 +16,14 @@ import {
 import {
 	InspectorControls,
 	useBlockProps,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	store as blockEditorStore,
 	withColors,
 	ContrastChecker,
 	getColorClassName,
 	Warning,
 	__experimentalColorGradientSettingsDropdown as ColorGradientSettingsDropdown,
-	__experimentalUseBlockOverlayActive as useBlockOverlayActive,
 	__experimentalUseMultipleOriginColorsAndGradients as useMultipleOriginColorsAndGradients,
 	useBlockEditingMode,
 } from '@wordpress/block-editor';
@@ -40,7 +39,7 @@ import {
 	Spinner,
 	Notice,
 } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { speak } from '@wordpress/a11y';
 import { close, Icon } from '@wordpress/icons';
 import { useInstanceId } from '@wordpress/compose';
@@ -74,6 +73,143 @@ import AccessibleDescription from './accessible-description';
 import AccessibleMenuDescription from './accessible-menu-description';
 import { unlock } from '../../lock-unlock';
 
+function useResponsiveMenu( navRef ) {
+	const [ isResponsiveMenuOpen, setResponsiveMenuVisibility ] =
+		useState( false );
+
+	useEffect( () => {
+		if ( ! navRef.current ) {
+			return;
+		}
+
+		const htmlElement = navRef.current.ownerDocument.documentElement;
+
+		// Add a `has-modal-open` class to the <html> when the responsive
+		// menu is open. This reproduces the same behavior of the frontend.
+		if ( isResponsiveMenuOpen ) {
+			htmlElement.classList.add( 'has-modal-open' );
+		} else {
+			htmlElement.classList.remove( 'has-modal-open' );
+		}
+
+		return () => {
+			htmlElement?.classList.remove( 'has-modal-open' );
+		};
+	}, [ navRef, isResponsiveMenuOpen ] );
+
+	return [ isResponsiveMenuOpen, setResponsiveMenuVisibility ];
+}
+
+function ColorTools( {
+	textColor,
+	setTextColor,
+	backgroundColor,
+	setBackgroundColor,
+	overlayTextColor,
+	setOverlayTextColor,
+	overlayBackgroundColor,
+	setOverlayBackgroundColor,
+	clientId,
+	navRef,
+} ) {
+	const [ detectedBackgroundColor, setDetectedBackgroundColor ] = useState();
+	const [ detectedColor, setDetectedColor ] = useState();
+	const [
+		detectedOverlayBackgroundColor,
+		setDetectedOverlayBackgroundColor,
+	] = useState();
+	const [ detectedOverlayColor, setDetectedOverlayColor ] = useState();
+	// Turn on contrast checker for web only since it's not supported on mobile yet.
+	const enableContrastChecking = Platform.OS === 'web';
+	useEffect( () => {
+		if ( ! enableContrastChecking ) {
+			return;
+		}
+		detectColors(
+			navRef.current,
+			setDetectedColor,
+			setDetectedBackgroundColor
+		);
+
+		const subMenuElement = navRef.current?.querySelector(
+			'[data-type="core/navigation-submenu"] [data-type="core/navigation-link"]'
+		);
+
+		if ( ! subMenuElement ) {
+			return;
+		}
+
+		// Only detect submenu overlay colors if they have previously been explicitly set.
+		// This avoids the contrast checker from reporting on inherited submenu colors and
+		// showing the contrast warning twice.
+		if ( overlayTextColor.color || overlayBackgroundColor.color ) {
+			detectColors(
+				subMenuElement,
+				setDetectedOverlayColor,
+				setDetectedOverlayBackgroundColor
+			);
+		}
+	}, [
+		enableContrastChecking,
+		overlayTextColor.color,
+		overlayBackgroundColor.color,
+		navRef,
+	] );
+	const colorGradientSettings = useMultipleOriginColorsAndGradients();
+	if ( ! colorGradientSettings.hasColorsOrGradients ) {
+		return null;
+	}
+	return (
+		<>
+			<ColorGradientSettingsDropdown
+				__experimentalIsRenderedInSidebar
+				settings={ [
+					{
+						colorValue: textColor.color,
+						label: __( 'Text' ),
+						onColorChange: setTextColor,
+						resetAllFilter: () => setTextColor(),
+					},
+					{
+						colorValue: backgroundColor.color,
+						label: __( 'Background' ),
+						onColorChange: setBackgroundColor,
+						resetAllFilter: () => setBackgroundColor(),
+					},
+					{
+						colorValue: overlayTextColor.color,
+						label: __( 'Submenu & overlay text' ),
+						onColorChange: setOverlayTextColor,
+						resetAllFilter: () => setOverlayTextColor(),
+					},
+					{
+						colorValue: overlayBackgroundColor.color,
+						label: __( 'Submenu & overlay background' ),
+						onColorChange: setOverlayBackgroundColor,
+						resetAllFilter: () => setOverlayBackgroundColor(),
+					},
+				] }
+				panelId={ clientId }
+				{ ...colorGradientSettings }
+				gradients={ [] }
+				disableCustomGradients
+			/>
+			{ enableContrastChecking && (
+				<>
+					<ContrastChecker
+						backgroundColor={ detectedBackgroundColor }
+						textColor={ detectedColor }
+					/>
+					<ContrastChecker
+						backgroundColor={ detectedOverlayBackgroundColor }
+						textColor={ detectedOverlayColor }
+					/>
+				</>
+			) }
+		</>
+	);
+}
+
 function Navigation( {
 	attributes,
 	setAttributes,
@@ -154,8 +290,8 @@ function Navigation( {
 		isError: createNavigationMenuIsError,
 	} = useCreateNavigationMenu( clientId );
 
-	const createUntitledEmptyNavigationMenu = () => {
-		createNavigationMenu( '' );
+	const createUntitledEmptyNavigationMenu = async () => {
+		await createNavigationMenu( '' );
 	};
 
 	const {
@@ -175,8 +311,10 @@ function Navigation( {
 		__unstableMarkNextChangeAsNotPersistent,
 	} = useDispatch( blockEditorStore );
 
+	const navRef = useRef();
+
 	const [ isResponsiveMenuOpen, setResponsiveMenuVisibility ] =
-		useState( false );
+		useResponsiveMenu( navRef );
 
 	const [ overlayMenuPreview, setOverlayMenuPreview ] = useState( false );
 
@@ -188,9 +326,9 @@ function Navigation( {
 		hasResolvedCanUserUpdateNavigationMenu,
 		canUserDeleteNavigationMenu,
 		hasResolvedCanUserDeleteNavigationMenu,
-		canUserCreateNavigationMenu,
-		isResolvingCanUserCreateNavigationMenu,
-		hasResolvedCanUserCreateNavigationMenu,
+		canUserCreateNavigationMenus,
+		isResolvingCanUserCreateNavigationMenus,
+		hasResolvedCanUserCreateNavigationMenus,
 	} = useNavigationMenu( ref );
 
 	const navMenuResolvedButMissing =
@@ -258,8 +396,6 @@ function Navigation( {
 		__unstableMarkNextChangeAsNotPersistent,
 	] );
 
-	const navRef = useRef();
-
 	// The standard HTML5 tag for the block wrapper.
 	const TagName = 'nav';
 
@@ -290,11 +426,17 @@ function Navigation( {
 
 	const textDecoration = attributes.style?.typography?.textDecoration;
 
-	const hasBlockOverlay = useBlockOverlayActive( clientId );
+	const hasBlockOverlay = useSelect(
+		( select ) =>
+			select( blockEditorStore ).__unstableHasActiveBlockOverlayActive(
+				clientId
+			),
+		[ clientId ]
+	);
 	const isResponsive = 'never' !== overlayMenu;
 	const blockProps = useBlockProps( {
 		ref: navRef,
-		className: classnames(
+		className: clsx(
 			className,
 			{
 				'items-justified-right': justifyContent === 'right',
@@ -325,28 +467,8 @@ function Navigation( {
 		},
 	} );
 
-	// Turn on contrast checker for web only since it's not supported on mobile yet.
-	const enableContrastChecking = Platform.OS === 'web';
-
-	const [ detectedBackgroundColor, setDetectedBackgroundColor ] = useState();
-	const [ detectedColor, setDetectedColor ] = useState();
-	const [
-		detectedOverlayBackgroundColor,
-		setDetectedOverlayBackgroundColor,
-	] = useState();
-	const [ detectedOverlayColor, setDetectedOverlayColor ] = useState();
-
 	const onSelectClassicMenu = async ( classicMenu ) => {
-		const navMenu = await convertClassicMenu(
-			classicMenu.id,
-			classicMenu.name,
-			'draft'
-		);
-		if ( navMenu ) {
-			handleUpdateMenu( navMenu.id, {
-				focusNavigationBlock: true,
-			} );
-		}
+		return convertClassicMenu( classicMenu.id, classicMenu.name, 'draft' );
 	};
 
 	const onSelectNavigationMenu = ( menuId ) => {
@@ -397,6 +519,9 @@ function Navigation( {
 			showClassicMenuConversionNotice(
 				__( 'Classic menu imported successfully.' )
 			);
+			handleUpdateMenu( createNavigationMenuPost?.id, {
+				focusNavigationBlock: true,
+			} );
 		}
 
 		if ( classicMenuConversionStatus === CLASSIC_MENU_CONVERSION_ERROR ) {
@@ -409,40 +534,8 @@ function Navigation( {
 		classicMenuConversionError,
 		hideClassicMenuConversionNotice,
 		showClassicMenuConversionNotice,
-	] );
-
-	useEffect( () => {
-		if ( ! enableContrastChecking ) {
-			return;
-		}
-		detectColors(
-			navRef.current,
-			setDetectedColor,
-			setDetectedBackgroundColor
-		);
-
-		const subMenuElement = navRef.current?.querySelector(
-			'[data-type="core/navigation-submenu"] [data-type="core/navigation-link"]'
-		);
-
-		if ( ! subMenuElement ) {
-			return;
-		}
-
-		// Only detect submenu overlay colors if they have previously been explicitly set.
-		// This avoids the contrast checker from reporting on inherited submenu colors and
-		// showing the contrast warning twice.
-		if ( overlayTextColor.color || overlayBackgroundColor.color ) {
-			detectColors(
-				subMenuElement,
-				setDetectedOverlayColor,
-				setDetectedOverlayBackgroundColor
-			);
-		}
-	}, [
-		enableContrastChecking,
-		overlayTextColor.color,
-		overlayBackgroundColor.color,
+		createNavigationMenuPost?.id,
+		handleUpdateMenu,
 	] );
 
 	useEffect( () => {
@@ -466,8 +559,8 @@ function Navigation( {
 
 			if (
 				! ref &&
-				hasResolvedCanUserCreateNavigationMenu &&
-				! canUserCreateNavigationMenu
+				hasResolvedCanUserCreateNavigationMenus &&
+				! canUserCreateNavigationMenus
 			) {
 				showNavigationMenuPermissionsNotice(
 					__(
@@ -481,8 +574,8 @@ function Navigation( {
 		isInnerBlockSelected,
 		canUserUpdateNavigationMenu,
 		hasResolvedCanUserUpdateNavigationMenu,
-		canUserCreateNavigationMenu,
-		hasResolvedCanUserCreateNavigationMenu,
+		canUserCreateNavigationMenus,
+		hasResolvedCanUserCreateNavigationMenus,
 		ref,
 		hideNavigationMenuPermissionsNotice,
 		showNavigationMenuPermissionsNotice,
@@ -490,9 +583,9 @@ function Navigation( {
 	] );
 
 	const hasManagePermissions =
-		canUserCreateNavigationMenu || canUserUpdateNavigationMenu;
+		canUserCreateNavigationMenus || canUserUpdateNavigationMenu;
 
-	const overlayMenuPreviewClasses = classnames(
+	const overlayMenuPreviewClasses = clsx(
 		'wp-block-navigation__overlay-menu-preview',
 		{ open: overlayMenuPreview }
 	);
@@ -517,7 +610,6 @@ function Navigation( {
 		`overlay-menu-preview`
 	);
 
-	const colorGradientSettings = useMultipleOriginColorsAndGradients();
 	const stylingInspectorControls = (
 		<>
 			<InspectorControls>
@@ -526,6 +618,7 @@ function Navigation( {
 						{ isResponsive && (
 							<>
 								<Button
+									__next40pxDefaultSize
 									className={ overlayMenuPreviewClasses }
 									onClick={ () => {
 										setOverlayMenuPreview(
@@ -561,10 +654,11 @@ function Navigation( {
 								</div>
 							</>
 						) }
-						<h3>{ __( 'Overlay Menu' ) }</h3>
 						<ToggleGroupControl
+							__next40pxDefaultSize
 							__nextHasNoMarginBottom
-							label={ __( 'Configure overlay menu' ) }
+							label={ __( 'Overlay Menu' ) }
+							aria-label={ __( 'Configure overlay menu' ) }
 							value={ overlayMenu }
 							help={ __(
 								'Collapses the navigation options in a menu icon opening an overlay.'
@@ -573,7 +667,6 @@ function Navigation( {
 								setAttributes( { overlayMenu: value } )
 							}
 							isBlock
-							hideLabelFromVision
 						>
 							<ToggleGroupControlOption
 								value="never"
@@ -633,63 +726,30 @@ function Navigation( {
 					</PanelBody>
 				) }
 			</InspectorControls>
-			{ colorGradientSettings.hasColorsOrGradients && (
-				<InspectorControls group="color">
-					<ColorGradientSettingsDropdown
-						__experimentalIsRenderedInSidebar
-						settings={ [
-							{
-								colorValue: textColor.color,
-								label: __( 'Text' ),
-								onColorChange: setTextColor,
-								resetAllFilter: () => setTextColor(),
-							},
-							{
-								colorValue: backgroundColor.color,
-								label: __( 'Background' ),
-								onColorChange: setBackgroundColor,
-								resetAllFilter: () => setBackgroundColor(),
-							},
-							{
-								colorValue: overlayTextColor.color,
-								label: __( 'Submenu & overlay text' ),
-								onColorChange: setOverlayTextColor,
-								resetAllFilter: () => setOverlayTextColor(),
-							},
-							{
-								colorValue: overlayBackgroundColor.color,
-								label: __( 'Submenu & overlay background' ),
-								onColorChange: setOverlayBackgroundColor,
-								resetAllFilter: () =>
-									setOverlayBackgroundColor(),
-							},
-						] }
-						panelId={ clientId }
-						{ ...colorGradientSettings }
-						gradients={ [] }
-						disableCustomGradients={ true }
-					/>
-					{ enableContrastChecking && (
-						<>
-							<ContrastChecker
-								backgroundColor={ detectedBackgroundColor }
-								textColor={ detectedColor }
-							/>
-							<ContrastChecker
-								backgroundColor={
-									detectedOverlayBackgroundColor
-								}
-								textColor={ detectedOverlayColor }
-							/>
-						</>
-					) }
-				</InspectorControls>
-			) }
+			<InspectorControls group="color">
+				{ /*
+				 * Avoid useMultipleOriginColorsAndGradients and detectColors
+				 * on block mount. InspectorControls only mounts this component
+				 * when the block is selected.
+				 * */ }
+				<ColorTools
+					textColor={ textColor }
+					setTextColor={ setTextColor }
+					backgroundColor={ backgroundColor }
+					setBackgroundColor={ setBackgroundColor }
+					overlayTextColor={ overlayTextColor }
+					setOverlayTextColor={ setOverlayTextColor }
+					overlayBackgroundColor={ overlayBackgroundColor }
+					setOverlayBackgroundColor={ setOverlayBackgroundColor }
+					clientId={ clientId }
+					navRef={ navRef }
+				/>
+			</InspectorControls>
 		</>
 	);
 
 	const accessibleDescriptionId = `${ clientId }-desc`;
-
+	const isHiddenByDefault = 'always' === overlayMenu;
 	const isManageMenusButtonDisabled =
 		! hasManagePermissions || ! hasResolvedNavigationMenus;
 
@@ -728,7 +788,7 @@ function Navigation( {
 					hasIcon={ hasIcon }
 					icon={ icon }
 					isResponsive={ isResponsive }
-					isHiddenByDefault={ 'always' === overlayMenu }
+					isHiddenByDefault={ isHiddenByDefault }
 					overlayBackgroundColor={ overlayBackgroundColor }
 					overlayTextColor={ overlayTextColor }
 				>
@@ -800,9 +860,11 @@ function Navigation( {
 					isSelected={ isSelected }
 					currentMenuId={ ref }
 					clientId={ clientId }
-					canUserCreateNavigationMenu={ canUserCreateNavigationMenu }
-					isResolvingCanUserCreateNavigationMenu={
-						isResolvingCanUserCreateNavigationMenu
+					canUserCreateNavigationMenus={
+						canUserCreateNavigationMenus
+					}
+					isResolvingCanUserCreateNavigationMenus={
+						isResolvingCanUserCreateNavigationMenus
 					}
 					onSelectNavigationMenu={ onSelectNavigationMenu }
 					onSelectClassicMenu={ onSelectClassicMenu }
@@ -840,15 +902,11 @@ function Navigation( {
 						{ hasResolvedCanUserDeleteNavigationMenu &&
 							canUserDeleteNavigationMenu && (
 								<NavigationMenuDeleteControl
-									onDelete={ ( deletedMenuTitle = '' ) => {
+									onDelete={ () => {
 										replaceInnerBlocks( clientId, [] );
 										showNavigationMenuStatusNotice(
-											sprintf(
-												// translators: %s: the name of a menu (e.g. Header navigation).
-												__(
-													'Navigation menu %s successfully deleted.'
-												),
-												deletedMenuTitle
+											__(
+												'Navigation Menu successfully deleted.'
 											)
 										);
 									} }
@@ -861,50 +919,52 @@ function Navigation( {
 					</InspectorControls>
 				) }
 
-				{ isLoading && (
-					<TagName { ...blockProps }>
+				<TagName
+					{ ...blockProps }
+					aria-describedby={
+						! isPlaceholder && ! isLoading
+							? accessibleDescriptionId
+							: undefined
+					}
+				>
+					{ isLoading && ! isHiddenByDefault && (
 						<div className="wp-block-navigation__loading-indicator-container">
 							<Spinner className="wp-block-navigation__loading-indicator" />
 						</div>
-					</TagName>
-				) }
+					) }
 
-				{ ! isLoading && (
-					<TagName
-						{ ...blockProps }
-						aria-describedby={
-							! isPlaceholder
-								? accessibleDescriptionId
-								: undefined
-						}
-					>
-						<AccessibleMenuDescription
-							id={ accessibleDescriptionId }
-						/>
-						<ResponsiveWrapper
-							id={ clientId }
-							onToggle={ setResponsiveMenuVisibility }
-							hasIcon={ hasIcon }
-							icon={ icon }
-							isOpen={ isResponsiveMenuOpen }
-							isResponsive={ isResponsive }
-							isHiddenByDefault={ 'always' === overlayMenu }
-							overlayBackgroundColor={ overlayBackgroundColor }
-							overlayTextColor={ overlayTextColor }
-						>
-							{ isEntityAvailable && (
-								<NavigationInnerBlocks
-									clientId={ clientId }
-									hasCustomPlaceholder={
-										!! CustomPlaceholder
-									}
-									templateLock={ templateLock }
-									orientation={ orientation }
-								/>
-							) }
-						</ResponsiveWrapper>
-					</TagName>
-				) }
+					{ ( ! isLoading || isHiddenByDefault ) && (
+						<>
+							<AccessibleMenuDescription
+								id={ accessibleDescriptionId }
+							/>
+							<ResponsiveWrapper
+								id={ clientId }
+								onToggle={ setResponsiveMenuVisibility }
+								hasIcon={ hasIcon }
+								icon={ icon }
+								isOpen={ isResponsiveMenuOpen }
+								isResponsive={ isResponsive }
+								isHiddenByDefault={ isHiddenByDefault }
+								overlayBackgroundColor={
+									overlayBackgroundColor
+								}
+								overlayTextColor={ overlayTextColor }
+							>
+								{ isEntityAvailable && (
+									<NavigationInnerBlocks
+										clientId={ clientId }
+										hasCustomPlaceholder={
+											!! CustomPlaceholder
+										}
+										templateLock={ templateLock }
+										orientation={ orientation }
+									/>
+								) }
+							</ResponsiveWrapper>
+						</>
+					) }
+				</TagName>
 			</RecursionProvider>
 		</EntityProvider>
 	);
diff --git a/packages/block-library/src/navigation/edit/inner-blocks.js b/packages/block-library/src/navigation/edit/inner-blocks.js
index 19258213f26e5f..6fe3dd8347a33e 100644
--- a/packages/block-library/src/navigation/edit/inner-blocks.js
+++ b/packages/block-library/src/navigation/edit/inner-blocks.js
@@ -14,11 +14,7 @@ import { useMemo } from '@wordpress/element';
  * Internal dependencies
  */
 import PlaceholderPreview from './placeholder/placeholder-preview';
-import {
-	DEFAULT_BLOCK,
-	ALLOWED_BLOCKS,
-	PRIORITIZED_INSERTER_BLOCKS,
-} from '../constants';
+import { DEFAULT_BLOCK, PRIORITIZED_INSERTER_BLOCKS } from '../constants';
 
 export default function NavigationInnerBlocks( {
 	clientId,
@@ -59,17 +55,6 @@ export default function NavigationInnerBlocks( {
 		'wp_navigation'
 	);
 
-	const shouldDirectInsert = useMemo(
-		() =>
-			blocks.every(
-				( { name } ) =>
-					name === 'core/navigation-link' ||
-					name === 'core/navigation-submenu' ||
-					name === 'core/page-list'
-			),
-		[ blocks ]
-	);
-
 	// When the block is selected itself or has a top level item selected that
 	// doesn't itself have children, show the standard appender. Else show no
 	// appender.
@@ -96,10 +81,9 @@ export default function NavigationInnerBlocks( {
 			value: blocks,
 			onInput,
 			onChange,
-			allowedBlocks: ALLOWED_BLOCKS,
 			prioritizedInserterBlocks: PRIORITIZED_INSERTER_BLOCKS,
 			defaultBlock: DEFAULT_BLOCK,
-			directInsert: shouldDirectInsert,
+			directInsert: true,
 			orientation,
 			templateLock,
 
diff --git a/packages/block-library/src/navigation/edit/menu-inspector-controls.js b/packages/block-library/src/navigation/edit/menu-inspector-controls.js
index 4c450b1dda74cf..8f6c2e47fe7759 100644
--- a/packages/block-library/src/navigation/edit/menu-inspector-controls.js
+++ b/packages/block-library/src/navigation/edit/menu-inspector-controls.js
@@ -49,7 +49,9 @@ function AdditionalBlockContent( { block, insertedBlock, setInsertedBlock } ) {
 
 	const setInsertedBlockAttributes =
 		( _insertedBlockClientId ) => ( _updatedAttributes ) => {
-			if ( ! _insertedBlockClientId ) return;
+			if ( ! _insertedBlockClientId ) {
+				return;
+			}
 			updateBlockAttributes( _insertedBlockClientId, _updatedAttributes );
 		};
 
@@ -92,7 +94,9 @@ const MainContent = ( {
 	const { navigationMenu } = useNavigationMenu( currentMenuId );
 
 	if ( currentMenuId && isNavigationMenuMissing ) {
-		return <DeletedNavigationWarning onCreateNew={ onCreateNew } />;
+		return (
+			<DeletedNavigationWarning onCreateNew={ onCreateNew } isNotice />
+		);
 	}
 
 	if ( isLoading ) {
@@ -102,7 +106,7 @@ const MainContent = ( {
 	const description = navigationMenu
 		? sprintf(
 				/* translators: %s: The name of a menu. */
-				__( 'Structure for navigation menu: %s' ),
+				__( 'Structure for Navigation Menu: %s' ),
 				navigationMenu?.title || __( 'Untitled menu' )
 		  )
 		: __(
@@ -113,7 +117,7 @@ const MainContent = ( {
 		<div className="wp-block-navigation__menu-inspector-controls">
 			{ ! hasChildren && (
 				<p className="wp-block-navigation__menu-inspector-controls__empty-message">
-					{ __( 'This navigation menu is empty.' ) }
+					{ __( 'This Navigation Menu is empty.' ) }
 				</p>
 			) }
 			<PrivateListView
diff --git a/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js b/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js
index e9f0f630d71147..e95e07ab778c2f 100644
--- a/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js
+++ b/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js
@@ -3,76 +3,51 @@
  */
 import {
 	Button,
-	Modal,
-	__experimentalHStack as HStack,
+	__experimentalConfirmDialog as ConfirmDialog,
 } from '@wordpress/components';
-import {
-	store as coreStore,
-	useEntityId,
-	useEntityProp,
-} from '@wordpress/core-data';
+import { store as coreStore, useEntityId } from '@wordpress/core-data';
 import { useDispatch } from '@wordpress/data';
 import { useState } from '@wordpress/element';
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 
 export default function NavigationMenuDeleteControl( { onDelete } ) {
-	const [ isConfirmModalVisible, setIsConfirmModalVisible ] =
+	const [ isConfirmDialogVisible, setIsConfirmDialogVisible ] =
 		useState( false );
 	const id = useEntityId( 'postType', 'wp_navigation' );
-	const [ title ] = useEntityProp( 'postType', 'wp_navigation', 'title' );
 	const { deleteEntityRecord } = useDispatch( coreStore );
 
 	return (
 		<>
 			<Button
+				__next40pxDefaultSize
 				className="wp-block-navigation-delete-menu-button"
 				variant="secondary"
 				isDestructive
 				onClick={ () => {
-					setIsConfirmModalVisible( true );
+					setIsConfirmDialogVisible( true );
 				} }
 			>
 				{ __( 'Delete menu' ) }
 			</Button>
-			{ isConfirmModalVisible && (
-				<Modal
-					title={ sprintf(
-						/* translators: %s: the name of a menu to delete */
-						__( 'Delete %s' ),
-						title
-					) }
-					onRequestClose={ () => setIsConfirmModalVisible( false ) }
+			{ isConfirmDialogVisible && (
+				<ConfirmDialog
+					isOpen
+					onConfirm={ () => {
+						deleteEntityRecord( 'postType', 'wp_navigation', id, {
+							force: true,
+						} );
+						onDelete();
+					} }
+					onCancel={ () => {
+						setIsConfirmDialogVisible( false );
+					} }
+					confirmButtonText={ __( 'Delete' ) }
+					size="medium"
 				>
-					<p>
-						{ __(
-							'Are you sure you want to delete this navigation menu?'
-						) }
-					</p>
-					<HStack justify="right">
-						<Button
-							variant="tertiary"
-							onClick={ () => {
-								setIsConfirmModalVisible( false );
-							} }
-						>
-							{ __( 'Cancel' ) }
-						</Button>
-						<Button
-							variant="primary"
-							onClick={ () => {
-								deleteEntityRecord(
-									'postType',
-									'wp_navigation',
-									id,
-									{ force: true }
-								);
-								onDelete( title );
-							} }
-						>
-							{ __( 'Confirm' ) }
-						</Button>
-					</HStack>
-				</Modal>
+					{ __(
+						'Are you sure you want to delete this Navigation Menu?'
+					) }
+				</ConfirmDialog>
 			) }
 		</>
 	);
diff --git a/packages/block-library/src/navigation/edit/navigation-menu-name-control.js b/packages/block-library/src/navigation/edit/navigation-menu-name-control.js
index fe1075f0044070..db895b0b644aac 100644
--- a/packages/block-library/src/navigation/edit/navigation-menu-name-control.js
+++ b/packages/block-library/src/navigation/edit/navigation-menu-name-control.js
@@ -14,6 +14,7 @@ export default function NavigationMenuNameControl() {
 
 	return (
 		<TextControl
+			__next40pxDefaultSize
 			__nextHasNoMarginBottom
 			label={ __( 'Menu name' ) }
 			value={ title }
diff --git a/packages/block-library/src/navigation/edit/navigation-menu-selector.js b/packages/block-library/src/navigation/edit/navigation-menu-selector.js
index d895de770fdafe..007220b1789131 100644
--- a/packages/block-library/src/navigation/edit/navigation-menu-selector.js
+++ b/packages/block-library/src/navigation/edit/navigation-menu-selector.js
@@ -49,7 +49,7 @@ function NavigationMenuSelector( {
 	/* translators: %s: The name of a menu. */
 	const createActionLabel = __( "Create from '%s'" );
 
-	const [ isCreatingMenu, setIsCreatingMenu ] = useState( false );
+	const [ isUpdatingMenuRef, setIsUpdatingMenuRef ] = useState( false );
 
 	actionLabel = actionLabel || createActionLabel;
 
@@ -59,7 +59,7 @@ function NavigationMenuSelector( {
 		navigationMenus,
 		isResolvingNavigationMenus,
 		hasResolvedNavigationMenus,
-		canUserCreateNavigationMenu,
+		canUserCreateNavigationMenus,
 		canSwitchNavigationMenu,
 	} = useNavigationMenu();
 
@@ -82,15 +82,25 @@ function NavigationMenuSelector( {
 					value: id,
 					label,
 					ariaLabel: sprintf( actionLabel, label ),
+					disabled:
+						isUpdatingMenuRef ||
+						isResolvingNavigationMenus ||
+						! hasResolvedNavigationMenus,
 				};
 			} ) || []
 		);
-	}, [ navigationMenus, actionLabel ] );
+	}, [
+		navigationMenus,
+		actionLabel,
+		isResolvingNavigationMenus,
+		hasResolvedNavigationMenus,
+		isUpdatingMenuRef,
+	] );
 
 	const hasNavigationMenus = !! navigationMenus?.length;
 	const hasClassicMenus = !! classicMenus?.length;
 	const showNavigationMenus = !! canSwitchNavigationMenu;
-	const showClassicMenus = !! canUserCreateNavigationMenu;
+	const showClassicMenus = !! canUserCreateNavigationMenus;
 
 	const noMenuSelected = hasNavigationMenus && ! currentMenuId;
 	const noBlockMenus = ! hasNavigationMenus && hasResolvedNavigationMenus;
@@ -99,11 +109,11 @@ function NavigationMenuSelector( {
 
 	let selectorLabel = '';
 
-	if ( isCreatingMenu || isResolvingNavigationMenus ) {
+	if ( isResolvingNavigationMenus ) {
 		selectorLabel = __( 'Loading…' );
 	} else if ( noMenuSelected || noBlockMenus || menuUnavailable ) {
 		// Note: classic Menus may be available.
-		selectorLabel = __( 'Choose or create a Navigation menu' );
+		selectorLabel = __( 'Choose or create a Navigation Menu' );
 	} else {
 		// Current Menu's title.
 		selectorLabel = currentTitle;
@@ -111,17 +121,17 @@ function NavigationMenuSelector( {
 
 	useEffect( () => {
 		if (
-			isCreatingMenu &&
+			isUpdatingMenuRef &&
 			( createNavigationMenuIsSuccess || createNavigationMenuIsError )
 		) {
-			setIsCreatingMenu( false );
+			setIsUpdatingMenuRef( false );
 		}
 	}, [
 		hasResolvedNavigationMenus,
 		createNavigationMenuIsSuccess,
-		canUserCreateNavigationMenu,
+		canUserCreateNavigationMenus,
 		createNavigationMenuIsError,
-		isCreatingMenu,
+		isUpdatingMenuRef,
 		menuUnavailable,
 		noBlockMenus,
 		noMenuSelected,
@@ -131,7 +141,7 @@ function NavigationMenuSelector( {
 		<DropdownMenu
 			label={ selectorLabel }
 			icon={ moreVertical }
-			toggleProps={ { isSmall: true } }
+			toggleProps={ { size: 'small' } }
 		>
 			{ ( { onClose } ) => (
 				<>
@@ -140,12 +150,10 @@ function NavigationMenuSelector( {
 							<MenuItemsChoice
 								value={ currentMenuId }
 								onSelect={ ( menuId ) => {
-									setIsCreatingMenu( true );
 									onSelectNavigationMenu( menuId );
 									onClose();
 								} }
 								choices={ menuChoices }
-								disabled={ isCreatingMenu }
 							/>
 						</MenuGroup>
 					) }
@@ -155,9 +163,10 @@ function NavigationMenuSelector( {
 								const label = decodeEntities( menu.name );
 								return (
 									<MenuItem
-										onClick={ () => {
-											setIsCreatingMenu( true );
-											onSelectClassicMenu( menu );
+										onClick={ async () => {
+											setIsUpdatingMenuRef( true );
+											await onSelectClassicMenu( menu );
+											setIsUpdatingMenuRef( false );
 											onClose();
 										} }
 										key={ menu.id }
@@ -165,7 +174,11 @@ function NavigationMenuSelector( {
 											createActionLabel,
 											label
 										) }
-										disabled={ isCreatingMenu }
+										disabled={
+											isUpdatingMenuRef ||
+											isResolvingNavigationMenus ||
+											! hasResolvedNavigationMenus
+										}
 									>
 										{ label }
 									</MenuItem>
@@ -174,17 +187,22 @@ function NavigationMenuSelector( {
 						</MenuGroup>
 					) }
 
-					{ canUserCreateNavigationMenu && (
+					{ canUserCreateNavigationMenus && (
 						<MenuGroup label={ __( 'Tools' ) }>
 							<MenuItem
-								disabled={ isCreatingMenu }
-								onClick={ () => {
+								onClick={ async () => {
+									setIsUpdatingMenuRef( true );
+									await onCreateNew();
+									setIsUpdatingMenuRef( false );
 									onClose();
-									onCreateNew();
-									setIsCreatingMenu( true );
 								} }
+								disabled={
+									isUpdatingMenuRef ||
+									isResolvingNavigationMenus ||
+									! hasResolvedNavigationMenus
+								}
 							>
-								{ __( 'Create new menu' ) }
+								{ __( 'Create new Menu' ) }
 							</MenuItem>
 						</MenuGroup>
 					) }
diff --git a/packages/block-library/src/navigation/edit/overlay-menu-preview.js b/packages/block-library/src/navigation/edit/overlay-menu-preview.js
index 8ea07351821c89..cdd4d6e3263c98 100644
--- a/packages/block-library/src/navigation/edit/overlay-menu-preview.js
+++ b/packages/block-library/src/navigation/edit/overlay-menu-preview.js
@@ -27,7 +27,9 @@ export default function OverlayMenuPreview( { setAttributes, hasIcon, icon } ) {
 			/>
 
 			<ToggleGroupControl
+				__next40pxDefaultSize
 				__nextHasNoMarginBottom
+				className="wp-block-navigation__overlay-menu-icon-toggle-group"
 				label={ __( 'Icon' ) }
 				value={ icon }
 				onChange={ ( value ) => setAttributes( { icon: value } ) }
diff --git a/packages/block-library/src/navigation/edit/placeholder/index.js b/packages/block-library/src/navigation/edit/placeholder/index.js
index 61fd13c8d97798..7b989de1490afb 100644
--- a/packages/block-library/src/navigation/edit/placeholder/index.js
+++ b/packages/block-library/src/navigation/edit/placeholder/index.js
@@ -18,8 +18,8 @@ export default function NavigationPlaceholder( {
 	isSelected,
 	currentMenuId,
 	clientId,
-	canUserCreateNavigationMenu = false,
-	isResolvingCanUserCreateNavigationMenu,
+	canUserCreateNavigationMenus = false,
+	isResolvingCanUserCreateNavigationMenus,
 	onSelectNavigationMenu,
 	onSelectClassicMenu,
 	onCreateEmpty,
@@ -41,7 +41,7 @@ export default function NavigationPlaceholder( {
 	}, [ hasResolvedMenus, isResolvingMenus, isSelected ] );
 
 	const isResolvingActions =
-		isResolvingMenus && isResolvingCanUserCreateNavigationMenu;
+		isResolvingMenus && isResolvingCanUserCreateNavigationMenus;
 
 	return (
 		<>
@@ -74,8 +74,9 @@ export default function NavigationPlaceholder( {
 
 						<hr />
 
-						{ canUserCreateNavigationMenu && (
+						{ canUserCreateNavigationMenus && (
 							<Button
+								__next40pxDefaultSize
 								variant="tertiary"
 								onClick={ onCreateEmpty }
 							>
diff --git a/packages/block-library/src/navigation/edit/responsive-wrapper.js b/packages/block-library/src/navigation/edit/responsive-wrapper.js
index ff66be85b5cde0..886e808965ce4b 100644
--- a/packages/block-library/src/navigation/edit/responsive-wrapper.js
+++ b/packages/block-library/src/navigation/edit/responsive-wrapper.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -32,7 +32,7 @@ export default function ResponsiveWrapper( {
 		return children;
 	}
 
-	const responsiveContainerClasses = classnames(
+	const responsiveContainerClasses = clsx(
 		'wp-block-navigation__responsive-container',
 		{
 			'has-text-color':
@@ -59,7 +59,7 @@ export default function ResponsiveWrapper( {
 			overlayBackgroundColor.color,
 	};
 
-	const openButtonClasses = classnames(
+	const openButtonClasses = clsx(
 		'wp-block-navigation__responsive-container-open',
 		{ 'always-shown': isHiddenByDefault }
 	);
@@ -79,6 +79,7 @@ export default function ResponsiveWrapper( {
 		<>
 			{ ! isOpen && (
 				<Button
+					__next40pxDefaultSize
 					aria-haspopup="true"
 					aria-label={ hasIcon && __( 'Open menu' ) }
 					className={ openButtonClasses }
@@ -100,6 +101,7 @@ export default function ResponsiveWrapper( {
 				>
 					<div { ...dialogProps }>
 						<Button
+							__next40pxDefaultSize
 							className="wp-block-navigation__responsive-container-close"
 							aria-label={ hasIcon && __( 'Close menu' ) }
 							onClick={ () => onToggle( false ) }
diff --git a/packages/block-library/src/navigation/edit/test/navigation-menu-selector.js b/packages/block-library/src/navigation/edit/test/navigation-menu-selector.js
index d07a399cd0f2cb..eee9be647cb19c 100644
--- a/packages/block-library/src/navigation/edit/test/navigation-menu-selector.js
+++ b/packages/block-library/src/navigation/edit/test/navigation-menu-selector.js
@@ -89,11 +89,11 @@ describe( 'NavigationMenuSelector', () => {
 			).toBeInTheDocument();
 		} );
 
-		it( 'should show correct dropdown toggle prompt to choose a menu when navigation menus have resolved', async () => {
+		it( 'should show correct dropdown toggle prompt to choose a menu when Navigation Menus have resolved', async () => {
 			useNavigationMenu.mockReturnValue( {
 				navigationMenus: [],
 				hasResolvedNavigationMenus: true,
-				canUserCreateNavigationMenu: true,
+				canUserCreateNavigationMenus: true,
 				canSwitchNavigationMenu: true,
 			} );
 
@@ -101,7 +101,7 @@ describe( 'NavigationMenuSelector', () => {
 
 			expect(
 				screen.getByRole( 'button', {
-					name: 'Choose or create a Navigation menu',
+					name: 'Choose or create a Navigation Menu',
 				} )
 			).toBeInTheDocument();
 		} );
@@ -115,7 +115,7 @@ describe( 'NavigationMenuSelector', () => {
 				navigationMenus: [],
 				isResolvingNavigationMenus: true,
 				hasResolvedNavigationMenus: false,
-				canUserCreateNavigationMenu: false,
+				canUserCreateNavigationMenus: false,
 				canSwitchNavigationMenu: true,
 			} );
 
@@ -152,14 +152,14 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
 				render( <NavigationMenuSelector /> );
 
 				const toggleButton = screen.getByRole( 'button', {
-					name: 'Choose or create a Navigation menu',
+					name: 'Choose or create a Navigation Menu',
 				} );
 
 				await user.click( toggleButton );
@@ -169,7 +169,7 @@ describe( 'NavigationMenuSelector', () => {
 				expect( menuPopover ).toHaveAttribute(
 					'aria-label',
 					expect.stringContaining(
-						'Choose or create a Navigation menu'
+						'Choose or create a Navigation Menu'
 					)
 				);
 
@@ -191,7 +191,7 @@ describe( 'NavigationMenuSelector', () => {
 				expect( toolsGroup ).toBeInTheDocument();
 
 				const createMenuButton = screen.getByRole( 'menuitem', {
-					name: 'Create new menu',
+					name: 'Create new Menu',
 				} );
 
 				expect( createMenuButton ).toBeInTheDocument();
@@ -203,7 +203,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: false,
+					canUserCreateNavigationMenus: false,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -226,7 +226,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -236,7 +236,7 @@ describe( 'NavigationMenuSelector', () => {
 				await user.click( toggleButton );
 
 				const createMenuButton = screen.getByRole( 'menuitem', {
-					name: 'Create new menu',
+					name: 'Create new Menu',
 				} );
 
 				await user.click( createMenuButton );
@@ -250,10 +250,11 @@ describe( 'NavigationMenuSelector', () => {
 				const user = userEvent.setup();
 				const handler = jest.fn();
 
+				// at the start we have the menus and we're not waiting on network
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -267,10 +268,22 @@ describe( 'NavigationMenuSelector', () => {
 
 				await user.click(
 					screen.getByRole( 'menuitem', {
-						name: 'Create new menu',
+						name: 'Create new Menu',
 					} )
 				);
 
+				// creating a menu is a network activity
+				// so we have to wait on it
+				useNavigationMenu.mockReturnValue( {
+					navigationMenus: [],
+					hasResolvedNavigationMenus: false,
+					isResolvingNavigationMenus: true,
+					canUserCreateNavigationMenus: true,
+					canSwitchNavigationMenu: true,
+				} );
+
+				rerender( <NavigationMenuSelector onCreateNew={ handler } /> );
+
 				// Re-open the dropdown (it's closed when the "Create menu" button is clicked).
 				await user.click( toggleButton );
 
@@ -280,35 +293,45 @@ describe( 'NavigationMenuSelector', () => {
 				// Check the "Create menu" button is disabled.
 				expect(
 					screen.queryByRole( 'menuitem', {
-						name: 'Create new menu',
+						name: 'Create new Menu',
 					} )
 				).toBeDisabled();
 
+				// once the menu is created
+				// no more network activity to wait on
+				useNavigationMenu.mockReturnValue( {
+					navigationMenus: [],
+					hasResolvedNavigationMenus: true,
+					isResolvingNavigationMenus: false,
+					canUserCreateNavigationMenus: true,
+					canSwitchNavigationMenu: true,
+				} );
+
 				// Simulate the menu being created and component being re-rendered.
 				rerender(
 					<NavigationMenuSelector
 						onCreateNew={ handler }
-						createNavigationMenuIsSuccess={ true }
+						createNavigationMenuIsSuccess
 					/>
 				);
 
 				// Check the button is enabled again.
 				expect(
 					screen.queryByRole( 'menuitem', {
-						name: 'Create new menu',
+						name: 'Create new Menu',
 					} )
 				).toBeEnabled();
 			} );
 		} );
 
-		describe( 'Navigation menus', () => {
+		describe( 'Navigation Menus', () => {
 			it( 'should not show a list of menus when menus exist but user does not have permission to switch menus', async () => {
 				const user = userEvent.setup();
 
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: navigationMenusFixture,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: false,
 				} );
 
@@ -329,7 +352,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: navigationMenusFixture,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: false,
+					canUserCreateNavigationMenus: false,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -368,7 +391,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: menusWithNoTitle,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -402,7 +425,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: navigationMenusFixture,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -422,7 +445,7 @@ describe( 'NavigationMenuSelector', () => {
 				expect( menuItem ).toBeChecked();
 			} );
 
-			it( 'should call the handler when the navigation menu is selected and disable all options during the import/creation process', async () => {
+			it( 'should call the handler when the Navigation Menu is selected', async () => {
 				const user = userEvent.setup();
 
 				const handler = jest.fn();
@@ -430,11 +453,11 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: navigationMenusFixture,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
-				const { rerender } = render(
+				render(
 					<NavigationMenuSelector
 						onSelectNavigationMenu={ handler }
 					/>
@@ -455,42 +478,6 @@ describe( 'NavigationMenuSelector', () => {
 
 				//  Check the dropdown has been closed.
 				expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
-
-				// Re-open the dropdown
-				await user.click( screen.getByRole( 'button' ) );
-
-				// Check the dropdown is again open and is in the "loading" state.
-				expect(
-					screen.getByRole( 'menu', {
-						name: /Loading/,
-					} )
-				).toBeInTheDocument();
-
-				// // Check all menu items are present but disabled.
-				screen.getAllByRole( 'menuitem' ).forEach( ( item ) => {
-					// // Check all menu items are present but disabled.
-					expect( item ).toBeDisabled();
-				} );
-
-				// // Simulate the menu being created and component being re-rendered.
-				rerender(
-					<NavigationMenuSelector
-						createNavigationMenuIsSuccess={ true } // classic menu import creates a Navigation menu.
-					/>
-				);
-
-				// Todo: fix bug where aria label is not updated.
-				// expect(
-				// 	screen.getByRole( 'menu', {
-				// 		name: `You are currently editing ${ navigationMenusFixture[ 0 ].title.rendered }`,
-				// 	} )
-				// ).toBeInTheDocument();
-
-				// Check all menu items are re-enabled.
-				screen.getAllByRole( 'menuitem' ).forEach( ( item ) => {
-					// // Check all menu items are present but disabled.
-					expect( item ).toBeEnabled();
-				} );
 			} );
 		} );
 
@@ -517,7 +504,7 @@ describe( 'NavigationMenuSelector', () => {
 				const user = userEvent.setup();
 
 				useNavigationMenu.mockReturnValue( {
-					canUserCreateNavigationMenu: false,
+					canUserCreateNavigationMenus: false,
 				} );
 
 				useNavigationEntities.mockReturnValue( {
@@ -539,7 +526,7 @@ describe( 'NavigationMenuSelector', () => {
 				const user = userEvent.setup();
 
 				useNavigationMenu.mockReturnValue( {
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 				} );
 
 				useNavigationEntities.mockReturnValue( {
@@ -568,10 +555,15 @@ describe( 'NavigationMenuSelector', () => {
 
 			it( 'should call the handler when the classic menu item is selected and disable all options during the import/creation process', async () => {
 				const user = userEvent.setup();
-				const handler = jest.fn();
+				const handler = jest.fn( async () => {} );
 
+				// initially we have the menus, and we're not waiting on network
 				useNavigationMenu.mockReturnValue( {
-					canUserCreateNavigationMenu: true,
+					navigationMenus: [],
+					isResolvingNavigationMenus: false,
+					hasResolvedNavigationMenus: true,
+					canSwitchNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 				} );
 
 				useNavigationEntities.mockReturnValue( {
@@ -597,6 +589,23 @@ describe( 'NavigationMenuSelector', () => {
 				// Check the dropdown has been closed.
 				expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
 
+				// since we're importing we are doing network activity
+				// so we have to wait on it
+				useNavigationMenu.mockReturnValue( {
+					navigationMenus: [],
+					isResolvingNavigationMenus: true,
+					hasResolvedNavigationMenus: false,
+					canUserCreateNavigationMenus: true,
+				} );
+
+				useNavigationEntities.mockReturnValue( {
+					menus: classicMenusFixture,
+				} );
+
+				rerender(
+					<NavigationMenuSelector onSelectClassicMenu={ handler } />
+				);
+
 				// // Re-open the dropdown (it's closed when the "Create menu" button is clicked).
 				await user.click( screen.getByRole( 'button' ) );
 
@@ -613,10 +622,23 @@ describe( 'NavigationMenuSelector', () => {
 					expect( item ).toBeDisabled();
 				} );
 
+				// once the menu is imported
+				// no more network activity to wait on
+				useNavigationMenu.mockReturnValue( {
+					navigationMenus: [],
+					isResolvingNavigationMenus: false,
+					hasResolvedNavigationMenus: true,
+					canUserCreateNavigationMenus: true,
+				} );
+
+				useNavigationEntities.mockReturnValue( {
+					menus: classicMenusFixture,
+				} );
+
 				// Simulate the menu being created and component being re-rendered.
 				rerender(
 					<NavigationMenuSelector
-						createNavigationMenuIsSuccess={ true } // classic menu import creates a Navigation menu.
+						createNavigationMenuIsSuccess // classic menu import creates a Navigation menu.
 					/>
 				);
 
diff --git a/packages/block-library/src/navigation/edit/unsaved-inner-blocks.js b/packages/block-library/src/navigation/edit/unsaved-inner-blocks.js
index e2ad08c2a99ab1..6cdcaa46f2bac3 100644
--- a/packages/block-library/src/navigation/edit/unsaved-inner-blocks.js
+++ b/packages/block-library/src/navigation/edit/unsaved-inner-blocks.js
@@ -5,17 +5,13 @@ import { useInnerBlocksProps } from '@wordpress/block-editor';
 import { Disabled } from '@wordpress/components';
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
-import { useContext, useEffect, useRef, useMemo } from '@wordpress/element';
+import { useContext, useEffect, useRef } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { areBlocksDirty } from './are-blocks-dirty';
-import {
-	DEFAULT_BLOCK,
-	ALLOWED_BLOCKS,
-	SELECT_NAVIGATION_MENUS_ARGS,
-} from '../constants';
+import { DEFAULT_BLOCK, SELECT_NAVIGATION_MENUS_ARGS } from '../constants';
 
 const EMPTY_OBJECT = {};
 
@@ -24,13 +20,13 @@ export default function UnsavedInnerBlocks( {
 	createNavigationMenu,
 	hasSelection,
 } ) {
-	const originalBlocks = useRef();
+	const originalBlocksRef = useRef();
 
 	useEffect( () => {
 		// Initially store the uncontrolled inner blocks for
 		// dirty state comparison.
-		if ( ! originalBlocks?.current ) {
-			originalBlocks.current = blocks;
+		if ( ! originalBlocksRef?.current ) {
+			originalBlocksRef.current = blocks;
 		}
 	}, [ blocks ] );
 
@@ -42,21 +38,10 @@ export default function UnsavedInnerBlocks( {
 	// entity records. As a result we need to perform a deep equality check skipping
 	// the page list's inner blocks.
 	const innerBlocksAreDirty = areBlocksDirty(
-		originalBlocks?.current,
+		originalBlocksRef?.current,
 		blocks
 	);
 
-	const shouldDirectInsert = useMemo(
-		() =>
-			blocks.every(
-				( { name } ) =>
-					name === 'core/navigation-link' ||
-					name === 'core/navigation-submenu' ||
-					name === 'core/page-list'
-			),
-		[ blocks ]
-	);
-
 	// The block will be disabled in a block preview, use this as a way of
 	// avoiding the side-effects of this component for block previews.
 	const isDisabled = useContext( Disabled.Context );
@@ -67,9 +52,8 @@ export default function UnsavedInnerBlocks( {
 		},
 		{
 			renderAppender: hasSelection ? undefined : false,
-			allowedBlocks: ALLOWED_BLOCKS,
 			defaultBlock: DEFAULT_BLOCK,
-			directInsert: shouldDirectInsert,
+			directInsert: true,
 		}
 	);
 
diff --git a/packages/block-library/src/navigation/edit/utils.js b/packages/block-library/src/navigation/edit/utils.js
index 2c436af8c5754f..943fc3b4cb4c11 100644
--- a/packages/block-library/src/navigation/edit/utils.js
+++ b/packages/block-library/src/navigation/edit/utils.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 function getComputedStyle( node ) {
 	return node.ownerDocument.defaultView.getComputedStyle( node );
@@ -91,7 +91,7 @@ export function getColors( context, isSubMenu ) {
 
 export function getNavigationChildBlockProps( innerBlocksColors ) {
 	return {
-		className: classnames( 'wp-block-navigation__submenu-container', {
+		className: clsx( 'wp-block-navigation__submenu-container', {
 			'has-text-color': !! (
 				innerBlocksColors.textColor || innerBlocksColors.customTextColor
 			),
diff --git a/packages/block-library/src/navigation/editor.scss b/packages/block-library/src/navigation/editor.scss
index 107fb6e6de5fd5..2f61a19be2b799 100644
--- a/packages/block-library/src/navigation/editor.scss
+++ b/packages/block-library/src/navigation/editor.scss
@@ -5,6 +5,10 @@
 // Undo default editor styles.
 // These need extra specificity.
 .editor-styles-wrapper .wp-block-navigation {
+	// Extra specificity is applied to do two things in classic themes:
+	// 1. Override the auto margin from alignment styles. This is needed as the `ul` element
+	//    has a `wp-block` class applied to it, even though it's not a block.
+	// 2. Override list indentation that targets `ul,ol` elements.
 	ul {
 		margin-top: 0;
 		margin-bottom: 0;
@@ -100,7 +104,6 @@
 		background: $gray-900;
 		padding: 0;
 		width: $button-size-small;
-		border-radius: $radius-block-ui;
 		margin-right: 0;
 		margin-left: auto;
 	}
@@ -200,6 +203,7 @@ $color-control-label-height: 20px;
 .wp-block-navigation .wp-block + .block-list-appender .block-editor-button-block-appender {
 	background-color: $gray-900;
 	color: $white;
+	height: $button-size-small;
 
 	// This needs specificity to override an inherited padding.
 	// That source padding in turn has high specificity to protect
@@ -287,7 +291,6 @@ $color-control-label-height: 20px;
 		left: 0;
 		pointer-events: none;
 		border: $border-width dashed currentColor;
-		@include placeholder-style();
 
 		// Inherit border radius from style variations.
 		border-radius: inherit;
@@ -323,7 +326,7 @@ $color-control-label-height: 20px;
 }
 
 .wp-block-navigation-placeholder__controls {
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	background-color: $white;
 	box-shadow: inset 0 0 0 $border-width $gray-900;
 	display: none;
@@ -457,21 +460,11 @@ $color-control-label-height: 20px;
 	}
 }
 
-.has-fixed-toolbar .wp-block-navigation__responsive-container.is-menu-open {
-	@include break-medium() {
-		top: $admin-bar-height + $header-height + $block-toolbar-height + $border-width;
-	}
-}
-
 .is-mobile-preview .wp-block-navigation__responsive-container.is-menu-open,
 .is-tablet-preview .wp-block-navigation__responsive-container.is-menu-open {
 	top: $admin-bar-height + $header-height + $block-toolbar-height + $border-width;
 }
 
-.is-sidebar-opened .wp-block-navigation__responsive-container.is-menu-open {
-	right: $sidebar-width;
-}
-
 // When fullscreen.
 .is-fullscreen-mode {
 	.wp-block-navigation__responsive-container.is-menu-open {
@@ -483,19 +476,13 @@ $color-control-label-height: 20px;
 		}
 	}
 
-	.has-fixed-toolbar .wp-block-navigation__responsive-container.is-menu-open {
-		@include break-medium() {
-			top: $header-height + $block-toolbar-height + $border-width;
-		}
-	}
-
 	.is-mobile-preview .wp-block-navigation__responsive-container.is-menu-open,
 	.is-tablet-preview .wp-block-navigation__responsive-container.is-menu-open {
 		top: $header-height + $block-toolbar-height + $border-width;
 	}
 }
 
-// The iframe makes these rules a lot simpler.
+// `body.editor-styles-wrapper` ensures this only applies to the iframed editor.
 body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-open {
 	top: 0;
 	right: 0;
@@ -577,7 +564,11 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
 	width: 100%;
 	background-color: $gray-100;
 	padding: 0 $grid-unit-30;
-	height: $grid-unit-40 * 2;
+
+	// Adding !important to override default 40px size.
+	// Ref - https://github.com/WordPress/gutenberg/pull/65075#discussion_r1746282734
+	height: $grid-unit-40 * 2 !important;
+
 	margin-bottom: $grid-unit-15;
 
 	&.open {
@@ -645,3 +636,8 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
 .wp-block-navigation__menu-inspector-controls__empty-message {
 	margin-left: 24px;
 }
+
+.wp-block-navigation__overlay-menu-icon-toggle-group {
+	// Counteract the margin added by the block inspector.
+	margin-bottom: $grid-unit-20;
+}
diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index eb06e731ccb8f9..fa9bb5a56f8012 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -5,12 +5,717 @@
  * @package WordPress
  */
 
+/**
+ * Helper functions used to render the navigation block.
+ *
+ * @since 6.5.0
+ */
+class WP_Navigation_Block_Renderer {
+
+	/**
+	 * Used to determine whether or not a navigation has submenus.
+	 *
+	 * @since 6.5.0
+	 */
+	private static $has_submenus = false;
+
+	/**
+	 * Used to determine which blocks need an <li> wrapper.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var array
+	 */
+	private static $needs_list_item_wrapper = array(
+		'core/site-title',
+		'core/site-logo',
+		'core/social-links',
+	);
+
+	/**
+	 * Keeps track of all the navigation names that have been seen.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var array
+	 */
+	private static $seen_menu_names = array();
+
+	/**
+	 * Returns whether or not this is responsive navigation.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return bool Returns whether or not this is responsive navigation.
+	 */
+	private static function is_responsive( $attributes ) {
+		/**
+		 * This is for backwards compatibility after the `isResponsive` attribute was been removed.
+		 */
+
+		$has_old_responsive_attribute = ! empty( $attributes['isResponsive'] ) && $attributes['isResponsive'];
+		return isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'] || $has_old_responsive_attribute;
+	}
+
+	/**
+	 * Returns whether or not a navigation has a submenu.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @return bool Returns whether or not a navigation has a submenu and also sets the member variable.
+	 */
+	private static function has_submenus( $inner_blocks ) {
+		if ( true === static::$has_submenus ) {
+			return static::$has_submenus;
+		}
+
+		foreach ( $inner_blocks as $inner_block ) {
+			// If this is a page list then work out if any of the pages have children.
+			if ( 'core/page-list' === $inner_block->name ) {
+				$all_pages = get_pages(
+					array(
+						'sort_column' => 'menu_order,post_title',
+						'order'       => 'asc',
+					)
+				);
+				foreach ( (array) $all_pages as $page ) {
+					if ( $page->post_parent ) {
+						static::$has_submenus = true;
+						break;
+					}
+				}
+			}
+			// If this is a navigation submenu then we know we have submenus.
+			if ( 'core/navigation-submenu' === $inner_block->name ) {
+				static::$has_submenus = true;
+				break;
+			}
+		}
+
+		return static::$has_submenus;
+	}
+
+	/**
+	 * Determine whether the navigation blocks is interactive.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array         $attributes   The block attributes.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @return bool Returns whether or not to load the view script.
+	 */
+	private static function is_interactive( $attributes, $inner_blocks ) {
+		$has_submenus       = static::has_submenus( $inner_blocks );
+		$is_responsive_menu = static::is_responsive( $attributes );
+		return ( $has_submenus && ( $attributes['openSubmenusOnClick'] || $attributes['showSubmenuIcon'] ) ) || $is_responsive_menu;
+	}
+
+	/**
+	 * Returns whether or not a block needs a list item wrapper.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Block $block The block.
+	 * @return bool Returns whether or not a block needs a list item wrapper.
+	 */
+	private static function does_block_need_a_list_item_wrapper( $block ) {
+
+		/**
+		 * Filter the list of blocks that need a list item wrapper.
+		 *
+		 * Affords the ability to customize which blocks need a list item wrapper when rendered
+		 * within a core/navigation block.
+		 * This is useful for blocks that are not list items but should be wrapped in a list
+		 * item when used as a child of a navigation block.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param array $needs_list_item_wrapper The list of blocks that need a list item wrapper.
+		 * @return array The list of blocks that need a list item wrapper.
+		 */
+		$needs_list_item_wrapper = apply_filters( 'block_core_navigation_listable_blocks', static::$needs_list_item_wrapper );
+
+		return in_array( $block->name, $needs_list_item_wrapper, true );
+	}
+
+	/**
+	 * Returns the markup for a single inner block.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Block $inner_block The inner block.
+	 * @return string Returns the markup for a single inner block.
+	 */
+	private static function get_markup_for_inner_block( $inner_block ) {
+		$inner_block_content = $inner_block->render();
+		if ( ! empty( $inner_block_content ) ) {
+			if ( static::does_block_need_a_list_item_wrapper( $inner_block ) ) {
+				return '<li class="wp-block-navigation-item">' . $inner_block_content . '</li>';
+			}
+		}
+
+		return $inner_block_content;
+	}
+
+	/**
+	 * Returns the html for the inner blocks of the navigation block.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array         $attributes   The block attributes.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @return string Returns the html for the inner blocks of the navigation block.
+	 */
+	private static function get_inner_blocks_html( $attributes, $inner_blocks ) {
+		$has_submenus   = static::has_submenus( $inner_blocks );
+		$is_interactive = static::is_interactive( $attributes, $inner_blocks );
+
+		$style                = static::get_styles( $attributes );
+		$class                = static::get_classes( $attributes );
+		$container_attributes = get_block_wrapper_attributes(
+			array(
+				'class' => 'wp-block-navigation__container ' . $class,
+				'style' => $style,
+			)
+		);
+
+		$inner_blocks_html = '';
+		$is_list_open      = false;
+
+		foreach ( $inner_blocks as $inner_block ) {
+			$inner_block_markup = static::get_markup_for_inner_block( $inner_block );
+			$p                  = new WP_HTML_Tag_Processor( $inner_block_markup );
+			$is_list_item       = $p->next_tag( 'LI' );
+
+			if ( $is_list_item && ! $is_list_open ) {
+				$is_list_open       = true;
+				$inner_blocks_html .= sprintf(
+					'<ul %1$s>',
+					$container_attributes
+				);
+			}
+
+			if ( ! $is_list_item && $is_list_open ) {
+				$is_list_open       = false;
+				$inner_blocks_html .= '</ul>';
+			}
+
+			$inner_blocks_html .= $inner_block_markup;
+		}
+
+		if ( $is_list_open ) {
+			$inner_blocks_html .= '</ul>';
+		}
+
+		// Add directives to the submenu if needed.
+		if ( $has_submenus && $is_interactive ) {
+			$tags              = new WP_HTML_Tag_Processor( $inner_blocks_html );
+			$inner_blocks_html = block_core_navigation_add_directives_to_submenu( $tags, $attributes );
+		}
+
+		return $inner_blocks_html;
+	}
+
+	/**
+	 * Gets the inner blocks for the navigation block from the navigation post.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return WP_Block_List Returns the inner blocks for the navigation block.
+	 */
+	private static function get_inner_blocks_from_navigation_post( $attributes ) {
+		$navigation_post = get_post( $attributes['ref'] );
+		if ( ! isset( $navigation_post ) ) {
+			return new WP_Block_List( array(), $attributes );
+		}
+
+		// Only published posts are valid. If this is changed then a corresponding change
+		// must also be implemented in `use-navigation-menu.js`.
+		if ( 'publish' === $navigation_post->post_status ) {
+			$parsed_blocks = parse_blocks( $navigation_post->post_content );
+
+			// 'parse_blocks' includes a null block with '\n\n' as the content when
+			// it encounters whitespace. This code strips it.
+			$blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
+
+			// Run Block Hooks algorithm to inject hooked blocks.
+			$markup         = block_core_navigation_insert_hooked_blocks( $blocks, $navigation_post );
+			$root_nav_block = parse_blocks( $markup )[0];
+
+			$blocks = isset( $root_nav_block['innerBlocks'] ) ? $root_nav_block['innerBlocks'] : $blocks;
+
+			// TODO - this uses the full navigation block attributes for the
+			// context which could be refined.
+			return new WP_Block_List( $blocks, $attributes );
+		}
+	}
+
+	/**
+	 * Gets the inner blocks for the navigation block from the fallback.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return WP_Block_List Returns the inner blocks for the navigation block.
+	 */
+	private static function get_inner_blocks_from_fallback( $attributes ) {
+		$fallback_blocks = block_core_navigation_get_fallback_blocks();
+
+		// Fallback my have been filtered so do basic test for validity.
+		if ( empty( $fallback_blocks ) || ! is_array( $fallback_blocks ) ) {
+			return new WP_Block_List( array(), $attributes );
+		}
+
+		return new WP_Block_List( $fallback_blocks, $attributes );
+	}
+
+	/**
+	 * Gets the inner blocks for the navigation block.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array    $attributes The block attributes.
+	 * @param WP_Block $block The parsed block.
+	 * @return WP_Block_List Returns the inner blocks for the navigation block.
+	 */
+	private static function get_inner_blocks( $attributes, $block ) {
+		$inner_blocks = $block->inner_blocks;
+
+		// Ensure that blocks saved with the legacy ref attribute name (navigationMenuId) continue to render.
+		if ( array_key_exists( 'navigationMenuId', $attributes ) ) {
+			$attributes['ref'] = $attributes['navigationMenuId'];
+		}
+
+		// If:
+		// - the gutenberg plugin is active
+		// - `__unstableLocation` is defined
+		// - we have menu items at the defined location
+		// - we don't have a relationship to a `wp_navigation` Post (via `ref`).
+		// ...then create inner blocks from the classic menu assigned to that location.
+		if (
+			defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN &&
+			array_key_exists( '__unstableLocation', $attributes ) &&
+			! array_key_exists( 'ref', $attributes ) &&
+			! empty( block_core_navigation_get_menu_items_at_location( $attributes['__unstableLocation'] ) )
+		) {
+			$inner_blocks = block_core_navigation_get_inner_blocks_from_unstable_location( $attributes );
+		}
+
+		// Load inner blocks from the navigation post.
+		if ( array_key_exists( 'ref', $attributes ) ) {
+			$inner_blocks = static::get_inner_blocks_from_navigation_post( $attributes );
+		}
+
+		// If there are no inner blocks then fallback to rendering an appropriate fallback.
+		if ( empty( $inner_blocks ) ) {
+			$inner_blocks = static::get_inner_blocks_from_fallback( $attributes );
+		}
+
+		/**
+		 * Filter navigation block $inner_blocks.
+		 * Allows modification of a navigation block menu items.
+		 *
+		 * @since 6.1.0
+		 *
+		 * @param \WP_Block_List $inner_blocks
+		 */
+		$inner_blocks = apply_filters( 'block_core_navigation_render_inner_blocks', $inner_blocks );
+
+		$post_ids = block_core_navigation_get_post_ids( $inner_blocks );
+		if ( $post_ids ) {
+			_prime_post_caches( $post_ids, false, false );
+		}
+
+		return $inner_blocks;
+	}
+
+	/**
+	 * Gets the name of the current navigation, if it has one.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns the name of the navigation.
+	 */
+	private static function get_navigation_name( $attributes ) {
+
+		$navigation_name = $attributes['ariaLabel'] ?? '';
+
+		// Load the navigation post.
+		if ( array_key_exists( 'ref', $attributes ) ) {
+			$navigation_post = get_post( $attributes['ref'] );
+			if ( ! isset( $navigation_post ) ) {
+				return $navigation_name;
+			}
+
+			// Only published posts are valid. If this is changed then a corresponding change
+			// must also be implemented in `use-navigation-menu.js`.
+			if ( 'publish' === $navigation_post->post_status ) {
+				$navigation_name = $navigation_post->post_title;
+
+				// This is used to count the number of times a navigation name has been seen,
+				// so that we can ensure every navigation has a unique id.
+				if ( isset( static::$seen_menu_names[ $navigation_name ] ) ) {
+					++static::$seen_menu_names[ $navigation_name ];
+				} else {
+					static::$seen_menu_names[ $navigation_name ] = 1;
+				}
+			}
+		}
+
+		return $navigation_name;
+	}
+
+	/**
+	 * Returns the layout class for the navigation block.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns the layout class for the navigation block.
+	 */
+	private static function get_layout_class( $attributes ) {
+		$layout_justification = array(
+			'left'          => 'items-justified-left',
+			'right'         => 'items-justified-right',
+			'center'        => 'items-justified-center',
+			'space-between' => 'items-justified-space-between',
+		);
+
+		$layout_class = '';
+		if (
+			isset( $attributes['layout']['justifyContent'] ) &&
+			isset( $layout_justification[ $attributes['layout']['justifyContent'] ] )
+		) {
+			$layout_class .= $layout_justification[ $attributes['layout']['justifyContent'] ];
+		}
+		if ( isset( $attributes['layout']['orientation'] ) && 'vertical' === $attributes['layout']['orientation'] ) {
+			$layout_class .= ' is-vertical';
+		}
+
+		if ( isset( $attributes['layout']['flexWrap'] ) && 'nowrap' === $attributes['layout']['flexWrap'] ) {
+			$layout_class .= ' no-wrap';
+		}
+		return $layout_class;
+	}
+
+	/**
+	 * Return classes for the navigation block.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns the classes for the navigation block.
+	 */
+	private static function get_classes( $attributes ) {
+		// Restore legacy classnames for submenu positioning.
+		$layout_class       = static::get_layout_class( $attributes );
+		$colors             = block_core_navigation_build_css_colors( $attributes );
+		$font_sizes         = block_core_navigation_build_css_font_sizes( $attributes );
+		$is_responsive_menu = static::is_responsive( $attributes );
+
+		// Manually add block support text decoration as CSS class.
+		$text_decoration       = $attributes['style']['typography']['textDecoration'] ?? null;
+		$text_decoration_class = sprintf( 'has-text-decoration-%s', $text_decoration );
+
+		$classes = array_merge(
+			$colors['css_classes'],
+			$font_sizes['css_classes'],
+			$is_responsive_menu ? array( 'is-responsive' ) : array(),
+			$layout_class ? array( $layout_class ) : array(),
+			$text_decoration ? array( $text_decoration_class ) : array()
+		);
+		return implode( ' ', $classes );
+	}
+
+	/**
+	 * Get styles for the navigation block.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns the styles for the navigation block.
+	 */
+	private static function get_styles( $attributes ) {
+		$colors       = block_core_navigation_build_css_colors( $attributes );
+		$font_sizes   = block_core_navigation_build_css_font_sizes( $attributes );
+		$block_styles = isset( $attributes['styles'] ) ? $attributes['styles'] : '';
+		return $block_styles . $colors['inline_styles'] . $font_sizes['inline_styles'];
+	}
+
+	/**
+	 * Get the responsive container markup
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array         $attributes The block attributes.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @param string        $inner_blocks_html The markup for the inner blocks.
+	 * @return string Returns the container markup.
+	 */
+	private static function get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html ) {
+		$is_interactive  = static::is_interactive( $attributes, $inner_blocks );
+		$colors          = block_core_navigation_build_css_colors( $attributes );
+		$modal_unique_id = wp_unique_id( 'modal-' );
+
+		$is_hidden_by_default = isset( $attributes['overlayMenu'] ) && 'always' === $attributes['overlayMenu'];
+
+		$responsive_container_classes = array(
+			'wp-block-navigation__responsive-container',
+			$is_hidden_by_default ? 'hidden-by-default' : '',
+			implode( ' ', $colors['overlay_css_classes'] ),
+		);
+		$open_button_classes          = array(
+			'wp-block-navigation__responsive-container-open',
+			$is_hidden_by_default ? 'always-shown' : '',
+		);
+
+		$should_display_icon_label = isset( $attributes['hasIcon'] ) && true === $attributes['hasIcon'];
+		$toggle_button_icon        = '<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><rect x="4" y="7.5" width="16" height="1.5" /><rect x="4" y="15" width="16" height="1.5" /></svg>';
+		if ( isset( $attributes['icon'] ) ) {
+			if ( 'menu' === $attributes['icon'] ) {
+				$toggle_button_icon = '<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 5v1.5h14V5H5zm0 7.8h14v-1.5H5v1.5zM5 19h14v-1.5H5V19z" /></svg>';
+			}
+		}
+		$toggle_button_content       = $should_display_icon_label ? $toggle_button_icon : __( 'Menu' );
+		$toggle_close_button_icon    = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="m13.06 12 6.47-6.47-1.06-1.06L12 10.94 5.53 4.47 4.47 5.53 10.94 12l-6.47 6.47 1.06 1.06L12 13.06l6.47 6.47 1.06-1.06L13.06 12Z"></path></svg>';
+		$toggle_close_button_content = $should_display_icon_label ? $toggle_close_button_icon : __( 'Close' );
+		$toggle_aria_label_open      = $should_display_icon_label ? 'aria-label="' . __( 'Open menu' ) . '"' : ''; // Open button label.
+		$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
+
+		// Add Interactivity API directives to the markup if needed.
+		$open_button_directives          = '';
+		$responsive_container_directives = '';
+		$responsive_dialog_directives    = '';
+		$close_button_directives         = '';
+		if ( $is_interactive ) {
+			$open_button_directives                  = '
+				data-wp-on-async--click="actions.openMenuOnClick"
+				data-wp-on--keydown="actions.handleMenuKeydown"
+			';
+			$responsive_container_directives         = '
+				data-wp-class--has-modal-open="state.isMenuOpen"
+				data-wp-class--is-menu-open="state.isMenuOpen"
+				data-wp-watch="callbacks.initMenu"
+				data-wp-on--keydown="actions.handleMenuKeydown"
+				data-wp-on-async--focusout="actions.handleMenuFocusout"
+				tabindex="-1"
+			';
+			$responsive_dialog_directives            = '
+				data-wp-bind--aria-modal="state.ariaModal"
+				data-wp-bind--aria-label="state.ariaLabel"
+				data-wp-bind--role="state.roleAttribute"
+			';
+			$close_button_directives                 = '
+				data-wp-on-async--click="actions.closeMenuOnClick"
+			';
+			$responsive_container_content_directives = '
+				data-wp-watch="callbacks.focusFirstElement"
+			';
+		}
+
+		$overlay_inline_styles = esc_attr( safecss_filter_attr( $colors['overlay_inline_styles'] ) );
+
+		return sprintf(
+			'<button aria-haspopup="dialog" %3$s class="%6$s" %10$s>%8$s</button>
+				<div class="%5$s" %7$s id="%1$s" %11$s>
+					<div class="wp-block-navigation__responsive-close" tabindex="-1">
+						<div class="wp-block-navigation__responsive-dialog" %12$s>
+							<button %4$s class="wp-block-navigation__responsive-container-close" %13$s>%9$s</button>
+							<div class="wp-block-navigation__responsive-container-content" %14$s id="%1$s-content">
+								%2$s
+							</div>
+						</div>
+					</div>
+				</div>',
+			esc_attr( $modal_unique_id ),
+			$inner_blocks_html,
+			$toggle_aria_label_open,
+			$toggle_aria_label_close,
+			esc_attr( implode( ' ', $responsive_container_classes ) ),
+			esc_attr( implode( ' ', $open_button_classes ) ),
+			( ! empty( $overlay_inline_styles ) ) ? "style=\"$overlay_inline_styles\"" : '',
+			$toggle_button_content,
+			$toggle_close_button_content,
+			$open_button_directives,
+			$responsive_container_directives,
+			$responsive_dialog_directives,
+			$close_button_directives,
+			$responsive_container_content_directives
+		);
+	}
+
+	/**
+	 * Get the wrapper attributes
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array         $attributes    The block attributes.
+	 * @param WP_Block_List $inner_blocks  A list of inner blocks.
+	 * @return string Returns the navigation block markup.
+	 */
+	private static function get_nav_wrapper_attributes( $attributes, $inner_blocks ) {
+		$nav_menu_name      = static::get_unique_navigation_name( $attributes );
+		$is_interactive     = static::is_interactive( $attributes, $inner_blocks );
+		$is_responsive_menu = static::is_responsive( $attributes );
+		$style              = static::get_styles( $attributes );
+		$class              = static::get_classes( $attributes );
+		$wrapper_attributes = get_block_wrapper_attributes(
+			array(
+				'class'      => $class,
+				'style'      => $style,
+				'aria-label' => $nav_menu_name,
+			)
+		);
+
+		if ( $is_responsive_menu ) {
+			$nav_element_directives = static::get_nav_element_directives( $is_interactive );
+			$wrapper_attributes    .= ' ' . $nav_element_directives;
+		}
+
+		return $wrapper_attributes;
+	}
+
+	/**
+	 * Gets the nav element directives.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param bool $is_interactive Whether the block is interactive.
+	 * @return string the directives for the navigation element.
+	 */
+	private static function get_nav_element_directives( $is_interactive ) {
+		if ( ! $is_interactive ) {
+			return '';
+		}
+		// When adding to this array be mindful of security concerns.
+		$nav_element_context    = wp_interactivity_data_wp_context(
+			array(
+				'overlayOpenedBy' => array(
+					'click' => false,
+					'hover' => false,
+					'focus' => false,
+				),
+				'type'            => 'overlay',
+				'roleAttribute'   => '',
+				'ariaLabel'       => __( 'Menu' ),
+			)
+		);
+		$nav_element_directives = '
+		 data-wp-interactive="core/navigation" '
+		. $nav_element_context;
+
+		return $nav_element_directives;
+	}
+
+	/**
+	 * Handle view script module loading.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array         $attributes   The block attributes.
+	 * @param WP_Block      $block        The parsed block.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 */
+	private static function handle_view_script_module_loading( $attributes, $block, $inner_blocks ) {
+		if ( static::is_interactive( $attributes, $inner_blocks ) ) {
+			wp_enqueue_script_module( '@wordpress/block-library/navigation/view' );
+		}
+	}
+
+	/**
+	 * Returns the markup for the navigation block.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array         $attributes The block attributes.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @return string Returns the navigation wrapper markup.
+	 */
+	private static function get_wrapper_markup( $attributes, $inner_blocks ) {
+		$inner_blocks_html = static::get_inner_blocks_html( $attributes, $inner_blocks );
+		if ( static::is_responsive( $attributes ) ) {
+			return static::get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html );
+		}
+		return $inner_blocks_html;
+	}
+
+	/**
+	 * Returns a unique name for the navigation.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns a unique name for the navigation.
+	 */
+	private static function get_unique_navigation_name( $attributes ) {
+		$nav_menu_name = static::get_navigation_name( $attributes );
+
+		// If the menu name has been used previously then append an ID
+		// to the name to ensure uniqueness across a given post.
+		if ( isset( static::$seen_menu_names[ $nav_menu_name ] ) && static::$seen_menu_names[ $nav_menu_name ] > 1 ) {
+			$count         = static::$seen_menu_names[ $nav_menu_name ];
+			$nav_menu_name = $nav_menu_name . ' ' . ( $count );
+		}
+
+		return $nav_menu_name;
+	}
+
+	/**
+	 * Renders the navigation block.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array    $attributes The block attributes.
+	 * @param string   $content    The saved content.
+	 * @param WP_Block $block      The parsed block.
+	 * @return string Returns the navigation block markup.
+	 */
+	public static function render( $attributes, $content, $block ) {
+		/**
+		 * Deprecated:
+		 * The rgbTextColor and rgbBackgroundColor attributes
+		 * have been deprecated in favor of
+		 * customTextColor and customBackgroundColor ones.
+		 * Move the values from old attrs to the new ones.
+		 */
+		if ( isset( $attributes['rgbTextColor'] ) && empty( $attributes['textColor'] ) ) {
+			$attributes['customTextColor'] = $attributes['rgbTextColor'];
+		}
+
+		if ( isset( $attributes['rgbBackgroundColor'] ) && empty( $attributes['backgroundColor'] ) ) {
+			$attributes['customBackgroundColor'] = $attributes['rgbBackgroundColor'];
+		}
+
+		unset( $attributes['rgbTextColor'], $attributes['rgbBackgroundColor'] );
+
+		$inner_blocks = static::get_inner_blocks( $attributes, $block );
+		// Prevent navigation blocks referencing themselves from rendering.
+		if ( block_core_navigation_block_contains_core_navigation( $inner_blocks ) ) {
+			return '';
+		}
+
+		static::handle_view_script_module_loading( $attributes, $block, $inner_blocks );
+
+		return sprintf(
+			'<nav %1$s>%2$s</nav>',
+			static::get_nav_wrapper_attributes( $attributes, $inner_blocks ),
+			static::get_wrapper_markup( $attributes, $inner_blocks )
+		);
+	}
+}
+
 // These functions are used for the __unstableLocation feature and only active
 // when the gutenberg plugin is active.
 if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
 	/**
 	 * Returns the menu items for a WordPress menu location.
 	 *
+	 * @since 5.9.0
+	 *
 	 * @param string $location The menu location.
 	 * @return array Menu items for the location.
 	 */
@@ -47,6 +752,8 @@ function block_core_navigation_get_menu_items_at_location( $location ) {
 	 * Sorts a standard array of menu items into a nested structure keyed by the
 	 * id of the parent menu.
 	 *
+	 * @since 5.9.0
+	 *
 	 * @param array $menu_items Menu items to sort.
 	 * @return array An array keyed by the id of the parent menu where each element
 	 *               is an array of menu items that belong to that parent.
@@ -69,13 +776,15 @@ function block_core_navigation_sort_menu_items_by_parent_id( $menu_items ) {
 	/**
 	 * Gets the inner blocks for the navigation block from the unstable location attribute.
 	 *
+	 * @since 6.5.0
+	 *
 	 * @param array $attributes The block attributes.
 	 * @return WP_Block_List Returns the inner blocks for the navigation block.
 	 */
 	function block_core_navigation_get_inner_blocks_from_unstable_location( $attributes ) {
 		$menu_items = block_core_navigation_get_menu_items_at_location( $attributes['__unstableLocation'] );
 		if ( empty( $menu_items ) ) {
-			return '';
+			return new WP_Block_List( array(), $attributes );
 		}
 
 		$menu_items_by_parent_id = block_core_navigation_sort_menu_items_by_parent_id( $menu_items );
@@ -88,6 +797,8 @@ function block_core_navigation_get_inner_blocks_from_unstable_location( $attribu
  * Add Interactivity API directives to the navigation-submenu and page-list
  * blocks markup using the Tag Processor.
  *
+ * @since 6.3.0
+ *
  * @param WP_HTML_Tag_Processor $tags             Markup of the navigation block.
  * @param array                 $block_attributes Block attributes.
  *
@@ -101,8 +812,8 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
 		)
 	) ) {
 		// Add directives to the parent `<li>`.
-		$tags->set_attribute( 'data-wp-interactive', '{ "namespace": "core/navigation" }' );
-		$tags->set_attribute( 'data-wp-context', '{ "submenuOpenedBy": {}, "type": "submenu" }' );
+		$tags->set_attribute( 'data-wp-interactive', 'core/navigation' );
+		$tags->set_attribute( 'data-wp-context', '{ "submenuOpenedBy": { "click": false, "hover": false, "focus": false }, "type": "submenu" }' );
 		$tags->set_attribute( 'data-wp-watch', 'callbacks.initMenu' );
 		$tags->set_attribute( 'data-wp-on--focusout', 'actions.handleMenuFocusout' );
 		$tags->set_attribute( 'data-wp-on--keydown', 'actions.handleMenuKeydown' );
@@ -114,8 +825,8 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
 		$tags->set_attribute( 'tabindex', '-1' );
 
 		if ( ! isset( $block_attributes['openSubmenusOnClick'] ) || false === $block_attributes['openSubmenusOnClick'] ) {
-			$tags->set_attribute( 'data-wp-on--mouseenter', 'actions.openMenuOnHover' );
-			$tags->set_attribute( 'data-wp-on--mouseleave', 'actions.closeMenuOnHover' );
+			$tags->set_attribute( 'data-wp-on-async--mouseenter', 'actions.openMenuOnHover' );
+			$tags->set_attribute( 'data-wp-on-async--mouseleave', 'actions.closeMenuOnHover' );
 		}
 
 		// Add directives to the toggle submenu button.
@@ -125,7 +836,7 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
 				'class_name' => 'wp-block-navigation-submenu__toggle',
 			)
 		) ) {
-			$tags->set_attribute( 'data-wp-on--click', 'actions.toggleMenuOnClick' );
+			$tags->set_attribute( 'data-wp-on-async--click', 'actions.toggleMenuOnClick' );
 			$tags->set_attribute( 'data-wp-bind--aria-expanded', 'state.isMenuOpen' );
 			// The `aria-expanded` attribute for SSR is already added in the submenu block.
 		}
@@ -136,7 +847,7 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
 				'class_name' => 'wp-block-navigation__submenu-container',
 			)
 		) ) {
-			$tags->set_attribute( 'data-wp-on--focus', 'actions.openMenuOnFocus' );
+			$tags->set_attribute( 'data-wp-on-async--focus', 'actions.openMenuOnFocus' );
 		}
 
 		// Iterate through subitems if exist.
@@ -149,6 +860,8 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
  * Build an array with CSS classes and inline styles defining the colors
  * which will be applied to the navigation markup in the front-end.
  *
+ * @since 5.9.0
+ *
  * @param array $attributes Navigation block attributes.
  *
  * @return array Colors CSS classes and inline styles.
@@ -240,6 +953,8 @@ function block_core_navigation_build_css_colors( $attributes ) {
  * Build an array with CSS classes and inline styles defining the font sizes
  * which will be applied to the navigation markup in the front-end.
  *
+ * @since 5.9.0
+ *
  * @param array $attributes Navigation block attributes.
  *
  * @return array Font size CSS classes and inline styles.
@@ -268,6 +983,8 @@ function block_core_navigation_build_css_font_sizes( $attributes ) {
 /**
  * Returns the top-level submenu SVG chevron icon.
  *
+ * @since 5.9.0
+ *
  * @return string
  */
 function block_core_navigation_render_submenu_icon() {
@@ -280,6 +997,8 @@ function block_core_navigation_render_submenu_icon() {
  * it encounters whitespace. This is not a bug but rather how the parser
  * is designed.
  *
+ * @since 5.9.0
+ *
  * @param array $parsed_blocks the parsed blocks to be normalized.
  * @return array the normalized parsed blocks.
  */
@@ -298,6 +1017,8 @@ static function ( $block ) {
 /**
  * Returns true if the navigation block contains a nested navigation block.
  *
+ * @since 6.2.0
+ *
  * @param WP_Block_List $inner_blocks Inner block instance to be normalized.
  * @return bool true if the navigation block contains a nested navigation block.
  */
@@ -321,12 +1042,16 @@ function block_core_navigation_block_contains_core_navigation( $inner_blocks ) {
  * This aims to mirror how the fallback mechanic for wp_nav_menu works.
  * See https://developer.wordpress.org/reference/functions/wp_nav_menu/#more-information.
  *
+ * @since 5.9.0
+ *
  * @return array the array of blocks to be used as a fallback.
  */
 function block_core_navigation_get_fallback_blocks() {
 	$page_list_fallback = array(
 		array(
-			'blockName' => 'core/page-list',
+			'blockName'    => 'core/page-list',
+			'innerContent' => array(),
+			'attrs'        => array(),
 		),
 	);
 
@@ -334,12 +1059,7 @@ function block_core_navigation_get_fallback_blocks() {
 
 	// If `core/page-list` is not registered then return empty blocks.
 	$fallback_blocks = $registry->is_registered( 'core/page-list' ) ? $page_list_fallback : array();
-
-	if ( class_exists( 'WP_Navigation_Fallback' ) ) {
-		$navigation_post = WP_Navigation_Fallback::get_fallback();
-	} else {
-		$navigation_post = Gutenberg_Navigation_Fallback::get_fallback();
-	}
+	$navigation_post = WP_Navigation_Fallback::get_fallback();
 
 	// Use the first non-empty Navigation as fallback if available.
 	if ( $navigation_post ) {
@@ -349,6 +1069,15 @@ function block_core_navigation_get_fallback_blocks() {
 		// Normalizing blocks may result in an empty array of blocks if they were all `null` blocks.
 		// In this case default to the (Page List) fallback.
 		$fallback_blocks = ! empty( $maybe_fallback ) ? $maybe_fallback : $fallback_blocks;
+
+		// Run Block Hooks algorithm to inject hooked blocks.
+		// We have to run it here because we need the post ID of the Navigation block to track ignored hooked blocks.
+		$markup = block_core_navigation_insert_hooked_blocks( $fallback_blocks, $navigation_post );
+		$blocks = parse_blocks( $markup );
+
+		if ( isset( $blocks[0]['innerBlocks'] ) ) {
+			$fallback_blocks = $blocks[0]['innerBlocks'];
+		}
 	}
 
 	/**
@@ -360,7 +1089,7 @@ function block_core_navigation_get_fallback_blocks() {
 	 *
 	 * @since 5.9.0
 	 *
-	 * @param array[] default fallback blocks provided by the default block mechanic.
+	 * @param array[] $fallback_blocks default fallback blocks provided by the default block mechanic.
 	 */
 	return apply_filters( 'block_core_navigation_render_fallback', $fallback_blocks );
 }
@@ -368,6 +1097,8 @@ function block_core_navigation_get_fallback_blocks() {
 /**
  * Iterate through all inner blocks recursively and get navigation link block's post IDs.
  *
+ * @since 6.0.0
+ *
  * @param WP_Block_List $inner_blocks Block list class instance.
  *
  * @return array Array of post IDs.
@@ -380,6 +1111,8 @@ function block_core_navigation_get_post_ids( $inner_blocks ) {
 /**
  * Get post IDs from a navigation link block instance.
  *
+ * @since 6.0.0
+ *
  * @param WP_Block $block Instance of a block.
  *
  * @return array Array of post IDs.
@@ -403,6 +1136,8 @@ function block_core_navigation_from_block_get_post_ids( $block ) {
 /**
  * Renders the `core/navigation` block on server.
  *
+ * @since 5.9.0
+ *
  * @param array    $attributes The block attributes.
  * @param string   $content    The saved content.
  * @param WP_Block $block      The parsed block.
@@ -416,6 +1151,8 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 /**
  * Register the navigation block.
  *
+ * @since 5.9.0
+ *
  * @uses render_block_core_navigation()
  * @throws WP_Error An WP_Error exception parsing the block definition.
  */
@@ -426,15 +1163,6 @@ function register_block_core_navigation() {
 			'render_callback' => 'render_block_core_navigation',
 		)
 	);
-
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/navigation-block',
-			gutenberg_url( '/build/interactivity/navigation.min.js' ),
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
 }
 
 add_action( 'init', 'register_block_core_navigation' );
@@ -442,6 +1170,8 @@ function register_block_core_navigation() {
 /**
  * Filter that changes the parsed attribute values of navigation blocks contain typographic presets to contain the values directly.
  *
+ * @since 5.9.0
+ *
  * @param array $parsed_block The block being rendered.
  *
  * @return array The block being rendered without typographic presets.
@@ -473,28 +1203,11 @@ function block_core_navigation_typographic_presets_backcompatibility( $parsed_bl
 
 add_filter( 'render_block_data', 'block_core_navigation_typographic_presets_backcompatibility' );
 
-/**
- * Ensure that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_navigation_ensure_interactivity_dependency() {
-	global $wp_scripts;
-	if (
-		isset( $wp_scripts->registered['wp-block-navigation-view'] ) &&
-		! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-navigation-view']->deps, true )
-	) {
-		$wp_scripts->registered['wp-block-navigation-view']->deps[] = 'wp-interactivity';
-	}
-}
-
-add_action( 'wp_print_scripts', 'block_core_navigation_ensure_interactivity_dependency' );
-
 /**
  * Turns menu item data into a nested array of parsed blocks
  *
+ * @since 5.9.0
+ *
  * @deprecated 6.3.0 Use WP_Navigation_Fallback::parse_blocks_from_menu_items() instead.
  *
  * @param array $menu_items               An array of menu items that represent
@@ -552,6 +1265,8 @@ function block_core_navigation_parse_blocks_from_menu_items( $menu_items, $menu_
 /**
  * Get the classic navigation menu to use as a fallback.
  *
+ * @since 6.2.0
+ *
  * @deprecated 6.3.0 Use WP_Navigation_Fallback::get_classic_menu_fallback() instead.
  *
  * @return object WP_Term The classic navigation.
@@ -596,6 +1311,8 @@ static function ( $a, $b ) {
 /**
  * Converts a classic navigation to blocks.
  *
+ * @since 6.2.0
+ *
  * @deprecated 6.3.0 Use WP_Navigation_Fallback::get_classic_menu_fallback_blocks() instead.
  *
  * @param  object $classic_nav_menu WP_Term The classic navigation object to convert.
@@ -638,6 +1355,8 @@ function block_core_navigation_get_classic_menu_fallback_blocks( $classic_nav_me
 /**
  * If there's a classic menu then use it as a fallback.
  *
+ * @since 6.2.0
+ *
  * @deprecated 6.3.0 Use WP_Navigation_Fallback::create_classic_menu_fallback() instead.
  *
  * @return array the normalized parsed blocks.
@@ -683,6 +1402,8 @@ function block_core_navigation_maybe_use_classic_menu_fallback() {
 /**
  * Finds the most recently published `wp_navigation` Post.
  *
+ * @since 6.1.0
+ *
  * @deprecated 6.3.0 Use WP_Navigation_Fallback::get_most_recently_published_navigation() instead.
  *
  * @return WP_Post|null the first non-empty Navigation or null.
@@ -710,3 +1431,238 @@ function block_core_navigation_get_most_recently_published_navigation() {
 
 	return null;
 }
+
+/**
+ * Accepts the serialized markup of a block and its inner blocks, and returns serialized markup of the inner blocks.
+ *
+ * @since 6.5.0
+ *
+ * @param string $serialized_block The serialized markup of a block and its inner blocks.
+ * @return string
+ */
+function block_core_navigation_remove_serialized_parent_block( $serialized_block ) {
+	$start = strpos( $serialized_block, '-->' ) + strlen( '-->' );
+	$end   = strrpos( $serialized_block, '<!--' );
+	return substr( $serialized_block, $start, $end - $start );
+}
+
+/**
+ * Mock a parsed block for the Navigation block given its inner blocks and the `wp_navigation` post object.
+ * The `wp_navigation` post's `_wp_ignored_hooked_blocks` meta is queried to add the `metadata.ignoredHookedBlocks` attribute.
+ *
+ * @since 6.5.0
+ *
+ * @param array   $inner_blocks Parsed inner blocks of a Navigation block.
+ * @param WP_Post $post         `wp_navigation` post object corresponding to the block.
+ *
+ * @return array the normalized parsed blocks.
+ */
+function block_core_navigation_mock_parsed_block( $inner_blocks, $post ) {
+	$attributes = array();
+
+	if ( isset( $post->ID ) ) {
+		$ignored_hooked_blocks = get_post_meta( $post->ID, '_wp_ignored_hooked_blocks', true );
+		if ( ! empty( $ignored_hooked_blocks ) ) {
+			$ignored_hooked_blocks  = json_decode( $ignored_hooked_blocks, true );
+			$attributes['metadata'] = array(
+				'ignoredHookedBlocks' => $ignored_hooked_blocks,
+			);
+		}
+	}
+
+	$mock_anchor_parent_block = array(
+		'blockName'    => 'core/navigation',
+		'attrs'        => $attributes,
+		'innerBlocks'  => $inner_blocks,
+		'innerContent' => array_fill( 0, count( $inner_blocks ), null ),
+	);
+
+	return $mock_anchor_parent_block;
+}
+
+/**
+ * Insert hooked blocks into a Navigation block.
+ *
+ * Given a Navigation block's inner blocks and its corresponding `wp_navigation` post object,
+ * this function inserts hooked blocks into it, and returns the serialized inner blocks in a
+ * mock Navigation block wrapper.
+ *
+ * If there are any hooked blocks that need to be inserted as the Navigation block's first or last
+ * children, the `wp_navigation` post's `_wp_ignored_hooked_blocks` meta is checked to see if any
+ * of those hooked blocks should be exempted from insertion.
+ *
+ * @since 6.5.0
+ *
+ * @param array   $inner_blocks Parsed inner blocks of a Navigation block.
+ * @param WP_Post $post         `wp_navigation` post object corresponding to the block.
+ * @return string Serialized inner blocks in mock Navigation block wrapper, with hooked blocks inserted, if any.
+ */
+function block_core_navigation_insert_hooked_blocks( $inner_blocks, $post ) {
+	$mock_navigation_block = block_core_navigation_mock_parsed_block( $inner_blocks, $post );
+
+	if ( function_exists( 'apply_block_hooks_to_content' ) ) {
+		$mock_navigation_block_markup = serialize_block( $mock_navigation_block );
+		return apply_block_hooks_to_content( $mock_navigation_block_markup, $post, 'insert_hooked_blocks' );
+	}
+
+	$hooked_blocks        = get_hooked_blocks();
+	$before_block_visitor = null;
+	$after_block_visitor  = null;
+
+	if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
+		$before_block_visitor = make_before_block_visitor( $hooked_blocks, $post, 'insert_hooked_blocks' );
+		$after_block_visitor  = make_after_block_visitor( $hooked_blocks, $post, 'insert_hooked_blocks' );
+	}
+
+	return traverse_and_serialize_block( $mock_navigation_block, $before_block_visitor, $after_block_visitor );
+}
+
+/**
+ * Insert ignoredHookedBlocks meta into the Navigation block and its inner blocks.
+ *
+ * Given a Navigation block's inner blocks and its corresponding `wp_navigation` post object,
+ * this function inserts ignoredHookedBlocks meta into it, and returns the serialized inner blocks in a
+ * mock Navigation block wrapper.
+ *
+ * @since 6.5.0
+ *
+ * @param array   $inner_blocks Parsed inner blocks of a Navigation block.
+ * @param WP_Post $post         `wp_navigation` post object corresponding to the block.
+ * @return string Serialized inner blocks in mock Navigation block wrapper, with hooked blocks inserted, if any.
+ */
+function block_core_navigation_set_ignored_hooked_blocks_metadata( $inner_blocks, $post ) {
+	$mock_navigation_block = block_core_navigation_mock_parsed_block( $inner_blocks, $post );
+	$hooked_blocks         = get_hooked_blocks();
+	$before_block_visitor  = null;
+	$after_block_visitor   = null;
+
+	if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
+		$before_block_visitor = make_before_block_visitor( $hooked_blocks, $post, 'set_ignored_hooked_blocks_metadata' );
+		$after_block_visitor  = make_after_block_visitor( $hooked_blocks, $post, 'set_ignored_hooked_blocks_metadata' );
+	}
+
+	return traverse_and_serialize_block( $mock_navigation_block, $before_block_visitor, $after_block_visitor );
+}
+
+/**
+ * Updates the post meta with the list of ignored hooked blocks when the navigation is created or updated via the REST API.
+ *
+ * @access private
+ * @since 6.5.0
+ *
+ * @param stdClass $post Post object.
+ * @return stdClass The updated post object.
+ */
+function block_core_navigation_update_ignore_hooked_blocks_meta( $post ) {
+	/*
+	 * In this scenario the user has likely tried to create a navigation via the REST API.
+	 * In which case we won't have a post ID to work with and store meta against.
+	 */
+	if ( empty( $post->ID ) ) {
+		return $post;
+	}
+
+	/**
+	 * Skip meta generation when consumers intentionally update specific Navigation fields
+	 * and omit the content update.
+	 */
+	if ( ! isset( $post->post_content ) ) {
+		return $post;
+	}
+
+	/*
+	 * We run the Block Hooks mechanism to inject the `metadata.ignoredHookedBlocks` attribute into
+	 * all anchor blocks. For the root level, we create a mock Navigation and extract them from there.
+	 */
+	$blocks = parse_blocks( $post->post_content );
+
+	/*
+	 * Block Hooks logic requires a `WP_Post` object (rather than the `stdClass` with the updates that
+	 * we're getting from the `rest_pre_insert_wp_navigation` filter) as its second argument (to be
+	 * used as context for hooked blocks insertion).
+	 * We thus have to look it up from the DB,based on `$post->ID`.
+	 */
+	$markup = block_core_navigation_set_ignored_hooked_blocks_metadata( $blocks, get_post( $post->ID ) );
+
+	$root_nav_block        = parse_blocks( $markup )[0];
+	$ignored_hooked_blocks = isset( $root_nav_block['attrs']['metadata']['ignoredHookedBlocks'] )
+		? $root_nav_block['attrs']['metadata']['ignoredHookedBlocks']
+		: array();
+
+	if ( ! empty( $ignored_hooked_blocks ) ) {
+		$existing_ignored_hooked_blocks = get_post_meta( $post->ID, '_wp_ignored_hooked_blocks', true );
+		if ( ! empty( $existing_ignored_hooked_blocks ) ) {
+			$existing_ignored_hooked_blocks = json_decode( $existing_ignored_hooked_blocks, true );
+			$ignored_hooked_blocks          = array_unique( array_merge( $ignored_hooked_blocks, $existing_ignored_hooked_blocks ) );
+		}
+		update_post_meta( $post->ID, '_wp_ignored_hooked_blocks', json_encode( $ignored_hooked_blocks ) );
+	}
+
+	$post->post_content = block_core_navigation_remove_serialized_parent_block( $markup );
+	return $post;
+}
+
+/*
+ * Before adding our filter, we verify if it's already added in Core.
+ * However, during the build process, Gutenberg automatically prefixes our functions with "gutenberg_".
+ * Therefore, we concatenate the Core's function name to circumvent this prefix for our check.
+ */
+$rest_insert_wp_navigation_core_callback = 'block_core_navigation_' . 'update_ignore_hooked_blocks_meta'; // phpcs:ignore Generic.Strings.UnnecessaryStringConcat.Found
+
+/*
+ * Do not add the `block_core_navigation_update_ignore_hooked_blocks_meta` filter in the following cases:
+ * - If Core has added the `update_ignored_hooked_blocks_postmeta` filter already (WP >= 6.6);
+ * - or if the `$rest_insert_wp_navigation_core_callback` filter has already been added.
+ */
+if (
+	! has_filter( 'rest_pre_insert_wp_navigation', 'update_ignored_hooked_blocks_postmeta' ) &&
+	! has_filter( 'rest_pre_insert_wp_navigation', $rest_insert_wp_navigation_core_callback )
+) {
+	add_filter( 'rest_pre_insert_wp_navigation', 'block_core_navigation_update_ignore_hooked_blocks_meta' );
+}
+
+/**
+ * Hooks into the REST API response for the core/navigation block and adds the first and last inner blocks.
+ *
+ * @since 6.5.0
+ *
+ * @param WP_REST_Response $response The response object.
+ * @param WP_Post          $post     Post object.
+ * @return WP_REST_Response The response object.
+ */
+function block_core_navigation_insert_hooked_blocks_into_rest_response( $response, $post ) {
+	if ( ! isset( $response->data['content']['raw'] ) || ! isset( $response->data['content']['rendered'] ) ) {
+		return $response;
+	}
+	$parsed_blocks = parse_blocks( $response->data['content']['raw'] );
+	$content       = block_core_navigation_insert_hooked_blocks( $parsed_blocks, $post );
+
+	// Remove mock Navigation block wrapper.
+	$content = block_core_navigation_remove_serialized_parent_block( $content );
+
+	$response->data['content']['raw'] = $content;
+
+	/** This filter is documented in wp-includes/post-template.php */
+	$response->data['content']['rendered'] = apply_filters( 'the_content', $content );
+
+	return $response;
+}
+
+/*
+ *  Before adding our filter, we verify if it's already added in Core.
+ * However, during the build process, Gutenberg automatically prefixes our functions with "gutenberg_".
+ * Therefore, we concatenate the Core's function name to circumvent this prefix for our check.
+ */
+$rest_prepare_wp_navigation_core_callback = 'block_core_navigation_' . 'insert_hooked_blocks_into_rest_response';
+
+/*
+ * Do not add the `block_core_navigation_insert_hooked_blocks_into_rest_response` filter in the following cases:
+ * - If Core has added the `insert_hooked_blocks_into_rest_response` filter already (WP >= 6.6);
+ * - or if the `$rest_prepare_wp_navigation_core_callback` filter has already been added.
+ */
+if (
+	! has_filter( 'rest_prepare_wp_navigation', 'insert_hooked_blocks_into_rest_response' ) &&
+	! has_filter( 'rest_prepare_wp_navigation', $rest_prepare_wp_navigation_core_callback )
+) {
+	add_filter( 'rest_prepare_wp_navigation', 'block_core_navigation_insert_hooked_blocks_into_rest_response', 10, 3 );
+}
diff --git a/packages/block-library/src/navigation/style.scss b/packages/block-library/src/navigation/style.scss
index 0b70ebb656cfa8..3d7a8810ae9b71 100644
--- a/packages/block-library/src/navigation/style.scss
+++ b/packages/block-library/src/navigation/style.scss
@@ -76,15 +76,10 @@ $navigation-icon-size: 24px;
 		}
 	}
 
-	&:where(:not([class*="has-text-decoration"])) {
-		a {
-			text-decoration: none;
-
-			&:focus,
-			&:active {
-				text-decoration: none;
-			}
-		}
+	& :where(a),
+	& :where(a:focus),
+	& :where(a:active) {
+		text-decoration: none;
 	}
 
 	// Submenu indicator.
@@ -300,6 +295,7 @@ button.wp-block-navigation-item__content {
 	color: currentColor;
 	font-size: inherit;
 	font-family: inherit;
+	letter-spacing: inherit;
 	line-height: inherit;
 	font-style: inherit;
 	font-weight: inherit;
diff --git a/packages/block-library/src/navigation/test/use-navigation-menu.js b/packages/block-library/src/navigation/test/use-navigation-menu.js
index f82acca835884d..7eaf648fab936e 100644
--- a/packages/block-library/src/navigation/test/use-navigation-menu.js
+++ b/packages/block-library/src/navigation/test/use-navigation-menu.js
@@ -9,6 +9,12 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import useNavigationMenu from '../use-navigation-menu';
 
+const BASE_ENTITY = {
+	kind: 'postType',
+	name: 'wp_navigation',
+	id: undefined,
+};
+
 function createRegistryWithStores() {
 	// Create a registry and register used stores.
 	const registry = createRegistry();
@@ -63,37 +69,70 @@ function resolveRecords( registry, menus ) {
 
 function resolveReadPermission( registry, allowed ) {
 	const dispatch = registry.dispatch( coreStore );
-	dispatch.receiveUserPermission( 'create/navigation', allowed );
-	dispatch.startResolution( 'canUser', [ 'read', 'navigation' ] );
-	dispatch.finishResolution( 'canUser', [ 'read', 'navigation' ] );
+	dispatch.receiveUserPermission( 'read/postType/wp_navigation', allowed );
+	dispatch.startResolution( 'canUser', [ 'read', BASE_ENTITY ] );
+	dispatch.finishResolution( 'canUser', [ 'read', BASE_ENTITY ] );
 }
 
 function resolveReadRecordPermission( registry, ref, allowed ) {
 	const dispatch = registry.dispatch( coreStore );
-	dispatch.receiveUserPermission( 'create/navigation', allowed );
-	dispatch.startResolution( 'canUser', [ 'read', 'navigation', ref ] );
-	dispatch.finishResolution( 'canUser', [ 'read', 'navigation', ref ] );
+	dispatch.receiveUserPermission(
+		`read/postType/wp_navigation/${ ref }`,
+		allowed
+	);
+	dispatch.startResolution( 'canUser', [
+		'read',
+		{ ...BASE_ENTITY, id: ref },
+	] );
+	dispatch.finishResolution( 'canUser', [
+		'read',
+		{ ...BASE_ENTITY, id: ref },
+	] );
 }
 
 function resolveCreatePermission( registry, allowed ) {
 	const dispatch = registry.dispatch( coreStore );
-	dispatch.receiveUserPermission( 'create/navigation', allowed );
-	dispatch.startResolution( 'canUser', [ 'create', 'navigation' ] );
-	dispatch.finishResolution( 'canUser', [ 'create', 'navigation' ] );
+	dispatch.receiveUserPermission( 'create/postType/wp_navigation', allowed );
+	dispatch.startResolution( 'canUser', [
+		'create',
+		{ kind: 'postType', name: 'wp_navigation' },
+	] );
+	dispatch.finishResolution( 'canUser', [
+		'create',
+		{ kind: 'postType', name: 'wp_navigation' },
+	] );
 }
 
 function resolveUpdatePermission( registry, ref, allowed ) {
 	const dispatch = registry.dispatch( coreStore );
-	dispatch.receiveUserPermission( `update/navigation/${ ref }`, allowed );
-	dispatch.startResolution( 'canUser', [ 'update', 'navigation', ref ] );
-	dispatch.finishResolution( 'canUser', [ 'update', 'navigation', ref ] );
+	dispatch.receiveUserPermission(
+		`update/postType/wp_navigation/${ ref }`,
+		allowed
+	);
+	dispatch.startResolution( 'canUser', [
+		'update',
+		{ ...BASE_ENTITY, id: ref },
+	] );
+	dispatch.finishResolution( 'canUser', [
+		'update',
+		{ ...BASE_ENTITY, id: ref },
+	] );
 }
 
 function resolveDeletePermission( registry, ref, allowed ) {
 	const dispatch = registry.dispatch( coreStore );
-	dispatch.receiveUserPermission( `delete/navigation/${ ref }`, allowed );
-	dispatch.startResolution( 'canUser', [ 'delete', 'navigation', ref ] );
-	dispatch.finishResolution( 'canUser', [ 'delete', 'navigation', ref ] );
+	dispatch.receiveUserPermission(
+		`delete/postType/wp_navigation/${ ref }`,
+		allowed
+	);
+	dispatch.startResolution( 'canUser', [
+		'delete',
+		{ ...BASE_ENTITY, id: ref },
+	] );
+	dispatch.finishResolution( 'canUser', [
+		'delete',
+		{ ...BASE_ENTITY, id: ref },
+	] );
 }
 
 describe( 'useNavigationMenus', () => {
@@ -117,16 +156,16 @@ describe( 'useNavigationMenus', () => {
 			navigationMenus: null,
 			navigationMenu: undefined,
 			canSwitchNavigationMenu: false,
-			canUserCreateNavigationMenu: false,
+			canUserCreateNavigationMenus: false,
 			canUserDeleteNavigationMenu: undefined,
 			canUserUpdateNavigationMenu: undefined,
-			hasResolvedCanUserCreateNavigationMenu: false,
+			hasResolvedCanUserCreateNavigationMenus: false,
 			hasResolvedCanUserDeleteNavigationMenu: undefined,
 			hasResolvedCanUserUpdateNavigationMenu: undefined,
 			hasResolvedNavigationMenus: false,
 			isNavigationMenuMissing: true,
 			isNavigationMenuResolved: false,
-			isResolvingCanUserCreateNavigationMenu: false,
+			isResolvingCanUserCreateNavigationMenus: false,
 			isResolvingNavigationMenus: false,
 		} );
 	} );
@@ -139,16 +178,16 @@ describe( 'useNavigationMenus', () => {
 			navigationMenus,
 			navigationMenu: undefined,
 			canSwitchNavigationMenu: true,
-			canUserCreateNavigationMenu: true,
+			canUserCreateNavigationMenus: true,
 			canUserDeleteNavigationMenu: undefined,
 			canUserUpdateNavigationMenu: undefined,
-			hasResolvedCanUserCreateNavigationMenu: true,
+			hasResolvedCanUserCreateNavigationMenus: true,
 			hasResolvedCanUserDeleteNavigationMenu: undefined,
 			hasResolvedCanUserUpdateNavigationMenu: undefined,
 			hasResolvedNavigationMenus: true,
 			isNavigationMenuMissing: true,
 			isNavigationMenuResolved: false,
-			isResolvingCanUserCreateNavigationMenu: false,
+			isResolvingCanUserCreateNavigationMenus: false,
 			isResolvingNavigationMenus: false,
 		} );
 	} );
@@ -159,16 +198,16 @@ describe( 'useNavigationMenus', () => {
 			navigationMenu: navigationMenu1,
 			navigationMenus,
 			canSwitchNavigationMenu: true,
-			canUserCreateNavigationMenu: false,
+			canUserCreateNavigationMenus: false,
 			canUserDeleteNavigationMenu: false,
 			canUserUpdateNavigationMenu: false,
-			hasResolvedCanUserCreateNavigationMenu: false,
+			hasResolvedCanUserCreateNavigationMenus: false,
 			hasResolvedCanUserDeleteNavigationMenu: false,
 			hasResolvedCanUserUpdateNavigationMenu: false,
 			hasResolvedNavigationMenus: true,
 			isNavigationMenuMissing: false,
 			isNavigationMenuResolved: false,
-			isResolvingCanUserCreateNavigationMenu: false,
+			isResolvingCanUserCreateNavigationMenus: false,
 			isResolvingNavigationMenus: false,
 		} );
 	} );
@@ -181,16 +220,16 @@ describe( 'useNavigationMenus', () => {
 			navigationMenu: navigationMenuDraft,
 			navigationMenus: testMenus,
 			canSwitchNavigationMenu: true,
-			canUserCreateNavigationMenu: false,
+			canUserCreateNavigationMenus: false,
 			canUserDeleteNavigationMenu: false,
 			canUserUpdateNavigationMenu: false,
-			hasResolvedCanUserCreateNavigationMenu: false,
+			hasResolvedCanUserCreateNavigationMenus: false,
 			hasResolvedCanUserDeleteNavigationMenu: false,
 			hasResolvedCanUserUpdateNavigationMenu: false,
 			hasResolvedNavigationMenus: true,
 			isNavigationMenuMissing: false,
 			isNavigationMenuResolved: false,
-			isResolvingCanUserCreateNavigationMenu: false,
+			isResolvingCanUserCreateNavigationMenus: false,
 			isResolvingNavigationMenus: false,
 		} );
 	} );
@@ -205,16 +244,16 @@ describe( 'useNavigationMenus', () => {
 			navigationMenu: navigationMenu1,
 			navigationMenus,
 			canSwitchNavigationMenu: true,
-			canUserCreateNavigationMenu: true,
+			canUserCreateNavigationMenus: true,
 			canUserDeleteNavigationMenu: false,
 			canUserUpdateNavigationMenu: true,
-			hasResolvedCanUserCreateNavigationMenu: true,
+			hasResolvedCanUserCreateNavigationMenus: true,
 			hasResolvedCanUserDeleteNavigationMenu: true,
 			hasResolvedCanUserUpdateNavigationMenu: true,
 			hasResolvedNavigationMenus: true,
 			isNavigationMenuMissing: false,
 			isNavigationMenuResolved: false,
-			isResolvingCanUserCreateNavigationMenu: false,
+			isResolvingCanUserCreateNavigationMenus: false,
 			isResolvingNavigationMenus: false,
 		} );
 	} );
@@ -229,16 +268,16 @@ describe( 'useNavigationMenus', () => {
 			navigationMenu: navigationMenu1,
 			navigationMenus,
 			canSwitchNavigationMenu: true,
-			canUserCreateNavigationMenu: false,
+			canUserCreateNavigationMenus: false,
 			canUserDeleteNavigationMenu: true,
 			canUserUpdateNavigationMenu: false,
-			hasResolvedCanUserCreateNavigationMenu: true,
+			hasResolvedCanUserCreateNavigationMenus: true,
 			hasResolvedCanUserDeleteNavigationMenu: true,
 			hasResolvedCanUserUpdateNavigationMenu: true,
 			hasResolvedNavigationMenus: true,
 			isNavigationMenuMissing: false,
 			isNavigationMenuResolved: false,
-			isResolvingCanUserCreateNavigationMenu: false,
+			isResolvingCanUserCreateNavigationMenus: false,
 			isResolvingNavigationMenus: false,
 		} );
 	} );
@@ -254,16 +293,16 @@ describe( 'useNavigationMenus', () => {
 			navigationMenu: requestedMenu,
 			navigationMenus,
 			canSwitchNavigationMenu: true,
-			canUserCreateNavigationMenu: false,
+			canUserCreateNavigationMenus: false,
 			canUserDeleteNavigationMenu: false,
 			canUserUpdateNavigationMenu: false,
-			hasResolvedCanUserCreateNavigationMenu: false,
+			hasResolvedCanUserCreateNavigationMenus: false,
 			hasResolvedCanUserDeleteNavigationMenu: false,
 			hasResolvedCanUserUpdateNavigationMenu: false,
 			hasResolvedNavigationMenus: true,
 			isNavigationMenuMissing: false,
 			isNavigationMenuResolved: false,
-			isResolvingCanUserCreateNavigationMenu: false,
+			isResolvingCanUserCreateNavigationMenus: false,
 			isResolvingNavigationMenus: false,
 		} );
 	} );
diff --git a/packages/block-library/src/navigation/use-navigation-menu.js b/packages/block-library/src/navigation/use-navigation-menu.js
index 02df0ba2831dcc..5fd942c485bf84 100644
--- a/packages/block-library/src/navigation/use-navigation-menu.js
+++ b/packages/block-library/src/navigation/use-navigation-menu.js
@@ -14,7 +14,11 @@ import { useSelect } from '@wordpress/data';
 import { PRELOADED_NAVIGATION_MENUS_QUERY } from './constants';
 
 export default function useNavigationMenu( ref ) {
-	const permissions = useResourcePermissions( 'navigation', ref );
+	const permissions = useResourcePermissions( {
+		kind: 'postType',
+		name: 'wp_navigation',
+		id: ref,
+	} );
 
 	const {
 		navigationMenu,
@@ -27,8 +31,18 @@ export default function useNavigationMenu( ref ) {
 		[ ref ]
 	);
 
-	const { canCreate, canUpdate, canDelete, isResolving, hasResolved } =
-		permissions;
+	const {
+		// Can the user create navigation menus?
+		canCreate: canCreateNavigationMenus,
+
+		// Can the user update the specific navigation menu with the given post ID?
+		canUpdate: canUpdateNavigationMenu,
+
+		// Can the user delete the specific navigation menu with the given post ID?
+		canDelete: canDeleteNavigationMenu,
+		isResolving: isResolvingPermissions,
+		hasResolved: hasResolvedPermissions,
+	} = permissions;
 
 	const {
 		records: navigationMenus,
@@ -52,13 +66,17 @@ export default function useNavigationMenu( ref ) {
 		isResolvingNavigationMenus,
 		hasResolvedNavigationMenus,
 		canSwitchNavigationMenu,
-		canUserCreateNavigationMenu: canCreate,
-		isResolvingCanUserCreateNavigationMenu: isResolving,
-		hasResolvedCanUserCreateNavigationMenu: hasResolved,
-		canUserUpdateNavigationMenu: canUpdate,
-		hasResolvedCanUserUpdateNavigationMenu: ref ? hasResolved : undefined,
-		canUserDeleteNavigationMenu: canDelete,
-		hasResolvedCanUserDeleteNavigationMenu: ref ? hasResolved : undefined,
+		canUserCreateNavigationMenus: canCreateNavigationMenus,
+		isResolvingCanUserCreateNavigationMenus: isResolvingPermissions,
+		hasResolvedCanUserCreateNavigationMenus: hasResolvedPermissions,
+		canUserUpdateNavigationMenu: canUpdateNavigationMenu,
+		hasResolvedCanUserUpdateNavigationMenu: ref
+			? hasResolvedPermissions
+			: undefined,
+		canUserDeleteNavigationMenu: canDeleteNavigationMenu,
+		hasResolvedCanUserDeleteNavigationMenu: ref
+			? hasResolvedPermissions
+			: undefined,
 	};
 }
 
diff --git a/packages/block-library/src/navigation/view.js b/packages/block-library/src/navigation/view.js
index ba8e6d1a6683a4..9da7ab70d84f33 100644
--- a/packages/block-library/src/navigation/view.js
+++ b/packages/block-library/src/navigation/view.js
@@ -18,172 +18,197 @@ const focusableSelectors = [
 // capture the clicks, instead of relying on the focusout event.
 document.addEventListener( 'click', () => {} );
 
-const { state, actions } = store( 'core/navigation', {
-	state: {
-		get roleAttribute() {
-			const ctx = getContext();
-			return ctx.type === 'overlay' && state.isMenuOpen ? 'dialog' : null;
-		},
-		get ariaModal() {
-			const ctx = getContext();
-			return ctx.type === 'overlay' && state.isMenuOpen ? 'true' : null;
-		},
-		get ariaLabel() {
-			const ctx = getContext();
-			return ctx.type === 'overlay' && state.isMenuOpen
-				? ctx.ariaLabel
-				: null;
-		},
-		get isMenuOpen() {
-			// The menu is opened if either `click`, `hover` or `focus` is true.
-			return (
-				Object.values( state.menuOpenedBy ).filter( Boolean ).length > 0
-			);
-		},
-		get menuOpenedBy() {
-			const ctx = getContext();
-			return ctx.type === 'overlay'
-				? ctx.overlayOpenedBy
-				: ctx.submenuOpenedBy;
-		},
-	},
-	actions: {
-		openMenuOnHover() {
-			const { type, overlayOpenedBy } = getContext();
-			if (
-				type === 'submenu' &&
-				// Only open on hover if the overlay is closed.
-				Object.values( overlayOpenedBy || {} ).filter( Boolean )
-					.length === 0
-			)
-				actions.openMenu( 'hover' );
-		},
-		closeMenuOnHover() {
-			actions.closeMenu( 'hover' );
-		},
-		openMenuOnClick() {
-			const ctx = getContext();
-			const { ref } = getElement();
-			ctx.previousFocus = ref;
-			actions.openMenu( 'click' );
-		},
-		closeMenuOnClick() {
-			actions.closeMenu( 'click' );
-			actions.closeMenu( 'focus' );
-		},
-		openMenuOnFocus() {
-			actions.openMenu( 'focus' );
-		},
-		toggleMenuOnClick() {
-			const ctx = getContext();
-			const { ref } = getElement();
-			// Safari won't send focus to the clicked element, so we need to manually place it: https://bugs.webkit.org/show_bug.cgi?id=22261
-			if ( window.document.activeElement !== ref ) ref.focus();
-			const { menuOpenedBy } = state;
-			if ( menuOpenedBy.click || menuOpenedBy.focus ) {
-				actions.closeMenu( 'click' );
-				actions.closeMenu( 'focus' );
-			} else {
+const { state, actions } = store(
+	'core/navigation',
+	{
+		state: {
+			get roleAttribute() {
+				const ctx = getContext();
+				return ctx.type === 'overlay' && state.isMenuOpen
+					? 'dialog'
+					: null;
+			},
+			get ariaModal() {
+				const ctx = getContext();
+				return ctx.type === 'overlay' && state.isMenuOpen
+					? 'true'
+					: null;
+			},
+			get ariaLabel() {
+				const ctx = getContext();
+				return ctx.type === 'overlay' && state.isMenuOpen
+					? ctx.ariaLabel
+					: null;
+			},
+			get isMenuOpen() {
+				// The menu is opened if either `click`, `hover` or `focus` is true.
+				return (
+					Object.values( state.menuOpenedBy ).filter( Boolean )
+						.length > 0
+				);
+			},
+			get menuOpenedBy() {
+				const ctx = getContext();
+				return ctx.type === 'overlay'
+					? ctx.overlayOpenedBy
+					: ctx.submenuOpenedBy;
+			},
+		},
+		actions: {
+			openMenuOnHover() {
+				const { type, overlayOpenedBy } = getContext();
+				if (
+					type === 'submenu' &&
+					// Only open on hover if the overlay is closed.
+					Object.values( overlayOpenedBy || {} ).filter( Boolean )
+						.length === 0
+				) {
+					actions.openMenu( 'hover' );
+				}
+			},
+			closeMenuOnHover() {
+				const { type, overlayOpenedBy } = getContext();
+				if (
+					type === 'submenu' &&
+					// Only close on hover if the overlay is closed.
+					Object.values( overlayOpenedBy || {} ).filter( Boolean )
+						.length === 0
+				) {
+					actions.closeMenu( 'hover' );
+				}
+			},
+			openMenuOnClick() {
+				const ctx = getContext();
+				const { ref } = getElement();
 				ctx.previousFocus = ref;
 				actions.openMenu( 'click' );
-			}
-		},
-		handleMenuKeydown( event ) {
-			const { type, firstFocusableElement, lastFocusableElement } =
-				getContext();
-			if ( state.menuOpenedBy.click ) {
-				// If Escape close the menu.
-				if ( event?.key === 'Escape' ) {
+			},
+			closeMenuOnClick() {
+				actions.closeMenu( 'click' );
+				actions.closeMenu( 'focus' );
+			},
+			openMenuOnFocus() {
+				actions.openMenu( 'focus' );
+			},
+			toggleMenuOnClick() {
+				const ctx = getContext();
+				const { ref } = getElement();
+				// Safari won't send focus to the clicked element, so we need to manually place it: https://bugs.webkit.org/show_bug.cgi?id=22261
+				if ( window.document.activeElement !== ref ) {
+					ref.focus();
+				}
+				const { menuOpenedBy } = state;
+				if ( menuOpenedBy.click || menuOpenedBy.focus ) {
 					actions.closeMenu( 'click' );
 					actions.closeMenu( 'focus' );
-					return;
+				} else {
+					ctx.previousFocus = ref;
+					actions.openMenu( 'click' );
 				}
+			},
+			handleMenuKeydown( event ) {
+				const { type, firstFocusableElement, lastFocusableElement } =
+					getContext();
+				if ( state.menuOpenedBy.click ) {
+					// If Escape close the menu.
+					if ( event?.key === 'Escape' ) {
+						actions.closeMenu( 'click' );
+						actions.closeMenu( 'focus' );
+						return;
+					}
 
-				// Trap focus if it is an overlay (main menu).
-				if ( type === 'overlay' && event.key === 'Tab' ) {
-					// If shift + tab it change the direction.
-					if (
-						event.shiftKey &&
-						window.document.activeElement === firstFocusableElement
-					) {
-						event.preventDefault();
-						lastFocusableElement.focus();
-					} else if (
-						! event.shiftKey &&
-						window.document.activeElement === lastFocusableElement
-					) {
-						event.preventDefault();
-						firstFocusableElement.focus();
+					// Trap focus if it is an overlay (main menu).
+					if ( type === 'overlay' && event.key === 'Tab' ) {
+						// If shift + tab it change the direction.
+						if (
+							event.shiftKey &&
+							window.document.activeElement ===
+								firstFocusableElement
+						) {
+							event.preventDefault();
+							lastFocusableElement.focus();
+						} else if (
+							! event.shiftKey &&
+							window.document.activeElement ===
+								lastFocusableElement
+						) {
+							event.preventDefault();
+							firstFocusableElement.focus();
+						}
 					}
 				}
-			}
-		},
-		handleMenuFocusout( event ) {
-			const { modal } = getContext();
-			// If focus is outside modal, and in the document, close menu
-			// event.target === The element losing focus
-			// event.relatedTarget === The element receiving focus (if any)
-			// When focusout is outsite the document,
-			// `window.document.activeElement` doesn't change.
+			},
+			handleMenuFocusout( event ) {
+				const { modal, type } = getContext();
+				// If focus is outside modal, and in the document, close menu
+				// event.target === The element losing focus
+				// event.relatedTarget === The element receiving focus (if any)
+				// When focusout is outside the document,
+				// `window.document.activeElement` doesn't change.
 
-			// The event.relatedTarget is null when something outside the navigation menu is clicked. This is only necessary for Safari.
-			if (
-				event.relatedTarget === null ||
-				( ! modal?.contains( event.relatedTarget ) &&
-					event.target !== window.document.activeElement )
-			) {
-				actions.closeMenu( 'click' );
-				actions.closeMenu( 'focus' );
-			}
-		},
+				// The event.relatedTarget is null when something outside the navigation menu is clicked. This is only necessary for Safari.
+				if (
+					event.relatedTarget === null ||
+					( ! modal?.contains( event.relatedTarget ) &&
+						event.target !== window.document.activeElement &&
+						type === 'submenu' )
+				) {
+					actions.closeMenu( 'click' );
+					actions.closeMenu( 'focus' );
+				}
+			},
 
-		openMenu( menuOpenedOn = 'click' ) {
-			const { type } = getContext();
-			state.menuOpenedBy[ menuOpenedOn ] = true;
-			if ( type === 'overlay' ) {
-				// Add a `has-modal-open` class to the <html> root.
-				document.documentElement.classList.add( 'has-modal-open' );
-			}
-		},
+			openMenu( menuOpenedOn = 'click' ) {
+				const { type } = getContext();
+				state.menuOpenedBy[ menuOpenedOn ] = true;
+				if ( type === 'overlay' ) {
+					// Add a `has-modal-open` class to the <html> root.
+					document.documentElement.classList.add( 'has-modal-open' );
+				}
+			},
 
-		closeMenu( menuClosedOn = 'click' ) {
-			const ctx = getContext();
-			state.menuOpenedBy[ menuClosedOn ] = false;
-			// Check if the menu is still open or not.
-			if ( ! state.isMenuOpen ) {
-				if ( ctx.modal?.contains( window.document.activeElement ) ) {
-					ctx.previousFocus?.focus();
+			closeMenu( menuClosedOn = 'click' ) {
+				const ctx = getContext();
+				state.menuOpenedBy[ menuClosedOn ] = false;
+				// Check if the menu is still open or not.
+				if ( ! state.isMenuOpen ) {
+					if (
+						ctx.modal?.contains( window.document.activeElement )
+					) {
+						ctx.previousFocus?.focus();
+					}
+					ctx.modal = null;
+					ctx.previousFocus = null;
+					if ( ctx.type === 'overlay' ) {
+						document.documentElement.classList.remove(
+							'has-modal-open'
+						);
+					}
 				}
-				ctx.modal = null;
-				ctx.previousFocus = null;
-				if ( ctx.type === 'overlay' ) {
-					document.documentElement.classList.remove(
-						'has-modal-open'
-					);
+			},
+		},
+		callbacks: {
+			initMenu() {
+				const ctx = getContext();
+				const { ref } = getElement();
+				if ( state.isMenuOpen ) {
+					const focusableElements =
+						ref.querySelectorAll( focusableSelectors );
+					ctx.modal = ref;
+					ctx.firstFocusableElement = focusableElements[ 0 ];
+					ctx.lastFocusableElement =
+						focusableElements[ focusableElements.length - 1 ];
 				}
-			}
-		},
-	},
-	callbacks: {
-		initMenu() {
-			const ctx = getContext();
-			const { ref } = getElement();
-			if ( state.isMenuOpen ) {
-				const focusableElements =
-					ref.querySelectorAll( focusableSelectors );
-				ctx.modal = ref;
-				ctx.firstFocusableElement = focusableElements[ 0 ];
-				ctx.lastFocusableElement =
-					focusableElements[ focusableElements.length - 1 ];
-			}
-		},
-		focusFirstElement() {
-			const { ref } = getElement();
-			if ( state.isMenuOpen ) {
-				ref.querySelector(
-					'.wp-block-navigation-item > *:first-child'
-				).focus();
-			}
+			},
+			focusFirstElement() {
+				const { ref } = getElement();
+				if ( state.isMenuOpen ) {
+					const focusableElements =
+						ref.querySelectorAll( focusableSelectors );
+					focusableElements?.[ 0 ]?.focus();
+				}
+			},
 		},
 	},
-} );
+	{ lock: true }
+);
diff --git a/packages/block-library/src/nextpage/block.json b/packages/block-library/src/nextpage/block.json
index ab88d4a7be4f0b..3dd1a24d36e59d 100644
--- a/packages/block-library/src/nextpage/block.json
+++ b/packages/block-library/src/nextpage/block.json
@@ -11,7 +11,10 @@
 	"supports": {
 		"customClassName": false,
 		"className": false,
-		"html": false
+		"html": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-nextpage-editor"
 }
diff --git a/packages/block-library/src/page-list-item/block.json b/packages/block-library/src/page-list-item/block.json
index abd86924949ab6..7890771f639219 100644
--- a/packages/block-library/src/page-list-item/block.json
+++ b/packages/block-library/src/page-list-item/block.json
@@ -45,7 +45,10 @@
 		"html": false,
 		"lock": false,
 		"inserter": false,
-		"__experimentalToolbar": false
+		"__experimentalToolbar": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-page-list-editor",
 	"style": "wp-block-page-list"
diff --git a/packages/block-library/src/page-list-item/edit.js b/packages/block-library/src/page-list-item/edit.js
index dda1ab155816f5..456225b7419198 100644
--- a/packages/block-library/src/page-list-item/edit.js
+++ b/packages/block-library/src/page-list-item/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 /**
  * WordPress dependencies
  */
@@ -21,10 +21,10 @@ import {
 
 function useFrontPageId() {
 	return useSelect( ( select ) => {
-		const canReadSettings = select( coreStore ).canUser(
-			'read',
-			'settings'
-		);
+		const canReadSettings = select( coreStore ).canUser( 'read', {
+			kind: 'root',
+			name: 'site',
+		} );
 		if ( ! canReadSettings ) {
 			return undefined;
 		}
@@ -52,7 +52,7 @@ export default function PageListItemEdit( { context, attributes } ) {
 	return (
 		<li
 			key={ id }
-			className={ classnames( 'wp-block-pages-list__item', {
+			className={ clsx( 'wp-block-pages-list__item', {
 				'has-child': hasChildren,
 				'wp-block-navigation-item': isNavigationChild,
 				'open-on-click': context.openSubmenusOnClick,
@@ -76,7 +76,7 @@ export default function PageListItemEdit( { context, attributes } ) {
 				</>
 			) : (
 				<a
-					className={ classnames( 'wp-block-pages-list__item__link', {
+					className={ clsx( 'wp-block-pages-list__item__link', {
 						'wp-block-navigation-item__content': isNavigationChild,
 					} ) }
 					href={ link }
diff --git a/packages/block-library/src/page-list-item/index.php b/packages/block-library/src/page-list-item/index.php
index 2955c795aec2b7..121d2dbbb97051 100644
--- a/packages/block-library/src/page-list-item/index.php
+++ b/packages/block-library/src/page-list-item/index.php
@@ -7,6 +7,8 @@
 
 /**
  * Registers the `core/page-list-item` block on server.
+ *
+ * @since 6.3.0
  */
 function register_block_core_page_list_item() {
 	register_block_type_from_metadata( __DIR__ . '/page-list-item' );
diff --git a/packages/block-library/src/page-list/block.json b/packages/block-library/src/page-list/block.json
index 7f4f2ce86c425f..b465e4ef5dc3d0 100644
--- a/packages/block-library/src/page-list/block.json
+++ b/packages/block-library/src/page-list/block.json
@@ -4,6 +4,7 @@
 	"name": "core/page-list",
 	"title": "Page List",
 	"category": "widgets",
+	"allowedBlocks": [ "core/page-list-item" ],
 	"description": "Display a list of all pages.",
 	"keywords": [ "menu", "navigation" ],
 	"textdomain": "default",
@@ -47,6 +48,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-page-list-editor",
diff --git a/packages/block-library/src/page-list/convert-to-links-modal.js b/packages/block-library/src/page-list/convert-to-links-modal.js
index cd4049fecff588..f2ab425a1ef10a 100644
--- a/packages/block-library/src/page-list/convert-to-links-modal.js
+++ b/packages/block-library/src/page-list/convert-to-links-modal.js
@@ -2,10 +2,11 @@
  * WordPress dependencies
  */
 import { Button, Modal } from '@wordpress/components';
+import { useInstanceId } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
 
 export const convertDescription = __(
-	'This page list is synced with the published pages on your site. Detach the page list to add, delete, or reorder pages yourself.'
+	"This Navigation Menu displays your website's pages. Editing it will enable you to add, delete, or reorder pages. However, new pages will no longer be added automatically."
 );
 
 export function ConvertToLinksModal( { onClick, onClose, disabled } ) {
@@ -13,24 +14,38 @@ export function ConvertToLinksModal( { onClick, onClose, disabled } ) {
 		<Modal
 			onRequestClose={ onClose }
 			title={ __( 'Edit Page List' ) }
-			className={ 'wp-block-page-list-modal' }
+			className="wp-block-page-list-modal"
 			aria={ {
-				describedby: 'wp-block-page-list-modal__description',
+				describedby: useInstanceId(
+					ConvertToLinksModal,
+					'wp-block-page-list-modal__description'
+				),
 			} }
 		>
-			<p id={ 'wp-block-page-list-modal__description' }>
+			<p
+				id={ useInstanceId(
+					ConvertToLinksModal,
+					'wp-block-page-list-modal__description'
+				) }
+			>
 				{ convertDescription }
 			</p>
 			<div className="wp-block-page-list-modal-buttons">
-				<Button variant="tertiary" onClick={ onClose }>
+				<Button
+					__next40pxDefaultSize
+					variant="tertiary"
+					onClick={ onClose }
+				>
 					{ __( 'Cancel' ) }
 				</Button>
 				<Button
+					__next40pxDefaultSize
 					variant="primary"
+					accessibleWhenDisabled
 					disabled={ disabled }
 					onClick={ onClick }
 				>
-					{ __( 'Detach' ) }
+					{ __( 'Edit' ) }
 				</Button>
 			</div>
 		</Modal>
diff --git a/packages/block-library/src/page-list/edit.js b/packages/block-library/src/page-list/edit.js
index 8f21f781396c6f..31e400b8676717 100644
--- a/packages/block-library/src/page-list/edit.js
+++ b/packages/block-library/src/page-list/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -63,7 +63,7 @@ function BlockContent( {
 	if ( pages === null ) {
 		return (
 			<div { ...blockProps }>
-				<Notice status={ 'warning' } isDismissible={ false }>
+				<Notice status="warning" isDismissible={ false }>
 					{ __( 'Page List: Cannot retrieve Pages.' ) }
 				</Notice>
 			</div>
@@ -73,7 +73,7 @@ function BlockContent( {
 	if ( pages.length === 0 ) {
 		return (
 			<div { ...blockProps }>
-				<Notice status={ 'info' } isDismissible={ false }>
+				<Notice status="info" isDismissible={ false }>
 					{ __( 'Page List: Cannot retrieve Pages.' ) }
 				</Notice>
 			</div>
@@ -101,7 +101,7 @@ function BlockContent( {
 
 		return (
 			<div { ...blockProps }>
-				<Notice status={ 'warning' } isDismissible={ false }>
+				<Notice status="warning" isDismissible={ false }>
 					{ __( 'Page List: Cannot retrieve Pages.' ) }
 				</Notice>
 			</div>
@@ -170,7 +170,7 @@ export default function PageListEdit( {
 	}, [ pages ] );
 
 	const blockProps = useBlockProps( {
-		className: classnames( 'wp-block-page-list', {
+		className: clsx( 'wp-block-page-list', {
 			'has-text-color': !! context.textColor,
 			[ getColorClassName( 'color', context.textColor ) ]:
 				!! context.textColor,
@@ -225,7 +225,11 @@ export default function PageListEdit( {
 						page.title?.rendered?.trim() !== ''
 							? page.title?.rendered
 							: __( '(no title)' ),
-					title: page.title?.rendered,
+					title:
+						// translators: displayed when a page has an empty title.
+						page.title?.rendered?.trim() !== ''
+							? page.title?.rendered
+							: __( '(no title)' ),
 					link: page.url,
 					hasChildren,
 				};
@@ -286,7 +290,6 @@ export default function PageListEdit( {
 	} );
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: [ 'core/page-list-item' ],
 		renderAppender: false,
 		__unstableDisableDropZone: true,
 		templateLock: isChildOfNavigation ? false : 'all',
@@ -320,6 +323,7 @@ export default function PageListEdit( {
 				{ pagesTree.length > 0 && (
 					<PanelBody>
 						<ComboboxControl
+							__nextHasNoMarginBottom
 							__next40pxDefaultSize
 							className="editor-page-attributes__parent"
 							label={ __( 'Parent' ) }
@@ -338,7 +342,9 @@ export default function PageListEdit( {
 					<PanelBody title={ __( 'Edit this menu' ) }>
 						<p>{ convertDescription }</p>
 						<Button
+							__next40pxDefaultSize
 							variant="primary"
+							accessibleWhenDisabled
 							disabled={ ! hasResolvedPages }
 							onClick={ convertToNavigationLinks }
 						>
diff --git a/packages/block-library/src/page-list/editor.scss b/packages/block-library/src/page-list/editor.scss
index 18ecf904e3919a..b3f70746acd57f 100644
--- a/packages/block-library/src/page-list/editor.scss
+++ b/packages/block-library/src/page-list/editor.scss
@@ -58,10 +58,6 @@
 	}
 }
 
-.wp-block-page-list .components-notice {
-	margin-left: 0;
-}
-
 // Space spinner to give it breathing
 // room when block is selected and has focus outline.
 .wp-block-page-list__loading-indicator-container {
diff --git a/packages/block-library/src/page-list/index.php b/packages/block-library/src/page-list/index.php
index b9ef8bf745a733..a574633d4ddf47 100644
--- a/packages/block-library/src/page-list/index.php
+++ b/packages/block-library/src/page-list/index.php
@@ -9,6 +9,8 @@
  * Build an array with CSS classes and inline styles defining the colors
  * which will be applied to the pages markup in the front-end when it is a descendant of navigation.
  *
+ * @since 5.8.0
+ *
  * @param  array $attributes Block attributes.
  * @param  array $context    Navigation block context.
  * @return array Colors CSS classes and inline styles.
@@ -101,6 +103,8 @@ function block_core_page_list_build_css_colors( $attributes, $context ) {
  * Build an array with CSS classes and inline styles defining the font sizes
  * which will be applied to the pages markup in the front-end when it is a descendant of navigation.
  *
+ * @since 5.8.0
+ *
  * @param  array $context Navigation block context.
  * @return array Font size CSS classes and inline styles.
  */
@@ -135,6 +139,8 @@ function block_core_page_list_build_css_font_sizes( $context ) {
 /**
  * Outputs Page list markup from an array of pages with nested children.
  *
+ * @since 5.8.0
+ *
  * @param boolean $open_submenus_on_click Whether to open submenus on click instead of hover.
  * @param boolean $show_submenu_icons Whether to show submenu indicator icons.
  * @param boolean $is_navigation_child If block is a child of Navigation block.
@@ -186,7 +192,9 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click,
 			$css_class .= ' menu-item-home';
 		}
 
-		$title      = wp_kses_post( $page['title'] );
+		$title = wp_kses_post( $page['title'] );
+		$title = $title ? $title : __( '(no title)' );
+
 		$aria_label = sprintf(
 			/* translators: Accessibility text. %s: Parent page title. */
 			__( '%s submenu' ),
@@ -220,6 +228,8 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click,
 /**
  * Outputs nested array of pages
  *
+ * @since 5.8.0
+ *
  * @param array $current_level The level being iterated through.
  * @param array $children The children grouped by parent post ID.
  *
@@ -240,6 +250,8 @@ function block_core_page_list_nest_pages( $current_level, $children ) {
 /**
  * Renders the `core/page-list` block on server.
  *
+ * @since 5.8.0
+ *
  * @param array    $attributes The block attributes.
  * @param string   $content    The saved content.
  * @param WP_Block $block      The parsed block.
@@ -345,6 +357,8 @@ function render_block_core_page_list( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/pages` block on server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_page_list() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json
index 85f56f4a838f50..7e004019cbf282 100644
--- a/packages/block-library/src/paragraph/block.json
+++ b/packages/block-library/src/paragraph/block.json
@@ -7,17 +7,15 @@
 	"description": "Start with the basic building block of all narrative.",
 	"keywords": [ "text" ],
 	"textdomain": "default",
-	"usesContext": [ "postId" ],
 	"attributes": {
 		"align": {
 			"type": "string"
 		},
 		"content": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "p",
-			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"dropCap": {
 			"type": "boolean",
@@ -32,8 +30,15 @@
 		}
 	},
 	"supports": {
+		"splitting": true,
 		"anchor": true,
 		"className": false,
+		"__experimentalBorder": {
+			"color": true,
+			"radius": true,
+			"style": true,
+			"width": true
+		},
 		"color": {
 			"gradients": true,
 			"link": true,
@@ -42,7 +47,6 @@
 				"text": true
 			}
 		},
-		"__experimentalConnections": true,
 		"spacing": {
 			"margin": true,
 			"padding": true,
@@ -66,7 +70,10 @@
 			}
 		},
 		"__experimentalSelector": "p",
-		"__unstablePasteTextInline": true
+		"__unstablePasteTextInline": true,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-paragraph-editor",
 	"style": "wp-block-paragraph"
diff --git a/packages/block-library/src/paragraph/deprecated.js b/packages/block-library/src/paragraph/deprecated.js
index b5b62992aab769..855b23f4aed29c 100644
--- a/packages/block-library/src/paragraph/deprecated.js
+++ b/packages/block-library/src/paragraph/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -110,7 +110,7 @@ const deprecated = [
 		},
 		save( { attributes } ) {
 			const { align, content, dropCap, direction } = attributes;
-			const className = classnames( {
+			const className = clsx( {
 				'has-drop-cap':
 					align === ( isRTL() ? 'left' : 'right' ) ||
 					align === 'center'
@@ -162,7 +162,7 @@ const deprecated = [
 			);
 			const fontSizeClass = getFontSizeClass( fontSize );
 
-			const className = classnames( {
+			const className = clsx( {
 				'has-text-color': textColor || customTextColor,
 				'has-background': backgroundColor || customBackgroundColor,
 				'has-drop-cap': dropCap,
@@ -227,7 +227,7 @@ const deprecated = [
 			);
 			const fontSizeClass = getFontSizeClass( fontSize );
 
-			const className = classnames( {
+			const className = clsx( {
 				'has-text-color': textColor || customTextColor,
 				'has-background': backgroundColor || customBackgroundColor,
 				'has-drop-cap': dropCap,
@@ -295,7 +295,7 @@ const deprecated = [
 			);
 			const fontSizeClass = fontSize && `is-${ fontSize }-text`;
 
-			const className = classnames( {
+			const className = clsx( {
 				[ `align${ width }` ]: width,
 				'has-background': backgroundColor || customBackgroundColor,
 				'has-drop-cap': dropCap,
@@ -341,7 +341,7 @@ const deprecated = [
 				textColor,
 				fontSize,
 			} = attributes;
-			const className = classnames( {
+			const className = clsx( {
 				[ `align${ width }` ]: width,
 				'has-background': backgroundColor,
 				'has-drop-cap': dropCap,
diff --git a/packages/block-library/src/paragraph/edit.js b/packages/block-library/src/paragraph/edit.js
index 3a0f4f0688ac9b..7edfbbc6252ae6 100644
--- a/packages/block-library/src/paragraph/edit.js
+++ b/packages/block-library/src/paragraph/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -19,8 +19,8 @@ import {
 	RichText,
 	useBlockProps,
 	useSettings,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
-import { createBlock } from '@wordpress/blocks';
 import { formatLtr } from '@wordpress/icons';
 
 /**
@@ -28,8 +28,6 @@ import { formatLtr } from '@wordpress/icons';
  */
 import { useOnEnter } from './use-enter';
 
-const name = 'core/paragraph';
-
 function ParagraphRTLControl( { direction, setDirection } ) {
 	return (
 		isRTL() && (
@@ -49,6 +47,48 @@ function hasDropCapDisabled( align ) {
 	return align === ( isRTL() ? 'left' : 'right' ) || align === 'center';
 }
 
+function DropCapControl( { clientId, attributes, setAttributes } ) {
+	// Please do not add a useSelect call to the paragraph block unconditionally.
+	// Every useSelect added to a (frequently used) block will degrade load
+	// and type performance. By moving it within InspectorControls, the subscription is
+	// now only added for the selected block(s).
+	const [ isDropCapFeatureEnabled ] = useSettings( 'typography.dropCap' );
+
+	if ( ! isDropCapFeatureEnabled ) {
+		return null;
+	}
+
+	const { align, dropCap } = attributes;
+
+	let helpText;
+	if ( hasDropCapDisabled( align ) ) {
+		helpText = __( 'Not available for aligned text.' );
+	} else if ( dropCap ) {
+		helpText = __( 'Showing large initial letter.' );
+	} else {
+		helpText = __( 'Toggle to show a large initial letter.' );
+	}
+
+	return (
+		<ToolsPanelItem
+			hasValue={ () => !! dropCap }
+			label={ __( 'Drop cap' ) }
+			onDeselect={ () => setAttributes( { dropCap: undefined } ) }
+			resetAllFilter={ () => ( { dropCap: undefined } ) }
+			panelId={ clientId }
+		>
+			<ToggleControl
+				__nextHasNoMarginBottom
+				label={ __( 'Drop cap' ) }
+				checked={ !! dropCap }
+				onChange={ () => setAttributes( { dropCap: ! dropCap } ) }
+				help={ helpText }
+				disabled={ hasDropCapDisabled( align ) ? true : false }
+			/>
+		</ToolsPanelItem>
+	);
+}
+
 function ParagraphBlock( {
 	attributes,
 	mergeBlocks,
@@ -58,72 +98,46 @@ function ParagraphBlock( {
 	clientId,
 } ) {
 	const { align, content, direction, dropCap, placeholder } = attributes;
-	const [ isDropCapFeatureEnabled ] = useSettings( 'typography.dropCap' );
 	const blockProps = useBlockProps( {
 		ref: useOnEnter( { clientId, content } ),
-		className: classnames( {
+		className: clsx( {
 			'has-drop-cap': hasDropCapDisabled( align ) ? false : dropCap,
 			[ `has-text-align-${ align }` ]: align,
 		} ),
 		style: { direction },
 	} );
-
-	let helpText;
-	if ( hasDropCapDisabled( align ) ) {
-		helpText = __( 'Not available for aligned text.' );
-	} else if ( dropCap ) {
-		helpText = __( 'Showing large initial letter.' );
-	} else {
-		helpText = __( 'Toggle to show a large initial letter.' );
-	}
+	const blockEditingMode = useBlockEditingMode();
 
 	return (
 		<>
-			<BlockControls group="block">
-				<AlignmentControl
-					value={ align }
-					onChange={ ( newAlign ) =>
-						setAttributes( {
-							align: newAlign,
-							dropCap: hasDropCapDisabled( newAlign )
-								? false
-								: dropCap,
-						} )
-					}
-				/>
-				<ParagraphRTLControl
-					direction={ direction }
-					setDirection={ ( newDirection ) =>
-						setAttributes( { direction: newDirection } )
-					}
-				/>
-			</BlockControls>
-			{ isDropCapFeatureEnabled && (
-				<InspectorControls group="typography">
-					<ToolsPanelItem
-						hasValue={ () => !! dropCap }
-						label={ __( 'Drop cap' ) }
-						onDeselect={ () =>
-							setAttributes( { dropCap: undefined } )
+			{ blockEditingMode === 'default' && (
+				<BlockControls group="block">
+					<AlignmentControl
+						value={ align }
+						onChange={ ( newAlign ) =>
+							setAttributes( {
+								align: newAlign,
+								dropCap: hasDropCapDisabled( newAlign )
+									? false
+									: dropCap,
+							} )
+						}
+					/>
+					<ParagraphRTLControl
+						direction={ direction }
+						setDirection={ ( newDirection ) =>
+							setAttributes( { direction: newDirection } )
 						}
-						resetAllFilter={ () => ( { dropCap: undefined } ) }
-						panelId={ clientId }
-					>
-						<ToggleControl
-							__nextHasNoMarginBottom
-							label={ __( 'Drop cap' ) }
-							checked={ !! dropCap }
-							onChange={ () =>
-								setAttributes( { dropCap: ! dropCap } )
-							}
-							help={ helpText }
-							disabled={
-								hasDropCapDisabled( align ) ? true : false
-							}
-						/>
-					</ToolsPanelItem>
-				</InspectorControls>
+					/>
+				</BlockControls>
 			) }
+			<InspectorControls group="typography">
+				<DropCapControl
+					clientId={ clientId }
+					attributes={ attributes }
+					setAttributes={ setAttributes }
+				/>
+			</InspectorControls>
 			<RichText
 				identifier="content"
 				tagName="p"
@@ -132,24 +146,6 @@ function ParagraphBlock( {
 				onChange={ ( newContent ) =>
 					setAttributes( { content: newContent } )
 				}
-				onSplit={ ( value, isOriginal ) => {
-					let newAttributes;
-
-					if ( isOriginal || value ) {
-						newAttributes = {
-							...attributes,
-							content: value,
-						};
-					}
-
-					const block = createBlock( name, newAttributes );
-
-					if ( isOriginal ) {
-						block.clientId = clientId;
-					}
-
-					return block;
-				} }
 				onMerge={ mergeBlocks }
 				onReplace={ onReplace }
 				onRemove={ onRemove }
diff --git a/packages/block-library/src/paragraph/edit.native.js b/packages/block-library/src/paragraph/edit.native.js
index 98662ba21c8841..e7f05dab0547ce 100644
--- a/packages/block-library/src/paragraph/edit.native.js
+++ b/packages/block-library/src/paragraph/edit.native.js
@@ -65,7 +65,7 @@ function ParagraphBlock( {
 				identifier="content"
 				tagName="p"
 				value={ content }
-				deleteEnter={ true }
+				deleteEnter
 				style={ styles }
 				onChange={ ( nextContent ) => {
 					setAttributes( {
diff --git a/packages/block-library/src/paragraph/save.js b/packages/block-library/src/paragraph/save.js
index 5f451225ff2237..c503b5f2b4322b 100644
--- a/packages/block-library/src/paragraph/save.js
+++ b/packages/block-library/src/paragraph/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,7 +11,7 @@ import { isRTL } from '@wordpress/i18n';
 
 export default function save( { attributes } ) {
 	const { align, content, dropCap, direction } = attributes;
-	const className = classnames( {
+	const className = clsx( {
 		'has-drop-cap':
 			align === ( isRTL() ? 'left' : 'right' ) || align === 'center'
 				? false
diff --git a/packages/block-library/src/paragraph/style.scss b/packages/block-library/src/paragraph/style.scss
index 34960bdb2fd589..7bd8c77e85de83 100644
--- a/packages/block-library/src/paragraph/style.scss
+++ b/packages/block-library/src/paragraph/style.scss
@@ -38,7 +38,8 @@ p.has-drop-cap.has-background {
 	overflow: hidden;
 }
 
-p.has-background {
+// Specificity is reduced to 0-1-0 so global styles can override this.
+:root :where(p.has-background) {
 	padding: $block-bg-padding--v $block-bg-padding--h;
 }
 
diff --git a/packages/block-library/src/paragraph/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/paragraph/test/__snapshots__/edit.native.js.snap
index adc6ab4210efa5..82b6a608814a72 100644
--- a/packages/block-library/src/paragraph/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/paragraph/test/__snapshots__/edit.native.js.snap
@@ -1,5 +1,41 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Paragraph block should be able to use a prefix to create a Heading block 1`] = `
+"<!-- wp:heading {"level":1} -->
+<h1 class="wp-block-heading"></h1>
+<!-- /wp:heading -->"
+`;
+
+exports[`Paragraph block should be able to use a prefix to create a List block 1`] = `
+"<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li></li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->"
+`;
+
+exports[`Paragraph block should be able to use a prefix to create a Quote block 1`] = `
+"<!-- wp:quote -->
+<blockquote class="wp-block-quote"><!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph --></blockquote>
+<!-- /wp:quote -->"
+`;
+
+exports[`Paragraph block should be able to use a prefix to create a numbered List block 1`] = `
+"<!-- wp:list {"ordered":true} -->
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li></li>
+<!-- /wp:list-item --></ol>
+<!-- /wp:list -->"
+`;
+
+exports[`Paragraph block should prevent deleting the first Paragraph block when pressing backspace at the start 1`] = `
+"<!-- wp:paragraph -->
+<p>A quick brown fox jumps over the lazy dog.</p>
+<!-- /wp:paragraph -->"
+`;
+
 exports[`Paragraph block should render without crashing and match snapshot 1`] = `
 <View
   style={
@@ -38,3 +74,15 @@ exports[`Paragraph block should render without crashing and match snapshot 1`] =
   />
 </View>
 `;
+
+exports[`Paragraph block should set a font size value 1`] = `
+"<!-- wp:paragraph {"style":{"typography":{"fontSize":"30px"}}} -->
+<p style="font-size:30px">A quick brown fox jumps over the lazy dog.</p>
+<!-- /wp:paragraph -->"
+`;
+
+exports[`Paragraph block should set a line height value 1`] = `
+"<!-- wp:paragraph {"style":{"typography":{"lineHeight":1.8}}} -->
+<p style="line-height:1.8">A quick brown fox jumps over the lazy dog.</p>
+<!-- /wp:paragraph -->"
+`;
diff --git a/packages/block-library/src/paragraph/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/paragraph/test/__snapshots__/transforms.native.js.snap
index b0855c02bd0e96..3a2a928b81f5e8 100644
--- a/packages/block-library/src/paragraph/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/paragraph/test/__snapshots__/transforms.native.js.snap
@@ -32,7 +32,7 @@ exports[`Paragraph block transforms to Heading block 1`] = `
 
 exports[`Paragraph block transforms to List block 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Example text</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
diff --git a/packages/block-library/src/paragraph/test/edit.native.js b/packages/block-library/src/paragraph/test/edit.native.js
index fdb082246171ba..c3c7e7ca49d720 100644
--- a/packages/block-library/src/paragraph/test/edit.native.js
+++ b/packages/block-library/src/paragraph/test/edit.native.js
@@ -4,6 +4,7 @@
 import {
 	act,
 	addBlock,
+	dismissModal,
 	getBlock,
 	typeInRichText,
 	fireEvent,
@@ -11,10 +12,12 @@ import {
 	initializeEditor,
 	render,
 	setupCoreBlocks,
+	triggerBlockListLayout,
 	waitFor,
 	within,
 	withFakeTimers,
 	waitForElementToBeRemoved,
+	waitForModalVisible,
 } from 'test/helpers';
 import Clipboard from '@react-native-clipboard/clipboard';
 import TextInputState from 'react-native/Libraries/Components/TextInput/TextInputState';
@@ -61,6 +64,131 @@ describe( 'Paragraph block', () => {
 		expect( screen.toJSON() ).toMatchSnapshot();
 	} );
 
+	it( 'should prevent deleting the first Paragraph block when pressing backspace at the start', async () => {
+		// Arrange
+		const screen = await initializeEditor();
+		await addBlock( screen, 'Paragraph' );
+
+		// Act
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		typeInRichText(
+			paragraphTextInput,
+			'A quick brown fox jumps over the lazy dog.',
+			{ finalSelectionStart: 0, finalSelectionEnd: 0 }
+		);
+
+		fireEvent( paragraphTextInput, 'onKeyDown', {
+			nativeEvent: {},
+			preventDefault() {},
+			keyCode: BACKSPACE,
+		} );
+
+		// Assert
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'should be able to use a prefix to create a Heading block', async () => {
+		const screen = await initializeEditor();
+		await addBlock( screen, 'Paragraph' );
+		const text = '# ';
+
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		typeInRichText( paragraphTextInput, text, {
+			finalSelectionStart: 1,
+			finalSelectionEnd: 1,
+		} );
+
+		fireEvent( paragraphTextInput, 'onChange', {
+			nativeEvent: { text },
+			preventDefault() {},
+		} );
+
+		const headingBlock = getBlock( screen, 'Heading' );
+		expect( headingBlock ).toBeVisible();
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'should be able to use a prefix to create a Quote block', async () => {
+		const screen = await initializeEditor();
+		await addBlock( screen, 'Paragraph' );
+		const text = '> ';
+
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		typeInRichText( paragraphTextInput, text, {
+			finalSelectionStart: 1,
+			finalSelectionEnd: 1,
+		} );
+
+		fireEvent( paragraphTextInput, 'onChange', {
+			nativeEvent: { text },
+			preventDefault() {},
+		} );
+		const quoteBlock = getBlock( screen, 'Quote' );
+		await triggerBlockListLayout( quoteBlock );
+
+		expect( quoteBlock ).toBeVisible();
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'should be able to use a prefix to create a List block', async () => {
+		const screen = await initializeEditor();
+		await addBlock( screen, 'Paragraph' );
+		const text = '- ';
+
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		typeInRichText( paragraphTextInput, text, {
+			finalSelectionStart: 1,
+			finalSelectionEnd: 1,
+		} );
+
+		fireEvent( paragraphTextInput, 'onChange', {
+			nativeEvent: { text },
+			preventDefault() {},
+		} );
+		const listBlock = getBlock( screen, 'List' );
+		await triggerBlockListLayout( listBlock );
+
+		expect( listBlock ).toBeVisible();
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'should be able to use a prefix to create a numbered List block', async () => {
+		const screen = await initializeEditor();
+		await addBlock( screen, 'Paragraph' );
+		const text = '1. ';
+
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		typeInRichText( paragraphTextInput, text, {
+			finalSelectionStart: 2,
+			finalSelectionEnd: 2,
+		} );
+
+		fireEvent( paragraphTextInput, 'onChange', {
+			nativeEvent: { text },
+			preventDefault() {},
+		} );
+		const listBlock = getBlock( screen, 'List' );
+		await triggerBlockListLayout( listBlock );
+
+		expect( listBlock ).toBeVisible();
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
 	it( 'should bold text', async () => {
 		// Arrange
 		const screen = await initializeEditor();
@@ -211,6 +339,41 @@ describe( 'Paragraph block', () => {
 	` );
 	} );
 
+	it( 'should inherit parent alignment', async () => {
+		// Arrange
+		const screen = await initializeEditor();
+		await addBlock( screen, 'Quote' );
+		await triggerBlockListLayout( getBlock( screen, 'Quote' ) );
+
+		// Act
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		typeInRichText(
+			paragraphTextInput,
+			'A quick brown fox jumps over the lazy dog.'
+		);
+		fireEvent.press( screen.getByLabelText( 'Navigate Up' ) );
+		fireEvent.press( screen.getByLabelText( 'Align text' ) );
+		fireEvent.press( screen.getByLabelText( 'Align text right' ) );
+
+		// Assert
+		// This not an ideal assertion, as it relies implementation details of the
+		// component: prop names. However, the only aspect we can assert is the prop
+		// passed to Aztec, the native module controlling visual alignment. A less
+		// brittle alternative might be snapshotting, but RNTL does not yet support
+		// focused snapshots, which means the snapshot would be huge.
+		// https://github.com/facebook/react/pull/25329
+		expect(
+			screen.UNSAFE_queryAllByProps( {
+				value: '<p>A quick brown fox jumps over the lazy dog.</p>',
+				placeholder: 'Start writing…',
+				textAlign: 'right',
+			} ).length
+		).toBe( 2 ); // One for Aztec mock, one for the TextInput.
+	} );
+
 	it( 'should preserve alignment when split', async () => {
 		// Arrange
 		const screen = await initializeEditor();
@@ -687,6 +850,118 @@ describe( 'Paragraph block', () => {
 	` );
 	} );
 
+	it( 'should show the expected font sizes values', async () => {
+		// Arrange
+		const screen = await initializeEditor( { withGlobalStyles: true } );
+		await addBlock( screen, 'Paragraph' );
+
+		// Act
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		typeInRichText(
+			paragraphTextInput,
+			'A quick brown fox jumps over the lazy dog.'
+		);
+		// Open Block Settings.
+		fireEvent.press( screen.getByLabelText( 'Open Settings' ) );
+
+		// Wait for Block Settings to be visible.
+		const blockSettingsModal = screen.getByTestId( 'block-settings-modal' );
+		await waitForModalVisible( blockSettingsModal );
+
+		// Open Font size settings
+		fireEvent.press( screen.getByLabelText( 'Font Size, Custom' ) );
+		await waitFor( () => screen.getByLabelText( 'Selected: Default' ) );
+
+		// Assert
+		const modalContent = within( blockSettingsModal );
+		expect( modalContent.getByLabelText( 'Small' ) ).toBeVisible();
+		expect( modalContent.getByText( '14px' ) ).toBeVisible();
+		expect( modalContent.getByLabelText( 'Medium' ) ).toBeVisible();
+		expect( modalContent.getByText( '17px' ) ).toBeVisible();
+		expect( modalContent.getByLabelText( 'Large' ) ).toBeVisible();
+		expect( modalContent.getByText( '30px' ) ).toBeVisible();
+		expect( modalContent.getByLabelText( 'Extra Large' ) ).toBeVisible();
+		expect( modalContent.getByText( '40px' ) ).toBeVisible();
+		expect(
+			modalContent.getByLabelText( 'Extra Extra Large' )
+		).toBeVisible();
+		expect( modalContent.getByText( '52px' ) ).toBeVisible();
+	} );
+
+	it( 'should set a font size value', async () => {
+		// Arrange
+		const screen = await initializeEditor( { withGlobalStyles: true } );
+		await addBlock( screen, 'Paragraph' );
+
+		// Act
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		typeInRichText(
+			paragraphTextInput,
+			'A quick brown fox jumps over the lazy dog.'
+		);
+		// Open Block Settings.
+		fireEvent.press( screen.getByLabelText( 'Open Settings' ) );
+
+		// Wait for Block Settings to be visible.
+		const blockSettingsModal = screen.getByTestId( 'block-settings-modal' );
+		await waitForModalVisible( blockSettingsModal );
+
+		// Open Font size settings
+		fireEvent.press( screen.getByLabelText( 'Font Size, Custom' ) );
+
+		// Tap one font size
+		fireEvent.press( screen.getByLabelText( 'Large' ) );
+
+		// Dismiss the Block Settings modal.
+		await dismissModal( blockSettingsModal );
+
+		// Assert
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'should set a line height value', async () => {
+		// Arrange
+		const screen = await initializeEditor( { withGlobalStyles: true } );
+		await addBlock( screen, 'Paragraph' );
+
+		// Act
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+		typeInRichText(
+			paragraphTextInput,
+			'A quick brown fox jumps over the lazy dog.'
+		);
+		// Open Block Settings.
+		fireEvent.press( screen.getByLabelText( 'Open Settings' ) );
+
+		// Wait for Block Settings to be visible.
+		const blockSettingsModal = screen.getByTestId( 'block-settings-modal' );
+		await waitForModalVisible( blockSettingsModal );
+
+		const lineHeightControl = screen.getByLabelText( /Line Height/ );
+		fireEvent.press(
+			within( lineHeightControl ).getByText( '1.5', { hidden: true } )
+		);
+		const lineHeightTextInput = within(
+			lineHeightControl
+		).getByDisplayValue( '1.5', { hidden: true } );
+		fireEvent.changeText( lineHeightTextInput, '1.8' );
+
+		// Dismiss the Block Settings modal.
+		await dismissModal( blockSettingsModal );
+
+		// Assert
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
 	it( 'should focus on the previous Paragraph block when backspacing in an empty Paragraph block', async () => {
 		// Arrange
 		const screen = await initializeEditor();
diff --git a/packages/block-library/src/pattern/block.json b/packages/block-library/src/pattern/block.json
index da02f7b72747e4..13fc9d154b15a4 100644
--- a/packages/block-library/src/pattern/block.json
+++ b/packages/block-library/src/pattern/block.json
@@ -8,7 +8,10 @@
 	"supports": {
 		"html": false,
 		"inserter": false,
-		"renaming": false
+		"renaming": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"textdomain": "default",
 	"attributes": {
diff --git a/packages/block-library/src/pattern/edit.js b/packages/block-library/src/pattern/edit.js
index e01fb37eb849e6..f496132f6e2b1d 100644
--- a/packages/block-library/src/pattern/edit.js
+++ b/packages/block-library/src/pattern/edit.js
@@ -2,15 +2,23 @@
  * WordPress dependencies
  */
 import { cloneBlock } from '@wordpress/blocks';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useEffect } from '@wordpress/element';
+import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
+import { useState, useEffect } from '@wordpress/element';
 import {
+	Warning,
 	store as blockEditorStore,
 	useBlockProps,
 } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { useParsePatternDependencies } from './recursion-detector';
 
 const PatternEdit = ( { attributes, clientId } ) => {
+	const registry = useRegistry();
 	const selectedPattern = useSelect(
 		( select ) =>
 			select( blockEditorStore ).__experimentalGetParsedPattern(
@@ -32,7 +40,10 @@ const PatternEdit = ( { attributes, clientId } ) => {
 	const { getBlockRootClientId, getBlockEditingMode } =
 		useSelect( blockEditorStore );
 
-	// Duplicated in packages/edit-site/src/components/start-template-options/index.js.
+	const [ hasRecursionError, setHasRecursionError ] = useState( false );
+	const parsePatternDependencies = useParsePatternDependencies();
+
+	// Duplicated in packages/editor/src/components/start-template-options/index.js.
 	function injectThemeAttributeInBlockTemplateContent( block ) {
 		if (
 			block.innerBlocks.find(
@@ -64,7 +75,14 @@ const PatternEdit = ( { attributes, clientId } ) => {
 	// This change won't be saved.
 	// It will continue to pull from the pattern file unless changes are made to its respective template part.
 	useEffect( () => {
-		if ( selectedPattern?.blocks ) {
+		if ( ! hasRecursionError && selectedPattern?.blocks ) {
+			try {
+				parsePatternDependencies( selectedPattern );
+			} catch ( error ) {
+				setHasRecursionError( true );
+				return;
+			}
+
 			// We batch updates to block list settings to avoid triggering cascading renders
 			// for each container block included in a tree and optimize initial render.
 			// Since the above uses microtasks, we need to use a microtask here as well,
@@ -79,21 +97,42 @@ const PatternEdit = ( { attributes, clientId } ) => {
 						injectThemeAttributeInBlockTemplateContent( block )
 					)
 				);
+				// If the pattern has a single block and categories, we should add the
+				// categories of the pattern to the block's metadata.
+				if (
+					clonedBlocks.length === 1 &&
+					selectedPattern.categories?.length > 0
+				) {
+					clonedBlocks[ 0 ].attributes = {
+						...clonedBlocks[ 0 ].attributes,
+						metadata: {
+							...clonedBlocks[ 0 ].attributes.metadata,
+							categories: selectedPattern.categories,
+							patternName: selectedPattern.name,
+							name:
+								clonedBlocks[ 0 ].attributes.metadata.name ||
+								selectedPattern.title,
+						},
+					};
+				}
 				const rootEditingMode = getBlockEditingMode( rootClientId );
-				// Temporarily set the root block to default mode to allow replacing the pattern.
-				// This could happen when the page is disabling edits of non-content blocks.
-				__unstableMarkNextChangeAsNotPersistent();
-				setBlockEditingMode( rootClientId, 'default' );
-				__unstableMarkNextChangeAsNotPersistent();
-				replaceBlocks( clientId, clonedBlocks );
-				// Restore the root block's original mode.
-				__unstableMarkNextChangeAsNotPersistent();
-				setBlockEditingMode( rootClientId, rootEditingMode );
+				registry.batch( () => {
+					// Temporarily set the root block to default mode to allow replacing the pattern.
+					// This could happen when the page is disabling edits of non-content blocks.
+					__unstableMarkNextChangeAsNotPersistent();
+					setBlockEditingMode( rootClientId, 'default' );
+					__unstableMarkNextChangeAsNotPersistent();
+					replaceBlocks( clientId, clonedBlocks );
+					// Restore the root block's original mode.
+					__unstableMarkNextChangeAsNotPersistent();
+					setBlockEditingMode( rootClientId, rootEditingMode );
+				} );
 			} );
 		}
 	}, [
 		clientId,
-		selectedPattern?.blocks,
+		hasRecursionError,
+		selectedPattern,
 		__unstableMarkNextChangeAsNotPersistent,
 		replaceBlocks,
 		getBlockEditingMode,
@@ -103,6 +142,20 @@ const PatternEdit = ( { attributes, clientId } ) => {
 
 	const props = useBlockProps();
 
+	if ( hasRecursionError ) {
+		return (
+			<div { ...props }>
+				<Warning>
+					{ sprintf(
+						// translators: A warning in which %s is the name of a pattern.
+						__( 'Pattern "%s" cannot be rendered inside itself.' ),
+						selectedPattern?.name
+					) }
+				</Warning>
+			</div>
+		);
+	}
+
 	return <div { ...props } />;
 };
 
diff --git a/packages/block-library/src/pattern/index.php b/packages/block-library/src/pattern/index.php
index 436452f6853001..5595818a2271b7 100644
--- a/packages/block-library/src/pattern/index.php
+++ b/packages/block-library/src/pattern/index.php
@@ -7,6 +7,8 @@
 
 /**
  *  Registers the `core/pattern` block on the server.
+ *
+ * @since 5.9.0
  */
 function register_block_core_pattern() {
 	register_block_type_from_metadata(
@@ -22,11 +24,15 @@ function register_block_core_pattern() {
  *
  * @since 6.3.0 Backwards compatibility: blocks with no `syncStatus` attribute do not receive block wrapper.
  *
+ * @global WP_Embed $wp_embed Used to process embedded content within patterns
+ *
  * @param array $attributes Block attributes.
  *
  * @return string Returns the output of the pattern.
  */
 function render_block_core_pattern( $attributes ) {
+	static $seen_refs = array();
+
 	if ( empty( $attributes['slug'] ) ) {
 		return '';
 	}
@@ -38,6 +44,17 @@ function render_block_core_pattern( $attributes ) {
 		return '';
 	}
 
+	if ( isset( $seen_refs[ $attributes['slug'] ] ) ) {
+		// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
+		// is set in `wp_debug_mode()`.
+		$is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
+
+		return $is_debug ?
+			// translators: Visible only in the front end, this warning takes the place of a faulty block. %s represents a pattern's slug.
+			sprintf( __( '[block rendering halted for pattern "%s"]' ), $slug ) :
+			'';
+	}
+
 	$pattern = $registry->get_registered( $slug );
 	$content = $pattern['content'];
 
@@ -48,11 +65,14 @@ function render_block_core_pattern( $attributes ) {
 		$content = gutenberg_serialize_blocks( $blocks );
 	}
 
+	$seen_refs[ $attributes['slug'] ] = true;
+
 	$content = do_blocks( $content );
 
 	global $wp_embed;
 	$content = $wp_embed->autoembed( $content );
 
+	unset( $seen_refs[ $attributes['slug'] ] );
 	return $content;
 }
 
diff --git a/packages/block-library/src/pattern/recursion-detector.js b/packages/block-library/src/pattern/recursion-detector.js
new file mode 100644
index 00000000000000..f2e80087dd4b07
--- /dev/null
+++ b/packages/block-library/src/pattern/recursion-detector.js
@@ -0,0 +1,145 @@
+/**
+ * THIS MODULE IS INTENTIONALLY KEPT WITHIN THE PATTERN BLOCK'S SOURCE.
+ *
+ * This is because this approach for preventing infinite loops due to
+ * recursively rendering blocks is specific to the way that the `core/pattern`
+ * block behaves in the editor. Any other block types that deal with recursion
+ * SHOULD USE THE STANDARD METHOD for avoiding loops:
+ *
+ * @see https://github.com/WordPress/gutenberg/pull/31455
+ * @see packages/block-editor/src/components/recursion-provider/README.md
+ */
+
+/**
+ * WordPress dependencies
+ */
+import { useRegistry } from '@wordpress/data';
+
+/**
+ * Naming is hard.
+ *
+ * @see useParsePatternDependencies
+ *
+ * @type {WeakMap<Object, Function>}
+ */
+const cachedParsers = new WeakMap();
+
+/**
+ * Hook used by PatternEdit to parse block patterns. It returns a function that
+ * takes a pattern and returns nothing but throws an error if the pattern is
+ * recursive.
+ *
+ * @example
+ * ```js
+ * const parsePatternDependencies = useParsePatternDependencies();
+ * parsePatternDependencies( selectedPattern );
+ * ```
+ *
+ * @see parsePatternDependencies
+ *
+ * @return {Function} A function to parse block patterns.
+ */
+export function useParsePatternDependencies() {
+	const registry = useRegistry();
+
+	// Instead of caching maps, go straight to the point and cache bound
+	// functions. Each of those functions is bound to a different Map that will
+	// keep track of patterns in the context of the given registry.
+	if ( ! cachedParsers.has( registry ) ) {
+		const deps = new Map();
+		cachedParsers.set(
+			registry,
+			parsePatternDependencies.bind( null, deps )
+		);
+	}
+	return cachedParsers.get( registry );
+}
+
+/**
+ * Parse a given pattern and traverse its contents to detect any subsequent
+ * patterns on which it may depend. Such occurrences will be added to an
+ * internal dependency graph. If a circular dependency is detected, an
+ * error will be thrown.
+ *
+ * EXPORTED FOR TESTING PURPOSES ONLY.
+ *
+ * @param {Map<string, Set<string>>} deps           Map of pattern dependencies.
+ * @param {Object}                   pattern        Pattern.
+ * @param {string}                   pattern.name   Pattern name.
+ * @param {Array}                    pattern.blocks Pattern's block list.
+ *
+ * @throws {Error} If a circular dependency is detected.
+ */
+export function parsePatternDependencies( deps, { name, blocks } ) {
+	const queue = [ ...blocks ];
+	while ( queue.length ) {
+		const block = queue.shift();
+		for ( const innerBlock of block.innerBlocks ?? [] ) {
+			queue.unshift( innerBlock );
+		}
+		if ( block.name === 'core/pattern' ) {
+			registerDependency( deps, name, block.attributes.slug );
+		}
+	}
+}
+
+/**
+ * Declare that pattern `a` depends on pattern `b`. If a circular
+ * dependency is detected, an error will be thrown.
+ *
+ * EXPORTED FOR TESTING PURPOSES ONLY.
+ *
+ * @param {Map<string, Set<string>>} deps Map of pattern dependencies.
+ * @param {string}                   a    Slug for pattern A.
+ * @param {string}                   b    Slug for pattern B.
+ *
+ * @throws {Error} If a circular dependency is detected.
+ */
+export function registerDependency( deps, a, b ) {
+	if ( ! deps.has( a ) ) {
+		deps.set( a, new Set() );
+	}
+	deps.get( a ).add( b );
+	if ( hasCycle( deps, a ) ) {
+		throw new TypeError(
+			`Pattern ${ a } has a circular dependency and cannot be rendered.`
+		);
+	}
+}
+
+/**
+ * Determine if a given pattern has circular dependencies on other patterns.
+ * This will be determined by running a depth-first search on the current state
+ * of the graph represented by `patternDependencies`.
+ *
+ * @param {Map<string, Set<string>>} deps           Map of pattern dependencies.
+ * @param {string}                   slug           Pattern slug.
+ * @param {Set<string>}              [visitedNodes] Set to track visited nodes in the graph.
+ * @param {Set<string>}              [currentPath]  Set to track and backtrack graph paths.
+ * @return {boolean} Whether any cycle was found.
+ */
+function hasCycle(
+	deps,
+	slug,
+	visitedNodes = new Set(),
+	currentPath = new Set()
+) {
+	visitedNodes.add( slug );
+	currentPath.add( slug );
+
+	const dependencies = deps.get( slug ) ?? new Set();
+
+	for ( const dependency of dependencies ) {
+		if ( ! visitedNodes.has( dependency ) ) {
+			if ( hasCycle( deps, dependency, visitedNodes, currentPath ) ) {
+				return true;
+			}
+		} else if ( currentPath.has( dependency ) ) {
+			return true;
+		}
+	}
+
+	// Remove the current node from the current path when backtracking
+	currentPath.delete( slug );
+	return false;
+}
diff --git a/packages/block-library/src/pattern/test/index.js b/packages/block-library/src/pattern/test/index.js
new file mode 100644
index 00000000000000..0f682f6cce67b9
--- /dev/null
+++ b/packages/block-library/src/pattern/test/index.js
@@ -0,0 +1,74 @@
+/**
+ * Internal dependencies
+ */
+import {
+	parsePatternDependencies,
+	registerDependency,
+} from '../recursion-detector';
+
+describe( 'core/pattern', () => {
+	const deps = new Map();
+
+	beforeEach( () => {
+		deps.clear();
+	} );
+
+	describe( 'parsePatternDependencies', () => {
+		it( "is silent for patterns that don't require other patterns", () => {
+			const pattern = {
+				name: 'test/benign-pattern',
+				blocks: [ { name: 'core/paragraph' } ],
+			};
+			expect( () => {
+				parsePatternDependencies( deps, pattern );
+			} ).not.toThrow();
+		} );
+		it( 'catches self-referencing patterns', () => {
+			const pattern = {
+				name: 'test/evil-pattern',
+				blocks: [ { name: 'core/pattern', slug: 'test/evil-pattern' } ],
+			};
+			expect( () => {
+				parsePatternDependencies( deps, pattern );
+			} ).toThrow();
+		} );
+	} );
+
+	describe( 'registerDependency', () => {
+		it( 'is silent for patterns with no circular dependencies', () => {
+			expect( () => {
+				registerDependency( deps, 'a', 'b' );
+			} ).not.toThrow();
+		} );
+		it( 'catches self-referencing patterns', () => {
+			expect( () => {
+				registerDependency( deps, 'a', 'a' );
+			} ).toThrow();
+		} );
+		it( 'catches mutually-referencing patterns', () => {
+			registerDependency( deps, 'a', 'b' );
+			expect( () => {
+				registerDependency( deps, 'b', 'a' );
+			} ).toThrow();
+		} );
+		it( 'catches longer cycles', () => {
+			registerDependency( deps, 'a', 'b' );
+			registerDependency( deps, 'b', 'c' );
+			registerDependency( deps, 'b', 'd' );
+			expect( () => {
+				registerDependency( deps, 'd', 'a' );
+			} ).toThrow();
+		} );
+		it( 'catches any pattern depending on a tainted one', () => {
+			registerDependency( deps, 'a', 'b' );
+			registerDependency( deps, 'b', 'c' );
+			registerDependency( deps, 'b', 'd' );
+			expect( () => {
+				registerDependency( deps, 'd', 'a' );
+			} ).toThrow();
+			expect( () => {
+				registerDependency( deps, 'e', 'd' );
+			} ).toThrow();
+		} );
+	} );
+} );
diff --git a/packages/block-library/src/post-author-biography/block.json b/packages/block-library/src/post-author-biography/block.json
index 5d7a4d4585747d..c6e27bc484dfd0 100644
--- a/packages/block-library/src/post-author-biography/block.json
+++ b/packages/block-library/src/post-author-biography/block.json
@@ -12,6 +12,9 @@
 		}
 	},
 	"usesContext": [ "postType", "postId" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"spacing": {
 			"margin": true,
@@ -37,6 +40,22 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
-	}
+	},
+	"style": "wp-block-post-author-biography"
 }
diff --git a/packages/block-library/src/post-author-biography/edit.js b/packages/block-library/src/post-author-biography/edit.js
index 6bd733f32fd466..20f9e94302e4b1 100644
--- a/packages/block-library/src/post-author-biography/edit.js
+++ b/packages/block-library/src/post-author-biography/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -37,7 +37,7 @@ function PostAuthorBiographyEdit( {
 	);
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/post-author-biography/index.php b/packages/block-library/src/post-author-biography/index.php
index 3ea6ecbd9b46a1..bd983f79e76092 100644
--- a/packages/block-library/src/post-author-biography/index.php
+++ b/packages/block-library/src/post-author-biography/index.php
@@ -8,17 +8,20 @@
 /**
  * Renders the `core/post-author-biography` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param  array    $attributes Block attributes.
  * @param  string   $content    Block default content.
  * @param  WP_Block $block      Block instance.
  * @return string Returns the rendered post author biography block.
  */
 function render_block_core_post_author_biography( $attributes, $content, $block ) {
-	if ( ! isset( $block->context['postId'] ) ) {
-		return '';
+	if ( isset( $block->context['postId'] ) ) {
+		$author_id = get_post_field( 'post_author', $block->context['postId'] );
+	} else {
+		$author_id = get_query_var( 'author' );
 	}
 
-	$author_id = get_post_field( 'post_author', $block->context['postId'] );
 	if ( empty( $author_id ) ) {
 		return '';
 	}
@@ -36,6 +39,8 @@ function render_block_core_post_author_biography( $attributes, $content, $block
 
 /**
  * Registers the `core/post-author-biography` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_post_author_biography() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-author-biography/style.scss b/packages/block-library/src/post-author-biography/style.scss
new file mode 100644
index 00000000000000..9a69fac9ba95b8
--- /dev/null
+++ b/packages/block-library/src/post-author-biography/style.scss
@@ -0,0 +1,4 @@
+.wp-block-post-author-biography {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/post-author-name/block.json b/packages/block-library/src/post-author-name/block.json
index 89e4b38de2c281..68d2c49bd91056 100644
--- a/packages/block-library/src/post-author-name/block.json
+++ b/packages/block-library/src/post-author-name/block.json
@@ -20,6 +20,9 @@
 		}
 	},
 	"usesContext": [ "postType", "postId" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"html": false,
 		"spacing": {
@@ -47,6 +50,22 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
-	}
+	},
+	"style": "wp-block-post-author-name"
 }
diff --git a/packages/block-library/src/post-author-name/edit.js b/packages/block-library/src/post-author-name/edit.js
index 9cd2d40799a00c..b4afb9a9799498 100644
--- a/packages/block-library/src/post-author-name/edit.js
+++ b/packages/block-library/src/post-author-name/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -39,7 +39,7 @@ function PostAuthorNameEdit( {
 	);
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/post-author-name/index.php b/packages/block-library/src/post-author-name/index.php
index c5c6d142e06ddf..effc83962a3547 100644
--- a/packages/block-library/src/post-author-name/index.php
+++ b/packages/block-library/src/post-author-name/index.php
@@ -8,17 +8,20 @@
 /**
  * Renders the `core/post-author-name` block on the server.
  *
+ * @since 6.2.0
+ *
  * @param  array    $attributes Block attributes.
  * @param  string   $content    Block default content.
  * @param  WP_Block $block      Block instance.
  * @return string Returns the rendered post author name block.
  */
 function render_block_core_post_author_name( $attributes, $content, $block ) {
-	if ( ! isset( $block->context['postId'] ) ) {
-		return '';
+	if ( isset( $block->context['postId'] ) ) {
+		$author_id = get_post_field( 'post_author', $block->context['postId'] );
+	} else {
+		$author_id = get_query_var( 'author' );
 	}
 
-	$author_id = get_post_field( 'post_author', $block->context['postId'] );
 	if ( empty( $author_id ) ) {
 		return '';
 	}
@@ -42,6 +45,8 @@ function render_block_core_post_author_name( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/post-author-name` block on the server.
+ *
+ * @since 6.2.0
  */
 function register_block_core_post_author_name() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-author-name/style.scss b/packages/block-library/src/post-author-name/style.scss
new file mode 100644
index 00000000000000..0f57b30490fa68
--- /dev/null
+++ b/packages/block-library/src/post-author-name/style.scss
@@ -0,0 +1,4 @@
+.wp-block-post-author-name {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/post-author/block.json b/packages/block-library/src/post-author/block.json
index 47dceef55604f6..d66498c8ee3df9 100644
--- a/packages/block-library/src/post-author/block.json
+++ b/packages/block-library/src/post-author/block.json
@@ -61,7 +61,23 @@
 				"background": true,
 				"text": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
+	"editorStyle": "wp-block-post-author-editor",
 	"style": "wp-block-post-author"
 }
diff --git a/packages/block-library/src/post-author/edit.js b/packages/block-library/src/post-author/edit.js
index 05797fcc8250a1..6186b0d052e8aa 100644
--- a/packages/block-library/src/post-author/edit.js
+++ b/packages/block-library/src/post-author/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -18,6 +18,7 @@ import {
 	PanelBody,
 	SelectControl,
 	ToggleControl,
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
@@ -72,7 +73,7 @@ function PostAuthorEdit( {
 	}
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
@@ -100,72 +101,82 @@ function PostAuthorEdit( {
 		<>
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
-					{ showAuthorControl &&
-						( ( showCombobox && (
-							<ComboboxControl
-								__nextHasNoMarginBottom
-								label={ __( 'Author' ) }
-								options={ authorOptions }
-								value={ authorId }
-								onChange={ handleSelect }
-								allowReset={ false }
-							/>
-						) ) || (
+					<VStack
+						spacing={ 4 }
+						className="wp-block-post-author__inspector-settings"
+					>
+						{ showAuthorControl &&
+							( ( showCombobox && (
+								<ComboboxControl
+									__next40pxDefaultSize
+									__nextHasNoMarginBottom
+									label={ __( 'Author' ) }
+									options={ authorOptions }
+									value={ authorId }
+									onChange={ handleSelect }
+									allowReset={ false }
+								/>
+							) ) || (
+								<SelectControl
+									__next40pxDefaultSize
+									__nextHasNoMarginBottom
+									label={ __( 'Author' ) }
+									value={ authorId }
+									options={ authorOptions }
+									onChange={ handleSelect }
+								/>
+							) ) }
+						<ToggleControl
+							__nextHasNoMarginBottom
+							label={ __( 'Show avatar' ) }
+							checked={ showAvatar }
+							onChange={ () =>
+								setAttributes( { showAvatar: ! showAvatar } )
+							}
+						/>
+						{ showAvatar && (
 							<SelectControl
+								__next40pxDefaultSize
 								__nextHasNoMarginBottom
-								label={ __( 'Author' ) }
-								value={ authorId }
-								options={ authorOptions }
-								onChange={ handleSelect }
+								label={ __( 'Avatar size' ) }
+								value={ attributes.avatarSize }
+								options={ avatarSizes }
+								onChange={ ( size ) => {
+									setAttributes( {
+										avatarSize: Number( size ),
+									} );
+								} }
 							/>
-						) ) }
-					<ToggleControl
-						__nextHasNoMarginBottom
-						label={ __( 'Show avatar' ) }
-						checked={ showAvatar }
-						onChange={ () =>
-							setAttributes( { showAvatar: ! showAvatar } )
-						}
-					/>
-					{ showAvatar && (
-						<SelectControl
+						) }
+						<ToggleControl
 							__nextHasNoMarginBottom
-							label={ __( 'Avatar size' ) }
-							value={ attributes.avatarSize }
-							options={ avatarSizes }
-							onChange={ ( size ) => {
-								setAttributes( {
-									avatarSize: Number( size ),
-								} );
-							} }
+							label={ __( 'Show bio' ) }
+							checked={ showBio }
+							onChange={ () =>
+								setAttributes( { showBio: ! showBio } )
+							}
 						/>
-					) }
-					<ToggleControl
-						__nextHasNoMarginBottom
-						label={ __( 'Show bio' ) }
-						checked={ showBio }
-						onChange={ () =>
-							setAttributes( { showBio: ! showBio } )
-						}
-					/>
-					<ToggleControl
-						__nextHasNoMarginBottom
-						label={ __( 'Link author name to author page' ) }
-						checked={ isLink }
-						onChange={ () => setAttributes( { isLink: ! isLink } ) }
-					/>
-					{ isLink && (
 						<ToggleControl
 							__nextHasNoMarginBottom
-							label={ __( 'Open in new tab' ) }
-							onChange={ ( value ) =>
-								setAttributes( {
-									linkTarget: value ? '_blank' : '_self',
-								} )
+							label={ __( 'Link author name to author page' ) }
+							checked={ isLink }
+							onChange={ () =>
+								setAttributes( { isLink: ! isLink } )
 							}
-							checked={ linkTarget === '_blank' }
 						/>
-					) }
+						{ isLink && (
+							<ToggleControl
+								__nextHasNoMarginBottom
+								label={ __( 'Open in new tab' ) }
+								onChange={ ( value ) =>
+									setAttributes( {
+										linkTarget: value ? '_blank' : '_self',
+									} )
+								}
+								checked={ linkTarget === '_blank' }
+							/>
+						) }
+					</VStack>
 				</PanelBody>
 			</InspectorControls>
 
@@ -195,6 +206,7 @@ function PostAuthorEdit( {
 				<div className="wp-block-post-author__content">
 					{ ( ! RichText.isEmpty( byline ) || isSelected ) && (
 						<RichText
+							identifier="byline"
 							className="wp-block-post-author__byline"
 							aria-label={ __( 'Post author byline text' ) }
 							placeholder={ __( 'Write byline…' ) }
diff --git a/packages/block-library/src/post-author/editor.scss b/packages/block-library/src/post-author/editor.scss
new file mode 100644
index 00000000000000..f6464893138cff
--- /dev/null
+++ b/packages/block-library/src/post-author/editor.scss
@@ -0,0 +1,7 @@
+.wp-block-post-author__inspector-settings {
+	// Counteract the margin added by the block inspector.
+	.components-base-control,
+	.components-base-control:last-child {
+		margin-bottom: 0;
+	}
+}
diff --git a/packages/block-library/src/post-author/index.js b/packages/block-library/src/post-author/index.js
index 8c91b99f7f6f59..b9b17c0899fc4f 100644
--- a/packages/block-library/src/post-author/index.js
+++ b/packages/block-library/src/post-author/index.js
@@ -1,6 +1,7 @@
 /**
  * WordPress dependencies
  */
+import { __ } from '@wordpress/i18n';
 import { postAuthor as icon } from '@wordpress/icons';
 
 /**
@@ -15,6 +16,13 @@ export { metadata, name };
 
 export const settings = {
 	icon,
+	example: {
+		viewportWidth: 350,
+		attributes: {
+			showBio: true,
+			byline: __( 'Posted by' ),
+		},
+	},
 	edit,
 };
 
diff --git a/packages/block-library/src/post-author/index.php b/packages/block-library/src/post-author/index.php
index 898d9478283bc8..faf894d997d732 100644
--- a/packages/block-library/src/post-author/index.php
+++ b/packages/block-library/src/post-author/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/post-author` block on the server.
  *
+ * @since 5.9.0
+ *
  * @param  array    $attributes Block attributes.
  * @param  string   $content    Block default content.
  * @param  WP_Block $block      Block instance.
@@ -61,6 +63,8 @@ function render_block_core_post_author( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/post-author` block on the server.
+ *
+ * @since 5.9.0
  */
 function register_block_core_post_author() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-author/style.scss b/packages/block-library/src/post-author/style.scss
index 0b2d63aab44f60..28fd4fad3cf5a7 100644
--- a/packages/block-library/src/post-author/style.scss
+++ b/packages/block-library/src/post-author/style.scss
@@ -1,6 +1,7 @@
 .wp-block-post-author {
 	display: flex;
 	flex-wrap: wrap;
+	box-sizing: border-box;
 
 	&__byline {
 		width: 100%;
diff --git a/packages/block-library/src/post-comment/block.json b/packages/block-library/src/post-comment/block.json
index 85bdb7dd6cf327..071ef550deb9bc 100644
--- a/packages/block-library/src/post-comment/block.json
+++ b/packages/block-library/src/post-comment/block.json
@@ -5,6 +5,14 @@
 	"name": "core/post-comment",
 	"title": "Comment (deprecated)",
 	"category": "theme",
+	"allowedBlocks": [
+		"core/avatar",
+		"core/comment-author-name",
+		"core/comment-content",
+		"core/comment-date",
+		"core/comment-edit-link",
+		"core/comment-reply-link"
+	],
 	"description": "This block is deprecated. Please use the Comments block instead.",
 	"textdomain": "default",
 	"attributes": {
@@ -17,6 +25,9 @@
 	},
 	"supports": {
 		"html": false,
-		"inserter": false
+		"inserter": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	}
 }
diff --git a/packages/block-library/src/post-comment/edit.js b/packages/block-library/src/post-comment/edit.js
index 35c0eee93308f4..a5193e427fa981 100644
--- a/packages/block-library/src/post-comment/edit.js
+++ b/packages/block-library/src/post-comment/edit.js
@@ -7,14 +7,6 @@ import { useState } from '@wordpress/element';
 import { blockDefault } from '@wordpress/icons';
 import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
 
-const ALLOWED_BLOCKS = [
-	'core/avatar',
-	'core/comment-author-name',
-	'core/comment-content',
-	'core/comment-date',
-	'core/comment-edit-link',
-	'core/comment-reply-link',
-];
 const TEMPLATE = [
 	[ 'core/avatar' ],
 	[ 'core/comment-author-name' ],
@@ -29,7 +21,6 @@ export default function Edit( { attributes: { commentId }, setAttributes } ) {
 	const blockProps = useBlockProps();
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
 		template: TEMPLATE,
-		allowedBlocks: ALLOWED_BLOCKS,
 	} );
 
 	if ( ! commentId ) {
@@ -43,6 +34,7 @@ export default function Edit( { attributes: { commentId }, setAttributes } ) {
 					) }
 				>
 					<TextControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						value={ commentId }
 						onChange={ ( val ) =>
@@ -51,6 +43,7 @@ export default function Edit( { attributes: { commentId }, setAttributes } ) {
 					/>
 
 					<Button
+						__next40pxDefaultSize
 						variant="primary"
 						onClick={ () => {
 							setAttributes( { commentId: commentIdInput } );
diff --git a/packages/block-library/src/post-comments-count/block.json b/packages/block-library/src/post-comments-count/block.json
index 43c1aaf713776f..796e6e3830236c 100644
--- a/packages/block-library/src/post-comments-count/block.json
+++ b/packages/block-library/src/post-comments-count/block.json
@@ -38,6 +38,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/post-comments-count/edit.js b/packages/block-library/src/post-comments-count/edit.js
index e5d0ec9352edaf..9e148a1c33b03b 100644
--- a/packages/block-library/src/post-comments-count/edit.js
+++ b/packages/block-library/src/post-comments-count/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -26,7 +26,7 @@ export default function PostCommentsCountEdit( {
 	const { postId } = context;
 	const [ commentsCount, setCommentsCount ] = useState();
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/post-comments-form/block.json b/packages/block-library/src/post-comments-form/block.json
index ff157beb5ced9c..af893ccb67a082 100644
--- a/packages/block-library/src/post-comments-form/block.json
+++ b/packages/block-library/src/post-comments-form/block.json
@@ -37,6 +37,18 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"editorStyle": "wp-block-post-comments-form-editor",
diff --git a/packages/block-library/src/post-comments-form/edit.js b/packages/block-library/src/post-comments-form/edit.js
index b63c798a2458af..11089cbe627ffa 100644
--- a/packages/block-library/src/post-comments-form/edit.js
+++ b/packages/block-library/src/post-comments-form/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -32,7 +32,7 @@ export default function PostCommentsFormEdit( {
 	const instanceIdDesc = sprintf( 'comments-form-edit-%d-desc', instanceId );
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 		'aria-describedby': instanceIdDesc,
diff --git a/packages/block-library/src/post-comments-form/form.js b/packages/block-library/src/post-comments-form/form.js
index 10483e145f709b..20f0ebca61ead6 100644
--- a/packages/block-library/src/post-comments-form/form.js
+++ b/packages/block-library/src/post-comments-form/form.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -44,7 +44,7 @@ const CommentsFormPlaceholder = () => {
 					<input
 						name="submit"
 						type="submit"
-						className={ classnames(
+						className={ clsx(
 							'wp-block-button__link',
 							__experimentalGetElementClassName( 'button' )
 						) }
@@ -84,6 +84,7 @@ const CommentsForm = ( { postId, postType } ) => {
 		if ( 'closed' === commentStatus ) {
 			const actions = [
 				<Button
+					__next40pxDefaultSize
 					key="enableComments"
 					onClick={ () => setCommentStatus( 'open' ) }
 					variant="primary"
diff --git a/packages/block-library/src/post-comments-form/index.php b/packages/block-library/src/post-comments-form/index.php
index 644b02ae0f1498..dfbf4c59f264ad 100644
--- a/packages/block-library/src/post-comments-form/index.php
+++ b/packages/block-library/src/post-comments-form/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/post-comments-form` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -54,6 +56,8 @@ function render_block_core_post_comments_form( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/post-comments-form` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_post_comments_form() {
 	register_block_type_from_metadata(
@@ -68,6 +72,8 @@ function register_block_core_post_comments_form() {
 /**
  * Use the button block classes for the form-submit button.
  *
+ * @since 6.0.0
+ *
  * @param array $fields The default comment form arguments.
  *
  * @return array Returns the modified fields.
diff --git a/packages/block-library/src/post-comments-form/style.scss b/packages/block-library/src/post-comments-form/style.scss
index 52b00a2c4f6cee..b400849ba83bdb 100644
--- a/packages/block-library/src/post-comments-form/style.scss
+++ b/packages/block-library/src/post-comments-form/style.scss
@@ -1,3 +1,18 @@
+// Allow these default styles to be overridden by global styles.
+:where(.wp-block-post-comments-form) {
+	textarea,
+	input:not([type="submit"]) {
+		border: 1px solid $gray-600;
+		font-size: 1em;
+		font-family: inherit;
+	}
+
+	textarea,
+	input:where(:not([type="submit"]):not([type="checkbox"])) {
+		padding: calc(0.667em + 2px); // The extra 2px is added to match outline buttons.
+	}
+}
+
 .wp-block-post-comments-form {
 	// This block has customizable padding, border-box makes that more predictable.
 	box-sizing: border-box;
@@ -23,7 +38,7 @@
 	}
 
 	// Styles copied from button block styles.
-	input[type="submit"] {
+	:where(input[type="submit"]) {
 		box-shadow: none;
 		cursor: pointer;
 		display: inline-block;
@@ -31,18 +46,6 @@
 		overflow-wrap: break-word;
 	}
 
-	textarea,
-	input:not([type="submit"]) {
-		border: 1px solid $gray-600;
-		font-size: 1em;
-		font-family: inherit;
-	}
-
-	textarea,
-	input:not([type="submit"]):not([type="checkbox"]) {
-		padding: calc(0.667em + 2px); // The extra 2px is added to match outline buttons.
-	}
-
 	.comment-form {
 		textarea,
 		// Make sure to not set display block on hidden input fields, to prevent
diff --git a/packages/block-library/src/post-comments-link/block.json b/packages/block-library/src/post-comments-link/block.json
index 74e268c3c20b19..67831b1d15c5d5 100644
--- a/packages/block-library/src/post-comments-link/block.json
+++ b/packages/block-library/src/post-comments-link/block.json
@@ -39,6 +39,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/post-comments-link/edit.js b/packages/block-library/src/post-comments-link/edit.js
index 36e617c55a3e7d..e90734e9740bb3 100644
--- a/packages/block-library/src/post-comments-link/edit.js
+++ b/packages/block-library/src/post-comments-link/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -25,7 +25,7 @@ function PostCommentsLinkEdit( { context, attributes, setAttributes } ) {
 	const [ commentsCount, setCommentsCount ] = useState();
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/post-content/block.json b/packages/block-library/src/post-content/block.json
index b0e0487a0b8249..1b9de707cb3220 100644
--- a/packages/block-library/src/post-content/block.json
+++ b/packages/block-library/src/post-content/block.json
@@ -7,15 +7,30 @@
 	"description": "Displays the contents of a post or page.",
 	"textdomain": "default",
 	"usesContext": [ "postId", "postType", "queryId" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
 		"layout": true,
+		"background": {
+			"backgroundImage": true,
+			"backgroundSize": true,
+			"__experimentalDefaultControls": {
+				"backgroundImage": true
+			}
+		},
 		"dimensions": {
 			"minHeight": true
 		},
 		"spacing": {
-			"blockGap": true
+			"blockGap": true,
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"color": {
 			"gradients": true,
@@ -39,5 +54,6 @@
 			}
 		}
 	},
+	"style": "wp-block-post-content",
 	"editorStyle": "wp-block-post-content-editor"
 }
diff --git a/packages/block-library/src/post-content/edit.js b/packages/block-library/src/post-content/edit.js
index ae3bb938c90eee..582165303c0d05 100644
--- a/packages/block-library/src/post-content/edit.js
+++ b/packages/block-library/src/post-content/edit.js
@@ -5,22 +5,27 @@ import { __ } from '@wordpress/i18n';
 import {
 	useBlockProps,
 	useInnerBlocksProps,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	Warning,
+	__experimentalUseBlockPreview as useBlockPreview,
 } from '@wordpress/block-editor';
+import { parse } from '@wordpress/blocks';
 import {
 	useEntityProp,
 	useEntityBlockEditor,
 	store as coreStore,
 } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
 import { useCanEditEntity } from '../utils/hooks';
 
 function ReadOnlyContent( {
+	parentLayout,
 	layoutClassNames,
 	userCanEdit,
 	postType,
@@ -33,7 +38,28 @@ function ReadOnlyContent( {
 		postId
 	);
 	const blockProps = useBlockProps( { className: layoutClassNames } );
-	return content?.protected && ! userCanEdit ? (
+	const blocks = useMemo( () => {
+		return content?.raw ? parse( content.raw ) : [];
+	}, [ content?.raw ] );
+	const blockPreviewProps = useBlockPreview( {
+		blocks,
+		props: blockProps,
+		layout: parentLayout,
+	} );
+
+	if ( userCanEdit ) {
+		/*
+		 * Rendering the block preview using the raw content blocks allows for
+		 * block support styles to be generated and applied by the editor.
+		 *
+		 * The preview using the raw blocks can only be presented to users with
+		 * edit permissions for the post to prevent potential exposure of private
+		 * block content.
+		 */
+		return <div { ...blockPreviewProps }></div>;
+	}
+
+	return content?.protected ? (
 		<div { ...blockProps }>
 			<Warning>{ __( 'This content is password protected.' ) }</Warning>
 		</div>
@@ -96,6 +122,7 @@ function Content( props ) {
 		<EditableContent { ...props } />
 	) : (
 		<ReadOnlyContent
+			parentLayout={ props.parentLayout }
 			layoutClassNames={ layoutClassNames }
 			userCanEdit={ userCanEdit }
 			postType={ postType }
@@ -141,6 +168,7 @@ function RecursionError() {
 export default function PostContentEdit( {
 	context,
 	__unstableLayoutClassNames: layoutClassNames,
+	__unstableParentLayout: parentLayout,
 } ) {
 	const { postId: contextPostId, postType: contextPostType } = context;
 	const hasAlreadyRendered = useHasRecursion( contextPostId );
@@ -154,6 +182,7 @@ export default function PostContentEdit( {
 			{ contextPostId && contextPostType ? (
 				<Content
 					context={ context }
+					parentLayout={ parentLayout }
 					layoutClassNames={ layoutClassNames }
 				/>
 			) : (
diff --git a/packages/block-library/src/post-content/index.php b/packages/block-library/src/post-content/index.php
index dd84574fdea658..25be880cc47887 100644
--- a/packages/block-library/src/post-content/index.php
+++ b/packages/block-library/src/post-content/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/post-content` block on the server.
  *
+ * @since 5.8.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -63,6 +65,8 @@ function render_block_core_post_content( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/post-content` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_post_content() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-content/style.scss b/packages/block-library/src/post-content/style.scss
new file mode 100644
index 00000000000000..1d3e210e1210d7
--- /dev/null
+++ b/packages/block-library/src/post-content/style.scss
@@ -0,0 +1,3 @@
+.wp-block-post-content {
+	display: flow-root;
+}
diff --git a/packages/block-library/src/post-date/block.json b/packages/block-library/src/post-date/block.json
index 11ebc32d9cabec..470bddae53bdfc 100644
--- a/packages/block-library/src/post-date/block.json
+++ b/packages/block-library/src/post-date/block.json
@@ -23,6 +23,9 @@
 		}
 	},
 	"usesContext": [ "postId", "postType", "queryId" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"html": false,
 		"color": {
@@ -50,6 +53,21 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	}
 }
diff --git a/packages/block-library/src/post-date/edit.js b/packages/block-library/src/post-date/edit.js
index f8cd268358d49f..5057466c6af453 100644
--- a/packages/block-library/src/post-date/edit.js
+++ b/packages/block-library/src/post-date/edit.js
@@ -1,14 +1,18 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { useEntityProp, store as coreStore } from '@wordpress/core-data';
 import { useMemo, useState } from '@wordpress/element';
-import { dateI18n, getSettings as getDateSettings } from '@wordpress/date';
+import {
+	dateI18n,
+	humanTimeDiff,
+	getSettings as getDateSettings,
+} from '@wordpress/date';
 import {
 	AlignmentControl,
 	BlockControls,
@@ -24,7 +28,7 @@ import {
 	ToggleControl,
 	PanelBody,
 } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
+import { __, _x, sprintf } from '@wordpress/i18n';
 import { edit } from '@wordpress/icons';
 import { DOWN } from '@wordpress/keycodes';
 import { useSelect } from '@wordpress/data';
@@ -35,7 +39,7 @@ export default function PostDateEdit( {
 	setAttributes,
 } ) {
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 			[ `wp-block-post-date__modified-date` ]: displayType === 'modified',
 		} ),
@@ -82,7 +86,9 @@ export default function PostDateEdit( {
 
 	let postDate = date ? (
 		<time dateTime={ dateI18n( 'c', date ) } ref={ setPopoverAnchor }>
-			{ dateI18n( format || siteFormat, date ) }
+			{ format === 'human-diff'
+				? humanTimeDiff( date )
+				: dateI18n( format || siteFormat, date ) }
 		</time>
 	) : (
 		dateLabel
@@ -108,40 +114,49 @@ export default function PostDateEdit( {
 						setAttributes( { textAlign: nextAlign } );
 					} }
 				/>
-				{ date && ! isDescendentOfQueryLoop && (
-					<ToolbarGroup>
-						<Dropdown
-							popoverProps={ popoverProps }
-							renderContent={ ( { onClose } ) => (
-								<PublishDateTimePicker
-									currentDate={ date }
-									onChange={ setDate }
-									is12Hour={ is12HourFormat(
-										siteTimeFormat
-									) }
-									onClose={ onClose }
-								/>
-							) }
-							renderToggle={ ( { isOpen, onToggle } ) => {
-								const openOnArrowDown = ( event ) => {
-									if ( ! isOpen && event.keyCode === DOWN ) {
-										event.preventDefault();
-										onToggle();
-									}
-								};
-								return (
-									<ToolbarButton
-										aria-expanded={ isOpen }
-										icon={ edit }
-										title={ __( 'Change Date' ) }
-										onClick={ onToggle }
-										onKeyDown={ openOnArrowDown }
+				{ date &&
+					displayType === 'date' &&
+					! isDescendentOfQueryLoop && (
+						<ToolbarGroup>
+							<Dropdown
+								popoverProps={ popoverProps }
+								renderContent={ ( { onClose } ) => (
+									<PublishDateTimePicker
+										currentDate={ date }
+										onChange={ setDate }
+										is12Hour={ is12HourFormat(
+											siteTimeFormat
+										) }
+										onClose={ onClose }
+										dateOrder={
+											/* translators: Order of day, month, and year. Available formats are 'dmy', 'mdy', and 'ymd'. */
+											_x( 'dmy', 'date order' )
+										}
 									/>
-								);
-							} }
-						/>
-					</ToolbarGroup>
-				) }
+								) }
+								renderToggle={ ( { isOpen, onToggle } ) => {
+									const openOnArrowDown = ( event ) => {
+										if (
+											! isOpen &&
+											event.keyCode === DOWN
+										) {
+											event.preventDefault();
+											onToggle();
+										}
+									};
+									return (
+										<ToolbarButton
+											aria-expanded={ isOpen }
+											icon={ edit }
+											title={ __( 'Change Date' ) }
+											onClick={ onToggle }
+											onKeyDown={ openOnArrowDown }
+										/>
+									);
+								} }
+							/>
+						</ToolbarGroup>
+					) }
 			</BlockControls>
 
 			<InspectorControls>
diff --git a/packages/block-library/src/post-date/index.php b/packages/block-library/src/post-date/index.php
index b59db80b242cd1..79aa81e7f9c11a 100644
--- a/packages/block-library/src/post-date/index.php
+++ b/packages/block-library/src/post-date/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/post-date` block on the server.
  *
+ * @since 5.8.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -18,8 +20,20 @@ function render_block_core_post_date( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$post_ID          = $block->context['postId'];
-	$formatted_date   = get_the_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+	$post_ID = $block->context['postId'];
+
+	if ( isset( $attributes['format'] ) && 'human-diff' === $attributes['format'] ) {
+		$post_timestamp = get_post_timestamp( $post_ID );
+		if ( $post_timestamp > time() ) {
+			// translators: %s: human-readable time difference.
+			$formatted_date = sprintf( __( '%s from now' ), human_time_diff( $post_timestamp ) );
+		} else {
+			// translators: %s: human-readable time difference.
+			$formatted_date = sprintf( __( '%s ago' ), human_time_diff( $post_timestamp ) );
+		}
+	} else {
+		$formatted_date = get_the_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+	}
 	$unformatted_date = esc_attr( get_the_date( 'c', $post_ID ) );
 	$classes          = array();
 
@@ -36,7 +50,12 @@ function render_block_core_post_date( $attributes, $content, $block ) {
 	 */
 	if ( isset( $attributes['displayType'] ) && 'modified' === $attributes['displayType'] ) {
 		if ( get_the_modified_date( 'Ymdhi', $post_ID ) > get_the_date( 'Ymdhi', $post_ID ) ) {
-			$formatted_date   = get_the_modified_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+			if ( isset( $attributes['format'] ) && 'human-diff' === $attributes['format'] ) {
+				// translators: %s: human-readable time difference.
+				$formatted_date = sprintf( __( '%s ago' ), human_time_diff( get_post_timestamp( $post_ID, 'modified' ) ) );
+			} else {
+				$formatted_date = get_the_modified_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+			}
 			$unformatted_date = esc_attr( get_the_modified_date( 'c', $post_ID ) );
 			$classes[]        = 'wp-block-post-date__modified-date';
 		} else {
@@ -60,6 +79,8 @@ function render_block_core_post_date( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/post-date` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_post_date() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-excerpt/block.json b/packages/block-library/src/post-excerpt/block.json
index 33b7818ebed9f2..61888ced43e67d 100644
--- a/packages/block-library/src/post-excerpt/block.json
+++ b/packages/block-library/src/post-excerpt/block.json
@@ -23,6 +23,9 @@
 		}
 	},
 	"usesContext": [ "postId", "postType", "queryId" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"html": false,
 		"color": {
@@ -50,6 +53,21 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"editorStyle": "wp-block-post-excerpt-editor",
diff --git a/packages/block-library/src/post-excerpt/edit.js b/packages/block-library/src/post-excerpt/edit.js
index c4b53b22833698..05aaf543b59196 100644
--- a/packages/block-library/src/post-excerpt/edit.js
+++ b/packages/block-library/src/post-excerpt/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -71,7 +71,7 @@ export default function PostExcerptEditor( {
 		userCanEdit && ! isDescendentOfQueryLoop && postTypeSupportsExcerpts;
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
@@ -89,7 +89,9 @@ export default function PostExcerptEditor( {
 	 * excerpt has been produced from the content.
 	 */
 	const strippedRenderedExcerpt = useMemo( () => {
-		if ( ! renderedExcerpt ) return '';
+		if ( ! renderedExcerpt ) {
+			return '';
+		}
 		const document = new window.DOMParser().parseFromString(
 			renderedExcerpt,
 			'text/html'
@@ -127,6 +129,7 @@ export default function PostExcerptEditor( {
 	}
 	const readMoreLink = (
 		<RichText
+			identifier="moreText"
 			className="wp-block-post-excerpt__more-link"
 			tagName="a"
 			aria-label={ __( '“Read more” link text' ) }
@@ -135,10 +138,10 @@ export default function PostExcerptEditor( {
 			onChange={ ( newMoreText ) =>
 				setAttributes( { moreText: newMoreText } )
 			}
-			withoutInteractiveFormatting={ true }
+			withoutInteractiveFormatting
 		/>
 	);
-	const excerptClassName = classnames( 'wp-block-post-excerpt__excerpt', {
+	const excerptClassName = clsx( 'wp-block-post-excerpt__excerpt', {
 		'is-inline': ! showMoreOnNewLine,
 	} );
 
@@ -228,6 +231,8 @@ export default function PostExcerptEditor( {
 						}
 					/>
 					<RangeControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
 						label={ __( 'Max number of words' ) }
 						value={ excerptLength }
 						onChange={ ( value ) => {
diff --git a/packages/block-library/src/post-excerpt/index.php b/packages/block-library/src/post-excerpt/index.php
index 09d6b6f003d34b..c8882b4062ac00 100644
--- a/packages/block-library/src/post-excerpt/index.php
+++ b/packages/block-library/src/post-excerpt/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/post-excerpt` block on the server.
  *
+ * @since 5.8.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -66,6 +68,8 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/post-excerpt` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_post_excerpt() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-excerpt/style.scss b/packages/block-library/src/post-excerpt/style.scss
index 1562bca962c1c9..b44108f67b5dd5 100644
--- a/packages/block-library/src/post-excerpt/style.scss
+++ b/packages/block-library/src/post-excerpt/style.scss
@@ -1,5 +1,8 @@
 // Lowest specificity on wrapper margins to avoid overriding layout styles.
 :where(.wp-block-post-excerpt) {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+
 	margin-top: var(--wp--style--block-gap);
 	margin-bottom: var(--wp--style--block-gap);
 }
diff --git a/packages/block-library/src/post-featured-image/block.json b/packages/block-library/src/post-featured-image/block.json
index 34e3bd6b2325fa..8b431ffc625790 100644
--- a/packages/block-library/src/post-featured-image/block.json
+++ b/packages/block-library/src/post-featured-image/block.json
@@ -51,13 +51,19 @@
 		},
 		"customGradient": {
 			"type": "string"
+		},
+		"useFirstImageFromPost": {
+			"type": "boolean",
+			"default": false
 		}
 	},
 	"usesContext": [ "postId", "postType", "queryId" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"align": [ "left", "right", "center", "wide", "full" ],
 		"color": {
-			"__experimentalDuotone": "img, .wp-block-post-featured-image__placeholder, .components-placeholder__illustration, .components-placeholder::before",
 			"text": false,
 			"background": false
 		},
@@ -65,7 +71,6 @@
 			"color": true,
 			"radius": true,
 			"width": true,
-			"__experimentalSelector": "img, .block-editor-media-placeholder, .wp-block-post-featured-image__overlay",
 			"__experimentalSkipSerialization": true,
 			"__experimentalDefaultControls": {
 				"color": true,
@@ -73,10 +78,26 @@
 				"width": true
 			}
 		},
+		"filter": {
+			"duotone": true
+		},
+		"shadow": {
+			"__experimentalSkipSerialization": true
+		},
 		"html": false,
 		"spacing": {
 			"margin": true,
 			"padding": true
+		},
+		"interactivity": {
+			"clientNavigation": true
+		}
+	},
+	"selectors": {
+		"border": ".wp-block-post-featured-image img, .wp-block-post-featured-image .block-editor-media-placeholder, .wp-block-post-featured-image .wp-block-post-featured-image__overlay",
+		"shadow": ".wp-block-post-featured-image img, .wp-block-post-featured-image .components-placeholder",
+		"filter": {
+			"duotone": ".wp-block-post-featured-image img, .wp-block-post-featured-image .wp-block-post-featured-image__placeholder, .wp-block-post-featured-image .components-placeholder__illustration, .wp-block-post-featured-image .components-placeholder::before"
 		}
 	},
 	"editorStyle": "wp-block-post-featured-image-editor",
diff --git a/packages/block-library/src/post-featured-image/dimension-controls.js b/packages/block-library/src/post-featured-image/dimension-controls.js
index 03a2d2849dae36..5a3e40a126bf8d 100644
--- a/packages/block-library/src/post-featured-image/dimension-controls.js
+++ b/packages/block-library/src/post-featured-image/dimension-controls.js
@@ -10,7 +10,11 @@ import {
 	__experimentalUseCustomUnits as useCustomUnits,
 	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
-import { InspectorControls, useSettings } from '@wordpress/block-editor';
+import {
+	useSettings,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
 
 const SCALE_OPTIONS = (
 	<>
@@ -51,12 +55,31 @@ const DimensionControls = ( {
 	clientId,
 	attributes: { aspectRatio, width, height, scale, sizeSlug },
 	setAttributes,
-	imageSizeOptions = [],
+	media,
 } ) => {
-	const [ availableUnits ] = useSettings( 'spacing.units' );
+	const [ availableUnits, defaultRatios, themeRatios, showDefaultRatios ] =
+		useSettings(
+			'spacing.units',
+			'dimensions.aspectRatios.default',
+			'dimensions.aspectRatios.theme',
+			'dimensions.defaultAspectRatios'
+		);
 	const units = useCustomUnits( {
 		availableUnits: availableUnits || [ 'px', '%', 'vw', 'em', 'rem' ],
 	} );
+	const imageSizes = useSelect(
+		( select ) => select( blockEditorStore ).getSettings().imageSizes,
+		[]
+	);
+	const imageSizeOptions = imageSizes
+		.filter( ( { slug } ) => {
+			return media?.media_details?.sizes?.[ slug ]?.source_url;
+		} )
+		.map( ( { name, slug } ) => ( {
+			value: slug,
+			label: name,
+		} ) );
+
 	const onDimensionChange = ( dimension, nextValue ) => {
 		const parsedValue = parseFloat( nextValue );
 		/**
@@ -64,7 +87,9 @@ const DimensionControls = ( {
 		 * we don't want to set the attribute, as it would
 		 * end up having the unit as value without any number.
 		 */
-		if ( isNaN( parsedValue ) && nextValue ) return;
+		if ( isNaN( parsedValue ) && nextValue ) {
+			return;
+		}
 		setAttributes( {
 			[ dimension ]: parsedValue < 0 ? '0' : nextValue,
 		} );
@@ -74,8 +99,30 @@ const DimensionControls = ( {
 	const showScaleControl =
 		height || ( aspectRatio && aspectRatio !== 'auto' );
 
+	const themeOptions = themeRatios?.map( ( { name, ratio } ) => ( {
+		label: name,
+		value: ratio,
+	} ) );
+
+	const defaultOptions = defaultRatios?.map( ( { name, ratio } ) => ( {
+		label: name,
+		value: ratio,
+	} ) );
+
+	const aspectRatioOptions = [
+		{
+			label: _x(
+				'Original',
+				'Aspect ratio option for dimensions control'
+			),
+			value: 'auto',
+		},
+		...( showDefaultRatios ? defaultOptions : [] ),
+		...( themeOptions ? themeOptions : [] ),
+	];
+
 	return (
-		<InspectorControls group="dimensions">
+		<>
 			<ToolsPanelItem
 				hasValue={ () => !! aspectRatio }
 				label={ __( 'Aspect ratio' ) }
@@ -83,48 +130,15 @@ const DimensionControls = ( {
 				resetAllFilter={ () => ( {
 					aspectRatio: undefined,
 				} ) }
-				isShownByDefault={ true }
+				isShownByDefault
 				panelId={ clientId }
 			>
 				<SelectControl
+					__next40pxDefaultSize
 					__nextHasNoMarginBottom
 					label={ __( 'Aspect ratio' ) }
 					value={ aspectRatio }
-					options={ [
-						// These should use the same values as AspectRatioDropdown in @wordpress/block-editor
-						{
-							label: __( 'Original' ),
-							value: 'auto',
-						},
-						{
-							label: __( 'Square' ),
-							value: '1',
-						},
-						{
-							label: __( '16:9' ),
-							value: '16/9',
-						},
-						{
-							label: __( '4:3' ),
-							value: '4/3',
-						},
-						{
-							label: __( '3:2' ),
-							value: '3/2',
-						},
-						{
-							label: __( '9:16' ),
-							value: '9/16',
-						},
-						{
-							label: __( '3:4' ),
-							value: '3/4',
-						},
-						{
-							label: __( '2:3' ),
-							value: '2/3',
-						},
-					] }
+					options={ aspectRatioOptions }
 					onChange={ ( nextAspectRatio ) =>
 						setAttributes( { aspectRatio: nextAspectRatio } )
 					}
@@ -138,10 +152,11 @@ const DimensionControls = ( {
 				resetAllFilter={ () => ( {
 					height: undefined,
 				} ) }
-				isShownByDefault={ true }
+				isShownByDefault
 				panelId={ clientId }
 			>
 				<UnitControl
+					__next40pxDefaultSize
 					label={ __( 'Height' ) }
 					labelPosition="top"
 					value={ height || '' }
@@ -160,10 +175,11 @@ const DimensionControls = ( {
 				resetAllFilter={ () => ( {
 					width: undefined,
 				} ) }
-				isShownByDefault={ true }
+				isShownByDefault
 				panelId={ clientId }
 			>
 				<UnitControl
+					__next40pxDefaultSize
 					label={ __( 'Width' ) }
 					labelPosition="top"
 					value={ width || '' }
@@ -186,10 +202,11 @@ const DimensionControls = ( {
 					resetAllFilter={ () => ( {
 						scale: DEFAULT_SCALE,
 					} ) }
-					isShownByDefault={ true }
+					isShownByDefault
 					panelId={ clientId }
 				>
 					<ToggleGroupControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ scaleLabel }
 						value={ scale }
@@ -219,6 +236,7 @@ const DimensionControls = ( {
 					panelId={ clientId }
 				>
 					<SelectControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ __( 'Resolution' ) }
 						value={ sizeSlug || DEFAULT_SIZE }
@@ -230,7 +248,7 @@ const DimensionControls = ( {
 					/>
 				</ToolsPanelItem>
 			) }
-		</InspectorControls>
+		</>
 	);
 };
 
diff --git a/packages/block-library/src/post-featured-image/edit.js b/packages/block-library/src/post-featured-image/edit.js
index 843f1cf66cdfcd..dff34379e4f3b4 100644
--- a/packages/block-library/src/post-featured-image/edit.js
+++ b/packages/block-library/src/post-featured-image/edit.js
@@ -1,19 +1,20 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
+import { isBlobURL } from '@wordpress/blob';
 import { useEntityProp, store as coreStore } from '@wordpress/core-data';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
-	MenuItem,
 	ToggleControl,
 	PanelBody,
 	Placeholder,
 	Button,
+	Spinner,
 	TextControl,
 } from '@wordpress/components';
 import {
@@ -22,9 +23,11 @@ import {
 	MediaPlaceholder,
 	MediaReplaceFlow,
 	useBlockProps,
-	store as blockEditorStore,
 	__experimentalUseBorderProps as useBorderProps,
+	__experimentalGetShadowClassesAndStyles as getShadowClassesAndStyles,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
+import { useMemo, useEffect, useState } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { upload } from '@wordpress/icons';
 import { store as noticesStore } from '@wordpress/notices';
@@ -33,6 +36,7 @@ import { store as noticesStore } from '@wordpress/notices';
  * Internal dependencies
  */
 import DimensionControls from './dimension-controls';
+import OverlayControls from './overlay-controls';
 import Overlay from './overlay';
 
 const ALLOWED_MEDIA_TYPES = [ 'image' ];
@@ -64,14 +68,45 @@ export default function PostFeaturedImageEdit( {
 		sizeSlug,
 		rel,
 		linkTarget,
+		useFirstImageFromPost,
 	} = attributes;
-	const [ featuredImage, setFeaturedImage ] = useEntityProp(
+	const [ temporaryURL, setTemporaryURL ] = useState();
+
+	const [ storedFeaturedImage, setFeaturedImage ] = useEntityProp(
 		'postType',
 		postTypeSlug,
 		'featured_media',
 		postId
 	);
 
+	// Fallback to post content if no featured image is set.
+	// This is needed for the "Use first image from post" option.
+	const [ postContent ] = useEntityProp(
+		'postType',
+		postTypeSlug,
+		'content',
+		postId
+	);
+
+	const featuredImage = useMemo( () => {
+		if ( storedFeaturedImage ) {
+			return storedFeaturedImage;
+		}
+
+		if ( ! useFirstImageFromPost ) {
+			return;
+		}
+
+		const imageOpener =
+			/<!--\s+wp:(?:core\/)?image\s+(?<attrs>{(?:(?:[^}]+|}+(?=})|(?!}\s+\/?-->).)*)?}\s+)?-->/.exec(
+				postContent
+			);
+		const imageId =
+			imageOpener?.groups?.attrs &&
+			JSON.parse( imageOpener.groups.attrs )?.id;
+		return imageId;
+	}, [ storedFeaturedImage, useFirstImageFromPost, postContent ] );
+
 	const { media, postType, postPermalink } = useSelect(
 		( select ) => {
 			const { getMedia, getPostType, getEditedEntityRecord } =
@@ -95,36 +130,29 @@ export default function PostFeaturedImageEdit( {
 
 	const mediaUrl = getMediaSourceUrlBySizeSlug( media, sizeSlug );
 
-	const imageSizes = useSelect(
-		( select ) => select( blockEditorStore ).getSettings().imageSizes,
-		[]
-	);
-	const imageSizeOptions = imageSizes
-		.filter( ( { slug } ) => {
-			return media?.media_details?.sizes?.[ slug ]?.source_url;
-		} )
-		.map( ( { name, slug } ) => ( {
-			value: slug,
-			label: name,
-		} ) );
-
 	const blockProps = useBlockProps( {
 		style: { width, height, aspectRatio },
+		className: clsx( {
+			'is-transient': temporaryURL,
+		} ),
 	} );
 	const borderProps = useBorderProps( attributes );
+	const shadowProps = getShadowClassesAndStyles( attributes );
+	const blockEditingMode = useBlockEditingMode();
 
 	const placeholder = ( content ) => {
 		return (
 			<Placeholder
-				className={ classnames(
+				className={ clsx(
 					'block-editor-media-placeholder',
 					borderProps.className
 				) }
-				withIllustration={ true }
+				withIllustration
 				style={ {
 					height: !! aspectRatio && '100%',
 					width: !! aspectRatio && '100%',
 					...borderProps.style,
+					...shadowProps.style,
 				} }
 			>
 				{ content }
@@ -136,21 +164,42 @@ export default function PostFeaturedImageEdit( {
 		if ( value?.id ) {
 			setFeaturedImage( value.id );
 		}
+
+		if ( value?.url && isBlobURL( value.url ) ) {
+			setTemporaryURL( value.url );
+		}
 	};
 
+	// Reset temporary url when media is available.
+	useEffect( () => {
+		if ( mediaUrl && temporaryURL ) {
+			setTemporaryURL();
+		}
+	}, [ mediaUrl, temporaryURL ] );
+
 	const { createErrorNotice } = useDispatch( noticesStore );
 	const onUploadError = ( message ) => {
 		createErrorNotice( message, { type: 'snackbar' } );
+		setTemporaryURL();
 	};
 
-	const controls = (
+	const controls = blockEditingMode === 'default' && (
 		<>
-			<DimensionControls
-				clientId={ clientId }
-				attributes={ attributes }
-				setAttributes={ setAttributes }
-				imageSizeOptions={ imageSizeOptions }
-			/>
+			<InspectorControls group="color">
+				<OverlayControls
+					attributes={ attributes }
+					setAttributes={ setAttributes }
+					clientId={ clientId }
+				/>
+			</InspectorControls>
+			<InspectorControls group="dimensions">
+				<DimensionControls
+					clientId={ clientId }
+					attributes={ attributes }
+					setAttributes={ setAttributes }
+					media={ media }
+				/>
+			</InspectorControls>
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
 					<ToggleControl
@@ -180,6 +229,7 @@ export default function PostFeaturedImageEdit( {
 								checked={ linkTarget === '_blank' }
 							/>
 							<TextControl
+								__next40pxDefaultSize
 								__nextHasNoMarginBottom
 								label={ __( 'Link rel' ) }
 								value={ rel }
@@ -193,12 +243,13 @@ export default function PostFeaturedImageEdit( {
 			</InspectorControls>
 		</>
 	);
+
 	let image;
 
 	/**
 	 * A Post Featured Image block should not have image replacement
 	 * or upload options in the following cases:
-	 * - Is placed in a Query Loop. This is a consious decision to
+	 * - Is placed in a Query Loop. This is a conscious decision to
 	 * prevent content editing of different posts in Query Loop, and
 	 * this could change in the future.
 	 * - Is in a context where it does not have a postId (for example
@@ -233,6 +284,7 @@ export default function PostFeaturedImageEdit( {
 	const label = __( 'Add a featured image' );
 	const imageStyles = {
 		...borderProps.style,
+		...shadowProps.style,
 		height: aspectRatio ? '100%' : height,
 		width: !! aspectRatio && '100%',
 		objectFit: !! ( height || aspectRatio ) && scale,
@@ -245,7 +297,7 @@ export default function PostFeaturedImageEdit( {
 	 * - It has no image assigned yet
 	 * Then display the placeholder with the image upload option.
 	 */
-	if ( ! featuredImage ) {
+	if ( ! featuredImage && ! temporaryURL ) {
 		image = (
 			<MediaPlaceholder
 				onSelect={ onSelectImage }
@@ -256,6 +308,7 @@ export default function PostFeaturedImageEdit( {
 				mediaLibraryButton={ ( { open } ) => {
 					return (
 						<Button
+							__next40pxDefaultSize
 							icon={ upload }
 							variant="primary"
 							label={ label }
@@ -271,24 +324,28 @@ export default function PostFeaturedImageEdit( {
 		);
 	} else {
 		// We have a Featured image so show a Placeholder if is loading.
-		image = ! media ? (
-			placeholder()
-		) : (
-			<img
-				className={ borderProps.className }
-				src={ mediaUrl }
-				alt={
-					media.alt_text
-						? sprintf(
-								// translators: %s: The image's alt text.
-								__( 'Featured image: %s' ),
-								media.alt_text
-						  )
-						: __( 'Featured image' )
-				}
-				style={ imageStyles }
-			/>
-		);
+		image =
+			! media && ! temporaryURL ? (
+				placeholder()
+			) : (
+				<>
+					<img
+						className={ borderProps.className }
+						src={ temporaryURL || mediaUrl }
+						alt={
+							media && media?.alt_text
+								? sprintf(
+										// translators: %s: The image's alt text.
+										__( 'Featured image: %s' ),
+										media.alt_text
+								  )
+								: __( 'Featured image' )
+						}
+						style={ imageStyles }
+					/>
+					{ temporaryURL && <Spinner /> }
+				</>
+			);
 	}
 
 	/**
@@ -299,7 +356,7 @@ export default function PostFeaturedImageEdit( {
 	 */
 	return (
 		<>
-			{ controls }
+			{ ! temporaryURL && controls }
 			{ !! media && ! isDescendentOfQueryLoop && (
 				<BlockControls group="other">
 					<MediaReplaceFlow
@@ -309,11 +366,8 @@ export default function PostFeaturedImageEdit( {
 						accept="image/*"
 						onSelect={ onSelectImage }
 						onError={ onUploadError }
-					>
-						<MenuItem onClick={ () => setFeaturedImage( 0 ) }>
-							{ __( 'Reset' ) }
-						</MenuItem>
-					</MediaReplaceFlow>
+						onReset={ () => setFeaturedImage( 0 ) }
+					/>
 				</BlockControls>
 			) }
 			<figure { ...blockProps }>
diff --git a/packages/block-library/src/post-featured-image/editor.scss b/packages/block-library/src/post-featured-image/editor.scss
index c17be8fac64664..5fab62c571b1cf 100644
--- a/packages/block-library/src/post-featured-image/editor.scss
+++ b/packages/block-library/src/post-featured-image/editor.scss
@@ -1,5 +1,5 @@
 // Provide special styling for the placeholder.
-// @todo: this particular minimal style of placeholder could be componentized further.
+// @todo this particular minimal style of placeholder could be componentized further.
 .wp-block-post-featured-image {
 	.block-editor-media-placeholder {
 		z-index: 1; // Need to put it above the overlay so the upload button works.
@@ -21,6 +21,7 @@
 
 		// Style the upload button.
 		.components-button {
+			margin: auto;
 			padding: 0;
 			display: flex;
 			justify-content: center;
@@ -115,6 +116,23 @@
 			pointer-events: auto;
 		}
 	}
+
+	// When image being uploaded.
+	&.is-transient {
+		position: relative;
+
+		img {
+			opacity: 0.3;
+		}
+
+		// Show spinner while image is being uploaded.
+		.components-spinner {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+		}
+	}
 }
 
 div[data-type="core/post-featured-image"] {
diff --git a/packages/block-library/src/post-featured-image/index.php b/packages/block-library/src/post-featured-image/index.php
index 4a7aa2f3d8ab94..815da4ee63fe19 100644
--- a/packages/block-library/src/post-featured-image/index.php
+++ b/packages/block-library/src/post-featured-image/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/post-featured-image` block on the server.
  *
+ * @since 5.8.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -48,15 +50,53 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
 	if ( ! empty( $attributes['scale'] ) ) {
 		$extra_styles .= "object-fit:{$attributes['scale']};";
 	}
+	if ( ! empty( $attributes['style']['shadow'] ) ) {
+		$shadow_styles = wp_style_engine_get_styles( array( 'shadow' => $attributes['style']['shadow'] ) );
+
+		if ( ! empty( $shadow_styles['css'] ) ) {
+			$extra_styles .= $shadow_styles['css'];
+		}
+	}
 
 	if ( ! empty( $extra_styles ) ) {
 		$attr['style'] = empty( $attr['style'] ) ? $extra_styles : $attr['style'] . $extra_styles;
 	}
 
 	$featured_image = get_the_post_thumbnail( $post_ID, $size_slug, $attr );
+
+	// Get the first image from the post.
+	if ( $attributes['useFirstImageFromPost'] && ! $featured_image ) {
+		$content_post = get_post( $post_ID );
+		$content      = $content_post->post_content;
+		$processor    = new WP_HTML_Tag_Processor( $content );
+
+		/*
+		 * Transfer the image tag from the post into a new text snippet.
+		 * Because the HTML API doesn't currently expose a way to extract
+		 * HTML substrings this is necessary as a workaround. Of note, this
+		 * is different than directly extracting the IMG tag:
+		 * - If there are duplicate attributes in the source there will only be one in the output.
+		 * - If there are single-quoted or unquoted attributes they will be double-quoted in the output.
+		 * - If there are named character references in the attribute values they may be replaced with their direct code points. E.g. `&hellip;` becomes `…`.
+		 * In the future there will likely be a mechanism to copy snippets of HTML from
+		 * one document into another, via the HTML Processor's `get_outer_html()` or
+		 * equivalent. When that happens it would be appropriate to replace this custom
+		 * code with that canonical code.
+		 */
+		if ( $processor->next_tag( 'img' ) ) {
+			$tag_html = new WP_HTML_Tag_Processor( '<img>' );
+			$tag_html->next_tag();
+			foreach ( $processor->get_attribute_names_with_prefix( '' ) as $name ) {
+				$tag_html->set_attribute( $name, $processor->get_attribute( $name ) );
+			}
+			$featured_image = $tag_html->get_updated_html();
+		}
+	}
+
 	if ( ! $featured_image ) {
 		return '';
 	}
+
 	if ( $is_link ) {
 		$link_target    = $attributes['linkTarget'];
 		$rel            = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
@@ -94,6 +134,8 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
 /**
  * Generate markup for the HTML element that will be used for the overlay.
  *
+ * @since 6.1.0
+ *
  * @param array $attributes Block attributes.
  *
  * @return string HTML markup in string format.
@@ -160,6 +202,8 @@ function get_block_core_post_featured_image_overlay_element_markup( $attributes
  * Generates class names and styles to apply the border support styles for
  * the Post Featured Image block.
  *
+ * @since 6.1.0
+ *
  * @param array $attributes The block attributes.
  * @return array The border-related classnames and styles for the block.
  */
@@ -210,6 +254,8 @@ function get_block_core_post_featured_image_border_attributes( $attributes ) {
 
 /**
  * Registers the `core/post-featured-image` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_post_featured_image() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-featured-image/overlay-controls.js b/packages/block-library/src/post-featured-image/overlay-controls.js
new file mode 100644
index 00000000000000..3dabb60f77fb18
--- /dev/null
+++ b/packages/block-library/src/post-featured-image/overlay-controls.js
@@ -0,0 +1,87 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	RangeControl,
+	__experimentalToolsPanelItem as ToolsPanelItem,
+} from '@wordpress/components';
+import {
+	withColors,
+	__experimentalColorGradientSettingsDropdown as ColorGradientSettingsDropdown,
+	__experimentalUseGradient as useGradient,
+	__experimentalUseMultipleOriginColorsAndGradients as useMultipleOriginColorsAndGradients,
+} from '@wordpress/block-editor';
+import { compose } from '@wordpress/compose';
+import { __ } from '@wordpress/i18n';
+
+const Overlay = ( {
+	clientId,
+	attributes,
+	setAttributes,
+	overlayColor,
+	setOverlayColor,
+} ) => {
+	const { dimRatio } = attributes;
+	const { gradientValue, setGradient } = useGradient();
+	const colorGradientSettings = useMultipleOriginColorsAndGradients();
+
+	if ( ! colorGradientSettings.hasColorsOrGradients ) {
+		return null;
+	}
+
+	return (
+		<>
+			<ColorGradientSettingsDropdown
+				__experimentalIsRenderedInSidebar
+				settings={ [
+					{
+						colorValue: overlayColor.color,
+						gradientValue,
+						label: __( 'Overlay' ),
+						onColorChange: setOverlayColor,
+						onGradientChange: setGradient,
+						isShownByDefault: true,
+						resetAllFilter: () => ( {
+							overlayColor: undefined,
+							customOverlayColor: undefined,
+							gradient: undefined,
+							customGradient: undefined,
+						} ),
+					},
+				] }
+				panelId={ clientId }
+				{ ...colorGradientSettings }
+			/>
+			<ToolsPanelItem
+				hasValue={ () => dimRatio !== undefined }
+				label={ __( 'Overlay opacity' ) }
+				onDeselect={ () => setAttributes( { dimRatio: 0 } ) }
+				resetAllFilter={ () => ( {
+					dimRatio: 0,
+				} ) }
+				isShownByDefault
+				panelId={ clientId }
+			>
+				<RangeControl
+					__nextHasNoMarginBottom
+					label={ __( 'Overlay opacity' ) }
+					value={ dimRatio }
+					onChange={ ( newDimRatio ) =>
+						setAttributes( {
+							dimRatio: newDimRatio,
+						} )
+					}
+					min={ 0 }
+					max={ 100 }
+					step={ 10 }
+					required
+					__next40pxDefaultSize
+				/>
+			</ToolsPanelItem>
+		</>
+	);
+};
+
+export default compose( [
+	withColors( { overlayColor: 'background-color' } ),
+] )( Overlay );
diff --git a/packages/block-library/src/post-featured-image/overlay.js b/packages/block-library/src/post-featured-image/overlay.js
index 33d7047e814921..2ddebd5d9de901 100644
--- a/packages/block-library/src/post-featured-image/overlay.js
+++ b/packages/block-library/src/post-featured-image/overlay.js
@@ -1,41 +1,27 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import {
-	RangeControl,
-	__experimentalToolsPanelItem as ToolsPanelItem,
-} from '@wordpress/components';
-import {
-	InspectorControls,
 	withColors,
-	__experimentalColorGradientSettingsDropdown as ColorGradientSettingsDropdown,
 	__experimentalUseGradient,
 	__experimentalUseMultipleOriginColorsAndGradients as useMultipleOriginColorsAndGradients,
 	__experimentalUseBorderProps as useBorderProps,
 } from '@wordpress/block-editor';
 import { compose } from '@wordpress/compose';
-import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { dimRatioToClass } from './utils';
 
-const Overlay = ( {
-	clientId,
-	attributes,
-	setAttributes,
-	overlayColor,
-	setOverlayColor,
-} ) => {
+const Overlay = ( { attributes, overlayColor } ) => {
 	const { dimRatio } = attributes;
-	const { gradientClass, gradientValue, setGradient } =
-		__experimentalUseGradient();
+	const { gradientClass, gradientValue } = __experimentalUseGradient();
 	const colorGradientSettings = useMultipleOriginColorsAndGradients();
 
 	const borderProps = useBorderProps( attributes );
@@ -45,79 +31,26 @@ const Overlay = ( {
 		...borderProps.style,
 	};
 
-	if ( ! colorGradientSettings.hasColorsOrGradients ) {
+	if ( ! colorGradientSettings.hasColorsOrGradients || ! dimRatio ) {
 		return null;
 	}
 
 	return (
-		<>
-			{ !! dimRatio && (
-				<span
-					aria-hidden="true"
-					className={ classnames(
-						'wp-block-post-featured-image__overlay',
-						dimRatioToClass( dimRatio ),
-						{
-							[ overlayColor.class ]: overlayColor.class,
-							'has-background-dim': dimRatio !== undefined,
-							'has-background-gradient': gradientValue,
-							[ gradientClass ]: gradientClass,
-						},
-						borderProps.className
-					) }
-					style={ overlayStyles }
-				/>
+		<span
+			aria-hidden="true"
+			className={ clsx(
+				'wp-block-post-featured-image__overlay',
+				dimRatioToClass( dimRatio ),
+				{
+					[ overlayColor.class ]: overlayColor.class,
+					'has-background-dim': dimRatio !== undefined,
+					'has-background-gradient': gradientValue,
+					[ gradientClass ]: gradientClass,
+				},
+				borderProps.className
 			) }
-			<InspectorControls group="color">
-				<ColorGradientSettingsDropdown
-					__experimentalIsRenderedInSidebar
-					settings={ [
-						{
-							colorValue: overlayColor.color,
-							gradientValue,
-							label: __( 'Overlay' ),
-							onColorChange: setOverlayColor,
-							onGradientChange: setGradient,
-							isShownByDefault: true,
-							resetAllFilter: () => ( {
-								overlayColor: undefined,
-								customOverlayColor: undefined,
-								gradient: undefined,
-								customGradient: undefined,
-							} ),
-						},
-					] }
-					panelId={ clientId }
-					{ ...colorGradientSettings }
-				/>
-				<ToolsPanelItem
-					hasValue={ () => dimRatio !== undefined }
-					label={ __( 'Overlay opacity' ) }
-					onDeselect={ () => setAttributes( { dimRatio: 0 } ) }
-					resetAllFilter={ () => ( {
-						dimRatio: 0,
-					} ) }
-					isShownByDefault
-					panelId={ clientId }
-				>
-					<RangeControl
-						__nextHasNoMarginBottom
-						label={ __( 'Overlay opacity' ) }
-						value={ dimRatio }
-						onChange={ ( newDimRatio ) =>
-							setAttributes( {
-								dimRatio: newDimRatio,
-							} )
-						}
-						min={ 0 }
-						max={ 100 }
-						step={ 10 }
-						required
-						__next40pxDefaultSize
-					/>
-				</ToolsPanelItem>
-			</InspectorControls>
-		</>
+			style={ overlayStyles }
+		/>
 	);
 };
 
diff --git a/packages/block-library/src/post-featured-image/style.scss b/packages/block-library/src/post-featured-image/style.scss
index e740b8c56e608c..70022d82902f84 100644
--- a/packages/block-library/src/post-featured-image/style.scss
+++ b/packages/block-library/src/post-featured-image/style.scss
@@ -5,7 +5,7 @@
 		display: block;
 		height: 100%;
 	}
-	img {
+	:where(img) {
 		max-width: 100%;
 		width: 100%;
 		height: auto;
diff --git a/packages/block-library/src/post-navigation-link/block.json b/packages/block-library/src/post-navigation-link/block.json
index e1b6d4fa90a40c..5f1b295119822a 100644
--- a/packages/block-library/src/post-navigation-link/block.json
+++ b/packages/block-library/src/post-navigation-link/block.json
@@ -28,8 +28,19 @@
 		"arrow": {
 			"type": "string",
 			"default": "none"
+		},
+		"taxonomy": {
+			"type": "string",
+			"default": ""
 		}
 	},
+	"example": {
+		"attributes": {
+			"label": "Next post",
+			"arrow": "arrow"
+		}
+	},
+	"usesContext": [ "postType" ],
 	"supports": {
 		"reusable": false,
 		"html": false,
@@ -49,6 +60,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-post-navigation-link"
diff --git a/packages/block-library/src/post-navigation-link/edit.js b/packages/block-library/src/post-navigation-link/edit.js
index f899788428bcdb..e27d094feb79ab 100644
--- a/packages/block-library/src/post-navigation-link/edit.js
+++ b/packages/block-library/src/post-navigation-link/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -10,6 +10,7 @@ import {
 	__experimentalToggleGroupControl as ToggleGroupControl,
 	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 	ToggleControl,
+	SelectControl,
 	PanelBody,
 } from '@wordpress/components';
 import {
@@ -20,9 +21,20 @@ import {
 	useBlockProps,
 } from '@wordpress/block-editor';
 import { __, _x } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
 
 export default function PostNavigationLinkEdit( {
-	attributes: { type, label, showTitle, textAlign, linkLabel, arrow },
+	context: { postType },
+	attributes: {
+		type,
+		label,
+		showTitle,
+		textAlign,
+		linkLabel,
+		arrow,
+		taxonomy,
+	},
 	setAttributes,
 } ) {
 	const isNext = type === 'next';
@@ -37,16 +49,48 @@ export default function PostNavigationLinkEdit( {
 	const displayArrow = arrowMap[ arrow ];
 
 	if ( showTitle ) {
-		/* translators: Label before for next and previous post. There is a space after the colon. */
-		placeholder = isNext ? __( 'Next: ' ) : __( 'Previous: ' );
+		placeholder = isNext
+			? /* translators: Label before for next and previous post. There is a space after the colon. */
+			  __( 'Next: ' ) // eslint-disable-line @wordpress/i18n-no-flanking-whitespace
+			: /* translators: Label before for next and previous post. There is a space after the colon. */
+			  __( 'Previous: ' ); // eslint-disable-line @wordpress/i18n-no-flanking-whitespace
 	}
 
 	const ariaLabel = isNext ? __( 'Next post' ) : __( 'Previous post' );
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
+
+	const taxonomies = useSelect(
+		( select ) => {
+			const { getTaxonomies } = select( coreStore );
+			const filteredTaxonomies = getTaxonomies( {
+				type: postType,
+				per_page: -1,
+			} );
+			return filteredTaxonomies;
+		},
+		[ postType ]
+	);
+	const getTaxonomyOptions = () => {
+		const selectOption = {
+			label: __( 'Unfiltered' ),
+			value: '',
+		};
+		const taxonomyOptions = ( taxonomies ?? [] )
+			.filter( ( { visibility } ) => !! visibility?.publicly_queryable )
+			.map( ( item ) => {
+				return {
+					value: item.slug,
+					label: item.name,
+				};
+			} );
+
+		return [ selectOption, ...taxonomyOptions ];
+	};
+
 	return (
 		<>
 			<InspectorControls>
@@ -79,6 +123,7 @@ export default function PostNavigationLinkEdit( {
 						/>
 					) }
 					<ToggleGroupControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ __( 'Arrow' ) }
 						value={ arrow }
@@ -114,6 +159,23 @@ export default function PostNavigationLinkEdit( {
 					</ToggleGroupControl>
 				</PanelBody>
 			</InspectorControls>
+			<InspectorControls group="advanced">
+				<SelectControl
+					__next40pxDefaultSize
+					__nextHasNoMarginBottom
+					label={ __( 'Filter by taxonomy' ) }
+					value={ taxonomy }
+					options={ getTaxonomyOptions() }
+					onChange={ ( value ) =>
+						setAttributes( {
+							taxonomy: value,
+						} )
+					}
+					help={ __(
+						'Only link to posts that have the same taxonomy terms as the current post. For example the same tags or categories.'
+					) }
+				/>
+			</InspectorControls>
 			<BlockControls>
 				<AlignmentToolbar
 					value={ textAlign }
@@ -132,6 +194,7 @@ export default function PostNavigationLinkEdit( {
 				) }
 				<RichText
 					tagName="a"
+					identifier="label"
 					aria-label={ ariaLabel }
 					placeholder={ placeholder }
 					value={ label }
@@ -151,7 +214,7 @@ export default function PostNavigationLinkEdit( {
 				{ isNext && displayArrow && (
 					<span
 						className={ `wp-block-post-navigation-link__arrow-next is-arrow-${ arrow }` }
-						aria-hidden={ true }
+						aria-hidden
 					>
 						{ displayArrow }
 					</span>
diff --git a/packages/block-library/src/post-navigation-link/index.php b/packages/block-library/src/post-navigation-link/index.php
index add112c388c6eb..8162b74d8af17f 100644
--- a/packages/block-library/src/post-navigation-link/index.php
+++ b/packages/block-library/src/post-navigation-link/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/post-navigation-link` block on the server.
  *
+ * @since 5.9.0
+ *
  * @param array  $attributes Block attributes.
  * @param string $content    Block default content.
  *
@@ -99,10 +101,21 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
 		}
 	}
 
-	// The dynamic portion of the function name, `$navigation_type`,
-	// refers to the type of adjacency, 'next' or 'previous'.
+	/*
+	 * The dynamic portion of the function name, `$navigation_type`,
+	 * Refers to the type of adjacency, 'next' or 'previous'.
+	 *
+	 * @see https://developer.wordpress.org/reference/functions/get_previous_post_link/
+	 * @see https://developer.wordpress.org/reference/functions/get_next_post_link/
+	 */
 	$get_link_function = "get_{$navigation_type}_post_link";
-	$content           = $get_link_function( $format, $link );
+
+	if ( ! empty( $attributes['taxonomy'] ) ) {
+		$content = $get_link_function( $format, $link, true, '', $attributes['taxonomy'] );
+	} else {
+		$content = $get_link_function( $format, $link );
+	}
+
 	return sprintf(
 		'<div %1$s>%2$s</div>',
 		$wrapper_attributes,
@@ -112,6 +125,8 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
 
 /**
  * Registers the `core/post-navigation-link` block on the server.
+ *
+ * @since 5.9.0
  */
 function register_block_core_post_navigation_link() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-navigation-link/variations.js b/packages/block-library/src/post-navigation-link/variations.js
index 6d3e7f76cd7fa5..4f52b21338af1e 100644
--- a/packages/block-library/src/post-navigation-link/variations.js
+++ b/packages/block-library/src/post-navigation-link/variations.js
@@ -15,6 +15,12 @@ const variations = [
 		icon: next,
 		attributes: { type: 'next' },
 		scope: [ 'inserter', 'transform' ],
+		example: {
+			attributes: {
+				label: 'Next post',
+				arrow: 'arrow',
+			},
+		},
 	},
 	{
 		name: 'post-previous',
@@ -25,6 +31,12 @@ const variations = [
 		icon: previous,
 		attributes: { type: 'previous' },
 		scope: [ 'inserter', 'transform' ],
+		example: {
+			attributes: {
+				label: 'Previous post',
+				arrow: 'arrow',
+			},
+		},
 	},
 ];
 
@@ -34,7 +46,9 @@ const variations = [
  *  Block by providing its attributes.
  */
 variations.forEach( ( variation ) => {
-	if ( variation.isActive ) return;
+	if ( variation.isActive ) {
+		return;
+	}
 	variation.isActive = ( blockAttributes, variationAttributes ) =>
 		blockAttributes.type === variationAttributes.type;
 } );
diff --git a/packages/block-library/src/post-template/block.json b/packages/block-library/src/post-template/block.json
index d2f7c09693121c..6a575855583527 100644
--- a/packages/block-library/src/post-template/block.json
+++ b/packages/block-library/src/post-template/block.json
@@ -48,6 +48,9 @@
 			"__experimentalDefaultControls": {
 				"blockGap": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-post-template",
diff --git a/packages/block-library/src/post-template/edit.js b/packages/block-library/src/post-template/edit.js
index 2e668674e85301..a9e279ee2c3052 100644
--- a/packages/block-library/src/post-template/edit.js
+++ b/packages/block-library/src/post-template/edit.js
@@ -1,14 +1,14 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { memo, useMemo, useState } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 import {
 	BlockControls,
 	BlockContextProvider,
@@ -27,9 +27,9 @@ const TEMPLATE = [
 	[ 'core/post-excerpt' ],
 ];
 
-function PostTemplateInnerBlocks() {
+function PostTemplateInnerBlocks( { classList } ) {
 	const innerBlocksProps = useInnerBlocksProps(
-		{ className: 'wp-block-post' },
+		{ className: clsx( 'wp-block-post', classList ) },
 		{ template: TEMPLATE, __unstableDisableLayoutClassNames: true }
 	);
 	return <li { ...innerBlocksProps } />;
@@ -38,13 +38,14 @@ function PostTemplateInnerBlocks() {
 function PostTemplateBlockPreview( {
 	blocks,
 	blockContextId,
+	classList,
 	isHidden,
 	setActiveBlockContextId,
 } ) {
 	const blockPreviewProps = useBlockPreview( {
 		blocks,
 		props: {
-			className: 'wp-block-post',
+			className: clsx( 'wp-block-post', classList ),
 		},
 	} );
 
@@ -89,6 +90,7 @@ export default function PostTemplateEdit( {
 			taxQuery,
 			parents,
 			pages,
+			format,
 			// We gather extra query args to pass to the REST API call.
 			// This way extenders of Query Loop can add their own query args,
 			// and have accurate previews in the editor.
@@ -108,11 +110,6 @@ export default function PostTemplateEdit( {
 		( select ) => {
 			const { getEntityRecords, getTaxonomies } = select( coreStore );
 			const { getBlocks } = select( blockEditorStore );
-			const taxonomies = getTaxonomies( {
-				type: postType,
-				per_page: -1,
-				context: 'view',
-			} );
 			const templateCategory =
 				inherit &&
 				templateSlug?.startsWith( 'category-' ) &&
@@ -129,6 +126,11 @@ export default function PostTemplateEdit( {
 			};
 			// There is no need to build the taxQuery if we inherit.
 			if ( taxQuery && ! inherit ) {
+				const taxonomies = getTaxonomies( {
+					type: postType,
+					per_page: -1,
+					context: 'view',
+				} );
 				// We have to build the tax query for the REST API and use as
 				// keys the taxonomies `rest_base` with the `term ids` as values.
 				const builtTaxQuery = Object.entries( taxQuery ).reduce(
@@ -162,6 +164,10 @@ export default function PostTemplateEdit( {
 			if ( parents?.length ) {
 				query.parent = parents;
 			}
+			if ( format?.length ) {
+				query.format = format;
+			}
+
 			// If sticky is not set, it will return all posts in the results.
 			// If sticky is set to `only`, it will limit the results to sticky posts only.
 			// If it is anything else, it will exclude sticky posts from results. For the record the value stored is `exclude`.
@@ -204,6 +210,7 @@ export default function PostTemplateEdit( {
 			templateSlug,
 			taxQuery,
 			parents,
+			format,
 			restQueryArgs,
 			previewPostType,
 		]
@@ -213,12 +220,13 @@ export default function PostTemplateEdit( {
 			posts?.map( ( post ) => ( {
 				postType: post.type,
 				postId: post.id,
+				classList: post.class_list ?? '',
 			} ) ),
 		[ posts ]
 	);
 
 	const blockProps = useBlockProps( {
-		className: classnames( __unstableLayoutClassNames, {
+		className: clsx( __unstableLayoutClassNames, {
 			[ `columns-${ columnCount }` ]:
 				layoutType === 'grid' && columnCount, // Ensure column count is flagged via classname for backwards compatibility.
 		} ),
@@ -244,13 +252,13 @@ export default function PostTemplateEdit( {
 	const displayLayoutControls = [
 		{
 			icon: list,
-			title: __( 'List view' ),
+			title: _x( 'List view', 'Post template block display setting' ),
 			onClick: () => setDisplayLayout( { type: 'default' } ),
 			isActive: layoutType === 'default' || layoutType === 'constrained',
 		},
 		{
 			icon: grid,
-			title: __( 'Grid view' ),
+			title: _x( 'Grid view', 'Post template block display setting' ),
 			onClick: () =>
 				setDisplayLayout( {
 					type: 'grid',
@@ -280,11 +288,14 @@ export default function PostTemplateEdit( {
 							{ blockContext.postId ===
 							( activeBlockContextId ||
 								blockContexts[ 0 ]?.postId ) ? (
-								<PostTemplateInnerBlocks />
+								<PostTemplateInnerBlocks
+									classList={ blockContext.classList }
+								/>
 							) : null }
 							<MemoizedPostTemplateBlockPreview
 								blocks={ blocks }
 								blockContextId={ blockContext.postId }
+								classList={ blockContext.classList }
 								setActiveBlockContextId={
 									setActiveBlockContextId
 								}
diff --git a/packages/block-library/src/post-template/index.php b/packages/block-library/src/post-template/index.php
index 2c7502ca3b6653..9126355c096a57 100644
--- a/packages/block-library/src/post-template/index.php
+++ b/packages/block-library/src/post-template/index.php
@@ -8,6 +8,8 @@
 /**
  * Determines whether a block list contains a block that uses the featured image.
  *
+ * @since 6.0.0
+ *
  * @param WP_Block_List $inner_blocks Inner block instance.
  *
  * @return bool Whether the block list contains a block that uses the featured image.
@@ -36,6 +38,8 @@ function block_core_post_template_uses_featured_image( $inner_blocks ) {
  *
  * @since 6.3.0 Changed render_block_context priority to `1`.
  *
+ * @global WP_Query $wp_query WordPress Query object.
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -143,6 +147,8 @@ function render_block_core_post_template( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/post-template` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_post_template() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-template/style.scss b/packages/block-library/src/post-template/style.scss
index 4af30e30b23098..806aadc77470eb 100644
--- a/packages/block-library/src/post-template/style.scss
+++ b/packages/block-library/src/post-template/style.scss
@@ -5,10 +5,6 @@
 	list-style: none;
 	padding: 0;
 
-	// Unset background colors that can be inherited from Global Styles with extra specificity.
-	&.wp-block-post-template {
-		background: none;
-	}
 	// These rules no longer apply but should be kept for backwards compatibility.
 	&.is-flex-container {
 		flex-direction: row;
diff --git a/packages/block-library/src/post-terms/block.json b/packages/block-library/src/post-terms/block.json
index 0da7fb02f8134f..165f50109616e7 100644
--- a/packages/block-library/src/post-terms/block.json
+++ b/packages/block-library/src/post-terms/block.json
@@ -27,6 +27,9 @@
 		}
 	},
 	"usesContext": [ "postId", "postType" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"html": false,
 		"color": {
@@ -54,6 +57,21 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"style": "wp-block-post-terms"
diff --git a/packages/block-library/src/post-terms/edit.js b/packages/block-library/src/post-terms/edit.js
index b5eb0bb9e3bfb6..13d5b61ad13d6b 100644
--- a/packages/block-library/src/post-terms/edit.js
+++ b/packages/block-library/src/post-terms/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -49,7 +49,9 @@ export default function PostTermsEdit( {
 
 	const selectedTerm = useSelect(
 		( select ) => {
-			if ( ! term ) return {};
+			if ( ! term ) {
+				return {};
+			}
 			const { getTaxonomy } = select( coreStore );
 			const taxonomy = getTaxonomy( term );
 			return taxonomy?.visibility?.publicly_queryable ? taxonomy : {};
@@ -63,7 +65,7 @@ export default function PostTermsEdit( {
 	const hasPost = postId && postType;
 	const blockInformation = useBlockDisplayInformation( clientId );
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 			[ `taxonomy-${ term }` ]: term,
 		} ),
@@ -81,6 +83,7 @@ export default function PostTermsEdit( {
 			</BlockControls>
 			<InspectorControls group="advanced">
 				<TextControl
+					__next40pxDefaultSize
 					__nextHasNoMarginBottom
 					autoComplete="off"
 					label={ __( 'Separator' ) }
@@ -95,6 +98,7 @@ export default function PostTermsEdit( {
 				{ isLoading && hasPost && <Spinner /> }
 				{ ! isLoading && ( isSelected || prefix ) && (
 					<RichText
+						identifier="prefix"
 						allowedFormats={ ALLOWED_FORMATS }
 						className="wp-block-post-terms__prefix"
 						aria-label={ __( 'Prefix' ) }
@@ -138,6 +142,7 @@ export default function PostTermsEdit( {
 						__( 'Term items not found.' ) ) }
 				{ ! isLoading && ( isSelected || suffix ) && (
 					<RichText
+						identifier="suffix"
 						allowedFormats={ ALLOWED_FORMATS }
 						className="wp-block-post-terms__suffix"
 						aria-label={ __( 'Suffix' ) }
diff --git a/packages/block-library/src/post-terms/index.php b/packages/block-library/src/post-terms/index.php
index c97155b81e3a95..3e7a05f10117e4 100644
--- a/packages/block-library/src/post-terms/index.php
+++ b/packages/block-library/src/post-terms/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/post-terms` block on the server.
  *
+ * @since 5.8.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -22,11 +24,6 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$post_terms = get_the_terms( $block->context['postId'], $attributes['term'] );
-	if ( is_wp_error( $post_terms ) || empty( $post_terms ) ) {
-		return '';
-	}
-
 	$classes = array( 'taxonomy-' . $attributes['term'] );
 	if ( isset( $attributes['textAlign'] ) ) {
 		$classes[] = 'has-text-align-' . $attributes['textAlign'];
@@ -49,19 +46,29 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
 		$suffix = '<span class="wp-block-post-terms__suffix">' . $attributes['suffix'] . '</span>' . $suffix;
 	}
 
-	return get_the_term_list(
+	$post_terms = get_the_term_list(
 		$block->context['postId'],
 		$attributes['term'],
 		wp_kses_post( $prefix ),
 		'<span class="wp-block-post-terms__separator">' . esc_html( $separator ) . '</span>',
 		wp_kses_post( $suffix )
 	);
+
+	if ( is_wp_error( $post_terms ) || empty( $post_terms ) ) {
+		return '';
+	}
+
+	return $post_terms;
 }
 
 /**
- * Registers the `core/post-terms` block on the server.
+ * Returns the available variations for the `core/post-terms` block.
+ *
+ * @since 6.5.0
+ *
+ * @return array The available variations for the block.
  */
-function register_block_core_post_terms() {
+function block_core_post_terms_build_variations() {
 	$taxonomies = get_taxonomies(
 		array(
 			'publicly_queryable' => true,
@@ -103,11 +110,20 @@ function register_block_core_post_terms() {
 		}
 	}
 
+	return array_merge( $built_ins, $custom_variations );
+}
+
+/**
+ * Registers the `core/post-terms` block on the server.
+ *
+ * @since 5.8.0
+ */
+function register_block_core_post_terms() {
 	register_block_type_from_metadata(
 		__DIR__ . '/post-terms',
 		array(
-			'render_callback' => 'render_block_core_post_terms',
-			'variations'      => array_merge( $built_ins, $custom_variations ),
+			'render_callback'    => 'render_block_core_post_terms',
+			'variation_callback' => 'block_core_post_terms_build_variations',
 		)
 	);
 }
diff --git a/packages/block-library/src/post-time-to-read/block.json b/packages/block-library/src/post-time-to-read/block.json
index 281e9bb1f1b210..ce0ab2be6c02f3 100644
--- a/packages/block-library/src/post-time-to-read/block.json
+++ b/packages/block-library/src/post-time-to-read/block.json
@@ -42,6 +42,15 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true
 		}
 	}
 }
diff --git a/packages/block-library/src/post-time-to-read/edit.js b/packages/block-library/src/post-time-to-read/edit.js
index 1689a6da71a5a1..abfdce6630a67d 100644
--- a/packages/block-library/src/post-time-to-read/edit.js
+++ b/packages/block-library/src/post-time-to-read/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -66,7 +66,7 @@ function PostTimeToReadEdit( { attributes, setAttributes, context } ) {
 		const minutesToRead = Math.max(
 			1,
 			Math.round(
-				wordCount( content, wordCountType ) / AVERAGE_READING_RATE
+				wordCount( content || '', wordCountType ) / AVERAGE_READING_RATE
 			)
 		);
 
@@ -78,7 +78,7 @@ function PostTimeToReadEdit( { attributes, setAttributes, context } ) {
 	}, [ contentStructure, blocks ] );
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/post-time-to-read/index.js b/packages/block-library/src/post-time-to-read/index.js
index 95b379f55f0b3f..039923161ca81d 100644
--- a/packages/block-library/src/post-time-to-read/index.js
+++ b/packages/block-library/src/post-time-to-read/index.js
@@ -12,6 +12,7 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/post-title/block.json b/packages/block-library/src/post-title/block.json
index 75a4fa3c3a60fa..ecb5053d6cd39e 100644
--- a/packages/block-library/src/post-title/block.json
+++ b/packages/block-library/src/post-title/block.json
@@ -15,6 +15,9 @@
 			"type": "number",
 			"default": 2
 		},
+		"levelOptions": {
+			"type": "array"
+		},
 		"isLink": {
 			"type": "boolean",
 			"default": false
@@ -29,6 +32,9 @@
 			"default": "_self"
 		}
 	},
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
@@ -57,6 +63,21 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"style": "wp-block-post-title"
diff --git a/packages/block-library/src/post-title/edit.js b/packages/block-library/src/post-title/edit.js
index 28d9b8cdcfd8ff..fdfb8e7c2c6cd2 100644
--- a/packages/block-library/src/post-title/edit.js
+++ b/packages/block-library/src/post-title/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -18,31 +18,37 @@ import {
 import { ToggleControl, TextControl, PanelBody } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
-import { useEntityProp } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { useCanEditEntity } from '../utils/hooks';
+import { useEntityProp, store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
 
 export default function PostTitleEdit( {
-	attributes: { level, textAlign, isLink, rel, linkTarget },
+	attributes: { level, levelOptions, textAlign, isLink, rel, linkTarget },
 	setAttributes,
 	context: { postType, postId, queryId },
 	insertBlocksAfter,
 } ) {
-	const TagName = 'h' + level;
+	const TagName = level === 0 ? 'p' : `h${ level }`;
 	const isDescendentOfQueryLoop = Number.isFinite( queryId );
-	/**
-	 * Hack: useCanEditEntity may trigger an OPTIONS request to the REST API via the canUser resolver.
-	 * However, when the Post Title is a descendant of a Query Loop block, the title cannot be edited.
-	 * In order to avoid these unnecessary requests, we call the hook without
-	 * the proper data, resulting in returning early without making them.
-	 */
-	const userCanEdit = useCanEditEntity(
-		'postType',
-		! isDescendentOfQueryLoop && postType,
-		postId
+	const userCanEdit = useSelect(
+		( select ) => {
+			/**
+			 * useCanEditEntity may trigger an OPTIONS request to the REST API
+			 * via the canUser resolver. However, when the Post Title is a
+			 * descendant of a Query Loop block, the title cannot be edited. In
+			 * order to avoid these unnecessary requests, we call the hook
+			 * without the proper data, resulting in returning early without
+			 * making them.
+			 */
+			if ( isDescendentOfQueryLoop ) {
+				return false;
+			}
+			return select( coreStore ).canUser( 'update', {
+				kind: 'postType',
+				name: postType,
+				id: postId,
+			} );
+		},
+		[ isDescendentOfQueryLoop, postType, postId ]
 	);
 	const [ rawTitle = '', setTitle, fullTitle ] = useEntityProp(
 		'postType',
@@ -55,7 +61,7 @@ export default function PostTitleEdit( {
 		insertBlocksAfter( createBlock( getDefaultBlockName() ) );
 	};
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
@@ -67,7 +73,7 @@ export default function PostTitleEdit( {
 		titleElement = userCanEdit ? (
 			<PlainText
 				tagName={ TagName }
-				placeholder={ __( 'No Title' ) }
+				placeholder={ __( 'No title' ) }
 				value={ rawTitle }
 				onChange={ setTitle }
 				__experimentalVersion={ 2 }
@@ -90,7 +96,7 @@ export default function PostTitleEdit( {
 					href={ link }
 					target={ linkTarget }
 					rel={ rel }
-					placeholder={ ! rawTitle.length ? __( 'No Title' ) : null }
+					placeholder={ ! rawTitle.length ? __( 'No title' ) : null }
 					value={ rawTitle }
 					onChange={ setTitle }
 					__experimentalVersion={ 2 }
@@ -115,53 +121,61 @@ export default function PostTitleEdit( {
 	return (
 		<>
 			{ blockEditingMode === 'default' && (
-				<BlockControls group="block">
-					<HeadingLevelDropdown
-						value={ level }
-						onChange={ ( newLevel ) =>
-							setAttributes( { level: newLevel } )
-						}
-					/>
-					<AlignmentControl
-						value={ textAlign }
-						onChange={ ( nextAlign ) => {
-							setAttributes( { textAlign: nextAlign } );
-						} }
-					/>
-				</BlockControls>
-			) }
-			<InspectorControls>
-				<PanelBody title={ __( 'Settings' ) }>
-					<ToggleControl
-						__nextHasNoMarginBottom
-						label={ __( 'Make title a link' ) }
-						onChange={ () => setAttributes( { isLink: ! isLink } ) }
-						checked={ isLink }
-					/>
-					{ isLink && (
-						<>
+				<>
+					<BlockControls group="block">
+						<HeadingLevelDropdown
+							value={ level }
+							options={ levelOptions }
+							onChange={ ( newLevel ) =>
+								setAttributes( { level: newLevel } )
+							}
+						/>
+						<AlignmentControl
+							value={ textAlign }
+							onChange={ ( nextAlign ) => {
+								setAttributes( { textAlign: nextAlign } );
+							} }
+						/>
+					</BlockControls>
+					<InspectorControls>
+						<PanelBody title={ __( 'Settings' ) }>
 							<ToggleControl
 								__nextHasNoMarginBottom
-								label={ __( 'Open in new tab' ) }
-								onChange={ ( value ) =>
-									setAttributes( {
-										linkTarget: value ? '_blank' : '_self',
-									} )
+								label={ __( 'Make title a link' ) }
+								onChange={ () =>
+									setAttributes( { isLink: ! isLink } )
 								}
-								checked={ linkTarget === '_blank' }
+								checked={ isLink }
 							/>
-							<TextControl
-								__nextHasNoMarginBottom
-								label={ __( 'Link rel' ) }
-								value={ rel }
-								onChange={ ( newRel ) =>
-									setAttributes( { rel: newRel } )
-								}
-							/>
-						</>
-					) }
-				</PanelBody>
-			</InspectorControls>
+							{ isLink && (
+								<>
+									<ToggleControl
+										__nextHasNoMarginBottom
+										label={ __( 'Open in new tab' ) }
+										onChange={ ( value ) =>
+											setAttributes( {
+												linkTarget: value
+													? '_blank'
+													: '_self',
+											} )
+										}
+										checked={ linkTarget === '_blank' }
+									/>
+									<TextControl
+										__next40pxDefaultSize
+										__nextHasNoMarginBottom
+										label={ __( 'Link rel' ) }
+										value={ rel }
+										onChange={ ( newRel ) =>
+											setAttributes( { rel: newRel } )
+										}
+									/>
+								</>
+							) }
+						</PanelBody>
+					</InspectorControls>
+				</>
+			) }
 			{ titleElement }
 		</>
 	);
diff --git a/packages/block-library/src/post-title/index.php b/packages/block-library/src/post-title/index.php
index d0eef8572ba139..ed27f2e4158eb4 100644
--- a/packages/block-library/src/post-title/index.php
+++ b/packages/block-library/src/post-title/index.php
@@ -33,7 +33,7 @@ function render_block_core_post_title( $attributes, $content, $block ) {
 
 	$tag_name = 'h2';
 	if ( isset( $attributes['level'] ) ) {
-		$tag_name = 'h' . $attributes['level'];
+		$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . (int) $attributes['level'];
 	}
 
 	if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
@@ -60,6 +60,8 @@ function render_block_core_post_title( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/post-title` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_post_title() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/post-title/style.scss b/packages/block-library/src/post-title/style.scss
index abeb4454bcb2c5..8dfd25b1a0786b 100644
--- a/packages/block-library/src/post-title/style.scss
+++ b/packages/block-library/src/post-title/style.scss
@@ -3,7 +3,14 @@
 	// This block has customizable padding, border-box makes that more predictable.
 	box-sizing: border-box;
 
-	a {
+	:where(a) {
 		display: inline-block;
+		font-family: inherit;
+		font-size: inherit;
+		font-style: inherit;
+		font-weight: inherit;
+		letter-spacing: inherit;
+		line-height: inherit;
+		text-decoration: inherit;
 	}
 }
diff --git a/packages/block-library/src/preformatted/block.json b/packages/block-library/src/preformatted/block.json
index ec6ea839385eb2..c25b8ce37093a5 100644
--- a/packages/block-library/src/preformatted/block.json
+++ b/packages/block-library/src/preformatted/block.json
@@ -8,12 +8,11 @@
 	"textdomain": "default",
 	"attributes": {
 		"content": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "pre",
-			"default": "",
 			"__unstablePreserveWhiteSpace": true,
-			"__experimentalRole": "content"
+			"role": "content"
 		}
 	},
 	"supports": {
@@ -41,6 +40,21 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"style": "wp-block-preformatted"
diff --git a/packages/block-library/src/private-apis.js b/packages/block-library/src/private-apis.js
new file mode 100644
index 00000000000000..3cee106895d6d7
--- /dev/null
+++ b/packages/block-library/src/private-apis.js
@@ -0,0 +1,13 @@
+/**
+ * Internal dependencies
+ */
+import { default as BlockKeyboardShortcuts } from './block-keyboard-shortcuts';
+import { lock } from './lock-unlock';
+
+/**
+ * @private
+ */
+export const privateApis = {};
+lock( privateApis, {
+	BlockKeyboardShortcuts,
+} );
diff --git a/packages/block-library/src/pullquote/block.json b/packages/block-library/src/pullquote/block.json
index 1d6c74dbc4ae04..271bba74d0252a 100644
--- a/packages/block-library/src/pullquote/block.json
+++ b/packages/block-library/src/pullquote/block.json
@@ -8,17 +8,16 @@
 	"textdomain": "default",
 	"attributes": {
 		"value": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "p",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"citation": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "cite",
-			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"textAlign": {
 			"type": "string"
@@ -27,6 +26,13 @@
 	"supports": {
 		"anchor": true,
 		"align": [ "left", "right", "wide", "full" ],
+		"background": {
+			"backgroundImage": true,
+			"backgroundSize": true,
+			"__experimentalDefaultControls": {
+				"backgroundImage": true
+			}
+		},
 		"color": {
 			"gradients": true,
 			"background": true,
@@ -36,6 +42,16 @@
 				"text": true
 			}
 		},
+		"dimensions": {
+			"minHeight": true,
+			"__experimentalDefaultControls": {
+				"minHeight": false
+			}
+		},
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
@@ -66,6 +82,9 @@
 				"fontSize": "1.5em",
 				"lineHeight": "1.6"
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-pullquote-editor",
diff --git a/packages/block-library/src/pullquote/deprecated.js b/packages/block-library/src/pullquote/deprecated.js
index 2839a6d2b88042..18e47997550782 100644
--- a/packages/block-library/src/pullquote/deprecated.js
+++ b/packages/block-library/src/pullquote/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -75,14 +75,14 @@ const v5 = {
 			source: 'html',
 			selector: 'blockquote',
 			multiline: 'p',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		citation: {
 			type: 'string',
 			source: 'html',
 			selector: 'cite',
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		textAlign: {
 			type: 'string',
@@ -95,7 +95,7 @@ const v5 = {
 		return (
 			<figure
 				{ ...useBlockProps.save( {
-					className: classnames( {
+					className: clsx( {
 						[ `has-text-align-${ textAlign }` ]: textAlign,
 					} ),
 				} ) }
@@ -145,7 +145,7 @@ const v4 = {
 				mainColor
 			);
 
-			figureClasses = classnames( {
+			figureClasses = clsx( {
 				'has-background': backgroundClass || customMainColor,
 				[ backgroundClass ]: backgroundClass,
 			} );
@@ -164,7 +164,7 @@ const v4 = {
 			'color',
 			textColor
 		);
-		const blockquoteClasses = classnames( {
+		const blockquoteClasses = clsx( {
 			'has-text-color': textColor || customTextColor,
 			[ blockquoteTextColorClass ]: blockquoteTextColorClass,
 		} );
@@ -275,7 +275,7 @@ const v3 = {
 				mainColor
 			);
 
-			figureClasses = classnames( {
+			figureClasses = clsx( {
 				'has-background': backgroundClass || customMainColor,
 				[ backgroundClass ]: backgroundClass,
 			} );
@@ -308,7 +308,7 @@ const v3 = {
 		);
 		const blockquoteClasses =
 			( textColor || customTextColor ) &&
-			classnames( 'has-text-color', {
+			clsx( 'has-text-color', {
 				[ blockquoteTextColorClass ]: blockquoteTextColorClass,
 			} );
 
@@ -446,7 +446,7 @@ const v2 = {
 		);
 		const blockquoteClasses =
 			textColor || customTextColor
-				? classnames( 'has-text-color', {
+				? clsx( 'has-text-color', {
 						[ blockquoteTextColorClass ]: blockquoteTextColorClass,
 				  } )
 				: undefined;
diff --git a/packages/block-library/src/pullquote/edit.js b/packages/block-library/src/pullquote/edit.js
index 637d83d5b42897..3b0831a26352d0 100644
--- a/packages/block-library/src/pullquote/edit.js
+++ b/packages/block-library/src/pullquote/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -32,7 +32,7 @@ function PullQuoteEdit( {
 } ) {
 	const { textAlign, citation, value } = attributes;
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
diff --git a/packages/block-library/src/pullquote/editor.scss b/packages/block-library/src/pullquote/editor.scss
index 7b985d8020c9fe..deb325849ebebf 100644
--- a/packages/block-library/src/pullquote/editor.scss
+++ b/packages/block-library/src/pullquote/editor.scss
@@ -1,4 +1,6 @@
 // .is-style-solid-color is deprecated.
+// This selector has not been scoped with `:root :where`, as global styles
+// does, to keep its specificity as it was at the time of deprecation.
 .wp-block-pullquote.is-style-solid-color {
 	& blockquote p {
 		font-size: 32px;
diff --git a/packages/block-library/src/pullquote/save.js b/packages/block-library/src/pullquote/save.js
index 26f6adc3eef05b..19fa49a3fa8345 100644
--- a/packages/block-library/src/pullquote/save.js
+++ b/packages/block-library/src/pullquote/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -15,7 +15,7 @@ export default function save( { attributes } ) {
 	return (
 		<figure
 			{ ...useBlockProps.save( {
-				className: classnames( {
+				className: clsx( {
 					[ `has-text-align-${ textAlign }` ]: textAlign,
 				} ),
 			} ) }
diff --git a/packages/block-library/src/pullquote/style.scss b/packages/block-library/src/pullquote/style.scss
index 94d043d1cf2f5b..b9e28b7cdcfaa6 100644
--- a/packages/block-library/src/pullquote/style.scss
+++ b/packages/block-library/src/pullquote/style.scss
@@ -1,8 +1,9 @@
 .wp-block-pullquote {
-	padding: 3em 0;
 	text-align: center; // Default text-alignment where the `textAlign` attribute value isn't specified.
 	overflow-wrap: break-word; // Break long strings of text without spaces so they don't overflow the block.
 	box-sizing: border-box;
+	margin: 0 0 1em 0;
+	padding: 4em 0;
 
 	p,
 	blockquote,
@@ -10,6 +11,18 @@
 		color: inherit;
 	}
 
+	blockquote {
+		margin: 0;
+	}
+
+	p {
+		margin-top: 0;
+
+		&:last-child {
+			margin-bottom: 0;
+		}
+	}
+
 	&.alignleft,
 	&.alignright {
 		max-width: $content-width * 0.5;
@@ -24,11 +37,6 @@
 	}
 }
 
-// Lowest specificity to avoid overriding layout styles.
-:where(.wp-block-pullquote) {
-	margin: 0 0 1em 0;
-}
-
 // Ensure that we are reasonably specific to override theme defaults.
 .wp-block-pullquote.has-text-align-left blockquote {
 	text-align: left;
@@ -40,6 +48,8 @@
 }
 
 // .is-style-solid-color is deprecated.
+// This selector has not been scoped with `:root :where`, as global styles
+// does, to keep its specificity as it was at the time of deprecation.
 .wp-block-pullquote.is-style-solid-color {
 	border: none;
 	blockquote {
diff --git a/packages/block-library/src/query-no-results/block.json b/packages/block-library/src/query-no-results/block.json
index 32088752bb0606..2f656594afa306 100644
--- a/packages/block-library/src/query-no-results/block.json
+++ b/packages/block-library/src/query-no-results/block.json
@@ -8,6 +8,16 @@
 	"parent": [ "core/query" ],
 	"textdomain": "default",
 	"usesContext": [ "queryId", "query" ],
+	"example": {
+		"innerBlocks": [
+			{
+				"name": "core/paragraph",
+				"attributes": {
+					"content": "No posts were found."
+				}
+			}
+		]
+	},
 	"supports": {
 		"align": true,
 		"reusable": false,
@@ -28,6 +38,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/query-no-results/index.php b/packages/block-library/src/query-no-results/index.php
index a6f4bd14d01972..34d6b321cbd6ba 100644
--- a/packages/block-library/src/query-no-results/index.php
+++ b/packages/block-library/src/query-no-results/index.php
@@ -8,6 +8,10 @@
 /**
  * Renders the `core/query-no-results` block on the server.
  *
+ * @since 6.0.0
+ *
+ * @global WP_Query $wp_query WordPress Query object.
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -47,6 +51,8 @@ function render_block_core_query_no_results( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/query-no-results` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_query_no_results() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/query-no-results/save.js b/packages/block-library/src/query-no-results/save.js
index 70161d85c27b16..17571d8f30d2de 100644
--- a/packages/block-library/src/query-no-results/save.js
+++ b/packages/block-library/src/query-no-results/save.js
@@ -3,6 +3,6 @@
  */
 import { InnerBlocks } from '@wordpress/block-editor';
 
-export default function QueryNoResultsSave() {
+export default function save() {
 	return <InnerBlocks.Content />;
 }
diff --git a/packages/block-library/src/query-pagination-next/block.json b/packages/block-library/src/query-pagination-next/block.json
index 95b1169dc992fd..ec56125ee3b766 100644
--- a/packages/block-library/src/query-pagination-next/block.json
+++ b/packages/block-library/src/query-pagination-next/block.json
@@ -41,6 +41,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/query-pagination-next/edit.js b/packages/block-library/src/query-pagination-next/edit.js
index ce76889f37c750..2bd38277a4b6c0 100644
--- a/packages/block-library/src/query-pagination-next/edit.js
+++ b/packages/block-library/src/query-pagination-next/edit.js
@@ -37,7 +37,7 @@ export default function QueryPaginationNextEdit( {
 			{ displayArrow && (
 				<span
 					className={ `wp-block-query-pagination-next-arrow is-arrow-${ paginationArrow }` }
-					aria-hidden={ true }
+					aria-hidden
 				>
 					{ displayArrow }
 				</span>
diff --git a/packages/block-library/src/query-pagination-next/index.php b/packages/block-library/src/query-pagination-next/index.php
index ca134f62192f9e..3b5be47fbed371 100644
--- a/packages/block-library/src/query-pagination-next/index.php
+++ b/packages/block-library/src/query-pagination-next/index.php
@@ -8,6 +8,10 @@
 /**
  * Renders the `core/query-pagination-next` block on the server.
  *
+ * @since 5.8.0
+ *
+ * @global WP_Query $wp_query WordPress Query object.
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -73,7 +77,7 @@ function render_block_core_query_pagination_next( $attributes, $content, $block
 		) ) {
 			$p->set_attribute( 'data-wp-key', 'query-pagination-next' );
 			$p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
-			$p->set_attribute( 'data-wp-on--mouseenter', 'core/query::actions.prefetch' );
+			$p->set_attribute( 'data-wp-on-async--mouseenter', 'core/query::actions.prefetch' );
 			$p->set_attribute( 'data-wp-watch', 'core/query::callbacks.prefetch' );
 			$content = $p->get_updated_html();
 		}
@@ -84,6 +88,8 @@ function render_block_core_query_pagination_next( $attributes, $content, $block
 
 /**
  * Registers the `core/query-pagination-next` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_query_pagination_next() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/query-pagination-numbers/block.json b/packages/block-library/src/query-pagination-numbers/block.json
index f05e269d2ece20..8a9f0ee69f14e4 100644
--- a/packages/block-library/src/query-pagination-numbers/block.json
+++ b/packages/block-library/src/query-pagination-numbers/block.json
@@ -5,7 +5,7 @@
 	"title": "Page Numbers",
 	"category": "theme",
 	"parent": [ "core/query-pagination" ],
-	"description": "Displays a list of page numbers for pagination",
+	"description": "Displays a list of page numbers for pagination.",
 	"textdomain": "default",
 	"attributes": {
 		"midSize": {
@@ -36,6 +36,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-query-pagination-numbers-editor"
diff --git a/packages/block-library/src/query-pagination-numbers/edit.js b/packages/block-library/src/query-pagination-numbers/edit.js
index eb83204b2cca2b..b8d8c160cc874d 100644
--- a/packages/block-library/src/query-pagination-numbers/edit.js
+++ b/packages/block-library/src/query-pagination-numbers/edit.js
@@ -51,6 +51,8 @@ export default function QueryPaginationNumbersEdit( {
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
 					<RangeControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
 						label={ __( 'Number of links' ) }
 						help={ __(
 							'Specify how many links can appear before and after the current page number. Links to the first, current and last page are always visible.'
diff --git a/packages/block-library/src/query-pagination-numbers/index.js b/packages/block-library/src/query-pagination-numbers/index.js
index 3fd903e2d9ef48..f769f54b4ac034 100644
--- a/packages/block-library/src/query-pagination-numbers/index.js
+++ b/packages/block-library/src/query-pagination-numbers/index.js
@@ -16,6 +16,7 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/query-pagination-numbers/index.php b/packages/block-library/src/query-pagination-numbers/index.php
index 2f9370751f6d25..fddf28660fe4f8 100644
--- a/packages/block-library/src/query-pagination-numbers/index.php
+++ b/packages/block-library/src/query-pagination-numbers/index.php
@@ -8,6 +8,10 @@
 /**
  * Renders the `core/query-pagination-numbers` block on the server.
  *
+ * @since 5.8.0
+ *
+ * @global WP_Query $wp_query WordPress Query object.
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -91,14 +95,17 @@ function render_block_core_query_pagination_numbers( $attributes, $content, $blo
 	}
 
 	if ( $enhanced_pagination ) {
-		$p = new WP_HTML_Tag_Processor( $content );
+		$p         = new WP_HTML_Tag_Processor( $content );
+		$tag_index = 0;
 		while ( $p->next_tag(
-			array(
-				'tag_name'   => 'a',
-				'class_name' => 'page-numbers',
-			)
+			array( 'class_name' => 'page-numbers' )
 		) ) {
-			$p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
+			if ( null === $p->get_attribute( 'data-wp-key' ) ) {
+				$p->set_attribute( 'data-wp-key', 'index-' . $tag_index++ );
+			}
+			if ( 'A' === $p->get_tag() ) {
+				$p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
+			}
 		}
 		$content = $p->get_updated_html();
 	}
@@ -112,6 +119,8 @@ function render_block_core_query_pagination_numbers( $attributes, $content, $blo
 
 /**
  * Registers the `core/query-pagination-numbers` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_query_pagination_numbers() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/query-pagination-previous/block.json b/packages/block-library/src/query-pagination-previous/block.json
index fbaac543c1da35..d1e34c8630250d 100644
--- a/packages/block-library/src/query-pagination-previous/block.json
+++ b/packages/block-library/src/query-pagination-previous/block.json
@@ -41,6 +41,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	}
 }
diff --git a/packages/block-library/src/query-pagination-previous/edit.js b/packages/block-library/src/query-pagination-previous/edit.js
index 3d8b3cfbbef72a..b32f15052f2e64 100644
--- a/packages/block-library/src/query-pagination-previous/edit.js
+++ b/packages/block-library/src/query-pagination-previous/edit.js
@@ -25,7 +25,7 @@ export default function QueryPaginationPreviousEdit( {
 			{ displayArrow && (
 				<span
 					className={ `wp-block-query-pagination-previous-arrow is-arrow-${ paginationArrow }` }
-					aria-hidden={ true }
+					aria-hidden
 				>
 					{ displayArrow }
 				</span>
diff --git a/packages/block-library/src/query-pagination-previous/index.php b/packages/block-library/src/query-pagination-previous/index.php
index b49130a44d8ddf..1592f0a10cbff5 100644
--- a/packages/block-library/src/query-pagination-previous/index.php
+++ b/packages/block-library/src/query-pagination-previous/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/query-pagination-previous` block on the server.
  *
+ * @since 5.8.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -61,7 +63,7 @@ function render_block_core_query_pagination_previous( $attributes, $content, $bl
 		) ) {
 			$p->set_attribute( 'data-wp-key', 'query-pagination-previous' );
 			$p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
-			$p->set_attribute( 'data-wp-on--mouseenter', 'core/query::actions.prefetch' );
+			$p->set_attribute( 'data-wp-on-async--mouseenter', 'core/query::actions.prefetch' );
 			$p->set_attribute( 'data-wp-watch', 'core/query::callbacks.prefetch' );
 			$content = $p->get_updated_html();
 		}
@@ -72,6 +74,8 @@ function render_block_core_query_pagination_previous( $attributes, $content, $bl
 
 /**
  * Registers the `core/query-pagination-previous` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_query_pagination_previous() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/query-pagination/block.json b/packages/block-library/src/query-pagination/block.json
index e32a9ba9b495ff..355b188e442d8d 100644
--- a/packages/block-library/src/query-pagination/block.json
+++ b/packages/block-library/src/query-pagination/block.json
@@ -4,7 +4,12 @@
 	"name": "core/query-pagination",
 	"title": "Pagination",
 	"category": "theme",
-	"parent": [ "core/query" ],
+	"ancestor": [ "core/query" ],
+	"allowedBlocks": [
+		"core/query-pagination-previous",
+		"core/query-pagination-numbers",
+		"core/query-pagination-next"
+	],
 	"description": "Displays a paginated navigation to next/previous set of posts, when applicable.",
 	"textdomain": "default",
 	"attributes": {
@@ -54,6 +59,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-query-pagination-editor",
diff --git a/packages/block-library/src/query-pagination/edit.js b/packages/block-library/src/query-pagination/edit.js
index 7598eba5c1cacf..e051c2e67e7e5a 100644
--- a/packages/block-library/src/query-pagination/edit.js
+++ b/packages/block-library/src/query-pagination/edit.js
@@ -23,11 +23,6 @@ const TEMPLATE = [
 	[ 'core/query-pagination-numbers' ],
 	[ 'core/query-pagination-next' ],
 ];
-const ALLOWED_BLOCKS = [
-	'core/query-pagination-previous',
-	'core/query-pagination-numbers',
-	'core/query-pagination-next',
-];
 
 export default function QueryPaginationEdit( {
 	attributes: { paginationArrow, showLabel },
@@ -54,7 +49,6 @@ export default function QueryPaginationEdit( {
 	const blockProps = useBlockProps();
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
 		template: TEMPLATE,
-		allowedBlocks: ALLOWED_BLOCKS,
 	} );
 	// Always show label text if paginationArrow is set to 'none'.
 	useEffect( () => {
diff --git a/packages/block-library/src/query-pagination/editor.scss b/packages/block-library/src/query-pagination/editor.scss
index 169f2b5ca72afb..ed8a2cc47a30f7 100644
--- a/packages/block-library/src/query-pagination/editor.scss
+++ b/packages/block-library/src/query-pagination/editor.scss
@@ -1,11 +1,9 @@
-$pagination-margin: 0.5em;
-
 // Center flex items. This has an equivalent in style.scss.
 .wp-block[data-align="center"] > .wp-block-query-pagination {
 	justify-content: center;
 }
 
-.editor-styles-wrapper {
+:where(.editor-styles-wrapper) {
 	.wp-block-query-pagination {
 		max-width: 100%;
 		&.block-editor-block-list__layout {
@@ -14,21 +12,3 @@ $pagination-margin: 0.5em;
 	}
 }
 
-.wp-block-query-pagination {
-	> .wp-block-query-pagination-next,
-	> .wp-block-query-pagination-previous,
-	> .wp-block-query-pagination-numbers {
-		// Override editor auto block margins.
-		margin-left: 0;
-		margin-top: $pagination-margin;
-
-		/*rtl:ignore*/
-		margin-right: $pagination-margin;
-		margin-bottom: $pagination-margin;
-
-		&:last-child {
-			/*rtl:ignore*/
-			margin-right: 0;
-		}
-	}
-}
diff --git a/packages/block-library/src/query-pagination/index.php b/packages/block-library/src/query-pagination/index.php
index 9b7289ec22e0fa..acafe968c0bec2 100644
--- a/packages/block-library/src/query-pagination/index.php
+++ b/packages/block-library/src/query-pagination/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/query-pagination` block on the server.
  *
+ * @since 5.9.0
+ *
  * @param array  $attributes Block attributes.
  * @param string $content    Block default content.
  *
@@ -35,6 +37,8 @@ function render_block_core_query_pagination( $attributes, $content ) {
 
 /**
  * Registers the `core/query-pagination` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_query_pagination() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/query-pagination/query-pagination-arrow-controls.js b/packages/block-library/src/query-pagination/query-pagination-arrow-controls.js
index d5b3353a7187e7..0f2e9c1788bf7b 100644
--- a/packages/block-library/src/query-pagination/query-pagination-arrow-controls.js
+++ b/packages/block-library/src/query-pagination/query-pagination-arrow-controls.js
@@ -10,6 +10,7 @@ import {
 export function QueryPaginationArrowControls( { value, onChange } ) {
 	return (
 		<ToggleGroupControl
+			__next40pxDefaultSize
 			__nextHasNoMarginBottom
 			label={ __( 'Arrow' ) }
 			value={ value }
diff --git a/packages/block-library/src/query-pagination/style.scss b/packages/block-library/src/query-pagination/style.scss
index a7f2832af48c7a..e949c766e56511 100644
--- a/packages/block-library/src/query-pagination/style.scss
+++ b/packages/block-library/src/query-pagination/style.scss
@@ -1,19 +1,4 @@
-$pagination-margin: 0.5em;
 .wp-block-query-pagination {
-	// Increased specificity to override blocks default margin.
-	> .wp-block-query-pagination-next,
-	> .wp-block-query-pagination-previous,
-	> .wp-block-query-pagination-numbers {
-		/*rtl:ignore*/
-		margin-right: $pagination-margin;
-		margin-bottom: $pagination-margin;
-
-		&:last-child {
-			/*rtl:ignore*/
-			margin-right: 0;
-		}
-	}
-
 	// This moves the next link to the right side of the container,
 	// which is important when it's the only block displayed
 	// and the block has a "space-between" justification.
diff --git a/packages/block-library/src/query-title/block.json b/packages/block-library/src/query-title/block.json
index 65eb03d310c12d..5d5c9113bda084 100644
--- a/packages/block-library/src/query-title/block.json
+++ b/packages/block-library/src/query-title/block.json
@@ -17,6 +17,9 @@
 			"type": "number",
 			"default": 1
 		},
+		"levelOptions": {
+			"type": "array"
+		},
 		"showPrefix": {
 			"type": "boolean",
 			"default": true
@@ -26,6 +29,11 @@
 			"default": true
 		}
 	},
+	"example": {
+		"attributes": {
+			"type": "search"
+		}
+	},
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
@@ -52,6 +60,21 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"style": "wp-block-query-title"
diff --git a/packages/block-library/src/query-title/edit.js b/packages/block-library/src/query-title/edit.js
index b74e03e7583b2d..845809a9300137 100644
--- a/packages/block-library/src/query-title/edit.js
+++ b/packages/block-library/src/query-title/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -13,33 +13,33 @@ import {
 	useBlockProps,
 	Warning,
 	HeadingLevelDropdown,
-	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { ToggleControl, PanelBody } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
-import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { useArchiveLabel } from './use-archive-label';
 
 const SUPPORTED_TYPES = [ 'archive', 'search' ];
 
 export default function QueryTitleEdit( {
-	attributes: { type, level, textAlign, showPrefix, showSearchTerm },
+	attributes: {
+		type,
+		level,
+		levelOptions,
+		textAlign,
+		showPrefix,
+		showSearchTerm,
+	},
 	setAttributes,
 } ) {
-	const { archiveTypeTitle, archiveNameLabel } = useSelect( ( select ) => {
-		const { getSettings } = select( blockEditorStore );
-		const {
-			__experimentalArchiveTitleNameLabel,
-			__experimentalArchiveTitleTypeLabel,
-		} = getSettings();
-		return {
-			archiveTypeTitle: __experimentalArchiveTitleTypeLabel,
-			archiveNameLabel: __experimentalArchiveTitleNameLabel,
-		};
-	} );
+	const { archiveTypeLabel, archiveNameLabel } = useArchiveLabel();
 
 	const TagName = `h${ level }`;
 	const blockProps = useBlockProps( {
-		className: classnames( 'wp-block-query-title__placeholder', {
+		className: clsx( 'wp-block-query-title__placeholder', {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
@@ -55,20 +55,20 @@ export default function QueryTitleEdit( {
 	let titleElement;
 	if ( type === 'archive' ) {
 		let title;
-		if ( archiveTypeTitle ) {
+		if ( archiveTypeLabel ) {
 			if ( showPrefix ) {
 				if ( archiveNameLabel ) {
 					title = sprintf(
 						/* translators: 1: Archive type title e.g: "Category", 2: Label of the archive e.g: "Shoes" */
 						__( '%1$s: %2$s' ),
-						archiveTypeTitle,
+						archiveTypeLabel,
 						archiveNameLabel
 					);
 				} else {
 					title = sprintf(
 						/* translators: %s: Archive type title e.g: "Category", "Tag"... */
 						__( '%s: Name' ),
-						archiveTypeTitle
+						archiveTypeLabel
 					);
 				}
 			} else if ( archiveNameLabel ) {
@@ -77,7 +77,7 @@ export default function QueryTitleEdit( {
 				title = sprintf(
 					/* translators: %s: Archive type title e.g: "Category", "Tag"... */
 					__( '%s name' ),
-					archiveTypeTitle
+					archiveTypeLabel
 				);
 			}
 		} else {
@@ -137,6 +137,7 @@ export default function QueryTitleEdit( {
 			<BlockControls group="block">
 				<HeadingLevelDropdown
 					value={ level }
+					options={ levelOptions }
 					onChange={ ( newLevel ) =>
 						setAttributes( { level: newLevel } )
 					}
diff --git a/packages/block-library/src/query-title/index.php b/packages/block-library/src/query-title/index.php
index 29793e5227a79f..88a945535a22d9 100644
--- a/packages/block-library/src/query-title/index.php
+++ b/packages/block-library/src/query-title/index.php
@@ -10,6 +10,8 @@
  * For now it only supports Archive title,
  * using queried object information
  *
+ * @since 5.8.0
+ *
  * @param array $attributes Block attributes.
  *
  * @return string Returns the query title based on the queried object.
@@ -60,6 +62,8 @@ function render_block_core_query_title( $attributes ) {
 
 /**
  * Registers the `core/query-title` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_query_title() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/query-title/use-archive-label.js b/packages/block-library/src/query-title/use-archive-label.js
new file mode 100644
index 00000000000000..28b7a6f1afb87c
--- /dev/null
+++ b/packages/block-library/src/query-title/use-archive-label.js
@@ -0,0 +1,99 @@
+/**
+ * WordPress dependencies
+ */
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+
+export function useArchiveLabel() {
+	const templateSlug = useSelect( ( select ) => {
+		// @wordpress/block-library should not depend on @wordpress/editor.
+		// Blocks can be loaded into a *non-post* block editor, so to avoid
+		// declaring @wordpress/editor as a dependency, we must access its
+		// store by string.
+		// The solution here is to split WP specific blocks from generic blocks.
+		// eslint-disable-next-line @wordpress/data-no-store-string-literals
+		const { getCurrentPostId, getCurrentPostType, getCurrentTemplateId } =
+			select( 'core/editor' );
+		const currentPostType = getCurrentPostType();
+		const templateId =
+			getCurrentTemplateId() ||
+			( currentPostType === 'wp_template' ? getCurrentPostId() : null );
+
+		return templateId
+			? select( coreStore ).getEditedEntityRecord(
+					'postType',
+					'wp_template',
+					templateId
+			  )?.slug
+			: null;
+	}, [] );
+	const taxonomyMatches = templateSlug?.match(
+		/^(category|tag|taxonomy-([^-]+))$|^(((category|tag)|taxonomy-([^-]+))-(.+))$/
+	);
+	let taxonomy;
+	let term;
+	let isAuthor = false;
+	let authorSlug;
+	if ( taxonomyMatches ) {
+		// If is for a all taxonomies of a type
+		if ( taxonomyMatches[ 1 ] ) {
+			taxonomy = taxonomyMatches[ 2 ]
+				? taxonomyMatches[ 2 ]
+				: taxonomyMatches[ 1 ];
+		}
+		// If is for a all taxonomies of a type
+		else if ( taxonomyMatches[ 3 ] ) {
+			taxonomy = taxonomyMatches[ 6 ]
+				? taxonomyMatches[ 6 ]
+				: taxonomyMatches[ 4 ];
+			term = taxonomyMatches[ 7 ];
+		}
+		taxonomy = taxonomy === 'tag' ? 'post_tag' : taxonomy;
+
+		//getTaxonomy( 'category' );
+		//wp.data.select('core').getEntityRecords( 'taxonomy', 'category', {slug: 'newcat'} );
+	} else {
+		const authorMatches = templateSlug?.match( /^(author)$|^author-(.+)$/ );
+		if ( authorMatches ) {
+			isAuthor = true;
+			if ( authorMatches[ 2 ] ) {
+				authorSlug = authorMatches[ 2 ];
+			}
+		}
+	}
+	return useSelect(
+		( select ) => {
+			const { getEntityRecords, getTaxonomy, getAuthors } =
+				select( coreStore );
+			let archiveTypeLabel;
+			let archiveNameLabel;
+			if ( taxonomy ) {
+				archiveTypeLabel =
+					getTaxonomy( taxonomy )?.labels?.singular_name;
+			}
+			if ( term ) {
+				const records = getEntityRecords( 'taxonomy', taxonomy, {
+					slug: term,
+					per_page: 1,
+				} );
+				if ( records && records[ 0 ] ) {
+					archiveNameLabel = records[ 0 ].name;
+				}
+			}
+			if ( isAuthor ) {
+				archiveTypeLabel = 'Author';
+				if ( authorSlug ) {
+					const authorRecords = getAuthors( { slug: authorSlug } );
+					if ( authorRecords && authorRecords[ 0 ] ) {
+						archiveNameLabel = authorRecords[ 0 ].name;
+					}
+				}
+			}
+			return {
+				archiveTypeLabel,
+				archiveNameLabel,
+			};
+		},
+		[ authorSlug, isAuthor, taxonomy, term ]
+	);
+}
diff --git a/packages/block-library/src/query-title/variations.js b/packages/block-library/src/query-title/variations.js
index 741f74c8b82ceb..6ee004259e2ff9 100644
--- a/packages/block-library/src/query-title/variations.js
+++ b/packages/block-library/src/query-title/variations.js
@@ -38,7 +38,9 @@ const variations = [
  *  Block by providing its attributes.
  */
 variations.forEach( ( variation ) => {
-	if ( variation.isActive ) return;
+	if ( variation.isActive ) {
+		return;
+	}
 	variation.isActive = ( blockAttributes, variationAttributes ) =>
 		blockAttributes.type === variationAttributes.type;
 } );
diff --git a/packages/block-library/src/query/block.json b/packages/block-library/src/query/block.json
index d30eccf3765792..b2225192c6b218 100644
--- a/packages/block-library/src/query/block.json
+++ b/packages/block-library/src/query/block.json
@@ -5,6 +5,7 @@
 	"title": "Query Loop",
 	"category": "theme",
 	"description": "An advanced block that allows displaying post types based on different query parameters and visual configurations.",
+	"keywords": [ "posts", "list", "blog", "blogs", "custom post types" ],
 	"textdomain": "default",
 	"attributes": {
 		"queryId": {
@@ -25,7 +26,8 @@
 				"sticky": "",
 				"inherit": true,
 				"taxQuery": null,
-				"parents": []
+				"parents": [],
+				"format": []
 			}
 		},
 		"tagName": {
@@ -40,6 +42,7 @@
 			"default": false
 		}
 	},
+	"usesContext": [ "postType" ],
 	"providesContext": {
 		"queryId": "queryId",
 		"query": "query",
@@ -49,9 +52,8 @@
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
-		"layout": true
+		"layout": true,
+		"interactivity": true
 	},
-	"editorStyle": "wp-block-query-editor",
-	"style": "wp-block-query",
-	"viewScript": "file:./view.min.js"
+	"editorStyle": "wp-block-query-editor"
 }
diff --git a/packages/block-library/src/query/edit/enhanced-pagination-modal.js b/packages/block-library/src/query/edit/enhanced-pagination-modal.js
index 6009881c7bd862..332cc337bb0f67 100644
--- a/packages/block-library/src/query/edit/enhanced-pagination-modal.js
+++ b/packages/block-library/src/query/edit/enhanced-pagination-modal.js
@@ -27,7 +27,11 @@ export default function EnhancedPaginationModal( {
 		useUnsupportedBlocks( clientId );
 
 	useEffect( () => {
-		if ( enhancedPagination && hasUnsupportedBlocks ) {
+		if (
+			enhancedPagination &&
+			hasUnsupportedBlocks &&
+			! window.__experimentalFullPageClientSideNavigation
+		) {
 			setAttributes( { enhancedPagination: false } );
 			setOpen( true );
 		}
@@ -38,12 +42,12 @@ export default function EnhancedPaginationModal( {
 	};
 
 	let notice = __(
-		'If you still want to prevent full page reloads, remove that block, then disable "Force page reload" again in the Query Block settings.'
+		'If you still want to prevent full page reloads, remove that block, then disable "Reload full page" again in the Query Block settings.'
 	);
 	if ( hasBlocksFromPlugins ) {
 		notice =
 			__(
-				'Currently, avoiding full page reloads is not possible when blocks from plugins are present inside the Query block.'
+				'Currently, avoiding full page reloads is not possible when non-interactive or non-client Navigation compatible blocks from plugins are present inside the Query block.'
 			) +
 			' ' +
 			notice;
@@ -59,7 +63,7 @@ export default function EnhancedPaginationModal( {
 	return (
 		isOpen && (
 			<Modal
-				title={ __( 'Query block: Force page reload enabled' ) }
+				title={ __( 'Query block: Reload full page enabled' ) }
 				className="wp-block-query__enhanced-pagination-modal"
 				aria={ {
 					describedby: modalDescriptionId,
@@ -71,7 +75,11 @@ export default function EnhancedPaginationModal( {
 			>
 				<VStack alignment="right" spacing={ 5 }>
 					<span id={ modalDescriptionId }>{ notice }</span>
-					<Button variant="primary" onClick={ closeModal }>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						onClick={ closeModal }
+					>
 						{ __( 'OK' ) }
 					</Button>
 				</VStack>
diff --git a/packages/block-library/src/query/edit/inspector-controls/author-control.js b/packages/block-library/src/query/edit/inspector-controls/author-control.js
index 68f4f32093c9e1..b27322837e4b9e 100644
--- a/packages/block-library/src/query/edit/inspector-controls/author-control.js
+++ b/packages/block-library/src/query/edit/inspector-controls/author-control.js
@@ -52,14 +52,18 @@ function AuthorControl( { value, onChange } ) {
 
 	const getIdByValue = ( entitiesMappedByName, authorValue ) => {
 		const id = authorValue?.id || entitiesMappedByName[ authorValue ]?.id;
-		if ( id ) return id;
+		if ( id ) {
+			return id;
+		}
 	};
 	const onAuthorChange = ( newValue ) => {
 		const ids = Array.from(
 			newValue.reduce( ( accumulator, author ) => {
 				// Verify that new values point to existing entities.
 				const id = getIdByValue( authorsInfo.mapByName, author );
-				if ( id ) accumulator.add( id );
+				if ( id ) {
+					accumulator.add( id );
+				}
 				return accumulator;
 			}, new Set() )
 		);
@@ -72,6 +76,8 @@ function AuthorControl( { value, onChange } ) {
 			suggestions={ authorsInfo.names }
 			onChange={ onAuthorChange }
 			__experimentalShowHowTo={ false }
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
 		/>
 	);
 }
diff --git a/packages/block-library/src/query/edit/inspector-controls/create-new-post-link.js b/packages/block-library/src/query/edit/inspector-controls/create-new-post-link.js
index ac9904f0f2d514..58d58a6089aacd 100644
--- a/packages/block-library/src/query/edit/inspector-controls/create-new-post-link.js
+++ b/packages/block-library/src/query/edit/inspector-controls/create-new-post-link.js
@@ -1,21 +1,27 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
 import { createInterpolateElement } from '@wordpress/element';
 import { addQueryArgs } from '@wordpress/url';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
 
-const CreateNewPostLink = ( {
-	attributes: { query: { postType } = {} } = {},
-} ) => {
-	if ( ! postType ) return null;
+const CreateNewPostLink = ( { postType } ) => {
 	const newPostUrl = addQueryArgs( 'post-new.php', {
 		post_type: postType,
 	} );
+
+	const addNewItemLabel = useSelect(
+		( select ) => {
+			const { getPostType } = select( coreStore );
+			return getPostType( postType )?.labels?.add_new_item;
+		},
+		[ postType ]
+	);
 	return (
 		<div className="wp-block-query__create-new-link">
 			{ createInterpolateElement(
-				__( '<a>Add new post</a>' ),
+				'<a>' + addNewItemLabel + '</a>',
 				// eslint-disable-next-line jsx-a11y/anchor-has-content
 				{ a: <a href={ newPostUrl } /> }
 			) }
diff --git a/packages/block-library/src/query/edit/inspector-controls/enhanced-pagination-control.js b/packages/block-library/src/query/edit/inspector-controls/enhanced-pagination-control.js
index de889c0715c07a..9d47d67e61d781 100644
--- a/packages/block-library/src/query/edit/inspector-controls/enhanced-pagination-control.js
+++ b/packages/block-library/src/query/edit/inspector-controls/enhanced-pagination-control.js
@@ -15,25 +15,36 @@ export default function EnhancedPaginationControl( {
 	clientId,
 } ) {
 	const { hasUnsupportedBlocks } = useUnsupportedBlocks( clientId );
+	const fullPageClientSideNavigation =
+		window.__experimentalFullPageClientSideNavigation;
 
 	let help = __( 'Browsing between pages requires a full page reload.' );
-	if ( enhancedPagination ) {
+	if ( fullPageClientSideNavigation ) {
 		help = __(
-			"Browsing between pages won't require a full page reload, unless non-compatible blocks are detected."
+			'Experimental full-page client-side navigation setting enabled.'
+		);
+	} else if ( enhancedPagination ) {
+		help = __(
+			'Reload the full page—instead of just the posts list—when visitors navigate between pages.'
 		);
 	} else if ( hasUnsupportedBlocks ) {
 		help = __(
-			"Force page reload can't be disabled because there are non-compatible blocks inside the Query block."
+			'Enhancement disabled because there are non-compatible blocks inside the Query block.'
 		);
 	}
 
 	return (
 		<>
 			<ToggleControl
-				label={ __( 'Force page reload' ) }
+				__nextHasNoMarginBottom
+				label={ __( 'Reload full page' ) }
 				help={ help }
-				checked={ ! enhancedPagination }
-				disabled={ hasUnsupportedBlocks }
+				checked={
+					! enhancedPagination && ! fullPageClientSideNavigation
+				}
+				disabled={
+					hasUnsupportedBlocks || fullPageClientSideNavigation
+				}
 				onChange={ ( value ) => {
 					setAttributes( {
 						enhancedPagination: ! value,
diff --git a/packages/block-library/src/query/edit/inspector-controls/format-controls.js b/packages/block-library/src/query/edit/inspector-controls/format-controls.js
new file mode 100644
index 00000000000000..15c95f3bbba2e2
--- /dev/null
+++ b/packages/block-library/src/query/edit/inspector-controls/format-controls.js
@@ -0,0 +1,90 @@
+/**
+ * WordPress dependencies
+ */
+import { FormTokenField } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { __ } from '@wordpress/i18n';
+
+// All WP post formats, sorted alphabetically by translated name.
+// Value is the post format slug. Label is the name.
+const POST_FORMATS = [
+	{ value: 'aside', label: __( 'Aside' ) },
+	{ value: 'audio', label: __( 'Audio' ) },
+	{ value: 'chat', label: __( 'Chat' ) },
+	{ value: 'gallery', label: __( 'Gallery' ) },
+	{ value: 'image', label: __( 'Image' ) },
+	{ value: 'link', label: __( 'Link' ) },
+	{ value: 'quote', label: __( 'Quote' ) },
+	{ value: 'standard', label: __( 'Standard' ) },
+	{ value: 'status', label: __( 'Status' ) },
+	{ value: 'video', label: __( 'Video' ) },
+].sort( ( a, b ) => {
+	const normalizedA = a.label.toUpperCase();
+	const normalizedB = b.label.toUpperCase();
+
+	if ( normalizedA < normalizedB ) {
+		return -1;
+	}
+	if ( normalizedA > normalizedB ) {
+		return 1;
+	}
+	return 0;
+} );
+
+// A helper function to convert translatable post format names into their static values.
+function formatNamesToValues( names, formats ) {
+	return names
+		.map( ( name ) => {
+			return formats.find(
+				( item ) =>
+					item.label.toLocaleLowerCase() === name.toLocaleLowerCase()
+			)?.value;
+		} )
+		.filter( Boolean );
+}
+
+export default function FormatControls( { onChange, query: { format } } ) {
+	// 'format' is expected to be an array. If it is not an array, for example
+	// if a user has manually entered an invalid value in the block markup,
+	// convert it to an array to prevent JavaScript errors.
+	const normalizedFormats = Array.isArray( format ) ? format : [ format ];
+
+	const { supportedFormats } = useSelect( ( select ) => {
+		const themeSupports = select( coreStore ).getThemeSupports();
+		return {
+			supportedFormats: themeSupports.formats,
+		};
+	}, [] );
+
+	const formats = POST_FORMATS.filter( ( item ) =>
+		supportedFormats.includes( item.value )
+	);
+
+	const values = normalizedFormats
+		.map(
+			( name ) => formats.find( ( item ) => item.value === name )?.label
+		)
+		.filter( Boolean );
+
+	const suggestions = formats
+		.filter( ( item ) => ! normalizedFormats.includes( item.value ) )
+		.map( ( item ) => item.label );
+
+	return (
+		<FormTokenField
+			label={ __( 'Formats' ) }
+			value={ values }
+			suggestions={ suggestions }
+			onChange={ ( newValues ) => {
+				onChange( {
+					format: formatNamesToValues( newValues, formats ),
+				} );
+			} }
+			__experimentalShowHowTo={ false }
+			__experimentalExpandOnFocus
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+		/>
+	);
+}
diff --git a/packages/block-library/src/query/edit/inspector-controls/index.js b/packages/block-library/src/query/edit/inspector-controls/index.js
index d276bdec98ed61..06105bef4e0269 100644
--- a/packages/block-library/src/query/edit/inspector-controls/index.js
+++ b/packages/block-library/src/query/edit/inspector-controls/index.js
@@ -6,16 +6,16 @@ import {
 	TextControl,
 	SelectControl,
 	RangeControl,
-	ToggleControl,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 	Notice,
 	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
 import { __ } from '@wordpress/i18n';
-import {
-	InspectorControls,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { debounce } from '@wordpress/compose';
 import { useEffect, useState, useCallback } from '@wordpress/element';
 
@@ -26,9 +26,12 @@ import OrderControl from './order-control';
 import AuthorControl from './author-control';
 import ParentControl from './parent-control';
 import { TaxonomyControls } from './taxonomy-controls';
+import FormatControls from './format-controls';
 import StickyControl from './sticky-control';
-import EnhancedPaginationControl from './enhanced-pagination-control';
 import CreateNewPostLink from './create-new-post-link';
+import PerPageControl from './per-page-control';
+import OffsetControl from './offset-controls';
+import PagesControl from './pages-control';
 import { unlock } from '../../../lock-unlock';
 import {
 	usePostTypes,
@@ -37,31 +40,36 @@ import {
 	isControlAllowed,
 	useTaxonomies,
 } from '../../utils';
+import { useToolsPanelDropdownMenuProps } from '../../../utils/hooks';
 
 const { BlockInfo } = unlock( blockEditorPrivateApis );
 
 export default function QueryInspectorControls( props ) {
-	const { attributes, setQuery, setDisplayLayout, setAttributes, clientId } =
-		props;
-	const { query, displayLayout, enhancedPagination } = attributes;
+	const { attributes, setQuery, setDisplayLayout, isTemplate } = props;
+	const { query, displayLayout } = attributes;
 	const {
 		order,
 		orderBy,
 		author: authorIds,
+		pages,
 		postType,
+		perPage,
+		offset,
 		sticky,
 		inherit,
 		taxQuery,
 		parents,
+		format,
 	} = query;
 	const allowedControls = useAllowedControls( attributes );
-	const [ showSticky, setShowSticky ] = useState( postType === 'post' );
-	const { postTypesTaxonomiesMap, postTypesSelectOptions } = usePostTypes();
+	const showSticky = postType === 'post';
+	const {
+		postTypesTaxonomiesMap,
+		postTypesSelectOptions,
+		postTypeFormatSupportMap,
+	} = usePostTypes();
 	const taxonomies = useTaxonomies( postType );
 	const isPostTypeHierarchical = useIsPostTypeHierarchical( postType );
-	useEffect( () => {
-		setShowSticky( postType === 'post' );
-	}, [ postType ] );
 	const onPostTypeChange = ( newValue ) => {
 		const updateQuery = { postType: newValue };
 		// We need to dynamically update the `taxQuery` property,
@@ -85,6 +93,14 @@ export default function QueryInspectorControls( props ) {
 		}
 		// We need to reset `parents` because they are tied to each post type.
 		updateQuery.parents = [];
+		// Post types can register post format support with `add_post_type_support`.
+		// But we need to reset the `format` property when switching to post types
+		// that do not support post formats.
+		const hasFormatSupport = postTypeFormatSupportMap[ newValue ];
+		if ( ! hasFormatSupport ) {
+			updateQuery.format = [];
+		}
+
 		setQuery( updateQuery );
 	};
 	const [ querySearch, setQuerySearch ] = useState( query.search );
@@ -100,9 +116,15 @@ export default function QueryInspectorControls( props ) {
 		onChangeDebounced();
 		return onChangeDebounced.cancel;
 	}, [ querySearch, onChangeDebounced ] );
-	const showInheritControl = isControlAllowed( allowedControls, 'inherit' );
+
+	const showInheritControl =
+		isTemplate && isControlAllowed( allowedControls, 'inherit' );
 	const showPostTypeControl =
 		! inherit && isControlAllowed( allowedControls, 'postType' );
+	const postTypeControlLabel = __( 'Post type' );
+	const postTypeControlHelp = __(
+		'Select the type of content to display: posts, pages, or custom post types.'
+	);
 	const showColumnsControl = false;
 	const showOrderControl =
 		! inherit && isControlAllowed( allowedControls, 'order' );
@@ -125,167 +147,287 @@ export default function QueryInspectorControls( props ) {
 		isControlAllowed( allowedControls, 'parents' ) &&
 		isPostTypeHierarchical;
 
+	const postTypeHasFormatSupport = postTypeFormatSupportMap[ postType ];
+	const showFormatControl = useSelect(
+		( select ) => {
+			// Check if the post type supports post formats and if the control is allowed.
+			if (
+				! postTypeHasFormatSupport ||
+				! isControlAllowed( allowedControls, 'format' )
+			) {
+				return false;
+			}
+
+			const themeSupports = select( coreStore ).getThemeSupports();
+
+			// If there are no supported formats, getThemeSupports still includes the default 'standard' format,
+			// and in this case the control should not be shown since the user has no other formats to choose from.
+			return (
+				themeSupports.formats &&
+				themeSupports.formats.length > 0 &&
+				themeSupports.formats.some( ( type ) => type !== 'standard' )
+			);
+		},
+		[ allowedControls, postTypeHasFormatSupport ]
+	);
+
 	const showFiltersPanel =
 		showTaxControl ||
 		showAuthorControl ||
 		showSearchControl ||
-		showParentControl;
+		showParentControl ||
+		showFormatControl;
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
+
+	const showPostCountControl = isControlAllowed(
+		allowedControls,
+		'postCount'
+	);
+	const showOffSetControl = isControlAllowed( allowedControls, 'offset' );
+	const showPagesControl = isControlAllowed( allowedControls, 'pages' );
+
+	const showDisplayPanel =
+		showPostCountControl || showOffSetControl || showPagesControl;
 
 	return (
 		<>
-			<BlockInfo>
-				<CreateNewPostLink { ...props } />
-			</BlockInfo>
+			{ !! postType && (
+				<BlockInfo>
+					<CreateNewPostLink postType={ postType } />
+				</BlockInfo>
+			) }
 			{ showSettingsPanel && (
-				<InspectorControls>
-					<PanelBody title={ __( 'Settings' ) }>
-						{ showInheritControl && (
-							<ToggleControl
-								__nextHasNoMarginBottom
-								label={ __( 'Inherit query from template' ) }
-								help={ __(
-									'Toggle to use the global query context that is set with the current template, such as an archive or search. Disable to customize the settings independently.'
-								) }
-								checked={ !! inherit }
-								onChange={ ( value ) =>
-									setQuery( { inherit: !! value } )
-								}
+				<PanelBody title={ __( 'Settings' ) }>
+					{ showInheritControl && (
+						<ToggleGroupControl
+							__next40pxDefaultSize
+							__nextHasNoMarginBottom
+							label={ __( 'Query type' ) }
+							isBlock
+							onChange={ ( value ) => {
+								setQuery( { inherit: value === 'default' } );
+							} }
+							help={
+								inherit
+									? __(
+											'Display a list of posts or custom post types based on the current template.'
+									  )
+									: __(
+											'Display a list of posts or custom post types based on specific criteria.'
+									  )
+							}
+							value={ !! inherit ? 'default' : 'custom' }
+						>
+							<ToggleGroupControlOption
+								value="default"
+								label={ __( 'Default' ) }
+							/>
+							<ToggleGroupControlOption
+								value="custom"
+								label={ __( 'Custom' ) }
 							/>
-						) }
-						{ showPostTypeControl && (
+						</ToggleGroupControl>
+					) }
+					{ showPostTypeControl &&
+						( postTypesSelectOptions.length > 2 ? (
 							<SelectControl
 								__nextHasNoMarginBottom
+								__next40pxDefaultSize
 								options={ postTypesSelectOptions }
 								value={ postType }
-								label={ __( 'Post type' ) }
+								label={ postTypeControlLabel }
 								onChange={ onPostTypeChange }
-								help={ __(
-									'WordPress contains different types of content and they are divided into collections called “Post types”. By default there are a few different ones such as blog posts and pages, but plugins could add more.'
-								) }
+								help={ postTypeControlHelp }
 							/>
-						) }
-						{ showColumnsControl && (
-							<>
-								<RangeControl
-									__nextHasNoMarginBottom
-									label={ __( 'Columns' ) }
-									value={ displayLayout.columns }
-									onChange={ ( value ) =>
-										setDisplayLayout( {
-											columns: value,
-										} )
-									}
-									min={ 2 }
-									max={ Math.max( 6, displayLayout.columns ) }
-								/>
-								{ displayLayout.columns > 6 && (
-									<Notice
-										status="warning"
-										isDismissible={ false }
-									>
-										{ __(
-											'This column count exceeds the recommended amount and may cause visual breakage.'
-										) }
-									</Notice>
-								) }
-							</>
-						) }
-						{ showOrderControl && (
-							<OrderControl
-								{ ...{ order, orderBy } }
-								onChange={ setQuery }
-							/>
-						) }
-						{ showStickyControl && (
-							<StickyControl
-								value={ sticky }
+						) : (
+							<ToggleGroupControl
+								__nextHasNoMarginBottom
+								__next40pxDefaultSize
+								isBlock
+								value={ postType }
+								label={ postTypeControlLabel }
+								onChange={ onPostTypeChange }
+								help={ postTypeControlHelp }
+							>
+								{ postTypesSelectOptions.map( ( option ) => (
+									<ToggleGroupControlOption
+										key={ option.value }
+										value={ option.value }
+										label={ option.label }
+									/>
+								) ) }
+							</ToggleGroupControl>
+						) ) }
+
+					{ showColumnsControl && (
+						<>
+							<RangeControl
+								__nextHasNoMarginBottom
+								__next40pxDefaultSize
+								label={ __( 'Columns' ) }
+								value={ displayLayout.columns }
 								onChange={ ( value ) =>
-									setQuery( { sticky: value } )
+									setDisplayLayout( {
+										columns: value,
+									} )
 								}
+								min={ 2 }
+								max={ Math.max( 6, displayLayout.columns ) }
 							/>
-						) }
-						<EnhancedPaginationControl
-							enhancedPagination={ enhancedPagination }
-							setAttributes={ setAttributes }
-							clientId={ clientId }
+							{ displayLayout.columns > 6 && (
+								<Notice
+									status="warning"
+									isDismissible={ false }
+								>
+									{ __(
+										'This column count exceeds the recommended amount and may cause visual breakage.'
+									) }
+								</Notice>
+							) }
+						</>
+					) }
+					{ showOrderControl && (
+						<OrderControl
+							{ ...{ order, orderBy } }
+							onChange={ setQuery }
 						/>
-					</PanelBody>
-				</InspectorControls>
+					) }
+					{ showStickyControl && (
+						<StickyControl
+							value={ sticky }
+							onChange={ ( value ) =>
+								setQuery( { sticky: value } )
+							}
+						/>
+					) }
+				</PanelBody>
 			) }
-			{ ! inherit && showFiltersPanel && (
-				<InspectorControls>
-					<ToolsPanel
-						className="block-library-query-toolspanel__filters"
-						label={ __( 'Filters' ) }
-						resetAll={ () => {
-							setQuery( {
-								author: '',
-								parents: [],
-								search: '',
-								taxQuery: null,
-							} );
-							setQuerySearch( '' );
-						} }
+			{ ! inherit && showDisplayPanel && (
+				<ToolsPanel
+					className="block-library-query-toolspanel__display"
+					label={ __( 'Display' ) }
+					resetAll={ () => {
+						setQuery( {
+							offset: 0,
+							pages: 0,
+						} );
+					} }
+					dropdownMenuProps={ dropdownMenuProps }
+				>
+					<ToolsPanelItem
+						label={ __( 'Items per page' ) }
+						hasValue={ () => perPage > 0 }
 					>
-						{ showTaxControl && (
-							<ToolsPanelItem
-								label={ __( 'Taxonomies' ) }
-								hasValue={ () =>
-									Object.values( taxQuery || {} ).some(
-										( terms ) => !! terms.length
-									)
-								}
-								onDeselect={ () =>
-									setQuery( { taxQuery: null } )
-								}
-							>
-								<TaxonomyControls
-									onChange={ setQuery }
-									query={ query }
-								/>
-							</ToolsPanelItem>
-						) }
-						{ showAuthorControl && (
-							<ToolsPanelItem
-								hasValue={ () => !! authorIds }
-								label={ __( 'Authors' ) }
-								onDeselect={ () => setQuery( { author: '' } ) }
-							>
-								<AuthorControl
-									value={ authorIds }
-									onChange={ setQuery }
-								/>
-							</ToolsPanelItem>
-						) }
-						{ showSearchControl && (
-							<ToolsPanelItem
-								hasValue={ () => !! querySearch }
+						<PerPageControl
+							perPage={ perPage }
+							offset={ offset }
+							onChange={ setQuery }
+						/>
+					</ToolsPanelItem>
+					<ToolsPanelItem
+						label={ __( 'Offset' ) }
+						hasValue={ () => offset > 0 }
+						onDeselect={ () => setQuery( { offset: 0 } ) }
+					>
+						<OffsetControl
+							offset={ offset }
+							onChange={ setQuery }
+						/>
+					</ToolsPanelItem>
+					<ToolsPanelItem
+						label={ __( 'Max pages to show' ) }
+						hasValue={ () => pages > 0 }
+						onDeselect={ () => setQuery( { pages: 0 } ) }
+					>
+						<PagesControl pages={ pages } onChange={ setQuery } />
+					</ToolsPanelItem>
+				</ToolsPanel>
+			) }
+			{ ! inherit && showFiltersPanel && (
+				<ToolsPanel
+					className="block-library-query-toolspanel__filters" // unused but kept for backward compatibility
+					label={ __( 'Filters' ) }
+					resetAll={ () => {
+						setQuery( {
+							author: '',
+							parents: [],
+							search: '',
+							taxQuery: null,
+							format: [],
+						} );
+						setQuerySearch( '' );
+					} }
+					dropdownMenuProps={ dropdownMenuProps }
+				>
+					{ showTaxControl && (
+						<ToolsPanelItem
+							label={ __( 'Taxonomies' ) }
+							hasValue={ () =>
+								Object.values( taxQuery || {} ).some(
+									( terms ) => !! terms.length
+								)
+							}
+							onDeselect={ () => setQuery( { taxQuery: null } ) }
+						>
+							<TaxonomyControls
+								onChange={ setQuery }
+								query={ query }
+							/>
+						</ToolsPanelItem>
+					) }
+					{ showAuthorControl && (
+						<ToolsPanelItem
+							hasValue={ () => !! authorIds }
+							label={ __( 'Authors' ) }
+							onDeselect={ () => setQuery( { author: '' } ) }
+						>
+							<AuthorControl
+								value={ authorIds }
+								onChange={ setQuery }
+							/>
+						</ToolsPanelItem>
+					) }
+					{ showSearchControl && (
+						<ToolsPanelItem
+							hasValue={ () => !! querySearch }
+							label={ __( 'Keyword' ) }
+							onDeselect={ () => setQuerySearch( '' ) }
+						>
+							<TextControl
+								__nextHasNoMarginBottom
+								__next40pxDefaultSize
 								label={ __( 'Keyword' ) }
-								onDeselect={ () => setQuerySearch( '' ) }
-							>
-								<TextControl
-									__nextHasNoMarginBottom
-									label={ __( 'Keyword' ) }
-									value={ querySearch }
-									onChange={ setQuerySearch }
-								/>
-							</ToolsPanelItem>
-						) }
-						{ showParentControl && (
-							<ToolsPanelItem
-								hasValue={ () => !! parents?.length }
-								label={ __( 'Parents' ) }
-								onDeselect={ () => setQuery( { parents: [] } ) }
-							>
-								<ParentControl
-									parents={ parents }
-									postType={ postType }
-									onChange={ setQuery }
-								/>
-							</ToolsPanelItem>
-						) }
-					</ToolsPanel>
-				</InspectorControls>
+								value={ querySearch }
+								onChange={ setQuerySearch }
+							/>
+						</ToolsPanelItem>
+					) }
+					{ showParentControl && (
+						<ToolsPanelItem
+							hasValue={ () => !! parents?.length }
+							label={ __( 'Parents' ) }
+							onDeselect={ () => setQuery( { parents: [] } ) }
+						>
+							<ParentControl
+								parents={ parents }
+								postType={ postType }
+								onChange={ setQuery }
+							/>
+						</ToolsPanelItem>
+					) }
+					{ showFormatControl && (
+						<ToolsPanelItem
+							hasValue={ () => !! format?.length }
+							label={ __( 'Formats' ) }
+							onDeselect={ () => setQuery( { format: [] } ) }
+						>
+							<FormatControls
+								onChange={ setQuery }
+								query={ query }
+							/>
+						</ToolsPanelItem>
+					) }
+				</ToolsPanel>
 			) }
 		</>
 	);
diff --git a/packages/block-library/src/query/edit/inspector-controls/offset-controls.js b/packages/block-library/src/query/edit/inspector-controls/offset-controls.js
new file mode 100644
index 00000000000000..ff755c95f8b0a9
--- /dev/null
+++ b/packages/block-library/src/query/edit/inspector-controls/offset-controls.js
@@ -0,0 +1,31 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalNumberControl as NumberControl } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+const MIN_OFFSET = 0;
+const MAX_OFFSET = 100;
+
+export const OffsetControl = ( { offset = 0, onChange } ) => {
+	return (
+		<NumberControl
+			__next40pxDefaultSize
+			label={ __( 'Offset' ) }
+			value={ offset }
+			min={ MIN_OFFSET }
+			onChange={ ( newOffset ) => {
+				if (
+					isNaN( newOffset ) ||
+					newOffset < MIN_OFFSET ||
+					newOffset > MAX_OFFSET
+				) {
+					return;
+				}
+				onChange( { offset: newOffset } );
+			} }
+		/>
+	);
+};
+
+export default OffsetControl;
diff --git a/packages/block-library/src/query/edit/inspector-controls/order-control.js b/packages/block-library/src/query/edit/inspector-controls/order-control.js
index 71ddd290989728..2f6fa0e589d473 100644
--- a/packages/block-library/src/query/edit/inspector-controls/order-control.js
+++ b/packages/block-library/src/query/edit/inspector-controls/order-control.js
@@ -28,6 +28,7 @@ function OrderControl( { order, orderBy, onChange } ) {
 	return (
 		<SelectControl
 			__nextHasNoMarginBottom
+			__next40pxDefaultSize
 			label={ __( 'Order by' ) }
 			value={ `${ orderBy }/${ order }` }
 			options={ orderOptions }
diff --git a/packages/block-library/src/query/edit/inspector-controls/pages-control.js b/packages/block-library/src/query/edit/inspector-controls/pages-control.js
new file mode 100644
index 00000000000000..06c6e32b66ad2a
--- /dev/null
+++ b/packages/block-library/src/query/edit/inspector-controls/pages-control.js
@@ -0,0 +1,27 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalNumberControl as NumberControl } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+export const PagesControl = ( { pages, onChange } ) => {
+	return (
+		<NumberControl
+			__next40pxDefaultSize
+			label={ __( 'Max pages to show' ) }
+			value={ pages }
+			min={ 0 }
+			onChange={ ( newPages ) => {
+				if ( isNaN( newPages ) || newPages < 0 ) {
+					return;
+				}
+				onChange( { pages: newPages } );
+			} }
+			help={ __(
+				'Limit the pages you want to show, even if the query has more results. To show all pages use 0 (zero).'
+			) }
+		/>
+	);
+};
+
+export default PagesControl;
diff --git a/packages/block-library/src/query/edit/inspector-controls/parent-control.js b/packages/block-library/src/query/edit/inspector-controls/parent-control.js
index 830600e47481dd..5fb9ffaad20e88 100644
--- a/packages/block-library/src/query/edit/inspector-controls/parent-control.js
+++ b/packages/block-library/src/query/edit/inspector-controls/parent-control.js
@@ -55,7 +55,9 @@ function ParentControl( { parents, postType, onChange } ) {
 	);
 	const currentParents = useSelect(
 		( select ) => {
-			if ( ! parents?.length ) return EMPTY_ARRAY;
+			if ( ! parents?.length ) {
+				return EMPTY_ARRAY;
+			}
 			const { getEntityRecords } = select( coreStore );
 			return getEntityRecords( 'postType', postType, {
 				...BASE_QUERY,
@@ -71,7 +73,9 @@ function ParentControl( { parents, postType, onChange } ) {
 		if ( ! parents?.length ) {
 			setValue( EMPTY_ARRAY );
 		}
-		if ( ! currentParents?.length ) return;
+		if ( ! currentParents?.length ) {
+			return;
+		}
 		const currentParentsInfo = getEntitiesInfo(
 			mapToIHasNameAndId( currentParents, 'title.rendered' )
 		);
@@ -91,27 +95,35 @@ function ParentControl( { parents, postType, onChange } ) {
 	}, [ parents, currentParents ] );
 
 	const entitiesInfo = useMemo( () => {
-		if ( ! searchResults?.length ) return EMPTY_ARRAY;
+		if ( ! searchResults?.length ) {
+			return EMPTY_ARRAY;
+		}
 		return getEntitiesInfo(
 			mapToIHasNameAndId( searchResults, 'title.rendered' )
 		);
 	}, [ searchResults ] );
 	// Update suggestions only when the query has resolved.
 	useEffect( () => {
-		if ( ! searchHasResolved ) return;
+		if ( ! searchHasResolved ) {
+			return;
+		}
 		setSuggestions( entitiesInfo.names );
 	}, [ entitiesInfo.names, searchHasResolved ] );
 
 	const getIdByValue = ( entitiesMappedByName, entity ) => {
 		const id = entity?.id || entitiesMappedByName?.[ entity ]?.id;
-		if ( id ) return id;
+		if ( id ) {
+			return id;
+		}
 	};
 	const onParentChange = ( newValue ) => {
 		const ids = Array.from(
 			newValue.reduce( ( accumulator, entity ) => {
 				// Verify that new values point to existing entities.
 				const id = getIdByValue( entitiesInfo.mapByName, entity );
-				if ( id ) accumulator.add( id );
+				if ( id ) {
+					accumulator.add( id );
+				}
 				return accumulator;
 			}, new Set() )
 		);
@@ -120,12 +132,14 @@ function ParentControl( { parents, postType, onChange } ) {
 	};
 	return (
 		<FormTokenField
+			__next40pxDefaultSize
 			label={ __( 'Parents' ) }
 			value={ value }
 			onInputChange={ debouncedSearch }
 			suggestions={ suggestions }
 			onChange={ onParentChange }
 			__experimentalShowHowTo={ false }
+			__nextHasNoMarginBottom
 		/>
 	);
 }
diff --git a/packages/block-library/src/query/edit/inspector-controls/per-page-control.js b/packages/block-library/src/query/edit/inspector-controls/per-page-control.js
new file mode 100644
index 00000000000000..933bb0851e6257
--- /dev/null
+++ b/packages/block-library/src/query/edit/inspector-controls/per-page-control.js
@@ -0,0 +1,33 @@
+/**
+ * WordPress dependencies
+ */
+import { RangeControl } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+const MIN_POSTS_PER_PAGE = 1;
+const MAX_POSTS_PER_PAGE = 100;
+
+const PerPageControl = ( { perPage, offset = 0, onChange } ) => {
+	return (
+		<RangeControl
+			__next40pxDefaultSize
+			__nextHasNoMarginBottom
+			label={ __( 'Items per page' ) }
+			min={ MIN_POSTS_PER_PAGE }
+			max={ MAX_POSTS_PER_PAGE }
+			onChange={ ( newPerPage ) => {
+				if (
+					isNaN( newPerPage ) ||
+					newPerPage < MIN_POSTS_PER_PAGE ||
+					newPerPage > MAX_POSTS_PER_PAGE
+				) {
+					return;
+				}
+				onChange( { perPage: newPerPage, offset } );
+			} }
+			value={ parseInt( perPage, 10 ) }
+		/>
+	);
+};
+
+export default PerPageControl;
diff --git a/packages/block-library/src/query/edit/inspector-controls/sticky-control.js b/packages/block-library/src/query/edit/inspector-controls/sticky-control.js
index d3f29a66385931..ee7ee31ba977a9 100644
--- a/packages/block-library/src/query/edit/inspector-controls/sticky-control.js
+++ b/packages/block-library/src/query/edit/inspector-controls/sticky-control.js
@@ -14,12 +14,13 @@ export default function StickyControl( { value, onChange } ) {
 	return (
 		<SelectControl
 			__nextHasNoMarginBottom
+			__next40pxDefaultSize
 			label={ __( 'Sticky posts' ) }
 			options={ stickyOptions }
 			value={ value }
 			onChange={ onChange }
 			help={ __(
-				'Blog posts can be “stickied”, a feature that places them at the top of the front page of posts, keeping it there until new sticky posts are published.'
+				'Sticky posts always appear first, regardless of their publish date.'
 			) }
 		/>
 	);
diff --git a/packages/block-library/src/query/edit/inspector-controls/taxonomy-controls.js b/packages/block-library/src/query/edit/inspector-controls/taxonomy-controls.js
index 6aa57d69141c74..447b667cdacb56 100644
--- a/packages/block-library/src/query/edit/inspector-controls/taxonomy-controls.js
+++ b/packages/block-library/src/query/edit/inspector-controls/taxonomy-controls.js
@@ -1,7 +1,10 @@
 /**
  * WordPress dependencies
  */
-import { FormTokenField } from '@wordpress/components';
+import {
+	FormTokenField,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { useState, useEffect } from '@wordpress/element';
@@ -53,7 +56,7 @@ export function TaxonomyControls( { onChange, query } ) {
 	}
 
 	return (
-		<>
+		<VStack spacing={ 4 }>
 			{ taxonomies.map( ( taxonomy ) => {
 				const termIds = taxQuery?.[ taxonomy.slug ] || [];
 				const handleChange = ( newTermIds ) =>
@@ -73,7 +76,7 @@ export function TaxonomyControls( { onChange, query } ) {
 					/>
 				);
 			} ) }
-		</>
+		</VStack>
 	);
 }
 
@@ -124,7 +127,9 @@ function TaxonomyItem( { taxonomy, termIds, onChange } ) {
 	// and to sanitize the provided `termIds`, by setting only the ones that exist.
 	const existingTerms = useSelect(
 		( select ) => {
-			if ( ! termIds?.length ) return EMPTY_ARRAY;
+			if ( ! termIds?.length ) {
+				return EMPTY_ARRAY;
+			}
 			const { getEntityRecords } = select( coreStore );
 			return getEntityRecords( 'taxonomy', taxonomy.slug, {
 				...BASE_QUERY,
@@ -140,7 +145,9 @@ function TaxonomyItem( { taxonomy, termIds, onChange } ) {
 		if ( ! termIds?.length ) {
 			setValue( EMPTY_ARRAY );
 		}
-		if ( ! existingTerms?.length ) return;
+		if ( ! existingTerms?.length ) {
+			return;
+		}
 		// Returns only the existing entity ids. This prevents the component
 		// from crashing in the editor, when non existing ids are provided.
 		const sanitizedValue = termIds.reduce( ( accumulator, id ) => {
@@ -157,7 +164,9 @@ function TaxonomyItem( { taxonomy, termIds, onChange } ) {
 	}, [ termIds, existingTerms ] );
 	// Update suggestions only when the query has resolved.
 	useEffect( () => {
-		if ( ! searchHasResolved ) return;
+		if ( ! searchHasResolved ) {
+			return;
+		}
 		setSuggestions( searchResults.map( ( result ) => result.name ) );
 	}, [ searchResults, searchHasResolved ] );
 	const onTermsChange = ( newTermValues ) => {
@@ -181,6 +190,8 @@ function TaxonomyItem( { taxonomy, termIds, onChange } ) {
 				displayTransform={ decodeEntities }
 				onChange={ onTermsChange }
 				__experimentalShowHowTo={ false }
+				__nextHasNoMarginBottom
+				__next40pxDefaultSize
 			/>
 		</div>
 	);
diff --git a/packages/block-library/src/query/edit/pattern-selection-modal.js b/packages/block-library/src/query/edit/pattern-selection-modal.js
index a70f7ee959e965..41a339908c5644 100644
--- a/packages/block-library/src/query/edit/pattern-selection-modal.js
+++ b/packages/block-library/src/query/edit/pattern-selection-modal.js
@@ -62,7 +62,7 @@ export default function PatternSelectionModal( {
 			overlayClassName="block-library-query-pattern__selection-modal"
 			title={ __( 'Choose a pattern' ) }
 			onRequestClose={ () => setIsPatternSelectionModalOpen( false ) }
-			isFullScreen={ true }
+			isFullScreen
 		>
 			<div className="block-library-query-pattern__selection-content">
 				<div className="block-library-query-pattern__selection-search">
@@ -70,7 +70,7 @@ export default function PatternSelectionModal( {
 						__nextHasNoMarginBottom
 						onChange={ setSearchValue }
 						value={ searchValue }
-						label={ __( 'Search for patterns' ) }
+						label={ __( 'Search' ) }
 						placeholder={ __( 'Search' ) }
 					/>
 				</div>
diff --git a/packages/block-library/src/query/edit/query-content.js b/packages/block-library/src/query/edit/query-content.js
index 4d9b8885cb15ea..8b3ff09b17934b 100644
--- a/packages/block-library/src/query/edit/query-content.js
+++ b/packages/block-library/src/query/edit/query-content.js
@@ -3,7 +3,7 @@
  */
 import { useSelect, useDispatch } from '@wordpress/data';
 import { useInstanceId } from '@wordpress/compose';
-import { useEffect } from '@wordpress/element';
+import { useEffect, useCallback } from '@wordpress/element';
 import {
 	BlockControls,
 	InspectorControls,
@@ -18,6 +18,7 @@ import { store as coreStore } from '@wordpress/core-data';
 /**
  * Internal dependencies
  */
+import EnhancedPaginationControl from './inspector-controls/enhanced-pagination-control';
 import QueryToolbar from './query-toolbar';
 import QueryInspectorControls from './inspector-controls';
 import EnhancedPaginationModal from './enhanced-pagination-modal';
@@ -31,14 +32,17 @@ export default function QueryContent( {
 	openPatternSelectionModal,
 	name,
 	clientId,
+	context,
 } ) {
 	const {
 		queryId,
 		query,
 		displayLayout,
+		enhancedPagination,
 		tagName: TagName = 'div',
 		query: { inherit } = {},
 	} = attributes;
+	const { postType } = context;
 	const { __unstableMarkNextChangeAsNotPersistent } =
 		useDispatch( blockEditorStore );
 	const instanceId = useInstanceId( QueryContent );
@@ -46,14 +50,38 @@ export default function QueryContent( {
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
 		template: TEMPLATE,
 	} );
+	const isTemplate = useSelect(
+		( select ) => {
+			const currentTemplate =
+				select( coreStore ).__experimentalGetTemplateForLink()?.type;
+			const isInTemplate = 'wp_template' === currentTemplate;
+			const isInSingularContent = postType !== undefined;
+			return isInTemplate && ! isInSingularContent;
+		},
+		[ postType ]
+	);
 	const { postsPerPage } = useSelect( ( select ) => {
 		const { getSettings } = select( blockEditorStore );
-		const { getEntityRecord, canUser } = select( coreStore );
-		const settingPerPage = canUser( 'read', 'settings' )
+		const { getEntityRecord, getEntityRecordEdits, canUser } =
+			select( coreStore );
+		const settingPerPage = canUser( 'read', {
+			kind: 'root',
+			name: 'site',
+		} )
 			? +getEntityRecord( 'root', 'site' )?.posts_per_page
 			: +getSettings().postsPerPage;
+
+		// Gets changes made via the template area posts per page setting. These won't be saved
+		// until the page is saved, but we should reflect this setting within the query loops
+		// that inherit it.
+		const editedSettingPerPage = +getEntityRecordEdits( 'root', 'site' )
+			?.posts_per_page;
+
 		return {
-			postsPerPage: settingPerPage || DEFAULTS_POSTS_PER_PAGE,
+			postsPerPage:
+				editedSettingPerPage ||
+				settingPerPage ||
+				DEFAULTS_POSTS_PER_PAGE,
 		};
 	}, [] );
 	// There are some effects running where some initialization logic is
@@ -65,6 +93,10 @@ export default function QueryContent( {
 	// Changes in query property (which is an object) need to be in the same callback,
 	// because updates are batched after the render and changes in different query properties
 	// would cause to override previous wanted changes.
+	const updateQuery = useCallback(
+		( newQuery ) => setAttributes( { query: { ...query, ...newQuery } } ),
+		[ query, setAttributes ]
+	);
 	useEffect( () => {
 		const newQuery = {};
 		// When we inherit from global query always need to set the `perPage`
@@ -74,11 +106,24 @@ export default function QueryContent( {
 		} else if ( ! query.perPage && postsPerPage ) {
 			newQuery.perPage = postsPerPage;
 		}
+		// We need to reset the `inherit` value if not in a template, as queries
+		// are not inherited when outside a template (e.g. when in singular content).
+		if ( ! isTemplate && query.inherit ) {
+			newQuery.inherit = false;
+		}
 		if ( !! Object.keys( newQuery ).length ) {
 			__unstableMarkNextChangeAsNotPersistent();
 			updateQuery( newQuery );
 		}
-	}, [ query.perPage, postsPerPage, inherit ] );
+	}, [
+		query.perPage,
+		postsPerPage,
+		inherit,
+		isTemplate,
+		query.inherit,
+		__unstableMarkNextChangeAsNotPersistent,
+		updateQuery,
+	] );
 	// We need this for multi-query block pagination.
 	// Query parameters for each block are scoped to their ID.
 	useEffect( () => {
@@ -86,16 +131,19 @@ export default function QueryContent( {
 			__unstableMarkNextChangeAsNotPersistent();
 			setAttributes( { queryId: instanceId } );
 		}
-	}, [ queryId, instanceId ] );
-	const updateQuery = ( newQuery ) =>
-		setAttributes( { query: { ...query, ...newQuery } } );
+	}, [
+		queryId,
+		instanceId,
+		__unstableMarkNextChangeAsNotPersistent,
+		setAttributes,
+	] );
 	const updateDisplayLayout = ( newDisplayLayout ) =>
 		setAttributes( {
 			displayLayout: { ...displayLayout, ...newDisplayLayout },
 		} );
 	const htmlElementMessages = {
 		main: __(
-			'The <main> element should be used for the primary content of your document only. '
+			'The <main> element should be used for the primary content of your document only.'
 		),
 		section: __(
 			"The <section> element should represent a standalone portion of the document that can't be better represented by another element."
@@ -112,13 +160,16 @@ export default function QueryContent( {
 				setAttributes={ setAttributes }
 				clientId={ clientId }
 			/>
-			<QueryInspectorControls
-				attributes={ attributes }
-				setQuery={ updateQuery }
-				setDisplayLayout={ updateDisplayLayout }
-				setAttributes={ setAttributes }
-				clientId={ clientId }
-			/>
+			<InspectorControls>
+				<QueryInspectorControls
+					attributes={ attributes }
+					setQuery={ updateQuery }
+					setDisplayLayout={ updateDisplayLayout }
+					setAttributes={ setAttributes }
+					clientId={ clientId }
+					isTemplate={ isTemplate }
+				/>
+			</InspectorControls>
 			<BlockControls>
 				<QueryToolbar
 					name={ name }
@@ -145,6 +196,11 @@ export default function QueryContent( {
 					}
 					help={ htmlElementMessages[ TagName ] }
 				/>
+				<EnhancedPaginationControl
+					enhancedPagination={ enhancedPagination }
+					setAttributes={ setAttributes }
+					clientId={ clientId }
+				/>
 			</InspectorControls>
 			<TagName { ...innerBlocksProps } />
 		</>
diff --git a/packages/block-library/src/query/edit/query-placeholder.js b/packages/block-library/src/query/edit/query-placeholder.js
index ceb5cb065f75ca..631eb64de07157 100644
--- a/packages/block-library/src/query/edit/query-placeholder.js
+++ b/packages/block-library/src/query/edit/query-placeholder.js
@@ -11,7 +11,6 @@ import {
 	useBlockProps,
 	store as blockEditorStore,
 	__experimentalBlockVariationPicker,
-	__experimentalGetMatchingVariation as getMatchingVariation,
 } from '@wordpress/block-editor';
 import { Button, Placeholder } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
@@ -26,7 +25,6 @@ export default function QueryPlaceholder( {
 	clientId,
 	name,
 	openPatternSelectionModal,
-	setAttributes,
 } ) {
 	const [ isStartingBlank, setIsStartingBlank ] = useState( false );
 	const blockProps = useBlockProps();
@@ -34,37 +32,37 @@ export default function QueryPlaceholder( {
 		clientId,
 		attributes
 	);
-
-	const { blockType, allVariations, hasPatterns } = useSelect(
+	const { blockType, activeBlockVariation, hasPatterns } = useSelect(
 		( select ) => {
-			const { getBlockVariations, getBlockType } = select( blocksStore );
+			const { getActiveBlockVariation, getBlockType } =
+				select( blocksStore );
 			const { getBlockRootClientId, getPatternsByBlockTypes } =
 				select( blockEditorStore );
 			const rootClientId = getBlockRootClientId( clientId );
 			return {
 				blockType: getBlockType( name ),
-				allVariations: getBlockVariations( name ),
+				activeBlockVariation: getActiveBlockVariation(
+					name,
+					attributes
+				),
 				hasPatterns: !! getPatternsByBlockTypes(
 					blockNameForPatterns,
 					rootClientId
 				).length,
 			};
 		},
-		[ name, blockNameForPatterns, clientId ]
+		[ name, blockNameForPatterns, clientId, attributes ]
 	);
-
-	const matchingVariation = getMatchingVariation( attributes, allVariations );
 	const icon =
-		matchingVariation?.icon?.src ||
-		matchingVariation?.icon ||
+		activeBlockVariation?.icon?.src ||
+		activeBlockVariation?.icon ||
 		blockType?.icon?.src;
-	const label = matchingVariation?.title || blockType?.title;
+	const label = activeBlockVariation?.title || blockType?.title;
 	if ( isStartingBlank ) {
 		return (
 			<QueryVariationPicker
 				clientId={ clientId }
 				attributes={ attributes }
-				setAttributes={ setAttributes }
 				icon={ icon }
 				label={ label }
 			/>
@@ -81,6 +79,7 @@ export default function QueryPlaceholder( {
 			>
 				{ !! hasPatterns && (
 					<Button
+						__next40pxDefaultSize
 						variant="primary"
 						onClick={ openPatternSelectionModal }
 					>
@@ -89,6 +88,7 @@ export default function QueryPlaceholder( {
 				) }
 
 				<Button
+					__next40pxDefaultSize
 					variant="secondary"
 					onClick={ () => {
 						setIsStartingBlank( true );
@@ -101,13 +101,7 @@ export default function QueryPlaceholder( {
 	);
 }
 
-function QueryVariationPicker( {
-	clientId,
-	attributes,
-	setAttributes,
-	icon,
-	label,
-} ) {
+function QueryVariationPicker( { clientId, attributes, icon, label } ) {
 	const scopeVariations = useScopedBlockVariations( attributes );
 	const { replaceInnerBlocks } = useDispatch( blockEditorStore );
 	const blockProps = useBlockProps();
@@ -118,18 +112,6 @@ function QueryVariationPicker( {
 				label={ label }
 				variations={ scopeVariations }
 				onSelect={ ( variation ) => {
-					if ( variation.attributes ) {
-						setAttributes( {
-							...variation.attributes,
-							query: {
-								...variation.attributes.query,
-								postType:
-									attributes.query.postType ||
-									variation.attributes.query.postType,
-							},
-							namespace: attributes.namespace,
-						} );
-					}
 					if ( variation.innerBlocks ) {
 						replaceInnerBlocks(
 							clientId,
diff --git a/packages/block-library/src/query/edit/query-toolbar.js b/packages/block-library/src/query/edit/query-toolbar.js
index 7b02290ae4c76c..cc2d62a54d529f 100644
--- a/packages/block-library/src/query/edit/query-toolbar.js
+++ b/packages/block-library/src/query/edit/query-toolbar.js
@@ -1,16 +1,8 @@
 /**
  * WordPress dependencies
  */
-import {
-	ToolbarGroup,
-	Dropdown,
-	ToolbarButton,
-	BaseControl,
-	__experimentalNumberControl as NumberControl,
-} from '@wordpress/components';
-import { useInstanceId } from '@wordpress/compose';
+import { ToolbarGroup, ToolbarButton } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { settings } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -18,107 +10,14 @@ import { settings } from '@wordpress/icons';
 import { usePatterns } from '../utils';
 
 export default function QueryToolbar( {
-	attributes: { query },
-	setQuery,
 	openPatternSelectionModal,
 	name,
 	clientId,
 } ) {
 	const hasPatterns = !! usePatterns( clientId, name ).length;
-	const maxPageInputId = useInstanceId(
-		QueryToolbar,
-		'blocks-query-pagination-max-page-input'
-	);
 
 	return (
 		<>
-			{ ! query.inherit && (
-				<ToolbarGroup>
-					<Dropdown
-						contentClassName="block-library-query-toolbar__popover"
-						renderToggle={ ( { onToggle } ) => (
-							<ToolbarButton
-								icon={ settings }
-								label={ __( 'Display settings' ) }
-								onClick={ onToggle }
-							/>
-						) }
-						renderContent={ () => (
-							<>
-								<BaseControl>
-									<NumberControl
-										__unstableInputWidth="60px"
-										label={ __( 'Items per Page' ) }
-										labelPosition="edge"
-										min={ 1 }
-										max={ 100 }
-										onChange={ ( value ) => {
-											if (
-												isNaN( value ) ||
-												value < 1 ||
-												value > 100
-											) {
-												return;
-											}
-											setQuery( {
-												perPage: value,
-											} );
-										} }
-										step="1"
-										value={ query.perPage }
-										isDragEnabled={ false }
-									/>
-								</BaseControl>
-								<BaseControl>
-									<NumberControl
-										__unstableInputWidth="60px"
-										label={ __( 'Offset' ) }
-										labelPosition="edge"
-										min={ 0 }
-										max={ 100 }
-										onChange={ ( value ) => {
-											if (
-												isNaN( value ) ||
-												value < 0 ||
-												value > 100
-											) {
-												return;
-											}
-											setQuery( { offset: value } );
-										} }
-										step="1"
-										value={ query.offset }
-										isDragEnabled={ false }
-									/>
-								</BaseControl>
-								<BaseControl
-									id={ maxPageInputId }
-									help={ __(
-										'Limit the pages you want to show, even if the query has more results. To show all pages use 0 (zero).'
-									) }
-								>
-									<NumberControl
-										id={ maxPageInputId }
-										__unstableInputWidth="60px"
-										label={ __( 'Max page to show' ) }
-										labelPosition="edge"
-										min={ 0 }
-										onChange={ ( value ) => {
-											if ( isNaN( value ) || value < 0 ) {
-												return;
-											}
-											setQuery( { pages: value } );
-										} }
-										step="1"
-										value={ query.pages }
-										isDragEnabled={ false }
-									/>
-								</BaseControl>
-							</>
-						) }
-					/>
-				</ToolbarGroup>
-			) }
 			{ hasPatterns && (
 				<ToolbarGroup className="wp-block-template-part__block-control-group">
 					<ToolbarButton onClick={ openPatternSelectionModal }>
diff --git a/packages/block-library/src/query/editor.scss b/packages/block-library/src/query/editor.scss
index 61b553b6ed02e0..b86eae0cbf65a8 100644
--- a/packages/block-library/src/query/editor.scss
+++ b/packages/block-library/src/query/editor.scss
@@ -1,5 +1,9 @@
 .block-library-query-toolbar__popover .components-popover__content {
 	min-width: 230px;
+
+	.block-library-query-toolbar__popover-number-control {
+		margin-bottom: $grid-unit-10;
+	}
 }
 
 .wp-block-query__create-new-link {
@@ -39,20 +43,12 @@
 		position: sticky;
 		top: 0;
 		padding: $grid-unit-20 0;
-		margin-bottom: 2px;
+		transform: translateY(- $grid-unit-05); // Offsets the top padding on the modal content container
+		margin-bottom: - $grid-unit-05;
 		z-index: z-index(".block-library-query-pattern__selection-search");
 	}
 }
 
-.block-library-query-toolspanel__filters {
-	.components-form-token-field__help {
-		margin-bottom: 0;
-	}
-	.block-library-query-inspector__taxonomy-control:not(:last-child) {
-		margin-bottom: $grid-unit-30;
-	}
-}
-
 .wp-block-query__enhanced-pagination-modal {
 	@include break-small() {
 		max-width: $break-mobile;
diff --git a/packages/block-library/src/query/index.js b/packages/block-library/src/query/index.js
index 8d82391923603e..0a757b8ee11e92 100644
--- a/packages/block-library/src/query/index.js
+++ b/packages/block-library/src/query/index.js
@@ -19,6 +19,46 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	example: {
+		viewportWidth: 650,
+		attributes: {
+			namespace: 'core/posts-list',
+			query: {
+				perPage: 4,
+				pages: 1,
+				offset: 0,
+				postType: 'post',
+				order: 'desc',
+				orderBy: 'date',
+				author: '',
+				search: '',
+				sticky: 'exclude',
+				inherit: false,
+			},
+		},
+		innerBlocks: [
+			{
+				name: 'core/post-template',
+				attributes: {
+					layout: {
+						type: 'grid',
+						columnCount: 2,
+					},
+				},
+				innerBlocks: [
+					{
+						name: 'core/post-title',
+					},
+					{
+						name: 'core/post-date',
+					},
+					{
+						name: 'core/post-excerpt',
+					},
+				],
+			},
+		],
+	},
 	save,
 	variations,
 	deprecated,
diff --git a/packages/block-library/src/query/index.php b/packages/block-library/src/query/index.php
index 75b5218364d7b1..043f351e11d7f1 100644
--- a/packages/block-library/src/query/index.php
+++ b/packages/block-library/src/query/index.php
@@ -17,89 +17,37 @@
  * @return string Returns the modified output of the query block.
  */
 function render_block_core_query( $attributes, $content, $block ) {
-	if ( $attributes['enhancedPagination'] && isset( $attributes['queryId'] ) ) {
+	$is_interactive = isset( $attributes['enhancedPagination'] )
+		&& true === $attributes['enhancedPagination']
+		&& isset( $attributes['queryId'] );
+
+	// Enqueue the script module and add the necessary directives if the block is
+	// interactive.
+	if ( $is_interactive ) {
+		wp_enqueue_script_module( '@wordpress/block-library/query/view' );
+
 		$p = new WP_HTML_Tag_Processor( $content );
 		if ( $p->next_tag() ) {
 			// Add the necessary directives.
-			$p->set_attribute( 'data-wp-interactive', '{"namespace":"core/query"}' );
-			$p->set_attribute( 'data-wp-navigation-id', 'query-' . $attributes['queryId'] );
-			// Use context to send translated strings.
-			$p->set_attribute(
-				'data-wp-context',
-				wp_json_encode(
-					array(
-						'loadingText' => __( 'Loading page, please wait.' ),
-						'loadedText'  => __( 'Page Loaded.' ),
-					),
-					JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP
-				)
-			);
+			$p->set_attribute( 'data-wp-interactive', 'core/query' );
+			$p->set_attribute( 'data-wp-router-region', 'query-' . $attributes['queryId'] );
+			$p->set_attribute( 'data-wp-context', '{}' );
+			$p->set_attribute( 'data-wp-key', $attributes['queryId'] );
 			$content = $p->get_updated_html();
-
-			// Mark the block as interactive.
-			$block->block_type->supports['interactivity'] = true;
-
-			// Add a div to announce messages using `aria-live`.
-			$html_tag = 'div';
-			if ( ! empty( $attributes['tagName'] ) ) {
-				$html_tag = esc_attr( $attributes['tagName'] );
-			}
-			$last_tag_position = strripos( $content, '</' . $html_tag . '>' );
-			$content           = substr_replace(
-				$content,
-				'<div
-					class="screen-reader-text"
-					aria-live="polite"
-					data-wp-text="context.message"
-				></div>
-				<div
-					class="wp-block-query__enhanced-pagination-animation"
-					data-wp-class--start-animation="state.startAnimation"
-					data-wp-class--finish-animation="state.finishAnimation"
-				></div>',
-				$last_tag_position,
-				0
-			);
-		}
-	}
-
-	$is_gutenberg_plugin     = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-	$should_load_view_script = $attributes['enhancedPagination'] && isset( $attributes['queryId'] );
-	$view_asset              = 'wp-block-query-view';
-	$script_handles          = $block->block_type->view_script_handles;
-
-	if ( $is_gutenberg_plugin ) {
-		if ( $should_load_view_script ) {
-			gutenberg_enqueue_module( '@wordpress/block-library/query' );
-		}
-		// Remove the view script because we are using the module.
-		$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_asset ) );
-	} else {
-		if ( ! wp_script_is( $view_asset ) ) {
-			// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-			if ( ! $should_load_view_script && in_array( $view_asset, $script_handles, true )
-			) {
-				$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_asset ) );
-			}
-			// If the script is needed, but it was previously removed, add it again.
-			if ( $should_load_view_script && ! in_array( $view_asset, $script_handles, true ) ) {
-				$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_asset ) );
-			}
 		}
 	}
 
+	// Add the styles to the block type if the block is interactive and remove
+	// them if it's not.
 	$style_asset = 'wp-block-query';
 	if ( ! wp_style_is( $style_asset ) ) {
 		$style_handles = $block->block_type->style_handles;
 		// If the styles are not needed, and they are still in the `style_handles`, remove them.
-		if (
-			( ! $attributes['enhancedPagination'] || ! isset( $attributes['queryId'] ) )
-			&& in_array( $style_asset, $style_handles, true )
-		) {
+		if ( ! $is_interactive && in_array( $style_asset, $style_handles, true ) ) {
 			$block->block_type->style_handles = array_diff( $style_handles, array( $style_asset ) );
 		}
 		// If the styles are needed, but they were previously removed, add them again.
-		if ( $attributes['enhancedPagination'] && isset( $attributes['queryId'] ) && ! in_array( $style_asset, $style_handles, true ) ) {
+		if ( $is_interactive && ! in_array( $style_asset, $style_handles, true ) ) {
 			$block->block_type->style_handles = array_merge( $style_handles, array( $style_asset ) );
 		}
 	}
@@ -107,27 +55,10 @@ class="wp-block-query__enhanced-pagination-animation"
 	return $content;
 }
 
-/**
- * Ensure that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_query_ensure_interactivity_dependency() {
-	global $wp_scripts;
-	if (
-		isset( $wp_scripts->registered['wp-block-query-view'] ) &&
-		! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-query-view']->deps, true )
-	) {
-		$wp_scripts->registered['wp-block-query-view']->deps[] = 'wp-interactivity';
-	}
-}
-
-add_action( 'wp_print_scripts', 'block_core_query_ensure_interactivity_dependency' );
-
 /**
  * Registers the `core/query` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_query() {
 	register_block_type_from_metadata(
@@ -136,15 +67,6 @@ function register_block_core_query() {
 			'render_callback' => 'render_block_core_query',
 		)
 	);
-
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/query',
-			'/wp-content/plugins/gutenberg/build/interactivity/query.min.js',
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
 }
 add_action( 'init', 'register_block_core_query' );
 
@@ -164,14 +86,18 @@ function block_core_query_disable_enhanced_pagination( $parsed_block ) {
 	static $dirty_enhanced_queries = array();
 	static $render_query_callback  = null;
 
-	$block_name = $parsed_block['blockName'];
-
-	if (
-		'core/query' === $block_name &&
-		isset( $parsed_block['attrs']['enhancedPagination'] ) &&
-		true === $parsed_block['attrs']['enhancedPagination'] &&
-		isset( $parsed_block['attrs']['queryId'] )
-	) {
+	$block_name              = $parsed_block['blockName'];
+	$block_type              = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
+	$has_enhanced_pagination = isset( $parsed_block['attrs']['enhancedPagination'] ) && true === $parsed_block['attrs']['enhancedPagination'] && isset( $parsed_block['attrs']['queryId'] );
+	/*
+	 * Client side navigation can be true in two states:
+	 *  - supports.interactivity = true;
+	 *  - supports.interactivity.clientNavigation = true;
+	 */
+	$supports_client_navigation = ( isset( $block_type->supports['interactivity']['clientNavigation'] ) && true === $block_type->supports['interactivity']['clientNavigation'] )
+		|| ( isset( $block_type->supports['interactivity'] ) && true === $block_type->supports['interactivity'] );
+
+	if ( 'core/query' === $block_name && $has_enhanced_pagination ) {
 		$enhanced_query_stack[] = $parsed_block['attrs']['queryId'];
 
 		if ( ! isset( $render_query_callback ) ) {
@@ -186,21 +112,15 @@ function block_core_query_disable_enhanced_pagination( $parsed_block ) {
 			 * @return string Returns the modified output of the query block.
 			 */
 			$render_query_callback = static function ( $content, $block ) use ( &$enhanced_query_stack, &$dirty_enhanced_queries, &$render_query_callback ) {
-				$has_enhanced_pagination =
-					isset( $block['attrs']['enhancedPagination'] ) &&
-					true === $block['attrs']['enhancedPagination'] &&
-					isset( $block['attrs']['queryId'] );
+				$has_enhanced_pagination = isset( $block['attrs']['enhancedPagination'] ) && true === $block['attrs']['enhancedPagination'] && isset( $block['attrs']['queryId'] );
 
 				if ( ! $has_enhanced_pagination ) {
 					return $content;
 				}
 
 				if ( isset( $dirty_enhanced_queries[ $block['attrs']['queryId'] ] ) ) {
-					$p = new WP_HTML_Tag_Processor( $content );
-					if ( $p->next_tag() ) {
-						$p->set_attribute( 'data-wp-navigation-disabled', 'true' );
-					}
-					$content = $p->get_updated_html();
+					// Disable navigation in the router store config.
+					wp_interactivity_config( 'core/router', array( 'clientNavigationDisabled' => true ) );
 					$dirty_enhanced_queries[ $block['attrs']['queryId'] ] = null;
 				}
 
@@ -219,7 +139,7 @@ function block_core_query_disable_enhanced_pagination( $parsed_block ) {
 	} elseif (
 		! empty( $enhanced_query_stack ) &&
 		isset( $block_name ) &&
-		( ! str_starts_with( $block_name, 'core/' ) || 'core/post-content' === $block_name )
+		( ! $supports_client_navigation )
 	) {
 		foreach ( $enhanced_query_stack as $query_id ) {
 			$dirty_enhanced_queries[ $query_id ] = true;
diff --git a/packages/block-library/src/query/save.js b/packages/block-library/src/query/save.js
index d8ae9942ed6f1b..0f8be90273bef1 100644
--- a/packages/block-library/src/query/save.js
+++ b/packages/block-library/src/query/save.js
@@ -3,7 +3,7 @@
  */
 import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
 
-export default function QuerySave( { attributes: { tagName: Tag = 'div' } } ) {
+export default function save( { attributes: { tagName: Tag = 'div' } } ) {
 	const blockProps = useBlockProps.save();
 	const innerBlocksProps = useInnerBlocksProps.save( blockProps );
 	return <Tag { ...innerBlocksProps } />;
diff --git a/packages/block-library/src/query/style.scss b/packages/block-library/src/query/style.scss
deleted file mode 100644
index 4e9f4741beaed4..00000000000000
--- a/packages/block-library/src/query/style.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-.wp-block-query__enhanced-pagination-animation {
-	position: fixed;
-	top: 0;
-	left: 0;
-	margin: 0;
-	padding: 0;
-	width: 100vw;
-	max-width: 100vw !important;
-	height: 4px;
-	background-color: var(--wp--preset--color--primary, #000);
-	opacity: 0;
-
-	&.start-animation {
-		animation:
-			wp-block-query__enhanced-pagination-start-animation
-			30s
-			cubic-bezier(0.03, 0.5, 0, 1)
-			forwards;
-	}
-
-	&.finish-animation {
-		animation:
-			wp-block-query__enhanced-pagination-finish-animation
-			300ms
-			ease-in;
-	}
-}
-
-@keyframes wp-block-query__enhanced-pagination-start-animation {
-	0% {
-		transform: scaleX(0);
-		transform-origin: 0% 0%;
-		opacity: 1;
-	}
-	100% {
-		transform: scaleX(1);
-		transform-origin: 0% 0%;
-		opacity: 1;
-	}
-}
-
-@keyframes wp-block-query__enhanced-pagination-finish-animation {
-	0% {
-		opacity: 1;
-	}
-	50% {
-		opacity: 1;
-	}
-	100% {
-		opacity: 0;
-	}
-}
diff --git a/packages/block-library/src/query/utils.js b/packages/block-library/src/query/utils.js
index 2ce4acd4a782cf..68da2573bab0f6 100644
--- a/packages/block-library/src/query/utils.js
+++ b/packages/block-library/src/query/utils.js
@@ -6,7 +6,11 @@ import { useMemo } from '@wordpress/element';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { decodeEntities } from '@wordpress/html-entities';
-import { cloneBlock, store as blocksStore } from '@wordpress/blocks';
+import {
+	cloneBlock,
+	getBlockSupport,
+	store as blocksStore,
+} from '@wordpress/blocks';
 
 /** @typedef {import('@wordpress/blocks').WPBlockVariation} WPBlockVariation */
 
@@ -90,6 +94,7 @@ export const mapToIHasNameAndId = ( entities, path ) => {
  * Returns a helper object that contains:
  * 1. An `options` object from the available post types, to be passed to a `SelectControl`.
  * 2. A helper map with available taxonomies per post type.
+ * 3. A helper map with post format support per post type.
  *
  * @return {Object} The helper object related to post types.
  */
@@ -104,7 +109,9 @@ export const usePostTypes = () => {
 		return filteredPostTypes;
 	}, [] );
 	const postTypesTaxonomiesMap = useMemo( () => {
-		if ( ! postTypes?.length ) return;
+		if ( ! postTypes?.length ) {
+			return;
+		}
 		return postTypes.reduce( ( accumulator, type ) => {
 			accumulator[ type.slug ] = type.taxonomies;
 			return accumulator;
@@ -118,7 +125,21 @@ export const usePostTypes = () => {
 			} ) ),
 		[ postTypes ]
 	);
-	return { postTypesTaxonomiesMap, postTypesSelectOptions };
+	const postTypeFormatSupportMap = useMemo( () => {
+		if ( ! postTypes?.length ) {
+			return {};
+		}
+		return postTypes.reduce( ( accumulator, type ) => {
+			accumulator[ type.slug ] =
+				type.supports?.[ 'post-formats' ] || false;
+			return accumulator;
+		}, {} );
+	}, [ postTypes ] );
+	return {
+		postTypesTaxonomiesMap,
+		postTypesSelectOptions,
+		postTypeFormatSupportMap,
+	};
 };
 
 /**
@@ -130,17 +151,23 @@ export const usePostTypes = () => {
 export const useTaxonomies = ( postType ) => {
 	const taxonomies = useSelect(
 		( select ) => {
-			const { getTaxonomies } = select( coreStore );
-			const filteredTaxonomies = getTaxonomies( {
-				type: postType,
-				per_page: -1,
-				context: 'view',
-			} );
-			return filteredTaxonomies;
+			const { getTaxonomies, getPostType } = select( coreStore );
+			// Does the post type have taxonomies?
+			if ( getPostType( postType )?.taxonomies?.length > 0 ) {
+				return getTaxonomies( {
+					type: postType,
+					per_page: -1,
+				} );
+			}
+			return [];
 		},
 		[ postType ]
 	);
-	return taxonomies;
+	return useMemo( () => {
+		return taxonomies?.filter(
+			( { visibility } ) => !! visibility?.publicly_queryable
+		);
+	}, [ taxonomies ] );
 };
 
 /**
@@ -205,6 +232,7 @@ export const getTransformedBlocksFromPattern = (
 ) => {
 	const {
 		query: { postType, inherit },
+		namespace,
 	} = queryBlockAttributes;
 	const clonedBlocks = blocks.map( ( block ) => cloneBlock( block ) );
 	const queryClientIds = [];
@@ -217,6 +245,9 @@ export const getTransformedBlocksFromPattern = (
 				postType,
 				inherit,
 			};
+			if ( namespace ) {
+				block.attributes.namespace = namespace;
+			}
 			queryClientIds.push( block.clientId );
 		}
 		block.innerBlocks?.forEach( ( innerBlock ) => {
@@ -373,7 +404,24 @@ export const useUnsupportedBlocks = ( clientId ) => {
 			getClientIdsOfDescendants( clientId ).forEach(
 				( descendantClientId ) => {
 					const blockName = getBlockName( descendantClientId );
-					if ( ! blockName.startsWith( 'core/' ) ) {
+					/*
+					 * Client side navigation can be true in two states:
+					 *  - supports.interactivity = true;
+					 *  - supports.interactivity.clientNavigation = true;
+					 */
+					const blockSupportsInteractivity = Object.is(
+						getBlockSupport( blockName, 'interactivity' ),
+						true
+					);
+					const blockSupportsInteractivityClientNavigation =
+						getBlockSupport(
+							blockName,
+							'interactivity.clientNavigation'
+						);
+					const blockInteractivity =
+						blockSupportsInteractivity ||
+						blockSupportsInteractivityClientNavigation;
+					if ( ! blockInteractivity ) {
 						blocks.hasBlocksFromPlugins = true;
 					} else if ( blockName === 'core/post-content' ) {
 						blocks.hasPostContentBlock = true;
diff --git a/packages/block-library/src/query/variations.js b/packages/block-library/src/query/variations.js
index fb15645760f293..56a2ba720f55b9 100644
--- a/packages/block-library/src/query/variations.js
+++ b/packages/block-library/src/query/variations.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { postList } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -14,51 +13,12 @@ import {
 	imageDateTitle,
 } from './icons';
 
-const QUERY_DEFAULT_ATTRIBUTES = {
-	query: {
-		perPage: 3,
-		pages: 0,
-		offset: 0,
-		postType: 'post',
-		order: 'desc',
-		orderBy: 'date',
-		author: '',
-		search: '',
-		exclude: [],
-		sticky: '',
-		inherit: false,
-	},
-};
-
 const variations = [
-	{
-		name: 'posts-list',
-		title: __( 'Posts List' ),
-		description: __(
-			'Display a list of your most recent posts, excluding sticky posts.'
-		),
-		icon: postList,
-		attributes: {
-			query: {
-				perPage: 4,
-				pages: 1,
-				offset: 0,
-				postType: 'post',
-				order: 'desc',
-				orderBy: 'date',
-				author: '',
-				search: '',
-				sticky: 'exclude',
-				inherit: false,
-			},
-		},
-		scope: [ 'inserter' ],
-	},
 	{
 		name: 'title-date',
 		title: __( 'Title & Date' ),
 		icon: titleDate,
-		attributes: { ...QUERY_DEFAULT_ATTRIBUTES },
+		attributes: {},
 		innerBlocks: [
 			[
 				'core/post-template',
@@ -74,7 +34,7 @@ const variations = [
 		name: 'title-excerpt',
 		title: __( 'Title & Excerpt' ),
 		icon: titleExcerpt,
-		attributes: { ...QUERY_DEFAULT_ATTRIBUTES },
+		attributes: {},
 		innerBlocks: [
 			[
 				'core/post-template',
@@ -90,7 +50,7 @@ const variations = [
 		name: 'title-date-excerpt',
 		title: __( 'Title, Date, & Excerpt' ),
 		icon: titleDateExcerpt,
-		attributes: { ...QUERY_DEFAULT_ATTRIBUTES },
+		attributes: {},
 		innerBlocks: [
 			[
 				'core/post-template',
@@ -110,7 +70,7 @@ const variations = [
 		name: 'image-date-title',
 		title: __( 'Image, Date, & Title' ),
 		icon: imageDateTitle,
-		attributes: { ...QUERY_DEFAULT_ATTRIBUTES },
+		attributes: {},
 		innerBlocks: [
 			[
 				'core/post-template',
diff --git a/packages/block-library/src/query/view.js b/packages/block-library/src/query/view.js
index ccf70810047673..e23294a24e02e3 100644
--- a/packages/block-library/src/query/view.js
+++ b/packages/block-library/src/query/view.js
@@ -1,13 +1,7 @@
 /**
  * WordPress dependencies
  */
-import {
-	store,
-	getContext,
-	getElement,
-	navigate,
-	prefetch,
-} from '@wordpress/interactivity';
+import { store, getContext, getElement } from '@wordpress/interactivity';
 
 const isValidLink = ( ref ) =>
 	ref &&
@@ -24,70 +18,53 @@ const isValidEvent = ( event ) =>
 	! event.shiftKey &&
 	! event.defaultPrevented;
 
-store( 'core/query', {
-	state: {
-		get startAnimation() {
-			return getContext().animation === 'start';
-		},
-		get finishAnimation() {
-			return getContext().animation === 'finish';
-		},
-	},
-	actions: {
-		*navigate( event ) {
-			const ctx = getContext();
-			const { ref } = getElement();
-			const isDisabled = ref.closest( '[data-wp-navigation-id]' )?.dataset
-				.wpNavigationDisabled;
-
-			if ( isValidLink( ref ) && isValidEvent( event ) && ! isDisabled ) {
-				event.preventDefault();
-
-				const id = ref.closest( '[data-wp-navigation-id]' ).dataset
-					.wpNavigationId;
+store(
+	'core/query',
+	{
+		actions: {
+			*navigate( event ) {
+				const ctx = getContext();
+				const { ref } = getElement();
+				const queryRef = ref.closest(
+					'.wp-block-query[data-wp-router-region]'
+				);
 
-				// Don't announce the navigation immediately, wait 400 ms.
-				const timeout = setTimeout( () => {
-					ctx.message = ctx.loadingText;
-					ctx.animation = 'start';
-				}, 400 );
+				if ( isValidLink( ref ) && isValidEvent( event ) ) {
+					event.preventDefault();
 
-				yield navigate( ref.href );
+					const { actions } = yield import(
+						'@wordpress/interactivity-router'
+					);
+					yield actions.navigate( ref.href );
+					ctx.url = ref.href;
 
-				// Dismiss loading message if it hasn't been added yet.
-				clearTimeout( timeout );
-
-				// Announce that the page has been loaded. If the message is the
-				// same, we use a no-break space similar to the @wordpress/a11y
-				// package: https://github.com/WordPress/gutenberg/blob/c395242b8e6ee20f8b06c199e4fc2920d7018af1/packages/a11y/src/filter-message.js#L20-L26
-				ctx.message =
-					ctx.loadedText +
-					( ctx.message === ctx.loadedText ? '\u00A0' : '' );
-
-				ctx.animation = 'finish';
-				ctx.url = ref.href;
-
-				// Focus the first anchor of the Query block.
-				const firstAnchor = `[data-wp-navigation-id=${ id }] .wp-block-post-template a[href]`;
-				document.querySelector( firstAnchor )?.focus();
-			}
+					// Focus the first anchor of the Query block.
+					const firstAnchor = `.wp-block-post-template a[href]`;
+					queryRef.querySelector( firstAnchor )?.focus();
+				}
+			},
+			*prefetch() {
+				const { ref } = getElement();
+				if ( isValidLink( ref ) ) {
+					const { actions } = yield import(
+						'@wordpress/interactivity-router'
+					);
+					yield actions.prefetch( ref.href );
+				}
+			},
 		},
-		*prefetch() {
-			const { ref } = getElement();
-			const isDisabled = ref.closest( '[data-wp-navigation-id]' )?.dataset
-				.wpNavigationDisabled;
-			if ( isValidLink( ref ) && ! isDisabled ) {
-				yield prefetch( ref.href );
-			}
-		},
-	},
-	callbacks: {
-		*prefetch() {
-			const { url } = getContext();
-			const { ref } = getElement();
-			if ( url && isValidLink( ref ) ) {
-				yield prefetch( ref.href );
-			}
+		callbacks: {
+			*prefetch() {
+				const { url } = getContext();
+				const { ref } = getElement();
+				if ( url && isValidLink( ref ) ) {
+					const { actions } = yield import(
+						'@wordpress/interactivity-router'
+					);
+					yield actions.prefetch( ref.href );
+				}
+			},
 		},
 	},
-} );
+	{ lock: true }
+);
diff --git a/packages/block-library/src/quote/block.json b/packages/block-library/src/quote/block.json
index 7ed406c0d20965..2ae37f9f36f766 100644
--- a/packages/block-library/src/quote/block.json
+++ b/packages/block-library/src/quote/block.json
@@ -14,22 +14,47 @@
 			"selector": "blockquote",
 			"multiline": "p",
 			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"citation": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "cite",
-			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
-		"align": {
+		"textAlign": {
 			"type": "string"
 		}
 	},
 	"supports": {
 		"anchor": true,
+		"align": [ "left", "right", "wide", "full" ],
 		"html": false,
+		"background": {
+			"backgroundImage": true,
+			"backgroundSize": true,
+			"__experimentalDefaultControls": {
+				"backgroundImage": true
+			}
+		},
+		"__experimentalBorder": {
+			"color": true,
+			"radius": true,
+			"style": true,
+			"width": true,
+			"__experimentalDefaultControls": {
+				"color": true,
+				"radius": true,
+				"style": true,
+				"width": true
+			}
+		},
+		"dimensions": {
+			"minHeight": true,
+			"__experimentalDefaultControls": {
+				"minHeight": false
+			}
+		},
 		"__experimentalOnEnter": true,
 		"__experimentalOnMerge": true,
 		"typography": {
@@ -58,7 +83,12 @@
 			"allowEditing": false
 		},
 		"spacing": {
-			"blockGap": true
+			"blockGap": true,
+			"padding": true,
+			"margin": true
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"styles": [
diff --git a/packages/block-library/src/quote/deprecated.js b/packages/block-library/src/quote/deprecated.js
index 052ac5b5c9c372..4d3efd28e3a22c 100644
--- a/packages/block-library/src/quote/deprecated.js
+++ b/packages/block-library/src/quote/deprecated.js
@@ -1,13 +1,13 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { createBlock, parseWithAttributeSchema } from '@wordpress/blocks';
-import { RichText, useBlockProps } from '@wordpress/block-editor';
+import { InnerBlocks, RichText, useBlockProps } from '@wordpress/block-editor';
 
 export const migrateToQuoteV2 = ( attributes ) => {
 	const { value, ...restAttributes } = attributes;
@@ -34,6 +34,102 @@ export const migrateToQuoteV2 = ( attributes ) => {
 	];
 };
 
+const TEXT_ALIGN_OPTIONS = [ 'left', 'right', 'center' ];
+
+// Migrate existing text alignment settings to the renamed attribute.
+const migrateTextAlign = ( attributes, innerBlocks ) => {
+	const { align, ...rest } = attributes;
+	// Check if there are valid alignments stored in the old attribute
+	// and assign them to the new attribute name.
+	const migratedAttributes = TEXT_ALIGN_OPTIONS.includes( align )
+		? { ...rest, textAlign: align }
+		: attributes;
+
+	return [ migratedAttributes, innerBlocks ];
+};
+
+// Migrate the v2 blocks with style === `2`;
+const migrateLargeStyle = ( attributes, innerBlocks ) => {
+	return [
+		{
+			...attributes,
+			className: attributes.className
+				? attributes.className + ' is-style-large'
+				: 'is-style-large',
+		},
+		innerBlocks,
+	];
+};
+
+// Version before the 'align' attribute was replaced with 'textAlign'.
+const v4 = {
+	attributes: {
+		value: {
+			type: 'string',
+			source: 'html',
+			selector: 'blockquote',
+			multiline: 'p',
+			default: '',
+			role: 'content',
+		},
+		citation: {
+			type: 'string',
+			source: 'html',
+			selector: 'cite',
+			default: '',
+			role: 'content',
+		},
+		align: {
+			type: 'string',
+		},
+	},
+	supports: {
+		anchor: true,
+		html: false,
+		__experimentalOnEnter: true,
+		__experimentalOnMerge: true,
+		typography: {
+			fontSize: true,
+			lineHeight: true,
+			__experimentalFontFamily: true,
+			__experimentalFontWeight: true,
+			__experimentalFontStyle: true,
+			__experimentalTextTransform: true,
+			__experimentalTextDecoration: true,
+			__experimentalLetterSpacing: true,
+			__experimentalDefaultControls: {
+				fontSize: true,
+				fontAppearance: true,
+			},
+		},
+		color: {
+			gradients: true,
+			heading: true,
+			link: true,
+			__experimentalDefaultControls: {
+				background: true,
+				text: true,
+			},
+		},
+	},
+	isEligible: ( { align } ) => TEXT_ALIGN_OPTIONS.includes( align ),
+	save( { attributes } ) {
+		const { align, citation } = attributes;
+		const className = clsx( {
+			[ `has-text-align-${ align }` ]: align,
+		} );
+		return (
+			<blockquote { ...useBlockProps.save( { className } ) }>
+				<InnerBlocks.Content />
+				{ ! RichText.isEmpty( citation ) && (
+					<RichText.Content tagName="cite" value={ citation } />
+				) }
+			</blockquote>
+		);
+	},
+	migrate: migrateTextAlign,
+};
+
 const v3 = {
 	attributes: {
 		value: {
@@ -42,14 +138,14 @@ const v3 = {
 			selector: 'blockquote',
 			multiline: 'p',
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		citation: {
 			type: 'string',
 			source: 'html',
 			selector: 'cite',
 			default: '',
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		align: {
 			type: 'string',
@@ -74,7 +170,7 @@ const v3 = {
 	save( { attributes } ) {
 		const { align, value, citation } = attributes;
 
-		const className = classnames( {
+		const className = clsx( {
 			[ `has-text-align-${ align }` ]: align,
 		} );
 
@@ -87,7 +183,9 @@ const v3 = {
 			</blockquote>
 		);
 	},
-	migrate: migrateToQuoteV2,
+	migrate( attributes ) {
+		return migrateTextAlign( ...migrateToQuoteV2( attributes ) );
+	},
 };
 
 const v2 = {
@@ -109,7 +207,9 @@ const v2 = {
 			type: 'string',
 		},
 	},
-	migrate: migrateToQuoteV2,
+	migrate( attributes ) {
+		return migrateTextAlign( ...migrateToQuoteV2( attributes ) );
+	},
 	save( { attributes } ) {
 		const { align, value, citation } = attributes;
 
@@ -151,15 +251,12 @@ const v1 = {
 	migrate( attributes ) {
 		if ( attributes.style === 2 ) {
 			const { style, ...restAttributes } = attributes;
-			return migrateToQuoteV2( {
-				...restAttributes,
-				className: attributes.className
-					? attributes.className + ' is-style-large'
-					: 'is-style-large',
-			} );
+			return migrateTextAlign(
+				...migrateLargeStyle( ...migrateToQuoteV2( restAttributes ) )
+			);
 		}
 
-		return migrateToQuoteV2( attributes );
+		return migrateTextAlign( ...migrateToQuoteV2( attributes ) );
 	},
 
 	save( { attributes } ) {
@@ -206,12 +303,10 @@ const v0 = {
 	migrate( attributes ) {
 		if ( ! isNaN( parseInt( attributes.style ) ) ) {
 			const { style, ...restAttributes } = attributes;
-			return migrateToQuoteV2( {
-				...restAttributes,
-			} );
+			return migrateTextAlign( ...migrateToQuoteV2( restAttributes ) );
 		}
 
-		return migrateToQuoteV2( attributes );
+		return migrateTextAlign( ...migrateToQuoteV2( attributes ) );
 	},
 
 	save( { attributes } ) {
@@ -239,4 +334,4 @@ const v0 = {
  *
  * See block-deprecation.md
  */
-export default [ v3, v2, v1, v0 ];
+export default [ v4, v3, v2, v1, v0 ];
diff --git a/packages/block-library/src/quote/edit.js b/packages/block-library/src/quote/edit.js
index 32c99bf7d097db..66f8f9d66c85ae 100644
--- a/packages/block-library/src/quote/edit.js
+++ b/packages/block-library/src/quote/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -10,21 +10,21 @@ import { __ } from '@wordpress/i18n';
 import {
 	AlignmentControl,
 	BlockControls,
-	RichText,
 	useBlockProps,
 	useInnerBlocksProps,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { BlockQuotation } from '@wordpress/components';
-import { useDispatch, useSelect, useRegistry } from '@wordpress/data';
-import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
+import { useDispatch, useRegistry } from '@wordpress/data';
 import { Platform, useEffect } from '@wordpress/element';
 import deprecated from '@wordpress/deprecated';
+import { verse } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import { migrateToQuoteV2 } from './deprecated';
+import { Caption } from '../utils/caption';
 
 const isWebPlatform = Platform.OS === 'web';
 
@@ -73,20 +73,15 @@ export default function QuoteEdit( {
 	clientId,
 	className,
 	style,
+	isSelected,
 } ) {
-	const { align, citation } = attributes;
+	const { textAlign } = attributes;
 
 	useMigrateOnLoad( attributes, clientId );
 
-	const hasSelection = useSelect( ( select ) => {
-		const { isBlockSelected, hasSelectedInnerBlock } =
-			select( blockEditorStore );
-		return hasSelectedInnerBlock( clientId ) || isBlockSelected( clientId );
-	}, [] );
-
 	const blockProps = useBlockProps( {
-		className: classNames( className, {
-			[ `has-text-align-${ align }` ]: align,
+		className: clsx( className, {
+			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 		...( ! isWebPlatform && { style } ),
 	} );
@@ -94,47 +89,43 @@ export default function QuoteEdit( {
 		template: TEMPLATE,
 		templateInsertUpdatesSelection: true,
 		__experimentalCaptureToolbars: true,
+		renderAppender: false,
 	} );
 
 	return (
 		<>
 			<BlockControls group="block">
 				<AlignmentControl
-					value={ align }
+					value={ textAlign }
 					onChange={ ( nextAlign ) => {
-						setAttributes( { align: nextAlign } );
+						setAttributes( { textAlign: nextAlign } );
 					} }
 				/>
 			</BlockControls>
 			<BlockQuotation { ...innerBlocksProps }>
 				{ innerBlocksProps.children }
-				{ ( ! RichText.isEmpty( citation ) || hasSelection ) && (
-					<RichText
-						identifier="citation"
-						tagName={ isWebPlatform ? 'cite' : undefined }
-						style={ { display: 'block' } }
-						value={ citation }
-						onChange={ ( nextCitation ) => {
-							setAttributes( {
-								citation: nextCitation,
-							} );
-						} }
-						__unstableMobileNoFocusOnMount
-						aria-label={ __( 'Quote citation' ) }
-						placeholder={
-							// translators: placeholder text used for the
-							// citation
-							__( 'Add citation' )
-						}
-						className="wp-block-quote__citation"
-						__unstableOnSplitAtEnd={ () =>
-							insertBlocksAfter(
-								createBlock( getDefaultBlockName() )
-							)
-						}
-						{ ...( ! isWebPlatform ? { textAlign: align } : {} ) }
-					/>
-				) }
+				<Caption
+					attributeKey="citation"
+					tagName={ isWebPlatform ? 'cite' : 'p' }
+					style={ isWebPlatform && { display: 'block' } }
+					isSelected={ isSelected }
+					attributes={ attributes }
+					setAttributes={ setAttributes }
+					__unstableMobileNoFocusOnMount
+					icon={ verse }
+					label={ __( 'Quote citation' ) }
+					placeholder={
+						// translators: placeholder text used for the
+						// citation
+						__( 'Add citation' )
+					}
+					addLabel={ __( 'Add citation' ) }
+					removeLabel={ __( 'Remove citation' ) }
+					excludeElementClassName
+					className="wp-block-quote__citation"
+					insertBlocksAfter={ insertBlocksAfter }
+					{ ...( ! isWebPlatform ? { textAlign } : {} ) }
+				/>
 			</BlockQuotation>
 		</>
 	);
diff --git a/packages/block-library/src/quote/save.js b/packages/block-library/src/quote/save.js
index 7b6ecab8762eb5..521d78def3ef3b 100644
--- a/packages/block-library/src/quote/save.js
+++ b/packages/block-library/src/quote/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -9,10 +9,10 @@ import classNames from 'classnames';
 import { InnerBlocks, RichText, useBlockProps } from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
-	const { align, citation } = attributes;
+	const { textAlign, citation } = attributes;
 
-	const className = classNames( {
-		[ `has-text-align-${ align }` ]: align,
+	const className = clsx( {
+		[ `has-text-align-${ textAlign }` ]: textAlign,
 	} );
 
 	return (
diff --git a/packages/block-library/src/quote/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/quote/test/__snapshots__/transforms.native.js.snap
index 65d87d5b0d7bd4..edd5c40ae916ba 100644
--- a/packages/block-library/src/quote/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/quote/test/__snapshots__/transforms.native.js.snap
@@ -3,7 +3,7 @@
 exports[`Quote block transforms to Columns block 1`] = `
 "<!-- wp:columns -->
 <div class="wp-block-columns"><!-- wp:column {"width":"100%"} -->
-<div class="wp-block-column" style="flex-basis:100%"><!-- wp:quote {"align":"left","className":"is-style-large"} -->
+<div class="wp-block-column" style="flex-basis:100%"><!-- wp:quote {"textAlign":"left","className":"is-style-large"} -->
 <blockquote class="wp-block-quote has-text-align-left is-style-large"><!-- wp:paragraph -->
 <p>"This will make running your own blog a viable alternative again."</p>
 <!-- /wp:paragraph --><cite>— <a href="https://twitter.com/azumbrunnen_/status/1019347243084800005">Adrian Zumbrunnen</a></cite></blockquote>
@@ -14,7 +14,7 @@ exports[`Quote block transforms to Columns block 1`] = `
 
 exports[`Quote block transforms to Group block 1`] = `
 "<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:quote {"align":"left","className":"is-style-large"} -->
+<div class="wp-block-group"><!-- wp:quote {"textAlign":"left","className":"is-style-large"} -->
 <blockquote class="wp-block-quote has-text-align-left is-style-large"><!-- wp:paragraph -->
 <p>"This will make running your own blog a viable alternative again."</p>
 <!-- /wp:paragraph --><cite>— <a href="https://twitter.com/azumbrunnen_/status/1019347243084800005">Adrian Zumbrunnen</a></cite></blockquote>
diff --git a/packages/block-library/src/quote/test/edit.native.js b/packages/block-library/src/quote/test/edit.native.js
index d2f2aad6669f98..c7479f611fa8b8 100644
--- a/packages/block-library/src/quote/test/edit.native.js
+++ b/packages/block-library/src/quote/test/edit.native.js
@@ -10,7 +10,6 @@ import {
 	getEditorHtml,
 	fireEvent,
 	within,
-	waitFor,
 	typeInRichText,
 } from 'test/helpers';
 
@@ -40,14 +39,9 @@ describe( 'Quote', () => {
 				},
 			}
 		);
-		// Await inner blocks to be rendered
-		const citationBlock = await waitFor( () =>
-			screen.getByPlaceholderText( 'Add citation' )
-		);
 
 		// Act
 		fireEvent.press( quoteBlock );
-		// screen.debug();
 		let quoteTextInput =
 			within( quoteBlock ).getByPlaceholderText( 'Start writing…' );
 		typeInRichText( quoteTextInput, 'A great statement.' );
@@ -61,6 +55,10 @@ describe( 'Quote', () => {
 				'Start writing…'
 			)[ 1 ];
 		typeInRichText( quoteTextInput, 'Again.' );
+		fireEvent.press( screen.getByLabelText( 'Navigate Up' ) );
+		fireEvent.press( screen.getByLabelText( 'Add citation' ) );
+		const citationBlock =
+			await screen.findByPlaceholderText( 'Add citation' );
 		const citationTextInput =
 			within( citationBlock ).getByPlaceholderText( 'Add citation' );
 		typeInRichText( citationTextInput, 'A person' );
diff --git a/packages/block-library/src/quote/test/transforms.native.js b/packages/block-library/src/quote/test/transforms.native.js
index 25030e0a018d41..3d2bc8ae609182 100644
--- a/packages/block-library/src/quote/test/transforms.native.js
+++ b/packages/block-library/src/quote/test/transforms.native.js
@@ -14,7 +14,7 @@ import {
 
 const block = 'Quote';
 const initialHtml = `
-<!-- wp:quote {"align":"left","className":"is-style-large"} -->
+<!-- wp:quote {"textAlign":"left","className":"is-style-large"} -->
 <blockquote class="wp-block-quote has-text-align-left is-style-large"><!-- wp:paragraph -->
 <p>"This will make running your own blog a viable alternative again."</p>
 <!-- /wp:paragraph --><cite>— <a href="https://twitter.com/azumbrunnen_/status/1019347243084800005">Adrian Zumbrunnen</a></cite></blockquote>
diff --git a/packages/block-library/src/quote/theme.scss b/packages/block-library/src/quote/theme.scss
index 085d4e91924a8a..2c5983003986a1 100644
--- a/packages/block-library/src/quote/theme.scss
+++ b/packages/block-library/src/quote/theme.scss
@@ -2,7 +2,6 @@
 	border-left: 0.25em solid currentColor;
 	margin: 0 0 1.75em 0;
 	padding-left: 1em;
-
 	cite,
 	footer {
 		color: currentColor;
@@ -11,19 +10,21 @@
 		font-style: normal;
 	}
 
-	&.has-text-align-right {
+	&:where(.has-text-align-right) {
 		border-left: none;
 		border-right: 0.25em solid currentColor;
 		padding-left: 0;
 		padding-right: 1em;
 	}
 
-	&.has-text-align-center {
+	&:where(.has-text-align-center) {
 		border: none;
 		padding-left: 0;
 	}
 	// .is-style-large and .is-large are kept for backwards compatibility.
-	&.is-style-plain,
+	// They are not wrapped in `:where()` to keep specificity as it was before
+	// they were deprecated.
+	&:where(.is-style-plain),
 	&.is-style-large,
 	&.is-large {
 		border: none;
diff --git a/packages/block-library/src/quote/transforms.js b/packages/block-library/src/quote/transforms.js
index f9b3970433fad6..c960759691bf16 100644
--- a/packages/block-library/src/quote/transforms.js
+++ b/packages/block-library/src/quote/transforms.js
@@ -9,10 +9,18 @@ const transforms = {
 		{
 			type: 'block',
 			blocks: [ 'core/pullquote' ],
-			transform: ( { value, citation, anchor, fontSize, style } ) => {
+			transform: ( {
+				value,
+				align,
+				citation,
+				anchor,
+				fontSize,
+				style,
+			} ) => {
 				return createBlock(
 					'core/quote',
 					{
+						align,
 						citation,
 						anchor,
 						fontSize,
@@ -95,7 +103,7 @@ const transforms = {
 				);
 			},
 			transform: (
-				{ citation, anchor, fontSize, style },
+				{ align, citation, anchor, fontSize, style },
 				innerBlocks
 			) => {
 				const value = innerBlocks
@@ -103,6 +111,7 @@ const transforms = {
 					.join( '<br>' );
 				return createBlock( 'core/pullquote', {
 					value,
+					align,
 					citation,
 					anchor,
 					fontSize,
diff --git a/packages/block-library/src/read-more/block.json b/packages/block-library/src/read-more/block.json
index d3386a49d66b82..9e4fc84d193f71 100644
--- a/packages/block-library/src/read-more/block.json
+++ b/packages/block-library/src/read-more/block.json
@@ -50,6 +50,9 @@
 			"__experimentalDefaultControls": {
 				"width": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-read-more"
diff --git a/packages/block-library/src/read-more/edit.js b/packages/block-library/src/read-more/edit.js
index 852b4f6431bed4..8486dd6e50141a 100644
--- a/packages/block-library/src/read-more/edit.js
+++ b/packages/block-library/src/read-more/edit.js
@@ -33,6 +33,7 @@ export default function ReadMore( {
 				</PanelBody>
 			</InspectorControls>
 			<RichText
+				identifier="content"
 				tagName="a"
 				aria-label={ __( '“Read more” link text' ) }
 				placeholder={ __( 'Read more' ) }
@@ -43,7 +44,7 @@ export default function ReadMore( {
 				__unstableOnSplitAtEnd={ () =>
 					insertBlocksAfter( createBlock( getDefaultBlockName() ) )
 				}
-				withoutInteractiveFormatting={ true }
+				withoutInteractiveFormatting
 				{ ...blockProps }
 			/>
 		</>
diff --git a/packages/block-library/src/read-more/index.php b/packages/block-library/src/read-more/index.php
index c59dd2bf3d408c..c01a0a377fc938 100644
--- a/packages/block-library/src/read-more/index.php
+++ b/packages/block-library/src/read-more/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/read-more` block on the server.
  *
+ * @since 6.0.0
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -47,6 +49,8 @@ function render_block_core_read_more( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/read-more` block on the server.
+ *
+ * @since 6.0.0
  */
 function register_block_core_read_more() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/reset.scss b/packages/block-library/src/reset.scss
index cf5e5a1596df59..df25b2c96e387f 100644
--- a/packages/block-library/src/reset.scss
+++ b/packages/block-library/src/reset.scss
@@ -8,19 +8,18 @@
 // We use :where to keep specificity minimal.
 // https://css-tricks.com/almanac/selectors/w/where/
 :where(.editor-styles-wrapper) {
-	/**
-	* The following styles revert to the browser defaults overriding the WPAdmin styles.
-	* This is only needed while the block editor is not being loaded in an iframe.
-	*/
-	font-family: serif; // unfortunately initial doesn't work for font-family.
-	font-size: initial;
-	line-height: initial;
-	color: initial;
+	// The following styles revert to the browser defaults overriding the WPAdmin styles.
+	html & {
+		font-family: serif; // unfortunately initial doesn't work for font-family.
+		font-size: initial;
+		line-height: initial;
+		color: initial;
 
-	// Many themes with white backgrounds load editor styles but fail to also provide
-	// an explicit white background color, assuming a white editing canvas.
-	// So to match browser defaults, we provide a white default here as well.
-	background: #fff;
+		// Many themes with white backgrounds load editor styles but fail to also provide
+		// an explicit white background color, assuming a white editing canvas.
+		// So to match browser defaults, we provide a white default here as well.
+		background: #fff;
+	}
 
 	.wp-align-wrapper {
 		max-width: $content-width;
diff --git a/packages/block-library/src/rss/block.json b/packages/block-library/src/rss/block.json
index 2535eda5946fbd..36d70e7b7ccb98 100644
--- a/packages/block-library/src/rss/block.json
+++ b/packages/block-library/src/rss/block.json
@@ -43,7 +43,10 @@
 	},
 	"supports": {
 		"align": true,
-		"html": false
+		"html": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-rss-editor",
 	"style": "wp-block-rss"
diff --git a/packages/block-library/src/rss/edit.js b/packages/block-library/src/rss/edit.js
index 7c35d63f4fc894..b67cb4f9193df1 100644
--- a/packages/block-library/src/rss/edit.js
+++ b/packages/block-library/src/rss/edit.js
@@ -14,12 +14,11 @@ import {
 	RangeControl,
 	ToggleControl,
 	ToolbarGroup,
-	__experimentalHStack as HStack,
 	__experimentalInputControl as InputControl,
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { grid, list, edit, rss } from '@wordpress/icons';
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 import { prependHTTP } from '@wordpress/url';
 import ServerSideRender from '@wordpress/server-side-render';
 
@@ -59,32 +58,40 @@ export default function RSSEdit( { attributes, setAttributes } ) {
 
 	const blockProps = useBlockProps();
 
+	const label = __( 'RSS URL' );
+
 	if ( isEditing ) {
 		return (
 			<div { ...blockProps }>
-				<Placeholder icon={ rss } label="RSS">
+				<Placeholder
+					icon={ rss }
+					label={ label }
+					instructions={ __(
+						'Display entries from any RSS or Atom feed.'
+					) }
+				>
 					<form
 						onSubmit={ onSubmitURL }
 						className="wp-block-rss__placeholder-form"
 					>
-						<HStack wrap>
-							<InputControl
-								__next40pxDefaultSize
-								placeholder={ __( 'Enter URL here…' ) }
-								value={ feedURL }
-								onChange={ ( value ) =>
-									setAttributes( { feedURL: value } )
-								}
-								className="wp-block-rss__placeholder-input"
-							/>
-							<Button
-								__next40pxDefaultSize
-								variant="primary"
-								type="submit"
-							>
-								{ __( 'Use URL' ) }
-							</Button>
-						</HStack>
+						<InputControl
+							__next40pxDefaultSize
+							label={ label }
+							hideLabelFromVision
+							placeholder={ __( 'Enter URL here…' ) }
+							value={ feedURL }
+							onChange={ ( value ) =>
+								setAttributes( { feedURL: value } )
+							}
+							className="wp-block-rss__placeholder-input"
+						/>
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							type="submit"
+						>
+							{ __( 'Apply' ) }
+						</Button>
 					</form>
 				</Placeholder>
 			</div>
@@ -99,13 +106,13 @@ export default function RSSEdit( { attributes, setAttributes } ) {
 		},
 		{
 			icon: list,
-			title: __( 'List view' ),
+			title: _x( 'List view', 'RSS block display setting' ),
 			onClick: () => setAttributes( { blockLayout: 'list' } ),
 			isActive: blockLayout === 'list',
 		},
 		{
 			icon: grid,
-			title: __( 'Grid view' ),
+			title: _x( 'Grid view', 'RSS block display setting' ),
 			onClick: () => setAttributes( { blockLayout: 'grid' } ),
 			isActive: blockLayout === 'grid',
 		},
diff --git a/packages/block-library/src/rss/editor.scss b/packages/block-library/src/rss/editor.scss
index 9b4bac2874ad5b..c5e79d6254460b 100644
--- a/packages/block-library/src/rss/editor.scss
+++ b/packages/block-library/src/rss/editor.scss
@@ -2,20 +2,6 @@
 	display: inline;
 }
 
-.wp-block-rss__placeholder-form {
-	> * {
-		margin-bottom: $grid-unit-10;
-	}
-
-	@include break-medium() {
-		> * {
-			margin-bottom: 0;
-		}
-	}
-
-	.wp-block-rss__placeholder-input {
-		flex: 1;
-		min-width: 80%;
-	}
+.wp-block-rss__placeholder-form .wp-block-rss__placeholder-input {
+	flex: 1 1 auto;
 }
-
diff --git a/packages/block-library/src/rss/index.php b/packages/block-library/src/rss/index.php
index 91cdab3f589e06..3e8231d259e700 100644
--- a/packages/block-library/src/rss/index.php
+++ b/packages/block-library/src/rss/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/rss` block on server.
  *
+ * @since 5.2.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string Returns the block content with received rss items.
@@ -107,6 +109,8 @@ function render_block_core_rss( $attributes ) {
 
 /**
  * Registers the `core/rss` block on server.
+ *
+ * @since 5.2.0
  */
 function register_block_core_rss() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/search/block.json b/packages/block-library/src/search/block.json
index 5669a9089d0e03..c5af5a29d21beb 100644
--- a/packages/block-library/src/search/block.json
+++ b/packages/block-library/src/search/block.json
@@ -10,7 +10,7 @@
 	"attributes": {
 		"label": {
 			"type": "string",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"showLabel": {
 			"type": "boolean",
@@ -19,7 +19,7 @@
 		"placeholder": {
 			"type": "string",
 			"default": "",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"width": {
 			"type": "number"
@@ -29,7 +29,7 @@
 		},
 		"buttonText": {
 			"type": "string",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"buttonPosition": {
 			"type": "string",
@@ -43,10 +43,6 @@
 			"type": "object",
 			"default": {}
 		},
-		"buttonBehavior": {
-			"type": "string",
-			"default": "expand-searchfield"
-		},
 		"isSearchFieldHidden": {
 			"type": "boolean",
 			"default": false
@@ -89,9 +85,11 @@
 				"width": true
 			}
 		},
+		"spacing": {
+			"margin": true
+		},
 		"html": false
 	},
-	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-search-editor",
 	"style": "wp-block-search"
 }
diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js
index 52f89d344cdf02..b68914893c0e84 100644
--- a/packages/block-library/src/search/edit.js
+++ b/packages/block-library/src/search/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -23,14 +23,14 @@ import { useEffect, useRef } from '@wordpress/element';
 import {
 	ToolbarDropdownMenu,
 	ToolbarGroup,
-	Button,
-	ButtonGroup,
 	ToolbarButton,
 	ResizableBox,
 	PanelBody,
-	BaseControl,
+	__experimentalVStack as VStack,
 	__experimentalUseCustomUnits as useCustomUnits,
 	__experimentalUnitControl as UnitControl,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 } from '@wordpress/components';
 import { useInstanceId } from '@wordpress/compose';
 import { Icon, search } from '@wordpress/icons';
@@ -58,8 +58,7 @@ import {
 // Used to calculate border radius adjustment to avoid "fat" corners when
 // button is placed inside wrapper.
 const DEFAULT_INNER_PADDING = '4px';
-
-const BUTTON_BEHAVIOR_EXPAND = 'expand-searchfield';
+const PERCENTAGE_WIDTHS = [ 25, 50, 75, 100 ];
 
 export default function SearchEdit( {
 	className,
@@ -79,7 +78,6 @@ export default function SearchEdit( {
 		buttonText,
 		buttonPosition,
 		buttonUseIcon,
-		buttonBehavior,
 		isSearchFieldHidden,
 		style,
 	} = attributes;
@@ -115,13 +113,19 @@ export default function SearchEdit( {
 	] );
 
 	const borderRadius = style?.border?.radius;
-	const borderProps = useBorderProps( attributes );
+	let borderProps = useBorderProps( attributes );
 
 	// Check for old deprecated numerical border radius. Done as a separate
 	// check so that a borderRadius style won't overwrite the longhand
 	// per-corner styles.
 	if ( typeof borderRadius === 'number' ) {
-		borderProps.style.borderRadius = `${ borderRadius }px`;
+		borderProps = {
+			...borderProps,
+			style: {
+				...borderProps.style,
+				borderRadius: `${ borderRadius }px`,
+			},
+		};
 	}
 
 	const colorProps = useColorProps( attributes );
@@ -171,7 +175,7 @@ export default function SearchEdit( {
 	}, [ hasOnlyButton, isSelected, setAttributes, width ] );
 
 	const getBlockClassNames = () => {
-		return classnames(
+		return clsx(
 			className,
 			isButtonPositionInside
 				? 'wp-block-search__button-inside'
@@ -187,9 +191,6 @@ export default function SearchEdit( {
 			buttonUseIcon && ! hasNoButton
 				? 'wp-block-search__icon-button'
 				: undefined,
-			hasOnlyButton && BUTTON_BEHAVIOR_EXPAND === buttonBehavior
-				? 'wp-block-search__button-behavior-expand'
-				: undefined,
 			hasOnlyButton && isSearchFieldHidden
 				? 'wp-block-search__searchfield-hidden'
 				: undefined
@@ -273,7 +274,7 @@ export default function SearchEdit( {
 
 	const renderTextField = () => {
 		// If the input is inside the wrapper, the wrapper gets the border color styles/classes, not the input control.
-		const textFieldClasses = classnames(
+		const textFieldClasses = clsx(
 			'wp-block-search__input',
 			isButtonPositionInside ? undefined : borderProps.className,
 			typographyProps.className
@@ -309,7 +310,7 @@ export default function SearchEdit( {
 
 	const renderButton = () => {
 		// If the button is inside the wrapper, the wrapper gets the border color styles/classes, not the button.
-		const buttonClasses = classnames(
+		const buttonClasses = clsx(
 			'wp-block-search__button',
 			colorProps.className,
 			typographyProps.className,
@@ -325,7 +326,7 @@ export default function SearchEdit( {
 				: borderProps.style ),
 		};
 		const handleButtonClick = () => {
-			if ( hasOnlyButton && BUTTON_BEHAVIOR_EXPAND === buttonBehavior ) {
+			if ( hasOnlyButton ) {
 				setAttributes( {
 					isSearchFieldHidden: ! isSearchFieldHidden,
 				} );
@@ -353,6 +354,7 @@ export default function SearchEdit( {
 
 				{ ! buttonUseIcon && (
 					<RichText
+						identifier="buttonText"
 						className={ buttonClasses }
 						style={ buttonStyles }
 						aria-label={ __( 'Button text' ) }
@@ -406,13 +408,15 @@ export default function SearchEdit( {
 			</BlockControls>
 
 			<InspectorControls>
-				<PanelBody title={ __( 'Display Settings' ) }>
-					<BaseControl
-						label={ __( 'Width' ) }
-						id={ unitControlInputId }
+				<PanelBody title={ __( 'Settings' ) }>
+					<VStack
+						className="wp-block-search__inspector-controls"
+						spacing={ 4 }
 					>
 						<UnitControl
-							id={ unitControlInputId }
+							__next40pxDefaultSize
+							label={ __( 'Width' ) }
+							id={ unitControlInputId } // unused, kept for backwards compatibility
 							min={
 								isPercentageUnit( widthUnit ) ? 0 : MIN_WIDTH
 							}
@@ -421,14 +425,12 @@ export default function SearchEdit( {
 							}
 							step={ 1 }
 							onChange={ ( newWidth ) => {
-								const filteredWidth =
-									widthUnit === '%' &&
-									parseInt( newWidth, 10 ) > 100
-										? 100
-										: newWidth;
-
+								const parsedNewWidth =
+									newWidth === ''
+										? undefined
+										: parseInt( newWidth, 10 );
 								setAttributes( {
-									width: parseInt( filteredWidth, 10 ),
+									width: parsedNewWidth,
 								} );
 							} }
 							onUnitChange={ ( newUnit ) => {
@@ -440,39 +442,40 @@ export default function SearchEdit( {
 									widthUnit: newUnit,
 								} );
 							} }
-							__unstableInputWidth={ '80px' }
+							__unstableInputWidth="80px"
 							value={ `${ width }${ widthUnit }` }
 							units={ units }
 						/>
-
-						<ButtonGroup
-							className="wp-block-search__components-button-group"
-							aria-label={ __( 'Percentage Width' ) }
+						<ToggleGroupControl
+							label={ __( 'Percentage Width' ) }
+							value={
+								PERCENTAGE_WIDTHS.includes( width ) &&
+								widthUnit === '%'
+									? width
+									: undefined
+							}
+							hideLabelFromVision
+							onChange={ ( newWidth ) => {
+								setAttributes( {
+									width: newWidth,
+									widthUnit: '%',
+								} );
+							} }
+							isBlock
+							__next40pxDefaultSize
+							__nextHasNoMarginBottom
 						>
-							{ [ 25, 50, 75, 100 ].map( ( widthValue ) => {
+							{ PERCENTAGE_WIDTHS.map( ( widthValue ) => {
 								return (
-									<Button
+									<ToggleGroupControlOption
 										key={ widthValue }
-										isSmall
-										variant={
-											widthValue === width &&
-											widthUnit === '%'
-												? 'primary'
-												: undefined
-										}
-										onClick={ () =>
-											setAttributes( {
-												width: widthValue,
-												widthUnit: '%',
-											} )
-										}
-									>
-										{ widthValue }%
-									</Button>
+										value={ widthValue }
+										label={ `${ widthValue }%` }
+									/>
 								);
 							} ) }
-						</ButtonGroup>
-					</BaseControl>
+						</ToggleGroupControl>
+					</VStack>
 				</PanelBody>
 			</InspectorControls>
 		</>
@@ -541,7 +544,7 @@ export default function SearchEdit( {
 		},
 	} );
 
-	const labelClassnames = classnames(
+	const labelClassnames = clsx(
 		'wp-block-search__label',
 		typographyProps.className
 	);
@@ -552,6 +555,7 @@ export default function SearchEdit( {
 
 			{ showLabel && (
 				<RichText
+					identifier="label"
 					className={ labelClassnames }
 					aria-label={ __( 'Label text' ) }
 					placeholder={ __( 'Add label…' ) }
@@ -564,9 +568,13 @@ export default function SearchEdit( {
 
 			<ResizableBox
 				size={ {
-					width: `${ width }${ widthUnit }`,
+					width:
+						width === undefined
+							? 'auto'
+							: `${ width }${ widthUnit }`,
+					height: 'auto',
 				} }
-				className={ classnames(
+				className={ clsx(
 					'wp-block-search__inside-wrapper',
 					isButtonPositionInside ? borderProps.className : undefined
 				) }
diff --git a/packages/block-library/src/search/edit.native.js b/packages/block-library/src/search/edit.native.js
index c5f5fb4cf23547..47a7eb98ded60b 100644
--- a/packages/block-library/src/search/edit.native.js
+++ b/packages/block-library/src/search/edit.native.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { View, AccessibilityInfo } from 'react-native';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -133,7 +133,7 @@ export default function SearchEdit( {
 	};
 
 	const getBlockClassNames = () => {
-		return classnames(
+		return clsx(
 			className,
 			'button-inside' === buttonPosition
 				? 'wp-block-search__button-inside'
@@ -192,7 +192,7 @@ export default function SearchEdit( {
 						} );
 					} }
 					options={ BUTTON_OPTIONS }
-					hideCancelButton={ true }
+					hideCancelButton
 				/>
 				{ buttonPosition !== 'no-button' && (
 					<ToggleControl
@@ -294,7 +294,7 @@ export default function SearchEdit( {
 		return (
 			<View
 				style={ styles.searchInputContainer }
-				accessible={ true }
+				accessible
 				accessibilityRole="none"
 				accessibilityHint={
 					isScreenReaderEnabled
@@ -383,7 +383,7 @@ export default function SearchEdit( {
 
 				{ ! buttonUseIcon && (
 					<View
-						accessible={ true }
+						accessible
 						accessibilityRole="none"
 						accessibilityHint={
 							isScreenReaderEnabled
@@ -395,7 +395,7 @@ export default function SearchEdit( {
 					>
 						<RichText
 							className="wp-block-search__button"
-							identifier="text"
+							identifier="buttonText"
 							tagName="p"
 							style={ richTextButtonStyle }
 							placeholder={ buttonPlaceholderText }
@@ -438,7 +438,7 @@ export default function SearchEdit( {
 
 			{ showLabel && (
 				<View
-					accessible={ true }
+					accessible
 					accessibilityRole="none"
 					accessibilityHint={
 						isScreenReaderEnabled
@@ -449,7 +449,7 @@ export default function SearchEdit( {
 				>
 					<RichText
 						className="wp-block-search__label"
-						identifier="text"
+						identifier="label"
 						tagName="p"
 						style={ styles.richTextLabel }
 						placeholder={ __( 'Add label…' ) }
diff --git a/packages/block-library/src/search/editor.scss b/packages/block-library/src/search/editor.scss
index effa741249e919..ecc244d3341e1e 100644
--- a/packages/block-library/src/search/editor.scss
+++ b/packages/block-library/src/search/editor.scss
@@ -7,7 +7,7 @@
 }
 
 .wp-block-search {
-	.wp-block-search__button {
+	:where(.wp-block-search__button) {
 		height: auto;
 		border-radius: initial;
 		display: flex;
@@ -15,8 +15,11 @@
 		justify-content: center;
 		text-align: center;
 	}
+}
 
-	&__components-button-group {
-		margin-top: 10px;
+.wp-block-search__inspector-controls {
+	.components-base-control {
+		// Counteract the margin added by the block inspector.
+		margin-bottom: 0;
 	}
 }
diff --git a/packages/block-library/src/search/index.php b/packages/block-library/src/search/index.php
index f5391eefc8caca..e4259bb0ce2c7f 100644
--- a/packages/block-library/src/search/index.php
+++ b/packages/block-library/src/search/index.php
@@ -16,7 +16,7 @@
  *
  * @return string The search block markup.
  */
-function render_block_core_search( $attributes, $content, $block ) {
+function render_block_core_search( $attributes ) {
 	// Older versions of the Search block defaulted the label and buttonText
 	// attributes to `__( 'Search' )` meaning that many posts contain `<!--
 	// wp:search /-->`. Support these by defaulting an undefined label and
@@ -36,7 +36,6 @@ function render_block_core_search( $attributes, $content, $block ) {
 	$show_button         = ( ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'] ) ? false : true;
 	$button_position     = $show_button ? $attributes['buttonPosition'] : null;
 	$query_params        = ( ! empty( $attributes['query'] ) ) ? $attributes['query'] : array();
-	$button_behavior     = ( ! empty( $attributes['buttonBehavior'] ) ) ? $attributes['buttonBehavior'] : 'default';
 	$button              = '';
 	$query_params_markup = '';
 	$inline_styles       = styles_for_block_core_search( $attributes );
@@ -48,7 +47,7 @@ function render_block_core_search( $attributes, $content, $block ) {
 	$border_color_classes = get_border_color_classes_for_block_core_search( $attributes );
 	// This variable is a constant and its value is always false at this moment.
 	// It is defined this way because some values depend on it, in case it changes in the future.
-	$open_by_default = 'false';
+	$open_by_default = false;
 
 	$label_inner_html = empty( $attributes['label'] ) ? __( 'Search' ) : wp_kses_post( $attributes['label'] );
 	$label            = new WP_HTML_Tag_Processor( sprintf( '<label %1$s>%2$s</label>', $inline_styles['label'], $label_inner_html ) );
@@ -78,39 +77,19 @@ function render_block_core_search( $attributes, $content, $block ) {
 		$input->set_attribute( 'value', get_search_query() );
 		$input->set_attribute( 'placeholder', $attributes['placeholder'] );
 
-		$is_expandable_searchfield = 'button-only' === $button_position && 'expand-searchfield' === $button_behavior;
+		// If it's interactive, enqueue the script module and add the directives.
+		$is_expandable_searchfield = 'button-only' === $button_position;
 		if ( $is_expandable_searchfield ) {
+			wp_enqueue_script_module( '@wordpress/block-library/search/view' );
+
 			$input->set_attribute( 'data-wp-bind--aria-hidden', '!context.isSearchInputVisible' );
 			$input->set_attribute( 'data-wp-bind--tabindex', 'state.tabindex' );
-			// Adding these attributes manually is needed until the Interactivity API SSR logic is added to core.
+
+			// Adding these attributes manually is needed until the Interactivity API
+			// SSR logic is added to core.
 			$input->set_attribute( 'aria-hidden', 'true' );
 			$input->set_attribute( 'tabindex', '-1' );
 		}
-
-		$is_gutenberg_plugin = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-		$script_handles      = $block->block_type->view_script_handles;
-		$view_js_file        = 'wp-block-search-view';
-
-		if ( $is_gutenberg_plugin ) {
-			if ( $is_expandable_searchfield ) {
-				gutenberg_enqueue_module( '@wordpress/block-library/search-block' );
-			}
-			// Remove the view script because we are using the module.
-			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-		} else {
-			// If the script already exists, there is no point in removing it from viewScript.
-			if ( ! wp_script_is( $view_js_file ) ) {
-
-				// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-				if ( ! $is_expandable_searchfield && in_array( $view_js_file, $script_handles, true ) ) {
-					$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-				}
-				// If the script is needed, but it was previously removed, add it again.
-				if ( $is_expandable_searchfield && ! in_array( $view_js_file, $script_handles, true ) ) {
-					$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
-				}
-			}
-		}
 	}
 
 	if ( count( $query_params ) > 0 ) {
@@ -154,13 +133,15 @@ function render_block_core_search( $attributes, $content, $block ) {
 
 		if ( $button->next_tag() ) {
 			$button->add_class( implode( ' ', $button_classes ) );
-			if ( 'expand-searchfield' === $attributes['buttonBehavior'] && 'button-only' === $attributes['buttonPosition'] ) {
+			if ( 'button-only' === $attributes['buttonPosition'] ) {
 				$button->set_attribute( 'data-wp-bind--aria-label', 'state.ariaLabel' );
 				$button->set_attribute( 'data-wp-bind--aria-controls', 'state.ariaControls' );
 				$button->set_attribute( 'data-wp-bind--aria-expanded', 'context.isSearchInputVisible' );
 				$button->set_attribute( 'data-wp-bind--type', 'state.type' );
 				$button->set_attribute( 'data-wp-on--click', 'actions.openSearchInput' );
-				// Adding these attributes manually is needed until the Interactivity API SSR logic is added to core.
+
+				// Adding these attributes manually is needed until the Interactivity
+				// API SSR logic is added to core.
 				$button->set_attribute( 'aria-label', __( 'Expand search field' ) );
 				$button->set_attribute( 'aria-controls', 'wp-block-search__input-' . $input_id );
 				$button->set_attribute( 'aria-expanded', 'false' );
@@ -182,15 +163,25 @@ function render_block_core_search( $attributes, $content, $block ) {
 		array( 'class' => $classnames )
 	);
 	$form_directives      = '';
+
+	// If it's interactive, add the directives.
 	if ( $is_expandable_searchfield ) {
 		$aria_label_expanded  = __( 'Submit Search' );
 		$aria_label_collapsed = __( 'Expand search field' );
+		$form_context         = wp_interactivity_data_wp_context(
+			array(
+				'isSearchInputVisible' => $open_by_default,
+				'inputId'              => $input_id,
+				'ariaLabelExpanded'    => $aria_label_expanded,
+				'ariaLabelCollapsed'   => $aria_label_collapsed,
+			)
+		);
 		$form_directives      = '
-			data-wp-interactive=\'{ "namespace": "core/search" }\'
-			data-wp-context=\'{ "isSearchInputVisible": ' . $open_by_default . ', "inputId": "' . $input_id . '", "ariaLabelExpanded": "' . $aria_label_expanded . '", "ariaLabelCollapsed": "' . $aria_label_collapsed . '" }\'
-			data-wp-class--wp-block-search__searchfield-hidden="!context.isSearchInputVisible"
-			data-wp-on--keydown="actions.handleSearchKeydown"
-			data-wp-on--focusout="actions.handleSearchFocusout"
+		 data-wp-interactive="core/search"'
+		. $form_context .
+		'data-wp-class--wp-block-search__searchfield-hidden="!context.isSearchInputVisible"
+		 data-wp-on-async--keydown="actions.handleSearchKeydown"
+		 data-wp-on-async--focusout="actions.handleSearchFocusout"
 		';
 	}
 
@@ -205,6 +196,8 @@ function render_block_core_search( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/search` block on the server.
+ *
+ * @since 5.2.0
  */
 function register_block_core_search() {
 	register_block_type_from_metadata(
@@ -213,21 +206,14 @@ function register_block_core_search() {
 			'render_callback' => 'render_block_core_search',
 		)
 	);
-
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/search-block',
-			gutenberg_url( '/build/interactivity/search.min.js' ),
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
 }
 add_action( 'init', 'register_block_core_search' );
 
 /**
  * Builds the correct top level classnames for the 'core/search' block.
  *
+ * @since 5.6.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string The classnames used in the block.
@@ -249,10 +235,7 @@ function classnames_for_block_core_search( $attributes ) {
 		}
 
 		if ( 'button-only' === $attributes['buttonPosition'] ) {
-			$classnames[] = 'wp-block-search__button-only';
-			if ( ! empty( $attributes['buttonBehavior'] ) && 'expand-searchfield' === $attributes['buttonBehavior'] ) {
-				$classnames[] = 'wp-block-search__button-behavior-expand wp-block-search__searchfield-hidden';
-			}
+			$classnames[] = 'wp-block-search__button-only wp-block-search__searchfield-hidden';
 		}
 	}
 
@@ -275,6 +258,8 @@ function classnames_for_block_core_search( $attributes ) {
  * or not, the generated rule is injected into the appropriate collection of
  * styles for later application in the block's markup.
  *
+ * @since 6.1.0
+ *
  * @param array  $attributes     The block attributes.
  * @param string $property       Border property to generate rule for e.g. width or color.
  * @param string $side           Optional side border. The dictates the value retrieved and final CSS property.
@@ -320,6 +305,8 @@ function apply_block_core_search_border_style( $attributes, $property, $side, &$
  * injects rules into the provided wrapper, button and input style arrays for
  * uniform "flat" borders or those with individual sides configured.
  *
+ * @since 6.1.0
+ *
  * @param array  $attributes     The block attributes.
  * @param string $property       Border property to generate rule for e.g. width or color.
  * @param array  $wrapper_styles Current collection of wrapper styles.
@@ -341,6 +328,8 @@ function apply_block_core_search_border_styles( $attributes, $property, &$wrappe
  * inner input or button and a second for the inner wrapper should the block
  * be positioning the button "inside".
  *
+ * @since 5.8.0
+ *
  * @param  array $attributes The block attributes.
  *
  * @return array Style HTML attribute.
@@ -467,7 +456,9 @@ function styles_for_block_core_search( $attributes ) {
 }
 
 /**
- * Returns typography classnames depending on whether there are named font sizes/families .
+ * Returns typography classnames depending on whether there are named font sizes/families.
+ *
+ * @since 6.1.0
  *
  * @param array $attributes The block attributes.
  *
@@ -493,6 +484,8 @@ function get_typography_classes_for_block_core_search( $attributes ) {
  * Returns typography styles to be included in an HTML style tag.
  * This excludes text-decoration, which is applied only to the label and button elements of the search block.
  *
+ * @since 6.1.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string A string of typography CSS declarations.
@@ -543,6 +536,8 @@ function get_typography_styles_for_block_core_search( $attributes ) {
 /**
  * Returns border color classnames depending on whether there are named or custom border colors.
  *
+ * @since 5.9.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string The border color classnames to be applied to the block elements.
@@ -566,6 +561,8 @@ function get_border_color_classes_for_block_core_search( $attributes ) {
 /**
  * Returns color classnames depending on whether there are named or custom text and background colors.
  *
+ * @since 5.9.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string The color classnames to be applied to the block elements.
diff --git a/packages/block-library/src/search/style.scss b/packages/block-library/src/search/style.scss
index b8a446721241b8..eb8e3051bada85 100644
--- a/packages/block-library/src/search/style.scss
+++ b/packages/block-library/src/search/style.scss
@@ -12,6 +12,8 @@ $button-spacing-y: math.div($grid-unit-15, 2); // 6px
 	svg {
 		min-width: $grid-unit-30;
 		min-height: $grid-unit-30;
+		width: 1.25em;
+		height: 1.25em;
 		fill: currentColor;
 		vertical-align: text-bottom;
 	}
@@ -62,35 +64,7 @@ $button-spacing-y: math.div($grid-unit-15, 2); // 6px
 	.wp-block-search__button[aria-expanded="true"] {
 		max-width: calc(100% - 100px);
 	}
-}
-
-// We are lowering the specificity so that the button element can override the rule for the button inside the search block.
-:where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) {
-	padding: $grid-unit-05;
-	border: 1px solid $gray-600;
-	box-sizing: border-box;
-
-	.wp-block-search__input {
-		border-radius: 0;
-		border: none;
-		padding: 0 $grid-unit-05;
-
-		&:focus {
-			outline: none;
-		}
-	}
-
-	// For lower specificity.
-	:where(.wp-block-search__button) {
-		padding: $grid-unit-05 $grid-unit-10;
-	}
-}
 
-.wp-block-search.aligncenter .wp-block-search__inside-wrapper {
-	margin: auto;
-}
-
-.wp-block-search__button-behavior-expand {
 	.wp-block-search__inside-wrapper {
 		transition-property: width;
 		min-width: 0 !important;
@@ -123,7 +97,44 @@ $button-spacing-y: math.div($grid-unit-15, 2); // 6px
 	}
 }
 
-.wp-block[data-align="right"] .wp-block-search__button-behavior-expand {
+// We are lowering the specificity so that the input element can override the rule for the input element inside the search block.
+:where(.wp-block-search__input) {
+	font-family: inherit;
+	font-weight: inherit;
+	font-size: inherit;
+	line-height: inherit;
+	letter-spacing: inherit;
+	text-transform: inherit;
+	font-style: inherit;
+}
+
+// We are lowering the specificity so that the button element can override the rule for the button inside the search block.
+:where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) {
+	padding: $grid-unit-05;
+	border: 1px solid $gray-600;
+	box-sizing: border-box;
+
+	.wp-block-search__input {
+		border-radius: 0;
+		border: none;
+		padding: 0 $grid-unit-05;
+
+		&:focus {
+			outline: none;
+		}
+	}
+
+	// For lower specificity.
+	:where(.wp-block-search__button) {
+		padding: $grid-unit-05 $grid-unit-10;
+	}
+}
+
+.wp-block-search.aligncenter .wp-block-search__inside-wrapper {
+	margin: auto;
+}
+
+.wp-block[data-align="right"] .wp-block-search.wp-block-search__button-only {
 	.wp-block-search__inside-wrapper {
 		float: right;
 	}
diff --git a/packages/block-library/src/search/view.js b/packages/block-library/src/search/view.js
index b633bf971f363a..0e4c462a2e3213 100644
--- a/packages/block-library/src/search/view.js
+++ b/packages/block-library/src/search/view.js
@@ -3,66 +3,70 @@
  */
 import { store, getContext, getElement } from '@wordpress/interactivity';
 
-const { actions } = store( 'core/search', {
-	state: {
-		get ariaLabel() {
-			const {
-				isSearchInputVisible,
-				ariaLabelCollapsed,
-				ariaLabelExpanded,
-			} = getContext();
-			return isSearchInputVisible
-				? ariaLabelExpanded
-				: ariaLabelCollapsed;
+const { actions } = store(
+	'core/search',
+	{
+		state: {
+			get ariaLabel() {
+				const {
+					isSearchInputVisible,
+					ariaLabelCollapsed,
+					ariaLabelExpanded,
+				} = getContext();
+				return isSearchInputVisible
+					? ariaLabelExpanded
+					: ariaLabelCollapsed;
+			},
+			get ariaControls() {
+				const { isSearchInputVisible, inputId } = getContext();
+				return isSearchInputVisible ? null : inputId;
+			},
+			get type() {
+				const { isSearchInputVisible } = getContext();
+				return isSearchInputVisible ? 'submit' : 'button';
+			},
+			get tabindex() {
+				const { isSearchInputVisible } = getContext();
+				return isSearchInputVisible ? '0' : '-1';
+			},
 		},
-		get ariaControls() {
-			const { isSearchInputVisible, inputId } = getContext();
-			return isSearchInputVisible ? null : inputId;
-		},
-		get type() {
-			const { isSearchInputVisible } = getContext();
-			return isSearchInputVisible ? 'submit' : 'button';
-		},
-		get tabindex() {
-			const { isSearchInputVisible } = getContext();
-			return isSearchInputVisible ? '0' : '-1';
-		},
-	},
-	actions: {
-		openSearchInput( event ) {
-			const ctx = getContext();
-			const { ref } = getElement();
-			if ( ! ctx.isSearchInputVisible ) {
-				event.preventDefault();
-				ctx.isSearchInputVisible = true;
-				ref.parentElement.querySelector( 'input' ).focus();
-			}
-		},
-		closeSearchInput() {
-			const ctx = getContext();
-			ctx.isSearchInputVisible = false;
-		},
-		handleSearchKeydown( event ) {
-			const { ref } = getElement();
-			// If Escape close the menu.
-			if ( event?.key === 'Escape' ) {
-				actions.closeSearchInput();
-				ref.querySelector( 'button' ).focus();
-			}
-		},
-		handleSearchFocusout( event ) {
-			const { ref } = getElement();
-			// If focus is outside search form, and in the document, close menu
-			// event.target === The element losing focus
-			// event.relatedTarget === The element receiving focus (if any)
-			// When focusout is outside the document,
-			// `window.document.activeElement` doesn't change.
-			if (
-				! ref.contains( event.relatedTarget ) &&
-				event.target !== window.document.activeElement
-			) {
-				actions.closeSearchInput();
-			}
+		actions: {
+			openSearchInput( event ) {
+				const ctx = getContext();
+				const { ref } = getElement();
+				if ( ! ctx.isSearchInputVisible ) {
+					event.preventDefault();
+					ctx.isSearchInputVisible = true;
+					ref.parentElement.querySelector( 'input' ).focus();
+				}
+			},
+			closeSearchInput() {
+				const ctx = getContext();
+				ctx.isSearchInputVisible = false;
+			},
+			handleSearchKeydown( event ) {
+				const { ref } = getElement();
+				// If Escape close the menu.
+				if ( event?.key === 'Escape' ) {
+					actions.closeSearchInput();
+					ref.querySelector( 'button' ).focus();
+				}
+			},
+			handleSearchFocusout( event ) {
+				const { ref } = getElement();
+				// If focus is outside search form, and in the document, close menu
+				// event.target === The element losing focus
+				// event.relatedTarget === The element receiving focus (if any)
+				// When focusout is outside the document,
+				// `window.document.activeElement` doesn't change.
+				if (
+					! ref.contains( event.relatedTarget ) &&
+					event.target !== window.document.activeElement
+				) {
+					actions.closeSearchInput();
+				}
+			},
 		},
 	},
-} );
+	{ lock: true }
+);
diff --git a/packages/block-library/src/separator/block.json b/packages/block-library/src/separator/block.json
index 970f6b5cbb5821..484627aaa1612a 100644
--- a/packages/block-library/src/separator/block.json
+++ b/packages/block-library/src/separator/block.json
@@ -28,6 +28,9 @@
 		},
 		"spacing": {
 			"margin": [ "top", "bottom" ]
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"styles": [
diff --git a/packages/block-library/src/separator/deprecated.js b/packages/block-library/src/separator/deprecated.js
index 43cad97fd9ee9b..5174310e186ff0 100644
--- a/packages/block-library/src/separator/deprecated.js
+++ b/packages/block-library/src/separator/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -27,7 +27,7 @@ const v1 = {
 		// using color, not backgroundColor
 		const colorClass = getColorClassName( 'color', color );
 
-		const className = classnames( {
+		const className = clsx( {
 			'has-text-color has-background': color || customColor,
 			[ backgroundClass ]: backgroundClass,
 			[ colorClass ]: colorClass,
diff --git a/packages/block-library/src/separator/edit.js b/packages/block-library/src/separator/edit.js
index 5ce522737f4508..0d0af336713c15 100644
--- a/packages/block-library/src/separator/edit.js
+++ b/packages/block-library/src/separator/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -30,7 +30,7 @@ export default function SeparatorEdit( { attributes, setAttributes } ) {
 	// using color, not backgroundColor.
 	const colorClass = getColorClassName( 'color', backgroundColor );
 
-	const className = classnames(
+	const className = clsx(
 		{
 			'has-text-color': backgroundColor || currentColor,
 			[ colorClass ]: colorClass,
diff --git a/packages/block-library/src/separator/editor.scss b/packages/block-library/src/separator/editor.scss
index 220c6bd9d80e38..24e940684279e8 100644
--- a/packages/block-library/src/separator/editor.scss
+++ b/packages/block-library/src/separator/editor.scss
@@ -2,11 +2,4 @@
 	// Prevent margin collapsing so the area to select the separator is bigger.
 	padding-top: 0.1px;
 	padding-bottom: 0.1px;
-
-	// This is also set in style.scss, but needs a higher specificity in editor
-	// due to the way that color block supports adds additional background color styles.
-	&.wp-block-separator.is-style-dots {
-		background: none !important;
-		border: none;
-	}
 }
diff --git a/packages/block-library/src/separator/save.js b/packages/block-library/src/separator/save.js
index 55a67c980c24fc..12d2282eb1d3e3 100644
--- a/packages/block-library/src/separator/save.js
+++ b/packages/block-library/src/separator/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -23,7 +23,7 @@ export default function separatorSave( { attributes } ) {
 	// using color, not backgroundColor.
 	const colorClass = getColorClassName( 'color', backgroundColor );
 
-	const className = classnames(
+	const className = clsx(
 		{
 			'has-text-color': backgroundColor || customColor,
 			[ colorClass ]: colorClass,
diff --git a/packages/block-library/src/separator/style.scss b/packages/block-library/src/separator/style.scss
index e7965c8efe4daf..65e463bc513f48 100644
--- a/packages/block-library/src/separator/style.scss
+++ b/packages/block-library/src/separator/style.scss
@@ -1,30 +1,37 @@
 .wp-block-separator {
-	border-top: 1px solid currentColor;
-	border-bottom: 1px solid currentColor;
+	border-top: 2px solid currentColor;
 	// Default, thin style, is stored in theme.scss so it can be opted out of
 
-	// Unset the left and right borders by default, otherwise some browsers will render them as "inset".
+	// Unset the left, right and bottom borders by default, otherwise some browsers will render them as "inset".
 	border-left: none;
 	border-right: none;
+	border-bottom: none;
+}
 
-	// Dots style
-	&.is-style-dots {
-		// Override any background themes often set on the hr tag for this style.
-		// also override the color set in the editor since it's intented for normal HR
-		background: none !important;
-		border: none;
-		text-align: center;
-		line-height: 1;
-		height: auto;
+// Dots block style variation
+:root :where(.wp-block-separator.is-style-dots) {
+	text-align: center;
+	line-height: 1;
+	height: auto;
 
-		&::before {
-			content: "\00b7 \00b7 \00b7";
-			color: currentColor;
-			font-size: 1.5em;
-			letter-spacing: 2em;
-			/*rtl:ignore*/
-			padding-left: 2em;
-			font-family: serif;
-		}
+	&::before {
+		content: "\00b7 \00b7 \00b7";
+		color: currentColor;
+		font-size: 1.5em;
+		letter-spacing: 2em;
+		/*rtl:ignore*/
+		padding-left: 2em;
+		font-family: serif;
 	}
 }
+
+// The following overrides should be enforced regardless of global styles.
+// The dots block style uses a pseudo element to render the dots. Background
+// color and borders would break this aesthetic.
+.wp-block-separator.is-style-dots {
+	// Override any background themes often set on the hr tag for this style.
+	// also override the color set in the editor since it's intended for normal HR
+	background: none !important;
+	// Important required to ensure dots does not get a border.
+	border: none !important;
+}
diff --git a/packages/block-library/src/separator/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/separator/test/__snapshots__/transforms.native.js.snap
index 8aa4a99b7a0381..6ffb73467852d9 100644
--- a/packages/block-library/src/separator/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/separator/test/__snapshots__/transforms.native.js.snap
@@ -17,3 +17,9 @@ exports[`Separator block transforms to Group block 1`] = `
 <!-- /wp:separator --></div>
 <!-- /wp:group -->"
 `;
+
+exports[`Separator block transforms to Spacer block 1`] = `
+"<!-- wp:spacer -->
+<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->"
+`;
diff --git a/packages/block-library/src/separator/test/transforms.native.js b/packages/block-library/src/separator/test/transforms.native.js
index f0873c7cd59e42..a5250025398d0e 100644
--- a/packages/block-library/src/separator/test/transforms.native.js
+++ b/packages/block-library/src/separator/test/transforms.native.js
@@ -16,7 +16,7 @@ const initialHtml = `
 <!-- /wp:separator -->`;
 
 const transformsWithInnerBlocks = [ 'Columns', 'Group' ];
-const blockTransforms = [ ...transformsWithInnerBlocks ];
+const blockTransforms = [ 'Spacer', ...transformsWithInnerBlocks ];
 
 setupCoreBlocks();
 
diff --git a/packages/block-library/src/separator/transforms.js b/packages/block-library/src/separator/transforms.js
index 06d9d667caf63d..1f40cb5dba8b5e 100644
--- a/packages/block-library/src/separator/transforms.js
+++ b/packages/block-library/src/separator/transforms.js
@@ -18,6 +18,17 @@ const transforms = {
 			},
 		},
 	],
+	to: [
+		{
+			type: 'block',
+			blocks: [ 'core/spacer' ], // Transform to Spacer.
+			transform: ( { anchor } ) => {
+				return createBlock( 'core/spacer', {
+					anchor: anchor || '',
+				} );
+			},
+		},
+	],
 };
 
 export default transforms;
diff --git a/packages/block-library/src/shortcode/edit.js b/packages/block-library/src/shortcode/edit.js
index aecebd115a983f..b3063077fe3085 100644
--- a/packages/block-library/src/shortcode/edit.js
+++ b/packages/block-library/src/shortcode/edit.js
@@ -4,29 +4,25 @@
 import { __ } from '@wordpress/i18n';
 import { PlainText, useBlockProps } from '@wordpress/block-editor';
 import { useInstanceId } from '@wordpress/compose';
-import { Icon, shortcode } from '@wordpress/icons';
+import { Placeholder } from '@wordpress/components';
+import { shortcode } from '@wordpress/icons';
 
 export default function ShortcodeEdit( { attributes, setAttributes } ) {
 	const instanceId = useInstanceId( ShortcodeEdit );
 	const inputId = `blocks-shortcode-input-${ instanceId }`;
 
 	return (
-		<div { ...useBlockProps( { className: 'components-placeholder' } ) }>
-			<label
-				htmlFor={ inputId }
-				className="components-placeholder__label"
-			>
-				<Icon icon={ shortcode } />
-				{ __( 'Shortcode' ) }
-			</label>
-			<PlainText
-				className="blocks-shortcode__textarea"
-				id={ inputId }
-				value={ attributes.text }
-				aria-label={ __( 'Shortcode text' ) }
-				placeholder={ __( 'Write shortcode here…' ) }
-				onChange={ ( text ) => setAttributes( { text } ) }
-			/>
+		<div { ...useBlockProps() }>
+			<Placeholder icon={ shortcode } label={ __( 'Shortcode' ) }>
+				<PlainText
+					className="blocks-shortcode__textarea"
+					id={ inputId }
+					value={ attributes.text }
+					aria-label={ __( 'Shortcode text' ) }
+					placeholder={ __( 'Write shortcode here…' ) }
+					onChange={ ( text ) => setAttributes( { text } ) }
+				/>
+			</Placeholder>
 		</div>
 	);
 }
diff --git a/packages/block-library/src/shortcode/editor.scss b/packages/block-library/src/shortcode/editor.scss
index 56586df8eefd23..6e7f482ad19f4f 100644
--- a/packages/block-library/src/shortcode/editor.scss
+++ b/packages/block-library/src/shortcode/editor.scss
@@ -1,9 +1,3 @@
-[data-type="core/shortcode"] {
-	&.components-placeholder {
-		min-height: 0;
-	}
-}
-
 // The editing view for the Shortcode block is equivalent to block UI.
 // Therefore we increase specificity to avoid theme styles bleeding in.
 .blocks-shortcode__textarea {
diff --git a/packages/block-library/src/shortcode/index.php b/packages/block-library/src/shortcode/index.php
index 97a40b386d9c92..d96acfc55fa64d 100644
--- a/packages/block-library/src/shortcode/index.php
+++ b/packages/block-library/src/shortcode/index.php
@@ -8,6 +8,8 @@
 /**
  * Performs wpautop() on the shortcode block content.
  *
+ * @since 5.0.0
+ *
  * @param array  $attributes The block attributes.
  * @param string $content    The block content.
  *
@@ -19,6 +21,8 @@ function render_block_core_shortcode( $attributes, $content ) {
 
 /**
  * Registers the `core/shortcode` block on server.
+ *
+ * @since 5.0.0
  */
 function register_block_core_shortcode() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/site-logo/block.json b/packages/block-library/src/site-logo/block.json
index d1e3d1b20c3dad..3bdbdc1b809ab1 100644
--- a/packages/block-library/src/site-logo/block.json
+++ b/packages/block-library/src/site-logo/block.json
@@ -45,6 +45,9 @@
 				"margin": false,
 				"padding": false
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"styles": [
diff --git a/packages/block-library/src/site-logo/edit.js b/packages/block-library/src/site-logo/edit.js
index cddfb5dfdc4fc4..36c217c1bf0c79 100644
--- a/packages/block-library/src/site-logo/edit.js
+++ b/packages/block-library/src/site-logo/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,11 +11,9 @@ import {
 	createInterpolateElement,
 	useEffect,
 	useState,
-	useRef,
 } from '@wordpress/element';
 import { __, isRTL } from '@wordpress/i18n';
 import {
-	MenuItem,
 	PanelBody,
 	RangeControl,
 	ResizableBox,
@@ -50,11 +48,6 @@ import { store as noticesStore } from '@wordpress/notices';
 /**
  * Internal dependencies
  */
-import useClientWidth from '../image/use-client-width';
-
-/**
- * Module constants
- */
 import { MIN_SIZE } from '../image/constants';
 
 const ALLOWED_MEDIA_TYPES = [ 'image' ];
@@ -63,7 +56,6 @@ const ACCEPT_MEDIA_STRING = 'image/*';
 const SiteLogo = ( {
 	alt,
 	attributes: { align, width, height, isLink, linkTarget, shouldSyncIcon },
-	containerRef,
 	isSelected,
 	setAttributes,
 	setLogo,
@@ -74,16 +66,12 @@ const SiteLogo = ( {
 	setIcon,
 	canUserEdit,
 } ) => {
-	const clientWidth = useClientWidth( containerRef, [ align ] );
 	const isLargeViewport = useViewportMatch( 'medium' );
 	const isWideAligned = [ 'wide', 'full' ].includes( align );
 	const isResizable = ! isWideAligned && isLargeViewport;
 	const [ { naturalWidth, naturalHeight }, setNaturalSize ] = useState( {} );
 	const [ isEditingImage, setIsEditingImage ] = useState( false );
 	const { toggleSelection } = useDispatch( blockEditorStore );
-	const classes = classnames( 'custom-logo-link', {
-		'is-transient': isBlobURL( logoUrl ),
-	} );
 	const { imageEditing, maxWidth, title } = useSelect( ( select ) => {
 		const settings = select( blockEditorStore ).getSettings();
 		const siteEntities = select( coreStore ).getEntityRecord(
@@ -121,17 +109,20 @@ const SiteLogo = ( {
 	}
 
 	const img = (
-		<img
-			className="custom-logo"
-			src={ logoUrl }
-			alt={ alt }
-			onLoad={ ( event ) => {
-				setNaturalSize( {
-					naturalWidth: event.target.naturalWidth,
-					naturalHeight: event.target.naturalHeight,
-				} );
-			} }
-		/>
+		<>
+			<img
+				className="custom-logo"
+				src={ logoUrl }
+				alt={ alt }
+				onLoad={ ( event ) => {
+					setNaturalSize( {
+						naturalWidth: event.target.naturalWidth,
+						naturalHeight: event.target.naturalHeight,
+					} );
+				} }
+			/>
+			{ isBlobURL( logoUrl ) && <Spinner /> }
+		</>
 	);
 
 	let imgWrapper = img;
@@ -143,7 +134,7 @@ const SiteLogo = ( {
 			/* eslint-disable jsx-a11y/no-noninteractive-element-interactions, jsx-a11y/click-events-have-key-events */
 			<a
 				href={ siteUrl }
-				className={ classes }
+				className="custom-logo-link"
 				rel="home"
 				title={ title }
 				onClick={ ( event ) => event.preventDefault() }
@@ -154,14 +145,7 @@ const SiteLogo = ( {
 		);
 	}
 
-	let imageWidthWithinContainer;
-
-	if ( clientWidth && naturalWidth && naturalHeight ) {
-		const exceedMaxWidth = naturalWidth > clientWidth;
-		imageWidthWithinContainer = exceedMaxWidth ? clientWidth : naturalWidth;
-	}
-
-	if ( ! isResizable || ! imageWidthWithinContainer ) {
+	if ( ! isResizable || ! naturalWidth || ! naturalHeight ) {
 		return <div style={ { width, height } }>{ imgWrapper }</div>;
 	}
 
@@ -227,7 +211,6 @@ const SiteLogo = ( {
 				url={ logoUrl }
 				width={ currentWidth }
 				height={ currentHeight }
-				clientWidth={ clientWidth }
 				naturalHeight={ naturalHeight }
 				naturalWidth={ naturalWidth }
 				onSaveImage={ ( imageAttributes ) => {
@@ -268,6 +251,14 @@ const SiteLogo = ( {
 			</ResizableBox>
 		);
 
+	// Support the previous location for the Site Icon settings. To be removed
+	// when the required WP core version for Gutenberg is >= 6.5.0.
+	const shouldUseNewUrl = ! window?.__experimentalUseCustomizerSiteLogoUrl;
+
+	const siteIconSettingsUrl = shouldUseNewUrl
+		? siteUrl + '/wp-admin/options-general.php'
+		: siteUrl + '/wp-admin/customize.php?autofocus[section]=title_tagline';
+
 	const syncSiteIconHelpText = createInterpolateElement(
 		__(
 			'Site Icons are what you see in browser tabs, bookmark bars, and within the WordPress mobile apps. To use a custom icon that is different from your site logo, use the <a>Site Icon settings</a>.'
@@ -276,10 +267,7 @@ const SiteLogo = ( {
 			a: (
 				// eslint-disable-next-line jsx-a11y/anchor-has-content
 				<a
-					href={
-						siteUrl +
-						'/wp-admin/customize.php?autofocus[section]=title_tagline'
-					}
+					href={ siteIconSettingsUrl }
 					target="_blank"
 					rel="noopener noreferrer"
 				/>
@@ -331,7 +319,7 @@ const SiteLogo = ( {
 						<>
 							<ToggleControl
 								__nextHasNoMarginBottom
-								label={ __( 'Use as site icon' ) }
+								label={ __( 'Use as Site Icon' ) }
 								onChange={ ( value ) => {
 									setAttributes( { shouldSyncIcon: value } );
 									setIcon( value ? logoId : undefined );
@@ -359,15 +347,19 @@ const SiteLogo = ( {
 
 // This is a light wrapper around MediaReplaceFlow because the block has two
 // different MediaReplaceFlows, one for the inspector and one for the toolbar.
-function SiteLogoReplaceFlow( { onRemoveLogo, ...mediaReplaceProps } ) {
+function SiteLogoReplaceFlow( {
+	mediaURL,
+	onRemoveLogo,
+	...mediaReplaceProps
+} ) {
 	return (
 		<MediaReplaceFlow
 			{ ...mediaReplaceProps }
+			mediaURL={ mediaURL }
 			allowedTypes={ ALLOWED_MEDIA_TYPES }
 			accept={ ACCEPT_MEDIA_STRING }
-		>
-			<MenuItem onClick={ onRemoveLogo }>{ __( 'Reset' ) }</MenuItem>
-		</MediaReplaceFlow>
+			onReset={ onRemoveLogo }
+		/>
 	);
 }
 
@@ -403,8 +395,6 @@ export default function LogoEdit( {
 	isSelected,
 } ) {
 	const { width, shouldSyncIcon } = attributes;
-	const ref = useRef();
-
 	const {
 		siteLogoId,
 		canUserEdit,
@@ -412,11 +402,13 @@ export default function LogoEdit( {
 		siteIconId,
 		mediaItemData,
 		isRequestingMediaItem,
-		mediaUpload,
 	} = useSelect( ( select ) => {
 		const { canUser, getEntityRecord, getEditedEntityRecord } =
 			select( coreStore );
-		const _canUserEdit = canUser( 'update', 'settings' );
+		const _canUserEdit = canUser( 'update', {
+			kind: 'root',
+			name: 'site',
+		} );
 		const siteSettings = _canUserEdit
 			? getEditedEntityRecord( 'root', 'site' )
 			: undefined;
@@ -431,7 +423,7 @@ export default function LogoEdit( {
 				context: 'view',
 			} );
 		const _isRequestingMediaItem =
-			_siteLogoId &&
+			!! _siteLogoId &&
 			! select( coreStore ).hasFinishedResolution( 'getMedia', [
 				_siteLogoId,
 				{ context: 'view' },
@@ -444,9 +436,10 @@ export default function LogoEdit( {
 			mediaItemData: mediaItem,
 			isRequestingMediaItem: _isRequestingMediaItem,
 			siteIconId: _siteIconId,
-			mediaUpload: select( blockEditorStore ).getSettings().mediaUpload,
 		};
 	}, [] );
+	const { getSettings } = useSelect( blockEditorStore );
+	const [ temporaryURL, setTemporaryURL ] = useState();
 
 	const { editEntityRecord } = useDispatch( coreStore );
 
@@ -493,6 +486,7 @@ export default function LogoEdit( {
 
 		if ( ! media.id && media.url ) {
 			// This is a temporary blob image.
+			setTemporaryURL( media.url );
 			setLogo( undefined );
 			return;
 		}
@@ -508,29 +502,33 @@ export default function LogoEdit( {
 	const { createErrorNotice } = useDispatch( noticesStore );
 	const onUploadError = ( message ) => {
 		createErrorNotice( message, { type: 'snackbar' } );
+		setTemporaryURL();
 	};
 
 	const onFilesDrop = ( filesList ) => {
-		mediaUpload( {
-			allowedTypes: [ 'image' ],
+		getSettings().mediaUpload( {
+			allowedTypes: ALLOWED_MEDIA_TYPES,
 			filesList,
 			onFileChange( [ image ] ) {
 				if ( isBlobURL( image?.url ) ) {
+					setTemporaryURL( image.url );
 					return;
 				}
 				onInitialSelectLogo( image );
 			},
 			onError: onUploadError,
+			onRemoveLogo,
 		} );
 	};
 
 	const mediaReplaceFlowProps = {
 		mediaURL: logoUrl,
+		name: ! logoUrl ? __( 'Choose logo' ) : __( 'Replace' ),
 		onSelect: onSelectLogo,
 		onError: onUploadError,
 		onRemoveLogo,
 	};
-	const controls = canUserEdit && logoUrl && (
+	const controls = canUserEdit && (
 		<BlockControls group="other">
 			<SiteLogoReplaceFlow { ...mediaReplaceFlowProps } />
 		</BlockControls>
@@ -541,27 +539,37 @@ export default function LogoEdit( {
 	if ( isLoading ) {
 		logoImage = <Spinner />;
 	}
-	if ( !! logoUrl ) {
+
+	// Reset temporary url when logoUrl is available.
+	useEffect( () => {
+		if ( logoUrl && temporaryURL ) {
+			setTemporaryURL();
+		}
+	}, [ logoUrl, temporaryURL ] );
+
+	if ( !! logoUrl || !! temporaryURL ) {
 		logoImage = (
-			<SiteLogo
-				alt={ alt }
-				attributes={ attributes }
-				className={ className }
-				containerRef={ ref }
-				isSelected={ isSelected }
-				setAttributes={ setAttributes }
-				logoUrl={ logoUrl }
-				setLogo={ setLogo }
-				logoId={ mediaItemData?.id || siteLogoId }
-				siteUrl={ url }
-				setIcon={ setIcon }
-				iconId={ siteIconId }
-				canUserEdit={ canUserEdit }
-			/>
+			<>
+				<SiteLogo
+					alt={ alt }
+					attributes={ attributes }
+					className={ className }
+					isSelected={ isSelected }
+					setAttributes={ setAttributes }
+					logoUrl={ temporaryURL || logoUrl }
+					setLogo={ setLogo }
+					logoId={ mediaItemData?.id || siteLogoId }
+					siteUrl={ url }
+					setIcon={ setIcon }
+					iconId={ siteIconId }
+					canUserEdit={ canUserEdit }
+				/>
+				{ canUserEdit && <DropZone onFilesDrop={ onFilesDrop } /> }
+			</>
 		);
 	}
 	const placeholder = ( content ) => {
-		const placeholderClassName = classnames(
+		const placeholderClassName = clsx(
 			'block-editor-media-placeholder',
 			className
 		);
@@ -570,7 +578,7 @@ export default function LogoEdit( {
 			<Placeholder
 				className={ placeholderClassName }
 				preview={ logoImage }
-				withIllustration={ true }
+				withIllustration
 				style={ {
 					width,
 				} }
@@ -580,16 +588,12 @@ export default function LogoEdit( {
 		);
 	};
 
-	const classes = classnames( className, {
+	const classes = clsx( className, {
 		'is-default-size': ! width,
+		'is-transient': temporaryURL,
 	} );
 
-	const blockProps = useBlockProps( {
-		ref,
-		className: classes,
-	} );
-
-	const label = __( 'Add a site logo' );
+	const blockProps = useBlockProps( { className: classes } );
 
 	const mediaInspectorPanel = ( canUserEdit || logoUrl ) && (
 		<InspectorControls>
@@ -624,13 +628,14 @@ export default function LogoEdit( {
 								render={ ( { open } ) => (
 									<div className="block-library-site-logo__inspector-upload-container">
 										<Button
+											__next40pxDefaultSize
 											onClick={ open }
 											variant="secondary"
 										>
 											{ isLoading ? (
 												<Spinner />
 											) : (
-												__( 'Add media' )
+												__( 'Choose logo' )
 											) }
 										</Button>
 										<DropZone onFilesDrop={ onFilesDrop } />
@@ -648,17 +653,18 @@ export default function LogoEdit( {
 		<div { ...blockProps }>
 			{ controls }
 			{ mediaInspectorPanel }
-			{ !! logoUrl && logoImage }
-			{ ! logoUrl && ! canUserEdit && (
-				<Placeholder className="site-logo_placeholder">
-					{ !! isLoading && (
+			{ ( !! logoUrl || !! temporaryURL ) && logoImage }
+			{ ( isLoading ||
+				( ! temporaryURL && ! logoUrl && ! canUserEdit ) ) && (
+				<Placeholder className="site-logo_placeholder" withIllustration>
+					{ isLoading && (
 						<span className="components-placeholder__preview">
 							<Spinner />
 						</span>
 					) }
 				</Placeholder>
 			) }
-			{ ! logoUrl && canUserEdit && (
+			{ ! isLoading && ! temporaryURL && ! logoUrl && canUserEdit && (
 				<MediaPlaceholder
 					onSelect={ onInitialSelectLogo }
 					accept={ ACCEPT_MEDIA_STRING }
@@ -668,11 +674,12 @@ export default function LogoEdit( {
 					mediaLibraryButton={ ( { open } ) => {
 						return (
 							<Button
+								__next40pxDefaultSize
 								icon={ upload }
 								variant="primary"
-								label={ label }
+								label={ __( 'Choose logo' ) }
 								showTooltip
-								tooltipPosition="top center"
+								tooltipPosition="middle right"
 								onClick={ () => {
 									open();
 								} }
diff --git a/packages/block-library/src/site-logo/editor.scss b/packages/block-library/src/site-logo/editor.scss
index 837cf8df688c16..2f9d1917079bec 100644
--- a/packages/block-library/src/site-logo/editor.scss
+++ b/packages/block-library/src/site-logo/editor.scss
@@ -17,10 +17,6 @@
 		&:focus {
 			box-shadow: none;
 		}
-
-		&.is-transient img {
-			opacity: 0.3;
-		}
 	}
 
 	img {
@@ -28,10 +24,27 @@
 		height: auto;
 		max-width: 100%;
 	}
+
+	&.is-transient {
+		position: relative;
+
+		img {
+			opacity: 0.3;
+		}
+
+		// Shown while image is being uploaded.
+		.components-spinner {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			margin: 0;
+		}
+	}
 }
 
 // Provide special styling for the placeholder.
-// @todo: this particular minimal style of placeholder could be componentized further.
+// @todo this particular minimal style of placeholder could be componentized further.
 .wp-block-site-logo.wp-block-site-logo {
 
 	&.is-default-size .components-placeholder {
@@ -54,7 +67,7 @@
 		border-radius: inherit;
 
 		// Provide a minimum size for the placeholder, for when the logo is resized.
-		// @todo: resizing is currently only possible by adding an image, resizing,
+		// @todo resizing is currently only possible by adding an image, resizing,
 		// and then removing the image again. We might want to enable resizing on the
 		// placeholder itself.
 		min-height: $grid-unit-60;
@@ -75,6 +88,7 @@
 		// Style the upload button.
 		.components-button.components-button {
 			padding: 0;
+			margin: auto;
 			display: flex;
 			justify-content: center;
 			align-items: center;
diff --git a/packages/block-library/src/site-logo/index.php b/packages/block-library/src/site-logo/index.php
index f1819fcaac8d03..915563461e30ce 100644
--- a/packages/block-library/src/site-logo/index.php
+++ b/packages/block-library/src/site-logo/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/site-logo` block on the server.
  *
+ * @since 5.8.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string The render.
@@ -60,6 +62,8 @@ function render_block_core_site_logo( $attributes ) {
 
 /**
  * Register a core site setting for a site logo
+ *
+ * @since 5.8.0
  */
 function register_block_core_site_logo_setting() {
 	register_setting(
@@ -70,6 +74,7 @@ function register_block_core_site_logo_setting() {
 				'name' => 'site_logo',
 			),
 			'type'         => 'integer',
+			'label'        => __( 'Logo' ),
 			'description'  => __( 'Site logo.' ),
 		)
 	);
@@ -79,6 +84,8 @@ function register_block_core_site_logo_setting() {
 
 /**
  * Register a core site setting for a site icon
+ *
+ * @since 5.9.0
  */
 function register_block_core_site_icon_setting() {
 	register_setting(
@@ -87,6 +94,7 @@ function register_block_core_site_icon_setting() {
 		array(
 			'show_in_rest' => true,
 			'type'         => 'integer',
+			'label'        => __( 'Icon' ),
 			'description'  => __( 'Site icon.' ),
 		)
 	);
@@ -96,6 +104,8 @@ function register_block_core_site_icon_setting() {
 
 /**
  * Registers the `core/site-logo` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_site_logo() {
 	register_block_type_from_metadata(
@@ -111,6 +121,8 @@ function register_block_core_site_logo() {
 /**
  * Overrides the custom logo with a site logo, if the option is set.
  *
+ * @since 5.8.0
+ *
  * @param string $custom_logo The custom logo set by a theme.
  *
  * @return string The site logo if set.
@@ -125,6 +137,8 @@ function _override_custom_logo_theme_mod( $custom_logo ) {
 /**
  * Updates the site_logo option when the custom_logo theme-mod gets updated.
  *
+ * @since 5.8.0
+ *
  * @param  mixed $value Attachment ID of the custom logo or an empty value.
  * @return mixed
  */
@@ -143,6 +157,10 @@ function _sync_custom_logo_to_site_logo( $value ) {
 /**
  * Deletes the site_logo when the custom_logo theme mod is removed.
  *
+ * @since 5.8.0
+ *
+ * @global array $_ignore_site_logo_changes
+ *
  * @param array $old_value Previous theme mod settings.
  * @param array $value     Updated theme mod settings.
  */
@@ -161,6 +179,10 @@ function _delete_site_logo_on_remove_custom_logo( $old_value, $value ) {
 
 /**
  * Deletes the site logo when all theme mods are being removed.
+ *
+ * @since 5.8.0
+ *
+ * @global array $_ignore_site_logo_changes
  */
 function _delete_site_logo_on_remove_theme_mods() {
 	global $_ignore_site_logo_changes;
@@ -179,6 +201,8 @@ function _delete_site_logo_on_remove_theme_mods() {
  * Hooks `_delete_site_logo_on_remove_theme_mods` in `delete_option_theme_mods_$theme`.
  *
  * Runs on `setup_theme` to account for dynamically-switched themes in the Customizer.
+ *
+ * @since 5.8.0
  */
 function _delete_site_logo_on_remove_custom_logo_on_setup_theme() {
 	$theme = get_option( 'stylesheet' );
@@ -189,6 +213,10 @@ function _delete_site_logo_on_remove_custom_logo_on_setup_theme() {
 
 /**
  * Removes the custom_logo theme-mod when the site_logo option gets deleted.
+ *
+ * @since 5.9.0
+ *
+ * @global array $_ignore_site_logo_changes
  */
 function _delete_custom_logo_on_remove_site_logo() {
 	global $_ignore_site_logo_changes;
diff --git a/packages/block-library/src/site-logo/style.scss b/packages/block-library/src/site-logo/style.scss
index ca9c92539b6760..020b7aab5370b3 100644
--- a/packages/block-library/src/site-logo/style.scss
+++ b/packages/block-library/src/site-logo/style.scss
@@ -31,11 +31,11 @@
 		margin-right: auto;
 		text-align: center;
 	}
+}
 
-	// Style variations
-	&.is-style-rounded {
-		// We use an absolute pixel to prevent the oval shape that a value of 50% would give
-		// to rectangular images. A pill-shape is better than otherwise.
-		border-radius: 9999px;
-	}
+// Style variations
+:root :where(.wp-block-site-logo.is-style-rounded) {
+	// We use an absolute pixel to prevent the oval shape that a value of 50% would give
+	// to rectangular images. A pill-shape is better than otherwise.
+	border-radius: 9999px;
 }
diff --git a/packages/block-library/src/site-tagline/block.json b/packages/block-library/src/site-tagline/block.json
index 22fb59aab5ead7..d42b7bcd4bed64 100644
--- a/packages/block-library/src/site-tagline/block.json
+++ b/packages/block-library/src/site-tagline/block.json
@@ -10,9 +10,22 @@
 	"attributes": {
 		"textAlign": {
 			"type": "string"
+		},
+		"level": {
+			"type": "number",
+			"default": 0
+		},
+		"levelOptions": {
+			"type": "array",
+			"default": [ 0, 1, 2, 3, 4, 5, 6 ]
+		}
+	},
+	"example": {
+		"viewportWidth": 350,
+		"attributes": {
+			"textAlign": "center"
 		}
 	},
-	"example": {},
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
@@ -40,10 +53,21 @@
 			"__experimentalFontStyle": true,
 			"__experimentalFontWeight": true,
 			"__experimentalLetterSpacing": true,
+			"__experimentalWritingMode": true,
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true
 		}
 	},
-	"editorStyle": "wp-block-site-tagline-editor"
+	"editorStyle": "wp-block-site-tagline-editor",
+	"style": "wp-block-site-tagline"
 }
diff --git a/packages/block-library/src/site-tagline/edit.js b/packages/block-library/src/site-tagline/edit.js
index 1ce13c6eb43c49..52b9c761ba4f54 100644
--- a/packages/block-library/src/site-tagline/edit.js
+++ b/packages/block-library/src/site-tagline/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,6 +12,7 @@ import {
 	AlignmentControl,
 	useBlockProps,
 	BlockControls,
+	HeadingLevelDropdown,
 	RichText,
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
@@ -22,22 +23,26 @@ export default function SiteTaglineEdit( {
 	setAttributes,
 	insertBlocksAfter,
 } ) {
-	const { textAlign } = attributes;
+	const { textAlign, level, levelOptions } = attributes;
 	const { canUserEdit, tagline } = useSelect( ( select ) => {
 		const { canUser, getEntityRecord, getEditedEntityRecord } =
 			select( coreStore );
-		const canEdit = canUser( 'update', 'settings' );
+		const canEdit = canUser( 'update', {
+			kind: 'root',
+			name: 'site',
+		} );
 		const settings = canEdit ? getEditedEntityRecord( 'root', 'site' ) : {};
 		const readOnlySettings = getEntityRecord( 'root', '__unstableBase' );
 
 		return {
-			canUserEdit: canUser( 'update', 'settings' ),
+			canUserEdit: canEdit,
 			tagline: canEdit
 				? settings?.description
 				: readOnlySettings?.description,
 		};
 	}, [] );
 
+	const TagName = level === 0 ? 'p' : `h${ level }`;
 	const { editEntityRecord } = useDispatch( coreStore );
 
 	function setTagline( newTagline ) {
@@ -47,7 +52,7 @@ export default function SiteTaglineEdit( {
 	}
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 			'wp-block-site-tagline__placeholder': ! canUserEdit && ! tagline,
 		} ),
@@ -58,7 +63,7 @@ export default function SiteTaglineEdit( {
 			onChange={ setTagline }
 			aria-label={ __( 'Site tagline text' ) }
 			placeholder={ __( 'Write site tagline…' ) }
-			tagName="p"
+			tagName={ TagName }
 			value={ tagline }
 			disableLineBreaks
 			__unstableOnSplitAtEnd={ () =>
@@ -67,11 +72,20 @@ export default function SiteTaglineEdit( {
 			{ ...blockProps }
 		/>
 	) : (
-		<p { ...blockProps }>{ tagline || __( 'Site Tagline placeholder' ) }</p>
+		<TagName { ...blockProps }>
+			{ tagline || __( 'Site Tagline placeholder' ) }
+		</TagName>
 	);
 	return (
 		<>
 			<BlockControls group="block">
+				<HeadingLevelDropdown
+					value={ level }
+					options={ levelOptions }
+					onChange={ ( newLevel ) =>
+						setAttributes( { level: newLevel } )
+					}
+				/>
 				<AlignmentControl
 					onChange={ ( newAlign ) =>
 						setAttributes( { textAlign: newAlign } )
diff --git a/packages/block-library/src/site-tagline/index.php b/packages/block-library/src/site-tagline/index.php
index 75375e5bb1e792..b59e1e556c320c 100644
--- a/packages/block-library/src/site-tagline/index.php
+++ b/packages/block-library/src/site-tagline/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/site-tagline` block on the server.
  *
+ * @since 5.8.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string The render.
@@ -17,11 +19,18 @@ function render_block_core_site_tagline( $attributes ) {
 	if ( ! $site_tagline ) {
 		return;
 	}
+
+	$tag_name           = 'p';
 	$align_class_name   = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
 
+	if ( isset( $attributes['level'] ) && 0 !== $attributes['level'] ) {
+		$tag_name = 'h' . (int) $attributes['level'];
+	}
+
 	return sprintf(
-		'<p %1$s>%2$s</p>',
+		'<%1$s %2$s>%3$s</%1$s>',
+		$tag_name,
 		$wrapper_attributes,
 		$site_tagline
 	);
@@ -29,6 +38,8 @@ function render_block_core_site_tagline( $attributes ) {
 
 /**
  * Registers the `core/site-tagline` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_site_tagline() {
 	register_block_type_from_metadata(
@@ -38,4 +49,5 @@ function register_block_core_site_tagline() {
 		)
 	);
 }
+
 add_action( 'init', 'register_block_core_site_tagline' );
diff --git a/packages/block-library/src/site-tagline/style.scss b/packages/block-library/src/site-tagline/style.scss
new file mode 100644
index 00000000000000..a22eeebb6e2777
--- /dev/null
+++ b/packages/block-library/src/site-tagline/style.scss
@@ -0,0 +1,4 @@
+.wp-block-site-tagline {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/site-title/block.json b/packages/block-library/src/site-title/block.json
index 4a2685e6941fc6..c75b1bc229beb9 100644
--- a/packages/block-library/src/site-title/block.json
+++ b/packages/block-library/src/site-title/block.json
@@ -11,6 +11,10 @@
 			"type": "number",
 			"default": 1
 		},
+		"levelOptions": {
+			"type": "array",
+			"default": [ 0, 1, 2, 3, 4, 5, 6 ]
+		},
 		"textAlign": {
 			"type": "string"
 		},
@@ -55,9 +59,19 @@
 			"__experimentalFontStyle": true,
 			"__experimentalFontWeight": true,
 			"__experimentalLetterSpacing": true,
+			"__experimentalWritingMode": true,
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true
 		}
 	},
 	"editorStyle": "wp-block-site-title-editor",
diff --git a/packages/block-library/src/site-title/edit.js b/packages/block-library/src/site-title/edit.js
new file mode 100644
index 00000000000000..82e3c1d7f7bb40
--- /dev/null
+++ b/packages/block-library/src/site-title/edit.js
@@ -0,0 +1,136 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { __ } from '@wordpress/i18n';
+import {
+	RichText,
+	AlignmentControl,
+	InspectorControls,
+	BlockControls,
+	useBlockProps,
+	HeadingLevelDropdown,
+} from '@wordpress/block-editor';
+import { ToggleControl, PanelBody } from '@wordpress/components';
+import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
+import { decodeEntities } from '@wordpress/html-entities';
+
+export default function SiteTitleEdit( {
+	attributes,
+	setAttributes,
+	insertBlocksAfter,
+} ) {
+	const { level, levelOptions, textAlign, isLink, linkTarget } = attributes;
+	const { canUserEdit, title } = useSelect( ( select ) => {
+		const { canUser, getEntityRecord, getEditedEntityRecord } =
+			select( coreStore );
+		const canEdit = canUser( 'update', {
+			kind: 'root',
+			name: 'site',
+		} );
+		const settings = canEdit ? getEditedEntityRecord( 'root', 'site' ) : {};
+		const readOnlySettings = getEntityRecord( 'root', '__unstableBase' );
+
+		return {
+			canUserEdit: canEdit,
+			title: canEdit ? settings?.title : readOnlySettings?.name,
+		};
+	}, [] );
+	const { editEntityRecord } = useDispatch( coreStore );
+
+	function setTitle( newTitle ) {
+		editEntityRecord( 'root', 'site', undefined, {
+			title: newTitle,
+		} );
+	}
+
+	const TagName = level === 0 ? 'p' : `h${ level }`;
+	const blockProps = useBlockProps( {
+		className: clsx( {
+			[ `has-text-align-${ textAlign }` ]: textAlign,
+			'wp-block-site-title__placeholder': ! canUserEdit && ! title,
+		} ),
+	} );
+	const siteTitleContent = canUserEdit ? (
+		<TagName { ...blockProps }>
+			<RichText
+				tagName={ isLink ? 'a' : 'span' }
+				href={ isLink ? '#site-title-pseudo-link' : undefined }
+				aria-label={ __( 'Site title text' ) }
+				placeholder={ __( 'Write site title…' ) }
+				value={ title }
+				onChange={ setTitle }
+				allowedFormats={ [] }
+				disableLineBreaks
+				__unstableOnSplitAtEnd={ () =>
+					insertBlocksAfter( createBlock( getDefaultBlockName() ) )
+				}
+			/>
+		</TagName>
+	) : (
+		<TagName { ...blockProps }>
+			{ isLink ? (
+				<a
+					href="#site-title-pseudo-link"
+					onClick={ ( event ) => event.preventDefault() }
+				>
+					{ decodeEntities( title ) ||
+						__( 'Site Title placeholder' ) }
+				</a>
+			) : (
+				<span>
+					{ decodeEntities( title ) ||
+						__( 'Site Title placeholder' ) }
+				</span>
+			) }
+		</TagName>
+	);
+	return (
+		<>
+			<BlockControls group="block">
+				<HeadingLevelDropdown
+					value={ level }
+					options={ levelOptions }
+					onChange={ ( newLevel ) =>
+						setAttributes( { level: newLevel } )
+					}
+				/>
+				<AlignmentControl
+					value={ textAlign }
+					onChange={ ( nextAlign ) => {
+						setAttributes( { textAlign: nextAlign } );
+					} }
+				/>
+			</BlockControls>
+			<InspectorControls>
+				<PanelBody title={ __( 'Settings' ) }>
+					<ToggleControl
+						__nextHasNoMarginBottom
+						label={ __( 'Make title link to home' ) }
+						onChange={ () => setAttributes( { isLink: ! isLink } ) }
+						checked={ isLink }
+					/>
+					{ isLink && (
+						<ToggleControl
+							__nextHasNoMarginBottom
+							label={ __( 'Open in new tab' ) }
+							onChange={ ( value ) =>
+								setAttributes( {
+									linkTarget: value ? '_blank' : '_self',
+								} )
+							}
+							checked={ linkTarget === '_blank' }
+						/>
+					) }
+				</PanelBody>
+			</InspectorControls>
+			{ siteTitleContent }
+		</>
+	);
+}
diff --git a/packages/block-library/src/site-title/edit/index.js b/packages/block-library/src/site-title/edit/index.js
deleted file mode 100644
index ad3136d106557f..00000000000000
--- a/packages/block-library/src/site-title/edit/index.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { useDispatch, useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import { __ } from '@wordpress/i18n';
-import {
-	RichText,
-	AlignmentControl,
-	InspectorControls,
-	BlockControls,
-	useBlockProps,
-	HeadingLevelDropdown,
-} from '@wordpress/block-editor';
-import { ToggleControl, PanelBody } from '@wordpress/components';
-import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
-import { decodeEntities } from '@wordpress/html-entities';
-
-const HEADING_LEVELS = [ 0, 1, 2, 3, 4, 5, 6 ];
-
-export default function SiteTitleEdit( {
-	attributes,
-	setAttributes,
-	insertBlocksAfter,
-} ) {
-	const { level, textAlign, isLink, linkTarget } = attributes;
-	const { canUserEdit, title } = useSelect( ( select ) => {
-		const { canUser, getEntityRecord, getEditedEntityRecord } =
-			select( coreStore );
-		const canEdit = canUser( 'update', 'settings' );
-		const settings = canEdit ? getEditedEntityRecord( 'root', 'site' ) : {};
-		const readOnlySettings = getEntityRecord( 'root', '__unstableBase' );
-
-		return {
-			canUserEdit: canEdit,
-			title: canEdit ? settings?.title : readOnlySettings?.name,
-		};
-	}, [] );
-	const { editEntityRecord } = useDispatch( coreStore );
-
-	function setTitle( newTitle ) {
-		editEntityRecord( 'root', 'site', undefined, {
-			title: newTitle,
-		} );
-	}
-
-	const TagName = level === 0 ? 'p' : `h${ level }`;
-	const blockProps = useBlockProps( {
-		className: classnames( {
-			[ `has-text-align-${ textAlign }` ]: textAlign,
-			'wp-block-site-title__placeholder': ! canUserEdit && ! title,
-		} ),
-	} );
-	const siteTitleContent = canUserEdit ? (
-		<TagName { ...blockProps }>
-			<RichText
-				tagName={ isLink ? 'a' : 'span' }
-				href={ isLink ? '#site-title-pseudo-link' : undefined }
-				aria-label={ __( 'Site title text' ) }
-				placeholder={ __( 'Write site title…' ) }
-				value={ title }
-				onChange={ setTitle }
-				allowedFormats={ [] }
-				disableLineBreaks
-				__unstableOnSplitAtEnd={ () =>
-					insertBlocksAfter( createBlock( getDefaultBlockName() ) )
-				}
-			/>
-		</TagName>
-	) : (
-		<TagName { ...blockProps }>
-			{ isLink ? (
-				<a
-					href="#site-title-pseudo-link"
-					onClick={ ( event ) => event.preventDefault() }
-				>
-					{ decodeEntities( title ) ||
-						__( 'Site Title placeholder' ) }
-				</a>
-			) : (
-				<span>
-					{ decodeEntities( title ) ||
-						__( 'Site Title placeholder' ) }
-				</span>
-			) }
-		</TagName>
-	);
-	return (
-		<>
-			<BlockControls group="block">
-				<HeadingLevelDropdown
-					options={ HEADING_LEVELS }
-					value={ level }
-					onChange={ ( newLevel ) =>
-						setAttributes( { level: newLevel } )
-					}
-				/>
-				<AlignmentControl
-					value={ textAlign }
-					onChange={ ( nextAlign ) => {
-						setAttributes( { textAlign: nextAlign } );
-					} }
-				/>
-			</BlockControls>
-			<InspectorControls>
-				<PanelBody title={ __( 'Settings' ) }>
-					<ToggleControl
-						__nextHasNoMarginBottom
-						label={ __( 'Make title link to home' ) }
-						onChange={ () => setAttributes( { isLink: ! isLink } ) }
-						checked={ isLink }
-					/>
-					{ isLink && (
-						<ToggleControl
-							__nextHasNoMarginBottom
-							label={ __( 'Open in new tab' ) }
-							onChange={ ( value ) =>
-								setAttributes( {
-									linkTarget: value ? '_blank' : '_self',
-								} )
-							}
-							checked={ linkTarget === '_blank' }
-						/>
-					) }
-				</PanelBody>
-			</InspectorControls>
-			{ siteTitleContent }
-		</>
-	);
-}
diff --git a/packages/block-library/src/site-title/editor.scss b/packages/block-library/src/site-title/editor.scss
index 173e4570929a51..372a85db2f4b13 100644
--- a/packages/block-library/src/site-title/editor.scss
+++ b/packages/block-library/src/site-title/editor.scss
@@ -2,9 +2,3 @@
 	padding: 1em 0;
 	border: 1px dashed;
 }
-
-.editor-styles-wrapper .wp-block-site-title {
-	a {
-		color: inherit;
-	}
-}
diff --git a/packages/block-library/src/site-title/index.js b/packages/block-library/src/site-title/index.js
index 87934888ce4380..b49e1561448c7e 100644
--- a/packages/block-library/src/site-title/index.js
+++ b/packages/block-library/src/site-title/index.js
@@ -17,7 +17,12 @@ export { metadata, name };
 
 export const settings = {
 	icon,
-	example: {},
+	example: {
+		viewportWidth: 350,
+		attributes: {
+			textAlign: 'center',
+		},
+	},
 	edit,
 	transforms,
 	deprecated,
diff --git a/packages/block-library/src/site-title/index.php b/packages/block-library/src/site-title/index.php
index 255615b3a4e450..f90c3a6ac3a6a0 100644
--- a/packages/block-library/src/site-title/index.php
+++ b/packages/block-library/src/site-title/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/site-title` block on the server.
  *
+ * @since 5.8.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string The render.
@@ -53,6 +55,8 @@ function render_block_core_site_title( $attributes ) {
 
 /**
  * Registers the `core/site-title` block on the server.
+ *
+ * @since 5.8.0
  */
 function register_block_core_site_title() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/site-title/style.scss b/packages/block-library/src/site-title/style.scss
index afc6f449f4025b..3b332e35c65237 100644
--- a/packages/block-library/src/site-title/style.scss
+++ b/packages/block-library/src/site-title/style.scss
@@ -1,5 +1,15 @@
 .wp-block-site-title {
-	a {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+
+	:where(a) {
 		color: inherit;
+		font-family: inherit;
+		font-size: inherit;
+		font-style: inherit;
+		font-weight: inherit;
+		letter-spacing: inherit;
+		line-height: inherit;
+		text-decoration: inherit;
 	}
 }
diff --git a/packages/block-library/src/social-link/block.json b/packages/block-library/src/social-link/block.json
index 50e95efedb630c..37e8376f22ff09 100644
--- a/packages/block-library/src/social-link/block.json
+++ b/packages/block-library/src/social-link/block.json
@@ -5,7 +5,7 @@
 	"title": "Social Icon",
 	"category": "widgets",
 	"parent": [ "core/social-links" ],
-	"description": "Display an icon linking to a social media profile or site.",
+	"description": "Display an icon linking to a social profile or site.",
 	"textdomain": "default",
 	"attributes": {
 		"url": {
@@ -31,7 +31,10 @@
 	],
 	"supports": {
 		"reusable": false,
-		"html": false
+		"html": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-social-link-editor"
 }
diff --git a/packages/block-library/src/social-link/edit.js b/packages/block-library/src/social-link/edit.js
index 110bc397136992..47af181bfe17e8 100644
--- a/packages/block-library/src/social-link/edit.js
+++ b/packages/block-library/src/social-link/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -22,8 +22,9 @@ import {
 	PanelBody,
 	PanelRow,
 	TextControl,
+	__experimentalInputControlSuffixWrapper as InputControlSuffixWrapper,
 } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { keyboardReturn } from '@wordpress/icons';
 
 /**
@@ -42,24 +43,30 @@ const SocialLinkURLPopover = ( {
 	return (
 		<URLPopover
 			anchor={ popoverAnchor }
-			onClose={ () => setPopover( false ) }
+			aria-label={ __( 'Edit social link' ) }
+			onClose={ () => {
+				setPopover( false );
+				popoverAnchor?.focus();
+			} }
 		>
 			<form
 				className="block-editor-url-popover__link-editor"
 				onSubmit={ ( event ) => {
 					event.preventDefault();
 					setPopover( false );
+					popoverAnchor?.focus();
 				} }
 			>
 				<div className="block-editor-url-input">
 					<URLInput
-						__nextHasNoMarginBottom
 						value={ url }
 						onChange={ ( nextURL ) =>
 							setAttributes( { url: nextURL } )
 						}
-						placeholder={ __( 'Enter address' ) }
-						disableSuggestions={ true }
+						placeholder={ __( 'Enter social link' ) }
+						label={ __( 'Enter social link' ) }
+						hideLabelFromVision
+						disableSuggestions
 						onKeyDown={ ( event ) => {
 							if (
 								!! url ||
@@ -72,13 +79,18 @@ const SocialLinkURLPopover = ( {
 							}
 							removeBlock( clientId );
 						} }
+						suffix={
+							<InputControlSuffixWrapper variant="control">
+								<Button
+									icon={ keyboardReturn }
+									label={ __( 'Apply' ) }
+									type="submit"
+									size="small"
+								/>
+							</InputControlSuffixWrapper>
+						}
 					/>
 				</div>
-				<Button
-					icon={ keyboardReturn }
-					label={ __( 'Apply' ) }
-					type="submit"
-				/>
 			</form>
 		</URLPopover>
 	);
@@ -91,7 +103,7 @@ const SocialLinkEdit = ( {
 	setAttributes,
 	clientId,
 } ) => {
-	const { url, service, label, rel } = attributes;
+	const { url, service, label = '', rel } = attributes;
 	const {
 		showLabels,
 		iconColor,
@@ -100,7 +112,7 @@ const SocialLinkEdit = ( {
 		iconBackgroundColorValue,
 	} = context;
 	const [ showURLPopover, setPopover ] = useState( false );
-	const classes = classNames( 'wp-social-link', 'wp-social-link-' + service, {
+	const classes = clsx( 'wp-social-link', 'wp-social-link-' + service, {
 		'wp-social-link__is-incomplete': ! url,
 		[ `has-${ iconColor }-color` ]: iconColor,
 		[ `has-${ iconBackgroundColor }-background-color` ]:
@@ -113,7 +125,12 @@ const SocialLinkEdit = ( {
 
 	const IconComponent = getIconBySite( service );
 	const socialLinkName = getNameBySite( service );
-	const socialLinkLabel = label ?? socialLinkName;
+	// The initial label (ie. the link text) is an empty string.
+	// We want to prevent empty links so that the link text always fallbacks to
+	// the social name, even when users enter and save an empty string or only
+	// spaces. The PHP render callback fallbacks to the social name as well.
+	const socialLinkText = label.trim() === '' ? socialLinkName : label;
+
 	const blockProps = useBlockProps( {
 		className: classes,
 		style: {
@@ -125,31 +142,27 @@ const SocialLinkEdit = ( {
 	return (
 		<>
 			<InspectorControls>
-				<PanelBody
-					title={ sprintf(
-						/* translators: %s: name of the social service. */
-						__( '%s label' ),
-						socialLinkName
-					) }
-					initialOpen={ false }
-				>
+				<PanelBody title={ __( 'Settings' ) }>
 					<PanelRow>
 						<TextControl
+							__next40pxDefaultSize
 							__nextHasNoMarginBottom
-							label={ __( 'Link label' ) }
+							label={ __( 'Text' ) }
 							help={ __(
-								'Briefly describe the link to help screen reader users.'
+								'The text is visible when enabled from the parent Social Icons block.'
 							) }
-							value={ label || '' }
+							value={ label }
 							onChange={ ( value ) =>
 								setAttributes( { label: value } )
 							}
+							placeholder={ socialLinkName }
 						/>
 					</PanelRow>
 				</PanelBody>
 			</InspectorControls>
 			<InspectorControls group="advanced">
 				<TextControl
+					__next40pxDefaultSize
 					__nextHasNoMarginBottom
 					label={ __( 'Link rel' ) }
 					value={ rel || '' }
@@ -157,29 +170,30 @@ const SocialLinkEdit = ( {
 				/>
 			</InspectorControls>
 			<li { ...blockProps }>
-				<Button
+				<button
 					className="wp-block-social-link-anchor"
 					ref={ setPopoverAnchor }
 					onClick={ () => setPopover( true ) }
+					aria-haspopup="dialog"
 				>
 					<IconComponent />
 					<span
-						className={ classNames( 'wp-block-social-link-label', {
+						className={ clsx( 'wp-block-social-link-label', {
 							'screen-reader-text': ! showLabels,
 						} ) }
 					>
-						{ socialLinkLabel }
+						{ socialLinkText }
 					</span>
-					{ isSelected && showURLPopover && (
-						<SocialLinkURLPopover
-							url={ url }
-							setAttributes={ setAttributes }
-							setPopover={ setPopover }
-							popoverAnchor={ popoverAnchor }
-							clientId={ clientId }
-						/>
-					) }
-				</Button>
+				</button>
+				{ isSelected && showURLPopover && (
+					<SocialLinkURLPopover
+						url={ url }
+						setAttributes={ setAttributes }
+						setPopover={ setPopover }
+						popoverAnchor={ popoverAnchor }
+						clientId={ clientId }
+					/>
+				) }
 			</li>
 		</>
 	);
diff --git a/packages/block-library/src/social-link/edit.native.js b/packages/block-library/src/social-link/edit.native.js
index 3ea794a9b8c20b..0b4b6b0ac7d4bd 100644
--- a/packages/block-library/src/social-link/edit.native.js
+++ b/packages/block-library/src/social-link/edit.native.js
@@ -171,7 +171,7 @@ const SocialLinkEdit = ( {
 
 			<TouchableWithoutFeedback
 				onPress={ onIconPress }
-				accessibilityRole={ 'button' }
+				accessibilityRole="button"
 				accessibilityLabel={ sprintf(
 					// translators: %s: social link name e.g: "Instagram".
 					__( '%s social icon' ),
diff --git a/packages/block-library/src/social-link/editor.scss b/packages/block-library/src/social-link/editor.scss
index 343f903ca4ce8e..bd93ad9f055fcd 100644
--- a/packages/block-library/src/social-link/editor.scss
+++ b/packages/block-library/src/social-link/editor.scss
@@ -1,27 +1,41 @@
-// The editor uses the button component, the frontend uses a link.
-// Therefore we unstyle the button component to make it more like the frontend.
 .wp-block-social-links .wp-social-link {
 	line-height: 0;
+}
+
+// The editor uses the button element, the frontend uses a link.
+// Therefore we unstyle the button element to make it more like the frontend.
+.wp-block-social-link-anchor {
+	align-items: center;
+	background: none;
+	border: 0;
+	box-sizing: border-box;
+	cursor: pointer;
+	display: inline-flex;
+	font-size: inherit;
+	color: currentColor;
+	height: auto;
+
+	// This rule ensures social link buttons display correctly in template parts.
+	opacity: 1;
 
-	button {
-		font-size: inherit;
-		color: currentColor;
-		height: auto;
-		line-height: 0;
+	// This rule is duplicated from the style.scss and needs to be the same as there.
+	padding: 0.25em;
 
-		// This rule ensures social link buttons display correctly in template parts.
-		opacity: 1;
+	// Focus styles replicate the `@wordpress/components` button component.
+	&:focus:not(:disabled) {
+		border-radius: 2px;
+		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 
-		// This rule is duplicated from the style.scss and needs to be the same as there.
-		padding: 0.25em;
+		// Windows High Contrast mode will show this outline, but not the box-shadow.
+		outline: 3px solid transparent;
 	}
 }
 
-.wp-block-social-links.is-style-pill-shape .wp-social-link button {
+:root :where(.wp-block-social-links.is-style-pill-shape .wp-social-link button) {
 	padding-left: calc((2/3) * 1em);
 	padding-right: calc((2/3) * 1em);
 }
 
-.wp-block-social-links.is-style-logos-only .wp-social-link button {
+:root :where(.wp-block-social-links.is-style-logos-only .wp-social-link button) {
 	padding: 0;
 }
diff --git a/packages/block-library/src/social-link/icons/bluesky.js b/packages/block-library/src/social-link/icons/bluesky.js
new file mode 100644
index 00000000000000..0295d318efe81f
--- /dev/null
+++ b/packages/block-library/src/social-link/icons/bluesky.js
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/primitives';
+
+export const BlueskyIcon = () => (
+	<SVG width="24" height="24" viewBox="0 0 24 24" version="1.1">
+		<Path d="M6.3,4.2c2.3,1.7,4.8,5.3,5.7,7.2.9-1.9,3.4-5.4,5.7-7.2,1.7-1.3,4.3-2.2,4.3.9s-.4,5.2-.6,5.9c-.7,2.6-3.3,3.2-5.6,2.8,4,.7,5.1,3,2.9,5.3-5,5.2-6.7-2.8-6.7-2.8,0,0-1.7,8-6.7,2.8-2.2-2.3-1.2-4.6,2.9-5.3-2.3.4-4.9-.3-5.6-2.8-.2-.7-.6-5.3-.6-5.9,0-3.1,2.7-2.1,4.3-.9h0Z" />
+	</SVG>
+);
diff --git a/packages/block-library/src/social-link/icons/index.js b/packages/block-library/src/social-link/icons/index.js
index 46c8c6d5acc6ef..422ff6f02dd20e 100644
--- a/packages/block-library/src/social-link/icons/index.js
+++ b/packages/block-library/src/social-link/icons/index.js
@@ -1,6 +1,7 @@
 export * from './amazon';
 export * from './bandcamp';
 export * from './behance';
+export * from './bluesky';
 export * from './chain';
 export * from './codepen';
 export * from './deviantart';
diff --git a/packages/block-library/src/social-link/icons/medium.js b/packages/block-library/src/social-link/icons/medium.js
index 88de49e65be046..a3979a3ada81b8 100644
--- a/packages/block-library/src/social-link/icons/medium.js
+++ b/packages/block-library/src/social-link/icons/medium.js
@@ -5,6 +5,6 @@ import { Path, SVG } from '@wordpress/primitives';
 
 export const MediumIcon = () => (
 	<SVG width="24" height="24" viewBox="0 0 24 24" version="1.1">
-		<Path d="M20.962,7.257l-5.457,8.867l-3.923-6.375l3.126-5.08c0.112-0.182,0.319-0.286,0.527-0.286c0.05,0,0.1,0.008,0.149,0.02 c0.039,0.01,0.078,0.023,0.114,0.041l5.43,2.715l0.006,0.003c0.004,0.002,0.007,0.006,0.011,0.008 C20.971,7.191,20.98,7.227,20.962,7.257z M9.86,8.592v5.783l5.14,2.57L9.86,8.592z M15.772,17.331l4.231,2.115 C20.554,19.721,21,19.529,21,19.016V8.835L15.772,17.331z M8.968,7.178L3.665,4.527C3.569,4.479,3.478,4.456,3.395,4.456 C3.163,4.456,3,4.636,3,4.938v11.45c0,0.306,0.224,0.669,0.498,0.806l4.671,2.335c0.12,0.06,0.234,0.088,0.337,0.088 c0.29,0,0.494-0.225,0.494-0.602V7.231C9,7.208,8.988,7.188,8.968,7.178z" />
+		<Path d="M13.2,12c0,3-2.4,5.4-5.3,5.4S2.6,15,2.6,12s2.4-5.4,5.3-5.4S13.2,9,13.2,12 M19.1,12c0,2.8-1.2,5-2.7,5s-2.7-2.3-2.7-5s1.2-5,2.7-5C17.9,7,19.1,9.2,19.1,12 M21.4,12c0,2.5-0.4,4.5-0.9,4.5c-0.5,0-0.9-2-0.9-4.5s0.4-4.5,0.9-4.5C21,7.5,21.4,9.5,21.4,12" />
 	</SVG>
 );
diff --git a/packages/block-library/src/social-link/icons/patreon.js b/packages/block-library/src/social-link/icons/patreon.js
index 9970d49eb4e0f6..04ef99a14706ec 100644
--- a/packages/block-library/src/social-link/icons/patreon.js
+++ b/packages/block-library/src/social-link/icons/patreon.js
@@ -1,11 +1,10 @@
 /**
  * WordPress dependencies
  */
-import { Circle, Rect, SVG } from '@wordpress/primitives';
+import { Path, SVG } from '@wordpress/primitives';
 
 export const PatreonIcon = () => (
-	<SVG width="24" height="24" viewBox="0 0 569 546" version="1.1">
-		<Circle cx="363" cy="205" r="205" />
-		<Rect width="100" height="546" x="0" y="0" />
+	<SVG width="24" height="24" viewBox="0 0 24 24" version="1.1">
+		<Path d="M20 8.40755C19.9969 6.10922 18.2543 4.22555 16.2097 3.54588C13.6708 2.70188 10.3222 2.82421 7.89775 3.99921C4.95932 5.42355 4.03626 8.54355 4.00186 11.6552C3.97363 14.2136 4.2222 20.9517 7.92225 20.9997C10.6715 21.0356 11.0809 17.3967 12.3529 15.6442C13.258 14.3974 14.4233 14.0452 15.8578 13.6806C18.3233 13.0537 20.0036 11.0551 20 8.40755Z" />
 	</SVG>
 );
diff --git a/packages/block-library/src/social-link/icons/reddit.js b/packages/block-library/src/social-link/icons/reddit.js
index 05c43e42f56b9f..7bb8ff1464b854 100644
--- a/packages/block-library/src/social-link/icons/reddit.js
+++ b/packages/block-library/src/social-link/icons/reddit.js
@@ -5,6 +5,6 @@ import { Path, SVG } from '@wordpress/primitives';
 
 export const RedditIcon = () => (
 	<SVG width="24" height="24" viewBox="0 0 24 24" version="1.1">
-		<Path d="M22 12.068a2.184 2.184 0 0 0-2.186-2.186c-.592 0-1.13.233-1.524.609-1.505-1.075-3.566-1.774-5.86-1.864l1.004-4.695 3.261.699A1.56 1.56 0 1 0 18.255 3c-.61-.001-1.147.357-1.398.877l-3.638-.77a.382.382 0 0 0-.287.053.348.348 0 0 0-.161.251l-1.112 5.233c-2.33.072-4.426.77-5.95 1.864a2.201 2.201 0 0 0-1.523-.61 2.184 2.184 0 0 0-.896 4.176c-.036.215-.053.43-.053.663 0 3.37 3.924 6.111 8.763 6.111s8.763-2.724 8.763-6.11c0-.216-.017-.449-.053-.664A2.207 2.207 0 0 0 22 12.068Zm-15.018 1.56a1.56 1.56 0 0 1 3.118 0c0 .86-.699 1.558-1.559 1.558-.86.018-1.559-.699-1.559-1.559Zm8.728 4.139c-1.076 1.075-3.119 1.147-3.71 1.147-.61 0-2.652-.09-3.71-1.147a.4.4 0 0 1 0-.573.4.4 0 0 1 .574 0c.68.68 2.114.914 3.136.914 1.022 0 2.473-.233 3.136-.914a.4.4 0 0 1 .574 0 .436.436 0 0 1 0 .573Zm-.287-2.563a1.56 1.56 0 0 1 0-3.118c.86 0 1.56.699 1.56 1.56 0 .841-.7 1.558-1.56 1.558Z" />
+		<Path d="M5.27 9.221A2.775 2.775 0 0 0 2.498 11.993a2.785 2.785 0 0 0 1.6 2.511 5.337 5.337 0 0 0 2.374 4.11 9.386 9.386 0 0 0 5.539 1.7 9.386 9.386 0 0 0 5.541-1.7 5.331 5.331 0 0 0 2.372-4.114 2.787 2.787 0 0 0 1.583-2.5 2.775 2.775 0 0 0-2.772-2.772 2.742 2.742 0 0 0-1.688.574 9.482 9.482 0 0 0-4.637-1.348v-.008a2.349 2.349 0 0 1 2.011-2.316 1.97 1.97 0 0 0 1.926 1.521 1.98 1.98 0 0 0 1.978-1.978 1.98 1.98 0 0 0-1.978-1.978 1.985 1.985 0 0 0-1.938 1.578 3.183 3.183 0 0 0-2.849 3.172v.011a9.463 9.463 0 0 0-4.59 1.35 2.741 2.741 0 0 0-1.688-.574Zm6.736 9.1a3.162 3.162 0 0 1-2.921-1.944.215.215 0 0 1 .014-.2.219.219 0 0 1 .168-.106 27.327 27.327 0 0 1 2.74-.133 27.357 27.357 0 0 1 2.74.133.219.219 0 0 1 .168.106.215.215 0 0 1 .014.2 3.158 3.158 0 0 1-2.921 1.944Zm3.743-3.157a1.265 1.265 0 0 1-1.4-1.371 1.954 1.954 0 0 1 .482-1.442 1.15 1.15 0 0 1 .842-.379 1.7 1.7 0 0 1 1.49 1.777 1.323 1.323 0 0 1-.325 1.015 1.476 1.476 0 0 1-1.089.4Zm-7.485 0a1.476 1.476 0 0 1-1.086-.4 1.323 1.323 0 0 1-.325-1.016 1.7 1.7 0 0 1 1.49-1.777 1.151 1.151 0 0 1 .843.379 1.951 1.951 0 0 1 .481 1.441 1.276 1.276 0 0 1-1.403 1.373Z" />
 	</SVG>
 );
diff --git a/packages/block-library/src/social-link/icons/soundcloud.js b/packages/block-library/src/social-link/icons/soundcloud.js
index ffc740aae1a077..8e4a66353fc8ea 100644
--- a/packages/block-library/src/social-link/icons/soundcloud.js
+++ b/packages/block-library/src/social-link/icons/soundcloud.js
@@ -5,6 +5,6 @@ import { Path, SVG } from '@wordpress/primitives';
 
 export const SoundCloudIcon = () => (
 	<SVG width="24" height="24" viewBox="0 0 24 24" version="1.1">
-		<Path d="M8.9,16.1L9,14L8.9,9.5c0-0.1,0-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1,0-0.1,0.1c0,0-0.1,0.1-0.1,0.1L8.3,14l0.1,2.1 c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1C8.8,16.3,8.9,16.3,8.9,16.1z M11.4,15.9l0.1-1.8L11.4,9c0-0.1,0-0.2-0.1-0.2 c0,0-0.1,0-0.1,0s-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.2l0,0.1l-0.1,5c0,0,0,0.7,0.1,2v0c0,0.1,0,0.1,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.1 c0.1,0,0.1,0,0.2-0.1c0.1,0,0.1-0.1,0.1-0.2L11.4,15.9z M2.4,12.9L2.5,14l-0.2,1.1c0,0.1,0,0.1-0.1,0.1c0,0-0.1,0-0.1-0.1L2.1,14 l0.1-1.1C2.2,12.9,2.3,12.9,2.4,12.9C2.3,12.9,2.4,12.9,2.4,12.9z M3.1,12.2L3.3,14l-0.2,1.8c0,0.1,0,0.1-0.1,0.1 c-0.1,0-0.1,0-0.1-0.1L2.8,14L3,12.2C3,12.2,3,12.2,3.1,12.2C3.1,12.2,3.1,12.2,3.1,12.2z M3.9,11.9L4.1,14l-0.2,2.1 c0,0.1,0,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L3.5,14l0.2-2.1c0-0.1,0-0.1,0.1-0.1C3.9,11.8,3.9,11.8,3.9,11.9z M4.7,11.9L4.9,14 l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L4.3,14l0.2-2.2c0-0.1,0-0.1,0.1-0.1C4.7,11.7,4.7,11.8,4.7,11.9z M5.6,12 l0.2,2l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1L5.1,14l0.2-2c0,0,0-0.1,0-0.1s0.1,0,0.1,0 C5.5,11.9,5.5,11.9,5.6,12L5.6,12z M6.4,10.7L6.6,14l-0.2,2.1c0,0,0,0.1,0,0.1c0,0-0.1,0-0.1,0c-0.1,0-0.1-0.1-0.2-0.2L5.9,14 l0.2-3.3c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0C6.4,10.7,6.4,10.7,6.4,10.7z M7.2,10l0.2,4.1l-0.2,2.1c0,0,0,0.1,0,0.1 c0,0-0.1,0-0.1,0c-0.1,0-0.2-0.1-0.2-0.2l-0.1-2.1L6.8,10c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0S7.2,9.9,7.2,10z M8,9.6L8.2,14 L8,16.1c0,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2-0.1-0.2-0.2L7.5,14l0.1-4.4c0-0.1,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1,0,0.1,0,0.1,0.1 C8,9.6,8,9.6,8,9.6z M11.4,16.1L11.4,16.1L11.4,16.1z M9.7,9.6L9.8,14l-0.1,2.1c0,0.1,0,0.1-0.1,0.2s-0.1,0.1-0.2,0.1 c-0.1,0-0.1,0-0.1-0.1s-0.1-0.1-0.1-0.2L9.2,14l0.1-4.4c0-0.1,0-0.1,0.1-0.2s0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S9.7,9.5,9.7,9.6 L9.7,9.6z M10.6,9.8l0.1,4.3l-0.1,2c0,0.1,0,0.1-0.1,0.2c0,0-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c0,0-0.1-0.1-0.1-0.2L10,14 l0.1-4.3c0-0.1,0-0.1,0.1-0.2c0,0,0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S10.6,9.7,10.6,9.8z M12.4,14l-0.1,2c0,0.1,0,0.1-0.1,0.2 c-0.1,0.1-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2l-0.1-1l-0.1-1l0.1-5.5v0c0-0.1,0-0.2,0.1-0.2 c0.1,0,0.1-0.1,0.2-0.1c0,0,0.1,0,0.1,0c0.1,0,0.1,0.1,0.1,0.2L12.4,14z M22.1,13.9c0,0.7-0.2,1.3-0.7,1.7c-0.5,0.5-1.1,0.7-1.7,0.7 h-6.8c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2V8.2c0-0.1,0.1-0.2,0.2-0.3c0.5-0.2,1-0.3,1.6-0.3c1.1,0,2.1,0.4,2.9,1.1 c0.8,0.8,1.3,1.7,1.4,2.8c0.3-0.1,0.6-0.2,1-0.2c0.7,0,1.3,0.2,1.7,0.7C21.8,12.6,22.1,13.2,22.1,13.9L22.1,13.9z" />
+		<Path d="M23.994 14.552a3.36 3.36 0 01-3.401 3.171h-8.176a.685.685 0 01-.679-.681V8.238a.749.749 0 01.452-.716S12.942 7 14.526 7a5.357 5.357 0 012.748.755 5.44 5.44 0 012.56 3.546c.282-.08.574-.12.868-.119a3.273 3.273 0 013.292 3.37zM10.718 8.795a.266.266 0 10-.528 0c-.224 2.96-.397 5.735 0 8.685a.265.265 0 00.528 0c.425-2.976.246-5.7 0-8.685zM9.066 9.82a.278.278 0 00-.553 0 33.183 33.183 0 000 7.663.278.278 0 00.55 0c.33-2.544.332-5.12.003-7.664zM7.406 9.56a.269.269 0 00-.535 0c-.253 2.7-.38 5.222 0 7.917a.266.266 0 10.531 0c.394-2.73.272-5.181.004-7.917zM5.754 10.331a.275.275 0 10-.55 0 28.035 28.035 0 000 7.155.272.272 0 00.54 0c.332-2.373.335-4.78.01-7.155zM4.087 12.12a.272.272 0 00-.544 0c-.393 1.843-.208 3.52.016 5.386a.26.26 0 00.512 0c.247-1.892.435-3.53.016-5.386zM2.433 11.838a.282.282 0 00-.56 0c-.349 1.882-.234 3.54.01 5.418.025.285.508.282.54 0 .269-1.907.394-3.517.01-5.418zM.762 12.76a.282.282 0 00-.56 0c-.32 1.264-.22 2.31.023 3.578a.262.262 0 00.521 0c.282-1.293.42-2.317.016-3.578z" />
 	</SVG>
 );
diff --git a/packages/block-library/src/social-link/index.php b/packages/block-library/src/social-link/index.php
index b203a662822f59..da28034f5a55d2 100644
--- a/packages/block-library/src/social-link/index.php
+++ b/packages/block-library/src/social-link/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/social-link` block on server.
  *
+ * @since 5.4.0
+ *
  * @param Array    $attributes The block attributes.
  * @param String   $content    InnerBlocks content of the Block.
  * @param WP_Block $block      Block object.
@@ -17,10 +19,12 @@
 function render_block_core_social_link( $attributes, $content, $block ) {
 	$open_in_new_tab = isset( $block->context['openInNewTab'] ) ? $block->context['openInNewTab'] : false;
 
-	$service     = ( isset( $attributes['service'] ) ) ? $attributes['service'] : 'Icon';
-	$url         = ( isset( $attributes['url'] ) ) ? $attributes['url'] : false;
-	$label       = ( isset( $attributes['label'] ) ) ? $attributes['label'] : block_core_social_link_get_name( $service );
-	$rel         = ( isset( $attributes['rel'] ) ) ? $attributes['rel'] : '';
+	$text = ! empty( $attributes['label'] ) ? trim( $attributes['label'] ) : '';
+
+	$service     = isset( $attributes['service'] ) ? $attributes['service'] : 'Icon';
+	$url         = isset( $attributes['url'] ) ? $attributes['url'] : false;
+	$text        = $text ? $text : block_core_social_link_get_name( $service );
+	$rel         = isset( $attributes['rel'] ) ? $attributes['rel'] : '';
 	$show_labels = array_key_exists( 'showLabels', $block->context ) ? $block->context['showLabels'] : false;
 
 	// Don't render a link if there is no URL set.
@@ -33,7 +37,7 @@ function render_block_core_social_link( $attributes, $content, $block ) {
 	 * The `is_email` returns false for emails with schema.
 	 */
 	if ( is_email( $url ) ) {
-		$url = 'mailto:' . $url;
+		$url = 'mailto:' . antispambot( $url );
 	}
 
 	/**
@@ -55,9 +59,8 @@ function render_block_core_social_link( $attributes, $content, $block ) {
 	$link  = '<li ' . $wrapper_attributes . '>';
 	$link .= '<a href="' . esc_url( $url ) . '" class="wp-block-social-link-anchor">';
 	$link .= $icon;
-	$link .= '<span class="wp-block-social-link-label' . ( $show_labels ? '' : ' screen-reader-text' ) . '">';
-	$link .= esc_html( $label );
-	$link .= '</span></a></li>';
+	$link .= '<span class="wp-block-social-link-label' . ( $show_labels ? '' : ' screen-reader-text' ) . '">' . esc_html( $text ) . '</span>';
+	$link .= '</a></li>';
 
 	$processor = new WP_HTML_Tag_Processor( $link );
 	$processor->next_tag( 'a' );
@@ -72,6 +75,8 @@ function render_block_core_social_link( $attributes, $content, $block ) {
 
 /**
  * Registers the `core/social-link` blocks.
+ *
+ * @since 5.4.0
  */
 function register_block_core_social_link() {
 	register_block_type_from_metadata(
@@ -87,6 +92,8 @@ function register_block_core_social_link() {
 /**
  * Returns the SVG for social link.
  *
+ * @since 5.4.0
+ *
  * @param string $service The service icon.
  *
  * @return string SVG Element for service icon.
@@ -103,6 +110,8 @@ function block_core_social_link_get_icon( $service ) {
 /**
  * Returns the brand name for social link.
  *
+ * @since 5.4.0
+ *
  * @param string $service The service icon.
  *
  * @return string Brand label.
@@ -119,6 +128,8 @@ function block_core_social_link_get_name( $service ) {
 /**
  * Returns the SVG for social link.
  *
+ * @since 5.4.0
+ *
  * @param string $service The service slug to extract data from.
  * @param string $field The field ('name', 'icon', etc) to extract for a service.
  *
@@ -142,6 +153,10 @@ function block_core_social_link_services( $service = '', $field = '' ) {
 			'name' => 'Behance',
 			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M7.799,5.698c0.589,0,1.12,0.051,1.606,0.156c0.482,0.102,0.894,0.273,1.241,0.507c0.344,0.235,0.612,0.546,0.804,0.938 c0.188,0.387,0.281,0.871,0.281,1.443c0,0.619-0.141,1.137-0.421,1.551c-0.284,0.413-0.7,0.751-1.255,1.014 c0.756,0.218,1.317,0.601,1.689,1.146c0.374,0.549,0.557,1.205,0.557,1.975c0,0.623-0.12,1.161-0.359,1.612 c-0.241,0.457-0.569,0.828-0.973,1.114c-0.408,0.288-0.876,0.5-1.399,0.637C9.052,17.931,8.514,18,7.963,18H2V5.698H7.799 M7.449,10.668c0.481,0,0.878-0.114,1.192-0.345c0.311-0.228,0.463-0.603,0.463-1.119c0-0.286-0.051-0.523-0.152-0.707 C8.848,8.315,8.711,8.171,8.536,8.07C8.362,7.966,8.166,7.894,7.94,7.854c-0.224-0.044-0.457-0.06-0.697-0.06H4.709v2.874H7.449z M7.6,15.905c0.267,0,0.521-0.024,0.759-0.077c0.243-0.053,0.457-0.137,0.637-0.261c0.182-0.12,0.332-0.283,0.441-0.491 C9.547,14.87,9.6,14.602,9.6,14.278c0-0.633-0.18-1.084-0.533-1.357c-0.356-0.27-0.83-0.404-1.413-0.404H4.709v3.388L7.6,15.905z M16.162,15.864c0.367,0.358,0.897,0.538,1.583,0.538c0.493,0,0.92-0.125,1.277-0.374c0.354-0.248,0.571-0.514,0.654-0.79h2.155 c-0.347,1.072-0.872,1.838-1.589,2.299C19.534,18,18.67,18.23,17.662,18.23c-0.701,0-1.332-0.113-1.899-0.337 c-0.567-0.227-1.041-0.544-1.439-0.958c-0.389-0.415-0.689-0.907-0.904-1.484c-0.213-0.574-0.32-1.21-0.32-1.899 c0-0.666,0.11-1.288,0.329-1.863c0.222-0.577,0.529-1.075,0.933-1.492c0.406-0.42,0.885-0.751,1.444-0.994 c0.558-0.241,1.175-0.363,1.857-0.363c0.754,0,1.414,0.145,1.98,0.44c0.563,0.291,1.026,0.686,1.389,1.181 c0.363,0.493,0.622,1.057,0.783,1.69c0.16,0.632,0.217,1.292,0.171,1.983h-6.428C15.557,14.84,15.795,15.506,16.162,15.864 M18.973,11.184c-0.291-0.321-0.783-0.496-1.384-0.496c-0.39,0-0.714,0.066-0.973,0.2c-0.254,0.132-0.461,0.297-0.621,0.491 c-0.157,0.197-0.265,0.405-0.328,0.628c-0.063,0.217-0.101,0.413-0.111,0.587h3.98C19.478,11.969,19.265,11.509,18.973,11.184z M15.057,7.738h4.985V6.524h-4.985L15.057,7.738z"></path></svg>',
 		),
+		'bluesky'       => array(
+			'name' => 'Bluesky',
+			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M6.3,4.2c2.3,1.7,4.8,5.3,5.7,7.2.9-1.9,3.4-5.4,5.7-7.2,1.7-1.3,4.3-2.2,4.3.9s-.4,5.2-.6,5.9c-.7,2.6-3.3,3.2-5.6,2.8,4,.7,5.1,3,2.9,5.3-5,5.2-6.7-2.8-6.7-2.8,0,0-1.7,8-6.7,2.8-2.2-2.3-1.2-4.6,2.9-5.3-2.3.4-4.9-.3-5.6-2.8-.2-.7-.6-5.3-.6-5.9,0-3.1,2.7-2.1,4.3-.9h0Z"></path></svg>',
+		),
 		'chain'         => array(
 			'name' => 'Link',
 			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M15.6,7.2H14v1.5h1.6c2,0,3.7,1.7,3.7,3.7s-1.7,3.7-3.7,3.7H14v1.5h1.6c2.8,0,5.2-2.3,5.2-5.2,0-2.9-2.3-5.2-5.2-5.2zM4.7,12.4c0-2,1.7-3.7,3.7-3.7H10V7.2H8.4c-2.9,0-5.2,2.3-5.2,5.2,0,2.9,2.3,5.2,5.2,5.2H10v-1.5H8.4c-2,0-3.7-1.7-3.7-3.7zm4.6.9h5.3v-1.5H9.3v1.5z"></path></svg>',
@@ -224,11 +239,11 @@ function block_core_social_link_services( $service = '', $field = '' ) {
 		),
 		'medium'        => array(
 			'name' => 'Medium',
-			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M20.962,7.257l-5.457,8.867l-3.923-6.375l3.126-5.08c0.112-0.182,0.319-0.286,0.527-0.286c0.05,0,0.1,0.008,0.149,0.02 c0.039,0.01,0.078,0.023,0.114,0.041l5.43,2.715l0.006,0.003c0.004,0.002,0.007,0.006,0.011,0.008 C20.971,7.191,20.98,7.227,20.962,7.257z M9.86,8.592v5.783l5.14,2.57L9.86,8.592z M15.772,17.331l4.231,2.115 C20.554,19.721,21,19.529,21,19.016V8.835L15.772,17.331z M8.968,7.178L3.665,4.527C3.569,4.479,3.478,4.456,3.395,4.456 C3.163,4.456,3,4.636,3,4.938v11.45c0,0.306,0.224,0.669,0.498,0.806l4.671,2.335c0.12,0.06,0.234,0.088,0.337,0.088 c0.29,0,0.494-0.225,0.494-0.602V7.231C9,7.208,8.988,7.188,8.968,7.178z"></path></svg>',
+			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M13.2,12c0,3-2.4,5.4-5.3,5.4S2.6,15,2.6,12s2.4-5.4,5.3-5.4S13.2,9,13.2,12 M19.1,12c0,2.8-1.2,5-2.7,5s-2.7-2.3-2.7-5s1.2-5,2.7-5C17.9,7,19.1,9.2,19.1,12 M21.4,12c0,2.5-0.4,4.5-0.9,4.5c-0.5,0-0.9-2-0.9-4.5s0.4-4.5,0.9-4.5C21,7.5,21.4,9.5,21.4,12"></path></svg>',
 		),
 		'patreon'       => array(
 			'name' => 'Patreon',
-			'icon' => '<svg width="24" height="24" viewBox="0 0 569 546" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><circle cx="363" cy="205" r="205" /><rect width="100" height="546" x="0" y="0" /></svg>',
+			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M20 8.40755C19.9969 6.10922 18.2543 4.22555 16.2097 3.54588C13.6708 2.70188 10.3222 2.82421 7.89775 3.99921C4.95932 5.42355 4.03626 8.54355 4.00186 11.6552C3.97363 14.2136 4.2222 20.9517 7.92225 20.9997C10.6715 21.0356 11.0809 17.3967 12.3529 15.6442C13.258 14.3974 14.4233 14.0452 15.8578 13.6806C18.3233 13.0537 20.0036 11.0551 20 8.40755Z" /></svg>',
 		),
 		'pinterest'     => array(
 			'name' => 'Pinterest',
@@ -240,7 +255,7 @@ function block_core_social_link_services( $service = '', $field = '' ) {
 		),
 		'reddit'        => array(
 			'name' => 'Reddit',
-			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M22 12.068a2.184 2.184 0 0 0-2.186-2.186c-.592 0-1.13.233-1.524.609-1.505-1.075-3.566-1.774-5.86-1.864l1.004-4.695 3.261.699A1.56 1.56 0 1 0 18.255 3c-.61-.001-1.147.357-1.398.877l-3.638-.77a.382.382 0 0 0-.287.053.348.348 0 0 0-.161.251l-1.112 5.233c-2.33.072-4.426.77-5.95 1.864a2.201 2.201 0 0 0-1.523-.61 2.184 2.184 0 0 0-.896 4.176c-.036.215-.053.43-.053.663 0 3.37 3.924 6.111 8.763 6.111s8.763-2.724 8.763-6.11c0-.216-.017-.449-.053-.664A2.207 2.207 0 0 0 22 12.068Zm-15.018 1.56a1.56 1.56 0 0 1 3.118 0c0 .86-.699 1.558-1.559 1.558-.86.018-1.559-.699-1.559-1.559Zm8.728 4.139c-1.076 1.075-3.119 1.147-3.71 1.147-.61 0-2.652-.09-3.71-1.147a.4.4 0 0 1 0-.573.4.4 0 0 1 .574 0c.68.68 2.114.914 3.136.914 1.022 0 2.473-.233 3.136-.914a.4.4 0 0 1 .574 0 .436.436 0 0 1 0 .573Zm-.287-2.563a1.56 1.56 0 0 1 0-3.118c.86 0 1.56.699 1.56 1.56 0 .841-.7 1.558-1.56 1.558Z"></path></svg>',
+			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M5.27 9.221A2.775 2.775 0 0 0 2.498 11.993a2.785 2.785 0 0 0 1.6 2.511 5.337 5.337 0 0 0 2.374 4.11 9.386 9.386 0 0 0 5.539 1.7 9.386 9.386 0 0 0 5.541-1.7 5.331 5.331 0 0 0 2.372-4.114 2.787 2.787 0 0 0 1.583-2.5 2.775 2.775 0 0 0-2.772-2.772 2.742 2.742 0 0 0-1.688.574 9.482 9.482 0 0 0-4.637-1.348v-.008a2.349 2.349 0 0 1 2.011-2.316 1.97 1.97 0 0 0 1.926 1.521 1.98 1.98 0 0 0 1.978-1.978 1.98 1.98 0 0 0-1.978-1.978 1.985 1.985 0 0 0-1.938 1.578 3.183 3.183 0 0 0-2.849 3.172v.011a9.463 9.463 0 0 0-4.59 1.35 2.741 2.741 0 0 0-1.688-.574Zm6.736 9.1a3.162 3.162 0 0 1-2.921-1.944.215.215 0 0 1 .014-.2.219.219 0 0 1 .168-.106 27.327 27.327 0 0 1 2.74-.133 27.357 27.357 0 0 1 2.74.133.219.219 0 0 1 .168.106.215.215 0 0 1 .014.2 3.158 3.158 0 0 1-2.921 1.944Zm3.743-3.157a1.265 1.265 0 0 1-1.4-1.371 1.954 1.954 0 0 1 .482-1.442 1.15 1.15 0 0 1 .842-.379 1.7 1.7 0 0 1 1.49 1.777 1.323 1.323 0 0 1-.325 1.015 1.476 1.476 0 0 1-1.089.4Zm-7.485 0a1.476 1.476 0 0 1-1.086-.4 1.323 1.323 0 0 1-.325-1.016 1.7 1.7 0 0 1 1.49-1.777 1.151 1.151 0 0 1 .843.379 1.951 1.951 0 0 1 .481 1.441 1.276 1.276 0 0 1-1.403 1.373Z"></path></svg>',
 		),
 		'share'         => array(
 			'name' => 'Share Icon',
@@ -332,6 +347,8 @@ function block_core_social_link_services( $service = '', $field = '' ) {
 /**
  * Returns CSS styles for icon and icon background colors.
  *
+ * @since 5.7.0
+ *
  * @param array $context Block context passed to Social Link.
  *
  * @return string Inline CSS styles for link's icon and background colors.
@@ -353,6 +370,8 @@ function block_core_social_link_get_color_styles( $context ) {
 /**
  * Returns CSS classes for icon and icon background colors.
  *
+ * @since 6.3.0
+ *
  * @param array $context Block context passed to Social Sharing Link.
  *
  * @return string CSS classes for link's icon and background colors.
diff --git a/packages/block-library/src/social-link/socials-with-bg.scss b/packages/block-library/src/social-link/socials-with-bg.scss
index 6a5906483b5dfb..35420fc624c0e6 100644
--- a/packages/block-library/src/social-link/socials-with-bg.scss
+++ b/packages/block-library/src/social-link/socials-with-bg.scss
@@ -18,6 +18,11 @@
 	color: #fff;
 }
 
+.wp-social-link-bluesky {
+	background-color: #0a7aff;
+	color: #fff;
+}
+
 .wp-social-link-codepen {
 	background-color: #1e1f26;
 	color: #fff;
@@ -44,7 +49,7 @@
 }
 
 .wp-social-link-facebook {
-	background-color: #1778f2;
+	background-color: #0866ff;
 	color: #fff;
 }
 
@@ -104,7 +109,7 @@
 }
 
 .wp-social-link-medium {
-	background-color: #02ab6c;
+	background-color: #000;
 	color: #fff;
 }
 
@@ -114,7 +119,7 @@
 }
 
 .wp-social-link-patreon {
-	background-color: #ff424d;
+	background-color: #000;
 	color: #fff;
 }
 
diff --git a/packages/block-library/src/social-link/socials-without-bg.scss b/packages/block-library/src/social-link/socials-without-bg.scss
index 85e0c4f6af4d71..24538b29824b17 100644
--- a/packages/block-library/src/social-link/socials-without-bg.scss
+++ b/packages/block-library/src/social-link/socials-without-bg.scss
@@ -10,6 +10,10 @@
 	color: #0757fe;
 }
 
+.wp-social-link-bluesky {
+	color: #0a7aff;
+}
+
 .wp-social-link-codepen {
 	color: #1e1f26;
 }
@@ -31,7 +35,7 @@
 }
 
 .wp-social-link-facebook {
-	color: #1778f2;
+	color: #0866ff;
 }
 
 .wp-social-link-fivehundredpx {
@@ -79,7 +83,7 @@
 }
 
 .wp-social-link-medium {
-	color: #02ab6c;
+	color: #000;
 }
 
 .wp-social-link-meetup {
@@ -87,7 +91,7 @@
 }
 
 .wp-social-link-patreon {
-	color: #ff424d;
+	color: #000;
 }
 
 .wp-social-link-pinterest {
diff --git a/packages/block-library/src/social-link/variations.js b/packages/block-library/src/social-link/variations.js
index af3219d2084c82..a97a396882d761 100644
--- a/packages/block-library/src/social-link/variations.js
+++ b/packages/block-library/src/social-link/variations.js
@@ -5,6 +5,7 @@ import {
 	AmazonIcon,
 	BandcampIcon,
 	BehanceIcon,
+	BlueskyIcon,
 	ChainIcon,
 	CodepenIcon,
 	DeviantArtIcon,
@@ -83,6 +84,12 @@ const variations = [
 		title: 'Behance',
 		icon: BehanceIcon,
 	},
+	{
+		name: 'bluesky',
+		attributes: { service: 'bluesky' },
+		title: 'Bluesky',
+		icon: BlueskyIcon,
+	},
 	{
 		name: 'chain',
 		attributes: { service: 'chain' },
@@ -339,7 +346,9 @@ const variations = [
  *  Block by providing its attributes.
  */
 variations.forEach( ( variation ) => {
-	if ( variation.isActive ) return;
+	if ( variation.isActive ) {
+		return;
+	}
 	variation.isActive = ( blockAttributes, variationAttributes ) =>
 		blockAttributes.service === variationAttributes.service;
 } );
diff --git a/packages/block-library/src/social-links/block.json b/packages/block-library/src/social-links/block.json
index 20206511a4c96c..bd750f26b3960c 100644
--- a/packages/block-library/src/social-links/block.json
+++ b/packages/block-library/src/social-links/block.json
@@ -4,7 +4,8 @@
 	"name": "core/social-links",
 	"title": "Social Icons",
 	"category": "widgets",
-	"description": "Display icons linking to your social media profiles or sites.",
+	"allowedBlocks": [ "core/social-link" ],
+	"description": "Display icons linking to your social profiles or sites.",
 	"keywords": [ "links" ],
 	"textdomain": "default",
 	"attributes": {
@@ -77,6 +78,21 @@
 				"margin": true,
 				"padding": false
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"styles": [
diff --git a/packages/block-library/src/social-links/deprecated.js b/packages/block-library/src/social-links/deprecated.js
index b5a56db3e102cb..e13cdaba6a43ce 100644
--- a/packages/block-library/src/social-links/deprecated.js
+++ b/packages/block-library/src/social-links/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -96,7 +96,7 @@ const deprecated = [
 				},
 			} = props;
 
-			const className = classNames( size, {
+			const className = clsx( size, {
 				'has-icon-color': iconColorValue,
 				'has-icon-background-color': iconBackgroundColorValue,
 				[ `items-justified-${ itemsJustification }` ]:
diff --git a/packages/block-library/src/social-links/edit.js b/packages/block-library/src/social-links/edit.js
index 03bcd59573aec2..068b34a3a70a4e 100644
--- a/packages/block-library/src/social-links/edit.js
+++ b/packages/block-library/src/social-links/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -14,8 +14,10 @@ import {
 	InspectorControls,
 	ContrastChecker,
 	withColors,
+	InnerBlocks,
 	__experimentalColorGradientSettingsDropdown as ColorGradientSettingsDropdown,
 	__experimentalUseMultipleOriginColorsAndGradients as useMultipleOriginColorsAndGradients,
+	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import {
 	MenuGroup,
@@ -26,8 +28,7 @@ import {
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { check } from '@wordpress/icons';
-
-const ALLOWED_BLOCKS = [ 'core/social-link' ];
+import { useSelect } from '@wordpress/data';
 
 const sizeOptions = [
 	{ name: __( 'Small' ), value: 'has-small-icon-size' },
@@ -57,14 +58,22 @@ export function SocialLinksEdit( props ) {
 		size,
 	} = attributes;
 
+	const hasSelectedChild = useSelect(
+		( select ) =>
+			select( blockEditorStore ).hasSelectedInnerBlock( clientId ),
+		[ clientId ]
+	);
+
+	const hasAnySelected = isSelected || hasSelectedChild;
+
 	const logosOnly = attributes.className?.includes( 'is-style-logos-only' );
 
 	// Remove icon background color when logos only style is selected or
 	// restore it when any other style is selected.
-	const backgroundBackup = useRef( {} );
+	const backgroundBackupRef = useRef( {} );
 	useEffect( () => {
 		if ( logosOnly ) {
-			backgroundBackup.current = {
+			backgroundBackupRef.current = {
 				iconBackgroundColor,
 				iconBackgroundColorValue,
 				customIconBackgroundColor,
@@ -75,7 +84,7 @@ export function SocialLinksEdit( props ) {
 				iconBackgroundColorValue: undefined,
 			} );
 		} else {
-			setAttributes( { ...backgroundBackup.current } );
+			setAttributes( { ...backgroundBackupRef.current } );
 		}
 	}, [ logosOnly ] );
 
@@ -89,15 +98,9 @@ export function SocialLinksEdit( props ) {
 		</li>
 	);
 
-	const SelectedSocialPlaceholder = (
-		<li className="wp-block-social-links__social-prompt">
-			{ __( 'Click plus to add' ) }
-		</li>
-	);
-
 	// Fallback color values are used maintain selections in case switching
 	// themes and named colors in palette do not match.
-	const className = classNames( size, {
+	const className = clsx( size, {
 		'has-visible-labels': showLabels,
 		'has-icon-color': iconColor.color || iconColorValue,
 		'has-icon-background-color':
@@ -106,11 +109,11 @@ export function SocialLinksEdit( props ) {
 
 	const blockProps = useBlockProps( { className } );
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: ALLOWED_BLOCKS,
-		placeholder: isSelected ? SelectedSocialPlaceholder : SocialPlaceholder,
+		placeholder: ! isSelected && SocialPlaceholder,
 		templateLock: false,
 		orientation: attributes.layout?.orientation ?? 'horizontal',
 		__experimentalAppenderTagName: 'li',
+		renderAppender: hasAnySelected && InnerBlocks.ButtonBlockAppender,
 	} );
 
 	const POPOVER_PROPS = {
@@ -206,7 +209,7 @@ export function SocialLinksEdit( props ) {
 					/>
 					<ToggleControl
 						__nextHasNoMarginBottom
-						label={ __( 'Show labels' ) }
+						label={ __( 'Show text' ) }
 						checked={ showLabels }
 						onChange={ () =>
 							setAttributes( { showLabels: ! showLabels } )
diff --git a/packages/block-library/src/social-links/edit.native.js b/packages/block-library/src/social-links/edit.native.js
index 8236eef0814775..c250465302227a 100644
--- a/packages/block-library/src/social-links/edit.native.js
+++ b/packages/block-library/src/social-links/edit.native.js
@@ -17,11 +17,6 @@ import { compose, usePreferredColorSchemeStyle } from '@wordpress/compose';
  * Internal dependencies
  */
 import styles from './editor.scss';
-import variations from '../social-link/variations';
-
-const ALLOWED_BLOCKS = variations.map(
-	( v ) => `core/social-link-${ v.name }`
-);
 
 // Template contains the links that show when start.
 const TEMPLATE = [
@@ -58,7 +53,7 @@ function SocialLinksEdit( {
 
 	const renderFooterAppender = useRef( () => (
 		<View style={ styles.footerAppenderContainer }>
-			<InnerBlocks.ButtonBlockAppender isFloating={ true } />
+			<InnerBlocks.ButtonBlockAppender isFloating />
 		</View>
 	) );
 
@@ -95,13 +90,12 @@ function SocialLinksEdit( {
 
 	return (
 		<InnerBlocks
-			allowedBlocks={ ALLOWED_BLOCKS }
 			templateLock={ false }
 			template={ initialCreation && TEMPLATE }
 			renderFooterAppender={
 				shouldRenderFooterAppender && renderFooterAppender.current
 			}
-			orientation={ 'horizontal' }
+			orientation="horizontal"
 			onDeleteBlock={ shouldDelete ? onDelete : undefined }
 			marginVertical={ spacing }
 			marginHorizontal={ spacing }
diff --git a/packages/block-library/src/social-links/editor.scss b/packages/block-library/src/social-links/editor.scss
index 4ba574c965d2d6..11f1ed86d11220 100644
--- a/packages/block-library/src/social-links/editor.scss
+++ b/packages/block-library/src/social-links/editor.scss
@@ -1,26 +1,28 @@
 // Editor specific styles for Social Links.
-.wp-block-social-links {
-	div.block-editor-url-input {
-		display: inline-block;
-		margin-left: $grid-unit-10;
-	}
-
-	// Unset background colors that can be inherited from Global Styles.
-	// This is a duplicate of a rule in style.scss, as it needs higher specificity in the editor.
-	// The rule can be removed if editor styles get lowered in specificity.
-	&.wp-block-social-links {
-		background: none;
-	}
+.wp-block-social-links div.block-editor-url-input {
+	display: inline-block;
+	margin-left: $grid-unit-10;
 }
 
+
 // Prevent toolbar from jumping when selecting / hovering a link.
 .wp-social-link:hover {
 	transform: none;
 }
 
-.editor-styles-wrapper .wp-block-social-links {
+// Specificity for the following styles are fixed at 0-1-0 to match and be
+// overridable by global styles.
+:root :where(.wp-block-social-links),
+:root :where(.wp-block-social-links.is-style-logos-only .wp-block-social-links__social-placeholder .wp-social-link) {
 	padding: 0;
 }
+:root :where(.wp-block-social-links__social-placeholder .wp-social-link) {
+	padding: 0.25em;
+}
+:root :where(.wp-block-social-links.is-style-pill-shape .wp-block-social-links__social-placeholder .wp-social-link) {
+	padding-left: calc((2/3) * 1em);
+	padding-right: calc((2/3) * 1em);
+}
 
 // Placeholder/setup state.
 .wp-block-social-links__social-placeholder {
@@ -44,19 +46,6 @@
 		display: flex;
 	}
 
-	.wp-social-link {
-		padding: 0.25em;
-
-		.is-style-pill-shape & {
-			padding-left: calc((2/3) * 1em);
-			padding-right: calc((2/3) * 1em);
-		}
-
-		.is-style-logos-only & {
-			padding: 0;
-		}
-	}
-
 	.wp-social-link::before {
 		content: "";
 		display: block;
@@ -74,7 +63,6 @@
 .wp-block-social-links .wp-block-social-links__social-prompt {
 	min-height: $button-size-small;
 	list-style: none;
-	order: 2; // Move after the appender button. Because this element is non-interactive, it does not affect tab order.
 
 	// Show as block UI.
 	font-family: $default-font;
@@ -93,7 +81,7 @@
 }
 
 // Improve the preview, ensure buttons are fully opaque despite being disabled.
-// @todo: Look at improving the preview component to make this unnecessary.
+// @todo Look at improving the preview component to make this unnecessary.
 .block-editor-block-preview__content .components-button:disabled {
 	opacity: 1;
 }
@@ -109,3 +97,14 @@
 .wp-social-link.wp-social-link__is-incomplete:focus {
 	opacity: 1;
 }
+
+.wp-block-social-links .block-list-appender {
+	position: static; // display inline.
+
+	.block-editor-button-block-appender {
+		height: 1.5em;
+		width: 1.5em;
+		font-size: inherit;
+		padding: 0;
+	}
+}
diff --git a/packages/block-library/src/social-links/save.js b/packages/block-library/src/social-links/save.js
index 07a91424166241..53d22430850487 100644
--- a/packages/block-library/src/social-links/save.js
+++ b/packages/block-library/src/social-links/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -18,7 +18,7 @@ export default function save( props ) {
 		},
 	} = props;
 
-	const className = classNames( size, {
+	const className = clsx( size, {
 		'has-visible-labels': showLabels,
 		'has-icon-color': iconColorValue,
 		'has-icon-background-color': iconBackgroundColorValue,
diff --git a/packages/block-library/src/social-links/style.scss b/packages/block-library/src/social-links/style.scss
index 1ad883bbb88840..955c0434feea22 100644
--- a/packages/block-library/src/social-links/style.scss
+++ b/packages/block-library/src/social-links/style.scss
@@ -21,12 +21,6 @@
 	}
 
 	.wp-social-link {
-		// By setting the font size, we can scale icons and paddings consistently based on that.
-		// This also allows themes to override this, if need be.
-		a {
-			padding: 0.25em;
-		}
-
 		svg {
 			width: 1em;
 			height: 1em;
@@ -113,20 +107,19 @@
 }
 
 // Provide colors for a range of icons.
-.wp-block-social-links:not(.is-style-logos-only) {
+:where(.wp-block-social-links:not(.is-style-logos-only)) {
 	// Generic items such as mail, feed, etc.
 	@import "../social-link/socials-with-bg.scss";
 }
 
 // Treatment for logos only style.
-.wp-block-social-links.is-style-logos-only {
+// The specificity for this selector has not been reduced to 0-1-0 as per
+// global styles variation selectors as the lack of background should be
+// enforced for this block style.
+:where(.wp-block-social-links.is-style-logos-only) {
 	.wp-social-link {
 		background: none;
 
-		a {
-			padding: 0;
-		}
-
 		// Make these bigger.
 		svg {
 			width: 1.25em;
@@ -142,11 +135,19 @@
 	.wp-social-link {
 		width: auto;
 	}
+}
 
-	.wp-social-link a {
-		padding-left: calc((2/3) * 1em);
-		padding-right: calc((2/3) * 1em);
-	}
+// The following rules have their selector specificity set to 0-1-0 to
+// facilitate theme.json styling of the inner social-link block padding.
+:root :where(.wp-block-social-links .wp-social-link a) {
+	padding: 0.25em;
+}
+:root :where(.wp-block-social-links.is-style-logos-only .wp-social-link a) {
+	padding: 0;
+}
+:root :where(.wp-block-social-links.is-style-pill-shape .wp-social-link a) {
+	padding-left: calc((2/3) * 1em);
+	padding-right: calc((2/3) * 1em);
 }
 
 // Ensure the Snapchat label is visible when no custom
diff --git a/packages/block-library/src/social-links/test/edit.native.js b/packages/block-library/src/social-links/test/edit.native.js
index a4ac5246979aa3..1ff2c89768b03a 100644
--- a/packages/block-library/src/social-links/test/edit.native.js
+++ b/packages/block-library/src/social-links/test/edit.native.js
@@ -9,6 +9,8 @@ import {
 	initializeEditor,
 	within,
 	getBlock,
+	screen,
+	triggerBlockListLayout,
 	waitFor,
 	waitForModalVisible,
 } from 'test/helpers';
@@ -33,7 +35,7 @@ afterAll( () => {
 
 describe( 'Social links block', () => {
 	it( 'inserts block with the default icons and the WordPress link set as active', async () => {
-		const screen = await initializeEditor();
+		await initializeEditor();
 
 		// Add block
 		await addBlock( screen, 'Social Icons' );
@@ -65,7 +67,7 @@ describe( 'Social links block', () => {
 	} );
 
 	it( 'shows active links correctly when not selected', async () => {
-		const screen = await initializeEditor();
+		await initializeEditor();
 
 		// Add Social Icons block
 		await addBlock( screen, 'Social Icons' );
@@ -105,7 +107,7 @@ describe( 'Social links block', () => {
 	} );
 
 	it( 'shows the social links bottom sheet when tapping on the inline appender', async () => {
-		const screen = await initializeEditor();
+		await initializeEditor();
 
 		// Add block
 		await addBlock( screen, 'Social Icons' );
@@ -154,8 +156,42 @@ describe( 'Social links block', () => {
 		expect( getEditorHtml() ).toMatchSnapshot();
 	} );
 
+	it( 'shows only the social link blocks when tapping on the inline appender', async () => {
+		await initializeEditor();
+
+		// Add block
+		await addBlock( screen, 'Social Icons' );
+
+		// Get block
+		const socialLinksBlock = await getBlock( screen, 'Social Icons' );
+		fireEvent.press( socialLinksBlock );
+		await triggerBlockListLayout( socialLinksBlock );
+
+		// Open the links bottom sheet
+		const appenderButton =
+			within( socialLinksBlock ).getByTestId( 'appender-button' );
+		fireEvent.press( appenderButton );
+
+		// Find a social link in the inserter
+		const inserterList = screen.getByTestId( 'InserterUI-Blocks' );
+
+		// onScroll event used to force the FlatList to render all items
+		fireEvent.scroll( inserterList, {
+			nativeEvent: {
+				contentOffset: { y: 0, x: 0 },
+				contentSize: { width: 100, height: 100 },
+				layoutMeasurement: { width: 100, height: 100 },
+			},
+		} );
+
+		// Check the Paragraph core block is not in the list
+		expect(
+			within( inserterList ).queryByLabelText( 'Paragraph block' )
+		).toBeNull();
+	} );
+
 	it( 'shows the ghost placeholder when no icon is active', async () => {
-		const screen = await initializeEditor();
+		await initializeEditor();
 		const { getByLabelText } = screen;
 
 		// Add block
@@ -201,7 +237,7 @@ describe( 'Social links block', () => {
 	} );
 
 	it( "should set a icon's URL", async () => {
-		const screen = await initializeEditor();
+		await initializeEditor();
 		await addBlock( screen, 'Social Icons' );
 		fireEvent.press( screen.getByLabelText( 'Facebook social icon' ) );
 		fireEvent.press( screen.getByLabelText( 'Add link to Facebook' ) );
diff --git a/packages/block-library/src/spacer/block.json b/packages/block-library/src/spacer/block.json
index a9da8d537f1b61..447ea99cc0b677 100644
--- a/packages/block-library/src/spacer/block.json
+++ b/packages/block-library/src/spacer/block.json
@@ -23,6 +23,9 @@
 			"__experimentalDefaultControls": {
 				"margin": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-spacer-editor",
diff --git a/packages/block-library/src/spacer/controls.js b/packages/block-library/src/spacer/controls.js
index 91a1e79be173eb..1e899e15aff0de 100644
--- a/packages/block-library/src/spacer/controls.js
+++ b/packages/block-library/src/spacer/controls.js
@@ -7,9 +7,9 @@ import {
 	useSettings,
 	__experimentalSpacingSizesControl as SpacingSizesControl,
 	isValueSpacingPreset,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import {
-	BaseControl,
 	PanelBody,
 	__experimentalUseCustomUnits as useCustomUnits,
 	__experimentalUnitControl as UnitControl,
@@ -21,14 +21,15 @@ import { View } from '@wordpress/primitives';
 /**
  * Internal dependencies
  */
+import { unlock } from '../lock-unlock';
 import { MIN_SPACER_SIZE } from './constants';
 
+const { useSpacingSizes } = unlock( blockEditorPrivateApis );
+
 function DimensionInput( { label, onChange, isResizing, value = '' } ) {
 	const inputId = useInstanceId( UnitControl, 'block-spacer-height-input' );
-	const [ spacingSizes, spacingUnits ] = useSettings(
-		'spacing.spacingSizes',
-		'spacing.units'
-	);
+	const spacingSizes = useSpacingSizes();
+	const [ spacingUnits ] = useSettings( 'spacing.units' );
 	// In most contexts the spacer size cannot meaningfully be set to a
 	// percentage, since this is relative to the parent container. This
 	// unit is disabled from the UI.
@@ -55,19 +56,17 @@ function DimensionInput( { label, onChange, isResizing, value = '' } ) {
 	return (
 		<>
 			{ ( ! spacingSizes || spacingSizes?.length === 0 ) && (
-				<BaseControl label={ label } id={ inputId }>
-					<UnitControl
-						id={ inputId }
-						isResetValueOnUnitChange
-						min={ MIN_SPACER_SIZE }
-						onChange={ handleOnChange }
-						style={ { maxWidth: 80 } }
-						value={ computedValue }
-						units={ units }
-					/>
-				</BaseControl>
+				<UnitControl
+					id={ inputId }
+					isResetValueOnUnitChange
+					min={ MIN_SPACER_SIZE }
+					onChange={ handleOnChange }
+					value={ computedValue }
+					units={ units }
+					label={ label }
+					__next40pxDefaultSize
+				/>
 			) }
-
 			{ spacingSizes?.length > 0 && (
 				<View className="tools-panel-item-spacing">
 					<SpacingSizesControl
diff --git a/packages/block-library/src/spacer/edit.js b/packages/block-library/src/spacer/edit.js
index 11133732042d3f..1e0ffb9700d685 100644
--- a/packages/block-library/src/spacer/edit.js
+++ b/packages/block-library/src/spacer/edit.js
@@ -1,17 +1,17 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import {
 	useBlockProps,
-	useSettings,
 	getCustomValueFromPreset,
 	getSpacingPresetCssVar,
 	store as blockEditorStore,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import { ResizableBox } from '@wordpress/components';
 import { useState, useEffect } from '@wordpress/element';
@@ -21,9 +21,12 @@ import { useSelect } from '@wordpress/data';
 /**
  * Internal dependencies
  */
+import { unlock } from '../lock-unlock';
 import SpacerControls from './controls';
 import { MIN_SPACER_SIZE } from './constants';
 
+const { useSpacingSizes } = unlock( blockEditorPrivateApis );
+
 const ResizableSpacer = ( {
 	orientation,
 	onResizeStart,
@@ -46,7 +49,7 @@ const ResizableSpacer = ( {
 
 	return (
 		<ResizableBox
-			className={ classnames( 'block-library-spacer__resize-container', {
+			className={ clsx( 'block-library-spacer__resize-container', {
 				'resize-horizontal': orientation === 'horizontal',
 				'is-resizing': isResizing,
 				'is-selected': isSelected,
@@ -67,7 +70,7 @@ const ResizableSpacer = ( {
 				onResizeStop( `${ nextVal }px` );
 				setIsResizing( false );
 			} }
-			__experimentalShowTooltip={ true }
+			__experimentalShowTooltip
 			__experimentalTooltipProps={ {
 				axis: orientation === 'horizontal' ? 'x' : 'y',
 				position: 'corner',
@@ -93,9 +96,14 @@ const SpacerEdit = ( {
 		return editorSettings?.disableCustomSpacingSizes;
 	} );
 	const { orientation } = context;
-	const { orientation: parentOrientation, type } = parentLayout || {};
+	const {
+		orientation: parentOrientation,
+		type,
+		default: { type: defaultType } = {},
+	} = parentLayout || {};
 	// Check if the spacer is inside a flex container.
-	const isFlexLayout = type === 'flex';
+	const isFlexLayout =
+		type === 'flex' || ( ! type && defaultType === 'flex' );
 	// If the spacer is inside a flex container, it should either inherit the orientation
 	// of the parent or use the flex default orientation.
 	const inheritedOrientation =
@@ -107,7 +115,7 @@ const SpacerEdit = ( {
 	const { layout = {} } = blockStyle;
 	const { selfStretch, flexSize } = layout;
 
-	const [ spacingSizes ] = useSettings( 'spacing.spacingSizes' );
+	const spacingSizes = useSpacingSizes();
 
 	const [ isResizing, setIsResizing ] = useState( false );
 	const [ temporaryHeight, setTemporaryHeight ] = useState( null );
@@ -341,7 +349,7 @@ const SpacerEdit = ( {
 			<View
 				{ ...useBlockProps( {
 					style,
-					className: classnames( className, {
+					className: clsx( className, {
 						'custom-sizes-disabled': disableCustomSpacingSizes,
 					} ),
 				} ) }
diff --git a/packages/block-library/src/spacer/edit.native.js b/packages/block-library/src/spacer/edit.native.js
index 614624570a6d95..c6ef3095e26acc 100644
--- a/packages/block-library/src/spacer/edit.native.js
+++ b/packages/block-library/src/spacer/edit.native.js
@@ -6,14 +6,16 @@ import { View, useWindowDimensions } from 'react-native';
 /**
  * WordPress dependencies
  */
-import { useConvertUnitToMobile } from '@wordpress/components';
+import {
+	useConvertUnitToMobile,
+	getPxFromCssUnit,
+} from '@wordpress/components';
 import { withPreferredColorScheme } from '@wordpress/compose';
 import {
 	InspectorControls,
 	isValueSpacingPreset,
 	useSettings,
 	getCustomValueFromPreset,
-	getPxFromCssUnit,
 } from '@wordpress/block-editor';
 import { useEffect } from '@wordpress/element';
 
diff --git a/packages/block-library/src/spacer/editor.scss b/packages/block-library/src/spacer/editor.scss
index 9eb8c8b4b263ee..e0c700795c0870 100644
--- a/packages/block-library/src/spacer/editor.scss
+++ b/packages/block-library/src/spacer/editor.scss
@@ -42,5 +42,7 @@
 
 	&.resize-horizontal {
 		margin-bottom: 0;
+		// Important is used to have higher specificity than the inline style set by re-resizable library.
+		height: 100% !important;
 	}
 }
diff --git a/packages/block-library/src/spacer/index.js b/packages/block-library/src/spacer/index.js
index d77c51bc96cea2..d2a60e0cdc1602 100644
--- a/packages/block-library/src/spacer/index.js
+++ b/packages/block-library/src/spacer/index.js
@@ -10,6 +10,7 @@ import initBlock from '../utils/init-block';
 import deprecated from './deprecated';
 import edit from './edit';
 import metadata from './block.json';
+import transforms from './transforms';
 import save from './save';
 
 const { name } = metadata;
@@ -18,6 +19,7 @@ export { metadata, name };
 
 export const settings = {
 	icon,
+	transforms,
 	edit,
 	save,
 	deprecated,
diff --git a/packages/block-library/src/spacer/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/spacer/test/__snapshots__/transforms.native.js.snap
index ce53012ff17e71..2427b0fb0f8559 100644
--- a/packages/block-library/src/spacer/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/spacer/test/__snapshots__/transforms.native.js.snap
@@ -17,3 +17,9 @@ exports[`Spacer block transforms to Group block 1`] = `
 <!-- /wp:spacer --></div>
 <!-- /wp:group -->"
 `;
+
+exports[`Spacer block transforms to Separator block 1`] = `
+"<!-- wp:separator -->
+<hr class="wp-block-separator has-alpha-channel-opacity"/>
+<!-- /wp:separator -->"
+`;
diff --git a/packages/block-library/src/spacer/test/transforms.native.js b/packages/block-library/src/spacer/test/transforms.native.js
index fc84004166775c..df8ff3bf237245 100644
--- a/packages/block-library/src/spacer/test/transforms.native.js
+++ b/packages/block-library/src/spacer/test/transforms.native.js
@@ -16,7 +16,7 @@ const initialHtml = `
 <!-- /wp:spacer -->`;
 
 const transformsWithInnerBlocks = [ 'Columns', 'Group' ];
-const blockTransforms = [ ...transformsWithInnerBlocks ];
+const blockTransforms = [ 'Separator', ...transformsWithInnerBlocks ];
 
 setupCoreBlocks();
 
diff --git a/packages/block-library/src/spacer/transforms.js b/packages/block-library/src/spacer/transforms.js
new file mode 100644
index 00000000000000..ddd8afb2ef98d9
--- /dev/null
+++ b/packages/block-library/src/spacer/transforms.js
@@ -0,0 +1,20 @@
+/**
+ * WordPress dependencies
+ */
+import { createBlock } from '@wordpress/blocks';
+
+const transforms = {
+	to: [
+		{
+			type: 'block',
+			blocks: [ 'core/separator' ], // Transform to Separator.
+			transform: ( { anchor } ) => {
+				return createBlock( 'core/separator', {
+					anchor: anchor || '',
+				} );
+			},
+		},
+	],
+};
+
+export default transforms;
diff --git a/packages/block-library/src/style.scss b/packages/block-library/src/style.scss
index 790e09535f4b69..a8819c2084dc2e 100644
--- a/packages/block-library/src/style.scss
+++ b/packages/block-library/src/style.scss
@@ -10,6 +10,11 @@
 @import "./comments/style.scss";
 @import "./comments-pagination/style.scss";
 @import "./comment-template/style.scss";
+@import "./comment-date/style.scss";
+@import "./comment-content/style.scss";
+@import "./comment-author-name/style.scss";
+@import "./comment-edit-link/style.scss";
+@import "./comment-reply-link/style.scss";
 @import "./cover/style.scss";
 @import "./details/style.scss";
 @import "./embed/style.scss";
@@ -22,13 +27,16 @@
 @import "./latest-comments/style.scss";
 @import "./latest-posts/style.scss";
 @import "./list/style.scss";
+@import "./loginout/style.scss";
 @import "./media-text/style.scss";
 @import "./navigation/style.scss";
 @import "./navigation-link/style.scss";
 @import "./page-list/style.scss";
 @import "./paragraph/style.scss";
 @import "./post-author/style.scss";
+@import "./post-author-biography/style.scss";
 @import "./post-comments-form/style.scss";
+@import "./post-content/style.scss";
 @import "./post-date/style.scss";
 @import "./post-excerpt/style.scss";
 @import "./post-featured-image/style.scss";
@@ -36,6 +44,7 @@
 @import "./post-terms/style.scss";
 @import "./post-time-to-read/style.scss";
 @import "./post-title/style.scss";
+@import "./post-author-name/style.scss";
 @import "./preformatted/style.scss";
 @import "./pullquote/style.scss";
 @import "./post-template/style.scss";
@@ -47,11 +56,13 @@
 @import "./search/style.scss";
 @import "./separator/style.scss";
 @import "./site-logo/style.scss";
+@import "./site-tagline/style.scss";
 @import "./site-title/style.scss";
 @import "./social-links/style.scss";
 @import "./spacer/style.scss";
 @import "./tag-cloud/style.scss";
 @import "./table/style.scss";
+@import "./table-of-contents/style.scss";
 @import "./term-description/style.scss";
 @import "./text-columns/style.scss";
 @import "./verse/style.scss";
diff --git a/packages/block-library/src/table-of-contents/block.json b/packages/block-library/src/table-of-contents/block.json
index 5fa7e37e6acbdf..5eb6e729d3f03e 100644
--- a/packages/block-library/src/table-of-contents/block.json
+++ b/packages/block-library/src/table-of-contents/block.json
@@ -4,7 +4,7 @@
 	"__experimental": true,
 	"name": "core/table-of-contents",
 	"title": "Table of Contents",
-	"category": "layout",
+	"category": "design",
 	"description": "Summarize your post with a list of headings. Add HTML anchors to Heading blocks to link them here.",
 	"keywords": [ "document outline", "summary" ],
 	"textdomain": "default",
@@ -45,7 +45,74 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
+		}
+	},
+	"example": {
+		"innerBlocks": [
+			{
+				"name": "core/heading",
+				"attributes": {
+					"level": 2,
+					"content": "Heading"
+				}
+			},
+			{
+				"name": "core/heading",
+				"attributes": {
+					"level": 3,
+					"content": "Subheading"
+				}
+			},
+			{
+				"name": "core/heading",
+				"attributes": {
+					"level": 2,
+					"content": "Heading"
+				}
+			},
+			{
+				"name": "core/heading",
+				"attributes": {
+					"level": 3,
+					"content": "Subheading"
+				}
+			}
+		],
+		"attributes": {
+			"headings": [
+				{
+					"content": "Heading",
+					"level": 2
+				},
+				{
+					"content": "Subheading",
+					"level": 3
+				},
+				{
+					"content": "Heading",
+					"level": 2
+				},
+				{
+					"content": "Subheading",
+					"level": 3
+				}
+			]
 		}
 	},
-	"example": {}
+	"style": "wp-block-table-of-contents"
 }
diff --git a/packages/block-library/src/table-of-contents/edit.js b/packages/block-library/src/table-of-contents/edit.js
index fcb3efaad334f5..c95b89200cb88c 100644
--- a/packages/block-library/src/table-of-contents/edit.js
+++ b/packages/block-library/src/table-of-contents/edit.js
@@ -58,15 +58,11 @@ export default function TableOfContentsEdit( {
 	);
 
 	// If a user clicks to a link prevent redirection and show a warning.
-	const { createWarningNotice, removeNotice } = useDispatch( noticeStore );
-	let noticeId;
+	const { createWarningNotice } = useDispatch( noticeStore );
 	const showRedirectionPreventedNotice = ( event ) => {
 		event.preventDefault();
-		// Remove previous warning if any, to show one at a time per block.
-		removeNotice( noticeId );
-		noticeId = `block-library/core/table-of-contents/redirection-prevented/${ instanceId }`;
 		createWarningNotice( __( 'Links are disabled in the editor.' ), {
-			id: noticeId,
+			id: `block-library/core/table-of-contents/redirection-prevented/${ instanceId }`,
 			type: 'snackbar',
 		} );
 	};
@@ -160,7 +156,7 @@ export default function TableOfContentsEdit( {
 				<ol>
 					<TableOfContentsList
 						nestedHeadingList={ headingTree }
-						disableLinkActivation={ true }
+						disableLinkActivation
 						onClick={ showRedirectionPreventedNotice }
 					/>
 				</ol>
diff --git a/packages/block-library/src/table-of-contents/hooks.js b/packages/block-library/src/table-of-contents/hooks.js
index af7b66568123f8..ef24d8167381ad 100644
--- a/packages/block-library/src/table-of-contents/hooks.js
+++ b/packages/block-library/src/table-of-contents/hooks.js
@@ -17,7 +17,7 @@ function getLatestHeadings( select, clientId ) {
 		getBlockAttributes,
 		getBlockName,
 		getClientIdsWithDescendants,
-		__experimentalGetGlobalBlocksByName: getGlobalBlocksByName,
+		getBlocksByName,
 	} = select( blockEditorStore );
 
 	// FIXME: @wordpress/block-library should not depend on @wordpress/editor.
@@ -28,7 +28,7 @@ function getLatestHeadings( select, clientId ) {
 	// eslint-disable-next-line @wordpress/data-no-store-string-literals
 	const permalink = select( 'core/editor' ).getPermalink() ?? null;
 
-	const isPaginated = getGlobalBlocksByName( 'core/nextpage' ).length !== 0;
+	const isPaginated = getBlocksByName( 'core/nextpage' ).length !== 0;
 	const { onlyIncludeCurrentPage } = getBlockAttributes( clientId ) ?? {};
 
 	// Get the client ids of all blocks in the editor.
diff --git a/packages/block-library/src/table-of-contents/style.scss b/packages/block-library/src/table-of-contents/style.scss
new file mode 100644
index 00000000000000..4a3fbb6108bee5
--- /dev/null
+++ b/packages/block-library/src/table-of-contents/style.scss
@@ -0,0 +1,4 @@
+:root :where(.wp-block-table-of-contents) {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
+}
diff --git a/packages/block-library/src/table/block.json b/packages/block-library/src/table/block.json
index d1139d6c55addf..11dd5b5f323e3b 100644
--- a/packages/block-library/src/table/block.json
+++ b/packages/block-library/src/table/block.json
@@ -9,13 +9,12 @@
 	"attributes": {
 		"hasFixedLayout": {
 			"type": "boolean",
-			"default": false
+			"default": true
 		},
 		"caption": {
-			"type": "string",
-			"source": "html",
-			"selector": "figcaption",
-			"default": ""
+			"type": "rich-text",
+			"source": "rich-text",
+			"selector": "figcaption"
 		},
 		"head": {
 			"type": "array",
@@ -30,8 +29,8 @@
 					"selector": "td,th",
 					"query": {
 						"content": {
-							"type": "string",
-							"source": "html"
+							"type": "rich-text",
+							"source": "rich-text"
 						},
 						"tag": {
 							"type": "string",
@@ -75,8 +74,8 @@
 					"selector": "td,th",
 					"query": {
 						"content": {
-							"type": "string",
-							"source": "html"
+							"type": "rich-text",
+							"source": "rich-text"
 						},
 						"tag": {
 							"type": "string",
@@ -120,8 +119,8 @@
 					"selector": "td,th",
 					"query": {
 						"content": {
-							"type": "string",
-							"source": "html"
+							"type": "rich-text",
+							"source": "rich-text"
 						},
 						"tag": {
 							"type": "string",
@@ -196,7 +195,10 @@
 				"width": true
 			}
 		},
-		"__experimentalSelector": ".wp-block-table > table"
+		"__experimentalSelector": ".wp-block-table > table",
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"styles": [
 		{
diff --git a/packages/block-library/src/table/deprecated.js b/packages/block-library/src/table/deprecated.js
index ed138c4518aa31..5f8ab6d5a7e3fa 100644
--- a/packages/block-library/src/table/deprecated.js
+++ b/packages/block-library/src/table/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,6 +12,7 @@ import {
 	useBlockProps,
 	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
 	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
+	__experimentalGetElementClassName,
 } from '@wordpress/block-editor';
 
 // As the previous arbitrary colors won't match theme color palettes, the hex
@@ -24,8 +25,262 @@ const oldColors = {
 	'subtle-pale-pink': '#fcf0ef',
 };
 
+// Fixed width table cells on by default.
+const v4Query = {
+	content: {
+		type: 'rich-text',
+		source: 'rich-text',
+	},
+	tag: {
+		type: 'string',
+		default: 'td',
+		source: 'tag',
+	},
+	scope: {
+		type: 'string',
+		source: 'attribute',
+		attribute: 'scope',
+	},
+	align: {
+		type: 'string',
+		source: 'attribute',
+		attribute: 'data-align',
+	},
+	colspan: {
+		type: 'string',
+		source: 'attribute',
+		attribute: 'colspan',
+	},
+	rowspan: {
+		type: 'string',
+		source: 'attribute',
+		attribute: 'rowspan',
+	},
+};
+
+const v4 = {
+	attributes: {
+		hasFixedLayout: {
+			type: 'boolean',
+			default: false,
+		},
+		caption: {
+			type: 'rich-text',
+			source: 'rich-text',
+			selector: 'figcaption',
+		},
+		head: {
+			type: 'array',
+			default: [],
+			source: 'query',
+			selector: 'thead tr',
+			query: {
+				cells: {
+					type: 'array',
+					default: [],
+					source: 'query',
+					selector: 'td,th',
+					query: v4Query,
+				},
+			},
+		},
+		body: {
+			type: 'array',
+			default: [],
+			source: 'query',
+			selector: 'tbody tr',
+			query: {
+				cells: {
+					type: 'array',
+					default: [],
+					source: 'query',
+					selector: 'td,th',
+					query: v4Query,
+				},
+			},
+		},
+		foot: {
+			type: 'array',
+			default: [],
+			source: 'query',
+			selector: 'tfoot tr',
+			query: {
+				cells: {
+					type: 'array',
+					default: [],
+					source: 'query',
+					selector: 'td,th',
+					query: v4Query,
+				},
+			},
+		},
+	},
+	supports: {
+		anchor: true,
+		align: true,
+		color: {
+			__experimentalSkipSerialization: true,
+			gradients: true,
+			__experimentalDefaultControls: {
+				background: true,
+				text: true,
+			},
+		},
+		spacing: {
+			margin: true,
+			padding: true,
+			__experimentalDefaultControls: {
+				margin: false,
+				padding: false,
+			},
+		},
+		typography: {
+			fontSize: true,
+			lineHeight: true,
+			__experimentalFontFamily: true,
+			__experimentalFontStyle: true,
+			__experimentalFontWeight: true,
+			__experimentalLetterSpacing: true,
+			__experimentalTextTransform: true,
+			__experimentalTextDecoration: true,
+			__experimentalDefaultControls: {
+				fontSize: true,
+			},
+		},
+		__experimentalBorder: {
+			__experimentalSkipSerialization: true,
+			color: true,
+			style: true,
+			width: true,
+			__experimentalDefaultControls: {
+				color: true,
+				style: true,
+				width: true,
+			},
+		},
+		__experimentalSelector: '.wp-block-table > table',
+		interactivity: {
+			clientNavigation: true,
+		},
+	},
+	save( { attributes } ) {
+		const { hasFixedLayout, head, body, foot, caption } = attributes;
+		const isEmpty = ! head.length && ! body.length && ! foot.length;
+
+		if ( isEmpty ) {
+			return null;
+		}
+
+		const colorProps = getColorClassesAndStyles( attributes );
+		const borderProps = getBorderClassesAndStyles( attributes );
+
+		const classes = clsx( colorProps.className, borderProps.className, {
+			'has-fixed-layout': hasFixedLayout,
+		} );
+
+		const hasCaption = ! RichText.isEmpty( caption );
+
+		const Section = ( { type, rows } ) => {
+			if ( ! rows.length ) {
+				return null;
+			}
+
+			const Tag = `t${ type }`;
+
+			return (
+				<Tag>
+					{ rows.map( ( { cells }, rowIndex ) => (
+						<tr key={ rowIndex }>
+							{ cells.map(
+								(
+									{
+										content,
+										tag,
+										scope,
+										align,
+										colspan,
+										rowspan,
+									},
+									cellIndex
+								) => {
+									const cellClasses = clsx( {
+										[ `has-text-align-${ align }` ]: align,
+									} );
+
+									return (
+										<RichText.Content
+											className={
+												cellClasses
+													? cellClasses
+													: undefined
+											}
+											data-align={ align }
+											tagName={ tag }
+											value={ content }
+											key={ cellIndex }
+											scope={
+												tag === 'th' ? scope : undefined
+											}
+											colSpan={ colspan }
+											rowSpan={ rowspan }
+										/>
+									);
+								}
+							) }
+						</tr>
+					) ) }
+				</Tag>
+			);
+		};
+
+		return (
+			<figure { ...useBlockProps.save() }>
+				<table
+					className={ classes === '' ? undefined : classes }
+					style={ { ...colorProps.style, ...borderProps.style } }
+				>
+					<Section type="head" rows={ head } />
+					<Section type="body" rows={ body } />
+					<Section type="foot" rows={ foot } />
+				</table>
+				{ hasCaption && (
+					<RichText.Content
+						tagName="figcaption"
+						value={ caption }
+						className={ __experimentalGetElementClassName(
+							'caption'
+						) }
+					/>
+				) }
+			</figure>
+		);
+	},
+};
+
 // In #41140 support was added to global styles for caption elements which
 // added a `wp-element-caption` classname to the embed figcaption element.
+const v3Query = {
+	content: {
+		type: 'string',
+		source: 'html',
+	},
+	tag: {
+		type: 'string',
+		default: 'td',
+		source: 'tag',
+	},
+	scope: {
+		type: 'string',
+		source: 'attribute',
+		attribute: 'scope',
+	},
+	align: {
+		type: 'string',
+		source: 'attribute',
+		attribute: 'data-align',
+	},
+};
+
 const v3 = {
 	attributes: {
 		hasFixedLayout: {
@@ -49,27 +304,7 @@ const v3 = {
 					default: [],
 					source: 'query',
 					selector: 'td,th',
-					query: {
-						content: {
-							type: 'string',
-							source: 'html',
-						},
-						tag: {
-							type: 'string',
-							default: 'td',
-							source: 'tag',
-						},
-						scope: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'scope',
-						},
-						align: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'data-align',
-						},
-					},
+					query: v3Query,
 				},
 			},
 		},
@@ -84,27 +319,7 @@ const v3 = {
 					default: [],
 					source: 'query',
 					selector: 'td,th',
-					query: {
-						content: {
-							type: 'string',
-							source: 'html',
-						},
-						tag: {
-							type: 'string',
-							default: 'td',
-							source: 'tag',
-						},
-						scope: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'scope',
-						},
-						align: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'data-align',
-						},
-					},
+					query: v3Query,
 				},
 			},
 		},
@@ -119,27 +334,7 @@ const v3 = {
 					default: [],
 					source: 'query',
 					selector: 'td,th',
-					query: {
-						content: {
-							type: 'string',
-							source: 'html',
-						},
-						tag: {
-							type: 'string',
-							default: 'td',
-							source: 'tag',
-						},
-						scope: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'scope',
-						},
-						align: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'data-align',
-						},
-					},
+					query: v3Query,
 				},
 			},
 		},
@@ -196,13 +391,9 @@ const v3 = {
 		const colorProps = getColorClassesAndStyles( attributes );
 		const borderProps = getBorderClassesAndStyles( attributes );
 
-		const classes = classnames(
-			colorProps.className,
-			borderProps.className,
-			{
-				'has-fixed-layout': hasFixedLayout,
-			}
-		);
+		const classes = clsx( colorProps.className, borderProps.className, {
+			'has-fixed-layout': hasFixedLayout,
+		} );
 
 		const hasCaption = ! RichText.isEmpty( caption );
 
@@ -222,7 +413,7 @@ const v3 = {
 									{ content, tag, scope, align },
 									cellIndex
 								) => {
-									const cellClasses = classnames( {
+									const cellClasses = clsx( {
 										[ `has-text-align-${ align }` ]: align,
 									} );
 
@@ -269,6 +460,28 @@ const v3 = {
 };
 
 // Deprecation migrating table block to use colors block support feature.
+const v2Query = {
+	content: {
+		type: 'string',
+		source: 'html',
+	},
+	tag: {
+		type: 'string',
+		default: 'td',
+		source: 'tag',
+	},
+	scope: {
+		type: 'string',
+		source: 'attribute',
+		attribute: 'scope',
+	},
+	align: {
+		type: 'string',
+		source: 'attribute',
+		attribute: 'data-align',
+	},
+};
+
 const v2 = {
 	attributes: {
 		hasFixedLayout: {
@@ -295,27 +508,7 @@ const v2 = {
 					default: [],
 					source: 'query',
 					selector: 'td,th',
-					query: {
-						content: {
-							type: 'string',
-							source: 'html',
-						},
-						tag: {
-							type: 'string',
-							default: 'td',
-							source: 'tag',
-						},
-						scope: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'scope',
-						},
-						align: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'data-align',
-						},
-					},
+					query: v2Query,
 				},
 			},
 		},
@@ -330,27 +523,7 @@ const v2 = {
 					default: [],
 					source: 'query',
 					selector: 'td,th',
-					query: {
-						content: {
-							type: 'string',
-							source: 'html',
-						},
-						tag: {
-							type: 'string',
-							default: 'td',
-							source: 'tag',
-						},
-						scope: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'scope',
-						},
-						align: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'data-align',
-						},
-					},
+					query: v2Query,
 				},
 			},
 		},
@@ -365,27 +538,7 @@ const v2 = {
 					default: [],
 					source: 'query',
 					selector: 'td,th',
-					query: {
-						content: {
-							type: 'string',
-							source: 'html',
-						},
-						tag: {
-							type: 'string',
-							default: 'td',
-							source: 'tag',
-						},
-						scope: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'scope',
-						},
-						align: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'data-align',
-						},
-					},
+					query: v2Query,
 				},
 			},
 		},
@@ -409,7 +562,7 @@ const v2 = {
 			backgroundColor
 		);
 
-		const classes = classnames( backgroundClass, {
+		const classes = clsx( backgroundClass, {
 			'has-fixed-layout': hasFixedLayout,
 			'has-background': !! backgroundClass,
 		} );
@@ -432,7 +585,7 @@ const v2 = {
 									{ content, tag, scope, align },
 									cellIndex
 								) => {
-									const cellClasses = classnames( {
+									const cellClasses = clsx( {
 										[ `has-text-align-${ align }` ]: align,
 									} );
 
@@ -496,6 +649,23 @@ const v2 = {
 	},
 };
 
+const v1Query = {
+	content: {
+		type: 'string',
+		source: 'html',
+	},
+	tag: {
+		type: 'string',
+		default: 'td',
+		source: 'tag',
+	},
+	scope: {
+		type: 'string',
+		source: 'attribute',
+		attribute: 'scope',
+	},
+};
+
 const v1 = {
 	attributes: {
 		hasFixedLayout: {
@@ -516,22 +686,7 @@ const v1 = {
 					default: [],
 					source: 'query',
 					selector: 'td,th',
-					query: {
-						content: {
-							type: 'string',
-							source: 'html',
-						},
-						tag: {
-							type: 'string',
-							default: 'td',
-							source: 'tag',
-						},
-						scope: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'scope',
-						},
-					},
+					query: v1Query,
 				},
 			},
 		},
@@ -546,22 +701,7 @@ const v1 = {
 					default: [],
 					source: 'query',
 					selector: 'td,th',
-					query: {
-						content: {
-							type: 'string',
-							source: 'html',
-						},
-						tag: {
-							type: 'string',
-							default: 'td',
-							source: 'tag',
-						},
-						scope: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'scope',
-						},
-					},
+					query: v1Query,
 				},
 			},
 		},
@@ -576,22 +716,7 @@ const v1 = {
 					default: [],
 					source: 'query',
 					selector: 'td,th',
-					query: {
-						content: {
-							type: 'string',
-							source: 'html',
-						},
-						tag: {
-							type: 'string',
-							default: 'td',
-							source: 'tag',
-						},
-						scope: {
-							type: 'string',
-							source: 'attribute',
-							attribute: 'scope',
-						},
-					},
+					query: v1Query,
 				},
 			},
 		},
@@ -613,7 +738,7 @@ const v1 = {
 			backgroundColor
 		);
 
-		const classes = classnames( backgroundClass, {
+		const classes = clsx( backgroundClass, {
 			'has-fixed-layout': hasFixedLayout,
 			'has-background': !! backgroundClass,
 		} );
@@ -665,4 +790,4 @@ const v1 = {
  *
  * See block-deprecation.md
  */
-export default [ v3, v2, v1 ];
+export default [ v4, v3, v2, v1 ];
diff --git a/packages/block-library/src/table/edit.js b/packages/block-library/src/table/edit.js
index 17a9e1ecfdd5bf..f1cb3fa5d8b8ae 100644
--- a/packages/block-library/src/table/edit.js
+++ b/packages/block-library/src/table/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -16,7 +16,6 @@ import {
 	useBlockProps,
 	__experimentalUseColorProps as useColorProps,
 	__experimentalUseBorderProps as useBorderProps,
-	__experimentalGetElementClassName,
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 import {
@@ -41,7 +40,6 @@ import {
 	tableRowDelete,
 	table,
 } from '@wordpress/icons';
-import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -57,6 +55,7 @@ import {
 	toggleSection,
 	isEmptyTableSection,
 } from './state';
+import { Caption } from '../utils/caption';
 
 const ALIGNMENT_CONTROLS = [
 	{
@@ -96,9 +95,9 @@ function TableEdit( {
 	attributes,
 	setAttributes,
 	insertBlocksAfter,
-	isSelected,
+	isSelected: isSingleSelected,
 } ) {
-	const { hasFixedLayout, caption, head, foot } = attributes;
+	const { hasFixedLayout, head, foot } = attributes;
 	const [ initialRowCount, setInitialRowCount ] = useState( 2 );
 	const [ initialColumnCount, setInitialColumnCount ] = useState( 2 );
 	const [ selectedCell, setSelectedCell ] = useState();
@@ -341,10 +340,10 @@ function TableEdit( {
 	}
 
 	useEffect( () => {
-		if ( ! isSelected ) {
+		if ( ! isSingleSelected ) {
 			setSelectedCell();
 		}
-	}, [ isSelected ] );
+	}, [ isSingleSelected ] );
 
 	useEffect( () => {
 		if ( hasTableCreated ) {
@@ -419,7 +418,7 @@ function TableEdit( {
 								scope={ CellTag === 'th' ? scope : undefined }
 								colSpan={ colspan }
 								rowSpan={ rowspan }
-								className={ classnames(
+								className={ clsx(
 									{
 										[ `has-text-align-${ align }` ]: align,
 									},
@@ -466,7 +465,6 @@ function TableEdit( {
 					</BlockControls>
 					<BlockControls group="other">
 						<ToolbarDropdownMenu
-							hasArrowIndicator
 							icon={ table }
 							label={ __( 'Edit table' ) }
 							controls={ tableControls }
@@ -505,7 +503,7 @@ function TableEdit( {
 			</InspectorControls>
 			{ ! isEmpty && (
 				<table
-					className={ classnames(
+					className={ clsx(
 						colorProps.className,
 						borderProps.className,
 						{
@@ -523,27 +521,7 @@ function TableEdit( {
 					{ renderedSections }
 				</table>
 			) }
-			{ ! isEmpty && (
-				<RichText
-					identifier="caption"
-					tagName="figcaption"
-					className={ __experimentalGetElementClassName( 'caption' ) }
-					aria-label={ __( 'Table caption text' ) }
-					placeholder={ __( 'Add caption' ) }
-					value={ caption }
-					onChange={ ( value ) =>
-						setAttributes( { caption: value } )
-					}
-					// Deselect the selected table cell when the caption is focused.
-					onFocus={ () => setSelectedCell() }
-					__unstableOnSplitAtEnd={ () =>
-						insertBlocksAfter(
-							createBlock( getDefaultBlockName() )
-						)
-					}
-				/>
-			) }
-			{ isEmpty && (
+			{ isEmpty ? (
 				<Placeholder
 					label={ __( 'Table' ) }
 					icon={ <BlockIcon icon={ icon } showColors /> }
@@ -555,6 +533,7 @@ function TableEdit( {
 					>
 						<TextControl
 							__nextHasNoMarginBottom
+							__next40pxDefaultSize
 							type="number"
 							label={ __( 'Column count' ) }
 							value={ initialColumnCount }
@@ -564,6 +543,7 @@ function TableEdit( {
 						/>
 						<TextControl
 							__nextHasNoMarginBottom
+							__next40pxDefaultSize
 							type="number"
 							label={ __( 'Row count' ) }
 							value={ initialRowCount }
@@ -572,7 +552,7 @@ function TableEdit( {
 							className="blocks-table__placeholder-input"
 						/>
 						<Button
-							className="blocks-table__placeholder-button"
+							__next40pxDefaultSize
 							variant="primary"
 							type="submit"
 						>
@@ -580,6 +560,15 @@ function TableEdit( {
 						</Button>
 					</form>
 				</Placeholder>
+			) : (
+				<Caption
+					attributes={ attributes }
+					setAttributes={ setAttributes }
+					isSelected={ isSingleSelected }
+					insertBlocksAfter={ insertBlocksAfter }
+					label={ __( 'Table caption text' ) }
+					showToolbarButton={ isSingleSelected }
+				/>
 			) }
 		</figure>
 	);
diff --git a/packages/block-library/src/table/editor.scss b/packages/block-library/src/table/editor.scss
index ef7e1bdcd9aa38..55652742a5ae9d 100644
--- a/packages/block-library/src/table/editor.scss
+++ b/packages/block-library/src/table/editor.scss
@@ -1,7 +1,4 @@
 .wp-block-table {
-	// Remove default <figure> style.
-	margin: 0;
-
 	.wp-block[data-align="left"] > &,
 	.wp-block[data-align="right"] > &,
 	.wp-block[data-align="center"] > & {
@@ -58,27 +55,14 @@
 	display: flex;
 	flex-direction: column;
 	align-items: flex-start;
-
-	> * {
-		margin-bottom: $grid-unit-10;
-	}
+	gap: $grid-unit-10;
 
 	@include break-medium() {
 		flex-direction: row;
 		align-items: flex-end;
-
-		> * {
-			margin-bottom: 0;
-		}
 	}
 }
 
 .blocks-table__placeholder-input {
 	width: $grid-unit-10 * 14;
-	margin-right: $grid-unit-10;
-	margin-bottom: 0;
-
-	input {
-		height: $button-size;
-	}
 }
diff --git a/packages/block-library/src/table/save.js b/packages/block-library/src/table/save.js
index dca1295656aa64..abf0c3ce900dc1 100644
--- a/packages/block-library/src/table/save.js
+++ b/packages/block-library/src/table/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -25,7 +25,7 @@ export default function save( { attributes } ) {
 	const colorProps = getColorClassesAndStyles( attributes );
 	const borderProps = getBorderClassesAndStyles( attributes );
 
-	const classes = classnames( colorProps.className, borderProps.className, {
+	const classes = clsx( colorProps.className, borderProps.className, {
 		'has-fixed-layout': hasFixedLayout,
 	} );
 
@@ -54,7 +54,7 @@ export default function save( { attributes } ) {
 								},
 								cellIndex
 							) => {
-								const cellClasses = classnames( {
+								const cellClasses = clsx( {
 									[ `has-text-align-${ align }` ]: align,
 								} );
 
diff --git a/packages/block-library/src/table/style.scss b/packages/block-library/src/table/style.scss
index 4f4271650f50e1..69cd2666e13e20 100644
--- a/packages/block-library/src/table/style.scss
+++ b/packages/block-library/src/table/style.scss
@@ -71,6 +71,9 @@
 	}
 
 	// "Stripes" style variation.
+	// This block style selector does not have 0-1-0 specificity, as per those
+	// generated via global styles, to maintain current styling. Global styles
+	// support for table borders also only applies to the outer `table` element.
 	&.is-style-stripes {
 		border-spacing: 0;
 		border-collapse: inherit;
diff --git a/packages/block-library/src/table/theme.scss b/packages/block-library/src/table/theme.scss
index d42e79b02b4965..c86da9c7f731f8 100644
--- a/packages/block-library/src/table/theme.scss
+++ b/packages/block-library/src/table/theme.scss
@@ -6,7 +6,7 @@
 		word-break: normal;
 	}
 
-	figcaption {
+	:where(figcaption) {
 		@include caption-style-theme();
 	}
 }
diff --git a/packages/block-library/src/tag-cloud/block.json b/packages/block-library/src/tag-cloud/block.json
index 9481dc945666ad..044bc0c5333768 100644
--- a/packages/block-library/src/tag-cloud/block.json
+++ b/packages/block-library/src/tag-cloud/block.json
@@ -4,7 +4,7 @@
 	"name": "core/tag-cloud",
 	"title": "Tag Cloud",
 	"category": "widgets",
-	"description": "A cloud of your most used tags.",
+	"description": "A cloud of popular keywords, each sized by how often it appears.",
 	"textdomain": "default",
 	"attributes": {
 		"numberOfTags": {
@@ -48,6 +48,21 @@
 			"__experimentalFontStyle": true,
 			"__experimentalTextTransform": true,
 			"__experimentalLetterSpacing": true
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	},
 	"editorStyle": "wp-block-tag-cloud-editor"
diff --git a/packages/block-library/src/tag-cloud/edit.js b/packages/block-library/src/tag-cloud/edit.js
index a52c68bc6a7390..eeb568e7a89ef1 100644
--- a/packages/block-library/src/tag-cloud/edit.js
+++ b/packages/block-library/src/tag-cloud/edit.js
@@ -11,9 +11,10 @@ import {
 	__experimentalUnitControl as UnitControl,
 	__experimentalUseCustomUnits as useCustomUnits,
 	__experimentalParseQuantityAndUnitFromRawValue as parseQuantityAndUnitFromRawValue,
+	__experimentalVStack as VStack,
 	Disabled,
 } from '@wordpress/components';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import {
 	InspectorControls,
@@ -40,7 +41,7 @@ const MAX_TAGS = 100;
 const MIN_FONT_SIZE = 0.1;
 const MAX_FONT_SIZE = 100;
 
-function TagCloudEdit( { attributes, setAttributes, taxonomies } ) {
+function TagCloudEdit( { attributes, setAttributes } ) {
 	const {
 		taxonomy,
 		showTagCounts,
@@ -50,10 +51,20 @@ function TagCloudEdit( { attributes, setAttributes, taxonomies } ) {
 	} = attributes;
 
 	const [ availableUnits ] = useSettings( 'spacing.units' );
+
+	// The `pt` unit is used as the default value and is therefore
+	// always considered an available unit.
 	const units = useCustomUnits( {
-		availableUnits: availableUnits || [ '%', 'px', 'em', 'rem' ],
+		availableUnits: availableUnits
+			? [ ...availableUnits, 'pt' ]
+			: [ '%', 'px', 'em', 'rem', 'pt' ],
 	} );
 
+	const taxonomies = useSelect(
+		( select ) => select( coreStore ).getTaxonomies( { per_page: -1 } ),
+		[]
+	);
+
 	const getTaxonomyOptions = () => {
 		const selectOption = {
 			label: __( '- Select -' ),
@@ -96,64 +107,87 @@ function TagCloudEdit( { attributes, setAttributes, taxonomies } ) {
 		setAttributes( updateObj );
 	};
 
+	// Remove border styles from the server-side attributes to prevent duplicate border.
+	const serverSideAttributes = {
+		...attributes,
+		style: {
+			...attributes?.style,
+			border: undefined,
+		},
+	};
+
 	const inspectorControls = (
 		<InspectorControls>
 			<PanelBody title={ __( 'Settings' ) }>
-				<SelectControl
-					__nextHasNoMarginBottom
-					label={ __( 'Taxonomy' ) }
-					options={ getTaxonomyOptions() }
-					value={ taxonomy }
-					onChange={ ( selectedTaxonomy ) =>
-						setAttributes( { taxonomy: selectedTaxonomy } )
-					}
-				/>
-				<ToggleControl
-					__nextHasNoMarginBottom
-					label={ __( 'Show post counts' ) }
-					checked={ showTagCounts }
-					onChange={ () =>
-						setAttributes( { showTagCounts: ! showTagCounts } )
-					}
-				/>
-				<RangeControl
-					__nextHasNoMarginBottom
-					__next40pxDefaultSize
-					label={ __( 'Number of tags' ) }
-					value={ numberOfTags }
-					onChange={ ( value ) =>
-						setAttributes( { numberOfTags: value } )
-					}
-					min={ MIN_TAGS }
-					max={ MAX_TAGS }
-					required
-				/>
-				<Flex>
-					<FlexItem isBlock>
-						<UnitControl
-							label={ __( 'Smallest size' ) }
-							value={ smallestFontSize }
-							onChange={ ( value ) => {
-								onFontSizeChange( 'smallestFontSize', value );
-							} }
-							units={ units }
-							min={ MIN_FONT_SIZE }
-							max={ MAX_FONT_SIZE }
-						/>
-					</FlexItem>
-					<FlexItem isBlock>
-						<UnitControl
-							label={ __( 'Largest size' ) }
-							value={ largestFontSize }
-							onChange={ ( value ) => {
-								onFontSizeChange( 'largestFontSize', value );
-							} }
-							units={ units }
-							min={ MIN_FONT_SIZE }
-							max={ MAX_FONT_SIZE }
-						/>
-					</FlexItem>
-				</Flex>
+				<VStack
+					spacing={ 4 }
+					className="wp-block-tag-cloud__inspector-settings"
+				>
+					<SelectControl
+						__nextHasNoMarginBottom
+						__next40pxDefaultSize
+						label={ __( 'Taxonomy' ) }
+						options={ getTaxonomyOptions() }
+						value={ taxonomy }
+						onChange={ ( selectedTaxonomy ) =>
+							setAttributes( { taxonomy: selectedTaxonomy } )
+						}
+					/>
+					<Flex gap={ 4 }>
+						<FlexItem isBlock>
+							<UnitControl
+								label={ __( 'Smallest size' ) }
+								value={ smallestFontSize }
+								onChange={ ( value ) => {
+									onFontSizeChange(
+										'smallestFontSize',
+										value
+									);
+								} }
+								units={ units }
+								min={ MIN_FONT_SIZE }
+								max={ MAX_FONT_SIZE }
+								size="__unstable-large"
+							/>
+						</FlexItem>
+						<FlexItem isBlock>
+							<UnitControl
+								label={ __( 'Largest size' ) }
+								value={ largestFontSize }
+								onChange={ ( value ) => {
+									onFontSizeChange(
+										'largestFontSize',
+										value
+									);
+								} }
+								units={ units }
+								min={ MIN_FONT_SIZE }
+								max={ MAX_FONT_SIZE }
+								size="__unstable-large"
+							/>
+						</FlexItem>
+					</Flex>
+					<RangeControl
+						__nextHasNoMarginBottom
+						__next40pxDefaultSize
+						label={ __( 'Number of tags' ) }
+						value={ numberOfTags }
+						onChange={ ( value ) =>
+							setAttributes( { numberOfTags: value } )
+						}
+						min={ MIN_TAGS }
+						max={ MAX_TAGS }
+						required
+					/>
+					<ToggleControl
+						__nextHasNoMarginBottom
+						label={ __( 'Show tag counts' ) }
+						checked={ showTagCounts }
+						onChange={ () =>
+							setAttributes( { showTagCounts: ! showTagCounts } )
+						}
+					/>
+				</VStack>
 			</PanelBody>
 		</InspectorControls>
 	);
@@ -166,7 +200,7 @@ function TagCloudEdit( { attributes, setAttributes, taxonomies } ) {
 					<ServerSideRender
 						skipBlockSupportAttributes
 						block="core/tag-cloud"
-						attributes={ attributes }
+						attributes={ serverSideAttributes }
 					/>
 				</Disabled>
 			</div>
@@ -174,8 +208,4 @@ function TagCloudEdit( { attributes, setAttributes, taxonomies } ) {
 	);
 }
 
-export default withSelect( ( select ) => {
-	return {
-		taxonomies: select( coreStore ).getTaxonomies( { per_page: -1 } ),
-	};
-} )( TagCloudEdit );
+export default TagCloudEdit;
diff --git a/packages/block-library/src/tag-cloud/editor.scss b/packages/block-library/src/tag-cloud/editor.scss
new file mode 100644
index 00000000000000..e85129e22f1aca
--- /dev/null
+++ b/packages/block-library/src/tag-cloud/editor.scss
@@ -0,0 +1,19 @@
+// The following styles are to prevent duplicate spacing and border for the tag cloud
+// block in the editor given it uses server side rendering. The specificity
+// must be higher than `0-1-0` to override global styles. Targeting the
+// inner use of the .wp-block-tag-cloud class should minimize impact on
+// other 3rd party styles targeting the block.
+.wp-block-tag-cloud .wp-block-tag-cloud {
+	margin: 0;
+	padding: 0;
+	border: none;
+	border-radius: inherit;
+}
+
+.wp-block-tag-cloud__inspector-settings {
+	.components-base-control,
+	.components-base-control:last-child {
+		// Cancel out extra margins added by block inspector
+		margin-bottom: 0;
+	}
+}
diff --git a/packages/block-library/src/tag-cloud/index.php b/packages/block-library/src/tag-cloud/index.php
index 7ff5f78400db64..8949dd8e5b11fb 100644
--- a/packages/block-library/src/tag-cloud/index.php
+++ b/packages/block-library/src/tag-cloud/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/tag-cloud` block on server.
  *
+ * @since 5.2.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string Returns the tag cloud for selected taxonomy.
@@ -27,8 +29,13 @@ function render_block_core_tag_cloud( $attributes ) {
 	);
 	$tag_cloud = wp_tag_cloud( $args );
 
-	if ( ! $tag_cloud ) {
-		$tag_cloud = __( 'There&#8217;s no content to show here yet.' );
+	if ( empty( $tag_cloud ) ) {
+		// Display placeholder content when there are no tags only in editor.
+		if ( wp_is_serving_rest_request() ) {
+			$tag_cloud = __( 'There&#8217;s no content to show here yet.' );
+		} else {
+			return '';
+		}
 	}
 
 	$wrapper_attributes = get_block_wrapper_attributes();
@@ -42,6 +49,8 @@ function render_block_core_tag_cloud( $attributes ) {
 
 /**
  * Registers the `core/tag-cloud` block on server.
+ *
+ * @since 5.2.0
  */
 function register_block_core_tag_cloud() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/tag-cloud/style.scss b/packages/block-library/src/tag-cloud/style.scss
index 5fb04840de1517..dedb5e73ab1a1f 100644
--- a/packages/block-library/src/tag-cloud/style.scss
+++ b/packages/block-library/src/tag-cloud/style.scss
@@ -22,18 +22,20 @@
 		margin-left: 5px;
 		text-decoration: none;
 	}
+}
 
-	&.is-style-outline {
-		display: flex;
-		flex-wrap: wrap;
-		gap: 1ch;
-
-		a {
-			border: 1px solid currentColor;
-			font-size: unset !important; // !important Needed to override the inline styles.
-			margin-right: 0;
-			padding: 1ch 2ch;
-			text-decoration: none !important; // !important needed to override generic post content link decoration.
-		}
-	}
+// Specificity is set to 0-1-0 to match global styles selectors.
+:root :where(.wp-block-tag-cloud.is-style-outline) {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 1ch;
+}
+// The block support related styles below haven't been replicated in the base theme.json
+// as the block doesn't yet adopt them for its inner links.
+:root :where(.wp-block-tag-cloud.is-style-outline a) {
+	border: 1px solid currentColor;
+	font-size: unset !important; // !important Needed to override the inline styles.
+	margin-right: 0;
+	padding: 1ch 2ch;
+	text-decoration: none !important; // !important needed to override generic post content link decoration.
 }
diff --git a/packages/block-library/src/template-part/block.json b/packages/block-library/src/template-part/block.json
index 3b0946718bcb9c..9710bdeee2e535 100644
--- a/packages/block-library/src/template-part/block.json
+++ b/packages/block-library/src/template-part/block.json
@@ -24,7 +24,10 @@
 		"align": true,
 		"html": false,
 		"reusable": false,
-		"renaming": false
+		"renaming": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-template-part-editor"
 }
diff --git a/packages/block-library/src/template-part/edit/advanced-controls.js b/packages/block-library/src/template-part/edit/advanced-controls.js
index 8ad4b4bdbeb1da..3c319a7ec0fe73 100644
--- a/packages/block-library/src/template-part/edit/advanced-controls.js
+++ b/packages/block-library/src/template-part/edit/advanced-controls.js
@@ -4,7 +4,6 @@
 import { useEntityProp } from '@wordpress/core-data';
 import { SelectControl, TextControl } from '@wordpress/components';
 import { sprintf, __ } from '@wordpress/i18n';
-import { InspectorControls } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
 
 /**
@@ -70,10 +69,11 @@ export function TemplatePartAdvancedControls( {
 	} ) );
 
 	return (
-		<InspectorControls group="advanced">
+		<>
 			{ isEntityAvailable && (
 				<>
 					<TextControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ __( 'Title' ) }
 						value={ title }
@@ -82,8 +82,8 @@ export function TemplatePartAdvancedControls( {
 						} }
 						onFocus={ ( event ) => event.target.select() }
 					/>
-
 					<SelectControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						label={ __( 'Area' ) }
 						labelPosition="top"
@@ -124,6 +124,6 @@ export function TemplatePartAdvancedControls( {
 					setAttributes={ setAttributes }
 				/>
 			) }
-		</InspectorControls>
+		</>
 	);
 }
diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index 163dfa5403ce61..951f875143b0f9 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -1,19 +1,31 @@
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
+import { serialize } from '@wordpress/blocks';
+import { useSelect, useDispatch } from '@wordpress/data';
 import {
 	BlockSettingsMenuControls,
 	useBlockProps,
 	Warning,
 	store as blockEditorStore,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
+	InspectorControls,
+	__experimentalBlockPatternsList as BlockPatternsList,
+	BlockControls,
 } from '@wordpress/block-editor';
-import { Spinner, Modal, MenuItem } from '@wordpress/components';
+import {
+	PanelBody,
+	Spinner,
+	Modal,
+	MenuItem,
+	ToolbarButton,
+} from '@wordpress/components';
+import { useAsyncList } from '@wordpress/compose';
 import { __, sprintf } from '@wordpress/i18n';
 import { store as coreStore } from '@wordpress/core-data';
 import { useState } from '@wordpress/element';
+import { store as noticesStore } from '@wordpress/notices';
 
 /**
  * Internal dependencies
@@ -29,11 +41,76 @@ import {
 	useTemplatePartArea,
 } from './utils/hooks';
 
+function ReplaceButton( {
+	isEntityAvailable,
+	area,
+	templatePartId,
+	isTemplatePartSelectionOpen,
+	setIsTemplatePartSelectionOpen,
+} ) {
+	// This hook fetches patterns, so don't run it unconditionally in the main
+	// edit function!
+	const { templateParts } = useAlternativeTemplateParts(
+		area,
+		templatePartId
+	);
+	const hasReplacements = !! templateParts.length;
+	const canReplace =
+		isEntityAvailable &&
+		hasReplacements &&
+		( area === 'header' || area === 'footer' );
+
+	if ( ! canReplace ) {
+		return null;
+	}
+
+	return (
+		<MenuItem
+			onClick={ () => {
+				setIsTemplatePartSelectionOpen( true );
+			} }
+			aria-expanded={ isTemplatePartSelectionOpen }
+			aria-haspopup="dialog"
+		>
+			{ __( 'Replace' ) }
+		</MenuItem>
+	);
+}
+
+function TemplatesList( { area, clientId, isEntityAvailable, onSelect } ) {
+	// This hook fetches patterns, so don't run it unconditionally in the main
+	// edit function!
+	const blockPatterns = useAlternativeBlockPatterns( area, clientId );
+	const canReplace =
+		isEntityAvailable &&
+		!! blockPatterns.length &&
+		( area === 'header' || area === 'footer' );
+	const shownTemplates = useAsyncList( blockPatterns );
+
+	if ( ! canReplace ) {
+		return null;
+	}
+
+	return (
+		<PanelBody title={ __( 'Design' ) }>
+			<BlockPatternsList
+				label={ __( 'Templates' ) }
+				blockPatterns={ blockPatterns }
+				shownPatterns={ shownTemplates }
+				onClickPattern={ onSelect }
+				showTitle={ false }
+			/>
+		</PanelBody>
+	);
+}
+
 export default function TemplatePartEdit( {
 	attributes,
 	setAttributes,
 	clientId,
 } ) {
+	const { createSuccessNotice } = useDispatch( noticesStore );
+	const { editEntityRecord } = useDispatch( coreStore );
 	const currentTheme = useSelect(
 		( select ) => select( coreStore ).getCurrentTheme()?.stylesheet,
 		[]
@@ -44,14 +121,19 @@ export default function TemplatePartEdit( {
 	const [ isTemplatePartSelectionOpen, setIsTemplatePartSelectionOpen ] =
 		useState( false );
 
-	// Set the postId block attribute if it did not exist,
-	// but wait until the inner blocks have loaded to allow
-	// new edits to trigger this.
-	const { isResolved, innerBlocks, isMissing, area } = useSelect(
+	const {
+		isResolved,
+		hasInnerBlocks,
+		isMissing,
+		area,
+		onNavigateToEntityRecord,
+		title,
+		canUserEdit,
+	} = useSelect(
 		( select ) => {
 			const { getEditedEntityRecord, hasFinishedResolution } =
 				select( coreStore );
-			const { getBlocks } = select( blockEditorStore );
+			const { getBlockCount, getSettings } = select( blockEditorStore );
 
 			const getEntityArgs = [
 				'postType',
@@ -69,39 +151,63 @@ export default function TemplatePartEdit( {
 				  )
 				: false;
 
+			const _canUserEdit = hasResolvedEntity
+				? select( coreStore ).canUser( 'update', {
+						kind: 'postType',
+						name: 'wp_template_part',
+						id: templatePartId,
+				  } )
+				: false;
+
 			return {
-				innerBlocks: getBlocks( clientId ),
+				hasInnerBlocks: getBlockCount( clientId ) > 0,
 				isResolved: hasResolvedEntity,
 				isMissing:
 					hasResolvedEntity &&
 					( ! entityRecord ||
 						Object.keys( entityRecord ).length === 0 ),
 				area: _area,
+				onNavigateToEntityRecord:
+					getSettings().onNavigateToEntityRecord,
+				title: entityRecord?.title,
+				canUserEdit: !! _canUserEdit,
 			};
 		},
 		[ templatePartId, attributes.area, clientId ]
 	);
-	const { templateParts } = useAlternativeTemplateParts(
-		area,
-		templatePartId
-	);
-	const blockPatterns = useAlternativeBlockPatterns( area, clientId );
-	const hasReplacements = !! templateParts.length || !! blockPatterns.length;
+
 	const areaObject = useTemplatePartArea( area );
 	const blockProps = useBlockProps();
 	const isPlaceholder = ! slug;
 	const isEntityAvailable = ! isPlaceholder && ! isMissing && isResolved;
 	const TagName = tagName || areaObject.tagName;
 
-	const canReplace =
-		isEntityAvailable &&
-		hasReplacements &&
-		( area === 'header' || area === 'footer' );
+	const onPatternSelect = async ( pattern ) => {
+		await editEntityRecord(
+			'postType',
+			'wp_template_part',
+			templatePartId,
+			{
+				blocks: pattern.blocks,
+				content: serialize( pattern.blocks ),
+			}
+		);
+		createSuccessNotice(
+			sprintf(
+				/* translators: %s: template part title. */
+				__( 'Template Part "%s" updated.' ),
+				title || slug
+			),
+			{
+				type: 'snackbar',
+			}
+		);
+	};
 
 	// We don't want to render a missing state if we have any inner blocks.
 	// A new template part is automatically created if we have any inner blocks but no entity.
 	if (
-		innerBlocks.length === 0 &&
+		! hasInnerBlocks &&
 		( ( slug && ! theme ) || ( slug && isMissing ) )
 	) {
 		return (
@@ -132,14 +238,34 @@ export default function TemplatePartEdit( {
 	return (
 		<>
 			<RecursionProvider uniqueId={ templatePartId }>
-				<TemplatePartAdvancedControls
-					tagName={ tagName }
-					setAttributes={ setAttributes }
-					isEntityAvailable={ isEntityAvailable }
-					templatePartId={ templatePartId }
-					defaultWrapper={ areaObject.tagName }
-					hasInnerBlocks={ innerBlocks.length > 0 }
-				/>
+				{ isEntityAvailable &&
+					onNavigateToEntityRecord &&
+					canUserEdit && (
+						<BlockControls group="other">
+							<ToolbarButton
+								onClick={ () =>
+									onNavigateToEntityRecord( {
+										postId: templatePartId,
+										postType: 'wp_template_part',
+									} )
+								}
+							>
+								{ __( 'Edit' ) }
+							</ToolbarButton>
+						</BlockControls>
+					) }
+				{ canUserEdit && (
+					<InspectorControls group="advanced">
+						<TemplatePartAdvancedControls
+							tagName={ tagName }
+							setAttributes={ setAttributes }
+							isEntityAvailable={ isEntityAvailable }
+							templatePartId={ templatePartId }
+							defaultWrapper={ areaObject.tagName }
+							hasInnerBlocks={ hasInnerBlocks }
+						/>
+					</InspectorControls>
+				) }
 				{ isPlaceholder && (
 					<TagName { ...blockProps }>
 						<TemplatePartPlaceholder
@@ -153,42 +279,49 @@ export default function TemplatePartEdit( {
 						/>
 					</TagName>
 				) }
-				{ canReplace && (
-					<BlockSettingsMenuControls>
-						{ ( { selectedClientIds } ) => {
-							// Only enable for single selection that matches the current block.
-							// Ensures menu item doesn't render multiple times.
-							if (
-								! (
-									selectedClientIds.length === 1 &&
-									clientId === selectedClientIds[ 0 ]
-								)
-							) {
-								return null;
-							}
+				<BlockSettingsMenuControls>
+					{ ( { selectedClientIds } ) => {
+						// Only enable for single selection that matches the current block.
+						// Ensures menu item doesn't render multiple times.
+						if (
+							! (
+								selectedClientIds.length === 1 &&
+								clientId === selectedClientIds[ 0 ]
+							)
+						) {
+							return null;
+						}
+
+						return (
+							<ReplaceButton
+								{ ...{
+									isEntityAvailable,
+									area,
+									clientId,
+									templatePartId,
+									isTemplatePartSelectionOpen,
+									setIsTemplatePartSelectionOpen,
+								} }
+							/>
+						);
+					} }
+				</BlockSettingsMenuControls>
+
+				<InspectorControls>
+					<TemplatesList
+						area={ area }
+						clientId={ clientId }
+						isEntityAvailable={ isEntityAvailable }
+						onSelect={ ( pattern ) => onPatternSelect( pattern ) }
+					/>
+				</InspectorControls>
 
-							return (
-								<MenuItem
-									onClick={ () => {
-										setIsTemplatePartSelectionOpen( true );
-									} }
-									aria-expanded={
-										isTemplatePartSelectionOpen
-									}
-									aria-haspopup="dialog"
-								>
-									{ __( 'Replace' ) }
-								</MenuItem>
-							);
-						} }
-					</BlockSettingsMenuControls>
-				) }
 				{ isEntityAvailable && (
 					<TemplatePartInnerBlocks
 						tagName={ TagName }
 						blockProps={ blockProps }
 						postId={ templatePartId }
-						hasInnerBlocks={ innerBlocks.length > 0 }
+						hasInnerBlocks={ hasInnerBlocks }
 						layout={ layout }
 					/>
 				) }
@@ -209,7 +342,7 @@ export default function TemplatePartEdit( {
 					onRequestClose={ () =>
 						setIsTemplatePartSelectionOpen( false )
 					}
-					isFullScreen={ true }
+					isFullScreen
 				>
 					<TemplatePartSelectionModal
 						templatePartId={ templatePartId }
diff --git a/packages/block-library/src/template-part/edit/inner-blocks.js b/packages/block-library/src/template-part/edit/inner-blocks.js
index 146877ee0287cc..8582caba4cde47 100644
--- a/packages/block-library/src/template-part/edit/inner-blocks.js
+++ b/packages/block-library/src/template-part/edit/inner-blocks.js
@@ -1,28 +1,110 @@
 /**
  * WordPress dependencies
  */
-import { useEntityBlockEditor } from '@wordpress/core-data';
+import { useEntityBlockEditor, store as coreStore } from '@wordpress/core-data';
 import {
 	InnerBlocks,
 	useInnerBlocksProps,
 	useSettings,
 	store as blockEditorStore,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+import { parse } from '@wordpress/blocks';
 
-export default function TemplatePartInnerBlocks( {
+function useRenderAppender( hasInnerBlocks ) {
+	const blockEditingMode = useBlockEditingMode();
+	// Disable appending when the editing mode is 'contentOnly'. This is so that the user can't
+	// append into a template part when editing a page in the site editor. See
+	// DisableNonPageContentBlocks. Ideally instead of (mis)using editing mode there would be a
+	// block editor API for achieving this.
+	if ( blockEditingMode === 'contentOnly' ) {
+		return false;
+	}
+	if ( ! hasInnerBlocks ) {
+		return InnerBlocks.ButtonBlockAppender;
+	}
+}
+
+function useLayout( layout ) {
+	const themeSupportsLayout = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+		return getSettings()?.supportsLayout;
+	}, [] );
+	const [ defaultLayout ] = useSettings( 'layout' );
+	if ( themeSupportsLayout ) {
+		return layout?.inherit ? defaultLayout || {} : layout;
+	}
+}
+
+function NonEditableTemplatePartPreview( {
+	postId: id,
+	layout,
+	tagName: TagName,
+	blockProps,
+} ) {
+	useBlockEditingMode( 'disabled' );
+
+	const { content, editedBlocks } = useSelect(
+		( select ) => {
+			if ( ! id ) {
+				return {};
+			}
+			const { getEditedEntityRecord } = select( coreStore );
+			const editedRecord = getEditedEntityRecord(
+				'postType',
+				'wp_template_part',
+				id,
+				{ context: 'view' }
+			);
+			return {
+				editedBlocks: editedRecord.blocks,
+				content: editedRecord.content,
+			};
+		},
+		[ id ]
+	);
+
+	const blocks = useMemo( () => {
+		if ( ! id ) {
+			return undefined;
+		}
+
+		if ( editedBlocks ) {
+			return editedBlocks;
+		}
+
+		if ( ! content || typeof content !== 'string' ) {
+			return [];
+		}
+
+		return parse( content );
+	}, [ id, editedBlocks, content ] );
+
+	const innerBlocksProps = useInnerBlocksProps( blockProps, {
+		value: blocks,
+		onInput: () => {},
+		onChange: () => {},
+		renderAppender: false,
+		layout: useLayout( layout ),
+	} );
+
+	return <TagName { ...innerBlocksProps } />;
+}
+
+function EditableTemplatePartInnerBlocks( {
 	postId: id,
 	hasInnerBlocks,
 	layout,
 	tagName: TagName,
 	blockProps,
 } ) {
-	const themeSupportsLayout = useSelect( ( select ) => {
-		const { getSettings } = select( blockEditorStore );
-		return getSettings()?.supportsLayout;
-	}, [] );
-	const [ defaultLayout ] = useSettings( 'layout' );
-	const usedLayout = layout?.inherit ? defaultLayout || {} : layout;
+	const onNavigateToEntityRecord = useSelect(
+		( select ) =>
+			select( blockEditorStore ).getSettings().onNavigateToEntityRecord,
+		[]
+	);
 
 	const [ blocks, onInput, onChange ] = useEntityBlockEditor(
 		'postType',
@@ -34,11 +116,66 @@ export default function TemplatePartInnerBlocks( {
 		value: blocks,
 		onInput,
 		onChange,
-		renderAppender: hasInnerBlocks
-			? undefined
-			: InnerBlocks.ButtonBlockAppender,
-		layout: themeSupportsLayout ? usedLayout : undefined,
+		renderAppender: useRenderAppender( hasInnerBlocks ),
+		layout: useLayout( layout ),
 	} );
 
-	return <TagName { ...innerBlocksProps } />;
+	const blockEditingMode = useBlockEditingMode();
+
+	const customProps =
+		blockEditingMode === 'contentOnly' && onNavigateToEntityRecord
+			? {
+					onDoubleClick: () =>
+						onNavigateToEntityRecord( {
+							postId: id,
+							postType: 'wp_template_part',
+						} ),
+			  }
+			: {};
+
+	return <TagName { ...innerBlocksProps } { ...customProps } />;
+}
+
+export default function TemplatePartInnerBlocks( {
+	postId: id,
+	hasInnerBlocks,
+	layout,
+	tagName: TagName,
+	blockProps,
+} ) {
+	const { canViewTemplatePart, canEditTemplatePart } = useSelect(
+		( select ) => {
+			return {
+				canViewTemplatePart: !! select( coreStore ).canUser( 'read', {
+					kind: 'postType',
+					name: 'wp_template_part',
+					id,
+				} ),
+				canEditTemplatePart: !! select( coreStore ).canUser( 'update', {
+					kind: 'postType',
+					name: 'wp_template_part',
+					id,
+				} ),
+			};
+		},
+		[ id ]
+	);
+
+	if ( ! canViewTemplatePart ) {
+		return null;
+	}
+
+	const TemplatePartInnerBlocksComponent = canEditTemplatePart
+		? EditableTemplatePartInnerBlocks
+		: NonEditableTemplatePartPreview;
+
+	return (
+		<TemplatePartInnerBlocksComponent
+			postId={ id }
+			hasInnerBlocks={ hasInnerBlocks }
+			layout={ layout }
+			tagName={ TagName }
+			blockProps={ blockProps }
+		/>
+	);
 }
diff --git a/packages/block-library/src/template-part/edit/placeholder.js b/packages/block-library/src/template-part/edit/placeholder.js
index ff43ee5644ad7c..0b8a980b8b7e3a 100644
--- a/packages/block-library/src/template-part/edit/placeholder.js
+++ b/packages/block-library/src/template-part/edit/placeholder.js
@@ -4,6 +4,8 @@
 import { __, sprintf } from '@wordpress/i18n';
 import { Placeholder, Button, Spinner } from '@wordpress/components';
 import { useState } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -28,6 +30,21 @@ export default function TemplatePartPlaceholder( {
 		templatePartId
 	);
 	const blockPatterns = useAlternativeBlockPatterns( area, clientId );
+
+	const { isBlockBasedTheme, canCreateTemplatePart } = useSelect(
+		( select ) => {
+			const { getCurrentTheme, canUser } = select( coreStore );
+			return {
+				isBlockBasedTheme: getCurrentTheme()?.is_block_theme,
+				canCreateTemplatePart: canUser( 'create', {
+					kind: 'postType',
+					name: 'wp_template_part',
+				} ),
+			};
+		},
+		[]
+	);
+
 	const [ showTitleModal, setShowTitleModal ] = useState( false );
 	const areaObject = useTemplatePartArea( area );
 	const createFromBlocks = useCreateTemplatePartFromBlocks(
@@ -39,23 +56,36 @@ export default function TemplatePartPlaceholder( {
 		<Placeholder
 			icon={ areaObject.icon }
 			label={ areaObject.label }
-			instructions={ sprintf(
-				// Translators: %s as template part area title ("Header", "Footer", etc.).
-				__( 'Choose an existing %s or create a new one.' ),
-				areaObject.label.toLowerCase()
-			) }
+			instructions={
+				isBlockBasedTheme
+					? sprintf(
+							// Translators: %s as template part area title ("Header", "Footer", etc.).
+							__( 'Choose an existing %s or create a new one.' ),
+							areaObject.label.toLowerCase()
+					  )
+					: sprintf(
+							// Translators: %s as template part area title ("Header", "Footer", etc.).
+							__( 'Choose an existing %s.' ),
+							areaObject.label.toLowerCase()
+					  )
+			}
 		>
 			{ isResolving && <Spinner /> }
 
 			{ ! isResolving &&
 				!! ( templateParts.length || blockPatterns.length ) && (
-					<Button variant="primary" onClick={ onOpenSelectionModal }>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						onClick={ onOpenSelectionModal }
+					>
 						{ __( 'Choose' ) }
 					</Button>
 				) }
 
-			{ ! isResolving && (
+			{ ! isResolving && isBlockBasedTheme && canCreateTemplatePart && (
 				<Button
+					__next40pxDefaultSize
 					variant="secondary"
 					onClick={ () => {
 						setShowTitleModal( true );
diff --git a/packages/block-library/src/template-part/edit/selection-modal.js b/packages/block-library/src/template-part/edit/selection-modal.js
index 7987d5720cdada..5fa5d9786d8c96 100644
--- a/packages/block-library/src/template-part/edit/selection-modal.js
+++ b/packages/block-library/src/template-part/edit/selection-modal.js
@@ -5,7 +5,6 @@ import { useMemo, useState } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { store as noticesStore } from '@wordpress/notices';
 import { useDispatch } from '@wordpress/data';
-import { parse } from '@wordpress/blocks';
 import { useAsyncList } from '@wordpress/compose';
 import { __experimentalBlockPatternsList as BlockPatternsList } from '@wordpress/block-editor';
 import {
@@ -19,9 +18,8 @@ import {
 import {
 	useAlternativeBlockPatterns,
 	useAlternativeTemplateParts,
-	useCreateTemplatePartFromBlocks,
 } from './utils/hooks';
-import { createTemplatePartId } from './utils/create-template-part-id';
+import { mapTemplatePartToBlockPattern } from './utils/map-template-part-to-block-pattern';
 import { searchPatterns } from '../../utils/search-patterns';
 
 export default function TemplatePartSelectionModal( {
@@ -32,19 +30,16 @@ export default function TemplatePartSelectionModal( {
 	clientId,
 } ) {
 	const [ searchValue, setSearchValue ] = useState( '' );
-
 	const { templateParts } = useAlternativeTemplateParts(
 		area,
 		templatePartId
 	);
+
 	// We can map template parts to block patters to reuse the BlockPatternsList UI
 	const filteredTemplateParts = useMemo( () => {
-		const partsAsPatterns = templateParts.map( ( templatePart ) => ( {
-			name: createTemplatePartId( templatePart.theme, templatePart.slug ),
-			title: templatePart.title.rendered,
-			blocks: parse( templatePart.content.raw ),
-			templatePart,
-		} ) );
+		const partsAsPatterns = templateParts.map( ( templatePart ) =>
+			mapTemplatePartToBlockPattern( templatePart )
+		);
 
 		return searchPatterns( partsAsPatterns, searchValue );
 	}, [ templateParts, searchValue ] );
@@ -53,7 +48,6 @@ export default function TemplatePartSelectionModal( {
 	const filteredBlockPatterns = useMemo( () => {
 		return searchPatterns( blockPatterns, searchValue );
 	}, [ blockPatterns, searchValue ] );
-	const shownBlockPatterns = useAsyncList( filteredBlockPatterns );
 
 	const { createSuccessNotice } = useDispatch( noticesStore );
 
@@ -76,11 +70,6 @@ export default function TemplatePartSelectionModal( {
 		onClose();
 	};
 
-	const createFromBlocks = useCreateTemplatePartFromBlocks(
-		area,
-		setAttributes
-	);
-
 	const hasTemplateParts = !! filteredTemplateParts.length;
 	const hasBlockPatterns = !! filteredBlockPatterns.length;
 
@@ -91,7 +80,7 @@ export default function TemplatePartSelectionModal( {
 					__nextHasNoMarginBottom
 					onChange={ setSearchValue }
 					value={ searchValue }
-					label={ __( 'Search for replacements' ) }
+					label={ __( 'Search' ) }
 					placeholder={ __( 'Search' ) }
 				/>
 			</div>
@@ -108,20 +97,6 @@ export default function TemplatePartSelectionModal( {
 				</div>
 			) }
 
-			{ hasBlockPatterns && (
-				<div>
-					<h2>{ __( 'Patterns' ) }</h2>
-					<BlockPatternsList
-						blockPatterns={ filteredBlockPatterns }
-						shownPatterns={ shownBlockPatterns }
-						onClickPattern={ ( pattern, blocks ) => {
-							createFromBlocks( blocks, pattern.title );
-							onClose();
-						} }
-					/>
-				</div>
-			) }
-
 			{ ! hasTemplateParts && ! hasBlockPatterns && (
 				<HStack alignment="center">
 					<p>{ __( 'No results found.' ) }</p>
diff --git a/packages/block-library/src/template-part/edit/title-modal.js b/packages/block-library/src/template-part/edit/title-modal.js
index f813541bd7d733..e1f10c91a67da8 100644
--- a/packages/block-library/src/template-part/edit/title-modal.js
+++ b/packages/block-library/src/template-part/edit/title-modal.js
@@ -14,7 +14,7 @@ import {
 export default function TitleModal( { areaLabel, onClose, onSubmit } ) {
 	// Restructure onCreate to set the blocks on local state.
 	// Add modal to confirm title and trigger onCreate.
-	const [ title, setTitle ] = useState( __( 'Untitled Template Part' ) );
+	const [ title, setTitle ] = useState( '' );
 
 	const submitForCreation = ( event ) => {
 		event.preventDefault();
@@ -25,26 +25,40 @@ export default function TitleModal( { areaLabel, onClose, onSubmit } ) {
 		<Modal
 			title={ sprintf(
 				// Translators: %s as template part area title ("Header", "Footer", etc.).
-				__( 'Name and create your new %s' ),
+				__( 'Create new %s' ),
 				areaLabel.toLowerCase()
 			) }
-			overlayClassName="wp-block-template-part__placeholder-create-new__title-form"
 			onRequestClose={ onClose }
+			focusOnMount="firstContentElement"
+			size="small"
 		>
 			<form onSubmit={ submitForCreation }>
 				<VStack spacing="5">
 					<TextControl
-						__nextHasNoMarginBottom
 						label={ __( 'Name' ) }
 						value={ title }
 						onChange={ setTitle }
+						placeholder={ __( 'Custom Template Part' ) }
+						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 					/>
 					<HStack justify="right">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ () => {
+								onClose();
+								setTitle( '' );
+							} }
+						>
+							{ __( 'Cancel' ) }
+						</Button>
 						<Button
 							variant="primary"
 							type="submit"
+							accessibleWhenDisabled
 							disabled={ ! title.length }
-							aria-disabled={ ! title.length }
+							__next40pxDefaultSize
 						>
 							{ __( 'Create' ) }
 						</Button>
diff --git a/packages/block-library/src/template-part/edit/utils/map-template-part-to-block-pattern.js b/packages/block-library/src/template-part/edit/utils/map-template-part-to-block-pattern.js
new file mode 100644
index 00000000000000..5a053350d750f8
--- /dev/null
+++ b/packages/block-library/src/template-part/edit/utils/map-template-part-to-block-pattern.js
@@ -0,0 +1,23 @@
+/**
+ * WordPress dependencies
+ */
+import { parse } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { createTemplatePartId } from './create-template-part-id';
+
+/**
+ * This maps the properties of a template part to those of a block pattern.
+ * @param {Object} templatePart
+ * @return {Object} The template part in the shape of block pattern.
+ */
+export function mapTemplatePartToBlockPattern( templatePart ) {
+	return {
+		name: createTemplatePartId( templatePart.theme, templatePart.slug ),
+		title: templatePart.title.rendered,
+		blocks: parse( templatePart.content.raw ),
+		templatePart,
+	};
+}
diff --git a/packages/block-library/src/template-part/editor.scss b/packages/block-library/src/template-part/editor.scss
index c60f93c1874b5b..735c9370099d91 100644
--- a/packages/block-library/src/template-part/editor.scss
+++ b/packages/block-library/src/template-part/editor.scss
@@ -23,20 +23,22 @@
 	z-index: z-index(".block-library-template-part__selection-search");
 }
 
-.is-outline-mode .block-editor-block-list__block:not(.remove-outline).wp-block-template-part,
-.is-outline-mode .block-editor-block-list__block:not(.remove-outline).is-reusable {
-	&.is-highlighted,
-	&.is-selected {
-		box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-block-synced-color);
+// We don't use .is-outline-mode in this case so colors take effect properly in the block editor.
+.block-editor-block-list__block:not(.remove-outline).wp-block-template-part,
+.block-editor-block-list__block:not(.remove-outline).is-reusable {
+
+	&.is-highlighted::after,
+	&.is-selected::after {
+		outline-color: var(--wp-block-synced-color);
 	}
 
 	&.block-editor-block-list__block:not([contenteditable]):focus {
 		&::after {
-			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-block-synced-color);
-			// Show a light color for dark themes.
-			.is-dark-theme & {
-				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) $dark-theme-focus;
-			}
+			outline-color: var(--wp-block-synced-color);
 		}
 	}
 }
+
+.is-outline-mode .block-editor-block-list__block:not(.remove-outline).wp-block-template-part.has-editable-outline::after {
+	border: none;
+}
diff --git a/packages/block-library/src/template-part/index.js b/packages/block-library/src/template-part/index.js
index c9b5e33a1c9598..20976e231d811c 100644
--- a/packages/block-library/src/template-part/index.js
+++ b/packages/block-library/src/template-part/index.js
@@ -32,8 +32,9 @@ export const settings = {
 			return;
 		}
 
-		const { getCurrentTheme, getEntityRecord } = select( coreDataStore );
-		const entity = getEntityRecord(
+		const { getCurrentTheme, getEditedEntityRecord } =
+			select( coreDataStore );
+		const entity = getEditedEntityRecord(
 			'postType',
 			'wp_template_part',
 			( theme || getCurrentTheme()?.stylesheet ) + '//' + slug
@@ -43,8 +44,7 @@ export const settings = {
 		}
 
 		return (
-			decodeEntities( entity.title?.rendered ) ||
-			capitalCase( entity.slug )
+			decodeEntities( entity.title ) || capitalCase( entity.slug || '' )
 		);
 	},
 	edit,
diff --git a/packages/block-library/src/template-part/index.php b/packages/block-library/src/template-part/index.php
index 26d90c51b5529c..be867c4ced1660 100644
--- a/packages/block-library/src/template-part/index.php
+++ b/packages/block-library/src/template-part/index.php
@@ -8,6 +8,10 @@
 /**
  * Renders the `core/template-part` block on the server.
  *
+ * @since 5.9.0
+ *
+ * @global WP_Embed $wp_embed WordPress Embed object.
+ *
  * @param array $attributes The block attributes.
  *
  * @return string The render.
@@ -70,6 +74,12 @@ function render_block_core_template_part( $attributes ) {
 				if ( isset( $block_template->area ) ) {
 					$area = $block_template->area;
 				}
+
+				// Needed for the `render_block_core_template_part_file` and `render_block_core_template_part_none` actions below.
+				$block_template_file = _get_block_template_file( 'wp_template_part', $attributes['slug'] );
+				if ( $block_template_file ) {
+					$template_part_file_path = $block_template_file['path'];
+				}
 			}
 
 			if ( '' !== $content && null !== $content ) {
@@ -103,16 +113,16 @@ function render_block_core_template_part( $attributes ) {
 	// is set in `wp_debug_mode()`.
 	$is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
 
-	if ( is_null( $content ) && $is_debug ) {
-		if ( ! isset( $attributes['slug'] ) ) {
-			// If there is no slug this is a placeholder and we dont want to return any message.
-			return;
+	if ( is_null( $content ) ) {
+		if ( $is_debug && isset( $attributes['slug'] ) ) {
+			return sprintf(
+				/* translators: %s: Template part slug. */
+				__( 'Template part has been deleted or is unavailable: %s' ),
+				$attributes['slug']
+			);
 		}
-		return sprintf(
-			/* translators: %s: Template part slug. */
-			__( 'Template part has been deleted or is unavailable: %s' ),
-			$attributes['slug']
-		);
+
+		return '';
 	}
 
 	if ( isset( $seen_ids[ $template_part_id ] ) ) {
@@ -151,7 +161,7 @@ function render_block_core_template_part( $attributes ) {
 	global $wp_embed;
 	$content = $wp_embed->autoembed( $content );
 
-	if ( empty( $attributes['tagName'] ) ) {
+	if ( empty( $attributes['tagName'] ) || tag_escape( $attributes['tagName'] ) !== $attributes['tagName'] ) {
 		$area_tag = 'div';
 		if ( $area_definition && isset( $area_definition['area_tag'] ) ) {
 			$area_tag = $area_definition['area_tag'];
@@ -168,6 +178,8 @@ function render_block_core_template_part( $attributes ) {
 /**
  * Returns an array of area variation objects for the template part block.
  *
+ * @since 6.1.0
+ *
  * @param array $instance_variations The variations for instances.
  *
  * @return array Array containing the block variation objects.
@@ -206,6 +218,8 @@ function build_template_part_block_area_variations( $instance_variations ) {
 /**
  * Returns an array of instance variation objects for the template part block
  *
+ * @since 6.1.0
+ *
  * @return array Array containing the block variation objects.
  */
 function build_template_part_block_instance_variations() {
@@ -260,6 +274,8 @@ function build_template_part_block_instance_variations() {
 /**
  * Returns an array of all template part block variations.
  *
+ * @since 5.9.0
+ *
  * @return array Array containing the block variation objects.
  */
 function build_template_part_block_variations() {
@@ -270,13 +286,15 @@ function build_template_part_block_variations() {
 
 /**
  * Registers the `core/template-part` block on the server.
+ *
+ * @since 5.9.0
  */
 function register_block_core_template_part() {
 	register_block_type_from_metadata(
 		__DIR__ . '/template-part',
 		array(
-			'render_callback' => 'render_block_core_template_part',
-			'variations'      => build_template_part_block_variations(),
+			'render_callback'    => 'render_block_core_template_part',
+			'variation_callback' => 'build_template_part_block_variations',
 		)
 	);
 }
diff --git a/packages/block-library/src/template-part/theme.scss b/packages/block-library/src/template-part/theme.scss
index 58e7b1fdf2d9ff..179873b9448b82 100644
--- a/packages/block-library/src/template-part/theme.scss
+++ b/packages/block-library/src/template-part/theme.scss
@@ -1,9 +1,7 @@
 // Same as the group block styles.
-.wp-block-template-part {
-	&.has-background {
-		// Matches paragraph Block padding
-		padding: $block-bg-padding--v $block-bg-padding--h;
-		margin-top: 0;
-		margin-bottom: 0;
-	}
+:root :where(.wp-block-template-part.has-background) {
+	// Matches paragraph Block padding
+	padding: $block-bg-padding--v $block-bg-padding--h;
+	margin-top: 0;
+	margin-bottom: 0;
 }
diff --git a/packages/block-library/src/template-part/variations.js b/packages/block-library/src/template-part/variations.js
index 79881ee5f89e4c..acd8af13508ba9 100644
--- a/packages/block-library/src/template-part/variations.js
+++ b/packages/block-library/src/template-part/variations.js
@@ -31,10 +31,14 @@ export function enhanceTemplatePartVariations( settings, name ) {
 			const { area, theme, slug } = blockAttributes;
 			// We first check the `area` block attribute which is set during insertion.
 			// This property is removed on the creation of a template part.
-			if ( area ) return area === variationAttributes.area;
+			if ( area ) {
+				return area === variationAttributes.area;
+			}
 			// Find a matching variation from the created template part
 			// by checking the entity's `area` property.
-			if ( ! slug ) return false;
+			if ( ! slug ) {
+				return false;
+			}
 			const { getCurrentTheme, getEntityRecord } =
 				select( coreDataStore );
 			const entity = getEntityRecord(
diff --git a/packages/block-library/src/term-description/block.json b/packages/block-library/src/term-description/block.json
index fc91a4aff4c484..dc27fc17df7890 100644
--- a/packages/block-library/src/term-description/block.json
+++ b/packages/block-library/src/term-description/block.json
@@ -37,6 +37,21 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"color": true,
+			"width": true,
+			"style": true,
+			"__experimentalDefaultControls": {
+				"radius": true,
+				"color": true,
+				"width": true,
+				"style": true
+			}
 		}
 	}
 }
diff --git a/packages/block-library/src/term-description/edit.js b/packages/block-library/src/term-description/edit.js
index cd728ec051b603..c19d38abde5136 100644
--- a/packages/block-library/src/term-description/edit.js
+++ b/packages/block-library/src/term-description/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -20,7 +20,7 @@ export default function TermDescriptionEdit( {
 } ) {
 	const { textAlign } = attributes;
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 		style: mergedStyle,
diff --git a/packages/block-library/src/term-description/index.js b/packages/block-library/src/term-description/index.js
index 0ff710a91f5d50..330ca05bd174e1 100644
--- a/packages/block-library/src/term-description/index.js
+++ b/packages/block-library/src/term-description/index.js
@@ -16,6 +16,7 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	example: {},
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/term-description/index.php b/packages/block-library/src/term-description/index.php
index 011ec28f2e5e63..925b37f34f98a8 100644
--- a/packages/block-library/src/term-description/index.php
+++ b/packages/block-library/src/term-description/index.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/term-description` block on the server.
  *
+ * @since 5.9.0
+ *
  * @param array $attributes Block attributes.
  *
  * @return string Returns the description of the current taxonomy term, if available
@@ -37,6 +39,8 @@ function render_block_core_term_description( $attributes ) {
 
 /**
  * Registers the `core/term-description` block on the server.
+ *
+ * @since 5.9.0
  */
 function register_block_core_term_description() {
 	register_block_type_from_metadata(
diff --git a/packages/block-library/src/term-description/style.scss b/packages/block-library/src/term-description/style.scss
index bd455f7a68d3dd..1649a8d80c8f12 100644
--- a/packages/block-library/src/term-description/style.scss
+++ b/packages/block-library/src/term-description/style.scss
@@ -1,5 +1,7 @@
 // Lowest specificity on wrapper margins to avoid overriding layout styles.
 :where(.wp-block-term-description) {
+	// This block has customizable padding, border-box makes that more predictable.
+	box-sizing: border-box;
 	margin-top: var(--wp--style--block-gap);
 	margin-bottom: var(--wp--style--block-gap);
 }
diff --git a/packages/block-library/src/text-columns/block.json b/packages/block-library/src/text-columns/block.json
index 3af169fadbb3bd..2599df111d34bd 100644
--- a/packages/block-library/src/text-columns/block.json
+++ b/packages/block-library/src/text-columns/block.json
@@ -29,7 +29,10 @@
 		}
 	},
 	"supports": {
-		"inserter": false
+		"inserter": false,
+		"interactivity": {
+			"clientNavigation": true
+		}
 	},
 	"editorStyle": "wp-block-text-columns-editor",
 	"style": "wp-block-text-columns"
diff --git a/packages/block-library/src/utils/caption.js b/packages/block-library/src/utils/caption.js
index e9055cc29df02c..82e951d4813eb1 100644
--- a/packages/block-library/src/utils/caption.js
+++ b/packages/block-library/src/utils/caption.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -10,16 +10,21 @@ import { useState, useEffect, useCallback } from '@wordpress/element';
 import { usePrevious } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
 import {
-	RichText,
 	BlockControls,
 	__experimentalGetElementClassName,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import { ToolbarButton } from '@wordpress/components';
 import { caption as captionIcon } from '@wordpress/icons';
 import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
 
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../lock-unlock';
+
 export function Caption( {
-	key = 'caption',
+	attributeKey = 'caption',
 	attributes,
 	setAttributes,
 	isSelected,
@@ -27,10 +32,18 @@ export function Caption( {
 	placeholder = __( 'Add caption' ),
 	label = __( 'Caption text' ),
 	showToolbarButton = true,
+	excludeElementClassName,
 	className,
+	readOnly,
+	tagName = 'figcaption',
+	addLabel = __( 'Add caption' ),
+	removeLabel = __( 'Remove caption' ),
+	icon = captionIcon,
+	...props
 } ) {
-	const caption = attributes[ key ];
+	const caption = attributes[ attributeKey ];
 	const prevCaption = usePrevious( caption );
+	const { PrivateRichText: RichText } = unlock( blockEditorPrivateApis );
 	const isCaptionEmpty = RichText.isEmpty( caption );
 	const isPrevCaptionEmpty = RichText.isEmpty( prevCaption );
 	const [ showCaption, setShowCaption ] = useState( ! isCaptionEmpty );
@@ -58,6 +71,7 @@ export function Caption( {
 		},
 		[ isCaptionEmpty ]
 	);
+
 	return (
 		<>
 			{ showToolbarButton && (
@@ -66,34 +80,34 @@ export function Caption( {
 						onClick={ () => {
 							setShowCaption( ! showCaption );
 							if ( showCaption && caption ) {
-								setAttributes( { caption: undefined } );
+								setAttributes( {
+									[ attributeKey ]: undefined,
+								} );
 							}
 						} }
-						icon={ captionIcon }
+						icon={ icon }
 						isPressed={ showCaption }
-						label={
-							showCaption
-								? __( 'Remove caption' )
-								: __( 'Add caption' )
-						}
+						label={ showCaption ? removeLabel : addLabel }
 					/>
 				</BlockControls>
 			) }
 			{ showCaption &&
 				( ! RichText.isEmpty( caption ) || isSelected ) && (
 					<RichText
-						identifier={ key }
-						tagName="figcaption"
-						className={ classnames(
+						identifier={ attributeKey }
+						tagName={ tagName }
+						className={ clsx(
 							className,
-							__experimentalGetElementClassName( 'caption' )
+							excludeElementClassName
+								? ''
+								: __experimentalGetElementClassName( 'caption' )
 						) }
 						ref={ ref }
 						aria-label={ label }
 						placeholder={ placeholder }
 						value={ caption }
 						onChange={ ( value ) =>
-							setAttributes( { caption: value } )
+							setAttributes( { [ attributeKey ]: value } )
 						}
 						inlineToolbar
 						__unstableOnSplitAtEnd={ () =>
@@ -101,6 +115,8 @@ export function Caption( {
 								createBlock( getDefaultBlockName() )
 							)
 						}
+						readOnly={ readOnly }
+						{ ...props }
 					/>
 				) }
 		</>
diff --git a/packages/block-library/src/utils/get-transformed-metadata.js b/packages/block-library/src/utils/get-transformed-metadata.js
new file mode 100644
index 00000000000000..53d79d3c1e42ac
--- /dev/null
+++ b/packages/block-library/src/utils/get-transformed-metadata.js
@@ -0,0 +1,65 @@
+/**
+ * WordPress dependencies
+ */
+import { getBlockType } from '@wordpress/blocks';
+
+/**
+ * Transform the metadata attribute with only the values and bindings specified by each transform.
+ * Returns `undefined` if the input metadata is falsy.
+ *
+ * @param {Object}   metadata         Original metadata attribute from the block that is being transformed.
+ * @param {Object}   newBlockName     Name of the final block after the transformation.
+ * @param {Function} bindingsCallback Optional callback to transform the `bindings` property object.
+ * @return {Object|undefined} New metadata object only with the relevant properties.
+ */
+export function getTransformedMetadata(
+	metadata,
+	newBlockName,
+	bindingsCallback
+) {
+	if ( ! metadata ) {
+		return;
+	}
+	const { supports } = getBlockType( newBlockName );
+	// Fixed until an opt-in mechanism is implemented.
+	const BLOCK_BINDINGS_SUPPORTED_BLOCKS = [
+		'core/paragraph',
+		'core/heading',
+		'core/image',
+		'core/button',
+	];
+	// The metadata properties that should be preserved after the transform.
+	const transformSupportedProps = [];
+	// If it support bindings, and there is a transform bindings callback, add the `id` and `bindings` properties.
+	if (
+		BLOCK_BINDINGS_SUPPORTED_BLOCKS.includes( newBlockName ) &&
+		bindingsCallback
+	) {
+		transformSupportedProps.push( 'id', 'bindings' );
+	}
+	// If it support block naming (true by default), add the `name` property.
+	if ( supports.renaming !== false ) {
+		transformSupportedProps.push( 'name' );
+	}
+
+	// Return early if no supported properties.
+	if ( ! transformSupportedProps.length ) {
+		return;
+	}
+
+	const newMetadata = Object.entries( metadata ).reduce(
+		( obj, [ prop, value ] ) => {
+			// If prop is not supported, don't add it to the new metadata object.
+			if ( ! transformSupportedProps.includes( prop ) ) {
+				return obj;
+			}
+			obj[ prop ] =
+				prop === 'bindings' ? bindingsCallback( value ) : value;
+			return obj;
+		},
+		{}
+	);
+
+	// Return undefined if object is empty.
+	return Object.keys( newMetadata ).length ? newMetadata : undefined;
+}
diff --git a/packages/block-library/src/utils/hooks.js b/packages/block-library/src/utils/hooks.js
index 4b64c529299467..61515306e8bfd1 100644
--- a/packages/block-library/src/utils/hooks.js
+++ b/packages/block-library/src/utils/hooks.js
@@ -2,7 +2,11 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
+import { useLayoutEffect, useEffect, useRef } from '@wordpress/element';
+import { getBlobByURL, isBlobURL, revokeBlobURL } from '@wordpress/blob';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
+import { useViewportMatch } from '@wordpress/compose';
 
 /**
  * Returns whether the current user can edit the given entity.
@@ -14,11 +18,86 @@ import { store as coreStore } from '@wordpress/core-data';
 export function useCanEditEntity( kind, name, recordId ) {
 	return useSelect(
 		( select ) =>
-			select( coreStore ).canUserEditEntityRecord( kind, name, recordId ),
+			select( coreStore ).canUser( 'update', {
+				kind,
+				name,
+				id: recordId,
+			} ),
 		[ kind, name, recordId ]
 	);
 }
 
-export default {
-	useCanEditEntity,
-};
+/**
+ * Handles uploading a media file from a blob URL on mount.
+ *
+ * @param {Object}   args              Upload media arguments.
+ * @param {string}   args.url          Blob URL.
+ * @param {?Array}   args.allowedTypes Array of allowed media types.
+ * @param {Function} args.onChange     Function called when the media is uploaded.
+ * @param {Function} args.onError      Function called when an error happens.
+ */
+export function useUploadMediaFromBlobURL( args = {} ) {
+	const latestArgsRef = useRef( args );
+	const hasUploadStartedRef = useRef( false );
+	const { getSettings } = useSelect( blockEditorStore );
+
+	useLayoutEffect( () => {
+		latestArgsRef.current = args;
+	} );
+
+	useEffect( () => {
+		// Uploading is a special effect that can't be canceled via the cleanup method.
+		// The extra check avoids duplicate uploads in development mode (React.StrictMode).
+		if ( hasUploadStartedRef.current ) {
+			return;
+		}
+		if (
+			! latestArgsRef.current.url ||
+			! isBlobURL( latestArgsRef.current.url )
+		) {
+			return;
+		}
+
+		const file = getBlobByURL( latestArgsRef.current.url );
+		if ( ! file ) {
+			return;
+		}
+
+		const { url, allowedTypes, onChange, onError } = latestArgsRef.current;
+		const { mediaUpload } = getSettings();
+
+		hasUploadStartedRef.current = true;
+
+		mediaUpload( {
+			filesList: [ file ],
+			allowedTypes,
+			onFileChange: ( [ media ] ) => {
+				if ( isBlobURL( media?.url ) ) {
+					return;
+				}
+
+				revokeBlobURL( url );
+				onChange( media );
+				hasUploadStartedRef.current = false;
+			},
+			onError: ( message ) => {
+				revokeBlobURL( url );
+				onError( message );
+				hasUploadStartedRef.current = false;
+			},
+		} );
+	}, [ getSettings ] );
+}
+
+export function useToolsPanelDropdownMenuProps() {
+	const isMobile = useViewportMatch( 'medium', '<' );
+	return ! isMobile
+		? {
+				popoverProps: {
+					placement: 'left-start',
+					// For non-mobile, inner sidebar width (248px) - button width (24px) - border (1px) + padding (16px) + spacing (20px)
+					offset: 259,
+				},
+		  }
+		: {};
+}
diff --git a/packages/block-library/src/utils/remove-anchor-tag.js b/packages/block-library/src/utils/remove-anchor-tag.js
index 31d1877082f50d..82e7b03423648d 100644
--- a/packages/block-library/src/utils/remove-anchor-tag.js
+++ b/packages/block-library/src/utils/remove-anchor-tag.js
@@ -6,5 +6,6 @@
  * @return {string} The value with anchor tags removed.
  */
 export default function removeAnchorTag( value ) {
-	return value.replace( /<\/?a[^>]*>/g, '' );
+	// To do: Refactor this to use rich text's removeFormat instead.
+	return value.toString().replace( /<\/?a[^>]*>/g, '' );
 }
diff --git a/packages/block-library/src/verse/block.json b/packages/block-library/src/verse/block.json
index fa0bc30798212e..81cccd72965b1a 100644
--- a/packages/block-library/src/verse/block.json
+++ b/packages/block-library/src/verse/block.json
@@ -9,12 +9,11 @@
 	"textdomain": "default",
 	"attributes": {
 		"content": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "pre",
-			"default": "",
 			"__unstablePreserveWhiteSpace": true,
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"textAlign": {
 			"type": "string"
@@ -22,6 +21,13 @@
 	},
 	"supports": {
 		"anchor": true,
+		"background": {
+			"backgroundImage": true,
+			"backgroundSize": true,
+			"__experimentalDefaultControls": {
+				"backgroundImage": true
+			}
+		},
 		"color": {
 			"gradients": true,
 			"link": true,
@@ -30,6 +36,12 @@
 				"text": true
 			}
 		},
+		"dimensions": {
+			"minHeight": true,
+			"__experimentalDefaultControls": {
+				"minHeight": false
+			}
+		},
 		"typography": {
 			"fontSize": true,
 			"__experimentalFontFamily": true,
@@ -39,6 +51,7 @@
 			"__experimentalLetterSpacing": true,
 			"__experimentalTextTransform": true,
 			"__experimentalTextDecoration": true,
+			"__experimentalWritingMode": true,
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
@@ -56,6 +69,9 @@
 			"width": true,
 			"color": true,
 			"style": true
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"style": "wp-block-verse",
diff --git a/packages/block-library/src/verse/deprecated.js b/packages/block-library/src/verse/deprecated.js
index d986e2df75e5b2..bd4edc46738c5c 100644
--- a/packages/block-library/src/verse/deprecated.js
+++ b/packages/block-library/src/verse/deprecated.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -46,7 +46,7 @@ const v2 = {
 			selector: 'pre',
 			default: '',
 			__unstablePreserveWhiteSpace: true,
-			__experimentalRole: 'content',
+			role: 'content',
 		},
 		textAlign: {
 			type: 'string',
@@ -69,7 +69,7 @@ const v2 = {
 	save( { attributes } ) {
 		const { textAlign, content } = attributes;
 
-		const className = classnames( {
+		const className = clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} );
 
diff --git a/packages/block-library/src/verse/edit.js b/packages/block-library/src/verse/edit.js
index a76ecc1ff6ab42..ea7a2037303a88 100644
--- a/packages/block-library/src/verse/edit.js
+++ b/packages/block-library/src/verse/edit.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -25,7 +25,7 @@ export default function VerseEdit( {
 } ) {
 	const { textAlign, content } = attributes;
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 		style,
diff --git a/packages/block-library/src/verse/save.js b/packages/block-library/src/verse/save.js
index 9a535f7b19c686..42f10533cac17f 100644
--- a/packages/block-library/src/verse/save.js
+++ b/packages/block-library/src/verse/save.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,7 +11,7 @@ import { RichText, useBlockProps } from '@wordpress/block-editor';
 export default function save( { attributes } ) {
 	const { textAlign, content } = attributes;
 
-	const className = classnames( {
+	const className = clsx( {
 		[ `has-text-align-${ textAlign }` ]: textAlign,
 	} );
 
diff --git a/packages/block-library/src/video/block.json b/packages/block-library/src/video/block.json
index debe6f20fe53f7..d2dcd95365c3b5 100644
--- a/packages/block-library/src/video/block.json
+++ b/packages/block-library/src/video/block.json
@@ -15,10 +15,10 @@
 			"attribute": "autoplay"
 		},
 		"caption": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "figcaption",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"controls": {
 			"type": "boolean",
@@ -29,7 +29,7 @@
 		},
 		"id": {
 			"type": "number",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"loop": {
 			"type": "boolean",
@@ -56,12 +56,16 @@
 			"attribute": "preload",
 			"default": "metadata"
 		},
+		"blob": {
+			"type": "string",
+			"role": "local"
+		},
 		"src": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "video",
 			"attribute": "src",
-			"__experimentalRole": "content"
+			"role": "content"
 		},
 		"playsInline": {
 			"type": "boolean",
@@ -70,7 +74,7 @@
 			"attribute": "playsinline"
 		},
 		"tracks": {
-			"__experimentalRole": "content",
+			"role": "content",
 			"type": "array",
 			"items": {
 				"type": "object"
@@ -88,6 +92,9 @@
 				"margin": false,
 				"padding": false
 			}
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-video-editor",
diff --git a/packages/block-library/src/video/edit-common-settings.js b/packages/block-library/src/video/edit-common-settings.js
index f0cdf210fe0d5f..9394bfaf5c6145 100644
--- a/packages/block-library/src/video/edit-common-settings.js
+++ b/packages/block-library/src/video/edit-common-settings.js
@@ -74,17 +74,22 @@ const VideoSettings = ( { setAttributes, attributes } ) => {
 			/>
 			<ToggleControl
 				__nextHasNoMarginBottom
+				/* translators: Setting to play videos within the webpage on mobile browsers rather than opening in a fullscreen player. */
 				label={ __( 'Play inline' ) }
 				onChange={ toggleFactory.playsInline }
 				checked={ !! playsInline }
+				help={ __(
+					'When enabled, videos will play directly within the webpage on mobile browsers, instead of opening in a fullscreen player.'
+				) }
 			/>
 			<SelectControl
+				__next40pxDefaultSize
 				__nextHasNoMarginBottom
 				label={ __( 'Preload' ) }
 				value={ preload }
 				onChange={ onChangePreload }
 				options={ options }
-				hideCancelButton={ true }
+				hideCancelButton
 			/>
 		</>
 	);
diff --git a/packages/block-library/src/video/edit.js b/packages/block-library/src/video/edit.js
index 88b2669e66f565..ba6b4c869aefcb 100644
--- a/packages/block-library/src/video/edit.js
+++ b/packages/block-library/src/video/edit.js
@@ -1,12 +1,12 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { getBlobByURL, isBlobURL } from '@wordpress/blob';
+import { isBlobURL } from '@wordpress/blob';
 import {
 	BaseControl,
 	Button,
@@ -24,12 +24,11 @@ import {
 	MediaUploadCheck,
 	MediaReplaceFlow,
 	useBlockProps,
-	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { useRef, useEffect } from '@wordpress/element';
+import { useRef, useEffect, useState } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { useInstanceId } from '@wordpress/compose';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch } from '@wordpress/data';
 import { video as icon } from '@wordpress/icons';
 import { store as noticesStore } from '@wordpress/notices';
 
@@ -37,33 +36,17 @@ import { store as noticesStore } from '@wordpress/notices';
  * Internal dependencies
  */
 import { createUpgradedEmbedBlock } from '../embed/util';
+import { useUploadMediaFromBlobURL } from '../utils/hooks';
 import VideoCommonSettings from './edit-common-settings';
 import TracksEditor from './tracks-editor';
 import Tracks from './tracks';
 import { Caption } from '../utils/caption';
 
-// Much of this description is duplicated from MediaPlaceholder.
-const placeholder = ( content ) => {
-	return (
-		<Placeholder
-			className="block-editor-media-placeholder"
-			withIllustration={ true }
-			icon={ icon }
-			label={ __( 'Video' ) }
-			instructions={ __(
-				'Upload a video file, pick one from your media library, or add one with a URL.'
-			) }
-		>
-			{ content }
-		</Placeholder>
-	);
-};
-
 const ALLOWED_MEDIA_TYPES = [ 'video' ];
 const VIDEO_POSTER_ALLOWED_MEDIA_TYPES = [ 'image' ];
 
 function VideoEdit( {
-	isSelected,
+	isSelected: isSingleSelected,
 	attributes,
 	className,
 	setAttributes,
@@ -74,25 +57,14 @@ function VideoEdit( {
 	const videoPlayer = useRef();
 	const posterImageButton = useRef();
 	const { id, controls, poster, src, tracks } = attributes;
-	const isTemporaryVideo = ! id && isBlobURL( src );
-	const mediaUpload = useSelect(
-		( select ) => select( blockEditorStore ).getSettings().mediaUpload,
-		[]
-	);
+	const [ temporaryURL, setTemporaryURL ] = useState( attributes.blob );
 
-	useEffect( () => {
-		if ( ! id && isBlobURL( src ) ) {
-			const file = getBlobByURL( src );
-			if ( file ) {
-				mediaUpload( {
-					filesList: [ file ],
-					onFileChange: ( [ media ] ) => onSelectVideo( media ),
-					onError: onUploadError,
-					allowedTypes: ALLOWED_MEDIA_TYPES,
-				} );
-			}
-		}
-	}, [] );
+	useUploadMediaFromBlobURL( {
+		url: temporaryURL,
+		allowedTypes: ALLOWED_MEDIA_TYPES,
+		onChange: onSelectVideo,
+		onError: onUploadError,
+	} );
 
 	useEffect( () => {
 		// Placeholder may be rendered.
@@ -111,19 +83,28 @@ function VideoEdit( {
 				id: undefined,
 				poster: undefined,
 				caption: undefined,
+				blob: undefined,
 			} );
+			setTemporaryURL();
+			return;
+		}
+
+		if ( isBlobURL( media.url ) ) {
+			setTemporaryURL( media.url );
 			return;
 		}
 
 		// Sets the block's attribute and updates the edit component from the
 		// selected media.
 		setAttributes( {
+			blob: undefined,
 			src: media.url,
 			id: media.id,
 			poster:
 				media.image?.src !== media.icon ? media.image?.src : undefined,
 			caption: media.caption,
 		} );
+		setTemporaryURL();
 	}
 
 	function onSelectURL( newSrc ) {
@@ -136,7 +117,13 @@ function VideoEdit( {
 				onReplace( embedBlock );
 				return;
 			}
-			setAttributes( { src: newSrc, id: undefined, poster: undefined } );
+			setAttributes( {
+				blob: undefined,
+				src: newSrc,
+				id: undefined,
+				poster: undefined,
+			} );
+			setTemporaryURL();
 		}
 	}
 
@@ -145,15 +132,32 @@ function VideoEdit( {
 		createErrorNotice( message, { type: 'snackbar' } );
 	}
 
-	const classes = classnames( className, {
-		'is-transient': isTemporaryVideo,
+	// Much of this description is duplicated from MediaPlaceholder.
+	const placeholder = ( content ) => {
+		return (
+			<Placeholder
+				className="block-editor-media-placeholder"
+				withIllustration={ ! isSingleSelected }
+				icon={ icon }
+				label={ __( 'Video' ) }
+				instructions={ __(
+					'Upload a video file, pick one from your media library, or add one with a URL.'
+				) }
+			>
+				{ content }
+			</Placeholder>
+		);
+	};
+
+	const classes = clsx( className, {
+		'is-transient': !! temporaryURL,
 	} );
 
 	const blockProps = useBlockProps( {
 		className: classes,
 	} );
 
-	if ( ! src ) {
+	if ( ! src && ! temporaryURL ) {
 		return (
 			<div { ...blockProps }>
 				<MediaPlaceholder
@@ -185,25 +189,30 @@ function VideoEdit( {
 
 	return (
 		<>
-			<BlockControls>
-				<TracksEditor
-					tracks={ tracks }
-					onChange={ ( newTracks ) => {
-						setAttributes( { tracks: newTracks } );
-					} }
-				/>
-			</BlockControls>
-			<BlockControls group="other">
-				<MediaReplaceFlow
-					mediaId={ id }
-					mediaURL={ src }
-					allowedTypes={ ALLOWED_MEDIA_TYPES }
-					accept="video/*"
-					onSelect={ onSelectVideo }
-					onSelectURL={ onSelectURL }
-					onError={ onUploadError }
-				/>
-			</BlockControls>
+			{ isSingleSelected && (
+				<>
+					<BlockControls>
+						<TracksEditor
+							tracks={ tracks }
+							onChange={ ( newTracks ) => {
+								setAttributes( { tracks: newTracks } );
+							} }
+						/>
+					</BlockControls>
+					<BlockControls group="other">
+						<MediaReplaceFlow
+							mediaId={ id }
+							mediaURL={ src }
+							allowedTypes={ ALLOWED_MEDIA_TYPES }
+							accept="video/*"
+							onSelect={ onSelectVideo }
+							onSelectURL={ onSelectURL }
+							onError={ onUploadError }
+							onReset={ () => onSelectVideo( undefined ) }
+						/>
+					</BlockControls>
+				</>
+			) }
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
 					<VideoCommonSettings
@@ -211,7 +220,7 @@ function VideoEdit( {
 						attributes={ attributes }
 					/>
 					<MediaUploadCheck>
-						<BaseControl className="editor-video-poster-control">
+						<div className="editor-video-poster-control">
 							<BaseControl.VisualLabel>
 								{ __( 'Poster image' ) }
 							</BaseControl.VisualLabel>
@@ -223,6 +232,7 @@ function VideoEdit( {
 								}
 								render={ ( { open } ) => (
 									<Button
+										__next40pxDefaultSize
 										variant="primary"
 										onClick={ open }
 										ref={ posterImageButton }
@@ -251,39 +261,41 @@ function VideoEdit( {
 							</p>
 							{ !! poster && (
 								<Button
+									__next40pxDefaultSize
 									onClick={ onRemovePoster }
 									variant="tertiary"
 								>
 									{ __( 'Remove' ) }
 								</Button>
 							) }
-						</BaseControl>
+						</div>
 					</MediaUploadCheck>
 				</PanelBody>
 			</InspectorControls>
 			<figure { ...blockProps }>
 				{ /*
-					Disable the video tag if the block is not selected
-					so the user clicking on it won't play the
-					video when the controls are enabled.
-				*/ }
-				<Disabled isDisabled={ ! isSelected }>
+                Disable the video tag if the block is not selected
+                so the user clicking on it won't play the
+                video when the controls are enabled.
+            */ }
+				<Disabled isDisabled={ ! isSingleSelected }>
 					<video
 						controls={ controls }
 						poster={ poster }
-						src={ src }
+						src={ src || temporaryURL }
 						ref={ videoPlayer }
 					>
 						<Tracks tracks={ tracks } />
 					</video>
 				</Disabled>
-				{ isTemporaryVideo && <Spinner /> }
+				{ !! temporaryURL && <Spinner /> }
 				<Caption
 					attributes={ attributes }
 					setAttributes={ setAttributes }
-					isSelected={ isSelected }
+					isSelected={ isSingleSelected }
 					insertBlocksAfter={ insertBlocksAfter }
 					label={ __( 'Video caption text' ) }
+					showToolbarButton={ isSingleSelected }
 				/>
 			</figure>
 		</>
diff --git a/packages/block-library/src/video/edit.native.js b/packages/block-library/src/video/edit.native.js
index b974e61e109605..f6960f0888617d 100644
--- a/packages/block-library/src/video/edit.native.js
+++ b/packages/block-library/src/video/edit.native.js
@@ -218,7 +218,7 @@ class VideoEdit extends Component {
 		const toolbarEditButton = (
 			<MediaUpload
 				allowedTypes={ [ MEDIA_TYPE_VIDEO ] }
-				isReplacingMedia={ true }
+				isReplacingMedia
 				onSelect={ this.onSelectMediaUploadOption }
 				onSelectURL={ this.onSelectURL }
 				render={ ( { open, getMediaOptions } ) => {
@@ -290,8 +290,10 @@ class VideoEdit extends Component {
 						} ) => {
 							const showVideo =
 								isURL( src ) &&
+								getProtocol( attributes.src ) !== 'file:' &&
 								! isUploadInProgress &&
 								! isUploadFailed;
+
 							const icon = this.getIcon(
 								isUploadFailed
 									? ICON_TYPE.RETRY
@@ -332,7 +334,7 @@ class VideoEdit extends Component {
 												}
 												style={ videoStyle }
 												source={ { uri: src } }
-												paused={ true }
+												paused
 											/>
 										</View>
 									) }
@@ -365,7 +367,7 @@ class VideoEdit extends Component {
 						} }
 					/>
 					<BlockCaption
-						accessible={ true }
+						accessible
 						accessibilityLabelCreator={ ( caption ) =>
 							RichText.isEmpty( caption )
 								? /* translators: accessibility text. Empty video caption. */
diff --git a/packages/block-library/src/video/editor.scss b/packages/block-library/src/video/editor.scss
index f1a7a0b27173e9..dd50ecc6c066fd 100644
--- a/packages/block-library/src/video/editor.scss
+++ b/packages/block-library/src/video/editor.scss
@@ -1,40 +1,3 @@
-// Provide special styling for the placeholder.
-// @todo: this particular minimal style of placeholder could be componentized further.
-.wp-block-video.wp-block-video {
-	// Show Placeholder style on-select.
-	&.is-selected .components-placeholder {
-		// Block UI appearance.
-		color: $gray-900;
-		background-color: $white;
-		box-shadow: inset 0 0 0 $border-width $gray-900;
-		border: none;
-
-		// @todo: this should eventually be overridden by a custom border-radius set in the inspector.
-		border-radius: $radius-block-ui;
-
-		> svg {
-			opacity: 0;
-		}
-
-		.components-placeholder__illustration {
-			display: none;
-		}
-
-		&::before {
-			opacity: 0;
-		}
-	}
-
-	// Remove the transition while we still have a legacy placeholder style.
-	// Otherwise the content jumps between the 1px placeholder border, and any inherited custom
-	// parent border that may get applied when you deselect.
-	.components-placeholder__label,
-	.components-placeholder__instructions,
-	.components-button {
-		transition: none;
-	}
-}
-
 .wp-block[data-align="center"] > .wp-block-video {
 	text-align: center;
 }
@@ -57,10 +20,6 @@
 }
 
 .editor-video-poster-control {
-	.components-base-control__label {
-		display: block;
-	}
-
 	.components-button {
 		margin-right: $grid-unit-10;
 	}
@@ -89,7 +48,6 @@
 
 .block-library-video-tracks-editor > .components-popover__content {
 	width: 360px;
-	padding: 0;
 }
 
 .block-library-video-tracks-editor__track-list,
@@ -98,10 +56,3 @@
 		padding: 0;
 	}
 }
-
-.block-library-video-tracks-editor__single-track-editor,
-.block-library-video-tracks-editor__track-list,
-.block-library-video-tracks-editor__add-tracks-container {
-	padding: $grid-unit-15;
-}
-
diff --git a/packages/block-library/src/video/style.scss b/packages/block-library/src/video/style.scss
index e8d99186f9f7ac..06c0dfd9cdd469 100644
--- a/packages/block-library/src/video/style.scss
+++ b/packages/block-library/src/video/style.scss
@@ -19,7 +19,7 @@
 	// Supply caption styles to videos, even if the theme hasn't opted in.
 	// Reason being: the new markup, <figcaptions>, are not likely to be styled in the majority of existing themes,
 	// so we supply the styles so as to not appear broken or unstyled in those themes.
-	figcaption {
+	:where(figcaption) {
 		@include caption-style();
 	}
 }
diff --git a/packages/block-library/src/video/test/edit.native.js b/packages/block-library/src/video/test/edit.native.js
index 9b7f4b0bdffbb4..c82273e102dd4d 100644
--- a/packages/block-library/src/video/test/edit.native.js
+++ b/packages/block-library/src/video/test/edit.native.js
@@ -26,4 +26,28 @@ describe( 'Video block', () => {
 
 		expect( screen.getByText( 'Invalid URL.' ) ).toBeVisible();
 	} );
+
+	it( 'should render empty state when source is not present', async () => {
+		await initializeEditor( {
+			initialHtml: `
+<!-- wp:video -->
+<figure class="wp-block-video"></figure>
+<!-- /wp:video -->
+		`,
+		} );
+		const addVideoButton = screen.queryByText( 'Add video' );
+		expect( addVideoButton ).toBeVisible();
+	} );
+
+	it( 'should not render empty state when video source is present', async () => {
+		await initializeEditor( {
+			initialHtml: `
+<!-- wp:video {"id":1234} -->
+<figure class="wp-block-video"><video controls src="https://VIDEO_URL.mp4"></video></figure>
+<!-- /wp:video -->
+		`,
+		} );
+		const addVideoButton = screen.queryByText( 'Add video' );
+		expect( addVideoButton ).toBeNull();
+	} );
 } );
diff --git a/packages/block-library/src/video/theme.scss b/packages/block-library/src/video/theme.scss
index cdc95af0b02c29..99af5d557bfa5a 100644
--- a/packages/block-library/src/video/theme.scss
+++ b/packages/block-library/src/video/theme.scss
@@ -1,4 +1,4 @@
-.wp-block-video figcaption {
+.wp-block-video :where(figcaption) {
 	@include caption-style-theme();
 }
 
diff --git a/packages/block-library/src/video/tracks-editor.js b/packages/block-library/src/video/tracks-editor.js
index 366d521f5aa625..d01e365985bc96 100644
--- a/packages/block-library/src/video/tracks-editor.js
+++ b/packages/block-library/src/video/tracks-editor.js
@@ -58,6 +58,7 @@ function TrackList( { tracks, onEditPress } ) {
 				>
 					<span>{ track.label } </span>
 					<Button
+						__next40pxDefaultSize
 						variant="tertiary"
 						onClick={ () => onEditPress( index ) }
 						aria-label={ sprintf(
@@ -99,6 +100,7 @@ function SingleTrackEditor( { track, onChange, onClose, onRemove } ) {
 				</span>
 				<Grid columns={ 2 } gap={ 4 }>
 					<TextControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						/* eslint-disable jsx-a11y/no-autofocus */
 						autoFocus
@@ -114,6 +116,7 @@ function SingleTrackEditor( { track, onChange, onClose, onRemove } ) {
 						help={ __( 'Title of track' ) }
 					/>
 					<TextControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						onChange={ ( newSrcLang ) =>
 							onChange( {
@@ -128,6 +131,7 @@ function SingleTrackEditor( { track, onChange, onClose, onRemove } ) {
 				</Grid>
 				<VStack spacing="8">
 					<SelectControl
+						__next40pxDefaultSize
 						__nextHasNoMarginBottom
 						className="block-library-video-tracks-editor__single-track-editor-kind-select"
 						options={ KIND_OPTIONS }
@@ -142,6 +146,7 @@ function SingleTrackEditor( { track, onChange, onClose, onRemove } ) {
 					/>
 					<HStack className="block-library-video-tracks-editor__single-track-editor-buttons-container">
 						<Button
+							__next40pxDefaultSize
 							variant="secondary"
 							onClick={ () => {
 								const changes = {};
@@ -170,6 +175,7 @@ function SingleTrackEditor( { track, onChange, onClose, onRemove } ) {
 							{ __( 'Close' ) }
 						</Button>
 						<Button
+							__next40pxDefaultSize
 							isDestructive
 							variant="link"
 							onClick={ onRemove }
diff --git a/packages/block-library/src/video/transforms.js b/packages/block-library/src/video/transforms.js
index 246032422d643d..4325cd1e7e7e9d 100644
--- a/packages/block-library/src/video/transforms.js
+++ b/packages/block-library/src/video/transforms.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createBlobURL } from '@wordpress/blob';
+import { createBlobURL, isBlobURL } from '@wordpress/blob';
 import { createBlock } from '@wordpress/blocks';
 
 const transforms = {
@@ -20,7 +20,7 @@ const transforms = {
 				// It's already done as part of the `componentDidMount`
 				// in the video block
 				const block = createBlock( 'core/video', {
-					src: createBlobURL( file ),
+					blob: createBlobURL( file ),
 				} );
 				return block;
 			},
@@ -63,6 +63,42 @@ const transforms = {
 				},
 			},
 		},
+		{
+			type: 'raw',
+			isMatch: ( node ) =>
+				node.nodeName === 'P' &&
+				node.children.length === 1 &&
+				node.firstChild.nodeName === 'VIDEO',
+			transform: ( node ) => {
+				const videoElement = node.firstChild;
+				const attributes = {
+					autoplay: videoElement.hasAttribute( 'autoplay' )
+						? true
+						: undefined,
+					controls: videoElement.hasAttribute( 'controls' )
+						? undefined
+						: false,
+					loop: videoElement.hasAttribute( 'loop' )
+						? true
+						: undefined,
+					muted: videoElement.hasAttribute( 'muted' )
+						? true
+						: undefined,
+					preload:
+						videoElement.getAttribute( 'preload' ) || undefined,
+					playsInline: videoElement.hasAttribute( 'playsinline' )
+						? true
+						: undefined,
+					poster: videoElement.getAttribute( 'poster' ) || undefined,
+					src: videoElement.getAttribute( 'src' ) || undefined,
+				};
+				if ( isBlobURL( attributes.src ) ) {
+					attributes.blob = attributes.src;
+					delete attributes.src;
+				}
+				return createBlock( 'core/video', attributes );
+			},
+		},
 	],
 };
 
diff --git a/packages/block-library/tsconfig.json b/packages/block-library/tsconfig.json
index a9a30e9804e1f3..2a2cb1653d4285 100644
--- a/packages/block-library/tsconfig.json
+++ b/packages/block-library/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
@@ -27,6 +28,7 @@
 		{ "path": "../i18n" },
 		{ "path": "../icons" },
 		{ "path": "../interactivity" },
+		{ "path": "../interactivity-router" },
 		{ "path": "../notices" },
 		{ "path": "../keycodes" },
 		{ "path": "../primitives" },
diff --git a/packages/block-serialization-default-parser/.npmrc b/packages/block-serialization-default-parser/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/block-serialization-default-parser/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/block-serialization-default-parser/CHANGELOG.md b/packages/block-serialization-default-parser/CHANGELOG.md
index a44ee8ed86efde..9b0457333bd7d5 100644
--- a/packages/block-serialization-default-parser/CHANGELOG.md
+++ b/packages/block-serialization-default-parser/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.58.0 (2024-05-16)
+
+## 4.57.0 (2024-05-02)
+
+## 4.56.0 (2024-04-19)
+
+## 4.55.0 (2024-04-03)
+
+## 4.54.0 (2024-03-21)
+
+## 4.53.0 (2024-03-06)
+
+## 4.52.0 (2024-02-21)
+
+## 4.51.0 (2024-02-09)
+
+## 4.50.0 (2024-01-24)
+
+## 4.49.0 (2024-01-10)
+
+## 4.48.0 (2023-12-13)
+
 ## 4.47.0 (2023-11-29)
 
 ## 4.46.0 (2023-11-16)
@@ -64,7 +112,7 @@
 
 ## 4.17.0 (2022-09-13)
 
-### New Feature
+### New Features
 
 -   Include TypeScript type declarations ([#43722](https://github.com/WordPress/gutenberg/pull/43722)).
 
diff --git a/packages/block-serialization-default-parser/class-wp-block-parser-frame.php b/packages/block-serialization-default-parser/class-wp-block-parser-frame.php
index 15938dea389aad..6ab5dd3087dfb6 100644
--- a/packages/block-serialization-default-parser/class-wp-block-parser-frame.php
+++ b/packages/block-serialization-default-parser/class-wp-block-parser-frame.php
@@ -65,8 +65,9 @@ class WP_Block_Parser_Frame {
 	 * @param WP_Block_Parser_Block $block              Full or partial block.
 	 * @param int                   $token_start        Byte offset into document for start of parse token.
 	 * @param int                   $token_length       Byte length of entire parse token string.
-	 * @param int                   $prev_offset        Byte offset into document for after parse token ends.
-	 * @param int                   $leading_html_start Byte offset into document where leading HTML before token starts.
+	 * @param int|null              $prev_offset        Optional. Byte offset into document for after parse token ends. Default null.
+	 * @param int|null              $leading_html_start Optional. Byte offset into document where leading HTML before token starts.
+	 *                                                  Default null.
 	 */
 	public function __construct( $block, $token_start, $token_length, $prev_offset = null, $leading_html_start = null ) {
 		$this->block              = $block;
diff --git a/packages/block-serialization-default-parser/package.json b/packages/block-serialization-default-parser/package.json
index 53dc592315f534..14d2db0f688688 100644
--- a/packages/block-serialization-default-parser/package.json
+++ b/packages/block-serialization-default-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-default-parser",
-	"version": "4.47.0",
+	"version": "5.10.0",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,9 +29,10 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/block-serialization-default-parser/tsconfig.json b/packages/block-serialization-default-parser/tsconfig.json
index 3c2c31f506f132..6e33d8ff82d47e 100644
--- a/packages/block-serialization-default-parser/tsconfig.json
+++ b/packages/block-serialization-default-parser/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/block-serialization-spec-parser/.npmrc b/packages/block-serialization-spec-parser/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/block-serialization-spec-parser/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/block-serialization-spec-parser/CHANGELOG.md b/packages/block-serialization-spec-parser/CHANGELOG.md
index f61da25760bb5a..40c93063cafbb7 100644
--- a/packages/block-serialization-spec-parser/CHANGELOG.md
+++ b/packages/block-serialization-spec-parser/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.58.0 (2024-05-16)
+
+## 4.57.0 (2024-05-02)
+
+## 4.56.0 (2024-04-19)
+
+## 4.55.0 (2024-04-03)
+
+## 4.54.0 (2024-03-21)
+
+## 4.53.0 (2024-03-06)
+
+## 4.52.0 (2024-02-21)
+
+## 4.51.0 (2024-02-09)
+
+## 4.50.0 (2024-01-24)
+
+## 4.49.0 (2024-01-10)
+
+## 4.48.0 (2023-12-13)
+
 ## 4.47.0 (2023-11-29)
 
 ## 4.46.0 (2023-11-16)
@@ -107,11 +155,11 @@
 
 ## 3.0.0 (2019-03-06)
 
-## Breaking Change
+### Breaking Changes
 
 -   A `parser.js` file generated from the PEGJS grammar is now outputted in commonjs format.
 
-## New Feature
+### New Features
 
 -   A `parser.php` file generated from the PEGJS grammar is now added upon installation.
 
@@ -121,7 +169,7 @@
 
 ## 2.0.0 (2018-11-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   JS and PHP parsers now behave consistently when parsing empty attributes.
 
diff --git a/packages/block-serialization-spec-parser/package.json b/packages/block-serialization-spec-parser/package.json
index 1844feeaf7844b..9a871250162ca0 100644
--- a/packages/block-serialization-spec-parser/package.json
+++ b/packages/block-serialization-spec-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-spec-parser",
-	"version": "4.47.0",
+	"version": "5.10.0",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "parser.js",
 	"sideEffects": false,
@@ -36,5 +37,6 @@
 		"build": "concurrently \"npm run build:js\" \"npm run build:php\"",
 		"build:js": "pegjs --format commonjs -o ./parser.js ./grammar.pegjs",
 		"build:php": "node bin/create-php-parser.js"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/blocks/.npmrc b/packages/blocks/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/blocks/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/blocks/CHANGELOG.md b/packages/blocks/CHANGELOG.md
index d9e5e2616efd0c..eebbe7148e8055 100644
--- a/packages/blocks/CHANGELOG.md
+++ b/packages/blocks/CHANGELOG.md
@@ -2,6 +2,59 @@
 
 ## Unreleased
 
+### Breaking changes
+
+- Normalize `blockType.parent` to be an array. While string values were never supported, they appeared to work with some unintended side-effects that have been fixed by [#66250](https://github.com/WordPress/gutenberg/pull/66250). For that reason, we've added some code that automatically migrates strings to arrays — though it still raises a warning.
+
+## 13.10.0 (2024-10-16)
+
+## 13.9.0 (2024-10-03)
+
+## 13.8.0 (2024-09-19)
+
+## 13.7.0 (2024-09-05)
+
+## 13.6.0 (2024-08-21)
+
+## 13.5.0 (2024-08-07)
+
+## 13.4.0 (2024-07-24)
+
+## 13.3.0 (2024-07-10)
+
+## 13.2.0 (2024-06-26)
+
+## 13.1.0 (2024-06-15)
+
+## 13.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 12.35.0 (2024-05-16)
+
+## 12.34.0 (2024-05-02)
+
+## 12.33.0 (2024-04-19)
+
+## 12.32.0 (2024-04-03)
+
+## 12.31.0 (2024-03-21)
+
+## 12.30.0 (2024-03-06)
+
+## 12.29.0 (2024-02-21)
+
+## 12.28.0 (2024-02-09)
+
+## 12.27.0 (2024-01-24)
+
+## 12.26.0 (2024-01-10)
+
+## 12.25.0 (2023-12-13)
+
 ## 12.24.0 (2023-11-29)
 
 ## 12.23.0 (2023-11-16)
@@ -70,12 +123,13 @@
 
 ## 11.17.0 (2022-09-21)
 
-- The block attribute sources `children` and `node` have been deprecated. Please use the `html` source instead. See https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields/ and the core blocks for examples.
+-   The block attribute sources `children` and `node` have been deprecated. Please use the `html` source instead. See https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/introducing-attributes-and-editable-fields/ and the core blocks for examples.
+
 ## 11.16.0 (2022-09-13)
 
 ## 11.15.0 (2022-08-24)
 
-### Bug Fix
+### Bug Fixes
 
 -   Packages: Replace `is-plain-obj` with `is-plain-object` ([#43511](https://github.com/WordPress/gutenberg/pull/43511)).
 
@@ -89,7 +143,7 @@
 
 -   `withBlockContentContext` is no longer used by the block editor and therefore got deprecated ([#41395](https://github.com/WordPress/gutenberg/pull/41395)).
 
-### New API
+### New Features
 
 -   The shortcode transformer now accepts a `transform` method to allow advanced controls over the transformed result. For instance, it's now possible to define custom `innerBlocks` for the transformed block. ([#42001](https://github.com/WordPress/gutenberg/pull/42001))
 
@@ -115,17 +169,17 @@
 
 ## 11.1.0 (2021-09-09)
 
-### Backward Compatibility
+### Bug Fixes
 
 -   Register a block even when an invalid value provided for the icon setting ([#34350](https://github.com/WordPress/gutenberg/pull/34350)).
 
-### New API
+### New Features
 
 -   The `isMatch` callback on block transforms now receives the block object (or block objects if `isMulti` is `true`) as its second argument.
 
 ## 11.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -137,7 +191,7 @@
 
 ## 9.1.0 (2021-05-20)
 
-### New API
+### New Features
 
 -   `registerBlockType` method can be used to register a block type using the metadata loaded from `block.json` file ([#32030](https://github.com/WordPress/gutenberg/pull/32030)).
 
@@ -152,37 +206,37 @@
 -   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
 -   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
 
-### New API
+### New Features
 
 -   `registerBlockTypeFromMetadata` method can be used to register a block type using the metadata loaded from `block.json` file ([#30293](https://github.com/WordPress/gutenberg/pull/30293)).
 
 ## 8.0.0 (2021-03-17)
 
-### Breaking Change
+### Breaking Changes
 
 -   Reverted `cloneBlock` back to its original logic that doesn't sanitize block's attributes. [#28379](https://github.com/WordPress/gutenberg/pull/29111)
 
 ## 7.0.0 (2021-02-01)
 
-### Breaking Change
+### Breaking Changes
 
 -   `cloneBlock` now sanitizes the attributes to match the same logic `createBlock` has. [#28379](https://github.com/WordPress/gutenberg/pull/28379)
 
 ## 6.25.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the blocks namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
 ## 6.13.0 (2020-04-01)
 
-### New Feature
+### New Features
 
 -   Blocks can now be registered with an `defaultStylePicker` flag in the `supports` setting, allowing the default style picker to be removed.
 
 ## 6.4.0 (2019-08-05)
 
-### Improvements
+### Enhancements
 
 -   Omitting `attributes` or `keywords` settings will now stub default values (an empty object or empty array, respectively).
 
@@ -192,14 +246,14 @@
 
 ## 6.3.0 (2019-05-21)
 
-### New Feature
+### New Features
 
 -   Added a default implementation for `save` setting in `registerBlockType` which saves no markup in the post content.
 -   Added wildcard block transforms which allows for transforming all/any blocks in another block.
 
 ## 6.1.0 (2019-03-06)
 
-### New Feature
+### New Features
 
 -   Blocks' `transforms` will receive `innerBlocks` as the second argument (or an array of each block's respective `innerBlocks` for a multi-transform).
 
@@ -223,7 +277,7 @@
 
 -   `isValidBlock` has been removed. Please use `isValidBlockContent` instead but keep in mind that the order of params has changed.
 
-### Bug Fix
+### Bug Fixes
 
 -   The block validator is more lenient toward equivalent encoding forms.
 
@@ -231,7 +285,7 @@
 
 ## 5.3.0 (2018-11-09)
 
-### New feature
+### New Features
 
 -   `getBlockAttributes`, `getBlockTransforms`, `getSaveContent`, `getSaveElement` and `isValidBlockContent` methods can now take also block's name as the first param ([#11490](https://github.com/WordPress/gutenberg/pull/11490)). Passing a block's type object continues to work as before.
 -   `registerBlockStyles` and `unregisterBlockStyles` can be triggered at any moment (before or after block registration).
@@ -248,11 +302,11 @@
 
 ## 5.1.0 (2018-10-30)
 
-### New features
+### New Features
 
 -   `isValidBlockContent` function has been added ([#10891](https://github.com/WordPress/gutenberg/pull/10891)).
 
-### Deprecation
+### Deprecations
 
 -   `isValidBlock` function has been deprecated ([#10891](https://github.com/WordPress/gutenberg/pull/10891)). Use `isValidBlockContent` instead.
 
@@ -264,7 +318,7 @@
 -   `setUnknownTypeHandlerName` has been removed. Please use `setFreeformContentHandlerName` and `setUnregisteredTypeHandlerName` instead.
 -   `getUnknownTypeHandlerName` has been removed. Please use `getFreeformContentHandlerName` and `getUnregisteredTypeHandlerName` instead.
 
-### New Feature
+### New Features
 
 -   Added a `unregisterBlockStyle()` function to remove a block style variation.
 
diff --git a/packages/blocks/README.md b/packages/blocks/README.md
index 8e6fdc9d900dbb..f4805e1c60b381 100644
--- a/packages/blocks/README.md
+++ b/packages/blocks/README.md
@@ -102,6 +102,47 @@ _Returns_
 
 -   `Object`: All block attributes.
 
+### getBlockAttributesNamesByRole
+
+Filter block attributes by `role` and return their names.
+
+_Parameters_
+
+-   _name_ `string`: Block attribute's name.
+-   _role_ `string`: The role of a block attribute.
+
+_Returns_
+
+-   `string[]`: The attribute names that have the provided role.
+
+### getBlockBindingsSource
+
+Returns a registered block bindings source by its name.
+
+_Parameters_
+
+-   _name_ `string`: Block bindings source name.
+
+_Returns_
+
+-   `?Object`: Block bindings source.
+
+_Changelog_
+
+`6.7.0` Introduced in WordPress core.
+
+### getBlockBindingsSources
+
+Returns all registered block bindings sources.
+
+_Returns_
+
+-   `Array`: Block bindings sources.
+
+_Changelog_
+
+`6.7.0` Introduced in WordPress core.
+
 ### getBlockContent
 
 Given a block object, returns the Block's Inner HTML markup.
@@ -462,6 +503,10 @@ _Returns_
 
 -   `Array|string`: A list of blocks or a string, depending on `handlerMode`.
 
+### privateApis
+
+Undocumented declaration.
+
 ### rawHandler
 
 Converts an HTML string to known blocks.
@@ -475,6 +520,40 @@ _Returns_
 
 -   `Array`: A list of blocks.
 
+### registerBlockBindingsSource
+
+Registers a new block bindings source with an object defining its behavior. Once registered, the source is available to be connected to the supported block attributes.
+
+_Usage_
+
+```js
+import { _x } from '@wordpress/i18n';
+import { registerBlockBindingsSource } from '@wordpress/blocks';
+
+registerBlockBindingsSource( {
+	name: 'plugin/my-custom-source',
+	label: _x( 'My Custom Source', 'block bindings source' ),
+	usesContext: [ 'postType' ],
+	getValues: getSourceValues,
+	setValues: updateMyCustomValuesInBatch,
+	canUserEditValue: () => true,
+} );
+```
+
+_Parameters_
+
+-   _source_ `Object`: Properties of the source to be registered.
+-   _source.name_ `string`: The unique and machine-readable name.
+-   _source.label_ `[string]`: Human-readable label. Optional when it is defined in the server.
+-   _source.usesContext_ `[Array]`: Optional array of context needed by the source only in the editor.
+-   _source.getValues_ `[Function]`: Optional function to get the values from the source.
+-   _source.setValues_ `[Function]`: Optional function to update multiple values connected to the source.
+-   _source.canUserEditValue_ `[Function]`: Optional function to determine if the user can edit the value.
+
+_Changelog_
+
+`6.7.0` Introduced in WordPress core.
+
 ### registerBlockCollection
 
 Registers a new block collection to group blocks in the same namespace in the inserter.
@@ -507,7 +586,7 @@ _Parameters_
 
 ### registerBlockStyle
 
-Registers a new block style for the given block.
+Registers a new block style for the given block types.
 
 For more information on connecting the styles with CSS [the official documentation](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-styles/#styles).
 
@@ -536,7 +615,7 @@ const ExampleComponent = () => {
 
 _Parameters_
 
--   _blockName_ `string`: Name of block (example: “core/latest-posts”).
+-   _blockNames_ `string|Array`: Name of blocks e.g. “core/latest-posts” or `["core/group", "core/columns"]`.
 -   _styleVariation_ `Object`: Object containing `name` which is the class name applied to the block and `label` which identifies the variation to the user.
 
 ### registerBlockType
@@ -776,6 +855,26 @@ _Returns_
 
 -   `Array`: Updated Block list.
 
+### unregisterBlockBindingsSource
+
+Unregisters a block bindings source by providing its name.
+
+_Usage_
+
+```js
+import { unregisterBlockBindingsSource } from '@wordpress/blocks';
+
+unregisterBlockBindingsSource( 'plugin/my-custom-source' );
+```
+
+_Parameters_
+
+-   _name_ `string`: The name of the block bindings source to unregister.
+
+_Changelog_
+
+`6.7.0` Introduced in WordPress core.
+
 ### unregisterBlockStyle
 
 Unregisters a block style for the given block.
diff --git a/packages/blocks/package.json b/packages/blocks/package.json
index 961cb338d73378..d7207548d173fc 100644
--- a/packages/blocks/package.json
+++ b/packages/blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blocks",
-	"version": "12.24.0",
+	"version": "13.10.0",
 	"description": "Block API for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,28 +29,29 @@
 		"{src,build,build-module}/{index.js,store/index.js}"
 	],
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/autop": "file:../autop",
-		"@wordpress/blob": "file:../blob",
-		"@wordpress/block-serialization-default-parser": "file:../block-serialization-default-parser",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/element": "file:../element",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/shortcode": "file:../shortcode",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/autop": "*",
+		"@wordpress/blob": "*",
+		"@wordpress/block-serialization-default-parser": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/element": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/is-shallow-equal": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/rich-text": "*",
+		"@wordpress/shortcode": "*",
+		"@wordpress/warning": "*",
 		"change-case": "^4.1.2",
 		"colord": "^2.7.0",
 		"fast-deep-equal": "^3.1.3",
 		"hpq": "^1.3.0",
 		"is-plain-object": "^5.0.0",
 		"memize": "^2.1.0",
-		"rememo": "^4.0.2",
+		"react-is": "^18.3.0",
 		"remove-accents": "^0.5.0",
 		"showdown": "^1.9.1",
 		"simple-html-tokenizer": "^0.5.7",
@@ -60,5 +62,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/blocks/src/api/constants.js b/packages/blocks/src/api/constants.js
index 2afdee93278ce7..620dfcbb8599c0 100644
--- a/packages/blocks/src/api/constants.js
+++ b/packages/blocks/src/api/constants.js
@@ -20,6 +20,11 @@ export const __EXPERIMENTAL_STYLE_PROPERTY = {
 		value: [ 'color', 'link' ],
 		support: [ 'color', 'link' ],
 	},
+	aspectRatio: {
+		value: [ 'dimensions', 'aspectRatio' ],
+		support: [ 'dimensions', 'aspectRatio' ],
+		useEngine: true,
+	},
 	background: {
 		value: [ 'color', 'gradient' ],
 		support: [ 'color', 'gradients' ],
@@ -31,6 +36,26 @@ export const __EXPERIMENTAL_STYLE_PROPERTY = {
 		requiresOptOut: true,
 		useEngine: true,
 	},
+	backgroundImage: {
+		value: [ 'background', 'backgroundImage' ],
+		support: [ 'background', 'backgroundImage' ],
+		useEngine: true,
+	},
+	backgroundRepeat: {
+		value: [ 'background', 'backgroundRepeat' ],
+		support: [ 'background', 'backgroundRepeat' ],
+		useEngine: true,
+	},
+	backgroundSize: {
+		value: [ 'background', 'backgroundSize' ],
+		support: [ 'background', 'backgroundSize' ],
+		useEngine: true,
+	},
+	backgroundPosition: {
+		value: [ 'background', 'backgroundPosition' ],
+		support: [ 'background', 'backgroundPosition' ],
+		useEngine: true,
+	},
 	borderColor: {
 		value: [ 'border', 'color' ],
 		support: [ '__experimentalBorder', 'color' ],
@@ -208,6 +233,11 @@ export const __EXPERIMENTAL_STYLE_PROPERTY = {
 		},
 		useEngine: true,
 	},
+	textAlign: {
+		value: [ 'typography', 'textAlign' ],
+		support: [ 'typography', 'textAlign' ],
+		useEngine: false,
+	},
 	textDecoration: {
 		value: [ 'typography', 'textDecoration' ],
 		support: [ 'typography', '__experimentalTextDecoration' ],
@@ -242,7 +272,7 @@ export const __EXPERIMENTAL_STYLE_PROPERTY = {
 };
 
 export const __EXPERIMENTAL_ELEMENTS = {
-	link: 'a',
+	link: 'a:where(:not(.wp-element-button))',
 	heading: 'h1, h2, h3, h4, h5, h6',
 	h1: 'h1',
 	h2: 'h2',
@@ -256,11 +286,14 @@ export const __EXPERIMENTAL_ELEMENTS = {
 	cite: 'cite',
 };
 
-export const __EXPERIMENTAL_PATHS_WITH_MERGE = {
+// These paths may have three origins, custom, theme, and default,
+// and are expected to override other origins with custom, theme,
+// and default priority.
+export const __EXPERIMENTAL_PATHS_WITH_OVERRIDE = {
 	'color.duotone': true,
 	'color.gradients': true,
 	'color.palette': true,
-	'typography.fontFamilies': true,
+	'dimensions.aspectRatios': true,
 	'typography.fontSizes': true,
 	'spacing.spacingSizes': true,
 };
diff --git a/packages/blocks/src/api/factory.js b/packages/blocks/src/api/factory.js
index 53333ef688085f..25bf64ca65dc90 100644
--- a/packages/blocks/src/api/factory.js
+++ b/packages/blocks/src/api/factory.js
@@ -402,6 +402,10 @@ export function getBlockTransforms( direction, blockTypeOrName ) {
 					return true;
 				}
 
+				if ( t.type === 'prefix' ) {
+					return true;
+				}
+
 				if ( ! t.blocks || ! t.blocks.length ) {
 					return false;
 				}
diff --git a/packages/blocks/src/api/index.js b/packages/blocks/src/api/index.js
index 2ddeb3a60f0abb..0b38b8e29e68a0 100644
--- a/packages/blocks/src/api/index.js
+++ b/packages/blocks/src/api/index.js
@@ -1,3 +1,9 @@
+/**
+ * Internal dependencies
+ */
+import { lock } from '../lock-unlock';
+import { isUnmodifiedBlockContent } from './utils';
+
 // The blocktype is the most important concept within the block API. It defines
 // all aspects of the block configuration and its interfaces, including `edit`
 // and `save`. The transforms specification allows converting one blocktype to
@@ -135,6 +141,10 @@ export {
 	unregisterBlockStyle,
 	registerBlockVariation,
 	unregisterBlockVariation,
+	registerBlockBindingsSource,
+	unregisterBlockBindingsSource,
+	getBlockBindingsSource,
+	getBlockBindingsSources,
 } from './registration';
 export {
 	isUnmodifiedBlock,
@@ -144,6 +154,7 @@ export {
 	getBlockLabel as __experimentalGetBlockLabel,
 	getAccessibleBlockLabel as __experimentalGetAccessibleBlockLabel,
 	__experimentalSanitizeBlockAttributes,
+	getBlockAttributesNamesByRole,
 	__experimentalGetBlockAttributesNamesByRole,
 } from './utils';
 
@@ -162,5 +173,8 @@ export { default as node } from './node';
 export {
 	__EXPERIMENTAL_STYLE_PROPERTY,
 	__EXPERIMENTAL_ELEMENTS,
-	__EXPERIMENTAL_PATHS_WITH_MERGE,
+	__EXPERIMENTAL_PATHS_WITH_OVERRIDE,
 } from './constants';
+
+export const privateApis = {};
+lock( privateApis, { isUnmodifiedBlockContent } );
diff --git a/packages/blocks/src/api/matchers.js b/packages/blocks/src/api/matchers.js
index 7a6ac84891658a..950f1539440a0b 100644
--- a/packages/blocks/src/api/matchers.js
+++ b/packages/blocks/src/api/matchers.js
@@ -3,6 +3,11 @@
  */
 export { attr, prop, text, query } from 'hpq';
 
+/**
+ * WordPress dependencies
+ */
+import { RichTextData } from '@wordpress/rich-text';
+
 /**
  * Internal dependencies
  */
@@ -41,3 +46,10 @@ export function html( selector, multilineTag ) {
 		return match.innerHTML;
 	};
 }
+
+export const richText = ( selector, preserveWhiteSpace ) => ( el ) => {
+	const target = selector ? el.querySelector( selector ) : el;
+	return target
+		? RichTextData.fromHTMLElement( target, { preserveWhiteSpace } )
+		: RichTextData.empty();
+};
diff --git a/packages/blocks/src/api/parser/convert-legacy-block.js b/packages/blocks/src/api/parser/convert-legacy-block.js
index c993d450099912..1ddec1d8b3448d 100644
--- a/packages/blocks/src/api/parser/convert-legacy-block.js
+++ b/packages/blocks/src/api/parser/convert-legacy-block.js
@@ -77,5 +77,91 @@ export function convertLegacyBlockNameAndAttributes( name, attributes ) {
 		newAttributes.legacy = true;
 	}
 
+	// Column count was stored as a string from WP 6.3-6.6. Convert it to a number.
+	if (
+		attributes.layout?.type === 'grid' &&
+		typeof attributes.layout?.columnCount === 'string'
+	) {
+		newAttributes.layout = {
+			...newAttributes.layout,
+			columnCount: parseInt( attributes.layout.columnCount, 10 ),
+		};
+	}
+
+	// Column span and row span were stored as strings in WP 6.6. Convert them to numbers.
+	if ( typeof attributes.style?.layout?.columnSpan === 'string' ) {
+		const columnSpanNumber = parseInt(
+			attributes.style.layout.columnSpan,
+			10
+		);
+		newAttributes.style = {
+			...newAttributes.style,
+			layout: {
+				...newAttributes.style.layout,
+				columnSpan: isNaN( columnSpanNumber )
+					? undefined
+					: columnSpanNumber,
+			},
+		};
+	}
+	if ( typeof attributes.style?.layout?.rowSpan === 'string' ) {
+		const rowSpanNumber = parseInt( attributes.style.layout.rowSpan, 10 );
+		newAttributes.style = {
+			...newAttributes.style,
+			layout: {
+				...newAttributes.style.layout,
+				rowSpan: isNaN( rowSpanNumber ) ? undefined : rowSpanNumber,
+			},
+		};
+	}
+
+	// The following code is only relevant for the Gutenberg plugin.
+	// It's a stand-alone if statement for dead-code elimination.
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+		// Convert pattern overrides added during experimental phase.
+		// Only four blocks were supported initially.
+		// These checks can be removed in WordPress 6.6.
+		if (
+			newAttributes.metadata?.bindings &&
+			( name === 'core/paragraph' ||
+				name === 'core/heading' ||
+				name === 'core/image' ||
+				name === 'core/button' ) &&
+			newAttributes.metadata.bindings.__default?.source !==
+				'core/pattern-overrides'
+		) {
+			const bindings = [
+				'content',
+				'url',
+				'title',
+				'id',
+				'alt',
+				'text',
+				'linkTarget',
+			];
+			// Delete any existing individual bindings and add a default binding.
+			// It was only possible to add all the default attributes through the UI,
+			// So as soon as we find an attribute, we can assume all default attributes are overridable.
+			let hasPatternOverrides = false;
+			bindings.forEach( ( binding ) => {
+				if (
+					newAttributes.metadata.bindings[ binding ]?.source ===
+					'core/pattern-overrides'
+				) {
+					hasPatternOverrides = true;
+					newAttributes.metadata = {
+						...newAttributes.metadata,
+						bindings: { ...newAttributes.metadata.bindings },
+					};
+					delete newAttributes.metadata.bindings[ binding ];
+				}
+			} );
+			if ( hasPatternOverrides ) {
+				newAttributes.metadata.bindings.__default = {
+					source: 'core/pattern-overrides',
+				};
+			}
+		}
+	}
 	return [ name, newAttributes ];
 }
diff --git a/packages/blocks/src/api/parser/fix-custom-classname.js b/packages/blocks/src/api/parser/fix-custom-classname.js
index d72065cd59222b..78f04ea4a00fa5 100644
--- a/packages/blocks/src/api/parser/fix-custom-classname.js
+++ b/packages/blocks/src/api/parser/fix-custom-classname.js
@@ -42,27 +42,30 @@ export function getHTMLRootElementClasses( innerHTML ) {
  * @return {Object} Filtered block attributes.
  */
 export function fixCustomClassname( blockAttributes, blockType, innerHTML ) {
-	if ( hasBlockSupport( blockType, 'customClassName', true ) ) {
-		// To determine difference, serialize block given the known set of
-		// attributes, with the exception of `className`. This will determine
-		// the default set of classes. From there, any difference in innerHTML
-		// can be considered as custom classes.
-		const { className: omittedClassName, ...attributesSansClassName } =
-			blockAttributes;
-		const serialized = getSaveContent( blockType, attributesSansClassName );
-		const defaultClasses = getHTMLRootElementClasses( serialized );
-		const actualClasses = getHTMLRootElementClasses( innerHTML );
+	if ( ! hasBlockSupport( blockType, 'customClassName', true ) ) {
+		return blockAttributes;
+	}
+
+	const modifiedBlockAttributes = { ...blockAttributes };
+	// To determine difference, serialize block given the known set of
+	// attributes, with the exception of `className`. This will determine
+	// the default set of classes. From there, any difference in innerHTML
+	// can be considered as custom classes.
+	const { className: omittedClassName, ...attributesSansClassName } =
+		modifiedBlockAttributes;
+	const serialized = getSaveContent( blockType, attributesSansClassName );
+	const defaultClasses = getHTMLRootElementClasses( serialized );
+	const actualClasses = getHTMLRootElementClasses( innerHTML );
 
-		const customClasses = actualClasses.filter(
-			( className ) => ! defaultClasses.includes( className )
-		);
+	const customClasses = actualClasses.filter(
+		( className ) => ! defaultClasses.includes( className )
+	);
 
-		if ( customClasses.length ) {
-			blockAttributes.className = customClasses.join( ' ' );
-		} else if ( serialized ) {
-			delete blockAttributes.className;
-		}
+	if ( customClasses.length ) {
+		modifiedBlockAttributes.className = customClasses.join( ' ' );
+	} else if ( serialized ) {
+		delete modifiedBlockAttributes.className;
 	}
 
-	return blockAttributes;
+	return modifiedBlockAttributes;
 }
diff --git a/packages/blocks/src/api/parser/get-block-attributes.js b/packages/blocks/src/api/parser/get-block-attributes.js
index cc81c108005529..36ea86399329e1 100644
--- a/packages/blocks/src/api/parser/get-block-attributes.js
+++ b/packages/blocks/src/api/parser/get-block-attributes.js
@@ -7,14 +7,23 @@ import memoize from 'memize';
 /**
  * WordPress dependencies
  */
-import { pipe } from '@wordpress/compose';
 import { applyFilters } from '@wordpress/hooks';
+import { RichTextData } from '@wordpress/rich-text';
 
 /**
  * Internal dependencies
  */
-import { attr, html, text, query, node, children, prop } from '../matchers';
-import { normalizeBlockType } from '../utils';
+import {
+	attr,
+	html,
+	text,
+	query,
+	node,
+	children,
+	prop,
+	richText,
+} from '../matchers';
+import { normalizeBlockType, getDefault } from '../utils';
 
 /**
  * Higher-order hpq matcher which enhances an attribute matcher to return true
@@ -27,24 +36,8 @@ import { normalizeBlockType } from '../utils';
  *
  * @return {Function} Enhanced hpq matcher.
  */
-export const toBooleanAttributeMatcher = ( matcher ) =>
-	pipe( [
-		matcher,
-		// Expected values from `attr( 'disabled' )`:
-		//
-		// <input>
-		// - Value:       `undefined`
-		// - Transformed: `false`
-		//
-		// <input disabled>
-		// - Value:       `''`
-		// - Transformed: `true`
-		//
-		// <input disabled="disabled">
-		// - Value:       `'disabled'`
-		// - Transformed: `true`
-		( value ) => value !== undefined,
-	] );
+export const toBooleanAttributeMatcher = ( matcher ) => ( value ) =>
+	matcher( value ) !== undefined;
 
 /**
  * Returns true if value is of the given JSON schema type, or false otherwise.
@@ -58,6 +51,9 @@ export const toBooleanAttributeMatcher = ( matcher ) =>
  */
 export function isOfType( value, type ) {
 	switch ( type ) {
+		case 'rich-text':
+			return value instanceof RichTextData;
+
 		case 'string':
 			return typeof value === 'string';
 
@@ -134,6 +130,7 @@ export function getBlockAttribute(
 		case 'property':
 		case 'html':
 		case 'text':
+		case 'rich-text':
 		case 'children':
 		case 'node':
 		case 'query':
@@ -152,7 +149,7 @@ export function getBlockAttribute(
 	}
 
 	if ( value === undefined ) {
-		value = attributeSchema.default;
+		value = getDefault( attributeSchema );
 	}
 
 	return value;
@@ -200,17 +197,22 @@ export function isValidByEnum( value, enumSet ) {
  */
 export const matcherFromSource = memoize( ( sourceConfig ) => {
 	switch ( sourceConfig.source ) {
-		case 'attribute':
+		case 'attribute': {
 			let matcher = attr( sourceConfig.selector, sourceConfig.attribute );
 			if ( sourceConfig.type === 'boolean' ) {
 				matcher = toBooleanAttributeMatcher( matcher );
 			}
-
 			return matcher;
+		}
 		case 'html':
 			return html( sourceConfig.selector, sourceConfig.multiline );
 		case 'text':
 			return text( sourceConfig.selector );
+		case 'rich-text':
+			return richText(
+				sourceConfig.selector,
+				sourceConfig.__unstablePreserveWhiteSpace
+			);
 		case 'children':
 			return children( sourceConfig.selector );
 		case 'node':
@@ -225,12 +227,10 @@ export const matcherFromSource = memoize( ( sourceConfig ) => {
 				)
 			);
 			return query( sourceConfig.selector, subMatchers );
-		case 'tag':
-			return pipe( [
-				prop( sourceConfig.selector, 'nodeName' ),
-				( nodeName ) =>
-					nodeName ? nodeName.toLowerCase() : undefined,
-			] );
+		case 'tag': {
+			const matcher = prop( sourceConfig.selector, 'nodeName' );
+			return ( domNode ) => matcher( domNode )?.toLowerCase();
+		}
 		default:
 			// eslint-disable-next-line no-console
 			console.error( `Unknown source type "${ sourceConfig.source }"` );
diff --git a/packages/blocks/src/api/parser/index.js b/packages/blocks/src/api/parser/index.js
index f8ff0c68964dc3..14a88f602987ab 100644
--- a/packages/blocks/src/api/parser/index.js
+++ b/packages/blocks/src/api/parser/index.js
@@ -178,7 +178,7 @@ function applyBlockValidation( unvalidatedBlock, blockType ) {
 	);
 	// Attempt to validate the block once again after the built-in fixes.
 	const [ isFixedValid, validationIssues ] = validateBlock(
-		unvalidatedBlock,
+		fixedBlock,
 		blockType
 	);
 
diff --git a/packages/blocks/src/api/parser/test/index.js b/packages/blocks/src/api/parser/test/index.js
index 85e51e9d0af025..42923a7d3eeb35 100644
--- a/packages/blocks/src/api/parser/test/index.js
+++ b/packages/blocks/src/api/parser/test/index.js
@@ -50,6 +50,38 @@ describe( 'block parser', () => {
 	} );
 
 	describe( 'parseRawBlock', () => {
+		it( 'should apply className block validation fixes', () => {
+			registerBlockType( 'core/test-block', {
+				...defaultBlockSettings,
+				attributes: {
+					fruit: {
+						type: 'string',
+						source: 'text',
+						selector: 'div',
+					},
+				},
+				save: ( { attributes } ) => (
+					// eslint-disable-next-line react/no-unknown-property
+					<div class={ attributes.className }>
+						{ attributes.fruit }
+					</div>
+				),
+			} );
+
+			const block = parseRawBlock( {
+				blockName: 'core/test-block',
+				innerHTML:
+					'<div class="custom-class another-custom-class">Bananas</div>',
+				attrs: { fruit: 'Bananas' },
+			} );
+
+			expect( block.name ).toEqual( 'core/test-block' );
+			expect( block.attributes ).toEqual( {
+				fruit: 'Bananas',
+				className: 'custom-class another-custom-class',
+			} );
+		} );
+
 		it( 'should create the requested block if it exists', () => {
 			registerBlockType( 'core/test-block', defaultBlockSettings );
 
diff --git a/packages/blocks/src/api/raw-handling/blockquote-normaliser.js b/packages/blocks/src/api/raw-handling/blockquote-normaliser.js
index 2b4f65009f31ea..e8967a79c73f89 100644
--- a/packages/blocks/src/api/raw-handling/blockquote-normaliser.js
+++ b/packages/blocks/src/api/raw-handling/blockquote-normaliser.js
@@ -3,10 +3,12 @@
  */
 import normaliseBlocks from './normalise-blocks';
 
-export default function blockquoteNormaliser( node ) {
-	if ( node.nodeName !== 'BLOCKQUOTE' ) {
-		return;
-	}
+export default function blockquoteNormaliser( options ) {
+	return ( node ) => {
+		if ( node.nodeName !== 'BLOCKQUOTE' ) {
+			return;
+		}
 
-	node.innerHTML = normaliseBlocks( node.innerHTML );
+		node.innerHTML = normaliseBlocks( node.innerHTML, options );
+	};
 }
diff --git a/packages/blocks/src/api/raw-handling/figure-content-reducer.js b/packages/blocks/src/api/raw-handling/figure-content-reducer.js
index 4dfb24f2c97816..4c8c1a8dd736bb 100644
--- a/packages/blocks/src/api/raw-handling/figure-content-reducer.js
+++ b/packages/blocks/src/api/raw-handling/figure-content-reducer.js
@@ -95,7 +95,7 @@ export default function figureContentReducer( node, doc, schema ) {
 		) {
 			wrapFigureContent( nodeToInsert, wrapper );
 		}
-	} else if ( nodeToInsert.parentNode.nodeName === 'BODY' ) {
+	} else {
 		wrapFigureContent( nodeToInsert );
 	}
 }
diff --git a/packages/blocks/src/api/raw-handling/html-to-blocks.js b/packages/blocks/src/api/raw-handling/html-to-blocks.js
index 1ee2bdc263126f..4944c54d6bf83d 100644
--- a/packages/blocks/src/api/raw-handling/html-to-blocks.js
+++ b/packages/blocks/src/api/raw-handling/html-to-blocks.js
@@ -51,7 +51,11 @@ export function htmlToBlocks( html, handler ) {
 		const { transform, blockName } = rawTransform;
 
 		if ( transform ) {
-			return transform( node, handler );
+			const block = transform( node, handler );
+			if ( node.hasAttribute( 'class' ) ) {
+				block.attributes.className = node.getAttribute( 'class' );
+			}
+			return block;
 		}
 
 		return createBlock(
diff --git a/packages/blocks/src/api/raw-handling/image-corrector.native.js b/packages/blocks/src/api/raw-handling/image-corrector.native.js
index 10974e5dc10bdc..550c2e0e6e1537 100644
--- a/packages/blocks/src/api/raw-handling/image-corrector.native.js
+++ b/packages/blocks/src/api/raw-handling/image-corrector.native.js
@@ -10,6 +10,13 @@ export default function imageCorrector( node ) {
 		return;
 	}
 
+	// For local files makes sure the path doesn't end with an invalid extension.
+	// This scenario often happens with content from MS Word and similar text apps.
+	// We still need to support local files pasted from the users Media library.
+	if ( node.src.startsWith( 'file:' ) && node.src.slice( -1 ) === '/' ) {
+		node.setAttribute( 'src', '' );
+	}
+
 	// Remove trackers and hardly visible images.
 	if ( node.height === 1 || node.width === 1 ) {
 		node.parentNode.removeChild( node );
diff --git a/packages/blocks/src/api/raw-handling/index.js b/packages/blocks/src/api/raw-handling/index.js
index afd68a4a9e1e7b..2d1094023ada1d 100644
--- a/packages/blocks/src/api/raw-handling/index.js
+++ b/packages/blocks/src/api/raw-handling/index.js
@@ -38,7 +38,13 @@ export function deprecatedGetPhrasingContentSchema( context ) {
 export function rawHandler( { HTML = '' } ) {
 	// If we detect block delimiters, parse entirely as blocks.
 	if ( HTML.indexOf( '<!-- wp:' ) !== -1 ) {
-		return parse( HTML );
+		const parseResult = parse( HTML );
+		const isSingleFreeFormBlock =
+			parseResult.length === 1 &&
+			parseResult[ 0 ].name === 'core/freeform';
+		if ( ! isSingleFreeFormBlock ) {
+			return parseResult;
+		}
 	}
 
 	// An array of HTML strings and block objects. The blocks replace matched
@@ -65,11 +71,11 @@ export function rawHandler( { HTML = '' } ) {
 				figureContentReducer,
 				// Needed to create the quote block, which cannot handle text
 				// without wrapper paragraphs.
-				blockquoteNormaliser,
+				blockquoteNormaliser( { raw: true } ),
 			];
 
 			piece = deepFilterHTML( piece, filters, blockContentSchema );
-			piece = normaliseBlocks( piece );
+			piece = normaliseBlocks( piece, { raw: true } );
 
 			return htmlToBlocks( piece, rawHandler );
 		} )
diff --git a/packages/blocks/src/api/raw-handling/list-reducer.js b/packages/blocks/src/api/raw-handling/list-reducer.js
index b7fce3d805b83e..f771a8215636bd 100644
--- a/packages/blocks/src/api/raw-handling/list-reducer.js
+++ b/packages/blocks/src/api/raw-handling/list-reducer.js
@@ -53,9 +53,6 @@ export default function listReducer( node ) {
 		if ( prevListItem ) {
 			prevListItem.appendChild( list );
 			parentList.removeChild( parentListItem );
-		} else {
-			parentList.parentNode.insertBefore( list, parentList );
-			parentList.parentNode.removeChild( parentList );
 		}
 	}
 
diff --git a/packages/blocks/src/api/raw-handling/ms-list-ignore.js b/packages/blocks/src/api/raw-handling/ms-list-ignore.js
index d1ed421e3b76c5..88a940337130ba 100644
--- a/packages/blocks/src/api/raw-handling/ms-list-ignore.js
+++ b/packages/blocks/src/api/raw-handling/ms-list-ignore.js
@@ -17,7 +17,10 @@ export default function msListIgnore( node ) {
 
 	const rules = style.split( ';' ).reduce( ( acc, rule ) => {
 		const [ key, value ] = rule.split( ':' );
-		acc[ key.trim().toLowerCase() ] = value.trim().toLowerCase();
+
+		if ( key && value ) {
+			acc[ key.trim().toLowerCase() ] = value.trim().toLowerCase();
+		}
 		return acc;
 	}, {} );
 
diff --git a/packages/blocks/src/api/raw-handling/normalise-blocks.js b/packages/blocks/src/api/raw-handling/normalise-blocks.js
index f469b7000aa7f9..a0e8a76fed737c 100644
--- a/packages/blocks/src/api/raw-handling/normalise-blocks.js
+++ b/packages/blocks/src/api/raw-handling/normalise-blocks.js
@@ -3,7 +3,7 @@
  */
 import { isEmpty, isPhrasingContent } from '@wordpress/dom';
 
-export default function normaliseBlocks( HTML ) {
+export default function normaliseBlocks( HTML, options = {} ) {
 	const decuDoc = document.implementation.createHTMLDocument( '' );
 	const accuDoc = document.implementation.createHTMLDocument( '' );
 
@@ -47,7 +47,7 @@ export default function normaliseBlocks( HTML ) {
 				}
 			} else if ( node.nodeName === 'P' ) {
 				// Only append non-empty paragraph nodes.
-				if ( isEmpty( node ) ) {
+				if ( isEmpty( node ) && ! options.raw ) {
 					decu.removeChild( node );
 				} else {
 					accu.appendChild( node );
diff --git a/packages/blocks/src/api/raw-handling/paste-handler.js b/packages/blocks/src/api/raw-handling/paste-handler.js
index d0bf3e05979c63..002ed7aec0c188 100644
--- a/packages/blocks/src/api/raw-handling/paste-handler.js
+++ b/packages/blocks/src/api/raw-handling/paste-handler.js
@@ -100,12 +100,17 @@ export function pasteHandler( {
 		const content = HTML ? HTML : plainText;
 
 		if ( content.indexOf( '<!-- wp:' ) !== -1 ) {
-			return parse( content );
+			const parseResult = parse( content );
+			const isSingleFreeFormBlock =
+				parseResult.length === 1 &&
+				parseResult[ 0 ].name === 'core/freeform';
+			if ( ! isSingleFreeFormBlock ) {
+				return parseResult;
+			}
 		}
 	}
 
 	// Normalize unicode to use composed characters.
-	// This is unsupported in IE 11 but it's a nice-to-have feature, not mandatory.
 	// Not normalizing the content will only affect older browsers and won't
 	// entirely break the app.
 	// See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize
@@ -191,7 +196,7 @@ export function pasteHandler( {
 				commentRemover,
 				iframeRemover,
 				figureContentReducer,
-				blockquoteNormaliser,
+				blockquoteNormaliser(),
 				divNormaliser,
 			];
 
diff --git a/packages/blocks/src/api/raw-handling/shortcode-converter.js b/packages/blocks/src/api/raw-handling/shortcode-converter.js
index 3434717553a985..ed81dfabb43091 100644
--- a/packages/blocks/src/api/raw-handling/shortcode-converter.js
+++ b/packages/blocks/src/api/raw-handling/shortcode-converter.js
@@ -14,6 +14,9 @@ import { applyBuiltInValidationFixes } from '../parser/apply-built-in-validation
 const castArray = ( maybeArray ) =>
 	Array.isArray( maybeArray ) ? maybeArray : [ maybeArray ];
 
+const beforeLineRegexp = /(\n|<p>)\s*$/;
+const afterLineRegexp = /^\s*(\n|<\/p>)/;
+
 function segmentHTMLToShortcodeBlock(
 	HTML,
 	lastIndex = 0,
@@ -56,8 +59,8 @@ function segmentHTMLToShortcodeBlock(
 		if (
 			! match.shortcode.content?.includes( '<' ) &&
 			! (
-				/(\n|<p>)\s*$/.test( beforeHTML ) &&
-				/^\s*(\n|<\/p>)/.test( afterHTML )
+				beforeLineRegexp.test( beforeHTML ) &&
+				afterLineRegexp.test( afterHTML )
 			)
 		) {
 			return segmentHTMLToShortcodeBlock( HTML, lastIndex );
@@ -143,9 +146,13 @@ function segmentHTMLToShortcodeBlock(
 		}
 
 		return [
-			...segmentHTMLToShortcodeBlock( beforeHTML ),
+			...segmentHTMLToShortcodeBlock(
+				beforeHTML.replace( beforeLineRegexp, '' )
+			),
 			...blocks,
-			...segmentHTMLToShortcodeBlock( afterHTML ),
+			...segmentHTMLToShortcodeBlock(
+				afterHTML.replace( afterLineRegexp, '' )
+			),
 		];
 	}
 
diff --git a/packages/blocks/src/api/raw-handling/special-comment-converter.js b/packages/blocks/src/api/raw-handling/special-comment-converter.js
index 5561a974cb2f20..e0f845d300d6c7 100644
--- a/packages/blocks/src/api/raw-handling/special-comment-converter.js
+++ b/packages/blocks/src/api/raw-handling/special-comment-converter.js
@@ -23,58 +23,22 @@ export default function specialCommentConverter( node, doc ) {
 		return;
 	}
 
-	if ( node.nodeValue === 'nextpage' ) {
-		replace( node, createNextpage( doc ) );
+	if (
+		node.nodeValue !== 'nextpage' &&
+		node.nodeValue.indexOf( 'more' ) !== 0
+	) {
 		return;
 	}
 
-	if ( node.nodeValue.indexOf( 'more' ) === 0 ) {
-		moreCommentConverter( node, doc );
-	}
-}
-
-/**
- * Convert `<!--more-->` as well as the `<!--more Some text-->` variant
- * and its `<!--noteaser-->` companion into the custom element
- * described in `specialCommentConverter()`.
- *
- * @param {Node}     node The node to be processed.
- * @param {Document} doc  The document of the node.
- * @return {void}
- */
-function moreCommentConverter( node, doc ) {
-	// Grab any custom text in the comment.
-	const customText = node.nodeValue.slice( 4 ).trim();
-
-	/*
-	 * When a `<!--more-->` comment is found, we need to look for any
-	 * `<!--noteaser-->` sibling, but it may not be a direct sibling
-	 * (whitespace typically lies in between)
-	 */
-	let sibling = node;
-	let noTeaser = false;
-	while ( ( sibling = sibling.nextSibling ) ) {
-		if (
-			sibling.nodeType === sibling.COMMENT_NODE &&
-			sibling.nodeValue === 'noteaser'
-		) {
-			noTeaser = true;
-			remove( sibling );
-			break;
-		}
-	}
-
-	const moreBlock = createMore( customText, noTeaser, doc );
+	const block = createBlock( node, doc );
 
 	// If our `<!--more-->` comment is in the middle of a paragraph, we should
-	// split the paragraph in two and insert the more block in between. If not,
-	// the more block will eventually end up being inserted after the paragraph.
-	if (
-		! node.parentNode ||
-		node.parentNode.nodeName !== 'P' ||
-		node.parentNode.childNodes.length === 1
-	) {
-		replace( node, moreBlock );
+	// split the paragraph in two and insert the more block in between. If it's
+	// inside an empty paragraph, we should still move it out of the paragraph
+	// and remove the paragraph. If there's no paragraph, fall back to simply
+	// replacing the comment.
+	if ( ! node.parentNode || node.parentNode.nodeName !== 'P' ) {
+		replace( node, block );
 	} else {
 		const childNodes = Array.from( node.parentNode.childNodes );
 		const nodeIndex = childNodes.indexOf( node );
@@ -93,7 +57,7 @@ function moreCommentConverter( node, doc ) {
 		// Split the original parent node and insert our more block
 		[
 			childNodes.slice( 0, nodeIndex ).reduce( paragraphBuilder, null ),
-			moreBlock,
+			block,
 			childNodes.slice( nodeIndex + 1 ).reduce( paragraphBuilder, null ),
 		].forEach(
 			( element ) =>
@@ -105,6 +69,35 @@ function moreCommentConverter( node, doc ) {
 	}
 }
 
+function createBlock( commentNode, doc ) {
+	if ( commentNode.nodeValue === 'nextpage' ) {
+		return createNextpage( doc );
+	}
+
+	// Grab any custom text in the comment.
+	const customText = commentNode.nodeValue.slice( 4 ).trim();
+
+	/*
+	 * When a `<!--more-->` comment is found, we need to look for any
+	 * `<!--noteaser-->` sibling, but it may not be a direct sibling
+	 * (whitespace typically lies in between)
+	 */
+	let sibling = commentNode;
+	let noTeaser = false;
+	while ( ( sibling = sibling.nextSibling ) ) {
+		if (
+			sibling.nodeType === sibling.COMMENT_NODE &&
+			sibling.nodeValue === 'noteaser'
+		) {
+			noTeaser = true;
+			remove( sibling );
+			break;
+		}
+	}
+
+	return createMore( customText, noTeaser, doc );
+}
+
 function createMore( customText, noTeaser, doc ) {
 	const node = doc.createElement( 'wp-block' );
 	node.dataset.block = 'core/more';
diff --git a/packages/blocks/src/api/raw-handling/test/blockquote-normaliser.js b/packages/blocks/src/api/raw-handling/test/blockquote-normaliser.js
index f7ac96a95b94f6..c44164e890d8ca 100644
--- a/packages/blocks/src/api/raw-handling/test/blockquote-normaliser.js
+++ b/packages/blocks/src/api/raw-handling/test/blockquote-normaliser.js
@@ -8,7 +8,7 @@ describe( 'blockquoteNormaliser', () => {
 	it( 'should normalise blockquote', () => {
 		const input = '<blockquote>test</blockquote>';
 		const output = '<blockquote><p>test</p></blockquote>';
-		expect( deepFilterHTML( input, [ blockquoteNormaliser ] ) ).toEqual(
+		expect( deepFilterHTML( input, [ blockquoteNormaliser() ] ) ).toEqual(
 			output
 		);
 	} );
diff --git a/packages/blocks/src/api/raw-handling/test/list-reducer.js b/packages/blocks/src/api/raw-handling/test/list-reducer.js
index cb89e5c45e6a48..5c1692dd5ebf33 100644
--- a/packages/blocks/src/api/raw-handling/test/list-reducer.js
+++ b/packages/blocks/src/api/raw-handling/test/list-reducer.js
@@ -41,12 +41,6 @@ describe( 'listReducer', () => {
 		expect( deepFilterHTML( input, [ listReducer ] ) ).toEqual( output );
 	} );
 
-	it( 'should remove empty list wrappers', () => {
-		const input = '<ul><li>\n<ul><li>test</li></ul>\n</li></ul>';
-		const output = '<ul><li>test</li></ul>';
-		expect( deepFilterHTML( input, [ listReducer ] ) ).toEqual( output );
-	} );
-
 	it( 'should not remove filled list wrappers', () => {
 		const input = '<ul><li>\ntest\n<ul><li>test</li></ul>\n</li></ul>';
 		expect( deepFilterHTML( input, [ listReducer ] ) ).toEqual( input );
diff --git a/packages/blocks/src/api/raw-handling/test/paste-handler.js b/packages/blocks/src/api/raw-handling/test/paste-handler.js
index 6938ad0d9c4081..40a28f3c35a33f 100644
--- a/packages/blocks/src/api/raw-handling/test/paste-handler.js
+++ b/packages/blocks/src/api/raw-handling/test/paste-handler.js
@@ -6,6 +6,7 @@ import { pasteHandler } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { init as initAndRegisterTableBlock } from '../../../../../block-library/src/table';
+import { init as initAndRegisterVideoBlock } from '../../../../../block-library/src/video';
 
 const tableWithHeaderFooterAndBodyUsingColspan = `
 <table>
@@ -63,6 +64,7 @@ const tableWithHeaderFooterAndBodyUsingRowspan = `
 describe( 'pasteHandler', () => {
 	beforeAll( () => {
 		initAndRegisterTableBlock();
+		initAndRegisterVideoBlock();
 	} );
 
 	it( 'can handle a table with thead, tbody and tfoot using colspan', () => {
@@ -73,9 +75,9 @@ describe( 'pasteHandler', () => {
 
 		expect( console ).toHaveLogged();
 
+		delete result.attributes.caption;
 		expect( result.attributes ).toEqual( {
-			hasFixedLayout: false,
-			caption: '',
+			hasFixedLayout: true,
 			head: [
 				{
 					cells: [
@@ -113,9 +115,9 @@ describe( 'pasteHandler', () => {
 
 		expect( console ).toHaveLogged();
 
+		delete result.attributes.caption;
 		expect( result.attributes ).toEqual( {
-			hasFixedLayout: false,
-			caption: '',
+			hasFixedLayout: true,
 			head: [
 				{
 					cells: [
@@ -153,4 +155,29 @@ describe( 'pasteHandler', () => {
 		expect( result.name ).toEqual( 'core/table' );
 		expect( result.isValid ).toBeTruthy();
 	} );
+
+	it( 'can handle a video', () => {
+		const [ result ] = pasteHandler( {
+			HTML: '<video controls src="https://example.com/media.mp4" autoplay loop muted controls playsinline preload="auto" poster="https://example.com/media.jpg"></video>',
+			tagName: 'p',
+			preserveWhiteSpace: false,
+		} );
+
+		expect( console ).toHaveLogged();
+
+		delete result.attributes.caption;
+		expect( result.attributes ).toEqual( {
+			autoplay: true,
+			loop: true,
+			muted: true,
+			controls: true,
+			playsInline: true,
+			preload: 'auto',
+			poster: 'https://example.com/media.jpg',
+			src: 'https://example.com/media.mp4',
+			tracks: [],
+		} );
+		expect( result.name ).toEqual( 'core/video' );
+		expect( result.isValid ).toBeTruthy();
+	} );
 } );
diff --git a/packages/blocks/src/api/raw-handling/test/special-comment-converter.js b/packages/blocks/src/api/raw-handling/test/special-comment-converter.js
index 602990788cab02..22c9a5815fb44c 100644
--- a/packages/blocks/src/api/raw-handling/test/special-comment-converter.js
+++ b/packages/blocks/src/api/raw-handling/test/special-comment-converter.js
@@ -8,14 +8,14 @@ describe( 'specialCommentConverter', () => {
 	it( 'should convert a single "more" comment into a basic block', () => {
 		expect(
 			deepFilterHTML( '<p><!--more--></p>', [ specialCommentConverter ] )
-		).toEqual( '<p></p><wp-block data-block="core/more"></wp-block>' );
+		).toEqual( '<wp-block data-block="core/more"></wp-block>' );
 	} );
 	it( 'should convert a single "nextpage" comment into a basic block', () => {
 		expect(
 			deepFilterHTML( '<p><!--nextpage--></p>', [
 				specialCommentConverter,
 			] )
-		).toEqual( '<p></p><wp-block data-block="core/nextpage"></wp-block>' );
+		).toEqual( '<wp-block data-block="core/nextpage"></wp-block>' );
 	} );
 	it( 'should convert two comments into a block', () => {
 		expect(
@@ -23,7 +23,7 @@ describe( 'specialCommentConverter', () => {
 				specialCommentConverter,
 			] )
 		).toEqual(
-			'<p></p><wp-block data-block="core/more" data-no-teaser=""></wp-block>'
+			'<wp-block data-block="core/more" data-no-teaser=""></wp-block>'
 		);
 	} );
 	it( 'should pass custom text to the block', () => {
@@ -33,7 +33,7 @@ describe( 'specialCommentConverter', () => {
 				[ specialCommentConverter ]
 			)
 		).toEqual(
-			'<p></p><wp-block data-block="core/more" data-custom-text="Read all about it!" data-no-teaser=""></wp-block>'
+			'<wp-block data-block="core/more" data-custom-text="Read all about it!" data-no-teaser=""></wp-block>'
 		);
 	} );
 	it( 'should not break content order', () => {
@@ -95,7 +95,7 @@ describe( 'specialCommentConverter', () => {
 				[ specialCommentConverter ]
 			);
 			expect( output ).toEqual(
-				'<p></p><wp-block data-block="core/more" data-no-teaser=""></wp-block>'
+				'<wp-block data-block="core/more" data-no-teaser=""></wp-block>'
 			);
 		} );
 		it( 'should not break content order', () => {
@@ -108,7 +108,7 @@ describe( 'specialCommentConverter', () => {
 			);
 			expect( output ).toEqual(
 				`<p>First paragraph.</p>
-				<p></p><wp-block data-block=\"core/more\"></wp-block>
+				<wp-block data-block=\"core/more\"></wp-block>
 				<p>Second paragraph</p>
 				<p>Third paragraph</p>`
 			);
@@ -124,9 +124,9 @@ describe( 'specialCommentConverter', () => {
 			);
 			expect( output ).toEqual(
 				`<p>First page.</p>
-				<p></p><wp-block data-block=\"core/nextpage\"></wp-block>
+				<wp-block data-block=\"core/nextpage\"></wp-block>
 				<p>Second page</p>
-				<p></p><wp-block data-block=\"core/nextpage\"></wp-block>
+				<wp-block data-block=\"core/nextpage\"></wp-block>
 				<p>Third page</p>`
 			);
 		} );
diff --git a/packages/blocks/src/api/registration.js b/packages/blocks/src/api/registration.js
index b1dbee47b9b7cb..2f4bab2b5f2589 100644
--- a/packages/blocks/src/api/registration.js
+++ b/packages/blocks/src/api/registration.js
@@ -1,10 +1,9 @@
-/* eslint no-console: [ 'error', { allow: [ 'error', 'warn' ] } ] */
-
 /**
  * WordPress dependencies
  */
 import { select, dispatch } from '@wordpress/data';
 import { _x } from '@wordpress/i18n';
+import warning from '@wordpress/warning';
 
 /**
  * Internal dependencies
@@ -131,6 +130,10 @@ function isObject( object ) {
 /**
  * Sets the server side block definition of blocks.
  *
+ * Ignored from documentation due to being marked as unstable.
+ *
+ * @ignore
+ *
  * @param {Object} definitions Server-side block definitions
  */
 // eslint-disable-next-line camelcase
@@ -142,7 +145,7 @@ export function unstable__bootstrapServerSideBlockDefinitions( definitions ) {
 }
 
 /**
- * Gets block settings from metadata loaded from `block.json` file.
+ * Gets block settings from metadata loaded from `block.json` file
  *
  * @param {Object} metadata            Block metadata loaded from `block.json`.
  * @param {string} metadata.textdomain Textdomain to use with translations.
@@ -168,6 +171,7 @@ function getBlockSettingsFromMetadata( { textdomain, ...metadata } ) {
 		'example',
 		'variations',
 		'blockHooks',
+		'allowedBlocks',
 	];
 
 	const settings = Object.fromEntries(
@@ -224,18 +228,18 @@ export function registerBlockType( blockNameOrMetadata, settings ) {
 		: blockNameOrMetadata;
 
 	if ( typeof name !== 'string' ) {
-		console.error( 'Block names must be strings.' );
+		warning( 'Block names must be strings.' );
 		return;
 	}
 
 	if ( ! /^[a-z][a-z0-9-]*\/[a-z][a-z0-9-]*$/.test( name ) ) {
-		console.error(
+		warning(
 			'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
 		);
 		return;
 	}
 	if ( select( blocksStore ).getBlockType( name ) ) {
-		console.error( 'Block "' + name + '" is already registered.' );
+		warning( 'Block "' + name + '" is already registered.' );
 		return;
 	}
 
@@ -380,7 +384,7 @@ export function unregisterBlockCollection( namespace ) {
 export function unregisterBlockType( name ) {
 	const oldBlock = select( blocksStore ).getBlockType( name );
 	if ( ! oldBlock ) {
-		console.error( 'Block "' + name + '" is not registered.' );
+		warning( 'Block "' + name + '" is not registered.' );
 		return;
 	}
 	dispatch( blocksStore ).removeBlockTypes( name );
@@ -610,13 +614,13 @@ export const hasChildBlocksWithInserterSupport = ( blockName ) => {
 };
 
 /**
- * Registers a new block style for the given block.
+ * Registers a new block style for the given block types.
  *
  * For more information on connecting the styles with CSS
  * [the official documentation](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-styles/#styles).
  *
- * @param {string} blockName      Name of block (example: “core/latest-posts”).
- * @param {Object} styleVariation Object containing `name` which is the class name applied to the block and `label` which identifies the variation to the user.
+ * @param {string|Array} blockNames     Name of blocks e.g. “core/latest-posts” or `["core/group", "core/columns"]`.
+ * @param {Object}       styleVariation Object containing `name` which is the class name applied to the block and `label` which identifies the variation to the user.
  *
  * @example
  * ```js
@@ -641,8 +645,8 @@ export const hasChildBlocksWithInserterSupport = ( blockName ) => {
  * };
  * ```
  */
-export const registerBlockStyle = ( blockName, styleVariation ) => {
-	dispatch( blocksStore ).addBlockStyles( blockName, styleVariation );
+export const registerBlockStyle = ( blockNames, styleVariation ) => {
+	dispatch( blocksStore ).addBlockStyles( blockNames, styleVariation );
 };
 
 /**
@@ -722,6 +726,10 @@ export const getBlockVariations = ( blockName, scope ) => {
  * ```
  */
 export const registerBlockVariation = ( blockName, variation ) => {
+	if ( typeof variation.name !== 'string' ) {
+		warning( 'Variation names must be unique strings.' );
+	}
+
 	dispatch( blocksStore ).addBlockVariations( blockName, variation );
 };
 
@@ -753,3 +761,191 @@ export const registerBlockVariation = ( blockName, variation ) => {
 export const unregisterBlockVariation = ( blockName, variationName ) => {
 	dispatch( blocksStore ).removeBlockVariations( blockName, variationName );
 };
+
+/**
+ * Registers a new block bindings source with an object defining its
+ * behavior. Once registered, the source is available to be connected
+ * to the supported block attributes.
+ *
+ * @since 6.7.0 Introduced in WordPress core.
+ *
+ * @param {Object}   source                    Properties of the source to be registered.
+ * @param {string}   source.name               The unique and machine-readable name.
+ * @param {string}   [source.label]            Human-readable label. Optional when it is defined in the server.
+ * @param {Array}    [source.usesContext]      Optional array of context needed by the source only in the editor.
+ * @param {Function} [source.getValues]        Optional function to get the values from the source.
+ * @param {Function} [source.setValues]        Optional function to update multiple values connected to the source.
+ * @param {Function} [source.canUserEditValue] Optional function to determine if the user can edit the value.
+ *
+ * @example
+ * ```js
+ * import { _x } from '@wordpress/i18n';
+ * import { registerBlockBindingsSource } from '@wordpress/blocks'
+ *
+ * registerBlockBindingsSource( {
+ *     name: 'plugin/my-custom-source',
+ *     label: _x( 'My Custom Source', 'block bindings source' ),
+ *     usesContext: [ 'postType' ],
+ *     getValues: getSourceValues,
+ *     setValues: updateMyCustomValuesInBatch,
+ *     canUserEditValue: () => true,
+ * } );
+ * ```
+ */
+export const registerBlockBindingsSource = ( source ) => {
+	const {
+		name,
+		label,
+		usesContext,
+		getValues,
+		setValues,
+		canUserEditValue,
+		getFieldsList,
+	} = source;
+
+	const existingSource = unlock(
+		select( blocksStore )
+	).getBlockBindingsSource( name );
+
+	/*
+	 * Check if the source has been already registered on the client.
+	 * If any property expected to be "client-only" is defined, return a warning.
+	 */
+	const serverProps = [ 'label', 'usesContext' ];
+	for ( const prop in existingSource ) {
+		if ( ! serverProps.includes( prop ) && existingSource[ prop ] ) {
+			warning(
+				'Block bindings source "' + name + '" is already registered.'
+			);
+			return;
+		}
+	}
+
+	// Check the `name` property is correct.
+	if ( ! name ) {
+		warning( 'Block bindings source must contain a name.' );
+		return;
+	}
+
+	if ( typeof name !== 'string' ) {
+		warning( 'Block bindings source name must be a string.' );
+		return;
+	}
+
+	if ( /[A-Z]+/.test( name ) ) {
+		warning(
+			'Block bindings source name must not contain uppercase characters.'
+		);
+		return;
+	}
+
+	if ( ! /^[a-z0-9/-]+$/.test( name ) ) {
+		warning(
+			'Block bindings source name must contain only valid characters: lowercase characters, hyphens, or digits. Example: my-plugin/my-custom-source.'
+		);
+		return;
+	}
+
+	if ( ! /^[a-z0-9-]+\/[a-z0-9-]+$/.test( name ) ) {
+		warning(
+			'Block bindings source name must contain a namespace and valid characters. Example: my-plugin/my-custom-source.'
+		);
+		return;
+	}
+
+	// Check the `label` property is correct.
+
+	if ( ! label && ! existingSource?.label ) {
+		warning( 'Block bindings source must contain a label.' );
+		return;
+	}
+
+	if ( label && typeof label !== 'string' ) {
+		warning( 'Block bindings source label must be a string.' );
+		return;
+	}
+
+	if ( label && existingSource?.label && label !== existingSource?.label ) {
+		warning( 'Block bindings "' + name + '" source label was overriden.' );
+	}
+
+	// Check the `usesContext` property is correct.
+	if ( usesContext && ! Array.isArray( usesContext ) ) {
+		warning( 'Block bindings source usesContext must be an array.' );
+		return;
+	}
+
+	// Check the `getValues` property is correct.
+	if ( getValues && typeof getValues !== 'function' ) {
+		warning( 'Block bindings source getValues must be a function.' );
+		return;
+	}
+
+	// Check the `setValues` property is correct.
+	if ( setValues && typeof setValues !== 'function' ) {
+		warning( 'Block bindings source setValues must be a function.' );
+		return;
+	}
+
+	// Check the `canUserEditValue` property is correct.
+	if ( canUserEditValue && typeof canUserEditValue !== 'function' ) {
+		warning( 'Block bindings source canUserEditValue must be a function.' );
+		return;
+	}
+
+	// Check the `getFieldsList` property is correct.
+	if ( getFieldsList && typeof getFieldsList !== 'function' ) {
+		// eslint-disable-next-line no-console
+		warning( 'Block bindings source getFieldsList must be a function.' );
+		return;
+	}
+
+	return unlock( dispatch( blocksStore ) ).addBlockBindingsSource( source );
+};
+
+/**
+ * Unregisters a block bindings source by providing its name.
+ *
+ * @since 6.7.0 Introduced in WordPress core.
+ *
+ * @param {string} name The name of the block bindings source to unregister.
+ *
+ * @example
+ * ```js
+ * import { unregisterBlockBindingsSource } from '@wordpress/blocks';
+ *
+ * unregisterBlockBindingsSource( 'plugin/my-custom-source' );
+ * ```
+ */
+export function unregisterBlockBindingsSource( name ) {
+	const oldSource = getBlockBindingsSource( name );
+	if ( ! oldSource ) {
+		warning( 'Block bindings source "' + name + '" is not registered.' );
+		return;
+	}
+	unlock( dispatch( blocksStore ) ).removeBlockBindingsSource( name );
+}
+
+/**
+ * Returns a registered block bindings source by its name.
+ *
+ * @since 6.7.0 Introduced in WordPress core.
+ *
+ * @param {string} name Block bindings source name.
+ *
+ * @return {?Object} Block bindings source.
+ */
+export function getBlockBindingsSource( name ) {
+	return unlock( select( blocksStore ) ).getBlockBindingsSource( name );
+}
+
+/**
+ * Returns all registered block bindings sources.
+ *
+ * @since 6.7.0 Introduced in WordPress core.
+ *
+ * @return {Array} Block bindings sources.
+ */
+export function getBlockBindingsSources() {
+	return unlock( select( blocksStore ) ).getAllBlockBindingsSources();
+}
diff --git a/packages/blocks/src/api/serializer.js b/packages/blocks/src/api/serializer.js
index 5883f47536431d..f1fb28e9d9a361 100644
--- a/packages/blocks/src/api/serializer.js
+++ b/packages/blocks/src/api/serializer.js
@@ -10,6 +10,7 @@ import {
 import { hasFilter, applyFilters } from '@wordpress/hooks';
 import isShallowEqual from '@wordpress/is-shallow-equal';
 import { removep } from '@wordpress/autop';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -128,7 +129,9 @@ export function getSaveElement(
 ) {
 	const blockType = normalizeBlockType( blockTypeOrName );
 
-	if ( ! blockType?.save ) return null;
+	if ( ! blockType?.save ) {
+		return null;
+	}
 
 	let { save } = blockType;
 
@@ -235,6 +238,21 @@ export function getCommentAttributes( blockType, attributes ) {
 				return accumulator;
 			}
 
+			// Ignore all local attributes
+			if ( attributeSchema.role === 'local' ) {
+				return accumulator;
+			}
+
+			if ( attributeSchema.__experimentalRole === 'local' ) {
+				deprecated( '__experimentalRole attribute', {
+					since: '6.7',
+					version: '6.8',
+					alternative: 'role attribute',
+					hint: `Check the block.json of the ${ blockType?.name } block.`,
+				} );
+				return accumulator;
+			}
+
 			// Ignore default value.
 			if (
 				'default' in attributeSchema &&
diff --git a/packages/blocks/src/api/templates.js b/packages/blocks/src/api/templates.js
index bc76218892688a..71231121362a49 100644
--- a/packages/blocks/src/api/templates.js
+++ b/packages/blocks/src/api/templates.js
@@ -31,6 +31,42 @@ export function doBlocksMatchTemplate( blocks = [], template = [] ) {
 	);
 }
 
+const isHTMLAttribute = ( attributeDefinition ) =>
+	attributeDefinition?.source === 'html';
+
+const isQueryAttribute = ( attributeDefinition ) =>
+	attributeDefinition?.source === 'query';
+
+function normalizeAttributes( schema, values ) {
+	if ( ! values ) {
+		return {};
+	}
+
+	return Object.fromEntries(
+		Object.entries( values ).map( ( [ key, value ] ) => [
+			key,
+			normalizeAttribute( schema[ key ], value ),
+		] )
+	);
+}
+
+function normalizeAttribute( definition, value ) {
+	if ( isHTMLAttribute( definition ) && Array.isArray( value ) ) {
+		// Introduce a deprecated call at this point
+		// When we're confident that "children" format should be removed from the templates.
+
+		return renderToString( value );
+	}
+
+	if ( isQueryAttribute( definition ) && value ) {
+		return value.map( ( subValues ) => {
+			return normalizeAttributes( definition.query, subValues );
+		} );
+	}
+
+	return value;
+}
+
 /**
  * Synchronize a block list with a block template.
  *
@@ -67,42 +103,6 @@ export function synchronizeBlocksWithTemplate( blocks = [], template ) {
 			// before creating the blocks.
 
 			const blockType = getBlockType( name );
-			const isHTMLAttribute = ( attributeDefinition ) =>
-				attributeDefinition?.source === 'html';
-			const isQueryAttribute = ( attributeDefinition ) =>
-				attributeDefinition?.source === 'query';
-
-			const normalizeAttributes = ( schema, values ) => {
-				if ( ! values ) {
-					return {};
-				}
-
-				return Object.fromEntries(
-					Object.entries( values ).map( ( [ key, value ] ) => [
-						key,
-						normalizeAttribute( schema[ key ], value ),
-					] )
-				);
-			};
-			const normalizeAttribute = ( definition, value ) => {
-				if ( isHTMLAttribute( definition ) && Array.isArray( value ) ) {
-					// Introduce a deprecated call at this point
-					// When we're confident that "children" format should be removed from the templates.
-
-					return renderToString( value );
-				}
-
-				if ( isQueryAttribute( definition ) && value ) {
-					return value.map( ( subValues ) => {
-						return normalizeAttributes(
-							definition.query,
-							subValues
-						);
-					} );
-				}
-
-				return value;
-			};
 
 			const normalizedAttributes = normalizeAttributes(
 				blockType?.attributes ?? {},
diff --git a/packages/blocks/src/api/test/registration.js b/packages/blocks/src/api/test/registration.js
index 6347912c0402cd..5941415e61fe55 100644
--- a/packages/blocks/src/api/test/registration.js
+++ b/packages/blocks/src/api/test/registration.js
@@ -13,8 +13,11 @@ import { select, dispatch } from '@wordpress/data';
 import {
 	registerBlockType,
 	registerBlockCollection,
+	registerBlockVariation,
+	registerBlockBindingsSource,
 	unregisterBlockCollection,
 	unregisterBlockType,
+	unregisterBlockBindingsSource,
 	setFreeformContentHandlerName,
 	getFreeformContentHandlerName,
 	setUnregisteredTypeHandlerName,
@@ -26,6 +29,8 @@ import {
 	getBlockType,
 	getBlockTypes,
 	getBlockSupport,
+	getBlockVariations,
+	getBlockBindingsSource,
 	hasBlockSupport,
 	isReusableBlock,
 	unstable__bootstrapServerSideBlockDefinitions, // eslint-disable-line camelcase
@@ -34,6 +39,7 @@ import { BLOCK_ICON_DEFAULT, DEPRECATED_ENTRY_KEYS } from '../constants';
 import { omit } from '../utils';
 import { store as blocksStore } from '../../store';
 import { unlock } from '../../lock-unlock';
+import { logged as warningLoggedSet } from '../../../../warning/src/utils';
 
 const noop = () => {};
 
@@ -62,12 +68,13 @@ describe( 'blocks', () => {
 		for ( const key in logged ) {
 			delete logged[ key ];
 		}
+		warningLoggedSet.clear();
 	} );
 
 	describe( 'registerBlockType()', () => {
 		it( 'should reject numbers', () => {
 			const block = registerBlockType( 999 );
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'Block names must be strings.'
 			);
 			expect( block ).toBeUndefined();
@@ -75,7 +82,7 @@ describe( 'blocks', () => {
 
 		it( 'should reject blocks without a namespace', () => {
 			const block = registerBlockType( 'doing-it-wrong' );
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
 			);
 			expect( block ).toBeUndefined();
@@ -83,7 +90,7 @@ describe( 'blocks', () => {
 
 		it( 'should reject blocks with too many namespaces', () => {
 			const block = registerBlockType( 'doing/it/wrong' );
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
 			);
 			expect( block ).toBeUndefined();
@@ -91,15 +98,26 @@ describe( 'blocks', () => {
 
 		it( 'should reject blocks with invalid characters', () => {
 			const block = registerBlockType( 'still/_doing_it_wrong' );
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
 			);
 			expect( block ).toBeUndefined();
 		} );
 
+		it( 'Should reject blocks with the block name itself as the only parent attribute value', () => {
+			const block = registerBlockType( 'core/test-block', {
+				...defaultBlockSettings,
+				parent: [ 'core/test-block' ],
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block "core/test-block" cannot be a parent of itself. Please remove the block name from the parent list.'
+			);
+			expect( block ).toBeUndefined();
+		} );
+
 		it( 'should reject blocks with uppercase characters', () => {
 			const block = registerBlockType( 'Core/Paragraph' );
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
 			);
 			expect( block ).toBeUndefined();
@@ -110,7 +128,7 @@ describe( 'blocks', () => {
 				'my-plugin/4-fancy-block',
 				defaultBlockSettings
 			);
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'Block names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-block'
 			);
 			expect( block ).toBeUndefined();
@@ -121,7 +139,7 @@ describe( 'blocks', () => {
 				'my-plugin/fancy-block-4',
 				defaultBlockSettings
 			);
-			expect( console ).not.toHaveErrored();
+			expect( console ).not.toHaveWarned();
 			expect( block ).toEqual( {
 				name: 'my-plugin/fancy-block-4',
 				icon: { src: BLOCK_ICON_DEFAULT },
@@ -146,7 +164,7 @@ describe( 'blocks', () => {
 				'core/test-block',
 				defaultBlockSettings
 			);
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'Block "core/test-block" is already registered.'
 			);
 			expect( block ).toBeUndefined();
@@ -159,7 +177,7 @@ describe( 'blocks', () => {
 				keywords: [],
 				save: 'invalid',
 			} );
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'The "save" property must be a valid function.'
 			);
 			expect( block ).toBeUndefined();
@@ -168,7 +186,7 @@ describe( 'blocks', () => {
 		it( 'should reject blocks with an invalid edit function', () => {
 			const blockType = {
 					save: noop,
-					edit: 'not-a-function',
+					edit: {},
 					category: 'text',
 					title: 'block title',
 				},
@@ -176,8 +194,8 @@ describe( 'blocks', () => {
 					'my-plugin/fancy-block-6',
 					blockType
 				);
-			expect( console ).toHaveErroredWith(
-				'The "edit" property must be a valid function.'
+			expect( console ).toHaveWarnedWith(
+				'The "edit" property must be a valid component.'
 			);
 			expect( block ).toBeUndefined();
 		} );
@@ -222,7 +240,7 @@ describe( 'blocks', () => {
 					'my-plugin/fancy-block-9',
 					blockType
 				);
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'The block "my-plugin/fancy-block-9" must have a title.'
 			);
 			expect( block ).toBeUndefined();
@@ -239,7 +257,7 @@ describe( 'blocks', () => {
 					'my-plugin/fancy-block-10',
 					blockType
 				);
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'The block "my-plugin/fancy-block-10" must have a title.'
 			);
 			expect( block ).toBeUndefined();
@@ -256,7 +274,7 @@ describe( 'blocks', () => {
 					'my-plugin/fancy-block-11',
 					blockType
 				);
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'Block titles must be strings.'
 			);
 			expect( block ).toBeUndefined();
@@ -398,39 +416,47 @@ describe( 'blocks', () => {
 			} );
 		} );
 
-		// This can be removed once polyfill adding selectors has been removed.
-		it( 'should apply selectors on the client when not set on the server', () => {
-			const blockName = 'core/test-block-with-selectors';
-			unstable__bootstrapServerSideBlockDefinitions( {
-				[ blockName ]: {
-					category: 'widgets',
-				},
-			} );
+		it( 'should merge settings provided by server and client', () => {
+			const blockName = 'core/test-block-with-merged-settings';
 			unstable__bootstrapServerSideBlockDefinitions( {
 				[ blockName ]: {
-					selectors: { root: '.wp-block-custom-selector' },
-					category: 'ignored',
+					variations: [
+						{ name: 'foo', label: 'Foo' },
+						{ name: 'baz', label: 'Baz', description: 'Testing' },
+					],
 				},
 			} );
 
 			const blockType = {
-				title: 'block title',
+				title: 'block settings merge',
+				variations: [
+					{ name: 'bar', label: 'Bar' },
+					{ name: 'baz', label: 'Baz', icon: 'layout' },
+				],
 			};
 			registerBlockType( blockName, blockType );
 			expect( getBlockType( blockName ) ).toEqual( {
 				name: blockName,
 				save: expect.any( Function ),
-				title: 'block title',
-				category: 'widgets',
+				title: 'block settings merge',
 				icon: { src: BLOCK_ICON_DEFAULT },
 				attributes: {},
 				providesContext: {},
 				usesContext: [],
 				keywords: [],
-				selectors: { root: '.wp-block-custom-selector' },
+				selectors: {},
 				supports: {},
 				styles: [],
-				variations: [],
+				variations: [
+					{ name: 'foo', label: 'Foo' },
+					{
+						description: 'Testing',
+						name: 'baz',
+						label: 'Baz',
+						icon: 'layout',
+					},
+					{ name: 'bar', label: 'Bar' },
+				],
 				blockHooks: {},
 			} );
 		} );
@@ -488,7 +514,7 @@ describe( 'blocks', () => {
 				'core/test-block-icon-normalize-element',
 				blockType
 			);
-			expect( console ).toHaveErrored();
+			expect( console ).toHaveWarned();
 			expect( block ).toBeUndefined();
 		} );
 
@@ -716,6 +742,39 @@ describe( 'blocks', () => {
 			} );
 		} );
 
+		it( 'should transform parent string to array', () => {
+			const blockType = {
+				save: noop,
+				category: 'text',
+				title: 'block title',
+				parent: 'core/paragraph',
+			};
+			const block = registerBlockType(
+				'core/test-block-parent-string',
+				blockType
+			);
+			expect( console ).toHaveWarnedWith(
+				'Parent must be undefined or an array of strings (block types), but it is a string.'
+			);
+			expect( block ).toEqual( {
+				name: 'core/test-block-parent-string',
+				save: noop,
+				category: 'text',
+				title: 'block title',
+				icon: { src: BLOCK_ICON_DEFAULT },
+				attributes: {},
+				providesContext: {},
+				usesContext: [],
+				keywords: [],
+				selectors: {},
+				supports: {},
+				styles: [],
+				variations: [],
+				blockHooks: {},
+				parent: [ 'core/paragraph' ],
+			} );
+		} );
+
 		describe( 'applyFilters', () => {
 			afterEach( () => {
 				removeAllFilters( 'blocks.registerBlockType' );
@@ -736,7 +795,7 @@ describe( 'blocks', () => {
 					'my-plugin/fancy-block-12',
 					defaultBlockSettings
 				);
-				expect( console ).toHaveErroredWith(
+				expect( console ).toHaveWarnedWith(
 					'The block "my-plugin/fancy-block-12" must have a title.'
 				);
 				expect( block ).toBeUndefined();
@@ -754,7 +813,7 @@ describe( 'blocks', () => {
 					'my-plugin/fancy-block-13',
 					defaultBlockSettings
 				);
-				expect( console ).toHaveErroredWith(
+				expect( console ).toHaveWarnedWith(
 					'Block settings must be a valid object.'
 				);
 				expect( block ).toBeUndefined();
@@ -1080,7 +1139,7 @@ describe( 'blocks', () => {
 	describe( 'unregisterBlockType()', () => {
 		it( 'should fail if a block is not registered', () => {
 			const oldBlock = unregisterBlockType( 'core/test-block' );
-			expect( console ).toHaveErroredWith(
+			expect( console ).toHaveWarnedWith(
 				'Block "core/test-block" is not registered.'
 			);
 			expect( oldBlock ).toBeUndefined();
@@ -1107,7 +1166,7 @@ describe( 'blocks', () => {
 				},
 			] );
 			const oldBlock = unregisterBlockType( 'core/test-block' );
-			expect( console ).not.toHaveErrored();
+			expect( console ).not.toHaveWarned();
 			expect( oldBlock ).toEqual( {
 				name: 'core/test-block',
 				save: noop,
@@ -1402,6 +1461,325 @@ describe( 'blocks', () => {
 			expect( isReusableBlock( block ) ).toBe( false );
 		} );
 	} );
+
+	describe( 'registerBlockVariation', () => {
+		it( 'should warn when registering block variation without a name', () => {
+			registerBlockType( 'core/variation-block', defaultBlockSettings );
+			registerBlockVariation( 'core/variation-block', {
+				title: 'Variation Title',
+				description: 'Variation description',
+			} );
+
+			expect( console ).toHaveWarnedWith(
+				'Variation names must be unique strings.'
+			);
+			expect( getBlockVariations( 'core/variation-block' ) ).toEqual( [
+				{
+					title: 'Variation Title',
+					description: 'Variation description',
+				},
+			] );
+		} );
+	} );
+
+	describe( 'registerBlockBindingsSource', () => {
+		// Check the name is correct.
+		it( 'should contain name property', () => {
+			const source = registerBlockBindingsSource( {} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source must contain a name.'
+			);
+			expect( source ).toBeUndefined();
+		} );
+
+		it( 'should reject numbers', () => {
+			const source = registerBlockBindingsSource( { name: 1 } );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source name must be a string.'
+			);
+			expect( source ).toBeUndefined();
+		} );
+
+		it( 'should reject names with uppercase characters', () => {
+			registerBlockBindingsSource( {
+				name: 'Core/WrongName',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source name must not contain uppercase characters.'
+			);
+			expect(
+				getBlockBindingsSource( 'Core/WrongName' )
+			).toBeUndefined();
+		} );
+
+		it( 'should reject names with invalid characters', () => {
+			registerBlockBindingsSource( {
+				name: 'core/_wrong_name',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source name must contain only valid characters: lowercase characters, hyphens, or digits. Example: my-plugin/my-custom-source.'
+			);
+			expect(
+				getBlockBindingsSource( 'core/_wrong_name' )
+			).toBeUndefined();
+		} );
+
+		it( 'should reject invalid names without namespace', () => {
+			registerBlockBindingsSource( {
+				name: 'wrong-name',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source name must contain a namespace and valid characters. Example: my-plugin/my-custom-source.'
+			);
+			expect( getBlockBindingsSource( 'wrong-name' ) ).toBeUndefined();
+		} );
+
+		// Check the label is correct.
+		it( 'should contain label property', () => {
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source must contain a label.'
+			);
+			expect( getBlockBindingsSource( 'core/testing' ) ).toBeUndefined();
+		} );
+
+		it( 'should reject invalid label', () => {
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 1,
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source label must be a string.'
+			);
+			expect( getBlockBindingsSource( 'core/testing' ) ).toBeUndefined();
+		} );
+
+		it( 'should override label from the server', () => {
+			// Simulate bootstrap source from the server.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'Server label',
+			} );
+			// Override the source with a different label in the client.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'Client label',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings "core/testing" source label was overriden.'
+			);
+			const source = getBlockBindingsSource( 'core/testing' );
+			unregisterBlockBindingsSource( 'core/testing' );
+			expect( source.label ).toEqual( 'Client label' );
+		} );
+
+		it( 'should keep label from the server when not defined in the client', () => {
+			// Simulate bootstrap source from the server.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'Server label',
+			} );
+			// Override the source with a different label in the client.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+			} );
+			const source = getBlockBindingsSource( 'core/testing' );
+			unregisterBlockBindingsSource( 'core/testing' );
+			expect( source.label ).toEqual( 'Server label' );
+		} );
+
+		// Check the `usesContext` array is correct.
+		it( 'should reject invalid usesContext property', () => {
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'testing',
+				usesContext: 'should be an array',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source usesContext must be an array.'
+			);
+		} );
+
+		it( 'should add usesContext when only defined in the server', () => {
+			// Simulate bootstrap source from the server.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'testing',
+				usesContext: [ 'postId', 'postType' ],
+			} );
+			// Register source in the client without usesContext.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				getValue: () => 'value',
+			} );
+			const source = getBlockBindingsSource( 'core/testing' );
+			unregisterBlockBindingsSource( 'core/testing' );
+			expect( source.usesContext ).toEqual( [ 'postId', 'postType' ] );
+		} );
+
+		it( 'should add usesContext when only defined in the client', () => {
+			// Simulate bootstrap source from the server.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'testing',
+			} );
+			// Register source in the client with usesContext.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				usesContext: [ 'postId', 'postType' ],
+				getValue: () => 'value',
+			} );
+			const source = getBlockBindingsSource( 'core/testing' );
+			unregisterBlockBindingsSource( 'core/testing' );
+			expect( source.usesContext ).toEqual( [ 'postId', 'postType' ] );
+		} );
+
+		it( 'should merge usesContext from server and client without duplicates', () => {
+			// Simulate bootstrap source from the server.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'testing',
+				usesContext: [ 'postId', 'postType' ],
+			} );
+			// Register source in the client with usesContext.
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				usesContext: [ 'postType', 'clientContext' ],
+				getValue: () => 'value',
+			} );
+			const source = getBlockBindingsSource( 'core/testing' );
+			unregisterBlockBindingsSource( 'core/testing' );
+			expect( source.usesContext ).toEqual( [
+				'postId',
+				'postType',
+				'clientContext',
+			] );
+		} );
+
+		// Check the `getValues` callback is correct.
+		it( 'should reject invalid getValues callback', () => {
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'testing',
+				getValues: 'should be a function',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source getValues must be a function.'
+			);
+			expect( getBlockBindingsSource( 'core/testing' ) ).toBeUndefined();
+		} );
+
+		// Check the `setValues` callback is correct.
+		it( 'should reject invalid setValues callback', () => {
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'testing',
+				setValues: 'should be a function',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source setValues must be a function.'
+			);
+			expect( getBlockBindingsSource( 'core/testing' ) ).toBeUndefined();
+		} );
+
+		// Check the `canUserEditValue` callback is correct.
+		it( 'should reject invalid canUserEditValue callback', () => {
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'testing',
+				canUserEditValue: 'should be a function',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source canUserEditValue must be a function.'
+			);
+			expect( getBlockBindingsSource( 'core/testing' ) ).toBeUndefined();
+		} );
+
+		// Check the `getFieldsList` callback is correct.
+		it( 'should reject invalid getFieldsList callback', () => {
+			registerBlockBindingsSource( {
+				name: 'core/testing',
+				label: 'testing',
+				getFieldsList: 'should be a function',
+			} );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source getFieldsList must be a function.'
+			);
+			expect( getBlockBindingsSource( 'core/testing' ) ).toBeUndefined();
+		} );
+
+		// Check correct sources are registered as expected.
+		it( 'should register a valid source', () => {
+			const sourceProperties = {
+				label: 'Valid Source',
+				usesContext: [ 'postId' ],
+				getValues: () => 'value',
+				setValues: () => 'new values',
+				canUserEditValue: () => true,
+				getFieldsList: () => {
+					return { field: 'value' };
+				},
+			};
+			registerBlockBindingsSource( {
+				name: 'core/valid-source',
+				...sourceProperties,
+			} );
+			expect( getBlockBindingsSource( 'core/valid-source' ) ).toEqual(
+				sourceProperties
+			);
+			unregisterBlockBindingsSource( 'core/valid-source' );
+		} );
+
+		it( 'should register a source with default values', () => {
+			registerBlockBindingsSource( {
+				name: 'core/valid-source',
+				label: 'Valid Source',
+			} );
+			const source = getBlockBindingsSource( 'core/valid-source' );
+			expect( source.usesContext ).toBeUndefined();
+			expect( source.getValues ).toBeUndefined();
+			expect( source.setValues ).toBeUndefined();
+			expect( source.canUserEditValue ).toBeUndefined();
+			expect( source.getFieldsList ).toBeUndefined();
+			unregisterBlockBindingsSource( 'core/valid-source' );
+		} );
+
+		it( 'should reject registering the same source twice', () => {
+			const source = {
+				name: 'core/test-source',
+				label: 'Test Source',
+				getValues: () => 'value',
+			};
+			registerBlockBindingsSource( source );
+			registerBlockBindingsSource( source );
+			unregisterBlockBindingsSource( 'core/test-source' );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source "core/test-source" is already registered.'
+			);
+		} );
+	} );
+
+	describe( 'unregisterBlockBindingsSource', () => {
+		it( 'should remove an existing block bindings source', () => {
+			registerBlockBindingsSource( {
+				name: 'core/test-source',
+				label: 'Test Source',
+			} );
+			unregisterBlockBindingsSource( 'core/test-source' );
+			expect(
+				getBlockBindingsSource( 'core/test-source' )
+			).toBeUndefined();
+		} );
+
+		it( 'should reject removing a source that does not exist', () => {
+			unregisterBlockBindingsSource( 'core/non-existing-source' );
+			expect( console ).toHaveWarnedWith(
+				'Block bindings source "core/non-existing-source" is not registered.'
+			);
+		} );
+	} );
 } );
 
 /* eslint-enable react/forbid-elements */
diff --git a/packages/blocks/src/api/test/serializer.js b/packages/blocks/src/api/test/serializer.js
index 6cb21470f9e1fa..3c1cbd6d1e74ff 100644
--- a/packages/blocks/src/api/test/serializer.js
+++ b/packages/blocks/src/api/test/serializer.js
@@ -148,6 +148,30 @@ describe( 'block serializer', () => {
 
 			expect( attributes ).toEqual( { fruit: 'bananas' } );
 		} );
+
+		it( 'should ingore local attributes', () => {
+			const attributes = getCommentAttributes(
+				{
+					attributes: {
+						blob: {
+							type: 'string',
+							role: 'local',
+						},
+						url: {
+							type: 'string',
+						},
+					},
+				},
+				{
+					blob: 'blob://false-url.com',
+					url: 'http://real-url.com',
+				}
+			);
+
+			expect( attributes ).toEqual( {
+				url: 'http://real-url.com',
+			} );
+		} );
 	} );
 
 	describe( 'serializeAttributes()', () => {
diff --git a/packages/blocks/src/api/test/utils.js b/packages/blocks/src/api/test/utils.js
index 9bfef69c4c1428..ad76e89aafe5f0 100644
--- a/packages/blocks/src/api/test/utils.js
+++ b/packages/blocks/src/api/test/utils.js
@@ -13,7 +13,7 @@ import {
 	getAccessibleBlockLabel,
 	getBlockLabel,
 	__experimentalSanitizeBlockAttributes,
-	__experimentalGetBlockAttributesNamesByRole,
+	getBlockAttributesNamesByRole,
 } from '../utils';
 
 const noop = () => {};
@@ -309,7 +309,7 @@ describe( 'sanitizeBlockAttributes', () => {
 	} );
 } );
 
-describe( '__experimentalGetBlockAttributesNamesByRole', () => {
+describe( 'getBlockAttributesNamesByRole', () => {
 	beforeAll( () => {
 		registerBlockType( 'core/test-block-1', {
 			attributes: {
@@ -318,15 +318,15 @@ describe( '__experimentalGetBlockAttributesNamesByRole', () => {
 				},
 				content: {
 					type: 'boolean',
-					__experimentalRole: 'content',
+					role: 'content',
 				},
 				level: {
 					type: 'number',
-					__experimentalRole: 'content',
+					role: 'content',
 				},
 				color: {
 					type: 'string',
-					__experimentalRole: 'other',
+					role: 'other',
 				},
 			},
 			save: noop,
@@ -357,42 +357,28 @@ describe( '__experimentalGetBlockAttributesNamesByRole', () => {
 		].forEach( unregisterBlockType );
 	} );
 	it( 'should return empty array if block has no attributes', () => {
-		expect(
-			__experimentalGetBlockAttributesNamesByRole( 'core/test-block-3' )
-		).toEqual( [] );
+		expect( getBlockAttributesNamesByRole( 'core/test-block-3' ) ).toEqual(
+			[]
+		);
 	} );
 	it( 'should return all attribute names if no role is provided', () => {
-		expect(
-			__experimentalGetBlockAttributesNamesByRole( 'core/test-block-1' )
-		).toEqual(
+		expect( getBlockAttributesNamesByRole( 'core/test-block-1' ) ).toEqual(
 			expect.arrayContaining( [ 'align', 'content', 'level', 'color' ] )
 		);
 	} );
 	it( 'should return proper results with existing attributes and provided role', () => {
 		expect(
-			__experimentalGetBlockAttributesNamesByRole(
-				'core/test-block-1',
-				'content'
-			)
+			getBlockAttributesNamesByRole( 'core/test-block-1', 'content' )
 		).toEqual( expect.arrayContaining( [ 'content', 'level' ] ) );
 		expect(
-			__experimentalGetBlockAttributesNamesByRole(
-				'core/test-block-1',
-				'other'
-			)
+			getBlockAttributesNamesByRole( 'core/test-block-1', 'other' )
 		).toEqual( [ 'color' ] );
 		expect(
-			__experimentalGetBlockAttributesNamesByRole(
-				'core/test-block-1',
-				'not-exists'
-			)
+			getBlockAttributesNamesByRole( 'core/test-block-1', 'not-exists' )
 		).toEqual( [] );
 		// A block with no `role` in any attributes.
 		expect(
-			__experimentalGetBlockAttributesNamesByRole(
-				'core/test-block-2',
-				'content'
-			)
+			getBlockAttributesNamesByRole( 'core/test-block-2', 'content' )
 		).toEqual( [] );
 	} );
 } );
diff --git a/packages/blocks/src/api/utils.js b/packages/blocks/src/api/utils.js
index c43445c6272264..7bace4ff84c29b 100644
--- a/packages/blocks/src/api/utils.js
+++ b/packages/blocks/src/api/utils.js
@@ -11,13 +11,14 @@ import a11yPlugin from 'colord/plugins/a11y';
 import { Component, isValidElement } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
+import { RichTextData } from '@wordpress/rich-text';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
 import { BLOCK_ICON_DEFAULT } from './constants';
 import { getBlockType, getDefaultBlockName } from './registration';
-import { createBlock } from './factory';
 
 extend( [ namesPlugin, a11yPlugin ] );
 
@@ -29,6 +30,30 @@ extend( [ namesPlugin, a11yPlugin ] );
  */
 const ICON_COLORS = [ '#191e23', '#f8f9f9' ];
 
+/**
+ * Determines whether the block's attribute is equal to the default attribute
+ * which means the attribute is unmodified.
+ * @param {Object} attributeDefinition The attribute's definition of the block type.
+ * @param {*}      value               The attribute's value.
+ * @return {boolean} Whether the attribute is unmodified.
+ */
+function isUnmodifiedAttribute( attributeDefinition, value ) {
+	// Every attribute that has a default must match the default.
+	if ( attributeDefinition.hasOwnProperty( 'default' ) ) {
+		return value === attributeDefinition.default;
+	}
+
+	// The rich text type is a bit different from the rest because it
+	// has an implicit default value of an empty RichTextData instance,
+	// so check the length of the value.
+	if ( attributeDefinition.type === 'rich-text' ) {
+		return ! value?.length;
+	}
+
+	// Every attribute that doesn't have a default should be undefined.
+	return value === undefined;
+}
+
 /**
  * Determines whether the block's attributes are equal to the default attributes
  * which means the block is unmodified.
@@ -38,17 +63,12 @@ const ICON_COLORS = [ '#191e23', '#f8f9f9' ];
  * @return {boolean} Whether the block is an unmodified block.
  */
 export function isUnmodifiedBlock( block ) {
-	// Cache a created default block if no cache exists or the default block
-	// name changed.
-	if ( ! isUnmodifiedBlock[ block.name ] ) {
-		isUnmodifiedBlock[ block.name ] = createBlock( block.name );
-	}
-
-	const newBlock = isUnmodifiedBlock[ block.name ];
-	const blockType = getBlockType( block.name );
+	return Object.entries( getBlockType( block.name )?.attributes ?? {} ).every(
+		( [ key, definition ] ) => {
+			const value = block.attributes[ key ];
 
-	return Object.keys( blockType?.attributes ?? {} ).every(
-		( key ) => newBlock.attributes[ key ] === block.attributes[ key ]
+			return isUnmodifiedAttribute( definition, value );
+		}
 	);
 }
 
@@ -64,6 +84,35 @@ export function isUnmodifiedDefaultBlock( block ) {
 	return block.name === getDefaultBlockName() && isUnmodifiedBlock( block );
 }
 
+/**
+ * Determines whether the block content is unmodified. A block content is
+ * considered unmodified if all the attributes that have a role of 'content'
+ * are equal to the default attributes (or undefined).
+ * If the block does not have any attributes with a role of 'content', it
+ * will be considered unmodified if all the attributes are equal to the default
+ * attributes (or undefined).
+ *
+ * @param {WPBlock} block Block Object
+ * @return {boolean} Whether the block content is unmodified.
+ */
+export function isUnmodifiedBlockContent( block ) {
+	const contentAttributes = getBlockAttributesNamesByRole(
+		block.name,
+		'content'
+	);
+
+	if ( contentAttributes.length === 0 ) {
+		return isUnmodifiedBlock( block );
+	}
+
+	return contentAttributes.every( ( key ) => {
+		const definition = getBlockType( block.name )?.attributes[ key ];
+		const value = block.attributes[ key ];
+
+		return isUnmodifiedAttribute( definition, value );
+	} );
+}
+
 /**
  * Function that checks if the parameter is a valid icon.
  *
@@ -156,6 +205,10 @@ export function getBlockLabel( blockType, attributes, context = 'visual' ) {
 		return title;
 	}
 
+	if ( label.toPlainText ) {
+		return label.toPlainText();
+	}
+
 	// Strip any HTML (i.e. RichText formatting) before returning.
 	return stripHTML( label );
 }
@@ -243,6 +296,16 @@ export function getAccessibleBlockLabel(
 	);
 }
 
+export function getDefault( attributeSchema ) {
+	if ( attributeSchema.default !== undefined ) {
+		return attributeSchema.default;
+	}
+
+	if ( attributeSchema.type === 'rich-text' ) {
+		return new RichTextData();
+	}
+}
+
 /**
  * Ensure attributes contains only values defined by block type, and merge
  * default values for missing attributes.
@@ -264,9 +327,26 @@ export function __experimentalSanitizeBlockAttributes( name, attributes ) {
 			const value = attributes[ key ];
 
 			if ( undefined !== value ) {
-				accumulator[ key ] = value;
-			} else if ( schema.hasOwnProperty( 'default' ) ) {
-				accumulator[ key ] = schema.default;
+				if ( schema.type === 'rich-text' ) {
+					if ( value instanceof RichTextData ) {
+						accumulator[ key ] = value;
+					} else if ( typeof value === 'string' ) {
+						accumulator[ key ] =
+							RichTextData.fromHTMLString( value );
+					}
+				} else if (
+					schema.type === 'string' &&
+					value instanceof RichTextData
+				) {
+					accumulator[ key ] = value.toHTMLString();
+				} else {
+					accumulator[ key ] = value;
+				}
+			} else {
+				const _default = getDefault( schema );
+				if ( undefined !== _default ) {
+					accumulator[ key ] = _default;
+				}
 			}
 
 			if ( [ 'node', 'children' ].indexOf( schema.source ) !== -1 ) {
@@ -293,17 +373,43 @@ export function __experimentalSanitizeBlockAttributes( name, attributes ) {
  *
  * @return {string[]} The attribute names that have the provided role.
  */
-export function __experimentalGetBlockAttributesNamesByRole( name, role ) {
+export function getBlockAttributesNamesByRole( name, role ) {
 	const attributes = getBlockType( name )?.attributes;
-	if ( ! attributes ) return [];
+	if ( ! attributes ) {
+		return [];
+	}
 	const attributesNames = Object.keys( attributes );
-	if ( ! role ) return attributesNames;
-	return attributesNames.filter(
-		( attributeName ) =>
-			attributes[ attributeName ]?.__experimentalRole === role
-	);
+	if ( ! role ) {
+		return attributesNames;
+	}
+
+	return attributesNames.filter( ( attributeName ) => {
+		const attribute = attributes[ attributeName ];
+		if ( attribute?.role === role ) {
+			return true;
+		}
+		if ( attribute?.__experimentalRole === role ) {
+			deprecated( '__experimentalRole attribute', {
+				since: '6.7',
+				version: '6.8',
+				alternative: 'role attribute',
+				hint: `Check the block.json of the ${ name } block.`,
+			} );
+			return true;
+		}
+		return false;
+	} );
 }
 
+export const __experimentalGetBlockAttributesNamesByRole = ( ...args ) => {
+	deprecated( '__experimentalGetBlockAttributesNamesByRole', {
+		since: '6.7',
+		version: '6.8',
+		alternative: 'getBlockAttributesNamesByRole',
+	} );
+	return getBlockAttributesNamesByRole( ...args );
+};
+
 /**
  * Return a new object with the specified keys omitted.
  *
diff --git a/packages/blocks/src/lock-unlock.js b/packages/blocks/src/lock-unlock.js
index 0a98fcfb19d296..2ed55b6ba6adb5 100644
--- a/packages/blocks/src/lock-unlock.js
+++ b/packages/blocks/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/blocks'
 	);
diff --git a/packages/blocks/src/store/actions.js b/packages/blocks/src/store/actions.js
index d3bd71c067ebe3..34216e05808ad7 100644
--- a/packages/blocks/src/store/actions.js
+++ b/packages/blocks/src/store/actions.js
@@ -98,18 +98,18 @@ export function removeBlockTypes( names ) {
  * Returns an action object used in signalling that new block styles have been added.
  * Ignored from documentation as the recommended usage for this action through registerBlockStyle from @wordpress/blocks.
  *
- * @param {string}       blockName Block name.
- * @param {Array|Object} styles    Block style object or array of block style objects.
+ * @param {string|Array} blockNames Block names to register new styles for.
+ * @param {Array|Object} styles     Block style object or array of block style objects.
  *
  * @ignore
  *
  * @return {Object} Action object.
  */
-export function addBlockStyles( blockName, styles ) {
+export function addBlockStyles( blockNames, styles ) {
 	return {
 		type: 'ADD_BLOCK_STYLES',
 		styles: Array.isArray( styles ) ? styles : [ styles ],
-		blockName,
+		blockNames: Array.isArray( blockNames ) ? blockNames : [ blockNames ],
 	};
 }
 
diff --git a/packages/blocks/src/store/private-actions.js b/packages/blocks/src/store/private-actions.js
index bc06e231b17222..bfefe56773d77a 100644
--- a/packages/blocks/src/store/private-actions.js
+++ b/packages/blocks/src/store/private-actions.js
@@ -40,3 +40,33 @@ export function addUnprocessedBlockType( name, blockType ) {
 		dispatch.addBlockTypes( processedBlockType );
 	};
 }
+
+/**
+ * Adds new block bindings source.
+ *
+ * @param {string} source Name of the source to register.
+ */
+export function addBlockBindingsSource( source ) {
+	return {
+		type: 'ADD_BLOCK_BINDINGS_SOURCE',
+		name: source.name,
+		label: source.label,
+		usesContext: source.usesContext,
+		getValues: source.getValues,
+		setValues: source.setValues,
+		canUserEditValue: source.canUserEditValue,
+		getFieldsList: source.getFieldsList,
+	};
+}
+
+/**
+ * Removes existing block bindings source.
+ *
+ * @param {string} name Name of the source to remove.
+ */
+export function removeBlockBindingsSource( name ) {
+	return {
+		type: 'REMOVE_BLOCK_BINDINGS_SOURCE',
+		name,
+	};
+}
diff --git a/packages/blocks/src/store/private-selectors.js b/packages/blocks/src/store/private-selectors.js
index 7e4311658c8694..d5665323859e40 100644
--- a/packages/blocks/src/store/private-selectors.js
+++ b/packages/blocks/src/store/private-selectors.js
@@ -1,7 +1,8 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import createSelector from 'rememo';
+import { createSelector } from '@wordpress/data';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -52,23 +53,33 @@ function filterElementBlockSupports( blockSupports, name, element ) {
 			return false;
 		}
 
-		// This is only available for heading
+		// This is only available for heading, button, caption and text
 		if (
 			support === 'textTransform' &&
 			! name &&
-			! [ 'heading', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ].includes(
-				element
+			! (
+				[ 'heading', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ].includes(
+					element
+				) ||
+				element === 'button' ||
+				element === 'caption' ||
+				element === 'text'
 			)
 		) {
 			return false;
 		}
 
-		// This is only available for headings
+		// This is only available for heading, button, caption and text
 		if (
 			support === 'letterSpacing' &&
 			! name &&
-			! [ 'heading', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ].includes(
-				element
+			! (
+				[ 'heading', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ].includes(
+					element
+				) ||
+				element === 'button' ||
+				element === 'caption' ||
+				element === 'text'
 			)
 		) {
 			return false;
@@ -176,3 +187,59 @@ export function getBootstrappedBlockType( state, name ) {
 export function getUnprocessedBlockTypes( state ) {
 	return state.unprocessedBlockTypes;
 }
+
+/**
+ * Returns all the block bindings sources registered.
+ *
+ * @param {Object} state Data state.
+ *
+ * @return {Object} All the registered sources and their properties.
+ */
+export function getAllBlockBindingsSources( state ) {
+	return state.blockBindingsSources;
+}
+
+/**
+ * Returns a specific block bindings source.
+ *
+ * @param {Object} state      Data state.
+ * @param {string} sourceName Name of the source to get.
+ *
+ * @return {Object} The specific block binding source and its properties.
+ */
+export function getBlockBindingsSource( state, sourceName ) {
+	return state.blockBindingsSources[ sourceName ];
+}
+
+/**
+ * Determines if any of the block type's attributes have
+ * the content role attribute.
+ *
+ * @param {Object} state         Data state.
+ * @param {string} blockTypeName Block type name.
+ * @return {boolean} Whether block type has content role attribute.
+ */
+export const hasContentRoleAttribute = ( state, blockTypeName ) => {
+	const blockType = getBlockType( state, blockTypeName );
+	if ( ! blockType ) {
+		return false;
+	}
+
+	return Object.values( blockType.attributes ).some(
+		( { role, __experimentalRole } ) => {
+			if ( role === 'content' ) {
+				return true;
+			}
+			if ( __experimentalRole === 'content' ) {
+				deprecated( '__experimentalRole attribute', {
+					since: '6.7',
+					version: '6.8',
+					alternative: 'role attribute',
+					hint: `Check the block.json of the ${ blockTypeName } block.`,
+				} );
+				return true;
+			}
+			return false;
+		}
+	);
+};
diff --git a/packages/blocks/src/store/process-block-type.js b/packages/blocks/src/store/process-block-type.js
index 59b48979b07eb5..bc7b1a0e10e774 100644
--- a/packages/blocks/src/store/process-block-type.js
+++ b/packages/blocks/src/store/process-block-type.js
@@ -2,12 +2,14 @@
  * External dependencies
  */
 import { isPlainObject } from 'is-plain-object';
+import { isValidElementType } from 'react-is';
 
 /**
  * WordPress dependencies
  */
 import deprecated from '@wordpress/deprecated';
 import { applyFilters } from '@wordpress/hooks';
+import warning from '@wordpress/warning';
 
 /**
  * Internal dependencies
@@ -17,9 +19,6 @@ import { BLOCK_ICON_DEFAULT, DEPRECATED_ENTRY_KEYS } from '../api/constants';
 
 /** @typedef {import('../api/registration').WPBlockType} WPBlockType */
 
-const error = ( ...args ) => window?.console?.error?.( ...args );
-const warn = ( ...args ) => window?.console?.warn?.( ...args );
-
 /**
  * Mapping of legacy category slugs to their latest normal values, used to
  * accommodate updates of the default set of block categories.
@@ -32,6 +31,37 @@ const LEGACY_CATEGORY_MAPPING = {
 	layout: 'design',
 };
 
+/**
+ * Merge block variations bootstrapped from the server and client.
+ *
+ * When a variation is registered in both places, its properties are merged.
+ *
+ * @param {Array} bootstrappedVariations - A block type variations from the server.
+ * @param {Array} clientVariations       - A block type variations from the client.
+ * @return {Array} The merged array of block variations.
+ */
+function mergeBlockVariations(
+	bootstrappedVariations = [],
+	clientVariations = []
+) {
+	const result = [ ...bootstrappedVariations ];
+
+	clientVariations.forEach( ( clientVariation ) => {
+		const index = result.findIndex(
+			( bootstrappedVariation ) =>
+				bootstrappedVariation.name === clientVariation.name
+		);
+
+		if ( index !== -1 ) {
+			result[ index ] = { ...result[ index ], ...clientVariation };
+		} else {
+			result.push( clientVariation );
+		}
+	} );
+
+	return result;
+}
+
 /**
  * Takes the unprocessed block type settings, merges them with block type metadata
  * and applies all the existing filters for the registered block type.
@@ -45,6 +75,8 @@ const LEGACY_CATEGORY_MAPPING = {
 export const processBlockType =
 	( name, blockSettings ) =>
 	( { select } ) => {
+		const bootstrappedBlockType = select.getBootstrappedBlockType( name );
+
 		const blockType = {
 			name,
 			icon: BLOCK_ICON_DEFAULT,
@@ -55,11 +87,19 @@ export const processBlockType =
 			selectors: {},
 			supports: {},
 			styles: [],
-			variations: [],
 			blockHooks: {},
 			save: () => null,
-			...select.getBootstrappedBlockType( name ),
+			...bootstrappedBlockType,
 			...blockSettings,
+			// blockType.variations can be defined as a filePath.
+			variations: mergeBlockVariations(
+				Array.isArray( bootstrappedBlockType?.variations )
+					? bootstrappedBlockType.variations
+					: [],
+				Array.isArray( blockSettings?.variations )
+					? blockSettings.variations
+					: []
+			),
 		};
 
 		const settings = applyFilters(
@@ -105,16 +145,16 @@ export const processBlockType =
 		}
 
 		if ( ! isPlainObject( settings ) ) {
-			error( 'Block settings must be a valid object.' );
+			warning( 'Block settings must be a valid object.' );
 			return;
 		}
 
 		if ( typeof settings.save !== 'function' ) {
-			error( 'The "save" property must be a valid function.' );
+			warning( 'The "save" property must be a valid function.' );
 			return;
 		}
-		if ( 'edit' in settings && typeof settings.edit !== 'function' ) {
-			error( 'The "edit" property must be a valid function.' );
+		if ( 'edit' in settings && ! isValidElementType( settings.edit ) ) {
+			warning( 'The "edit" property must be a valid component.' );
 			return;
 		}
 
@@ -129,7 +169,7 @@ export const processBlockType =
 				.getCategories()
 				.some( ( { slug } ) => slug === settings.category )
 		) {
-			warn(
+			warning(
 				'The block "' +
 					name +
 					'" is registered with an invalid category "' +
@@ -140,22 +180,58 @@ export const processBlockType =
 		}
 
 		if ( ! ( 'title' in settings ) || settings.title === '' ) {
-			error( 'The block "' + name + '" must have a title.' );
+			warning( 'The block "' + name + '" must have a title.' );
 			return;
 		}
 		if ( typeof settings.title !== 'string' ) {
-			error( 'Block titles must be strings.' );
+			warning( 'Block titles must be strings.' );
 			return;
 		}
 
 		settings.icon = normalizeIconObject( settings.icon );
 		if ( ! isValidIcon( settings.icon.src ) ) {
-			error(
+			warning(
 				'The icon passed is invalid. ' +
 					'The icon should be a string, an element, a function, or an object following the specifications documented in https://developer.wordpress.org/block-editor/developers/block-api/block-registration/#icon-optional'
 			);
 			return;
 		}
 
+		if (
+			typeof settings?.parent === 'string' ||
+			settings?.parent instanceof String
+		) {
+			settings.parent = [ settings.parent ];
+			warning(
+				'Parent must be undefined or an array of strings (block types), but it is a string.'
+			);
+			// Intentionally continue:
+			//
+			// While string values were never supported, they appeared to work with some unintended side-effects
+			// that have been fixed by [#66250](https://github.com/WordPress/gutenberg/pull/66250).
+			//
+			// To be backwards-compatible, this code that automatically migrates strings to arrays.
+		}
+
+		if (
+			! Array.isArray( settings?.parent ) &&
+			settings?.parent !== undefined
+		) {
+			warning(
+				'Parent must be undefined or an array of block types, but it is ',
+				settings.parent
+			);
+			return;
+		}
+
+		if ( 1 === settings?.parent?.length && name === settings.parent[ 0 ] ) {
+			warning(
+				'Block "' +
+					name +
+					'" cannot be a parent of itself. Please remove the block name from the parent list.'
+			);
+			return;
+		}
+
 		return settings;
 	};
diff --git a/packages/blocks/src/store/reducer.js b/packages/blocks/src/store/reducer.js
index c16c1a6087efbf..ac652b91890319 100644
--- a/packages/blocks/src/store/reducer.js
+++ b/packages/blocks/src/store/reducer.js
@@ -66,30 +66,31 @@ function bootstrappedBlockTypes( state = {}, action ) {
 			// Don't overwrite if already set. It covers the case when metadata
 			// was initialized from the server.
 			if ( serverDefinition ) {
-				// The `selectors` prop is not yet included in the server provided
+				// The `blockHooks` prop is not yet included in the server provided
 				// definitions and needs to be polyfilled. This can be removed when the
-				// minimum supported WordPress is >= 6.3.
+				// minimum supported WordPress is >= 6.4.
 				if (
-					serverDefinition.selectors === undefined &&
-					blockType.selectors
+					serverDefinition.blockHooks === undefined &&
+					blockType.blockHooks
 				) {
 					newDefinition = {
 						...serverDefinition,
-						selectors: blockType.selectors,
+						...newDefinition,
+						blockHooks: blockType.blockHooks,
 					};
 				}
 
-				// The `blockHooks` prop is not yet included in the server provided
+				// The `allowedBlocks` prop is not yet included in the server provided
 				// definitions and needs to be polyfilled. This can be removed when the
-				// minimum supported WordPress is >= 6.4.
+				// minimum supported WordPress is >= 6.5.
 				if (
-					serverDefinition.blockHooks === undefined &&
-					blockType.blockHooks
+					serverDefinition.allowedBlocks === undefined &&
+					blockType.allowedBlocks
 				) {
 					newDefinition = {
 						...serverDefinition,
 						...newDefinition,
-						blockHooks: blockType.blockHooks,
+						allowedBlocks: blockType.allowedBlocks,
 					};
 				}
 			} else {
@@ -200,13 +201,14 @@ export function blockStyles( state = {}, action ) {
 				),
 			};
 		case 'ADD_BLOCK_STYLES':
-			return {
-				...state,
-				[ action.blockName ]: getUniqueItemsByName( [
-					...( state[ action.blockName ] ?? [] ),
+			const updatedStyles = {};
+			action.blockNames.forEach( ( blockName ) => {
+				updatedStyles[ blockName ] = getUniqueItemsByName( [
+					...( state[ blockName ] ?? [] ),
 					...action.styles,
-				] ),
-			};
+				] );
+			} );
+			return { ...state, ...updatedStyles };
 		case 'REMOVE_BLOCK_STYLES':
 			return {
 				...state,
@@ -326,7 +328,12 @@ export const groupingBlockName = createBlockNameSetterReducer(
 export function categories( state = DEFAULT_CATEGORIES, action ) {
 	switch ( action.type ) {
 		case 'SET_CATEGORIES':
-			return action.categories || [];
+			// Ensure, that categories are unique by slug.
+			const uniqueCategories = new Map();
+			( action.categories || [] ).forEach( ( category ) => {
+				uniqueCategories.set( category.slug, category );
+			} );
+			return [ ...uniqueCategories.values() ];
 		case 'UPDATE_CATEGORY': {
 			if (
 				! action.category ||
@@ -369,6 +376,52 @@ export function collections( state = {}, action ) {
 	return state;
 }
 
+/**
+ * Merges usesContext with existing values, potentially defined in the server registration.
+ *
+ * @param {string[]} existingUsesContext Existing `usesContext`.
+ * @param {string[]} newUsesContext      Newly added `usesContext`.
+ * @return {string[]|undefined} Merged `usesContext`.
+ */
+function getMergedUsesContext( existingUsesContext = [], newUsesContext = [] ) {
+	const mergedArrays = Array.from(
+		new Set( existingUsesContext.concat( newUsesContext ) )
+	);
+	return mergedArrays.length > 0 ? mergedArrays : undefined;
+}
+
+export function blockBindingsSources( state = {}, action ) {
+	switch ( action.type ) {
+		case 'ADD_BLOCK_BINDINGS_SOURCE':
+			// Only open this API in Gutenberg and for `core/post-meta` for the moment.
+			let getFieldsList;
+			if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+				getFieldsList = action.getFieldsList;
+			} else if ( action.name === 'core/post-meta' ) {
+				getFieldsList = action.getFieldsList;
+			}
+			return {
+				...state,
+				[ action.name ]: {
+					label: action.label || state[ action.name ]?.label,
+					usesContext: getMergedUsesContext(
+						state[ action.name ]?.usesContext,
+						action.usesContext
+					),
+					getValues: action.getValues,
+					setValues: action.setValues,
+					// Only set `canUserEditValue` if `setValues` is also defined.
+					canUserEditValue:
+						action.setValues && action.canUserEditValue,
+					getFieldsList,
+				},
+			};
+		case 'REMOVE_BLOCK_BINDINGS_SOURCE':
+			return omit( state, action.name );
+	}
+	return state;
+}
+
 export default combineReducers( {
 	bootstrappedBlockTypes,
 	unprocessedBlockTypes,
@@ -381,4 +434,5 @@ export default combineReducers( {
 	groupingBlockName,
 	categories,
 	collections,
+	blockBindingsSources,
 } );
diff --git a/packages/blocks/src/store/selectors.js b/packages/blocks/src/store/selectors.js
index b2b8ab8106f097..79e88073ba20de 100644
--- a/packages/blocks/src/store/selectors.js
+++ b/packages/blocks/src/store/selectors.js
@@ -1,18 +1,20 @@
 /**
  * External dependencies
  */
-import createSelector from 'rememo';
 import removeAccents from 'remove-accents';
 
 /**
  * WordPress dependencies
  */
-import { pipe } from '@wordpress/compose';
+import { createSelector } from '@wordpress/data';
+import { RichTextData } from '@wordpress/rich-text';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
-import { getValueFromObjectPath } from './utils';
+import { getValueFromObjectPath, matchesAttributes } from './utils';
+import { hasContentRoleAttribute as privateHasContentRoleAttribute } from './private-selectors';
 
 /** @typedef {import('../api/registration').WPBlockVariation} WPBlockVariation */
 /** @typedef {import('../api/registration').WPBlockVariationScope} WPBlockVariationScope */
@@ -238,26 +240,61 @@ export const getBlockVariations = createSelector(
 export function getActiveBlockVariation( state, blockName, attributes, scope ) {
 	const variations = getBlockVariations( state, blockName, scope );
 
-	const match = variations?.find( ( variation ) => {
+	if ( ! variations ) {
+		return variations;
+	}
+
+	const blockType = getBlockType( state, blockName );
+	const attributeKeys = Object.keys( blockType?.attributes || {} );
+	let match;
+	let maxMatchedAttributes = 0;
+
+	for ( const variation of variations ) {
 		if ( Array.isArray( variation.isActive ) ) {
-			const blockType = getBlockType( state, blockName );
-			const attributeKeys = Object.keys( blockType?.attributes || {} );
 			const definedAttributes = variation.isActive.filter(
-				( attribute ) => attributeKeys.includes( attribute )
+				( attribute ) => {
+					// We support nested attribute paths, e.g. `layout.type`.
+					// In this case, we need to check if the part before the
+					// first dot is a known attribute.
+					const topLevelAttribute = attribute.split( '.' )[ 0 ];
+					return attributeKeys.includes( topLevelAttribute );
+				}
 			);
-			if ( definedAttributes.length === 0 ) {
-				return false;
+			const definedAttributesLength = definedAttributes.length;
+			if ( definedAttributesLength === 0 ) {
+				continue;
 			}
-			return definedAttributes.every(
-				( attribute ) =>
-					attributes[ attribute ] ===
-					variation.attributes[ attribute ]
-			);
+			const isMatch = definedAttributes.every( ( attribute ) => {
+				const variationAttributeValue = getValueFromObjectPath(
+					variation.attributes,
+					attribute
+				);
+				if ( variationAttributeValue === undefined ) {
+					return false;
+				}
+				let blockAttributeValue = getValueFromObjectPath(
+					attributes,
+					attribute
+				);
+				if ( blockAttributeValue instanceof RichTextData ) {
+					blockAttributeValue = blockAttributeValue.toHTMLString();
+				}
+				return matchesAttributes(
+					blockAttributeValue,
+					variationAttributeValue
+				);
+			} );
+			if ( isMatch && definedAttributesLength > maxMatchedAttributes ) {
+				match = variation;
+				maxMatchedAttributes = definedAttributesLength;
+			}
+		} else if ( variation.isActive?.( attributes, variation.attributes ) ) {
+			// If isActive is a function, we cannot know how many attributes it matches.
+			// This means that we cannot compare the specificity of our matches,
+			// and simply return the best match we have found.
+			return match || variation;
 		}
-
-		return variation.isActive?.( attributes, variation.attributes );
-	} );
-
+	}
 	return match;
 }
 
@@ -645,6 +682,18 @@ export function hasBlockSupport( state, nameOrType, feature, defaultSupports ) {
 	return !! getBlockSupport( state, nameOrType, feature, defaultSupports );
 }
 
+/**
+ * Normalizes a search term string: removes accents, converts to lowercase, removes extra whitespace.
+ *
+ * @param {string|null|undefined} term Search term to normalize.
+ * @return {string} Normalized search term.
+ */
+function getNormalizedSearchTerm( term ) {
+	return removeAccents( term ?? '' )
+		.toLowerCase()
+		.trim();
+}
+
 /**
  * Returns true if the block type by the given name or object value matches a
  * search term, or false otherwise.
@@ -684,30 +733,12 @@ export function hasBlockSupport( state, nameOrType, feature, defaultSupports ) {
  *
  * @return {Object[]} Whether block type matches search term.
  */
-export function isMatchingSearchTerm( state, nameOrType, searchTerm ) {
+export function isMatchingSearchTerm( state, nameOrType, searchTerm = '' ) {
 	const blockType = getNormalizedBlockType( state, nameOrType );
-
-	const getNormalizedSearchTerm = pipe( [
-		// Disregard diacritics.
-		//  Input: "média"
-		( term ) => removeAccents( term ?? '' ),
-
-		// Lowercase.
-		//  Input: "MEDIA"
-		( term ) => term.toLowerCase(),
-
-		// Strip leading and trailing whitespace.
-		//  Input: " media "
-		( term ) => term.trim(),
-	] );
-
 	const normalizedSearchTerm = getNormalizedSearchTerm( searchTerm );
 
-	const isSearchMatch = pipe( [
-		getNormalizedSearchTerm,
-		( normalizedCandidate ) =>
-			normalizedCandidate.includes( normalizedSearchTerm ),
-	] );
+	const isSearchMatch = ( candidate ) =>
+		getNormalizedSearchTerm( candidate ).includes( normalizedSearchTerm );
 
 	return (
 		isSearchMatch( blockType.title ) ||
@@ -793,23 +824,11 @@ export const hasChildBlocksWithInserterSupport = ( state, blockName ) => {
 	} );
 };
 
-/**
- * DO-NOT-USE in production.
- * This selector is created for internal/experimental only usage and may be
- * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
- */
-export const __experimentalHasContentRoleAttribute = createSelector(
-	( state, blockTypeName ) => {
-		const blockType = getBlockType( state, blockTypeName );
-		if ( ! blockType ) {
-			return false;
-		}
-
-		return Object.entries( blockType.attributes ).some(
-			( [ , { __experimentalRole } ] ) => __experimentalRole === 'content'
-		);
-	},
-	( state, blockTypeName ) => [
-		state.blockTypes[ blockTypeName ]?.attributes,
-	]
-);
+export const __experimentalHasContentRoleAttribute = ( ...args ) => {
+	deprecated( '__experimentalHasContentRoleAttribute', {
+		since: '6.7',
+		version: '6.8',
+		hint: 'This is a private selector.',
+	} );
+	return privateHasContentRoleAttribute( ...args );
+};
diff --git a/packages/blocks/src/store/test/reducer.js b/packages/blocks/src/store/test/reducer.js
index 5664f9d876cb6e..1a295f1efc30d7 100644
--- a/packages/blocks/src/store/test/reducer.js
+++ b/packages/blocks/src/store/test/reducer.js
@@ -10,6 +10,7 @@ import {
 	addBlockVariations,
 	addBlockTypes,
 	removeBlockVariations,
+	addBlockStyles,
 } from '../actions';
 import {
 	unprocessedBlockTypes,
@@ -108,30 +109,55 @@ describe( 'blockStyles', () => {
 		expect( blockStyles( undefined, {} ) ).toEqual( {} );
 	} );
 
-	it( 'should add a new block styles', () => {
+	it( 'should add new block styles for a single block type', () => {
 		const original = deepFreeze( {} );
 
-		let state = blockStyles( original, {
-			type: 'ADD_BLOCK_STYLES',
-			blockName,
-			styles: [ { name: 'fancy' } ],
-		} );
+		let state = blockStyles(
+			original,
+			addBlockStyles( blockName, [ { name: 'fancy' } ] )
+		);
 
 		expect( state ).toEqual( {
 			[ blockName ]: [ { name: 'fancy' } ],
 		} );
 
-		state = blockStyles( state, {
-			type: 'ADD_BLOCK_STYLES',
-			blockName,
-			styles: [ { name: 'lightbox' } ],
-		} );
+		state = blockStyles(
+			state,
+			addBlockStyles( blockName, [ { name: 'lightbox' } ] )
+		);
 
 		expect( state ).toEqual( {
 			[ blockName ]: [ { name: 'fancy' }, { name: 'lightbox' } ],
 		} );
 	} );
 
+	it( 'should add block styles for array of block types', () => {
+		const original = deepFreeze( {} );
+
+		let state = blockStyles(
+			original,
+			addBlockStyles(
+				[ 'core/group', 'core/columns' ],
+				[ { name: 'dark' } ]
+			)
+		);
+
+		expect( state ).toEqual( {
+			'core/group': [ { name: 'dark' } ],
+			'core/columns': [ { name: 'dark' } ],
+		} );
+
+		state = blockStyles(
+			state,
+			addBlockStyles( [ 'core/group' ], [ { name: 'light' } ] )
+		);
+
+		expect( state ).toEqual( {
+			'core/group': [ { name: 'dark' }, { name: 'light' } ],
+			'core/columns': [ { name: 'dark' } ],
+		} );
+	} );
+
 	it( 'should prepend block styles when adding a block', () => {
 		const original = deepFreeze( {
 			[ blockName ]: [ { name: 'fancy' } ],
@@ -394,6 +420,22 @@ describe( 'categories', () => {
 		expect( state ).toEqual( [ { slug: 'wings', title: 'Wings' } ] );
 	} );
 
+	it( 'should ensure, that categories are unique by slug', () => {
+		const original = deepFreeze( [
+			{ slug: 'chicken', title: 'Chicken' },
+		] );
+
+		const state = categories( original, {
+			type: 'SET_CATEGORIES',
+			categories: [ { slug: 'chicken', title: 'Another chicken' } ],
+		} );
+
+		expect( state ).toEqual( [
+			{ slug: 'chicken', title: 'Another chicken' },
+		] );
+		expect( state.length ).toBe( 1 );
+	} );
+
 	it( 'should add the category icon', () => {
 		const original = deepFreeze( [
 			{
diff --git a/packages/blocks/src/store/test/selectors.js b/packages/blocks/src/store/test/selectors.js
index 1fda11d72311a3..1f95809c9674b0 100644
--- a/packages/blocks/src/store/test/selectors.js
+++ b/packages/blocks/src/store/test/selectors.js
@@ -17,6 +17,11 @@ import {
 	getActiveBlockVariation,
 } from '../selectors';
 
+/**
+ * WordPress dependencies
+ */
+import { RichTextData } from '@wordpress/rich-text';
+
 const keyBlocksByName = ( blocks ) =>
 	blocks.reduce(
 		( result, block ) => ( { ...result, [ block.name ]: block } ),
@@ -291,6 +296,7 @@ describe( 'selectors', () => {
 					testAttribute: {},
 					firstTestAttribute: {},
 					secondTestAttribute: {},
+					thirdTestAttribute: {},
 				},
 			};
 			const FIRST_VARIATION_TEST_ATTRIBUTE_VALUE = 1;
@@ -410,6 +416,161 @@ describe( 'selectors', () => {
 					expect( result ).toEqual( variation );
 				} );
 			} );
+			it( 'should support nested attribute paths in the isActive array', () => {
+				const variations = [
+					{
+						name: 'variation-1',
+						attributes: {
+							firstTestAttribute: {
+								nestedProperty: 1,
+								otherNestedProperty: 5555,
+							},
+						},
+						isActive: [ 'firstTestAttribute.nestedProperty' ],
+					},
+					{
+						name: 'variation-2',
+						attributes: {
+							firstTestAttribute: {
+								nestedProperty: 2,
+								otherNestedProperty: 5555,
+							},
+						},
+						isActive: [ 'firstTestAttribute.nestedProperty' ],
+					},
+				];
+				const state =
+					createBlockVariationsStateWithTestBlockType( variations );
+
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: {
+							nestedProperty: 1,
+						},
+					} )
+				).toEqual( variations[ 0 ] );
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: {
+							nestedProperty: 2,
+						},
+					} )
+				).toEqual( variations[ 1 ] );
+			} );
+			it( 'should support RichText attributes in the isActive array', () => {
+				const variations = [
+					{
+						name: 'variation-1',
+						attributes: {
+							firstTestAttribute:
+								'This is a <strong>RichText</strong> attribute.',
+						},
+						isActive: [ 'firstTestAttribute' ],
+					},
+					{
+						name: 'variation-2',
+						attributes: {
+							firstTestAttribute:
+								'This is a <em>RichText</em> attribute.',
+						},
+						isActive: [ 'firstTestAttribute' ],
+					},
+				];
+				const state =
+					createBlockVariationsStateWithTestBlockType( variations );
+
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: RichTextData.fromHTMLString(
+							'This is a <strong>RichText</strong> attribute.'
+						),
+					} )
+				).toEqual( variations[ 0 ] );
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: RichTextData.fromHTMLString(
+							'This is a <em>RichText</em> attribute.'
+						),
+					} )
+				).toEqual( variations[ 1 ] );
+			} );
+			it( 'should compare object attributes in the isActive array based on given properties', () => {
+				const variations = [
+					{
+						name: 'variation-1',
+						attributes: {
+							firstTestAttribute: {
+								nestedProperty: 1,
+								secondNestedProperty: 10,
+							},
+							secondTestAttribute: {
+								nestedProperty: {
+									firstDeeplyNestedProperty: 'a1',
+									secondDeeplyNestedProperty: 'a2',
+								},
+							},
+						},
+						isActive: [
+							'firstTestAttribute',
+							'secondTestAttribute.nestedProperty',
+						],
+					},
+					{
+						name: 'variation-2',
+						attributes: {
+							firstTestAttribute: {
+								nestedProperty: 2,
+								secondNestedProperty: 20,
+							},
+							secondTestAttribute: {
+								nestedProperty: {
+									firstDeeplyNestedProperty: 'b1',
+									secondDeeplyNestedProperty: 'b2',
+								},
+							},
+						},
+						isActive: [
+							'firstTestAttribute',
+							'secondTestAttribute.nestedProperty',
+						],
+					},
+				];
+				const state =
+					createBlockVariationsStateWithTestBlockType( variations );
+
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: {
+							nestedProperty: 1,
+							secondNestedProperty: 10,
+							otherNestedProperty: 5555,
+						},
+						secondTestAttribute: {
+							nestedProperty: {
+								firstDeeplyNestedProperty: 'a1',
+								secondDeeplyNestedProperty: 'a2',
+								otherDeeplyNestedProperty: 'ffff',
+							},
+						},
+					} )
+				).toEqual( variations[ 0 ] );
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: {
+							nestedProperty: 2,
+							secondNestedProperty: 20,
+							otherNestedProperty: 5555,
+						},
+						secondTestAttribute: {
+							nestedProperty: {
+								firstDeeplyNestedProperty: 'b1',
+								secondDeeplyNestedProperty: 'b2',
+								otherDeeplyNestedProperty: 'ffff',
+							},
+						},
+					} )
+				).toEqual( variations[ 1 ] );
+			} );
 			it( 'should return the active variation based on the given isActive array (multiple values)', () => {
 				const variations = [
 					{
@@ -469,6 +630,136 @@ describe( 'selectors', () => {
 					} )
 				).toEqual( variations[ 2 ] );
 			} );
+			it( 'should return the active variation using the match with the highest specificity for the given isActive array (multiple values)', () => {
+				const variations = [
+					{
+						name: 'variation-1',
+						attributes: {
+							firstTestAttribute: 1,
+							secondTestAttribute: 2,
+						},
+						isActive: [
+							'firstTestAttribute',
+							'secondTestAttribute',
+						],
+					},
+					{
+						name: 'variation-2',
+						attributes: {
+							firstTestAttribute: 1,
+							secondTestAttribute: 2,
+							thirdTestAttribute: 3,
+						},
+						isActive: [
+							'firstTestAttribute',
+							'secondTestAttribute',
+							'thirdTestAttribute',
+						],
+					},
+					{
+						name: 'variation-3',
+						attributes: {
+							firstTestAttribute: 1,
+							thirdTestAttribute: 3,
+						},
+						isActive: [
+							'firstTestAttribute',
+							'thirdTestAttribute',
+						],
+					},
+				];
+
+				const state =
+					createBlockVariationsStateWithTestBlockType( variations );
+
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: 1,
+						secondTestAttribute: 2,
+					} )
+				).toEqual( variations[ 0 ] );
+				// All variations match the following attributes. Since all matches have an array for their isActive
+				// fields, we can compare the specificity of each match and return the most specific match.
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: 1,
+						secondTestAttribute: 2,
+						thirdTestAttribute: 3,
+					} )
+				).toEqual( variations[ 1 ] );
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: 1,
+						thirdTestAttribute: 3,
+					} )
+				).toEqual( variations[ 2 ] );
+			} );
+			it( 'should return the active variation using the first match given the isActive array (multiple values) and function', () => {
+				const variations = [
+					{
+						name: 'variation-1',
+						attributes: {
+							firstTestAttribute: 1,
+							secondTestAttribute: 2,
+						},
+						isActive: [
+							'firstTestAttribute',
+							'secondTestAttribute',
+						],
+					},
+					{
+						name: 'variation-2',
+						attributes: {
+							firstTestAttribute: 1,
+							secondTestAttribute: 2,
+							thirdTestAttribute: 3,
+						},
+						isActive: [
+							'firstTestAttribute',
+							'secondTestAttribute',
+							'thirdTestAttribute',
+						],
+					},
+					{
+						name: 'variation-3',
+						attributes: {
+							firstTestAttribute: 1,
+							thirdTestAttribute: 3,
+						},
+						isActive: ( blockAttributes, variationAttributes ) =>
+							blockAttributes.firstTestAttribute ===
+								variationAttributes.firstTestAttribute &&
+							blockAttributes.thirdTestAttribute ===
+								variationAttributes.thirdTestAttribute,
+					},
+				];
+
+				const state =
+					createBlockVariationsStateWithTestBlockType( variations );
+
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: 1,
+						secondTestAttribute: 2,
+					} )
+				).toEqual( variations[ 0 ] );
+				// All variations match the following attributes. However, since the third variation has a function
+				// for its isActive field, we cannot compare the specificity of each match, so instead we return the
+				// best match we've found.
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: 1,
+						secondTestAttribute: 2,
+						thirdTestAttribute: 3,
+					} )
+				).toEqual( variations[ 1 ] );
+				expect(
+					getActiveBlockVariation( state, blockName, {
+						firstTestAttribute: 1,
+						thirdTestAttribute: 3,
+					} )
+				).toEqual( variations[ 2 ] );
+			} );
 			it( 'should ignore attributes that are not defined in the block type', () => {
 				const variations = [
 					{
diff --git a/packages/blocks/src/store/utils.js b/packages/blocks/src/store/utils.js
index 64974bd8000b27..ce9b9f9ab3be94 100644
--- a/packages/blocks/src/store/utils.js
+++ b/packages/blocks/src/store/utils.js
@@ -18,3 +18,33 @@ export const getValueFromObjectPath = ( object, path, defaultValue ) => {
 	} );
 	return value ?? defaultValue;
 };
+
+function isObject( candidate ) {
+	return (
+		typeof candidate === 'object' &&
+		candidate.constructor === Object &&
+		candidate !== null
+	);
+}
+
+/**
+ * Determine whether a set of object properties matches a given object.
+ *
+ * Given an object of block attributes and an object of variation attributes,
+ * this function checks recursively whether all the variation attributes are
+ * present in the block attributes object.
+ *
+ * @param {Object} blockAttributes     The object to inspect.
+ * @param {Object} variationAttributes The object of property values to match.
+ * @return {boolean} Whether the block attributes match the variation attributes.
+ */
+export function matchesAttributes( blockAttributes, variationAttributes ) {
+	if ( isObject( blockAttributes ) && isObject( variationAttributes ) ) {
+		return Object.entries( variationAttributes ).every(
+			( [ key, value ] ) =>
+				matchesAttributes( blockAttributes?.[ key ], value )
+		);
+	}
+
+	return blockAttributes === variationAttributes;
+}
diff --git a/packages/browserslist-config/.npmrc b/packages/browserslist-config/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/browserslist-config/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/browserslist-config/CHANGELOG.md b/packages/browserslist-config/CHANGELOG.md
index 4fdb2307059f8c..8a2dc5d0ecc484 100644
--- a/packages/browserslist-config/CHANGELOG.md
+++ b/packages/browserslist-config/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 6.10.0 (2024-10-16)
+
+## 6.9.0 (2024-10-03)
+
+## 6.8.0 (2024-09-19)
+
+## 6.7.0 (2024-09-05)
+
+## 6.6.0 (2024-08-21)
+
+## 6.5.0 (2024-08-07)
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 5.41.0 (2024-05-16)
+
+## 5.40.0 (2024-05-02)
+
+## 5.39.0 (2024-04-19)
+
+## 5.38.0 (2024-04-03)
+
+## 5.37.0 (2024-03-21)
+
+## 5.36.0 (2024-03-06)
+
+## 5.35.0 (2024-02-21)
+
+## 5.34.0 (2024-02-09)
+
+## 5.33.0 (2024-01-24)
+
+## 5.32.0 (2024-01-10)
+
+## 5.31.0 (2023-12-13)
+
 ## 5.30.0 (2023-11-29)
 
 ## 5.29.0 (2023-11-16)
@@ -64,7 +112,7 @@
 
 ## 5.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -89,56 +137,56 @@
 
 ## 2.1.4 (2018-05-18)
 
-### Polish
+### Internal
 
 -   Fix: Standardized `package.json` format ([#119](https://github.com/WordPress/packages/pull/119))
 
 ## 2.1.3 (2018-05-18)
 
-### Polish
+### Internal
 
 -   Docs update of the Browserslist example repo URL ([#98](https://github.com/WordPress/packages/pull/98))
 
 ## 2.1.2 (2018-02-28)
 
-### Polish
+### Internal
 
 -   Removed `package-lock.json` file, lockfiles for apps, not packages ([#88](https://github.com/WordPress/packages/pull/88))
 
 ## 2.1.1 (2018-02-21)
 
-### Polish
+### Internal
 
 -   Added "Code is Poetry" footer to README.md ([#82](https://github.com/WordPress/packages/pull/82))
 
 ## 2.1.0 (2018-02-15)
 
-### New Feature
+### New Features
 
 -   Updated Browserslist to v3.1.0 ([#81](https://github.com/WordPress/packages/pull/81))
 
 ## 2.0.0
 
-### Breaking Change
+### Breaking Changes
 
 -   Transfer to @wordpress npm organization.
 -   Published as @wordpress/browserslist-config.
 
 ## 1.1.0
 
-### New Feature
+### New Features
 
 -   Add browserslist tests.
 -   Refactor per coding standards.
 
 ## 1.0.1
 
-### Polish
+### Internal
 
 -   Update installation documentation.
 
 ## 1.0.0
 
-### New Feature
+### New Features
 
 -   Initial release.
diff --git a/packages/browserslist-config/README.md b/packages/browserslist-config/README.md
index 0ab8e724947d7a..2376c8332a2b81 100644
--- a/packages/browserslist-config/README.md
+++ b/packages/browserslist-config/README.md
@@ -10,7 +10,7 @@ Install the module
 $ npm install browserslist @wordpress/browserslist-config --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Usage
 
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index f0a6895b3d8d92..8b19151e950475 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/browserslist-config",
-	"version": "5.30.0",
+	"version": "6.10.0",
 	"description": "WordPress Browserslist shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"index.js"
diff --git a/packages/commands/CHANGELOG.md b/packages/commands/CHANGELOG.md
index e99fa417e0e4c8..c75dbab26739d8 100644
--- a/packages/commands/CHANGELOG.md
+++ b/packages/commands/CHANGELOG.md
@@ -2,6 +2,62 @@
 
 ## Unreleased
 
+## 1.10.0 (2024-10-16)
+
+## 1.9.0 (2024-10-03)
+
+## 1.8.0 (2024-09-19)
+
+## 1.7.0 (2024-09-05)
+
+## 1.6.0 (2024-08-21)
+
+## 1.5.0 (2024-08-07)
+
+## 1.4.0 (2024-07-24)
+
+## 1.3.0 (2024-07-10)
+
+## 1.2.0 (2024-06-26)
+
+## 1.1.0 (2024-06-15)
+
+## 1.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 0.29.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 0.28.0 (2024-05-02)
+
+## 0.27.0 (2024-04-19)
+
+## 0.26.0 (2024-04-03)
+
+## 0.25.0 (2024-03-21)
+
+## 0.24.0 (2024-03-06)
+
+## 0.23.0 (2024-02-21)
+
+## 0.22.0 (2024-02-09)
+
+## 0.21.0 (2024-01-24)
+
+## 0.20.0 (2024-01-10)
+
+### Enhancements
+
+-   Support conditional commands and commands loaders using the "disabled" config.
+
+## 0.19.0 (2023-12-13)
+
 ## 0.18.0 (2023-11-29)
 
 ## 0.17.0 (2023-11-16)
diff --git a/packages/commands/package.json b/packages/commands/package.json
index 98ba9be50d9003..4d35172ce8186d 100644
--- a/packages/commands/package.json
+++ b/packages/commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/commands",
-	"version": "0.18.0",
+	"version": "1.10.0",
 	"description": "Handles the commands menu.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,23 +20,23 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/components": "file:../components",
-		"@wordpress/data": "file:../data",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-		"@wordpress/private-apis": "file:../private-apis",
-		"classnames": "^2.3.1",
-		"cmdk": "^0.2.0",
-		"rememo": "^4.0.2"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/components": "*",
+		"@wordpress/data": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/keyboard-shortcuts": "*",
+		"@wordpress/private-apis": "*",
+		"clsx": "^2.1.1",
+		"cmdk": "^1.0.0"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -44,5 +44,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/commands/src/components/command-menu.js b/packages/commands/src/components/command-menu.js
index e844fce7bae73c..55f78ac02c655b 100644
--- a/packages/commands/src/components/command-menu.js
+++ b/packages/commands/src/components/command-menu.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { Command, useCommandState } from 'cmdk';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -32,6 +32,8 @@ import { Icon, search as inputIcon } from '@wordpress/icons';
  */
 import { store as commandsStore } from '../store';
 
+const inputLabel = __( 'Search commands and settings' );
+
 function CommandMenuLoader( { name, search, hook, setLoader, close } ) {
 	const { isLoading, commands = [] } = hook( { search } ) ?? {};
 	useEffect( () => {
@@ -44,34 +46,29 @@ function CommandMenuLoader( { name, search, hook, setLoader, close } ) {
 
 	return (
 		<>
-			<Command.List>
-				{ commands.map( ( command ) => (
-					<Command.Item
-						key={ command.name }
-						value={ command.searchLabel ?? command.label }
-						onSelect={ () => command.callback( { close } ) }
-						id={ command.name }
+			{ commands.map( ( command ) => (
+				<Command.Item
+					key={ command.name }
+					value={ command.searchLabel ?? command.label }
+					onSelect={ () => command.callback( { close } ) }
+					id={ command.name }
+				>
+					<HStack
+						alignment="left"
+						className={ clsx( 'commands-command-menu__item', {
+							'has-icon': command.icon,
+						} ) }
 					>
-						<HStack
-							alignment="left"
-							className={ classnames(
-								'commands-command-menu__item',
-								{
-									'has-icon': command.icon,
-								}
-							) }
-						>
-							{ command.icon && <Icon icon={ command.icon } /> }
-							<span>
-								<TextHighlight
-									text={ command.label }
-									highlight={ search }
-								/>
-							</span>
-						</HStack>
-					</Command.Item>
-				) ) }
-			</Command.List>
+						{ command.icon && <Icon icon={ command.icon } /> }
+						<span>
+							<TextHighlight
+								text={ command.label }
+								highlight={ search }
+							/>
+						</span>
+					</HStack>
+				</Command.Item>
+			) ) }
 		</>
 	);
 }
@@ -82,11 +79,11 @@ export function CommandMenuLoaderWrapper( { hook, search, setLoader, close } ) {
 	// the CommandMenuLoaderWrapper component need to be
 	// remounted on each hook prop change
 	// We use the key state to make sure we do that properly.
-	const currentLoader = useRef( hook );
+	const currentLoaderRef = useRef( hook );
 	const [ key, setKey ] = useState( 0 );
 	useEffect( () => {
-		if ( currentLoader.current !== hook ) {
-			currentLoader.current = hook;
+		if ( currentLoaderRef.current !== hook ) {
+			currentLoaderRef.current = hook;
 			setKey( ( prevKey ) => prevKey + 1 );
 		}
 	}, [ hook ] );
@@ -94,7 +91,7 @@ export function CommandMenuLoaderWrapper( { hook, search, setLoader, close } ) {
 	return (
 		<CommandMenuLoader
 			key={ key }
-			hook={ currentLoader.current }
+			hook={ currentLoaderRef.current }
 			search={ search }
 			setLoader={ setLoader }
 			close={ close }
@@ -129,7 +126,7 @@ export function CommandMenuGroup( { isContextual, search, setLoader, close } ) {
 				>
 					<HStack
 						alignment="left"
-						className={ classnames( 'commands-command-menu__item', {
+						className={ clsx( 'commands-command-menu__item', {
 							'has-icon': command.icon,
 						} ) }
 					>
@@ -176,7 +173,7 @@ function CommandInput( { isOpen, search, setSearch } ) {
 			ref={ commandMenuInput }
 			value={ search }
 			onValueChange={ setSearch }
-			placeholder={ __( 'Search for commands' ) }
+			placeholder={ inputLabel }
 			aria-activedescendant={ selectedItemId }
 			icon={ search }
 		/>
@@ -213,7 +210,9 @@ export function CommandMenu() {
 		/** @type {import('react').KeyboardEventHandler} */
 		( event ) => {
 			// Bails to avoid obscuring the effect of the preceding handler(s).
-			if ( event.defaultPrevented ) return;
+			if ( event.defaultPrevented ) {
+				return;
+			}
 
 			event.preventDefault();
 			if ( isOpen ) {
@@ -265,21 +264,19 @@ export function CommandMenu() {
 			overlayClassName="commands-command-menu__overlay"
 			onRequestClose={ closeAndReset }
 			__experimentalHideHeader
+			contentLabel={ __( 'Command palette' ) }
 		>
 			<div className="commands-command-menu__container">
-				<Command
-					label={ __( 'Command palette' ) }
-					onKeyDown={ onKeyDown }
-				>
+				<Command label={ inputLabel } onKeyDown={ onKeyDown }>
 					<div className="commands-command-menu__header">
-						<Icon icon={ inputIcon } />
 						<CommandInput
 							search={ search }
 							setSearch={ setSearch }
 							isOpen={ isOpen }
 						/>
+						<Icon icon={ inputIcon } />
 					</div>
-					<Command.List>
+					<Command.List label={ __( 'Command suggestions' ) }>
 						{ search && ! isLoading && (
 							<Command.Empty>
 								{ __( 'No results found.' ) }
diff --git a/packages/commands/src/components/style.scss b/packages/commands/src/components/style.scss
index aeb818507f0730..bcf3d17d7baa6c 100644
--- a/packages/commands/src/components/style.scss
+++ b/packages/commands/src/components/style.scss
@@ -3,12 +3,12 @@
 	border-radius: $grid-unit-05;
 	width: calc(100% - #{$grid-unit-40});
 	margin: auto;
-	max-width: 420px;
+	max-width: 400px;
 	position: relative;
-	top: calc(15% + #{$header-height});
+	top: calc(5% + #{$header-height});
 
 	@include break-small() {
-		top: 15%;
+		top: calc(10% + #{$header-height});
 	}
 
 	.components-modal__content {
@@ -25,15 +25,15 @@
 .commands-command-menu__header {
 	display: flex;
 	align-items: center;
-	padding-left: $grid-unit-20;
+	padding: 0 $grid-unit-20;
 
 	.components-button {
 		height: $grid-unit-70;
 		width: $grid-unit-70;
-		border: 1px solid $gray-600;
+		border: $border-width solid $gray-600;
 		border-right: 0;
 		justify-content: center;
-		border-radius: $radius-block-ui 0 0 $radius-block-ui;
+		border-radius: $radius-small 0 0 $radius-small;
 
 		& + [cmdk-input] {
 			border-top-left-radius: 0;
@@ -49,11 +49,11 @@
 	[cmdk-input] {
 		border: none;
 		width: 100%;
-		padding: $grid-unit-20 $grid-unit-20 $grid-unit-20 $grid-unit-10;
+		padding: $grid-unit-20 $grid-unit-05;
 		outline: none;
 		color: $gray-900;
 		margin: 0;
-		font-size: 16px;
+		font-size: 15px;
 		line-height: 28px;
 		border-radius: 0;
 
@@ -68,13 +68,12 @@
 	}
 
 	[cmdk-item] {
-		border-radius: $radius-block-ui;
+		border-radius: $radius-small;
 		cursor: pointer;
 		display: flex;
 		align-items: center;
 		color: $gray-900;
 		font-size: $default-font-size;
-		min-height: $button-size-next-default-40px;
 
 		&[aria-selected="true"],
 		&:active {
@@ -96,7 +95,8 @@
 		}
 
 		> div {
-			padding: $grid-unit;
+			min-height: $button-size-next-default-40px;
+			padding: $grid-unit-05;
 			padding-left: $grid-unit-50; // Account for commands without icons.
 		}
 
@@ -109,8 +109,13 @@
 		max-height: 368px; // Specific to not have commands overflow oddly.
 		overflow: auto;
 
+		// Ensures there is always padding bottom on the last group, when there are commands.
+		& [cmdk-list-sizer] > [cmdk-group]:last-child [cmdk-group-items]:not(:empty) {
+			padding-bottom: $grid-unit-10;
+		}
+
 		& [cmdk-list-sizer] > [cmdk-group] > [cmdk-group-items]:not(:empty) {
-			padding: 0 $grid-unit $grid-unit;
+			padding: 0 $grid-unit-10;
 		}
 	}
 
diff --git a/packages/commands/src/hooks/use-command-loader.js b/packages/commands/src/hooks/use-command-loader.js
index 2c554cf17d974a..5143cbb0d5ef20 100644
--- a/packages/commands/src/hooks/use-command-loader.js
+++ b/packages/commands/src/hooks/use-command-loader.js
@@ -82,6 +82,9 @@ export default function useCommandLoader( loader ) {
 	const { registerCommandLoader, unregisterCommandLoader } =
 		useDispatch( commandsStore );
 	useEffect( () => {
+		if ( loader.disabled ) {
+			return;
+		}
 		registerCommandLoader( {
 			name: loader.name,
 			hook: loader.hook,
@@ -94,6 +97,7 @@ export default function useCommandLoader( loader ) {
 		loader.name,
 		loader.hook,
 		loader.context,
+		loader.disabled,
 		registerCommandLoader,
 		unregisterCommandLoader,
 	] );
diff --git a/packages/commands/src/hooks/use-command.js b/packages/commands/src/hooks/use-command.js
index 87092712072c4b..32ff6336a7d467 100644
--- a/packages/commands/src/hooks/use-command.js
+++ b/packages/commands/src/hooks/use-command.js
@@ -32,19 +32,22 @@ import { store as commandsStore } from '../store';
  */
 export default function useCommand( command ) {
 	const { registerCommand, unregisterCommand } = useDispatch( commandsStore );
-	const currentCallback = useRef( command.callback );
+	const currentCallbackRef = useRef( command.callback );
 	useEffect( () => {
-		currentCallback.current = command.callback;
+		currentCallbackRef.current = command.callback;
 	}, [ command.callback ] );
 
 	useEffect( () => {
+		if ( command.disabled ) {
+			return;
+		}
 		registerCommand( {
 			name: command.name,
 			context: command.context,
 			label: command.label,
 			searchLabel: command.searchLabel,
 			icon: command.icon,
-			callback: ( ...args ) => currentCallback.current( ...args ),
+			callback: ( ...args ) => currentCallbackRef.current( ...args ),
 		} );
 		return () => {
 			unregisterCommand( command.name );
@@ -55,6 +58,7 @@ export default function useCommand( command ) {
 		command.searchLabel,
 		command.icon,
 		command.context,
+		command.disabled,
 		registerCommand,
 		unregisterCommand,
 	] );
diff --git a/packages/commands/src/lock-unlock.js b/packages/commands/src/lock-unlock.js
index e11bd687d87421..ffff128cdb91b7 100644
--- a/packages/commands/src/lock-unlock.js
+++ b/packages/commands/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/commands'
 	);
diff --git a/packages/commands/src/store/actions.js b/packages/commands/src/store/actions.js
index f6d9105dd2b906..2926bb84ab6079 100644
--- a/packages/commands/src/store/actions.js
+++ b/packages/commands/src/store/actions.js
@@ -11,6 +11,7 @@
  * @property {string=}     context     Command context.
  * @property {JSX.Element} icon        Command icon.
  * @property {Function}    callback    Command callback.
+ * @property {boolean}     disabled    Whether to disable the command.
  */
 
 /**
@@ -22,9 +23,10 @@
  *
  * @typedef {Object} WPCommandLoaderConfig
  *
- * @property {string}              name    Command loader name.
- * @property {string=}             context Command loader context.
- * @property {WPCommandLoaderHook} hook    Command loader hook.
+ * @property {string}              name     Command loader name.
+ * @property {string=}             context  Command loader context.
+ * @property {WPCommandLoaderHook} hook     Command loader hook.
+ * @property {boolean}             disabled Whether to disable the command loader.
  */
 
 /**
diff --git a/packages/commands/src/store/selectors.js b/packages/commands/src/store/selectors.js
index 426151464131a0..69646c479d5067 100644
--- a/packages/commands/src/store/selectors.js
+++ b/packages/commands/src/store/selectors.js
@@ -1,7 +1,7 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import createSelector from 'rememo';
+import { createSelector } from '@wordpress/data';
 
 /**
  * Returns the registered static commands.
diff --git a/packages/components/.npmrc b/packages/components/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/components/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/components/.stylelintrc.js b/packages/components/.stylelintrc.js
new file mode 100644
index 00000000000000..2a583a09c16059
--- /dev/null
+++ b/packages/components/.stylelintrc.js
@@ -0,0 +1,23 @@
+/** @type {import('stylelint').Config} */
+module.exports = {
+	extends: '../../.stylelintrc.json',
+	rules: {
+		'declaration-property-value-disallowed-list': [
+			{
+				'/.*/': [ '/--wp-admin-theme-/', '/--wp-components-color-/' ],
+			},
+			{
+				message:
+					'To support component theming and ensure proper fallbacks, use Sass variables from packages/components/src/utils/theme-variables.scss instead.',
+			},
+		],
+	},
+	overrides: [
+		{
+			files: [ './src/utils/theme-variables.scss' ],
+			rules: {
+				'declaration-property-value-disallowed-list': null,
+			},
+		},
+	],
+};
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 435a9bf22d9b20..2025a550d55e0f 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,16 +2,796 @@
 
 ## Unreleased
 
+### Bug Fixes
+
+-   `ColorPalette`: prevent overflow of custom color button background ([#66152](https://github.com/WordPress/gutenberg/pull/66152)).
+-   `RadioGroup`: Fix arrow key navigation in RTL ([#66202](https://github.com/WordPress/gutenberg/pull/66202)).
+-   `Tabs` and `ToggleGroupControl`: round indicator size ([#66426](https://github.com/WordPress/gutenberg/pull/66426)).
+
+### Enhancements
+
+-   `PaletteEdit`: use `Item` internally instead of custom styles ([#66164](https://github.com/WordPress/gutenberg/pull/66164)).
+
+### Experimental
+
+-   `Tabs`: add props to control active tab item ([#66223](https://github.com/WordPress/gutenberg/pull/66223)).
+-   `Tabs`: restore vertical alignent for tabs content ([#66215](https://github.com/WordPress/gutenberg/pull/66215)).
+-   `Tabs`: fix indicator animation ([#66198](https://github.com/WordPress/gutenberg/pull/66198)).
+-   `Tabs`: update indicator more reactively ([#66207](https://github.com/WordPress/gutenberg/pull/66207)).
+-   `Tabs` and `TabPanel`: Fix arrow key navigation in RTL ([#66201](https://github.com/WordPress/gutenberg/pull/66201)).
+-   `Tabs`: override tablist's tabindex only when necessary ([#66209](https://github.com/WordPress/gutenberg/pull/66209)).
+
+### Internal
+
+-   ESLint: Stop disabling `react-hooks/exhaustive-deps` rule ([#66324](https://github.com/WordPress/gutenberg/pull/66324)).
+
+## 28.10.0 (2024-10-16)
+
+### Bug Fixes
+
+-   `Tooltip`: add `aria-describedby` to the anchor only if not redundant ([#65989](https://github.com/WordPress/gutenberg/pull/65989)).
+-   `PaletteEdit`: dedupe palette element slugs ([#65772](https://github.com/WordPress/gutenberg/pull/65772)).
+-   `RangeControl`: do not tooltip contents to the DOM when not shown ([#65875](https://github.com/WordPress/gutenberg/pull/65875)).
+-   `Tabs`: fix skipping indication animation glitch ([#65878](https://github.com/WordPress/gutenberg/pull/65878)).
+-   `ToggleGroupControl`: Don't autoselect option on first group focus ([#65892](https://github.com/WordPress/gutenberg/pull/65892)).
+-   `Button`: fix `box-shadow` transition for secondary variation ([#66045](https://github.com/WordPress/gutenberg/pull/66045)).
+-   `ToggleGroupControl`: Don't set value on focus after a reset ([#66151](https://github.com/WordPress/gutenberg/pull/66151)).
+
+### Deprecations
+
+-   `SearchControl`: Soft deprecate `onClose` prop ([#65988](https://github.com/WordPress/gutenberg/pull/65988)).
+
+### Enhancements
+
+-   `Modal`: Modal dialog small improvement for elementShouldBeHidden ([#65941](https://github.com/WordPress/gutenberg/pull/65941)).
+-   `Tabs`: revamped vertical orientation styles ([#65387](https://github.com/WordPress/gutenberg/pull/65387)).
+-   `ComboboxControl`: display `No items found` when there are no matches found ([#66142](https://github.com/WordPress/gutenberg/pull/66142))
+-   `FormTokenField`: display `No items found` when there are no matches found. This occurs when the `__experimentalExpandOnFocus` prop is enabled ([#66142](https://github.com/WordPress/gutenberg/pull/66142))
+
+## 28.9.0 (2024-10-03)
+
+### Bug Fixes
+
+-   `ToolsPanel`: atomic one-step state update when (un)registering panels ([#65564](https://github.com/WordPress/gutenberg/pull/65564)).
+-   `Navigator`: fix `isInitial` logic ([#65527](https://github.com/WordPress/gutenberg/pull/65527)).
+-   `ToggleGroupControl`: Fix arrow key navigation in RTL ([#65735](https://github.com/WordPress/gutenberg/pull/65735)).
+-   `ToggleGroupControl`: indicator doesn't jump around when the layout around it changes ([#65175](https://github.com/WordPress/gutenberg/pull/65175)).
+-   `Composite`: fix legacy support for the store prop ([#65821](https://github.com/WordPress/gutenberg/pull/65821)).
+-   `Composite`: make items tabbable if active element gets removed ([#65720](https://github.com/WordPress/gutenberg/pull/65720)).
+-   `DropZone`: fix class names on drop ([#65798](https://github.com/WordPress/gutenberg/pull/65798)).
+
+### Deprecations
+
+-   `__experimentalBorderControl` can now be imported as a stable `BorderControl` ([#65475](https://github.com/WordPress/gutenberg/pull/65475)).
+-   `__experimentalBorderBoxControl` can now be imported as a stable `BorderBoxControl` ([#65586](https://github.com/WordPress/gutenberg/pull/65586)).
+-   `__experimentalNavigator*` components can now be imported as a stable `Navigator`. Similarly, the `__experimentalUseNavigator` hook can be imported as a stable `useNavigator` ([#65802](https://github.com/WordPress/gutenberg/pull/65802)).
+
+### Enhancements
+
+-   `Tabs`: handle horizontal overflow and large tab lists gracefully ([#64371](https://github.com/WordPress/gutenberg/pull/64371)).
+-   `BorderControl`: promote to stable ([#65475](https://github.com/WordPress/gutenberg/pull/65475)).
+-   `BorderBoxControl`: promote to stable ([#65586](https://github.com/WordPress/gutenberg/pull/65586)).
+-   `MenuGroup`: Simplify the MenuGroup styles within dropdown menus. ([#65561](https://github.com/WordPress/gutenberg/pull/65561)).
+-   `DatePicker`: Use compact button size. ([#65653](https://github.com/WordPress/gutenberg/pull/65653)).
+-   `Navigator`: add support for exit animation ([#64777](https://github.com/WordPress/gutenberg/pull/64777)).
+-   `Guide`: Update finish button to use the new default size ([#65680](https://github.com/WordPress/gutenberg/pull/65680)).
+-   `BorderControl`: Use `__next40pxDefaultSize` prop for Reset button ([#65682](https://github.com/WordPress/gutenberg/pull/65682)).
+-   `Navigator`: stabilize APIs ([#64613](https://github.com/WordPress/gutenberg/pull/64613)).
+-   `ToggleGroupControl`: indicator animation is now more lightweight and performant ([#65175](https://github.com/WordPress/gutenberg/pull/65175)).
+
+## 28.8.0 (2024-09-19)
+
+### Bug Fixes
+
+-   `Tabs`: restore vertical indicator ([#65385](https://github.com/WordPress/gutenberg/pull/65385)).
+-   `Tabs`: indicator positioning under RTL direction ([#64926](https://github.com/WordPress/gutenberg/pull/64926)).
+-   `Popover`: Update `toolbar` variant radius to match block toolbar ([#65263](https://github.com/WordPress/gutenberg/pull/65263)).
+-   `MenuItemsChoice`: Allow menu items height to adapt to its content ([#65204](https://github.com/WordPress/gutenberg/pull/65204)).
+-   `BoxControl`: Unify input filed width whether linked or not ([#65348](https://github.com/WordPress/gutenberg/pull/65348)).
+
+### Deprecations
+
+-   Deprecate `__unstableComposite`, `__unstableCompositeGroup`, `__unstableCompositeItem` and `__unstableUseCompositeState`. Consumers of the package should use the stable `Composite` component instead ([#63572](https://github.com/WordPress/gutenberg/pull/63572)).
+-   `__experimentalBoxControl` can now be imported as a stable `BoxControl` ([#65469](https://github.com/WordPress/gutenberg/pull/65469)).
+
+### New Features
+
+-   `Composite`: add stable version of the component ([#63569](https://github.com/WordPress/gutenberg/pull/63569)).
+-   `ComboboxControl`: add support for `placeholder` attribute ([#65254](https://github.com/WordPress/gutenberg/pull/65254)).
+
+### Enhancements
+
+-   `Navigator`: warn if a screen's `path` doesn't follow a URL-like scheme ([#65231](https://github.com/WordPress/gutenberg/pull/65231)).
+-   `Modal`: Decrease close button size and remove horizontal offset ([#65131](https://github.com/WordPress/gutenberg/pull/65131)).
+-   `CustomSelectControl V2`: Adopt elevation scale ([#65159](https://github.com/WordPress/gutenberg/pull/65159)).
+-   `DropdownMenu V2`: Adopt elevation scale ([#65159](https://github.com/WordPress/gutenberg/pull/65159)).
+-   `FormToggle`: Adopt elevation scale ([#65159](https://github.com/WordPress/gutenberg/pull/65159)).
+-   `Popover`: Adopt elevation scale ([#65159](https://github.com/WordPress/gutenberg/pull/65159)).
+-   `RangeControl`: Adopt elevation scale ([#65159](https://github.com/WordPress/gutenberg/pull/65159)).
+-   `ResizeableBox`: Adopt elevation scale ([#65159](https://github.com/WordPress/gutenberg/pull/65159)).
+-   `Snackbar`: Adopt elevation scale ([#65159](https://github.com/WordPress/gutenberg/pull/65159)).
+-   `Tooltip`: Adopt elevation scale ([#65159](https://github.com/WordPress/gutenberg/pull/65159)).
+-   `Modal`: add exit animation for internally triggered events ([#65203](https://github.com/WordPress/gutenberg/pull/65203)).
+-   `Card`: Adopt radius scale ([#65053](https://github.com/WordPress/gutenberg/pull/65053)).
+-   `BoxControl`: promote to stable ([#65469](https://github.com/WordPress/gutenberg/pull/65469)).
+
+### Bug Fixes
+
+-   `DatePicker`: better hover/focus styles ([#65117](https://github.com/WordPress/gutenberg/pull/65117)).
+
+### Internal
+
+-   `Tabs`: improved performance of the indicator animation ([#64926](https://github.com/WordPress/gutenberg/pull/64926)).
+-   `Composite`: Remove from private APIs ([#63569](https://github.com/WordPress/gutenberg/pull/63569)).
+-   use local copy of `use-lilius` instead of `npm` dependency ([#65097](https://github.com/WordPress/gutenberg/pull/65097)).
+-   `BoxControl`: Fix critical error when null value is passed ([#65287](https://github.com/WordPress/gutenberg/pull/65287)).
+
+## 28.7.0 (2024-09-05)
+
+### Deprecations
+
+-   Deprecate `replace` from the options accepted by `useNavigator().goTo()` ([#64675](https://github.com/WordPress/gutenberg/pull/64675)).
+-   Soft deprecate `size` prop on `AlignmentMatrixControl.Icon` ([#64827](https://github.com/WordPress/gutenberg/pull/64827)).
+-   `__experimentalAlignmentMatrixControl` can now be imported as a stable `AlignmentMatrixControl` ([#60913](https://github.com/WordPress/gutenberg/pull/60913)).
+-   Deprecate `DimensionControl`, scheduled to be removed in WordPress 7.0 ([#64951](https://github.com/WordPress/gutenberg/pull/64951)).
+
+### Enhancements
+
+-   `ColorPicker`: Adopt radius scale ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `CustomSelectControl V2`: Adopt radius scale ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `AlignmentMatrixControl.Icon`: rewrite entirely using SVG markup ([#64827](https://github.com/WordPress/gutenberg/pull/64827)).
+-   `DateTime`: Adopt radius scale ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `FormToggle`: Adopt radius scale ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `FormTokenField`: Remove unused border-radius ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `InputControl`: Adopt radius scale ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `Navigation`: Adopt radius scale ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `RangeControl`: Adopt radius scale ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `ResizeableBox`: Adopt radius scale ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `TabPanel`: Remove radius applied to panel focus style ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `Tabs`: Remove radius applied to panel focus style ([#64693](https://github.com/WordPress/gutenberg/pull/64693)).
+-   `UnitControl`: Update unit select styles ([#64712](https://github.com/WordPress/gutenberg/pull/64712)).
+-   `InputControl`: Add variants to prefix/suffix wrappers ([#64824](https://github.com/WordPress/gutenberg/pull/64824)).
+-   `Navigator`: remove location history, simplify internal logic ([#64675](https://github.com/WordPress/gutenberg/pull/64675)).
+-   `AlignmentMatrixControl`: Promote to stable ([#60913](https://github.com/WordPress/gutenberg/pull/60913)).
+-   Tighten gap between the main control and the prefix/suffix slot for the following components ([#64908](https://github.com/WordPress/gutenberg/pull/64908)).
+    -   `InputControl`
+    -   `NumberControl`
+    -   `SelectControl`
+    -   `TreeSelect`
+    -   `UnitControl`
+    -   Contains internal visual changes from this PR:
+        -   `AnglePickerControl`
+        -   `ColorPicker`
+-   Decrease horizontal padding from 16px to 12px on the following components, when in the 40px default size ([#64708](https://github.com/WordPress/gutenberg/pull/64708)).
+    -   `AnglePickerControl`
+    -   `ColorPicker` (on the inputs)
+    -   `CustomSelectControl`
+    -   `CustomSelectControlV2`
+    -   `DateTimePicker` (on the selects and inputs)
+    -   `DimensionControl`
+    -   `FocalPointPicker` (on the inputs)
+    -   `FontSizePicker` (on the custom inputs)
+    -   `GradientPicker` (on the selects and inputs)
+    -   `InputControl`
+    -   `NumberControl`
+    -   `QueryControls` (on the selects and inputs)
+    -   `RangeControl` (on the inputs)
+    -   `SearchControl`
+    -   `SelectControl`
+    -   `TextControl`
+    -   `TimePicker` (on the inputs)
+    -   `TreeSelect`
+    -   `UnitControl`
+-   `Modal`: Update animation effect ([#64580](https://github.com/WordPress/gutenberg/pull/64580)).
+-   `AlignmentMatrixControl`: do not use composite store directly ([#64850](https://github.com/WordPress/gutenberg/pull/64850)).
+-   `CircularOptionPicker`: do not use composite store directly ([#64833](https://github.com/WordPress/gutenberg/pull/64833)).
+
+### Bug Fixes
+
+-   `TimePicker`: use ToggleGroupControl for AM/PM toggle ([#64800](https://github.com/WordPress/gutenberg/pull/64800)).
+-   `ColorPalette` utils: do not normalize undefined color values ([#64969](https://github.com/WordPress/gutenberg/pull/64969)).
+-   `DatePicker` restore round radius for event dot ([#65031](https://github.com/WordPress/gutenberg/pull/65031)).
+
+### Internal
+
+-   `DropdownMenu` v2: expose CompositeTypeaheadV2 and CompositeHoverV2 via private APIs ([#64985](https://github.com/WordPress/gutenberg/pull/64985)).
+-   `DropdownMenu` v2: fix flashing menu item styles when using keyboard ([#64873](https://github.com/WordPress/gutenberg/pull/64873), [#64942](https://github.com/WordPress/gutenberg/pull/64942)).
+-   `DropdownMenu` v2: refactor to overloaded naming convention ([#64654](https://github.com/WordPress/gutenberg/pull/64654)).
+-   `DropdownMenu` v2: add `GroupLabel` subcomponent ([#64854](https://github.com/WordPress/gutenberg/pull/64854)).
+-   `DropdownMenuV2`: update animation ([#64868](https://github.com/WordPress/gutenberg/pull/64868)).
+-   `Composite` V2: fix Storybook docgen ([#64682](https://github.com/WordPress/gutenberg/pull/64682)).
+-   `Composite` V2: add "With Slot Fill" example ([#65051](https://github.com/WordPress/gutenberg/pull/65051)).
+-   `Composite` V2: accept store props on top-level component ([#64832](https://github.com/WordPress/gutenberg/pull/64832)).
+-   `Composite` V2: remove `store` prop and `useCompositeStore` hook ([#64723](https://github.com/WordPress/gutenberg/pull/64723)).
+
+## 28.6.0 (2024-08-21)
+
+### Deprecations
+
+-   Deprecate bottom margin on the following `BaseControl`-based components. Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version ([#64408](https://github.com/WordPress/gutenberg/pull/64408)).
+    -   `BaseControl`
+    -   `CheckboxControl`
+    -   `ComboboxControl`
+    -   `DimensionControl`
+    -   `FocalPointPicker`
+    -   `RangeControl`
+    -   `SearchControl`
+    -   `SelectControl`
+    -   `TextControl`
+    -   `TextareaControl`
+    -   `ToggleControl`
+    -   `ToggleGroupControl`
+    -   `TreeSelect`
+-   Deprecate `NavigatorToParentButton` and `useNavigator().goToParent()` in favor of `NavigatorBackButton` and `useNavigator().goBack()` ([#63317](https://github.com/WordPress/gutenberg/pull/63317)).
+
+### Enhancements
+
+-   `Placeholder`: Temporarily rewind radius scale ([#64672](https://github.com/WordPress/gutenberg/pull/64672)).
+-   `Composite`: improve Storybook examples and add interactive controls ([#64397](https://github.com/WordPress/gutenberg/pull/64397)).
+-   `Composite`: use internal context to forward the composite store to sub-components ([#64493](https://github.com/WordPress/gutenberg/pull/64493)).
+-   `QueryControls`: Default to new 40px size ([#64457](https://github.com/WordPress/gutenberg/pull/64457)).
+-   `TimePicker`: add `hideLabelFromVision` prop ([#64267](https://github.com/WordPress/gutenberg/pull/64267)).
+-   `FocalPointPicker`: Default to new 40px size ([#64456](https://github.com/WordPress/gutenberg/pull/64456)).
+-   `DropdownMenuV2`: adopt elevation scale ([#64432](https://github.com/WordPress/gutenberg/pull/64432)).
+-   `AlignmentMatrixControl`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `AnglePickerControl`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `BorderControl`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `ButtonGroup`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Button`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `CircularOptionPicker`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `ColorIndicator`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `ColorPalette`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `CustomGradientPicker`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `DropZone`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `DropdownMenuV2`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `FocalPointPicker`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Guide`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Modal`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Placeholder`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Popover`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `ProgressBar`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `RadioControl`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Snackbar`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `TabPanel`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Text`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `ToggleGroupControl`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `ToolbarGroup`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Toolbar`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Tooltip`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `UnitControl`: Adopt radius scale ([#64368](https://github.com/WordPress/gutenberg/pull/64368)).
+-   `Popover`: allow `style` prop usage ([#64489](https://github.com/WordPress/gutenberg/pull/64489)).
+-   `ToolsPanel`: sets column-gap to 16px for ToolsPanel grid ([#64497](https://github.com/WordPress/gutenberg/pull/64497)).
+-   `Modal`: Replace references to deprecated styling variables ([#64655](https://github.com/WordPress/gutenberg/pull/64655)).
+-   `Popover`: Replace references to deprecated styling variables ([#64655](https://github.com/WordPress/gutenberg/pull/64655)).
+-   `Snackbar`: Replace references to deprecated styling variables ([#64655](https://github.com/WordPress/gutenberg/pull/64655)).
+-   `TextareaControl`: Update styles ([#64586](https://github.com/WordPress/gutenberg/pull/64586)).
+-   `CircularOptionPicker`: Update hard-coded border-width value ([#64680](https://github.com/WordPress/gutenberg/pull/64680)).
+-   `CustomGradientPicker`: Update hard-coded border-width value ([#64680](https://github.com/WordPress/gutenberg/pull/64680)).
+
+### Bug Fixes
+
+-   `RangeControl`: disable reset button when the current value is equal to the reset value ([#64579](https://github.com/WordPress/gutenberg/pull/64579)).
+-   `RangeControl`: tweak mark and label absolute positioning ([#64487](https://github.com/WordPress/gutenberg/pull/64487)).
+-   `RadioGroup`: use fieldset and legend to group radio inputs ([#64582](https://github.com/WordPress/gutenberg/pull/64582)).
+
+### Internal
+
+-   `Composite` v2: add `Hover` and `Typeahead` subcomponents ([#64399](https://github.com/WordPress/gutenberg/pull/64399)).
+-   `Composite` v2: add focus-related props to `Composite`and`Composite.Item` subcomponents ([#64450](https://github.com/WordPress/gutenberg/pull/64450)).
+-   `Composite` v2: add `Context` subcomponent ([#64493](https://github.com/WordPress/gutenberg/pull/64493)).
+-   `DropdownMenu` v2: use themed color variables ([#64647](https://github.com/WordPress/gutenberg/pull/64647)).
+-   `CustomSelectControl`: Improve type inferring ([#64412](https://github.com/WordPress/gutenberg/pull/64412)).
+-   Update `ariakit` to version `0.4.10` ([#64637](https://github.com/WordPress/gutenberg/pull/64637)).
+-   Ariakit: Use `useStoreState()` instead of `store.useState()` ([#64648](https://github.com/WordPress/gutenberg/pull/64648)).
+
+## 28.5.0 (2024-08-07)
+
+### Bug Fixes
+
+-   `ColorPalette`: Remove extra bottom margin when `CircularOptionPicker` is unneeded ([#63961](https://github.com/WordPress/gutenberg/pull/63961)).
+-   `CustomSelectControl`: Restore `describedBy` functionality ([#63957](https://github.com/WordPress/gutenberg/pull/63957)).
+-   `Button`: Improve the aria-disabled focus style ([#62480](https://github.com/WordPress/gutenberg/pull/62480)).
+-   `Modal`: Fix the dismissal logic for React development mode ([#64132](https://github.com/WordPress/gutenberg/pull/64132)).
+-   `Button`: Fix tertiary destructive hover style ([#64152](https://github.com/WordPress/gutenberg/pull/64152)).
+-   `Autocompleter UI`: Fix text color when hovering selected item ([#64294](https://github.com/WordPress/gutenberg/pull/64294)).
+-   `Heading`: Add the missing `size` prop to the component's props type ([#64299](https://github.com/WordPress/gutenberg/pull/64299)).
+-   `TextControl`: Fix the padding of the component to be consistent with the rest of the controls. ([#64326](https://github.com/WordPress/gutenberg/pull/64326)).
+
+### Enhancements
+
+-   `ColorPalette`: partial support of `color-mix()` CSS colors ([#64224](https://github.com/WordPress/gutenberg/pull/64224)).
+-   `TimeInput`: Expose as subcomponent of `TimePicker` ([#63145](https://github.com/WordPress/gutenberg/pull/63145)).
+-   `RadioControl`: add support for option help text ([#63751](https://github.com/WordPress/gutenberg/pull/63751)).
+-   `SelectControl`: Infer `value` type from `options` ([#64069](https://github.com/WordPress/gutenberg/pull/64069)).
+-   `Guide`: Add `__next40pxDefaultSize` to buttons ([#64181](https://github.com/WordPress/gutenberg/pull/64181)).
+-   `SelectControl`: Pass through `options` props ([#64211](https://github.com/WordPress/gutenberg/pull/64211)).
+-   `DimensionControl`: Add `__nextHasNoMarginBottom` prop to remove bottom margin ([#64346](https://github.com/WordPress/gutenberg/pull/64346)).
+
+### Internal
+
+-   Upgraded `@ariakit/react` (v0.4.7) and `@ariakit/test` (v0.4.0) ([#64066](https://github.com/WordPress/gutenberg/pull/64066)).
+-   `DropdownMenuV2`: break menu item help text on multiple lines for better truncation. ([#63916](https://github.com/WordPress/gutenberg/pull/63916)).
+-   `CustomSelectControl`: Support generic props type ([#63985](https://github.com/WordPress/gutenberg/pull/63985)).
+
+## 28.4.0 (2024-07-24)
+
+### Deprecations
+
+-   `FormTokenField`: Deprecate bottom margin. Add a `__nextHasNoMarginBottom` prop to start opting into the margin-free styles that will become the default in a future version, currently scheduled to be WordPress 7.0 ([#63491](https://github.com/WordPress/gutenberg/pull/63491)).
+
+### Bug Fixes
+
+-   `BaseControl`: change label's `display` to `block`. ([#63911](https://github.com/WordPress/gutenberg/pull/63911))
+-   `ComboboxControl`: Fix ComboboxControl reset button when using the keyboard. ([#63410](https://github.com/WordPress/gutenberg/pull/63410))
+-   `Button`: Never apply `aria-disabled` to anchor ([#63376](https://github.com/WordPress/gutenberg/pull/63376)).
+-   `SelectControl`: Fix hover/focus color in wp-admin ([#63855](https://github.com/WordPress/gutenberg/pull/63855)).
+-   `ToggleControl`: Fix indentation ([#63903](https://github.com/WordPress/gutenberg/pull/63903)).
+
+### Enhancements
+
+-   `Button`: Rename Button describedBy prop to description and deprecate old name. ([#63486](https://github.com/WordPress/gutenberg/pull/63486))
+-   `ToggleGroupControl`: support disabled options ([#63450](https://github.com/WordPress/gutenberg/pull/63450)).
+-   `CustomSelectControl`: Stabilize `__experimentalShowSelectedHint` and `options[]. __experimentalHint` props ([#63248](https://github.com/WordPress/gutenberg/pull/63248)).
+-   `SelectControl`: Add `"minimal"` variant ([#63265](https://github.com/WordPress/gutenberg/pull/63265)).
+-   `FontSizePicker`: tidy up internal logic ([#63553](https://github.com/WordPress/gutenberg/pull/63553)).
+-   `ToggleControl`: Update spacing and appearance to adhere to 4px baseline, slightly reducing footprint. Make label treatment and focus styles consistent with `RadioControl` and `CheckboxControl`. ([#63490](https://github.com/WordPress/gutenberg/pull/63490)).
+-   `CheckboxControl`: Slightly reduced footprint. Make label treatment, focus styles, and spacing consistent with `ToggleControl` and `RadioControl`. ([#63490](https://github.com/WordPress/gutenberg/pull/63490)).
+-   `RadioControl`: Slightly reduced footprint. Make label treatment, focus styles, and spacing consistent with `ToggleControl` and `CheckboxControl`. ([#63490](https://github.com/WordPress/gutenberg/pull/63490)).
+-   `FormToggle`: Update spacing and appearance to adhere to 4px baseline, slightly reducing footprint. Make label treatment and focus styles consistent with `RadioControl` and `CheckboxControl`. ([#63490](https://github.com/WordPress/gutenberg/pull/63490)).
+
+### Internal
+
+-   `CustomSelectControl`: switch to ariakit-based implementation ([#63258](https://github.com/WordPress/gutenberg/pull/63258)).
+-   `CustomSelectControlV2`: animate select popover appearance. ([#63343](https://github.com/WordPress/gutenberg/pull/63343))
+-   `CustomSelectControlV2`: do not flip popover if legacy adapter. ([#63357](https://github.com/WordPress/gutenberg/pull/63357)).
+-   `DropdownMenuV2`: invert animation direction. ([#63443](https://github.com/WordPress/gutenberg/pull/63443)).
+-   `Tabs`: Vertical Tabs should be 40px min height. ([#63446](https://github.com/WordPress/gutenberg/pull/63446)).
+-   `ColorPicker`: Use `minimal` variant for `SelectControl` ([#63676](https://github.com/WordPress/gutenberg/pull/63676)).
+-   `Tabs`: keep full opacity of focus ring and remove hover styles on disabled tabs ([#63754](https://github.com/WordPress/gutenberg/pull/63754)).
+-   `Placeholder`: Remove unnecssary `placeholder-style` Sass mixin ([#63885](https://github.com/WordPress/gutenberg/pull/63885)).
+
+### Documentation
+
+-   `BaseControl`: Improve the base control help prop documentation. ([#63693](https://github.com/WordPress/gutenberg/pull/63693)).
+
+## 28.3.0 (2024-07-10)
+
+### Enhancements
+
+-   `Tabs`: hyphenate tab labels ([#63337](https://github.com/WordPress/gutenberg/pull/63337)).
+-   `Tooltip`: Add support for `className` prop ([#63157](https://github.com/WordPress/gutenberg/pull/63157)).
+-   `Toolbar`: Add support for `vertical` orientation ([#60123](https://github.com/WordPress/gutenberg/pull/60123)).
+-   `BaseControl`: forward ref on `VisualLabel` ([#63169](https://github.com/WordPress/gutenberg/pull/63169)).
+-   `ToolbarButton`: Deprecate `isDisabled` prop and merge with `disabled` ([#63101](https://github.com/WordPress/gutenberg/pull/63101)).
+-   `Button`: Stabilize `__experimentalIsFocusable` prop as `accessibleWhenDisabled` ([#62282](https://github.com/WordPress/gutenberg/pull/62282)).
+-   `ToolbarButton`: Always keep focusable when disabled ([#63102](https://github.com/WordPress/gutenberg/pull/63102)).
+-   `ProgressBar`: Fix indeterminate RTL support. ([#63129](https://github.com/WordPress/gutenberg/pull/63129)).
+-   `RangeControl`: Fix RTL support for custom marks ([#63198](https://github.com/WordPress/gutenberg/pull/63198)).
+-   `TimePicker`: Add `dateOrder` prop ([#62481](https://github.com/WordPress/gutenberg/pull/62481)).
+
+### Bug Fixes
+
+-   `Tabs`: Make Tabs have a fluid height ([#62027](https://github.com/WordPress/gutenberg/pull/62027)).
+-   `UnitControl`: Fix colors when disabled. ([#62970](https://github.com/WordPress/gutenberg/pull/62970))
+-   `useUpdateEffect`: Correctly track mounted state in strict mode. ([#62974](https://github.com/WordPress/gutenberg/pull/62974))
+-   `UnitControl`: Fix an issue where keyboard shortcuts unintentionally shift focus on Windows OS. ([#62988](https://github.com/WordPress/gutenberg/pull/62988))
+-   Fix inaccessibly disabled `Button`s ([#62306](https://github.com/WordPress/gutenberg/pull/62306)).
+-   `TimePicker`: Fix time zone overflow ([#63209](https://github.com/WordPress/gutenberg/pull/63209)).
+-   `SelectControl`: Fix disabled styles ([#63266](https://github.com/WordPress/gutenberg/pull/63266)).
+-   `Tabs`: Fix text-align when text wraps in vertical mode ([#63272](https://github.com/WordPress/gutenberg/pull/63272)).
+-   `Tabs`: Fix "With tab icons" Storybook example ([#63297](https://github.com/WordPress/gutenberg/pull/63297)).
+
+### Internal
+
+-   Allow ariakit and framer motion imports in the components package. ([#63123](https://github.com/WordPress/gutenberg/pull/63123))
+-   `CustomSelectControlV2`: prevent keyboard event propagation in legacy wrapper. ([#62907](https://github.com/WordPress/gutenberg/pull/62907))
+-   `CustomSelectControlV2`: expose legacy wrapper through private APIs. ([#62936](https://github.com/WordPress/gutenberg/pull/62936))
+-   `CustomSelectControlV2`: fix item styles ([#62825](https://github.com/WordPress/gutenberg/pull/62825))
+-   `CustomSelectControlV2`: add root element wrapper. ([#62803](https://github.com/WordPress/gutenberg/pull/62803))
+-   `CustomSelectControlV2`: tweak item inline padding based on size ([#62850](https://github.com/WordPress/gutenberg/pull/62850)).
+-   `CustomSelectControlV2`: fix popover styles. ([#62821](https://github.com/WordPress/gutenberg/pull/62821))
+-   `CustomSelectControlV2`: fix trigger text alignment in RTL languages ([#62869](https://github.com/WordPress/gutenberg/pull/62869)).
+-   `CustomSelectControlV2`: allow wrapping item hint to new line ([#62848](https://github.com/WordPress/gutenberg/pull/62848)).
+-   `CustomSelectControlV2`: fix select popover content overflow. ([#62844](https://github.com/WordPress/gutenberg/pull/62844))
+-   `CustomSelectControlV2`: keep item checkmark top aligned. ([#63230](https://github.com/WordPress/gutenberg/pull/63230))
+-   `CustomSelectControlV2`: keep legacy arrow down behavior only for legacy wrapper. ([#62919](https://github.com/WordPress/gutenberg/pull/62919))
+-   `CustomSelectControlV2`: fix trigger button font size. ([#63131](https://github.com/WordPress/gutenberg/pull/63131))
+-   `CustomSelectControlV2`: fix labelling with a visually hidden label. ([#63137](https://github.com/WordPress/gutenberg/pull/63137))
+-   `CustomSelectControlV2`: allow checkmark wrapper to collapse when not shown. ([#63229](https://github.com/WordPress/gutenberg/pull/63229))
+-   Extract `TimeInput` component from `TimePicker` ([#60613](https://github.com/WordPress/gutenberg/pull/60613)).
+-   `TimeInput`: Add `label` prop ([#63106](https://github.com/WordPress/gutenberg/pull/63106)).
+-   Method style type signatures have been changed to function style ([#62718](https://github.com/WordPress/gutenberg/pull/62718)).
+-   `FontSizePicker`: use CustomSelectControl V2 legacy adapter ([#63134](https://github.com/WordPress/gutenberg/pull/63134)).
+
+## 28.2.0 (2024-06-26)
+
+### Enhancements
+
+-   `DropZone`: rewrite animation without depending on framer-motion. ([#62044](https://github.com/WordPress/gutenberg/pull/62044))
+-   `__experimentalPaletteEdit`: improve the accessibility. ([#62753](https://github.com/WordPress/gutenberg/pull/62753))
+
+### Internal
+
+-   `CustomSelectControl`: align unit tests for v1 and legacy v2 versions. ([#62706](https://github.com/WordPress/gutenberg/pull/62706))
+-   `CustomSelectControlV2`: fix handling of extra option attributes in the `onChange` callbacks and when forwarding them to the option DOM elements. ([#62255](https://github.com/WordPress/gutenberg/pull/62255))
+-   `CustomSelectControlV2`: fix setting initial value and reacting to external controlled updates. ([#62733](https://github.com/WordPress/gutenberg/pull/62733))
+-   `CustomSelectControlV2`: Handle long strings in selected value ([#62198](https://github.com/WordPress/gutenberg/pull/62198)).
+
+## 28.1.0 (2024-06-15)
+
+### Enhancements
+
+-   Add `text-wrap: balance` fallback to all instances of `text-wrap: pretty` for greater cross browser compatibility. ([#62233](https://github.com/WordPress/gutenberg/pull/62233))
+-   Updates the space between input + label to `8px` in CheckboxControl and RadioControl. Also increased the space between RadioControl components to `12px` to make it consistent with CheckboxControl. ([#61696](https://github.com/WordPress/gutenberg/pull/61696))
+
+### Bug Fixes
+
+-   `Tabs`: Prevent accidental overflow in indicator ([#61979](https://github.com/WordPress/gutenberg/pull/61979)).
+
+## 28.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+### Enhancements
+
+-   `Tabs`: Animate indicator ([#60560](https://github.com/WordPress/gutenberg/pull/60560)).
+-   `ComboboxControl`: Introduce Combobox expandOnFocus prop ([#61705](https://github.com/WordPress/gutenberg/pull/61705)).
+-   `ProgressBar`: Expose as public API ([#61062](https://github.com/WordPress/gutenberg/pull/61062)).
+-   `ProgressBar`: Simplify default width implementation and make it more easily overridable ([#61976](https://github.com/WordPress/gutenberg/pull/61976)).
+
+### Bug Fixes
+
+-   `Autocomplete`: Stabilize rendering of autocomplete items ([#61877](https://github.com/WordPress/gutenberg/pull/61877)).
+-   `TabPanel`: Make the the focus styles consistent with `Tabs`. ([#61317](https://github.com/WordPress/gutenberg/pull/61317)).
+-   `InputControl`: Fixed z-index issue where slider dots appeared in front of the Appearance dropdown. ([#61937](https://github.com/WordPress/gutenberg/pull/61937))
+
+### Internal
+
+-   Remove `reduceMotion` util ([#61963](https://github.com/WordPress/gutenberg/pull/61963)).
+-   Add type support for CSS Custom Properties ([#61872](https://github.com/WordPress/gutenberg/pull/61872)).
+-   Remove usage of deprecated spreading of `key` prop in JSX in CustomSelectControl and FormTokenField components ([#61692](https://github.com/WordPress/gutenberg/pull/61692)).
+-   `Tooltip`: Fix Ariakit tooltip store usage ([#61858](https://github.com/WordPress/gutenberg/pull/61858)).
+-   `CustomSelectControlV2`: Use `InputBase` for styling ([#60261](https://github.com/WordPress/gutenberg/pull/60261)).
+
+## 27.6.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+-   Upgrade `@use-gesture/react` package to `^10.3.1` ([#61503](https://github.com/WordPress/gutenberg/pull/61503)).
+-   Upgrade `framer-motion` package to version `^11.1.9` ([#61572](https://github.com/WordPress/gutenberg/pull/61572)).
+
+### Enhancements
+
+-   `FontSizePicker`: Add `vw` and `vh` units to the default units in the font size picker ([#60507](<(https://github.com/WordPress/gutenberg/pull/60607)>).
+-   `PaletteEdit`: Use consistent spacing and metrics. ([#61368](https://github.com/WordPress/gutenberg/pull/61368)).
+-   `FormTokenField`: Hide label when not defined ([#61336](https://github.com/WordPress/gutenberg/pull/61336)).
+-   `ComboboxControl`: supports disabled items ([#61294](https://github.com/WordPress/gutenberg/pull/61294)).
+-   Upgraded the @types/react and @types/react-dom packages ([#60796](https://github.com/WordPress/gutenberg/pull/60796)).
+-   `Placeholder`: Tweak placeholder style ([#61590](https://github.com/WordPress/gutenberg/pull/61590)).
+
+### Bug Fixes
+
+-   `ToolsPanel`: Fix sticking “Reset” option ([#60621](https://github.com/WordPress/gutenberg/pull/60621)).
+-   Fix an issue where types used a synthetic default import ([#61679](https://github.com/WordPress/gutenberg/pull/61679)).
+
+## 27.5.0 (2024-05-02)
+
+### Enhancements
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+-   `InputControl`: Add a password visibility toggle story ([#60898](https://github.com/WordPress/gutenberg/pull/60898)).
+-   `View`: Fix prop types ([#60919](https://github.com/WordPress/gutenberg/pull/60919)).
+-   `Placeholder`: Unify appearance across. ([#59275](https://github.com/WordPress/gutenberg/pull/59275)).
+-   `Toolbar`: Adjust top toolbar to use same metrics as block toolbar ([#61126](https://github.com/WordPress/gutenberg/pull/61126)).
+-   `DropZone`: Avoid a media query on mount [#60546](https://github.com/WordPress/gutenberg/pull/60546)).
+-   `ComboboxControl`: Simplify string normalization ([#60893](https://github.com/WordPress/gutenberg/pull/60893)).
+
+### Bug Fixes
+
+-   `BaseControl`, `InputControl`: Remove usage of aria-details from InputControl and BaseControl ([#61203](https://github.com/WordPress/gutenberg/pull/61203)).
+-   `SlotFill`: fixed missing `getServerSnapshot` parameter in slot map ([#60943](https://github.com/WordPress/gutenberg/pull/60943)).
+-   `Panel`: Fix issue with collapsing panel header ([#61319](https://github.com/WordPress/gutenberg/pull/61319)).
+
+### Internal
+
+-   `FontSizerPicker`: Improve docs for default units ([#60996](https://github.com/WordPress/gutenberg/pull/60996)).
+
+## 27.4.0 (2024-04-19)
+
+### Deprecations
+
+-   `Navigation`: Soft deprecate component ([#59182](https://github.com/WordPress/gutenberg/pull/59182)).
+
+### Enhancements
+
+-   `Tooltip`: Make tests faster ([#60897](https://github.com/WordPress/gutenberg/pull/60897)).
+-   `ExternalLink`: Use unicode arrow instead of svg icon ([#60255](https://github.com/WordPress/gutenberg/pull/60255)).
+-   `ProgressBar`: Move the indicator width styles from emotion to a CSS variable ([#60388](https://github.com/WordPress/gutenberg/pull/60388)).
+-   `Text`: Add `text-wrap: pretty;` to improve wrapping ([#60164](https://github.com/WordPress/gutenberg/pull/60164)).
+-   `Navigator`: Navigation to the active path doesn't create a new location history ([#60561](https://github.com/WordPress/gutenberg/pull/60561)).
+-   `FormToggle`: Forwards ref to input ([#60234](https://github.com/WordPress/gutenberg/pull/60234)).
+-   `ToggleControl`: Forwards ref to FormToggle ([#60234](https://github.com/WordPress/gutenberg/pull/60234)).
+-   `CheckboxControl`: Update help text alignment ([#60787](https://github.com/WordPress/gutenberg/pull/60787)).
+
+### Bug Fixes
+
+-   `Truncate`: Fix link control link preview when it displays long URLs ([#60890](https://github.com/WordPress/gutenberg/pull/60890)).
+
+-   `ProgressBar`: Fix CSS variable with invalid value ([#60576](https://github.com/WordPress/gutenberg/pull/60576)).
+-   `CheckboxControl`: Fix label text wrap ([#60787](https://github.com/WordPress/gutenberg/pull/60787)).
+
+### Experimental
+
+-   `Tabs`: Fallback to first enabled tab if no active tab id ([#60681](https://github.com/WordPress/gutenberg/pull/60681)).
+
+### Internal
+
+-   Remove CSS hack for Internet Explorer 11 ([#60727](https://github.com/WordPress/gutenberg/pull/60727)).
+-   `CheckboxControl`: Streamline size styles ([#60475](https://github.com/WordPress/gutenberg/pull/60475)).
+-   Deprecate `reduceMotion` util ([#60839](https://github.com/WordPress/gutenberg/pull/60839)).
+-   `InputBase`: Simplify management of focus styles. Affects all components based on `InputControl` (e.g. `SearchControl`, `NumberControl`, `UnitControl`), as well as `SelectControl`, `CustomSelectControl`, and `TreeSelect` ([#60226](https://github.com/WordPress/gutenberg/pull/60226)).
+-   Removed dependency on `valtio`, replaced its usage in `SlotFill` with a custom object [#60879](https://github.com/WordPress/gutenberg/pull/60879)).
+-   `CustomSelectControlV2`: Support disabled in item types ([#60896](https://github.com/WordPress/gutenberg/pull/60896)).
+
+## 27.3.0 (2024-04-03)
+
+### Bug Fixes
+
+-   `Dropdown`: Fix bug with separator styling. ([#60336](https://github.com/WordPress/gutenberg/pull/60336)).
+-   `InputControl`: Ignore IME events when `isPressEnterToChange` is enabled ([#60090](https://github.com/WordPress/gutenberg/pull/60090)).
+-   `TextControl`: Apply zero margin to input element ([#60282](https://github.com/WordPress/gutenberg/pull/60282)).
+
+### Experimental
+
+-   `CustomSelectControlV2`: Rename for consistency ([#60178](https://github.com/WordPress/gutenberg/pull/60178)).
+
+### Internal
+
+-   `Popover`, `ColorPicker`: Obviate pointer event trap #59449 ([#59449](https://github.com/WordPress/gutenberg/pull/59449)).
+-   `Popover`, `ToggleGroupControl`: Use `useReducedMotion()` ([#60168](https://github.com/WordPress/gutenberg/pull/60168)).
+-   `NavigatorProvider`: Simplify the router state logic ([#60190](https://github.com/WordPress/gutenberg/pull/60190)).
+-   Update `date-fns` to version `3.6.0` ([#60163](https://github.com/WordPress/gutenberg/pull/60163)).
+-   Update `use-lilius` to version `2.0.5` ([#60163](https://github.com/WordPress/gutenberg/pull/60163)).
+
+### Experimental
+
+-   `CustomSelectControlV2`: Fix hint behavior in legacy ([#60183](https://github.com/WordPress/gutenberg/pull/60183)).
+
+## 27.2.0 (2024-03-21)
+
+-   `Dropdown` : Add styling support for `MenuGroup` ([#59723](https://github.com/WordPress/gutenberg/pull/59723)).
+-   `Placeholder` : Allow overflow but only when placeholder is selected, to fix a layout shift. ([#59857](https://github.com/WordPress/gutenberg/pull/59857)).
+
+### Enhancements
+
+-   `TextControl`: Add typings for `date`, `time` and `datetime-local` ([#59666](https://github.com/WordPress/gutenberg/pull/59666)).
+-   `Text`, `Heading`, `ItemGroup` : Update the line height from 1.2 to 1.4 ([#60041](https://github.com/WordPress/gutenberg/pull/60041)).
+-   `Autocomplete` : match the autocomplete styling to that of List View and Command Palette([#60131](https://github.com/WordPress/gutenberg/pull/60131)).
+
+### Deprecations
+
+-   `isSmall` prop in `Button` component has been deprecated. Use `size="small"` prop instead ([#59734](https://github.com/WordPress/gutenberg/pull/59734)).
+
+### Internal
+
+-   `Button`: Keep deprecated props in type definitions ([#59913](https://github.com/WordPress/gutenberg/pull/59913)).
+
+### Bug Fixes
+
+-   `PaletteEdit`: Fix number incrementing of default names for new colors added in non-en-US locales ([#52212](https://github.com/WordPress/gutenberg/pull/52212)).
+-   `DateTimePicker`: Change day button size back from 32px to 28px ([#59990](https://github.com/WordPress/gutenberg/pull/59990)).
+
+## 27.1.0 (2024-03-06)
+
+### Bug Fixes
+
+-   `InputControl`: Fix sample code on InputControl docs [#59517](https://github.com/WordPress/gutenberg/pull/59517)
+-   `Tooltip`: Explicitly set system font to avoid CSS bleed ([#59307](https://github.com/WordPress/gutenberg/pull/59307)).
+-   `HStack`, `VStack`: Stop passing invalid props to underlying element ([#59416](https://github.com/WordPress/gutenberg/pull/59416)).
+-   `Button`: Fix focus outline in disabled primary variant ([#59391](https://github.com/WordPress/gutenberg/pull/59391)).
+-   `Button`: Place `children` before the icon when `iconPosition` is `right` ([#59489](https://github.com/WordPress/gutenberg/pull/59489)).
+-   `ToggleGroupControl`: Fix unwanted backdrop vertical animation ([#59642](https://github.com/WordPress/gutenberg/pull/59642)).
+
+### Internal
+
+-   `SnackbarList`, `Snackbar`: add unit tests ([#59157](https://github.com/WordPress/gutenberg/pull/59157)).
+-   Remove unused `useLatestRef()` hook ([#59471](https://github.com/WordPress/gutenberg/pull/59471)).
+
+### Experimental
+
+-   `CustomSelectControlV2`: Remove legacy adapter layer ([#59420](https://github.com/WordPress/gutenberg/pull/59420)).
+
+## 27.0.0 (2024-02-21)
+
+### Breaking Changes
+
+-   `CustomSelectControl`: Remove deprecated `__nextUnconstrainedWidth` prop and promote to default behavior ([#58974](https://github.com/WordPress/gutenberg/pull/58974)).
+
+### Bug Fixes
+
+-   `ToolbarButton`: Center text for short labels ([#59117](https://github.com/WordPress/gutenberg/pull/59117)).
+
+### Internal
+
+-   `ColorPicker`: Style without accessing internal `InputControl` classes ([#59069](https://github.com/WordPress/gutenberg/pull/59069)).
+-   Add lint rules for theme color CSS var usage ([#59022](https://github.com/WordPress/gutenberg/pull/59022)).
+-   `FormTokenField`: Use `Element.scrollIntoView()` instead of `dom-scroll-into-view` ([#59085](https://github.com/WordPress/gutenberg/pull/59085)).
+-   Removing `dom-scroll-into-view` as a dependency of the components package ([#59085](https://github.com/WordPress/gutenberg/pull/59085)).
+-   Add higher-order function to ignore IME keydowns ([#59081](https://github.com/WordPress/gutenberg/pull/59081)).
+
+### Experimental
+
+-   `Tabs`: rename `initialTabId` prop to `defaultTabId` ([#59035](https://github.com/WordPress/gutenberg/pull/59035)).
+
+## 26.0.1 (2024-02-13)
+
+### Bug Fixes
+
+-   `Modal`: Add `box-sizing` reset style ([#58905](https://github.com/WordPress/gutenberg/pull/58905)).
+-   `Popover`: Fix positioning in nested iframes by upgrading Floating UI packages to their latest versions ([#58932](https://github.com/WordPress/gutenberg/pull/58932)).
+
+### Experimental
+
+-   `CustomSelectControlV2`: Adapt component for legacy usage ([#57902](https://github.com/WordPress/gutenberg/pull/57902)).
+
+## 26.0.0 (2024-02-09)
+
+### Breaking Changes
+
+-   `FontSizePicker`: Remove deprecated `__nextHasNoMarginBottom` prop and promote to default behavior ([#58702](https://github.com/WordPress/gutenberg/pull/58702)).
+-   `GradientPicker`: Remove deprecated `__nextHasNoMargin` prop and promote to default behavior ([#58701](https://github.com/WordPress/gutenberg/pull/58701)).
+-   `CustomGradientPicker`: Remove deprecated `__nextHasNoMargin` prop and promote to default behavior ([#58699](https://github.com/WordPress/gutenberg/pull/58699)).
+-   `AnglePickerControl`: Remove deprecated `__nextHasNoMarginBottom` prop and promote to default behavior ([#58700](https://github.com/WordPress/gutenberg/pull/58700)).
+
+### Enhancements
+
+-   `Button`: Update secondary variant to show the border even in a disabled state. ([#58606](https://github.com/WordPress/gutenberg/pull/58606)).
+-   `ConfirmDialog`: Add `__next40pxDefaultSize` to buttons ([#58421](https://github.com/WordPress/gutenberg/pull/58421)).
+-   `Snackbar`: Update the warning message ([#58591](https://github.com/WordPress/gutenberg/pull/58591)).
+-   `Composite`: Implementing `useCompositeState` with Ariakit ([#57304](https://github.com/WordPress/gutenberg/pull/57304)).
+-   Remove deprecation warnings for `__next36pxDefaultSize` prop ([#58703](https://github.com/WordPress/gutenberg/pull/58703)).
+-   `CheckboxControl`: Remove ability for label prop to be false ([#58339](https://github.com/WordPress/gutenberg/pull/58339)).
+-   `FocalPointPicker`: Apply modern styling ([#58459](https://github.com/WordPress/gutenberg/pull/58459)).
+
+### Bug Fixes
+
+-   `FocalPointPicker`: Allow `PointerCircle` to render in a default centered position when x and y coordinates are undefined ([#58592](https://github.com/WordPress/gutenberg/pull/58592)).
+-   `DateTime`: Add a timezone offset value for display purposes. ([#56682](https://github.com/WordPress/gutenberg/pull/56682)).
+-   `Placeholder`: Fix Placeholder component padding when body text font size is changed ([#58323](https://github.com/WordPress/gutenberg/pull/58323)).
+-   `Placeholder`: Fix Global Styles typography settings bleeding into placeholder component ([#58303](https://github.com/WordPress/gutenberg/pull/58303)).
+-   `PaletteEdit`: Fix palette item accessibility in details view ([#58214](https://github.com/WordPress/gutenberg/pull/58214)).
+-   `Snackbar`: Fix the auto-dismissal timers ([#58604](https://github.com/WordPress/gutenberg/pull/58604)).
+-   `Tabs`: Fix infinite loop in `useEffect` ([#58861](https://github.com/WordPress/gutenberg/pull/58861)).
+-   `Popover`: Add `box-sizing` reset style ([#58871](https://github.com/WordPress/gutenberg/pull/58871)).
+
+### Experimental
+
+-   `Guide`, `Modal`: Restore accent color themability ([#58098](https://github.com/WordPress/gutenberg/pull/58098)).
+-   `DropdownMenuV2`: Restore accent color themability ([#58130](https://github.com/WordPress/gutenberg/pull/58130)).
+-   `Tabs`: improve controlled mode focus handling and keyboard navigation ([#57696](https://github.com/WordPress/gutenberg/pull/57696)).
+-   `Tabs`: prevent internal focus from updating too early ([#58625](https://github.com/WordPress/gutenberg/pull/58625)).
+-   Expand theming support in the `COLORS` variable object ([#58097](https://github.com/WordPress/gutenberg/pull/58097)).
+-   `CustomSelect`: disable `virtualFocus` to fix issue for screenreaders ([#58585](https://github.com/WordPress/gutenberg/pull/58585)).
+
+### Internal
+
+-   `Composite`: Removing Reakit `Composite` implementation ([#58620](https://github.com/WordPress/gutenberg/pull/58620)).
+-   Removing Reakit as a dependency of the components package ([#58631](https://github.com/WordPress/gutenberg/pull/58631)).
+-   `CustomSelect`: add unit tests ([#58583](https://github.com/WordPress/gutenberg/pull/58583)).
+-   `InputBase`: Add `isBorderless` prop ([#58750](https://github.com/WordPress/gutenberg/pull/58750)).
+-   `SearchControl`: Replace internal implementation to use `InputControl` ([#56524](https://github.com/WordPress/gutenberg/pull/56524)).
+
+## 25.16.0 (2024-01-24)
+
+### Enhancements
+
+-   `ColorPicker`: improve the UX around HSL sliders ([#57555](https://github.com/WordPress/gutenberg/pull/57555)).
+-   `BoxControl`, `BorderControl`, `BorderBoxControl`: Add opt-in prop for 40px default size ([#56185](https://github.com/WordPress/gutenberg/pull/56185)).
+-   `PaletteEdit`: improve unit tests ([#57645](https://github.com/WordPress/gutenberg/pull/57645)).
+-   `PaletteEdit` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
+-   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
+-   `Tooltip` and `Button`: tidy up unit tests ([#57975](https://github.com/WordPress/gutenberg/pull/57975)).
+-   `BorderControl`, `BorderBoxControl`: Replace style picker with ToggleGroupControl ([#57562](https://github.com/WordPress/gutenberg/pull/57562)).
+-   `SlotFill`: fix typo in use-slot-fills return docs ([#57654](https://github.com/WordPress/gutenberg/pull/57654))
+-   `Popover`: Adding `constrainTabbing` prop to `useDialog` hook ([#57962](https://github.com/WordPress/gutenberg/pull/57962))
+
+### Bug Fixes
+
+-   `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
+-   `Tooltip`: Improve props forwarding to children of nested `Tooltip` components ([#57878](https://github.com/WordPress/gutenberg/pull/57878)).
+-   `Tooltip`: revert prop types to only accept component-specific props ([#58125](https://github.com/WordPress/gutenberg/pull/58125)).
+-   `Button`: prevent the component from trashing and re-creating the HTML element ([#56490](https://github.com/WordPress/gutenberg/pull/56490)).
+
+### Experimental
+
+-   `BoxControl`: Update design ([#56665](https://github.com/WordPress/gutenberg/pull/56665)).
+-   `CustomSelect`: adjust `renderSelectedValue` to fix sizing ([#57865](https://github.com/WordPress/gutenberg/pull/57865)).
+-   `Theme`: Set `color` on wrapper div ([#58095](https://github.com/WordPress/gutenberg/pull/58095)).
+
+## 25.15.0 (2024-01-10)
+
+### Bug Fixes
+
+-   `NumberControl`: Make increment and decrement buttons keyboard accessible. ([#57402](https://github.com/WordPress/gutenberg/pull/57402)).
+-   `DropdownMenu V2`: better fallback on browsers that don't support CSS subgrid([#57327](https://github.com/WordPress/gutenberg/pull/57327)).
+-   `FontSizePicker`: Use Button API for keeping focus on reset ([#57221](https://github.com/WordPress/gutenberg/pull/57221)).
+-   `FontSizePicker`: Fix Reset button focus loss ([#57196](https://github.com/WordPress/gutenberg/pull/57196)).
+-   `PaletteEdit`: Consider digits when generating kebab-cased slug ([#56713](https://github.com/WordPress/gutenberg/pull/56713)).
+-   `FormTokenField`: Prevent focus being passed to internal buttons when component is disabled ([#57187](https://github.com/WordPress/gutenberg/pull/57187)).
+-   `Button`: Fix logic of `has-text` class addition ([#56949](https://github.com/WordPress/gutenberg/pull/56949)).
+-   `FormTokenField`: Fix a regression where the suggestion list would re-open after clicking away from the input ([#57002](https://github.com/WordPress/gutenberg/pull/57002)).
+-   `Snackbar`: Remove erroneous `__unstableHTML` prop from TypeScript definitions ([#57218](https://github.com/WordPress/gutenberg/pull/57218)).
+-   `Truncate`: improve handling of non-string `children` ([#57261](https://github.com/WordPress/gutenberg/pull/57261)).
+-   `PaletteEdit`: Don't discard colors with default name and slug ([#54332](https://github.com/WordPress/gutenberg/pull/54332)).
+-   `RadioControl`: Fully encapsulate styles ([#57347](https://github.com/WordPress/gutenberg/pull/57347)).
+-   `DuotonePicker`: Remove top margin when no duotone options ([#57489](https://github.com/WordPress/gutenberg/pull/57489)).
+-   `Snackbar`: Fix icon positioning ([#57377](https://github.com/WordPress/gutenberg/pull/57377)).
+-   `GradientPicker`: Use slug while iterating over gradient entries to avoid React "duplicated key" warning ([#57361](https://github.com/WordPress/gutenberg/pull/57361)).
+-   `NavigatorProvider`: Exclude `size` value from `contain` CSS rule ([#57498](https://github.com/WordPress/gutenberg/pull/57498)).
+
+### Enhancements
+
+-   Update `ariakit` to version `0.3.10` ([#57325](https://github.com/WordPress/gutenberg/pull/57325)).
+-   Update `@ariakit/react` to version `0.3.12` and @ariakit/test to version `0.3.7` ([#57547](https://github.com/WordPress/gutenberg/pull/57547)).
+-   `DropdownMenuV2`: do not collapse suffix width ([#57238](https://github.com/WordPress/gutenberg/pull/57238)).
+-   `DateTimePicker`: Adjustment of the dot position on DayButton and expansion of the button area. ([#55502](https://github.com/WordPress/gutenberg/pull/55502)).
+-   `Modal`: Improve application of body class names ([#55430](https://github.com/WordPress/gutenberg/pull/55430)).
+-   `BaseControl`: Connect to context system ([#57408](https://github.com/WordPress/gutenberg/pull/57408)).
+-   `InputControl`, `NumberControl`, `UnitControl`, `SelectControl`, `TreeSelect`: Add `compact` size variant ([#57398](https://github.com/WordPress/gutenberg/pull/57398)).
+-   `ToggleGroupControl`: Update button size in large variant to be 32px ([#57338](https://github.com/WordPress/gutenberg/pull/57338)).
+-   `Tooltip`: improve unit tests ([#57345](https://github.com/WordPress/gutenberg/pull/57345)).
+
+### Experimental
+
+-   `DropdownMenuV2`: remove temporary radix UI based implementation ([#55626](https://github.com/WordPress/gutenberg/pull/55626)).
+-   `Tabs`: do not render hidden content ([#57046](https://github.com/WordPress/gutenberg/pull/57046)).
+-   `Tabs`: improve hover and text alignment styles ([#57275](https://github.com/WordPress/gutenberg/pull/57275)).
+-   `Tabs`: make sure `Tab`s are associated to the right `TabPanel`s, regardless of the order they're rendered in ([#57033](https://github.com/WordPress/gutenberg/pull/57033)).
+
+## 25.14.0 (2023-12-13)
+
 ### Enhancements
 
+-   `Navigator`: use vanilla CSS animations instead of `framer-motion` ([#56909](https://github.com/WordPress/gutenberg/pull/56909)).
 -   `FormToggle`: fix sass deprecation warning ([#56672](https://github.com/WordPress/gutenberg/pull/56672)).
 -   `QueryControls`: Add opt-in prop for 40px default size ([#56576](https://github.com/WordPress/gutenberg/pull/56576)).
 -   `CheckboxControl`: Add option to not render label ([#56158](https://github.com/WordPress/gutenberg/pull/56158)).
+-   `PaletteEdit`: Gradient pickers to use same width as color pickers ([#56801](https://github.com/WordPress/gutenberg/pull/56801)).
+-   `FocalPointPicker`: Add opt-in prop for 40px default size ([#56021](https://github.com/WordPress/gutenberg/pull/56021)).
+-   `DimensionControl`: Add opt-in prop for 40px default size ([#56805](https://github.com/WordPress/gutenberg/pull/56805)).
+-   `FontSizePicker`: Add opt-in prop for 40px default size ([#56804](https://github.com/WordPress/gutenberg/pull/56804)).
+-   `ToolsPanel`/`ToolsPanelHeader`: Added `dropdownMenuProps` to allow customization of the panel's dropdown menu. Also merged default and optional control menu groups ([#55785](https://github.com/WordPress/gutenberg/pull/55785)).
 
-### Bug Fix
+### Bug Fixes
 
+-   `PaletteEdit`: temporary custom gradient not saving ([#56896](https://github.com/WordPress/gutenberg/pull/56896)).
 -   `ToggleGroupControl`: react correctly to external controlled updates ([#56678](https://github.com/WordPress/gutenberg/pull/56678)).
 -   `ToolsPanel`: fix a performance issue ([#56770](https://github.com/WordPress/gutenberg/pull/56770)).
+-   `BorderControl`: adjust `BorderControlDropdown` Button size to fix misaligned border ([#56730](https://github.com/WordPress/gutenberg/pull/56730)).
+-   `SlotFillProvider`: Restore contextual Slot/Fills within SlotFillProvider ([#56779](https://github.com/WordPress/gutenberg/pull/56779)).
+
+### Internal
+
+-   `DropdownMenuV2Ariakit`: prevent prefix collapsing if all radios or checkboxes are unselected ([#56720](https://github.com/WordPress/gutenberg/pull/56720)).
+-   Move `kebabCase()` function from `block-editor` package and mark it as private API ([#56758](https://github.com/WordPress/gutenberg/pull/56758)).
+
+### Experimental
+
+-   `Tabs`: implement new `tabId` prop ([#56883](https://github.com/WordPress/gutenberg/pull/56883)).
+-   `CustomSelect`: add `WordPressComponentsProps` for more flexibility ([#56998](https://github.com/WordPress/gutenberg/pull/56998))
+
+### Experimental
+
+-   `Tabs`: improve focus handling in controlled mode ([#56658](https://github.com/WordPress/gutenberg/pull/56658)).
+
+### Documentation
+
+-   `Search`: Added links to storybook for more information on usage. ([#56815](https://github.com/WordPress/gutenberg/pull/56815)).
+-   `Spinner`: Added links to storybook for more information on usage. ([#56953](https://github.com/WordPress/gutenberg/pull/56953)).
 
 ## 25.13.0 (2023-11-29)
 
@@ -21,7 +801,7 @@
 -   `Button`: Add focus rings to focusable disabled buttons ([#56383](https://github.com/WordPress/gutenberg/pull/56383)).
 -   `InserterButton`: Move mobile InserterButton from components package to block-editor package ([#56494](https://github.com/WordPress/gutenberg/pull/56494))
 
-### Bug Fix
+### Bug Fixes
 
 -   `DateTime`: Make the Timezone indication render a tooltip only when necessary. ([#56214](https://github.com/WordPress/gutenberg/pull/56214)).
 -   `ToolsPanelItem`: Use useLayoutEffect to prevent rendering glitch for last panel item styling. ([#56536](https://github.com/WordPress/gutenberg/pull/56536)).
@@ -41,10 +821,11 @@
 
 -   `Slot`: add `style` prop to `bubblesVirtually` version ([#56428](https://github.com/WordPress/gutenberg/pull/56428))
 -   Introduce experimental new version of `CustomSelectControl` based on `ariakit` ([#55790](https://github.com/WordPress/gutenberg/pull/55790))
+-   `Composite`: add unit tests for `useCompositeState` ([#56645](https://github.com/WordPress/gutenberg/pull/56645)).
 
 ## 25.12.0 (2023-11-16)
 
-### Bug Fix
+### Bug Fixes
 
 -   `Toolbar`: Remove CSS rule that prevented focus outline to be visible for toolbar buttons in the `:active` state. ([#56123](https://github.com/WordPress/gutenberg/pull/56123)).
 
@@ -66,7 +847,7 @@
 -   `ToggleGroupControl`: Add opt-in prop for 40px default size ([#55789](https://github.com/WordPress/gutenberg/pull/55789)).
 -   `TextControl`: Add opt-in prop for 40px default size ([#55471](https://github.com/WordPress/gutenberg/pull/55471)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `DropdownMenu`: remove extra vertical space around the toggle button ([#56136](https://github.com/WordPress/gutenberg/pull/56136)).
 -   Package should not depend on `@ariakit/test`, that package is only needed for testing ([#56091](https://github.com/WordPress/gutenberg/pull/56091)).
@@ -77,7 +858,7 @@
 
 -   `InputControl`/`SelectControl`: update `height`/`min-height` to `32px` instead of `30px` to align with modern sizing scale ([#55490](https://github.com/WordPress/gutenberg/pull/55490)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Autocomplete`: Add `aria-live` announcements for Mac and IOS Voiceover to fix lack of support for `aria-owns` ([#54902](https://github.com/WordPress/gutenberg/pull/54902)).
 -   Improve Button saving state accessibility. ([#55547](https://github.com/WordPress/gutenberg/pull/55547))
@@ -98,7 +879,7 @@
 -   `Tabs`: Expose via private APIs ([#55327](https://github.com/WordPress/gutenberg/pull/55327)).
 -   `ColorPalette`/`ToggleGroupControl/ToggleGroupControlOptionBase`: add `type="button"` attribute to native `<button>`s ([#55125](https://github.com/WordPress/gutenberg/pull/55125)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Render a "mouse event trap" when using a `ColorPicker` inside a `Popover` to prevent issues when rendering on top of `iframes` ([#55149](https://github.com/WordPress/gutenberg/pull/55149)).
 -   `Modal`: fix closing when contained iframe is focused ([#51602](https://github.com/WordPress/gutenberg/pull/51602)).
@@ -126,7 +907,7 @@
 -   Wrapped `TextareaControl` in a `forwardRef` call ([#54975](https://github.com/WordPress/gutenberg/pull/54975)).
 -   `Composite`/`AlignmentMatrixControl`/`CircularOptionPicker`: Starts the `Composite` migration from `reakit` to `ariakit` ([#54225](https://github.com/WordPress/gutenberg/pull/54225)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Placeholder`: Improved DOM structure and screen reader announcements ([#45801](https://github.com/WordPress/gutenberg/pull/45801)).
 -   `DateTimePicker`: fix onChange callback check so that it also works inside iframes ([#54669](https://github.com/WordPress/gutenberg/pull/54669)).
@@ -172,7 +953,7 @@
 -   `FormTokenField`: Add `tokenizeOnBlur` prop to add any incompleteTokenValue as a new token when field loses focus ([#54445](https://github.com/WordPress/gutenberg/pull/54445)).
 -   `Sandbox`: Add `tabIndex` prop ([#54408](https://github.com/WordPress/gutenberg/pull/54408)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Notice`: Make the Close button render a tooltip to visually expose its accessible name. All icon buttons must always show a tooltip ([#54498](https://github.com/WordPress/gutenberg/pull/54498)).
 -   `Tooltip`: dynamically render in the DOM only when visible ([#54312](https://github.com/WordPress/gutenberg/pull/54312)).
@@ -208,7 +989,7 @@
 
 ## 25.7.0 (2023-08-31)
 
-### Breaking changes
+### Breaking Changes
 
 -   Make the `Popover.Slot` optional and render popovers at the bottom of the document's body by default. ([#53889](https://github.com/WordPress/gutenberg/pull/53889), [#53982](https://github.com/WordPress/gutenberg/pull/53982)).
 
@@ -217,7 +998,7 @@
 -   `ProgressBar`: Add transition to determinate indicator ([#53877](https://github.com/WordPress/gutenberg/pull/53877)).
 -   Prevent nested `SlotFillProvider` from rendering ([#53940](https://github.com/WordPress/gutenberg/pull/53940)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `SandBox`: Fix the cleanup method in useEffect ([#53796](https://github.com/WordPress/gutenberg/pull/53796)).
 -   `PaletteEdit`: Fix the height of the `PaletteItems`. Don't rely on styles only present in the block editor ([#54000](https://github.com/WordPress/gutenberg/pull/54000)).
@@ -243,7 +1024,7 @@
 -   Components: Move accent colors to theme context ([#53631](https://github.com/WordPress/gutenberg/pull/53631)).
 -   `ProgressBar`: Use the new theme system accent for indicator color ([#53632](https://github.com/WordPress/gutenberg/pull/53632)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Button`: add `:disabled` selector to reset hover color for disabled buttons ([#53411](https://github.com/WordPress/gutenberg/pull/53411)).
 
@@ -257,7 +1038,7 @@
 
 ## 25.5.0 (2023-08-10)
 
-### New Feature
+### New Features
 
 -   Add a new `ProgressBar` component. ([#53030](https://github.com/WordPress/gutenberg/pull/53030)).
 
@@ -267,7 +1048,7 @@
 -   `MenuItemsChoice`, `MenuItem`: Support a `disabled` prop on a menu item ([#52737](https://github.com/WordPress/gutenberg/pull/52737)).
 -   `TabPanel`: Introduce a new version of `TabPanel` with updated internals and improved adherence to ARIA guidance on `tabpanel` focus behavior while maintaining the same functionality and API surface.([#52133](https://github.com/WordPress/gutenberg/pull/52133)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Modal`: Fix loss of focus when clicking outside ([#52653](https://github.com/WordPress/gutenberg/pull/52653)).
 
@@ -278,7 +1059,7 @@
 -   `TextControl`: Add `id` prop to allow for custom IDs in `TextControl`s ([#52028](https://github.com/WordPress/gutenberg/pull/52028)).
 -   `Navigator`: Add `replace` option to `navigator.goTo()` and `navigator.goToParent()` ([#52456](https://github.com/WordPress/gutenberg/pull/52456)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Popover`: Pin `react-dropdown-menu` version to avoid breaking changes in dependency updates. ([#52356](https://github.com/WordPress/gutenberg/pull/52356)).
 -   `Item`: Unify focus style and add default font styles. ([#52495](https://github.com/WordPress/gutenberg/pull/52495)).
@@ -295,7 +1076,7 @@
 -   `ItemGroup`: Update button focus state styles to target `:focus-visible` rather than `:focus`. ([#51787](https://github.com/WordPress/gutenberg/pull/51787)).
 -   `Guide`: Don't show Close button when there is only one page, and use default button and accent/theme styling ([#52014](https://github.com/WordPress/gutenberg/pull/52014)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `ConfirmDialog`: Ensure onConfirm isn't called an extra time when submitting one of the buttons using the keyboard ([#51730](https://github.com/WordPress/gutenberg/pull/51730)).
 -   `ZStack`: ZStack: fix component bounding box to match children ([#51836](https://github.com/WordPress/gutenberg/pull/51836)).
@@ -313,7 +1094,7 @@
 -   `ItemGroup`: Update button focus state styles to be inline with other button focus states in the editor. ([#51576](https://github.com/WordPress/gutenberg/pull/51576)).
 -   `ItemGroup`: Update button focus state styles to target `:focus-visible` rather than `:focus`. ([#51787](https://github.com/WordPress/gutenberg/pull/51787)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Popover`: Allow legitimate 0 positions to update popover position ([#51320](https://github.com/WordPress/gutenberg/pull/51320)).
 -   `Button`: Remove unnecessary margin from dashicon ([#51395](https://github.com/WordPress/gutenberg/pull/51395)).
@@ -335,7 +1116,7 @@
 -   `BorderControl`: Improve color code readability in aria-label ([#51197](https://github.com/WordPress/gutenberg/pull/51197)).
 -   `Dropdown` and `DropdownMenu`: use internal context system to automatically pick the toolbar popover variant when rendered inside the `Toolbar` component ([#51154](https://github.com/WordPress/gutenberg/pull/51154)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `FocalPointUnitControl`: Add aria-labels ([#50993](https://github.com/WordPress/gutenberg/pull/50993)).
 
@@ -365,7 +1146,7 @@
 -   Added experimental v2 of `DropdownMenu` ([#49473](https://github.com/WordPress/gutenberg/pull/49473)).
 -   `ColorPicker`: its private `SelectControl` component no longer hides BackdropUI, thus making its focus state visible for keyboard users ([#50703](https://github.com/WordPress/gutenberg/pull/50703)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `ColorPicker`: Add an outline when the color picker select box is focused([#50609](https://github.com/WordPress/gutenberg/pull/50609)).
 -   `InputControl`: Fix focus style to support Windows High Contrast mode ([#50772](https://github.com/WordPress/gutenberg/pull/50772)).
@@ -383,7 +1164,7 @@
 
 -   `onDragStart` in `<Draggable>` is now a synchronous function to allow setting additional data for `event.dataTransfer` ([#49673](https://github.com/WordPress/gutenberg/pull/49673)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `NavigableContainer`: do not trap focus in `TabbableContainer` ([#49846](https://github.com/WordPress/gutenberg/pull/49846)).
 -   Update `<Button>` component to have a transparent background for its tertiary disabled state, to match its enabled state. ([#50496](https://github.com/WordPress/gutenberg/pull/50496)).
@@ -434,7 +1215,7 @@
 -   `SlotFill`: Added util for creating private SlotFills and supporting Symbol keys ([#49819](https://github.com/WordPress/gutenberg/pull/49819)).
 -   `IconType`: Export for external use ([#49649](https://github.com/WordPress/gutenberg/pull/49649)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `CheckboxControl`: Add support custom IDs ([#49977](https://github.com/WordPress/gutenberg/pull/49977)).
 
@@ -457,7 +1238,7 @@
 -   `Spinner`: add explicit opacity and background styles ([#49695](https://github.com/WordPress/gutenberg/pull/49695)).
 -   Make TypeScript types available for consumers ([#49229](https://github.com/WordPress/gutenberg/pull/49229)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Snackbar`: Fix insufficient color contrast on hover ([#49682](https://github.com/WordPress/gutenberg/pull/49682)).
 
@@ -478,7 +1259,7 @@
 -   `AnglePickerControl`: Style to better fit in narrow contexts and improve RTL layout ([#49046](https://github.com/WordPress/gutenberg/pull/49046)).
 -   `ImageSizeControl`: Use large 40px sizes ([#49113](https://github.com/WordPress/gutenberg/pull/49113)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `CircularOptionPicker`: force swatches to visually render on top of the rest of the component's content ([#49245](https://github.com/WordPress/gutenberg/pull/49245)).
 -   `InputControl`: Fix misaligned textarea input control ([#49116](https://github.com/WordPress/gutenberg/pull/49116)).
@@ -497,7 +1278,7 @@
 -   `Navigator`: Disable initial screen animation ([#49062](https://github.com/WordPress/gutenberg/pull/49062)).
 -   `FormTokenField`: Hide suggestions list on blur event if the input value is invalid ([#48785](https://github.com/WordPress/gutenberg/pull/48785)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `ResponsiveWrapper`: use `aspect-ratio` CSS prop, add support for `SVG` elements ([#48573](https://github.com/WordPress/gutenberg/pull/48573).
 -   `ResizeTooltip`: Use `default.fontFamily` on tooltip ([#48805](https://github.com/WordPress/gutenberg/pull/48805).
@@ -537,7 +1318,7 @@
 
 ## 23.4.0 (2023-02-15)
 
-### Bug Fix
+### Bug Fixes
 
 -   `ToolsPanel`: fix type inconsistencies between types, docs and normal component usage ([47944](https://github.com/WordPress/gutenberg/pull/47944)).
 -   `SelectControl`: Fix styling when `multiple` prop is enabled ([#47893](https://github.com/WordPress/gutenberg/pull/43213)).
@@ -596,7 +1377,7 @@
 -   `Notice`: refactor to TypeScript ([47118](https://github.com/WordPress/gutenberg/pull/47118)).
 -   `Popover`: Take iframe element scaling into account ([47004](https://github.com/WordPress/gutenberg/pull/47004)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `TabPanel`: Fix initial tab selection when the tab declaration is lazily added to the `tabs` array ([47100](https://github.com/WordPress/gutenberg/pull/47100)).
 -   `InputControl`: Avoid the "controlled to uncontrolled" warning by forcing the internal `<input />` element to be always in controlled mode ([47250](https://github.com/WordPress/gutenberg/pull/47250)).
@@ -613,7 +1394,7 @@
 -   `ResponsiveWrapper`: Convert to TypeScript ([#46480](https://github.com/WordPress/gutenberg/pull/46480)).
 -   `ItemGroup`: migrate Storybook to controls, refactor to TypeScript ([46945](https://github.com/WordPress/gutenberg/pull/46945)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Placeholder`: set fixed right margin for label's icon ([46918](https://github.com/WordPress/gutenberg/pull/46918)).
 -   `TreeGrid`: Fix right-arrow keyboard navigation when a row contains more than two focusable elements ([46998](https://github.com/WordPress/gutenberg/pull/46998)).
@@ -630,13 +1411,13 @@
 
 -   Updated dependencies to require React 18 ([45235](https://github.com/WordPress/gutenberg/pull/45235))
 
-### New Feature
+### New Features
 
 -   `TabPanel`: support manual tab activation ([#46004](https://github.com/WordPress/gutenberg/pull/46004)).
 -   `TabPanel`: support disabled prop for tab buttons ([#46471](https://github.com/WordPress/gutenberg/pull/46471)).
 -   `BaseControl`: Add `useBaseControlProps` hook to help generate id-releated props ([#46170](https://github.com/WordPress/gutenberg/pull/46170)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `ColorPalette`: show "Clear" button even when colors array is empty ([#46001](https://github.com/WordPress/gutenberg/pull/46001)).
 -   `InputControl`: Fix internal `Flex` wrapper usage that could add an unintended `height: 100%` ([#46213](https://github.com/WordPress/gutenberg/pull/46213)).
@@ -695,7 +1476,7 @@
 
 -   `AnglePickerControl`: remove `:focus-visible' outline on `CircleOutlineWrapper` ([#45758](https://github.com/WordPress/gutenberg/pull/45758))
 
-### Bug Fix
+### Bug Fixes
 
 -   `FormTokenField`: Fix duplicate input in IME composition ([#45607](https://github.com/WordPress/gutenberg/pull/45607)).
 -   `Autocomplete`: Check key events more strictly in IME composition ([#45626](https://github.com/WordPress/gutenberg/pull/45626)).
@@ -739,7 +1520,7 @@
 -   `Popover`: the deprecation messages for anchor-related props (`anchorRef`, `anchorRect`, `getAnchorRect`) have been updated. ([#45195](https://github.com/WordPress/gutenberg/pull/45195)).
 -   `Popover`: The `isAlternate` prop has been replaced with a `variant` prop that can be called with the `'toolbar'` string ([#45137](https://github.com/WordPress/gutenberg/pull/45137)).
 
-### New Feature
+### New Features
 
 -   `BoxControl` & `CustomSelectControl`: Add `onMouseOver` and `onMouseOut` callback props to allow handling of these events by parent components ([#44955](https://github.com/WordPress/gutenberg/pull/44955))
 -   `Popover`: A `variant` prop has been added to style popovers, with `'unstyled'` and `'toolbar'` possible values ([#45137](https://github.com/WordPress/gutenberg/pull/45137)).
@@ -755,7 +1536,7 @@
 -   `ToggleGroupControl`: Add `isDeselectable` prop to allow deselecting the selected option ([#45123](https://github.com/WordPress/gutenberg/pull/45123)).
 -   `FontSizePicker`: Improve hint text shown next to 'Font size' label ([#44966](https://github.com/WordPress/gutenberg/pull/44966)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `useNavigateRegions`: Add new keyboard shortcut alias to cover backtick and tilde keys inconsistencies across browsers ([#45019](https://github.com/WordPress/gutenberg/pull/45019)).
 -   `Button`: Tweak the destructive button primary, link, and default variants ([#44427](https://github.com/WordPress/gutenberg/pull/44427)).
@@ -798,7 +1579,7 @@
 
 ## 21.3.0 (2022-10-19)
 
-### Bug Fix
+### Bug Fixes
 
 -   `FontSizePicker`: Ensure that fluid font size presets appear correctly in the UI controls ([#44791](https://github.com/WordPress/gutenberg/pull/44791)).
 -   `ToggleGroupControl`: Remove unsupported `disabled` prop from types, and correctly mark `label` prop as required ([#45114](https://github.com/WordPress/gutenberg/pull/45114)).
@@ -824,11 +1605,11 @@
 
 ### Enhancements
 
--   `FontSizePicker`: Updated to take up full width of its parent and have a 40px Reset button when `size` is `__unstable-large` ((44559)[https://github.com/WordPress/gutenberg/pull/44559]).
+-   `FontSizePicker`: Updated to take up full width of its parent and have a 40px Reset button when `size` is `__unstable-large` ([44559](https://github.com/WordPress/gutenberg/pull/44559)).
 -   `BorderBoxControl`: Omit unit select when width values are mixed ([#44592](https://github.com/WordPress/gutenberg/pull/44592))
 -   `BorderControl`: Add ability to disable unit selection ([#44592](https://github.com/WordPress/gutenberg/pull/44592))
 
-### Bug Fix
+### Bug Fixes
 
 -   `Popover`: fix limitShift logic by adding iframe offset correctly ([#42950](https://github.com/WordPress/gutenberg/pull/42950)).
 -   `Popover`: refine position-to-placement conversion logic, add tests ([#44377](https://github.com/WordPress/gutenberg/pull/44377)).
@@ -861,7 +1642,7 @@
 
 -   `Popover`: added new `anchor` prop, supposed to supersede all previous anchor-related props (`anchorRef`, `anchorRect`, `getAnchorRect`). These older anchor-related props are now marked as deprecated and are scheduled to be removed in WordPress 6.3 ([#43691](https://github.com/WordPress/gutenberg/pull/43691)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Button`: Remove unexpected `has-text` class when empty children are passed ([#44198](https://github.com/WordPress/gutenberg/pull/44198)).
 -   The `LinkedButton` to unlink sides in `BoxControl`, `BorderBoxControl` and `BorderRadiusControl` have changed from a rectangular primary button to an icon-only button, with a sentence case tooltip, and default-size icon for better legibility. The `Button` component has been fixed so when `isSmall` and `icon` props are set, and no text is present, the button shape is square rather than rectangular.
@@ -887,7 +1668,7 @@
 -   `Popover`: deprecate `__unstableShift` prop in favour of new `shift` prop. The `__unstableShift` is currently scheduled for removal in WordPress 6.3 ([#43845](https://github.com/WordPress/gutenberg/pull/43845)).
 -   `Popover`: removed the `__unstableObserveElement` prop, which is not necessary anymore. The functionality is now supported directly by the component without the need of an external prop ([#43617](https://github.com/WordPress/gutenberg/pull/43617)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `Button`, `Icon`: Fix `iconSize` prop doesn't work with some icons ([#43821](https://github.com/WordPress/gutenberg/pull/43821)).
 -   `InputControl`, `NumberControl`, `UnitControl`: Fix margin when `labelPosition` is `bottom` ([#43995](https://github.com/WordPress/gutenberg/pull/43995)).
@@ -952,7 +1733,7 @@
 -   `CustomSelectControl`: Deprecate constrained width style. Add a `__nextUnconstrainedWidth` prop to start opting into the unconstrained width that will become the default in a future version, currently scheduled to be WordPress 6.4 ([#43230](https://github.com/WordPress/gutenberg/pull/43230)).
 -   `Popover`: deprecate `__unstableForcePosition` prop in favour of new `flip` and `resize` props. The `__unstableForcePosition` is currently scheduled for removal in WordPress 6.3 ([#43546](https://github.com/WordPress/gutenberg/pull/43546)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `AlignmentMatrixControl`: keep the physical direction in RTL languages ([#43126](https://github.com/WordPress/gutenberg/pull/43126)).
 -   `AlignmentMatrixControl`: Fix the `width` prop so it works as intended ([#43482](https://github.com/WordPress/gutenberg/pull/43482)).
@@ -1023,7 +1804,7 @@
 
 ## 19.17.0 (2022-08-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   `Popover`: make sure that `ownerDocument` is always defined ([#42886](https://github.com/WordPress/gutenberg/pull/42886)).
 -   `ExternalLink`: Check if the link is an internal anchor link and prevent anchor links from being opened. ([#42259](https://github.com/WordPress/gutenberg/pull/42259)).
@@ -1069,7 +1850,7 @@
 
 ## 19.16.0 (2022-07-27)
 
-### Bug Fix
+### Bug Fixes
 
 -   Context System: Stop explicitly setting `undefined` to the `children` prop. This fixes a bug where `Icon` could not be correctly rendered via the `as` prop of a context-connected component ([#42686](https://github.com/WordPress/gutenberg/pull/42686)).
 -   `Popover`, `Dropdown`: Fix width when `expandOnMobile` is enabled ([#42635](https://github.com/WordPress/gutenberg/pull/42635/)).
@@ -1115,7 +1896,7 @@
 
 ## 19.15.0 (2022-07-13)
 
-### Bug Fix
+### Bug Fixes
 
 -   `BoxControl`: Change ARIA role from `region` to `group` to avoid unwanted ARIA landmark regions ([#42094](https://github.com/WordPress/gutenberg/pull/42094)).
 -   `FocalPointPicker`, `FormTokenField`, `ResizableBox`: Fixed SSR breakage ([#42248](https://github.com/WordPress/gutenberg/pull/42248)).
@@ -1157,7 +1938,7 @@
 
 ## 19.14.0 (2022-06-29)
 
-### Bug Fix
+### Bug Fixes
 
 -   `ColorPicker`: Remove horizontal scrollbar when using HSL or RGB color input types. ([#41646](https://github.com/WordPress/gutenberg/pull/41646))
 -   `ColorPicker`: Widen hex input field for mobile. ([#42004](https://github.com/WordPress/gutenberg/pull/42004))
@@ -1197,7 +1978,7 @@
 
 ## 19.13.0 (2022-06-15)
 
-### Bug Fix
+### Bug Fixes
 
 -   `Tooltip`: Opt in to `__unstableShift` to ensure that the Tooltip is always within the viewport. ([#41524](https://github.com/WordPress/gutenberg/pull/41524))
 -   `FormTokenField`: Do not suggest the selected one even if `{ value: string }` is passed ([#41216](https://github.com/WordPress/gutenberg/pull/41216)).
@@ -1231,7 +2012,7 @@
 
 ## 19.12.0 (2022-06-01)
 
-### Bug Fix
+### Bug Fixes
 
 -   `Popover`, `Dropdown`, `CustomGradientPicker`: Fix dropdown positioning by always targeting the rendered toggle, and switch off width in the Popover size middleware to stop reducing the width of the popover. ([#41361](https://github.com/WordPress/gutenberg/pull/41361))
 -   Fix `InputControl` blocking undo/redo while focused. ([#40518](https://github.com/WordPress/gutenberg/pull/40518))
@@ -1301,7 +2082,7 @@
 -   `ToggleControlGroup`: Switch to internal `Icon` component for dashicon support ([40717](https://github.com/WordPress/gutenberg/pull/40717)).
 -   Improve `ToolsPanel` accessibility. ([#40716](https://github.com/WordPress/gutenberg/pull/40716))
 
-### Bug Fix
+### Bug Fixes
 
 -   The `Button` component now displays the label as the tooltip for icon only buttons. ([#40716](https://github.com/WordPress/gutenberg/pull/40716))
 -   Use fake timers and fix usage of async methods from `@testing-library/user-event`. ([#40790](https://github.com/WordPress/gutenberg/pull/40790))
@@ -1315,7 +2096,7 @@
 
 ## 19.9.0 (2022-04-21)
 
-### Bug Fix
+### Bug Fixes
 
 -   Consolidate the main black colors to gray-900. Affects `AlignmentMatrixControl`, `InputControl`, `Heading`, `SelectControl`, `Spinner (Experimental)`, and `Text` ([#40391](https://github.com/WordPress/gutenberg/pull/40391)).
 
@@ -1323,7 +2104,7 @@
 
 -   Remove individual color object exports from the `utils/colors-values.js` file. Colors should now be used from the main `COLORS` export([#40387](https://github.com/WordPress/gutenberg/pull/40387)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `InputControl`: allow user to input a value interactively in Storybook, by removing default value argument ([#40410](https://github.com/WordPress/gutenberg/pull/40410)).
 
@@ -1346,7 +2127,7 @@
 -   Add `BorderBoxControl` component ([#38876](https://github.com/WordPress/gutenberg/pull/38876)).
 -   Add `ToggleGroupControlOptionIcon` component ([#39760](https://github.com/WordPress/gutenberg/pull/39760)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Use `Object.assign` instead of `{ ...spread }` syntax to avoid errors in the code generated by TypeScript ([#39932](https://github.com/WordPress/gutenberg/pull/39932)).
 -   `ItemGroup`: Ensure that the Item's text color is not overridden by the user agent's button color ([#40055](https://github.com/WordPress/gutenberg/pull/40055)).
@@ -1372,13 +2153,13 @@
 -   Delete the `composeStateReducers` utility function ([#39262](https://github.com/WordPress/gutenberg/pull/39262)).
 -   `BoxControl`: stop using `UnitControl`'s deprecated `unit` prop ([#39511](https://github.com/WordPress/gutenberg/pull/39511)).
 
-### Bug Fix
+### Bug Fixes
 
 -   `NumberControl`: commit (and constrain) value on `blur` event ([#39186](https://github.com/WordPress/gutenberg/pull/39186)).
 -   Fix `UnitControl`'s reset of unit when the quantity value is cleared. ([#39531](https://github.com/WordPress/gutenberg/pull/39531/)).
 -   `ResizableBox`: Ensure tooltip text remains on a single line. ([#39623](https://github.com/WordPress/gutenberg/pull/39623)).
 
-### Deprecation
+### Deprecations
 
 -   `unit` prop in `UnitControl` marked as deprecated ([#39503](https://github.com/WordPress/gutenberg/pull/39503)).
 
@@ -1391,7 +2172,7 @@
 -   `TreeGrid`: Add tests for Home/End keyboard navigation. Add `onFocusRow` callback for Home/End keyboard navigation, this was missed in the implementation PR. Modify test for expanding/collapsing a row as row 1 implements this now. Update README with latest changes. ([#39302](https://github.com/WordPress/gutenberg/pull/39302))
 -   `ToggleGroupControlOption`: Calculate width from button content and remove `LabelPlaceholderView` ([#39345](https://github.com/WordPress/gutenberg/pull/39345))
 
-### Bug Fix
+### Bug Fixes
 
 -   Normalize `font-family` on `Button`, `ColorPalette`, `ComoboboxControl`, `DateTimePicker`, `FormTokenField`, `InputControl`, `SelectControl`, and `ToggleGroupControl` ([#38969](https://github.com/WordPress/gutenberg/pull/38969)).
 -   Fix input value selection of `InputControl`-based controls in Firefox and Safari with axial constraint of drag gesture ([#38968](https://github.com/WordPress/gutenberg/pull/38968)).
@@ -1399,7 +2180,7 @@
 
 ## 19.5.0 (2022-02-23)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix spin buttons of number inputs in Safari ([#38840](https://github.com/WordPress/gutenberg/pull/38840))
 -   Show tooltip on toggle custom size button in FontSizePicker ([#38985](https://github.com/WordPress/gutenberg/pull/38985))
@@ -1411,7 +2192,7 @@
 
 ## 19.4.0 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Components: Fix `Slot`/`Fill` Emotion `StyleProvider` ([#38237](https://github.com/WordPress/gutenberg/pull/38237))
 -   Reduce height and min-width of the reset button on `ComboBoxControl` for consistency. ([#38020](https://github.com/WordPress/gutenberg/pull/38020))
@@ -1445,7 +2226,7 @@
 -   Updated `ToolsPanel` header icon to only show "plus" icon when all items are optional and all are currently hidden ([#38262](https://github.com/WordPress/gutenberg/pull/38262))
 -   `TreeGrid`: Fix keyboard navigation for expand/collapse table rows in Firefox ([#37983](https://github.com/WordPress/gutenberg/pull/37983))
 
-### Bug Fix
+### Bug Fixes
 
 -   Update the `HexInput` component to accept a pasted value that contains a starting #
 -   Update `ToggleGroupControl` background active state to use a simple background color instead of animated backdrop ([38008](https://github.com/WordPress/gutenberg/pull/38008))
@@ -1479,7 +2260,7 @@
 -   Add `__experimentalIsRenderedInSidebar` property to the `GradientPicker`and `CustomGradientPicker`. The property changes the color popover behavior to have a special placement behavior appropriate for sidebar UI's.
 -   Add `first` and `last` classes to displayed `ToolsPanelItem` group within a `ToolsPanel` ([#37546](https://github.com/WordPress/gutenberg/pull/37546))
 
-### Bug Fix
+### Bug Fixes
 
 -   Fixed spacing between `BaseControl` fields and help text within the `ToolsPanel` ([#36334](https://github.com/WordPress/gutenberg/pull/36334))
 -   Replaced hardcoded blue in `ColorPicker` with UI theme color ([#36153](https://github.com/WordPress/gutenberg/pull/36153)).
@@ -1502,7 +2283,7 @@
 
 ## 19.1.4 (2021-12-13)
 
-### Bug Fix
+### Bug Fixes
 
 -   Improve accessibility and visibility in `ColorPallete` ([#36925](https://github.com/WordPress/gutenberg/pull/36925))
 
@@ -1512,7 +2293,7 @@
 
 ## 19.1.2 (2021-12-06)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fixed `GradientPicker` not displaying `CustomGradientPicker` when no gradients are provided ([#36900](https://github.com/WordPress/gutenberg/pull/36900)).
 -   Fixed error thrown in `ColorPicker` when used in controlled state in color gradients ([#36941](https://github.com/WordPress/gutenberg/pull/36941)).
@@ -1525,7 +2306,7 @@
 
 -   Added a `showTooltip` prop to `ToggleGroupControlOption` in order to display tooltip text (using `<Tooltip />`). ([#36726](https://github.com/WordPress/gutenberg/pull/36726)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Fixed a bug which prevented setting `PM` hours correctly in the `DateTimePicker` ([#36878](https://github.com/WordPress/gutenberg/pull/36878)).
 
@@ -1580,7 +2361,7 @@
 -   Add an experimental `Navigator` components ([#34904](https://github.com/WordPress/gutenberg/pull/34904)) as a replacement for the previous `Navigation` related components.
 -   Update the `ColorPicker` component to the latest design ([#35220](https://github.com/WordPress/gutenberg/pull/35220))
 
-### Bug Fix
+### Bug Fixes
 
 -   Fixed rounding of value in `RangeControl` component when it loses focus while the `SHIFT` key is held. ([#35020](https://github.com/WordPress/gutenberg/pull/35020)).
 
@@ -1591,11 +2372,11 @@
 
 ## 17.0.0 (2021-09-09)
 
-### Breaking Change
+### Breaking Changes
 
 -   Removed a min-width from the `DropdownMenu` component, allowing the menu to accommodate thin contents like vertical tools menus ([#33995](https://github.com/WordPress/gutenberg/pull/33995)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Fixed RTL styles in `Flex` component ([#33729](https://github.com/WordPress/gutenberg/pull/33729)).
 -   Fixed unit test errors caused by `CSS.supports` being called in a non-browser environment ([#34572](https://github.com/WordPress/gutenberg/pull/34572)).
@@ -1607,39 +2388,39 @@
 
 ## 16.0.0 (2021-08-23)
 
-### Breaking Change
+### Breaking Changes
 
 -   Updated the visual styles of the RangeControl component ([#33824](https://github.com/WordPress/gutenberg/pull/33824)).
 
-### New Feature
+### New Features
 
 -   Add `hideLabelFromVision` prop to `RangeControl` ([#33714](https://github.com/WordPress/gutenberg/pull/33714)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Listen to `resize` events correctly in `useBreakpointIndex`. This hook is used in `useResponsiveValue` and consequently in the `Flex` and `Grid` components ([#33902](https://github.com/WordPress/gutenberg/pull/33902))
 
 ## 15.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
-### Deprecation
+### Deprecations
 
 -   `isScrollable` prop in `CardBody` default value changed from `true` to `false` ([#33490](https://github.com/WordPress/gutenberg/pull/33490))
 
-### Bug Fix
+### Bug Fixes
 
 -   Added back `box-sizing: border-box` rule to `CardBody`, `CardHeader` and `CardFooter` components [#33511](https://github.com/WordPress/gutenberg/pull/33511).
 
 ## 14.2.0 (2021-07-21)
 
-### New Feature
+### New Features
 
 -   Update the border color used in `CardBody`, `CardHeader`, `CardFooter`, and `CardDivider` to a different shade of gray, in order to match the color used in other components ([#32566](https://github.com/WordPress/gutenberg/pull/32566)).
 
-### Deprecation
+### Deprecations
 
 -   `isPrimary`, `isSecondary`, `isTertiary` and `isLink` props in `Button` have been deprecated. Use `variant` instead ([#31713](https://github.com/WordPress/gutenberg/pull/31713)).
 -   `isElevated` prop in `Card` has been deprecated. Use `elevation` instead ([#32566](https://github.com/WordPress/gutenberg/pull/32566)).
@@ -1654,11 +2435,11 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 -   The experimental `Text` component has been completely re-written and enhanced with truncation support and separate variant, size, and weight props to allow for greater control. The previous `variant` prop has been completely removed.
 
-### Deprecation
+### Deprecations
 
 -   `isReversed` prop in `Flex` component has been deprecated. Use `direction` instead ([#31297](https://github.com/WordPress/gutenberg/pull/31297)).
 
@@ -1668,16 +2449,16 @@
 
 ## 13.0.0 (2021-03-17)
 
-### Breaking Change
+### Breaking Changes
 
 -   `onChange` prop of `FocalPointPicker` is called at the end of drag operations. Previously, it was called repetitively while dragging.
 
-### New Feature
+### New Features
 
 -   Supports ref forwarding in `withNotices` and `ResizableBox`.
 -   Adds `onDrag` prop of `FocalPointPicker`.
 
-### Bug Fix
+### Bug Fixes
 
 -   Allows focus of the `FocalPointPicker` draggable area and adjustment with arrow keys. This was added in [#22531](https://github.com/WordPress/gutenberg/pull/22264) but was no longer working.
 
@@ -1687,13 +2468,13 @@
 
 -   ComboboxControl: Deburr option labels before filter
 
-### Breaking Change
+### Breaking Changes
 
 -   Introduce support for other units and advanced CSS properties on `FontSizePicker`. Provided the value passed to the `FontSizePicker` is a string or one of the size options passed is a string, onChange will start to be called with a string value instead of a number. On WordPress usage, font size options are now automatically converted to strings with the default "px" unit added.
 
 ## 10.1.0 (2020-09-03)
 
-### New Feature
+### New Features
 
 -   Add `ToolbarItem` component.
 -   Support `label` prop on the `Toolbar` component.
@@ -1704,14 +2485,14 @@
 
 ## 10.0.0 (2020-07-07)
 
-### Breaking Change
+### Breaking Changes
 
 -   `NumberControl` no longer automatically transforms values when rendering `value` into a `<input />` HTML element.
 -   `Dashicon` component no longer renders SVGs. If you rely on this component, make sure to load the dashicon font.
 
 ## 9.6.0 (2020-05-14)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix and issue that would cause the `Popover` component to throw an error under certain
     circumstances ([#22264](https://github.com/WordPress/gutenberg/pull/22264)).
@@ -1792,7 +2573,7 @@
 
 ## 8.0.0 (2019-06-12)
 
-### New Feature
+### New Features
 
 -   Add new `BlockQuotation` block to the primitives folder to support blockquote in a multiplatform way. [#15482](https://github.com/WordPress/gutenberg/pull/15482).
 -   `DropdownMenu` now supports passing a [render prop](https://reactjs.org/docs/render-props.html#using-props-other-than-render) as children for more advanced customization.
@@ -1805,22 +2586,22 @@
 
 -   Added missing documentation for `DropdownMenu` props `menuLabel`, `position`, `className`.
 
-### Breaking Change
+### Breaking Changes
 
 -   `ServerSideRender` is no longer part of components. It was extracted to an independent package `@wordpress/server-side-render`.
 
-### Bug Fix
+### Bug Fixes
 
 -   Although `DateTimePicker` does not allow picking the seconds, passed the current seconds as the selected value for seconds when calling `onChange`. Now it passes zero.
 
 ## 7.4.0 (2019-05-21)
 
-### New Feature
+### New Features
 
 -   Added a new `HorizontalRule` component.
 -   Added a new `Snackbar` component.
 
-### Bug Fix
+### Bug Fixes
 
 -   Fixed display of reset button when using RangeControl `allowReset` prop.
 -   Fixed minutes field of `DateTimePicker` missed '0' before single digit values.
@@ -1834,17 +2615,17 @@
 -   Added a new `preview` prop to the `Placeholder` component which allows to display a preview, for example a media preview when the Placeholder is used in media editing contexts.
 -   Added a new `anchorRect` prop to `Popover` which enables a developer to provide a custom `DOMRect` object at which to position the popover.
 
-### Improvements
+### Enhancements
 
 -   Limit `Base Control Label` to the width of its content.
 
-### Bug fixes
+### Bug Fixes
 
 -   Fix `instanceId` prop passed through to `Button` component via `MenuItems` producing React console error. Fixed by removing the unnecessary use of `withInstanceId` on the `MenuItems` component [#14599](https://github.com/WordPress/gutenberg/pull/14599)
 
 ## 7.2.0 (2019-03-20)
 
-### Improvements
+### Enhancements
 
 -   Make `RangeControl` validation rely on the `checkValidity` provided by the browsers instead of using our own validation.
 
@@ -1858,7 +2639,7 @@
 
 -   Added a new `Animate` component.
 
-### Improvements
+### Enhancements
 
 -   `withFilters` has been optimized to avoid binding hook handlers for each mounted instance of the component, instead using a single centralized hook delegator.
 -   `withFilters` has been optimized to reuse a single shared component definition for all filtered instances of the component.
@@ -1869,7 +2650,7 @@
 -   Resolves a conflict where two instance of Slot would produce an inconsistent or duplicated rendering output.
 -   Allow years between 0 and 1970 in DateTime component.
 
-### New Feature
+### New Features
 
 -   `Dropdown` now has a `focusOnMount` prop which is passed directly to the contained `Popover`.
 -   `DatePicker` has new prop `isInvalidDate` exposing react-dates' `isOutsideRange`.
@@ -1887,7 +2668,7 @@
 
 ## 7.0.0 (2018-11-20)
 
-### Breaking Change
+### Breaking Changes
 
 -   `Dropdown.refresh()` has been removed. The contained `Popover` is now automatically refreshed.
 
@@ -1899,13 +2680,13 @@
 
 -   Avoid constantly recomputing the popover position.
 
-### Polish
+### Internal
 
 -   Remove `<DateTimePicker />` obsolete `locale` prop (and pass-through to child components) and obsolete `is12Hour` prop pass through to `<DateTime />` [#11649](https://github.com/WordPress/gutenberg/pull/11649)
 
 ## 6.0.0 (2018-11-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   The `PanelColor` component has been removed.
 
@@ -1913,18 +2694,18 @@
 
 ## 5.1.0 (2018-11-09)
 
-### New Feature
+### New Features
 
 -   Adjust a11y roles for MenuItem component, so that aria-checked is used properly, related change in Editor/Components/BlockNavigationList ([#11431](https://github.com/WordPress/gutenberg/issues/11431)).
 -   `Popover` components are now automatically refreshed every 0.5s in order to recalculate their size or position.
 
-### Deprecation
+### Deprecations
 
 -   `Dropdown.refresh()` has been deprecated as the contained `Popover` is now automatically refreshed.
 
 ## 5.0.2 (2018-11-03)
 
-### Polish
+### Internal
 
 -   Forward `ref` in the `PanelBody` component.
 -   Tooltip are no longer removed when Button becomes disabled, it's left to the component rendering the Tooltip.
@@ -1934,32 +2715,32 @@
 
 ## 5.0.0 (2018-10-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   `AccessibleSVG` component has been removed. Please use `SVG` instead.
 
-### New Feature
+### New Features
 
 -   The `Notice` component accepts an array of action objects via the `actions` prop. Each member object should contain a `label` and either a `url` link string or `onClick` callback function.
 
 ## 4.2.1 (2018-10-22)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix importing `react-dates` stylesheet in production.
 
 ## 4.2.0 (2018-10-19)
 
-### New Feature
+### New Features
 
 -   Added a new `ColorPicker` component ([#10564](https://github.com/WordPress/gutenberg/pull/10564)).
 -   `MenuItem` now accepts an `info` prop for including an extended description.
 
-### Bug Fix
+### Bug Fixes
 
 -   `IconButton` correctly respects a passed `aria-label` prop.
 
-### Deprecation
+### Deprecations
 
 -   `PanelColor` has been deprecated in favor of `wp.editor.PanelColorSettings`.
 
@@ -1967,29 +2748,29 @@
 
 ## 4.1.0 (2018-10-10)
 
-### New Feature
+### New Features
 
 -   Added a new `ResizableBox` component.
 
 ## 4.0.0 (2018-09-30)
 
-### Breaking Change
+### Breaking Changes
 
 -   `Draggable` as a DOM node drag handler has been removed. Please, use `Draggable` as a wrap component for your DOM node drag handler.
 
-### Deprecation
+### Deprecations
 
 -   Renamed `AccessibleSVG` component to `SVG`.
 
 ## 3.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   `withAPIData` has been removed. Please use the Core Data module or `@wordpress/api-fetch` directly instead.
 -   `Draggable` as a DOM node drag handler has been deprecated. Please, use `Draggable` as a wrap component for your DOM node drag handler.
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
--   `withContext` has been removed. Please use `wp.element.createContext` instead. See: https://reactjs.org/docs/context.html.
+-   `withContext` has been removed. Please use `wp.element.createContext` instead. See: <https://reactjs.org/docs/context.html>.
 
-### New Feature
+### New Features
 
 -   Added a new `AccessibleSVG` component.
diff --git a/packages/components/CONTRIBUTING.md b/packages/components/CONTRIBUTING.md
index 3d682c584f383d..8af8bbf801edfe 100644
--- a/packages/components/CONTRIBUTING.md
+++ b/packages/components/CONTRIBUTING.md
@@ -6,21 +6,20 @@ The following is a set of guidelines for contributing to the `@wordpress/compone
 
 This set of guidelines should apply especially to newly introduced components. In fact, while these guidelines should also be retroactively applied to existing components, it is sometimes impossible to do so for legacy/compatibility reasons.
 
-For an example of a component that follows these requirements, take a look at [`ItemGroup`](/packages/components/src/item-group).
-- [Introducing new components](#introducing-new-components)
-- [Compatibility](#compatibility)
-- [Compound components](#compound-components)
-- [Components & Hooks](#components--hooks)
-- [TypeScript](#typescript)
-- [Styling](#styling)
-- [Context system](#context-system)
-- [Unit tests](#unit-tests)
-- [Storybook](#storybook)
-- [Documentation](#documentation)
-- [README example](#README-example)
-- [Folder structure](#folder-structure)
-- [TypeScript migration guide](#refactoring-a-component-to-typescript)
-- [Using Radix UI primitives](#using-radix-ui-primitives)
+-   [Introducing new components](#introducing-new-components)
+-   [Compatibility](#compatibility)
+-   [Compound components](#compound-components)
+-   [Components & Hooks](#components--hooks)
+-   [Naming Conventions](#naming-conventions)
+-   [TypeScript](#typescript)
+-   [Styling](#styling)
+-   [Context system](#context-system)
+-   [Unit tests](#unit-tests)
+-   [Storybook](#storybook)
+-   [Documentation](#documentation)
+-   [README example](#README-example)
+-   [Folder structure](#folder-structure)
+-   [Component versioning](#component-versioning)
 
 ## Introducing new components
 
@@ -96,13 +95,13 @@ In these situations, one possible approach is to "soft-deprecate" a given legacy
 2. Updating all places in Gutenberg that use that API.
 3. Adding deprecation warnings (only after the previous point is completed, otherwise the Browser Console will be polluted by all those warnings and some e2e tests may fail).
 
-When adding new components or new props to existing components, it's recommended to prefix them with `__unstable` or `__experimental` until they're stable enough to be exposed as part of the public API.
+When adding new components or new props to existing components, it's recommended to create a [private version](/packages/private-apis/README.md)) of the component until the changes are stable enough to be exposed as part of the public API.
 
 ### Learn more
 
-- [How to preserve backward compatibility for a React Component](/docs/contributors/code/backward-compatibility.md#how-to-preserve-backward-compatibility-for-a-react-component)
-- [Experimental and Unstable APIs](/docs/contributors/code/coding-guidelines.md#experimental-and-unstable-apis)
-- [Deprecating styles](#deprecating-styles)
+-   [How to preserve backward compatibility for a React Component](/docs/contributors/code/backward-compatibility.md#how-to-preserve-backward-compatibility-for-a-react-component)
+-   [Experimental and Unstable APIs](/docs/contributors/code/coding-guidelines.md#legacy-experimental-apis-plugin-only-apis-and-private-apis)
+-   [Deprecating styles](#deprecating-styles)
 
 <!-- ## Polymorphic Components (i.e. the `as` prop)
 
@@ -122,20 +121,16 @@ When creating components that render a list of subcomponents, prefer to expose t
 ```jsx
 // ❌ Don't:
 <List
-	items={ [
-		{ value: 'Item 1' },
-		{ value: 'Item 2' },
-		{ value: 'Item 3' },
-	] }
+	items={ [ { value: 'Item 1' }, { value: 'Item 2' }, { value: 'Item 3' } ] }
 />
 ```
 
 ```jsx
 // ✅ Do:
 <List>
-	<ListItem value="Item 1" />
-	<ListItem value="Item 2" />
-	<ListItem value="Item 3" />
+	<List.Item value="Item 1" />
+	<List.Item value="Item 2" />
+	<List.Item value="Item 3" />
 </List>
 ```
 
@@ -186,25 +181,25 @@ One way to enable reusability and composition is to extract a component's underl
 
 ```tsx
 // in `hook.ts`
-function useExampleComponent( props: PolymorphicComponentProps< ExampleProps, 'div' > ) {
+function useExampleComponent(
+	props: PolymorphicComponentProps< ExampleProps, 'div' >
+) {
 	// Merge received props with the context system.
-	const { isVisible, className, ...otherProps } = useContextSystem( props, 'Example' );
+	const { isVisible, className, ...otherProps } = useContextSystem(
+		props,
+		'Example'
+	);
 
 	// Any other reusable rendering logic (e.g. computing className, state, event listeners...)
 	const cx = useCx();
 	const classes = useMemo(
-		() =>
-			cx(
-				styles.example,
-				isVisible && styles.visible,
-				className
-			),
+		() => cx( styles.example, isVisible && styles.visible, className ),
 		[ className, isVisible ]
 	);
 
 	return {
 		...otherProps,
-		className: classes
+		className: classes,
 	};
 }
 
@@ -221,8 +216,8 @@ function Example(
 
 A couple of good examples of how hooks are used for composition are:
 
-- the `Card` component, which builds on top of the `Surface` component by [calling the `useSurface` hook inside its own hook](/packages/components/src/card/card/hook.ts);
-- the `HStack` component, which builds on top of the `Flex` component and [calls the `useFlex` hook inside its own hook](/packages/components/src/h-stack/hook.tsx).
+-   the `Card` component, which builds on top of the `Surface` component by [calling the `useSurface` hook inside its own hook](/packages/components/src/card/card/hook.ts);
+-   the `HStack` component, which builds on top of the `Flex` component and [calls the `useFlex` hook inside its own hook](/packages/components/src/h-stack/hook.tsx).
 
 <!-- ## API Consinstency
 
@@ -237,9 +232,184 @@ A couple of good examples of how hooks are used for composition are:
 
 TDB -->
 
+## Naming Conventions
+
+It is recommended that compound components use dot notation to separate the namespace from the individual component names. The top-level compound component should be called the namespace (no dot notation).
+
+Dedicated React context should also use dot notation, while hooks should not.
+
+When exporting compound components and preparing them to be consumed, it is important that:
+
+-   the JSDocs appear correctly in IntelliSense;
+-   the top-level component's JSDoc appears in the Storybook docs page;
+-   the top-level and subcomponent's prop types appear correctly in the Storybook props table.
+
+To meet the above requirements, we recommend:
+
+-   using `Object.assign()` to add subcomponents as properties of the top-level component;
+-   using named functions for all components;
+-   using a separate file for each component, context and hook;
+-   setting explicitly the `displayName` on all subcomponents;
+-   adding the top-level JSDoc to the result of the `Object.assign` call;
+-   adding inline subcomponent JSDocs inside the `Object.assign` call.
+
+The following example implements all of the above recommendations.
+
+```tsx
+//=======================
+// subcomponent.tsx
+//=======================
+import { forwardRef } from '@wordpress/element';
+
+export const ComponentSubcomponent = forwardRef(
+	function UnforwardedComponentSubcomponent( props, ref ) {
+		/* ... */
+	}
+);
+
+//=======================
+// context.ts
+//=======================
+import { createContext } from '@wordpress/element';
+
+export const ComponentContext = createContext();
+
+//=======================
+// hook.ts
+//=======================
+
+/** The hook's JSDoc. */
+export function useComponent() {
+	/* ... */
+}
+
+//=======================
+// component.tsx
+//=======================
+import { forwardRef } from '@wordpress/element';
+import { ComponentSubcomponent } from './subcomponent';
+import { ComponentContext } from './context';
+
+/** The top-level component's JSDoc. */
+export const Component = Object.assign(
+	forwardRef( function UnforwardedTopLevelComponent( props, ref ) {
+		/* ... */
+	} ),
+	{
+		/** The subcomponent's JSDoc. */
+		Subcomponent: Object.assign(ComponentSubcomponent, {
+			displayName: 'Component.SubComponent';,
+		}),
+		/** The context's JSDoc. */
+		Context: Object.assign(ComponentContext, {
+			displayName: 'Component.Context'
+		}),
+	}
+);
+
+export default Component;
+
+//=======================
+// App.tsx
+//=======================
+import { Component, useComponent } from '@wordpress/components';
+import { useContext } from '@wordpress/element';
+
+function CompoundComponentExample() {
+	return (
+		<Component>
+			<Component.SubComponent />
+		</Component>
+	);
+}
+
+function ContextProviderExample() {
+	return (
+		<Component.Context.Provider value={ /* ... */ }>
+			{ /* React tree */ }
+		</Component.Context.Provider>
+	);
+}
+
+function ContextConsumerExample() {
+	const componentContext = useContext( Component.Context );
+
+	// etc
+}
+
+function HookExample() {
+	const hookReturnValue = useComponent();
+
+	// etc.
+}
+```
+
 ## TypeScript
 
-We strongly encourage using TypeScript for all new components. Components should be typed using the `WordPressComponent` type.
+We strongly encourage using TypeScript for all new components.
+
+Extend existing components’ props if possible, especially when a component internally forwards its props to another component in the package:
+
+```ts
+type NumberControlProps = Omit<
+	InputControlProps,
+	'isDragEnabled' | 'min' | 'max'
+> & {
+	/* Additional props specific to NumberControl */
+};
+```
+
+Use JSDocs syntax for each TypeScript property that is part of the public API of a component. The docs used here should be aligned with the component’s README. Add `@default` values where appropriate:
+
+```ts
+/**
+ * Renders with elevation styles (box shadow).
+ *
+ * @default false
+ * @deprecated
+ */
+isElevated?: boolean;
+```
+
+Prefer `unknown` to `any`, and in general avoid it when possible.
+
+If the component forwards its `...restProps` to an underlying element/component, you should use the `WordPressComponentProps` type for the component's props:
+
+```ts
+import type { WordPressComponentProps } from '../context';
+import type { ComponentOwnProps } from './types';
+
+function UnconnectedMyComponent(
+	// The resulting type will include:
+	// - all props defined in `ComponentOwnProps`
+	// - all HTML props/attributes from the component specified as the second
+	//   parameter (`div` in this example)
+	// - the special `as` prop (which marks the component as polymorphic),
+	//   unless the third parameter is `false`
+	props: WordPressComponentProps< ComponentOwnProps, 'div', true >
+) {
+	/* ... */
+}
+```
+
+### Considerations for the docgen
+
+Make sure you have a **named** export for the component, not just the default export ([example](https://github.com/WordPress/gutenberg/blob/trunk/packages/components/src/divider/component.tsx)). This ensures that the docgen can properly extract the types data. The naming should be so that the connected/forwarded component has the plain component name (`MyComponent`), and the raw component is prefixed (`UnconnectedMyComponent` or `UnforwardedMyComponent`). This makes the component's `displayName` look nicer in React devtools and in the autogenerated Storybook code snippets.
+
+```js
+function UnconnectedMyComponent() {
+	/* ... */
+}
+
+// 👇 Without this named export, the docgen will not work!
+export const MyComponent = contextConnect(
+	UnconnectedMyComponent,
+	'MyComponent'
+);
+export default MyComponent;
+```
+
+On the component's main named export, add a JSDoc comment that includes the main description and the example code snippet from the README ([example](https://github.com/WordPress/gutenberg/blob/43d9c82922619c1d1ff6b454f86f75c3157d3de6/packages/components/src/date-time/date-time/index.tsx#L193-L217)). _At the time of writing, the `@example` JSDoc keyword is not recognized by StoryBook's docgen, so please avoid using it_.
 
 <!-- TODO: add to the previous paragraph once the composision section gets added to this document.
 (more details about polymorphism can be found above in the "Components composition" section). -->
@@ -259,16 +429,15 @@ Changing the styles of a non-experimental component must be done with care. To p
 import deprecated from '@wordpress/deprecated';
 import { Wrapper } from './styles.ts';
 
-function MyComponent({ __nextHasNoOuterMargins = false }) {
+function MyComponent( { __nextHasNoOuterMargins = false } ) {
 	if ( ! __nextHasNoOuterMargins ) {
 		deprecated( 'Outer margin styles for wp.components.MyComponent', {
 			since: '6.0',
 			version: '6.2', // Set a reasonable grace period depending on impact
-			hint:
-				'Set the `__nextHasNoOuterMargins` prop to true to start opting into the new styles, which will become the default in a future version.',
+			hint: 'Set the `__nextHasNoOuterMargins` prop to true to start opting into the new styles, which will become the default in a future version.',
 		} );
 	}
-	return <Wrapper __nextHasNoOuterMargins={__nextHasNoOuterMargins} />
+	return <Wrapper __nextHasNoOuterMargins={ __nextHasNoOuterMargins } />;
 }
 ```
 
@@ -276,7 +445,7 @@ Styles should be structured so the deprecated styles are cleanly encapsulated, a
 
 ```js
 // styles.ts
-const deprecatedMargins = ({ __nextHasNoOuterMargins }) => {
+const deprecatedMargins = ( { __nextHasNoOuterMargins } ) => {
 	if ( ! __nextHasNoOuterMargins ) {
 		return css`
 			margin: 8px;
@@ -287,7 +456,7 @@ const deprecatedMargins = ({ __nextHasNoOuterMargins }) => {
 export const Wrapper = styled.div`
 	margin: 0;
 
-	${deprecatedMargins}
+	${ deprecatedMargins }
 `;
 ```
 
@@ -303,24 +472,24 @@ Not all style changes justify a formal deprecation process. The main thing to lo
 
 ##### DOES need formal deprecation
 
-- Removing an outer margin.
-- Substantial changes to width/height, such as adding or removing a size restriction.
+-   Removing an outer margin.
+-   Substantial changes to width/height, such as adding or removing a size restriction.
 
 ##### DOES NOT need formal deprecation
 
-- Breakage only occurs in non-standard usage, such as when the consumer is overriding component internals.
-- Minor layout shifts of a few pixels.
-- Internal layout changes of a higher-level component.
+-   Breakage only occurs in non-standard usage, such as when the consumer is overriding component internals.
+-   Minor layout shifts of a few pixels.
+-   Internal layout changes of a higher-level component.
 
 ## Context system
 
-The `@wordpress/components` context system is based on [React's `Context` API](https://reactjs.org/docs/context.html), and is a way for components to adapt to the "context" they're being rendered in.
+The `@wordpress/components` context system is based on [React's `Context` API](https://react.dev/reference/react/createContext), and is a way for components to adapt to the "context" they're being rendered in.
 
 Components can use this system via a couple of functions:
 
-- they can provide values using a shared `ContextSystemProvider` component
-- they can connect to the Context via `contextConnect`
-- they can read the "computed" values from the context via `useContextSystem`
+-   they can provide values using a shared `ContextSystemProvider` component
+-   they can connect to the Context via `contextConnect`
+-   they can read the "computed" values from the context via `useContextSystem`
 
 An example of how this is used can be found in the [`Card` component family](/packages/components/src/card). For example, this is how the `Card` component injects the `size` and `isBorderless` props down to its `CardBody` subcomponent — which makes it use the correct spacing and border settings "auto-magically".
 
@@ -345,11 +514,7 @@ export function useCard( props ) {
 import { contextConnect, ContextSystemProvider } from '../../context';
 
 function Card( props, forwardedRef ) {
-	const {
-		size,
-		isBorderless,
-		...otherComputedHookProps
-	} = useCard( props );
+	const { size, isBorderless, ...otherComputedHookProps } = useCard( props );
 
 	// [...]
 
@@ -386,7 +551,10 @@ export function useCardBody( props ) {
 	// If a `CardBody` component is rendered as a child of a `Card` component, the value of
 	// the `size` prop will be the one set by the parent `Card` component via the Context
 	// System (unless the prop gets explicitely set on the `CardBody` component).
-	const { size = 'medium', ...otherDerivedProps } = useContextSystem( props, 'CardBody' );
+	const { size = 'medium', ...otherDerivedProps } = useContextSystem(
+		props,
+		'CardBody'
+	);
 
 	// [...]
 
@@ -402,7 +570,7 @@ Please refer to the [JavaScript Testing Overview docs](/docs/contributors/code/t
 
 All new components should add stories to the project's [Storybook](https://storybook.js.org/). Each [story](https://storybook.js.org/docs/react/get-started/whats-a-story) captures the rendered state of a UI component in isolation. This greatly simplifies working on a given component, while also serving as an interactive form of documentation.
 
-A component's story should be showcasing its different states — for example, the different variants of a  `Button`:
+A component's story should be showcasing its different states — for example, the different variants of a `Button`:
 
 ```jsx
 import Button from '../';
@@ -488,6 +656,7 @@ Prop description. With a new line before and after the description and before an
 Add this section when there are props that are drilled down into an internal component. See [ClipboardButton](/packages/components/src/clipboard-button/README.md) for an example.
 
 <!-- Only add the next section if the component relies on the [Context System](#context-system) -->
+
 ## Context
 
 See examples for this section for the [ItemGroup](/packages/components/src/item-group/item-group/README.md#context) and [`Card`](/packages/components/src/card/card/README.md#context) components.
@@ -538,114 +707,73 @@ component-family-name/
 └── utils.ts
 ```
 
-## Refactoring a component to TypeScript
-
-*Note: This section assumes that the local developer environment is set up correctly, including TypeScript linting. We also strongly recommend using an IDE that supports TypeScript.*
-
-Given a component folder (e.g. `packages/components/src/unit-control`):
-
-1. Remove the folder from the exclude list in `tsconfig.json`, if it isn’t already.
-2. Remove any `// @ts-nocheck` comments in the folder, if any.
-3. Rename `*.js{x}` files to `*.ts{x}` (except stories and unit tests).
-4. Run `npm run dev` and take note of all the errors (your IDE should also flag them).
-5. Since we want to focus on one component’s folder at the time, if any errors are coming from files outside of the folder that is being refactored, there are two potential approaches:
-	1. Following those same guidelines, refactor those dependencies first.
-		1. Ideally, start from the “leaf” of the dependency tree and slowly work your way up the chain.
-		2. Resume work on this component once all dependencies have been refactored.
-	2. Alternatively:
-		1. For each of those files, add `// @ts-nocheck` at the start of the file.
-		2. If the components in the ignored files are destructuring props directly from the function's arguments, move the props destructuring to the function's body (this is to avoid TypeScript errors from trying to infer the props type):
-
-			```jsx
-			// Before:
-			function MyComponent( { myProp1, myProp2, ...restProps } ) { /* ... */ }
-
-			// After:
-			function MyComponent( props ) {
-				const {  myProp1, myProp2, ...restProps } = props;
-
-				/* ... */
-			}
-			```
-
-		3. Remove the folders from the exclude list in the `tsconfig.json` file.
-		4. If you’re still getting errors about a component’s props, the easiest way is to slightly refactor this component and perform the props destructuring inside the component’s body (as opposed as in the function signature) — this is to prevent TypeScript from inferring the types of these props.
-		5. Continue with the refactor of the current component (and take care of the refactor of the dependent components at a later stage).
-6. Create a new `types.ts` file.
-7. Slowly work your way through fixing the TypeScript errors in the folder:
-	1. Try to avoid introducing any runtime changes, if possible. The aim of this refactor is to simply rewrite the component to TypeScript.
-	2. Extract props to `types.ts`, and use them to type components. The README can be of help when determining a prop’s type.
-	3. Use existing HTML types when possible? (e.g. `required` for an input field?)
-	4. Use the `CSSProperties` type where it makes sense.
-	5. Extend existing components’ props if possible, especially when a component internally forwards its props to another component in the package.
-	6. If the component forwards its `...restProps` to an underlying element/component, you should use the `WordPressComponentProps` type for the component's props:
-
-		```tsx
-		import type { WordPressComponentProps } from '../context';
-		import type { ComponentOwnProps } from './types';
-
-		function UnconnectedMyComponent(
-			// The resulting type will include:
-			// - all props defined in `ComponentOwnProps`
-			// - all HTML props/attributes from the component specified as the second
-			//   parameter (`div` in this example)
-			// - the special `as` prop (which marks the component as polymorphic),
-			//   unless the third parameter is `false`
-			props:  WordPressComponentProps< ComponentOwnProps, 'div', true >
-		) { /* ... */ }
-		```
-
-	7. As shown in the previous examples, make sure you have a **named** export for the component, not just the default export ([example](https://github.com/WordPress/gutenberg/blob/trunk/packages/components/src/divider/component.tsx)). This ensures that the docgen can properly extract the types data. The naming should be so that the connected/forwarded component has the plain component name (`MyComponent`), and the raw component is prefixed (`UnconnectedMyComponent` or `UnforwardedMyComponent`). This makes the component's `displayName` look nicer in React devtools and in the autogenerated Storybook code snippets.
-
-		```jsx
-		function UnconnectedMyComponent() { /* ... */ }
-
-		// 👇 Without this named export, the docgen will not work!
-		export const MyComponent = contextConnect( UnconnectedMyComponent, 'MyComponent' );
-		export default MyComponent;
-		```
-
-	8. Use JSDocs syntax for each TypeScript property that is part of the public API of a component. The docs used here should be aligned with the component’s README. Add `@default` values where appropriate.
-	9. Prefer `unknown` to `any`, and in general avoid it when possible.
-8. On the component's main named export, add a JSDoc comment that includes the main description and the example code snippet from the README ([example](https://github.com/WordPress/gutenberg/blob/43d9c82922619c1d1ff6b454f86f75c3157d3de6/packages/components/src/date-time/date-time/index.tsx#L193-L217)). _At the time of writing, the `@example` JSDoc keyword is not recognized by StoryBook's docgen, so please avoid using it_.
-9. Make sure that:
-	1. tests still pass;
-	2. storybook examples work as expected.
-	3. the component still works as expected in its usage in Gutenberg;
-	4. the JSDocs comments on `types.ts` and README docs are aligned.
-10. Convert Storybook examples to TypeScript (and from knobs to controls, if necessary) ([example](https://github.com/WordPress/gutenberg/pull/39320)).
-	1. Update all consumers of the component to potentially extend the newly added types (e.g. make `UnitControl` props extend `NumberControl` props after `NumberControl` types are made available).
-	2. Rename Story extension from `.js` to `.tsx`.
-	3. Rewrite the `meta` story object, and export it as default. In particular, make sure you add the following settings under the `parameters` key:
-
-		```tsx
-		const meta: Meta< typeof MyComponent > = {
-			parameters: {
-				controls: { expanded: true },
-				docs: { canvas: { sourceState: 'shown' } },
-			},
-		};
-		```
-
-		These options will display prop descriptions in the `Canvas ▸ Controls` tab, and expand code snippets in the `Docs` tab.
-
-	4. Go to the component in Storybook and check the props table in the Docs tab. If there are props that shouldn't be there, check that your types are correct, or consider `Omit`-ing props that shouldn't be exposed.
-		1. Use the `parameters.controls.exclude` property on the `meta` object to hide props from the docs.
-		2. Use the `argTypes` prop on the `meta` object to customize how each prop in the docs can be interactively controlled by the user (tip: use `control: { type: null }` to remove the interactive controls from a prop, without hiding the prop from the docs).
-		3. See the [official docs](https://storybook.js.org/docs/react/essentials/controls) for more details.
-	5. Comment out all existing stories.
-	6. Create a default template, where the component is being used in the most “vanilla” way possible.
-	7. Use the template for the `Default` story, which will serve as an interactive doc playground.
-	8. Add more focused stories as you see fit. These non-default stories should illustrate specific scenarios and usages of the component. A developer looking at the Docs tab should be able to understand what each story is demonstrating. Add JSDoc comments to stories when necessary.
-11. Convert unit tests.
-	1. Rename test file extensions from `.js` to `.tsx`.
-	2. Fix all TypeScript errors.
-
-## Using Radix UI primitives
-
-Useful links:
-
-- [online docs](https://www.radix-ui.com/docs/primitives/overview/introduction)
-- [repo](https://github.com/radix-ui/primitives) — useful for:
-    - inspecting source code
-    - running storybook examples (`yarn install && yarn dev`)
+## Component versioning
+
+As the needs of the package evolve with time, sometimes we may opt to fully rewrite an existing component — either to introduce substantial changes, support new features, or swap the implementation details.
+
+### Glossary
+
+Here is some terminology that will be used in the upcoming sections:
+
+-   "Legacy" component: the version(s) of the component that existsted on `trunk` before the rewrite;
+-   API surface: the component's public APIs. It includes the list of components (and subcomponents) exported from the package, their props, any associated React context. It does not include internal classnames and internal DOM structure of the components.
+
+### Approaches
+
+We identified two approaches to the task.
+
+#### Swap the implementation, keep the same API surface
+
+One possible approach is to keep the existing API surface and only swap the internal implementation of the component.
+
+This is by far the simplest approach, since it doesn't involve making changes to the API surface.
+
+If the existing API surface is not a good fit for the new implementation, or if it is not possible (or simply not desirable) to preserve backward compatibility with the existing implementation, there is another approach that can be used.
+
+#### Create a new component (or component family)
+
+This second approach involves creating a new, separate version (ie. export) of the component. Having two separate exports will help to keep the package tree-shakeable, and it will make it easier to potentially deprecated and remove the legacy component.
+
+If possible, the legacy version of the component should be rewritten so that it uses the same underlying implementation of the new version, with an extra API "translation" layer to adapt the legacy API surface to the new API surface, e.g:
+
+```
+// legacy-component/index.tsx
+
+function LegacyComponent( props ) {
+	const newProps = useTranslateLegacyPropsToNewProps( props );
+
+	return ( <NewComponentImplementation { ...newProps } /> );
+}
+
+// new-component/index.tsx
+function NewComponent( props ) {
+	return ( <NewComponentImplementation { ...props } /> );
+}
+
+// new-component/implementation.tsx
+function NewComponentImplementation( props ) {
+	// implementation
+}
+
+```
+
+In case that is not possible (eg. too difficult to reconciliate new and legacy implementations, or impossible to preserve backward compatibility), then the legacy implementation can stay as-is.
+
+In any case, extra attention should be payed to legacy component families made of two or more subcomponents. It is possible, in fact, that the a legacy subcomponent is used as a parent / child of a subcomponent from the new version (this can happen, for example, when Gutenberg allows third party developers to inject React components via Slot/Fill). To avoid incompatibility issues and unexpected behavior, there should be some code in the components warning when the above scenario happens — or even better, aliasing to the correct version of the component.
+
+##### Naming
+
+When it comes to naming the newly added component, there are two options.
+
+If there is a good reason for it, pick a new name for the component. For example, some legacy components have names that don't correspond to the corrent name of UI widget that they implement (for example, `TabPanel` should be called `Tabs`, and `Modal` should be called `Dialog`).
+
+Alternatively, version the component name. For example, the new version of `Component` could be called `ComponentV2`. This also applies for namespaced subcomponents (ie. `ComponentV2.SubComponent`).
+
+### Methodology
+
+Regardless of the chosen approach, we recommend adopting the following methodology:
+
+1. First, make sure that the legacy component is well covered by automated tests. Using those tests against the new implementation will serve as a great first layer to make sure that we don't break backward compatibility where necessary, and that we are otherwise aware of any differences in behavior;
+2. Create a new temporary folder, so that all the work can be done without affecting publicly exported APIs; make it explicit in the README, JSDocs and Storybook (by using badges) that the components are WIP and shouldn't be used outside of the components package;
+3. Once the first iteration of the new component(s) is complete, start testing it by exporting it via private APIs, and replacing usages of the legacy component across the Gutenberg repository. This process is great to gather more feedback, spot bugs and missing features;
+4. Once all usages are migrated, you can replace the legacy component with the new implementation, and delete the temporary folder and private exports. Don't forget to write a dev note when necessary.
diff --git a/packages/components/README.md b/packages/components/README.md
index f3e4399fe3d518..df92e8db57be42 100644
--- a/packages/components/README.md
+++ b/packages/components/README.md
@@ -57,6 +57,19 @@ const Example = () => {
 };
 ```
 
+### TypeScript
+
+This package exposes its own types for the components it exports, however it doesn't export its own types for component props. If you need to extract the props type, please use `React.ComponentProps` to get the types from the element.
+
+```tsx
+import type { ComponentProps } from 'react';
+import { Button } from '@wordpress/components';
+
+export default function MyButton( props: ComponentProps< typeof Button > ) {
+	return <Button { ...props }>Click Me!</Button>;
+}
+```
+
 ## Docs & examples
 
 You can browse the components docs and examples at [https://wordpress.github.io/gutenberg/](https://wordpress.github.io/gutenberg/)
diff --git a/packages/components/package.json b/packages/components/package.json
index 25ddcf603fb32a..a44e0afe89152b 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/components",
-	"version": "25.13.0",
+	"version": "28.10.0",
 	"description": "UI components for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -30,45 +31,42 @@
 	],
 	"types": "build-types",
 	"dependencies": {
-		"@ariakit/react": "^0.3.5",
-		"@babel/runtime": "^7.16.0",
+		"@ariakit/react": "^0.4.10",
+		"@babel/runtime": "7.25.7",
 		"@emotion/cache": "^11.7.1",
 		"@emotion/css": "^11.7.1",
 		"@emotion/react": "^11.7.1",
 		"@emotion/serialize": "^1.0.2",
 		"@emotion/styled": "^11.6.0",
 		"@emotion/utils": "^1.0.0",
-		"@floating-ui/react-dom": "^2.0.1",
-		"@radix-ui/react-dropdown-menu": "2.0.4",
+		"@floating-ui/react-dom": "^2.0.8",
 		"@types/gradient-parser": "0.1.3",
 		"@types/highlight-words-core": "1.2.1",
-		"@use-gesture/react": "^10.2.24",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/date": "file:../date",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/element": "file:../element",
-		"@wordpress/escape-html": "file:../escape-html",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/primitives": "file:../primitives",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/rich-text": "file:../rich-text",
-		"@wordpress/warning": "file:../warning",
+		"@use-gesture/react": "^10.3.1",
+		"@wordpress/a11y": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/date": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/element": "*",
+		"@wordpress/escape-html": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/is-shallow-equal": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/primitives": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/rich-text": "*",
+		"@wordpress/warning": "*",
 		"change-case": "^4.1.2",
-		"classnames": "^2.3.1",
+		"clsx": "^2.1.1",
 		"colord": "^2.7.0",
-		"date-fns": "^2.28.0",
+		"date-fns": "^3.6.0",
 		"deepmerge": "^4.3.0",
-		"dom-scroll-into-view": "^1.2.1",
-		"downshift": "^6.0.15",
 		"fast-deep-equal": "^3.1.3",
-		"framer-motion": "^10.13.0",
+		"framer-motion": "^11.1.9",
 		"gradient-parser": "^0.1.5",
 		"highlight-words-core": "^1.2.2",
 		"is-plain-object": "^5.0.0",
@@ -76,11 +74,8 @@
 		"path-to-regexp": "^6.2.1",
 		"re-resizable": "^6.4.0",
 		"react-colorful": "^5.3.1",
-		"reakit": "^1.3.11",
 		"remove-accents": "^0.5.0",
-		"use-lilius": "^2.0.1",
-		"uuid": "^9.0.1",
-		"valtio": "1.7.0"
+		"uuid": "^9.0.1"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -88,5 +83,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/components/schemas/docs-manifest.json b/packages/components/schemas/docs-manifest.json
new file mode 100644
index 00000000000000..7d1e40f4f696d7
--- /dev/null
+++ b/packages/components/schemas/docs-manifest.json
@@ -0,0 +1,38 @@
+{
+	"title": "JSON schema for @wordpress/components README manifests",
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"type": "object",
+	"properties": {
+		"displayName": {
+			"type": "string",
+			"description": "The `displayName` of the component, as determined in code. Used to identify the component in the specified source file."
+		},
+		"filePath": {
+			"type": "string",
+			"description": "The file path where the component is located."
+		},
+		"subcomponents": {
+			"type": "array",
+			"description": "List of subcomponents related to the component.",
+			"items": {
+				"type": "object",
+				"properties": {
+					"displayName": {
+						"type": "string",
+						"description": "The `displayName` of the subcomponent, as determined in code. Used to identify the component in the specified source file."
+					},
+					"preferredDisplayName": {
+						"type": "string",
+						"description": "The display name to use in the README, if it is different from the `displayName` as determined in code."
+					},
+					"filePath": {
+						"type": "string",
+						"description": "The file path where the subcomponent is located."
+					}
+				},
+				"required": [ "displayName", "filePath" ]
+			}
+		}
+	},
+	"required": [ "displayName", "filePath" ]
+}
diff --git a/packages/components/src/alignment-matrix-control/README.md b/packages/components/src/alignment-matrix-control/README.md
index d087a177d8d414..af97e3ae0607cd 100644
--- a/packages/components/src/alignment-matrix-control/README.md
+++ b/packages/components/src/alignment-matrix-control/README.md
@@ -1,16 +1,14 @@
 # AlignmentMatrixControl
 
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
+<!-- This file is generated automatically and cannot be edited directly. Make edits via TypeScript types and TSDocs. -->
 
-AlignmentMatrixControl components enable adjustments to horizontal and vertical alignments for UI.
+<p class="callout callout-info">See the <a href="https://wordpress.github.io/gutenberg/?path=/docs/components-alignmentmatrixcontrol--docs">WordPress Storybook</a> for more detailed, interactive documentation.</p>
 
-## Usage
+AlignmentMatrixControl components enable adjustments to horizontal and vertical alignments for UI.
 
 ```jsx
-import { useState } from 'react';
-import { __experimentalAlignmentMatrixControl as AlignmentMatrixControl } from '@wordpress/components';
+import { AlignmentMatrixControl } from '@wordpress/components';
+import { useState } from '@wordpress/element';
 
 const Example = () => {
 	const [ alignment, setAlignment ] = useState( 'center center' );
@@ -18,63 +16,70 @@ const Example = () => {
 	return (
 		<AlignmentMatrixControl
 			value={ alignment }
-			onChange={ ( newAlignment ) => setAlignment( newAlignment ) }
+			onChange={ setAlignment }
 		/>
 	);
 };
 ```
-
 ## Props
 
-The component accepts the following props:
+### `defaultValue`
 
-### className
+If provided, sets the default alignment value.
 
-The class that will be added to the classes of the underlying `grid` widget.
--   Type: `string`
--   Required: No
+ - Type: `"center" | "top left" | "top center" | "top right" | "center left" | "center center" | "center right" | "bottom left" | "bottom center" | "bottom right"`
+ - Required: No
+ - Default: `'center center'`
 
-### id
+### `label`
 
-Unique ID for the component.
+Accessible label. If provided, sets the `aria-label` attribute of the
+underlying `grid` widget.
 
--  Type: `string`
--  Required: No
+ - Type: `string`
+ - Required: No
+ - Default: `'Alignment Matrix Control'`
 
-### label
+### `onChange`
 
-Accessible label. If provided, sets the `aria-label` attribute of the underlying `grid` widget.
+A function that receives the updated alignment value.
 
--   Type: `string`
--   Required: No
--   Default: `Alignment Matrix Control`
+ - Type: `(newValue: AlignmentMatrixControlValue) => void`
+ - Required: No
 
-### defaultValue
+### `value`
 
-If provided, sets the default alignment value.
+The current alignment value.
 
-- Type: `AlignmentMatrixControlValue`
-- Required: No
-- Default: `center center`
+ - Type: `"center" | "top left" | "top center" | "top right" | "center left" | "center center" | "center right" | "bottom left" | "bottom center" | "bottom right"`
+ - Required: No
 
-### value
+### `width`
 
-The current alignment value.
+If provided, sets the width of the control.
 
-- Type: `AlignmentMatrixControlValue`
-- Required: No
+ - Type: `number`
+ - Required: No
+ - Default: `92`
 
-### onChange
+## Subcomponents
 
-A function that receives the updated alignment value.
+### AlignmentMatrixControl.Icon
 
--   Type: `( newValue: AlignmentMatrixControlValue ) => void`
--   Required: No
+#### Props
 
-### width
+##### `disablePointerEvents`
 
-If provided, sets the width of the control.
+If `true`, disables pointer events on the icon.
 
- - Type: `number`
+ - Type: `boolean`
  - Required: No
- - Default: `92`
+ - Default: `true`
+
+##### `value`
+
+The current alignment value.
+
+ - Type: `"center" | "top left" | "top center" | "top right" | "center left" | "center center" | "center right" | "bottom left" | "bottom center" | "bottom right"`
+ - Required: No
+ - Default: `center`
diff --git a/packages/components/src/alignment-matrix-control/cell.tsx b/packages/components/src/alignment-matrix-control/cell.tsx
index 162ca879f1a7e5..8a3d1735b5ecfa 100644
--- a/packages/components/src/alignment-matrix-control/cell.tsx
+++ b/packages/components/src/alignment-matrix-control/cell.tsx
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { CompositeItem } from '../composite/v2';
+import { Composite } from '../composite';
 import Tooltip from '../tooltip';
 import { VisuallyHidden } from '../visually-hidden';
 
@@ -9,24 +9,18 @@ import { VisuallyHidden } from '../visually-hidden';
  * Internal dependencies
  */
 import { ALIGNMENT_LABEL } from './utils';
-import {
-	Cell as CellView,
-	Point,
-} from './styles/alignment-matrix-control-styles';
+import { Cell as CellView, Point } from './styles';
 import type { AlignmentMatrixControlCellProps } from './types';
 import type { WordPressComponentProps } from '../context';
 
 export default function Cell( {
 	id,
-	isActive = false,
 	value,
 	...props
 }: WordPressComponentProps< AlignmentMatrixControlCellProps, 'span', false > ) {
-	const tooltipText = ALIGNMENT_LABEL[ value ];
-
 	return (
-		<Tooltip text={ tooltipText }>
-			<CompositeItem
+		<Tooltip text={ ALIGNMENT_LABEL[ value ] }>
+			<Composite.Item
 				id={ id }
 				render={ <CellView { ...props } role="gridcell" /> }
 			>
@@ -34,8 +28,8 @@ export default function Cell( {
 			otherwise it'll announce the content as "blank". So we use a visually
 			hidden element instead of aria-label. */ }
 				<VisuallyHidden>{ value }</VisuallyHidden>
-				<Point isActive={ isActive } role="presentation" />
-			</CompositeItem>
+				<Point role="presentation" />
+			</Composite.Item>
 		</Tooltip>
 	);
 }
diff --git a/packages/components/src/alignment-matrix-control/docs-manifest.json b/packages/components/src/alignment-matrix-control/docs-manifest.json
new file mode 100644
index 00000000000000..82ee28f4840c49
--- /dev/null
+++ b/packages/components/src/alignment-matrix-control/docs-manifest.json
@@ -0,0 +1,12 @@
+{
+	"$schema": "../../schemas/docs-manifest.json",
+	"displayName": "AlignmentMatrixControl",
+	"filePath": "./index.tsx",
+	"subcomponents": [
+		{
+			"displayName": "AlignmentMatrixControlIcon",
+			"preferredDisplayName": "AlignmentMatrixControl.Icon",
+			"filePath": "./icon.tsx"
+		}
+	]
+}
diff --git a/packages/components/src/alignment-matrix-control/icon.tsx b/packages/components/src/alignment-matrix-control/icon.tsx
index 33528e63fc87f0..24cf54c0214937 100644
--- a/packages/components/src/alignment-matrix-control/icon.tsx
+++ b/packages/components/src/alignment-matrix-control/icon.tsx
@@ -1,61 +1,79 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { Rect, SVG } from '@wordpress/primitives';
 
 /**
  * Internal dependencies
  */
 import { ALIGNMENTS, getAlignmentIndex } from './utils';
-import {
-	Root,
-	Cell,
-	Point,
-} from './styles/alignment-matrix-control-icon-styles';
 import type { AlignmentMatrixControlIconProps } from './types';
 import type { WordPressComponentProps } from '../context';
 
 const BASE_SIZE = 24;
+const GRID_CELL_SIZE = 7;
+const GRID_PADDING = ( BASE_SIZE - 3 * GRID_CELL_SIZE ) / 2;
+const DOT_SIZE = 2;
+const DOT_SIZE_SELECTED = 4;
 
 function AlignmentMatrixControlIcon( {
 	className,
 	disablePointerEvents = true,
-	size = BASE_SIZE,
+	size,
+	width,
+	height,
 	style = {},
 	value = 'center',
 	...props
-}: WordPressComponentProps< AlignmentMatrixControlIconProps, 'div', false > ) {
-	const alignIndex = getAlignmentIndex( value );
-	const scale = ( size / BASE_SIZE ).toFixed( 2 );
-
-	const classes = classnames(
-		'component-alignment-matrix-control-icon',
-		className
-	);
-
-	const styles = {
-		...style,
-		transform: `scale(${ scale })`,
-	};
-
+}: WordPressComponentProps< AlignmentMatrixControlIconProps, 'svg', false > ) {
 	return (
-		<Root
-			{ ...props }
-			className={ classes }
-			disablePointerEvents={ disablePointerEvents }
+		<SVG
+			xmlns="http://www.w3.org/2000/svg"
+			viewBox={ `0 0 ${ BASE_SIZE } ${ BASE_SIZE }` }
+			width={ size ?? width ?? BASE_SIZE }
+			height={ size ?? height ?? BASE_SIZE }
 			role="presentation"
-			style={ styles }
+			className={ clsx(
+				'component-alignment-matrix-control-icon',
+				className
+			) }
+			style={ {
+				pointerEvents: disablePointerEvents ? 'none' : undefined,
+				...style,
+			} }
+			{ ...props }
 		>
 			{ ALIGNMENTS.map( ( align, index ) => {
-				const isActive = alignIndex === index;
+				const dotSize =
+					getAlignmentIndex( value ) === index
+						? DOT_SIZE_SELECTED
+						: DOT_SIZE;
 
 				return (
-					<Cell key={ align }>
-						<Point isActive={ isActive } />
-					</Cell>
+					<Rect
+						key={ align }
+						x={
+							GRID_PADDING +
+							( index % 3 ) * GRID_CELL_SIZE +
+							( GRID_CELL_SIZE - dotSize ) / 2
+						}
+						y={
+							GRID_PADDING +
+							Math.floor( index / 3 ) * GRID_CELL_SIZE +
+							( GRID_CELL_SIZE - dotSize ) / 2
+						}
+						width={ dotSize }
+						height={ dotSize }
+						fill="currentColor"
+					/>
 				);
 			} ) }
-		</Root>
+		</SVG>
 	);
 }
 
diff --git a/packages/components/src/alignment-matrix-control/index.tsx b/packages/components/src/alignment-matrix-control/index.tsx
index 3de0e401187d53..0e3c23623883fc 100644
--- a/packages/components/src/alignment-matrix-control/index.tsx
+++ b/packages/components/src/alignment-matrix-control/index.tsx
@@ -1,46 +1,27 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { __, isRTL } from '@wordpress/i18n';
 import { useInstanceId } from '@wordpress/compose';
+import { useCallback } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import Cell from './cell';
-import { Composite, CompositeRow, useCompositeStore } from '../composite/v2';
-import { Root, Row } from './styles/alignment-matrix-control-styles';
+import { Composite } from '../composite';
+import { GridContainer, GridRow } from './styles';
 import AlignmentMatrixControlIcon from './icon';
 import { GRID, getItemId, getItemValue } from './utils';
 import type { WordPressComponentProps } from '../context';
 import type { AlignmentMatrixControlProps } from './types';
 
-/**
- *
- * AlignmentMatrixControl components enable adjustments to horizontal and vertical alignments for UI.
- *
- * ```jsx
- * import { __experimentalAlignmentMatrixControl as AlignmentMatrixControl } from '@wordpress/components';
- * import { useState } from '@wordpress/element';
- *
- * const Example = () => {
- * 	const [ alignment, setAlignment ] = useState( 'center center' );
- *
- * 	return (
- * 		<AlignmentMatrixControl
- * 			value={ alignment }
- * 			onChange={ setAlignment }
- * 		/>
- * 	);
- * };
- * ```
- */
-export function AlignmentMatrixControl( {
+function UnforwardedAlignmentMatrixControl( {
 	className,
 	id,
 	label = __( 'Alignment Matrix Control' ),
@@ -51,33 +32,33 @@ export function AlignmentMatrixControl( {
 	...props
 }: WordPressComponentProps< AlignmentMatrixControlProps, 'div', false > ) {
 	const baseId = useInstanceId(
-		AlignmentMatrixControl,
+		UnforwardedAlignmentMatrixControl,
 		'alignment-matrix-control',
 		id
 	);
 
-	const compositeStore = useCompositeStore( {
-		defaultActiveId: getItemId( baseId, defaultValue ),
-		activeId: getItemId( baseId, value ),
-		setActiveId: ( nextActiveId ) => {
+	const setActiveId = useCallback<
+		NonNullable< React.ComponentProps< typeof Composite >[ 'setActiveId' ] >
+	>(
+		( nextActiveId ) => {
 			const nextValue = getItemValue( baseId, nextActiveId );
-			if ( nextValue ) onChange?.( nextValue );
+			if ( nextValue ) {
+				onChange?.( nextValue );
+			}
 		},
-		rtl: isRTL(),
-	} );
-
-	const activeId = compositeStore.useState( 'activeId' );
-
-	const classes = classnames(
-		'component-alignment-matrix-control',
-		className
+		[ baseId, onChange ]
 	);
 
+	const classes = clsx( 'component-alignment-matrix-control', className );
+
 	return (
 		<Composite
-			store={ compositeStore }
+			defaultActiveId={ getItemId( baseId, defaultValue ) }
+			activeId={ getItemId( baseId, value ) }
+			setActiveId={ setActiveId }
+			rtl={ isRTL() }
 			render={
-				<Root
+				<GridContainer
 					{ ...props }
 					aria-label={ label }
 					className={ classes }
@@ -88,26 +69,55 @@ export function AlignmentMatrixControl( {
 			}
 		>
 			{ GRID.map( ( cells, index ) => (
-				<CompositeRow render={ <Row role="row" /> } key={ index }>
-					{ cells.map( ( cell ) => {
-						const cellId = getItemId( baseId, cell );
-						const isActive = cellId === activeId;
-
-						return (
-							<Cell
-								id={ cellId }
-								isActive={ isActive }
-								key={ cell }
-								value={ cell }
-							/>
-						);
-					} ) }
-				</CompositeRow>
+				<Composite.Row render={ <GridRow role="row" /> } key={ index }>
+					{ cells.map( ( cell ) => (
+						<Cell
+							id={ getItemId( baseId, cell ) }
+							key={ cell }
+							value={ cell }
+						/>
+					) ) }
+				</Composite.Row>
 			) ) }
 		</Composite>
 	);
 }
 
-AlignmentMatrixControl.Icon = AlignmentMatrixControlIcon;
+/**
+ * AlignmentMatrixControl components enable adjustments to horizontal and vertical alignments for UI.
+ *
+ * ```jsx
+ * import { AlignmentMatrixControl } from '@wordpress/components';
+ * import { useState } from '@wordpress/element';
+ *
+ * const Example = () => {
+ * 	const [ alignment, setAlignment ] = useState( 'center center' );
+ *
+ * 	return (
+ * 		<AlignmentMatrixControl
+ * 			value={ alignment }
+ * 			onChange={ setAlignment }
+ * 		/>
+ * 	);
+ * };
+ * ```
+ */
+export const AlignmentMatrixControl = Object.assign(
+	UnforwardedAlignmentMatrixControl,
+	{
+		/**
+		 * Render an alignment matrix as an icon.
+		 *
+		 * ```jsx
+		 * import { AlignmentMatrixControl } from '@wordpress/components';
+		 *
+		 * <Icon icon={<AlignmentMatrixControl.Icon value="top left" />} />
+		 * ```
+		 */
+		Icon: Object.assign( AlignmentMatrixControlIcon, {
+			displayName: 'AlignmentMatrixControl.Icon',
+		} ),
+	}
+);
 
 export default AlignmentMatrixControl;
diff --git a/packages/components/src/alignment-matrix-control/stories/index.story.tsx b/packages/components/src/alignment-matrix-control/stories/index.story.tsx
index 03bec9d92a8b78..433d7540197da2 100644
--- a/packages/components/src/alignment-matrix-control/stories/index.story.tsx
+++ b/packages/components/src/alignment-matrix-control/stories/index.story.tsx
@@ -17,7 +17,7 @@ import { HStack } from '../../h-stack';
 import type { AlignmentMatrixControlProps } from '../types';
 
 const meta: Meta< typeof AlignmentMatrixControl > = {
-	title: 'Components (Experimental)/AlignmentMatrixControl',
+	title: 'Components/AlignmentMatrixControl',
 	component: AlignmentMatrixControl,
 	subcomponents: {
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
@@ -59,18 +59,9 @@ export const Default = Template.bind( {} );
 export const IconSubcomponent = () => {
 	return (
 		<HStack justify="flex-start">
+			<Icon icon={ <AlignmentMatrixControl.Icon value="top left" /> } />
 			<Icon
-				icon={
-					<AlignmentMatrixControl.Icon size={ 24 } value="top left" />
-				}
-			/>
-			<Icon
-				icon={
-					<AlignmentMatrixControl.Icon
-						size={ 24 }
-						value="center center"
-					/>
-				}
+				icon={ <AlignmentMatrixControl.Icon value="center center" /> }
 			/>
 		</HStack>
 	);
diff --git a/packages/components/src/alignment-matrix-control/styles.ts b/packages/components/src/alignment-matrix-control/styles.ts
new file mode 100644
index 00000000000000..73a20c2a37564b
--- /dev/null
+++ b/packages/components/src/alignment-matrix-control/styles.ts
@@ -0,0 +1,113 @@
+/**
+ * External dependencies
+ */
+import styled from '@emotion/styled';
+import { css } from '@emotion/react';
+
+/**
+ * Internal dependencies
+ */
+import { COLORS, CONFIG } from '../utils';
+import type {
+	AlignmentMatrixControlProps,
+	AlignmentMatrixControlIconProps,
+} from './types';
+
+// Grid structure
+
+const rootBase = ( { size = 92 } ) => css`
+	direction: ltr;
+
+	display: grid;
+	grid-template-columns: repeat( 3, 1fr );
+	grid-template-rows: repeat( 3, 1fr );
+
+	box-sizing: border-box;
+	width: ${ size }px;
+	aspect-ratio: 1;
+
+	border-radius: ${ CONFIG.radiusMedium };
+	outline: none;
+`;
+
+export const GridContainer = styled.div< {
+	size?: AlignmentMatrixControlProps[ 'width' ];
+	disablePointerEvents?: AlignmentMatrixControlIconProps[ 'disablePointerEvents' ];
+} >`
+	${ rootBase }
+
+	border: 1px solid transparent;
+
+	${ ( props ) =>
+		props.disablePointerEvents
+			? css``
+			: css`
+					cursor: pointer;
+			  ` }
+`;
+
+export const GridRow = styled.div`
+	grid-column: 1 / -1;
+
+	box-sizing: border-box;
+	display: grid;
+	grid-template-columns: repeat( 3, 1fr );
+`;
+
+// Cell
+export const Cell = styled.span`
+	position: relative;
+
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	box-sizing: border-box;
+	margin: 0;
+	padding: 0;
+
+	appearance: none;
+	border: none;
+	outline: none;
+`;
+
+const POINT_SIZE = 6;
+export const Point = styled.span`
+	display: block;
+	contain: strict;
+
+	box-sizing: border-box;
+	width: ${ POINT_SIZE }px;
+	aspect-ratio: 1;
+
+	margin: auto;
+
+	color: ${ COLORS.theme.gray[ 400 ] };
+
+	/* Use border instead of background color so that the point shows
+	in Windows High Contrast Mode */
+	border: ${ POINT_SIZE / 2 }px solid currentColor;
+
+	/* Highlight active item */
+	${ Cell }[data-active-item] & {
+		color: ${ COLORS.gray[ 900 ] };
+		transform: scale( calc( 5 / 3 ) );
+	}
+
+	/* Hover styles for non-active items */
+	${ Cell }:not([data-active-item]):hover & {
+		color: ${ COLORS.theme.accent };
+	}
+
+	/* Show an outline only when interacting with keyboard */
+	${ Cell }[data-focus-visible] & {
+		outline: 1px solid ${ COLORS.theme.accent };
+		outline-offset: 1px;
+	}
+
+	@media not ( prefers-reduced-motion ) {
+		transition-property: color, transform;
+		transition-duration: 120ms;
+		transition-timing-function: linear;
+	}
+`;
diff --git a/packages/components/src/alignment-matrix-control/styles/alignment-matrix-control-icon-styles.ts b/packages/components/src/alignment-matrix-control/styles/alignment-matrix-control-icon-styles.ts
deleted file mode 100644
index a14894633e05d1..00000000000000
--- a/packages/components/src/alignment-matrix-control/styles/alignment-matrix-control-icon-styles.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * External dependencies
- */
-import styled from '@emotion/styled';
-import { css } from '@emotion/react';
-
-/**
- * Internal dependencies
- */
-import {
-	rootBase,
-	pointBase,
-	Cell as CellBase,
-} from './alignment-matrix-control-styles';
-import type {
-	AlignmentMatrixControlIconProps,
-	AlignmentMatrixControlCellProps,
-} from '../types';
-
-const rootSize = () => {
-	const padding = 1.5;
-	const size = 24;
-
-	return css( {
-		gridTemplateRows: `repeat( 3, calc( ${ size - padding * 2 }px / 3))`,
-		padding,
-		maxHeight: size,
-		maxWidth: size,
-	} );
-};
-
-const rootPointerEvents = ( {
-	disablePointerEvents,
-}: Pick< AlignmentMatrixControlIconProps, 'disablePointerEvents' > ) => {
-	return css( {
-		pointerEvents: disablePointerEvents ? 'none' : undefined,
-	} );
-};
-
-export const Wrapper = styled.div`
-	box-sizing: border-box;
-	padding: 2px;
-`;
-
-export const Root = styled.div`
-	transform-origin: top left;
-	height: 100%;
-	width: 100%;
-
-	${ rootBase };
-	${ rootSize };
-	${ rootPointerEvents };
-`;
-
-const pointActive = ( {
-	isActive,
-}: Pick< AlignmentMatrixControlCellProps, 'isActive' > ) => {
-	const boxShadow = isActive ? `0 0 0 1px currentColor` : null;
-
-	return css`
-		box-shadow: ${ boxShadow };
-		color: currentColor;
-
-		*:hover > & {
-			color: currentColor;
-		}
-	`;
-};
-
-export const Point = styled.span`
-	height: 2px;
-	width: 2px;
-	${ pointBase };
-	${ pointActive };
-`;
-
-export const Cell = CellBase;
diff --git a/packages/components/src/alignment-matrix-control/styles/alignment-matrix-control-styles.ts b/packages/components/src/alignment-matrix-control/styles/alignment-matrix-control-styles.ts
deleted file mode 100644
index 0df630181b388d..00000000000000
--- a/packages/components/src/alignment-matrix-control/styles/alignment-matrix-control-styles.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * External dependencies
- */
-import styled from '@emotion/styled';
-import { css } from '@emotion/react';
-
-/**
- * Internal dependencies
- */
-import { COLORS, reduceMotion } from '../../utils';
-import type {
-	AlignmentMatrixControlProps,
-	AlignmentMatrixControlCellProps,
-} from '../types';
-
-export const rootBase = () => {
-	return css`
-		border-radius: 2px;
-		box-sizing: border-box;
-		direction: ltr;
-		display: grid;
-		grid-template-columns: repeat( 3, 1fr );
-		outline: none;
-	`;
-};
-
-const rootSize = ( { size = 92 } ) => {
-	return css`
-		grid-template-rows: repeat( 3, calc( ${ size }px / 3 ) );
-		width: ${ size }px;
-	`;
-};
-
-export const Root = styled.div< {
-	size: AlignmentMatrixControlProps[ 'width' ];
-} >`
-	${ rootBase };
-
-	border: 1px solid transparent;
-	cursor: pointer;
-	grid-template-columns: auto;
-
-	${ rootSize };
-`;
-
-export const Row = styled.div`
-	box-sizing: border-box;
-	display: grid;
-	grid-template-columns: repeat( 3, 1fr );
-`;
-
-const pointActive = ( {
-	isActive,
-}: Pick< AlignmentMatrixControlCellProps, 'isActive' > ) => {
-	const boxShadow = isActive ? `0 0 0 2px ${ COLORS.gray[ 900 ] }` : null;
-	const pointColor = isActive ? COLORS.gray[ 900 ] : COLORS.gray[ 400 ];
-	const pointColorHover = isActive ? COLORS.gray[ 900 ] : COLORS.theme.accent;
-
-	return css`
-		box-shadow: ${ boxShadow };
-		color: ${ pointColor };
-
-		*:hover > & {
-			color: ${ pointColorHover };
-		}
-	`;
-};
-
-export const pointBase = (
-	props: Pick< AlignmentMatrixControlCellProps, 'isActive' >
-) => {
-	return css`
-		background: currentColor;
-		box-sizing: border-box;
-		display: grid;
-		margin: auto;
-		transition: all 120ms linear;
-
-		${ reduceMotion( 'transition' ) }
-		${ pointActive( props ) }
-	`;
-};
-
-export const Point = styled.span`
-	height: 6px;
-	width: 6px;
-	${ pointBase }
-`;
-
-export const Cell = styled.span`
-	appearance: none;
-	border: none;
-	box-sizing: border-box;
-	margin: 0;
-	display: flex;
-	position: relative;
-	outline: none;
-	align-items: center;
-	justify-content: center;
-	padding: 0;
-`;
diff --git a/packages/components/src/alignment-matrix-control/test/index.tsx b/packages/components/src/alignment-matrix-control/test/index.tsx
index 6836bc7e45f95c..a820b69b26c8ff 100644
--- a/packages/components/src/alignment-matrix-control/test/index.tsx
+++ b/packages/components/src/alignment-matrix-control/test/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { render, screen, waitFor, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { press, click } from '@ariakit/test';
 
 /**
  * Internal dependencies
@@ -37,11 +37,9 @@ describe( 'AlignmentMatrixControl', () => {
 		} );
 
 		it( 'should be centered by default', async () => {
-			const user = userEvent.setup();
-
 			await renderAndInitCompositeStore( <AlignmentMatrixControl /> );
 
-			await user.tab();
+			await press.Tab();
 
 			expect( getCell( 'center center' ) ).toHaveFocus();
 		} );
@@ -60,7 +58,6 @@ describe( 'AlignmentMatrixControl', () => {
 					'bottom center',
 					'bottom right',
 				] )( '%s', async ( alignment ) => {
-					const user = userEvent.setup();
 					const spy = jest.fn();
 
 					await renderAndInitCompositeStore(
@@ -72,14 +69,13 @@ describe( 'AlignmentMatrixControl', () => {
 
 					const cell = getCell( alignment );
 
-					await user.click( cell );
+					await click( cell );
 
 					expect( cell ).toHaveFocus();
 					expect( spy ).toHaveBeenCalledWith( alignment );
 				} );
 
 				it( 'unless already focused', async () => {
-					const user = userEvent.setup();
 					const spy = jest.fn();
 
 					await renderAndInitCompositeStore(
@@ -91,7 +87,7 @@ describe( 'AlignmentMatrixControl', () => {
 
 					const cell = getCell( 'center center' );
 
-					await user.click( cell );
+					await click( cell );
 
 					expect( cell ).toHaveFocus();
 					expect( spy ).not.toHaveBeenCalled();
@@ -106,16 +102,15 @@ describe( 'AlignmentMatrixControl', () => {
 					[ 'ArrowLeft', 'center left' ],
 					[ 'ArrowDown', 'bottom center' ],
 					[ 'ArrowRight', 'center right' ],
-				] )( '%s', async ( keyRef, cellRef ) => {
-					const user = userEvent.setup();
+				] as const )( '%s', async ( keyRef, cellRef ) => {
 					const spy = jest.fn();
 
 					await renderAndInitCompositeStore(
 						<AlignmentMatrixControl onChange={ spy } />
 					);
 
-					await user.tab();
-					await user.keyboard( `[${ keyRef }]` );
+					await press.Tab();
+					await press[ keyRef ]();
 
 					expect( getCell( cellRef ) ).toHaveFocus();
 					expect( spy ).toHaveBeenCalledWith( cellRef );
@@ -128,8 +123,7 @@ describe( 'AlignmentMatrixControl', () => {
 					[ 'ArrowLeft', 'top left' ],
 					[ 'ArrowDown', 'bottom right' ],
 					[ 'ArrowRight', 'bottom right' ],
-				] )( '%s', async ( keyRef, cellRef ) => {
-					const user = userEvent.setup();
+				] as const )( '%s', async ( keyRef, cellRef ) => {
 					const spy = jest.fn();
 
 					await renderAndInitCompositeStore(
@@ -137,8 +131,8 @@ describe( 'AlignmentMatrixControl', () => {
 					);
 
 					const cell = getCell( cellRef );
-					await user.click( cell );
-					await user.keyboard( `[${ keyRef }]` );
+					await click( cell );
+					await press[ keyRef ]();
 
 					expect( cell ).toHaveFocus();
 					expect( spy ).toHaveBeenCalledWith( cellRef );
diff --git a/packages/components/src/alignment-matrix-control/types.ts b/packages/components/src/alignment-matrix-control/types.ts
index 892781234e694c..e93f412c1f4721 100644
--- a/packages/components/src/alignment-matrix-control/types.ts
+++ b/packages/components/src/alignment-matrix-control/types.ts
@@ -44,11 +44,24 @@ export type AlignmentMatrixControlIconProps = Pick<
 	AlignmentMatrixControlProps,
 	'value'
 > & {
+	/**
+	 * If `true`, disables pointer events on the icon.
+	 * @default true
+	 */
 	disablePointerEvents?: boolean;
+	/**
+	 * _Note: this prop is deprecated. Use the `size` prop on the parent `Icon`
+	 * component instead_
+	 *
+	 * The size of the icon.
+	 *
+	 * @deprecated
+	 * @ignore
+	 * @default 24
+	 */
 	size?: number;
 };
 
 export type AlignmentMatrixControlCellProps = {
-	isActive?: boolean;
 	value: NonNullable< AlignmentMatrixControlProps[ 'value' ] >;
 };
diff --git a/packages/components/src/alignment-matrix-control/utils.tsx b/packages/components/src/alignment-matrix-control/utils.tsx
index 54455b61229b01..e206e197c25558 100644
--- a/packages/components/src/alignment-matrix-control/utils.tsx
+++ b/packages/components/src/alignment-matrix-control/utils.tsx
@@ -65,7 +65,9 @@ export function getItemId(
 	value?: AlignmentMatrixControlValue
 ) {
 	const normalized = normalize( value );
-	if ( ! normalized ) return;
+	if ( ! normalized ) {
+		return;
+	}
 
 	const id = normalized.replace( ' ', '-' );
 	return `${ prefixId }-${ id }`;
@@ -94,7 +96,9 @@ export function getAlignmentIndex(
 	alignment: AlignmentMatrixControlValue = 'center'
 ) {
 	const normalized = normalize( alignment );
-	if ( ! normalized ) return undefined;
+	if ( ! normalized ) {
+		return undefined;
+	}
 
 	const index = ALIGNMENTS.indexOf( normalized );
 	return index > -1 ? index : undefined;
diff --git a/packages/components/src/angle-picker-control/README.md b/packages/components/src/angle-picker-control/README.md
index 3cbc1f6c8d9e1a..d9389c6564338f 100644
--- a/packages/components/src/angle-picker-control/README.md
+++ b/packages/components/src/angle-picker-control/README.md
@@ -1,52 +1,56 @@
 # AnglePickerControl
 
-`AnglePickerControl` is a React component to render a UI that allows users to pick an angle.
-Users can choose an angle in a visual UI with the mouse by dragging an angle indicator inside a circle or by directly inserting the desired angle in a text field.
+<!-- This file is generated automatically and cannot be edited directly. Make edits via TypeScript types and TSDocs. -->
 
-## Usage
+<p class="callout callout-info">See the <a href="https://wordpress.github.io/gutenberg/?path=/docs/components-anglepickercontrol--docs">WordPress Storybook</a> for more detailed, interactive documentation.</p>
+
+`AnglePickerControl` is a React component to render a UI that allows users to
+pick an angle. Users can choose an angle in a visual UI with the mouse by
+dragging an angle indicator inside a circle or by directly inserting the
+desired angle in a text field.
 
 ```jsx
-import { useState } from 'react';
+import { useState } from '@wordpress/element';
 import { AnglePickerControl } from '@wordpress/components';
 
 function Example() {
-	const [ angle, setAngle ] = useState( 0 );
-	return (
-		<AnglePickerControl
-			value={ angle }
-			onChange={ setAngle }
-			__nextHasNoMarginBottom
-		/>
-	);
-};
+  const [ angle, setAngle ] = useState( 0 );
+  return (
+    <AnglePickerControl
+      value={ angle }
+      onChange={ setAngle }
+    </>
+  );
+}
 ```
-
 ## Props
 
-The component accepts the following props.
+### `as`
 
-### `label`: `string`
+The HTML element or React component to render the component as.
 
-Label to use for the angle picker.
+ - Type: `"symbol" | "object" | "a" | "abbr" | "address" | "area" | "article" | "aside" | "audio" | "b" | ...`
+ - Required: No
 
--   Required: No
--   Default: `__( 'Angle' )`
+### `label`
 
-### `value`: `number | string`
-
-The current value of the input. The value represents an angle in degrees and should be a value between 0 and 360.
+Label to use for the angle picker.
 
--   Required: Yes
+ - Type: `string`
+ - Required: No
+ - Default: `__( 'Angle' )`
 
-### `onChange`: `( value: number ) => void`
+### `onChange`
 
 A function that receives the new value of the input.
 
--   Required: Yes
+ - Type: `(value: number) => void`
+ - Required: Yes
 
-### `__nextHasNoMarginBottom`: `boolean`
+### `value`
 
-Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 6.4. (The prop can be safely removed once this happens.)
+The current value of the input. The value represents an angle in degrees
+and should be a value between 0 and 360.
 
--   Required: No
--   Default: `false`
+ - Type: `string | number`
+ - Required: Yes
diff --git a/packages/components/src/angle-picker-control/angle-circle.tsx b/packages/components/src/angle-picker-control/angle-circle.tsx
index 8558b23279302d..52a2d2838a1f26 100644
--- a/packages/components/src/angle-picker-control/angle-circle.tsx
+++ b/packages/components/src/angle-picker-control/angle-circle.tsx
@@ -28,8 +28,10 @@ function AngleCircle( {
 	...props
 }: WordPressComponentProps< AngleCircleProps, 'div' > ) {
 	const angleCircleRef = useRef< HTMLDivElement | null >( null );
-	const angleCircleCenter = useRef< { x: number; y: number } | undefined >();
-	const previousCursorValue = useRef< CSSStyleDeclaration[ 'cursor' ] >();
+	const angleCircleCenterRef = useRef<
+		{ x: number; y: number } | undefined
+	>();
+	const previousCursorValueRef = useRef< CSSStyleDeclaration[ 'cursor' ] >();
 
 	const setAngleCircleCenter = () => {
 		if ( angleCircleRef.current === null ) {
@@ -37,7 +39,7 @@ function AngleCircle( {
 		}
 
 		const rect = angleCircleRef.current.getBoundingClientRect();
-		angleCircleCenter.current = {
+		angleCircleCenterRef.current = {
 			x: rect.x + rect.width / 2,
 			y: rect.y + rect.height / 2,
 		};
@@ -55,10 +57,10 @@ function AngleCircle( {
 		( event.target as HTMLDivElement | null )?.focus();
 
 		if (
-			angleCircleCenter.current !== undefined &&
+			angleCircleCenterRef.current !== undefined &&
 			onChange !== undefined
 		) {
-			const { x: centerX, y: centerY } = angleCircleCenter.current;
+			const { x: centerX, y: centerY } = angleCircleCenterRef.current;
 			onChange(
 				getAngle( centerX, centerY, event.clientX, event.clientY )
 			);
@@ -76,13 +78,13 @@ function AngleCircle( {
 
 	useEffect( () => {
 		if ( isDragging ) {
-			if ( previousCursorValue.current === undefined ) {
-				previousCursorValue.current = document.body.style.cursor;
+			if ( previousCursorValueRef.current === undefined ) {
+				previousCursorValueRef.current = document.body.style.cursor;
 			}
 			document.body.style.cursor = 'grabbing';
 		} else {
-			document.body.style.cursor = previousCursorValue.current || '';
-			previousCursorValue.current = undefined;
+			document.body.style.cursor = previousCursorValueRef.current || '';
+			previousCursorValueRef.current = undefined;
 		}
 	}, [ isDragging ] );
 
diff --git a/packages/components/src/angle-picker-control/docs-manifest.json b/packages/components/src/angle-picker-control/docs-manifest.json
new file mode 100644
index 00000000000000..bcbfb353ac9e32
--- /dev/null
+++ b/packages/components/src/angle-picker-control/docs-manifest.json
@@ -0,0 +1,5 @@
+{
+	"$schema": "../../schemas/docs-manifest.json",
+	"displayName": "AnglePickerControl",
+	"filePath": "./index.tsx"
+}
diff --git a/packages/components/src/angle-picker-control/index.tsx b/packages/components/src/angle-picker-control/index.tsx
index 06178e0b401015..b824660fddb134 100644
--- a/packages/components/src/angle-picker-control/index.tsx
+++ b/packages/components/src/angle-picker-control/index.tsx
@@ -2,23 +2,22 @@
  * External dependencies
  */
 import type { ForwardedRef } from 'react';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import deprecated from '@wordpress/deprecated';
 import { forwardRef } from '@wordpress/element';
 import { isRTL, __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
-import { FlexBlock } from '../flex';
+import { Flex, FlexBlock } from '../flex';
 import { Spacer } from '../spacer';
 import NumberControl from '../number-control';
 import AngleCircle from './angle-circle';
-import { Root, UnitText } from './styles/angle-picker-control-styles';
+import { UnitText } from './styles/angle-picker-control-styles';
 
 import type { WordPressComponentProps } from '../context';
 import type { AnglePickerControlProps } from './types';
@@ -28,7 +27,6 @@ function UnforwardedAnglePickerControl(
 	ref: ForwardedRef< any >
 ) {
 	const {
-		__nextHasNoMarginBottom = false,
 		className,
 		label = __( 'Angle' ),
 		onChange,
@@ -36,16 +34,6 @@ function UnforwardedAnglePickerControl(
 		...restProps
 	} = props;
 
-	if ( ! __nextHasNoMarginBottom ) {
-		deprecated(
-			'Bottom margin styles for wp.components.AnglePickerControl',
-			{
-				since: '6.1',
-				hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version.',
-			}
-		);
-	}
-
 	const handleOnNumberChange = ( unprocessedValue: string | undefined ) => {
 		if ( onChange === undefined ) {
 			return;
@@ -58,7 +46,7 @@ function UnforwardedAnglePickerControl(
 		onChange( inputValue );
 	};
 
-	const classes = classnames( 'components-angle-picker-control', className );
+	const classes = clsx( 'components-angle-picker-control', className );
 
 	const unitText = <UnitText>°</UnitText>;
 	const [ prefixedUnitText, suffixedUnitText ] = isRTL()
@@ -66,13 +54,7 @@ function UnforwardedAnglePickerControl(
 		: [ null, unitText ];
 
 	return (
-		<Root
-			{ ...restProps }
-			ref={ ref }
-			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
-			className={ classes }
-			gap={ 2 }
-		>
+		<Flex { ...restProps } ref={ ref } className={ classes } gap={ 2 }>
 			<FlexBlock>
 				<NumberControl
 					label={ label }
@@ -95,7 +77,7 @@ function UnforwardedAnglePickerControl(
 					onChange={ onChange }
 				/>
 			</Spacer>
-		</Root>
+		</Flex>
 	);
 }
 
@@ -115,7 +97,6 @@ function UnforwardedAnglePickerControl(
  *     <AnglePickerControl
  *       value={ angle }
  *       onChange={ setAngle }
- *       __nextHasNoMarginBottom
  *     </>
  *   );
  * }
diff --git a/packages/components/src/angle-picker-control/stories/index.story.tsx b/packages/components/src/angle-picker-control/stories/index.story.tsx
index d10403a436bfc2..ebbf3425d802f1 100644
--- a/packages/components/src/angle-picker-control/stories/index.story.tsx
+++ b/packages/components/src/angle-picker-control/stories/index.story.tsx
@@ -52,6 +52,3 @@ const AnglePickerWithState: StoryFn< typeof AnglePickerControl > = ( {
 };
 
 export const Default = AnglePickerWithState.bind( {} );
-Default.args = {
-	__nextHasNoMarginBottom: true,
-};
diff --git a/packages/components/src/angle-picker-control/styles/angle-picker-control-styles.tsx b/packages/components/src/angle-picker-control/styles/angle-picker-control-styles.tsx
index 08a907b21e0c99..f57d60db0744b1 100644
--- a/packages/components/src/angle-picker-control/styles/angle-picker-control-styles.tsx
+++ b/packages/components/src/angle-picker-control/styles/angle-picker-control-styles.tsx
@@ -1,39 +1,21 @@
 /**
  * External dependencies
  */
-import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 
 /**
  * Internal dependencies
  */
-import { Flex } from '../../flex';
 import { COLORS } from '../../utils';
 import { space } from '../../utils/space';
 import { Text } from '../../text';
 import CONFIG from '../../utils/config-values';
 
-import type { AnglePickerControlProps } from '../types';
-
 const CIRCLE_SIZE = 32;
 const INNER_CIRCLE_SIZE = 6;
 
-const deprecatedBottomMargin = ( {
-	__nextHasNoMarginBottom,
-}: Pick< AnglePickerControlProps, '__nextHasNoMarginBottom' > ) => {
-	return ! __nextHasNoMarginBottom
-		? css`
-				margin-bottom: ${ space( 2 ) };
-		  `
-		: '';
-};
-
-export const Root = styled( Flex )`
-	${ deprecatedBottomMargin }
-`;
-
 export const CircleRoot = styled.div`
-	border-radius: 50%;
+	border-radius: ${ CONFIG.radiusRound };
 	border: ${ CONFIG.borderWidth } solid ${ COLORS.ui.border };
 	box-sizing: border-box;
 	cursor: grab;
@@ -59,7 +41,7 @@ export const CircleIndicatorWrapper = styled.div`
 
 export const CircleIndicator = styled.div`
 	background: ${ COLORS.theme.accent };
-	border-radius: 50%;
+	border-radius: ${ CONFIG.radiusRound };
 	box-sizing: border-box;
 	display: block;
 	left: 50%;
diff --git a/packages/components/src/angle-picker-control/types.ts b/packages/components/src/angle-picker-control/types.ts
index 1ddd26f679db6d..d453be1d6023bd 100644
--- a/packages/components/src/angle-picker-control/types.ts
+++ b/packages/components/src/angle-picker-control/types.ts
@@ -4,6 +4,8 @@ export type AnglePickerControlProps = {
 	 * in a future version.
 	 *
 	 * @default false
+	 * @deprecated Default behavior since WP 6.5. Prop can be safely removed.
+	 * @ignore
 	 */
 	__nextHasNoMarginBottom?: boolean;
 	/**
diff --git a/packages/components/src/animate/index.tsx b/packages/components/src/animate/index.tsx
index f73090bf85dba9..e819020447bc9e 100644
--- a/packages/components/src/animate/index.tsx
+++ b/packages/components/src/animate/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
@@ -23,24 +23,21 @@ function getDefaultOrigin( type?: GetAnimateOptions[ 'type' ] ) {
  */
 export function getAnimateClassName( options: GetAnimateOptions ) {
 	if ( options.type === 'loading' ) {
-		return classnames( 'components-animate__loading' );
+		return 'components-animate__loading';
 	}
 
 	const { type, origin = getDefaultOrigin( type ) } = options;
 
 	if ( type === 'appear' ) {
 		const [ yAxis, xAxis = 'center' ] = origin.split( ' ' );
-		return classnames( 'components-animate__appear', {
+		return clsx( 'components-animate__appear', {
 			[ 'is-from-' + xAxis ]: xAxis !== 'center',
 			[ 'is-from-' + yAxis ]: yAxis !== 'middle',
 		} );
 	}
 
 	if ( type === 'slide-in' ) {
-		return classnames(
-			'components-animate__slide-in',
-			'is-from-' + origin
-		);
+		return clsx( 'components-animate__slide-in', 'is-from-' + origin );
 	}
 
 	return undefined;
diff --git a/packages/components/src/animate/stories/index.story.tsx b/packages/components/src/animate/stories/index.story.tsx
index be076b4e6976c6..c1798b503faa83 100644
--- a/packages/components/src/animate/stories/index.story.tsx
+++ b/packages/components/src/animate/stories/index.story.tsx
@@ -10,7 +10,8 @@ import { Animate } from '..';
 import Notice from '../../notice';
 
 const meta: Meta< typeof Animate > = {
-	title: 'Components/Animate',
+	title: 'Components/Utilities/Animate',
+	id: 'components-animate',
 	component: Animate,
 	parameters: {
 		controls: { expanded: true },
@@ -27,7 +28,12 @@ export const Default = Template.bind( {} );
 Default.args = {
 	children: ( { className } ) => (
 		<Notice className={ className } status="success">
-			<p>{ `No default animation. Use one of type = "appear", "slide-in", or "loading".` }</p>
+			<p>
+				{ /* eslint-disable react/no-unescaped-entities */ }
+				No default animation. Use one of type = "appear", "slide-in", or
+				"loading".
+				{ /* eslint-enable react/no-unescaped-entities */ }
+			</p>
 		</Notice>
 	),
 };
diff --git a/packages/components/src/animation/index.tsx b/packages/components/src/animation/index.tsx
index 39507803d2f401..6620f8d5d4ecae 100644
--- a/packages/components/src/animation/index.tsx
+++ b/packages/components/src/animation/index.tsx
@@ -6,7 +6,6 @@
  * @see https://www.framer.com/docs/animation/
  */
 
-// eslint-disable-next-line no-restricted-imports
 export {
 	motion as __unstableMotion,
 	AnimatePresence as __unstableAnimatePresence,
diff --git a/packages/components/src/autocomplete/README.md b/packages/components/src/autocomplete/README.md
index 42cadcbb06921c..e2bc93fc476e00 100644
--- a/packages/components/src/autocomplete/README.md
+++ b/packages/components/src/autocomplete/README.md
@@ -8,7 +8,7 @@ The following props are used to control the behavior of the component.
 
 ### record
 
-The rich text value object the autocomleter is being applied to.
+The rich text value object the autocompleter is being applied to.
 
 -   Required: Yes
 -   Type: `RichTextValue`
@@ -50,7 +50,7 @@ A function that returns nodes to be rendered within the Autocomplete.
 
 ### isSelected
 
-Whether or not the Autocomplte componenet is selected, and if its `Popover` should be displayed.
+Whether or not the Autocomplete component is selected, and if its `Popover` should be displayed.
 
 - Required: Yes
 - Type: `Boolean`
diff --git a/packages/components/src/autocomplete/autocompleter-ui.native.js b/packages/components/src/autocomplete/autocompleter-ui.native.js
index 1785d742d1ee44..daf4fe301abf77 100644
--- a/packages/components/src/autocomplete/autocompleter-ui.native.js
+++ b/packages/components/src/autocomplete/autocompleter-ui.native.js
@@ -21,10 +21,6 @@ import {
 	useCallback,
 } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
-import {
-	Icon,
-	__unstableAutocompletionItemsFill as AutocompletionItemsFill,
-} from '@wordpress/components';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 
 /**
@@ -33,6 +29,8 @@ import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 import BackgroundView from './background-view';
 import getDefaultUseItems from './get-default-use-items';
 import styles from './style.scss';
+import Icon from '../icon';
+import { __unstableAutocompletionItemsFill as AutocompletionItemsFill } from '../mobile/autocompletion-items';
 
 const { compose: stylesCompose } = StyleSheet;
 
@@ -71,9 +69,8 @@ export function getAutoCompleterUI( autocompleter ) {
 			} else if ( isVisible && text.length === 0 ) {
 				startAnimation( false );
 			}
-			// Temporarily disabling exhaustive-deps to avoid introducing unexpected side effecst.
+			// We want to avoid introducing unexpected side effects.
 			// See https://github.com/WordPress/gutenberg/pull/41820
-			// eslint-disable-next-line react-hooks/exhaustive-deps
 		}, [ items, isVisible, text ] );
 
 		const activeItemStyles = usePreferredColorSchemeStyle(
@@ -114,9 +111,8 @@ export function getAutoCompleterUI( autocompleter ) {
 					}
 				} );
 			},
-			// Temporarily disabling exhaustive-deps to avoid introducing unexpected side effecst.
+			// We want to avoid introducing unexpected side effects.
 			// See https://github.com/WordPress/gutenberg/pull/41820
-			// eslint-disable-next-line react-hooks/exhaustive-deps
 			[ isVisible ]
 		);
 
diff --git a/packages/components/src/autocomplete/autocompleter-ui.tsx b/packages/components/src/autocomplete/autocompleter-ui.tsx
index 663316c39b32ea..69105f6c9d3b44 100644
--- a/packages/components/src/autocomplete/autocompleter-ui.tsx
+++ b/packages/components/src/autocomplete/autocompleter-ui.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -27,10 +27,60 @@ import { VisuallyHidden } from '../visually-hidden';
 import { createPortal } from 'react-dom';
 import type { AutocompleterUIProps, KeyedOption, WPCompleter } from './types';
 
+type ListBoxProps = {
+	items: KeyedOption[];
+	onSelect: ( option: KeyedOption ) => void;
+	selectedIndex: number;
+	instanceId: number;
+	listBoxId: string | undefined;
+	className?: string;
+	Component?: React.ElementType;
+};
+
+function ListBox( {
+	items,
+	onSelect,
+	selectedIndex,
+	instanceId,
+	listBoxId,
+	className,
+	Component = 'div',
+}: ListBoxProps ) {
+	return (
+		<Component
+			id={ listBoxId }
+			role="listbox"
+			className="components-autocomplete__results"
+		>
+			{ items.map( ( option, index ) => (
+				<Button
+					key={ option.key }
+					id={ `components-autocomplete-item-${ instanceId }-${ option.key }` }
+					role="option"
+					aria-selected={ index === selectedIndex }
+					accessibleWhenDisabled
+					disabled={ option.isDisabled }
+					className={ clsx(
+						'components-autocomplete__result',
+						className,
+						{
+							// Unused, for backwards compatibility.
+							'is-selected': index === selectedIndex,
+						}
+					) }
+					variant={ index === selectedIndex ? 'primary' : undefined }
+					onClick={ () => onSelect( option ) }
+				>
+					{ option.label }
+				</Button>
+			) ) }
+		</Component>
+	);
+}
+
 export function getAutoCompleterUI( autocompleter: WPCompleter ) {
-	const useItems = autocompleter.useItems
-		? autocompleter.useItems
-		: getDefaultUseItems( autocompleter );
+	const useItems =
+		autocompleter.useItems ?? getDefaultUseItems( autocompleter );
 
 	function AutocompleterUI( {
 		filterValue,
@@ -55,12 +105,14 @@ export function getAutoCompleterUI( autocompleter: WPCompleter ) {
 			popoverRef,
 			useRefEffect(
 				( node ) => {
-					if ( ! contentRef.current ) return;
+					if ( ! contentRef.current ) {
+						return;
+					}
 
 					// If the popover is rendered in a different document than
 					// the content, we need to duplicate the options list in the
 					// content document so that it's available to the screen
-					// readers, which check the DOM ID based aira-* attributes.
+					// readers, which check the DOM ID based aria-* attributes.
 					setNeedsA11yCompat(
 						node.ownerDocument !== contentRef.current.ownerDocument
 					);
@@ -113,47 +165,14 @@ export function getAutoCompleterUI( autocompleter: WPCompleter ) {
 		useLayoutEffect( () => {
 			onChangeOptions( items );
 			announce( items );
-			// Temporarily disabling exhaustive-deps to avoid introducing unexpected side effecst.
+			// We want to avoid introducing unexpected side effects.
 			// See https://github.com/WordPress/gutenberg/pull/41820
-			// eslint-disable-next-line react-hooks/exhaustive-deps
 		}, [ items ] );
 
 		if ( items.length === 0 ) {
 			return null;
 		}
 
-		const ListBox = ( {
-			Component = 'div',
-		}: {
-			Component?: React.ElementType;
-		} ) => (
-			<Component
-				id={ listBoxId }
-				role="listbox"
-				className="components-autocomplete__results"
-			>
-				{ items.map( ( option, index ) => (
-					<Button
-						key={ option.key }
-						id={ `components-autocomplete-item-${ instanceId }-${ option.key }` }
-						role="option"
-						aria-selected={ index === selectedIndex }
-						disabled={ option.isDisabled }
-						className={ classnames(
-							'components-autocomplete__result',
-							className,
-							{
-								'is-selected': index === selectedIndex,
-							}
-						) }
-						onClick={ () => onSelect( option ) }
-					>
-						{ option.label }
-					</Button>
-				) ) }
-			</Component>
-		);
-
 		return (
 			<>
 				<Popover
@@ -164,12 +183,27 @@ export function getAutoCompleterUI( autocompleter: WPCompleter ) {
 					anchor={ popoverAnchor }
 					ref={ popoverRefs }
 				>
-					<ListBox />
+					<ListBox
+						items={ items }
+						onSelect={ onSelect }
+						selectedIndex={ selectedIndex }
+						instanceId={ instanceId }
+						listBoxId={ listBoxId }
+						className={ className }
+					/>
 				</Popover>
 				{ contentRef.current &&
 					needsA11yCompat &&
 					createPortal(
-						<ListBox Component={ VisuallyHidden } />,
+						<ListBox
+							items={ items }
+							onSelect={ onSelect }
+							selectedIndex={ selectedIndex }
+							instanceId={ instanceId }
+							listBoxId={ listBoxId }
+							className={ className }
+							Component={ VisuallyHidden }
+						/>,
 						contentRef.current.ownerDocument.body
 					) }
 			</>
@@ -200,8 +234,5 @@ function useOnClickOutside(
 			document.removeEventListener( 'mousedown', listener );
 			document.removeEventListener( 'touchstart', listener );
 		};
-		// Disable reason: `ref` is a ref object and should not be included in a
-		// hook's dependency list.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [ handler ] );
+	}, [ handler, ref ] );
 }
diff --git a/packages/components/src/autocomplete/index.tsx b/packages/components/src/autocomplete/index.tsx
index b76e8548c08f23..f3278a46015c3c 100644
--- a/packages/components/src/autocomplete/index.tsx
+++ b/packages/components/src/autocomplete/index.tsx
@@ -13,7 +13,6 @@ import {
 	useRef,
 	useMemo,
 } from '@wordpress/element';
-import { __, _n } from '@wordpress/i18n';
 import { useInstanceId, useMergeRefs, useRefEffect } from '@wordpress/compose';
 import {
 	create,
@@ -30,6 +29,7 @@ import { isAppleOS } from '@wordpress/keycodes';
  */
 import { getAutoCompleterUI } from './autocompleter-ui';
 import { escapeRegExp } from '../utils/strings';
+import { withIgnoreIMEEvents } from '../utils/with-ignore-ime-events';
 import type {
 	AutocompleteProps,
 	AutocompleterUIProps,
@@ -72,6 +72,9 @@ const getNodeText = ( node: React.ReactNode ): string => {
 
 const EMPTY_FILTERED_OPTIONS: KeyedOption[] = [];
 
+// Used for generating the instance ID
+const AUTOCOMPLETE_HOOK_REFERENCE = {};
+
 export function useAutocomplete( {
 	record,
 	onChange,
@@ -79,7 +82,7 @@ export function useAutocomplete( {
 	completers,
 	contentRef,
 }: UseAutocompleteProps ) {
-	const instanceId = useInstanceId( useAutocomplete );
+	const instanceId = useInstanceId( AUTOCOMPLETE_HOOK_REFERENCE );
 	const [ selectedIndex, setSelectedIndex ] = useState( 0 );
 
 	const [ filteredOptions, setFilteredOptions ] = useState<
@@ -183,15 +186,7 @@ export function useAutocomplete( {
 			return;
 		}
 
-		if (
-			event.defaultPrevented ||
-			// Ignore keydowns from IMEs
-			event.isComposing ||
-			// Workaround for Mac Safari where the final Enter/Backspace of an IME composition
-			// is `isComposing=false`, even though it's technically still part of the composition.
-			// These can only be detected by keyCode.
-			event.keyCode === 229
-		) {
+		if ( event.defaultPrevented ) {
 			return;
 		}
 
@@ -260,7 +255,9 @@ export function useAutocomplete( {
 
 	useEffect( () => {
 		if ( ! textContent ) {
-			if ( autocompleter ) reset();
+			if ( autocompleter ) {
+				reset();
+			}
 			return;
 		}
 
@@ -284,7 +281,9 @@ export function useAutocomplete( {
 		);
 
 		if ( ! completer ) {
-			if ( autocompleter ) reset();
+			if ( autocompleter ) {
+				reset();
+			}
 			return;
 		}
 
@@ -300,7 +299,9 @@ export function useAutocomplete( {
 		// significantly. This could happen, for example, if `matchingWhileBackspacing`
 		// is true and one of the "words" end up being too long. If that's the case,
 		// it will be caught by this guard.
-		if ( tooDistantFromTrigger ) return;
+		if ( tooDistantFromTrigger ) {
+			return;
+		}
 
 		const mismatch = filteredOptions.length === 0;
 		const wordsFromTrigger = textWithoutTrigger.split( /\s/ );
@@ -325,7 +326,9 @@ export function useAutocomplete( {
 			backspacing.current && wordsFromTrigger.length <= 3;
 
 		if ( mismatch && ! ( matchingWhileBackspacing || hasOneTriggerWord ) ) {
-			if ( autocompleter ) reset();
+			if ( autocompleter ) {
+				reset();
+			}
 			return;
 		}
 
@@ -340,7 +343,9 @@ export function useAutocomplete( {
 				textAfterSelection
 			)
 		) {
-			if ( autocompleter ) reset();
+			if ( autocompleter ) {
+				reset();
+			}
 			return;
 		}
 
@@ -348,12 +353,16 @@ export function useAutocomplete( {
 			/^\s/.test( textWithoutTrigger ) ||
 			/\s\s+$/.test( textWithoutTrigger )
 		) {
-			if ( autocompleter ) reset();
+			if ( autocompleter ) {
+				reset();
+			}
 			return;
 		}
 
 		if ( ! /[\u0000-\uFFFF]*$/.test( textWithoutTrigger ) ) {
-			if ( autocompleter ) reset();
+			if ( autocompleter ) {
+				reset();
+			}
 			return;
 		}
 
@@ -371,9 +380,8 @@ export function useAutocomplete( {
 				: AutocompleterUI
 		);
 		setFilterValue( query === null ? '' : query );
-		// Temporarily disabling exhaustive-deps to avoid introducing unexpected side effecst.
+		// We want to avoid introducing unexpected side effects.
 		// See https://github.com/WordPress/gutenberg/pull/41820
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ textContent ] );
 
 	const { key: selectedKey = '' } = filteredOptions[ selectedIndex ] || {};
@@ -390,7 +398,7 @@ export function useAutocomplete( {
 	return {
 		listBoxId,
 		activeId,
-		onKeyDown: handleKeyDown,
+		onKeyDown: withIgnoreIMEEvents( handleKeyDown ),
 		popover: hasSelection && AutocompleterUI && (
 			<AutocompleterUI
 				className={ className }
diff --git a/packages/components/src/autocomplete/style.scss b/packages/components/src/autocomplete/style.scss
index 4d04b3b8b52cf2..75b219210f42e2 100644
--- a/packages/components/src/autocomplete/style.scss
+++ b/packages/components/src/autocomplete/style.scss
@@ -1,6 +1,6 @@
 .components-autocomplete__popover .components-popover__content {
-	padding: $grid-unit-20;
-	min-width: 220px;
+	padding: $grid-unit-10;
+	min-width: 200px;
 }
 
 .components-autocomplete__result.components-button {
@@ -10,7 +10,7 @@
 	text-align: left;
 	width: 100%;
 
-	&.is-selected {
-		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) $components-color-accent;
+	&:focus:not(:disabled) {
+		@include block-toolbar-button-style__focus();
 	}
 }
diff --git a/packages/components/src/autocomplete/test/index.tsx b/packages/components/src/autocomplete/test/index.tsx
index 7a31680b3dd5e1..0df784f8367cdd 100644
--- a/packages/components/src/autocomplete/test/index.tsx
+++ b/packages/components/src/autocomplete/test/index.tsx
@@ -67,10 +67,10 @@ describe( 'AutocompleterUI', () => {
 				return (
 					<div>
 						<AutocompleterUI
-							className={ 'test' }
-							filterValue={ 'Apple' }
+							className="test"
+							filterValue="Apple"
 							instanceId={ 1 }
-							listBoxId={ '1' }
+							listBoxId="1"
 							selectedIndex={ 0 }
 							onChangeOptions={ () => {} }
 							onSelect={ () => {} }
diff --git a/packages/components/src/autocomplete/types.ts b/packages/components/src/autocomplete/types.ts
index ebe69648fc7e96..46f4a33d1401d3 100644
--- a/packages/components/src/autocomplete/types.ts
+++ b/packages/components/src/autocomplete/types.ts
@@ -200,9 +200,8 @@ export type AutocompleteProps = UseAutocompleteProps & {
 		props: Omit< ReturnType< typeof useAutocomplete >, 'popover' >
 	) => React.ReactNode;
 	/**
-	 * Whether or not the Autocomplte componenet is selected, and if its
-	 * `Popover`
-	 * should be displayed.
+	 * Whether or not the Autocomplete component is selected, and if its
+	 * `Popover` should be displayed.
 	 */
 	isSelected: boolean;
 };
diff --git a/packages/components/src/base-control/README.md b/packages/components/src/base-control/README.md
index c2f3dc3e0108fd..d51629de6f7253 100644
--- a/packages/components/src/base-control/README.md
+++ b/packages/components/src/base-control/README.md
@@ -15,7 +15,7 @@ const MyCustomTextareaControl = ({ children, ...baseProps }) => (
 	const { baseControlProps, controlProps } = useBaseControlProps( baseProps );
 
 	return (
-		<BaseControl { ...baseControlProps } __nextHasNoMarginBottom={ true }>
+		<BaseControl { ...baseControlProps } __nextHasNoMarginBottom>
 			<textarea { ...controlProps }>
 			  { children }
 			</textarea>
@@ -53,7 +53,7 @@ If true, the label will only be visible to screen readers.
 
 ### help
 
-Additional description for the control. It is preferable to use plain text for `help`, as it can be accessibly associated with the control using `aria-describedby`. When the `help` contains links, or otherwise non-plain text content, it will be associated with the control using `aria-details`.
+Additional description for the control. Only use for meaningful description or instructions for the control. An element containing the description will be programmatically associated to the BaseControl by the means of an `aria-describedby` attribute.
 
 -   Type: `ReactNode`
 -   Required: No
@@ -92,7 +92,10 @@ It should only be used in cases where the children being rendered inside BaseCon
 import { BaseControl } from '@wordpress/components';
 
 const MyBaseControl = () => (
-	<BaseControl help="This button is already accessibly labeled.">
+	<BaseControl
+		__nextHasNoMarginBottom
+		help="This button is already accessibly labeled."
+	>
 		<BaseControl.VisualLabel>Author</BaseControl.VisualLabel>
 		<Button>Select an author</Button>
 	</BaseControl>
diff --git a/packages/components/src/base-control/hooks.ts b/packages/components/src/base-control/hooks.ts
index cfc5a8cf9baa47..7aa7c242575220 100644
--- a/packages/components/src/base-control/hooks.ts
+++ b/packages/components/src/base-control/hooks.ts
@@ -27,10 +27,6 @@ export function useBaseControlProps(
 		preferredId
 	);
 
-	// ARIA descriptions can only contain plain text, so fall back to aria-details if not.
-	const helpPropName =
-		typeof help === 'string' ? 'aria-describedby' : 'aria-details';
-
 	return {
 		baseControlProps: {
 			id: uniqueId,
@@ -39,7 +35,7 @@ export function useBaseControlProps(
 		},
 		controlProps: {
 			id: uniqueId,
-			...( !! help ? { [ helpPropName ]: `${ uniqueId }__help` } : {} ),
+			...( !! help ? { 'aria-describedby': `${ uniqueId }__help` } : {} ),
 		},
 	};
 }
diff --git a/packages/components/src/base-control/index.native.js b/packages/components/src/base-control/index.native.js
index 1bf653768e7532..8ae2c35ea0595c 100644
--- a/packages/components/src/base-control/index.native.js
+++ b/packages/components/src/base-control/index.native.js
@@ -5,7 +5,7 @@ import { Text, View } from 'react-native';
 
 export default function BaseControl( { label, help, children } ) {
 	return (
-		<View accessible={ true } accessibilityLabel={ label }>
+		<View accessible accessibilityLabel={ label }>
 			{ label && <Text>{ label }</Text> }
 			{ children }
 			{ help && <Text>{ help }</Text> }
diff --git a/packages/components/src/base-control/index.tsx b/packages/components/src/base-control/index.tsx
index 29251a114e0343..423636a92cd5f0 100644
--- a/packages/components/src/base-control/index.tsx
+++ b/packages/components/src/base-control/index.tsx
@@ -1,7 +1,14 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
+import type { ForwardedRef } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import deprecated from '@wordpress/deprecated';
+import { forwardRef } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -16,45 +23,37 @@ import {
 	StyledVisualLabel,
 } from './styles/base-control-styles';
 import type { WordPressComponentProps } from '../context';
+import { contextConnectWithoutRef, useContextSystem } from '../context';
 
 export { useBaseControlProps } from './hooks';
 
-/**
- * `BaseControl` is a component used to generate labels and help text for components handling user inputs.
- *
- * ```jsx
- * import { BaseControl, useBaseControlProps } from '@wordpress/components';
- *
- * // Render a `BaseControl` for a textarea input
- * const MyCustomTextareaControl = ({ children, ...baseProps }) => (
- * 	// `useBaseControlProps` is a convenience hook to get the props for the `BaseControl`
- * 	// and the inner control itself. Namely, it takes care of generating a unique `id`,
- * 	// properly associating it with the `label` and `help` elements.
- * 	const { baseControlProps, controlProps } = useBaseControlProps( baseProps );
- *
- * 	return (
- * 		<BaseControl { ...baseControlProps } __nextHasNoMarginBottom={ true }>
- * 			<textarea { ...controlProps }>
- * 			  { children }
- * 			</textarea>
- * 		</BaseControl>
- * 	);
- * );
- * ```
- */
-export const BaseControl = ( {
-	__nextHasNoMarginBottom = false,
-	id,
-	label,
-	hideLabelFromVision = false,
-	help,
-	className,
-	children,
-}: BaseControlProps ) => {
+const UnconnectedBaseControl = (
+	props: WordPressComponentProps< BaseControlProps, null >
+) => {
+	const {
+		__nextHasNoMarginBottom = false,
+		__associatedWPComponentName = 'BaseControl',
+		id,
+		label,
+		hideLabelFromVision = false,
+		help,
+		className,
+		children,
+	} = useContextSystem( props, 'BaseControl' );
+
+	if ( ! __nextHasNoMarginBottom ) {
+		deprecated(
+			`Bottom margin styles for wp.components.${ __associatedWPComponentName }`,
+			{
+				since: '6.7',
+				version: '7.0',
+				hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version.',
+			}
+		);
+	}
+
 	return (
-		<Wrapper
-			className={ classnames( 'components-base-control', className ) }
-		>
+		<Wrapper className={ className }>
 			<StyledField
 				className="components-base-control__field"
 				// TODO: Official deprecation for this should start after all internal usages have been migrated
@@ -79,9 +78,7 @@ export const BaseControl = ( {
 					( hideLabelFromVision ? (
 						<VisuallyHidden as="label">{ label }</VisuallyHidden>
 					) : (
-						<BaseControl.VisualLabel>
-							{ label }
-						</BaseControl.VisualLabel>
+						<VisualLabel>{ label }</VisualLabel>
 					) ) }
 				{ children }
 			</StyledField>
@@ -98,40 +95,75 @@ export const BaseControl = ( {
 	);
 };
 
-/**
- * `BaseControl.VisualLabel` is used to render a purely visual label inside a `BaseControl` component.
- *
- * It should only be used in cases where the children being rendered inside `BaseControl` are already accessibly labeled,
- * e.g., a button, but we want an additional visual label for that section equivalent to the labels `BaseControl` would
- * otherwise use if the `label` prop was passed.
- *
- * @example
- * import { BaseControl } from '@wordpress/components';
- *
- * const MyBaseControl = () => (
- * 	<BaseControl help="This button is already accessibly labeled.">
- * 		<BaseControl.VisualLabel>Author</BaseControl.VisualLabel>
- * 		<Button>Select an author</Button>
- * 	</BaseControl>
- * );
- */
-export const VisualLabel = ( {
-	className,
-	children,
-	...props
-}: WordPressComponentProps< BaseControlVisualLabelProps, 'span' > ) => {
+const UnforwardedVisualLabel = (
+	props: WordPressComponentProps< BaseControlVisualLabelProps, 'span' >,
+	ref: ForwardedRef< any >
+) => {
+	const { className, children, ...restProps } = props;
+
 	return (
 		<StyledVisualLabel
-			{ ...props }
-			className={ classnames(
-				'components-base-control__label',
-				className
-			) }
+			ref={ ref }
+			{ ...restProps }
+			className={ clsx( 'components-base-control__label', className ) }
 		>
 			{ children }
 		</StyledVisualLabel>
 	);
 };
-BaseControl.VisualLabel = VisualLabel;
+
+export const VisualLabel = forwardRef( UnforwardedVisualLabel );
+
+/**
+ * `BaseControl` is a component used to generate labels and help text for components handling user inputs.
+ *
+ * ```jsx
+ * import { BaseControl, useBaseControlProps } from '@wordpress/components';
+ *
+ * // Render a `BaseControl` for a textarea input
+ * const MyCustomTextareaControl = ({ children, ...baseProps }) => (
+ * 	// `useBaseControlProps` is a convenience hook to get the props for the `BaseControl`
+ * 	// and the inner control itself. Namely, it takes care of generating a unique `id`,
+ * 	// properly associating it with the `label` and `help` elements.
+ * 	const { baseControlProps, controlProps } = useBaseControlProps( baseProps );
+ *
+ * 	return (
+ * 		<BaseControl { ...baseControlProps } __nextHasNoMarginBottom>
+ * 			<textarea { ...controlProps }>
+ * 			  { children }
+ * 			</textarea>
+ * 		</BaseControl>
+ * 	);
+ * );
+ * ```
+ */
+export const BaseControl = Object.assign(
+	contextConnectWithoutRef( UnconnectedBaseControl, 'BaseControl' ),
+
+	{
+		/**
+		 * `BaseControl.VisualLabel` is used to render a purely visual label inside a `BaseControl` component.
+		 *
+		 * It should only be used in cases where the children being rendered inside `BaseControl` are already accessibly labeled,
+		 * e.g., a button, but we want an additional visual label for that section equivalent to the labels `BaseControl` would
+		 * otherwise use if the `label` prop was passed.
+		 *
+		 * ```jsx
+		 * import { BaseControl } from '@wordpress/components';
+		 *
+		 * const MyBaseControl = () => (
+		 * 	<BaseControl
+		 * 		__nextHasNoMarginBottom
+		 * 		help="This button is already accessibly labeled."
+		 * 	>
+		 * 		<BaseControl.VisualLabel>Author</BaseControl.VisualLabel>
+		 * 		<Button>Select an author</Button>
+		 * 	</BaseControl>
+		 * );
+		 * ```
+		 */
+		VisualLabel,
+	}
+);
 
 export default BaseControl;
diff --git a/packages/components/src/base-control/stories/index.story.tsx b/packages/components/src/base-control/stories/index.story.tsx
index 3b6e228bd4fc81..62191f906a4ce3 100644
--- a/packages/components/src/base-control/stories/index.story.tsx
+++ b/packages/components/src/base-control/stories/index.story.tsx
@@ -55,7 +55,6 @@ WithHelpText.args = {
  * otherwise use if the `label` prop was passed.
  */
 export const WithVisualLabel: StoryFn< typeof BaseControl > = ( props ) => {
-	// @ts-expect-error - Unclear how to fix, see also https://github.com/WordPress/gutenberg/pull/39468#discussion_r827150516
 	BaseControl.VisualLabel.displayName = 'BaseControl.VisualLabel';
 
 	return (
diff --git a/packages/components/src/base-control/styles/base-control-styles.ts b/packages/components/src/base-control/styles/base-control-styles.ts
index 6ddfe10229fdbb..d633fcdd7e7a77 100644
--- a/packages/components/src/base-control/styles/base-control-styles.ts
+++ b/packages/components/src/base-control/styles/base-control-styles.ts
@@ -37,7 +37,7 @@ export const StyledField = styled.div`
 const labelStyles = css`
 	${ baseLabelTypography };
 
-	display: inline-block;
+	display: block;
 	margin-bottom: ${ space( 2 ) };
 	/**
 	 * Removes Chrome/Safari/Firefox user agent stylesheet padding from
diff --git a/packages/components/src/base-control/test/index.tsx b/packages/components/src/base-control/test/index.tsx
index 949ad83cd83ebc..07623a8b4c3e7d 100644
--- a/packages/components/src/base-control/test/index.tsx
+++ b/packages/components/src/base-control/test/index.tsx
@@ -14,7 +14,7 @@ const MyBaseControl = ( props: Omit< BaseControlProps, 'children' > ) => {
 	const { baseControlProps, controlProps } = useBaseControlProps( props );
 
 	return (
-		<BaseControl { ...baseControlProps } __nextHasNoMarginBottom={ true }>
+		<BaseControl { ...baseControlProps } __nextHasNoMarginBottom>
 			<textarea { ...controlProps } />
 		</BaseControl>
 	);
@@ -31,7 +31,7 @@ describe( 'BaseControl', () => {
 		).toBeInTheDocument();
 	} );
 
-	it( 'should render help as aria-details when not plain text', () => {
+	it( 'should still render help as aria-describedby when not plain text', () => {
 		render(
 			<MyBaseControl
 				label="Text"
@@ -44,10 +44,10 @@ describe( 'BaseControl', () => {
 			name: 'My help text',
 		} );
 
-		expect( textarea ).toHaveAttribute( 'aria-details' );
+		expect( textarea ).toHaveAttribute( 'aria-describedby' );
 		expect(
 			// eslint-disable-next-line testing-library/no-node-access
-			help.closest( `#${ textarea.getAttribute( 'aria-details' ) }` )
+			help.closest( `#${ textarea.getAttribute( 'aria-describedby' ) }` )
 		).toBeVisible();
 	} );
 } );
diff --git a/packages/components/src/base-control/types.ts b/packages/components/src/base-control/types.ts
index 36306e9a24b0b2..e4c838459209c4 100644
--- a/packages/components/src/base-control/types.ts
+++ b/packages/components/src/base-control/types.ts
@@ -10,6 +10,13 @@ export type BaseControlProps = {
 	 * @default false
 	 */
 	__nextHasNoMarginBottom?: boolean;
+	/**
+	 * Temporary private prop for showing better deprecation messages,
+	 * e.g. `Some feature from wp.components.${ __associatedWPControl } is deprecated`.
+	 *
+	 * @ignore
+	 */
+	__associatedWPComponentName?: string;
 	/**
 	 * The HTML `id` of the control element (passed in as a child to `BaseControl`) to which labels and help text are being generated.
 	 * This is necessary to accessibly associate the label with that element.
@@ -21,8 +28,7 @@ export type BaseControlProps = {
 	/**
 	 * Additional description for the control.
 	 *
-	 * It is preferable to use plain text for `help`, as it can be accessibly associated with the control using `aria-describedby`.
-	 * When the `help` contains links, or otherwise non-plain text content, it will be associated with the control using `aria-details`.
+	 * Only use for meaningful description or instructions for the control. An element containing the description will be programmatically associated to the BaseControl by the means of an `aria-describedby` attribute.
 	 */
 	help?: ReactNode;
 	/**
diff --git a/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx b/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
index ee76c39742d417..5388a381deb395 100644
--- a/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
+++ b/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
@@ -29,7 +29,7 @@ const BorderBoxControlLinkedButton = (
 			<View className={ className }>
 				<Button
 					{ ...buttonProps }
-					isSmall
+					size="small"
 					icon={ isLinked ? link : linkOff }
 					iconSize={ 24 }
 					aria-label={ label }
diff --git a/packages/components/src/border-box-control/border-box-control-split-controls/component.tsx b/packages/components/src/border-box-control/border-box-control-split-controls/component.tsx
index ee7a6d86cb33fb..8f125cdb8f9261 100644
--- a/packages/components/src/border-box-control/border-box-control-split-controls/component.tsx
+++ b/packages/components/src/border-box-control/border-box-control-split-controls/component.tsx
@@ -76,7 +76,7 @@ const BorderBoxControlSplitControls = (
 			<BorderBoxControlVisualizer value={ value } size={ size } />
 			<BorderControl
 				className={ centeredClassName }
-				hideLabelFromVision={ true }
+				hideLabelFromVision
 				label={ __( 'Top border' ) }
 				onChange={ ( newBorder ) => onChange( newBorder, 'top' ) }
 				__unstablePopoverProps={ popoverProps }
@@ -84,7 +84,7 @@ const BorderBoxControlSplitControls = (
 				{ ...sharedBorderControlProps }
 			/>
 			<BorderControl
-				hideLabelFromVision={ true }
+				hideLabelFromVision
 				label={ __( 'Left border' ) }
 				onChange={ ( newBorder ) => onChange( newBorder, 'left' ) }
 				__unstablePopoverProps={ popoverProps }
@@ -93,7 +93,7 @@ const BorderBoxControlSplitControls = (
 			/>
 			<BorderControl
 				className={ rightAlignedClassName }
-				hideLabelFromVision={ true }
+				hideLabelFromVision
 				label={ __( 'Right border' ) }
 				onChange={ ( newBorder ) => onChange( newBorder, 'right' ) }
 				__unstablePopoverProps={ popoverProps }
@@ -102,7 +102,7 @@ const BorderBoxControlSplitControls = (
 			/>
 			<BorderControl
 				className={ centeredClassName }
-				hideLabelFromVision={ true }
+				hideLabelFromVision
 				label={ __( 'Bottom border' ) }
 				onChange={ ( newBorder ) => onChange( newBorder, 'bottom' ) }
 				__unstablePopoverProps={ popoverProps }
diff --git a/packages/components/src/border-box-control/border-box-control-visualizer/component.tsx b/packages/components/src/border-box-control/border-box-control-visualizer/component.tsx
index 2656911d765797..fe457eccac8c0e 100644
--- a/packages/components/src/border-box-control/border-box-control-visualizer/component.tsx
+++ b/packages/components/src/border-box-control/border-box-control-visualizer/component.tsx
@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
 /**
  * Internal dependencies
  */
diff --git a/packages/components/src/border-box-control/border-box-control/README.md b/packages/components/src/border-box-control/border-box-control/README.md
index 20352e03c8243d..e67a1386103c1a 100644
--- a/packages/components/src/border-box-control/border-box-control/README.md
+++ b/packages/components/src/border-box-control/border-box-control/README.md
@@ -1,12 +1,7 @@
 # BorderBoxControl
 
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-<br />
-
-This component provides users with the ability to configure a single "flat"
-border or separate borders per side.
+An input control for the color, style, and width of the border of a box. The
+border can be customized as a whole, or individually for each side of the box.
 
 ## Development guidelines
 
@@ -28,7 +23,7 @@ show "Mixed" placeholder text.
 
 ```jsx
 import { useState } from 'react';
-import { __experimentalBorderBoxControl as BorderBoxControl } from '@wordpress/components';
+import { BorderBoxControl } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
 const colors = [
@@ -76,35 +71,35 @@ colors are organized by multiple origins.
 
 Each color may be an object containing a `name` and `color` value.
 
-- Required: No
-- Default: `[]`
+-   Required: No
+-   Default: `[]`
 
 ### `disableCustomColors`: `boolean`
 
 This toggles the ability to choose custom colors.
 
-- Required: No
+-   Required: No
 
 ### `enableAlpha`: `boolean`
 
 This controls whether the alpha channel will be offered when selecting
 custom colors.
 
-- Required: No
-- Default: `false`
+-   Required: No
+-   Default: `false`
 
 ### `enableStyle`: `boolean`
 
 This controls whether to support border style selections.
 
-- Required: No
-- Default: `true`
+-   Required: No
+-   Default: `true`
 
 ### `hideLabelFromVision`: `boolean`
 
 Provides control over whether the label will only be visible to screen readers.
 
-- Required: No
+-   Required: No
 
 ### `label`: `string`
 
@@ -113,7 +108,7 @@ If provided, a label will be generated using this as the content.
 _Whether it is visible only to screen readers is controlled via
 `hideLabelFromVision`._
 
-- Required: No
+-   Required: No
 
 ### `onChange`: `( value?: Object ) => void`
 
@@ -123,7 +118,7 @@ borders, or `undefined`.
 
 _Note: The will be `undefined` if a user clears all borders._
 
-- Required: Yes
+-   Required: Yes
 
 ### `popoverPlacement`: `string`
 
@@ -133,21 +128,21 @@ By default, popovers are displayed relative to the button that initiated the pop
 
 The available base placements are 'top', 'right', 'bottom', 'left'. Each of these base placements has an alignment in the form -start and -end. For example, 'right-start', or 'bottom-end'. These allow you to align the tooltip to the edges of the button, rather than centering it.
 
-- Required: No
+-   Required: No
 
 ### `popoverOffset`: `number`
 
 The space between the popover and the control wrapper.
 
-- Required: No
+-   Required: No
 
 ### `size`: `string`
 
 Size of the control.
 
-- Required: No
-- Default: `default`
-- Allowed values: `default`, `__unstable-large`
+-   Required: No
+-   Default: `default`
+-   Allowed values: `default`, `__unstable-large`
 
 ### `value`: `Object`
 
@@ -158,6 +153,7 @@ properties or a "split" border which defines the previous properties but for
 each side; `top`, `right`, `bottom`, and `left`.
 
 Examples:
+
 ```js
 const flatBorder = { color: '#72aee6', style: 'solid', width: '1px' };
 const splitBorders = {
@@ -168,4 +164,11 @@ const splitBorders = {
 };
 ```
 
-- Required: No
+-   Required: No
+
+### `__next40pxDefaultSize`: `boolean`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Required: No
+-   Default: `false`
diff --git a/packages/components/src/border-box-control/border-box-control/component.tsx b/packages/components/src/border-box-control/border-box-control/component.tsx
index 4f3517937f2046..1dd3437aa50de4 100644
--- a/packages/components/src/border-box-control/border-box-control/component.tsx
+++ b/packages/components/src/border-box-control/border-box-control/component.tsx
@@ -89,7 +89,6 @@ const UnconnectedBorderBoxControl = (
 		);
 
 	const mergedRef = useMergeRefs( [ setPopoverAnchor, forwardedRef ] );
-
 	return (
 		<View className={ className } { ...otherProps } ref={ mergedRef }>
 			<BorderLabel
@@ -112,7 +111,7 @@ const UnconnectedBorderBoxControl = (
 						__unstablePopoverProps={ popoverProps }
 						shouldSanitizeBorder={ false } // This component will handle that.
 						value={ linkedValue }
-						withSlider={ true }
+						withSlider
 						width={
 							size === '__unstable-large' ? '116px' : '110px'
 						}
@@ -148,22 +147,11 @@ const UnconnectedBorderBoxControl = (
 };
 
 /**
- * The `BorderBoxControl` effectively has two view states. The first, a "linked"
- * view, allows configuration of a flat border via a single `BorderControl`.
- * The second, a "split" view, contains a `BorderControl` for each side
- * as well as a visualizer for the currently selected borders. Each view also
- * contains a button to toggle between the two.
- *
- * When switching from the "split" view to "linked", if the individual side
- * borders are not consistent, the "linked" view will display any border
- * properties selections that are consistent while showing a mixed state for
- * those that aren't. For example, if all borders had the same color and style
- * but different widths, then the border dropdown in the "linked" view's
- * `BorderControl` would show that consistent color and style but the "linked"
- * view's width input would show "Mixed" placeholder text.
+ * An input control for the color, style, and width of the border of a box. The
+ * border can be customized as a whole, or individually for each side of the box.
  *
  * ```jsx
- * import { __experimentalBorderBoxControl as BorderBoxControl } from '@wordpress/components';
+ * import { BorderBoxControl } from '@wordpress/components';
  * import { __ } from '@wordpress/i18n';
  *
  * const colors = [
diff --git a/packages/components/src/border-box-control/border-box-control/hook.ts b/packages/components/src/border-box-control/border-box-control/hook.ts
index a303e7d5a39e8b..6756bd51188fb4 100644
--- a/packages/components/src/border-box-control/border-box-control/hook.ts
+++ b/packages/components/src/border-box-control/border-box-control/hook.ts
@@ -35,9 +35,13 @@ export function useBorderBoxControl(
 		size = 'default',
 		value,
 		__experimentalIsRenderedInSidebar = false,
+		__next40pxDefaultSize,
 		...otherProps
 	} = useContextSystem( props, 'BorderBoxControl' );
 
+	const computedSize =
+		size === 'default' && __next40pxDefaultSize ? '__unstable-large' : size;
+
 	const mixedBorders = hasMixedBorders( value );
 	const splitBorders = hasSplitBorders( value );
 
@@ -133,7 +137,7 @@ export function useBorderBoxControl(
 		onSplitChange,
 		toggleLinked,
 		linkedValue,
-		size,
+		size: computedSize,
 		splitValue,
 		wrapperClassName,
 		__experimentalIsRenderedInSidebar,
diff --git a/packages/components/src/border-box-control/stories/index.story.tsx b/packages/components/src/border-box-control/stories/index.story.tsx
index 5b5d7f311208c0..5341dacab646eb 100644
--- a/packages/components/src/border-box-control/stories/index.story.tsx
+++ b/packages/components/src/border-box-control/stories/index.story.tsx
@@ -16,7 +16,7 @@ import Button from '../../button';
 import { BorderBoxControl } from '../';
 
 const meta: Meta< typeof BorderBoxControl > = {
-	title: 'Components (Experimental)/BorderBoxControl',
+	title: 'Components/BorderBoxControl',
 	component: BorderBoxControl,
 	argTypes: {
 		onChange: { action: 'onChange' },
@@ -83,4 +83,5 @@ export const Default = Template.bind( {} );
 Default.args = {
 	colors,
 	label: 'Borders',
+	enableStyle: true,
 };
diff --git a/packages/components/src/border-box-control/types.ts b/packages/components/src/border-box-control/types.ts
index 0b454d8ed09292..283faf05014a03 100644
--- a/packages/components/src/border-box-control/types.ts
+++ b/packages/components/src/border-box-control/types.ts
@@ -45,6 +45,12 @@ export type BorderBoxControlProps = ColorProps &
 		 * properties but for each side; `top`, `right`, `bottom`, and `left`.
 		 */
 		value: AnyBorder;
+		/**
+		 * Start opting into the larger default height that will become the default size in a future version.
+		 *
+		 * @default false
+		 */
+		__next40pxDefaultSize?: boolean;
 	};
 
 export type LinkedButtonProps = Pick< BorderBoxControlProps, 'size' > & {
diff --git a/packages/components/src/border-control/border-control-dropdown/component.tsx b/packages/components/src/border-control/border-control-dropdown/component.tsx
index 4f43a6ed0ce55d..0223de66a4c78b 100644
--- a/packages/components/src/border-control/border-control-dropdown/component.tsx
+++ b/packages/components/src/border-control/border-control-dropdown/component.tsx
@@ -7,7 +7,6 @@ import type { CSSProperties } from 'react';
  * WordPress dependencies
  */
 import { __, sprintf } from '@wordpress/i18n';
-import { closeSmall } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -17,12 +16,10 @@ import Button from '../../button';
 import ColorIndicator from '../../color-indicator';
 import ColorPalette from '../../color-palette';
 import Dropdown from '../../dropdown';
-import { HStack } from '../../h-stack';
 import { VStack } from '../../v-stack';
 import type { WordPressComponentProps } from '../../context';
 import { contextConnect } from '../../context';
 import { useBorderControlDropdown } from './hook';
-import { StyledLabel } from '../../base-control/styles/base-control-styles';
 import DropdownContentWrapper from '../../dropdown/dropdown-content-wrapper';
 
 import type { ColorObject } from '../../color-palette/types';
@@ -142,13 +139,14 @@ const BorderControlDropdown = (
 		enableStyle,
 		indicatorClassName,
 		indicatorWrapperClassName,
+		isStyleSettable,
 		onReset,
 		onColorChange,
 		onStyleChange,
 		popoverContentClassName,
 		popoverControlsClassName,
 		resetButtonClassName,
-		showDropdownHeader,
+		size,
 		__unstablePopoverProps,
 		...otherProps
 	} = useBorderControlDropdown( props );
@@ -177,7 +175,8 @@ const BorderControlDropdown = (
 			aria-label={ toggleAriaLabel }
 			tooltipPosition={ dropdownPosition }
 			label={ __( 'Border color and style picker' ) }
-			showTooltip={ true }
+			showTooltip
+			__next40pxDefaultSize={ size === '__unstable-large' ? true : false }
 		>
 			<span className={ indicatorWrapperClassName }>
 				<ColorIndicator
@@ -194,17 +193,6 @@ const BorderControlDropdown = (
 		<>
 			<DropdownContentWrapper paddingSize="medium">
 				<VStack className={ popoverControlsClassName } spacing={ 6 }>
-					{ showDropdownHeader ? (
-						<HStack>
-							<StyledLabel>{ __( 'Border color' ) }</StyledLabel>
-							<Button
-								isSmall
-								label={ __( 'Close border color' ) }
-								icon={ closeSmall }
-								onClick={ onClose }
-							/>
-						</HStack>
-					) : undefined }
 					<ColorPalette
 						className={ popoverContentClassName }
 						value={ color }
@@ -216,7 +204,7 @@ const BorderControlDropdown = (
 						clearable={ false }
 						enableAlpha={ enableAlpha }
 					/>
-					{ enableStyle && (
+					{ enableStyle && isStyleSettable && (
 						<BorderControlStylePicker
 							label={ __( 'Style' ) }
 							value={ style }
@@ -234,6 +222,7 @@ const BorderControlDropdown = (
 							onReset();
 							onClose();
 						} }
+						__next40pxDefaultSize
 					>
 						{ __( 'Reset' ) }
 					</Button>
diff --git a/packages/components/src/border-control/border-control-dropdown/hook.ts b/packages/components/src/border-control/border-control-dropdown/hook.ts
index b60aa52a34e2eb..5366babc266c61 100644
--- a/packages/components/src/border-control/border-control-dropdown/hook.ts
+++ b/packages/components/src/border-control/border-control-dropdown/hook.ts
@@ -57,8 +57,8 @@ export function useBorderControlDropdown(
 	// Generate class names.
 	const cx = useCx();
 	const classes = useMemo( () => {
-		return cx( styles.borderControlDropdown( size ), className );
-	}, [ className, cx, size ] );
+		return cx( styles.borderControlDropdown, className );
+	}, [ className, cx ] );
 
 	const indicatorClassName = useMemo( () => {
 		return cx( styles.borderColorIndicator );
@@ -95,6 +95,7 @@ export function useBorderControlDropdown(
 		popoverContentClassName,
 		popoverControlsClassName,
 		resetButtonClassName,
+		size,
 		__experimentalIsRenderedInSidebar,
 	};
 }
diff --git a/packages/components/src/border-control/border-control-style-picker/component.tsx b/packages/components/src/border-control/border-control-style-picker/component.tsx
index ffb44855be9fa4..c0a0fe82111cec 100644
--- a/packages/components/src/border-control/border-control-style-picker/component.tsx
+++ b/packages/components/src/border-control/border-control-style-picker/component.tsx
@@ -7,16 +7,12 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import Button from '../../button';
-import { StyledLabel } from '../../base-control/styles/base-control-styles';
-import { View } from '../../view';
-import { Flex } from '../../flex';
-import { VisuallyHidden } from '../../visually-hidden';
-import type { WordPressComponentProps } from '../../context';
 import { contextConnect } from '../../context';
-import { useBorderControlStylePicker } from './hook';
-
-import type { LabelProps, StylePickerProps } from '../types';
+import type { StylePickerProps } from '../types';
+import {
+	ToggleGroupControl,
+	ToggleGroupControlOptionIcon,
+} from '../../toggle-group-control';
 
 const BORDER_STYLES = [
 	{ label: __( 'Solid' ), icon: lineSolid, value: 'solid' },
@@ -24,67 +20,36 @@ const BORDER_STYLES = [
 	{ label: __( 'Dotted' ), icon: lineDotted, value: 'dotted' },
 ];
 
-const Label = ( props: LabelProps ) => {
-	const { label, hideLabelFromVision } = props;
-
-	if ( ! label ) {
-		return null;
-	}
-
-	return hideLabelFromVision ? (
-		<VisuallyHidden as="label">{ label }</VisuallyHidden>
-	) : (
-		<StyledLabel>{ label }</StyledLabel>
-	);
-};
-
-const BorderControlStylePicker = (
-	props: WordPressComponentProps< StylePickerProps, 'div' >,
+function UnconnectedBorderControlStylePicker(
+	{ onChange, ...restProps }: StylePickerProps,
 	forwardedRef: React.ForwardedRef< any >
-) => {
-	const {
-		buttonClassName,
-		hideLabelFromVision,
-		label,
-		onChange,
-		value,
-		...otherProps
-	} = useBorderControlStylePicker( props );
-
+) {
 	return (
-		<View { ...otherProps } ref={ forwardedRef }>
-			<Label
-				label={ label }
-				hideLabelFromVision={ hideLabelFromVision }
-			/>
-			<Flex justify="flex-start" gap={ 1 }>
-				{ BORDER_STYLES.map( ( borderStyle ) => (
-					<Button
-						key={ borderStyle.value }
-						className={ buttonClassName }
-						icon={ borderStyle.icon }
-						isSmall
-						isPressed={ borderStyle.value === value }
-						onClick={ () =>
-							onChange(
-								borderStyle.value === value
-									? undefined
-									: borderStyle.value
-							)
-						}
-						aria-label={ borderStyle.label }
-						label={ borderStyle.label }
-						showTooltip={ true }
-					/>
-				) ) }
-			</Flex>
-		</View>
+		<ToggleGroupControl
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			ref={ forwardedRef }
+			isDeselectable
+			onChange={ ( value ) => {
+				onChange?.( value as string | undefined );
+			} }
+			{ ...restProps }
+		>
+			{ BORDER_STYLES.map( ( borderStyle ) => (
+				<ToggleGroupControlOptionIcon
+					key={ borderStyle.value }
+					value={ borderStyle.value }
+					icon={ borderStyle.icon }
+					label={ borderStyle.label }
+				/>
+			) ) }
+		</ToggleGroupControl>
 	);
-};
+}
 
-const ConnectedBorderControlStylePicker = contextConnect(
-	BorderControlStylePicker,
+const BorderControlStylePicker = contextConnect(
+	UnconnectedBorderControlStylePicker,
 	'BorderControlStylePicker'
 );
 
-export default ConnectedBorderControlStylePicker;
+export default BorderControlStylePicker;
diff --git a/packages/components/src/border-control/border-control-style-picker/hook.ts b/packages/components/src/border-control/border-control-style-picker/hook.ts
deleted file mode 100644
index 27233c40309a3a..00000000000000
--- a/packages/components/src/border-control/border-control-style-picker/hook.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import * as styles from '../styles';
-import type { WordPressComponentProps } from '../../context';
-import { useContextSystem } from '../../context';
-import { useCx } from '../../utils/hooks/use-cx';
-
-import type { StylePickerProps } from '../types';
-
-export function useBorderControlStylePicker(
-	props: WordPressComponentProps< StylePickerProps, 'div' >
-) {
-	const { className, ...otherProps } = useContextSystem(
-		props,
-		'BorderControlStylePicker'
-	);
-
-	// Generate class names.
-	const cx = useCx();
-	const classes = useMemo( () => {
-		return cx( styles.borderControlStylePicker, className );
-	}, [ className, cx ] );
-
-	const buttonClassName = useMemo( () => {
-		return cx( styles.borderStyleButton );
-	}, [ cx ] );
-
-	return { ...otherProps, className: classes, buttonClassName };
-}
diff --git a/packages/components/src/border-control/border-control/README.md b/packages/components/src/border-control/border-control/README.md
index 51fb7172b7c553..fbd0c10e418d5a 100644
--- a/packages/components/src/border-control/border-control/README.md
+++ b/packages/components/src/border-control/border-control/README.md
@@ -1,10 +1,6 @@
-#  BorderControl
+# BorderControl
 
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-<br />
-This component provides control over a border's color, style, and width.
+An input control for a border's color, style, and width.
 
 ## Development guidelines
 
@@ -21,7 +17,7 @@ a "shape" abstraction.
 
 ```jsx
 import { useState } from 'react';
-import { __experimentalBorderControl as BorderControl } from '@wordpress/components';
+import { BorderControl } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
 const colors = [
@@ -58,41 +54,41 @@ colors are organized by multiple origins.
 
 Each color may be an object containing a `name` and `color` value.
 
-- Required: No
-- Default: `[]`
+-   Required: No
+-   Default: `[]`
 
 ### `disableCustomColors`: `boolean`
 
 This toggles the ability to choose custom colors.
 
-- Required: No
+-   Required: No
 
 ### `disableUnits`: `boolean`
 
 This controls whether unit selection should be disabled.
 
-- Required: No
+-   Required: No
 
 ### `enableAlpha`: `boolean`
 
 This controls whether the alpha channel will be offered when selecting
 custom colors.
 
-- Required: No
-- Default: `false`
+-   Required: No
+-   Default: `true`
 
 ### `enableStyle`: `boolean`
 
 This controls whether to support border style selection.
 
-- Required: No
-- Default: `true`
+-   Required: No
+-   Default: `true`
 
 ### `hideLabelFromVision`: `boolean`
 
 Provides control over whether the label will only be visible to screen readers.
 
-- Required: No
+-   Required: No
 
 ### `isCompact`: `boolean`
 
@@ -100,7 +96,7 @@ This flags the `BorderControl` to render with a more compact appearance. It
 restricts the width of the control and prevents it from expanding to take up
 additional space.
 
-- Required: No
+-   Required: No
 
 ### `label`: `string`
 
@@ -109,7 +105,7 @@ If provided, a label will be generated using this as the content.
 _Whether it is visible only to screen readers is controlled via
 `hideLabelFromVision`._
 
-- Required: No
+-   Required: No
 
 ### `onChange`: `( value?: Object ) => void`
 
@@ -118,7 +114,7 @@ that selects or clears, border color, style, or width.
 
 _Note: the value may be `undefined` if a user clears all border properties._
 
-- Required: Yes
+-   Required: Yes
 
 ### `shouldSanitizeBorder`: `boolean`
 
@@ -126,23 +122,16 @@ If opted into, sanitizing the border means that if no width or color have been
 selected, the border style is also cleared and `undefined` is returned as the
 new border value.
 
-- Required: No
-- Default: true
-
-### `showDropdownHeader`: `boolean`
-
-Whether or not to render a header for the border color and style picker
-dropdown. The header includes a label for the color picker and a close button.
-
-- Required: No
+-   Required: No
+-   Default: `true`
 
 ### `size`: `string`
 
 Size of the control.
 
-- Required: No
-- Default: `default`
-- Allowed values: `default`, `__unstable-large`
+-   Required: No
+-   Default: `default`
+-   Allowed values: `default`, `__unstable-large`
 
 ### `value`: `Object`
 
@@ -150,6 +139,7 @@ An object representing a border or `undefined`. Used to set the current border
 configuration for this component.
 
 Example:
+
 ```js
  {
 	color: '#72aee6',
@@ -158,18 +148,25 @@ Example:
 }
 ```
 
-- Required: No
+-   Required: No
 
 ### `width`: `CSSProperties[ 'width' ]`
 
 Controls the visual width of the `BorderControl`. It has no effect if the
 `isCompact` prop is set to `true`.
 
-- Required: No
+-   Required: No
 
 ### `withSlider`: `boolean`
 
 Flags whether this `BorderControl` should also render a `RangeControl` for
 additional control over a border's width.
 
-- Required: No
+-   Required: No
+
+### `__next40pxDefaultSize`: `boolean`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Required: No
+-   Default: `false`
diff --git a/packages/components/src/border-control/border-control/component.tsx b/packages/components/src/border-control/border-control/component.tsx
index 960be4bf171ea4..21be22c9dd55d8 100644
--- a/packages/components/src/border-control/border-control/component.tsx
+++ b/packages/components/src/border-control/border-control/component.tsx
@@ -18,6 +18,7 @@ import { contextConnect } from '../../context';
 import { useBorderControl } from './hook';
 
 import type { BorderControlProps, LabelProps } from '../types';
+import { Spacer } from '../../spacer';
 
 const BorderLabel = ( props: LabelProps ) => {
 	const { label, hideLabelFromVision } = props;
@@ -38,6 +39,7 @@ const UnconnectedBorderControl = (
 	forwardedRef: React.ForwardedRef< any >
 ) => {
 	const {
+		__next40pxDefaultSize = false,
 		colors,
 		disableCustomColors,
 		disableUnits,
@@ -46,6 +48,7 @@ const UnconnectedBorderControl = (
 		hideLabelFromVision,
 		innerWrapperClassName,
 		inputWidth,
+		isStyleSettable,
 		label,
 		onBorderChange,
 		onSliderChange,
@@ -73,21 +76,27 @@ const UnconnectedBorderControl = (
 			<HStack spacing={ 4 } className={ innerWrapperClassName }>
 				<UnitControl
 					prefix={
-						<BorderControlDropdown
-							border={ border }
-							colors={ colors }
-							__unstablePopoverProps={ __unstablePopoverProps }
-							disableCustomColors={ disableCustomColors }
-							enableAlpha={ enableAlpha }
-							enableStyle={ enableStyle }
-							onChange={ onBorderChange }
-							previousStyleSelection={ previousStyleSelection }
-							showDropdownHeader={ showDropdownHeader }
-							__experimentalIsRenderedInSidebar={
-								__experimentalIsRenderedInSidebar
-							}
-							size={ size }
-						/>
+						<Spacer marginRight={ 1 } marginBottom={ 0 }>
+							<BorderControlDropdown
+								border={ border }
+								colors={ colors }
+								__unstablePopoverProps={
+									__unstablePopoverProps
+								}
+								disableCustomColors={ disableCustomColors }
+								enableAlpha={ enableAlpha }
+								enableStyle={ enableStyle }
+								isStyleSettable={ isStyleSettable }
+								onChange={ onBorderChange }
+								previousStyleSelection={
+									previousStyleSelection
+								}
+								__experimentalIsRenderedInSidebar={
+									__experimentalIsRenderedInSidebar
+								}
+								size={ size }
+							/>
+						</Spacer>
 					}
 					label={ __( 'Border width' ) }
 					hideLabelFromVision
@@ -112,6 +121,7 @@ const UnconnectedBorderControl = (
 						step={ [ 'px', '%' ].includes( widthUnit ) ? 1 : 0.1 }
 						value={ widthValue || undefined }
 						withInputField={ false }
+						__next40pxDefaultSize={ __next40pxDefaultSize }
 					/>
 				) }
 			</HStack>
@@ -130,7 +140,7 @@ const UnconnectedBorderControl = (
  * a "shape" abstraction.
  *
  * ```jsx
- * import { __experimentalBorderControl as BorderControl } from '@wordpress/components';
+ * import { BorderControl } from '@wordpress/components';
  * import { __ } from '@wordpress/i18n';
  *
  * const colors = [
diff --git a/packages/components/src/border-control/border-control/hook.ts b/packages/components/src/border-control/border-control/hook.ts
index 63034527cfa1a8..676ff9ea2cc6ed 100644
--- a/packages/components/src/border-control/border-control/hook.ts
+++ b/packages/components/src/border-control/border-control/hook.ts
@@ -14,16 +14,12 @@ import { useCx } from '../../utils/hooks/use-cx';
 
 import type { Border, BorderControlProps } from '../types';
 
-const sanitizeBorder = ( border?: Border ) => {
-	const hasNoWidth = border?.width === undefined || border.width === '';
-	const hasNoColor = border?.color === undefined;
-
-	// If width and color are undefined, unset any style selection as well.
-	if ( hasNoWidth && hasNoColor ) {
-		return undefined;
-	}
-
-	return border;
+// If either width or color are defined, the border is considered valid
+// and a border style can be set as well.
+const isValidBorder = ( border?: Border ) => {
+	const hasWidth = border?.width !== undefined && border.width !== '';
+	const hasColor = border?.color !== undefined;
+	return hasWidth || hasColor;
 };
 
 export function useBorderControl(
@@ -41,9 +37,13 @@ export function useBorderControl(
 		value: border,
 		width,
 		__experimentalIsRenderedInSidebar = false,
+		__next40pxDefaultSize,
 		...otherProps
 	} = useContextSystem( props, 'BorderControl' );
 
+	const computedSize =
+		size === 'default' && __next40pxDefaultSize ? '__unstable-large' : size;
+
 	const [ widthValue, originalWidthUnit ] = parseQuantityAndUnitFromRawValue(
 		border?.width
 	);
@@ -53,12 +53,16 @@ export function useBorderControl(
 	const [ colorSelection, setColorSelection ] = useState< string >();
 	const [ styleSelection, setStyleSelection ] = useState< string >();
 
+	const isStyleSettable = shouldSanitizeBorder
+		? isValidBorder( border )
+		: true;
+
 	const onBorderChange = useCallback(
 		( newBorder?: Border ) => {
-			if ( shouldSanitizeBorder ) {
-				return onChange( sanitizeBorder( newBorder ) );
+			if ( shouldSanitizeBorder && ! isValidBorder( newBorder ) ) {
+				onChange( undefined );
+				return;
 			}
-
 			onChange( newBorder );
 		},
 		[ onChange, shouldSanitizeBorder ]
@@ -130,10 +134,10 @@ export function useBorderControl(
 	}
 	const innerWrapperClassName = useMemo( () => {
 		const widthStyle = !! wrapperWidth && styles.wrapperWidth;
-		const heightStyle = styles.wrapperHeight( size );
+		const heightStyle = styles.wrapperHeight( computedSize );
 
 		return cx( styles.innerWrapper(), widthStyle, heightStyle );
-	}, [ wrapperWidth, cx, size ] );
+	}, [ wrapperWidth, cx, computedSize ] );
 
 	const sliderClassName = useMemo( () => {
 		return cx( styles.borderSlider() );
@@ -147,6 +151,7 @@ export function useBorderControl(
 		enableStyle,
 		innerWrapperClassName,
 		inputWidth: wrapperWidth,
+		isStyleSettable,
 		onBorderChange,
 		onSliderChange,
 		onWidthChange,
@@ -155,7 +160,8 @@ export function useBorderControl(
 		value: border,
 		widthUnit,
 		widthValue,
-		size,
+		size: computedSize,
 		__experimentalIsRenderedInSidebar,
+		__next40pxDefaultSize,
 	};
 }
diff --git a/packages/components/src/border-control/stories/index.story.tsx b/packages/components/src/border-control/stories/index.story.tsx
index 9a5349d302c276..0756a18ac5c0e5 100644
--- a/packages/components/src/border-control/stories/index.story.tsx
+++ b/packages/components/src/border-control/stories/index.story.tsx
@@ -16,7 +16,7 @@ import { BorderControl } from '..';
 import type { Border } from '../types';
 
 const meta: Meta< typeof BorderControl > = {
-	title: 'Components (Experimental)/BorderControl',
+	title: 'Components/BorderControl',
 	component: BorderControl,
 	argTypes: {
 		onChange: {
@@ -93,6 +93,9 @@ export const Default = Template.bind( {} );
 Default.args = {
 	colors,
 	label: 'Border',
+	enableAlpha: true,
+	enableStyle: true,
+	shouldSanitizeBorder: true,
 };
 
 /**
@@ -133,12 +136,3 @@ WithMultipleOrigins.args = {
 	...Default.args,
 	colors: multipleOriginColors,
 };
-
-/**
- * Allow the alpha channel to be edited on each color.
- */
-export const WithAlphaEnabled = Template.bind( {} );
-WithAlphaEnabled.args = {
-	...Default.args,
-	enableAlpha: true,
-};
diff --git a/packages/components/src/border-control/styles.ts b/packages/components/src/border-control/styles.ts
index 322e9563d58a4d..a678b6f362308a 100644
--- a/packages/components/src/border-control/styles.ts
+++ b/packages/components/src/border-control/styles.ts
@@ -16,10 +16,6 @@ import {
 
 import type { Border } from './types';
 
-const labelStyles = css`
-	font-weight: 500;
-`;
-
 const focusBoxShadow = css`
 	box-shadow: inset ${ CONFIG.controlBoxShadowFocus };
 `;
@@ -59,18 +55,11 @@ export const wrapperHeight = ( size?: 'default' | '__unstable-large' ) => {
 	`;
 };
 
-export const borderControlDropdown = (
-	size?: 'default' | '__unstable-large'
-) => css`
+export const borderControlDropdown = css`
 	background: #fff;
 
 	&& > button {
-		/*
-		 * Override button component styles to fit within BorderControl
-		 * regardless of size.
-		 */
-		height: ${ size === '__unstable-large' ? '40px' : '30px' };
-		width: ${ size === '__unstable-large' ? '40px' : '30px' };
+		aspect-ratio: 1;
 		padding: 0;
 		display: flex;
 		align-items: center;
@@ -110,7 +99,7 @@ export const colorIndicatorWrapper = (
 	const { style } = border || {};
 
 	return css`
-		border-radius: 9999px;
+		border-radius: ${ CONFIG.radiusFull };
 		border: 2px solid transparent;
 		${ style ? colorIndicatorBorder( border ) : undefined }
 		width: ${ size === '__unstable-large' ? '24px' : '22px' };
@@ -147,7 +136,6 @@ export const borderControlPopoverControls = css`
 
 	> div:first-of-type > ${ StyledLabel } {
 		margin-bottom: 0;
-		${ labelStyles }
 	}
 
 	&& ${ StyledLabel } + button:not( .has-text ) {
@@ -168,22 +156,6 @@ export const resetButton = css`
 		border-top: ${ CONFIG.borderWidth } solid ${ COLORS.gray[ 400 ] };
 		border-top-left-radius: 0;
 		border-top-right-radius: 0;
-		height: 40px;
-	}
-`;
-
-export const borderControlStylePicker = css`
-	${ StyledLabel } {
-		${ labelStyles }
-	}
-`;
-
-export const borderStyleButton = css`
-	&&&&& {
-		min-width: 32px;
-		width: 32px;
-		height: 32px;
-		padding: 4px;
 	}
 `;
 
diff --git a/packages/components/src/border-control/test/index.js b/packages/components/src/border-control/test/index.js
index c41dce687cc522..000a89e14a40b3 100644
--- a/packages/components/src/border-control/test/index.js
+++ b/packages/components/src/border-control/test/index.js
@@ -148,19 +148,6 @@ describe( 'BorderControl', () => {
 			expect( resetButton ).toBeInTheDocument();
 		} );
 
-		it( 'should render color and style popover header', async () => {
-			const user = userEvent.setup();
-			const props = createProps( { showDropdownHeader: true } );
-			render( <BorderControl { ...props } /> );
-			await openPopover( user );
-
-			const headerLabel = screen.getByText( 'Border color' );
-			const closeButton = getButton( 'Close border color' );
-
-			expect( headerLabel ).toBeInTheDocument();
-			expect( closeButton ).toBeInTheDocument();
-		} );
-
 		it( 'should not render style options when opted out of', async () => {
 			const user = userEvent.setup();
 			const props = createProps( { enableStyle: false } );
@@ -346,10 +333,10 @@ describe( 'BorderControl', () => {
 
 		it( 'should take no action when color and style popover is closed', async () => {
 			const user = userEvent.setup();
-			const props = createProps( { showDropdownHeader: true } );
+			const props = createProps();
 			render( <BorderControl { ...props } /> );
 			await openPopover( user );
-			await user.click( getButton( 'Close border color' ) );
+			await user.keyboard( 'Escape' );
 
 			expect( props.onChange ).not.toHaveBeenCalled();
 		} );
diff --git a/packages/components/src/border-control/types.ts b/packages/components/src/border-control/types.ts
index 470b75df7c1829..8ab614907684d2 100644
--- a/packages/components/src/border-control/types.ts
+++ b/packages/components/src/border-control/types.ts
@@ -8,6 +8,7 @@ import type { CSSProperties } from 'react';
  */
 import type { ColorPaletteProps } from '../color-palette/types';
 import type { PopoverProps } from '../popover/types';
+import type { ToggleGroupControlProps } from '../toggle-group-control/types';
 
 export type Border = {
 	color?: CSSProperties[ 'borderColor' ];
@@ -17,12 +18,19 @@ export type Border = {
 
 export type ColorProps = Pick<
 	ColorPaletteProps,
-	'colors' | 'enableAlpha' | '__experimentalIsRenderedInSidebar'
+	'colors' | '__experimentalIsRenderedInSidebar'
 > & {
 	/**
 	 * This toggles the ability to choose custom colors.
 	 */
 	disableCustomColors?: boolean;
+	/**
+	 * This controls whether the alpha channel will be offered when selecting
+	 * custom colors.
+	 *
+	 * @default true
+	 */
+	enableAlpha?: boolean;
 };
 
 export type LabelProps = {
@@ -60,6 +68,10 @@ export type BorderControlProps = ColorProps &
 		 * interaction that selects or clears, border color, style, or width.
 		 */
 		onChange: ( value?: Border ) => void;
+		/**
+		 * Placeholder text for the number input.
+		 */
+		placeholder?: HTMLInputElement[ 'placeholder' ];
 		/**
 		 * An internal prop used to control the visibility of the dropdown.
 		 */
@@ -73,9 +85,8 @@ export type BorderControlProps = ColorProps &
 		 */
 		shouldSanitizeBorder?: boolean;
 		/**
-		 * Whether or not to show the header for the border color and style
-		 * picker dropdown. The header includes a label for the color picker
-		 * and a close button.
+		 * @deprecated This prop no longer has any effect.
+		 * @ignore
 		 */
 		showDropdownHeader?: boolean;
 		/**
@@ -99,6 +110,12 @@ export type BorderControlProps = ColorProps &
 		 * `RangeControl` for additional control over a border's width.
 		 */
 		withSlider?: boolean;
+		/**
+		 * Start opting into the larger default height that will become the default size in a future version.
+		 *
+		 * @default false
+		 */
+		__next40pxDefaultSize?: boolean;
 	};
 
 export type DropdownProps = ColorProps &
@@ -109,6 +126,10 @@ export type DropdownProps = ColorProps &
 		 * values for its popover controls.
 		 */
 		border?: Border;
+		/**
+		 * Whether a border style can be set, based on the border sanitization settings.
+		 */
+		isStyleSettable: boolean;
 		/**
 		 * An internal prop used to control the visibility of the dropdown.
 		 */
@@ -124,14 +145,16 @@ export type DropdownProps = ColorProps &
 		 */
 		previousStyleSelection?: string;
 		/**
-		 * Whether or not to render a header for the border color and style picker
-		 * dropdown. The header includes a label for the color picker and a
-		 * close button.
+		 * @deprecated This prop no longer has any effect.
+		 * @ignore
 		 */
 		showDropdownHeader?: boolean;
 	};
 
-export type StylePickerProps = LabelProps & {
+export type StylePickerProps = Omit<
+	ToggleGroupControlProps,
+	'value' | 'onChange' | 'children'
+> & {
 	/**
 	 * A callback function invoked when a border style is selected or cleared.
 	 */
diff --git a/packages/components/src/box-control/README.md b/packages/components/src/box-control/README.md
index 2fd214b79157f7..77176b49eeb6d8 100644
--- a/packages/components/src/box-control/README.md
+++ b/packages/components/src/box-control/README.md
@@ -1,18 +1,14 @@
 # BoxControl
 
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-
-BoxControl components let users set values for Top, Right, Bottom, and Left. This can be used as an input control for values like `padding` or `margin`.
+A control that lets users set values for top, right, bottom, and left. Can be used as an input control for values like `padding` or `margin`.
 
 ## Usage
 
 ```jsx
 import { useState } from 'react';
-import { __experimentalBoxControl as BoxControl } from '@wordpress/components';
+import { BoxControl } from '@wordpress/components';
 
-const Example = () => {
+function Example() {
 	const [ values, setValues ] = useState( {
 		top: '50px',
 		left: '10%',
@@ -26,23 +22,24 @@ const Example = () => {
 			onChange={ ( nextValues ) => setValues( nextValues ) }
 		/>
 	);
-};
+}
 ```
 
 ## Props
+
 ### `allowReset`: `boolean`
 
 If this property is true, a button to reset the box control is rendered.
 
-- Required: No
-- Default: `true`
+-   Required: No
+-   Default: `true`
 
 ### `splitOnAxis`: `boolean`
 
 If this property is true, when the box control is unlinked, vertical and horizontal controls can be used instead of updating individual sides.
 
-- Required: No
-- Default: `false`
+-   Required: No
+-   Default: `false`
 
 ### `inputProps`: `object`
 
@@ -100,3 +97,10 @@ A handler for onMouseOver events.
 A handler for onMouseOut events.
 
 -   Required: No
+
+### `__next40pxDefaultSize`: `boolean`
+
+Start opting into the larger default size that will become the default size in a future version.
+
+-   Required: No
+-   Default: `false`
diff --git a/packages/components/src/box-control/all-input-control.tsx b/packages/components/src/box-control/all-input-control.tsx
index b66e10fdb4ce3f..e9166ff7f692e8 100644
--- a/packages/components/src/box-control/all-input-control.tsx
+++ b/packages/components/src/box-control/all-input-control.tsx
@@ -1,42 +1,55 @@
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
 import type { UnitControlProps } from '../unit-control/types';
+import {
+	FlexedRangeControl,
+	StyledUnitControl,
+} from './styles/box-control-styles';
 import type { BoxControlInputControlProps } from './types';
-import UnitControl from './unit-control';
+import { parseQuantityAndUnitFromRawValue } from '../unit-control';
 import {
 	LABELS,
 	applyValueToSides,
 	getAllValue,
 	isValuesMixed,
 	isValuesDefined,
+	CUSTOM_VALUE_SETTINGS,
 } from './utils';
 
 const noop = () => {};
 
 export default function AllInputControl( {
+	__next40pxDefaultSize,
 	onChange = noop,
 	onFocus = noop,
-	onHoverOn = noop,
-	onHoverOff = noop,
 	values,
 	sides,
 	selectedUnits,
 	setSelectedUnits,
 	...props
 }: BoxControlInputControlProps ) {
+	const inputId = useInstanceId( AllInputControl, 'box-control-input-all' );
+
 	const allValue = getAllValue( values, selectedUnits, sides );
 	const hasValues = isValuesDefined( values );
 	const isMixed = hasValues && isValuesMixed( values, selectedUnits, sides );
 	const allPlaceholder = isMixed ? LABELS.mixed : undefined;
 
+	const [ parsedQuantity, parsedUnit ] =
+		parseQuantityAndUnitFromRawValue( allValue );
+
 	const handleOnFocus: React.FocusEventHandler< HTMLInputElement > = (
 		event
 	) => {
 		onFocus( event, { side: 'all' } );
 	};
 
-	const handleOnChange: UnitControlProps[ 'onChange' ] = ( next ) => {
+	const onValueChange = ( next?: string ) => {
 		const isNumeric = next !== undefined && ! isNaN( parseFloat( next ) );
 		const nextValue = isNumeric ? next : undefined;
 		const nextValues = applyValueToSides( values, nextValue, sides );
@@ -44,6 +57,12 @@ export default function AllInputControl( {
 		onChange( nextValues );
 	};
 
+	const sliderOnChange = ( next?: number ) => {
+		onValueChange(
+			next !== undefined ? [ next, parsedUnit ].join( '' ) : undefined
+		);
+	};
+
 	// Set selected unit so it can be used as fallback by unlinked controls
 	// when individual sides do not have a value containing a unit.
 	const handleOnUnitChange: UnitControlProps[ 'onUnitChange' ] = ( unit ) => {
@@ -51,36 +70,39 @@ export default function AllInputControl( {
 		setSelectedUnits( newUnits );
 	};
 
-	const handleOnHoverOn = () => {
-		onHoverOn( {
-			top: true,
-			bottom: true,
-			left: true,
-			right: true,
-		} );
-	};
-
-	const handleOnHoverOff = () => {
-		onHoverOff( {
-			top: false,
-			bottom: false,
-			left: false,
-			right: false,
-		} );
-	};
-
 	return (
-		<UnitControl
-			{ ...props }
-			disableUnits={ isMixed }
-			isOnly
-			value={ allValue }
-			onChange={ handleOnChange }
-			onUnitChange={ handleOnUnitChange }
-			onFocus={ handleOnFocus }
-			onHoverOn={ handleOnHoverOn }
-			onHoverOff={ handleOnHoverOff }
-			placeholder={ allPlaceholder }
-		/>
+		<>
+			<StyledUnitControl
+				{ ...props }
+				__next40pxDefaultSize={ __next40pxDefaultSize }
+				className="component-box-control__unit-control"
+				disableUnits={ isMixed }
+				id={ inputId }
+				isPressEnterToChange
+				value={ allValue }
+				onChange={ onValueChange }
+				onUnitChange={ handleOnUnitChange }
+				onFocus={ handleOnFocus }
+				placeholder={ allPlaceholder }
+				label={ LABELS.all }
+				hideLabelFromVision
+			/>
+
+			<FlexedRangeControl
+				__nextHasNoMarginBottom
+				__next40pxDefaultSize={ __next40pxDefaultSize }
+				aria-controls={ inputId }
+				label={ LABELS.all }
+				hideLabelFromVision
+				onChange={ sliderOnChange }
+				min={ 0 }
+				max={ CUSTOM_VALUE_SETTINGS[ parsedUnit ?? 'px' ]?.max ?? 10 }
+				step={
+					CUSTOM_VALUE_SETTINGS[ parsedUnit ?? 'px' ]?.step ?? 0.1
+				}
+				value={ parsedQuantity ?? 0 }
+				withInputField={ false }
+			/>
+		</>
 	);
 }
diff --git a/packages/components/src/box-control/axial-input-controls.tsx b/packages/components/src/box-control/axial-input-controls.tsx
index bc8a4bd420bbd2..c6c0181f6c871c 100644
--- a/packages/components/src/box-control/axial-input-controls.tsx
+++ b/packages/components/src/box-control/axial-input-controls.tsx
@@ -1,26 +1,39 @@
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
 import { parseQuantityAndUnitFromRawValue } from '../unit-control/utils';
-import UnitControl from './unit-control';
-import { LABELS } from './utils';
-import { Layout } from './styles/box-control-styles';
+import Tooltip from '../tooltip';
+import { CUSTOM_VALUE_SETTINGS, LABELS } from './utils';
+import {
+	FlexedBoxControlIcon,
+	FlexedRangeControl,
+	InputWrapper,
+	StyledUnitControl,
+} from './styles/box-control-styles';
 import type { BoxControlInputControlProps } from './types';
 
 const groupedSides = [ 'vertical', 'horizontal' ] as const;
 type GroupedSide = ( typeof groupedSides )[ number ];
 
 export default function AxialInputControls( {
+	__next40pxDefaultSize,
 	onChange,
 	onFocus,
-	onHoverOn,
-	onHoverOff,
 	values,
 	selectedUnits,
 	setSelectedUnits,
 	sides,
 	...props
 }: BoxControlInputControlProps ) {
+	const generatedId = useInstanceId(
+		AxialInputControls,
+		`box-control-input`
+	);
+
 	const createHandleOnFocus =
 		( side: GroupedSide ) =>
 		( event: React.FocusEvent< HTMLInputElement > ) => {
@@ -30,43 +43,7 @@ export default function AxialInputControls( {
 			onFocus( event, { side } );
 		};
 
-	const createHandleOnHoverOn = ( side: GroupedSide ) => () => {
-		if ( ! onHoverOn ) {
-			return;
-		}
-		if ( side === 'vertical' ) {
-			onHoverOn( {
-				top: true,
-				bottom: true,
-			} );
-		}
-		if ( side === 'horizontal' ) {
-			onHoverOn( {
-				left: true,
-				right: true,
-			} );
-		}
-	};
-
-	const createHandleOnHoverOff = ( side: GroupedSide ) => () => {
-		if ( ! onHoverOff ) {
-			return;
-		}
-		if ( side === 'vertical' ) {
-			onHoverOff( {
-				top: false,
-				bottom: false,
-			} );
-		}
-		if ( side === 'horizontal' ) {
-			onHoverOff( {
-				left: false,
-				right: false,
-			} );
-		}
-	};
-
-	const createHandleOnChange = ( side: GroupedSide ) => ( next?: string ) => {
+	const handleOnValueChange = ( side: GroupedSide, next?: string ) => {
 		if ( ! onChange ) {
 			return;
 		}
@@ -109,16 +86,8 @@ export default function AxialInputControls( {
 		? groupedSides.filter( ( side ) => sides.includes( side ) )
 		: groupedSides;
 
-	const first = filteredSides[ 0 ];
-	const last = filteredSides[ filteredSides.length - 1 ];
-	const only = first === last && first;
-
 	return (
-		<Layout
-			gap={ 0 }
-			align="top"
-			className="component-box-control__vertical-horizontal-input-controls"
-		>
+		<>
 			{ filteredSides.map( ( side ) => {
 				const [ parsedQuantity, parsedUnit ] =
 					parseQuantityAndUnitFromRawValue(
@@ -128,26 +97,67 @@ export default function AxialInputControls( {
 					side === 'vertical'
 						? selectedUnits.top
 						: selectedUnits.left;
+
+				const inputId = [ generatedId, side ].join( '-' );
+
 				return (
-					<UnitControl
-						{ ...props }
-						isFirst={ first === side }
-						isLast={ last === side }
-						isOnly={ only === side }
-						value={ [
-							parsedQuantity,
-							selectedUnit ?? parsedUnit,
-						].join( '' ) }
-						onChange={ createHandleOnChange( side ) }
-						onUnitChange={ createHandleOnUnitChange( side ) }
-						onFocus={ createHandleOnFocus( side ) }
-						onHoverOn={ createHandleOnHoverOn( side ) }
-						onHoverOff={ createHandleOnHoverOff( side ) }
-						label={ LABELS[ side ] }
-						key={ side }
-					/>
+					<InputWrapper key={ side }>
+						<FlexedBoxControlIcon side={ side } sides={ sides } />
+						<Tooltip placement="top-end" text={ LABELS[ side ] }>
+							<StyledUnitControl
+								{ ...props }
+								__next40pxDefaultSize={ __next40pxDefaultSize }
+								className="component-box-control__unit-control"
+								id={ inputId }
+								isPressEnterToChange
+								value={ [
+									parsedQuantity,
+									selectedUnit ?? parsedUnit,
+								].join( '' ) }
+								onChange={ ( newValue ) =>
+									handleOnValueChange( side, newValue )
+								}
+								onUnitChange={ createHandleOnUnitChange(
+									side
+								) }
+								onFocus={ createHandleOnFocus( side ) }
+								label={ LABELS[ side ] }
+								hideLabelFromVision
+								key={ side }
+							/>
+						</Tooltip>
+						<FlexedRangeControl
+							__nextHasNoMarginBottom
+							__next40pxDefaultSize={ __next40pxDefaultSize }
+							aria-controls={ inputId }
+							label={ LABELS[ side ] }
+							hideLabelFromVision
+							onChange={ ( newValue ) =>
+								handleOnValueChange(
+									side,
+									newValue !== undefined
+										? [
+												newValue,
+												selectedUnit ?? parsedUnit,
+										  ].join( '' )
+										: undefined
+								)
+							}
+							min={ 0 }
+							max={
+								CUSTOM_VALUE_SETTINGS[ selectedUnit ?? 'px' ]
+									?.max ?? 10
+							}
+							step={
+								CUSTOM_VALUE_SETTINGS[ selectedUnit ?? 'px' ]
+									?.step ?? 0.1
+							}
+							value={ parsedQuantity ?? 0 }
+							withInputField={ false }
+						/>
+					</InputWrapper>
 				);
 			} ) }
-		</Layout>
+		</>
 	);
 }
diff --git a/packages/components/src/box-control/index.tsx b/packages/components/src/box-control/index.tsx
index cf267aff44352e..41e95aa88bea37 100644
--- a/packages/components/src/box-control/index.tsx
+++ b/packages/components/src/box-control/index.tsx
@@ -9,17 +9,16 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { BaseControl } from '../base-control';
-import Button from '../button';
-import { FlexItem, FlexBlock } from '../flex';
 import AllInputControl from './all-input-control';
 import InputControls from './input-controls';
 import AxialInputControls from './axial-input-controls';
-import BoxControlIcon from './icon';
 import LinkedButton from './linked-button';
+import { Grid } from '../grid';
 import {
-	Root,
-	Header,
-	HeaderControlWrapper,
+	FlexedBoxControlIcon,
+	InputWrapper,
+	ResetButton,
+	LinkedButtonWrapper,
 } from './styles/box-control-styles';
 import { parseQuantityAndUnitFromRawValue } from '../unit-control/utils';
 import {
@@ -48,14 +47,14 @@ function useUniqueId( idProp?: string ) {
 }
 
 /**
- * BoxControl components let users set values for Top, Right, Bottom, and Left.
- * This can be used as an input control for values like `padding` or `margin`.
+ * A control that lets users set values for top, right, bottom, and left. Can be
+ * used as an input control for values like `padding` or `margin`.
  *
  * ```jsx
- * import { __experimentalBoxControl as BoxControl } from '@wordpress/components';
+ * import { BoxControl } from '@wordpress/components';
  * import { useState } from '@wordpress/element';
  *
- * const Example = () => {
+ * function Example() {
  * 	const [ values, setValues ] = useState( {
  * 		top: '50px',
  * 		left: '10%',
@@ -73,6 +72,7 @@ function useUniqueId( idProp?: string ) {
  * ```
  */
 function BoxControl( {
+	__next40pxDefaultSize = false,
 	id: idProp,
 	inputProps = defaultInputProps,
 	onChange = noop,
@@ -152,60 +152,53 @@ function BoxControl( {
 		values: inputValues,
 		onMouseOver,
 		onMouseOut,
+		__next40pxDefaultSize,
 	};
 
 	return (
-		<Root id={ id } role="group" aria-labelledby={ headingId }>
-			<Header className="component-box-control__header">
-				<FlexItem>
-					<BaseControl.VisualLabel id={ headingId }>
-						{ label }
-					</BaseControl.VisualLabel>
-				</FlexItem>
-				{ allowReset && (
-					<FlexItem>
-						<Button
-							className="component-box-control__reset-button"
-							variant="secondary"
-							isSmall
-							onClick={ handleOnReset }
-							disabled={ ! isDirty }
-						>
-							{ __( 'Reset' ) }
-						</Button>
-					</FlexItem>
-				) }
-			</Header>
-			<HeaderControlWrapper className="component-box-control__header-control-wrapper">
-				<FlexItem>
-					<BoxControlIcon side={ side } sides={ sides } />
-				</FlexItem>
-				{ isLinked && (
-					<FlexBlock>
-						<AllInputControl
-							aria-label={ label }
-							{ ...inputControlProps }
-						/>
-					</FlexBlock>
-				) }
-				{ ! isLinked && splitOnAxis && (
-					<FlexBlock>
-						<AxialInputControls { ...inputControlProps } />
-					</FlexBlock>
-				) }
-				{ ! hasOneSide && (
-					<FlexItem>
-						<LinkedButton
-							onClick={ toggleLinked }
-							isLinked={ isLinked }
-						/>
-					</FlexItem>
-				) }
-			</HeaderControlWrapper>
+		<Grid
+			id={ id }
+			columns={ 3 }
+			templateColumns="1fr min-content min-content"
+			role="group"
+			aria-labelledby={ headingId }
+		>
+			<BaseControl.VisualLabel id={ headingId }>
+				{ label }
+			</BaseControl.VisualLabel>
+			{ isLinked && (
+				<InputWrapper>
+					<FlexedBoxControlIcon side={ side } sides={ sides } />
+					<AllInputControl { ...inputControlProps } />
+				</InputWrapper>
+			) }
+			{ ! hasOneSide && (
+				<LinkedButtonWrapper>
+					<LinkedButton
+						onClick={ toggleLinked }
+						isLinked={ isLinked }
+					/>
+				</LinkedButtonWrapper>
+			) }
+
+			{ ! isLinked && splitOnAxis && (
+				<AxialInputControls { ...inputControlProps } />
+			) }
 			{ ! isLinked && ! splitOnAxis && (
 				<InputControls { ...inputControlProps } />
 			) }
-		</Root>
+			{ allowReset && (
+				<ResetButton
+					className="component-box-control__reset-button"
+					variant="secondary"
+					size="small"
+					onClick={ handleOnReset }
+					disabled={ ! isDirty }
+				>
+					{ __( 'Reset' ) }
+				</ResetButton>
+			) }
+		</Grid>
 	);
 }
 
diff --git a/packages/components/src/box-control/input-controls.tsx b/packages/components/src/box-control/input-controls.tsx
index f72179f0d18c10..553f547abf9b0d 100644
--- a/packages/components/src/box-control/input-controls.tsx
+++ b/packages/components/src/box-control/input-controls.tsx
@@ -1,82 +1,82 @@
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
-import UnitControl from './unit-control';
+import Tooltip from '../tooltip';
 import { parseQuantityAndUnitFromRawValue } from '../unit-control/utils';
-import { ALL_SIDES, LABELS } from './utils';
-import { LayoutContainer, Layout } from './styles/box-control-styles';
+import { ALL_SIDES, CUSTOM_VALUE_SETTINGS, LABELS } from './utils';
+import {
+	FlexedBoxControlIcon,
+	FlexedRangeControl,
+	InputWrapper,
+	StyledUnitControl,
+} from './styles/box-control-styles';
 import type { BoxControlInputControlProps, BoxControlValue } from './types';
-import type { UnitControlProps } from '../unit-control/types';
 
 const noop = () => {};
 
 export default function BoxInputControls( {
+	__next40pxDefaultSize,
 	onChange = noop,
 	onFocus = noop,
-	onHoverOn = noop,
-	onHoverOff = noop,
 	values,
 	selectedUnits,
 	setSelectedUnits,
 	sides,
 	...props
 }: BoxControlInputControlProps ) {
+	const generatedId = useInstanceId( BoxInputControls, 'box-control-input' );
+
 	const createHandleOnFocus =
 		( side: keyof BoxControlValue ) =>
 		( event: React.FocusEvent< HTMLInputElement > ) => {
 			onFocus( event, { side } );
 		};
 
-	const createHandleOnHoverOn = ( side: keyof BoxControlValue ) => () => {
-		onHoverOn( { [ side ]: true } );
-	};
-
-	const createHandleOnHoverOff = ( side: keyof BoxControlValue ) => () => {
-		onHoverOff( { [ side ]: false } );
-	};
-
 	const handleOnChange = ( nextValues: BoxControlValue ) => {
 		onChange( nextValues );
 	};
 
-	const createHandleOnChange: (
-		side: keyof BoxControlValue
-	) => UnitControlProps[ 'onChange' ] =
-		( side ) =>
-		( next, { event } ) => {
-			const nextValues = { ...values };
-			const isNumeric =
-				next !== undefined && ! isNaN( parseFloat( next ) );
-			const nextValue = isNumeric ? next : undefined;
+	const handleOnValueChange = (
+		side: keyof BoxControlValue,
+		next?: string,
+		extra?: { event: React.SyntheticEvent< Element, Event > }
+	) => {
+		const nextValues = { ...values };
+		const isNumeric = next !== undefined && ! isNaN( parseFloat( next ) );
+		const nextValue = isNumeric ? next : undefined;
 
-			nextValues[ side ] = nextValue;
+		nextValues[ side ] = nextValue;
 
-			/**
-			 * Supports changing pair sides. For example, holding the ALT key
-			 * when changing the TOP will also update BOTTOM.
-			 */
-			// @ts-expect-error - TODO: event.altKey is only present when the change event was
-			// triggered by a keyboard event. Should this feature be implemented differently so
-			// it also works with drag events?
-			if ( event.altKey ) {
-				switch ( side ) {
-					case 'top':
-						nextValues.bottom = nextValue;
-						break;
-					case 'bottom':
-						nextValues.top = nextValue;
-						break;
-					case 'left':
-						nextValues.right = nextValue;
-						break;
-					case 'right':
-						nextValues.left = nextValue;
-						break;
-				}
+		/**
+		 * Supports changing pair sides. For example, holding the ALT key
+		 * when changing the TOP will also update BOTTOM.
+		 */
+		// @ts-expect-error - TODO: event.altKey is only present when the change event was
+		// triggered by a keyboard event. Should this feature be implemented differently so
+		// it also works with drag events?
+		if ( extra?.event.altKey ) {
+			switch ( side ) {
+				case 'top':
+					nextValues.bottom = nextValue;
+					break;
+				case 'bottom':
+					nextValues.top = nextValue;
+					break;
+				case 'left':
+					nextValues.right = nextValue;
+					break;
+				case 'right':
+					nextValues.left = nextValue;
+					break;
 			}
+		}
 
-			handleOnChange( nextValues );
-		};
+		handleOnChange( nextValues );
+	};
 
 	const createHandleOnUnitChange =
 		( side: keyof BoxControlValue ) => ( next?: string ) => {
@@ -90,45 +90,76 @@ export default function BoxInputControls( {
 		? ALL_SIDES.filter( ( side ) => sides.includes( side ) )
 		: ALL_SIDES;
 
-	const first = filteredSides[ 0 ];
-	const last = filteredSides[ filteredSides.length - 1 ];
-	const only = first === last && first;
-
 	return (
-		<LayoutContainer className="component-box-control__input-controls-wrapper">
-			<Layout
-				gap={ 0 }
-				align="top"
-				className="component-box-control__input-controls"
-			>
-				{ filteredSides.map( ( side ) => {
-					const [ parsedQuantity, parsedUnit ] =
-						parseQuantityAndUnitFromRawValue( values[ side ] );
+		<>
+			{ filteredSides.map( ( side ) => {
+				const [ parsedQuantity, parsedUnit ] =
+					parseQuantityAndUnitFromRawValue( values[ side ] );
+
+				const computedUnit = values[ side ]
+					? parsedUnit
+					: selectedUnits[ side ];
+
+				const inputId = [ generatedId, side ].join( '-' );
 
-					const computedUnit = values[ side ]
-						? parsedUnit
-						: selectedUnits[ side ];
+				return (
+					<InputWrapper key={ `box-control-${ side }` } expanded>
+						<FlexedBoxControlIcon side={ side } sides={ sides } />
+						<Tooltip placement="top-end" text={ LABELS[ side ] }>
+							<StyledUnitControl
+								{ ...props }
+								__next40pxDefaultSize={ __next40pxDefaultSize }
+								className="component-box-control__unit-control"
+								id={ inputId }
+								isPressEnterToChange
+								value={ [ parsedQuantity, computedUnit ].join(
+									''
+								) }
+								onChange={ ( nextValue, extra ) =>
+									handleOnValueChange(
+										side,
+										nextValue,
+										extra
+									)
+								}
+								onUnitChange={ createHandleOnUnitChange(
+									side
+								) }
+								onFocus={ createHandleOnFocus( side ) }
+								label={ LABELS[ side ] }
+								hideLabelFromVision
+							/>
+						</Tooltip>
 
-					return (
-						<UnitControl
-							{ ...props }
-							isFirst={ first === side }
-							isLast={ last === side }
-							isOnly={ only === side }
-							value={ [ parsedQuantity, computedUnit ].join(
-								''
-							) }
-							onChange={ createHandleOnChange( side ) }
-							onUnitChange={ createHandleOnUnitChange( side ) }
-							onFocus={ createHandleOnFocus( side ) }
-							onHoverOn={ createHandleOnHoverOn( side ) }
-							onHoverOff={ createHandleOnHoverOff( side ) }
+						<FlexedRangeControl
+							__nextHasNoMarginBottom
+							__next40pxDefaultSize={ __next40pxDefaultSize }
+							aria-controls={ inputId }
 							label={ LABELS[ side ] }
-							key={ `box-control-${ side }` }
+							hideLabelFromVision
+							onChange={ ( newValue ) => {
+								handleOnValueChange(
+									side,
+									newValue !== undefined
+										? [ newValue, computedUnit ].join( '' )
+										: undefined
+								);
+							} }
+							min={ 0 }
+							max={
+								CUSTOM_VALUE_SETTINGS[ computedUnit ?? 'px' ]
+									?.max ?? 10
+							}
+							step={
+								CUSTOM_VALUE_SETTINGS[ computedUnit ?? 'px' ]
+									?.step ?? 0.1
+							}
+							value={ parsedQuantity ?? 0 }
+							withInputField={ false }
 						/>
-					);
-				} ) }
-			</Layout>
-		</LayoutContainer>
+					</InputWrapper>
+				);
+			} ) }
+		</>
 	);
 }
diff --git a/packages/components/src/box-control/linked-button.tsx b/packages/components/src/box-control/linked-button.tsx
index 600261379d5675..595a3c03436756 100644
--- a/packages/components/src/box-control/linked-button.tsx
+++ b/packages/components/src/box-control/linked-button.tsx
@@ -21,7 +21,7 @@ export default function LinkedButton( {
 			<Button
 				{ ...props }
 				className="component-box-control__linked-button"
-				isSmall
+				size="small"
 				icon={ isLinked ? link : linkOff }
 				iconSize={ 24 }
 				aria-label={ label }
diff --git a/packages/components/src/box-control/stories/index.story.tsx b/packages/components/src/box-control/stories/index.story.tsx
index 1b6604048f6d52..783f9d047b1bb0 100644
--- a/packages/components/src/box-control/stories/index.story.tsx
+++ b/packages/components/src/box-control/stories/index.story.tsx
@@ -14,7 +14,7 @@ import { useState } from '@wordpress/element';
 import BoxControl from '../';
 
 const meta: Meta< typeof BoxControl > = {
-	title: 'Components (Experimental)/BoxControl',
+	title: 'Components/BoxControl',
 	component: BoxControl,
 	argTypes: {
 		values: { control: { type: null } },
diff --git a/packages/components/src/box-control/styles/box-control-styles.ts b/packages/components/src/box-control/styles/box-control-styles.ts
index d961d4322ba5ac..ce2c8aa227e586 100644
--- a/packages/components/src/box-control/styles/box-control-styles.ts
+++ b/packages/components/src/box-control/styles/box-control-styles.ts
@@ -1,80 +1,40 @@
 /**
  * External dependencies
  */
-import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 /**
  * Internal dependencies
  */
-import { Flex } from '../../flex';
-import BaseUnitControl from '../../unit-control';
-import { rtl } from '../../utils';
-import type { BoxUnitControlProps } from '../types';
-
-export const Root = styled.div`
-	box-sizing: border-box;
-	max-width: 235px;
-	padding-bottom: 12px;
-	width: 100%;
+import BoxControlIcon from '../icon';
+import Button from '../../button';
+import { HStack } from '../../h-stack';
+import RangeControl from '../../range-control';
+import UnitControl from '../../unit-control';
+import { space } from '../../utils/space';
+
+export const StyledUnitControl = styled( UnitControl )`
+	max-width: 90px;
 `;
 
-export const Header = styled( Flex )`
-	margin-bottom: 8px;
+export const InputWrapper = styled( HStack )`
+	grid-column: 1 / span 3;
 `;
 
-export const HeaderControlWrapper = styled( Flex )`
-	min-height: 30px;
-	gap: 0;
+export const ResetButton = styled( Button )`
+	grid-area: 1 / 2;
+	justify-self: end;
 `;
 
-export const UnitControlWrapper = styled.div`
-	box-sizing: border-box;
-	max-width: 80px;
+export const LinkedButtonWrapper = styled.div`
+	grid-area: 1 / 3;
+	justify-self: end;
 `;
 
-export const LayoutContainer = styled( Flex )`
-	justify-content: center;
-	padding-top: 8px;
+export const FlexedBoxControlIcon = styled( BoxControlIcon )`
+	flex: 0 0 auto;
 `;
 
-export const Layout = styled( Flex )`
-	position: relative;
-	height: 100%;
+export const FlexedRangeControl = styled( RangeControl )`
 	width: 100%;
-	justify-content: flex-start;
-`;
-
-const unitControlBorderRadiusStyles = ( {
-	isFirst,
-	isLast,
-	isOnly,
-}: Pick< BoxUnitControlProps, 'isFirst' | 'isLast' | 'isOnly' > ) => {
-	if ( isFirst ) {
-		return rtl( { borderTopRightRadius: 0, borderBottomRightRadius: 0 } )();
-	}
-	if ( isLast ) {
-		return rtl( { borderTopLeftRadius: 0, borderBottomLeftRadius: 0 } )();
-	}
-	if ( isOnly ) {
-		return css( { borderRadius: 2 } );
-	}
-
-	return css( {
-		borderRadius: 0,
-	} );
-};
-
-const unitControlMarginStyles = ( {
-	isFirst,
-	isOnly,
-}: Pick< BoxUnitControlProps, 'isFirst' | 'isOnly' > ) => {
-	const marginLeft = isFirst || isOnly ? 0 : -1;
-
-	return rtl( { marginLeft } )();
-};
-
-export const UnitControl = styled( BaseUnitControl )`
-	max-width: 60px;
-	${ unitControlBorderRadiusStyles };
-	${ unitControlMarginStyles };
+	margin-inline-end: ${ space( 2 ) };
 `;
diff --git a/packages/components/src/box-control/styles/box-control-visualizer-styles.ts b/packages/components/src/box-control/styles/box-control-visualizer-styles.ts
deleted file mode 100644
index bbfe66c9a71e98..00000000000000
--- a/packages/components/src/box-control/styles/box-control-visualizer-styles.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * External dependencies
- */
-import { css } from '@emotion/react';
-import styled from '@emotion/styled';
-
-/**
- * Internal dependencies
- */
-import { COLORS, rtl } from '../../utils';
-
-const containerPositionStyles = ( {
-	isPositionAbsolute,
-}: {
-	isPositionAbsolute: boolean;
-} ) => {
-	if ( ! isPositionAbsolute ) return '';
-
-	return css`
-		bottom: 0;
-		left: 0;
-		pointer-events: none;
-		position: absolute;
-		right: 0;
-		top: 0;
-		z-index: 1;
-	`;
-};
-
-export const Container = styled.div`
-	box-sizing: border-box;
-	position: relative;
-	${ containerPositionStyles };
-`;
-
-export const Side = styled.div`
-	box-sizing: border-box;
-	background: ${ COLORS.theme.accent };
-	filter: brightness( 1 );
-	opacity: 0;
-	position: absolute;
-	pointer-events: none;
-	transition: opacity 120ms linear;
-	z-index: 1;
-
-	${ ( { isActive }: { isActive: boolean } ) =>
-		isActive &&
-		`
-		opacity: 0.3;
-	` }
-`;
-
-export const TopView = styled( Side )`
-	top: 0;
-	left: 0;
-	right: 0;
-`;
-
-export const RightView = styled( Side )`
-	top: 0;
-	bottom: 0;
-	${ rtl( { right: 0 } ) };
-`;
-
-export const BottomView = styled( Side )`
-	bottom: 0;
-	left: 0;
-	right: 0;
-`;
-
-export const LeftView = styled( Side )`
-	top: 0;
-	bottom: 0;
-	${ rtl( { left: 0 } ) };
-`;
diff --git a/packages/components/src/box-control/test/index.tsx b/packages/components/src/box-control/test/index.tsx
index 8a861eff37e1b2..681e7721d0c13a 100644
--- a/packages/components/src/box-control/test/index.tsx
+++ b/packages/components/src/box-control/test/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 /**
@@ -33,7 +33,10 @@ describe( 'BoxControl', () => {
 			render( <BoxControl onChange={ () => {} } /> );
 
 			expect(
-				screen.getByRole( 'textbox', { name: 'Box Control' } )
+				screen.getByRole( 'group', { name: 'Box Control' } )
+			).toBeVisible();
+			expect(
+				screen.getByRole( 'textbox', { name: 'All sides' } )
 			).toBeVisible();
 		} );
 
@@ -42,15 +45,63 @@ describe( 'BoxControl', () => {
 
 			render( <BoxControl onChange={ () => {} } /> );
 
-			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
-			} );
+			const input = screen.getByRole( 'textbox', { name: 'All sides' } );
 
 			await user.type( input, '100' );
 			await user.keyboard( '{Enter}' );
 
 			expect( input ).toHaveValue( '100' );
 		} );
+
+		it( 'should update input values when interacting with slider', () => {
+			render( <BoxControl onChange={ () => {} } /> );
+
+			const slider = screen.getByRole( 'slider' );
+
+			fireEvent.change( slider, { target: { value: 50 } } );
+
+			expect( slider ).toHaveValue( '50' );
+			expect(
+				screen.getByRole( 'textbox', { name: 'All sides' } )
+			).toHaveValue( '50' );
+		} );
+
+		it( 'should update slider values when interacting with input', async () => {
+			const user = userEvent.setup();
+			render( <BoxControl onChange={ () => {} } /> );
+
+			const input = screen.getByRole( 'textbox', {
+				name: 'All sides',
+			} );
+
+			await user.type( input, '50' );
+			await user.keyboard( '{Enter}' );
+
+			expect( input ).toHaveValue( '50' );
+			expect( screen.getByRole( 'slider' ) ).toHaveValue( '50' );
+		} );
+
+		it( 'should render the number input with a default min value of 0', () => {
+			render( <BoxControl onChange={ () => {} } /> );
+
+			const input = screen.getByRole( 'textbox', { name: 'All sides' } );
+
+			expect( input ).toHaveAttribute( 'min', '0' );
+		} );
+
+		it( 'should pass down `inputProps` to the underlying number input', () => {
+			render(
+				<BoxControl
+					onChange={ () => {} }
+					inputProps={ { min: 10, max: 50 } }
+				/>
+			);
+
+			const input = screen.getByRole( 'textbox', { name: 'All sides' } );
+
+			expect( input ).toHaveAttribute( 'min', '10' );
+			expect( input ).toHaveAttribute( 'max', '50' );
+		} );
 	} );
 
 	describe( 'Reset', () => {
@@ -60,7 +111,7 @@ describe( 'BoxControl', () => {
 			render( <BoxControl onChange={ () => {} } /> );
 
 			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 
 			await user.type( input, '100' );
@@ -79,7 +130,7 @@ describe( 'BoxControl', () => {
 			render( <Example /> );
 
 			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 
 			await user.type( input, '100' );
@@ -98,7 +149,7 @@ describe( 'BoxControl', () => {
 			render( <Example /> );
 
 			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 
 			await user.type( input, '100' );
@@ -118,7 +169,7 @@ describe( 'BoxControl', () => {
 			render( <BoxControl onChange={ ( v ) => spyChange( v ) } /> );
 
 			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 
 			await user.type( input, '100' );
@@ -152,21 +203,49 @@ describe( 'BoxControl', () => {
 			);
 
 			await user.type(
-				screen.getByRole( 'textbox', { name: 'Top' } ),
+				screen.getByRole( 'textbox', { name: 'Top side' } ),
 				'100'
 			);
 
 			expect(
-				screen.getByRole( 'textbox', { name: 'Top' } )
+				screen.getByRole( 'textbox', { name: 'Top side' } )
 			).toHaveValue( '100' );
 			expect(
-				screen.getByRole( 'textbox', { name: 'Right' } )
+				screen.getByRole( 'textbox', { name: 'Right side' } )
 			).not.toHaveValue();
 			expect(
-				screen.getByRole( 'textbox', { name: 'Bottom' } )
+				screen.getByRole( 'textbox', { name: 'Bottom side' } )
 			).not.toHaveValue();
 			expect(
-				screen.getByRole( 'textbox', { name: 'Left' } )
+				screen.getByRole( 'textbox', { name: 'Left side' } )
+			).not.toHaveValue();
+		} );
+
+		it( 'should update a single side value when using slider unlinked', async () => {
+			const user = userEvent.setup();
+
+			render( <Example /> );
+
+			await user.click(
+				screen.getByRole( 'button', { name: 'Unlink sides' } )
+			);
+
+			const slider = screen.getByRole( 'slider', { name: 'Right side' } );
+
+			fireEvent.change( slider, { target: { value: 50 } } );
+
+			expect( slider ).toHaveValue( '50' );
+			expect(
+				screen.getByRole( 'textbox', { name: 'Top side' } )
+			).not.toHaveValue();
+			expect(
+				screen.getByRole( 'textbox', { name: 'Right side' } )
+			).toHaveValue( '50' );
+			expect(
+				screen.getByRole( 'textbox', { name: 'Bottom side' } )
+			).not.toHaveValue();
+			expect(
+				screen.getByRole( 'textbox', { name: 'Left side' } )
 			).not.toHaveValue();
 		} );
 
@@ -181,18 +260,69 @@ describe( 'BoxControl', () => {
 
 			await user.type(
 				screen.getByRole( 'textbox', {
-					name: 'Vertical',
+					name: 'Top and bottom sides',
 				} ),
 				'100'
 			);
 
 			expect(
-				screen.getByRole( 'textbox', { name: 'Vertical' } )
+				screen.getByRole( 'textbox', { name: 'Top and bottom sides' } )
 			).toHaveValue( '100' );
 			expect(
-				screen.getByRole( 'textbox', { name: 'Horizontal' } )
+				screen.getByRole( 'textbox', { name: 'Left and right sides' } )
 			).not.toHaveValue();
 		} );
+
+		it( 'should update a whole axis using a slider when value is changed when unlinked', async () => {
+			const user = userEvent.setup();
+
+			render( <Example splitOnAxis /> );
+
+			await user.click(
+				screen.getByRole( 'button', { name: 'Unlink sides' } )
+			);
+
+			const slider = screen.getByRole( 'slider', {
+				name: 'Left and right sides',
+			} );
+
+			fireEvent.change( slider, { target: { value: 50 } } );
+
+			expect( slider ).toHaveValue( '50' );
+			expect(
+				screen.getByRole( 'textbox', { name: 'Top and bottom sides' } )
+			).not.toHaveValue();
+			expect(
+				screen.getByRole( 'textbox', { name: 'Left and right sides' } )
+			).toHaveValue( '50' );
+		} );
+
+		it( 'should show "Mixed" label when sides have different values but are linked', async () => {
+			const user = userEvent.setup();
+
+			render( <Example /> );
+
+			const unlinkButton = screen.getByRole( 'button', {
+				name: 'Unlink sides',
+			} );
+
+			await user.click( unlinkButton );
+
+			await user.type(
+				screen.getByRole( 'textbox', {
+					name: 'Right side',
+				} ),
+				'13'
+			);
+
+			expect(
+				screen.getByRole( 'textbox', { name: 'Right side' } )
+			).toHaveValue( '13' );
+
+			await user.click( unlinkButton );
+
+			expect( screen.getByPlaceholderText( 'Mixed' ) ).toHaveValue( '' );
+		} );
 	} );
 
 	describe( 'Unit selections', () => {
@@ -287,7 +417,7 @@ describe( 'BoxControl', () => {
 			render( <BoxControl onChange={ onChangeSpy } /> );
 
 			const valueInput = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 			const unitSelect = screen.getByRole( 'combobox', {
 				name: 'Select unit',
diff --git a/packages/components/src/box-control/types.ts b/packages/components/src/box-control/types.ts
index 0eba0e58fd33cc..5f4071aeed88a7 100644
--- a/packages/components/src/box-control/types.ts
+++ b/packages/components/src/box-control/types.ts
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import type { useHover } from '@use-gesture/react';
-
 /**
  * Internal dependencies
  */
@@ -16,6 +11,10 @@ export type BoxControlValue = {
 	left?: string;
 };
 
+export type CustomValueUnits = {
+	[ key: string ]: { max: number; step: number };
+};
+
 type UnitControlPassthroughProps = Omit<
 	UnitControlProps,
 	'label' | 'onChange' | 'onFocus' | 'onMouseOver' | 'onMouseOut' | 'units'
@@ -38,13 +37,13 @@ export type BoxControlProps = Pick<
 	/**
 	 * Props for the internal `UnitControl` components.
 	 *
-	 * @default `{ min: 0 }`
+	 * @default { min: 0 }
 	 */
 	inputProps?: UnitControlPassthroughProps;
 	/**
 	 * Heading label for the control.
 	 *
-	 * @default `__( 'Box Control' )`
+	 * @default __( 'Box Control' )
 	 */
 	label?: string;
 	/**
@@ -54,7 +53,7 @@ export type BoxControlProps = Pick<
 	/**
 	 * The `top`, `right`, `bottom`, and `left` box dimension values to use when the control is reset.
 	 *
-	 * @default `{ top: undefined, right: undefined, bottom: undefined, left: undefined }`
+	 * @default { top: undefined, right: undefined, bottom: undefined, left: undefined }
 	 */
 	resetValues?: BoxControlValue;
 	/**
@@ -72,6 +71,12 @@ export type BoxControlProps = Pick<
 	 * The current values of the control, expressed as an object of `top`, `right`, `bottom`, and `left` values.
 	 */
 	values?: BoxControlValue;
+	/**
+	 * Start opting into the larger default height that will become the default size in a future version.
+	 *
+	 * @default false
+	 */
+	__next40pxDefaultSize?: boolean;
 };
 
 export type BoxControlInputControlProps = UnitControlPassthroughProps & {
@@ -92,22 +97,6 @@ export type BoxControlInputControlProps = UnitControlPassthroughProps & {
 	values: BoxControlValue;
 };
 
-export type BoxUnitControlProps = UnitControlPassthroughProps &
-	Pick< UnitControlProps, 'onChange' | 'onFocus' > & {
-		isFirst?: boolean;
-		isLast?: boolean;
-		isOnly?: boolean;
-		label?: string;
-		onHoverOff?: (
-			event: ReturnType< typeof useHover >[ 'event' ],
-			state: Omit< ReturnType< typeof useHover >, 'event' >
-		) => void;
-		onHoverOn?: (
-			event: ReturnType< typeof useHover >[ 'event' ],
-			state: Omit< ReturnType< typeof useHover >, 'event' >
-		) => void;
-	};
-
 export type BoxControlIconProps = {
 	/**
 	 * @default 24
diff --git a/packages/components/src/box-control/unit-control.tsx b/packages/components/src/box-control/unit-control.tsx
deleted file mode 100644
index 24d71cf0d6cd34..00000000000000
--- a/packages/components/src/box-control/unit-control.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * External dependencies
- */
-import { useHover } from '@use-gesture/react';
-
-/**
- * Internal dependencies
- */
-import BaseTooltip from '../tooltip';
-import { UnitControlWrapper, UnitControl } from './styles/box-control-styles';
-import type { BoxUnitControlProps } from './types';
-
-const noop = () => {};
-
-export default function BoxUnitControl( {
-	isFirst,
-	isLast,
-	isOnly,
-	onHoverOn = noop,
-	onHoverOff = noop,
-	label,
-	value,
-	...props
-}: BoxUnitControlProps ) {
-	const bindHoverGesture = useHover( ( { event, ...state } ) => {
-		if ( state.hovering ) {
-			onHoverOn( event, state );
-		} else {
-			onHoverOff( event, state );
-		}
-	} );
-
-	return (
-		<UnitControlWrapper { ...bindHoverGesture() }>
-			<Tooltip text={ label }>
-				<UnitControl
-					aria-label={ label }
-					className="component-box-control__unit-control"
-					isFirst={ isFirst }
-					isLast={ isLast }
-					isOnly={ isOnly }
-					isPressEnterToChange
-					isResetValueOnUnitChange={ false }
-					value={ value }
-					{ ...props }
-				/>
-			</Tooltip>
-		</UnitControlWrapper>
-	);
-}
-
-function Tooltip( {
-	children,
-	text,
-}: {
-	children: JSX.Element;
-	text?: string;
-} ) {
-	if ( ! text ) return children;
-
-	/**
-	 * Wrapping the children in a `<div />` as Tooltip as it attempts
-	 * to render the <UnitControl />. Using a plain `<div />` appears to
-	 * resolve this issue.
-	 *
-	 * Originally discovered and referenced here:
-	 * https://github.com/WordPress/gutenberg/pull/24966#issuecomment-685875026
-	 */
-	return (
-		<BaseTooltip text={ text } placement="top">
-			<div>{ children }</div>
-		</BaseTooltip>
-	);
-}
diff --git a/packages/components/src/box-control/utils.ts b/packages/components/src/box-control/utils.ts
index 6614342d3da6d3..73c7f4a6a46cfb 100644
--- a/packages/components/src/box-control/utils.ts
+++ b/packages/components/src/box-control/utils.ts
@@ -7,17 +7,52 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { parseQuantityAndUnitFromRawValue } from '../unit-control/utils';
-import type { BoxControlProps, BoxControlValue } from './types';
+import type {
+	BoxControlProps,
+	BoxControlValue,
+	CustomValueUnits,
+} from './types';
+
+export const CUSTOM_VALUE_SETTINGS: CustomValueUnits = {
+	px: { max: 300, step: 1 },
+	'%': { max: 100, step: 1 },
+	vw: { max: 100, step: 1 },
+	vh: { max: 100, step: 1 },
+	em: { max: 10, step: 0.1 },
+	rm: { max: 10, step: 0.1 },
+	svw: { max: 100, step: 1 },
+	lvw: { max: 100, step: 1 },
+	dvw: { max: 100, step: 1 },
+	svh: { max: 100, step: 1 },
+	lvh: { max: 100, step: 1 },
+	dvh: { max: 100, step: 1 },
+	vi: { max: 100, step: 1 },
+	svi: { max: 100, step: 1 },
+	lvi: { max: 100, step: 1 },
+	dvi: { max: 100, step: 1 },
+	vb: { max: 100, step: 1 },
+	svb: { max: 100, step: 1 },
+	lvb: { max: 100, step: 1 },
+	dvb: { max: 100, step: 1 },
+	vmin: { max: 100, step: 1 },
+	svmin: { max: 100, step: 1 },
+	lvmin: { max: 100, step: 1 },
+	dvmin: { max: 100, step: 1 },
+	vmax: { max: 100, step: 1 },
+	svmax: { max: 100, step: 1 },
+	lvmax: { max: 100, step: 1 },
+	dvmax: { max: 100, step: 1 },
+};
 
 export const LABELS = {
-	all: __( 'All' ),
-	top: __( 'Top' ),
-	bottom: __( 'Bottom' ),
-	left: __( 'Left' ),
-	right: __( 'Right' ),
+	all: __( 'All sides' ),
+	top: __( 'Top side' ),
+	bottom: __( 'Bottom side' ),
+	left: __( 'Left side' ),
+	right: __( 'Right side' ),
 	mixed: __( 'Mixed' ),
-	vertical: __( 'Vertical' ),
-	horizontal: __( 'Horizontal' ),
+	vertical: __( 'Top and bottom sides' ),
+	horizontal: __( 'Left and right sides' ),
 };
 
 export const DEFAULT_VALUES = {
@@ -144,7 +179,7 @@ export function isValuesMixed(
  */
 export function isValuesDefined( values?: BoxControlValue ) {
 	return (
-		values !== undefined &&
+		values &&
 		Object.values( values ).filter(
 			// Switching units when input is empty causes values only
 			// containing units. This gives false positive on mixed values
diff --git a/packages/components/src/button-group/README.md b/packages/components/src/button-group/README.md
index 2135a027afa5b6..5c0179d6877af9 100644
--- a/packages/components/src/button-group/README.md
+++ b/packages/components/src/button-group/README.md
@@ -4,12 +4,6 @@ ButtonGroup can be used to group any related buttons together. To emphasize rela
 
 ![ButtonGroup component](https://wordpress.org/gutenberg/files/2018/12/s_96EC471FE9C9D91A996770229947AAB54A03351BDE98F444FD3C1BF0CED365EA_1541792995815_ButtonGroup.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
diff --git a/packages/components/src/button-group/index.tsx b/packages/components/src/button-group/index.tsx
index 2eb7451e3e00db..fb2659c2a0d7de 100644
--- a/packages/components/src/button-group/index.tsx
+++ b/packages/components/src/button-group/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef } from 'react';
 
 /**
@@ -20,7 +20,7 @@ function UnforwardedButtonGroup(
 	ref: ForwardedRef< HTMLDivElement >
 ) {
 	const { className, ...restProps } = props;
-	const classes = classnames( 'components-button-group', className );
+	const classes = clsx( 'components-button-group', className );
 
 	return (
 		<div ref={ ref } role="group" className={ classes } { ...restProps } />
diff --git a/packages/components/src/button-group/stories/index.story.tsx b/packages/components/src/button-group/stories/index.story.tsx
index 958a0d137763e9..f6af2416977f40 100644
--- a/packages/components/src/button-group/stories/index.story.tsx
+++ b/packages/components/src/button-group/stories/index.story.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import type { Meta, StoryFn } from '@storybook/react';
+import type { Meta, StoryObj } from '@storybook/react';
 
 /**
  * Internal dependencies
@@ -22,18 +22,13 @@ const meta: Meta< typeof ButtonGroup > = {
 };
 export default meta;
 
-const Template: StoryFn< typeof ButtonGroup > = ( args ) => {
-	const style = { margin: '0 4px' };
-	return (
-		<ButtonGroup { ...args }>
-			<Button variant="primary" style={ style }>
-				Button 1
-			</Button>
-			<Button variant="primary" style={ style }>
-				Button 2
-			</Button>
-		</ButtonGroup>
-	);
+export const Default: StoryObj< typeof ButtonGroup > = {
+	args: {
+		children: (
+			<>
+				<Button variant="primary">Button 1</Button>
+				<Button>Button 2</Button>
+			</>
+		),
+	},
 };
-
-export const Default: StoryFn< typeof ButtonGroup > = Template.bind( {} );
diff --git a/packages/components/src/button-group/style.scss b/packages/components/src/button-group/style.scss
index 171722b409f693..96a9e8f458c84c 100644
--- a/packages/components/src/button-group/style.scss
+++ b/packages/components/src/button-group/style.scss
@@ -12,11 +12,11 @@
 		}
 
 		&:first-child {
-			border-radius: $radius-block-ui 0 0 $radius-block-ui;
+			border-radius: $radius-small 0 0 $radius-small;
 		}
 
 		&:last-child {
-			border-radius: 0 $radius-block-ui $radius-block-ui 0;
+			border-radius: 0 $radius-small $radius-small 0;
 		}
 
 		// The focused button should be elevated so the focus ring isn't cropped,
diff --git a/packages/components/src/button/README.md b/packages/components/src/button/README.md
index 3af46280b1bc9a..d458771494a338 100644
--- a/packages/components/src/button/README.md
+++ b/packages/components/src/button/README.md
@@ -4,12 +4,6 @@ Buttons let users take actions and make choices with a single click or tap.
 
 ![Button components](https://make.wordpress.org/design/files/2019/03/button.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
@@ -121,6 +115,17 @@ The presence of a `href` prop determines whether an `anchor` element is rendered
 
 Props not included in this set will be applied to the `a` or `button` element.
 
+#### `accessibleWhenDisabled`: `boolean`
+
+Whether to keep the button focusable when disabled.
+
+In most cases, it is recommended to set this to `true`. Disabling a control without maintaining focusability can cause accessibility issues, by hiding their presence from screen reader users, or by preventing focus from returning to a trigger element.
+
+Learn more about the [focusability of disabled controls](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#focusabilityofdisabledcontrols) in the WAI-ARIA Authoring Practices Guide.
+
+-   Required: No
+-   Default: `false`
+
 #### `children`: `ReactNode`
 
 The button's children.
@@ -133,7 +138,7 @@ An optional additional class name to apply to the rendered button.
 
 -   Required: No
 
-#### `describedBy`: `string`
+#### `description`: `string`
 
 An accessible description for the button.
 
@@ -141,7 +146,9 @@ An accessible description for the button.
 
 #### `disabled`: `boolean`
 
-Whether the button is disabled. If `true`, this will force a `button` element to be rendered.
+Whether the button is disabled. If `true`, this will force a `button` element to be rendered, even when an `href` is given.
+
+In most cases, it is recommended to also set the `accessibleWhenDisabled` prop to `true`.
 
 -   Required: No
 
@@ -182,6 +189,14 @@ Renders a red text-based button style to indicate destructive behavior.
 
 -   Required: No
 
+#### `isLink`: `boolean`
+
+Deprecated: Renders a button with an anchor style.
+Use `variant` prop with `link` value instead.
+
+-   Required: No
+-   Default: `false`
+
 #### `isPressed`: `boolean`
 
 Renders a pressed button style.
@@ -190,6 +205,22 @@ If the native `aria-pressed` attribute is also set, it will take precedence.
 
 -   Required: No
 
+#### `isPrimary`: `boolean`
+
+Deprecated: Renders a primary button style.
+Use `variant` prop with `primary` value instead.
+
+-   Required: No
+-   Default: `false`
+
+#### `isSecondary`: `boolean`
+
+Deprecated: Renders a default button style.
+Use `variant` prop with `secondary` value instead.
+
+-   Required: No
+-   Default: `false`
+
 #### `isSmall`: `boolean`
 
 Decreases the size of the button.
@@ -198,6 +229,14 @@ Deprecated in favor of the `size` prop. If both props are defined, the `size` pr
 
 -   Required: No
 
+#### `isTertiary`: `boolean`
+
+Deprecated: Renders a text-based button style.
+Use `variant` prop with `tertiary` value instead.
+
+-   Required: No
+-   Default: `false`
+
 #### `label`: `string`
 
 Sets the `aria-label` of the component, if none is provided. Sets the Tooltip content if `showTooltip` is provided.
@@ -253,6 +292,13 @@ Specifies the button's style. The accepted values are `'primary'` (the primary b
 
 -   Required: No
 
+#### `__next40pxDefaultSize`: `boolean`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+- Required: No
+- Default: `false`
+
 ## Related components
 
 -   To group buttons together, use the [ButtonGroup](/packages/components/src/button-group/README.md) component.
diff --git a/packages/components/src/button/index.native.js b/packages/components/src/button/index.native.js
index 95ca9d36b3791b..063a2cc191eaed 100644
--- a/packages/components/src/button/index.native.js
+++ b/packages/components/src/button/index.native.js
@@ -180,10 +180,10 @@ export function Button( props ) {
 	const element = (
 		<TouchableOpacity
 			activeOpacity={ 0.7 }
-			accessible={ true }
+			accessible
 			accessibilityLabel={ label }
 			accessibilityStates={ states }
-			accessibilityRole={ 'button' }
+			accessibilityRole="button"
 			accessibilityHint={ hint }
 			onPress={ onClick }
 			style={ containerStyle }
diff --git a/packages/components/src/button/index.tsx b/packages/components/src/button/index.tsx
index b14e85fa52f7f6..0ab6b24b4dd6aa 100644
--- a/packages/components/src/button/index.tsx
+++ b/packages/components/src/button/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type {
 	ComponentPropsWithoutRef,
 	ForwardedRef,
@@ -29,6 +29,7 @@ import { positionToPlacement } from '../popover/utils';
 const disabledEventsOnDisabledButton = [ 'onMouseDown', 'onClick' ] as const;
 
 function useDeprecatedProps( {
+	__experimentalIsFocusable,
 	isDefault,
 	isPrimary,
 	isSecondary,
@@ -38,14 +39,17 @@ function useDeprecatedProps( {
 	isSmall,
 	size,
 	variant,
+	describedBy,
 	...otherProps
 }: ButtonProps & DeprecatedButtonProps ): ButtonProps {
 	let computedSize = size;
 	let computedVariant = variant;
 
-	const newProps: { 'aria-pressed'?: boolean } = {
-		// @TODO Mark `isPressed` as deprecated
+	const newProps = {
+		accessibleWhenDisabled: __experimentalIsFocusable,
+		// @todo Mark `isPressed` as deprecated
 		'aria-pressed': isPressed,
+		description: describedBy,
 	};
 
 	if ( isSmall ) {
@@ -65,10 +69,9 @@ function useDeprecatedProps( {
 	}
 
 	if ( isDefault ) {
-		deprecated( 'Button isDefault prop', {
+		deprecated( 'wp.components.Button `isDefault` prop', {
 			since: '5.4',
 			alternative: 'variant="secondary"',
-			version: '6.2',
 		} );
 
 		computedVariant ??= 'secondary';
@@ -87,11 +90,12 @@ function useDeprecatedProps( {
 }
 
 export function UnforwardedButton(
-	props: ButtonProps,
+	props: ButtonProps & DeprecatedButtonProps,
 	ref: ForwardedRef< any >
 ) {
 	const {
 		__next40pxDefaultSize,
+		accessibleWhenDisabled,
 		isBusy,
 		isDestructive,
 		className,
@@ -107,8 +111,7 @@ export function UnforwardedButton(
 		size = 'default',
 		text,
 		variant,
-		__experimentalIsFocusable: isFocusable,
-		describedBy,
+		description,
 		...buttonOrAnchorProps
 	} = useDeprecatedProps( props );
 
@@ -142,7 +145,7 @@ export function UnforwardedButton(
 		'mixed',
 	];
 
-	const classes = classnames( 'components-button', className, {
+	const classes = clsx( 'components-button', className, {
 		'is-next-40px-default-size': __next40pxDefaultSize,
 		'is-secondary': variant === 'secondary',
 		'is-primary': variant === 'primary',
@@ -156,12 +159,12 @@ export function UnforwardedButton(
 		'is-busy': isBusy,
 		'is-link': variant === 'link',
 		'is-destructive': isDestructive,
-		'has-text': !! icon && hasChildren,
+		'has-text': !! icon && ( hasChildren || text ),
 		'has-icon': !! icon,
 	} );
 
-	const trulyDisabled = disabled && ! isFocusable;
-	const Tag = href !== undefined && ! trulyDisabled ? 'a' : 'button';
+	const trulyDisabled = disabled && ! accessibleWhenDisabled;
+	const Tag = href !== undefined && ! disabled ? 'a' : 'button';
 	const buttonProps: ComponentPropsWithoutRef< 'button' > =
 		Tag === 'button'
 			? {
@@ -175,14 +178,16 @@ export function UnforwardedButton(
 	const anchorProps: ComponentPropsWithoutRef< 'a' > =
 		Tag === 'a' ? { href, target } : {};
 
-	if ( disabled && isFocusable ) {
+	const disableEventProps: {
+		[ key: string ]: ( event: MouseEvent ) => void;
+	} = {};
+	if ( disabled && accessibleWhenDisabled ) {
 		// In this case, the button will be disabled, but still focusable and
 		// perceivable by screen reader users.
 		buttonProps[ 'aria-disabled' ] = true;
 		anchorProps[ 'aria-disabled' ] = true;
-
 		for ( const disabledEvent of disabledEventsOnDisabledButton ) {
-			additionalProps[ disabledEvent ] = ( event: MouseEvent ) => {
+			disableEventProps[ disabledEvent ] = ( event: MouseEvent ) => {
 				if ( event ) {
 					event.stopPropagation();
 					event.preventDefault();
@@ -195,9 +200,9 @@ export function UnforwardedButton(
 	const shouldShowTooltip =
 		! trulyDisabled &&
 		// An explicit tooltip is passed or...
-		( ( showTooltip && label ) ||
+		( ( showTooltip && !! label ) ||
 			// There's a shortcut or...
-			shortcut ||
+			!! shortcut ||
 			// There's a label and...
 			( !! label &&
 				// The children are empty and...
@@ -205,7 +210,7 @@ export function UnforwardedButton(
 				// The tooltip is not explicitly disabled.
 				false !== showTooltip ) );
 
-	const descriptionId = describedBy ? instanceId : undefined;
+	const descriptionId = description ? instanceId : undefined;
 
 	const describedById =
 		additionalProps[ 'aria-describedby' ] || descriptionId;
@@ -223,10 +228,10 @@ export function UnforwardedButton(
 				<Icon icon={ icon } size={ iconSize } />
 			) }
 			{ text && <>{ text }</> }
+			{ children }
 			{ icon && iconPosition === 'right' && (
 				<Icon icon={ icon } size={ iconSize } />
 			) }
-			{ children }
 		</>
 	);
 
@@ -235,6 +240,7 @@ export function UnforwardedButton(
 			<a
 				{ ...anchorProps }
 				{ ...( additionalProps as HTMLAttributes< HTMLAnchorElement > ) }
+				{ ...disableEventProps }
 				{ ...commonProps }
 			>
 				{ elementChildren }
@@ -243,49 +249,38 @@ export function UnforwardedButton(
 			<button
 				{ ...buttonProps }
 				{ ...( additionalProps as HTMLAttributes< HTMLButtonElement > ) }
+				{ ...disableEventProps }
 				{ ...commonProps }
 			>
 				{ elementChildren }
 			</button>
 		);
 
-	// Convert legacy `position` values to be used with the new `placement` prop
-	let computedPlacement;
-	// if `tooltipPosition` is defined, compute value to `placement`
-	if ( tooltipPosition !== undefined ) {
-		computedPlacement = positionToPlacement( tooltipPosition );
-	}
-
-	if ( ! shouldShowTooltip ) {
-		return (
-			<>
-				{ element }
-				{ describedBy && (
-					<VisuallyHidden>
-						<span id={ descriptionId }>{ describedBy }</span>
-					</VisuallyHidden>
-				) }
-			</>
-		);
-	}
+	// In order to avoid some React reconciliation issues, we are always rendering
+	// the `Tooltip` component even when `shouldShowTooltip` is `false`.
+	// In order to make sure that the tooltip doesn't show when it shouldn't,
+	// we don't pass the props to the `Tooltip` component.
+	const tooltipProps = shouldShowTooltip
+		? {
+				text:
+					( children as string | ReactElement[] )?.length &&
+					description
+						? description
+						: label,
+				shortcut,
+				placement:
+					tooltipPosition &&
+					// Convert legacy `position` values to be used with the new `placement` prop
+					positionToPlacement( tooltipPosition ),
+		  }
+		: {};
 
 	return (
 		<>
-			<Tooltip
-				text={
-					( children as string | ReactElement[] )?.length &&
-					describedBy
-						? describedBy
-						: label
-				}
-				shortcut={ shortcut }
-				placement={ computedPlacement }
-			>
-				{ element }
-			</Tooltip>
-			{ describedBy && (
+			<Tooltip { ...tooltipProps }>{ element }</Tooltip>
+			{ description && (
 				<VisuallyHidden>
-					<span id={ descriptionId }>{ describedBy }</span>
+					<span id={ descriptionId }>{ description }</span>
 				</VisuallyHidden>
 			) }
 		</>
diff --git a/packages/components/src/button/stories/e2e/index.story.tsx b/packages/components/src/button/stories/e2e/index.story.tsx
index c2ec8e237d3b2a..d2651e8df1ec18 100644
--- a/packages/components/src/button/stories/e2e/index.story.tsx
+++ b/packages/components/src/button/stories/e2e/index.story.tsx
@@ -31,21 +31,110 @@ export const VariantStates: StoryFn< typeof Button > = (
 		'link',
 	];
 
-	return (
-		<div style={ { display: 'flex', flexDirection: 'column', gap: 24 } }>
-			{ variants.map( ( variant ) => (
-				<div
-					style={ { display: 'flex', gap: 8 } }
-					key={ variant ?? 'undefined' }
+	const VariantsRow = ( {
+		buttonProps,
+		name,
+	}: {
+		buttonProps?: ButtonAsButtonProps;
+		name: string;
+	} ) => {
+		return (
+			<tr>
+				<th
+					style={ {
+						fontSize: 13,
+						fontWeight: 'normal',
+						padding: 8,
+						background: '#f3f4f5',
+					} }
 				>
-					<Button { ...props } variant={ variant } />
-					<Button { ...props } variant={ variant } disabled />
-					<Button { ...props } variant={ variant } isBusy />
-					<Button { ...props } variant={ variant } isDestructive />
-					<Button { ...props } variant={ variant } isPressed />
-				</div>
-			) ) }
-		</div>
+					{ name }
+				</th>
+				{ variants.map( ( variant ) => (
+					<td key={ variant ?? 'undefined' } style={ { padding: 4 } }>
+						<Button
+							{ ...props }
+							variant={ variant }
+							{ ...buttonProps }
+						/>
+					</td>
+				) ) }
+			</tr>
+		);
+	};
+
+	return (
+		<table>
+			<thead>
+				<tr style={ { background: '#f3f4f5' } }>
+					<th />
+					{ variants.map( ( variant ) => (
+						<th
+							key={ variant ?? 'undefined' }
+							style={ { padding: 8 } }
+						>
+							{ variant ?? '(default)' }
+						</th>
+					) ) }
+				</tr>
+			</thead>
+			<tbody>
+				<VariantsRow name="(default)" />
+				<VariantsRow
+					name="disabled"
+					buttonProps={ { disabled: true } }
+				/>
+				<VariantsRow
+					name="focusable disabled"
+					buttonProps={ {
+						accessibleWhenDisabled: true,
+						disabled: true,
+					} }
+				/>
+				<VariantsRow
+					name="isBusy"
+					buttonProps={ {
+						isBusy: true,
+					} }
+				/>
+				<VariantsRow
+					name="isBusy disabled"
+					buttonProps={ {
+						isBusy: true,
+						accessibleWhenDisabled: true,
+						disabled: true,
+					} }
+				/>
+				<VariantsRow
+					name="isDestructive"
+					buttonProps={ {
+						isDestructive: true,
+					} }
+				/>
+				<VariantsRow
+					name="isDestructive disabled"
+					buttonProps={ {
+						isDestructive: true,
+						accessibleWhenDisabled: true,
+						disabled: true,
+					} }
+				/>
+				<VariantsRow
+					name="isPressed"
+					buttonProps={ {
+						isPressed: true,
+					} }
+				/>
+				<VariantsRow
+					name="isPressed disabled"
+					buttonProps={ {
+						isPressed: true,
+						accessibleWhenDisabled: true,
+						disabled: true,
+					} }
+				/>
+			</tbody>
+		</table>
 	);
 };
 VariantStates.args = {
diff --git a/packages/components/src/button/stories/index.story.tsx b/packages/components/src/button/stories/index.story.tsx
index 2981319cfb3233..808914893de610 100644
--- a/packages/components/src/button/stories/index.story.tsx
+++ b/packages/components/src/button/stories/index.story.tsx
@@ -22,7 +22,8 @@ import './style.css';
 import Button from '..';
 
 const meta: Meta< typeof Button > = {
-	title: 'Components/Button',
+	title: 'Components/Actions/Button',
+	id: 'components-button',
 	component: Button,
 	argTypes: {
 		// Overrides a limitation of the docgen interpreting our TS types for this as required.
diff --git a/packages/components/src/button/style.scss b/packages/components/src/button/style.scss
index 0af5144d3d4b7f..61455a54e26f6b 100644
--- a/packages/components/src/button/style.scss
+++ b/packages/components/src/button/style.scss
@@ -1,3 +1,10 @@
+/**
+ * For easier testing of potential regressions, you can use a Button variant matrix
+ * available in a special Storybook instance by running `npm run storybook:e2e:dev`.
+ *
+ * @see https://github.com/WordPress/gutenberg/blob/trunk/test/storybook-playwright/README.md
+ */
+
 .components-button {
 	display: inline-flex;
 	text-decoration: none;
@@ -15,7 +22,7 @@
 	align-items: center;
 	box-sizing: border-box;
 	padding: 6px 12px;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	color: $components-color-foreground;
 
 	&.is-next-40px-default-size {
@@ -23,16 +30,10 @@
 	}
 
 	&[aria-expanded="true"],
-	&:hover {
+	&:hover:not(:disabled, [aria-disabled="true"]) {
 		color: $components-color-accent;
 	}
 
-	// Unset some hovers, instead of adding :not specificity.
-	&:disabled:hover,
-	&[aria-disabled="true"]:hover {
-		color: initial;
-	}
-
 	// Focus.
 	// See https://github.com/WordPress/gutenberg/issues/13267 for more context on these selectors.
 	&:focus:not(:disabled) {
@@ -80,13 +81,10 @@
 			color: rgba($white, 0.4);
 			background: $components-color-accent;
 			border-color: $components-color-accent;
-			opacity: 1;
 			outline: none;
 
 			&:focus:enabled {
-				box-shadow:
-					0 0 0 $border-width $components-color-background,
-					0 0 0 3px $components-color-accent;
+				box-shadow: inset 0 0 0 1px $components-color-background, 0 0 0 var(--wp-admin-border-width-focus) $components-color-accent;
 			}
 		}
 
@@ -95,8 +93,7 @@
 		&.is-busy[aria-disabled="true"] {
 			color: $components-color-accent-inverted;
 			background-size: 100px 100%;
-			// Disable reason: This function call looks nicer when each argument is on its own line.
-			/* stylelint-disable */
+			/* stylelint-disable -- Disable reason: This function call looks nicer when each argument is on its own line. */
 			background-image: linear-gradient(
 				-45deg,
 				$components-color-accent 33%,
@@ -128,12 +125,6 @@
 			color: $gray-600;
 			background: transparent;
 			transform: none;
-			opacity: 1;
-
-			&:not(:focus) {
-				box-shadow: none;
-				outline: none;
-			}
 		}
 	}
 
@@ -142,7 +133,7 @@
 	 */
 
 	&.is-secondary {
-		box-shadow: inset 0 0 0 $border-width $components-color-accent;
+		box-shadow: inset 0 0 0 $border-width $components-color-accent, 0 0 0 currentColor;
 		outline: 1px solid transparent; // Shown in high contrast mode.
 		white-space: nowrap;
 		color: $components-color-accent;
@@ -151,6 +142,16 @@
 		&:hover:not(:disabled, [aria-disabled="true"]) {
 			box-shadow: inset 0 0 0 $border-width $components-color-accent-darker-10;
 		}
+
+		&:disabled:not(:focus),
+		&[aria-disabled="true"]:not(:focus),
+		&[aria-disabled="true"]:hover:not(:focus) {
+			box-shadow: inset 0 0 0 $border-width $gray-300;
+		}
+
+		&:focus:not(:disabled) {
+			box-shadow: 0 0 0 currentColor inset, 0 0 0 var(--wp-admin-border-width-focus) $components-color-accent;
+		}
 	}
 
 	/**
@@ -164,11 +165,13 @@
 
 		&:hover:not(:disabled, [aria-disabled="true"]) {
 			// TODO: Prepare for theming (https://github.com/WordPress/gutenberg/pull/45466/files#r1030872724)
+			/* stylelint-disable-next-line declaration-property-value-disallowed-list -- Allow tertiary buttons to use colors from the user admin color scheme. */
 			background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
 		}
 
 		&:active:not(:disabled, [aria-disabled="true"]) {
 			// TODO: Prepare for theming (https://github.com/WordPress/gutenberg/pull/45466/files#r1030872724)
+			/* stylelint-disable-next-line declaration-property-value-disallowed-list -- Allow tertiary buttons to use colors from the user admin color scheme. */
 			background: rgba(var(--wp-admin-theme-color--rgb), 0.08);
 		}
 
@@ -176,6 +179,15 @@
 		p + & {
 			margin-left: -($grid-unit-15 * 0.5);
 		}
+
+		&:disabled,
+		&[aria-disabled="true"],
+		&[aria-disabled="true"]:hover {
+			&:not(:focus) {
+				box-shadow: none;
+				outline: none;
+			}
+		}
 	}
 
 	/**
@@ -190,17 +202,32 @@
 		&:not(.is-primary):not(.is-secondary):not(.is-tertiary):not(.is-link) {
 			color: $alert-red;
 
-			&:hover:not(:disabled) {
+			&:hover:not(:disabled, [aria-disabled="true"]) {
 				color: darken($alert-red, 20%);
 			}
 
-			&:focus:not(:disabled) {
+			&:focus {
 				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) $alert-red;
 			}
 
-			&:active:not(:disabled) {
+			&:active:not(:disabled, [aria-disabled="true"]) {
 				background: $gray-400;
 			}
+
+			&:disabled,
+			&[aria-disabled="true"] {
+				color: $gray-600;
+			}
+		}
+
+		&.is-tertiary {
+			&:hover:not(:disabled, [aria-disabled="true"]) {
+				background: rgba($alert-red, 0.04);
+			}
+
+			&:active:not(:disabled, [aria-disabled="true"]) {
+				background: rgba($alert-red, 0.08);
+			}
 		}
 	}
 
@@ -226,7 +253,12 @@
 		height: auto;
 
 		&:focus {
-			border-radius: $radius-block-ui;
+			border-radius: $radius-small;
+		}
+
+		&:disabled,
+		&[aria-disabled="true"] {
+			color: $gray-600;
 		}
 	}
 
@@ -237,7 +269,7 @@
 	&:disabled,
 	&[aria-disabled="true"] {
 		cursor: default;
-		opacity: 0.3;
+		color: $gray-600;
 	}
 
 	&.is-busy,
@@ -250,10 +282,8 @@
 		@media (prefers-reduced-motion: reduce) {
 			animation-duration: 0s;
 		}
-		opacity: 1;
 		background-size: 100px 100%;
-		// Disable reason: This function call looks nicer when each argument is on its own line.
-		/* stylelint-disable */
+		/* stylelint-disable -- Disable reason: This function call looks nicer when each argument is on its own line. */
 		background-image: linear-gradient(
 			-45deg,
 			// TODO: Prepare for theming (https://github.com/WordPress/gutenberg/pull/45466/files#r1030872724)
@@ -317,8 +347,23 @@
 
 	// Toggled style.
 	&.is-pressed {
-		color: $components-color-foreground-inverted;
-		background: $components-color-foreground;
+		&,
+		&:hover {
+			color: $components-color-foreground-inverted;
+			&:not(:disabled, [aria-disabled="true"]) {
+				background: $components-color-foreground;
+			}
+		}
+
+		&:disabled,
+		&[aria-disabled="true"] {
+			color: $gray-600;
+
+			&:not(.is-primary):not(.is-secondary):not(.is-tertiary) {
+				color: $components-color-foreground-inverted;
+				background: $gray-600;
+			}
+		}
 
 		&:focus:not(:disabled) {
 			box-shadow: inset 0 0 0 1px $components-color-background, 0 0 0 var(--wp-admin-border-width-focus) $components-color-accent;
@@ -326,11 +371,6 @@
 			// Windows High Contrast mode will show this outline, but not the box-shadow.
 			outline: 2px solid transparent;
 		}
-
-		&:hover:not(:disabled) {
-			color: $components-color-foreground-inverted;
-			background: $components-color-foreground;
-		}
 	}
 
 	svg {
diff --git a/packages/components/src/button/test/index.tsx b/packages/components/src/button/test/index.tsx
index fb6c6a72b9adcb..8161e68c4e21b6 100644
--- a/packages/components/src/button/test/index.tsx
+++ b/packages/components/src/button/test/index.tsx
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
 
 /**
  * WordPress dependencies
@@ -16,6 +15,7 @@ import { plusCircle } from '@wordpress/icons';
 import Button from '..';
 import Tooltip from '../../tooltip';
 import cleanupTooltip from '../../tooltip/test/utils';
+import { press } from '@ariakit/test';
 
 jest.mock( '../../icon', () => () => <div data-testid="test-icon" /> );
 
@@ -43,7 +43,7 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should render a button element with is-secondary and is-small class', () => {
-			render( <Button variant="secondary" isSmall /> );
+			render( <Button variant="secondary" size="small" /> );
 			const button = screen.getByRole( 'button' );
 
 			expect( button ).toHaveClass( 'is-secondary' );
@@ -73,12 +73,10 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should render a button element with has-text when children are passed', async () => {
-			const user = userEvent.setup();
-
 			render( <Button icon={ plusCircle }>Children</Button> );
 
 			// Move focus to the button
-			await user.tab();
+			await press.Tab();
 
 			expect( screen.getByRole( 'button' ) ).toHaveClass( 'has-text' );
 		} );
@@ -112,14 +110,131 @@ describe( 'Button', () => {
 			);
 		} );
 
+		it( 'should render correctly as a tooltip anchor', async () => {
+			render(
+				<>
+					<Tooltip text="Tooltip text">
+						<Button icon={ plusCircle } label="Tooltip anchor" />
+					</Tooltip>
+					<Button>Focus me</Button>
+				</>
+			);
+
+			const anchor = screen.getByRole( 'button', {
+				name: 'Tooltip anchor',
+			} );
+
+			await press.Tab();
+
+			expect( anchor ).toHaveFocus();
+
+			const tooltip = await screen.findByRole( 'tooltip', {
+				name: 'Tooltip text',
+			} );
+
+			expect( tooltip ).toBeVisible();
+
+			await press.Tab();
+
+			expect(
+				screen.getByRole( 'button', { name: 'Focus me' } )
+			).toHaveFocus();
+
+			expect(
+				screen.queryByRole( 'tooltip', {
+					name: 'Tooltip text',
+				} )
+			).not.toBeInTheDocument();
+		} );
+
+		it( 'should render correctly as a tooltip anchor, ignoring its internal tooltip in favour of the external tooltip', async () => {
+			render(
+				<>
+					<Tooltip text="Tooltip text">
+						<Button icon={ plusCircle } label="Button label" />
+					</Tooltip>
+					<Button>Focus me</Button>
+				</>
+			);
+
+			const anchor = screen.getByRole( 'button', {
+				name: 'Button label',
+			} );
+
+			await press.Tab();
+
+			expect( anchor ).toHaveFocus();
+
+			const tooltip = await screen.findByRole( 'tooltip', {
+				name: 'Tooltip text',
+			} );
+
+			expect( tooltip ).toBeVisible();
+			// Check that the tooltip that would be normally rendered internally by
+			// the `Button` component is ignored, because of an outer tooltip.
+			expect(
+				screen.queryByRole( 'tooltip', {
+					name: 'Button label',
+				} )
+			).not.toBeInTheDocument();
+
+			await press.Tab();
+
+			expect(
+				screen.getByRole( 'button', { name: 'Focus me' } )
+			).toHaveFocus();
+
+			expect(
+				screen.queryByRole( 'tooltip', {
+					name: 'Tooltip text',
+				} )
+			).not.toBeInTheDocument();
+		} );
+
+		it( 'should not trash the rendered HTML elements when toggling between showing and not showing a tooltip', async () => {
+			const { rerender } = render(
+				<Button label="Button label">Test button</Button>
+			);
+
+			const button = screen.getByRole( 'button', {
+				name: 'Button label',
+			} );
+
+			expect( button ).toBeVisible();
+
+			await press.Tab();
+
+			expect( button ).toHaveFocus();
+
+			// Re-render the button, but this time change the settings so that it
+			// shows a tooltip.
+			rerender(
+				<Button label="Button label" showTooltip>
+					Test button
+				</Button>
+			);
+
+			// The same button element that we referenced before should still be
+			// in the document and have focus.
+			expect( button ).toHaveFocus();
+
+			// Re-render the button, but stop showing a tooltip.
+			rerender( <Button label="Button label">Test button</Button> );
+
+			// The same button element that we referenced before should still be
+			// in the document and have focus.
+			expect( button ).toHaveFocus();
+		} );
+
 		it( 'should add a disabled prop to the button', () => {
+			// eslint-disable-next-line no-restricted-syntax
 			render( <Button disabled /> );
 
 			expect( screen.getByRole( 'button' ) ).toBeDisabled();
 		} );
 
 		it( 'should add only aria-disabled attribute when disabled and isFocusable are true', () => {
-			render( <Button disabled __experimentalIsFocusable /> );
+			render( <Button disabled accessibleWhenDisabled /> );
 			const button = screen.getByRole( 'button' );
 
 			expect( button ).toBeEnabled();
@@ -184,14 +299,12 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should add an aria-label when the label property is used, with Tooltip wrapper', async () => {
-			const user = userEvent.setup();
-
 			render( <Button icon={ plusCircle } label="WordPress" /> );
 
 			expect( screen.queryByText( 'WordPress' ) ).not.toBeInTheDocument();
 
 			// Move focus to the button
-			await user.tab();
+			await press.Tab();
 
 			expect( screen.getByText( 'WordPress' ) ).toBeVisible();
 		} );
@@ -206,7 +319,7 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should support adding aria-describedby text', () => {
-			render( <Button describedBy="Description text" /> );
+			render( <Button description="Description text" /> );
 			expect(
 				screen.getByRole( 'button', {
 					description: 'Description text',
@@ -215,11 +328,9 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should populate tooltip with label content for buttons without visible labels (no children)', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<Button
-					describedBy="Description text"
+					description="Description text"
 					label="Label"
 					icon={ plusCircle }
 				/>
@@ -228,20 +339,18 @@ describe( 'Button', () => {
 			expect( screen.queryByText( 'Label' ) ).not.toBeInTheDocument();
 
 			// Move focus to the button
-			await user.tab();
+			await press.Tab();
 
 			expect( screen.getByText( 'Label' ) ).toBeVisible();
 
-			await cleanupTooltip( user );
+			await cleanupTooltip();
 		} );
 
 		it( 'should populate tooltip with description content for buttons with visible labels (buttons with children)', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<Button
 					label="Label"
-					describedBy="Description text"
+					description="Description text"
 					icon={ plusCircle }
 					showTooltip
 				>
@@ -255,7 +364,7 @@ describe( 'Button', () => {
 				} )
 			).toBeVisible();
 
-			await user.tab();
+			await press.Tab();
 
 			expect(
 				screen.getByRole( 'tooltip', {
@@ -263,12 +372,10 @@ describe( 'Button', () => {
 				} )
 			).toBeVisible();
 
-			await cleanupTooltip( user );
+			await cleanupTooltip();
 		} );
 
 		it( 'should allow tooltip disable', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<Button
 					icon={ plusCircle }
@@ -284,14 +391,12 @@ describe( 'Button', () => {
 			expect( screen.queryByText( 'WordPress' ) ).not.toBeInTheDocument();
 
 			// Move focus to the button
-			await user.tab();
+			await press.Tab();
 
 			expect( screen.queryByText( 'WordPress' ) ).not.toBeInTheDocument();
 		} );
 
 		it( 'should show the tooltip for empty children', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<Button icon={ plusCircle } label="WordPress" children={ [] } />
 			);
@@ -299,16 +404,14 @@ describe( 'Button', () => {
 			expect( screen.queryByText( 'WordPress' ) ).not.toBeInTheDocument();
 
 			// Move focus to the button
-			await user.tab();
+			await press.Tab();
 
 			expect( screen.getByText( 'WordPress' ) ).toBeVisible();
 
-			await cleanupTooltip( user );
+			await cleanupTooltip();
 		} );
 
 		it( 'should not show the tooltip when icon and children defined', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<Button icon={ plusCircle } label="WordPress">
 					Children
@@ -318,14 +421,12 @@ describe( 'Button', () => {
 			expect( screen.queryByText( 'WordPress' ) ).not.toBeInTheDocument();
 
 			// Move focus to the button
-			await user.tab();
+			await press.Tab();
 
 			expect( screen.queryByText( 'WordPress' ) ).not.toBeInTheDocument();
 		} );
 
 		it( 'should force showing the tooltip even if icon and children defined', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<Button icon={ plusCircle } label="WordPress" showTooltip>
 					Children
@@ -335,11 +436,11 @@ describe( 'Button', () => {
 			expect( screen.queryByText( 'WordPress' ) ).not.toBeInTheDocument();
 
 			// Move focus to the button
-			await user.tab();
+			await press.Tab();
 
 			expect( screen.getByText( 'WordPress' ) ).toBeVisible();
 
-			await cleanupTooltip( user );
+			await cleanupTooltip();
 		} );
 
 		describe( 'using `aria-pressed` prop', () => {
@@ -414,10 +515,24 @@ describe( 'Button', () => {
 
 		it( 'should become a button again when disabled is supplied', () => {
 			// @ts-expect-error - a button should not have `href`
+			// eslint-disable-next-line no-restricted-syntax
 			render( <Button href="https://wordpress.org/" disabled /> );
 
 			expect( screen.getByRole( 'button' ) ).toBeVisible();
 		} );
+
+		it( 'should become a button again when disabled is supplied, even with `accessibleWhenDisabled`', () => {
+			render(
+				<Button
+					// @ts-expect-error - a button should not have `href`
+					// eslint-disable-next-line no-restricted-syntax
+					href="https://wordpress.org/"
+					disabled
+					accessibleWhenDisabled
+				/>
+			);
+			expect( screen.getByRole( 'button' ) ).toBeVisible();
+		} );
 	} );
 
 	describe( 'ref forwarding', () => {
@@ -432,13 +547,11 @@ describe( 'Button', () => {
 
 	describe( 'deprecated props', () => {
 		it( 'should not break when the legacy isPrimary prop is passed', () => {
-			// @ts-expect-error
 			render( <Button isPrimary /> );
 			expect( screen.getByRole( 'button' ) ).toHaveClass( 'is-primary' );
 		} );
 
 		it( 'should not break when the legacy isSecondary prop is passed', () => {
-			// @ts-expect-error
 			render( <Button isSecondary /> );
 			expect( screen.getByRole( 'button' ) ).toHaveClass(
 				'is-secondary'
@@ -446,19 +559,16 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should not break when the legacy isTertiary prop is passed', () => {
-			// @ts-expect-error
 			render( <Button isTertiary /> );
 			expect( screen.getByRole( 'button' ) ).toHaveClass( 'is-tertiary' );
 		} );
 
 		it( 'should not break when the legacy isLink prop is passed', () => {
-			// @ts-expect-error
 			render( <Button isLink /> );
 			expect( screen.getByRole( 'button' ) ).toHaveClass( 'is-link' );
 		} );
 
 		it( 'should warn when the isDefault prop is passed', () => {
-			// @ts-expect-error
 			render( <Button isDefault /> );
 			expect( screen.getByRole( 'button' ) ).toHaveClass(
 				'is-secondary'
@@ -471,6 +581,11 @@ describe( 'Button', () => {
 			expect( screen.getByRole( 'button' ) ).toHaveClass( 'is-small' );
 		} );
 
+		it( 'should have the is-small class when small class prop is passed', () => {
+			render( <Button size="small" /> );
+			expect( screen.getByRole( 'button' ) ).toHaveClass( 'is-small' );
+		} );
+
 		it( 'should prioritize the `size` prop over `isSmall`', () => {
 			render( <Button size="compact" isSmall /> );
 			expect( screen.getByRole( 'button' ) ).not.toHaveClass(
@@ -495,6 +610,15 @@ describe( 'Button', () => {
 				'mixed'
 			);
 		} );
+
+		it( 'should not break when the legacy __experimentalIsFocusable prop is passed', () => {
+			// eslint-disable-next-line no-restricted-syntax
+			render( <Button disabled __experimentalIsFocusable /> );
+			const button = screen.getByRole( 'button' );
+
+			expect( button ).toBeEnabled();
+			expect( button ).toHaveAttribute( 'aria-disabled' );
+		} );
 	} );
 
 	describe( 'static typing', () => {
@@ -502,15 +626,19 @@ describe( 'Button', () => {
 			<Button href="foo" />
 			{ /* @ts-expect-error - `target` requires `href` */ }
 			<Button target="foo" />
+
+			{ /* eslint-disable no-restricted-syntax */ }
 			{ /* @ts-expect-error - `disabled` is only for buttons */ }
 			<Button href="foo" disabled />
+			{ /* eslint-enable no-restricted-syntax */ }
+
 			<Button href="foo" type="image/png" />
 			{ /* @ts-expect-error - if button, type must be submit/reset/button */ }
 			<Button type="image/png" />
 			{ /* @ts-expect-error */ }
 			<Button type="invalidtype" />
-			{ /* @ts-expect-error - although the runtime behavior will allow this to be an anchor, this is probably a mistake. */ }
-			<Button disabled __experimentalIsFocusable href="foo" />
+			{ /* @ts-expect-error */ }
+			<Button disabled accessibleWhenDisabled href="foo" />
 		</>;
 	} );
 } );
diff --git a/packages/components/src/button/types.ts b/packages/components/src/button/types.ts
index b781786cc12711..7d67b721a5036d 100644
--- a/packages/components/src/button/types.ts
+++ b/packages/components/src/button/types.ts
@@ -25,14 +25,27 @@ type BaseButtonProps = {
 	 * @default false
 	 */
 	__next40pxDefaultSize?: boolean;
+	/**
+	 * Whether to keep the button focusable when disabled.
+	 *
+	 * In most cases, it is recommended to set this to `true`. Disabling a control without maintaining focusability
+	 * can cause accessibility issues, by hiding their presence from screen reader users,
+	 * or by preventing focus from returning to a trigger element.
+	 *
+	 * Learn more about the [focusability of disabled controls](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#focusabilityofdisabledcontrols)
+	 * in the WAI-ARIA Authoring Practices Guide.
+	 *
+	 * @default false
+	 */
+	accessibleWhenDisabled?: boolean;
 	/**
 	 * The button's children.
 	 */
 	children?: ReactNode;
 	/**
-	 * An accessible description for the button.
+	 * A visually hidden accessible description for the button.
 	 */
-	describedBy?: string;
+	description?: string;
 	/**
 	 * If provided, renders an Icon component inside the button.
 	 */
@@ -61,15 +74,6 @@ type BaseButtonProps = {
 	 * Renders a pressed button style.
 	 */
 	isPressed?: boolean;
-	// TODO: Deprecate officially (add console warning and move to DeprecatedButtonProps).
-	/**
-	 * Decreases the size of the button.
-	 *
-	 * Deprecated in favor of the `size` prop. If both props are defined, the `size` prop will take precedence.
-	 *
-	 * @deprecated Use the `'small'` value on the `size` prop instead.
-	 */
-	isSmall?: boolean;
 	/**
 	 * Sets the `aria-label` of the component, if none is provided.
 	 * Sets the Tooltip content if `showTooltip` is provided.
@@ -114,24 +118,24 @@ type BaseButtonProps = {
 	 * 'link' (the link button styles)
 	 */
 	variant?: 'primary' | 'secondary' | 'tertiary' | 'link';
-	/**
-	 * Whether this is focusable.
-	 */
-	__experimentalIsFocusable?: boolean;
 };
 
 type _ButtonProps = {
 	/**
-	 * Whether the button is disabled.
-	 * If `true`, this will force a `button` element to be rendered.
+	 * Whether the button is disabled. If `true`, this will force a `button` element
+	 * to be rendered, even when an `href` is given.
+	 *
+	 * In most cases, it is recommended to also set the `accessibleWhenDisabled` prop to `true`.
 	 */
 	disabled?: boolean;
 };
 
 type AnchorProps = {
 	/**
-	 * Whether the button is disabled.
-	 * If `true`, this will force a `button` element to be rendered.
+	 * Whether the button is disabled. If `true`, this will force a `button` element
+	 * to be rendered, even when an `href` is given.
+	 *
+	 * In most cases, it is recommended to also set the `accessibleWhenDisabled` prop to `true`.
 	 */
 	disabled?: false;
 	/**
@@ -145,11 +149,63 @@ type AnchorProps = {
 };
 
 export type DeprecatedButtonProps = {
+	/**
+	 * Whether to keep the button focusable when disabled.
+	 *
+	 * @default false
+	 * @deprecated Use the `accessibleWhenDisabled` prop instead.
+	 * @ignore
+	 */
+	__experimentalIsFocusable?: boolean;
+	/**
+	 * Gives the button a default style.
+	 *
+	 * @deprecated Use the `'secondary'` value on the `variant` prop instead.
+	 * @ignore
+	 */
 	isDefault?: boolean;
+	/**
+	 * Gives the button a link style.
+	 *
+	 * @deprecated Use the `'link'` value on the `variant` prop instead.
+	 * @ignore
+	 */
 	isLink?: boolean;
+	/**
+	 * Gives the button a primary style.
+	 *
+	 * @deprecated Use the `'primary'` value on the `variant` prop instead.
+	 * @ignore
+	 */
 	isPrimary?: boolean;
+	/**
+	 * Gives the button a default style.
+	 *
+	 * @deprecated Use the `'secondary'` value on the `variant` prop instead.
+	 * @ignore
+	 */
 	isSecondary?: boolean;
+	/**
+	 * Gives the button a text-based style.
+	 *
+	 * @deprecated Use the `'tertiary'` value on the `variant` prop instead.
+	 * @ignore
+	 */
 	isTertiary?: boolean;
+	/**
+	 * Decreases the size of the button.
+	 *
+	 * @deprecated Use the `'small'` value on the `size` prop instead.
+	 * @ignore
+	 */
+	isSmall?: boolean;
+	/**
+	 * A visually hidden accessible description for the button.
+	 *
+	 * @deprecated Use the `description` prop instead.
+	 * @ignore
+	 */
+	describedBy?: string;
 };
 
 export type DeprecatedIconButtonProps = {
diff --git a/packages/components/src/card/card/README.md b/packages/components/src/card/card/README.md
index c7b70c8c6c907a..33b71cb74faa83 100644
--- a/packages/components/src/card/card/README.md
+++ b/packages/components/src/card/card/README.md
@@ -99,14 +99,14 @@ const Example = () => (
 		<CardMedia>
 			<img src="..." />
 		</CardMedia>
-		<CardHeader>...</CardHeader>
+		<CardFooter>...</CardFooter>
 	</Card>
 );
 ```
 
 ### Context
 
-`<Card />`'s sub-components are connected to `<Card />` using [Context](https://reactjs.org/docs/context.html). Certain props like `size` and `isBorderless` are passed through to some of the sub-components.
+`<Card />`'s sub-components are connected to `<Card />` using [Context](https://react.dev/learn/passing-data-deeply-with-context). Certain props like `size` and `isBorderless` are passed through to some of the sub-components.
 
 In the following example, the `<CardBody />` will render with a size of `small`:
 
diff --git a/packages/components/src/card/card/component.tsx b/packages/components/src/card/card/component.tsx
index 8fefc33bd48027..e459f9abb9275b 100644
--- a/packages/components/src/card/card/component.tsx
+++ b/packages/components/src/card/card/component.tsx
@@ -34,7 +34,7 @@ function UnconnectedCard(
 		size,
 		...otherProps
 	} = useCard( props );
-	const elevationBorderRadius = isRounded ? CONFIG.cardBorderRadius : 0;
+	const elevationBorderRadius = isRounded ? CONFIG.radiusLarge : 0;
 
 	const cx = useCx();
 
diff --git a/packages/components/src/card/stories/index.story.tsx b/packages/components/src/card/stories/index.story.tsx
index 8a20d82b318e3b..03726abbe754ee 100644
--- a/packages/components/src/card/stories/index.story.tsx
+++ b/packages/components/src/card/stories/index.story.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import type { Meta, StoryFn } from '@storybook/react';
+import type { Meta, StoryObj } from '@storybook/react';
 
 /**
  * Internal dependencies
@@ -22,7 +22,8 @@ const meta: Meta< typeof Card > = {
 	component: Card,
 	// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
 	subcomponents: { CardHeader, CardBody, CardDivider, CardMedia, CardFooter },
-	title: 'Components/Card',
+	title: 'Components/Containers/Card',
+	id: 'components-card',
 	argTypes: {
 		as: {
 			control: { type: null },
@@ -41,51 +42,52 @@ const meta: Meta< typeof Card > = {
 
 export default meta;
 
-const Template: StoryFn< typeof Card > = ( args ) => <Card { ...args } />;
-
-export const Default = Template.bind( {} );
-Default.args = {
-	children: (
-		<>
-			<CardHeader>
-				<Heading>CardHeader</Heading>
-			</CardHeader>
-			<CardBody>
-				<Text>CardBody</Text>
-			</CardBody>
-			<CardBody>
-				<Text>CardBody (before CardDivider)</Text>
-			</CardBody>
-			<CardDivider />
-			<CardBody>
-				<Text>CardBody (after CardDivider)</Text>
-			</CardBody>
-			<CardMedia>
-				<img
-					alt="Card Media"
-					src="https://images.unsplash.com/photo-1566125882500-87e10f726cdc?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1867&q=80"
-				/>
-			</CardMedia>
-			<CardFooter>
-				<Text>CardFooter</Text>
-				<Button variant="secondary">Action Button</Button>
-			</CardFooter>
-		</>
-	),
+export const Default: StoryObj< typeof Card > = {
+	args: {
+		children: (
+			<>
+				<CardHeader>
+					<Heading>CardHeader</Heading>
+				</CardHeader>
+				<CardBody>
+					<Text>CardBody</Text>
+				</CardBody>
+				<CardBody>
+					<Text>CardBody (before CardDivider)</Text>
+				</CardBody>
+				<CardDivider />
+				<CardBody>
+					<Text>CardBody (after CardDivider)</Text>
+				</CardBody>
+				<CardMedia>
+					<img
+						alt="Card Media"
+						src="https://images.unsplash.com/photo-1566125882500-87e10f726cdc?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1867&q=80"
+					/>
+				</CardMedia>
+				<CardFooter>
+					<Text>CardFooter</Text>
+					<Button variant="secondary">Action Button</Button>
+				</CardFooter>
+			</>
+		),
+	},
 };
 
 /**
  * `CardMedia` provides a container for full-bleed content within a `Card`,
  * such as images, video, or even just a background color. The corners will be rounded if necessary.
  */
-export const FullBleedContent = Template.bind( {} );
-FullBleedContent.args = {
-	...Default.args,
-	children: (
-		<CardMedia>
-			<div style={ { padding: 16, background: 'beige' } }>
-				Some full bleed content
-			</div>
-		</CardMedia>
-	),
+export const FullBleedContent: StoryObj< typeof Card > = {
+	...Default,
+	args: {
+		...Default.args,
+		children: (
+			<CardMedia>
+				<div style={ { padding: 16, background: 'beige' } }>
+					Some full bleed content
+				</div>
+			</CardMedia>
+		),
+	},
 };
diff --git a/packages/components/src/card/styles.ts b/packages/components/src/card/styles.ts
index fa70b19054e2fc..df0fe4eb7ed720 100644
--- a/packages/components/src/card/styles.ts
+++ b/packages/components/src/card/styles.ts
@@ -12,7 +12,7 @@ import { COLORS, CONFIG } from '../utils';
 // (as opposed to the `border` property), the value of the border radius needs
 // to be adjusted by removing 1px (this is because the `box-shadow` renders
 // as an "outer radius").
-const adjustedBorderRadius = `calc(${ CONFIG.cardBorderRadius } - 1px)`;
+const adjustedBorderRadius = `calc(${ CONFIG.radiusLarge } - 1px)`;
 
 export const Card = css`
 	box-shadow: 0 0 0 1px ${ CONFIG.surfaceBorderColor };
diff --git a/packages/components/src/card/test/__snapshots__/index.tsx.snap b/packages/components/src/card/test/__snapshots__/index.tsx.snap
index b86714d86636a8..e9073edba3e3e4 100644
--- a/packages/components/src/card/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/card/test/__snapshots__/index.tsx.snap
@@ -8,8 +8,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-card__body components-card-body css-1nwhnu3-View-Body-borderRadius-medium e19lxcc00"
-+     class="components-scrollable components-card__body components-card-body css-1w878rm-View-Scrollable-scrollableScrollbar-scrollY-Body-borderRadius-medium e19lxcc00"
+-     class="components-card__body components-card-body css-12jqy32-PolymorphicDiv-Body-borderRadius-medium e19lxcc00"
++     class="components-scrollable components-card__body components-card-body css-26nv7r-PolymorphicDiv-Scrollable-scrollableScrollbar-scrollY-Body-borderRadius-medium e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="CardBody"
     >
@@ -25,8 +25,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-card__body components-card-body css-1nwhnu3-View-Body-borderRadius-medium e19lxcc00"
-+     class="components-card__body components-card-body css-1nhkags-View-Body-borderRadius-medium-shady e19lxcc00"
+-     class="components-card__body components-card-body css-12jqy32-PolymorphicDiv-Body-borderRadius-medium e19lxcc00"
++     class="components-card__body components-card-body css-1j7lja1-PolymorphicDiv-Body-borderRadius-medium-shady e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="CardBody"
     >
@@ -42,8 +42,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-flex components-card__footer components-card-footer css-120suhd-View-Flex-base-ItemsRow-Footer-borderRadius-borderColor-medium e19lxcc00"
-+     class="components-flex components-card__footer components-card-footer css-19jxwll-View-Flex-base-ItemsRow-Footer-borderRadius-borderColor-medium-shady e19lxcc00"
+-     class="components-flex components-card__footer components-card-footer css-19sc0cg-PolymorphicDiv-Flex-base-ItemsRow-Footer-borderRadius-borderColor-medium e19lxcc00"
++     class="components-flex components-card__footer components-card-footer css-14budie-PolymorphicDiv-Flex-base-ItemsRow-Footer-borderRadius-borderColor-medium-shady e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="CardFooter"
     >
@@ -59,8 +59,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-flex components-card__footer components-card-footer css-120suhd-View-Flex-base-ItemsRow-Footer-borderRadius-borderColor-medium e19lxcc00"
-+     class="components-flex components-card__footer components-card-footer css-ys33kb-View-Flex-base-ItemsRow-Footer-borderRadius-borderColor-medium e19lxcc00"
+-     class="components-flex components-card__footer components-card-footer css-19sc0cg-PolymorphicDiv-Flex-base-ItemsRow-Footer-borderRadius-borderColor-medium e19lxcc00"
++     class="components-flex components-card__footer components-card-footer css-2io175-PolymorphicDiv-Flex-base-ItemsRow-Footer-borderRadius-borderColor-medium e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="CardFooter"
     >
@@ -76,8 +76,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-flex components-card__header components-card-header css-3fkkv8-View-Flex-base-ItemsRow-Header-borderRadius-borderColor-medium e19lxcc00"
-+     class="components-flex components-card__header components-card-header css-1qktnah-View-Flex-base-ItemsRow-Header-borderRadius-borderColor-medium-shady e19lxcc00"
+-     class="components-flex components-card__header components-card-header css-1qwshfy-PolymorphicDiv-Flex-base-ItemsRow-Header-borderRadius-borderColor-medium e19lxcc00"
++     class="components-flex components-card__header components-card-header css-1bzc8bz-PolymorphicDiv-Flex-base-ItemsRow-Header-borderRadius-borderColor-medium-shady e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="CardHeader"
     >
@@ -93,19 +93,19 @@ Snapshot Diff:
 @@ -6,18 +6,18 @@
     >
       <div
-        class="css-mgwsf4-View-Content e19lxcc00"
+        class="css-76dw7d-PolymorphicDiv-Content e19lxcc00"
       >
         <div
--         class="components-flex components-card__header components-card-header css-3fkkv8-View-Flex-base-ItemsRow-Header-borderRadius-borderColor-medium e19lxcc00"
-+         class="components-flex components-card__header components-card-header css-2feznw-View-Flex-base-ItemsRow-Header-borderRadius-borderColor-large e19lxcc00"
+-         class="components-flex components-card__header components-card-header css-1qwshfy-PolymorphicDiv-Flex-base-ItemsRow-Header-borderRadius-borderColor-medium e19lxcc00"
++         class="components-flex components-card__header components-card-header css-1t2zg3y-PolymorphicDiv-Flex-base-ItemsRow-Header-borderRadius-borderColor-large e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="CardHeader"
         >
           Header
         </div>
         <div
--         class="components-card__body components-card-body css-1nwhnu3-View-Body-borderRadius-medium e19lxcc00"
-+         class="components-card__body components-card-body css-1nonx1n-View-Body-borderRadius-large e19lxcc00"
+-         class="components-card__body components-card-body css-12jqy32-PolymorphicDiv-Body-borderRadius-medium e19lxcc00"
++         class="components-card__body components-card-body css-e0vrqx-PolymorphicDiv-Body-borderRadius-large e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="CardBody"
         >
@@ -122,7 +122,7 @@ Snapshot Diff:
   Array [
     Object {
       "background-color": "#fff",
--     "border-radius": "calc(2px - 1px)",
+-     "border-radius": "calc(8px - 1px)",
       "box-shadow": "0 0 0 1px rgba(0, 0, 0, 0.1)",
       "color": "#1e1e1e",
       "outline": "none",
@@ -138,27 +138,27 @@ Snapshot Diff:
 @@ -6,25 +6,25 @@
     >
       <div
-        class="css-mgwsf4-View-Content e19lxcc00"
+        class="css-76dw7d-PolymorphicDiv-Content e19lxcc00"
       >
         <div
--         class="components-flex components-card__header components-card-header css-ed5e1x-View-Flex-base-ItemsRow-Header-borderRadius-borderColor-large-borderless e19lxcc00"
-+         class="components-flex components-card__header components-card-header css-1f9ii60-View-Flex-base-ItemsRow-Header-borderRadius-borderColor-small e19lxcc00"
+-         class="components-flex components-card__header components-card-header css-ubn8f6-PolymorphicDiv-Flex-base-ItemsRow-Header-borderRadius-borderColor-large-borderless e19lxcc00"
++         class="components-flex components-card__header components-card-header css-1t1rswf-PolymorphicDiv-Flex-base-ItemsRow-Header-borderRadius-borderColor-small e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="CardHeader"
         >
           Header
         </div>
         <div
--         class="components-card__body components-card-body css-1nonx1n-View-Body-borderRadius-large e19lxcc00"
-+         class="components-card__body components-card-body css-1nwhnu3-View-Body-borderRadius-medium e19lxcc00"
+-         class="components-card__body components-card-body css-e0vrqx-PolymorphicDiv-Body-borderRadius-large e19lxcc00"
++         class="components-card__body components-card-body css-12jqy32-PolymorphicDiv-Body-borderRadius-medium e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="CardBody"
         >
           Body
         </div>
         <div
--         class="components-flex components-card__footer components-card-footer css-ide17g-View-Flex-base-ItemsRow-Footer-borderRadius-borderColor-large-borderless e19lxcc00"
-+         class="components-flex components-card__footer components-card-footer css-jsws2e-View-Flex-base-ItemsRow-Footer-borderRadius-borderColor-xSmallCardPadding e19lxcc00"
+-         class="components-flex components-card__footer components-card-footer css-167csgt-PolymorphicDiv-Flex-base-ItemsRow-Footer-borderRadius-borderColor-large-borderless e19lxcc00"
++         class="components-flex components-card__footer components-card-footer css-1kcgqsk-PolymorphicDiv-Flex-base-ItemsRow-Footer-borderRadius-borderColor-xSmallCardPadding e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="CardFooter"
         >
@@ -174,33 +174,33 @@ Snapshot Diff:
 @@ -1,30 +1,30 @@
   <div>
     <div
--     class="components-surface components-card css-hkvggq-View-Surface-getBorders-primary-Card-boxShadowless-rounded e19lxcc00"
-+     class="components-surface components-card css-nsno0f-View-Surface-getBorders-primary-Card-rounded e19lxcc00"
+-     class="components-surface components-card css-1hs39fv-PolymorphicDiv-Surface-getBorders-primary-Card-boxShadowless-rounded e19lxcc00"
++     class="components-surface components-card css-1c6nh8q-PolymorphicDiv-Surface-getBorders-primary-Card-rounded e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="Card"
     >
       <div
-        class="css-mgwsf4-View-Content e19lxcc00"
+        class="css-76dw7d-PolymorphicDiv-Content e19lxcc00"
       >
         <div
--         class="components-flex components-card__header components-card-header css-ed5e1x-View-Flex-base-ItemsRow-Header-borderRadius-borderColor-large-borderless e19lxcc00"
-+         class="components-flex components-card__header components-card-header css-1f9ii60-View-Flex-base-ItemsRow-Header-borderRadius-borderColor-small e19lxcc00"
+-         class="components-flex components-card__header components-card-header css-ubn8f6-PolymorphicDiv-Flex-base-ItemsRow-Header-borderRadius-borderColor-large-borderless e19lxcc00"
++         class="components-flex components-card__header components-card-header css-1t1rswf-PolymorphicDiv-Flex-base-ItemsRow-Header-borderRadius-borderColor-small e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="CardHeader"
         >
           Header
         </div>
         <div
--         class="components-card__body components-card-body css-1nonx1n-View-Body-borderRadius-large e19lxcc00"
-+         class="components-card__body components-card-body css-5spj1a-View-Body-borderRadius-small e19lxcc00"
+-         class="components-card__body components-card-body css-e0vrqx-PolymorphicDiv-Body-borderRadius-large e19lxcc00"
++         class="components-card__body components-card-body css-hms9n9-PolymorphicDiv-Body-borderRadius-small e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="CardBody"
         >
           Body
         </div>
         <div
--         class="components-flex components-card__footer components-card-footer css-ide17g-View-Flex-base-ItemsRow-Footer-borderRadius-borderColor-large-borderless e19lxcc00"
-+         class="components-flex components-card__footer components-card-footer css-1ih54yp-View-Flex-base-ItemsRow-Footer-borderRadius-borderColor-small e19lxcc00"
+-         class="components-flex components-card__footer components-card-footer css-167csgt-PolymorphicDiv-Flex-base-ItemsRow-Footer-borderRadius-borderColor-large-borderless e19lxcc00"
++         class="components-flex components-card__footer components-card-footer css-18yn3ff-PolymorphicDiv-Flex-base-ItemsRow-Footer-borderRadius-borderColor-small e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="CardFooter"
         >
@@ -215,7 +215,7 @@ exports[`Card Card component should render correctly 1`] = `
   position: relative;
   box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1);
   outline: none;
-  border-radius: calc(2px - 1px);
+  border-radius: calc(8px - 1px);
 }
 
 .emotion-2 {
@@ -254,13 +254,13 @@ exports[`Card Card component should render correctly 1`] = `
 }
 
 .emotion-4:first-of-type {
-  border-top-left-radius: calc(2px - 1px);
-  border-top-right-radius: calc(2px - 1px);
+  border-top-left-radius: calc(8px - 1px);
+  border-top-right-radius: calc(8px - 1px);
 }
 
 .emotion-4:last-of-type {
-  border-bottom-left-radius: calc(2px - 1px);
-  border-bottom-right-radius: calc(2px - 1px);
+  border-bottom-left-radius: calc(8px - 1px);
+  border-bottom-right-radius: calc(8px - 1px);
 }
 
 .emotion-6 {
@@ -271,13 +271,13 @@ exports[`Card Card component should render correctly 1`] = `
 }
 
 .emotion-6:first-of-type {
-  border-top-left-radius: calc(2px - 1px);
-  border-top-right-radius: calc(2px - 1px);
+  border-top-left-radius: calc(8px - 1px);
+  border-top-right-radius: calc(8px - 1px);
 }
 
 .emotion-6:last-of-type {
-  border-bottom-left-radius: calc(2px - 1px);
-  border-bottom-right-radius: calc(2px - 1px);
+  border-bottom-left-radius: calc(8px - 1px);
+  border-bottom-right-radius: calc(8px - 1px);
 }
 
 .emotion-10 {
@@ -306,13 +306,13 @@ exports[`Card Card component should render correctly 1`] = `
 }
 
 .emotion-14:first-of-type {
-  border-top-left-radius: calc(2px - 1px);
-  border-top-right-radius: calc(2px - 1px);
+  border-top-left-radius: calc(8px - 1px);
+  border-top-right-radius: calc(8px - 1px);
 }
 
 .emotion-14:last-of-type {
-  border-bottom-left-radius: calc(2px - 1px);
-  border-bottom-right-radius: calc(2px - 1px);
+  border-bottom-left-radius: calc(8px - 1px);
+  border-bottom-right-radius: calc(8px - 1px);
 }
 
 .emotion-16 {
@@ -347,13 +347,13 @@ exports[`Card Card component should render correctly 1`] = `
 }
 
 .emotion-16:first-of-type {
-  border-top-left-radius: calc(2px - 1px);
-  border-top-right-radius: calc(2px - 1px);
+  border-top-left-radius: calc(8px - 1px);
+  border-top-right-radius: calc(8px - 1px);
 }
 
 .emotion-16:last-of-type {
-  border-bottom-left-radius: calc(2px - 1px);
-  border-bottom-right-radius: calc(2px - 1px);
+  border-bottom-left-radius: calc(8px - 1px);
+  border-bottom-right-radius: calc(8px - 1px);
 }
 
 .emotion-18 {
@@ -370,14 +370,13 @@ exports[`Card Card component should render correctly 1`] = `
   left: 0;
   right: 0;
   top: 0;
-  -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  border-radius: 2px;
+  border-radius: 8px;
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-18 {
-    transition-duration: 0ms;
+    -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
+    transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
   }
 }
 
@@ -470,15 +469,15 @@ Snapshot Diff:
       </div>
       <div
         aria-hidden="true"
--       class="components-elevation css-1lsfy80-View-Elevation-sx-Base-elevationClassName e19lxcc00"
-+       class="components-elevation css-15t1t3g-View-Elevation-sx-Base-elevationClassName e19lxcc00"
+-       class="components-elevation css-a91pvj-PolymorphicDiv-Elevation-sx-Base-sx-Base-elevationClassName e19lxcc00"
++       class="components-elevation css-1q4cuxd-PolymorphicDiv-Elevation-sx-Base-sx-Base-elevationClassName e19lxcc00"
         data-wp-c16t="true"
         data-wp-component="Elevation"
       />
       <div
         aria-hidden="true"
--       class="components-elevation css-18cl04p-View-Elevation-sx-Base-elevationClassName e19lxcc00"
-+       class="components-elevation css-15t1t3g-View-Elevation-sx-Base-elevationClassName e19lxcc00"
+-       class="components-elevation css-5u83fl-PolymorphicDiv-Elevation-sx-Base-sx-Base-elevationClassName e19lxcc00"
++       class="components-elevation css-1q4cuxd-PolymorphicDiv-Elevation-sx-Base-sx-Base-elevationClassName e19lxcc00"
         data-wp-c16t="true"
         data-wp-component="Elevation"
       />
@@ -498,7 +497,7 @@ exports[`Card Card component should warn when the isElevated prop is passed 1`]
   position: relative;
   box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1);
   outline: none;
-  border-radius: calc(2px - 1px);
+  border-radius: calc(8px - 1px);
 }
 
 .emotion-2 {
@@ -519,14 +518,13 @@ exports[`Card Card component should warn when the isElevated prop is passed 1`]
   left: 0;
   right: 0;
   top: 0;
-  -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  border-radius: 2px;
+  border-radius: 8px;
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-4 {
-    transition-duration: 0ms;
+    -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
+    transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
   }
 }
 
@@ -544,14 +542,13 @@ exports[`Card Card component should warn when the isElevated prop is passed 1`]
   left: 0;
   right: 0;
   top: 0;
-  -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  border-radius: 2px;
+  border-radius: 8px;
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-6 {
-    transition-duration: 0ms;
+    -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
+    transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
   }
 }
 
diff --git a/packages/components/src/checkbox-control/README.md b/packages/components/src/checkbox-control/README.md
index 66f3cae2be379e..90c33a1fab78d5 100644
--- a/packages/components/src/checkbox-control/README.md
+++ b/packages/components/src/checkbox-control/README.md
@@ -2,15 +2,7 @@
 
 Checkboxes allow the user to select one or more items from a set.
 
-![](https://make.wordpress.org/design/files/2019/02/CheckboxControl.png)
-
-Selected and unselected checkboxes
-
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
+![Selected and unselected checkboxes](https://make.wordpress.org/design/files/2019/02/CheckboxControl.png)
 
 ## Design guidelines
 
@@ -63,6 +55,7 @@ const MyCheckboxControl = () => {
 	const [ isChecked, setChecked ] = useState( true );
 	return (
 		<CheckboxControl
+			__nextHasNoMarginBottom
 			label="Is author"
 			help="Is the user a author or not?"
 			checked={ isChecked }
@@ -77,12 +70,11 @@ const MyCheckboxControl = () => {
 The set of props accepted by the component will be specified below.
 Props not included in this set will be applied to the input element.
 
-#### `label`: `string|false`
+#### `label`: `string`
 
 A label for the input field, that appears at the side of the checkbox.
 The prop will be rendered as content a label element.
 If no prop is passed an empty label is rendered.
-If the prop is set to false no label is rendered.
 
 -   Required: No
 
@@ -111,6 +103,13 @@ If indeterminate is true the state of the checkbox will be indeterminate.
 
 -   Required: No
 
+#### `__nextHasNoMarginBottom`: `boolean`
+
+Start opting into the new margin-free styles that will become the default in a future version.
+
+-   Required: No
+-   Default: `false`
+
 ## Related components
 
 -   To select one option from a set, and you want to show all the available options at once, use the `RadioControl` component.
diff --git a/packages/components/src/checkbox-control/index.tsx b/packages/components/src/checkbox-control/index.tsx
index 54a9952d199491..a24d1abaab45a7 100644
--- a/packages/components/src/checkbox-control/index.tsx
+++ b/packages/components/src/checkbox-control/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ChangeEvent } from 'react';
 
 /**
@@ -16,6 +16,7 @@ import { Icon, check, reset } from '@wordpress/icons';
  * Internal dependencies
  */
 import BaseControl from '../base-control';
+import { HStack } from '../h-stack';
 import type { CheckboxControlProps } from './types';
 import type { WordPressComponentProps } from '../context';
 
@@ -30,6 +31,7 @@ import type { WordPressComponentProps } from '../context';
  *   const [ isChecked, setChecked ] = useState( true );
  *   return (
  *     <CheckboxControl
+ *       __nextHasNoMarginBottom
  *       label="Is author"
  *       help="Is the user a author or not?"
  *       checked={ isChecked }
@@ -93,46 +95,55 @@ export function CheckboxControl(
 	return (
 		<BaseControl
 			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+			__associatedWPComponentName="CheckboxControl"
 			label={ heading }
 			id={ id }
-			help={ help }
-			className={ classnames( 'components-checkbox-control', className ) }
+			help={
+				help && (
+					<span className="components-checkbox-control__help">
+						{ help }
+					</span>
+				)
+			}
+			className={ clsx( 'components-checkbox-control', className ) }
 		>
-			<span className="components-checkbox-control__input-container">
-				<input
-					ref={ ref }
-					id={ id }
-					className="components-checkbox-control__input"
-					type="checkbox"
-					value="1"
-					onChange={ onChangeValue }
-					checked={ checked }
-					aria-describedby={ !! help ? id + '__help' : undefined }
-					{ ...additionalProps }
-				/>
-				{ showIndeterminateIcon ? (
-					<Icon
-						icon={ reset }
-						className="components-checkbox-control__indeterminate"
-						role="presentation"
-					/>
-				) : null }
-				{ showCheckedIcon ? (
-					<Icon
-						icon={ check }
-						className="components-checkbox-control__checked"
-						role="presentation"
+			<HStack spacing={ 0 } justify="start" alignment="top">
+				<span className="components-checkbox-control__input-container">
+					<input
+						ref={ ref }
+						id={ id }
+						className="components-checkbox-control__input"
+						type="checkbox"
+						value="1"
+						onChange={ onChangeValue }
+						checked={ checked }
+						aria-describedby={ !! help ? id + '__help' : undefined }
+						{ ...additionalProps }
 					/>
-				) : null }
-			</span>
-			{ label && (
-				<label
-					className="components-checkbox-control__label"
-					htmlFor={ id }
-				>
-					{ label }
-				</label>
-			) }
+					{ showIndeterminateIcon ? (
+						<Icon
+							icon={ reset }
+							className="components-checkbox-control__indeterminate"
+							role="presentation"
+						/>
+					) : null }
+					{ showCheckedIcon ? (
+						<Icon
+							icon={ check }
+							className="components-checkbox-control__checked"
+							role="presentation"
+						/>
+					) : null }
+				</span>
+				{ label && (
+					<label
+						className="components-checkbox-control__label"
+						htmlFor={ id }
+					>
+						{ label }
+					</label>
+				) }
+			</HStack>
 		</BaseControl>
 	);
 }
diff --git a/packages/components/src/checkbox-control/stories/index.story.tsx b/packages/components/src/checkbox-control/stories/index.story.tsx
index ce55cfb655a17c..3c55ba3192a3cf 100644
--- a/packages/components/src/checkbox-control/stories/index.story.tsx
+++ b/packages/components/src/checkbox-control/stories/index.story.tsx
@@ -13,6 +13,7 @@ import { useState } from '@wordpress/element';
  */
 import CheckboxControl from '..';
 import { VStack } from '../../v-stack';
+import { HStack } from '../../h-stack';
 
 const meta: Meta< typeof CheckboxControl > = {
 	component: CheckboxControl,
@@ -58,6 +59,7 @@ export const Default: StoryFn< typeof CheckboxControl > = DefaultTemplate.bind(
 	{}
 );
 Default.args = {
+	__nextHasNoMarginBottom: true,
 	label: 'Is author',
 	help: 'Is the user an author or not?',
 };
@@ -115,3 +117,49 @@ Indeterminate.args = {
 	label: 'Select all',
 	__nextHasNoMarginBottom: true,
 };
+
+/**
+ * For more complex designs, a custom `<label>` element can be associated with the checkbox
+ * by leaving the `label` prop undefined and using the `id` and `htmlFor` props instead.
+ * Because the label element also functions as a click target for the checkbox, [do not
+ * place interactive elements](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label#interactive_content)
+ * such as links or buttons inside the `<label>` node.
+ *
+ * Similarly, a custom description can be added by omitting the `help` prop
+ * and using the `aria-describedby` prop instead.
+ */
+export const WithCustomLabel: StoryFn< typeof CheckboxControl > = ( {
+	onChange,
+	...args
+} ) => {
+	const [ isChecked, setChecked ] = useState( true );
+
+	return (
+		<HStack justify="flex-start" alignment="top" spacing={ 0 }>
+			<CheckboxControl
+				{ ...args }
+				checked={ isChecked }
+				onChange={ ( v ) => {
+					setChecked( v );
+					onChange( v );
+				} }
+				// Disable reason: For simplicity of the code snippet.
+				// eslint-disable-next-line no-restricted-syntax
+				id="my-checkbox-with-custom-label"
+				aria-describedby="my-custom-description"
+			/>
+			<VStack>
+				<label htmlFor="my-checkbox-with-custom-label">
+					My custom label
+				</label>
+				{ /* eslint-disable-next-line no-restricted-syntax */ }
+				<div id="my-custom-description" style={ { fontSize: 13 } }>
+					A custom description.
+				</div>
+			</VStack>
+		</HStack>
+	);
+};
+WithCustomLabel.args = {
+	__nextHasNoMarginBottom: true,
+};
diff --git a/packages/components/src/checkbox-control/style.scss b/packages/components/src/checkbox-control/style.scss
index 4121250a7308a2..25394ba645ee80 100644
--- a/packages/components/src/checkbox-control/style.scss
+++ b/packages/components/src/checkbox-control/style.scss
@@ -1,5 +1,19 @@
-$checkbox-input-size: 20px;
-$checkbox-input-size-sm: 24px; // Width & height for small viewports.
+.components-checkbox-control {
+	// Careful, these CSS vars have experimental overrides in Data Views (packages/dataviews/src/style.scss).
+	--checkbox-input-size: 24px; // Width & height for small viewports.
+
+	@include break-small() {
+		--checkbox-input-size: 16px;
+	}
+
+	--checkbox-input-margin: #{$grid-unit-10};
+}
+
+.components-checkbox-control__label {
+	// Ensure label is aligned with checkbox along X axis
+	line-height: var(--checkbox-input-size);
+	cursor: pointer;
+}
 
 .components-checkbox-control__input[type="checkbox"] {
 	@include checkbox-control;
@@ -14,13 +28,8 @@ $checkbox-input-size-sm: 24px; // Width & height for small viewports.
 	padding: 0 !important;
 	text-align: center;
 	vertical-align: top;
-	width: $checkbox-input-size-sm;
-	height: $checkbox-input-size-sm;
-
-	@include break-small() {
-		height: $checkbox-input-size;
-		width: $checkbox-input-size;
-	}
+	width: var(--checkbox-input-size);
+	height: var(--checkbox-input-size);
 
 	appearance: none;
 	transition: 0.1s border-color ease-in-out;
@@ -49,31 +58,35 @@ $checkbox-input-size-sm: 24px; // Width & height for small viewports.
 .components-checkbox-control__input-container {
 	position: relative;
 	display: inline-block;
-	margin-right: 12px;
+	margin-right: var(--checkbox-input-margin);
 	vertical-align: middle;
-	width: $checkbox-input-size-sm;
-	height: $checkbox-input-size-sm;
-
-	@include break-small() {
-		width: $checkbox-input-size;
-		height: $checkbox-input-size;
-	}
+	width: var(--checkbox-input-size);
+	aspect-ratio: 1;
+	line-height: 1; // maintains proper height even with WP common.css
+	flex-shrink: 0;
 }
 
 svg.components-checkbox-control__checked,
 svg.components-checkbox-control__indeterminate {
+	--checkmark-size: var(--checkbox-input-size);
+
 	fill: $white;
 	cursor: pointer;
 	position: absolute;
-	left: 0;
-	top: 0;
-	width: $button-size-small;
-	height: $button-size-small;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	width: var(--checkmark-size);
+	height: var(--checkmark-size);
+	user-select: none;
+	pointer-events: none;
 
 	@include break-small() {
-		left: -2px;
-		top: -2px;
+		--checkmark-size: calc(var(--checkbox-input-size) + 4px);
 	}
-	user-select: none;
-	pointer-events: none;
+}
+
+.components-checkbox-control__help {
+	display: inline-block;
+	margin-inline-start: calc(var(--checkbox-input-size) + var(--checkbox-input-margin));
 }
diff --git a/packages/components/src/checkbox-control/test/__snapshots__/index.tsx.snap b/packages/components/src/checkbox-control/test/__snapshots__/index.tsx.snap
index f3bdccc1ccff6b..6a4d345cc445bf 100644
--- a/packages/components/src/checkbox-control/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/checkbox-control/test/__snapshots__/index.tsx.snap
@@ -5,32 +5,33 @@ Snapshot Diff:
 - First value
 + Second value
 
-@@ -8,13 +8,27 @@
-        <span
-          class="components-checkbox-control__input-container"
-        >
-          <input
-            class="components-checkbox-control__input"
--           id="inspector-checkbox-control-6"
-+           id="inspector-checkbox-control-7"
-            type="checkbox"
-            value="1"
-+         />
-+         <svg
-+           aria-hidden="true"
-+           class="components-checkbox-control__indeterminate"
-+           focusable="false"
-+           height="24"
-+           role="presentation"
-+           viewBox="0 0 24 24"
-+           width="24"
-+           xmlns="http://www.w3.org/2000/svg"
-+         >
-+           <path
-+             d="M7 11.5h10V13H7z"
-            />
-+         </svg>
-        </span>
+@@ -13,14 +13,28 @@
+          <span
+            class="components-checkbox-control__input-container"
+          >
+            <input
+              class="components-checkbox-control__input"
+-             id="inspector-checkbox-control-6"
++             id="inspector-checkbox-control-7"
+              type="checkbox"
+              value="1"
++           />
++           <svg
++             aria-hidden="true"
++             class="components-checkbox-control__indeterminate"
++             focusable="false"
++             height="24"
++             role="presentation"
++             viewBox="0 0 24 24"
++             width="24"
++             xmlns="http://www.w3.org/2000/svg"
++           >
++             <path
++               d="M7 11.5h10V13H7z"
+              />
++           </svg>
+          </span>
+        </div>
       </div>
     </div>
   </div>
diff --git a/packages/components/src/checkbox-control/test/index.tsx b/packages/components/src/checkbox-control/test/index.tsx
index 55e1447661392e..547f479184e862 100644
--- a/packages/components/src/checkbox-control/test/index.tsx
+++ b/packages/components/src/checkbox-control/test/index.tsx
@@ -20,13 +20,20 @@ const noop = () => {};
 const getInput = () => screen.getByRole( 'checkbox' ) as HTMLInputElement;
 
 const CheckboxControl = ( props: Omit< CheckboxControlProps, 'onChange' > ) => {
-	return <BaseCheckboxControl onChange={ noop } { ...props } />;
+	return (
+		<BaseCheckboxControl
+			onChange={ noop }
+			{ ...props }
+			__nextHasNoMarginBottom
+		/>
+	);
 };
 
 const ControlledCheckboxControl = ( { onChange }: CheckboxControlProps ) => {
 	const [ isChecked, setChecked ] = useState( false );
 	return (
 		<BaseCheckboxControl
+			__nextHasNoMarginBottom
 			checked={ isChecked }
 			onChange={ ( value ) => {
 				setChecked( value );
@@ -60,8 +67,8 @@ describe( 'CheckboxControl', () => {
 			expect( label ).toBeInTheDocument();
 		} );
 
-		it( 'should not render label element if label is set to false', () => {
-			render( <CheckboxControl label={ false } /> );
+		it( 'should not render label element if label is not set', () => {
+			render( <CheckboxControl /> );
 
 			const label = screen.queryByRole( 'label' );
 			expect( label ).not.toBeInTheDocument();
@@ -86,6 +93,11 @@ describe( 'CheckboxControl', () => {
 				containerIndeterminate
 			);
 		} );
+
+		it( 'should associate the `help` text accessibly', () => {
+			render( <CheckboxControl help="Help text" /> );
+			expect( getInput() ).toHaveAccessibleDescription( 'Help text' );
+		} );
 	} );
 
 	describe( 'Value', () => {
diff --git a/packages/components/src/checkbox-control/types.ts b/packages/components/src/checkbox-control/types.ts
index 48a1d02affb700..07ab55493fc661 100644
--- a/packages/components/src/checkbox-control/types.ts
+++ b/packages/components/src/checkbox-control/types.ts
@@ -19,10 +19,9 @@ export type CheckboxControlProps = Pick<
 	/**
 	 * A label for the input field, that appears at the side of the checkbox.
 	 * The prop will be rendered as content a label element. If no prop is
-	 * passed an empty label is rendered. If the prop is set to false no label
-	 * is rendered.
+	 * passed an empty label is rendered.
 	 */
-	label?: string | false;
+	label?: string;
 	/**
 	 * If checked is true the checkbox will be checked. If checked is false the
 	 * checkbox will be unchecked. If no value is passed the checkbox will be
diff --git a/packages/components/src/circular-option-picker/circular-option-picker-actions.tsx b/packages/components/src/circular-option-picker/circular-option-picker-actions.tsx
index a9c86b4240ee9b..4cf4d6f95da383 100644
--- a/packages/components/src/circular-option-picker/circular-option-picker-actions.tsx
+++ b/packages/components/src/circular-option-picker/circular-option-picker-actions.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
@@ -20,7 +20,7 @@ export function DropdownLinkAction( {
 }: DropdownLinkActionProps ) {
 	return (
 		<Dropdown
-			className={ classnames(
+			className={ clsx(
 				'components-circular-option-picker__dropdown-link-action',
 				className
 			) }
@@ -47,7 +47,7 @@ export function ButtonAction( {
 }: WordPressComponentProps< ButtonAsButtonProps, 'button', false > ) {
 	return (
 		<Button
-			className={ classnames(
+			className={ clsx(
 				'components-circular-option-picker__clear',
 				className
 			) }
diff --git a/packages/components/src/circular-option-picker/circular-option-picker-option-group.tsx b/packages/components/src/circular-option-picker/circular-option-picker-option-group.tsx
index 2b50d80799b849..a4a8da1b62b58e 100644
--- a/packages/components/src/circular-option-picker/circular-option-picker-option-group.tsx
+++ b/packages/components/src/circular-option-picker/circular-option-picker-option-group.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
@@ -22,7 +22,7 @@ export function OptionGroup( {
 		<div
 			{ ...additionalProps }
 			role={ role }
-			className={ classnames(
+			className={ clsx(
 				'components-circular-option-picker__option-group',
 				'components-circular-option-picker__swatches',
 				className
diff --git a/packages/components/src/circular-option-picker/circular-option-picker-option.tsx b/packages/components/src/circular-option-picker/circular-option-picker-option.tsx
index 7dcfd635557550..276ab7549781ed 100644
--- a/packages/components/src/circular-option-picker/circular-option-picker-option.tsx
+++ b/packages/components/src/circular-option-picker/circular-option-picker-option.tsx
@@ -1,14 +1,14 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef } from 'react';
 
 /**
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { forwardRef, useContext } from '@wordpress/element';
+import { forwardRef, useContext, useEffect } from '@wordpress/element';
 import { Icon, check } from '@wordpress/icons';
 
 /**
@@ -16,9 +16,9 @@ import { Icon, check } from '@wordpress/icons';
  */
 import { CircularOptionPickerContext } from './circular-option-picker-context';
 import Button from '../button';
-import { CompositeItem } from '../composite/v2';
+import { Composite } from '../composite';
 import Tooltip from '../tooltip';
-import type { OptionProps, CircularOptionPickerCompositeStore } from './types';
+import type { OptionProps } from './types';
 
 function UnforwardedOptionAsButton(
 	props: {
@@ -45,19 +45,24 @@ function UnforwardedOptionAsOption(
 		id: string;
 		className?: string;
 		isSelected?: boolean;
-		compositeStore: CircularOptionPickerCompositeStore;
 	},
 	forwardedRef: ForwardedRef< any >
 ) {
-	const { id, isSelected, compositeStore, ...additionalProps } = props;
-	const activeId = compositeStore.useState( 'activeId' );
+	const { id, isSelected, ...additionalProps } = props;
 
-	if ( isSelected && ! activeId ) {
-		compositeStore.setActiveId( id );
-	}
+	const { setActiveId, activeId } = useContext( CircularOptionPickerContext );
+
+	useEffect( () => {
+		if ( isSelected && ! activeId ) {
+			// The setTimeout call is necessary to make sure that this update
+			// doesn't get overridden by `Composite`'s internal logic, which picks
+			// an initial active item if one is not specifically set.
+			window.setTimeout( () => setActiveId?.( id ), 0 );
+		}
+	}, [ isSelected, setActiveId, activeId, id ] );
 
 	return (
-		<CompositeItem
+		<Composite.Item
 			render={
 				<Button
 					{ ...additionalProps }
@@ -66,7 +71,6 @@ function UnforwardedOptionAsOption(
 					ref={ forwardedRef }
 				/>
 			}
-			store={ compositeStore }
 			id={ id }
 		/>
 	);
@@ -81,9 +85,7 @@ export function Option( {
 	tooltipText,
 	...additionalProps
 }: OptionProps ) {
-	const { baseId, compositeStore } = useContext(
-		CircularOptionPickerContext
-	);
+	const { baseId, setActiveId } = useContext( CircularOptionPickerContext );
 	const id = useInstanceId(
 		Option,
 		baseId || 'components-circular-option-picker__option'
@@ -95,19 +97,16 @@ export function Option( {
 		...additionalProps,
 	};
 
-	const optionControl = compositeStore ? (
-		<OptionAsOption
-			{ ...commonProps }
-			compositeStore={ compositeStore }
-			isSelected={ isSelected }
-		/>
+	const isListbox = setActiveId !== undefined;
+	const optionControl = isListbox ? (
+		<OptionAsOption { ...commonProps } isSelected={ isSelected } />
 	) : (
 		<OptionAsButton { ...commonProps } isPressed={ isSelected } />
 	);
 
 	return (
 		<div
-			className={ classnames(
+			className={ clsx(
 				className,
 				'components-circular-option-picker__option-wrapper'
 			) }
diff --git a/packages/components/src/circular-option-picker/circular-option-picker.tsx b/packages/components/src/circular-option-picker/circular-option-picker.tsx
index 047b0c569c7d3e..adf2b386e5cbec 100644
--- a/packages/components/src/circular-option-picker/circular-option-picker.tsx
+++ b/packages/components/src/circular-option-picker/circular-option-picker.tsx
@@ -1,19 +1,20 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
 import { isRTL } from '@wordpress/i18n';
+import { useMemo, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { CircularOptionPickerContext } from './circular-option-picker-context';
-import { Composite, useCompositeStore } from '../composite/v2';
+import { Composite } from '../composite';
 import type {
 	CircularOptionPickerProps,
 	ListboxCircularOptionPickerProps,
@@ -85,24 +86,30 @@ function ListboxCircularOptionPicker(
 		...additionalProps
 	} = props;
 
-	const compositeStore = useCompositeStore( {
-		focusLoop: loop,
-		rtl: isRTL(),
-	} );
+	const [ activeId, setActiveId ] = useState< string | null | undefined >(
+		undefined
+	);
 
-	const compositeContext = {
-		baseId,
-		compositeStore,
-	};
+	const contextValue = useMemo(
+		() => ( {
+			baseId,
+			activeId,
+			setActiveId,
+		} ),
+		[ baseId, activeId, setActiveId ]
+	);
 
 	return (
 		<div className={ className }>
-			<CircularOptionPickerContext.Provider value={ compositeContext }>
+			<CircularOptionPickerContext.Provider value={ contextValue }>
 				<Composite
 					{ ...additionalProps }
 					id={ baseId }
-					store={ compositeStore }
-					role={ 'listbox' }
+					focusLoop={ loop }
+					rtl={ isRTL() }
+					role="listbox"
+					activeId={ activeId }
+					setActiveId={ setActiveId }
 				>
 					{ options }
 				</Composite>
@@ -118,9 +125,16 @@ function ButtonsCircularOptionPicker(
 ) {
 	const { actions, options, children, baseId, ...additionalProps } = props;
 
+	const contextValue = useMemo(
+		() => ( {
+			baseId,
+		} ),
+		[ baseId ]
+	);
+
 	return (
 		<div { ...additionalProps } id={ baseId }>
-			<CircularOptionPickerContext.Provider value={ { baseId } }>
+			<CircularOptionPickerContext.Provider value={ contextValue }>
 				{ options }
 				{ children }
 				{ actions }
@@ -156,7 +170,7 @@ function CircularOptionPicker( props: CircularOptionPickerProps ) {
 	) : undefined;
 
 	const options = (
-		<div className={ 'components-circular-option-picker__swatches' }>
+		<div className="components-circular-option-picker__swatches">
 			{ optionsProp }
 		</div>
 	);
@@ -165,10 +179,7 @@ function CircularOptionPicker( props: CircularOptionPickerProps ) {
 		<OptionPickerImplementation
 			{ ...additionalProps }
 			baseId={ baseId }
-			className={ classnames(
-				'components-circular-option-picker',
-				className
-			) }
+			className={ clsx( 'components-circular-option-picker', className ) }
 			actions={ actions }
 			options={ options }
 		>
diff --git a/packages/components/src/circular-option-picker/stories/index.story.tsx b/packages/components/src/circular-option-picker/stories/index.story.tsx
index 45643e9d6dd6e1..e091a2ac54d41e 100644
--- a/packages/components/src/circular-option-picker/stories/index.story.tsx
+++ b/packages/components/src/circular-option-picker/stories/index.story.tsx
@@ -101,7 +101,7 @@ const DefaultActions = () => {
 		<CircularOptionPicker.ButtonAction
 			onClick={ () => setCurrentColor?.( undefined ) }
 		>
-			{ 'Clear' }
+			Clear
 		</CircularOptionPicker.ButtonAction>
 	);
 };
diff --git a/packages/components/src/circular-option-picker/style.scss b/packages/components/src/circular-option-picker/style.scss
index a705bf62fdb11d..24b67eb7e7021e 100644
--- a/packages/components/src/circular-option-picker/style.scss
+++ b/packages/components/src/circular-option-picker/style.scss
@@ -60,8 +60,7 @@ $color-palette-circle-spacing: 12px;
 	border-radius: $radius-round;
 	// Show a thin circular outline in Windows high contrast mode, otherwise the button is invisible.
 	z-index: z-index(".components-circular-option-picker__option-wrapper::before");
-	// Need to disable the lint rule because given that we are in the presence of a data URL that needs quotes we need to wrap it with single quotes.
-	/* stylelint-disable-next-line function-url-quotes */
+	/* stylelint-disable-next-line function-url-quotes -- We need quotes for the data URL to use the SVG inline. */
 	background: url('data:image/svg+xml,%3Csvg width="28" height="28" fill="none" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M6 8V6H4v2h2zM8 8V6h2v2H8zM10 16H8v-2h2v2zM12 16v-2h2v2h-2zM12 18v-2h-2v2H8v2h2v-2h2zM14 18v2h-2v-2h2zM16 18h-2v-2h2v2z" fill="%23555D65"/%3E%3Cpath fill-rule="evenodd" clip-rule="evenodd" d="M18 18h2v-2h-2v-2h2v-2h-2v-2h2V8h-2v2h-2V8h-2v2h2v2h-2v2h2v2h2v2zm-2-4v-2h2v2h-2z" fill="%23555D65"/%3E%3Cpath d="M18 18v2h-2v-2h2z" fill="%23555D65"/%3E%3Cpath fill-rule="evenodd" clip-rule="evenodd" d="M8 10V8H6v2H4v2h2v2H4v2h2v2H4v2h2v2H4v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2V8h-2V6h2V4h-2v2h-2V4h-2v2h-2V4h-2v2h-2V4h-2v2h2v2h-2v2H8zm0 2v-2H6v2h2zm2 0v-2h2v2h-2zm0 2v-2H8v2H6v2h2v2H6v2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2V8h-2V6h-2v2h-2V6h-2v2h-2v2h2v2h-2v2h-2z" fill="%23555D65"/%3E%3Cpath fill-rule="evenodd" clip-rule="evenodd" d="M4 0H2v2H0v2h2v2H0v2h2v2H0v2h2v2H0v2h2v2H0v2h2v2H0v2h2v2H0v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2V8h-2V6h2V4h-2V2h2V0h-2v2h-2V0h-2v2h-2V0h-2v2h-2V0h-2v2h-2V0h-2v2H8V0H6v2H4V0zm0 4V2H2v2h2zm2 0V2h2v2H6zm0 2V4H4v2H2v2h2v2H2v2h2v2H2v2h2v2H2v2h2v2H2v2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2V8h-2V6h2V4h-2V2h-2v2h-2V2h-2v2h-2V2h-2v2h-2V2h-2v2H8v2H6z" fill="%23555D65"/%3E%3C/svg%3E');
 }
 
@@ -71,7 +70,7 @@ $color-palette-circle-spacing: 12px;
 	height: 100%;
 	width: 100%;
 	border: none;
-	border-radius: 50%;
+	border-radius: $radius-round;
 	background: transparent;
 	box-shadow: inset 0 0 0 ($color-palette-circle-size * 0.5);
 	transition: 100ms box-shadow ease;
@@ -94,7 +93,7 @@ $color-palette-circle-spacing: 12px;
 			position: absolute;
 			left: 2px;
 			top: 2px;
-			border-radius: 50%;
+			border-radius: $radius-round;
 			z-index: z-index(".components-circular-option-picker__option.is-pressed + svg");
 			pointer-events: none;
 		}
@@ -110,7 +109,7 @@ $color-palette-circle-spacing: 12px;
 		border-radius: $radius-round;
 		box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
 		// Show a thin circular outline in Windows high contrast mode, otherwise the button is invisible.
-		border: 1px solid transparent;
+		border: $border-width solid transparent;
 		box-sizing: inherit;
 	}
 
diff --git a/packages/components/src/circular-option-picker/test/index.tsx b/packages/components/src/circular-option-picker/test/index.tsx
index 48a0aca40faf3e..a6e9f2c45a05ce 100644
--- a/packages/components/src/circular-option-picker/test/index.tsx
+++ b/packages/components/src/circular-option-picker/test/index.tsx
@@ -2,24 +2,18 @@
  * External dependencies
  */
 import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { press } from '@ariakit/test';
 
 /**
  * Internal dependencies
  */
 import CircularOptionPicker from '..';
 
-const SINGLE_OPTION = [ <CircularOptionPicker.Option key={ 'option' } /> ];
+const SINGLE_OPTION = [ <CircularOptionPicker.Option key="option" /> ];
 
 const MULTIPLE_OPTIONS = [
-	<CircularOptionPicker.Option
-		key={ 'option-1' }
-		aria-label={ 'Option One' }
-	/>,
-	<CircularOptionPicker.Option
-		key={ 'option-2' }
-		aria-label={ 'Option Two' }
-	/>,
+	<CircularOptionPicker.Option key="option-1" aria-label="Option One" />,
+	<CircularOptionPicker.Option key="option-2" aria-label="Option Two" />,
 ];
 
 const DEFAULT_PROPS = {
@@ -59,9 +53,7 @@ describe( 'CircularOptionPicker', () => {
 
 	describe( 'when `asButtons` is true', () => {
 		it( 'should render as buttons', async () => {
-			render(
-				<CircularOptionPicker { ...DEFAULT_PROPS } asButtons={ true } />
-			);
+			render( <CircularOptionPicker { ...DEFAULT_PROPS } asButtons /> );
 
 			expect( screen.queryByRole( 'listbox' ) ).not.toBeInTheDocument();
 			expect( screen.queryByRole( 'option' ) ).not.toBeInTheDocument();
@@ -71,8 +63,6 @@ describe( 'CircularOptionPicker', () => {
 
 	describe( 'when `loop` is not set', () => {
 		it( 'should loop', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<CircularOptionPicker
 					{ ...DEFAULT_PROPS }
@@ -80,40 +70,36 @@ describe( 'CircularOptionPicker', () => {
 				/>
 			);
 
-			await user.tab();
+			await press.Tab();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option Two' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
 		} );
 	} );
 
 	describe( 'when `loop` is true', () => {
 		it( 'should loop', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<CircularOptionPicker
 					{ ...DEFAULT_PROPS }
 					options={ MULTIPLE_OPTIONS }
-					loop={ true }
+					loop
 				/>
 			);
 
-			await user.tab();
+			await press.Tab();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option Two' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
 		} );
 	} );
 
 	describe( 'when `loop` is false', () => {
 		it( 'should not loop', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<CircularOptionPicker
 					{ ...DEFAULT_PROPS }
@@ -122,11 +108,11 @@ describe( 'CircularOptionPicker', () => {
 				/>
 			);
 
-			await user.tab();
+			await press.Tab();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option Two' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option Two' ) ).toHaveFocus();
 		} );
 	} );
diff --git a/packages/components/src/circular-option-picker/types.ts b/packages/components/src/circular-option-picker/types.ts
index 519d81d5905107..411782aed575b1 100644
--- a/packages/components/src/circular-option-picker/types.ts
+++ b/packages/components/src/circular-option-picker/types.ts
@@ -14,7 +14,6 @@ import type { Icon } from '@wordpress/icons';
 import type { ButtonAsButtonProps } from '../button/types';
 import type { DropdownProps } from '../dropdown/types';
 import type { WordPressComponentProps } from '../context';
-import type { CompositeStore } from '../composite/v2';
 
 type CommonCircularOptionPickerProps = {
 	/**
@@ -123,8 +122,8 @@ export type OptionProps = Omit<
 	>;
 };
 
-export type CircularOptionPickerCompositeStore = CompositeStore;
 export type CircularOptionPickerContextProps = {
 	baseId?: string;
-	compositeStore?: CircularOptionPickerCompositeStore;
+	activeId?: string | null | undefined;
+	setActiveId?: ( newId: string | null | undefined ) => void;
 };
diff --git a/packages/components/src/clipboard-button/index.tsx b/packages/components/src/clipboard-button/index.tsx
index 5a9cec30f7d49d..0bf7d177e251ef 100644
--- a/packages/components/src/clipboard-button/index.tsx
+++ b/packages/components/src/clipboard-button/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -32,25 +32,25 @@ export default function ClipboardButton( {
 		alternative: 'wp.compose.useCopyToClipboard',
 	} );
 
-	const timeoutId = useRef< NodeJS.Timeout >();
+	const timeoutIdRef = useRef< NodeJS.Timeout >();
 	const ref = useCopyToClipboard( text, () => {
 		onCopy();
-		if ( timeoutId.current ) {
-			clearTimeout( timeoutId.current );
+		if ( timeoutIdRef.current ) {
+			clearTimeout( timeoutIdRef.current );
 		}
 
 		if ( onFinishCopy ) {
-			timeoutId.current = setTimeout( () => onFinishCopy(), TIMEOUT );
+			timeoutIdRef.current = setTimeout( () => onFinishCopy(), TIMEOUT );
 		}
 	} );
 
 	useEffect( () => {
-		if ( timeoutId.current ) {
-			clearTimeout( timeoutId.current );
+		if ( timeoutIdRef.current ) {
+			clearTimeout( timeoutIdRef.current );
 		}
 	}, [] );
 
-	const classes = classnames( 'components-clipboard-button', className );
+	const classes = clsx( 'components-clipboard-button', className );
 
 	// Workaround for inconsistent behavior in Safari, where <textarea> is not
 	// the document.activeElement at the moment when the copy event fires.
diff --git a/packages/components/src/color-indicator/index.native.js b/packages/components/src/color-indicator/index.native.js
index 2a058f25ceec4c..b76915e87469e3 100644
--- a/packages/components/src/color-indicator/index.native.js
+++ b/packages/components/src/color-indicator/index.native.js
@@ -6,12 +6,12 @@ import { View, Animated } from 'react-native';
  * WordPress dependencies
  */
 import { Icon, check } from '@wordpress/icons';
-import { Gradient } from '@wordpress/components';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
 import styles from './style.scss';
+import Gradient from '../mobile/gradient';
 import { colorsUtils } from '../mobile/color-settings/utils';
 
 function SelectedIcon( { opacity } ) {
diff --git a/packages/components/src/color-indicator/index.tsx b/packages/components/src/color-indicator/index.tsx
index 00312a39cdc7de..9d4c0de452b246 100644
--- a/packages/components/src/color-indicator/index.tsx
+++ b/packages/components/src/color-indicator/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef } from 'react';
 
 /**
@@ -23,7 +23,7 @@ function UnforwardedColorIndicator(
 
 	return (
 		<span
-			className={ classnames( 'component-color-indicator', className ) }
+			className={ clsx( 'component-color-indicator', className ) }
 			style={ { background: colorValue } }
 			ref={ forwardedRef }
 			{ ...additionalProps }
diff --git a/packages/components/src/color-indicator/style.scss b/packages/components/src/color-indicator/style.scss
index e70b8a09ca5bf5..4029b50340e62a 100644
--- a/packages/components/src/color-indicator/style.scss
+++ b/packages/components/src/color-indicator/style.scss
@@ -2,7 +2,7 @@
 	width: $grid-unit-50 * 0.5;
 	height: $grid-unit-50 * 0.5;
 	box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
-	border-radius: 50%;
+	border-radius: $radius-round;
 	display: inline-block;
 	padding: 0;
 	background: $white linear-gradient(-45deg, transparent 48%, $gray-300 48%, $gray-300 52%, transparent 52%);
diff --git a/packages/components/src/color-palette/index.native.js b/packages/components/src/color-palette/index.native.js
index 51a61785df9afe..ab86cd6f05f127 100644
--- a/packages/components/src/color-palette/index.native.js
+++ b/packages/components/src/color-palette/index.native.js
@@ -33,7 +33,7 @@ let scrollPosition = 0;
 let customIndicatorWidth = 0;
 
 function ColorPalette( {
-	enableCustomColor = true,
+	enableCustomColor = false,
 	setColor,
 	activeColor,
 	isGradientColor,
@@ -61,25 +61,37 @@ function ColorPalette( {
 
 	const scale = useRef( new Animated.Value( 1 ) ).current;
 	const opacity = useRef( new Animated.Value( 1 ) ).current;
+	const delayedScrollRef = useRef();
 
-	const defaultColors = [
+	const mergedColors = [
 		...new Set(
 			( defaultSettings.colors ?? [] ).map( ( { color } ) => color )
 		),
 	];
-	const mergedColors = [
+	const mergedGradients = [
+		...new Set(
+			( defaultSettings.gradients ?? [] ).map(
+				( { gradient } ) => gradient
+			)
+		),
+	];
+	const allAvailableColors = [
 		...new Set(
 			( defaultSettings.allColors ?? [] ).map( ( { color } ) => color )
 		),
 	];
-	const defaultGradientColors = [
+	const allAvailableGradients = [
 		...new Set(
-			( defaultSettings.gradients ?? [] ).map(
+			( defaultSettings.allGradients ?? [] ).map(
 				( { gradient } ) => gradient
 			)
 		),
 	];
-	const colors = isGradientSegment ? defaultGradientColors : defaultColors;
+
+	const colors = isGradientSegment ? mergedGradients : mergedColors;
+	const allColors = isGradientSegment
+		? allAvailableGradients
+		: allAvailableColors;
 
 	const customIndicatorColor = isGradientSegment
 		? activeColor
@@ -103,14 +115,13 @@ function ColorPalette( {
 				scrollViewRef.current.scrollTo( { x: 0, y: 0 } );
 			}
 		}
-		// Temporarily disabling exhuastive-deps until the component can be refactored and updated safely.
+		// Not adding additional dependencies until the component can be refactored and updated safely.
 		// Please see https://github.com/WordPress/gutenberg/pull/41253 for discussion and details.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ currentSegment ] );
 
 	function isSelectedCustom() {
 		const isWithinColors =
-			activeColor && mergedColors && mergedColors.includes( activeColor );
+			activeColor && allColors?.includes( activeColor );
 		if ( enableCustomColor && activeColor ) {
 			if ( isGradientSegment ) {
 				return isGradientColor && ! isWithinColors;
@@ -205,11 +216,11 @@ function ColorPalette( {
 	}
 
 	function scrollToEndWithDelay() {
-		const delayedScroll = setTimeout( () => {
-			scrollViewRef.current.scrollToEnd();
+		delayedScrollRef.current = setTimeout( () => {
+			scrollViewRef?.current.scrollToEnd();
 		}, ANIMATION_DURATION );
 		return () => {
-			clearTimeout( delayedScroll );
+			clearTimeout( delayedScrollRef.current );
 		};
 	}
 
@@ -273,7 +284,7 @@ function ColorPalette( {
 						<View key={ `${ color }-${ isSelected( color ) }` }>
 							<TouchableWithoutFeedback
 								onPress={ () => onColorPress( color ) }
-								accessibilityRole={ 'button' }
+								accessibilityRole="button"
 								accessibilityState={ {
 									selected: isSelected( color ),
 								} }
@@ -314,7 +325,7 @@ function ColorPalette( {
 						) }
 						<TouchableWithoutFeedback
 							onPress={ onCustomPress }
-							accessibilityRole={ 'button' }
+							accessibilityRole="button"
 							accessibilityState={ {
 								selected: isSelectedCustom(),
 							} }
diff --git a/packages/components/src/color-palette/index.tsx b/packages/components/src/color-palette/index.tsx
index 96f8fba24cd644..c744faee9b0c3f 100644
--- a/packages/components/src/color-palette/index.tsx
+++ b/packages/components/src/color-palette/index.tsx
@@ -5,7 +5,7 @@ import type { ForwardedRef } from 'react';
 import { colord, extend } from 'colord';
 import namesPlugin from 'colord/plugins/names';
 import a11yPlugin from 'colord/plugins/a11y';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -320,7 +320,7 @@ function UnforwardedColorPalette(
 								does not shift
 								*/ }
 								<Truncate
-									className={ classnames(
+									className={ clsx(
 										'components-color-palette__custom-color-value',
 										{
 											'components-color-palette__custom-color-value--is-hex':
@@ -335,26 +335,28 @@ function UnforwardedColorPalette(
 					) }
 				/>
 			) }
-			<CircularOptionPicker
-				{ ...metaProps }
-				actions={ actions }
-				options={
-					hasMultipleColorOrigins ? (
-						<MultiplePalettes
-							{ ...paletteCommonProps }
-							headingLevel={ headingLevel }
-							colors={ colors as PaletteObject[] }
-							value={ value }
-						/>
-					) : (
-						<SinglePalette
-							{ ...paletteCommonProps }
-							colors={ colors as ColorObject[] }
-							value={ value }
-						/>
-					)
-				}
-			/>
+			{ ( colors.length > 0 || actions ) && (
+				<CircularOptionPicker
+					{ ...metaProps }
+					actions={ actions }
+					options={
+						hasMultipleColorOrigins ? (
+							<MultiplePalettes
+								{ ...paletteCommonProps }
+								headingLevel={ headingLevel }
+								colors={ colors as PaletteObject[] }
+								value={ value }
+							/>
+						) : (
+							<SinglePalette
+								{ ...paletteCommonProps }
+								colors={ colors as ColorObject[] }
+								value={ value }
+							/>
+						)
+					}
+				/>
+			) }
 		</VStack>
 	);
 }
diff --git a/packages/components/src/color-palette/stories/index.story.tsx b/packages/components/src/color-palette/stories/index.story.tsx
index b49de51c1d16e3..727e840ff99358 100644
--- a/packages/components/src/color-palette/stories/index.story.tsx
+++ b/packages/components/src/color-palette/stories/index.story.tsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import type { CSSProperties } from 'react';
 import type { Meta, StoryFn } from '@storybook/react';
 
 /**
@@ -92,13 +91,11 @@ MultipleOrigins.args = {
 export const CSSVariables: StoryFn< typeof ColorPalette > = ( args ) => {
 	return (
 		<div
-			style={
-				{
-					'--red': '#f00',
-					'--yellow': '#ff0',
-					'--blue': '#00f',
-				} as CSSProperties
-			}
+			style={ {
+				'--red': '#f00',
+				'--yellow': '#ff0',
+				'--blue': '#00f',
+			} }
 		>
 			<Template { ...args } />
 		</div>
diff --git a/packages/components/src/color-palette/style.scss b/packages/components/src/color-palette/style.scss
index 2d6bc4ddc1db3d..278aacb22914bb 100644
--- a/packages/components/src/color-palette/style.scss
+++ b/packages/components/src/color-palette/style.scss
@@ -14,7 +14,7 @@ $border-as-box-shadow: inset 0 0 0 $border-width rgba(0, 0, 0, 0.2);
 	cursor: pointer;
 	// Show a thin outline in Windows high contrast mode.
 	outline: 1px solid transparent;
-	border-radius: $radius-block-ui $radius-block-ui 0 0;
+	border-radius: $radius-medium $radius-medium 0 0;
 	box-shadow: $border-as-box-shadow;
 
 	&:focus {
@@ -26,10 +26,7 @@ $border-as-box-shadow: inset 0 0 0 $border-width rgba(0, 0, 0, 0.2);
 	&::after {
 		content: "";
 		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
+		inset: $border-width;
 		z-index: -1;
 		// The background image creates a checkerboard pattern. Ignore rtlcss to
 		// make it work both in LTR and RTL.
@@ -41,12 +38,13 @@ $border-as-box-shadow: inset 0 0 0 $border-width rgba(0, 0, 0, 0.2);
 		background-position: 0 0, 24px 24px;
 		/*rtl:end:ignore*/
 		background-size: calc(2 * 24px) calc(2 * 24px);
+		border-radius: $radius-medium - $border-width $radius-medium - $border-width 0 0;
 	}
 }
 
 .components-color-palette__custom-color-text-wrapper {
 	padding: $grid-unit-15 $grid-unit-20;
-	border-radius: 0 0 $radius-block-ui $radius-block-ui;
+	border-radius: 0 0 $radius-medium $radius-medium;
 	position: relative;
 	font-size: $default-font-size;
 
diff --git a/packages/components/src/color-palette/test/utils.ts b/packages/components/src/color-palette/test/utils.ts
index 65e829a58a06bd..56acec5416ecbd 100644
--- a/packages/components/src/color-palette/test/utils.ts
+++ b/packages/components/src/color-palette/test/utils.ts
@@ -26,18 +26,37 @@ describe( 'ColorPalette: Utils', () => {
 	} );
 
 	describe( 'normalizeColorValue', () => {
-		test( 'should return the value as is if the color value is not a CSS variable', () => {
+		test( 'should return the value if the value argument is not a CSS variable', () => {
 			const element = document.createElement( 'div' );
 			expect( normalizeColorValue( '#ff0000', element ) ).toBe(
 				'#ff0000'
 			);
 		} );
-		test( 'should return the background color computed from a element if the color value is a CSS variable', () => {
+		test( 'should return the background color computed from an element if the value argument is a CSS variable', () => {
 			const element = document.createElement( 'div' );
 			element.style.backgroundColor = '#ff0000';
 			expect( normalizeColorValue( 'var(--red)', element ) ).toBe(
 				'#ff0000'
 			);
 		} );
+		test( 'should return the background color computed from an element if the value argument is a color mix', () => {
+			const element = document.createElement( 'div' );
+			element.style.backgroundColor = '#ff0000';
+			expect(
+				normalizeColorValue(
+					'color-mix(in oklab, #a71e14, white)',
+					element
+				)
+			).toBe( '#ff0000' );
+		} );
+		test( 'should return the value if the value argument is undefined', () => {
+			const element = document.createElement( 'div' );
+			expect( normalizeColorValue( undefined, element ) ).toBe(
+				undefined
+			);
+		} );
+		test( 'should return the value if the element argument is null', () => {
+			expect( normalizeColorValue( '#ff0000', null ) ).toBe( '#ff0000' );
+		} );
 	} );
 } );
diff --git a/packages/components/src/color-palette/utils.ts b/packages/components/src/color-palette/utils.ts
index 79141bf752eb73..19fd4b7252f639 100644
--- a/packages/components/src/color-palette/utils.ts
+++ b/packages/components/src/color-palette/utils.ts
@@ -17,6 +17,18 @@ import type { ColorObject, ColorPaletteProps, PaletteObject } from './types';
 
 extend( [ namesPlugin, a11yPlugin ] );
 
+/**
+ * Checks if a color value is a simple CSS color.
+ *
+ * @param value The color value to check.
+ * @return A boolean indicating whether the color value is a simple CSS color.
+ */
+const isSimpleCSSColor = ( value: string ): boolean => {
+	const valueIsCssVariable = /var\(/.test( value ?? '' );
+	const valueIsColorMix = /color-mix\(/.test( value ?? '' );
+	return ! valueIsCssVariable && ! valueIsColorMix;
+};
+
 export const extractColorNameFromCurrentValue = (
 	currentValue?: ColorPaletteProps[ 'value' ],
 	colors: ColorPaletteProps[ 'colors' ] = [],
@@ -25,11 +37,12 @@ export const extractColorNameFromCurrentValue = (
 	if ( ! currentValue ) {
 		return '';
 	}
-
-	const currentValueIsCssVariable = /^var\(/.test( currentValue );
-	const normalizedCurrentValue = currentValueIsCssVariable
-		? currentValue
-		: colord( currentValue ).toHex();
+	const currentValueIsSimpleColor = currentValue
+		? isSimpleCSSColor( currentValue )
+		: false;
+	const normalizedCurrentValue = currentValueIsSimpleColor
+		? colord( currentValue ).toHex()
+		: currentValue;
 
 	// Normalize format of `colors` to simplify the following loop
 	type normalizedPaletteObject = { colors: ColorObject[] };
@@ -38,9 +51,9 @@ export const extractColorNameFromCurrentValue = (
 		: [ { colors: colors as ColorObject[] } ];
 	for ( const { colors: paletteColors } of colorPalettes ) {
 		for ( const { name: colorName, color: colorValue } of paletteColors ) {
-			const normalizedColorValue = currentValueIsCssVariable
-				? colorValue
-				: colord( colorValue ).toHex();
+			const normalizedColorValue = currentValueIsSimpleColor
+				? colord( colorValue ).toHex()
+				: colorValue;
 
 			if ( normalizedCurrentValue === normalizedColorValue ) {
 				return colorName;
@@ -79,9 +92,7 @@ export const normalizeColorValue = (
 	value: string | undefined,
 	element: HTMLElement | null
 ) => {
-	const currentValueIsCssVariable = /^var\(/.test( value ?? '' );
-
-	if ( ! currentValueIsCssVariable || element === null ) {
+	if ( ! value || ! element || isSimpleCSSColor( value ) ) {
 		return value;
 	}
 
diff --git a/packages/components/src/color-picker/color-copy-button.tsx b/packages/components/src/color-picker/color-copy-button.tsx
index 99450b07628c21..b8a4822544322c 100644
--- a/packages/components/src/color-picker/color-copy-button.tsx
+++ b/packages/components/src/color-picker/color-copy-button.tsx
@@ -17,7 +17,9 @@ import type { ColorCopyButtonProps } from './types';
 export const ColorCopyButton = ( props: ColorCopyButtonProps ) => {
 	const { color, colorType } = props;
 	const [ copiedColor, setCopiedColor ] = useState< string | null >( null );
-	const copyTimer = useRef< ReturnType< typeof setTimeout > | undefined >();
+	const copyTimerRef = useRef<
+		ReturnType< typeof setTimeout > | undefined
+	>();
 	const copyRef = useCopyToClipboard< HTMLDivElement >(
 		() => {
 			switch ( colorType ) {
@@ -34,21 +36,21 @@ export const ColorCopyButton = ( props: ColorCopyButtonProps ) => {
 			}
 		},
 		() => {
-			if ( copyTimer.current ) {
-				clearTimeout( copyTimer.current );
+			if ( copyTimerRef.current ) {
+				clearTimeout( copyTimerRef.current );
 			}
 			setCopiedColor( color.toHex() );
-			copyTimer.current = setTimeout( () => {
+			copyTimerRef.current = setTimeout( () => {
 				setCopiedColor( null );
-				copyTimer.current = undefined;
+				copyTimerRef.current = undefined;
 			}, 3000 );
 		}
 	);
 	useEffect( () => {
-		// Clear copyTimer on component unmount.
+		// Clear copyTimerRef on component unmount.
 		return () => {
-			if ( copyTimer.current ) {
-				clearTimeout( copyTimer.current );
+			if ( copyTimerRef.current ) {
+				clearTimeout( copyTimerRef.current );
 			}
 		};
 	}, [] );
@@ -62,7 +64,7 @@ export const ColorCopyButton = ( props: ColorCopyButtonProps ) => {
 			}
 		>
 			<CopyButton
-				isSmall
+				size="small"
 				ref={ copyRef }
 				icon={ copy }
 				showTooltip={ false }
diff --git a/packages/components/src/color-picker/component.tsx b/packages/components/src/color-picker/component.tsx
index 5f6d0754c93ccc..a1112d2e1ecd23 100644
--- a/packages/components/src/color-picker/component.tsx
+++ b/packages/components/src/color-picker/component.tsx
@@ -10,7 +10,7 @@ import namesPlugin from 'colord/plugins/names';
  * WordPress dependencies
  */
 import { useCallback, useState, useMemo } from '@wordpress/element';
-import { useDebounce, useMergeRefs } from '@wordpress/compose';
+import { useDebounce } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -49,24 +49,8 @@ const UnconnectedColorPicker = (
 		onChange,
 		defaultValue = '#fff',
 		copyFormat,
-
-		// Context
-		onPickerDragStart,
-		onPickerDragEnd,
 		...divProps
-	} = useContextSystem<
-		ColorPickerProps & {
-			onPickerDragStart?: ( event: MouseEvent ) => void;
-			onPickerDragEnd?: ( event: MouseEvent ) => void;
-		}
-	>( props, 'ColorPicker' );
-
-	const [ containerEl, setContainerEl ] = useState< HTMLElement | null >(
-		null
-	);
-	const containerRef = ( node: HTMLElement | null ) => {
-		setContainerEl( node );
-	};
+	} = useContextSystem( props, 'ColorPicker' );
 
 	// Use a safe default value for the color and remove the possibility of `undefined`.
 	const [ color, setColor ] = useControlledValue( {
@@ -93,17 +77,11 @@ const UnconnectedColorPicker = (
 	);
 
 	return (
-		<ColorfulWrapper
-			ref={ useMergeRefs( [ containerRef, forwardedRef ] ) }
-			{ ...divProps }
-		>
+		<ColorfulWrapper ref={ forwardedRef } { ...divProps }>
 			<Picker
-				containerEl={ containerEl }
 				onChange={ handleChange }
 				color={ safeColordColor }
 				enableAlpha={ enableAlpha }
-				onDragStart={ onPickerDragStart }
-				onDragEnd={ onPickerDragEnd }
 			/>
 			<AuxiliaryColorArtefactWrapper>
 				<AuxiliaryColorArtefactHStackHeader justify="space-between">
@@ -116,6 +94,7 @@ const UnconnectedColorPicker = (
 						}
 						label={ __( 'Color format' ) }
 						hideLabelFromVision
+						variant="minimal"
 					/>
 					<ColorCopyButton
 						color={ safeColordColor }
diff --git a/packages/components/src/color-picker/hex-input.tsx b/packages/components/src/color-picker/hex-input.tsx
index 6001892ff8afa5..ef8b5356c0edc1 100644
--- a/packages/components/src/color-picker/hex-input.tsx
+++ b/packages/components/src/color-picker/hex-input.tsx
@@ -13,15 +13,16 @@ import { __ } from '@wordpress/i18n';
  */
 import { InputControl } from '../input-control';
 import { Text } from '../text';
-import { Spacer } from '../spacer';
-import { space } from '../utils/space';
 import { COLORS } from '../utils/colors-values';
 import type { StateReducer } from '../input-control/reducer/state';
 import type { HexInputProps } from './types';
+import InputControlPrefixWrapper from '../input-control/input-prefix-wrapper';
 
 export const HexInput = ( { color, onChange, enableAlpha }: HexInputProps ) => {
 	const handleChange = ( nextValue: string | undefined ) => {
-		if ( ! nextValue ) return;
+		if ( ! nextValue ) {
+			return;
+		}
 		const hexValue = nextValue.startsWith( '#' )
 			? nextValue
 			: '#' + nextValue;
@@ -46,14 +47,11 @@ export const HexInput = ( { color, onChange, enableAlpha }: HexInputProps ) => {
 	return (
 		<InputControl
 			prefix={
-				<Spacer
-					as={ Text }
-					marginLeft={ space( 4 ) }
-					color={ COLORS.theme.accent }
-					lineHeight={ 1 }
-				>
-					#
-				</Spacer>
+				<InputControlPrefixWrapper>
+					<Text color={ COLORS.theme.accent } lineHeight={ 1 }>
+						#
+					</Text>
+				</InputControlPrefixWrapper>
 			}
 			value={ color.toHex().slice( 1 ).toUpperCase() }
 			onChange={ handleChange }
diff --git a/packages/components/src/color-picker/hsl-input.tsx b/packages/components/src/color-picker/hsl-input.tsx
index 3331a97b3d4de6..8d2b0c7c444899 100644
--- a/packages/components/src/color-picker/hsl-input.tsx
+++ b/packages/components/src/color-picker/hsl-input.tsx
@@ -3,6 +3,11 @@
  */
 import { colord } from 'colord';
 
+/**
+ * WordPress dependencies
+ */
+import { useState, useEffect, useMemo } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
@@ -10,7 +15,49 @@ import { InputWithSlider } from './input-with-slider';
 import type { HslInputProps } from './types';
 
 export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
-	const { h, s, l, a } = color.toHsl();
+	const colorPropHSLA = useMemo( () => color.toHsl(), [ color ] );
+
+	const [ internalHSLA, setInternalHSLA ] = useState( { ...colorPropHSLA } );
+
+	const isInternalColorSameAsReceivedColor = color.isEqual(
+		colord( internalHSLA )
+	);
+
+	useEffect( () => {
+		if ( ! isInternalColorSameAsReceivedColor ) {
+			// Keep internal HSLA color up to date with the received color prop
+			setInternalHSLA( colorPropHSLA );
+		}
+	}, [ colorPropHSLA, isInternalColorSameAsReceivedColor ] );
+
+	// If the internal color is equal to the received color prop, we can use the
+	// HSLA values from the local state which, compared to the received color prop,
+	// retain more details about the actual H and S values that the user selected,
+	// and thus allow for better UX when interacting with the H and S sliders.
+	const colorValue = isInternalColorSameAsReceivedColor
+		? internalHSLA
+		: colorPropHSLA;
+
+	const updateHSLAValue = (
+		partialNewValue: Partial< typeof colorPropHSLA >
+	) => {
+		const nextOnChangeValue = colord( {
+			...colorValue,
+			...partialNewValue,
+		} );
+
+		// Fire `onChange` only if the resulting color is different from the
+		// current one.
+		// Otherwise, update the internal HSLA color to cause a re-render.
+		if ( ! color.isEqual( nextOnChangeValue ) ) {
+			onChange( nextOnChangeValue );
+		} else {
+			setInternalHSLA( ( prevHSLA ) => ( {
+				...prevHSLA,
+				...partialNewValue,
+			} ) );
+		}
+	};
 
 	return (
 		<>
@@ -19,9 +66,9 @@ export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
 				max={ 359 }
 				label="Hue"
 				abbreviation="H"
-				value={ h }
+				value={ colorValue.h }
 				onChange={ ( nextH: number ) => {
-					onChange( colord( { h: nextH, s, l, a } ) );
+					updateHSLAValue( { h: nextH } );
 				} }
 			/>
 			<InputWithSlider
@@ -29,16 +76,9 @@ export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
 				max={ 100 }
 				label="Saturation"
 				abbreviation="S"
-				value={ s }
+				value={ colorValue.s }
 				onChange={ ( nextS: number ) => {
-					onChange(
-						colord( {
-							h,
-							s: nextS,
-							l,
-							a,
-						} )
-					);
+					updateHSLAValue( { s: nextS } );
 				} }
 			/>
 			<InputWithSlider
@@ -46,16 +86,9 @@ export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
 				max={ 100 }
 				label="Lightness"
 				abbreviation="L"
-				value={ l }
+				value={ colorValue.l }
 				onChange={ ( nextL: number ) => {
-					onChange(
-						colord( {
-							h,
-							s,
-							l: nextL,
-							a,
-						} )
-					);
+					updateHSLAValue( { l: nextL } );
 				} }
 			/>
 			{ enableAlpha && (
@@ -64,16 +97,9 @@ export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
 					max={ 100 }
 					label="Alpha"
 					abbreviation="A"
-					value={ Math.trunc( 100 * a ) }
+					value={ Math.trunc( 100 * colorValue.a ) }
 					onChange={ ( nextA: number ) => {
-						onChange(
-							colord( {
-								h,
-								s,
-								l,
-								a: nextA / 100,
-							} )
-						);
+						updateHSLAValue( { a: nextA / 100 } );
 					} }
 				/>
 			) }
diff --git a/packages/components/src/color-picker/hue-picker.native.js b/packages/components/src/color-picker/hue-picker.native.js
index d7d391e1837656..691e9396ee2d8d 100644
--- a/packages/components/src/color-picker/hue-picker.native.js
+++ b/packages/components/src/color-picker/hue-picker.native.js
@@ -72,8 +72,12 @@ export default class HuePicker extends Component {
 	}
 
 	normalizeValue( value ) {
-		if ( value < 0 ) return 0;
-		if ( value > 1 ) return 1;
+		if ( value < 0 ) {
+			return 0;
+		}
+		if ( value > 1 ) {
+			return 1;
+		}
 		return value;
 	}
 
diff --git a/packages/components/src/color-picker/index.native.js b/packages/components/src/color-picker/index.native.js
index a2fee512ce26ff..302de6b7d79b89 100644
--- a/packages/components/src/color-picker/index.native.js
+++ b/packages/components/src/color-picker/index.native.js
@@ -9,7 +9,6 @@ import namesPlugin from 'colord/plugins/names';
  */
 import { useState, useEffect } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { BottomSheet } from '@wordpress/components';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 import { Icon, check, close } from '@wordpress/icons';
 /**
@@ -17,6 +16,7 @@ import { Icon, check, close } from '@wordpress/icons';
  */
 import styles from './style.scss';
 import HsvColorPicker from './hsv-color-picker.native.js';
+import BottomSheet from '../mobile/bottom-sheet';
 
 extend( [ namesPlugin ] );
 
@@ -82,9 +82,15 @@ function ColorPicker( {
 	const currentColor = combineToHex();
 
 	const updateColor = ( { hue: h, saturation: s, value: v } ) => {
-		if ( h !== undefined ) setHue( h );
-		if ( s !== undefined ) setSaturation( s );
-		if ( v !== undefined ) setValue( v );
+		if ( h !== undefined ) {
+			setHue( h );
+		}
+		if ( s !== undefined ) {
+			setSaturation( s );
+		}
+		if ( v !== undefined ) {
+			setValue( v );
+		}
 		setColor( combineToHex( h, s, v ) );
 	};
 
@@ -105,7 +111,6 @@ function ColorPicker( {
 		// the hook’s dependencies and running it a single time. Ideally there
 		// may be a way to refactor and obviate the disabled lint rule. If not,
 		// this comment should be replaced by one that explains the reasoning.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [] );
 
 	function onButtonPress( action ) {
diff --git a/packages/components/src/color-picker/input-with-slider.tsx b/packages/components/src/color-picker/input-with-slider.tsx
index b51db75c1f4513..5e08fa42daf80e 100644
--- a/packages/components/src/color-picker/input-with-slider.tsx
+++ b/packages/components/src/color-picker/input-with-slider.tsx
@@ -3,11 +3,10 @@
  */
 import { HStack } from '../h-stack';
 import { Text } from '../text';
-import { Spacer } from '../spacer';
-import { space } from '../utils/space';
 import { RangeControl, NumberControlWrapper } from './styles';
 import { COLORS } from '../utils/colors-values';
 import type { InputWithSliderProps } from './types';
+import InputControlPrefixWrapper from '../input-control/input-prefix-wrapper';
 
 export const InputWithSlider = ( {
 	min,
@@ -39,20 +38,18 @@ export const InputWithSlider = ( {
 				value={ value }
 				onChange={ onNumberControlChange }
 				prefix={
-					<Spacer
-						as={ Text }
-						paddingLeft={ space( 4 ) }
-						color={ COLORS.theme.accent }
-						lineHeight={ 1 }
-					>
-						{ abbreviation }
-					</Spacer>
+					<InputControlPrefixWrapper>
+						<Text color={ COLORS.theme.accent } lineHeight={ 1 }>
+							{ abbreviation }
+						</Text>
+					</InputControlPrefixWrapper>
 				}
 				spinControls="none"
 				size="__unstable-large"
 			/>
 			<RangeControl
 				__nextHasNoMarginBottom
+				__next40pxDefaultSize
 				label={ label }
 				hideLabelFromVision
 				min={ min }
diff --git a/packages/components/src/color-picker/picker.tsx b/packages/components/src/color-picker/picker.tsx
index af3727f1f82014..f2c068d8a46be2 100644
--- a/packages/components/src/color-picker/picker.tsx
+++ b/packages/components/src/color-picker/picker.tsx
@@ -7,118 +7,34 @@ import { colord } from 'colord';
 /**
  * WordPress dependencies
  */
-import { useMemo, useEffect, useRef } from '@wordpress/element';
+import { useMemo } from '@wordpress/element';
 /**
  * Internal dependencies
  */
 import type { PickerProps } from './types';
 
-/**
- * Track the start and the end of drag pointer events related to controlling
- * the picker's saturation / hue / alpha, and fire the corresponding callbacks.
- * This is particularly useful to implement synergies like the one with the
- * `Popover` component, where a pointer events "trap" is rendered while
- * the user is dragging the pointer to avoid potential interference with iframe
- * elements.
- *
- * @param props
- * @param props.containerEl
- * @param props.onDragStart
- * @param props.onDragEnd
- */
-const useOnPickerDrag = ( {
-	containerEl,
-	onDragStart,
-	onDragEnd,
-}: Pick< PickerProps, 'containerEl' | 'onDragStart' | 'onDragEnd' > ) => {
-	const isDragging = useRef( false );
-	const leftWhileDragging = useRef( false );
-	useEffect( () => {
-		if ( ! containerEl || ( ! onDragStart && ! onDragEnd ) ) {
-			return;
-		}
-		const interactiveElements = [
-			containerEl.querySelector( '.react-colorful__saturation' ),
-			containerEl.querySelector( '.react-colorful__hue' ),
-			containerEl.querySelector( '.react-colorful__alpha' ),
-		].filter( ( el ) => !! el ) as Element[];
-
-		if ( interactiveElements.length === 0 ) {
-			return;
-		}
-
-		const doc = containerEl.ownerDocument;
-
-		const onPointerUp: EventListener = ( event ) => {
-			isDragging.current = false;
-			leftWhileDragging.current = false;
-			onDragEnd?.( event as MouseEvent );
-		};
-
-		const onPointerDown: EventListener = ( event ) => {
-			isDragging.current = true;
-			onDragStart?.( event as MouseEvent );
-		};
-
-		const onPointerLeave: EventListener = () => {
-			leftWhileDragging.current = isDragging.current;
-		};
-
-		// Try to detect if the user released the pointer while away from the
-		// current window. If the check is successfull, the dragEnd callback will
-		// called as soon as the pointer re-enters the window (better late than never)
-		const onPointerEnter: EventListener = ( event ) => {
-			const noPointerButtonsArePressed =
-				( event as PointerEvent ).buttons === 0;
-
-			if ( leftWhileDragging.current && noPointerButtonsArePressed ) {
-				onPointerUp( event );
-			}
-		};
-
-		// The pointerdown event is added on the interactive elements,
-		// while the remaining events are added on the document object since
-		// the pointer wouldn't necessarily be hovering the initial interactive
-		// element at that point.
-		interactiveElements.forEach( ( el ) =>
-			el.addEventListener( 'pointerdown', onPointerDown )
-		);
-		doc.addEventListener( 'pointerup', onPointerUp );
-		doc.addEventListener( 'pointerenter', onPointerEnter );
-		doc.addEventListener( 'pointerleave', onPointerLeave );
-
-		return () => {
-			interactiveElements.forEach( ( el ) =>
-				el.removeEventListener( 'pointerdown', onPointerDown )
-			);
-			doc.removeEventListener( 'pointerup', onPointerUp );
-			doc.removeEventListener( 'pointerenter', onPointerEnter );
-			doc.removeEventListener( 'pointerleave', onPointerUp );
-		};
-	}, [ onDragStart, onDragEnd, containerEl ] );
-};
-
-export const Picker = ( {
-	color,
-	enableAlpha,
-	onChange,
-	onDragStart,
-	onDragEnd,
-	containerEl,
-}: PickerProps ) => {
+export const Picker = ( { color, enableAlpha, onChange }: PickerProps ) => {
 	const Component = enableAlpha
 		? RgbaStringColorPicker
 		: RgbStringColorPicker;
 	const rgbColor = useMemo( () => color.toRgbString(), [ color ] );
 
-	useOnPickerDrag( { containerEl, onDragStart, onDragEnd } );
-
 	return (
 		<Component
 			color={ rgbColor }
 			onChange={ ( nextColor ) => {
 				onChange( colord( nextColor ) );
 			} }
+			// Pointer capture fortifies drag gestures so that they continue to
+			// work while dragging outside the component over objects like
+			// iframes. If a newer version of react-colorful begins to employ
+			// pointer capture this will be redundant and should be removed.
+			onPointerDown={ ( { currentTarget, pointerId } ) => {
+				currentTarget.setPointerCapture( pointerId );
+			} }
+			onPointerUp={ ( { currentTarget, pointerId } ) => {
+				currentTarget.releasePointerCapture( pointerId );
+			} }
 		/>
 	);
 };
diff --git a/packages/components/src/color-picker/saturation-picker.native.js b/packages/components/src/color-picker/saturation-picker.native.js
index 5c7e2e6d562a1b..5ca35d257565ff 100644
--- a/packages/components/src/color-picker/saturation-picker.native.js
+++ b/packages/components/src/color-picker/saturation-picker.native.js
@@ -56,8 +56,12 @@ export default class SaturationValuePicker extends Component {
 	}
 
 	normalizeValue( value ) {
-		if ( value < 0 ) return 0;
-		if ( value > 1 ) return 1;
+		if ( value < 0 ) {
+			return 0;
+		}
+		if ( value > 1 ) {
+			return 1;
+		}
 		return value;
 	}
 
diff --git a/packages/components/src/color-picker/stories/index.story.tsx b/packages/components/src/color-picker/stories/index.story.tsx
index 81500c15588222..9f2198515db1e6 100644
--- a/packages/components/src/color-picker/stories/index.story.tsx
+++ b/packages/components/src/color-picker/stories/index.story.tsx
@@ -1,12 +1,7 @@
 /**
  * External dependencies
  */
-import type { Meta, StoryFn } from '@storybook/react';
-
-/**
- * WordPress dependencies
- */
-import { useState } from '@wordpress/element';
+import type { Meta, StoryObj } from '@storybook/react';
 
 /**
  * Internal dependencies
@@ -30,19 +25,4 @@ const meta: Meta< typeof ColorPicker > = {
 };
 export default meta;
 
-const Template: StoryFn< typeof ColorPicker > = ( { onChange, ...props } ) => {
-	const [ color, setColor ] = useState< string | undefined >();
-
-	return (
-		<ColorPicker
-			{ ...props }
-			color={ color }
-			onChange={ ( ...changeArgs ) => {
-				onChange?.( ...changeArgs );
-				setColor( ...changeArgs );
-			} }
-		/>
-	);
-};
-
-export const Default = Template.bind( {} );
+export const Default: StoryObj< typeof ColorPicker > = {};
diff --git a/packages/components/src/color-picker/styles.ts b/packages/components/src/color-picker/styles.ts
index 02c99924bb1380..a78f10de2e4a32 100644
--- a/packages/components/src/color-picker/styles.ts
+++ b/packages/components/src/color-picker/styles.ts
@@ -14,29 +14,15 @@ import { boxSizingReset } from '../utils';
 import Button from '../button';
 import { Flex } from '../flex';
 import { HStack } from '../h-stack';
-import {
-	BackdropUI,
-	Container as InputControlContainer,
-} from '../input-control/styles/input-control-styles';
 import CONFIG from '../utils/config-values';
 
 export const NumberControlWrapper = styled( NumberControl )`
-	${ InputControlContainer } {
-		width: ${ space( 24 ) };
-	}
+	width: ${ space( 24 ) };
 `;
 
 export const SelectControl = styled( InnerSelectControl )`
 	margin-left: ${ space( -2 ) };
 	width: 5em;
-	/*
-	 * Remove border, but preserve focus styles
-	 * TODO: this override should be removed,
-	 * see https://github.com/WordPress/gutenberg/pull/50609
-	 */
-	select:not( :focus ) ~ ${ BackdropUI }${ BackdropUI }${ BackdropUI } {
-		border-color: transparent;
-	}
 `;
 
 export const RangeControl = styled( InnerRangeControl )`
@@ -95,7 +81,7 @@ export const ColorfulWrapper = styled.div`
 	.react-colorful__alpha {
 		width: 184px;
 		height: 16px;
-		border-radius: 16px;
+		border-radius: ${ CONFIG.radiusFull };
 		margin-bottom: ${ space( 2 ) };
 	}
 
diff --git a/packages/components/src/color-picker/test/index.tsx b/packages/components/src/color-picker/test/index.tsx
index 8d584d626487a4..98e059d5994ded 100644
--- a/packages/components/src/color-picker/test/index.tsx
+++ b/packages/components/src/color-picker/test/index.tsx
@@ -1,13 +1,19 @@
 /**
  * External dependencies
  */
-import { screen, render } from '@testing-library/react';
+import { fireEvent, screen, render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
 import { ColorPicker } from '..';
+import { click } from '@ariakit/test';
 
 const hslaMatcher = expect.objectContaining( {
 	h: expect.any( Number ),
@@ -133,20 +139,39 @@ describe( 'ColorPicker', () => {
 		} );
 	} );
 
-	describe.each( [
-		[ 'hue', 'Hue', '#aad52a' ],
-		[ 'saturation', 'Saturation', '#20dfdf' ],
-		[ 'lightness', 'Lightness', '#95eaea' ],
-	] )( 'HSL inputs', ( colorInput, inputLabel, expected ) => {
-		it( `should fire onChange with the correct value when the ${ colorInput } value is updated`, async () => {
+	describe( 'HSL inputs', () => {
+		it( 'sliders should use accurate H and S values based on user interaction when possible', async () => {
 			const user = userEvent.setup();
 			const onChange = jest.fn();
-			const color = '#2ad5d5';
+
+			const ControlledColorPicker = ( {
+				onChange: onChangeProp,
+				...restProps
+			}: React.ComponentProps< typeof ColorPicker > ) => {
+				const [ colorState, setColorState ] = useState( '#000000' );
+
+				const internalOnChange: typeof onChangeProp = ( newColor ) => {
+					onChangeProp?.( newColor );
+					setColorState( newColor );
+				};
+
+				return (
+					<>
+						<ColorPicker
+							{ ...restProps }
+							onChange={ internalOnChange }
+							color={ colorState }
+						/>
+						<button onClick={ () => setColorState( '#4d87ba' ) }>
+							Set color to #4d87ba
+						</button>
+					</>
+				);
+			};
 
 			render(
-				<ColorPicker
+				<ControlledColorPicker
 					onChange={ onChange }
-					color={ color }
 					enableAlpha={ false }
 				/>
 			);
@@ -156,16 +181,165 @@ describe( 'ColorPicker', () => {
 
 			await user.selectOptions( formatSelector, 'hsl' );
 
-			const inputElement = screen.getByRole( 'spinbutton', {
-				name: inputLabel,
+			const hueSliders = screen.getAllByRole( 'slider', {
+				name: 'Hue',
 			} );
-			expect( inputElement ).toBeVisible();
+			expect( hueSliders ).toHaveLength( 2 );
 
-			await user.clear( inputElement );
-			await user.type( inputElement, '75' );
+			// Reason for the `!` post-fix expression operator: if the check above
+			// doesn't fail, we're guaranteed that `hueSlider` is not undefined.
+			const hueSlider = hueSliders.at( -1 )!;
+			const saturationSlider = screen.getByRole( 'slider', {
+				name: 'Saturation',
+			} );
+			const lightnessSlider = screen.getByRole( 'slider', {
+				name: 'Lightness',
+			} );
+			const hueNumberInput = screen.getByRole( 'spinbutton', {
+				name: 'Hue',
+			} );
+			const saturationNumberInput = screen.getByRole( 'spinbutton', {
+				name: 'Saturation',
+			} );
+			const lightnessNumberInput = screen.getByRole( 'spinbutton', {
+				name: 'Lightness',
+			} );
+
+			// All initial inputs should have a value of `0` since the color is black.
+			expect( hueSlider ).toHaveValue( '0' );
+			expect( saturationSlider ).toHaveValue( '0' );
+			expect( lightnessSlider ).toHaveValue( '0' );
+			expect( hueNumberInput ).toHaveValue( 0 );
+			expect( saturationNumberInput ).toHaveValue( 0 );
+			expect( lightnessNumberInput ).toHaveValue( 0 );
+
+			// Interact with the Hue slider, it should change its value (and the
+			// value of the associated number input), but it shouldn't cause the
+			// `onChange` callback to fire, since the resulting color is still black.
+			fireEvent.change( hueSlider, { target: { value: 80 } } );
+
+			expect( hueSlider ).toHaveValue( '80' );
+			expect( hueNumberInput ).toHaveValue( 80 );
+			expect( onChange ).not.toHaveBeenCalled();
+
+			// Interact with the Saturation slider, it should change its value (and the
+			// value of the associated number input), but it shouldn't cause the
+			// `onChange` callback to fire, since the resulting color is still black.
+			fireEvent.change( saturationSlider, { target: { value: 50 } } );
+
+			expect( saturationSlider ).toHaveValue( '50' );
+			expect( saturationNumberInput ).toHaveValue( 50 );
+			expect( onChange ).not.toHaveBeenCalled();
+
+			// Interact with the Lightness slider, it should change its value (and the
+			// value of the associated number input). It should also cause the
+			// `onChange` callback to fire, since changing the lightness actually
+			// causes the color to change.
+			fireEvent.change( lightnessSlider, { target: { value: 30 } } );
 
+			await waitFor( () =>
+				expect( lightnessSlider ).toHaveValue( '30' )
+			);
+			expect( lightnessNumberInput ).toHaveValue( 30 );
+			expect( onChange ).toHaveBeenCalledTimes( 1 );
+			expect( onChange ).toHaveBeenLastCalledWith( '#597326' );
+
+			// Interact with the Lightness slider, setting to 100 (ie. white).
+			// It should also cause the `onChange` callback to fire, and reset the
+			// hue and saturation inputs to `0`.
+			fireEvent.change( lightnessSlider, { target: { value: 100 } } );
+
+			await waitFor( () =>
+				expect( lightnessSlider ).toHaveValue( '100' )
+			);
+			expect( lightnessNumberInput ).toHaveValue( 100 );
+			expect( hueSlider ).toHaveValue( '0' );
+			expect( saturationSlider ).toHaveValue( '0' );
+			expect( hueNumberInput ).toHaveValue( 0 );
+			expect( saturationNumberInput ).toHaveValue( 0 );
+			expect( onChange ).toHaveBeenCalledTimes( 2 );
+			expect( onChange ).toHaveBeenLastCalledWith( '#ffffff' );
+
+			// Interact with the Hue slider, it should change its value (and the
+			// value of the associated number input), but it shouldn't cause the
+			// `onChange` callback to fire, since the resulting color is still white.
+			fireEvent.change( hueSlider, { target: { value: 147 } } );
+
+			expect( hueSlider ).toHaveValue( '147' );
+			expect( hueNumberInput ).toHaveValue( 147 );
+			expect( onChange ).toHaveBeenCalledTimes( 2 );
+
+			// Interact with the Saturation slider, it should change its value (and the
+			// value of the associated number input), but it shouldn't cause the
+			// `onChange` callback to fire, since the resulting color is still white.
+			fireEvent.change( saturationSlider, { target: { value: 82 } } );
+
+			expect( saturationSlider ).toHaveValue( '82' );
+			expect( saturationNumberInput ).toHaveValue( 82 );
+			expect( onChange ).toHaveBeenCalledTimes( 2 );
+
+			// Interact with the Lightness slider, it should change its value (and the
+			// value of the associated number input). It should also cause the
+			// `onChange` callback to fire, since changing the lightness actually
+			// causes the color to change.
+			fireEvent.change( lightnessSlider, { target: { value: 14 } } );
+
+			await waitFor( () =>
+				expect( lightnessSlider ).toHaveValue( '14' )
+			);
+			expect( lightnessNumberInput ).toHaveValue( 14 );
 			expect( onChange ).toHaveBeenCalledTimes( 3 );
-			expect( onChange ).toHaveBeenLastCalledWith( expected );
+			expect( onChange ).toHaveBeenLastCalledWith( '#064121' );
+
+			// Set the color externally. All inputs should update to match the H/S/L
+			// value of the new color.
+			const setColorButton = screen.getByRole( 'button', {
+				name: /set color/i,
+			} );
+			await click( setColorButton );
+
+			expect( hueSlider ).toHaveValue( '208' );
+			expect( hueNumberInput ).toHaveValue( 208 );
+			expect( saturationSlider ).toHaveValue( '44' );
+			expect( saturationNumberInput ).toHaveValue( 44 );
+			expect( lightnessSlider ).toHaveValue( '52' );
+			expect( lightnessNumberInput ).toHaveValue( 52 );
+		} );
+
+		describe.each( [
+			[ 'hue', 'Hue', '#aad52a' ],
+			[ 'saturation', 'Saturation', '#20dfdf' ],
+			[ 'lightness', 'Lightness', '#95eaea' ],
+		] )( 'HSL inputs', ( colorInput, inputLabel, expected ) => {
+			it( `should fire onChange with the correct value when the ${ colorInput } value is updated`, async () => {
+				const user = userEvent.setup();
+				const onChange = jest.fn();
+				const color = '#2ad5d5';
+
+				render(
+					<ColorPicker
+						onChange={ onChange }
+						color={ color }
+						enableAlpha={ false }
+					/>
+				);
+
+				const formatSelector = screen.getByRole( 'combobox' );
+				expect( formatSelector ).toBeVisible();
+
+				await user.selectOptions( formatSelector, 'hsl' );
+
+				const inputElement = screen.getByRole( 'spinbutton', {
+					name: inputLabel,
+				} );
+				expect( inputElement ).toBeVisible();
+
+				await user.clear( inputElement );
+				await user.type( inputElement, '75' );
+
+				expect( onChange ).toHaveBeenCalledTimes( 3 );
+				expect( onChange ).toHaveBeenLastCalledWith( expected );
+			} );
 		} );
 	} );
 } );
diff --git a/packages/components/src/color-picker/types.ts b/packages/components/src/color-picker/types.ts
index 37c199e4c3b00d..5f98404c528444 100644
--- a/packages/components/src/color-picker/types.ts
+++ b/packages/components/src/color-picker/types.ts
@@ -59,9 +59,6 @@ export interface PickerProps {
 	color: Colord;
 	enableAlpha: boolean;
 	onChange: ( nextColor: Colord ) => void;
-	containerEl: HTMLElement | null;
-	onDragStart?: ( event: MouseEvent ) => void;
-	onDragEnd?: ( event: MouseEvent ) => void;
 }
 
 export interface ColorInputProps {
diff --git a/packages/components/src/color-picker/use-deprecated-props.ts b/packages/components/src/color-picker/use-deprecated-props.ts
index cc835d68fd10ba..68820af887a944 100644
--- a/packages/components/src/color-picker/use-deprecated-props.ts
+++ b/packages/components/src/color-picker/use-deprecated-props.ts
@@ -25,11 +25,17 @@ function isLegacyProps( props: any ): props is LegacyProps {
 function getColorFromLegacyProps(
 	color: LegacyProps[ 'color' ]
 ): string | undefined {
-	if ( color === undefined ) return;
+	if ( color === undefined ) {
+		return;
+	}
 
-	if ( typeof color === 'string' ) return color;
+	if ( typeof color === 'string' ) {
+		return color;
+	}
 
-	if ( color.hex ) return color.hex;
+	if ( color.hex ) {
+		return color.hex;
+	}
 
 	return undefined;
 }
diff --git a/packages/components/src/combobox-control/README.md b/packages/components/src/combobox-control/README.md
index cc15248678d275..5831c5ec2832c2 100644
--- a/packages/components/src/combobox-control/README.md
+++ b/packages/components/src/combobox-control/README.md
@@ -2,12 +2,6 @@
 
 `ComboboxControl` is an enhanced version of a [`SelectControl`](/packages/components/src/select-control/README.md), with the addition of being able to search for options using a search input.
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 These are the same as [the ones for `SelectControl`s](/packages/components/src/select-control/README.md#design-guidelines), but this component is better suited for when there are too many items to scroll through or load at once so you need to filter them based on user input.
@@ -40,6 +34,7 @@ function MyComboboxControl() {
 	const [ filteredOptions, setFilteredOptions ] = useState( options );
 	return (
 		<ComboboxControl
+			__nextHasNoMarginBottom
 			label="Font Size"
 			value={ fontSize }
 			onChange={ setFontSize }
@@ -83,7 +78,7 @@ If this property is added, a help text will be generated using help property as
 
 The options that can be chosen from.
 
--   Type: `Array<{ value: string, label: string }>`
+-   Type: `Array<{ value: string, label: string, disabled?: boolean }>`
 -   Required: Yes
 
 #### onFilterValueChange
@@ -107,6 +102,22 @@ The current value of the control.
 -   Type: `string | null`
 -   Required: No
 
+#### expandOnFocus
+
+Automatically expand the dropdown when the control is focused.
+If the control is clicked, the dropdown will expand regardless of this prop.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `true`
+
+### placeholder
+
+If passed, the combobox input will show a placeholder string if no values are present.
+
+-   Type: `string`
+-   Required: No
+
 #### __experimentalRenderItem
 
 Custom renderer invoked for each option in the suggestion list. The render prop receives as its argument an object containing, under the `item` key, the single option's data (directly from the array of data passed to the `options` prop).
@@ -114,10 +125,26 @@ Custom renderer invoked for each option in the suggestion list. The render prop
 -   Type: `( args: { item: object } ) => ReactNode`
 -   Required: No
 
+#### __next40pxDefaultSize
+
+Start opting into the larger default height that will become the default size in a future version.
+
+- Type: `Boolean`
+- Required: No
+- Default: `false`
+
+#### __nextHasNoMarginBottom
+
+Start opting into the new margin-free styles that will become the default in a future version.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
+
 ## Related components
 
--   Like this component, but without a search input, the `CustomSelectControl` component.
+-   Like this component, but without a search input, the [`CustomSelectControl`](https://developer.wordpress.org/block-editor/reference-guides/components/custom-select-control/) component.
 
--   To select one option from a set, when you want to show all the available options at once, use the `Radio` component.
--   To select one or more items from a set, use the `CheckboxControl` component.
--   To toggle a single setting on or off, use the `ToggleControl` component.
+-   To select one option from a set, when you want to show all the available options at once, use the [`RadioControl`](https://developer.wordpress.org/block-editor/reference-guides/components/radio-control/) component.
+-   To select one or more items from a set, use the [`CheckboxControl`](https://developer.wordpress.org/block-editor/reference-guides/components/checkbox-control/) component.
+-   To toggle a single setting on or off, use the [`ToggleControl`](https://developer.wordpress.org/block-editor/reference-guides/components/toggle-control/) component.
diff --git a/packages/components/src/combobox-control/index.tsx b/packages/components/src/combobox-control/index.tsx
index f4292d9980ee41..5c6725a51b435d 100644
--- a/packages/components/src/combobox-control/index.tsx
+++ b/packages/components/src/combobox-control/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -33,6 +33,7 @@ import { normalizeTextString } from '../utils/strings';
 import type { ComboboxControlOption, ComboboxControlProps } from './types';
 import type { TokenInputProps } from '../form-token-field/types';
 import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props';
+import { withIgnoreIMEEvents } from '../utils/with-ignore-ime-events';
 
 const noop = () => {};
 
@@ -77,10 +78,12 @@ const getIndexOfMatchingSuggestion = (
  * 	{
  * 		value: 'normal',
  * 		label: 'Normal',
+ * 		disabled: true,
  * 	},
  * 	{
  * 		value: 'large',
  * 		label: 'Large',
+ * 		disabled: false,
  * 	},
  * ];
  *
@@ -89,6 +92,7 @@ const getIndexOfMatchingSuggestion = (
  * 	const [ filteredOptions, setFilteredOptions ] = useState( options );
  * 	return (
  * 		<ComboboxControl
+ * 			__nextHasNoMarginBottom
  * 			label="Font Size"
  * 			value={ fontSize }
  * 			onChange={ setFontSize }
@@ -124,10 +128,9 @@ function ComboboxControl( props: ComboboxControlProps ) {
 			selected: __( 'Item selected.' ),
 		},
 		__experimentalRenderItem,
-	} = useDeprecated36pxDefaultSizeProp< ComboboxControlProps >(
-		props,
-		'wp.components.ComboboxControl'
-	);
+		expandOnFocus = true,
+		placeholder,
+	} = useDeprecated36pxDefaultSizeProp( props );
 
 	const [ value, setValue ] = useControlledValue( {
 		value: valueProp,
@@ -167,6 +170,10 @@ function ComboboxControl( props: ComboboxControlProps ) {
 	const onSuggestionSelected = (
 		newSelectedSuggestion: ComboboxControlOption
 	) => {
+		if ( newSelectedSuggestion.disabled ) {
+			return;
+		}
+
 		setValue( newSelectedSuggestion.value );
 		speak( messages.selected, 'assertive' );
 		setSelectedSuggestion( newSelectedSuggestion );
@@ -189,51 +196,42 @@ function ComboboxControl( props: ComboboxControlProps ) {
 		setIsExpanded( true );
 	};
 
-	const onKeyDown: React.KeyboardEventHandler< HTMLDivElement > = (
-		event
-	) => {
-		let preventDefault = false;
-
-		if (
-			event.defaultPrevented ||
-			// Ignore keydowns from IMEs
-			event.nativeEvent.isComposing ||
-			// Workaround for Mac Safari where the final Enter/Backspace of an IME composition
-			// is `isComposing=false`, even though it's technically still part of the composition.
-			// These can only be detected by keyCode.
-			event.keyCode === 229
-		) {
-			return;
-		}
+	const onKeyDown: React.KeyboardEventHandler< HTMLDivElement > =
+		withIgnoreIMEEvents( ( event ) => {
+			let preventDefault = false;
 
-		switch ( event.code ) {
-			case 'Enter':
-				if ( selectedSuggestion ) {
-					onSuggestionSelected( selectedSuggestion );
+			if ( event.defaultPrevented ) {
+				return;
+			}
+
+			switch ( event.code ) {
+				case 'Enter':
+					if ( selectedSuggestion ) {
+						onSuggestionSelected( selectedSuggestion );
+						preventDefault = true;
+					}
+					break;
+				case 'ArrowUp':
+					handleArrowNavigation( -1 );
 					preventDefault = true;
-				}
-				break;
-			case 'ArrowUp':
-				handleArrowNavigation( -1 );
-				preventDefault = true;
-				break;
-			case 'ArrowDown':
-				handleArrowNavigation( 1 );
-				preventDefault = true;
-				break;
-			case 'Escape':
-				setIsExpanded( false );
-				setSelectedSuggestion( null );
-				preventDefault = true;
-				break;
-			default:
-				break;
-		}
+					break;
+				case 'ArrowDown':
+					handleArrowNavigation( 1 );
+					preventDefault = true;
+					break;
+				case 'Escape':
+					setIsExpanded( false );
+					setSelectedSuggestion( null );
+					preventDefault = true;
+					break;
+				default:
+					break;
+			}
 
-		if ( preventDefault ) {
-			event.preventDefault();
-		}
-	};
+			if ( preventDefault ) {
+				event.preventDefault();
+			}
+		} );
 
 	const onBlur = () => {
 		setInputHasFocus( false );
@@ -241,11 +239,18 @@ function ComboboxControl( props: ComboboxControlProps ) {
 
 	const onFocus = () => {
 		setInputHasFocus( true );
-		setIsExpanded( true );
+		if ( expandOnFocus ) {
+			setIsExpanded( true );
+		}
+
 		onFilterValueChange( '' );
 		setInputValue( '' );
 	};
 
+	const onClick = () => {
+		setIsExpanded( true );
+	};
+
 	const onFocusOutside = () => {
 		setIsExpanded( false );
 	};
@@ -264,6 +269,15 @@ function ComboboxControl( props: ComboboxControlProps ) {
 		inputContainer.current?.focus();
 	};
 
+	// Stop propagation of the keydown event when pressing Enter on the Reset
+	// button to prevent calling the onKeydown callback on the container div
+	// element which actually sets the selected suggestion.
+	const handleResetStopPropagation: React.KeyboardEventHandler<
+		HTMLButtonElement
+	> = ( event ) => {
+		event.stopPropagation();
+	};
+
 	// Update current selections when the filter input changes.
 	useEffect( () => {
 		const hasMatchingSuggestions = matchingSuggestions.length > 0;
@@ -307,10 +321,8 @@ function ComboboxControl( props: ComboboxControlProps ) {
 		<DetectOutside onFocusOutside={ onFocusOutside }>
 			<BaseControl
 				__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
-				className={ classnames(
-					className,
-					'components-combobox-control'
-				) }
+				__associatedWPComponentName="ComboboxControl"
+				className={ clsx( className, 'components-combobox-control' ) }
 				label={ label }
 				id={ `components-form-token-input-${ instanceId }` }
 				hideLabelFromVision={ hideLabelFromVision }
@@ -329,9 +341,11 @@ function ComboboxControl( props: ComboboxControlProps ) {
 								className="components-combobox-control__input"
 								instanceId={ instanceId }
 								ref={ inputContainer }
+								placeholder={ placeholder }
 								value={ isExpanded ? inputValue : currentLabel }
 								onFocus={ onFocus }
 								onBlur={ onBlur }
+								onClick={ onClick }
 								isExpanded={ isExpanded }
 								selectedSuggestionIndex={ getIndexOfMatchingSuggestion(
 									selectedSuggestion,
@@ -345,8 +359,11 @@ function ComboboxControl( props: ComboboxControlProps ) {
 								<Button
 									className="components-combobox-control__reset"
 									icon={ closeSmall }
+									// Disable reason: Focus returns to input field when reset is clicked.
+									// eslint-disable-next-line no-restricted-syntax
 									disabled={ ! value }
 									onClick={ handleOnReset }
+									onKeyDown={ handleResetStopPropagation }
 									label={ __( 'Reset' ) }
 								/>
 							</FlexItem>
diff --git a/packages/components/src/combobox-control/stories/index.story.tsx b/packages/components/src/combobox-control/stories/index.story.tsx
index 9c0e5455ebc06c..516cd262fd5aa6 100644
--- a/packages/components/src/combobox-control/stories/index.story.tsx
+++ b/packages/components/src/combobox-control/stories/index.story.tsx
@@ -20,6 +20,17 @@ const countries = [
 	{ name: 'Albania', code: 'AL' },
 	{ name: 'Algeria', code: 'DZ' },
 	{ name: 'American Samoa', code: 'AS' },
+	{ name: 'Andorra', code: 'AD' },
+	{ name: 'Angola', code: 'AO' },
+	{ name: 'Anguilla', code: 'AI' },
+	{ name: 'Antarctica', code: 'AQ' },
+	{ name: 'Antigua and Barbuda', code: 'AG' },
+	{ name: 'Argentina', code: 'AR' },
+	{ name: 'Armenia', code: 'AM' },
+	{ name: 'Aruba', code: 'AW' },
+	{ name: 'Australia', code: 'AU' },
+	{ name: 'Austria', code: 'AT' },
+	{ name: 'Azerbaijan', code: 'AZ' },
 ];
 
 const meta: Meta< typeof ComboboxControl > = {
@@ -65,6 +76,7 @@ const Template: StoryFn< typeof ComboboxControl > = ( {
 };
 export const Default = Template.bind( {} );
 Default.args = {
+	__nextHasNoMarginBottom: true,
 	allowReset: false,
 	label: 'Select a country',
 	options: countryOptions,
@@ -111,3 +123,32 @@ WithCustomRenderItem.args = {
 		);
 	},
 };
+
+/**
+ * You can disable options in the list
+ * by setting the `disabled` property to true
+ * for individual items in the option object.
+ */
+export const WithDisabledOptions = Template.bind( {} );
+const optionsWithDisabledOptions = countryOptions.map( ( option, index ) => ( {
+	...option,
+	disabled: index % 3 === 0, // Disable options at index 0, 3, 6, etc.
+} ) );
+
+WithDisabledOptions.args = {
+	...Default.args,
+	options: optionsWithDisabledOptions,
+};
+
+/**
+ * By default, the combobox expands when focused.
+ * You can disable this behavior by setting the `expandOnFocus` prop to `false`.
+ * This is useful when you want to show the suggestions only when the user interacts with the input.
+ */
+export const NotExpandOnFocus = Template.bind( {} );
+
+NotExpandOnFocus.args = {
+	...Default.args,
+	options: countryOptions,
+	expandOnFocus: false,
+};
diff --git a/packages/components/src/combobox-control/test/index.tsx b/packages/components/src/combobox-control/test/index.tsx
index c26d8ab5afeb96..639407ac998ed2 100644
--- a/packages/components/src/combobox-control/test/index.tsx
+++ b/packages/components/src/combobox-control/test/index.tsx
@@ -12,7 +12,7 @@ import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import ComboboxControl from '..';
+import _ComboboxControl from '..';
 import type { ComboboxControlOption, ComboboxControlProps } from '../types';
 
 const timezones = [
@@ -57,6 +57,10 @@ const getAllOptions = () => screen.getAllByRole( 'option' );
 const getOptionSearchString = ( option: ComboboxControlOption ) =>
 	option.label.substring( 0, 11 );
 
+const ComboboxControl = ( props: ComboboxControlProps ) => {
+	return <_ComboboxControl { ...props } __nextHasNoMarginBottom />;
+};
+
 const ControlledComboboxControl = ( {
 	value: valueProp,
 	onChange,
@@ -89,7 +93,6 @@ describe.each( [
 			<Component options={ timezones } label={ defaultLabelText } />
 		);
 		const label = getLabel( defaultLabelText );
-		expect( label ).toBeInTheDocument();
 		expect( label ).toBeVisible();
 	} );
 
@@ -98,7 +101,7 @@ describe.each( [
 			<Component
 				options={ timezones }
 				label={ defaultLabelText }
-				hideLabelFromVision={ true }
+				hideLabelFromVision
 			/>
 		);
 		const label = getLabel( defaultLabelText );
@@ -185,6 +188,46 @@ describe.each( [
 		expect( input ).toHaveValue( targetOption.label );
 	} );
 
+	it( 'calls onFilterValueChange whenever the textbox changes', async () => {
+		const user = userEvent.setup();
+		const onFilterValueChangeSpy = jest.fn();
+		render(
+			<Component
+				options={ timezones }
+				label={ defaultLabelText }
+				onFilterValueChange={ onFilterValueChangeSpy }
+			/>
+		);
+
+		const input = getInput( defaultLabelText );
+
+		await user.type( input, 'a' );
+		expect( onFilterValueChangeSpy ).toHaveBeenCalledWith( 'a' );
+	} );
+
+	it( 'clears the textbox value if there is no selected value on blur', async () => {
+		const user = userEvent.setup();
+		const onFilterValueChangeSpy = jest.fn();
+		render(
+			<Component
+				options={ timezones }
+				label={ defaultLabelText }
+				onFilterValueChange={ onFilterValueChangeSpy }
+			/>
+		);
+		const input = getInput( defaultLabelText );
+
+		await user.type( input, 'a' );
+		expect( input ).toHaveValue( 'a' );
+
+		// Blur and focus the input.
+		await user.tab();
+		await user.click( input );
+
+		expect( input ).toHaveValue( '' );
+		expect( onFilterValueChangeSpy ).toHaveBeenLastCalledWith( '' );
+	} );
+
 	it( 'should select the correct option from a search', async () => {
 		const user = await userEvent.setup();
 		const targetOption = timezones[ 13 ];
@@ -306,4 +349,131 @@ describe.each( [
 		expect( onChangeSpy ).toHaveBeenCalledWith( targetOption.value );
 		expect( input ).toHaveValue( targetOption.label );
 	} );
+
+	it( 'should render with Reset button disabled', () => {
+		render(
+			<Component
+				options={ timezones }
+				label={ defaultLabelText }
+				allowReset
+			/>
+		);
+
+		const resetButton = screen.getByRole( 'button', { name: 'Reset' } );
+
+		expect( resetButton ).toBeVisible();
+		expect( resetButton ).toBeDisabled();
+	} );
+
+	it( 'should reset input when clicking the Reset button', async () => {
+		const user = await userEvent.setup();
+		const targetOption = timezones[ 13 ];
+
+		render(
+			<Component
+				options={ timezones }
+				label={ defaultLabelText }
+				allowReset
+			/>
+		);
+
+		// Pressing tab selects the input and shows the options.
+		await user.tab();
+		// Type enough characters to ensure a predictable search result.
+		await user.keyboard( getOptionSearchString( targetOption ) );
+		// Pressing Enter/Return selects the currently focused option.
+		await user.keyboard( '{Enter}' );
+
+		const input = getInput( defaultLabelText );
+
+		expect( input ).toHaveValue( targetOption.label );
+
+		const resetButton = screen.getByRole( 'button', { name: 'Reset' } );
+
+		expect( resetButton ).toBeEnabled();
+
+		await user.click( resetButton );
+
+		expect( input ).toHaveValue( '' );
+		expect( resetButton ).toBeDisabled();
+		expect( input ).toHaveFocus();
+	} );
+
+	it( 'should reset input when pressing the Reset button with the Enter key', async () => {
+		const user = await userEvent.setup();
+		const targetOption = timezones[ 13 ];
+
+		render(
+			<Component
+				options={ timezones }
+				label={ defaultLabelText }
+				allowReset
+			/>
+		);
+
+		// Pressing tab selects the input and shows the options.
+		await user.tab();
+		// Type enough characters to ensure a predictable search result.
+		await user.keyboard( getOptionSearchString( targetOption ) );
+		// Pressing Enter/Return selects the currently focused option.
+		await user.keyboard( '{Enter}' );
+
+		const input = getInput( defaultLabelText );
+
+		expect( input ).toHaveValue( targetOption.label );
+
+		// Pressing tab moves focus to the Reset buttons
+		await user.tab();
+
+		const resetButton = screen.getByRole( 'button', { name: 'Reset' } );
+
+		// If the button has focus that implies it is enabled.
+		expect( resetButton ).toHaveFocus();
+
+		// Pressing Enter/Return resets the input.
+		await user.keyboard( '{Enter}' );
+
+		expect( input ).toHaveValue( '' );
+		expect( resetButton ).toBeDisabled();
+		expect( input ).toHaveFocus();
+	} );
+
+	it( 'should reset input when pressing the Reset button with the Spacebar key', async () => {
+		const user = await userEvent.setup();
+		const targetOption = timezones[ 13 ];
+
+		render(
+			<Component
+				options={ timezones }
+				label={ defaultLabelText }
+				allowReset
+			/>
+		);
+
+		// Pressing tab selects the input and shows the options.
+		await user.tab();
+		// Type enough characters to ensure a predictable search result.
+		await user.keyboard( getOptionSearchString( targetOption ) );
+		// Pressing Enter/Return selects the currently focused option.
+		await user.keyboard( '{Enter}' );
+
+		const input = getInput( defaultLabelText );
+
+		expect( input ).toHaveValue( targetOption.label );
+
+		// Pressing tab moves focus to the Reset buttons.
+		await user.tab();
+
+		const resetButton = screen.getByRole( 'button', { name: 'Reset' } );
+
+		// If the button has focus that implies it is enabled.
+		expect( resetButton ).toHaveFocus();
+
+		// Pressing Spacebar resets the input.
+		await user.keyboard( '[Space]' );
+
+		expect( input ).toHaveValue( '' );
+		expect( resetButton ).toBeDisabled();
+		expect( input ).toHaveFocus();
+	} );
 } );
diff --git a/packages/components/src/combobox-control/types.ts b/packages/components/src/combobox-control/types.ts
index 6a32fb17e16c08..470b38c35e2c8a 100644
--- a/packages/components/src/combobox-control/types.ts
+++ b/packages/components/src/combobox-control/types.ts
@@ -6,6 +6,7 @@ import type { BaseControlProps } from '../base-control/types';
 export type ComboboxControlOption = {
 	label: string;
 	value: string;
+	disabled?: boolean;
 	[ key: string ]: any;
 };
 
@@ -30,6 +31,7 @@ export type ComboboxControlProps = Pick<
 	 *
 	 * @default false
 	 * @deprecated
+	 * @ignore
 	 */
 	__next36pxDefaultSize?: boolean;
 	/**
@@ -44,6 +46,13 @@ export type ComboboxControlProps = Pick<
 	 * @default true
 	 */
 	allowReset?: boolean;
+	/**
+	 * Automatically expand the dropdown when the control is focused.
+	 * If the control is clicked, the dropdown will expand regardless of this prop.
+	 *
+	 * @default true
+	 */
+	expandOnFocus?: boolean;
 	/**
 	 * Customizable UI messages.
 	 */
@@ -73,4 +82,8 @@ export type ComboboxControlProps = Pick<
 	 * The current value of the control.
 	 */
 	value?: string | null;
+	/**
+	 * If passed, the combobox input will show a placeholder string if no values are present.
+	 */
+	placeholder?: string;
 };
diff --git a/packages/components/src/composite/README.md b/packages/components/src/composite/README.md
new file mode 100644
index 00000000000000..de710bd2ab6272
--- /dev/null
+++ b/packages/components/src/composite/README.md
@@ -0,0 +1,306 @@
+# `Composite`
+
+`Composite` provides a single tab stop on the page and allows navigation through the focusable descendants with arrow keys. This abstract component is based on the [WAI-ARIA Composite Role⁠](https://w3c.github.io/aria/#composite).
+
+## Usage
+
+```jsx
+import { Composite } from '@wordpress/components';
+
+<Composite>
+  <Composite.Group>
+    <Composite.GroupLabel>Label</Composite.GroupLabel>
+    <Composite.Item>Item 1</Composite.Item>
+    <Composite.Item>Item 2</Composite.Item>
+  </CompositeGroup>
+</Composite>
+```
+
+## Components
+
+### `Composite`
+
+Renders a composite widget.
+
+#### Props
+
+##### `activeId`: `string | null`
+
+The current active item `id`. The active item is the element within the composite widget that has either DOM or virtual focus (in case the `virtualFocus` prop is enabled).
+
+-   `null` represents the base composite element (the one with a [composite role](https://w3c.github.io/aria/#composite)). Users will be able to navigate out of it using arrow keys.
+-   If `activeId` is initially set to `null`, the base composite element itself will have focus and users will be able to navigate to it using arrow keys.
+
+-   Required: no
+
+##### `defaultActiveId`: `string | null`
+
+The composite item id that should be active by default when the composite widget is rendered. If `null`, the composite element itself will have focus and users will be able to navigate to it using arrow keys. If `undefined`, the first enabled item will be focused.
+
+-   Required: no
+
+##### `setActiveId`: `((activeId: string | null | undefined) => void)`
+
+A callback that gets called when the `activeId` state changes.
+
+-   Required: no
+
+##### `focusLoop`: `boolean | 'horizontal' | 'vertical' | 'both'`
+
+Determines how the focus behaves when the user reaches the end of the composite widget.
+
+On one-dimensional composite widgets:
+
+-   `true` loops from the last item to the first item and vice-versa.
+-   `horizontal` loops only if `orientation` is `horizontal` or not set.
+-   `vertical` loops only if `orientation` is `vertical` or not set.
+-   If `activeId` is initially set to `null`, the composite element will be focused in between the last and first items.
+
+On two-dimensional composite widgets (ie. when using `CompositeRow`):
+
+-   `true` loops from the last row/column item to the first item in the same row/column and vice-versa. If it's the last item in the last row, it moves to the first item in the first row and vice-versa.
+-   `horizontal` loops only from the last row item to the first item in the same row.
+-   `vertical` loops only from the last column item to the first item in the column row.
+-   If `activeId` is initially set to `null`, vertical loop will have no effect as moving down from the last row or up from the first row will focus on the composite element.
+-   If `focusWrap` matches the value of `focusLoop`, it'll wrap between the last item in the last row or column and the first item in the first row or column and vice-versa.
+
+-   Required: no
+-   Default: `false`
+
+##### `focusShift`: `boolean`
+
+**Works only on two-dimensional composite widgets**.
+
+If enabled, moving up or down when there's no next item or when the next item is disabled will shift to the item right before it.
+
+-   Required: no
+-   Default: `false`
+
+##### `focusWrap`: `boolean`
+
+**Works only on two-dimensional composite widgets**.
+
+If enabled, moving to the next item from the last one in a row or column
+will focus on the first item in the next row or column and vice-versa.
+
+-   `true` wraps between rows and columns.
+-   `horizontal` wraps only between rows.
+-   `vertical` wraps only between columns.
+-   If `focusLoop` matches the value of `focusWrap`, it'll wrap between the
+    last item in the last row or column and the first item in the first row or
+    column and vice-versa.
+
+-   Required: no
+-   Default: `false`
+
+##### `virtualFocus`: `boolean`
+
+If enabled, the composite element will act as an [`aria-activedescendant`](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#kbd_focus_activedescendant)
+container instead of [roving tabindex](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#kbd_roving_tabindex). DOM focus will remain on the composite element while its items receive
+virtual focus.
+
+In both scenarios, the item in focus will carry the `data-active-item` attribute.
+
+-   Required: no
+-   Default: `false`
+
+##### `orientation`: `'horizontal' | 'vertical' | 'both'`
+
+Defines the orientation of the composite widget. If the composite has a single row or column (one-dimensional), the `orientation` value determines which arrow keys can be used to move focus:
+
+-   `both`: all arrow keys work.
+-   `horizontal`: only left and right arrow keys work.
+-   `vertical`: only up and down arrow keys work.
+
+It doesn't have any effect on two-dimensional composites.
+
+-   Required: no
+-   Default: `both`
+
+##### `rtl`: `boolean`
+
+Determines how the `store`'s `next` and `previous` functions will behave. If `rtl` is set to `true`, they will be inverted.
+
+This only affects the composite widget behavior. You still need to set `dir="rtl"` on HTML/CSS.
+
+-   Required: no
+-   Default: `false`
+
+##### `render`: `RenderProp<React.HTMLAttributes<any> & { ref?: React.Ref<any> | undefined; }> | React.ReactElement<any, string | React.JSXElementConstructor<any>>`
+
+Allows the component to be rendered as a different HTML element or React component. The value can be a React element or a function that takes in the original component props and gives back a React element with the props merged.
+
+-   Required: no
+
+##### `focusable`: `boolean`
+
+Makes the component a focusable element. When this element gains keyboard focus, it gets a `data-focus-visible` attribute and triggers the `onFocusVisible` prop.
+
+The component supports the `disabled` prop even for those elements not supporting the native `disabled` attribute. Disabled elements may be still accessible via keyboard by using the the `accessibleWhenDisabled` prop.
+
+Non-native focusable elements will lose their focusability entirely. However, native focusable elements will retain their inherent focusability.
+
+-   Required: no
+
+##### `disabled`: `boolean`
+
+Determines if the element is disabled. This sets the `aria-disabled` attribute accordingly, enabling support for all elements, including those that don't support the native `disabled` attribute.
+
+This feature can be combined with the `accessibleWhenDisabled` prop to
+make disabled elements still accessible via keyboard.
+
+**Note**: For this prop to work, the `focusable` prop must be set to
+`true`, if it's not set by default.
+
+-   Required: no
+-   Default: `false`
+
+##### `accessibleWhenDisabled`: `boolean`
+
+Indicates whether the element should be focusable even when it is
+`disabled`.
+
+This is important when discoverability is a concern. For example:
+
+> A toolbar in an editor contains a set of special smart paste functions
+> that are disabled when the clipboard is empty or when the function is not
+> applicable to the current content of the clipboard. It could be helpful to
+> keep the disabled buttons focusable if the ability to discover their
+> functionality is primarily via their presence on the toolbar.
+
+Learn more on [Focusability of disabled
+controls](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#focusabilityofdisabledcontrols).
+
+-   Required: no
+
+##### `onFocusVisible`: `(event: SyntheticEvent<HTMLElement>) => void`
+
+Custom event handler invoked when the element gains focus through keyboard interaction or a key press occurs while the element is in focus. This is the programmatic equivalent of the `data-focus-visible` attribute.
+
+**Note**: For this prop to work, the `focusable` prop must be set to `true` if it's not set by default.
+
+-   Required: no
+
+##### `children`: `React.ReactNode`
+
+The contents of the component.
+
+-   Required: no
+
+### `Composite.Group`
+
+Renders a group element for composite items.
+
+##### `render`: `RenderProp<React.HTMLAttributes<any> & { ref?: React.Ref<any> | undefined; }> | React.ReactElement<any, string | React.JSXElementConstructor<any>>`
+
+Allows the component to be rendered as a different HTML element or React component. The value can be a React element or a function that takes in the original component props and gives back a React element with the props merged.
+
+-   Required: no
+
+##### `children`: `React.ReactNode`
+
+The contents of the component.
+
+-   Required: no
+
+### `Composite.GroupLabel`
+
+Renders a label in a composite group. This component must be wrapped with `Composite.Group` so the `aria-labelledby` prop is properly set on the composite group element.
+
+##### `render`: `RenderProp<React.HTMLAttributes<any> & { ref?: React.Ref<any> | undefined; }> | React.ReactElement<any, string | React.JSXElementConstructor<any>>`
+
+Allows the component to be rendered as a different HTML element or React component. The value can be a React element or a function that takes in the original component props and gives back a React element with the props merged.
+
+-   Required: no
+
+##### `children`: `React.ReactNode`
+
+The contents of the component.
+
+-   Required: no
+
+### `Composite.Item`
+
+Renders a composite item.
+
+##### `accessibleWhenDisabled`: `boolean`
+
+Indicates whether the element should be focusable even when it is
+`disabled`.
+
+This is important when discoverability is a concern. For example:
+
+> A toolbar in an editor contains a set of special smart paste functions
+> that are disabled when the clipboard is empty or when the function is not
+> applicable to the current content of the clipboard. It could be helpful to
+> keep the disabled buttons focusable if the ability to discover their
+> functionality is primarily via their presence on the toolbar.
+
+Learn more on [Focusability of disabled
+controls](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#focusabilityofdisabledcontrols).
+
+-   Required: no
+
+##### `render`: `RenderProp<React.HTMLAttributes<any> & { ref?: React.Ref<any> | undefined; }> | React.ReactElement<any, string | React.JSXElementConstructor<any>>`
+
+Allows the component to be rendered as a different HTML element or React component. The value can be a React element or a function that takes in the original component props and gives back a React element with the props merged.
+
+-   Required: no
+
+##### `children`: `React.ReactNode`
+
+The contents of the component.
+
+-   Required: no
+
+### `Composite.Row`
+
+Renders a composite row. Wrapping `Composite.Item` elements within `Composite.Row` will create a two-dimensional composite widget, such as a grid.
+
+##### `render`: `RenderProp<React.HTMLAttributes<any> & { ref?: React.Ref<any> | undefined; }> | React.ReactElement<any, string | React.JSXElementConstructor<any>>`
+
+Allows the component to be rendered as a different HTML element or React component. The value can be a React element or a function that takes in the original component props and gives back a React element with the props merged.
+
+-   Required: no
+
+##### `children`: `React.ReactNode`
+
+The contents of the component.
+
+-   Required: no
+
+### `Composite.Hover`
+
+Renders an element in a composite widget that receives focus on mouse move and loses focus to the composite base element on mouse leave. This should be combined with the `Composite.Item` component.
+
+##### `render`: `RenderProp<React.HTMLAttributes<any> & { ref?: React.Ref<any> | undefined; }> | React.ReactElement<any, string | React.JSXElementConstructor<any>>`
+
+Allows the component to be rendered as a different HTML element or React component. The value can be a React element or a function that takes in the original component props and gives back a React element with the props merged.
+
+-   Required: no
+
+##### `children`: `React.ReactNode`
+
+The contents of the component.
+
+-   Required: no
+
+### `Composite.Typeahead`
+
+Renders a component that adds typeahead functionality to composite components. Hitting printable character keys will move focus to the next composite item that begins with the input characters.
+
+##### `render`: `RenderProp<React.HTMLAttributes<any> & { ref?: React.Ref<any> | undefined; }> | React.ReactElement<any, string | React.JSXElementConstructor<any>>`
+
+Allows the component to be rendered as a different HTML element or React component. The value can be a React element or a function that takes in the original component props and gives back a React element with the props merged.
+
+-   Required: no
+
+##### `children`: `React.ReactNode`
+
+The contents of the component.
+
+-   Required: no
+
+### `Composite.Context`
+
+The React context used by the composite components. It can be used by to access the composite store, and to forward the context when composite sub-components are rendered across portals (ie. `SlotFill` components) that would not otherwise forward the context to the `Fill` children.
diff --git a/packages/components/src/composite/context.tsx b/packages/components/src/composite/context.tsx
new file mode 100644
index 00000000000000..4a8b22a712b031
--- /dev/null
+++ b/packages/components/src/composite/context.tsx
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { createContext, useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { CompositeContextProps } from './types';
+
+export const CompositeContext = createContext< CompositeContextProps >( {} );
+
+export const useCompositeContext = () => useContext( CompositeContext );
diff --git a/packages/components/src/composite/group-label.tsx b/packages/components/src/composite/group-label.tsx
new file mode 100644
index 00000000000000..7e3c6ffdc7759c
--- /dev/null
+++ b/packages/components/src/composite/group-label.tsx
@@ -0,0 +1,32 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { useCompositeContext } from './context';
+import type { CompositeGroupLabelProps } from './types';
+
+export const CompositeGroupLabel = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< CompositeGroupLabelProps, 'div', false >
+>( function CompositeGroupLabel( props, ref ) {
+	const context = useCompositeContext();
+
+	// @ts-expect-error The store prop is undocumented and only used by the
+	// legacy compat layer. The `store` prop is documented, but its type is
+	// obfuscated to discourage its use outside of the component's internals.
+	const store = ( props.store ?? context.store ) as Ariakit.CompositeStore;
+
+	return (
+		<Ariakit.CompositeGroupLabel store={ store } { ...props } ref={ ref } />
+	);
+} );
diff --git a/packages/components/src/composite/group.tsx b/packages/components/src/composite/group.tsx
new file mode 100644
index 00000000000000..bcfb47e684613d
--- /dev/null
+++ b/packages/components/src/composite/group.tsx
@@ -0,0 +1,30 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { useCompositeContext } from './context';
+import type { CompositeGroupProps } from './types';
+
+export const CompositeGroup = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< CompositeGroupProps, 'div', false >
+>( function CompositeGroup( props, ref ) {
+	const context = useCompositeContext();
+
+	// @ts-expect-error The store prop is undocumented and only used by the
+	// legacy compat layer. The `store` prop is documented, but its type is
+	// obfuscated to discourage its use outside of the component's internals.
+	const store = ( props.store ?? context.store ) as Ariakit.CompositeStore;
+
+	return <Ariakit.CompositeGroup store={ store } { ...props } ref={ ref } />;
+} );
diff --git a/packages/components/src/composite/hover.tsx b/packages/components/src/composite/hover.tsx
new file mode 100644
index 00000000000000..1507a1879cc19f
--- /dev/null
+++ b/packages/components/src/composite/hover.tsx
@@ -0,0 +1,30 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { useCompositeContext } from './context';
+import type { CompositeHoverProps } from './types';
+
+export const CompositeHover = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< CompositeHoverProps, 'div', false >
+>( function CompositeHover( props, ref ) {
+	const context = useCompositeContext();
+
+	// @ts-expect-error The store prop is undocumented and only used by the
+	// legacy compat layer. The `store` prop is documented, but its type is
+	// obfuscated to discourage its use outside of the component's internals.
+	const store = ( props.store ?? context.store ) as Ariakit.CompositeStore;
+
+	return <Ariakit.CompositeGroup store={ store } { ...props } ref={ ref } />;
+} );
diff --git a/packages/components/src/composite/index.ts b/packages/components/src/composite/index.ts
deleted file mode 100644
index 2a4e3655426908..00000000000000
--- a/packages/components/src/composite/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Composite is a component that may contain navigable items represented by
- * CompositeItem. It's inspired by the WAI-ARIA Composite Role and implements
- * all the keyboard navigation mechanisms to ensure that there's only one
- * tab stop for the whole Composite element. This means that it can behave as
- * a roving tabindex or aria-activedescendant container.
- *
- * @see https://reakit.io/docs/composite/
- *
- * The plan is to build own API that accounts for future breaking changes
- * in Reakit (https://github.com/WordPress/gutenberg/pull/28085).
- */
-/* eslint-disable-next-line no-restricted-imports */
-export {
-	Composite,
-	CompositeGroup,
-	CompositeItem,
-	useCompositeState,
-} from 'reakit';
-
-/* eslint-disable-next-line no-restricted-imports */
-export type { CompositeStateReturn as CompositeState } from 'reakit';
diff --git a/packages/components/src/composite/index.tsx b/packages/components/src/composite/index.tsx
new file mode 100644
index 00000000000000..8eb562f5bdab38
--- /dev/null
+++ b/packages/components/src/composite/index.tsx
@@ -0,0 +1,251 @@
+/**
+ * Composite is a component that may contain navigable items represented by
+ * Composite.Item. It's inspired by the WAI-ARIA Composite Role and implements
+ * all the keyboard navigation mechanisms to ensure that there's only one
+ * tab stop for the whole Composite element. This means that it can behave as
+ * a roving tabindex or aria-activedescendant container.
+ *
+ * @see https://ariakit.org/components/composite
+ */
+
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { isRTL } from '@wordpress/i18n';
+import { useMemo, forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { CompositeContext } from './context';
+import { CompositeGroup } from './group';
+import { CompositeGroupLabel } from './group-label';
+import { CompositeHover } from './hover';
+import { CompositeItem } from './item';
+import { CompositeRow } from './row';
+import { CompositeTypeahead } from './typeahead';
+import type { CompositeProps } from './types';
+
+/**
+ * Renders a widget based on the WAI-ARIA [`composite`](https://w3c.github.io/aria/#composite)
+ * role, which provides a single tab stop on the page and arrow key navigation
+ * through the focusable descendants.
+ *
+ * @example
+ * ```jsx
+ * import { Composite } from '@wordpress/components';
+ *
+ * <Composite>
+ *   <Composite.Item>Item 1</Composite.Item>
+ *   <Composite.Item>Item 2</Composite.Item>
+ * </Composite>
+ * ```
+ */
+export const Composite = Object.assign(
+	forwardRef<
+		HTMLDivElement,
+		WordPressComponentProps< CompositeProps, 'div', false >
+	>( function Composite(
+		{
+			// Composite store props
+			activeId,
+			defaultActiveId,
+			setActiveId,
+			focusLoop = false,
+			focusWrap = false,
+			focusShift = false,
+			virtualFocus = false,
+			orientation = 'both',
+			rtl = isRTL(),
+
+			// Composite component props
+			children,
+			disabled = false,
+
+			// Rest props
+			...props
+		},
+		ref
+	) {
+		// @ts-expect-error The store prop is undocumented and only used by the
+		// legacy compat layer.
+		const storeProp = props.store as Ariakit.CompositeStore;
+		const internalStore = Ariakit.useCompositeStore( {
+			activeId,
+			defaultActiveId,
+			setActiveId,
+			focusLoop,
+			focusWrap,
+			focusShift,
+			virtualFocus,
+			orientation,
+			rtl,
+		} );
+
+		const store = storeProp ?? internalStore;
+
+		const contextValue = useMemo(
+			() => ( {
+				store,
+			} ),
+			[ store ]
+		);
+
+		return (
+			<Ariakit.Composite
+				disabled={ disabled }
+				store={ store }
+				{ ...props }
+				ref={ ref }
+			>
+				<CompositeContext.Provider value={ contextValue }>
+					{ children }
+				</CompositeContext.Provider>
+			</Ariakit.Composite>
+		);
+	} ),
+	{
+		/**
+		 * Renders a group element for composite items.
+		 *
+		 * @example
+		 * ```jsx
+		 * import { Composite } from '@wordpress/components';
+		 *
+		 * <Composite>
+		 *   <Composite.Group>
+		 *     <Composite.GroupLabel>Label</Composite.GroupLabel>
+		 *     <Composite.Item>Item 1</Composite.Item>
+		 *     <Composite.Item>Item 2</Composite.Item>
+		 *   </CompositeGroup>
+		 * </Composite>
+		 * ```
+		 */
+		Group: Object.assign( CompositeGroup, {
+			displayName: 'Composite.Group',
+		} ),
+		/**
+		 * Renders a label in a composite group. This component must be wrapped with
+		 * `Composite.Group` so the `aria-labelledby` prop is properly set on the
+		 * composite group element.
+		 *
+		 * @example
+		 * ```jsx
+		 * import { Composite } from '@wordpress/components';
+		 *
+		 * <Composite>
+		 *   <Composite.Group>
+		 *     <Composite.GroupLabel>Label</Composite.GroupLabel>
+		 *     <Composite.Item>Item 1</Composite.Item>
+		 *     <Composite.Item>Item 2</Composite.Item>
+		 *   </CompositeGroup>
+		 * </Composite>
+		 * ```
+		 */
+		GroupLabel: Object.assign( CompositeGroupLabel, {
+			displayName: 'Composite.GroupLabel',
+		} ),
+		/**
+		 * Renders a composite item.
+		 *
+		 * @example
+		 * ```jsx
+		 * import { Composite } from '@wordpress/components';
+		 *
+		 * <Composite>
+		 *   <Composite.Item>Item 1</Composite.Item>
+		 *   <Composite.Item>Item 2</Composite.Item>
+		 *   <Composite.Item>Item 3</Composite.Item>
+		 * </Composite>
+		 * ```
+		 */
+		Item: Object.assign( CompositeItem, { displayName: 'Composite.Item' } ),
+		/**
+		 * Renders a composite row. Wrapping `Composite.Item` elements within
+		 * `Composite.Row` will create a two-dimensional composite widget, such as a
+		 * grid.
+		 *
+		 * @example
+		 * ```jsx
+		 * import { Composite } from '@wordpress/components';
+		 *
+		 * <Composite>
+		 *   <Composite.Row>
+		 *     <Composite.Item>Item 1.1</Composite.Item>
+		 *     <Composite.Item>Item 1.2</Composite.Item>
+		 *     <Composite.Item>Item 1.3</Composite.Item>
+		 *   </Composite.Row>
+		 *   <Composite.Row>
+		 *     <Composite.Item>Item 2.1</Composite.Item>
+		 *     <Composite.Item>Item 2.2</Composite.Item>
+		 *     <Composite.Item>Item 2.3</Composite.Item>
+		 *   </Composite.Row>
+		 * </Composite>
+		 * ```
+		 */
+		Row: Object.assign( CompositeRow, { displayName: 'Composite.Row' } ),
+		/**
+		 * Renders an element in a composite widget that receives focus on mouse move
+		 * and loses focus to the composite base element on mouse leave. This should
+		 * be combined with the `Composite.Item` component.
+		 *
+		 * @example
+		 * ```jsx
+		 * import { Composite } from '@wordpress/components';
+		 *
+		 * <Composite>
+		 *   <Composite.Hover render={ <Composite.Item /> }>
+		 *     Item 1
+		 *   </Composite.Hover>
+		 *   <Composite.Hover render={ <Composite.Item /> }>
+		 *     Item 2
+		 *   </Composite.Hover>
+		 * </Composite>
+		 * ```
+		 */
+		Hover: Object.assign( CompositeHover, {
+			displayName: 'Composite.Hover',
+		} ),
+		/**
+		 * Renders a component that adds typeahead functionality to composite
+		 * components. Hitting printable character keys will move focus to the next
+		 * composite item that begins with the input characters.
+		 *
+		 * @example
+		 * ```jsx
+		 * import { Composite } from '@wordpress/components';
+		 *
+		 * <Composite render={ <CompositeTypeahead /> }>
+		 *   <Composite.Item>Item 1</Composite.Item>
+		 *   <Composite.Item>Item 2</Composite.Item>
+		 * </Composite>
+		 * ```
+		 */
+		Typeahead: Object.assign( CompositeTypeahead, {
+			displayName: 'Composite.Typeahead',
+		} ),
+		/**
+		 * The React context used by the composite components. It can be used by
+		 * to access the composite store, and to forward the context when composite
+		 * sub-components are rendered across portals (ie. `SlotFill` components)
+		 * that would not otherwise forward the context to the `Fill` children.
+		 *
+		 * @example
+		 * ```jsx
+		 * import { Composite } from '@wordpress/components';
+		 * import { useContext } from '@wordpress/element';
+		 *
+		 * const compositeContext = useContext( Composite.Context );
+		 * ```
+		 */
+		Context: Object.assign( CompositeContext, {
+			displayName: 'Composite.Context',
+		} ),
+	}
+);
diff --git a/packages/components/src/composite/item.tsx b/packages/components/src/composite/item.tsx
new file mode 100644
index 00000000000000..edbf0b92e039af
--- /dev/null
+++ b/packages/components/src/composite/item.tsx
@@ -0,0 +1,48 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { useCompositeContext } from './context';
+import type { CompositeItemProps } from './types';
+
+export const CompositeItem = forwardRef<
+	HTMLButtonElement,
+	WordPressComponentProps< CompositeItemProps, 'button', false >
+>( function CompositeItem( props, ref ) {
+	const context = useCompositeContext();
+
+	// @ts-expect-error The store prop is undocumented and only used by the
+	// legacy compat layer. The `store` prop is documented, but its type is
+	// obfuscated to discourage its use outside of the component's internals.
+	const store = ( props.store ?? context.store ) as Ariakit.CompositeStore;
+
+	// If the active item is not connected, Composite may end up in a state
+	// where none of the items are tabbable. In this case, we force all items to
+	// be tabbable, so that as soon as an item received focus, it becomes active
+	// and Composite goes back to working as expected.
+	const tabbable = Ariakit.useStoreState( store, ( state ) => {
+		return (
+			state?.activeId !== null &&
+			! store?.item( state?.activeId )?.element?.isConnected
+		);
+	} );
+
+	return (
+		<Ariakit.CompositeItem
+			store={ store }
+			tabbable={ tabbable }
+			{ ...props }
+			ref={ ref }
+		/>
+	);
+} );
diff --git a/packages/components/src/composite/legacy/index.tsx b/packages/components/src/composite/legacy/index.tsx
new file mode 100644
index 00000000000000..c6e6616e96c044
--- /dev/null
+++ b/packages/components/src/composite/legacy/index.tsx
@@ -0,0 +1,257 @@
+/**
+ * Composite is a component that may contain navigable items represented by
+ * CompositeItem. It's inspired by the WAI-ARIA Composite Role and implements
+ * all the keyboard navigation mechanisms to ensure that there's only one
+ * tab stop for the whole Composite element. This means that it can behave as
+ * a roving tabindex or aria-activedescendant container.
+ *
+ * This file aims at providing components that are as close as possible to the
+ * original `reakit`-based implementation (which was removed from the codebase),
+ * although it is recommended that consumers of the package switch to the stable,
+ * un-prefixed, `ariakit`-based version of `Composite`.
+ *
+ * @see https://ariakit.org/components/composite
+ */
+
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+import { useInstanceId } from '@wordpress/compose';
+import deprecated from '@wordpress/deprecated';
+
+/**
+ * Internal dependencies
+ */
+import { Composite as Current } from '..';
+
+type Orientation = 'horizontal' | 'vertical';
+
+export interface LegacyStateOptions {
+	/**
+	 * ID that will serve as a base for all the items IDs.
+	 */
+	baseId?: string;
+	/**
+	 * Determines how next and previous functions will behave. If `rtl` is set
+	 * to `true`, they will be inverted. This only affects the composite widget
+	 * behavior. You still need to set `dir="rtl"` on HTML/CSS.
+	 *
+	 * @default false
+	 */
+	rtl?: boolean;
+	/**
+	 * Defines the orientation of the composite widget. If the composite has a
+	 * single row or column (one-dimensional), the orientation value determines
+	 * which arrow keys can be used to move focus.
+	 */
+	orientation?: Orientation;
+	/**
+	 * The current focused item `id`.
+	 */
+	currentId?: string;
+	/**
+	 * Determines how focus moves from the start and end of rows and columns.
+	 *
+	 * @default false
+	 */
+	loop?: boolean | Orientation;
+	/**
+	 * If enabled, moving to the next item from the last one in a row or column
+	 * will focus the first item in the next row or column and vice-versa.
+	 *
+	 * ** Has effect only on two-dimensional composites. **
+	 *
+	 * @default false
+	 */
+	wrap?: boolean | Orientation;
+	/**
+	 * If enabled, moving up or down when there's no next item or the next item
+	 * is disabled will shift to the item right before it.
+	 *
+	 * ** Has effect only on two-dimensional composites. **
+	 *
+	 * @default false
+	 */
+	shift?: boolean;
+	unstable_virtual?: boolean;
+}
+
+type Component = React.FunctionComponent< any >;
+
+type CompositeStore = ReturnType< typeof Ariakit.useCompositeStore >;
+type CompositeStoreState = { store: CompositeStore };
+export type CompositeState = CompositeStoreState &
+	Required< Pick< LegacyStateOptions, 'baseId' > >;
+
+// Legacy composite components can either provide state through a
+// single `state` prop, or via individual props, usually through
+// spreading the state generated by `useCompositeState`.
+// That is, `<Composite* { ...state }>`.
+export type CompositeStateProps =
+	| { state: CompositeState }
+	| ( CompositeState & { state?: never } );
+type ComponentProps< C extends Component > = React.ComponentPropsWithRef< C >;
+export type CompositeProps< C extends Component > = ComponentProps< C > &
+	CompositeStateProps;
+type CompositeComponent< C extends Component > = (
+	props: CompositeProps< C >
+) => React.ReactElement;
+type CompositeComponentProps = CompositeState &
+	(
+		| ComponentProps< typeof Current.Group >
+		| ComponentProps< typeof Current.Item >
+		| ComponentProps< typeof Current.Row >
+	);
+
+function mapLegacyStatePropsToComponentProps(
+	legacyProps: CompositeStateProps
+): CompositeComponentProps {
+	// If a `state` prop is provided, we unpack that; otherwise,
+	// the necessary props are provided directly in `legacyProps`.
+	if ( legacyProps.state ) {
+		const { state, ...rest } = legacyProps;
+		const { store, ...props } =
+			mapLegacyStatePropsToComponentProps( state );
+		return { ...rest, ...props, store };
+	}
+
+	return legacyProps;
+}
+
+const LEGACY_TO_NEW_DISPLAY_NAME = {
+	__unstableComposite: 'Composite',
+	__unstableCompositeGroup: 'Composite.Group or Composite.Row',
+	__unstableCompositeItem: 'Composite.Item',
+	__unstableUseCompositeState: 'Composite',
+};
+
+function proxyComposite< C extends Component >(
+	ProxiedComponent: C | React.ForwardRefExoticComponent< C >,
+	propMap: Record< string, string > = {}
+): CompositeComponent< C > {
+	const displayName = ProxiedComponent.displayName ?? '';
+
+	const Component = ( legacyProps: CompositeStateProps ) => {
+		deprecated( `wp.components.${ displayName }`, {
+			since: '6.7',
+			alternative: LEGACY_TO_NEW_DISPLAY_NAME.hasOwnProperty(
+				displayName
+			)
+				? LEGACY_TO_NEW_DISPLAY_NAME[
+						displayName as keyof typeof LEGACY_TO_NEW_DISPLAY_NAME
+				  ]
+				: undefined,
+		} );
+
+		const { store, ...rest } =
+			mapLegacyStatePropsToComponentProps( legacyProps );
+		let props = rest as ComponentProps< C >;
+		props = {
+			...props,
+			id: useInstanceId( store, props.baseId, props.id ),
+		};
+
+		Object.entries( propMap ).forEach( ( [ from, to ] ) => {
+			if ( props.hasOwnProperty( from ) ) {
+				Object.assign( props, { [ to ]: props[ from ] } );
+				delete props[ from ];
+			}
+		} );
+
+		delete props.baseId;
+
+		return <ProxiedComponent { ...props } store={ store } />;
+	};
+	Component.displayName = displayName;
+	return Component;
+}
+
+// The old `CompositeGroup` used to behave more like the current
+// `CompositeRow`, but this has been split into two different
+// components. We handle that difference by checking on the
+// provided role, and returning the appropriate component.
+const UnproxiedCompositeGroup = forwardRef<
+	any,
+	React.ComponentPropsWithoutRef< typeof Current.Group | typeof Current.Row >
+>( ( { role, ...props }, ref ) => {
+	const Component = role === 'row' ? Current.Row : Current.Group;
+	return <Component ref={ ref } role={ role } { ...props } />;
+} );
+
+/**
+ * _Note: please use the `Composite` component instead._
+ *
+ * @deprecated
+ */
+export const Composite = proxyComposite(
+	Object.assign( Current, { displayName: '__unstableComposite' } ),
+	{ baseId: 'id' }
+);
+/**
+ * _Note: please use the `Composite.Row` or `Composite.Group` components instead._
+ *
+ * @deprecated
+ */
+export const CompositeGroup = proxyComposite(
+	Object.assign( UnproxiedCompositeGroup, {
+		displayName: '__unstableCompositeGroup',
+	} )
+);
+/**
+ * _Note: please use the `Composite.Item` component instead._
+ *
+ * @deprecated
+ */
+export const CompositeItem = proxyComposite(
+	Object.assign( Current.Item, {
+		displayName: '__unstableCompositeItem',
+	} ),
+	{
+		focusable: 'accessibleWhenDisabled',
+	}
+);
+
+/**
+ * _Note: please use the `Composite` component instead._
+ *
+ * @deprecated
+ */
+export function useCompositeState(
+	legacyStateOptions: LegacyStateOptions = {}
+): CompositeState {
+	deprecated( `wp.components.__unstableUseCompositeState`, {
+		since: '6.7',
+		alternative: LEGACY_TO_NEW_DISPLAY_NAME.__unstableUseCompositeState,
+	} );
+
+	const {
+		baseId,
+		currentId: defaultActiveId,
+		orientation,
+		rtl = false,
+		loop: focusLoop = false,
+		wrap: focusWrap = false,
+		shift: focusShift = false,
+		// eslint-disable-next-line camelcase
+		unstable_virtual: virtualFocus,
+	} = legacyStateOptions;
+
+	return {
+		baseId: useInstanceId( Composite, 'composite', baseId ),
+		store: Ariakit.useCompositeStore( {
+			defaultActiveId,
+			rtl,
+			orientation,
+			focusLoop,
+			focusShift,
+			focusWrap,
+			virtualFocus,
+		} ),
+	};
+}
diff --git a/packages/components/src/composite/legacy/stories/index.story.tsx b/packages/components/src/composite/legacy/stories/index.story.tsx
new file mode 100644
index 00000000000000..1b8e07e9bbf560
--- /dev/null
+++ b/packages/components/src/composite/legacy/stories/index.story.tsx
@@ -0,0 +1,206 @@
+/**
+ * External dependencies
+ */
+import type { Meta, StoryFn } from '@storybook/react';
+
+/**
+ * Internal dependencies
+ */
+import {
+	Composite,
+	CompositeGroup,
+	CompositeItem,
+	useCompositeState,
+} from '..';
+import { UseCompositeStatePlaceholder, transform } from './utils';
+
+const meta: Meta< typeof UseCompositeStatePlaceholder > = {
+	title: 'Components (Deprecated)/Composite (Unstable)',
+	id: 'components-composite-unstable',
+	component: UseCompositeStatePlaceholder,
+	subcomponents: {
+		Composite,
+		CompositeGroup,
+		CompositeItem,
+	},
+	args: {},
+	parameters: {
+		controls: { exclude: /^unstable_/ },
+		docs: {
+			canvas: { sourceState: 'shown' },
+			source: { transform },
+		},
+	},
+	argTypes: {
+		orientation: { control: 'select' },
+		loop: {
+			control: 'select',
+			options: [ true, false, 'horizontal', 'vertical' ],
+		},
+		wrap: {
+			control: 'select',
+			options: [ true, false, 'horizontal', 'vertical' ],
+		},
+	},
+};
+export default meta;
+
+export const TwoDimensionsWithStateProp: StoryFn<
+	typeof UseCompositeStatePlaceholder
+> = ( initialState ) => {
+	const state = useCompositeState( initialState );
+
+	return (
+		<Composite
+			role="grid"
+			state={ state }
+			aria-label="Legacy Composite with state prop (two dimensions)"
+		>
+			<CompositeGroup state={ state } role="row">
+				<CompositeItem state={ state } role="gridcell">
+					Item A1
+				</CompositeItem>
+				<CompositeItem state={ state } role="gridcell">
+					Item A2
+				</CompositeItem>
+				<CompositeItem state={ state } role="gridcell">
+					Item A3
+				</CompositeItem>
+			</CompositeGroup>
+			<CompositeGroup state={ state } role="row">
+				<CompositeItem state={ state } role="gridcell">
+					Item B1
+				</CompositeItem>
+				<CompositeItem state={ state } role="gridcell">
+					Item B2
+				</CompositeItem>
+				<CompositeItem state={ state } role="gridcell">
+					Item B3
+				</CompositeItem>
+			</CompositeGroup>
+			<CompositeGroup state={ state } role="row">
+				<CompositeItem state={ state } role="gridcell">
+					Item C1
+				</CompositeItem>
+				<CompositeItem state={ state } role="gridcell">
+					Item C2
+				</CompositeItem>
+				<CompositeItem state={ state } role="gridcell">
+					Item C3
+				</CompositeItem>
+			</CompositeGroup>
+		</Composite>
+	);
+};
+TwoDimensionsWithStateProp.args = {};
+
+export const TwoDimensionsWithSpreadProps: StoryFn<
+	typeof UseCompositeStatePlaceholder
+> = ( initialState ) => {
+	const state = useCompositeState( initialState );
+
+	return (
+		<Composite
+			role="grid"
+			{ ...state }
+			aria-label="Legacy Composite with spread props (two dimensions)"
+		>
+			<CompositeGroup { ...state } role="row">
+				<CompositeItem { ...state } role="gridcell">
+					Item A1
+				</CompositeItem>
+				<CompositeItem { ...state } role="gridcell">
+					Item A2
+				</CompositeItem>
+				<CompositeItem { ...state } role="gridcell">
+					Item A3
+				</CompositeItem>
+			</CompositeGroup>
+			<CompositeGroup { ...state } role="row">
+				<CompositeItem { ...state } role="gridcell">
+					Item B1
+				</CompositeItem>
+				<CompositeItem { ...state } role="gridcell">
+					Item B2
+				</CompositeItem>
+				<CompositeItem { ...state } role="gridcell">
+					Item B3
+				</CompositeItem>
+			</CompositeGroup>
+			<CompositeGroup { ...state } role="row">
+				<CompositeItem { ...state } role="gridcell">
+					Item C1
+				</CompositeItem>
+				<CompositeItem { ...state } role="gridcell">
+					Item C2
+				</CompositeItem>
+				<CompositeItem { ...state } role="gridcell">
+					Item C3
+				</CompositeItem>
+			</CompositeGroup>
+		</Composite>
+	);
+};
+TwoDimensionsWithSpreadProps.args = {};
+
+export const OneDimensionWithStateProp: StoryFn<
+	typeof UseCompositeStatePlaceholder
+> = ( initialState ) => {
+	const state = useCompositeState( initialState );
+
+	return (
+		<Composite
+			role="list"
+			state={ state }
+			aria-label="Legacy Composite with state prop (one dimension)"
+		>
+			<CompositeItem state={ state } role="listitem">
+				Item 1
+			</CompositeItem>
+			<CompositeItem state={ state } role="listitem">
+				Item 2
+			</CompositeItem>
+			<CompositeItem state={ state } role="listitem">
+				Item 3
+			</CompositeItem>
+			<CompositeItem state={ state } role="listitem">
+				Item 4
+			</CompositeItem>
+			<CompositeItem state={ state } role="listitem">
+				Item 5
+			</CompositeItem>
+		</Composite>
+	);
+};
+OneDimensionWithStateProp.args = {};
+
+export const OneDimensionWithSpreadProps: StoryFn<
+	typeof UseCompositeStatePlaceholder
+> = ( initialState ) => {
+	const state = useCompositeState( initialState );
+
+	return (
+		<Composite
+			role="list"
+			{ ...state }
+			aria-label="Legacy Composite with spread props (one dimension)"
+		>
+			<CompositeItem { ...state } role="listitem">
+				Item 1
+			</CompositeItem>
+			<CompositeItem { ...state } role="listitem">
+				Item 2
+			</CompositeItem>
+			<CompositeItem { ...state } role="listitem">
+				Item 3
+			</CompositeItem>
+			<CompositeItem { ...state } role="listitem">
+				Item 4
+			</CompositeItem>
+			<CompositeItem { ...state } role="listitem">
+				Item 5
+			</CompositeItem>
+		</Composite>
+	);
+};
+OneDimensionWithSpreadProps.args = {};
diff --git a/packages/components/src/composite/legacy/stories/utils.tsx b/packages/components/src/composite/legacy/stories/utils.tsx
new file mode 100644
index 00000000000000..2fb51c845f9fbe
--- /dev/null
+++ b/packages/components/src/composite/legacy/stories/utils.tsx
@@ -0,0 +1,86 @@
+/**
+ * External dependencies
+ */
+import type { StoryContext } from '@storybook/react';
+
+/**
+ * Internal dependencies
+ */
+import type { LegacyStateOptions } from '..';
+
+/**
+ * Renders a composite widget.
+ *
+ * This unstable component is deprecated. Use `Composite` instead.
+ *
+ * ```jsx
+ * import {
+ * 	__unstableUseCompositeState as useCompositeState,
+ * 	__unstableComposite as Composite,
+ * 	__unstableCompositeItem as CompositeItem,
+ * } from '@wordpress/components';
+ *
+ * const state = useCompositeState();
+ * <Composite state={ state }>
+ * 	<CompositeItem>Item 1</CompositeItem>
+ * 	<CompositeItem>Item 2</CompositeItem>
+ * </Composite>;
+ * ```
+ */
+export function UseCompositeStatePlaceholder( props: LegacyStateOptions ) {
+	return (
+		<dl>
+			{ Object.entries( props ).map( ( [ name, value ] ) => (
+				<>
+					<dt>{ name }</dt>
+					<dd>{ JSON.stringify( value ) }</dd>
+				</>
+			) ) }
+		</dl>
+	);
+}
+UseCompositeStatePlaceholder.displayName = 'useCompositeState';
+
+export function transform( code: string, context: StoryContext ) {
+	// The output generated by Storybook for these components is
+	// messy, so we apply this transform to make it more useful
+	// for anyone reading the docs.
+	const config = ` ${ JSON.stringify( context.args, null, 2 ) } `;
+	const state = config.replace( ' {} ', '' );
+	return [
+		// Include a setup line, showing how to make use of
+		// `useCompositeState` to convert state options into
+		// a composite state option.
+		`const state = useCompositeState(${ state });`,
+		'',
+		'return (',
+		'  ' +
+			code
+				// The generated output includes a full dump of everything
+				// in the state; the reader probably isn't interested in
+				// what that looks like, so instead we drop all of that
+				// in favor of the state generated above.
+				.replaceAll( /state=\{\{[\s\S]*?\}\}/g, 'state={ state }' )
+				// The previous line only works for `state={ state }`, and
+				// doesn't replace spread props, so we do that separately.
+				.replaceAll( '=>', '' )
+				.replaceAll( /baseId=[^>]+?(\s*>)/g, ( _, close ) => {
+					return `{ ...state }${ close }`;
+				} )
+				// Now we tidy the output by removing any unnecessary
+				// whitespace...
+				.replaceAll( /<Composite\w+[\s\S]*?>/g, ( match ) =>
+					match.replaceAll( /\s+\s/g, ' ' )
+				)
+				// ...including around <Composite*> children...
+				.replaceAll(
+					/ >\s+([\w\s]*?)\s+<\//g,
+					( _, value ) => `>${ value }</`
+				)
+				// ...and inside JSX definitions.
+				.replaceAll( '} >', '}>' )
+				// Finally we indent everything to make it more readable.
+				.replaceAll( /\n/g, '\n  ' ),
+		');',
+	].join( '\n' );
+}
diff --git a/packages/components/src/composite/legacy/test/index.tsx b/packages/components/src/composite/legacy/test/index.tsx
new file mode 100644
index 00000000000000..a118dbcfbadbb3
--- /dev/null
+++ b/packages/components/src/composite/legacy/test/index.tsx
@@ -0,0 +1,636 @@
+/**
+ * External dependencies
+ */
+import {
+	queryByAttribute,
+	render,
+	screen,
+	renderHook,
+} from '@testing-library/react';
+import { press, waitFor } from '@ariakit/test';
+
+/**
+ * Internal dependencies
+ */
+import {
+	Composite,
+	CompositeGroup,
+	CompositeItem,
+	useCompositeState,
+} from '..';
+
+// This is necessary because of how Ariakit calculates page up and
+// page down. Without this, nothing has a height, and so paging up
+// and down doesn't behave as expected in tests.
+
+let clientHeightSpy: jest.SpiedGetter<
+	typeof HTMLElement.prototype.clientHeight
+>;
+
+beforeAll( () => {
+	clientHeightSpy = jest
+		.spyOn( HTMLElement.prototype, 'clientHeight', 'get' )
+		.mockImplementation( function getClientHeight( this: HTMLElement ) {
+			if ( this.tagName === 'BODY' ) {
+				return window.outerHeight;
+			}
+			return 50;
+		} );
+} );
+
+afterAll( () => {
+	clientHeightSpy?.mockRestore();
+} );
+
+type InitialState = Parameters< typeof useCompositeState >[ 0 ];
+type CompositeState = ReturnType< typeof useCompositeState >;
+type CompositeStateProps = CompositeState | { state: CompositeState };
+
+async function renderAndValidate( ...args: Parameters< typeof render > ) {
+	const view = render( ...args );
+	await waitFor( () => {
+		const activeButton = queryByAttribute(
+			'data-active-item',
+			view.baseElement,
+			'true'
+		);
+		expect( activeButton ).not.toBeNull();
+	} );
+	return view;
+}
+
+function getKeys( rtl: boolean ) {
+	return {
+		previous: rtl ? 'ArrowRight' : 'ArrowLeft',
+		next: rtl ? 'ArrowLeft' : 'ArrowRight',
+		first: rtl ? 'End' : 'Home',
+		last: rtl ? 'Home' : 'End',
+	};
+}
+
+function OneDimensionalTest( props: CompositeStateProps ) {
+	return (
+		<Composite
+			{ ...props }
+			aria-label={ expect.getState().currentTestName }
+		>
+			<CompositeItem { ...props }>Item 1</CompositeItem>
+			<CompositeItem { ...props }>Item 2</CompositeItem>
+			<CompositeItem { ...props }>Item 3</CompositeItem>
+		</Composite>
+	);
+}
+
+function getOneDimensionalItems() {
+	return {
+		item1: screen.getByText( 'Item 1' ),
+		item2: screen.getByText( 'Item 2' ),
+		item3: screen.getByText( 'Item 3' ),
+	};
+}
+
+function TwoDimensionalTest( props: CompositeStateProps ) {
+	return (
+		<Composite
+			{ ...props }
+			aria-label={ expect.getState().currentTestName }
+		>
+			<CompositeGroup role="row" { ...props }>
+				<CompositeItem { ...props }>Item A1</CompositeItem>
+				<CompositeItem { ...props }>Item A2</CompositeItem>
+				<CompositeItem { ...props }>Item A3</CompositeItem>
+			</CompositeGroup>
+			<CompositeGroup role="row" { ...props }>
+				<CompositeItem { ...props }>Item B1</CompositeItem>
+				<CompositeItem { ...props }>Item B2</CompositeItem>
+				<CompositeItem { ...props }>Item B3</CompositeItem>
+			</CompositeGroup>
+			<CompositeGroup role="row" { ...props }>
+				<CompositeItem { ...props }>Item C1</CompositeItem>
+				<CompositeItem { ...props }>Item C2</CompositeItem>
+				<CompositeItem { ...props }>Item C3</CompositeItem>
+			</CompositeGroup>
+		</Composite>
+	);
+}
+
+function getTwoDimensionalItems() {
+	return {
+		itemA1: screen.getByText( 'Item A1' ),
+		itemA2: screen.getByText( 'Item A2' ),
+		itemA3: screen.getByText( 'Item A3' ),
+		itemB1: screen.getByText( 'Item B1' ),
+		itemB2: screen.getByText( 'Item B2' ),
+		itemB3: screen.getByText( 'Item B3' ),
+		itemC1: screen.getByText( 'Item C1' ),
+		itemC2: screen.getByText( 'Item C2' ),
+		itemC3: screen.getByText( 'Item C3' ),
+	};
+}
+
+function ShiftTest( props: CompositeStateProps ) {
+	return (
+		<Composite
+			{ ...props }
+			aria-label={ expect.getState().currentTestName }
+		>
+			<CompositeGroup role="row" { ...props }>
+				<CompositeItem { ...props }>Item A1</CompositeItem>
+			</CompositeGroup>
+			<CompositeGroup role="row" { ...props }>
+				<CompositeItem { ...props }>Item B1</CompositeItem>
+				<CompositeItem { ...props }>Item B2</CompositeItem>
+			</CompositeGroup>
+			<CompositeGroup role="row" { ...props }>
+				<CompositeItem { ...props }>Item C1</CompositeItem>
+				<CompositeItem { ...props } disabled>
+					Item C2
+				</CompositeItem>
+			</CompositeGroup>
+		</Composite>
+	);
+}
+
+function getShiftTestItems() {
+	return {
+		itemA1: screen.getByText( 'Item A1' ),
+		itemB1: screen.getByText( 'Item B1' ),
+		itemB2: screen.getByText( 'Item B2' ),
+		itemC1: screen.getByText( 'Item C1' ),
+		itemC2: screen.getByText( 'Item C2' ),
+	};
+}
+
+// Checking for deprecation warnings before other tests because the `deprecated`
+// utility only fires a console.warn the first time a component is rendered.
+describe( 'Shows a deprecation warning', () => {
+	it( 'useCompositeState', () => {
+		renderHook( () => useCompositeState() );
+		expect( console ).toHaveWarnedWith(
+			'wp.components.__unstableUseCompositeState is deprecated since version 6.7. Please use Composite instead.'
+		);
+	} );
+	it( 'Composite', () => {
+		const Test = () => {
+			const props = useCompositeState();
+			return <Composite { ...props } />;
+		};
+		render( <Test /> );
+		expect( console ).toHaveWarnedWith(
+			'wp.components.__unstableComposite is deprecated since version 6.7. Please use Composite instead.'
+		);
+	} );
+	it( 'CompositeItem', () => {
+		const Test = () => {
+			const props = useCompositeState();
+			return (
+				<Composite { ...props }>
+					<CompositeItem { ...props } />
+				</Composite>
+			);
+		};
+		render( <Test /> );
+		expect( console ).toHaveWarnedWith(
+			'wp.components.__unstableCompositeItem is deprecated since version 6.7. Please use Composite.Item instead.'
+		);
+	} );
+	it( 'CompositeGroup', () => {
+		const Test = () => {
+			const props = useCompositeState();
+			return (
+				<Composite { ...props }>
+					<CompositeGroup { ...props }>
+						<CompositeItem { ...props } />
+					</CompositeGroup>
+				</Composite>
+			);
+		};
+		render( <Test /> );
+		expect( console ).toHaveWarnedWith(
+			'wp.components.__unstableCompositeGroup is deprecated since version 6.7. Please use Composite.Group or Composite.Row instead.'
+		);
+	} );
+} );
+
+describe.each( [
+	[
+		'With "spread" state',
+		( initialState?: InitialState ) => useCompositeState( initialState ),
+	],
+	[
+		'With `state` prop',
+		( initialState?: InitialState ) => ( {
+			state: useCompositeState( initialState ),
+		} ),
+	],
+] )( '%s', ( __, useProps ) => {
+	test( 'Renders as a single tab stop', async () => {
+		const Test = () => (
+			<>
+				<button>Before</button>
+				<OneDimensionalTest { ...useProps() } />
+				<button>After</button>
+			</>
+		);
+		await renderAndValidate( <Test /> );
+
+		await press.Tab();
+		expect( screen.getByText( 'Before' ) ).toHaveFocus();
+		await press.Tab();
+		expect( screen.getByText( 'Item 1' ) ).toHaveFocus();
+		await press.Tab();
+		expect( screen.getByText( 'After' ) ).toHaveFocus();
+		await press.ShiftTab();
+		expect( screen.getByText( 'Item 1' ) ).toHaveFocus();
+	} );
+
+	test( 'Excludes disabled items', async () => {
+		const Test = () => {
+			const props = useProps();
+			return (
+				<Composite
+					{ ...props }
+					aria-label={ expect.getState().currentTestName }
+				>
+					<CompositeItem { ...props }>Item 1</CompositeItem>
+					<CompositeItem { ...props } disabled>
+						Item 2
+					</CompositeItem>
+					<CompositeItem { ...props }>Item 3</CompositeItem>
+				</Composite>
+			);
+		};
+		await renderAndValidate( <Test /> );
+
+		const { item1, item2, item3 } = getOneDimensionalItems();
+
+		expect( item2 ).toBeDisabled();
+
+		await press.Tab();
+		expect( item1 ).toHaveFocus();
+		await press.ArrowDown();
+		expect( item2 ).not.toHaveFocus();
+		expect( item3 ).toHaveFocus();
+	} );
+
+	test( 'Includes focusable disabled items', async () => {
+		const Test = () => {
+			const props = useProps();
+			return (
+				<Composite
+					{ ...props }
+					aria-label={ expect.getState().currentTestName }
+				>
+					<CompositeItem { ...props }>Item 1</CompositeItem>
+					<CompositeItem { ...props } disabled focusable>
+						Item 2
+					</CompositeItem>
+					<CompositeItem { ...props }>Item 3</CompositeItem>
+				</Composite>
+			);
+		};
+		await renderAndValidate( <Test /> );
+		const { item1, item2, item3 } = getOneDimensionalItems();
+
+		expect( item2 ).toBeEnabled();
+		expect( item2 ).toHaveAttribute( 'aria-disabled', 'true' );
+
+		await press.Tab();
+		expect( item1 ).toHaveFocus();
+		await press.ArrowDown();
+		expect( item2 ).toHaveFocus();
+		expect( item3 ).not.toHaveFocus();
+	} );
+
+	test( 'Supports `baseId`', async () => {
+		const Test = () => (
+			<OneDimensionalTest
+				{ ...useProps( {
+					baseId: 'test-id',
+				} ) }
+			/>
+		);
+		await renderAndValidate( <Test /> );
+		const { item1, item2, item3 } = getOneDimensionalItems();
+
+		expect( item1.id ).toMatch( 'test-id-1' );
+		expect( item2.id ).toMatch( 'test-id-2' );
+		expect( item3.id ).toMatch( 'test-id-3' );
+	} );
+
+	test( 'Supports `currentId`', async () => {
+		const Test = () => (
+			<OneDimensionalTest
+				{ ...useProps( {
+					baseId: 'test-id',
+					currentId: 'test-id-2',
+				} ) }
+			/>
+		);
+		await renderAndValidate( <Test /> );
+		const { item2 } = getOneDimensionalItems();
+
+		await press.Tab();
+		await waitFor( () => expect( item2 ).toHaveFocus() );
+	} );
+} );
+
+describe.each( [
+	[ 'When LTR', false ],
+	[ 'When RTL', true ],
+] )( '%s', ( _when, rtl ) => {
+	const { previous, next, first, last } = getKeys( rtl );
+
+	async function useOneDimensionalTest( initialState?: InitialState ) {
+		const Test = () => (
+			<OneDimensionalTest
+				state={ useCompositeState( { rtl, ...initialState } ) }
+			/>
+		);
+		await renderAndValidate( <Test /> );
+		return getOneDimensionalItems();
+	}
+
+	async function useTwoDimensionalTest( initialState?: InitialState ) {
+		const Test = () => (
+			<TwoDimensionalTest
+				state={ useCompositeState( { rtl, ...initialState } ) }
+			/>
+		);
+		await renderAndValidate( <Test /> );
+		return getTwoDimensionalItems();
+	}
+
+	async function useShiftTest( shift: boolean ) {
+		const Test = () => (
+			<ShiftTest state={ useCompositeState( { rtl, shift } ) } />
+		);
+		await renderAndValidate( <Test /> );
+		return getShiftTestItems();
+	}
+
+	describe( 'In one dimension', () => {
+		test( 'All directions work with no orientation', async () => {
+			const { item1, item2, item3 } = await useOneDimensionalTest();
+
+			await press.Tab();
+			expect( item1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( item2 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( item3 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( item3 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( item2 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( item1 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( item1 ).toHaveFocus();
+			await press( next );
+			expect( item2 ).toHaveFocus();
+			await press( next );
+			expect( item3 ).toHaveFocus();
+			await press( previous );
+			expect( item2 ).toHaveFocus();
+			await press( previous );
+			expect( item1 ).toHaveFocus();
+			await press.End();
+			expect( item3 ).toHaveFocus();
+			await press.Home();
+			expect( item1 ).toHaveFocus();
+			await press.PageDown();
+			expect( item3 ).toHaveFocus();
+			await press.PageUp();
+			expect( item1 ).toHaveFocus();
+		} );
+
+		test( 'Only left/right work with horizontal orientation', async () => {
+			const { item1, item2, item3 } = await useOneDimensionalTest( {
+				orientation: 'horizontal',
+			} );
+
+			await press.Tab();
+			expect( item1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( item1 ).toHaveFocus();
+			await press( next );
+			expect( item2 ).toHaveFocus();
+			await press( next );
+			expect( item3 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( item3 ).toHaveFocus();
+			await press( previous );
+			expect( item2 ).toHaveFocus();
+			await press( previous );
+			expect( item1 ).toHaveFocus();
+			await press.End();
+			expect( item3 ).toHaveFocus();
+			await press.Home();
+			expect( item1 ).toHaveFocus();
+			await press.PageDown();
+			expect( item3 ).toHaveFocus();
+			await press.PageUp();
+			expect( item1 ).toHaveFocus();
+		} );
+
+		test( 'Only up/down work with vertical orientation', async () => {
+			const { item1, item2, item3 } = await useOneDimensionalTest( {
+				orientation: 'vertical',
+			} );
+
+			await press.Tab();
+			expect( item1 ).toHaveFocus();
+			await press( next );
+			expect( item1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( item2 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( item3 ).toHaveFocus();
+			await press( previous );
+			expect( item3 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( item2 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( item1 ).toHaveFocus();
+			await press.End();
+			expect( item3 ).toHaveFocus();
+			await press.Home();
+			expect( item1 ).toHaveFocus();
+			await press.PageDown();
+			expect( item3 ).toHaveFocus();
+			await press.PageUp();
+			expect( item1 ).toHaveFocus();
+		} );
+
+		test( 'Focus wraps with loop enabled', async () => {
+			const { item1, item2, item3 } = await useOneDimensionalTest( {
+				loop: true,
+			} );
+
+			await press.Tab();
+			expect( item1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( item2 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( item3 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( item1 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( item3 ).toHaveFocus();
+			await press( next );
+			expect( item1 ).toHaveFocus();
+			await press( previous );
+			expect( item3 ).toHaveFocus();
+		} );
+	} );
+
+	describe( 'In two dimensions', () => {
+		test( 'All directions work as standard', async () => {
+			const { itemA1, itemA2, itemA3, itemB1, itemB2, itemC1, itemC3 } =
+				await useTwoDimensionalTest();
+
+			await press.Tab();
+			expect( itemA1 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( itemA1 ).toHaveFocus();
+			await press( previous );
+			expect( itemA1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemB1 ).toHaveFocus();
+			await press( next );
+			expect( itemB2 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( itemA2 ).toHaveFocus();
+			await press( previous );
+			expect( itemA1 ).toHaveFocus();
+			await press( last );
+			expect( itemA3 ).toHaveFocus();
+			await press.PageDown();
+			expect( itemC3 ).toHaveFocus();
+			await press( next );
+			expect( itemC3 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemC3 ).toHaveFocus();
+			await press( first );
+			expect( itemC1 ).toHaveFocus();
+			await press.PageUp();
+			expect( itemA1 ).toHaveFocus();
+			await press.End( null, { ctrlKey: true } );
+			expect( itemC3 ).toHaveFocus();
+			await press.Home( null, { ctrlKey: true } );
+			expect( itemA1 ).toHaveFocus();
+		} );
+
+		test( 'Focus wraps around rows/columns with loop enabled', async () => {
+			const { itemA1, itemA2, itemA3, itemB1, itemC1, itemC3 } =
+				await useTwoDimensionalTest( { loop: true } );
+
+			await press.Tab();
+			expect( itemA1 ).toHaveFocus();
+			await press( next );
+			expect( itemA2 ).toHaveFocus();
+			await press( next );
+			expect( itemA3 ).toHaveFocus();
+			await press( next );
+			expect( itemA1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemB1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemC1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemA1 ).toHaveFocus();
+			await press( previous );
+			expect( itemA3 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( itemC3 ).toHaveFocus();
+		} );
+
+		test( 'Focus moves between rows/columns with wrap enabled', async () => {
+			const { itemA1, itemA2, itemA3, itemB1, itemC1, itemC3 } =
+				await useTwoDimensionalTest( { wrap: true } );
+
+			await press.Tab();
+			expect( itemA1 ).toHaveFocus();
+			await press( next );
+			expect( itemA2 ).toHaveFocus();
+			await press( next );
+			expect( itemA3 ).toHaveFocus();
+			await press( next );
+			expect( itemB1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemC1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemA2 ).toHaveFocus();
+			await press( previous );
+			expect( itemA1 ).toHaveFocus();
+			await press( previous );
+			expect( itemA1 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( itemA1 ).toHaveFocus();
+			await press.End( itemA1, { ctrlKey: true } );
+			expect( itemC3 ).toHaveFocus();
+			await press( next );
+			expect( itemC3 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemC3 ).toHaveFocus();
+		} );
+
+		test( 'Focus wraps around start/end with loop and wrap enabled', async () => {
+			const { itemA1, itemC3 } = await useTwoDimensionalTest( {
+				loop: true,
+				wrap: true,
+			} );
+
+			await press.Tab();
+			expect( itemA1 ).toHaveFocus();
+			await press( previous );
+			expect( itemC3 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemA1 ).toHaveFocus();
+			await press.ArrowUp();
+			expect( itemC3 ).toHaveFocus();
+			await press( next );
+			expect( itemA1 ).toHaveFocus();
+		} );
+
+		test( 'Focus shifts if vertical neighbour unavailable when shift enabled', async () => {
+			const { itemA1, itemB1, itemB2, itemC1 } =
+				await useShiftTest( true );
+
+			await press.Tab();
+			expect( itemA1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemB1 ).toHaveFocus();
+			await press( next );
+			expect( itemB2 ).toHaveFocus();
+			await press.ArrowUp();
+			// A2 doesn't exist
+			expect( itemA1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemB1 ).toHaveFocus();
+			await press( next );
+			expect( itemB2 ).toHaveFocus();
+			await press.ArrowDown();
+			// C2 is disabled
+			expect( itemC1 ).toHaveFocus();
+		} );
+
+		test( 'Focus does not shift if vertical neighbour unavailable when shift not enabled', async () => {
+			const { itemA1, itemB1, itemB2 } = await useShiftTest( false );
+
+			await press.Tab();
+			expect( itemA1 ).toHaveFocus();
+			await press.ArrowDown();
+			expect( itemB1 ).toHaveFocus();
+			await press( next );
+			expect( itemB2 ).toHaveFocus();
+			await press.ArrowUp();
+			// A2 doesn't exist
+			expect( itemB2 ).toHaveFocus();
+			await press.ArrowDown();
+			// C2 is disabled
+			expect( itemB2 ).toHaveFocus();
+		} );
+	} );
+} );
diff --git a/packages/components/src/composite/row.tsx b/packages/components/src/composite/row.tsx
new file mode 100644
index 00000000000000..1a88da557785e9
--- /dev/null
+++ b/packages/components/src/composite/row.tsx
@@ -0,0 +1,30 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { useCompositeContext } from './context';
+import type { CompositeRowProps } from './types';
+
+export const CompositeRow = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< CompositeRowProps, 'div', false >
+>( function CompositeRow( props, ref ) {
+	const context = useCompositeContext();
+
+	// @ts-expect-error The store prop is undocumented and only used by the
+	// legacy compat layer. The `store` prop is documented, but its type is
+	// obfuscated to discourage its use outside of the component's internals.
+	const store = ( props.store ?? context.store ) as Ariakit.CompositeStore;
+
+	return <Ariakit.CompositeRow store={ store } { ...props } ref={ ref } />;
+} );
diff --git a/packages/components/src/composite/stories/index.story.tsx b/packages/components/src/composite/stories/index.story.tsx
new file mode 100644
index 00000000000000..eefcd599134757
--- /dev/null
+++ b/packages/components/src/composite/stories/index.story.tsx
@@ -0,0 +1,398 @@
+/**
+ * External dependencies
+ */
+import type { Meta, StoryObj } from '@storybook/react';
+
+/**
+ * WordPress dependencies
+ */
+import { useContext, useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { createSlotFill, Provider as SlotFillProvider } from '../../slot-fill';
+import { Composite } from '..';
+import { Tooltip } from '../../tooltip';
+
+const meta: Meta< typeof Composite > = {
+	title: 'Components/Utilities/Composite',
+	id: 'components-composite',
+	component: Composite,
+	subcomponents: {
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		'Composite.Group': Composite.Group,
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		'Composite.GroupLabel': Composite.GroupLabel,
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		'Composite.Row': Composite.Row,
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		'Composite.Item': Composite.Item,
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		'Composite.Hover': Composite.Hover,
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		'Composite.Typeahead': Composite.Typeahead,
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		'Composite.Context': Composite.Context,
+	},
+	argTypes: {
+		children: { control: { type: null } },
+		render: { control: { type: null } },
+		setActiveId: { control: { type: null } },
+		focusLoop: {
+			control: 'select',
+			options: [ true, false, 'horizontal', 'vertical', 'both' ],
+		},
+		focusWrap: {
+			control: 'select',
+			options: [ true, false, 'horizontal', 'vertical', 'both' ],
+		},
+	},
+	parameters: {
+		controls: { expanded: true },
+		docs: {
+			canvas: { sourceState: 'shown' },
+		},
+	},
+	decorators: [
+		( Story ) => {
+			return (
+				<>
+					{ /* Visually style the active composite item  */ }
+					<style>{ `
+						[data-active-item] {
+							background-color: #ffc0b5;
+						}
+					` }</style>
+					<Story />
+					<div
+						style={ {
+							marginTop: '2em',
+							fontSize: '12px',
+							fontStyle: 'italic',
+						} }
+					>
+						{ /* eslint-disable-next-line no-restricted-syntax */ }
+						<p id="list-title">Notes</p>
+						<ul aria-labelledby="list-title">
+							<li>
+								The active composite item is highlighted with a
+								different background color;
+							</li>
+							<li>
+								A composite item can be the active item even
+								when it doesn&apos;t have keyboard focus.
+							</li>
+						</ul>
+					</div>
+				</>
+			);
+		},
+	],
+};
+export default meta;
+
+export const Default: StoryObj< typeof Composite > = {
+	args: {
+		children: (
+			<>
+				<Composite.Item>Item one</Composite.Item>
+				<Composite.Item>Item two</Composite.Item>
+				<Composite.Item>Item three</Composite.Item>
+			</>
+		),
+	},
+};
+
+export const Groups: StoryObj< typeof Composite > = {
+	...Default,
+	args: {
+		...Default.args,
+		children: (
+			<>
+				<Composite.Group>
+					<Composite.GroupLabel>Group one</Composite.GroupLabel>
+					<Composite.Item>Item 1.1</Composite.Item>
+					<Composite.Item>Item 1.2</Composite.Item>
+				</Composite.Group>
+				<Composite.Group>
+					<Composite.GroupLabel>Group two</Composite.GroupLabel>
+					<Composite.Item>Item 2.1</Composite.Item>
+					<Composite.Item>Item 2.1</Composite.Item>
+				</Composite.Group>
+			</>
+		),
+	},
+};
+
+export const Grid: StoryObj< typeof Composite > = {
+	...Default,
+	args: {
+		...Default.args,
+		role: 'grid',
+		'aria-label': 'Composite',
+		children: (
+			<>
+				<Composite.Row role="row">
+					<Composite.Item role="gridcell">Item A1</Composite.Item>
+					<Composite.Item role="gridcell">Item A2</Composite.Item>
+					<Composite.Item role="gridcell">Item A3</Composite.Item>
+				</Composite.Row>
+				<Composite.Row role="row">
+					<Composite.Item role="gridcell">Item B1</Composite.Item>
+					<Composite.Item role="gridcell">Item B2</Composite.Item>
+					<Composite.Item role="gridcell">Item B3</Composite.Item>
+				</Composite.Row>
+				<Composite.Row role="row">
+					<Composite.Item role="gridcell">Item C1</Composite.Item>
+					<Composite.Item role="gridcell">Item C2</Composite.Item>
+					<Composite.Item role="gridcell">Item C3</Composite.Item>
+				</Composite.Row>
+			</>
+		),
+	},
+};
+
+export const Hover: StoryObj< typeof Composite > = {
+	...Default,
+	args: {
+		...Default.args,
+		children: (
+			<>
+				<Composite.Hover render={ <Composite.Item /> }>
+					Hover item one
+				</Composite.Hover>
+				<Composite.Hover render={ <Composite.Item /> }>
+					Hover item two
+				</Composite.Hover>
+				<Composite.Hover render={ <Composite.Item /> }>
+					Hover item three
+				</Composite.Hover>
+			</>
+		),
+	},
+	parameters: {
+		docs: {
+			description: {
+				story: 'Elements in the composite widget will receive focus on mouse move and lose focus to the composite base element on mouse leave.',
+			},
+		},
+	},
+};
+
+export const Typeahead: StoryObj< typeof Composite > = {
+	args: {
+		...Default.args,
+		render: <Composite.Typeahead />,
+		children: (
+			<>
+				<Composite.Item>Apple</Composite.Item>
+				<Composite.Item>Banana</Composite.Item>
+				<Composite.Item>Peach</Composite.Item>
+			</>
+		),
+	},
+	parameters: {
+		docs: {
+			description: {
+				story: 'When focus in on the composite widget, hitting printable character keys will move focus to the next composite item that begins with the input characters.',
+			},
+		},
+	},
+};
+
+const ExampleSlotFill = createSlotFill( 'Example' );
+
+const Slot = () => {
+	const compositeContext = useContext( Composite.Context );
+
+	// Forward the Slot's composite context to the Fill via fillProps, so that
+	// Composite components rendered inside the Fill can work as expected.
+	const fillProps = useMemo(
+		() => ( {
+			forwardedContext: [
+				[ Composite.Context.Provider, { value: compositeContext } ],
+			],
+		} ),
+		[ compositeContext ]
+	);
+
+	return (
+		<ExampleSlotFill.Slot
+			fillProps={ fillProps }
+			bubblesVirtually
+			style={ { display: 'contents' } }
+		/>
+	);
+};
+
+type ForwardedContextTuple< P = {} > = [
+	React.ComponentType< React.PropsWithChildren< P > >,
+	P,
+];
+
+const Fill = ( { children }: { children: React.ReactNode } ) => {
+	const innerMarkup = <>{ children }</>;
+
+	return (
+		<ExampleSlotFill.Fill>
+			{ ( fillProps: { forwardedContext?: ForwardedContextTuple[] } ) => {
+				const { forwardedContext = [] } = fillProps;
+
+				// Render all context providers forwarded by the Slot via fillProps.
+				return forwardedContext.reduce(
+					( inner: JSX.Element, [ Provider, props ] ) => (
+						<Provider { ...props }>{ inner }</Provider>
+					),
+					innerMarkup
+				);
+			} }
+		</ExampleSlotFill.Fill>
+	);
+};
+
+export const WithSlotFill: StoryObj< typeof Composite > = {
+	...Default,
+	args: {
+		...Default.args,
+		children: (
+			<>
+				<Composite.Item>Item one (direct child)</Composite.Item>
+				<Slot />
+				<Composite.Item>Item four (direct child)</Composite.Item>
+			</>
+		),
+	},
+	decorators: [
+		( Story ) => {
+			return (
+				<SlotFillProvider>
+					<Story />
+
+					<Fill>
+						<Composite.Item>
+							Item two (from slot fill)
+						</Composite.Item>
+						<Composite.Item>
+							Item three (from slot fill)
+						</Composite.Item>
+					</Fill>
+				</SlotFillProvider>
+			);
+		},
+	],
+	parameters: {
+		docs: {
+			description: {
+				story: 'When rendering Composite components across a SlotFill, the Composite.Context should be manually forwarded from the Slot to the Fill component.',
+			},
+			source: {
+				transform: ( code: string ) => {
+					return `const ExampleSlotFill = createSlotFill( 'Example' );
+
+const Slot = () => {
+  const compositeContext = useContext( Composite.Context );
+
+  // Forward the Slot's composite context to the Fill via fillProps, so that
+  // Composite components rendered inside the Fill can work as expected.
+  const fillProps = useMemo(
+    () => ( {
+      forwardedContext: [
+        [ Composite.Context.Provider, { value: compositeContext } ],
+      ],
+    } ),
+    [ compositeContext ]
+  );
+
+  return (
+    <ExampleSlotFill.Slot
+      fillProps={ fillProps }
+      bubblesVirtually
+      style={ { display: 'contents' } }
+    />
+  );
+};
+
+const Fill = ( { children } ) => {
+  const innerMarkup = <>{ children }</>;
+
+  return (
+    <ExampleSlotFill.Fill>
+      { ( fillProps ) => {
+        const { forwardedContext = [] } = fillProps;
+
+        // Render all context providers forwarded by the Slot via fillProps.
+        return forwardedContext.reduce(
+          ( inner, [ Provider, props ] ) => (
+            <Provider { ...props }>{ inner }</Provider>
+          ),
+          innerMarkup
+        );
+      } }
+    </ExampleSlotFill.Fill>
+  );
+};
+
+// In a separate component:
+
+<SlotFillProvider>
+  ${
+		// Add one level of indentation to match the surrounding code.
+		code.replaceAll( '\n', '\n  ' )
+  }
+
+  <Fill>
+    <Composite.Item>
+      Item two (from slot fill)
+    </Composite.Item>
+    <Composite.Item>
+      Item three (from slot fill)
+    </Composite.Item>
+  </Fill>
+</SlotFillProvider>`;
+				},
+			},
+		},
+	},
+};
+
+/**
+ * Combining the `Tooltip` and `Composite` component has a few caveats. And while there are a few ways to compose these two components, our recommendation is to render `Composite.Item` as a child of `Tooltip`.
+ *
+ * ```jsx
+ * // 🔴 Does not work
+ * <Composite.Item
+ *   render={
+ *     <Tooltip text="Tooltip">
+ *       <button>Item</button>
+ *     </Tooltip>
+ *   }
+ * />
+ *
+ * // 🟢 Good
+ * <Tooltip text="Tooltip one">
+ *   <Composite.Item>
+ *     Item one
+ *   </Composite.Item>
+ * </Tooltip>
+ * ```
+ */
+export const WithTooltips: StoryObj< typeof Composite > = {
+	...Default,
+	args: {
+		...Default.args,
+		children: (
+			<>
+				<Tooltip text="Tooltip one">
+					<Composite.Item>Item one</Composite.Item>
+				</Tooltip>
+				<Tooltip text="Tooltip two">
+					<Composite.Item>Item two</Composite.Item>
+				</Tooltip>
+				<Tooltip text="Tooltip three">
+					<Composite.Item>Item three</Composite.Item>
+				</Tooltip>
+			</>
+		),
+	},
+};
diff --git a/packages/components/src/composite/test/index.tsx b/packages/components/src/composite/test/index.tsx
new file mode 100644
index 00000000000000..197302a5f3c9d3
--- /dev/null
+++ b/packages/components/src/composite/test/index.tsx
@@ -0,0 +1,714 @@
+/**
+ * External dependencies
+ */
+import { queryByAttribute, render, screen } from '@testing-library/react';
+import { click, press, waitFor } from '@ariakit/test';
+import type { ComponentProps } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { Composite } from '..';
+
+async function renderAndValidate( ...args: Parameters< typeof render > ) {
+	const view = render( ...args );
+	await waitFor( () => {
+		const activeButton = queryByAttribute(
+			'data-active-item',
+			view.baseElement,
+			'true'
+		);
+		expect( activeButton ).not.toBeNull();
+	} );
+	return view;
+}
+
+describe( 'Composite', () => {
+	let clientHeightSpy: jest.SpiedGetter<
+		typeof HTMLElement.prototype.clientHeight
+	>;
+
+	beforeAll( () => {
+		// This is necessary because of how Ariakit calculates page up and
+		// page down. Without this, nothing has a height, and so paging up
+		// and down doesn't behave as expected in tests.
+		clientHeightSpy = jest
+			.spyOn( HTMLElement.prototype, 'clientHeight', 'get' )
+			.mockImplementation( function getClientHeight( this: HTMLElement ) {
+				if ( this.tagName === 'BODY' ) {
+					return window.outerHeight;
+				}
+				return 50;
+			} );
+	} );
+
+	afterAll( () => {
+		clientHeightSpy?.mockRestore();
+	} );
+
+	test( 'Renders as a single tab stop', async () => {
+		await renderAndValidate(
+			<>
+				<button>Before</button>
+				<Composite>
+					<Composite.Item>Item 1</Composite.Item>
+					<Composite.Item>Item 2</Composite.Item>
+					<Composite.Item>Item 3</Composite.Item>
+				</Composite>
+				<button>After</button>
+			</>
+		);
+
+		await press.Tab();
+		expect(
+			screen.getByRole( 'button', { name: 'Before' } )
+		).toHaveFocus();
+		await press.Tab();
+		expect(
+			screen.getByRole( 'button', { name: 'Item 1' } )
+		).toHaveFocus();
+		await press.Tab();
+		expect( screen.getByRole( 'button', { name: 'After' } ) ).toHaveFocus();
+		await press.ShiftTab();
+		expect(
+			screen.getByRole( 'button', { name: 'Item 1' } )
+		).toHaveFocus();
+	} );
+
+	test( 'Excludes disabled items', async () => {
+		await renderAndValidate(
+			<Composite>
+				<Composite.Item>Item 1</Composite.Item>
+				<Composite.Item disabled>Item 2</Composite.Item>
+				<Composite.Item>Item 3</Composite.Item>
+			</Composite>
+		);
+
+		const item1 = screen.getByRole( 'button', { name: 'Item 1' } );
+		const item2 = screen.getByRole( 'button', { name: 'Item 2' } );
+		const item3 = screen.getByRole( 'button', { name: 'Item 3' } );
+
+		expect( item2 ).toBeDisabled();
+
+		await press.Tab();
+		expect( item1 ).toHaveFocus();
+		await press.ArrowDown();
+		expect( item2 ).not.toHaveFocus();
+		expect( item3 ).toHaveFocus();
+	} );
+
+	test( 'Includes focusable disabled items', async () => {
+		await renderAndValidate(
+			<Composite>
+				<Composite.Item>Item 1</Composite.Item>
+				<Composite.Item disabled accessibleWhenDisabled>
+					Item 2
+				</Composite.Item>
+				<Composite.Item>Item 3</Composite.Item>
+			</Composite>
+		);
+
+		const item1 = screen.getByRole( 'button', { name: 'Item 1' } );
+		const item2 = screen.getByRole( 'button', { name: 'Item 2' } );
+		const item3 = screen.getByRole( 'button', { name: 'Item 3' } );
+
+		expect( item2 ).toBeEnabled();
+		expect( item2 ).toHaveAttribute( 'aria-disabled', 'true' );
+
+		await press.Tab();
+		expect( item1 ).toHaveFocus();
+		await press.ArrowDown();
+		expect( item2 ).toHaveFocus();
+		expect( item3 ).not.toHaveFocus();
+	} );
+
+	test( 'Supports `activeId`', async () => {
+		/* eslint-disable no-restricted-syntax */
+		await renderAndValidate(
+			<Composite activeId="item-2">
+				<Composite.Item id="item-1">Item 1</Composite.Item>
+				<Composite.Item id="item-2">Item 2</Composite.Item>
+				<Composite.Item id="item-3">Item 3</Composite.Item>
+			</Composite>
+		);
+		/* eslint-enable no-restricted-syntax */
+
+		const item2 = screen.getByRole( 'button', { name: 'Item 2' } );
+
+		await press.Tab();
+		await waitFor( () => expect( item2 ).toHaveFocus() );
+	} );
+
+	it( 'should remain focusable even when there are no elements in the DOM associated with the currently active ID', async () => {
+		const RemoveItemTest = (
+			props: ComponentProps< typeof Composite >
+		) => {
+			const [ showThirdItem, setShowThirdItem ] = useState( true );
+			return (
+				<>
+					<button>Focus trap before composite</button>
+					<Composite { ...props }>
+						<Composite.Item>Item 1</Composite.Item>
+						<Composite.Item>Item 2</Composite.Item>
+						{ showThirdItem && (
+							<Composite.Item>Item 3</Composite.Item>
+						) }
+					</Composite>
+					<button
+						onClick={ () =>
+							setShowThirdItem( ( value ) => ! value )
+						}
+					>
+						Toggle third item
+					</button>
+				</>
+			);
+		};
+
+		await renderAndValidate( <RemoveItemTest /> );
+
+		const toggleButton = screen.getByRole( 'button', {
+			name: 'Toggle third item',
+		} );
+
+		await press.Tab();
+		await press.Tab();
+
+		expect(
+			screen.getByRole( 'button', { name: 'Item 1' } )
+		).toHaveFocus();
+
+		await press.ArrowRight();
+		await press.ArrowRight();
+
+		expect(
+			screen.getByRole( 'button', { name: 'Item 3' } )
+		).toHaveFocus();
+
+		await click( toggleButton );
+
+		expect(
+			screen.queryByRole( 'button', { name: 'Item 3' } )
+		).not.toBeInTheDocument();
+
+		await press.ShiftTab();
+
+		expect(
+			screen.getByRole( 'button', { name: 'Item 2' } )
+		).toHaveFocus();
+
+		await click( toggleButton );
+
+		expect(
+			screen.getByRole( 'button', { name: 'Item 3' } )
+		).toBeVisible();
+
+		await press.ShiftTab();
+
+		expect(
+			screen.getByRole( 'button', { name: 'Item 2' } )
+		).toHaveFocus();
+
+		await press.ArrowRight();
+
+		expect(
+			screen.getByRole( 'button', { name: 'Item 3' } )
+		).toHaveFocus();
+	} );
+
+	describe.each( [
+		[ 'When LTR', false ],
+		[ 'When RTL', true ],
+	] )( '%s', ( _when, rtl ) => {
+		const previousArrowKey = rtl ? 'ArrowRight' : 'ArrowLeft';
+		const nextArrowKey = rtl ? 'ArrowLeft' : 'ArrowRight';
+		const firstArrowKey = rtl ? 'End' : 'Home';
+		const lastArrowKey = rtl ? 'Home' : 'End';
+
+		describe( 'In one dimension', () => {
+			test( 'All directions work with no orientation', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl }>
+						<Composite.Item>Item 1</Composite.Item>
+						<Composite.Item>Item 2</Composite.Item>
+						<Composite.Item>Item 3</Composite.Item>
+					</Composite>
+				);
+
+				const item1 = screen.getByRole( 'button', { name: 'Item 1' } );
+				const item2 = screen.getByRole( 'button', { name: 'Item 2' } );
+				const item3 = screen.getByRole( 'button', { name: 'Item 3' } );
+
+				await press.Tab();
+				expect( item1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( item2 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( item3 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( item3 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( item2 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( item1 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( item1 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( item2 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( item3 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( item2 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( item1 ).toHaveFocus();
+				await press.End();
+				expect( item3 ).toHaveFocus();
+				await press.Home();
+				expect( item1 ).toHaveFocus();
+				await press.PageDown();
+				expect( item3 ).toHaveFocus();
+				await press.PageUp();
+				expect( item1 ).toHaveFocus();
+			} );
+
+			test( 'Only left/right work with horizontal orientation', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl } orientation="horizontal">
+						<Composite.Item>Item 1</Composite.Item>
+						<Composite.Item>Item 2</Composite.Item>
+						<Composite.Item>Item 3</Composite.Item>
+					</Composite>
+				);
+
+				const item1 = screen.getByRole( 'button', { name: 'Item 1' } );
+				const item2 = screen.getByRole( 'button', { name: 'Item 2' } );
+				const item3 = screen.getByRole( 'button', { name: 'Item 3' } );
+
+				await press.Tab();
+				expect( item1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( item1 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( item2 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( item3 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( item3 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( item2 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( item1 ).toHaveFocus();
+				await press.End();
+				expect( item3 ).toHaveFocus();
+				await press.Home();
+				expect( item1 ).toHaveFocus();
+				await press.PageDown();
+				expect( item3 ).toHaveFocus();
+				await press.PageUp();
+				expect( item1 ).toHaveFocus();
+			} );
+
+			test( 'Only up/down work with vertical orientation', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl } orientation="vertical">
+						<Composite.Item>Item 1</Composite.Item>
+						<Composite.Item>Item 2</Composite.Item>
+						<Composite.Item>Item 3</Composite.Item>
+					</Composite>
+				);
+
+				const item1 = screen.getByRole( 'button', { name: 'Item 1' } );
+				const item2 = screen.getByRole( 'button', { name: 'Item 2' } );
+				const item3 = screen.getByRole( 'button', { name: 'Item 3' } );
+
+				await press.Tab();
+				expect( item1 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( item1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( item2 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( item3 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( item3 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( item2 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( item1 ).toHaveFocus();
+				await press.End();
+				expect( item3 ).toHaveFocus();
+				await press.Home();
+				expect( item1 ).toHaveFocus();
+				await press.PageDown();
+				expect( item3 ).toHaveFocus();
+				await press.PageUp();
+				expect( item1 ).toHaveFocus();
+			} );
+
+			test( 'Focus wraps with loop enabled', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl } focusLoop>
+						<Composite.Item>Item 1</Composite.Item>
+						<Composite.Item>Item 2</Composite.Item>
+						<Composite.Item>Item 3</Composite.Item>
+					</Composite>
+				);
+
+				const item1 = screen.getByRole( 'button', { name: 'Item 1' } );
+				const item2 = screen.getByRole( 'button', { name: 'Item 2' } );
+				const item3 = screen.getByRole( 'button', { name: 'Item 3' } );
+
+				await press.Tab();
+				expect( item1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( item2 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( item3 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( item1 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( item3 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( item1 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( item3 ).toHaveFocus();
+			} );
+		} );
+
+		describe( 'In two dimensions', () => {
+			test( 'All directions work as standard', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl }>
+						<Composite.Row>
+							<Composite.Item>Item A1</Composite.Item>
+							<Composite.Item>Item A2</Composite.Item>
+							<Composite.Item>Item A3</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item B1</Composite.Item>
+							<Composite.Item>Item B2</Composite.Item>
+							<Composite.Item>Item B3</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item C1</Composite.Item>
+							<Composite.Item>Item C2</Composite.Item>
+							<Composite.Item>Item C3</Composite.Item>
+						</Composite.Row>
+					</Composite>
+				);
+
+				const itemA1 = screen.getByRole( 'button', {
+					name: 'Item A1',
+				} );
+				const itemA2 = screen.getByRole( 'button', {
+					name: 'Item A2',
+				} );
+				const itemA3 = screen.getByRole( 'button', {
+					name: 'Item A3',
+				} );
+				const itemB1 = screen.getByRole( 'button', {
+					name: 'Item B1',
+				} );
+				const itemB2 = screen.getByRole( 'button', {
+					name: 'Item B2',
+				} );
+				const itemC1 = screen.getByRole( 'button', {
+					name: 'Item C1',
+				} );
+				const itemC3 = screen.getByRole( 'button', {
+					name: 'Item C3',
+				} );
+
+				await press.Tab();
+				expect( itemA1 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( itemA1 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( itemA1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemB1 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemB2 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( itemA2 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( itemA1 ).toHaveFocus();
+				await press( lastArrowKey );
+				expect( itemA3 ).toHaveFocus();
+				await press.PageDown();
+				expect( itemC3 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemC3 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemC3 ).toHaveFocus();
+				await press( firstArrowKey );
+				expect( itemC1 ).toHaveFocus();
+				await press.PageUp();
+				expect( itemA1 ).toHaveFocus();
+				await press.End( null, { ctrlKey: true } );
+				expect( itemC3 ).toHaveFocus();
+				await press.Home( null, { ctrlKey: true } );
+				expect( itemA1 ).toHaveFocus();
+			} );
+
+			test( 'Focus wraps around rows/columns with loop enabled', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl } focusLoop>
+						<Composite.Row>
+							<Composite.Item>Item A1</Composite.Item>
+							<Composite.Item>Item A2</Composite.Item>
+							<Composite.Item>Item A3</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item B1</Composite.Item>
+							<Composite.Item>Item B2</Composite.Item>
+							<Composite.Item>Item B3</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item C1</Composite.Item>
+							<Composite.Item>Item C2</Composite.Item>
+							<Composite.Item>Item C3</Composite.Item>
+						</Composite.Row>
+					</Composite>
+				);
+
+				const itemA1 = screen.getByRole( 'button', {
+					name: 'Item A1',
+				} );
+				const itemA2 = screen.getByRole( 'button', {
+					name: 'Item A2',
+				} );
+				const itemA3 = screen.getByRole( 'button', {
+					name: 'Item A3',
+				} );
+				const itemB1 = screen.getByRole( 'button', {
+					name: 'Item B1',
+				} );
+				const itemC1 = screen.getByRole( 'button', {
+					name: 'Item C1',
+				} );
+				const itemC3 = screen.getByRole( 'button', {
+					name: 'Item C3',
+				} );
+
+				await press.Tab();
+				expect( itemA1 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemA2 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemA3 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemA1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemB1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemC1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemA1 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( itemA3 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( itemC3 ).toHaveFocus();
+			} );
+
+			test( 'Focus moves between rows/columns with wrap enabled', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl } focusWrap>
+						<Composite.Row>
+							<Composite.Item>Item A1</Composite.Item>
+							<Composite.Item>Item A2</Composite.Item>
+							<Composite.Item>Item A3</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item B1</Composite.Item>
+							<Composite.Item>Item B2</Composite.Item>
+							<Composite.Item>Item B3</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item C1</Composite.Item>
+							<Composite.Item>Item C2</Composite.Item>
+							<Composite.Item>Item C3</Composite.Item>
+						</Composite.Row>
+					</Composite>
+				);
+
+				const itemA1 = screen.getByRole( 'button', {
+					name: 'Item A1',
+				} );
+				const itemA2 = screen.getByRole( 'button', {
+					name: 'Item A2',
+				} );
+				const itemA3 = screen.getByRole( 'button', {
+					name: 'Item A3',
+				} );
+				const itemB1 = screen.getByRole( 'button', {
+					name: 'Item B1',
+				} );
+				const itemC1 = screen.getByRole( 'button', {
+					name: 'Item C1',
+				} );
+				const itemC3 = screen.getByRole( 'button', {
+					name: 'Item C3',
+				} );
+				await press.Tab();
+				expect( itemA1 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemA2 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemA3 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemB1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemC1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemA2 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( itemA1 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( itemA1 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( itemA1 ).toHaveFocus();
+				await press.End( itemA1, { ctrlKey: true } );
+				expect( itemC3 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemC3 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemC3 ).toHaveFocus();
+			} );
+
+			test( 'Focus wraps around start/end with loop and wrap enabled', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl } focusLoop focusWrap>
+						<Composite.Row>
+							<Composite.Item>Item A1</Composite.Item>
+							<Composite.Item>Item A2</Composite.Item>
+							<Composite.Item>Item A3</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item B1</Composite.Item>
+							<Composite.Item>Item B2</Composite.Item>
+							<Composite.Item>Item B3</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item C1</Composite.Item>
+							<Composite.Item>Item C2</Composite.Item>
+							<Composite.Item>Item C3</Composite.Item>
+						</Composite.Row>
+					</Composite>
+				);
+
+				const itemA1 = screen.getByRole( 'button', {
+					name: 'Item A1',
+				} );
+				const itemC3 = screen.getByRole( 'button', {
+					name: 'Item C3',
+				} );
+
+				await press.Tab();
+				expect( itemA1 ).toHaveFocus();
+				await press( previousArrowKey );
+				expect( itemC3 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemA1 ).toHaveFocus();
+				await press.ArrowUp();
+				expect( itemC3 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemA1 ).toHaveFocus();
+			} );
+
+			test( 'Focus shifts if vertical neighbor unavailable when shift enabled', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl } focusShift>
+						<Composite.Row>
+							<Composite.Item>Item A1</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item B1</Composite.Item>
+							<Composite.Item>Item B2</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item C1</Composite.Item>
+							<Composite.Item disabled>Item C2</Composite.Item>
+						</Composite.Row>
+					</Composite>
+				);
+
+				const itemA1 = screen.getByRole( 'button', {
+					name: 'Item A1',
+				} );
+				const itemB1 = screen.getByRole( 'button', {
+					name: 'Item B1',
+				} );
+				const itemB2 = screen.getByRole( 'button', {
+					name: 'Item B2',
+				} );
+				const itemC1 = screen.getByRole( 'button', {
+					name: 'Item C1',
+				} );
+
+				await press.Tab();
+				expect( itemA1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemB1 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemB2 ).toHaveFocus();
+				await press.ArrowUp();
+				// A2 doesn't exist
+				expect( itemA1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemB1 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemB2 ).toHaveFocus();
+				await press.ArrowDown();
+				// C2 is disabled
+				expect( itemC1 ).toHaveFocus();
+			} );
+
+			test( 'Focus does not shift if vertical neighbor unavailable when shift not enabled', async () => {
+				await renderAndValidate(
+					<Composite rtl={ rtl }>
+						<Composite.Row>
+							<Composite.Item>Item A1</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item B1</Composite.Item>
+							<Composite.Item>Item B2</Composite.Item>
+						</Composite.Row>
+						<Composite.Row>
+							<Composite.Item>Item C1</Composite.Item>
+							<Composite.Item disabled>Item C2</Composite.Item>
+						</Composite.Row>
+					</Composite>
+				);
+
+				const itemA1 = screen.getByRole( 'button', {
+					name: 'Item A1',
+				} );
+				const itemB1 = screen.getByRole( 'button', {
+					name: 'Item B1',
+				} );
+				const itemB2 = screen.getByRole( 'button', {
+					name: 'Item B2',
+				} );
+
+				await press.Tab();
+				expect( itemA1 ).toHaveFocus();
+				await press.ArrowDown();
+				expect( itemB1 ).toHaveFocus();
+				await press( nextArrowKey );
+				expect( itemB2 ).toHaveFocus();
+				await press.ArrowUp();
+				// A2 doesn't exist
+				expect( itemB2 ).toHaveFocus();
+				await press.ArrowDown();
+				// C2 is disabled
+				expect( itemB2 ).toHaveFocus();
+			} );
+		} );
+	} );
+} );
diff --git a/packages/components/src/composite/typeahead.tsx b/packages/components/src/composite/typeahead.tsx
new file mode 100644
index 00000000000000..519c59ea374e5d
--- /dev/null
+++ b/packages/components/src/composite/typeahead.tsx
@@ -0,0 +1,30 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { useCompositeContext } from './context';
+import type { CompositeTypeaheadProps } from './types';
+
+export const CompositeTypeahead = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< CompositeTypeaheadProps, 'div', false >
+>( function CompositeTypeahead( props, ref ) {
+	const context = useCompositeContext();
+
+	// @ts-expect-error The store prop is undocumented and only used by the
+	// legacy compat layer. The `store` prop is documented, but its type is
+	// obfuscated to discourage its use outside of the component's internals.
+	const store = ( props.store ?? context.store ) as Ariakit.CompositeStore;
+
+	return <Ariakit.CompositeRow store={ store } { ...props } ref={ ref } />;
+} );
diff --git a/packages/components/src/composite/types.ts b/packages/components/src/composite/types.ts
new file mode 100644
index 00000000000000..ed95c7f0253b33
--- /dev/null
+++ b/packages/components/src/composite/types.ts
@@ -0,0 +1,296 @@
+/**
+ * External dependencies
+ */
+import type * as Ariakit from '@ariakit/react';
+
+export type CompositeContextProps = {
+	/**
+	 * The component store, used for advanced usage of the component.
+	 *
+	 * _Note: Using the store directly is not recommended. Instead, use the props
+	 * exposed by the `Composite` component._
+	 *
+	 */
+	store?: unknown;
+};
+
+type CompositeStoreProps = {
+	/**
+	 * The current active item `id`. The active item is the element within the
+	 * composite widget that has either DOM or virtual focus (in case
+	 * the `virtualFocus` prop is enabled).
+	 * - `null` represents the base composite element (the one with a [composite
+	 *   role](https://w3c.github.io/aria/#composite)). Users will be able to
+	 *   navigate out of it using arrow keys.
+	 * - If `activeId` is initially set to `null`, the base composite element
+	 *   itself will have focus and users will be able to navigate to it using
+	 *   arrow keys.
+	 */
+	activeId?: Ariakit.CompositeStoreProps[ 'activeId' ];
+	/**
+	 * The composite item id that should be active by default when the composite
+	 * widget is rendered. If `null`, the composite element itself will have focus
+	 * and users will be able to navigate to it using arrow keys. If `undefined`,
+	 * the first enabled item will be focused.
+	 */
+	defaultActiveId?: Ariakit.CompositeStoreProps[ 'defaultActiveId' ];
+	/**
+	 * A callback that gets called when the `activeId` state changes.
+	 */
+	setActiveId?: Ariakit.CompositeStoreProps[ 'setActiveId' ];
+	/**
+	 * Determines how the focus behaves when the user reaches the end of the
+	 * composite widget.
+	 *
+	 * On one-dimensional composite widgets:
+	 * - `true` loops from the last item to the first item and vice-versa.
+	 * - `horizontal` loops only if `orientation` is `horizontal` or not set.
+	 * - `vertical` loops only if `orientation` is `vertical` or not set.
+	 * - If `activeId` is initially set to `null`, the composite element will
+	 *   be focused in between the last and first items.
+	 *
+	 * On two-dimensional composite widgets (ie. when using `CompositeRow`):
+	 * - `true` loops from the last row/column item to the first item in the same
+	 *   row/column and vice-versa. If it's the last item in the last row, it
+	 *   moves to the first item in the first row and vice-versa.
+	 * - `horizontal` loops only from the last row item to the first item in the
+	 *   same row.
+	 * - `vertical` loops only from the last column item to the first item in the
+	 *   column row.
+	 * - If `activeId` is initially set to `null`, vertical loop will have no
+	 *   effect as moving down from the last row or up from the first row will
+	 *   focus on the composite element.
+	 * - If `focusWrap` matches the value of `focusLoop`, it'll wrap between the
+	 *   last item in the last row or column and the first item in the first row or
+	 *   column and vice-versa.
+	 *
+	 * @default false
+	 */
+	focusLoop?: Ariakit.CompositeStoreProps[ 'focusLoop' ];
+	/**
+	 * **Works only on two-dimensional composite widgets**.
+	 *
+	 * If enabled, moving to the next item from the last one in a row or column
+	 * will focus on the first item in the next row or column and vice-versa.
+	 * - `true` wraps between rows and columns.
+	 * - `horizontal` wraps only between rows.
+	 * - `vertical` wraps only between columns.
+	 * - If `focusLoop` matches the value of `focusWrap`, it'll wrap between the
+	 *   last item in the last row or column and the first item in the first row or
+	 *   column and vice-versa.
+	 *
+	 * @default false
+	 */
+	focusWrap?: Ariakit.CompositeStoreProps[ 'focusWrap' ];
+	/**
+	 * **Works only on two-dimensional composite widgets**.
+	 *
+	 * If enabled, moving up or down when there's no next item or when the next
+	 * item is disabled will shift to the item right before it.
+	 *
+	 * @default false
+	 */
+	focusShift?: Ariakit.CompositeStoreProps[ 'focusShift' ];
+	/**
+	 * If enabled, the composite element will act as an
+	 * [`aria-activedescendant`](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#kbd_focus_activedescendant)
+	 * container instead of [roving
+	 * tabindex](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#kbd_roving_tabindex).
+	 * DOM focus will remain on the composite element while its items receive
+	 * virtual focus.
+	 *
+	 * In both scenarios, the item in focus will carry the `data-active-item`
+	 * attribute.
+	 *
+	 * @default false
+	 */
+	virtualFocus?: Ariakit.CompositeStoreProps[ 'virtualFocus' ];
+	/**
+	 * Defines the orientation of the composite widget. If the composite has a
+	 * single row or column (one-dimensional), the `orientation` value determines
+	 * which arrow keys can be used to move focus:
+	 * - `both`: all arrow keys work.
+	 * - `horizontal`: only left and right arrow keys work.
+	 * - `vertical`: only up and down arrow keys work.
+	 *
+	 * It doesn't have any effect on two-dimensional composites.
+	 *
+	 * @default "both"
+	 */
+	orientation?: Ariakit.CompositeStoreProps[ 'orientation' ];
+	/**
+	 * Controls how the previous and next items are determined.
+	 * If `rtl` is set to `true`, they will be inverted.
+	 *
+	 * This only affects the composite widget behavior. You still need to set
+	 * `dir="rtl"` on HTML/CSS.
+	 *
+	 * @default `isRtl()`
+	 */
+	rtl?: Ariakit.CompositeStoreProps[ 'rtl' ];
+};
+
+export type CompositeProps = CompositeStoreProps & {
+	/**
+	 * Allows the component to be rendered as a different HTML element or React
+	 * component. The value can be a React element or a function that takes in the
+	 * original component props and gives back a React element with the props
+	 * merged.
+	 */
+	render?: Ariakit.CompositeProps[ 'render' ];
+	/**
+	 * Makes the component a focusable element. When this element gains keyboard
+	 * focus, it gets a `data-focus-visible` attribute and triggers the
+	 * `onFocusVisible` prop.
+	 * The component supports the `disabled` prop even for those elements not
+	 * supporting the native `disabled` attribute. Disabled elements may be
+	 * still accessible via keyboard by using the the `accessibleWhenDisabled`
+	 * prop.
+	 * Non-native focusable elements will lose their focusability entirely.
+	 * However, native focusable elements will retain their inherent focusability.
+	 */
+	focusable?: Ariakit.CompositeProps[ 'focusable' ];
+	/**
+	 * Determines if the element is disabled. This sets the `aria-disabled`
+	 * attribute accordingly, enabling support for all elements, including those
+	 * that don't support the native `disabled` attribute.
+	 *
+	 * This feature can be combined with the `accessibleWhenDisabled` prop to
+	 * make disabled elements still accessible via keyboard.
+	 *
+	 * **Note**: For this prop to work, the `focusable` prop must be set to
+	 * `true`, if it's not set by default.
+	 *
+	 * @default false
+	 */
+	disabled?: Ariakit.CompositeProps[ 'disabled' ];
+	/**
+	 * Indicates whether the element should be focusable even when it is
+	 * `disabled`.
+	 *
+	 * This is important when discoverability is a concern. For example:
+	 *
+	 * > A toolbar in an editor contains a set of special smart paste functions
+	 * that are disabled when the clipboard is empty or when the function is not
+	 * applicable to the current content of the clipboard. It could be helpful to
+	 * keep the disabled buttons focusable if the ability to discover their
+	 * functionality is primarily via their presence on the toolbar.
+	 *
+	 * Learn more on [Focusability of disabled
+	 * controls](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#focusabilityofdisabledcontrols).
+	 */
+	accessibleWhenDisabled?: Ariakit.CompositeProps[ 'accessibleWhenDisabled' ];
+	/**
+	 * Custom event handler invoked when the element gains focus through keyboard
+	 * interaction or a key press occurs while the element is in focus. This is
+	 * the programmatic equivalent of the `data-focus-visible` attribute.
+	 *
+	 * **Note**: For this prop to work, the `focusable` prop must be set to `true`
+	 * if it's not set by default.
+	 */
+	onFocusVisible?: Ariakit.CompositeProps[ 'onFocusVisible' ];
+	/**
+	 * The contents of the component.
+	 */
+	children?: Ariakit.CompositeProps[ 'children' ];
+};
+
+export type CompositeGroupProps = {
+	/**
+	 * Allows the component to be rendered as a different HTML element or React
+	 * component. The value can be a React element or a function that takes in the
+	 * original component props and gives back a React element with the props
+	 * merged.
+	 */
+	render?: Ariakit.CompositeGroupProps[ 'render' ];
+	/**
+	 * The contents of the component.
+	 */
+	children?: Ariakit.CompositeGroupProps[ 'children' ];
+};
+
+export type CompositeGroupLabelProps = {
+	/**
+	 * Allows the component to be rendered as a different HTML element or React
+	 * component. The value can be a React element or a function that takes in the
+	 * original component props and gives back a React element with the props
+	 * merged.
+	 */
+	render?: Ariakit.CompositeGroupLabelProps[ 'render' ];
+	/**
+	 * The contents of the component.
+	 */
+	children?: Ariakit.CompositeGroupLabelProps[ 'children' ];
+};
+
+export type CompositeItemProps = {
+	/**
+	 * Allows the component to be rendered as a different HTML element or React
+	 * component. The value can be a React element or a function that takes in the
+	 * original component props and gives back a React element with the props
+	 * merged.
+	 */
+	render?: Ariakit.CompositeItemProps[ 'render' ];
+	/**
+	 * The contents of the component.
+	 */
+	children?: Ariakit.CompositeItemProps[ 'children' ];
+	/**
+	 * Indicates whether the element should be focusable even when it is
+	 * `disabled`.
+	 *
+	 * This is important when discoverability is a concern. For example:
+	 *
+	 * > A toolbar in an editor contains a set of special smart paste functions
+	 * that are disabled when the clipboard is empty or when the function is not
+	 * applicable to the current content of the clipboard. It could be helpful to
+	 * keep the disabled buttons focusable if the ability to discover their
+	 * functionality is primarily via their presence on the toolbar.
+	 *
+	 * Learn more on [Focusability of disabled
+	 * controls](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#focusabilityofdisabledcontrols).
+	 */
+	accessibleWhenDisabled?: Ariakit.CompositeItemProps[ 'accessibleWhenDisabled' ];
+};
+
+export type CompositeRowProps = {
+	/**
+	 * Allows the component to be rendered as a different HTML element or React
+	 * component. The value can be a React element or a function that takes in the
+	 * original component props and gives back a React element with the props
+	 * merged.
+	 */
+	render?: Ariakit.CompositeRowProps[ 'render' ];
+	/**
+	 * The contents of the component.
+	 */
+	children?: Ariakit.CompositeRowProps[ 'children' ];
+};
+
+export type CompositeHoverProps = {
+	/**
+	 * Allows the component to be rendered as a different HTML element or React
+	 * component. The value can be a React element or a function that takes in the
+	 * original component props and gives back a React element with the props
+	 * merged.
+	 */
+	render?: Ariakit.CompositeHoverProps[ 'render' ];
+	/**
+	 * The contents of the component.
+	 */
+	children?: Ariakit.CompositeHoverProps[ 'children' ];
+};
+
+export type CompositeTypeaheadProps = {
+	/**
+	 * Allows the component to be rendered as a different HTML element or React
+	 * component. The value can be a React element or a function that takes in the
+	 * original component props and gives back a React element with the props
+	 * merged.
+	 */
+	render?: Ariakit.CompositeTypeaheadProps[ 'render' ];
+	/**
+	 * The contents of the component.
+	 */
+	children?: Ariakit.CompositeTypeaheadProps[ 'children' ];
+};
diff --git a/packages/components/src/composite/v2.ts b/packages/components/src/composite/v2.ts
deleted file mode 100644
index d329fd3fd11dfb..00000000000000
--- a/packages/components/src/composite/v2.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Composite is a component that may contain navigable items represented by
- * CompositeItem. It's inspired by the WAI-ARIA Composite Role and implements
- * all the keyboard navigation mechanisms to ensure that there's only one
- * tab stop for the whole Composite element. This means that it can behave as
- * a roving tabindex or aria-activedescendant container.
- *
- * @see https://ariakit.org/components/composite
- */
-
-/* eslint-disable-next-line no-restricted-imports */
-export {
-	Composite,
-	CompositeGroup,
-	CompositeGroupLabel,
-	CompositeItem,
-	CompositeRow,
-	useCompositeStore,
-} from '@ariakit/react';
-
-/* eslint-disable-next-line no-restricted-imports */
-export type { CompositeStore } from '@ariakit/react';
diff --git a/packages/components/src/confirm-dialog/README.md b/packages/components/src/confirm-dialog/README.md
index 4b0f37f5d35b39..3ad42d9d68160e 100644
--- a/packages/components/src/confirm-dialog/README.md
+++ b/packages/components/src/confirm-dialog/README.md
@@ -138,3 +138,10 @@ The optional custom text to display as the confirmation button's label
 -   Default: "Cancel"
 
 The optional custom text to display as the cancellation button's label
+
+## Best practices
+
+The ConfirmDialog component should:
+
+-   Be used only for short confirmation messages where a cancel and confirm actions are provided.
+-   Use a descriptive text for the _confirm_ button. Default is "OK".
diff --git a/packages/components/src/confirm-dialog/component.tsx b/packages/components/src/confirm-dialog/component.tsx
index 750e7030de13cd..7e787439d91dfd 100644
--- a/packages/components/src/confirm-dialog/component.tsx
+++ b/packages/components/src/confirm-dialog/component.tsx
@@ -86,7 +86,7 @@ const UnconnectedConfirmDialog = (
 					onRequestClose={ handleEvent( onCancel ) }
 					onKeyDown={ handleEnter }
 					closeButtonLabel={ cancelLabel }
-					isDismissible={ true }
+					isDismissible
 					ref={ forwardedRef }
 					overlayClassName={ wrapperClassName }
 					__experimentalHideHeader
@@ -96,6 +96,7 @@ const UnconnectedConfirmDialog = (
 						<Text>{ children }</Text>
 						<Flex direction="row" justify="flex-end">
 							<Button
+								__next40pxDefaultSize
 								ref={ cancelButtonRef }
 								variant="tertiary"
 								onClick={ handleEvent( onCancel ) }
@@ -103,6 +104,7 @@ const UnconnectedConfirmDialog = (
 								{ cancelLabel }
 							</Button>
 							<Button
+								__next40pxDefaultSize
 								ref={ confirmButtonRef }
 								variant="primary"
 								onClick={ handleEvent( onConfirm ) }
diff --git a/packages/components/src/confirm-dialog/test/index.tsx b/packages/components/src/confirm-dialog/test/index.tsx
index 27e1af66ce7429..65867e827f4845 100644
--- a/packages/components/src/confirm-dialog/test/index.tsx
+++ b/packages/components/src/confirm-dialog/test/index.tsx
@@ -235,11 +235,7 @@ describe( 'Confirm', () => {
 	describe( 'When controlled (isOpen is not `undefined`)', () => {
 		it( 'should render when `isOpen` is set to `true`', async () => {
 			render(
-				<ConfirmDialog
-					isOpen={ true }
-					onConfirm={ noop }
-					onCancel={ noop }
-				>
+				<ConfirmDialog isOpen onConfirm={ noop } onCancel={ noop }>
 					Are you sure?
 				</ConfirmDialog>
 			);
@@ -273,7 +269,7 @@ describe( 'Confirm', () => {
 			const onConfirm = jest.fn().mockName( 'onConfirm()' );
 
 			render(
-				<ConfirmDialog isOpen={ true } onConfirm={ onConfirm }>
+				<ConfirmDialog isOpen onConfirm={ onConfirm }>
 					Are you sure?
 				</ConfirmDialog>
 			);
@@ -291,11 +287,7 @@ describe( 'Confirm', () => {
 			const onCancel = jest.fn().mockName( 'onCancel()' );
 
 			render(
-				<ConfirmDialog
-					isOpen={ true }
-					onConfirm={ noop }
-					onCancel={ onCancel }
-				>
+				<ConfirmDialog isOpen onConfirm={ noop } onCancel={ onCancel }>
 					Are you sure?
 				</ConfirmDialog>
 			);
@@ -312,11 +304,7 @@ describe( 'Confirm', () => {
 			const onCancel = jest.fn().mockName( 'onCancel()' );
 
 			render(
-				<ConfirmDialog
-					isOpen={ true }
-					onConfirm={ noop }
-					onCancel={ onCancel }
-				>
+				<ConfirmDialog isOpen onConfirm={ noop } onCancel={ onCancel }>
 					Are you sure?
 				</ConfirmDialog>
 			);
@@ -352,11 +340,7 @@ describe( 'Confirm', () => {
 			const onConfirm = jest.fn().mockName( 'onConfirm()' );
 
 			render(
-				<ConfirmDialog
-					isOpen={ true }
-					onConfirm={ onConfirm }
-					onCancel={ noop }
-				>
+				<ConfirmDialog isOpen onConfirm={ onConfirm } onCancel={ noop }>
 					Are you sure?
 				</ConfirmDialog>
 			);
diff --git a/packages/components/src/context/context-connect.ts b/packages/components/src/context/context-connect.ts
index f938fa0b1f3241..bbab68222abb9a 100644
--- a/packages/components/src/context/context-connect.ts
+++ b/packages/components/src/context/context-connect.ts
@@ -116,7 +116,9 @@ function _contextConnect<
 export function getConnectNamespace(
 	Component: ReactChild | undefined | {}
 ): string[] {
-	if ( ! Component ) return [];
+	if ( ! Component ) {
+		return [];
+	}
 
 	let namespaces = [];
 
@@ -145,7 +147,9 @@ export function hasConnectNamespace(
 	Component: ReactNode,
 	match: string[] | string
 ): boolean {
-	if ( ! Component ) return false;
+	if ( ! Component ) {
+		return false;
+	}
 
 	if ( typeof match === 'string' ) {
 		return getConnectNamespace( Component ).includes( match );
diff --git a/packages/components/src/context/wordpress-component.ts b/packages/components/src/context/wordpress-component.ts
index 57e69abdc38093..6e88ed4efb094e 100644
--- a/packages/components/src/context/wordpress-component.ts
+++ b/packages/components/src/context/wordpress-component.ts
@@ -3,19 +3,24 @@
  */
 import type * as React from 'react';
 
-// Based on https://github.com/reakit/reakit/blob/master/packages/reakit-utils/src/types.ts
+// Based on https://github.com/ariakit/ariakit/blob/reakit/packages/reakit-utils/src/types.ts
 export type WordPressComponentProps<
 	/** Prop types. */
 	P,
 	/** The HTML element to inherit props from. */
-	T extends React.ElementType,
+	T extends React.ElementType | null,
 	/** Supports polymorphism through the `as` prop. */
 	IsPolymorphic extends boolean = true,
 > = P &
-	// The `children` prop is being explicitly omitted since it is otherwise implicitly added
-	// by `ComponentPropsWithRef`. The context is that components should require the `children`
-	// prop explicitly when needed (see https://github.com/WordPress/gutenberg/pull/31817).
-	Omit< React.ComponentPropsWithoutRef< T >, 'as' | keyof P | 'children' > &
+	( T extends React.ElementType
+		? // The `children` prop is being explicitly omitted since it is otherwise implicitly added
+		  // by `ComponentPropsWithRef`. The context is that components should require the `children`
+		  // prop explicitly when needed (see https://github.com/WordPress/gutenberg/pull/31817).
+		  Omit<
+				React.ComponentPropsWithoutRef< T >,
+				'as' | keyof P | 'children'
+		  >
+		: {} ) &
 	( IsPolymorphic extends true
 		? {
 				/** The HTML element or React component to render the component as. */
@@ -24,7 +29,7 @@ export type WordPressComponentProps<
 		: {} );
 
 export type WordPressComponent<
-	T extends React.ElementType,
+	T extends React.ElementType | null,
 	O,
 	IsPolymorphic extends boolean,
 > = {
diff --git a/packages/components/src/css.d.ts b/packages/components/src/css.d.ts
new file mode 100644
index 00000000000000..598eb388f6d352
--- /dev/null
+++ b/packages/components/src/css.d.ts
@@ -0,0 +1,9 @@
+import type * as CSS from 'csstype';
+
+// See: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/f6d4d15522356eba4a0267142834e3abc6b603fc/types/react/index.d.ts#L2580-L2587
+declare module 'csstype' {
+	interface Properties {
+		// Allow any CSS Custom Properties
+		[ index: `--${ string }` ]: any;
+	}
+}
diff --git a/packages/components/src/custom-gradient-picker/gradient-bar/control-points.tsx b/packages/components/src/custom-gradient-picker/gradient-bar/control-points.tsx
index 1c64dea91e9f20..a92e973d88c5a8 100644
--- a/packages/components/src/custom-gradient-picker/gradient-bar/control-points.tsx
+++ b/packages/components/src/custom-gradient-picker/gradient-bar/control-points.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import { colord } from 'colord';
 
 /**
@@ -66,7 +66,7 @@ function ControlPointButton( {
 				aria-describedby={ descriptionId }
 				aria-haspopup="true"
 				aria-expanded={ isOpen }
-				className={ classnames(
+				className={ clsx(
 					'components-custom-gradient-picker__control-point-button',
 					{
 						'is-active': isOpen,
@@ -102,7 +102,7 @@ function GradientColorPickerDropdown( {
 		[]
 	);
 
-	const mergedClassName = classnames(
+	const mergedClassName = clsx(
 		'components-custom-gradient-picker__control-point-dropdown',
 		className
 	);
@@ -128,11 +128,11 @@ function ControlPoints( {
 	onStopControlPointChange,
 	__experimentalIsRenderedInSidebar,
 }: ControlPointsProps ) {
-	const controlPointMoveState = useRef< ControlPointMoveState >();
+	const controlPointMoveStateRef = useRef< ControlPointMoveState >();
 
 	const onMouseMove = ( event: MouseEvent ) => {
 		if (
-			controlPointMoveState.current === undefined ||
+			controlPointMoveStateRef.current === undefined ||
 			gradientPickerDomRef.current === null
 		) {
 			return;
@@ -144,14 +144,14 @@ function ControlPoints( {
 		);
 
 		const { initialPosition, index, significantMoveHappened } =
-			controlPointMoveState.current;
+			controlPointMoveStateRef.current;
 
 		if (
 			! significantMoveHappened &&
 			Math.abs( initialPosition - relativePosition ) >=
 				MINIMUM_SIGNIFICANT_MOVE
 		) {
-			controlPointMoveState.current.significantMoveHappened = true;
+			controlPointMoveStateRef.current.significantMoveHappened = true;
 		}
 
 		onChange(
@@ -163,13 +163,13 @@ function ControlPoints( {
 		if (
 			window &&
 			window.removeEventListener &&
-			controlPointMoveState.current &&
-			controlPointMoveState.current.listenersActivated
+			controlPointMoveStateRef.current &&
+			controlPointMoveStateRef.current.listenersActivated
 		) {
 			window.removeEventListener( 'mousemove', onMouseMove );
 			window.removeEventListener( 'mouseup', cleanEventListeners );
 			onStopControlPointChange();
-			controlPointMoveState.current.listenersActivated = false;
+			controlPointMoveStateRef.current.listenersActivated = false;
 		}
 	};
 
@@ -202,8 +202,8 @@ function ControlPoints( {
 									key={ index }
 									onClick={ () => {
 										if (
-											controlPointMoveState.current &&
-											controlPointMoveState.current
+											controlPointMoveStateRef.current &&
+											controlPointMoveStateRef.current
 												.significantMoveHappened
 										) {
 											return;
@@ -220,7 +220,7 @@ function ControlPoints( {
 											window &&
 											window.addEventListener
 										) {
-											controlPointMoveState.current = {
+											controlPointMoveStateRef.current = {
 												initialPosition,
 												index,
 												significantMoveHappened: false,
diff --git a/packages/components/src/custom-gradient-picker/gradient-bar/index.tsx b/packages/components/src/custom-gradient-picker/gradient-bar/index.tsx
index 53589aa1d3efd8..4f5eafb17523b4 100644
--- a/packages/components/src/custom-gradient-picker/gradient-bar/index.tsx
+++ b/packages/components/src/custom-gradient-picker/gradient-bar/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -133,7 +133,7 @@ export default function CustomGradientBar( {
 
 	return (
 		<div
-			className={ classnames(
+			className={ clsx(
 				'components-custom-gradient-picker__gradient-bar',
 				{ 'has-gradient': hasGradient }
 			) }
diff --git a/packages/components/src/custom-gradient-picker/index.native.js b/packages/components/src/custom-gradient-picker/index.native.js
index d10ade0aea7c2e..12b2e44e379e68 100644
--- a/packages/components/src/custom-gradient-picker/index.native.js
+++ b/packages/components/src/custom-gradient-picker/index.native.js
@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import { PanelBody, RadioControl, RangeControl } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
 
@@ -16,6 +15,9 @@ import {
 	HORIZONTAL_GRADIENT_ORIENTATION,
 } from './constants';
 import styles from './style.scss';
+import PanelBody from '../panel/body';
+import RadioControl from '../radio-control';
+import RangeControl from '../range-control';
 
 function CustomGradientPicker( { setColor, currentValue, isGradientColor } ) {
 	const [ gradientOrientation, setGradientOrientation ] = useState(
diff --git a/packages/components/src/custom-gradient-picker/index.tsx b/packages/components/src/custom-gradient-picker/index.tsx
index 19cfd8f740df7d..dd0659515234a6 100644
--- a/packages/components/src/custom-gradient-picker/index.tsx
+++ b/packages/components/src/custom-gradient-picker/index.tsx
@@ -1,13 +1,11 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
-import type gradientParser from 'gradient-parser';
+import { type LinearGradientNode } from 'gradient-parser';
 
 /**
  * WordPress dependencies
  */
-import deprecated from '@wordpress/deprecated';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -60,7 +58,6 @@ const GradientAnglePicker = ( {
 	};
 	return (
 		<AnglePickerControl
-			__nextHasNoMarginBottom
 			onChange={ onAngleChange }
 			value={ hasGradient ? angle : '' }
 		/>
@@ -82,7 +79,7 @@ const GradientTypePicker = ( {
 					? undefined
 					: HORIZONTAL_GRADIENT_ORIENTATION,
 				type: 'linear-gradient',
-			} as gradientParser.LinearGradientNode )
+			} satisfies LinearGradientNode )
 		);
 	};
 
@@ -141,8 +138,6 @@ const GradientTypePicker = ( {
  * ```
  */
 export function CustomGradientPicker( {
-	/** Start opting into the new margin-free styles that will become the default in a future version. */
-	__nextHasNoMargin = false,
 	value,
 	onChange,
 	__experimentalIsRenderedInSidebar = false,
@@ -166,24 +161,8 @@ export function CustomGradientPicker( {
 		};
 	} );
 
-	if ( ! __nextHasNoMargin ) {
-		deprecated(
-			'Outer margin styles for wp.components.CustomGradientPicker',
-			{
-				since: '6.1',
-				version: '6.4',
-				hint: 'Set the `__nextHasNoMargin` prop to true to start opting into the new styles, which will become the default in a future version',
-			}
-		);
-	}
-
 	return (
-		<VStack
-			spacing={ 4 }
-			className={ classnames( 'components-custom-gradient-picker', {
-				'is-next-has-no-margin': __nextHasNoMargin,
-			} ) }
-		>
+		<VStack spacing={ 4 } className="components-custom-gradient-picker">
 			<CustomGradientBar
 				__experimentalIsRenderedInSidebar={
 					__experimentalIsRenderedInSidebar
diff --git a/packages/components/src/custom-gradient-picker/stories/index.story.tsx b/packages/components/src/custom-gradient-picker/stories/index.story.tsx
index 6d19157238d28c..3be8eb36e5a3c2 100644
--- a/packages/components/src/custom-gradient-picker/stories/index.story.tsx
+++ b/packages/components/src/custom-gradient-picker/stories/index.story.tsx
@@ -40,6 +40,3 @@ const CustomGradientPickerWithState: StoryFn<
 };
 
 export const Default = CustomGradientPickerWithState.bind( {} );
-Default.args = {
-	__nextHasNoMargin: true,
-};
diff --git a/packages/components/src/custom-gradient-picker/style.scss b/packages/components/src/custom-gradient-picker/style.scss
index a1a9a699a71a44..fea18f340951e5 100644
--- a/packages/components/src/custom-gradient-picker/style.scss
+++ b/packages/components/src/custom-gradient-picker/style.scss
@@ -1,14 +1,7 @@
 $components-custom-gradient-picker__padding: $grid-unit-20; // 48px container, 16px handles inside, that leaves 32px padding, half of which is 1å6.
 
-.components-custom-gradient-picker {
-	&:not(.is-next-has-no-margin) {
-		margin-top: $grid-unit-15;
-		margin-bottom: $grid-unit-30;
-	}
-}
-
 .components-custom-gradient-picker__gradient-bar {
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	width: 100%;
 	height: $grid-unit-60;
 	position: relative;
@@ -55,7 +48,7 @@ $components-custom-gradient-picker__padding: $grid-unit-20; // 48px container, 1
 		height: inherit;
 		width: inherit;
 		min-width: $grid-unit-20;
-		border-radius: 50%;
+		border-radius: $radius-round;
 
 		background: $white;
 		padding: 2px;
@@ -72,7 +65,7 @@ $components-custom-gradient-picker__padding: $grid-unit-20; // 48px container, 1
 		// Same size as the .components-custom-gradient-picker__control-point-dropdown parent
 		height: inherit;
 		width: inherit;
-		border-radius: 50%;
+		border-radius: $radius-round;
 		padding: 0;
 
 		// Shadow and stroke.
@@ -107,25 +100,6 @@ $components-custom-gradient-picker__padding: $grid-unit-20; // 48px container, 1
 	height: 20px;
 }
 
-.components-custom-gradient-picker .components-custom-gradient-picker__toolbar {
-	border: none;
-
-	// Work-around to target the inner button containers rendered by <ToolbarGroup />
-	> div + div {
-		margin-left: 1px;
-	}
-
-	button {
-		&.is-pressed {
-			> svg {
-				background: $white;
-				border: 1px solid $gray-600;
-				border-radius: 2px;
-			}
-		}
-	}
-}
-
 .components-custom-gradient-picker__ui-line {
 	position: relative;
 	z-index: 0;
diff --git a/packages/components/src/custom-gradient-picker/types.ts b/packages/components/src/custom-gradient-picker/types.ts
index f0dc50094a5b6e..f9efb90799daf2 100644
--- a/packages/components/src/custom-gradient-picker/types.ts
+++ b/packages/components/src/custom-gradient-picker/types.ts
@@ -10,6 +10,8 @@ export type CustomGradientPickerProps = {
 	 * can be safely removed once this happens.)
 	 *
 	 * @default false
+	 * @deprecated Default behavior since WP 6.5. Prop can be safely removed.
+	 * @ignore
 	 */
 	__nextHasNoMargin?: boolean;
 	/**
diff --git a/packages/components/src/custom-select-control-v2/README.md b/packages/components/src/custom-select-control-v2/README.md
index 3cd9c3f8534e76..db7208c2d13015 100644
--- a/packages/components/src/custom-select-control-v2/README.md
+++ b/packages/components/src/custom-select-control-v2/README.md
@@ -1,58 +1,144 @@
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-
-### `CustomSelect`
+# CustomSelectControlV2
 
 Used to render a customizable select control component.
 
+## Development guidelines
+
+### Usage
+
+#### Uncontrolled Mode
+
+`CustomSelectControlV2` can be used in an uncontrolled mode, where the component manages its own state. In this mode, the `defaultValue` prop can be used to set the initial selected value. If this prop is not set, the first value from the children will be selected by default.
+
+```jsx
+const UncontrolledCustomSelectControlV2 = () => (
+	<CustomSelectControlV2 label="Colors">
+		<CustomSelectControlV2.Item value="Blue">
+			{ /* The `defaultValue` since it wasn't defined */ }
+			<span style={ { color: 'blue' } }>Blue</span>
+		</CustomSelectControlV2.Item>
+		<CustomSelectControlV2.Item value="Purple">
+			<span style={ { color: 'purple' } }>Purple</span>
+		</CustomSelectControlV2.Item>
+		<CustomSelectControlV2.Item value="Pink">
+			<span style={ { color: 'deeppink' } }>Pink</span>
+		</CustomSelectControlV2.Item>
+	</CustomSelectControlV2>
+);
+```
+
+#### Controlled Mode
+
+`CustomSelectControlV2` can also be used in a controlled mode, where the parent component specifies the `value` and the `onChange` props to control selection.
+
+```jsx
+const ControlledCustomSelectControlV2 = () => {
+	const [ value, setValue ] = useState< string | string[] >();
+
+    const renderControlledValue = ( renderValue: string | string[] ) => (
+		<>
+			{ /* Custom JSX to display `renderValue` item */ }
+		</>
+    );
+
+	return (
+		<CustomSelectControlV2
+			{ ...props }
+			onChange={ ( nextValue ) => {
+				setValue( nextValue );
+				props.onChange?.( nextValue );
+			} }
+			value={ value }
+		>
+			{ [ 'blue', 'purple', 'pink' ].map( ( option ) => (
+				<CustomSelectControlV2.Item key={ option } value={ option }>
+					{ renderControlledValue( option ) }
+				</CustomSelectControlV2.Item>
+			) ) }
+		</CustomSelectControlV2>
+	);
+};
+```
+
+#### Multiple Selection
+
+Multiple selection can be enabled by using an array for the `value` and
+`defaultValue` props. The argument of the `onChange` function will also change accordingly.
+
+```jsx
+const MultiSelectCustomSelectControlV2 = () => (
+	<CustomSelectControlV2 defaultValue={ [ 'blue', 'pink' ] } label="Colors">
+		{ [ 'blue', 'purple', 'pink' ].map( ( item ) => (
+			<CustomSelectControlV2.Item key={ item } value={ item }>
+				{ item }
+			</CustomSelectControlV2.Item>
+		) ) }
+	</CustomSelectControlV2>
+);
+```
+
+### Components and Sub-components
+
+`CustomSelectControlV2` is comprised of two individual components:
+
+-   `CustomSelectControlV2`: a wrapper component and context provider. It is responsible for managing the state of the `CustomSelectControlV2.Item` children.
+-   `CustomSelectControlV2.Item`: renders a single select item. The first `CustomSelectControlV2.Item` child will be used as the `defaultValue` when `defaultValue` is undefined.
+
 #### Props
 
 The component accepts the following props:
 
 ##### `children`: `React.ReactNode`
 
-The child elements. This should be composed of CustomSelect.Item components.
+The child elements. This should be composed of `CustomSelectControlV2.Item` components.
 
 -   Required: yes
 
-##### `defaultValue`: `string`
+##### `defaultValue`: `string | string[]`
 
 An optional default value for the control. If left `undefined`, the first non-disabled item will be used.
 
 -   Required: no
 
+##### `hideLabelFromVision`: `boolean`
+
+Used to visually hide the label. It will always be visible to screen readers.
+
+-   Required: no
+-   Default: `false`
+
 ##### `label`: `string`
 
 Label for the control.
 
 -   Required: yes
 
-##### `onChange`: `( newValue: string ) => void`
+##### `onChange`: `( newValue: string | string[] ) => void`
 
 A function that receives the new value of the input.
 
 -   Required: no
 
-##### `renderSelectedValue`: `( selectValue: string ) => React.ReactNode`
+##### `renderSelectedValue`: `( selectValue: string | string[] ) => React.ReactNode`
 
 Can be used to render select UI with custom styled values.
 
 -   Required: no
 
-##### `size`: `'default' | 'large'`
+##### `size`: `'default' | 'compact'`
 
 The size of the control.
 
 -   Required: no
+-   Default: `'default'`
 
-##### `value`: `string`
+##### `value`: `string | string[]`
 
 Can be used to externally control the value of the control.
 
 -   Required: no
 
-### `CustomSelectItem`
+### `CustomSelectControlV2.Item`
 
 Used to render a select item.
 
diff --git a/packages/components/src/custom-select-control-v2/custom-select.tsx b/packages/components/src/custom-select-control-v2/custom-select.tsx
new file mode 100644
index 00000000000000..bb458abcc282ff
--- /dev/null
+++ b/packages/components/src/custom-select-control-v2/custom-select.tsx
@@ -0,0 +1,161 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+import { useStoreState } from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { createContext, useCallback, useMemo } from '@wordpress/element';
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { VisuallyHidden } from '..';
+import * as Styled from './styles';
+import type {
+	CustomSelectContext as CustomSelectContextType,
+	CustomSelectStore,
+	CustomSelectButtonProps,
+	CustomSelectButtonSize,
+	_CustomSelectInternalProps,
+	_CustomSelectProps,
+} from './types';
+import InputBase from '../input-control/input-base';
+import SelectControlChevronDown from '../select-control/chevron-down';
+import BaseControl from '../base-control';
+
+export const CustomSelectContext =
+	createContext< CustomSelectContextType >( undefined );
+
+function defaultRenderSelectedValue(
+	value: CustomSelectButtonProps[ 'value' ]
+) {
+	const isValueEmpty = Array.isArray( value )
+		? value.length === 0
+		: value === undefined || value === null;
+
+	if ( isValueEmpty ) {
+		return __( 'Select an item' );
+	}
+
+	if ( Array.isArray( value ) ) {
+		return value.length === 1
+			? value[ 0 ]
+			: // translators: %s: number of items selected (it will always be 2 or more items)
+			  sprintf( __( '%s items selected' ), value.length );
+	}
+
+	return value;
+}
+
+const CustomSelectButton = ( {
+	renderSelectedValue,
+	size = 'default',
+	store,
+	...restProps
+}: Omit<
+	React.ComponentProps< typeof Ariakit.Select > &
+		CustomSelectButtonProps &
+		CustomSelectButtonSize &
+		CustomSelectStore,
+	'onChange'
+> ) => {
+	const { value: currentValue } = useStoreState( store );
+
+	const computedRenderSelectedValue = useMemo(
+		() => renderSelectedValue ?? defaultRenderSelectedValue,
+		[ renderSelectedValue ]
+	);
+
+	return (
+		<Styled.Select
+			{ ...restProps }
+			size={ size }
+			hasCustomRenderProp={ !! renderSelectedValue }
+			store={ store }
+		>
+			{ computedRenderSelectedValue( currentValue ) }
+		</Styled.Select>
+	);
+};
+
+function _CustomSelect(
+	props: _CustomSelectInternalProps &
+		_CustomSelectProps &
+		CustomSelectStore &
+		CustomSelectButtonSize
+) {
+	const {
+		children,
+		hideLabelFromVision = false,
+		label,
+		size,
+		store,
+		className,
+		isLegacy = false,
+		...restProps
+	} = props;
+
+	const onSelectPopoverKeyDown: React.KeyboardEventHandler< HTMLDivElement > =
+		useCallback(
+			( e ) => {
+				if ( isLegacy ) {
+					e.stopPropagation();
+				}
+			},
+			[ isLegacy ]
+		);
+
+	const contextValue = useMemo( () => ( { store, size } ), [ store, size ] );
+
+	return (
+		// Where should `restProps` be forwarded to?
+		<div className={ className }>
+			<Ariakit.SelectLabel
+				store={ store }
+				render={
+					hideLabelFromVision ? (
+						// @ts-expect-error `children` are passed via the render prop
+						<VisuallyHidden />
+					) : (
+						// @ts-expect-error `children` are passed via the render prop
+						<BaseControl.VisualLabel as="div" />
+					)
+				}
+			>
+				{ label }
+			</Ariakit.SelectLabel>
+			<InputBase
+				__next40pxDefaultSize
+				size={ size }
+				suffix={ <SelectControlChevronDown /> }
+			>
+				<CustomSelectButton
+					{ ...restProps }
+					size={ size }
+					store={ store }
+					// Match legacy behavior (move selection rather than open the popover)
+					showOnKeyDown={ ! isLegacy }
+				/>
+				<Styled.SelectPopover
+					gutter={ 12 }
+					store={ store }
+					sameWidth
+					slide={ false }
+					onKeyDown={ onSelectPopoverKeyDown }
+					// Match legacy behavior
+					flip={ ! isLegacy }
+				>
+					<CustomSelectContext.Provider value={ contextValue }>
+						{ children }
+					</CustomSelectContext.Provider>
+				</Styled.SelectPopover>
+			</InputBase>
+		</div>
+	);
+}
+
+export default _CustomSelect;
diff --git a/packages/components/src/custom-select-control-v2/index.tsx b/packages/components/src/custom-select-control-v2/index.tsx
index 88231078fa8d56..07d073caf920f9 100644
--- a/packages/components/src/custom-select-control-v2/index.tsx
+++ b/packages/components/src/custom-select-control-v2/index.tsx
@@ -1,99 +1,29 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
-/**
- * WordPress dependencies
- */
-import { createContext, useContext } from '@wordpress/element';
-import { __, sprintf } from '@wordpress/i18n';
-
 /**
  * Internal dependencies
  */
-import * as Styled from './styles';
-import type {
-	CustomSelectProps,
-	CustomSelectItemProps,
-	CustomSelectContext as CustomSelectContextType,
-} from './types';
-
-export const CustomSelectContext =
-	createContext< CustomSelectContextType >( undefined );
-
-function defaultRenderSelectedValue( value: CustomSelectProps[ 'value' ] ) {
-	const isValueEmpty = Array.isArray( value )
-		? value.length === 0
-		: value === undefined || value === null;
-
-	if ( isValueEmpty ) {
-		return __( 'Select an item' );
-	}
-
-	if ( Array.isArray( value ) ) {
-		return value.length === 1
-			? value[ 0 ]
-			: // translators: %s: number of items selected (it will always be 2 or more items)
-			  sprintf( __( '%s items selected' ), value.length );
-	}
-
-	return value;
-}
-
-export function CustomSelect( props: CustomSelectProps ) {
-	const {
-		children,
-		defaultValue,
-		label,
-		onChange,
-		size = 'default',
-		value,
-		renderSelectedValue = defaultRenderSelectedValue,
-	} = props;
-
+import _CustomSelect from './custom-select';
+import type { CustomSelectProps } from './types';
+import type { WordPressComponentProps } from '../context';
+import Item from './item';
+
+function CustomSelectControlV2(
+	props: WordPressComponentProps< CustomSelectProps, 'button', false >
+) {
+	const { defaultValue, onChange, value, ...restProps } = props;
+	// Forward props + store from v2 implementation
 	const store = Ariakit.useSelectStore( {
 		setValue: ( nextValue ) => onChange?.( nextValue ),
 		defaultValue,
 		value,
 	} );
 
-	const { value: currentValue } = store.useState();
-
-	return (
-		<>
-			<Styled.CustomSelectLabel store={ store }>
-				{ label }
-			</Styled.CustomSelectLabel>
-			<Styled.CustomSelectButton
-				size={ size }
-				hasCustomRenderProp={ !! renderSelectedValue }
-				store={ store }
-			>
-				{ renderSelectedValue( currentValue ) }
-				<Ariakit.SelectArrow />
-			</Styled.CustomSelectButton>
-			<Styled.CustomSelectPopover gutter={ 12 } store={ store } sameWidth>
-				<CustomSelectContext.Provider value={ { store } }>
-					{ children }
-				</CustomSelectContext.Provider>
-			</Styled.CustomSelectPopover>
-		</>
-	);
+	return <_CustomSelect { ...restProps } store={ store } />;
 }
 
-export function CustomSelectItem( {
-	children,
-	...props
-}: CustomSelectItemProps ) {
-	const customSelectContext = useContext( CustomSelectContext );
-	return (
-		<Styled.CustomSelectItem
-			store={ customSelectContext?.store }
-			{ ...props }
-		>
-			{ children ?? props.value }
-			<Ariakit.SelectItemCheck />
-		</Styled.CustomSelectItem>
-	);
-}
+CustomSelectControlV2.Item = Item;
+
+export default CustomSelectControlV2;
diff --git a/packages/components/src/custom-select-control-v2/item.tsx b/packages/components/src/custom-select-control-v2/item.tsx
new file mode 100644
index 00000000000000..ade187bb603e98
--- /dev/null
+++ b/packages/components/src/custom-select-control-v2/item.tsx
@@ -0,0 +1,35 @@
+/**
+ * WordPress dependencies
+ */
+import { useContext } from '@wordpress/element';
+import { Icon, check } from '@wordpress/icons';
+/**
+ * Internal dependencies
+ */
+import type { CustomSelectItemProps } from './types';
+import type { WordPressComponentProps } from '../context';
+import * as Styled from './styles';
+import { CustomSelectContext } from './custom-select';
+
+export function CustomSelectItem( {
+	children,
+	...props
+}: WordPressComponentProps< CustomSelectItemProps, 'div', false > ) {
+	const customSelectContext = useContext( CustomSelectContext );
+	return (
+		<Styled.SelectItem
+			store={ customSelectContext?.store }
+			size={ customSelectContext?.size ?? 'default' }
+			{ ...props }
+		>
+			{ children ?? props.value }
+			<Styled.SelectedItemCheck>
+				<Icon icon={ check } />
+			</Styled.SelectedItemCheck>
+		</Styled.SelectItem>
+	);
+}
+
+CustomSelectItem.displayName = 'CustomSelectControlV2.Item';
+
+export default CustomSelectItem;
diff --git a/packages/components/src/custom-select-control-v2/stories/index.story.tsx b/packages/components/src/custom-select-control-v2/stories/index.story.tsx
index 2c7ae3507046bc..a3324a5fa03a47 100644
--- a/packages/components/src/custom-select-control-v2/stories/index.story.tsx
+++ b/packages/components/src/custom-select-control-v2/stories/index.story.tsx
@@ -11,25 +11,24 @@ import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { CustomSelect, CustomSelectItem } from '..';
+import CustomSelectControlV2 from '..';
 
-const meta: Meta< typeof CustomSelect > = {
-	title: 'Components (Experimental)/CustomSelectControl v2',
-	component: CustomSelect,
+const meta: Meta< typeof CustomSelectControlV2 > = {
+	title: 'Components/CustomSelectControl v2',
+	component: CustomSelectControlV2,
 	subcomponents: {
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		CustomSelectItem,
+		'CustomSelectControlV2.Item': CustomSelectControlV2.Item,
 	},
 	argTypes: {
 		children: { control: { type: null } },
-		renderSelectedValue: { control: { type: null } },
 		value: { control: { type: null } },
 	},
+	tags: [ 'status-wip' ],
 	parameters: {
 		actions: { argTypesRegex: '^on.*' },
 		controls: { expanded: true },
 		docs: {
-			canvas: { sourceState: 'shown' },
 			source: { excludeDecorators: true },
 		},
 	},
@@ -47,16 +46,12 @@ const meta: Meta< typeof CustomSelect > = {
 };
 export default meta;
 
-const Template: StoryFn< typeof CustomSelect > = ( props ) => {
-	return <CustomSelect { ...props } />;
-};
-
-const ControlledTemplate: StoryFn< typeof CustomSelect > = ( props ) => {
+const Template: StoryFn< typeof CustomSelectControlV2 > = ( props ) => {
 	const [ value, setValue ] = useState< string | string[] >();
 	return (
-		<CustomSelect
+		<CustomSelectControlV2
 			{ ...props }
-			onChange={ ( nextValue ) => {
+			onChange={ ( nextValue: string | string[] ) => {
 				setValue( nextValue );
 				props.onChange?.( nextValue );
 			} }
@@ -67,36 +62,32 @@ const ControlledTemplate: StoryFn< typeof CustomSelect > = ( props ) => {
 
 export const Default = Template.bind( {} );
 Default.args = {
-	label: 'Label',
+	label: 'Label text',
+	defaultValue: 'Select a color...',
 	children: (
 		<>
-			<CustomSelectItem value="Small">
-				<span style={ { fontSize: '75%' } }>Small</span>
-			</CustomSelectItem>
-			<CustomSelectItem value="Something bigger">
-				<span style={ { fontSize: '200%' } }>Something bigger</span>
-			</CustomSelectItem>
+			<CustomSelectControlV2.Item value="Blue">
+				<span style={ { color: 'blue' } }>Blue</span>
+			</CustomSelectControlV2.Item>
+			<CustomSelectControlV2.Item value="Purple">
+				<span style={ { color: 'purple' } }>Purple</span>
+			</CustomSelectControlV2.Item>
+			<CustomSelectControlV2.Item value="Pink">
+				<span style={ { color: 'deeppink' } }>Pink</span>
+			</CustomSelectControlV2.Item>
 		</>
 	),
 };
 
 /**
  * Multiple selection can be enabled by using an array for the `value` and
- * `defaultValue` props. The argument of the `onChange` function will also
+ * `defaultValue` props. The argument type of the `onChange` function will also
  * change accordingly.
  */
-export const MultiSelect = Template.bind( {} );
-MultiSelect.args = {
-	defaultValue: [ 'lavender', 'tangerine' ],
+export const MultipleSelection = Template.bind( {} );
+MultipleSelection.args = {
 	label: 'Select Colors',
-	renderSelectedValue: ( currentValue: string | string[] ) => {
-		if ( ! Array.isArray( currentValue ) ) {
-			return currentValue;
-		}
-		if ( currentValue.length === 0 ) return 'No colors selected';
-		if ( currentValue.length === 1 ) return currentValue[ 0 ];
-		return `${ currentValue.length } colors selected`;
-	},
+	defaultValue: [ 'lavender', 'tangerine' ],
 	children: (
 		<>
 			{ [
@@ -107,41 +98,43 @@ MultiSelect.args = {
 				'maroon',
 				'tangerine',
 			].map( ( item ) => (
-				<CustomSelectItem key={ item } value={ item }>
+				<CustomSelectControlV2.Item key={ item } value={ item }>
 					{ item }
-				</CustomSelectItem>
+				</CustomSelectControlV2.Item>
 			) ) }
 		</>
 	),
 };
 
-const renderControlledValue = ( gravatar: string | string[] ) => {
+const renderItem = ( gravatar: string | string[] ) => {
 	const avatar = `https://gravatar.com/avatar?d=${ gravatar }`;
 	return (
 		<div style={ { display: 'flex', alignItems: 'center' } }>
 			<img
 				style={ { maxHeight: '75px', marginRight: '10px' } }
-				key={ avatar }
 				src={ avatar }
 				alt=""
-				aria-hidden="true"
 			/>
 			<span>{ gravatar }</span>
 		</div>
 	);
 };
 
-export const Controlled = ControlledTemplate.bind( {} );
-Controlled.args = {
+/**
+ * The `renderSelectedValue` prop can be used to customize how the selected value
+ * is rendered in the dropdown trigger.
+ */
+export const CustomSelectedValue = Template.bind( {} );
+CustomSelectedValue.args = {
 	label: 'Default Gravatars',
-	renderSelectedValue: renderControlledValue,
+	renderSelectedValue: renderItem,
 	children: (
 		<>
 			{ [ 'mystery-person', 'identicon', 'wavatar', 'retro' ].map(
 				( option ) => (
-					<CustomSelectItem key={ option } value={ option }>
-						{ renderControlledValue( option ) }
-					</CustomSelectItem>
+					<CustomSelectControlV2.Item key={ option } value={ option }>
+						{ renderItem( option ) }
+					</CustomSelectControlV2.Item>
 				)
 			) }
 		</>
diff --git a/packages/components/src/custom-select-control-v2/styles.ts b/packages/components/src/custom-select-control-v2/styles.ts
index c04f6ac32e5ffb..2b8bdb9946b7c9 100644
--- a/packages/components/src/custom-select-control-v2/styles.ts
+++ b/packages/components/src/custom-select-control-v2/styles.ts
@@ -1,76 +1,231 @@
 /**
  * External dependencies
  */
-import styled from '@emotion/styled';
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
-
+import { css, keyframes } from '@emotion/react';
+import styled from '@emotion/styled';
 /**
  * Internal dependencies
  */
-import { COLORS } from '../utils';
+import { COLORS, CONFIG } from '../utils';
 import { space } from '../utils/space';
-import type { CustomSelectProps } from './types';
-
-export const CustomSelectLabel = styled( Ariakit.SelectLabel )`
-	font-size: 11px;
-	font-weight: 500;
-	line-height: 1.4;
-	text-transform: uppercase;
-	margin-bottom: ${ space( 2 ) };
-`;
+import { chevronIconSize } from '../select-control/styles/select-control-styles';
+import { fontSizeStyles } from '../input-control/styles/input-control-styles';
+import type { CustomSelectButtonSize } from './types';
 
-const inputHeights = {
-	default: 40,
-	small: 24,
+// TODO: extract to common utils and apply to relevant components
+const ANIMATION_PARAMS = {
+	SLIDE_AMOUNT: '2px',
+	DURATION: '400ms',
+	EASING: 'cubic-bezier( 0.16, 1, 0.3, 1 )',
 };
 
-export const CustomSelectButton = styled( Ariakit.Select, {
-	// Do not forward `hasCustomRenderProp` to the underlying Ariakit.Select component
-	shouldForwardProp: ( prop ) => prop !== 'hasCustomRenderProp',
-} )( ( {
-	size,
-	hasCustomRenderProp,
-}: {
-	size: NonNullable< CustomSelectProps[ 'size' ] >;
-	hasCustomRenderProp: boolean;
-} ) => {
-	const isSmallSize = size === 'small' && ! hasCustomRenderProp;
-	const heightProperty = hasCustomRenderProp ? 'minHeight' : 'height';
-
-	return {
-		display: 'flex',
-		justifyContent: 'space-between',
-		alignItems: 'center',
-		backgroundColor: COLORS.white,
-		border: `1px solid ${ COLORS.gray[ 600 ] }`,
-		borderRadius: space( 0.5 ),
-		cursor: 'pointer',
-		width: '100%',
-		[ heightProperty ]: `${ inputHeights[ size ] }px`,
-		padding: isSmallSize ? space( 2 ) : space( 4 ),
-		fontSize: isSmallSize ? '11px' : '13px',
-		'&[data-focus-visible]': {
-			outlineStyle: 'solid',
+const INLINE_PADDING = {
+	compact: CONFIG.controlPaddingXSmall,
+	small: CONFIG.controlPaddingXSmall,
+	default: CONFIG.controlPaddingX,
+};
+
+const getSelectSize = (
+	size: NonNullable< CustomSelectButtonSize[ 'size' ] >,
+	heightProperty: 'minHeight' | 'height'
+) => {
+	const sizes = {
+		compact: {
+			[ heightProperty ]: 32,
+			paddingInlineStart: INLINE_PADDING.compact,
+			paddingInlineEnd: INLINE_PADDING.compact + chevronIconSize,
+		},
+		default: {
+			[ heightProperty ]: 40,
+			paddingInlineStart: INLINE_PADDING.default,
+			paddingInlineEnd: INLINE_PADDING.default + chevronIconSize,
 		},
-		'&[aria-expanded="true"]': {
-			outlineStyle: `1.5px solid ${ COLORS.theme.accent }`,
+		small: {
+			[ heightProperty ]: 24,
+			paddingInlineStart: INLINE_PADDING.small,
+			paddingInlineEnd: INLINE_PADDING.small + chevronIconSize,
 		},
 	};
+
+	return sizes[ size ] || sizes.default;
+};
+
+const getSelectItemSize = (
+	size: NonNullable< CustomSelectButtonSize[ 'size' ] >
+) => {
+	// Used to visually align the checkmark with the chevron
+	const checkmarkCorrection = 6;
+	const sizes = {
+		compact: {
+			paddingInlineStart: INLINE_PADDING.compact,
+			paddingInlineEnd: INLINE_PADDING.compact - checkmarkCorrection,
+		},
+		default: {
+			paddingInlineStart: INLINE_PADDING.default,
+			paddingInlineEnd: INLINE_PADDING.default - checkmarkCorrection,
+		},
+		small: {
+			paddingInlineStart: INLINE_PADDING.small,
+			paddingInlineEnd: INLINE_PADDING.small - checkmarkCorrection,
+		},
+	};
+
+	return sizes[ size ] || sizes.default;
+};
+
+export const Select = styled( Ariakit.Select, {
+	// Do not forward `hasCustomRenderProp` to the underlying Ariakit.Select component
+	shouldForwardProp: ( prop ) => prop !== 'hasCustomRenderProp',
+} )(
+	( {
+		size,
+		hasCustomRenderProp,
+	}: {
+		size: NonNullable< CustomSelectButtonSize[ 'size' ] >;
+		hasCustomRenderProp: boolean;
+	} ) => css`
+		display: block;
+		background-color: ${ COLORS.theme.background };
+		border: none;
+		color: ${ COLORS.theme.foreground };
+		cursor: pointer;
+		font-family: inherit;
+		text-align: start;
+		user-select: none;
+		width: 100%;
+
+		&[data-focus-visible] {
+			outline: none; // handled by InputBase component
+		}
+
+		${ getSelectSize( size, hasCustomRenderProp ? 'minHeight' : 'height' ) }
+		${ ! hasCustomRenderProp && truncateStyles }
+		${ fontSizeStyles( { inputSize: size } ) }
+	`
+);
+
+const slideDownAndFade = keyframes( {
+	'0%': {
+		opacity: 0,
+		transform: `translateY(-${ ANIMATION_PARAMS.SLIDE_AMOUNT })`,
+	},
+	'100%': { opacity: 1, transform: 'translateY(0)' },
 } );
 
-export const CustomSelectPopover = styled( Ariakit.SelectPopover )`
-	border-radius: ${ space( 0.5 ) };
-	background: ${ COLORS.white };
-	border: 1px solid ${ COLORS.gray[ 900 ] };
+export const SelectPopover = styled( Ariakit.SelectPopover )`
+	display: flex;
+	flex-direction: column;
+
+	background-color: ${ COLORS.theme.background };
+	border-radius: ${ CONFIG.radiusSmall };
+	border: 1px solid ${ COLORS.theme.foreground };
+	box-shadow: ${ CONFIG.elevationMedium };
+
+	/* z-index(".components-popover") */
+	z-index: 1000000;
+
+	max-height: min( var( --popover-available-height, 400px ), 400px );
+	overflow: auto;
+	overscroll-behavior: contain;
+
+	/* The smallest size without overflowing the container. */
+	min-width: min-content;
+
+	/* Animation */
+	&[data-open] {
+		@media not ( prefers-reduced-motion ) {
+			animation-duration: ${ ANIMATION_PARAMS.DURATION };
+			animation-timing-function: ${ ANIMATION_PARAMS.EASING };
+			animation-name: ${ slideDownAndFade };
+			will-change: transform, opacity;
+		}
+	}
+
+	&[data-focus-visible] {
+		/* The outline will be on the trigger, rather than the popover. */
+		outline: none;
+	}
+`;
+
+export const SelectItem = styled( Ariakit.SelectItem )(
+	( {
+		size,
+	}: {
+		size: NonNullable< CustomSelectButtonSize[ 'size' ] >;
+	} ) => css`
+		cursor: default;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: ${ CONFIG.fontSize };
+		// TODO: reassess line-height for non-legacy v2
+		line-height: 28px;
+		padding-block: ${ space( 2 ) };
+		scroll-margin: ${ space( 1 ) };
+		user-select: none;
+
+		&[aria-disabled='true'] {
+			cursor: not-allowed;
+		}
+
+		&[data-active-item] {
+			background-color: ${ COLORS.theme.gray[ 300 ] };
+		}
+
+		${ getSelectItemSize( size ) }
+	`
+);
+
+const truncateStyles = css`
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+`;
+
+export const SelectedExperimentalHintWrapper = styled.div`
+	${ truncateStyles }
+`;
+
+export const SelectedExperimentalHintItem = styled.span`
+	color: ${ COLORS.theme.gray[ 600 ] };
+	margin-inline-start: ${ space( 2 ) };
 `;
 
-export const CustomSelectItem = styled( Ariakit.SelectItem )`
+export const WithHintItemWrapper = styled.div`
 	display: flex;
-	align-items: center;
 	justify-content: space-between;
-	padding: ${ space( 2 ) };
-	&[data-active-item] {
-		background-color: ${ COLORS.gray[ 300 ] };
+	align-items: center;
+	flex-wrap: wrap;
+	flex: 1;
+	column-gap: ${ space( 4 ) };
+`;
+
+export const WithHintItemHint = styled.span`
+	color: ${ COLORS.theme.gray[ 600 ] };
+	text-align: initial;
+	line-height: ${ CONFIG.fontLineHeightBase };
+	padding-inline-end: ${ space( 1 ) };
+	margin-block: ${ space( 1 ) };
+`;
+
+export const SelectedItemCheck = styled( Ariakit.SelectItemCheck )`
+	display: flex;
+	align-items: center;
+	margin-inline-start: ${ space( 2 ) };
+
+	// Keep the checkmark vertically aligned at the top. Since the item text has a
+	// 28px line height and the checkmark is 24px tall, a (28-24)/2 = 2px margin
+	// is applied to keep the correct alignment between the text and the checkmark.
+	align-self: start;
+	margin-block-start: 2px;
+
+	// Since the checkmark's dimensions are applied with 'em' units, setting a
+	// font size of 0 allows the space reserved for the checkmark to collapse for
+	// items that are not selected or that don't have an associated item hint.
+	font-size: 0;
+	${ WithHintItemWrapper } ~ &,
+	&:not(:empty) {
+		font-size: 24px; // Size of checkmark icon
 	}
 `;
diff --git a/packages/components/src/custom-select-control-v2/test/index.tsx b/packages/components/src/custom-select-control-v2/test/index.tsx
new file mode 100644
index 00000000000000..060a367ba8597b
--- /dev/null
+++ b/packages/components/src/custom-select-control-v2/test/index.tsx
@@ -0,0 +1,445 @@
+/**
+ * External dependencies
+ */
+import { screen } from '@testing-library/react';
+import { click, press, type } from '@ariakit/test';
+import { render } from '@ariakit/test/react';
+
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import UncontrolledCustomSelectControlV2 from '..';
+import type { CustomSelectProps } from '../types';
+
+const items = [
+	{
+		key: 'flower1',
+		value: 'violets',
+	},
+	{
+		key: 'flower2',
+		value: 'crimson clover',
+	},
+	{
+		key: 'flower3',
+		value: 'poppy',
+	},
+	{
+		key: 'color1',
+		value: 'amber',
+	},
+	{
+		key: 'color2',
+		value: 'aquamarine',
+	},
+];
+
+const defaultProps = {
+	label: 'label!',
+	children: items.map( ( { value, key } ) => (
+		<UncontrolledCustomSelectControlV2.Item value={ value } key={ key } />
+	) ),
+};
+
+const ControlledCustomSelectControl = ( props: CustomSelectProps ) => {
+	const [ value, setValue ] = useState< string | string[] >();
+	return (
+		<UncontrolledCustomSelectControlV2
+			{ ...props }
+			onChange={ ( nextValue: string | string[] ) => {
+				setValue( nextValue );
+				props.onChange?.( nextValue );
+			} }
+			value={ value }
+		/>
+	);
+};
+
+describe.each( [
+	[ 'Uncontrolled', UncontrolledCustomSelectControlV2 ],
+	[ 'Controlled', ControlledCustomSelectControl ],
+] )( 'CustomSelectControlV2 (%s)', ( ...modeAndComponent ) => {
+	const [ , Component ] = modeAndComponent;
+
+	it( 'Should replace the initial selection when a new item is selected', async () => {
+		await render( <Component { ...defaultProps } /> );
+
+		const currentSelectedItem = screen.getByRole( 'combobox', {
+			expanded: false,
+		} );
+
+		await click( currentSelectedItem );
+
+		await click(
+			screen.getByRole( 'option', {
+				name: 'crimson clover',
+			} )
+		);
+
+		expect( currentSelectedItem ).toHaveTextContent( 'crimson clover' );
+
+		await click( currentSelectedItem );
+
+		await click(
+			screen.getByRole( 'option', {
+				name: 'poppy',
+			} )
+		);
+
+		expect( currentSelectedItem ).toHaveTextContent( 'poppy' );
+	} );
+
+	it( 'Should keep current selection if dropdown is closed without changing selection', async () => {
+		await render( <Component { ...defaultProps } /> );
+
+		const currentSelectedItem = screen.getByRole( 'combobox', {
+			expanded: false,
+		} );
+
+		await press.Tab();
+		await press.Enter();
+		expect(
+			screen.getByRole( 'listbox', {
+				name: defaultProps.label,
+			} )
+		).toBeVisible();
+
+		await press.Escape();
+		expect(
+			screen.queryByRole( 'listbox', {
+				name: defaultProps.label,
+			} )
+		).not.toBeInTheDocument();
+
+		expect( currentSelectedItem ).toHaveTextContent( items[ 0 ].value );
+	} );
+
+	describe( 'Keyboard behavior and accessibility', () => {
+		it( 'Should be able to change selection using keyboard', async () => {
+			await render( <Component { ...defaultProps } /> );
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await press.Tab();
+			expect( currentSelectedItem ).toHaveFocus();
+
+			await press.Enter();
+			expect(
+				screen.getByRole( 'listbox', {
+					name: defaultProps.label,
+				} )
+			).toHaveFocus();
+
+			await press.ArrowDown();
+			await press.Enter();
+
+			expect( currentSelectedItem ).toHaveTextContent( 'crimson clover' );
+		} );
+
+		it( 'Should be able to type characters to select matching options', async () => {
+			await render( <Component { ...defaultProps } /> );
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await press.Tab();
+			await press.Enter();
+			expect(
+				screen.getByRole( 'listbox', {
+					name: defaultProps.label,
+				} )
+			).toHaveFocus();
+
+			await type( 'a' );
+			await press.Enter();
+			expect( currentSelectedItem ).toHaveTextContent( 'amber' );
+		} );
+
+		it( 'Can change selection with a focused input and closed dropdown if typed characters match an option', async () => {
+			await render( <Component { ...defaultProps } /> );
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await press.Tab();
+			expect( currentSelectedItem ).toHaveFocus();
+			expect( currentSelectedItem ).toHaveTextContent( 'violets' );
+
+			// Ideally we would test a multi-character typeahead, but anything more than a single character is flaky
+			await type( 'a' );
+
+			expect(
+				screen.queryByRole( 'listbox', {
+					name: defaultProps.label,
+					hidden: true,
+				} )
+			).not.toBeInTheDocument();
+
+			// This Enter is a workaround for flakiness, and shouldn't be necessary in an actual browser
+			await press.Enter();
+
+			expect( currentSelectedItem ).toHaveTextContent( 'amber' );
+		} );
+
+		it( 'Should have correct aria-selected value for selections', async () => {
+			await render( <Component { ...defaultProps } /> );
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await click( currentSelectedItem );
+
+			// assert that first item has aria-selected="true"
+			expect(
+				screen.getByRole( 'option', {
+					name: 'violets',
+					selected: true,
+				} )
+			).toBeVisible();
+
+			// change the current selection
+			await click( screen.getByRole( 'option', { name: 'poppy' } ) );
+
+			// click combobox to mount listbox with options again
+			await click( currentSelectedItem );
+
+			// check that first item is has aria-selected="false" after new selection
+			expect(
+				screen.getByRole( 'option', {
+					name: 'violets',
+					selected: false,
+				} )
+			).toBeVisible();
+
+			// check that new selected item now has aria-selected="true"
+			expect(
+				screen.getByRole( 'option', {
+					name: 'poppy',
+					selected: true,
+				} )
+			).toBeVisible();
+		} );
+	} );
+
+	describe( 'Multiple selection', () => {
+		it( 'Should be able to select multiple items when provided an array', async () => {
+			const onChangeMock = jest.fn();
+
+			// initial selection as defaultValue
+			const defaultValues = [
+				'incandescent glow',
+				'ultraviolet morning light',
+			];
+
+			await render(
+				<Component
+					defaultValue={ defaultValues }
+					onChange={ onChangeMock }
+					label="Multi-select"
+				>
+					{ [
+						'aurora borealis green',
+						'flamingo pink sunrise',
+						'incandescent glow',
+						'rose blush',
+						'ultraviolet morning light',
+					].map( ( item ) => (
+						<UncontrolledCustomSelectControlV2.Item
+							key={ item }
+							value={ item }
+						>
+							{ item }
+						</UncontrolledCustomSelectControlV2.Item>
+					) ) }
+				</Component>
+			);
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			// ensure more than one item is selected due to defaultValues
+			expect( currentSelectedItem ).toHaveTextContent(
+				`${ defaultValues.length } items selected`
+			);
+
+			await click( currentSelectedItem );
+
+			expect( screen.getByRole( 'listbox' ) ).toHaveAttribute(
+				'aria-multiselectable'
+			);
+
+			// ensure defaultValues are selected in list of items
+			defaultValues.forEach( ( value ) =>
+				expect(
+					screen.getByRole( 'option', {
+						name: value,
+						selected: true,
+					} )
+				).toBeVisible()
+			);
+
+			// name of next selection
+			const nextSelectionName = 'rose blush';
+
+			// element for next selection
+			const nextSelection = screen.getByRole( 'option', {
+				name: nextSelectionName,
+			} );
+
+			// click next selection to add another item to current selection
+			await click( nextSelection );
+
+			// updated array containing defaultValues + the item just selected
+			const updatedSelection = defaultValues.concat( nextSelectionName );
+
+			expect( onChangeMock ).toHaveBeenCalledWith( updatedSelection );
+
+			expect( nextSelection ).toHaveAttribute( 'aria-selected' );
+
+			// expect increased array length for current selection
+			expect( currentSelectedItem ).toHaveTextContent(
+				`${ updatedSelection.length } items selected`
+			);
+		} );
+
+		it( 'Should be able to deselect items when provided an array', async () => {
+			// initial selection as defaultValue
+			const defaultValues = [
+				'aurora borealis green',
+				'incandescent glow',
+				'key lime green',
+				'rose blush',
+				'ultraviolet morning light',
+			];
+
+			await render(
+				<Component defaultValue={ defaultValues } label="Multi-select">
+					{ defaultValues.map( ( item ) => (
+						<UncontrolledCustomSelectControlV2.Item
+							key={ item }
+							value={ item }
+						>
+							{ item }
+						</UncontrolledCustomSelectControlV2.Item>
+					) ) }
+				</Component>
+			);
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await click( currentSelectedItem );
+
+			// Array containing items to deselect
+			const nextSelection = [
+				'aurora borealis green',
+				'rose blush',
+				'incandescent glow',
+			];
+
+			// Deselect some items by clicking them to ensure that changes
+			// are reflected correctly
+			await Promise.all(
+				nextSelection.map( async ( value ) => {
+					await click(
+						screen.getByRole( 'option', { name: value } )
+					);
+					expect(
+						screen.getByRole( 'option', {
+							name: value,
+							selected: false,
+						} )
+					).toBeVisible();
+				} )
+			);
+
+			// expect different array length from defaultValues due to deselecting items
+			expect( currentSelectedItem ).toHaveTextContent(
+				`${
+					defaultValues.length - nextSelection.length
+				} items selected`
+			);
+		} );
+	} );
+
+	it( 'Should allow rendering a custom value when using `renderSelectedValue`', async () => {
+		const renderValue = ( value: string | string[] ) => {
+			return <img src={ `${ value }.jpg` } alt={ value as string } />;
+		};
+
+		await render(
+			<Component label="Rendered" renderSelectedValue={ renderValue }>
+				<UncontrolledCustomSelectControlV2.Item value="april-29">
+					{ renderValue( 'april-29' ) }
+				</UncontrolledCustomSelectControlV2.Item>
+				<UncontrolledCustomSelectControlV2.Item value="july-9">
+					{ renderValue( 'july-9' ) }
+				</UncontrolledCustomSelectControlV2.Item>
+			</Component>
+		);
+
+		const currentSelectedItem = screen.getByRole( 'combobox', {
+			expanded: false,
+		} );
+
+		expect( currentSelectedItem ).toBeVisible();
+
+		// expect that the initial selection renders an image
+		expect( currentSelectedItem ).toContainElement(
+			screen.getByRole( 'img', { name: 'april-29' } )
+		);
+
+		expect(
+			screen.queryByRole( 'img', { name: 'july-9' } )
+		).not.toBeInTheDocument();
+
+		await click( currentSelectedItem );
+
+		// expect that the other image is only visible after opening popover with options
+		expect( screen.getByRole( 'img', { name: 'july-9' } ) ).toBeVisible();
+		expect(
+			screen.getByRole( 'option', { name: 'july-9' } )
+		).toBeVisible();
+	} );
+
+	it( 'Should open the select popover when focussing the trigger button and pressing arrow down', async () => {
+		await render( <Component { ...defaultProps } /> );
+
+		const currentSelectedItem = screen.getByRole( 'combobox', {
+			expanded: false,
+		} );
+
+		await press.Tab();
+		expect( currentSelectedItem ).toHaveFocus();
+		expect( currentSelectedItem ).toHaveTextContent( items[ 0 ].value );
+
+		await press.ArrowDown();
+		expect(
+			screen.getByRole( 'listbox', {
+				name: defaultProps.label,
+			} )
+		).toBeVisible();
+	} );
+
+	it( 'Should label the component correctly even when the label is not visible', async () => {
+		await render( <Component { ...defaultProps } hideLabelFromVision /> );
+
+		expect(
+			screen.getByRole( 'combobox', {
+				name: defaultProps.label,
+			} )
+		).toBeVisible();
+	} );
+} );
diff --git a/packages/components/src/custom-select-control-v2/types.ts b/packages/components/src/custom-select-control-v2/types.ts
index 2aecc1d4746f5c..a31598c1db3ead 100644
--- a/packages/components/src/custom-select-control-v2/types.ts
+++ b/packages/components/src/custom-select-control-v2/types.ts
@@ -1,32 +1,38 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import type * as Ariakit from '@ariakit/react';
 
-export type CustomSelectContext =
-	| {
-			/**
-			 * The store object returned by Ariakit's `useSelectStore` hook.
-			 */
-			store: Ariakit.SelectStore;
-	  }
-	| undefined;
-
-export type CustomSelectProps = {
+export type CustomSelectStore = {
 	/**
-	 * The child elements. This should be composed of CustomSelectItem components.
+	 * The store object returned by Ariakit's `useSelectStore` hook.
 	 */
-	children: React.ReactNode;
+	store: Ariakit.SelectStore;
+};
+
+type CustomSelectSize< Size = 'compact' | 'default' > = {
 	/**
-	 * An optional default value for the control. If left `undefined`, the first
-	 * non-disabled item will be used.
+	 * The size of the control.
+	 *
+	 * @default 'default'
 	 */
-	defaultValue?: string | string[];
+	size?: Size;
+};
+
+export type CustomSelectButtonSize = CustomSelectSize<
+	'compact' | 'default' | 'small'
+>;
+
+export type CustomSelectContext =
+	| ( CustomSelectStore & CustomSelectButtonSize )
+	| undefined;
+
+export type CustomSelectButtonProps = {
 	/**
-	 * Label for the control.
+	 * An optional default value for the control when used in uncontrolled mode.
+	 * If left `undefined`, the first non-disabled item will be used.
 	 */
-	label: string;
+	defaultValue?: string | string[];
 	/**
 	 * A function that receives the new value of the input.
 	 */
@@ -38,17 +44,43 @@ export type CustomSelectProps = {
 		selectedValue: string | string[]
 	) => React.ReactNode;
 	/**
-	 * The size of the control.
+	 * The value of the control when used in uncontrolled mode.
+	 */
+	value?: string | string[];
+};
+
+// Props only exposed on the internal implementation
+export type _CustomSelectInternalProps = {
+	/**
+	 * True if the consumer is emulating the legacy component behavior and look
+	 */
+	isLegacy?: boolean;
+};
+
+// Props that are exposed in exported components
+export type _CustomSelectProps = CustomSelectButtonProps & {
+	/**
+	 * Additional className added to the root wrapper element.
+	 */
+	className?: string;
+	/**
+	 * The child elements. This should be composed of `CustomSelectItem` components.
+	 */
+	children: React.ReactNode;
+	/**
+	 * Used to visually hide the label. It will always be visible to screen readers.
 	 *
-	 * @default 'default'
+	 * @default false
 	 */
-	size?: 'default' | 'small';
+	hideLabelFromVision?: boolean;
 	/**
-	 * Can be used to externally control the value of the control.
+	 * Accessible label for the control.
 	 */
-	value?: string | string[];
+	label: string;
 };
 
+export type CustomSelectProps = _CustomSelectProps & CustomSelectSize;
+
 export type CustomSelectItemProps = {
 	/**
 	 * The value of the select item. This will be used as the children if
@@ -60,4 +92,11 @@ export type CustomSelectItemProps = {
 	 * used if left `undefined`.
 	 */
 	children?: React.ReactNode;
+	/**
+	 * If true, the item will be disabled.
+	 *
+	 * You will need to add your own styles (e.g. reduced opacity) to visually show that they are disabled.
+	 * @default false
+	 */
+	disabled?: boolean;
 };
diff --git a/packages/components/src/custom-select-control/README.md b/packages/components/src/custom-select-control/README.md
index 696fca338e465c..a764a0df133eab 100644
--- a/packages/components/src/custom-select-control/README.md
+++ b/packages/components/src/custom-select-control/README.md
@@ -2,12 +2,6 @@
 
 `CustomSelectControl` allows users to select an item from a single-option menu just like [`SelectControl`](/packages/components/src/select-control/readme.md), with the addition of being able to provide custom styles for each item in the menu. This means it does not use a native `<select>`, so should only be used if the custom styling is necessary.
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 These are the same as [the ones for `SelectControl`s](/packages/components/src/select-control/readme.md#design-guidelines).
@@ -47,7 +41,6 @@ function MyCustomSelectControl() {
 	const [ , setFontSize ] = useState();
 	return (
 		<CustomSelectControl
-			__nextUnconstrainedWidth
 			label="Font Size"
 			options={ options }
 			onChange={ ( { selectedItem } ) => setFontSize( selectedItem ) }
@@ -59,7 +52,6 @@ function MyControlledCustomSelectControl() {
 	const [ fontSize, setFontSize ] = useState( options[ 0 ] );
 	return (
 		<CustomSelectControl
-			__nextUnconstrainedWidth
 			label="Font Size"
 			options={ options }
 			onChange={ ( { selectedItem } ) => setFontSize( selectedItem ) }
@@ -71,91 +63,92 @@ function MyControlledCustomSelectControl() {
 
 ### Props
 
-#### className
+#### `className`: `string`
 
-A custom class name to append to the outer `<div>`.
+Optional classname for the component.
 
--   Type: `String`
 -   Required: No
 
-#### hideLabelFromVision
+#### `hideLabelFromVision`: `boolean`
 
-Used to visually hide the label. It will always be visible to screen readers.
+Hide the label visually, while keeping available to assistive technology.
 
--   Type: `Boolean`
 -   Required: No
 
-#### label
+#### `describedBy`: `string`
 
-The label for the control.
+Description for the select trigger button used by assistive technology. If no value is passed, the text "Currently selected: selectedItem.name" will be used fully translated.
+
+-   Required: No
+
+#### `label`: `string`
+
+Label for the control.
 
--   Type: `String`
 -   Required: Yes
 
-#### describedBy
+#### `onChange`: `( newValue: ChangeObject ) => void`
 
-Pass in a description that will be shown to screen readers associated with the select trigger button. If no value is passed, the text "Currently selected: selectedItem.name" will be used fully translated.
+Function called with the control's internal state changes. The `selectedItem` property contains the next selected item.
 
--   Type: `String`
 -   Required: No
 
-#### options
+#### `options`: `Array< Option >`
 
-The options that can be chosen from.
+The list of options that can be chosen from.
 
--   Type: `Array<{ key: String, name: String, style: ?{}, className: ?String, ...rest }>`
 -   Required: Yes
 
-#### onChange
+#### `size`: `'default' | 'small' | '\_\_unstable-large'`
 
-Function called with the control's internal state changes. The `selectedItem` property contains the next selected item.
+The size of the control.
 
--   Type: `Function`
+-   Default: `'default'`
 -   Required: No
 
-#### value
+#### `showSelectedHint`: `boolean`
 
-Can be used to externally control the value of the control, like in the `MyControlledCustomSelectControl` example above.
+Show the hint of the selected item in the trigger button.
 
--   Type: `Object`
 -   Required: No
 
-#### __nextUnconstrainedWidth
+#### `value`: `Option`
 
-Start opting into the unconstrained width style that will become the default in a future version, currently scheduled to be WordPress 6.4. (The prop can be safely removed once this happens.)
+Can be used to externally control the value of the control, like in the `MyControlledCustomSelectControl` example above.
 
--   Type: `Boolean`
 -   Required: No
--   Default: `false`
 
-#### onMouseOver
+#### `onMouseOver`: `MouseEventHandler< HTMLButtonElement >`
 
-A handler for onMouseOver events.
+A handler for `mouseover` events on the trigger button.
 
--   Type: `Function`
 -   Required: No
 
-#### onMouseOut
+#### `onMouseOut`: `MouseEventHandler< HTMLButtonElement >`
 
-A handler for onMouseOut events.
+A handler for `mouseout` events on the trigger button.
 
--   Type: `Function`
 -   Required: No
 
-#### onFocus
+#### `onFocus`: `FocusEventHandler< HTMLButtonElement >`
 
-A handler for onFocus events.
+A handler for `focus` events on the trigger button.
 
--   Type: `Function`
 -   Required: No
 
-#### onBlur
+#### `onBlur`: `FocusEventHandler< HTMLButtonElement >`
 
-A handler for onBlur events.
+A handler for `blur` events on the trigger button.
 
--   Type: `Function`
 -   Required: No
 
+#### `__next40pxDefaultSize`: `boolean`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+- Required: No
+- Default: `false`
+
 ## Related components
 
 -   Like this component, but implemented using a native `<select>` for when custom styling is not necessary, the `SelectControl` component.
diff --git a/packages/components/src/custom-select-control/index.js b/packages/components/src/custom-select-control/index.js
deleted file mode 100644
index ed9e73e525e449..00000000000000
--- a/packages/components/src/custom-select-control/index.js
+++ /dev/null
@@ -1,273 +0,0 @@
-// @ts-nocheck
-/**
- * External dependencies
- */
-import { useSelect } from 'downshift';
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { Icon, check } from '@wordpress/icons';
-import { __, sprintf } from '@wordpress/i18n';
-import { useCallback, useState } from '@wordpress/element';
-import deprecated from '@wordpress/deprecated';
-
-/**
- * Internal dependencies
- */
-import { VisuallyHidden } from '../visually-hidden';
-import { Select as SelectControlSelect } from '../select-control/styles/select-control-styles';
-import SelectControlChevronDown from '../select-control/chevron-down';
-import { InputBaseWithBackCompatMinWidth } from './styles';
-import { StyledLabel } from '../base-control/styles/base-control-styles';
-import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props';
-
-const itemToString = ( item ) => item?.name;
-// This is needed so that in Windows, where
-// the menu does not necessarily open on
-// key up/down, you can still switch between
-// options with the menu closed.
-const stateReducer = (
-	{ selectedItem },
-	{ type, changes, props: { items } }
-) => {
-	switch ( type ) {
-		case useSelect.stateChangeTypes.ToggleButtonKeyDownArrowDown:
-			// If we already have a selected item, try to select the next one,
-			// without circular navigation. Otherwise, select the first item.
-			return {
-				selectedItem:
-					items[
-						selectedItem
-							? Math.min(
-									items.indexOf( selectedItem ) + 1,
-									items.length - 1
-							  )
-							: 0
-					],
-			};
-		case useSelect.stateChangeTypes.ToggleButtonKeyDownArrowUp:
-			// If we already have a selected item, try to select the previous one,
-			// without circular navigation. Otherwise, select the last item.
-			return {
-				selectedItem:
-					items[
-						selectedItem
-							? Math.max( items.indexOf( selectedItem ) - 1, 0 )
-							: items.length - 1
-					],
-			};
-		default:
-			return changes;
-	}
-};
-
-export default function CustomSelectControl( props ) {
-	const {
-		/** Start opting into the larger default height that will become the default size in a future version. */
-		__next40pxDefaultSize = false,
-		/** Start opting into the unconstrained width that will become the default in a future version. */
-		__nextUnconstrainedWidth = false,
-		className,
-		hideLabelFromVision,
-		label,
-		describedBy,
-		options: items,
-		onChange: onSelectedItemChange,
-		/** @type {import('../select-control/types').SelectControlProps.size} */
-		size = 'default',
-		value: _selectedItem,
-		onMouseOver,
-		onMouseOut,
-		onFocus,
-		onBlur,
-		__experimentalShowSelectedHint = false,
-	} = useDeprecated36pxDefaultSizeProp(
-		props,
-		'wp.components.CustomSelectControl',
-		'6.4'
-	);
-
-	const {
-		getLabelProps,
-		getToggleButtonProps,
-		getMenuProps,
-		getItemProps,
-		isOpen,
-		highlightedIndex,
-		selectedItem,
-	} = useSelect( {
-		initialSelectedItem: items[ 0 ],
-		items,
-		itemToString,
-		onSelectedItemChange,
-		...( typeof _selectedItem !== 'undefined' && _selectedItem !== null
-			? { selectedItem: _selectedItem }
-			: undefined ),
-		stateReducer,
-	} );
-
-	const [ isFocused, setIsFocused ] = useState( false );
-
-	function handleOnFocus( e ) {
-		setIsFocused( true );
-		onFocus?.( e );
-	}
-
-	function handleOnBlur( e ) {
-		setIsFocused( false );
-		onBlur?.( e );
-	}
-
-	if ( ! __nextUnconstrainedWidth ) {
-		deprecated(
-			'Constrained width styles for wp.components.CustomSelectControl',
-			{
-				since: '6.1',
-				version: '6.4',
-				hint: 'Set the `__nextUnconstrainedWidth` prop to true to start opting into the new styles, which will become the default in a future version',
-			}
-		);
-	}
-
-	function getDescribedBy() {
-		if ( describedBy ) {
-			return describedBy;
-		}
-
-		if ( ! selectedItem ) {
-			return __( 'No selection' );
-		}
-
-		// translators: %s: The selected option.
-		return sprintf( __( 'Currently selected: %s' ), selectedItem.name );
-	}
-
-	const menuProps = getMenuProps( {
-		className: 'components-custom-select-control__menu',
-		'aria-hidden': ! isOpen,
-	} );
-
-	const onKeyDownHandler = useCallback(
-		( e ) => {
-			e.stopPropagation();
-			menuProps?.onKeyDown?.( e );
-		},
-		[ menuProps ]
-	);
-
-	// We need this here, because the null active descendant is not fully ARIA compliant.
-	if (
-		menuProps[ 'aria-activedescendant' ]?.startsWith( 'downshift-null' )
-	) {
-		delete menuProps[ 'aria-activedescendant' ];
-	}
-	return (
-		<div
-			className={ classnames(
-				'components-custom-select-control',
-				className
-			) }
-		>
-			{ hideLabelFromVision ? (
-				<VisuallyHidden as="label" { ...getLabelProps() }>
-					{ label }
-				</VisuallyHidden>
-			) : (
-				/* eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for */
-				<StyledLabel
-					{ ...getLabelProps( {
-						className: 'components-custom-select-control__label',
-					} ) }
-				>
-					{ label }
-				</StyledLabel>
-			) }
-			<InputBaseWithBackCompatMinWidth
-				__next40pxDefaultSize={ __next40pxDefaultSize }
-				__nextUnconstrainedWidth={ __nextUnconstrainedWidth }
-				isFocused={ isOpen || isFocused }
-				__unstableInputWidth={
-					__nextUnconstrainedWidth ? undefined : 'auto'
-				}
-				labelPosition={ __nextUnconstrainedWidth ? undefined : 'top' }
-				size={ size }
-				suffix={ <SelectControlChevronDown /> }
-			>
-				<SelectControlSelect
-					onMouseOver={ onMouseOver }
-					onMouseOut={ onMouseOut }
-					as="button"
-					onFocus={ handleOnFocus }
-					onBlur={ handleOnBlur }
-					selectSize={ size }
-					__next40pxDefaultSize={ __next40pxDefaultSize }
-					{ ...getToggleButtonProps( {
-						// This is needed because some speech recognition software don't support `aria-labelledby`.
-						'aria-label': label,
-						'aria-labelledby': undefined,
-						className: 'components-custom-select-control__button',
-						describedBy: getDescribedBy(),
-					} ) }
-				>
-					{ itemToString( selectedItem ) }
-					{ __experimentalShowSelectedHint &&
-						selectedItem.__experimentalHint && (
-							<span className="components-custom-select-control__hint">
-								{ selectedItem.__experimentalHint }
-							</span>
-						) }
-				</SelectControlSelect>
-			</InputBaseWithBackCompatMinWidth>
-			{ /* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */ }
-			<ul { ...menuProps } onKeyDown={ onKeyDownHandler }>
-				{ isOpen &&
-					items.map( ( item, index ) => (
-						// eslint-disable-next-line react/jsx-key
-						<li
-							{ ...getItemProps( {
-								item,
-								index,
-								key: item.key,
-								className: classnames(
-									item.className,
-									'components-custom-select-control__item',
-									{
-										'is-highlighted':
-											index === highlightedIndex,
-										'has-hint': !! item.__experimentalHint,
-										'is-next-40px-default-size':
-											__next40pxDefaultSize,
-									}
-								),
-								style: item.style,
-							} ) }
-						>
-							{ item.name }
-							{ item.__experimentalHint && (
-								<span className="components-custom-select-control__item-hint">
-									{ item.__experimentalHint }
-								</span>
-							) }
-							{ item === selectedItem && (
-								<Icon
-									icon={ check }
-									className="components-custom-select-control__item-icon"
-								/>
-							) }
-						</li>
-					) ) }
-			</ul>
-		</div>
-	);
-}
-
-export function StableCustomSelectControl( props ) {
-	return (
-		<CustomSelectControl
-			{ ...props }
-			__experimentalShowSelectedHint={ false }
-		/>
-	);
-}
diff --git a/packages/components/src/custom-select-control/index.tsx b/packages/components/src/custom-select-control/index.tsx
new file mode 100644
index 00000000000000..ecd9dc37a8f491
--- /dev/null
+++ b/packages/components/src/custom-select-control/index.tsx
@@ -0,0 +1,206 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId } from '@wordpress/compose';
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import _CustomSelect from '../custom-select-control-v2/custom-select';
+import CustomSelectItem from '../custom-select-control-v2/item';
+import * as Styled from '../custom-select-control-v2/styles';
+import type { CustomSelectProps, CustomSelectOption } from './types';
+import { VisuallyHidden } from '../visually-hidden';
+
+function useDeprecatedProps< T extends CustomSelectOption >( {
+	__experimentalShowSelectedHint,
+	...otherProps
+}: CustomSelectProps< T > ) {
+	return {
+		showSelectedHint: __experimentalShowSelectedHint,
+		...otherProps,
+	};
+}
+
+// The removal of `__experimentalHint` in favour of `hint` doesn't happen in
+// the `useDeprecatedProps` hook in order not to break consumers that rely
+// on object identity (see https://github.com/WordPress/gutenberg/pull/63248#discussion_r1672213131)
+function applyOptionDeprecations( {
+	__experimentalHint,
+	...rest
+}: CustomSelectOption ) {
+	return {
+		hint: __experimentalHint,
+		...rest,
+	};
+}
+
+function getDescribedBy( currentValue: string, describedBy?: string ) {
+	if ( describedBy ) {
+		return describedBy;
+	}
+
+	// translators: %s: The selected option.
+	return sprintf( __( 'Currently selected: %s' ), currentValue );
+}
+
+function CustomSelectControl< T extends CustomSelectOption >(
+	props: CustomSelectProps< T >
+) {
+	const {
+		__next40pxDefaultSize = false,
+		describedBy,
+		options,
+		onChange,
+		size = 'default',
+		value,
+		className: classNameProp,
+		showSelectedHint = false,
+		...restProps
+	} = useDeprecatedProps( props );
+
+	const descriptionId = useInstanceId(
+		CustomSelectControl,
+		'custom-select-control__description'
+	);
+
+	// Forward props + store from v2 implementation
+	const store = Ariakit.useSelectStore< string >( {
+		async setValue( nextValue ) {
+			const nextOption = options.find(
+				( item ) => item.name === nextValue
+			);
+
+			if ( ! onChange || ! nextOption ) {
+				return;
+			}
+
+			// Executes the logic in a microtask after the popup is closed.
+			// This is simply to ensure the isOpen state matches the one from the
+			// previous legacy implementation.
+			await Promise.resolve();
+			const state = store.getState();
+
+			const changeObject = {
+				highlightedIndex: state.renderedItems.findIndex(
+					( item ) => item.value === nextValue
+				),
+				inputValue: '',
+				isOpen: state.open,
+				selectedItem: nextOption,
+				type: '',
+			};
+			onChange( changeObject );
+		},
+		value: value?.name,
+		// Setting the first option as a default value when no value is provided
+		// is already done natively by the underlying Ariakit component,
+		// but doing this explicitly avoids the `onChange` callback from firing
+		// on initial render, thus making this implementation closer to the v1.
+		defaultValue: options[ 0 ]?.name,
+	} );
+
+	const children = options
+		.map( applyOptionDeprecations )
+		.map( ( { name, key, hint, style, className } ) => {
+			const withHint = (
+				<Styled.WithHintItemWrapper>
+					<span>{ name }</span>
+					<Styled.WithHintItemHint
+						// Keeping the classname for legacy reasons
+						className="components-custom-select-control__item-hint"
+					>
+						{ hint }
+					</Styled.WithHintItemHint>
+				</Styled.WithHintItemWrapper>
+			);
+
+			return (
+				<CustomSelectItem
+					key={ key }
+					value={ name }
+					children={ hint ? withHint : name }
+					style={ style }
+					className={ clsx(
+						className,
+						// Keeping the classnames for legacy reasons
+						'components-custom-select-control__item',
+						{
+							'has-hint': hint,
+						}
+					) }
+				/>
+			);
+		} );
+
+	const { value: currentValue } = store.getState();
+
+	const renderSelectedValueHint = () => {
+		const selectedOptionHint = options
+			?.map( applyOptionDeprecations )
+			?.find( ( { name } ) => currentValue === name )?.hint;
+
+		return (
+			<Styled.SelectedExperimentalHintWrapper>
+				{ currentValue }
+				{ selectedOptionHint && (
+					<Styled.SelectedExperimentalHintItem
+						// Keeping the classname for legacy reasons
+						className="components-custom-select-control__hint"
+					>
+						{ selectedOptionHint }
+					</Styled.SelectedExperimentalHintItem>
+				) }
+			</Styled.SelectedExperimentalHintWrapper>
+		);
+	};
+
+	const translatedSize = ( () => {
+		if (
+			( __next40pxDefaultSize && size === 'default' ) ||
+			size === '__unstable-large'
+		) {
+			return 'default';
+		}
+		if ( ! __next40pxDefaultSize && size === 'default' ) {
+			return 'compact';
+		}
+		return size;
+	} )();
+
+	return (
+		<>
+			<_CustomSelect
+				aria-describedby={ descriptionId }
+				renderSelectedValue={
+					showSelectedHint ? renderSelectedValueHint : undefined
+				}
+				size={ translatedSize }
+				store={ store }
+				className={ clsx(
+					// Keeping the classname for legacy reasons
+					'components-custom-select-control',
+					classNameProp
+				) }
+				isLegacy
+				{ ...restProps }
+			>
+				{ children }
+			</_CustomSelect>
+			<VisuallyHidden>
+				<span id={ descriptionId }>
+					{ getDescribedBy( currentValue, describedBy ) }
+				</span>
+			</VisuallyHidden>
+		</>
+	);
+}
+
+export default CustomSelectControl;
diff --git a/packages/components/src/custom-select-control/stories/index.story.js b/packages/components/src/custom-select-control/stories/index.story.js
deleted file mode 100644
index d8fea5c7baa003..00000000000000
--- a/packages/components/src/custom-select-control/stories/index.story.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Internal dependencies
- */
-import CustomSelectControl from '..';
-
-export default {
-	title: 'Components/CustomSelectControl',
-	component: CustomSelectControl,
-	argTypes: {
-		__next40pxDefaultSize: { control: { type: 'boolean' } },
-		__experimentalShowSelectedHint: { control: { type: 'boolean' } },
-		size: {
-			options: [ 'small', 'default', '__unstable-large' ],
-			control: {
-				type: 'radio',
-			},
-		},
-	},
-};
-
-export const Default = CustomSelectControl.bind( {} );
-Default.args = {
-	__nextUnconstrainedWidth: true,
-	label: 'Label',
-	options: [
-		{
-			key: 'small',
-			name: 'Small',
-			style: { fontSize: '50%' },
-		},
-		{
-			key: 'normal',
-			name: 'Normal',
-			style: { fontSize: '100%' },
-			className: 'can-apply-custom-class-to-option',
-		},
-		{
-			key: 'large',
-			name: 'Large',
-			style: { fontSize: '200%' },
-		},
-		{
-			key: 'huge',
-			name: 'Huge',
-			style: { fontSize: '300%' },
-		},
-	],
-};
-
-export const WithLongLabels = CustomSelectControl.bind( {} );
-WithLongLabels.args = {
-	...Default.args,
-	options: [
-		{
-			key: 'reallylonglabel1',
-			name: 'Really long labels are good for stress testing',
-		},
-		{
-			key: 'reallylonglabel2',
-			name: 'But they can take a long time to type.',
-		},
-		{
-			key: 'reallylonglabel3',
-			name: 'That really is ok though because you should stress test your UIs.',
-		},
-	],
-};
-
-export const WithHints = CustomSelectControl.bind( {} );
-WithHints.args = {
-	...Default.args,
-	options: [
-		{
-			key: 'thumbnail',
-			name: 'Thumbnail',
-			__experimentalHint: '150x150',
-		},
-		{
-			key: 'medium',
-			name: 'Medium',
-			__experimentalHint: '250x250',
-		},
-		{
-			key: 'large',
-			name: 'Large',
-			__experimentalHint: '1024x1024',
-		},
-		{
-			key: 'full',
-			name: 'Full Size',
-			__experimentalHint: '1600x1600',
-		},
-	],
-};
diff --git a/packages/components/src/custom-select-control/stories/index.story.tsx b/packages/components/src/custom-select-control/stories/index.story.tsx
new file mode 100644
index 00000000000000..836fc540c6d1ed
--- /dev/null
+++ b/packages/components/src/custom-select-control/stories/index.story.tsx
@@ -0,0 +1,135 @@
+/**
+ * External dependencies
+ */
+import type { Meta, StoryFn } from '@storybook/react';
+
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import CustomSelectControl from '..';
+
+const meta: Meta< typeof CustomSelectControl > = {
+	title: 'Components/CustomSelectControl',
+	component: CustomSelectControl,
+	argTypes: {
+		onChange: { control: { type: null } },
+		value: { control: { type: null } },
+	},
+	parameters: {
+		actions: { argTypesRegex: '^on.*' },
+		controls: { expanded: true },
+		docs: {
+			source: { excludeDecorators: true },
+		},
+	},
+	decorators: [
+		( Story ) => (
+			<div
+				style={ {
+					minHeight: '150px',
+				} }
+			>
+				<Story />
+			</div>
+		),
+	],
+};
+export default meta;
+
+const Template: StoryFn< typeof CustomSelectControl > = ( props ) => {
+	const [ value, setValue ] = useState( props.options[ 0 ] );
+
+	const onChange: React.ComponentProps<
+		typeof CustomSelectControl
+	>[ 'onChange' ] = ( changeObject ) => {
+		setValue( changeObject.selectedItem );
+		props.onChange?.( changeObject );
+	};
+
+	return (
+		<CustomSelectControl
+			{ ...props }
+			onChange={ onChange }
+			value={ value }
+		/>
+	);
+};
+
+export const Default = Template.bind( {} );
+Default.args = {
+	label: 'Label',
+	options: [
+		{
+			key: 'small',
+			name: 'Small',
+			style: { fontSize: '50%' },
+		},
+		{
+			key: 'normal',
+			name: 'Normal',
+			style: { fontSize: '100%' },
+			className: 'can-apply-custom-class-to-option',
+		},
+		{
+			key: 'large',
+			name: 'Large',
+			style: { fontSize: '200%' },
+		},
+		{
+			key: 'huge',
+			name: 'Huge',
+			style: { fontSize: '300%' },
+		},
+	],
+};
+
+export const WithLongLabels = Template.bind( {} );
+WithLongLabels.args = {
+	...Default.args,
+	options: [
+		{
+			key: 'reallylonglabel1',
+			name: 'Really long labels are good for stress testing',
+		},
+		{
+			key: 'reallylonglabel2',
+			name: 'But they can take a long time to type.',
+		},
+		{
+			key: 'reallylonglabel3',
+			name: 'That really is ok though because you should stress test your UIs.',
+		},
+	],
+};
+
+export const WithHints = Template.bind( {} );
+WithHints.args = {
+	...Default.args,
+	options: [
+		{
+			key: 'thumbnail',
+			name: 'Thumbnail',
+			hint: '150x150',
+		},
+		{
+			key: 'medium',
+			name: 'Medium',
+			hint: '250x250',
+		},
+		{
+			key: 'large',
+			name: 'Large',
+			hint: '1024x1024',
+		},
+		{
+			key: 'full',
+			name: 'Full Size',
+			hint: '1600x1600',
+		},
+	],
+};
diff --git a/packages/components/src/custom-select-control/style.scss b/packages/components/src/custom-select-control/style.scss
deleted file mode 100644
index 06c912cd510f91..00000000000000
--- a/packages/components/src/custom-select-control/style.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-.components-custom-select-control {
-	position: relative;
-	font-size: $default-font-size;
-}
-
-.components-custom-select-control__button {
-	position: relative;
-	text-align: left;
-	outline: 0; // focus ring is handled elsewhere
-}
-
-.components-custom-select-control__hint {
-	color: $gray-600;
-	margin-left: 10px;
-}
-
-.components-custom-select-control__menu {
-	// Hide when collapsed.
-	&[aria-hidden="true"] {
-		display: none;
-	}
-
-	// Block UI appearance.
-	border: $border-width solid $gray-900;
-	background-color: $white;
-	border-radius: $radius-block-ui;
-	outline: none;
-	transition: none;
-
-	max-height: 400px;
-	min-width: 100%;
-	overflow: auto;
-	padding: 0;
-	position: absolute;
-	z-index: z-index(".components-popover");
-}
-
-.components-custom-select-control__item {
-	align-items: center;
-	display: grid;
-	grid-template-columns: auto auto;
-	list-style-type: none;
-	padding: $grid-unit-10 $grid-unit-20;
-	cursor: default;
-	line-height: $icon-size + $grid-unit-05;
-
-	&:not(.is-next-40px-default-size) {
-		padding: $grid-unit-10;
-	}
-
-	&.has-hint {
-		grid-template-columns: auto auto 30px;
-	}
-	&.is-highlighted {
-		background: $gray-300;
-	}
-	.components-custom-select-control__item-hint {
-		color: $gray-600;
-		text-align: right;
-		padding-right: $grid-unit-05;
-	}
-	.components-custom-select-control__item-icon {
-		margin-left: auto;
-	}
-
-	&:last-child {
-		margin-bottom: 0;
-	}
-}
diff --git a/packages/components/src/custom-select-control/styles.ts b/packages/components/src/custom-select-control/styles.ts
deleted file mode 100644
index e16b5d0b7bdd7a..00000000000000
--- a/packages/components/src/custom-select-control/styles.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * External dependencies
- */
-import { css } from '@emotion/react';
-import styled from '@emotion/styled';
-
-/**
- * Internal dependencies
- */
-import InputBase from '../input-control/input-base';
-import { Container as InputControlContainer } from '../input-control/styles/input-control-styles';
-
-type BackCompatMinWidthProps = {
-	__nextUnconstrainedWidth: boolean;
-};
-
-const backCompatMinWidth = ( props: BackCompatMinWidthProps ) =>
-	! props.__nextUnconstrainedWidth
-		? css`
-				${ InputControlContainer } {
-					min-width: 130px;
-				}
-		  `
-		: '';
-
-export const InputBaseWithBackCompatMinWidth = styled( InputBase )`
-	${ backCompatMinWidth }
-`;
diff --git a/packages/components/src/custom-select-control/test/index.js b/packages/components/src/custom-select-control/test/index.js
deleted file mode 100644
index 150afe4aa75f51..00000000000000
--- a/packages/components/src/custom-select-control/test/index.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-/**
- * Internal dependencies
- */
-import CustomSelectControl from '..';
-
-describe( 'CustomSelectControl', () => {
-	it( 'Captures the keypress event and does not let it propagate', async () => {
-		const user = userEvent.setup();
-		const onKeyDown = jest.fn();
-		const options = [
-			{
-				key: 'one',
-				name: 'Option one',
-			},
-			{
-				key: 'two',
-				name: 'Option two',
-			},
-			{
-				key: 'three',
-				name: 'Option three',
-			},
-		];
-
-		render(
-			<div
-				// This role="none" is required to prevent an eslint warning about accessibility.
-				role="none"
-				onKeyDown={ onKeyDown }
-			>
-				<CustomSelectControl
-					options={ options }
-					__nextUnconstrainedWidth
-				/>
-			</div>
-		);
-		const toggleButton = screen.getByRole( 'button' );
-		await user.click( toggleButton );
-
-		const customSelect = screen.getByRole( 'listbox' );
-		await user.type( customSelect, '{enter}' );
-
-		expect( onKeyDown ).toHaveBeenCalledTimes( 0 );
-	} );
-
-	it( 'does not show selected hint by default', () => {
-		render(
-			<CustomSelectControl
-				label="Custom select"
-				options={ [
-					{
-						key: 'one',
-						name: 'One',
-						__experimentalHint: 'Hint',
-					},
-				] }
-				__nextUnconstrainedWidth
-			/>
-		);
-		expect(
-			screen.getByRole( 'button', { name: 'Custom select' } )
-		).not.toHaveTextContent( 'Hint' );
-	} );
-
-	it( 'shows selected hint when __experimentalShowSelectedHint is set', () => {
-		render(
-			<CustomSelectControl
-				label="Custom select"
-				options={ [
-					{
-						key: 'one',
-						name: 'One',
-						__experimentalHint: 'Hint',
-					},
-				] }
-				__experimentalShowSelectedHint
-				__nextUnconstrainedWidth
-			/>
-		);
-		expect(
-			screen.getByRole( 'button', { name: 'Custom select' } )
-		).toHaveTextContent( 'Hint' );
-	} );
-} );
diff --git a/packages/components/src/custom-select-control/test/index.tsx b/packages/components/src/custom-select-control/test/index.tsx
new file mode 100644
index 00000000000000..b2ac5c19c6ab3f
--- /dev/null
+++ b/packages/components/src/custom-select-control/test/index.tsx
@@ -0,0 +1,816 @@
+/**
+ * External dependencies
+ */
+import { screen } from '@testing-library/react';
+import { click, press, sleep, type, waitFor } from '@ariakit/test';
+import { render } from '@ariakit/test/react';
+
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import UncontrolledCustomSelectControl from '..';
+
+const customClassName = 'amber-skies';
+const customStyles = {
+	backgroundColor: 'rgb(127, 255, 212)',
+	rotate: '13deg',
+};
+
+const props = {
+	label: 'label!',
+	options: [
+		{
+			key: 'flower1',
+			name: 'violets',
+		},
+		{
+			key: 'flower2',
+			name: 'crimson clover',
+			className: customClassName,
+		},
+		{
+			key: 'flower3',
+			name: 'poppy',
+		},
+		{
+			key: 'color1',
+			name: 'amber',
+			className: customClassName,
+		},
+		{
+			key: 'color2',
+			name: 'aquamarine',
+			style: customStyles,
+		},
+		{
+			key: 'color3',
+			name: 'tomato (with custom props)',
+			className: customClassName,
+			style: customStyles,
+			// try passing a valid HTML attribute
+			'aria-label': 'test label',
+			// try adding a custom prop
+			customPropFoo: 'foo',
+		},
+	],
+};
+
+const ControlledCustomSelectControl = ( {
+	options,
+	onChange: onChangeProp,
+	...restProps
+}: React.ComponentProps< typeof UncontrolledCustomSelectControl > ) => {
+	const [ value, setValue ] = useState( restProps.value ?? options[ 0 ] );
+
+	const onChange: typeof onChangeProp = ( changeObject ) => {
+		onChangeProp?.( changeObject );
+		setValue( changeObject.selectedItem );
+	};
+
+	return (
+		<UncontrolledCustomSelectControl
+			{ ...restProps }
+			options={ options }
+			onChange={ onChange }
+			value={ options.find(
+				( option: any ) => option.key === value.key
+			) }
+		/>
+	);
+};
+
+it( 'Should apply external controlled updates', async () => {
+	const mockOnChange = jest.fn();
+	const { rerender } = await render(
+		<UncontrolledCustomSelectControl
+			{ ...props }
+			value={ props.options[ 0 ] }
+			onChange={ mockOnChange }
+		/>
+	);
+
+	const currentSelectedItem = screen.getByRole( 'combobox', {
+		expanded: false,
+	} );
+
+	expect( currentSelectedItem ).toHaveTextContent( props.options[ 0 ].name );
+
+	expect( mockOnChange ).not.toHaveBeenCalled();
+
+	await rerender(
+		<UncontrolledCustomSelectControl
+			{ ...props }
+			value={ props.options[ 1 ] }
+		/>
+	);
+
+	expect( currentSelectedItem ).toHaveTextContent( props.options[ 1 ].name );
+
+	// Necessary to wait for onChange to potentially fire
+	await sleep();
+
+	expect( mockOnChange ).not.toHaveBeenCalled();
+} );
+
+describe.each( [
+	[ 'Uncontrolled', UncontrolledCustomSelectControl ],
+	[ 'Controlled', ControlledCustomSelectControl ],
+] )( 'CustomSelectControl (%s)', ( ...modeAndComponent ) => {
+	const [ , Component ] = modeAndComponent;
+
+	it( 'Should select the first option when no explicit initial value is passed without firing onChange', async () => {
+		const mockOnChange = jest.fn();
+		await render( <Component { ...props } onChange={ mockOnChange } /> );
+
+		expect(
+			screen.getByRole( 'combobox', {
+				expanded: false,
+			} )
+		).toHaveTextContent( props.options[ 0 ].name );
+
+		// Necessary to wait for onChange to potentially fire
+		await sleep();
+
+		expect( mockOnChange ).not.toHaveBeenCalled();
+	} );
+
+	it( 'Should pick the initially selected option if the value prop is passed without firing onChange', async () => {
+		const mockOnChange = jest.fn();
+		await render(
+			<Component
+				{ ...props }
+				onChange={ mockOnChange }
+				value={ props.options[ 3 ] }
+			/>
+		);
+
+		expect(
+			screen.getByRole( 'combobox', {
+				expanded: false,
+			} )
+		).toHaveTextContent( props.options[ 3 ].name );
+
+		// Necessary to wait for onChange to potentially fire
+		await sleep();
+
+		expect( mockOnChange ).not.toHaveBeenCalled();
+	} );
+
+	it( 'Should replace the initial selection when a new item is selected', async () => {
+		await render( <Component { ...props } /> );
+
+		const currentSelectedItem = screen.getByRole( 'combobox', {
+			expanded: false,
+		} );
+
+		await click( currentSelectedItem );
+
+		await click(
+			screen.getByRole( 'option', {
+				name: 'crimson clover',
+			} )
+		);
+
+		expect( currentSelectedItem ).toHaveTextContent( 'crimson clover' );
+
+		await click( currentSelectedItem );
+
+		await click(
+			screen.getByRole( 'option', {
+				name: 'poppy',
+			} )
+		);
+
+		expect( currentSelectedItem ).toHaveTextContent( 'poppy' );
+	} );
+
+	it( 'Should keep current selection if dropdown is closed without changing selection', async () => {
+		await render( <Component { ...props } /> );
+
+		const currentSelectedItem = screen.getByRole( 'combobox', {
+			expanded: false,
+		} );
+
+		await press.Tab();
+		await press.Enter();
+		expect(
+			screen.getByRole( 'listbox', {
+				name: props.label,
+			} )
+		).toBeVisible();
+
+		await press.Escape();
+		expect(
+			screen.queryByRole( 'listbox', {
+				name: props.label,
+			} )
+		).not.toBeInTheDocument();
+
+		expect( currentSelectedItem ).toHaveTextContent(
+			props.options[ 0 ].name
+		);
+	} );
+
+	it( 'Should apply class only to options that have a className defined', async () => {
+		await render( <Component { ...props } /> );
+
+		await click(
+			screen.getByRole( 'combobox', {
+				expanded: false,
+			} )
+		);
+
+		// return an array of items _with_ a className added
+		const itemsWithClass = props.options.filter(
+			( option ) => option.className !== undefined
+		);
+
+		// assert against filtered array
+		itemsWithClass.map( ( { name } ) =>
+			expect( screen.getByRole( 'option', { name } ) ).toHaveClass(
+				customClassName
+			)
+		);
+
+		// return an array of items _without_ a className added
+		const itemsWithoutClass = props.options.filter(
+			( option ) => option.className === undefined
+		);
+
+		// assert against filtered array
+		itemsWithoutClass.map( ( { name } ) =>
+			expect( screen.getByRole( 'option', { name } ) ).not.toHaveClass(
+				customClassName
+			)
+		);
+	} );
+
+	it( 'Should apply styles only to options that have styles defined', async () => {
+		await render( <Component { ...props } /> );
+
+		await click(
+			screen.getByRole( 'combobox', {
+				expanded: false,
+			} )
+		);
+
+		// return an array of items _with_ styles added
+		const styledItems = props.options.filter(
+			( option ) => option.style !== undefined
+		);
+
+		// assert against filtered array
+		styledItems.map( ( { name } ) =>
+			expect( screen.getByRole( 'option', { name } ) ).toHaveStyle(
+				customStyles
+			)
+		);
+
+		// return an array of items _without_ styles added
+		const unstyledItems = props.options.filter(
+			( option ) => option.style === undefined
+		);
+
+		// assert against filtered array
+		unstyledItems.map( ( { name } ) =>
+			expect( screen.getByRole( 'option', { name } ) ).not.toHaveStyle(
+				customStyles
+			)
+		);
+	} );
+
+	it( 'does not show selected hint by default', async () => {
+		await render(
+			<Component
+				{ ...props }
+				label="Custom select"
+				options={ [
+					{
+						key: 'one',
+						name: 'One',
+						hint: 'Hint',
+					},
+				] }
+			/>
+		);
+		await waitFor( () =>
+			expect(
+				screen.getByRole( 'combobox', { name: 'Custom select' } )
+			).not.toHaveTextContent( 'Hint' )
+		);
+	} );
+
+	it( 'shows selected hint when showSelectedHint is set', async () => {
+		await render(
+			<Component
+				{ ...props }
+				label="Custom select"
+				options={ [
+					{
+						key: 'one',
+						name: 'One',
+						hint: 'Hint',
+					},
+				] }
+				showSelectedHint
+			/>
+		);
+
+		await waitFor( () =>
+			expect(
+				screen.getByRole( 'combobox', {
+					expanded: false,
+				} )
+			).toHaveTextContent( 'Hint' )
+		);
+	} );
+
+	it( 'shows selected hint in list of options when added, regardless of showSelectedHint prop', async () => {
+		await render(
+			<Component
+				{ ...props }
+				label="Custom select"
+				options={ [
+					{
+						key: 'one',
+						name: 'One',
+						hint: 'Hint',
+					},
+				] }
+			/>
+		);
+
+		await click(
+			screen.getByRole( 'combobox', { name: 'Custom select' } )
+		);
+
+		expect( screen.getByRole( 'option', { name: /hint/i } ) ).toBeVisible();
+	} );
+
+	it( 'Should return object onChange', async () => {
+		const mockOnChange = jest.fn();
+
+		await render( <Component { ...props } onChange={ mockOnChange } /> );
+
+		await click(
+			screen.getByRole( 'combobox', {
+				expanded: false,
+			} )
+		);
+
+		await click(
+			screen.getByRole( 'option', {
+				name: 'aquamarine',
+			} )
+		);
+
+		expect( mockOnChange ).toHaveBeenCalledTimes( 1 );
+		expect( mockOnChange ).toHaveBeenLastCalledWith(
+			expect.objectContaining( {
+				inputValue: '',
+				isOpen: false,
+				selectedItem: expect.objectContaining( {
+					name: 'aquamarine',
+				} ),
+				type: expect.any( String ),
+			} )
+		);
+	} );
+
+	it( 'Should return selectedItem object when specified onChange', async () => {
+		const mockOnChange = jest.fn();
+
+		await render( <Component { ...props } onChange={ mockOnChange } /> );
+
+		await press.Tab();
+		expect(
+			screen.getByRole( 'combobox', {
+				expanded: false,
+			} )
+		).toHaveFocus();
+
+		await type( 'p' );
+		await press.Enter();
+
+		expect( mockOnChange ).toHaveBeenCalledTimes( 1 );
+		expect( mockOnChange ).toHaveBeenLastCalledWith(
+			expect.objectContaining( {
+				selectedItem: expect.objectContaining( {
+					key: 'flower3',
+					name: 'poppy',
+				} ),
+			} )
+		);
+	} );
+
+	it( "Should pass arbitrary props to onChange's selectedItem, but apply only style and className to DOM elements", async () => {
+		const onChangeMock = jest.fn();
+
+		await render( <Component { ...props } onChange={ onChangeMock } /> );
+
+		const currentSelectedItem = screen.getByRole( 'combobox', {
+			expanded: false,
+		} );
+
+		await click( currentSelectedItem );
+
+		const optionWithCustomAttributes = screen.getByRole( 'option', {
+			name: 'tomato (with custom props)',
+		} );
+
+		// Assert that the option element does not have the custom attributes
+		expect( optionWithCustomAttributes ).not.toHaveAttribute(
+			'customPropFoo'
+		);
+		expect( optionWithCustomAttributes ).not.toHaveAttribute(
+			'aria-label'
+		);
+
+		await click( optionWithCustomAttributes );
+
+		expect( onChangeMock ).toHaveBeenCalledTimes( 1 );
+		expect( onChangeMock ).toHaveBeenCalledWith(
+			expect.objectContaining( {
+				selectedItem: expect.objectContaining( {
+					key: 'color3',
+					name: 'tomato (with custom props)',
+					className: customClassName,
+					style: customStyles,
+					'aria-label': 'test label',
+					customPropFoo: 'foo',
+				} ),
+			} )
+		);
+	} );
+
+	it( 'Should label the component correctly even when the label is not visible', async () => {
+		await render( <Component { ...props } hideLabelFromVision /> );
+
+		expect(
+			screen.getByRole( 'combobox', {
+				name: props.label,
+			} )
+		).toBeVisible();
+	} );
+
+	describe( 'Keyboard behavior and accessibility', () => {
+		it( 'Captures the keypress event and does not let it propagate', async () => {
+			const onKeyDown = jest.fn();
+
+			await render(
+				<div
+					// This role="none" is required to prevent an eslint warning about accessibility.
+					role="none"
+					onKeyDown={ onKeyDown }
+				>
+					<Component { ...props } />
+				</div>
+			);
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+			await click( currentSelectedItem );
+
+			const customSelect = screen.getByRole( 'listbox', {
+				name: props.label,
+			} );
+			expect( customSelect ).toHaveFocus();
+			await press.Enter();
+
+			expect( onKeyDown ).toHaveBeenCalledTimes( 0 );
+		} );
+
+		it( 'Should be able to change selection using keyboard', async () => {
+			await render( <Component { ...props } /> );
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await press.Tab();
+			expect( currentSelectedItem ).toHaveFocus();
+
+			await press.Enter();
+			expect(
+				screen.getByRole( 'listbox', {
+					name: props.label,
+				} )
+			).toHaveFocus();
+
+			await press.ArrowDown();
+			await press.Enter();
+
+			expect( currentSelectedItem ).toHaveTextContent(
+				props.options[ 1 ].name
+			);
+		} );
+
+		it( 'Should be able to type characters to select matching options', async () => {
+			await render( <Component { ...props } /> );
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await press.Tab();
+			await press.Enter();
+			expect(
+				screen.getByRole( 'listbox', {
+					name: props.label,
+				} )
+			).toHaveFocus();
+
+			await type( 'a' );
+			await press.Enter();
+			expect( currentSelectedItem ).toHaveTextContent( 'amber' );
+		} );
+
+		it( 'Can change selection with a focused input and closed dropdown if typed characters match an option', async () => {
+			await render( <Component { ...props } /> );
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await press.Tab();
+			expect( currentSelectedItem ).toHaveFocus();
+			expect( currentSelectedItem ).toHaveTextContent(
+				props.options[ 0 ].name
+			);
+
+			// Ideally we would test a multi-character typeahead, but anything more than a single character is flaky
+			await type( 'a' );
+
+			expect(
+				screen.queryByRole( 'listbox', {
+					name: props.label,
+					hidden: true,
+				} )
+			).not.toBeInTheDocument();
+
+			// This Enter is a workaround for flakiness, and shouldn't be necessary in an actual browser
+			await press.Enter();
+
+			expect( currentSelectedItem ).toHaveTextContent( 'amber' );
+		} );
+
+		it( 'Can change selection with a focused input and closed dropdown while pressing arrow keys', async () => {
+			await render( <Component { ...props } /> );
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await press.Tab();
+			expect( currentSelectedItem ).toHaveFocus();
+			expect( currentSelectedItem ).toHaveTextContent(
+				props.options[ 0 ].name
+			);
+
+			await press.ArrowDown();
+			await press.ArrowDown();
+			expect(
+				screen.queryByRole( 'listbox', {
+					name: props.label,
+				} )
+			).not.toBeInTheDocument();
+
+			expect( currentSelectedItem ).toHaveTextContent(
+				props.options[ 2 ].name
+			);
+		} );
+
+		it( 'Should have correct aria-selected value for selections', async () => {
+			await render( <Component { ...props } /> );
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await click( currentSelectedItem );
+
+			// get all items except for first option
+			const unselectedItems = props.options.filter(
+				( { name } ) => name !== props.options[ 0 ].name
+			);
+
+			// assert that all other items have aria-selected="false"
+			unselectedItems.map( ( { name } ) =>
+				expect(
+					screen.getByRole( 'option', { name, selected: false } )
+				).toBeVisible()
+			);
+
+			// assert that first item has aria-selected="true"
+			expect(
+				screen.getByRole( 'option', {
+					name: props.options[ 0 ].name,
+					selected: true,
+				} )
+			).toBeVisible();
+
+			// change the current selection
+			await click( screen.getByRole( 'option', { name: 'poppy' } ) );
+
+			// click combobox to mount listbox with options again
+			await click( currentSelectedItem );
+
+			// check that first item is has aria-selected="false" after new selection
+			expect(
+				screen.getByRole( 'option', {
+					name: props.options[ 0 ].name,
+					selected: false,
+				} )
+			).toBeVisible();
+
+			// check that new selected item now has aria-selected="true"
+			expect(
+				screen.getByRole( 'option', {
+					name: 'poppy',
+					selected: true,
+				} )
+			).toBeVisible();
+		} );
+
+		it( 'Should call custom event handlers', async () => {
+			const onFocusMock = jest.fn();
+			const onBlurMock = jest.fn();
+
+			await render(
+				<>
+					<Component
+						{ ...props }
+						onFocus={ onFocusMock }
+						onBlur={ onBlurMock }
+					/>
+					<button>Focus stop</button>
+				</>
+			);
+
+			const currentSelectedItem = screen.getByRole( 'combobox', {
+				expanded: false,
+			} );
+
+			await press.Tab();
+
+			expect( currentSelectedItem ).toHaveFocus();
+			expect( onFocusMock ).toHaveBeenCalledTimes( 1 );
+
+			await press.Tab();
+			expect( currentSelectedItem ).not.toHaveFocus();
+			expect( onBlurMock ).toHaveBeenCalledTimes( 1 );
+		} );
+
+		it( 'should render the describedBy text when specified', async () => {
+			const describedByText = 'My description.';
+
+			await render(
+				<Component { ...props } describedBy={ describedByText } />
+			);
+
+			expect(
+				screen.getByRole( 'combobox' )
+			).toHaveAccessibleDescription( describedByText );
+		} );
+
+		it( 'should render the default ARIA description when describedBy is not specified', async () => {
+			await render( <Component { ...props } /> );
+
+			expect(
+				screen.getByRole( 'combobox' )
+			).toHaveAccessibleDescription(
+				`Currently selected: ${ props.options[ 0 ].name }`
+			);
+		} );
+	} );
+} );
+
+describe( 'Type checking', () => {
+	// eslint-disable-next-line jest/expect-expect
+	it( 'should infer the value type from available `options`, but not the `value` or `onChange` prop', () => {
+		const options = [
+			{
+				key: 'narrow',
+				name: 'Narrow',
+			},
+			{
+				key: 'value',
+				name: 'Value',
+			},
+		];
+		const optionsReadOnly = [
+			{
+				key: 'narrow',
+				name: 'Narrow',
+			},
+			{
+				key: 'value',
+				name: 'Value',
+			},
+		] as const;
+
+		const onChange = (): void => {};
+
+		<UncontrolledCustomSelectControl
+			label="Label"
+			options={ options }
+			value={ {
+				key: 'narrow',
+				name: 'Narrow',
+			} }
+			onChange={ onChange }
+		/>;
+
+		<UncontrolledCustomSelectControl
+			label="Label"
+			options={ options }
+			value={ {
+				key: 'random string is also accepted for non-readonly options',
+				name: 'Narrow',
+			} }
+			onChange={ onChange }
+		/>;
+
+		<UncontrolledCustomSelectControl
+			label="Label"
+			options={ options }
+			value={ {
+				key: 'narrow',
+				name: 'Narrow',
+				// @ts-expect-error: the option type should not be inferred from `value`
+				foo: 'foo',
+			} }
+			onChange={ onChange }
+		/>;
+
+		<UncontrolledCustomSelectControl
+			label="Label"
+			options={ options }
+			value={ {
+				key: 'narrow',
+				name: 'Narrow',
+			} }
+			// To ensure the type inferring is working correctly, but this is not a common use case.
+			// @ts-expect-error: the option type should not be inferred from `onChange`
+			onChange={
+				onChange as ( obj: {
+					selectedItem: { key: string; name: string; foo: string };
+				} ) => void
+			}
+		/>;
+
+		<UncontrolledCustomSelectControl
+			label="Label"
+			options={ optionsReadOnly }
+			value={ {
+				key: 'narrow',
+				name: 'Narrow',
+			} }
+			onChange={ onChange }
+		/>;
+
+		<UncontrolledCustomSelectControl
+			label="Label"
+			options={ optionsReadOnly }
+			value={ {
+				// @ts-expect-error: random string is not accepted for immutable options
+				key: 'random string is not accepted for readonly options',
+				name: 'Narrow',
+			} }
+			onChange={ onChange }
+		/>;
+
+		<UncontrolledCustomSelectControl
+			label="Label"
+			options={ optionsReadOnly }
+			value={ {
+				key: 'narrow',
+				name: 'Narrow',
+				// @ts-expect-error: the option type should not be inferred from `value`
+				foo: 'foo',
+			} }
+			onChange={ onChange }
+		/>;
+
+		<UncontrolledCustomSelectControl
+			label="Label"
+			options={ optionsReadOnly }
+			value={ {
+				key: 'narrow',
+				name: 'Narrow',
+			} }
+			// To ensure the type inferring is working correctly, but this is not a common use case.
+			// @ts-expect-error: the option type should not be inferred from `onChange`
+			onChange={
+				onChange as ( obj: {
+					selectedItem: { key: string; name: string; foo: string };
+				} ) => void
+			}
+		/>;
+	} );
+} );
diff --git a/packages/components/src/custom-select-control/types.ts b/packages/components/src/custom-select-control/types.ts
new file mode 100644
index 00000000000000..0cbc2388e79638
--- /dev/null
+++ b/packages/components/src/custom-select-control/types.ts
@@ -0,0 +1,123 @@
+/**
+ * External dependencies
+ */
+import type { FocusEventHandler, MouseEventHandler } from 'react';
+
+/**
+ * The object structure for the options array.
+ */
+export type CustomSelectOption = {
+	key: string;
+	name: string;
+	style?: React.CSSProperties;
+	className?: string;
+	hint?: string;
+	/**
+	 * Use the `hint` property instead
+	 * @deprecated
+	 * @ignore
+	 */
+	__experimentalHint?: string;
+	[ key: string ]: any;
+};
+
+/**
+ * The object returned from the onChange event.
+ */
+type CustomSelectChangeObject< T extends CustomSelectOption > = {
+	highlightedIndex?: number;
+	inputValue?: string;
+	isOpen?: boolean;
+	type?: string;
+	selectedItem: T;
+};
+
+export type CustomSelectProps< T extends CustomSelectOption > = {
+	/**
+	 * Optional classname for the component.
+	 */
+	className?: string;
+	/**
+	 * Hide the label visually, while keeping available to assistive technology.
+	 */
+	hideLabelFromVision?: boolean;
+	/**
+	 * Description for the select trigger button used by assistive technology.
+	 * If no value is passed, the text "Currently selected: selectedItem.name"
+	 * will be used fully translated.
+	 */
+	describedBy?: string;
+	/**
+	 * Label for the control.
+	 */
+	label: string;
+	/**
+	 * Function called with the control's internal state changes. The `selectedItem`
+	 * property contains the next selected item.
+	 */
+	onChange?: ( newValue: CustomSelectChangeObject< NoInfer< T > > ) => void;
+	/**
+	 * A handler for `blur` events on the trigger button.
+	 *
+	 * @ignore
+	 */
+	onBlur?: FocusEventHandler< HTMLButtonElement >;
+	/**
+	 * A handler for `focus` events on the trigger button.
+	 *
+	 * @ignore
+	 */
+	onFocus?: FocusEventHandler< HTMLButtonElement >;
+	/**
+	 * A handler for `mouseout` events on the trigger button.
+	 *
+	 * @ignore
+	 */
+	onMouseOut?: MouseEventHandler< HTMLButtonElement >;
+	/**
+	 * A handler for `mouseover` events on the trigger button.
+	 *
+	 * @ignore
+	 */
+	onMouseOver?: MouseEventHandler< HTMLButtonElement >;
+	/**
+	 * The list of options that can be chosen from.
+	 */
+	options: ReadonlyArray< T >;
+	/**
+	 * The size of the control.
+	 *
+	 * @default 'default'
+	 */
+	size?: 'default' | 'small' | '__unstable-large';
+	/**
+	 * Can be used to externally control the value of the control.
+	 */
+	value?: NoInfer< T >;
+	/**
+	 * Use the `showSelectedHint` property instead.
+	 * @deprecated
+	 * @ignore
+	 */
+	__experimentalShowSelectedHint?: boolean;
+	/**
+	 * Show the hint of the selected item in the trigger button.
+	 *
+	 * @default false
+	 */
+	showSelectedHint?: boolean;
+	/**
+	 * Opt-in prop for an unconstrained width style which became the default in
+	 * WordPress 6.5. The prop is no longer needed and can be safely removed.
+	 *
+	 * @deprecated
+	 * @ignore
+	 */
+	__nextUnconstrainedWidth?: boolean;
+	/**
+	 * Start opting into the larger default height that will become the default size in a future version.
+	 *
+	 * @default false
+	 */
+	__next40pxDefaultSize?: boolean;
+};
diff --git a/packages/components/src/dashicon/index.native.js b/packages/components/src/dashicon/index.native.js
index 35f9f6f99cb6f7..aba26313412602 100644
--- a/packages/components/src/dashicon/index.native.js
+++ b/packages/components/src/dashicon/index.native.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Icon } from '@wordpress/components';
+import { Icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
diff --git a/packages/components/src/date-time/README.md b/packages/components/src/date-time/README.md
index 3d6b0e7761d6a6..b57a3f859b0e11 100644
--- a/packages/components/src/date-time/README.md
+++ b/packages/components/src/date-time/README.md
@@ -56,6 +56,14 @@ Whether we use a 12-hour clock. With a 12-hour clock, an AM/PM widget is display
 -   Required: No
 -   Default: false
 
+### `dateOrder`: `'dmy' | 'mdy' | 'ymd'`
+
+The order of day, month, and year. This prop overrides the time format determined by `is12Hour` prop.
+
+-   Type: `string`
+-   Required: No
+-   Default: `'dmy'`
+
 ### `isInvalidDate`: `( date: Date ) => boolean`
 
 A callback function which receives a Date object representing a day as an argument, and should return a Boolean to signify if the day is valid or not.
diff --git a/packages/components/src/date-time/date-time/index.tsx b/packages/components/src/date-time/date-time/index.tsx
index a75b9fe57c14ed..82e34cff8e14e9 100644
--- a/packages/components/src/date-time/date-time/index.tsx
+++ b/packages/components/src/date-time/date-time/index.tsx
@@ -7,7 +7,6 @@ import type { ForwardedRef } from 'react';
  * WordPress dependencies
  */
 import { forwardRef } from '@wordpress/element';
-import { __, _x } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -25,6 +24,7 @@ function UnforwardedDateTimePicker(
 	{
 		currentDate,
 		is12Hour,
+		dateOrder,
 		isInvalidDate,
 		onMonthPreviewed = noop,
 		onChange,
@@ -40,6 +40,7 @@ function UnforwardedDateTimePicker(
 					currentTime={ currentDate }
 					onChange={ onChange }
 					is12Hour={ is12Hour }
+					dateOrder={ dateOrder }
 				/>
 				<DatePicker
 					currentDate={ currentDate }
diff --git a/packages/components/src/date-time/date/index.tsx b/packages/components/src/date-time/date/index.tsx
index 75bfbb76ba2116..ca093f9d70847b 100644
--- a/packages/components/src/date-time/date/index.tsx
+++ b/packages/components/src/date-time/date/index.tsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import { useLilius } from 'use-lilius';
 import {
 	format,
 	isSameDay,
@@ -29,6 +28,7 @@ import { useState, useRef, useEffect } from '@wordpress/element';
 /**
  * Internal dependencies
  */
+import { useLilius } from './use-lilius';
 import type { DatePickerProps } from '../types';
 import {
 	Wrapper,
@@ -125,6 +125,7 @@ export function DatePicker( {
 							)
 						);
 					} }
+					size="compact"
 				/>
 				<NavigatorHeading level={ 3 }>
 					<strong>
@@ -150,6 +151,7 @@ export function DatePicker( {
 							)
 						);
 					} }
+					size="compact"
 				/>
 			</Navigator>
 			<Calendar
@@ -300,7 +302,6 @@ function Day( {
 		}
 		// isFocusAllowed is not a dep as there is no point calling focus() on
 		// an already focused element.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ isFocusable ] );
 
 	return (
diff --git a/packages/components/src/date-time/date/styles.ts b/packages/components/src/date-time/date/styles.ts
index 5500206abd40a2..84405854827ec9 100644
--- a/packages/components/src/date-time/date/styles.ts
+++ b/packages/components/src/date-time/date/styles.ts
@@ -7,13 +7,13 @@ import styled from '@emotion/styled';
  * Internal dependencies
  */
 import Button from '../../button';
-import { COLORS, CONFIG } from '../../utils';
+import { boxSizingReset, COLORS, CONFIG } from '../../utils';
 import { HStack } from '../../h-stack';
 import { Heading } from '../../heading';
 import { space } from '../../utils/space';
 
 export const Wrapper = styled.div`
-	box-sizing: border-box;
+	${ boxSizingReset }
 `;
 
 export const Navigator = styled( HStack )`
@@ -38,7 +38,7 @@ export const Calendar = styled.div`
 `;
 
 export const DayOfWeek = styled.div`
-	color: ${ COLORS.gray[ 700 ] };
+	color: ${ COLORS.theme.gray[ 700 ] };
 	font-size: ${ CONFIG.fontSize };
 	line-height: ${ CONFIG.fontLineHeightBase };
 
@@ -83,22 +83,41 @@ export const DayButton = styled( Button, {
 		` }
 
 	&&& {
-		border-radius: 100%;
+		border-radius: ${ CONFIG.radiusRound };
 		height: ${ space( 7 ) };
 		width: ${ space( 7 ) };
 
 		${ ( props ) =>
 			props.isSelected &&
 			`
-			background: ${ COLORS.theme.accent };
-			color: ${ COLORS.white };
+				background: ${ COLORS.theme.accent };
+
+				&,
+				&:hover:not(:disabled, [aria-disabled=true]) {
+					color: ${ COLORS.theme.accentInverted };
+				}
+
+				&:focus:not(:disabled),
+				&:focus:not(:disabled) {
+					border: ${ CONFIG.borderWidthFocus } solid currentColor;
+				}
+
+				/* Highlight the selected day for high-contrast mode */
+				&::after {
+					content: '';
+					position: absolute;
+					pointer-events: none;
+					inset: 0;
+					border-radius: inherit;
+					border: 1px solid transparent;
+				}
 			` }
 
 		${ ( props ) =>
 			! props.isSelected &&
 			props.isToday &&
 			`
-			background: ${ COLORS.gray[ 200 ] };
+			background: ${ COLORS.theme.gray[ 200 ] };
 			` }
 	}
 
@@ -106,15 +125,16 @@ export const DayButton = styled( Button, {
 		props.hasEvents &&
 		`
 		::before {
-			background: ${ props.isSelected ? COLORS.white : COLORS.theme.accent };
-			border-radius: 2px;
-			bottom: 0;
+			border: 2px solid ${
+				props.isSelected
+					? COLORS.theme.accentInverted
+					: COLORS.theme.accent
+			};
+			border-radius: ${ CONFIG.radiusRound };
 			content: " ";
-			height: 4px;
 			left: 50%;
-			margin-left: -2px;
 			position: absolute;
-			width: 4px;
+			transform: translate(-50%, 9px);
 		}
 		` }
 `;
diff --git a/packages/components/src/date-time/date/test/use-lilius.ts b/packages/components/src/date-time/date/test/use-lilius.ts
new file mode 100644
index 00000000000000..31b81fa11bb74b
--- /dev/null
+++ b/packages/components/src/date-time/date/test/use-lilius.ts
@@ -0,0 +1,417 @@
+/**
+ * External dependencies
+ */
+import { act, renderHook } from '@testing-library/react';
+import { addYears, getYear, set, startOfToday, subYears } from 'date-fns';
+
+/**
+ * Internal dependencies
+ */
+import { Month, useLilius } from '../use-lilius';
+
+const getDate = ( {
+	year = 1999,
+	month = Month.NOVEMBER,
+	date = 24,
+	hours = 0,
+	minutes = 0,
+	seconds = 0,
+	milliseconds = 0,
+}: {
+	year?: number;
+	month?: number;
+	date?: number;
+	hours?: number;
+	minutes?: number;
+	seconds?: number;
+	milliseconds?: number;
+} = {} ) => {
+	return set( new Date(), {
+		year,
+		month,
+		date,
+		hours,
+		minutes,
+		seconds,
+		milliseconds,
+	} );
+};
+
+describe( 'helpers', () => {
+	describe( 'clearTime', () => {
+		it( 'returns a copy of the given date with the time set to 00:00:00:00', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate( { hours: 7, minutes: 30 } );
+
+			expect( result.current.clearTime( date ) ).toStrictEqual(
+				set( date, {
+					hours: 0,
+					minutes: 0,
+					seconds: 0,
+					milliseconds: 0,
+				} )
+			);
+		} );
+	} );
+
+	describe( 'inRange', () => {
+		it( 'returns whether or not a date is between 2 other dates (inclusive)', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate();
+			const min = subYears( date, 1 );
+			const max = addYears( date, 1 );
+
+			expect( result.current.inRange( date, min, max ) ).toBe( true );
+			expect(
+				result.current.inRange( addYears( date, 10 ), min, max )
+			).toBe( false );
+		} );
+	} );
+} );
+
+describe( 'viewing', () => {
+	describe( 'viewing', () => {
+		it( 'returns the date represented in the calendar matrix', () => {
+			const date = getDate();
+
+			const { result } = renderHook( () =>
+				useLilius( { viewing: date } )
+			);
+
+			expect( result.current.viewing ).toStrictEqual( date );
+		} );
+	} );
+
+	describe( 'setViewing', () => {
+		it( 'sets the date represented in the calendar matrix', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate();
+
+			act( () => result.current.setViewing( date ) );
+			expect( result.current.viewing ).toStrictEqual( date );
+		} );
+	} );
+
+	describe( 'viewToday', () => {
+		it( 'sets the viewing date to today', () => {
+			const { result } = renderHook( () =>
+				useLilius( { viewing: getDate( { year: 1999 } ) } )
+			);
+
+			act( () => result.current.viewToday() );
+			expect( result.current.viewing ).toStrictEqual( startOfToday() );
+		} );
+	} );
+
+	describe( 'viewMonth', () => {
+		it( 'sets the viewing date to the given month', () => {
+			const date = getDate( { month: Month.JANUARY } );
+
+			const { result } = renderHook( () =>
+				useLilius( { viewing: date } )
+			);
+
+			act( () => result.current.viewMonth( Month.FEBRUARY ) );
+			expect( result.current.viewing ).toStrictEqual(
+				set( date, { month: Month.FEBRUARY } )
+			);
+		} );
+	} );
+
+	describe( 'viewPreviousMonth', () => {
+		it( 'sets the viewing date to the month before the current', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate( { month: Month.OCTOBER } );
+
+			act( () => result.current.setViewing( date ) );
+			act( () => result.current.viewPreviousMonth() );
+			expect( result.current.viewing ).toStrictEqual(
+				set( date, { month: Month.SEPTEMBER } )
+			);
+		} );
+
+		it( 'wraps to december of the previous year if the current month is january', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate( { month: Month.JANUARY } );
+
+			act( () => result.current.setViewing( date ) );
+			act( () => result.current.viewPreviousMonth() );
+			expect( result.current.viewing ).toStrictEqual(
+				set( date, {
+					month: Month.DECEMBER,
+					year: getYear( date ) - 1,
+				} )
+			);
+		} );
+	} );
+
+	describe( 'viewNextMonth', () => {
+		it( 'sets the viewing date to the month after the current', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate( { month: Month.OCTOBER } );
+
+			act( () => result.current.setViewing( date ) );
+			act( () => result.current.viewNextMonth() );
+			expect( result.current.viewing ).toStrictEqual(
+				set( date, { month: Month.NOVEMBER } )
+			);
+		} );
+
+		it( 'wraps to january of the next year if the current month is december', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate( { month: Month.DECEMBER } );
+
+			act( () => result.current.setViewing( date ) );
+			act( () => result.current.viewNextMonth() );
+			expect( result.current.viewing ).toStrictEqual(
+				set( date, { month: Month.JANUARY, year: getYear( date ) + 1 } )
+			);
+		} );
+	} );
+
+	describe( 'viewYear', () => {
+		it( 'sets the viewing date to the given year', () => {
+			const date = getDate( { year: 1999 } );
+
+			const { result } = renderHook( () =>
+				useLilius( { viewing: date } )
+			);
+
+			act( () => result.current.viewYear( 1997 ) );
+			expect( result.current.viewing ).toStrictEqual(
+				set( date, { year: 1997 } )
+			);
+		} );
+	} );
+
+	describe( 'viewPreviousYear', () => {
+		it( 'sets the viewing date to the year before the current', () => {
+			const date = getDate( { year: 1999 } );
+
+			const { result } = renderHook( () =>
+				useLilius( { viewing: date } )
+			);
+
+			act( () => result.current.viewPreviousYear() );
+			expect( result.current.viewing ).toStrictEqual(
+				set( date, { year: 1998 } )
+			);
+		} );
+	} );
+
+	describe( 'viewNextYear', () => {
+		it( 'sets the viewing date to the year after the current', () => {
+			const date = getDate( { year: 1999 } );
+
+			const { result } = renderHook( () =>
+				useLilius( { viewing: date } )
+			);
+
+			act( () => result.current.viewNextYear() );
+			expect( result.current.viewing ).toStrictEqual(
+				set( date, { year: 2000 } )
+			);
+		} );
+	} );
+} );
+
+describe( 'selected', () => {
+	describe( 'selected', () => {
+		it( 'returns the dates currently selected', () => {
+			const date = getDate();
+
+			const { result } = renderHook( () =>
+				useLilius( {
+					selected: [ date ],
+				} )
+			);
+
+			expect( result.current.selected ).toStrictEqual( [ date ] );
+		} );
+	} );
+
+	describe( 'clearSelected', () => {
+		it( 'resets the selected dates to []', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate();
+
+			act( () =>
+				result.current.selectRange(
+					set( date, { date: 1 } ),
+					set( date, { date: 5 } )
+				)
+			);
+			expect( result.current.selected.length ).toBe( 5 );
+
+			act( () => result.current.clearSelected() );
+			expect( result.current.selected.length ).toBe( 0 );
+		} );
+	} );
+
+	describe( 'isSelected', () => {
+		it( 'returns whether or not a date has been selected', () => {
+			const date = getDate();
+
+			const { result } = renderHook( () =>
+				useLilius( {
+					selected: [ date ],
+				} )
+			);
+
+			expect( result.current.isSelected( date ) ).toBe( true );
+		} );
+	} );
+
+	describe( 'select', () => {
+		it( 'selects a date', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate();
+
+			act( () => result.current.select( date ) );
+			expect( result.current.isSelected( date ) ).toBe( true );
+		} );
+
+		it( 'selects multiple dates', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const dateOne = getDate( { date: 1 } );
+			const dateTwo = getDate( { date: 2 } );
+
+			act( () => result.current.select( [ dateOne, dateTwo ] ) );
+			expect( result.current.isSelected( dateOne ) ).toBe( true );
+			expect( result.current.isSelected( dateTwo ) ).toBe( true );
+		} );
+	} );
+
+	describe( 'deselect', () => {
+		it( 'deselects a date', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate();
+
+			act( () => result.current.select( date ) );
+			act( () => result.current.deselect( date ) );
+			expect( result.current.isSelected( date ) ).toBe( false );
+		} );
+
+		it( 'deselects multiple dates', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const dateOne = getDate( { date: 1 } );
+			const dateTwo = getDate( { date: 2 } );
+
+			act( () => result.current.select( [ dateOne, dateTwo ] ) );
+			act( () => result.current.deselect( [ dateOne, dateTwo ] ) );
+			expect( result.current.isSelected( dateOne ) ).toBe( false );
+			expect( result.current.isSelected( dateTwo ) ).toBe( false );
+		} );
+	} );
+
+	describe( 'toggle', () => {
+		it( 'toggles the selection of a date', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate();
+
+			act( () => result.current.toggle( date ) );
+			expect( result.current.isSelected( date ) ).toBe( true );
+
+			act( () => result.current.toggle( date ) );
+			expect( result.current.isSelected( date ) ).toBe( false );
+		} );
+	} );
+
+	describe( 'selectRange', () => {
+		it( 'selects a range of dates (inclusive)', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate();
+
+			const first = set( date, { date: 1 } );
+			const second = set( date, { date: 2 } );
+			const third = set( date, { date: 3 } );
+
+			act( () => result.current.selectRange( first, third ) );
+
+			expect( result.current.selected.length ).toBe( 3 );
+			expect( result.current.isSelected( first ) ).toBe( true );
+			expect( result.current.isSelected( second ) ).toBe( true );
+			expect( result.current.isSelected( third ) ).toBe( true );
+		} );
+	} );
+
+	describe( 'deselectRange', () => {
+		it( 'deselects a range of dates (inclusive)', () => {
+			const { result } = renderHook( () => useLilius() );
+
+			const date = getDate();
+
+			act( () =>
+				result.current.selectRange(
+					set( date, { date: 1 } ),
+					set( date, { date: 3 } )
+				)
+			);
+			act( () =>
+				result.current.deselectRange(
+					set( date, { date: 1 } ),
+					set( date, { date: 3 } )
+				)
+			);
+
+			expect( result.current.selected.length ).toBe( 0 );
+			expect(
+				result.current.isSelected( set( date, { date: 1 } ) )
+			).toBe( false );
+			expect(
+				result.current.isSelected( set( date, { date: 2 } ) )
+			).toBe( false );
+			expect(
+				result.current.isSelected( set( date, { date: 3 } ) )
+			).toBe( false );
+		} );
+	} );
+} );
+
+describe( 'calendar', () => {
+	it( 'returns a matrix of days based on the current viewing date', () => {
+		const { result } = renderHook( () =>
+			useLilius( { viewing: new Date( 1582, Month.OCTOBER, 1 ) } )
+		);
+
+		expect( result.current.calendar![ 0 ][ 0 ][ 0 ] ).toStrictEqual(
+			new Date( 1582, Month.SEPTEMBER, 26 )
+		);
+		expect( result.current.calendar![ 0 ][ 0 ][ 5 ] ).toStrictEqual(
+			new Date( 1582, Month.OCTOBER, 1 )
+		);
+		expect( result.current.calendar![ 0 ][ 5 ][ 6 ] ).toStrictEqual(
+			new Date( 1582, Month.NOVEMBER, 6 )
+		);
+	} );
+
+	it( 'supports returning multiple months', () => {
+		const { result } = renderHook( () =>
+			useLilius( {
+				viewing: new Date( 1582, Month.OCTOBER, 1 ),
+				numberOfMonths: 2,
+			} )
+		);
+
+		expect( result.current.calendar![ 0 ][ 0 ][ 0 ] ).toStrictEqual(
+			new Date( 1582, Month.SEPTEMBER, 26 )
+		);
+		expect( result.current.calendar![ 1 ][ 0 ][ 0 ] ).toStrictEqual(
+			new Date( 1582, Month.OCTOBER, 31 )
+		);
+	} );
+} );
diff --git a/packages/components/src/date-time/date/use-lilius/index.ts b/packages/components/src/date-time/date/use-lilius/index.ts
new file mode 100644
index 00000000000000..2da204b3c76419
--- /dev/null
+++ b/packages/components/src/date-time/date/use-lilius/index.ts
@@ -0,0 +1,394 @@
+/**
+ * This source is a local copy of the use-lilius library, since the original
+ * library is not actively maintained.
+ * @see https://github.com/WordPress/gutenberg/discussions/64968
+ *
+ * use-lilius@2.0.5
+ * https://github.com/Avarios/use-lilius
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021-Present Danny Tatom
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * External dependencies
+ */
+import {
+	addMonths,
+	addYears,
+	eachDayOfInterval,
+	eachMonthOfInterval,
+	eachWeekOfInterval,
+	endOfMonth,
+	endOfWeek,
+	isAfter,
+	isBefore,
+	isEqual,
+	set,
+	setMonth,
+	setYear,
+	startOfMonth,
+	startOfToday,
+	startOfWeek,
+	subMonths,
+	subYears,
+} from 'date-fns';
+
+/**
+ * WordPress dependencies
+ */
+import { useCallback, useMemo, useState } from '@wordpress/element';
+
+export enum Month {
+	JANUARY,
+	FEBRUARY,
+	MARCH,
+	APRIL,
+	MAY,
+	JUNE,
+	JULY,
+	AUGUST,
+	SEPTEMBER,
+	OCTOBER,
+	NOVEMBER,
+	DECEMBER,
+}
+
+export enum Day {
+	SUNDAY,
+	MONDAY,
+	TUESDAY,
+	WEDNESDAY,
+	THURSDAY,
+	FRIDAY,
+	SATURDAY,
+}
+
+export interface Options {
+	/**
+	 * What day a week starts on within the calendar matrix.
+	 *
+	 * @default Day.SUNDAY
+	 */
+	weekStartsOn?: Day;
+
+	/**
+	 * The initial viewing date.
+	 *
+	 * @default new Date()
+	 */
+	viewing?: Date;
+
+	/**
+	 * The initial date(s) selection.
+	 *
+	 * @default []
+	 */
+	selected?: Date[];
+
+	/**
+	 * The number of months in the calendar.
+	 *
+	 * @default 1
+	 */
+	numberOfMonths?: number;
+}
+
+export interface Returns {
+	/**
+	 * Returns a copy of the given date with the time set to 00:00:00:00.
+	 */
+	clearTime: ( date: Date ) => Date;
+
+	/**
+	 * Returns whether or not a date is between 2 other dates (inclusive).
+	 */
+	inRange: ( date: Date, min: Date, max: Date ) => boolean;
+
+	/**
+	 * The date represented in the calendar matrix. Note that
+	 * the month and year are the only parts used.
+	 */
+	viewing: Date;
+
+	/**
+	 * Set the date represented in the calendar matrix. Note that
+	 * the month and year are the only parts used.
+	 */
+	setViewing: React.Dispatch< React.SetStateAction< Date > >;
+
+	/**
+	 * Set the viewing date to today.
+	 */
+	viewToday: () => void;
+
+	/**
+	 * Set the viewing date to the given month.
+	 */
+	viewMonth: ( month: Month ) => void;
+
+	/**
+	 * Set the viewing date to the month before the current.
+	 */
+	viewPreviousMonth: () => void;
+
+	/**
+	 * Set the viewing date to the month after the current.
+	 */
+	viewNextMonth: () => void;
+
+	/**
+	 * Set the viewing date to the given year.
+	 */
+	viewYear: ( year: number ) => void;
+
+	/**
+	 * Set the viewing date to the year before the current.
+	 */
+	viewPreviousYear: () => void;
+
+	/**
+	 * Set the viewing date to the year after the current.
+	 */
+	viewNextYear: () => void;
+
+	/**
+	 * The dates currently selected.
+	 */
+	selected: Date[];
+
+	/**
+	 * Override the currently selected dates.
+	 */
+	setSelected: React.Dispatch< React.SetStateAction< Date[] > >;
+
+	/**
+	 * Reset the selected dates to [].
+	 */
+	clearSelected: () => void;
+
+	/**
+	 * Determine whether or not a date has been selected.
+	 */
+	isSelected: ( date: Date ) => boolean;
+
+	/**
+	 * Select one or more dates.
+	 */
+	select: ( date: Date | Date[], replaceExisting?: boolean ) => void;
+
+	/**
+	 * Deselect one or more dates.
+	 */
+	deselect: ( date: Date | Date[] ) => void;
+
+	/**
+	 * Toggle the selection of a date.
+	 */
+	toggle: ( date: Date, replaceExisting?: boolean ) => void;
+
+	/**
+	 * Select a range of dates (inclusive).
+	 */
+	selectRange: ( start: Date, end: Date, replaceExisting?: boolean ) => void;
+
+	/**
+	 * Deselect a range of dates (inclusive).
+	 */
+	deselectRange: ( start: Date, end: Date ) => void;
+
+	/**
+	 * A matrix of days based on the current viewing date.
+	 */
+	calendar: Date[][][];
+}
+
+const inRange = ( date: Date, min: Date, max: Date ) =>
+	( isEqual( date, min ) || isAfter( date, min ) ) &&
+	( isEqual( date, max ) || isBefore( date, max ) );
+
+const clearTime = ( date: Date ) =>
+	set( date, { hours: 0, minutes: 0, seconds: 0, milliseconds: 0 } );
+
+export const useLilius = ( {
+	weekStartsOn = Day.SUNDAY,
+	viewing: initialViewing = new Date(),
+	selected: initialSelected = [],
+	numberOfMonths = 1,
+}: Options = {} ): Returns => {
+	const [ viewing, setViewing ] = useState< Date >( initialViewing );
+
+	const viewToday = useCallback(
+		() => setViewing( startOfToday() ),
+		[ setViewing ]
+	);
+
+	const viewMonth = useCallback(
+		( month: Month ) => setViewing( ( v ) => setMonth( v, month ) ),
+		[]
+	);
+
+	const viewPreviousMonth = useCallback(
+		() => setViewing( ( v ) => subMonths( v, 1 ) ),
+		[]
+	);
+
+	const viewNextMonth = useCallback(
+		() => setViewing( ( v ) => addMonths( v, 1 ) ),
+		[]
+	);
+
+	const viewYear = useCallback(
+		( year: number ) => setViewing( ( v ) => setYear( v, year ) ),
+		[]
+	);
+
+	const viewPreviousYear = useCallback(
+		() => setViewing( ( v ) => subYears( v, 1 ) ),
+		[]
+	);
+
+	const viewNextYear = useCallback(
+		() => setViewing( ( v ) => addYears( v, 1 ) ),
+		[]
+	);
+
+	const [ selected, setSelected ] = useState< Date[] >(
+		initialSelected.map( clearTime )
+	);
+
+	const clearSelected = () => setSelected( [] );
+
+	const isSelected = useCallback(
+		( date: Date ) =>
+			selected.findIndex( ( s ) => isEqual( s, date ) ) > -1,
+		[ selected ]
+	);
+
+	const select = useCallback(
+		( date: Date | Date[], replaceExisting?: boolean ) => {
+			if ( replaceExisting ) {
+				setSelected( Array.isArray( date ) ? date : [ date ] );
+			} else {
+				setSelected( ( selectedItems ) =>
+					selectedItems.concat(
+						Array.isArray( date ) ? date : [ date ]
+					)
+				);
+			}
+		},
+		[]
+	);
+
+	const deselect = useCallback(
+		( date: Date | Date[] ) =>
+			setSelected( ( selectedItems ) =>
+				Array.isArray( date )
+					? selectedItems.filter(
+							( s ) =>
+								! date
+									.map( ( d ) => d.getTime() )
+									.includes( s.getTime() )
+					  )
+					: selectedItems.filter( ( s ) => ! isEqual( s, date ) )
+			),
+		[]
+	);
+
+	const toggle = useCallback(
+		( date: Date, replaceExisting?: boolean ) =>
+			isSelected( date )
+				? deselect( date )
+				: select( date, replaceExisting ),
+		[ deselect, isSelected, select ]
+	);
+
+	const selectRange = useCallback(
+		( start: Date, end: Date, replaceExisting?: boolean ) => {
+			if ( replaceExisting ) {
+				setSelected( eachDayOfInterval( { start, end } ) );
+			} else {
+				setSelected( ( selectedItems ) =>
+					selectedItems.concat( eachDayOfInterval( { start, end } ) )
+				);
+			}
+		},
+		[]
+	);
+
+	const deselectRange = useCallback( ( start: Date, end: Date ) => {
+		setSelected( ( selectedItems ) =>
+			selectedItems.filter(
+				( s ) =>
+					! eachDayOfInterval( { start, end } )
+						.map( ( d ) => d.getTime() )
+						.includes( s.getTime() )
+			)
+		);
+	}, [] );
+
+	const calendar = useMemo< Date[][][] >(
+		() =>
+			eachMonthOfInterval( {
+				start: startOfMonth( viewing ),
+				end: endOfMonth( addMonths( viewing, numberOfMonths - 1 ) ),
+			} ).map( ( month ) =>
+				eachWeekOfInterval(
+					{
+						start: startOfMonth( month ),
+						end: endOfMonth( month ),
+					},
+					{ weekStartsOn }
+				).map( ( week ) =>
+					eachDayOfInterval( {
+						start: startOfWeek( week, { weekStartsOn } ),
+						end: endOfWeek( week, { weekStartsOn } ),
+					} )
+				)
+			),
+		[ viewing, weekStartsOn, numberOfMonths ]
+	);
+
+	return {
+		clearTime,
+		inRange,
+		viewing,
+		setViewing,
+		viewToday,
+		viewMonth,
+		viewPreviousMonth,
+		viewNextMonth,
+		viewYear,
+		viewPreviousYear,
+		viewNextYear,
+		selected,
+		setSelected,
+		clearSelected,
+		isSelected,
+		select,
+		deselect,
+		toggle,
+		selectRange,
+		deselectRange,
+		calendar,
+	};
+};
diff --git a/packages/components/src/date-time/stories/time.story.tsx b/packages/components/src/date-time/stories/time.story.tsx
index c48b8fb1d15922..947b5bd64d5eb1 100644
--- a/packages/components/src/date-time/stories/time.story.tsx
+++ b/packages/components/src/date-time/stories/time.story.tsx
@@ -16,6 +16,8 @@ import TimePicker from '../time';
 const meta: Meta< typeof TimePicker > = {
 	title: 'Components/TimePicker',
 	component: TimePicker,
+	// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+	subcomponents: { 'TimePicker.TimeInput': TimePicker.TimeInput },
 	argTypes: {
 		currentTime: { control: 'date' },
 		onChange: { action: 'onChange', control: { type: null } },
@@ -49,3 +51,18 @@ const Template: StoryFn< typeof TimePicker > = ( {
 };
 
 export const Default: StoryFn< typeof TimePicker > = Template.bind( {} );
+
+const TimeInputTemplate: StoryFn< typeof TimePicker.TimeInput > = ( args ) => {
+	return <TimePicker.TimeInput { ...args } />;
+};
+
+/**
+ * The time input can be used in isolation as `<TimePicker.TimeInput />`. In this case, the `value` will be passed
+ * as an object in 24-hour format (`{ hours: number, minutes: number }`).
+ */
+export const TimeInput = TimeInputTemplate.bind( {} );
+TimeInput.args = {
+	label: 'Time',
+};
+// Hide TimePicker controls because they don't apply to TimeInput
+TimeInput.parameters = { controls: { include: [] } };
diff --git a/packages/components/src/date-time/time/index.tsx b/packages/components/src/date-time/time/index.tsx
index b0d8c20be74ac6..90a8a901354a39 100644
--- a/packages/components/src/date-time/time/index.tsx
+++ b/packages/components/src/date-time/time/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { startOfMinute, format, set, setHours, setMonth } from 'date-fns';
+import { startOfMinute, format, set, setMonth } from 'date-fns';
 
 /**
  * WordPress dependencies
@@ -13,63 +13,29 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import BaseControl from '../../base-control';
-import Button from '../../button';
-import ButtonGroup from '../../button-group';
+import { VisuallyHidden } from '../../visually-hidden';
 import SelectControl from '../../select-control';
 import TimeZone from './timezone';
-import type { TimePickerProps } from '../types';
+import type { TimeInputValue, TimePickerProps } from '../types';
 import {
 	Wrapper,
 	Fieldset,
-	HoursInput,
-	TimeSeparator,
-	MinutesInput,
 	MonthSelectWrapper,
 	DayInput,
 	YearInput,
-	TimeWrapper,
 } from './styles';
 import { HStack } from '../../h-stack';
 import { Spacer } from '../../spacer';
 import type { InputChangeCallback } from '../../input-control/types';
-import type { InputState } from '../../input-control/reducer/state';
-import type { InputAction } from '../../input-control/reducer/actions';
 import {
-	COMMIT,
-	PRESS_DOWN,
-	PRESS_UP,
-} from '../../input-control/reducer/actions';
-import { inputToDate } from '../utils';
+	inputToDate,
+	buildPadInputStateReducer,
+	validateInputElementTarget,
+} from '../utils';
 import { TIMEZONELESS_FORMAT } from '../constants';
+import { TimeInput } from './time-input';
 
-function from12hTo24h( hours: number, isPm: boolean ) {
-	return isPm ? ( ( hours % 12 ) + 12 ) % 24 : hours % 12;
-}
-
-/**
- * Creates an InputControl reducer used to pad an input so that it is always a
- * given width. For example, the hours and minutes inputs are padded to 2 so
- * that '4' appears as '04'.
- *
- * @param pad How many digits the value should be.
- */
-function buildPadInputStateReducer( pad: number ) {
-	return ( state: InputState, action: InputAction ) => {
-		const nextState = { ...state };
-		if (
-			action.type === COMMIT ||
-			action.type === PRESS_UP ||
-			action.type === PRESS_DOWN
-		) {
-			if ( nextState.value !== undefined ) {
-				nextState.value = nextState.value
-					.toString()
-					.padStart( pad, '0' );
-			}
-		}
-		return nextState;
-	};
-}
+const VALID_DATE_ORDERS = [ 'dmy', 'mdy', 'ymd' ];
 
 /**
  * TimePicker is a React component that renders a clock for time selection.
@@ -95,6 +61,8 @@ export function TimePicker( {
 	is12Hour,
 	currentTime,
 	onChange,
+	dateOrder: dateOrderProp,
+	hideLabelFromVision = false,
 }: TimePickerProps ) {
 	const [ date, setDate ] = useState( () =>
 		// Truncate the date at the minutes, see: #15495.
@@ -111,46 +79,44 @@ export function TimePicker( {
 		);
 	}, [ currentTime ] );
 
-	const { day, month, year, minutes, hours, am } = useMemo(
+	const monthOptions = [
+		{ value: '01', label: __( 'January' ) },
+		{ value: '02', label: __( 'February' ) },
+		{ value: '03', label: __( 'March' ) },
+		{ value: '04', label: __( 'April' ) },
+		{ value: '05', label: __( 'May' ) },
+		{ value: '06', label: __( 'June' ) },
+		{ value: '07', label: __( 'July' ) },
+		{ value: '08', label: __( 'August' ) },
+		{ value: '09', label: __( 'September' ) },
+		{ value: '10', label: __( 'October' ) },
+		{ value: '11', label: __( 'November' ) },
+		{ value: '12', label: __( 'December' ) },
+	] as const;
+
+	const { day, month, year, minutes, hours } = useMemo(
 		() => ( {
 			day: format( date, 'dd' ),
-			month: format( date, 'MM' ),
+			month: format(
+				date,
+				'MM'
+			) as ( typeof monthOptions )[ number ][ 'value' ],
 			year: format( date, 'yyyy' ),
 			minutes: format( date, 'mm' ),
-			hours: format( date, is12Hour ? 'hh' : 'HH' ),
+			hours: format( date, 'HH' ),
 			am: format( date, 'a' ),
 		} ),
-		[ date, is12Hour ]
+		[ date ]
 	);
 
-	const buildNumberControlChangeCallback = (
-		method: 'hours' | 'minutes' | 'date' | 'year'
-	) => {
+	const buildNumberControlChangeCallback = ( method: 'date' | 'year' ) => {
 		const callback: InputChangeCallback = ( value, { event } ) => {
-			// `instanceof` checks need to get the instance definition from the
-			// corresponding window object — therefore, the following logic makes
-			// the component work correctly even when rendered inside an iframe.
-			const HTMLInputElementInstance =
-				( event.target as HTMLInputElement )?.ownerDocument.defaultView
-					?.HTMLInputElement ?? HTMLInputElement;
-
-			if ( ! ( event.target instanceof HTMLInputElementInstance ) ) {
-				return;
-			}
-
-			if ( ! event.target.validity.valid ) {
+			if ( ! validateInputElementTarget( event ) ) {
 				return;
 			}
 
 			// We can safely assume value is a number if target is valid.
-			let numberValue = Number( value );
-
-			// If the 12-hour format is being used and the 'PM' period is
-			// selected, then the incoming value (which ranges 1-12) should be
-			// increased by 12 to match the expected 24-hour format.
-			if ( method === 'hours' && is12Hour ) {
-				numberValue = from12hTo24h( numberValue, am === 'PM' );
-			}
+			const numberValue = Number( value );
 
 			const newDate = set( date, { [ method ]: numberValue } );
 			setDate( newDate );
@@ -159,25 +125,21 @@ export function TimePicker( {
 		return callback;
 	};
 
-	function buildAmPmChangeCallback( value: 'AM' | 'PM' ) {
-		return () => {
-			if ( am === value ) {
-				return;
-			}
-
-			const parsedHours = parseInt( hours, 10 );
-
-			const newDate = setHours(
-				date,
-				from12hTo24h( parsedHours, value === 'PM' )
-			);
-			setDate( newDate );
-			onChange?.( format( newDate, TIMEZONELESS_FORMAT ) );
-		};
-	}
+	const onTimeInputChangeCallback = ( {
+		hours: newHours,
+		minutes: newMinutes,
+	}: TimeInputValue ) => {
+		const newDate = set( date, {
+			hours: newHours,
+			minutes: newMinutes,
+		} );
+		setDate( newDate );
+		onChange?.( format( newDate, TIMEZONELESS_FORMAT ) );
+	};
 
 	const dayField = (
 		<DayInput
+			key="day"
 			className="components-datetime__time-field components-datetime__time-field-day" // Unused, for backwards compatibility.
 			label={ __( 'Day' ) }
 			hideLabelFromVision
@@ -196,7 +158,7 @@ export function TimePicker( {
 	);
 
 	const monthField = (
-		<MonthSelectWrapper>
+		<MonthSelectWrapper key="month">
 			<SelectControl
 				className="components-datetime__time-field components-datetime__time-field-month" // Unused, for backwards compatibility.
 				label={ __( 'Month' ) }
@@ -204,20 +166,7 @@ export function TimePicker( {
 				__next40pxDefaultSize
 				__nextHasNoMarginBottom
 				value={ month }
-				options={ [
-					{ value: '01', label: __( 'January' ) },
-					{ value: '02', label: __( 'February' ) },
-					{ value: '03', label: __( 'March' ) },
-					{ value: '04', label: __( 'April' ) },
-					{ value: '05', label: __( 'May' ) },
-					{ value: '06', label: __( 'June' ) },
-					{ value: '07', label: __( 'July' ) },
-					{ value: '08', label: __( 'August' ) },
-					{ value: '09', label: __( 'September' ) },
-					{ value: '10', label: __( 'October' ) },
-					{ value: '11', label: __( 'November' ) },
-					{ value: '12', label: __( 'December' ) },
-				] }
+				options={ monthOptions }
 				onChange={ ( value ) => {
 					const newDate = setMonth( date, Number( value ) - 1 );
 					setDate( newDate );
@@ -227,146 +176,124 @@ export function TimePicker( {
 		</MonthSelectWrapper>
 	);
 
+	const yearField = (
+		<YearInput
+			key="year"
+			className="components-datetime__time-field components-datetime__time-field-year" // Unused, for backwards compatibility.
+			label={ __( 'Year' ) }
+			hideLabelFromVision
+			__next40pxDefaultSize
+			value={ year }
+			step={ 1 }
+			min={ 1 }
+			max={ 9999 }
+			required
+			spinControls="none"
+			isPressEnterToChange
+			isDragEnabled={ false }
+			isShiftStepEnabled={ false }
+			onChange={ buildNumberControlChangeCallback( 'year' ) }
+			__unstableStateReducer={ buildPadInputStateReducer( 4 ) }
+		/>
+	);
+
+	const defaultDateOrder = is12Hour ? 'mdy' : 'dmy';
+	const dateOrder =
+		dateOrderProp && VALID_DATE_ORDERS.includes( dateOrderProp )
+			? dateOrderProp
+			: defaultDateOrder;
+
+	const fields = dateOrder.split( '' ).map( ( field ) => {
+		switch ( field ) {
+			case 'd':
+				return dayField;
+			case 'm':
+				return monthField;
+			case 'y':
+				return yearField;
+			default:
+				return null;
+		}
+	} );
+
 	return (
 		<Wrapper
 			className="components-datetime__time" // Unused, for backwards compatibility.
 		>
 			<Fieldset>
-				<BaseControl.VisualLabel
-					as="legend"
-					className="components-datetime__time-legend" // Unused, for backwards compatibility.
-				>
-					{ __( 'Time' ) }
-				</BaseControl.VisualLabel>
+				{ hideLabelFromVision ? (
+					<VisuallyHidden as="legend">
+						{ __( 'Time' ) }
+					</VisuallyHidden>
+				) : (
+					<BaseControl.VisualLabel
+						as="legend"
+						className="components-datetime__time-legend" // Unused, for backwards compatibility.
+					>
+						{ __( 'Time' ) }
+					</BaseControl.VisualLabel>
+				) }
 				<HStack
 					className="components-datetime__time-wrapper" // Unused, for backwards compatibility.
 				>
-					<TimeWrapper
-						className="components-datetime__time-field components-datetime__time-field-time" // Unused, for backwards compatibility.
-					>
-						<HoursInput
-							className="components-datetime__time-field-hours-input" // Unused, for backwards compatibility.
-							label={ __( 'Hours' ) }
-							hideLabelFromVision
-							__next40pxDefaultSize
-							value={ hours }
-							step={ 1 }
-							min={ is12Hour ? 1 : 0 }
-							max={ is12Hour ? 12 : 23 }
-							required
-							spinControls="none"
-							isPressEnterToChange
-							isDragEnabled={ false }
-							isShiftStepEnabled={ false }
-							onChange={ buildNumberControlChangeCallback(
-								'hours'
-							) }
-							__unstableStateReducer={ buildPadInputStateReducer(
-								2
-							) }
-						/>
-						<TimeSeparator
-							className="components-datetime__time-separator" // Unused, for backwards compatibility.
-							aria-hidden="true"
-						>
-							:
-						</TimeSeparator>
-						<MinutesInput
-							className="components-datetime__time-field-minutes-input" // Unused, for backwards compatibility.
-							label={ __( 'Minutes' ) }
-							hideLabelFromVision
-							__next40pxDefaultSize
-							value={ minutes }
-							step={ 1 }
-							min={ 0 }
-							max={ 59 }
-							required
-							spinControls="none"
-							isPressEnterToChange
-							isDragEnabled={ false }
-							isShiftStepEnabled={ false }
-							onChange={ buildNumberControlChangeCallback(
-								'minutes'
-							) }
-							__unstableStateReducer={ buildPadInputStateReducer(
-								2
-							) }
-						/>
-					</TimeWrapper>
-					{ is12Hour && (
-						<ButtonGroup
-							className="components-datetime__time-field components-datetime__time-field-am-pm" // Unused, for backwards compatibility.
-						>
-							<Button
-								className="components-datetime__time-am-button" // Unused, for backwards compatibility.
-								variant={
-									am === 'AM' ? 'primary' : 'secondary'
-								}
-								__next40pxDefaultSize
-								onClick={ buildAmPmChangeCallback( 'AM' ) }
-							>
-								{ __( 'AM' ) }
-							</Button>
-							<Button
-								className="components-datetime__time-pm-button" // Unused, for backwards compatibility.
-								variant={
-									am === 'PM' ? 'primary' : 'secondary'
-								}
-								__next40pxDefaultSize
-								onClick={ buildAmPmChangeCallback( 'PM' ) }
-							>
-								{ __( 'PM' ) }
-							</Button>
-						</ButtonGroup>
-					) }
+					<TimeInput
+						value={ {
+							hours: Number( hours ),
+							minutes: Number( minutes ),
+						} }
+						is12Hour={ is12Hour }
+						onChange={ onTimeInputChangeCallback }
+					/>
 					<Spacer />
 					<TimeZone />
 				</HStack>
 			</Fieldset>
 			<Fieldset>
-				<BaseControl.VisualLabel
-					as="legend"
-					className="components-datetime__time-legend" // Unused, for backwards compatibility.
-				>
-					{ __( 'Date' ) }
-				</BaseControl.VisualLabel>
+				{ hideLabelFromVision ? (
+					<VisuallyHidden as="legend">
+						{ __( 'Date' ) }
+					</VisuallyHidden>
+				) : (
+					<BaseControl.VisualLabel
+						as="legend"
+						className="components-datetime__time-legend" // Unused, for backwards compatibility.
+					>
+						{ __( 'Date' ) }
+					</BaseControl.VisualLabel>
+				) }
 				<HStack
 					className="components-datetime__time-wrapper" // Unused, for backwards compatibility.
 				>
-					{ is12Hour ? (
-						<>
-							{ monthField }
-							{ dayField }
-						</>
-					) : (
-						<>
-							{ dayField }
-							{ monthField }
-						</>
-					) }
-					<YearInput
-						className="components-datetime__time-field components-datetime__time-field-year" // Unused, for backwards compatibility.
-						label={ __( 'Year' ) }
-						hideLabelFromVision
-						__next40pxDefaultSize
-						value={ year }
-						step={ 1 }
-						min={ 1 }
-						max={ 9999 }
-						required
-						spinControls="none"
-						isPressEnterToChange
-						isDragEnabled={ false }
-						isShiftStepEnabled={ false }
-						onChange={ buildNumberControlChangeCallback( 'year' ) }
-						__unstableStateReducer={ buildPadInputStateReducer(
-							4
-						) }
-					/>
+					{ fields }
 				</HStack>
 			</Fieldset>
 		</Wrapper>
 	);
 }
 
+/**
+ * A component to input a time.
+ *
+ * Values are passed as an object in 24-hour format (`{ hours: number, minutes: number }`).
+ *
+ * ```jsx
+ * import { TimePicker } from '@wordpress/components';
+ * import { useState } from '@wordpress/element';
+ *
+ * const MyTimeInput = () => {
+ * 	const [ time, setTime ] = useState( { hours: 13, minutes: 30 } );
+ *
+ * 	return (
+ * 		<TimePicker.TimeInput
+ * 			value={ time }
+ * 			onChange={ setTime }
+ * 			label="Time"
+ * 		/>
+ * 	);
+ * };
+ * ```
+ */
+TimePicker.TimeInput = TimeInput;
+Object.assign( TimePicker.TimeInput, { displayName: 'TimePicker.TimeInput' } );
+
 export default TimePicker;
diff --git a/packages/components/src/date-time/time/styles.ts b/packages/components/src/date-time/time/styles.ts
index bba0cc500e0c8a..066c8fb1d1d3cd 100644
--- a/packages/components/src/date-time/time/styles.ts
+++ b/packages/components/src/date-time/time/styles.ts
@@ -62,6 +62,7 @@ export const HoursInput = styled( NumberControl )`
 export const TimeSeparator = styled.span`
 	border-top: ${ CONFIG.borderWidth } solid ${ COLORS.gray[ 700 ] };
 	border-bottom: ${ CONFIG.borderWidth } solid ${ COLORS.gray[ 700 ] };
+	font-size: ${ CONFIG.fontSize };
 	line-height: calc(
 		${ CONFIG.controlHeight } - ${ CONFIG.borderWidth } * 2
 	);
diff --git a/packages/components/src/date-time/time/test/index.tsx b/packages/components/src/date-time/time/test/index.tsx
index a4f7df4db2acba..6f843fda75336c 100644
--- a/packages/components/src/date-time/time/test/index.tsx
+++ b/packages/components/src/date-time/time/test/index.tsx
@@ -281,12 +281,9 @@ describe( 'TimePicker', () => {
 		expect(
 			( screen.getByLabelText( 'Minutes' ) as HTMLInputElement ).value
 		).toBe( '00' );
-		/**
-		 * This is not ideal, but best of we can do for now until we refactor
-		 * AM/PM into accessible elements, like radio buttons.
-		 */
-		expect( screen.getByText( 'AM' ) ).not.toHaveClass( 'is-primary' );
-		expect( screen.getByText( 'PM' ) ).toHaveClass( 'is-primary' );
+
+		expect( screen.getByRole( 'radio', { name: 'AM' } ) ).not.toBeChecked();
+		expect( screen.getByRole( 'radio', { name: 'PM' } ) ).toBeChecked();
 	} );
 
 	it( 'should have different layouts/orders for 12/24 hour formats', () => {
@@ -333,6 +330,67 @@ describe( 'TimePicker', () => {
 		expect( monthInputIndex < dayInputIndex ).toBe( true );
 	} );
 
+	it( 'Should change layouts/orders when `dateOrder` prop is passed', () => {
+		const onChangeSpy = jest.fn();
+
+		render(
+			<form aria-label="form">
+				<TimePicker
+					currentTime="1986-10-18T11:00:00"
+					onChange={ onChangeSpy }
+					dateOrder="ymd"
+				/>
+			</form>
+		);
+
+		const form = screen.getByRole( 'form' ) as HTMLFormElement;
+
+		const yearInputIndex = Array.from( form.elements ).indexOf(
+			screen.getByLabelText( 'Year' )
+		);
+
+		const monthInputIndex = Array.from( form.elements ).indexOf(
+			screen.getByLabelText( 'Month' )
+		);
+		const dayInputIndex = Array.from( form.elements ).indexOf(
+			screen.getByLabelText( 'Day' )
+		);
+
+		expect( monthInputIndex > yearInputIndex ).toBe( true );
+		expect( dayInputIndex > monthInputIndex ).toBe( true );
+	} );
+
+	it( 'Should ignore `is12Hour` prop setting when `dateOrder` prop is explicitly passed', () => {
+		const onChangeSpy = jest.fn();
+
+		render(
+			<form aria-label="form">
+				<TimePicker
+					currentTime="1986-10-18T11:00:00"
+					onChange={ onChangeSpy }
+					dateOrder="ymd"
+					is12Hour
+				/>
+			</form>
+		);
+
+		const form = screen.getByRole( 'form' ) as HTMLFormElement;
+
+		const yearInputIndex = Array.from( form.elements ).indexOf(
+			screen.getByLabelText( 'Year' )
+		);
+
+		const monthInputIndex = Array.from( form.elements ).indexOf(
+			screen.getByLabelText( 'Month' )
+		);
+		const dayInputIndex = Array.from( form.elements ).indexOf(
+			screen.getByLabelText( 'Day' )
+		);
+
+		expect( monthInputIndex > yearInputIndex ).toBe( true );
+		expect( dayInputIndex > monthInputIndex ).toBe( true );
+	} );
+
 	it( 'Should set a time when passed a null currentTime', () => {
 		const onChangeSpy = jest.fn();
 
diff --git a/packages/components/src/date-time/time/time-input/index.tsx b/packages/components/src/date-time/time/time-input/index.tsx
new file mode 100644
index 00000000000000..e2628fdb7a2b46
--- /dev/null
+++ b/packages/components/src/date-time/time/time-input/index.tsx
@@ -0,0 +1,196 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Fragment } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import {
+	TimeWrapper,
+	TimeSeparator,
+	HoursInput,
+	MinutesInput,
+	Fieldset,
+} from '../styles';
+import { HStack } from '../../../h-stack';
+import {
+	from12hTo24h,
+	from24hTo12h,
+	buildPadInputStateReducer,
+	validateInputElementTarget,
+} from '../../utils';
+import type { TimeInputProps } from '../../types';
+import type { InputChangeCallback } from '../../../input-control/types';
+import { useControlledValue } from '../../../utils';
+import BaseControl from '../../../base-control';
+import {
+	ToggleGroupControl,
+	ToggleGroupControlOption,
+} from '../../../toggle-group-control';
+
+export function TimeInput( {
+	value: valueProp,
+	defaultValue,
+	is12Hour,
+	label,
+	minutesProps,
+	onChange,
+}: TimeInputProps ) {
+	const [
+		value = {
+			hours: new Date().getHours(),
+			minutes: new Date().getMinutes(),
+		},
+		setValue,
+	] = useControlledValue( {
+		value: valueProp,
+		onChange,
+		defaultValue,
+	} );
+	const dayPeriod = parseDayPeriod( value.hours );
+	const hours12Format = from24hTo12h( value.hours );
+
+	const buildNumberControlChangeCallback = (
+		method: 'hours' | 'minutes'
+	): InputChangeCallback => {
+		return ( _value, { event } ) => {
+			if ( ! validateInputElementTarget( event ) ) {
+				return;
+			}
+
+			// We can safely assume value is a number if target is valid.
+			const numberValue = Number( _value );
+
+			setValue( {
+				...value,
+				[ method ]:
+					method === 'hours' && is12Hour
+						? from12hTo24h( numberValue, dayPeriod === 'PM' )
+						: numberValue,
+			} );
+		};
+	};
+
+	const buildAmPmChangeCallback = ( _value: 'AM' | 'PM' ) => {
+		return () => {
+			if ( dayPeriod === _value ) {
+				return;
+			}
+
+			setValue( {
+				...value,
+				hours: from12hTo24h( hours12Format, _value === 'PM' ),
+			} );
+		};
+	};
+
+	function parseDayPeriod( _hours: number ) {
+		return _hours < 12 ? 'AM' : 'PM';
+	}
+
+	const Wrapper = label ? Fieldset : Fragment;
+
+	return (
+		<Wrapper>
+			{ label && (
+				<BaseControl.VisualLabel as="legend">
+					{ label }
+				</BaseControl.VisualLabel>
+			) }
+
+			<HStack alignment="left" expanded={ false }>
+				<TimeWrapper
+					className="components-datetime__time-field components-datetime__time-field-time" // Unused, for backwards compatibility.
+				>
+					<HoursInput
+						className="components-datetime__time-field-hours-input" // Unused, for backwards compatibility.
+						label={ __( 'Hours' ) }
+						hideLabelFromVision
+						__next40pxDefaultSize
+						value={ String(
+							is12Hour ? hours12Format : value.hours
+						).padStart( 2, '0' ) }
+						step={ 1 }
+						min={ is12Hour ? 1 : 0 }
+						max={ is12Hour ? 12 : 23 }
+						required
+						spinControls="none"
+						isPressEnterToChange
+						isDragEnabled={ false }
+						isShiftStepEnabled={ false }
+						onChange={ buildNumberControlChangeCallback( 'hours' ) }
+						__unstableStateReducer={ buildPadInputStateReducer(
+							2
+						) }
+					/>
+					<TimeSeparator
+						className="components-datetime__time-separator" // Unused, for backwards compatibility.
+						aria-hidden="true"
+					>
+						:
+					</TimeSeparator>
+					<MinutesInput
+						className={ clsx(
+							'components-datetime__time-field-minutes-input', // Unused, for backwards compatibility.
+							minutesProps?.className
+						) }
+						label={ __( 'Minutes' ) }
+						hideLabelFromVision
+						__next40pxDefaultSize
+						value={ String( value.minutes ).padStart( 2, '0' ) }
+						step={ 1 }
+						min={ 0 }
+						max={ 59 }
+						required
+						spinControls="none"
+						isPressEnterToChange
+						isDragEnabled={ false }
+						isShiftStepEnabled={ false }
+						onChange={ ( ...args ) => {
+							buildNumberControlChangeCallback( 'minutes' )(
+								...args
+							);
+							minutesProps?.onChange?.( ...args );
+						} }
+						__unstableStateReducer={ buildPadInputStateReducer(
+							2
+						) }
+						{ ...minutesProps }
+					/>
+				</TimeWrapper>
+				{ is12Hour && (
+					<ToggleGroupControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
+						isBlock
+						label={ __( 'Select AM or PM' ) }
+						hideLabelFromVision
+						value={ dayPeriod }
+						onChange={ ( newValue ) => {
+							buildAmPmChangeCallback(
+								newValue as 'AM' | 'PM'
+							)();
+						} }
+					>
+						<ToggleGroupControlOption
+							value="AM"
+							label={ __( 'AM' ) }
+						/>
+						<ToggleGroupControlOption
+							value="PM"
+							label={ __( 'PM' ) }
+						/>
+					</ToggleGroupControl>
+				) }
+			</HStack>
+		</Wrapper>
+	);
+}
+export default TimeInput;
diff --git a/packages/components/src/date-time/time/time-input/test/index.tsx b/packages/components/src/date-time/time/time-input/test/index.tsx
new file mode 100644
index 00000000000000..eae082a12bc1c9
--- /dev/null
+++ b/packages/components/src/date-time/time/time-input/test/index.tsx
@@ -0,0 +1,170 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+/**
+ * Internal dependencies
+ */
+import TimeInput from '..';
+
+describe( 'TimeInput', () => {
+	it( 'should call onChange with updated values | 24-hours format', async () => {
+		const user = userEvent.setup();
+
+		const timeInputValue = { hours: 0, minutes: 0 };
+		const onChangeSpy = jest.fn();
+
+		render(
+			<TimeInput
+				defaultValue={ timeInputValue }
+				onChange={ onChangeSpy }
+			/>
+		);
+
+		const hoursInput = screen.getByRole( 'spinbutton', { name: 'Hours' } );
+		const minutesInput = screen.getByRole( 'spinbutton', {
+			name: 'Minutes',
+		} );
+
+		await user.clear( minutesInput );
+		await user.type( minutesInput, '35' );
+		await user.keyboard( '{Tab}' );
+
+		expect( onChangeSpy ).toHaveBeenCalledWith( { hours: 0, minutes: 35 } );
+		onChangeSpy.mockClear();
+
+		await user.clear( hoursInput );
+		await user.type( hoursInput, '12' );
+		await user.keyboard( '{Tab}' );
+
+		expect( onChangeSpy ).toHaveBeenCalledWith( {
+			hours: 12,
+			minutes: 35,
+		} );
+		onChangeSpy.mockClear();
+
+		await user.clear( hoursInput );
+		await user.type( hoursInput, '23' );
+		await user.keyboard( '{Tab}' );
+
+		expect( onChangeSpy ).toHaveBeenCalledWith( {
+			hours: 23,
+			minutes: 35,
+		} );
+		onChangeSpy.mockClear();
+
+		await user.clear( minutesInput );
+		await user.type( minutesInput, '0' );
+		await user.keyboard( '{Tab}' );
+
+		expect( onChangeSpy ).toHaveBeenCalledWith( { hours: 23, minutes: 0 } );
+	} );
+
+	it( 'should call onChange with updated values | 12-hours format', async () => {
+		const user = userEvent.setup();
+
+		const timeInputValue = { hours: 0, minutes: 0 };
+		const onChangeSpy = jest.fn();
+
+		render(
+			<TimeInput
+				is12Hour
+				defaultValue={ timeInputValue }
+				onChange={ onChangeSpy }
+			/>
+		);
+
+		const hoursInput = screen.getByRole( 'spinbutton', { name: 'Hours' } );
+		const minutesInput = screen.getByRole( 'spinbutton', {
+			name: 'Minutes',
+		} );
+		const amButton = screen.getByRole( 'radio', { name: 'AM' } );
+		const pmButton = screen.getByRole( 'radio', { name: 'PM' } );
+
+		expect( amButton ).toBeChecked();
+		expect( pmButton ).not.toBeChecked();
+		expect( hoursInput ).not.toHaveValue( 0 );
+		expect( hoursInput ).toHaveValue( 12 );
+
+		await user.clear( minutesInput );
+		await user.type( minutesInput, '35' );
+		await user.keyboard( '{Tab}' );
+
+		expect( onChangeSpy ).toHaveBeenCalledWith( { hours: 0, minutes: 35 } );
+		expect( amButton ).toBeChecked();
+
+		await user.clear( hoursInput );
+		await user.type( hoursInput, '12' );
+		await user.keyboard( '{Tab}' );
+
+		expect( onChangeSpy ).toHaveBeenCalledWith( { hours: 0, minutes: 35 } );
+
+		await user.click( pmButton );
+		expect( onChangeSpy ).toHaveBeenCalledWith( {
+			hours: 12,
+			minutes: 35,
+		} );
+		expect( pmButton ).toBeChecked();
+	} );
+
+	it( 'should call onChange with defined minutes steps', async () => {
+		const user = userEvent.setup();
+
+		const timeInputValue = { hours: 0, minutes: 0 };
+		const onChangeSpy = jest.fn();
+
+		render(
+			<TimeInput
+				defaultValue={ timeInputValue }
+				minutesProps={ { step: 5 } }
+				onChange={ onChangeSpy }
+			/>
+		);
+
+		const minutesInput = screen.getByRole( 'spinbutton', {
+			name: 'Minutes',
+		} );
+
+		await user.clear( minutesInput );
+		await user.keyboard( '{ArrowUp}' );
+
+		expect( minutesInput ).toHaveValue( 5 );
+
+		await user.keyboard( '{ArrowUp}' );
+		await user.keyboard( '{ArrowUp}' );
+
+		expect( minutesInput ).toHaveValue( 15 );
+
+		await user.keyboard( '{ArrowDown}' );
+
+		expect( minutesInput ).toHaveValue( 10 );
+
+		await user.clear( minutesInput );
+		await user.type( minutesInput, '44' );
+		await user.keyboard( '{Tab}' );
+
+		expect( minutesInput ).toHaveValue( 45 );
+
+		await user.clear( minutesInput );
+		await user.type( minutesInput, '51' );
+		await user.keyboard( '{Tab}' );
+
+		expect( minutesInput ).toHaveValue( 50 );
+	} );
+
+	it( 'should reflect changes to the value prop', () => {
+		const { rerender } = render(
+			<TimeInput value={ { hours: 0, minutes: 0 } } />
+		);
+		rerender( <TimeInput value={ { hours: 1, minutes: 2 } } /> );
+
+		expect(
+			screen.getByRole( 'spinbutton', { name: 'Hours' } )
+		).toHaveValue( 1 );
+		expect(
+			screen.getByRole( 'spinbutton', { name: 'Minutes' } )
+		).toHaveValue( 2 );
+	} );
+} );
diff --git a/packages/components/src/date-time/time/timezone.tsx b/packages/components/src/date-time/time/timezone.tsx
index 9b08eac6307aa7..5c839e8df3af48 100644
--- a/packages/components/src/date-time/time/timezone.tsx
+++ b/packages/components/src/date-time/time/timezone.tsx
@@ -30,7 +30,7 @@ const TimeZone = () => {
 	const zoneAbbr =
 		'' !== timezone.abbr && isNaN( Number( timezone.abbr ) )
 			? timezone.abbr
-			: `UTC${ offsetSymbol }${ timezone.offset }`;
+			: `UTC${ offsetSymbol }${ timezone.offsetFormatted }`;
 
 	// Replace underscore with space in strings like `America/Costa_Rica`.
 	const prettyTimezoneString = timezone.string.replace( '_', ' ' );
diff --git a/packages/components/src/date-time/types.ts b/packages/components/src/date-time/types.ts
index 02df096a866b9c..1f2298d9d450b5 100644
--- a/packages/components/src/date-time/types.ts
+++ b/packages/components/src/date-time/types.ts
@@ -1,3 +1,8 @@
+/**
+ * Internal dependencies
+ */
+import type { MinutesInput } from './time/styles';
+
 export type TimePickerProps = {
 	/**
 	 * The initial current time the time picker should render.
@@ -11,11 +16,76 @@ export type TimePickerProps = {
 	 */
 	is12Hour?: boolean;
 
+	/**
+	 * The order of day, month, and year. This prop overrides the time format
+	 * determined by `is12Hour` prop.
+	 *
+	 * @default 'dmy'
+	 */
+	dateOrder?: 'dmy' | 'mdy' | 'ymd';
+
 	/**
 	 * The function called when a new time has been selected. It is passed the
 	 * time as an argument.
 	 */
 	onChange?: ( time: string ) => void;
+
+	/**
+	 * If true, the label will only be visible to screen readers.
+	 *
+	 * @default false
+	 */
+	hideLabelFromVision?: boolean;
+};
+
+export type TimeInputValue = {
+	/**
+	 * The hours value in 24-hour format.
+	 */
+	hours: number;
+
+	/**
+	 * The minutes value.
+	 */
+	minutes: number;
+};
+
+export type TimeInputProps = {
+	/**
+	 * Whether we use a 12-hour clock. With a 12-hour clock, an AM/PM widget is
+	 * displayed
+	 */
+	is12Hour?: boolean;
+
+	/**
+	 * The time input object with hours and minutes values.
+	 *
+	 * - hours: number (24-hour format)
+	 * - minutes: number
+	 */
+	value?: TimeInputValue;
+
+	/**
+	 * An optional default value for the control when used in uncontrolled mode.
+	 * If left `undefined`, the current time will be used.
+	 */
+	defaultValue?: TimeInputValue;
+
+	/**
+	 * The props to pass down to the minutes input.
+	 */
+	minutesProps?: React.ComponentProps< typeof MinutesInput >;
+
+	/**
+	 * The label for the time input.
+	 */
+	label?: string;
+
+	/**
+	 * The function is called when a new time has been selected.
+	 * Passing hours and minutes as an object properties.
+	 */
+	onChange?: ( time: TimeInputValue ) => void;
 };
 
 export type DatePickerEvent = {
@@ -67,7 +137,10 @@ export type DatePickerProps = {
 };
 
 export type DateTimePickerProps = Omit< DatePickerProps, 'onChange' > &
-	Omit< TimePickerProps, 'currentTime' | 'onChange' > & {
+	Omit<
+		TimePickerProps,
+		'currentTime' | 'onChange' | 'hideLabelFromVision'
+	> & {
 		/**
 		 * The function called when a new date or time has been selected. It is
 		 * passed the date and time as an argument.
diff --git a/packages/components/src/date-time/utils.ts b/packages/components/src/date-time/utils.ts
index ab60179421cb4e..76250edc1959cd 100644
--- a/packages/components/src/date-time/utils.ts
+++ b/packages/components/src/date-time/utils.ts
@@ -3,6 +3,13 @@
  */
 import { toDate } from 'date-fns';
 
+/**
+ * Internal dependencies
+ */
+import type { InputState } from '../input-control/reducer/state';
+import type { InputAction } from '../input-control/reducer/actions';
+import { COMMIT, PRESS_DOWN, PRESS_UP } from '../input-control/reducer/actions';
+
 /**
  * Like date-fn's toDate, but tries to guess the format when a string is
  * given.
@@ -15,3 +22,65 @@ export function inputToDate( input: Date | string | number ): Date {
 	}
 	return toDate( input );
 }
+
+/**
+ * Converts a 12-hour time to a 24-hour time.
+ * @param hours
+ * @param isPm
+ */
+export function from12hTo24h( hours: number, isPm: boolean ) {
+	return isPm ? ( ( hours % 12 ) + 12 ) % 24 : hours % 12;
+}
+
+/**
+ * Converts a 24-hour time to a 12-hour time.
+ * @param hours
+ */
+export function from24hTo12h( hours: number ) {
+	return hours % 12 || 12;
+}
+
+/**
+ * Creates an InputControl reducer used to pad an input so that it is always a
+ * given width. For example, the hours and minutes inputs are padded to 2 so
+ * that '4' appears as '04'.
+ *
+ * @param pad How many digits the value should be.
+ */
+export function buildPadInputStateReducer( pad: number ) {
+	return ( state: InputState, action: InputAction ) => {
+		const nextState = { ...state };
+		if (
+			action.type === COMMIT ||
+			action.type === PRESS_UP ||
+			action.type === PRESS_DOWN
+		) {
+			if ( nextState.value !== undefined ) {
+				nextState.value = nextState.value
+					.toString()
+					.padStart( pad, '0' );
+			}
+		}
+		return nextState;
+	};
+}
+
+/**
+ * Validates the target of a React event to ensure it is an input element and
+ * that the input is valid.
+ * @param event
+ */
+export function validateInputElementTarget( event: React.SyntheticEvent ) {
+	// `instanceof` checks need to get the instance definition from the
+	// corresponding window object — therefore, the following logic makes
+	// the component work correctly even when rendered inside an iframe.
+	const HTMLInputElementInstance =
+		( event.target as HTMLInputElement )?.ownerDocument.defaultView
+			?.HTMLInputElement ?? HTMLInputElement;
+
+	if ( ! ( event.target instanceof HTMLInputElementInstance ) ) {
+		return false;
+	}
+
+	return event.target.validity.valid;
+}
diff --git a/packages/components/src/dimension-control/README.md b/packages/components/src/dimension-control/README.md
index 498322931b7ab6..78c1a60275c13a 100644
--- a/packages/components/src/dimension-control/README.md
+++ b/packages/components/src/dimension-control/README.md
@@ -1,5 +1,9 @@
 # DimensionControl
 
+<div class="callout callout-alert">
+This component is deprecated.
+</div>
+
 <div class="callout callout-alert">
 This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
 </div>
@@ -17,6 +21,7 @@ export default function MyCustomDimensionControl() {
 
 	return (
 		<DimensionControl
+			__nextHasNoMarginBottom
 			label={ 'Padding' }
 			icon={ 'desktop' }
 			onChange={ ( value ) => setPaddingSize( value ) }
@@ -91,3 +96,19 @@ A callback which is triggered when a spacing size value changes (is selected/cli
 -   **Required:** No
 
 A string of classes to be added to the control component.
+
+### `__next40pxDefaultSize`
+
+-   **Type:** `Boolean`
+-   **Required:** No
+-   **Default:** `false`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+### `__nextHasNoMarginBottom`
+
+-   **Type:** `Boolean`
+-   **Required:** No
+-   **Default:** `false`
+
+Start opting into the new margin-free styles that will become the default in a future version.
diff --git a/packages/components/src/dimension-control/index.tsx b/packages/components/src/dimension-control/index.tsx
index 0fbdd62b58a00d..25880f9b4fdb38 100644
--- a/packages/components/src/dimension-control/index.tsx
+++ b/packages/components/src/dimension-control/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -16,11 +16,21 @@ import SelectControl from '../select-control';
 import sizesTable, { findSizeBySlug } from './sizes';
 import type { DimensionControlProps, Size } from './types';
 import type { SelectControlSingleSelectionProps } from '../select-control/types';
+import { ContextSystemProvider } from '../context';
+import deprecated from '@wordpress/deprecated';
+
+const CONTEXT_VALUE = {
+	BaseControl: {
+		// Temporary during deprecation grace period: Overrides the underlying `__associatedWPComponentName`
+		// via the context system to override the value set by SelectControl.
+		_overrides: { __associatedWPComponentName: 'DimensionControl' },
+	},
+};
 
 /**
  * `DimensionControl` is a component designed to provide a UI to control spacing and/or dimensions.
  *
- * This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
+ * @deprecated
  *
  * ```jsx
  * import { __experimentalDimensionControl as DimensionControl } from '@wordpress/components';
@@ -31,6 +41,7 @@ import type { SelectControlSingleSelectionProps } from '../select-control/types'
  *
  * 	return (
  * 		<DimensionControl
+ * 			__nextHasNoMarginBottom
  * 			label={ 'Padding' }
  * 			icon={ 'desktop' }
  * 			onChange={ ( value ) => setPaddingSize( value ) }
@@ -42,6 +53,8 @@ import type { SelectControlSingleSelectionProps } from '../select-control/types'
  */
 export function DimensionControl( props: DimensionControlProps ) {
 	const {
+		__next40pxDefaultSize = false,
+		__nextHasNoMarginBottom = false,
 		label,
 		value,
 		sizes = sizesTable,
@@ -50,6 +63,11 @@ export function DimensionControl( props: DimensionControlProps ) {
 		className = '',
 	} = props;
 
+	deprecated( 'wp.components.DimensionControl', {
+		since: '6.7',
+		version: '7.0',
+	} );
+
 	const onChangeSpacingSize: SelectControlSingleSelectionProps[ 'onChange' ] =
 		( val ) => {
 			const theSize = findSizeBySlug( sizes, val );
@@ -84,17 +102,21 @@ export function DimensionControl( props: DimensionControlProps ) {
 	);
 
 	return (
-		<SelectControl
-			className={ classnames(
-				className,
-				'block-editor-dimension-control'
-			) }
-			label={ selectLabel }
-			hideLabelFromVision={ false }
-			value={ value }
-			onChange={ onChangeSpacingSize }
-			options={ formatSizesAsOptions( sizes ) }
-		/>
+		<ContextSystemProvider value={ CONTEXT_VALUE }>
+			<SelectControl
+				__next40pxDefaultSize={ __next40pxDefaultSize }
+				__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+				className={ clsx(
+					className,
+					'block-editor-dimension-control'
+				) }
+				label={ selectLabel }
+				hideLabelFromVision={ false }
+				value={ value }
+				onChange={ onChangeSpacingSize }
+				options={ formatSizesAsOptions( sizes ) }
+			/>
+		</ContextSystemProvider>
 	);
 }
 
diff --git a/packages/components/src/dimension-control/stories/index.story.tsx b/packages/components/src/dimension-control/stories/index.story.tsx
index 0698125c446ca7..15a63fcf6ccf6c 100644
--- a/packages/components/src/dimension-control/stories/index.story.tsx
+++ b/packages/components/src/dimension-control/stories/index.story.tsx
@@ -13,9 +13,15 @@ import sizes from '../sizes';
  */
 import { desktop, tablet, mobile } from '@wordpress/icons';
 
-export default {
+/**
+ * `DimensionControl` is a component designed to provide a UI to control spacing and/or dimensions.
+ *
+ * This component is deprecated.
+ */
+const meta: Meta< typeof DimensionControl > = {
 	component: DimensionControl,
-	title: 'Components (Experimental)/DimensionControl',
+	title: 'Components (Deprecated)/DimensionControl',
+	id: 'components-dimensioncontrol',
 	argTypes: {
 		onChange: { action: 'onChange' },
 		value: { control: { type: null } },
@@ -29,20 +35,21 @@ export default {
 				mobile,
 			},
 		},
-		parameters: {
-			controls: { expanded: true },
-			docs: { canvas: { sourceState: 'shown' } },
-		},
 	},
-} as Meta< typeof DimensionControl >;
+	parameters: {
+		controls: { expanded: true },
+		docs: { canvas: { sourceState: 'shown' } },
+	},
+};
+export default meta;
 
 const Template: StoryFn< typeof DimensionControl > = ( args ) => (
 	<DimensionControl { ...args } />
 );
 
 export const Default = Template.bind( {} );
-
 Default.args = {
+	__nextHasNoMarginBottom: true,
 	label: 'Please select a size',
 	sizes,
 };
diff --git a/packages/components/src/dimension-control/test/__snapshots__/index.test.js.snap b/packages/components/src/dimension-control/test/__snapshots__/index.test.js.snap
index 9b3f8b2d90e987..bd2c26d641fe72 100644
--- a/packages/components/src/dimension-control/test/__snapshots__/index.test.js.snap
+++ b/packages/components/src/dimension-control/test/__snapshots__/index.test.js.snap
@@ -13,15 +13,11 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
   box-sizing: inherit;
 }
 
-.emotion-2 {
-  margin-bottom: calc(4px * 2);
-}
-
 .components-panel__row .emotion-2 {
   margin-bottom: inherit;
 }
 
-.emotion-5 {
+.emotion-6 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -41,13 +37,22 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
   position: relative;
   border-radius: 2px;
   padding-top: 0;
+  color: var(--wp-components-color-foreground, #1e1e1e);
+  cursor: pointer;
 }
 
-.emotion-5>* {
+.emotion-6>* {
   min-height: 0;
 }
 
-.emotion-8 {
+.emotion-6:focus-within:not( :has( :is( .em5sgkm8, .emotion-19 ):focus-within ) ) .emotion-26 {
+  border-color: var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+  box-shadow: 0 0 0 0.5px var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+  outline: 2px solid transparent;
+  outline-offset: -2px;
+}
+
+.emotion-9 {
   display: block;
   max-height: 100%;
   max-width: 100%;
@@ -57,15 +62,17 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
   max-width: calc( 100% - 10px );
 }
 
-.emotion-11 {
+.emotion-12 {
   color: #1e1e1e;
-  line-height: 1.2;
+  line-height: 1.4;
   margin: 0;
+  text-wrap: balance;
+  text-wrap: pretty;
   font-size: calc((13 / 13) * 13px);
   font-weight: normal;
 }
 
-.emotion-11.emotion-11.emotion-11 {
+.emotion-12.emotion-12.emotion-12 {
   font-size: 11px;
   font-weight: 500;
   line-height: 1.4;
@@ -81,7 +88,7 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
   white-space: nowrap;
 }
 
-.emotion-13 {
+.emotion-14 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -96,11 +103,11 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
   -ms-flex: 1;
   flex: 1;
   position: relative;
-  background-color: #fff;
+  background-color: var(--wp-components-color-background, #fff);
   width: 100%;
 }
 
-.emotion-15.emotion-15.emotion-15 {
+.emotion-16.emotion-16.emotion-16 {
   -webkit-appearance: none;
   -moz-appearance: none;
   -ms-appearance: none;
@@ -109,13 +116,13 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
   box-sizing: border-box;
   border: none;
   box-shadow: none!important;
-  color: #1e1e1e;
+  color: currentColor;
+  cursor: inherit;
   display: block;
   font-family: inherit;
   margin: 0;
   width: 100%;
   max-width: none;
-  cursor: pointer;
   white-space: nowrap;
   text-overflow: ellipsis;
   font-size: 16px;
@@ -129,12 +136,12 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
 }
 
 @media ( min-width: 600px ) {
-  .emotion-15.emotion-15.emotion-15 {
+  .emotion-16.emotion-16.emotion-16 {
     font-size: 13px;
   }
 }
 
-.emotion-17 {
+.emotion-18 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -149,23 +156,30 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
   display: flex;
 }
 
-.emotion-20 {
-  margin-bottom: 0;
-  padding-right: calc(4px * 2);
+.emotion-21 {
+  -webkit-padding-end: 8px;
+  padding-inline-end: 8px;
   position: absolute;
   pointer-events: none;
   right: 0;
 }
 
-.emotion-22 {
+.emotion-23 {
   -webkit-margin-end: calc(4px * -1);
   margin-inline-end: calc(4px * -1);
   line-height: 0;
 }
 
-.emotion-24.emotion-24.emotion-24 {
+.emotion-23 path {
+  fill: currentColor;
+}
+
+.emotion-25.emotion-25.emotion-25 {
   box-sizing: border-box;
+  border-color: var(--wp-components-color-gray-600, #949494);
   border-radius: inherit;
+  border-style: solid;
+  border-width: 1px;
   bottom: 0;
   left: 0;
   margin: 0;
@@ -174,9 +188,6 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
   position: absolute;
   right: 0;
   top: 0;
-  border-color: #949494;
-  border-style: solid;
-  border-width: 1px;
   padding-left: 2px;
 }
 
@@ -188,17 +199,17 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
       class="components-base-control__field emotion-2 emotion-3"
     >
       <div
-        class="components-flex components-select-control block-editor-dimension-control emotion-4 emotion-5 emotion-6"
+        class="components-flex components-input-base components-select-control block-editor-dimension-control emotion-4 emotion-5 emotion-6 emotion-7"
         data-wp-c16t="true"
-        data-wp-component="Flex"
+        data-wp-component="InputBase"
       >
         <div
-          class="components-flex-item emotion-7 emotion-8 emotion-6"
+          class="components-flex-item emotion-8 emotion-9 emotion-7"
           data-wp-c16t="true"
           data-wp-component="FlexItem"
         >
           <label
-            class="components-truncate components-text components-input-control__label emotion-10 emotion-11 emotion-6"
+            class="components-truncate components-text components-input-control__label emotion-11 emotion-12 emotion-7"
             data-wp-c16t="true"
             data-wp-component="Text"
             for="inspector-select-control-3"
@@ -207,10 +218,10 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
           </label>
         </div>
         <div
-          class="components-input-control__container emotion-13 emotion-14"
+          class="components-input-control__container emotion-14 emotion-15"
         >
           <select
-            class="components-select-control__input emotion-15 emotion-16"
+            class="components-select-control__input emotion-16 emotion-17"
             id="inspector-select-control-3"
           >
             <option
@@ -235,15 +246,15 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
             </option>
           </select>
           <span
-            class="components-input-control__suffix emotion-17 emotion-18"
+            class="components-input-control__suffix emotion-18 emotion-19"
           >
             <div
-              class="components-spacer components-input-control-suffix-wrapper emotion-19 emotion-20 emotion-6"
+              class="components-input-control-suffix-wrapper emotion-20 emotion-21 emotion-22"
               data-wp-c16t="true"
               data-wp-component="InputControlSuffixWrapper"
             >
               <div
-                class="emotion-22 emotion-23"
+                class="emotion-23 emotion-24"
               >
                 <svg
                   aria-hidden="true"
@@ -262,7 +273,7 @@ exports[`DimensionControl rendering renders with custom sizes 1`] = `
           </span>
           <div
             aria-hidden="true"
-            class="components-input-control__backdrop emotion-24 emotion-25"
+            class="components-input-control__backdrop emotion-25 emotion-26"
           />
         </div>
       </div>
@@ -284,15 +295,11 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
   box-sizing: inherit;
 }
 
-.emotion-2 {
-  margin-bottom: calc(4px * 2);
-}
-
 .components-panel__row .emotion-2 {
   margin-bottom: inherit;
 }
 
-.emotion-5 {
+.emotion-6 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -312,13 +319,22 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
   position: relative;
   border-radius: 2px;
   padding-top: 0;
+  color: var(--wp-components-color-foreground, #1e1e1e);
+  cursor: pointer;
 }
 
-.emotion-5>* {
+.emotion-6>* {
   min-height: 0;
 }
 
-.emotion-8 {
+.emotion-6:focus-within:not( :has( :is( .em5sgkm8, .emotion-19 ):focus-within ) ) .emotion-26 {
+  border-color: var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+  box-shadow: 0 0 0 0.5px var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+  outline: 2px solid transparent;
+  outline-offset: -2px;
+}
+
+.emotion-9 {
   display: block;
   max-height: 100%;
   max-width: 100%;
@@ -328,15 +344,17 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
   max-width: calc( 100% - 10px );
 }
 
-.emotion-11 {
+.emotion-12 {
   color: #1e1e1e;
-  line-height: 1.2;
+  line-height: 1.4;
   margin: 0;
+  text-wrap: balance;
+  text-wrap: pretty;
   font-size: calc((13 / 13) * 13px);
   font-weight: normal;
 }
 
-.emotion-11.emotion-11.emotion-11 {
+.emotion-12.emotion-12.emotion-12 {
   font-size: 11px;
   font-weight: 500;
   line-height: 1.4;
@@ -352,7 +370,7 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
   white-space: nowrap;
 }
 
-.emotion-13 {
+.emotion-14 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -367,11 +385,11 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
   -ms-flex: 1;
   flex: 1;
   position: relative;
-  background-color: #fff;
+  background-color: var(--wp-components-color-background, #fff);
   width: 100%;
 }
 
-.emotion-15.emotion-15.emotion-15 {
+.emotion-16.emotion-16.emotion-16 {
   -webkit-appearance: none;
   -moz-appearance: none;
   -ms-appearance: none;
@@ -380,13 +398,13 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
   box-sizing: border-box;
   border: none;
   box-shadow: none!important;
-  color: #1e1e1e;
+  color: currentColor;
+  cursor: inherit;
   display: block;
   font-family: inherit;
   margin: 0;
   width: 100%;
   max-width: none;
-  cursor: pointer;
   white-space: nowrap;
   text-overflow: ellipsis;
   font-size: 16px;
@@ -400,12 +418,12 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
 }
 
 @media ( min-width: 600px ) {
-  .emotion-15.emotion-15.emotion-15 {
+  .emotion-16.emotion-16.emotion-16 {
     font-size: 13px;
   }
 }
 
-.emotion-17 {
+.emotion-18 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -420,23 +438,30 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
   display: flex;
 }
 
-.emotion-20 {
-  margin-bottom: 0;
-  padding-right: calc(4px * 2);
+.emotion-21 {
+  -webkit-padding-end: 8px;
+  padding-inline-end: 8px;
   position: absolute;
   pointer-events: none;
   right: 0;
 }
 
-.emotion-22 {
+.emotion-23 {
   -webkit-margin-end: calc(4px * -1);
   margin-inline-end: calc(4px * -1);
   line-height: 0;
 }
 
-.emotion-24.emotion-24.emotion-24 {
+.emotion-23 path {
+  fill: currentColor;
+}
+
+.emotion-25.emotion-25.emotion-25 {
   box-sizing: border-box;
+  border-color: var(--wp-components-color-gray-600, #949494);
   border-radius: inherit;
+  border-style: solid;
+  border-width: 1px;
   bottom: 0;
   left: 0;
   margin: 0;
@@ -445,9 +470,6 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
   position: absolute;
   right: 0;
   top: 0;
-  border-color: #949494;
-  border-style: solid;
-  border-width: 1px;
   padding-left: 2px;
 }
 
@@ -459,17 +481,17 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
       class="components-base-control__field emotion-2 emotion-3"
     >
       <div
-        class="components-flex components-select-control block-editor-dimension-control emotion-4 emotion-5 emotion-6"
+        class="components-flex components-input-base components-select-control block-editor-dimension-control emotion-4 emotion-5 emotion-6 emotion-7"
         data-wp-c16t="true"
-        data-wp-component="Flex"
+        data-wp-component="InputBase"
       >
         <div
-          class="components-flex-item emotion-7 emotion-8 emotion-6"
+          class="components-flex-item emotion-8 emotion-9 emotion-7"
           data-wp-c16t="true"
           data-wp-component="FlexItem"
         >
           <label
-            class="components-truncate components-text components-input-control__label emotion-10 emotion-11 emotion-6"
+            class="components-truncate components-text components-input-control__label emotion-11 emotion-12 emotion-7"
             data-wp-c16t="true"
             data-wp-component="Text"
             for="inspector-select-control-0"
@@ -478,10 +500,10 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
           </label>
         </div>
         <div
-          class="components-input-control__container emotion-13 emotion-14"
+          class="components-input-control__container emotion-14 emotion-15"
         >
           <select
-            class="components-select-control__input emotion-15 emotion-16"
+            class="components-select-control__input emotion-16 emotion-17"
             id="inspector-select-control-0"
           >
             <option
@@ -516,15 +538,15 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
             </option>
           </select>
           <span
-            class="components-input-control__suffix emotion-17 emotion-18"
+            class="components-input-control__suffix emotion-18 emotion-19"
           >
             <div
-              class="components-spacer components-input-control-suffix-wrapper emotion-19 emotion-20 emotion-6"
+              class="components-input-control-suffix-wrapper emotion-20 emotion-21 emotion-22"
               data-wp-c16t="true"
               data-wp-component="InputControlSuffixWrapper"
             >
               <div
-                class="emotion-22 emotion-23"
+                class="emotion-23 emotion-24"
               >
                 <svg
                   aria-hidden="true"
@@ -543,7 +565,7 @@ exports[`DimensionControl rendering renders with defaults 1`] = `
           </span>
           <div
             aria-hidden="true"
-            class="components-input-control__backdrop emotion-24 emotion-25"
+            class="components-input-control__backdrop emotion-25 emotion-26"
           />
         </div>
       </div>
@@ -565,15 +587,11 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
   box-sizing: inherit;
 }
 
-.emotion-2 {
-  margin-bottom: calc(4px * 2);
-}
-
 .components-panel__row .emotion-2 {
   margin-bottom: inherit;
 }
 
-.emotion-5 {
+.emotion-6 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -593,13 +611,22 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
   position: relative;
   border-radius: 2px;
   padding-top: 0;
+  color: var(--wp-components-color-foreground, #1e1e1e);
+  cursor: pointer;
 }
 
-.emotion-5>* {
+.emotion-6>* {
   min-height: 0;
 }
 
-.emotion-8 {
+.emotion-6:focus-within:not( :has( :is( .em5sgkm8, .emotion-19 ):focus-within ) ) .emotion-26 {
+  border-color: var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+  box-shadow: 0 0 0 0.5px var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+  outline: 2px solid transparent;
+  outline-offset: -2px;
+}
+
+.emotion-9 {
   display: block;
   max-height: 100%;
   max-width: 100%;
@@ -609,15 +636,17 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
   max-width: calc( 100% - 10px );
 }
 
-.emotion-11 {
+.emotion-12 {
   color: #1e1e1e;
-  line-height: 1.2;
+  line-height: 1.4;
   margin: 0;
+  text-wrap: balance;
+  text-wrap: pretty;
   font-size: calc((13 / 13) * 13px);
   font-weight: normal;
 }
 
-.emotion-11.emotion-11.emotion-11 {
+.emotion-12.emotion-12.emotion-12 {
   font-size: 11px;
   font-weight: 500;
   line-height: 1.4;
@@ -633,7 +662,7 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
   white-space: nowrap;
 }
 
-.emotion-13 {
+.emotion-14 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -648,11 +677,11 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
   -ms-flex: 1;
   flex: 1;
   position: relative;
-  background-color: #fff;
+  background-color: var(--wp-components-color-background, #fff);
   width: 100%;
 }
 
-.emotion-15.emotion-15.emotion-15 {
+.emotion-16.emotion-16.emotion-16 {
   -webkit-appearance: none;
   -moz-appearance: none;
   -ms-appearance: none;
@@ -661,13 +690,13 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
   box-sizing: border-box;
   border: none;
   box-shadow: none!important;
-  color: #1e1e1e;
+  color: currentColor;
+  cursor: inherit;
   display: block;
   font-family: inherit;
   margin: 0;
   width: 100%;
   max-width: none;
-  cursor: pointer;
   white-space: nowrap;
   text-overflow: ellipsis;
   font-size: 16px;
@@ -681,12 +710,12 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
 }
 
 @media ( min-width: 600px ) {
-  .emotion-15.emotion-15.emotion-15 {
+  .emotion-16.emotion-16.emotion-16 {
     font-size: 13px;
   }
 }
 
-.emotion-17 {
+.emotion-18 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -701,23 +730,30 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
   display: flex;
 }
 
-.emotion-20 {
-  margin-bottom: 0;
-  padding-right: calc(4px * 2);
+.emotion-21 {
+  -webkit-padding-end: 8px;
+  padding-inline-end: 8px;
   position: absolute;
   pointer-events: none;
   right: 0;
 }
 
-.emotion-22 {
+.emotion-23 {
   -webkit-margin-end: calc(4px * -1);
   margin-inline-end: calc(4px * -1);
   line-height: 0;
 }
 
-.emotion-24.emotion-24.emotion-24 {
+.emotion-23 path {
+  fill: currentColor;
+}
+
+.emotion-25.emotion-25.emotion-25 {
   box-sizing: border-box;
+  border-color: var(--wp-components-color-gray-600, #949494);
   border-radius: inherit;
+  border-style: solid;
+  border-width: 1px;
   bottom: 0;
   left: 0;
   margin: 0;
@@ -726,9 +762,6 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
   position: absolute;
   right: 0;
   top: 0;
-  border-color: #949494;
-  border-style: solid;
-  border-width: 1px;
   padding-left: 2px;
 }
 
@@ -740,17 +773,17 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
       class="components-base-control__field emotion-2 emotion-3"
     >
       <div
-        class="components-flex components-select-control block-editor-dimension-control emotion-4 emotion-5 emotion-6"
+        class="components-flex components-input-base components-select-control block-editor-dimension-control emotion-4 emotion-5 emotion-6 emotion-7"
         data-wp-c16t="true"
-        data-wp-component="Flex"
+        data-wp-component="InputBase"
       >
         <div
-          class="components-flex-item emotion-7 emotion-8 emotion-6"
+          class="components-flex-item emotion-8 emotion-9 emotion-7"
           data-wp-c16t="true"
           data-wp-component="FlexItem"
         >
           <label
-            class="components-truncate components-text components-input-control__label emotion-10 emotion-11 emotion-6"
+            class="components-truncate components-text components-input-control__label emotion-11 emotion-12 emotion-7"
             data-wp-c16t="true"
             data-wp-component="Text"
             for="inspector-select-control-2"
@@ -771,10 +804,10 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
           </label>
         </div>
         <div
-          class="components-input-control__container emotion-13 emotion-14"
+          class="components-input-control__container emotion-14 emotion-15"
         >
           <select
-            class="components-select-control__input emotion-15 emotion-16"
+            class="components-select-control__input emotion-16 emotion-17"
             id="inspector-select-control-2"
           >
             <option
@@ -809,15 +842,15 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
             </option>
           </select>
           <span
-            class="components-input-control__suffix emotion-17 emotion-18"
+            class="components-input-control__suffix emotion-18 emotion-19"
           >
             <div
-              class="components-spacer components-input-control-suffix-wrapper emotion-19 emotion-20 emotion-6"
+              class="components-input-control-suffix-wrapper emotion-20 emotion-21 emotion-22"
               data-wp-c16t="true"
               data-wp-component="InputControlSuffixWrapper"
             >
               <div
-                class="emotion-22 emotion-23"
+                class="emotion-23 emotion-24"
               >
                 <svg
                   aria-hidden="true"
@@ -836,7 +869,7 @@ exports[`DimensionControl rendering renders with icon and custom icon label 1`]
           </span>
           <div
             aria-hidden="true"
-            class="components-input-control__backdrop emotion-24 emotion-25"
+            class="components-input-control__backdrop emotion-25 emotion-26"
           />
         </div>
       </div>
@@ -858,15 +891,11 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
   box-sizing: inherit;
 }
 
-.emotion-2 {
-  margin-bottom: calc(4px * 2);
-}
-
 .components-panel__row .emotion-2 {
   margin-bottom: inherit;
 }
 
-.emotion-5 {
+.emotion-6 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -886,13 +915,22 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
   position: relative;
   border-radius: 2px;
   padding-top: 0;
+  color: var(--wp-components-color-foreground, #1e1e1e);
+  cursor: pointer;
 }
 
-.emotion-5>* {
+.emotion-6>* {
   min-height: 0;
 }
 
-.emotion-8 {
+.emotion-6:focus-within:not( :has( :is( .em5sgkm8, .emotion-19 ):focus-within ) ) .emotion-26 {
+  border-color: var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+  box-shadow: 0 0 0 0.5px var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+  outline: 2px solid transparent;
+  outline-offset: -2px;
+}
+
+.emotion-9 {
   display: block;
   max-height: 100%;
   max-width: 100%;
@@ -902,15 +940,17 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
   max-width: calc( 100% - 10px );
 }
 
-.emotion-11 {
+.emotion-12 {
   color: #1e1e1e;
-  line-height: 1.2;
+  line-height: 1.4;
   margin: 0;
+  text-wrap: balance;
+  text-wrap: pretty;
   font-size: calc((13 / 13) * 13px);
   font-weight: normal;
 }
 
-.emotion-11.emotion-11.emotion-11 {
+.emotion-12.emotion-12.emotion-12 {
   font-size: 11px;
   font-weight: 500;
   line-height: 1.4;
@@ -926,7 +966,7 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
   white-space: nowrap;
 }
 
-.emotion-13 {
+.emotion-14 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -941,11 +981,11 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
   -ms-flex: 1;
   flex: 1;
   position: relative;
-  background-color: #fff;
+  background-color: var(--wp-components-color-background, #fff);
   width: 100%;
 }
 
-.emotion-15.emotion-15.emotion-15 {
+.emotion-16.emotion-16.emotion-16 {
   -webkit-appearance: none;
   -moz-appearance: none;
   -ms-appearance: none;
@@ -954,13 +994,13 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
   box-sizing: border-box;
   border: none;
   box-shadow: none!important;
-  color: #1e1e1e;
+  color: currentColor;
+  cursor: inherit;
   display: block;
   font-family: inherit;
   margin: 0;
   width: 100%;
   max-width: none;
-  cursor: pointer;
   white-space: nowrap;
   text-overflow: ellipsis;
   font-size: 16px;
@@ -974,12 +1014,12 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
 }
 
 @media ( min-width: 600px ) {
-  .emotion-15.emotion-15.emotion-15 {
+  .emotion-16.emotion-16.emotion-16 {
     font-size: 13px;
   }
 }
 
-.emotion-17 {
+.emotion-18 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -994,23 +1034,30 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
   display: flex;
 }
 
-.emotion-20 {
-  margin-bottom: 0;
-  padding-right: calc(4px * 2);
+.emotion-21 {
+  -webkit-padding-end: 8px;
+  padding-inline-end: 8px;
   position: absolute;
   pointer-events: none;
   right: 0;
 }
 
-.emotion-22 {
+.emotion-23 {
   -webkit-margin-end: calc(4px * -1);
   margin-inline-end: calc(4px * -1);
   line-height: 0;
 }
 
-.emotion-24.emotion-24.emotion-24 {
+.emotion-23 path {
+  fill: currentColor;
+}
+
+.emotion-25.emotion-25.emotion-25 {
   box-sizing: border-box;
+  border-color: var(--wp-components-color-gray-600, #949494);
   border-radius: inherit;
+  border-style: solid;
+  border-width: 1px;
   bottom: 0;
   left: 0;
   margin: 0;
@@ -1019,9 +1066,6 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
   position: absolute;
   right: 0;
   top: 0;
-  border-color: #949494;
-  border-style: solid;
-  border-width: 1px;
   padding-left: 2px;
 }
 
@@ -1033,17 +1077,17 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
       class="components-base-control__field emotion-2 emotion-3"
     >
       <div
-        class="components-flex components-select-control block-editor-dimension-control emotion-4 emotion-5 emotion-6"
+        class="components-flex components-input-base components-select-control block-editor-dimension-control emotion-4 emotion-5 emotion-6 emotion-7"
         data-wp-c16t="true"
-        data-wp-component="Flex"
+        data-wp-component="InputBase"
       >
         <div
-          class="components-flex-item emotion-7 emotion-8 emotion-6"
+          class="components-flex-item emotion-8 emotion-9 emotion-7"
           data-wp-c16t="true"
           data-wp-component="FlexItem"
         >
           <label
-            class="components-truncate components-text components-input-control__label emotion-10 emotion-11 emotion-6"
+            class="components-truncate components-text components-input-control__label emotion-11 emotion-12 emotion-7"
             data-wp-c16t="true"
             data-wp-component="Text"
             for="inspector-select-control-1"
@@ -1064,10 +1108,10 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
           </label>
         </div>
         <div
-          class="components-input-control__container emotion-13 emotion-14"
+          class="components-input-control__container emotion-14 emotion-15"
         >
           <select
-            class="components-select-control__input emotion-15 emotion-16"
+            class="components-select-control__input emotion-16 emotion-17"
             id="inspector-select-control-1"
           >
             <option
@@ -1102,15 +1146,15 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
             </option>
           </select>
           <span
-            class="components-input-control__suffix emotion-17 emotion-18"
+            class="components-input-control__suffix emotion-18 emotion-19"
           >
             <div
-              class="components-spacer components-input-control-suffix-wrapper emotion-19 emotion-20 emotion-6"
+              class="components-input-control-suffix-wrapper emotion-20 emotion-21 emotion-22"
               data-wp-c16t="true"
               data-wp-component="InputControlSuffixWrapper"
             >
               <div
-                class="emotion-22 emotion-23"
+                class="emotion-23 emotion-24"
               >
                 <svg
                   aria-hidden="true"
@@ -1129,7 +1173,7 @@ exports[`DimensionControl rendering renders with icon and default icon label 1`]
           </span>
           <div
             aria-hidden="true"
-            class="components-input-control__backdrop emotion-24 emotion-25"
+            class="components-input-control__backdrop emotion-25 emotion-26"
           />
         </div>
       </div>
diff --git a/packages/components/src/dimension-control/test/index.test.js b/packages/components/src/dimension-control/test/index.test.js
index 247e15fbe1b521..14f1c509f70cf9 100644
--- a/packages/components/src/dimension-control/test/index.test.js
+++ b/packages/components/src/dimension-control/test/index.test.js
@@ -12,7 +12,11 @@ import { plus } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { DimensionControl } from '../';
+import { DimensionControl as _DimensionControl } from '../';
+
+const DimensionControl = ( props ) => {
+	return <_DimensionControl { ...props } __nextHasNoMarginBottom />;
+};
 
 describe( 'DimensionControl', () => {
 	const onChangeHandler = jest.fn();
@@ -25,11 +29,9 @@ describe( 'DimensionControl', () => {
 	describe( 'rendering', () => {
 		it( 'renders with defaults', () => {
 			const { container } = render(
-				<DimensionControl
-					instanceId={ instanceId }
-					label={ 'Padding' }
-				/>
+				<DimensionControl instanceId={ instanceId } label="Padding" />
 			);
+			expect( console ).toHaveWarned();
 			expect( container ).toMatchSnapshot();
 		} );
 
@@ -37,7 +39,7 @@ describe( 'DimensionControl', () => {
 			const { container } = render(
 				<DimensionControl
 					instanceId={ instanceId }
-					label={ 'Margin' }
+					label="Margin"
 					icon={ plus }
 				/>
 			);
@@ -48,9 +50,9 @@ describe( 'DimensionControl', () => {
 			const { container } = render(
 				<DimensionControl
 					instanceId={ instanceId }
-					label={ 'Margin' }
+					label="Margin"
 					icon={ plus }
-					iconLabel={ 'Tablet Devices' }
+					iconLabel="Tablet Devices"
 				/>
 			);
 			expect( container ).toMatchSnapshot();
@@ -78,7 +80,7 @@ describe( 'DimensionControl', () => {
 			const { container } = render(
 				<DimensionControl
 					instanceId={ instanceId }
-					label={ 'Custom Dimension' }
+					label="Custom Dimension"
 					sizes={ customSizes }
 				/>
 			);
@@ -93,7 +95,7 @@ describe( 'DimensionControl', () => {
 			render(
 				<DimensionControl
 					instanceId={ instanceId }
-					label={ 'Padding' }
+					label="Padding"
 					onChange={ onChangeHandler }
 				/>
 			);
@@ -115,7 +117,7 @@ describe( 'DimensionControl', () => {
 			render(
 				<DimensionControl
 					instanceId={ instanceId }
-					label={ 'Padding' }
+					label="Padding"
 					onChange={ onChangeHandler }
 				/>
 			);
diff --git a/packages/components/src/dimension-control/types.ts b/packages/components/src/dimension-control/types.ts
index 534b80053db968..03a4edf29153b7 100644
--- a/packages/components/src/dimension-control/types.ts
+++ b/packages/components/src/dimension-control/types.ts
@@ -2,6 +2,7 @@
  * Internal dependencies
  */
 import type { IconType } from '../icon';
+import type { SelectControlProps } from '../select-control/types';
 
 export type Size = {
 	/**
@@ -14,7 +15,10 @@ export type Size = {
 	slug: string;
 };
 
-export type DimensionControlProps = {
+export type DimensionControlProps = Pick<
+	SelectControlProps,
+	'__next40pxDefaultSize' | '__nextHasNoMarginBottom'
+> & {
 	/**
 	 * Label for the control.
 	 */
diff --git a/packages/components/src/disabled/README.md b/packages/components/src/disabled/README.md
index 918f6b785e3876..9b257acd0f737b 100644
--- a/packages/components/src/disabled/README.md
+++ b/packages/components/src/disabled/README.md
@@ -33,7 +33,7 @@ const MyDisabled = () => {
 };
 ```
 
-A component can detect if it has been wrapped in a `<Disabled />` by accessing its [context](https://reactjs.org/docs/context.html) using `Disabled.Context`.
+A component can detect if it has been wrapped in a `<Disabled />` by accessing its [context](https://react.dev/learn/passing-data-deeply-with-context) using `Disabled.Context`.
 
 ```jsx
 function CustomButton( props ) {
diff --git a/packages/components/src/disabled/stories/index.story.tsx b/packages/components/src/disabled/stories/index.story.tsx
index b5da6ccedddc07..59ff84dec43fca 100644
--- a/packages/components/src/disabled/stories/index.story.tsx
+++ b/packages/components/src/disabled/stories/index.story.tsx
@@ -18,7 +18,8 @@ import TextareaControl from '../../textarea-control/';
 import { VStack } from '../../v-stack/';
 
 const meta: Meta< typeof Disabled > = {
-	title: 'Components/Disabled',
+	title: 'Components/Utilities/Disabled',
+	id: 'components-disabled',
 	component: Disabled,
 	argTypes: {
 		as: { control: { type: null } },
diff --git a/packages/components/src/disabled/test/index.tsx b/packages/components/src/disabled/test/index.tsx
index 5ab8e6ebffd5ca..fd03d5161f3300 100644
--- a/packages/components/src/disabled/test/index.tsx
+++ b/packages/components/src/disabled/test/index.tsx
@@ -94,7 +94,7 @@ describe( 'Disabled', () => {
 			'This is contentEditable.'
 		);
 
-		rerender( <MaybeDisable isDisabled={ true } /> );
+		rerender( <MaybeDisable isDisabled /> );
 		expect( getInput() ).toHaveValue( 'This is input.' );
 		expect( getContentEditable() ).toHaveTextContent(
 			'This is contentEditable.'
diff --git a/packages/components/src/disclosure/index.tsx b/packages/components/src/disclosure/index.tsx
index 5bacfcabc349a6..fa8570fc1d4c5b 100644
--- a/packages/components/src/disclosure/index.tsx
+++ b/packages/components/src/disclosure/index.tsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
 
 /**
diff --git a/packages/components/src/divider/README.md b/packages/components/src/divider/README.md
index c28b6b6b060a04..c81026b7b55871 100644
--- a/packages/components/src/divider/README.md
+++ b/packages/components/src/divider/README.md
@@ -55,4 +55,4 @@ Divider's orientation. When using inside a flex container, you may need to make
 
 ### Inherited props
 
-`Divider` also inherits all of the [`Separator` props](https://reakit.io/docs/separator/).
+`Divider` also inherits all of the [`Separator` props](https://ariakit.org/reference/separator#optional-props).
diff --git a/packages/components/src/divider/component.tsx b/packages/components/src/divider/component.tsx
index 3870c2f12c4fc3..8d68f8a6326ac1 100644
--- a/packages/components/src/divider/component.tsx
+++ b/packages/components/src/divider/component.tsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
 import type { ForwardedRef } from 'react';
 
diff --git a/packages/components/src/divider/types.ts b/packages/components/src/divider/types.ts
index cb29823eb4ca1a..7f7ecf1f0dcca5 100644
--- a/packages/components/src/divider/types.ts
+++ b/packages/components/src/divider/types.ts
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import type { SeparatorProps } from '@ariakit/react';
 
 /**
diff --git a/packages/components/src/draggable/index.native.js b/packages/components/src/draggable/index.native.js
index 474730d900e384..87e68ad651cb06 100644
--- a/packages/components/src/draggable/index.native.js
+++ b/packages/components/src/draggable/index.native.js
@@ -63,7 +63,7 @@ const Draggable = ( {
 	useAnimatedReaction(
 		() => isDragging.value,
 		( result, previous ) => {
-			if ( result === previous || previous === null ) {
+			if ( result === previous ) {
 				return;
 			}
 
@@ -75,7 +75,7 @@ const Draggable = ( {
 						id: draggingId.value,
 					} );
 				}
-			} else if ( onDragEnd ) {
+			} else if ( previous !== null && onDragEnd ) {
 				onDragEnd( {
 					x: lastPosition.x.value,
 					y: lastPosition.y.value,
diff --git a/packages/components/src/draggable/index.tsx b/packages/components/src/draggable/index.tsx
index 0a3000538dbf24..b9dea8fed43061 100644
--- a/packages/components/src/draggable/index.tsx
+++ b/packages/components/src/draggable/index.tsx
@@ -71,7 +71,7 @@ export function Draggable( {
 	__experimentalDragComponent: dragComponent,
 }: DraggableProps ) {
 	const dragComponentRef = useRef< HTMLDivElement >( null );
-	const cleanup = useRef( () => {} );
+	const cleanupRef = useRef( () => {} );
 
 	/**
 	 * Removes the element clone, resets cursor, and removes drag listener.
@@ -80,7 +80,7 @@ export function Draggable( {
 	 */
 	function end( event: DragEvent ) {
 		event.preventDefault();
-		cleanup.current();
+		cleanupRef.current();
 
 		if ( onDragEnd ) {
 			onDragEnd( event );
@@ -216,7 +216,7 @@ export function Draggable( {
 			onDragStart( event );
 		}
 
-		cleanup.current = () => {
+		cleanupRef.current = () => {
 			// Remove drag clone.
 			if ( cloneWrapper && cloneWrapper.parentNode ) {
 				cloneWrapper.parentNode.removeChild( cloneWrapper );
@@ -235,7 +235,7 @@ export function Draggable( {
 
 	useEffect(
 		() => () => {
-			cleanup.current();
+			cleanupRef.current();
 		},
 		[]
 	);
diff --git a/packages/components/src/draggable/stories/index.story.tsx b/packages/components/src/draggable/stories/index.story.tsx
index fc48618b1083a3..6ecb54a07a3fb2 100644
--- a/packages/components/src/draggable/stories/index.story.tsx
+++ b/packages/components/src/draggable/stories/index.story.tsx
@@ -18,7 +18,8 @@ import Draggable from '..';
 
 const meta: Meta< typeof Draggable > = {
 	component: Draggable,
-	title: 'Components/Draggable',
+	title: 'Components/Utilities/Draggable',
+	id: 'components-draggable',
 	argTypes: {
 		elementId: { control: { type: null } },
 		__experimentalDragComponent: { control: { type: null } },
diff --git a/packages/components/src/draggable/test/index.native.js b/packages/components/src/draggable/test/index.native.js
index 3a160d81a81fdd..ca607960010d18 100644
--- a/packages/components/src/draggable/test/index.native.js
+++ b/packages/components/src/draggable/test/index.native.js
@@ -10,9 +10,9 @@ import { State } from 'react-native-gesture-handler';
 import Animated from 'react-native-reanimated';
 
 /**
- * WordPress dependencies
+ * Internal dependencies
  */
-import { Draggable, DraggableTrigger } from '@wordpress/components';
+import Draggable, { DraggableTrigger } from '../../draggable';
 
 // Touch event type constants have been extracted from original source code, as they are not exported in the package.
 // Reference: https://github.com/software-mansion/react-native-gesture-handler/blob/90895e5f38616a6be256fceec6c6a391cd9ad7c7/src/TouchEventType.ts
@@ -28,10 +28,12 @@ const TouchEventType = {
 // For testing, we mock the "requestAnimationFrame" so it calls the callback passed instantly.
 let requestAnimationFrameCopy;
 beforeEach( () => {
+	jest.useFakeTimers();
 	requestAnimationFrameCopy = global.requestAnimationFrame;
 	global.requestAnimationFrame = ( callback ) => callback();
 } );
 afterEach( () => {
+	jest.useRealTimers();
 	global.requestAnimationFrame = requestAnimationFrameCopy;
 } );
 
@@ -43,7 +45,7 @@ describe( 'Draggable', () => {
 			<Draggable>
 				<DraggableTrigger
 					id={ triggerId }
-					enabled={ true }
+					enabled
 					minDuration={ 500 }
 					onLongPress={ onLongPress }
 					testID="draggableTrigger"
@@ -58,6 +60,7 @@ describe( 'Draggable', () => {
 			{ oldState: State.BEGAN, state: State.ACTIVE },
 			{ state: State.ACTIVE },
 		] );
+		jest.runOnlyPendingTimers();
 
 		expect( onLongPress ).toHaveBeenCalledTimes( 1 );
 		expect( onLongPress ).toHaveBeenCalledWith( triggerId );
@@ -93,6 +96,7 @@ describe( 'Draggable', () => {
 			{ oldState: State.BEGAN, state: State.ACTIVE },
 			{ state: State.ACTIVE },
 		] );
+		jest.runOnlyPendingTimers();
 		fireGestureHandler( draggable, [
 			// TOUCHES_DOWN event is only received on ACTIVE state, so we have to fire it manually.
 			{ oldState: State.BEGAN, state: State.ACTIVE },
@@ -112,7 +116,7 @@ describe( 'Draggable', () => {
 		] );
 		// TODO(jest-console): Fix the warning and remove the expect below.
 		expect( console ).toHaveWarnedWith(
-			'[Reanimated] You can not use setGestureState in non-worklet function.'
+			'[Reanimated] setGestureState() cannot be used with Jest.'
 		);
 
 		expect( onDragStart ).toHaveBeenCalledTimes( 1 );
diff --git a/packages/components/src/drop-zone/index.tsx b/packages/components/src/drop-zone/index.tsx
index f620e6a03c6b85..b1bd0199e877d8 100644
--- a/packages/components/src/drop-zone/index.tsx
+++ b/packages/components/src/drop-zone/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -10,18 +10,11 @@ import { __ } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
 import { upload, Icon } from '@wordpress/icons';
 import { getFilesFromDataTransfer } from '@wordpress/dom';
-import {
-	__experimentalUseDropZone as useDropZone,
-	useReducedMotion,
-} from '@wordpress/compose';
+import { __experimentalUseDropZone as useDropZone } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
-import {
-	__unstableMotion as motion,
-	__unstableAnimatePresence as AnimatePresence,
-} from '../animation';
 import type { DropType, DropZoneProps } from './types';
 import type { WordPressComponentProps } from '../context';
 
@@ -70,7 +63,7 @@ export function DropZoneComponent( {
 
 			/**
 			 * From Windows Chrome 96, the `event.dataTransfer` returns both file object and HTML.
-			 * The order of the checks is important to recognise the HTML drop.
+			 * The order of the checks is important to recognize the HTML drop.
 			 */
 			if ( html && onHTMLDrop ) {
 				onHTMLDrop( html );
@@ -87,7 +80,7 @@ export function DropZoneComponent( {
 
 			/**
 			 * From Windows Chrome 96, the `event.dataTransfer` returns both file object and HTML.
-			 * The order of the checks is important to recognise the HTML drop.
+			 * The order of the checks is important to recognize the HTML drop.
 			 */
 			if ( event.dataTransfer?.types.includes( 'text/html' ) ) {
 				_type = 'html';
@@ -106,6 +99,7 @@ export function DropZoneComponent( {
 			setType( _type );
 		},
 		onDragEnd() {
+			setIsDraggingOverElement( false );
 			setIsDraggingOverDocument( false );
 			setType( undefined );
 		},
@@ -116,68 +110,8 @@ export function DropZoneComponent( {
 			setIsDraggingOverElement( false );
 		},
 	} );
-	const disableMotion = useReducedMotion();
-
-	let children;
-	const backdrop = {
-		hidden: { opacity: 0 },
-		show: {
-			opacity: 1,
-			transition: {
-				type: 'tween',
-				duration: 0.2,
-				delay: 0,
-				delayChildren: 0.1,
-			},
-		},
-		exit: {
-			opacity: 0,
-			transition: {
-				duration: 0.2,
-				delayChildren: 0,
-			},
-		},
-	};
-
-	const foreground = {
-		hidden: { opacity: 0, scale: 0.9 },
-		show: {
-			opacity: 1,
-			scale: 1,
-			transition: {
-				duration: 0.1,
-			},
-		},
-		exit: { opacity: 0, scale: 0.9 },
-	};
 
-	if ( isDraggingOverElement ) {
-		children = (
-			<motion.div
-				variants={ backdrop }
-				initial={ disableMotion ? 'show' : 'hidden' }
-				animate="show"
-				exit={ disableMotion ? 'show' : 'exit' }
-				className="components-drop-zone__content"
-				// Without this, when this div is shown,
-				// Safari calls a onDropZoneLeave causing a loop because of this bug
-				// https://bugs.webkit.org/show_bug.cgi?id=66547
-				style={ { pointerEvents: 'none' } }
-			>
-				<motion.div variants={ foreground }>
-					<Icon
-						icon={ upload }
-						className="components-drop-zone__content-icon"
-					/>
-					<span className="components-drop-zone__content-text">
-						{ label ? label : __( 'Drop files to upload' ) }
-					</span>
-				</motion.div>
-			</motion.div>
-		);
-	}
-
-	const classes = classnames( 'components-drop-zone', className, {
+	const classes = clsx( 'components-drop-zone', className, {
 		'is-active':
 			( isDraggingOverDocument || isDraggingOverElement ) &&
 			( ( type === 'file' && onFilesDrop ) ||
@@ -190,11 +124,17 @@ export function DropZoneComponent( {
 
 	return (
 		<div { ...restProps } ref={ ref } className={ classes }>
-			{ disableMotion ? (
-				children
-			) : (
-				<AnimatePresence>{ children }</AnimatePresence>
-			) }
+			<div className="components-drop-zone__content">
+				<div className="components-drop-zone__content-inner">
+					<Icon
+						icon={ upload }
+						className="components-drop-zone__content-icon"
+					/>
+					<span className="components-drop-zone__content-text">
+						{ label ? label : __( 'Drop files to upload' ) }
+					</span>
+				</div>
+			</div>
 		</div>
 	);
 }
diff --git a/packages/components/src/drop-zone/style.scss b/packages/components/src/drop-zone/style.scss
index 164ff5cd9db251..d66eaee87b8a1f 100644
--- a/packages/components/src/drop-zone/style.scss
+++ b/packages/components/src/drop-zone/style.scss
@@ -7,29 +7,64 @@
 	z-index: z-index(".components-drop-zone");
 	visibility: hidden;
 	opacity: 0;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 
 	&.is-active {
 		opacity: 1;
 		visibility: visible;
 	}
-}
 
-.components-drop-zone__content {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	height: 100%;
-	width: 100%;
-	display: flex;
-	background-color: $components-color-accent;
-	align-items: center;
-	justify-content: center;
-	z-index: z-index(".components-drop-zone__content");
-	text-align: center;
-	color: $white;
+	.components-drop-zone__content {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		height: 100%;
+		width: 100%;
+		display: flex;
+		background-color: $components-color-accent;
+		align-items: center;
+		justify-content: center;
+		z-index: z-index(".components-drop-zone__content");
+		text-align: center;
+		color: $white;
+		opacity: 0;
+
+		// Without this, when this div is shown,
+		// Safari calls a onDropZoneLeave causing a loop because of this bug
+		// https://bugs.webkit.org/show_bug.cgi?id=66547
+		pointer-events: none;
+	}
+
+	.components-drop-zone__content-inner {
+		opacity: 0;
+		transform: scale(0.9);
+	}
+
+	&.is-active.is-dragging-over-element {
+		.components-drop-zone__content {
+			opacity: 1;
+
+			transition: opacity 0.2s ease-in-out;
+			@media (prefers-reduced-motion) {
+				transition: none;
+			}
+		}
+
+		.components-drop-zone__content-inner {
+			opacity: 1;
+			transform: scale(1);
+
+			transition:
+				opacity 0.1s ease-in-out 0.1s,
+				transform 0.1s ease-in-out 0.1s;
+
+			@media (prefers-reduced-motion) {
+				transition: none;
+			}
+		}
+	}
 }
 
 .components-drop-zone__content-icon,
diff --git a/packages/components/src/dropdown-menu-v2-ariakit/README.md b/packages/components/src/dropdown-menu-v2-ariakit/README.md
deleted file mode 100644
index 2902b541169766..00000000000000
--- a/packages/components/src/dropdown-menu-v2-ariakit/README.md
+++ /dev/null
@@ -1,331 +0,0 @@
-# `DropdownMenu` (v2)
-
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-
-`DropdownMenu` displays a menu to the user (such as a set of actions or functions) triggered by a button.
-
-
-## Design guidelines
-
-### Usage
-
-#### When to use a DropdownMenu
-
-Use a DropdownMenu when you want users to:
-
--   Choose an action or change a setting from a list, AND
--   Only see the available choices contextually.
-
-`DropdownMenu` is a React component to render an expandable menu of buttons. It is similar in purpose to a `<select>` element, with the distinction that it does not maintain a value. Instead, each option behaves as an action button.
-
-If you need to display all the available options at all times, consider using a Toolbar instead. Use a `DropdownMenu` to display a list of actions after the user interacts with a button.
-
-**Do**
-Use a `DropdownMenu` to display a list of actions after the user interacts with an icon.
-
-**Don’t** use a `DropdownMenu` for important actions that should always be visible. Use a `Toolbar` instead.
-
-**Don’t**
-Don’t use a `DropdownMenu` for frequently used actions. Use a `Toolbar` instead.
-
-#### Behavior
-
-Generally, the parent button should indicate that interacting with it will show a `DropdownMenu`.
-
-The parent button should retain the same visual styling regardless of whether the `DropdownMenu` is displayed or not.
-
-#### Placement
-
-The `DropdownMenu` should typically appear directly below, or below and to the left of, the parent button. If there isn’t enough space below to display the full `DropdownMenu`, it can be displayed instead above the parent button.
-
-## Development guidelines
-
-This component is still highly experimental, and it's not normally accessible to consumers of the `@wordpress/components` package.
-
-The component exposes a set of components that are meant to be used in combination with each other in order to implement a `DropdownMenu` correctly.
-
-### `DropdownMenu`
-
-The root component, used to specify the menu's trigger and its contents.
-
-#### Props
-
-The component accepts the following props:
-
-##### `trigger`: `React.ReactNode`
-
-The trigger button
-
-- Required: yes
-
-##### `children`: `React.ReactNode`
-
-The contents of the dropdown
-
-- Required: yes
-
-##### `defaultOpen`: `boolean`
-
-The open state of the dropdown menu when it is initially rendered. Use when not wanting to control its open state.
-
-- Required: no
-- Default: `false`
-
-##### `open`: `boolean`
-
-The controlled open state of the dropdown menu. Must be used in conjunction with `onOpenChange`.
-
-- Required: no
-
-##### `onOpenChange`: `(open: boolean) => void`
-
-Event handler called when the open state of the dropdown menu changes.
-
-- Required: no
-
-##### `modal`: `boolean`
-
-The modality of the dropdown menu. When set to true, interaction with outside elements will be disabled and only menu content will be visible to screen readers.
-
-- Required: no
-- Default: `true`
-
-##### `placement`: ``'top' | 'top-start' | 'top-end' | 'right' | 'right-start' | 'right-end' | 'bottom' | 'bottom-start' | 'bottom-end' | 'left' | 'left-start' | 'left-end'`
-
-The placement of the dropdown menu popover.
-
-- Required: no
-- Default: `'bottom-start'` for root-level menus, `'right-start'` for nested menus
-
-##### `gutter`: `number`
-
-The distance in pixels from the trigger.
-
-- Required: no
-- Default: `8` for root-level menus, `16` for nested menus
-
-##### `shift`: `number`
-
-The skidding of the popover along the anchor element. Can be set to negative values to make the popover shift to the opposite side.
-
-- Required: no
-- Default: `0` for root-level menus, `-8` for nested menus
-
-### `DropdownMenuItem`
-
-Used to render a menu item.
-
-#### Props
-
-The component accepts the following props:
-
-##### `children`: `React.ReactNode`
-
-The contents of the item
-
-- Required: yes
-
-##### `prefix`: `React.ReactNode`
-
-The contents of the item's prefix.
-
-- Required: no
-
-##### `suffix`: `React.ReactNode`
-
-The contents of the item's suffix.
-
-- Required: no
-
-##### `hideOnClick`: `boolean`
-
-Whether to hide the dropdown menu when the menu item is clicked.
-
-- Required: no
-- Default: `true`
-
-##### `disabled`: `boolean`
-
-Determines if the element is disabled.
-
-- Required: no
-- Default: `false`
-
-### `DropdownMenuCheckboxItem`
-
-Used to render a checkbox item.
-
-#### Props
-
-The component accepts the following props:
-
-##### `children`: `React.ReactNode`
-
-The contents of the item
-
-- Required: yes
-
-##### `suffix`: `React.ReactNode`
-
-The contents of the item's suffix.
-
-- Required: no
-
-##### `hideOnClick`: `boolean`
-
-Whether to hide the dropdown menu when the menu item is clicked.
-
-- Required: no
-- Default: `false`
-
-##### `disabled`: `boolean`
-
-Determines if the element is disabled.
-
-- Required: no
-- Default: `false`
-
-##### `name`: `string`
-
-The checkbox item's name.
-
-- Required: yes
-
-##### `value`: `string`
-
-The checkbox item's value, useful when using multiple checkbox items
- associated to the same `name`.
-
-- Required: no
-
-##### `checked`: `boolean`
-
-The checkbox item's value, useful when using multiple checkbox items
- associated to the same `name`.
-
-- Required: no
-
-##### `defaultChecked`: `boolean`
-
-The checked state of the checkbox menu item when it is initially rendered. Use when not wanting to control its checked state.
-
-- Required: no
-
-##### `onChange`: `( event: React.ChangeEvent< HTMLInputElement > ) => void;`
-
-Event handler called when the checked state of the checkbox menu item changes.
-
-- Required: no
-
-### `DropdownMenuRadioItem`
-
-Used to render a radio item.
-
-#### Props
-
-The component accepts the following props:
-
-##### `children`: `React.ReactNode`
-
-The contents of the item
-
-- Required: yes
-
-##### `suffix`: `React.ReactNode`
-
-The contents of the item's suffix.
-
-- Required: no
-
-##### `hideOnClick`: `boolean`
-
-Whether to hide the dropdown menu when the menu item is clicked.
-
-- Required: no
-- Default: `false`
-
-##### `disabled`: `boolean`
-
-Determines if the element is disabled.
-
-- Required: no
-- Default: `false`
-
-##### `name`: `string`
-
-The radio item's name.
-
-- Required: yes
-
-##### `value`: `string | number`
-
-The radio item's value.
-
-- Required: yes
-
-##### `checked`: `boolean`
-
-The checkbox item's value, useful when using multiple checkbox items
- associated to the same `name`.
-
-- Required: no
-
-##### `defaultChecked`: `boolean`
-
-The checked state of the radio menu item when it is initially rendered. Use when not wanting to control its checked state.
-
-- Required: no
-
-##### `onChange`: `( event: React.ChangeEvent< HTMLInputElement > ) => void;`
-
-Event handler called when the checked radio menu item changes.
-
-- Required: no
-
-### `DropdownMenuItemLabel`
-
-Used to render the menu item's label.
-
-#### Props
-
-The component accepts the following props:
-
-##### `children`: `React.ReactNode`
-
-The label contents.
-
-- Required: yes
-
-### `DropdownMenuItemHelpText`
-
-Used to render the menu item's help text.
-
-#### Props
-
-The component accepts the following props:
-
-##### `children`: `React.ReactNode`
-
-The help text contents.
-
-- Required: yes
-
-### `DropdownMenuGroup`
-
-Used to group menu items.
-
-#### Props
-
-The component accepts the following props:
-
-##### `children`: `React.ReactNode`
-
-The contents of the group.
-
-- Required: yes
-
-### `DropdownMenuSeparatorProps`
-
-Used to render a visual separator.
diff --git a/packages/components/src/dropdown-menu-v2-ariakit/index.tsx b/packages/components/src/dropdown-menu-v2-ariakit/index.tsx
deleted file mode 100644
index 37d4a1f9cfcc5e..00000000000000
--- a/packages/components/src/dropdown-menu-v2-ariakit/index.tsx
+++ /dev/null
@@ -1,383 +0,0 @@
-/**
- * External dependencies
- */
-// eslint-disable-next-line no-restricted-imports
-import * as Ariakit from '@ariakit/react';
-
-/**
- * WordPress dependencies
- */
-import {
-	forwardRef,
-	createContext,
-	useContext,
-	useMemo,
-	cloneElement,
-	isValidElement,
-	useCallback,
-} from '@wordpress/element';
-import { isRTL } from '@wordpress/i18n';
-import { check, chevronRightSmall } from '@wordpress/icons';
-import { SVG, Circle } from '@wordpress/primitives';
-
-/**
- * Internal dependencies
- */
-import { useContextSystem, contextConnect } from '../context';
-import type { WordPressComponentProps } from '../context';
-import Icon from '../icon';
-import type {
-	DropdownMenuContext as DropdownMenuContextType,
-	DropdownMenuProps,
-	DropdownMenuGroupProps,
-	DropdownMenuItemProps,
-	DropdownMenuCheckboxItemProps,
-	DropdownMenuRadioItemProps,
-	DropdownMenuSeparatorProps,
-} from './types';
-import * as Styled from './styles';
-
-export const DropdownMenuContext = createContext<
-	DropdownMenuContextType | undefined
->( undefined );
-
-export const DropdownMenuItem = forwardRef<
-	HTMLDivElement,
-	WordPressComponentProps< DropdownMenuItemProps, 'div', false >
->( function DropdownMenuItem(
-	{ prefix, suffix, children, hideOnClick = true, ...props },
-	ref
-) {
-	const dropdownMenuContext = useContext( DropdownMenuContext );
-
-	return (
-		<Styled.DropdownMenuItem
-			ref={ ref }
-			{ ...props }
-			accessibleWhenDisabled
-			hideOnClick={ hideOnClick }
-			store={ dropdownMenuContext?.store }
-		>
-			<Styled.ItemPrefixWrapper>{ prefix }</Styled.ItemPrefixWrapper>
-
-			<Styled.DropdownMenuItemContentWrapper>
-				<Styled.DropdownMenuItemChildrenWrapper>
-					{ children }
-				</Styled.DropdownMenuItemChildrenWrapper>
-
-				{ suffix && (
-					<Styled.ItemSuffixWrapper>
-						{ suffix }
-					</Styled.ItemSuffixWrapper>
-				) }
-			</Styled.DropdownMenuItemContentWrapper>
-		</Styled.DropdownMenuItem>
-	);
-} );
-
-export const DropdownMenuCheckboxItem = forwardRef<
-	HTMLDivElement,
-	WordPressComponentProps< DropdownMenuCheckboxItemProps, 'div', false >
->( function DropdownMenuCheckboxItem(
-	{ suffix, children, hideOnClick = false, ...props },
-	ref
-) {
-	const dropdownMenuContext = useContext( DropdownMenuContext );
-
-	return (
-		<Styled.DropdownMenuCheckboxItem
-			ref={ ref }
-			{ ...props }
-			accessibleWhenDisabled
-			hideOnClick={ hideOnClick }
-			store={ dropdownMenuContext?.store }
-		>
-			<Ariakit.MenuItemCheck
-				store={ dropdownMenuContext?.store }
-				render={ <Styled.ItemPrefixWrapper /> }
-				// Override some ariakit inline styles
-				style={ { width: 'auto', height: 'auto' } }
-			>
-				<Icon icon={ check } size={ 24 } />
-			</Ariakit.MenuItemCheck>
-
-			<Styled.DropdownMenuItemContentWrapper>
-				<Styled.DropdownMenuItemChildrenWrapper>
-					{ children }
-				</Styled.DropdownMenuItemChildrenWrapper>
-
-				{ suffix && (
-					<Styled.ItemSuffixWrapper>
-						{ suffix }
-					</Styled.ItemSuffixWrapper>
-				) }
-			</Styled.DropdownMenuItemContentWrapper>
-		</Styled.DropdownMenuCheckboxItem>
-	);
-} );
-
-const radioCheck = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Circle cx={ 12 } cy={ 12 } r={ 3 }></Circle>
-	</SVG>
-);
-
-export const DropdownMenuRadioItem = forwardRef<
-	HTMLDivElement,
-	WordPressComponentProps< DropdownMenuRadioItemProps, 'div', false >
->( function DropdownMenuRadioItem(
-	{ suffix, children, hideOnClick = false, ...props },
-	ref
-) {
-	const dropdownMenuContext = useContext( DropdownMenuContext );
-
-	return (
-		<Styled.DropdownMenuRadioItem
-			ref={ ref }
-			{ ...props }
-			accessibleWhenDisabled
-			hideOnClick={ hideOnClick }
-			store={ dropdownMenuContext?.store }
-		>
-			<Ariakit.MenuItemCheck
-				store={ dropdownMenuContext?.store }
-				render={ <Styled.ItemPrefixWrapper /> }
-				// Override some ariakit inline styles
-				style={ { width: 'auto', height: 'auto' } }
-			>
-				<Icon icon={ radioCheck } size={ 24 } />
-			</Ariakit.MenuItemCheck>
-
-			<Styled.DropdownMenuItemContentWrapper>
-				<Styled.DropdownMenuItemChildrenWrapper>
-					{ children }
-				</Styled.DropdownMenuItemChildrenWrapper>
-
-				{ suffix && (
-					<Styled.ItemSuffixWrapper>
-						{ suffix }
-					</Styled.ItemSuffixWrapper>
-				) }
-			</Styled.DropdownMenuItemContentWrapper>
-		</Styled.DropdownMenuRadioItem>
-	);
-} );
-
-export const DropdownMenuGroup = forwardRef<
-	HTMLDivElement,
-	WordPressComponentProps< DropdownMenuGroupProps, 'div', false >
->( function DropdownMenuGroup( props, ref ) {
-	const dropdownMenuContext = useContext( DropdownMenuContext );
-	return (
-		<Styled.DropdownMenuGroup
-			ref={ ref }
-			{ ...props }
-			store={ dropdownMenuContext?.store }
-		/>
-	);
-} );
-
-const UnconnectedDropdownMenu = (
-	props: WordPressComponentProps< DropdownMenuProps, 'div', false >,
-	ref: React.ForwardedRef< HTMLDivElement >
-) => {
-	const {
-		// Store props
-		open,
-		defaultOpen = false,
-		onOpenChange,
-		placement,
-
-		// Menu trigger props
-		trigger,
-
-		// Menu props
-		gutter,
-		children,
-		shift,
-		modal = true,
-
-		// From internal components context
-		variant,
-
-		// Rest
-		...otherProps
-	} = useContextSystem<
-		typeof props & Pick< DropdownMenuContextType, 'variant' >
-	>( props, 'DropdownMenu' );
-
-	const parentContext = useContext( DropdownMenuContext );
-
-	const computedDirection = isRTL() ? 'rtl' : 'ltr';
-
-	// If an explicit value for the `placement` prop is not passed,
-	// apply a default placement of `bottom-start` for the root dropdown,
-	// and of `right-start` for nested dropdowns.
-	let computedPlacement =
-		props.placement ??
-		( parentContext?.store ? 'right-start' : 'bottom-start' );
-	// Swap left/right in case of RTL direction
-	if ( computedDirection === 'rtl' ) {
-		if ( /right/.test( computedPlacement ) ) {
-			computedPlacement = computedPlacement.replace(
-				'right',
-				'left'
-			) as typeof computedPlacement;
-		} else if ( /left/.test( computedPlacement ) ) {
-			computedPlacement = computedPlacement.replace(
-				'left',
-				'right'
-			) as typeof computedPlacement;
-		}
-	}
-
-	const dropdownMenuStore = Ariakit.useMenuStore( {
-		parent: parentContext?.store,
-		open,
-		defaultOpen,
-		placement: computedPlacement,
-		focusLoop: true,
-		setOpen( willBeOpen ) {
-			onOpenChange?.( willBeOpen );
-		},
-		rtl: computedDirection === 'rtl',
-	} );
-
-	const contextValue = useMemo(
-		() => ( { store: dropdownMenuStore, variant } ),
-		[ dropdownMenuStore, variant ]
-	);
-
-	// Extract the side from the applied placement — useful for animations.
-	const appliedPlacementSide = dropdownMenuStore
-		.useState( 'placement' )
-		.split( '-' )[ 0 ];
-
-	if (
-		dropdownMenuStore.parent &&
-		! ( isValidElement( trigger ) && DropdownMenuItem === trigger.type )
-	) {
-		// eslint-disable-next-line no-console
-		console.warn(
-			'For nested DropdownMenus, the `trigger` should always be a `DropdownMenuItem`.'
-		);
-	}
-
-	const hideOnEscape = useCallback(
-		( event: React.KeyboardEvent< Element > ) => {
-			// Pressing Escape can cause unexpected consequences (ie. exiting
-			// full screen mode on MacOs, close parent modals...).
-			event.preventDefault();
-			// Returning `true` causes the menu to hide.
-			return true;
-		},
-		[]
-	);
-
-	const wrapperProps = useMemo(
-		() => ( {
-			dir: computedDirection,
-			style: {
-				direction:
-					computedDirection as React.CSSProperties[ 'direction' ],
-			},
-		} ),
-		[ computedDirection ]
-	);
-
-	return (
-		<>
-			{ /* Menu trigger */ }
-			<Ariakit.MenuButton
-				ref={ ref }
-				store={ dropdownMenuStore }
-				render={
-					dropdownMenuStore.parent
-						? cloneElement( trigger, {
-								// Add submenu arrow, unless a `suffix` is explicitly specified
-								suffix: (
-									<>
-										{ trigger.props.suffix }
-										<Styled.SubmenuChevronIcon
-											aria-hidden="true"
-											icon={ chevronRightSmall }
-											size={ 24 }
-											preserveAspectRatio="xMidYMid slice"
-										/>
-									</>
-								),
-						  } )
-						: trigger
-				}
-			/>
-
-			{ /* Menu popover */ }
-			<Styled.DropdownMenu
-				{ ...otherProps }
-				modal={ modal }
-				store={ dropdownMenuStore }
-				// Root menu has an 8px distance from its trigger,
-				// otherwise 0 (which causes the submenu to slightly overlap)
-				gutter={ gutter ?? ( dropdownMenuStore.parent ? 0 : 8 ) }
-				// Align nested menu by the same (but opposite) amount
-				// as the menu container's padding.
-				shift={ shift ?? ( dropdownMenuStore.parent ? -4 : 0 ) }
-				hideOnHoverOutside={ false }
-				data-side={ appliedPlacementSide }
-				variant={ variant }
-				wrapperProps={ wrapperProps }
-				hideOnEscape={ hideOnEscape }
-				unmountOnHide
-			>
-				<DropdownMenuContext.Provider value={ contextValue }>
-					{ children }
-				</DropdownMenuContext.Provider>
-			</Styled.DropdownMenu>
-		</>
-	);
-};
-export const DropdownMenu = contextConnect(
-	UnconnectedDropdownMenu,
-	'DropdownMenu'
-);
-
-export const DropdownMenuSeparator = forwardRef<
-	HTMLHRElement,
-	WordPressComponentProps< DropdownMenuSeparatorProps, 'hr', false >
->( function DropdownMenuSeparator( props, ref ) {
-	const dropdownMenuContext = useContext( DropdownMenuContext );
-	return (
-		<Styled.DropdownMenuSeparator
-			ref={ ref }
-			{ ...props }
-			store={ dropdownMenuContext?.store }
-			variant={ dropdownMenuContext?.variant }
-		/>
-	);
-} );
-
-export const DropdownMenuItemLabel = forwardRef<
-	HTMLSpanElement,
-	WordPressComponentProps< { children: React.ReactNode }, 'span', true >
->( function DropdownMenuItemLabel( props, ref ) {
-	return (
-		<Styled.DropdownMenuItemLabel
-			numberOfLines={ 1 }
-			ref={ ref }
-			{ ...props }
-		/>
-	);
-} );
-
-export const DropdownMenuItemHelpText = forwardRef<
-	HTMLSpanElement,
-	WordPressComponentProps< { children: React.ReactNode }, 'span', true >
->( function DropdownMenuItemHelpText( props, ref ) {
-	return (
-		<Styled.DropdownMenuItemHelpText
-			numberOfLines={ 2 }
-			ref={ ref }
-			{ ...props }
-		/>
-	);
-} );
diff --git a/packages/components/src/dropdown-menu-v2-ariakit/stories/index.story.tsx b/packages/components/src/dropdown-menu-v2-ariakit/stories/index.story.tsx
deleted file mode 100644
index fcc8f76294bc6b..00000000000000
--- a/packages/components/src/dropdown-menu-v2-ariakit/stories/index.story.tsx
+++ /dev/null
@@ -1,617 +0,0 @@
-/**
- * External dependencies
- */
-import type { Meta, StoryFn } from '@storybook/react';
-import { css } from '@emotion/react';
-
-/**
- * WordPress dependencies
- */
-import { customLink, formatCapitalize } from '@wordpress/icons';
-import { useState, useMemo, useContext } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { useCx } from '../../utils';
-import {
-	DropdownMenu,
-	DropdownMenuItem,
-	DropdownMenuCheckboxItem,
-	DropdownMenuGroup,
-	DropdownMenuSeparator,
-	DropdownMenuContext,
-	DropdownMenuRadioItem,
-	DropdownMenuItemLabel,
-	DropdownMenuItemHelpText,
-} from '..';
-import Icon from '../../icon';
-import Button from '../../button';
-import Modal from '../../modal';
-import { createSlotFill, Provider as SlotFillProvider } from '../../slot-fill';
-import { ContextSystemProvider } from '../../context';
-
-const meta: Meta< typeof DropdownMenu > = {
-	title: 'Components (Experimental)/DropdownMenu v2 ariakit',
-	component: DropdownMenu,
-	subcomponents: {
-		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuItem,
-		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuCheckboxItem,
-		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuGroup,
-		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuSeparator,
-		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuContext,
-		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuRadioItem,
-		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuItemLabel,
-		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuItemHelpText,
-	},
-	argTypes: {
-		children: { control: { type: null } },
-		trigger: { control: { type: null } },
-	},
-	parameters: {
-		actions: { argTypesRegex: '^on.*' },
-		controls: { expanded: true },
-		docs: {
-			canvas: { sourceState: 'shown' },
-			source: { excludeDecorators: true },
-		},
-	},
-	decorators: [
-		// Layout wrapper
-		( Story ) => (
-			<div
-				style={ {
-					minHeight: '300px',
-				} }
-			>
-				<Story />
-			</div>
-		),
-	],
-};
-export default meta;
-
-export const Default: StoryFn< typeof DropdownMenu > = ( props ) => (
-	<DropdownMenu { ...props }>
-		<DropdownMenuItem>
-			<DropdownMenuItemLabel>Label</DropdownMenuItemLabel>
-		</DropdownMenuItem>
-		<DropdownMenuItem>
-			<DropdownMenuItemLabel>Label</DropdownMenuItemLabel>
-			<DropdownMenuItemHelpText>Help text</DropdownMenuItemHelpText>
-		</DropdownMenuItem>
-		<DropdownMenuItem>
-			<DropdownMenuItemLabel>Label</DropdownMenuItemLabel>
-			<DropdownMenuItemHelpText>
-				The menu item help text is automatically truncated when there
-				are more than two lines of text
-			</DropdownMenuItemHelpText>
-		</DropdownMenuItem>
-		<DropdownMenuItem hideOnClick={ false }>
-			<DropdownMenuItemLabel>Label</DropdownMenuItemLabel>
-			<DropdownMenuItemHelpText>
-				This item doesn&apos;t close the menu on click
-			</DropdownMenuItemHelpText>
-		</DropdownMenuItem>
-		<DropdownMenuItem disabled>Disabled item</DropdownMenuItem>
-		<DropdownMenuSeparator />
-		<DropdownMenuGroup>
-			<DropdownMenuItem
-				prefix={ <Icon icon={ customLink } size={ 24 } /> }
-			>
-				<DropdownMenuItemLabel>With prefix</DropdownMenuItemLabel>
-			</DropdownMenuItem>
-			<DropdownMenuItem suffix={ '⌘S' }>With suffix</DropdownMenuItem>
-			<DropdownMenuItem
-				disabled
-				prefix={ <Icon icon={ formatCapitalize } size={ 24 } /> }
-				suffix="⌥⌘T"
-			>
-				<DropdownMenuItemLabel>
-					Disabled with prefix and suffix
-				</DropdownMenuItemLabel>
-				<DropdownMenuItemHelpText>
-					And help text
-				</DropdownMenuItemHelpText>
-			</DropdownMenuItem>
-		</DropdownMenuGroup>
-	</DropdownMenu>
-);
-Default.args = {
-	trigger: (
-		<Button __next40pxDefaultSize variant="secondary">
-			Open menu
-		</Button>
-	),
-};
-
-export const WithSubmenu: StoryFn< typeof DropdownMenu > = ( props ) => (
-	<DropdownMenu { ...props }>
-		<DropdownMenuItem>Level 1 item</DropdownMenuItem>
-		<DropdownMenu
-			trigger={
-				<DropdownMenuItem suffix="Suffix">
-					<DropdownMenuItemLabel>
-						Submenu trigger item with a long label
-					</DropdownMenuItemLabel>
-				</DropdownMenuItem>
-			}
-		>
-			<DropdownMenuItem>
-				<DropdownMenuItemLabel>Level 2 item</DropdownMenuItemLabel>
-			</DropdownMenuItem>
-			<DropdownMenuItem>
-				<DropdownMenuItemLabel>Level 2 item</DropdownMenuItemLabel>
-			</DropdownMenuItem>
-			<DropdownMenu
-				trigger={
-					<DropdownMenuItem>
-						<DropdownMenuItemLabel>
-							Submenu trigger
-						</DropdownMenuItemLabel>
-					</DropdownMenuItem>
-				}
-			>
-				<DropdownMenuItem>
-					<DropdownMenuItemLabel>Level 3 item</DropdownMenuItemLabel>
-				</DropdownMenuItem>
-				<DropdownMenuItem>
-					<DropdownMenuItemLabel>Level 3 item</DropdownMenuItemLabel>
-				</DropdownMenuItem>
-			</DropdownMenu>
-		</DropdownMenu>
-	</DropdownMenu>
-);
-WithSubmenu.args = {
-	...Default.args,
-};
-
-export const WithCheckboxes: StoryFn< typeof DropdownMenu > = ( props ) => {
-	const [ isAChecked, setAChecked ] = useState( false );
-	const [ isBChecked, setBChecked ] = useState( true );
-	const [ multipleCheckboxesValue, setMultipleCheckboxesValue ] = useState<
-		string[]
-	>( [ 'b' ] );
-
-	const onMultipleCheckboxesCheckedChange: React.ComponentProps<
-		typeof DropdownMenuCheckboxItem
-	>[ 'onChange' ] = ( e ) => {
-		setMultipleCheckboxesValue( ( prevValues ) => {
-			if ( prevValues.includes( e.target.value ) ) {
-				return prevValues.filter( ( val ) => val !== e.target.value );
-			}
-			return [ ...prevValues, e.target.value ];
-		} );
-	};
-
-	return (
-		<DropdownMenu { ...props }>
-			<DropdownMenuGroup>
-				<DropdownMenuCheckboxItem
-					name="checkbox-individual-uncontrolled-a"
-					value="a"
-					suffix="⌥⌘T"
-				>
-					<DropdownMenuItemLabel>
-						Checkbox item A
-					</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Uncontrolled
-					</DropdownMenuItemHelpText>
-				</DropdownMenuCheckboxItem>
-				<DropdownMenuCheckboxItem
-					name="checkbox-individual-uncontrolled-b"
-					value="b"
-					defaultChecked
-				>
-					<DropdownMenuItemLabel>
-						Checkbox item B
-					</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Uncontrolled, initially checked
-					</DropdownMenuItemHelpText>
-				</DropdownMenuCheckboxItem>
-			</DropdownMenuGroup>
-			<DropdownMenuSeparator />
-			<DropdownMenuGroup>
-				<DropdownMenuCheckboxItem
-					name="checkbox-individual-controlled-a"
-					value="a"
-					checked={ isAChecked }
-					onChange={ ( e ) => setAChecked( e.target.checked ) }
-				>
-					<DropdownMenuItemLabel>
-						Checkbox item A
-					</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Controlled
-					</DropdownMenuItemHelpText>
-				</DropdownMenuCheckboxItem>
-				<DropdownMenuCheckboxItem
-					name="checkbox-individual-controlled-b"
-					value="b"
-					checked={ isBChecked }
-					onChange={ ( e ) => setBChecked( e.target.checked ) }
-				>
-					<DropdownMenuItemLabel>
-						Checkbox item B
-					</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Controlled, initially checked
-					</DropdownMenuItemHelpText>
-				</DropdownMenuCheckboxItem>
-			</DropdownMenuGroup>
-			<DropdownMenuSeparator />
-			<DropdownMenuGroup>
-				<DropdownMenuCheckboxItem
-					name="checkbox-multiple-uncontrolled"
-					value="a"
-				>
-					<DropdownMenuItemLabel>
-						Checkbox item A
-					</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Uncontrolled, multiple selection
-					</DropdownMenuItemHelpText>
-				</DropdownMenuCheckboxItem>
-				<DropdownMenuCheckboxItem
-					name="checkbox-multiple-uncontrolled"
-					value="b"
-					defaultChecked
-				>
-					<DropdownMenuItemLabel>
-						Checkbox item B
-					</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Uncontrolled, multiple selection, initially checked
-					</DropdownMenuItemHelpText>
-				</DropdownMenuCheckboxItem>
-			</DropdownMenuGroup>
-			<DropdownMenuSeparator />
-			<DropdownMenuGroup>
-				<DropdownMenuCheckboxItem
-					name="checkbox-multiple-controlled"
-					value="a"
-					checked={ multipleCheckboxesValue.includes( 'a' ) }
-					onChange={ onMultipleCheckboxesCheckedChange }
-				>
-					<DropdownMenuItemLabel>
-						Checkbox item A
-					</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Controlled, multiple selection
-					</DropdownMenuItemHelpText>
-				</DropdownMenuCheckboxItem>
-				<DropdownMenuCheckboxItem
-					name="checkbox-multiple-controlled"
-					value="b"
-					checked={ multipleCheckboxesValue.includes( 'b' ) }
-					onChange={ onMultipleCheckboxesCheckedChange }
-				>
-					<DropdownMenuItemLabel>
-						Checkbox item B
-					</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Controlled, multiple selection, initially checked
-					</DropdownMenuItemHelpText>
-				</DropdownMenuCheckboxItem>
-			</DropdownMenuGroup>
-		</DropdownMenu>
-	);
-};
-WithCheckboxes.args = {
-	...Default.args,
-};
-
-export const WithRadios: StoryFn< typeof DropdownMenu > = ( props ) => {
-	const [ radioValue, setRadioValue ] = useState( 'two' );
-	const onRadioChange: React.ComponentProps<
-		typeof DropdownMenuRadioItem
-	>[ 'onChange' ] = ( e ) => setRadioValue( e.target.value );
-
-	return (
-		<DropdownMenu { ...props }>
-			<DropdownMenuGroup>
-				<DropdownMenuRadioItem name="radio-uncontrolled" value="one">
-					<DropdownMenuItemLabel>Radio item 1</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Uncontrolled
-					</DropdownMenuItemHelpText>
-				</DropdownMenuRadioItem>
-				<DropdownMenuRadioItem
-					name="radio-uncontrolled"
-					value="two"
-					defaultChecked
-				>
-					<DropdownMenuItemLabel>Radio item 2</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Uncontrolled, initially checked
-					</DropdownMenuItemHelpText>
-				</DropdownMenuRadioItem>
-			</DropdownMenuGroup>
-			<DropdownMenuSeparator />
-			<DropdownMenuGroup>
-				<DropdownMenuRadioItem
-					name="radio-controlled"
-					value="one"
-					checked={ radioValue === 'one' }
-					onChange={ onRadioChange }
-				>
-					<DropdownMenuItemLabel>Radio item 1</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Controlled
-					</DropdownMenuItemHelpText>
-				</DropdownMenuRadioItem>
-				<DropdownMenuRadioItem
-					name="radio-controlled"
-					value="two"
-					checked={ radioValue === 'two' }
-					onChange={ onRadioChange }
-				>
-					<DropdownMenuItemLabel>Radio item 2</DropdownMenuItemLabel>
-					<DropdownMenuItemHelpText>
-						Controlled, initially checked
-					</DropdownMenuItemHelpText>
-				</DropdownMenuRadioItem>
-			</DropdownMenuGroup>
-		</DropdownMenu>
-	);
-};
-WithRadios.args = {
-	...Default.args,
-};
-
-const modalOnTopOfDropdown = css`
-	&& {
-		z-index: 1000000;
-	}
-`;
-
-// For more examples with `Modal`, check https://ariakit.org/examples/menu-wordpress-modal
-export const WithModals: StoryFn< typeof DropdownMenu > = ( props ) => {
-	const [ isOuterModalOpen, setOuterModalOpen ] = useState( false );
-	const [ isInnerModalOpen, setInnerModalOpen ] = useState( false );
-
-	const cx = useCx();
-	const modalOverlayClassName = cx( modalOnTopOfDropdown );
-
-	return (
-		<>
-			<DropdownMenu { ...props }>
-				<DropdownMenuItem
-					onClick={ () => setOuterModalOpen( true ) }
-					hideOnClick={ false }
-				>
-					<DropdownMenuItemLabel>
-						Open outer modal
-					</DropdownMenuItemLabel>
-				</DropdownMenuItem>
-				<DropdownMenuItem
-					onClick={ () => setInnerModalOpen( true ) }
-					hideOnClick={ false }
-				>
-					<DropdownMenuItemLabel>
-						Open inner modal
-					</DropdownMenuItemLabel>
-				</DropdownMenuItem>
-				{ isInnerModalOpen && (
-					<Modal
-						onRequestClose={ () => setInnerModalOpen( false ) }
-						overlayClassName={ modalOverlayClassName }
-					>
-						Modal&apos;s contents
-						<button onClick={ () => setInnerModalOpen( false ) }>
-							Close
-						</button>
-					</Modal>
-				) }
-			</DropdownMenu>
-			{ isOuterModalOpen && (
-				<Modal
-					onRequestClose={ () => setOuterModalOpen( false ) }
-					overlayClassName={ modalOverlayClassName }
-				>
-					Modal&apos;s contents
-					<button onClick={ () => setOuterModalOpen( false ) }>
-						Close
-					</button>
-				</Modal>
-			) }
-		</>
-	);
-};
-WithModals.args = {
-	...Default.args,
-};
-
-const ExampleSlotFill = createSlotFill( 'Example' );
-
-const Slot = () => {
-	const dropdownMenuContext = useContext( DropdownMenuContext );
-
-	// Forwarding the content of the slot so that it can be used by the fill
-	const fillProps = useMemo(
-		() => ( {
-			forwardedContext: [
-				[
-					DropdownMenuContext.Provider,
-					{ value: dropdownMenuContext },
-				],
-			],
-		} ),
-		[ dropdownMenuContext ]
-	);
-
-	return (
-		<ExampleSlotFill.Slot
-			fillProps={ fillProps }
-			bubblesVirtually
-			style={ { display: 'contents' } }
-		/>
-	);
-};
-
-type ForwardedContextTuple< P = {} > = [
-	React.ComponentType< React.PropsWithChildren< P > >,
-	P,
-];
-
-const Fill = ( { children }: { children: React.ReactNode } ) => {
-	const innerMarkup = <>{ children }</>;
-
-	return (
-		<ExampleSlotFill.Fill>
-			{ ( fillProps: { forwardedContext?: ForwardedContextTuple[] } ) => {
-				const { forwardedContext = [] } = fillProps;
-
-				return forwardedContext.reduce(
-					( inner: JSX.Element, [ Provider, props ] ) => (
-						<Provider { ...props }>{ inner }</Provider>
-					),
-					innerMarkup
-				);
-			} }
-		</ExampleSlotFill.Fill>
-	);
-};
-
-export const WithSlotFill: StoryFn< typeof DropdownMenu > = ( props ) => {
-	return (
-		<SlotFillProvider>
-			<DropdownMenu { ...props }>
-				<DropdownMenuItem>
-					<DropdownMenuItemLabel>Item</DropdownMenuItemLabel>
-				</DropdownMenuItem>
-				<Slot />
-			</DropdownMenu>
-
-			<Fill>
-				<DropdownMenuItem>
-					<DropdownMenuItemLabel>
-						Item from fill
-					</DropdownMenuItemLabel>
-				</DropdownMenuItem>
-				<DropdownMenu
-					trigger={
-						<DropdownMenuItem>
-							<DropdownMenuItemLabel>
-								Submenu from fill
-							</DropdownMenuItemLabel>
-						</DropdownMenuItem>
-					}
-				>
-					<DropdownMenuItem>
-						<DropdownMenuItemLabel>
-							Submenu item from fill
-						</DropdownMenuItemLabel>
-					</DropdownMenuItem>
-				</DropdownMenu>
-			</Fill>
-		</SlotFillProvider>
-	);
-};
-WithSlotFill.args = {
-	...Default.args,
-};
-
-const toolbarVariantContextValue = {
-	DropdownMenu: {
-		variant: 'toolbar',
-	},
-};
-export const ToolbarVariant: StoryFn< typeof DropdownMenu > = ( props ) => (
-	// TODO: add toolbar
-	<ContextSystemProvider value={ toolbarVariantContextValue }>
-		<DropdownMenu { ...props }>
-			<DropdownMenuItem>
-				<DropdownMenuItemLabel>Level 1 item</DropdownMenuItemLabel>
-			</DropdownMenuItem>
-			<DropdownMenuItem>
-				<DropdownMenuItemLabel>Level 1 item</DropdownMenuItemLabel>
-			</DropdownMenuItem>
-			<DropdownMenuSeparator />
-			<DropdownMenu
-				trigger={
-					<DropdownMenuItem>
-						<DropdownMenuItemLabel>
-							Submenu trigger
-						</DropdownMenuItemLabel>
-					</DropdownMenuItem>
-				}
-			>
-				<DropdownMenuItem>
-					<DropdownMenuItemLabel>Level 2 item</DropdownMenuItemLabel>
-				</DropdownMenuItem>
-			</DropdownMenu>
-		</DropdownMenu>
-	</ContextSystemProvider>
-);
-ToolbarVariant.args = {
-	...Default.args,
-};
-
-export const InsideModal: StoryFn< typeof DropdownMenu > = ( props ) => {
-	const [ isModalOpen, setModalOpen ] = useState( false );
-	return (
-		<>
-			<Button
-				onClick={ () => setModalOpen( true ) }
-				__next40pxDefaultSize
-				variant="secondary"
-			>
-				Open modal
-			</Button>
-			{ isModalOpen && (
-				<Modal onRequestClose={ () => setModalOpen( false ) }>
-					<DropdownMenu { ...props }>
-						<DropdownMenuItem>
-							<DropdownMenuItemLabel>
-								Level 1 item
-							</DropdownMenuItemLabel>
-						</DropdownMenuItem>
-						<DropdownMenuItem>
-							<DropdownMenuItemLabel>
-								Level 1 item
-							</DropdownMenuItemLabel>
-						</DropdownMenuItem>
-						<DropdownMenuSeparator />
-						<DropdownMenu
-							trigger={
-								<DropdownMenuItem>
-									<DropdownMenuItemLabel>
-										Submenu trigger
-									</DropdownMenuItemLabel>
-								</DropdownMenuItem>
-							}
-						>
-							<DropdownMenuItem>
-								<DropdownMenuItemLabel>
-									Level 2 item
-								</DropdownMenuItemLabel>
-							</DropdownMenuItem>
-						</DropdownMenu>
-					</DropdownMenu>
-					<Button onClick={ () => setModalOpen( false ) }>
-						Close modal
-					</Button>
-				</Modal>
-			) }
-		</>
-	);
-};
-InsideModal.args = {
-	...Default.args,
-};
-InsideModal.parameters = {
-	docs: {
-		source: { type: 'code' },
-	},
-};
diff --git a/packages/components/src/dropdown-menu-v2-ariakit/styles.ts b/packages/components/src/dropdown-menu-v2-ariakit/styles.ts
deleted file mode 100644
index 465bdb1aebb30e..00000000000000
--- a/packages/components/src/dropdown-menu-v2-ariakit/styles.ts
+++ /dev/null
@@ -1,333 +0,0 @@
-/**
- * External dependencies
- */
-// eslint-disable-next-line no-restricted-imports
-import * as Ariakit from '@ariakit/react';
-import { css, keyframes } from '@emotion/react';
-import styled from '@emotion/styled';
-
-/**
- * Internal dependencies
- */
-import { COLORS, font, rtl, CONFIG } from '../utils';
-import { space } from '../utils/space';
-import Icon from '../icon';
-import { Truncate } from '../truncate';
-import type { DropdownMenuContext } from './types';
-
-const ANIMATION_PARAMS = {
-	SLIDE_AMOUNT: '2px',
-	DURATION: '400ms',
-	EASING: 'cubic-bezier( 0.16, 1, 0.3, 1 )',
-};
-
-const CONTENT_WRAPPER_PADDING = space( 1 );
-const ITEM_PADDING_BLOCK = space( 2 );
-const ITEM_PADDING_INLINE = space( 3 );
-
-// TODO:
-// - those values are different from saved variables?
-// - should bring this into the config, and make themeable
-// - border color and divider color are different?
-const DEFAULT_BORDER_COLOR = COLORS.gray[ 300 ];
-const DIVIDER_COLOR = COLORS.gray[ 200 ];
-const TOOLBAR_VARIANT_BORDER_COLOR = COLORS.gray[ '900' ];
-const DEFAULT_BOX_SHADOW = `0 0 0 ${ CONFIG.borderWidth } ${ DEFAULT_BORDER_COLOR }, ${ CONFIG.popoverShadow }`;
-const TOOLBAR_VARIANT_BOX_SHADOW = `0 0 0 ${ CONFIG.borderWidth } ${ TOOLBAR_VARIANT_BORDER_COLOR }`;
-
-const slideUpAndFade = keyframes( {
-	'0%': {
-		opacity: 0,
-		transform: `translateY(${ ANIMATION_PARAMS.SLIDE_AMOUNT })`,
-	},
-	'100%': { opacity: 1, transform: 'translateY(0)' },
-} );
-
-const slideRightAndFade = keyframes( {
-	'0%': {
-		opacity: 0,
-		transform: `translateX(-${ ANIMATION_PARAMS.SLIDE_AMOUNT })`,
-	},
-	'100%': { opacity: 1, transform: 'translateX(0)' },
-} );
-
-const slideDownAndFade = keyframes( {
-	'0%': {
-		opacity: 0,
-		transform: `translateY(-${ ANIMATION_PARAMS.SLIDE_AMOUNT })`,
-	},
-	'100%': { opacity: 1, transform: 'translateY(0)' },
-} );
-
-const slideLeftAndFade = keyframes( {
-	'0%': {
-		opacity: 0,
-		transform: `translateX(${ ANIMATION_PARAMS.SLIDE_AMOUNT })`,
-	},
-	'100%': { opacity: 1, transform: 'translateX(0)' },
-} );
-
-export const DropdownMenu = styled( Ariakit.Menu )<
-	Pick< DropdownMenuContext, 'variant' >
->`
-	position: relative;
-	/* Same as popover component */
-	/* TODO: is there a way to read the sass variable? */
-	z-index: 1000000;
-
-	display: grid;
-	grid-template-columns: minmax( 0, max-content ) 1fr;
-	grid-template-rows: auto;
-
-	box-sizing: border-box;
-	min-width: 160px;
-	max-width: 320px;
-	max-height: var( --popover-available-height );
-	padding: ${ CONTENT_WRAPPER_PADDING };
-
-	background-color: ${ COLORS.ui.background };
-	border-radius: 4px;
-	${ ( props ) => css`
-		box-shadow: ${ props.variant === 'toolbar'
-			? TOOLBAR_VARIANT_BOX_SHADOW
-			: DEFAULT_BOX_SHADOW };
-	` }
-
-	overscroll-behavior: contain;
-	overflow: auto;
-
-	/* Only visible in Windows High Contrast mode */
-	outline: 2px solid transparent !important;
-
-	/* Animation */
-	animation-duration: ${ ANIMATION_PARAMS.DURATION };
-	animation-timing-function: ${ ANIMATION_PARAMS.EASING };
-	will-change: transform, opacity;
-	/* Default animation.*/
-	animation-name: ${ slideDownAndFade };
-
-	&[data-side='right'] {
-		animation-name: ${ slideLeftAndFade };
-	}
-	&[data-side='bottom'] {
-		animation-name: ${ slideUpAndFade };
-	}
-	&[data-side='left'] {
-		animation-name: ${ slideRightAndFade };
-	}
-	@media ( prefers-reduced-motion ) {
-		animation-duration: 0s;
-	}
-`;
-
-const baseItem = css`
-	all: unset;
-
-	position: relative;
-	min-height: ${ space( 10 ) };
-	box-sizing: border-box;
-
-	/* Occupy the width of all grid columns (ie. full width) */
-	grid-column: 1 / -1;
-
-	/*
-	 * Define a grid layout which inherits the same columns configuration
-	 * from the parent layout (ie. subgrid).
-	 */
-	display: grid;
-	grid-template-columns: subgrid;
-	align-items: center;
-
-	font-size: ${ font( 'default.fontSize' ) };
-	font-family: inherit;
-	font-weight: normal;
-	line-height: 20px;
-
-	color: ${ COLORS.gray[ 900 ] };
-	border-radius: ${ CONFIG.radiusBlockUi };
-
-	padding-block: ${ ITEM_PADDING_BLOCK };
-	padding-inline: ${ ITEM_PADDING_INLINE };
-
-	/*
-	 * Make sure that, when an item is scrolled into view (eg. while using the
-	 * keyboard to move focus), the whole item comes into view
-	 */
-	scroll-margin: ${ CONTENT_WRAPPER_PADDING };
-
-	user-select: none;
-	outline: none;
-
-	&[aria-disabled='true'] {
-		color: ${ COLORS.ui.textDisabled };
-		cursor: not-allowed;
-	}
-
-	/* Hover */
-	&[data-active-item]:not( [data-focus-visible] ):not(
-			[aria-disabled='true']
-		) {
-		background-color: ${ COLORS.theme.accent };
-		color: ${ COLORS.white };
-	}
-
-	/* Keyboard focus (focus-visible) */
-	&[data-focus-visible] {
-		box-shadow: 0 0 0 1.5px var( --wp-admin-theme-color );
-
-		/* Only visible in Windows High Contrast mode */
-		outline: 2px solid transparent;
-	}
-
-	/* Active (ie. pressed, mouse down) */
-	&:active,
-	&[data-active] {
-		/* TODO: should there be a visual active state? */
-	}
-
-	/* When the item is the trigger of an open submenu */
-	${ DropdownMenu }:not(:focus) &:not(:focus)[aria-expanded="true"] {
-		background-color: ${ COLORS.gray[ 100 ] };
-		color: ${ COLORS.gray[ 900 ] };
-	}
-
-	svg {
-		fill: currentColor;
-	}
-`;
-
-export const DropdownMenuItem = styled( Ariakit.MenuItem )`
-	${ baseItem };
-`;
-
-export const DropdownMenuCheckboxItem = styled( Ariakit.MenuItemCheckbox )`
-	${ baseItem };
-`;
-
-export const DropdownMenuRadioItem = styled( Ariakit.MenuItemRadio )`
-	${ baseItem };
-`;
-
-export const ItemPrefixWrapper = styled.span`
-	/* Always occupy the first column, even when auto-collapsing */
-	grid-column: 1;
-
-	&:not( :empty ) {
-		margin-inline-end: ${ space( 2 ) };
-	}
-
-	display: flex;
-	align-items: center;
-	justify-content: center;
-
-	color: ${ COLORS.gray[ '700' ] };
-
-	/*
-	* When the parent menu item is active, except when it's a non-focused/hovered
-	* submenu trigger (in that case, color should not be inherited)
-	*/
-	[data-active-item]:not( [data-focus-visible] ) > &,
-	/* When the parent menu item is disabled */
-	[aria-disabled='true'] > & {
-		color: inherit;
-	}
-`;
-
-export const DropdownMenuItemContentWrapper = styled.div`
-	/*
-	 * Always occupy the second column, since the first column
-	 * is taken by the prefix wrapper (when displayed).
-	 */
-	grid-column: 2;
-
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	gap: ${ space( 3 ) };
-
-	pointer-events: none;
-`;
-
-export const DropdownMenuItemChildrenWrapper = styled.div`
-	flex: 1;
-
-	display: inline-flex;
-	flex-direction: column;
-	gap: ${ space( 1 ) };
-`;
-
-export const ItemSuffixWrapper = styled.span`
-	flex: 0;
-	width: max-content;
-
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	gap: ${ space( 3 ) };
-
-	color: ${ COLORS.gray[ '700' ] };
-
-	/*
-	 * When the parent menu item is active, except when it's a non-focused/hovered
-	 * submenu trigger (in that case, color should not be inherited)
-	 */
-	[data-active-item]:not( [data-focus-visible] ) *:not(${ DropdownMenu }) &,
-	/* When the parent menu item is disabled */
-	[aria-disabled='true'] *:not(${ DropdownMenu }) & {
-		color: inherit;
-	}
-`;
-
-export const DropdownMenuGroup = styled( Ariakit.MenuGroup )`
-	/* Ignore this element when calculating the layout. Useful for subgrid */
-	display: contents;
-`;
-
-export const DropdownMenuSeparator = styled( Ariakit.MenuSeparator )<
-	Pick< DropdownMenuContext, 'variant' >
->`
-	/* Occupy the width of all grid columns (ie. full width) */
-	grid-column: 1 / -1;
-
-	border: none;
-	height: ${ CONFIG.borderWidth };
-	background-color: ${ ( props ) =>
-		props.variant === 'toolbar'
-			? TOOLBAR_VARIANT_BORDER_COLOR
-			: DIVIDER_COLOR };
-	/* Align with menu items' content */
-	margin-block: ${ space( 2 ) };
-	margin-inline: ${ ITEM_PADDING_INLINE };
-
-	/* Only visible in Windows High Contrast mode */
-	outline: 2px solid transparent;
-`;
-
-export const SubmenuChevronIcon = styled( Icon )`
-	width: ${ space( 1.5 ) };
-	${ rtl(
-		{
-			transform: `scaleX(1)`,
-		},
-		{
-			transform: `scaleX(-1)`,
-		}
-	) };
-`;
-
-export const DropdownMenuItemLabel = styled( Truncate )`
-	font-size: ${ font( 'default.fontSize' ) };
-	line-height: 20px;
-	color: inherit;
-`;
-
-export const DropdownMenuItemHelpText = styled( Truncate )`
-	font-size: ${ font( 'helpText.fontSize' ) };
-	line-height: 16px;
-	color: ${ COLORS.gray[ '700' ] };
-
-	[data-active-item]:not( [data-focus-visible] ) *:not( ${ DropdownMenu } ) &,
-	[aria-disabled='true'] *:not( ${ DropdownMenu } ) & {
-		color: inherit;
-	}
-`;
diff --git a/packages/components/src/dropdown-menu-v2-ariakit/test/index.tsx b/packages/components/src/dropdown-menu-v2-ariakit/test/index.tsx
deleted file mode 100644
index f58639a545a056..00000000000000
--- a/packages/components/src/dropdown-menu-v2-ariakit/test/index.tsx
+++ /dev/null
@@ -1,1108 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen, waitFor } from '@testing-library/react';
-import { press, click, hover, type } from '@ariakit/test';
-
-/**
- * WordPress dependencies
- */
-import { useState } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import {
-	DropdownMenu,
-	DropdownMenuCheckboxItem,
-	DropdownMenuItem,
-	DropdownMenuRadioItem,
-	DropdownMenuSeparator,
-	DropdownMenuGroup,
-} from '..';
-
-const delay = ( delayInMs: number ) => {
-	return new Promise( ( resolve ) => setTimeout( resolve, delayInMs ) );
-};
-
-describe( 'DropdownMenu', () => {
-	// See https://www.w3.org/WAI/ARIA/apg/patterns/menu-button/
-	it( 'should follow the WAI-ARIA spec', async () => {
-		render(
-			<DropdownMenu trigger={ <button>Open dropdown</button> }>
-				<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				<DropdownMenuSeparator />
-				<DropdownMenu
-					trigger={
-						<DropdownMenuItem>Dropdown submenu</DropdownMenuItem>
-					}
-				>
-					<DropdownMenuItem>Dropdown submenu item 1</DropdownMenuItem>
-					<DropdownMenuItem>Dropdown submenu item 2</DropdownMenuItem>
-				</DropdownMenu>
-			</DropdownMenu>
-		);
-
-		const toggleButton = screen.getByRole( 'button', {
-			name: 'Open dropdown',
-		} );
-
-		expect( toggleButton ).toHaveAttribute( 'aria-haspopup', 'menu' );
-		expect( toggleButton ).toHaveAttribute( 'aria-expanded', 'false' );
-
-		await click( toggleButton );
-
-		expect( toggleButton ).toHaveAttribute( 'aria-expanded', 'true' );
-
-		expect(
-			screen.getByRole( 'menu', { name: toggleButton.textContent ?? '' } )
-		).toHaveFocus();
-		expect( screen.getByRole( 'separator' ) ).toHaveAttribute(
-			'aria-orientation',
-			'horizontal'
-		);
-		expect( screen.getAllByRole( 'menuitem' ) ).toHaveLength( 2 );
-
-		const submenuTrigger = screen.getByRole( 'menuitem', {
-			name: 'Dropdown submenu',
-		} );
-		expect( submenuTrigger ).toHaveAttribute( 'aria-haspopup', 'menu' );
-		expect( submenuTrigger ).toHaveAttribute( 'aria-expanded', 'false' );
-
-		await hover( submenuTrigger );
-
-		// Wait for the open animation after hovering
-		await waitFor( () =>
-			expect(
-				screen.getByRole( 'menu', {
-					name: submenuTrigger.textContent ?? '',
-				} )
-			).toBeVisible()
-		);
-
-		expect( submenuTrigger ).toHaveAttribute( 'aria-expanded', 'true' );
-		expect( submenuTrigger ).toHaveAttribute(
-			'aria-controls',
-			screen.getAllByRole( 'menu' )[ 1 ].id
-		);
-	} );
-
-	describe( 'pointer and keyboard interactions', () => {
-		it( 'should open and focus the menu when clicking the trigger', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			const toggleButton = screen.getByRole( 'button', {
-				name: 'Open dropdown',
-			} );
-
-			// DropdownMenu closed
-			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
-
-			// Click to open the menu
-			await click( toggleButton );
-
-			// DropdownMenu open, focus is on the menu wrapper
-			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
-		} );
-
-		it( 'should open and focus the first item when pressing the arrow down key on the trigger', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem disabled>First item</DropdownMenuItem>
-					<DropdownMenuItem>Second item</DropdownMenuItem>
-					<DropdownMenuItem>Third item</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			const toggleButton = screen.getByRole( 'button', {
-				name: 'Open dropdown',
-			} );
-
-			// Move focus on the toggle
-			await press.Tab();
-
-			expect( toggleButton ).toHaveFocus();
-
-			// DropdownMenu closed
-			expect( screen.queryByRole( 'menuitem' ) ).not.toBeInTheDocument();
-
-			await press.ArrowDown();
-
-			// DropdownMenu open, focus is on the first focusable item
-			// (disabled items are still focusable and accessible)
-			expect(
-				screen.getByRole( 'menuitem', { name: 'First item' } )
-			).toHaveFocus();
-		} );
-
-		it( 'should open and focus the first item when pressing the space key on the trigger', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem disabled>First item</DropdownMenuItem>
-					<DropdownMenuItem>Second item</DropdownMenuItem>
-					<DropdownMenuItem>Third item</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			const toggleButton = screen.getByRole( 'button', {
-				name: 'Open dropdown',
-			} );
-
-			// Move focus on the toggle
-			await press.Tab();
-
-			expect( toggleButton ).toHaveFocus();
-
-			// DropdownMenu closed
-			expect( screen.queryByRole( 'menuitem' ) ).not.toBeInTheDocument();
-
-			await press.Space();
-
-			// DropdownMenu open, focus is on the first focusable item
-			// (disabled items are still focusable and accessible
-			expect(
-				screen.getByRole( 'menuitem', { name: 'First item' } )
-			).toHaveFocus();
-		} );
-
-		it( 'should close when pressing the escape key', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			const trigger = screen.getByRole( 'button', {
-				name: 'Open dropdown',
-			} );
-
-			await click( trigger );
-
-			// Focuses menu on mouse click, focuses first item on keyboard press
-			// Can be changed with a custom useEffect
-			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
-
-			// Pressing esc will close the menu and move focus to the toggle
-			await press.Escape();
-
-			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
-
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'button', { name: 'Open dropdown' } )
-				).toHaveFocus()
-			);
-		} );
-
-		it( 'should close when clicking outside of the content', async () => {
-			render(
-				<DropdownMenu
-					defaultOpen
-					trigger={ <button>Open dropdown</button> }
-				>
-					<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
-
-			// Click on the body (ie. outside of the dropdown menu)
-			await click( document.body );
-
-			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
-		} );
-
-		it( 'should close when clicking on a menu item', async () => {
-			render(
-				<DropdownMenu
-					defaultOpen
-					trigger={ <button>Open dropdown</button> }
-				>
-					<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
-
-			// Clicking a menu item will close the menu
-			await click( screen.getByRole( 'menuitem' ) );
-
-			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
-		} );
-
-		it( 'should not close when clicking on a menu item when the `hideOnClick` prop is set to `false`', async () => {
-			render(
-				<DropdownMenu
-					defaultOpen
-					trigger={ <button>Open dropdown</button> }
-				>
-					<DropdownMenuItem hideOnClick={ false }>
-						Dropdown menu item
-					</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			expect( screen.getByRole( 'menu' ) ).toBeVisible();
-
-			// Clicking a menu item will close the menu
-			await click( screen.getByRole( 'menuitem' ) );
-
-			expect( screen.getByRole( 'menu' ) ).toBeVisible();
-		} );
-
-		it( 'should not close when clicking on a disabled menu item', async () => {
-			render(
-				<DropdownMenu
-					defaultOpen
-					trigger={ <button>Open dropdown</button> }
-				>
-					<DropdownMenuItem disabled>
-						Dropdown menu item
-					</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
-
-			// Clicking a disabled menu item won't close the menu
-			await click( screen.getByRole( 'menuitem' ) );
-
-			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
-		} );
-
-		it( 'should reveal submenu content when hovering over the submenu trigger', async () => {
-			render(
-				<DropdownMenu
-					defaultOpen
-					trigger={ <button>Open dropdown</button> }
-				>
-					<DropdownMenuItem>Dropdown menu item 1</DropdownMenuItem>
-					<DropdownMenuItem>Dropdown menu item 2</DropdownMenuItem>
-					<DropdownMenu
-						trigger={
-							<DropdownMenuItem>
-								Dropdown submenu
-							</DropdownMenuItem>
-						}
-					>
-						<DropdownMenuItem>
-							Dropdown submenu item 1
-						</DropdownMenuItem>
-						<DropdownMenuItem>
-							Dropdown submenu item 2
-						</DropdownMenuItem>
-					</DropdownMenu>
-					<DropdownMenuItem>Dropdown menu item 3</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			// Before hover, submenu items are not rendered
-			expect(
-				screen.queryByRole( 'menuitem', {
-					name: 'Dropdown submenu item 1',
-				} )
-			).not.toBeInTheDocument();
-
-			await hover(
-				screen.getByRole( 'menuitem', { name: 'Dropdown submenu' } )
-			);
-
-			// After hover, submenu items are rendered
-			// Reason for `findByRole`: due to the animation, we've got to wait
-			// a short amount of time for the submenu to appear
-			await screen.findByRole( 'menuitem', {
-				name: 'Dropdown submenu item 1',
-			} );
-		} );
-
-		it( 'should navigate menu items and subitems using the arrow, spacebar and enter keys', async () => {
-			render(
-				<DropdownMenu
-					defaultOpen
-					trigger={ <button>Open dropdown</button> }
-				>
-					<DropdownMenuItem>Dropdown menu item 1</DropdownMenuItem>
-					<DropdownMenuItem>Dropdown menu item 2</DropdownMenuItem>
-					<DropdownMenu
-						trigger={
-							<DropdownMenuItem>
-								Dropdown submenu
-							</DropdownMenuItem>
-						}
-					>
-						<DropdownMenuItem>
-							Dropdown submenu item 1
-						</DropdownMenuItem>
-						<DropdownMenuItem>
-							Dropdown submenu item 2
-						</DropdownMenuItem>
-					</DropdownMenu>
-					<DropdownMenuItem>Dropdown menu item 3</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			// The menu is focused automatically when `defaultOpen` is set.
-			await waitFor( () =>
-				expect( screen.getByRole( 'menu' ) ).toHaveFocus()
-			);
-
-			// Arrow up/down selects menu items
-			// The selection wraps around from last to first and viceversa
-			await press.ArrowDown();
-			expect(
-				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 1' } )
-			).toHaveFocus();
-
-			await press.ArrowDown();
-			expect(
-				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 2' } )
-			).toHaveFocus();
-
-			await press.ArrowDown();
-			expect(
-				screen.getByRole( 'menuitem', { name: 'Dropdown submenu' } )
-			).toHaveFocus();
-
-			await press.ArrowDown();
-			expect(
-				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 3' } )
-			).toHaveFocus();
-
-			await press.ArrowDown();
-			expect(
-				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 1' } )
-			).toHaveFocus();
-
-			await press.ArrowUp();
-			expect(
-				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 3' } )
-			).toHaveFocus();
-
-			await press.ArrowUp();
-			expect(
-				screen.getByRole( 'menuitem', { name: 'Dropdown submenu' } )
-			).toHaveFocus();
-
-			// Arrow right/left can be used to enter/leave submenus
-			await press.ArrowRight();
-			expect(
-				screen.getByRole( 'menuitem', {
-					name: 'Dropdown submenu item 1',
-				} )
-			).toHaveFocus();
-
-			await press.ArrowDown();
-			expect(
-				screen.getByRole( 'menuitem', {
-					name: 'Dropdown submenu item 2',
-				} )
-			).toHaveFocus();
-
-			await press.ArrowLeft();
-			expect(
-				screen.getByRole( 'menuitem', {
-					name: 'Dropdown submenu',
-				} )
-			).toHaveFocus();
-
-			// Spacebar or enter key can also be used to enter a submenu
-			await press.Enter();
-			expect(
-				screen.getByRole( 'menuitem', {
-					name: 'Dropdown submenu item 1',
-				} )
-			).toHaveFocus();
-
-			await press.ArrowLeft();
-			expect(
-				screen.getByRole( 'menuitem', {
-					name: 'Dropdown submenu',
-				} )
-			).toHaveFocus();
-
-			await press.Space();
-			expect(
-				screen.getByRole( 'menuitem', {
-					name: 'Dropdown submenu item 1',
-				} )
-			).toHaveFocus();
-
-			await press.ArrowLeft();
-			expect(
-				screen.getByRole( 'menuitem', {
-					name: 'Dropdown submenu',
-				} )
-			).toHaveFocus();
-		} );
-
-		it( 'should check radio items and keep the menu open when clicking (controlled)', async () => {
-			const onRadioValueChangeSpy = jest.fn();
-
-			const ControlledRadioGroup = () => {
-				const [ radioValue, setRadioValue ] = useState( 'two' );
-				const onRadioChange: React.ComponentProps<
-					typeof DropdownMenuRadioItem
-				>[ 'onChange' ] = ( e ) => {
-					onRadioValueChangeSpy( e.target.value );
-					setRadioValue( e.target.value );
-				};
-				return (
-					<DropdownMenu trigger={ <button>Open dropdown</button> }>
-						<DropdownMenuGroup>
-							<DropdownMenuRadioItem
-								name="radio-test"
-								value="radio-one"
-								checked={ radioValue === 'radio-one' }
-								onChange={ onRadioChange }
-							>
-								Radio item one
-							</DropdownMenuRadioItem>
-							<DropdownMenuRadioItem
-								name="radio-test"
-								value="radio-two"
-								checked={ radioValue === 'radio-two' }
-								onChange={ onRadioChange }
-							>
-								Radio item two
-							</DropdownMenuRadioItem>
-						</DropdownMenuGroup>
-					</DropdownMenu>
-				);
-			};
-
-			render( <ControlledRadioGroup /> );
-
-			// Open dropdown
-			await click(
-				screen.getByRole( 'button', { name: 'Open dropdown' } )
-			);
-
-			// No radios should be checked at this point
-			expect( screen.getAllByRole( 'menuitemradio' ) ).toHaveLength( 2 );
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
-			).not.toBeChecked();
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
-			).not.toBeChecked();
-
-			// Click first radio item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
-			);
-			expect( onRadioValueChangeSpy ).toHaveBeenCalledTimes( 1 );
-			expect( onRadioValueChangeSpy ).toHaveBeenLastCalledWith(
-				'radio-one'
-			);
-
-			// Make sure that first radio is checked
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
-			).toBeChecked();
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
-			).not.toBeChecked();
-
-			// Click second radio item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
-			);
-			expect( onRadioValueChangeSpy ).toHaveBeenCalledTimes( 2 );
-			expect( onRadioValueChangeSpy ).toHaveBeenLastCalledWith(
-				'radio-two'
-			);
-
-			// Make sure that second radio is selected
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
-			).not.toBeChecked();
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
-			).toBeChecked();
-		} );
-
-		it( 'should check radio items and keep the menu open when clicking (uncontrolled)', async () => {
-			const onRadioValueChangeSpy = jest.fn();
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuGroup>
-						<DropdownMenuRadioItem
-							name="radio-test"
-							value="radio-one"
-							onChange={ ( e ) =>
-								onRadioValueChangeSpy( e.target.value )
-							}
-						>
-							Radio item one
-						</DropdownMenuRadioItem>
-						<DropdownMenuRadioItem
-							name="radio-test"
-							value="radio-two"
-							defaultChecked
-							onChange={ ( e ) =>
-								onRadioValueChangeSpy( e.target.value )
-							}
-						>
-							Radio item two
-						</DropdownMenuRadioItem>
-					</DropdownMenuGroup>
-				</DropdownMenu>
-			);
-
-			// Open dropdown
-			await click(
-				screen.getByRole( 'button', { name: 'Open dropdown' } )
-			);
-
-			// Radio item two should be checked (`defaultChecked` prop)
-			expect( screen.getAllByRole( 'menuitemradio' ) ).toHaveLength( 2 );
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
-			).not.toBeChecked();
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
-			).toBeChecked();
-
-			// Click first radio item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
-			);
-			expect( onRadioValueChangeSpy ).toHaveBeenCalledTimes( 1 );
-			expect( onRadioValueChangeSpy ).toHaveBeenLastCalledWith(
-				'radio-one'
-			);
-
-			// Make sure that first radio is checked
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
-			).toBeChecked();
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
-			).not.toBeChecked();
-
-			// Click second radio item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
-			);
-			expect( onRadioValueChangeSpy ).toHaveBeenCalledTimes( 2 );
-			expect( onRadioValueChangeSpy ).toHaveBeenLastCalledWith(
-				'radio-two'
-			);
-
-			// Make sure that second radio is selected
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
-			).not.toBeChecked();
-			expect(
-				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
-			).toBeChecked();
-		} );
-
-		it( 'should check checkbox items and keep the menu open when clicking (controlled)', async () => {
-			const onCheckboxValueChangeSpy = jest.fn();
-
-			const ControlledRadioGroup = () => {
-				const [ itemOneChecked, setItemOneChecked ] =
-					useState< boolean >();
-				const [ itemTwoChecked, setItemTwoChecked ] =
-					useState< boolean >();
-
-				return (
-					<DropdownMenu trigger={ <button>Open dropdown</button> }>
-						<DropdownMenuCheckboxItem
-							name="item-one"
-							value="item-one-value"
-							checked={ itemOneChecked }
-							onChange={ ( e ) => {
-								onCheckboxValueChangeSpy(
-									e.target.name,
-									e.target.value,
-									e.target.checked
-								);
-								setItemOneChecked( e.target.checked );
-							} }
-						>
-							Checkbox item one
-						</DropdownMenuCheckboxItem>
-
-						<DropdownMenuCheckboxItem
-							name="item-two"
-							value="item-two-value"
-							checked={ itemTwoChecked }
-							onChange={ ( e ) => {
-								onCheckboxValueChangeSpy(
-									e.target.name,
-									e.target.value,
-									e.target.checked
-								);
-								setItemTwoChecked( e.target.checked );
-							} }
-						>
-							Checkbox item two
-						</DropdownMenuCheckboxItem>
-					</DropdownMenu>
-				);
-			};
-
-			render( <ControlledRadioGroup /> );
-
-			// Open dropdown
-			await click(
-				screen.getByRole( 'button', { name: 'Open dropdown' } )
-			);
-
-			// No checkboxes should be checked at this point
-			expect( screen.getAllByRole( 'menuitemcheckbox' ) ).toHaveLength(
-				2
-			);
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item one',
-				} )
-			).not.toBeChecked();
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			).not.toBeChecked();
-
-			// Click first checkbox item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item one',
-				} )
-			);
-			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 1 );
-			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
-				'item-one',
-				'item-one-value',
-				true
-			);
-
-			// Make sure that first checkbox is checked
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item one',
-				} )
-			).toBeChecked();
-
-			// Click second checkbox item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			);
-			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 2 );
-			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
-				'item-two',
-				'item-two-value',
-				true
-			);
-
-			// Make sure that second checkbox is selected
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			).toBeChecked();
-
-			// Click second checkbox item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			);
-			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 3 );
-			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
-				'item-two',
-				'item-two-value',
-				false
-			);
-
-			// Make sure that second checkbox is unselected
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			).not.toBeChecked();
-		} );
-
-		it( 'should check checkbox items and keep the menu open when clicking (uncontrolled)', async () => {
-			const onCheckboxValueChangeSpy = jest.fn();
-
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuCheckboxItem
-						name="item-one"
-						value="item-one-value"
-						onChange={ ( e ) => {
-							onCheckboxValueChangeSpy(
-								e.target.name,
-								e.target.value,
-								e.target.checked
-							);
-						} }
-					>
-						Checkbox item one
-					</DropdownMenuCheckboxItem>
-
-					<DropdownMenuCheckboxItem
-						name="item-two"
-						value="item-two-value"
-						defaultChecked
-						onChange={ ( e ) => {
-							onCheckboxValueChangeSpy(
-								e.target.name,
-								e.target.value,
-								e.target.checked
-							);
-						} }
-					>
-						Checkbox item two
-					</DropdownMenuCheckboxItem>
-				</DropdownMenu>
-			);
-
-			// Open dropdown
-			await click(
-				screen.getByRole( 'button', { name: 'Open dropdown' } )
-			);
-
-			// Checkbox item two should be checked (`defaultChecked`)
-			expect( screen.getAllByRole( 'menuitemcheckbox' ) ).toHaveLength(
-				2
-			);
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item one',
-				} )
-			).not.toBeChecked();
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			).toBeChecked();
-
-			// Click first checkbox item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item one',
-				} )
-			);
-			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 1 );
-			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
-				'item-one',
-				'item-one-value',
-				true
-			);
-
-			// Make sure that first checkbox is checked
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item one',
-				} )
-			).toBeChecked();
-
-			// Click second checkbox item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			);
-			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 2 );
-			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
-				'item-two',
-				'item-two-value',
-				false
-			);
-
-			// Make sure that second checkbox is unchecked
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			).not.toBeChecked();
-
-			// Click second checkbox item, make sure that the callback fires
-			await click(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			);
-			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 3 );
-			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
-				'item-two',
-				'item-two-value',
-				true
-			);
-
-			// Make sure that second checkbox is unselected
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item two',
-				} )
-			).toBeChecked();
-		} );
-	} );
-
-	describe( 'modality', () => {
-		it( 'should be modal by default', async () => {
-			render(
-				<>
-					<DropdownMenu trigger={ <button>Open dropdown</button> }>
-						<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-					</DropdownMenu>
-					<button>Button outside of dropdown</button>
-				</>
-			);
-
-			// Click to open the menu
-			await click(
-				screen.getByRole( 'button', {
-					name: 'Open dropdown',
-				} )
-			);
-
-			// DropdownMenu open, focus is on the menu wrapper
-			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
-
-			expect(
-				screen.queryByRole( 'button', {
-					name: 'Button outside of dropdown',
-				} )
-			).not.toBeInTheDocument();
-		} );
-
-		it( 'should not be modal when the `modal` prop is set to `false`', async () => {
-			render(
-				<>
-					<DropdownMenu
-						trigger={ <button>Open dropdown</button> }
-						modal={ false }
-					>
-						<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-					</DropdownMenu>
-					<button>Button outside of dropdown</button>
-				</>
-			);
-
-			// Click to open the menu
-			await click(
-				screen.getByRole( 'button', {
-					name: 'Open dropdown',
-				} )
-			);
-
-			// DropdownMenu open, focus is on the menu wrapper
-			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
-
-			// DropdownMenu is not modal, therefore the outer button is part of the
-			// accessibility tree and can be found.
-			const outerButton = screen.getByRole( 'button', {
-				name: 'Button outside of dropdown',
-			} );
-
-			// The outer button can be focused by pressing tab. Doing so will cause
-			// the DropdownMenu to close.
-			await press.Tab();
-			expect( outerButton ).toBeInTheDocument();
-			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
-		} );
-	} );
-
-	describe( 'items prefix and suffix', () => {
-		it( 'should display a prefix on regular items', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem prefix={ <>Item prefix</> }>
-						Dropdown menu item
-					</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			// Click to open the menu
-			await click(
-				screen.getByRole( 'button', {
-					name: 'Open dropdown',
-				} )
-			);
-
-			// The contents of the prefix are rendered before the item's children
-			expect(
-				screen.getByRole( 'menuitem', {
-					name: 'Item prefix Dropdown menu item',
-				} )
-			).toBeInTheDocument();
-		} );
-
-		it( 'should display a suffix on regular items', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem suffix={ <>Item suffix</> }>
-						Dropdown menu item
-					</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			// Click to open the menu
-			await click(
-				screen.getByRole( 'button', {
-					name: 'Open dropdown',
-				} )
-			);
-
-			// The contents of the suffix are rendered after the item's children
-			expect(
-				screen.getByRole( 'menuitem', {
-					name: 'Dropdown menu item Item suffix',
-				} )
-			).toBeInTheDocument();
-		} );
-
-		it( 'should display a suffix on radio items', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuRadioItem
-						name="radio-test"
-						value="radio-one"
-						suffix="Radio suffix"
-					>
-						Radio item one
-					</DropdownMenuRadioItem>
-				</DropdownMenu>
-			);
-
-			// Click to open the menu
-			await click(
-				screen.getByRole( 'button', {
-					name: 'Open dropdown',
-				} )
-			);
-
-			// The contents of the suffix are rendered after the item's children
-			expect(
-				screen.getByRole( 'menuitemradio', {
-					name: 'Radio item one Radio suffix',
-				} )
-			).toBeInTheDocument();
-		} );
-
-		it( 'should display a suffix on checkbox items', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuCheckboxItem
-						name="checkbox-test"
-						value="checkbox-one"
-						suffix="Checkbox suffix"
-					>
-						Checkbox item one
-					</DropdownMenuCheckboxItem>
-				</DropdownMenu>
-			);
-
-			// Click to open the menu
-			await click(
-				screen.getByRole( 'button', {
-					name: 'Open dropdown',
-				} )
-			);
-
-			// The contents of the suffix are rendered after the item's children
-			expect(
-				screen.getByRole( 'menuitemcheckbox', {
-					name: 'Checkbox item one Checkbox suffix',
-				} )
-			).toBeInTheDocument();
-		} );
-	} );
-
-	describe( 'typeahead', () => {
-		it( 'should highlight matching item', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem>One</DropdownMenuItem>
-					<DropdownMenuItem>Two</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			// Click to open the menu
-			await click(
-				screen.getByRole( 'button', {
-					name: 'Open dropdown',
-				} )
-			);
-			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
-
-			// Type "tw", it should match and focus the item with content "Two"
-			await type( 'tw' );
-			expect(
-				screen.getByRole( 'menuitem', { name: 'Two' } )
-			).toHaveFocus();
-
-			// Wait for the typeahead timer to reset and interpret
-			// the next keystrokes as a new search
-			await delay( 500 );
-
-			// Type "on", it should match and focus the item with content "One"
-			await type( 'on' );
-			expect(
-				screen.getByRole( 'menuitem', { name: 'One' } )
-			).toHaveFocus();
-		} );
-
-		it( 'should keep previous focus when no matches are found', async () => {
-			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem>One</DropdownMenuItem>
-					<DropdownMenuItem>Two</DropdownMenuItem>
-				</DropdownMenu>
-			);
-
-			// Click to open the menu
-			await click(
-				screen.getByRole( 'button', {
-					name: 'Open dropdown',
-				} )
-			);
-			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
-
-			// Type a string that doesn't match any items. Focus shouldn't move.
-			await type( 'abc' );
-			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
-
-			// Wait for the typeahead timer to reset and interpret
-			// the next keystrokes as a new search
-			await delay( 500 );
-
-			// Type "on", it should match and focus the item with content "One"
-			await type( 'on' );
-			expect(
-				screen.getByRole( 'menuitem', { name: 'One' } )
-			).toHaveFocus();
-
-			// Wait for the typeahead timer to reset and interpret
-			// the next keystrokes as a new search
-			await delay( 500 );
-
-			// Type a string that doesn't match any items. Focus shouldn't move.
-			await type( 'abc' );
-			expect(
-				screen.getByRole( 'menuitem', { name: 'One' } )
-			).toHaveFocus();
-
-			// Wait for the typeahead timer to reset and interpret
-			// the next keystrokes as a new search
-			await delay( 500 );
-
-			// Type "tw", it should match and focus the item with content "Two"
-			await type( 'tw' );
-			expect(
-				screen.getByRole( 'menuitem', { name: 'Two' } )
-			).toHaveFocus();
-		} );
-	} );
-} );
diff --git a/packages/components/src/dropdown-menu-v2-ariakit/types.ts b/packages/components/src/dropdown-menu-v2-ariakit/types.ts
deleted file mode 100644
index 478b89c67f136a..00000000000000
--- a/packages/components/src/dropdown-menu-v2-ariakit/types.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * External dependencies
- */
-// eslint-disable-next-line no-restricted-imports
-import type * as Ariakit from '@ariakit/react';
-import type { Placement } from '@floating-ui/react-dom';
-
-export interface DropdownMenuContext {
-	/**
-	 * The ariakit store shared across all DropdownMenu subcomponents.
-	 */
-	store: Ariakit.MenuStore;
-	/**
-	 * The variant used by the underlying menu popover.
-	 */
-	variant?: 'toolbar';
-}
-
-export interface DropdownMenuProps {
-	/**
-	 * The trigger button.
-	 */
-	trigger: React.ReactElement;
-	/**
-	 * The contents of the dropdown.
-	 */
-	children?: React.ReactNode;
-	/**
-	 * The open state of the dropdown menu when it is initially rendered. Use when
-	 * not wanting to control its open state.
-	 *
-	 * @default false
-	 */
-	defaultOpen?: boolean;
-	/**
-	 * The controlled open state of the dropdown menu. Must be used in conjunction
-	 * with `onOpenChange`.
-	 */
-	open?: boolean;
-	/**
-	 * Event handler called when the open state of the dropdown menu changes.
-	 */
-	onOpenChange?: ( open: boolean ) => void;
-	/**
-	 * The modality of the dropdown menu. When set to true, interaction with
-	 * outside elements will be disabled and only menu content will be visible to
-	 * screen readers.
-	 *
-	 * @default true
-	 */
-	modal?: boolean;
-	/**
-	 * The placement of the dropdown menu popover.
-	 *
-	 * @default 'bottom-start' for root-level menus, 'right-start' for nested menus
-	 */
-	placement?: Placement;
-	/**
-	 * The distance between the popover and the anchor element.
-	 *
-	 * @default 8 for root-level menus, 16 for nested menus
-	 */
-	gutter?: number;
-	/**
-	 * The skidding of the popover along the anchor element. Can be set to
-	 * negative values to make the popover shift to the opposite side.
-	 *
-	 * @default 0 for root-level menus, -8 for nested menus
-	 */
-	shift?: number;
-	/**
-	 * Determines whether the menu popover will be hidden when the user presses
-	 * the Escape key.
-	 *
-	 * @default `( event ) => { event.preventDefault(); return true; }`
-	 */
-	hideOnEscape?:
-		| boolean
-		| ( (
-				event: KeyboardEvent | React.KeyboardEvent< Element >
-		  ) => boolean );
-}
-
-export interface DropdownMenuGroupProps {
-	/**
-	 * The contents of the dropdown menu group.
-	 */
-	children: React.ReactNode;
-}
-
-export interface DropdownMenuItemProps {
-	/**
-	 * The contents of the menu item.
-	 */
-	children: React.ReactNode;
-	/**
-	 * The contents of the menu item's prefix.
-	 */
-	prefix?: React.ReactNode;
-	/**
-	 * The contents of the menu item's suffix.
-	 */
-	suffix?: React.ReactNode;
-	/**
-	 * Whether to hide the parent menu when the item is clicked.
-	 *
-	 * @default true
-	 */
-	hideOnClick?: boolean;
-	/**
-	 * Determines if the element is disabled.
-	 */
-	disabled?: boolean;
-}
-
-export interface DropdownMenuCheckboxItemProps
-	extends Omit< DropdownMenuItemProps, 'prefix' | 'hideOnClick' > {
-	/**
-	 * Whether to hide the dropdown menu when the item is clicked.
-	 *
-	 * @default false
-	 */
-	hideOnClick?: boolean;
-	/**
-	 * The checkbox menu item's name.
-	 */
-	name: string;
-	/**
-	 * The checkbox item's value, useful when using multiple checkbox menu items
-	 * associated to the same `name`.
-	 */
-	value?: string;
-	/**
-	 * The controlled checked state of the checkbox menu item.
-	 */
-	checked?: boolean;
-	/**
-	 * The checked state of the checkbox menu item when it is initially rendered.
-	 * Use when not wanting to control its checked state.
-	 */
-	defaultChecked?: boolean;
-	/**
-	 * Event handler called when the checked state of the checkbox menu item changes.
-	 */
-	onChange?: ( event: React.ChangeEvent< HTMLInputElement > ) => void;
-}
-
-export interface DropdownMenuRadioItemProps
-	extends Omit< DropdownMenuItemProps, 'prefix' | 'hideOnClick' > {
-	/**
-	 * Whether to hide the dropdown menu when the item is clicked.
-	 *
-	 * @default false
-	 */
-	hideOnClick?: boolean;
-	/**
-	 * The radio item's name.
-	 */
-	name: string;
-	/**
-	 * The radio item's value.
-	 */
-	value: string | number;
-	/**
-	 * The controlled checked state of the radio menu item.
-	 */
-	checked?: boolean;
-	/**
-	 * The checked state of the radio menu item when it is initially rendered.
-	 * Use when not wanting to control its checked state.
-	 */
-	defaultChecked?: boolean;
-	/**
-	 * Event handler called when the checked radio menu item changes.
-	 */
-	onChange?: ( event: React.ChangeEvent< HTMLInputElement > ) => void;
-}
-
-export interface DropdownMenuSeparatorProps {}
diff --git a/packages/components/src/dropdown-menu-v2/README.md b/packages/components/src/dropdown-menu-v2/README.md
index 910690280015f5..771b5b74b24bf7 100644
--- a/packages/components/src/dropdown-menu-v2/README.md
+++ b/packages/components/src/dropdown-menu-v2/README.md
@@ -1,11 +1,10 @@
-# `DropdownMenu` (v2)
+# `DropdownMenuV2`
 
 <div class="callout callout-alert">
 This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
 </div>
 
-`DropdownMenu` displays a menu to the user (such as a set of actions or functions) triggered by a button.
-
+`DropdownMenuV2` displays a menu to the user (such as a set of actions or functions) triggered by a button.
 
 ## Design guidelines
 
@@ -46,7 +45,7 @@ This component is still highly experimental, and it's not normally accessible to
 
 The component exposes a set of components that are meant to be used in combination with each other in order to implement a `DropdownMenu` correctly.
 
-### `DropdownMenu`
+### `DropdownMenuV2`
 
 The root component, used to specify the menu's trigger and its contents.
 
@@ -58,68 +57,62 @@ The component accepts the following props:
 
 The trigger button
 
-- Required: yes
+-   Required: yes
 
 ##### `children`: `React.ReactNode`
 
 The contents of the dropdown
 
-- Required: yes
+-   Required: yes
 
 ##### `defaultOpen`: `boolean`
 
-The open state of the dropdown menu when it is initially rendered. Use when you do not need to control its open state.
+The open state of the dropdown menu when it is initially rendered. Use when not wanting to control its open state.
 
-- Required: no
+-   Required: no
+-   Default: `false`
 
 ##### `open`: `boolean`
 
-The controlled open state of the dropdown menu. Must be used in conjunction with `onOpenChange`
+The controlled open state of the dropdown menu. Must be used in conjunction with `onOpenChange`.
 
-- Required: no
+-   Required: no
 
 ##### `onOpenChange`: `(open: boolean) => void`
 
 Event handler called when the open state of the dropdown menu changes.
 
-- Required: no
+-   Required: no
 
 ##### `modal`: `boolean`
 
 The modality of the dropdown menu. When set to true, interaction with outside elements will be disabled and only menu content will be visible to screen readers.
 
-- Required: no
-- Default: `true`
+-   Required: no
+-   Default: `true`
 
-##### `side`: `"bottom" | "left" | "right" | "top"`
+##### `placement`: ``'top' | 'top-start' | 'top-end' | 'right' | 'right-start' | 'right-end' | 'bottom' | 'bottom-start' | 'bottom-end' | 'left' | 'left-start' | 'left-end'`
 
-The preferred side of the trigger to render against when open. Will be reversed when collisions occur and avoidCollisions is enabled.
+The placement of the dropdown menu popover.
 
-- Required: no
-- Default: `"bottom"`
+-   Required: no
+-   Default: `'bottom-start'` for root-level menus, `'right-start'` for nested menus
 
-##### `sideOffset`: `number`
+##### `gutter`: `number`
 
 The distance in pixels from the trigger.
 
-- Required: no
-- Default: `0`
-
-##### `align`: `"end" | "start" | "center"`
-
-The preferred alignment against the trigger. May change when collisions occur.
+-   Required: no
+-   Default: `8` for root-level menus, `16` for nested menus
 
-- Required: no
-- Default: `"start"`
+##### `shift`: `number`
 
-##### `alignOffset`: `number`
+The skidding of the popover along the anchor element. Can be set to negative values to make the popover shift to the opposite side.
 
-An offset in pixels from the "start" or "end" alignment options.
+-   Required: no
+-   Default: `0` for root-level menus, `-8` for nested menus
 
-- Required: no
-- Default: `0`
-
-### `DropdownMenuItem`
+### `DropdownMenuV2.Item`
 
 Used to render a menu item.
 
@@ -131,116 +124,103 @@ The component accepts the following props:
 
 The contents of the item
 
-- Required: yes
-
-##### `disabled`: `boolean`
-
-- Required: no
-- Default: `false`
-
-##### `onSelect`: `(event: Event) => void`
-
-Event handler called when the user selects an item (via mouse or keyboard). Calling `event.preventDefault` in this handler will prevent the dropdown menu from closing when selecting that item.
-
-- Required: no
-
-##### `textValue`: `string`
-
-Optional text used for typeahead purposes. By default the typeahead behavior will use the `.textContent` of the item. Use this when the content is complex, or you have non-textual content inside.
-
-- Required: no
+-   Required: yes
 
 ##### `prefix`: `React.ReactNode`
 
 The contents of the item's prefix.
 
-- Required: no
+-   Required: no
 
 ##### `suffix`: `React.ReactNode`
 
 The contents of the item's suffix.
 
-- Required: no
+-   Required: no
 
-### `DropdownSubMenu`
+##### `hideOnClick`: `boolean`
 
-Used to render a nested submenu.
+Whether to hide the dropdown menu when the menu item is clicked.
 
-#### Props
+-   Required: no
+-   Default: `true`
 
-The component accepts the following props:
-##### `trigger`: `React.ReactNode`
+##### `disabled`: `boolean`
 
-The contents rendered inside the trigger. The trigger should be an instance of the `DropdownSubMenuTrigger` component.
+Determines if the element is disabled.
 
-- Required: yes
+-   Required: no
+-   Default: `false`
 
-##### `children`: `React.ReactNode`
+### `DropdownMenuV2.CheckboxItem`
 
-The contents of the dropdown
+Used to render a checkbox item.
 
-- Required: yes
+#### Props
 
-##### `defaultOpen`: `boolean`
+The component accepts the following props:
 
-The open state of the dropdown menu when it is initially rendered. Use when you do not need to control its open state.
+##### `children`: `React.ReactNode`
 
-- Required: no
+The contents of the item
 
-##### `open`: `boolean`
+-   Required: yes
 
-The controlled open state of the dropdown menu. Must be used in conjunction with `onOpenChange`
+##### `suffix`: `React.ReactNode`
 
-- Required: no
+The contents of the item's suffix.
 
-##### `onOpenChange`: `(open: boolean) => void`
+-   Required: no
 
-Event handler called when the open state of the dropdown menu changes.
+##### `hideOnClick`: `boolean`
 
-- Required: no
+Whether to hide the dropdown menu when the menu item is clicked.
+
+-   Required: no
+-   Default: `false`
 
 ##### `disabled`: `boolean`
 
-When `true`, prevents the user from interacting with the item.
+Determines if the element is disabled.
 
-- Required: no
+-   Required: no
+-   Default: `false`
 
-##### `textValue`: `string`
+##### `name`: `string`
 
-Optional text used for typeahead purposes for the trigger. By default the typeahead behavior will use the `.textContent` of the trigger. Use this when the content is complex, or you have non-textual content inside.
+The checkbox item's name.
 
-- Required: no
+-   Required: yes
 
-### `DropdownSubMenuTrigger`
+##### `value`: `string`
 
-Used to render a submenu trigger.
+The checkbox item's value, useful when using multiple checkbox items
+associated to the same `name`.
 
-#### Props
-
-The component accepts the following props:
+-   Required: no
 
-##### `children`: `React.ReactNode`
+##### `checked`: `boolean`
 
-The contents of the item
+The checkbox item's value, useful when using multiple checkbox items
+associated to the same `name`.
 
-- Required: yes
+-   Required: no
 
-##### `prefix`: `React.ReactNode`
+##### `defaultChecked`: `boolean`
 
-The contents of the item's prefix.
+The checked state of the checkbox menu item when it is initially rendered. Use when not wanting to control its checked state.
 
-- Required: no
+-   Required: no
 
-##### `suffix`: `React.ReactNode`
+##### `onChange`: `( event: React.ChangeEvent< HTMLInputElement > ) => void;`
 
-The contents of the item's suffix.
+Event handler called when the checked state of the checkbox menu item changes.
 
-- Default: a chevron icon
-- Required: The standard chevron icon for a submenu trigger
+-   Required: no
 
-### `DropdownMenuCheckboxItem`
+### `DropdownMenuV2.RadioItem`
 
-Used to render a checkbox item.
+Used to render a radio item.
 
 #### Props
 
@@ -248,76 +228,64 @@ The component accepts the following props:
 
 ##### `children`: `React.ReactNode`
 
-The contents of the checkbox item
+The contents of the item
 
-- Required: yes
+-   Required: yes
 
-##### `checked`: `boolean`
+##### `suffix`: `React.ReactNode`
 
-The controlled checked state of the item. Must be used in conjunction with `onCheckedChange`.
+The contents of the item's suffix.
 
-- Required: no
-- Default: `false`
+-   Required: no
 
-##### `onCheckedChange`: `(checked: boolean) => void)`
+##### `hideOnClick`: `boolean`
 
-Event handler called when the checked state changes.
+Whether to hide the dropdown menu when the menu item is clicked.
 
-- Required: no
+-   Required: no
+-   Default: `false`
 
 ##### `disabled`: `boolean`
 
-When `true`, prevents the user from interacting with the item.
-
-- Required: no
+Determines if the element is disabled.
 
-##### `onSelect`: `(event: Event) => void`
+-   Required: no
+-   Default: `false`
 
-Event handler called when the user selects an item (via mouse or keyboard). Calling `event.preventDefault` in this handler will prevent the dropdown menu from closing when selecting that item.
+##### `name`: `string`
 
-- Required: no
+The radio item's name.
 
-##### `textValue`: `string`
+-   Required: yes
 
-Optional text used for typeahead purposes. By default the typeahead behavior will use the `.textContent` of the item. Use this when the content is complex, or you have non-textual content inside.
+##### `value`: `string | number`
 
-- Required: no
+The radio item's value.
 
-##### `suffix`: `React.ReactNode`
-
-The contents of the checkbox item's suffix.
-
-- Required: no
-
-### `DropdownMenuRadioGroup`
-
-Used to render a radio group.
+-   Required: yes
 
-#### Props
-
-The component accepts the following props:
-
-##### `children`: `React.ReactNode`
+##### `checked`: `boolean`
 
-The contents of the radio group
+The checkbox item's value, useful when using multiple checkbox items
+associated to the same `name`.
 
-- Required: yes
+-   Required: no
 
-##### `value`: `string`
+##### `defaultChecked`: `boolean`
 
-The value of the selected item in the group.
+The checked state of the radio menu item when it is initially rendered. Use when not wanting to control its checked state.
 
-- Required: no
+-   Required: no
 
-##### `onValueChange`: `(value: string) => void`
+##### `onChange`: `( event: React.ChangeEvent< HTMLInputElement > ) => void;`
 
-Event handler called when the value changes.
+Event handler called when the checked radio menu item changes.
 
-- Required: no
+-   Required: no
 
-### `DropdownMenuRadioItem`
+### `DropdownMenuV2.ItemLabel`
 
-Used to render a radio item.
+Used to render the menu item's label.
 
 #### Props
 
@@ -325,43 +293,27 @@ The component accepts the following props:
 
 ##### `children`: `React.ReactNode`
 
-The contents of the item.
-
-- Required: yes
-
-##### `value`: `string`
-
-The unique value of the item.
-
-- Required: yes
-
-##### `disabled`: `boolean`
+The label contents.
 
-When `true`, prevents the user from interacting with the item.
+-   Required: yes
 
-- Required: no
+### `DropdownMenuV2.ItemHelpText`
 
-##### `onSelect`: `(event: Event) => void`
+Used to render the menu item's help text.
 
-Event handler called when the user selects an item (via mouse or keyboard). Calling `event.preventDefault` in this handler will prevent the dropdown menu from closing when selecting that item.
-
-- Required: no
-
-##### `textValue`: `string`
-
-Optional text used for typeahead purposes. By default the typeahead behavior will use the `.textContent` of the item. Use this when the content is complex, or you have non-textual content inside.
+#### Props
 
-- Required: no
+The component accepts the following props:
 
-##### `suffix`: `React.ReactNode
+##### `children`: `React.ReactNode`
 
-The contents of the radio item's suffix.
+The help text contents.
 
-- Required: no
+-   Required: yes
 
-### `DropdownMenuLabel`
+### `DropdownMenuV2.Group`
 
-Used to render a group label.
+Used to group menu items.
 
 #### Props
 
@@ -371,11 +323,11 @@ The component accepts the following props:
 
 The contents of the group.
 
-- Required: yes
+-   Required: yes
 
-### `DropdownMenuGroup`
+### `DropdownMenuV2.GroupLabel`
 
-Used to group menu items.
+Used to render a group label. The label text should be kept as short as possible.
 
 #### Props
 
@@ -383,10 +335,10 @@ The component accepts the following props:
 
 ##### `children`: `React.ReactNode`
 
-The contents of the group.
+The contents of the group label.
 
-- Required: yes
+-   Required: yes
 
-### `DropdownMenuSeparatorProps`
+### `DropdownMenuV2.Separator`
 
 Used to render a visual separator.
diff --git a/packages/components/src/dropdown-menu-v2/checkbox-item.tsx b/packages/components/src/dropdown-menu-v2/checkbox-item.tsx
new file mode 100644
index 00000000000000..bcbc920cbb7205
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/checkbox-item.tsx
@@ -0,0 +1,63 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef, useContext } from '@wordpress/element';
+import { Icon, check } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { DropdownMenuContext } from './context';
+import type { DropdownMenuCheckboxItemProps } from './types';
+import * as Styled from './styles';
+import { useTemporaryFocusVisibleFix } from './use-temporary-focus-visible-fix';
+
+export const DropdownMenuCheckboxItem = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< DropdownMenuCheckboxItemProps, 'div', false >
+>( function DropdownMenuCheckboxItem(
+	{ suffix, children, onBlur, hideOnClick = false, ...props },
+	ref
+) {
+	// TODO: Remove when https://github.com/ariakit/ariakit/issues/4083 is fixed
+	const focusVisibleFixProps = useTemporaryFocusVisibleFix( { onBlur } );
+	const dropdownMenuContext = useContext( DropdownMenuContext );
+
+	return (
+		<Styled.DropdownMenuCheckboxItem
+			ref={ ref }
+			{ ...props }
+			{ ...focusVisibleFixProps }
+			accessibleWhenDisabled
+			hideOnClick={ hideOnClick }
+			store={ dropdownMenuContext?.store }
+		>
+			<Ariakit.MenuItemCheck
+				store={ dropdownMenuContext?.store }
+				render={ <Styled.ItemPrefixWrapper /> }
+				// Override some ariakit inline styles
+				style={ { width: 'auto', height: 'auto' } }
+			>
+				<Icon icon={ check } size={ 24 } />
+			</Ariakit.MenuItemCheck>
+
+			<Styled.DropdownMenuItemContentWrapper>
+				<Styled.DropdownMenuItemChildrenWrapper>
+					{ children }
+				</Styled.DropdownMenuItemChildrenWrapper>
+
+				{ suffix && (
+					<Styled.ItemSuffixWrapper>
+						{ suffix }
+					</Styled.ItemSuffixWrapper>
+				) }
+			</Styled.DropdownMenuItemContentWrapper>
+		</Styled.DropdownMenuCheckboxItem>
+	);
+} );
diff --git a/packages/components/src/dropdown-menu-v2/context.tsx b/packages/components/src/dropdown-menu-v2/context.tsx
new file mode 100644
index 00000000000000..b285843327267f
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/context.tsx
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { createContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { DropdownMenuContext as DropdownMenuContextType } from './types';
+
+export const DropdownMenuContext = createContext<
+	DropdownMenuContextType | undefined
+>( undefined );
diff --git a/packages/components/src/dropdown-menu-v2/group-label.tsx b/packages/components/src/dropdown-menu-v2/group-label.tsx
new file mode 100644
index 00000000000000..7d838ef9fa620a
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/group-label.tsx
@@ -0,0 +1,37 @@
+/**
+ * WordPress dependencies
+ */
+import { forwardRef, useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { DropdownMenuContext } from './context';
+import { Text } from '../text';
+import type { DropdownMenuGroupLabelProps } from './types';
+import * as Styled from './styles';
+
+export const DropdownMenuGroupLabel = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< DropdownMenuGroupLabelProps, 'div', false >
+>( function DropdownMenuGroup( props, ref ) {
+	const dropdownMenuContext = useContext( DropdownMenuContext );
+	return (
+		<Styled.DropdownMenuGroupLabel
+			ref={ ref }
+			render={
+				// @ts-expect-error The `children` prop is passed
+				<Text
+					upperCase
+					variant="muted"
+					size="11px"
+					weight={ 500 }
+					lineHeight="16px"
+				/>
+			}
+			{ ...props }
+			store={ dropdownMenuContext?.store }
+		/>
+	);
+} );
diff --git a/packages/components/src/dropdown-menu-v2/group.tsx b/packages/components/src/dropdown-menu-v2/group.tsx
new file mode 100644
index 00000000000000..f2bf79015bc691
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/group.tsx
@@ -0,0 +1,26 @@
+/**
+ * WordPress dependencies
+ */
+import { forwardRef, useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { DropdownMenuContext } from './context';
+import type { DropdownMenuGroupProps } from './types';
+import * as Styled from './styles';
+
+export const DropdownMenuGroup = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< DropdownMenuGroupProps, 'div', false >
+>( function DropdownMenuGroup( props, ref ) {
+	const dropdownMenuContext = useContext( DropdownMenuContext );
+	return (
+		<Styled.DropdownMenuGroup
+			ref={ ref }
+			{ ...props }
+			store={ dropdownMenuContext?.store }
+		/>
+	);
+} );
diff --git a/packages/components/src/dropdown-menu-v2/index.tsx b/packages/components/src/dropdown-menu-v2/index.tsx
index 085a1f2c144cce..50c4f3069d51b5 100644
--- a/packages/components/src/dropdown-menu-v2/index.tsx
+++ b/packages/components/src/dropdown-menu-v2/index.tsx
@@ -1,293 +1,244 @@
 /**
  * External dependencies
  */
-import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
+import * as Ariakit from '@ariakit/react';
+import { useStoreState } from '@ariakit/react';
 
 /**
  * WordPress dependencies
  */
 import {
-	forwardRef,
-	createContext,
 	useContext,
 	useMemo,
+	cloneElement,
+	isValidElement,
+	useCallback,
 } from '@wordpress/element';
 import { isRTL } from '@wordpress/i18n';
-import { check, chevronRightSmall, lineSolid } from '@wordpress/icons';
-import { SVG, Circle } from '@wordpress/primitives';
+import { chevronRightSmall } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
-import { useContextSystem, contextConnectWithoutRef } from '../context';
-import { useSlot } from '../slot-fill';
-import Icon from '../icon';
-import { SLOT_NAME as POPOVER_DEFAULT_SLOT_NAME } from '../popover';
-import * as DropdownMenuStyled from './styles';
+import { useContextSystem, contextConnect } from '../context';
+import type { WordPressComponentProps } from '../context';
 import type {
+	DropdownMenuContext as DropdownMenuContextType,
 	DropdownMenuProps,
-	DropdownSubMenuProps,
-	DropdownMenuItemProps,
-	DropdownMenuLabelProps,
-	DropdownMenuGroupProps,
-	DropdownMenuCheckboxItemProps,
-	DropdownMenuRadioGroupProps,
-	DropdownMenuRadioItemProps,
-	DropdownMenuSeparatorProps,
-	DropdownSubMenuTriggerProps,
-	DropdownMenuInternalContext,
-	DropdownMenuPrivateContext as DropdownMenuPrivateContextType,
 } from './types';
-
-// Menu content's side padding + 4px
-const SUB_MENU_OFFSET_SIDE = 16;
-// Opposite amount of the top padding of the menu item
-const SUB_MENU_OFFSET_ALIGN = -8;
-
-const DropdownMenuPrivateContext =
-	createContext< DropdownMenuPrivateContextType >( {
-		variant: undefined,
-		portalContainer: null,
-	} );
-
-const UnconnectedDropdownMenu = ( props: DropdownMenuProps ) => {
+import * as Styled from './styles';
+import { DropdownMenuContext } from './context';
+import { DropdownMenuItem } from './item';
+import { DropdownMenuCheckboxItem } from './checkbox-item';
+import { DropdownMenuRadioItem } from './radio-item';
+import { DropdownMenuGroup } from './group';
+import { DropdownMenuGroupLabel } from './group-label';
+import { DropdownMenuSeparator } from './separator';
+import { DropdownMenuItemLabel } from './item-label';
+import { DropdownMenuItemHelpText } from './item-help-text';
+
+const UnconnectedDropdownMenu = (
+	props: WordPressComponentProps< DropdownMenuProps, 'div', false >,
+	ref: React.ForwardedRef< HTMLDivElement >
+) => {
 	const {
-		// Root props
-		defaultOpen,
+		// Store props
 		open,
+		defaultOpen = false,
 		onOpenChange,
-		modal = true,
-		// Content positioning props
-		side = 'bottom',
-		sideOffset = 0,
-		align = 'center',
-		alignOffset = 0,
-		// Render props
-		children,
+		placement,
+
+		// Menu trigger props
 		trigger,
 
+		// Menu props
+		gutter,
+		children,
+		shift,
+		modal = true,
+
 		// From internal components context
 		variant,
+
+		// Rest
+		...otherProps
 	} = useContextSystem<
-		// Adding `className` to the context type to avoid a TS error
-		DropdownMenuProps & DropdownMenuInternalContext & { className?: string }
+		typeof props & Pick< DropdownMenuContextType, 'variant' >
 	>( props, 'DropdownMenu' );
 
-	// Render the portal in the default slot used by the legacy Popover component.
-	const slot = useSlot( POPOVER_DEFAULT_SLOT_NAME );
-	const portalContainer = slot.ref?.current;
+	const parentContext = useContext( DropdownMenuContext );
+
+	const computedDirection = isRTL() ? 'rtl' : 'ltr';
+
+	// If an explicit value for the `placement` prop is not passed,
+	// apply a default placement of `bottom-start` for the root dropdown,
+	// and of `right-start` for nested dropdowns.
+	let computedPlacement =
+		props.placement ??
+		( parentContext?.store ? 'right-start' : 'bottom-start' );
+	// Swap left/right in case of RTL direction
+	if ( computedDirection === 'rtl' ) {
+		if ( /right/.test( computedPlacement ) ) {
+			computedPlacement = computedPlacement.replace(
+				'right',
+				'left'
+			) as typeof computedPlacement;
+		} else if ( /left/.test( computedPlacement ) ) {
+			computedPlacement = computedPlacement.replace(
+				'left',
+				'right'
+			) as typeof computedPlacement;
+		}
+	}
 
-	const privateContextValue = useMemo(
-		() => ( {
-			variant,
-			portalContainer,
-		} ),
-		[ variant, portalContainer ]
-	);
+	const dropdownMenuStore = Ariakit.useMenuStore( {
+		parent: parentContext?.store,
+		open,
+		defaultOpen,
+		placement: computedPlacement,
+		focusLoop: true,
+		setOpen( willBeOpen ) {
+			onOpenChange?.( willBeOpen );
+		},
+		rtl: computedDirection === 'rtl',
+	} );
 
-	return (
-		<DropdownMenuPrimitive.Root
-			defaultOpen={ defaultOpen }
-			open={ open }
-			onOpenChange={ onOpenChange }
-			modal={ modal }
-			dir={ isRTL() ? 'rtl' : 'ltr' }
-		>
-			<DropdownMenuPrimitive.Trigger asChild>
-				{ trigger }
-			</DropdownMenuPrimitive.Trigger>
-			<DropdownMenuPrimitive.Portal container={ portalContainer }>
-				<DropdownMenuStyled.Content
-					side={ side }
-					align={ align }
-					sideOffset={ sideOffset }
-					alignOffset={ alignOffset }
-					loop={ true }
-					variant={ variant }
-				>
-					<DropdownMenuPrivateContext.Provider
-						value={ privateContextValue }
-					>
-						{ children }
-					</DropdownMenuPrivateContext.Provider>
-				</DropdownMenuStyled.Content>
-			</DropdownMenuPrimitive.Portal>
-		</DropdownMenuPrimitive.Root>
+	const contextValue = useMemo(
+		() => ( { store: dropdownMenuStore, variant } ),
+		[ dropdownMenuStore, variant ]
 	);
-};
 
-/**
- * `DropdownMenu` displays a menu to the user (such as a set of actions
- * or functions) triggered by a button.
- */
-export const DropdownMenu = contextConnectWithoutRef(
-	UnconnectedDropdownMenu,
-	'DropdownMenu'
-);
+	// Extract the side from the applied placement — useful for animations.
+	// Using `currentPlacement` instead of `placement` to make sure that we
+	// use the final computed placement (including "flips" etc).
+	const appliedPlacementSide = useStoreState(
+		dropdownMenuStore,
+		'currentPlacement'
+	).split( '-' )[ 0 ];
+
+	if (
+		dropdownMenuStore.parent &&
+		! ( isValidElement( trigger ) && DropdownMenuItem === trigger.type )
+	) {
+		// eslint-disable-next-line no-console
+		console.warn(
+			'For nested DropdownMenus, the `trigger` should always be a `DropdownMenuItem`.'
+		);
+	}
 
-export const DropdownSubMenuTrigger = ( {
-	prefix,
-	suffix = (
-		<DropdownMenuStyled.SubmenuRtlChevronIcon
-			icon={ chevronRightSmall }
-			size={ 24 }
-		/>
-	),
-	children,
-}: DropdownSubMenuTriggerProps ) => {
-	return (
-		<>
-			{ prefix && (
-				<DropdownMenuStyled.ItemPrefixWrapper>
-					{ prefix }
-				</DropdownMenuStyled.ItemPrefixWrapper>
-			) }
-			{ children }
-			{ suffix && (
-				<DropdownMenuStyled.ItemSuffixWrapper>
-					{ suffix }
-				</DropdownMenuStyled.ItemSuffixWrapper>
-			) }
-		</>
+	const hideOnEscape = useCallback(
+		( event: React.KeyboardEvent< Element > ) => {
+			// Pressing Escape can cause unexpected consequences (ie. exiting
+			// full screen mode on MacOs, close parent modals...).
+			event.preventDefault();
+			// Returning `true` causes the menu to hide.
+			return true;
+		},
+		[]
 	);
-};
 
-export const DropdownSubMenu = ( {
-	// Sub props
-	defaultOpen,
-	open,
-	onOpenChange,
-	// Sub trigger props
-	disabled,
-	textValue,
-	// Render props
-	children,
-	trigger,
-}: DropdownSubMenuProps ) => {
-	const { variant, portalContainer } = useContext(
-		DropdownMenuPrivateContext
+	const wrapperProps = useMemo(
+		() => ( {
+			dir: computedDirection,
+			style: {
+				direction:
+					computedDirection as React.CSSProperties[ 'direction' ],
+			},
+		} ),
+		[ computedDirection ]
 	);
 
 	return (
-		<DropdownMenuPrimitive.Sub
-			defaultOpen={ defaultOpen }
-			open={ open }
-			onOpenChange={ onOpenChange }
-		>
-			<DropdownMenuStyled.SubTrigger
-				disabled={ disabled }
-				textValue={ textValue }
+		<>
+			{ /* Menu trigger */ }
+			<Ariakit.MenuButton
+				ref={ ref }
+				store={ dropdownMenuStore }
+				render={
+					dropdownMenuStore.parent
+						? cloneElement( trigger, {
+								// Add submenu arrow, unless a `suffix` is explicitly specified
+								suffix: (
+									<>
+										{ trigger.props.suffix }
+										<Styled.SubmenuChevronIcon
+											aria-hidden="true"
+											icon={ chevronRightSmall }
+											size={ 24 }
+											preserveAspectRatio="xMidYMid slice"
+										/>
+									</>
+								),
+						  } )
+						: trigger
+				}
+			/>
+
+			{ /* Menu popover */ }
+			<Ariakit.Menu
+				{ ...otherProps }
+				modal={ modal }
+				store={ dropdownMenuStore }
+				// Root menu has an 8px distance from its trigger,
+				// otherwise 0 (which causes the submenu to slightly overlap)
+				gutter={ gutter ?? ( dropdownMenuStore.parent ? 0 : 8 ) }
+				// Align nested menu by the same (but opposite) amount
+				// as the menu container's padding.
+				shift={ shift ?? ( dropdownMenuStore.parent ? -4 : 0 ) }
+				hideOnHoverOutside={ false }
+				data-side={ appliedPlacementSide }
+				wrapperProps={ wrapperProps }
+				hideOnEscape={ hideOnEscape }
+				unmountOnHide
+				render={ ( renderProps ) => (
+					// Two wrappers are needed for the entry animation, where the menu
+					// container scales with a different factor than its contents.
+					// The {...renderProps} are passed to the inner wrapper, so that the
+					// menu element is the direct parent of the menu item elements.
+					<Styled.MenuPopoverOuterWrapper variant={ variant }>
+						<Styled.MenuPopoverInnerWrapper { ...renderProps } />
+					</Styled.MenuPopoverOuterWrapper>
+				) }
 			>
-				{ trigger }
-			</DropdownMenuStyled.SubTrigger>
-			<DropdownMenuPrimitive.Portal container={ portalContainer }>
-				<DropdownMenuStyled.SubContent
-					loop
-					sideOffset={ SUB_MENU_OFFSET_SIDE }
-					alignOffset={ SUB_MENU_OFFSET_ALIGN }
-					variant={ variant }
-				>
+				<DropdownMenuContext.Provider value={ contextValue }>
 					{ children }
-				</DropdownMenuStyled.SubContent>
-			</DropdownMenuPrimitive.Portal>
-		</DropdownMenuPrimitive.Sub>
+				</DropdownMenuContext.Provider>
+			</Ariakit.Menu>
+		</>
 	);
 };
 
-export const DropdownMenuLabel = ( props: DropdownMenuLabelProps ) => (
-	<DropdownMenuStyled.Label { ...props } />
-);
-
-export const DropdownMenuGroup = ( props: DropdownMenuGroupProps ) => (
-	<DropdownMenuPrimitive.Group { ...props } />
-);
-
-export const DropdownMenuItem = forwardRef(
-	(
-		{ children, prefix, suffix, ...props }: DropdownMenuItemProps,
-		forwardedRef: React.ForwardedRef< any >
-	) => {
-		return (
-			<DropdownMenuStyled.Item { ...props } ref={ forwardedRef }>
-				{ prefix && (
-					<DropdownMenuStyled.ItemPrefixWrapper>
-						{ prefix }
-					</DropdownMenuStyled.ItemPrefixWrapper>
-				) }
-				{ children }
-				{ suffix && (
-					<DropdownMenuStyled.ItemSuffixWrapper>
-						{ suffix }
-					</DropdownMenuStyled.ItemSuffixWrapper>
-				) }
-			</DropdownMenuStyled.Item>
-		);
+export const DropdownMenuV2 = Object.assign(
+	contextConnect( UnconnectedDropdownMenu, 'DropdownMenu' ),
+	{
+		Context: Object.assign( DropdownMenuContext, {
+			displayName: 'DropdownMenuV2.Context',
+		} ),
+		Item: Object.assign( DropdownMenuItem, {
+			displayName: 'DropdownMenuV2.Item',
+		} ),
+		RadioItem: Object.assign( DropdownMenuRadioItem, {
+			displayName: 'DropdownMenuV2.RadioItem',
+		} ),
+		CheckboxItem: Object.assign( DropdownMenuCheckboxItem, {
+			displayName: 'DropdownMenuV2.CheckboxItem',
+		} ),
+		Group: Object.assign( DropdownMenuGroup, {
+			displayName: 'DropdownMenuV2.Group',
+		} ),
+		GroupLabel: Object.assign( DropdownMenuGroupLabel, {
+			displayName: 'DropdownMenuV2.GroupLabel',
+		} ),
+		Separator: Object.assign( DropdownMenuSeparator, {
+			displayName: 'DropdownMenuV2.Separator',
+		} ),
+		ItemLabel: Object.assign( DropdownMenuItemLabel, {
+			displayName: 'DropdownMenuV2.ItemLabel',
+		} ),
+		ItemHelpText: Object.assign( DropdownMenuItemHelpText, {
+			displayName: 'DropdownMenuV2.ItemHelpText',
+		} ),
 	}
 );
 
-export const DropdownMenuCheckboxItem = ( {
-	children,
-	checked = false,
-	suffix,
-	...props
-}: DropdownMenuCheckboxItemProps ) => {
-	return (
-		<DropdownMenuStyled.CheckboxItem { ...props } checked={ checked }>
-			<DropdownMenuStyled.ItemPrefixWrapper>
-				<DropdownMenuStyled.ItemIndicator>
-					{ ( checked === 'indeterminate' || checked === true ) && (
-						<Icon
-							icon={
-								checked === 'indeterminate' ? lineSolid : check
-							}
-							size={ 24 }
-						/>
-					) }
-				</DropdownMenuStyled.ItemIndicator>
-			</DropdownMenuStyled.ItemPrefixWrapper>
-			{ children }
-			{ suffix && (
-				<DropdownMenuStyled.ItemSuffixWrapper>
-					{ suffix }
-				</DropdownMenuStyled.ItemSuffixWrapper>
-			) }
-		</DropdownMenuStyled.CheckboxItem>
-	);
-};
-
-export const DropdownMenuRadioGroup = (
-	props: DropdownMenuRadioGroupProps
-) => <DropdownMenuPrimitive.RadioGroup { ...props } />;
-
-const radioDot = (
-	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-		<Circle cx={ 12 } cy={ 12 } r={ 3 } fill="currentColor"></Circle>
-	</SVG>
-);
-
-export const DropdownMenuRadioItem = ( {
-	children,
-	suffix,
-	...props
-}: DropdownMenuRadioItemProps ) => {
-	return (
-		<DropdownMenuStyled.RadioItem { ...props }>
-			<DropdownMenuStyled.ItemPrefixWrapper>
-				<DropdownMenuStyled.ItemIndicator>
-					<Icon icon={ radioDot } size={ 22 } />
-				</DropdownMenuStyled.ItemIndicator>
-			</DropdownMenuStyled.ItemPrefixWrapper>
-			{ children }
-			{ suffix && (
-				<DropdownMenuStyled.ItemSuffixWrapper>
-					{ suffix }
-				</DropdownMenuStyled.ItemSuffixWrapper>
-			) }
-		</DropdownMenuStyled.RadioItem>
-	);
-};
-
-export const DropdownMenuSeparator = ( props: DropdownMenuSeparatorProps ) => {
-	const { variant } = useContext( DropdownMenuPrivateContext );
-	return <DropdownMenuStyled.Separator { ...props } variant={ variant } />;
-};
+export default DropdownMenuV2;
diff --git a/packages/components/src/dropdown-menu-v2/item-help-text.tsx b/packages/components/src/dropdown-menu-v2/item-help-text.tsx
new file mode 100644
index 00000000000000..0408d20dfbd40d
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/item-help-text.tsx
@@ -0,0 +1,23 @@
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import * as Styled from './styles';
+
+export const DropdownMenuItemHelpText = forwardRef<
+	HTMLSpanElement,
+	WordPressComponentProps< { children: React.ReactNode }, 'span', true >
+>( function DropdownMenuItemHelpText( props, ref ) {
+	return (
+		<Styled.DropdownMenuItemHelpText
+			numberOfLines={ 2 }
+			ref={ ref }
+			{ ...props }
+		/>
+	);
+} );
diff --git a/packages/components/src/dropdown-menu-v2/item-label.tsx b/packages/components/src/dropdown-menu-v2/item-label.tsx
new file mode 100644
index 00000000000000..a1f9391af2f92d
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/item-label.tsx
@@ -0,0 +1,23 @@
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import * as Styled from './styles';
+
+export const DropdownMenuItemLabel = forwardRef<
+	HTMLSpanElement,
+	WordPressComponentProps< { children: React.ReactNode }, 'span', true >
+>( function DropdownMenuItemLabel( props, ref ) {
+	return (
+		<Styled.DropdownMenuItemLabel
+			numberOfLines={ 1 }
+			ref={ ref }
+			{ ...props }
+		/>
+	);
+} );
diff --git a/packages/components/src/dropdown-menu-v2/item.tsx b/packages/components/src/dropdown-menu-v2/item.tsx
new file mode 100644
index 00000000000000..2680603db22aa7
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/item.tsx
@@ -0,0 +1,50 @@
+/**
+ * WordPress dependencies
+ */
+import { forwardRef, useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import type { DropdownMenuItemProps } from './types';
+import * as Styled from './styles';
+import { DropdownMenuContext } from './context';
+import { useTemporaryFocusVisibleFix } from './use-temporary-focus-visible-fix';
+
+export const DropdownMenuItem = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< DropdownMenuItemProps, 'div', false >
+>( function DropdownMenuItem(
+	{ prefix, suffix, children, onBlur, hideOnClick = true, ...props },
+	ref
+) {
+	// TODO: Remove when https://github.com/ariakit/ariakit/issues/4083 is fixed
+	const focusVisibleFixProps = useTemporaryFocusVisibleFix( { onBlur } );
+	const dropdownMenuContext = useContext( DropdownMenuContext );
+
+	return (
+		<Styled.DropdownMenuItem
+			ref={ ref }
+			{ ...props }
+			{ ...focusVisibleFixProps }
+			accessibleWhenDisabled
+			hideOnClick={ hideOnClick }
+			store={ dropdownMenuContext?.store }
+		>
+			<Styled.ItemPrefixWrapper>{ prefix }</Styled.ItemPrefixWrapper>
+
+			<Styled.DropdownMenuItemContentWrapper>
+				<Styled.DropdownMenuItemChildrenWrapper>
+					{ children }
+				</Styled.DropdownMenuItemChildrenWrapper>
+
+				{ suffix && (
+					<Styled.ItemSuffixWrapper>
+						{ suffix }
+					</Styled.ItemSuffixWrapper>
+				) }
+			</Styled.DropdownMenuItemContentWrapper>
+		</Styled.DropdownMenuItem>
+	);
+} );
diff --git a/packages/components/src/dropdown-menu-v2/radio-item.tsx b/packages/components/src/dropdown-menu-v2/radio-item.tsx
new file mode 100644
index 00000000000000..547d8f257cdf4b
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/radio-item.tsx
@@ -0,0 +1,70 @@
+/**
+ * External dependencies
+ */
+import * as Ariakit from '@ariakit/react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef, useContext } from '@wordpress/element';
+import { Icon } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { DropdownMenuContext } from './context';
+import type { DropdownMenuRadioItemProps } from './types';
+import * as Styled from './styles';
+import { SVG, Circle } from '@wordpress/primitives';
+import { useTemporaryFocusVisibleFix } from './use-temporary-focus-visible-fix';
+
+const radioCheck = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Circle cx={ 12 } cy={ 12 } r={ 3 }></Circle>
+	</SVG>
+);
+
+export const DropdownMenuRadioItem = forwardRef<
+	HTMLDivElement,
+	WordPressComponentProps< DropdownMenuRadioItemProps, 'div', false >
+>( function DropdownMenuRadioItem(
+	{ suffix, children, onBlur, hideOnClick = false, ...props },
+	ref
+) {
+	// TODO: Remove when https://github.com/ariakit/ariakit/issues/4083 is fixed
+	const focusVisibleFixProps = useTemporaryFocusVisibleFix( { onBlur } );
+	const dropdownMenuContext = useContext( DropdownMenuContext );
+
+	return (
+		<Styled.DropdownMenuRadioItem
+			ref={ ref }
+			{ ...props }
+			{ ...focusVisibleFixProps }
+			accessibleWhenDisabled
+			hideOnClick={ hideOnClick }
+			store={ dropdownMenuContext?.store }
+		>
+			<Ariakit.MenuItemCheck
+				store={ dropdownMenuContext?.store }
+				render={ <Styled.ItemPrefixWrapper /> }
+				// Override some ariakit inline styles
+				style={ { width: 'auto', height: 'auto' } }
+			>
+				<Icon icon={ radioCheck } size={ 24 } />
+			</Ariakit.MenuItemCheck>
+
+			<Styled.DropdownMenuItemContentWrapper>
+				<Styled.DropdownMenuItemChildrenWrapper>
+					{ children }
+				</Styled.DropdownMenuItemChildrenWrapper>
+
+				{ suffix && (
+					<Styled.ItemSuffixWrapper>
+						{ suffix }
+					</Styled.ItemSuffixWrapper>
+				) }
+			</Styled.DropdownMenuItemContentWrapper>
+		</Styled.DropdownMenuRadioItem>
+	);
+} );
diff --git a/packages/components/src/dropdown-menu-v2/separator.tsx b/packages/components/src/dropdown-menu-v2/separator.tsx
new file mode 100644
index 00000000000000..bc5aff7ae26118
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/separator.tsx
@@ -0,0 +1,27 @@
+/**
+ * WordPress dependencies
+ */
+import { forwardRef, useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../context';
+import { DropdownMenuContext } from './context';
+import type { DropdownMenuSeparatorProps } from './types';
+import * as Styled from './styles';
+
+export const DropdownMenuSeparator = forwardRef<
+	HTMLHRElement,
+	WordPressComponentProps< DropdownMenuSeparatorProps, 'hr', false >
+>( function DropdownMenuSeparator( props, ref ) {
+	const dropdownMenuContext = useContext( DropdownMenuContext );
+	return (
+		<Styled.DropdownMenuSeparator
+			ref={ ref }
+			{ ...props }
+			store={ dropdownMenuContext?.store }
+			variant={ dropdownMenuContext?.variant }
+		/>
+	);
+} );
diff --git a/packages/components/src/dropdown-menu-v2/stories/index.story.tsx b/packages/components/src/dropdown-menu-v2/stories/index.story.tsx
index 9c76a6f6f0f72f..90d15ca2ea6c18 100644
--- a/packages/components/src/dropdown-menu-v2/stories/index.story.tsx
+++ b/packages/components/src/dropdown-menu-v2/stories/index.story.tsx
@@ -2,65 +2,53 @@
  * External dependencies
  */
 import type { Meta, StoryFn } from '@storybook/react';
-import styled from '@emotion/styled';
-
-/**
- * Internal dependencies
- */
-import { COLORS } from '../../utils';
-import {
-	DropdownMenu,
-	DropdownMenuItem,
-	DropdownSubMenu,
-	DropdownMenuSeparator,
-	DropdownMenuCheckboxItem,
-	DropdownMenuGroup,
-	DropdownMenuLabel,
-	DropdownMenuRadioGroup,
-	DropdownMenuRadioItem,
-	DropdownSubMenuTrigger,
-} from '..';
-import Button from '../../button';
+import { css } from '@emotion/react';
 
 /**
  * WordPress dependencies
  */
-import { useState } from '@wordpress/element';
-import { menu, wordpress } from '@wordpress/icons';
+import { customLink, formatCapitalize } from '@wordpress/icons';
+import { useState, useMemo, useContext } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
+import { useCx } from '../../utils';
+import DropdownMenuV2 from '..';
 import Icon from '../../icon';
+import Button from '../../button';
+import Modal from '../../modal';
+import { createSlotFill, Provider as SlotFillProvider } from '../../slot-fill';
 import { ContextSystemProvider } from '../../context';
 
-const meta: Meta< typeof DropdownMenu > = {
-	title: 'Components (Experimental)/DropdownMenu v2',
-	component: DropdownMenu,
+const meta: Meta< typeof DropdownMenuV2 > = {
+	title: 'Components (Experimental)/DropdownMenu V2',
+	component: DropdownMenuV2,
 	subcomponents: {
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuItem,
+		Item: DropdownMenuV2.Item,
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownSubMenu,
+		CheckboxItem: DropdownMenuV2.CheckboxItem,
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownSubMenuTrigger,
+		Group: DropdownMenuV2.Group,
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuSeparator,
+		GroupLabel: DropdownMenuV2.GroupLabel,
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuCheckboxItem,
+		Separator: DropdownMenuV2.Separator,
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuGroup,
+		Context: DropdownMenuV2.Context,
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuLabel,
+		RadioItem: DropdownMenuV2.RadioItem,
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuRadioGroup,
+		ItemLabel: DropdownMenuV2.ItemLabel,
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-		DropdownMenuRadioItem,
+		ItemHelpText: DropdownMenuV2.ItemHelpText,
 	},
 	argTypes: {
 		children: { control: { type: null } },
 		trigger: { control: { type: null } },
 	},
+	tags: [ 'status-private' ],
 	parameters: {
 		actions: { argTypesRegex: '^on.*' },
 		controls: { expanded: true },
@@ -69,153 +57,583 @@ const meta: Meta< typeof DropdownMenu > = {
 			source: { excludeDecorators: true },
 		},
 	},
-	decorators: [
-		// Layout wrapper
-		( Story ) => (
-			<div
-				style={ {
-					minHeight: '300px',
-				} }
-			>
-				<Story />
-			</div>
-		),
-	],
 };
 export default meta;
 
-const ItemHelpText = styled.span`
-	font-size: 12px;
-	color: ${ COLORS.gray[ '700' ] };
+export const Default: StoryFn< typeof DropdownMenuV2 > = ( props ) => (
+	<DropdownMenuV2 { ...props }>
+		<DropdownMenuV2.Item>
+			<DropdownMenuV2.ItemLabel>Label</DropdownMenuV2.ItemLabel>
+		</DropdownMenuV2.Item>
+		<DropdownMenuV2.Item>
+			<DropdownMenuV2.ItemLabel>Label</DropdownMenuV2.ItemLabel>
+			<DropdownMenuV2.ItemHelpText>Help text</DropdownMenuV2.ItemHelpText>
+		</DropdownMenuV2.Item>
+		<DropdownMenuV2.Item>
+			<DropdownMenuV2.ItemLabel>Label</DropdownMenuV2.ItemLabel>
+			<DropdownMenuV2.ItemHelpText>
+				The menu item help text is automatically truncated when there
+				are more than two lines of text
+			</DropdownMenuV2.ItemHelpText>
+		</DropdownMenuV2.Item>
+		<DropdownMenuV2.Item hideOnClick={ false }>
+			<DropdownMenuV2.ItemLabel>Label</DropdownMenuV2.ItemLabel>
+			<DropdownMenuV2.ItemHelpText>
+				This item doesn&apos;t close the menu on click
+			</DropdownMenuV2.ItemHelpText>
+		</DropdownMenuV2.Item>
+		<DropdownMenuV2.Item disabled>Disabled item</DropdownMenuV2.Item>
+		<DropdownMenuV2.Separator />
+		<DropdownMenuV2.Group>
+			<DropdownMenuV2.GroupLabel>Group label</DropdownMenuV2.GroupLabel>
+			<DropdownMenuV2.Item
+				prefix={ <Icon icon={ customLink } size={ 24 } /> }
+			>
+				<DropdownMenuV2.ItemLabel>With prefix</DropdownMenuV2.ItemLabel>
+			</DropdownMenuV2.Item>
+			<DropdownMenuV2.Item suffix="⌘S">With suffix</DropdownMenuV2.Item>
+			<DropdownMenuV2.Item
+				disabled
+				prefix={ <Icon icon={ formatCapitalize } size={ 24 } /> }
+				suffix="⌥⌘T"
+			>
+				<DropdownMenuV2.ItemLabel>
+					Disabled with prefix and suffix
+				</DropdownMenuV2.ItemLabel>
+				<DropdownMenuV2.ItemHelpText>
+					And help text
+				</DropdownMenuV2.ItemHelpText>
+			</DropdownMenuV2.Item>
+		</DropdownMenuV2.Group>
+	</DropdownMenuV2>
+);
+Default.args = {
+	trigger: (
+		<Button __next40pxDefaultSize variant="secondary">
+			Open menu
+		</Button>
+	),
+};
 
-	/* "> * > &" syntax is to target only immediate parent menu item */
-	[data-highlighted] > * > &,
-	[data-state='open'] > * > &,
-	[data-disabled] > * & {
-		color: inherit;
-	}
-`;
+export const WithSubmenu: StoryFn< typeof DropdownMenuV2 > = ( props ) => (
+	<DropdownMenuV2 { ...props }>
+		<DropdownMenuV2.Item>Level 1 item</DropdownMenuV2.Item>
+		<DropdownMenuV2
+			trigger={
+				<DropdownMenuV2.Item suffix="Suffix">
+					<DropdownMenuV2.ItemLabel>
+						Submenu trigger item with a long label
+					</DropdownMenuV2.ItemLabel>
+				</DropdownMenuV2.Item>
+			}
+		>
+			<DropdownMenuV2.Item>
+				<DropdownMenuV2.ItemLabel>
+					Level 2 item
+				</DropdownMenuV2.ItemLabel>
+			</DropdownMenuV2.Item>
+			<DropdownMenuV2.Item>
+				<DropdownMenuV2.ItemLabel>
+					Level 2 item
+				</DropdownMenuV2.ItemLabel>
+			</DropdownMenuV2.Item>
+			<DropdownMenuV2
+				trigger={
+					<DropdownMenuV2.Item>
+						<DropdownMenuV2.ItemLabel>
+							Submenu trigger
+						</DropdownMenuV2.ItemLabel>
+					</DropdownMenuV2.Item>
+				}
+			>
+				<DropdownMenuV2.Item>
+					<DropdownMenuV2.ItemLabel>
+						Level 3 item
+					</DropdownMenuV2.ItemLabel>
+				</DropdownMenuV2.Item>
+				<DropdownMenuV2.Item>
+					<DropdownMenuV2.ItemLabel>
+						Level 3 item
+					</DropdownMenuV2.ItemLabel>
+				</DropdownMenuV2.Item>
+			</DropdownMenuV2>
+		</DropdownMenuV2>
+	</DropdownMenuV2>
+);
+WithSubmenu.args = {
+	...Default.args,
+};
 
-const CheckboxItemsGroup = () => {
-	const [ itemOneChecked, setItemOneChecked ] = useState( true );
-	const [ itemTwoChecked, setItemTwoChecked ] = useState( false );
+export const WithCheckboxes: StoryFn< typeof DropdownMenuV2 > = ( props ) => {
+	const [ isAChecked, setAChecked ] = useState( false );
+	const [ isBChecked, setBChecked ] = useState( true );
+	const [ multipleCheckboxesValue, setMultipleCheckboxesValue ] = useState<
+		string[]
+	>( [ 'b' ] );
 
-	return (
-		<DropdownMenuGroup>
-			<DropdownMenuLabel>Checkbox group label</DropdownMenuLabel>
-			<DropdownMenuCheckboxItem
-				checked={ itemOneChecked }
-				onCheckedChange={ setItemOneChecked }
-				suffix={ <span>⌘+B</span> }
-			>
-				Checkbox item one
-			</DropdownMenuCheckboxItem>
+	const onMultipleCheckboxesCheckedChange: React.ComponentProps<
+		typeof DropdownMenuV2.CheckboxItem
+	>[ 'onChange' ] = ( e ) => {
+		setMultipleCheckboxesValue( ( prevValues ) => {
+			if ( prevValues.includes( e.target.value ) ) {
+				return prevValues.filter( ( val ) => val !== e.target.value );
+			}
+			return [ ...prevValues, e.target.value ];
+		} );
+	};
 
-			<DropdownMenuCheckboxItem
-				checked={ itemTwoChecked }
-				onCheckedChange={ setItemTwoChecked }
-			>
-				Checkbox item two
-			</DropdownMenuCheckboxItem>
-		</DropdownMenuGroup>
+	return (
+		<DropdownMenuV2 { ...props }>
+			<DropdownMenuV2.Group>
+				<DropdownMenuV2.GroupLabel>
+					Single selection, uncontrolled
+				</DropdownMenuV2.GroupLabel>
+				<DropdownMenuV2.CheckboxItem
+					name="checkbox-individual-uncontrolled-a"
+					value="a"
+					suffix="⌥⌘T"
+				>
+					<DropdownMenuV2.ItemLabel>
+						Checkbox item A
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially unchecked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.CheckboxItem>
+				<DropdownMenuV2.CheckboxItem
+					name="checkbox-individual-uncontrolled-b"
+					value="b"
+					defaultChecked
+				>
+					<DropdownMenuV2.ItemLabel>
+						Checkbox item B
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially checked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.CheckboxItem>
+			</DropdownMenuV2.Group>
+			<DropdownMenuV2.Separator />
+			<DropdownMenuV2.Group>
+				<DropdownMenuV2.GroupLabel>
+					Single selection, controlled
+				</DropdownMenuV2.GroupLabel>
+				<DropdownMenuV2.CheckboxItem
+					name="checkbox-individual-controlled-a"
+					value="a"
+					checked={ isAChecked }
+					onChange={ ( e ) => setAChecked( e.target.checked ) }
+				>
+					<DropdownMenuV2.ItemLabel>
+						Checkbox item A
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially unchecked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.CheckboxItem>
+				<DropdownMenuV2.CheckboxItem
+					name="checkbox-individual-controlled-b"
+					value="b"
+					checked={ isBChecked }
+					onChange={ ( e ) => setBChecked( e.target.checked ) }
+				>
+					<DropdownMenuV2.ItemLabel>
+						Checkbox item B
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially checked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.CheckboxItem>
+			</DropdownMenuV2.Group>
+			<DropdownMenuV2.Separator />
+			<DropdownMenuV2.Group>
+				<DropdownMenuV2.GroupLabel>
+					Multiple selection, uncontrolled
+				</DropdownMenuV2.GroupLabel>
+				<DropdownMenuV2.CheckboxItem
+					name="checkbox-multiple-uncontrolled"
+					value="a"
+				>
+					<DropdownMenuV2.ItemLabel>
+						Checkbox item A
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially unchecked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.CheckboxItem>
+				<DropdownMenuV2.CheckboxItem
+					name="checkbox-multiple-uncontrolled"
+					value="b"
+					defaultChecked
+				>
+					<DropdownMenuV2.ItemLabel>
+						Checkbox item B
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially checked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.CheckboxItem>
+			</DropdownMenuV2.Group>
+			<DropdownMenuV2.Separator />
+			<DropdownMenuV2.Group>
+				<DropdownMenuV2.GroupLabel>
+					Multiple selection, controlled
+				</DropdownMenuV2.GroupLabel>
+				<DropdownMenuV2.CheckboxItem
+					name="checkbox-multiple-controlled"
+					value="a"
+					checked={ multipleCheckboxesValue.includes( 'a' ) }
+					onChange={ onMultipleCheckboxesCheckedChange }
+				>
+					<DropdownMenuV2.ItemLabel>
+						Checkbox item A
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially unchecked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.CheckboxItem>
+				<DropdownMenuV2.CheckboxItem
+					name="checkbox-multiple-controlled"
+					value="b"
+					checked={ multipleCheckboxesValue.includes( 'b' ) }
+					onChange={ onMultipleCheckboxesCheckedChange }
+				>
+					<DropdownMenuV2.ItemLabel>
+						Checkbox item B
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially checked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.CheckboxItem>
+			</DropdownMenuV2.Group>
+		</DropdownMenuV2>
 	);
 };
+WithCheckboxes.args = {
+	...Default.args,
+};
 
-const RadioItemsGroup = () => {
-	const [ radioValue, setRadioValue ] = useState( 'radio-one' );
+export const WithRadios: StoryFn< typeof DropdownMenuV2 > = ( props ) => {
+	const [ radioValue, setRadioValue ] = useState( 'two' );
+	const onRadioChange: React.ComponentProps<
+		typeof DropdownMenuV2.RadioItem
+	>[ 'onChange' ] = ( e ) => setRadioValue( e.target.value );
 
 	return (
-		<DropdownMenuRadioGroup
-			value={ radioValue }
-			onValueChange={ setRadioValue }
-		>
-			<DropdownMenuLabel>Radio group label</DropdownMenuLabel>
-			<DropdownMenuRadioItem value="radio-one">
-				Radio item one
-			</DropdownMenuRadioItem>
-			<DropdownMenuRadioItem value="radio-two">
-				Radio item two
-			</DropdownMenuRadioItem>
-		</DropdownMenuRadioGroup>
+		<DropdownMenuV2 { ...props }>
+			<DropdownMenuV2.Group>
+				<DropdownMenuV2.GroupLabel>
+					Uncontrolled
+				</DropdownMenuV2.GroupLabel>
+				<DropdownMenuV2.RadioItem name="radio-uncontrolled" value="one">
+					<DropdownMenuV2.ItemLabel>
+						Radio item 1
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially unchecked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.RadioItem>
+				<DropdownMenuV2.RadioItem
+					name="radio-uncontrolled"
+					value="two"
+					defaultChecked
+				>
+					<DropdownMenuV2.ItemLabel>
+						Radio item 2
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially checked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.RadioItem>
+			</DropdownMenuV2.Group>
+			<DropdownMenuV2.Separator />
+			<DropdownMenuV2.Group>
+				<DropdownMenuV2.GroupLabel>
+					Controlled
+				</DropdownMenuV2.GroupLabel>
+				<DropdownMenuV2.RadioItem
+					name="radio-controlled"
+					value="one"
+					checked={ radioValue === 'one' }
+					onChange={ onRadioChange }
+				>
+					<DropdownMenuV2.ItemLabel>
+						Radio item 1
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially unchecked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.RadioItem>
+				<DropdownMenuV2.RadioItem
+					name="radio-controlled"
+					value="two"
+					checked={ radioValue === 'two' }
+					onChange={ onRadioChange }
+				>
+					<DropdownMenuV2.ItemLabel>
+						Radio item 2
+					</DropdownMenuV2.ItemLabel>
+					<DropdownMenuV2.ItemHelpText>
+						Initially checked
+					</DropdownMenuV2.ItemHelpText>
+				</DropdownMenuV2.RadioItem>
+			</DropdownMenuV2.Group>
+		</DropdownMenuV2>
 	);
 };
+WithRadios.args = {
+	...Default.args,
+};
 
-const Template: StoryFn< typeof DropdownMenu > = ( props ) => (
-	<DropdownMenu { ...props } />
-);
-export const Default = Template.bind( {} );
-Default.args = {
-	trigger: <Button __next40pxDefaultSize label="Open menu" icon={ menu } />,
-	sideOffset: 12,
-	children: (
+const modalOnTopOfDropdown = css`
+	&& {
+		z-index: 1000000;
+	}
+`;
+
+// For more examples with `Modal`, check https://ariakit.org/examples/menu-wordpress-modal
+export const WithModals: StoryFn< typeof DropdownMenuV2 > = ( props ) => {
+	const [ isOuterModalOpen, setOuterModalOpen ] = useState( false );
+	const [ isInnerModalOpen, setInnerModalOpen ] = useState( false );
+
+	const cx = useCx();
+	const modalOverlayClassName = cx( modalOnTopOfDropdown );
+
+	return (
 		<>
-			<DropdownMenuGroup>
-				<DropdownMenuItem>Menu item</DropdownMenuItem>
-				<DropdownMenuItem
-					prefix={ <Icon icon={ wordpress } size={ 24 } /> }
+			<DropdownMenuV2 { ...props }>
+				<DropdownMenuV2.Item
+					onClick={ () => setOuterModalOpen( true ) }
+					hideOnClick={ false }
 				>
-					Menu item with prefix
-				</DropdownMenuItem>
-				<DropdownMenuItem suffix={ <span>⌥⌘T</span> }>
-					Menu item with suffix
-				</DropdownMenuItem>
-				<DropdownMenuItem disabled>Disabled menu item</DropdownMenuItem>
-				<DropdownSubMenu
-					trigger={
-						<DropdownSubMenuTrigger>Submenu</DropdownSubMenuTrigger>
-					}
+					<DropdownMenuV2.ItemLabel>
+						Open outer modal
+					</DropdownMenuV2.ItemLabel>
+				</DropdownMenuV2.Item>
+				<DropdownMenuV2.Item
+					onClick={ () => setInnerModalOpen( true ) }
+					hideOnClick={ false }
 				>
-					<DropdownMenuItem suffix={ <span>⌘+S</span> }>
-						Submenu item with suffix
-					</DropdownMenuItem>
-					<DropdownMenuItem>
-						<div
-							style={ {
-								display: 'inline-flex',
-								flexDirection: 'column',
-							} }
-						>
-							Submenu item
-							<ItemHelpText>
-								With additional custom text
-							</ItemHelpText>
-						</div>
-					</DropdownMenuItem>
-					<DropdownMenuSeparator />
-					<DropdownSubMenu
-						trigger={
-							<DropdownSubMenuTrigger>
-								Second level submenu
-							</DropdownSubMenuTrigger>
-						}
+					<DropdownMenuV2.ItemLabel>
+						Open inner modal
+					</DropdownMenuV2.ItemLabel>
+				</DropdownMenuV2.Item>
+				{ isInnerModalOpen && (
+					<Modal
+						onRequestClose={ () => setInnerModalOpen( false ) }
+						overlayClassName={ modalOverlayClassName }
 					>
-						<DropdownMenuItem>Submenu item</DropdownMenuItem>
-						<DropdownMenuItem>Submenu item</DropdownMenuItem>
-					</DropdownSubMenu>
-				</DropdownSubMenu>
-			</DropdownMenuGroup>
+						Modal&apos;s contents
+						<button onClick={ () => setInnerModalOpen( false ) }>
+							Close
+						</button>
+					</Modal>
+				) }
+			</DropdownMenuV2>
+			{ isOuterModalOpen && (
+				<Modal
+					onRequestClose={ () => setOuterModalOpen( false ) }
+					overlayClassName={ modalOverlayClassName }
+				>
+					Modal&apos;s contents
+					<button onClick={ () => setOuterModalOpen( false ) }>
+						Close
+					</button>
+				</Modal>
+			) }
+		</>
+	);
+};
+WithModals.args = {
+	...Default.args,
+};
 
-			<DropdownMenuSeparator />
+const ExampleSlotFill = createSlotFill( 'Example' );
 
-			<CheckboxItemsGroup />
+const Slot = () => {
+	const dropdownMenuContext = useContext( DropdownMenuV2.Context );
 
-			<DropdownMenuSeparator />
+	// Forwarding the content of the slot so that it can be used by the fill
+	const fillProps = useMemo(
+		() => ( {
+			forwardedContext: [
+				[
+					DropdownMenuV2.Context.Provider,
+					{ value: dropdownMenuContext },
+				],
+			],
+		} ),
+		[ dropdownMenuContext ]
+	);
 
-			<RadioItemsGroup />
-		</>
-	),
+	return (
+		<ExampleSlotFill.Slot
+			fillProps={ fillProps }
+			bubblesVirtually
+			style={ { display: 'contents' } }
+		/>
+	);
+};
+
+type ForwardedContextTuple< P = {} > = [
+	React.ComponentType< React.PropsWithChildren< P > >,
+	P,
+];
+
+const Fill = ( { children }: { children: React.ReactNode } ) => {
+	const innerMarkup = <>{ children }</>;
+
+	return (
+		<ExampleSlotFill.Fill>
+			{ ( fillProps: { forwardedContext?: ForwardedContextTuple[] } ) => {
+				const { forwardedContext = [] } = fillProps;
+
+				return forwardedContext.reduce(
+					( inner: JSX.Element, [ Provider, props ] ) => (
+						<Provider { ...props }>{ inner }</Provider>
+					),
+					innerMarkup
+				);
+			} }
+		</ExampleSlotFill.Fill>
+	);
+};
+
+export const WithSlotFill: StoryFn< typeof DropdownMenuV2 > = ( props ) => {
+	return (
+		<SlotFillProvider>
+			<DropdownMenuV2 { ...props }>
+				<DropdownMenuV2.Item>
+					<DropdownMenuV2.ItemLabel>Item</DropdownMenuV2.ItemLabel>
+				</DropdownMenuV2.Item>
+				<Slot />
+			</DropdownMenuV2>
+
+			<Fill>
+				<DropdownMenuV2.Item>
+					<DropdownMenuV2.ItemLabel>
+						Item from fill
+					</DropdownMenuV2.ItemLabel>
+				</DropdownMenuV2.Item>
+				<DropdownMenuV2
+					trigger={
+						<DropdownMenuV2.Item>
+							<DropdownMenuV2.ItemLabel>
+								Submenu from fill
+							</DropdownMenuV2.ItemLabel>
+						</DropdownMenuV2.Item>
+					}
+				>
+					<DropdownMenuV2.Item>
+						<DropdownMenuV2.ItemLabel>
+							Submenu item from fill
+						</DropdownMenuV2.ItemLabel>
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
+			</Fill>
+		</SlotFillProvider>
+	);
+};
+WithSlotFill.args = {
+	...Default.args,
 };
 
 const toolbarVariantContextValue = {
-	DropdownMenu: {
+	DropdownMenuV2: {
 		variant: 'toolbar',
 	},
 };
-export const ToolbarVariant: StoryFn< typeof DropdownMenu > = ( props ) => (
+export const ToolbarVariant: StoryFn< typeof DropdownMenuV2 > = ( props ) => (
+	// TODO: add toolbar
 	<ContextSystemProvider value={ toolbarVariantContextValue }>
-		<DropdownMenu { ...props } />
+		<DropdownMenuV2 { ...props }>
+			<DropdownMenuV2.Item>
+				<DropdownMenuV2.ItemLabel>
+					Level 1 item
+				</DropdownMenuV2.ItemLabel>
+			</DropdownMenuV2.Item>
+			<DropdownMenuV2.Item>
+				<DropdownMenuV2.ItemLabel>
+					Level 1 item
+				</DropdownMenuV2.ItemLabel>
+			</DropdownMenuV2.Item>
+			<DropdownMenuV2.Separator />
+			<DropdownMenuV2
+				trigger={
+					<DropdownMenuV2.Item>
+						<DropdownMenuV2.ItemLabel>
+							Submenu trigger
+						</DropdownMenuV2.ItemLabel>
+					</DropdownMenuV2.Item>
+				}
+			>
+				<DropdownMenuV2.Item>
+					<DropdownMenuV2.ItemLabel>
+						Level 2 item
+					</DropdownMenuV2.ItemLabel>
+				</DropdownMenuV2.Item>
+			</DropdownMenuV2>
+		</DropdownMenuV2>
 	</ContextSystemProvider>
 );
 ToolbarVariant.args = {
 	...Default.args,
 };
+
+export const InsideModal: StoryFn< typeof DropdownMenuV2 > = ( props ) => {
+	const [ isModalOpen, setModalOpen ] = useState( false );
+	return (
+		<>
+			<Button
+				onClick={ () => setModalOpen( true ) }
+				__next40pxDefaultSize
+				variant="secondary"
+			>
+				Open modal
+			</Button>
+			{ isModalOpen && (
+				<Modal onRequestClose={ () => setModalOpen( false ) }>
+					<DropdownMenuV2 { ...props }>
+						<DropdownMenuV2.Item>
+							<DropdownMenuV2.ItemLabel>
+								Level 1 item
+							</DropdownMenuV2.ItemLabel>
+						</DropdownMenuV2.Item>
+						<DropdownMenuV2.Item>
+							<DropdownMenuV2.ItemLabel>
+								Level 1 item
+							</DropdownMenuV2.ItemLabel>
+						</DropdownMenuV2.Item>
+						<DropdownMenuV2.Separator />
+						<DropdownMenuV2
+							trigger={
+								<DropdownMenuV2.Item>
+									<DropdownMenuV2.ItemLabel>
+										Submenu trigger
+									</DropdownMenuV2.ItemLabel>
+								</DropdownMenuV2.Item>
+							}
+						>
+							<DropdownMenuV2.Item>
+								<DropdownMenuV2.ItemLabel>
+									Level 2 item
+								</DropdownMenuV2.ItemLabel>
+							</DropdownMenuV2.Item>
+						</DropdownMenuV2>
+					</DropdownMenuV2>
+					<Button onClick={ () => setModalOpen( false ) }>
+						Close modal
+					</Button>
+				</Modal>
+			) }
+		</>
+	);
+};
+InsideModal.args = {
+	...Default.args,
+};
+InsideModal.parameters = {
+	docs: {
+		source: { type: 'code' },
+	},
+};
diff --git a/packages/components/src/dropdown-menu-v2/styles.ts b/packages/components/src/dropdown-menu-v2/styles.ts
index cdeeed077b5f3a..b25613e9feb52b 100644
--- a/packages/components/src/dropdown-menu-v2/styles.ts
+++ b/packages/components/src/dropdown-menu-v2/styles.ts
@@ -1,9 +1,9 @@
 /**
  * External dependencies
  */
+import * as Ariakit from '@ariakit/react';
+import { css } from '@emotion/react';
 import styled from '@emotion/styled';
-import { css, keyframes } from '@emotion/react';
-import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
 
 /**
  * Internal dependencies
@@ -11,268 +11,381 @@ import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
 import { COLORS, font, rtl, CONFIG } from '../utils';
 import { space } from '../utils/space';
 import Icon from '../icon';
-import type { DropdownMenuInternalContext } from './types';
+import { Truncate } from '../truncate';
+import type { DropdownMenuContext } from './types';
 
 const ANIMATION_PARAMS = {
-	SLIDE_AMOUNT: '2px',
-	DURATION: '400ms',
-	EASING: 'cubic-bezier( 0.16, 1, 0.3, 1 )',
+	SCALE_AMOUNT_OUTER: 0.82,
+	SCALE_AMOUNT_CONTENT: 0.9,
+	DURATION: {
+		IN: '400ms',
+		OUT: '200ms',
+	},
+	EASING: 'cubic-bezier(0.33, 0, 0, 1)',
 };
 
-const CONTENT_WRAPPER_PADDING = space( 2 );
-const ITEM_PREFIX_WIDTH = space( 7 );
-const ITEM_PADDING_INLINE_START = space( 2 );
-const ITEM_PADDING_INLINE_END = space( 2.5 );
-
-// TODO: should bring this into the config, and make themeable
-const DEFAULT_BORDER_COLOR = COLORS.ui.borderDisabled;
-const TOOLBAR_VARIANT_BORDER_COLOR = COLORS.gray[ '900' ];
-const DEFAULT_BOX_SHADOW = `0 0 0 ${ CONFIG.borderWidth } ${ DEFAULT_BORDER_COLOR }, ${ CONFIG.popoverShadow }`;
+const CONTENT_WRAPPER_PADDING = space( 1 );
+const ITEM_PADDING_BLOCK = space( 2 );
+const ITEM_PADDING_INLINE = space( 3 );
+
+// TODO:
+// - border color and divider color are different from COLORS.theme variables
+// - lighter text color is not defined in COLORS.theme, should it be?
+// - lighter background color is not defined in COLORS.theme, should it be?
+const DEFAULT_BORDER_COLOR = COLORS.theme.gray[ 300 ];
+const DIVIDER_COLOR = COLORS.theme.gray[ 200 ];
+const LIGHTER_TEXT_COLOR = COLORS.theme.gray[ 700 ];
+const LIGHT_BACKGROUND_COLOR = COLORS.theme.gray[ 100 ];
+const TOOLBAR_VARIANT_BORDER_COLOR = COLORS.theme.foreground;
+const DEFAULT_BOX_SHADOW = `0 0 0 ${ CONFIG.borderWidth } ${ DEFAULT_BORDER_COLOR }, ${ CONFIG.elevationMedium }`;
 const TOOLBAR_VARIANT_BOX_SHADOW = `0 0 0 ${ CONFIG.borderWidth } ${ TOOLBAR_VARIANT_BORDER_COLOR }`;
 
-const slideUpAndFade = keyframes( {
-	'0%': {
-		opacity: 0,
-		transform: `translateY(${ ANIMATION_PARAMS.SLIDE_AMOUNT })`,
-	},
-	'100%': { opacity: 1, transform: 'translateY(0)' },
-} );
-
-const slideRightAndFade = keyframes( {
-	'0%': {
-		opacity: 0,
-		transform: `translateX(-${ ANIMATION_PARAMS.SLIDE_AMOUNT })`,
-	},
-	'100%': { opacity: 1, transform: 'translateX(0)' },
-} );
-
-const slideDownAndFade = keyframes( {
-	'0%': {
-		opacity: 0,
-		transform: `translateY(-${ ANIMATION_PARAMS.SLIDE_AMOUNT })`,
-	},
-	'100%': { opacity: 1, transform: 'translateY(0)' },
-} );
+const GRID_TEMPLATE_COLS = 'minmax( 0, max-content ) 1fr';
 
-const slideLeftAndFade = keyframes( {
-	'0%': {
-		opacity: 0,
-		transform: `translateX(${ ANIMATION_PARAMS.SLIDE_AMOUNT })`,
-	},
-	'100%': { opacity: 1, transform: 'translateX(0)' },
-} );
+export const MenuPopoverOuterWrapper = styled.div<
+	Pick< DropdownMenuContext, 'variant' >
+>`
+	position: relative;
 
-const baseContent = (
-	variant: DropdownMenuInternalContext[ 'variant' ]
-) => css`
-	min-width: 220px;
 	background-color: ${ COLORS.ui.background };
-	border-radius: ${ CONFIG.radiusBlockUi };
-	padding: ${ CONTENT_WRAPPER_PADDING };
-	box-shadow: ${ variant === 'toolbar'
-		? TOOLBAR_VARIANT_BOX_SHADOW
-		: DEFAULT_BOX_SHADOW };
-	animation-duration: ${ ANIMATION_PARAMS.DURATION };
-	animation-timing-function: ${ ANIMATION_PARAMS.EASING };
-	will-change: transform, opacity;
-
-	&[data-side='top'] {
-		animation-name: ${ slideDownAndFade };
-	}
+	border-radius: ${ CONFIG.radiusMedium };
+	${ ( props ) => css`
+		box-shadow: ${ props.variant === 'toolbar'
+			? TOOLBAR_VARIANT_BOX_SHADOW
+			: DEFAULT_BOX_SHADOW };
+	` }
+
+	overflow: hidden;
+
+	/* Open/close animation (outer wrapper) */
+	@media not ( prefers-reduced-motion ) {
+		transition-property: transform, opacity;
+		transition-timing-function: ${ ANIMATION_PARAMS.EASING };
+		transition-duration: ${ ANIMATION_PARAMS.DURATION.IN };
+		will-change: transform, opacity;
+
+		/* Regardless of the side, fade in and out. */
+		opacity: 0;
+		&:has( [data-enter] ) {
+			opacity: 1;
+		}
 
-	&[data-side='right'] {
-		animation-name: ${ slideLeftAndFade };
-	}
+		&:has( [data-leave] ) {
+			transition-duration: ${ ANIMATION_PARAMS.DURATION.OUT };
+		}
 
-	&[data-side='bottom'] {
-		animation-name: ${ slideUpAndFade };
+		/* For menus opening on top and bottom side, animate the scale Y too. */
+		&:has( [data-side='bottom'] ),
+		&:has( [data-side='top'] ) {
+			transform: scaleY( ${ ANIMATION_PARAMS.SCALE_AMOUNT_OUTER } );
+		}
+		&:has( [data-side='bottom'] ) {
+			transform-origin: top;
+		}
+		&:has( [data-side='top'] ) {
+			transform-origin: bottom;
+		}
+		&:has( [data-enter][data-side='bottom'] ),
+		&:has( [data-enter][data-side='top'] ),
+		/* Do not animate the scaleY when closing the menu */
+		&:has( [data-leave][data-side='bottom'] ),
+		&:has( [data-leave][data-side='top'] ) {
+			transform: scaleY( 1 );
+		}
 	}
+`;
 
-	&[data-side='left'] {
-		animation-name: ${ slideRightAndFade };
-	}
+export const MenuPopoverInnerWrapper = styled.div`
+	position: relative;
+	/* Same as popover component */
+	/* TODO: is there a way to read the sass variable? */
+	z-index: 1000000;
 
-	@media ( prefers-reduced-motion ) {
-		animation-duration: 0s;
-	}
-`;
+	display: grid;
+	grid-template-columns: ${ GRID_TEMPLATE_COLS };
+	grid-template-rows: auto;
 
-const itemPrefix = css`
-	width: ${ ITEM_PREFIX_WIDTH };
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	/* Prefixes don't get affected by the item's inline start padding */
-	margin-inline-start: calc( -1 * ${ ITEM_PADDING_INLINE_START } );
-	/*
-		Negative margin allows the suffix to be as tall as the whole item
-		(incl. padding) before increasing the items' height. This can be useful,
-		e.g., when using icons that are bigger than 20x20 px
-	*/
-	margin-top: ${ space( -2 ) };
-	margin-bottom: ${ space( -2 ) };
-`;
+	box-sizing: border-box;
+	min-width: 160px;
+	max-width: 320px;
+	max-height: var( --popover-available-height );
 
-const itemSuffix = css`
-	width: max-content;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	/* Push prefix to the inline-end of the item */
-	margin-inline-start: auto;
-	/* Minimum space between the item's content and suffix */
-	padding-inline-start: ${ space( 6 ) };
-	/*
-		Negative margin allows the suffix to be as tall as the whole item
-		(incl. padding) before increasing the items' height. This can be useful,
-		e.g., when using icons that are bigger than 20x20 px
-	*/
-	margin-top: ${ space( -2 ) };
-	margin-bottom: ${ space( -2 ) };
+	padding: ${ CONTENT_WRAPPER_PADDING };
 
-	/*
-		Override color in normal conditions, but inherit the item's color
-	  for altered conditions.
-
-		TODO:
-		  - For now, used opacity like for disabled item, which makes it work
-			  regardless of the theme
-		  - how do we translate this for themes? Should we have a new variable
-		for "secondary" text?
-	*/
-	opacity: 0.6;
+	overscroll-behavior: contain;
+	overflow: auto;
 
-	[data-highlighted] > &,
-	[data-state='open'] > &,
-	[data-disabled] > & {
-		opacity: 1;
-	}
-`;
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent !important;
 
-export const ItemPrefixWrapper = styled.span`
-	${ itemPrefix }
-`;
+	/* Open/close animation (inner content wrapper) */
+	@media not ( prefers-reduced-motion ) {
+		transition: inherit;
+		transform-origin: inherit;
 
-export const ItemSuffixWrapper = styled.span`
-	${ itemSuffix }
+		/*
+		 * For menus opening on top and bottom side, animate the scale Y too.
+		 * The content scales at a different rate than the outer container:
+		 * - first, counter the outer scale factor by doing "1 / scaleAmountOuter"
+		 * - then, apply the content scale factor.
+		 */
+		&[data-side='bottom'],
+		&[data-side='top'] {
+			transform: scaleY(
+				calc(
+					1 / ${ ANIMATION_PARAMS.SCALE_AMOUNT_OUTER } *
+						${ ANIMATION_PARAMS.SCALE_AMOUNT_CONTENT }
+				)
+			);
+		}
+		&[data-enter][data-side='bottom'],
+		&[data-enter][data-side='top'],
+		/* Do not animate the scaleY when closing the menu */
+		&[data-leave][data-side='bottom'],
+		&[data-leave][data-side='top'] {
+			transform: scaleY( 1 );
+		}
+	}
 `;
 
 const baseItem = css`
 	all: unset;
+
+	position: relative;
+	min-height: ${ space( 10 ) };
+	box-sizing: border-box;
+
+	/* Occupy the width of all grid columns (ie. full width) */
+	grid-column: 1 / -1;
+
+	display: grid;
+	grid-template-columns: ${ GRID_TEMPLATE_COLS };
+	align-items: center;
+
+	@supports ( grid-template-columns: subgrid ) {
+		/*
+		 * Define a grid layout which inherits the same columns configuration
+		 * from the parent layout (ie. subgrid). This allows the menu
+		 * to synchronize the indentation of all its items.
+		 */
+		grid-template-columns: subgrid;
+	}
+
 	font-size: ${ font( 'default.fontSize' ) };
 	font-family: inherit;
 	font-weight: normal;
 	line-height: 20px;
-	color: ${ COLORS.gray[ 900 ] };
-	border-radius: ${ CONFIG.radiusBlockUi };
-	display: flex;
-	align-items: center;
-	padding: ${ space( 2 ) } ${ ITEM_PADDING_INLINE_END } ${ space( 2 ) }
-		${ ITEM_PADDING_INLINE_START };
-	position: relative;
+
+	color: ${ COLORS.theme.foreground };
+	border-radius: ${ CONFIG.radiusSmall };
+
+	padding-block: ${ ITEM_PADDING_BLOCK };
+	padding-inline: ${ ITEM_PADDING_INLINE };
+
+	/*
+	 * Make sure that, when an item is scrolled into view (eg. while using the
+	 * keyboard to move focus), the whole item comes into view
+	 */
+	scroll-margin: ${ CONTENT_WRAPPER_PADDING };
+
 	user-select: none;
 	outline: none;
 
-	&[data-disabled] {
-		/*
-			TODO:
-			  - we need a disabled color in the Theme variables
-			  - design specs use opacity instead of setting a new text color
-		*/
-		opacity: 0.5;
-		pointer-events: none;
+	&[aria-disabled='true'] {
+		color: ${ COLORS.ui.textDisabled };
+		cursor: not-allowed;
+	}
+
+	/* Active item (including hover) */
+	&[data-active-item]:not( [data-focus-visible] ):not(
+			[aria-disabled='true']
+		) {
+		background-color: ${ COLORS.theme.accent };
+		color: ${ COLORS.white };
 	}
 
-	/* Hover and Focus styles */
-	&[data-highlighted] {
-		/* TODO: reconcile with global focus styles */
-		background-color: ${ COLORS.gray[ '100' ] };
+	/* Keyboard focus (focus-visible) */
+	&[data-focus-visible] {
+		box-shadow: 0 0 0 1.5px ${ COLORS.theme.accent };
 
 		/* Only visible in Windows High Contrast mode */
 		outline: 2px solid transparent;
 	}
 
-	svg {
-		fill: currentColor;
+	/* Active (ie. pressed, mouse down) */
+	&:active,
+	&[data-active] {
+		/* TODO: should there be a visual active state? */
+	}
+
+	/* When the item is the trigger of an open submenu */
+	${ MenuPopoverInnerWrapper }:not(:focus) &:not(:focus)[aria-expanded="true"] {
+		background-color: ${ LIGHT_BACKGROUND_COLOR };
+		color: ${ COLORS.theme.foreground };
 	}
 
-	&:not( :has( ${ ItemPrefixWrapper } ) ) {
-		padding-inline-start: ${ ITEM_PREFIX_WIDTH };
+	svg {
+		fill: currentColor;
 	}
 `;
 
-export const Content = styled( DropdownMenu.Content )<
-	Pick< DropdownMenuInternalContext, 'variant' >
->`
-	${ ( props ) => baseContent( props.variant ) }
+export const DropdownMenuItem = styled( Ariakit.MenuItem )`
+	${ baseItem };
 `;
-export const SubContent = styled( DropdownMenu.SubContent )<
-	Pick< DropdownMenuInternalContext, 'variant' >
->`
-	${ ( props ) => baseContent( props.variant ) }
+
+export const DropdownMenuCheckboxItem = styled( Ariakit.MenuItemCheckbox )`
+	${ baseItem };
 `;
 
-export const Item = styled( DropdownMenu.Item )`
-	${ baseItem }
+export const DropdownMenuRadioItem = styled( Ariakit.MenuItemRadio )`
+	${ baseItem };
 `;
-export const CheckboxItem = styled( DropdownMenu.CheckboxItem )`
-	${ baseItem }
+
+export const ItemPrefixWrapper = styled.span`
+	/* Always occupy the first column, even when auto-collapsing */
+	grid-column: 1;
+
+	/*
+	 * Even when the item is not checked, occupy the same screen space to avoid
+	 * the space collapside when no items are checked.
+	 */
+	${ DropdownMenuCheckboxItem } > &,
+	${ DropdownMenuRadioItem } > & {
+		/* Same width as the check icons */
+		min-width: ${ space( 6 ) };
+	}
+
+	${ DropdownMenuCheckboxItem } > &,
+	${ DropdownMenuRadioItem } > &,
+	&:not( :empty ) {
+		margin-inline-end: ${ space( 2 ) };
+	}
+
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	color: ${ LIGHTER_TEXT_COLOR };
+
+	/*
+	* When the parent menu item is active, except when it's a non-focused/hovered
+	* submenu trigger (in that case, color should not be inherited)
+	*/
+	[data-active-item]:not( [data-focus-visible] ) > &,
+	/* When the parent menu item is disabled */
+	[aria-disabled='true'] > & {
+		color: inherit;
+	}
 `;
-export const RadioItem = styled( DropdownMenu.RadioItem )`
-	${ baseItem }
+
+export const DropdownMenuItemContentWrapper = styled.div`
+	/*
+	 * Always occupy the second column, since the first column
+	 * is taken by the prefix wrapper (when displayed).
+	 */
+	grid-column: 2;
+
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: ${ space( 3 ) };
+
+	pointer-events: none;
 `;
-export const SubTrigger = styled( DropdownMenu.SubTrigger )`
-	${ baseItem }
 
-	&[data-state='open'] {
-		background-color: ${ COLORS.gray[ '100' ] };
-	}
+export const DropdownMenuItemChildrenWrapper = styled.div`
+	flex: 1;
+
+	display: inline-flex;
+	flex-direction: column;
+	gap: ${ space( 1 ) };
 `;
 
-export const Label = styled( DropdownMenu.Label )`
-	box-sizing: border-box;
+export const ItemSuffixWrapper = styled.span`
+	flex: 0 1 fit-content;
+	min-width: 0;
+	width: fit-content;
+
 	display: flex;
 	align-items: center;
-	min-height: ${ space( 8 ) };
-
-	padding: ${ space( 2 ) } ${ ITEM_PADDING_INLINE_END } ${ space( 2 ) }
-		${ ITEM_PREFIX_WIDTH };
-	/* TODO: color doesn't match available UI variables */
-	color: ${ COLORS.gray[ 700 ] };
-
-	/* TODO: font size doesn't match available ones via "font" utils */
-	font-size: 11px;
-	line-height: 1.4;
-	font-weight: 500;
-	text-transform: uppercase;
+	justify-content: center;
+	gap: ${ space( 3 ) };
+
+	color: ${ LIGHTER_TEXT_COLOR };
+
+	/*
+	 * When the parent menu item is active, except when it's a non-focused/hovered
+	 * submenu trigger (in that case, color should not be inherited)
+	 */
+	[data-active-item]:not( [data-focus-visible] ) *:not(${ MenuPopoverInnerWrapper }) &,
+	/* When the parent menu item is disabled */
+	[aria-disabled='true'] *:not(${ MenuPopoverInnerWrapper }) & {
+		color: inherit;
+	}
+`;
+
+export const DropdownMenuGroup = styled( Ariakit.MenuGroup )`
+	/* Ignore this element when calculating the layout. Useful for subgrid */
+	display: contents;
+`;
+
+export const DropdownMenuGroupLabel = styled( Ariakit.MenuGroupLabel )`
+	/* Occupy the width of all grid columns (ie. full width) */
+	grid-column: 1 / -1;
+
+	padding-block-start: ${ space( 3 ) };
+	padding-block-end: ${ space( 2 ) };
+	padding-inline: ${ ITEM_PADDING_INLINE };
 `;
 
-export const Separator = styled( DropdownMenu.Separator )<
-	Pick< DropdownMenuInternalContext, 'variant' >
+export const DropdownMenuSeparator = styled( Ariakit.MenuSeparator )<
+	Pick< DropdownMenuContext, 'variant' >
 >`
+	/* Occupy the width of all grid columns (ie. full width) */
+	grid-column: 1 / -1;
+
+	border: none;
 	height: ${ CONFIG.borderWidth };
-	/* TODO: doesn't match border color from variables */
 	background-color: ${ ( props ) =>
 		props.variant === 'toolbar'
 			? TOOLBAR_VARIANT_BORDER_COLOR
-			: DEFAULT_BORDER_COLOR };
-	/* Negative horizontal margin to make separator go from side to side */
-	margin: ${ space( 2 ) } calc( -1 * ${ CONTENT_WRAPPER_PADDING } );
-`;
+			: DIVIDER_COLOR };
+	/* Align with menu items' content */
+	margin-block: ${ space( 2 ) };
+	margin-inline: ${ ITEM_PADDING_INLINE };
 
-export const ItemIndicator = styled( DropdownMenu.ItemIndicator )`
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
 `;
 
-export const SubmenuRtlChevronIcon = styled( Icon )`
+export const SubmenuChevronIcon = styled( Icon )`
+	width: ${ space( 1.5 ) };
 	${ rtl(
 		{
-			transform: `scaleX(1) translateX(${ space( 2 ) })`,
+			transform: `scaleX(1)`,
 		},
 		{
-			transform: `scaleX(-1) translateX(${ space( 2 ) })`,
+			transform: `scaleX(-1)`,
 		}
-	) }
+	) };
+`;
+
+export const DropdownMenuItemLabel = styled( Truncate )`
+	font-size: ${ font( 'default.fontSize' ) };
+	line-height: 20px;
+	color: inherit;
+`;
+
+export const DropdownMenuItemHelpText = styled( Truncate )`
+	font-size: ${ font( 'helpText.fontSize' ) };
+	line-height: 16px;
+	color: ${ LIGHTER_TEXT_COLOR };
+	word-break: break-all;
+
+	[data-active-item]:not( [data-focus-visible] )
+		*:not( ${ MenuPopoverInnerWrapper } )
+		&,
+	[aria-disabled='true'] *:not( ${ MenuPopoverInnerWrapper } ) & {
+		color: inherit;
+	}
 `;
diff --git a/packages/components/src/dropdown-menu-v2/test/index.tsx b/packages/components/src/dropdown-menu-v2/test/index.tsx
index 3138c74557ae1a..cb674f27edaacf 100644
--- a/packages/components/src/dropdown-menu-v2/test/index.tsx
+++ b/packages/components/src/dropdown-menu-v2/test/index.tsx
@@ -2,10 +2,7 @@
  * External dependencies
  */
 import { render, screen, waitFor } from '@testing-library/react';
-import {
-	default as userEvent,
-	PointerEventsCheckLevel,
-} from '@testing-library/user-event';
+import { press, click, hover, type } from '@ariakit/test';
 
 /**
  * WordPress dependencies
@@ -15,17 +12,7 @@ import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import {
-	DropdownMenu,
-	DropdownMenuCheckboxItem,
-	DropdownMenuItem,
-	DropdownMenuLabel,
-	DropdownMenuRadioGroup,
-	DropdownMenuRadioItem,
-	DropdownMenuSeparator,
-	DropdownSubMenu,
-	DropdownSubMenuTrigger,
-} from '..';
+import { DropdownMenuV2 } from '..';
 
 const delay = ( delayInMs: number ) => {
 	return new Promise( ( resolve ) => setTimeout( resolve, delayInMs ) );
@@ -34,24 +21,25 @@ const delay = ( delayInMs: number ) => {
 describe( 'DropdownMenu', () => {
 	// See https://www.w3.org/WAI/ARIA/apg/patterns/menu-button/
 	it( 'should follow the WAI-ARIA spec', async () => {
-		// Radio and Checkbox items'
-		const user = userEvent.setup();
-
 		render(
-			<DropdownMenu trigger={ <button>Open dropdown</button> }>
-				<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				<DropdownMenuSeparator />
-				<DropdownSubMenu
+			<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+				<DropdownMenuV2.Item>Dropdown menu item</DropdownMenuV2.Item>
+				<DropdownMenuV2.Separator />
+				<DropdownMenuV2
 					trigger={
-						<DropdownSubMenuTrigger>
+						<DropdownMenuV2.Item>
 							Dropdown submenu
-						</DropdownSubMenuTrigger>
+						</DropdownMenuV2.Item>
 					}
 				>
-					<DropdownMenuItem>Dropdown submenu item 1</DropdownMenuItem>
-					<DropdownMenuItem>Dropdown submenu item 2</DropdownMenuItem>
-				</DropdownSubMenu>
-			</DropdownMenu>
+					<DropdownMenuV2.Item>
+						Dropdown submenu item 1
+					</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item>
+						Dropdown submenu item 2
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
+			</DropdownMenuV2>
 		);
 
 		const toggleButton = screen.getByRole( 'button', {
@@ -61,11 +49,18 @@ describe( 'DropdownMenu', () => {
 		expect( toggleButton ).toHaveAttribute( 'aria-haspopup', 'menu' );
 		expect( toggleButton ).toHaveAttribute( 'aria-expanded', 'false' );
 
-		await user.click( toggleButton );
+		await click( toggleButton );
 
 		expect( toggleButton ).toHaveAttribute( 'aria-expanded', 'true' );
 
-		expect( screen.getByRole( 'menu' ) ).toHaveFocus();
+		await waitFor( () =>
+			expect(
+				screen.getByRole( 'menu', {
+					name: toggleButton.textContent ?? '',
+				} )
+			).toHaveFocus()
+		);
+
 		expect( screen.getByRole( 'separator' ) ).toHaveAttribute(
 			'aria-orientation',
 			'horizontal'
@@ -78,11 +73,15 @@ describe( 'DropdownMenu', () => {
 		expect( submenuTrigger ).toHaveAttribute( 'aria-haspopup', 'menu' );
 		expect( submenuTrigger ).toHaveAttribute( 'aria-expanded', 'false' );
 
-		await user.hover( submenuTrigger );
+		await hover( submenuTrigger );
 
 		// Wait for the open animation after hovering
 		await waitFor( () =>
-			expect( screen.getAllByRole( 'menu' ) ).toHaveLength( 2 )
+			expect(
+				screen.getByRole( 'menu', {
+					name: submenuTrigger.textContent ?? '',
+				} )
+			).toBeVisible()
 		);
 
 		expect( submenuTrigger ).toHaveAttribute( 'aria-expanded', 'true' );
@@ -93,38 +92,70 @@ describe( 'DropdownMenu', () => {
 	} );
 
 	describe( 'pointer and keyboard interactions', () => {
-		it( 'should open when clicking the trigger', async () => {
-			const user = userEvent.setup();
-
+		it( 'should open and focus the menu when clicking the trigger', async () => {
 			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				</DropdownMenu>
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.Item>
+						Dropdown menu item
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			const toggleButton = screen.getByRole( 'button', {
 				name: 'Open dropdown',
 			} );
 
-			// DropdownMenu closed, the content is not displayed
+			// DropdownMenu closed
 			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
-			expect( screen.queryByRole( 'menuitem' ) ).not.toBeInTheDocument();
 
 			// Click to open the menu
-			await user.click( toggleButton );
+			await click( toggleButton );
 
-			// DropdownMenu open, the content is displayed
-			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
-			expect( screen.getByRole( 'menuitem' ) ).toBeInTheDocument();
+			// DropdownMenu open, focus is on the menu wrapper
+			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
 		} );
 
-		it( 'should open when pressing the arrow down key on the trigger', async () => {
-			const user = userEvent.setup();
+		it( 'should open and focus the first item when pressing the arrow down key on the trigger', async () => {
+			render(
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.Item disabled>
+						First item
+					</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item>Second item</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item>Third item</DropdownMenuV2.Item>
+				</DropdownMenuV2>
+			);
 
+			const toggleButton = screen.getByRole( 'button', {
+				name: 'Open dropdown',
+			} );
+
+			// Move focus on the toggle
+			await press.Tab();
+
+			expect( toggleButton ).toHaveFocus();
+
+			// DropdownMenu closed
+			expect( screen.queryByRole( 'menuitem' ) ).not.toBeInTheDocument();
+
+			await press.ArrowDown();
+
+			// DropdownMenu open, focus is on the first focusable item
+			// (disabled items are still focusable and accessible)
+			expect(
+				screen.getByRole( 'menuitem', { name: 'First item' } )
+			).toHaveFocus();
+		} );
+
+		it( 'should open and focus the first item when pressing the space key on the trigger', async () => {
 			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				</DropdownMenu>
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.Item disabled>
+						First item
+					</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item>Second item</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item>Third item</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			const toggleButton = screen.getByRole( 'button', {
@@ -132,139 +163,163 @@ describe( 'DropdownMenu', () => {
 			} );
 
 			// Move focus on the toggle
-			await user.keyboard( '{Tab}' );
+			await press.Tab();
 
 			expect( toggleButton ).toHaveFocus();
 
-			// DropdownMenu closed, the content is not displayed
+			// DropdownMenu closed
 			expect( screen.queryByRole( 'menuitem' ) ).not.toBeInTheDocument();
 
-			await user.keyboard( '{ArrowDown}' );
+			await press.Space();
 
-			// DropdownMenu open, the content is displayed
-			expect( screen.getByRole( 'menuitem' ) ).toBeInTheDocument();
+			// DropdownMenu open, focus is on the first focusable item
+			// (disabled items are still focusable and accessible
+			expect(
+				screen.getByRole( 'menuitem', { name: 'First item' } )
+			).toHaveFocus();
 		} );
 
 		it( 'should close when pressing the escape key', async () => {
-			const user = userEvent.setup();
-
 			render(
-				<DropdownMenu
-					defaultOpen
-					trigger={ <button>Open dropdown</button> }
-				>
-					<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				</DropdownMenu>
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.Item>
+						Dropdown menu item
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
-			// The menu is focused automatically when `defaultOpen` is set.
+			const trigger = screen.getByRole( 'button', {
+				name: 'Open dropdown',
+			} );
+
+			await click( trigger );
+
+			// Focuses menu on mouse click, focuses first item on keyboard press
+			// Can be changed with a custom useEffect
 			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
 
 			// Pressing esc will close the menu and move focus to the toggle
-			await user.keyboard( '{Escape}' );
+			await press.Escape();
 
 			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
-			expect(
-				screen.getByRole( 'button', { name: 'Open dropdown' } )
-			).toHaveFocus();
+
+			await waitFor( () =>
+				expect(
+					screen.getByRole( 'button', { name: 'Open dropdown' } )
+				).toHaveFocus()
+			);
 		} );
 
 		it( 'should close when clicking outside of the content', async () => {
-			const user = userEvent.setup( {
-				// Disabling this check otherwise testing-library would complain
-				// when clicking on document.body to close the dropdown menu.
-				pointerEventsCheck: PointerEventsCheckLevel.Never,
-			} );
-
 			render(
-				<DropdownMenu
+				<DropdownMenuV2
 					defaultOpen
 					trigger={ <button>Open dropdown</button> }
 				>
-					<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				</DropdownMenu>
+					<DropdownMenuV2.Item>
+						Dropdown menu item
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
 
 			// Click on the body (ie. outside of the dropdown menu)
-			await user.click( document.body );
+			await click( document.body );
 
 			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
 		} );
 
 		it( 'should close when clicking on a menu item', async () => {
-			const user = userEvent.setup();
-
 			render(
-				<DropdownMenu
+				<DropdownMenuV2
 					defaultOpen
 					trigger={ <button>Open dropdown</button> }
 				>
-					<DropdownMenuItem>Dropdown menu item</DropdownMenuItem>
-				</DropdownMenu>
+					<DropdownMenuV2.Item>
+						Dropdown menu item
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
 
 			// Clicking a menu item will close the menu
-			await user.click( screen.getByRole( 'menuitem' ) );
+			await click( screen.getByRole( 'menuitem' ) );
 
 			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
 		} );
 
-		it( 'should not close when clicking on a disabled menu item', async () => {
-			const user = userEvent.setup( {
-				// Disabling this check otherwise testing-library would complain
-				// when clicking on a disabled element with pointer-events: none
-				pointerEventsCheck: PointerEventsCheckLevel.Never,
-			} );
+		it( 'should not close when clicking on a menu item when the `hideOnClick` prop is set to `false`', async () => {
+			render(
+				<DropdownMenuV2
+					defaultOpen
+					trigger={ <button>Open dropdown</button> }
+				>
+					<DropdownMenuV2.Item hideOnClick={ false }>
+						Dropdown menu item
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
+			);
 
+			expect( screen.getByRole( 'menu' ) ).toBeVisible();
+
+			// Clicking a menu item will close the menu
+			await click( screen.getByRole( 'menuitem' ) );
+
+			expect( screen.getByRole( 'menu' ) ).toBeVisible();
+		} );
+
+		it( 'should not close when clicking on a disabled menu item', async () => {
 			render(
-				<DropdownMenu
+				<DropdownMenuV2
 					defaultOpen
 					trigger={ <button>Open dropdown</button> }
 				>
-					<DropdownMenuItem disabled>
+					<DropdownMenuV2.Item disabled>
 						Dropdown menu item
-					</DropdownMenuItem>
-				</DropdownMenu>
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
 
 			// Clicking a disabled menu item won't close the menu
-			await user.click( screen.getByRole( 'menuitem' ) );
+			await click( screen.getByRole( 'menuitem' ) );
 
 			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
 		} );
 
 		it( 'should reveal submenu content when hovering over the submenu trigger', async () => {
-			const user = userEvent.setup();
-
 			render(
-				<DropdownMenu
+				<DropdownMenuV2
 					defaultOpen
 					trigger={ <button>Open dropdown</button> }
 				>
-					<DropdownMenuItem>Dropdown menu item 1</DropdownMenuItem>
-					<DropdownMenuItem>Dropdown menu item 2</DropdownMenuItem>
-					<DropdownSubMenu
+					<DropdownMenuV2.Item>
+						Dropdown menu item 1
+					</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item>
+						Dropdown menu item 2
+					</DropdownMenuV2.Item>
+					<DropdownMenuV2
 						trigger={
-							<DropdownSubMenuTrigger>
+							<DropdownMenuV2.Item>
 								Dropdown submenu
-							</DropdownSubMenuTrigger>
+							</DropdownMenuV2.Item>
 						}
 					>
-						<DropdownMenuItem>
+						<DropdownMenuV2.Item>
 							Dropdown submenu item 1
-						</DropdownMenuItem>
-						<DropdownMenuItem>
+						</DropdownMenuV2.Item>
+						<DropdownMenuV2.Item>
 							Dropdown submenu item 2
-						</DropdownMenuItem>
-					</DropdownSubMenu>
-					<DropdownMenuItem>Dropdown menu item 3</DropdownMenuItem>
-				</DropdownMenu>
+						</DropdownMenuV2.Item>
+					</DropdownMenuV2>
+					<DropdownMenuV2.Item>
+						Dropdown menu item 3
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			// Before hover, submenu items are not rendered
@@ -274,7 +329,7 @@ describe( 'DropdownMenu', () => {
 				} )
 			).not.toBeInTheDocument();
 
-			await user.hover(
+			await hover(
 				screen.getByRole( 'menuitem', { name: 'Dropdown submenu' } )
 			);
 
@@ -287,89 +342,95 @@ describe( 'DropdownMenu', () => {
 		} );
 
 		it( 'should navigate menu items and subitems using the arrow, spacebar and enter keys', async () => {
-			const user = userEvent.setup();
-
 			render(
-				<DropdownMenu
+				<DropdownMenuV2
 					defaultOpen
 					trigger={ <button>Open dropdown</button> }
 				>
-					<DropdownMenuItem>Dropdown menu item 1</DropdownMenuItem>
-					<DropdownMenuItem>Dropdown menu item 2</DropdownMenuItem>
-					<DropdownSubMenu
+					<DropdownMenuV2.Item>
+						Dropdown menu item 1
+					</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item>
+						Dropdown menu item 2
+					</DropdownMenuV2.Item>
+					<DropdownMenuV2
 						trigger={
-							<DropdownSubMenuTrigger>
+							<DropdownMenuV2.Item>
 								Dropdown submenu
-							</DropdownSubMenuTrigger>
+							</DropdownMenuV2.Item>
 						}
 					>
-						<DropdownMenuItem>
+						<DropdownMenuV2.Item>
 							Dropdown submenu item 1
-						</DropdownMenuItem>
-						<DropdownMenuItem>
+						</DropdownMenuV2.Item>
+						<DropdownMenuV2.Item>
 							Dropdown submenu item 2
-						</DropdownMenuItem>
-					</DropdownSubMenu>
-					<DropdownMenuItem>Dropdown menu item 3</DropdownMenuItem>
-				</DropdownMenu>
+						</DropdownMenuV2.Item>
+					</DropdownMenuV2>
+					<DropdownMenuV2.Item>
+						Dropdown menu item 3
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			// The menu is focused automatically when `defaultOpen` is set.
-			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
+			await waitFor( () =>
+				expect( screen.getByRole( 'menu' ) ).toHaveFocus()
+			);
 
 			// Arrow up/down selects menu items
 			// The selection wraps around from last to first and viceversa
-			await user.keyboard( '{ArrowDown}' );
+			await press.ArrowDown();
 			expect(
 				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 1' } )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowDown}' );
+			await press.ArrowDown();
 			expect(
 				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 2' } )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowDown}' );
+			await press.ArrowDown();
 			expect(
 				screen.getByRole( 'menuitem', { name: 'Dropdown submenu' } )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowDown}' );
+			await press.ArrowDown();
 			expect(
 				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 3' } )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowDown}' );
+			await press.ArrowDown();
 			expect(
 				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 1' } )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowUp}' );
+			await press.ArrowUp();
 			expect(
 				screen.getByRole( 'menuitem', { name: 'Dropdown menu item 3' } )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowUp}' );
+			await press.ArrowUp();
 			expect(
 				screen.getByRole( 'menuitem', { name: 'Dropdown submenu' } )
 			).toHaveFocus();
 
 			// Arrow right/left can be used to enter/leave submenus
-			await user.keyboard( '{ArrowRight}' );
+			await press.ArrowRight();
 			expect(
 				screen.getByRole( 'menuitem', {
 					name: 'Dropdown submenu item 1',
 				} )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowDown}' );
+			await press.ArrowDown();
 			expect(
 				screen.getByRole( 'menuitem', {
 					name: 'Dropdown submenu item 2',
 				} )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowLeft}' );
+			await press.ArrowLeft();
 			expect(
 				screen.getByRole( 'menuitem', {
 					name: 'Dropdown submenu',
@@ -377,28 +438,28 @@ describe( 'DropdownMenu', () => {
 			).toHaveFocus();
 
 			// Spacebar or enter key can also be used to enter a submenu
-			await user.keyboard( '{Enter}' );
+			await press.Enter();
 			expect(
 				screen.getByRole( 'menuitem', {
 					name: 'Dropdown submenu item 1',
 				} )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowLeft}' );
+			await press.ArrowLeft();
 			expect(
 				screen.getByRole( 'menuitem', {
 					name: 'Dropdown submenu',
 				} )
 			).toHaveFocus();
 
-			await user.keyboard( '{Spacebar}' );
+			await press.Space();
 			expect(
 				screen.getByRole( 'menuitem', {
 					name: 'Dropdown submenu item 1',
 				} )
 			).toHaveFocus();
 
-			await user.keyboard( '{ArrowLeft}' );
+			await press.ArrowLeft();
 			expect(
 				screen.getByRole( 'menuitem', {
 					name: 'Dropdown submenu',
@@ -406,40 +467,45 @@ describe( 'DropdownMenu', () => {
 			).toHaveFocus();
 		} );
 
-		it( 'should check menu radio items', async () => {
-			const user = userEvent.setup();
-
+		it( 'should check radio items and keep the menu open when clicking (controlled)', async () => {
 			const onRadioValueChangeSpy = jest.fn();
 
 			const ControlledRadioGroup = () => {
-				const [ radioValue, setRadioValue ] = useState< string >();
+				const [ radioValue, setRadioValue ] = useState( 'two' );
+				const onRadioChange: React.ComponentProps<
+					typeof DropdownMenuV2.RadioItem
+				>[ 'onChange' ] = ( e ) => {
+					onRadioValueChangeSpy( e.target.value );
+					setRadioValue( e.target.value );
+				};
 				return (
-					<DropdownMenu trigger={ <button>Open dropdown</button> }>
-						<DropdownMenuRadioGroup
-							value={ radioValue }
-							onValueChange={ ( value ) => {
-								onRadioValueChangeSpy( value );
-								setRadioValue( value );
-							} }
-						>
-							<DropdownMenuLabel>
-								Radio group label
-							</DropdownMenuLabel>
-							<DropdownMenuRadioItem value="radio-one">
+					<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+						<DropdownMenuV2.Group>
+							<DropdownMenuV2.RadioItem
+								name="radio-test"
+								value="radio-one"
+								checked={ radioValue === 'radio-one' }
+								onChange={ onRadioChange }
+							>
 								Radio item one
-							</DropdownMenuRadioItem>
-							<DropdownMenuRadioItem value="radio-two">
+							</DropdownMenuV2.RadioItem>
+							<DropdownMenuV2.RadioItem
+								name="radio-test"
+								value="radio-two"
+								checked={ radioValue === 'radio-two' }
+								onChange={ onRadioChange }
+							>
 								Radio item two
-							</DropdownMenuRadioItem>
-						</DropdownMenuRadioGroup>
-					</DropdownMenu>
+							</DropdownMenuV2.RadioItem>
+						</DropdownMenuV2.Group>
+					</DropdownMenuV2>
 				);
 			};
 
 			render( <ControlledRadioGroup /> );
 
 			// Open dropdown
-			await user.click(
+			await click(
 				screen.getByRole( 'button', { name: 'Open dropdown' } )
 			);
 
@@ -453,7 +519,7 @@ describe( 'DropdownMenu', () => {
 			).not.toBeChecked();
 
 			// Click first radio item, make sure that the callback fires
-			await user.click(
+			await click(
 				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
 			);
 			expect( onRadioValueChangeSpy ).toHaveBeenCalledTimes( 1 );
@@ -461,11 +527,6 @@ describe( 'DropdownMenu', () => {
 				'radio-one'
 			);
 
-			// Open dropdown
-			await user.click(
-				screen.getByRole( 'button', { name: 'Open dropdown' } )
-			);
-
 			// Make sure that first radio is checked
 			expect(
 				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
@@ -475,7 +536,7 @@ describe( 'DropdownMenu', () => {
 			).not.toBeChecked();
 
 			// Click second radio item, make sure that the callback fires
-			await user.click(
+			await click(
 				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
 			);
 			expect( onRadioValueChangeSpy ).toHaveBeenCalledTimes( 2 );
@@ -483,11 +544,83 @@ describe( 'DropdownMenu', () => {
 				'radio-two'
 			);
 
+			// Make sure that second radio is selected
+			expect(
+				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
+			).not.toBeChecked();
+			expect(
+				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
+			).toBeChecked();
+		} );
+
+		it( 'should check radio items and keep the menu open when clicking (uncontrolled)', async () => {
+			const onRadioValueChangeSpy = jest.fn();
+			render(
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.Group>
+						<DropdownMenuV2.RadioItem
+							name="radio-test"
+							value="radio-one"
+							onChange={ ( e ) =>
+								onRadioValueChangeSpy( e.target.value )
+							}
+						>
+							Radio item one
+						</DropdownMenuV2.RadioItem>
+						<DropdownMenuV2.RadioItem
+							name="radio-test"
+							value="radio-two"
+							defaultChecked
+							onChange={ ( e ) =>
+								onRadioValueChangeSpy( e.target.value )
+							}
+						>
+							Radio item two
+						</DropdownMenuV2.RadioItem>
+					</DropdownMenuV2.Group>
+				</DropdownMenuV2>
+			);
+
 			// Open dropdown
-			await user.click(
+			await click(
 				screen.getByRole( 'button', { name: 'Open dropdown' } )
 			);
 
+			// Radio item two should be checked (`defaultChecked` prop)
+			expect( screen.getAllByRole( 'menuitemradio' ) ).toHaveLength( 2 );
+			expect(
+				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
+			).not.toBeChecked();
+			expect(
+				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
+			).toBeChecked();
+
+			// Click first radio item, make sure that the callback fires
+			await click(
+				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
+			);
+			expect( onRadioValueChangeSpy ).toHaveBeenCalledTimes( 1 );
+			expect( onRadioValueChangeSpy ).toHaveBeenLastCalledWith(
+				'radio-one'
+			);
+
+			// Make sure that first radio is checked
+			expect(
+				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
+			).toBeChecked();
+			expect(
+				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
+			).not.toBeChecked();
+
+			// Click second radio item, make sure that the callback fires
+			await click(
+				screen.getByRole( 'menuitemradio', { name: 'Radio item two' } )
+			);
+			expect( onRadioValueChangeSpy ).toHaveBeenCalledTimes( 2 );
+			expect( onRadioValueChangeSpy ).toHaveBeenLastCalledWith(
+				'radio-two'
+			);
+
 			// Make sure that second radio is selected
 			expect(
 				screen.getByRole( 'menuitemradio', { name: 'Radio item one' } )
@@ -497,9 +630,7 @@ describe( 'DropdownMenu', () => {
 			).toBeChecked();
 		} );
 
-		it( 'should check menu checkbox items', async () => {
-			const user = userEvent.setup();
-
+		it( 'should check checkbox items and keep the menu open when clicking (controlled)', async () => {
 			const onCheckboxValueChangeSpy = jest.fn();
 
 			const ControlledRadioGroup = () => {
@@ -507,38 +638,48 @@ describe( 'DropdownMenu', () => {
 					useState< boolean >();
 				const [ itemTwoChecked, setItemTwoChecked ] =
 					useState< boolean >();
+
 				return (
-					<DropdownMenu trigger={ <button>Open dropdown</button> }>
-						<DropdownMenuLabel>
-							Checkbox group label
-						</DropdownMenuLabel>
-						<DropdownMenuCheckboxItem
+					<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+						<DropdownMenuV2.CheckboxItem
+							name="item-one"
+							value="item-one-value"
 							checked={ itemOneChecked }
-							onCheckedChange={ ( checked ) => {
-								setItemOneChecked( checked );
-								onCheckboxValueChangeSpy( 'item-one', checked );
+							onChange={ ( e ) => {
+								onCheckboxValueChangeSpy(
+									e.target.name,
+									e.target.value,
+									e.target.checked
+								);
+								setItemOneChecked( e.target.checked );
 							} }
 						>
 							Checkbox item one
-						</DropdownMenuCheckboxItem>
+						</DropdownMenuV2.CheckboxItem>
 
-						<DropdownMenuCheckboxItem
+						<DropdownMenuV2.CheckboxItem
+							name="item-two"
+							value="item-two-value"
 							checked={ itemTwoChecked }
-							onCheckedChange={ ( checked ) => {
-								setItemTwoChecked( checked );
-								onCheckboxValueChangeSpy( 'item-two', checked );
+							onChange={ ( e ) => {
+								onCheckboxValueChangeSpy(
+									e.target.name,
+									e.target.value,
+									e.target.checked
+								);
+								setItemTwoChecked( e.target.checked );
 							} }
 						>
 							Checkbox item two
-						</DropdownMenuCheckboxItem>
-					</DropdownMenu>
+						</DropdownMenuV2.CheckboxItem>
+					</DropdownMenuV2>
 				);
 			};
 
 			render( <ControlledRadioGroup /> );
 
 			// Open dropdown
-			await user.click(
+			await click(
 				screen.getByRole( 'button', { name: 'Open dropdown' } )
 			);
 
@@ -558,7 +699,7 @@ describe( 'DropdownMenu', () => {
 			).not.toBeChecked();
 
 			// Click first checkbox item, make sure that the callback fires
-			await user.click(
+			await click(
 				screen.getByRole( 'menuitemcheckbox', {
 					name: 'Checkbox item one',
 				} )
@@ -566,14 +707,10 @@ describe( 'DropdownMenu', () => {
 			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 1 );
 			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
 				'item-one',
+				'item-one-value',
 				true
 			);
 
-			// Open dropdown
-			await user.click(
-				screen.getByRole( 'button', { name: 'Open dropdown' } )
-			);
-
 			// Make sure that first checkbox is checked
 			expect(
 				screen.getByRole( 'menuitemcheckbox', {
@@ -582,7 +719,7 @@ describe( 'DropdownMenu', () => {
 			).toBeChecked();
 
 			// Click second checkbox item, make sure that the callback fires
-			await user.click(
+			await click(
 				screen.getByRole( 'menuitemcheckbox', {
 					name: 'Checkbox item two',
 				} )
@@ -590,14 +727,10 @@ describe( 'DropdownMenu', () => {
 			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 2 );
 			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
 				'item-two',
+				'item-two-value',
 				true
 			);
 
-			// Open dropdown
-			await user.click(
-				screen.getByRole( 'button', { name: 'Open dropdown' } )
-			);
-
 			// Make sure that second checkbox is selected
 			expect(
 				screen.getByRole( 'menuitemcheckbox', {
@@ -606,7 +739,7 @@ describe( 'DropdownMenu', () => {
 			).toBeChecked();
 
 			// Click second checkbox item, make sure that the callback fires
-			await user.click(
+			await click(
 				screen.getByRole( 'menuitemcheckbox', {
 					name: 'Checkbox item two',
 				} )
@@ -614,37 +747,217 @@ describe( 'DropdownMenu', () => {
 			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 3 );
 			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
 				'item-two',
+				'item-two-value',
 				false
 			);
 
+			// Make sure that second checkbox is unselected
+			expect(
+				screen.getByRole( 'menuitemcheckbox', {
+					name: 'Checkbox item two',
+				} )
+			).not.toBeChecked();
+		} );
+
+		it( 'should check checkbox items and keep the menu open when clicking (uncontrolled)', async () => {
+			const onCheckboxValueChangeSpy = jest.fn();
+
+			render(
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.CheckboxItem
+						name="item-one"
+						value="item-one-value"
+						onChange={ ( e ) => {
+							onCheckboxValueChangeSpy(
+								e.target.name,
+								e.target.value,
+								e.target.checked
+							);
+						} }
+					>
+						Checkbox item one
+					</DropdownMenuV2.CheckboxItem>
+
+					<DropdownMenuV2.CheckboxItem
+						name="item-two"
+						value="item-two-value"
+						defaultChecked
+						onChange={ ( e ) => {
+							onCheckboxValueChangeSpy(
+								e.target.name,
+								e.target.value,
+								e.target.checked
+							);
+						} }
+					>
+						Checkbox item two
+					</DropdownMenuV2.CheckboxItem>
+				</DropdownMenuV2>
+			);
+
 			// Open dropdown
-			await user.click(
+			await click(
 				screen.getByRole( 'button', { name: 'Open dropdown' } )
 			);
 
-			// Make sure that second checkbox is unselected
+			// Checkbox item two should be checked (`defaultChecked`)
+			expect( screen.getAllByRole( 'menuitemcheckbox' ) ).toHaveLength(
+				2
+			);
+			expect(
+				screen.getByRole( 'menuitemcheckbox', {
+					name: 'Checkbox item one',
+				} )
+			).not.toBeChecked();
+			expect(
+				screen.getByRole( 'menuitemcheckbox', {
+					name: 'Checkbox item two',
+				} )
+			).toBeChecked();
+
+			// Click first checkbox item, make sure that the callback fires
+			await click(
+				screen.getByRole( 'menuitemcheckbox', {
+					name: 'Checkbox item one',
+				} )
+			);
+			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 1 );
+			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
+				'item-one',
+				'item-one-value',
+				true
+			);
+
+			// Make sure that first checkbox is checked
+			expect(
+				screen.getByRole( 'menuitemcheckbox', {
+					name: 'Checkbox item one',
+				} )
+			).toBeChecked();
+
+			// Click second checkbox item, make sure that the callback fires
+			await click(
+				screen.getByRole( 'menuitemcheckbox', {
+					name: 'Checkbox item two',
+				} )
+			);
+			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 2 );
+			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
+				'item-two',
+				'item-two-value',
+				false
+			);
+
+			// Make sure that second checkbox is unchecked
 			expect(
 				screen.getByRole( 'menuitemcheckbox', {
 					name: 'Checkbox item two',
 				} )
 			).not.toBeChecked();
+
+			// Click second checkbox item, make sure that the callback fires
+			await click(
+				screen.getByRole( 'menuitemcheckbox', {
+					name: 'Checkbox item two',
+				} )
+			);
+			expect( onCheckboxValueChangeSpy ).toHaveBeenCalledTimes( 3 );
+			expect( onCheckboxValueChangeSpy ).toHaveBeenLastCalledWith(
+				'item-two',
+				'item-two-value',
+				true
+			);
+
+			// Make sure that second checkbox is unselected
+			expect(
+				screen.getByRole( 'menuitemcheckbox', {
+					name: 'Checkbox item two',
+				} )
+			).toBeChecked();
+		} );
+	} );
+
+	describe( 'modality', () => {
+		it( 'should be modal by default', async () => {
+			render(
+				<>
+					<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+						<DropdownMenuV2.Item>
+							Dropdown menu item
+						</DropdownMenuV2.Item>
+					</DropdownMenuV2>
+					<button>Button outside of dropdown</button>
+				</>
+			);
+
+			// Click to open the menu
+			await click(
+				screen.getByRole( 'button', {
+					name: 'Open dropdown',
+				} )
+			);
+
+			// DropdownMenu open, focus is on the menu wrapper
+			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
+
+			expect(
+				screen.queryByRole( 'button', {
+					name: 'Button outside of dropdown',
+				} )
+			).not.toBeInTheDocument();
+		} );
+
+		it( 'should not be modal when the `modal` prop is set to `false`', async () => {
+			render(
+				<>
+					<DropdownMenuV2
+						trigger={ <button>Open dropdown</button> }
+						modal={ false }
+					>
+						<DropdownMenuV2.Item>
+							Dropdown menu item
+						</DropdownMenuV2.Item>
+					</DropdownMenuV2>
+					<button>Button outside of dropdown</button>
+				</>
+			);
+
+			// Click to open the menu
+			await click(
+				screen.getByRole( 'button', {
+					name: 'Open dropdown',
+				} )
+			);
+
+			// DropdownMenu open, focus is on the menu wrapper
+			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
+
+			// DropdownMenu is not modal, therefore the outer button is part of the
+			// accessibility tree and can be found.
+			const outerButton = screen.getByRole( 'button', {
+				name: 'Button outside of dropdown',
+			} );
+
+			// The outer button can be focused by pressing tab. Doing so will cause
+			// the DropdownMenu to close.
+			await press.Tab();
+			expect( outerButton ).toBeInTheDocument();
+			expect( screen.queryByRole( 'menu' ) ).not.toBeInTheDocument();
 		} );
 	} );
 
 	describe( 'items prefix and suffix', () => {
 		it( 'should display a prefix on regular items', async () => {
-			const user = userEvent.setup();
-
 			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem prefix={ <>Item prefix</> }>
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.Item prefix={ <>Item prefix</> }>
 						Dropdown menu item
-					</DropdownMenuItem>
-				</DropdownMenu>
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			// Click to open the menu
-			await user.click(
+			await click(
 				screen.getByRole( 'button', {
 					name: 'Open dropdown',
 				} )
@@ -659,18 +972,16 @@ describe( 'DropdownMenu', () => {
 		} );
 
 		it( 'should display a suffix on regular items', async () => {
-			const user = userEvent.setup();
-
 			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem suffix={ <>Item suffix</> }>
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.Item suffix={ <>Item suffix</> }>
 						Dropdown menu item
-					</DropdownMenuItem>
-				</DropdownMenu>
+					</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			// Click to open the menu
-			await user.click(
+			await click(
 				screen.getByRole( 'button', {
 					name: 'Open dropdown',
 				} )
@@ -685,23 +996,20 @@ describe( 'DropdownMenu', () => {
 		} );
 
 		it( 'should display a suffix on radio items', async () => {
-			const user = userEvent.setup();
-
 			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuRadioGroup>
-						<DropdownMenuRadioItem
-							value="radio-one"
-							suffix="Radio suffix"
-						>
-							Radio item one
-						</DropdownMenuRadioItem>
-					</DropdownMenuRadioGroup>
-				</DropdownMenu>
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.RadioItem
+						name="radio-test"
+						value="radio-one"
+						suffix="Radio suffix"
+					>
+						Radio item one
+					</DropdownMenuV2.RadioItem>
+				</DropdownMenuV2>
 			);
 
 			// Click to open the menu
-			await user.click(
+			await click(
 				screen.getByRole( 'button', {
 					name: 'Open dropdown',
 				} )
@@ -716,18 +1024,20 @@ describe( 'DropdownMenu', () => {
 		} );
 
 		it( 'should display a suffix on checkbox items', async () => {
-			const user = userEvent.setup();
-
 			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuCheckboxItem suffix={ 'Checkbox suffix' }>
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.CheckboxItem
+						name="checkbox-test"
+						value="checkbox-one"
+						suffix="Checkbox suffix"
+					>
 						Checkbox item one
-					</DropdownMenuCheckboxItem>
-				</DropdownMenu>
+					</DropdownMenuV2.CheckboxItem>
+				</DropdownMenuV2>
 			);
 
 			// Click to open the menu
-			await user.click(
+			await click(
 				screen.getByRole( 'button', {
 					name: 'Open dropdown',
 				} )
@@ -744,70 +1054,84 @@ describe( 'DropdownMenu', () => {
 
 	describe( 'typeahead', () => {
 		it( 'should highlight matching item', async () => {
-			const user = userEvent.setup();
-
 			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem>One</DropdownMenuItem>
-					<DropdownMenuItem>Two</DropdownMenuItem>
-				</DropdownMenu>
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.Item>One</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item>Two</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			// Click to open the menu
-			await user.click(
+			await click(
 				screen.getByRole( 'button', {
 					name: 'Open dropdown',
 				} )
 			);
-			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
+			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
 
 			// Type "tw", it should match and focus the item with content "Two"
-			await user.keyboard( 'tw' );
+			await type( 'tw' );
 			expect(
 				screen.getByRole( 'menuitem', { name: 'Two' } )
 			).toHaveFocus();
 
 			// Wait for the typeahead timer to reset and interpret
 			// the next keystrokes as a new search
-			await delay( 1000 );
+			await delay( 500 );
 
 			// Type "on", it should match and focus the item with content "One"
-			await user.keyboard( 'on' );
+			await type( 'on' );
 			expect(
 				screen.getByRole( 'menuitem', { name: 'One' } )
 			).toHaveFocus();
 		} );
 
-		it( 'should use the textValue prop if specificied', async () => {
-			const user = userEvent.setup();
-
+		it( 'should keep previous focus when no matches are found', async () => {
 			render(
-				<DropdownMenu trigger={ <button>Open dropdown</button> }>
-					<DropdownMenuItem>One</DropdownMenuItem>
-					<DropdownMenuItem textValue="Four">Two</DropdownMenuItem>
-				</DropdownMenu>
+				<DropdownMenuV2 trigger={ <button>Open dropdown</button> }>
+					<DropdownMenuV2.Item>One</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item>Two</DropdownMenuV2.Item>
+				</DropdownMenuV2>
 			);
 
 			// Click to open the menu
-			await user.click(
+			await click(
 				screen.getByRole( 'button', {
 					name: 'Open dropdown',
 				} )
 			);
-			expect( screen.getByRole( 'menu' ) ).toBeInTheDocument();
+			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
 
-			// Type "tw", it should not match the item with content "Two" because it
-			// that item specifies the "textValue" prop. Therefore, the menu container
-			// retains focus.
-			await user.keyboard( 'tw' );
+			// Type a string that doesn't match any items. Focus shouldn't move.
+			await type( 'abc' );
 			expect( screen.getByRole( 'menu' ) ).toHaveFocus();
 
 			// Wait for the typeahead timer to reset and interpret
 			// the next keystrokes as a new search
-			await delay( 1000 );
+			await delay( 500 );
+
+			// Type "on", it should match and focus the item with content "One"
+			await type( 'on' );
+			expect(
+				screen.getByRole( 'menuitem', { name: 'One' } )
+			).toHaveFocus();
+
+			// Wait for the typeahead timer to reset and interpret
+			// the next keystrokes as a new search
+			await delay( 500 );
 
-			// Type "fo", it should match and focus the item with textValue "Four"
-			await user.keyboard( 'fo' );
+			// Type a string that doesn't match any items. Focus shouldn't move.
+			await type( 'abc' );
+			expect(
+				screen.getByRole( 'menuitem', { name: 'One' } )
+			).toHaveFocus();
+
+			// Wait for the typeahead timer to reset and interpret
+			// the next keystrokes as a new search
+			await delay( 500 );
+
+			// Type "tw", it should match and focus the item with content "Two"
+			await type( 'tw' );
 			expect(
 				screen.getByRole( 'menuitem', { name: 'Two' } )
 			).toHaveFocus();
diff --git a/packages/components/src/dropdown-menu-v2/types.ts b/packages/components/src/dropdown-menu-v2/types.ts
index c06bb5aac626a7..795cd9ac76ff58 100644
--- a/packages/components/src/dropdown-menu-v2/types.ts
+++ b/packages/components/src/dropdown-menu-v2/types.ts
@@ -1,24 +1,45 @@
 /**
  * External dependencies
  */
-import type * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
+import type * as Ariakit from '@ariakit/react';
+import type { Placement } from '@floating-ui/react-dom';
 
-export type DropdownMenuProps = {
+export interface DropdownMenuContext {
+	/**
+	 * The ariakit store shared across all DropdownMenu subcomponents.
+	 */
+	store: Ariakit.MenuStore;
+	/**
+	 * The variant used by the underlying menu popover.
+	 */
+	variant?: 'toolbar';
+}
+
+export interface DropdownMenuProps {
+	/**
+	 * The trigger button.
+	 */
+	trigger: React.ReactElement;
+	/**
+	 * The contents of the dropdown.
+	 */
+	children?: React.ReactNode;
 	/**
 	 * The open state of the dropdown menu when it is initially rendered. Use when
-	 * you do not need to control its open state.
+	 * not wanting to control its open state.
 	 *
+	 * @default false
 	 */
-	defaultOpen?: DropdownMenuPrimitive.DropdownMenuProps[ 'defaultOpen' ];
+	defaultOpen?: boolean;
 	/**
 	 * The controlled open state of the dropdown menu. Must be used in conjunction
 	 * with `onOpenChange`.
 	 */
-	open?: DropdownMenuPrimitive.DropdownMenuProps[ 'open' ];
+	open?: boolean;
 	/**
 	 * Event handler called when the open state of the dropdown menu changes.
 	 */
-	onOpenChange?: DropdownMenuPrimitive.DropdownMenuProps[ 'onOpenChange' ];
+	onOpenChange?: ( open: boolean ) => void;
 	/**
 	 * The modality of the dropdown menu. When set to true, interaction with
 	 * outside elements will be disabled and only menu content will be visible to
@@ -26,240 +47,139 @@ export type DropdownMenuProps = {
 	 *
 	 * @default true
 	 */
-	modal?: DropdownMenuPrimitive.DropdownMenuProps[ 'modal' ];
+	modal?: boolean;
 	/**
-	 * The preferred side of the trigger to render against when open.
-	 * Will be reversed when collisions occur and avoidCollisions is enabled.
+	 * The placement of the dropdown menu popover.
 	 *
-	 * @default 'bottom'
+	 * @default 'bottom-start' for root-level menus, 'right-start' for nested menus
 	 */
-	side?: DropdownMenuPrimitive.DropdownMenuContentProps[ 'side' ];
+	placement?: Placement;
 	/**
-	 * The distance in pixels from the trigger.
+	 * The distance between the popover and the anchor element.
 	 *
-	 * @default 0
+	 * @default 8 for root-level menus, 16 for nested menus
 	 */
-	sideOffset?: DropdownMenuPrimitive.DropdownMenuContentProps[ 'sideOffset' ];
+	gutter?: number;
 	/**
-	 * The preferred alignment against the trigger.
-	 * May change when collisions occur.
+	 * The skidding of the popover along the anchor element. Can be set to
+	 * negative values to make the popover shift to the opposite side.
 	 *
-	 * @default 'start'
+	 * @default 0 for root-level menus, -8 for nested menus
 	 */
-	align?: DropdownMenuPrimitive.DropdownMenuContentProps[ 'align' ];
+	shift?: number;
 	/**
-	 * An offset in pixels from the "start" or "end" alignment options.
+	 * Determines whether the menu popover will be hidden when the user presses
+	 * the Escape key.
 	 *
-	 * @default 0
-	 */
-	alignOffset?: DropdownMenuPrimitive.DropdownMenuContentProps[ 'alignOffset' ];
+	 * @default `( event ) => { event.preventDefault(); return true; }`
+	 */
+	hideOnEscape?:
+		| boolean
+		| ( (
+				event: KeyboardEvent | React.KeyboardEvent< Element >
+		  ) => boolean );
+}
+
+export interface DropdownMenuGroupProps {
 	/**
-	 * The trigger button.
+	 * The contents of the dropdown menu group.
 	 */
-	trigger: React.ReactNode;
+	children: React.ReactNode;
+}
+
+export interface DropdownMenuGroupLabelProps {
 	/**
-	 * The contents of the dropdown
+	 * The contents of the dropdown menu group.
 	 */
 	children: React.ReactNode;
-};
+}
 
-export type DropdownSubMenuTriggerProps = {
+export interface DropdownMenuItemProps {
 	/**
-	 * The contents of the item.
+	 * The contents of the menu item.
 	 */
 	children: React.ReactNode;
 	/**
-	 * The contents of the item's prefix.
+	 * The contents of the menu item's prefix.
 	 */
 	prefix?: React.ReactNode;
 	/**
-	 * The contents of the item's suffix.
-	 *
-	 * @default The standard chevron icon for a submenu trigger.
+	 * The contents of the menu item's suffix.
 	 */
 	suffix?: React.ReactNode;
-};
-
-export type DropdownSubMenuProps = {
 	/**
-	 * The open state of the submenu when it is initially rendered. Use when you
-	 * do not need to control its open state.
-	 */
-	defaultOpen?: DropdownMenuPrimitive.DropdownMenuSubProps[ 'defaultOpen' ];
-	/**
-	 * The controlled open state of the submenu. Must be used in conjunction with
-	 * `onOpenChange`.
-	 */
-	open?: DropdownMenuPrimitive.DropdownMenuSubProps[ 'open' ];
-	/**
-	 * Event handler called when the open state of the submenu changes.
-	 */
-	onOpenChange?: DropdownMenuPrimitive.DropdownMenuSubProps[ 'onOpenChange' ];
-	/**
-	 * When `true`, prevents the user from interacting with the item.
-	 */
-	disabled?: DropdownMenuPrimitive.DropdownMenuSubTriggerProps[ 'disabled' ];
-	/**
-	 * Optional text used for typeahead purposes for the trigger. By default the typeahead
-	 * behavior will use the `.textContent` of the trigger. Use this when the content
-	 * is complex, or you have non-textual content inside.
-	 */
-	textValue?: DropdownMenuPrimitive.DropdownMenuSubTriggerProps[ 'textValue' ];
-	/**
-	 * The contents rendered inside the trigger. The trigger should be
-	 * an instance of the `DropdownSubMenuTriggerProps` component.
+	 * Whether to hide the parent menu when the item is clicked.
+	 *
+	 * @default true
 	 */
-	trigger: React.ReactNode;
+	hideOnClick?: boolean;
 	/**
-	 * The contents of the dropdown sub menu
+	 * Determines if the element is disabled.
 	 */
-	children: React.ReactNode;
-};
+	disabled?: boolean;
+}
 
-export type DropdownMenuItemProps = {
+export interface DropdownMenuCheckboxItemProps
+	extends Omit< DropdownMenuItemProps, 'prefix' | 'hideOnClick' > {
 	/**
-	 * When true, prevents the user from interacting with the item.
+	 * Whether to hide the dropdown menu when the item is clicked.
 	 *
 	 * @default false
 	 */
-	disabled?: DropdownMenuPrimitive.DropdownMenuItemProps[ 'disabled' ];
+	hideOnClick?: boolean;
 	/**
-	 * Event handler called when the user selects an item (via mouse or keyboard).
-	 * Calling `event.preventDefault` in this handler will prevent the dropdown
-	 * menu from closing when selecting that item.
+	 * The checkbox menu item's name.
 	 */
-	onSelect?: DropdownMenuPrimitive.DropdownMenuItemProps[ 'onSelect' ];
+	name: string;
 	/**
-	 * Optional text used for typeahead purposes. By default the typeahead
-	 * behavior will use the `.textContent` of the item. Use this when the content
-	 * is complex, or you have non-textual content inside.
+	 * The checkbox item's value, useful when using multiple checkbox menu items
+	 * associated to the same `name`.
 	 */
-	textValue?: DropdownMenuPrimitive.DropdownMenuItemProps[ 'textValue' ];
+	value?: string;
 	/**
-	 * The contents of the item
+	 * The controlled checked state of the checkbox menu item.
 	 */
-	children: React.ReactNode;
+	checked?: boolean;
 	/**
-	 * The contents of the item's prefix
+	 * The checked state of the checkbox menu item when it is initially rendered.
+	 * Use when not wanting to control its checked state.
 	 */
-	prefix?: React.ReactNode;
+	defaultChecked?: boolean;
 	/**
-	 * The contents of the item's suffix
+	 * Event handler called when the checked state of the checkbox menu item changes.
 	 */
-	suffix?: React.ReactNode;
-};
+	onChange?: ( event: React.ChangeEvent< HTMLInputElement > ) => void;
+}
 
-export type DropdownMenuCheckboxItemProps = {
+export interface DropdownMenuRadioItemProps
+	extends Omit< DropdownMenuItemProps, 'prefix' | 'hideOnClick' > {
 	/**
-	 * The controlled checked state of the item.
-	 * Must be used in conjunction with `onCheckedChange`.
+	 * Whether to hide the dropdown menu when the item is clicked.
 	 *
 	 * @default false
 	 */
-	checked?: DropdownMenuPrimitive.DropdownMenuCheckboxItemProps[ 'checked' ];
-	/**
-	 * Event handler called when the checked state changes.
-	 */
-	onCheckedChange?: DropdownMenuPrimitive.DropdownMenuCheckboxItemProps[ 'onCheckedChange' ];
+	hideOnClick?: boolean;
 	/**
-	 * When `true`, prevents the user from interacting with the item.
+	 * The radio item's name.
 	 */
-	disabled?: DropdownMenuPrimitive.DropdownMenuCheckboxItemProps[ 'disabled' ];
+	name: string;
 	/**
-	 * Event handler called when the user selects an item (via mouse or keyboard).
-	 * Calling `event.preventDefault` in this handler will prevent the dropdown
-	 * 	menu from closing when selecting that item.
+	 * The radio item's value.
 	 */
-	onSelect?: DropdownMenuPrimitive.DropdownMenuCheckboxItemProps[ 'onSelect' ];
+	value: string | number;
 	/**
-	 * Optional text used for typeahead purposes. By default the typeahead
-	 * behavior will use the `.textContent` of the item. Use this when the content
-	 * is complex, or you have non-textual content inside.
+	 * The controlled checked state of the radio menu item.
 	 */
-	textValue?: DropdownMenuPrimitive.DropdownMenuCheckboxItemProps[ 'textValue' ];
+	checked?: boolean;
 	/**
-	 * The contents of the checkbox item
+	 * The checked state of the radio menu item when it is initially rendered.
+	 * Use when not wanting to control its checked state.
 	 */
-	children: React.ReactNode;
+	defaultChecked?: boolean;
 	/**
-	 * The contents of the checkbox item's suffix
+	 * Event handler called when the checked radio menu item changes.
 	 */
-	suffix?: React.ReactNode;
-};
-
-export type DropdownMenuRadioGroupProps = {
-	/**
-	 * The value of the selected item in the group.
-	 */
-	value?: DropdownMenuPrimitive.DropdownMenuRadioGroupProps[ 'value' ];
-	/**
-	 * Event handler called when the value changes.
-	 */
-	onValueChange?: DropdownMenuPrimitive.DropdownMenuRadioGroupProps[ 'onValueChange' ];
-	/**
-	 * The contents of the radio group
-	 */
-	children: React.ReactNode;
-};
-
-export type DropdownMenuRadioItemProps = {
-	/**
-	 * The unique value of the item.
-	 */
-	value: DropdownMenuPrimitive.DropdownMenuRadioItemProps[ 'value' ];
-	/**
-	 * When `true`, prevents the user from interacting with the item.
-	 */
-	disabled?: DropdownMenuPrimitive.DropdownMenuRadioItemProps[ 'disabled' ];
-	/**
-	 * Event handler called when the user selects an item (via mouse or keyboard).
-	 * Calling `event.preventDefault` in this handler will prevent the dropdown
-	 * menu from closing when selecting that item.
-	 */
-	onSelect?: DropdownMenuPrimitive.DropdownMenuRadioItemProps[ 'onSelect' ];
-	/**
-	 * Optional text used for typeahead purposes. By default the typeahead
-	 * behavior will use the `.textContent` of the item. Use this when the content
-	 * is complex, or you have non-textual content inside.
-	 */
-	textValue?: DropdownMenuPrimitive.DropdownMenuRadioItemProps[ 'textValue' ];
-	/**
-	 * The contents of the radio item
-	 */
-	children: React.ReactNode;
-	/**
-	 * The contents of the radio item's suffix
-	 */
-	suffix?: React.ReactNode;
-};
-
-export type DropdownMenuLabelProps = {
-	/**
-	 * The contents of the label
-	 */
-	children: React.ReactNode;
-};
-
-export type DropdownMenuGroupProps = {
-	/**
-	 * The contents of the group
-	 */
-	children: React.ReactNode;
-};
-
-export type DropdownMenuSeparatorProps = {};
-
-export type DropdownMenuInternalContext = {
-	/**
-	 * This variant can be used to change the appearance of the component in
-	 * specific contexts, ie. when rendered inside the `Toolbar` component.
-	 */
-	variant?: 'toolbar';
-};
+	onChange?: ( event: React.ChangeEvent< HTMLInputElement > ) => void;
+}
 
-export type DropdownMenuPrivateContext = Pick<
-	DropdownMenuInternalContext,
-	'variant'
-> & {
-	portalContainer?: HTMLElement | null;
-};
+export interface DropdownMenuSeparatorProps {}
diff --git a/packages/components/src/dropdown-menu-v2/use-temporary-focus-visible-fix.ts b/packages/components/src/dropdown-menu-v2/use-temporary-focus-visible-fix.ts
new file mode 100644
index 00000000000000..0df13133739609
--- /dev/null
+++ b/packages/components/src/dropdown-menu-v2/use-temporary-focus-visible-fix.ts
@@ -0,0 +1,22 @@
+/**
+ * WordPress dependencies
+ */
+import { useState, flushSync } from '@wordpress/element';
+
+export function useTemporaryFocusVisibleFix( {
+	onBlur: onBlurProp,
+}: {
+	onBlur?: React.FocusEventHandler< HTMLDivElement >;
+} ) {
+	const [ focusVisible, setFocusVisible ] = useState( false );
+	return {
+		'data-focus-visible': focusVisible || undefined,
+		onFocusVisible: () => {
+			flushSync( () => setFocusVisible( true ) );
+		},
+		onBlur: ( ( event ) => {
+			onBlurProp?.( event );
+			setFocusVisible( false );
+		} ) as React.FocusEventHandler< HTMLDivElement >,
+	};
+}
diff --git a/packages/components/src/dropdown-menu/README.md b/packages/components/src/dropdown-menu/README.md
index dcdb30997038eb..f1b664efc09a29 100644
--- a/packages/components/src/dropdown-menu/README.md
+++ b/packages/components/src/dropdown-menu/README.md
@@ -4,11 +4,6 @@ The DropdownMenu displays a list of actions (each contained in a MenuItem, MenuI
 
 ![An expanded DropdownMenu, containing a list of MenuItems.](https://wordpress.org/gutenberg/files/2019/01/DropdownMenuExample.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-
 ## Anatomy
 
 ![Anatomy of a DropdownMenu.](https://wordpress.org/gutenberg/files/2019/01/DropdownMenuAnatomy.png)
diff --git a/packages/components/src/dropdown-menu/index.native.js b/packages/components/src/dropdown-menu/index.native.js
index 1f60e0f67cf088..1e9d6569afc932 100644
--- a/packages/components/src/dropdown-menu/index.native.js
+++ b/packages/components/src/dropdown-menu/index.native.js
@@ -1,12 +1,11 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import { Platform } from 'react-native';
 /**
  * WordPress dependencies
  */
-import { BottomSheet, PanelBody } from '@wordpress/components';
 import { withPreferredColorScheme } from '@wordpress/compose';
 import { menu } from '@wordpress/icons';
 
@@ -15,6 +14,8 @@ import { menu } from '@wordpress/icons';
  */
 import Button from '../button';
 import Dropdown from '../dropdown';
+import BottomSheet from '../mobile/bottom-sheet';
+import PanelBody from '../panel/body';
 
 function mergeProps( defaultProps = {}, props = {} ) {
 	const mergedProps = {
@@ -23,10 +24,7 @@ function mergeProps( defaultProps = {}, props = {} ) {
 	};
 
 	if ( props.className && defaultProps.className ) {
-		mergedProps.className = classnames(
-			props.className,
-			defaultProps.className
-		);
+		mergedProps.className = clsx( props.className, defaultProps.className );
 	}
 
 	return mergedProps;
@@ -72,17 +70,14 @@ function DropdownMenu( {
 
 	return (
 		<Dropdown
-			className={ classnames( 'components-dropdown-menu', className ) }
+			className={ clsx( 'components-dropdown-menu', className ) }
 			popoverProps={ mergedPopoverProps }
 			renderToggle={ ( { isOpen, onToggle } ) => {
 				const mergedToggleProps = mergeProps(
 					{
-						className: classnames(
-							'components-dropdown-menu__toggle',
-							{
-								'is-opened': isOpen,
-							}
-						),
+						className: clsx( 'components-dropdown-menu__toggle', {
+							'is-opened': isOpen,
+						} ),
 					},
 					toggleProps
 				);
@@ -108,7 +103,7 @@ function DropdownMenu( {
 			renderContent={ ( { isOpen, onClose, ...props } ) => {
 				return (
 					<BottomSheet
-						hideHeader={ true }
+						hideHeader
 						isVisible={ isOpen }
 						onClose={ onClose }
 					>
@@ -135,7 +130,7 @@ function DropdownMenu( {
 												} }
 												editable={ false }
 												icon={ control.icon }
-												leftAlign={ true }
+												leftAlign
 												isSelected={ control.isActive }
 												separatorType={
 													Platform.OS === 'android'
diff --git a/packages/components/src/dropdown-menu/index.tsx b/packages/components/src/dropdown-menu/index.tsx
index 5d0e69f528204a..0e4501be4839c0 100644
--- a/packages/components/src/dropdown-menu/index.tsx
+++ b/packages/components/src/dropdown-menu/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -30,10 +30,7 @@ function mergeProps<
 	};
 
 	if ( props.className && defaultProps.className ) {
-		mergedProps.className = classnames(
-			props.className,
-			defaultProps.className
-		);
+		mergedProps.className = clsx( props.className, defaultProps.className );
 	}
 
 	return mergedProps;
@@ -113,12 +110,9 @@ function UnconnectedDropdownMenu( dropdownMenuProps: DropdownMenuProps ) {
 
 				const mergedToggleProps = mergeProps(
 					{
-						className: classnames(
-							'components-dropdown-menu__toggle',
-							{
-								'is-opened': isOpen,
-							}
-						),
+						className: clsx( 'components-dropdown-menu__toggle', {
+							'is-opened': isOpen,
+						} ),
 					},
 					restToggleProps
 				);
@@ -157,10 +151,9 @@ function UnconnectedDropdownMenu( dropdownMenuProps: DropdownMenuProps ) {
 				const mergedMenuProps = mergeProps(
 					{
 						'aria-label': label,
-						className: classnames(
-							'components-dropdown-menu__menu',
-							{ 'no-icons': noIcons }
-						),
+						className: clsx( 'components-dropdown-menu__menu', {
+							'no-icons': noIcons,
+						} ),
 					},
 					menuProps
 				);
@@ -182,7 +175,7 @@ function UnconnectedDropdownMenu( dropdownMenuProps: DropdownMenuProps ) {
 											control.onClick();
 										}
 									} }
-									className={ classnames(
+									className={ clsx(
 										'components-dropdown-menu__menu-item',
 										{
 											'has-separator':
@@ -206,6 +199,7 @@ function UnconnectedDropdownMenu( dropdownMenuProps: DropdownMenuProps ) {
 											? control.role
 											: 'menuitem'
 									}
+									accessibleWhenDisabled
 									disabled={ control.isDisabled }
 								>
 									{ control.title }
diff --git a/packages/components/src/dropdown-menu/stories/index.story.tsx b/packages/components/src/dropdown-menu/stories/index.story.tsx
index d4b856380db92a..dd4907bd0b96b1 100644
--- a/packages/components/src/dropdown-menu/stories/index.story.tsx
+++ b/packages/components/src/dropdown-menu/stories/index.story.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import type { Meta, StoryFn } from '@storybook/react';
+import type { Meta, StoryObj } from '@storybook/react';
 
 /**
  * Internal dependencies
@@ -43,39 +43,35 @@ const meta: Meta< typeof DropdownMenu > = {
 };
 export default meta;
 
-const Template: StoryFn< typeof DropdownMenu > = ( props ) => (
-	<div style={ { height: 150 } }>
-		<DropdownMenu { ...props } />
-	</div>
-);
-
-export const Default = Template.bind( {} );
-Default.args = {
-	label: 'Select a direction.',
-	icon: menu,
-	controls: [
-		{
-			title: 'First Menu Item Label',
-			icon: arrowUp,
-			// eslint-disable-next-line no-console
-			onClick: () => console.log( 'up!' ),
-		},
-		{
-			title: 'Second Menu Item Label',
-			icon: arrowDown,
-			// eslint-disable-next-line no-console
-			onClick: () => console.log( 'down!' ),
-		},
-	],
+export const Default: StoryObj< typeof DropdownMenu > = {
+	args: {
+		label: 'Select a direction.',
+		icon: menu,
+		controls: [
+			{
+				title: 'First Menu Item Label',
+				icon: arrowUp,
+				// eslint-disable-next-line no-console
+				onClick: () => console.log( 'up!' ),
+			},
+			{
+				title: 'Second Menu Item Label',
+				icon: arrowDown,
+				// eslint-disable-next-line no-console
+				onClick: () => console.log( 'down!' ),
+			},
+		],
+	},
 };
 
-export const WithChildren = Template.bind( {} );
-// Adding custom source because Storybook is not able to show the contents of
-// the `children` prop correctly in the code snippet.
-WithChildren.parameters = {
-	docs: {
-		source: {
-			code: `<DropdownMenu label="Select a direction." icon={ more }>
+export const WithChildren: StoryObj< typeof DropdownMenu > = {
+	...Default,
+	// Adding custom source because Storybook is not able to show the contents of
+	// the `children` prop correctly in the code snippet.
+	parameters: {
+		docs: {
+			source: {
+				code: `<DropdownMenu label="Select a direction." icon={ more }>
   <MenuGroup>
     <MenuItem icon={ arrowUp } onClick={ onClose }>
       Move Up
@@ -90,29 +86,33 @@ WithChildren.parameters = {
     </MenuItem>
   </MenuGroup>
 </DropdownMenu>`,
-			language: 'jsx',
-			type: 'auto',
+				language: 'jsx',
+				type: 'auto',
+			},
 		},
 	},
-};
-WithChildren.args = {
-	label: 'Select a direction.',
-	icon: more,
-	children: ( { onClose } ) => (
-		<>
-			<MenuGroup>
+	args: {
+		label: 'Select a direction.',
+		icon: more,
+		children: ( { onClose } ) => (
+			<>
 				<MenuItem icon={ arrowUp } onClick={ onClose }>
-					Move Up
-				</MenuItem>
-				<MenuItem icon={ arrowDown } onClick={ onClose }>
-					Move Down
+					Standalone Item
 				</MenuItem>
-			</MenuGroup>
-			<MenuGroup>
-				<MenuItem icon={ trash } onClick={ onClose }>
-					Remove
-				</MenuItem>
-			</MenuGroup>
-		</>
-	),
+				<MenuGroup>
+					<MenuItem icon={ arrowUp } onClick={ onClose }>
+						Move Up
+					</MenuItem>
+					<MenuItem icon={ arrowDown } onClick={ onClose }>
+						Move Down
+					</MenuItem>
+				</MenuGroup>
+				<MenuGroup>
+					<MenuItem icon={ trash } onClick={ onClose }>
+						Remove
+					</MenuItem>
+				</MenuGroup>
+			</>
+		),
+	},
 };
diff --git a/packages/components/src/dropdown-menu/style.scss b/packages/components/src/dropdown-menu/style.scss
index 261662ab7256dc..1c716d80410e12 100644
--- a/packages/components/src/dropdown-menu/style.scss
+++ b/packages/components/src/dropdown-menu/style.scss
@@ -60,29 +60,4 @@
 		padding-right: $grid-unit-10;
 	}
 
-	.components-menu-group {
-		padding: $grid-unit-10;
-		margin-top: 0;
-		margin-bottom: 0;
-		margin-left: -$grid-unit-10;
-		margin-right: -$grid-unit-10;
-
-		&:first-child {
-			margin-top: -$grid-unit-10;
-		}
-
-		&:last-child {
-			margin-bottom: -$grid-unit-10;
-		}
-	}
-
-	.components-menu-group + .components-menu-group {
-		margin-top: 0;
-		border-top: $border-width solid $gray-400;
-		padding: $grid-unit-10;
-
-		.is-alternate & {
-			border-color: $gray-900;
-		}
-	}
 }
diff --git a/packages/components/src/dropdown/index.tsx b/packages/components/src/dropdown/index.tsx
index 0527f4f0c2cd8d..3530d3b1e8de23 100644
--- a/packages/components/src/dropdown/index.tsx
+++ b/packages/components/src/dropdown/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef } from 'react';
 
 /**
@@ -142,7 +142,7 @@ const UnconnectedDropdown = (
 					}
 					variant={ variant }
 					{ ...popoverProps }
-					className={ classnames(
+					className={ clsx(
 						'components-dropdown__content',
 						popoverProps?.className,
 						contentClassName
diff --git a/packages/components/src/dropdown/stories/index.story.tsx b/packages/components/src/dropdown/stories/index.story.tsx
index 894f62ee47f8d7..0f07664787cc33 100644
--- a/packages/components/src/dropdown/stories/index.story.tsx
+++ b/packages/components/src/dropdown/stories/index.story.tsx
@@ -1,13 +1,15 @@
 /**
  * External dependencies
  */
-import type { Meta, StoryFn } from '@storybook/react';
+import type { Meta, StoryObj } from '@storybook/react';
 
 /**
  * Internal dependencies
  */
 import Dropdown from '..';
 import Button from '../../button';
+import MenuGroup from '../../menu-group';
+import MenuItem from '../../menu-item';
 import { DropdownContentWrapper } from '../dropdown-content-wrapper';
 
 const meta: Meta< typeof Dropdown > = {
@@ -39,34 +41,37 @@ const meta: Meta< typeof Dropdown > = {
 };
 export default meta;
 
-const Template: StoryFn< typeof Dropdown > = ( args ) => (
-	<div style={ { height: 150 } }>
-		<Dropdown { ...args } />
-	</div>
-);
-
-export const Default = Template.bind( {} );
-Default.args = {
-	renderToggle: ( { isOpen, onToggle } ) => (
-		<Button onClick={ onToggle } aria-expanded={ isOpen } variant="primary">
-			Open dropdown
-		</Button>
-	),
-	renderContent: () => <div>This is the dropdown content.</div>,
+export const Default: StoryObj< typeof Dropdown > = {
+	args: {
+		renderToggle: ( { isOpen, onToggle } ) => (
+			<Button
+				onClick={ onToggle }
+				aria-expanded={ isOpen }
+				variant="primary"
+			>
+				Open dropdown
+			</Button>
+		),
+		renderContent: () => <div>This is the dropdown content.</div>,
+	},
 };
 
 /**
  * To apply more padding to the dropdown content, use the provided `<DropdownContentWrapper>`
  * convenience wrapper. A `paddingSize` of `"medium"` is suitable for relatively larger dropdowns (default is `"small"`).
  */
-export const WithMorePadding = Template.bind( {} );
-WithMorePadding.args = {
-	...Default.args,
-	renderContent: () => (
-		<DropdownContentWrapper paddingSize="medium">
-			Content wrapped with <code>{ `paddingSize="medium"` }</code>.
-		</DropdownContentWrapper>
-	),
+export const WithMorePadding: StoryObj< typeof Dropdown > = {
+	...Default,
+	args: {
+		...Default.args,
+		renderContent: () => (
+			<DropdownContentWrapper paddingSize="medium">
+				{ /* eslint-disable react/no-unescaped-entities */ }
+				Content wrapped with <code>paddingSize="medium"</code>.
+				{ /* eslint-enable react/no-unescaped-entities */ }
+			</DropdownContentWrapper>
+		),
+	},
 };
 
 /**
@@ -74,12 +79,36 @@ WithMorePadding.args = {
  * with a `paddingSize` of `"none"`. This can also serve as a clean foundation to add arbitrary
  * paddings, for example when child components already have padding on their own.
  */
-export const WithNoPadding = Template.bind( {} );
-WithNoPadding.args = {
-	...Default.args,
-	renderContent: () => (
-		<DropdownContentWrapper paddingSize="none">
-			Content wrapped with <code>{ `paddingSize="none"` }</code>.
-		</DropdownContentWrapper>
-	),
+export const WithNoPadding: StoryObj< typeof Dropdown > = {
+	...Default,
+	args: {
+		...Default.args,
+		renderContent: () => (
+			<DropdownContentWrapper paddingSize="none">
+				{ /* eslint-disable react/no-unescaped-entities */ }
+				Content wrapped with <code>paddingSize="none"</code>.
+				{ /* eslint-enable react/no-unescaped-entities */ }
+			</DropdownContentWrapper>
+		),
+	},
+};
+
+export const WithMenuItems: StoryObj< typeof Dropdown > = {
+	...Default,
+	args: {
+		...Default.args,
+		renderContent: () => (
+			<>
+				<MenuItem>Standalone Item</MenuItem>
+				<MenuGroup label="Group 1">
+					<MenuItem>Item 1</MenuItem>
+					<MenuItem>Item 2</MenuItem>
+				</MenuGroup>
+				<MenuGroup label="Group 2">
+					<MenuItem>Item 1</MenuItem>
+					<MenuItem>Item 2</MenuItem>
+				</MenuGroup>
+			</>
+		),
+	},
 };
diff --git a/packages/components/src/dropdown/style.scss b/packages/components/src/dropdown/style.scss
index f3b0570eca1d84..d7ae7963f7ed8c 100644
--- a/packages/components/src/dropdown/style.scss
+++ b/packages/components/src/dropdown/style.scss
@@ -5,9 +5,32 @@
 .components-dropdown__content {
 	.components-popover__content {
 		padding: $grid-unit-10;
+
+		&:has(.components-menu-group) {
+			padding: 0;
+
+			.components-dropdown-menu__menu > .components-menu-item__button,
+			> .components-menu-item__button {
+				margin: $grid-unit-10;
+				width: auto;
+			}
+		}
 	}
 
 	[role="menuitem"] {
 		white-space: nowrap;
 	}
+
+	.components-menu-group {
+		padding: $grid-unit-10;
+	}
+
+	.components-menu-group + .components-menu-group {
+		border-top: $border-width solid $gray-400;
+		padding: $grid-unit-10;
+	}
+
+	&.is-alternate .components-menu-group + .components-menu-group {
+		border-color: $gray-900;
+	}
 }
diff --git a/packages/components/src/dropdown/styles.ts b/packages/components/src/dropdown/styles.ts
index 6d5412f9a81213..24f4de4b4c6c92 100644
--- a/packages/components/src/dropdown/styles.ts
+++ b/packages/components/src/dropdown/styles.ts
@@ -11,7 +11,9 @@ import { space } from '../utils/space';
 import type { DropdownContentWrapperProps } from './types';
 
 const padding = ( { paddingSize = 'small' }: DropdownContentWrapperProps ) => {
-	if ( paddingSize === 'none' ) return;
+	if ( paddingSize === 'none' ) {
+		return;
+	}
 
 	const paddingValues = {
 		small: space( 2 ),
diff --git a/packages/components/src/duotone-picker/duotone-picker.tsx b/packages/components/src/duotone-picker/duotone-picker.tsx
index 759c517b4759e1..ee54c9cdf4235e 100644
--- a/packages/components/src/duotone-picker/duotone-picker.tsx
+++ b/packages/components/src/duotone-picker/duotone-picker.tsx
@@ -91,7 +91,7 @@ function DuotonePicker( {
 		/>
 	);
 
-	const options = duotonePalette.map( ( { colors, slug, name } ) => {
+	const duotoneOptions = duotonePalette.map( ( { colors, slug, name } ) => {
 		const style = {
 			background: getGradientFromCSSColors( colors, '135deg' ),
 			color: 'transparent',
@@ -155,11 +155,15 @@ function DuotonePicker( {
 		}
 	}
 
+	const options = unsetable
+		? [ unsetOption, ...duotoneOptions ]
+		: duotoneOptions;
+
 	return (
 		<CircularOptionPicker
 			{ ...otherProps }
 			{ ...metaProps }
-			options={ unsetable ? [ unsetOption, ...options ] : options }
+			options={ options }
 			actions={
 				!! clearable && (
 					<CircularOptionPicker.ButtonAction
@@ -170,7 +174,7 @@ function DuotonePicker( {
 				)
 			}
 		>
-			<Spacer paddingTop={ 4 }>
+			<Spacer paddingTop={ options.length === 0 ? 0 : 4 }>
 				<VStack spacing={ 3 }>
 					{ ! disableCustomColors && ! disableCustomDuotone && (
 						<CustomDuotoneBar
diff --git a/packages/components/src/duotone-picker/utils.ts b/packages/components/src/duotone-picker/utils.ts
index 06d371902f882b..3f3eb1fd1eb247 100644
--- a/packages/components/src/duotone-picker/utils.ts
+++ b/packages/components/src/duotone-picker/utils.ts
@@ -31,7 +31,9 @@ export function getDefaultColors(
 	palette: DuotonePickerProps[ 'colorPalette' ]
 ) {
 	// A default dark and light color are required.
-	if ( ! palette || palette.length < 2 ) return [ '#000', '#fff' ];
+	if ( ! palette || palette.length < 2 ) {
+		return [ '#000', '#fff' ];
+	}
 
 	return palette
 		.map( ( { color } ) => ( {
diff --git a/packages/components/src/elevation/hook.ts b/packages/components/src/elevation/hook.ts
index 1eeda29cb600f2..ce95de6ef6b67d 100644
--- a/packages/components/src/elevation/hook.ts
+++ b/packages/components/src/elevation/hook.ts
@@ -15,7 +15,7 @@ import { useMemo } from '@wordpress/element';
 import type { WordPressComponentProps } from '../context';
 import { useContextSystem } from '../context';
 import * as styles from './styles';
-import { CONFIG, reduceMotion } from '../utils';
+import { CONFIG } from '../utils';
 import { useCx } from '../utils/hooks/use-cx';
 import { isValueDefined } from '../utils/values';
 import type { ElevationProps } from './types';
@@ -76,9 +76,12 @@ export function useElevation(
 				left: offset,
 				right: offset,
 				top: offset,
-				transition,
 			},
-			reduceMotion( 'transition' )
+			css`
+				@media not ( prefers-reduced-motion ) {
+					transition: ${ transition };
+				}
+			`
 		);
 
 		if ( isValueDefined( hoverValue ) ) {
diff --git a/packages/components/src/elevation/test/__snapshots__/index.tsx.snap b/packages/components/src/elevation/test/__snapshots__/index.tsx.snap
index 248fe4dbd25823..2c78ed92d491b5 100644
--- a/packages/components/src/elevation/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/elevation/test/__snapshots__/index.tsx.snap
@@ -15,13 +15,12 @@ exports[`props should render active 1`] = `
   left: 0;
   right: 0;
   top: 0;
-  -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-0 {
-    transition-duration: 0ms;
+    -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
+    transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
   }
 }
 
@@ -57,13 +56,12 @@ exports[`props should render correctly 1`] = `
   left: 0;
   right: 0;
   top: 0;
-  -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-0 {
-    transition-duration: 0ms;
+    -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
+    transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
   }
 }
 
@@ -91,13 +89,12 @@ exports[`props should render hover 1`] = `
   left: 0;
   right: 0;
   top: 0;
-  -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-0 {
-    transition-duration: 0ms;
+    -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
+    transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
   }
 }
 
@@ -129,13 +126,12 @@ exports[`props should render isInteractive 1`] = `
   left: 0;
   right: 0;
   top: 0;
-  -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-0 {
-    transition-duration: 0ms;
+    -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
+    transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
   }
 }
 
@@ -171,13 +167,12 @@ exports[`props should render offset 1`] = `
   left: -2px;
   right: -2px;
   top: -2px;
-  -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-0 {
-    transition-duration: 0ms;
+    -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
+    transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
   }
 }
 
@@ -213,13 +208,12 @@ exports[`props should render value 1`] = `
   left: 0;
   right: 0;
   top: 0;
-  -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
-  transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-0 {
-    transition-duration: 0ms;
+    -webkit-transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
+    transition: box-shadow 200ms cubic-bezier(0.08, 0.52, 0.52, 1);
   }
 }
 
diff --git a/packages/components/src/external-link/index.tsx b/packages/components/src/external-link/index.tsx
index 312aa88f491d24..0927effb3ae672 100644
--- a/packages/components/src/external-link/index.tsx
+++ b/packages/components/src/external-link/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef } from 'react';
 
 /**
@@ -9,13 +9,10 @@ import type { ForwardedRef } from 'react';
  */
 import { __ } from '@wordpress/i18n';
 import { forwardRef } from '@wordpress/element';
-import { external } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
-import { VisuallyHidden } from '../visually-hidden';
-import { StyledIcon } from './styles/external-link-styles';
 import type { ExternalLinkProps } from './types';
 import type { WordPressComponentProps } from '../context';
 
@@ -37,7 +34,7 @@ function UnforwardedExternalLink(
 			].filter( Boolean )
 		),
 	].join( ' ' );
-	const classes = classnames( 'components-external-link', className );
+	const classes = clsx( 'components-external-link', className );
 	/* Anchor links are perceived as external links.
 	This constant helps check for on page anchor links,
 	to prevent them from being opened in the editor. */
@@ -66,17 +63,18 @@ function UnforwardedExternalLink(
 			rel={ optimizedRel }
 			ref={ ref }
 		>
-			{ children }
-			<VisuallyHidden as="span">
-				{
+			<span className="components-external-link__contents">
+				{ children }
+			</span>
+			<span
+				className="components-external-link__icon"
+				aria-label={
 					/* translators: accessibility text */
 					__( '(opens in a new tab)' )
 				}
-			</VisuallyHidden>
-			<StyledIcon
-				icon={ external }
-				className="components-external-link__icon"
-			/>
+			>
+				&#8599;
+			</span>
 		</a>
 		/* eslint-enable react/jsx-no-target-blank */
 	);
diff --git a/packages/components/src/external-link/style.scss b/packages/components/src/external-link/style.scss
new file mode 100644
index 00000000000000..6af3b0e991e710
--- /dev/null
+++ b/packages/components/src/external-link/style.scss
@@ -0,0 +1,12 @@
+.components-external-link {
+	text-decoration: none;
+}
+
+.components-external-link__contents {
+	text-decoration: underline;
+}
+
+.components-external-link__icon {
+	margin-left: 0.5ch;
+	font-weight: 400;
+}
diff --git a/packages/components/src/external-link/styles/external-link-styles.ts b/packages/components/src/external-link/styles/external-link-styles.ts
deleted file mode 100644
index 6b64fd61c8bad4..00000000000000
--- a/packages/components/src/external-link/styles/external-link-styles.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * External dependencies
- */
-import styled from '@emotion/styled';
-
-/**
- * WordPress dependencies
- */
-import { Icon } from '@wordpress/icons';
-
-export const StyledIcon = styled( Icon )`
-	width: 1em;
-	height: 1em;
-	margin: 0;
-	vertical-align: middle;
-	fill: currentColor;
-`;
diff --git a/packages/components/src/flex/flex/README.md b/packages/components/src/flex/flex/README.md
index b72a9b19424f77..ef36e2700ea304 100644
--- a/packages/components/src/flex/flex/README.md
+++ b/packages/components/src/flex/flex/README.md
@@ -53,14 +53,14 @@ Spacing in between each child can be adjusted by using `gap`. The value of `gap`
 -   Required: No
 -   Default: `2`
 
-##### `justify`: `CSSProperties['justifyContent']`
+### `justify`: `CSSProperties['justifyContent']`
 
 Horizontally aligns content if the `direction` is `row`, or vertically aligns content if the `direction` is `column`.
 
 -   Required: No
 -   Default: `space-between`
 
-##### `wrap`: `boolean`
+### `wrap`: `boolean`
 
 Determines if children should wrap.
 
diff --git a/packages/components/src/flex/flex/hook.ts b/packages/components/src/flex/flex/hook.ts
index df53667915999c..f5648c187c7628 100644
--- a/packages/components/src/flex/flex/hook.ts
+++ b/packages/components/src/flex/flex/hook.ts
@@ -22,7 +22,7 @@ import type { FlexProps } from '../types';
 
 function useDeprecatedProps(
 	props: WordPressComponentProps< FlexProps, 'div' >
-): WordPressComponentProps< FlexProps, 'div' > {
+): Omit< typeof props, 'isReversed' > {
 	const { isReversed, ...otherProps } = props;
 
 	if ( typeof isReversed !== 'undefined' ) {
diff --git a/packages/components/src/flex/test/__snapshots__/index.tsx.snap b/packages/components/src/flex/test/__snapshots__/index.tsx.snap
index 072b70ff9cb806..f963bf0fd7167d 100644
--- a/packages/components/src/flex/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/flex/test/__snapshots__/index.tsx.snap
@@ -7,25 +7,25 @@ Snapshot Diff:
 
 @@ -1,22 +1,18 @@
   <div
-    class="components-flex css-j6raph-View-Flex-base-ItemsRow e19lxcc00"
+    class="components-flex css-1hwd9hm-PolymorphicDiv-Flex-base-ItemsRow e19lxcc00"
 -   data-testid="flex"
 +   data-testid="base-flex"
     data-wp-c16t="true"
     data-wp-component="Flex"
   >
     <div
-      class="components-flex-item css-mw3lhz-View-Item-sx-Base e19lxcc00"
+      class="components-flex-item css-eno349-PolymorphicDiv-Item-sx-Base e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="FlexItem"
     >
       Item
     </div>
 -   <div
--     class="css-1mm2cvy-View e19lxcc00"
+-     class="css-161q9d5-PolymorphicDiv e19lxcc00"
 -   />
 -   <div />
     <div
-      class="components-flex-item components-flex-block css-14wzr73-View-Item-sx-Base-block e19lxcc00"
+      class="components-flex-item components-flex-block css-10m3u8l-PolymorphicDiv-Item-sx-Base-block e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="FlexBlock"
     >
diff --git a/packages/components/src/focal-point-picker/README.md b/packages/components/src/focal-point-picker/README.md
index 9abb147831409a..baa6601d74dbcf 100644
--- a/packages/components/src/focal-point-picker/README.md
+++ b/packages/components/src/focal-point-picker/README.md
@@ -28,6 +28,7 @@ const Example = () => {
 	return (
 		<>
 			<FocalPointPicker
+			  __nextHasNoMarginBottom
 				url={ url }
 				value={ focalPoint }
 				onDragStart={ setFocalPoint }
@@ -98,3 +99,19 @@ Callback which is called at the start of drag operations.
 -   Required: No
 
 Function which is called before internal updates to the value state. It receives the upcoming value and may return a modified one.
+
+### `__next40pxDefaultSize`
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
+
+Start opting into the new margin-free styles that will become the default in a future version.
+
+### `__nextHasNoMarginBottom`
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
+
+Start opting into the new margin-free styles that will become the default in a future version.
\ No newline at end of file
diff --git a/packages/components/src/focal-point-picker/controls.tsx b/packages/components/src/focal-point-picker/controls.tsx
index f204d5736779cb..1ecf846b10635e 100644
--- a/packages/components/src/focal-point-picker/controls.tsx
+++ b/packages/components/src/focal-point-picker/controls.tsx
@@ -37,7 +37,9 @@ export default function FocalPointPickerControls( {
 		value: Parameters< UnitControlOnChangeCallback >[ 0 ],
 		axis: FocalPointAxis
 	) => {
-		if ( value === undefined ) return;
+		if ( value === undefined ) {
+			return;
+		}
 
 		const num = parseInt( value, 10 );
 
@@ -51,6 +53,7 @@ export default function FocalPointPickerControls( {
 			className="focal-point-picker__controls"
 			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
 			hasHelpText={ hasHelpText }
+			gap={ 4 }
 		>
 			<FocalPointUnitControl
 				label={ __( 'Left' ) }
@@ -85,6 +88,7 @@ export default function FocalPointPickerControls( {
 function FocalPointUnitControl( props: UnitControlProps ) {
 	return (
 		<StyledUnitControl
+			__next40pxDefaultSize
 			className="focal-point-picker__controls-position-unit-control"
 			labelPosition="top"
 			max={ TEXTCONTROL_MAX }
diff --git a/packages/components/src/focal-point-picker/focal-point.tsx b/packages/components/src/focal-point-picker/focal-point.tsx
index 5b82bef4bfb2ea..a03e41d4809cce 100644
--- a/packages/components/src/focal-point-picker/focal-point.tsx
+++ b/packages/components/src/focal-point-picker/focal-point.tsx
@@ -6,7 +6,6 @@ import { PointerCircle } from './styles/focal-point-style';
 /**
  * External dependencies
  */
-import classnames from 'classnames';
 import type { FocalPointProps } from './types';
 import type { WordPressComponentProps } from '../context';
 
@@ -15,11 +14,13 @@ export default function FocalPoint( {
 	top = '50%',
 	...props
 }: WordPressComponentProps< FocalPointProps, 'div' > ) {
-	const classes = classnames(
-		'components-focal-point-picker__icon_container'
-	);
-
 	const style = { left, top };
 
-	return <PointerCircle { ...props } className={ classes } style={ style } />;
+	return (
+		<PointerCircle
+			{ ...props }
+			className="components-focal-point-picker__icon_container"
+			style={ style }
+		/>
+	);
 }
diff --git a/packages/components/src/focal-point-picker/index.native.js b/packages/components/src/focal-point-picker/index.native.js
index 834c962eae7b1c..9a11673aa41bb0 100644
--- a/packages/components/src/focal-point-picker/index.native.js
+++ b/packages/components/src/focal-point-picker/index.native.js
@@ -12,7 +12,6 @@ import {
 	setFocalPointPickerTooltipShown,
 } from '@wordpress/react-native-bridge';
 import { __ } from '@wordpress/i18n';
-import { Image, UnitControl } from '@wordpress/components';
 import { useRef, useState, useMemo, useEffect } from '@wordpress/element';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 
@@ -24,6 +23,8 @@ import Tooltip from './tooltip';
 import styles from './style.scss';
 import { isVideoType } from './utils';
 import { clamp } from '../utils/math';
+import Image from '../mobile/image';
+import UnitControl from '../unit-control';
 
 const MIN_POSITION_VALUE = 0;
 const MAX_POSITION_VALUE = 100;
diff --git a/packages/components/src/focal-point-picker/index.tsx b/packages/components/src/focal-point-picker/index.tsx
index 65efdc322cf0c6..cad14aff5b693f 100644
--- a/packages/components/src/focal-point-picker/index.tsx
+++ b/packages/components/src/focal-point-picker/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -70,6 +70,7 @@ const GRID_OVERLAY_TIMEOUT = 600;
  * 	return (
  * 		<>
  * 			<FocalPointPicker
+ *        __nextHasNoMarginBottom
  * 				url={ url }
  * 				value={ focalPoint }
  * 				onDragStart={ setFocalPoint }
@@ -110,7 +111,9 @@ export function FocalPointPicker( {
 
 			// `value` can technically be undefined if getValueWithinDragArea() is
 			// called before dragAreaRef is set, but this shouldn't happen in reality.
-			if ( ! value ) return;
+			if ( ! value ) {
+				return;
+			}
 
 			onDragStart?.( value, event );
 			setPoint( value );
@@ -119,7 +122,9 @@ export function FocalPointPicker( {
 			// Prevents text-selection when dragging.
 			event.preventDefault();
 			const value = getValueWithinDragArea( event );
-			if ( ! value ) return;
+			if ( ! value ) {
+				return;
+			}
 			onDrag?.( value, event );
 			setPoint( value );
 		},
@@ -135,7 +140,9 @@ export function FocalPointPicker( {
 	const dragAreaRef = useRef< HTMLDivElement >( null );
 	const [ bounds, setBounds ] = useState( INITIAL_BOUNDS );
 	const refUpdateBounds = useRef( () => {
-		if ( ! dragAreaRef.current ) return;
+		if ( ! dragAreaRef.current ) {
+			return;
+		}
 
 		const { clientWidth: width, clientHeight: height } =
 			dragAreaRef.current;
@@ -149,7 +156,9 @@ export function FocalPointPicker( {
 
 	useEffect( () => {
 		const updateBounds = refUpdateBounds.current;
-		if ( ! dragAreaRef.current ) return;
+		if ( ! dragAreaRef.current ) {
+			return;
+		}
 
 		const { defaultView } = dragAreaRef.current.ownerDocument;
 		defaultView?.addEventListener( 'resize', updateBounds );
@@ -170,7 +179,9 @@ export function FocalPointPicker( {
 		clientY: number;
 		shiftKey: boolean;
 	} ) => {
-		if ( ! dragAreaRef.current ) return;
+		if ( ! dragAreaRef.current ) {
+			return;
+		}
 
 		const { top, left } = dragAreaRef.current.getBoundingClientRect();
 		let nextX = ( clientX - left ) / bounds.width;
@@ -202,8 +213,9 @@ export function FocalPointPicker( {
 			! [ 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight' ].includes(
 				code
 			)
-		)
+		) {
 			return;
+		}
 
 		event.preventDefault();
 		const value = { x, y };
@@ -216,14 +228,11 @@ export function FocalPointPicker( {
 	};
 
 	const focalPointPosition = {
-		left: x * bounds.width,
-		top: y * bounds.height,
+		left: x !== undefined ? x * bounds.width : 0.5 * bounds.width,
+		top: y !== undefined ? y * bounds.height : 0.5 * bounds.height,
 	};
 
-	const classes = classnames(
-		'components-focal-point-picker-control',
-		className
-	);
+	const classes = clsx( 'components-focal-point-picker-control', className );
 
 	const instanceId = useInstanceId( FocalPointPicker );
 	const id = `inspector-focal-point-picker-control-${ instanceId }`;
@@ -241,6 +250,7 @@ export function FocalPointPicker( {
 		<BaseControl
 			{ ...restProps }
 			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+			__associatedWPComponentName="FocalPointPicker"
 			label={ label }
 			id={ id }
 			help={ help }
@@ -252,7 +262,9 @@ export function FocalPointPicker( {
 					onKeyDown={ arrowKeyStep }
 					onMouseDown={ startDrag }
 					onBlur={ () => {
-						if ( isDragging ) endDrag();
+						if ( isDragging ) {
+							endDrag();
+						}
 					} }
 					ref={ dragAreaRef }
 					role="button"
diff --git a/packages/components/src/focal-point-picker/stories/index.story.tsx b/packages/components/src/focal-point-picker/stories/index.story.tsx
index ce93d3557060c9..42fd64b8e4d855 100644
--- a/packages/components/src/focal-point-picker/stories/index.story.tsx
+++ b/packages/components/src/focal-point-picker/stories/index.story.tsx
@@ -49,6 +49,9 @@ const Template: StoryFn< typeof FocalPointPicker > = ( {
 };
 
 export const Default = Template.bind( {} );
+Default.args = {
+	__nextHasNoMarginBottom: true,
+};
 
 export const Image = Template.bind( {} );
 Image.args = {
diff --git a/packages/components/src/focal-point-picker/styles/focal-point-picker-style.ts b/packages/components/src/focal-point-picker/styles/focal-point-picker-style.ts
index f405b02959f9d7..fba3eda2fb0f29 100644
--- a/packages/components/src/focal-point-picker/styles/focal-point-picker-style.ts
+++ b/packages/components/src/focal-point-picker/styles/focal-point-picker-style.ts
@@ -9,19 +9,20 @@ import styled from '@emotion/styled';
  */
 import { Flex } from '../../flex';
 import UnitControl from '../../unit-control';
-import { COLORS } from '../../utils';
+import { COLORS, CONFIG } from '../../utils';
 import type { FocalPointPickerControlsProps } from '../types';
 import { INITIAL_BOUNDS } from '../utils';
 
 export const MediaWrapper = styled.div`
 	background-color: transparent;
+	display: flex;
 	text-align: center;
 	width: 100%;
 `;
 
 export const MediaContainer = styled.div`
 	align-items: center;
-	box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.2 );
+	border-radius: ${ CONFIG.radiusSmall };
 	cursor: pointer;
 	display: inline-flex;
 	justify-content: center;
@@ -29,8 +30,21 @@ export const MediaContainer = styled.div`
 	position: relative;
 	height: 100%;
 
+	&:after {
+		border-radius: inherit;
+		bottom: 0;
+		box-shadow: inset 0 0 0 1px rgba( 0, 0, 0, 0.1 );
+		content: '';
+		left: 0;
+		pointer-events: none;
+		position: absolute;
+		right: 0;
+		top: 0;
+	}
+
 	img,
 	video {
+		border-radius: inherit;
 		box-sizing: border-box;
 		display: block;
 		height: auto;
@@ -45,6 +59,7 @@ export const MediaContainer = styled.div`
 
 export const MediaPlaceholder = styled.div`
 	background: ${ COLORS.gray[ 100 ] };
+	border-radius: inherit;
 	box-sizing: border-box;
 	height: ${ INITIAL_BOUNDS.height }px;
 	max-width: 280px;
@@ -53,7 +68,7 @@ export const MediaPlaceholder = styled.div`
 `;
 
 export const StyledUnitControl = styled( UnitControl )`
-	width: 100px;
+	width: 100%;
 `;
 
 const deprecatedBottomMargin = ( {
@@ -91,29 +106,31 @@ export const GridView = styled.div`
 	position: absolute;
 	top: 50%;
 	transform: translate3d( -50%, -50%, 0 );
-	transition: opacity 120ms linear;
 	z-index: 1;
 
+	@media not ( prefers-reduced-motion ) {
+		transition: opacity 100ms linear;
+	}
+
 	opacity: ${ ( { showOverlay }: { showOverlay?: boolean } ) =>
 		showOverlay ? 1 : 0 };
 `;
 
 export const GridLine = styled.div`
-	background: white;
-	box-shadow: 0 0 2px rgba( 0, 0, 0, 0.6 );
+	background: rgba( 255, 255, 255, 0.4 );
+	backdrop-filter: blur( 16px ) saturate( 180% );
 	position: absolute;
-	opacity: 0.4;
 	transform: translateZ( 0 );
 `;
 
 export const GridLineX = styled( GridLine )`
 	height: 1px;
-	left: 0;
-	right: 0;
+	left: 1px;
+	right: 1px;
 `;
 
 export const GridLineY = styled( GridLine )`
 	width: 1px;
-	top: 0;
-	bottom: 0;
+	top: 1px;
+	bottom: 1px;
 `;
diff --git a/packages/components/src/focal-point-picker/styles/focal-point-style.ts b/packages/components/src/focal-point-picker/styles/focal-point-style.ts
index 201924ec6f6c6e..ad1e8eeb286779 100644
--- a/packages/components/src/focal-point-picker/styles/focal-point-style.ts
+++ b/packages/components/src/focal-point-picker/styles/focal-point-style.ts
@@ -3,21 +3,36 @@
  */
 import styled from '@emotion/styled';
 
+/**
+ * Internal dependencies
+ */
+import { CONFIG } from '../../utils';
+
 export const PointerCircle = styled.div`
 	background-color: transparent;
 	cursor: grab;
-	height: 48px;
-	margin: -24px 0 0 -24px;
+	height: 40px;
+	margin: -20px 0 0 -20px;
 	position: absolute;
 	user-select: none;
-	width: 48px;
+	width: 40px;
 	will-change: transform;
 	z-index: 10000;
-	background: rgba( 255, 255, 255, 0.6 );
-	border-radius: 50%;
-	backdrop-filter: blur( 4px );
-	box-shadow: rgb( 0 0 0 / 20% ) 0px 0px 10px;
+	background: rgba( 255, 255, 255, 0.4 );
+	border: 1px solid rgba( 255, 255, 255, 0.4 );
+	border-radius: ${ CONFIG.radiusRound };
+	backdrop-filter: blur( 16px ) saturate( 180% );
+	box-shadow: rgb( 0 0 0 / 10% ) 0px 0px 8px;
+
+	@media not ( prefers-reduced-motion ) {
+		transition: transform 100ms linear;
+	}
 
 	${ ( { isDragging }: { isDragging: boolean } ) =>
-		isDragging && 'cursor: grabbing;' }
+		isDragging &&
+		`
+			box-shadow: rgb( 0 0 0 / 12% ) 0px 0px 10px;
+			transform: scale( 1.1 );
+			cursor: grabbing;
+			` }
 `;
diff --git a/packages/components/src/focal-point-picker/test/index.js b/packages/components/src/focal-point-picker/test/index.js
deleted file mode 100644
index d5c7946cffd860..00000000000000
--- a/packages/components/src/focal-point-picker/test/index.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * External dependencies
- */
-import { fireEvent, render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-/**
- * Internal dependencies
- */
-import Picker from '..';
-
-describe( 'FocalPointPicker', () => {
-	describe( 'focus and blur', () => {
-		it( 'clicking the draggable area should focus it', async () => {
-			const user = userEvent.setup();
-
-			const mockOnChange = jest.fn();
-
-			render( <Picker onChange={ mockOnChange } /> );
-
-			const draggableArea = screen.getByRole( 'button' );
-
-			await user.click( draggableArea );
-
-			expect( draggableArea ).toHaveFocus();
-		} );
-
-		it( 'should stop a drag operation when focus is lost', () => {
-			const mockOnDrag = jest.fn();
-			const mockOnDragEnd = jest.fn();
-			const mockOnChange = jest.fn();
-
-			render(
-				<Picker
-					onChange={ mockOnChange }
-					onDrag={ mockOnDrag }
-					onDragEnd={ mockOnDragEnd }
-				/>
-			);
-
-			const draggableArea = screen.getByRole( 'button' );
-
-			// `user-event` is not capable of testing drag interactions properly.
-			// we could consider using playwright instead.
-			fireEvent.mouseDown( draggableArea );
-
-			expect( mockOnDrag ).not.toHaveBeenCalled();
-			expect( mockOnDragEnd ).not.toHaveBeenCalled();
-
-			fireEvent.blur( draggableArea );
-			fireEvent.mouseMove( draggableArea );
-
-			expect( mockOnDrag ).not.toHaveBeenCalled();
-			expect( mockOnDragEnd ).toHaveBeenCalledTimes( 1 );
-		} );
-	} );
-
-	describe( 'drag gestures', () => {
-		it( 'should call onDragStart, onDrag, onDragEnd and onChange in that order', () => {
-			const logs = [];
-			const eventLogger = ( name, args ) => logs.push( { name, args } );
-			const events = [ 'onDragStart', 'onDrag', 'onDragEnd', 'onChange' ];
-			const handlers = {};
-			events.forEach( ( name ) => {
-				handlers[ name ] = ( ...all ) => eventLogger( name, all );
-			} );
-
-			render( <Picker { ...handlers } /> );
-
-			const dragArea = screen.getByRole( 'button' );
-
-			// `user-event` is not capable of testing drag interactions properly.
-			// we could consider using playwright instead.
-			fireEvent.mouseDown( dragArea );
-			fireEvent.mouseMove( dragArea );
-			fireEvent.mouseUp( dragArea );
-
-			expect(
-				events.reduce( ( last, eventName, index ) => {
-					return last && logs[ index ].name === eventName;
-				}, true )
-			).toBe( true );
-		} );
-	} );
-
-	describe( 'resolvePoint handling', () => {
-		it( 'should allow value altering', async () => {
-			const user = userEvent.setup();
-
-			const spyChange = jest.fn();
-			const spy = jest.fn();
-
-			render(
-				<Picker
-					value={ { x: 0.25, y: 0.25 } }
-					onChange={ spyChange }
-					resolvePoint={ () => {
-						spy();
-						return { x: 0.91, y: 0.42 };
-					} }
-				/>
-			);
-
-			// Click and press arrow up
-			const dragArea = screen.getByRole( 'button' );
-
-			await user.click( dragArea );
-			await user.keyboard( '[ArrowUp]' );
-
-			expect( spy ).toHaveBeenCalled();
-			expect( spyChange ).toHaveBeenLastCalledWith( {
-				x: 0.91,
-				y: 0.42,
-			} );
-		} );
-	} );
-
-	describe( 'controllability', () => {
-		it( 'should update value from props', () => {
-			const { rerender } = render(
-				<Picker value={ { x: 0.25, y: 0.5 } } />
-			);
-			const xInput = screen.getByRole( 'spinbutton', {
-				name: 'Focal point left position',
-			} );
-			rerender( <Picker value={ { x: 0.93, y: 0.5 } } /> );
-			expect( xInput.value ).toBe( '93' );
-		} );
-		it( 'call onChange with the expected values', async () => {
-			const user = userEvent.setup();
-
-			const spyChange = jest.fn();
-			render(
-				<Picker value={ { x: 0.14, y: 0.62 } } onChange={ spyChange } />
-			);
-			// Focus and press arrow up
-			const dragArea = screen.getByRole( 'button' );
-
-			await user.click( dragArea );
-			await user.keyboard( '[ArrowDown]' );
-
-			expect( spyChange ).toHaveBeenLastCalledWith( {
-				x: 0.14,
-				y: 0.63,
-			} );
-		} );
-	} );
-
-	describe( 'value handling', () => {
-		it( 'should handle legacy string values', () => {
-			const onChangeSpy = jest.fn();
-			render(
-				<Picker
-					value={ { x: '0.1', y: '0.2' } }
-					onChange={ onChangeSpy }
-				/>
-			);
-
-			expect(
-				screen.getByRole( 'spinbutton', {
-					name: 'Focal point left position',
-				} ).value
-			).toBe( '10' );
-			expect(
-				screen.getByRole( 'spinbutton', {
-					name: 'Focal point top position',
-				} ).value
-			).toBe( '20' );
-			expect( onChangeSpy ).not.toHaveBeenCalled();
-		} );
-	} );
-} );
diff --git a/packages/components/src/focal-point-picker/test/index.tsx b/packages/components/src/focal-point-picker/test/index.tsx
new file mode 100644
index 00000000000000..377ba6c4e9e6b3
--- /dev/null
+++ b/packages/components/src/focal-point-picker/test/index.tsx
@@ -0,0 +1,203 @@
+/**
+ * External dependencies
+ */
+import { fireEvent, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+/**
+ * Internal dependencies
+ */
+import _Picker from '..';
+import type { FocalPointPickerProps } from '../types';
+
+type Log = { name: string; args: unknown[] };
+type EventLogger = ( name: string, args: unknown[] ) => void;
+
+const Picker = ( props: React.ComponentProps< typeof _Picker > ) => {
+	return <_Picker { ...props } __nextHasNoMarginBottom />;
+};
+
+const props: FocalPointPickerProps = {
+	onChange: jest.fn(),
+	url: 'test-url',
+	value: {
+		x: 0,
+		y: 0,
+	},
+};
+
+describe( 'FocalPointPicker', () => {
+	describe( 'focus and blur', () => {
+		it( 'clicking the draggable area should focus it', async () => {
+			const user = userEvent.setup();
+
+			const mockOnChange = jest.fn();
+
+			render( <Picker { ...props } onChange={ mockOnChange } /> );
+
+			const draggableArea = screen.getByRole( 'button' );
+
+			await user.click( draggableArea );
+
+			expect( draggableArea ).toHaveFocus();
+		} );
+
+		it( 'should stop a drag operation when focus is lost', () => {
+			const mockOnDrag = jest.fn();
+			const mockOnDragEnd = jest.fn();
+			const mockOnChange = jest.fn();
+
+			render(
+				<Picker
+					{ ...props }
+					onChange={ mockOnChange }
+					onDrag={ mockOnDrag }
+					onDragEnd={ mockOnDragEnd }
+				/>
+			);
+
+			const draggableArea = screen.getByRole( 'button' );
+
+			// `user-event` is not capable of testing drag interactions properly.
+			// we could consider using playwright instead.
+			fireEvent.mouseDown( draggableArea );
+
+			expect( mockOnDrag ).not.toHaveBeenCalled();
+			expect( mockOnDragEnd ).not.toHaveBeenCalled();
+
+			fireEvent.blur( draggableArea );
+			fireEvent.mouseMove( draggableArea );
+
+			expect( mockOnDrag ).not.toHaveBeenCalled();
+			expect( mockOnDragEnd ).toHaveBeenCalledTimes( 1 );
+		} );
+	} );
+
+	describe( 'drag gestures', () => {
+		it( 'should call onDragStart, onDrag, onDragEnd and onChange in that order', () => {
+			const logs: Log[] = [];
+			const eventLogger: EventLogger = ( name, args ) =>
+				logs.push( { name, args } );
+			const events = [ 'onDragStart', 'onDrag', 'onDragEnd', 'onChange' ];
+			const handlers: { [ key: string ]: EventLogger } = {};
+			events.forEach( ( name ) => {
+				handlers[ name ] = ( ...all ) => eventLogger( name, all );
+			} );
+
+			render( <Picker { ...props } { ...handlers } /> );
+
+			const dragArea = screen.getByRole( 'button' );
+
+			// `user-event` is not capable of testing drag interactions properly.
+			// we could consider using playwright instead.
+			fireEvent.mouseDown( dragArea );
+			fireEvent.mouseMove( dragArea );
+			fireEvent.mouseUp( dragArea );
+
+			expect(
+				events.reduce( ( last, eventName, index ) => {
+					return last && logs[ index ].name === eventName;
+				}, true )
+			).toBe( true );
+		} );
+	} );
+
+	describe( 'resolvePoint handling', () => {
+		it( 'should allow value altering', async () => {
+			const user = userEvent.setup();
+
+			const spyChange = jest.fn();
+			const spy = jest.fn();
+
+			render(
+				<Picker
+					{ ...props }
+					value={ { x: 0.25, y: 0.25 } }
+					onChange={ spyChange }
+					resolvePoint={ () => {
+						spy();
+						return { x: 0.91, y: 0.42 };
+					} }
+				/>
+			);
+
+			// Click and press arrow up
+			const dragArea = screen.getByRole( 'button' );
+
+			await user.click( dragArea );
+			await user.keyboard( '[ArrowUp]' );
+
+			expect( spy ).toHaveBeenCalled();
+			expect( spyChange ).toHaveBeenLastCalledWith( {
+				x: 0.91,
+				y: 0.42,
+			} );
+		} );
+	} );
+
+	describe( 'controllability', () => {
+		it( 'should update value from props', () => {
+			const { rerender } = render(
+				<Picker { ...props } value={ { x: 0.25, y: 0.5 } } />
+			);
+			const xInput = screen.getByRole( 'spinbutton', {
+				name: 'Focal point left position',
+			} ) as HTMLButtonElement;
+			rerender( <Picker { ...props } value={ { x: 0.93, y: 0.5 } } /> );
+			expect( xInput.value ).toBe( '93' );
+		} );
+		it( 'call onChange with the expected values', async () => {
+			const user = userEvent.setup();
+
+			const spyChange = jest.fn();
+			render(
+				<Picker
+					{ ...props }
+					value={ { x: 0.14, y: 0.62 } }
+					onChange={ spyChange }
+				/>
+			);
+			// Focus and press arrow up
+			const dragArea = screen.getByRole( 'button' );
+
+			await user.click( dragArea );
+			await user.keyboard( '[ArrowDown]' );
+
+			expect( spyChange ).toHaveBeenLastCalledWith( {
+				x: 0.14,
+				y: 0.63,
+			} );
+		} );
+	} );
+
+	describe( 'value handling', () => {
+		it( 'should handle legacy string values', () => {
+			const onChangeSpy = jest.fn();
+			render(
+				<Picker
+					{ ...props }
+					value={ {
+						x: '0.1' as unknown as number,
+						y: '0.2' as unknown as number,
+					} }
+					onChange={ onChangeSpy }
+				/>
+			);
+			expect(
+				(
+					screen.getByRole( 'spinbutton', {
+						name: 'Focal point left position',
+					} ) as HTMLButtonElement
+				 ).value
+			).toBe( '10' );
+			expect(
+				(
+					screen.getByRole( 'spinbutton', {
+						name: 'Focal point top position',
+					} ) as HTMLButtonElement
+				 ).value
+			).toBe( '20' );
+			expect( onChangeSpy ).not.toHaveBeenCalled();
+		} );
+	} );
+} );
diff --git a/packages/components/src/focal-point-picker/test/media.js b/packages/components/src/focal-point-picker/test/media.js
deleted file mode 100644
index 25296424cf65e5..00000000000000
--- a/packages/components/src/focal-point-picker/test/media.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen } from '@testing-library/react';
-
-/**
- * Internal dependencies
- */
-import Media from '../media';
-
-describe( 'FocalPointPicker/Media', () => {
-	describe( 'Basic rendering', () => {
-		it( 'should render', () => {
-			render( <Media data-testid="media" /> );
-
-			expect( screen.getByTestId( 'media' ) ).toBeVisible();
-		} );
-	} );
-
-	describe( 'Media types', () => {
-		it( 'should render a placeholder by default', () => {
-			render( <Media data-testid="media" /> );
-
-			expect( screen.getByTestId( 'media' ) ).toHaveClass(
-				'components-focal-point-picker__media--placeholder'
-			);
-		} );
-
-		it( 'should render an video if src is a video file', () => {
-			const { rerender } = render(
-				<Media src="file.mp4" muted={ false } data-testid="media" />
-			);
-
-			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'VIDEO' );
-
-			rerender(
-				<Media src="file.ogg" muted={ false } data-testid="media" />
-			);
-
-			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'VIDEO' );
-
-			rerender(
-				<Media src="file.webm" muted={ false } data-testid="media" />
-			);
-
-			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'VIDEO' );
-		} );
-
-		it( 'should render an image file, if not video', () => {
-			const { rerender } = render(
-				<Media src="file.gif" data-testid="media" />
-			);
-
-			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'IMG' );
-
-			rerender(
-				<Media src="file.png" muted={ false } data-testid="media" />
-			);
-
-			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'IMG' );
-		} );
-	} );
-} );
diff --git a/packages/components/src/focal-point-picker/test/media.tsx b/packages/components/src/focal-point-picker/test/media.tsx
new file mode 100644
index 00000000000000..e2c03968f795d9
--- /dev/null
+++ b/packages/components/src/focal-point-picker/test/media.tsx
@@ -0,0 +1,68 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+
+/**
+ * Internal dependencies
+ */
+import Media from '../media';
+import type { FocalPointPickerMediaProps } from '../types';
+
+type FocalPointPickerMediaTestProps = FocalPointPickerMediaProps & {
+	'data-testid': string;
+};
+
+const props: FocalPointPickerMediaTestProps = {
+	alt: '',
+	src: '',
+	'data-testid': 'media',
+};
+
+describe( 'FocalPointPicker/Media', () => {
+	describe( 'Basic rendering', () => {
+		it( 'should render', () => {
+			render( <Media { ...props } /> );
+
+			expect( screen.getByTestId( 'media' ) ).toBeVisible();
+		} );
+	} );
+
+	describe( 'Media types', () => {
+		it( 'should render a placeholder by default', () => {
+			render( <Media { ...props } /> );
+
+			expect( screen.getByTestId( 'media' ) ).toHaveClass(
+				'components-focal-point-picker__media--placeholder'
+			);
+		} );
+
+		it( 'should render an video if src is a video file', () => {
+			const { rerender } = render(
+				<Media { ...props } src="file.mp4" muted={ false } />
+			);
+
+			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'VIDEO' );
+
+			rerender( <Media { ...props } src="file.ogg" muted={ false } /> );
+
+			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'VIDEO' );
+
+			rerender( <Media { ...props } src="file.webm" muted={ false } /> );
+
+			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'VIDEO' );
+		} );
+
+		it( 'should render an image file, if not video', () => {
+			const { rerender } = render(
+				<Media { ...props } src="file.gif" />
+			);
+
+			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'IMG' );
+
+			rerender( <Media { ...props } src="file.png" muted={ false } /> );
+
+			expect( screen.getByTestId( 'media' ).tagName ).toBe( 'IMG' );
+		} );
+	} );
+} );
diff --git a/packages/components/src/focal-point-picker/tooltip/index.native.js b/packages/components/src/focal-point-picker/tooltip/index.native.js
index 626fb130c43dce..a8e9e74abd0045 100644
--- a/packages/components/src/focal-point-picker/tooltip/index.native.js
+++ b/packages/components/src/focal-point-picker/tooltip/index.native.js
@@ -54,7 +54,7 @@ function Tooltip( { children, onPress, style, visible } ) {
 	);
 }
 
-function Label( { align, text, xOffset, yOffset } ) {
+function Label( { align = 'center', text, xOffset = 0, yOffset = 0 } ) {
 	const animationValue = useRef( new Animated.Value( 0 ) ).current;
 	const [ dimensions, setDimensions ] = useState( null );
 	const visible = useContext( TooltipContext );
@@ -139,12 +139,6 @@ function Label( { align, text, xOffset, yOffset } ) {
 	);
 }
 
-Label.defaultProps = {
-	align: 'center',
-	xOffset: 0,
-	yOffset: 0,
-};
-
 Tooltip.Label = Label;
 
 export default Tooltip;
diff --git a/packages/components/src/focal-point-picker/types.ts b/packages/components/src/focal-point-picker/types.ts
index 81b683b7ce16cb..357af1e090d7f5 100644
--- a/packages/components/src/focal-point-picker/types.ts
+++ b/packages/components/src/focal-point-picker/types.ts
@@ -26,6 +26,13 @@ export type FocalPointPickerProps = Pick<
 	 * @default false
 	 */
 	__nextHasNoMarginBottom?: boolean;
+	/**
+	 * Start opting into the larger default height that will become the default size in a future version.
+	 *
+	 * @deprecated Default behavior since WP 6.7. Prop can be safely removed.
+	 * @ignore
+	 */
+	__next40pxDefaultSize?: boolean;
 	/**
 	 * Autoplays HTML5 video. This only applies to video sources (`url`).
 	 *
diff --git a/packages/components/src/focal-point-picker/utils.ts b/packages/components/src/focal-point-picker/utils.ts
index 9ded459d2ac418..0fa5f5707e9248 100644
--- a/packages/components/src/focal-point-picker/utils.ts
+++ b/packages/components/src/focal-point-picker/utils.ts
@@ -34,7 +34,9 @@ export function getExtension( filename = '' ): string {
  * @return Whether the file is a video.
  */
 export function isVideoType( filename: string = '' ): boolean {
-	if ( ! filename ) return false;
+	if ( ! filename ) {
+		return false;
+	}
 	return (
 		filename.startsWith( 'data:video/' ) ||
 		VIDEO_EXTENSIONS.includes( getExtension( filename ) )
diff --git a/packages/components/src/font-size-picker/README.md b/packages/components/src/font-size-picker/README.md
index 56391ad0c7c33f..5d7fe2b39a7373 100644
--- a/packages/components/src/font-size-picker/README.md
+++ b/packages/components/src/font-size-picker/README.md
@@ -29,7 +29,6 @@ const MyFontSizePicker = () => {
 
 	return (
 		<FontSizePicker
-			__nextHasNoMarginBottom
 			fontSizes={ fontSizes }
 			value={ fontSize }
 			fallbackFontSize={ fallbackFontSize }
@@ -93,6 +92,7 @@ Size of the control.
 Available units for custom font size selection.
 
 -   Required: No
+-   Default: `[ 'px', 'em', 'rem', 'vw', 'vh' ]`
 
 ### `value`: `number | string`
 
@@ -114,9 +114,9 @@ If `true`, a slider will be displayed alongside the input field when a custom fo
 -   Required: no
 -   Default: `false`
 
-### `__nextHasNoMarginBottom`: `boolean`
+### `__next40pxDefaultSize`: `boolean`
 
-Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 6.4. (The prop can be safely removed once this happens.)
+Start opting into the larger default height that will become the default size in a future version.
 
--   Required: no
--   Default: `false`
+- Required: No
+- Default: `false`
diff --git a/packages/components/src/font-size-picker/font-size-picker-select.tsx b/packages/components/src/font-size-picker/font-size-picker-select.tsx
index d3fc2ffe4a61fd..19eaba1cfbecd0 100644
--- a/packages/components/src/font-size-picker/font-size-picker-select.tsx
+++ b/packages/components/src/font-size-picker/font-size-picker-select.tsx
@@ -27,6 +27,7 @@ const CUSTOM_OPTION: FontSizePickerSelectOption = {
 
 const FontSizePickerSelect = ( props: FontSizePickerSelectProps ) => {
 	const {
+		__next40pxDefaultSize,
 		fontSizes,
 		value,
 		disableCustomFontSizes,
@@ -55,7 +56,7 @@ const FontSizePickerSelect = ( props: FontSizePickerSelectProps ) => {
 				key: fontSize.slug,
 				name: fontSize.name || fontSize.slug,
 				value: fontSize.size,
-				__experimentalHint: hint,
+				hint,
 			};
 		} ),
 		...( disableCustomFontSizes ? [] : [ CUSTOM_OPTION ] ),
@@ -67,7 +68,7 @@ const FontSizePickerSelect = ( props: FontSizePickerSelectProps ) => {
 
 	return (
 		<CustomSelectControl
-			__nextUnconstrainedWidth
+			__next40pxDefaultSize={ __next40pxDefaultSize }
 			className="components-font-size-picker__select"
 			label={ __( 'Font size' ) }
 			hideLabelFromVision
@@ -78,7 +79,7 @@ const FontSizePickerSelect = ( props: FontSizePickerSelectProps ) => {
 			) }
 			options={ options }
 			value={ selectedOption }
-			__experimentalShowSelectedHint
+			showSelectedHint
 			onChange={ ( {
 				selectedItem,
 			}: {
diff --git a/packages/components/src/font-size-picker/font-size-picker-toggle-group.tsx b/packages/components/src/font-size-picker/font-size-picker-toggle-group.tsx
index 697d9e11b67e47..1e4cbcd1b72660 100644
--- a/packages/components/src/font-size-picker/font-size-picker-toggle-group.tsx
+++ b/packages/components/src/font-size-picker/font-size-picker-toggle-group.tsx
@@ -14,10 +14,11 @@ import { T_SHIRT_ABBREVIATIONS, T_SHIRT_NAMES } from './constants';
 import type { FontSizePickerToggleGroupProps } from './types';
 
 const FontSizePickerToggleGroup = ( props: FontSizePickerToggleGroupProps ) => {
-	const { fontSizes, value, __nextHasNoMarginBottom, size, onChange } = props;
+	const { fontSizes, value, __next40pxDefaultSize, size, onChange } = props;
 	return (
 		<ToggleGroupControl
-			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize={ __next40pxDefaultSize }
 			label={ __( 'Font size' ) }
 			hideLabelFromVision
 			value={ value }
diff --git a/packages/components/src/font-size-picker/index.native.js b/packages/components/src/font-size-picker/index.native.js
index 9659c1dbe225fa..b12a27296ca297 100644
--- a/packages/components/src/font-size-picker/index.native.js
+++ b/packages/components/src/font-size-picker/index.native.js
@@ -10,14 +10,14 @@ import { useNavigation } from '@react-navigation/native';
 import { useState } from '@wordpress/element';
 import { Icon, chevronRight, check } from '@wordpress/icons';
 import { __, sprintf } from '@wordpress/i18n';
-import { BottomSheet } from '@wordpress/components';
-import { getPxFromCssUnit } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
+import { default as getPxFromCssUnit } from '../mobile/utils/get-px-from-css-unit';
 import { default as UnitControl, useCustomUnits } from '../unit-control';
 import styles from './style.scss';
+import BottomSheet from '../mobile/bottom-sheet';
 
 const DEFAULT_FONT_SIZE = 16;
 
@@ -59,9 +59,15 @@ function FontSizePicker( {
 	const label = __( 'Font Size' );
 
 	const units = useCustomUnits( {
-		availableUnits: [ 'px', 'em', 'rem' ],
+		availableUnits: [ 'px', 'em', 'rem', 'vw', 'vh' ],
 	} );
 
+	const accessibilityLabel = sprintf(
+		// translators: %1$s: Font size name e.g. Small
+		__( 'Font Size, %1$s' ),
+		selectedOption.name
+	);
+
 	return (
 		<BottomSheet.SubSheet
 			navigationButton={
@@ -79,8 +85,8 @@ function FontSizePicker( {
 							: __( 'Default' )
 					}
 					onPress={ openSubSheet }
-					accessibilityRole={ 'button' }
-					accessibilityLabel={ selectedOption.name }
+					accessibilityRole="button"
+					accessibilityLabel={ accessibilityLabel }
 					accessibilityHint={ sprintf(
 						// translators: %s: Select control button label e.g. Small
 						__( 'Navigates to select %s' ),
@@ -105,9 +111,9 @@ function FontSizePicker( {
 						separatorType="none"
 						label={ __( 'Default' ) }
 						onPress={ onChangeValue( undefined ) }
-						leftAlign={ true }
-						key={ 'default' }
-						accessibilityRole={ 'button' }
+						leftAlign
+						key="default"
+						accessibilityRole="button"
 						accessibilityLabel={ __( 'Selected: Default' ) }
 						accessibilityHint={ __(
 							'Double tap to select default font size'
@@ -131,9 +137,9 @@ function FontSizePicker( {
 								label={ item.name }
 								subLabel={ item.sizePx }
 								onPress={ onChangeValue( item.sizePx ) }
-								leftAlign={ true }
+								leftAlign
 								key={ index }
-								accessibilityRole={ 'button' }
+								accessibilityRole="button"
 								accessibilityLabel={
 									item.sizePx === selectedValue
 										? sprintf(
diff --git a/packages/components/src/font-size-picker/index.tsx b/packages/components/src/font-size-picker/index.tsx
index e454b3093bf6a5..f93a09440a0688 100644
--- a/packages/components/src/font-size-picker/index.tsx
+++ b/packages/components/src/font-size-picker/index.tsx
@@ -6,7 +6,6 @@ import type { ForwardedRef } from 'react';
 /**
  * WordPress dependencies
  */
-import deprecated from '@wordpress/deprecated';
 import { __ } from '@wordpress/i18n';
 import { settings } from '@wordpress/icons';
 import { useState, useMemo, forwardRef } from '@wordpress/element';
@@ -31,80 +30,80 @@ import {
 	HeaderHint,
 	HeaderLabel,
 	HeaderToggle,
-	Controls,
 } from './styles';
 import { Spacer } from '../spacer';
 import FontSizePickerSelect from './font-size-picker-select';
 import FontSizePickerToggleGroup from './font-size-picker-toggle-group';
 import { T_SHIRT_NAMES } from './constants';
 
+const DEFAULT_UNITS = [ 'px', 'em', 'rem', 'vw', 'vh' ];
+
+const MAX_TOGGLE_GROUP_SIZES = 5;
+
 const UnforwardedFontSizePicker = (
 	props: FontSizePickerProps,
 	ref: ForwardedRef< any >
 ) => {
 	const {
-		/** Start opting into the new margin-free styles that will become the default in a future version. */
-		__nextHasNoMarginBottom = false,
+		__next40pxDefaultSize = false,
 		fallbackFontSize,
 		fontSizes = [],
 		disableCustomFontSizes = false,
 		onChange,
 		size = 'default',
-		units: unitsProp,
+		units: unitsProp = DEFAULT_UNITS,
 		value,
 		withSlider = false,
 		withReset = true,
 	} = props;
 
-	if ( ! __nextHasNoMarginBottom ) {
-		deprecated( 'Bottom margin styles for wp.components.FontSizePicker', {
-			since: '6.1',
-			version: '6.4',
-			hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version.',
-		} );
-	}
-
 	const units = useCustomUnits( {
-		availableUnits: unitsProp || [ 'px', 'em', 'rem' ],
+		availableUnits: unitsProp,
 	} );
 
-	const shouldUseSelectControl = fontSizes.length > 5;
 	const selectedFontSize = fontSizes.find(
 		( fontSize ) => fontSize.size === value
 	);
 	const isCustomValue = !! value && ! selectedFontSize;
 
-	const [ showCustomValueControl, setShowCustomValueControl ] = useState(
-		! disableCustomFontSizes && isCustomValue
-	);
+	// Initially request a custom picker if the value is not from the predef list.
+	const [ userRequestedCustom, setUserRequestedCustom ] =
+		useState( isCustomValue );
 
-	const headerHint = useMemo( () => {
-		if ( showCustomValueControl ) {
-			return __( 'Custom' );
-		}
-
-		if ( ! shouldUseSelectControl ) {
-			if ( selectedFontSize ) {
-				return (
-					selectedFontSize.name ||
-					T_SHIRT_NAMES[ fontSizes.indexOf( selectedFontSize ) ]
-				);
-			}
-			return '';
-		}
+	let currentPickerType;
+	if ( ! disableCustomFontSizes && userRequestedCustom ) {
+		// While showing the custom value picker, switch back to predef only if
+		// `disableCustomFontSizes` is set to `true`.
+		currentPickerType = 'custom' as const;
+	} else {
+		currentPickerType =
+			fontSizes.length > MAX_TOGGLE_GROUP_SIZES
+				? ( 'select' as const )
+				: ( 'togglegroup' as const );
+	}
 
-		const commonUnit = getCommonSizeUnit( fontSizes );
-		if ( commonUnit ) {
-			return `(${ commonUnit })`;
+	const headerHint = useMemo( () => {
+		switch ( currentPickerType ) {
+			case 'custom':
+				return __( 'Custom' );
+			case 'togglegroup':
+				if ( selectedFontSize ) {
+					return (
+						selectedFontSize.name ||
+						T_SHIRT_NAMES[ fontSizes.indexOf( selectedFontSize ) ]
+					);
+				}
+				break;
+			case 'select':
+				const commonUnit = getCommonSizeUnit( fontSizes );
+				if ( commonUnit ) {
+					return `(${ commonUnit })`;
+				}
+				break;
 		}
 
 		return '';
-	}, [
-		showCustomValueControl,
-		shouldUseSelectControl,
-		selectedFontSize,
-		fontSizes,
-	] );
+	}, [ currentPickerType, selectedFontSize, fontSizes ] );
 
 	if ( fontSizes.length === 0 && disableCustomFontSizes ) {
 		return null;
@@ -121,7 +120,8 @@ const UnforwardedFontSizePicker = (
 		units
 	);
 	const isValueUnitRelative =
-		!! valueUnit && [ 'em', 'rem' ].includes( valueUnit );
+		!! valueUnit && [ 'em', 'rem', 'vw', 'vh' ].includes( valueUnit );
+	const isDisabled = value === undefined;
 
 	return (
 		<Container ref={ ref } className="components-font-size-picker">
@@ -141,59 +141,49 @@ const UnforwardedFontSizePicker = (
 					{ ! disableCustomFontSizes && (
 						<HeaderToggle
 							label={
-								showCustomValueControl
+								currentPickerType === 'custom'
 									? __( 'Use size preset' )
 									: __( 'Set custom size' )
 							}
 							icon={ settings }
-							onClick={ () => {
-								setShowCustomValueControl(
-									! showCustomValueControl
-								);
-							} }
-							isPressed={ showCustomValueControl }
-							isSmall
+							onClick={ () =>
+								setUserRequestedCustom( ! userRequestedCustom )
+							}
+							isPressed={ currentPickerType === 'custom' }
+							size="small"
 						/>
 					) }
 				</Header>
 			</Spacer>
-			<Controls
-				className="components-font-size-picker__controls"
-				__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
-			>
-				{ !! fontSizes.length &&
-					shouldUseSelectControl &&
-					! showCustomValueControl && (
-						<FontSizePickerSelect
-							fontSizes={ fontSizes }
-							value={ value }
-							disableCustomFontSizes={ disableCustomFontSizes }
-							size={ size }
-							onChange={ ( newValue ) => {
-								if ( newValue === undefined ) {
-									onChange?.( undefined );
-								} else {
-									onChange?.(
-										hasUnits
-											? newValue
-											: Number( newValue ),
-										fontSizes.find(
-											( fontSize ) =>
-												fontSize.size === newValue
-										)
-									);
-								}
-							} }
-							onSelectCustom={ () =>
-								setShowCustomValueControl( true )
+			<div>
+				{ currentPickerType === 'select' && (
+					<FontSizePickerSelect
+						__next40pxDefaultSize={ __next40pxDefaultSize }
+						fontSizes={ fontSizes }
+						value={ value }
+						disableCustomFontSizes={ disableCustomFontSizes }
+						size={ size }
+						onChange={ ( newValue ) => {
+							if ( newValue === undefined ) {
+								onChange?.( undefined );
+							} else {
+								onChange?.(
+									hasUnits ? newValue : Number( newValue ),
+									fontSizes.find(
+										( fontSize ) =>
+											fontSize.size === newValue
+									)
+								);
 							}
-						/>
-					) }
-				{ ! shouldUseSelectControl && ! showCustomValueControl && (
+						} }
+						onSelectCustom={ () => setUserRequestedCustom( true ) }
+					/>
+				) }
+				{ currentPickerType === 'togglegroup' && (
 					<FontSizePickerToggleGroup
 						fontSizes={ fontSizes }
 						value={ value }
-						__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+						__next40pxDefaultSize={ __next40pxDefaultSize }
 						size={ size }
 						onChange={ ( newValue ) => {
 							if ( newValue === undefined ) {
@@ -210,15 +200,18 @@ const UnforwardedFontSizePicker = (
 						} }
 					/>
 				) }
-				{ ! disableCustomFontSizes && showCustomValueControl && (
+				{ currentPickerType === 'custom' && (
 					<Flex className="components-font-size-picker__custom-size-control">
 						<FlexItem isBlock>
 							<UnitControl
+								__next40pxDefaultSize={ __next40pxDefaultSize }
 								label={ __( 'Custom' ) }
 								labelPosition="top"
 								hideLabelFromVision
 								value={ value }
 								onChange={ ( newValue ) => {
+									setUserRequestedCustom( true );
+
 									if ( newValue === undefined ) {
 										onChange?.( undefined );
 									} else {
@@ -238,8 +231,9 @@ const UnforwardedFontSizePicker = (
 							<FlexItem isBlock>
 								<Spacer marginX={ 2 } marginBottom={ 0 }>
 									<RangeControl
-										__nextHasNoMarginBottom={
-											__nextHasNoMarginBottom
+										__nextHasNoMarginBottom
+										__next40pxDefaultSize={
+											__next40pxDefaultSize
 										}
 										className="components-font-size-picker__custom-input"
 										label={ __( 'Custom Size' ) }
@@ -248,6 +242,8 @@ const UnforwardedFontSizePicker = (
 										initialPosition={ fallbackFontSize }
 										withInputField={ false }
 										onChange={ ( newValue ) => {
+											setUserRequestedCustom( true );
+
 											if ( newValue === undefined ) {
 												onChange?.( undefined );
 											} else if ( hasUnits ) {
@@ -269,16 +265,18 @@ const UnforwardedFontSizePicker = (
 						{ withReset && (
 							<FlexItem>
 								<Button
-									disabled={ value === undefined }
+									disabled={ isDisabled }
+									accessibleWhenDisabled
 									onClick={ () => {
 										onChange?.( undefined );
 									} }
 									variant="secondary"
 									__next40pxDefaultSize
 									size={
-										size !== '__unstable-large'
-											? 'small'
-											: 'default'
+										size === '__unstable-large' ||
+										props.__next40pxDefaultSize
+											? 'default'
+											: 'small'
 									}
 								>
 									{ __( 'Reset' ) }
@@ -287,7 +285,7 @@ const UnforwardedFontSizePicker = (
 						) }
 					</Flex>
 				) }
-			</Controls>
+			</div>
 		</Container>
 	);
 };
diff --git a/packages/components/src/font-size-picker/stories/index.story.tsx b/packages/components/src/font-size-picker/stories/index.story.tsx
index 69043278389c75..eec8f5173d9655 100644
--- a/packages/components/src/font-size-picker/stories/index.story.tsx
+++ b/packages/components/src/font-size-picker/stories/index.story.tsx
@@ -66,7 +66,6 @@ const TwoFontSizePickersWithState: StoryFn< typeof FontSizePicker > = ( {
 export const Default: StoryFn< typeof FontSizePicker > =
 	FontSizePickerWithState.bind( {} );
 Default.args = {
-	__nextHasNoMarginBottom: true,
 	disableCustomFontSizes: false,
 	fontSizes: [
 		{
@@ -85,7 +84,6 @@ Default.args = {
 			size: 26,
 		},
 	],
-	units: [ 'px', 'em', 'rem' ],
 	value: 16,
 	withSlider: false,
 };
diff --git a/packages/components/src/font-size-picker/styles.ts b/packages/components/src/font-size-picker/styles.ts
index ef8ec8ebb30cb2..f47ca41b51eb71 100644
--- a/packages/components/src/font-size-picker/styles.ts
+++ b/packages/components/src/font-size-picker/styles.ts
@@ -36,10 +36,3 @@ export const HeaderLabel = styled( BaseControl.VisualLabel )`
 export const HeaderHint = styled.span`
 	color: ${ COLORS.gray[ 700 ] };
 `;
-
-export const Controls = styled.div< {
-	__nextHasNoMarginBottom: boolean;
-} >`
-	${ ( props ) =>
-		! props.__nextHasNoMarginBottom && `margin-bottom: ${ space( 6 ) };` }
-`;
diff --git a/packages/components/src/font-size-picker/test/index.tsx b/packages/components/src/font-size-picker/test/index.tsx
index 0d7816399b3652..e7205e57eefaa6 100644
--- a/packages/components/src/font-size-picker/test/index.tsx
+++ b/packages/components/src/font-size-picker/test/index.tsx
@@ -1,14 +1,38 @@
 /**
  * External dependencies
  */
-import { render, screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { render } from '@ariakit/test/react';
 
 /**
  * Internal dependencies
  */
 import FontSizePicker from '../';
 import type { FontSize } from '../types';
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+const ControlledFontSizePicker = ( {
+	onChange,
+	...props
+}: React.ComponentProps< typeof FontSizePicker > ) => {
+	const [ fontSize, setFontSize ] =
+		useState< typeof props.value >( undefined );
+
+	return (
+		<FontSizePicker
+			{ ...props }
+			value={ fontSize }
+			onChange={ ( newFontSize ) => {
+				setFontSize( newFontSize );
+				onChange?.( newFontSize );
+			} }
+		/>
+	);
+};
 
 describe( 'FontSizePicker', () => {
 	test.each( [
@@ -21,12 +45,8 @@ describe( 'FontSizePicker', () => {
 		async ( { value, expectedValue } ) => {
 			const user = userEvent.setup();
 			const onChange = jest.fn();
-			render(
-				<FontSizePicker
-					__nextHasNoMarginBottom
-					value={ value }
-					onChange={ onChange }
-				/>
+			await render(
+				<FontSizePicker value={ value } onChange={ onChange } />
 			);
 			const input = screen.getByLabelText( 'Custom' );
 			await user.clear( input );
@@ -46,9 +66,8 @@ describe( 'FontSizePicker', () => {
 		async ( { firstFontSize, expectedValue } ) => {
 			const user = userEvent.setup();
 			const onChange = jest.fn();
-			render(
+			await render(
 				<FontSizePicker
-					__nextHasNoMarginBottom
 					fontSizes={ [ { slug: 'slug', size: firstFontSize } ] }
 					onChange={ onChange }
 				/>
@@ -99,14 +118,9 @@ describe( 'FontSizePicker', () => {
 
 		it( 'displays a select control', async () => {
 			const user = userEvent.setup();
-			render(
-				<FontSizePicker
-					__nextHasNoMarginBottom
-					fontSizes={ fontSizes }
-				/>
-			);
+			await render( <FontSizePicker fontSizes={ fontSizes } /> );
 			await user.click(
-				screen.getByRole( 'button', { name: 'Font size' } )
+				screen.getByRole( 'combobox', { name: 'Font size' } )
 			);
 			const options = screen.getAllByRole( 'option' );
 			expect( options ).toHaveLength( 8 );
@@ -126,17 +140,11 @@ describe( 'FontSizePicker', () => {
 			{ value: '3px', expectedLabel: 'Size Custom' },
 		] )(
 			'displays $expectedLabel as label when value is $value',
-			( { value, expectedLabel } ) => {
-				render(
-					<FontSizePicker
-						__nextHasNoMarginBottom
-						fontSizes={ fontSizes }
-						value={ value }
-					/>
+			async ( { value, expectedLabel } ) => {
+				await render(
+					<FontSizePicker fontSizes={ fontSizes } value={ value } />
 				);
-				expect(
-					screen.getByLabelText( expectedLabel )
-				).toBeInTheDocument();
+				expect( screen.getByLabelText( expectedLabel ) ).toBeVisible();
 			}
 		);
 
@@ -156,16 +164,15 @@ describe( 'FontSizePicker', () => {
 			async ( { option, value, expectedArguments } ) => {
 				const user = userEvent.setup();
 				const onChange = jest.fn();
-				render(
+				await render(
 					<FontSizePicker
-						__nextHasNoMarginBottom
 						fontSizes={ fontSizes }
 						value={ value }
 						onChange={ onChange }
 					/>
 				);
 				await user.click(
-					screen.getByRole( 'button', { name: 'Font size' } )
+					screen.getByRole( 'combobox', { name: 'Font size' } )
 				);
 				await user.click(
 					screen.getByRole( 'option', { name: option } )
@@ -215,14 +222,9 @@ describe( 'FontSizePicker', () => {
 
 		it( 'displays a select control', async () => {
 			const user = userEvent.setup();
-			render(
-				<FontSizePicker
-					__nextHasNoMarginBottom
-					fontSizes={ fontSizes }
-				/>
-			);
+			await render( <FontSizePicker fontSizes={ fontSizes } /> );
 			await user.click(
-				screen.getByRole( 'button', { name: 'Font size' } )
+				screen.getByRole( 'combobox', { name: 'Font size' } )
 			);
 			const options = screen.getAllByRole( 'option' );
 			expect( options ).toHaveLength( 8 );
@@ -242,16 +244,12 @@ describe( 'FontSizePicker', () => {
 			{ value: '8px', option: 'Tiny' },
 		] )(
 			'defaults to $option when value is $value',
-			( { value, option } ) => {
-				render(
-					<FontSizePicker
-						__nextHasNoMarginBottom
-						fontSizes={ fontSizes }
-						value={ value }
-					/>
+			async ( { value, option } ) => {
+				await render(
+					<FontSizePicker fontSizes={ fontSizes } value={ value } />
 				);
 				expect(
-					screen.getByRole( 'button', { name: 'Font size' } )
+					screen.getByRole( 'combobox', { name: 'Font size' } )
 				).toHaveTextContent( option );
 			}
 		);
@@ -265,17 +263,11 @@ describe( 'FontSizePicker', () => {
 			{ value: '3px', expectedLabel: 'Size Custom' },
 		] )(
 			'displays $expectedLabel as label when value is $value',
-			( { value, expectedLabel } ) => {
-				render(
-					<FontSizePicker
-						__nextHasNoMarginBottom
-						fontSizes={ fontSizes }
-						value={ value }
-					/>
+			async ( { value, expectedLabel } ) => {
+				await render(
+					<FontSizePicker fontSizes={ fontSizes } value={ value } />
 				);
-				expect(
-					screen.getByLabelText( expectedLabel )
-				).toBeInTheDocument();
+				expect( screen.getByLabelText( expectedLabel ) ).toBeVisible();
 			}
 		);
 
@@ -313,16 +305,15 @@ describe( 'FontSizePicker', () => {
 			async ( { option, value, expectedArguments } ) => {
 				const user = userEvent.setup();
 				const onChange = jest.fn();
-				render(
+				await render(
 					<FontSizePicker
-						__nextHasNoMarginBottom
 						fontSizes={ fontSizes }
 						value={ value }
 						onChange={ onChange }
 					/>
 				);
 				await user.click(
-					screen.getByRole( 'button', { name: 'Font size' } )
+					screen.getByRole( 'combobox', { name: 'Font size' } )
 				);
 				await user.click(
 					screen.getByRole( 'option', { name: option } )
@@ -365,13 +356,8 @@ describe( 'FontSizePicker', () => {
 			},
 		];
 
-		it( 'displays a toggle group control with t-shirt sizes', () => {
-			render(
-				<FontSizePicker
-					__nextHasNoMarginBottom
-					fontSizes={ fontSizes }
-				/>
-			);
+		it( 'displays a toggle group control with t-shirt sizes', async () => {
+			await render( <FontSizePicker fontSizes={ fontSizes } /> );
 			const options = screen.getAllByRole( 'radio' );
 			expect( options ).toHaveLength( 5 );
 			expect( options[ 0 ] ).toHaveTextContent( 'S' );
@@ -392,29 +378,19 @@ describe( 'FontSizePicker', () => {
 			{ value: '40px', expectedLabel: 'Size Gigantosaurus' },
 		] )(
 			'displays $expectedLabel as label when value is $value',
-			( { value, expectedLabel } ) => {
-				render(
-					<FontSizePicker
-						__nextHasNoMarginBottom
-						fontSizes={ fontSizes }
-						value={ value }
-					/>
+			async ( { value, expectedLabel } ) => {
+				await render(
+					<FontSizePicker fontSizes={ fontSizes } value={ value } />
 				);
-				expect(
-					screen.getByLabelText( expectedLabel )
-				).toBeInTheDocument();
+				expect( screen.getByLabelText( expectedLabel ) ).toBeVisible();
 			}
 		);
 
 		it( 'calls onChange when a font size is selected', async () => {
 			const user = userEvent.setup();
 			const onChange = jest.fn();
-			render(
-				<FontSizePicker
-					__nextHasNoMarginBottom
-					fontSizes={ fontSizes }
-					onChange={ onChange }
-				/>
+			await render(
+				<FontSizePicker fontSizes={ fontSizes } onChange={ onChange } />
 			);
 			await user.click( screen.getByRole( 'radio', { name: 'Medium' } ) );
 			expect( onChange ).toHaveBeenCalledTimes( 1 );
@@ -449,13 +425,8 @@ describe( 'FontSizePicker', () => {
 			},
 		];
 
-		it( 'displays a toggle group control with t-shirt sizes', () => {
-			render(
-				<FontSizePicker
-					__nextHasNoMarginBottom
-					fontSizes={ fontSizes }
-				/>
-			);
+		it( 'displays a toggle group control with t-shirt sizes', async () => {
+			await render( <FontSizePicker fontSizes={ fontSizes } /> );
 			const options = screen.getAllByRole( 'radio' );
 			expect( options ).toHaveLength( 4 );
 			expect( options[ 0 ] ).toHaveTextContent( 'S' );
@@ -479,17 +450,11 @@ describe( 'FontSizePicker', () => {
 			},
 		] )(
 			'displays $expectedLabel as label when value is $value',
-			( { value, expectedLabel } ) => {
-				render(
-					<FontSizePicker
-						__nextHasNoMarginBottom
-						fontSizes={ fontSizes }
-						value={ value }
-					/>
+			async ( { value, expectedLabel } ) => {
+				await render(
+					<FontSizePicker fontSizes={ fontSizes } value={ value } />
 				);
-				expect(
-					screen.getByLabelText( expectedLabel )
-				).toBeInTheDocument();
+				expect( screen.getByLabelText( expectedLabel ) ).toBeVisible();
 			}
 		);
 
@@ -509,9 +474,8 @@ describe( 'FontSizePicker', () => {
 			async ( { radio, expectedArguments } ) => {
 				const user = userEvent.setup();
 				const onChange = jest.fn();
-				render(
+				await render(
 					<FontSizePicker
-						__nextHasNoMarginBottom
 						fontSizes={ fontSizes }
 						onChange={ onChange }
 					/>
@@ -529,10 +493,9 @@ describe( 'FontSizePicker', () => {
 	} );
 
 	function commonToggleGroupTests( fontSizes: FontSize[] ) {
-		it( 'defaults to M when value is 16px', () => {
-			render(
+		it( 'defaults to M when value is 16px', async () => {
+			await render(
 				<FontSizePicker
-					__nextHasNoMarginBottom
 					fontSizes={ fontSizes }
 					value={ fontSizes[ 0 ].size }
 				/>
@@ -544,15 +507,11 @@ describe( 'FontSizePicker', () => {
 
 		test.each( [ undefined, '' ] )(
 			'has no selection when value is %p',
-			( value ) => {
-				render(
-					<FontSizePicker
-						__nextHasNoMarginBottom
-						fontSizes={ fontSizes }
-						value={ value }
-					/>
+			async ( value ) => {
+				await render(
+					<FontSizePicker fontSizes={ fontSizes } value={ value } />
 				);
-				expect( screen.getByRole( 'radiogroup' ) ).toBeInTheDocument();
+				expect( screen.getByRole( 'radiogroup' ) ).toBeVisible();
 				expect(
 					screen.queryByRole( 'radio', { checked: true } )
 				).not.toBeInTheDocument();
@@ -564,46 +523,67 @@ describe( 'FontSizePicker', () => {
 		it( 'shows custom input when Custom is selected', async () => {
 			const user = userEvent.setup();
 			const onChange = jest.fn();
-			render(
-				<FontSizePicker
-					__nextHasNoMarginBottom
-					fontSizes={ fontSizes }
-					onChange={ onChange }
-				/>
+			await render(
+				<FontSizePicker fontSizes={ fontSizes } onChange={ onChange } />
 			);
 			await user.click(
-				screen.getByRole( 'button', { name: 'Font size' } )
+				screen.getByRole( 'combobox', { name: 'Font size' } )
 			);
 			await user.click(
 				screen.getByRole( 'option', { name: 'Custom' } )
 			);
-			expect( screen.getByLabelText( 'Custom' ) ).toBeInTheDocument();
+			expect( screen.getByLabelText( 'Custom' ) ).toBeVisible();
 			expect( onChange ).not.toHaveBeenCalled();
 		} );
 	}
 
 	function commonTests( fontSizes: FontSize[] ) {
-		it( 'shows custom input when value is unknown', () => {
-			render(
+		it( 'shows custom input when value is unknown', async () => {
+			await render(
+				<FontSizePicker fontSizes={ fontSizes } value="3px" />
+			);
+			expect( screen.getByLabelText( 'Custom' ) ).toBeVisible();
+		} );
+
+		it( 'hides custom input when disableCustomFontSizes is set to `true` with a custom font size', async () => {
+			const { rerender } = await render(
+				<FontSizePicker fontSizes={ fontSizes } value="3px" />
+			);
+			expect( screen.getByLabelText( 'Custom' ) ).toBeVisible();
+
+			rerender(
 				<FontSizePicker
-					__nextHasNoMarginBottom
+					disableCustomFontSizes
 					fontSizes={ fontSizes }
 					value="3px"
 				/>
 			);
-			expect( screen.getByLabelText( 'Custom' ) ).toBeInTheDocument();
+			expect(
+				screen.queryByLabelText( 'Custom' )
+			).not.toBeInTheDocument();
 		} );
 
-		it( 'allows custom values by default', async () => {
-			const user = userEvent.setup();
-			const onChange = jest.fn();
-			render(
+		it( "doesn't hide custom input when the selected font size is a predef", async () => {
+			const { rerender } = await render(
+				<FontSizePicker fontSizes={ fontSizes } value="3px" />
+			);
+			expect( screen.getByLabelText( 'Custom' ) ).toBeVisible();
+
+			rerender(
 				<FontSizePicker
-					__nextHasNoMarginBottom
 					fontSizes={ fontSizes }
-					onChange={ onChange }
+					value={ fontSizes[ 0 ].size }
 				/>
 			);
+			expect( screen.getByLabelText( 'Custom' ) ).toBeVisible();
+		} );
+
+		it( 'allows custom values by default', async () => {
+			const user = userEvent.setup();
+			const onChange = jest.fn();
+			await render(
+				<FontSizePicker fontSizes={ fontSizes } onChange={ onChange } />
+			);
 			await user.click(
 				screen.getByRole( 'button', { name: 'Set custom size' } )
 			);
@@ -612,10 +592,31 @@ describe( 'FontSizePicker', () => {
 			expect( onChange ).toHaveBeenCalledWith( '80px' );
 		} );
 
-		it( 'does not allow custom values when disableCustomFontSizes is set', () => {
-			render(
+		it( 'allows switching between custom and predef inputs when pressing the dedicated toggle', async () => {
+			const user = userEvent.setup();
+
+			await render(
+				<ControlledFontSizePicker fontSizes={ fontSizes } />
+			);
+
+			await user.click(
+				screen.getByRole( 'button', { name: 'Set custom size' } )
+			);
+
+			await user.type( screen.getByLabelText( 'Custom' ), '80' );
+
+			await user.click(
+				screen.getByRole( 'button', { name: 'Use size preset' } )
+			);
+
+			expect(
+				screen.queryByLabelText( 'Custom' )
+			).not.toBeInTheDocument();
+		} );
+
+		it( 'does not allow custom values when disableCustomFontSizes is set', async () => {
+			await render(
 				<FontSizePicker
-					__nextHasNoMarginBottom
 					fontSizes={ fontSizes }
 					disableCustomFontSizes
 				/>
@@ -627,12 +628,7 @@ describe( 'FontSizePicker', () => {
 
 		it( 'does not display a slider by default', async () => {
 			const user = userEvent.setup();
-			render(
-				<FontSizePicker
-					__nextHasNoMarginBottom
-					fontSizes={ fontSizes }
-				/>
-			);
+			await render( <FontSizePicker fontSizes={ fontSizes } /> );
 			await user.click(
 				screen.getByRole( 'button', { name: 'Set custom size' } )
 			);
@@ -644,9 +640,8 @@ describe( 'FontSizePicker', () => {
 		it( 'allows a slider to be used when withSlider is set', async () => {
 			const user = userEvent.setup();
 			const onChange = jest.fn();
-			render(
+			await render(
 				<FontSizePicker
-					__nextHasNoMarginBottom
 					fontSizes={ fontSizes }
 					withSlider
 					onChange={ onChange }
@@ -666,9 +661,8 @@ describe( 'FontSizePicker', () => {
 		it( 'allows reset by default', async () => {
 			const user = userEvent.setup();
 			const onChange = jest.fn();
-			render(
+			await render(
 				<FontSizePicker
-					__nextHasNoMarginBottom
 					fontSizes={ fontSizes }
 					value={ fontSizes[ 0 ].size }
 					onChange={ onChange }
@@ -684,9 +678,8 @@ describe( 'FontSizePicker', () => {
 
 		it( 'does not allow reset when withReset is false', async () => {
 			const user = userEvent.setup();
-			render(
+			await render(
 				<FontSizePicker
-					__nextHasNoMarginBottom
 					fontSizes={ fontSizes }
 					value={ fontSizes[ 0 ].size }
 					withReset={ false }
@@ -703,9 +696,8 @@ describe( 'FontSizePicker', () => {
 		it( 'applies custom units to custom font size control', async () => {
 			const user = userEvent.setup();
 
-			render(
+			await render(
 				<FontSizePicker
-					__nextHasNoMarginBottom
 					fontSizes={ fontSizes }
 					value={ fontSizes[ 0 ].size }
 					units={ [ 'px', 'ch', 'ex' ] }
diff --git a/packages/components/src/font-size-picker/types.ts b/packages/components/src/font-size-picker/types.ts
index f4d00c2d3ce674..2296e968567882 100644
--- a/packages/components/src/font-size-picker/types.ts
+++ b/packages/components/src/font-size-picker/types.ts
@@ -28,6 +28,8 @@ export type FontSizePickerProps = {
 	) => void;
 	/**
 	 * Available units for custom font size selection.
+	 *
+	 * @default [ 'px', 'em', 'rem', 'vw', 'vh' ]
 	 */
 	units?: string[];
 	/**
@@ -35,8 +37,9 @@ export type FontSizePickerProps = {
 	 */
 	value?: number | string;
 	/**
-	 * If `true`, the UI will contain a slider, instead of a numeric text input
-	 * field. If `false`, no slider will be present.
+	 * If `true`, a slider will be displayed alongside the input field when a
+	 * custom font size is active. Has no effect when `disableCustomFontSizes`
+	 * is `true`.
 	 *
 	 * @default false
 	 */
@@ -44,7 +47,7 @@ export type FontSizePickerProps = {
 	/**
 	 * If `true`, a reset button will be displayed alongside the input field
 	 * when a custom font size is active. Has no effect when
-	 * `disableCustomFontSizes` or `withSlider` is `true`.
+	 * `disableCustomFontSizes` is `true`.
 	 *
 	 * @default true
 	 */
@@ -55,8 +58,16 @@ export type FontSizePickerProps = {
 	 * can be safely removed once this happens.)
 	 *
 	 * @default false
+	 * @deprecated Default behavior since WP 6.5. Prop can be safely removed.
+	 * @ignore
 	 */
 	__nextHasNoMarginBottom?: boolean;
+	/**
+	 * Start opting into the larger default height that will become the default size in a future version.
+	 *
+	 * @default false
+	 */
+	__next40pxDefaultSize?: boolean;
 	/**
 	 * Size of the control.
 	 *
@@ -93,18 +104,19 @@ export type FontSizePickerSelectProps = Pick<
 	>;
 	onChange: NonNullable< FontSizePickerProps[ 'onChange' ] >;
 	onSelectCustom: () => void;
+	__next40pxDefaultSize: boolean;
 };
 
 export type FontSizePickerSelectOption = {
 	key: string;
 	name: string;
 	value?: FontSize[ 'size' ];
-	__experimentalHint?: string;
+	hint?: string;
 };
 
 export type FontSizePickerToggleGroupProps = Pick<
 	FontSizePickerProps,
-	'value' | 'size' | '__nextHasNoMarginBottom'
+	'value' | 'size' | '__next40pxDefaultSize'
 > & {
 	fontSizes: NonNullable< FontSizePickerProps[ 'fontSizes' ] >;
 	onChange: NonNullable< FontSizePickerProps[ 'onChange' ] >;
diff --git a/packages/components/src/font-size-picker/utils.ts b/packages/components/src/font-size-picker/utils.ts
index cf81c7ed27b182..64816f12255bac 100644
--- a/packages/components/src/font-size-picker/utils.ts
+++ b/packages/components/src/font-size-picker/utils.ts
@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
 /**
  * Internal dependencies
  */
diff --git a/packages/components/src/form-file-upload/README.md b/packages/components/src/form-file-upload/README.md
index f4dc4d1ef5a023..4dd8affc5f54a0 100644
--- a/packages/components/src/form-file-upload/README.md
+++ b/packages/components/src/form-file-upload/README.md
@@ -85,3 +85,11 @@ Optional callback function used to render the UI. If passed, the component does
 
 -   Type: `Function`
 -   Required: No
+
+### __next40pxDefaultSize
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
diff --git a/packages/components/src/form-file-upload/types.ts b/packages/components/src/form-file-upload/types.ts
index 5b9054fa869eea..728ed959aba76e 100644
--- a/packages/components/src/form-file-upload/types.ts
+++ b/packages/components/src/form-file-upload/types.ts
@@ -10,6 +10,12 @@ import type Icon from '../icon';
 
 // TODO: Replace `children` and `icon` types with props from Button once Button is typed.
 export type FormFileUploadProps = {
+	/**
+	 * Start opting into the larger default height that will become the default size in a future version.
+	 *
+	 * @default false
+	 */
+	__next40pxDefaultSize?: boolean;
 	/**
 	 * A string passed to `input` element that tells the browser which file types can be
 	 * upload to the upload by the user use. e.g: `image/*,video/*`.
diff --git a/packages/components/src/form-toggle/README.md b/packages/components/src/form-toggle/README.md
index 5d385e23f7bdec..ba5fbf3cb16007 100644
--- a/packages/components/src/form-toggle/README.md
+++ b/packages/components/src/form-toggle/README.md
@@ -4,12 +4,6 @@ FormToggle switches a single setting on or off.
 
 ![On and off FormToggles. The top toggle is on, while the bottom toggle is off.](https://wordpress.org/gutenberg/files/2019/01/Toggle.jpg)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
diff --git a/packages/components/src/form-toggle/index.tsx b/packages/components/src/form-toggle/index.tsx
index 19cb828023ad89..8a90fe4561bff4 100644
--- a/packages/components/src/form-toggle/index.tsx
+++ b/packages/components/src/form-toggle/index.tsx
@@ -1,7 +1,13 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
+import type { ForwardedRef } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -11,27 +17,9 @@ import type { WordPressComponentProps } from '../context';
 
 export const noop = () => {};
 
-/**
- * FormToggle switches a single setting on or off.
- *
- * ```jsx
- * import { FormToggle } from '@wordpress/components';
- * import { useState } from '@wordpress/element';
- *
- * const MyFormToggle = () => {
- *   const [ isChecked, setChecked ] = useState( true );
- *
- *   return (
- *     <FormToggle
- *       checked={ isChecked }
- *       onChange={ () => setChecked( ( state ) => ! state ) }
- *     />
- *   );
- * };
- * ```
- */
-export function FormToggle(
-	props: WordPressComponentProps< FormToggleProps, 'input', false >
+function UnforwardedFormToggle(
+	props: WordPressComponentProps< FormToggleProps, 'input', false >,
+	ref: ForwardedRef< HTMLInputElement >
 ) {
 	const {
 		className,
@@ -41,7 +29,7 @@ export function FormToggle(
 		onChange = noop,
 		...additionalProps
 	} = props;
-	const wrapperClasses = classnames( 'components-form-toggle', className, {
+	const wrapperClasses = clsx( 'components-form-toggle', className, {
 		'is-checked': checked,
 		'is-disabled': disabled,
 	} );
@@ -56,6 +44,7 @@ export function FormToggle(
 				onChange={ onChange }
 				disabled={ disabled }
 				{ ...additionalProps }
+				ref={ ref }
 			/>
 			<span className="components-form-toggle__track"></span>
 			<span className="components-form-toggle__thumb"></span>
@@ -63,4 +52,25 @@ export function FormToggle(
 	);
 }
 
+/**
+ * FormToggle switches a single setting on or off.
+ *
+ * ```jsx
+ * import { FormToggle } from '@wordpress/components';
+ * import { useState } from '@wordpress/element';
+ *
+ * const MyFormToggle = () => {
+ *   const [ isChecked, setChecked ] = useState( true );
+ *
+ *   return (
+ *     <FormToggle
+ *       checked={ isChecked }
+ *       onChange={ () => setChecked( ( state ) => ! state ) }
+ *     />
+ *   );
+ * };
+ * ```
+ */
+export const FormToggle = forwardRef( UnforwardedFormToggle );
+
 export default FormToggle;
diff --git a/packages/components/src/form-toggle/stories/index.story.tsx b/packages/components/src/form-toggle/stories/index.story.tsx
index 0958b94c342c4a..d987860955bdf9 100644
--- a/packages/components/src/form-toggle/stories/index.story.tsx
+++ b/packages/components/src/form-toggle/stories/index.story.tsx
@@ -11,7 +11,7 @@ import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { FormToggle } from '..';
+import FormToggle from '..';
 
 const meta: Meta< typeof FormToggle > = {
 	component: FormToggle,
diff --git a/packages/components/src/form-toggle/style.scss b/packages/components/src/form-toggle/style.scss
index d04ad4c651f862..900874b59004b8 100644
--- a/packages/components/src/form-toggle/style.scss
+++ b/packages/components/src/form-toggle/style.scss
@@ -1,15 +1,16 @@
 @use "sass:math";
 
-$toggle-width: 36px;
-$toggle-height: 18px;
+$toggle-width: $grid-unit-40;
+$toggle-height: $grid-unit-20;
 $toggle-border-width: 1px;
-$thumb-size:  $toggle-height - ($toggle-border-width * 6);
+$toggle-thumb-size:  $grid-unit-15;
 
 $transition-duration: 0.2s;
 
 .components-form-toggle {
 	position: relative;
 	display: inline-block;
+	height: $toggle-height;
 
 	// Unchecked state.
 	.components-form-toggle__track {
@@ -19,7 +20,7 @@ $transition-duration: 0.2s;
 		box-sizing: border-box;
 		vertical-align: top;
 		background-color: $white;
-		border: $toggle-border-width solid $gray-900;
+		border: $toggle-border-width solid $gray-600;
 		width: $toggle-width;
 		height: $toggle-height;
 		border-radius: math.div($toggle-height, 2);
@@ -49,19 +50,20 @@ $transition-duration: 0.2s;
 		display: block;
 		position: absolute;
 		box-sizing: border-box;
-		top: $toggle-border-width * 3;
-		left: $toggle-border-width * 3;
-		width: $thumb-size;
-		height: $thumb-size;
-		border-radius: 50%;
+		top: math.div($toggle-thumb-size, 6);
+		left: math.div($toggle-thumb-size, 6);
+		width: $toggle-thumb-size;
+		height: $toggle-thumb-size;
+		border-radius: $radius-round;
 		transition:
 			$transition-duration transform ease,
 			$transition-duration background-color ease-out;
 		@include reduce-motion("transition");
 		background-color: $gray-900;
+		box-shadow: $elevation-x-small;
 
 		// Transparent border acts as a fill in Windows High Contrast Mode.
-		border: math.div($thumb-size, 2) solid transparent;
+		border: math.div($toggle-thumb-size, 2) solid transparent;
 	}
 
 	// Checked state.
@@ -116,4 +118,8 @@ $transition-duration: 0.2s;
 	&::before {
 		content: "";
 	}
+
+	&:not(:disabled, [aria-disabled="true"]) {
+		cursor: pointer;
+	}
 }
diff --git a/packages/components/src/form-token-field/README.md b/packages/components/src/form-token-field/README.md
index 41083789f1340f..70e9bd09a61a36 100644
--- a/packages/components/src/form-token-field/README.md
+++ b/packages/components/src/form-token-field/README.md
@@ -4,7 +4,7 @@ A `FormTokenField` is a field similar to the tags and categories fields in the i
 
 Up to one hundred suggestions that match what the user has typed so far will be shown from which the user can pick from (auto-complete). Tokens are separated by the "," character. Suggestions can be selected with the up or down arrows and added with the tab or enter key.
 
-The `value` property is handled in a manner similar to controlled form components. See [Forms](http://facebook.github.io/react/docs/forms.html) in the React Documentation for more information.
+The `value` property is handled in a manner similar to controlled form components. See [Forms](https://react.dev/reference/react-dom/components#form-components) in the React Documentation for more information.
 
 ## Keyboard Accessibility
 
@@ -61,7 +61,8 @@ The `value` property is handled in a manner similar to controlled form component
 -   `__experimentalShowHowTo` - If false, the text on how to use the select (ie: _Separate with commas or the Enter key._) will be hidden.
 -   `__experimentalValidateInput` - If passed, all introduced values will be validated before being added as tokens.
 -   `__experimentalAutoSelectFirstMatch` - If true, the select the first matching suggestion when the user presses the Enter key (or space when tokenizeOnSpace is true).
--   `__nextHasNoMarginBottom` - Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 6.5. (The prop can be safely removed once this happens.)
+-   `__next40pxDefaultSize` - Start opting into the larger default height that will become the default size in a future version.
+-   `__nextHasNoMarginBottom` - Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 7.0. (The prop can be safely removed once this happens.)
 -   `tokenizeOnBlur` - If true, add any incompleteTokenValue as a new token when the field loses focus.
 
 ## Usage
@@ -87,6 +88,7 @@ const MyFormTokenField = () => {
 			value={ selectedContinents }
 			suggestions={ continents }
 			onChange={ ( tokens ) => setSelectedContinents( tokens ) }
+			__nextHasNoMarginBottom
 		/>
 	);
 };
diff --git a/packages/components/src/form-token-field/index.tsx b/packages/components/src/form-token-field/index.tsx
index bdc3c2a53ae1d0..4f2f325e409a76 100644
--- a/packages/components/src/form-token-field/index.tsx
+++ b/packages/components/src/form-token-field/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { KeyboardEvent, MouseEvent, TouchEvent, FocusEvent } from 'react';
 
 /**
@@ -12,6 +12,7 @@ import { __, _n, sprintf } from '@wordpress/i18n';
 import { useDebounce, useInstanceId, usePrevious } from '@wordpress/compose';
 import { speak } from '@wordpress/a11y';
 import isShallowEqual from '@wordpress/is-shallow-equal';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -28,6 +29,7 @@ import {
 } from '../base-control/styles/base-control-styles';
 import { Spacer } from '../spacer';
 import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props';
+import { withIgnoreIMEEvents } from '../utils/with-ignore-ime-events';
 
 const identity = ( value: string ) => value;
 
@@ -39,7 +41,7 @@ const identity = ( value: string ) => value;
  * Tokens are separated by the "," character. Suggestions can be selected with the up or down arrows and added with the tab or enter key.
  *
  * The `value` property is handled in a manner similar to controlled form components.
- * See [Forms](http://facebook.github.io/react/docs/forms.html) in the React Documentation for more information.
+ * See [Forms](https://react.dev/reference/react-dom/components#form-components) in the React Documentation for more information.
  */
 export function FormTokenField( props: FormTokenFieldProps ) {
 	const {
@@ -74,10 +76,15 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 		__experimentalAutoSelectFirstMatch = false,
 		__nextHasNoMarginBottom = false,
 		tokenizeOnBlur = false,
-	} = useDeprecated36pxDefaultSizeProp< FormTokenFieldProps >(
-		props,
-		'wp.components.FormTokenField'
-	);
+	} = useDeprecated36pxDefaultSizeProp< FormTokenFieldProps >( props );
+
+	if ( ! __nextHasNoMarginBottom ) {
+		deprecated( 'Bottom margin styles for wp.components.FormTokenField', {
+			since: '6.7',
+			version: '7.0',
+			hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version.',
+		} );
+	}
 
 	const instanceId = useInstanceId( FormTokenField );
 
@@ -117,17 +124,14 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 		}
 
 		// TODO: updateSuggestions() should first be refactored so its actual deps are clearer.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ suggestions, prevSuggestions, value, prevValue ] );
 
 	useEffect( () => {
 		updateSuggestions();
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ incompleteTokenValue ] );
 
 	useEffect( () => {
 		updateSuggestions();
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ __experimentalAutoSelectFirstMatch ] );
 
 	if ( disabled && isActive ) {
@@ -177,13 +181,17 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 			setInputOffsetFromEnd( 0 );
 			setIsActive( false );
 
-			// If `__experimentalExpandOnFocus` is true, don't close the suggestions list when
-			// the user clicks on it (`tokensAndInput` will be the element that caused the blur).
-			const shouldKeepSuggestionsExpanded =
-				! __experimentalExpandOnFocus ||
-				( __experimentalExpandOnFocus &&
-					event.relatedTarget === tokensAndInput.current );
-			setIsExpanded( shouldKeepSuggestionsExpanded );
+			if ( __experimentalExpandOnFocus ) {
+				// If `__experimentalExpandOnFocus` is true, don't close the suggestions list when
+				// the user clicks on it (`tokensAndInput` will be the element that caused the blur).
+				const hasFocusWithin =
+					event.relatedTarget === tokensAndInput.current;
+				setIsExpanded( hasFocusWithin );
+			} else {
+				// Else collapse the suggestion list. This will result in the suggestion list closing
+				// after a suggestion has been submitted since that causes a blur.
+				setIsExpanded( false );
+			}
 
 			setSelectedSuggestionIndex( -1 );
 			setSelectedSuggestionScroll( false );
@@ -193,15 +201,7 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 	function onKeyDown( event: KeyboardEvent ) {
 		let preventDefault = false;
 
-		if (
-			event.defaultPrevented ||
-			// Ignore keydowns from IMEs
-			event.nativeEvent.isComposing ||
-			// Workaround for Mac Safari where the final Enter/Backspace of an IME composition
-			// is `isComposing=false`, even though it's technically still part of the composition.
-			// These can only be detected by keyCode.
-			event.keyCode === 229
-		) {
+		if ( event.defaultPrevented ) {
 			return;
 		}
 		switch ( event.key ) {
@@ -650,7 +650,6 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 			autoCapitalize,
 			autoComplete,
 			placeholder: value.length === 0 ? placeholder : '',
-			key: 'input',
 			disabled,
 			value: incompleteTokenValue,
 			onBlur,
@@ -660,6 +659,7 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 
 		return (
 			<TokenInput
+				key="input"
 				{ ...inputProps }
 				onChange={
 					! ( maxLength && value.length >= maxLength )
@@ -671,7 +671,7 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 		);
 	}
 
-	const classes = classnames(
+	const classes = clsx(
 		className,
 		'components-form-token-field__input-container',
 		{
@@ -688,7 +688,7 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 
 	if ( ! disabled ) {
 		tokenFieldProps = Object.assign( {}, tokenFieldProps, {
-			onKeyDown,
+			onKeyDown: withIgnoreIMEEvents( onKeyDown ),
 			onKeyPress,
 			onFocus: onFocusHandler,
 		} );
@@ -700,12 +700,14 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 	/* eslint-disable jsx-a11y/no-static-element-interactions */
 	return (
 		<div { ...tokenFieldProps }>
-			<StyledLabel
-				htmlFor={ `components-form-token-input-${ instanceId }` }
-				className="components-form-token-field__label"
-			>
-				{ label }
-			</StyledLabel>
+			{ label && (
+				<StyledLabel
+					htmlFor={ `components-form-token-input-${ instanceId }` }
+					className="components-form-token-field__label"
+				>
+					{ label }
+				</StyledLabel>
+			) }
 			<div
 				ref={ tokensAndInput }
 				className={ classes }
@@ -717,7 +719,7 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 					justify="flex-start"
 					align="center"
 					gap={ 1 }
-					wrap={ true }
+					wrap
 					__next40pxDefaultSize={ __next40pxDefaultSize }
 					hasTokens={ !! value.length }
 				>
diff --git a/packages/components/src/form-token-field/stories/index.story.tsx b/packages/components/src/form-token-field/stories/index.story.tsx
index da61a0b313bfe9..117dec9e9df5a1 100644
--- a/packages/components/src/form-token-field/stories/index.story.tsx
+++ b/packages/components/src/form-token-field/stories/index.story.tsx
@@ -62,6 +62,7 @@ export const Default: StoryFn< typeof FormTokenField > = DefaultTemplate.bind(
 Default.args = {
 	label: 'Type a continent',
 	suggestions: continents,
+	__nextHasNoMarginBottom: true,
 };
 
 export const Async: StoryFn< typeof FormTokenField > = ( {
@@ -99,6 +100,7 @@ export const Async: StoryFn< typeof FormTokenField > = ( {
 Async.args = {
 	label: 'Type a continent',
 	suggestions: continents,
+	__nextHasNoMarginBottom: true,
 };
 
 export const DropdownSelector: StoryFn< typeof FormTokenField > =
diff --git a/packages/components/src/form-token-field/style.scss b/packages/components/src/form-token-field/style.scss
index 72a5b7929a7b04..51f9e24ea0d4f2 100644
--- a/packages/components/src/form-token-field/style.scss
+++ b/packages/components/src/form-token-field/style.scss
@@ -102,7 +102,6 @@
 		&.is-error {
 			.components-form-token-field__token-text {
 				color: $alert-red;
-				border-radius: 4px 0 0 4px;
 				padding: 0 4px 0 6px;
 			}
 		}
@@ -133,7 +132,7 @@
 }
 
 .components-form-token-field__token-text {
-	border-radius: 2px 0 0 2px;
+	border-radius: $radius-x-small 0 0 $radius-x-small;
 	padding: 0 0 0 8px;
 	white-space: nowrap;
 	overflow: hidden;
@@ -142,7 +141,7 @@
 
 .components-form-token-field__remove-token.components-button {
 	cursor: pointer;
-	border-radius: 0 2px 2px 0;
+	border-radius: 0 $radius-x-small $radius-x-small 0;
 	padding: 0 2px;
 	color: $gray-900;
 	line-height: 10px;
@@ -174,11 +173,23 @@
 	padding: $grid-unit-10 $grid-unit-15;
 	min-height: $button-size-compact;
 	margin: 0;
-	cursor: pointer;
 	box-sizing: border-box;
 
 	&.is-selected {
 		background: $components-color-accent;
 		color: $white;
 	}
+
+	&[aria-disabled="true"] {
+		pointer-events: none;
+		color: $gray-600;
+
+		&.is-selected {
+			background-color: $components-color-accent-transparent-40;
+		}
+	}
+
+	&:not(.is-empty) {
+		cursor: pointer;
+	}
 }
diff --git a/packages/components/src/form-token-field/suggestions-list.tsx b/packages/components/src/form-token-field/suggestions-list.tsx
index 81302d5bfebe81..1339e0cc189e38 100644
--- a/packages/components/src/form-token-field/suggestions-list.tsx
+++ b/packages/components/src/form-token-field/suggestions-list.tsx
@@ -1,15 +1,14 @@
 /**
  * External dependencies
  */
-import scrollView from 'dom-scroll-into-view';
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { MouseEventHandler, ReactNode } from 'react';
 
 /**
  * WordPress dependencies
  */
-import { useState } from '@wordpress/element';
 import { useRefEffect } from '@wordpress/compose';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -21,7 +20,9 @@ const handleMouseDown: MouseEventHandler = ( e ) => {
 	e.preventDefault();
 };
 
-export function SuggestionsList< T extends string | { value: string } >( {
+export function SuggestionsList<
+	T extends string | { value: string; disabled?: boolean },
+>( {
 	selectedIndex,
 	scrollIntoView,
 	match,
@@ -32,8 +33,6 @@ export function SuggestionsList< T extends string | { value: string } >( {
 	instanceId,
 	__experimentalRenderItem,
 }: SuggestionsListProps< T > ) {
-	const [ scrollingIntoView, setScrollingIntoView ] = useState( false );
-
 	const listRef = useRefEffect< HTMLUListElement >(
 		( listNode ) => {
 			// only have to worry about scrolling selected suggestion into view
@@ -44,16 +43,10 @@ export function SuggestionsList< T extends string | { value: string } >( {
 				scrollIntoView &&
 				listNode.children[ selectedIndex ]
 			) {
-				setScrollingIntoView( true );
-				scrollView(
-					listNode.children[ selectedIndex ] as HTMLLIElement,
-					listNode,
-					{
-						onlyScrollIfNeeded: true,
-					}
-				);
-				rafId = requestAnimationFrame( () => {
-					setScrollingIntoView( false );
+				listNode.children[ selectedIndex ].scrollIntoView( {
+					behavior: 'instant',
+					block: 'nearest',
+					inline: 'nearest',
 				} );
 			}
 
@@ -68,9 +61,7 @@ export function SuggestionsList< T extends string | { value: string } >( {
 
 	const handleHover = ( suggestion: T ) => {
 		return () => {
-			if ( ! scrollingIntoView ) {
-				onHover?.( suggestion );
-			}
+			onHover?.( suggestion );
 		};
 	};
 
@@ -115,10 +106,18 @@ export function SuggestionsList< T extends string | { value: string } >( {
 		>
 			{ suggestions.map( ( suggestion, index ) => {
 				const matchText = computeSuggestionMatch( suggestion );
-				const className = classnames(
+				const isSelected = index === selectedIndex;
+				const isDisabled =
+					typeof suggestion === 'object' && suggestion?.disabled;
+				const key =
+					typeof suggestion === 'object' && 'value' in suggestion
+						? suggestion?.value
+						: displayTransform( suggestion );
+
+				const className = clsx(
 					'components-form-token-field__suggestion',
 					{
-						'is-selected': index === selectedIndex,
+						'is-selected': isSelected,
 					}
 				);
 
@@ -146,22 +145,23 @@ export function SuggestionsList< T extends string | { value: string } >( {
 						id={ `components-form-token-suggestions-${ instanceId }-${ index }` }
 						role="option"
 						className={ className }
-						key={
-							typeof suggestion === 'object' &&
-							'value' in suggestion
-								? suggestion?.value
-								: displayTransform( suggestion )
-						}
+						key={ key }
 						onMouseDown={ handleMouseDown }
 						onClick={ handleClick( suggestion ) }
 						onMouseEnter={ handleHover( suggestion ) }
 						aria-selected={ index === selectedIndex }
+						aria-disabled={ isDisabled }
 					>
 						{ output }
 					</li>
 				);
 				/* eslint-enable jsx-a11y/click-events-have-key-events */
 			} ) }
+			{ suggestions.length === 0 && (
+				<li className="components-form-token-field__suggestion is-empty">
+					{ __( 'No items found' ) }
+				</li>
+			) }
 		</ul>
 	);
 }
diff --git a/packages/components/src/form-token-field/test/index.tsx b/packages/components/src/form-token-field/test/index.tsx
index 76e308d5993beb..961214a574c90d 100644
--- a/packages/components/src/form-token-field/test/index.tsx
+++ b/packages/components/src/form-token-field/test/index.tsx
@@ -741,6 +741,103 @@ describe( 'FormTokenField', () => {
 			] );
 		} );
 
+		it( 'should render suggestions after a selection is made when the `__experimentalExpandOnFocus` prop is set to `true`', async () => {
+			const user = userEvent.setup();
+
+			const onFocusSpy = jest.fn();
+
+			const suggestions = [ 'Green', 'Emerald', 'Seaweed' ];
+
+			render(
+				<>
+					<FormTokenFieldWithState
+						onFocus={ onFocusSpy }
+						suggestions={ suggestions }
+						__experimentalExpandOnFocus
+					/>
+				</>
+			);
+
+			const input = screen.getByRole( 'combobox' );
+
+			await user.type( input, 'ee' );
+
+			expectVisibleSuggestionsToBe( screen.getByRole( 'listbox' ), [
+				'Green',
+				'Seaweed',
+			] );
+
+			// Select the first suggestion ("Green")
+			await user.keyboard( '[ArrowDown][Enter]' );
+
+			expect( screen.getByRole( 'listbox' ) ).toBeVisible();
+		} );
+
+		it( 'should not render suggestions after a selection is made when the `__experimentalExpandOnFocus` prop is set to `false` or not defined', async () => {
+			const user = userEvent.setup();
+
+			const onFocusSpy = jest.fn();
+
+			const suggestions = [ 'Green', 'Emerald', 'Seaweed' ];
+
+			render(
+				<>
+					<FormTokenFieldWithState
+						onFocus={ onFocusSpy }
+						suggestions={ suggestions }
+					/>
+				</>
+			);
+
+			const input = screen.getByRole( 'combobox' );
+
+			await user.type( input, 'ee' );
+
+			expectVisibleSuggestionsToBe( screen.getByRole( 'listbox' ), [
+				'Green',
+				'Seaweed',
+			] );
+
+			// Select the first suggestion ("Green")
+			await user.keyboard( '[ArrowDown][Enter]' );
+
+			expect( screen.queryByRole( 'listbox' ) ).not.toBeInTheDocument();
+		} );
+
+		it( 'should not render suggestions after the input is blurred', async () => {
+			const user = userEvent.setup();
+
+			const onFocusSpy = jest.fn();
+
+			const suggestions = [ 'Green', 'Emerald', 'Seaweed' ];
+
+			render(
+				<>
+					<FormTokenFieldWithState
+						onFocus={ onFocusSpy }
+						suggestions={ suggestions }
+					/>
+				</>
+			);
+
+			const input = screen.getByRole( 'combobox' );
+
+			await user.type( input, 'ee' );
+
+			expectVisibleSuggestionsToBe( screen.getByRole( 'listbox' ), [
+				'Green',
+				'Seaweed',
+			] );
+
+			// Select the first suggestion ("Green")
+			await user.keyboard( '[ArrowDown][Enter]' );
+
+			// Click the body, blurring the input.
+			await user.click( document.body );
+
+			expect( screen.queryByRole( 'listbox' ) ).not.toBeInTheDocument();
+		} );
+
 		it( 'should not render suggestions if the text input is not matching any of the suggestions', async () => {
 			const user = userEvent.setup();
 
diff --git a/packages/components/src/form-token-field/token-input.tsx b/packages/components/src/form-token-field/token-input.tsx
index c2b4983c51cb9d..daf1df4223354a 100644
--- a/packages/components/src/form-token-field/token-input.tsx
+++ b/packages/components/src/form-token-field/token-input.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ChangeEvent, ForwardedRef, FocusEventHandler } from 'react';
 
 /**
@@ -64,7 +64,7 @@ export function UnForwardedTokenInput(
 			onFocus={ onFocusHandler }
 			onBlur={ onBlurHandler }
 			size={ size }
-			className={ classnames(
+			className={ clsx(
 				className,
 				'components-form-token-field__input'
 			) }
diff --git a/packages/components/src/form-token-field/token.tsx b/packages/components/src/form-token-field/token.tsx
index e5633aa3b75cf0..3e723c2bd78fc2 100644
--- a/packages/components/src/form-token-field/token.tsx
+++ b/packages/components/src/form-token-field/token.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -34,7 +34,7 @@ export default function Token( {
 	termsCount,
 }: TokenProps ) {
 	const instanceId = useInstanceId( Token );
-	const tokenClasses = classnames( 'components-form-token-field__token', {
+	const tokenClasses = clsx( 'components-form-token-field__token', {
 		'is-error': 'error' === status,
 		'is-success': 'success' === status,
 		'is-validating': 'validating' === status,
@@ -74,6 +74,9 @@ export default function Token( {
 				className="components-form-token-field__remove-token"
 				icon={ closeSmall }
 				onClick={ ! disabled ? onClick : undefined }
+				// Disable reason: Even when FormTokenField itself is accessibly disabled, token reset buttons shouldn't be in the tab sequence.
+				// eslint-disable-next-line no-restricted-syntax
+				disabled={ disabled }
 				label={ messages.remove }
 				aria-describedby={ `components-form-token-field__token-text-${ instanceId }` }
 			/>
diff --git a/packages/components/src/form-token-field/types.ts b/packages/components/src/form-token-field/types.ts
index db4549a7f0779c..051f00a6cdeb06 100644
--- a/packages/components/src/form-token-field/types.ts
+++ b/packages/components/src/form-token-field/types.ts
@@ -157,6 +157,7 @@ export interface FormTokenFieldProps
 	 *
 	 * @default false
 	 * @deprecated
+	 * @ignore
 	 */
 	__next36pxDefaultSize?: boolean;
 	/**
diff --git a/packages/components/src/gradient-picker/README.md b/packages/components/src/gradient-picker/README.md
index c092c8b5673cc9..815b3d8eb5dd75 100644
--- a/packages/components/src/gradient-picker/README.md
+++ b/packages/components/src/gradient-picker/README.md
@@ -17,7 +17,6 @@ const myGradientPicker = () => {
 
 	return (
 		<GradientPicker
-			__nextHasNoMargin
 			value={ gradient }
 			onChange={ ( currentGradient ) => setGradient( currentGradient ) }
 			gradients={ [
@@ -89,13 +88,6 @@ If true, the gradient picker will not be displayed and only defined gradients fr
 -   Required: No
 -   Default: false
 
-### `__nextHasNoMargin`: `boolean`
-
-Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 6.4. (The prop can be safely removed once this happens.)
-
--   Required: No
--   Default: `false`
-
 ### `headingLevel`: `1 | 2 | 3 | 4 | 5 | 6 | '1' | '2' | '3' | '4' | '5' | '6'`
 
 The heading level. Only applies in cases where gradients are provided from multiple origins (ie. when the array passed as the `gradients` prop contains two or more items).
diff --git a/packages/components/src/gradient-picker/index.tsx b/packages/components/src/gradient-picker/index.tsx
index b435ded2bcd0d8..8368279b8afd70 100644
--- a/packages/components/src/gradient-picker/index.tsx
+++ b/packages/components/src/gradient-picker/index.tsx
@@ -4,7 +4,6 @@
 import { __, sprintf } from '@wordpress/i18n';
 import { useInstanceId } from '@wordpress/compose';
 import { useCallback, useMemo } from '@wordpress/element';
-import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -13,7 +12,6 @@ import CircularOptionPicker from '../circular-option-picker';
 import CustomGradientPicker from '../custom-gradient-picker';
 import { VStack } from '../v-stack';
 import { ColorHeading } from '../color-palette/styles';
-import { Spacer } from '../spacer';
 import type {
 	GradientPickerComponentProps,
 	PickerProps,
@@ -44,9 +42,9 @@ function SingleOrigin( {
 	...additionalProps
 }: PickerProps< GradientObject > ) {
 	const gradientOptions = useMemo( () => {
-		return gradients.map( ( { gradient, name }, index ) => (
+		return gradients.map( ( { gradient, name, slug }, index ) => (
 			<CircularOptionPicker.Option
-				key={ gradient }
+				key={ slug }
 				value={ gradient }
 				isSelected={ value === gradient }
 				tooltipText={
@@ -181,7 +179,6 @@ function Component( props: PickerProps< any > ) {
  *
  *	return (
  *		<GradientPicker
- *			__nextHasNoMargin
  *			value={ gradient }
  *			onChange={ ( currentGradient ) => setGradient( currentGradient ) }
  *			gradients={ [
@@ -211,8 +208,6 @@ function Component( props: PickerProps< any > ) {
  *
  */
 export function GradientPicker( {
-	/** Start opting into the new margin-free styles that will become the default in a future version. */
-	__nextHasNoMargin = false,
 	className,
 	gradients = [],
 	onChange,
@@ -228,58 +223,39 @@ export function GradientPicker( {
 		[ onChange ]
 	);
 
-	if ( ! __nextHasNoMargin ) {
-		deprecated( 'Outer margin styles for wp.components.GradientPicker', {
-			since: '6.1',
-			version: '6.4',
-			hint: 'Set the `__nextHasNoMargin` prop to true to start opting into the new styles, which will become the default in a future version',
-		} );
-	}
-
-	const deprecatedMarginSpacerProps = ! __nextHasNoMargin
-		? {
-				marginTop: ! gradients.length ? 3 : undefined,
-				marginBottom: ! clearable ? 6 : 0,
-		  }
-		: {};
-
 	return (
-		// Outmost Spacer wrapper can be removed when deprecation period is over
-		<Spacer marginBottom={ 0 } { ...deprecatedMarginSpacerProps }>
-			<VStack spacing={ gradients.length ? 4 : 0 }>
-				{ ! disableCustomGradients && (
-					<CustomGradientPicker
-						__nextHasNoMargin
-						__experimentalIsRenderedInSidebar={
-							__experimentalIsRenderedInSidebar
-						}
-						value={ value }
-						onChange={ onChange }
-					/>
-				) }
-				{ ( gradients.length > 0 || clearable ) && (
-					<Component
-						{ ...additionalProps }
-						className={ className }
-						clearGradient={ clearGradient }
-						gradients={ gradients }
-						onChange={ onChange }
-						value={ value }
-						actions={
-							clearable &&
-							! disableCustomGradients && (
-								<CircularOptionPicker.ButtonAction
-									onClick={ clearGradient }
-								>
-									{ __( 'Clear' ) }
-								</CircularOptionPicker.ButtonAction>
-							)
-						}
-						headingLevel={ headingLevel }
-					/>
-				) }
-			</VStack>
-		</Spacer>
+		<VStack spacing={ gradients.length ? 4 : 0 }>
+			{ ! disableCustomGradients && (
+				<CustomGradientPicker
+					__experimentalIsRenderedInSidebar={
+						__experimentalIsRenderedInSidebar
+					}
+					value={ value }
+					onChange={ onChange }
+				/>
+			) }
+			{ ( gradients.length > 0 || clearable ) && (
+				<Component
+					{ ...additionalProps }
+					className={ className }
+					clearGradient={ clearGradient }
+					gradients={ gradients }
+					onChange={ onChange }
+					value={ value }
+					actions={
+						clearable &&
+						! disableCustomGradients && (
+							<CircularOptionPicker.ButtonAction
+								onClick={ clearGradient }
+							>
+								{ __( 'Clear' ) }
+							</CircularOptionPicker.ButtonAction>
+						)
+					}
+					headingLevel={ headingLevel }
+				/>
+			) }
+		</VStack>
 	);
 }
 
diff --git a/packages/components/src/gradient-picker/stories/index.story.tsx b/packages/components/src/gradient-picker/stories/index.story.tsx
index 039a2f0da1729c..b5f3a9dbca15a5 100644
--- a/packages/components/src/gradient-picker/stories/index.story.tsx
+++ b/packages/components/src/gradient-picker/stories/index.story.tsx
@@ -85,7 +85,6 @@ const Template: StoryFn< typeof GradientPicker > = ( {
 
 export const Default = Template.bind( {} );
 Default.args = {
-	__nextHasNoMargin: true,
 	gradients: GRADIENTS,
 };
 
diff --git a/packages/components/src/gradient-picker/types.ts b/packages/components/src/gradient-picker/types.ts
index 8deb9513cc0dbe..b563653e33e4c4 100644
--- a/packages/components/src/gradient-picker/types.ts
+++ b/packages/components/src/gradient-picker/types.ts
@@ -93,6 +93,8 @@ export type GradientPickerComponentProps = GradientPickerBaseProps & {
 	 * can be safely removed once this happens.)
 	 *
 	 * @default false
+	 * @deprecated Default behavior since WP 6.5. Prop can be safely removed.
+	 * @ignore
 	 */
 	__nextHasNoMargin?: boolean;
 	/**
diff --git a/packages/components/src/grid/README.md b/packages/components/src/grid/README.md
index 85640de2868c40..15cd959e135bee 100644
--- a/packages/components/src/grid/README.md
+++ b/packages/components/src/grid/README.md
@@ -27,69 +27,69 @@ function Example() {
 
 ## Props
 
-##### `align`: `CSS['alignItems']`
+### `align`: `CSS['alignItems']`
 
 Adjusts the block alignment of children.
 
 -   Required: No
 
-##### `alignment`: `GridAlignment`
+### `alignment`: `GridAlignment`
 
 Adjusts the horizontal and vertical alignment of children.
 
 -   Required: No
 
-##### `columnGap`: `CSSProperties['gridColumnGap']`
+### `columnGap`: `CSSProperties['gridColumnGap']`
 
 Adjusts the `grid-column-gap`.
 
 -   Required: No
 
-##### `columns`: `number`
+### `columns`: `number`
 
 Adjusts the number of columns of the `Grid`.
 
 -   Required: No
 -   Default: `2`
 
-##### `gap`: `number`
+### `gap`: `number`
 
 Gap between each child.
 
 -   Required: No
 -   Default: `3`
 
-##### `isInline`: `boolean`
+### `isInline`: `boolean`
 
 Changes the CSS display from `grid` to `inline-grid`.
 
 -   Required: No
 
-##### `justify`: `CSS['justifyContent']`
+### `justify`: `CSS['justifyContent']`
 
 Adjusts the inline alignment of children.
 
 -   Required: No
 
-##### `rowGap`: `CSSProperties['gridRowGap']`
+### `rowGap`: `CSSProperties['gridRowGap']`
 
 Adjusts the `grid-row-gap`.
 
 -   Required: No
 
-##### `rows`: `number`
+### `rows`: `number`
 
 Adjusts the number of rows of the `Grid`.
 
 -   Required: No
 
-##### `templateColumns`: `CSS['gridTemplateColumns']`
+### `templateColumns`: `CSS['gridTemplateColumns']`
 
 Adjusts the CSS grid `template-columns`.
 
 -   Required: No
 
-##### `templateRows`: `CSS['gridTemplateRows']`
+### `templateRows`: `CSS['gridTemplateRows']`
 
 Adjusts the CSS grid `template-rows`.
 
diff --git a/packages/components/src/guide/index.tsx b/packages/components/src/guide/index.tsx
index c5655847d99e5e..121c9f22330e88 100644
--- a/packages/components/src/guide/index.tsx
+++ b/packages/components/src/guide/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -106,7 +106,7 @@ function Guide( {
 
 	return (
 		<Modal
-			className={ classnames( 'components-guide', className ) }
+			className={ clsx( 'components-guide', className ) }
 			contentLabel={ contentLabel }
 			isDismissible={ pages.length > 1 }
 			onRequestClose={ onFinish }
@@ -144,6 +144,7 @@ function Guide( {
 							className="components-guide__back-button"
 							variant="tertiary"
 							onClick={ goBack }
+							__next40pxDefaultSize
 						>
 							{ __( 'Previous' ) }
 						</Button>
@@ -153,6 +154,7 @@ function Guide( {
 							className="components-guide__forward-button"
 							variant="primary"
 							onClick={ goForward }
+							__next40pxDefaultSize
 						>
 							{ __( 'Next' ) }
 						</Button>
@@ -162,6 +164,7 @@ function Guide( {
 							className="components-guide__finish-button"
 							variant="primary"
 							onClick={ onFinish }
+							__next40pxDefaultSize
 						>
 							{ finishButtonText }
 						</Button>
diff --git a/packages/components/src/guide/style.scss b/packages/components/src/guide/style.scss
index b2516edeff1354..073bfc06843075 100644
--- a/packages/components/src/guide/style.scss
+++ b/packages/components/src/guide/style.scss
@@ -9,7 +9,6 @@
 	.components-modal__content {
 		padding: 0;
 		margin-top: 0;
-		border-radius: $radius-block-ui;
 
 		&::before {
 			content: none;
@@ -82,7 +81,7 @@
 		}
 
 		li[aria-current="step"] .components-button {
-			color: var(--wp-components-color-accent, var(--wp-admin-theme-color));
+			color: $components-color-accent;
 		}
 	}
 }
diff --git a/packages/components/src/h-stack/README.md b/packages/components/src/h-stack/README.md
index eb9db50aa5b41f..77e3c77b940f2a 100644
--- a/packages/components/src/h-stack/README.md
+++ b/packages/components/src/h-stack/README.md
@@ -29,7 +29,7 @@ function Example() {
 
 ## Props
 
-##### alignment
+### alignment
 
 **Type**: `HStackAlignment` | `CSS[ 'alignItems' ]`
 
@@ -47,33 +47,33 @@ Determines how the child elements are aligned.
 -   `edge`: Justifies content to be evenly spread out up to the main axis edges of the container.
 -   `stretch`: Stretches content to the cross axis edges of the container.
 
-##### direction
+### direction
 
 **Type**: `FlexDirection`
 
 The direction flow of the children content can be adjusted with `direction`. `column` will align children vertically and `row` will align children horizontally.
 
-##### expanded
+### expanded
 
 **Type**: `boolean`
 
 Expands to the maximum available width (if horizontal) or height (if vertical).
 
-##### justify
+### justify
 
 **Type**: `CSS['justifyContent']`
 
 Horizontally aligns content if the `direction` is `row`, or vertically aligns content if the `direction` is `column`.
 In the example below, `flex-start` will align the children content to the left.
 
-##### spacing
+### spacing
 
 **Type**: `CSS['width']`
 
 The amount of space between each child element. Spacing in between each child can be adjusted by using `spacing`.
 The value of `spacing` works as a multiplier to the library's grid system (base of `4px`).
 
-##### wrap
+### wrap
 
 **Type**: `boolean`
 
diff --git a/packages/components/src/h-stack/hook.tsx b/packages/components/src/h-stack/hook.tsx
index b7b8cf92954a1d..bb473a881b9dea 100644
--- a/packages/components/src/h-stack/hook.tsx
+++ b/packages/components/src/h-stack/hook.tsx
@@ -47,7 +47,8 @@ export function useHStack( props: WordPressComponentProps< Props, 'div' > ) {
 		gap: spacing,
 	};
 
-	const flexProps = useFlex( propsForFlex );
+	// Omit `isColumn` because it's not used in HStack.
+	const { isColumn, ...flexProps } = useFlex( propsForFlex );
 
 	return flexProps;
 }
diff --git a/packages/components/src/h-stack/test/index.tsx b/packages/components/src/h-stack/test/index.tsx
index ea4f9c94fbe7f8..75352f3dfd22f0 100644
--- a/packages/components/src/h-stack/test/index.tsx
+++ b/packages/components/src/h-stack/test/index.tsx
@@ -39,4 +39,14 @@ describe( 'props', () => {
 		);
 		expect( container ).toMatchSnapshot();
 	} );
+
+	test( 'should not pass through invalid props to the `as` component', () => {
+		const AsComponent = ( props: JSX.IntrinsicElements[ 'div' ] ) => {
+			return <div { ...props } />;
+		};
+
+		render( <HStack as={ AsComponent }>foobar</HStack> );
+
+		expect( console ).not.toHaveErrored();
+	} );
 } );
diff --git a/packages/components/src/heading/README.md b/packages/components/src/heading/README.md
index 5f7f41c0664698..a56e6e6ccd9321 100644
--- a/packages/components/src/heading/README.md
+++ b/packages/components/src/heading/README.md
@@ -25,7 +25,7 @@ function Example() {
 
 For a complete list of those props, check out [`Text`](/packages/components/src/text/README.md#props).
 
-##### `level`: `1 | 2 | 3 | 4 | 5 | 6 | '1' | '2' | '3' | '4' | '5' | '6'`
+### `level`: `1 | 2 | 3 | 4 | 5 | 6 | '1' | '2' | '3' | '4' | '5' | '6'`
 
 Passing any of the heading levels to `level` will both render the correct typographic text size as well as the semantic element corresponding to the level (`h1` for `1` for example).
 
diff --git a/packages/components/src/heading/test/__snapshots__/index.tsx.snap b/packages/components/src/heading/test/__snapshots__/index.tsx.snap
index 554446c2840cbc..cf863c4b2bb2ef 100644
--- a/packages/components/src/heading/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/heading/test/__snapshots__/index.tsx.snap
@@ -3,8 +3,10 @@
 exports[`props should render correctly 1`] = `
 .emotion-0 {
   color: #1e1e1e;
-  line-height: 1.2;
+  line-height: 1.4;
   margin: 0;
+  text-wrap: balance;
+  text-wrap: pretty;
   color: #1e1e1e;
   font-size: calc(1.95 * 13px);
   font-weight: 600;
@@ -25,6 +27,7 @@ Snapshot Diff:
 - Received styles
 + Base styles
 
+@@ -1,10 +1,10 @@
   Array [
     Object {
       "color": "#1e1e1e",
@@ -32,10 +35,10 @@ Snapshot Diff:
 -     "font-size": "calc(1.25 * 13px)",
 +     "font-size": "calc(1.95 * 13px)",
       "font-weight": "600",
-      "line-height": "1.2",
+      "line-height": "1.4",
       "margin": "0",
+      "text-wrap": "pretty",
     },
-  ]
 `;
 
 exports[`props should render level as a string 1`] = `
@@ -43,6 +46,7 @@ Snapshot Diff:
 - Received styles
 + Base styles
 
+@@ -1,10 +1,10 @@
   Array [
     Object {
       "color": "#1e1e1e",
@@ -50,8 +54,8 @@ Snapshot Diff:
 -     "font-size": "calc(1.25 * 13px)",
 +     "font-size": "calc(1.95 * 13px)",
       "font-weight": "600",
-      "line-height": "1.2",
+      "line-height": "1.4",
       "margin": "0",
+      "text-wrap": "pretty",
     },
-  ]
 `;
diff --git a/packages/components/src/heading/types.ts b/packages/components/src/heading/types.ts
index 4767c0407d5a03..6ec3f0a82ef2eb 100644
--- a/packages/components/src/heading/types.ts
+++ b/packages/components/src/heading/types.ts
@@ -17,10 +17,7 @@ export type HeadingSize =
 	| '5'
 	| '6';
 
-export type HeadingProps = Omit<
-	TextProps,
-	'size' | 'isBlock' | 'color' | 'weight'
-> & {
+export type HeadingProps = Omit< TextProps, 'isBlock' | 'color' | 'weight' > & {
 	/**
 	 * Passing any of the heading levels to `level` will both render the correct
 	 * typographic text size as well as the semantic element corresponding to
diff --git a/packages/components/src/higher-order/navigate-regions/style.scss b/packages/components/src/higher-order/navigate-regions/style.scss
index f146413a09dc9e..5fc1e210dea871 100644
--- a/packages/components/src/higher-order/navigate-regions/style.scss
+++ b/packages/components/src/higher-order/navigate-regions/style.scss
@@ -1,22 +1,23 @@
-// Allow the position to be easily overridden to e.g. fixed.
+$regionOutlineRatio: 2;
+
+@mixin region-selection-focus {
+	@include selected-block-focus( $regionOutlineRatio );
+	z-index: z-index(".is-focusing-regions {region} :focus::after");
+}
+
 [role="region"] {
 	position: relative;
+
+	// Handles the focus when we programatically send focus to this region
+	&.interface-interface-skeleton__content:focus-visible::after {
+		@include region-selection-focus;
+	}
 }
 
 .is-focusing-regions {
 	[role="region"]:focus::after {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		content: "";
-		pointer-events: none;
-		outline: 4px solid $components-color-accent;
-		outline-offset: -4px;
-		z-index: z-index(".is-focusing-regions {region} :focus::after");
+		@include region-selection-focus;
 	}
-
 	// Fixes for edge cases.
 	// Some of the regions are currently used for layout purposes as 'interface skeleton'
 	// items. When they're absolutely positioned or when they contain absolutely
@@ -29,11 +30,10 @@
 
 	// Header top bar when Distraction free mode is on.
 	&.is-distraction-free .interface-interface-skeleton__header .edit-post-header,
-	.interface-interface-skeleton__sidebar .edit-post-layout__toggle-sidebar-panel,
-	.interface-interface-skeleton__actions .edit-post-layout__toggle-publish-panel,
-	.interface-interface-skeleton__actions .edit-post-layout__toggle-entities-saved-states-panel,
+	.interface-interface-skeleton__sidebar .editor-layout__toggle-sidebar-panel,
+	.interface-interface-skeleton__actions .editor-layout__toggle-publish-panel,
+	.interface-interface-skeleton__actions .editor-layout__toggle-entities-saved-states-panel,
 	.editor-post-publish-panel {
-		outline: 4px solid $components-color-accent;
-		outline-offset: -4px;
+		@include selected-block-outline( $regionOutlineRatio );
 	}
 }
diff --git a/packages/components/src/higher-order/with-spoken-messages/index.tsx b/packages/components/src/higher-order/with-spoken-messages/index.tsx
index 5e0d52c81ad438..df97427594ef36 100644
--- a/packages/components/src/higher-order/with-spoken-messages/index.tsx
+++ b/packages/components/src/higher-order/with-spoken-messages/index.tsx
@@ -7,8 +7,7 @@ import { speak } from '@wordpress/a11y';
 /** @typedef {import('react').ComponentType} ComponentType */
 
 /**
- * A Higher Order Component used to be provide speak and debounced speak
- * functions.
+ * A Higher Order Component used to provide speak and debounced speak functions.
  *
  * @see https://developer.wordpress.org/block-editor/packages/packages-a11y/#speak
  *
diff --git a/packages/components/src/index.native.js b/packages/components/src/index.native.js
index 6c793499102e1c..7c2866cbe98b13 100644
--- a/packages/components/src/index.native.js
+++ b/packages/components/src/index.native.js
@@ -106,12 +106,11 @@ export { default as LinkPickerScreen } from './mobile/link-picker/link-picker-sc
 export { default as LinkSettings } from './mobile/link-settings';
 export { default as LinkSettingsScreen } from './mobile/link-settings/link-settings-screen';
 export { default as LinkSettingsNavigation } from './mobile/link-settings/link-settings-navigation';
-export { default as ImageLinkDestinationsScreen } from './mobile/link-settings/image-link-destinations-screen';
 export { default as SegmentedControl } from './mobile/segmented-control';
-export { default as Image, IMAGE_DEFAULT_FOCAL_POINT } from './mobile/image';
+export { default as Image } from './mobile/image';
+export { IMAGE_DEFAULT_FOCAL_POINT } from './mobile/image/constants';
 export { default as ImageEditingButton } from './mobile/image/image-editing-button';
 export { setClipboard, getClipboard } from './mobile/clipboard';
-export { default as AudioPlayer } from './mobile/audio-player';
 export { default as Badge } from './mobile/badge';
 export { default as Gridicons } from './mobile/gridicons';
 
@@ -122,6 +121,7 @@ export {
 	ALIGNMENT_BREAKPOINTS,
 	alignmentHelpers,
 } from './mobile/utils/alignments';
+export { default as getPxFromCssUnit } from './mobile/utils/get-px-from-css-unit';
 
 // Hooks.
 export {
@@ -130,15 +130,5 @@ export {
 	getValueAndUnit,
 } from './mobile/utils/use-unit-converter-to-mobile';
 
-export {
-	default as GlobalStylesContext,
-	useGlobalStyles,
-	withGlobalStyles,
-	getMergedGlobalStyles,
-} from './mobile/global-styles-context';
-export {
-	getGlobalStyles,
-	getColorsAndGradients,
-	useMobileGlobalStylesColors,
-	useEditorColorScheme,
-} from './mobile/global-styles-context/utils';
+// Private APIs.
+export { privateApis } from './private-apis';
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index a824162cb24129..e82d6da70279e8 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -12,7 +12,11 @@ export {
 } from '@wordpress/primitives';
 
 // Components.
-export { default as __experimentalAlignmentMatrixControl } from './alignment-matrix-control';
+export {
+	/** @deprecated Import `AlignmentMatrixControl` instead. */
+	default as __experimentalAlignmentMatrixControl,
+	default as AlignmentMatrixControl,
+} from './alignment-matrix-control';
 export {
 	default as Animate,
 	getAnimateClassName as __unstableGetAnimateClassName,
@@ -29,14 +33,22 @@ export {
 } from './autocomplete';
 export { default as BaseControl, useBaseControlProps } from './base-control';
 export {
+	/** @deprecated Import `BorderBoxControl` instead. */
 	BorderBoxControl as __experimentalBorderBoxControl,
+	BorderBoxControl,
 	hasSplitBorders as __experimentalHasSplitBorders,
 	isDefinedBorder as __experimentalIsDefinedBorder,
 	isEmptyBorder as __experimentalIsEmptyBorder,
 } from './border-box-control';
-export { BorderControl as __experimentalBorderControl } from './border-control';
 export {
+	/** @deprecated Import `BorderControl` instead. */
+	BorderControl as __experimentalBorderControl,
+	BorderControl,
+} from './border-control';
+export {
+	/** @deprecated Import `BoxControl` instead. */
 	default as __experimentalBoxControl,
+	default as BoxControl,
 	applyValueToSides as __experimentalApplyValueToSides,
 } from './box-control';
 export { default as Button } from './button';
@@ -61,9 +73,10 @@ export {
 	CompositeGroup as __unstableCompositeGroup,
 	CompositeItem as __unstableCompositeItem,
 	useCompositeState as __unstableUseCompositeState,
-} from './composite';
+} from './composite/legacy';
+export { Composite } from './composite';
 export { ConfirmDialog as __experimentalConfirmDialog } from './confirm-dialog';
-export { StableCustomSelectControl as CustomSelectControl } from './custom-select-control';
+export { default as CustomSelectControl } from './custom-select-control';
 export { default as Dashicon } from './dashicon';
 export { default as DateTimePicker, DatePicker, TimePicker } from './date-time';
 export { default as __experimentalDimensionControl } from './dimension-control';
@@ -116,11 +129,21 @@ export { default as __experimentalNavigationGroup } from './navigation/group';
 export { default as __experimentalNavigationItem } from './navigation/item';
 export { default as __experimentalNavigationMenu } from './navigation/menu';
 export {
+	/** @deprecated Import `Navigator` instead. */
 	NavigatorProvider as __experimentalNavigatorProvider,
+	/** @deprecated Import `Navigator` and use `Navigator.Screen` instead. */
 	NavigatorScreen as __experimentalNavigatorScreen,
+	/** @deprecated Import `Navigator` and use `Navigator.Button` instead. */
 	NavigatorButton as __experimentalNavigatorButton,
+	/** @deprecated Import `Navigator` and use `Navigator.BackButton` instead. */
 	NavigatorBackButton as __experimentalNavigatorBackButton,
+	/** @deprecated Import `Navigator` and use `Navigator.BackButton` instead. */
 	NavigatorToParentButton as __experimentalNavigatorToParentButton,
+} from './navigator/legacy';
+export {
+	Navigator,
+	useNavigator,
+	/** @deprecated Import `useNavigator` instead. */
 	useNavigator as __experimentalUseNavigator,
 } from './navigator';
 export { default as Notice } from './notice';
@@ -132,6 +155,7 @@ export { default as PanelHeader } from './panel/header';
 export { default as PanelRow } from './panel/row';
 export { default as Placeholder } from './placeholder';
 export { default as Popover } from './popover';
+export { default as ProgressBar } from './progress-bar';
 export { default as QueryControls } from './query-controls';
 export { default as __experimentalRadio } from './radio-group/radio';
 export { default as __experimentalRadioGroup } from './radio-group';
diff --git a/packages/components/src/input-control/README.md b/packages/components/src/input-control/README.md
index 1cde49917823ff..58a3b4a3b1a094 100644
--- a/packages/components/src/input-control/README.md
+++ b/packages/components/src/input-control/README.md
@@ -10,7 +10,7 @@ InputControl components let users enter and edit text. This is an experimental c
 
 ```js
 import { __experimentalInputControl as InputControl } from '@wordpress/components';
-import { useState } from '@wordpress/compose';
+import { useState } from 'react';
 
 const Example = () => {
 	const [ value, setValue ] = useState( '' );
@@ -107,3 +107,11 @@ The current value of the input.
 
 -   Type: `String`
 -   Required: No
+
+### __next40pxDefaultSize
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
diff --git a/packages/components/src/input-control/backdrop.tsx b/packages/components/src/input-control/backdrop.tsx
index c85efad03a8052..4fe0bb9097c62e 100644
--- a/packages/components/src/input-control/backdrop.tsx
+++ b/packages/components/src/input-control/backdrop.tsx
@@ -7,13 +7,13 @@ import { memo } from '@wordpress/element';
  */
 import { BackdropUI } from './styles/input-control-styles';
 
-function Backdrop( { disabled = false, isFocused = false } ) {
+function Backdrop( { disabled = false, isBorderless = false } ) {
 	return (
 		<BackdropUI
 			aria-hidden="true"
 			className="components-input-control__backdrop"
 			disabled={ disabled }
-			isFocused={ isFocused }
+			isBorderless={ isBorderless }
 		/>
 	);
 }
diff --git a/packages/components/src/input-control/index.tsx b/packages/components/src/input-control/index.tsx
index f9eafb7757e47e..fd0fc0a5c45536 100644
--- a/packages/components/src/input-control/index.tsx
+++ b/packages/components/src/input-control/index.tsx
@@ -1,14 +1,14 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef } from 'react';
 
 /**
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { useState, forwardRef } from '@wordpress/element';
+import { forwardRef } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -55,16 +55,10 @@ export function UnforwardedInputControl(
 		suffix,
 		value,
 		...restProps
-	} = useDeprecated36pxDefaultSizeProp< InputControlProps >(
-		props,
-		'wp.components.InputControl',
-		'6.4'
-	);
-
-	const [ isFocused, setIsFocused ] = useState( false );
+	} = useDeprecated36pxDefaultSizeProp< InputControlProps >( props );
 
 	const id = useUniqueId( idProp );
-	const classes = classNames( 'components-input-control', className );
+	const classes = clsx( 'components-input-control', className );
 
 	const draftHookProps = useDraft( {
 		value,
@@ -72,10 +66,7 @@ export function UnforwardedInputControl(
 		onChange,
 	} );
 
-	// ARIA descriptions can only contain plain text, so fall back to aria-details if not.
-	const helpPropName =
-		typeof help === 'string' ? 'aria-describedby' : 'aria-details';
-	const helpProp = !! help ? { [ helpPropName ]: `${ id }__help` } : {};
+	const helpProp = !! help ? { 'aria-describedby': `${ id }__help` } : {};
 
 	return (
 		<BaseControl
@@ -91,7 +82,6 @@ export function UnforwardedInputControl(
 				gap={ 3 }
 				hideLabelFromVision={ hideLabelFromVision }
 				id={ id }
-				isFocused={ isFocused }
 				justify="left"
 				label={ label }
 				labelPosition={ labelPosition }
@@ -107,14 +97,12 @@ export function UnforwardedInputControl(
 					className="components-input-control__input"
 					disabled={ disabled }
 					id={ id }
-					isFocused={ isFocused }
 					isPressEnterToChange={ isPressEnterToChange }
 					onKeyDown={ onKeyDown }
 					onValidate={ onValidate }
-					paddingInlineStart={ prefix ? space( 2 ) : undefined }
-					paddingInlineEnd={ suffix ? space( 2 ) : undefined }
+					paddingInlineStart={ prefix ? space( 1 ) : undefined }
+					paddingInlineEnd={ suffix ? space( 1 ) : undefined }
 					ref={ ref }
-					setIsFocused={ setIsFocused }
 					size={ size }
 					stateReducer={ stateReducer }
 					{ ...draftHookProps }
@@ -130,7 +118,7 @@ export function UnforwardedInputControl(
  *
  * ```jsx
  * import { __experimentalInputControl as InputControl } from '@wordpress/components';
- * import { useState } from '@wordpress/compose';
+ * import { useState } from 'react';
  *
  * const Example = () => {
  *   const [ value, setValue ] = useState( '' );
diff --git a/packages/components/src/input-control/input-base.tsx b/packages/components/src/input-control/input-base.tsx
index 64544971840b34..f1b8227563cfdc 100644
--- a/packages/components/src/input-control/input-base.tsx
+++ b/packages/components/src/input-control/input-base.tsx
@@ -7,23 +7,21 @@ import type { ForwardedRef } from 'react';
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { forwardRef, useMemo } from '@wordpress/element';
+import { useMemo } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import Backdrop from './backdrop';
 import Label from './label';
-import {
-	Container,
-	Root,
-	Prefix,
-	Suffix,
-	getSizeConfig,
-} from './styles/input-control-styles';
+import { Container, Root, Prefix, Suffix } from './styles/input-control-styles';
 import type { InputBaseProps, LabelPosition } from './types';
 import type { WordPressComponentProps } from '../context';
-import { ContextSystemProvider } from '../context';
+import {
+	ContextSystemProvider,
+	contextConnect,
+	useContextSystem,
+} from '../context';
 import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props';
 
 function useUniqueId( idProp?: string ) {
@@ -60,7 +58,7 @@ function getUIFlexProps( labelPosition?: LabelPosition ) {
 	return props;
 }
 
-export function InputBase(
+function InputBase(
 	props: WordPressComponentProps< InputBaseProps, 'div' >,
 	ref: ForwardedRef< HTMLDivElement >
 ) {
@@ -73,31 +71,25 @@ export function InputBase(
 		hideLabelFromVision = false,
 		labelPosition,
 		id: idProp,
-		isFocused = false,
+		isBorderless = false,
 		label,
 		prefix,
 		size = 'default',
 		suffix,
 		...restProps
 	} = useDeprecated36pxDefaultSizeProp(
-		props,
-		'wp.components.InputBase',
-		'6.4'
+		useContextSystem( props, 'InputBase' )
 	);
 
 	const id = useUniqueId( idProp );
 	const hideLabel = hideLabelFromVision || ! label;
 
-	const { paddingLeft, paddingRight } = getSizeConfig( {
-		inputSize: size,
-		__next40pxDefaultSize,
-	} );
 	const prefixSuffixContextValue = useMemo( () => {
 		return {
-			InputControlPrefixWrapper: { paddingLeft },
-			InputControlSuffixWrapper: { paddingRight },
+			InputControlPrefixWrapper: { __next40pxDefaultSize, size },
+			InputControlSuffixWrapper: { __next40pxDefaultSize, size },
 		};
-	}, [ paddingLeft, paddingRight ] );
+	}, [ __next40pxDefaultSize, size ] );
 
 	return (
 		// @ts-expect-error The `direction` prop from Flex (FlexDirection) conflicts with legacy SVGAttributes `direction` (string) that come from React intrinsic prop definitions.
@@ -106,8 +98,6 @@ export function InputBase(
 			{ ...getUIFlexProps( labelPosition ) }
 			className={ className }
 			gap={ 2 }
-			isFocused={ isFocused }
-			labelPosition={ labelPosition }
 			ref={ ref }
 		>
 			<Label
@@ -138,10 +128,14 @@ export function InputBase(
 						</Suffix>
 					) }
 				</ContextSystemProvider>
-				<Backdrop disabled={ disabled } isFocused={ isFocused } />
+				<Backdrop disabled={ disabled } isBorderless={ isBorderless } />
 			</Container>
 		</Root>
 	);
 }
 
-export default forwardRef( InputBase );
+/**
+ * `InputBase` is an internal component used to style the standard borders for an input,
+ * as well as handle the layout for prefix/suffix elements.
+ */
+export default contextConnect( InputBase, 'InputBase' );
diff --git a/packages/components/src/input-control/input-field.tsx b/packages/components/src/input-control/input-field.tsx
index 37e2bf4351c002..d9b5a293a0fa6e 100644
--- a/packages/components/src/input-control/input-field.tsx
+++ b/packages/components/src/input-control/input-field.tsx
@@ -24,6 +24,7 @@ import { useDragCursor } from './utils';
 import { Input } from './styles/input-control-styles';
 import { useInputControlStateReducer } from './reducer/reducer';
 import type { InputFieldProps } from './types';
+import { withIgnoreIMEEvents } from '../utils/with-ignore-ime-events';
 
 const noop = () => {};
 
@@ -34,18 +35,15 @@ function InputField(
 		dragThreshold = 10,
 		id,
 		isDragEnabled = false,
-		isFocused,
 		isPressEnterToChange = false,
 		onBlur = noop,
 		onChange = noop,
 		onDrag = noop,
 		onDragEnd = noop,
 		onDragStart = noop,
-		onFocus = noop,
 		onKeyDown = noop,
 		onValidate = noop,
 		size = 'default',
-		setIsFocused,
 		stateReducer = ( state: any ) => state,
 		value: valueProp,
 		type,
@@ -84,7 +82,6 @@ function InputField(
 
 	const handleOnBlur = ( event: FocusEvent< HTMLInputElement > ) => {
 		onBlur( event );
-		setIsFocused?.( false );
 
 		/**
 		 * If isPressEnterToChange is set, this commits the value to
@@ -96,11 +93,6 @@ function InputField(
 		}
 	};
 
-	const handleOnFocus = ( event: FocusEvent< HTMLInputElement > ) => {
-		onFocus( event );
-		setIsFocused?.( true );
-	};
-
 	const handleOnChange = ( event: ChangeEvent< HTMLInputElement > ) => {
 		const nextValue = event.target.value;
 		change( nextValue, event );
@@ -163,7 +155,9 @@ function InputField(
 				target,
 			};
 
-			if ( ! distance ) return;
+			if ( ! distance ) {
+				return;
+			}
 			event.stopPropagation();
 
 			/**
@@ -221,8 +215,7 @@ function InputField(
 			id={ id }
 			onBlur={ handleOnBlur }
 			onChange={ handleOnChange }
-			onFocus={ handleOnFocus }
-			onKeyDown={ handleOnKeyDown }
+			onKeyDown={ withIgnoreIMEEvents( handleOnKeyDown ) }
 			onMouseDown={ handleOnMouseDown }
 			ref={ ref }
 			inputSize={ size }
diff --git a/packages/components/src/input-control/input-prefix-wrapper.tsx b/packages/components/src/input-control/input-prefix-wrapper.tsx
index 23d9e823da932d..c5232e4d9e6bbc 100644
--- a/packages/components/src/input-control/input-prefix-wrapper.tsx
+++ b/packages/components/src/input-control/input-prefix-wrapper.tsx
@@ -6,19 +6,23 @@ import type { ForwardedRef } from 'react';
 /**
  * Internal dependencies
  */
-import { Spacer } from '../spacer';
 import type { WordPressComponentProps } from '../context';
 import { contextConnect, useContextSystem } from '../context';
-import type { InputControlPrefixWrapperProps } from './types';
+import type { PrefixSuffixWrapperProps } from './types';
+import { PrefixSuffixWrapper } from './styles/input-control-styles';
 
 function UnconnectedInputControlPrefixWrapper(
-	props: WordPressComponentProps< InputControlPrefixWrapperProps, 'div' >,
+	props: WordPressComponentProps< PrefixSuffixWrapperProps, 'div' >,
 	forwardedRef: ForwardedRef< any >
 ) {
 	const derivedProps = useContextSystem( props, 'InputControlPrefixWrapper' );
 
 	return (
-		<Spacer marginBottom={ 0 } { ...derivedProps } ref={ forwardedRef } />
+		<PrefixSuffixWrapper
+			{ ...derivedProps }
+			isPrefix
+			ref={ forwardedRef }
+		/>
 	);
 }
 
diff --git a/packages/components/src/input-control/input-suffix-wrapper.tsx b/packages/components/src/input-control/input-suffix-wrapper.tsx
index 1be352f562e369..fb3ec4c6ae9be9 100644
--- a/packages/components/src/input-control/input-suffix-wrapper.tsx
+++ b/packages/components/src/input-control/input-suffix-wrapper.tsx
@@ -6,20 +6,18 @@ import type { ForwardedRef } from 'react';
 /**
  * Internal dependencies
  */
-import { Spacer } from '../spacer';
 import type { WordPressComponentProps } from '../context';
 import { contextConnect, useContextSystem } from '../context';
-import type { InputControlSuffixWrapperProps } from './types';
+import type { PrefixSuffixWrapperProps } from './types';
+import { PrefixSuffixWrapper } from './styles/input-control-styles';
 
 function UnconnectedInputControlSuffixWrapper(
-	props: WordPressComponentProps< InputControlSuffixWrapperProps, 'div' >,
+	props: WordPressComponentProps< PrefixSuffixWrapperProps, 'div' >,
 	forwardedRef: ForwardedRef< any >
 ) {
 	const derivedProps = useContextSystem( props, 'InputControlSuffixWrapper' );
 
-	return (
-		<Spacer marginBottom={ 0 } { ...derivedProps } ref={ forwardedRef } />
-	);
+	return <PrefixSuffixWrapper { ...derivedProps } ref={ forwardedRef } />;
 }
 
 /**
diff --git a/packages/components/src/input-control/label.tsx b/packages/components/src/input-control/label.tsx
index 9c82d4d7902730..50a92289be0208 100644
--- a/packages/components/src/input-control/label.tsx
+++ b/packages/components/src/input-control/label.tsx
@@ -15,7 +15,9 @@ export default function Label( {
 	htmlFor,
 	...props
 }: WordPressComponentProps< InputControlLabelProps, 'label', false > ) {
-	if ( ! children ) return null;
+	if ( ! children ) {
+		return null;
+	}
 
 	if ( hideLabelFromVision ) {
 		return (
diff --git a/packages/components/src/input-control/reducer/reducer.ts b/packages/components/src/input-control/reducer/reducer.ts
index 8e3584d3910d74..51e54d6492f5c5 100644
--- a/packages/components/src/input-control/reducer/reducer.ts
+++ b/packages/components/src/input-control/reducer/reducer.ts
@@ -192,25 +192,28 @@ export function useInputControlStateReducer(
 	const pressDown = createKeyEvent( actions.PRESS_DOWN );
 	const pressEnter = createKeyEvent( actions.PRESS_ENTER );
 
-	const currentState = useRef( state );
-	const refProps = useRef( { value: initialState.value, onChangeHandler } );
+	const currentStateRef = useRef( state );
+	const refPropsRef = useRef( {
+		value: initialState.value,
+		onChangeHandler,
+	} );
 
 	// Freshens refs to props and state so that subsequent effects have access
 	// to their latest values without their changes causing effect runs.
 	useLayoutEffect( () => {
-		currentState.current = state;
-		refProps.current = { value: initialState.value, onChangeHandler };
+		currentStateRef.current = state;
+		refPropsRef.current = { value: initialState.value, onChangeHandler };
 	} );
 
 	// Propagates the latest state through onChange.
 	useLayoutEffect( () => {
 		if (
-			currentState.current._event !== undefined &&
-			state.value !== refProps.current.value &&
+			currentStateRef.current._event !== undefined &&
+			state.value !== refPropsRef.current.value &&
 			! state.isDirty
 		) {
-			refProps.current.onChangeHandler( state.value ?? '', {
-				event: currentState.current._event as
+			refPropsRef.current.onChangeHandler( state.value ?? '', {
+				event: currentStateRef.current._event as
 					| ChangeEvent< HTMLInputElement >
 					| PointerEvent< HTMLInputElement >,
 			} );
@@ -220,8 +223,8 @@ export function useInputControlStateReducer(
 	// Updates the state from props.
 	useLayoutEffect( () => {
 		if (
-			initialState.value !== currentState.current.value &&
-			! currentState.current.isDirty
+			initialState.value !== currentStateRef.current.value &&
+			! currentStateRef.current.isDirty
 		) {
 			dispatch( {
 				type: actions.CONTROL,
diff --git a/packages/components/src/input-control/stories/index.story.tsx b/packages/components/src/input-control/stories/index.story.tsx
index edfb43950d3a8a..1a9290e8e856ea 100644
--- a/packages/components/src/input-control/stories/index.story.tsx
+++ b/packages/components/src/input-control/stories/index.story.tsx
@@ -2,13 +2,18 @@
  * External dependencies
  */
 import type { Meta, StoryFn } from '@storybook/react';
-
+/**
+ * WordPress dependencies
+ */
+import { closeSmall, Icon, link, seen, unseen } from '@wordpress/icons';
+import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
 import InputControl from '..';
 import { InputControlPrefixWrapper } from '../input-prefix-wrapper';
 import { InputControlSuffixWrapper } from '../input-suffix-wrapper';
+import Button from '../../button';
 
 const meta: Meta< typeof InputControl > = {
 	title: 'Components (Experimental)/InputControl',
@@ -25,6 +30,7 @@ const meta: Meta< typeof InputControl > = {
 		value: { control: { disable: true } },
 	},
 	parameters: {
+		actions: { argTypesRegex: '^on.*' },
 		controls: { expanded: true },
 		docs: { canvas: { sourceState: 'shown' } },
 	},
@@ -69,6 +75,29 @@ WithSuffix.args = {
 	suffix: <InputControlSuffixWrapper>%</InputControlSuffixWrapper>,
 };
 
+/**
+ * `<InputControlPrefixWrapper>` and `<InputControlSuffixWrapper>` have a `variant` prop that can be used to
+ * adjust the wrapper based on the prefix or suffix content.
+ *
+ * - `'default'`: Standard padding for text content.
+ * - `'icon'`: For icons.
+ * - `'control'`: For controls, like buttons or selects.
+ */
+export const WithIconOrControl = Template.bind( {} );
+WithIconOrControl.args = {
+	...Default.args,
+	prefix: (
+		<InputControlPrefixWrapper variant="icon">
+			<Icon icon={ link } />
+		</InputControlPrefixWrapper>
+	),
+	suffix: (
+		<InputControlSuffixWrapper variant="control">
+			<Button icon={ closeSmall } size="small" label="Clear" />
+		</InputControlSuffixWrapper>
+	),
+};
+
 export const WithSideLabel = Template.bind( {} );
 WithSideLabel.args = {
 	...Default.args,
@@ -81,3 +110,24 @@ WithEdgeLabel.args = {
 	__unstableInputWidth: '20em',
 	labelPosition: 'edge',
 };
+
+export const ShowPassword: StoryFn< typeof InputControl > = ( args ) => {
+	const [ visible, setVisible ] = useState( false );
+	return (
+		<InputControl
+			type={ visible ? 'text' : 'password' }
+			label="Password"
+			suffix={
+				<InputControlSuffixWrapper variant="control">
+					<Button
+						size="small"
+						icon={ visible ? unseen : seen }
+						onClick={ () => setVisible( ( value ) => ! value ) }
+						label={ visible ? 'Hide password' : 'Show password' }
+					/>
+				</InputControlSuffixWrapper>
+			}
+			{ ...args }
+		/>
+	);
+};
diff --git a/packages/components/src/input-control/styles/input-control-styles.tsx b/packages/components/src/input-control/styles/input-control-styles.tsx
index e4f4c3664e1d9b..39eea8fdb029a1 100644
--- a/packages/components/src/input-control/styles/input-control-styles.tsx
+++ b/packages/components/src/input-control/styles/input-control-styles.tsx
@@ -13,8 +13,7 @@ import type { WordPressComponentProps } from '../../context';
 import { Flex, FlexItem } from '../../flex';
 import { Text } from '../../text';
 import { baseLabelTypography, COLORS, CONFIG, rtl } from '../../utils';
-import type { LabelPosition, Size } from '../types';
-import { space } from '../../utils/space';
+import type { LabelPosition, Size, PrefixSuffixWrapperProps } from '../types';
 
 type ContainerProps = {
 	disabled?: boolean;
@@ -23,23 +22,74 @@ type ContainerProps = {
 	labelPosition?: LabelPosition;
 };
 
-type RootProps = {
-	isFocused?: boolean;
-	labelPosition?: LabelPosition;
+export const Prefix = styled.span`
+	box-sizing: border-box;
+	display: block;
+`;
+
+export const Suffix = styled.span`
+	align-items: center;
+	align-self: stretch;
+	box-sizing: border-box;
+	display: flex;
+`;
+
+type BackdropProps = {
+	disabled?: boolean;
+	isBorderless?: boolean;
 };
 
-const rootFocusedStyles = ( { isFocused }: RootProps ) => {
-	if ( ! isFocused ) return '';
+const backdropBorderColor = ( {
+	disabled,
+	isBorderless,
+}: BackdropProps ): CSSProperties[ 'borderColor' ] => {
+	if ( isBorderless ) {
+		return 'transparent';
+	}
 
-	return css( { zIndex: 1 } );
+	if ( disabled ) {
+		return COLORS.ui.borderDisabled;
+	}
+
+	return COLORS.ui.border;
 };
 
-export const Root = styled( Flex )< RootProps >`
+export const BackdropUI = styled.div< BackdropProps >`
+	&&& {
+		box-sizing: border-box;
+		border-color: ${ backdropBorderColor };
+		border-radius: inherit;
+		border-style: solid;
+		border-width: 1px;
+		bottom: 0;
+		left: 0;
+		margin: 0;
+		padding: 0;
+		pointer-events: none;
+		position: absolute;
+		right: 0;
+		top: 0;
+
+		${ rtl( { paddingLeft: 2 } ) }
+	}
+`;
+
+export const Root = styled( Flex )`
 	box-sizing: border-box;
 	position: relative;
-	border-radius: 2px;
+	border-radius: ${ CONFIG.radiusSmall };
 	padding-top: 0;
-	${ rootFocusedStyles }
+
+	// Focus within, excluding cases where auxiliary controls in prefix or suffix have focus.
+	&:focus-within:not( :has( :is( ${ Prefix }, ${ Suffix } ):focus-within ) ) {
+		${ BackdropUI } {
+			border-color: ${ COLORS.ui.borderFocus };
+			box-shadow: ${ CONFIG.controlBoxShadowFocus };
+			// Windows High Contrast mode will show this outline, but not the box-shadow.
+			outline: 2px solid transparent;
+			outline-offset: -2px;
+		}
+	}
 `;
 
 const containerDisabledStyles = ( { disabled }: ContainerProps ) => {
@@ -54,9 +104,13 @@ const containerWidthStyles = ( {
 	__unstableInputWidth,
 	labelPosition,
 }: ContainerProps ) => {
-	if ( ! __unstableInputWidth ) return css( { width: '100%' } );
+	if ( ! __unstableInputWidth ) {
+		return css( { width: '100%' } );
+	}
 
-	if ( labelPosition === 'side' ) return '';
+	if ( labelPosition === 'side' ) {
+		return '';
+	}
 
 	if ( labelPosition === 'edge' ) {
 		return css( {
@@ -90,24 +144,29 @@ type InputProps = {
 };
 
 const disabledStyles = ( { disabled }: InputProps ) => {
-	if ( ! disabled ) return '';
+	if ( ! disabled ) {
+		return '';
+	}
 
 	return css( {
 		color: COLORS.ui.textDisabled,
 	} );
 };
 
-const fontSizeStyles = ( { inputSize: size }: InputProps ) => {
+export const fontSizeStyles = ( { inputSize: size }: InputProps ) => {
 	const sizes = {
 		default: '13px',
 		small: '11px',
+		compact: '13px',
 		'__unstable-large': '13px',
 	};
 
 	const fontSize = sizes[ size as Size ] || sizes.default;
 	const fontSizeMobile = '16px';
 
-	if ( ! fontSize ) return '';
+	if ( ! fontSize ) {
+		return '';
+	}
 
 	return css`
 		font-size: ${ fontSizeMobile };
@@ -128,33 +187,34 @@ export const getSizeConfig = ( {
 			height: 40,
 			lineHeight: 1,
 			minHeight: 40,
-			paddingLeft: space( 4 ),
-			paddingRight: space( 4 ),
+			paddingLeft: CONFIG.controlPaddingX,
+			paddingRight: CONFIG.controlPaddingX,
 		},
 		small: {
 			height: 24,
 			lineHeight: 1,
 			minHeight: 24,
-			paddingLeft: space( 2 ),
-			paddingRight: space( 2 ),
+			paddingLeft: CONFIG.controlPaddingXSmall,
+			paddingRight: CONFIG.controlPaddingXSmall,
+		},
+		compact: {
+			height: 32,
+			lineHeight: 1,
+			minHeight: 32,
+			paddingLeft: CONFIG.controlPaddingXSmall,
+			paddingRight: CONFIG.controlPaddingXSmall,
 		},
 		'__unstable-large': {
 			height: 40,
 			lineHeight: 1,
 			minHeight: 40,
-			paddingLeft: space( 4 ),
-			paddingRight: space( 4 ),
+			paddingLeft: CONFIG.controlPaddingX,
+			paddingRight: CONFIG.controlPaddingX,
 		},
 	};
 
 	if ( ! __next40pxDefaultSize ) {
-		sizes.default = {
-			height: 32,
-			lineHeight: 1,
-			minHeight: 32,
-			paddingLeft: space( 2 ),
-			paddingRight: space( 2 ),
-		};
+		sizes.default = sizes.compact;
 	}
 
 	return sizes[ size as Size ] || sizes.default;
@@ -211,7 +271,7 @@ export const Input = styled.input< InputProps >`
 		box-sizing: border-box;
 		border: none;
 		box-shadow: none !important;
-		color: ${ COLORS.gray[ 900 ] };
+		color: ${ COLORS.theme.foreground };
 		display: block;
 		font-family: inherit;
 		margin: 0;
@@ -259,68 +319,34 @@ export const LabelWrapper = styled( FlexItem )`
 	max-width: calc( 100% - 10px );
 `;
 
-type BackdropProps = {
-	disabled?: boolean;
-	isFocused?: boolean;
-};
+const prefixSuffixWrapperStyles = ( {
+	variant = 'default',
+	size,
+	__next40pxDefaultSize,
+	isPrefix,
+}: PrefixSuffixWrapperProps & { isPrefix?: boolean } ) => {
+	const { paddingLeft: padding } = getSizeConfig( {
+		inputSize: size,
+		__next40pxDefaultSize,
+	} );
 
-const backdropFocusedStyles = ( {
-	disabled,
-	isFocused,
-}: BackdropProps ): SerializedStyles => {
-	let borderColor = isFocused ? COLORS.ui.borderFocus : COLORS.ui.border;
-
-	let boxShadow;
-	let outline;
-	let outlineOffset;
-
-	if ( isFocused ) {
-		boxShadow = CONFIG.controlBoxShadowFocus;
-		// Windows High Contrast mode will show this outline, but not the box-shadow.
-		outline = `2px solid transparent`;
-		outlineOffset = `-2px`;
-	}
+	const paddingProperty = isPrefix
+		? 'paddingInlineStart'
+		: 'paddingInlineEnd';
 
-	if ( disabled ) {
-		borderColor = COLORS.ui.borderDisabled;
+	if ( variant === 'default' ) {
+		return css( {
+			[ paddingProperty ]: padding,
+		} );
 	}
 
+	// If variant is 'icon' or 'control'
 	return css( {
-		boxShadow,
-		borderColor,
-		borderStyle: 'solid',
-		borderWidth: 1,
-		outline,
-		outlineOffset,
+		display: 'flex',
+		[ paddingProperty ]: padding - 4,
 	} );
 };
 
-export const BackdropUI = styled.div< BackdropProps >`
-	&&& {
-		box-sizing: border-box;
-		border-radius: inherit;
-		bottom: 0;
-		left: 0;
-		margin: 0;
-		padding: 0;
-		pointer-events: none;
-		position: absolute;
-		right: 0;
-		top: 0;
-
-		${ backdropFocusedStyles }
-		${ rtl( { paddingLeft: 2 } ) }
-	}
-`;
-
-export const Prefix = styled.span`
-	box-sizing: border-box;
-	display: block;
-`;
-
-export const Suffix = styled.span`
-	align-items: center;
-	align-self: stretch;
-	box-sizing: border-box;
-	display: flex;
+export const PrefixSuffixWrapper = styled.div`
+	${ prefixSuffixWrapperStyles }
 `;
diff --git a/packages/components/src/input-control/test/index.js b/packages/components/src/input-control/test/index.js
index 1ca2860442bd95..ace3086c388c8b 100644
--- a/packages/components/src/input-control/test/index.js
+++ b/packages/components/src/input-control/test/index.js
@@ -53,7 +53,7 @@ describe( 'InputControl', () => {
 			).toBeInTheDocument();
 		} );
 
-		it( 'should render help as aria-details when not plain text', () => {
+		it( 'should still render help as aria-describedby when not plain text', () => {
 			render( <InputControl help={ <a href="/foo">My help text</a> } /> );
 
 			const input = screen.getByRole( 'textbox' );
@@ -61,7 +61,7 @@ describe( 'InputControl', () => {
 
 			expect(
 				// eslint-disable-next-line testing-library/no-node-access
-				help.closest( `#${ input.getAttribute( 'aria-details' ) }` )
+				help.closest( `#${ input.getAttribute( 'aria-describedby' ) }` )
 			).toBeVisible();
 		} );
 	} );
@@ -112,10 +112,13 @@ describe( 'InputControl', () => {
 				const onKeyDown = ( { key } ) => {
 					heldKeySet.add( key );
 					if ( key === 'Escape' ) {
-						if ( heldKeySet.has( 'Meta' ) ) setState( 'qux' );
-						else if ( heldKeySet.has( 'Alt' ) )
+						if ( heldKeySet.has( 'Meta' ) ) {
+							setState( 'qux' );
+						} else if ( heldKeySet.has( 'Alt' ) ) {
 							setState( undefined );
-						else setState( '' );
+						} else {
+							setState( '' );
+						}
 					}
 				};
 				const onKeyUp = ( { key } ) => heldKeySet.delete( key );
@@ -204,8 +207,9 @@ describe( 'InputControl', () => {
 						if (
 							action.type === 'COMMIT' &&
 							action.payload.event.type === 'blur'
-						)
+						) {
 							value = value.replace( /\bnow\b/, 'meow' );
+						}
 
 						return { ...state, value };
 					} }
diff --git a/packages/components/src/input-control/types.ts b/packages/components/src/input-control/types.ts
index a804efadd89d38..13f078cd89cc1f 100644
--- a/packages/components/src/input-control/types.ts
+++ b/packages/components/src/input-control/types.ts
@@ -23,7 +23,7 @@ export type DragDirection = 'n' | 's' | 'e' | 'w';
 
 export type DragProps = Parameters< Parameters< typeof useDrag >[ 0 ] >[ 0 ];
 
-export type Size = 'default' | 'small' | '__unstable-large';
+export type Size = 'default' | 'small' | 'compact' | '__unstable-large';
 
 interface BaseProps {
 	/**
@@ -31,6 +31,7 @@ interface BaseProps {
 	 *
 	 * @default false
 	 * @deprecated
+	 * @ignore
 	 */
 	__next36pxDefaultSize?: boolean;
 	/**
@@ -46,14 +47,6 @@ interface BaseProps {
 	 * @default false
 	 */
 	hideLabelFromVision?: boolean;
-	/**
-	 * Whether the component should be in a focused state.
-	 * Used to coordinate focus states when the actual focused element and the component handling
-	 * visual focus are separate.
-	 *
-	 * @default false
-	 */
-	isFocused: boolean;
 	/**
 	 * The position of the label.
 	 *
@@ -111,7 +104,6 @@ export interface InputFieldProps
 	) => void;
 	paddingInlineStart?: CSSProperties[ 'paddingInlineStart' ];
 	paddingInlineEnd?: CSSProperties[ 'paddingInlineEnd' ];
-	setIsFocused: ( isFocused: boolean ) => void;
 	stateReducer?: StateReducer;
 	/**
 	 * The current value of the input.
@@ -176,10 +168,19 @@ export interface InputBaseProps extends BaseProps, FlexProps {
 	 * If this property is added, a label will be generated using label property as the content.
 	 */
 	label?: ReactNode;
+	/**
+	 * Whether to hide the border when not focused.
+	 *
+	 * @default false
+	 */
+	isBorderless?: boolean;
 }
 
 export interface InputControlProps
-	extends Omit< InputBaseProps, 'children' | 'isFocused' | keyof FlexProps >,
+	extends Omit<
+			InputBaseProps,
+			'children' | 'isBorderless' | keyof FlexProps
+		>,
 		Pick< BaseControlProps, 'help' >,
 		/**
 		 * The `prefix` prop in `WordPressComponentProps< InputFieldProps, 'input', false >` comes from the
@@ -188,15 +189,13 @@ export interface InputControlProps
 		 * be the only prefix prop. Otherwise it tries to do a union of the two prefix properties and you end up
 		 * with an unresolvable type.
 		 *
-		 * `isFocused`, `setIsFocused`, `paddingInlineStart`, and `paddingInlineEnd` are managed internally by
+		 * `paddingInlineStart`, and `paddingInlineEnd` are managed internally by
 		 * the InputControl, but the rest of the props for InputField are passed through.
 		 */
 		Omit<
 			WordPressComponentProps< InputFieldProps, 'input', false >,
 			| 'stateReducer'
 			| 'prefix'
-			| 'isFocused'
-			| 'setIsFocused'
 			| 'paddingInlineStart'
 			| 'paddingInlineEnd'
 		> {
@@ -210,16 +209,31 @@ export interface InputControlLabelProps {
 	size?: BaseProps[ 'size' ];
 }
 
-export type InputControlPrefixWrapperProps = {
+export type PrefixSuffixWrapperProps = {
 	/**
-	 * The prefix to be inserted.
+	 * The content to be inserted.
 	 */
 	children: ReactNode;
-};
-
-export type InputControlSuffixWrapperProps = {
 	/**
-	 * The suffix to be inserted.
+	 * Internal prop used to control the padding size of the wrapper.
+	 *
+	 * @ignore
 	 */
-	children: ReactNode;
+	size?: BaseProps[ 'size' ];
+	/**
+	 * Internal prop used to control the padding size of the wrapper.
+	 *
+	 * @ignore
+	 */
+	__next40pxDefaultSize?: BaseProps[ '__next40pxDefaultSize' ];
+	/**
+	 * Adjust the wrapper based on the prefix or suffix content.
+	 *
+	 * - `'default'`: Standard padding for text content.
+	 * - `'icon'`: For icons.
+	 * - `'control'`: For controls, like buttons or selects.
+	 *
+	 * @default 'default'
+	 */
+	variant?: 'default' | 'icon' | 'control';
 };
diff --git a/packages/components/src/input-control/utils.ts b/packages/components/src/input-control/utils.ts
index f82002fb6d78b4..5bc42312af1f5d 100644
--- a/packages/components/src/input-control/utils.ts
+++ b/packages/components/src/input-control/utils.ts
@@ -73,7 +73,7 @@ export function useDraft( props: {
 	onBlur?: FocusEventHandler;
 	onChange: InputChangeCallback;
 } ) {
-	const refPreviousValue = useRef( props.value );
+	const previousValueRef = useRef( props.value );
 	const [ draft, setDraft ] = useState< {
 		value?: string;
 		isStale?: boolean;
@@ -84,12 +84,13 @@ export function useDraft( props: {
 	// To do so, it tracks the previous value and marks the draft value as stale
 	// after each render.
 	useLayoutEffect( () => {
-		const { current: previousValue } = refPreviousValue;
-		refPreviousValue.current = props.value;
-		if ( draft.value !== undefined && ! draft.isStale )
+		const { current: previousValue } = previousValueRef;
+		previousValueRef.current = props.value;
+		if ( draft.value !== undefined && ! draft.isStale ) {
 			setDraft( { ...draft, isStale: true } );
-		else if ( draft.isStale && props.value !== previousValue )
+		} else if ( draft.isStale && props.value !== previousValue ) {
 			setDraft( {} );
+		}
 	}, [ props.value, draft ] );
 
 	const onChange: InputChangeCallback = ( nextValue, extra ) => {
diff --git a/packages/components/src/item-group/item/hook.ts b/packages/components/src/item-group/item/hook.ts
index 188b575e072c87..be817a24dcbb1e 100644
--- a/packages/components/src/item-group/item/hook.ts
+++ b/packages/components/src/item-group/item/hook.ts
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import type { ElementType } from 'react';
-
 /**
  * WordPress dependencies
  */
@@ -32,11 +27,7 @@ export function useItem( props: WordPressComponentProps< ItemProps, 'div' > ) {
 
 	const size = sizeProp || contextSize;
 
-	const as =
-		asProp ||
-		( ( typeof onClick !== 'undefined'
-			? 'button'
-			: 'div' ) as ElementType );
+	const as = asProp || ( typeof onClick !== 'undefined' ? 'button' : 'div' );
 
 	const cx = useCx();
 
diff --git a/packages/components/src/item-group/stories/index.story.tsx b/packages/components/src/item-group/stories/index.story.tsx
index 473cdfedbf4f12..99309b81ea314f 100644
--- a/packages/components/src/item-group/stories/index.story.tsx
+++ b/packages/components/src/item-group/stories/index.story.tsx
@@ -37,6 +37,8 @@ const Template: StoryFn< typeof ItemGroup > = ( props ) => (
 
 export const Default: StoryFn< typeof ItemGroup > = Template.bind( {} );
 Default.args = {
+	isBordered: true,
+	isSeparated: true,
 	children: (
 		[
 			{
@@ -67,6 +69,7 @@ export const NonClickableItems: StoryFn< typeof ItemGroup > = Template.bind(
 	{}
 );
 NonClickableItems.args = {
+	...Default.args,
 	children: (
 		[
 			{
@@ -83,6 +86,7 @@ NonClickableItems.args = {
 
 export const CustomItemSize: StoryFn< typeof ItemGroup > = Template.bind( {} );
 CustomItemSize.args = {
+	...Default.args,
 	children: (
 		[
 			{
@@ -98,9 +102,9 @@ CustomItemSize.args = {
 	 ).map( mapPropsToItem ),
 };
 
-export const WithBorder: StoryFn< typeof ItemGroup > = Template.bind( {} );
-WithBorder.args = {
+export const WithoutBorder: StoryFn< typeof ItemGroup > = Template.bind( {} );
+WithoutBorder.args = {
 	...Default.args,
-	isBordered: true,
-	isSeparated: true,
+	isBordered: false,
+	isSeparated: false,
 };
diff --git a/packages/components/src/item-group/styles.ts b/packages/components/src/item-group/styles.ts
index 7019d61ff1ce51..a2d73c8dcfc592 100644
--- a/packages/components/src/item-group/styles.ts
+++ b/packages/components/src/item-group/styles.ts
@@ -35,10 +35,7 @@ export const unstyledButton = ( as: 'a' | 'button' ) => {
 
 		&:focus-visible {
 			box-shadow: 0 0 0 var( --wp-admin-border-width-focus )
-				var(
-					--wp-components-color-accent,
-					var( --wp-admin-theme-color, ${ COLORS.theme.accent } )
-				);
+				${ COLORS.theme.accent };
 			// Windows high contrast mode.
 			outline: 2px solid transparent;
 			outline-offset: 0;
@@ -73,7 +70,7 @@ export const separated = css`
 	}
 `;
 
-const borderRadius = CONFIG.controlBorderRadius;
+const borderRadius = CONFIG.radiusSmall;
 
 export const spacedAround = css`
 	border-radius: ${ borderRadius };
@@ -108,12 +105,12 @@ const paddingYLarge = `calc((${ CONFIG.controlHeightLarge } - ${ baseFontHeight
 
 export const itemSizes = {
 	small: css`
-		padding: ${ paddingYSmall } ${ CONFIG.controlPaddingXSmall };
+		padding: ${ paddingYSmall } ${ CONFIG.controlPaddingXSmall }px;
 	`,
 	medium: css`
-		padding: ${ paddingY } ${ CONFIG.controlPaddingX };
+		padding: ${ paddingY } ${ CONFIG.controlPaddingX }px;
 	`,
 	large: css`
-		padding: ${ paddingYLarge } ${ CONFIG.controlPaddingXLarge };
+		padding: ${ paddingYLarge } ${ CONFIG.controlPaddingXLarge }px;
 	`,
 };
diff --git a/packages/components/src/item-group/test/__snapshots__/index.js.snap b/packages/components/src/item-group/test/__snapshots__/index.js.snap
index c31562a222b6c9..4104a4bf5140c1 100644
--- a/packages/components/src/item-group/test/__snapshots__/index.js.snap
+++ b/packages/components/src/item-group/test/__snapshots__/index.js.snap
@@ -11,8 +11,8 @@ Snapshot Diff:
         role="listitem"
       >
         <div
--         class="components-item css-ufjlmj-View-medium-item-spacedAround e19lxcc00"
-+         class="components-item css-17haj95-View-large-item-spacedAround e19lxcc00"
+-         class="components-item css-au4yox-PolymorphicDiv-medium-item-spacedAround e19lxcc00"
++         class="components-item css-1ycukrf-PolymorphicDiv-large-item-spacedAround e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="Item"
         >
@@ -24,8 +24,8 @@ Snapshot Diff:
         role="listitem"
       >
         <div
--         class="components-item css-ufjlmj-View-medium-item-spacedAround e19lxcc00"
-+         class="components-item css-17haj95-View-large-item-spacedAround e19lxcc00"
+-         class="components-item css-au4yox-PolymorphicDiv-medium-item-spacedAround e19lxcc00"
++         class="components-item css-1ycukrf-PolymorphicDiv-large-item-spacedAround e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="Item"
         >
@@ -44,8 +44,8 @@ Snapshot Diff:
       role="listitem"
     >
       <div
--       class="components-item css-cl593w-View-medium-item e19lxcc00"
-+       class="components-item css-1yvqxd-View-large-item e19lxcc00"
+-       class="components-item css-tpom78-PolymorphicDiv-medium-item e19lxcc00"
++       class="components-item css-sbyvbg-PolymorphicDiv-large-item e19lxcc00"
         data-wp-c16t="true"
         data-wp-component="Item"
       >
@@ -74,7 +74,7 @@ exports[`ItemGroup ItemGroup component should render correctly 1`] = `
 }
 
 .emotion-3 {
-  padding: calc((36px - calc(13px * 1.2) - 2px) / 2) 12px;
+  padding: calc((36px - calc(13px * 1.4) - 2px) / 2) 12px;
   box-sizing: border-box;
   width: 100%;
   display: block;
@@ -114,8 +114,8 @@ Snapshot Diff:
 @@ -1,18 +1,18 @@
   <div>
     <div
--     class="components-item-group css-kj8mvb-View-rounded e19lxcc00"
-+     class="components-item-group css-18qvw1m-View-separated-rounded e19lxcc00"
+-     class="components-item-group css-1iattls-PolymorphicDiv-rounded e19lxcc00"
++     class="components-item-group css-zgfros-PolymorphicDiv-separated-rounded e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="ItemGroup"
       role="list"
@@ -125,8 +125,8 @@ Snapshot Diff:
         role="listitem"
       >
         <div
--         class="components-item css-ufjlmj-View-medium-item-spacedAround e19lxcc00"
-+         class="components-item css-cl593w-View-medium-item e19lxcc00"
+-         class="components-item css-au4yox-PolymorphicDiv-medium-item-spacedAround e19lxcc00"
++         class="components-item css-tpom78-PolymorphicDiv-medium-item e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="Item"
         >
@@ -142,8 +142,8 @@ Snapshot Diff:
 @@ -1,18 +1,18 @@
   <div>
     <div
--     class="components-item-group css-kj8mvb-View-rounded e19lxcc00"
-+     class="components-item-group css-acyoj6-View-bordered-rounded e19lxcc00"
+-     class="components-item-group css-1iattls-PolymorphicDiv-rounded e19lxcc00"
++     class="components-item-group css-1ibn92o-PolymorphicDiv-bordered-rounded e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="ItemGroup"
       role="list"
@@ -153,8 +153,8 @@ Snapshot Diff:
         role="listitem"
       >
         <div
--         class="components-item css-ufjlmj-View-medium-item-spacedAround e19lxcc00"
-+         class="components-item css-cl593w-View-medium-item e19lxcc00"
+-         class="components-item css-au4yox-PolymorphicDiv-medium-item-spacedAround e19lxcc00"
++         class="components-item css-tpom78-PolymorphicDiv-medium-item e19lxcc00"
           data-wp-c16t="true"
           data-wp-component="Item"
         >
@@ -170,8 +170,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-item-group css-kj8mvb-View-rounded e19lxcc00"
-+     class="components-item-group css-1mm2cvy-View e19lxcc00"
+-     class="components-item-group css-1iattls-PolymorphicDiv-rounded e19lxcc00"
++     class="components-item-group css-161q9d5-PolymorphicDiv e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="ItemGroup"
       role="list"
diff --git a/packages/components/src/item-group/test/index.js b/packages/components/src/item-group/test/index.js
index dba3c26d88411a..be89f5880089fb 100644
--- a/packages/components/src/item-group/test/index.js
+++ b/packages/components/src/item-group/test/index.js
@@ -29,7 +29,7 @@ describe( 'ItemGroup', () => {
 			);
 
 			const { container: withBorders } = render(
-				<ItemGroup isBordered={ true }>
+				<ItemGroup isBordered>
 					<Item>Code is poetry</Item>
 				</ItemGroup>
 			);
@@ -63,7 +63,7 @@ describe( 'ItemGroup', () => {
 			);
 
 			const { container: separatedItems } = render(
-				<ItemGroup isSeparated={ true }>
+				<ItemGroup isSeparated>
 					<Item>Code is poetry</Item>
 				</ItemGroup>
 			);
diff --git a/packages/components/src/keyboard-shortcuts/stories/index.story.tsx b/packages/components/src/keyboard-shortcuts/stories/index.story.tsx
index d181be737353cd..0c8e0f451929a0 100644
--- a/packages/components/src/keyboard-shortcuts/stories/index.story.tsx
+++ b/packages/components/src/keyboard-shortcuts/stories/index.story.tsx
@@ -10,7 +10,8 @@ import KeyboardShortcuts from '..';
 
 const meta: Meta< typeof KeyboardShortcuts > = {
 	component: KeyboardShortcuts,
-	title: 'Components/KeyboardShortcuts',
+	title: 'Components/Utilities/KeyboardShortcuts',
+	id: 'components-keyboardshortcuts',
 	parameters: {
 		controls: { expanded: true },
 		docs: { canvas: { sourceState: 'shown' } },
@@ -32,7 +33,9 @@ Default.args = {
 	},
 	children: (
 		<div>
-			<p>{ `Hit the "a" or "b" key in this textarea:` }</p>
+			{ /* eslint-disable react/no-unescaped-entities */ }
+			<p>Hit the "a" or "b" key in this textarea:</p>
+			{ /* eslint-enable react/no-unescaped-entities */ }
 			<textarea />
 		</div>
 	),
diff --git a/packages/components/src/lock-unlock.js b/packages/components/src/lock-unlock.js
new file mode 100644
index 00000000000000..7749a249cd02ac
--- /dev/null
+++ b/packages/components/src/lock-unlock.js
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+		'@wordpress/components'
+	);
diff --git a/packages/components/src/menu-group/README.md b/packages/components/src/menu-group/README.md
index 94dc54e0cda8ce..f3e18edec9b1a1 100644
--- a/packages/components/src/menu-group/README.md
+++ b/packages/components/src/menu-group/README.md
@@ -4,14 +4,6 @@
 
 ![MenuGroup Example](https://wordpress.org/gutenberg/files/2019/03/MenuGroup.png)
 
-1. MenuGroup
-
-## Table of Contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
diff --git a/packages/components/src/menu-group/index.tsx b/packages/components/src/menu-group/index.tsx
index 00938928969507..4148db8f369557 100644
--- a/packages/components/src/menu-group/index.tsx
+++ b/packages/components/src/menu-group/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -38,7 +38,7 @@ export function MenuGroup( props: MenuGroupProps ) {
 	}
 
 	const labelId = `components-menu-group-label-${ instanceId }`;
-	const classNames = classnames( className, 'components-menu-group', {
+	const classNames = clsx( className, 'components-menu-group', {
 		'has-hidden-separator': hideSeparator,
 	} );
 
diff --git a/packages/components/src/menu-group/stories/index.story.tsx b/packages/components/src/menu-group/stories/index.story.tsx
index 80cdae3dab600a..7cb9004b45a8c2 100644
--- a/packages/components/src/menu-group/stories/index.story.tsx
+++ b/packages/components/src/menu-group/stories/index.story.tsx
@@ -54,7 +54,7 @@ const MultiGroupsTemplate: StoryFn< typeof MenuGroup > = ( args ) => {
 
 	return (
 		<>
-			<MenuGroup label={ 'View' }>
+			<MenuGroup label="View">
 				<MenuItem>Top Toolbar</MenuItem>
 				<MenuItem>Spotlight Mode</MenuItem>
 				<MenuItem>Distraction Free</MenuItem>
diff --git a/packages/components/src/menu-group/style.scss b/packages/components/src/menu-group/style.scss
index d9412c504940b3..744e3f74c5b955 100644
--- a/packages/components/src/menu-group/style.scss
+++ b/packages/components/src/menu-group/style.scss
@@ -1,5 +1,4 @@
 .components-menu-group + .components-menu-group {
-	margin-top: $grid-unit-10;
 	padding-top: $grid-unit-10;
 	border-top: $border-width solid $gray-900;
 
@@ -10,6 +9,10 @@
 	}
 }
 
+.components-menu-group:has(> div:empty) {
+	display: none;
+}
+
 .components-menu-group__label {
 	padding: 0 $grid-unit-10;
 	margin-top: $grid-unit-05;
diff --git a/packages/components/src/menu-item/index.tsx b/packages/components/src/menu-item/index.tsx
index 644d5bff2b023e..cb746becdbb1ba 100644
--- a/packages/components/src/menu-item/index.tsx
+++ b/packages/components/src/menu-item/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import type { ForwardedRef } from 'react';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -35,7 +35,7 @@ function UnforwardedMenuItem(
 		...buttonProps
 	} = props;
 
-	className = classnames( 'components-menu-item__button', className );
+	className = clsx( 'components-menu-item__button', className );
 
 	if ( info ) {
 		children = (
@@ -48,7 +48,7 @@ function UnforwardedMenuItem(
 
 	if ( icon && typeof icon !== 'string' ) {
 		icon = cloneElement( icon, {
-			className: classnames( 'components-menu-items__item-icon', {
+			className: clsx( 'components-menu-items__item-icon', {
 				'has-icon-right': iconPosition === 'right',
 			} ),
 		} );
diff --git a/packages/components/src/menu-items-choice/README.md b/packages/components/src/menu-items-choice/README.md
index 7aa12bbbb74ff9..7ee1b6096fb1fd 100644
--- a/packages/components/src/menu-items-choice/README.md
+++ b/packages/components/src/menu-items-choice/README.md
@@ -4,13 +4,6 @@
 
 ![MenuItemsChoice Example](https://wordpress.org/gutenberg/files/2019/03/MenuItemsChoice.png)
 
-1. MenuItemsChoice
-
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-
 ## Design guidelines
 
 A `MenuItemsChoice` should be housed within in its own distinct `MenuGroup`, so that the set of options are distinct from nearby `MenuItems`.
diff --git a/packages/components/src/menu-items-choice/style.scss b/packages/components/src/menu-items-choice/style.scss
index 5de8363be0d6e8..383eb4066ba86b 100644
--- a/packages/components/src/menu-items-choice/style.scss
+++ b/packages/components/src/menu-items-choice/style.scss
@@ -1,5 +1,7 @@
 .components-menu-items-choice,
 .components-menu-items-choice.components-button {
+	height: auto;
+
 	svg {
 		margin-right: $grid-unit-15;
 	}
diff --git a/packages/components/src/menu-items-choice/types.ts b/packages/components/src/menu-items-choice/types.ts
index 87d8e7687a4fbd..a722d5e03709ed 100644
--- a/packages/components/src/menu-items-choice/types.ts
+++ b/packages/components/src/menu-items-choice/types.ts
@@ -20,7 +20,8 @@ export type MenuItemsChoiceProps = {
 	 * Callback function to be called with the selected choice when user
 	 * selects a new choice.
 	 */
-	onSelect( value: string ): void;
+	onSelect: ( value: string ) => void;
+
 	/**
 	 * Callback function to be called with a choice when user
 	 * hovers over a new choice (will be empty on mouse leave).
diff --git a/packages/components/src/mobile/audio-player/index.native.js b/packages/components/src/mobile/audio-player/index.native.js
deleted file mode 100644
index c5d7c0e8132c1e..00000000000000
--- a/packages/components/src/mobile/audio-player/index.native.js
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- * External dependencies
- */
-import {
-	Text,
-	TouchableWithoutFeedback,
-	Linking,
-	Alert,
-	Platform,
-} from 'react-native';
-import { default as VideoPlayer } from 'react-native-video';
-
-/**
- * WordPress dependencies
- */
-import { View } from '@wordpress/primitives';
-import { Icon, useEditorColorScheme } from '@wordpress/components';
-import { withPreferredColorScheme } from '@wordpress/compose';
-import { __ } from '@wordpress/i18n';
-import { audio, warning } from '@wordpress/icons';
-import {
-	requestImageFailedRetryDialog,
-	requestImageUploadCancelDialog,
-} from '@wordpress/react-native-bridge';
-import { getProtocol } from '@wordpress/url';
-import { useState } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import styles from './styles.scss';
-import { parseAudioUrl } from './audio-url-parser.native';
-
-const isIOS = Platform.OS === 'ios';
-
-function Player( {
-	isUploadInProgress,
-	isUploadFailed,
-	attributes,
-	isSelected,
-} ) {
-	const { id, src } = attributes;
-	const [ paused, setPaused ] = useState( true );
-
-	const onPressListen = () => {
-		if ( src ) {
-			if ( isIOS && this.player ) {
-				this.player.presentFullscreenPlayer();
-				return;
-			}
-
-			Linking.canOpenURL( src )
-				.then( ( supported ) => {
-					if ( ! supported ) {
-						Alert.alert(
-							__( 'Problem opening the audio' ),
-							__( 'No application can handle this request.' )
-						);
-					} else {
-						return Linking.openURL( src );
-					}
-				} )
-				.catch( () => {
-					Alert.alert(
-						__( 'Problem opening the audio' ),
-						__( 'An unknown error occurred. Please try again.' )
-					);
-				} );
-		}
-	};
-
-	const containerStyle = useEditorColorScheme(
-		styles.container,
-		styles.containerDark
-	);
-
-	const iconStyle = useEditorColorScheme( styles.icon, styles.iconDark );
-
-	const iconDisabledStyle = useEditorColorScheme(
-		styles.iconDisabled,
-		styles.iconDisabledDark
-	);
-
-	const isDisabled = isUploadFailed || isUploadInProgress;
-
-	const finalIconStyle = {
-		...iconStyle,
-		...( isDisabled && iconDisabledStyle ),
-	};
-
-	const iconContainerStyle = useEditorColorScheme(
-		styles.iconContainer,
-		styles.iconContainerDark
-	);
-
-	const titleContainerStyle = {
-		...styles.titleContainer,
-		...( isIOS ? styles.titleContainerIOS : styles.titleContainerAndroid ),
-	};
-
-	const titleStyle = useEditorColorScheme( styles.title, styles.titleDark );
-
-	const uploadFailedStyle = useEditorColorScheme(
-		styles.uploadFailed,
-		styles.uploadFailedDark
-	);
-
-	const subtitleStyle = useEditorColorScheme(
-		styles.subtitle,
-		styles.subtitleDark
-	);
-
-	const finalSubtitleStyle = {
-		...subtitleStyle,
-		...( isUploadFailed && uploadFailedStyle ),
-	};
-
-	const buttonBackgroundStyle = useEditorColorScheme(
-		styles.buttonBackground,
-		styles.buttonBackgroundDark
-	);
-
-	let title = '';
-	let extension = '';
-
-	if ( src ) {
-		const result = parseAudioUrl( src );
-		extension = result.extension;
-		title = result.title;
-	}
-
-	const getSubtitleValue = () => {
-		if ( isUploadInProgress ) {
-			return __( 'Uploading…' );
-		}
-		if ( isUploadFailed ) {
-			return __( 'Failed to insert audio file. Please tap for options.' );
-		}
-		return (
-			extension +
-			// translators: displays audio file extension. e.g. MP3 audio file
-			__( 'audio file' )
-		);
-	};
-
-	function onAudioUploadCancelDialog() {
-		if ( isUploadInProgress ) {
-			requestImageUploadCancelDialog( id );
-		} else if ( id && getProtocol( src ) === 'file:' ) {
-			requestImageFailedRetryDialog( id );
-		}
-	}
-
-	return (
-		<TouchableWithoutFeedback
-			accessible={ ! isSelected }
-			disabled={ ! isSelected }
-			onPress={ onAudioUploadCancelDialog }
-		>
-			<View style={ containerStyle }>
-				<View style={ iconContainerStyle }>
-					<Icon icon={ audio } style={ finalIconStyle } size={ 24 } />
-				</View>
-				<View style={ titleContainerStyle }>
-					<Text style={ titleStyle }>{ title }</Text>
-					<View style={ styles.subtitleContainer }>
-						{ isUploadFailed && (
-							<Icon
-								icon={ warning }
-								style={ {
-									...styles.errorIcon,
-									...uploadFailedStyle,
-								} }
-								size={ 16 }
-							/>
-						) }
-						<Text style={ finalSubtitleStyle }>
-							{ getSubtitleValue() }
-						</Text>
-					</View>
-				</View>
-				{ ! isDisabled && (
-					<TouchableWithoutFeedback
-						accessibilityLabel={ __( 'Audio Player' ) }
-						accessibilityRole={ 'button' }
-						accessibilityHint={ __(
-							'Double tap to listen the audio file'
-						) }
-						onPress={ onPressListen }
-					>
-						<View style={ buttonBackgroundStyle }>
-							<Text style={ styles.buttonText }>
-								{ __( 'OPEN' ) }
-							</Text>
-						</View>
-					</TouchableWithoutFeedback>
-				) }
-				{ isIOS && (
-					<VideoPlayer
-						source={ { uri: src } }
-						paused={ paused }
-						ref={ ( ref ) => {
-							this.player = ref;
-						} }
-						controls={ false }
-						ignoreSilentSwitch={ 'ignore' }
-						onFullscreenPlayerWillPresent={ () => {
-							setPaused( false );
-						} }
-						onFullscreenPlayerDidDismiss={ () => {
-							setPaused( true );
-						} }
-					/>
-				) }
-			</View>
-		</TouchableWithoutFeedback>
-	);
-}
-
-export default withPreferredColorScheme( Player );
diff --git a/packages/components/src/mobile/autocompletion-items.native.js b/packages/components/src/mobile/autocompletion-items.native.js
index 320dc6758ba5dd..9d010dc3a144eb 100644
--- a/packages/components/src/mobile/autocompletion-items.native.js
+++ b/packages/components/src/mobile/autocompletion-items.native.js
@@ -1,7 +1,7 @@
 /**
- * WordPress dependencies
+ * Internal dependencies
  */
-import { createSlotFill } from '@wordpress/components';
+import { createSlotFill } from '../slot-fill';
 
 const { Fill, Slot } = createSlotFill( '__unstableAutocompletionItemsSlot' );
 
diff --git a/packages/components/src/mobile/bottom-sheet-select-control/README.md b/packages/components/src/mobile/bottom-sheet-select-control/README.md
index ed940baa53409f..7d45b7abcabba1 100644
--- a/packages/components/src/mobile/bottom-sheet-select-control/README.md
+++ b/packages/components/src/mobile/bottom-sheet-select-control/README.md
@@ -10,7 +10,7 @@ However, instead of opening up the selection in a modal, the selection opens up
  * WordPress dependencies
  */
 import { BottomSheetSelectControl } from '@wordpress/components';
-import { useState } from '@wordpress/compose';
+import { useState } from 'react';
 
 const options = [
 	{
diff --git a/packages/components/src/mobile/bottom-sheet-select-control/index.native.js b/packages/components/src/mobile/bottom-sheet-select-control/index.native.js
index 93df1217206364..89c157d85b9b2d 100644
--- a/packages/components/src/mobile/bottom-sheet-select-control/index.native.js
+++ b/packages/components/src/mobile/bottom-sheet-select-control/index.native.js
@@ -10,11 +10,16 @@ import { useNavigation } from '@react-navigation/native';
 import { useState } from '@wordpress/element';
 import { Icon, chevronRight, check } from '@wordpress/icons';
 import { __, sprintf } from '@wordpress/i18n';
-import { BottomSheet } from '@wordpress/components';
+
 /**
  * Internal dependencies
  */
 import styles from './style.scss';
+import BottomSheet from '../bottom-sheet';
+
+const EMPTY_OPTION = {
+	label: '',
+};
 
 const BottomSheetSelectControl = ( {
 	label,
@@ -34,9 +39,9 @@ const BottomSheetSelectControl = ( {
 		};
 	};
 
-	const selectedOption = items.find(
-		( option ) => option.value === selectedValue
-	);
+	const selectedOption =
+		items.find( ( option ) => option.value === selectedValue ) ??
+		EMPTY_OPTION;
 
 	const goBack = () => {
 		setShowSubSheet( false );
@@ -57,7 +62,7 @@ const BottomSheetSelectControl = ( {
 					icon={ icon }
 					value={ selectedOption.label }
 					onPress={ openSubSheet }
-					accessibilityRole={ 'button' }
+					accessibilityRole="button"
 					accessibilityLabel={ sprintf(
 						// translators:  %1$s: Select control button label e.g. "Button width". %2$s: Select control option value e.g: "Auto, 25%".
 						__( '%1$s. Currently selected: %2$s' ),
@@ -91,9 +96,9 @@ const BottomSheetSelectControl = ( {
 							label={ item.label }
 							icon={ item.icon }
 							onPress={ onChangeValue( item.value ) }
-							leftAlign={ true }
+							leftAlign
 							key={ index }
-							accessibilityRole={ 'button' }
+							accessibilityRole="button"
 							accessibilityLabel={
 								item.value === selectedValue
 									? sprintf(
diff --git a/packages/components/src/mobile/bottom-sheet-text-control/index.native.js b/packages/components/src/mobile/bottom-sheet-text-control/index.native.js
index 54a678b1ae0a14..430981f8f9695a 100644
--- a/packages/components/src/mobile/bottom-sheet-text-control/index.native.js
+++ b/packages/components/src/mobile/bottom-sheet-text-control/index.native.js
@@ -10,16 +10,14 @@ import { useNavigation } from '@react-navigation/native';
 import { useState } from '@wordpress/element';
 import { Icon, chevronRight } from '@wordpress/icons';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
-import {
-	BottomSheet,
-	PanelBody,
-	FooterMessageControl,
-} from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import styles from './styles.scss';
+import BottomSheet from '../bottom-sheet';
+import PanelBody from '../../panel/body';
+import FooterMessageControl from '../../footer-message-control';
 
 const BottomSheetTextControl = ( {
 	initialValue,
@@ -82,11 +80,11 @@ const BottomSheetTextControl = ( {
 						label={ label }
 						onChangeText={ ( text ) => onChange( text ) }
 						defaultValue={ initialValue }
-						multiline={ true }
+						multiline
 						placeholder={ placeholder }
-						placeholderTextColor={ '#87a6bc' }
+						placeholderTextColor="#87a6bc"
 						style={ textEditorStyle }
-						textAlignVertical={ 'top' }
+						textAlignVertical="top"
 					/>
 				</PanelBody>
 			</>
diff --git a/packages/components/src/mobile/bottom-sheet/bottom-sheet-navigation/navigation-screen.native.js b/packages/components/src/mobile/bottom-sheet/bottom-sheet-navigation/navigation-screen.native.js
index bde7c2c67ee52c..8c43bc85612762 100644
--- a/packages/components/src/mobile/bottom-sheet/bottom-sheet-navigation/navigation-screen.native.js
+++ b/packages/components/src/mobile/bottom-sheet/bottom-sheet-navigation/navigation-screen.native.js
@@ -16,13 +16,14 @@ import {
 /**
  * WordPress dependencies
  */
-import { BottomSheetContext } from '@wordpress/components';
+
 import { useRef, useCallback, useContext, useMemo } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { BottomSheetNavigationContext } from './bottom-sheet-navigation-context';
+import { BottomSheetContext } from '../bottom-sheet-context';
 import styles from './styles.scss';
 
 const BottomSheetNavigationScreen = ( {
@@ -64,15 +65,15 @@ const BottomSheetNavigationScreen = ( {
 			 * passed to useCallback here is what prevents erroneous callback
 			 * replacements, but leveraging memoization to achieve this is brittle and
 			 * explicitly discouraged in the React documentation.
-			 * https://reactjs.org/docs/hooks-reference.html#usememo
+			 * https://react.dev/reference/react/useMemo
 			 *
 			 * Ideally, we refactor onHandleHardwareButtonPress to manage multiple
 			 * callbacks triggered based upon which screen is currently active.
 			 *
 			 * Related: https://github.com/WordPress/gutenberg/pull/36328#discussion_r768897546
+			 *
+			 * Also see https://github.com/WordPress/gutenberg/pull/41166.
 			 */
-			// see https://github.com/WordPress/gutenberg/pull/41166
-			// eslint-disable-next-line react-hooks/exhaustive-deps
 		}, [] )
 	);
 
@@ -129,9 +130,7 @@ const BottomSheetNavigationScreen = ( {
 				</TouchableHighlight>
 			</ScrollView>
 		);
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [
 		children,
 		isFocused,
diff --git a/packages/components/src/mobile/bottom-sheet/bottom-sheet-navigation/test/navigation-container.native.js b/packages/components/src/mobile/bottom-sheet/bottom-sheet-navigation/test/navigation-container.native.js
index 9ff6a115f0a6f9..e0ebd90eb6c1e4 100644
--- a/packages/components/src/mobile/bottom-sheet/bottom-sheet-navigation/test/navigation-container.native.js
+++ b/packages/components/src/mobile/bottom-sheet/bottom-sheet-navigation/test/navigation-container.native.js
@@ -2,12 +2,7 @@
  * External dependencies
  */
 import { Text } from 'react-native';
-import {
-	render,
-	fireEvent,
-	withReanimatedTimer,
-	advanceAnimationByTime,
-} from 'test/helpers';
+import { act, render, fireEvent, withReanimatedTimer } from 'test/helpers';
 import { useNavigation } from '@react-navigation/native';
 
 /**
@@ -63,7 +58,7 @@ it( 'animates height transitioning from non-full-screen to non-full-screen', asy
 			screen.getByTestId( 'navigation-screen-test-screen-1' ),
 			screen1Layout
 		);
-		advanceAnimationByTime( 1 );
+		act( () => jest.advanceTimersByTime( 1 ) );
 		expect( navigationContainer ).toHaveAnimatedStyle( screen1Layout );
 
 		// Navigate to screen 2
@@ -75,7 +70,7 @@ it( 'animates height transitioning from non-full-screen to non-full-screen', asy
 		);
 		// The animation takes 300 ms, so we wait that time plus 1 ms
 		// to the completion.
-		advanceAnimationByTime( 301 );
+		act( () => jest.advanceTimersByTime( 301 ) );
 		expect( navigationContainer ).toHaveAnimatedStyle( screen2Layout );
 	} ) );
 
@@ -105,14 +100,14 @@ it( 'animates height transitioning from non-full-screen to full-screen', async (
 			screen.getByTestId( 'navigation-screen-test-screen-1' ),
 			screen1Layout
 		);
-		advanceAnimationByTime( 1 );
+		act( () => jest.advanceTimersByTime( 1 ) );
 		expect( navigationContainer ).toHaveAnimatedStyle( screen1Layout );
 
 		// Navigate to screen 2
 		fireEvent.press( screen.getByText( /test-screen-1/ ) );
 		// The animation takes 300 ms, so we wait that time plus 1 ms
 		// to the completion.
-		advanceAnimationByTime( 301 );
+		act( () => jest.advanceTimersByTime( 301 ) );
 		expect( navigationContainer ).toHaveAnimatedStyle( {
 			height: WINDOW_HEIGHT,
 		} );
@@ -144,14 +139,14 @@ it( 'animates height transitioning from full-screen to non-full-screen', async (
 			screen.getByTestId( 'navigation-screen-test-screen-1' ),
 			screen1Layout
 		);
-		advanceAnimationByTime( 1 );
+		act( () => jest.advanceTimersByTime( 1 ) );
 		expect( navigationContainer ).toHaveAnimatedStyle( screen1Layout );
 
 		// Navigate to screen 2
 		fireEvent.press( screen.getByText( /test-screen-1/ ) );
 		// The animation takes 300 ms, so we wait that time plus 1 ms
 		// to the completion.
-		advanceAnimationByTime( 301 );
+		act( () => jest.advanceTimersByTime( 301 ) );
 		expect( navigationContainer ).toHaveAnimatedStyle( {
 			height: WINDOW_HEIGHT,
 		} );
@@ -160,7 +155,7 @@ it( 'animates height transitioning from full-screen to non-full-screen', async (
 		fireEvent.press( await screen.findByText( /test-screen-2/ ) );
 		// The animation takes 300 ms, so we wait that time plus 1 ms
 		// to the completion.
-		advanceAnimationByTime( 301 );
+		act( () => jest.advanceTimersByTime( 301 ) );
 		expect( navigationContainer ).toHaveAnimatedStyle( screen1Layout );
 	} ) );
 
@@ -187,7 +182,7 @@ it( 'does not animate height transitioning from full-screen to full-screen', asy
 
 		// First height value should be set without animation, but we need
 		// to wait for a frame to let animated styles be updated.
-		advanceAnimationByTime( 1 );
+		act( () => jest.advanceTimersByTime( 1 ) );
 		expect( navigationContainer ).toHaveAnimatedStyle( {
 			height: WINDOW_HEIGHT,
 		} );
@@ -195,7 +190,7 @@ it( 'does not animate height transitioning from full-screen to full-screen', asy
 		// Navigate to screen 2
 		fireEvent.press( screen.getByText( /test-screen-1/ ) );
 		// We wait some milliseconds to check if height has changed.
-		advanceAnimationByTime( 10 );
+		act( () => jest.advanceTimersByTime( 10 ) );
 		expect( navigationContainer ).toHaveAnimatedStyle( {
 			height: WINDOW_HEIGHT,
 		} );
diff --git a/packages/components/src/mobile/bottom-sheet/button.native.js b/packages/components/src/mobile/bottom-sheet/button.native.js
index a9c88f18fb770b..205ee43e5ac096 100644
--- a/packages/components/src/mobile/bottom-sheet/button.native.js
+++ b/packages/components/src/mobile/bottom-sheet/button.native.js
@@ -9,11 +9,7 @@ import { TouchableOpacity, View, Text } from 'react-native';
 import styles from './styles.scss';
 
 const BottomSheetButton = ( { onPress, disabled, text, color } ) => (
-	<TouchableOpacity
-		accessible={ true }
-		onPress={ onPress }
-		disabled={ disabled }
-	>
+	<TouchableOpacity accessible onPress={ onPress } disabled={ disabled }>
 		<View style={ { flexDirection: 'row', justifyContent: 'center' } }>
 			<Text style={ { ...styles.buttonText, color } }>{ text }</Text>
 		</View>
diff --git a/packages/components/src/mobile/bottom-sheet/cell.native.js b/packages/components/src/mobile/bottom-sheet/cell.native.js
index 30f061dc5c14b3..6618566837cfc9 100644
--- a/packages/components/src/mobile/bottom-sheet/cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/cell.native.js
@@ -14,7 +14,6 @@ import {
 /**
  * WordPress dependencies
  */
-import { Icon } from '@wordpress/components';
 import { check } from '@wordpress/icons';
 import { Component } from '@wordpress/element';
 import { __, _x, sprintf } from '@wordpress/i18n';
@@ -27,6 +26,7 @@ import styles from './styles.scss';
 import platformStyles from './cellStyles.scss';
 import TouchableRipple from './ripple';
 import LockIcon from './lock-icon';
+import Icon from '../../icon';
 
 const isIOS = Platform.OS === 'ios';
 class BottomSheetCell extends Component {
@@ -272,7 +272,7 @@ class BottomSheetCell extends Component {
 				<Text
 					style={ textStyle }
 					numberOfLines={ 1 }
-					ellipsizeMode={ 'middle' }
+					ellipsizeMode="middle"
 				>
 					{ value }
 				</Text>
@@ -419,7 +419,7 @@ class BottomSheetCell extends Component {
 						{ customActionButton && (
 							<TouchableOpacity
 								onPress={ handler }
-								accessibilityRole={ 'button' }
+								accessibilityRole="button"
 							>
 								<Text style={ resetButtonStyle }>
 									{ title }
diff --git a/packages/components/src/mobile/bottom-sheet/color-cell.native.js b/packages/components/src/mobile/bottom-sheet/color-cell.native.js
index 76cdc56930805a..a03b968e3b03ef 100644
--- a/packages/components/src/mobile/bottom-sheet/color-cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/color-cell.native.js
@@ -3,12 +3,13 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Icon, chevronRight } from '@wordpress/icons';
-import { ColorIndicator } from '@wordpress/components';
+
 /**
  * Internal dependencies
  */
 import Cell from './cell';
 import styles from './styles.scss';
+import ColorIndicator from '../../color-indicator';
 
 export default function BottomSheetColorCell( props ) {
 	const { color, withColorIndicator = true, disabled, ...cellProps } = props;
@@ -16,7 +17,7 @@ export default function BottomSheetColorCell( props ) {
 	return (
 		<Cell
 			{ ...cellProps }
-			accessibilityRole={ 'button' }
+			accessibilityRole="button"
 			accessibilityHint={
 				/* translators: accessibility text (hint for moving to color settings) */
 				__( 'Double tap to go to color settings' )
diff --git a/packages/components/src/mobile/bottom-sheet/footer-message-cell.native.js b/packages/components/src/mobile/bottom-sheet/footer-message-cell.native.js
index 343363a2b07fe4..17001242b30a2b 100644
--- a/packages/components/src/mobile/bottom-sheet/footer-message-cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/footer-message-cell.native.js
@@ -13,8 +13,8 @@ function FooterMessageCell( { textAlign = 'left', ...props } ) {
 		<Cell
 			{ ...props }
 			editable={ false }
-			value={ '' }
-			accessibilityRole={ 'text' }
+			value=""
+			accessibilityRole="text"
 			labelStyle={ [ styles.footerMessageCell, { textAlign } ] }
 		/>
 	);
diff --git a/packages/components/src/mobile/bottom-sheet/index.native.js b/packages/components/src/mobile/bottom-sheet/index.native.js
index 11918782f4dfb4..017956c6405d92 100644
--- a/packages/components/src/mobile/bottom-sheet/index.native.js
+++ b/packages/components/src/mobile/bottom-sheet/index.native.js
@@ -19,7 +19,10 @@ import SafeArea from 'react-native-safe-area';
 /**
  * WordPress dependencies
  */
-import { subscribeAndroidModalClosed } from '@wordpress/react-native-bridge';
+import {
+	subscribeAndroidModalClosed,
+	showAndroidSoftKeyboard,
+} from '@wordpress/react-native-bridge';
 import { Component } from '@wordpress/element';
 import { withPreferredColorScheme } from '@wordpress/compose';
 
@@ -215,6 +218,11 @@ class BottomSheet extends Component {
 		if ( this.androidModalClosedSubscription ) {
 			this.androidModalClosedSubscription.remove();
 		}
+
+		if ( this.props.isVisible ) {
+			showAndroidSoftKeyboard();
+		}
+
 		if ( this.safeAreaEventSubscription === null ) {
 			return;
 		}
@@ -315,6 +323,9 @@ class BottomSheet extends Component {
 	onDismiss() {
 		const { onDismiss } = this.props;
 
+		// Restore Keyboard Visibility
+		showAndroidSoftKeyboard();
+
 		if ( onDismiss ) {
 			onDismiss();
 		}
@@ -368,6 +379,7 @@ class BottomSheet extends Component {
 	onHardwareButtonPress() {
 		const { onClose } = this.props;
 		const { handleHardwareButtonPress } = this.state;
+
 		if ( handleHardwareButtonPress && handleHardwareButtonPress() ) {
 			return;
 		}
@@ -528,6 +540,8 @@ class BottomSheet extends Component {
 				}
 				onAccessibilityEscape={ this.onCloseBottomSheet }
 				testID="bottom-sheet"
+				hardwareAccelerated
+				useNativeDriverForBackdrop
 				{ ...rest }
 			>
 				<KeyboardAvoidingView
diff --git a/packages/components/src/mobile/bottom-sheet/link-suggestion-item-cell.native.js b/packages/components/src/mobile/bottom-sheet/link-suggestion-item-cell.native.js
index f183f8f291b5b4..46029a7585f54a 100644
--- a/packages/components/src/mobile/bottom-sheet/link-suggestion-item-cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/link-suggestion-item-cell.native.js
@@ -64,7 +64,7 @@ function LinkSuggestionItemCell( { suggestion, onLinkPicked, ...props } ) {
 			{ ...props }
 			icon={ icons[ type ] || empty }
 			onPress={ pickLink }
-			separatorType={ 'none' }
+			separatorType="none"
 			cellContainerStyle={ suggestionStyles.itemContainerStyle }
 			labelStyle={ suggestionStyles.hidden }
 			valueStyle={ suggestionStyles.hidden }
@@ -73,14 +73,14 @@ function LinkSuggestionItemCell( { suggestion, onLinkPicked, ...props } ) {
 				<Text
 					style={ titleStyle }
 					numberOfLines={ 1 }
-					ellipsizeMode={ 'middle' }
+					ellipsizeMode="middle"
 				>
 					{ title }
 				</Text>
 				<Text
 					style={ summaryStyle }
 					numberOfLines={ 1 }
-					ellipsizeMode={ 'middle' }
+					ellipsizeMode="middle"
 				>
 					{ summary }
 				</Text>
diff --git a/packages/components/src/mobile/bottom-sheet/nav-bar/action-button.native.js b/packages/components/src/mobile/bottom-sheet/nav-bar/action-button.native.js
index 6b11f30959fe5d..6a13bca18e9efb 100644
--- a/packages/components/src/mobile/bottom-sheet/nav-bar/action-button.native.js
+++ b/packages/components/src/mobile/bottom-sheet/nav-bar/action-button.native.js
@@ -18,7 +18,7 @@ function ActionButton( {
 	return (
 		<TouchableWithoutFeedback
 			onPress={ onPress }
-			accessibilityRole={ 'button' }
+			accessibilityRole="button"
 			accessibilityLabel={ accessibilityLabel }
 			accessibilityHint={ accessibilityHint }
 		>
diff --git a/packages/components/src/mobile/bottom-sheet/radio-cell.native.js b/packages/components/src/mobile/bottom-sheet/radio-cell.native.js
index 2700cb0f923882..c2b5df004d5c31 100644
--- a/packages/components/src/mobile/bottom-sheet/radio-cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/radio-cell.native.js
@@ -21,14 +21,14 @@ export default function BottomSheetRadioCell( props ) {
 	return (
 		<Cell
 			{ ...cellProps }
-			accessibilityRole={ 'radio' }
+			accessibilityRole="radio"
 			accessibilityState={ { selected } }
 			accessibilityHint={
 				/* translators: accessibility text (hint for selecting option) */
 				__( 'Double tap to select the option' )
 			}
 			editable={ false }
-			value={ '' }
+			value=""
 			showLockIcon={ selected }
 		>
 			{ selected && (
diff --git a/packages/components/src/mobile/bottom-sheet/range-cell.native.js b/packages/components/src/mobile/bottom-sheet/range-cell.native.js
index fa4780b00eee82..f0d82cb96908ac 100644
--- a/packages/components/src/mobile/bottom-sheet/range-cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/range-cell.native.js
@@ -181,7 +181,7 @@ class BottomSheetRangeCell extends Component {
 
 		return (
 			<View
-				accessible={ true }
+				accessible
 				accessibilityRole="adjustable"
 				accessibilityActions={ [
 					{ name: 'increment' },
diff --git a/packages/components/src/mobile/bottom-sheet/stepper-cell/index.native.js b/packages/components/src/mobile/bottom-sheet/stepper-cell/index.native.js
index 5328d26df53c9a..aad78cd12665b6 100644
--- a/packages/components/src/mobile/bottom-sheet/stepper-cell/index.native.js
+++ b/packages/components/src/mobile/bottom-sheet/stepper-cell/index.native.js
@@ -174,7 +174,7 @@ class BottomSheetStepperCell extends Component {
 
 		return (
 			<View
-				accessible={ true }
+				accessible
 				accessibilityRole="adjustable"
 				accessibilityLabel={ accessibilityLabel }
 				accessibilityHint={ getAccessibilityHint() }
@@ -214,7 +214,7 @@ class BottomSheetStepperCell extends Component {
 						icon={ icon }
 						label={ label }
 						labelStyle={ labelStyle }
-						leftAlign={ true }
+						leftAlign
 						separatorType={ separatorType }
 						disabled={ disabled }
 					>
diff --git a/packages/components/src/mobile/bottom-sheet/stepper-cell/stepper.android.js b/packages/components/src/mobile/bottom-sheet/stepper-cell/stepper.android.js
index 37f72425640fe0..ce0fbba03eae88 100644
--- a/packages/components/src/mobile/bottom-sheet/stepper-cell/stepper.android.js
+++ b/packages/components/src/mobile/bottom-sheet/stepper-cell/stepper.android.js
@@ -56,7 +56,7 @@ function Stepper( {
 			) }
 			{ children }
 			<TouchableOpacity
-				testID={ 'Increment' }
+				testID="Increment"
 				disabled={ isMaxValue }
 				onPressIn={ onPressInIncrement }
 				onPressOut={ onPressOut }
diff --git a/packages/components/src/mobile/bottom-sheet/stepper-cell/stepper.ios.js b/packages/components/src/mobile/bottom-sheet/stepper-cell/stepper.ios.js
index fa2318a9fd7282..3cd25ab6b7bd6c 100644
--- a/packages/components/src/mobile/bottom-sheet/stepper-cell/stepper.ios.js
+++ b/packages/components/src/mobile/bottom-sheet/stepper-cell/stepper.ios.js
@@ -49,7 +49,7 @@ function Stepper( {
 				<Icon icon={ reset } size={ 24 } color={ buttonStyle.color } />
 			</TouchableOpacity>
 			<TouchableOpacity
-				testID={ 'Increment' }
+				testID="Increment"
 				disabled={ isMaxValue }
 				onPressIn={ onPressInIncrement }
 				onPressOut={ onPressOut }
diff --git a/packages/components/src/mobile/bottom-sheet/sub-sheet/index.native.js b/packages/components/src/mobile/bottom-sheet/sub-sheet/index.native.js
index 64e3f609d167c3..14040be0cc239e 100644
--- a/packages/components/src/mobile/bottom-sheet/sub-sheet/index.native.js
+++ b/packages/components/src/mobile/bottom-sheet/sub-sheet/index.native.js
@@ -7,7 +7,12 @@ import { SafeAreaView } from 'react-native';
  * WordPress dependencies
  */
 import { Children, useEffect, useContext } from '@wordpress/element';
-import { createSlotFill, BottomSheetContext } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { BottomSheetContext } from '../bottom-sheet-context';
+import { createSlotFill } from '../../../slot-fill';
 
 const { Fill, Slot } = createSlotFill( 'BottomSheetSubSheet' );
 
@@ -23,9 +28,7 @@ const BottomSheetSubSheet = ( {
 		if ( showSheet ) {
 			setIsFullScreen( isFullScreen );
 		}
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ showSheet, isFullScreen ] );
 
 	return (
diff --git a/packages/components/src/mobile/bottom-sheet/switch-cell.native.js b/packages/components/src/mobile/bottom-sheet/switch-cell.native.js
index f16bb0d7b237a7..3e00756b1a7dc5 100644
--- a/packages/components/src/mobile/bottom-sheet/switch-cell.native.js
+++ b/packages/components/src/mobile/bottom-sheet/switch-cell.native.js
@@ -54,14 +54,14 @@ export default function BottomSheetSwitchCell( props ) {
 		<Cell
 			{ ...cellProps }
 			accessibilityLabel={ getAccessibilityLabel() }
-			accessibilityRole={ 'none' }
+			accessibilityRole="none"
 			accessibilityHint={
 				/* translators: accessibility text (hint for switches) */
 				__( 'Double tap to toggle setting' )
 			}
 			onPress={ onPress }
 			editable={ false }
-			value={ '' }
+			value=""
 			disabled={ disabled }
 			disabledStyle={ EMPTY_STYLE }
 		>
diff --git a/packages/components/src/mobile/color-settings/index.native.js b/packages/components/src/mobile/color-settings/index.native.js
index 171c4a011a7fe2..c7956df0e935dd 100644
--- a/packages/components/src/mobile/color-settings/index.native.js
+++ b/packages/components/src/mobile/color-settings/index.native.js
@@ -7,7 +7,6 @@ import { useRoute } from '@react-navigation/native';
  * WordPress dependencies
  */
 import { memo, useEffect, useContext } from '@wordpress/element';
-import { BottomSheetContext, BottomSheet } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -15,6 +14,8 @@ import { BottomSheetContext, BottomSheet } from '@wordpress/components';
 import PickerScreen from './picker-screen';
 import GradientPickerScreen from './gradient-picker-screen';
 import PaletteScreen from './palette.screen';
+import BottomSheet from '../bottom-sheet';
+import { BottomSheetContext } from '../bottom-sheet/bottom-sheet-context';
 
 import { colorsUtils } from './utils';
 
@@ -34,9 +35,7 @@ const ColorSettingsMemo = memo(
 		useEffect( () => {
 			shouldEnableBottomSheetMaxHeight( true );
 			onHandleClosingBottomSheet( null );
-			// Disable reason: deferring this refactor to the native team.
-			// see https://github.com/WordPress/gutenberg/pull/41166
-			// eslint-disable-next-line react-hooks/exhaustive-deps
+			// See https://github.com/WordPress/gutenberg/pull/41166
 		}, [] );
 		return (
 			<BottomSheet.NavigationContainer>
diff --git a/packages/components/src/mobile/color-settings/palette.screen.native.js b/packages/components/src/mobile/color-settings/palette.screen.native.js
index bc7187fd092b8c..a780a4295dfba5 100644
--- a/packages/components/src/mobile/color-settings/palette.screen.native.js
+++ b/packages/components/src/mobile/color-settings/palette.screen.native.js
@@ -9,12 +9,6 @@ import { View, Text, TouchableWithoutFeedback } from 'react-native';
 import { __ } from '@wordpress/i18n';
 import { useState, useContext } from '@wordpress/element';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
-import {
-	ColorControl,
-	PanelBody,
-	BottomSheetContext,
-	useMobileGlobalStylesColors,
-} from '@wordpress/components';
 import { useRoute, useNavigation } from '@react-navigation/native';
 
 /**
@@ -25,11 +19,13 @@ import ColorIndicator from '../../color-indicator';
 import NavBar from '../bottom-sheet/nav-bar';
 import SegmentedControls from '../segmented-control';
 import { colorsUtils } from './utils';
+import PanelBody from '../../panel/body';
+import { BottomSheetContext } from '../bottom-sheet/bottom-sheet-context';
+import ColorControl from '../../color-control';
 
 import styles from './style.scss';
 
 const HIT_SLOP = { top: 8, bottom: 8, left: 8, right: 8 };
-const THEME_PALETTE_NAME = 'Theme';
 
 const PaletteScreen = () => {
 	const route = useRoute();
@@ -48,7 +44,6 @@ const PaletteScreen = () => {
 	const [ currentValue, setCurrentValue ] = useState( colorValue );
 	const isGradientColor = isGradient( currentValue );
 	const selectedSegmentIndex = isGradientColor ? 1 : 0;
-	const allAvailableColors = useMobileGlobalStylesColors();
 
 	const [ currentSegment, setCurrentSegment ] = useState(
 		segments[ selectedSegmentIndex ]
@@ -57,6 +52,10 @@ const PaletteScreen = () => {
 	const currentSegmentColors = ! isGradientSegment
 		? defaultSettings.colors
 		: defaultSettings.gradients;
+	const allAvailableColors = defaultSettings?.allAvailableColors || [];
+	const allAvailableGradients = currentSegmentColors
+		.flatMap( ( { gradients } ) => gradients )
+		.filter( Boolean );
 
 	const horizontalSeparatorStyle = usePreferredColorSchemeStyle(
 		styles.horizontalSeparator,
@@ -110,7 +109,11 @@ const PaletteScreen = () => {
 
 	function getClearButton() {
 		return (
-			<TouchableWithoutFeedback onPress={ onClear } hitSlop={ HIT_SLOP }>
+			<TouchableWithoutFeedback
+				accessibilityLabel={ __( 'Clear selected color' ) }
+				onPress={ onClear }
+				hitSlop={ HIT_SLOP }
+			>
 				<View style={ styles.clearButtonContainer }>
 					<Text style={ clearButtonStyle }>{ __( 'Reset' ) }</Text>
 				</View>
@@ -184,10 +187,10 @@ const PaletteScreen = () => {
 						colors: palette.colors,
 						gradients: palette.gradients,
 						allColors: allAvailableColors,
+						allGradients: allAvailableGradients,
 					};
-					const enableCustomColor =
-						! isGradientSegment &&
-						palette.name === THEME_PALETTE_NAME;
+					// Limit to show the custom indicator to the first available palette
+					const enableCustomColor = paletteKey === 0;
 
 					return (
 						<ColorPalette
diff --git a/packages/components/src/mobile/color-settings/picker-screen.native.js b/packages/components/src/mobile/color-settings/picker-screen.native.js
index f8626a67338a42..e924580d939794 100644
--- a/packages/components/src/mobile/color-settings/picker-screen.native.js
+++ b/packages/components/src/mobile/color-settings/picker-screen.native.js
@@ -7,12 +7,12 @@ import { useRoute, useNavigation } from '@react-navigation/native';
  * WordPress dependencies
  */
 import { useContext, useMemo } from '@wordpress/element';
-import { BottomSheetContext } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import { ColorPicker } from '../../color-picker';
+import { BottomSheetContext } from '../bottom-sheet/bottom-sheet-context';
 
 const PickerScreen = () => {
 	const route = useRoute();
@@ -43,9 +43,7 @@ const PickerScreen = () => {
 				onHandleHardwareButtonPress={ onHandleHardwareButtonPress }
 			/>
 		);
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [
 		setColor,
 		currentValue,
diff --git a/packages/components/src/mobile/color-settings/utils.native.js b/packages/components/src/mobile/color-settings/utils.native.js
index c18a6503e5973f..87ad346c8ec3a6 100644
--- a/packages/components/src/mobile/color-settings/utils.native.js
+++ b/packages/components/src/mobile/color-settings/utils.native.js
@@ -28,7 +28,7 @@ export const colorsUtils = {
 		picker: 'Picker',
 		palette: 'Palette',
 	},
-	segments: [ __( 'Solid' ), __( 'Gradient' ) ],
+	segments: [ __( 'Color' ), __( 'Gradient' ) ],
 	gradients,
 	gradientOptions,
 	getGradientType,
diff --git a/packages/components/src/mobile/focal-point-settings-panel/index.native.js b/packages/components/src/mobile/focal-point-settings-panel/index.native.js
index c9b87a4793cdb4..0aefdc6188c22c 100644
--- a/packages/components/src/mobile/focal-point-settings-panel/index.native.js
+++ b/packages/components/src/mobile/focal-point-settings-panel/index.native.js
@@ -9,13 +9,14 @@ import { useRoute, useNavigation } from '@react-navigation/native';
  */
 import { __ } from '@wordpress/i18n';
 import { memo, useContext, useState, useCallback } from '@wordpress/element';
-import { BottomSheetContext, FocalPointPicker } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import NavBar from '../bottom-sheet/nav-bar';
 import styles from './styles.scss';
+import { BottomSheetContext } from '../bottom-sheet/bottom-sheet-context';
+import FocalPointPicker from '../../focal-point-picker';
 
 const FocalPointSettingsPanelMemo = memo(
 	( {
diff --git a/packages/components/src/mobile/global-styles-context/index.native.js b/packages/components/src/mobile/global-styles-context/index.native.js
deleted file mode 100644
index cc9f6baf93348b..00000000000000
--- a/packages/components/src/mobile/global-styles-context/index.native.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createContext, useContext } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import {
-	BLOCK_STYLE_ATTRIBUTES,
-	getBlockPaddings,
-	getBlockColors,
-	getBlockTypography,
-} from './utils';
-
-const GlobalStylesContext = createContext( { style: {} } );
-
-GlobalStylesContext.BLOCK_STYLE_ATTRIBUTES = BLOCK_STYLE_ATTRIBUTES;
-
-export const getMergedGlobalStyles = (
-	baseGlobalStyles,
-	globalStyle,
-	wrapperPropsStyle,
-	blockAttributes,
-	defaultColors,
-	blockName,
-	fontSizes
-) => {
-	// Current support for general styles and blocks.
-	const baseGlobalColors = {
-		baseColors: {
-			color: baseGlobalStyles?.color,
-			typography: baseGlobalStyles?.typography,
-			elements: {
-				link: baseGlobalStyles?.elements?.link,
-			},
-			blocks: {
-				'core/button': baseGlobalStyles?.blocks?.[ 'core/button' ],
-			},
-		},
-	};
-
-	const blockStyleAttributes = Object.fromEntries(
-		Object.entries( blockAttributes ?? {} ).filter( ( [ key ] ) =>
-			BLOCK_STYLE_ATTRIBUTES.includes( key )
-		)
-	);
-
-	// This prevents certain wrapper styles from being applied to blocks that
-	// don't support them yet.
-	const wrapperPropsStyleFiltered = Object.fromEntries(
-		Object.entries( wrapperPropsStyle ?? {} ).filter( ( [ key ] ) =>
-			BLOCK_STYLE_ATTRIBUTES.includes( key )
-		)
-	);
-
-	const mergedStyle = {
-		...baseGlobalColors,
-		...globalStyle,
-		...wrapperPropsStyleFiltered,
-	};
-	const blockColors = getBlockColors(
-		blockStyleAttributes,
-		defaultColors,
-		blockName,
-		baseGlobalStyles
-	);
-	const blockPaddings = getBlockPaddings(
-		mergedStyle,
-		wrapperPropsStyle,
-		blockStyleAttributes,
-		blockColors
-	);
-	const blockTypography = getBlockTypography(
-		blockStyleAttributes,
-		fontSizes,
-		blockName,
-		baseGlobalStyles
-	);
-
-	return {
-		...mergedStyle,
-		...blockPaddings,
-		...blockColors,
-		...blockTypography,
-	};
-};
-
-export const useGlobalStyles = () => {
-	const globalStyles = useContext( GlobalStylesContext );
-
-	return globalStyles;
-};
-
-export const withGlobalStyles = ( WrappedComponent ) => ( props ) => (
-	<GlobalStylesContext.Consumer>
-		{ ( globalStyles ) => (
-			<WrappedComponent { ...props } globalStyles={ globalStyles } />
-		) }
-	</GlobalStylesContext.Consumer>
-);
-
-export default GlobalStylesContext;
diff --git a/packages/components/src/mobile/global-styles-context/test/fixtures/theme.native.js b/packages/components/src/mobile/global-styles-context/test/fixtures/theme.native.js
deleted file mode 100644
index 68c4593446a7ce..00000000000000
--- a/packages/components/src/mobile/global-styles-context/test/fixtures/theme.native.js
+++ /dev/null
@@ -1,294 +0,0 @@
-export const DEFAULT_COLORS = [
-	{ color: '#cd2653', name: 'Accent Color', slug: 'accent' },
-	{ color: '#000000', name: 'Primary', slug: 'primary' },
-	{ color: '#6d6d6d', name: 'Secondary', slug: 'secondary' },
-];
-
-export const GLOBAL_STYLES_PALETTE = [
-	{
-		slug: 'green',
-		color: '#D1E4DD',
-		name: 'Green',
-	},
-	{
-		slug: 'blue',
-		color: '#D1DFE4',
-		name: 'Blue',
-	},
-	{
-		slug: 'purple',
-		color: '#D1D1E4',
-		name: 'Purple',
-	},
-	{
-		color: '#cf1594',
-		name: 'Color 2 ',
-		slug: 'custom-color-2',
-	},
-];
-
-export const GLOBAL_STYLES_GRADIENTS = {
-	default: [
-		{
-			name: 'Vivid cyan blue to vivid purple',
-			gradient:
-				'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
-			slug: 'vivid-cyan-blue-to-vivid-purple',
-		},
-		{
-			name: 'Light green cyan to vivid green cyan',
-			gradient:
-				'linear-gradient(135deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)',
-			slug: 'light-green-cyan-to-vivid-green-cyan',
-		},
-	],
-	theme: [
-		{
-			slug: 'purple-to-blue',
-			gradient:
-				'linear-gradient(160deg, var(--wp--preset--color--purple), var(--wp--preset--color--blue))',
-			name: 'Purple to Blue',
-		},
-		{
-			slug: 'green-to-purple',
-			gradient:
-				'linear-gradient(160deg, var(--wp--preset--color--green), var(--wp--preset--color--purple))',
-			name: 'Green to Purple',
-		},
-	],
-};
-
-export const DEFAULT_GLOBAL_STYLES = {
-	color: {
-		background: 'var(--wp--preset--color--green)',
-		text: 'var(--wp--preset--color--blue)',
-	},
-	typography: {
-		fontSize: 'var(--wp--preset--font-size--normal)',
-		lineHeight: 'var(--wp--custom--line-height--body)',
-	},
-	elements: {
-		link: {
-			color: {
-				text: 'var(--wp--preset--color--purple)',
-			},
-		},
-		h1: {
-			typography: {
-				fontSize: 'var(--wp--preset--font-size--gigantic)',
-				lineHeight: 'var(--wp--custom--line-height--page-title)',
-			},
-		},
-		h2: {
-			typography: {
-				fontSize: 'var(--wp--preset--font-size--extra-large)',
-				lineHeight: 'var(--wp--custom--line-height--heading)',
-			},
-		},
-	},
-	blocks: {
-		'core/button': {
-			color: {
-				background: 'var(--wp--preset--color--purple)',
-				text: 'var(--wp--preset--color--green)',
-			},
-			typography: {
-				fontSize: 'var(--wp--preset--font-size--normal)',
-			},
-		},
-		'core/separator': {
-			color: {
-				text: 'var:preset|color|custom-color-2',
-			},
-		},
-	},
-};
-
-export const PARSED_GLOBAL_STYLES = {
-	color: {
-		background: '#D1E4DD',
-		text: '#D1DFE4',
-	},
-	typography: {
-		fontSize: '18px',
-		lineHeight: '1.7',
-	},
-	elements: {
-		link: {
-			color: {
-				text: '#D1D1E4',
-			},
-		},
-		h1: {
-			typography: {
-				fontSize: '144px',
-				lineHeight: '1.1',
-			},
-		},
-		h2: {
-			typography: {
-				fontSize: '40px',
-				lineHeight: '1.3',
-			},
-		},
-	},
-	blocks: {
-		'core/button': {
-			color: {
-				background: '#D1D1E4',
-				text: '#D1E4DD',
-			},
-			typography: {
-				fontSize: '18px',
-			},
-		},
-		'core/separator': {
-			color: {
-				text: '#cf1594',
-			},
-		},
-	},
-};
-
-export const RAW_FEATURES = {
-	color: {
-		palette: {
-			default: [
-				{
-					name: 'Black',
-					slug: 'black',
-					color: '#000000',
-				},
-				{
-					name: 'Cyan bluish gray',
-					slug: 'cyan-bluish-gray',
-					color: '#abb8c3',
-				},
-				{
-					name: 'White',
-					slug: 'white',
-					color: '#ffffff',
-				},
-			],
-			theme: [
-				{
-					slug: 'green',
-					color: '#D1E4DD',
-					name: 'Green',
-				},
-				{
-					slug: 'blue',
-					color: '#D1DFE4',
-					name: 'Blue',
-				},
-				{
-					slug: 'purple',
-					color: '#D1D1E4',
-					name: 'Purple',
-				},
-			],
-			custom: [
-				{
-					color: '#1bf5c1',
-					name: 'Color 1 ',
-					slug: 'custom-color-1',
-				},
-				{
-					color: '#cf1594',
-					name: 'Color 2 ',
-					slug: 'custom-color-2',
-				},
-			],
-		},
-		gradients: {
-			default: [
-				{
-					name: 'Vivid cyan blue to vivid purple',
-					gradient:
-						'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
-					slug: 'vivid-cyan-blue-to-vivid-purple',
-				},
-				{
-					name: 'Light green cyan to vivid green cyan',
-					gradient:
-						'linear-gradient(135deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)',
-					slug: 'light-green-cyan-to-vivid-green-cyan',
-				},
-			],
-			theme: [
-				{
-					slug: 'purple-to-blue',
-					gradient: 'linear-gradient(160deg, #D1D1E4, #D1DFE4)',
-					name: 'Purple to Blue',
-				},
-				{
-					slug: 'green-to-purple',
-					gradient: 'linear-gradient(160deg, #D1E4DD, #D1D1E4)',
-					name: 'Green to Purple',
-				},
-			],
-		},
-	},
-	typography: {
-		fontSizes: {
-			default: [
-				{
-					name: 'Small',
-					slug: 'small',
-					size: '13px',
-					sizePx: '13px',
-				},
-				{
-					name: 'Normal',
-					slug: 'normal',
-					size: '16px',
-					sizePx: '16px',
-				},
-				{
-					name: 'Huge',
-					slug: 'huge',
-					size: '42px',
-					sizePx: '42px',
-				},
-			],
-			theme: [
-				{
-					name: 'Normal',
-					slug: 'normal',
-					size: '18px',
-					sizePx: '18px',
-				},
-				{
-					slug: 'extra-large',
-					size: '40px',
-					sizePx: '40px',
-					name: 'Extra large',
-				},
-				{
-					slug: 'gigantic',
-					size: '144px',
-					sizePx: '144px',
-					name: 'Gigantic',
-				},
-			],
-		},
-	},
-	custom: {
-		'line-height': {
-			body: 1.7,
-			heading: 1.3,
-			'page-title': 1.1,
-		},
-	},
-};
-
-export const MAPPED_VALUES = {
-	color: {
-		values: GLOBAL_STYLES_PALETTE,
-		slug: 'color',
-	},
-	'font-size': {
-		values: RAW_FEATURES.typography.fontSizes.theme,
-		slug: 'size',
-	},
-};
diff --git a/packages/components/src/mobile/global-styles-context/test/utils.native.js b/packages/components/src/mobile/global-styles-context/test/utils.native.js
deleted file mode 100644
index 6144b9a13ae89e..00000000000000
--- a/packages/components/src/mobile/global-styles-context/test/utils.native.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Internal dependencies
- */
-import {
-	getBlockPaddings,
-	getBlockColors,
-	parseStylesVariables,
-	getGlobalStyles,
-} from '../utils';
-
-import {
-	DEFAULT_COLORS,
-	GLOBAL_STYLES_GRADIENTS,
-	DEFAULT_GLOBAL_STYLES,
-	PARSED_GLOBAL_STYLES,
-	RAW_FEATURES,
-	MAPPED_VALUES,
-} from './fixtures/theme';
-
-describe( 'getBlockPaddings', () => {
-	const PADDING = 12;
-
-	it( 'returns no paddings for a block without background color', () => {
-		const paddings = getBlockPaddings(
-			{ color: 'red' },
-			{ backgroundColor: 'red' },
-			{ textColor: 'primary' }
-		);
-		expect( paddings ).toEqual( expect.objectContaining( {} ) );
-	} );
-
-	it( 'returns paddings for a block with background color', () => {
-		const paddings = getBlockPaddings(
-			{ color: 'red' },
-			{},
-			{ backgroundColor: 'red', textColor: 'primary' }
-		);
-		expect( paddings ).toEqual(
-			expect.objectContaining( { padding: PADDING } )
-		);
-	} );
-
-	it( 'returns no paddings for an inner block without background color within a parent block with background color', () => {
-		const paddings = getBlockPaddings(
-			{ backgroundColor: 'blue', color: 'yellow', padding: PADDING },
-			{},
-			{ textColor: 'primary' }
-		);
-
-		expect( paddings ).toEqual(
-			expect.not.objectContaining( { padding: PADDING } )
-		);
-	} );
-} );
-
-describe( 'getBlockColors', () => {
-	it( 'returns the theme colors correctly', () => {
-		const blockColors = getBlockColors(
-			{ backgroundColor: 'accent', textColor: 'secondary' },
-			DEFAULT_COLORS
-		);
-		expect( blockColors ).toEqual(
-			expect.objectContaining( {
-				backgroundColor: '#cd2653',
-				color: '#6d6d6d',
-			} )
-		);
-	} );
-
-	it( 'returns custom background color correctly', () => {
-		const blockColors = getBlockColors(
-			{ backgroundColor: '#222222', textColor: 'accent' },
-			DEFAULT_COLORS
-		);
-		expect( blockColors ).toEqual(
-			expect.objectContaining( {
-				backgroundColor: '#222222',
-				color: '#cd2653',
-			} )
-		);
-	} );
-
-	it( 'returns custom text color correctly', () => {
-		const blockColors = getBlockColors(
-			{ textColor: '#4ddddd' },
-			DEFAULT_COLORS
-		);
-		expect( blockColors ).toEqual(
-			expect.objectContaining( {
-				color: '#4ddddd',
-			} )
-		);
-	} );
-} );
-
-describe( 'parseStylesVariables', () => {
-	it( 'returns the parsed preset values correctly', () => {
-		const customValues = parseStylesVariables(
-			JSON.stringify( RAW_FEATURES.custom ),
-			MAPPED_VALUES
-		);
-		const blockColors = parseStylesVariables(
-			JSON.stringify( DEFAULT_GLOBAL_STYLES ),
-			MAPPED_VALUES,
-			customValues
-		);
-		expect( blockColors ).toEqual(
-			expect.objectContaining( PARSED_GLOBAL_STYLES )
-		);
-	} );
-
-	it( 'returns the parsed custom color values correctly', () => {
-		const defaultStyles = {
-			...DEFAULT_GLOBAL_STYLES,
-			color: {
-				text: 'var(--wp--custom--color--blue)',
-				background: 'var(--wp--custom--color--green)',
-			},
-		};
-		const customValues = parseStylesVariables(
-			JSON.stringify( RAW_FEATURES.custom ),
-			MAPPED_VALUES
-		);
-		const styles = parseStylesVariables(
-			JSON.stringify( defaultStyles ),
-			MAPPED_VALUES,
-			customValues
-		);
-		expect( styles ).toEqual(
-			expect.objectContaining( PARSED_GLOBAL_STYLES )
-		);
-	} );
-} );
-
-describe( 'getGlobalStyles', () => {
-	it( 'returns the global styles data correctly', () => {
-		const rawFeatures = JSON.stringify( RAW_FEATURES );
-		const gradients = parseStylesVariables(
-			JSON.stringify( GLOBAL_STYLES_GRADIENTS ),
-			MAPPED_VALUES
-		);
-
-		const globalStyles = getGlobalStyles(
-			JSON.stringify( DEFAULT_GLOBAL_STYLES ),
-			rawFeatures
-		);
-
-		expect( globalStyles ).toEqual(
-			expect.objectContaining( {
-				__experimentalFeatures: {
-					color: {
-						palette: RAW_FEATURES.color.palette,
-						gradients,
-						text: true,
-						background: true,
-						defaultPalette: true,
-						defaultGradients: true,
-					},
-					typography: {
-						fontSizes: RAW_FEATURES.typography.fontSizes,
-						customLineHeight: RAW_FEATURES.custom[ 'line-height' ],
-					},
-				},
-				__experimentalGlobalStylesBaseStyles: PARSED_GLOBAL_STYLES,
-			} )
-		);
-	} );
-} );
diff --git a/packages/components/src/mobile/global-styles-context/utils.native.js b/packages/components/src/mobile/global-styles-context/utils.native.js
deleted file mode 100644
index b56e28da46207c..00000000000000
--- a/packages/components/src/mobile/global-styles-context/utils.native.js
+++ /dev/null
@@ -1,501 +0,0 @@
-/**
- * External dependencies
- */
-import { camelCase } from 'change-case';
-import { Dimensions } from 'react-native';
-import { colord } from 'colord';
-
-/**
- * WordPress dependencies
- */
-import {
-	getPxFromCssUnit,
-	useSettings,
-	useMultipleOriginColorsAndGradients,
-	SETTINGS_DEFAULTS,
-} from '@wordpress/block-editor';
-import { usePreferredColorSchemeStyle } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { useGlobalStyles } from './index.native';
-
-export const BLOCK_STYLE_ATTRIBUTES = [
-	'textColor',
-	'backgroundColor',
-	'style',
-	'color',
-	'fontSize',
-];
-
-// Mapping style properties name to native.
-const BLOCK_STYLE_ATTRIBUTES_MAPPING = {
-	textColor: 'color',
-	text: 'color',
-	background: 'backgroundColor',
-	link: 'linkColor',
-	placeholder: 'placeholderColor',
-};
-
-const PADDING = 12; // $solid-border-space
-const UNKNOWN_VALUE = 'undefined';
-const DEFAULT_FONT_SIZE = 16;
-
-export function getBlockPaddings(
-	mergedStyle,
-	wrapperPropsStyle,
-	blockStyleAttributes,
-	blockColors
-) {
-	const blockPaddings = {};
-
-	if (
-		! mergedStyle.padding &&
-		( wrapperPropsStyle?.backgroundColor ||
-			blockStyleAttributes?.backgroundColor ||
-			blockColors?.backgroundColor )
-	) {
-		blockPaddings.padding = PADDING;
-		return blockPaddings;
-	}
-
-	// Prevent adding extra paddings to inner blocks without background colors.
-	if (
-		mergedStyle?.padding &&
-		! wrapperPropsStyle?.backgroundColor &&
-		! blockStyleAttributes?.backgroundColor &&
-		! blockColors?.backgroundColor
-	) {
-		blockPaddings.padding = undefined;
-	}
-
-	return blockPaddings;
-}
-
-export function getBlockColors(
-	blockStyleAttributes,
-	defaultColors,
-	blockName,
-	baseGlobalStyles
-) {
-	const blockStyles = {};
-	const customBlockStyles = blockStyleAttributes?.style?.color || {};
-	const blockGlobalStyles = baseGlobalStyles?.blocks?.[ blockName ];
-
-	// Global styles colors.
-	if ( blockGlobalStyles?.color ) {
-		Object.entries( blockGlobalStyles.color ).forEach(
-			( [ key, value ] ) => {
-				const styleKey = BLOCK_STYLE_ATTRIBUTES_MAPPING[ key ];
-
-				if ( styleKey && value !== UNKNOWN_VALUE ) {
-					const color = customBlockStyles[ key ] ?? value;
-					blockStyles[ styleKey ] = color;
-				}
-			}
-		);
-	} else if ( baseGlobalStyles?.styles?.color?.text ) {
-		blockStyles[ BLOCK_STYLE_ATTRIBUTES_MAPPING.text ] =
-			baseGlobalStyles?.styles?.color?.text;
-	}
-
-	// Global styles elements.
-	if ( blockGlobalStyles?.elements ) {
-		const linkColor = blockGlobalStyles.elements?.link?.color?.text;
-		const styleKey = BLOCK_STYLE_ATTRIBUTES_MAPPING.link;
-
-		if ( styleKey && linkColor && linkColor !== UNKNOWN_VALUE ) {
-			blockStyles[ styleKey ] = linkColor;
-		}
-	}
-
-	// Custom colors.
-	Object.entries( blockStyleAttributes ).forEach( ( [ key, value ] ) => {
-		const isCustomColor = value?.startsWith?.( '#' );
-		let styleKey = key;
-
-		if ( BLOCK_STYLE_ATTRIBUTES_MAPPING[ styleKey ] ) {
-			styleKey = BLOCK_STYLE_ATTRIBUTES_MAPPING[ styleKey ];
-		}
-
-		if ( ! isCustomColor ) {
-			const mappedColor = Object.values( defaultColors ?? {} ).find(
-				( { slug } ) => slug === value
-			);
-
-			if ( mappedColor ) {
-				blockStyles[ styleKey ] = mappedColor.color;
-			}
-		} else {
-			blockStyles[ styleKey ] = value;
-		}
-	} );
-
-	// Color placeholder.
-	if ( blockStyles?.color ) {
-		blockStyles[ BLOCK_STYLE_ATTRIBUTES_MAPPING.placeholder ] =
-			blockStyles.color;
-	}
-
-	return blockStyles;
-}
-
-export function getBlockTypography(
-	blockStyleAttributes,
-	fontSizes,
-	blockName,
-	baseGlobalStyles
-) {
-	const typographyStyles = {};
-	const customBlockStyles = blockStyleAttributes?.style?.typography || {};
-	const blockGlobalStyles = baseGlobalStyles?.blocks?.[ blockName ];
-	const parsedFontSizes = Object.values( fontSizes ?? {} );
-
-	// Global styles.
-	if ( blockGlobalStyles?.typography ) {
-		const fontSize = blockGlobalStyles?.typography?.fontSize;
-		const lineHeight = blockGlobalStyles?.typography?.lineHeight;
-
-		if ( fontSize ) {
-			if ( parseInt( fontSize, 10 ) ) {
-				typographyStyles.fontSize = fontSize;
-			} else {
-				const mappedFontSize = parsedFontSizes.find(
-					( { slug } ) => slug === fontSize
-				);
-
-				if ( mappedFontSize ) {
-					typographyStyles.fontSize = mappedFontSize?.size;
-				}
-			}
-		}
-
-		if ( lineHeight ) {
-			typographyStyles.lineHeight = lineHeight;
-		}
-	}
-
-	if ( blockStyleAttributes?.fontSize && baseGlobalStyles ) {
-		const mappedFontSize = parsedFontSizes.find(
-			( { slug } ) => slug === blockStyleAttributes?.fontSize
-		);
-
-		if ( mappedFontSize ) {
-			typographyStyles.fontSize = mappedFontSize?.size;
-		}
-	}
-
-	// Custom styles.
-	if ( customBlockStyles?.fontSize ) {
-		typographyStyles.fontSize = customBlockStyles?.fontSize;
-	}
-
-	if ( customBlockStyles?.lineHeight ) {
-		typographyStyles.lineHeight = customBlockStyles?.lineHeight;
-	}
-
-	return typographyStyles;
-}
-
-/**
- * Return a value from a certain path of the object.
- * Path is specified as an array of properties, like: [ 'parent', 'child' ].
- *
- * @param {Object} object Input object.
- * @param {Array}  path   Path to the object property.
- * @return {*} Value of the object property at the specified path.
- */
-const getValueFromObjectPath = ( object, path ) => {
-	let value = object;
-	path.forEach( ( fieldName ) => {
-		value = value?.[ fieldName ];
-	} );
-	return value;
-};
-
-export function parseStylesVariables( styles, mappedValues, customValues ) {
-	let stylesBase = styles;
-	const variables = [ 'preset', 'custom', 'var', 'fontSize' ];
-
-	if ( ! stylesBase ) {
-		return styles;
-	}
-
-	variables.forEach( ( variable ) => {
-		// Examples
-		// var(--wp--preset--color--gray)
-		// var(--wp--custom--body--typography--font-family)
-		// var:preset|color|custom-color-2
-		const regex = new RegExp( `var\\(--wp--${ variable }--(.*?)\\)`, 'g' );
-		const varRegex = /\"var:preset\|color\|(.*?)\"/gm;
-		const fontSizeRegex = /"fontSize":"(.*?)"/gm;
-
-		if ( variable === 'preset' ) {
-			stylesBase = stylesBase.replace( regex, ( _$1, $2 ) => {
-				const path = $2.split( '--' );
-				const mappedPresetValue = mappedValues[ path[ 0 ] ];
-				if ( mappedPresetValue && mappedPresetValue.slug ) {
-					const matchedValue = Object.values(
-						mappedPresetValue.values ?? {}
-					).find( ( { slug } ) => slug === path[ 1 ] );
-					return matchedValue?.[ mappedPresetValue.slug ];
-				}
-				return UNKNOWN_VALUE;
-			} );
-		}
-		if ( variable === 'custom' ) {
-			const customValuesData = customValues ?? JSON.parse( stylesBase );
-			stylesBase = stylesBase.replace( regex, ( _$1, $2 ) => {
-				const path = $2.split( '--' );
-
-				// Supports cases for variables like var(--wp--custom--color--background)
-				if ( path[ 0 ] === 'color' ) {
-					const colorKey = path[ path.length - 1 ];
-					if ( mappedValues?.color ) {
-						const matchedValue = mappedValues.color?.values?.find(
-							( { slug } ) => slug === colorKey
-						);
-						if ( matchedValue ) {
-							return `${ matchedValue?.color }`;
-						}
-					}
-				}
-
-				if (
-					path.reduce(
-						( prev, curr ) => prev && prev[ curr ],
-						customValuesData
-					)
-				) {
-					return getValueFromObjectPath( customValuesData, path );
-				}
-
-				// Check for camelcase properties.
-				return getValueFromObjectPath( customValuesData, [
-					...path.slice( 0, path.length - 1 ),
-					camelCase( path[ path.length - 1 ] ),
-				] );
-			} );
-		}
-
-		if ( variable === 'var' ) {
-			stylesBase = stylesBase.replace( varRegex, ( _$1, $2 ) => {
-				if ( mappedValues?.color ) {
-					const matchedValue = mappedValues.color?.values?.find(
-						( { slug } ) => slug === $2
-					);
-					return `"${ matchedValue?.color }"`;
-				}
-				return UNKNOWN_VALUE;
-			} );
-		}
-
-		if ( variable === 'fontSize' ) {
-			const { width, height } = Dimensions.get( 'window' );
-
-			stylesBase = stylesBase.replace( fontSizeRegex, ( _$1, $2 ) => {
-				const parsedFontSize =
-					getPxFromCssUnit( $2, {
-						width,
-						height,
-						fontSize: DEFAULT_FONT_SIZE,
-					} ) || `${ DEFAULT_FONT_SIZE }px`;
-
-				return `"fontSize":"${ parsedFontSize }"`;
-			} );
-		}
-	} );
-
-	return JSON.parse( stylesBase );
-}
-
-export function getMappedValues( features, palette ) {
-	const typography = features?.typography;
-	const colors = [
-		...( palette?.theme || [] ),
-		...( palette?.custom || [] ),
-		...( palette?.default || [] ),
-	];
-
-	const fontSizes = {
-		...typography?.fontSizes?.theme,
-		...typography?.fontSizes?.custom,
-	};
-	const mappedValues = {
-		color: {
-			values: colors,
-			slug: 'color',
-		},
-		'font-size': {
-			values: fontSizes,
-			slug: 'size',
-		},
-	};
-	return mappedValues;
-}
-
-/**
- * Returns the normalized fontSizes to include the sizePx value for each of the different sizes.
- *
- * @param {Object} fontSizes found in global styles.
- * @return {Object} normalized sizes.
- */
-function normalizeFontSizes( fontSizes ) {
-	// Adds normalized PX values for each of the different keys.
-	if ( ! fontSizes ) {
-		return fontSizes;
-	}
-	const normalizedFontSizes = {};
-	const dimensions = Dimensions.get( 'window' );
-
-	[ 'default', 'theme', 'custom' ].forEach( ( key ) => {
-		if ( fontSizes[ key ] ) {
-			normalizedFontSizes[ key ] = fontSizes[ key ]?.map(
-				( fontSizeObject ) => {
-					fontSizeObject.sizePx = getPxFromCssUnit(
-						fontSizeObject.size,
-						{
-							width: dimensions.width,
-							height: dimensions.height,
-							fontSize: DEFAULT_FONT_SIZE,
-						}
-					);
-					return fontSizeObject;
-				}
-			);
-		}
-	} );
-
-	return normalizedFontSizes;
-}
-
-export function useMobileGlobalStylesColors( type = 'colors' ) {
-	const colorGradientSettings = useMultipleOriginColorsAndGradients();
-	const availableThemeColors = colorGradientSettings?.[ type ]?.reduce(
-		( colors, origin ) => colors.concat( origin?.[ type ] ),
-		[]
-	);
-	// Default editor colors/gradients if it's not a block-based theme.
-	const defaultPaletteSetting =
-		type === 'colors' ? 'color.palette' : 'color.gradients';
-	const [ defaultPaletteValue ] = useSettings( defaultPaletteSetting );
-	// In edge cases, the default palette might be undefined. To avoid
-	// exceptions across the editor in that case, we explicitly return
-	// the default editor colors.
-	const defaultPalette = defaultPaletteValue ?? SETTINGS_DEFAULTS.colors;
-
-	return availableThemeColors.length >= 1
-		? availableThemeColors
-		: defaultPalette;
-}
-
-export function getColorsAndGradients(
-	defaultEditorColors = [],
-	defaultEditorGradients = [],
-	rawFeatures
-) {
-	const features = rawFeatures ? JSON.parse( rawFeatures ) : {};
-
-	return {
-		__experimentalGlobalStylesBaseStyles: null,
-		__experimentalFeatures: {
-			color: {
-				...( ! features?.color
-					? {
-							text: true,
-							background: true,
-							palette: {
-								default: defaultEditorColors,
-							},
-							gradients: {
-								default: defaultEditorGradients,
-							},
-					  }
-					: features?.color ),
-				defaultPalette: defaultEditorColors?.length > 0,
-				defaultGradients: defaultEditorGradients?.length > 0,
-			},
-		},
-	};
-}
-
-export function getGlobalStyles( rawStyles, rawFeatures ) {
-	const features = rawFeatures ? JSON.parse( rawFeatures ) : {};
-	const mappedValues = getMappedValues( features, features?.color?.palette );
-	const colors = parseStylesVariables(
-		JSON.stringify( features?.color ),
-		mappedValues
-	);
-	const gradients = parseStylesVariables(
-		JSON.stringify( features?.color?.gradients ),
-		mappedValues
-	);
-	const customValues = parseStylesVariables(
-		JSON.stringify( features?.custom ),
-		mappedValues
-	);
-	const globalStyles = parseStylesVariables(
-		rawStyles,
-		mappedValues,
-		customValues
-	);
-
-	const fontSizes = normalizeFontSizes( features?.typography?.fontSizes );
-
-	return {
-		__experimentalFeatures: {
-			color: {
-				palette: colors?.palette,
-				gradients,
-				text: features?.color?.text ?? true,
-				background: features?.color?.background ?? true,
-				defaultPalette: features?.color?.defaultPalette ?? true,
-				defaultGradients: features?.color?.defaultGradients ?? true,
-			},
-			typography: {
-				fontSizes,
-				customLineHeight: features?.custom?.[ 'line-height' ],
-			},
-			spacing: features?.spacing,
-		},
-		__experimentalGlobalStylesBaseStyles: globalStyles,
-	};
-}
-
-/**
- * Determine and apply appropriate color scheme based on global styles or device's light/dark mode.
- *
- * The function first attempts to retrieve the editor's background color from global styles.
- * If the detected background color is light, light styles are applied, and dark styles otherwise.
- * If no custom background color is defined, styles are applied using the device's dark/light setting.
- *
- * @param {Object} baseStyle - An object representing the base (light theme) styles for the editor.
- * @param {Object} darkStyle - An object representing the additional styles to apply when the editor is in dark mode.
- *
- * @return {Object} - The combined style object that should be applied to the editor.
- */
-export const useEditorColorScheme = ( baseStyle, darkStyle ) => {
-	const globalStyles = useGlobalStyles();
-
-	const deviceColorScheme = usePreferredColorSchemeStyle(
-		baseStyle,
-		darkStyle
-	);
-
-	const editorColors = globalStyles?.baseColors?.color;
-	const editorBackgroundColor = editorColors?.background;
-
-	const isBackgroundColorDefined =
-		typeof editorBackgroundColor !== 'undefined' &&
-		editorBackgroundColor !== 'undefined';
-
-	if ( isBackgroundColorDefined ) {
-		const isEditorBackgroundDark = colord( editorBackgroundColor ).isDark();
-		return isEditorBackgroundDark
-			? { ...baseStyle, ...darkStyle }
-			: baseStyle;
-	}
-
-	return deviceColorScheme;
-};
diff --git a/packages/components/src/mobile/gradient/index.native.js b/packages/components/src/mobile/gradient/index.native.js
index e0a2ad8de0decb..47e96558ce3fef 100644
--- a/packages/components/src/mobile/gradient/index.native.js
+++ b/packages/components/src/mobile/gradient/index.native.js
@@ -7,7 +7,6 @@ import gradientParser from 'gradient-parser';
 /**
  * WordPress dependencies
  */
-import { colorsUtils } from '@wordpress/components';
 import { RadialGradient, Stop, SVG, Defs, Rect } from '@wordpress/primitives';
 import { useResizeObserver } from '@wordpress/compose';
 import { useMemo } from '@wordpress/element';
@@ -16,6 +15,7 @@ import { useMemo } from '@wordpress/element';
  * Internal dependencies
  */
 import styles from './style.scss';
+import { colorsUtils } from '../color-settings/utils';
 
 export function getGradientAngle( gradientValue ) {
 	const angleBase = 45;
@@ -51,7 +51,9 @@ export function getGradientAngle( gradientValue ) {
 		}
 	} else if ( angleType === 'angle' ) {
 		return parseFloat( angle );
-	} else return 4 * angleBase;
+	} else {
+		return 4 * angleBase;
+	}
 }
 
 export function getGradientColorGroup( gradientValue ) {
@@ -135,7 +137,7 @@ function Gradient( {
 		return (
 			<RNLinearGradient
 				colors={ colors }
-				useAngle={ true }
+				useAngle
 				angle={ getGradientAngle( gradientValue ) }
 				locations={ locations }
 				angleCenter={ angleCenter }
diff --git a/packages/components/src/mobile/image/constants.js b/packages/components/src/mobile/image/constants.js
new file mode 100644
index 00000000000000..e866759bd2ac0d
--- /dev/null
+++ b/packages/components/src/mobile/image/constants.js
@@ -0,0 +1 @@
+export const IMAGE_DEFAULT_FOCAL_POINT = { x: 0.5, y: 0.5 };
diff --git a/packages/components/src/mobile/image/icon-customize.native.js b/packages/components/src/mobile/image/icon-customize.native.js
index 57fc39c7c29f1b..0f33638041688b 100644
--- a/packages/components/src/mobile/image/icon-customize.native.js
+++ b/packages/components/src/mobile/image/icon-customize.native.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Path, SVG } from '@wordpress/components';
+import { SVG, Path } from '@wordpress/primitives';
 
 export default (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
diff --git a/packages/components/src/mobile/image/icon-retry.native.js b/packages/components/src/mobile/image/icon-retry.native.js
index 580cd1fff188f5..1ac6c714b3f6e4 100644
--- a/packages/components/src/mobile/image/icon-retry.native.js
+++ b/packages/components/src/mobile/image/icon-retry.native.js
@@ -1,11 +1,11 @@
 /**
  * WordPress dependencies
  */
-import { Path, SVG } from '@wordpress/components';
+import { SVG, Path } from '@wordpress/primitives';
 
 export default (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<Path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z" />
-		<Path d="M0 0h24v24H0z" fill={ 'none' } />
+		<Path d="M0 0h24v24H0z" fill="none" />
 	</SVG>
 );
diff --git a/packages/components/src/mobile/image/image-editing-button.native.js b/packages/components/src/mobile/image/image-editing-button.native.js
index fccc4fa2bfe334..b3dfd546b63645 100644
--- a/packages/components/src/mobile/image/image-editing-button.native.js
+++ b/packages/components/src/mobile/image/image-editing-button.native.js
@@ -6,7 +6,6 @@ import { TouchableWithoutFeedback, View, Platform } from 'react-native';
 /**
  * WordPress dependencies
  */
-import { Icon } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -15,6 +14,7 @@ import { __ } from '@wordpress/i18n';
 import { MediaEdit } from '../media-edit';
 import SvgIconCustomize from './icon-customize';
 import styles from './style.scss';
+import Icon from '../../icon';
 
 const accessibilityHint =
 	Platform.OS === 'ios'
@@ -40,7 +40,7 @@ const ImageEditingButton = ( {
 				<TouchableWithoutFeedback
 					accessibilityHint={ accessibilityHint }
 					accessibilityLabel={ __( 'Edit image' ) }
-					accessibilityRole={ 'button' }
+					accessibilityRole="button"
 					onPress={ open }
 				>
 					<View style={ styles.editContainer }>
diff --git a/packages/components/src/mobile/image/index.native.js b/packages/components/src/mobile/image/index.native.js
index 064150ec5f728d..3c7e4ddc19c006 100644
--- a/packages/components/src/mobile/image/index.native.js
+++ b/packages/components/src/mobile/image/index.native.js
@@ -8,8 +8,7 @@ import FastImage from 'react-native-fast-image';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Icon } from '@wordpress/components';
-import { image as icon } from '@wordpress/icons';
+import { image, offline } from '@wordpress/icons';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 import { useEffect, useState, Platform } from '@wordpress/element';
 
@@ -20,15 +19,15 @@ import { getImageWithFocalPointStyles } from './utils';
 import styles from './style.scss';
 import SvgIconRetry from './icon-retry';
 import ImageEditingButton from './image-editing-button';
+import Icon from '../../icon';
 
 const ICON_TYPE = {
+	OFFLINE: 'offline',
 	PLACEHOLDER: 'placeholder',
 	RETRY: 'retry',
 	UPLOAD: 'upload',
 };
 
-export const IMAGE_DEFAULT_FOCAL_POINT = { x: 0.5, y: 0.5 };
-
 const ImageComponent = ( {
 	align,
 	alt,
@@ -39,6 +38,7 @@ const ImageComponent = ( {
 	isSelected,
 	shouldUseFastImage,
 	isUploadFailed,
+	isUploadPaused,
 	isUploadInProgress,
 	mediaPickerOptions,
 	onImageDataLoad,
@@ -54,6 +54,9 @@ const ImageComponent = ( {
 } ) => {
 	const [ imageData, setImageData ] = useState( null );
 	const [ containerSize, setContainerSize ] = useState( null );
+	const [ localURL, setLocalURL ] = useState( null );
+	const [ networkURL, setNetworkURL ] = useState( null );
+	const [ networkImageLoaded, setNetworkImageLoaded ] = useState( false );
 
 	// Disabled for Android due to https://github.com/WordPress/gutenberg/issues/43149
 	const Image =
@@ -80,11 +83,36 @@ const ImageComponent = ( {
 					onImageDataLoad( metaData );
 				}
 			} );
+
+			if ( url.startsWith( 'file:///' ) ) {
+				setLocalURL( url );
+				setNetworkURL( null );
+				setNetworkImageLoaded( false );
+			} else if ( url.startsWith( 'https://' ) ) {
+				if ( Platform.isIOS ) {
+					setNetworkURL( url );
+				} else if ( Platform.isAndroid ) {
+					RNImage.prefetch( url ).then(
+						() => {
+							if ( ! isCurrent ) {
+								return;
+							}
+							setNetworkURL( url );
+							setNetworkImageLoaded( true );
+						},
+						() => {
+							// This callback is called when the image fails to load,
+							// but these events are handled by `isUploadFailed`
+							// and `isUploadPaused` events instead.
+							//
+							// Ignoring the error event will persist the local image URI.
+						}
+					);
+				}
+			}
 		}
 		return () => ( isCurrent = false );
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ url ] );
 
 	const onContainerLayout = ( event ) => {
@@ -101,19 +129,23 @@ const ImageComponent = ( {
 	};
 
 	const getIcon = ( iconType ) => {
+		let icon;
 		let iconStyle;
 		switch ( iconType ) {
 			case ICON_TYPE.RETRY:
-				return (
-					<Icon
-						icon={ retryIcon || SvgIconRetry }
-						{ ...styles.iconRetry }
-					/>
-				);
+				icon = retryIcon || SvgIconRetry;
+				iconStyle = iconRetryStyles;
+				break;
+			case ICON_TYPE.OFFLINE:
+				icon = offline;
+				iconStyle = iconOfflineStyles;
+				break;
 			case ICON_TYPE.PLACEHOLDER:
+				icon = image;
 				iconStyle = iconPlaceholderStyles;
 				break;
 			case ICON_TYPE.UPLOAD:
+				icon = image;
 				iconStyle = iconUploadStyles;
 				break;
 		}
@@ -130,6 +162,31 @@ const ImageComponent = ( {
 		styles.iconUploadDark
 	);
 
+	const iconOfflineStyles = usePreferredColorSchemeStyle(
+		styles.iconOffline,
+		styles.iconOfflineDark
+	);
+
+	const retryIconStyles = usePreferredColorSchemeStyle(
+		styles.retryIcon,
+		styles.retryIconDark
+	);
+
+	const iconRetryStyles = usePreferredColorSchemeStyle(
+		styles.iconRetry,
+		styles.iconRetryDark
+	);
+
+	const retryContainerStyles = usePreferredColorSchemeStyle(
+		styles.retryContainer,
+		styles.retryContainerDark
+	);
+
+	const uploadFailedTextStyles = usePreferredColorSchemeStyle(
+		styles.uploadFailedText,
+		styles.uploadFailedTextDark
+	);
+
 	const placeholderStyles = [
 		usePreferredColorSchemeStyle(
 			styles.imageContainerUpload,
@@ -161,7 +218,6 @@ const ImageComponent = ( {
 
 	const imageStyles = [
 		{
-			opacity: isUploadInProgress ? 0.3 : 1,
 			height: containerSize?.height,
 		},
 		! resizeMode && {
@@ -185,12 +241,29 @@ const ImageComponent = ( {
 		imageHeight && { height: imageHeight },
 		shapeStyle,
 	];
+
+	// On iOS, add 1 to height to account for the 1px non-visible image
+	// that is used to determine when the network image has loaded
+	// We also must verify that it is not NaN, as it can be NaN when the image is loading.
+	// This is not necessary on Android as the non-visible image is not used.
+	let calculatedSelectedHeight;
+	if ( Platform.isIOS ) {
+		calculatedSelectedHeight =
+			containerSize && ! isNaN( containerSize.height )
+				? containerSize.height + 1
+				: 0;
+	} else {
+		calculatedSelectedHeight = containerSize?.height;
+	}
+
 	const imageSelectedStyles = [
 		usePreferredColorSchemeStyle(
 			styles.imageBorder,
 			styles.imageBorderDark
 		),
-		{ height: containerSize?.height },
+		{
+			height: calculatedSelectedHeight,
+		},
 	];
 
 	return (
@@ -210,15 +283,13 @@ const ImageComponent = ( {
 				disabled={ ! isSelected }
 				accessibilityLabel={ alt }
 				accessibilityHint={ __( 'Double tap and hold to edit' ) }
-				accessibilityRole={ 'imagebutton' }
+				accessibilityRole="imagebutton"
 				key={ url }
 				style={ imageContainerStyles }
 			>
-				{ isSelected &&
-					highlightSelected &&
-					! ( isUploadInProgress || isUploadFailed ) && (
-						<View style={ imageSelectedStyles } />
-					) }
+				{ isSelected && highlightSelected && (
+					<View style={ imageSelectedStyles } />
+				) }
 
 				{ ! imageData ? (
 					<View style={ placeholderStyles }>
@@ -228,33 +299,83 @@ const ImageComponent = ( {
 					</View>
 				) : (
 					<View style={ focalPoint && styles.focalPointContent }>
-						<Image
-							style={ imageStyles }
-							source={ { uri: url } }
-							{ ...( ! focalPoint && {
-								resizeMethod: 'scale',
-							} ) }
-							resizeMode={ imageResizeMode }
-						/>
+						{ Platform.isAndroid && (
+							<>
+								{ networkImageLoaded && networkURL && (
+									<Image
+										style={ imageStyles }
+										fadeDuration={ 0 }
+										source={ { uri: networkURL } }
+										{ ...( ! focalPoint && {
+											resizeMethod: 'scale',
+										} ) }
+										resizeMode={ imageResizeMode }
+										testID={ `network-image-${ url }` }
+									/>
+								) }
+								{ ! networkImageLoaded && ! networkURL && (
+									<Image
+										style={ imageStyles }
+										fadeDuration={ 0 }
+										source={ { uri: localURL } }
+										{ ...( ! focalPoint && {
+											resizeMethod: 'scale',
+										} ) }
+										resizeMode={ imageResizeMode }
+									/>
+								) }
+							</>
+						) }
+						{ Platform.isIOS && (
+							<>
+								<Image
+									style={ imageStyles }
+									source={ {
+										uri:
+											networkURL && networkImageLoaded
+												? networkURL
+												: localURL || url,
+									} }
+									{ ...( ! focalPoint && {
+										resizeMethod: 'scale',
+									} ) }
+									resizeMode={ imageResizeMode }
+									testID={ `network-image-${
+										networkURL && networkImageLoaded
+											? networkURL
+											: localURL || url
+									}` }
+								/>
+								<Image
+									source={ { uri: networkURL } }
+									style={ styles.nonVisibleImage }
+									onLoad={ () => {
+										setNetworkImageLoaded( true );
+									} }
+								/>
+							</>
+						) }
 					</View>
 				) }
 
-				{ isUploadFailed && retryMessage && (
+				{ ( isUploadFailed || isUploadPaused ) && retryMessage && (
 					<View
 						style={ [
 							styles.imageContainer,
-							styles.retryContainer,
+							retryContainerStyles,
 						] }
 					>
 						<View
 							style={ [
-								styles.retryIcon,
+								retryIconStyles,
 								retryIcon && styles.customRetryIcon,
 							] }
 						>
-							{ getIcon( ICON_TYPE.RETRY ) }
+							{ isUploadPaused
+								? getIcon( ICON_TYPE.OFFLINE )
+								: getIcon( ICON_TYPE.RETRY ) }
 						</View>
-						<Text style={ styles.uploadFailedText }>
+						<Text style={ uploadFailedTextStyles }>
 							{ retryMessage }
 						</Text>
 					</View>
@@ -265,7 +386,11 @@ const ImageComponent = ( {
 				<ImageEditingButton
 					onSelectMediaUploadOption={ onSelectMediaUploadOption }
 					openMediaOptions={ openMediaOptions }
-					url={ ! isUploadFailed && imageData && url }
+					url={
+						! ( isUploadFailed || isUploadPaused ) &&
+						imageData &&
+						url
+					}
 					pickerOptions={ mediaPickerOptions }
 				/>
 			) }
diff --git a/packages/components/src/mobile/image/style.native.scss b/packages/components/src/mobile/image/style.native.scss
index f6deb3655f3699..cebc097de8cdc5 100644
--- a/packages/components/src/mobile/image/style.native.scss
+++ b/packages/components/src/mobile/image/style.native.scss
@@ -21,10 +21,23 @@
 }
 
 .retryIcon {
-	width: 80px;
-	height: 80px;
-	justify-content: center;
-	align-items: center;
+	background-color: $black;
+	border-radius: 200px;
+	padding: 8px;
+}
+
+.retryIconDark {
+	background-color: $white;
+}
+
+.iconOffline {
+	fill: $white;
+	width: 24px;
+	height: 24px;
+}
+
+.iconOfflineDark {
+	fill: $black;
 }
 
 .customRetryIcon {
@@ -33,9 +46,13 @@
 }
 
 .iconRetry {
-	fill: #fff;
-	width: 100%;
-	height: 100%;
+	fill: $white;
+	width: 24px;
+	height: 24px;
+}
+
+.iconRetryDark {
+	fill: $black;
 }
 
 .iconPlaceholder {
@@ -90,12 +107,17 @@
 }
 
 .uploadFailedText {
-	color: #fff;
+	color: $black;
+	font-weight: bold;
 	font-size: 14;
 	margin-top: 5;
 	text-align: center;
 }
 
+.uploadFailedTextDark {
+	color: $white;
+}
+
 .editContainer {
 	width: 44px;
 	height: 44px;
@@ -116,7 +138,7 @@
 }
 
 .iconCustomise {
-	fill: #fff;
+	fill: $white;
 	position: absolute;
 	top: 7px;
 	left: 7px;
@@ -124,6 +146,10 @@
 
 .retryContainer {
 	flex: 1;
+	background-color: "rgba(255, 255, 255, 0.8)";
+}
+
+.retryContainerDark {
 	background-color: "rgba(0, 0, 0, 0.5)";
 }
 
@@ -145,3 +171,9 @@
 .wide {
 	width: 100%;
 }
+
+.nonVisibleImage {
+	height: 1;
+	width: 1;
+	opacity: 0;
+}
diff --git a/packages/components/src/mobile/keyboard-avoiding-view/index.ios.js b/packages/components/src/mobile/keyboard-avoiding-view/index.ios.js
index f13e7d329874fd..7630fd21fbc429 100644
--- a/packages/components/src/mobile/keyboard-avoiding-view/index.ios.js
+++ b/packages/components/src/mobile/keyboard-avoiding-view/index.ios.js
@@ -69,9 +69,7 @@ export const KeyboardAvoidingView = ( {
 			keyboardShowSubscription.remove();
 			keyboardHideSubscription.remove();
 		};
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [] );
 
 	function onSafeAreaInsetsUpdate( { safeAreaInsets } ) {
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/index.android.js b/packages/components/src/mobile/keyboard-aware-flat-list/index.android.js
index eccb80f3903e5d..0e92bef7df25f2 100644
--- a/packages/components/src/mobile/keyboard-aware-flat-list/index.android.js
+++ b/packages/components/src/mobile/keyboard-aware-flat-list/index.android.js
@@ -2,26 +2,80 @@
  * External dependencies
  */
 import { FlatList } from 'react-native';
-import Animated, { useAnimatedScrollHandler } from 'react-native-reanimated';
+import Animated from 'react-native-reanimated';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	forwardRef,
+	useCallback,
+	useImperativeHandle,
+} from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
+import useScroll from './use-scroll';
 import KeyboardAvoidingView from '../keyboard-avoiding-view';
+import { OPTIMIZATION_ITEMS_THRESHOLD, OPTIMIZATION_PROPS } from './shared';
 
 const AnimatedFlatList = Animated.createAnimatedComponent( FlatList );
+const EMPTY_OBJECT = {};
+
+export const KeyboardAwareFlatList = ( { onScroll, ...props }, ref ) => {
+	const { extraScrollHeight, scrollEnabled, shouldPreventAutomaticScroll } =
+		props;
+
+	const {
+		scrollViewRef,
+		scrollHandler,
+		scrollToSection,
+		scrollToElement,
+		onContentSizeChange,
+		lastScrollTo,
+	} = useScroll( {
+		scrollEnabled,
+		shouldPreventAutomaticScroll,
+		extraScrollHeight,
+		onScroll,
+	} );
+
+	const getFlatListRef = useCallback(
+		( flatListRef ) => {
+			scrollViewRef.current = flatListRef?.getNativeScrollRef();
+		},
+		[ scrollViewRef ]
+	);
+
+	useImperativeHandle( ref, () => {
+		return {
+			scrollViewRef: scrollViewRef.current,
+			scrollToSection,
+			scrollToElement,
+			lastScrollTo,
+		};
+	} );
+
+	const optimizationProps =
+		props.data?.length > OPTIMIZATION_ITEMS_THRESHOLD
+			? OPTIMIZATION_PROPS
+			: EMPTY_OBJECT;
 
-export const KeyboardAwareFlatList = ( { innerRef, onScroll, ...props } ) => {
-	const scrollHandler = useAnimatedScrollHandler( { onScroll } );
 	return (
 		<KeyboardAvoidingView style={ { flex: 1 } }>
 			<AnimatedFlatList
-				ref={ innerRef }
+				ref={ getFlatListRef }
 				onScroll={ scrollHandler }
+				onContentSizeChange={ onContentSizeChange }
+				// Disable clipping to fix focus losing.
+				// See https://github.com/wordpress-mobile/gutenberg-mobile/pull/741#issuecomment-472746541
+				removeClippedSubviews={ false }
+				{ ...optimizationProps }
 				{ ...props }
 			/>
 		</KeyboardAvoidingView>
 	);
 };
 
-export default KeyboardAwareFlatList;
+export default forwardRef( KeyboardAwareFlatList );
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/index.ios.js b/packages/components/src/mobile/keyboard-aware-flat-list/index.ios.js
index 8dc58008a3600d..9c224405a14a82 100644
--- a/packages/components/src/mobile/keyboard-aware-flat-list/index.ios.js
+++ b/packages/components/src/mobile/keyboard-aware-flat-list/index.ios.js
@@ -1,162 +1,147 @@
 /**
  * External dependencies
  */
-
-import { ScrollView, FlatList, useWindowDimensions } from 'react-native';
-import Animated, {
-	useAnimatedScrollHandler,
-	useSharedValue,
-} from 'react-native-reanimated';
+import { FlatList, View } from 'react-native';
+import Animated from 'react-native-reanimated';
 
 /**
  * WordPress dependencies
  */
-import { useCallback, useEffect, useRef } from '@wordpress/element';
+import {
+	useCallback,
+	useEffect,
+	forwardRef,
+	useImperativeHandle,
+} from '@wordpress/element';
 import { useThrottle } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
+import useScroll from './use-scroll';
 import useTextInputOffset from './use-text-input-offset';
-import useKeyboardOffset from './use-keyboard-offset';
-import useScrollToTextInput from './use-scroll-to-text-input';
 import useTextInputCaretPosition from './use-text-input-caret-position';
+import { OPTIMIZATION_ITEMS_THRESHOLD, OPTIMIZATION_PROPS } from './shared';
+import styles from './styles.scss';
 
-const AnimatedScrollView = Animated.createAnimatedComponent( ScrollView );
+const DEFAULT_FONT_SIZE = 16;
+const AnimatedFlatList = Animated.createAnimatedComponent( FlatList );
+const EMPTY_OBJECT = {};
 
+/** @typedef {import('@wordpress/element').RefObject} RefObject */
 /**
  * React component that provides a FlatList that is aware of the keyboard state and can scroll
  * to the currently focused TextInput.
  *
- * @param {Object}   props                              Component props.
- * @param {number}   props.extraScrollHeight            Extra scroll height for the content.
- * @param {Function} props.innerRef                     Function to pass the ScrollView ref to the parent component.
- * @param {Function} props.onScroll                     Function to be called when the list is scrolled.
- * @param {boolean}  props.scrollEnabled                Whether the list can be scrolled.
- * @param {Object}   props.scrollViewStyle              Additional style for the ScrollView component.
- * @param {boolean}  props.shouldPreventAutomaticScroll Whether to prevent scrolling when there's a Keyboard offset set.
- * @param {Object}   props...                           Other props to pass to the FlatList component.
+ * @param {Object}    props                              Component props.
+ * @param {number}    props.extraScrollHeight            Extra scroll height for the content.
+ * @param {Function}  props.onScroll                     Function to be called when the list is scrolled.
+ * @param {boolean}   props.scrollEnabled                Whether the list can be scrolled.
+ * @param {boolean}   props.shouldPreventAutomaticScroll Whether to prevent scrolling when there's a Keyboard offset set.
+ * @param {Object}    props...                           Other props to pass to the FlatList component.
+ * @param {RefObject} ref
  * @return {Component} KeyboardAwareFlatList component.
  */
-export const KeyboardAwareFlatList = ( {
-	extraScrollHeight,
-	innerRef,
-	onScroll,
-	scrollEnabled,
-	scrollViewStyle,
-	shouldPreventAutomaticScroll,
-	...props
-} ) => {
-	const scrollViewRef = useRef();
-	const scrollViewMeasurements = useRef();
-	const scrollViewYOffset = useSharedValue( -1 );
-
-	const { height: windowHeight, width: windowWidth } = useWindowDimensions();
-	const isLandscape = windowWidth >= windowHeight;
-
-	const [ keyboardOffset ] = useKeyboardOffset(
+export const KeyboardAwareFlatList = (
+	{
+		extraScrollHeight,
+		onScroll,
 		scrollEnabled,
-		shouldPreventAutomaticScroll
-	);
-
-	const [ currentCaretData ] = useTextInputCaretPosition( scrollEnabled );
+		shouldPreventAutomaticScroll,
+		...props
+	},
+	ref
+) => {
+	const {
+		scrollViewRef,
+		scrollHandler,
+		keyboardOffset,
+		scrollToSection,
+		scrollToElement,
+		onContentSizeChange,
+		lastScrollTo,
+	} = useScroll( {
+		scrollEnabled,
+		shouldPreventAutomaticScroll,
+		extraScrollHeight,
+		onScroll,
+		onSizeChange,
+	} );
 
 	const [ getTextInputOffset ] = useTextInputOffset(
 		scrollEnabled,
 		scrollViewRef
 	);
 
-	const [ scrollToTextInputOffset ] = useScrollToTextInput(
-		extraScrollHeight,
-		keyboardOffset,
-		scrollEnabled,
-		scrollViewMeasurements,
-		scrollViewRef,
-		scrollViewYOffset
-	);
-
 	const onScrollToTextInput = useThrottle(
 		useCallback(
 			async ( caret ) => {
+				const { caretHeight = DEFAULT_FONT_SIZE } = caret ?? {};
 				const textInputOffset = await getTextInputOffset( caret );
 				const hasTextInputOffset = textInputOffset !== null;
 
 				if ( hasTextInputOffset ) {
-					scrollToTextInputOffset( caret, textInputOffset );
+					scrollToSection( textInputOffset, caretHeight );
 				}
 			},
-			[ getTextInputOffset, scrollToTextInputOffset ]
+			[ getTextInputOffset, scrollToSection ]
 		),
 		200,
 		{ leading: false }
 	);
 
-	useEffect( () => {
-		onScrollToTextInput( currentCaretData );
-	}, [ currentCaretData, onScrollToTextInput ] );
-
-	// When the orientation changes, the ScrollView measurements
-	// need to be re-calculated.
-	useEffect( () => {
-		scrollViewMeasurements.current = null;
-	}, [ isLandscape ] );
-
-	const scrollHandler = useAnimatedScrollHandler( {
-		onScroll: ( event ) => {
-			const { contentOffset } = event;
-			scrollViewYOffset.value = contentOffset.y;
-			onScroll( event );
-		},
-	} );
-
-	const measureScrollView = useCallback( () => {
-		if ( scrollViewRef.current ) {
-			const scrollRef = scrollViewRef.current.getNativeScrollRef();
+	const [ currentCaretData ] = useTextInputCaretPosition( scrollEnabled );
 
-			scrollRef.measureInWindow( ( _x, y, width, height ) => {
-				scrollViewMeasurements.current = { y, width, height };
-			} );
-		}
-	}, [] );
+	const onSizeChange = useCallback(
+		() => onScrollToTextInput( currentCaretData ),
+		[ currentCaretData, onScrollToTextInput ]
+	);
 
-	const onContentSizeChange = useCallback( () => {
+	useEffect( () => {
 		onScrollToTextInput( currentCaretData );
+	}, [ currentCaretData, onScrollToTextInput ] );
 
-		// Sets the first values when the content size changes.
-		if ( ! scrollViewMeasurements.current ) {
-			measureScrollView();
-		}
-	}, [ measureScrollView, onScrollToTextInput, currentCaretData ] );
+	// Adds content insets when the keyboard is opened to have
+	// extra padding at the bottom.
+	const contentInset = { bottom: keyboardOffset };
 
-	const getRef = useCallback(
-		( ref ) => {
-			scrollViewRef.current = ref;
-			innerRef( ref );
+	const getFlatListRef = useCallback(
+		( flatListRef ) => {
+			scrollViewRef.current = flatListRef?.getNativeScrollRef();
 		},
-		[ innerRef ]
+		[ scrollViewRef ]
 	);
 
-	// Adds content insets when the keyboard is opened to have
-	// extra padding at the bottom.
-	const contentInset = { bottom: keyboardOffset };
+	useImperativeHandle( ref, () => {
+		return {
+			scrollViewRef: scrollViewRef.current,
+			scrollToSection,
+			scrollToElement,
+			lastScrollTo,
+		};
+	} );
 
-	const style = [ { flex: 1 }, scrollViewStyle ];
+	const optimizationProps =
+		props.data?.length > OPTIMIZATION_ITEMS_THRESHOLD
+			? OPTIMIZATION_PROPS
+			: EMPTY_OBJECT;
 
 	return (
-		<AnimatedScrollView
-			automaticallyAdjustContentInsets={ false }
-			contentInset={ contentInset }
-			keyboardShouldPersistTaps="handled"
-			onContentSizeChange={ onContentSizeChange }
-			onScroll={ scrollHandler }
-			ref={ getRef }
-			scrollEnabled={ scrollEnabled }
-			scrollEventThrottle={ 16 }
-			style={ style }
-		>
-			<FlatList { ...props } scrollEnabled={ false } />
-		</AnimatedScrollView>
+		<View style={ styles.list__container }>
+			<AnimatedFlatList
+				ref={ getFlatListRef }
+				automaticallyAdjustContentInsets={ false }
+				contentInset={ contentInset }
+				keyboardShouldPersistTaps="handled"
+				onContentSizeChange={ onContentSizeChange }
+				onScroll={ scrollHandler }
+				scrollEventThrottle={ 16 }
+				style={ styles.list__content }
+				{ ...optimizationProps }
+				{ ...props }
+			/>
+		</View>
 	);
 };
 
-export default KeyboardAwareFlatList;
+export default forwardRef( KeyboardAwareFlatList );
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/shared.native.js b/packages/components/src/mobile/keyboard-aware-flat-list/shared.native.js
new file mode 100644
index 00000000000000..170ea77773ee1d
--- /dev/null
+++ b/packages/components/src/mobile/keyboard-aware-flat-list/shared.native.js
@@ -0,0 +1,26 @@
+/**
+ * Optimization properties for FlatList.
+ * @typedef {Object} OptimizationProps
+ * @property {number} maxToRenderPerBatch - Controls the amount of items rendered per batch during scrolling.
+ *                                        Increasing this number reduces visual blank areas but may affect responsiveness.
+ *                                        Default: 10
+ * @property {number} windowSize          - Measurement unit representing viewport height.
+ *                                        Default: 21 (10 viewports above, 10 below, and 1 in between).
+ *                                        Larger values reduce chances of seeing blank spaces while scrolling but increase memory consumption.
+ *                                        Smaller values save memory but increase chances of seeing blank areas.
+ */
+
+/**
+ * Threshold for applying optimization settings.
+ * @type {number}
+ */
+export const OPTIMIZATION_ITEMS_THRESHOLD = 30;
+
+/**
+ * Optimization properties for FlatList.
+ * @type {OptimizationProps}
+ */
+export const OPTIMIZATION_PROPS = {
+	maxToRenderPerBatch: 15,
+	windowSize: 17,
+};
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/styles.native.scss b/packages/components/src/mobile/keyboard-aware-flat-list/styles.native.scss
new file mode 100644
index 00000000000000..bbde37bac1c37b
--- /dev/null
+++ b/packages/components/src/mobile/keyboard-aware-flat-list/styles.native.scss
@@ -0,0 +1,8 @@
+.list__container {
+	flex-grow: 1;
+	align-items: stretch;
+}
+
+.list__content {
+	margin-bottom: $mobile-block-toolbar-height;
+}
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/test/use-scroll-to-section.native.js b/packages/components/src/mobile/keyboard-aware-flat-list/test/use-scroll-to-section.native.js
new file mode 100644
index 00000000000000..7ee00cea55c664
--- /dev/null
+++ b/packages/components/src/mobile/keyboard-aware-flat-list/test/use-scroll-to-section.native.js
@@ -0,0 +1,142 @@
+/**
+ * External dependencies
+ */
+
+import { renderHook } from '@testing-library/react-native';
+
+/**
+ * Internal dependencies
+ */
+import useScrollToSection from '../use-scroll-to-section';
+
+describe( 'useScrollToSection', () => {
+	it( 'scrolls up to the section', () => {
+		// Arrange
+		const sectionY = 50;
+		const sectionHeight = 10;
+
+		const extraScrollHeight = 50;
+		const keyboardOffset = 100;
+		const scrollEnabled = true;
+		const scrollViewRef = { current: { scrollTo: jest.fn() } };
+		const scrollViewMeasurements = { current: { height: 600 } };
+		const scrollViewYOffset = { value: 150 };
+
+		const { result } = renderHook( () =>
+			useScrollToSection(
+				extraScrollHeight,
+				keyboardOffset,
+				scrollEnabled,
+				scrollViewMeasurements,
+				scrollViewRef,
+				scrollViewYOffset
+			)
+		);
+
+		// Act
+		result.current[ 0 ]( sectionY, sectionHeight );
+
+		// Assert
+		expect( scrollViewRef.current.scrollTo ).toHaveBeenCalledWith( {
+			y: sectionY,
+			animated: true,
+		} );
+	} );
+
+	it( 'scrolls down to the section', () => {
+		// Arrange
+		const sectionY = 750;
+		const sectionHeight = 10;
+
+		const extraScrollHeight = 50;
+		const keyboardOffset = 100;
+		const scrollEnabled = true;
+		const scrollViewRef = { current: { scrollTo: jest.fn() } };
+		const scrollViewMeasurements = { current: { height: 600 } };
+		const scrollViewYOffset = { value: 250 };
+
+		const { result } = renderHook( () =>
+			useScrollToSection(
+				extraScrollHeight,
+				keyboardOffset,
+				scrollEnabled,
+				scrollViewMeasurements,
+				scrollViewRef,
+				scrollViewYOffset
+			)
+		);
+
+		// Act
+		result.current[ 0 ]( sectionY, sectionHeight );
+
+		// Assert
+		const expectedYOffset =
+			sectionY -
+			( scrollViewMeasurements.current.height -
+				( keyboardOffset + extraScrollHeight + sectionHeight ) );
+		expect( scrollViewRef.current.scrollTo ).toHaveBeenCalledWith( {
+			y: expectedYOffset,
+			animated: true,
+		} );
+	} );
+
+	it( 'does not scroll when the ScrollView ref is not available', () => {
+		// Arrange
+		const sectionY = 50;
+		const sectionHeight = 10;
+
+		const extraScrollHeight = 50;
+		const keyboardOffset = 100;
+		const scrollEnabled = true;
+		const scrollViewRef = { current: null };
+		const scrollViewMeasurements = { current: { height: 600 } };
+		const scrollViewYOffset = { value: 0 };
+
+		const { result } = renderHook( () =>
+			useScrollToSection(
+				extraScrollHeight,
+				keyboardOffset,
+				scrollEnabled,
+				scrollViewMeasurements,
+				scrollViewRef,
+				scrollViewYOffset
+			)
+		);
+
+		// Act
+		result.current[ 0 ]( sectionY, sectionHeight );
+
+		// Assert
+		expect( scrollViewRef.current ).toBeNull();
+	} );
+
+	it( 'does not scroll when the scroll is not enabled', () => {
+		// Arrange
+		const sectionY = 50;
+		const sectionHeight = 10;
+
+		const extraScrollHeight = 50;
+		const keyboardOffset = 100;
+		const scrollEnabled = false;
+		const scrollViewRef = { current: { scrollTo: jest.fn() } };
+		const scrollViewMeasurements = { current: { height: 600 } };
+		const scrollViewYOffset = { value: 0 };
+
+		const { result } = renderHook( () =>
+			useScrollToSection(
+				extraScrollHeight,
+				keyboardOffset,
+				scrollEnabled,
+				scrollViewMeasurements,
+				scrollViewRef,
+				scrollViewYOffset
+			)
+		);
+
+		// Act
+		result.current[ 0 ]( sectionY, sectionHeight );
+
+		// Assert
+		expect( scrollViewRef.current.scrollTo ).not.toHaveBeenCalled();
+	} );
+} );
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/test/use-scroll-to-text-input.native.js b/packages/components/src/mobile/keyboard-aware-flat-list/test/use-scroll-to-text-input.native.js
deleted file mode 100644
index 98c33cd4750fbb..00000000000000
--- a/packages/components/src/mobile/keyboard-aware-flat-list/test/use-scroll-to-text-input.native.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * External dependencies
- */
-
-import { renderHook } from '@testing-library/react-native';
-
-/**
- * Internal dependencies
- */
-import useScrollToTextInput from '../use-scroll-to-text-input';
-
-describe( 'useScrollToTextInput', () => {
-	it( 'scrolls up to the current TextInput offset', () => {
-		// Arrange
-		const currentCaretData = { caretHeight: 10 };
-		const extraScrollHeight = 50;
-		const keyboardOffset = 100;
-		const scrollEnabled = true;
-		const scrollViewRef = { current: { scrollTo: jest.fn() } };
-		const scrollViewMeasurements = { current: { height: 600 } };
-		const scrollViewYOffset = { value: 150 };
-		const textInputOffset = 50;
-
-		const { result } = renderHook( () =>
-			useScrollToTextInput(
-				extraScrollHeight,
-				keyboardOffset,
-				scrollEnabled,
-				scrollViewMeasurements,
-				scrollViewRef,
-				scrollViewYOffset
-			)
-		);
-
-		// Act
-		result.current[ 0 ]( currentCaretData, textInputOffset );
-
-		// Assert
-		expect( scrollViewRef.current.scrollTo ).toHaveBeenCalledWith( {
-			y: textInputOffset,
-			animated: true,
-		} );
-	} );
-
-	it( 'scrolls down to the current TextInput offset', () => {
-		// Arrange
-		const currentCaretData = { caretHeight: 10 };
-		const extraScrollHeight = 50;
-		const keyboardOffset = 100;
-		const scrollEnabled = true;
-		const scrollViewRef = { current: { scrollTo: jest.fn() } };
-		const scrollViewMeasurements = { current: { height: 600 } };
-		const scrollViewYOffset = { value: 250 };
-		const textInputOffset = 750;
-
-		const { result } = renderHook( () =>
-			useScrollToTextInput(
-				extraScrollHeight,
-				keyboardOffset,
-				scrollEnabled,
-				scrollViewMeasurements,
-				scrollViewRef,
-				scrollViewYOffset
-			)
-		);
-
-		// Act
-		result.current[ 0 ]( currentCaretData, textInputOffset );
-
-		// Assert
-		const expectedYOffset =
-			textInputOffset -
-			( scrollViewMeasurements.current.height -
-				( keyboardOffset +
-					extraScrollHeight +
-					currentCaretData.caretHeight ) );
-		expect( scrollViewRef.current.scrollTo ).toHaveBeenCalledWith( {
-			y: expectedYOffset,
-			animated: true,
-		} );
-	} );
-
-	it( 'does not scroll when the ScrollView ref is not available', () => {
-		// Arrange
-		const currentCaretData = { caretHeight: 10 };
-		const extraScrollHeight = 50;
-		const keyboardOffset = 100;
-		const scrollEnabled = true;
-		const scrollViewRef = { current: null };
-		const scrollViewMeasurements = { current: { height: 600 } };
-		const scrollViewYOffset = { value: 0 };
-		const textInputOffset = 50;
-
-		const { result } = renderHook( () =>
-			useScrollToTextInput(
-				extraScrollHeight,
-				keyboardOffset,
-				scrollEnabled,
-				scrollViewMeasurements,
-				scrollViewRef,
-				scrollViewYOffset
-			)
-		);
-
-		// Act
-		result.current[ 0 ]( currentCaretData, textInputOffset );
-
-		// Assert
-		expect( scrollViewRef.current ).toBeNull();
-	} );
-
-	it( 'does not scroll when the scroll is not enabled', () => {
-		// Arrange
-		const currentCaretData = { caretHeight: 10 };
-		const extraScrollHeight = 50;
-		const keyboardOffset = 100;
-		const scrollEnabled = false;
-		const scrollViewRef = { current: { scrollTo: jest.fn() } };
-		const scrollViewMeasurements = { current: { height: 600 } };
-		const scrollViewYOffset = { value: 0 };
-		const textInputOffset = 50;
-
-		const { result } = renderHook( () =>
-			useScrollToTextInput(
-				extraScrollHeight,
-				keyboardOffset,
-				scrollEnabled,
-				scrollViewMeasurements,
-				scrollViewRef,
-				scrollViewYOffset
-			)
-		);
-
-		// Act
-		result.current[ 0 ]( currentCaretData, textInputOffset );
-
-		// Assert
-		expect( scrollViewRef.current.scrollTo ).not.toHaveBeenCalled();
-	} );
-} );
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/test/use-scroll.native.js b/packages/components/src/mobile/keyboard-aware-flat-list/test/use-scroll.native.js
new file mode 100644
index 00000000000000..ab34bb59b3a4e1
--- /dev/null
+++ b/packages/components/src/mobile/keyboard-aware-flat-list/test/use-scroll.native.js
@@ -0,0 +1,71 @@
+/**
+ * External dependencies
+ */
+
+import { renderHook } from 'test/helpers';
+
+/**
+ * Internal dependencies
+ */
+import useScroll from '../use-scroll';
+
+// Mock Reanimated with default mock
+jest.mock( 'react-native-reanimated', () => ( {
+	...require( 'react-native-reanimated/mock' ),
+	useAnimatedScrollHandler: jest.fn( ( args ) => args ),
+} ) );
+
+describe( 'useScroll', () => {
+	it( 'scrolls using current scroll position', () => {
+		const sectionY = 50;
+		const sectionHeight = 10;
+		const scrollViewMeasurements = { x: 0, y: 0, width: 0, height: 600 };
+		const extraScrollHeight = 50;
+		const scrollEnabled = true;
+		const shouldPreventAutomaticScroll = false;
+
+		const scrollTo = jest.fn();
+		const measureInWindow = jest.fn( ( callback ) =>
+			callback( ...Object.values( scrollViewMeasurements ) )
+		);
+		const scrollRef = { scrollTo, measureInWindow };
+		const onScroll = jest.fn();
+		const onSizeChange = jest.fn();
+
+		const { result } = renderHook( () =>
+			useScroll( {
+				scrollEnabled,
+				shouldPreventAutomaticScroll,
+				onScroll,
+				onSizeChange,
+				extraScrollHeight,
+			} )
+		);
+		const {
+			scrollViewRef,
+			onContentSizeChange,
+			scrollHandler,
+			scrollToSection,
+		} = result.current;
+
+		// Assign ref
+		scrollViewRef.current = scrollRef;
+
+		// Check content size changes
+		onContentSizeChange();
+		expect( measureInWindow ).toHaveBeenCalled();
+		expect( onSizeChange ).toHaveBeenCalled();
+
+		// Set up initial scroll offset
+		scrollHandler.onScroll( { contentOffset: { y: 150 } } );
+
+		// Scroll to section
+		scrollToSection( sectionY, sectionHeight );
+
+		// Assert
+		expect( scrollTo ).toHaveBeenCalledWith( {
+			y: sectionY,
+			animated: true,
+		} );
+	} );
+} );
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll-to-element.native.js b/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll-to-element.native.js
new file mode 100644
index 00000000000000..048b6815cdec29
--- /dev/null
+++ b/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll-to-element.native.js
@@ -0,0 +1,41 @@
+/**
+ * WordPress dependencies
+ */
+import { useCallback } from '@wordpress/element';
+
+/** @typedef {import('@wordpress/element').RefObject} RefObject */
+/**
+ * Hook to scroll to a specified element by taking into account the Keyboard
+ * and the Header.
+ *
+ * @param {RefObject} scrollViewRef   Scroll view reference.
+ * @param {Function}  scrollToSection Function to scroll.
+ * @return {Function[]} Function to scroll to an element.
+ */
+export default function useScrollToElement( scrollViewRef, scrollToSection ) {
+	/**
+	 * Function to scroll to an element.
+	 *
+	 * @param {RefObject} elementRef Ref of the element.
+	 */
+	const scrollToElement = useCallback(
+		( elementRef ) => {
+			if ( ! scrollViewRef.current || ! elementRef ) {
+				return;
+			}
+
+			elementRef.current.measureLayout(
+				scrollViewRef.current,
+				( _x, y, _width, height ) => {
+					if ( height || y ) {
+						scrollToSection( Math.round( y ), height );
+					}
+				},
+				() => {}
+			);
+		},
+		[ scrollViewRef, scrollToSection ]
+	);
+
+	return [ scrollToElement ];
+}
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll-to-section.native.js b/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll-to-section.native.js
new file mode 100644
index 00000000000000..d44895c69f678c
--- /dev/null
+++ b/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll-to-section.native.js
@@ -0,0 +1,100 @@
+/**
+ * External dependencies
+ */
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+
+/**
+ * WordPress dependencies
+ */
+import { useCallback } from '@wordpress/element';
+
+/** @typedef {import('@wordpress/element').RefObject} RefObject */
+/** @typedef {import('react-native-reanimated').SharedValue} SharedValue */
+/**
+ * Hook to scroll to a specified section by taking into account the Keyboard
+ * and the Header.
+ *
+ * @param {number}      extraScrollHeight      Extra space to not overlap the content.
+ * @param {number}      keyboardOffset         Keyboard space offset.
+ * @param {boolean}     scrollEnabled          Whether the scroll is enabled or not.
+ * @param {RefObject}   scrollViewMeasurements ScrollView Layout measurements.
+ * @param {RefObject}   scrollViewRef          Scroll view reference.
+ * @param {SharedValue} scrollViewYOffset      Current offset position of the ScrollView.
+ * @return {Function[]} Function to scroll to a section.
+ */
+export default function useScrollToSection(
+	extraScrollHeight,
+	keyboardOffset,
+	scrollEnabled,
+	scrollViewMeasurements,
+	scrollViewRef,
+	scrollViewYOffset
+) {
+	const { top, bottom } = useSafeAreaInsets();
+	const insets = top + bottom;
+
+	/**
+	 * Function to scroll to a section.
+	 *
+	 * @param {Object} section        Section data to scroll to.
+	 * @param {number} section.y      Y-coordinate of of the section.
+	 * @param {number} section.height Height of the section.
+	 */
+	const scrollToSection = useCallback(
+		( sectionY, sectionHeight ) => {
+			if (
+				! scrollViewRef.current ||
+				! scrollEnabled ||
+				! scrollViewMeasurements.current
+			) {
+				return;
+			}
+
+			const currentScrollViewYOffset = Math.max(
+				0,
+				scrollViewYOffset.value
+			);
+
+			// Scroll to the top of the section.
+			if ( sectionY < currentScrollViewYOffset ) {
+				scrollViewRef.current.scrollTo( {
+					y: sectionY,
+					animated: true,
+				} );
+				return;
+			}
+
+			const availableScreenSpace = Math.abs(
+				Math.floor(
+					scrollViewMeasurements.current.height -
+						( keyboardOffset + extraScrollHeight + sectionHeight )
+				)
+			);
+			const maxOffset = Math.floor(
+				currentScrollViewYOffset + availableScreenSpace
+			);
+
+			const isAtTheTop =
+				sectionY < scrollViewMeasurements.current.y + insets;
+
+			// Scroll to the bottom of the section.
+			if ( sectionY > maxOffset && ! isAtTheTop ) {
+				scrollViewRef.current.scrollTo( {
+					y: sectionY - availableScreenSpace,
+					animated: true,
+				} );
+			}
+		},
+		[
+			extraScrollHeight,
+			insets,
+			keyboardOffset,
+			scrollEnabled,
+			scrollViewMeasurements,
+			scrollViewRef,
+			scrollViewYOffset,
+		]
+	);
+
+	return [ scrollToSection ];
+}
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll-to-text-input.native.js b/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll-to-text-input.native.js
deleted file mode 100644
index 3bdaba837a60b3..00000000000000
--- a/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll-to-text-input.native.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * External dependencies
- */
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
-
-/**
- * WordPress dependencies
- */
-import { useCallback } from '@wordpress/element';
-
-const DEFAULT_FONT_SIZE = 16;
-
-/** @typedef {import('@wordpress/element').RefObject} RefObject */
-/** @typedef {import('react-native-reanimated').SharedValue} SharedValue */
-/**
- * Hook to scroll to the currently focused TextInput
- * depending on where the caret is placed taking into
- * account the Keyboard and the Header.
- *
- * @param {number}      extraScrollHeight      Extra space to not overlap the content.
- * @param {number}      keyboardOffset         Keyboard space offset.
- * @param {boolean}     scrollEnabled          Whether the scroll is enabled or not.
- * @param {RefObject}   scrollViewMeasurements ScrollView Layout measurements.
- * @param {RefObject}   scrollViewRef          ScrollView reference.
- * @param {SharedValue} scrollViewYOffset      Current offset position of the ScrollView.
- * @return {Function[]} Function to scroll to the current TextInput's offset.
- */
-export default function useScrollToTextInput(
-	extraScrollHeight,
-	keyboardOffset,
-	scrollEnabled,
-	scrollViewMeasurements,
-	scrollViewRef,
-	scrollViewYOffset
-) {
-	const { top, bottom } = useSafeAreaInsets();
-	const insets = top + bottom;
-
-	/**
-	 * Function to scroll to the current TextInput's offset.
-	 *
-	 * @param {Object} caret             The caret position data of the currently focused TextInput.
-	 * @param {number} caret.caretHeight The height of the caret.
-	 * @param {number} textInputOffset   The offset calculated with the caret's Y coordinate + the
-	 *                                   TextInput's Y coord or height value.
-	 */
-	const scrollToTextInputOffset = useCallback(
-		( caret, textInputOffset ) => {
-			const { caretHeight = DEFAULT_FONT_SIZE } = caret ?? {};
-
-			if (
-				! scrollViewRef.current ||
-				! scrollEnabled ||
-				! scrollViewMeasurements.current
-			) {
-				return;
-			}
-			const currentScrollViewYOffset = Math.max(
-				0,
-				scrollViewYOffset.value
-			);
-
-			// Scroll up.
-			if ( textInputOffset < currentScrollViewYOffset ) {
-				scrollViewRef.current.scrollTo( {
-					y: textInputOffset,
-					animated: true,
-				} );
-				return;
-			}
-
-			const availableScreenSpace = Math.abs(
-				Math.floor(
-					scrollViewMeasurements.current.height -
-						( keyboardOffset + extraScrollHeight + caretHeight )
-				)
-			);
-			const maxOffset = Math.floor(
-				currentScrollViewYOffset + availableScreenSpace
-			);
-
-			const isAtTheTop =
-				textInputOffset < scrollViewMeasurements.current.y + insets;
-
-			// Scroll down.
-			if ( textInputOffset > maxOffset && ! isAtTheTop ) {
-				scrollViewRef.current.scrollTo( {
-					y: textInputOffset - availableScreenSpace,
-					animated: true,
-				} );
-			}
-		},
-		[
-			extraScrollHeight,
-			insets,
-			keyboardOffset,
-			scrollEnabled,
-			scrollViewMeasurements,
-			scrollViewRef,
-			scrollViewYOffset,
-		]
-	);
-
-	return [ scrollToTextInputOffset ];
-}
diff --git a/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll.native.js b/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll.native.js
new file mode 100644
index 00000000000000..faba873a9903be
--- /dev/null
+++ b/packages/components/src/mobile/keyboard-aware-flat-list/use-scroll.native.js
@@ -0,0 +1,100 @@
+/**
+ * External dependencies
+ */
+
+import { useWindowDimensions } from 'react-native';
+import {
+	useAnimatedScrollHandler,
+	useSharedValue,
+} from 'react-native-reanimated';
+
+/**
+ * WordPress dependencies
+ */
+import { useCallback, useEffect, useRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import useKeyboardOffset from './use-keyboard-offset';
+import useScrollToSection from './use-scroll-to-section';
+import useScrollToElement from './use-scroll-to-element';
+
+export default function useScroll( {
+	scrollEnabled,
+	shouldPreventAutomaticScroll,
+	onScroll,
+	onSizeChange,
+	extraScrollHeight,
+} ) {
+	const scrollViewRef = useRef();
+	const scrollViewMeasurements = useRef();
+	const scrollViewYOffset = useSharedValue( -1 );
+	const lastScrollTo = useRef( {
+		clientId: null,
+	} );
+
+	const { height: windowHeight, width: windowWidth } = useWindowDimensions();
+	const isLandscape = windowWidth >= windowHeight;
+
+	const [ keyboardOffset ] = useKeyboardOffset(
+		scrollEnabled,
+		shouldPreventAutomaticScroll
+	);
+
+	const scrollHandler = useAnimatedScrollHandler( {
+		onScroll: ( event ) => {
+			const { contentOffset } = event;
+			scrollViewYOffset.value = contentOffset.y;
+			onScroll( event );
+		},
+	} );
+
+	// When the orientation changes, the ScrollView measurements
+	// need to be re-calculated.
+	useEffect( () => {
+		scrollViewMeasurements.current = null;
+	}, [ isLandscape ] );
+
+	const [ scrollToSection ] = useScrollToSection(
+		extraScrollHeight,
+		keyboardOffset,
+		scrollEnabled,
+		scrollViewMeasurements,
+		scrollViewRef,
+		scrollViewYOffset
+	);
+	const [ scrollToElement ] = useScrollToElement(
+		scrollViewRef,
+		scrollToSection
+	);
+
+	const measureScrollView = useCallback( () => {
+		if ( scrollViewRef.current ) {
+			scrollViewRef.current.measureInWindow( ( _x, y, width, height ) => {
+				scrollViewMeasurements.current = { y, width, height };
+			} );
+		}
+	}, [ scrollViewRef ] );
+
+	const onContentSizeChange = useCallback( () => {
+		if ( onSizeChange ) {
+			onSizeChange();
+		}
+
+		// Sets the first values when the content size changes.
+		if ( ! scrollViewMeasurements.current ) {
+			measureScrollView();
+		}
+	}, [ measureScrollView, onSizeChange ] );
+
+	return {
+		scrollViewRef,
+		scrollHandler,
+		keyboardOffset,
+		scrollToSection,
+		scrollToElement,
+		onContentSizeChange,
+		lastScrollTo,
+	};
+}
diff --git a/packages/components/src/mobile/link-picker/index.native.js b/packages/components/src/mobile/link-picker/index.native.js
index 404bbb1760c156..d6eb354287b9a3 100644
--- a/packages/components/src/mobile/link-picker/index.native.js
+++ b/packages/components/src/mobile/link-picker/index.native.js
@@ -9,7 +9,6 @@ import Clipboard from '@react-native-clipboard/clipboard';
  */
 import { useEffect, useState } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
-import { BottomSheet, Icon } from '@wordpress/components';
 import { getProtocol, isURL, prependHTTP } from '@wordpress/url';
 import { link, cancelCircleFilled } from '@wordpress/icons';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
@@ -20,6 +19,8 @@ import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 import LinkPickerResults from './link-picker-results';
 import NavBar from '../bottom-sheet/nav-bar';
 import styles from './styles.scss';
+import BottomSheet from '../bottom-sheet';
+import Icon from '../../icon';
 
 // This creates a search suggestion for adding a url directly.
 export const createDirectEntry = ( value ) => {
diff --git a/packages/components/src/mobile/link-picker/link-picker-results.native.js b/packages/components/src/mobile/link-picker/link-picker-results.native.js
index c2d0b60f8a3dfb..4751ebc1ee2111 100644
--- a/packages/components/src/mobile/link-picker/link-picker-results.native.js
+++ b/packages/components/src/mobile/link-picker/link-picker-results.native.js
@@ -6,7 +6,6 @@ import { ActivityIndicator, FlatList, View } from 'react-native';
 /**
  * WordPress dependencies
  */
-import { BottomSheet, BottomSheetConsumer } from '@wordpress/components';
 import { debounce } from '@wordpress/compose';
 import { useState, useEffect, useRef } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
@@ -15,6 +14,8 @@ import { useSelect } from '@wordpress/data';
  * Internal dependencies
  */
 import styles from './styles.scss';
+import BottomSheet from '../bottom-sheet';
+import { BottomSheetConsumer } from '../bottom-sheet/bottom-sheet-context';
 
 const PER_PAGE = 20;
 const REQUEST_DEBOUNCE_DELAY = 400;
@@ -74,9 +75,8 @@ export default function LinkPickerResults( {
 		return {
 			fetchMoreSuggestions: debounce( fetchMore, REQUEST_DEBOUNCE_DELAY ),
 		};
-		// Disable eslint rule for now, to avoid introducing a regression
+		// Not adding dependencies for now, to avoid introducing a regression
 		// (see https://github.com/WordPress/gutenberg/pull/23922#discussion_r1170634879).
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [] );
 
 	// Prevent setting state when unmounted.
@@ -89,9 +89,7 @@ export default function LinkPickerResults( {
 		setHasAllSuggestions( false );
 		setLinks( [ directEntry ] );
 		fetchMoreSuggestions( { query, links: [ directEntry ] } );
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ query ] );
 
 	const onEndReached = () => fetchMoreSuggestions( { query, links } );
diff --git a/packages/components/src/mobile/link-picker/link-picker-screen.native.js b/packages/components/src/mobile/link-picker/link-picker-screen.native.js
index 7bc1dbd7009b62..999c9053c59862 100644
--- a/packages/components/src/mobile/link-picker/link-picker-screen.native.js
+++ b/packages/components/src/mobile/link-picker/link-picker-screen.native.js
@@ -53,9 +53,7 @@ const LinkPickerScreen = ( { returnScreenName } ) => {
 				onCancel={ onCancel }
 			/>
 		);
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ inputValue ] );
 };
 
diff --git a/packages/components/src/mobile/link-settings/image-link-destinations-screen.native.js b/packages/components/src/mobile/link-settings/image-link-destinations-screen.native.js
deleted file mode 100644
index 02d29326e303e2..00000000000000
--- a/packages/components/src/mobile/link-settings/image-link-destinations-screen.native.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * External dependencies
- */
-import { useNavigation, useRoute } from '@react-navigation/native';
-import { StyleSheet } from 'react-native';
-
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { Icon, check, chevronRight } from '@wordpress/icons';
-import { blockSettingsScreens } from '@wordpress/block-editor';
-import { usePreferredColorSchemeStyle } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import styles from './style.scss';
-import PanelBody from '../../panel/body';
-import BottomSheet from '../bottom-sheet';
-
-const LINK_DESTINATION_NONE = 'none';
-const LINK_DESTINATION_MEDIA = 'media';
-const LINK_DESTINATION_ATTACHMENT = 'attachment';
-const LINK_DESTINATION_CUSTOM = 'custom';
-
-function LinkDestination( {
-	children,
-	isSelected,
-	label,
-	onPress,
-	value,
-	valueStyle,
-} ) {
-	const optionIcon = usePreferredColorSchemeStyle(
-		styles.optionIcon,
-		styles.optionIconDark
-	);
-	return (
-		<BottomSheet.Cell
-			icon={ check }
-			iconStyle={ StyleSheet.flatten( [
-				optionIcon,
-				! isSelected && styles.unselectedOptionIcon,
-			] ) }
-			label={ label }
-			leftAlign
-			onPress={ onPress }
-			value={ value }
-			valueStyle={ valueStyle }
-			separatorType="leftMargin"
-		>
-			{ children }
-		</BottomSheet.Cell>
-	);
-}
-
-function ImageLinkDestinationsScreen( props ) {
-	const navigation = useNavigation();
-	const route = useRoute();
-	const { url = '' } = props;
-	const {
-		inputValue = url,
-		imageUrl,
-		attachmentPageUrl,
-		linkDestination,
-	} = route.params || {};
-
-	function goToLinkPicker() {
-		navigation.navigate( blockSettingsScreens.linkPicker, {
-			inputValue:
-				linkDestination === LINK_DESTINATION_CUSTOM ? inputValue : '',
-		} );
-	}
-
-	const setLinkDestination = ( newLinkDestination ) => () => {
-		let newUrl;
-		switch ( newLinkDestination ) {
-			case LINK_DESTINATION_MEDIA:
-				newUrl = imageUrl;
-				break;
-			case LINK_DESTINATION_ATTACHMENT:
-				newUrl = attachmentPageUrl;
-				break;
-			default:
-				newUrl = '';
-				break;
-		}
-
-		navigation.navigate( blockSettingsScreens.settings, {
-			// The `inputValue` name is reused from LinkPicker, as it helps avoid
-			// bugs from stale values remaining in the React Navigation route
-			// parameters.
-			inputValue: newUrl,
-			// Clear link text value that may be set from LinkPicker.
-			text: '',
-		} );
-	};
-
-	return (
-		<>
-			<BottomSheet.NavBar>
-				<BottomSheet.NavBar.BackButton onPress={ navigation.goBack } />
-				<BottomSheet.NavBar.Heading>
-					{ __( 'Link To' ) }
-				</BottomSheet.NavBar.Heading>
-			</BottomSheet.NavBar>
-			<PanelBody>
-				<LinkDestination
-					isSelected={ linkDestination === LINK_DESTINATION_NONE }
-					label={ __( 'None' ) }
-					onPress={ setLinkDestination( LINK_DESTINATION_NONE ) }
-				/>
-				<LinkDestination
-					isSelected={ linkDestination === LINK_DESTINATION_MEDIA }
-					label={ __( 'Media File' ) }
-					onPress={ setLinkDestination( LINK_DESTINATION_MEDIA ) }
-				/>
-				{ !! attachmentPageUrl && (
-					<LinkDestination
-						isSelected={
-							linkDestination === LINK_DESTINATION_ATTACHMENT
-						}
-						label={ __( 'Attachment Page' ) }
-						onPress={ setLinkDestination(
-							LINK_DESTINATION_ATTACHMENT
-						) }
-					/>
-				) }
-				<LinkDestination
-					isSelected={ linkDestination === LINK_DESTINATION_CUSTOM }
-					label={ __( 'Custom URL' ) }
-					onPress={ goToLinkPicker }
-					value={
-						linkDestination === LINK_DESTINATION_CUSTOM
-							? inputValue
-							: ''
-					}
-					valueStyle={
-						linkDestination === LINK_DESTINATION_CUSTOM
-							? undefined
-							: styles.placeholderTextColor
-					}
-				>
-					<Icon icon={ chevronRight }></Icon>
-				</LinkDestination>
-			</PanelBody>
-		</>
-	);
-}
-
-export default ImageLinkDestinationsScreen;
diff --git a/packages/components/src/mobile/link-settings/index.native.js b/packages/components/src/mobile/link-settings/index.native.js
index e80672a3103fa6..a01e33b410a5c0 100644
--- a/packages/components/src/mobile/link-settings/index.native.js
+++ b/packages/components/src/mobile/link-settings/index.native.js
@@ -101,9 +101,7 @@ function LinkSettings( {
 		if ( onHandleClosingBottomSheet ) {
 			onHandleClosingBottomSheet( onCloseSettingsSheet );
 		}
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ urlInputValue, labelInputValue, linkRelInputValue ] );
 
 	useEffect( () => {
@@ -115,9 +113,7 @@ function LinkSettings( {
 		if ( url !== urlInputValue ) {
 			setUrlInputValue( url || '' );
 		}
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ url ] );
 
 	useEffect( () => {
@@ -141,9 +137,7 @@ function LinkSettings( {
 		if ( prevEditorSidebarOpened && ! editorSidebarOpened ) {
 			onSetAttributes();
 		}
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ editorSidebarOpened, isVisible ] );
 
 	useEffect( () => {
@@ -156,9 +150,7 @@ function LinkSettings( {
 				url: prependHTTP( urlValue ),
 			} );
 		}
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ urlValue ] );
 
 	const onChangeURL = useCallback(
@@ -188,9 +180,7 @@ function LinkSettings( {
 				rel: linkRelInputValue,
 			} );
 		}
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ urlInputValue, labelInputValue, linkRelInputValue, setAttributes ] );
 
 	const onCloseSettingsSheet = useCallback( () => {
@@ -223,9 +213,7 @@ function LinkSettings( {
 				rel: updatedRel,
 			} );
 		},
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 		[ linkRelInputValue ]
 	);
 
diff --git a/packages/components/src/mobile/link-settings/link-rel.native.js b/packages/components/src/mobile/link-settings/link-rel.native.js
index bc8060ec405a88..041acb2b33aaad 100644
--- a/packages/components/src/mobile/link-settings/link-rel.native.js
+++ b/packages/components/src/mobile/link-settings/link-rel.native.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Path, SVG } from '@wordpress/components';
+import { Path, SVG } from '@wordpress/primitives';
 
 export default (
 	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
diff --git a/packages/components/src/mobile/link-settings/link-settings-screen.native.js b/packages/components/src/mobile/link-settings/link-settings-screen.native.js
index d04bd0699b7a54..7147becd67b22d 100644
--- a/packages/components/src/mobile/link-settings/link-settings-screen.native.js
+++ b/packages/components/src/mobile/link-settings/link-settings-screen.native.js
@@ -37,9 +37,7 @@ const LinkSettingsScreen = ( props ) => {
 				urlValue={ inputValue }
 			/>
 		);
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ props, inputValue, navigation, route ] );
 };
 
diff --git a/packages/components/src/mobile/link-settings/style.native.scss b/packages/components/src/mobile/link-settings/style.native.scss
index 137c2e32dfc768..b9545b80ec4ab1 100644
--- a/packages/components/src/mobile/link-settings/style.native.scss
+++ b/packages/components/src/mobile/link-settings/style.native.scss
@@ -2,20 +2,3 @@
 	padding-left: 0;
 	padding-right: 0;
 }
-
-// used in both light and dark modes
-.placeholderTextColor {
-	color: #87a6bc;
-}
-
-.optionIcon {
-	color: $blue-50;
-}
-
-.optionIconDark {
-	color: $blue-30;
-}
-
-.unselectedOptionIcon {
-	opacity: 0;
-}
diff --git a/packages/components/src/mobile/media-edit/index.native.js b/packages/components/src/mobile/media-edit/index.native.js
index 471bd7d23ecfa5..08bedbb804a1a3 100644
--- a/packages/components/src/mobile/media-edit/index.native.js
+++ b/packages/components/src/mobile/media-edit/index.native.js
@@ -3,12 +3,16 @@
  */
 import { Component } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { Picker } from '@wordpress/components';
 import {
 	requestMediaEditor,
 	mediaSources,
 } from '@wordpress/react-native-bridge';
 
+/**
+ * Internal dependencies
+ */
+import Picker from '../picker';
+
 export const MEDIA_TYPE_IMAGE = 'image';
 
 export const MEDIA_EDITOR = 'MEDIA_EDITOR';
@@ -103,7 +107,7 @@ export class MediaEdit extends Component {
 				hideCancelButton
 				ref={ ( instance ) => ( this.picker = instance ) }
 				options={ this.getMediaOptionsItems() }
-				leftAlign={ true }
+				leftAlign
 				onChange={ this.onPickerSelect }
 				// translators: %s: block title e.g: "Paragraph".
 				title={ __( 'Media options' ) }
diff --git a/packages/components/src/mobile/picker/index.android.js b/packages/components/src/mobile/picker/index.android.js
index 0db2826ddb16ca..06d2665f189c88 100644
--- a/packages/components/src/mobile/picker/index.android.js
+++ b/packages/components/src/mobile/picker/index.android.js
@@ -9,13 +9,14 @@ import { View } from 'react-native';
 import { __ } from '@wordpress/i18n';
 import { Component, Fragment } from '@wordpress/element';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
-import { PanelBody, TextControl } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import BottomSheet from '../bottom-sheet';
 import styles from './styles.scss';
+import PanelBody from '../../panel/body';
+import TextControl from '../../text-control';
 
 function Separator() {
 	const separatorStyle = usePreferredColorSchemeStyle(
@@ -61,7 +62,7 @@ export default class Picker extends Component {
 					icon={ option.icon }
 					leftAlign={ leftAlign }
 					label={ option.label }
-					separatorType={ 'none' }
+					separatorType="none"
 					onPress={ () => this.onCellPress( option.value ) }
 					disabled={ option.disabled }
 					style={
@@ -93,7 +94,7 @@ export default class Picker extends Component {
 						<TextControl
 							label={ __( 'Cancel' ) }
 							onPress={ this.onClose }
-							separatorType={ 'none' }
+							separatorType="none"
 						/>
 					) }
 				</PanelBody>
diff --git a/packages/components/src/mobile/picker/index.ios.js b/packages/components/src/mobile/picker/index.ios.js
index dac31ded159be0..a6f98465e7e498 100644
--- a/packages/components/src/mobile/picker/index.ios.js
+++ b/packages/components/src/mobile/picker/index.ios.js
@@ -9,13 +9,13 @@ import { ActionSheetIOS } from 'react-native';
 import { __ } from '@wordpress/i18n';
 import { Component, forwardRef, useContext } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
-import { BottomSheetContext } from '@wordpress/components';
 import { usePreferredColorScheme } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import styles from './styles.scss';
+import { BottomSheetContext } from '../bottom-sheet/bottom-sheet-context';
 
 class Picker extends Component {
 	presentPicker() {
diff --git a/packages/components/src/mobile/segmented-control/index.native.js b/packages/components/src/mobile/segmented-control/index.native.js
index d76a42d6d8c3b1..36b92bb0d4ea32 100644
--- a/packages/components/src/mobile/segmented-control/index.native.js
+++ b/packages/components/src/mobile/segmented-control/index.native.js
@@ -74,18 +74,14 @@ const SegmentedControls = ( {
 	useEffect( () => {
 		setActiveSegmentIndex( selectedSegmentIndex );
 		segmentHandler( segments[ selectedSegmentIndex ] );
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [] );
 
 	useEffect( () => {
 		positionAnimationValue.setValue(
 			calculateEndValue( activeSegmentIndex )
 		);
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ segmentsDimensions ] );
 
 	const containerStyle = usePreferredColorSchemeStyle(
@@ -173,7 +169,7 @@ const SegmentedControls = ( {
 							accessibilityState={ {
 								selected: activeSegmentIndex === index,
 							} }
-							accessibilityRole={ 'button' }
+							accessibilityRole="button"
 							accessibilityLabel={ segment }
 							accessibilityHint={ `${ index + 1 } on ${
 								segments.length
diff --git a/packages/components/src/mobile/utils/alignments.native.js b/packages/components/src/mobile/utils/alignments.native.js
index bc42385988a5d1..f1f737d7ed367a 100644
--- a/packages/components/src/mobile/utils/alignments.native.js
+++ b/packages/components/src/mobile/utils/alignments.native.js
@@ -13,6 +13,7 @@ export const WIDE_ALIGNMENTS = {
 		'core/image',
 		'core/separator',
 		'core/media-text',
+		'core/quote',
 		'core/pullquote',
 	],
 };
diff --git a/packages/block-editor/src/utils/parse-css-unit-to-px.js b/packages/components/src/mobile/utils/get-px-from-css-unit.native.js
similarity index 100%
rename from packages/block-editor/src/utils/parse-css-unit-to-px.js
rename to packages/components/src/mobile/utils/get-px-from-css-unit.native.js
diff --git a/packages/components/src/mobile/utils/test/get-px-from-css-unit.native.js b/packages/components/src/mobile/utils/test/get-px-from-css-unit.native.js
new file mode 100644
index 00000000000000..852fc0b4f9a78a
--- /dev/null
+++ b/packages/components/src/mobile/utils/test/get-px-from-css-unit.native.js
@@ -0,0 +1,172 @@
+/**
+ * Internal dependencies
+ */
+import {
+	default as memoizedGetPxFromCssUnit,
+	getPxFromCssUnit,
+} from '../get-px-from-css-unit';
+
+describe( 'getPxFromCssUnit', () => {
+	// Absolute units.
+	describe( 'absolute unites should return px values', () => {
+		const testData = [
+			[ '25px', '25px' ],
+			[ '25.5', '26px' ],
+			[ '1cm', '38px' ],
+			[ '10mm', '38px' ],
+			[ '1in', '96px' ],
+			[ '12pt', '16px' ],
+			[ '1pc', '16px' ],
+			[ '40Q', '38px' ], // 40 Q should be 1 cm.
+		];
+
+		test.each( testData )( 'getPxFromCssUnit( %s )', ( unit, expected ) => {
+			expect( getPxFromCssUnit( unit ) ).toBe( expected );
+		} );
+		test.each( testData )(
+			'memoizedGetPxFromCssUnit( %s )',
+			( unit, expected ) => {
+				expect( memoizedGetPxFromCssUnit( unit ) ).toBe( expected );
+			}
+		);
+		test.each( testData )(
+			'cached memoizedGetPxFromCssUnit( %s )',
+			( unit, expected ) => {
+				expect( memoizedGetPxFromCssUnit( unit ) ).toBe( expected );
+			}
+		);
+	} );
+
+	describe( 'relative unites should return px values', () => {
+		const settings = {
+			fontSize: 10,
+			width: 100,
+			height: 200,
+			lineHeight: 2,
+			type: 'font',
+		};
+
+		const testData = [
+			[ '2em', '20px' ],
+			[ '2rem', '20px' ],
+			[ '1.125rem', '11px' ],
+			[ '20vw', '20px' ],
+			[ '20vh', '40px' ],
+			[ '20vmin', '20px' ],
+			[ '20vmax', '40px' ],
+			[ '20lh', '40px' ],
+			[ '120%', '12px' ],
+		];
+
+		test.each( testData )( 'getPxFromCssUnit( %s )', ( unit, expected ) => {
+			expect( getPxFromCssUnit( unit, settings ) ).toBe( expected );
+		} );
+		test.each( testData )(
+			'memoizedGetPxFromCssUnit( %s )',
+			( unit, expected ) => {
+				expect( memoizedGetPxFromCssUnit( unit, settings ) ).toBe(
+					expected
+				);
+			}
+		);
+		test.each( testData )(
+			'cached memoizedGetPxFromCssUnit( %s )',
+			( unit, expected ) => {
+				expect( memoizedGetPxFromCssUnit( unit, settings ) ).toBe(
+					expected
+				);
+			}
+		);
+	} );
+
+	// Function units.
+
+	describe( 'function unites should return px values', () => {
+		const settings = {
+			fontSize: 10,
+			width: 100,
+			height: 200,
+			lineHeight: 2,
+			type: 'font',
+		};
+
+		const testData = [
+			[ 'min(20px, 25px)', '20px' ],
+			[ 'min(20px, 9px, 12pt, 25px)', '9px' ],
+			[ 'max(20px, 25px)', '25px' ],
+			[ 'clamp(10px, 9px, 25px)', '10px' ],
+			[ 'clamp(10px, 35px, 25px)', '25px' ],
+			[ 'clamp(10px, 15px, 25px)', '15px' ],
+			[ 'min(max(20px,25px), 35px)', '25px' ],
+			[ 'max(min(20px,25px), 35px)', '35px' ],
+			[ '10px + 25px', '35px' ],
+			[ 'calc(10px + 25px)', '35px' ],
+			[ 'calc( 2 * 20px)', '40px' ],
+			[ 'calc(25px - 10px)', '15px' ],
+			[ 'min(10px + 25px, 55pt)', '35px' ],
+			[ 'calc(12vw * 10px)', '450px' ],
+			[ 'calc(45vw / 10px)', '17px' ],
+			[ '', null ],
+			[ undefined, null ],
+			[ 123, '123px' ],
+			[ 123.456, '123px' ],
+			[ 'abc', null ],
+			[ 'console.log("howdy"); + 10px', null ],
+			[ 'calc(12vw * 10px', null ], // Missing closing bracket.
+			[ 'calc( 1em + 0.875rem )', '30px' ], // Decimals
+			[
+				'clamp(1.8rem, 1.8rem + ((1vw / 0.48rem + 1rem) * 2.885), 3rem)',
+				'48px',
+			],
+			[
+				'clamp(5rem, 5.25rem + ((1vw - 0.48rem) * 9.096), 8rem)',
+				'80px',
+			],
+			[
+				'clamp(2.625rem, calc(2.625rem + ((1vw - 0.48rem) * 8.4135)), 3.25rem)',
+				'42px',
+			],
+			[ 'var:preset|font-size|medium', null ],
+		];
+
+		test.each( testData )( 'getPxFromCssUnit( %s )', ( unit, expected ) => {
+			expect( getPxFromCssUnit( unit, settings ) ).toBe( expected );
+		} );
+		test.each( testData )(
+			'memoizedGetPxFromCssUnit( %s )',
+			( unit, expected ) => {
+				expect( memoizedGetPxFromCssUnit( unit, settings ) ).toBe(
+					expected
+				);
+			}
+		);
+		test.each( testData )(
+			'cached memoizedGetPxFromCssUnit( %s )',
+			( unit, expected ) => {
+				expect( memoizedGetPxFromCssUnit( unit, settings ) ).toBe(
+					expected
+				);
+			}
+		);
+	} );
+	// Skip this test it might be useful in dev.
+	it.skip( 'test performance of memoizedGetPxFromCssUnit function', () => {
+		const start = Date.now();
+		let i = 0;
+		const intervals = 1000;
+		while ( i < intervals ) {
+			getPxFromCssUnit( 'max(25px, 35px)', { width: 200 } );
+			i++;
+		}
+		const rawDuration = Date.now() - start;
+
+		const startM = Date.now();
+		i = 0;
+		// The memoized Version should be at 10X better then the non default one.
+		while ( i < intervals * 10 ) {
+			memoizedGetPxFromCssUnit( 'max(25px, 35px)', { width: 201 } );
+			i++;
+		}
+		expect( rawDuration > Date.now() - startM ).toBe( true );
+	} );
+} );
diff --git a/packages/components/src/mobile/utils/use-unit-converter-to-mobile.native.js b/packages/components/src/mobile/utils/use-unit-converter-to-mobile.native.js
index 11d54f954215d4..0b1dfd31147dee 100644
--- a/packages/components/src/mobile/utils/use-unit-converter-to-mobile.native.js
+++ b/packages/components/src/mobile/utils/use-unit-converter-to-mobile.native.js
@@ -6,18 +6,7 @@ import { Dimensions } from 'react-native';
 /**
  * WordPress dependencies
  */
-import {
-	useContext,
-	useEffect,
-	useState,
-	useMemo,
-	useCallback,
-} from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import GlobalStylesContext from '../global-styles-context';
+import { useEffect, useState, useMemo, useCallback } from '@wordpress/element';
 
 const getValueAndUnit = ( value, unit ) => {
 	const regex = /(\d+\.?\d*)(.*)/;
@@ -63,8 +52,7 @@ const convertUnitToMobile = ( containerSize, globalStyles, value, unit ) => {
 	}
 };
 
-const useConvertUnitToMobile = ( value, unit ) => {
-	const { globalStyles: styles } = useContext( GlobalStylesContext );
+const useConvertUnitToMobile = ( value, unit, styles ) => {
 	const [ windowSizes, setWindowSizes ] = useState(
 		Dimensions.get( 'window' )
 	);
@@ -78,9 +66,7 @@ const useConvertUnitToMobile = ( value, unit ) => {
 		return () => {
 			dimensionsChangeSubscription.remove();
 		};
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [] );
 
 	const onDimensionsChange = useCallback( ( { window } ) => {
@@ -97,9 +83,7 @@ const useConvertUnitToMobile = ( value, unit ) => {
 			valueToConvert,
 			valueUnit
 		);
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ windowSizes, value, unit ] );
 };
 
diff --git a/packages/components/src/modal/README.md b/packages/components/src/modal/README.md
index a2165afde9d5ca..c7c0c8ec6d6348 100644
--- a/packages/components/src/modal/README.md
+++ b/packages/components/src/modal/README.md
@@ -4,12 +4,6 @@ Modals give users information and choices related to a task they’re trying to
 
 ![An alert modal for trashing a post](https://wordpress.org/gutenberg/files/2019/04/Modal.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
diff --git a/packages/components/src/modal/aria-helper.ts b/packages/components/src/modal/aria-helper.ts
index 6d4427ddea948e..bd11fb71253e1e 100644
--- a/packages/components/src/modal/aria-helper.ts
+++ b/packages/components/src/modal/aria-helper.ts
@@ -25,7 +25,9 @@ export function modalize( modalElement?: HTMLDivElement ) {
 	const hiddenElements: Element[] = [];
 	hiddenElementsByDepth.push( hiddenElements );
 	for ( const element of elements ) {
-		if ( element === modalElement ) continue;
+		if ( element === modalElement ) {
+			continue;
+		}
 
 		if ( elementShouldBeHidden( element ) ) {
 			element.setAttribute( 'aria-hidden', 'true' );
@@ -45,6 +47,7 @@ export function elementShouldBeHidden( element: Element ) {
 	const role = element.getAttribute( 'role' );
 	return ! (
 		element.tagName === 'SCRIPT' ||
+		element.hasAttribute( 'hidden' ) ||
 		element.hasAttribute( 'aria-hidden' ) ||
 		element.hasAttribute( 'aria-live' ) ||
 		( role && LIVE_REGION_ARIA_ROLES.has( role ) )
@@ -56,8 +59,11 @@ export function elementShouldBeHidden( element: Element ) {
  */
 export function unmodalize() {
 	const hiddenElements = hiddenElementsByDepth.pop();
-	if ( ! hiddenElements ) return;
+	if ( ! hiddenElements ) {
+		return;
+	}
 
-	for ( const element of hiddenElements )
+	for ( const element of hiddenElements ) {
 		element.removeAttribute( 'aria-hidden' );
+	}
 }
diff --git a/packages/components/src/modal/index.tsx b/packages/components/src/modal/index.tsx
index 041c592166ab73..7d55c9a4d5d1e6 100644
--- a/packages/components/src/modal/index.tsx
+++ b/packages/components/src/modal/index.tsx
@@ -1,13 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
-import type {
-	ForwardedRef,
-	KeyboardEvent,
-	MutableRefObject,
-	UIEvent,
-} from 'react';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -41,18 +35,22 @@ import * as ariaHelper from './aria-helper';
 import Button from '../button';
 import StyleProvider from '../style-provider';
 import type { ModalProps } from './types';
+import { withIgnoreIMEEvents } from '../utils/with-ignore-ime-events';
+import { Spacer } from '../spacer';
+import { useModalExitAnimation } from './use-modal-exit-animation';
 
 // Used to track and dismiss the prior modal when another opens unless nested.
-const level0Dismissers: MutableRefObject<
-	ModalProps[ 'onRequestClose' ] | undefined
->[] = [];
-const ModalContext = createContext( level0Dismissers );
+type Dismissers = Set<
+	React.RefObject< ModalProps[ 'onRequestClose' ] | undefined >
+>;
+const ModalContext = createContext< Dismissers >( new Set() );
 
-let isBodyOpenClassActive = false;
+// Used to track body class names applied while modals are open.
+const bodyOpenClasses = new Map< string, number >();
 
 function UnforwardedModal(
 	props: ModalProps,
-	forwardedRef: ForwardedRef< HTMLDivElement >
+	forwardedRef: React.ForwardedRef< HTMLDivElement >
 ) {
 	const {
 		bodyOpenClassName = 'modal-open',
@@ -72,7 +70,7 @@ function UnforwardedModal(
 		closeButtonLabel,
 		children,
 		style,
-		overlayClassName,
+		overlayClassName: overlayClassnameProp,
 		className,
 		contentLabel,
 		onKeyDown,
@@ -137,45 +135,57 @@ function UnforwardedModal(
 	}, [] );
 
 	// Keeps a fresh ref for the subsequent effect.
-	const refOnRequestClose = useRef< ModalProps[ 'onRequestClose' ] >();
+	const onRequestCloseRef = useRef< ModalProps[ 'onRequestClose' ] >();
 	useEffect( () => {
-		refOnRequestClose.current = onRequestClose;
+		onRequestCloseRef.current = onRequestClose;
 	}, [ onRequestClose ] );
 
 	// The list of `onRequestClose` callbacks of open (non-nested) Modals. Only
 	// one should remain open at a time and the list enables closing prior ones.
 	const dismissers = useContext( ModalContext );
 	// Used for the tracking and dismissing any nested modals.
-	const nestedDismissers = useRef< typeof level0Dismissers >( [] );
+	const [ nestedDismissers ] = useState< Dismissers >( () => new Set() );
 
 	// Updates the stack tracking open modals at this level and calls
 	// onRequestClose for any prior and/or nested modals as applicable.
 	useEffect( () => {
-		dismissers.push( refOnRequestClose );
-		const [ first, second ] = dismissers;
-		if ( second ) first?.current?.();
-
-		const nested = nestedDismissers.current;
+		// add this modal instance to the dismissers set
+		dismissers.add( onRequestCloseRef );
+		// request that all the other modals close themselves
+		for ( const dismisser of dismissers ) {
+			if ( dismisser !== onRequestCloseRef ) {
+				dismisser.current?.();
+			}
+		}
 		return () => {
-			nested[ 0 ]?.current?.();
-			dismissers.shift();
+			// request that all the nested modals close themselves
+			for ( const dismisser of nestedDismissers ) {
+				dismisser.current?.();
+			}
+			// remove this modal instance from the dismissers set
+			dismissers.delete( onRequestCloseRef );
 		};
-	}, [ dismissers ] );
+	}, [ dismissers, nestedDismissers ] );
 
-	const isLevel0 = dismissers === level0Dismissers;
 	// Adds/removes the value of bodyOpenClassName to body element.
 	useEffect( () => {
-		if ( ! isBodyOpenClassActive ) {
-			isBodyOpenClassActive = true;
-			document.body.classList.add( bodyOpenClassName );
-		}
+		const theClass = bodyOpenClassName;
+		const oneMore = 1 + ( bodyOpenClasses.get( theClass ) ?? 0 );
+		bodyOpenClasses.set( theClass, oneMore );
+		document.body.classList.add( bodyOpenClassName );
 		return () => {
-			if ( isLevel0 && dismissers.length === 0 ) {
-				document.body.classList.remove( bodyOpenClassName );
-				isBodyOpenClassActive = false;
+			const oneLess = bodyOpenClasses.get( theClass )! - 1;
+			if ( oneLess === 0 ) {
+				document.body.classList.remove( theClass );
+				bodyOpenClasses.delete( theClass );
+			} else {
+				bodyOpenClasses.set( theClass, oneLess );
 			}
 		};
-	}, [ bodyOpenClassName, dismissers, isLevel0 ] );
+	}, [ bodyOpenClassName ] );
+
+	const { closeModal, frameRef, frameStyle, overlayClassname } =
+		useModalExitAnimation();
 
 	// Calls the isContentScrollable callback when the Modal children container resizes.
 	useLayoutEffect( () => {
@@ -193,32 +203,21 @@ function UnforwardedModal(
 		};
 	}, [ isContentScrollable, childrenContainerRef ] );
 
-	function handleEscapeKeyDown( event: KeyboardEvent< HTMLDivElement > ) {
-		if (
-			// Ignore keydowns from IMEs
-			event.nativeEvent.isComposing ||
-			// Workaround for Mac Safari where the final Enter/Backspace of an IME composition
-			// is `isComposing=false`, even though it's technically still part of the composition.
-			// These can only be detected by keyCode.
-			event.keyCode === 229
-		) {
-			return;
-		}
-
+	function handleEscapeKeyDown(
+		event: React.KeyboardEvent< HTMLDivElement >
+	) {
 		if (
 			shouldCloseOnEsc &&
-			event.code === 'Escape' &&
+			( event.code === 'Escape' || event.key === 'Escape' ) &&
 			! event.defaultPrevented
 		) {
 			event.preventDefault();
-			if ( onRequestClose ) {
-				onRequestClose( event );
-			}
+			closeModal().then( () => onRequestClose( event ) );
 		}
 	}
 
 	const onContentContainerScroll = useCallback(
-		( e: UIEvent< HTMLDivElement > ) => {
+		( e: React.UIEvent< HTMLDivElement > ) => {
 			const scrollY = e?.currentTarget?.scrollTop ?? -1;
 
 			if ( ! hasScrolledContent && scrollY > 0 ) {
@@ -251,7 +250,9 @@ function UnforwardedModal(
 		onPointerUp: ( { target, button } ) => {
 			const isSameTarget = target === pressTarget;
 			pressTarget = null;
-			if ( button === 0 && isSameTarget ) onRequestClose();
+			if ( button === 0 && isSameTarget ) {
+				closeModal().then( () => onRequestClose() );
+			}
 		},
 	};
 
@@ -259,22 +260,27 @@ function UnforwardedModal(
 		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
 		<div
 			ref={ useMergeRefs( [ ref, forwardedRef ] ) }
-			className={ classnames(
+			className={ clsx(
 				'components-modal__screen-overlay',
-				overlayClassName
+				overlayClassname,
+				overlayClassnameProp
 			) }
-			onKeyDown={ handleEscapeKeyDown }
+			onKeyDown={ withIgnoreIMEEvents( handleEscapeKeyDown ) }
 			{ ...( shouldCloseOnClickOutside ? overlayPressHandlers : {} ) }
 		>
 			<StyleProvider document={ document }>
 				<div
-					className={ classnames(
+					className={ clsx(
 						'components-modal__frame',
 						sizeClass,
 						className
 					) }
-					style={ style }
+					style={ {
+						...frameStyle,
+						...style,
+					} }
 					ref={ useMergeRefs( [
+						frameRef,
 						constrainedTabbingRef,
 						focusReturnRef,
 						focusOnMount !== 'firstContentElement'
@@ -289,7 +295,7 @@ function UnforwardedModal(
 					onKeyDown={ onKeyDown }
 				>
 					<div
-						className={ classnames( 'components-modal__content', {
+						className={ clsx( 'components-modal__content', {
 							'hide-header': __experimentalHideHeader,
 							'is-scrollable': hasScrollableContent,
 							'has-scrolled-content': hasScrolledContent,
@@ -326,13 +332,27 @@ function UnforwardedModal(
 								</div>
 								{ headerActions }
 								{ isDismissible && (
-									<Button
-										onClick={ onRequestClose }
-										icon={ close }
-										label={
-											closeButtonLabel || __( 'Close' )
-										}
-									/>
+									<>
+										<Spacer
+											marginBottom={ 0 }
+											marginLeft={ 3 }
+										/>
+										<Button
+											size="small"
+											onClick={ (
+												event: React.MouseEvent< HTMLButtonElement >
+											) =>
+												closeModal().then( () =>
+													onRequestClose( event )
+												)
+											}
+											icon={ close }
+											label={
+												closeButtonLabel ||
+												__( 'Close' )
+											}
+										/>
+									</>
 								) }
 							</div>
 						) }
@@ -354,7 +374,7 @@ function UnforwardedModal(
 	);
 
 	return createPortal(
-		<ModalContext.Provider value={ nestedDismissers.current }>
+		<ModalContext.Provider value={ nestedDismissers }>
 			{ modal }
 		</ModalContext.Provider>,
 		document.body
diff --git a/packages/components/src/modal/stories/index.story.tsx b/packages/components/src/modal/stories/index.story.tsx
index 60a53947116fac..f180de0dc06a46 100644
--- a/packages/components/src/modal/stories/index.story.tsx
+++ b/packages/components/src/modal/stories/index.story.tsx
@@ -7,7 +7,7 @@ import type { StoryFn, Meta } from '@storybook/react';
  * WordPress dependencies
  */
 import { useState } from '@wordpress/element';
-import { starEmpty, starFilled } from '@wordpress/icons';
+import { fullscreen } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -103,22 +103,16 @@ WithsizeSmall.args = {
 };
 WithsizeSmall.storyName = 'With size: small';
 
-const LikeButton = () => {
-	const [ isLiked, setIsLiked ] = useState( false );
-	return (
-		<Button
-			icon={ isLiked ? starFilled : starEmpty }
-			label="Like"
-			onClick={ () => setIsLiked( ! isLiked ) }
-		/>
-	);
-};
-
+/**
+ * The `headerActions` prop can be used to add auxiliary actions to the header, for example a fullscreen mode toggle.
+ */
 export const WithHeaderActions: StoryFn< typeof Modal > = Template.bind( {} );
 WithHeaderActions.args = {
 	...Default.args,
-	headerActions: <LikeButton />,
-	isDismissible: false,
+	headerActions: (
+		<Button icon={ fullscreen } label="Fullscreen mode" size="small" />
+	),
+	children: <div style={ { height: '200px' } } />,
 };
 WithHeaderActions.parameters = {
 	...Default.parameters,
diff --git a/packages/components/src/modal/style.scss b/packages/components/src/modal/style.scss
index 0933f836892f1d..70959f69392d1c 100644
--- a/packages/components/src/modal/style.scss
+++ b/packages/components/src/modal/style.scss
@@ -8,30 +8,44 @@
 	background-color: rgba($black, 0.35);
 	z-index: z-index(".components-modal__screen-overlay");
 	display: flex;
-	// backdrop-filter: blur($grid-unit);
-	// This animates the appearance of the white background.
-	@include edit-post__fade-in-animation();
+	// This animates the appearance of the backdrop.
+	@include animation__fade-in();
+
+	&.is-animating-out {
+		// Note: it's important that the fade-out animation doesn't end after the
+		// modal frame's disappear animation, because the component will be removed
+		// from the DOM when that animation ends.
+		@include animation__fade-out($delay: 80ms);
+	}
 }
 
 // The modal window element.
 .components-modal__frame {
+	@include reset;
 	// Use the entire viewport on smaller screens.
 	margin: $grid-unit-50 0 0 0;
 	width: 100%;
 	background: $white;
-	box-shadow: $shadow-modal;
-	border-radius: $grid-unit-05 $grid-unit-05 0 0;
+	box-shadow: $elevation-large;
+	border-radius: $radius-large $radius-large 0 0;
 	overflow: hidden;
 	// Have the content element fill the vertical space yet not overflow.
 	display: flex;
 	// Animate the modal frame/contents appearing on the page.
-	animation: components-modal__appear-animation 0.1s ease-out;
+	animation-name: components-modal__appear-animation;
+	animation-duration: var(--modal-frame-animation-duration);
 	animation-fill-mode: forwards;
+	animation-timing-function: cubic-bezier(0.29, 0, 0, 1);
 	@include reduce-motion("animation");
 
+	.components-modal__screen-overlay.is-animating-out & {
+		animation-name: components-modal__disappear-animation;
+		animation-timing-function: cubic-bezier(1, 0, 0.2, 1);
+	}
+
 	// Show a centered modal on bigger screens.
 	@include break-small() {
-		border-radius: $grid-unit-05;
+		border-radius: $radius-large;
 		margin: auto;
 		width: auto;
 		min-width: $modal-min-width;
@@ -79,10 +93,25 @@
 
 @keyframes components-modal__appear-animation {
 	from {
-		transform: translateY($grid-unit-40);
+		opacity: 0;
+		transform: scale(0.9);
 	}
 	to {
-		transform: translateY(0);
+		opacity: 1;
+		transform: scale(1);
+	}
+}
+
+// Note: this animation is also used in the animationend JS event listener.
+// Make sure that the animation name is kept in sync across the two files.
+@keyframes components-modal__disappear-animation {
+	from {
+		opacity: 1;
+		transform: scale(1);
+	}
+	to {
+		opacity: 0;
+		transform: scale(0.9);
 	}
 }
 
@@ -114,11 +143,6 @@
 		margin: 0;
 	}
 
-	.components-button {
-		position: relative;
-		left: $grid-unit-10;
-	}
-
 	.components-modal__content.has-scrolled-content:not(.hide-header) & {
 		border-bottom-color: $gray-300;
 	}
@@ -160,7 +184,7 @@
 	}
 
 	&.is-scrollable:focus-visible {
-		box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+		box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $components-color-accent;
 
 		// Windows High Contrast mode will show this outline, but not the box-shadow.
 		outline: 2px solid transparent;
diff --git a/packages/components/src/modal/test/index.tsx b/packages/components/src/modal/test/index.tsx
index 9073735e94dbe9..a0d0ee2653edb4 100644
--- a/packages/components/src/modal/test/index.tsx
+++ b/packages/components/src/modal/test/index.tsx
@@ -7,7 +7,7 @@ import userEvent from '@testing-library/user-event';
 /**
  * WordPress dependencies
  */
-import { useState } from '@wordpress/element';
+import { useEffect, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -178,7 +178,9 @@ describe( 'Modal', () => {
 					{ isShown && (
 						<Modal
 							onKeyDown={ ( { key } ) => {
-								if ( key === 'o' ) setIsShown( false );
+								if ( key === 'o' ) {
+									setIsShown( false );
+								}
 							} }
 							onRequestClose={ noop }
 						>
@@ -335,7 +337,7 @@ describe( 'Modal', () => {
 		it( 'should focus the Modal dialog when `true` passed as value for `focusOnMount` prop', async () => {
 			const user = userEvent.setup();
 
-			render( <FocusMountDemo focusOnMount={ true } /> );
+			render( <FocusMountDemo focusOnMount /> );
 
 			const opener = screen.getByRole( 'button', {
 				name: 'Toggle Modal',
@@ -388,4 +390,98 @@ describe( 'Modal', () => {
 			expect( opener ).toHaveFocus();
 		} );
 	} );
+
+	describe( 'Body class name', () => {
+		const overrideClass = 'is-any-open';
+		const BodyClassDemo = () => {
+			const [ isAShown, setIsAShown ] = useState( false );
+			const [ isA1Shown, setIsA1Shown ] = useState( false );
+			const [ isBShown, setIsBShown ] = useState( false );
+			const [ isClassOverriden, setIsClassOverriden ] = useState( false );
+			useEffect( () => {
+				const toggles: ( e: KeyboardEvent ) => void = ( {
+					key,
+					metaKey,
+				} ) => {
+					if ( key === 'a' ) {
+						if ( metaKey ) {
+							return setIsA1Shown( ( v ) => ! v );
+						}
+						return setIsAShown( ( v ) => ! v );
+					}
+					if ( key === 'b' ) {
+						return setIsBShown( ( v ) => ! v );
+					}
+					if ( key === 'c' ) {
+						return setIsClassOverriden( ( v ) => ! v );
+					}
+				};
+				document.addEventListener( 'keydown', toggles );
+				return () =>
+					void document.removeEventListener( 'keydown', toggles );
+			}, [] );
+			return (
+				<>
+					{ isAShown && (
+						<Modal
+							bodyOpenClassName={
+								isClassOverriden ? overrideClass : 'is-A-open'
+							}
+							onRequestClose={ () => setIsAShown( false ) }
+						>
+							<p>Modal A contents</p>
+							{ isA1Shown && (
+								<Modal
+									title="Nested"
+									onRequestClose={ () =>
+										setIsA1Shown( false )
+									}
+								>
+									<p>Modal A1 contents</p>
+								</Modal>
+							) }
+						</Modal>
+					) }
+					{ isBShown && (
+						<Modal
+							bodyOpenClassName={
+								isClassOverriden ? overrideClass : 'is-B-open'
+							}
+							onRequestClose={ () => setIsBShown( false ) }
+						>
+							<p>Modal B contents</p>
+						</Modal>
+					) }
+				</>
+			);
+		};
+
+		it( 'is added and removed when modal opens and closes including when closed due to another modal opening', async () => {
+			const user = userEvent.setup();
+
+			const { baseElement } = render( <BodyClassDemo /> );
+
+			await user.keyboard( 'a' ); // Opens modal A.
+			expect( baseElement ).toHaveClass( 'is-A-open' );
+
+			await user.keyboard( 'b' ); // Opens modal B > closes modal A.
+			expect( baseElement ).toHaveClass( 'is-B-open' );
+			expect( baseElement ).not.toHaveClass( 'is-A-open' );
+
+			await user.keyboard( 'b' ); // Closes modal B.
+			expect( baseElement ).not.toHaveClass( 'is-B-open' );
+		} );
+
+		it( 'is removed even when prop changes while nested modal is open', async () => {
+			const user = userEvent.setup();
+
+			const { baseElement } = render( <BodyClassDemo /> );
+
+			await user.keyboard( 'a' ); // Opens modal A.
+			await user.keyboard( '{Meta>}a{/Meta}' ); // Opens nested modal.
+			await user.keyboard( 'c' ); // Changes `bodyOpenClassName`.
+			await user.keyboard( 'a' ); // Closes modal A.
+			expect( baseElement ).not.toHaveClass( 'is-A-open' );
+		} );
+	} );
 } );
diff --git a/packages/components/src/modal/types.ts b/packages/components/src/modal/types.ts
index 0a422718b1be14..f6f35eec85fc73 100644
--- a/packages/components/src/modal/types.ts
+++ b/packages/components/src/modal/types.ts
@@ -1,15 +1,3 @@
-/**
- * External dependencies
- */
-import type {
-	AriaRole,
-	CSSProperties,
-	ReactNode,
-	KeyboardEventHandler,
-	KeyboardEvent,
-	SyntheticEvent,
-} from 'react';
-
 /**
  * WordPress dependencies
  */
@@ -42,7 +30,7 @@ export type ModalProps = {
 	/**
 	 * The children elements.
 	 */
-	children: ReactNode;
+	children: React.ReactNode;
 	/**
 	 * If this property is added, it will an additional class name to the modal
 	 * content `div`.
@@ -77,7 +65,7 @@ export type ModalProps = {
 	 *
 	 * @default null
 	 */
-	headerActions?: ReactNode;
+	headerActions?: React.ReactNode;
 
 	/**
 	 * If this property is added, an icon will be added before the title.
@@ -108,12 +96,12 @@ export type ModalProps = {
 	/**
 	 *  Handle the key down on the modal frame `div`.
 	 */
-	onKeyDown?: KeyboardEventHandler< HTMLDivElement >;
+	onKeyDown?: React.KeyboardEventHandler< HTMLDivElement >;
 	/**
 	 * This function is called to indicate that the modal should be closed.
 	 */
 	onRequestClose: (
-		event?: KeyboardEvent< HTMLDivElement > | SyntheticEvent
+		event?: React.KeyboardEvent< HTMLDivElement > | React.SyntheticEvent
 	) => void;
 	/**
 	 * If this property is added, it will an additional class name to the modal
@@ -126,7 +114,7 @@ export type ModalProps = {
 	 *
 	 * @default 'dialog'
 	 */
-	role?: AriaRole;
+	role?: React.AriaRole;
 	/**
 	 * If this property is added, it will determine whether the modal requests
 	 * to close when a mouse click occurs outside of the modal content.
@@ -144,7 +132,7 @@ export type ModalProps = {
 	/**
 	 * If this property is added, it will be added to the modal frame `div`.
 	 */
-	style?: CSSProperties;
+	style?: React.CSSProperties;
 	/**
 	 * This property is used as the modal header's title.
 	 *
diff --git a/packages/components/src/modal/use-modal-exit-animation.ts b/packages/components/src/modal/use-modal-exit-animation.ts
new file mode 100644
index 00000000000000..729b4f9ea6f86c
--- /dev/null
+++ b/packages/components/src/modal/use-modal-exit-animation.ts
@@ -0,0 +1,99 @@
+/**
+ * WordPress dependencies
+ */
+import { useReducedMotion } from '@wordpress/compose';
+import { useCallback, useRef, useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { CONFIG } from '../utils';
+import warning from '@wordpress/warning';
+
+// Animation duration (ms) extracted to JS in order to be used on a setTimeout.
+const FRAME_ANIMATION_DURATION = CONFIG.transitionDuration;
+const FRAME_ANIMATION_DURATION_NUMBER = Number.parseInt(
+	CONFIG.transitionDuration
+);
+
+const EXIT_ANIMATION_NAME = 'components-modal__disappear-animation';
+
+export function useModalExitAnimation() {
+	const frameRef = useRef< HTMLDivElement >();
+	const [ isAnimatingOut, setIsAnimatingOut ] = useState( false );
+	const isReducedMotion = useReducedMotion();
+
+	const closeModal = useCallback(
+		() =>
+			new Promise< void >( ( closeModalResolve ) => {
+				// Grab a "stable" reference of the frame element, since
+				// the value held by the react ref might change at runtime.
+				const frameEl = frameRef.current;
+
+				if ( isReducedMotion ) {
+					closeModalResolve();
+					return;
+				}
+
+				if ( ! frameEl ) {
+					warning(
+						"wp.components.Modal: the Modal component can't be closed with an exit animation because of a missing reference to the modal frame element."
+					);
+					closeModalResolve();
+					return;
+				}
+
+				let handleAnimationEnd:
+					| undefined
+					| ( ( e: AnimationEvent ) => void );
+
+				const startAnimation = () =>
+					new Promise< void >( ( animationResolve ) => {
+						handleAnimationEnd = ( e: AnimationEvent ) => {
+							if ( e.animationName === EXIT_ANIMATION_NAME ) {
+								animationResolve();
+							}
+						};
+
+						frameEl.addEventListener(
+							'animationend',
+							handleAnimationEnd
+						);
+						setIsAnimatingOut( true );
+					} );
+				const animationTimeout = () =>
+					new Promise< void >( ( timeoutResolve ) => {
+						setTimeout(
+							() => timeoutResolve(),
+							// Allow an extra 20% of the animation duration for the
+							// animationend event to fire, in case the animation frame is
+							// slightly delayes by some other events in the event loop.
+							FRAME_ANIMATION_DURATION_NUMBER * 1.2
+						);
+					} );
+
+				Promise.race( [ startAnimation(), animationTimeout() ] ).then(
+					() => {
+						if ( handleAnimationEnd ) {
+							frameEl.removeEventListener(
+								'animationend',
+								handleAnimationEnd
+							);
+						}
+						setIsAnimatingOut( false );
+						closeModalResolve();
+					}
+				);
+			} ),
+		[ isReducedMotion ]
+	);
+
+	return {
+		overlayClassname: isAnimatingOut ? 'is-animating-out' : undefined,
+		frameRef,
+		frameStyle: {
+			'--modal-frame-animation-duration': `${ FRAME_ANIMATION_DURATION }`,
+		},
+		closeModal,
+	};
+}
diff --git a/packages/components/src/navigable-container/container.tsx b/packages/components/src/navigable-container/container.tsx
index c5f92f8effcade..44e990a6e4a195 100644
--- a/packages/components/src/navigable-container/container.tsx
+++ b/packages/components/src/navigable-container/container.tsx
@@ -79,7 +79,7 @@ class NavigableContainer extends Component< NavigableContainerProps > {
 
 		const { onlyBrowserTabstops } = this.props;
 		const finder = onlyBrowserTabstops ? focus.tabbable : focus.focusable;
-		const focusables = finder.find( this.container ) as HTMLElement[];
+		const focusables = finder.find( this.container );
 
 		const index = this.getFocusableIndex( focusables, target );
 		if ( index > -1 && target ) {
diff --git a/packages/components/src/navigable-container/stories/navigable-menu.story.tsx b/packages/components/src/navigable-container/stories/navigable-menu.story.tsx
index 9e5f3eedff5289..2ad7e028d6faf1 100644
--- a/packages/components/src/navigable-container/stories/navigable-menu.story.tsx
+++ b/packages/components/src/navigable-container/stories/navigable-menu.story.tsx
@@ -9,7 +9,8 @@ import type { Meta, StoryFn } from '@storybook/react';
 import { NavigableMenu } from '..';
 
 const meta: Meta< typeof NavigableMenu > = {
-	title: 'Components/NavigableMenu',
+	title: 'Components/Containers/NavigableMenu',
+	id: 'components-navigablemenu',
 	component: NavigableMenu,
 	argTypes: {
 		children: { control: { type: null } },
diff --git a/packages/components/src/navigable-container/stories/tabbable-container.story.tsx b/packages/components/src/navigable-container/stories/tabbable-container.story.tsx
index 3dd090f0b05859..07c87a0c20f1bf 100644
--- a/packages/components/src/navigable-container/stories/tabbable-container.story.tsx
+++ b/packages/components/src/navigable-container/stories/tabbable-container.story.tsx
@@ -9,7 +9,8 @@ import type { Meta, StoryFn } from '@storybook/react';
 import { TabbableContainer } from '..';
 
 const meta: Meta< typeof TabbableContainer > = {
-	title: 'Components/TabbableContainer',
+	title: 'Components/Containers/TabbableContainer',
+	id: 'components-tabbablecontainer',
 	component: TabbableContainer,
 	argTypes: {
 		children: { control: { type: null } },
diff --git a/packages/components/src/navigation/README.md b/packages/components/src/navigation/README.md
index 3a1fa992611b62..b294eb78331eef 100644
--- a/packages/components/src/navigation/README.md
+++ b/packages/components/src/navigation/README.md
@@ -1,5 +1,9 @@
 # Navigation
 
+<div class="callout callout-alert">
+This component is deprecated. Consider using `Navigator` instead.
+</div>
+
 <div class="callout callout-alert">
 This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
 </div>
diff --git a/packages/components/src/navigation/back-button/index.tsx b/packages/components/src/navigation/back-button/index.tsx
index 182faa8773726d..077e5a8dbdc6d4 100644
--- a/packages/components/src/navigation/back-button/index.tsx
+++ b/packages/components/src/navigation/back-button/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 /**
  * WordPress dependencies
  */
@@ -29,10 +29,7 @@ function UnforwardedNavigationBackButton(
 ) {
 	const { setActiveMenu, navigationTree } = useNavigationContext();
 
-	const classes = classnames(
-		'components-navigation__back-button',
-		className
-	);
+	const classes = clsx( 'components-navigation__back-button', className );
 
 	const parentMenuTitle =
 		parentMenu !== undefined
@@ -64,6 +61,9 @@ function UnforwardedNavigationBackButton(
 	);
 }
 
+/**
+ * @deprecated Use `Navigator` instead.
+ */
 export const NavigationBackButton = forwardRef(
 	UnforwardedNavigationBackButton
 );
diff --git a/packages/components/src/navigation/group/index.tsx b/packages/components/src/navigation/group/index.tsx
index cd91fb97365d26..f1871f67cace35 100644
--- a/packages/components/src/navigation/group/index.tsx
+++ b/packages/components/src/navigation/group/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -19,6 +19,9 @@ import type { NavigationGroupProps } from '../types';
 
 let uniqueId = 0;
 
+/**
+ * @deprecated Use `Navigator` instead.
+ */
 export function NavigationGroup( {
 	children,
 	className,
@@ -45,7 +48,7 @@ export function NavigationGroup( {
 	}
 
 	const groupTitleId = `components-navigation__group-title-${ groupId }`;
-	const classes = classnames( 'components-navigation__group', className );
+	const classes = clsx( 'components-navigation__group', className );
 
 	return (
 		<NavigationGroupContext.Provider value={ context }>
diff --git a/packages/components/src/navigation/index.tsx b/packages/components/src/navigation/index.tsx
index dfc1b26cb33ad0..92f431dfb22fc7 100644
--- a/packages/components/src/navigation/index.tsx
+++ b/packages/components/src/navigation/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -28,6 +28,8 @@ const noop = () => {};
 /**
  * Render a navigation list with optional groupings and hierarchy.
  *
+ * @deprecated Use `Navigator` instead.
+ *
  * ```jsx
  * import {
  *   __experimentalNavigation as Navigation,
@@ -91,10 +93,10 @@ export function Navigation( {
 	};
 
 	// Used to prevent the sliding animation on mount
-	const isMounted = useRef( false );
+	const isMountedRef = useRef( false );
 	useEffect( () => {
-		if ( ! isMounted.current ) {
-			isMounted.current = true;
+		if ( ! isMountedRef.current ) {
+			isMountedRef.current = true;
 		}
 	}, [] );
 
@@ -102,9 +104,8 @@ export function Navigation( {
 		if ( activeMenu !== menu ) {
 			setActiveMenu( activeMenu );
 		}
-		// Ignore exhaustive-deps here, as it would require either a larger refactor or some questionable workarounds.
+		// Not adding deps for now, as it would require either a larger refactor or some questionable workarounds.
 		// See https://github.com/WordPress/gutenberg/pull/41612 for context.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ activeMenu ] );
 
 	const context = {
@@ -114,7 +115,7 @@ export function Navigation( {
 		navigationTree,
 	};
 
-	const classes = classnames( 'components-navigation', className );
+	const classes = clsx( 'components-navigation', className );
 	const animateClassName = getAnimateClassName( {
 		type: 'slide-in',
 		origin: slideOrigin,
@@ -126,9 +127,9 @@ export function Navigation( {
 				key={ menu }
 				className={
 					animateClassName
-						? classnames( {
+						? clsx( {
 								[ animateClassName ]:
-									isMounted.current && slideOrigin,
+									isMountedRef.current && slideOrigin,
 						  } )
 						: undefined
 				}
diff --git a/packages/components/src/navigation/item/base.tsx b/packages/components/src/navigation/item/base.tsx
index e5d106bf71c1ac..de4dfaba88c1a3 100644
--- a/packages/components/src/navigation/item/base.tsx
+++ b/packages/components/src/navigation/item/base.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -32,7 +32,7 @@ export default function NavigationItemBase( props: NavigationItemBaseProps ) {
 		return null;
 	}
 
-	const classes = classnames( 'components-navigation__item', className );
+	const classes = clsx( 'components-navigation__item', className );
 
 	return (
 		<ItemBaseUI className={ classes } { ...restProps }>
diff --git a/packages/components/src/navigation/item/index.tsx b/packages/components/src/navigation/item/index.tsx
index 2fd1aebefcbbac..4f4cc2a5dc7a22 100644
--- a/packages/components/src/navigation/item/index.tsx
+++ b/packages/components/src/navigation/item/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -22,6 +22,9 @@ import type { NavigationItemProps } from '../types';
 
 const noop = () => {};
 
+/**
+ * @deprecated Use `Navigator` instead.
+ */
 export function NavigationItem( props: NavigationItemProps ) {
 	const {
 		badge,
@@ -57,7 +60,7 @@ export function NavigationItem( props: NavigationItemProps ) {
 
 	const isActive = item && activeItem === item;
 
-	const classes = classnames( className, {
+	const classes = clsx( className, {
 		'is-active': isActive,
 	} );
 
diff --git a/packages/components/src/navigation/item/use-navigation-tree-item.tsx b/packages/components/src/navigation/item/use-navigation-tree-item.tsx
index e294af4169517e..335e55f2401bf4 100644
--- a/packages/components/src/navigation/item/use-navigation-tree-item.tsx
+++ b/packages/components/src/navigation/item/use-navigation-tree-item.tsx
@@ -41,7 +41,7 @@ export const useNavigationTreeItem = (
 		return () => {
 			removeItem( itemId );
 		};
-		// Ignore exhaustive-deps rule for now. See https://github.com/WordPress/gutenberg/pull/41639
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// Not adding deps for now, as it would require either a larger refactor.
+		// See https://github.com/WordPress/gutenberg/pull/41639
 	}, [ activeMenu, search ] );
 };
diff --git a/packages/components/src/navigation/menu/index.tsx b/packages/components/src/navigation/menu/index.tsx
index b001bd0fa0f3d8..2a2cb20da0e9c9 100644
--- a/packages/components/src/navigation/menu/index.tsx
+++ b/packages/components/src/navigation/menu/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -23,6 +23,9 @@ import { MenuUI } from '../styles/navigation-styles';
 
 import type { NavigationMenuProps } from '../types';
 
+/**
+ * @deprecated Use `Navigator` instead.
+ */
 export function NavigationMenu( props: NavigationMenuProps ) {
 	const {
 		backButtonLabel,
@@ -63,7 +66,7 @@ export function NavigationMenu( props: NavigationMenuProps ) {
 		: setUncontrolledSearch;
 
 	const menuTitleId = `components-navigation__menu-title-${ menu }`;
-	const classes = classnames( 'components-navigation__menu', className );
+	const classes = clsx( 'components-navigation__menu', className );
 
 	return (
 		<NavigationMenuContext.Provider value={ context }>
diff --git a/packages/components/src/navigation/menu/menu-title-search.tsx b/packages/components/src/navigation/menu/menu-title-search.tsx
index d03766f28d7522..f0014fa4768046 100644
--- a/packages/components/src/navigation/menu/menu-title-search.tsx
+++ b/packages/components/src/navigation/menu/menu-title-search.tsx
@@ -10,10 +10,11 @@ import { __, _n, sprintf } from '@wordpress/i18n';
 import withSpokenMessages from '../../higher-order/with-spoken-messages';
 import { useNavigationMenuContext } from './context';
 import { useNavigationContext } from '../context';
-import { MenuTitleSearchUI } from '../styles/navigation-styles';
 import { SEARCH_FOCUS_DELAY } from '../constants';
 
 import type { NavigationMenuTitleSearchProps } from '../types';
+import SearchControl from '../../search-control';
+import { MenuTitleSearchControlWrapper } from '../styles/navigation-styles';
 
 function MenuTitleSearch( {
 	debouncedSpeak,
@@ -54,8 +55,8 @@ function MenuTitleSearch( {
 			count
 		);
 		debouncedSpeak( resultsFoundMessage );
-		// Ignore exhaustive-deps rule for now. See https://github.com/WordPress/gutenberg/pull/44090
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// Not adding deps for now, as it would require either a larger refactor.
+		// See https://github.com/WordPress/gutenberg/pull/44090
 	}, [ items, search ] );
 
 	const onClose = () => {
@@ -80,9 +81,9 @@ function MenuTitleSearch( {
 	).trim();
 
 	return (
-		<div className="components-navigation__menu-title-search">
-			<MenuTitleSearchUI
-				autoComplete="off"
+		<MenuTitleSearchControlWrapper>
+			<SearchControl
+				__nextHasNoMarginBottom
 				className="components-navigation__menu-search-input"
 				id={ inputId }
 				onChange={ ( value ) => onSearch?.( value ) }
@@ -90,10 +91,9 @@ function MenuTitleSearch( {
 				placeholder={ placeholder }
 				onClose={ onClose }
 				ref={ inputRef }
-				type="search"
 				value={ search }
 			/>
-		</div>
+		</MenuTitleSearchControlWrapper>
 	);
 }
 
diff --git a/packages/components/src/navigation/menu/menu-title.tsx b/packages/components/src/navigation/menu/menu-title.tsx
index 8a9c7fcd59963c..43ae0bd45cfb2b 100644
--- a/packages/components/src/navigation/menu/menu-title.tsx
+++ b/packages/components/src/navigation/menu/menu-title.tsx
@@ -66,7 +66,7 @@ export default function NavigationMenuTitle( {
 
 							{ hasSearch && (
 								<Button
-									isSmall
+									size="small"
 									variant="tertiary"
 									label={ searchButtonLabel }
 									onClick={ () => setIsSearching( true ) }
diff --git a/packages/components/src/navigation/menu/use-navigation-tree-menu.tsx b/packages/components/src/navigation/menu/use-navigation-tree-menu.tsx
index 1db2ee87fa7847..8631812445cd7d 100644
--- a/packages/components/src/navigation/menu/use-navigation-tree-menu.tsx
+++ b/packages/components/src/navigation/menu/use-navigation-tree-menu.tsx
@@ -23,7 +23,7 @@ export const useNavigationTreeMenu = ( props: NavigationMenuProps ) => {
 		return () => {
 			removeMenu( key );
 		};
-		// Ignore exhaustive-deps rule for now. See https://github.com/WordPress/gutenberg/pull/44090
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// Not adding deps for now, as it would require either a larger refactor
+		// See https://github.com/WordPress/gutenberg/pull/44090
 	}, [] );
 };
diff --git a/packages/components/src/navigation/stories/index.story.tsx b/packages/components/src/navigation/stories/index.story.tsx
index e0a3f1e1397576..2f09ace29f16e5 100644
--- a/packages/components/src/navigation/stories/index.story.tsx
+++ b/packages/components/src/navigation/stories/index.story.tsx
@@ -19,8 +19,14 @@ import { MoreExamplesStory } from './utils/more-examples';
 import { HideIfEmptyStory } from './utils/hide-if-empty';
 import './style.css';
 
+/**
+ * Render a navigation list with optional groupings and hierarchy.
+ *
+ * This component is deprecated. Consider using `Navigator` instead.
+ */
 const meta: Meta< typeof Navigation > = {
-	title: 'Components (Experimental)/Navigation',
+	title: 'Components (Deprecated)/Navigation',
+	id: 'components-navigation',
 	component: Navigation,
 	subcomponents: {
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
diff --git a/packages/components/src/navigation/stories/utils/hide-if-empty.tsx b/packages/components/src/navigation/stories/utils/hide-if-empty.tsx
index 9b1414db861c0b..2d9dcb91660375 100644
--- a/packages/components/src/navigation/stories/utils/hide-if-empty.tsx
+++ b/packages/components/src/navigation/stories/utils/hide-if-empty.tsx
@@ -42,11 +42,7 @@ export const HideIfEmptyStory: StoryFn< typeof Navigation > = ( {
 					/>
 				</NavigationMenu>
 
-				<NavigationMenu
-					menu="root-sub-1"
-					parentMenu="root"
-					isEmpty={ true }
-				/>
+				<NavigationMenu menu="root-sub-1" parentMenu="root" isEmpty />
 				<NavigationMenu
 					menu="root-sub-2"
 					parentMenu="root"
@@ -57,7 +53,7 @@ export const HideIfEmptyStory: StoryFn< typeof Navigation > = ( {
 				<NavigationMenu
 					menu="root-sub-1-sub-1"
 					parentMenu="root-sub-1"
-					isEmpty={ true }
+					isEmpty
 				/>
 			</Navigation>
 
diff --git a/packages/components/src/navigation/styles/navigation-styles.tsx b/packages/components/src/navigation/styles/navigation-styles.tsx
index 27c508b98f26dc..580c0eef4dba8f 100644
--- a/packages/components/src/navigation/styles/navigation-styles.tsx
+++ b/packages/components/src/navigation/styles/navigation-styles.tsx
@@ -15,9 +15,8 @@ import { COLORS } from '../../utils/colors-values';
 import Button from '../../button';
 import { Text } from '../../text';
 import { Heading } from '../../heading';
-import { reduceMotion, rtl } from '../../utils';
+import { rtl, CONFIG } from '../../utils';
 import { space } from '../../utils/space';
-import SearchControl from '../../search-control';
 
 export const NavigationUI = styled.div`
 	width: 100%;
@@ -69,6 +68,11 @@ export const MenuTitleUI = styled.div`
 	width: 100%;
 `;
 
+export const MenuTitleSearchControlWrapper = styled.div`
+	margin: 11px 0; // non-ideal hardcoding to maintain same height as Heading, could be improved
+	padding: 1px; // so the focus border doesn't get cut off by the overflow hidden on MenuTitleUI
+`;
+
 export const MenuTitleActionsUI = styled.span`
 	height: ${ space( 6 ) }; // 24px, same height as the buttons inside
 
@@ -91,32 +95,6 @@ export const MenuTitleActionsUI = styled.span`
 	}
 `;
 
-export const MenuTitleSearchUI = styled( SearchControl )`
-	input[type='search'].components-search-control__input {
-		margin: 0;
-		background: #303030;
-		color: #fff;
-
-		&:focus {
-			background: #434343;
-			color: #fff;
-		}
-
-		&::placeholder {
-			color: rgba( 255, 255, 255, 0.6 );
-		}
-	}
-
-	svg {
-		fill: white;
-	}
-
-	.components-button.has-icon {
-		padding: 0;
-		min-width: auto;
-	}
-`;
-
 export const GroupTitleUI = styled( Heading )`
 	min-height: ${ space( 12 ) };
 	align-items: center;
@@ -133,7 +111,7 @@ export const GroupTitleUI = styled( Heading )`
 `;
 
 export const ItemBaseUI = styled.li`
-	border-radius: 2px;
+	border-radius: ${ CONFIG.radiusSmall };
 	color: inherit;
 	margin-bottom: 0;
 
@@ -194,8 +172,7 @@ export const ItemBadgeUI = styled.span`
 	margin-right: ${ () => ( isRTL() ? space( 2 ) : '0' ) };
 	display: inline-flex;
 	padding: ${ space( 1 ) } ${ space( 3 ) };
-	border-radius: 2px;
-	animation: fade-in 250ms ease-out;
+	border-radius: ${ CONFIG.radiusSmall };
 
 	@keyframes fade-in {
 		from {
@@ -206,7 +183,9 @@ export const ItemBadgeUI = styled.span`
 		}
 	}
 
-	${ reduceMotion( 'animation' ) };
+	@media not ( prefers-reduced-motion ) {
+		animation: fade-in 250ms ease-out;
+	}
 `;
 
 export const ItemTitleUI = styled( Text )`
diff --git a/packages/components/src/navigator/README.md b/packages/components/src/navigator/README.md
new file mode 100644
index 00000000000000..b56a82e0524eef
--- /dev/null
+++ b/packages/components/src/navigator/README.md
@@ -0,0 +1,176 @@
+# `Navigator`
+
+`Navigator` is a collection components that allow rendering nested views/panels/menus (via the `Navigator.Screen` component) and navigate between them (via the `Navigator.Button` and `Navigator.BackButton` components).
+
+## Usage
+
+```jsx
+import { Navigator } from '@wordpress/components';
+
+const MyNavigation = () => (
+	<Navigator initialPath="/">
+		<Navigator.Screen path="/">
+			<p>This is the home screen.</p>
+			<Navigator.Button path="/child">
+				Navigate to child screen.
+			</Navigator.Button>
+		</Navigator.Screen>
+		<Navigator.Screen path="/child">
+			<p>This is the child screen.</p>
+			<Navigator.BackButton>Go back</Navigator.BackButton>
+		</Navigator.Screen>
+	</Navigator>
+);
+```
+
+### Hierarchical `path`s
+
+`Navigator` assumes that screens are organized hierarchically according to their `path`, which should follow a URL-like scheme where each path segment starts with and is separated by the `/` character.
+
+`Navigator` will treat "back" navigations as going to the parent screen — it is, therefore, the responsibility of the consumer of the component to create the correct screen hierarchy.
+
+For example:
+
+-   `/` is the root of all paths. There should always be a screen with `path="/"`;
+-   `/parent/child` is a child of `/parent`;
+-   `/parent/child/grand-child` is a child of `/parent/child`;
+-   `/parent/:param` is a child of `/parent` as well;
+-   if the current screen has a `path="/parent/child/grand-child"`, when going "back" `Navigator` will try to recursively navigate the path hierarchy until a matching screen (or the root `/`) is found.
+
+### Height and animations
+
+Due to how `Navigator.Screen` animations work, it is recommended that the `Navigator` component is assigned a `height` to prevent some potential UI jumps while moving across screens.
+
+### Individual components
+
+`Navigator` is comprised of four individual components:
+
+-   `Navigator`: a wrapper component and context provider. It holds the main logic for hiding and showing screens.
+-   `Navigator.Screen`: represents a single view/screen/panel;
+-   `Navigator.Button`: renders a button that allows navigating to a different `Navigator.Screen`;
+-   `Navigator.BackButton`: renders a button that allows navigating to the parent `Navigator.Screen` (see the section above about hierarchical paths).
+
+For advanced usages, consumers can use the `useNavigator` hook.
+
+#### `Navigator`
+
+##### Props
+
+###### `initialPath`: `string`
+
+The initial active path.
+
+-   Required: Yes
+
+###### `children`: `string`
+
+The children elements.
+
+-   Required: Yes
+
+#### `Navigator.Screen`
+
+##### Props
+
+###### `path`: `string`
+
+The screen's path, matched against the current path stored in the navigator.
+
+`Navigator` assumes that screens are organized hierarchically according to their `path`, which should follow a URL-like scheme where each path segment starts with and is separated by the `/` character.
+
+`Navigator` will treat "back" navigations as going to the parent screen — it is, therefore, the responsibility of the consumer of the component to create the correct screen hierarchy.
+
+For example:
+
+-   `/` is the root of all paths. There should always be a screen with `path="/"`.
+-   `/parent/child` is a child of `/parent`.
+-   `/parent/child/grand-child` is a child of `/parent/child`.
+-   `/parent/:param` is a child of `/parent` as well.
+-   if the current screen has a `path` with value `/parent/child/grand-child`, when going "back" `Navigator` will try to recursively navigate the path hierarchy until a matching screen (or the root `/`) is found.
+
+-   Required: Yes
+
+###### `children`: `string`
+
+The children elements.
+
+-   Required: Yes
+
+#### `Navigator.Button`
+
+##### Props
+
+###### `path`: `string`
+
+The path of the screen to navigate to. The value of this prop needs to be [a valid value for an HTML attribute](https://html.spec.whatwg.org/multipage/syntax.html#attributes-2).
+
+-   Required: Yes
+
+###### `attributeName`: `string`
+
+The HTML attribute used to identify the `Navigator.Button`, which is used by `Navigator` to restore focus.
+
+-   Required: No
+-   Default: `id`
+
+###### `children`: `string`
+
+The children elements.
+
+-   Required: No
+
+###### Inherited props
+
+`Navigator.Button` also inherits all of the [`Button` props](/packages/components/src/button/README.md#props), except for `href` and `target`.
+
+#### `Navigator.BackButton`
+
+##### Props
+
+###### `children`: `string`
+
+The children elements.
+
+-   Required: No
+
+###### Inherited props
+
+`Navigator.BackButton` also inherits all of the [`Button` props](/packages/components/src/button/README.md#props), except for `href` and `target`.
+
+#### `useNavigator`
+
+You can retrieve a `navigator` instance by using the `useNavigator` hook.
+
+##### Props
+
+The `navigator` instance has a few properties:
+
+###### `goTo`: `( path: string, options: NavigateOptions ) => void`
+
+The `goTo` function allows navigating to a given path. The second argument can augment the navigation operations with different options.
+
+The available options are:
+
+-   `focusTargetSelector`: `string`. An optional property used to specify the CSS selector used to restore focus on the matching element when navigating back;
+-   `isBack`: `boolean`. An optional property used to specify whether the navigation should be considered as backwards (thus enabling focus restoration when possible, and causing the animation to be backwards too);
+-   `skipFocus`: `boolean`. An optional property used to opt out of `Navigator`'s focus management, useful when the consumer of the component wants to manage focus themselves;
+
+###### `goBack`: `( path: string, options: NavigateOptions ) => void`
+
+The `goBack` function allows navigating to the parent screen. Parent/child navigation only works if the paths you define are hierarchical (see note above).
+
+When a match is not found, the function will try to recursively navigate the path hierarchy until a matching screen (or the root `/`) is found.
+
+The available options are the same as for the `goTo` method, except for the `isBack` property, which is not available for the `goBack` method.
+
+###### `location`: `NavigatorLocation`
+
+The `location` object represents the current location, and has a few properties:
+
+-   `path`: `string`. The path associated to the location.
+-   `isBack`: `boolean`. A flag that is `true` when the current location was reached by navigating backwards.
+-   `isInitial`: `boolean`. A flag that is `true` only for the initial location.
+
+###### `params`: `Record< string, string | string[] >`
+
+The parsed record of parameters from the current location. For example if the current screen path is `/product/:productId` and the location is `/product/123`, then `params` will be `{ productId: '123' }`.
diff --git a/packages/components/src/navigator/index.ts b/packages/components/src/navigator/index.ts
deleted file mode 100644
index 74c69a0daa9c31..00000000000000
--- a/packages/components/src/navigator/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { NavigatorProvider } from './navigator-provider';
-export { NavigatorScreen } from './navigator-screen';
-export { NavigatorButton } from './navigator-button';
-export { NavigatorBackButton } from './navigator-back-button';
-export { NavigatorToParentButton } from './navigator-to-parent-button';
-export { default as useNavigator } from './use-navigator';
diff --git a/packages/components/src/navigator/index.tsx b/packages/components/src/navigator/index.tsx
new file mode 100644
index 00000000000000..1d9ae95441e01a
--- /dev/null
+++ b/packages/components/src/navigator/index.tsx
@@ -0,0 +1,131 @@
+/**
+ * Internal dependencies
+ */
+import { Navigator as TopLevelNavigator } from './navigator/component';
+import { NavigatorScreen } from './navigator-screen/component';
+import { NavigatorButton } from './navigator-button/component';
+import { NavigatorBackButton } from './navigator-back-button/component';
+export { useNavigator } from './use-navigator';
+
+/**
+ * The `Navigator` component allows rendering nested views/panels/menus
+ * (via the `Navigator.Screen` component) and navigate between them
+ * (via the `Navigator.Button` and `Navigator.BackButton` components).
+ *
+ * ```jsx
+ * import { Navigator } from '@wordpress/components';
+ *
+ * const MyNavigation = () => (
+ *   <Navigator initialPath="/">
+ *     <Navigator.Screen path="/">
+ *       <p>This is the home screen.</p>
+ *        <Navigator.Button path="/child">
+ *          Navigate to child screen.
+ *       </Navigator.Button>
+ *     </Navigator.Screen>
+ *
+ *     <Navigator.Screen path="/child">
+ *       <p>This is the child screen.</p>
+ *       <Navigator.BackButton>
+ *         Go back
+ *       </Navigator.BackButton>
+ *     </Navigator.Screen>
+ *   </Navigator>
+ * );
+ * ```
+ */
+export const Navigator = Object.assign( TopLevelNavigator, {
+	/**
+	 * The `Navigator.Screen` component represents a single view/screen/panel and
+	 * should be used in combination with the `Navigator`, the `Navigator.Button`
+	 * and the `Navigator.BackButton` components.
+	 *
+	 * @example
+	 * ```jsx
+	 * import { Navigator } from '@wordpress/components';
+	 *
+	 * const MyNavigation = () => (
+	 *   <Navigator initialPath="/">
+	 *     <Navigator.Screen path="/">
+	 *       <p>This is the home screen.</p>
+	 *        <Navigator.Button path="/child">
+	 *          Navigate to child screen.
+	 *       </Navigator.Button>
+	 *     </Navigator.Screen>
+	 *
+	 *     <Navigator.Screen path="/child">
+	 *       <p>This is the child screen.</p>
+	 *       <Navigator.BackButton>
+	 *         Go back
+	 *       </Navigator.BackButton>
+	 *     </Navigator.Screen>
+	 *   </Navigator>
+	 * );
+	 * ```
+	 */
+	Screen: Object.assign( NavigatorScreen, {
+		displayName: 'Navigator.Screen',
+	} ),
+	/**
+	 * The `Navigator.Button` component can be used to navigate to a screen and
+	 * should be used in combination with the `Navigator`, the `Navigator.Screen`
+	 * and the `Navigator.BackButton` components.
+	 *
+	 * @example
+	 * ```jsx
+	 * import { Navigator } from '@wordpress/components';
+	 *
+	 * const MyNavigation = () => (
+	 *   <Navigator initialPath="/">
+	 *     <Navigator.Screen path="/">
+	 *       <p>This is the home screen.</p>
+	 *        <Navigator.Button path="/child">
+	 *          Navigate to child screen.
+	 *       </Navigator.Button>
+	 *     </Navigator.Screen>
+	 *
+	 *     <Navigator.Screen path="/child">
+	 *       <p>This is the child screen.</p>
+	 *       <Navigator.BackButton>
+	 *         Go back
+	 *       </Navigator.BackButton>
+	 *     </Navigator.Screen>
+	 *   </Navigator>
+	 * );
+	 * ```
+	 */
+	Button: Object.assign( NavigatorButton, {
+		displayName: 'Navigator.Button',
+	} ),
+	/**
+	 * The `Navigator.BackButton` component can be used to navigate to a screen and
+	 * should be used in combination with the `Navigator`, the `Navigator.Screen`
+	 * and the `Navigator.Button` components.
+	 *
+	 * @example
+	 * ```jsx
+	 * import { Navigator } from '@wordpress/components';
+	 *
+	 * const MyNavigation = () => (
+	 *   <Navigator initialPath="/">
+	 *     <Navigator.Screen path="/">
+	 *       <p>This is the home screen.</p>
+	 *        <Navigator.Button path="/child">
+	 *          Navigate to child screen.
+	 *       </Navigator.Button>
+	 *     </Navigator.Screen>
+	 *
+	 *     <Navigator.Screen path="/child">
+	 *       <p>This is the child screen.</p>
+	 *       <Navigator.BackButton>
+	 *         Go back
+	 *       </Navigator.BackButton>
+	 *     </Navigator.Screen>
+	 *   </Navigator>
+	 * );
+	 * ```
+	 */
+	BackButton: Object.assign( NavigatorBackButton, {
+		displayName: 'Navigator.BackButton',
+	} ),
+} );
diff --git a/packages/components/src/navigator/legacy.ts b/packages/components/src/navigator/legacy.ts
new file mode 100644
index 00000000000000..1caa5380fc049e
--- /dev/null
+++ b/packages/components/src/navigator/legacy.ts
@@ -0,0 +1,169 @@
+/**
+ * Internal dependencies
+ */
+import { Navigator as InternalNavigator } from './navigator/component';
+import { NavigatorScreen as InternalNavigatorScreen } from './navigator-screen/component';
+import { NavigatorButton as InternalNavigatorButton } from './navigator-button/component';
+import { NavigatorBackButton as InternalNavigatorBackButton } from './navigator-back-button/component';
+import { NavigatorToParentButton as InternalNavigatorToParentButton } from './navigator-to-parent-button/component';
+export { useNavigator } from './use-navigator';
+
+/**
+ * The `NavigatorProvider` component allows rendering nested views/panels/menus
+ * (via the `NavigatorScreen` component and navigate between them
+ * (via the `NavigatorButton` and `NavigatorBackButton` components).
+ *
+ * ```jsx
+ * import {
+ *   __experimentalNavigatorProvider as NavigatorProvider,
+ *   __experimentalNavigatorScreen as NavigatorScreen,
+ *   __experimentalNavigatorButton as NavigatorButton,
+ *   __experimentalNavigatorBackButton as NavigatorBackButton,
+ * } from '@wordpress/components';
+ *
+ * const MyNavigation = () => (
+ *   <NavigatorProvider initialPath="/">
+ *     <NavigatorScreen path="/">
+ *       <p>This is the home screen.</p>
+ *        <NavigatorButton path="/child">
+ *          Navigate to child screen.
+ *       </NavigatorButton>
+ *     </NavigatorScreen>
+ *
+ *     <NavigatorScreen path="/child">
+ *       <p>This is the child screen.</p>
+ *       <NavigatorBackButton>
+ *         Go back
+ *       </NavigatorBackButton>
+ *     </NavigatorScreen>
+ *   </NavigatorProvider>
+ * );
+ * ```
+ */
+export const NavigatorProvider = Object.assign( InternalNavigator, {
+	displayName: 'NavigatorProvider',
+} );
+
+/**
+ * The `NavigatorScreen` component represents a single view/screen/panel and
+ * should be used in combination with the `NavigatorProvider`, the
+ * `NavigatorButton` and the `NavigatorBackButton` components.
+ *
+ * @example
+ * ```jsx
+ * import {
+ *   __experimentalNavigatorProvider as NavigatorProvider,
+ *   __experimentalNavigatorScreen as NavigatorScreen,
+ *   __experimentalNavigatorButton as NavigatorButton,
+ *   __experimentalNavigatorBackButton as NavigatorBackButton,
+ * } from '@wordpress/components';
+ *
+ * const MyNavigation = () => (
+ *   <NavigatorProvider initialPath="/">
+ *     <NavigatorScreen path="/">
+ *       <p>This is the home screen.</p>
+ *        <NavigatorButton path="/child">
+ *          Navigate to child screen.
+ *       </NavigatorButton>
+ *     </NavigatorScreen>
+ *
+ *     <NavigatorScreen path="/child">
+ *       <p>This is the child screen.</p>
+ *       <NavigatorBackButton>
+ *         Go back
+ *       </NavigatorBackButton>
+ *     </NavigatorScreen>
+ *   </NavigatorProvider>
+ * );
+ * ```
+ */
+export const NavigatorScreen = Object.assign( InternalNavigatorScreen, {
+	displayName: 'NavigatorScreen',
+} );
+
+/**
+ * The `NavigatorButton` component can be used to navigate to a screen and should
+ * be used in combination with the `NavigatorProvider`, the `NavigatorScreen`
+ * and the `NavigatorBackButton` components.
+ *
+ * @example
+ * ```jsx
+ * import {
+ *   __experimentalNavigatorProvider as NavigatorProvider,
+ *   __experimentalNavigatorScreen as NavigatorScreen,
+ *   __experimentalNavigatorButton as NavigatorButton,
+ *   __experimentalNavigatorBackButton as NavigatorBackButton,
+ * } from '@wordpress/components';
+ *
+ * const MyNavigation = () => (
+ *   <NavigatorProvider initialPath="/">
+ *     <NavigatorScreen path="/">
+ *       <p>This is the home screen.</p>
+ *        <NavigatorButton path="/child">
+ *          Navigate to child screen.
+ *       </NavigatorButton>
+ *     </NavigatorScreen>
+ *
+ *     <NavigatorScreen path="/child">
+ *       <p>This is the child screen.</p>
+ *       <NavigatorBackButton>
+ *         Go back
+ *       </NavigatorBackButton>
+ *     </NavigatorScreen>
+ *   </NavigatorProvider>
+ * );
+ * ```
+ */
+export const NavigatorButton = Object.assign( InternalNavigatorButton, {
+	displayName: 'NavigatorButton',
+} );
+
+/**
+ * The `NavigatorBackButton` component can be used to navigate to a screen and
+ * should be used in combination with the `NavigatorProvider`, the
+ * `NavigatorScreen` and the `NavigatorButton` components.
+ *
+ * @example
+ * ```jsx
+ * import {
+ *   __experimentalNavigatorProvider as NavigatorProvider,
+ *   __experimentalNavigatorScreen as NavigatorScreen,
+ *   __experimentalNavigatorButton as NavigatorButton,
+ *   __experimentalNavigatorBackButton as NavigatorBackButton,
+ * } from '@wordpress/components';
+ *
+ * const MyNavigation = () => (
+ *   <NavigatorProvider initialPath="/">
+ *     <NavigatorScreen path="/">
+ *       <p>This is the home screen.</p>
+ *        <NavigatorButton path="/child">
+ *          Navigate to child screen.
+ *       </NavigatorButton>
+ *     </NavigatorScreen>
+ *
+ *     <NavigatorScreen path="/child">
+ *       <p>This is the child screen.</p>
+ *       <NavigatorBackButton>
+ *         Go back (to parent)
+ *       </NavigatorBackButton>
+ *     </NavigatorScreen>
+ *   </NavigatorProvider>
+ * );
+ * ```
+ */
+export const NavigatorBackButton = Object.assign( InternalNavigatorBackButton, {
+	displayName: 'NavigatorBackButton',
+} );
+
+/**
+ * _Note: this component is deprecated. Please use the `NavigatorBackButton`
+ * component instead._
+ *
+ * @deprecated
+ */
+export const NavigatorToParentButton = Object.assign(
+	InternalNavigatorToParentButton,
+	{
+		displayName: 'NavigatorToParentButton',
+	}
+);
diff --git a/packages/components/src/navigator/navigator-back-button/README.md b/packages/components/src/navigator/navigator-back-button/README.md
deleted file mode 100644
index 01d4221be536e5..00000000000000
--- a/packages/components/src/navigator/navigator-back-button/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# `NavigatorBackButton`
-
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-
-The `NavigatorBackButton` component can be used to navigate to a screen and should be used in combination with the [`NavigatorProvider`](/packages/components/src/navigator/navigator-provider/README.md), the [`NavigatorScreen`](/packages/components/src/navigator/navigator-screen/README.md) and the [`NavigatorButton`](/packages/components/src/navigator/navigator-button/README.md) components (or the `useNavigator` hook).
-
-## Usage
-
-Refer to [the `NavigatorProvider` component](/packages/components/src/navigator/navigator-provider/README.md#usage) for a usage example.
-
-### Inherited props
-
-`NavigatorBackButton` also inherits all of the [`Button` props](/packages/components/src/button/README.md#props), except for `href` and `target`.
diff --git a/packages/components/src/navigator/navigator-back-button/component.tsx b/packages/components/src/navigator/navigator-back-button/component.tsx
index 71c5ac14cd00d9..b5c4de7df78a85 100644
--- a/packages/components/src/navigator/navigator-back-button/component.tsx
+++ b/packages/components/src/navigator/navigator-back-button/component.tsx
@@ -21,43 +21,7 @@ function UnconnectedNavigatorBackButton(
 	return <View ref={ forwardedRef } { ...navigatorBackButtonProps } />;
 }
 
-/**
- * The `NavigatorBackButton` component can be used to navigate to a screen and
- * should be used in combination with the `NavigatorProvider`, the
- * `NavigatorScreen` and the `NavigatorButton` components (or the `useNavigator`
- * hook).
- *
- * @example
- * ```jsx
- * import {
- *   __experimentalNavigatorProvider as NavigatorProvider,
- *   __experimentalNavigatorScreen as NavigatorScreen,
- *   __experimentalNavigatorButton as NavigatorButton,
- *   __experimentalNavigatorBackButton as NavigatorBackButton,
- * } from '@wordpress/components';
- *
- * const MyNavigation = () => (
- *   <NavigatorProvider initialPath="/">
- *     <NavigatorScreen path="/">
- *       <p>This is the home screen.</p>
- *        <NavigatorButton path="/child">
- *          Navigate to child screen.
- *       </NavigatorButton>
- *     </NavigatorScreen>
- *
- *     <NavigatorScreen path="/child">
- *       <p>This is the child screen.</p>
- *       <NavigatorBackButton>
- *         Go back
- *       </NavigatorBackButton>
- *     </NavigatorScreen>
- *   </NavigatorProvider>
- * );
- * ```
- */
 export const NavigatorBackButton = contextConnect(
 	UnconnectedNavigatorBackButton,
-	'NavigatorBackButton'
+	'Navigator.BackButton'
 );
-
-export default NavigatorBackButton;
diff --git a/packages/components/src/navigator/navigator-back-button/hook.ts b/packages/components/src/navigator/navigator-back-button/hook.ts
index edf55be0f15f5b..d6fcd39647bff9 100644
--- a/packages/components/src/navigator/navigator-back-button/hook.ts
+++ b/packages/components/src/navigator/navigator-back-button/hook.ts
@@ -9,32 +9,28 @@ import { useCallback } from '@wordpress/element';
 import type { WordPressComponentProps } from '../../context';
 import { useContextSystem } from '../../context';
 import Button from '../../button';
-import useNavigator from '../use-navigator';
-import type { NavigatorBackButtonHookProps } from '../types';
+import { useNavigator } from '../use-navigator';
+import type { NavigatorBackButtonProps } from '../types';
 
 export function useNavigatorBackButton(
-	props: WordPressComponentProps< NavigatorBackButtonHookProps, 'button' >
+	props: WordPressComponentProps< NavigatorBackButtonProps, 'button' >
 ) {
 	const {
 		onClick,
 		as = Button,
-		goToParent: goToParentProp = false,
+
 		...otherProps
-	} = useContextSystem( props, 'NavigatorBackButton' );
+	} = useContextSystem( props, 'Navigator.BackButton' );
 
-	const { goBack, goToParent } = useNavigator();
+	const { goBack } = useNavigator();
 	const handleClick: React.MouseEventHandler< HTMLButtonElement > =
 		useCallback(
 			( e ) => {
 				e.preventDefault();
-				if ( goToParentProp ) {
-					goToParent();
-				} else {
-					goBack();
-				}
+				goBack();
 				onClick?.( e );
 			},
-			[ goToParentProp, goToParent, goBack, onClick ]
+			[ goBack, onClick ]
 		);
 
 	return {
diff --git a/packages/components/src/navigator/navigator-back-button/index.ts b/packages/components/src/navigator/navigator-back-button/index.ts
deleted file mode 100644
index 9046e90350e278..00000000000000
--- a/packages/components/src/navigator/navigator-back-button/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as NavigatorBackButton } from './component';
diff --git a/packages/components/src/navigator/navigator-button/README.md b/packages/components/src/navigator/navigator-button/README.md
deleted file mode 100644
index 72154ec317da44..00000000000000
--- a/packages/components/src/navigator/navigator-button/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# `NavigatorButton`
-
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-
-The `NavigatorButton` component can be used to navigate to a screen and should be used in combination with the [`NavigatorProvider`](/packages/components/src/navigator/navigator-provider/README.md), the [`NavigatorScreen`](/packages/components/src/navigator/navigator-screen/README.md) and the [`NavigatorBackButton`](/packages/components/src/navigator/navigator-back-button/README.md) components (or the `useNavigator` hook).
-
-## Usage
-
-Refer to [the `NavigatorProvider` component](/packages/components/src/navigator/navigator-provider/README.md#usage) for a usage example.
-
-## Props
-
-The component accepts the following props:
-
-### `attributeName`: `string`
-
-The HTML attribute used to identify the `NavigatorButton`, which is used by `Navigator` to restore focus.
-
--   Required: No
--   Default: `id`
-
-### `onClick`: `React.MouseEventHandler< HTMLElement >`
-
-The callback called in response to a `click` event.
-
--   Required: No
-
-### `path`: `string`
-
-The path of the screen to navigate to. The value of this prop needs to be [a valid value for an HTML attribute](https://html.spec.whatwg.org/multipage/syntax.html#attributes-2).
-
--   Required: Yes
-
-### Inherited props
-
-`NavigatorButton` also inherits all of the [`Button` props](/packages/components/src/button/README.md#props), except for `href` and `target`.
diff --git a/packages/components/src/navigator/navigator-button/component.tsx b/packages/components/src/navigator/navigator-button/component.tsx
index 1b84a2315c04d3..a6dc7963376723 100644
--- a/packages/components/src/navigator/navigator-button/component.tsx
+++ b/packages/components/src/navigator/navigator-button/component.tsx
@@ -21,42 +21,7 @@ function UnconnectedNavigatorButton(
 	return <View ref={ forwardedRef } { ...navigatorButtonProps } />;
 }
 
-/**
- * The `NavigatorButton` component can be used to navigate to a screen and should
- * be used in combination with the `NavigatorProvider`, the `NavigatorScreen`
- * and the `NavigatorBackButton` components (or the `useNavigator` hook).
- *
- * @example
- * ```jsx
- * import {
- *   __experimentalNavigatorProvider as NavigatorProvider,
- *   __experimentalNavigatorScreen as NavigatorScreen,
- *   __experimentalNavigatorButton as NavigatorButton,
- *   __experimentalNavigatorBackButton as NavigatorBackButton,
- * } from '@wordpress/components';
- *
- * const MyNavigation = () => (
- *   <NavigatorProvider initialPath="/">
- *     <NavigatorScreen path="/">
- *       <p>This is the home screen.</p>
- *        <NavigatorButton path="/child">
- *          Navigate to child screen.
- *       </NavigatorButton>
- *     </NavigatorScreen>
- *
- *     <NavigatorScreen path="/child">
- *       <p>This is the child screen.</p>
- *       <NavigatorBackButton>
- *         Go back
- *       </NavigatorBackButton>
- *     </NavigatorScreen>
- *   </NavigatorProvider>
- * );
- * ```
- */
 export const NavigatorButton = contextConnect(
 	UnconnectedNavigatorButton,
-	'NavigatorButton'
+	'Navigator.Button'
 );
-
-export default NavigatorButton;
diff --git a/packages/components/src/navigator/navigator-button/hook.ts b/packages/components/src/navigator/navigator-button/hook.ts
index 3952dc3fd56ba5..59d2aaa65662d7 100644
--- a/packages/components/src/navigator/navigator-button/hook.ts
+++ b/packages/components/src/navigator/navigator-button/hook.ts
@@ -10,7 +10,7 @@ import { escapeAttribute } from '@wordpress/escape-html';
 import type { WordPressComponentProps } from '../../context';
 import { useContextSystem } from '../../context';
 import Button from '../../button';
-import useNavigator from '../use-navigator';
+import { useNavigator } from '../use-navigator';
 import type { NavigatorButtonProps } from '../types';
 
 const cssSelectorForAttribute = ( attrName: string, attrValue: string ) =>
@@ -25,7 +25,7 @@ export function useNavigatorButton(
 		as = Button,
 		attributeName = 'id',
 		...otherProps
-	} = useContextSystem( props, 'NavigatorButton' );
+	} = useContextSystem( props, 'Navigator.Button' );
 
 	const escapedPath = escapeAttribute( path );
 
diff --git a/packages/components/src/navigator/navigator-button/index.ts b/packages/components/src/navigator/navigator-button/index.ts
deleted file mode 100644
index 74975a5e1b0c14..00000000000000
--- a/packages/components/src/navigator/navigator-button/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as NavigatorButton } from './component';
diff --git a/packages/components/src/navigator/navigator-provider/README.md b/packages/components/src/navigator/navigator-provider/README.md
deleted file mode 100644
index 8be27a65101843..00000000000000
--- a/packages/components/src/navigator/navigator-provider/README.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# `NavigatorProvider`
-
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-
-The `NavigatorProvider` component allows rendering nested views/panels/menus (via the [`NavigatorScreen` component](/packages/components/src/navigator/navigator-screen/README.md)) and navigate between these different states (via the [`NavigatorButton`](/packages/components/src/navigator/navigator-button/README.md), [`NavigatorToParentButton`](/packages/components/src/navigator/navigator-to-parent-button/README.md) and [`NavigatorBackButton`](/packages/components/src/navigator/navigator-back-button/README.md) components or the `useNavigator` hook). The Global Styles sidebar is an example of this.
-
-## Usage
-
-```jsx
-import {
-  __experimentalNavigatorProvider as NavigatorProvider,
-  __experimentalNavigatorScreen as NavigatorScreen,
-  __experimentalNavigatorButton as NavigatorButton,
-  __experimentalNavigatorToParentButton as NavigatorToParentButton,
-} from '@wordpress/components';
-
-const MyNavigation = () => (
-  <NavigatorProvider initialPath="/">
-    <NavigatorScreen path="/">
-      <p>This is the home screen.</p>
-       <NavigatorButton path="/child">
-         Navigate to child screen.
-      </NavigatorButton>
-    </NavigatorScreen>
-
-    <NavigatorScreen path="/child">
-      <p>This is the child screen.</p>
-      <NavigatorToParentButton>
-        Go back
-      </NavigatorToParentButton>
-    </NavigatorScreen>
-  </NavigatorProvider>
-);
-```
-**Important note**
-
-Parent/child navigation only works if the path you define are hierarchical, following a URL-like scheme where each path segment is separated by the `/` character.
-For example:
-- `/` is the root of all paths. There should always be a screen with `path="/"`.
-- `/parent/child` is a child of `/parent`.
-- `/parent/child/grand-child` is a child of `/parent/child`.
-- `/parent/:param` is a child of `/parent` as well.
-
-## Props
-
-The component accepts the following props:
-
-### `initialPath`: `string`
-
-The initial active path.
-
--   Required: No
-
-## The `navigator` object
-
-You can retrieve a `navigator` instance by using the `useNavigator` hook.
-
-The `navigator` instance has a few properties:
-
-### `goTo`: `( path: string, options: NavigateOptions ) => void`
-
-The `goTo` function allows navigating to a given path. The second argument can augment the navigation operations with different options.
-
-The available options are:
-
-- `focusTargetSelector`: `string`. An optional property used to specify the CSS selector used to restore focus on the matching element when navigating back.
-- `isBack`: `boolean`. An optional property used to specify whether the navigation should be considered as backwards (thus enabling focus restoration when possible, and causing the animation to be backwards too)
-
-### `goToParent`: `() => void;`
-
-The `goToParent` function allows navigating to the parent screen.
-
-Parent/child navigation only works if the path you define are hierarchical (see note above).
-
-When a match is not found, the function will try to recursively navigate the path hierarchy until a matching screen (or the root `/`) are found.
-
-### `goBack`: `() => void`
-
-The `goBack` function allows navigating to the previous path.
-
-### `location`: `NavigatorLocation`
-
-The `location` object represent the current location, and has a few properties:
-
-- `path`: `string`. The path associated to the location.
-- `isBack`: `boolean`. A flag that is `true` when the current location was reached by navigating backwards in the location stack.
-- `isInitial`: `boolean`. A flag that is `true` only for the first (root) location in the location stack.
-
-### `params`: `Record< string, string | string[] >`
-
-The parsed record of parameters from the current location. For example if the current screen path is `/product/:productId` and the location is `/product/123`, then `params` will be `{ productId: '123' }`.
diff --git a/packages/components/src/navigator/navigator-provider/component.tsx b/packages/components/src/navigator/navigator-provider/component.tsx
deleted file mode 100644
index cccbb84f0d093a..00000000000000
--- a/packages/components/src/navigator/navigator-provider/component.tsx
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * External dependencies
- */
-import type { ForwardedRef } from 'react';
-import { css } from '@emotion/react';
-
-/**
- * WordPress dependencies
- */
-import {
-	useMemo,
-	useState,
-	useCallback,
-	useReducer,
-	useRef,
-	useEffect,
-} from '@wordpress/element';
-import isShallowEqual from '@wordpress/is-shallow-equal';
-
-/**
- * Internal dependencies
- */
-import type { WordPressComponentProps } from '../../context';
-import { contextConnect, useContextSystem } from '../../context';
-import { useCx } from '../../utils/hooks/use-cx';
-import { View } from '../../view';
-import { NavigatorContext } from '../context';
-import type {
-	NavigatorProviderProps,
-	NavigatorLocation,
-	NavigatorContext as NavigatorContextType,
-	Screen,
-} from '../types';
-import { patternMatch, findParent } from '../utils/router';
-
-type MatchedPath = ReturnType< typeof patternMatch >;
-type ScreenAction = { type: string; screen: Screen };
-
-const MAX_HISTORY_LENGTH = 50;
-
-function screensReducer(
-	state: Screen[] = [],
-	action: ScreenAction
-): Screen[] {
-	switch ( action.type ) {
-		case 'add':
-			return [ ...state, action.screen ];
-		case 'remove':
-			return state.filter( ( s: Screen ) => s.id !== action.screen.id );
-	}
-
-	return state;
-}
-
-function UnconnectedNavigatorProvider(
-	props: WordPressComponentProps< NavigatorProviderProps, 'div' >,
-	forwardedRef: ForwardedRef< any >
-) {
-	const { initialPath, children, className, ...otherProps } =
-		useContextSystem( props, 'NavigatorProvider' );
-
-	const [ locationHistory, setLocationHistory ] = useState<
-		NavigatorLocation[]
-	>( [
-		{
-			path: initialPath,
-		},
-	] );
-	const currentLocationHistory = useRef< NavigatorLocation[] >( [] );
-	const [ screens, dispatch ] = useReducer( screensReducer, [] );
-	const currentScreens = useRef< Screen[] >( [] );
-	useEffect( () => {
-		currentScreens.current = screens;
-	}, [ screens ] );
-	useEffect( () => {
-		currentLocationHistory.current = locationHistory;
-	}, [ locationHistory ] );
-	const currentMatch = useRef< MatchedPath >();
-	const matchedPath = useMemo( () => {
-		let currentPath: string | undefined;
-		if (
-			locationHistory.length === 0 ||
-			( currentPath =
-				locationHistory[ locationHistory.length - 1 ].path ) ===
-				undefined
-		) {
-			currentMatch.current = undefined;
-			return undefined;
-		}
-
-		const resolvePath = ( path: string ) => {
-			const newMatch = patternMatch( path, screens );
-
-			// If the new match is the same as the current match,
-			// return the previous one for performance reasons.
-			if (
-				currentMatch.current &&
-				newMatch &&
-				isShallowEqual(
-					newMatch.params,
-					currentMatch.current.params
-				) &&
-				newMatch.id === currentMatch.current.id
-			) {
-				return currentMatch.current;
-			}
-
-			return newMatch;
-		};
-
-		const newMatch = resolvePath( currentPath );
-		currentMatch.current = newMatch;
-		return newMatch;
-	}, [ screens, locationHistory ] );
-
-	const addScreen = useCallback(
-		( screen: Screen ) => dispatch( { type: 'add', screen } ),
-		[]
-	);
-
-	const removeScreen = useCallback(
-		( screen: Screen ) => dispatch( { type: 'remove', screen } ),
-		[]
-	);
-
-	const goBack: NavigatorContextType[ 'goBack' ] = useCallback( () => {
-		setLocationHistory( ( prevLocationHistory ) => {
-			if ( prevLocationHistory.length <= 1 ) {
-				return prevLocationHistory;
-			}
-			return [
-				...prevLocationHistory.slice( 0, -2 ),
-				{
-					...prevLocationHistory[ prevLocationHistory.length - 2 ],
-					isBack: true,
-					hasRestoredFocus: false,
-				},
-			];
-		} );
-	}, [] );
-
-	const goTo: NavigatorContextType[ 'goTo' ] = useCallback(
-		( path, options = {} ) => {
-			const {
-				focusTargetSelector,
-				isBack = false,
-				skipFocus = false,
-				replace = false,
-				...restOptions
-			} = options;
-
-			const isNavigatingToPreviousPath =
-				isBack &&
-				currentLocationHistory.current.length > 1 &&
-				currentLocationHistory.current[
-					currentLocationHistory.current.length - 2
-				].path === path;
-
-			if ( isNavigatingToPreviousPath ) {
-				goBack();
-				return;
-			}
-
-			setLocationHistory( ( prevLocationHistory ) => {
-				const newLocation = {
-					...restOptions,
-					path,
-					isBack,
-					hasRestoredFocus: false,
-					skipFocus,
-				};
-
-				if ( prevLocationHistory.length === 0 ) {
-					return replace ? [] : [ newLocation ];
-				}
-
-				const newLocationHistory = prevLocationHistory.slice(
-					prevLocationHistory.length > MAX_HISTORY_LENGTH - 1 ? 1 : 0,
-					-1
-				);
-
-				if ( ! replace ) {
-					newLocationHistory.push(
-						// Assign `focusTargetSelector` to the previous location in history
-						// (the one we just navigated from).
-						{
-							...prevLocationHistory[
-								prevLocationHistory.length - 1
-							],
-							focusTargetSelector,
-						}
-					);
-				}
-
-				newLocationHistory.push( newLocation );
-
-				return newLocationHistory;
-			} );
-		},
-		[ goBack ]
-	);
-
-	const goToParent: NavigatorContextType[ 'goToParent' ] = useCallback(
-		( options = {} ) => {
-			const currentPath =
-				currentLocationHistory.current[
-					currentLocationHistory.current.length - 1
-				].path;
-			if ( currentPath === undefined ) {
-				return;
-			}
-			const parentPath = findParent(
-				currentPath,
-				currentScreens.current
-			);
-			if ( parentPath === undefined ) {
-				return;
-			}
-			goTo( parentPath, { ...options, isBack: true } );
-		},
-		[ goTo ]
-	);
-
-	const navigatorContextValue: NavigatorContextType = useMemo(
-		() => ( {
-			location: {
-				...locationHistory[ locationHistory.length - 1 ],
-				isInitial: locationHistory.length === 1,
-			},
-			params: matchedPath ? matchedPath.params : {},
-			match: matchedPath ? matchedPath.id : undefined,
-			goTo,
-			goBack,
-			goToParent,
-			addScreen,
-			removeScreen,
-		} ),
-		[
-			locationHistory,
-			matchedPath,
-			goTo,
-			goBack,
-			goToParent,
-			addScreen,
-			removeScreen,
-		]
-	);
-
-	const cx = useCx();
-	const classes = useMemo(
-		// Prevents horizontal overflow while animating screen transitions.
-		() => cx( css( { overflowX: 'hidden' } ), className ),
-		[ className, cx ]
-	);
-
-	return (
-		<View ref={ forwardedRef } className={ classes } { ...otherProps }>
-			<NavigatorContext.Provider value={ navigatorContextValue }>
-				{ children }
-			</NavigatorContext.Provider>
-		</View>
-	);
-}
-
-/**
- * The `NavigatorProvider` component allows rendering nested views/panels/menus
- * (via the `NavigatorScreen` component and navigate between these different
- * view (via the `NavigatorButton` and `NavigatorBackButton` components or the
- * `useNavigator` hook).
- *
- * ```jsx
- * import {
- *   __experimentalNavigatorProvider as NavigatorProvider,
- *   __experimentalNavigatorScreen as NavigatorScreen,
- *   __experimentalNavigatorButton as NavigatorButton,
- *   __experimentalNavigatorBackButton as NavigatorBackButton,
- * } from '@wordpress/components';
- *
- * const MyNavigation = () => (
- *   <NavigatorProvider initialPath="/">
- *     <NavigatorScreen path="/">
- *       <p>This is the home screen.</p>
- *        <NavigatorButton path="/child">
- *          Navigate to child screen.
- *       </NavigatorButton>
- *     </NavigatorScreen>
- *
- *     <NavigatorScreen path="/child">
- *       <p>This is the child screen.</p>
- *       <NavigatorBackButton>
- *         Go back
- *       </NavigatorBackButton>
- *     </NavigatorScreen>
- *   </NavigatorProvider>
- * );
- * ```
- */
-export const NavigatorProvider = contextConnect(
-	UnconnectedNavigatorProvider,
-	'NavigatorProvider'
-);
-
-export default NavigatorProvider;
diff --git a/packages/components/src/navigator/navigator-provider/index.ts b/packages/components/src/navigator/navigator-provider/index.ts
deleted file mode 100644
index b9a330613ac847..00000000000000
--- a/packages/components/src/navigator/navigator-provider/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as NavigatorProvider } from './component';
diff --git a/packages/components/src/navigator/navigator-screen/README.md b/packages/components/src/navigator/navigator-screen/README.md
deleted file mode 100644
index 5ba5af44fe8c1a..00000000000000
--- a/packages/components/src/navigator/navigator-screen/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# `NavigatorScreen`
-
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-
-The `NavigatorScreen` component represents a single view/screen/panel and should be used in combination with the [`NavigatorProvider`](/packages/components/src/navigator/navigator-provider/README.md), the [`NavigatorButton`](/packages/components/src/navigator/navigator-button/README.md) and the [`NavigatorBackButton`](/packages/components/src/navigator/navigator-back-button/README.md) components (or the `useNavigator` hook).
-
-## Usage
-
-Refer to [the `NavigatorProvider` component](/packages/components/src/navigator/navigator-provider/README.md#usage) for a usage example.
-
-## Props
-
-The component accepts the following props:
-
-### `path`: `string`
-
-The screen's path, matched against the current path stored in the navigator.
-
--   Required: Yes
diff --git a/packages/components/src/navigator/navigator-screen/component.tsx b/packages/components/src/navigator/navigator-screen/component.tsx
index ed4ab9629d3a8d..fe0d81b90a17be 100644
--- a/packages/components/src/navigator/navigator-screen/component.tsx
+++ b/packages/components/src/navigator/navigator-screen/component.tsx
@@ -2,11 +2,6 @@
  * External dependencies
  */
 import type { ForwardedRef } from 'react';
-// eslint-disable-next-line no-restricted-imports
-import type { MotionProps } from 'framer-motion';
-// eslint-disable-next-line no-restricted-imports
-import { motion } from 'framer-motion';
-import { css } from '@emotion/react';
 
 /**
  * WordPress dependencies
@@ -19,9 +14,9 @@ import {
 	useRef,
 	useId,
 } from '@wordpress/element';
-import { useReducedMotion, useMergeRefs } from '@wordpress/compose';
-import { isRTL } from '@wordpress/i18n';
+import { useMergeRefs } from '@wordpress/compose';
 import { escapeAttribute } from '@wordpress/escape-html';
+import warning from '@wordpress/warning';
 
 /**
  * Internal dependencies
@@ -31,36 +26,39 @@ import { contextConnect, useContextSystem } from '../../context';
 import { useCx } from '../../utils/hooks/use-cx';
 import { View } from '../../view';
 import { NavigatorContext } from '../context';
+import * as styles from '../styles';
 import type { NavigatorScreenProps } from '../types';
-
-const animationEnterDelay = 0;
-const animationEnterDuration = 0.14;
-const animationExitDuration = 0.14;
-const animationExitDelay = 0;
-
-// Props specific to `framer-motion` can't be currently passed to `NavigatorScreen`,
-// as some of them would overlap with HTML props (e.g. `onAnimationStart`, ...)
-type Props = Omit<
-	WordPressComponentProps< NavigatorScreenProps, 'div', false >,
-	Exclude< keyof MotionProps, 'style' | 'children' >
->;
+import { useScreenAnimatePresence } from './use-screen-animate-presence';
 
 function UnconnectedNavigatorScreen(
-	props: Props,
+	props: WordPressComponentProps< NavigatorScreenProps, 'div', false >,
 	forwardedRef: ForwardedRef< any >
 ) {
+	if ( ! /^\//.test( props.path ) ) {
+		warning(
+			'wp.components.Navigator.Screen: the `path` should follow a URL-like scheme; it should start with and be separated by the `/` character.'
+		);
+	}
+
 	const screenId = useId();
-	const { children, className, path, ...otherProps } = useContextSystem(
-		props,
-		'NavigatorScreen'
-	);
 
-	const prefersReducedMotion = useReducedMotion();
+	const {
+		children,
+		className,
+		path,
+		onAnimationEnd: onAnimationEndProp,
+		...otherProps
+	} = useContextSystem( props, 'Navigator.Screen' );
+
 	const { location, match, addScreen, removeScreen } =
 		useContext( NavigatorContext );
+	const { isInitial, isBack, focusTargetSelector, skipFocus } = location;
+
 	const isMatch = match === screenId;
 	const wrapperRef = useRef< HTMLDivElement >( null );
+	const skipAnimationAndFocusRestoration = !! isInitial && ! isBack;
 
+	// Register / unregister screen with the navigator context.
 	useEffect( () => {
 		const screen = {
 			id: screenId,
@@ -70,30 +68,28 @@ function UnconnectedNavigatorScreen(
 		return () => removeScreen( screen );
 	}, [ screenId, path, addScreen, removeScreen ] );
 
+	// Animation.
+	const { animationStyles, shouldRenderScreen, screenProps } =
+		useScreenAnimatePresence( {
+			isMatch,
+			isBack,
+			onAnimationEnd: onAnimationEndProp,
+			skipAnimation: skipAnimationAndFocusRestoration,
+		} );
+
 	const cx = useCx();
 	const classes = useMemo(
-		() =>
-			cx(
-				css( {
-					// Ensures horizontal overflow is visually accessible.
-					overflowX: 'auto',
-					// In case the root has a height, it should not be exceeded.
-					maxHeight: '100%',
-				} ),
-				className
-			),
-		[ className, cx ]
+		() => cx( styles.navigatorScreen, animationStyles, className ),
+		[ className, cx, animationStyles ]
 	);
 
+	// Focus restoration
 	const locationRef = useRef( location );
-
 	useEffect( () => {
 		locationRef.current = location;
 	}, [ location ] );
-
-	// Focus restoration
-	const isInitialLocation = location.isInitial && ! location.isBack;
 	useEffect( () => {
+		const wrapperEl = wrapperRef.current;
 		// Only attempt to restore focus:
 		// - if the current location is not the initial one (to avoid moving focus on page load)
 		// - when the screen becomes visible
@@ -101,20 +97,20 @@ function UnconnectedNavigatorScreen(
 		// - if focus hasn't already been restored for the current location
 		// - if the `skipFocus` option is not set to `true`. This is useful when we trigger the navigation outside of NavigatorScreen.
 		if (
-			isInitialLocation ||
+			skipAnimationAndFocusRestoration ||
 			! isMatch ||
-			! wrapperRef.current ||
+			! wrapperEl ||
 			locationRef.current.hasRestoredFocus ||
-			location.skipFocus
+			skipFocus
 		) {
 			return;
 		}
 
-		const activeElement = wrapperRef.current.ownerDocument.activeElement;
+		const activeElement = wrapperEl.ownerDocument.activeElement;
 
 		// If an element is already focused within the wrapper do not focus the
 		// element. This prevents inputs or buttons from losing focus unnecessarily.
-		if ( wrapperRef.current.contains( activeElement ) ) {
+		if ( wrapperEl.contains( activeElement ) ) {
 			return;
 		}
 
@@ -122,139 +118,42 @@ function UnconnectedNavigatorScreen(
 
 		// When navigating back, if a selector is provided, use it to look for the
 		// target element (assumed to be a node inside the current NavigatorScreen)
-		if ( location.isBack && location?.focusTargetSelector ) {
-			elementToFocus = wrapperRef.current.querySelector(
-				location.focusTargetSelector
-			);
+		if ( isBack && focusTargetSelector ) {
+			elementToFocus = wrapperEl.querySelector( focusTargetSelector );
 		}
 
 		// If the previous query didn't run or find any element to focus, fallback
 		// to the first tabbable element in the screen (or the screen itself).
 		if ( ! elementToFocus ) {
-			const firstTabbable = (
-				focus.tabbable.find( wrapperRef.current ) as HTMLElement[]
-			 )[ 0 ];
-			elementToFocus = firstTabbable ?? wrapperRef.current;
+			const [ firstTabbable ] = focus.tabbable.find( wrapperEl );
+			elementToFocus = firstTabbable ?? wrapperEl;
 		}
 
 		locationRef.current.hasRestoredFocus = true;
 		elementToFocus.focus();
 	}, [
-		isInitialLocation,
+		skipAnimationAndFocusRestoration,
 		isMatch,
-		location.isBack,
-		location.focusTargetSelector,
-		location.skipFocus,
+		isBack,
+		focusTargetSelector,
+		skipFocus,
 	] );
 
 	const mergedWrapperRef = useMergeRefs( [ forwardedRef, wrapperRef ] );
 
-	if ( ! isMatch ) {
-		return null;
-	}
-
-	if ( prefersReducedMotion ) {
-		return (
-			<View
-				ref={ mergedWrapperRef }
-				className={ classes }
-				{ ...otherProps }
-			>
-				{ children }
-			</View>
-		);
-	}
-
-	const animate = {
-		opacity: 1,
-		transition: {
-			delay: animationEnterDelay,
-			duration: animationEnterDuration,
-			ease: 'easeInOut',
-		},
-		x: 0,
-	};
-	// Disable the initial animation if the screen is the very first screen to be
-	// rendered within the current `NavigatorProvider`.
-	const initial =
-		location.isInitial && ! location.isBack
-			? false
-			: {
-					opacity: 0,
-					x:
-						( isRTL() && location.isBack ) ||
-						( ! isRTL() && ! location.isBack )
-							? 50
-							: -50,
-			  };
-	const exit = {
-		delay: animationExitDelay,
-		opacity: 0,
-		x:
-			( ! isRTL() && location.isBack ) || ( isRTL() && ! location.isBack )
-				? 50
-				: -50,
-		transition: {
-			duration: animationExitDuration,
-			ease: 'easeInOut',
-		},
-	};
-
-	const animatedProps = {
-		animate,
-		exit,
-		initial,
-	};
-
-	return (
-		<motion.div
+	return shouldRenderScreen ? (
+		<View
 			ref={ mergedWrapperRef }
 			className={ classes }
+			{ ...screenProps }
 			{ ...otherProps }
-			{ ...animatedProps }
 		>
 			{ children }
-		</motion.div>
-	);
+		</View>
+	) : null;
 }
 
-/**
- * The `NavigatorScreen` component represents a single view/screen/panel and
- * should be used in combination with the `NavigatorProvider`, the
- * `NavigatorButton` and the `NavigatorBackButton` components (or the `useNavigator`
- * hook).
- *
- * @example
- * ```jsx
- * import {
- *   __experimentalNavigatorProvider as NavigatorProvider,
- *   __experimentalNavigatorScreen as NavigatorScreen,
- *   __experimentalNavigatorButton as NavigatorButton,
- *   __experimentalNavigatorBackButton as NavigatorBackButton,
- * } from '@wordpress/components';
- *
- * const MyNavigation = () => (
- *   <NavigatorProvider initialPath="/">
- *     <NavigatorScreen path="/">
- *       <p>This is the home screen.</p>
- *        <NavigatorButton path="/child">
- *          Navigate to child screen.
- *       </NavigatorButton>
- *     </NavigatorScreen>
- *
- *     <NavigatorScreen path="/child">
- *       <p>This is the child screen.</p>
- *       <NavigatorBackButton>
- *         Go back
- *       </NavigatorBackButton>
- *     </NavigatorScreen>
- *   </NavigatorProvider>
- * );
- * ```
- */
 export const NavigatorScreen = contextConnect(
 	UnconnectedNavigatorScreen,
-	'NavigatorScreen'
+	'Navigator.Screen'
 );
-
-export default NavigatorScreen;
diff --git a/packages/components/src/navigator/navigator-screen/index.ts b/packages/components/src/navigator/navigator-screen/index.ts
deleted file mode 100644
index 9c9a40d435fff3..00000000000000
--- a/packages/components/src/navigator/navigator-screen/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as NavigatorScreen } from './component';
diff --git a/packages/components/src/navigator/navigator-screen/use-screen-animate-presence.ts b/packages/components/src/navigator/navigator-screen/use-screen-animate-presence.ts
new file mode 100644
index 00000000000000..af5a47ee12df4c
--- /dev/null
+++ b/packages/components/src/navigator/navigator-screen/use-screen-animate-presence.ts
@@ -0,0 +1,177 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	useState,
+	useEffect,
+	useLayoutEffect,
+	useCallback,
+} from '@wordpress/element';
+import { useReducedMotion } from '@wordpress/compose';
+import { isRTL as isRTLFn } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import * as styles from '../styles';
+
+// Possible values:
+// - 'INITIAL': the initial state
+// - 'ANIMATING_IN': start enter animation
+// - 'IN': enter animation has ended
+// - 'ANIMATING_OUT': start exit animation
+// - 'OUT': the exit animation has ended
+type AnimationStatus =
+	| 'INITIAL'
+	| 'ANIMATING_IN'
+	| 'IN'
+	| 'ANIMATING_OUT'
+	| 'OUT';
+
+// Allow an extra 20% of the total animation duration to account for potential
+// event loop delays.
+const ANIMATION_TIMEOUT_MARGIN = 1.2;
+
+const isEnterAnimation = (
+	animationDirection: 'end' | 'start',
+	animationStatus: AnimationStatus,
+	animationName: string
+) =>
+	animationStatus === 'ANIMATING_IN' &&
+	animationName === styles.ANIMATION_END_NAMES[ animationDirection ].in;
+
+const isExitAnimation = (
+	animationDirection: 'end' | 'start',
+	animationStatus: AnimationStatus,
+	animationName: string
+) =>
+	animationStatus === 'ANIMATING_OUT' &&
+	animationName === styles.ANIMATION_END_NAMES[ animationDirection ].out;
+
+export function useScreenAnimatePresence( {
+	isMatch,
+	skipAnimation,
+	isBack,
+	onAnimationEnd,
+}: {
+	isMatch: boolean;
+	skipAnimation: boolean;
+	isBack?: boolean;
+	onAnimationEnd?: React.AnimationEventHandler< Element >;
+} ) {
+	const isRTL = isRTLFn();
+	const prefersReducedMotion = useReducedMotion();
+
+	const [ animationStatus, setAnimationStatus ] =
+		useState< AnimationStatus >( 'INITIAL' );
+
+	// Start enter and exit animations when the screen is selected or deselected.
+	// The animation status is set to `IN` or `OUT` immediately if the animation
+	// should be skipped.
+	const becameSelected =
+		animationStatus !== 'ANIMATING_IN' &&
+		animationStatus !== 'IN' &&
+		isMatch;
+	const becameUnselected =
+		animationStatus !== 'ANIMATING_OUT' &&
+		animationStatus !== 'OUT' &&
+		! isMatch;
+	useLayoutEffect( () => {
+		if ( becameSelected ) {
+			setAnimationStatus(
+				skipAnimation || prefersReducedMotion ? 'IN' : 'ANIMATING_IN'
+			);
+		} else if ( becameUnselected ) {
+			setAnimationStatus(
+				skipAnimation || prefersReducedMotion ? 'OUT' : 'ANIMATING_OUT'
+			);
+		}
+	}, [
+		becameSelected,
+		becameUnselected,
+		skipAnimation,
+		prefersReducedMotion,
+	] );
+
+	// Animation attributes (derived state).
+	const animationDirection =
+		( isRTL && isBack ) || ( ! isRTL && ! isBack ) ? 'end' : 'start';
+	const isAnimatingIn = animationStatus === 'ANIMATING_IN';
+	const isAnimatingOut = animationStatus === 'ANIMATING_OUT';
+	let animationType: 'in' | 'out' | undefined;
+	if ( isAnimatingIn ) {
+		animationType = 'in';
+	} else if ( isAnimatingOut ) {
+		animationType = 'out';
+	}
+
+	const onScreenAnimationEnd = useCallback(
+		( e: React.AnimationEvent< HTMLElement > ) => {
+			onAnimationEnd?.( e );
+
+			if (
+				isExitAnimation(
+					animationDirection,
+					animationStatus,
+					e.animationName
+				)
+			) {
+				// When the exit animation ends on an unselected screen, set the
+				// status to 'OUT' to remove the screen contents from the DOM.
+				setAnimationStatus( 'OUT' );
+			} else if (
+				isEnterAnimation(
+					animationDirection,
+					animationStatus,
+					e.animationName
+				)
+			) {
+				// When the enter animation ends on a selected screen, set the
+				// status to 'IN' to ensure the screen is rendered in the DOM.
+				setAnimationStatus( 'IN' );
+			}
+		},
+		[ onAnimationEnd, animationStatus, animationDirection ]
+	);
+
+	// Fallback timeout to ensure that the logic is applied even if the
+	// `animationend` event is not triggered.
+	useEffect( () => {
+		let animationTimeout: number | undefined;
+
+		if ( isAnimatingOut ) {
+			animationTimeout = window.setTimeout( () => {
+				setAnimationStatus( 'OUT' );
+				animationTimeout = undefined;
+			}, styles.TOTAL_ANIMATION_DURATION.OUT * ANIMATION_TIMEOUT_MARGIN );
+		} else if ( isAnimatingIn ) {
+			animationTimeout = window.setTimeout( () => {
+				setAnimationStatus( 'IN' );
+				animationTimeout = undefined;
+			}, styles.TOTAL_ANIMATION_DURATION.IN * ANIMATION_TIMEOUT_MARGIN );
+		}
+
+		return () => {
+			if ( animationTimeout ) {
+				window.clearTimeout( animationTimeout );
+				animationTimeout = undefined;
+			}
+		};
+	}, [ isAnimatingOut, isAnimatingIn ] );
+
+	return {
+		animationStyles: styles.navigatorScreenAnimation,
+		// Render the screen's contents in the DOM not only when the screen is
+		// selected, but also while it is animating out.
+		shouldRenderScreen:
+			isMatch ||
+			animationStatus === 'IN' ||
+			animationStatus === 'ANIMATING_OUT',
+		screenProps: {
+			onAnimationEnd: onScreenAnimationEnd,
+			'data-animation-direction': animationDirection,
+			'data-animation-type': animationType,
+			'data-skip-animation': skipAnimation || undefined,
+		},
+	} as const;
+}
diff --git a/packages/components/src/navigator/navigator-to-parent-button/README.md b/packages/components/src/navigator/navigator-to-parent-button/README.md
deleted file mode 100644
index 62dacc3dfa4ea5..00000000000000
--- a/packages/components/src/navigator/navigator-to-parent-button/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# `NavigatorToParentButton`
-
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-
-The `NavigatorToParentButton` component can be used to navigate to a screen and should be used in combination with the [`NavigatorProvider`](/packages/components/src/navigator/navigator-provider/README.md), the [`NavigatorScreen`](/packages/components/src/navigator/navigator-screen/README.md) and the [`NavigatorButton`](/packages/components/src/navigator/navigator-button/README.md) components (or the `useNavigator` hook).
-
-## Usage
-
-Refer to [the `NavigatorProvider` component](/packages/components/src/navigator/navigator-provider/README.md#usage) for a usage example.
-
-### Inherited props
-
-`NavigatorToParentButton` also inherits all of the [`Button` props](/packages/components/src/button/README.md#props), except for `href` and `target`.
diff --git a/packages/components/src/navigator/navigator-to-parent-button/component.tsx b/packages/components/src/navigator/navigator-to-parent-button/component.tsx
index e73a3619f3d494..f1c2d27e2284a1 100644
--- a/packages/components/src/navigator/navigator-to-parent-button/component.tsx
+++ b/packages/components/src/navigator/navigator-to-parent-button/component.tsx
@@ -1,66 +1,32 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import type { ForwardedRef } from 'react';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
+import { NavigatorBackButton } from '../navigator-back-button/component';
 import type { WordPressComponentProps } from '../../context';
 import { contextConnect } from '../../context';
-import { View } from '../../view';
-import { useNavigatorBackButton } from '../navigator-back-button/hook';
-import type { NavigatorToParentButtonProps } from '../types';
+import type { NavigatorBackButtonProps } from '../types';
 
 function UnconnectedNavigatorToParentButton(
-	props: WordPressComponentProps< NavigatorToParentButtonProps, 'button' >,
-	forwardedRef: ForwardedRef< any >
+	props: WordPressComponentProps< NavigatorBackButtonProps, 'button' >,
+	forwardedRef: React.ForwardedRef< any >
 ) {
-	const navigatorToParentButtonProps = useNavigatorBackButton( {
-		...props,
-		goToParent: true,
+	deprecated( 'wp.components.NavigatorToParentButton', {
+		since: '6.7',
+		alternative: 'wp.components.Navigator.BackButton',
 	} );
 
-	return <View ref={ forwardedRef } { ...navigatorToParentButtonProps } />;
+	return <NavigatorBackButton ref={ forwardedRef } { ...props } />;
 }
 
-/*
- * The `NavigatorToParentButton` component can be used to navigate to a screen and
- * should be used in combination with the `NavigatorProvider`, the
- * `NavigatorScreen` and the `NavigatorButton` components (or the `useNavigator`
- * hook).
- *
- * @example
- * ```jsx
- * import {
- *   __experimentalNavigatorProvider as NavigatorProvider,
- *   __experimentalNavigatorScreen as NavigatorScreen,
- *   __experimentalNavigatorButton as NavigatorButton,
- *   __experimentalNavigatorToParentButton as NavigatorToParentButton,
- * } from '@wordpress/components';
- *
- * const MyNavigation = () => (
- *   <NavigatorProvider initialPath="/">
- *     <NavigatorScreen path="/">
- *       <p>This is the home screen.</p>
- *        <NavigatorButton path="/child">
- *          Navigate to child screen.
- *       </NavigatorButton>
- *     </NavigatorScreen>
- *
- *     <NavigatorScreen path="/child">
- *       <p>This is the child screen.</p>
- *       <NavigatorToParentButton>
- *         Go to parent
- *       </NavigatorToParentButton>
- *     </NavigatorScreen>
- *   </NavigatorProvider>
- * );
- * ```
+/**
+ * @deprecated
  */
 export const NavigatorToParentButton = contextConnect(
 	UnconnectedNavigatorToParentButton,
-	'NavigatorToParentButton'
+	'Navigator.ToParentButton'
 );
-
-export default NavigatorToParentButton;
diff --git a/packages/components/src/navigator/navigator-to-parent-button/index.ts b/packages/components/src/navigator/navigator-to-parent-button/index.ts
deleted file mode 100644
index f5218e456065e6..00000000000000
--- a/packages/components/src/navigator/navigator-to-parent-button/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as NavigatorToParentButton } from './component';
diff --git a/packages/components/src/navigator/navigator/component.tsx b/packages/components/src/navigator/navigator/component.tsx
new file mode 100644
index 00000000000000..bd49b3682fb144
--- /dev/null
+++ b/packages/components/src/navigator/navigator/component.tsx
@@ -0,0 +1,291 @@
+/**
+ * External dependencies
+ */
+import type { ForwardedRef } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import { useMemo, useReducer } from '@wordpress/element';
+import isShallowEqual from '@wordpress/is-shallow-equal';
+import warning from '@wordpress/warning';
+
+/**
+ * Internal dependencies
+ */
+import type { WordPressComponentProps } from '../../context';
+import { contextConnect, useContextSystem } from '../../context';
+import { useCx } from '../../utils/hooks/use-cx';
+import { patternMatch, findParent } from '../utils/router';
+import { View } from '../../view';
+import { NavigatorContext } from '../context';
+import * as styles from '../styles';
+import type {
+	NavigatorProps,
+	NavigatorLocation,
+	NavigatorContext as NavigatorContextType,
+	NavigateOptions,
+	Screen,
+	NavigateToParentOptions,
+} from '../types';
+import deprecated from '@wordpress/deprecated';
+
+type MatchedPath = ReturnType< typeof patternMatch >;
+
+type RouterAction =
+	| { type: 'add' | 'remove'; screen: Screen }
+	| { type: 'goto'; path: string; options?: NavigateOptions }
+	| { type: 'gotoparent'; options?: NavigateToParentOptions };
+
+type RouterState = {
+	initialPath: string;
+	screens: Screen[];
+	currentLocation: NavigatorLocation;
+	matchedPath: MatchedPath;
+	focusSelectors: Map< string, string >;
+};
+
+function addScreen( { screens }: RouterState, screen: Screen ) {
+	if ( screens.some( ( s ) => s.path === screen.path ) ) {
+		warning(
+			`Navigator: a screen with path ${ screen.path } already exists.
+The screen with id ${ screen.id } will not be added.`
+		);
+		return screens;
+	}
+	return [ ...screens, screen ];
+}
+
+function removeScreen( { screens }: RouterState, screen: Screen ) {
+	return screens.filter( ( s ) => s.id !== screen.id );
+}
+
+function goTo(
+	state: RouterState,
+	path: string,
+	options: NavigateOptions = {}
+) {
+	const { focusSelectors } = state;
+	const currentLocation = { ...state.currentLocation };
+
+	const {
+		// Default assignments
+		isBack = false,
+		skipFocus = false,
+		// Extract to avoid forwarding
+		replace,
+		focusTargetSelector,
+		// Rest
+		...restOptions
+	} = options;
+
+	if ( currentLocation.path === path ) {
+		return { currentLocation, focusSelectors };
+	}
+
+	let focusSelectorsCopy: typeof focusSelectors | undefined;
+	function getFocusSelectorsCopy() {
+		focusSelectorsCopy =
+			focusSelectorsCopy ?? new Map( state.focusSelectors );
+		return focusSelectorsCopy;
+	}
+
+	// Set a focus selector that will be used when navigating
+	// back to the current location.
+	if ( focusTargetSelector && currentLocation.path ) {
+		getFocusSelectorsCopy().set(
+			currentLocation.path,
+			focusTargetSelector
+		);
+	}
+
+	// Get the focus selector for the new location.
+	let currentFocusSelector;
+	if ( focusSelectors.get( path ) ) {
+		if ( isBack ) {
+			// Use the found focus selector only when navigating back.
+			currentFocusSelector = focusSelectors.get( path );
+		}
+		// Make a copy of the focusSelectors map to remove the focus selector
+		// only if necessary (ie. a focus selector was found).
+		getFocusSelectorsCopy().delete( path );
+	}
+
+	return {
+		currentLocation: {
+			...restOptions,
+			isInitial: false,
+			path,
+			isBack,
+			hasRestoredFocus: false,
+			focusTargetSelector: currentFocusSelector,
+			skipFocus,
+		},
+		focusSelectors: focusSelectorsCopy ?? focusSelectors,
+	};
+}
+
+function goToParent(
+	state: RouterState,
+	options: NavigateToParentOptions = {}
+) {
+	const { screens, focusSelectors } = state;
+	const currentLocation = { ...state.currentLocation };
+	const currentPath = currentLocation.path;
+	if ( currentPath === undefined ) {
+		return { currentLocation, focusSelectors };
+	}
+	const parentPath = findParent( currentPath, screens );
+	if ( parentPath === undefined ) {
+		return { currentLocation, focusSelectors };
+	}
+	return goTo( state, parentPath, {
+		...options,
+		isBack: true,
+	} );
+}
+
+function routerReducer(
+	state: RouterState,
+	action: RouterAction
+): RouterState {
+	let {
+		screens,
+		currentLocation,
+		matchedPath,
+		focusSelectors,
+		...restState
+	} = state;
+	switch ( action.type ) {
+		case 'add':
+			screens = addScreen( state, action.screen );
+			break;
+		case 'remove':
+			screens = removeScreen( state, action.screen );
+			break;
+		case 'goto':
+			( { currentLocation, focusSelectors } = goTo(
+				state,
+				action.path,
+				action.options
+			) );
+			break;
+		case 'gotoparent':
+			( { currentLocation, focusSelectors } = goToParent(
+				state,
+				action.options
+			) );
+			break;
+	}
+
+	// Return early in case there is no change
+	if (
+		screens === state.screens &&
+		currentLocation === state.currentLocation
+	) {
+		return state;
+	}
+
+	// Compute the matchedPath
+	const currentPath = currentLocation.path;
+	matchedPath =
+		currentPath !== undefined
+			? patternMatch( currentPath, screens )
+			: undefined;
+
+	// If the new match is the same as the previous match,
+	// return the previous one to keep immutability.
+	if (
+		matchedPath &&
+		state.matchedPath &&
+		matchedPath.id === state.matchedPath.id &&
+		isShallowEqual( matchedPath.params, state.matchedPath.params )
+	) {
+		matchedPath = state.matchedPath;
+	}
+
+	return {
+		...restState,
+		screens,
+		currentLocation,
+		matchedPath,
+		focusSelectors,
+	};
+}
+
+function UnconnectedNavigator(
+	props: WordPressComponentProps< NavigatorProps, 'div' >,
+	forwardedRef: ForwardedRef< any >
+) {
+	const {
+		initialPath: initialPathProp,
+		children,
+		className,
+		...otherProps
+	} = useContextSystem( props, 'Navigator' );
+
+	const [ routerState, dispatch ] = useReducer(
+		routerReducer,
+		initialPathProp,
+		( path ) => ( {
+			screens: [],
+			currentLocation: { path, isInitial: true },
+			matchedPath: undefined,
+			focusSelectors: new Map(),
+			initialPath: initialPathProp,
+		} )
+	);
+
+	// The methods are constant forever, create stable references to them.
+	const methods = useMemo(
+		() => ( {
+			// Note: calling goBack calls `goToParent` internally, as it was established
+			// that `goBack` should behave like `goToParent`, and `goToParent` should
+			// be marked as deprecated.
+			goBack: ( options: NavigateToParentOptions | undefined ) =>
+				dispatch( { type: 'gotoparent', options } ),
+			goTo: ( path: string, options?: NavigateOptions ) =>
+				dispatch( { type: 'goto', path, options } ),
+			goToParent: ( options: NavigateToParentOptions | undefined ) => {
+				deprecated( `wp.components.useNavigator().goToParent`, {
+					since: '6.7',
+					alternative: 'wp.components.useNavigator().goBack',
+				} );
+				dispatch( { type: 'gotoparent', options } );
+			},
+			addScreen: ( screen: Screen ) =>
+				dispatch( { type: 'add', screen } ),
+			removeScreen: ( screen: Screen ) =>
+				dispatch( { type: 'remove', screen } ),
+		} ),
+		[]
+	);
+
+	const { currentLocation, matchedPath } = routerState;
+
+	const navigatorContextValue: NavigatorContextType = useMemo(
+		() => ( {
+			location: currentLocation,
+			params: matchedPath?.params ?? {},
+			match: matchedPath?.id,
+			...methods,
+		} ),
+		[ currentLocation, matchedPath, methods ]
+	);
+
+	const cx = useCx();
+	const classes = useMemo(
+		() => cx( styles.navigatorWrapper, className ),
+		[ className, cx ]
+	);
+
+	return (
+		<View ref={ forwardedRef } className={ classes } { ...otherProps }>
+			<NavigatorContext.Provider value={ navigatorContextValue }>
+				{ children }
+			</NavigatorContext.Provider>
+		</View>
+	);
+}
+
+export const Navigator = contextConnect( UnconnectedNavigator, 'Navigator' );
diff --git a/packages/components/src/navigator/stories/index.story.tsx b/packages/components/src/navigator/stories/index.story.tsx
index 5adeadcf7ac1d6..e9e342bb0d2eee 100644
--- a/packages/components/src/navigator/stories/index.story.tsx
+++ b/packages/components/src/navigator/stories/index.story.tsx
@@ -1,29 +1,27 @@
 /**
  * External dependencies
  */
-import type { Meta, StoryFn } from '@storybook/react';
+import type { Meta, StoryObj } from '@storybook/react';
 
 /**
  * Internal dependencies
  */
 import Button from '../../button';
-import { Card, CardBody, CardFooter, CardHeader } from '../../card';
 import { VStack } from '../../v-stack';
-import Dropdown from '../../dropdown';
-import {
-	NavigatorProvider,
-	NavigatorScreen,
-	NavigatorButton,
-	NavigatorBackButton,
-	NavigatorToParentButton,
-	useNavigator,
-} from '..';
-
-const meta: Meta< typeof NavigatorProvider > = {
-	component: NavigatorProvider,
-	// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
-	subcomponents: { NavigatorScreen, NavigatorButton, NavigatorBackButton },
-	title: 'Components (Experimental)/Navigator',
+import { HStack } from '../../h-stack';
+import { Navigator, useNavigator } from '../';
+
+const meta: Meta< typeof Navigator > = {
+	component: Navigator,
+	subcomponents: {
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		Screen: Navigator.Screen,
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		Button: Navigator.Button,
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		BackButton: Navigator.BackButton,
+	},
+	title: 'Components/Navigator',
 	argTypes: {
 		as: { control: { type: null } },
 		children: { control: { type: null } },
@@ -33,282 +31,123 @@ const meta: Meta< typeof NavigatorProvider > = {
 		controls: { expanded: true },
 		docs: { canvas: { sourceState: 'shown' } },
 	},
+	decorators: [
+		( Story ) => {
+			return (
+				<>
+					<style>{ `
+					  /* The data-wp-component attribute is a private implementation
+						 * detail of the Navigator component. Do not use outside of
+						 * its source code.
+						 */
+						[data-wp-component="Navigator"] {
+							height: 250px;
+						}
+						[data-wp-component="Navigator.Screen"] {
+							padding: 8px;
+						}
+					` }</style>
+					<Story />
+				</>
+			);
+		},
+	],
 };
 export default meta;
 
-const Template: StoryFn< typeof NavigatorProvider > = ( {
-	style,
-	...props
-} ) => (
-	<NavigatorProvider
-		style={ { ...style, height: '100vh', maxHeight: '450px' } }
-		{ ...props }
-	>
-		<NavigatorScreen path="/">
-			<Card>
-				<CardBody>
-					<p>This is the home screen.</p>
+export const Default: StoryObj< typeof Navigator > = {
+	args: {
+		initialPath: '/',
+		children: (
+			<>
+				<Navigator.Screen path="/">
+					<h2>This is the home screen.</h2>
 
 					<VStack alignment="left">
-						<NavigatorButton variant="secondary" path="/child">
-							Navigate to child screen.
-						</NavigatorButton>
-
-						<NavigatorButton
-							variant="secondary"
-							path="/overflow-child"
-						>
-							Navigate to screen with horizontal overflow.
-						</NavigatorButton>
+						<Navigator.Button variant="primary" path="/child">
+							Go to child screen.
+						</Navigator.Button>
 
-						<NavigatorButton variant="secondary" path="/stickies">
-							Navigate to screen with sticky content.
-						</NavigatorButton>
+						<Navigator.Button variant="primary" path="/product/1">
+							Go to dynamic path screen with id 1.
+						</Navigator.Button>
 
-						<NavigatorButton variant="secondary" path="/product/1">
-							Navigate to product screen with id 1.
-						</NavigatorButton>
-
-						<Dropdown
-							renderToggle={ ( {
-								isOpen,
-								onToggle,
-							}: {
-								// TODO: remove once `Dropdown` is refactored to TypeScript
-								isOpen: boolean;
-								onToggle: () => void;
-							} ) => (
-								<Button
-									onClick={ onToggle }
-									aria-expanded={ isOpen }
-									variant="primary"
-								>
-									Open test dialog
-								</Button>
-							) }
-							renderContent={ () => (
-								<Card>
-									<CardHeader>Go</CardHeader>
-									<CardBody>Stuff</CardBody>
-								</Card>
-							) }
-						/>
+						<Navigator.Button variant="primary" path="/product/2">
+							Go to dynamic path screen with id 2.
+						</Navigator.Button>
 					</VStack>
-				</CardBody>
-			</Card>
-		</NavigatorScreen>
-
-		<NavigatorScreen path="/child">
-			<Card>
-				<CardBody>
-					<p>This is the child screen.</p>
-					<NavigatorBackButton variant="secondary">
-						Go back
-					</NavigatorBackButton>
-				</CardBody>
-			</Card>
-		</NavigatorScreen>
-
-		<NavigatorScreen path="/overflow-child">
-			<Card>
-				<CardBody>
-					<NavigatorBackButton variant="secondary">
-						Go back
-					</NavigatorBackButton>
-					<div
-						style={ {
-							display: 'inline-block',
-							background: 'papayawhip',
-						} }
-					>
-						<span
-							style={ {
-								color: 'palevioletred',
-								whiteSpace: 'nowrap',
-								fontSize: '42vw',
-							} }
+				</Navigator.Screen>
+
+				<Navigator.Screen path="/child">
+					<h2>This is the child screen.</h2>
+					<HStack spacing={ 2 } alignment="left">
+						<Navigator.BackButton variant="secondary">
+							Go back
+						</Navigator.BackButton>
+
+						<Navigator.Button
+							variant="primary"
+							path="/child/grandchild"
 						>
-							¯\_(ツ)_/¯
-						</span>
-					</div>
-				</CardBody>
-			</Card>
-		</NavigatorScreen>
-
-		<NavigatorScreen path="/stickies">
-			<Card>
-				<CardHeader style={ getStickyStyles( { zIndex: 2 } ) }>
-					<NavigatorBackButton variant="secondary">
+							Go to grand child screen.
+						</Navigator.Button>
+					</HStack>
+				</Navigator.Screen>
+
+				<Navigator.Screen path="/child/grandchild">
+					<h2>This is the grand child screen.</h2>
+					<Navigator.BackButton variant="secondary">
 						Go back
-					</NavigatorBackButton>
-				</CardHeader>
-				<CardBody>
-					<div
-						style={ getStickyStyles( {
-							top: 69,
-							bgColor: 'peachpuff',
-						} ) }
-					>
-						<h2>A wild sticky element appears</h2>
-					</div>
-					<MetaphorIpsum quantity={ 3 } />
-				</CardBody>
-				<CardBody>
-					<div
-						style={ getStickyStyles( {
-							top: 69,
-							bgColor: 'paleturquoise',
-						} ) }
-					>
-						<h2>Another wild sticky element appears</h2>
-					</div>
-					<MetaphorIpsum quantity={ 3 } />
-				</CardBody>
-				<CardFooter
-					style={ getStickyStyles( {
-						bgColor: 'mistyrose',
-					} ) }
-				>
-					<Button variant="primary">Primary noop</Button>
-				</CardFooter>
-			</Card>
-		</NavigatorScreen>
-
-		<NavigatorScreen path="/product/:id">
-			<ProductDetails />
-		</NavigatorScreen>
-	</NavigatorProvider>
-);
-
-export const Default: StoryFn< typeof NavigatorProvider > = Template.bind( {} );
-Default.args = {
-	initialPath: '/',
+					</Navigator.BackButton>
+				</Navigator.Screen>
+
+				<Navigator.Screen path="/product/:id">
+					<DynamicScreen />
+				</Navigator.Screen>
+			</>
+		),
+	},
 };
 
-function getStickyStyles( {
-	bottom = 0,
-	bgColor = 'whitesmoke',
-	top = 0,
-	zIndex = 1,
-} ): React.CSSProperties {
-	return {
-		display: 'flex',
-		position: 'sticky',
-		top,
-		bottom,
-		zIndex,
-		backgroundColor: bgColor,
-	};
-}
+function DynamicScreen() {
+	const { params } = useNavigator();
 
-function MetaphorIpsum( { quantity }: { quantity: number } ) {
-	const list = [
-		'A loopy clarinet’s year comes with it the thought that the fenny step-son is an ophthalmologist. The literature would have us believe that a glabrate country is not but a rhythm. A beech is a rub from the right perspective. In ancient times few can name an unglossed walrus that isn’t an unspilt trial.',
-		'Authors often misinterpret the afterthought as a roseless mother-in-law, when in actuality it feels more like an uncapped thunderstorm. In recent years, some posit the tarry bottle to be less than acerb. They were lost without the unkissed timbale that composed their customer. A donna is a springtime breath.',
-		'It’s an undeniable fact, really; their museum was, in this moment, a snotty beef. The swordfishes could be said to resemble prowessed lasagnas. However, the rainier authority comes from a cureless soup. Unfortunately, that is wrong; on the contrary, the cover is a powder.',
-	];
-	quantity = Math.min( list.length, quantity );
 	return (
 		<>
-			{ list.slice( 0, quantity ).map( ( text, key ) => (
-				<p style={ { maxWidth: '20em' } } key={ key }>
-					{ text }
-				</p>
-			) ) }
+			<h2>This is the dynamic screen</h2>
+			<p>
+				This screen can parse params dynamically. The current id is:{ ' ' }
+				{ params.id }
+			</p>
+			<Navigator.BackButton variant="secondary">
+				Go back
+			</Navigator.BackButton>
 		</>
 	);
 }
 
-function ProductDetails() {
-	const { params } = useNavigator();
-
-	return (
-		<Card>
-			<CardBody>
-				<NavigatorBackButton variant="secondary">
-					Go back
-				</NavigatorBackButton>
-				<p>This is the screen for the product with id: { params.id }</p>
-			</CardBody>
-		</Card>
-	);
-}
-
-const NestedNavigatorTemplate: StoryFn< typeof NavigatorProvider > = ( {
-	style,
-	...props
-} ) => (
-	<NavigatorProvider
-		style={ { ...style, height: '100vh', maxHeight: '450px' } }
-		{ ...props }
-	>
-		<NavigatorScreen path="/">
-			<Card>
-				<CardBody>
-					<NavigatorButton variant="secondary" path="/child1">
-						Go to first child.
-					</NavigatorButton>
-					<NavigatorButton variant="secondary" path="/child2">
-						Go to second child.
-					</NavigatorButton>
-				</CardBody>
-			</Card>
-		</NavigatorScreen>
-		<NavigatorScreen path="/child1">
-			<Card>
-				<CardBody>
-					This is the first child
-					<NavigatorToParentButton variant="secondary">
-						Go back to parent
-					</NavigatorToParentButton>
-				</CardBody>
-			</Card>
-		</NavigatorScreen>
-		<NavigatorScreen path="/child2">
-			<Card>
-				<CardBody>
-					This is the second child
-					<NavigatorToParentButton variant="secondary">
-						Go back to parent
-					</NavigatorToParentButton>
-					<NavigatorButton
-						variant="secondary"
-						path="/child2/grandchild"
-					>
-						Go to grand child.
-					</NavigatorButton>
-				</CardBody>
-			</Card>
-		</NavigatorScreen>
-		<NavigatorScreen path="/child2/grandchild">
-			<Card>
-				<CardBody>
-					This is the grand child
-					<NavigatorToParentButton variant="secondary">
-						Go back to parent
-					</NavigatorToParentButton>
-				</CardBody>
-			</Card>
-		</NavigatorScreen>
-	</NavigatorProvider>
-);
-
-export const NestedNavigator: StoryFn< typeof NavigatorProvider > =
-	NestedNavigatorTemplate.bind( {} );
-NestedNavigator.args = {
-	initialPath: '/child2/grandchild',
+export const WithNestedInitialPath: StoryObj< typeof Navigator > = {
+	...Default,
+	args: {
+		...Default.args,
+		initialPath: '/child/grandchild',
+	},
 };
 
 const NavigatorButtonWithSkipFocus = ( {
 	path,
 	onClick,
 	...props
-}: React.ComponentProps< typeof NavigatorButton > ) => {
+}: React.ComponentProps< typeof Navigator.Button > ) => {
 	const { goTo } = useNavigator();
 
 	return (
 		<Button
 			{ ...props }
+			style={ {
+				marginInline: '8px',
+				...props.style,
+			} }
 			onClick={ ( e: React.MouseEvent< HTMLButtonElement > ) => {
 				goTo( path, { skipFocus: true } );
 				onClick?.( e );
@@ -317,50 +156,39 @@ const NavigatorButtonWithSkipFocus = ( {
 	);
 };
 
-export const SkipFocus: StoryFn< typeof NavigatorProvider > = ( args ) => {
-	return <NavigatorProvider { ...args } />;
-};
-SkipFocus.args = {
-	initialPath: '/',
-	children: (
-		<>
-			<div
-				style={ {
-					height: 250,
-					border: '1px solid black',
-				} }
-			>
-				<NavigatorScreen
-					path="/"
-					style={ {
-						height: '100%',
-					} }
-				>
-					<h1>Home screen</h1>
-					<NavigatorButton variant="secondary" path="/child">
-						Go to child screen.
-					</NavigatorButton>
-				</NavigatorScreen>
-				<NavigatorScreen
-					path="/child"
+export const SkipFocus: StoryObj< typeof Navigator > = {
+	args: {
+		initialPath: '/',
+		children: (
+			<>
+				<div
 					style={ {
-						height: '100%',
+						height: 150,
+						outline: '1px solid black',
+						outlineOffset: '-1px',
+						marginBlockEnd: '1rem',
+						display: 'contents',
 					} }
 				>
-					<h2>Child screen</h2>
-					<NavigatorToParentButton variant="secondary">
-						Go to parent screen.
-					</NavigatorToParentButton>
-				</NavigatorScreen>
-			</div>
-
-			<NavigatorButtonWithSkipFocus
-				variant="secondary"
-				path="/child"
-				style={ { margin: '1rem 2rem' } }
-			>
-				Go to child screen, but keep focus on this button
-			</NavigatorButtonWithSkipFocus>
-		</>
-	),
+					<Navigator.Screen path="/">
+						<h2>Home screen</h2>
+						<Navigator.Button variant="primary" path="/child">
+							Go to child screen.
+						</Navigator.Button>
+					</Navigator.Screen>
+
+					<Navigator.Screen path="/child">
+						<h2>Child screen</h2>
+						<Navigator.BackButton variant="secondary">
+							Go back to home screen
+						</Navigator.BackButton>
+					</Navigator.Screen>
+				</div>
+
+				<NavigatorButtonWithSkipFocus path="/child">
+					Go to child screen, but keep focus on this button
+				</NavigatorButtonWithSkipFocus>
+			</>
+		),
+	},
 };
diff --git a/packages/components/src/navigator/styles.ts b/packages/components/src/navigator/styles.ts
new file mode 100644
index 00000000000000..167d4ac07de3d6
--- /dev/null
+++ b/packages/components/src/navigator/styles.ts
@@ -0,0 +1,142 @@
+/**
+ * External dependencies
+ */
+import { css, keyframes } from '@emotion/react';
+
+export const navigatorWrapper = css`
+	position: relative;
+	/* Prevents horizontal overflow while animating screen transitions */
+	overflow-x: clip;
+	/*
+	 * Mark this DOM subtree as isolated when it comes to layout calculations,
+	 * providing performance benefits.
+	 */
+	contain: layout;
+
+	display: grid;
+	grid-template-columns: 1fr;
+	grid-template-rows: 1fr;
+	align-items: start;
+`;
+
+const fadeIn = keyframes( {
+	from: {
+		opacity: 0,
+	},
+} );
+
+const fadeOut = keyframes( {
+	to: {
+		opacity: 0,
+	},
+} );
+
+export const slideFromRight = keyframes( {
+	from: {
+		transform: 'translateX(100px)',
+	},
+} );
+
+export const slideToLeft = keyframes( {
+	to: {
+		transform: 'translateX(-80px)',
+	},
+} );
+
+export const slideFromLeft = keyframes( {
+	from: {
+		transform: 'translateX(-100px)',
+	},
+} );
+
+export const slideToRight = keyframes( {
+	to: {
+		transform: 'translateX(80px)',
+	},
+} );
+
+const FADE = {
+	DURATION: 70,
+	EASING: 'linear',
+	DELAY: {
+		IN: 70,
+		OUT: 40,
+	},
+};
+const SLIDE = {
+	DURATION: 300,
+	EASING: 'cubic-bezier(0.33, 0, 0, 1)',
+};
+
+export const TOTAL_ANIMATION_DURATION = {
+	IN: Math.max( FADE.DURATION + FADE.DELAY.IN, SLIDE.DURATION ),
+	OUT: Math.max( FADE.DURATION + FADE.DELAY.OUT, SLIDE.DURATION ),
+};
+
+export const ANIMATION_END_NAMES = {
+	end: {
+		in: slideFromRight.name,
+		out: slideToLeft.name,
+	},
+	start: {
+		in: slideFromLeft.name,
+		out: slideToRight.name,
+	},
+};
+
+const ANIMATION = {
+	end: {
+		in: css`
+			${ FADE.DURATION }ms ${ FADE.EASING } ${ FADE.DELAY
+				.IN }ms both ${ fadeIn }, ${ SLIDE.DURATION }ms ${ SLIDE.EASING } both ${ slideFromRight }
+		`,
+		out: css`
+			${ FADE.DURATION }ms ${ FADE.EASING } ${ FADE.DELAY
+				.OUT }ms both ${ fadeOut }, ${ SLIDE.DURATION }ms ${ SLIDE.EASING } both ${ slideToLeft }
+		`,
+	},
+	start: {
+		in: css`
+			${ FADE.DURATION }ms ${ FADE.EASING } ${ FADE.DELAY
+				.IN }ms both ${ fadeIn }, ${ SLIDE.DURATION }ms ${ SLIDE.EASING } both ${ slideFromLeft }
+		`,
+		out: css`
+			${ FADE.DURATION }ms ${ FADE.EASING } ${ FADE.DELAY
+				.OUT }ms both ${ fadeOut }, ${ SLIDE.DURATION }ms ${ SLIDE.EASING } both ${ slideToRight }
+		`,
+	},
+} as const;
+export const navigatorScreenAnimation = css`
+	z-index: 1;
+
+	&[data-animation-type='out'] {
+		z-index: 0;
+	}
+
+	@media not ( prefers-reduced-motion ) {
+		&:not( [data-skip-animation] ) {
+			${ ( [ 'start', 'end' ] as const ).map( ( direction ) =>
+				( [ 'in', 'out' ] as const ).map(
+					( type ) => css`
+						&[data-animation-direction='${ direction }'][data-animation-type='${ type }'] {
+							animation: ${ ANIMATION[ direction ][ type ] };
+						}
+					`
+				)
+			) }
+		}
+	}
+`;
+
+export const navigatorScreen = css`
+	/* Ensures horizontal overflow is visually accessible */
+	overflow-x: auto;
+	/* In case the root has a height, it should not be exceeded */
+	max-height: 100%;
+	box-sizing: border-box;
+
+	position: relative;
+
+	grid-column: 1 / -1;
+	grid-row: 1 / -1;
+`;
diff --git a/packages/components/src/navigator/test/index.tsx b/packages/components/src/navigator/test/index.tsx
index 5a711b8730224a..cab6e9a4cdadff 100644
--- a/packages/components/src/navigator/test/index.tsx
+++ b/packages/components/src/navigator/test/index.tsx
@@ -14,19 +14,13 @@ import { useState } from '@wordpress/element';
  * Internal dependencies
  */
 import Button from '../../button';
-import {
-	NavigatorProvider,
-	NavigatorScreen,
-	NavigatorButton,
-	NavigatorBackButton,
-	NavigatorToParentButton,
-	useNavigator,
-} from '..';
+import { Navigator, useNavigator } from '..';
+import { NavigatorToParentButton } from '../legacy';
 import type { NavigateOptions } from '../types';
 
 const INVALID_HTML_ATTRIBUTE = {
-	raw: ' "\'><=invalid_path',
-	escaped: " &quot;'&gt;<=invalid_path",
+	raw: '/ "\'><=invalid_path',
+	escaped: "/ &quot;'&gt;<=invalid_path",
 };
 
 const PATHS = {
@@ -76,11 +70,11 @@ function CustomNavigatorButton( {
 	path,
 	onClick,
 	...props
-}: Omit< ComponentPropsWithoutRef< typeof NavigatorButton >, 'onClick' > & {
+}: Omit< ComponentPropsWithoutRef< typeof Navigator.Button >, 'onClick' > & {
 	onClick?: CustomTestOnClickHandler;
 } ) {
 	return (
-		<NavigatorButton
+		<Navigator.Button
 			onClick={ () => {
 				// Used to spy on the values passed to `navigator.goTo`.
 				onClick?.( { type: 'goTo', path } );
@@ -95,7 +89,7 @@ function CustomNavigatorGoToBackButton( {
 	path,
 	onClick,
 	...props
-}: Omit< ComponentPropsWithoutRef< typeof NavigatorButton >, 'onClick' > & {
+}: Omit< ComponentPropsWithoutRef< typeof Navigator.Button >, 'onClick' > & {
 	onClick?: CustomTestOnClickHandler;
 } ) {
 	const { goTo } = useNavigator();
@@ -115,7 +109,7 @@ function CustomNavigatorGoToSkipFocusButton( {
 	path,
 	onClick,
 	...props
-}: Omit< ComponentPropsWithoutRef< typeof NavigatorButton >, 'onClick' > & {
+}: Omit< ComponentPropsWithoutRef< typeof Navigator.Button >, 'onClick' > & {
 	onClick?: CustomTestOnClickHandler;
 } ) {
 	const { goTo } = useNavigator();
@@ -134,11 +128,14 @@ function CustomNavigatorGoToSkipFocusButton( {
 function CustomNavigatorBackButton( {
 	onClick,
 	...props
-}: Omit< ComponentPropsWithoutRef< typeof NavigatorBackButton >, 'onClick' > & {
+}: Omit<
+	ComponentPropsWithoutRef< typeof Navigator.BackButton >,
+	'onClick'
+> & {
 	onClick?: CustomTestOnClickHandler;
 } ) {
 	return (
-		<NavigatorBackButton
+		<Navigator.BackButton
 			onClick={ () => {
 				// Used to spy on the values passed to `navigator.goBack`.
 				onClick?.( { type: 'goBack' } );
@@ -151,7 +148,10 @@ function CustomNavigatorBackButton( {
 function CustomNavigatorToParentButton( {
 	onClick,
 	...props
-}: Omit< ComponentPropsWithoutRef< typeof NavigatorBackButton >, 'onClick' > & {
+}: Omit<
+	ComponentPropsWithoutRef< typeof Navigator.BackButton >,
+	'onClick'
+> & {
 	onClick?: CustomTestOnClickHandler;
 } ) {
 	return (
@@ -165,6 +165,27 @@ function CustomNavigatorToParentButton( {
 	);
 }
 
+function CustomNavigatorToParentButtonAlternative( {
+	onClick,
+	children,
+}: {
+	children: React.ReactNode;
+	onClick?: CustomTestOnClickHandler;
+} ) {
+	const { goToParent } = useNavigator();
+	return (
+		<button
+			onClick={ () => {
+				goToParent();
+				// Used to spy on the values passed to `navigator.goBack`.
+				onClick?.( { type: 'goToParent' } );
+			} }
+		>
+			{ children }
+		</button>
+	);
+}
+
 const ProductScreen = ( {
 	onBackButtonClick,
 }: {
@@ -173,13 +194,13 @@ const ProductScreen = ( {
 	const { params } = useNavigator();
 
 	return (
-		<NavigatorScreen path={ PATHS.PRODUCT_PATTERN }>
+		<Navigator.Screen path={ PATHS.PRODUCT_PATTERN }>
 			<p>{ SCREEN_TEXT.product }</p>
 			<p>Product ID is { params.productId }</p>
 			<CustomNavigatorBackButton onClick={ onBackButtonClick }>
 				{ BUTTON_TEXT.back }
 			</CustomNavigatorBackButton>
-		</NavigatorScreen>
+		</Navigator.Screen>
 	);
 };
 
@@ -194,8 +215,8 @@ const MyNavigation = ( {
 	const [ outerInputValue, setOuterInputValue ] = useState( '' );
 	return (
 		<>
-			<NavigatorProvider initialPath={ initialPath }>
-				<NavigatorScreen path={ PATHS.HOME }>
+			<Navigator initialPath={ initialPath }>
+				<Navigator.Screen path={ PATHS.HOME }>
 					<p>{ SCREEN_TEXT.home }</p>
 					{ /*
 					 * A button useful to test focus restoration. This button is the first
@@ -233,9 +254,9 @@ const MyNavigation = ( {
 					>
 						{ BUTTON_TEXT.toInvalidHtmlPathScreen }
 					</CustomNavigatorButton>
-				</NavigatorScreen>
+				</Navigator.Screen>
 
-				<NavigatorScreen path={ PATHS.CHILD }>
+				<Navigator.Screen path={ PATHS.CHILD }>
 					<p>{ SCREEN_TEXT.child }</p>
 					{ /*
 					 * A button useful to test focus restoration. This button is the first
@@ -265,30 +286,30 @@ const MyNavigation = ( {
 						} }
 						value={ innerInputValue }
 					/>
-				</NavigatorScreen>
+				</Navigator.Screen>
 
-				<NavigatorScreen path={ PATHS.NESTED }>
+				<Navigator.Screen path={ PATHS.NESTED }>
 					<p>{ SCREEN_TEXT.nested }</p>
 					<CustomNavigatorBackButton
 						onClick={ onNavigatorButtonClick }
 					>
 						{ BUTTON_TEXT.back }
 					</CustomNavigatorBackButton>
-				</NavigatorScreen>
+				</Navigator.Screen>
 
 				<ProductScreen onBackButtonClick={ onNavigatorButtonClick } />
 
-				<NavigatorScreen path={ PATHS.INVALID_HTML_ATTRIBUTE }>
+				<Navigator.Screen path={ PATHS.INVALID_HTML_ATTRIBUTE }>
 					<p>{ SCREEN_TEXT.invalidHtmlPath }</p>
 					<CustomNavigatorBackButton
 						onClick={ onNavigatorButtonClick }
 					>
 						{ BUTTON_TEXT.back }
 					</CustomNavigatorBackButton>
-				</NavigatorScreen>
+				</Navigator.Screen>
 
-				{ /* A `NavigatorScreen` with `path={ PATHS.NOT_FOUND }` is purposefully not included. */ }
-			</NavigatorProvider>
+				{ /* A `Navigator.Screen` with `path={ PATHS.NOT_FOUND }` is purposefully not included. */ }
+			</Navigator>
 
 			<label htmlFor="test-input-outer">Outer input</label>
 			<input
@@ -313,8 +334,8 @@ const MyHierarchicalNavigation = ( {
 } ) => {
 	return (
 		<>
-			<NavigatorProvider initialPath={ initialPath }>
-				<NavigatorScreen path={ PATHS.HOME }>
+			<Navigator initialPath={ initialPath }>
+				<Navigator.Screen path={ PATHS.HOME }>
 					<p>{ SCREEN_TEXT.home }</p>
 					{ /*
 					 * A button useful to test focus restoration. This button is the first
@@ -328,9 +349,9 @@ const MyHierarchicalNavigation = ( {
 					>
 						{ BUTTON_TEXT.toChildScreen }
 					</CustomNavigatorButton>
-				</NavigatorScreen>
+				</Navigator.Screen>
 
-				<NavigatorScreen path={ PATHS.CHILD }>
+				<Navigator.Screen path={ PATHS.CHILD }>
 					<p>{ SCREEN_TEXT.child }</p>
 					{ /*
 					 * A button useful to test focus restoration. This button is the first
@@ -344,34 +365,94 @@ const MyHierarchicalNavigation = ( {
 					>
 						{ BUTTON_TEXT.toNestedScreen }
 					</CustomNavigatorButton>
-					<CustomNavigatorToParentButton
+					<CustomNavigatorBackButton
 						onClick={ onNavigatorButtonClick }
 					>
 						{ BUTTON_TEXT.back }
-					</CustomNavigatorToParentButton>
-				</NavigatorScreen>
+					</CustomNavigatorBackButton>
+				</Navigator.Screen>
 
-				<NavigatorScreen path={ PATHS.NESTED }>
+				<Navigator.Screen path={ PATHS.NESTED }>
 					<p>{ SCREEN_TEXT.nested }</p>
-					<CustomNavigatorToParentButton
+					<CustomNavigatorBackButton
 						onClick={ onNavigatorButtonClick }
 					>
 						{ BUTTON_TEXT.back }
-					</CustomNavigatorToParentButton>
+					</CustomNavigatorBackButton>
 					<CustomNavigatorGoToBackButton
 						path={ PATHS.CHILD }
 						onClick={ onNavigatorButtonClick }
 					>
 						{ BUTTON_TEXT.backUsingGoTo }
 					</CustomNavigatorGoToBackButton>
-				</NavigatorScreen>
+				</Navigator.Screen>
 				<CustomNavigatorGoToSkipFocusButton
 					path={ PATHS.NESTED }
 					onClick={ onNavigatorButtonClick }
 				>
 					{ BUTTON_TEXT.goToWithSkipFocus }
 				</CustomNavigatorGoToSkipFocusButton>
-			</NavigatorProvider>
+			</Navigator>
+		</>
+	);
+};
+
+const MyDeprecatedNavigation = ( {
+	initialPath = PATHS.HOME,
+	onNavigatorButtonClick,
+}: {
+	initialPath?: string;
+	onNavigatorButtonClick?: CustomTestOnClickHandler;
+} ) => {
+	return (
+		<>
+			<Navigator initialPath={ initialPath }>
+				<Navigator.Screen path={ PATHS.HOME }>
+					<p>{ SCREEN_TEXT.home }</p>
+					{ /*
+					 * A button useful to test focus restoration. This button is the first
+					 * tabbable item in the screen, but should not receive focus when
+					 * navigating to screen as a result of a backwards navigation.
+					 */ }
+					<button>First tabbable home screen button</button>
+					<CustomNavigatorButton
+						path={ PATHS.CHILD }
+						onClick={ onNavigatorButtonClick }
+					>
+						{ BUTTON_TEXT.toChildScreen }
+					</CustomNavigatorButton>
+				</Navigator.Screen>
+
+				<Navigator.Screen path={ PATHS.CHILD }>
+					<p>{ SCREEN_TEXT.child }</p>
+					{ /*
+					 * A button useful to test focus restoration. This button is the first
+					 * tabbable item in the screen, but should not receive focus when
+					 * navigating to screen as a result of a backwards navigation.
+					 */ }
+					<button>First tabbable child screen button</button>
+					<CustomNavigatorButton
+						path={ PATHS.NESTED }
+						onClick={ onNavigatorButtonClick }
+					>
+						{ BUTTON_TEXT.toNestedScreen }
+					</CustomNavigatorButton>
+					<CustomNavigatorToParentButton
+						onClick={ onNavigatorButtonClick }
+					>
+						{ BUTTON_TEXT.back }
+					</CustomNavigatorToParentButton>
+				</Navigator.Screen>
+
+				<Navigator.Screen path={ PATHS.NESTED }>
+					<p>{ SCREEN_TEXT.nested }</p>
+					<CustomNavigatorToParentButtonAlternative
+						onClick={ onNavigatorButtonClick }
+					>
+						{ BUTTON_TEXT.back }
+					</CustomNavigatorToParentButtonAlternative>
+				</Navigator.Screen>
+			</Navigator>
 		</>
 	);
 };
@@ -561,6 +642,14 @@ describe( 'Navigator', () => {
 		).toHaveAttribute( 'id', INVALID_HTML_ATTRIBUTE.escaped );
 	} );
 
+	it( 'should warn if the `path` prop does not follow the required format', () => {
+		render( <Navigator.Screen path="not-valid">Test</Navigator.Screen> );
+
+		expect( console ).toHaveWarnedWith(
+			'wp.components.Navigator.Screen: the `path` should follow a URL-like scheme; it should start with and be separated by the `/` character.'
+		);
+	} );
+
 	it( 'should match correctly paths with named arguments', async () => {
 		const user = userEvent.setup();
 
@@ -770,67 +859,52 @@ describe( 'Navigator', () => {
 		} );
 	} );
 
-	describe( 'animation', () => {
-		it( 'should not animate the initial screen', async () => {
-			const onHomeAnimationStartSpy = jest.fn();
+	describe( 'deprecated APIs', () => {
+		it( 'should log a deprecation notice when using the NavigatorToParentButton component', async () => {
+			const user = userEvent.setup();
 
-			render(
-				<NavigatorProvider initialPath="/">
-					<NavigatorScreen
-						path="/"
-						onAnimationStart={ onHomeAnimationStartSpy }
-					>
-						<CustomNavigatorButton path="/child">
-							To child
-						</CustomNavigatorButton>
-					</NavigatorScreen>
-				</NavigatorProvider>
-			);
+			render( <MyDeprecatedNavigation initialPath={ PATHS.CHILD } /> );
+
+			expect( getScreen( 'child' ) ).toBeInTheDocument();
 
-			expect( onHomeAnimationStartSpy ).not.toHaveBeenCalled();
+			// Navigate back to home screen.
+			// The first tabbable element receives focus, since focus restoration
+			// it not possible (there was no forward navigation).
+			await user.click( getNavigationButton( 'back' ) );
+			expect( getScreen( 'home' ) ).toBeInTheDocument();
+			expect(
+				screen.getByRole( 'button', {
+					name: 'First tabbable home screen button',
+				} )
+			).toHaveFocus();
+
+			// Rendering `NavigatorToParentButton` logs a deprecation notice
+			expect( console ).toHaveWarnedWith(
+				'wp.components.NavigatorToParentButton is deprecated since version 6.7. Please use wp.components.Navigator.BackButton instead.'
+			);
 		} );
 
-		it( 'should animate all other screens (including the initial screen when navigating back)', async () => {
+		it( 'should log a deprecation notice when using the useNavigator().goToParent() function', async () => {
 			const user = userEvent.setup();
 
-			const onHomeAnimationStartSpy = jest.fn();
-			const onChildAnimationStartSpy = jest.fn();
-
-			render(
-				<NavigatorProvider initialPath="/">
-					<NavigatorScreen
-						path="/"
-						onAnimationStart={ onHomeAnimationStartSpy }
-					>
-						<CustomNavigatorButton path="/child">
-							To child
-						</CustomNavigatorButton>
-					</NavigatorScreen>
-					<NavigatorScreen
-						path="/child"
-						onAnimationStart={ onChildAnimationStartSpy }
-					>
-						<CustomNavigatorBackButton>
-							Back to home
-						</CustomNavigatorBackButton>
-					</NavigatorScreen>
-				</NavigatorProvider>
-			);
+			render( <MyDeprecatedNavigation initialPath={ PATHS.NESTED } /> );
 
-			expect( onHomeAnimationStartSpy ).not.toHaveBeenCalled();
-			expect( onChildAnimationStartSpy ).not.toHaveBeenCalled();
+			expect( getScreen( 'nested' ) ).toBeInTheDocument();
 
-			await user.click(
-				screen.getByRole( 'button', { name: 'To child' } )
-			);
-			expect( onChildAnimationStartSpy ).toHaveBeenCalledTimes( 1 );
-			expect( onHomeAnimationStartSpy ).not.toHaveBeenCalled();
+			// Navigate back to child screen using the back button.
+			// The first tabbable element receives focus, since focus restoration
+			// it not possible (there was no forward navigation).
+			await user.click( getNavigationButton( 'back' ) );
+			expect( getScreen( 'child' ) ).toBeInTheDocument();
+			expect(
+				screen.getByRole( 'button', {
+					name: 'First tabbable child screen button',
+				} )
+			).toHaveFocus();
 
-			await user.click(
-				screen.getByRole( 'button', { name: 'Back to home' } )
+			expect( console ).toHaveWarnedWith(
+				'wp.components.useNavigator().goToParent is deprecated since version 6.7. Please use wp.components.useNavigator().goBack instead.'
 			);
-			expect( onChildAnimationStartSpy ).toHaveBeenCalledTimes( 1 );
-			expect( onHomeAnimationStartSpy ).toHaveBeenCalledTimes( 1 );
 		} );
 	} );
 } );
diff --git a/packages/components/src/navigator/types.ts b/packages/components/src/navigator/types.ts
index 557f8074fd42e2..aeb5fd3b12c7fb 100644
--- a/packages/components/src/navigator/types.ts
+++ b/packages/components/src/navigator/types.ts
@@ -11,26 +11,72 @@ import type { ButtonAsButtonProps } from '../button/types';
 export type MatchParams = Record< string, string | string[] >;
 
 export type NavigateOptions = {
+	/**
+	 * Specify the CSS selector used to restore focus on an given element when
+	 * navigating back. When not provided, the component will attempt to restore
+	 * focus on the element that originated the forward navigation.
+	 */
 	focusTargetSelector?: string;
+	/**
+	 * Whether the navigation is a backwards navigation. This enables focus
+	 * restoration (when possible), and causes the animation to be backwards.
+	 */
 	isBack?: boolean;
+	/**
+	 * Opt out of focus management. Useful when the consumer of the component
+	 * wants to manage focus themselves.
+	 */
 	skipFocus?: boolean;
+	/**
+	 * Note: this option is deprecated and currently doesn't have any effect.
+	 * @deprecated
+	 * @ignore
+	 */
 	replace?: boolean;
 };
 
 export type NavigateToParentOptions = Omit< NavigateOptions, 'isBack' >;
 
 export type NavigatorLocation = NavigateOptions & {
+	/**
+	 * Whether the current location is the initial one (ie. first in the stack).
+	 */
 	isInitial?: boolean;
+	/**
+	 * The path associated to the location.
+	 */
 	path?: string;
+	/**
+	 * Whether focus was already restored for this location (in case of
+	 * backwards navigation).
+	 */
 	hasRestoredFocus?: boolean;
 };
 
 // Returned by the `useNavigator` hook.
 export type Navigator = {
+	/**
+	 * The current location.
+	 */
 	location: NavigatorLocation;
+	/**
+	 * Params associated with the current location
+	 */
 	params: MatchParams;
+	/**
+	 * Navigate to a new location.
+	 */
 	goTo: ( path: string, options?: NavigateOptions ) => void;
-	goBack: () => void;
+	/**
+	 * Go back to the parent location (ie. "/some/path" will navigate back
+	 * to "/some")
+	 */
+	goBack: ( options?: NavigateToParentOptions ) => void;
+	/**
+	 * _Note: This function is deprecated. Please use `goBack` instead._
+	 * @deprecated
+	 * @ignore
+	 */
 	goToParent: ( options?: NavigateToParentOptions ) => void;
 };
 
@@ -40,7 +86,7 @@ export type NavigatorContext = Navigator & {
 	match?: string;
 };
 
-export type NavigatorProviderProps = {
+export type NavigatorProps = {
 	/**
 	 * The initial active path.
 	 */
@@ -54,6 +100,24 @@ export type NavigatorProviderProps = {
 export type NavigatorScreenProps = {
 	/**
 	 * The screen's path, matched against the current path stored in the navigator.
+	 *
+	 * `Navigator` assumes that screens are organized hierarchically according
+	 * to their `path`, which should follow a URL-like scheme where each path
+	 * segment starts with and is separated by the `/` character.
+	 *
+	 * `Navigator` will treat "back" navigations as going to the parent screen —
+	 * it is, therefore, the responsibility of the consumer of the component to
+	 * create the correct screen hierarchy.
+	 *
+	 * For example:
+	 *  - `/` is the root of all paths. There should always be a screen with
+	 *    `path="/"`;
+	 *  - `/parent/child` is a child of `/parent`;
+	 *  - `/parent/child/grand-child` is a child of `/parent/child`;
+	 *  - `/parent/:param` is a child of `/parent` as well;
+	 *  - if the current screen has a `path="/parent/child/grand-child"`, when
+	 *    going "back" `Navigator` will try to recursively navigate the path
+	 *    hierarchy until a matching screen (or the root `/`) is found.
 	 */
 	path: string;
 	/**
@@ -64,15 +128,6 @@ export type NavigatorScreenProps = {
 
 export type NavigatorBackButtonProps = ButtonAsButtonProps;
 
-export type NavigatorBackButtonHookProps = NavigatorBackButtonProps & {
-	/**
-	 * Whether we should navigate to the parent screen.
-	 *
-	 * @default 'false'
-	 */
-	goToParent?: boolean;
-};
-
 export type NavigatorToParentButtonProps = NavigatorBackButtonProps;
 
 export type NavigatorButtonProps = NavigatorBackButtonProps & {
diff --git a/packages/components/src/navigator/use-navigator.ts b/packages/components/src/navigator/use-navigator.ts
index 4d917649374d53..1ea99f3f1c857d 100644
--- a/packages/components/src/navigator/use-navigator.ts
+++ b/packages/components/src/navigator/use-navigator.ts
@@ -10,9 +10,12 @@ import { NavigatorContext } from './context';
 import type { Navigator } from './types';
 
 /**
- * Retrieves a `navigator` instance.
+ * Retrieves a `navigator` instance. This hook provides advanced functionality,
+ * such as imperatively navigating to a new location (with options like
+ * navigating back or skipping focus restoration) and accessing the current
+ * location and path parameters.
  */
-function useNavigator(): Navigator {
+export function useNavigator(): Navigator {
 	const { location, params, goTo, goBack, goToParent } =
 		useContext( NavigatorContext );
 
@@ -24,5 +27,3 @@ function useNavigator(): Navigator {
 		params,
 	};
 }
-
-export default useNavigator;
diff --git a/packages/components/src/notice/README.md b/packages/components/src/notice/README.md
index 0fd961a281bfc7..2efb8276cb7584 100644
--- a/packages/components/src/notice/README.md
+++ b/packages/components/src/notice/README.md
@@ -4,12 +4,6 @@ Use Notices to communicate prominent messages to the user.
 
 ![Notice component](https://make.wordpress.org/design/files/2019/03/Notice-Screenshot-alt.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 A Notice displays a succinct message. It can also offer the user options, like viewing a published post or updating a setting, and requires a user action to be dismissed.
diff --git a/packages/components/src/notice/index.tsx b/packages/components/src/notice/index.tsx
index 7117295b71975e..868576ecc9aa3f 100644
--- a/packages/components/src/notice/index.tsx
+++ b/packages/components/src/notice/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -93,14 +93,9 @@ function Notice( {
 }: NoticeProps ) {
 	useSpokenMessage( spokenMessage, politeness );
 
-	const classes = classnames(
-		className,
-		'components-notice',
-		'is-' + status,
-		{
-			'is-dismissible': isDismissible,
-		}
-	);
+	const classes = clsx( className, 'components-notice', 'is-' + status, {
+		'is-dismissible': isDismissible,
+	} );
 
 	if ( __unstableHTML && typeof children === 'string' ) {
 		children = <RawHTML>{ children }</RawHTML>;
@@ -151,7 +146,7 @@ function Notice( {
 									href={ url }
 									variant={ computedVariant }
 									onClick={ url ? undefined : onClick }
-									className={ classnames(
+									className={ clsx(
 										'components-notice__action',
 										buttonCustomClasses
 									) }
diff --git a/packages/components/src/notice/list.tsx b/packages/components/src/notice/list.tsx
index 5b92b6902a847d..04351f383894ef 100644
--- a/packages/components/src/notice/list.tsx
+++ b/packages/components/src/notice/list.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
@@ -48,7 +48,7 @@ function NoticeList( {
 		( id: NoticeListProps[ 'notices' ][ number ][ 'id' ] ) => () =>
 			onRemove( id );
 
-	className = classnames( 'components-notice-list', className );
+	className = clsx( 'components-notice-list', className );
 
 	return (
 		<div className={ className }>
diff --git a/packages/components/src/notice/stories/index.story.tsx b/packages/components/src/notice/stories/index.story.tsx
index 16a68ab293f551..3314fc722af969 100644
--- a/packages/components/src/notice/stories/index.story.tsx
+++ b/packages/components/src/notice/stories/index.story.tsx
@@ -109,7 +109,7 @@ export const NoticeListSubcomponent: StoryFn< typeof NoticeList > = () => {
 	return (
 		<>
 			<NoticeList notices={ notices } onRemove={ removeNotice } />
-			<Button variant={ 'primary' } onClick={ resetNotices }>
+			<Button variant="primary" onClick={ resetNotices }>
 				Reset Notices
 			</Button>
 		</>
diff --git a/packages/components/src/notice/test/__snapshots__/index.tsx.snap b/packages/components/src/notice/test/__snapshots__/index.tsx.snap
index a793b5db706a4c..c74d6fdd0a6fc9 100644
--- a/packages/components/src/notice/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/notice/test/__snapshots__/index.tsx.snap
@@ -54,7 +54,7 @@ exports[`Notice should match snapshot 1`] = `
         xmlns="http://www.w3.org/2000/svg"
       >
         <path
-          d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"
+          d="m13.06 12 6.47-6.47-1.06-1.06L12 10.94 5.53 4.47 4.47 5.53 10.94 12l-6.47 6.47 1.06 1.06L12 13.06l6.47 6.47 1.06-1.06L13.06 12Z"
         />
       </svg>
     </button>
diff --git a/packages/components/src/number-control/README.md b/packages/components/src/number-control/README.md
index 1a78cd25bb457c..8421691296e90a 100644
--- a/packages/components/src/number-control/README.md
+++ b/packages/components/src/number-control/README.md
@@ -46,9 +46,9 @@ If `isDragEnabled` is true, this controls the amount of `px` to have been dragge
 
 ### spinControls
 
- The type of spin controls to display. These are butons that allow the user to
+ The type of spin controls to display. These are buttons that allow the user to
  quickly increment and decrement the number.
- 
+
  - 'none' - Do not show spin controls.
  - 'native' - Use browser's native HTML `input` controls.
  - 'custom' - Use plus and minus icon buttons.
@@ -139,3 +139,11 @@ Amount by which the `value` is changed when incrementing/decrementing. It is als
 -   Type: `Number | "any"`
 -   Required: No
 -   Default: `1`
+
+### __next40pxDefaultSize
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
\ No newline at end of file
diff --git a/packages/components/src/number-control/index.tsx b/packages/components/src/number-control/index.tsx
index fce0a7f76f49ed..5c846aaafc1e02 100644
--- a/packages/components/src/number-control/index.tsx
+++ b/packages/components/src/number-control/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef, KeyboardEvent, MouseEvent } from 'react';
 
 /**
@@ -54,11 +54,7 @@ function UnforwardedNumberControl(
 		suffix,
 		onChange = noop,
 		...restProps
-	} = useDeprecated36pxDefaultSizeProp< NumberControlProps >(
-		props,
-		'wp.components.NumberControl',
-		'6.4'
-	);
+	} = useDeprecated36pxDefaultSizeProp< NumberControlProps >( props );
 
 	if ( hideHTMLArrows ) {
 		deprecated( 'wp.components.NumberControl hideHTMLArrows prop ', {
@@ -86,7 +82,7 @@ function UnforwardedNumberControl(
 	};
 
 	const autoComplete = typeProp === 'number' ? 'off' : undefined;
-	const classes = classNames( 'components-number-control', className );
+	const classes = clsx( 'components-number-control', className );
 	const cx = useCx();
 	const spinButtonClasses = cx( size === 'small' && styles.smallSpinButtons );
 
@@ -246,10 +242,8 @@ function UnforwardedNumberControl(
 								<SpinButton
 									className={ spinButtonClasses }
 									icon={ plusIcon }
-									isSmall
-									aria-hidden="true"
-									aria-label={ __( 'Increment' ) }
-									tabIndex={ -1 }
+									size="small"
+									label={ __( 'Increment' ) }
 									onClick={ buildSpinButtonClickHandler(
 										'up'
 									) }
@@ -257,10 +251,8 @@ function UnforwardedNumberControl(
 								<SpinButton
 									className={ spinButtonClasses }
 									icon={ resetIcon }
-									isSmall
-									aria-hidden="true"
-									aria-label={ __( 'Decrement' ) }
-									tabIndex={ -1 }
+									size="small"
+									label={ __( 'Decrement' ) }
 									onClick={ buildSpinButtonClickHandler(
 										'down'
 									) }
diff --git a/packages/components/src/number-control/types.ts b/packages/components/src/number-control/types.ts
index 98ee8e0a672f08..8d198e777bd557 100644
--- a/packages/components/src/number-control/types.ts
+++ b/packages/components/src/number-control/types.ts
@@ -15,7 +15,7 @@ export type NumberControlProps = Omit<
 	 */
 	hideHTMLArrows?: boolean;
 	/**
-	 * The type of spin controls to display. These are butons that allow the
+	 * The type of spin controls to display. These are buttons that allow the
 	 * user to quickly increment and decrement the number.
 	 *
 	 * - 'none' - Do not show spin controls.
diff --git a/packages/components/src/palette-edit/index.tsx b/packages/components/src/palette-edit/index.tsx
index b3b8b626ce3b4a..570613e5378c10 100644
--- a/packages/components/src/palette-edit/index.tsx
+++ b/packages/components/src/palette-edit/index.tsx
@@ -1,8 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
-import { paramCase as kebabCase } from 'change-case';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -16,10 +15,7 @@ import {
 } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { lineSolid, moreVertical, plus } from '@wordpress/icons';
-import {
-	__experimentalUseFocusOutside as useFocusOutside,
-	useDebounce,
-} from '@wordpress/compose';
+import { useDebounce } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -28,7 +24,7 @@ import Button from '../button';
 import { ColorPicker } from '../color-picker';
 import { FlexItem } from '../flex';
 import { HStack } from '../h-stack';
-import { ItemGroup } from '../item-group';
+import { Item, ItemGroup } from '../item-group';
 import { VStack } from '../v-stack';
 import GradientPicker from '../gradient-picker';
 import ColorPalette from '../color-palette';
@@ -38,21 +34,20 @@ import {
 	PaletteActionsContainer,
 	PaletteEditStyles,
 	PaletteHeading,
-	PaletteHStackHeader,
 	IndicatorStyled,
-	PaletteItem,
 	NameContainer,
 	NameInputControl,
 	DoneButton,
 	RemoveButton,
+	PaletteEditContents,
 } from './styles';
 import { NavigableMenu } from '../navigable-container';
 import { DEFAULT_GRADIENT } from '../custom-gradient-picker/constants';
 import CustomGradientPicker from '../custom-gradient-picker';
+import { kebabCase } from '../utils/strings';
 import type {
 	Color,
 	ColorPickerPopoverProps,
-	Gradient,
 	NameInputProps,
 	OptionProps,
 	PaletteEditListViewProps,
@@ -73,25 +68,47 @@ function NameInput( { value, onChange, label }: NameInputProps ) {
 	);
 }
 
+/*
+ * Deduplicates the slugs of the provided elements.
+ */
+export function deduplicateElementSlugs< T extends PaletteElement >(
+	elements: T[]
+) {
+	const slugCounts: { [ slug: string ]: number } = {};
+
+	return elements.map( ( element ) => {
+		let newSlug: string | undefined;
+
+		const { slug } = element;
+		slugCounts[ slug ] = ( slugCounts[ slug ] || 0 ) + 1;
+
+		if ( slugCounts[ slug ] > 1 ) {
+			newSlug = `${ slug }-${ slugCounts[ slug ] - 1 }`;
+		}
+
+		return { ...element, slug: newSlug ?? slug };
+	} );
+}
+
 /**
- * Returns a temporary name for a palette item in the format "Color + id".
- * To ensure there are no duplicate ids, this function checks all slugs for temporary names.
+ * Returns a name and slug for a palette item. The name takes the format "Color + id".
+ * To ensure there are no duplicate ids, this function checks all slugs.
  * It expects slugs to be in the format: slugPrefix + color- + number.
  * It then sets the id component of the new name based on the incremented id of the highest existing slug id.
  *
  * @param elements   An array of color palette items.
  * @param slugPrefix The slug prefix used to match the element slug.
  *
- * @return A unique name for a palette item.
+ * @return A name and slug for the new palette item.
  */
-export function getNameForPosition(
+export function getNameAndSlugForPosition(
 	elements: PaletteElement[],
 	slugPrefix: string
 ) {
-	const temporaryNameRegex = new RegExp( `^${ slugPrefix }color-([\\d]+)$` );
+	const nameRegex = new RegExp( `^${ slugPrefix }color-([\\d]+)$` );
 	const position = elements.reduce( ( previousValue, currentValue ) => {
 		if ( typeof currentValue?.slug === 'string' ) {
-			const matches = currentValue?.slug.match( temporaryNameRegex );
+			const matches = currentValue?.slug.match( nameRegex );
 			if ( matches ) {
 				const id = parseInt( matches[ 1 ], 10 );
 				if ( id >= previousValue ) {
@@ -102,14 +119,17 @@ export function getNameForPosition(
 		return previousValue;
 	}, 1 );
 
-	return sprintf(
-		/* translators: %s: is a temporary id for a custom color */
-		__( 'Color %s' ),
-		position
-	);
+	return {
+		name: sprintf(
+			/* translators: %s: is an id for a custom color */
+			__( 'Color %s' ),
+			position
+		),
+		slug: `${ slugPrefix }color-${ position }`,
+	};
 }
 
-function ColorPickerPopover< T extends Color | Gradient >( {
+function ColorPickerPopover< T extends PaletteElement >( {
 	isGradient,
 	element,
 	onChange,
@@ -127,7 +147,7 @@ function ColorPickerPopover< T extends Color | Gradient >( {
 				resize: false,
 				placement: 'left-start',
 				...receivedPopoverProps,
-				className: classnames(
+				className: clsx(
 					'components-palette-edit__popover',
 					receivedPopoverProps?.className
 				),
@@ -152,7 +172,6 @@ function ColorPickerPopover< T extends Color | Gradient >( {
 			{ isGradient && (
 				<div className="components-palette-edit__popover-gradient-picker">
 					<CustomGradientPicker
-						__nextHasNoMargin
 						__experimentalIsRenderedInSidebar
 						value={ element.gradient }
 						onChange={ ( newGradient ) => {
@@ -168,20 +187,17 @@ function ColorPickerPopover< T extends Color | Gradient >( {
 	);
 }
 
-function Option< T extends Color | Gradient >( {
+function Option< T extends PaletteElement >( {
 	canOnlyChangeValues,
 	element,
 	onChange,
-	isEditing,
-	onStartEditing,
 	onRemove,
-	onStopEditing,
 	popoverProps: receivedPopoverProps,
 	slugPrefix,
 	isGradient,
 }: OptionProps< T > ) {
-	const focusOutsideProps = useFocusOutside( onStopEditing );
 	const value = isGradient ? element.gradient : element.color;
+	const [ isEditingColor, setIsEditingColor ] = useState( false );
 
 	// Use internal state instead of a ref to make sure that the component
 	// re-renders when the popover's anchor updates.
@@ -196,27 +212,23 @@ function Option< T extends Color | Gradient >( {
 	);
 
 	return (
-		<PaletteItem
-			className={ isEditing ? 'is-selected' : undefined }
-			as="div"
-			onClick={ onStartEditing }
-			ref={ setPopoverAnchor }
-			{ ...( isEditing
-				? { ...focusOutsideProps }
-				: {
-						style: {
-							cursor: 'pointer',
-						},
-				  } ) }
-		>
+		<Item ref={ setPopoverAnchor } size="small">
 			<HStack justify="flex-start">
+				<Button
+					onClick={ () => {
+						setIsEditingColor( true );
+					} }
+					aria-label={ sprintf(
+						// translators: %s is a color or gradient name, e.g. "Red".
+						__( 'Edit: %s' ),
+						element.name.trim().length ? element.name : value
+					) }
+					style={ { padding: 0 } }
+				>
+					<IndicatorStyled colorValue={ value } />
+				</Button>
 				<FlexItem>
-					<IndicatorStyled
-						style={ { background: value, color: 'transparent' } }
-					/>
-				</FlexItem>
-				<FlexItem>
-					{ isEditing && ! canOnlyChangeValues ? (
+					{ ! canOnlyChangeValues ? (
 						<NameInput
 							label={
 								isGradient
@@ -235,93 +247,74 @@ function Option< T extends Color | Gradient >( {
 							}
 						/>
 					) : (
-						<NameContainer>{ element.name }</NameContainer>
+						<NameContainer>
+							{ element.name.trim().length
+								? element.name
+								: /* Fall back to non-breaking space to maintain height */
+								  '\u00A0' }
+						</NameContainer>
 					) }
 				</FlexItem>
-				{ isEditing && ! canOnlyChangeValues && (
+				{ ! canOnlyChangeValues && (
 					<FlexItem>
 						<RemoveButton
-							isSmall
+							size="small"
 							icon={ lineSolid }
-							label={ __( 'Remove color' ) }
+							label={ sprintf(
+								// translators: %s is a color or gradient name, e.g. "Red".
+								__( 'Remove color: %s' ),
+								element.name.trim().length
+									? element.name
+									: value
+							) }
 							onClick={ onRemove }
 						/>
 					</FlexItem>
 				) }
 			</HStack>
-			{ isEditing && (
+			{ isEditingColor && (
 				<ColorPickerPopover
 					isGradient={ isGradient }
 					onChange={ onChange }
 					element={ element }
 					popoverProps={ popoverProps }
+					onClose={ () => setIsEditingColor( false ) }
 				/>
 			) }
-		</PaletteItem>
-	);
-}
-
-function isTemporaryElement(
-	slugPrefix: string,
-	{ slug, color, gradient }: Color | Gradient
-) {
-	const regex = new RegExp( `^${ slugPrefix }color-([\\d]+)$` );
-	return (
-		regex.test( slug ) &&
-		( ( !! color && color === DEFAULT_COLOR ) ||
-			( !! gradient && gradient === DEFAULT_GRADIENT ) )
+		</Item>
 	);
 }
 
-function PaletteEditListView< T extends Color | Gradient >( {
+function PaletteEditListView< T extends PaletteElement >( {
 	elements,
 	onChange,
-	editingElement,
-	setEditingElement,
 	canOnlyChangeValues,
 	slugPrefix,
 	isGradient,
 	popoverProps,
+	addColorRef,
 }: PaletteEditListViewProps< T > ) {
 	// When unmounting the component if there are empty elements (the user did not complete the insertion) clean them.
-	const elementsReference = useRef< typeof elements >();
+	const elementsReferenceRef = useRef< typeof elements >();
 	useEffect( () => {
-		elementsReference.current = elements;
+		elementsReferenceRef.current = elements;
 	}, [ elements ] );
-	useEffect( () => {
-		return () => {
-			if (
-				elementsReference.current?.some( ( element ) =>
-					isTemporaryElement( slugPrefix, element )
-				)
-			) {
-				const newElements = elementsReference.current.filter(
-					( element ) => ! isTemporaryElement( slugPrefix, element )
-				);
-				onChange( newElements.length ? newElements : undefined );
-			}
-		};
-		// Disable reason: adding the missing dependency here would cause breaking changes that will require
-		// a heavier refactor to avoid. See https://github.com/WordPress/gutenberg/pull/43911
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [] );
 
-	const debounceOnChange = useDebounce( onChange, 100 );
+	const debounceOnChange = useDebounce(
+		( updatedElements: T[] ) =>
+			onChange( deduplicateElementSlugs( updatedElements ) ),
+		100
+	);
 
 	return (
 		<VStack spacing={ 3 }>
-			<ItemGroup isRounded>
+			<ItemGroup isRounded isBordered isSeparated>
 				{ elements.map( ( element, index ) => (
 					<Option
 						isGradient={ isGradient }
 						canOnlyChangeValues={ canOnlyChangeValues }
 						key={ index }
 						element={ element }
-						onStartEditing={ () => {
-							if ( editingElement !== index ) {
-								setEditingElement( index );
-							}
-						} }
 						onChange={ ( newElement ) => {
 							debounceOnChange(
 								elements.map(
@@ -335,7 +328,6 @@ function PaletteEditListView< T extends Color | Gradient >( {
 							);
 						} }
 						onRemove={ () => {
-							setEditingElement( null );
 							const newElements = elements.filter(
 								( _currentElement, currentIndex ) => {
 									if ( currentIndex === index ) {
@@ -347,12 +339,7 @@ function PaletteEditListView< T extends Color | Gradient >( {
 							onChange(
 								newElements.length ? newElements : undefined
 							);
-						} }
-						isEditing={ index === editingElement }
-						onStopEditing={ () => {
-							if ( index === editingElement ) {
-								setEditingElement( null );
-							}
+							addColorRef.current?.focus();
 						} }
 						slugPrefix={ slugPrefix }
 						popoverProps={ popoverProps }
@@ -431,16 +418,18 @@ export function PaletteEdit( {
 		[ isGradient, elements ]
 	);
 
+	const addColorRef = useRef< HTMLButtonElement | null >( null );
+
 	return (
 		<PaletteEditStyles>
-			<PaletteHStackHeader>
+			<HStack>
 				<PaletteHeading level={ paletteLabelHeadingLevel }>
 					{ paletteLabel }
 				</PaletteHeading>
 				<PaletteActionsContainer>
 					{ hasElements && isEditing && (
 						<DoneButton
-							isSmall
+							size="small"
 							onClick={ () => {
 								setIsEditing( false );
 								setEditingElement( null );
@@ -451,7 +440,8 @@ export function PaletteEdit( {
 					) }
 					{ ! canOnlyChangeValues && (
 						<Button
-							isSmall
+							ref={ addColorRef }
+							size="small"
 							isPressed={ isAdding }
 							icon={ plus }
 							label={
@@ -460,20 +450,19 @@ export function PaletteEdit( {
 									: __( 'Add color' )
 							}
 							onClick={ () => {
-								const tempOptionName = getNameForPosition(
-									elements,
-									slugPrefix
-								);
+								const { name, slug } =
+									getNameAndSlugForPosition(
+										elements,
+										slugPrefix
+									);
 
 								if ( !! gradients ) {
 									onChange( [
 										...gradients,
 										{
 											gradient: DEFAULT_GRADIENT,
-											name: tempOptionName,
-											slug:
-												slugPrefix +
-												kebabCase( tempOptionName ),
+											name,
+											slug,
 										},
 									] );
 								} else {
@@ -481,10 +470,8 @@ export function PaletteEdit( {
 										...colors,
 										{
 											color: DEFAULT_COLOR,
-											name: tempOptionName,
-											slug:
-												slugPrefix +
-												kebabCase( tempOptionName ),
+											name,
+											slug,
 										},
 									] );
 								}
@@ -506,7 +493,7 @@ export function PaletteEdit( {
 										: __( 'Color options' )
 								}
 								toggleProps={ {
-									isSmall: true,
+									size: 'small',
 								} }
 							>
 								{ ( { onClose }: { onClose: () => void } ) => (
@@ -568,20 +555,19 @@ export function PaletteEdit( {
 							</DropdownMenu>
 						) }
 				</PaletteActionsContainer>
-			</PaletteHStackHeader>
+			</HStack>
 			{ hasElements && (
-				<>
+				<PaletteEditContents>
 					{ isEditing && (
 						<PaletteEditListView< ( typeof elements )[ number ] >
 							canOnlyChangeValues={ canOnlyChangeValues }
 							elements={ elements }
 							// @ts-expect-error TODO: Don't know how to resolve
 							onChange={ onChange }
-							editingElement={ editingElement }
-							setEditingElement={ setEditingElement }
 							slugPrefix={ slugPrefix }
 							isGradient={ isGradient }
 							popoverProps={ popoverProps }
+							addColorRef={ addColorRef }
 						/>
 					) }
 					{ ! isEditing && editingElement !== null && (
@@ -615,23 +601,24 @@ export function PaletteEdit( {
 					{ ! isEditing &&
 						( isGradient ? (
 							<GradientPicker
-								__nextHasNoMargin
 								gradients={ gradients }
 								onChange={ onSelectPaletteItem }
 								clearable={ false }
-								disableCustomGradients={ true }
+								disableCustomGradients
 							/>
 						) : (
 							<ColorPalette
 								colors={ colors }
 								onChange={ onSelectPaletteItem }
 								clearable={ false }
-								disableCustomColors={ true }
+								disableCustomColors
 							/>
 						) ) }
-				</>
+				</PaletteEditContents>
+			) }
+			{ ! hasElements && emptyMessage && (
+				<PaletteEditContents>{ emptyMessage }</PaletteEditContents>
 			) }
-			{ ! hasElements && emptyMessage }
 		</PaletteEditStyles>
 	);
 }
diff --git a/packages/components/src/palette-edit/stories/index.story.tsx b/packages/components/src/palette-edit/stories/index.story.tsx
index dd2ab92978c923..e78bc04d5b9ec9 100644
--- a/packages/components/src/palette-edit/stories/index.story.tsx
+++ b/packages/components/src/palette-edit/stories/index.story.tsx
@@ -56,6 +56,7 @@ Default.args = {
 	colors: [
 		{ color: '#1a4548', name: 'Primary', slug: 'primary' },
 		{ color: '#0000ff', name: 'Secondary', slug: 'secondary' },
+		{ color: '#fb326b', name: 'Tertiary', slug: 'tertiary' },
 	],
 	paletteLabel: 'Colors',
 	emptyMessage: 'Colors are empty',
diff --git a/packages/components/src/palette-edit/style.scss b/packages/components/src/palette-edit/style.scss
index 55fdfbf42cb525..d73c7ff46cc3c0 100644
--- a/packages/components/src/palette-edit/style.scss
+++ b/packages/components/src/palette-edit/style.scss
@@ -1,6 +1,6 @@
 .components-palette-edit__popover-gradient-picker {
-	width: 280px;
-	padding: 8px;
+	width: 260px;
+	padding: $grid-unit-10;
 }
 .components-dropdown-menu__menu {
 	.components-palette-edit__menu-button {
diff --git a/packages/components/src/palette-edit/styles.js b/packages/components/src/palette-edit/styles.js
deleted file mode 100644
index 4beeb6e7c2213d..00000000000000
--- a/packages/components/src/palette-edit/styles.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * External dependencies
- */
-import styled from '@emotion/styled';
-
-/**
- * Internal dependencies
- */
-import Button from '../button';
-import { Heading } from '../heading';
-import { HStack } from '../h-stack';
-import { space } from '../utils/space';
-import { COLORS, CONFIG } from '../utils';
-import { View } from '../view';
-import InputControl from '../input-control';
-import {
-	Container as InputControlContainer,
-	Input,
-	BackdropUI as InputBackdropUI,
-} from '../input-control/styles/input-control-styles';
-import CircularOptionPicker from '../circular-option-picker';
-
-export const IndicatorStyled = styled( CircularOptionPicker.Option )`
-	width: ${ space( 6 ) };
-	height: ${ space( 6 ) };
-	pointer-events: none;
-`;
-
-export const NameInputControl = styled( InputControl )`
-	${ InputControlContainer } {
-		background: ${ COLORS.gray[ 100 ] };
-		border-radius: ${ CONFIG.controlBorderRadius };
-		${ Input }${ Input }${ Input }${ Input } {
-			height: ${ space( 8 ) };
-		}
-		${ InputBackdropUI }${ InputBackdropUI }${ InputBackdropUI } {
-			border-color: transparent;
-			box-shadow: none;
-		}
-	}
-`;
-
-export const PaletteItem = styled( View )`
-	padding-block: 3px;
-	padding-inline-start: ${ space( 3 ) };
-	border: 1px solid ${ CONFIG.surfaceBorderColor };
-	border-bottom-color: transparent;
-	&:first-of-type {
-		border-top-left-radius: ${ CONFIG.controlBorderRadius };
-		border-top-right-radius: ${ CONFIG.controlBorderRadius };
-	}
-	&:last-of-type {
-		border-bottom-left-radius: ${ CONFIG.controlBorderRadius };
-		border-bottom-right-radius: ${ CONFIG.controlBorderRadius };
-		border-bottom-color: ${ CONFIG.surfaceBorderColor };
-	}
-	&.is-selected + & {
-		border-top-color: transparent;
-	}
-	&.is-selected {
-		border-color: ${ COLORS.theme.accent };
-	}
-`;
-
-export const NameContainer = styled.div`
-	line-height: ${ space( 8 ) };
-	margin-left: ${ space( 2 ) };
-	margin-right: ${ space( 2 ) };
-	white-space: nowrap;
-	overflow: hidden;
-	${ PaletteItem }:hover & {
-		color: ${ COLORS.theme.accent };
-	}
-`;
-
-export const PaletteHeading = styled( Heading )`
-	text-transform: uppercase;
-	line-height: ${ space( 6 ) };
-	font-weight: 500;
-	&&& {
-		font-size: 11px;
-		margin-bottom: 0;
-	}
-`;
-
-export const PaletteActionsContainer = styled( View )`
-	height: ${ space( 6 ) };
-	display: flex;
-`;
-
-export const PaletteHStackHeader = styled( HStack )`
-	margin-bottom: ${ space( 2 ) };
-`;
-
-export const PaletteEditStyles = styled( View )`
-	&&& {
-		.components-button.has-icon {
-			min-width: 0;
-			padding: 0;
-		}
-	}
-`;
-
-export const DoneButton = styled( Button )`
-	&& {
-		color: ${ COLORS.theme.accent };
-	}
-`;
-
-export const RemoveButton = styled( Button )`
-	&& {
-		margin-top: ${ space( 1 ) };
-	}
-`;
diff --git a/packages/components/src/palette-edit/styles.ts b/packages/components/src/palette-edit/styles.ts
new file mode 100644
index 00000000000000..0afe38773fc8e2
--- /dev/null
+++ b/packages/components/src/palette-edit/styles.ts
@@ -0,0 +1,90 @@
+/**
+ * External dependencies
+ */
+import styled from '@emotion/styled';
+
+/**
+ * Internal dependencies
+ */
+import Button from '../button';
+import { Heading } from '../heading';
+import { space } from '../utils/space';
+import { COLORS, CONFIG } from '../utils';
+import { View } from '../view';
+import InputControl from '../input-control';
+import {
+	Container as InputControlContainer,
+	Input,
+	BackdropUI as InputBackdropUI,
+} from '../input-control/styles/input-control-styles';
+import ColorIndicator from '../color-indicator';
+
+export const IndicatorStyled = styled( ColorIndicator )`
+	&& {
+		flex-shrink: 0;
+		width: ${ space( 6 ) };
+		height: ${ space( 6 ) };
+	}
+`;
+
+export const NameInputControl = styled( InputControl )`
+	${ InputControlContainer } {
+		background: ${ COLORS.gray[ 100 ] };
+		border-radius: ${ CONFIG.radiusXSmall };
+		${ Input }${ Input }${ Input }${ Input } {
+			height: ${ space( 8 ) };
+		}
+		${ InputBackdropUI }${ InputBackdropUI }${ InputBackdropUI } {
+			border-color: transparent;
+			box-shadow: none;
+		}
+	}
+`;
+
+export const NameContainer = styled.div`
+	line-height: ${ space( 8 ) };
+	margin-left: ${ space( 2 ) };
+	margin-right: ${ space( 2 ) };
+	white-space: nowrap;
+	overflow: hidden;
+`;
+
+export const PaletteHeading = styled( Heading )`
+	text-transform: uppercase;
+	line-height: ${ space( 6 ) };
+	font-weight: 500;
+	&&& {
+		font-size: 11px;
+		margin-bottom: 0;
+	}
+`;
+
+export const PaletteActionsContainer = styled( View )`
+	height: ${ space( 6 ) };
+	display: flex;
+`;
+
+export const PaletteEditContents = styled( View )`
+	margin-top: ${ space( 2 ) };
+`;
+
+export const PaletteEditStyles = styled( View )`
+	&&& {
+		.components-button.has-icon {
+			min-width: 0;
+			padding: 0;
+		}
+	}
+`;
+
+export const DoneButton = styled( Button )`
+	&& {
+		color: ${ COLORS.theme.accent };
+	}
+`;
+
+export const RemoveButton = styled( Button )`
+	&& {
+		margin-top: ${ space( 1 ) };
+	}
+`;
diff --git a/packages/components/src/palette-edit/test/index.tsx b/packages/components/src/palette-edit/test/index.tsx
index 1bf2802709de7f..7dc00dbba22042 100644
--- a/packages/components/src/palette-edit/test/index.tsx
+++ b/packages/components/src/palette-edit/test/index.tsx
@@ -1,25 +1,42 @@
 /**
  * External dependencies
  */
-import { render, fireEvent, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import { click, type, press } from '@ariakit/test';
 
 /**
  * Internal dependencies
  */
-import PaletteEdit, { getNameForPosition } from '..';
+import PaletteEdit, {
+	getNameAndSlugForPosition,
+	deduplicateElementSlugs,
+} from '..';
 import type { PaletteElement } from '../types';
 
-describe( 'getNameForPosition', () => {
+const noop = () => {};
+
+async function clearInput( input: HTMLInputElement ) {
+	await click( input );
+
+	// Press backspace as many times as the input's current value
+	// eslint-disable-next-line @typescript-eslint/no-unused-vars
+	for ( const _ of Array( input.value.length ) ) {
+		await press.Backspace();
+	}
+}
+
+describe( 'getNameAndSlugForPosition', () => {
 	test( 'should return 1 by default', () => {
 		const slugPrefix = 'test-';
 		const elements: PaletteElement[] = [];
 
-		expect( getNameForPosition( elements, slugPrefix ) ).toEqual(
-			'Color 1'
-		);
+		expect( getNameAndSlugForPosition( elements, slugPrefix ) ).toEqual( {
+			name: 'Color 1',
+			slug: 'test-color-1',
+		} );
 	} );
 
-	test( 'should return a new color name with an incremented slug id', () => {
+	test( 'should return a new color name and slug with an incremented slug id', () => {
 		const slugPrefix = 'test-';
 		const elements = [
 			{
@@ -29,12 +46,13 @@ describe( 'getNameForPosition', () => {
 			},
 		];
 
-		expect( getNameForPosition( elements, slugPrefix ) ).toEqual(
-			'Color 2'
-		);
+		expect( getNameAndSlugForPosition( elements, slugPrefix ) ).toEqual( {
+			name: 'Color 2',
+			slug: 'test-color-2',
+		} );
 	} );
 
-	test( 'should ignore user-defined color names', () => {
+	test( 'should ignore user-defined color name and slug', () => {
 		const slugPrefix = 'test-';
 		const elements = [
 			{
@@ -44,12 +62,13 @@ describe( 'getNameForPosition', () => {
 			},
 		];
 
-		expect( getNameForPosition( elements, slugPrefix ) ).toEqual(
-			'Color 1'
-		);
+		expect( getNameAndSlugForPosition( elements, slugPrefix ) ).toEqual( {
+			name: 'Color 1',
+			slug: 'test-color-1',
+		} );
 	} );
 
-	test( 'should return a new color name with an incremented slug id one higher than the current highest', () => {
+	test( 'should return a new color name and slug with an incremented slug id one higher than the current highest', () => {
 		const slugPrefix = 'test-';
 		const elements = [
 			{
@@ -74,26 +93,379 @@ describe( 'getNameForPosition', () => {
 			},
 		];
 
-		expect( getNameForPosition( elements, slugPrefix ) ).toEqual(
-			'Color 151'
-		);
+		expect( getNameAndSlugForPosition( elements, slugPrefix ) ).toEqual( {
+			name: 'Color 151',
+			slug: 'test-color-151',
+		} );
+	} );
+} );
+
+describe( 'deduplicateElementSlugs', () => {
+	it( 'should not change the slugs if they are unique', () => {
+		const elements: PaletteElement[] = [
+			{
+				slug: 'test-color-1',
+				color: '#ffffff',
+				name: 'Test Color 1',
+			},
+			{
+				slug: 'test-color-2',
+				color: '#1a4548',
+				name: 'Test Color 2',
+			},
+		];
+
+		expect( deduplicateElementSlugs( elements ) ).toEqual( elements );
+	} );
+	it( 'should change the slugs if they are not unique', () => {
+		const elements: PaletteElement[] = [
+			{
+				slug: 'test-color-1',
+				color: '#ffffff',
+				name: 'Test Color 1',
+			},
+			{
+				slug: 'test-color-1',
+				color: '#1a4548',
+				name: 'Test Color 2',
+			},
+		];
+
+		expect( deduplicateElementSlugs( elements ) ).toEqual( [
+			{
+				slug: 'test-color-1',
+				color: '#ffffff',
+				name: 'Test Color 1',
+			},
+			{
+				slug: 'test-color-1-1',
+				color: '#1a4548',
+				name: 'Test Color 2',
+			},
+		] );
 	} );
 } );
 
 describe( 'PaletteEdit', () => {
 	const defaultProps = {
-		colors: [ { color: '#ffffff', name: 'Base', slug: 'base' } ],
-		onChange: jest.fn(),
 		paletteLabel: 'Test label',
-		emptyMessage: 'Test empty message',
-		canOnlyChangeValues: true,
-		canReset: true,
 		slugPrefix: '',
+		onChange: noop,
 	};
 
-	it( 'opens color selector for color palettes', () => {
-		render( <PaletteEdit { ...defaultProps } /> );
-		fireEvent.click( screen.getByLabelText( 'Color: Base' ) );
-		expect( screen.getByLabelText( 'Hex color' ) ).toBeInTheDocument();
+	const colors = [
+		{ color: '#1a4548', name: 'Primary', slug: 'primary' },
+		{ color: '#0000ff', name: 'Secondary', slug: 'secondary' },
+	];
+	const gradients = [
+		{
+			gradient:
+				'linear-gradient(135deg,rgb(255,245,203) 0%,rgb(182,227,212) 50%,rgb(51,167,181) 100%)',
+			name: 'Pale ocean',
+			slug: 'pale-ocean',
+		},
+		{
+			gradient:
+				'linear-gradient(135deg,rgb(2,3,129) 0%,rgb(40,116,252) 100%)',
+			name: 'Midnight',
+			slug: 'midnight',
+		},
+	];
+
+	it( 'shows heading label', () => {
+		render( <PaletteEdit { ...defaultProps } colors={ colors } /> );
+
+		const paletteLabel = screen.getByRole( 'heading', {
+			level: 2,
+			name: 'Test label',
+		} );
+
+		expect( paletteLabel ).toBeVisible();
+	} );
+
+	it( 'shows heading label with custom heading level', () => {
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				paletteLabelHeadingLevel={ 5 }
+			/>
+		);
+
+		expect(
+			screen.getByRole( 'heading', {
+				level: 5,
+				name: 'Test label',
+			} )
+		).toBeVisible();
+	} );
+
+	it( 'shows empty message', () => {
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				emptyMessage="Test empty message"
+			/>
+		);
+
+		expect( screen.getByText( 'Test empty message' ) ).toBeVisible();
+	} );
+
+	it( 'shows an option to remove all colors', async () => {
+		render( <PaletteEdit { ...defaultProps } colors={ colors } /> );
+
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+
+		await waitFor( () => {
+			expect(
+				screen.getByRole( 'button', {
+					name: 'Remove all colors',
+				} )
+			).toBeVisible();
+		} );
+	} );
+
+	it( 'shows a reset option when the `canReset` prop is enabled', async () => {
+		render(
+			<PaletteEdit { ...defaultProps } colors={ colors } canReset />
+		);
+
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+		await waitFor( () => {
+			expect(
+				screen.getByRole( 'button', {
+					name: 'Reset colors',
+				} )
+			).toBeVisible();
+		} );
+	} );
+
+	it( 'does not show a reset colors option when `canReset` is disabled', async () => {
+		render( <PaletteEdit { ...defaultProps } colors={ colors } /> );
+
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+		expect(
+			screen.queryByRole( 'button', {
+				name: 'Reset colors',
+			} )
+		).not.toBeInTheDocument();
+	} );
+
+	it( 'calls the `onChange` with the new color appended', async () => {
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				onChange={ onChange }
+			/>
+		);
+
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Add color',
+			} )
+		);
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				...colors,
+				{
+					color: '#000',
+					name: 'Color 1',
+					slug: 'color-1',
+				},
+			] );
+		} );
+	} );
+
+	it( 'calls the `onChange` with the new gradient appended', async () => {
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				gradients={ gradients }
+				onChange={ onChange }
+			/>
+		);
+
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Add gradient',
+			} )
+		);
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				...gradients,
+				{
+					gradient:
+						'linear-gradient(135deg, rgba(6, 147, 227, 1) 0%, rgb(155, 81, 224) 100%)',
+					name: 'Color 1',
+					slug: 'color-1',
+				},
+			] );
+		} );
+	} );
+
+	it( 'can not add new colors when `canOnlyChangeValues` is enabled', () => {
+		render( <PaletteEdit { ...defaultProps } canOnlyChangeValues /> );
+
+		expect(
+			screen.queryByRole( 'button', {
+				name: 'Add color',
+			} )
+		).not.toBeInTheDocument();
+	} );
+
+	it( 'can remove a color', async () => {
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				onChange={ onChange }
+			/>
+		);
+
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Show details',
+			} )
+		);
+		await click( screen.getByRole( 'button', { name: 'Edit: Primary' } ) );
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Remove color: Primary',
+			} )
+		);
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [ colors[ 1 ] ] );
+		} );
+	} );
+
+	it( 'can update palette name', async () => {
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				onChange={ onChange }
+			/>
+		);
+
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+		await click(
+			screen.getByRole( 'button', {
+				name: 'Show details',
+			} )
+		);
+		await click( screen.getByRole( 'button', { name: 'Edit: Primary' } ) );
+		const nameInput = screen.getByDisplayValue( 'Primary' );
+
+		await clearInput( nameInput as HTMLInputElement );
+
+		await type( 'Primary Updated' );
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				{
+					...colors[ 0 ],
+					name: 'Primary Updated',
+					slug: 'primary-updated',
+				},
+				colors[ 1 ],
+			] );
+		} );
+	} );
+
+	it( 'can update color palette value', async () => {
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				onChange={ onChange }
+			/>
+		);
+
+		await click( screen.getByLabelText( 'Color: Primary' ) );
+		const hexInput = screen.getByRole( 'textbox', {
+			name: 'Hex color',
+		} );
+
+		await clearInput( hexInput as HTMLInputElement );
+
+		await type( '000000' );
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				{
+					...colors[ 0 ],
+					color: '#000000',
+				},
+				colors[ 1 ],
+			] );
+		} );
+	} );
+
+	it( 'can update gradient palette value', async () => {
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				gradients={ gradients }
+				onChange={ onChange }
+			/>
+		);
+
+		await click( screen.getByLabelText( 'Gradient: Pale ocean' ) );
+
+		// Select radial gradient option
+		await click(
+			screen.getByRole( 'combobox', {
+				name: 'Type',
+			} )
+		);
+		await click( screen.getByRole( 'option', { name: 'Radial' } ) );
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				{
+					...gradients[ 0 ],
+					gradient:
+						'radial-gradient(rgb(255,245,203) 0%,rgb(182,227,212) 50%,rgb(51,167,181) 100%)',
+				},
+				gradients[ 1 ],
+			] );
+		} );
 	} );
 } );
diff --git a/packages/components/src/palette-edit/types.ts b/packages/components/src/palette-edit/types.ts
index 1cc0611628c2f4..71cd0ac1d8cf52 100644
--- a/packages/components/src/palette-edit/types.ts
+++ b/packages/components/src/palette-edit/types.ts
@@ -116,11 +116,8 @@ export type OptionProps< T extends Color | Gradient > = {
 	onChange: ( newElement: T ) => void;
 	isGradient: T extends Gradient ? true : false;
 	canOnlyChangeValues: PaletteEditProps[ 'canOnlyChangeValues' ];
-	isEditing: boolean;
 	key: Key;
 	onRemove: MouseEventHandler< HTMLButtonElement >;
-	onStartEditing: () => void;
-	onStopEditing: () => void;
 	popoverProps?: PaletteEditProps[ 'popoverProps' ];
 	slugPrefix: string;
 };
@@ -130,6 +127,7 @@ export type PaletteEditListViewProps< T extends Color | Gradient > = {
 	onChange: ( newElements?: T[] ) => void;
 	isGradient: T extends Gradient ? true : false;
 	canOnlyChangeValues: PaletteEditProps[ 'canOnlyChangeValues' ];
+	addColorRef: React.RefObject< HTMLButtonElement >;
 	editingElement?: EditingElement;
 	popoverProps?: PaletteEditProps[ 'popoverProps' ];
 	setEditingElement: ( newEditingElement?: EditingElement ) => void;
diff --git a/packages/components/src/panel/README.md b/packages/components/src/panel/README.md
index be4beca3e75278..ae9c209f250f54 100644
--- a/packages/components/src/panel/README.md
+++ b/packages/components/src/panel/README.md
@@ -4,12 +4,6 @@ Panels expand and collapse multiple sections of content.
 
 ![](https://make.wordpress.org/design/files/2019/03/panel.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Anatomy
diff --git a/packages/components/src/panel/actions.native.js b/packages/components/src/panel/actions.native.js
index cea78ce46fef0a..9e14932bfd5e19 100644
--- a/packages/components/src/panel/actions.native.js
+++ b/packages/components/src/panel/actions.native.js
@@ -6,7 +6,6 @@ import { View } from 'react-native';
 /**
  * WordPress dependencies
  */
-import { TextControl } from '@wordpress/components';
 import { withPreferredColorScheme } from '@wordpress/compose';
 import { useMemo } from '@wordpress/element';
 
@@ -15,6 +14,7 @@ import { useMemo } from '@wordpress/element';
  */
 import styles from './actions.scss';
 import BottomSeparatorCover from './bottom-separator-cover';
+import TextControl from '../text-control';
 
 function PanelActions( { actions, getStylesFromColorScheme } ) {
 	const mappedActions = useMemo( () => {
diff --git a/packages/components/src/panel/body.tsx b/packages/components/src/panel/body.tsx
index 46841f428fac19..bf6b867dccbf45 100644
--- a/packages/components/src/panel/body.tsx
+++ b/packages/components/src/panel/body.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -79,7 +79,7 @@ export function UnforwardedPanelBody(
 		}
 	}, [ isOpened, scrollBehavior ] );
 
-	const classes = classnames( 'components-panel__body', className, {
+	const classes = clsx( 'components-panel__body', className, {
 		'is-opened': isOpened,
 	} );
 
@@ -109,7 +109,9 @@ const PanelBodyTitle = forwardRef(
 		}: WordPressComponentProps< PanelBodyTitleProps, 'button' >,
 		ref: React.ForwardedRef< any >
 	) => {
-		if ( ! title ) return null;
+		if ( ! title ) {
+			return null;
+		}
 
 		return (
 			<h2 className="components-panel__body-title">
diff --git a/packages/components/src/panel/index.tsx b/packages/components/src/panel/index.tsx
index aa15d043647ec4..de44af6bdfa3f8 100644
--- a/packages/components/src/panel/index.tsx
+++ b/packages/components/src/panel/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -18,7 +18,7 @@ function UnforwardedPanel(
 	{ header, className, children }: PanelProps,
 	ref: React.ForwardedRef< HTMLDivElement >
 ) {
-	const classNames = classnames( className, 'components-panel' );
+	const classNames = clsx( className, 'components-panel' );
 	return (
 		<div className={ classNames } ref={ ref }>
 			{ header && <PanelHeader label={ header } /> }
diff --git a/packages/components/src/panel/row.tsx b/packages/components/src/panel/row.tsx
index 72f0e392e90b04..392f215c2c6754 100644
--- a/packages/components/src/panel/row.tsx
+++ b/packages/components/src/panel/row.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -20,7 +20,7 @@ function UnforwardedPanelRow(
 ) {
 	return (
 		<div
-			className={ classnames( 'components-panel__row', className ) }
+			className={ clsx( 'components-panel__row', className ) }
 			ref={ ref }
 		>
 			{ children }
diff --git a/packages/components/src/panel/stories/index.story.tsx b/packages/components/src/panel/stories/index.story.tsx
index 7f69f766603ebb..af9cf626f8eecd 100644
--- a/packages/components/src/panel/stories/index.story.tsx
+++ b/packages/components/src/panel/stories/index.story.tsx
@@ -17,7 +17,8 @@ import InputControl from '../../input-control';
 import { wordpress } from '@wordpress/icons';
 
 const meta: Meta< typeof Panel > = {
-	title: 'Components/Panel',
+	title: 'Components/Containers/Panel',
+	id: 'components-panel',
 	component: Panel,
 	// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
 	subcomponents: { PanelRow, PanelBody },
diff --git a/packages/components/src/panel/style.scss b/packages/components/src/panel/style.scss
index b26f134e72350b..e525cd92569182 100644
--- a/packages/components/src/panel/style.scss
+++ b/packages/components/src/panel/style.scss
@@ -32,6 +32,7 @@
 
 .components-panel__header {
 	display: flex;
+	flex-shrink: 0;
 	justify-content: space-between;
 	align-items: center;
 	padding: 0 $grid-unit-20;
diff --git a/packages/components/src/placeholder/index.tsx b/packages/components/src/placeholder/index.tsx
index d55741f1f41578..9a6e12f30fefcd 100644
--- a/packages/components/src/placeholder/index.tsx
+++ b/packages/components/src/placeholder/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -68,14 +68,14 @@ export function Placeholder(
 		};
 	}
 
-	const classes = classnames(
+	const classes = clsx(
 		'components-placeholder',
 		className,
 		modifierClassNames,
 		withIllustration ? 'has-illustration' : null
 	);
 
-	const fieldsetClasses = classnames( 'components-placeholder__fieldset', {
+	const fieldsetClasses = clsx( 'components-placeholder__fieldset', {
 		'is-column-layout': isColumnLayout,
 	} );
 
diff --git a/packages/components/src/placeholder/style.scss b/packages/components/src/placeholder/style.scss
index ce98350b767353..a38d7d3e3ace8b 100644
--- a/packages/components/src/placeholder/style.scss
+++ b/packages/components/src/placeholder/style.scss
@@ -1,27 +1,25 @@
 // This needs specificity to override individual block styles.
 .components-placeholder.components-placeholder {
+	font-size: $default-font-size;
 	box-sizing: border-box;
 	position: relative;
-	padding: 1em;
+	padding: $grid-unit-30;
 	width: 100%;
 	text-align: left;
 	margin: 0;
 	color: $gray-900;
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	gap: $grid-unit-20;
 
 	// Some editor styles unset this.
 	-moz-font-smoothing: subpixel-antialiased;
 	-webkit-font-smoothing: subpixel-antialiased;
 
-	// IE11 doesn't read rules inside this query. They are applied only to modern browsers.
-	@supports (position: sticky) {
-		display: flex;
-		flex-direction: column;
-		justify-content: top;
-		align-items: flex-start;
-	}
 
 	// Block UI appearance.
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;	// Match the block toolbar material radius.
 	background-color: $white;
 	box-shadow: inset 0 0 0 $border-width $gray-900;
 	outline: 1px solid transparent; // Shown for Windows 10 High Contrast mode.
@@ -33,18 +31,22 @@
 .components-placeholder__fieldset {
 	font-family: $default-font;
 	font-size: $default-font-size;
+	// Global Styles can affect this so we are resetting.
+	letter-spacing: initial;
+	line-height: initial;
+	text-transform: none;
+	font-weight: normal;
 }
 
 .components-placeholder__label {
-	display: flex;
 	font-weight: 600;
-	margin-bottom: $grid-unit-20;
 	align-items: center;
+	display: flex;
 
 	> svg,
 	.dashicon,
 	.block-editor-block-icon {
-		margin-right: $grid-unit-15;
+		margin-right: $grid-unit-05;
 		fill: currentColor;
 		// Optimizate for high contrast modes.
 		// See also https://blogs.windows.com/msedgedev/2020/09/17/styling-for-windows-high-contrast-with-new-standards-for-forced-colors/.
@@ -65,6 +67,8 @@
 	flex-direction: row;
 	width: 100%;
 	flex-wrap: wrap;
+	gap: $grid-unit-20;
+	justify-content: flex-start;
 
 	p {
 		font-family: $default-font;
@@ -79,28 +83,14 @@
 
 .components-placeholder__input[type="url"] {
 	@include input-control;
-	margin: 0 8px 0 0;
 	flex: 1 1 auto;
 }
 
-.components-placeholder__instructions {
-	margin-bottom: 1em;
-}
-
 .components-placeholder__error {
-	margin-top: 1em;
 	width: 100%;
+	gap: $grid-unit-10;
 }
 
-.components-placeholder__fieldset .components-button {
-	margin-right: $grid-unit-15;
-	margin-bottom: $grid-unit-15; // If buttons wrap we need vertical space between.
-
-	&:last-child {
-		margin-bottom: 0;
-		margin-right: 0;
-	}
-}
 
 // Any `<Button />` component with `variant="link"` prop will need extra spacing if placed
 // immediately after a button which is *not* an `variant="link"` style button. This is because
@@ -117,14 +107,6 @@
 
 // Element queries to show different layouts at various sizes.
 .components-placeholder {
-	// Medium and large sizes.
-	&.is-large {
-		.components-placeholder__label {
-			font-size: 18pt;
-			font-weight: normal;
-		}
-	}
-
 	// Medium and small sizes.
 	&.is-medium,
 	&.is-small {
@@ -137,21 +119,15 @@
 			flex-direction: column;
 		}
 
-		.components-placeholder__fieldset .components-button {
-			margin-right: auto;
+		.components-placeholder__fieldset > *,
+		.components-button {
+			width: 100%;
+			justify-content: center;
 		}
 	}
 
-	// Small sizes.
 	&.is-small {
-		.components-button {
-			padding: 0 $grid-unit-10 2px;
-		}
-	}
-	.components-placeholder__learn-more {
-		.components-external-link {
-			color: var(--wp-admin-theme-color);
-		}
+		padding: $grid-unit-20;
 	}
 }
 
@@ -168,6 +144,9 @@
 	display: flex;
 	box-shadow: none;
 
+	// In the unselected state, radius should match Global Styles > Image > Radius.
+	border-radius: 0;
+
 	// Blur the background so layered dashed placeholders are still visually separate.
 	// Make the background transparent to not interfere with the background overlay in placeholder-style() pseudo element
 	backdrop-filter: blur(100px);
@@ -182,8 +161,6 @@
 	}
 
 	.components-placeholder__fieldset {
-		width: auto;
-
 		// Unset intrinsic margins.
 		margin-left: 0;
 		margin-right: 0;
@@ -209,9 +186,22 @@
 		}
 	}
 
-	// By painting the borders here, we enable them to be replaced by the Border control.
-	@include placeholder-style();
-	overflow: auto;
+	&::before {
+		content: "";
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		pointer-events: none;
+		background: currentColor;
+		opacity: 0.1;
+	}
+
+	overflow: hidden;
+	.is-selected & {
+		overflow: auto;
+	}
 }
 
 // Position the spinner.
diff --git a/packages/components/src/popover/index.tsx b/packages/components/src/popover/index.tsx
index 709d4b9884b5ec..3005f13c952ec0 100644
--- a/packages/components/src/popover/index.tsx
+++ b/packages/components/src/popover/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import type { ForwardedRef, SyntheticEvent, RefCallback } from 'react';
-import classnames from 'classnames';
+import clsx from 'clsx';
 import {
 	useFloating,
 	flip as flipMiddleware,
@@ -13,10 +13,8 @@ import {
 	offset as offsetMiddleware,
 	size,
 } from '@floating-ui/react-dom';
-// eslint-disable-next-line no-restricted-imports
 import type { HTMLMotionProps, MotionProps } from 'framer-motion';
-// eslint-disable-next-line no-restricted-imports
-import { motion, useReducedMotion } from 'framer-motion';
+import { motion } from 'framer-motion';
 
 /**
  * WordPress dependencies
@@ -33,6 +31,7 @@ import {
 	createPortal,
 } from '@wordpress/element';
 import {
+	useReducedMotion,
 	useViewportMatch,
 	useMergeRefs,
 	__experimentalUseDialog as useDialog,
@@ -53,11 +52,7 @@ import {
 	placementToMotionAnimationProps,
 	getReferenceElement,
 } from './utils';
-import {
-	contextConnect,
-	useContextSystem,
-	ContextSystemProvider,
-} from '../context';
+import { contextConnect, useContextSystem } from '../context';
 import type { WordPressComponentProps } from '../context';
 import type {
 	PopoverProps,
@@ -81,7 +76,7 @@ export const SLOT_NAME = 'Popover';
 const ArrowTriangle = () => (
 	<SVG
 		xmlns="http://www.w3.org/2000/svg"
-		viewBox={ `0 0 100 100` }
+		viewBox="0 0 100 100"
 		className="components-popover__triangle"
 		role="presentation"
 	>
@@ -113,19 +108,21 @@ const getPopoverFallbackContainer = () => {
 	return container;
 };
 
-const UnconnectedPopover = (
+const UnforwardedPopover = (
 	props: Omit<
 		WordPressComponentProps< PopoverProps, 'div', false >,
 		// To avoid overlaps between the standard HTML attributes and the props
 		// expected by `framer-motion`, omit all framer motion props from popover
-		// props (except for `animate` and `children`, which are re-defined in `PopoverProps`).
-		keyof Omit< MotionProps, 'animate' | 'children' >
+		// props (except for `animate` and `children` which are re-defined in
+		// `PopoverProps`, and `style` which is merged safely).
+		keyof Omit< MotionProps, 'animate' | 'children' | 'style' >
 	>,
 	forwardedRef: ForwardedRef< any >
 ) => {
 	const {
 		animate = true,
 		headerTitle,
+		constrainTabbing,
 		onClose,
 		children,
 		className,
@@ -143,6 +140,7 @@ const UnconnectedPopover = (
 		shift = false,
 		inline = false,
 		variant,
+		style: contentStyle,
 
 		// Deprecated props
 		__unstableForcePosition,
@@ -228,8 +226,9 @@ const UnconnectedPopover = (
 					const { firstElementChild } = refs.floating.current ?? {};
 
 					// Only HTMLElement instances have the `style` property.
-					if ( ! ( firstElementChild instanceof HTMLElement ) )
+					if ( ! ( firstElementChild instanceof HTMLElement ) ) {
 						return;
+					}
 
 					// Reduce the height of the popover to the available space.
 					Object.assign( firstElementChild.style, {
@@ -264,6 +263,7 @@ const UnconnectedPopover = (
 	}
 
 	const [ dialogRef, dialogProps ] = useDialog( {
+		constrainTabbing,
 		focusOnMount,
 		__unstableOnClose: onDialogClose,
 		// @ts-expect-error The __unstableOnClose property needs to be deprecated first (see https://github.com/WordPress/gutenberg/pull/27675)
@@ -372,6 +372,7 @@ const UnconnectedPopover = (
 	const animationProps: HTMLMotionProps< 'div' > = shouldAnimate
 		? {
 				style: {
+					...contentStyle,
 					...motionInlineStyles,
 					...style,
 				},
@@ -380,7 +381,10 @@ const UnconnectedPopover = (
 		  }
 		: {
 				animate: false,
-				style,
+				style: {
+					...contentStyle,
+					...style,
+				},
 		  };
 
 	// When Floating UI has finished positioning and Framer Motion has finished animating
@@ -388,100 +392,63 @@ const UnconnectedPopover = (
 	const isPositioned =
 		( ! shouldAnimate || animationFinished ) && x !== null && y !== null;
 
-	// In case a `ColorPicker` component is rendered as a child of `Popover`,
-	// the `Popover` component can be notified of when the user is dragging
-	// parts of the `ColorPicker` UI (this is possible because the `ColorPicker`
-	// component exposes the `onPickerDragStart` and `onPickerDragEnd` props
-	// via internal context).
-	// While the user is performing a pointer drag, the `Popover` will render
-	// a transparent backdrop element that will serve as a "pointer events trap",
-	// making sure that no pointer events reach any potential `iframe` element
-	// underneath (like, for example, the editor canvas in the WordPress editor).
-	const [ showBackdrop, setShowBackdrop ] = useState( false );
-	const contextValue = useMemo(
-		() => ( {
-			ColorPicker: {
-				onPickerDragStart() {
-					setShowBackdrop( true );
-				},
-				onPickerDragEnd() {
-					setShowBackdrop( false );
-				},
-			},
-		} ),
-		[]
-	);
-
 	let content = (
-		<>
-			{ showBackdrop && (
-				<div
-					className="components-popover-pointer-events-trap"
-					aria-hidden="true"
-					onClick={ () => setShowBackdrop( false ) }
-				/>
+		<motion.div
+			className={ clsx( className, {
+				'is-expanded': isExpanded,
+				'is-positioned': isPositioned,
+				// Use the 'alternate' classname for 'toolbar' variant for back compat.
+				[ `is-${
+					computedVariant === 'toolbar'
+						? 'alternate'
+						: computedVariant
+				}` ]: computedVariant,
+			} ) }
+			{ ...animationProps }
+			{ ...contentProps }
+			ref={ mergedFloatingRef }
+			{ ...dialogProps }
+			tabIndex={ -1 }
+		>
+			{ /* Prevents scroll on the document */ }
+			{ isExpanded && <ScrollLock /> }
+			{ isExpanded && (
+				<div className="components-popover__header">
+					<span className="components-popover__header-title">
+						{ headerTitle }
+					</span>
+					<Button
+						className="components-popover__close"
+						icon={ close }
+						onClick={ onClose }
+					/>
+				</div>
 			) }
-			<motion.div
-				className={ classnames( 'components-popover', className, {
-					'is-expanded': isExpanded,
-					'is-positioned': isPositioned,
-					// Use the 'alternate' classname for 'toolbar' variant for back compat.
-					[ `is-${
-						computedVariant === 'toolbar'
-							? 'alternate'
-							: computedVariant
-					}` ]: computedVariant,
-				} ) }
-				{ ...animationProps }
-				{ ...contentProps }
-				ref={ mergedFloatingRef }
-				{ ...dialogProps }
-				tabIndex={ -1 }
-			>
-				{ /* Prevents scroll on the document */ }
-				{ isExpanded && <ScrollLock /> }
-				{ isExpanded && (
-					<div className="components-popover__header">
-						<span className="components-popover__header-title">
-							{ headerTitle }
-						</span>
-						<Button
-							className="components-popover__close"
-							icon={ close }
-							onClick={ onClose }
-						/>
-					</div>
-				) }
-				<div className="components-popover__content">
-					<ContextSystemProvider value={ contextValue }>
-						{ children }
-					</ContextSystemProvider>
+			<div className="components-popover__content">{ children }</div>
+			{ hasArrow && (
+				<div
+					ref={ arrowCallbackRef }
+					className={ [
+						'components-popover__arrow',
+						`is-${ computedPlacement.split( '-' )[ 0 ] }`,
+					].join( ' ' ) }
+					style={ {
+						left:
+							typeof arrowData?.x !== 'undefined' &&
+							Number.isFinite( arrowData.x )
+								? `${ arrowData.x }px`
+								: '',
+						top:
+							typeof arrowData?.y !== 'undefined' &&
+							Number.isFinite( arrowData.y )
+								? `${ arrowData.y }px`
+								: '',
+					} }
+				>
+					<ArrowTriangle />
 				</div>
-				{ hasArrow && (
-					<div
-						ref={ arrowCallbackRef }
-						className={ [
-							'components-popover__arrow',
-							`is-${ computedPlacement.split( '-' )[ 0 ] }`,
-						].join( ' ' ) }
-						style={ {
-							left:
-								typeof arrowData?.x !== 'undefined' &&
-								Number.isFinite( arrowData.x )
-									? `${ arrowData.x }px`
-									: '',
-							top:
-								typeof arrowData?.y !== 'undefined' &&
-								Number.isFinite( arrowData.y )
-									? `${ arrowData.y }px`
-									: '',
-						} }
-					>
-						<ArrowTriangle />
-					</div>
-				) }
-			</motion.div>
-		</>
+			) }
+		</motion.div>
 	);
 
 	const shouldRenderWithinSlot = slot.ref && ! inline;
@@ -531,7 +498,7 @@ const UnconnectedPopover = (
  * ```
  *
  */
-export const Popover = contextConnect( UnconnectedPopover, 'Popover' );
+export const Popover = contextConnect( UnforwardedPopover, 'Popover' );
 
 function PopoverSlot(
 	{ name = SLOT_NAME }: { name?: string },
diff --git a/packages/components/src/popover/overlay-middlewares.tsx b/packages/components/src/popover/overlay-middlewares.tsx
index fb64d739dce3b6..8647fe6fb5251e 100644
--- a/packages/components/src/popover/overlay-middlewares.tsx
+++ b/packages/components/src/popover/overlay-middlewares.tsx
@@ -17,7 +17,9 @@ export function overlayMiddlewares() {
 				const { firstElementChild } = elements.floating ?? {};
 
 				// Only HTMLElement instances have the `style` property.
-				if ( ! ( firstElementChild instanceof HTMLElement ) ) return;
+				if ( ! ( firstElementChild instanceof HTMLElement ) ) {
+					return;
+				}
 
 				// Reduce the height of the popover to the available space.
 				Object.assign( firstElementChild.style, {
diff --git a/packages/components/src/popover/stories/index.story.tsx b/packages/components/src/popover/stories/index.story.tsx
index 7f06045ac9b057..dfffaefe802a49 100644
--- a/packages/components/src/popover/stories/index.story.tsx
+++ b/packages/components/src/popover/stories/index.story.tsx
@@ -1,14 +1,12 @@
 /**
  * External dependencies
  */
-import type { StoryFn, Meta } from '@storybook/react';
+import type { Meta, StoryObj } from '@storybook/react';
 
 /**
  * WordPress dependencies
  */
 import { useState, useRef, useEffect } from '@wordpress/element';
-// @ts-expect-error The `@wordpress/block-editor` is not typed
-import { __unstableIframe as Iframe } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -81,174 +79,176 @@ const PopoverWithAnchor = ( args: PopoverProps ) => {
 	);
 };
 
-const Template: StoryFn< typeof Popover > = ( args ) => {
-	const [ isVisible, setIsVisible ] = useState( false );
-	const toggleVisible = () => {
-		setIsVisible( ( state ) => ! state );
-	};
-	const buttonRef = useRef< HTMLButtonElement | undefined >();
-	useEffect( () => {
-		buttonRef.current?.scrollIntoView?.( {
-			block: 'center',
-			inline: 'center',
-		} );
-	}, [] );
+export const Default: StoryObj< typeof Popover > = {
+	decorators: [
+		( Story ) => {
+			const [ isVisible, setIsVisible ] = useState( false );
+			const toggleVisible = () => {
+				setIsVisible( ( state ) => ! state );
+			};
+			const buttonRef = useRef< HTMLButtonElement | undefined >();
+			useEffect( () => {
+				buttonRef.current?.scrollIntoView?.( {
+					block: 'center',
+					inline: 'center',
+				} );
+			}, [] );
+
+			return (
+				<div
+					style={ {
+						width: '300vw',
+						height: '300vh',
+						display: 'flex',
+						alignItems: 'center',
+						justifyContent: 'center',
+					} }
+				>
+					<Button
+						variant="secondary"
+						onClick={ toggleVisible }
+						ref={ buttonRef }
+					>
+						Toggle Popover
+						{ isVisible && <Story /> }
+					</Button>
+				</div>
+			);
+		},
+	],
+	args: {
+		children: (
+			<div style={ { width: '280px', whiteSpace: 'normal' } }>
+				Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+				eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+				enim ad minim veniam, quis nostrud exercitation ullamco laboris
+				nisi ut aliquip ex ea commodo consequat.
+			</div>
+		),
+	},
+};
 
-	return (
+export const Unstyled: StoryObj< typeof Popover > = {
+	...Default,
+	args: {
+		...Default.args,
+
+		variant: 'unstyled',
+	},
+};
+
+export const AllPlacements: StoryObj< typeof Popover > = {
+	render: ( { children, ...args } ) => (
 		<div
 			style={ {
-				width: '300vw',
-				height: '300vh',
-				display: 'flex',
-				alignItems: 'center',
-				justifyContent: 'center',
+				minWidth: '600px',
+				marginLeft: 'auto',
+				marginRight: 'auto',
 			} }
 		>
-			<Button
-				variant="secondary"
-				onClick={ toggleVisible }
-				ref={ buttonRef }
-			>
-				Toggle Popover
-				{ isVisible && <Popover { ...args } /> }
-			</Button>
-		</div>
-	);
-};
-
-export const Default: StoryFn< typeof Popover > = Template.bind( {} );
-Default.args = {
-	children: (
-		<div style={ { width: '280px', whiteSpace: 'normal' } }>
-			Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-			eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-			ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-			aliquip ex ea commodo consequat.
+			<h2>
+				Resize / scroll the viewport to test the behavior of the
+				popovers when they reach the viewport boundaries.
+			</h2>
+			<div>
+				{ AVAILABLE_PLACEMENTS.map( ( p ) => (
+					<PopoverWithAnchor
+						key={ p }
+						placement={ p }
+						{ ...args }
+						resize={ p === 'overlay' ? true : args.resize }
+					>
+						{ children }
+						<div>
+							<small>(placement: { p })</small>
+						</div>
+					</PopoverWithAnchor>
+				) ) }
+			</div>
 		</div>
 	),
+	// Excluding placement and position since they all possible values
+	// are passed directly in code.
+	parameters: {
+		controls: {
+			exclude: [ 'placement', 'position' ],
+		},
+	},
+	args: {
+		...Default.args,
+		children: (
+			<div style={ { width: '280px', whiteSpace: 'normal' } }>
+				Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+				eiusmod tempor incididunt ut labore et dolore magna aliqua.
+			</div>
+		),
+		noArrow: false,
+		offset: 10,
+		resize: false,
+		flip: false,
+	},
 };
 
-export const Unstyled: StoryFn< typeof Popover > = Template.bind( {} );
-Unstyled.args = {
-	children: (
-		<div style={ { width: '280px', whiteSpace: 'normal' } }>
-			Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-			eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-			ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-			aliquip ex ea commodo consequat.
-		</div>
-	),
-	variant: 'unstyled',
-};
+export const DynamicHeight: StoryObj< typeof Popover > = {
+	decorators: [
+		( Story ) => {
+			const [ height, setHeight ] = useState( 200 );
+			const increase = () => setHeight( height + 100 );
+			const decrease = () => setHeight( height - 100 );
 
-export const AllPlacements: StoryFn< typeof Popover > = ( {
-	children,
-	...args
-} ) => (
-	<div
-		style={ {
-			minWidth: '600px',
-			marginLeft: 'auto',
-			marginRight: 'auto',
-		} }
-	>
-		<h2>
-			Resize / scroll the viewport to test the behavior of the popovers
-			when they reach the viewport boundaries.
-		</h2>
-		<div>
-			{ AVAILABLE_PLACEMENTS.map( ( p ) => (
-				<PopoverWithAnchor
-					key={ p }
-					placement={ p }
-					{ ...args }
-					resize={ p === 'overlay' ? true : args.resize }
-				>
-					{ children }
+			return (
+				<div style={ { padding: '20px' } }>
 					<div>
-						<small>(placement: { p })</small>
+						<Button
+							variant="primary"
+							onClick={ increase }
+							style={ {
+								marginRight: '20px',
+							} }
+						>
+							Increase Size
+						</Button>
+
+						<Button variant="primary" onClick={ decrease }>
+							Decrease Size
+						</Button>
 					</div>
-				</PopoverWithAnchor>
-			) ) }
-		</div>
-	</div>
-);
-// Excluding placement and position since they all possible values
-// are passed directly in code.
-AllPlacements.parameters = {
-	controls: {
-		exclude: [ 'placement', 'position' ],
-	},
-};
-AllPlacements.args = {
-	...Default.args,
-	children: (
-		<div style={ { width: '280px', whiteSpace: 'normal' } }>
-			Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-			eiusmod tempor incididunt ut labore et dolore magna aliqua.
-		</div>
-	),
-	noArrow: false,
-	offset: 10,
-	resize: false,
-	flip: false,
-};
 
-export const DynamicHeight: StoryFn< typeof Popover > = ( {
-	children,
-	...args
-} ) => {
-	const [ height, setHeight ] = useState( 200 );
-	const increase = () => setHeight( height + 100 );
-	const decrease = () => setHeight( height - 100 );
-
-	return (
-		<div style={ { padding: '20px' } }>
-			<div>
-				<Button
-					variant="primary"
-					onClick={ increase }
-					style={ {
-						marginRight: '20px',
-					} }
-				>
-					Increase Size
-				</Button>
-
-				<Button variant="primary" onClick={ decrease }>
-					Decrease Size
-				</Button>
-			</div>
+					<p>
+						When the height of the popover exceeds the available
+						space in the canvas, a scrollbar inside the popover
+						should appear.
+					</p>
 
-			<p>
-				When the height of the popover exceeds the available space in
-				the canvas, a scrollbar inside the popover should appear.
-			</p>
-
-			<div>
-				<Popover { ...args }>
-					<div
-						style={ {
-							height,
-							background: '#eee',
-							padding: '20px',
-						} }
-					>
-						{ children }
+					<div>
+						<style>{ `.components-popover { --dynamic-height: ${ height }px; }` }</style>
+						<Story />
 					</div>
-				</Popover>
+				</div>
+			);
+		},
+	],
+	args: {
+		...Default.args,
+		children: (
+			<div
+				style={ {
+					height: 'var(--dynamic-height)',
+					background: '#eee',
+					padding: '20px',
+				} }
+			>
+				Content with dynamic height
 			</div>
-		</div>
-	);
-};
-DynamicHeight.args = {
-	...Default.args,
-	children: 'Content with dynamic height',
+		),
+	},
 };
 
-export const WithSlotOutsideIframe: StoryFn< typeof Popover > = ( args ) => {
-	return <PopoverInsideIframeRenderedInExternalSlot { ...args } />;
-};
-WithSlotOutsideIframe.args = {
-	...Default.args,
+export const WithSlotOutsideIframe: StoryObj< typeof Popover > = {
+	render: ( args ) => (
+		<PopoverInsideIframeRenderedInExternalSlot { ...args } />
+	),
+	args: {
+		...Default.args,
+	},
 };
diff --git a/packages/components/src/popover/style.scss b/packages/components/src/popover/style.scss
index 2e8a766829f3a6..601e9ebb7675f5 100644
--- a/packages/components/src/popover/style.scss
+++ b/packages/components/src/popover/style.scss
@@ -6,6 +6,7 @@ $shadow-popover-border-top-only: 0 #{-$border-width} 0 0 $gray-400;
 $shadow-popover-border-top-only-alternate: 0 #{-$border-width} 0 $gray-900;
 
 .components-popover {
+	@include reset;
 	z-index: z-index(".components-popover");
 	will-change: transform;
 
@@ -21,14 +22,15 @@ $shadow-popover-border-top-only-alternate: 0 #{-$border-width} 0 $gray-900;
 
 .components-popover__content {
 	background: $white;
-	box-shadow: $shadow-popover-border-default, $shadow-popover;
-	border-radius: $radius-block-ui;
+	box-shadow: $shadow-popover-border-default, $elevation-medium;
+	border-radius: $radius-medium;
 	box-sizing: border-box;
 	width: min-content;
 
-	// Alternate treatment for popovers that put them at elevation zero with high contrast.
+	// Alternate treatment for popovers that put them at elevation zero with high contrast and smaller radius.
 	.is-alternate & {
 		box-shadow: $shadow-popover-border-default-alternate;
+		border-radius: $radius-small;
 	}
 
 	// A style that gives the popover no visible ui.
@@ -133,12 +135,3 @@ $shadow-popover-border-top-only-alternate: 0 #{-$border-width} 0 $gray-900;
 		stroke: $gray-900;
 	}
 }
-
-.components-popover-pointer-events-trap {
-	// Same z-index as popover, but rendered before the popover element
-	// in DOM order = it will display just under the popover
-	z-index: z-index(".components-popover");
-	position: fixed;
-	inset: 0;
-	background-color: transparent;
-}
diff --git a/packages/components/src/popover/test/index.tsx b/packages/components/src/popover/test/index.tsx
index 33a2d8758c09db..eac0f942df2f6e 100644
--- a/packages/components/src/popover/test/index.tsx
+++ b/packages/components/src/popover/test/index.tsx
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import { render, screen, waitFor, getByText } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import type { CSSProperties } from 'react';
 
 /**
@@ -36,6 +37,28 @@ type PlacementToInitialTranslationTuple = [
 	CSSProperties[ 'translate' ],
 ];
 
+beforeAll( () => {
+	// This mock is necessary because deep in the weeds, `useConstrained` relies
+	// on `focusable` to return a list of DOM elements that can be focused. Part
+	// of this process involves checking that an element has an intrinsic size,
+	// which will always fail in JSDom.
+	//
+	// https://github.com/WordPress/gutenberg/blob/trunk/packages/dom/src/focusable.js#L55-L61
+	jest.spyOn(
+		HTMLElement.prototype,
+		'offsetHeight',
+		'get'
+	).mockImplementation( function getOffsetHeight( this: HTMLElement ) {
+		// The `1` returned here is somewhat arbitrary – it just needs to be a
+		// non-zero integer.
+		return 1;
+	} );
+} );
+
+afterAll( () => {
+	jest.restoreAllMocks();
+} );
+
 // There's no matching `placement` for 'middle center' positions,
 // fallback to 'bottom' (same as `floating-ui`'s default.)
 const FALLBACK_FOR_MIDDLE_CENTER_POSITIONS = 'bottom';
@@ -156,13 +179,44 @@ describe( 'Popover', () => {
 			} );
 		} );
 
-		describe( 'focus behavior', () => {
-			it( 'should focus the popover container when opened', async () => {
+		describe( 'style', () => {
+			it( 'outputs inline styles added through the style prop in addition to built-in popover positioning styles', async () => {
+				render(
+					<Popover
+						style={ { zIndex: 0 } }
+						data-testid="popover-element"
+					>
+						Hello
+					</Popover>
+				);
+				const popover = screen.getByTestId( 'popover-element' );
+
+				await waitFor( () => expect( popover ).toBeVisible() );
+				expect( popover ).toHaveStyle(
+					'position: absolute; top: 0px; left: 0px; z-index: 0;'
+				);
+			} );
+
+			it( 'is not possible to override built-in popover positioning styles via the style prop', async () => {
 				render(
 					<Popover
-						focusOnMount={ true }
+						style={ { position: 'static' } }
 						data-testid="popover-element"
 					>
+						Hello
+					</Popover>
+				);
+				const popover = screen.getByTestId( 'popover-element' );
+
+				await waitFor( () => expect( popover ).toBeVisible() );
+				expect( popover ).not.toHaveStyle( 'position: static;' );
+			} );
+		} );
+
+		describe( 'focus behavior', () => {
+			it( 'should focus the popover container when opened', async () => {
+				render(
+					<Popover focusOnMount data-testid="popover-element">
 						Popover content
 					</Popover>
 				);
@@ -188,6 +242,233 @@ describe( 'Popover', () => {
 				expect( document.body ).toHaveFocus();
 			} );
 		} );
+
+		describe( 'tab constraint behavior', () => {
+			// `constrainTabbing` is implicitly controlled by `focusOnMount`.
+			// By default, when `focusOnMount` is false, `constrainTabbing` will
+			// also be false; otherwise, `constrainTabbing` will be true.
+
+			const setup = async (
+				props?: Partial< React.ComponentProps< typeof Popover > >
+			) => {
+				const user = await userEvent.setup();
+				const view = render(
+					<Popover data-testid="popover-element" { ...props }>
+						<button>Button 1</button>
+						<button>Button 2</button>
+						<button>Button 3</button>
+					</Popover>
+				);
+
+				const popover = screen.getByTestId( 'popover-element' );
+				await waitFor( () => expect( popover ).toBeVisible() );
+
+				const [ firstButton, secondButton, thirdButton ] =
+					screen.getAllByRole( 'button' );
+
+				return {
+					...view,
+					popover,
+					firstButton,
+					secondButton,
+					thirdButton,
+					user,
+				};
+			};
+
+			// Note: due to an issue in testing-library/user-event [1], the
+			// tests for constrained tabbing fail.
+			// [1]: https://github.com/testing-library/user-event/issues/1188
+			//
+			// eslint-disable-next-line jest/no-disabled-tests
+			describe.skip( 'constrains tabbing', () => {
+				test( 'by default', async () => {
+					// The default value for `focusOnMount` is 'firstElement',
+					// which means the default value for `constrainTabbing` is
+					// 'true'.
+
+					const { user, firstButton, secondButton, thirdButton } =
+						await setup();
+
+					await waitFor( () => expect( firstButton ).toHaveFocus() );
+					await user.tab();
+					expect( secondButton ).toHaveFocus();
+					await user.tab();
+					expect( thirdButton ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab( { shift: true } );
+					expect( thirdButton ).toHaveFocus();
+				} );
+
+				test( 'when `focusOnMount` is true', async () => {
+					const {
+						user,
+						popover,
+						firstButton,
+						secondButton,
+						thirdButton,
+					} = await setup( { focusOnMount: true } );
+
+					expect( popover ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab();
+					expect( secondButton ).toHaveFocus();
+					await user.tab();
+					expect( thirdButton ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab( { shift: true } );
+					expect( thirdButton ).toHaveFocus();
+				} );
+
+				test( 'when `focusOnMount` is "firstElement"', async () => {
+					const { user, firstButton, secondButton, thirdButton } =
+						await setup( { focusOnMount: 'firstElement' } );
+
+					await waitFor( () => expect( firstButton ).toHaveFocus() );
+					await user.tab();
+					expect( secondButton ).toHaveFocus();
+					await user.tab();
+					expect( thirdButton ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab( { shift: true } );
+					expect( thirdButton ).toHaveFocus();
+				} );
+
+				test( 'when `focusOnMount` is false if `constrainTabbing` is true', async () => {
+					const {
+						user,
+						baseElement,
+						firstButton,
+						secondButton,
+						thirdButton,
+					} = await setup( {
+						focusOnMount: false,
+						constrainTabbing: true,
+					} );
+
+					expect( baseElement ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab();
+					expect( secondButton ).toHaveFocus();
+					await user.tab();
+					expect( thirdButton ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab( { shift: true } );
+					expect( thirdButton ).toHaveFocus();
+				} );
+			} );
+
+			describe( 'does not constrain tabbing', () => {
+				test( 'when `constrainTabbing` is false', async () => {
+					// The default value for `focusOnMount` is 'firstElement',
+					// which means the default value for `constrainTabbing` is
+					// 'true', but the provided value should override this.
+
+					const {
+						user,
+						baseElement,
+						firstButton,
+						secondButton,
+						thirdButton,
+					} = await setup( { constrainTabbing: false } );
+
+					await waitFor( () => expect( firstButton ).toHaveFocus() );
+					await user.tab();
+					expect( secondButton ).toHaveFocus();
+					await user.tab();
+					expect( thirdButton ).toHaveFocus();
+					await user.tab();
+					expect( baseElement ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab( { shift: true } );
+					expect( baseElement ).toHaveFocus();
+				} );
+
+				test( 'when `focusOnMount` is false', async () => {
+					const {
+						user,
+						baseElement,
+						firstButton,
+						secondButton,
+						thirdButton,
+					} = await setup( { focusOnMount: false } );
+
+					expect( baseElement ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab();
+					expect( secondButton ).toHaveFocus();
+					await user.tab();
+					expect( thirdButton ).toHaveFocus();
+					await user.tab();
+					expect( baseElement ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab( { shift: true } );
+					expect( baseElement ).toHaveFocus();
+				} );
+
+				test( 'when `focusOnMount` is true if `constrainTabbing` is false', async () => {
+					const {
+						user,
+						baseElement,
+						popover,
+						firstButton,
+						secondButton,
+						thirdButton,
+					} = await setup( {
+						focusOnMount: true,
+						constrainTabbing: false,
+					} );
+
+					expect( popover ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab();
+					expect( secondButton ).toHaveFocus();
+					await user.tab();
+					expect( thirdButton ).toHaveFocus();
+					await user.tab();
+					expect( baseElement ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab( { shift: true } );
+					expect( baseElement ).toHaveFocus();
+				} );
+
+				test( 'when `focusOnMount` is "firstElement" if `constrainTabbing` is false', async () => {
+					const {
+						user,
+						baseElement,
+						firstButton,
+						secondButton,
+						thirdButton,
+					} = await setup( {
+						focusOnMount: 'firstElement',
+						constrainTabbing: false,
+					} );
+
+					await waitFor( () => expect( firstButton ).toHaveFocus() );
+					await user.tab();
+					expect( secondButton ).toHaveFocus();
+					await user.tab();
+					expect( thirdButton ).toHaveFocus();
+					await user.tab();
+					expect( baseElement ).toHaveFocus();
+					await user.tab();
+					expect( firstButton ).toHaveFocus();
+					await user.tab( { shift: true } );
+					expect( baseElement ).toHaveFocus();
+				} );
+			} );
+		} );
 	} );
 
 	describe( 'Slot outside iframe', () => {
diff --git a/packages/components/src/popover/types.ts b/packages/components/src/popover/types.ts
index c4250b22ba8349..427f4afb81bfb9 100644
--- a/packages/components/src/popover/types.ts
+++ b/packages/components/src/popover/types.ts
@@ -65,6 +65,15 @@ export type PopoverProps = {
 	 * @default true
 	 */
 	flip?: boolean;
+	/**
+	 * Determines whether tabbing is constrained to within the popover,
+	 * preventing keyboard focus from leaving the popover content without
+	 * explicit focus elswhere, or whether the popover remains part of the wider
+	 * tab order. If no value is passed, it will be derived from `focusOnMount`.
+	 *
+	 * @default `focusOnMount` !== false
+	 */
+	constrainTabbing?: boolean;
 	/**
 	 * By default, the _first tabbable element_ in the popover will receive focus
 	 * when it mounts. This is the same as setting this prop to `"firstElement"`.
diff --git a/packages/components/src/popover/utils.ts b/packages/components/src/popover/utils.ts
index 50e452222677e9..6b9a4fa3c36a9c 100644
--- a/packages/components/src/popover/utils.ts
+++ b/packages/components/src/popover/utils.ts
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import type { MotionProps } from 'framer-motion';
 import type { Placement, ReferenceType } from '@floating-ui/react-dom';
 
diff --git a/packages/components/src/private-apis.native.js b/packages/components/src/private-apis.native.js
new file mode 100644
index 00000000000000..659de19f39137b
--- /dev/null
+++ b/packages/components/src/private-apis.native.js
@@ -0,0 +1,13 @@
+/**
+ * Internal dependencies
+ */
+import { kebabCase } from './utils/strings';
+import { lock } from './lock-unlock';
+
+/**
+ * Private @wordpress/components APIs.
+ */
+export const privateApis = {};
+lock( privateApis, {
+	kebabCase,
+} );
diff --git a/packages/components/src/private-apis.ts b/packages/components/src/private-apis.ts
index fb4679dbc34234..51f820251b8d7c 100644
--- a/packages/components/src/private-apis.ts
+++ b/packages/components/src/private-apis.ts
@@ -1,84 +1,22 @@
-/**
- * WordPress dependencies
- */
-import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
-
 /**
  * Internal dependencies
  */
-import {
-	Composite as CompositeV2,
-	CompositeGroup as CompositeGroupV2,
-	CompositeItem as CompositeItemV2,
-	CompositeRow as CompositeRowV2,
-	useCompositeStore as useCompositeStoreV2,
-} from './composite/v2';
-import { default as CustomSelectControl } from './custom-select-control';
 import { positionToPlacement as __experimentalPopoverLegacyPositionToPlacement } from './popover/utils';
-import { default as ProgressBar } from './progress-bar';
 import { createPrivateSlotFill } from './slot-fill';
-import {
-	DropdownMenu as DropdownMenuV2,
-	DropdownMenuCheckboxItem as DropdownMenuCheckboxItemV2,
-	DropdownMenuGroup as DropdownMenuGroupV2,
-	DropdownMenuItem as DropdownMenuItemV2,
-	DropdownMenuLabel as DropdownMenuLabelV2,
-	DropdownMenuRadioGroup as DropdownMenuRadioGroupV2,
-	DropdownMenuRadioItem as DropdownMenuRadioItemV2,
-	DropdownMenuSeparator as DropdownMenuSeparatorV2,
-	DropdownSubMenu as DropdownSubMenuV2,
-	DropdownSubMenuTrigger as DropdownSubMenuTriggerV2,
-} from './dropdown-menu-v2';
-import {
-	DropdownMenu as DropdownMenuV2Ariakit,
-	DropdownMenuGroup as DropdownMenuGroupV2Ariakit,
-	DropdownMenuItem as DropdownMenuItemV2Ariakit,
-	DropdownMenuCheckboxItem as DropdownMenuCheckboxItemV2Ariakit,
-	DropdownMenuRadioItem as DropdownMenuRadioItemV2Ariakit,
-	DropdownMenuSeparator as DropdownMenuSeparatorV2Ariakit,
-	DropdownMenuItemLabel as DropdownMenuItemLabelV2Ariakit,
-	DropdownMenuItemHelpText as DropdownMenuItemHelpTextV2Ariakit,
-} from './dropdown-menu-v2-ariakit';
+import { DropdownMenuV2 } from './dropdown-menu-v2';
 import { ComponentsContext } from './context/context-system-provider';
 import Theme from './theme';
-import Tabs from './tabs';
-
-export const { lock, unlock } =
-	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
-		'@wordpress/components'
-	);
+import { Tabs } from './tabs';
+import { kebabCase } from './utils/strings';
+import { lock } from './lock-unlock';
 
 export const privateApis = {};
 lock( privateApis, {
-	CompositeV2,
-	CompositeGroupV2,
-	CompositeItemV2,
-	CompositeRowV2,
-	useCompositeStoreV2,
-	CustomSelectControl,
 	__experimentalPopoverLegacyPositionToPlacement,
 	createPrivateSlotFill,
 	ComponentsContext,
-	DropdownMenuV2,
-	DropdownMenuCheckboxItemV2,
-	DropdownMenuGroupV2,
-	DropdownMenuItemV2,
-	DropdownMenuLabelV2,
-	DropdownMenuRadioGroupV2,
-	DropdownMenuRadioItemV2,
-	DropdownMenuSeparatorV2,
-	DropdownSubMenuV2,
-	DropdownSubMenuTriggerV2,
-	ProgressBar,
 	Tabs,
 	Theme,
-	DropdownMenuV2Ariakit,
-	DropdownMenuGroupV2Ariakit,
-	DropdownMenuItemV2Ariakit,
-	DropdownMenuCheckboxItemV2Ariakit,
-	DropdownMenuRadioItemV2Ariakit,
-	DropdownMenuSeparatorV2Ariakit,
-	DropdownMenuItemLabelV2Ariakit,
-	DropdownMenuItemHelpTextV2Ariakit,
+	DropdownMenuV2,
+	kebabCase,
 } );
diff --git a/packages/components/src/progress-bar/README.md b/packages/components/src/progress-bar/README.md
index d0f62ce7e3be57..07bd1d6c12071b 100644
--- a/packages/components/src/progress-bar/README.md
+++ b/packages/components/src/progress-bar/README.md
@@ -1,13 +1,47 @@
 # ProgressBar
 
-<div class="callout callout-alert">
-This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
-</div>
-
 A simple horizontal progress bar component.
 
 Supports two modes: determinate and indeterminate. A progress bar is determinate when a specific progress value has been specified (from 0 to 100), and indeterminate when a value hasn't been specified.
 
+## Usage
+
+Basic usage:
+
+```jsx
+import { ProgressBar } from '@wordpress/components';
+
+const MyLoadingComponent = () => {
+	return <ProgressBar />;
+};
+```
+
+You can also make it determinate by passing a `value` (from 0 to 100) representing the progress:
+
+```jsx
+import { ProgressBar } from '@wordpress/components';
+
+const MyLoadingComponent = ( { progress } ) => {
+	return <ProgressBar value={ progress } />;
+};
+```
+
+You can customize its appearance by passing a custom CSS class name to `className`.
+
+```css
+.my-custom-progress-bar {
+	width: 100%;
+}
+```
+
+```jsx
+import { ProgressBar } from '@wordpress/components';
+
+const MyLoadingComponent = () => {
+	return <ProgressBar className="my-custom-progress-bar" />;
+};
+```
+
 ### Props
 
 The component accepts the following props:
@@ -19,11 +53,11 @@ If a `value` is not specified, the progress bar will be considered indeterminate
 
 -   Required: No
 
-##### `className`: `string`
+#### `className`: `string`
 
 A CSS class to apply to the underlying `div` element, serving as a progress bar track.
 
-- Required: No
+-   Required: No
 
 #### Inherited props
 
diff --git a/packages/components/src/progress-bar/index.tsx b/packages/components/src/progress-bar/index.tsx
index b5bd9ad46c34d3..e6a34850954563 100644
--- a/packages/components/src/progress-bar/index.tsx
+++ b/packages/components/src/progress-bar/index.tsx
@@ -26,8 +26,12 @@ function UnforwardedProgressBar(
 	return (
 		<ProgressBarStyled.Track className={ className }>
 			<ProgressBarStyled.Indicator
+				style={ {
+					'--indicator-width': ! isIndeterminate
+						? `${ value }%`
+						: undefined,
+				} }
 				isIndeterminate={ isIndeterminate }
-				value={ value }
 			/>
 			<ProgressBarStyled.ProgressElement
 				max={ 100 }
@@ -40,6 +44,21 @@ function UnforwardedProgressBar(
 	);
 }
 
+/**
+ * A simple horizontal progress bar component.
+ *
+ * Supports two modes: determinate and indeterminate. A progress bar is determinate
+ * when a specific progress value has been specified (from 0 to 100), and indeterminate
+ * when a value hasn't been specified.
+ *
+ * ```jsx
+ * import { ProgressBar } from '@wordpress/components';
+ *
+ * const MyLoadingComponent = () => {
+ * 	return <ProgressBar />;
+ * };
+ * ```
+ */
 export const ProgressBar = forwardRef( UnforwardedProgressBar );
 
 export default ProgressBar;
diff --git a/packages/components/src/progress-bar/stories/index.story.tsx b/packages/components/src/progress-bar/stories/index.story.tsx
index e3d217ffd3f415..4396c4cc48eebb 100644
--- a/packages/components/src/progress-bar/stories/index.story.tsx
+++ b/packages/components/src/progress-bar/stories/index.story.tsx
@@ -10,7 +10,7 @@ import { ProgressBar } from '..';
 
 const meta: Meta< typeof ProgressBar > = {
 	component: ProgressBar,
-	title: 'Components (Experimental)/ProgressBar',
+	title: 'Components/ProgressBar',
 	argTypes: {
 		value: { control: { type: 'number', min: 0, max: 100, step: 1 } },
 	},
@@ -29,3 +29,38 @@ const Template: StoryFn< typeof ProgressBar > = ( { ...args } ) => {
 
 export const Default: StoryFn< typeof ProgressBar > = Template.bind( {} );
 Default.args = {};
+
+const withCustomWidthCustomCSS = `
+	.custom-progress-bar {
+		width: 100%;
+	}
+`;
+
+/**
+ * A progress bar with a custom width.
+ *
+ * You can override the default `width` by passing a custom CSS class via the
+ * `className` prop.
+ *
+ * This example shows a progress bar with an overriden `width` of `100%` which
+ * makes it fit all available horizontal space of the parent element. The CSS
+ * class looks like this:
+ *
+ * ```css
+ * .custom-progress-bar {
+ *   width: 100%;
+ * }
+ * ```
+ */
+export const WithCustomWidth = Template.bind( {} );
+WithCustomWidth.args = {
+	className: 'custom-progress-bar',
+};
+WithCustomWidth.decorators = [
+	( Story ) => (
+		<>
+			<style>{ withCustomWidthCustomCSS }</style>
+			<Story />
+		</>
+	),
+];
diff --git a/packages/components/src/progress-bar/styles.ts b/packages/components/src/progress-bar/styles.ts
index 041b2402f0324e..585b9ab2620753 100644
--- a/packages/components/src/progress-bar/styles.ts
+++ b/packages/components/src/progress-bar/styles.ts
@@ -4,19 +4,28 @@
 import styled from '@emotion/styled';
 import { css, keyframes } from '@emotion/react';
 
+/**
+ * WordPress dependencies
+ */
+import { isRTL } from '@wordpress/i18n';
+
 /**
  * Internal dependencies
  */
 import { COLORS, CONFIG } from '../utils';
 
-const animateProgressBar = keyframes( {
-	'0%': {
-		left: '-50%',
-	},
-	'100%': {
-		left: '100%',
-	},
-} );
+function animateProgressBar( isRtl = false ) {
+	const animationDirection = isRtl ? 'right' : 'left';
+
+	return keyframes( {
+		'0%': {
+			[ animationDirection ]: '-50%',
+		},
+		'100%': {
+			[ animationDirection ]: '100%',
+		},
+	} );
+}
 
 // Width of the indicator for the indeterminate progress bar
 export const INDETERMINATE_TRACK_WIDTH = 50;
@@ -24,35 +33,36 @@ export const INDETERMINATE_TRACK_WIDTH = 50;
 export const Track = styled.div`
 	position: relative;
 	overflow: hidden;
-	width: 100%;
-	max-width: 160px;
 	height: ${ CONFIG.borderWidthFocus };
 	/* Text color at 10% opacity */
 	background-color: color-mix(
 		in srgb,
-		var( --wp-components-color-foreground, ${ COLORS.gray[ 900 ] } ),
+		${ COLORS.theme.foreground },
 		transparent 90%
 	);
-	border-radius: ${ CONFIG.radiusBlockUi };
+	border-radius: ${ CONFIG.radiusFull };
 
 	// Windows high contrast mode.
 	outline: 2px solid transparent;
 	outline-offset: 2px;
+
+	:where( & ) {
+		width: 160px;
+	}
 `;
 
 export const Indicator = styled.div< {
 	isIndeterminate: boolean;
-	value?: number;
 } >`
 	display: inline-block;
 	position: absolute;
 	top: 0;
 	height: 100%;
-	border-radius: ${ CONFIG.radiusBlockUi };
+	border-radius: ${ CONFIG.radiusFull };
 	/* Text color at 90% opacity */
 	background-color: color-mix(
 		in srgb,
-		var( --wp-components-color-foreground, ${ COLORS.gray[ 900 ] } ),
+		${ COLORS.theme.foreground },
 		transparent 10%
 	);
 
@@ -60,17 +70,17 @@ export const Indicator = styled.div< {
 	outline: 2px solid transparent;
 	outline-offset: -2px;
 
-	${ ( { isIndeterminate, value } ) =>
+	${ ( { isIndeterminate } ) =>
 		isIndeterminate
 			? css( {
 					animationDuration: '1.5s',
 					animationTimingFunction: 'ease-in-out',
 					animationIterationCount: 'infinite',
-					animationName: animateProgressBar,
+					animationName: animateProgressBar( isRTL() ),
 					width: `${ INDETERMINATE_TRACK_WIDTH }%`,
 			  } )
 			: css( {
-					width: `${ value }%`,
+					width: 'var(--indicator-width)',
 					transition: 'width 0.4s ease-in-out',
 			  } ) };
 `;
diff --git a/packages/components/src/progress-bar/test/index.tsx b/packages/components/src/progress-bar/test/index.tsx
index 425c54ce8a3022..c3984318cc618a 100644
--- a/packages/components/src/progress-bar/test/index.tsx
+++ b/packages/components/src/progress-bar/test/index.tsx
@@ -43,6 +43,9 @@ describe( 'ProgressBar', () => {
 		expect( indicator ).toHaveStyle( {
 			width: `${ INDETERMINATE_TRACK_WIDTH }%`,
 		} );
+		expect( indicator ).not.toHaveStyle( {
+			'--indicator-width': expect.any( String ),
+		} );
 	} );
 
 	it( 'should use `value`% as width for determinate progress bar', () => {
@@ -56,7 +59,7 @@ describe( 'ProgressBar', () => {
 		const indicator = container.firstChild?.firstChild;
 
 		expect( indicator ).toHaveStyle( {
-			width: '55%',
+			'--indicator-width': '55%',
 		} );
 	} );
 
diff --git a/packages/components/src/query-controls/README.md b/packages/components/src/query-controls/README.md
index 83cae88952d407..3eb6d507c9ccd6 100644
--- a/packages/components/src/query-controls/README.md
+++ b/packages/components/src/query-controls/README.md
@@ -240,3 +240,10 @@ The selected category for the `categoriesList` prop.
 
 -   Required: No
 -   Platform: Web
+
+#### `__next40pxDefaultSize`: `boolean`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+- Required: No
+- Default: `false`
\ No newline at end of file
diff --git a/packages/components/src/query-controls/author-select.tsx b/packages/components/src/query-controls/author-select.tsx
index f5f4feb9525f15..aad1184b44e481 100644
--- a/packages/components/src/query-controls/author-select.tsx
+++ b/packages/components/src/query-controls/author-select.tsx
@@ -13,7 +13,9 @@ export default function AuthorSelect( {
 	selectedAuthorId,
 	onChange: onChangeProp,
 }: AuthorSelectProps ) {
-	if ( ! authorList ) return null;
+	if ( ! authorList ) {
+		return null;
+	}
 	const termsTree = buildTermsTree( authorList );
 	return (
 		<TreeSelect
diff --git a/packages/components/src/query-controls/index.native.js b/packages/components/src/query-controls/index.native.js
index 51ba7cba690be5..4e687f4af09d57 100644
--- a/packages/components/src/query-controls/index.native.js
+++ b/packages/components/src/query-controls/index.native.js
@@ -1,13 +1,14 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 import { useCallback, memo } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import { RangeControl, SelectControl } from '../';
+import RangeControl from '../range-control';
+import SelectControl from '../select-control';
 import CategorySelect from './category-select';
 
 const DEFAULT_MIN_ITEMS = 1;
@@ -23,12 +24,12 @@ const options = [
 		value: 'date/asc',
 	},
 	{
-		/* translators: label for ordering posts by title in ascending order */
+		/* translators: Label for ordering posts by title in ascending order. */
 		label: __( 'A → Z' ),
 		value: 'title/asc',
 	},
 	{
-		/* translators: label for ordering posts by title in descending order */
+		/* translators: Label for ordering posts by title in descending order. */
 		label: __( 'Z → A' ),
 		value: 'title/desc',
 	},
@@ -69,17 +70,17 @@ const QueryControls = memo(
 						value={ `${ orderBy }/${ order }` }
 						options={ options }
 						onChange={ onChange }
-						hideCancelButton={ true }
+						hideCancelButton
 					/>
 				) }
 				{ onCategoryChange && (
 					<CategorySelect
 						categoriesList={ categoriesList }
 						label={ __( 'Category' ) }
-						noOptionLabel={ __( 'All' ) }
+						noOptionLabel={ _x( 'All', 'categories' ) }
 						selectedCategoryId={ selectedCategoryId }
 						onChange={ onCategoryChange }
-						hideCancelButton={ true }
+						hideCancelButton
 					/>
 				) }
 				{ onNumberOfItemsChange && (
diff --git a/packages/components/src/query-controls/index.tsx b/packages/components/src/query-controls/index.tsx
index ee207b6da82b9e..452dd303c778bb 100644
--- a/packages/components/src/query-controls/index.tsx
+++ b/packages/components/src/query-controls/index.tsx
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -60,7 +60,6 @@ function isMultipleCategorySelection(
  * ```
  */
 export function QueryControls( {
-	__next40pxDefaultSize = false,
 	authorList,
 	selectedAuthorId,
 	numberOfItems,
@@ -82,10 +81,14 @@ export function QueryControls( {
 				onOrderChange && onOrderByChange && (
 					<SelectControl
 						__nextHasNoMarginBottom
-						__next40pxDefaultSize={ __next40pxDefaultSize }
+						__next40pxDefaultSize
 						key="query-controls-order-select"
 						label={ __( 'Order by' ) }
-						value={ `${ orderBy }/${ order }` }
+						value={
+							orderBy === undefined || order === undefined
+								? undefined
+								: `${ orderBy }/${ order }`
+						}
 						options={ [
 							{
 								label: __( 'Newest to oldest' ),
@@ -96,12 +99,12 @@ export function QueryControls( {
 								value: 'date/asc',
 							},
 							{
-								/* translators: label for ordering posts by title in ascending order */
+								/* translators: Label for ordering posts by title in ascending order. */
 								label: __( 'A → Z' ),
 								value: 'title/asc',
 							},
 							{
-								/* translators: label for ordering posts by title in descending order */
+								/* translators: Label for ordering posts by title in descending order. */
 								label: __( 'Z → A' ),
 								value: 'title/desc',
 							},
@@ -133,11 +136,11 @@ export function QueryControls( {
 					props.categoriesList &&
 					props.onCategoryChange && (
 						<CategorySelect
-							__next40pxDefaultSize={ __next40pxDefaultSize }
+							__next40pxDefaultSize
 							key="query-controls-category-select"
 							categoriesList={ props.categoriesList }
 							label={ __( 'Category' ) }
-							noOptionLabel={ __( 'All' ) }
+							noOptionLabel={ _x( 'All', 'categories' ) }
 							selectedCategoryId={ props.selectedCategoryId }
 							onChange={ props.onCategoryChange }
 						/>
@@ -146,7 +149,7 @@ export function QueryControls( {
 					props.categorySuggestions &&
 					props.onCategoryChange && (
 						<FormTokenField
-							__next40pxDefaultSize={ __next40pxDefaultSize }
+							__next40pxDefaultSize
 							__nextHasNoMarginBottom
 							key="query-controls-categories-select"
 							label={ __( 'Categories' ) }
@@ -170,11 +173,11 @@ export function QueryControls( {
 					),
 				onAuthorChange && (
 					<AuthorSelect
-						__next40pxDefaultSize={ __next40pxDefaultSize }
+						__next40pxDefaultSize
 						key="query-controls-author-select"
 						authorList={ authorList }
 						label={ __( 'Author' ) }
-						noOptionLabel={ __( 'All' ) }
+						noOptionLabel={ _x( 'All', 'authors' ) }
 						selectedAuthorId={ selectedAuthorId }
 						onChange={ onAuthorChange }
 					/>
@@ -182,7 +185,7 @@ export function QueryControls( {
 				onNumberOfItemsChange && (
 					<RangeControl
 						__nextHasNoMarginBottom
-						__next40pxDefaultSize={ __next40pxDefaultSize }
+						__next40pxDefaultSize
 						key="query-controls-range-control"
 						label={ __( 'Number of items' ) }
 						value={ numberOfItems }
diff --git a/packages/components/src/query-controls/types.ts b/packages/components/src/query-controls/types.ts
index 8c45d22c54c064..eb004bf8215b0a 100644
--- a/packages/components/src/query-controls/types.ts
+++ b/packages/components/src/query-controls/types.ts
@@ -107,7 +107,8 @@ type BaseQueryControlsProps = {
 	 * Start opting into the larger default height that will become the
 	 * default size in a future version.
 	 *
-	 * @default false
+	 * @deprecated Default behavior since WP 6.7. Prop can be safely removed.
+	 * @ignore
 	 */
 	__next40pxDefaultSize?: boolean;
 };
diff --git a/packages/components/src/radio-control/README.md b/packages/components/src/radio-control/README.md
index e9be7b3c669da6..5d7204ef627be3 100644
--- a/packages/components/src/radio-control/README.md
+++ b/packages/components/src/radio-control/README.md
@@ -5,12 +5,6 @@ Use radio buttons when you want users to select one option from a set, and you w
 ![](https://make.wordpress.org/design/files/2018/11/radio.png)
 Selected and unselected radio buttons
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
@@ -26,12 +20,12 @@ If you have a list of available options that can be collapsed, consider using a
 
 #### Do
 
-![](https://make.wordpress.org/design/files/2018/11/radio-usage-do.png)
+![Right: A screenshot showing two radio buttons for "Author" and "Editor", one checked](https://github.com/WordPress/gutenberg/assets/10128264/77da4e95-b038-43e7-bd29-11282cc2bac7)
 Use radio buttons when only one item can be selected from a list.
 
 #### Don’t
 
-![](https://make.wordpress.org/design/files/2018/11/radio-usage-dont.png)
+![Wrong: A screenshot showing two checkboxes for "Author" and "Editor", one checked](https://github.com/WordPress/gutenberg/assets/10128264/214f37a8-2080-4c10-a4b5-b011e0875f18)
 Don’t use checkboxes when only one item can be selected from a list. Use radio buttons instead.
 
 #### Defaults
@@ -125,4 +119,4 @@ The value property of the currently selected option.
 
 -   To select one or more items from a set, use the `CheckboxControl` component.
 -   To toggle a single setting on or off, use the `ToggleControl` component.
--   To format as a button group, use the `RadioGroup` component.
+-   To format as a segmented button group, use the `ToggleGroupControl` component.
diff --git a/packages/components/src/radio-control/index.tsx b/packages/components/src/radio-control/index.tsx
index 4a8875bce0a2a3..29927558c58cd4 100644
--- a/packages/components/src/radio-control/index.tsx
+++ b/packages/components/src/radio-control/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ChangeEvent } from 'react';
 
 /**
@@ -16,6 +16,20 @@ import BaseControl from '../base-control';
 import type { WordPressComponentProps } from '../context';
 import type { RadioControlProps } from './types';
 import { VStack } from '../v-stack';
+import { StyledHelp } from '../base-control/styles/base-control-styles';
+import { VisuallyHidden } from '../visually-hidden';
+
+function generateOptionDescriptionId( radioGroupId: string, index: number ) {
+	return `${ radioGroupId }-${ index }-option-description`;
+}
+
+function generateOptionId( radioGroupId: string, index: number ) {
+	return `${ radioGroupId }-${ index }`;
+}
+
+function generateHelpId( radioGroupId: string ) {
+	return `${ radioGroupId }__help`;
+}
 
 /**
  * Render a user interface to select the user type using radio inputs.
@@ -53,10 +67,15 @@ export function RadioControl(
 		onChange,
 		hideLabelFromVision,
 		options = [],
+		id: preferredId,
 		...additionalProps
 	} = props;
-	const instanceId = useInstanceId( RadioControl );
-	const id = `inspector-radio-control-${ instanceId }`;
+	const id = useInstanceId(
+		RadioControl,
+		'inspector-radio-control',
+		preferredId
+	);
+
 	const onChangeValue = ( event: ChangeEvent< HTMLInputElement > ) =>
 		onChange( event.target.value );
 
@@ -65,22 +84,32 @@ export function RadioControl(
 	}
 
 	return (
-		<BaseControl
-			__nextHasNoMarginBottom
-			label={ label }
+		<fieldset
 			id={ id }
-			hideLabelFromVision={ hideLabelFromVision }
-			help={ help }
-			className={ classnames( className, 'components-radio-control' ) }
+			className={ clsx( className, 'components-radio-control' ) }
+			aria-describedby={ !! help ? generateHelpId( id ) : undefined }
 		>
-			<VStack spacing={ 1 }>
+			{ hideLabelFromVision ? (
+				<VisuallyHidden as="legend">{ label }</VisuallyHidden>
+			) : (
+				<BaseControl.VisualLabel as="legend">
+					{ label }
+				</BaseControl.VisualLabel>
+			) }
+
+			<VStack
+				spacing={ 3 }
+				className={ clsx( 'components-radio-control__group-wrapper', {
+					'has-help': !! help,
+				} ) }
+			>
 				{ options.map( ( option, index ) => (
 					<div
-						key={ `${ id }-${ index }` }
+						key={ generateOptionId( id, index ) }
 						className="components-radio-control__option"
 					>
 						<input
-							id={ `${ id }-${ index }` }
+							id={ generateOptionId( id, index ) }
 							className="components-radio-control__input"
 							type="radio"
 							name={ id }
@@ -88,17 +117,40 @@ export function RadioControl(
 							onChange={ onChangeValue }
 							checked={ option.value === selected }
 							aria-describedby={
-								!! help ? `${ id }__help` : undefined
+								!! option.description
+									? generateOptionDescriptionId( id, index )
+									: undefined
 							}
 							{ ...additionalProps }
 						/>
-						<label htmlFor={ `${ id }-${ index }` }>
+						<label
+							className="components-radio-control__label"
+							htmlFor={ generateOptionId( id, index ) }
+						>
 							{ option.label }
 						</label>
+						{ !! option.description ? (
+							<StyledHelp
+								__nextHasNoMarginBottom
+								id={ generateOptionDescriptionId( id, index ) }
+								className="components-radio-control__option-description"
+							>
+								{ option.description }
+							</StyledHelp>
+						) : null }
 					</div>
 				) ) }
 			</VStack>
-		</BaseControl>
+			{ !! help && (
+				<StyledHelp
+					__nextHasNoMarginBottom
+					id={ generateHelpId( id ) }
+					className="components-base-control__help"
+				>
+					{ help }
+				</StyledHelp>
+			) }
+		</fieldset>
 	);
 }
 
diff --git a/packages/components/src/radio-control/stories/index.story.tsx b/packages/components/src/radio-control/stories/index.story.tsx
index 7be398e77e17c7..dae00e57962f47 100644
--- a/packages/components/src/radio-control/stories/index.story.tsx
+++ b/packages/components/src/radio-control/stories/index.story.tsx
@@ -68,3 +68,26 @@ Default.args = {
 		{ label: 'Password Protected', value: 'password' },
 	],
 };
+
+export const WithOptionDescriptions: StoryFn< typeof RadioControl > =
+	Template.bind( {} );
+WithOptionDescriptions.args = {
+	...Default.args,
+	options: [
+		{
+			label: 'Public',
+			value: 'public',
+			description: 'Visible to everyone',
+		},
+		{
+			label: 'Private',
+			value: 'private',
+			description: 'Only visible to you',
+		},
+		{
+			label: 'Password Protected',
+			value: 'password',
+			description: 'Protected by a password',
+		},
+	],
+};
diff --git a/packages/components/src/radio-control/style.scss b/packages/components/src/radio-control/style.scss
index 732dc1201d9d5a..e3dcb8d1e58270 100644
--- a/packages/components/src/radio-control/style.scss
+++ b/packages/components/src/radio-control/style.scss
@@ -1,5 +1,72 @@
+.components-radio-control {
+	border: 0;
+	margin: 0;
+	padding: 0;
+
+	font-family: $default-font;
+	font-size: $default-font-size;
+}
+
+.components-radio-control__group-wrapper.has-help {
+	margin-block-end: $grid-unit-15;
+}
+
+.components-radio-control__option {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	grid-template-rows: auto minmax(0, max-content);
+	column-gap: $grid-unit-10;
+	align-items: center;
+}
+
 .components-radio-control__input[type="radio"] {
+	grid-column: 1;
+	grid-row: 1;
+
 	@include radio-control;
-	margin-top: 0;
-	margin-right: 6px;
+
+	display: inline-flex;
+	margin: 0;
+	padding: 0;
+	appearance: none;
+	cursor: pointer;
+
+	&:focus {
+		@include button-style-outset__focus(var(--wp-admin-theme-color));
+	}
+
+	&:checked {
+		background: $components-color-accent;
+		border-color: $components-color-accent;
+
+		&::before {
+			content: "";
+			border-radius: $radius-round;
+		}
+	}
+}
+
+.components-radio-control__label {
+	grid-column: 2;
+	grid-row: 1;
+
+	cursor: pointer;
+	line-height: $radio-input-size-sm;
+
+	@include break-small() {
+		line-height: $radio-input-size;
+	}
+}
+
+.components-radio-control__option-description {
+	grid-column: 2;
+	grid-row: 2;
+
+	padding-block-start: $grid-unit-05;
+
+	// Override the top margin of the StyledHelp component from BaseControl.
+	// TODO: we should tweak the StyledHelp component to not have a top margin.
+	&.components-radio-control__option-description {
+		margin-top: 0;
+	}
 }
diff --git a/packages/components/src/radio-control/test/index.tsx b/packages/components/src/radio-control/test/index.tsx
new file mode 100644
index 00000000000000..7e30744d96b826
--- /dev/null
+++ b/packages/components/src/radio-control/test/index.tsx
@@ -0,0 +1,277 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import RadioControl from '../';
+
+const ControlledRadioControl = ( {
+	...props
+}: React.ComponentProps< typeof RadioControl > ) => {
+	const [ option, setOption ] = useState( props.selected );
+
+	return (
+		<RadioControl
+			{ ...props }
+			onChange={ ( newValue ) => {
+				setOption( newValue );
+				props.onChange?.( newValue );
+			} }
+			selected={ option }
+		/>
+	);
+};
+
+const defaultProps = {
+	options: [
+		{ label: 'Mouse', value: 'mouse' },
+		{ label: 'Cat', value: 'cat' },
+		{ label: 'Dog', value: 'dog' },
+	],
+	label: 'Animal',
+};
+
+const defaultPropsWithDescriptions = {
+	...defaultProps,
+	options: defaultProps.options.map( ( option, index ) => ( {
+		...option,
+		description: `This is the option number ${ index + 1 }.`,
+	} ) ),
+};
+
+describe.each( [
+	// TODO: `RadioControl` doesn't currently support uncontrolled mode.
+	// [ 'uncontrolled', RadioControl ],
+	[ 'controlled', ControlledRadioControl ],
+] )( 'RadioControl %s', ( ...modeAndComponent ) => {
+	const [ , Component ] = modeAndComponent;
+
+	describe( 'semantics and labelling', () => {
+		it( 'should group all radios under a fieldset with an accessible label (legend)', () => {
+			const onChangeSpy = jest.fn();
+			render(
+				<Component { ...defaultProps } onChange={ onChangeSpy } />
+			);
+
+			expect(
+				screen.getByRole( 'group', { name: defaultProps.label } )
+			).toBeVisible();
+		} );
+
+		it( 'should group all radios under a fieldset with an accessible label even when the label is visually hidden', () => {
+			const onChangeSpy = jest.fn();
+			render(
+				<Component
+					{ ...defaultProps }
+					hideLabelFromVision
+					onChange={ onChangeSpy }
+				/>
+			);
+
+			expect(
+				screen.getByRole( 'group', { name: defaultProps.label } )
+			).toBeVisible();
+		} );
+
+		it( 'should describe the radio group with the help text', () => {
+			const onChangeSpy = jest.fn();
+			render(
+				<Component
+					{ ...defaultProps }
+					help="Test help text"
+					onChange={ onChangeSpy }
+				/>
+			);
+
+			expect(
+				screen.getByRole( 'group', { name: defaultProps.label } )
+			).toHaveAccessibleDescription( 'Test help text' );
+		} );
+
+		it( 'should render radio inputs with accessible labels', () => {
+			const onChangeSpy = jest.fn();
+			render(
+				<Component { ...defaultProps } onChange={ onChangeSpy } />
+			);
+
+			for ( const option of defaultProps.options ) {
+				const optionEl = screen.getByRole( 'radio', {
+					name: option.label,
+				} );
+				expect( optionEl ).toBeVisible();
+				expect( optionEl ).not.toBeChecked();
+			}
+		} );
+
+		it( 'should not select have a selected value when the `selected` prop does not match any available options', () => {
+			const onChangeSpy = jest.fn();
+			render(
+				<Component { ...defaultProps } onChange={ onChangeSpy } />
+			);
+
+			expect(
+				screen.queryByRole( 'radio', {
+					checked: true,
+				} )
+			).not.toBeInTheDocument();
+		} );
+
+		it( 'should render mutually exclusive radio inputs', () => {
+			const onChangeSpy = jest.fn();
+			render(
+				<Component
+					{ ...defaultProps }
+					onChange={ onChangeSpy }
+					selected={ defaultProps.options[ 1 ].value }
+				/>
+			);
+
+			expect(
+				screen.getByRole( 'radio', {
+					checked: true,
+				} )
+			).toHaveAccessibleName( defaultProps.options[ 1 ].label );
+		} );
+
+		it( 'should use the option description text to describe individual options', () => {
+			const onChangeSpy = jest.fn();
+			render(
+				<Component
+					{ ...defaultPropsWithDescriptions }
+					onChange={ onChangeSpy }
+					selected={ defaultProps.options[ 1 ].value }
+					help="Select your favorite animal"
+				/>
+			);
+
+			// Group help text should not be used to describe individual options.
+			let index = 1;
+			for ( const option of defaultProps.options ) {
+				expect(
+					screen.getByRole( 'radio', { name: option.label } )
+				).toHaveAccessibleDescription(
+					`This is the option number ${ index }.`
+				);
+				index += 1;
+			}
+		} );
+	} );
+
+	describe( 'interaction', () => {
+		it( 'should select a new value when clicking on the radio input', async () => {
+			const user = userEvent.setup();
+			const onChangeSpy = jest.fn();
+			render(
+				<Component { ...defaultProps } onChange={ onChangeSpy } />
+			);
+
+			// Click on the third radio, make sure it's selected.
+			await user.click(
+				screen.getByRole( 'radio', {
+					name: defaultProps.options[ 2 ].label,
+				} )
+			);
+			expect(
+				screen.getByRole( 'radio', {
+					checked: true,
+				} )
+			).toHaveAccessibleName( defaultProps.options[ 2 ].label );
+
+			expect( onChangeSpy ).toHaveBeenCalledTimes( 1 );
+			expect( onChangeSpy ).toHaveBeenLastCalledWith(
+				defaultProps.options[ 2 ].value
+			);
+		} );
+
+		it( 'should select a new value when clicking on the radio label', async () => {
+			const user = userEvent.setup();
+			const onChangeSpy = jest.fn();
+			render(
+				<Component { ...defaultProps } onChange={ onChangeSpy } />
+			);
+
+			// Click on the second radio's label, make sure it selects the associated radio.
+			await user.click(
+				screen.getByText( defaultProps.options[ 1 ].label )
+			);
+			expect(
+				screen.getByRole( 'radio', {
+					checked: true,
+				} )
+			).toHaveAccessibleName( defaultProps.options[ 1 ].label );
+
+			expect( onChangeSpy ).toHaveBeenCalledTimes( 1 );
+			expect( onChangeSpy ).toHaveBeenLastCalledWith(
+				defaultProps.options[ 1 ].value
+			);
+		} );
+
+		it( 'should select a new value when using the arrow keys', async () => {
+			const user = userEvent.setup();
+			const onChangeSpy = jest.fn();
+			render(
+				<Component { ...defaultProps } onChange={ onChangeSpy } />
+			);
+
+			await user.tab();
+
+			expect(
+				screen.getByRole( 'radio', {
+					name: defaultProps.options[ 0 ].label,
+				} )
+			).toHaveFocus();
+
+			await user.keyboard( '{ArrowDown}' );
+
+			expect(
+				screen.getByRole( 'radio', {
+					checked: true,
+					name: defaultProps.options[ 1 ].label,
+				} )
+			).toHaveFocus();
+			expect( onChangeSpy ).toHaveBeenCalledTimes( 2 );
+			expect( onChangeSpy ).toHaveBeenLastCalledWith(
+				defaultProps.options[ 1 ].value
+			);
+
+			await user.keyboard( '{ArrowDown}' );
+			await user.keyboard( '{ArrowDown}' );
+
+			// The selection wrap around.
+			expect(
+				screen.getByRole( 'radio', {
+					checked: true,
+					name: defaultProps.options[ 0 ].label,
+				} )
+			).toHaveFocus();
+			// TODO: why called twice for every interaction?
+			expect( onChangeSpy ).toHaveBeenCalledTimes( 6 );
+			expect( onChangeSpy ).toHaveBeenLastCalledWith(
+				defaultProps.options[ 0 ].value
+			);
+
+			await user.keyboard( '{ArrowUp}' );
+
+			expect(
+				screen.getByRole( 'radio', {
+					checked: true,
+					name: defaultProps.options[ 2 ].label,
+				} )
+			).toHaveFocus();
+
+			expect( onChangeSpy ).toHaveBeenCalledTimes( 8 );
+			expect( onChangeSpy ).toHaveBeenLastCalledWith(
+				defaultProps.options[ 2 ].value
+			);
+		} );
+	} );
+} );
diff --git a/packages/components/src/radio-control/types.ts b/packages/components/src/radio-control/types.ts
index 43c5e147f028d9..d1c3aa40d96481 100644
--- a/packages/components/src/radio-control/types.ts
+++ b/packages/components/src/radio-control/types.ts
@@ -24,6 +24,10 @@ export type RadioControlProps = Pick<
 		 * The internal value compared against select and passed to onChange
 		 */
 		value: string;
+		/**
+		 * Optional help text to be shown in addition the label.
+		 */
+		description?: string;
 	}[];
 	/**
 	 * The value property of the currently selected option.
diff --git a/packages/components/src/radio-group/README.md b/packages/components/src/radio-group/README.md
index c285e1a5d27731..1c24d49f1169d5 100644
--- a/packages/components/src/radio-group/README.md
+++ b/packages/components/src/radio-group/README.md
@@ -12,12 +12,6 @@ Use a RadioGroup component when you want users to select one option from a small
 
 ![RadioGroup component](https://wordpress.org/gutenberg/files/2018/12/s_96EC471FE9C9D91A996770229947AAB54A03351BDE98F444FD3C1BF0CED365EA_1541792995815_ButtonGroup.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
diff --git a/packages/components/src/radio-group/context.tsx b/packages/components/src/radio-group/context.tsx
index c2fa1b009b4e1f..be03d8d3254a4e 100644
--- a/packages/components/src/radio-group/context.tsx
+++ b/packages/components/src/radio-group/context.tsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import type * as Ariakit from '@ariakit/react';
 
 /**
diff --git a/packages/components/src/radio-group/index.tsx b/packages/components/src/radio-group/index.tsx
index 8bc35f8382ee34..e59775c00a8023 100644
--- a/packages/components/src/radio-group/index.tsx
+++ b/packages/components/src/radio-group/index.tsx
@@ -1,13 +1,13 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
 
 /**
  * WordPress dependencies
  */
 import { useMemo, forwardRef } from '@wordpress/element';
+import { isRTL } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -35,6 +35,7 @@ function UnforwardedRadioGroup(
 		setValue: ( newValue ) => {
 			onChange?.( newValue ?? undefined );
 		},
+		rtl: isRTL(),
 	} );
 
 	const contextValue = useMemo(
diff --git a/packages/components/src/radio-group/radio.tsx b/packages/components/src/radio-group/radio.tsx
index 8187b4a4ba573e..50a5a2647b39d5 100644
--- a/packages/components/src/radio-group/radio.tsx
+++ b/packages/components/src/radio-group/radio.tsx
@@ -6,8 +6,8 @@ import { forwardRef, useContext } from '@wordpress/element';
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
+import { useStoreState } from '@ariakit/react';
 
 /**
  * Internal dependencies
@@ -27,7 +27,7 @@ function UnforwardedRadio(
 ) {
 	const { store, disabled } = useContext( RadioGroupContext );
 
-	const selectedValue = store?.useState( 'value' );
+	const selectedValue = useStoreState( store, 'value' );
 	const isChecked = selectedValue !== undefined && selectedValue === value;
 
 	return (
diff --git a/packages/components/src/radio-group/stories/index.story.tsx b/packages/components/src/radio-group/stories/index.story.tsx
index cfa0a253fb7a0b..d9cf34c93b2ed1 100644
--- a/packages/components/src/radio-group/stories/index.story.tsx
+++ b/packages/components/src/radio-group/stories/index.story.tsx
@@ -16,6 +16,7 @@ import { useState } from '@wordpress/element';
 
 const meta: Meta< typeof RadioGroup > = {
 	title: 'Components (Deprecated)/RadioGroup',
+	id: 'components-radiogroup',
 	component: RadioGroup,
 	// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
 	subcomponents: { Radio },
diff --git a/packages/components/src/range-control/README.md b/packages/components/src/range-control/README.md
index 0dd822200a7bf5..cfa8c76740e74f 100644
--- a/packages/components/src/range-control/README.md
+++ b/packages/components/src/range-control/README.md
@@ -2,15 +2,7 @@
 
 RangeControls are used to make selections from a range of incremental values.
 
-![](https://make.wordpress.org/design/files/2018/12/rangecontrol.png)
-
-A RangeControl for volume
-
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
+![A RangeControl for volume](https://make.wordpress.org/design/files/2018/12/rangecontrol.png)
 
 ## Design guidelines
 
@@ -98,6 +90,7 @@ const MyRangeControl = () => {
 
 	return(
 		<RangeControl
+			__nextHasNoMarginBottom
 			label="Columns"
 			value={ columns }
 			onChange={ ( value ) => setColumns( value ) }
@@ -369,6 +362,20 @@ Determines if the `input` number field will render next to the RangeControl. Thi
 -   Required: No
 -   Platform: Web
 
+### `__next40pxDefaultSize`: `boolean`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Required: No
+-   Default: `false`
+
+### `__nextHasNoMarginBottom`: `boolean`
+
+Start opting into the new margin-free styles that will become the default in a future version.
+
+-   Required: No
+-   Default: `false`
+
 ## Related components
 
 -   To collect a numerical input in a text field, use the `TextControl` component.
diff --git a/packages/components/src/range-control/index.tsx b/packages/components/src/range-control/index.tsx
index 05b162a492e849..c9fbdc0055c855 100644
--- a/packages/components/src/range-control/index.tsx
+++ b/packages/components/src/range-control/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ChangeEvent, FocusEvent, ForwardedRef } from 'react';
 
 /**
@@ -41,6 +41,25 @@ import { space } from '../utils/space';
 
 const noop = () => {};
 
+/**
+ * Computes the value that `RangeControl` should reset to when pressing
+ * the reset button.
+ */
+function computeResetValue( {
+	resetFallbackValue,
+	initialPosition,
+}: Pick< RangeControlProps, 'resetFallbackValue' | 'initialPosition' > ) {
+	if ( resetFallbackValue !== undefined ) {
+		return ! Number.isNaN( resetFallbackValue ) ? resetFallbackValue : null;
+	}
+
+	if ( initialPosition !== undefined ) {
+		return ! Number.isNaN( initialPosition ) ? initialPosition : null;
+	}
+
+	return null;
+}
+
 function UnforwardedRangeControl(
 	props: WordPressComponentProps< RangeControlProps, 'input', false >,
 	forwardedRef: ForwardedRef< HTMLInputElement >
@@ -116,9 +135,9 @@ function UnforwardedRangeControl(
 		: ( ( value - min ) / ( max - min ) ) * 100;
 	const fillValueOffset = `${ clamp( fillValue, 0, 100 ) }%`;
 
-	const classes = classnames( 'components-range-control', className );
+	const classes = clsx( 'components-range-control', className );
 
-	const wrapperClasses = classnames(
+	const wrapperClasses = clsx(
 		'components-range-control__wrapper',
 		!! marks && 'is-marked'
 	);
@@ -166,13 +185,12 @@ function UnforwardedRangeControl(
 	};
 
 	const handleOnReset = () => {
-		let resetValue: number | null = parseFloat( `${ resetFallbackValue }` );
-		let onChangeResetValue: number | undefined = resetValue;
-
-		if ( isNaN( resetValue ) ) {
-			resetValue = null;
-			onChangeResetValue = undefined;
-		}
+		// Reset to `resetFallbackValue` if defined, otherwise set internal value
+		// to `null` — which, if propagated to the `value` prop, will cause
+		// the value to be reset to the `initialPosition` prop if defined.
+		const resetValue = Number.isNaN( resetFallbackValue )
+			? null
+			: resetFallbackValue ?? null;
 
 		setValue( resetValue );
 
@@ -189,7 +207,7 @@ function UnforwardedRangeControl(
 		 * preserve the undefined callback argument, except when a
 		 * resetFallbackValue is defined.
 		 */
-		onChange( onChangeResetValue );
+		onChange( resetValue ?? undefined );
 	};
 
 	const handleShowTooltip = () => setShowTooltip( true );
@@ -210,9 +228,11 @@ function UnforwardedRangeControl(
 	const offsetStyle = {
 		[ isRTL() ? 'right' : 'left' ]: fillValueOffset,
 	};
+
 	return (
 		<BaseControl
 			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+			__associatedWPComponentName="RangeControl"
 			className={ classes }
 			label={ label }
 			hideLabelFromVision={ hideLabelFromVision }
@@ -253,7 +273,7 @@ function UnforwardedRangeControl(
 						value={ inputSliderValue ?? undefined }
 					/>
 					<RangeRail
-						aria-hidden={ true }
+						aria-hidden
 						disabled={ disabled }
 						marks={ marks }
 						max={ max }
@@ -263,7 +283,7 @@ function UnforwardedRangeControl(
 						value={ rangeFillValue }
 					/>
 					<Track
-						aria-hidden={ true }
+						aria-hidden
 						className="components-range-control__track"
 						disabled={ disabled }
 						style={ { width: fillValueOffset } }
@@ -275,7 +295,7 @@ function UnforwardedRangeControl(
 						disabled={ disabled }
 					>
 						<Thumb
-							aria-hidden={ true }
+							aria-hidden
 							isFocused={ isThumbFocused }
 							disabled={ disabled }
 						/>
@@ -326,9 +346,21 @@ function UnforwardedRangeControl(
 					<ActionRightWrapper>
 						<Button
 							className="components-range-control__reset"
-							disabled={ disabled || value === undefined }
+							// If the RangeControl itself is disabled, the reset button shouldn't be in the tab sequence.
+							accessibleWhenDisabled={ ! disabled }
+							// The reset button should be disabled if RangeControl itself is disabled,
+							// or if the current `value` is equal to the value that would be currently
+							// assigned when clicking the button.
+							disabled={
+								disabled ||
+								value ===
+									computeResetValue( {
+										resetFallbackValue,
+										initialPosition,
+									} )
+							}
 							variant="secondary"
-							isSmall
+							size="small"
 							onClick={ handleOnReset }
 						>
 							{ __( 'Reset' ) }
@@ -351,6 +383,7 @@ function UnforwardedRangeControl(
  *   const [ isChecked, setChecked ] = useState( true );
  *   return (
  *     <RangeControl
+ *       __nextHasNoMarginBottom
  *       help="Please select how transparent you would like this."
  *       initialPosition={50}
  *       label="Opacity"
diff --git a/packages/components/src/range-control/mark.tsx b/packages/components/src/range-control/mark.tsx
index 856b540b70e1b5..a17665bb628aba 100644
--- a/packages/components/src/range-control/mark.tsx
+++ b/packages/components/src/range-control/mark.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * Internal dependencies
@@ -22,12 +22,12 @@ export default function RangeMark(
 		...otherProps
 	} = props;
 
-	const classes = classnames(
+	const classes = clsx(
 		'components-range-control__mark',
 		isFilled && 'is-filled',
 		className
 	);
-	const labelClasses = classnames(
+	const labelClasses = clsx(
 		'components-range-control__mark-label',
 		isFilled && 'is-filled'
 	);
diff --git a/packages/components/src/range-control/rail.tsx b/packages/components/src/range-control/rail.tsx
index a59cc0849246f4..48bf7d9b231158 100644
--- a/packages/components/src/range-control/rail.tsx
+++ b/packages/components/src/range-control/rail.tsx
@@ -92,7 +92,7 @@ function useMarks( {
 	if ( ! Array.isArray( marks ) ) {
 		marks = [];
 		const count = 1 + Math.round( range / step );
-		while ( count > marks.push( { value: step * marks.length + min } ) );
+		while ( count > marks.push( { value: step * marks.length + min } ) ) {}
 	}
 
 	const placedMarks: RangeMarkProps[] = [];
diff --git a/packages/components/src/range-control/stories/index.story.tsx b/packages/components/src/range-control/stories/index.story.tsx
index 4e0c1f19e078b6..7775c364195722 100644
--- a/packages/components/src/range-control/stories/index.story.tsx
+++ b/packages/components/src/range-control/stories/index.story.tsx
@@ -70,6 +70,7 @@ const Template: StoryFn< typeof RangeControl > = ( { onChange, ...args } ) => {
 
 export const Default: StoryFn< typeof RangeControl > = Template.bind( {} );
 Default.args = {
+	__nextHasNoMarginBottom: true,
 	help: 'Please select how transparent you would like this.',
 	initialPosition: 50,
 	label: 'Opacity',
@@ -104,6 +105,7 @@ export const WithAnyStep: StoryFn< typeof RangeControl > = ( {
 	);
 };
 WithAnyStep.args = {
+	__nextHasNoMarginBottom: true,
 	label: 'Brightness',
 	step: 'any',
 };
@@ -167,6 +169,7 @@ export const WithIntegerStepAndMarks: StoryFn< typeof RangeControl > =
 	MarkTemplate.bind( {} );
 
 WithIntegerStepAndMarks.args = {
+	__nextHasNoMarginBottom: true,
 	label: 'Integer Step',
 	marks: marksBase,
 	max: 10,
@@ -183,6 +186,7 @@ export const WithDecimalStepAndMarks: StoryFn< typeof RangeControl > =
 	MarkTemplate.bind( {} );
 
 WithDecimalStepAndMarks.args = {
+	__nextHasNoMarginBottom: true,
 	marks: [
 		...marksBase,
 		{ value: 3.5, label: '3.5' },
@@ -202,6 +206,7 @@ export const WithNegativeMinimumAndMarks: StoryFn< typeof RangeControl > =
 	MarkTemplate.bind( {} );
 
 WithNegativeMinimumAndMarks.args = {
+	__nextHasNoMarginBottom: true,
 	marks: marksWithNegatives,
 	max: 10,
 	min: -10,
@@ -217,6 +222,7 @@ export const WithNegativeRangeAndMarks: StoryFn< typeof RangeControl > =
 	MarkTemplate.bind( {} );
 
 WithNegativeRangeAndMarks.args = {
+	__nextHasNoMarginBottom: true,
 	marks: marksWithNegatives,
 	max: -1,
 	min: -10,
@@ -232,6 +238,7 @@ export const WithAnyStepAndMarks: StoryFn< typeof RangeControl > =
 	MarkTemplate.bind( {} );
 
 WithAnyStepAndMarks.args = {
+	__nextHasNoMarginBottom: true,
 	marks: marksBase,
 	max: 10,
 	min: 0,
diff --git a/packages/components/src/range-control/styles/range-control-styles.ts b/packages/components/src/range-control/styles/range-control-styles.ts
index 07b744356d4f9b..6e9c68ace97532 100644
--- a/packages/components/src/range-control/styles/range-control-styles.ts
+++ b/packages/components/src/range-control/styles/range-control-styles.ts
@@ -8,7 +8,7 @@ import styled from '@emotion/styled';
  * Internal dependencies
  */
 import NumberControl from '../../number-control';
-import { COLORS, reduceMotion, rtl } from '../../utils';
+import { COLORS, rtl, CONFIG } from '../../utils';
 import { space } from '../../utils/space';
 
 import type {
@@ -57,7 +57,10 @@ const wrapperMargin = ( { marks, __nextHasNoMarginBottom }: WrapperProps ) => {
 	return '';
 };
 
-export const Wrapper = styled.div< WrapperProps >`
+export const Wrapper = styled( 'div', {
+	shouldForwardProp: ( prop: string ) =>
+		! [ 'color', '__nextHasNoMarginBottom', 'marks' ].includes( prop ),
+} )< WrapperProps >`
 	display: block;
 	flex: 1;
 	position: relative;
@@ -102,7 +105,7 @@ export const Rail = styled.span`
 	position: absolute;
 	margin-top: ${ ( rangeHeightValue - railHeight ) / 2 }px;
 	top: 0;
-	border-radius: ${ railHeight }px;
+	border-radius: ${ CONFIG.radiusFull };
 
 	${ railBackgroundColor };
 `;
@@ -119,7 +122,7 @@ const trackBackgroundColor = ( { disabled, trackColor }: TrackProps ) => {
 
 export const Track = styled.span`
 	background-color: currentColor;
-	border-radius: ${ railHeight }px;
+	border-radius: ${ CONFIG.radiusFull };
 	height: ${ railHeight }px;
 	pointer-events: none;
 	display: block;
@@ -154,7 +157,7 @@ export const Mark = styled.span`
 	height: ${ thumbSize }px;
 	left: 0;
 	position: absolute;
-	top: -4px;
+	top: 9px;
 	width: 1px;
 
 	${ markFill };
@@ -168,13 +171,17 @@ const markLabelFill = ( { isFilled }: RangeMarkProps ) => {
 
 export const MarkLabel = styled.span`
 	color: ${ COLORS.gray[ 300 ] };
-	left: 0;
 	font-size: 11px;
 	position: absolute;
-	top: 12px;
-	transform: translateX( -50% );
+	top: 22px;
 	white-space: nowrap;
 
+	${ rtl( { left: 0 } ) };
+	${ rtl(
+		{ transform: 'translateX( -50% )' },
+		{ transform: 'translateX( 50% )' }
+	) };
+
 	${ markLabelFill };
 `;
 
@@ -199,7 +206,7 @@ export const ThumbWrapper = styled.span`
 	top: 0;
 	user-select: none;
 	width: ${ thumbSize }px;
-	border-radius: 50%;
+	border-radius: ${ CONFIG.radiusRound };
 
 	${ thumbColor };
 	${ rtl( { marginLeft: -10 } ) };
@@ -217,7 +224,7 @@ const thumbFocus = ( { isFocused }: ThumbProps ) => {
 					position: absolute;
 					background-color: ${ COLORS.theme.accent };
 					opacity: 0.4;
-					border-radius: 50%;
+					border-radius: ${ CONFIG.radiusRound };
 					height: ${ thumbSize + 8 }px;
 					width: ${ thumbSize + 8 }px;
 					top: -4px;
@@ -229,12 +236,13 @@ const thumbFocus = ( { isFocused }: ThumbProps ) => {
 
 export const Thumb = styled.span< ThumbProps >`
 	align-items: center;
-	border-radius: 50%;
+	border-radius: ${ CONFIG.radiusRound };
 	height: 100%;
 	outline: 0;
 	position: absolute;
 	user-select: none;
 	width: 100%;
+	box-shadow: ${ CONFIG.elevationXSmall };
 
 	${ thumbColor };
 	${ thumbFocus };
@@ -256,9 +264,20 @@ export const InputRange = styled.input`
 `;
 
 const tooltipShow = ( { show }: TooltipProps ) => {
-	return css( {
-		opacity: show ? 1 : 0,
-	} );
+	return css`
+		display: ${ show ? 'inline-block' : 'none' };
+		opacity: ${ show ? 1 : 0 };
+
+		@media not ( prefers-reduced-motion ) {
+			transition:
+				opacity 120ms ease,
+				display 120ms ease allow-discrete;
+		}
+
+		@starting-style {
+			opacity: 0;
+		}
+	`;
 };
 
 const tooltipPosition = ( { position }: TooltipProps ) => {
@@ -277,30 +296,27 @@ const tooltipPosition = ( { position }: TooltipProps ) => {
 
 export const Tooltip = styled.span< TooltipProps >`
 	background: rgba( 0, 0, 0, 0.8 );
-	border-radius: 2px;
+	border-radius: ${ CONFIG.radiusSmall };
 	color: white;
-	display: inline-block;
 	font-size: 12px;
 	min-width: 32px;
-	opacity: 0;
 	padding: 4px 8px;
 	pointer-events: none;
 	position: absolute;
 	text-align: center;
-	transition: opacity 120ms ease;
 	user-select: none;
 	line-height: 1.4;
 
 	${ tooltipShow };
+
 	${ tooltipPosition };
-	${ reduceMotion( 'transition' ) };
 	${ rtl(
 		{ transform: 'translateX(-50%)' },
 		{ transform: 'translateX(50%)' }
 	) }
 `;
 
-// @todo: Refactor RangeControl with latest HStack configuration
+// @todo Refactor RangeControl with latest HStack configuration
 // @see: packages/components/src/h-stack
 export const InputNumber = styled( NumberControl )`
 	display: inline-block;
diff --git a/packages/components/src/range-control/test/index.tsx b/packages/components/src/range-control/test/index.tsx
index bbb97dbfaa0859..3ce741867d0dbc 100644
--- a/packages/components/src/range-control/test/index.tsx
+++ b/packages/components/src/range-control/test/index.tsx
@@ -6,7 +6,7 @@ import { act, fireEvent, render, screen } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import RangeControl from '../';
+import _RangeControl from '../';
 
 const getRangeInput = (): HTMLInputElement => screen.getByRole( 'slider' );
 const getNumberInput = (): HTMLInputElement => screen.getByRole( 'spinbutton' );
@@ -15,6 +15,12 @@ const getResetButton = (): HTMLButtonElement => screen.getByRole( 'button' );
 const fireChangeEvent = ( input: HTMLInputElement, value?: number | string ) =>
 	fireEvent.change( input, { target: { value } } );
 
+const RangeControl = (
+	props: React.ComponentProps< typeof _RangeControl >
+) => {
+	return <_RangeControl { ...props } __nextHasNoMarginBottom />;
+};
+
 describe( 'RangeControl', () => {
 	describe( '#render()', () => {
 		it( 'should trigger change callback with numeric value', () => {
@@ -292,14 +298,37 @@ describe( 'RangeControl', () => {
 	} );
 
 	describe( 'reset', () => {
-		it( 'should reset to a custom fallback value, defined by a parent component', () => {
+		it( 'should clear the input value when clicking the reset button', () => {
+			const spy = jest.fn();
+			render( <RangeControl allowReset onChange={ spy } /> );
+
+			const resetButton = getResetButton();
+			const rangeInput = getRangeInput();
+			const numberInput = getNumberInput();
+
+			fireChangeEvent( numberInput, '14' );
+
+			expect( rangeInput.value ).toBe( '14' );
+			expect( numberInput.value ).toBe( '14' );
+			expect( spy ).toHaveBeenCalledWith( 14 );
+
+			fireEvent.click( resetButton );
+
+			// range input resets to min + (max-min)/2
+			expect( rangeInput.value ).toBe( '50' );
+			expect( numberInput.value ).toBe( '' );
+			expect( spy ).toHaveBeenCalledWith( undefined );
+
+			expect( resetButton ).toHaveAttribute( 'aria-disabled', 'true' );
+		} );
+
+		it( 'should reset to the `initialPosition` value when clicking the reset button', () => {
 			const spy = jest.fn();
 			render(
 				<RangeControl
-					initialPosition={ 10 }
-					allowReset={ true }
+					allowReset
+					initialPosition={ 23 }
 					onChange={ spy }
-					resetFallbackValue={ 33 }
 				/>
 			);
 
@@ -307,21 +336,29 @@ describe( 'RangeControl', () => {
 			const rangeInput = getRangeInput();
 			const numberInput = getNumberInput();
 
+			fireChangeEvent( numberInput, '14' );
+
+			expect( rangeInput.value ).toBe( '14' );
+			expect( numberInput.value ).toBe( '14' );
+			expect( spy ).toHaveBeenCalledWith( 14 );
+
 			fireEvent.click( resetButton );
 
-			expect( rangeInput.value ).toBe( '33' );
-			expect( numberInput.value ).toBe( '33' );
-			expect( spy ).toHaveBeenCalledWith( 33 );
+			expect( rangeInput.value ).toBe( '23' );
+			expect( numberInput.value ).toBe( '23' );
+			expect( spy ).toHaveBeenCalledWith( undefined );
+
+			expect( resetButton ).toHaveAttribute( 'aria-disabled', 'true' );
 		} );
 
-		it( 'should reset to a 50% of min/max value, of no initialPosition or value is defined', () => {
+		it( 'should reset to the `resetFallbackValue` value when clicking the reset button', () => {
+			const spy = jest.fn();
 			render(
 				<RangeControl
-					initialPosition={ undefined }
-					min={ 0 }
-					max={ 100 }
-					allowReset={ true }
-					resetFallbackValue={ undefined }
+					initialPosition={ 10 }
+					allowReset
+					onChange={ spy }
+					resetFallbackValue={ 33 }
 				/>
 			);
 
@@ -331,8 +368,11 @@ describe( 'RangeControl', () => {
 
 			fireEvent.click( resetButton );
 
-			expect( rangeInput.value ).toBe( '50' );
-			expect( numberInput.value ).toBe( '' );
+			expect( rangeInput.value ).toBe( '33' );
+			expect( numberInput.value ).toBe( '33' );
+			expect( spy ).toHaveBeenCalledWith( 33 );
+
+			expect( resetButton ).toHaveAttribute( 'aria-disabled', 'true' );
 		} );
 	} );
 } );
diff --git a/packages/components/src/range-control/tooltip.tsx b/packages/components/src/range-control/tooltip.tsx
index c5428baab52179..4156c026464347 100644
--- a/packages/components/src/range-control/tooltip.tsx
+++ b/packages/components/src/range-control/tooltip.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -31,7 +31,7 @@ export default function SimpleTooltip(
 		...restProps
 	} = props;
 	const position = useTooltipPosition( { inputRef, tooltipPosition } );
-	const classes = classnames( 'components-simple-tooltip', className );
+	const classes = clsx( 'components-simple-tooltip', className );
 	const styles = {
 		...style,
 		zIndex,
@@ -40,7 +40,7 @@ export default function SimpleTooltip(
 	return (
 		<Tooltip
 			{ ...restProps }
-			aria-hidden={ show }
+			aria-hidden="false"
 			className={ classes }
 			position={ position }
 			show={ show }
diff --git a/packages/components/src/resizable-box/index.tsx b/packages/components/src/resizable-box/index.tsx
index 0955c29c537786..1b05270ea0bf20 100644
--- a/packages/components/src/resizable-box/index.tsx
+++ b/packages/components/src/resizable-box/index.tsx
@@ -6,7 +6,7 @@ import { forwardRef } from '@wordpress/element';
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import { Resizable } from 're-resizable';
 import type { ResizableProps } from 're-resizable';
 import type { ReactNode, ForwardedRef } from 'react';
@@ -21,45 +21,45 @@ const SIDE_HANDLE_CLASS_NAME = 'components-resizable-box__side-handle';
 const CORNER_HANDLE_CLASS_NAME = 'components-resizable-box__corner-handle';
 
 const HANDLE_CLASSES = {
-	top: classnames(
+	top: clsx(
 		HANDLE_CLASS_NAME,
 		SIDE_HANDLE_CLASS_NAME,
 		'components-resizable-box__handle-top'
 	),
-	right: classnames(
+	right: clsx(
 		HANDLE_CLASS_NAME,
 		SIDE_HANDLE_CLASS_NAME,
 		'components-resizable-box__handle-right'
 	),
-	bottom: classnames(
+	bottom: clsx(
 		HANDLE_CLASS_NAME,
 		SIDE_HANDLE_CLASS_NAME,
 		'components-resizable-box__handle-bottom'
 	),
-	left: classnames(
+	left: clsx(
 		HANDLE_CLASS_NAME,
 		SIDE_HANDLE_CLASS_NAME,
 		'components-resizable-box__handle-left'
 	),
-	topLeft: classnames(
+	topLeft: clsx(
 		HANDLE_CLASS_NAME,
 		CORNER_HANDLE_CLASS_NAME,
 		'components-resizable-box__handle-top',
 		'components-resizable-box__handle-left'
 	),
-	topRight: classnames(
+	topRight: clsx(
 		HANDLE_CLASS_NAME,
 		CORNER_HANDLE_CLASS_NAME,
 		'components-resizable-box__handle-top',
 		'components-resizable-box__handle-right'
 	),
-	bottomRight: classnames(
+	bottomRight: clsx(
 		HANDLE_CLASS_NAME,
 		CORNER_HANDLE_CLASS_NAME,
 		'components-resizable-box__handle-bottom',
 		'components-resizable-box__handle-right'
 	),
-	bottomLeft: classnames(
+	bottomLeft: clsx(
 		HANDLE_CLASS_NAME,
 		CORNER_HANDLE_CLASS_NAME,
 		'components-resizable-box__handle-bottom',
@@ -107,7 +107,7 @@ function UnforwardedResizableBox(
 ): JSX.Element {
 	return (
 		<Resizable
-			className={ classnames(
+			className={ clsx(
 				'components-resizable-box__container',
 				showHandle && 'has-show-handle',
 				className
diff --git a/packages/components/src/resizable-box/resize-tooltip/README.md b/packages/components/src/resizable-box/resize-tooltip/README.md
index 513ed0d9fa83ce..d041d76f6d27e1 100644
--- a/packages/components/src/resizable-box/resize-tooltip/README.md
+++ b/packages/components/src/resizable-box/resize-tooltip/README.md
@@ -24,11 +24,11 @@ Be sure that the parent element containing `<ResizeTooltip />` has the `position
 -   `bottom` (Default)
 -   `corner`
 
-##### `bottom`
+#### `bottom`
 
 The `bottom` position (default) renders the dimensions label at the bottom-center of the (parent) element.
 
-##### `corner`
+#### `corner`
 
 The `corner` position renders the dimensions label in the top-right corner of the (parent) element.
 
@@ -60,7 +60,7 @@ Determines if the label can render.
 
 ### labelRef
 
-Callback [Ref](https://reactjs.org/docs/forwarding-refs.html) for the label element.
+Callback [Ref](https://react.dev/learn/manipulating-the-dom-with-refs) for the label element.
 
 -   Type: `Function`
 -   Required: No
diff --git a/packages/components/src/resizable-box/resize-tooltip/index.tsx b/packages/components/src/resizable-box/resize-tooltip/index.tsx
index 4daef4d65d4dfd..edab3f8406798c 100644
--- a/packages/components/src/resizable-box/resize-tooltip/index.tsx
+++ b/packages/components/src/resizable-box/resize-tooltip/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { Ref, ForwardedRef } from 'react';
 
 /**
@@ -55,9 +55,11 @@ function ResizeTooltip(
 		position,
 	} );
 
-	if ( ! isVisible ) return null;
+	if ( ! isVisible ) {
+		return null;
+	}
 
-	const classes = classnames( 'components-resize-tooltip', className );
+	const classes = clsx( 'components-resize-tooltip', className );
 
 	return (
 		<Root aria-hidden="true" className={ classes } ref={ ref } { ...props }>
diff --git a/packages/components/src/resizable-box/resize-tooltip/label.tsx b/packages/components/src/resizable-box/resize-tooltip/label.tsx
index 36bb0db72dd2cb..6f3cb4c77a49b4 100644
--- a/packages/components/src/resizable-box/resize-tooltip/label.tsx
+++ b/packages/components/src/resizable-box/resize-tooltip/label.tsx
@@ -41,7 +41,9 @@ function Label(
 	const isBottom = position === POSITIONS.bottom;
 	const isCorner = position === POSITIONS.corner;
 
-	if ( ! showLabel ) return null;
+	if ( ! showLabel ) {
+		return null;
+	}
 
 	let style: React.CSSProperties = {
 		opacity: showLabel ? 1 : undefined,
diff --git a/packages/components/src/resizable-box/resize-tooltip/styles/resize-tooltip.styles.ts b/packages/components/src/resizable-box/resize-tooltip/styles/resize-tooltip.styles.ts
index 399fe92616d569..1cfc2f381f2c11 100644
--- a/packages/components/src/resizable-box/resize-tooltip/styles/resize-tooltip.styles.ts
+++ b/packages/components/src/resizable-box/resize-tooltip/styles/resize-tooltip.styles.ts
@@ -7,7 +7,7 @@ import styled from '@emotion/styled';
  * Internal dependencies
  */
 import { Text } from '../../../text';
-import { font, COLORS } from '../../../utils';
+import { font, COLORS, CONFIG } from '../../../utils';
 
 export const Root = styled.div`
 	bottom: 0;
@@ -30,12 +30,12 @@ export const TooltipWrapper = styled.div`
 `;
 
 export const Tooltip = styled.div`
-	background: ${ COLORS.gray[ 900 ] };
-	border-radius: 2px;
+	background: ${ COLORS.theme.foreground };
+	border-radius: ${ CONFIG.radiusSmall };
 	box-sizing: border-box;
 	font-family: ${ font( 'default.fontFamily' ) };
 	font-size: 12px;
-	color: ${ COLORS.ui.textDark };
+	color: ${ COLORS.theme.foregroundInverted };
 	padding: 4px 8px;
 	position: relative;
 `;
@@ -45,7 +45,7 @@ export const Tooltip = styled.div`
 
 export const LabelText = styled( Text )`
 	&&& {
-		color: ${ COLORS.ui.textDark };
+		color: ${ COLORS.theme.foregroundInverted };
 		display: block;
 		font-size: 13px;
 		line-height: 1.4;
diff --git a/packages/components/src/resizable-box/resize-tooltip/utils.ts b/packages/components/src/resizable-box/resize-tooltip/utils.ts
index 7daf1b77aa382f..895f521c80ae22 100644
--- a/packages/components/src/resizable-box/resize-tooltip/utils.ts
+++ b/packages/components/src/resizable-box/resize-tooltip/utils.ts
@@ -25,7 +25,7 @@ interface UseResizeLabelProps {
 interface UseResizeLabelArgs {
 	axis?: Axis;
 	fadeTimeout: number;
-	onResize( data: { width: number | null; height: number | null } ): void;
+	onResize: ( data: { width: number | null; height: number | null } ) => void;
 	position: Position;
 	showPx: boolean;
 }
@@ -90,7 +90,9 @@ export function useResizeLabel( {
 			 * If axis is controlled, we will avoid resetting the moveX and moveY values.
 			 * This will allow for the preferred axis values to persist in the label.
 			 */
-			if ( isAxisControlled ) return;
+			if ( isAxisControlled ) {
+				return;
+			}
 			setMoveX( false );
 			setMoveY( false );
 		};
@@ -109,12 +111,16 @@ export function useResizeLabel( {
 		 */
 		const isRendered = width !== null || height !== null;
 
-		if ( ! isRendered ) return;
+		if ( ! isRendered ) {
+			return;
+		}
 
 		const didWidthChange = width !== widthRef.current;
 		const didHeightChange = height !== heightRef.current;
 
-		if ( ! didWidthChange && ! didHeightChange ) return;
+		if ( ! didWidthChange && ! didHeightChange ) {
+			return;
+		}
 
 		/*
 		 * After the initial render, the useResizeAware will set the first
@@ -194,7 +200,9 @@ function getSizeLabel( {
 	showPx = false,
 	width,
 }: GetSizeLabelArgs ): string | undefined {
-	if ( ! moveX && ! moveY ) return undefined;
+	if ( ! moveX && ! moveY ) {
+		return undefined;
+	}
 
 	/*
 	 * Corner position...
diff --git a/packages/components/src/resizable-box/stories/index.story.tsx b/packages/components/src/resizable-box/stories/index.story.tsx
index 81852f9cb4ea43..489a094c33f119 100644
--- a/packages/components/src/resizable-box/stories/index.story.tsx
+++ b/packages/components/src/resizable-box/stories/index.story.tsx
@@ -14,7 +14,8 @@ import ResizableBox from '..';
 import { useState } from '@wordpress/element';
 
 const meta: Meta< typeof ResizableBox > = {
-	title: 'Components/ResizableBox',
+	title: 'Components/Utilities/ResizableBox',
+	id: 'components-resizablebox',
 	component: ResizableBox,
 	argTypes: {
 		children: { control: { type: null } },
diff --git a/packages/components/src/resizable-box/style.scss b/packages/components/src/resizable-box/style.scss
index eed13578b3f0c4..3c9efd27136460 100644
--- a/packages/components/src/resizable-box/style.scss
+++ b/packages/components/src/resizable-box/style.scss
@@ -28,14 +28,14 @@ $resize-handler-container-size: $resize-handler-size + ($grid-unit-05 * 2); // M
 	content: "";
 	width: $resize-handler-size;
 	height: $resize-handler-size;
-	border-radius: 50%;
+	border-radius: $radius-round;
 	background: $white;
 	cursor: inherit;
 	position: absolute;
 	top: calc(50% - #{ceil($resize-handler-size * 0.5)});
 	right: calc(50% - #{ceil($resize-handler-size * 0.5)});
 
-	box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $components-color-accent;
+	box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $components-color-accent, $elevation-x-small;
 	// Only visible in Windows High Contrast mode.
 	outline: 2px solid transparent;
 }
@@ -43,7 +43,7 @@ $resize-handler-container-size: $resize-handler-size + ($grid-unit-05 * 2); // M
 // This is the "visible" resize handle for side handles - the line
 .components-resizable-box__side-handle::before {
 	display: block;
-	border-radius: 2px;
+	border-radius: $radius-full;
 	content: "";
 	width: 3px;
 	height: 3px;
diff --git a/packages/components/src/responsive-wrapper/index.tsx b/packages/components/src/responsive-wrapper/index.tsx
index a8b2ef9ff438a5..98e0493ad3e833 100644
--- a/packages/components/src/responsive-wrapper/index.tsx
+++ b/packages/components/src/responsive-wrapper/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -49,7 +49,7 @@ function ResponsiveWrapper( {
 		<TagName className="components-responsive-wrapper">
 			<div>
 				{ cloneElement( children, {
-					className: classnames(
+					className: clsx(
 						'components-responsive-wrapper__content',
 						children.props.className
 					),
diff --git a/packages/components/src/sandbox/index.native.js b/packages/components/src/sandbox/index.native.js
index b9bbc9a4e3281f..72070bf6efcd08 100644
--- a/packages/components/src/sandbox/index.native.js
+++ b/packages/components/src/sandbox/index.native.js
@@ -336,9 +336,7 @@ const Sandbox = forwardRef( function Sandbox(
 
 	useEffect( () => {
 		updateContentHtml();
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ html, title, type, styles, scripts ] );
 
 	useEffect( () => {
diff --git a/packages/components/src/sandbox/index.tsx b/packages/components/src/sandbox/index.tsx
index 4ad971cb63ca90..5288fea3f7e43e 100644
--- a/packages/components/src/sandbox/index.tsx
+++ b/packages/components/src/sandbox/index.tsx
@@ -262,23 +262,20 @@ function SandBox( {
 				checkMessageForResize
 			);
 		};
-		// Ignore reason: passing `exhaustive-deps` will likely involve a more detailed refactor.
+		// Passing `exhaustive-deps` will likely involve a more detailed refactor.
 		// See https://github.com/WordPress/gutenberg/pull/44378
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [] );
 
 	useEffect( () => {
 		trySandBox();
-		// Ignore reason: passing `exhaustive-deps` will likely involve a more detailed refactor.
+		// Passing `exhaustive-deps` will likely involve a more detailed refactor.
 		// See https://github.com/WordPress/gutenberg/pull/44378
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ title, styles, scripts ] );
 
 	useEffect( () => {
 		trySandBox( true );
-		// Ignore reason: passing `exhaustive-deps` will likely involve a more detailed refactor.
+		// Passing `exhaustive-deps` will likely involve a more detailed refactor.
 		// See https://github.com/WordPress/gutenberg/pull/44378
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ html, type ] );
 
 	return (
diff --git a/packages/components/src/sandbox/stories/index.story.tsx b/packages/components/src/sandbox/stories/index.story.tsx
index efa8db621a4a63..0d083eac3e9026 100644
--- a/packages/components/src/sandbox/stories/index.story.tsx
+++ b/packages/components/src/sandbox/stories/index.story.tsx
@@ -10,7 +10,8 @@ import SandBox from '..';
 
 const meta: Meta< typeof SandBox > = {
 	component: SandBox,
-	title: 'Components/SandBox',
+	title: 'Components/Utilities/SandBox',
+	id: 'components-sandbox',
 	argTypes: {
 		onFocus: { control: { type: null } },
 	},
diff --git a/packages/components/src/scroll-lock/stories/index.story.tsx b/packages/components/src/scroll-lock/stories/index.story.tsx
index 8518c0c520a486..b251018f00b38e 100644
--- a/packages/components/src/scroll-lock/stories/index.story.tsx
+++ b/packages/components/src/scroll-lock/stories/index.story.tsx
@@ -17,7 +17,8 @@ import ScrollLock from '..';
 
 const meta: Meta< typeof ScrollLock > = {
 	component: ScrollLock,
-	title: 'Components/ScrollLock',
+	title: 'Components/Utilities/ScrollLock',
+	id: 'components-scrolllock',
 	parameters: {
 		controls: { hideNoControlsWarning: true },
 		docs: { canvas: { sourceState: 'shown' } },
diff --git a/packages/components/src/search-control/README.md b/packages/components/src/search-control/README.md
index bd12580f3c8780..3945f451d6dcf7 100644
--- a/packages/components/src/search-control/README.md
+++ b/packages/components/src/search-control/README.md
@@ -2,11 +2,7 @@
 
 SearchControl components let users display a search control.
 
-
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
+Check out the [Storybook page](https://wordpress.github.io/gutenberg/?path=/docs/components-searchcontrol--docs) for a visual exploration of this component.
 
 ## Development guidelines
 
@@ -24,6 +20,7 @@ function MySearchControl( { className, setState } ) {
 
     return (
         <SearchControl
+            __nextHasNoMarginBottom
             label={ __( 'Search posts' ) }
             value={ searchInput }
             onChange={ setSearchInput }
@@ -39,13 +36,14 @@ Props not included in this set will be applied to the input element.
 
 #### label
 
-If this property is added, a label will be generated using label property as the content.
+The accessible label for the input.
 
 A label should always be provided as an accessibility best practice, even when a placeholder is defined
 and `hideLabelFromVision` is `true`.
 
 -   Type: `String`
--   Required: Yes
+-   Required: No
+-   Default: `__( 'Search' )`
 
 #### placeholder
 
@@ -76,6 +74,17 @@ A function that receives the value of the input.
 -   Type: `function`
 -   Required: Yes
 
+#### onClose
+
+_Note: this prop is deprecated._
+
+When an `onClose` callback is provided, the search control will render a close button that will trigger the given callback.
+
+Use this if you want the button to trigger your own logic to close the search field entirely, rather than just clearing the input value.
+
+-   Type: `function`
+-   Required: No
+
 #### help
 
 If this property is added, a help text will be generated using help property as the content.
@@ -83,12 +92,21 @@ If this property is added, a help text will be generated using help property as
 -   Type: `String|Element`
 -   Required: No
 
-### hideLabelFromVision
+#### hideLabelFromVision
 
 If true, the label will not be visible, but will be read by screen readers. Defaults to `true`.
 
 -   Type: `Boolean`
 -   Required: No
+-   Default: `true`
+
+#### __nextHasNoMarginBottom
+
+Start opting into the new margin-free styles that will become the default in a future version.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
 
 #### `size`: `'default'` | `'compact'`
 
diff --git a/packages/components/src/search-control/index.native.js b/packages/components/src/search-control/index.native.js
index 6cdabf966899f2..5bb03196d1de14 100644
--- a/packages/components/src/search-control/index.native.js
+++ b/packages/components/src/search-control/index.native.js
@@ -22,7 +22,6 @@ import {
 	useCallback,
 } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { Button, Gridicons } from '@wordpress/components';
 import {
 	Icon,
 	cancelCircleFilled as cancelCircleFilledIcon,
@@ -35,6 +34,8 @@ import {
  */
 import allStyles from './style.scss';
 import platformStyles from './platform-style.scss';
+import Button from '../button';
+import Gridicons from '../mobile/gridicons';
 
 // Merge platform specific styles with the default styles.
 const baseStyles = { ...allStyles };
@@ -121,9 +122,7 @@ function SearchControl( {
 		mergeFutureStyles( activeDarkStyles, [ isActive, isDark ] );
 
 		setCurrentStyles( futureStyles );
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ isActive, isDark ] );
 
 	const clearInput = useCallback( () => {
@@ -235,8 +234,8 @@ function SearchControl( {
 				<Text
 					onPress={ onCancel }
 					style={ cancelButtonTextStyle }
-					accessible={ true }
-					accessibilityRole={ 'button' }
+					accessible
+					accessibilityRole="button"
 					accessibilityLabel={ __( 'Cancel search' ) }
 					accessibilityHint={ __( 'Cancel search' ) }
 				>
diff --git a/packages/components/src/search-control/index.tsx b/packages/components/src/search-control/index.tsx
index a896ca1aa3d8fe..0a1b821a0a079a 100644
--- a/packages/components/src/search-control/index.tsx
+++ b/packages/components/src/search-control/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -9,100 +9,124 @@ import classnames from 'classnames';
 import { useInstanceId, useMergeRefs } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
 import { Icon, search, closeSmall } from '@wordpress/icons';
-import { forwardRef, useRef } from '@wordpress/element';
+import { forwardRef, useMemo, useRef } from '@wordpress/element';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
 import Button from '../button';
-import BaseControl from '../base-control';
 import type { WordPressComponentProps } from '../context/wordpress-component';
-import type { SearchControlProps } from './types';
+import type { SearchControlProps, SuffixItemProps } from './types';
 import type { ForwardedRef } from 'react';
+import { ContextSystemProvider } from '../context';
+import { StyledInputControl, SuffixItemWrapper } from './styles';
+
+function SuffixItem( {
+	searchRef,
+	value,
+	onChange,
+	onClose,
+}: SuffixItemProps ) {
+	if ( ! onClose && ! value ) {
+		return <Icon icon={ search } />;
+	}
+
+	if ( onClose ) {
+		deprecated( '`onClose` prop in wp.components.SearchControl', {
+			since: '6.8',
+		} );
+	}
+
+	const onReset = () => {
+		onChange( '' );
+		searchRef.current?.focus();
+	};
+
+	return (
+		<Button
+			size="small"
+			icon={ closeSmall }
+			label={ onClose ? __( 'Close search' ) : __( 'Reset search' ) }
+			onClick={ onClose ?? onReset }
+		/>
+	);
+}
 
 function UnforwardedSearchControl(
 	{
-		__nextHasNoMarginBottom,
-		__next40pxDefaultSize = false,
+		__nextHasNoMarginBottom = false,
 		className,
 		onChange,
-		onKeyDown,
 		value,
-		label,
+		label = __( 'Search' ),
 		placeholder = __( 'Search' ),
 		hideLabelFromVision = true,
-		help,
 		onClose,
 		size = 'default',
 		...restProps
-	}: WordPressComponentProps< SearchControlProps, 'input', false >,
+	}: Omit<
+		WordPressComponentProps< SearchControlProps, 'input', false >,
+		// TODO: Background styling currently doesn't support a disabled state. Needs design work.
+		'disabled'
+	>,
 	forwardedRef: ForwardedRef< HTMLInputElement >
 ) {
-	const searchRef = useRef< HTMLInputElement >();
-	const instanceId = useInstanceId( SearchControl );
-	const id = `components-search-control-${ instanceId }`;
+	// @ts-expect-error The `disabled` prop is not yet supported in the SearchControl component.
+	// Work with the design team (@WordPress/gutenberg-design) if you need this feature.
+	const { disabled, ...filteredRestProps } = restProps;
 
-	const renderRightButton = () => {
-		if ( onClose ) {
-			return (
-				<Button
-					__next40pxDefaultSize={ __next40pxDefaultSize }
-					icon={ closeSmall }
-					label={ __( 'Close search' ) }
-					onClick={ onClose }
-					size={ size }
-				/>
-			);
-		}
-
-		if ( !! value ) {
-			return (
-				<Button
-					__next40pxDefaultSize={ __next40pxDefaultSize }
-					icon={ closeSmall }
-					label={ __( 'Reset search' ) }
-					onClick={ () => {
-						onChange( '' );
-						searchRef.current?.focus();
-					} }
-					size={ size }
-				/>
-			);
-		}
+	const searchRef = useRef< HTMLInputElement >( null );
+	const instanceId = useInstanceId(
+		SearchControl,
+		'components-search-control'
+	);
 
-		return <Icon icon={ search } />;
-	};
+	const contextValue = useMemo(
+		() => ( {
+			BaseControl: {
+				// Overrides the underlying BaseControl `__nextHasNoMarginBottom` via the context system
+				// to provide backwards compatibile margin for SearchControl.
+				// (In a standard InputControl, the BaseControl `__nextHasNoMarginBottom` is always set to true.)
+				_overrides: { __nextHasNoMarginBottom },
+				__associatedWPComponentName: 'SearchControl',
+			},
+			// `isBorderless` is still experimental and not a public prop for InputControl yet.
+			InputBase: { isBorderless: true },
+		} ),
+		[ __nextHasNoMarginBottom ]
+	);
 
 	return (
-		<BaseControl
-			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
-			label={ label }
-			id={ id }
-			hideLabelFromVision={ hideLabelFromVision }
-			help={ help }
-			className={ classnames( className, 'components-search-control', {
-				'is-next-40px-default-size': __next40pxDefaultSize,
-				'is-size-compact': size === 'compact',
-			} ) }
-		>
-			<div className="components-search-control__input-wrapper">
-				<input
-					{ ...restProps }
-					ref={ useMergeRefs( [ searchRef, forwardedRef ] ) }
-					className="components-search-control__input"
-					id={ id }
-					type="search"
-					placeholder={ placeholder }
-					onChange={ ( event ) => onChange( event.target.value ) }
-					onKeyDown={ onKeyDown }
-					autoComplete="off"
-					value={ value || '' }
-				/>
-				<div className="components-search-control__icon">
-					{ renderRightButton() }
-				</div>
-			</div>
-		</BaseControl>
+		<ContextSystemProvider value={ contextValue }>
+			<StyledInputControl
+				__next40pxDefaultSize
+				id={ instanceId }
+				hideLabelFromVision={ hideLabelFromVision }
+				label={ label }
+				ref={ useMergeRefs( [ searchRef, forwardedRef ] ) }
+				type="search"
+				size={ size }
+				className={ clsx( 'components-search-control', className ) }
+				onChange={ ( nextValue?: string ) =>
+					onChange( nextValue ?? '' )
+				}
+				autoComplete="off"
+				placeholder={ placeholder }
+				value={ value ?? '' }
+				suffix={
+					<SuffixItemWrapper size={ size }>
+						<SuffixItem
+							searchRef={ searchRef }
+							value={ value }
+							onChange={ onChange }
+							onClose={ onClose }
+						/>
+					</SuffixItemWrapper>
+				}
+				{ ...filteredRestProps }
+			/>
+		</ContextSystemProvider>
 	);
 }
 
@@ -118,6 +142,7 @@ function UnforwardedSearchControl(
  *
  *   return (
  *     <SearchControl
+ *       __nextHasNoMarginBottom
  *       value={ searchInput }
  *       onChange={ setSearchInput }
  *     />
diff --git a/packages/components/src/search-control/stories/index.story.tsx b/packages/components/src/search-control/stories/index.story.tsx
index 1a6e58724ccb2d..59618dd7e0913b 100644
--- a/packages/components/src/search-control/stories/index.story.tsx
+++ b/packages/components/src/search-control/stories/index.story.tsx
@@ -18,6 +18,7 @@ const meta: Meta< typeof SearchControl > = {
 	component: SearchControl,
 	argTypes: {
 		onChange: { action: 'onChange' },
+		value: { control: { type: null } },
 	},
 	parameters: {
 		controls: { expanded: true },
@@ -46,21 +47,6 @@ const Template: StoryFn< typeof SearchControl > = ( {
 
 export const Default = Template.bind( {} );
 Default.args = {
-	label: 'Label Text',
 	help: 'Help text to explain the input.',
-};
-
-/**
- * When an `onClose` callback is provided, the search control will render a close button
- * that will trigger the given callback.
- *
- * Use this if you want the button to trigger your own logic to close the search field entirely,
- * rather than just clearing the input value.
- */
-export const WithOnClose = Template.bind( {} );
-WithOnClose.args = {
-	...Default.args,
-};
-WithOnClose.argTypes = {
-	onClose: { action: 'onClose' },
+	__nextHasNoMarginBottom: true,
 };
diff --git a/packages/components/src/search-control/style.scss b/packages/components/src/search-control/style.scss
deleted file mode 100644
index 21bd875f699a98..00000000000000
--- a/packages/components/src/search-control/style.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-.components-search-control {
-	position: relative;
-
-	input[type="search"].components-search-control__input {
-		@include input-control;
-		display: block;
-		padding: 0 $grid-unit-60 0 $grid-unit-20;
-		background: $gray-100;
-		border: none;
-		width: 100%;
-		height: $grid-unit-60;
-
-		// Unset inherited values.
-		margin-left: 0;
-		margin-right: 0;
-
-		/* Fonts smaller than 16px causes mobile safari to zoom. */
-		font-size: $mobile-text-min-font-size;
-		@include break-small {
-			font-size: $default-font-size;
-		}
-
-		&:focus {
-			background: $white;
-			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $components-color-accent;
-		}
-
-		&::placeholder {
-			color: $gray-700;
-		}
-
-		&::-webkit-search-decoration,
-		&::-webkit-search-cancel-button,
-		&::-webkit-search-results-button,
-		&::-webkit-search-results-decoration {
-			-webkit-appearance: none;
-		}
-	}
-
-	&.is-next-40px-default-size input[type="search"].components-search-control__input {
-		height: $grid-unit-50;
-	}
-
-	&.is-size-compact input[type="search"].components-search-control__input {
-		height: $grid-unit-40;
-		padding-left: $grid-unit-10;
-		padding-right: $grid-unit-40;
-	}
-
-}
-
-.components-search-control__icon {
-	position: absolute;
-	right: ( $grid-unit-60 - $icon-size ) * 0.5;
-	top: 50%;
-	transform: translateY(-50%);
-
-	display: flex;
-	align-items: center;
-	justify-content: center;
-
-	width: $icon-size;
-
-	.is-size-compact & {
-		right: $grid-unit-05;
-	}
-}
-
-.components-search-control__input-wrapper {
-	position: relative;
-}
diff --git a/packages/components/src/search-control/styles.ts b/packages/components/src/search-control/styles.ts
new file mode 100644
index 00000000000000..183c7a26e172e9
--- /dev/null
+++ b/packages/components/src/search-control/styles.ts
@@ -0,0 +1,42 @@
+/**
+ * External dependencies
+ */
+import styled from '@emotion/styled';
+
+/**
+ * Internal dependencies
+ */
+import { space } from '../utils/space';
+import InputControl from '../input-control';
+import { COLORS } from '../utils';
+import type { SearchControlProps } from './types';
+
+const inlinePadding = ( {
+	size,
+}: Required< Pick< SearchControlProps, 'size' > > ) => {
+	return space( size === 'compact' ? 1 : 2 );
+};
+
+export const SuffixItemWrapper = styled.div`
+	display: flex;
+	padding-inline-end: ${ inlinePadding };
+
+	svg {
+		fill: currentColor;
+	}
+`;
+
+export const StyledInputControl = styled( InputControl )`
+	input[type='search'] {
+		&::-webkit-search-decoration,
+		&::-webkit-search-cancel-button,
+		&::-webkit-search-results-button,
+		&::-webkit-search-results-decoration {
+			-webkit-appearance: none;
+		}
+	}
+
+	&:not( :focus-within ) {
+		--wp-components-color-background: ${ COLORS.theme.gray[ 100 ] };
+	}
+`;
diff --git a/packages/components/src/search-control/test/index.tsx b/packages/components/src/search-control/test/index.tsx
new file mode 100644
index 00000000000000..5250a531f58d09
--- /dev/null
+++ b/packages/components/src/search-control/test/index.tsx
@@ -0,0 +1,111 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+import { click, type } from '@ariakit/test';
+
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import SearchControl from '..';
+
+function ControlledSearchControl( {
+	onChange,
+	...restProps
+}: React.ComponentProps< typeof SearchControl > ) {
+	const [ value, setValue ] = useState( '' );
+
+	return (
+		<SearchControl
+			{ ...restProps }
+			__nextHasNoMarginBottom
+			value={ value }
+			onChange={ ( ...args ) => {
+				setValue( ...args );
+				onChange( ...args );
+			} }
+		/>
+	);
+}
+
+describe( 'SearchControl', () => {
+	describe.each( [
+		// TODO: Uncontrolled mode is not supported yet.
+		// [ 'Uncontrolled', SearchControl ],
+		[ 'Controlled mode', ControlledSearchControl ],
+	] )( '%s', ( ...modeAndComponent ) => {
+		const [ , Component ] = modeAndComponent;
+
+		it( 'should call onChange with input value when value is changed', async () => {
+			const onChangeSpy = jest.fn();
+			render( <Component onChange={ onChangeSpy } /> );
+
+			const searchInput = screen.getByRole( 'searchbox' );
+			await type( 'test', searchInput );
+			expect( searchInput ).toHaveValue( 'test' );
+			expect( onChangeSpy ).toHaveBeenLastCalledWith( 'test' );
+		} );
+
+		it( 'should render a Reset search button if no onClose function is provided', async () => {
+			const onChangeSpy = jest.fn();
+			render( <Component onChange={ onChangeSpy } /> );
+
+			const searchInput = screen.getByRole( 'searchbox' );
+
+			expect(
+				screen.queryByRole( 'button', { name: 'Reset search' } )
+			).not.toBeInTheDocument();
+
+			await type( 'test', searchInput );
+			const resetButton = screen.getByRole( 'button', {
+				name: 'Reset search',
+			} );
+			expect( resetButton ).toBeVisible();
+
+			await click( resetButton );
+			expect( searchInput ).toHaveValue( '' );
+			expect( onChangeSpy ).toHaveBeenLastCalledWith( '' );
+		} );
+
+		it( 'should render a Close button (instead of Reset) when onClose function is provided', async () => {
+			const onChangeSpy = jest.fn();
+			const onCloseSpy = jest.fn();
+			render(
+				<Component onChange={ onChangeSpy } onClose={ onCloseSpy } />
+			);
+
+			expect( console ).toHaveWarnedWith(
+				'`onClose` prop in wp.components.SearchControl is deprecated since version 6.8.'
+			);
+			expect(
+				screen.queryByRole( 'button', { name: 'Close search' } )
+			).toBeVisible();
+			expect(
+				screen.queryByRole( 'button', { name: 'Reset search' } )
+			).not.toBeInTheDocument();
+
+			const searchInput = screen.getByRole( 'searchbox' );
+			await type( 'test', searchInput );
+
+			expect(
+				screen.queryByRole( 'button', { name: 'Close search' } )
+			).toBeVisible();
+			expect(
+				screen.queryByRole( 'button', { name: 'Reset search' } )
+			).not.toBeInTheDocument();
+			expect( onChangeSpy ).toHaveBeenCalledTimes( 'test'.length );
+
+			await click(
+				screen.getByRole( 'button', { name: 'Close search' } )
+			);
+			expect( onCloseSpy ).toHaveBeenCalledTimes( 1 );
+			expect( searchInput ).toHaveValue( 'test' ); // no change
+			expect( onChangeSpy ).toHaveBeenCalledTimes( 'test'.length ); // no change
+		} );
+	} );
+} );
diff --git a/packages/components/src/search-control/types.ts b/packages/components/src/search-control/types.ts
index a3ae13b6d4985a..e4117e5ed57ffb 100644
--- a/packages/components/src/search-control/types.ts
+++ b/packages/components/src/search-control/types.ts
@@ -1,23 +1,35 @@
-/**
- * External dependencies
- */
-import type { HTMLAttributes } from 'react';
-
 /**
  * Internal dependencies
  */
-import type { BaseControlProps } from '../base-control/types';
+import type { InputControlProps } from '../input-control/types';
 
-export type SearchControlProps = Pick<
-	BaseControlProps,
-	'__nextHasNoMarginBottom' | 'help' | 'label'
-> & {
+export type SearchControlProps = Pick< InputControlProps, 'help' | 'value' > & {
+	/**
+	 * @deprecated This is now the default.
+	 * @ignore
+	 */
+	__next40pxDefaultSize?: InputControlProps[ '__next40pxDefaultSize' ];
+	/**
+	 * Start opting into the new margin-free styles that will become the default in a future version.
+	 *
+	 * @default false
+	 */
+	__nextHasNoMarginBottom?: boolean;
 	/**
 	 * If true, the label will only be visible to screen readers.
 	 *
 	 * @default true
 	 */
-	hideLabelFromVision?: boolean;
+	hideLabelFromVision?: InputControlProps[ 'hideLabelFromVision' ];
+	/**
+	 * The accessible label for the input.
+	 *
+	 * A label should always be provided as an accessibility best practice,
+	 * even when a placeholder is defined and `hideLabelFromVision` is `true`.
+	 *
+	 * @default 'Search'
+	 */
+	label?: string;
 	/**
 	 * A function that receives the value of the input when the value is changed.
 	 */
@@ -28,28 +40,34 @@ export type SearchControlProps = Pick<
 	 *
 	 * Use this if you want the button to trigger your own logic to close the search field entirely,
 	 * rather than just clearing the input value.
+	 *
+	 * @deprecated
+	 * @ignore
 	 */
 	onClose?: () => void;
+	/** @ignore */
+	onDrag?: InputControlProps[ 'onDrag' ];
+	/** @ignore */
+	onDragStart?: InputControlProps[ 'onDragStart' ];
+	/** @ignore */
+	onDragEnd?: InputControlProps[ 'onDragEnd' ];
 	/**
 	 * A placeholder for the input.
 	 *
 	 * @default 'Search'
 	 */
-	placeholder?: HTMLAttributes< HTMLInputElement >[ 'placeholder' ];
-	/**
-	 * The current value of the input.
-	 */
-	value?: string;
+	placeholder?: InputControlProps[ 'placeholder' ];
 	/**
 	 * The size of the component
 	 *
 	 * @default 'default'
 	 */
 	size?: 'default' | 'compact';
-	/**
-	 * Start opting into the larger default height that will become the default size in a future version.
-	 *
-	 * @default false
-	 */
-	__next40pxDefaultSize?: boolean;
+};
+
+export type SuffixItemProps = Pick<
+	SearchControlProps,
+	'value' | 'onChange' | 'onClose'
+> & {
+	searchRef: React.RefObject< HTMLInputElement >;
 };
diff --git a/packages/components/src/select-control/README.md b/packages/components/src/select-control/README.md
index e113c7cf01620d..c240243408fab3 100644
--- a/packages/components/src/select-control/README.md
+++ b/packages/components/src/select-control/README.md
@@ -4,12 +4,6 @@ SelectControl allow users to select from a single or multiple option menu. It fu
 
 ![A “Link To” select with “none” selected.](https://wordpress.org/gutenberg/files/2018/12/select.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
@@ -109,7 +103,7 @@ Render a user interface to select multiple users from a list.
 ```jsx
 <SelectControl
 	multiple
-	label={ __( 'Select some users:' ) }
+	label={ __( 'User' ) }
 	value={ this.state.users } // e.g: value = [ 'a', 'c' ]
 	onChange={ ( users ) => {
 		this.setState( { users } );
@@ -132,7 +126,7 @@ const [ item, setItem ] = useState( '' );
 // ...
 
 <SelectControl
-    label={ __( 'Select an item:' ) }
+    label={ __( 'My dinosaur' ) }
     value={ item } // e.g: value = 'a'
     onChange={ ( selection ) => { setItem( selection ) } }
     __nextHasNoMarginBottom
@@ -196,7 +190,7 @@ In most cases, it is preferable to use the `FormTokenField` or `CheckboxControl`
 
 #### options
 
-An array of objects containing the following properties:
+An array of objects containing the following properties, as well as any other `option` element attributes:
 
 -   `label`: (string) The label to be shown to the user.
 -   `value`: (string) The internal value used to choose the selected value. This is also the value passed to onChange when the option is selected.
@@ -220,6 +214,29 @@ If multiple is false the value received is a single value with the new selected
 -   Type: `function`
 -   Required: Yes
 
+#### value
+
+The value of the selected option. If `multiple` is true, the `value` should be an array with the values of the selected options.
+
+-   Type: `String|String[]`
+-   Required: No
+
+#### variant
+
+The style variant of the control.
+
+-   Type: `'default' | 'minimal'`
+-   Required: No
+-   Default: `'default'`
+
+### __next40pxDefaultSize
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
+
 ### __nextHasNoMarginBottom
 
 Start opting into the new margin-free styles that will become the default in a future version.
diff --git a/packages/components/src/select-control/index.tsx b/packages/components/src/select-control/index.tsx
index 9c6ce0aba5d27e..3686661b8a58dc 100644
--- a/packages/components/src/select-control/index.tsx
+++ b/packages/components/src/select-control/index.tsx
@@ -1,27 +1,24 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { useState, forwardRef } from '@wordpress/element';
+import { forwardRef } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import BaseControl from '../base-control';
-import InputBase from '../input-control/input-base';
-import { Select } from './styles/select-control-styles';
+import { Select, StyledInputBase } from './styles/select-control-styles';
 import type { WordPressComponentProps } from '../context';
 import type { SelectControlProps } from './types';
 import SelectControlChevronDown from './chevron-down';
 import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props';
 
-const noop = () => {};
-
 function useUniqueId( idProp?: string ) {
 	const instanceId = useInstanceId( SelectControl );
 	const id = `inspector-select-control-${ instanceId }`;
@@ -29,8 +26,24 @@ function useUniqueId( idProp?: string ) {
 	return idProp || id;
 }
 
-function UnforwardedSelectControl(
-	props: WordPressComponentProps< SelectControlProps, 'select', false >,
+function SelectOptions( {
+	options,
+}: {
+	options: NonNullable< SelectControlProps[ 'options' ] >;
+} ) {
+	return options.map( ( { id, label, value, ...optionProps }, index ) => {
+		const key = id || `${ label }-${ value }-${ index }`;
+
+		return (
+			<option key={ key } value={ value } { ...optionProps }>
+				{ label }
+			</option>
+		);
+	} );
+}
+
+function UnforwardedSelectControl< V extends string >(
+	props: WordPressComponentProps< SelectControlProps< V >, 'select', false >,
 	ref: React.ForwardedRef< HTMLSelectElement >
 ) {
 	const {
@@ -41,9 +54,7 @@ function UnforwardedSelectControl(
 		id: idProp,
 		label,
 		multiple = false,
-		onBlur = noop,
 		onChange,
-		onFocus = noop,
 		options = [],
 		size = 'default',
 		value: valueProp,
@@ -51,30 +62,18 @@ function UnforwardedSelectControl(
 		children,
 		prefix,
 		suffix,
+		variant = 'default',
 		__next40pxDefaultSize = false,
 		__nextHasNoMarginBottom = false,
 		...restProps
-	} = useDeprecated36pxDefaultSizeProp(
-		props,
-		'wp.components.SelectControl',
-		'6.4'
-	);
-	const [ isFocused, setIsFocused ] = useState( false );
+	} = useDeprecated36pxDefaultSizeProp( props );
 	const id = useUniqueId( idProp );
 	const helpId = help ? `${ id }__help` : undefined;
 
 	// Disable reason: A select with an onchange throws a warning.
-	if ( ! options?.length && ! children ) return null;
-
-	const handleOnBlur = ( event: React.FocusEvent< HTMLSelectElement > ) => {
-		onBlur( event );
-		setIsFocused( false );
-	};
-
-	const handleOnFocus = ( event: React.FocusEvent< HTMLSelectElement > ) => {
-		onFocus( event );
-		setIsFocused( true );
-	};
+	if ( ! options?.length && ! children ) {
+		return null;
+	}
 
 	const handleOnChange = (
 		event: React.ChangeEvent< HTMLSelectElement >
@@ -83,28 +82,31 @@ function UnforwardedSelectControl(
 			const selectedOptions = Array.from( event.target.options ).filter(
 				( { selected } ) => selected
 			);
-			const newValues = selectedOptions.map( ( { value } ) => value );
+			const newValues = selectedOptions.map(
+				( { value } ) => value as V
+			);
 			props.onChange?.( newValues, { event } );
 			return;
 		}
 
-		props.onChange?.( event.target.value, { event } );
+		props.onChange?.( event.target.value as V, { event } );
 	};
 
-	const classes = classNames( 'components-select-control', className );
+	const classes = clsx( 'components-select-control', className );
 
 	return (
 		<BaseControl
 			help={ help }
 			id={ id }
 			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+			__associatedWPComponentName="SelectControl"
 		>
-			<InputBase
+			<StyledInputBase
 				className={ classes }
 				disabled={ disabled }
 				hideLabelFromVision={ hideLabelFromVision }
 				id={ id }
-				isFocused={ isFocused }
+				isBorderless={ variant === 'minimal' }
 				label={ label }
 				size={ size }
 				suffix={
@@ -112,6 +114,10 @@ function UnforwardedSelectControl(
 				}
 				prefix={ prefix }
 				labelPosition={ labelPosition }
+				__unstableInputWidth={
+					variant === 'minimal' ? 'auto' : undefined
+				}
+				variant={ variant }
 				__next40pxDefaultSize={ __next40pxDefaultSize }
 			>
 				<Select
@@ -122,32 +128,15 @@ function UnforwardedSelectControl(
 					disabled={ disabled }
 					id={ id }
 					multiple={ multiple }
-					onBlur={ handleOnBlur }
 					onChange={ handleOnChange }
-					onFocus={ handleOnFocus }
 					ref={ ref }
 					selectSize={ size }
 					value={ valueProp }
+					variant={ variant }
 				>
-					{ children ||
-						options.map( ( option, index ) => {
-							const key =
-								option.id ||
-								`${ option.label }-${ option.value }-${ index }`;
-
-							return (
-								<option
-									key={ key }
-									value={ option.value }
-									disabled={ option.disabled }
-									hidden={ option.hidden }
-								>
-									{ option.label }
-								</option>
-							);
-						} ) }
+					{ children || <SelectOptions options={ options } /> }
 				</Select>
-			</InputBase>
+			</StyledInputBase>
 		</BaseControl>
 	);
 }
@@ -165,6 +154,7 @@ function UnforwardedSelectControl(
  *
  *   return (
  *     <SelectControl
+ *       __nextHasNoMarginBottom
  *       label="Size"
  *       value={ size }
  *       options={ [
@@ -178,6 +168,14 @@ function UnforwardedSelectControl(
  * };
  * ```
  */
-export const SelectControl = forwardRef( UnforwardedSelectControl );
+export const SelectControl = forwardRef( UnforwardedSelectControl ) as <
+	V extends string,
+>(
+	props: WordPressComponentProps<
+		SelectControlProps< V >,
+		'select',
+		false
+	> & { ref?: React.Ref< HTMLSelectElement > }
+) => React.JSX.Element | null;
 
 export default SelectControl;
diff --git a/packages/components/src/select-control/stories/index.story.tsx b/packages/components/src/select-control/stories/index.story.tsx
index 42966ef4f05f47..5e57a4eaecd5ab 100644
--- a/packages/components/src/select-control/stories/index.story.tsx
+++ b/packages/components/src/select-control/stories/index.story.tsx
@@ -12,6 +12,7 @@ import { useState } from '@wordpress/element';
  * Internal dependencies
  */
 import SelectControl from '../';
+import { InputControlPrefixWrapper } from '../../input-control/input-prefix-wrapper';
 
 const meta: Meta< typeof SelectControl > = {
 	title: 'Components/SelectControl',
@@ -63,6 +64,8 @@ const SelectControlWithState: StoryFn< typeof SelectControl > = ( props ) => {
 
 export const Default = SelectControlWithState.bind( {} );
 Default.args = {
+	__nextHasNoMarginBottom: true,
+	label: 'Label',
 	options: [
 		{ value: '', label: 'Select an Option', disabled: true },
 		{ value: 'a', label: 'Option A' },
@@ -75,16 +78,18 @@ export const WithLabelAndHelpText = SelectControlWithState.bind( {} );
 WithLabelAndHelpText.args = {
 	...Default.args,
 	help: 'Help text to explain the select control.',
-	label: 'Value',
 };
 
 /**
  * As an alternative to the `options` prop, `optgroup`s and `options` can be
  * passed in as `children` for more customizeability.
  */
-export const WithCustomChildren: StoryFn< typeof SelectControl > = ( args ) => {
-	return (
-		<SelectControlWithState { ...args }>
+export const WithCustomChildren = SelectControlWithState.bind( {} );
+WithCustomChildren.args = {
+	__nextHasNoMarginBottom: true,
+	label: 'Label',
+	children: (
+		<>
 			<option value="option-1">Option 1</option>
 			<option value="option-2" disabled>
 				Option 2 - Disabled
@@ -97,6 +102,23 @@ export const WithCustomChildren: StoryFn< typeof SelectControl > = ( args ) => {
 					Option Group 1 - Option 2 - Disabled
 				</option>
 			</optgroup>
-		</SelectControlWithState>
-	);
+		</>
+	),
+};
+
+/**
+ * By default, the prefix is aligned with the edge of the input border, with no padding.
+ * If you want to apply standard padding in accordance with the size variant, wrap the element in the `<InputControlPrefixWrapper>` component.
+ */
+export const WithPrefix = SelectControlWithState.bind( {} );
+WithPrefix.args = {
+	...Default.args,
+	prefix: <InputControlPrefixWrapper>Prefix:</InputControlPrefixWrapper>,
+};
+
+export const Minimal = SelectControlWithState.bind( {} );
+Minimal.args = {
+	...Default.args,
+	variant: 'minimal',
+	hideLabelFromVision: true,
 };
diff --git a/packages/components/src/select-control/styles/select-control-styles.ts b/packages/components/src/select-control/styles/select-control-styles.ts
index d23c689e2901ee..5248e7af988285 100644
--- a/packages/components/src/select-control/styles/select-control-styles.ts
+++ b/packages/components/src/select-control/styles/select-control-styles.ts
@@ -7,15 +7,17 @@ import styled from '@emotion/styled';
 /**
  * Internal dependencies
  */
-import { COLORS, rtl } from '../../utils';
+import { COLORS, rtl, CONFIG } from '../../utils';
 import { space } from '../../utils/space';
 import type { SelectControlProps } from '../types';
 import InputControlSuffixWrapper from '../../input-control/input-suffix-wrapper';
+import { fontSizeStyles } from '../../input-control/styles/input-control-styles';
+import InputBase from '../../input-control/input-base';
 
 interface SelectProps
 	extends Pick<
 		SelectControlProps,
-		'__next40pxDefaultSize' | 'disabled' | 'multiple'
+		'__next40pxDefaultSize' | 'disabled' | 'multiple' | 'variant'
 	> {
 	// Using `selectSize` instead of `size` to avoid a type conflict with the
 	// `size` HTML attribute of the `select` element.
@@ -23,33 +25,33 @@ interface SelectProps
 }
 
 const disabledStyles = ( { disabled }: SelectProps ) => {
-	if ( ! disabled ) return '';
+	if ( ! disabled ) {
+		return '';
+	}
 
-	return css( {
-		color: COLORS.ui.textDisabled,
-	} );
+	return css`
+		color: ${ COLORS.ui.textDisabled };
+		cursor: default;
+	`;
 };
 
-const fontSizeStyles = ( { selectSize = 'default' }: SelectProps ) => {
-	const sizes = {
-		default: '13px',
-		small: '11px',
-		'__unstable-large': '13px',
-	};
-
-	const fontSize = sizes[ selectSize ];
-	const fontSizeMobile = '16px';
+const inputBaseVariantStyles = ( { variant }: SelectProps ) => {
+	if ( variant === 'minimal' ) {
+		return css`
+			display: inline-flex;
+		`;
+	}
 
-	if ( ! fontSize ) return '';
+	return '';
+};
 
-	return css`
-		font-size: ${ fontSizeMobile };
+export const StyledInputBase = styled( InputBase )`
+	color: ${ COLORS.theme.foreground };
+	cursor: pointer;
 
-		@media ( min-width: 600px ) {
-			font-size: ${ fontSize };
-		}
-	`;
-};
+	${ disabledStyles }
+	${ inputBaseVariantStyles }
+`;
 
 const sizeStyles = ( {
 	__next40pxDefaultSize,
@@ -75,6 +77,12 @@ const sizeStyles = ( {
 			paddingTop: 0,
 			paddingBottom: 0,
 		},
+		compact: {
+			height: 32,
+			minHeight: 32,
+			paddingTop: 0,
+			paddingBottom: 0,
+		},
 		'__unstable-large': {
 			height: 40,
 			minHeight: 40,
@@ -84,12 +92,7 @@ const sizeStyles = ( {
 	};
 
 	if ( ! __next40pxDefaultSize ) {
-		sizes.default = {
-			height: 32,
-			minHeight: 32,
-			paddingTop: 0,
-			paddingBottom: 0,
-		};
+		sizes.default = sizes.compact;
 	}
 
 	const style = sizes[ selectSize ] || sizes.default;
@@ -105,13 +108,14 @@ const sizePaddings = ( {
 	selectSize = 'default',
 }: SelectProps ) => {
 	const padding = {
-		default: 16,
-		small: 8,
-		'__unstable-large': 16,
+		default: CONFIG.controlPaddingX,
+		small: CONFIG.controlPaddingXSmall,
+		compact: CONFIG.controlPaddingXSmall,
+		'__unstable-large': CONFIG.controlPaddingX,
 	};
 
 	if ( ! __next40pxDefaultSize ) {
-		padding.default = 8;
+		padding.default = padding.compact;
 	}
 
 	const selectedPadding = padding[ selectSize ] || padding.default;
@@ -134,6 +138,16 @@ const overflowStyles = ( { multiple }: SelectProps ) => {
 	};
 };
 
+const variantStyles = ( { variant }: SelectProps ) => {
+	if ( variant === 'minimal' ) {
+		return css( {
+			fieldSizing: 'content',
+		} );
+	}
+
+	return '';
+};
+
 // TODO: Resolve need to use &&& to increase specificity
 // https://github.com/WordPress/gutenberg/issues/18483
 
@@ -144,27 +158,31 @@ export const Select = styled.select< SelectProps >`
 		box-sizing: border-box;
 		border: none;
 		box-shadow: none !important;
-		color: ${ COLORS.gray[ 900 ] };
+		color: currentColor; // Overrides hover/focus styles in forms.css
+		cursor: inherit;
 		display: block;
 		font-family: inherit;
 		margin: 0;
 		width: 100%;
 		max-width: none;
-		cursor: pointer;
 		white-space: nowrap;
 		text-overflow: ellipsis;
 
-		${ disabledStyles };
 		${ fontSizeStyles };
 		${ sizeStyles };
 		${ sizePaddings };
 		${ overflowStyles }
+		${ variantStyles }
 	}
 `;
 
 export const DownArrowWrapper = styled.div`
 	margin-inline-end: ${ space( -1 ) }; // optically adjust the icon
 	line-height: 0;
+
+	path {
+		fill: currentColor;
+	}
 `;
 
 export const InputControlSuffixWrapperWithClickThrough = styled(
diff --git a/packages/components/src/select-control/test/select-control.tsx b/packages/components/src/select-control/test/select-control.tsx
index 03e3acbf1f7325..47b684cd20e280 100644
--- a/packages/components/src/select-control/test/select-control.tsx
+++ b/packages/components/src/select-control/test/select-control.tsx
@@ -7,7 +7,13 @@ import userEvent from '@testing-library/user-event';
 /**
  * Internal dependencies
  */
-import SelectControl from '..';
+import _SelectControl from '..';
+
+const SelectControl = (
+	props: React.ComponentProps< typeof _SelectControl >
+) => {
+	return <_SelectControl { ...props } __nextHasNoMarginBottom />;
+};
 
 describe( 'SelectControl', () => {
 	it( 'should not render when no options or children are provided', () => {
@@ -17,8 +23,8 @@ describe( 'SelectControl', () => {
 		expect( screen.queryByRole( 'combobox' ) ).not.toBeInTheDocument();
 	} );
 
-	it( 'should not render its children', async () => {
-		const user = await userEvent.setup();
+	it( 'should render its children', async () => {
+		const user = userEvent.setup();
 		const handleChangeMock = jest.fn();
 
 		render(
@@ -46,8 +52,8 @@ describe( 'SelectControl', () => {
 		);
 	} );
 
-	it( 'should not render its options', async () => {
-		const user = await userEvent.setup();
+	it( 'should render its options', async () => {
+		const user = userEvent.setup();
 		const handleChangeMock = jest.fn();
 
 		render(
@@ -81,4 +87,148 @@ describe( 'SelectControl', () => {
 			expect.anything()
 		);
 	} );
+
+	it( 'should pass through options props', () => {
+		render(
+			<SelectControl
+				label="Select"
+				options={ [
+					{
+						value: 'value',
+						label: 'label',
+						'aria-label': 'Aria label',
+					},
+				] }
+			/>
+		);
+
+		expect(
+			screen.getByRole( 'option', { name: 'Aria label' } )
+		).toBeInTheDocument();
+	} );
+
+	/* eslint-disable jest/expect-expect */
+	describe( 'static typing', () => {
+		describe( 'single', () => {
+			it( 'should infer the value type from available `options`, but not the `value` or `onChange` prop', () => {
+				const onChange: ( value: 'foo' | 'bar' ) => void = () => {};
+
+				<SelectControl
+					value="narrow"
+					options={ [
+						{
+							value: 'narrow',
+							label: 'Narrow',
+						},
+						{
+							value: 'value',
+							label: 'Value',
+						},
+					] }
+					// @ts-expect-error onChange type is not compatible with inferred value type
+					onChange={ onChange }
+				/>;
+
+				<_SelectControl
+					// @ts-expect-error "string" is not "narrow" or "value"
+					value="string"
+					options={ [
+						{
+							value: 'narrow',
+							label: 'Narrow',
+						},
+						{
+							value: 'value',
+							label: 'Value',
+						},
+					] }
+					// @ts-expect-error "string" is not "narrow" or "value"
+					onChange={ ( value ) => value === 'string' }
+				/>;
+			} );
+
+			it( 'should accept an explicit type argument', () => {
+				<_SelectControl< 'narrow' | 'value' >
+					// @ts-expect-error "string" is not "narrow" or "value"
+					value="string"
+					options={ [
+						{
+							value: 'narrow',
+							label: 'Narrow',
+						},
+						{
+							// @ts-expect-error "string" is not "narrow" or "value"
+							value: 'string',
+							label: 'String',
+						},
+					] }
+				/>;
+			} );
+		} );
+
+		describe( 'multiple', () => {
+			it( 'should infer the value type from available `options`, but not the `value` or `onChange` prop', () => {
+				const onChange: (
+					value: ( 'foo' | 'bar' )[]
+				) => void = () => {};
+
+				<_SelectControl
+					multiple
+					value={ [ 'narrow' ] }
+					options={ [
+						{
+							value: 'narrow',
+							label: 'Narrow',
+						},
+						{
+							value: 'value',
+							label: 'Value',
+						},
+					] }
+					// @ts-expect-error onChange type is not compatible with inferred value type
+					onChange={ onChange }
+				/>;
+
+				<_SelectControl
+					multiple
+					// @ts-expect-error "string" is not "narrow" or "value"
+					value={ [ 'string' ] }
+					options={ [
+						{
+							value: 'narrow',
+							label: 'Narrow',
+						},
+						{
+							value: 'value',
+							label: 'Value',
+						},
+					] }
+					onChange={ ( value ) =>
+						// @ts-expect-error "string" is not "narrow" or "value"
+						value.forEach( ( v ) => v === 'string' )
+					}
+				/>;
+			} );
+
+			it( 'should accept an explicit type argument', () => {
+				<_SelectControl< 'narrow' | 'value' >
+					multiple
+					// @ts-expect-error "string" is not "narrow" or "value"
+					value={ [ 'string' ] }
+					options={ [
+						{
+							value: 'narrow',
+							label: 'Narrow',
+						},
+						{
+							// @ts-expect-error "string" is not "narrow" or "value"
+							value: 'string',
+							label: 'String',
+						},
+					] }
+				/>;
+			} );
+		} );
+	} );
+	/* eslint-enable jest/expect-expect */
 } );
diff --git a/packages/components/src/select-control/types.ts b/packages/components/src/select-control/types.ts
index b8ec42cc4b72f2..4e7211ab9abfb2 100644
--- a/packages/components/src/select-control/types.ts
+++ b/packages/components/src/select-control/types.ts
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import type { ChangeEvent, FocusEvent, ReactNode } from 'react';
+import type { ChangeEvent, ReactNode } from 'react';
 
 /**
  * Internal dependencies
@@ -9,7 +9,7 @@ import type { ChangeEvent, FocusEvent, ReactNode } from 'react';
 import type { InputBaseProps } from '../input-control/types';
 import type { BaseControlProps } from '../base-control/types';
 
-type SelectControlBaseProps = Pick<
+type SelectControlBaseProps< V extends string > = Pick<
 	InputBaseProps,
 	| '__next36pxDefaultSize'
 	| '__next40pxDefaultSize'
@@ -22,9 +22,12 @@ type SelectControlBaseProps = Pick<
 	| 'suffix'
 > &
 	Pick< BaseControlProps, 'help' | '__nextHasNoMarginBottom' > & {
-		onBlur?: ( event: FocusEvent< HTMLSelectElement > ) => void;
-		onFocus?: ( event: FocusEvent< HTMLSelectElement > ) => void;
-		options?: {
+		/**
+		 * An array of option property objects to be rendered,
+		 * each with a `label` and `value` property, as well as any other
+		 * `<option>` attributes.
+		 */
+		options?: readonly ( {
 			/**
 			 * The label to be shown to the user.
 			 */
@@ -33,72 +36,80 @@ type SelectControlBaseProps = Pick<
 			 * The internal value used to choose the selected value.
 			 * This is also the value passed to `onChange` when the option is selected.
 			 */
-			value: string;
-			id?: string;
-			/**
-			 * Whether or not the option should have the disabled attribute.
-			 *
-			 * @default false
-			 */
-			disabled?: boolean;
-			/**
-			 * Whether or not the option should be hidden.
-			 *
-			 * @default false
-			 */
-			hidden?: boolean;
-		}[];
+			value: V;
+		} & Omit<
+			React.OptionHTMLAttributes< HTMLOptionElement >,
+			'label' | 'value'
+		> )[];
 		/**
 		 * As an alternative to the `options` prop, `optgroup`s and `options` can be
 		 * passed in as `children` for more customizability.
 		 */
 		children?: ReactNode;
+		/**
+		 * The style variant of the control.
+		 *
+		 * @default 'default'
+		 */
+		variant?: 'default' | 'minimal';
 	};
 
-export type SelectControlSingleSelectionProps = SelectControlBaseProps & {
-	/**
-	 * If this property is added, multiple values can be selected. The `value` passed should be an array.
-	 *
-	 * In most cases, it is preferable to use the `FormTokenField` or `CheckboxControl` components instead.
-	 *
-	 * @default false
-	 */
-	multiple?: false;
-	value?: string;
-	/**
-	 * A function that receives the value of the new option that is being selected as input.
-	 *
-	 * If `multiple` is `true`, the value received is an array of the selected value.
-	 * Otherwise, the value received is a single value with the new selected value.
-	 */
-	onChange?: (
-		value: string,
-		extra?: { event?: ChangeEvent< HTMLSelectElement > }
-	) => void;
-};
+export type SelectControlSingleSelectionProps< V extends string = string > =
+	SelectControlBaseProps< V > & {
+		/**
+		 * If this property is added, multiple values can be selected. The `value` passed should be an array.
+		 *
+		 * In most cases, it is preferable to use the `FormTokenField` or `CheckboxControl` components instead.
+		 *
+		 * @default false
+		 */
+		multiple?: false;
+		/**
+		 * The value of the selected option.
+		 *
+		 * If `multiple` is true, the `value` should be an array with the values of the selected options.
+		 */
+		value?: NoInfer< V >;
+		/**
+		 * A function that receives the value of the new option that is being selected as input.
+		 *
+		 * If `multiple` is `true`, the value received is an array of the selected value.
+		 * Otherwise, the value received is a single value with the new selected value.
+		 */
+		onChange?: (
+			value: NoInfer< V >,
+			extra?: { event?: ChangeEvent< HTMLSelectElement > }
+		) => void;
+	};
 
-export type SelectControlMultipleSelectionProps = SelectControlBaseProps & {
-	/**
-	 * If this property is added, multiple values can be selected. The `value` passed should be an array.
-	 *
-	 * In most cases, it is preferable to use the `FormTokenField` or `CheckboxControl` components instead.
-	 *
-	 * @default false
-	 */
-	multiple: true;
-	value?: string[];
-	/**
-	 * A function that receives the value of the new option that is being selected as input.
-	 *
-	 * If `multiple` is `true`, the value received is an array of the selected value.
-	 * Otherwise, the value received is a single value with the new selected value.
-	 */
-	onChange?: (
-		value: string[],
-		extra?: { event?: ChangeEvent< HTMLSelectElement > }
-	) => void;
-};
+export type SelectControlMultipleSelectionProps< V extends string > =
+	SelectControlBaseProps< V > & {
+		/**
+		 * If this property is added, multiple values can be selected. The `value` passed should be an array.
+		 *
+		 * In most cases, it is preferable to use the `FormTokenField` or `CheckboxControl` components instead.
+		 *
+		 * @default false
+		 */
+		multiple: true;
+		/**
+		 * The value of the selected option.
+		 *
+		 * If `multiple` is true, the `value` should be an array with the values of the selected options.
+		 */
+		value?: NoInfer< V >[];
+		/**
+		 * A function that receives the value of the new option that is being selected as input.
+		 *
+		 * If `multiple` is `true`, the value received is an array of the selected value.
+		 * Otherwise, the value received is a single value with the new selected value.
+		 */
+		onChange?: (
+			value: NoInfer< V >[],
+			extra?: { event?: ChangeEvent< HTMLSelectElement > }
+		) => void;
+	};
 
-export type SelectControlProps =
-	| SelectControlSingleSelectionProps
-	| SelectControlMultipleSelectionProps;
+export type SelectControlProps< V extends string = string > =
+	| SelectControlSingleSelectionProps< V >
+	| SelectControlMultipleSelectionProps< V >;
diff --git a/packages/components/src/shortcut/stories/index.story.tsx b/packages/components/src/shortcut/stories/index.story.tsx
index 27e96e3f6d1984..b0bd31ac51cf4b 100644
--- a/packages/components/src/shortcut/stories/index.story.tsx
+++ b/packages/components/src/shortcut/stories/index.story.tsx
@@ -10,7 +10,8 @@ import Shortcut from '../';
 
 const meta: Meta< typeof Shortcut > = {
 	component: Shortcut,
-	title: 'Components/Shortcut',
+	title: 'Components/Utilities/Shortcut',
+	id: 'components-shortcut',
 	parameters: {
 		controls: {
 			expanded: true,
diff --git a/packages/components/src/slot-fill/bubbles-virtually/fill.tsx b/packages/components/src/slot-fill/bubbles-virtually/fill.tsx
index 083d7302992dde..3cfadbadc62c4b 100644
--- a/packages/components/src/slot-fill/bubbles-virtually/fill.tsx
+++ b/packages/components/src/slot-fill/bubbles-virtually/fill.tsx
@@ -12,17 +12,17 @@ import type { FillComponentProps } from '../types';
 
 function useForceUpdate() {
 	const [ , setState ] = useState( {} );
-	const mounted = useRef( true );
+	const mountedRef = useRef( true );
 
 	useEffect( () => {
-		mounted.current = true;
+		mountedRef.current = true;
 		return () => {
-			mounted.current = false;
+			mountedRef.current = false;
 		};
 	}, [] );
 
 	return () => {
-		if ( mounted.current ) {
+		if ( mountedRef.current ) {
 			setState( {} );
 		}
 	};
diff --git a/packages/components/src/slot-fill/bubbles-virtually/slot-fill-context.ts b/packages/components/src/slot-fill/bubbles-virtually/slot-fill-context.ts
index 7c0ef340e53fe8..a144a7dc33f464 100644
--- a/packages/components/src/slot-fill/bubbles-virtually/slot-fill-context.ts
+++ b/packages/components/src/slot-fill/bubbles-virtually/slot-fill-context.ts
@@ -1,20 +1,18 @@
-/**
- * External dependencies
- */
-import { proxyMap } from 'valtio/utils';
 /**
  * WordPress dependencies
  */
 import { createContext } from '@wordpress/element';
 import warning from '@wordpress/warning';
+import { observableMap } from '@wordpress/compose';
+
 /**
  * Internal dependencies
  */
 import type { SlotFillBubblesVirtuallyContext } from '../types';
 
 const initialContextValue: SlotFillBubblesVirtuallyContext = {
-	slots: proxyMap(),
-	fills: proxyMap(),
+	slots: observableMap(),
+	fills: observableMap(),
 	registerSlot: () => {
 		warning(
 			'Components must be wrapped within `SlotFillProvider`. ' +
diff --git a/packages/components/src/slot-fill/bubbles-virtually/slot-fill-provider.tsx b/packages/components/src/slot-fill/bubbles-virtually/slot-fill-provider.tsx
index 6d10d08aca239c..4d68db6fd175ee 100644
--- a/packages/components/src/slot-fill/bubbles-virtually/slot-fill-provider.tsx
+++ b/packages/components/src/slot-fill/bubbles-virtually/slot-fill-provider.tsx
@@ -1,14 +1,9 @@
-/**
- * External dependencies
- */
-import { ref as valRef } from 'valtio';
-import { proxyMap } from 'valtio/utils';
-
 /**
  * WordPress dependencies
  */
-import { useMemo } from '@wordpress/element';
+import { useState } from '@wordpress/element';
 import isShallowEqual from '@wordpress/is-shallow-equal';
+import { observableMap } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -20,8 +15,8 @@ import type {
 } from '../types';
 
 function createSlotRegistry(): SlotFillBubblesVirtuallyContext {
-	const slots: SlotFillBubblesVirtuallyContext[ 'slots' ] = proxyMap();
-	const fills: SlotFillBubblesVirtuallyContext[ 'fills' ] = proxyMap();
+	const slots: SlotFillBubblesVirtuallyContext[ 'slots' ] = observableMap();
+	const fills: SlotFillBubblesVirtuallyContext[ 'fills' ] = observableMap();
 
 	const registerSlot: SlotFillBubblesVirtuallyContext[ 'registerSlot' ] = (
 		name,
@@ -30,14 +25,11 @@ function createSlotRegistry(): SlotFillBubblesVirtuallyContext {
 	) => {
 		const slot = slots.get( name );
 
-		slots.set(
-			name,
-			valRef( {
-				...slot,
-				ref: ref || slot?.ref,
-				fillProps: fillProps || slot?.fillProps || {},
-			} )
-		);
+		slots.set( name, {
+			...slot,
+			ref: ref || slot?.ref,
+			fillProps: fillProps || slot?.fillProps || {},
+		} );
 	};
 
 	const unregisterSlot: SlotFillBubblesVirtuallyContext[ 'unregisterSlot' ] =
@@ -74,7 +66,7 @@ function createSlotRegistry(): SlotFillBubblesVirtuallyContext {
 		name,
 		ref
 	) => {
-		fills.set( name, valRef( [ ...( fills.get( name ) || [] ), ref ] ) );
+		fills.set( name, [ ...( fills.get( name ) || [] ), ref ] );
 	};
 
 	const unregisterFill: SlotFillBubblesVirtuallyContext[ 'registerFill' ] = (
@@ -88,7 +80,7 @@ function createSlotRegistry(): SlotFillBubblesVirtuallyContext {
 
 		fills.set(
 			name,
-			valRef( fillsForName.filter( ( fillRef ) => fillRef !== ref ) )
+			fillsForName.filter( ( fillRef ) => fillRef !== ref )
 		);
 	};
 
@@ -106,7 +98,7 @@ function createSlotRegistry(): SlotFillBubblesVirtuallyContext {
 export default function SlotFillProvider( {
 	children,
 }: SlotFillProviderProps ) {
-	const registry = useMemo( createSlotRegistry, [] );
+	const [ registry ] = useState( createSlotRegistry );
 	return (
 		<SlotFillContext.Provider value={ registry }>
 			{ children }
diff --git a/packages/components/src/slot-fill/bubbles-virtually/slot.tsx b/packages/components/src/slot-fill/bubbles-virtually/slot.tsx
index e836782c906154..6ac2d51e1f857f 100644
--- a/packages/components/src/slot-fill/bubbles-virtually/slot.tsx
+++ b/packages/components/src/slot-fill/bubbles-virtually/slot.tsx
@@ -49,11 +49,10 @@ function Slot(
 		return () => {
 			unregisterSlot( name, ref );
 		};
-		// Ignore reason: We don't want to unregister and register the slot whenever
+		// We don't want to unregister and register the slot whenever
 		// `fillProps` change, which would cause the fill to be re-mounted. Instead,
 		// we can just update the slot (see hook below).
 		// For more context, see https://github.com/WordPress/gutenberg/pull/44403#discussion_r994415973
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ registerSlot, unregisterSlot, name ] );
 	// fillProps may be an update that interacts with the layout, so we
 	// useLayoutEffect.
diff --git a/packages/components/src/slot-fill/bubbles-virtually/use-slot-fills.ts b/packages/components/src/slot-fill/bubbles-virtually/use-slot-fills.ts
index 599f0bc5667711..6229d20f2da513 100644
--- a/packages/components/src/slot-fill/bubbles-virtually/use-slot-fills.ts
+++ b/packages/components/src/slot-fill/bubbles-virtually/use-slot-fills.ts
@@ -1,12 +1,8 @@
-/**
- * External dependencies
- */
-import { useSnapshot } from 'valtio';
-
 /**
  * WordPress dependencies
  */
 import { useContext } from '@wordpress/element';
+import { useObservableValue } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -16,9 +12,5 @@ import type { SlotKey } from '../types';
 
 export default function useSlotFills( name: SlotKey ) {
 	const registry = useContext( SlotFillContext );
-	const fills = useSnapshot( registry.fills, { sync: true } );
-	// The important bit here is that this call ensures that the hook
-	// only causes a re-render if the "fills" of a given slot name
-	// change change, not any fills.
-	return fills.get( name );
+	return useObservableValue( registry.fills, name );
 }
diff --git a/packages/components/src/slot-fill/bubbles-virtually/use-slot.ts b/packages/components/src/slot-fill/bubbles-virtually/use-slot.ts
index c039a36946991f..d1d37e1d8e541c 100644
--- a/packages/components/src/slot-fill/bubbles-virtually/use-slot.ts
+++ b/packages/components/src/slot-fill/bubbles-virtually/use-slot.ts
@@ -1,12 +1,8 @@
-/**
- * External dependencies
- */
-import { useSnapshot } from 'valtio';
-
 /**
  * WordPress dependencies
  */
 import { useMemo, useContext } from '@wordpress/element';
+import { useObservableValue } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -21,11 +17,7 @@ import type {
 
 export default function useSlot( name: SlotKey ) {
 	const registry = useContext( SlotFillContext );
-	const slots = useSnapshot( registry.slots, { sync: true } );
-	// The important bit here is that the `useSnapshot` call ensures that the
-	// hook only causes a re-render if the slot with the given name changes,
-	// not any other slot.
-	const slot = slots.get( name );
+	const slot = useObservableValue( registry.slots, name );
 
 	const api = useMemo(
 		() => ( {
diff --git a/packages/components/src/slot-fill/fill.ts b/packages/components/src/slot-fill/fill.ts
index 6aefacc4ff6f18..4134af25684b07 100644
--- a/packages/components/src/slot-fill/fill.ts
+++ b/packages/components/src/slot-fill/fill.ts
@@ -23,9 +23,8 @@ export default function Fill( { name, children }: FillComponentProps ) {
 		const refValue = ref.current;
 		registerFill( name, refValue );
 		return () => unregisterFill( name, refValue );
-		// Ignore reason: the useLayoutEffects here are written to fire at specific times, and introducing new dependencies could cause unexpected changes in behavior.
+		// The useLayoutEffects here are written to fire at specific times, and introducing new dependencies could cause unexpected changes in behavior.
 		// We'll leave them as-is until a more detailed investigation/refactor can be performed.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [] );
 
 	useLayoutEffect( () => {
@@ -33,9 +32,8 @@ export default function Fill( { name, children }: FillComponentProps ) {
 		if ( slot ) {
 			slot.forceUpdate();
 		}
-		// Ignore reason: the useLayoutEffects here are written to fire at specific times, and introducing new dependencies could cause unexpected changes in behavior.
+		// The useLayoutEffects here are written to fire at specific times, and introducing new dependencies could cause unexpected changes in behavior.
 		// We'll leave them as-is until a more detailed investigation/refactor can be performed.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ children ] );
 
 	useLayoutEffect( () => {
@@ -46,9 +44,8 @@ export default function Fill( { name, children }: FillComponentProps ) {
 		unregisterFill( ref.current.name, ref.current );
 		ref.current.name = name;
 		registerFill( name, ref.current );
-		// Ignore reason: the useLayoutEffects here are written to fire at specific times, and introducing new dependencies could cause unexpected changes in behavior.
+		// The useLayoutEffects here are written to fire at specific times, and introducing new dependencies could cause unexpected changes in behavior.
 		// We'll leave them as-is until a more detailed investigation/refactor can be performed.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ name ] );
 
 	return null;
diff --git a/packages/components/src/slot-fill/index.tsx b/packages/components/src/slot-fill/index.tsx
index fb1a08bc2207f9..03ed33a67f13b6 100644
--- a/packages/components/src/slot-fill/index.tsx
+++ b/packages/components/src/slot-fill/index.tsx
@@ -55,9 +55,12 @@ export function UnforwardedSlot(
 }
 export const Slot = forwardRef( UnforwardedSlot );
 
-export function Provider( { children }: SlotFillProviderProps ) {
+export function Provider( {
+	children,
+	passthrough = false,
+}: SlotFillProviderProps ) {
 	const parent = useContext( SlotFillContext );
-	if ( ! parent.isDefault ) {
+	if ( ! parent.isDefault && passthrough ) {
 		return <>{ children }</>;
 	}
 	return (
@@ -68,6 +71,7 @@ export function Provider( { children }: SlotFillProviderProps ) {
 		</SlotFillProvider>
 	);
 }
+Provider.displayName = 'SlotFillProvider';
 
 export function createSlotFill( key: SlotKey ) {
 	const baseName = typeof key === 'symbol' ? key.description : key;
diff --git a/packages/components/src/slot-fill/provider.tsx b/packages/components/src/slot-fill/provider.tsx
index ea32d7104b4981..6ed624bab67a3c 100644
--- a/packages/components/src/slot-fill/provider.tsx
+++ b/packages/components/src/slot-fill/provider.tsx
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import type { Component } from '@wordpress/element';
-import { useMemo } from '@wordpress/element';
+import { useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -118,7 +118,7 @@ function createSlotRegistry(): BaseSlotFillContext {
 }
 
 export function SlotFillProvider( { children }: SlotFillProviderProps ) {
-	const contextValue = useMemo( createSlotRegistry, [] );
+	const [ contextValue ] = useState( createSlotRegistry );
 	return (
 		<SlotFillContext.Provider value={ contextValue }>
 			{ children }
diff --git a/packages/components/src/slot-fill/stories/index.story.tsx b/packages/components/src/slot-fill/stories/index.story.tsx
index ee00a12d698954..bc6c4f57ad9ce1 100644
--- a/packages/components/src/slot-fill/stories/index.story.tsx
+++ b/packages/components/src/slot-fill/stories/index.story.tsx
@@ -15,7 +15,8 @@ import { Slot, Fill, Provider as SlotFillProvider } from '../';
 
 const meta: Meta< typeof Slot > = {
 	component: Slot,
-	title: 'Components/SlotFill',
+	title: 'Components/Utilities/SlotFill',
+	id: 'components-slotfill',
 	// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
 	subcomponents: { Fill, SlotFillProvider },
 	argTypes: {
diff --git a/packages/components/src/slot-fill/types.ts b/packages/components/src/slot-fill/types.ts
index 8abb9b941c527c..1711e04cbb1f47 100644
--- a/packages/components/src/slot-fill/types.ts
+++ b/packages/components/src/slot-fill/types.ts
@@ -3,6 +3,11 @@
  */
 import type { Component, MutableRefObject, ReactNode, RefObject } from 'react';
 
+/**
+ * WordPress dependencies
+ */
+import type { ObservableMap } from '@wordpress/compose';
+
 export type DistributiveOmit< T, K extends keyof any > = T extends any
 	? Omit< T, K >
 	: never;
@@ -96,6 +101,11 @@ export type SlotFillProviderProps = {
 	 * The children elements.
 	 */
 	children: ReactNode;
+
+	/**
+	 * Whether to pass slots to the parent provider if existent.
+	 */
+	passthrough?: boolean;
 };
 
 export type SlotFillBubblesVirtuallySlotRef = RefObject< HTMLElement >;
@@ -104,14 +114,14 @@ export type SlotFillBubblesVirtuallyFillRef = MutableRefObject< {
 } >;
 
 export type SlotFillBubblesVirtuallyContext = {
-	slots: Map<
+	slots: ObservableMap<
 		SlotKey,
 		{
 			ref: SlotFillBubblesVirtuallySlotRef;
 			fillProps: FillProps;
 		}
 	>;
-	fills: Map< SlotKey, SlotFillBubblesVirtuallyFillRef[] >;
+	fills: ObservableMap< SlotKey, SlotFillBubblesVirtuallyFillRef[] >;
 	registerSlot: (
 		name: SlotKey,
 		ref: SlotFillBubblesVirtuallySlotRef,
diff --git a/packages/components/src/snackbar/README.md b/packages/components/src/snackbar/README.md
index bbff9b9efabcb6..7fc734c69ac9b8 100644
--- a/packages/components/src/snackbar/README.md
+++ b/packages/components/src/snackbar/README.md
@@ -2,12 +2,6 @@
 
 Use Snackbars to communicate low priority, non-interruptive messages to the user.
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 A Snackbar displays a succinct message that is cleared out after a small delay. It can also offer the user options, like viewing a published post but these options should also be available elsewhere in the UI.
diff --git a/packages/components/src/snackbar/index.tsx b/packages/components/src/snackbar/index.tsx
index 45f1800bb2249f..0f2b74caca7d4a 100644
--- a/packages/components/src/snackbar/index.tsx
+++ b/packages/components/src/snackbar/index.tsx
@@ -2,13 +2,19 @@
  * External dependencies
  */
 import type { ForwardedRef, KeyboardEvent, MouseEvent } from 'react';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { speak } from '@wordpress/a11y';
-import { useEffect, forwardRef, renderToString } from '@wordpress/element';
+import {
+	useEffect,
+	useLayoutEffect,
+	useRef,
+	forwardRef,
+	renderToString,
+} from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import warning from '@wordpress/warning';
 
@@ -88,36 +94,40 @@ function UnforwardedSnackbar(
 
 	useSpokenMessage( spokenMessage, politeness );
 
-	// Only set up the timeout dismiss if we're not explicitly dismissing.
+	// The `onDismiss/onRemove` can have unstable references,
+	// trigger side-effect cleanup, and reset timers.
+	const callbacksRef = useRef( { onDismiss, onRemove } );
+	useLayoutEffect( () => {
+		callbacksRef.current = { onDismiss, onRemove };
+	} );
+
 	useEffect( () => {
+		// Only set up the timeout dismiss if we're not explicitly dismissing.
 		const timeoutHandle = setTimeout( () => {
 			if ( ! explicitDismiss ) {
-				onDismiss?.();
-				onRemove?.();
+				callbacksRef.current.onDismiss?.();
+				callbacksRef.current.onRemove?.();
 			}
 		}, NOTICE_TIMEOUT );
 
 		return () => clearTimeout( timeoutHandle );
-	}, [ onDismiss, onRemove, explicitDismiss ] );
+	}, [ explicitDismiss ] );
 
-	const classes = classnames( className, 'components-snackbar', {
+	const classes = clsx( className, 'components-snackbar', {
 		'components-snackbar-explicit-dismiss': !! explicitDismiss,
 	} );
 	if ( actions && actions.length > 1 ) {
 		// We need to inform developers that snackbar only accepts 1 action.
 		warning(
-			'Snackbar can only have 1 action, use Notice if your message require many messages'
+			'Snackbar can only have one action. Use Notice if your message requires many actions.'
 		);
 		// return first element only while keeping it inside an array
 		actions = [ actions[ 0 ] ];
 	}
 
-	const snackbarContentClassnames = classnames(
-		'components-snackbar__content',
-		{
-			'components-snackbar__content-with-icon': !! icon,
-		}
-	);
+	const snackbarContentClassnames = clsx( 'components-snackbar__content', {
+		'components-snackbar__content-with-icon': !! icon,
+	} );
 
 	return (
 		<div
@@ -125,9 +135,12 @@ function UnforwardedSnackbar(
 			className={ classes }
 			onClick={ ! explicitDismiss ? dismissMe : undefined }
 			tabIndex={ 0 }
-			role={ ! explicitDismiss ? 'button' : '' }
+			role={ ! explicitDismiss ? 'button' : undefined }
 			onKeyPress={ ! explicitDismiss ? dismissMe : undefined }
-			aria-label={ ! explicitDismiss ? __( 'Dismiss this notice' ) : '' }
+			aria-label={
+				! explicitDismiss ? __( 'Dismiss this notice' ) : undefined
+			}
+			data-testid="snackbar"
 		>
 			<div className={ snackbarContentClassnames }>
 				{ icon && (
@@ -152,7 +165,7 @@ function UnforwardedSnackbar(
 				{ explicitDismiss && (
 					<span
 						role="button"
-						aria-label="Dismiss this notice"
+						aria-label={ __( 'Dismiss this notice' ) }
 						tabIndex={ 0 }
 						className="components-snackbar__dismiss-button"
 						onClick={ dismissMe }
diff --git a/packages/components/src/snackbar/list.tsx b/packages/components/src/snackbar/list.tsx
index e423cf6c3a7f7e..f97f8cc5db8945 100644
--- a/packages/components/src/snackbar/list.tsx
+++ b/packages/components/src/snackbar/list.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -68,12 +68,17 @@ export function SnackbarList( {
 }: WordPressComponentProps< SnackbarListProps, 'div' > ) {
 	const listRef = useRef< HTMLDivElement | null >( null );
 	const isReducedMotion = useReducedMotion();
-	className = classnames( 'components-snackbar-list', className );
+	className = clsx( 'components-snackbar-list', className );
 	const removeNotice =
 		( notice: SnackbarListProps[ 'notices' ][ number ] ) => () =>
 			onRemove?.( notice.id );
 	return (
-		<div className={ className } tabIndex={ -1 } ref={ listRef }>
+		<div
+			className={ className }
+			tabIndex={ -1 }
+			ref={ listRef }
+			data-testid="snackbar-list"
+		>
 			{ children }
 			<AnimatePresence>
 				{ notices.map( ( notice ) => {
@@ -82,9 +87,9 @@ export function SnackbarList( {
 					return (
 						<motion.div
 							layout={ ! isReducedMotion } // See https://www.framer.com/docs/animation/#layout-animations
-							initial={ 'init' }
-							animate={ 'open' }
-							exit={ 'exit' }
+							initial="init"
+							animate="open"
+							exit="exit"
 							key={ notice.id }
 							variants={
 								isReducedMotion ? undefined : SNACKBAR_VARIANTS
diff --git a/packages/components/src/snackbar/stories/index.story.tsx b/packages/components/src/snackbar/stories/index.story.tsx
index 953b33d273b3fc..c1f525b60b3919 100644
--- a/packages/components/src/snackbar/stories/index.story.tsx
+++ b/packages/components/src/snackbar/stories/index.story.tsx
@@ -3,9 +3,15 @@
  */
 import type { Meta, StoryFn } from '@storybook/react';
 
+/**
+ * WordPress dependencies
+ */
+import { wordpress } from '@wordpress/icons';
+
 /**
  * Internal dependencies
  */
+import Icon from '../../icon';
 import Snackbar from '..';
 
 const meta: Meta< typeof Snackbar > = {
@@ -63,11 +69,7 @@ WithActions.args = {
 export const WithIcon: StoryFn< typeof Snackbar > = DefaultTemplate.bind( {} );
 WithIcon.args = {
 	children: 'Add an icon to make your snackbar stand out',
-	icon: (
-		<span role="img" aria-label="Icon" style={ { fontSize: 21 } }>
-			🌮
-		</span>
-	),
+	icon: <Icon style={ { fill: 'currentcolor' } } icon={ wordpress } />,
 };
 
 export const WithExplicitDismiss: StoryFn< typeof Snackbar > =
diff --git a/packages/components/src/snackbar/stories/list.story.tsx b/packages/components/src/snackbar/stories/list.story.tsx
index 5a759ddc661bfa..8548ffba1e1f09 100644
--- a/packages/components/src/snackbar/stories/list.story.tsx
+++ b/packages/components/src/snackbar/stories/list.story.tsx
@@ -70,7 +70,6 @@ Default.args = {
 				},
 			],
 			content: 'Post published.',
-			isDismissible: true,
 			explicitDismiss: false,
 		},
 		{
@@ -83,7 +82,6 @@ Default.args = {
 				},
 			],
 			content: 'Post updated.',
-			isDismissible: true,
 			explicitDismiss: false,
 		},
 		{
@@ -91,7 +89,6 @@ Default.args = {
 			spokenMessage: 'All content copied.',
 			actions: [],
 			content: 'All content copied.',
-			isDismissible: true,
 			explicitDismiss: false,
 		},
 	],
diff --git a/packages/components/src/snackbar/style.scss b/packages/components/src/snackbar/style.scss
index 3cae9c8ef65d49..1e76a1666411e7 100644
--- a/packages/components/src/snackbar/style.scss
+++ b/packages/components/src/snackbar/style.scss
@@ -3,8 +3,8 @@
 	font-size: $default-font-size;
 	background: rgba($black, 0.85); // Emulates #1e1e1e closely.
 	backdrop-filter: blur($grid-unit-20) saturate(180%);
-	border-radius: $radius-block-ui;
-	box-shadow: $shadow-popover;
+	border-radius: $radius-medium;
+	box-shadow: $elevation-small;
 	color: $white;
 	padding: $grid-unit-15 ($grid-unit-05 * 5);
 	width: 100%;
@@ -29,13 +29,14 @@
 	}
 
 	.components-snackbar__content-with-icon {
-		margin-left: $grid-unit-30;
+		position: relative;
+		padding-left: $icon-size;
 	}
 
 	.components-snackbar__icon {
 		position: absolute;
-		top: 24px;
-		left: 28px;
+		left: $grid-unit-10 * -1;
+		top: calc((#{$icon-size - ($default-font-size * $default-line-height)}) / -2);
 	}
 
 	.components-snackbar__dismiss-button {
diff --git a/packages/components/src/snackbar/test/index.tsx b/packages/components/src/snackbar/test/index.tsx
new file mode 100644
index 00000000000000..6be4e58c928123
--- /dev/null
+++ b/packages/components/src/snackbar/test/index.tsx
@@ -0,0 +1,267 @@
+/**
+ * External dependencies
+ */
+import { render, screen, within } from '@testing-library/react';
+import { click } from '@ariakit/test';
+
+/**
+ * WordPress dependencies
+ */
+import { speak } from '@wordpress/a11y';
+import { SVG, Path } from '@wordpress/primitives';
+
+/**
+ * Internal dependencies
+ */
+import Snackbar from '../index';
+
+jest.mock( '@wordpress/a11y', () => ( { speak: jest.fn() } ) );
+const mockedSpeak = jest.mocked( speak );
+
+describe( 'Snackbar', () => {
+	const testId = 'snackbar';
+
+	beforeEach( () => {
+		mockedSpeak.mockReset();
+	} );
+
+	it( 'should render correctly', () => {
+		render( <Snackbar>Message</Snackbar> );
+
+		const snackbar = screen.getByTestId( testId );
+
+		expect( snackbar ).toBeVisible();
+		expect( snackbar ).toHaveTextContent( 'Message' );
+	} );
+
+	it( 'should render with an additional className', () => {
+		render( <Snackbar className="gutenberg">Message</Snackbar> );
+
+		expect( screen.getByTestId( testId ) ).toHaveClass( 'gutenberg' );
+	} );
+
+	it( 'should render with an icon', () => {
+		const testIcon = (
+			<SVG data-testid="icon">
+				<Path />
+			</SVG>
+		);
+
+		render( <Snackbar icon={ testIcon }>Message</Snackbar> );
+
+		const snackbar = screen.getByTestId( testId );
+		const icon = within( snackbar ).getByTestId( 'icon' );
+
+		expect( icon ).toBeVisible();
+	} );
+
+	it( 'should be dismissible by clicking the snackbar', async () => {
+		const onRemove = jest.fn();
+		const onDismiss = jest.fn();
+
+		render(
+			<Snackbar onRemove={ onRemove } onDismiss={ onDismiss }>
+				Message
+			</Snackbar>
+		);
+
+		const snackbar = screen.getByTestId( testId );
+
+		expect( snackbar ).toHaveAttribute( 'role', 'button' );
+		expect( snackbar ).toHaveAttribute(
+			'aria-label',
+			'Dismiss this notice'
+		);
+
+		await click( snackbar );
+
+		expect( onRemove ).toHaveBeenCalledTimes( 1 );
+		expect( onDismiss ).toHaveBeenCalledTimes( 1 );
+	} );
+
+	it( 'should not be dismissible by clicking the snackbar when the `explicitDismiss` prop is set to `true`', async () => {
+		const onRemove = jest.fn();
+		const onDismiss = jest.fn();
+
+		render(
+			<Snackbar
+				explicitDismiss
+				onRemove={ onRemove }
+				onDismiss={ onDismiss }
+			>
+				Message
+			</Snackbar>
+		);
+
+		const snackbar = screen.getByTestId( testId );
+
+		expect( snackbar ).not.toHaveAttribute( 'role', 'button' );
+		expect( snackbar ).not.toHaveAttribute(
+			'aria-label',
+			'Dismiss this notice'
+		);
+		expect( snackbar ).toHaveClass(
+			'components-snackbar-explicit-dismiss'
+		);
+
+		await click( snackbar );
+
+		expect( onRemove ).not.toHaveBeenCalled();
+		expect( onDismiss ).not.toHaveBeenCalled();
+	} );
+
+	it( 'should be dismissible by clicking the close button when the `explicitDismiss` prop is set to `true`', async () => {
+		const onRemove = jest.fn();
+		const onDismiss = jest.fn();
+
+		render(
+			<Snackbar
+				explicitDismiss
+				onRemove={ onRemove }
+				onDismiss={ onDismiss }
+			>
+				Message
+			</Snackbar>
+		);
+
+		const snackbar = screen.getByTestId( testId );
+		const closeButton = within( snackbar ).getByRole( 'button', {
+			name: 'Dismiss this notice',
+		} );
+
+		await click( closeButton );
+
+		expect( onRemove ).toHaveBeenCalledTimes( 1 );
+		expect( onDismiss ).toHaveBeenCalledTimes( 1 );
+	} );
+
+	describe( 'actions', () => {
+		it( 'should render only the first action with a warning when multiple actions are passed', () => {
+			render(
+				<Snackbar
+					actions={ [
+						{ label: 'One', url: 'https://example.com' },
+						{ label: 'Two', url: 'https://example.com' },
+						{ label: 'Three', url: 'https://example.com' },
+					] }
+				>
+					Message
+				</Snackbar>
+			);
+
+			expect( console ).toHaveWarnedWith(
+				'Snackbar can only have one action. Use Notice if your message requires many actions.'
+			);
+
+			const snackbar = screen.getByTestId( testId );
+			const action = within( snackbar ).getByRole( 'link' );
+
+			expect( action ).toBeVisible();
+			expect( action ).toHaveTextContent( 'One' );
+		} );
+
+		it( 'should be rendered as a link when the `url` prop is set', () => {
+			render(
+				<Snackbar
+					actions={ [
+						{ label: 'View post', url: 'https://example.com' },
+					] }
+				>
+					Post updated.
+				</Snackbar>
+			);
+
+			const snackbar = screen.getByTestId( testId );
+			const link = within( snackbar ).getByRole( 'link', {
+				name: 'View post',
+			} );
+
+			expect( link ).toHaveAttribute( 'href', 'https://example.com' );
+		} );
+
+		it( 'should be rendered as a button and call `onClick` when the `onClick` prop is set', async () => {
+			const onClick = jest.fn();
+
+			render(
+				<Snackbar actions={ [ { label: 'View post', onClick } ] }>
+					Post updated.
+				</Snackbar>
+			);
+
+			const snackbar = screen.getByTestId( testId );
+			const button = within( snackbar ).getByRole( 'button', {
+				name: 'View post',
+			} );
+
+			await click( button );
+
+			expect( onClick ).toHaveBeenCalledTimes( 1 );
+		} );
+
+		it( 'should be rendered as a link when the `url` prop and the `onClick` are set', () => {
+			render(
+				<Snackbar
+					actions={ [
+						{
+							label: 'View post',
+							url: 'https://example.com',
+							onClick: () => {},
+						},
+					] }
+				>
+					Post updated.
+				</Snackbar>
+			);
+
+			const snackbar = screen.getByTestId( testId );
+			const link = within( snackbar ).getByRole( 'link', {
+				name: 'View post',
+			} );
+			expect( link ).toBeVisible();
+		} );
+	} );
+
+	describe( 'useSpokenMessage', () => {
+		it( 'should speak the given message', () => {
+			render( <Snackbar>FYI</Snackbar> );
+
+			expect( speak ).toHaveBeenCalledWith( 'FYI', 'polite' );
+		} );
+
+		it( 'should speak the given message by explicit politeness', () => {
+			render( <Snackbar politeness="assertive">Uh oh!</Snackbar> );
+
+			expect( speak ).toHaveBeenCalledWith( 'Uh oh!', 'assertive' );
+		} );
+
+		it( 'should coerce a message to a string', () => {
+			// This test assumes that `@wordpress/a11y` is capable of handling
+			// markup strings appropriately.
+			render(
+				<Snackbar>
+					With <em>emphasis</em> this time.
+				</Snackbar>
+			);
+
+			expect( speak ).toHaveBeenCalledWith(
+				'With <em>emphasis</em> this time.',
+				'polite'
+			);
+		} );
+
+		it( 'should not re-speak an effectively equivalent element message', () => {
+			const { rerender } = render(
+				<Snackbar>
+					With <em>emphasis</em> this time.
+				</Snackbar>
+			);
+			rerender(
+				<Snackbar>
+					With <em>emphasis</em> this time.
+				</Snackbar>
+			);
+
+			expect( speak ).toHaveBeenCalledTimes( 1 );
+		} );
+	} );
+} );
diff --git a/packages/components/src/snackbar/test/list.tsx b/packages/components/src/snackbar/test/list.tsx
new file mode 100644
index 00000000000000..1b3749d42c61ef
--- /dev/null
+++ b/packages/components/src/snackbar/test/list.tsx
@@ -0,0 +1,46 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+import { click } from '@ariakit/test';
+
+/**
+ * Internal dependencies
+ */
+import SnackbarList from '../list';
+
+window.scrollTo = jest.fn();
+
+describe( 'SnackbarList', () => {
+	afterEach( () => {
+		jest.resetAllMocks();
+	} );
+
+	it( 'should get focus after a snackbar is dismissed', async () => {
+		render(
+			<SnackbarList
+				notices={ [
+					{
+						id: 'ID_1',
+						content: 'Post published.',
+						explicitDismiss: true,
+					},
+					{
+						id: 'ID_2',
+						content: 'Post updated.',
+						explicitDismiss: true,
+					},
+				] }
+				onRemove={ () => {} }
+			/>
+		);
+
+		await click(
+			screen.getAllByRole( 'button', {
+				name: 'Dismiss this notice',
+			} )[ 0 ]
+		);
+
+		expect( screen.getByTestId( 'snackbar-list' ) ).toHaveFocus();
+	} );
+} );
diff --git a/packages/components/src/snackbar/types.ts b/packages/components/src/snackbar/types.ts
index 71ded92e5b7d11..13ed98ade8aa7a 100644
--- a/packages/components/src/snackbar/types.ts
+++ b/packages/components/src/snackbar/types.ts
@@ -6,7 +6,11 @@ import type { MutableRefObject, ReactNode } from 'react';
 /**
  * Internal dependencies
  */
-import type { NoticeProps, NoticeChildren } from '../notice/types';
+import type {
+	NoticeProps,
+	NoticeChildren,
+	NoticeAction,
+} from '../notice/types';
 
 type SnackbarOnlyProps = {
 	/**
@@ -28,7 +32,32 @@ type SnackbarOnlyProps = {
 	listRef?: MutableRefObject< HTMLDivElement | null >;
 };
 
-export type SnackbarProps = NoticeProps & SnackbarOnlyProps;
+export type SnackbarProps = Pick<
+	NoticeProps,
+	| 'className'
+	| 'children'
+	| 'spokenMessage'
+	| 'onRemove'
+	| 'politeness'
+	| 'onDismiss'
+> &
+	SnackbarOnlyProps & {
+		/**
+		 * An array of action objects. Each member object should contain:
+		 *
+		 * - `label`: `string` containing the text of the button/link
+		 * - `url`: `string` OR `onClick`: `( event: SyntheticEvent ) => void` to specify
+		 *    what the action does.
+		 *
+		 * The default appearance of an action button is inferred based on whether
+		 * `url` or `onClick` are provided, rendering the button as a link if
+		 * appropriate. If both props are provided, `url` takes precedence, and the
+		 * action button will render as an anchor tag.
+		 *
+		 * @default []
+		 */
+		actions?: Pick< NoticeAction, 'label' | 'url' | 'onClick' >[];
+	};
 
 export type SnackbarListProps = {
 	notices: Array<
diff --git a/packages/components/src/spacer/README.md b/packages/components/src/spacer/README.md
index 577e306acbf54e..16160d39b61fa0 100644
--- a/packages/components/src/spacer/README.md
+++ b/packages/components/src/spacer/README.md
@@ -6,8 +6,6 @@ This feature is still experimental. “Experimental” means this is an early im
 
 `Spacer` is a primitive layout component that providers inner (`padding`) or outer (`margin`) space in-between components. It can also be used to adaptively provide space within an `HStack` or `VStack`.
 
-## Table of contents
-
 ## Usage
 
 `Spacer` comes with a bunch of shorthand props to adjust `margin` and `padding`. The values of these props work as a multiplier to the library's grid system (base of `4px`).
diff --git a/packages/components/src/spacer/hook.ts b/packages/components/src/spacer/hook.ts
index 82d36baa5e202f..3ef4b21e104c74 100644
--- a/packages/components/src/spacer/hook.ts
+++ b/packages/components/src/spacer/hook.ts
@@ -12,8 +12,9 @@ import { space } from '../utils/space';
 import { rtl, useCx } from '../utils';
 import type { SpacerProps } from './types';
 
-const isDefined = < T >( o: T ): o is Exclude< T, null | undefined > =>
-	typeof o !== 'undefined' && o !== null;
+function isDefined< T >( o: T ): o is Exclude< T, null | undefined > {
+	return typeof o !== 'undefined' && o !== null;
+}
 
 export function useSpacer(
 	props: WordPressComponentProps< SpacerProps, 'div' >
diff --git a/packages/components/src/spinner/README.md b/packages/components/src/spinner/README.md
index 474e6ebcb0a81a..64f596f22032fa 100644
--- a/packages/components/src/spinner/README.md
+++ b/packages/components/src/spinner/README.md
@@ -17,3 +17,5 @@ function Example() {
 The spinner component should:
 
 -   Signal to users that the processing of their request is underway and will soon complete.
+
+Check out the [Storybook page](https://wordpress.github.io/gutenberg/?path=/docs/components-spinner--docs) for a visual exploration of this component.
diff --git a/packages/components/src/spinner/index.tsx b/packages/components/src/spinner/index.tsx
index 9864819fa3d97f..b9c0a0e92b9e28 100644
--- a/packages/components/src/spinner/index.tsx
+++ b/packages/components/src/spinner/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef } from 'react';
 
 /**
@@ -21,7 +21,7 @@ export function UnforwardedSpinner(
 ) {
 	return (
 		<StyledSpinner
-			className={ classNames( 'components-spinner', className ) }
+			className={ clsx( 'components-spinner', className ) }
 			viewBox="0 0 100 100"
 			width="16"
 			height="16"
diff --git a/packages/components/src/style.scss b/packages/components/src/style.scss
index 02dce83f66dcc6..70317f4a2d0e0b 100644
--- a/packages/components/src/style.scss
+++ b/packages/components/src/style.scss
@@ -19,7 +19,6 @@
 @import "./combobox-control/style.scss";
 @import "./color-palette/style.scss";
 @import "./custom-gradient-picker/style.scss";
-@import "./custom-select-control/style.scss";
 @import "./dimension-control/style.scss";
 @import "./draggable/style.scss";
 @import "./drop-zone/style.scss";
@@ -27,6 +26,7 @@
 @import "./dropdown-menu/style.scss";
 @import "./duotone-picker/style.scss";
 @import "./duotone-picker/color-list-picker/style.scss";
+@import "./external-link/style.scss";
 @import "./form-toggle/style.scss";
 @import "./form-token-field/style.scss";
 @import "./guide/style.scss";
@@ -44,12 +44,12 @@
 @import "./responsive-wrapper/style.scss";
 @import "./sandbox/style.scss";
 @import "./scroll-lock/style.scss";
-@import "./search-control/style.scss";
 @import "./select-control/style.scss";
 @import "./snackbar/style.scss";
 @import "./tab-panel/style.scss";
 @import "./text-control/style.scss";
 @import "./tip/style.scss";
+@import "./toggle-control/style.scss";
 @import "./toolbar/toolbar/style.scss";
 @import "./toolbar/toolbar-button/style.scss";
 @import "./toolbar/toolbar-group/style.scss";
diff --git a/packages/components/src/surface/test/__snapshots__/index.tsx.snap b/packages/components/src/surface/test/__snapshots__/index.tsx.snap
index 200382f04ae5b6..520649a54d295a 100644
--- a/packages/components/src/surface/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/surface/test/__snapshots__/index.tsx.snap
@@ -8,8 +8,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-surface css-pt58n0-View-Surface-getBorders-primary e19lxcc00"
-+     class="components-surface css-soe81k-View-Surface-getBorders-primary e19lxcc00"
+-     class="components-surface css-1bmtyqd-PolymorphicDiv-Surface-getBorders-primary e19lxcc00"
++     class="components-surface css-1u146xf-PolymorphicDiv-Surface-getBorders-primary e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="Surface"
     >
@@ -25,8 +25,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-surface css-1vckp4o-View-Surface-getBorders-primary e19lxcc00"
-+     class="components-surface css-soe81k-View-Surface-getBorders-primary e19lxcc00"
+-     class="components-surface css-iin9ud-PolymorphicDiv-Surface-getBorders-primary e19lxcc00"
++     class="components-surface css-1u146xf-PolymorphicDiv-Surface-getBorders-primary e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="Surface"
     >
@@ -42,8 +42,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-surface css-sw9dzi-View-Surface-getBorders-primary e19lxcc00"
-+     class="components-surface css-soe81k-View-Surface-getBorders-primary e19lxcc00"
+-     class="components-surface css-4j30ez-PolymorphicDiv-Surface-getBorders-primary e19lxcc00"
++     class="components-surface css-1u146xf-PolymorphicDiv-Surface-getBorders-primary e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="Surface"
     >
@@ -59,8 +59,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-surface css-123k66h-View-Surface-getBorders-primary e19lxcc00"
-+     class="components-surface css-soe81k-View-Surface-getBorders-primary e19lxcc00"
+-     class="components-surface css-1v7smm4-PolymorphicDiv-Surface-getBorders-primary e19lxcc00"
++     class="components-surface css-1u146xf-PolymorphicDiv-Surface-getBorders-primary e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="Surface"
     >
@@ -94,8 +94,8 @@ Snapshot Diff:
 @@ -1,8 +1,8 @@
   <div>
     <div
--     class="components-surface css-1m2pafr-View-Surface-getBorders-secondary e19lxcc00"
-+     class="components-surface css-soe81k-View-Surface-getBorders-primary e19lxcc00"
+-     class="components-surface css-1afnk4j-PolymorphicDiv-Surface-getBorders-secondary e19lxcc00"
++     class="components-surface css-1u146xf-PolymorphicDiv-Surface-getBorders-primary e19lxcc00"
       data-wp-c16t="true"
       data-wp-component="Surface"
     >
diff --git a/packages/components/src/tab-panel/README.md b/packages/components/src/tab-panel/README.md
index 67b00c37679eca..73d5d16b46985b 100644
--- a/packages/components/src/tab-panel/README.md
+++ b/packages/components/src/tab-panel/README.md
@@ -6,11 +6,6 @@ TabPanels organize content across different screens, data sets, and interactions
 
 ![The “Document” tab selected in the sidebar TabPanel.](https://wordpress.org/gutenberg/files/2019/01/s_E36D9C9B8FFA15A1A8CE224E422535A12B016F88884089575F9998E52016A49F_1541785098230_TabPanel.png)
 
-## Table of contents
-
-1. Design guidelines
-2. Development guidelines
-
 ## Design guidelines
 
 ### Usage
diff --git a/packages/components/src/tab-panel/index.tsx b/packages/components/src/tab-panel/index.tsx
index f4abd1c121b2f9..f9db745b424260 100644
--- a/packages/components/src/tab-panel/index.tsx
+++ b/packages/components/src/tab-panel/index.tsx
@@ -1,9 +1,9 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
-import classnames from 'classnames';
+import { useStoreState } from '@ariakit/react';
+import clsx from 'clsx';
 import type { ForwardedRef } from 'react';
 
 /**
@@ -16,6 +16,7 @@ import {
 	useCallback,
 } from '@wordpress/element';
 import { useInstanceId, usePrevious } from '@wordpress/compose';
+import { isRTL } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -120,9 +121,12 @@ const UnforwardedTabPanel = (
 		orientation,
 		selectOnMove,
 		defaultSelectedId: prependInstanceId( initialTabName ),
+		rtl: isRTL(),
 	} );
 
-	const selectedTabName = extractTabName( tabStore.useState( 'selectedId' ) );
+	const selectedTabName = extractTabName(
+		useStoreState( tabStore, 'selectedId' )
+	);
 
 	const setTabStoreSelectedId = useCallback(
 		( tabName: string ) => {
@@ -202,7 +206,7 @@ const UnforwardedTabPanel = (
 						<Ariakit.Tab
 							key={ tab.name }
 							id={ prependInstanceId( tab.name ) }
-							className={ classnames(
+							className={ clsx(
 								'components-tab-panel__tabs-item',
 								tab.className,
 								{
@@ -232,7 +236,7 @@ const UnforwardedTabPanel = (
 					id={ `${ prependInstanceId( selectedTab.name ) }-view` }
 					store={ tabStore }
 					tabId={ prependInstanceId( selectedTab.name ) }
-					className={ 'components-tab-panel__tab-content' }
+					className="components-tab-panel__tab-content"
 				>
 					{ children( selectedTab ) }
 				</Ariakit.TabPanel>
diff --git a/packages/components/src/tab-panel/stories/index.story.tsx b/packages/components/src/tab-panel/stories/index.story.tsx
index e2f146d55865cb..57a3cc311f863c 100644
--- a/packages/components/src/tab-panel/stories/index.story.tsx
+++ b/packages/components/src/tab-panel/stories/index.story.tsx
@@ -14,7 +14,8 @@ import { link, more, wordpress } from '@wordpress/icons';
 import TabPanel from '..';
 
 const meta: Meta< typeof TabPanel > = {
-	title: 'Components/TabPanel',
+	title: 'Components/Containers/TabPanel',
+	id: 'components-tabpanel',
 	component: TabPanel,
 	parameters: {
 		actions: { argTypesRegex: '^on.*' },
diff --git a/packages/components/src/tab-panel/style.scss b/packages/components/src/tab-panel/style.scss
index a6b6189e6c204b..229b32c7477e87 100644
--- a/packages/components/src/tab-panel/style.scss
+++ b/packages/components/src/tab-panel/style.scss
@@ -67,7 +67,7 @@
 
 		// Draw the indicator.
 		box-shadow: 0 0 0 0 transparent;
-		border-radius: $radius-block-ui;
+		border-radius: $radius-small;
 
 		// Animation
 		transition: all 0.1s linear;
@@ -81,3 +81,18 @@
 		outline: 2px solid transparent;
 	}
 }
+
+.components-tab-panel__tab-content {
+	&:focus {
+		box-shadow: none;
+		outline: none;
+	}
+
+	&:focus-visible {
+		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) $components-color-accent;
+
+		// Windows high contrast mode.
+		outline: 2px solid transparent;
+		outline-offset: 0;
+	}
+}
diff --git a/packages/components/src/tab-panel/test/index.tsx b/packages/components/src/tab-panel/test/index.tsx
index c07685935ce162..28dd1a81e9e84f 100644
--- a/packages/components/src/tab-panel/test/index.tsx
+++ b/packages/components/src/tab-panel/test/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { press, hover, click } from '@ariakit/test';
 
 /**
  * WordPress dependencies
@@ -13,7 +13,6 @@ import { wordpress, category, media } from '@wordpress/icons';
  * Internal dependencies
  */
 import TabPanel from '..';
-import cleanupTooltip from '../../tooltip/test/utils';
 
 const TABS = [
 	{
@@ -95,8 +94,6 @@ describe.each( [
 		} );
 
 		it( 'should display a tooltip when hovering tabs provided with an icon', async () => {
-			const user = userEvent.setup();
-
 			const panelRenderFunction = jest.fn();
 
 			const TABS_WITH_ICON = [
@@ -119,7 +116,7 @@ describe.each( [
 					screen.queryByText( TABS_WITH_ICON[ i ].title )
 				).not.toBeInTheDocument();
 
-				await user.hover( allTabs[ i ] );
+				await hover( allTabs[ i ] );
 
 				await waitFor( () =>
 					expect(
@@ -127,15 +124,12 @@ describe.each( [
 					).toBeVisible()
 				);
 
-				await user.unhover( allTabs[ i ] );
+				// Trigger closing the tooltip
+				await click( document.body );
 			}
-
-			await cleanupTooltip( user );
 		} );
 
 		it( 'should display a tooltip when moving the selection via the keyboard on tabs provided with an icon', async () => {
-			const user = userEvent.setup();
-
 			const mockOnSelect = jest.fn();
 			const panelRenderFunction = jest.fn();
 
@@ -161,7 +155,7 @@ describe.each( [
 			// Tab to focus the tablist. Make sure alpha is focused, and that the
 			// corresponding tooltip is shown.
 			expect( screen.queryByText( 'Alpha' ) ).not.toBeInTheDocument();
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 			expect( screen.getByText( 'Alpha' ) ).toBeInTheDocument();
 			expect( await getSelectedTab() ).toHaveFocus();
@@ -169,7 +163,7 @@ describe.each( [
 			// Move selection with arrow keys. Make sure beta is focused, and that
 			// the corresponding tooltip is shown.
 			expect( screen.queryByText( 'Beta' ) ).not.toBeInTheDocument();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'beta' );
 			expect( screen.getByText( 'Beta' ) ).toBeInTheDocument();
@@ -178,7 +172,7 @@ describe.each( [
 			// Move selection with arrow keys. Make sure gamma is focused, and that
 			// the corresponding tooltip is shown.
 			expect( screen.queryByText( 'Gamma' ) ).not.toBeInTheDocument();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'gamma' );
 			expect( screen.getByText( 'Gamma' ) ).toBeInTheDocument();
@@ -187,13 +181,11 @@ describe.each( [
 			// Move selection with arrow keys. Make sure beta is focused, and that
 			// the corresponding tooltip is shown.
 			expect( screen.queryByText( 'Beta' ) ).not.toBeInTheDocument();
-			await user.keyboard( '[ArrowLeft]' );
+			await press.ArrowLeft();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 4 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'beta' );
 			expect( screen.getByText( 'Beta' ) ).toBeInTheDocument();
 			expect( await getSelectedTab() ).toHaveFocus();
-
-			await cleanupTooltip( user );
 		} );
 	} );
 
@@ -283,7 +275,6 @@ describe.each( [
 		} );
 
 		it( 'should fall back to the tab associated to `initialTabName` if the currently active tab is removed', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
 			const { rerender } = render(
@@ -298,7 +289,7 @@ describe.each( [
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'gamma' );
 
-			await user.click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
@@ -386,7 +377,6 @@ describe.each( [
 
 	describe( 'Disabled Tab', () => {
 		it( 'should disable the tab when `disabled` is `true`', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
 			render(
@@ -414,7 +404,7 @@ describe.each( [
 
 			// onSelect should not be called since the disabled tab is
 			// highlighted, but not selected.
-			await user.keyboard( '[ArrowLeft]' );
+			await press.ArrowLeft();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 		} );
 
@@ -582,7 +572,6 @@ describe.each( [
 
 	describe( 'Tab Activation', () => {
 		it( 'defaults to automatic tab activation (pointer clicks)', async () => {
-			const user = userEvent.setup();
 			const panelRenderFunction = jest.fn();
 			const mockOnSelect = jest.fn();
 
@@ -602,7 +591,7 @@ describe.each( [
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
 			// Click on Beta, make sure beta is the selected tab
-			await user.click( screen.getByRole( 'tab', { name: 'Beta' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Beta' } ) );
 
 			expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			expect(
@@ -611,7 +600,7 @@ describe.each( [
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'beta' );
 
 			// Click on Alpha, make sure beta is the selected tab
-			await user.click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
 
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect(
@@ -621,7 +610,6 @@ describe.each( [
 		} );
 
 		it( 'defaults to automatic tab activation (arrow keys)', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
 			render(
@@ -638,12 +626,12 @@ describe.each( [
 			// Tab to focus the tablist. Make sure alpha is focused.
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).not.toHaveFocus();
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( await getSelectedTab() ).toHaveFocus();
 
 			// Navigate forward with arrow keys and make sure the Beta tab is
 			// selected automatically.
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
@@ -651,7 +639,7 @@ describe.each( [
 
 			// Navigate backwards with arrow keys. Make sure alpha is
 			// selected automatically.
-			await user.keyboard( '[ArrowLeft]' );
+			await press.ArrowLeft();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
@@ -659,7 +647,6 @@ describe.each( [
 		} );
 
 		it( 'wraps around the last/first tab when using arrow keys', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
 			render(
@@ -676,12 +663,12 @@ describe.each( [
 			// Tab to focus the tablist. Make sure Alpha is focused.
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).not.toHaveFocus();
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( await getSelectedTab() ).toHaveFocus();
 
 			// Navigate backwards with arrow keys and make sure that the Gamma tab
 			// (the last tab) is selected automatically.
-			await user.keyboard( '[ArrowLeft]' );
+			await press.ArrowLeft();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
@@ -689,7 +676,7 @@ describe.each( [
 
 			// Navigate forward with arrow keys. Make sure alpha (the first tab) is
 			// selected automatically.
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
@@ -697,7 +684,6 @@ describe.each( [
 		} );
 
 		it( 'should not move tab selection when pressing the up/down arrow keys, unless the orientation is changed to `vertical`', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
 			const { rerender } = render(
@@ -714,18 +700,18 @@ describe.each( [
 			// Tab to focus the tablist. Make sure alpha is focused.
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).not.toHaveFocus();
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( await getSelectedTab() ).toHaveFocus();
 
 			// Press the arrow up key, nothing happens.
-			await user.keyboard( '[ArrowUp]' );
+			await press.ArrowUp();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
 			// Press the arrow down key, nothing happens
-			await user.keyboard( '[ArrowDown]' );
+			await press.ArrowDown();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
@@ -753,7 +739,7 @@ describe.each( [
 
 			// Navigate forward with arrow keys and make sure the Beta tab is
 			// selected automatically.
-			await user.keyboard( '[ArrowDown]' );
+			await press.ArrowDown();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
@@ -761,7 +747,7 @@ describe.each( [
 
 			// Navigate backwards with arrow keys. Make sure alpha is
 			// selected automatically.
-			await user.keyboard( '[ArrowUp]' );
+			await press.ArrowUp();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
@@ -769,7 +755,7 @@ describe.each( [
 
 			// Navigate backwards with arrow keys. Make sure alpha is
 			// selected automatically.
-			await user.keyboard( '[ArrowUp]' );
+			await press.ArrowUp();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 4 );
@@ -777,7 +763,7 @@ describe.each( [
 
 			// Navigate backwards with arrow keys. Make sure alpha is
 			// selected automatically.
-			await user.keyboard( '[ArrowDown]' );
+			await press.ArrowDown();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 5 );
@@ -785,7 +771,6 @@ describe.each( [
 		} );
 
 		it( 'should move focus on a tab even if disabled with arrow key, but not with pointer clicks', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
 			render(
@@ -810,7 +795,7 @@ describe.each( [
 			// Tab to focus the tablist. Make sure Alpha is focused.
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).not.toHaveFocus();
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 
@@ -819,7 +804,9 @@ describe.each( [
 			//   it was the tab that was last selected before delta. Therefore, the
 			//   `mockOnSelect` function gets called only twice (and not three times)
 			// - it will receive focus, when using arrow keys
-			await user.keyboard( '[ArrowRight][ArrowRight][ArrowRight]' );
+			await press.ArrowRight();
+			await press.ArrowRight();
+			await press.ArrowRight();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect(
 				screen.getByRole( 'tab', { name: 'Delta' } )
@@ -830,7 +817,7 @@ describe.each( [
 			// Navigate backwards with arrow keys. The gamma tab receives focus.
 			// The `mockOnSelect` callback doesn't fire, since the gamma tab was
 			// already selected.
-			await user.keyboard( '[ArrowLeft]' );
+			await press.ArrowLeft();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
@@ -838,34 +825,31 @@ describe.each( [
 			// Click on the disabled tab. Compared to using arrow keys to move the
 			// focus, disabled tabs ignore pointer clicks — and therefore, they don't
 			// receive focus, nor they cause the `mockOnSelect` function to fire.
-			await user.click( screen.getByRole( 'tab', { name: 'Delta' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Delta' } ) );
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
 		} );
 
 		it( 'should not focus the next tab when the Tab key is pressed', async () => {
-			const user = userEvent.setup();
-
 			render( <Component tabs={ TABS } children={ () => undefined } /> );
 
 			// Tab should initially focus the first tab in the tablist, which
 			// is Alpha.
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect(
 				await screen.findByRole( 'tab', { name: 'Alpha' } )
 			).toHaveFocus();
 
 			// Because all other tabs should have `tabindex=-1`, pressing Tab
 			// should NOT move the focus to the next tab, which is Beta.
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect(
 				await screen.findByRole( 'tab', { name: 'Beta' } )
 			).not.toHaveFocus();
 		} );
 
 		it( 'switches to manual tab activation when the `selectOnMove` prop is set to `false`', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
 			render(
@@ -883,33 +867,33 @@ describe.each( [
 
 			// Click on Alpha and make sure it is selected.
 			// onSelect shouldn't fire since the selected tab didn't change.
-			await user.click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
 			// Navigate forward with arrow keys. Make sure Beta is focused, but
 			// that the tab selection happens only when pressing the spacebar
 			// or enter key.
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 			expect(
 				await screen.findByRole( 'tab', { name: 'Beta' } )
 			).toHaveFocus();
 
-			await user.keyboard( '[Enter]' );
+			await press.Enter();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'beta' );
 
 			// Navigate forward with arrow keys. Make sure Gamma (last tab) is
 			// focused, but that tab selection happens only when pressing the
 			// spacebar or enter key.
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
 			expect(
 				screen.getByRole( 'tab', { name: 'Gamma' } )
 			).toHaveFocus();
 
-			await user.keyboard( '[Space]' );
+			await press.Space();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'gamma' );
 		} );
@@ -931,7 +915,6 @@ describe.each( [
 		} );
 
 		it( 'should apply the `activeClass` to the selected tab', async () => {
-			const user = userEvent.setup();
 			const activeClass = 'my-active-tab';
 
 			render(
@@ -952,7 +935,7 @@ describe.each( [
 				} );
 
 			// Click the 'Beta' tab
-			await user.click( screen.getByRole( 'tab', { name: 'Beta' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Beta' } ) );
 
 			// Make sure that only the selected tab has the active class
 			expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
diff --git a/packages/components/src/tabs/README.md b/packages/components/src/tabs/README.md
index 423216e940584d..9c7e846046c904 100644
--- a/packages/components/src/tabs/README.md
+++ b/packages/components/src/tabs/README.md
@@ -14,7 +14,7 @@ Tabs organizes content across different screens, data sets, and interactions. It
 
 #### Uncontrolled Mode
 
-Tabs can be used in an uncontrolled mode, where the component manages its own state. In this mode, the `initialTabId` prop can be used to set the initially selected tab. If this prop is not set, the first tab will be selected by default. In addition, in most cases where the currently active tab becomes disabled or otherwise unavailable, uncontrolled mode will automatically fall back to selecting the first available tab.
+Tabs can be used in an uncontrolled mode, where the component manages its own state. In this mode, the `defaultTabId` prop can be used to set the initially selected tab. If this prop is not set, the first tab will be selected by default. In addition, in most cases where the currently active tab becomes disabled or otherwise unavailable, uncontrolled mode will automatically fall back to selecting the first available tab.
 
 ```jsx
 import { Tabs } from '@wordpress/components';
@@ -24,25 +24,25 @@ const onSelect = ( tabName ) => {
 };
 
 const MyUncontrolledTabs = () => (
-		<Tabs onSelect={onSelect} initialTab="tab2">
-			<Tabs.TabList >
-				<Tabs.Tab id={ 'tab1' } title={ 'Tab 1' }>
+		<Tabs onSelect={ onSelect } defaultTabId="tab2">
+			<Tabs.TabList>
+				<Tabs.Tab tabId="tab1" title="Tab 1">
 					Tab 1
 				</Tabs.Tab>
-				<Tabs.Tab id={ 'tab2' } title={ 'Tab 2' }>
+				<Tabs.Tab tabId="tab2" title="Tab 2">
 					Tab 2
 				</Tabs.Tab>
-				<Tabs.Tab id={ 'tab3' } title={ 'Tab 3' }>
+				<Tabs.Tab tabId="tab3" title="Tab 3">
 					Tab 3
 				</Tabs.Tab>
 			</Tabs.TabList>
-			<Tabs.TabPanel id={ 'tab1' }>
+			<Tabs.TabPanel tabId="tab1">
 				<p>Selected tab: Tab 1</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab2' }>
+			<Tabs.TabPanel tabId="tab2">
 				<p>Selected tab: Tab 2</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab3' }>
+			<Tabs.TabPanel tabId="tab3">
 				<p>Selected tab: Tab 3</p>
 			</Tabs.TabPanel>
 		</Tabs>
@@ -51,7 +51,7 @@ const MyUncontrolledTabs = () => (
 
 #### Controlled Mode
 
-Tabs can also be used in a controlled mode, where the parent component specifies the `selectedTabId` and the `onSelect` props to control tab selection. In this mode, the `initialTabId` prop will be ignored if it is provided. If the `selectedTabId` is `null`, no tab is selected. In this mode, if the currently selected tab becomes disabled or otherwise unavailable, the component will _not_ fall back to another available tab, leaving the controlling component in charge of implementing the desired logic.
+Tabs can also be used in a controlled mode, where the parent component specifies the `selectedTabId` and the `onSelect` props to control tab selection. In this mode, the `defaultTabId` prop will be ignored if it is provided. If the `selectedTabId` is `null`, no tab is selected. In this mode, if the currently selected tab becomes disabled or otherwise unavailable, the component will _not_ fall back to another available tab, leaving the controlling component in charge of implementing the desired logic.
 
 ```jsx
 import { Tabs } from '@wordpress/components';
@@ -71,24 +71,24 @@ const MyControlledTabs = () => (
 				onSelect( selectedId );
 			} }
 		>
-			<Tabs.TabList >
-				<Tabs.Tab id={ 'tab1' } title={ 'Tab 1' }>
+			<Tabs.TabList>
+				<Tabs.Tab tabId="tab1" title="Tab 1">
 					Tab 1
 				</Tabs.Tab>
-				<Tabs.Tab id={ 'tab2' } title={ 'Tab 2' }>
+				<Tabs.Tab tabId="tab2" title="Tab 2">
 					Tab 2
 				</Tabs.Tab>
-				<Tabs.Tab id={ 'tab3' } title={ 'Tab 3' }>
+				<Tabs.Tab tabId="tab3" title="Tab 3">
 					Tab 3
 				</Tabs.Tab>
 			</Tabs.TabList>
-			<Tabs.TabPanel id={ 'tab1' }>
+			<Tabs.TabPanel tabId="tab1">
 				<p>Selected tab: Tab 1</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab2' }>
+			<Tabs.TabPanel tabId="tab2">
 				<p>Selected tab: Tab 2</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab3' }>
+			<Tabs.TabPanel tabId="tab3">
 				<p>Selected tab: Tab 3</p>
 			</Tabs.TabPanel>
 		</Tabs>
@@ -109,45 +109,81 @@ Tabs is comprised of four individual components:
 
 ###### `children`: `React.ReactNode`
 
-The children elements, which should be at least a `Tabs.Tablist` component and a series of `Tabs.TabPanel` components.
+The children elements, which should include one instance of the `Tabs.Tablist` component and as many instances of the `Tabs.TabPanel` components as there are `Tabs.Tab` components.
 
 -   Required: Yes
 
 ###### `selectOnMove`: `boolean`
 
-When `true`, the tab will be selected when receiving focus (automatic tab activation). When `false`, the tab will be selected only when clicked (manual tab activation). See the [official W3C docs](https://www.w3.org/WAI/ARIA/apg/patterns/tabpanel/) for more info.
+Determines if the tab should be selected when it receives focus. If set to `false`, the tab will only be selected upon clicking, not when using arrow keys to shift focus (manual tab activation). See the [official W3C docs](https://www.w3.org/WAI/ARIA/apg/patterns/tabpanel/) for more info.
 
 -   Required: No
 -   Default: `true`
 
-###### `initialTabId`: `string`
+###### `selectedTabId`: `string | null`
+
+The id of the tab whose panel is currently visible.
+
+If left `undefined`, it will be automatically set to the first enabled tab, and the component assumes it is being used in "uncontrolled" mode.
+
+Consequently, any value different than `undefined` will set the component in "controlled" mode. When in "controlled" mode, the `null` value will result in no tabs being selected, and the tablist becoming tabbable.
+
+- Required: No
+
+###### `defaultTabId`: `string | null`
 
-The id of the tab to be selected upon mounting of component. If this prop is not set, the first tab will be selected by default. The id provided will be internally prefixed with a unique instance ID to avoid collisions.
+The id of the tab whose panel is currently visible.
 
-_Note: this prop will be overridden by the `selectedTabId` prop if it is provided. (Controlled Mode)_
+If left `undefined`, it will be automatically set to the first enabled tab. If set to `null`, no tab will be selected, and the tablist will be tabbable.
+
+_Note: this prop will be overridden by the `selectedTabId` prop if it is provided (meaning the component will be used in "controlled" mode)._
 
 -   Required: No
 
 ###### `onSelect`: `( ( selectedId: string | null | undefined ) => void )`
 
-The function called when a tab has been selected. It is passed the selected tab's ID as an argument.
+The function called when the `selectedTabId` changes.
 
 -   Required: No
 -   Default: `noop`
 
-###### `orientation`: `horizontal | vertical`
+###### `activeTabId`: `string | null`
+
+The current active tab `id`. The active tab is the tab element within the tablist widget that has DOM focus.
+
+- `null` represents the tablist (ie. the base composite element). Users
+  will be able to navigate out of it using arrow keys;
+- If `activeTabId` is initially set to `null`, the base composite element
+  itself will have focus and users will be able to navigate to it using
+  arrow keys.
+
+- Required: No
+
+###### `defaultActiveTabId`: `string | null`
+
+The tab id that should be active by default when the composite widget is rendered. If `null`, the tablist element itself will have focus and users will be able to navigate to it using arrow keys. If `undefined`, the first enabled item will be focused.
 
-The orientation of the `tablist` (`vertical` or `horizontal`)
+_Note: this prop will be overridden by the `activeTabId` prop if it is provided._
 
 -   Required: No
--   Default: `horizontal`
 
-###### `selectedTabId`: `string | null`
+###### `onActiveTabIdChange`: `( ( activeId: string | null | undefined ) => void )`
 
-The ID of the tab to display. This id is prepended with the `Tabs` instanceId internally.
-If left `undefined`, the component assumes it is being used in uncontrolled mode. Consequently, any value different than `undefined` will set the component in `controlled` mode. When in controlled mode, the `null` value will result in no tab being selected.
+The function called when the `selectedTabId` changes.
 
-- Required: No
+-   Required: No
+-   Default: `noop`
+
+###### `orientation`: `'horizontal' | 'vertical' | 'both'`
+
+Defines the orientation of the tablist and determines which arrow keys can be used to move focus:
+
+- `both`: all arrow keys work;
+- `horizontal`: only left and right arrow keys work;
+- `vertical`: only up and down arrow keys work.
+
+-   Required: No
+-   Default: `horizontal`
 
 #### TabList
 
@@ -155,7 +191,7 @@ If left `undefined`, the component assumes it is being used in uncontrolled mode
 
 ###### `children`: `React.ReactNode`
 
-The children elements, which should be a series of `Tabs.TabPanel` components.
+The children elements, which should include one or more instances of the `Tabs.Tab` component.
 
 -   Required: No
 
@@ -163,28 +199,30 @@ The children elements, which should be a series of `Tabs.TabPanel` components.
 
 ##### Props
 
-###### `id`: `string`
+###### `tabId`: `string`
 
-The id of the tab, which is prepended with the `Tabs` instance ID.
+The unique ID of the tab. It will be used to register the tab and match it to a corresponding `Tabs.TabPanel` component. If not provided, a unique ID will be automatically generated.
 
 - Required: Yes
 
 ###### `children`: `React.ReactNode`
 
-The children elements, generally the text to display on the tab.
+The contents of the tab.
 
 - Required: No
 
 ###### `disabled`: `boolean`
 
-Determines if the tab button should be disabled.
+Determines if the tab should be disabled. Note that disabled tabs can still be accessed via the keyboard when navigating through the tablist.
 
 - Required: No
 - Default: `false`
 
 ###### `render`: `React.ReactNode`
 
-The type of component to render the tab button as. If this prop is not provided, the tab button will be rendered as a `button` element.
+Allows the component to be rendered as a different HTML element or React component. The value can be a React element or a function that takes in the original component props and gives back a React element with the props merged.
+
+By default, the tab will be rendered as a `button` element.
 
 - Required: No
 
@@ -194,19 +232,23 @@ The type of component to render the tab button as. If this prop is not provided,
 
 ###### `children`: `React.ReactNode`
 
-The children elements, generally the content to display on the tabpanel.
+The contents of the tab panel.
 
 - Required: No
 
-###### `id`: `string`
+###### `tabId`: `string`
+
+The unique `id` of the `Tabs.Tab` component controlling this panel. This connection is used to assign the `aria-labelledby` attribute to the tab panel and to determine if the tab panel should be visible.
 
-The id of the tabpanel, which is combined with the `Tabs` instance ID and the suffix `-view`
+If not provided, this link is automatically established by matching the order of `Tabs.Tab` and `Tabs.TabPanel` elements in the DOM.
 
 - Required: Yes
 
 ###### `focusable`: `boolean`
 
-Determines whether or not the tabpanel element should be focusable. If `false`, pressing the tab key will skip over the tabpanel, and instead focus on the first focusable element in the panel (if there is one).
+Determines whether or not the tabpanel element should be focusable.
+
+If `false`, pressing the tab key will skip over the tabpanel, and instead focus on the first focusable element in the panel (if there is one).
 
 - Required: No
 - Default: `true`
diff --git a/packages/components/src/tabs/index.tsx b/packages/components/src/tabs/index.tsx
index 12dd0b4fcc83f4..37367e4642e152 100644
--- a/packages/components/src/tabs/index.tsx
+++ b/packages/components/src/tabs/index.tsx
@@ -1,14 +1,20 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
+import { useStoreState } from '@ariakit/react';
 
 /**
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { useLayoutEffect, useMemo, useRef } from '@wordpress/element';
+import {
+	useEffect,
+	useLayoutEffect,
+	useMemo,
+	useRef,
+} from '@wordpress/element';
+import { isRTL } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -19,159 +25,209 @@ import { Tab } from './tab';
 import { TabList } from './tablist';
 import { TabPanel } from './tabpanel';
 
-function Tabs( {
-	selectOnMove = true,
-	initialTabId,
-	orientation = 'horizontal',
-	onSelect,
-	children,
-	selectedTabId,
-}: TabsProps ) {
-	const instanceId = useInstanceId( Tabs, 'tabs' );
-	const store = Ariakit.useTabStore( {
-		selectOnMove,
-		orientation,
-		defaultSelectedId: initialTabId && `${ instanceId }-${ initialTabId }`,
-		setSelectedId: ( selectedId ) => {
-			const strippedDownId =
-				typeof selectedId === 'string'
-					? selectedId.replace( `${ instanceId }-`, '' )
-					: selectedId;
-			onSelect?.( strippedDownId );
-		},
-		selectedId: selectedTabId && `${ instanceId }-${ selectedTabId }`,
-	} );
-
-	const isControlled = selectedTabId !== undefined;
-
-	const { items, selectedId } = store.useState();
-	const { setSelectedId } = store;
-
-	// Keep track of whether tabs have been populated. This is used to prevent
-	// certain effects from firing too early while tab data and relevant
-	// variables are undefined during the initial render.
-	const tabsHavePopulated = useRef( false );
-	if ( items.length > 0 ) {
-		tabsHavePopulated.current = true;
-	}
-
-	const selectedTab = items.find( ( item ) => item.id === selectedId );
-	const firstEnabledTab = items.find( ( item ) => {
-		// Ariakit internally refers to disabled tabs as `dimmed`.
-		return ! item.dimmed;
-	} );
-	const initialTab = items.find(
-		( item ) => item.id === `${ instanceId }-${ initialTabId }`
-	);
-
-	// Handle selecting the initial tab.
-	useLayoutEffect( () => {
-		if ( isControlled ) {
-			return;
+/**
+ * Display one panel of content at a time with a tabbed interface, based on the
+ * WAI-ARIA Tabs Pattern⁠.
+ *
+ * @see https://www.w3.org/WAI/ARIA/apg/patterns/tabs/
+ * ```
+ */
+export const Tabs = Object.assign(
+	function Tabs( {
+		selectOnMove = true,
+		defaultTabId,
+		orientation = 'horizontal',
+		onSelect,
+		children,
+		selectedTabId,
+	}: TabsProps ) {
+		const instanceId = useInstanceId( Tabs, 'tabs' );
+		const store = Ariakit.useTabStore( {
+			selectOnMove,
+			orientation,
+			defaultSelectedId:
+				defaultTabId && `${ instanceId }-${ defaultTabId }`,
+			setSelectedId: ( selectedId ) => {
+				const strippedDownId =
+					typeof selectedId === 'string'
+						? selectedId.replace( `${ instanceId }-`, '' )
+						: selectedId;
+				onSelect?.( strippedDownId );
+			},
+			selectedId: selectedTabId && `${ instanceId }-${ selectedTabId }`,
+			rtl: isRTL(),
+		} );
+
+		const isControlled = selectedTabId !== undefined;
+
+		const { items, selectedId, activeId } = useStoreState( store );
+		const { setSelectedId, setActiveId } = store;
+
+		// Keep track of whether tabs have been populated. This is used to prevent
+		// certain effects from firing too early while tab data and relevant
+		// variables are undefined during the initial render.
+		const tabsHavePopulatedRef = useRef( false );
+		if ( items.length > 0 ) {
+			tabsHavePopulatedRef.current = true;
 		}
 
-		// Wait for the denoted initial tab to be declared before making a
-		// selection. This ensures that if a tab is declared lazily it can
-		// still receive initial selection, as well as ensuring no tab is
-		// selected if an invalid `initialTabId` is provided.
-		if ( initialTabId && ! initialTab ) {
-			return;
-		}
+		const selectedTab = items.find( ( item ) => item.id === selectedId );
+		const firstEnabledTab = items.find( ( item ) => {
+			// Ariakit internally refers to disabled tabs as `dimmed`.
+			return ! item.dimmed;
+		} );
+		const initialTab = items.find(
+			( item ) => item.id === `${ instanceId }-${ defaultTabId }`
+		);
+
+		// Handle selecting the initial tab.
+		useLayoutEffect( () => {
+			if ( isControlled ) {
+				return;
+			}
+
+			// Wait for the denoted initial tab to be declared before making a
+			// selection. This ensures that if a tab is declared lazily it can
+			// still receive initial selection, as well as ensuring no tab is
+			// selected if an invalid `defaultTabId` is provided.
+			if ( defaultTabId && ! initialTab ) {
+				return;
+			}
+
+			// If the currently selected tab is missing (i.e. removed from the DOM),
+			// fall back to the initial tab or the first enabled tab if there is
+			// one. Otherwise, no tab should be selected.
+			if ( ! items.find( ( item ) => item.id === selectedId ) ) {
+				if ( initialTab && ! initialTab.dimmed ) {
+					setSelectedId( initialTab?.id );
+					return;
+				}
+
+				if ( firstEnabledTab ) {
+					setSelectedId( firstEnabledTab.id );
+				} else if ( tabsHavePopulatedRef.current ) {
+					setSelectedId( null );
+				}
+			}
+		}, [
+			firstEnabledTab,
+			initialTab,
+			defaultTabId,
+			isControlled,
+			items,
+			selectedId,
+			setSelectedId,
+		] );
+
+		// Handle the currently selected tab becoming disabled.
+		useLayoutEffect( () => {
+			if ( ! selectedTab?.dimmed ) {
+				return;
+			}
 
-		// If the currently selected tab is missing (i.e. removed from the DOM),
-		// fall back to the initial tab or the first enabled tab if there is
-		// one. Otherwise, no tab should be selected.
-		if ( ! items.find( ( item ) => item.id === selectedId ) ) {
+			// In controlled mode, we trust that disabling tabs is done
+			// intentionally, and don't select a new tab automatically.
+			if ( isControlled ) {
+				setSelectedId( null );
+				return;
+			}
+
+			// If the currently selected tab becomes disabled, fall back to the
+			// `defaultTabId` if possible. Otherwise select the first
+			// enabled tab (if there is one).
 			if ( initialTab && ! initialTab.dimmed ) {
-				setSelectedId( initialTab?.id );
+				setSelectedId( initialTab.id );
 				return;
 			}
 
 			if ( firstEnabledTab ) {
 				setSelectedId( firstEnabledTab.id );
-			} else if ( tabsHavePopulated.current ) {
-				setSelectedId( null );
 			}
-		}
-	}, [
-		firstEnabledTab,
-		initialTab,
-		initialTabId,
-		isControlled,
-		items,
-		selectedId,
-		setSelectedId,
-	] );
-
-	// Handle the currently selected tab becoming disabled.
-	useLayoutEffect( () => {
-		if ( ! selectedTab?.dimmed ) {
-			return;
-		}
-
-		// In controlled mode, we trust that disabling tabs is done
-		// intentionally, and don't select a new tab automatically.
-		if ( isControlled ) {
-			setSelectedId( null );
-			return;
-		}
+		}, [
+			firstEnabledTab,
+			initialTab,
+			isControlled,
+			selectedTab?.dimmed,
+			setSelectedId,
+		] );
+
+		// Clear `selectedId` if the active tab is removed from the DOM in controlled mode.
+		useLayoutEffect( () => {
+			if ( ! isControlled ) {
+				return;
+			}
 
-		// If the currently selected tab becomes disabled, fall back to the
-		// `initialTabId` if possible. Otherwise select the first
-		// enabled tab (if there is one).
-		if ( initialTab && ! initialTab.dimmed ) {
-			setSelectedId( initialTab.id );
-			return;
-		}
+			// Once the tabs have populated, if the `selectedTabId` still can't be
+			// found, clear the selection.
+			if (
+				tabsHavePopulatedRef.current &&
+				!! selectedTabId &&
+				! selectedTab
+			) {
+				setSelectedId( null );
+			}
+		}, [ isControlled, selectedTab, selectedTabId, setSelectedId ] );
 
-		if ( firstEnabledTab ) {
-			setSelectedId( firstEnabledTab.id );
-		}
-	}, [
-		firstEnabledTab,
-		initialTab,
-		isControlled,
-		selectedTab?.dimmed,
-		setSelectedId,
-	] );
-
-	// Clear `selectedId` if the active tab is removed from the DOM in controlled mode.
-	useLayoutEffect( () => {
-		if ( ! isControlled ) {
-			return;
-		}
+		useEffect( () => {
+			// If there is no active tab, fallback to place focus on the first enabled tab
+			// so there is always an active element
+			if ( selectedTabId === null && ! activeId && firstEnabledTab?.id ) {
+				setActiveId( firstEnabledTab.id );
+			}
+		}, [ selectedTabId, activeId, firstEnabledTab?.id, setActiveId ] );
 
-		// Once the tabs have populated, if the `selectedTabId` still can't be
-		// found, clear the selection.
-		if ( tabsHavePopulated.current && !! selectedTabId && ! selectedTab ) {
-			setSelectedId( null );
-		}
-	}, [
-		isControlled,
-		selectedId,
-		selectedTab,
-		selectedTabId,
-		setSelectedId,
-	] );
+		useEffect( () => {
+			if ( ! isControlled ) {
+				return;
+			}
 
-	const contextValue = useMemo(
-		() => ( {
-			store,
-			instanceId,
+			requestAnimationFrame( () => {
+				const focusedElement =
+					items?.[ 0 ]?.element?.ownerDocument.activeElement;
+
+				if (
+					! focusedElement ||
+					! items.some( ( item ) => focusedElement === item.element )
+				) {
+					return; // Return early if no tabs are focused.
+				}
+
+				// If, after ariakit re-computes the active tab, that tab doesn't match
+				// the currently focused tab, then we force an update to ariakit to avoid
+				// any mismatches, especially when navigating to previous/next tab with
+				// arrow keys.
+				if ( activeId !== focusedElement.id ) {
+					setActiveId( focusedElement.id );
+				}
+			} );
+		}, [ activeId, isControlled, items, setActiveId ] );
+
+		const contextValue = useMemo(
+			() => ( {
+				store,
+				instanceId,
+			} ),
+			[ store, instanceId ]
+		);
+
+		return (
+			<TabsContext.Provider value={ contextValue }>
+				{ children }
+			</TabsContext.Provider>
+		);
+	},
+	{
+		Tab: Object.assign( Tab, {
+			displayName: 'Tabs.Tab',
+		} ),
+		TabList: Object.assign( TabList, {
+			displayName: 'Tabs.TabList',
+		} ),
+		TabPanel: Object.assign( TabPanel, {
+			displayName: 'Tabs.TabPanel',
 		} ),
-		[ store, instanceId ]
-	);
-
-	return (
-		<TabsContext.Provider value={ contextValue }>
-			{ children }
-		</TabsContext.Provider>
-	);
-}
-
-Tabs.TabList = TabList;
-Tabs.Tab = Tab;
-Tabs.TabPanel = TabPanel;
-Tabs.Context = TabsContext;
-
-export default Tabs;
+		Context: Object.assign( TabsContext, {
+			displayName: 'Tabs.Context',
+		} ),
+	}
+);
diff --git a/packages/components/src/tabs/stories/index.story.tsx b/packages/components/src/tabs/stories/index.story.tsx
index ce8c8324edaee4..5b2fd621bbb436 100644
--- a/packages/components/src/tabs/stories/index.story.tsx
+++ b/packages/components/src/tabs/stories/index.story.tsx
@@ -12,13 +12,16 @@ import { useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import Tabs from '..';
+import { Tabs } from '..';
 import { Slot, Fill, Provider as SlotFillProvider } from '../../slot-fill';
 import DropdownMenu from '../../dropdown-menu';
 import Button from '../../button';
+import Tooltip from '../../tooltip';
+import Icon from '../../icon';
 
 const meta: Meta< typeof Tabs > = {
-	title: 'Components (Experimental)/Tabs',
+	title: 'Components/Containers/Tabs',
+	id: 'components-tabs',
 	component: Tabs,
 	subcomponents: {
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
@@ -27,7 +30,10 @@ const meta: Meta< typeof Tabs > = {
 		'Tabs.Tab': Tabs.Tab,
 		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
 		'Tabs.TabPanel': Tabs.TabPanel,
+		// @ts-expect-error - See https://github.com/storybookjs/storybook/issues/23170
+		'Tabs.Context': Tabs.Context,
 	},
+	tags: [ 'status-private' ],
 	parameters: {
 		actions: { argTypesRegex: '^on.*' },
 		controls: { expanded: true },
@@ -40,17 +46,17 @@ const Template: StoryFn< typeof Tabs > = ( props ) => {
 	return (
 		<Tabs { ...props }>
 			<Tabs.TabList>
-				<Tabs.Tab id={ 'tab1' }>Tab 1</Tabs.Tab>
-				<Tabs.Tab id={ 'tab2' }>Tab 2</Tabs.Tab>
-				<Tabs.Tab id={ 'tab3' }>Tab 3</Tabs.Tab>
+				<Tabs.Tab tabId="tab1">Tab 1</Tabs.Tab>
+				<Tabs.Tab tabId="tab2">Tab 2</Tabs.Tab>
+				<Tabs.Tab tabId="tab3">Tab 3</Tabs.Tab>
 			</Tabs.TabList>
-			<Tabs.TabPanel id={ 'tab1' }>
+			<Tabs.TabPanel tabId="tab1">
 				<p>Selected tab: Tab 1</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab2' }>
+			<Tabs.TabPanel tabId="tab2">
 				<p>Selected tab: Tab 2</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab3' } focusable={ false }>
+			<Tabs.TabPanel tabId="tab3" focusable={ false }>
 				<p>Selected tab: Tab 3</p>
 				<p>
 					This tabpanel has its <code>focusable</code> prop set to
@@ -67,23 +73,143 @@ const Template: StoryFn< typeof Tabs > = ( props ) => {
 
 export const Default = Template.bind( {} );
 
+export const SizeAndOverflowPlayground: StoryFn< typeof Tabs > = ( props ) => {
+	const [ fullWidth, setFullWidth ] = useState( false );
+	return (
+		<div>
+			<div style={ { maxWidth: '40rem', marginBottom: '1rem' } }>
+				<p>
+					This story helps understand how the TabList component
+					behaves under different conditions. The container below
+					(with the dotted red border) can be horizontally resized,
+					and it has a bit of padding to be out of the way of the
+					TabList.
+				</p>
+				<p>
+					The button will toggle between full width (adding{ ' ' }
+					<code>width: 100%</code>) and the default width.
+				</p>
+				<p>Try the following:</p>
+				<ul>
+					<li>
+						<strong>Small container</strong> that causes tabs to
+						overflow with scroll.
+					</li>
+					<li>
+						<strong>Large container</strong> that exceeds the normal
+						width of the tabs.
+						<ul>
+							<li>
+								<strong>
+									With <code>width: 100%</code>
+								</strong>{ ' ' }
+								set on the TabList (tabs fill up the space).
+							</li>
+							<li>
+								<strong>
+									Without <code>width: 100%</code>
+								</strong>{ ' ' }
+								(defaults to <code>auto</code>) set on the
+								TabList (tabs take up space proportional to
+								their content).
+							</li>
+						</ul>
+					</li>
+				</ul>
+			</div>
+			<Button
+				style={ { marginBottom: '1rem' } }
+				variant="primary"
+				onClick={ () => setFullWidth( ! fullWidth ) }
+			>
+				{ fullWidth
+					? 'Remove width: 100% from TabList'
+					: 'Set width: 100% in TabList' }
+			</Button>
+			<Tabs { ...props }>
+				<div
+					style={ {
+						width: '20rem',
+						border: '2px dotted red',
+						padding: '1rem',
+						resize: 'horizontal',
+						overflow: 'auto',
+					} }
+				>
+					<Tabs.TabList
+						style={ {
+							maxWidth: '100%',
+							width: fullWidth ? '100%' : undefined,
+						} }
+					>
+						<Tabs.Tab tabId="tab1">
+							Label with multiple words
+						</Tabs.Tab>
+						<Tabs.Tab tabId="tab2">Short</Tabs.Tab>
+						<Tabs.Tab tabId="tab3">
+							Hippopotomonstrosesquippedaliophobia
+						</Tabs.Tab>
+						<Tabs.Tab tabId="tab4">Tab 4</Tabs.Tab>
+						<Tabs.Tab tabId="tab5">Tab 5</Tabs.Tab>
+					</Tabs.TabList>
+				</div>
+				<Tabs.TabPanel tabId="tab1">
+					<p>Selected tab: Tab 1</p>
+					<p>(Label with multiple words)</p>
+				</Tabs.TabPanel>
+				<Tabs.TabPanel tabId="tab2">
+					<p>Selected tab: Tab 2</p>
+					<p>(Short)</p>
+				</Tabs.TabPanel>
+				<Tabs.TabPanel tabId="tab3">
+					<p>Selected tab: Tab 3</p>
+					<p>(Hippopotomonstrosesquippedaliophobia)</p>
+				</Tabs.TabPanel>
+				<Tabs.TabPanel tabId="tab4">
+					<p>Selected tab: Tab 4</p>
+				</Tabs.TabPanel>
+				<Tabs.TabPanel tabId="tab5">
+					<p>Selected tab: Tab 5</p>
+				</Tabs.TabPanel>
+			</Tabs>
+		</div>
+	);
+};
+SizeAndOverflowPlayground.args = {
+	defaultTabId: 'tab4',
+};
+
+const VerticalTemplate: StoryFn< typeof Tabs > = ( props ) => {
+	return (
+		<Tabs orientation="vertical" { ...props }>
+			<Tabs.TabList style={ { maxWidth: '10rem' } }>
+				<Tabs.Tab tabId="tab1">Tab 1</Tabs.Tab>
+				<Tabs.Tab tabId="tab2">Tab 2</Tabs.Tab>
+				<Tabs.Tab tabId="tab3">Tab 3</Tabs.Tab>
+			</Tabs.TabList>
+		</Tabs>
+	);
+};
+
+export const Vertical = VerticalTemplate.bind( {} );
+
 const DisabledTabTemplate: StoryFn< typeof Tabs > = ( props ) => {
 	return (
 		<Tabs { ...props }>
 			<Tabs.TabList>
-				<Tabs.Tab id={ 'tab1' } disabled={ true }>
+				<Tabs.Tab tabId="tab1" disabled>
 					Tab 1
 				</Tabs.Tab>
-				<Tabs.Tab id={ 'tab2' }>Tab 2</Tabs.Tab>
-				<Tabs.Tab id={ 'tab3' }>Tab 3</Tabs.Tab>
+				<Tabs.Tab tabId="tab2">Tab 2</Tabs.Tab>
+				<Tabs.Tab tabId="tab3">Tab 3</Tabs.Tab>
 			</Tabs.TabList>
-			<Tabs.TabPanel id={ 'tab1' }>
+			<Tabs.TabPanel tabId="tab1">
 				<p>Selected tab: Tab 1</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab2' }>
+			<Tabs.TabPanel tabId="tab2">
 				<p>Selected tab: Tab 2</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab3' }>
+			<Tabs.TabPanel tabId="tab3">
 				<p>Selected tab: Tab 3</p>
 			</Tabs.TabPanel>
 		</Tabs>
@@ -95,32 +221,37 @@ const WithTabIconsAndTooltipsTemplate: StoryFn< typeof Tabs > = ( props ) => {
 	return (
 		<Tabs { ...props }>
 			<Tabs.TabList>
-				<Tabs.Tab
-					id={ 'tab1' }
-					render={
-						<Button icon={ wordpress } label="Tab 1" showTooltip />
-					}
-				/>
-				<Tabs.Tab
-					id={ 'tab2' }
-					render={
-						<Button icon={ link } label="Tab 2" showTooltip />
-					}
-				/>
-				<Tabs.Tab
-					id={ 'tab3' }
-					render={
-						<Button icon={ more } label="Tab 3" showTooltip />
-					}
-				/>
+				{ [
+					{
+						id: 'tab1',
+						label: 'Tab one',
+						icon: wordpress,
+					},
+					{
+						id: 'tab2',
+						label: 'Tab two',
+						icon: link,
+					},
+					{
+						id: 'tab3',
+						label: 'Tab three',
+						icon: more,
+					},
+				].map( ( { id, label, icon } ) => (
+					<Tooltip text={ label } key={ id }>
+						<Tabs.Tab tabId={ id } aria-label={ label }>
+							<Icon icon={ icon } />
+						</Tabs.Tab>
+					</Tooltip>
+				) ) }
 			</Tabs.TabList>
-			<Tabs.TabPanel id={ 'tab1' }>
+			<Tabs.TabPanel tabId="tab1">
 				<p>Selected tab: Tab 1</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab2' }>
+			<Tabs.TabPanel tabId="tab2">
 				<p>Selected tab: Tab 2</p>
 			</Tabs.TabPanel>
-			<Tabs.TabPanel id={ 'tab3' }>
+			<Tabs.TabPanel tabId="tab3">
 				<p>Selected tab: Tab 3</p>
 			</Tabs.TabPanel>
 		</Tabs>
@@ -140,18 +271,18 @@ const UsingSlotFillTemplate: StoryFn< typeof Tabs > = ( props ) => {
 		<SlotFillProvider>
 			<Tabs { ...props }>
 				<Tabs.TabList>
-					<Tabs.Tab id={ 'tab1' }>Tab 1</Tabs.Tab>
-					<Tabs.Tab id={ 'tab2' }>Tab 2</Tabs.Tab>
-					<Tabs.Tab id={ 'tab3' }>Tab 3</Tabs.Tab>
+					<Tabs.Tab tabId="tab1">Tab 1</Tabs.Tab>
+					<Tabs.Tab tabId="tab2">Tab 2</Tabs.Tab>
+					<Tabs.Tab tabId="tab3">Tab 3</Tabs.Tab>
 				</Tabs.TabList>
 				<Fill name="tabs-are-fun">
-					<Tabs.TabPanel id={ 'tab1' }>
+					<Tabs.TabPanel tabId="tab1">
 						<p>Selected tab: Tab 1</p>
 					</Tabs.TabPanel>
-					<Tabs.TabPanel id={ 'tab2' }>
+					<Tabs.TabPanel tabId="tab2">
 						<p>Selected tab: Tab 2</p>
 					</Tabs.TabPanel>
-					<Tabs.TabPanel id={ 'tab3' }>
+					<Tabs.TabPanel tabId="tab3">
 						<p>Selected tab: Tab 3</p>
 					</Tabs.TabPanel>
 				</Fill>
@@ -196,12 +327,12 @@ const CloseButtonTemplate: StoryFn< typeof Tabs > = ( props ) => {
 							} }
 						>
 							<Tabs.TabList>
-								<Tabs.Tab id={ 'tab1' }>Tab 1</Tabs.Tab>
-								<Tabs.Tab id={ 'tab2' }>Tab 2</Tabs.Tab>
-								<Tabs.Tab id={ 'tab3' }>Tab 3</Tabs.Tab>
+								<Tabs.Tab tabId="tab1">Tab 1</Tabs.Tab>
+								<Tabs.Tab tabId="tab2">Tab 2</Tabs.Tab>
+								<Tabs.Tab tabId="tab3">Tab 3</Tabs.Tab>
 							</Tabs.TabList>
 							<Button
-								variant={ 'tertiary' }
+								variant="tertiary"
 								style={ {
 									marginLeft: 'auto',
 									alignSelf: 'center',
@@ -211,22 +342,19 @@ const CloseButtonTemplate: StoryFn< typeof Tabs > = ( props ) => {
 								Close Tabs
 							</Button>
 						</div>
-						<Tabs.TabPanel id={ 'tab1' }>
+						<Tabs.TabPanel tabId="tab1">
 							<p>Selected tab: Tab 1</p>
 						</Tabs.TabPanel>
-						<Tabs.TabPanel id={ 'tab2' }>
+						<Tabs.TabPanel tabId="tab2">
 							<p>Selected tab: Tab 2</p>
 						</Tabs.TabPanel>
-						<Tabs.TabPanel id={ 'tab3' }>
+						<Tabs.TabPanel tabId="tab3">
 							<p>Selected tab: Tab 3</p>
 						</Tabs.TabPanel>
 					</Tabs>
 				</div>
 			) : (
-				<Button
-					variant={ 'tertiary' }
-					onClick={ () => setIsOpen( true ) }
-				>
+				<Button variant="tertiary" onClick={ () => setIsOpen( true ) }>
 					Open Tabs
 				</Button>
 			) }
@@ -251,47 +379,45 @@ const ControlledModeTemplate: StoryFn< typeof Tabs > = ( props ) => {
 				} }
 			>
 				<Tabs.TabList>
-					<Tabs.Tab id={ 'tab1' }>Tab 1</Tabs.Tab>
+					<Tabs.Tab tabId="tab1">Tab 1</Tabs.Tab>
 
-					<Tabs.Tab id={ 'tab2' }>Tab 2</Tabs.Tab>
+					<Tabs.Tab tabId="tab2">Tab 2</Tabs.Tab>
 
-					<Tabs.Tab id={ 'tab3' }>Tab 3</Tabs.Tab>
+					<Tabs.Tab tabId="tab3">Tab 3</Tabs.Tab>
 				</Tabs.TabList>
-				<Tabs.TabPanel id={ 'tab1' }>
+				<Tabs.TabPanel tabId="tab1">
 					<p>Selected tab: Tab 1</p>
 				</Tabs.TabPanel>
-				<Tabs.TabPanel id={ 'tab2' }>
+				<Tabs.TabPanel tabId="tab2">
 					<p>Selected tab: Tab 2</p>
 				</Tabs.TabPanel>
-				<Tabs.TabPanel id={ 'tab3' }>
+				<Tabs.TabPanel tabId="tab3">
 					<p>Selected tab: Tab 3</p>
 				</Tabs.TabPanel>
 			</Tabs>
-			{
-				<div style={ { marginTop: '200px' } }>
-					<p>Select a tab:</p>
-					<DropdownMenu
-						controls={ [
-							{
-								onClick: () => setSelectedTabId( 'tab1' ),
-								title: 'Tab 1',
-								isActive: selectedTabId === 'tab1',
-							},
-							{
-								onClick: () => setSelectedTabId( 'tab2' ),
-								title: 'Tab 2',
-								isActive: selectedTabId === 'tab2',
-							},
-							{
-								onClick: () => setSelectedTabId( 'tab3' ),
-								title: 'Tab 3',
-								isActive: selectedTabId === 'tab3',
-							},
-						] }
-						label="Choose a tab. The power is yours."
-					/>
-				</div>
-			}
+			<div style={ { marginTop: '200px' } }>
+				<p>Select a tab:</p>
+				<DropdownMenu
+					controls={ [
+						{
+							onClick: () => setSelectedTabId( 'tab1' ),
+							title: 'Tab 1',
+							isActive: selectedTabId === 'tab1',
+						},
+						{
+							onClick: () => setSelectedTabId( 'tab2' ),
+							title: 'Tab 2',
+							isActive: selectedTabId === 'tab2',
+						},
+						{
+							onClick: () => setSelectedTabId( 'tab3' ),
+							title: 'Tab 3',
+							isActive: selectedTabId === 'tab3',
+						},
+					] }
+					label="Choose a tab. The power is yours."
+				/>
+			</div>
 		</>
 	);
 };
@@ -314,19 +440,19 @@ const TabBecomesDisabledTemplate: StoryFn< typeof Tabs > = ( props ) => {
 			</Button>
 			<Tabs { ...props }>
 				<Tabs.TabList>
-					<Tabs.Tab id={ 'tab1' }>Tab 1</Tabs.Tab>
-					<Tabs.Tab id={ 'tab2' } disabled={ disableTab2 }>
+					<Tabs.Tab tabId="tab1">Tab 1</Tabs.Tab>
+					<Tabs.Tab tabId="tab2" disabled={ disableTab2 }>
 						Tab 2
 					</Tabs.Tab>
-					<Tabs.Tab id={ 'tab3' }>Tab 3</Tabs.Tab>
+					<Tabs.Tab tabId="tab3">Tab 3</Tabs.Tab>
 				</Tabs.TabList>
-				<Tabs.TabPanel id={ 'tab1' }>
+				<Tabs.TabPanel tabId="tab1">
 					<p>Selected tab: Tab 1</p>
 				</Tabs.TabPanel>
-				<Tabs.TabPanel id={ 'tab2' }>
+				<Tabs.TabPanel tabId="tab2">
 					<p>Selected tab: Tab 2</p>
 				</Tabs.TabPanel>
-				<Tabs.TabPanel id={ 'tab3' }>
+				<Tabs.TabPanel tabId="tab3">
 					<p>Selected tab: Tab 3</p>
 				</Tabs.TabPanel>
 			</Tabs>
@@ -348,17 +474,17 @@ const TabGetsRemovedTemplate: StoryFn< typeof Tabs > = ( props ) => {
 			</Button>
 			<Tabs { ...props }>
 				<Tabs.TabList>
-					{ ! removeTab1 && <Tabs.Tab id={ 'tab1' }>Tab 1</Tabs.Tab> }
-					<Tabs.Tab id={ 'tab2' }>Tab 2</Tabs.Tab>
-					<Tabs.Tab id={ 'tab3' }>Tab 3</Tabs.Tab>
+					{ ! removeTab1 && <Tabs.Tab tabId="tab1">Tab 1</Tabs.Tab> }
+					<Tabs.Tab tabId="tab2">Tab 2</Tabs.Tab>
+					<Tabs.Tab tabId="tab3">Tab 3</Tabs.Tab>
 				</Tabs.TabList>
-				<Tabs.TabPanel id={ 'tab1' }>
+				<Tabs.TabPanel tabId="tab1">
 					<p>Selected tab: Tab 1</p>
 				</Tabs.TabPanel>
-				<Tabs.TabPanel id={ 'tab2' }>
+				<Tabs.TabPanel tabId="tab2">
 					<p>Selected tab: Tab 2</p>
 				</Tabs.TabPanel>
-				<Tabs.TabPanel id={ 'tab3' }>
+				<Tabs.TabPanel tabId="tab3">
 					<p>Selected tab: Tab 3</p>
 				</Tabs.TabPanel>
 			</Tabs>
diff --git a/packages/components/src/tabs/styles.ts b/packages/components/src/tabs/styles.ts
index cb735f3177662a..717316227ddb3c 100644
--- a/packages/components/src/tabs/styles.ts
+++ b/packages/components/src/tabs/styles.ts
@@ -2,104 +2,271 @@
  * External dependencies
  */
 import styled from '@emotion/styled';
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
 
 /**
  * Internal dependencies
  */
-import { COLORS } from '../utils';
+import { COLORS, CONFIG } from '../utils';
 import { space } from '../utils/space';
-import { reduceMotion } from '../utils/reduce-motion';
+import Icon from '../icon';
 
-export const TabListWrapper = styled.div`
+export const StyledTabList = styled( Ariakit.TabList )`
 	display: flex;
 	align-items: stretch;
-	flex-direction: row;
+	overflow-x: auto;
+
 	&[aria-orientation='vertical'] {
 		flex-direction: column;
 	}
+
+	:where( [aria-orientation='horizontal'] ) {
+		width: fit-content;
+	}
+
+	--direction-factor: 1;
+	--direction-start: left;
+	--direction-end: right;
+	--selected-start: var( --selected-left, 0 );
+	&:dir( rtl ) {
+		--direction-factor: -1;
+		--direction-start: right;
+		--direction-end: left;
+		--selected-start: var( --selected-right, 0 );
+	}
+
+	@media not ( prefers-reduced-motion ) {
+		&[data-indicator-animated]::before {
+			transition-property: transform, border-radius, border-block;
+			transition-duration: 0.2s;
+			transition-timing-function: ease-out;
+		}
+	}
+	position: relative;
+	&::before {
+		content: '';
+		position: absolute;
+		pointer-events: none;
+		transform-origin: var( --direction-start ) top;
+
+		// Windows high contrast mode.
+		outline: 2px solid transparent;
+		outline-offset: -1px;
+	}
+
+	/* Using a large value to avoid antialiasing rounding issues
+			when scaling in the transform, see: https://stackoverflow.com/a/52159123 */
+	--antialiasing-factor: 100;
+	&[aria-orientation='horizontal'] {
+		--fade-width: 4rem;
+		--fade-gradient-base: transparent 0%, black var( --fade-width );
+		--fade-gradient-composed: var( --fade-gradient-base ), black 60%,
+			transparent 50%;
+		&.is-overflowing-first {
+			mask-image: linear-gradient(
+				to var( --direction-end ),
+				var( --fade-gradient-base )
+			);
+		}
+		&.is-overflowing-last {
+			mask-image: linear-gradient(
+				to var( --direction-start ),
+				var( --fade-gradient-base )
+			);
+		}
+		&.is-overflowing-first.is-overflowing-last {
+			mask-image: linear-gradient(
+					to right,
+					var( --fade-gradient-composed )
+				),
+				linear-gradient( to left, var( --fade-gradient-composed ) );
+		}
+
+		&::before {
+			bottom: 0;
+			height: 0;
+			width: calc( var( --antialiasing-factor ) * 1px );
+			transform: translateX(
+					calc(
+						var( --selected-start ) * var( --direction-factor ) *
+							1px
+					)
+				)
+				scaleX(
+					calc(
+						var( --selected-width, 0 ) /
+							var( --antialiasing-factor )
+					)
+				);
+			border-bottom: var( --wp-admin-border-width-focus ) solid
+				${ COLORS.theme.accent };
+		}
+	}
+	&[aria-orientation='vertical'] {
+		&::before {
+			/* Adjusting the border radius to match the scaling in the y axis. */
+			border-radius: ${ CONFIG.radiusSmall } /
+				calc(
+					${ CONFIG.radiusSmall } /
+						(
+							var( --selected-height, 0 ) /
+								var( --antialiasing-factor )
+						)
+				);
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: calc( var( --antialiasing-factor ) * 1px );
+			transform: translateY( calc( var( --selected-top, 0 ) * 1px ) )
+				scaleY(
+					calc(
+						var( --selected-height, 0 ) /
+							var( --antialiasing-factor )
+					)
+				);
+			background-color: color-mix(
+				in srgb,
+				${ COLORS.theme.accent },
+				transparent 96%
+			);
+		}
+		&[data-select-on-move='true']:has(
+				:is( :focus-visible, [data-focus-visible] )
+			)::before {
+			box-sizing: border-box;
+			border: var( --wp-admin-border-width-focus ) solid
+				${ COLORS.theme.accent };
+			/* Adjusting the border width to match the scaling in the y axis. */
+			border-block-width: calc(
+				var( --wp-admin-border-width-focus, 1px ) /
+					(
+						var( --selected-height, 0 ) /
+							var( --antialiasing-factor )
+					)
+			);
+		}
+	}
 `;
 
 export const Tab = styled( Ariakit.Tab )`
-	&& {
-		position: relative;
+	& {
+		/* Resets */
 		border-radius: 0;
-		height: ${ space( 12 ) };
 		background: transparent;
 		border: none;
 		box-shadow: none;
+
+		flex: 1 0 auto;
+		white-space: nowrap;
+		display: flex;
+		align-items: center;
 		cursor: pointer;
-		padding: 3px ${ space( 4 ) }; // Use padding to offset the [aria-selected="true"] border, this benefits Windows High Contrast mode
-		margin-left: 0;
-		font-weight: 500;
+		line-height: 1.2; // Characters in some languages (e.g. Japanese) may have a native higher line-height.
+		font-weight: 400;
+		color: ${ COLORS.theme.foreground };
 
 		&[aria-disabled='true'] {
 			cursor: default;
-			opacity: 0.3;
+			color: ${ COLORS.ui.textDisabled };
+		}
+
+		&:not( [aria-disabled='true'] ):is( :hover, [data-focus-visible] ) {
+			color: ${ COLORS.theme.accent };
 		}
 
 		&:focus:not( :disabled ) {
-			position: relative;
 			box-shadow: none;
 			outline: none;
 		}
 
-		// Tab indicator
+		// Focus indicator.
+		position: relative;
 		&::after {
-			content: '';
 			position: absolute;
-			right: 0;
-			bottom: 0;
-			left: 0;
 			pointer-events: none;
 
 			// Draw the indicator.
-			background: ${ COLORS.theme.accent };
-			height: calc( 0 * var( --wp-admin-border-width-focus ) );
-			border-radius: 0;
+			// Outline works for Windows high contrast mode as well.
+			outline: var( --wp-admin-border-width-focus ) solid
+				${ COLORS.theme.accent };
+			border-radius: ${ CONFIG.radiusSmall };
 
 			// Animation
-			transition: all 0.1s linear;
-			${ reduceMotion( 'transition' ) };
-		}
+			opacity: 0;
 
-		// Active.
-		&[aria-selected='true']::after {
-			height: calc( 1 * var( --wp-admin-border-width-focus ) );
+			@media not ( prefers-reduced-motion ) {
+				transition: opacity 0.1s linear;
+			}
+		}
 
-			// Windows high contrast mode.
-			outline: 2px solid transparent;
-			outline-offset: -1px;
+		&[data-focus-visible]::after {
+			opacity: 1;
 		}
+	}
 
-		// Focus.
-		&::before {
+	[aria-orientation='horizontal'] & {
+		padding-inline: ${ space( 4 ) };
+		height: ${ space( 12 ) };
+		scroll-margin: 24px;
+
+		&::after {
 			content: '';
-			position: absolute;
-			top: ${ space( 3 ) };
-			right: ${ space( 3 ) };
-			bottom: ${ space( 3 ) };
-			left: ${ space( 3 ) };
-			pointer-events: none;
+			inset: ${ space( 3 ) };
+		}
+	}
 
-			// Draw the indicator.
-			box-shadow: 0 0 0 0 transparent;
-			border-radius: 2px;
+	[aria-orientation='vertical'] & {
+		padding: ${ space( 2 ) } ${ space( 3 ) };
+		min-height: ${ space( 10 ) };
 
-			// Animation
-			transition: all 0.1s linear;
-			${ reduceMotion( 'transition' ) };
+		&[aria-selected='true'] {
+			color: ${ COLORS.theme.accent };
+			fill: currentColor;
 		}
+	}
+	[aria-orientation='vertical'][data-select-on-move='false'] &::after {
+		content: '';
+		inset: var( --wp-admin-border-width-focus );
+	}
+`;
 
-		&:focus-visible::before {
-			box-shadow: 0 0 0 var( --wp-admin-border-width-focus )
-				${ COLORS.theme.accent };
+export const TabChildren = styled.span`
+	flex-grow: 1;
+
+	display: flex;
+	align-items: center;
+
+	[aria-orientation='horizontal'] & {
+		justify-content: center;
+	}
+	[aria-orientation='vertical'] & {
+		justify-content: start;
+	}
+`;
 
-			// Windows high contrast mode.
-			outline: 2px solid transparent;
+export const TabChevron = styled( Icon )`
+	flex-shrink: 0;
+	margin-inline-end: ${ space( -1 ) };
+	[aria-orientation='horizontal'] & {
+		display: none;
+	}
+	opacity: 0;
+	[role='tab']:is( [aria-selected='true'], [data-focus-visible], :hover ) & {
+		opacity: 1;
+	}
+	// The chevron is transitioned into existence when selectOnMove is enabled,
+	// because otherwise it looks jarring, as it shows up outside of the focus
+	// indicator that's being animated at the same time.
+	@media not ( prefers-reduced-motion ) {
+		[data-select-on-move='true']
+			[role='tab']:is( [aria-selected='true'],  )
+			& {
+			transition: opacity 0.15s 0.15s linear;
 		}
 	}
+	&:dir( rtl ) {
+		rotate: 180deg;
+	}
 `;
 
 export const TabPanel = styled( Ariakit.TabPanel )`
@@ -108,8 +275,7 @@ export const TabPanel = styled( Ariakit.TabPanel )`
 		outline: none;
 	}
 
-	&:focus-visible {
-		border-radius: 2px;
+	&[data-focus-visible] {
 		box-shadow: 0 0 0 var( --wp-admin-border-width-focus )
 			${ COLORS.theme.accent };
 		// Windows high contrast mode.
diff --git a/packages/components/src/tabs/tab.tsx b/packages/components/src/tabs/tab.tsx
index 4bfc99e8ef43b1..29f6111adc8397 100644
--- a/packages/components/src/tabs/tab.tsx
+++ b/packages/components/src/tabs/tab.tsx
@@ -10,20 +10,25 @@ import { forwardRef } from '@wordpress/element';
 import type { TabProps } from './types';
 import warning from '@wordpress/warning';
 import { useTabsContext } from './context';
-import { Tab as StyledTab } from './styles';
+import {
+	Tab as StyledTab,
+	TabChildren as StyledTabChildren,
+	TabChevron as StyledTabChevron,
+} from './styles';
 import type { WordPressComponentProps } from '../context';
+import { chevronRight } from '@wordpress/icons';
 
 export const Tab = forwardRef<
 	HTMLButtonElement,
-	WordPressComponentProps< TabProps, 'button', false >
->( function Tab( { children, id, disabled, render, ...otherProps }, ref ) {
+	Omit< WordPressComponentProps< TabProps, 'button', false >, 'id' >
+>( function Tab( { children, tabId, disabled, render, ...otherProps }, ref ) {
 	const context = useTabsContext();
 	if ( ! context ) {
 		warning( '`Tabs.Tab` must be wrapped in a `Tabs` component.' );
 		return null;
 	}
 	const { store, instanceId } = context;
-	const instancedTabId = `${ instanceId }-${ id }`;
+	const instancedTabId = `${ instanceId }-${ tabId }`;
 	return (
 		<StyledTab
 			ref={ ref }
@@ -33,7 +38,8 @@ export const Tab = forwardRef<
 			render={ render }
 			{ ...otherProps }
 		>
-			{ children }
+			<StyledTabChildren>{ children }</StyledTabChildren>
+			<StyledTabChevron icon={ chevronRight } />
 		</StyledTab>
 	);
 } );
diff --git a/packages/components/src/tabs/tablist.tsx b/packages/components/src/tabs/tablist.tsx
index 7a53115910796c..2f736d6b95441c 100644
--- a/packages/components/src/tabs/tablist.tsx
+++ b/packages/components/src/tabs/tablist.tsx
@@ -1,41 +1,145 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import warning from '@wordpress/warning';
-import { forwardRef } from '@wordpress/element';
+import { forwardRef, useLayoutEffect, useState } from '@wordpress/element';
+import { useMergeRefs } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import type { TabListProps } from './types';
-import { useTabsContext } from './context';
-import { TabListWrapper } from './styles';
 import type { WordPressComponentProps } from '../context';
+import type { ElementOffsetRect } from '../utils/element-rect';
+import { useTabsContext } from './context';
+import { StyledTabList } from './styles';
+import { useTrackElementOffsetRect } from '../utils/element-rect';
+import { useTrackOverflow } from './use-track-overflow';
+import { useAnimatedOffsetRect } from '../utils/hooks/use-animated-offset-rect';
+
+const DEFAULT_SCROLL_MARGIN = 24;
+
+/**
+ * Scrolls a given parent element so that a given rect is visible.
+ *
+ * The scroll is updated initially and whenever the rect changes.
+ */
+function useScrollRectIntoView(
+	parent: HTMLElement | undefined,
+	rect: ElementOffsetRect,
+	{ margin = DEFAULT_SCROLL_MARGIN } = {}
+) {
+	useLayoutEffect( () => {
+		if ( ! parent || ! rect ) {
+			return;
+		}
+
+		const { scrollLeft: parentScroll } = parent;
+		const parentWidth = parent.getBoundingClientRect().width;
+		const { left: childLeft, width: childWidth } = rect;
+
+		const parentRightEdge = parentScroll + parentWidth;
+		const childRightEdge = childLeft + childWidth;
+		const rightOverflow = childRightEdge + margin - parentRightEdge;
+		const leftOverflow = parentScroll - ( childLeft - margin );
+		if ( leftOverflow > 0 ) {
+			parent.scrollLeft = parentScroll - leftOverflow;
+		} else if ( rightOverflow > 0 ) {
+			parent.scrollLeft = parentScroll + rightOverflow;
+		}
+	}, [ margin, parent, rect ] );
+}
 
 export const TabList = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< TabListProps, 'div', false >
 >( function TabList( { children, ...otherProps }, ref ) {
-	const context = useTabsContext();
-	if ( ! context ) {
+	const { store } = useTabsContext() ?? {};
+
+	const selectedId = Ariakit.useStoreState( store, 'selectedId' );
+	const activeId = Ariakit.useStoreState( store, 'activeId' );
+	const selectOnMove = Ariakit.useStoreState( store, 'selectOnMove' );
+	const items = Ariakit.useStoreState( store, 'items' );
+	const [ parent, setParent ] = useState< HTMLElement >();
+	const refs = useMergeRefs( [ ref, setParent ] );
+
+	const selectedItem = store?.item( selectedId );
+	const renderedItems = Ariakit.useStoreState( store, 'renderedItems' );
+
+	const selectedItemIndex =
+		renderedItems && selectedItem
+			? renderedItems.indexOf( selectedItem )
+			: -1;
+	// Use selectedItemIndex as a dependency to force recalculation when the
+	// selected item index changes (elements are swapped / added / removed).
+	const selectedRect = useTrackElementOffsetRect( selectedItem?.element, [
+		selectedItemIndex,
+	] );
+
+	// Track overflow to show scroll hints.
+	const overflow = useTrackOverflow( parent, {
+		first: items?.at( 0 )?.element,
+		last: items?.at( -1 )?.element,
+	} );
+
+	// Size, position, and animate the indicator.
+	useAnimatedOffsetRect( parent, selectedRect, {
+		prefix: 'selected',
+		dataAttribute: 'indicator-animated',
+		transitionEndFilter: ( event ) => event.pseudoElement === '::before',
+		roundRect: true,
+	} );
+
+	// Make sure selected tab is scrolled into view.
+	useScrollRectIntoView( parent, selectedRect );
+
+	const onBlur = () => {
+		if ( ! selectOnMove ) {
+			return;
+		}
+
+		// When automatic tab selection is on, make sure that the active tab is up
+		// to date with the selected tab when leaving the tablist. This makes sure
+		// that the selected tab will receive keyboard focus when tabbing back into
+		// the tablist.
+		if ( selectedId !== activeId ) {
+			store?.setActiveId( selectedId );
+		}
+	};
+
+	if ( ! store ) {
 		warning( '`Tabs.TabList` must be wrapped in a `Tabs` component.' );
 		return null;
 	}
-	const { store } = context;
+
 	return (
-		<Ariakit.TabList
-			ref={ ref }
+		<StyledTabList
+			ref={ refs }
 			store={ store }
-			render={ <TabListWrapper /> }
+			render={ ( props ) => (
+				<div
+					{ ...props }
+					// Fallback to -1 to prevent browsers from making the tablist
+					// tabbable when it is a scrolling container.
+					tabIndex={ props.tabIndex ?? -1 }
+				/>
+			) }
+			onBlur={ onBlur }
+			data-select-on-move={ selectOnMove ? 'true' : 'false' }
 			{ ...otherProps }
+			className={ clsx(
+				overflow.first && 'is-overflowing-first',
+				overflow.last && 'is-overflowing-last',
+				otherProps.className
+			) }
 		>
 			{ children }
-		</Ariakit.TabList>
+		</StyledTabList>
 	);
 } );
diff --git a/packages/components/src/tabs/tabpanel.tsx b/packages/components/src/tabs/tabpanel.tsx
index 8e8d72280a4935..512b2609682722 100644
--- a/packages/components/src/tabs/tabpanel.tsx
+++ b/packages/components/src/tabs/tabpanel.tsx
@@ -1,11 +1,11 @@
 /**
  * External dependencies
  */
+import { useStoreState } from '@ariakit/react';
 
 /**
  * WordPress dependencies
  */
-
 import { forwardRef } from '@wordpress/element';
 
 /**
@@ -20,24 +20,33 @@ import type { WordPressComponentProps } from '../context';
 
 export const TabPanel = forwardRef<
 	HTMLDivElement,
-	WordPressComponentProps< TabPanelProps, 'div', false >
->( function TabPanel( { children, id, focusable = true, ...otherProps }, ref ) {
+	Omit< WordPressComponentProps< TabPanelProps, 'div', false >, 'id' >
+>( function TabPanel(
+	{ children, tabId, focusable = true, ...otherProps },
+	ref
+) {
 	const context = useTabsContext();
+	const selectedId = useStoreState( context?.store, 'selectedId' );
 	if ( ! context ) {
 		warning( '`Tabs.TabPanel` must be wrapped in a `Tabs` component.' );
 		return null;
 	}
 	const { store, instanceId } = context;
+	const instancedTabId = `${ instanceId }-${ tabId }`;
 
 	return (
 		<StyledTabPanel
 			ref={ ref }
 			store={ store }
-			id={ `${ instanceId }-${ id }-view` }
+			// For TabPanel, the id passed here is the id attribute of the DOM
+			// element.
+			// `tabId` is the id of the tab that controls this panel.
+			id={ `${ instancedTabId }-view` }
+			tabId={ instancedTabId }
 			focusable={ focusable }
 			{ ...otherProps }
 		>
-			{ children }
+			{ selectedId === instancedTabId && children }
 		</StyledTabPanel>
 	);
 } );
diff --git a/packages/components/src/tabs/test/index.tsx b/packages/components/src/tabs/test/index.tsx
index fac8127c4cc0d8..82c75a3f16b253 100644
--- a/packages/components/src/tabs/test/index.tsx
+++ b/packages/components/src/tabs/test/index.tsx
@@ -1,22 +1,23 @@
 /**
  * External dependencies
  */
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen, waitFor } from '@testing-library/react';
+import { press, click } from '@ariakit/test';
+import { render } from '@ariakit/test/react';
 
 /**
  * WordPress dependencies
  */
-import { useState } from '@wordpress/element';
+import { useEffect, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import Tabs from '..';
+import { Tabs } from '..';
 import type { TabsProps } from '../types';
 
 type Tab = {
-	id: string;
+	tabId: string;
 	title: string;
 	content: React.ReactNode;
 	tab: {
@@ -30,19 +31,19 @@ type Tab = {
 
 const TABS: Tab[] = [
 	{
-		id: 'alpha',
+		tabId: 'alpha',
 		title: 'Alpha',
 		content: 'Selected tab: Alpha',
 		tab: { className: 'alpha-class' },
 	},
 	{
-		id: 'beta',
+		tabId: 'beta',
 		title: 'Beta',
 		content: 'Selected tab: Beta',
 		tab: { className: 'beta-class' },
 	},
 	{
-		id: 'gamma',
+		tabId: 'gamma',
 		title: 'Gamma',
 		content: 'Selected tab: Gamma',
 		tab: { className: 'gamma-class' },
@@ -52,7 +53,7 @@ const TABS: Tab[] = [
 const TABS_WITH_DELTA: Tab[] = [
 	...TABS,
 	{
-		id: 'delta',
+		tabId: 'delta',
 		title: 'Delta',
 		content: 'Selected tab: Delta',
 		tab: { className: 'delta-class' },
@@ -70,8 +71,8 @@ const UncontrolledTabs = ( {
 			<Tabs.TabList>
 				{ tabs.map( ( tabObj ) => (
 					<Tabs.Tab
-						key={ tabObj.id }
-						id={ tabObj.id }
+						key={ tabObj.tabId }
+						tabId={ tabObj.tabId }
 						className={ tabObj.tab.className }
 						disabled={ tabObj.tab.disabled }
 					>
@@ -81,8 +82,8 @@ const UncontrolledTabs = ( {
 			</Tabs.TabList>
 			{ tabs.map( ( tabObj ) => (
 				<Tabs.TabPanel
-					key={ tabObj.id }
-					id={ tabObj.id }
+					key={ tabObj.tabId }
+					tabId={ tabObj.tabId }
 					focusable={ tabObj.tabpanel?.focusable }
 				>
 					{ tabObj.content }
@@ -102,6 +103,10 @@ const ControlledTabs = ( {
 		string | undefined | null
 	>( props.selectedTabId );
 
+	useEffect( () => {
+		setSelectedTabId( props.selectedTabId );
+	}, [ props.selectedTabId ] );
+
 	return (
 		<Tabs
 			{ ...props }
@@ -114,8 +119,8 @@ const ControlledTabs = ( {
 			<Tabs.TabList>
 				{ tabs.map( ( tabObj ) => (
 					<Tabs.Tab
-						key={ tabObj.id }
-						id={ tabObj.id }
+						key={ tabObj.tabId }
+						tabId={ tabObj.tabId }
 						className={ tabObj.tab.className }
 						disabled={ tabObj.tab.disabled }
 					>
@@ -124,7 +129,7 @@ const ControlledTabs = ( {
 				) ) }
 			</Tabs.TabList>
 			{ tabs.map( ( tabObj ) => (
-				<Tabs.TabPanel key={ tabObj.id } id={ tabObj.id }>
+				<Tabs.TabPanel key={ tabObj.tabId } tabId={ tabObj.tabId }>
 					{ tabObj.content }
 				</Tabs.TabPanel>
 			) ) }
@@ -155,7 +160,7 @@ describe( 'Tabs', () => {
 
 	describe( 'Accessibility and semantics', () => {
 		it( 'should use the correct aria attributes', async () => {
-			render( <UncontrolledTabs tabs={ TABS } /> );
+			await render( <UncontrolledTabs tabs={ TABS } /> );
 
 			const tabList = screen.getByRole( 'tablist' );
 			const allTabs = screen.getAllByRole( 'tab' );
@@ -184,28 +189,24 @@ describe( 'Tabs', () => {
 	} );
 	describe( 'Focus Behavior', () => {
 		it( 'should focus on the related TabPanel when pressing the Tab key', async () => {
-			const user = userEvent.setup();
-
-			render( <UncontrolledTabs tabs={ TABS } /> );
+			await render( <UncontrolledTabs tabs={ TABS } /> );
 
 			const selectedTabPanel = await screen.findByRole( 'tabpanel' );
 
 			// Tab should initially focus the first tab in the tablist, which
 			// is Alpha.
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect(
 				await screen.findByRole( 'tab', { name: 'Alpha' } )
 			).toHaveFocus();
 
 			// By default the tabpanel should receive focus
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( selectedTabPanel ).toHaveFocus();
 		} );
 		it( 'should not focus on the related TabPanel when pressing the Tab key if `focusable: false` is set', async () => {
-			const user = userEvent.setup();
-
 			const TABS_WITH_ALPHA_FOCUSABLE_FALSE = TABS.map( ( tabObj ) =>
-				tabObj.id === 'alpha'
+				tabObj.tabId === 'alpha'
 					? {
 							...tabObj,
 							content: (
@@ -219,7 +220,7 @@ describe( 'Tabs', () => {
 					: tabObj
 			);
 
-			render(
+			await render(
 				<UncontrolledTabs tabs={ TABS_WITH_ALPHA_FOCUSABLE_FALSE } />
 			);
 
@@ -229,20 +230,57 @@ describe( 'Tabs', () => {
 
 			// Tab should initially focus the first tab in the tablist, which
 			// is Alpha.
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect(
 				await screen.findByRole( 'tab', { name: 'Alpha' } )
 			).toHaveFocus();
 			// Because the alpha tabpanel is set to `focusable: false`, pressing
 			// the Tab key should focus the button, not the tabpanel
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( alphaButton ).toHaveFocus();
 		} );
+
+		it( 'should focus on the first enabled tab when pressing the Tab key if no tab is selected', async () => {
+			const TABS_WITH_ALPHA_DISABLED = TABS.map( ( tabObj ) =>
+				tabObj.tabId === 'alpha'
+					? {
+							...tabObj,
+							tab: {
+								...tabObj.tab,
+								disabled: true,
+							},
+					  }
+					: tabObj
+			);
+
+			await render(
+				<ControlledTabs
+					tabs={ TABS_WITH_ALPHA_DISABLED }
+					selectedTabId={ null }
+				/>
+			);
+
+			await press.Tab();
+			expect(
+				await screen.findByRole( 'tab', { name: 'Beta' } )
+			).toHaveFocus();
+
+			await press.ArrowRight();
+			expect(
+				await screen.findByRole( 'tab', { name: 'Gamma' } )
+			).toHaveFocus();
+
+			await press.Tab();
+			await press.ShiftTab();
+			expect(
+				await screen.findByRole( 'tab', { name: 'Gamma' } )
+			).toHaveFocus();
+		} );
 	} );
 
 	describe( 'Tab Attributes', () => {
 		it( "should apply the tab's `className` to the tab button", async () => {
-			render( <UncontrolledTabs tabs={ TABS } /> );
+			await render( <UncontrolledTabs tabs={ TABS } /> );
 
 			expect(
 				await screen.findByRole( 'tab', { name: 'Alpha' } )
@@ -258,10 +296,9 @@ describe( 'Tabs', () => {
 
 	describe( 'Tab Activation', () => {
 		it( 'defaults to automatic tab activation (pointer clicks)', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
-			render(
+			await render(
 				<UncontrolledTabs tabs={ TABS } onSelect={ mockOnSelect } />
 			);
 
@@ -273,7 +310,7 @@ describe( 'Tabs', () => {
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
 			// Click on Beta, make sure beta is the selected tab
-			await user.click( screen.getByRole( 'tab', { name: 'Beta' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Beta' } ) );
 
 			expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			expect(
@@ -282,7 +319,7 @@ describe( 'Tabs', () => {
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'beta' );
 
 			// Click on Alpha, make sure beta is the selected tab
-			await user.click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
 
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect(
@@ -292,10 +329,9 @@ describe( 'Tabs', () => {
 		} );
 
 		it( 'defaults to automatic tab activation (arrow keys)', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
-			render(
+			await render(
 				<UncontrolledTabs tabs={ TABS } onSelect={ mockOnSelect } />
 			);
 
@@ -307,12 +343,12 @@ describe( 'Tabs', () => {
 			// Tab to focus the tablist. Make sure alpha is focused.
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).not.toHaveFocus();
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( await getSelectedTab() ).toHaveFocus();
 
 			// Navigate forward with arrow keys and make sure the Beta tab is
 			// selected automatically.
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
@@ -320,7 +356,7 @@ describe( 'Tabs', () => {
 
 			// Navigate backwards with arrow keys. Make sure alpha is
 			// selected automatically.
-			await user.keyboard( '[ArrowLeft]' );
+			await press.ArrowLeft();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
@@ -328,10 +364,9 @@ describe( 'Tabs', () => {
 		} );
 
 		it( 'wraps around the last/first tab when using arrow keys', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
-			render(
+			await render(
 				<UncontrolledTabs tabs={ TABS } onSelect={ mockOnSelect } />
 			);
 
@@ -341,12 +376,12 @@ describe( 'Tabs', () => {
 			// Tab to focus the tablist. Make sure Alpha is focused.
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).not.toHaveFocus();
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( await getSelectedTab() ).toHaveFocus();
 
 			// Navigate backwards with arrow keys and make sure that the Gamma tab
 			// (the last tab) is selected automatically.
-			await user.keyboard( '[ArrowLeft]' );
+			await press.ArrowLeft();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
@@ -354,7 +389,7 @@ describe( 'Tabs', () => {
 
 			// Navigate forward with arrow keys. Make sure alpha (the first tab) is
 			// selected automatically.
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
@@ -362,10 +397,9 @@ describe( 'Tabs', () => {
 		} );
 
 		it( 'should not move tab selection when pressing the up/down arrow keys, unless the orientation is changed to `vertical`', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
-			const { rerender } = render(
+			const { rerender } = await render(
 				<UncontrolledTabs tabs={ TABS } onSelect={ mockOnSelect } />
 			);
 
@@ -377,18 +411,18 @@ describe( 'Tabs', () => {
 			// Tab to focus the tablist. Make sure alpha is focused.
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).not.toHaveFocus();
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( await getSelectedTab() ).toHaveFocus();
 
 			// Press the arrow up key, nothing happens.
-			await user.keyboard( '[ArrowUp]' );
+			await press.ArrowUp();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
 			// Press the arrow down key, nothing happens
-			await user.keyboard( '[ArrowDown]' );
+			await press.ArrowDown();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
@@ -396,7 +430,7 @@ describe( 'Tabs', () => {
 
 			// Change orientation to `vertical`. When the orientation is vertical,
 			// left/right arrow keys are replaced by up/down arrow keys.
-			rerender(
+			await rerender(
 				<UncontrolledTabs
 					tabs={ TABS }
 					onSelect={ mockOnSelect }
@@ -415,7 +449,7 @@ describe( 'Tabs', () => {
 
 			// Navigate forward with arrow keys and make sure the Beta tab is
 			// selected automatically.
-			await user.keyboard( '[ArrowDown]' );
+			await press.ArrowDown();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
@@ -423,7 +457,7 @@ describe( 'Tabs', () => {
 
 			// Navigate backwards with arrow keys. Make sure alpha is
 			// selected automatically.
-			await user.keyboard( '[ArrowUp]' );
+			await press.ArrowUp();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
@@ -431,7 +465,7 @@ describe( 'Tabs', () => {
 
 			// Navigate backwards with arrow keys. Make sure alpha is
 			// selected automatically.
-			await user.keyboard( '[ArrowUp]' );
+			await press.ArrowUp();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 4 );
@@ -439,7 +473,7 @@ describe( 'Tabs', () => {
 
 			// Navigate backwards with arrow keys. Make sure alpha is
 			// selected automatically.
-			await user.keyboard( '[ArrowDown]' );
+			await press.ArrowDown();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 5 );
@@ -447,11 +481,10 @@ describe( 'Tabs', () => {
 		} );
 
 		it( 'should move focus on a tab even if disabled with arrow key, but not with pointer clicks', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
 			const TABS_WITH_DELTA_DISABLED = TABS_WITH_DELTA.map( ( tabObj ) =>
-				tabObj.id === 'delta'
+				tabObj.tabId === 'delta'
 					? {
 							...tabObj,
 							tab: {
@@ -462,7 +495,7 @@ describe( 'Tabs', () => {
 					: tabObj
 			);
 
-			render(
+			await render(
 				<UncontrolledTabs
 					tabs={ TABS_WITH_DELTA_DISABLED }
 					onSelect={ mockOnSelect }
@@ -477,7 +510,7 @@ describe( 'Tabs', () => {
 			// Tab to focus the tablist. Make sure Alpha is focused.
 			expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 			expect( await getSelectedTab() ).not.toHaveFocus();
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect( await getSelectedTab() ).toHaveFocus();
 			// Confirm onSelect has not been re-called
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
@@ -487,7 +520,9 @@ describe( 'Tabs', () => {
 			//   it was the tab that was last selected before delta. Therefore, the
 			//   `mockOnSelect` function gets called only twice (and not three times)
 			// - it will receive focus, when using arrow keys
-			await user.keyboard( '[ArrowRight][ArrowRight][ArrowRight]' );
+			await press.ArrowRight();
+			await press.ArrowRight();
+			await press.ArrowRight();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect(
 				screen.getByRole( 'tab', { name: 'Delta' } )
@@ -498,7 +533,7 @@ describe( 'Tabs', () => {
 			// Navigate backwards with arrow keys. The gamma tab receives focus.
 			// The `mockOnSelect` callback doesn't fire, since the gamma tab was
 			// already selected.
-			await user.keyboard( '[ArrowLeft]' );
+			await press.ArrowLeft();
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
@@ -506,37 +541,26 @@ describe( 'Tabs', () => {
 			// Click on the disabled tab. Compared to using arrow keys to move the
 			// focus, disabled tabs ignore pointer clicks — and therefore, they don't
 			// receive focus, nor they cause the `mockOnSelect` function to fire.
-			await user.click( screen.getByRole( 'tab', { name: 'Delta' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Delta' } ) );
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			expect( await getSelectedTab() ).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
 		} );
 
 		it( 'should not focus the next tab when the Tab key is pressed', async () => {
-			const user = userEvent.setup();
-
-			render( <UncontrolledTabs tabs={ TABS } /> );
+			await render( <UncontrolledTabs tabs={ TABS } /> );
 
 			// Tab should initially focus the first tab in the tablist, which
 			// is Alpha.
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect(
 				await screen.findByRole( 'tab', { name: 'Alpha' } )
 			).toHaveFocus();
 
-			// This assertion ensures the component has had time to fully
-			// render, preventing flakiness.
-			// see https://github.com/WordPress/gutenberg/pull/55950
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'tab', { name: 'Beta' } )
-				).toHaveAttribute( 'tabindex', '-1' )
-			);
-
 			// Because all other tabs should have `tabindex=-1`, pressing Tab
 			// should NOT move the focus to the next tab, which is Beta.
 			// Instead, focus should go to the currently selected tabpanel (alpha).
-			await user.keyboard( '[Tab]' );
+			await press.Tab();
 			expect(
 				await screen.findByRole( 'tabpanel', {
 					name: 'Alpha',
@@ -545,10 +569,9 @@ describe( 'Tabs', () => {
 		} );
 
 		it( 'switches to manual tab activation when the `selectOnMove` prop is set to `false`', async () => {
-			const user = userEvent.setup();
 			const mockOnSelect = jest.fn();
 
-			render(
+			await render(
 				<UncontrolledTabs
 					tabs={ TABS }
 					onSelect={ mockOnSelect }
@@ -563,7 +586,7 @@ describe( 'Tabs', () => {
 
 			// Click on Alpha and make sure it is selected.
 			// onSelect shouldn't fire since the selected tab didn't change.
-			await user.click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
+			await click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
 			expect(
 				await screen.findByRole( 'tab', { name: 'Alpha' } )
 			).toHaveFocus();
@@ -574,13 +597,13 @@ describe( 'Tabs', () => {
 			// that the tab selection happens only when pressing the spacebar
 			// or enter key. onSelect shouldn't fire since the selected tab
 			// didn't change.
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect(
 				await screen.findByRole( 'tab', { name: 'Beta' } )
 			).toHaveFocus();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 
-			await user.keyboard( '[Enter]' );
+			await press.Enter();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 2 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'beta' );
 
@@ -588,7 +611,7 @@ describe( 'Tabs', () => {
 			// focused, but that tab selection happens only when pressing the
 			// spacebar or enter key. onSelect shouldn't fire since the selected
 			// tab didn't change.
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect(
 				await screen.findByRole( 'tab', { name: 'Gamma' } )
 			).toHaveFocus();
@@ -597,15 +620,15 @@ describe( 'Tabs', () => {
 				screen.getByRole( 'tab', { name: 'Gamma' } )
 			).toHaveFocus();
 
-			await user.keyboard( '[Space]' );
+			await press.Space();
 			expect( mockOnSelect ).toHaveBeenCalledTimes( 3 );
 			expect( mockOnSelect ).toHaveBeenLastCalledWith( 'gamma' );
 		} );
 	} );
 	describe( 'Uncontrolled mode', () => {
-		describe( 'Without `initialTabId` prop', () => {
+		describe( 'Without `defaultTabId` prop', () => {
 			it( 'should render first tab', async () => {
-				render( <UncontrolledTabs tabs={ TABS } /> );
+				await render( <UncontrolledTabs tabs={ TABS } /> );
 
 				expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 				expect(
@@ -613,17 +636,17 @@ describe( 'Tabs', () => {
 				).toBeInTheDocument();
 			} );
 			it( 'should fall back to first enabled tab if the active tab is removed', async () => {
-				const { rerender } = render(
+				const { rerender } = await render(
 					<UncontrolledTabs tabs={ TABS } />
 				);
 
 				// Remove first item from `TABS` array
-				rerender( <UncontrolledTabs tabs={ TABS.slice( 1 ) } /> );
+				await rerender( <UncontrolledTabs tabs={ TABS.slice( 1 ) } /> );
 				expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			} );
 			it( 'should not load any tab if the active tab is removed and there are no enabled tabs', async () => {
 				const TABS_WITH_BETA_GAMMA_DISABLED = TABS.map( ( tabObj ) =>
-					tabObj.id !== 'alpha'
+					tabObj.tabId !== 'alpha'
 						? {
 								...tabObj,
 								tab: {
@@ -634,13 +657,13 @@ describe( 'Tabs', () => {
 						: tabObj
 				);
 
-				const { rerender } = render(
+				const { rerender } = await render(
 					<UncontrolledTabs tabs={ TABS_WITH_BETA_GAMMA_DISABLED } />
 				);
 				expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 
 				// Remove alpha
-				rerender(
+				await rerender(
 					<UncontrolledTabs
 						tabs={ TABS_WITH_BETA_GAMMA_DISABLED.slice( 1 ) }
 					/>
@@ -660,20 +683,20 @@ describe( 'Tabs', () => {
 			} );
 		} );
 
-		describe( 'With `initialTabId`', () => {
-			it( 'should render the tab set by `initialTabId` prop', async () => {
-				render(
-					<UncontrolledTabs tabs={ TABS } initialTabId="beta" />
+		describe( 'With `defaultTabId`', () => {
+			it( 'should render the tab set by `defaultTabId` prop', async () => {
+				await render(
+					<UncontrolledTabs tabs={ TABS } defaultTabId="beta" />
 				);
 
 				expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			} );
 
-			it( 'should not select a tab when `initialTabId` does not match any known tab', () => {
-				render(
+			it( 'should not select a tab when `defaultTabId` does not match any known tab', async () => {
+				await render(
 					<UncontrolledTabs
 						tabs={ TABS }
-						initialTabId="does-not-exist"
+						defaultTabId="does-not-exist"
 					/>
 				);
 
@@ -687,42 +710,39 @@ describe( 'Tabs', () => {
 					screen.queryByRole( 'tabpanel' )
 				).not.toBeInTheDocument();
 			} );
-			it( 'should not change tabs when initialTabId is changed', async () => {
-				const { rerender } = render(
-					<UncontrolledTabs tabs={ TABS } initialTabId="beta" />
+			it( 'should not change tabs when defaultTabId is changed', async () => {
+				const { rerender } = await render(
+					<UncontrolledTabs tabs={ TABS } defaultTabId="beta" />
 				);
 
-				rerender(
-					<UncontrolledTabs tabs={ TABS } initialTabId="alpha" />
+				await rerender(
+					<UncontrolledTabs tabs={ TABS } defaultTabId="alpha" />
 				);
 
 				expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			} );
 
-			it( 'should fall back to the tab associated to `initialTabId` if the currently active tab is removed', async () => {
-				const user = userEvent.setup();
+			it( 'should fall back to the tab associated to `defaultTabId` if the currently active tab is removed', async () => {
 				const mockOnSelect = jest.fn();
 
-				const { rerender } = render(
+				const { rerender } = await render(
 					<UncontrolledTabs
 						tabs={ TABS }
-						initialTabId="gamma"
+						defaultTabId="gamma"
 						onSelect={ mockOnSelect }
 					/>
 				);
 
 				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 
-				await user.click(
-					screen.getByRole( 'tab', { name: 'Alpha' } )
-				);
+				await click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
 				expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 				expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
-				rerender(
+				await rerender(
 					<UncontrolledTabs
 						tabs={ TABS.slice( 1 ) }
-						initialTabId="gamma"
+						defaultTabId="gamma"
 						onSelect={ mockOnSelect }
 					/>
 				);
@@ -730,28 +750,25 @@ describe( 'Tabs', () => {
 				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			} );
 
-			it( 'should fall back to the tab associated to `initialTabId` if the currently active tab becomes disabled', async () => {
-				const user = userEvent.setup();
+			it( 'should fall back to the tab associated to `defaultTabId` if the currently active tab becomes disabled', async () => {
 				const mockOnSelect = jest.fn();
 
-				const { rerender } = render(
+				const { rerender } = await render(
 					<UncontrolledTabs
 						tabs={ TABS }
-						initialTabId="gamma"
+						defaultTabId="gamma"
 						onSelect={ mockOnSelect }
 					/>
 				);
 
 				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 
-				await user.click(
-					screen.getByRole( 'tab', { name: 'Alpha' } )
-				);
+				await click( screen.getByRole( 'tab', { name: 'Alpha' } ) );
 				expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
 				expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
 				const TABS_WITH_ALPHA_DISABLED = TABS.map( ( tabObj ) =>
-					tabObj.id === 'alpha'
+					tabObj.tabId === 'alpha'
 						? {
 								...tabObj,
 								tab: {
@@ -762,10 +779,10 @@ describe( 'Tabs', () => {
 						: tabObj
 				);
 
-				rerender(
+				await rerender(
 					<UncontrolledTabs
 						tabs={ TABS_WITH_ALPHA_DISABLED }
-						initialTabId="gamma"
+						defaultTabId="gamma"
 						onSelect={ mockOnSelect }
 					/>
 				);
@@ -773,18 +790,18 @@ describe( 'Tabs', () => {
 				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 			} );
 
-			it( 'should have no active tabs when the tab associated to `initialTabId` is removed while being the active tab', async () => {
-				const { rerender } = render(
-					<UncontrolledTabs tabs={ TABS } initialTabId="gamma" />
+			it( 'should have no active tabs when the tab associated to `defaultTabId` is removed while being the active tab', async () => {
+				const { rerender } = await render(
+					<UncontrolledTabs tabs={ TABS } defaultTabId="gamma" />
 				);
 
 				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 
 				// Remove gamma
-				rerender(
+				await rerender(
 					<UncontrolledTabs
 						tabs={ TABS.slice( 0, 2 ) }
-						initialTabId="gamma"
+						defaultTabId="gamma"
 					/>
 				);
 
@@ -799,9 +816,9 @@ describe( 'Tabs', () => {
 				).not.toBeInTheDocument();
 			} );
 
-			it( 'waits for the tab with the `initialTabId` to be present in the `tabs` array before selecting it', async () => {
-				const { rerender } = render(
-					<UncontrolledTabs tabs={ TABS } initialTabId="delta" />
+			it( 'waits for the tab with the `defaultTabId` to be present in the `tabs` array before selecting it', async () => {
+				const { rerender } = await render(
+					<UncontrolledTabs tabs={ TABS } defaultTabId="delta" />
 				);
 
 				// There should be no selected tab yet.
@@ -809,10 +826,10 @@ describe( 'Tabs', () => {
 					screen.queryByRole( 'tab', { selected: true } )
 				).not.toBeInTheDocument();
 
-				rerender(
+				await rerender(
 					<UncontrolledTabs
 						tabs={ TABS_WITH_DELTA }
-						initialTabId="delta"
+						defaultTabId="delta"
 					/>
 				);
 
@@ -822,12 +839,11 @@ describe( 'Tabs', () => {
 
 		describe( 'Disabled tab', () => {
 			it( 'should disable the tab when `disabled` is `true`', async () => {
-				const user = userEvent.setup();
 				const mockOnSelect = jest.fn();
 
 				const TABS_WITH_DELTA_DISABLED = TABS_WITH_DELTA.map(
 					( tabObj ) =>
-						tabObj.id === 'delta'
+						tabObj.tabId === 'delta'
 							? {
 									...tabObj,
 									tab: {
@@ -838,7 +854,7 @@ describe( 'Tabs', () => {
 							: tabObj
 				);
 
-				render(
+				await render(
 					<UncontrolledTabs
 						tabs={ TABS_WITH_DELTA_DISABLED }
 						onSelect={ mockOnSelect }
@@ -853,20 +869,15 @@ describe( 'Tabs', () => {
 				expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 				expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
+				// Move focus to the tablist, make sure alpha is focused.
+				await press.Tab();
+				expect(
+					screen.getByRole( 'tab', { name: 'Alpha' } )
+				).toHaveFocus();
+
 				// onSelect should not be called since the disabled tab is
 				// highlighted, but not selected.
-				await user.keyboard( '[Tab]' );
-
-				// This assertion ensures focus has time to move to the first
-				// tab before the test proceeds, preventing flakiness.
-				// see https://github.com/WordPress/gutenberg/pull/55950
-				await waitFor( () =>
-					expect(
-						screen.getByRole( 'tab', { name: 'Alpha' } )
-					).toHaveFocus()
-				);
-
-				await user.keyboard( '[ArrowLeft]' );
+				await press.ArrowLeft();
 				expect( mockOnSelect ).toHaveBeenCalledTimes( 1 );
 
 				// Delta (which is disabled) has focus
@@ -880,7 +891,7 @@ describe( 'Tabs', () => {
 
 			it( 'should select first enabled tab when the initial tab is disabled', async () => {
 				const TABS_WITH_ALPHA_DISABLED = TABS.map( ( tabObj ) =>
-					tabObj.id === 'alpha'
+					tabObj.tabId === 'alpha'
 						? {
 								...tabObj,
 								tab: {
@@ -891,7 +902,7 @@ describe( 'Tabs', () => {
 						: tabObj
 				);
 
-				const { rerender } = render(
+				const { rerender } = await render(
 					<UncontrolledTabs tabs={ TABS_WITH_ALPHA_DISABLED } />
 				);
 
@@ -900,16 +911,16 @@ describe( 'Tabs', () => {
 				expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 
 				// Re-enable all tabs
-				rerender( <UncontrolledTabs tabs={ TABS } /> );
+				await rerender( <UncontrolledTabs tabs={ TABS } /> );
 
 				// Even if the initial tab becomes enabled again, the selected
 				// tab doesn't change.
 				expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			} );
 
-			it( 'should select first enabled tab when the tab associated to `initialTabId` is disabled', async () => {
+			it( 'should select first enabled tab when the tab associated to `defaultTabId` is disabled', async () => {
 				const TABS_ONLY_GAMMA_ENABLED = TABS.map( ( tabObj ) =>
-					tabObj.id !== 'gamma'
+					tabObj.tabId !== 'gamma'
 						? {
 								...tabObj,
 								tab: {
@@ -919,10 +930,10 @@ describe( 'Tabs', () => {
 						  }
 						: tabObj
 				);
-				const { rerender } = render(
+				const { rerender } = await render(
 					<UncontrolledTabs
 						tabs={ TABS_ONLY_GAMMA_ENABLED }
-						initialTabId="beta"
+						defaultTabId="beta"
 					/>
 				);
 
@@ -931,8 +942,8 @@ describe( 'Tabs', () => {
 				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 
 				// Re-enable all tabs
-				rerender(
-					<UncontrolledTabs tabs={ TABS } initialTabId="beta" />
+				await rerender(
+					<UncontrolledTabs tabs={ TABS } defaultTabId="beta" />
 				);
 
 				// Even if the initial tab becomes enabled again, the selected tab doesn't
@@ -942,7 +953,7 @@ describe( 'Tabs', () => {
 
 			it( 'should select the first enabled tab when the selected tab becomes disabled', async () => {
 				const mockOnSelect = jest.fn();
-				const { rerender } = render(
+				const { rerender } = await render(
 					<UncontrolledTabs tabs={ TABS } onSelect={ mockOnSelect } />
 				);
 
@@ -951,7 +962,7 @@ describe( 'Tabs', () => {
 				expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
 				const TABS_WITH_ALPHA_DISABLED = TABS.map( ( tabObj ) =>
-					tabObj.id === 'alpha'
+					tabObj.tabId === 'alpha'
 						? {
 								...tabObj,
 								tab: {
@@ -963,7 +974,7 @@ describe( 'Tabs', () => {
 				);
 
 				// Disable alpha
-				rerender(
+				await rerender(
 					<UncontrolledTabs
 						tabs={ TABS_WITH_ALPHA_DISABLED }
 						onSelect={ mockOnSelect }
@@ -975,7 +986,7 @@ describe( 'Tabs', () => {
 				expect( mockOnSelect ).toHaveBeenLastCalledWith( 'beta' );
 
 				// Re-enable all tabs
-				rerender(
+				await rerender(
 					<UncontrolledTabs tabs={ TABS } onSelect={ mockOnSelect } />
 				);
 
@@ -984,21 +995,21 @@ describe( 'Tabs', () => {
 				expect( mockOnSelect ).toHaveBeenLastCalledWith( 'beta' );
 			} );
 
-			it( 'should select the first enabled tab when the tab associated to `initialTabId` becomes disabled while being the active tab', async () => {
+			it( 'should select the first enabled tab when the tab associated to `defaultTabId` becomes disabled while being the active tab', async () => {
 				const mockOnSelect = jest.fn();
 
-				const { rerender } = render(
+				const { rerender } = await render(
 					<UncontrolledTabs
 						tabs={ TABS }
 						onSelect={ mockOnSelect }
-						initialTabId="gamma"
+						defaultTabId="gamma"
 					/>
 				);
 
 				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 
 				const TABS_WITH_GAMMA_DISABLED = TABS.map( ( tabObj ) =>
-					tabObj.id === 'gamma'
+					tabObj.tabId === 'gamma'
 						? {
 								...tabObj,
 								tab: {
@@ -1010,11 +1021,11 @@ describe( 'Tabs', () => {
 				);
 
 				// Disable gamma
-				rerender(
+				await rerender(
 					<UncontrolledTabs
 						tabs={ TABS_WITH_GAMMA_DISABLED }
 						onSelect={ mockOnSelect }
-						initialTabId="gamma"
+						defaultTabId="gamma"
 					/>
 				);
 
@@ -1023,11 +1034,11 @@ describe( 'Tabs', () => {
 				expect( mockOnSelect ).toHaveBeenLastCalledWith( 'alpha' );
 
 				// Re-enable all tabs
-				rerender(
+				await rerender(
 					<UncontrolledTabs
 						tabs={ TABS }
 						onSelect={ mockOnSelect }
-						initialTabId="gamma"
+						defaultTabId="gamma"
 					/>
 				);
 
@@ -1041,52 +1052,50 @@ describe( 'Tabs', () => {
 
 	describe( 'Controlled mode', () => {
 		it( 'should render the tab specified by the `selectedTabId` prop', async () => {
-			render( <ControlledTabs tabs={ TABS } selectedTabId="beta" /> );
+			await render(
+				<ControlledTabs tabs={ TABS } selectedTabId="beta" />
+			);
 
 			expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 			expect(
 				await screen.findByRole( 'tabpanel', { name: 'Beta' } )
 			).toBeInTheDocument();
 		} );
-		it( 'should render the specified `selectedTabId`, and ignore the `initialTabId` prop', async () => {
-			render(
+		it( 'should render the specified `selectedTabId`, and ignore the `defaultTabId` prop', async () => {
+			await render(
 				<ControlledTabs
 					tabs={ TABS }
 					selectedTabId="gamma"
-					initialTabId="beta"
+					defaultTabId="beta"
 				/>
 			);
 
 			expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
 		} );
 		it( 'should not render any tab if `selectedTabId` does not match any known tab', async () => {
-			render(
+			await render(
 				<ControlledTabs
 					tabs={ TABS_WITH_DELTA }
 					selectedTabId="does-not-exist"
 				/>
 			);
 
-			// No tab should be selected i.e. it doesn't fall back to first tab.
-			// `waitFor` is needed here to prevent testing library from
-			// throwing a 'not wrapped in `act()`' error.
-			await waitFor( () =>
-				expect(
-					screen.queryByRole( 'tab', { selected: true } )
-				).not.toBeInTheDocument()
-			);
+			expect(
+				screen.queryByRole( 'tab', { selected: true } )
+			).not.toBeInTheDocument();
+
 			// No tabpanel should be rendered either
 			expect( screen.queryByRole( 'tabpanel' ) ).not.toBeInTheDocument();
 		} );
 		it( 'should not render any tab if the active tab is removed', async () => {
-			const { rerender } = render(
+			const { rerender } = await render(
 				<ControlledTabs tabs={ TABS } selectedTabId="beta" />
 			);
 
 			// Remove beta
-			rerender(
+			await rerender(
 				<ControlledTabs
-					tabs={ TABS.filter( ( tab ) => tab.id !== 'beta' ) }
+					tabs={ TABS.filter( ( tab ) => tab.tabId !== 'beta' ) }
 					selectedTabId="beta"
 				/>
 			);
@@ -1105,7 +1114,9 @@ describe( 'Tabs', () => {
 			expect( screen.queryByRole( 'tabpanel' ) ).not.toBeInTheDocument();
 
 			// Restore beta
-			rerender( <ControlledTabs tabs={ TABS } selectedTabId="beta" /> );
+			await rerender(
+				<ControlledTabs tabs={ TABS } selectedTabId="beta" />
+			);
 
 			// No tab should be selected i.e. it doesn't reselect the previously
 			// removed tab.
@@ -1120,7 +1131,7 @@ describe( 'Tabs', () => {
 			it( 'should not render any tab if `selectedTabId` refers to a disabled tab', async () => {
 				const TABS_WITH_DELTA_WITH_BETA_DISABLED = TABS_WITH_DELTA.map(
 					( tabObj ) =>
-						tabObj.id === 'beta'
+						tabObj.tabId === 'beta'
 							? {
 									...tabObj,
 									tab: {
@@ -1131,7 +1142,7 @@ describe( 'Tabs', () => {
 							: tabObj
 				);
 
-				render(
+				await render(
 					<ControlledTabs
 						tabs={ TABS_WITH_DELTA_WITH_BETA_DISABLED }
 						selectedTabId="beta"
@@ -1150,14 +1161,14 @@ describe( 'Tabs', () => {
 				).not.toBeInTheDocument();
 			} );
 			it( 'should not render any tab when the selected tab becomes disabled', async () => {
-				const { rerender } = render(
+				const { rerender } = await render(
 					<ControlledTabs tabs={ TABS } selectedTabId="beta" />
 				);
 
 				expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
 
 				const TABS_WITH_BETA_DISABLED = TABS.map( ( tabObj ) =>
-					tabObj.id === 'beta'
+					tabObj.tabId === 'beta'
 						? {
 								...tabObj,
 								tab: {
@@ -1168,7 +1179,7 @@ describe( 'Tabs', () => {
 						: tabObj
 				);
 
-				rerender(
+				await rerender(
 					<ControlledTabs
 						tabs={ TABS_WITH_BETA_DISABLED }
 						selectedTabId="beta"
@@ -1188,7 +1199,7 @@ describe( 'Tabs', () => {
 				).not.toBeInTheDocument();
 
 				// re-enable all tabs
-				rerender(
+				await rerender(
 					<ControlledTabs tabs={ TABS } selectedTabId="beta" />
 				);
 
@@ -1203,5 +1214,234 @@ describe( 'Tabs', () => {
 				).not.toBeInTheDocument();
 			} );
 		} );
+		describe( 'When `selectedId` is changed by the controlling component', () => {
+			describe.each( [ true, false ] )(
+				'and `selectOnMove` is %s',
+				( selectOnMove ) => {
+					it( 'should continue to handle arrow key navigation properly', async () => {
+						const { rerender } = await render(
+							<ControlledTabs
+								tabs={ TABS }
+								selectedTabId="beta"
+								selectOnMove={ selectOnMove }
+							/>
+						);
+
+						// Tab key should focus the currently selected tab, which is Beta.
+						await press.Tab();
+						await waitFor( async () =>
+							expect( await getSelectedTab() ).toHaveTextContent(
+								'Beta'
+							)
+						);
+						expect( await getSelectedTab() ).toHaveFocus();
+
+						await rerender(
+							<ControlledTabs
+								tabs={ TABS }
+								selectedTabId="gamma"
+								selectOnMove={ selectOnMove }
+							/>
+						);
+
+						// When the selected tab is changed, it should not automatically receive focus.
+
+						expect( await getSelectedTab() ).toHaveTextContent(
+							'Gamma'
+						);
+
+						expect(
+							screen.getByRole( 'tab', { name: 'Beta' } )
+						).toHaveFocus();
+
+						// Arrow keys should move focus to the next tab, which is Gamma
+						await press.ArrowRight();
+						expect(
+							screen.getByRole( 'tab', { name: 'Gamma' } )
+						).toHaveFocus();
+					} );
+
+					it( 'should focus the correct tab when tabbing out and back into the tablist', async () => {
+						const { rerender } = await render(
+							<>
+								<button>Focus me</button>
+								<ControlledTabs
+									tabs={ TABS }
+									selectedTabId="beta"
+									selectOnMove={ selectOnMove }
+								/>
+							</>
+						);
+
+						// Tab key should focus the currently selected tab, which is Beta.
+						await press.Tab();
+						await press.Tab();
+						expect( await getSelectedTab() ).toHaveTextContent(
+							'Beta'
+						);
+						expect( await getSelectedTab() ).toHaveFocus();
+
+						await rerender(
+							<>
+								<button>Focus me</button>
+								<ControlledTabs
+									tabs={ TABS }
+									selectedTabId="gamma"
+									selectOnMove={ selectOnMove }
+								/>
+							</>
+						);
+
+						// When the selected tab is changed, it should not automatically receive focus.
+
+						expect( await getSelectedTab() ).toHaveTextContent(
+							'Gamma'
+						);
+
+						expect(
+							screen.getByRole( 'tab', { name: 'Beta' } )
+						).toHaveFocus();
+
+						// Press shift+tab, move focus to the button before Tabs
+						await press.ShiftTab();
+						expect(
+							screen.getByRole( 'button', { name: 'Focus me' } )
+						).toHaveFocus();
+
+						// Press tab, move focus back to the tablist
+						await press.Tab();
+
+						const betaTab = screen.getByRole( 'tab', {
+							name: 'Beta',
+						} );
+						const gammaTab = screen.getByRole( 'tab', {
+							name: 'Gamma',
+						} );
+
+						expect(
+							selectOnMove ? gammaTab : betaTab
+						).toHaveFocus();
+					} );
+				}
+			);
+		} );
+
+		describe( 'When `selectOnMove` is `true`', () => {
+			it( 'should automatically select a newly focused tab', async () => {
+				await render(
+					<ControlledTabs tabs={ TABS } selectedTabId="beta" />
+				);
+
+				await press.Tab();
+
+				// Tab key should focus the currently selected tab, which is Beta.
+				expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
+				expect( await getSelectedTab() ).toHaveFocus();
+
+				// Arrow keys should select and move focus to the next tab.
+				await press.ArrowRight();
+				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
+				expect( await getSelectedTab() ).toHaveFocus();
+			} );
+		} );
+		describe( 'When `selectOnMove` is `false`', () => {
+			it( 'should apply focus without automatically changing the selected tab', async () => {
+				await render(
+					<ControlledTabs
+						tabs={ TABS }
+						selectedTabId="beta"
+						selectOnMove={ false }
+					/>
+				);
+
+				expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
+
+				// Tab key should focus the currently selected tab, which is Beta.
+				await press.Tab();
+				await waitFor( async () =>
+					expect(
+						await screen.findByRole( 'tab', { name: 'Beta' } )
+					).toHaveFocus()
+				);
+
+				// Arrow key should move focus but not automatically change the selected tab.
+				await press.ArrowRight();
+				expect(
+					screen.getByRole( 'tab', { name: 'Gamma' } )
+				).toHaveFocus();
+				expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
+
+				// Pressing the spacebar should select the focused tab.
+				await press.Space();
+				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
+
+				// Arrow key should move focus but not automatically change the selected tab.
+				await press.ArrowRight();
+				expect(
+					screen.getByRole( 'tab', { name: 'Alpha' } )
+				).toHaveFocus();
+				expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
+
+				// Pressing the enter/return should select the focused tab.
+				await press.Enter();
+				expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
+			} );
+		} );
+	} );
+	it( 'should associate each `Tab` with the correct `TabPanel`, even if they are not rendered in the same order', async () => {
+		const TABS_WITH_DELTA_REVERSED = [ ...TABS_WITH_DELTA ].reverse();
+
+		await render(
+			<Tabs>
+				<Tabs.TabList>
+					{ TABS_WITH_DELTA.map( ( tabObj ) => (
+						<Tabs.Tab
+							key={ tabObj.tabId }
+							tabId={ tabObj.tabId }
+							className={ tabObj.tab.className }
+							disabled={ tabObj.tab.disabled }
+						>
+							{ tabObj.title }
+						</Tabs.Tab>
+					) ) }
+				</Tabs.TabList>
+				{ TABS_WITH_DELTA_REVERSED.map( ( tabObj ) => (
+					<Tabs.TabPanel
+						key={ tabObj.tabId }
+						tabId={ tabObj.tabId }
+						focusable={ tabObj.tabpanel?.focusable }
+					>
+						{ tabObj.content }
+					</Tabs.TabPanel>
+				) ) }
+			</Tabs>
+		);
+
+		// Alpha is the initially selected tab,and should render the correct tabpanel
+		expect( await getSelectedTab() ).toHaveTextContent( 'Alpha' );
+		expect( screen.getByRole( 'tabpanel' ) ).toHaveTextContent(
+			'Selected tab: Alpha'
+		);
+
+		// Select Beta, make sure the correct tabpanel is rendered
+		await click( screen.getByRole( 'tab', { name: 'Beta' } ) );
+		expect( await getSelectedTab() ).toHaveTextContent( 'Beta' );
+		expect( screen.getByRole( 'tabpanel' ) ).toHaveTextContent(
+			'Selected tab: Beta'
+		);
+
+		// Select Gamma, make sure the correct tabpanel is rendered
+		await click( screen.getByRole( 'tab', { name: 'Gamma' } ) );
+		expect( await getSelectedTab() ).toHaveTextContent( 'Gamma' );
+		expect( screen.getByRole( 'tabpanel' ) ).toHaveTextContent(
+			'Selected tab: Gamma'
+		);
+
+		// Select Delta, make sure the correct tabpanel is rendered
+		await click( screen.getByRole( 'tab', { name: 'Delta' } ) );
+		expect( await getSelectedTab() ).toHaveTextContent( 'Delta' );
+		expect( screen.getByRole( 'tabpanel' ) ).toHaveTextContent(
+			'Selected tab: Delta'
+		);
 	} );
 } );
diff --git a/packages/components/src/tabs/types.ts b/packages/components/src/tabs/types.ts
index 8b071937410919..959a82509a05d6 100644
--- a/packages/components/src/tabs/types.ts
+++ b/packages/components/src/tabs/types.ts
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import type * as Ariakit from '@ariakit/react';
 
 export type TabsContextProps =
@@ -19,93 +18,138 @@ export type TabsContextProps =
 
 export type TabsProps = {
 	/**
-	 * The children elements, which should be at least a
-	 * `Tabs.Tablist` component and a series of `Tabs.TabPanel`
-	 * components.
+	 * The children elements, which should include one instance of the
+	 * `Tabs.Tablist` component and as many instances of the `Tabs.TabPanel`
+	 * components as there are `Tabs.Tab` components.
 	 */
-	children: React.ReactNode;
+	children: Ariakit.TabProps[ 'children' ];
 	/**
-	 * When `true`, the tab will be selected when receiving focus (automatic tab
-	 * activation). When `false`, the tab will be selected only when clicked
-	 * (manual tab activation). See the official W3C docs for more info.
+	 * Determines if the tab should be selected when it receives focus. If set to
+	 * `false`, the tab will only be selected upon clicking, not when using arrow
+	 * keys to shift focus (manual tab activation). See the official W3C docs
+	 * for more info.
 	 *
 	 * @default true
 	 *
 	 * @see https://www.w3.org/WAI/ARIA/apg/patterns/tabpanel/
 	 */
-	selectOnMove?: boolean;
+	selectOnMove?: Ariakit.TabStoreProps[ 'selectOnMove' ];
 	/**
-	 * The id of the tab to be selected upon mounting of component.
-	 * If this prop is not set, the first tab will be selected by default.
-	 * The id provided will be internally prefixed with the
-	 * `TabsContextProps.instanceId`.
+	 * The id of the tab whose panel is currently visible.
+	 *
+	 * If left `undefined`, it will be automatically set to the first enabled
+	 * tab, and the component assumes it is being used in "uncontrolled" mode.
+	 *
+	 * Consequently, any value different than `undefined` will set the component
+	 * in "controlled" mode. When in "controlled" mode, the `null` value will
+	 * result in no tabs being selected, and the tablist becoming tabbable.
+	 */
+	selectedTabId?: Ariakit.TabStoreProps[ 'selectedId' ];
+	/**
+	 * The id of the tab whose panel is currently visible.
+	 *
+	 * If left `undefined`, it will be automatically set to the first enabled
+	 * tab. If set to `null`, no tab will be selected, and the tablist will be
+	 * tabbable.
 	 *
 	 * Note: this prop will be overridden by the `selectedTabId` prop if it is
-	 * provided. (Controlled Mode)
+	 * provided (meaning the component will be used in "controlled" mode).
 	 */
-	initialTabId?: string;
+	defaultTabId?: Ariakit.TabStoreProps[ 'defaultSelectedId' ];
 	/**
-	 * The function called when a tab has been selected.
-	 * It is passed the id of the newly selected tab as an argument.
+	 * The function called when the `selectedTabId` changes.
 	 */
-	onSelect?: ( selectedId: string | null | undefined ) => void;
-
+	onSelect?: Ariakit.TabStoreProps[ 'setSelectedId' ];
 	/**
-	 * The orientation of the tablist.
+	 * The current active tab `id`. The active tab is the tab element within the
+	 * tablist widget that has DOM focus.
+	 * - `null` represents the tablist (ie. the base composite element). Users
+	 *   will be able to navigate out of it using arrow keys.
+	 * - If `activeTabId` is initially set to `null`, the base composite element
+	 *   itself will have focus and users will be able to navigate to it using
+	 *   arrow keys.activeTabId
+	 */
+	activeTabId?: Ariakit.TabStoreProps[ 'activeId' ];
+	/**
+	 * The tab id that should be active by default when the composite widget is
+	 * rendered. If `null`, the tablist element itself will have focus
+	 * and users will be able to navigate to it using arrow keys. If `undefined`,
+	 * the first enabled item will be focused.
 	 *
-	 * @default `horizontal`
+	 * Note: this prop will be overridden by the `activeTabId` prop if it is
+	 * provided.
+	 */
+	defaultActiveTabId?: Ariakit.TabStoreProps[ 'defaultActiveId' ];
+	/**
+	 * A callback that gets called when the `activeTabId` state changes.
 	 */
-	orientation?: 'horizontal' | 'vertical';
+	onActiveTabIdChange?: Ariakit.TabStoreProps[ 'setActiveId' ];
 	/**
-	 * The Id of the tab to display. This id is prepended with the `Tabs`
-	 * instanceId internally.
+	 * Defines the orientation of the tablist and determines which arrow keys
+	 * can be used to move focus:
+	 * - `both`: all arrow keys work.
+	 * - `horizontal`: only left and right arrow keys work.
+	 * - `vertical`: only up and down arrow keys work.
 	 *
-	 * If left `undefined`, the component assumes it is being used in
-	 * uncontrolled mode. Consequently, any value different than `undefined`
-	 * will set the component in `controlled` mode.
-	 * When in controlled mode, the `null` value will result in no tab being selected.
+	 * @default "horizontal"
 	 */
-	selectedTabId?: string | null;
+	orientation?: Ariakit.TabStoreProps[ 'orientation' ];
 };
 
 export type TabListProps = {
 	/**
-	 * The children elements, which should be a series of `Tabs.TabPanel` components.
+	 * The children elements, which should include one or more instances of the
+	 * `Tabs.Tab` component.
 	 */
-	children?: React.ReactNode;
+	children: Ariakit.TabListProps[ 'children' ];
 };
 
+// TODO: consider prop name changes (tabId, selectedTabId)
+// switch to auto-generated README
+// compound technique
+
 export type TabProps = {
 	/**
-	 * The id of the tab, which is prepended with the `Tabs` instanceId.
+	 * The unique ID of the tab. It will be used to register the tab and match
+	 * it to a corresponding `Tabs.TabPanel` component.
 	 */
-	id: string;
+	tabId: NonNullable< Ariakit.TabProps[ 'id' ] >;
 	/**
-	 * The children elements, generally the text to display on the tab.
+	 * The contents of the tab.
 	 */
-	children?: React.ReactNode;
+	children?: Ariakit.TabProps[ 'children' ];
 	/**
-	 * Determines if the tab button should be disabled.
+	 * Determines if the tab should be disabled. Note that disabled tabs can
+	 * still be accessed via the keyboard when navigating through the tablist.
 	 *
 	 * @default false
 	 */
-	disabled?: boolean;
+	disabled?: Ariakit.TabProps[ 'disabled' ];
 	/**
-	 * The type of component to render the tab button as. If this prop is not
-	 * provided, the tab button will be rendered as a `button` element.
+	 * Allows the component to be rendered as a different HTML element or React
+	 * component. The value can be a React element or a function that takes in the
+	 * original component props and gives back a React element with the props
+	 * merged.
+	 *
+	 * By default, the tab will be rendered as a `button` element.
 	 */
-	render?: React.ReactElement;
+	render?: Ariakit.TabProps[ 'render' ];
 };
 
 export type TabPanelProps = {
 	/**
-	 * The children elements, generally the content to display on the tabpanel.
+	 * The contents of the tab panel.
 	 */
-	children?: React.ReactNode;
+	children?: Ariakit.TabPanelProps[ 'children' ];
 	/**
-	 * A unique identifier for the tabpanel, which is used to generate a unique `id` for the underlying element.
+	 * The unique `id` of the `Tabs.Tab` component controlling this panel. This
+	 * connection is used to assign the `aria-labelledby` attribute to the tab
+	 * panel and to determine if the tab panel should be visible.
+	 *
+	 * If not provided, this link is automatically established by matching the
+	 * order of `Tabs.Tab` and `Tabs.TabPanel` elements in the DOM.
 	 */
-	id: string;
+	tabId: NonNullable< Ariakit.TabPanelProps[ 'tabId' ] >;
 	/**
 	 * Determines whether or not the tabpanel element should be focusable.
 	 * If `false`, pressing the tab key will skip over the tabpanel, and instead
@@ -113,5 +157,5 @@ export type TabPanelProps = {
 	 *
 	 * @default true
 	 */
-	focusable?: boolean;
+	focusable?: Ariakit.TabPanelProps[ 'focusable' ];
 };
diff --git a/packages/components/src/tabs/use-track-overflow.ts b/packages/components/src/tabs/use-track-overflow.ts
new file mode 100644
index 00000000000000..5f6504e6875212
--- /dev/null
+++ b/packages/components/src/tabs/use-track-overflow.ts
@@ -0,0 +1,76 @@
+/* eslint-disable jsdoc/require-param */
+/**
+ * WordPress dependencies
+ */
+import { useState, useEffect } from '@wordpress/element';
+import { useEvent } from '@wordpress/compose';
+
+/**
+ * Tracks if an element contains overflow and on which end by tracking the
+ * first and last child elements with an `IntersectionObserver` in relation
+ * to the parent element.
+ *
+ * Note that the returned value will only indicate whether the first or last
+ * element is currently "going out of bounds" but not whether it happens on
+ * the X or Y axis.
+ */
+export function useTrackOverflow(
+	parent: HTMLElement | undefined | null,
+	children: {
+		first: HTMLElement | undefined | null;
+		last: HTMLElement | undefined | null;
+	}
+) {
+	const [ first, setFirst ] = useState( false );
+	const [ last, setLast ] = useState( false );
+	const [ observer, setObserver ] = useState< IntersectionObserver >();
+
+	const callback: IntersectionObserverCallback = useEvent( ( entries ) => {
+		for ( const entry of entries ) {
+			if ( entry.target === children.first ) {
+				setFirst( ! entry.isIntersecting );
+			}
+			if ( entry.target === children.last ) {
+				setLast( ! entry.isIntersecting );
+			}
+		}
+	} );
+
+	useEffect( () => {
+		if ( ! parent || ! window.IntersectionObserver ) {
+			return;
+		}
+		const newObserver = new IntersectionObserver( callback, {
+			root: parent,
+			threshold: 0.9,
+		} );
+		setObserver( newObserver );
+
+		return () => newObserver.disconnect();
+	}, [ callback, parent ] );
+
+	useEffect( () => {
+		if ( ! observer ) {
+			return;
+		}
+
+		if ( children.first ) {
+			observer.observe( children.first );
+		}
+		if ( children.last ) {
+			observer.observe( children.last );
+		}
+
+		return () => {
+			if ( children.first ) {
+				observer.unobserve( children.first );
+			}
+			if ( children.last ) {
+				observer.unobserve( children.last );
+			}
+		};
+	}, [ children.first, children.last, observer ] );
+
+	return { first, last };
+}
+/* eslint-enable jsdoc/require-param */
diff --git a/packages/components/src/text-control/README.md b/packages/components/src/text-control/README.md
index 6dfdb9ab6545da..0b6e2d4ebc684e 100644
--- a/packages/components/src/text-control/README.md
+++ b/packages/components/src/text-control/README.md
@@ -4,12 +4,6 @@ TextControl components let users enter and edit text.
 
 ![Unfilled and filled TextControl components](https://make.wordpress.org/design/files/2019/03/TextControl.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
@@ -68,6 +62,7 @@ const MyTextControl = () => {
 
 	return (
 		<TextControl
+			__nextHasNoMarginBottom
 			label="Additional CSS Class"
 			value={ className }
 			onChange={ ( value ) => setClassName( value ) }
@@ -132,6 +127,14 @@ A function that receives the value of the input.
 -   Type: `function`
 -   Required: Yes
 
+#### __next40pxDefaultSize
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
+
 ## Related components
 
 -   To offer users more constrained options for input, use SelectControl, RadioControl, CheckboxControl, or RangeControl.
diff --git a/packages/components/src/text-control/index.tsx b/packages/components/src/text-control/index.tsx
index 30298357c3c01d..ea2d2c17bb9cf6 100644
--- a/packages/components/src/text-control/index.tsx
+++ b/packages/components/src/text-control/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import type { ChangeEvent, ForwardedRef } from 'react';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -41,6 +41,7 @@ function UnforwardedTextControl(
 	return (
 		<BaseControl
 			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+			__associatedWPComponentName="TextControl"
 			label={ label }
 			hideLabelFromVision={ hideLabelFromVision }
 			id={ id }
@@ -48,7 +49,7 @@ function UnforwardedTextControl(
 			className={ className }
 		>
 			<input
-				className={ classnames( 'components-text-control__input', {
+				className={ clsx( 'components-text-control__input', {
 					'is-next-40px-default-size': __next40pxDefaultSize,
 				} ) }
 				type={ type }
@@ -75,6 +76,7 @@ function UnforwardedTextControl(
  *
  *   return (
  *     <TextControl
+ *       __nextHasNoMarginBottom
  *       label="Additional CSS Class"
  *       value={ className }
  *       onChange={ ( value ) => setClassName( value ) }
diff --git a/packages/components/src/text-control/stories/index.story.tsx b/packages/components/src/text-control/stories/index.story.tsx
index ddc8af7a9f2b3a..bebdb2caf75f63 100644
--- a/packages/components/src/text-control/stories/index.story.tsx
+++ b/packages/components/src/text-control/stories/index.story.tsx
@@ -52,7 +52,9 @@ const DefaultTemplate: StoryFn< typeof TextControl > = ( {
 export const Default: StoryFn< typeof TextControl > = DefaultTemplate.bind(
 	{}
 );
-Default.args = {};
+Default.args = {
+	__nextHasNoMarginBottom: true,
+};
 
 export const WithLabelAndHelpText: StoryFn< typeof TextControl > =
 	DefaultTemplate.bind( {} );
diff --git a/packages/components/src/text-control/style.scss b/packages/components/src/text-control/style.scss
index e9f5a79fbe490c..5ae2a90b827736 100644
--- a/packages/components/src/text-control/style.scss
+++ b/packages/components/src/text-control/style.scss
@@ -14,9 +14,17 @@
 .components-text-control__input[type="number"] {
 	width: 100%;
 	height: $grid-unit-40;
+	// Override input style margin in WP forms.css.
+	margin: 0;
 	@include input-control;
 
 	&.is-next-40px-default-size {
 		height: $grid-unit-50;
+
+		// Subtract 1px to account for the border, which isn't included on the element
+		// on newer components like InputControl, SelectControl, etc.
+		// These values should be shared with the `controlPaddingX` in ./utils/config-values.js
+		padding-left: $grid-unit-15;
+		padding-right: $grid-unit-15;
 	}
 }
diff --git a/packages/components/src/text-control/test/text-control.tsx b/packages/components/src/text-control/test/text-control.tsx
index fc048b93992f08..19b17cae443614 100644
--- a/packages/components/src/text-control/test/text-control.tsx
+++ b/packages/components/src/text-control/test/text-control.tsx
@@ -6,7 +6,11 @@ import { render, screen } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import TextControl from '..';
+import _TextControl from '..';
+
+const TextControl = ( props: React.ComponentProps< typeof _TextControl > ) => {
+	return <_TextControl { ...props } __nextHasNoMarginBottom />;
+};
 
 const noop = () => {};
 
diff --git a/packages/components/src/text-control/types.ts b/packages/components/src/text-control/types.ts
index 1324da625e2c59..0b2d2016614007 100644
--- a/packages/components/src/text-control/types.ts
+++ b/packages/components/src/text-control/types.ts
@@ -24,7 +24,18 @@ export type TextControlProps = Pick<
 	 *
 	 * @default 'text'
 	 */
-	type?: 'email' | 'number' | 'password' | 'tel' | 'text' | 'search' | 'url';
+	type?:
+		| 'date'
+		| 'datetime-local'
+		| 'email'
+		| 'number'
+		| 'password'
+		| 'tel'
+		| 'text'
+		| 'time'
+		| 'search'
+		| 'url';
+
 	/**
 	 * Start opting into the larger default height that will become the default size in a future version.
 	 *
diff --git a/packages/components/src/text/get-line-height.ts b/packages/components/src/text/get-line-height.ts
index 906bd0eabfab9d..345391ba334ffb 100644
--- a/packages/components/src/text/get-line-height.ts
+++ b/packages/components/src/text/get-line-height.ts
@@ -14,9 +14,13 @@ export function getLineHeight(
 	adjustLineHeightForInnerControls: Props[ 'adjustLineHeightForInnerControls' ],
 	lineHeight: CSSProperties[ 'lineHeight' ]
 ) {
-	if ( lineHeight ) return lineHeight;
+	if ( lineHeight ) {
+		return lineHeight;
+	}
 
-	if ( ! adjustLineHeightForInnerControls ) return;
+	if ( ! adjustLineHeightForInnerControls ) {
+		return;
+	}
 
 	let value = `calc(${ CONFIG.controlHeight } + ${ space( 2 ) })`;
 
diff --git a/packages/components/src/text/styles.ts b/packages/components/src/text/styles.ts
index ed821923db9ffc..e777ed4f0941de 100644
--- a/packages/components/src/text/styles.ts
+++ b/packages/components/src/text/styles.ts
@@ -12,6 +12,8 @@ export const Text = css`
 	color: ${ COLORS.gray[ 900 ] };
 	line-height: ${ CONFIG.fontLineHeightBase };
 	margin: 0;
+	text-wrap: balance; /* Fallback for Safari. */
+	text-wrap: pretty;
 `;
 
 export const block = css`
@@ -33,7 +35,7 @@ export const muted = css`
 export const highlighterText = css`
 	mark {
 		background: ${ COLORS.alert.yellow };
-		border-radius: 2px;
+		border-radius: ${ CONFIG.radiusSmall };
 		box-shadow:
 			0 0 0 1px rgba( 0, 0, 0, 0.05 ) inset,
 			0 -1px 0 rgba( 0, 0, 0, 0.1 ) inset;
diff --git a/packages/components/src/text/test/__snapshots__/index.tsx.snap b/packages/components/src/text/test/__snapshots__/index.tsx.snap
index f63684c25d8695..1b98c0853ac549 100644
--- a/packages/components/src/text/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/text/test/__snapshots__/index.tsx.snap
@@ -5,13 +5,14 @@ Snapshot Diff:
 - Received styles
 + Base styles
 
-@@ -3,7 +3,8 @@
+@@ -3,8 +3,9 @@
       "color": "#1e1e1e",
       "font-size": "calc((13 / 13) * 13px)",
       "font-weight": "normal",
-      "line-height": "1.2",
+      "line-height": "1.4",
       "margin": "0",
 +     "text-align": "center",
+      "text-wrap": "pretty",
     },
   ]
 `;
@@ -19,8 +20,10 @@ Snapshot Diff:
 exports[`Text should render highlighted words with highlightCaseSensitive 1`] = `
 .emotion-0 {
   color: #1e1e1e;
-  line-height: 1.2;
+  line-height: 1.4;
   margin: 0;
+  text-wrap: balance;
+  text-wrap: pretty;
   font-size: calc((13 / 13) * 13px);
   font-weight: normal;
 }
@@ -50,8 +53,10 @@ exports[`Text should render highlighted words with highlightCaseSensitive 1`] =
 exports[`Text snapshot tests should render correctly 1`] = `
 .emotion-0 {
   color: #1e1e1e;
-  line-height: 1.2;
+  line-height: 1.4;
   margin: 0;
+  text-wrap: balance;
+  text-wrap: pretty;
   font-size: calc((13 / 13) * 13px);
   font-weight: normal;
 }
diff --git a/packages/components/src/text/utils.ts b/packages/components/src/text/utils.ts
index 85e41a56c6e349..bcf7bff9c36ab7 100644
--- a/packages/components/src/text/utils.ts
+++ b/packages/components/src/text/utils.ts
@@ -99,8 +99,12 @@ export function createHighlighterText( {
 	unhighlightClassName = '',
 	unhighlightStyle,
 }: Options ) {
-	if ( ! children ) return null;
-	if ( typeof children !== 'string' ) return children;
+	if ( ! children ) {
+		return null;
+	}
+	if ( typeof children !== 'string' ) {
+		return children;
+	}
 
 	const textToHighlight = children;
 
diff --git a/packages/components/src/textarea-control/README.md b/packages/components/src/textarea-control/README.md
index 2b9a5a1f70e7e7..c812f6c308ea46 100644
--- a/packages/components/src/textarea-control/README.md
+++ b/packages/components/src/textarea-control/README.md
@@ -4,12 +4,6 @@ TextareaControls are TextControls that allow for multiple lines of text, and wra
 
 ![An empty TextareaControl, and a focused TextareaControl with some content entered.](https://wordpress.org/gutenberg/files/2019/01/TextareaControl.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
@@ -85,6 +79,7 @@ const MyTextareaControl = () => {
 
 	return (
 		<TextareaControl
+		  __nextHasNoMarginBottom
 			label="Text"
 			help="Enter some text"
 			value={ text }
@@ -137,6 +132,13 @@ The current value of the textarea.
 
 -   Required: Yes
 
+#### `__nextHasNoMarginBottom`: `Boolean`
+
+Start opting into the new margin-free styles that will become the default in a future version.
+
+-   Required: No
+-   Default: `false`
+
 ## Related components
 
 -   For a field where users only enter one line of text, use the `TextControl` component.
diff --git a/packages/components/src/textarea-control/index.tsx b/packages/components/src/textarea-control/index.tsx
index 7c0b0e92762fa6..e7528510667b75 100644
--- a/packages/components/src/textarea-control/index.tsx
+++ b/packages/components/src/textarea-control/index.tsx
@@ -35,6 +35,7 @@ function UnforwardedTextareaControl(
 	return (
 		<BaseControl
 			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+			__associatedWPComponentName="TextareaControl"
 			label={ label }
 			hideLabelFromVision={ hideLabelFromVision }
 			id={ id }
@@ -69,6 +70,7 @@ function UnforwardedTextareaControl(
  *
  *   return (
  *     <TextareaControl
+ *       __nextHasNoMarginBottom
  *       label="Text"
  *       help="Enter some text"
  *       value={ text }
diff --git a/packages/components/src/textarea-control/stories/index.story.tsx b/packages/components/src/textarea-control/stories/index.story.tsx
index e227519a069383..a8e5dc036248db 100644
--- a/packages/components/src/textarea-control/stories/index.story.tsx
+++ b/packages/components/src/textarea-control/stories/index.story.tsx
@@ -51,6 +51,8 @@ const Template: StoryFn< typeof TextareaControl > = ( {
 
 export const Default: StoryFn< typeof TextareaControl > = Template.bind( {} );
 Default.args = {
+	__nextHasNoMarginBottom: true,
 	label: 'Text',
 	help: 'Enter some text',
+	placeholder: 'Placeholder',
 };
diff --git a/packages/components/src/textarea-control/styles/textarea-control-styles.ts b/packages/components/src/textarea-control/styles/textarea-control-styles.ts
index 046e17816eff24..022ce3560ea3a5 100644
--- a/packages/components/src/textarea-control/styles/textarea-control-styles.ts
+++ b/packages/components/src/textarea-control/styles/textarea-control-styles.ts
@@ -2,13 +2,86 @@
  * External dependencies
  */
 import styled from '@emotion/styled';
+import { css } from '@emotion/react';
 
 /**
  * Internal dependencies
  */
-import { inputControl } from '../../utils/input';
+import { font } from '../../utils/font';
+import { COLORS } from '../../utils/colors-values';
+import { CONFIG } from '../../utils';
+import { breakpoint } from '../../utils/breakpoint';
+
+const inputStyleNeutral = css`
+	box-shadow: 0 0 0 transparent;
+	border-radius: ${ CONFIG.radiusSmall };
+	border: ${ CONFIG.borderWidth } solid ${ COLORS.ui.border };
+
+	@media not ( prefers-reduced-motion ) {
+		transition: box-shadow 0.1s linear;
+	}
+`;
+
+const inputStyleFocus = css`
+	border-color: ${ COLORS.theme.accent };
+	box-shadow: 0 0 0
+		calc( ${ CONFIG.borderWidthFocus } - ${ CONFIG.borderWidth } )
+		${ COLORS.theme.accent };
+
+	// Windows High Contrast mode will show this outline, but not the box-shadow.
+	outline: 2px solid transparent;
+`;
 
 export const StyledTextarea = styled.textarea`
 	width: 100%;
-	${ inputControl }
+	display: block;
+	font-family: ${ font( 'default.fontFamily' ) };
+	line-height: 20px;
+
+	// Vertical padding is to match the standard 40px control height when rows=1,
+	// in conjunction with the 20px line-height.
+	// "Standard" metrics are 10px 12px, but subtracts 1px each to account for the border width.
+	padding: 9px 11px;
+
+	${ inputStyleNeutral };
+
+	/* Fonts smaller than 16px causes mobile safari to zoom. */
+	font-size: ${ font( 'mobileTextMinFontSize' ) };
+
+	${ breakpoint( 'small' ) } {
+		font-size: ${ font( 'default.fontSize' ) };
+	}
+
+	&:focus {
+		${ inputStyleFocus }
+	}
+
+	// Use opacity to work in various editor styles.
+	&::-webkit-input-placeholder {
+		color: ${ COLORS.ui.darkGrayPlaceholder };
+	}
+
+	&::-moz-placeholder {
+		opacity: 1; // Necessary because Firefox reduces this from 1.
+		color: ${ COLORS.ui.darkGrayPlaceholder };
+	}
+
+	&:-ms-input-placeholder {
+		color: ${ COLORS.ui.darkGrayPlaceholder };
+	}
+
+	.is-dark-theme & {
+		&::-webkit-input-placeholder {
+			color: ${ COLORS.ui.lightGrayPlaceholder };
+		}
+
+		&::-moz-placeholder {
+			opacity: 1; // Necessary because Firefox reduces this from 1.
+			color: ${ COLORS.ui.lightGrayPlaceholder };
+		}
+
+		&:-ms-input-placeholder {
+			color: ${ COLORS.ui.lightGrayPlaceholder };
+		}
+	}
 `;
diff --git a/packages/components/src/theme/color-algorithms.ts b/packages/components/src/theme/color-algorithms.ts
index b2f69e1db21284..bed8353c16b8b4 100644
--- a/packages/components/src/theme/color-algorithms.ts
+++ b/packages/components/src/theme/color-algorithms.ts
@@ -76,7 +76,9 @@ function warnContrastIssues( issues: ReturnType< typeof checkContrasts > ) {
 }
 
 function generateAccentDependentColors( accent?: string ) {
-	if ( ! accent ) return {};
+	if ( ! accent ) {
+		return {};
+	}
 
 	return {
 		accent,
@@ -87,7 +89,9 @@ function generateAccentDependentColors( accent?: string ) {
 }
 
 function generateBackgroundDependentColors( background?: string ) {
-	if ( ! background ) return {};
+	if ( ! background ) {
+		return {};
+	}
 
 	const foreground = getForegroundForColor( background );
 
diff --git a/packages/components/src/theme/stories/index.story.tsx b/packages/components/src/theme/stories/index.story.tsx
index 3d52dea7fba57b..67eec72533ff3f 100644
--- a/packages/components/src/theme/stories/index.story.tsx
+++ b/packages/components/src/theme/stories/index.story.tsx
@@ -13,11 +13,13 @@ import { HStack } from '../../h-stack';
 
 const meta: Meta< typeof Theme > = {
 	component: Theme,
-	title: 'Components (Experimental)/Theme',
+	title: 'Components/Utilities/Theme',
+	id: 'components-theme',
 	argTypes: {
 		accent: { control: { type: 'color' } },
 		background: { control: { type: 'color' } },
 	},
+	tags: [ 'status-private' ],
 	parameters: {
 		controls: { expanded: true },
 		docs: { canvas: { sourceState: 'shown' } },
@@ -58,9 +60,11 @@ export const ColorScheme: StoryFn< typeof Theme > = ( {
 } ) => {
 	const { colors } = generateThemeVariables( { accent, background } );
 	const { gray, ...otherColors } = colors;
+	/* eslint-disable @typescript-eslint/no-unused-vars */
 	const contrastIssues = Object.entries(
 		checkContrasts( { accent, background }, colors )
 	).filter( ( [ _, error ] ) => !! error );
+	/* eslint-enable @typescript-eslint/no-unused-vars */
 
 	const Chip = ( { color, name }: { color: string; name: string } ) => (
 		<HStack justify="flex-start">
diff --git a/packages/components/src/theme/styles.ts b/packages/components/src/theme/styles.ts
index 650852d3461757..948c2d586649fb 100644
--- a/packages/components/src/theme/styles.ts
+++ b/packages/components/src/theme/styles.ts
@@ -30,4 +30,6 @@ export const colorVariables = ( { colors }: ThemeOutputValues ) => {
 	];
 };
 
-export const Wrapper = styled.div``;
+export const Wrapper = styled.div`
+	color: var( --wp-components-color-foreground, currentColor );
+`;
diff --git a/packages/components/src/toggle-control/README.md b/packages/components/src/toggle-control/README.md
index 3a77ef6942d2e5..cf480360265ed4 100644
--- a/packages/components/src/toggle-control/README.md
+++ b/packages/components/src/toggle-control/README.md
@@ -15,6 +15,7 @@ const MyToggleControl = () => {
 
 	return (
 		<ToggleControl
+			__nextHasNoMarginBottom
 			label="Fixed Background"
 			help={
 				hasFixedBackground
@@ -78,3 +79,11 @@ The class that will be added with `components-base-control` and `components-togg
 
 -		Type: `String`
 -		Required: No
+
+### `__nextHasNoMarginBottom`
+
+Start opting into the new margin-free styles that will become the default in a future version.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
diff --git a/packages/components/src/toggle-control/index.tsx b/packages/components/src/toggle-control/index.tsx
index c991953d53e4bf..d2ee234a9695f8 100644
--- a/packages/components/src/toggle-control/index.tsx
+++ b/packages/components/src/toggle-control/index.tsx
@@ -1,13 +1,16 @@
 /**
  * External dependencies
  */
-import type { ChangeEvent } from 'react';
+import type { ChangeEvent, ForwardedRef } from 'react';
 import { css } from '@emotion/react';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
+import { forwardRef } from '@wordpress/element';
 import { useInstanceId } from '@wordpress/compose';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -21,35 +24,18 @@ import { HStack } from '../h-stack';
 import { useCx } from '../utils';
 import { space } from '../utils/space';
 
-/**
- * ToggleControl is used to generate a toggle user interface.
- *
- * ```jsx
- * import { ToggleControl } from '@wordpress/components';
- * import { useState } from '@wordpress/element';
- *
- * const MyToggleControl = () => {
- *   const [ value, setValue ] = useState( false );
- *
- *   return (
- *     <ToggleControl
- *       label="Fixed Background"
- *       checked={ value }
- *       onChange={ () => setValue( ( state ) => ! state ) }
- *     />
- *   );
- * };
- * ```
- */
-export function ToggleControl( {
-	__nextHasNoMarginBottom,
-	label,
-	checked,
-	help,
-	className,
-	onChange,
-	disabled,
-}: WordPressComponentProps< ToggleControlProps, 'input', false > ) {
+function UnforwardedToggleControl(
+	{
+		__nextHasNoMarginBottom,
+		label,
+		checked,
+		help,
+		className,
+		onChange,
+		disabled,
+	}: WordPressComponentProps< ToggleControlProps, 'input', false >,
+	ref: ForwardedRef< HTMLInputElement >
+) {
 	function onChangeToggle( event: ChangeEvent< HTMLInputElement > ) {
 		onChange( event.target.checked );
 	}
@@ -63,6 +49,14 @@ export function ToggleControl( {
 		! __nextHasNoMarginBottom && css( { marginBottom: space( 3 ) } )
 	);
 
+	if ( ! __nextHasNoMarginBottom ) {
+		deprecated( 'Bottom margin styles for wp.components.ToggleControl', {
+			since: '6.7',
+			version: '7.0',
+			hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version.',
+		} );
+	}
+
 	let describedBy, helpLabel;
 	if ( help ) {
 		if ( typeof help === 'function' ) {
@@ -83,22 +77,31 @@ export function ToggleControl( {
 	return (
 		<BaseControl
 			id={ id }
-			help={ helpLabel }
+			help={
+				helpLabel && (
+					<span className="components-toggle-control__help">
+						{ helpLabel }
+					</span>
+				)
+			}
 			className={ classes }
 			__nextHasNoMarginBottom
 		>
-			<HStack justify="flex-start" spacing={ 3 }>
+			<HStack justify="flex-start" spacing={ 2 }>
 				<FormToggle
 					id={ id }
 					checked={ checked }
 					onChange={ onChangeToggle }
 					aria-describedby={ describedBy }
 					disabled={ disabled }
+					ref={ ref }
 				/>
 				<FlexBlock
 					as="label"
 					htmlFor={ id }
-					className="components-toggle-control__label"
+					className={ clsx( 'components-toggle-control__label', {
+						'is-disabled': disabled,
+					} ) }
 				>
 					{ label }
 				</FlexBlock>
@@ -107,4 +110,27 @@ export function ToggleControl( {
 	);
 }
 
+/**
+ * ToggleControl is used to generate a toggle user interface.
+ *
+ * ```jsx
+ * import { ToggleControl } from '@wordpress/components';
+ * import { useState } from '@wordpress/element';
+ *
+ * const MyToggleControl = () => {
+ *   const [ value, setValue ] = useState( false );
+ *
+ *   return (
+ *     <ToggleControl
+ *       __nextHasNoMarginBottom
+ *       label="Fixed Background"
+ *       checked={ value }
+ *       onChange={ () => setValue( ( state ) => ! state ) }
+ *     />
+ *   );
+ * };
+ * ```
+ */
+export const ToggleControl = forwardRef( UnforwardedToggleControl );
+
 export default ToggleControl;
diff --git a/packages/components/src/toggle-control/stories/index.story.tsx b/packages/components/src/toggle-control/stories/index.story.tsx
index b8043b8f48e523..97723aa207a394 100644
--- a/packages/components/src/toggle-control/stories/index.story.tsx
+++ b/packages/components/src/toggle-control/stories/index.story.tsx
@@ -48,6 +48,7 @@ const Template: StoryFn< typeof ToggleControl > = ( {
 
 export const Default = Template.bind( {} );
 Default.args = {
+	__nextHasNoMarginBottom: true,
 	label: 'Enable something',
 };
 
diff --git a/packages/components/src/toggle-control/style.scss b/packages/components/src/toggle-control/style.scss
new file mode 100644
index 00000000000000..68733b53a9bc94
--- /dev/null
+++ b/packages/components/src/toggle-control/style.scss
@@ -0,0 +1,12 @@
+.components-toggle-control__label {
+	line-height: $toggle-height;
+
+	&:not(.is-disabled) {
+		cursor: pointer;
+	}
+}
+
+.components-toggle-control__help {
+	display: inline-block;
+	margin-inline-start: $toggle-width + $grid-unit-10;
+}
diff --git a/packages/components/src/toggle-control/test/index.tsx b/packages/components/src/toggle-control/test/index.tsx
index cc89031d9affa3..b0eec2aca6663d 100644
--- a/packages/components/src/toggle-control/test/index.tsx
+++ b/packages/components/src/toggle-control/test/index.tsx
@@ -6,7 +6,13 @@ import { render, screen } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import ToggleControl from '..';
+import _ToggleControl from '..';
+
+const ToggleControl = (
+	props: React.ComponentProps< typeof _ToggleControl >
+) => {
+	return <_ToggleControl { ...props } __nextHasNoMarginBottom />;
+};
 
 describe( 'ToggleControl', () => {
 	it( 'should label the toggle', () => {
diff --git a/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap b/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap
index 91cd85dc80e750..832c6d7cb7a8c8 100644
--- a/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap
@@ -13,10 +13,6 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   box-sizing: inherit;
 }
 
-.emotion-2 {
-  margin-bottom: calc(4px * 2);
-}
-
 .components-panel__row .emotion-2 {
   margin-bottom: inherit;
 }
@@ -33,13 +29,13 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   font-weight: 500;
   line-height: 1.4;
   text-transform: uppercase;
-  display: inline-block;
+  display: block;
   margin-bottom: calc(4px * 2);
   padding: 0;
 }
 
 .emotion-8 {
-  background: #fff;
+  background: var(--wp-components-color-background, #fff);
   border: 1px solid transparent;
   border-radius: 2px;
   display: -webkit-inline-box;
@@ -47,13 +43,13 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   display: -ms-inline-flexbox;
   display: inline-flex;
   min-width: 0;
-  padding: 2px;
   position: relative;
   min-height: 36px;
+  padding: 2px;
 }
 
 .emotion-8:hover {
-  border-color: #757575;
+  border-color: var(--wp-components-color-gray-700, #757575);
 }
 
 .emotion-8:focus-within {
@@ -64,6 +60,55 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   outline-offset: -2px;
 }
 
+@media not ( prefers-reduced-motion ) {
+  .emotion-8[data-indicator-animated]::before {
+    transition-property: transform,border-radius;
+    transition-duration: 0.2s;
+    transition-timing-function: ease-out;
+  }
+}
+
+.emotion-8::before {
+  content: '';
+  position: absolute;
+  pointer-events: none;
+  background: #1e1e1e;
+  outline: 2px solid transparent;
+  outline-offset: -3px;
+  --antialiasing-factor: 100;
+  border-radius: calc(
+  				1px /
+  					(
+  						var( --selected-width, 0 ) /
+  							var( --antialiasing-factor )
+  					)
+  			)/1px;
+  left: -1px;
+  width: calc( var( --antialiasing-factor ) * 1px );
+  height: calc( var( --selected-height, 0 ) * 1px );
+  transform-origin: left top;
+  -webkit-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  -moz-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  -ms-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+}
+
 .emotion-10 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -88,7 +133,7 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   appearance: none;
   background: transparent;
   border: none;
-  border-radius: 2px;
+  border-radius: 1px;
   color: #757575;
   fill: currentColor;
   cursor: pointer;
@@ -107,8 +152,6 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   padding: 0 12px;
   position: relative;
   text-align: center;
-  -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
-  transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
@@ -116,15 +159,17 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   width: 100%;
   z-index: 2;
   color: #1e1e1e;
-  width: 30px;
+  height: 30px;
+  aspect-ratio: 1;
   padding-left: 0;
   padding-right: 0;
   color: #fff;
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-12 {
-    transition-duration: 0ms;
+    -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
+    transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   }
 }
 
@@ -132,6 +177,11 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   border: 0;
 }
 
+.emotion-12[disabled] {
+  opacity: 0.4;
+  cursor: default;
+}
+
 .emotion-12:active {
   background: #fff;
 }
@@ -149,17 +199,7 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   line-height: 1;
 }
 
-.emotion-15 {
-  background: #1e1e1e;
-  border-radius: 2px;
-  position: absolute;
-  inset: 0;
-  z-index: 1;
-  outline: 2px solid transparent;
-  outline-offset: -3px;
-}
-
-.emotion-18 {
+.emotion-17 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -170,7 +210,7 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   appearance: none;
   background: transparent;
   border: none;
-  border-radius: 2px;
+  border-radius: 1px;
   color: #757575;
   fill: currentColor;
   cursor: pointer;
@@ -189,8 +229,6 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   padding: 0 12px;
   position: relative;
   text-align: center;
-  -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
-  transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
@@ -198,22 +236,29 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
   width: 100%;
   z-index: 2;
   color: #1e1e1e;
-  width: 30px;
+  height: 30px;
+  aspect-ratio: 1;
   padding-left: 0;
   padding-right: 0;
 }
 
-@media ( prefers-reduced-motion: reduce ) {
-  .emotion-18 {
-    transition-duration: 0ms;
+@media not ( prefers-reduced-motion ) {
+  .emotion-17 {
+    -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
+    transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   }
 }
 
-.emotion-18::-moz-focus-inner {
+.emotion-17::-moz-focus-inner {
   border: 0;
 }
 
-.emotion-18:active {
+.emotion-17[disabled] {
+  opacity: 0.4;
+  cursor: default;
+}
+
+.emotion-17:active {
   background: #fff;
 }
 
@@ -238,7 +283,7 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
         class="components-toggle-group-control emotion-8 emotion-9"
         data-wp-c16t="true"
         data-wp-component="ToggleGroupControl"
-        id="toggle-group-control-as-radio-group-8"
+        id="toggle-group-control-as-radio-group-12"
         role="radiogroup"
       >
         <div
@@ -248,12 +293,11 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
             aria-checked="true"
             aria-label="Uppercase"
             class="emotion-12 components-toggle-group-control-option-base"
-            data-active-item=""
-            data-command=""
+            data-active-item="true"
             data-value="uppercase"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
-            id="toggle-group-control-as-radio-group-8-20"
+            id="toggle-group-control-as-radio-group-12-32"
             role="radio"
             type="button"
             value="uppercase"
@@ -275,11 +319,6 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
               </svg>
             </div>
           </button>
-          <div
-            class="emotion-15"
-            role="presentation"
-            style="opacity: 1;"
-          />
         </div>
         <div
           class="emotion-10 emotion-11"
@@ -287,12 +326,11 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
           <button
             aria-checked="false"
             aria-label="Lowercase"
-            class="emotion-18 components-toggle-group-control-option-base"
-            data-command=""
+            class="emotion-17 components-toggle-group-control-option-base"
             data-value="lowercase"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
-            id="toggle-group-control-as-radio-group-8-21"
+            id="toggle-group-control-as-radio-group-12-33"
             role="radio"
             type="button"
             value="lowercase"
@@ -340,10 +378,6 @@ exports[`ToggleGroupControl controlled should render correctly with text options
   box-sizing: inherit;
 }
 
-.emotion-2 {
-  margin-bottom: calc(4px * 2);
-}
-
 .components-panel__row .emotion-2 {
   margin-bottom: inherit;
 }
@@ -360,13 +394,13 @@ exports[`ToggleGroupControl controlled should render correctly with text options
   font-weight: 500;
   line-height: 1.4;
   text-transform: uppercase;
-  display: inline-block;
+  display: block;
   margin-bottom: calc(4px * 2);
   padding: 0;
 }
 
 .emotion-8 {
-  background: #fff;
+  background: var(--wp-components-color-background, #fff);
   border: 1px solid transparent;
   border-radius: 2px;
   display: -webkit-inline-box;
@@ -374,13 +408,13 @@ exports[`ToggleGroupControl controlled should render correctly with text options
   display: -ms-inline-flexbox;
   display: inline-flex;
   min-width: 0;
-  padding: 2px;
   position: relative;
   min-height: 36px;
+  padding: 2px;
 }
 
 .emotion-8:hover {
-  border-color: #757575;
+  border-color: var(--wp-components-color-gray-700, #757575);
 }
 
 .emotion-8:focus-within {
@@ -391,6 +425,55 @@ exports[`ToggleGroupControl controlled should render correctly with text options
   outline-offset: -2px;
 }
 
+@media not ( prefers-reduced-motion ) {
+  .emotion-8[data-indicator-animated]::before {
+    transition-property: transform,border-radius;
+    transition-duration: 0.2s;
+    transition-timing-function: ease-out;
+  }
+}
+
+.emotion-8::before {
+  content: '';
+  position: absolute;
+  pointer-events: none;
+  background: #1e1e1e;
+  outline: 2px solid transparent;
+  outline-offset: -3px;
+  --antialiasing-factor: 100;
+  border-radius: calc(
+  				1px /
+  					(
+  						var( --selected-width, 0 ) /
+  							var( --antialiasing-factor )
+  					)
+  			)/1px;
+  left: -1px;
+  width: calc( var( --antialiasing-factor ) * 1px );
+  height: calc( var( --selected-height, 0 ) * 1px );
+  transform-origin: left top;
+  -webkit-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  -moz-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  -ms-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+}
+
 .emotion-10 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -415,7 +498,7 @@ exports[`ToggleGroupControl controlled should render correctly with text options
   appearance: none;
   background: transparent;
   border: none;
-  border-radius: 2px;
+  border-radius: 1px;
   color: #757575;
   fill: currentColor;
   cursor: pointer;
@@ -434,8 +517,6 @@ exports[`ToggleGroupControl controlled should render correctly with text options
   padding: 0 12px;
   position: relative;
   text-align: center;
-  -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
-  transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
@@ -444,9 +525,10 @@ exports[`ToggleGroupControl controlled should render correctly with text options
   z-index: 2;
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-12 {
-    transition-duration: 0ms;
+    -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
+    transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   }
 }
 
@@ -454,6 +536,11 @@ exports[`ToggleGroupControl controlled should render correctly with text options
   border: 0;
 }
 
+.emotion-12[disabled] {
+  opacity: 0.4;
+  cursor: default;
+}
+
 .emotion-12:active {
   background: #fff;
 }
@@ -488,7 +575,7 @@ exports[`ToggleGroupControl controlled should render correctly with text options
         class="components-toggle-group-control emotion-8 emotion-9"
         data-wp-c16t="true"
         data-wp-component="ToggleGroupControl"
-        id="toggle-group-control-as-radio-group-7"
+        id="toggle-group-control-as-radio-group-11"
         role="radiogroup"
       >
         <div
@@ -498,11 +585,10 @@ exports[`ToggleGroupControl controlled should render correctly with text options
             aria-checked="false"
             aria-label="R"
             class="emotion-12 components-toggle-group-control-option-base"
-            data-command=""
             data-value="rigas"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
-            id="toggle-group-control-as-radio-group-7-18"
+            id="toggle-group-control-as-radio-group-11-30"
             role="radio"
             type="button"
             value="rigas"
@@ -521,11 +607,10 @@ exports[`ToggleGroupControl controlled should render correctly with text options
             aria-checked="false"
             aria-label="J"
             class="emotion-12 components-toggle-group-control-option-base"
-            data-command=""
             data-value="jack"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
-            id="toggle-group-control-as-radio-group-7-19"
+            id="toggle-group-control-as-radio-group-11-31"
             role="radio"
             type="button"
             value="jack"
@@ -562,10 +647,6 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   box-sizing: inherit;
 }
 
-.emotion-2 {
-  margin-bottom: calc(4px * 2);
-}
-
 .components-panel__row .emotion-2 {
   margin-bottom: inherit;
 }
@@ -582,13 +663,13 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   font-weight: 500;
   line-height: 1.4;
   text-transform: uppercase;
-  display: inline-block;
+  display: block;
   margin-bottom: calc(4px * 2);
   padding: 0;
 }
 
 .emotion-8 {
-  background: #fff;
+  background: var(--wp-components-color-background, #fff);
   border: 1px solid transparent;
   border-radius: 2px;
   display: -webkit-inline-box;
@@ -596,13 +677,13 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   display: -ms-inline-flexbox;
   display: inline-flex;
   min-width: 0;
-  padding: 2px;
   position: relative;
   min-height: 36px;
+  padding: 2px;
 }
 
 .emotion-8:hover {
-  border-color: #757575;
+  border-color: var(--wp-components-color-gray-700, #757575);
 }
 
 .emotion-8:focus-within {
@@ -613,6 +694,55 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   outline-offset: -2px;
 }
 
+@media not ( prefers-reduced-motion ) {
+  .emotion-8[data-indicator-animated]::before {
+    transition-property: transform,border-radius;
+    transition-duration: 0.2s;
+    transition-timing-function: ease-out;
+  }
+}
+
+.emotion-8::before {
+  content: '';
+  position: absolute;
+  pointer-events: none;
+  background: #1e1e1e;
+  outline: 2px solid transparent;
+  outline-offset: -3px;
+  --antialiasing-factor: 100;
+  border-radius: calc(
+  				1px /
+  					(
+  						var( --selected-width, 0 ) /
+  							var( --antialiasing-factor )
+  					)
+  			)/1px;
+  left: -1px;
+  width: calc( var( --antialiasing-factor ) * 1px );
+  height: calc( var( --selected-height, 0 ) * 1px );
+  transform-origin: left top;
+  -webkit-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  -moz-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  -ms-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+}
+
 .emotion-10 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -637,7 +767,7 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   appearance: none;
   background: transparent;
   border: none;
-  border-radius: 2px;
+  border-radius: 1px;
   color: #757575;
   fill: currentColor;
   cursor: pointer;
@@ -656,8 +786,6 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   padding: 0 12px;
   position: relative;
   text-align: center;
-  -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
-  transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
@@ -665,15 +793,17 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   width: 100%;
   z-index: 2;
   color: #1e1e1e;
-  width: 30px;
+  height: 30px;
+  aspect-ratio: 1;
   padding-left: 0;
   padding-right: 0;
   color: #fff;
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-12 {
-    transition-duration: 0ms;
+    -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
+    transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   }
 }
 
@@ -681,6 +811,11 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   border: 0;
 }
 
+.emotion-12[disabled] {
+  opacity: 0.4;
+  cursor: default;
+}
+
 .emotion-12:active {
   background: #fff;
 }
@@ -698,17 +833,7 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   line-height: 1;
 }
 
-.emotion-15 {
-  background: #1e1e1e;
-  border-radius: 2px;
-  position: absolute;
-  inset: 0;
-  z-index: 1;
-  outline: 2px solid transparent;
-  outline-offset: -3px;
-}
-
-.emotion-18 {
+.emotion-17 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -719,7 +844,7 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   appearance: none;
   background: transparent;
   border: none;
-  border-radius: 2px;
+  border-radius: 1px;
   color: #757575;
   fill: currentColor;
   cursor: pointer;
@@ -738,8 +863,6 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   padding: 0 12px;
   position: relative;
   text-align: center;
-  -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
-  transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
@@ -747,22 +870,29 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
   width: 100%;
   z-index: 2;
   color: #1e1e1e;
-  width: 30px;
+  height: 30px;
+  aspect-ratio: 1;
   padding-left: 0;
   padding-right: 0;
 }
 
-@media ( prefers-reduced-motion: reduce ) {
-  .emotion-18 {
-    transition-duration: 0ms;
+@media not ( prefers-reduced-motion ) {
+  .emotion-17 {
+    -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
+    transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   }
 }
 
-.emotion-18::-moz-focus-inner {
+.emotion-17::-moz-focus-inner {
   border: 0;
 }
 
-.emotion-18:active {
+.emotion-17[disabled] {
+  opacity: 0.4;
+  cursor: default;
+}
+
+.emotion-17:active {
   background: #fff;
 }
 
@@ -797,8 +927,7 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
             aria-checked="true"
             aria-label="Uppercase"
             class="emotion-12 components-toggle-group-control-option-base"
-            data-active-item=""
-            data-command=""
+            data-active-item="true"
             data-value="uppercase"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
@@ -824,11 +953,6 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
               </svg>
             </div>
           </button>
-          <div
-            class="emotion-15"
-            role="presentation"
-            style="opacity: 1;"
-          />
         </div>
         <div
           class="emotion-10 emotion-11"
@@ -836,8 +960,7 @@ exports[`ToggleGroupControl uncontrolled should render correctly with icons 1`]
           <button
             aria-checked="false"
             aria-label="Lowercase"
-            class="emotion-18 components-toggle-group-control-option-base"
-            data-command=""
+            class="emotion-17 components-toggle-group-control-option-base"
             data-value="lowercase"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
@@ -883,10 +1006,6 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
   box-sizing: inherit;
 }
 
-.emotion-2 {
-  margin-bottom: calc(4px * 2);
-}
-
 .components-panel__row .emotion-2 {
   margin-bottom: inherit;
 }
@@ -903,13 +1022,13 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
   font-weight: 500;
   line-height: 1.4;
   text-transform: uppercase;
-  display: inline-block;
+  display: block;
   margin-bottom: calc(4px * 2);
   padding: 0;
 }
 
 .emotion-8 {
-  background: #fff;
+  background: var(--wp-components-color-background, #fff);
   border: 1px solid transparent;
   border-radius: 2px;
   display: -webkit-inline-box;
@@ -917,13 +1036,13 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
   display: -ms-inline-flexbox;
   display: inline-flex;
   min-width: 0;
-  padding: 2px;
   position: relative;
   min-height: 36px;
+  padding: 2px;
 }
 
 .emotion-8:hover {
-  border-color: #757575;
+  border-color: var(--wp-components-color-gray-700, #757575);
 }
 
 .emotion-8:focus-within {
@@ -934,6 +1053,55 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
   outline-offset: -2px;
 }
 
+@media not ( prefers-reduced-motion ) {
+  .emotion-8[data-indicator-animated]::before {
+    transition-property: transform,border-radius;
+    transition-duration: 0.2s;
+    transition-timing-function: ease-out;
+  }
+}
+
+.emotion-8::before {
+  content: '';
+  position: absolute;
+  pointer-events: none;
+  background: #1e1e1e;
+  outline: 2px solid transparent;
+  outline-offset: -3px;
+  --antialiasing-factor: 100;
+  border-radius: calc(
+  				1px /
+  					(
+  						var( --selected-width, 0 ) /
+  							var( --antialiasing-factor )
+  					)
+  			)/1px;
+  left: -1px;
+  width: calc( var( --antialiasing-factor ) * 1px );
+  height: calc( var( --selected-height, 0 ) * 1px );
+  transform-origin: left top;
+  -webkit-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  -moz-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  -ms-transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+  transform: translateX( calc( var( --selected-left, 0 ) * 1px ) ) scaleX(
+  				calc(
+  					var( --selected-width, 0 ) / var( --antialiasing-factor )
+  				)
+  			);
+}
+
 .emotion-10 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -958,7 +1126,7 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
   appearance: none;
   background: transparent;
   border: none;
-  border-radius: 2px;
+  border-radius: 1px;
   color: #757575;
   fill: currentColor;
   cursor: pointer;
@@ -977,8 +1145,6 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
   padding: 0 12px;
   position: relative;
   text-align: center;
-  -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
-  transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
@@ -987,9 +1153,10 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
   z-index: 2;
 }
 
-@media ( prefers-reduced-motion: reduce ) {
+@media not ( prefers-reduced-motion ) {
   .emotion-12 {
-    transition-duration: 0ms;
+    -webkit-transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
+    transition: background 160ms linear,color 160ms linear,font-weight 60ms linear;
   }
 }
 
@@ -997,6 +1164,11 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
   border: 0;
 }
 
+.emotion-12[disabled] {
+  opacity: 0.4;
+  cursor: default;
+}
+
 .emotion-12:active {
   background: #fff;
 }
@@ -1041,7 +1213,6 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
             aria-checked="false"
             aria-label="R"
             class="emotion-12 components-toggle-group-control-option-base"
-            data-command=""
             data-value="rigas"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
@@ -1064,7 +1235,6 @@ exports[`ToggleGroupControl uncontrolled should render correctly with text optio
             aria-checked="false"
             aria-label="J"
             class="emotion-12 components-toggle-group-control-option-base"
-            data-command=""
             data-value="jack"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
diff --git a/packages/components/src/toggle-group-control/test/index.tsx b/packages/components/src/toggle-group-control/test/index.tsx
index b54b5764d4e0ff..168e8f498958b5 100644
--- a/packages/components/src/toggle-group-control/test/index.tsx
+++ b/packages/components/src/toggle-group-control/test/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { press, click, hover, sleep } from '@ariakit/test';
 
 /**
  * WordPress dependencies
@@ -15,12 +15,21 @@ import { formatLowercase, formatUppercase } from '@wordpress/icons';
  */
 import Button from '../../button';
 import {
-	ToggleGroupControl,
+	ToggleGroupControl as _ToggleGroupControl,
 	ToggleGroupControlOption,
 	ToggleGroupControlOptionIcon,
 } from '../index';
+import { TOOLTIP_DELAY } from '../../tooltip';
 import type { ToggleGroupControlProps } from '../types';
-import cleanupTooltip from '../../tooltip/test/utils';
+
+const hoverOutside = async () => {
+	await hover( document.body );
+	await hover( document.body, { clientX: 10, clientY: 10 } );
+};
+
+const ToggleGroupControl = ( props: ToggleGroupControlProps ) => {
+	return <_ToggleGroupControl { ...props } __nextHasNoMarginBottom />;
+};
 
 const ControlledToggleGroupControl = ( {
 	value: valueProp,
@@ -66,7 +75,7 @@ const optionsWithTooltip = (
 			value="gnocchi"
 			label="Delicious Gnocchi"
 			aria-label="Click for Delicious Gnocchi"
-			showTooltip={ true }
+			showTooltip
 		/>
 		<ToggleGroupControlOption
 			value="caponata"
@@ -75,6 +84,13 @@ const optionsWithTooltip = (
 		/>
 	</>
 );
+const optionsWithDisabledOption = (
+	<>
+		<ToggleGroupControlOption value="pizza" label="Pizza" />
+		<ToggleGroupControlOption value="rice" label="Rice" disabled />
+		<ToggleGroupControlOption value="pasta" label="Pasta" />
+	</>
+);
 
 describe.each( [
 	[ 'uncontrolled', ToggleGroupControl ],
@@ -112,8 +128,23 @@ describe.each( [
 			expect( container ).toMatchSnapshot();
 		} );
 	} );
+	it( 'should render with the correct option initially selected when `value` is defined', () => {
+		render(
+			<Component value="jack" label="Test Toggle Group Control">
+				{ options }
+			</Component>
+		);
+		expect( screen.getByRole( 'radio', { name: 'R' } ) ).not.toBeChecked();
+		expect( screen.getByRole( 'radio', { name: 'J' } ) ).toBeChecked();
+	} );
+	it( 'should render without a selected option when `value` is `undefined`', () => {
+		render(
+			<Component label="Test Toggle Group Control">{ options }</Component>
+		);
+		expect( screen.getByRole( 'radio', { name: 'R' } ) ).not.toBeChecked();
+		expect( screen.getByRole( 'radio', { name: 'J' } ) ).not.toBeChecked();
+	} );
 	it( 'should call onChange with proper value', async () => {
-		const user = userEvent.setup();
 		const mockOnChange = jest.fn();
 
 		render(
@@ -126,13 +157,51 @@ describe.each( [
 			</Component>
 		);
 
-		await user.click( screen.getByRole( 'radio', { name: 'R' } ) );
+		await click( screen.getByRole( 'radio', { name: 'R' } ) );
 
 		expect( mockOnChange ).toHaveBeenCalledWith( 'rigas' );
 	} );
 
+	it( 'should not set a value on focus', async () => {
+		render(
+			<Component label="Test Toggle Group Control">{ options }</Component>
+		);
+
+		const radio = screen.getByRole( 'radio', { name: 'R' } );
+		expect( radio ).not.toBeChecked();
+
+		await press.Tab();
+		expect( radio ).toHaveFocus();
+		expect( radio ).not.toBeChecked();
+	} );
+
+	if ( mode === 'controlled' ) {
+		it( 'should not set a value on focus, after the value is reset', async () => {
+			render(
+				<Component label="Test Toggle Group Control" value="jack">
+					{ options }
+				</Component>
+			);
+
+			expect( screen.getByRole( 'radio', { name: 'J' } ) ).toBeChecked();
+
+			await click( screen.getByRole( 'button', { name: 'Reset' } ) );
+
+			expect(
+				screen.getByRole( 'radio', { name: 'J' } )
+			).not.toBeChecked();
+
+			await press.ShiftTab();
+			expect(
+				screen.getByRole( 'radio', { name: 'R' } )
+			).not.toBeChecked();
+			expect(
+				screen.getByRole( 'radio', { name: 'J' } )
+			).not.toBeChecked();
+		} );
+	}
+
 	it( 'should render tooltip where `showTooltip` === `true`', async () => {
-		const user = userEvent.setup();
 		render(
 			<Component label="Test Toggle Group Control">
 				{ optionsWithTooltip }
@@ -143,19 +212,26 @@ describe.each( [
 			'Click for Delicious Gnocchi'
 		);
 
-		await user.hover( firstRadio );
+		await hover( firstRadio );
 
-		const tooltip = await screen.findByText(
-			'Click for Delicious Gnocchi'
-		);
+		const tooltip = await screen.findByRole( 'tooltip', {
+			name: 'Click for Delicious Gnocchi',
+		} );
 
 		await waitFor( () => expect( tooltip ).toBeVisible() );
 
-		await cleanupTooltip( user );
+		// hover outside of radio
+		await hoverOutside();
+
+		// Tooltip should hide
+		expect(
+			screen.queryByRole( 'tooltip', {
+				name: 'Click for Delicious Gnocchi',
+			} )
+		).not.toBeInTheDocument();
 	} );
 
 	it( 'should not render tooltip', async () => {
-		const user = userEvent.setup();
 		render(
 			<Component label="Test Toggle Group Control">
 				{ optionsWithTooltip }
@@ -166,19 +242,24 @@ describe.each( [
 			'Click for Sumptuous Caponata'
 		);
 
-		await user.hover( secondRadio );
+		await hover( secondRadio );
 
-		await waitFor( () =>
-			expect(
-				screen.queryByText( 'Click for Sumptuous Caponata' )
-			).not.toBeInTheDocument()
-		);
+		// Tooltip shouldn't show
+		expect(
+			screen.queryByText( 'Click for Sumptuous Caponata' )
+		).not.toBeInTheDocument();
+
+		// Advance time by default delay
+		await sleep( TOOLTIP_DELAY );
+
+		// Tooltip shouldn't show.
+		expect(
+			screen.queryByText( 'Click for Sumptuous Caponata' )
+		).not.toBeInTheDocument();
 	} );
 
 	if ( mode === 'controlled' ) {
-		it( 'should reset values correctly', async () => {
-			const user = userEvent.setup();
-
+		it( 'should reset values correctly when default value is undefined', async () => {
 			render(
 				<Component label="Test Toggle Group Control">
 					{ options }
@@ -188,70 +269,88 @@ describe.each( [
 			const rigasOption = screen.getByRole( 'radio', { name: 'R' } );
 			const jackOption = screen.getByRole( 'radio', { name: 'J' } );
 
-			await user.click( rigasOption );
+			await click( rigasOption );
 
 			expect( jackOption ).not.toBeChecked();
 			expect( rigasOption ).toBeChecked();
 
-			await user.keyboard( '[ArrowRight]' );
-
-			expect( rigasOption ).not.toBeChecked();
-			expect( jackOption ).toBeChecked();
-
-			await user.click( screen.getByRole( 'button', { name: 'Reset' } ) );
+			await click( screen.getByRole( 'button', { name: 'Reset' } ) );
 
 			expect( rigasOption ).not.toBeChecked();
 			expect( jackOption ).not.toBeChecked();
 		} );
 
-		it( 'should update correctly when triggered by external updates', async () => {
-			const user = userEvent.setup();
-
+		it( 'should reset values correctly when default value is defined', async () => {
 			render(
-				<Component
-					value="rigas"
-					label="Test Toggle Group Control"
-					extraButtonOptions={ [
-						{ name: 'Rigas', value: 'rigas' },
-						{ name: 'Jack', value: 'jack' },
-					] }
-				>
+				<Component label="Test Toggle Group Control" value="rigas">
 					{ options }
 				</Component>
 			);
 
-			expect( screen.getByRole( 'radio', { name: 'R' } ) ).toBeChecked();
-			expect(
-				screen.getByRole( 'radio', { name: 'J' } )
-			).not.toBeChecked();
+			const rigasOption = screen.getByRole( 'radio', {
+				name: 'R',
+			} );
+			const jackOption = screen.getByRole( 'radio', {
+				name: 'J',
+			} );
 
-			await user.click( screen.getByRole( 'button', { name: 'Jack' } ) );
-			expect( screen.getByRole( 'radio', { name: 'J' } ) ).toBeChecked();
-			expect(
-				screen.getByRole( 'radio', { name: 'R' } )
-			).not.toBeChecked();
+			expect( rigasOption ).toBeChecked();
+			expect( jackOption ).not.toBeChecked();
 
-			await user.click( screen.getByRole( 'button', { name: 'Rigas' } ) );
-			expect( screen.getByRole( 'radio', { name: 'R' } ) ).toBeChecked();
-			expect(
-				screen.getByRole( 'radio', { name: 'J' } )
-			).not.toBeChecked();
+			await click( screen.getByRole( 'button', { name: 'Reset' } ) );
 
-			await user.click( screen.getByRole( 'button', { name: 'Reset' } ) );
-			expect(
-				screen.getByRole( 'radio', { name: 'R' } )
-			).not.toBeChecked();
-			expect(
-				screen.getByRole( 'radio', { name: 'J' } )
-			).not.toBeChecked();
+			expect( rigasOption ).not.toBeChecked();
+			expect( jackOption ).not.toBeChecked();
 		} );
+
+		describe.each( [
+			[ 'undefined', undefined ],
+			[ 'defined', 'rigas' ],
+		] )(
+			'should update correctly when triggered by external updates',
+			( defaultValueType, defaultValue ) => {
+				it( `when default value is ${ defaultValueType }`, async () => {
+					render(
+						<Component
+							value={ defaultValue }
+							label="Test Toggle Group Control"
+							extraButtonOptions={ [
+								{ name: 'Rigas', value: 'rigas' },
+								{ name: 'Jack', value: 'jack' },
+							] }
+						>
+							{ options }
+						</Component>
+					);
+
+					await click(
+						screen.getByRole( 'button', { name: 'Jack' } )
+					);
+					expect(
+						screen.getByRole( 'radio', { name: 'J' } )
+					).toBeChecked();
+					expect(
+						screen.getByRole( 'radio', { name: 'R' } )
+					).not.toBeChecked();
+
+					await click(
+						screen.getByRole( 'button', { name: 'Rigas' } )
+					);
+					expect(
+						screen.getByRole( 'radio', { name: 'R' } )
+					).toBeChecked();
+					expect(
+						screen.getByRole( 'radio', { name: 'J' } )
+					).not.toBeChecked();
+				} );
+			}
+		);
 	}
 
 	describe( 'isDeselectable', () => {
 		describe( 'isDeselectable = false', () => {
 			it( 'should not be deselectable', async () => {
 				const mockOnChange = jest.fn();
-				const user = userEvent.setup();
 
 				render(
 					<Component
@@ -267,41 +366,90 @@ describe.each( [
 					name: 'R',
 					checked: true,
 				} );
-				await user.click( rigas );
+				await click( rigas );
 				expect( mockOnChange ).toHaveBeenCalledTimes( 0 );
 			} );
 
 			it( 'should not tab to next radio option', async () => {
-				const user = userEvent.setup();
-
 				render(
-					<Component value="rigas" label="Test">
-						{ options }
-					</Component>
+					<>
+						<Component value="rigas" label="Test">
+							{ options }
+						</Component>
+						<button>After ToggleGroupControl</button>
+					</>
 				);
 
 				const rigas = screen.getByRole( 'radio', {
 					name: 'R',
 				} );
 
-				await user.tab();
+				await press.Tab();
 				expect( rigas ).toHaveFocus();
 
-				await user.tab();
+				await press.Tab();
 
+				// When in controlled mode, there is an additional "Reset" button.
 				const expectedFocusTarget =
 					mode === 'uncontrolled'
-						? rigas.ownerDocument.body
+						? screen.getByRole( 'button', {
+								name: 'After ToggleGroupControl',
+						  } )
 						: screen.getByRole( 'button', { name: 'Reset' } );
 
 				expect( expectedFocusTarget ).toHaveFocus();
 			} );
+
+			it( 'should ignore disabled radio options', async () => {
+				const mockOnChange = jest.fn();
+
+				render(
+					<Component
+						value="pizza"
+						onChange={ mockOnChange }
+						label="Test Toggle Group Control"
+					>
+						{ optionsWithDisabledOption }
+					</Component>
+				);
+
+				await press.Tab();
+
+				expect(
+					screen.getByRole( 'radio', { name: 'Pizza' } )
+				).toBeChecked();
+				expect(
+					screen.getByRole( 'radio', { name: 'Rice' } )
+				).toBeDisabled();
+
+				// Arrow navigation skips the disabled option
+				await press.ArrowRight();
+				expect(
+					screen.getByRole( 'radio', { name: 'Pasta' } )
+				).toBeChecked();
+				expect( mockOnChange ).toHaveBeenCalledTimes( 1 );
+				expect( mockOnChange ).toHaveBeenLastCalledWith( 'pasta' );
+
+				// Arrow navigation skips the disabled option
+				await press.ArrowLeft();
+				expect(
+					screen.getByRole( 'radio', { name: 'Pizza' } )
+				).toBeChecked();
+				expect( mockOnChange ).toHaveBeenCalledTimes( 2 );
+				expect( mockOnChange ).toHaveBeenLastCalledWith( 'pizza' );
+
+				// Clicks don't cause the option to be selected
+				await click( screen.getByRole( 'radio', { name: 'Rice' } ) );
+				expect(
+					screen.getByRole( 'radio', { name: 'Pizza' } )
+				).toBeChecked();
+				expect( mockOnChange ).toHaveBeenCalledTimes( 2 );
+			} );
 		} );
 
 		describe( 'isDeselectable = true', () => {
 			it( 'should be deselectable', async () => {
 				const mockOnChange = jest.fn();
-				const user = userEvent.setup();
 
 				render(
 					<Component
@@ -314,7 +462,7 @@ describe.each( [
 					</Component>
 				);
 
-				await user.click(
+				await click(
 					screen.getByRole( 'button', {
 						name: 'R',
 						pressed: true,
@@ -323,7 +471,7 @@ describe.each( [
 				expect( mockOnChange ).toHaveBeenCalledTimes( 1 );
 				expect( mockOnChange ).toHaveBeenLastCalledWith( undefined );
 
-				await user.click(
+				await click(
 					screen.getByRole( 'button', {
 						name: 'R',
 						pressed: false,
@@ -334,15 +482,13 @@ describe.each( [
 			} );
 
 			it( 'should tab to the next option button', async () => {
-				const user = userEvent.setup();
-
 				render(
 					<Component isDeselectable value="rigas" label="Test">
 						{ options }
 					</Component>
 				);
 
-				await user.tab();
+				await press.Tab();
 				expect(
 					screen.getByRole( 'button', {
 						name: 'R',
@@ -350,7 +496,7 @@ describe.each( [
 					} )
 				).toHaveFocus();
 
-				await user.tab();
+				await press.Tab();
 				expect(
 					screen.getByRole( 'button', {
 						name: 'J',
@@ -359,7 +505,7 @@ describe.each( [
 				).toHaveFocus();
 
 				// Focus should not move with arrow keys
-				await user.keyboard( '{ArrowLeft}' );
+				await press.ArrowLeft();
 				expect(
 					screen.getByRole( 'button', {
 						name: 'J',
@@ -367,6 +513,65 @@ describe.each( [
 					} )
 				).toHaveFocus();
 			} );
+
+			it( 'should ignore disabled options', async () => {
+				const mockOnChange = jest.fn();
+
+				render(
+					<Component
+						value="pizza"
+						isDeselectable
+						onChange={ mockOnChange }
+						label="Test Toggle Group Control"
+					>
+						{ optionsWithDisabledOption }
+					</Component>
+				);
+
+				await press.Tab();
+
+				expect(
+					screen.getByRole( 'button', {
+						name: 'Pizza',
+						pressed: true,
+					} )
+				).toBeVisible();
+				expect(
+					screen.getByRole( 'button', {
+						name: 'Rice',
+						pressed: false,
+					} )
+				).toBeDisabled();
+
+				// Tab key navigation skips the disabled option
+				await press.Tab();
+				await press.Space();
+				expect(
+					screen.getByRole( 'button', {
+						name: 'Pasta',
+						pressed: true,
+					} )
+				).toHaveFocus();
+				expect( mockOnChange ).toHaveBeenCalledTimes( 1 );
+				expect( mockOnChange ).toHaveBeenLastCalledWith( 'pasta' );
+
+				// Tab key navigation skips the disabled option
+				await press.ShiftTab();
+				expect(
+					screen.getByRole( 'button', {
+						name: 'Pizza',
+						pressed: false,
+					} )
+				).toHaveFocus();
+
+				// Clicks don't cause the option to be selected.
+				await click(
+					screen.getByRole( 'button', {
+						name: 'Rice',
+					} )
+				);
+				expect( mockOnChange ).toHaveBeenCalledTimes( 1 );
+			} );
 		} );
 	} );
 } );
diff --git a/packages/components/src/toggle-group-control/toggle-group-control-option-base/README.md b/packages/components/src/toggle-group-control/toggle-group-control-option-base/README.md
index a3a9a94807e93d..e673a1ed45bbf6 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control-option-base/README.md
+++ b/packages/components/src/toggle-group-control/toggle-group-control-option-base/README.md
@@ -4,7 +4,7 @@
 This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
 </div>
 
-`ToggleGroupControlOptionBase` is a form component and is meant to be used as an internal, generic component for any children of [`ToggleGroupControl`](<(/packages/components/src/toggle-group-control/toggle-group-control/README.md)>).
+`ToggleGroupControlOptionBase` is a form component and is meant to be used as an internal, generic component for any children of [`ToggleGroupControl`](/packages/components/src/toggle-group-control/toggle-group-control/README.md).
 
 ## Props
 
diff --git a/packages/components/src/toggle-group-control/toggle-group-control-option-base/component.tsx b/packages/components/src/toggle-group-control/toggle-group-control-option-base/component.tsx
index d24201a7ab3377..041af1adf5e5b5 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control-option-base/component.tsx
+++ b/packages/components/src/toggle-group-control/toggle-group-control-option-base/component.tsx
@@ -2,16 +2,13 @@
  * External dependencies
  */
 import type { ForwardedRef } from 'react';
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
-// eslint-disable-next-line no-restricted-imports
-import { motion, useReducedMotion } from 'framer-motion';
 
 /**
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { useMemo } from '@wordpress/element';
+import { useLayoutEffect, useMemo, useRef } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -29,12 +26,6 @@ import Tooltip from '../../tooltip';
 
 const { ButtonContentView, LabelView } = styles;
 
-const REDUCED_MOTION_TRANSITION_CONFIG = {
-	duration: 0,
-};
-
-const LAYOUT_ID = 'toggle-group-backdrop-shared-layout-id';
-
 const WithToolTip = ( { showTooltip, text, children }: WithToolTipProps ) => {
 	if ( showTooltip && text ) {
 		return (
@@ -54,11 +45,12 @@ function ToggleGroupControlOptionBase(
 			false
 		>,
 		// the element's id is generated internally
-		'id'
+		| 'id'
+		// due to how the component works, only the `disabled` prop should be used
+		| 'aria-disabled'
 	>,
 	forwardedRef: ForwardedRef< any >
 ) {
-	const shouldReduceMotion = useReducedMotion();
 	const toggleGroupControlContext = useToggleGroupControlContext();
 
 	const id = useInstanceId(
@@ -83,7 +75,7 @@ function ToggleGroupControlOptionBase(
 		value,
 		children,
 		showTooltip = false,
-		onFocus: onFocusProp,
+		disabled,
 		...otherButtonProps
 	} = buttonProps;
 
@@ -106,7 +98,6 @@ function ToggleGroupControlOptionBase(
 			),
 		[ cx, isDeselectable, isIcon, isPressed, size, className ]
 	);
-	const backdropClasses = useMemo( () => cx( styles.backdropView ), [ cx ] );
 
 	const buttonOnClick = () => {
 		if ( isDeselectable && isPressed ) {
@@ -123,8 +114,15 @@ function ToggleGroupControlOptionBase(
 		ref: forwardedRef,
 	};
 
+	const labelRef = useRef< HTMLDivElement | null >( null );
+	useLayoutEffect( () => {
+		if ( isPressed && labelRef.current ) {
+			toggleGroupControlContext.setSelectedElement( labelRef.current );
+		}
+	}, [ isPressed, toggleGroupControlContext ] );
+
 	return (
-		<LabelView className={ labelViewClasses }>
+		<LabelView ref={ labelRef } className={ labelViewClasses }>
 			<WithToolTip
 				showTooltip={ showTooltip }
 				text={ otherButtonProps[ 'aria-label' ] }
@@ -132,7 +130,7 @@ function ToggleGroupControlOptionBase(
 				{ isDeselectable ? (
 					<button
 						{ ...commonProps }
-						onFocus={ onFocusProp }
+						disabled={ disabled }
 						aria-pressed={ isPressed }
 						type="button"
 						onClick={ buttonOnClick }
@@ -141,36 +139,28 @@ function ToggleGroupControlOptionBase(
 					</button>
 				) : (
 					<Ariakit.Radio
-						render={
-							<button
-								type="button"
-								{ ...commonProps }
-								onFocus={ ( event ) => {
-									onFocusProp?.( event );
-									if ( event.defaultPrevented ) return;
-									toggleGroupControlContext.setValue( value );
-								} }
-							/>
-						}
+						disabled={ disabled }
+						onFocusVisible={ () => {
+							const selectedValueIsEmpty =
+								toggleGroupControlContext.value === null ||
+								toggleGroupControlContext.value === '';
+
+							// Conditions ensure that the first visible focus to a radio group
+							// without a selected option will not automatically select the option.
+							if (
+								! selectedValueIsEmpty ||
+								toggleGroupControlContext.activeItemIsNotFirstItem?.()
+							) {
+								toggleGroupControlContext.setValue( value );
+							}
+						} }
+						render={ <button type="button" { ...commonProps } /> }
 						value={ value }
 					>
 						<ButtonContentView>{ children }</ButtonContentView>
 					</Ariakit.Radio>
 				) }
 			</WithToolTip>
-			{ /* Animated backdrop using framer motion's shared layout animation */ }
-			{ isPressed ? (
-				<motion.div
-					className={ backdropClasses }
-					transition={
-						shouldReduceMotion
-							? REDUCED_MOTION_TRANSITION_CONFIG
-							: undefined
-					}
-					role="presentation"
-					layoutId={ LAYOUT_ID }
-				/>
-			) : null }
 		</LabelView>
 	);
 }
diff --git a/packages/components/src/toggle-group-control/toggle-group-control-option-base/styles.ts b/packages/components/src/toggle-group-control/toggle-group-control-option-base/styles.ts
index dac297fd3ddfa3..c0248f9b3f7f22 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control-option-base/styles.ts
+++ b/packages/components/src/toggle-group-control/toggle-group-control-option-base/styles.ts
@@ -7,7 +7,7 @@ import styled from '@emotion/styled';
 /**
  * Internal dependencies
  */
-import { CONFIG, COLORS, reduceMotion } from '../../utils';
+import { CONFIG, COLORS } from '../../utils';
 import type {
 	ToggleGroupControlProps,
 	ToggleGroupControlOptionBaseProps,
@@ -37,7 +37,7 @@ export const buttonView = ( {
 	appearance: none;
 	background: transparent;
 	border: none;
-	border-radius: ${ CONFIG.controlBorderRadius };
+	border-radius: ${ CONFIG.radiusXSmall };
 	color: ${ COLORS.gray[ 700 ] };
 	fill: currentColor;
 	cursor: pointer;
@@ -50,11 +50,12 @@ export const buttonView = ( {
 	padding: 0 12px;
 	position: relative;
 	text-align: center;
-	transition:
-		background ${ CONFIG.transitionDurationFast } linear,
-		color ${ CONFIG.transitionDurationFast } linear,
-		font-weight 60ms linear;
-	${ reduceMotion( 'transition' ) }
+	@media not ( prefers-reduced-motion ) {
+		transition:
+			background ${ CONFIG.transitionDurationFast } linear,
+			color ${ CONFIG.transitionDurationFast } linear,
+			font-weight 60ms linear;
+	}
 	user-select: none;
 	width: 100%;
 	z-index: 2;
@@ -63,8 +64,13 @@ export const buttonView = ( {
 		border: 0;
 	}
 
+	&[disabled] {
+		opacity: 0.4;
+		cursor: default;
+	}
+
 	&:active {
-		background: ${ CONFIG.toggleGroupControlBackgroundColor };
+		background: ${ CONFIG.controlBackgroundColor };
 	}
 
 	${ isDeselectable && deselectable }
@@ -102,24 +108,14 @@ const isIconStyles = ( {
 }: Pick< ToggleGroupControlProps, 'size' > ) => {
 	const iconButtonSizes = {
 		default: '30px',
-		'__unstable-large': '34px',
+		'__unstable-large': '32px',
 	};
 
 	return css`
 		color: ${ COLORS.gray[ 900 ] };
-		width: ${ iconButtonSizes[ size ] };
+		height: ${ iconButtonSizes[ size ] };
+		aspect-ratio: 1;
 		padding-left: 0;
 		padding-right: 0;
 	`;
 };
-
-export const backdropView = css`
-	background: ${ COLORS.gray[ 900 ] };
-	border-radius: ${ CONFIG.controlBorderRadius };
-	position: absolute;
-	inset: 0;
-	z-index: 1;
-	// Windows High Contrast mode will show this outline, but not the box-shadow.
-	outline: 2px solid transparent;
-	outline-offset: -3px;
-`;
diff --git a/packages/components/src/toggle-group-control/toggle-group-control-option-icon/README.md b/packages/components/src/toggle-group-control/toggle-group-control-option-icon/README.md
index d82700ae21b1f5..a0e3a44cf74607 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control-option-icon/README.md
+++ b/packages/components/src/toggle-group-control/toggle-group-control-option-icon/README.md
@@ -4,7 +4,7 @@
 This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
 </div>
 
-`ToggleGroupControlOptionIcon` is a form component which is meant to be used as a child of [`ToggleGroupControl`] and displays an icon(<(/packages/components/src/toggle-group-control/toggle-group-control/README.md)>).
+`ToggleGroupControlOptionIcon` is a form component which is meant to be used as a child of [`ToggleGroupControl`](/packages/components/src/toggle-group-control/toggle-group-control/README.md) and displays an icon.
 
 ## Usage
 
@@ -17,7 +17,7 @@ import { formatLowercase, formatUppercase } from '@wordpress/icons';
 
 function Example() {
 	return (
-		<ToggleGroupControl>
+		<ToggleGroupControl __nextHasNoMarginBottom>
 			<ToggleGroupControlOptionIcon
 				value="uppercase"
 				icon={ formatUppercase }
diff --git a/packages/components/src/toggle-group-control/toggle-group-control-option-icon/component.tsx b/packages/components/src/toggle-group-control/toggle-group-control-option-icon/component.tsx
index ec009d82344c39..352b4acee71844 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control-option-icon/component.tsx
+++ b/packages/components/src/toggle-group-control/toggle-group-control-option-icon/component.tsx
@@ -51,20 +51,20 @@ function UnforwardedToggleGroupControlOptionIcon(
  * import { formatLowercase, formatUppercase } from '@wordpress/icons';
  *
  * function Example() {
- *	return (
- *		<ToggleGroupControl>
- *			<ToggleGroupControlOptionIcon
- *				value="uppercase"
- *				label="Uppercase"
- *				icon={ formatUppercase }
- *			/>
- *			<ToggleGroupControlOptionIcon
- *				value="lowercase"
- *				label="Lowercase"
- *				icon={ formatLowercase }
- *			/>
- *		</ToggleGroupControl>
- *	);
+ *  return (
+ *    <ToggleGroupControl __nextHasNoMarginBottom>
+ *      <ToggleGroupControlOptionIcon
+ *        value="uppercase"
+ *        label="Uppercase"
+ *        icon={ formatUppercase }
+ *      />
+ *      <ToggleGroupControlOptionIcon
+ *        value="lowercase"
+ *        label="Lowercase"
+ *        icon={ formatLowercase }
+ *      />
+ *    </ToggleGroupControl>
+ *  );
  * }
  * ```
  */
diff --git a/packages/components/src/toggle-group-control/toggle-group-control-option/README.md b/packages/components/src/toggle-group-control/toggle-group-control-option/README.md
index 2de2e665c3f5b2..2e7c55bd688361 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control-option/README.md
+++ b/packages/components/src/toggle-group-control/toggle-group-control-option/README.md
@@ -4,7 +4,7 @@
 This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
 </div>
 
-`ToggleGroupControlOption` is a form component and is meant to be used as a child of [`ToggleGroupControl`]((/packages/components/src/toggle-group-control/toggle-group-control/README.md)).
+`ToggleGroupControlOption` is a form component and is meant to be used as a child of [`ToggleGroupControl`](/packages/components/src/toggle-group-control/toggle-group-control/README.md).
 
 
 ## Usage
@@ -17,7 +17,12 @@ import {
 
 function Example() {
 	return (
-		<ToggleGroupControl label="my label" value="vertical" isBlock>
+		<ToggleGroupControl
+			label="my label"
+			value="vertical"
+			isBlock
+			__nextHasNoMarginBottom
+		>
 			<ToggleGroupControlOption
 				value="horizontal"
 				label="Horizontal"
diff --git a/packages/components/src/toggle-group-control/toggle-group-control-option/component.tsx b/packages/components/src/toggle-group-control/toggle-group-control-option/component.tsx
index e4b9cff4b80330..b71d37e81cf25f 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control-option/component.tsx
+++ b/packages/components/src/toggle-group-control/toggle-group-control-option/component.tsx
@@ -48,7 +48,12 @@ function UnforwardedToggleGroupControlOption(
  *
  * function Example() {
  *   return (
- *     <ToggleGroupControl label="my label" value="vertical" isBlock>
+ *     <ToggleGroupControl
+ *       label="my label"
+ *       value="vertical"
+ *       isBlock
+ *       __nextHasNoMarginBottom
+ *     >
  *       <ToggleGroupControlOption value="horizontal" label="Horizontal" />
  *       <ToggleGroupControlOption value="vertical" label="Vertical" />
  *     </ToggleGroupControl>
diff --git a/packages/components/src/toggle-group-control/toggle-group-control/README.md b/packages/components/src/toggle-group-control/toggle-group-control/README.md
index 64e0489f4171b7..ca5c5d14eb6b5a 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control/README.md
+++ b/packages/components/src/toggle-group-control/toggle-group-control/README.md
@@ -20,7 +20,12 @@ import {
 
 function Example() {
 	return (
-		<ToggleGroupControl label="my label" value="vertical" isBlock>
+		<ToggleGroupControl
+			label="my label"
+			value="vertical"
+			isBlock
+			__nextHasNoMarginBottom
+		>
 			<ToggleGroupControlOption value="horizontal" label="Horizontal" />
 			<ToggleGroupControlOption value="vertical" label="Vertical" />
 		</ToggleGroupControl>
@@ -82,3 +87,17 @@ Callback when a segment is selected.
 The value of the `ToggleGroupControl`.
 
 -   Required: No
+
+### `__next40pxDefaultSize`: `boolean`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Required: No
+-   Default: `false`
+
+### `__nextHasNoMarginBottom`: `boolean`
+
+Start opting into the new margin-free styles that will become the default in a future version.
+
+-   Required: No
+-   Default: `false`
\ No newline at end of file
diff --git a/packages/components/src/toggle-group-control/toggle-group-control/as-button-group.tsx b/packages/components/src/toggle-group-control/toggle-group-control/as-button-group.tsx
index b3f56bccd07c5f..7ce762b6e71df2 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control/as-button-group.tsx
+++ b/packages/components/src/toggle-group-control/toggle-group-control/as-button-group.tsx
@@ -26,6 +26,7 @@ function UnforwardedToggleGroupControlAsButtonGroup(
 		size,
 		value: valueProp,
 		id: idProp,
+		setSelectedElement,
 		...otherProps
 	}: WordPressComponentProps<
 		ToggleGroupControlMainControlProps,
@@ -54,16 +55,23 @@ function UnforwardedToggleGroupControlAsButtonGroup(
 	} );
 
 	const groupContextValue = useMemo(
-		() =>
-			( {
-				baseId,
-				value: selectedValue,
-				setValue: setSelectedValue,
-				isBlock: ! isAdaptiveWidth,
-				isDeselectable: true,
-				size,
-			} ) as ToggleGroupControlContextProps,
-		[ baseId, selectedValue, setSelectedValue, isAdaptiveWidth, size ]
+		(): ToggleGroupControlContextProps => ( {
+			baseId,
+			value: selectedValue,
+			setValue: setSelectedValue,
+			isBlock: ! isAdaptiveWidth,
+			isDeselectable: true,
+			size,
+			setSelectedElement,
+		} ),
+		[
+			baseId,
+			selectedValue,
+			setSelectedValue,
+			isAdaptiveWidth,
+			size,
+			setSelectedElement,
+		]
 	);
 
 	return (
diff --git a/packages/components/src/toggle-group-control/toggle-group-control/as-radio-group.tsx b/packages/components/src/toggle-group-control/toggle-group-control/as-radio-group.tsx
index 24a40527abdc41..0166728dbafba4 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control/as-radio-group.tsx
+++ b/packages/components/src/toggle-group-control/toggle-group-control/as-radio-group.tsx
@@ -2,14 +2,15 @@
  * External dependencies
  */
 import type { ForwardedRef } from 'react';
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
+import { useStoreState } from '@ariakit/react';
 
 /**
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { forwardRef, useMemo } from '@wordpress/element';
+import { forwardRef, useEffect, useMemo } from '@wordpress/element';
+import { isRTL } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -32,6 +33,7 @@ function UnforwardedToggleGroupControlAsRadioGroup(
 		size,
 		value: valueProp,
 		id: idProp,
+		setSelectedElement,
 		...otherProps
 	}: WordPressComponentProps<
 		ToggleGroupControlMainControlProps,
@@ -65,21 +67,41 @@ function UnforwardedToggleGroupControlAsRadioGroup(
 		defaultValue,
 		value,
 		setValue: wrappedOnChangeProp,
+		rtl: isRTL(),
 	} );
 
-	const selectedValue = radio.useState( 'value' );
+	const selectedValue = useStoreState( radio, 'value' );
 	const setValue = radio.setValue;
 
+	// Ensures that the active id is also reset after the value is "reset" by the consumer.
+	useEffect( () => {
+		if ( selectedValue === '' ) {
+			radio.setActiveId( undefined );
+		}
+	}, [ radio, selectedValue ] );
+
 	const groupContextValue = useMemo(
-		() =>
-			( {
-				baseId,
-				isBlock: ! isAdaptiveWidth,
-				size,
-				value: selectedValue,
-				setValue,
-			} ) as ToggleGroupControlContextProps,
-		[ baseId, isAdaptiveWidth, size, selectedValue, setValue ]
+		(): ToggleGroupControlContextProps => ( {
+			activeItemIsNotFirstItem: () =>
+				radio.getState().activeId !== radio.first(),
+			baseId,
+			isBlock: ! isAdaptiveWidth,
+			size,
+			// @ts-expect-error - This is wrong and we should fix it.
+			value: selectedValue,
+			// @ts-expect-error - This is wrong and we should fix it.
+			setValue,
+			setSelectedElement,
+		} ),
+		[
+			baseId,
+			isAdaptiveWidth,
+			radio,
+			selectedValue,
+			setSelectedElement,
+			setValue,
+			size,
+		]
 	);
 
 	return (
diff --git a/packages/components/src/toggle-group-control/toggle-group-control/component.tsx b/packages/components/src/toggle-group-control/toggle-group-control/component.tsx
index 1d48349f0ee799..7f384f70ae1dc5 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control/component.tsx
+++ b/packages/components/src/toggle-group-control/toggle-group-control/component.tsx
@@ -2,15 +2,11 @@
  * External dependencies
  */
 import type { ForwardedRef } from 'react';
-// eslint-disable-next-line no-restricted-imports
-import { LayoutGroup } from 'framer-motion';
 
 /**
  * WordPress dependencies
  */
-import { useInstanceId } from '@wordpress/compose';
-import { __ } from '@wordpress/i18n';
-import { useMemo } from '@wordpress/element';
+import { useMemo, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -24,6 +20,9 @@ import { VisualLabelWrapper } from './styles';
 import * as styles from './styles';
 import { ToggleGroupControlAsRadioGroup } from './as-radio-group';
 import { ToggleGroupControlAsButtonGroup } from './as-button-group';
+import { useTrackElementOffsetRect } from '../../utils/element-rect';
+import { useMergeRefs } from '@wordpress/compose';
+import { useAnimatedOffsetRect } from '../../utils/hooks/use-animated-offset-rect';
 
 function UnconnectedToggleGroupControl(
 	props: WordPressComponentProps< ToggleGroupControlProps, 'div', false >,
@@ -46,7 +45,21 @@ function UnconnectedToggleGroupControl(
 		...otherProps
 	} = useContextSystem( props, 'ToggleGroupControl' );
 
-	const baseId = useInstanceId( ToggleGroupControl, 'toggle-group-control' );
+	const normalizedSize =
+		__next40pxDefaultSize && size === 'default' ? '__unstable-large' : size;
+
+	const [ selectedElement, setSelectedElement ] = useState< HTMLElement >();
+	const [ controlElement, setControlElement ] = useState< HTMLElement >();
+	const refs = useMergeRefs( [ setControlElement, forwardedRef ] );
+	const selectedRect = useTrackElementOffsetRect(
+		value ? selectedElement : undefined
+	);
+	useAnimatedOffsetRect( controlElement, selectedRect, {
+		prefix: 'selected',
+		dataAttribute: 'indicator-animated',
+		transitionEndFilter: ( event ) => event.pseudoElement === '::before',
+		roundRect: true,
+	} );
 
 	const cx = useCx();
 
@@ -56,13 +69,12 @@ function UnconnectedToggleGroupControl(
 				styles.toggleGroupControl( {
 					isBlock,
 					isDeselectable,
-					size,
-					__next40pxDefaultSize,
+					size: normalizedSize,
 				} ),
 				isBlock && styles.block,
 				className
 			),
-		[ className, cx, isBlock, isDeselectable, size, __next40pxDefaultSize ]
+		[ className, cx, isBlock, isDeselectable, normalizedSize ]
 	);
 
 	const MainControl = isDeselectable
@@ -73,6 +85,7 @@ function UnconnectedToggleGroupControl(
 		<BaseControl
 			help={ help }
 			__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
+			__associatedWPComponentName="ToggleGroupControl"
 		>
 			{ ! hideLabelFromVision && (
 				<VisualLabelWrapper>
@@ -81,15 +94,16 @@ function UnconnectedToggleGroupControl(
 			) }
 			<MainControl
 				{ ...otherProps }
+				setSelectedElement={ setSelectedElement }
 				className={ classes }
 				isAdaptiveWidth={ isAdaptiveWidth }
 				label={ label }
 				onChange={ onChange }
-				ref={ forwardedRef }
-				size={ size }
+				ref={ refs }
+				size={ normalizedSize }
 				value={ value }
 			>
-				<LayoutGroup id={ baseId }>{ children }</LayoutGroup>
+				{ children }
 			</MainControl>
 		</BaseControl>
 	);
@@ -116,7 +130,12 @@ function UnconnectedToggleGroupControl(
  *
  * function Example() {
  *   return (
- *     <ToggleGroupControl label="my label" value="vertical" isBlock>
+ *     <ToggleGroupControl
+ *       label="my label"
+ *       value="vertical"
+ *       isBlock
+ *       __nextHasNoMarginBottom
+ *     >
  *       <ToggleGroupControlOption value="horizontal" label="Horizontal" />
  *       <ToggleGroupControlOption value="vertical" label="Vertical" />
  *     </ToggleGroupControl>
diff --git a/packages/components/src/toggle-group-control/toggle-group-control/styles.ts b/packages/components/src/toggle-group-control/toggle-group-control/styles.ts
index b8a8552f98beb0..bb6efe476b2b2c 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control/styles.ts
+++ b/packages/components/src/toggle-group-control/toggle-group-control/styles.ts
@@ -14,23 +14,59 @@ export const toggleGroupControl = ( {
 	isBlock,
 	isDeselectable,
 	size,
-	__next40pxDefaultSize,
-}: Pick<
-	ToggleGroupControlProps,
-	'isBlock' | 'isDeselectable' | '__next40pxDefaultSize'
-> & {
+}: Pick< ToggleGroupControlProps, 'isBlock' | 'isDeselectable' > & {
 	size: NonNullable< ToggleGroupControlProps[ 'size' ] >;
 } ) => css`
 	background: ${ COLORS.ui.background };
 	border: 1px solid transparent;
-	border-radius: ${ CONFIG.controlBorderRadius };
+	border-radius: ${ CONFIG.radiusSmall };
 	display: inline-flex;
 	min-width: 0;
-	padding: 2px;
 	position: relative;
 
-	${ toggleGroupControlSize( size, __next40pxDefaultSize ) }
+	${ toggleGroupControlSize( size ) }
 	${ ! isDeselectable && enclosingBorders( isBlock ) }
+
+	@media not ( prefers-reduced-motion ) {
+		&[data-indicator-animated]::before {
+			transition-property: transform, border-radius;
+			transition-duration: 0.2s;
+			transition-timing-function: ease-out;
+		}
+	}
+
+	&::before {
+		content: '';
+		position: absolute;
+		pointer-events: none;
+		background: ${ COLORS.gray[ 900 ] };
+
+		// Windows High Contrast mode will show this outline, but not the box-shadow.
+		outline: 2px solid transparent;
+		outline-offset: -3px;
+
+		/* Using a large value to avoid antialiasing rounding issues
+			when scaling in the transform, see: https://stackoverflow.com/a/52159123 */
+		--antialiasing-factor: 100;
+		/* Adjusting the border radius to match the scaling in the x axis. */
+		border-radius: calc(
+				${ CONFIG.radiusXSmall } /
+					(
+						var( --selected-width, 0 ) /
+							var( --antialiasing-factor )
+					)
+			) / ${ CONFIG.radiusXSmall };
+		left: -1px; // Correcting for border.
+		width: calc( var( --antialiasing-factor ) * 1px );
+		height: calc( var( --selected-height, 0 ) * 1px );
+		transform-origin: left top;
+		transform: translateX( calc( var( --selected-left, 0 ) * 1px ) )
+			scaleX(
+				calc(
+					var( --selected-width, 0 ) / var( --antialiasing-factor )
+				)
+			);
+	}
 `;
 
 const enclosingBorders = ( isBlock: ToggleGroupControlProps[ 'isBlock' ] ) => {
@@ -57,21 +93,20 @@ const enclosingBorders = ( isBlock: ToggleGroupControlProps[ 'isBlock' ] ) => {
 };
 
 export const toggleGroupControlSize = (
-	size: NonNullable< ToggleGroupControlProps[ 'size' ] >,
-	__next40pxDefaultSize: ToggleGroupControlProps[ '__next40pxDefaultSize' ]
+	size: NonNullable< ToggleGroupControlProps[ 'size' ] >
 ) => {
-	const heights = {
-		default: '40px',
-		'__unstable-large': '40px',
+	const styles = {
+		default: css`
+			min-height: 36px;
+			padding: 2px;
+		`,
+		'__unstable-large': css`
+			min-height: 40px;
+			padding: 3px;
+		`,
 	};
 
-	if ( ! __next40pxDefaultSize ) {
-		heights.default = '36px';
-	}
-
-	return css`
-		min-height: ${ heights[ size ] };
-	`;
+	return styles[ size ];
 };
 
 export const block = css`
diff --git a/packages/components/src/toggle-group-control/toggle-group-control/utils.ts b/packages/components/src/toggle-group-control/toggle-group-control/utils.ts
index 3f6d6e135a0df3..0cc6dcd743b119 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control/utils.ts
+++ b/packages/components/src/toggle-group-control/toggle-group-control/utils.ts
@@ -21,18 +21,23 @@ type ValueProp = ToggleGroupControlProps[ 'value' ];
 export function useComputeControlledOrUncontrolledValue(
 	valueProp: ValueProp
 ): { value: ValueProp; defaultValue: ValueProp } {
+	const isInitialRenderRef = useRef( true );
 	const prevValueProp = usePrevious( valueProp );
-	const prevIsControlled = useRef( false );
+	const prevIsControlledRef = useRef( false );
+
+	useEffect( () => {
+		if ( isInitialRenderRef.current ) {
+			isInitialRenderRef.current = false;
+		}
+	}, [] );
 
 	// Assume the component is being used in controlled mode on the first re-render
 	// that has a different `valueProp` from the previous render.
 	const isControlled =
-		prevIsControlled.current ||
-		( prevValueProp !== undefined &&
-			valueProp !== undefined &&
-			prevValueProp !== valueProp );
+		prevIsControlledRef.current ||
+		( ! isInitialRenderRef.current && prevValueProp !== valueProp );
 	useEffect( () => {
-		prevIsControlled.current = isControlled;
+		prevIsControlledRef.current = isControlled;
 	}, [ isControlled ] );
 
 	if ( isControlled ) {
diff --git a/packages/components/src/toggle-group-control/types.ts b/packages/components/src/toggle-group-control/types.ts
index d49ef3cbb77cb4..463d8d26e64410 100644
--- a/packages/components/src/toggle-group-control/types.ts
+++ b/packages/components/src/toggle-group-control/types.ts
@@ -131,15 +131,18 @@ export type ToggleGroupControlProps = Pick<
 };
 
 export type ToggleGroupControlContextProps = {
+	activeItemIsNotFirstItem?: () => boolean;
 	isDeselectable?: boolean;
 	baseId: string;
 	isBlock: ToggleGroupControlProps[ 'isBlock' ];
 	size: ToggleGroupControlProps[ 'size' ];
 	value: ToggleGroupControlProps[ 'value' ];
 	setValue: ( newValue: string | number | undefined ) => void;
+	setSelectedElement: ( element: HTMLElement | undefined ) => void;
 };
 
 export type ToggleGroupControlMainControlProps = Pick<
 	ToggleGroupControlProps,
 	'children' | 'isAdaptiveWidth' | 'label' | 'size' | 'onChange' | 'value'
->;
+> &
+	Pick< ToggleGroupControlContextProps, 'setSelectedElement' >;
diff --git a/packages/components/src/toolbar/toolbar-button/README.md b/packages/components/src/toolbar/toolbar-button/README.md
index 6bde73117b02c5..99338e32c1b700 100644
--- a/packages/components/src/toolbar/toolbar-button/README.md
+++ b/packages/components/src/toolbar/toolbar-button/README.md
@@ -1,6 +1,6 @@
 # ToolbarButton
 
-ToolbarButton can be used to add actions to a toolbar, usually inside a [Toolbar](/packages/components/src/toolbar/README.md) or [ToolbarGroup](/packages/components/src/toolbar-group/README.md) when used to create general interfaces. If you're using it to add controls to your custom block, you should consider using [BlockControls](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md).
+ToolbarButton can be used to add actions to a toolbar, usually inside a [Toolbar](/packages/components/src/toolbar/README.md) or [ToolbarGroup](/packages/components/src/toolbar-group/README.md) when used to create general interfaces. If you're using it to add controls to your custom block, you should consider using [BlockControls](/docs/getting-started/fundamentals/block-in-the-editor.md).
 
 It has similar features to the [Button](/packages/components/src/button/README.md) component. Using `ToolbarButton` will ensure the correct styling for a button in a toolbar, and also that keyboard interactions in a toolbar are consistent with the [WAI-ARIA toolbar pattern](https://www.w3.org/TR/wai-aria-practices/#toolbar).
 
@@ -27,7 +27,7 @@ function MyToolbar() {
 
 ### Inside BlockControls
 
-If you're working on a custom block and you want to add controls to the block toolbar, you should use [BlockControls](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md) instead. Optionally wrapping it with [ToolbarGroup](/packages/components/src/toolbar-group/README.md).
+If you're working on a custom block and you want to add controls to the block toolbar, you should use [BlockControls](/docs/getting-started/fundamentals/block-in-the-editor.md) instead. Optionally wrapping it with [ToolbarGroup](/packages/components/src/toolbar-group/README.md).
 
 ```jsx
 import { BlockControls } from '@wordpress/block-editor';
diff --git a/packages/components/src/toolbar/toolbar-button/index.tsx b/packages/components/src/toolbar/toolbar-button/index.tsx
index 3d77e9cbc8cf6f..bb591ff7b521c6 100644
--- a/packages/components/src/toolbar/toolbar-button/index.tsx
+++ b/packages/components/src/toolbar/toolbar-button/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef, MouseEvent as ReactMouseEvent } from 'react';
 
 /**
@@ -16,22 +16,36 @@ import Button from '../../button';
 import ToolbarItem from '../toolbar-item';
 import ToolbarContext from '../toolbar-context';
 import ToolbarButtonContainer from './toolbar-button-container';
-import type { ToolbarButtonProps } from './types';
+import type { ToolbarButtonOverriddenProps, ToolbarButtonProps } from './types';
 import type { WordPressComponentProps } from '../../context';
 
+function useDeprecatedProps( {
+	isDisabled,
+	...otherProps
+}: React.ComponentProps< typeof ToolbarButton > ) {
+	return {
+		disabled: isDisabled,
+		...otherProps,
+	};
+}
+
 function UnforwardedToolbarButton(
-	{
+	props: Omit<
+		WordPressComponentProps< ToolbarButtonProps, typeof Button, false >,
+		'accessibleWhenDisabled' // By default, ToolbarButton will be focusable when disabled.
+	> &
+		ToolbarButtonOverriddenProps,
+	ref: ForwardedRef< any >
+) {
+	const {
 		children,
 		className,
 		containerClassName,
 		extraProps,
 		isActive,
-		isDisabled,
 		title,
-		...props
-	}: WordPressComponentProps< ToolbarButtonProps, typeof Button, false >,
-	ref: ForwardedRef< any >
-) {
+		...restProps
+	} = useDeprecatedProps( props );
 	const accessibleToolbarState = useContext( ToolbarContext );
 
 	if ( ! accessibleToolbarState ) {
@@ -39,10 +53,10 @@ function UnforwardedToolbarButton(
 			<ToolbarButtonContainer className={ containerClassName }>
 				<Button
 					ref={ ref }
-					icon={ props.icon }
+					icon={ restProps.icon }
 					label={ title }
-					shortcut={ props.shortcut }
-					data-subscript={ props.subscript }
+					shortcut={ restProps.shortcut }
+					data-subscript={ restProps.subscript }
 					onClick={ (
 						event: ReactMouseEvent<
 							HTMLButtonElement & HTMLAnchorElement,
@@ -50,20 +64,20 @@ function UnforwardedToolbarButton(
 						>
 					) => {
 						event.stopPropagation();
-						// TODO: Possible bug; maybe use onClick instead of props.onClick.
-						if ( props.onClick ) {
-							props.onClick( event );
+						// TODO: Possible bug; maybe use onClick instead of restProps.onClick.
+						if ( restProps.onClick ) {
+							restProps.onClick( event );
 						}
 					} }
-					className={ classnames(
+					className={ clsx(
 						'components-toolbar__control',
 						className
 					) }
 					isPressed={ isActive }
-					disabled={ isDisabled }
+					accessibleWhenDisabled
 					data-toolbar-item
 					{ ...extraProps }
-					{ ...props }
+					{ ...restProps }
 				>
 					{ children }
 				</Button>
@@ -76,16 +90,15 @@ function UnforwardedToolbarButton(
 	// Button.
 	return (
 		<ToolbarItem
-			className={ classnames( 'components-toolbar-button', className ) }
+			className={ clsx( 'components-toolbar-button', className ) }
 			{ ...extraProps }
-			{ ...props }
+			{ ...restProps }
 			ref={ ref }
 		>
 			{ ( toolbarItemProps ) => (
 				<Button
 					label={ title }
 					isPressed={ isActive }
-					disabled={ isDisabled }
 					{ ...toolbarItemProps }
 				>
 					{ children }
diff --git a/packages/components/src/toolbar/toolbar-button/types.ts b/packages/components/src/toolbar/toolbar-button/types.ts
index da7038c213324a..bfe2f9c10ba49f 100644
--- a/packages/components/src/toolbar/toolbar-button/types.ts
+++ b/packages/components/src/toolbar/toolbar-button/types.ts
@@ -22,6 +22,9 @@ export type ToolbarButtonProps = {
 	isActive?: boolean;
 	/**
 	 * Indicates if the button is disabled.
+	 *
+	 * @deprecated Use `disabled` instead.
+	 * @ignore
 	 */
 	isDisabled?: boolean;
 	/**
@@ -34,6 +37,22 @@ export type ToolbarButtonProps = {
 	title?: string;
 };
 
+export type ToolbarButtonOverriddenProps = {
+	/**
+	 * Whether to keep the button focusable when disabled.
+	 *
+	 * In most cases, it is recommended to set this to `true`. Disabling a control without maintaining focusability
+	 * can cause accessibility issues, by hiding their presence from screen reader users,
+	 * or by preventing focus from returning to a trigger element.
+	 *
+	 * Learn more about the [focusability of disabled controls](https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#focusabilityofdisabledcontrols)
+	 * in the WAI-ARIA Authoring Practices Guide.
+	 *
+	 * @default true
+	 */
+	accessibleWhenDisabled?: boolean;
+};
+
 export type ToolbarButtonContainerProps = {
 	/**
 	 * Children to be rendered inside the button container.
diff --git a/packages/components/src/toolbar/toolbar-context/index.ts b/packages/components/src/toolbar/toolbar-context/index.ts
index 87c35c75fc68f1..33d407eac5c180 100644
--- a/packages/components/src/toolbar/toolbar-context/index.ts
+++ b/packages/components/src/toolbar/toolbar-context/index.ts
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import type * as Ariakit from '@ariakit/react';
 
 /**
diff --git a/packages/components/src/toolbar/toolbar-dropdown-menu/README.md b/packages/components/src/toolbar/toolbar-dropdown-menu/README.md
index 866d98a89177fe..4abcf3a9164e50 100644
--- a/packages/components/src/toolbar/toolbar-dropdown-menu/README.md
+++ b/packages/components/src/toolbar/toolbar-dropdown-menu/README.md
@@ -1,6 +1,6 @@
 # ToolbarDropdownMenu
 
-ToolbarDropdownMenu can be used to add actions to a toolbar, usually inside a [Toolbar](/packages/components/src/toolbar/README.md) or [ToolbarGroup](/packages/components/src/toolbar-group/README.md) when used to create general interfaces. If you're using it to add controls to your custom block, you should consider using [BlockControls](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md).
+ToolbarDropdownMenu can be used to add actions to a toolbar, usually inside a [Toolbar](/packages/components/src/toolbar/README.md) or [ToolbarGroup](/packages/components/src/toolbar-group/README.md) when used to create general interfaces. If you're using it to add controls to your custom block, you should consider using [BlockControls](/docs/getting-started/fundamentals/block-in-the-editor.md).
 
 It has similar features to the [DropdownMenu](/packages/components/src/dropdown-menu/README.md) component. Using `ToolbarDropdownMenu` will ensure that keyboard interactions in a toolbar are consistent with the [WAI-ARIA toolbar pattern](https://www.w3.org/TR/wai-aria-practices/#toolbar).
 
@@ -54,7 +54,7 @@ function MyToolbar() {
 
 ### Inside BlockControls
 
-If you're working on a custom block and you want to add controls to the block toolbar, you should use [BlockControls](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md) instead.
+If you're working on a custom block and you want to add controls to the block toolbar, you should use [BlockControls](/docs/getting-started/fundamentals/block-in-the-editor.md) instead.
 
 ```jsx
 import { BlockControls } from '@wordpress/block-editor';
diff --git a/packages/components/src/toolbar/toolbar-group/index.tsx b/packages/components/src/toolbar/toolbar-group/index.tsx
index e2c0b5b2f22c41..af555233cc25c6 100644
--- a/packages/components/src/toolbar/toolbar-group/index.tsx
+++ b/packages/components/src/toolbar/toolbar-group/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -67,7 +67,7 @@ function ToolbarGroup( {
 		return null;
 	}
 
-	const finalClassName = classnames(
+	const finalClassName = clsx(
 		// Unfortunately, there's legacy code referencing to `.components-toolbar`
 		// So we can't get rid of it
 		accessibleToolbarState
diff --git a/packages/components/src/toolbar/toolbar-group/style.scss b/packages/components/src/toolbar/toolbar-group/style.scss
index cf055791271ae6..668968d40babbe 100644
--- a/packages/components/src/toolbar/toolbar-group/style.scss
+++ b/packages/components/src/toolbar/toolbar-group/style.scss
@@ -20,6 +20,7 @@
 	// Icons are 36px, as set by a 24px icon and 12px padding.
 	.components-button.components-button, // This needs specificity to override padding values inherited from the button component.
 	.components-button.has-icon.has-icon {
+		justify-content: center;
 		min-width: $block-toolbar-height - $grid-unit-15;
 		padding-left: $grid-unit-15 * 0.5; // 6px.
 		padding-right: $grid-unit-15 * 0.5;
@@ -55,12 +56,7 @@
 
 div.components-toolbar {
 	& > div {
-		// IE11 does not support `position: sticky`, or Flex very well, so use block.
-		display: block;
-		@supports (position: sticky) {
-			display: flex;
-		}
-
+		display: flex;
 		margin: 0;
 	}
 
diff --git a/packages/components/src/toolbar/toolbar-item/README.md b/packages/components/src/toolbar/toolbar-item/README.md
index 31a0dfa1cf4735..e219d085a2cbaa 100644
--- a/packages/components/src/toolbar/toolbar-item/README.md
+++ b/packages/components/src/toolbar/toolbar-item/README.md
@@ -1,6 +1,6 @@
 # ToolbarItem
 
-A ToolbarItem is a generic headless component that can be used to make any custom component a [Toolbar](/packages/components/src/toolbar/README.md) item. It should be inside a [Toolbar](/packages/components/src/toolbar/README.md) or [ToolbarGroup](/packages/components/src/toolbar-group/README.md) when used to create general interfaces. If you're using it to add controls to your custom block, you should consider using [BlockControls](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md).
+A ToolbarItem is a generic headless component that can be used to make any custom component a [Toolbar](/packages/components/src/toolbar/README.md) item. It should be inside a [Toolbar](/packages/components/src/toolbar/README.md) or [ToolbarGroup](/packages/components/src/toolbar-group/README.md) when used to create general interfaces. If you're using it to add controls to your custom block, you should consider using [BlockControls](/docs/getting-started/fundamentals/block-in-the-editor.md).
 
 ## Usage
 
@@ -49,7 +49,7 @@ function MyToolbar() {
 
 ### Inside BlockControls
 
-If you're working on a custom block and you want to add controls to the block toolbar, you should use [BlockControls](/docs/how-to-guides/block-tutorial/block-controls-toolbar-and-sidebar.md) instead. Optionally wrapping it with [ToolbarGroup](/packages/components/src/toolbar-group/README.md).
+If you're working on a custom block and you want to add controls to the block toolbar, you should use [BlockControls](/docs/getting-started/fundamentals/block-in-the-editor.md) instead. Optionally wrapping it with [ToolbarGroup](/packages/components/src/toolbar-group/README.md).
 
 ```jsx
 import { BlockControls } from '@wordpress/block-editor';
diff --git a/packages/components/src/toolbar/toolbar-item/index.tsx b/packages/components/src/toolbar/toolbar-item/index.tsx
index 2c343eb173a27b..57cd80bc35d233 100644
--- a/packages/components/src/toolbar/toolbar-item/index.tsx
+++ b/packages/components/src/toolbar/toolbar-item/index.tsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
 import type { ForwardedRef } from 'react';
 
@@ -50,6 +49,7 @@ function ToolbarItem(
 
 	return (
 		<Ariakit.ToolbarItem
+			accessibleWhenDisabled
 			{ ...allProps }
 			store={ accessibleToolbarStore }
 			render={ render }
diff --git a/packages/components/src/toolbar/toolbar/README.md b/packages/components/src/toolbar/toolbar/README.md
index ee89127ded74f0..de8f7a89d01ea3 100644
--- a/packages/components/src/toolbar/toolbar/README.md
+++ b/packages/components/src/toolbar/toolbar/README.md
@@ -4,12 +4,6 @@ Toolbar can be used to group related options. To emphasize groups of related ico
 
 ![Toolbar component above an image block](https://wordpress.org/gutenberg/files/2019/01/s_96EC471FE9C9D91A996770229947AAB54A03351BDE98F444FD3C1BF0CED365EA_1541782974545_ButtonGroup.png)
 
-## Table of contents
-
-1. [Design guidelines](#design-guidelines)
-2. [Development guidelines](#development-guidelines)
-3. [Related components](#related-components)
-
 ## Design guidelines
 
 ### Usage
@@ -80,6 +74,15 @@ Leave undefined for the default style. Or `'unstyled'` which removes the border
 -   Required: No
 -   Default: `undefined`
 
+#### `orientation`: `'horizontal' | 'vertical'`
+
+Specifies the toolbar's orientation.
+
+Leave undefined or 'horizontal' for horizontal orientation keyboard interactions, choose 'vertical' for the alternative.
+
+-   Required: No
+-   Default: `horizontal`
+
 ## Related components
 
 -   Toolbar may contain [ToolbarGroup](/packages/components/src/toolbar-group/README.md), [ToolbarButton](/packages/components/src/toolbar-button/README.md) and [ToolbarItem](/packages/components/src/toolbar-Item/README.md) as children.
diff --git a/packages/components/src/toolbar/toolbar/index.tsx b/packages/components/src/toolbar/toolbar/index.tsx
index 47c49b270afef2..ba2e8062aed85d 100644
--- a/packages/components/src/toolbar/toolbar/index.tsx
+++ b/packages/components/src/toolbar/toolbar/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ForwardedRef } from 'react';
 
 /**
@@ -60,7 +60,7 @@ function UnforwardedToolbar(
 		);
 	}
 	// `ToolbarGroup` already uses components-toolbar for compatibility reasons.
-	const finalClassName = classnames(
+	const finalClassName = clsx(
 		'components-accessible-toolbar',
 		className,
 		variant && `is-${ variant }`
diff --git a/packages/components/src/toolbar/toolbar/style.scss b/packages/components/src/toolbar/toolbar/style.scss
index fa581c13cc6467..c0cabacb84c77e 100644
--- a/packages/components/src/toolbar/toolbar/style.scss
+++ b/packages/components/src/toolbar/toolbar/style.scss
@@ -1,7 +1,7 @@
 .components-accessible-toolbar {
 	display: inline-flex;
 	border: $border-width solid $gray-900;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	flex-shrink: 0;
 
 	& > .components-toolbar-group:last-child {
@@ -20,6 +20,13 @@
 
 .components-accessible-toolbar,
 .components-toolbar {
+
+	&[aria-orientation="vertical"] {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
 	.components-button {
 		position: relative;
 		height: $block-toolbar-height;
@@ -40,7 +47,7 @@
 			content: "";
 			position: absolute;
 			display: block;
-			border-radius: $radius-block-ui;
+			border-radius: $radius-small;
 			height: $grid-unit-40;
 
 			// Position the focus rectangle.
@@ -84,22 +91,10 @@
 		// This needs specificity.
 		&.has-icon.has-icon {
 			// Reduce the default padding when a button only has an icon.
-			padding-left: $grid-unit-15;
-			padding-right: $grid-unit-15;
+			padding-left: $grid-unit-10;
+			padding-right: $grid-unit-10;
 			min-width: $block-toolbar-height;
 		}
-
-		// @todo: We should extract the tabs styles to the tabs component itself
-		&.components-tab-button {
-			font-weight: 500;
-
-			span {
-				display: inline-block;
-				padding-left: 0;
-				padding-right: 0;
-				position: relative;
-			}
-		}
 	}
 }
 
diff --git a/packages/components/src/toolbar/toolbar/toolbar-container.tsx b/packages/components/src/toolbar/toolbar/toolbar-container.tsx
index 5f64ecb3d20cd0..5a12ba61c5d8a3 100644
--- a/packages/components/src/toolbar/toolbar/toolbar-container.tsx
+++ b/packages/components/src/toolbar/toolbar/toolbar-container.tsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
 import type { ForwardedRef } from 'react';
 
diff --git a/packages/components/src/toolbar/toolbar/types.ts b/packages/components/src/toolbar/toolbar/types.ts
index 681f1ab2d1af2d..bf9ecc56292931 100644
--- a/packages/components/src/toolbar/toolbar/types.ts
+++ b/packages/components/src/toolbar/toolbar/types.ts
@@ -22,4 +22,10 @@ export type ToolbarProps = {
 	 * @default undefined
 	 */
 	variant?: 'unstyled' | undefined;
+	/**
+	 * Orientation of the toolbar keyboard interactions.
+	 *
+	 * @default 'horizontal'
+	 */
+	orientation?: 'horizontal' | 'vertical';
 };
diff --git a/packages/components/src/tools-panel/stories/index.story.tsx b/packages/components/src/tools-panel/stories/index.story.tsx
index 62b8a22ee447e8..459932c9d22d7a 100644
--- a/packages/components/src/tools-panel/stories/index.story.tsx
+++ b/packages/components/src/tools-panel/stories/index.story.tsx
@@ -71,7 +71,7 @@ export const Default: StoryFn< typeof ToolsPanel > = ( {
 						hasValue={ () => !! width }
 						label="Width"
 						onDeselect={ () => setWidth( undefined ) }
-						isShownByDefault={ true }
+						isShownByDefault
 					>
 						<UnitControl
 							label="Width"
@@ -83,7 +83,7 @@ export const Default: StoryFn< typeof ToolsPanel > = ( {
 						hasValue={ () => !! height }
 						label="Height"
 						onDeselect={ () => setHeight( undefined ) }
-						isShownByDefault={ true }
+						isShownByDefault
 					>
 						<UnitControl
 							label="Height"
@@ -95,7 +95,7 @@ export const Default: StoryFn< typeof ToolsPanel > = ( {
 						hasValue={ () => !! minHeight }
 						label="Minimum height"
 						onDeselect={ () => setMinHeight( undefined ) }
-						isShownByDefault={ true }
+						isShownByDefault
 					>
 						<UnitControl
 							label="Minimum height"
@@ -163,7 +163,7 @@ export const WithNonToolsPanelItems: StoryFn< typeof ToolsPanel > = ( {
 						hasValue={ () => !! width }
 						label="Width"
 						onDeselect={ () => setWidth( undefined ) }
-						isShownByDefault={ true }
+						isShownByDefault
 					>
 						<UnitControl
 							label="Width"
@@ -175,7 +175,7 @@ export const WithNonToolsPanelItems: StoryFn< typeof ToolsPanel > = ( {
 						hasValue={ () => !! height }
 						label="Height"
 						onDeselect={ () => setHeight( undefined ) }
-						isShownByDefault={ true }
+						isShownByDefault
 					>
 						<UnitControl
 							label="Height"
@@ -367,7 +367,7 @@ export const WithSlotFillItems: StoryFn< typeof ToolsPanel > = ( {
 					label="Item for alternate panel"
 					onDeselect={ () => undefined }
 					resetAllFilter={ () => undefined }
-					panelId={ 'intended-for-another-panel-via-shared-slot' }
+					panelId="intended-for-another-panel-via-shared-slot"
 				>
 					<p>
 						This panel item will not be displayed in the demo as its
@@ -437,7 +437,7 @@ export const WithConditionalDefaultControl: StoryFn< typeof ToolsPanel > = ( {
 					onDeselect={ () => updateAttribute( 'height', undefined ) }
 					resetAllFilter={ () => ( { height: undefined } ) }
 					panelId={ panelId }
-					isShownByDefault={ true }
+					isShownByDefault
 				>
 					<UnitControl
 						label="Injected Height"
@@ -536,7 +536,7 @@ export const WithConditionallyRenderedControl: StoryFn<
 					} }
 					resetAllFilter={ () => ( { height: undefined } ) }
 					panelId={ panelId }
-					isShownByDefault={ true }
+					isShownByDefault
 				>
 					<UnitControl
 						label="Injected Height"
@@ -555,7 +555,7 @@ export const WithConditionallyRenderedControl: StoryFn<
 						}
 						resetAllFilter={ () => ( { scale: undefined } ) }
 						panelId={ panelId }
-						isShownByDefault={ true }
+						isShownByDefault
 					>
 						<ToggleGroupControl
 							__nextHasNoMarginBottom
diff --git a/packages/components/src/tools-panel/styles.ts b/packages/components/src/tools-panel/styles.ts
index 1da1003c0462e3..11536e98a128a9 100644
--- a/packages/components/src/tools-panel/styles.ts
+++ b/packages/components/src/tools-panel/styles.ts
@@ -21,7 +21,7 @@ const toolsPanelGrid = {
 		grid-template-columns: ${ `repeat( ${ columns }, minmax(0, 1fr) )` };
 	`,
 	spacing: css`
-		column-gap: ${ space( 2 ) };
+		column-gap: ${ space( 4 ) };
 		row-gap: ${ space( 4 ) };
 	`,
 	item: {
diff --git a/packages/components/src/tools-panel/test/index.tsx b/packages/components/src/tools-panel/test/index.tsx
index 812a21ec0d76ea..8d2c4f17a8b170 100644
--- a/packages/components/src/tools-panel/test/index.tsx
+++ b/packages/components/src/tools-panel/test/index.tsx
@@ -222,10 +222,7 @@ describe( 'ToolsPanel', () => {
 					<ToolsPanelItem { ...controlProps }>
 						<div>Example control</div>
 					</ToolsPanelItem>
-					<ToolsPanelItem
-						{ ...altControlProps }
-						isShownByDefault={ true }
-					>
+					<ToolsPanelItem { ...altControlProps } isShownByDefault>
 						<div>Alt control</div>
 					</ToolsPanelItem>
 				</ToolsPanel>
@@ -413,10 +410,7 @@ describe( 'ToolsPanel', () => {
 		it( 'should continue to render shown by default item after it is toggled off via menu item', async () => {
 			render(
 				<ToolsPanel { ...defaultProps }>
-					<ToolsPanelItem
-						{ ...controlProps }
-						isShownByDefault={ true }
-					>
+					<ToolsPanelItem { ...controlProps } isShownByDefault>
 						<div>Default control</div>
 					</ToolsPanelItem>
 				</ToolsPanel>
@@ -440,10 +434,7 @@ describe( 'ToolsPanel', () => {
 		it( 'should render appropriate menu groups', async () => {
 			render(
 				<ToolsPanel { ...defaultProps }>
-					<ToolsPanelItem
-						{ ...controlProps }
-						isShownByDefault={ true }
-					>
+					<ToolsPanelItem { ...controlProps } isShownByDefault>
 						<div>Default control</div>
 					</ToolsPanelItem>
 					<ToolsPanelItem { ...altControlProps }>
@@ -455,16 +446,13 @@ describe( 'ToolsPanel', () => {
 
 			const menuGroups = screen.getAllByRole( 'group' );
 
-			// Groups should be: default controls, optional controls & reset all.
-			expect( menuGroups.length ).toEqual( 3 );
+			// There are now only two groups controls & reset all.
+			expect( menuGroups.length ).toEqual( 2 );
 		} );
 
 		it( 'should not render contents of items when in placeholder state', () => {
 			render(
-				<ToolsPanel
-					{ ...defaultProps }
-					shouldRenderPlaceholderItems={ true }
-				>
+				<ToolsPanel { ...defaultProps } shouldRenderPlaceholderItems>
 					<ToolsPanelItem { ...altControlProps }>
 						<div>Optional control</div>
 					</ToolsPanelItem>
@@ -493,10 +481,7 @@ describe( 'ToolsPanel', () => {
 
 			const TestPanel = () => (
 				<ToolsPanel { ...defaultProps }>
-					<ToolsPanelItem
-						{ ...altControlProps }
-						isShownByDefault={ true }
-					>
+					<ToolsPanelItem { ...altControlProps } isShownByDefault>
 						<div>Default control</div>
 					</ToolsPanelItem>
 					<ToolsPanelItem
@@ -517,15 +502,11 @@ describe( 'ToolsPanel', () => {
 
 			await openDropdownMenu();
 
-			// The linked control should initially appear in the optional controls
-			// menu group. There should be three menu groups: default controls,
-			// optional controls, and the group to reset all options.
 			let menuGroups = screen.getAllByRole( 'group' );
-			expect( menuGroups.length ).toEqual( 3 );
 
-			// The linked control should be in the second group, of optional controls.
+			// The linked control should be in the first group of controls.
 			expect(
-				within( menuGroups[ 1 ] ).getByText( 'Linked' )
+				within( menuGroups[ 0 ] ).getByText( 'Linked' )
 			).toBeInTheDocument();
 
 			// Simulate the main control having a value set which should
@@ -540,22 +521,18 @@ describe( 'ToolsPanel', () => {
 			linkedItem = screen.getByText( 'Linked control' );
 			expect( linkedItem ).toBeInTheDocument();
 
-			// The linked control should now appear in the default controls
-			// menu group and have been removed from the optional group.
+			// The linked control should still appear in the controls
+			// menu group but as a default control.
 			menuGroups = screen.getAllByRole( 'group' );
 
-			// There should now only be two groups. The default controls and
-			// and the group for the reset all option.
-			expect( menuGroups.length ).toEqual( 2 );
-
-			// The new default control item for the Linked control should be
-			// within the first menu group.
+			// The new default control item for the Linked control should still
+			// be within the first menu group.
 			const defaultItem = within( menuGroups[ 0 ] ).getByText( 'Linked' );
 			expect( defaultItem ).toBeInTheDocument();
 
 			// Optional controls have an additional aria-label. This can be used
-			// to confirm the conditional default control has been removed from
-			// the optional menu item group.
+			// to confirm the conditional default control is now being treated
+			// as default control.
 			expect(
 				screen.queryByRole( 'menuitemcheckbox', {
 					name: 'Show Linked',
@@ -576,16 +553,13 @@ describe( 'ToolsPanel', () => {
 
 			const TestPanel = () => (
 				<ToolsPanel { ...defaultProps }>
-					<ToolsPanelItem
-						{ ...altControlProps }
-						isShownByDefault={ true }
-					>
+					<ToolsPanelItem { ...altControlProps } isShownByDefault>
 						<div>Default control</div>
 					</ToolsPanelItem>
 					{ !! altControlValue && (
 						<ToolsPanelItem
 							{ ...conditionalControlProps }
-							isShownByDefault={ true }
+							isShownByDefault
 						>
 							<div>Conditional control</div>
 						</ToolsPanelItem>
@@ -599,7 +573,7 @@ describe( 'ToolsPanel', () => {
 			let conditionalItem = screen.queryByText( 'Conditional control' );
 			expect( conditionalItem ).not.toBeInTheDocument();
 
-			// The conditional control should not yet appear in the default controls
+			// The conditional control should not yet appear in the controls
 			// menu group.
 			await openDropdownMenu();
 			let menuGroups = screen.getAllByRole( 'group' );
@@ -619,7 +593,7 @@ describe( 'ToolsPanel', () => {
 			conditionalItem = screen.getByText( 'Conditional control' );
 			expect( conditionalItem ).toBeInTheDocument();
 
-			// The conditional control should now appear in the default controls
+			// The conditional control should now appear in the controls
 			// menu group.
 			menuGroups = screen.getAllByRole( 'group' );
 
@@ -1348,7 +1322,7 @@ describe( 'ToolsPanel', () => {
 							{ ...altControlProps }
 							label="Item 3"
 							data-testid="item-3"
-							isShownByDefault={ true }
+							isShownByDefault
 						>
 							<div>Item 3</div>
 						</ToolsPanelItem>
@@ -1360,8 +1334,8 @@ describe( 'ToolsPanel', () => {
 					</ToolsPanelItems>
 					<ToolsPanel
 						{ ...defaultProps }
-						hasInnerWrapper={ true }
-						shouldRenderPlaceholderItems={ true }
+						hasInnerWrapper
+						shouldRenderPlaceholderItems
 						__experimentalFirstVisibleItemClass="first"
 						__experimentalLastVisibleItemClass="last"
 					>
diff --git a/packages/components/src/tools-panel/tools-panel-header/README.md b/packages/components/src/tools-panel/tools-panel-header/README.md
index e6164306dbee31..85e5aae5043948 100644
--- a/packages/components/src/tools-panel/tools-panel-header/README.md
+++ b/packages/components/src/tools-panel/tools-panel-header/README.md
@@ -18,6 +18,13 @@ This component is generated automatically by its parent
 
 ## Props
 
+### `dropdownMenuProps`: `{}`
+
+The dropdown menu props to configure the panel's `DropdownMenu`.
+
+-   Type: `DropdownMenuProps`
+-   Required: No
+
 ### `headingLevel`: `1 | 2 | 3 | 4 | 5 | 6 | '1' | '2' | '3' | '4' | '5' | '6'`
 
 The heading level of the panel's header.
diff --git a/packages/components/src/tools-panel/tools-panel-header/component.tsx b/packages/components/src/tools-panel/tools-panel-header/component.tsx
index a48ddac3bc34a0..5caf9ce82d64f2 100644
--- a/packages/components/src/tools-panel/tools-panel-header/component.tsx
+++ b/packages/components/src/tools-panel/tools-panel-header/component.tsx
@@ -39,7 +39,7 @@ const DefaultControlsGroup = ( {
 	const resetSuffix = <ResetLabel aria-hidden>{ __( 'Reset' ) }</ResetLabel>;
 
 	return (
-		<MenuGroup label={ __( 'Defaults' ) }>
+		<>
 			{ items.map( ( [ label, hasValue ] ) => {
 				if ( hasValue ) {
 					return (
@@ -73,6 +73,7 @@ const DefaultControlsGroup = ( {
 				return (
 					<MenuItem
 						key={ label }
+						icon={ check }
 						className={ itemClassName }
 						role="menuitemcheckbox"
 						isSelected
@@ -82,7 +83,7 @@ const DefaultControlsGroup = ( {
 					</MenuItem>
 				);
 			} ) }
-		</MenuGroup>
+		</>
 	);
 };
 
@@ -95,7 +96,7 @@ const OptionalControlsGroup = ( {
 	}
 
 	return (
-		<MenuGroup label={ __( 'Tools' ) }>
+		<>
 			{ items.map( ( [ label, isSelected ] ) => {
 				const itemLabel = isSelected
 					? sprintf(
@@ -143,7 +144,7 @@ const OptionalControlsGroup = ( {
 					</MenuItem>
 				);
 			} ) }
-		</MenuGroup>
+		</>
 	);
 };
 
@@ -162,6 +163,7 @@ const ToolsPanelHeader = (
 		menuItems,
 		resetAll,
 		toggleItem,
+		dropdownMenuProps,
 		...headerProps
 	} = useToolsPanelHeader( props );
 
@@ -192,32 +194,37 @@ const ToolsPanelHeader = (
 			</Heading>
 			{ hasMenuItems && (
 				<DropdownMenu
+					{ ...dropdownMenuProps }
 					icon={ dropDownMenuIcon }
 					label={ dropDownMenuLabelText }
 					menuProps={ { className: dropdownMenuClassName } }
 					toggleProps={ {
-						isSmall: true,
-						describedBy: dropdownMenuDescriptionText,
+						size: 'small',
+						description: dropdownMenuDescriptionText,
 					} }
 				>
 					{ () => (
 						<>
-							<DefaultControlsGroup
-								items={ defaultItems }
-								toggleItem={ toggleItem }
-								itemClassName={ defaultControlsItemClassName }
-							/>
-							<OptionalControlsGroup
-								items={ optionalItems }
-								toggleItem={ toggleItem }
-							/>
+							<MenuGroup label={ labelText }>
+								<DefaultControlsGroup
+									items={ defaultItems }
+									toggleItem={ toggleItem }
+									itemClassName={
+										defaultControlsItemClassName
+									}
+								/>
+								<OptionalControlsGroup
+									items={ optionalItems }
+									toggleItem={ toggleItem }
+								/>
+							</MenuGroup>
 							<MenuGroup>
 								<MenuItem
 									aria-disabled={ ! canResetAll }
 									// @ts-expect-error - TODO: If this "tertiary" style is something we really want to allow on MenuItem,
 									// we should rename it and explicitly allow it as an official API. All the other Button variants
 									// don't make sense in a MenuItem context, and should be disallowed.
-									variant={ 'tertiary' }
+									variant="tertiary"
 									onClick={ () => {
 										if ( canResetAll ) {
 											resetAll();
diff --git a/packages/components/src/tools-panel/tools-panel-item/hook.ts b/packages/components/src/tools-panel/tools-panel-item/hook.ts
index fe415b8723a88f..e0a1f0139dcace 100644
--- a/packages/components/src/tools-panel/tools-panel-item/hook.ts
+++ b/packages/components/src/tools-panel/tools-panel-item/hook.ts
@@ -54,11 +54,9 @@ export function useToolsPanelItem(
 
 	// hasValue is a new function on every render, so do not add it as a
 	// dependency to the useCallback hook! If needed, we should use a ref.
-	// eslint-disable-next-line react-hooks/exhaustive-deps
 	const hasValueCallback = useCallback( hasValue, [ panelId ] );
 	// resetAllFilter is a new function on every render, so do not add it as a
 	// dependency to the useCallback hook! If needed, we should use a ref.
-	// eslint-disable-next-line react-hooks/exhaustive-deps
 	const resetAllFilterCallback = useCallback( resetAllFilter, [ panelId ] );
 	const previousPanelId = usePrevious( currentPanelId );
 
@@ -125,17 +123,21 @@ export function useToolsPanelItem(
 	const isRegistered = menuItems?.[ menuGroup ]?.[ label ] !== undefined;
 
 	const isValueSet = hasValue();
-	const wasValueSet = usePrevious( isValueSet );
-	const newValueSet = isValueSet && ! wasValueSet;
-
-	// Notify the panel when an item's value has been set.
+	// Notify the panel when an item's value has changed except for optional
+	// items without value because the item should not cause itself to hide.
 	useEffect( () => {
-		if ( ! newValueSet ) {
+		if ( ! isShownByDefault && ! isValueSet ) {
 			return;
 		}
 
-		flagItemCustomization( label, menuGroup );
-	}, [ newValueSet, menuGroup, label, flagItemCustomization ] );
+		flagItemCustomization( isValueSet, label, menuGroup );
+	}, [
+		isValueSet,
+		menuGroup,
+		label,
+		flagItemCustomization,
+		isShownByDefault,
+	] );
 
 	// Determine if the panel item's corresponding menu is being toggled and
 	// trigger appropriate callback if it is.
@@ -151,7 +153,7 @@ export function useToolsPanelItem(
 			onSelect?.();
 		}
 
-		if ( ! isMenuItemChecked && wasMenuItemChecked ) {
+		if ( ! isMenuItemChecked && isValueSet && wasMenuItemChecked ) {
 			onDeselect?.();
 		}
 	}, [
diff --git a/packages/components/src/tools-panel/tools-panel/README.md b/packages/components/src/tools-panel/tools-panel/README.md
index 0ee251592d67b1..1daa7537335e1c 100644
--- a/packages/components/src/tools-panel/tools-panel/README.md
+++ b/packages/components/src/tools-panel/tools-panel/README.md
@@ -60,7 +60,7 @@ import styled from '@emotion/styled';
  * WordPress dependencies
  */
 import {
-	__experimentalBoxControl as BoxControl,
+	BoxControl,
 	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
 	__experimentalUnitControl as UnitControl,
@@ -91,8 +91,8 @@ export function DimensionPanel() {
 	return (
 		<ToolsPanel label={ __( 'Dimensions' ) } resetAll={ resetAll }>
 			<PanelDescription>
-				Select dimensions or spacing related settings from the
-				menu for additional controls.
+				Select dimensions or spacing related settings from the menu for
+				additional controls.
 			</PanelDescription>
 			<SingleColumnItem
 				hasValue={ () => !! height }
@@ -154,8 +154,15 @@ export function DimensionPanel() {
 Flags that the items in this ToolsPanel will be contained within an inner
 wrapper element allowing the panel to lay them out accordingly.
 
-- Required: No
-- Default: `false`
+-   Required: No
+-   Default: `false`
+
+### `dropdownMenuProps`: `{}`
+
+The popover props to configure panel's `DropdownMenu`.
+
+-   Type: `DropdownMenuProps`
+-   Required: No
 
 ### `headingLevel`: `1 | 2 | 3 | 4 | 5 | 6 | '1' | '2' | '3' | '4' | '5' | '6'`
 
@@ -169,7 +176,7 @@ The heading level of the panel's header.
 Text to be displayed within the panel's header and as the `aria-label` for the
 panel's dropdown menu.
 
-- Required: Yes
+-   Required: Yes
 
 ### `panelId`: `string | null`
 
@@ -178,13 +185,13 @@ to restrict panel items. When a `panelId` is set, items can only register
 themselves if the `panelId` is explicitly `null` or the item's `panelId` matches
 exactly.
 
-- Required: No
+-   Required: No
 
 ### `resetAll`: `( filters?: ResetAllFilter[] ) => void`
 
 A function to call when the `Reset all` menu option is selected. As an argument, it receives an array containing the `resetAllFilter` callbacks of all the valid registered `ToolsPanelItems`.
 
-- Required: Yes
+-   Required: Yes
 
 ### `shouldRenderPlaceholderItems`: `boolean`
 
@@ -194,5 +201,5 @@ placeholder content (instead of `null`) when they are toggled off and hidden.
 Note that placeholder items won't apply the `className` that would be
 normally applied to a visible `ToolsPanelItem` via the `className` prop.
 
-- Required: No
-- Default: `false`
+-   Required: No
+-   Default: `false`
diff --git a/packages/components/src/tools-panel/tools-panel/component.tsx b/packages/components/src/tools-panel/tools-panel/component.tsx
index 660a782e810214..4e01e39ffffb43 100644
--- a/packages/components/src/tools-panel/tools-panel/component.tsx
+++ b/packages/components/src/tools-panel/tools-panel/component.tsx
@@ -25,6 +25,7 @@ const UnconnectedToolsPanel = (
 		resetAllItems,
 		toggleItem,
 		headingLevel,
+		dropdownMenuProps,
 		...toolsPanelProps
 	} = useToolsPanel( props );
 
@@ -36,6 +37,7 @@ const UnconnectedToolsPanel = (
 					resetAll={ resetAllItems }
 					toggleItem={ toggleItem }
 					headingLevel={ headingLevel }
+					dropdownMenuProps={ dropdownMenuProps }
 				/>
 				{ children }
 			</ToolsPanelContext.Provider>
diff --git a/packages/components/src/tools-panel/tools-panel/hook.ts b/packages/components/src/tools-panel/tools-panel/hook.ts
index 8a38a15084b33c..583a079ab20026 100644
--- a/packages/components/src/tools-panel/tools-panel/hook.ts
+++ b/packages/components/src/tools-panel/tools-panel/hook.ts
@@ -5,8 +5,8 @@ import {
 	useCallback,
 	useEffect,
 	useMemo,
+	useReducer,
 	useRef,
-	useState,
 } from '@wordpress/element';
 
 /**
@@ -27,14 +27,40 @@ import type {
 
 const DEFAULT_COLUMNS = 2;
 
+type PanelItemsState = {
+	panelItems: ToolsPanelItem[];
+	menuItemOrder: string[];
+	menuItems: ToolsPanelMenuItems;
+};
+
+type PanelItemsAction =
+	| { type: 'REGISTER_PANEL'; item: ToolsPanelItem }
+	| { type: 'UNREGISTER_PANEL'; label: string }
+	| {
+			type: 'UPDATE_VALUE';
+			group: ToolsPanelMenuItemKey;
+			label: string;
+			value: boolean;
+	  }
+	| { type: 'TOGGLE_VALUE'; label: string }
+	| { type: 'RESET_ALL' };
+
+function emptyMenuItems(): ToolsPanelMenuItems {
+	return { default: {}, optional: {} };
+}
+
+function emptyState(): PanelItemsState {
+	return { panelItems: [], menuItemOrder: [], menuItems: emptyMenuItems() };
+}
+
 const generateMenuItems = ( {
 	panelItems,
 	shouldReset,
 	currentMenuItems,
 	menuItemOrder,
 }: ToolsPanelMenuItemsConfig ) => {
-	const newMenuItems: ToolsPanelMenuItems = { default: {}, optional: {} };
-	const menuItems: ToolsPanelMenuItems = { default: {}, optional: {} };
+	const newMenuItems: ToolsPanelMenuItems = emptyMenuItems();
+	const menuItems: ToolsPanelMenuItems = emptyMenuItems();
 
 	panelItems.forEach( ( { hasValue, isShownByDefault, label } ) => {
 		const group = isShownByDefault ? 'default' : 'optional';
@@ -75,9 +101,149 @@ const generateMenuItems = ( {
 	return menuItems;
 };
 
+function panelItemsReducer(
+	panelItems: ToolsPanelItem[],
+	action: PanelItemsAction
+) {
+	switch ( action.type ) {
+		case 'REGISTER_PANEL': {
+			const newItems = [ ...panelItems ];
+			// If an item with this label has already been registered, remove it
+			// first. This can happen when an item is moved between the default
+			// and optional groups.
+			const existingIndex = newItems.findIndex(
+				( oldItem ) => oldItem.label === action.item.label
+			);
+			if ( existingIndex !== -1 ) {
+				newItems.splice( existingIndex, 1 );
+			}
+			newItems.push( action.item );
+			return newItems;
+		}
+		case 'UNREGISTER_PANEL': {
+			const index = panelItems.findIndex(
+				( item ) => item.label === action.label
+			);
+			if ( index !== -1 ) {
+				const newItems = [ ...panelItems ];
+				newItems.splice( index, 1 );
+				return newItems;
+			}
+			return panelItems;
+		}
+		default:
+			return panelItems;
+	}
+}
+
+function menuItemOrderReducer(
+	menuItemOrder: string[],
+	action: PanelItemsAction
+) {
+	switch ( action.type ) {
+		case 'REGISTER_PANEL': {
+			// Track the initial order of item registration. This is used for
+			// maintaining menu item order later.
+			if ( menuItemOrder.includes( action.item.label ) ) {
+				return menuItemOrder;
+			}
+
+			return [ ...menuItemOrder, action.item.label ];
+		}
+		default:
+			return menuItemOrder;
+	}
+}
+
+function menuItemsReducer( state: PanelItemsState, action: PanelItemsAction ) {
+	switch ( action.type ) {
+		case 'REGISTER_PANEL':
+		case 'UNREGISTER_PANEL':
+			// generate new menu items from original `menuItems` and updated `panelItems` and `menuItemOrder`
+			return generateMenuItems( {
+				currentMenuItems: state.menuItems,
+				panelItems: state.panelItems,
+				menuItemOrder: state.menuItemOrder,
+				shouldReset: false,
+			} );
+		case 'RESET_ALL':
+			return generateMenuItems( {
+				panelItems: state.panelItems,
+				menuItemOrder: state.menuItemOrder,
+				shouldReset: true,
+			} );
+		case 'UPDATE_VALUE': {
+			const oldValue = state.menuItems[ action.group ][ action.label ];
+			if ( action.value === oldValue ) {
+				return state.menuItems;
+			}
+			return {
+				...state.menuItems,
+				[ action.group ]: {
+					...state.menuItems[ action.group ],
+					[ action.label ]: action.value,
+				},
+			};
+		}
+		case 'TOGGLE_VALUE': {
+			const currentItem = state.panelItems.find(
+				( item ) => item.label === action.label
+			);
+
+			if ( ! currentItem ) {
+				return state.menuItems;
+			}
+
+			const menuGroup = currentItem.isShownByDefault
+				? 'default'
+				: 'optional';
+
+			const newMenuItems = {
+				...state.menuItems,
+				[ menuGroup ]: {
+					...state.menuItems[ menuGroup ],
+					[ action.label ]:
+						! state.menuItems[ menuGroup ][ action.label ],
+				},
+			};
+			return newMenuItems;
+		}
+
+		default:
+			return state.menuItems;
+	}
+}
+
+function panelReducer( state: PanelItemsState, action: PanelItemsAction ) {
+	const panelItems = panelItemsReducer( state.panelItems, action );
+	const menuItemOrder = menuItemOrderReducer( state.menuItemOrder, action );
+	// `menuItemsReducer` is a bit unusual because it generates new state from original `menuItems`
+	// and the updated `panelItems` and `menuItemOrder`.
+	const menuItems = menuItemsReducer(
+		{ panelItems, menuItemOrder, menuItems: state.menuItems },
+		action
+	);
+
+	return { panelItems, menuItemOrder, menuItems };
+}
+
+function resetAllFiltersReducer(
+	filters: ResetAllFilter[],
+	action: { type: 'REGISTER' | 'UNREGISTER'; filter: ResetAllFilter }
+) {
+	switch ( action.type ) {
+		case 'REGISTER':
+			return [ ...filters, action.filter ];
+		case 'UNREGISTER':
+			return filters.filter( ( f ) => f !== action.filter );
+		default:
+			return filters;
+	}
+}
+
 const isMenuItemTypeEmpty = (
-	obj?: ToolsPanelMenuItems[ ToolsPanelMenuItemKey ]
-) => obj && Object.keys( obj ).length === 0;
+	obj: ToolsPanelMenuItems[ ToolsPanelMenuItemKey ]
+) => Object.keys( obj ).length === 0;
 
 export function useToolsPanel(
 	props: WordPressComponentProps< ToolsPanelProps, 'div' >
@@ -94,155 +260,84 @@ export function useToolsPanel(
 		...otherProps
 	} = useContextSystem( props, 'ToolsPanel' );
 
-	const isResetting = useRef( false );
-	const wasResetting = isResetting.current;
+	const isResettingRef = useRef( false );
+	const wasResetting = isResettingRef.current;
 
-	// `isResetting` is cleared via this hook to effectively batch together
+	// `isResettingRef` is cleared via this hook to effectively batch together
 	// the resetAll task. Without this, the flag is cleared after the first
 	// control updates and forces a rerender with subsequent controls then
 	// believing they need to reset, unfortunately using stale data.
 	useEffect( () => {
 		if ( wasResetting ) {
-			isResetting.current = false;
+			isResettingRef.current = false;
 		}
 	}, [ wasResetting ] );
 
 	// Allow panel items to register themselves.
-	const [ panelItems, setPanelItems ] = useState< ToolsPanelItem[] >( [] );
-	const [ menuItemOrder, setMenuItemOrder ] = useState< string[] >( [] );
-	const [ resetAllFilters, setResetAllFilters ] = useState<
-		ResetAllFilter[]
-	>( [] );
-
-	const registerPanelItem = useCallback(
-		( item: ToolsPanelItem ) => {
-			// Add item to panel items.
-			setPanelItems( ( items ) => {
-				const newItems = [ ...items ];
-				// If an item with this label has already been registered, remove it
-				// first. This can happen when an item is moved between the default
-				// and optional groups.
-				const existingIndex = newItems.findIndex(
-					( oldItem ) => oldItem.label === item.label
-				);
-				if ( existingIndex !== -1 ) {
-					newItems.splice( existingIndex, 1 );
-				}
-				return [ ...newItems, item ];
-			} );
-
-			// Track the initial order of item registration. This is used for
-			// maintaining menu item order later.
-			setMenuItemOrder( ( items ) => {
-				if ( items.includes( item.label ) ) {
-					return items;
-				}
+	const [ { panelItems, menuItems }, panelDispatch ] = useReducer(
+		panelReducer,
+		undefined,
+		emptyState
+	);
 
-				return [ ...items, item.label ];
-			} );
-		},
-		[ setPanelItems, setMenuItemOrder ]
+	const [ resetAllFilters, dispatchResetAllFilters ] = useReducer(
+		resetAllFiltersReducer,
+		[]
 	);
 
+	const registerPanelItem = useCallback( ( item: ToolsPanelItem ) => {
+		// Add item to panel items.
+		panelDispatch( { type: 'REGISTER_PANEL', item } );
+	}, [] );
+
 	// Panels need to deregister on unmount to avoid orphans in menu state.
 	// This is an issue when panel items are being injected via SlotFills.
-	const deregisterPanelItem = useCallback(
-		( label: string ) => {
-			// When switching selections between components injecting matching
-			// controls, e.g. both panels have a "padding" control, the
-			// deregistration of the first panel doesn't occur until after the
-			// registration of the next.
-			setPanelItems( ( items ) => {
-				const newItems = [ ...items ];
-				const index = newItems.findIndex(
-					( item ) => item.label === label
-				);
-				if ( index !== -1 ) {
-					newItems.splice( index, 1 );
-				}
-				return newItems;
-			} );
-		},
-		[ setPanelItems ]
-	);
-
-	const registerResetAllFilter = useCallback(
-		( newFilter: ResetAllFilter ) => {
-			setResetAllFilters( ( filters ) => {
-				return [ ...filters, newFilter ];
-			} );
-		},
-		[ setResetAllFilters ]
-	);
+	const deregisterPanelItem = useCallback( ( label: string ) => {
+		// When switching selections between components injecting matching
+		// controls, e.g. both panels have a "padding" control, the
+		// deregistration of the first panel doesn't occur until after the
+		// registration of the next.
+		panelDispatch( { type: 'UNREGISTER_PANEL', label } );
+	}, [] );
+
+	const registerResetAllFilter = useCallback( ( filter: ResetAllFilter ) => {
+		dispatchResetAllFilters( { type: 'REGISTER', filter } );
+	}, [] );
 
 	const deregisterResetAllFilter = useCallback(
-		( filterToRemove: ResetAllFilter ) => {
-			setResetAllFilters( ( filters ) => {
-				return filters.filter(
-					( filter ) => filter !== filterToRemove
-				);
-			} );
+		( filter: ResetAllFilter ) => {
+			dispatchResetAllFilters( { type: 'UNREGISTER', filter } );
 		},
-		[ setResetAllFilters ]
+		[]
 	);
 
-	// Manage and share display state of menu items representing child controls.
-	const [ menuItems, setMenuItems ] = useState< ToolsPanelMenuItems >( {
-		default: {},
-		optional: {},
-	} );
-
-	// Setup menuItems state as panel items register themselves.
-	useEffect( () => {
-		setMenuItems( ( prevState ) => {
-			const items = generateMenuItems( {
-				panelItems,
-				shouldReset: false,
-				currentMenuItems: prevState,
-				menuItemOrder,
-			} );
-			return items;
-		} );
-	}, [ panelItems, setMenuItems, menuItemOrder ] );
-
-	// Force a menu item to be checked.
-	// This is intended for use with default panel items. They are displayed
-	// separately to optional items and have different display states,
-	// we need to update that when their value is customized.
+	// Updates the status of the panel’s menu items. For default items the
+	// value represents whether it differs from the default and for optional
+	// items whether the item is shown.
 	const flagItemCustomization = useCallback(
-		( label: string, group: ToolsPanelMenuItemKey = 'default' ) => {
-			setMenuItems( ( items ) => {
-				const newState = {
-					...items,
-					[ group ]: {
-						...items[ group ],
-						[ label ]: true,
-					},
-				};
-				return newState;
-			} );
+		(
+			value: boolean,
+			label: string,
+			group: ToolsPanelMenuItemKey = 'default'
+		) => {
+			panelDispatch( { type: 'UPDATE_VALUE', group, label, value } );
 		},
-		[ setMenuItems ]
+		[]
 	);
 
 	// Whether all optional menu items are hidden or not must be tracked
 	// in order to later determine if the panel display is empty and handle
 	// conditional display of a plus icon to indicate the presence of further
 	// menu items.
-	const [ areAllOptionalControlsHidden, setAreAllOptionalControlsHidden ] =
-		useState( false );
-
-	useEffect( () => {
-		if (
-			isMenuItemTypeEmpty( menuItems?.default ) &&
-			! isMenuItemTypeEmpty( menuItems?.optional )
-		) {
-			const allControlsHidden = ! Object.entries(
-				menuItems.optional
-			).some( ( [ , isSelected ] ) => isSelected );
-			setAreAllOptionalControlsHidden( allControlsHidden );
-		}
-	}, [ menuItems, setAreAllOptionalControlsHidden ] );
+	const areAllOptionalControlsHidden = useMemo( () => {
+		return (
+			isMenuItemTypeEmpty( menuItems.default ) &&
+			! isMenuItemTypeEmpty( menuItems.optional ) &&
+			Object.values( menuItems.optional ).every(
+				( isSelected ) => ! isSelected
+			)
+		);
+	}, [ menuItems ] );
 
 	const cx = useCx();
 	const classes = useMemo( () => {
@@ -250,9 +345,7 @@ export function useToolsPanel(
 			hasInnerWrapper &&
 			styles.ToolsPanelWithInnerWrapper( DEFAULT_COLUMNS );
 		const emptyStyle =
-			isMenuItemTypeEmpty( menuItems?.default ) &&
-			areAllOptionalControlsHidden &&
-			styles.ToolsPanelHiddenInnerWrapper;
+			areAllOptionalControlsHidden && styles.ToolsPanelHiddenInnerWrapper;
 
 		return cx(
 			styles.ToolsPanel( DEFAULT_COLUMNS ),
@@ -260,65 +353,31 @@ export function useToolsPanel(
 			emptyStyle,
 			className
 		);
-	}, [
-		areAllOptionalControlsHidden,
-		className,
-		cx,
-		hasInnerWrapper,
-		menuItems,
-	] );
+	}, [ areAllOptionalControlsHidden, className, cx, hasInnerWrapper ] );
 
 	// Toggle the checked state of a menu item which is then used to determine
 	// display of the item within the panel.
-	const toggleItem = useCallback(
-		( label: string ) => {
-			const currentItem = panelItems.find(
-				( item ) => item.label === label
-			);
-
-			if ( ! currentItem ) {
-				return;
-			}
-
-			const menuGroup = currentItem.isShownByDefault
-				? 'default'
-				: 'optional';
-
-			const newMenuItems = {
-				...menuItems,
-				[ menuGroup ]: {
-					...menuItems[ menuGroup ],
-					[ label ]: ! menuItems[ menuGroup ][ label ],
-				},
-			};
-
-			setMenuItems( newMenuItems );
-		},
-		[ menuItems, panelItems, setMenuItems ]
-	);
+	const toggleItem = useCallback( ( label: string ) => {
+		panelDispatch( { type: 'TOGGLE_VALUE', label } );
+	}, [] );
 
 	// Resets display of children and executes resetAll callback if available.
 	const resetAllItems = useCallback( () => {
 		if ( typeof resetAll === 'function' ) {
-			isResetting.current = true;
+			isResettingRef.current = true;
 			resetAll( resetAllFilters );
 		}
 
 		// Turn off display of all non-default items.
-		const resetMenuItems = generateMenuItems( {
-			panelItems,
-			menuItemOrder,
-			shouldReset: true,
-		} );
-		setMenuItems( resetMenuItems );
-	}, [ panelItems, resetAllFilters, resetAll, setMenuItems, menuItemOrder ] );
+		panelDispatch( { type: 'RESET_ALL' } );
+	}, [ resetAllFilters, resetAll ] );
 
 	// Assist ItemGroup styling when there are potentially hidden placeholder
 	// items by identifying first & last items that are toggled on for display.
 	const getFirstVisibleItemLabel = ( items: ToolsPanelItem[] ) => {
 		const optionalItems = menuItems.optional || {};
 		const firstItem = items.find(
-			( item ) => item.isShownByDefault || !! optionalItems[ item.label ]
+			( item ) => item.isShownByDefault || optionalItems[ item.label ]
 		);
 
 		return firstItem?.label;
@@ -329,6 +388,8 @@ export function useToolsPanel(
 		[ ...panelItems ].reverse()
 	);
 
+	const hasMenuItems = panelItems.length > 0;
+
 	const panelContext = useMemo(
 		() => ( {
 			areAllOptionalControlsHidden,
@@ -336,8 +397,8 @@ export function useToolsPanel(
 			deregisterResetAllFilter,
 			firstDisplayedItem,
 			flagItemCustomization,
-			hasMenuItems: !! panelItems.length,
-			isResetting: isResetting.current,
+			hasMenuItems,
+			isResetting: isResettingRef.current,
 			lastDisplayedItem,
 			menuItems,
 			panelId,
@@ -356,7 +417,7 @@ export function useToolsPanel(
 			lastDisplayedItem,
 			menuItems,
 			panelId,
-			panelItems,
+			hasMenuItems,
 			registerResetAllFilter,
 			registerPanelItem,
 			shouldRenderPlaceholderItems,
diff --git a/packages/components/src/tools-panel/types.ts b/packages/components/src/tools-panel/types.ts
index 3156137e580442..e8e2f950de9a30 100644
--- a/packages/components/src/tools-panel/types.ts
+++ b/packages/components/src/tools-panel/types.ts
@@ -7,6 +7,7 @@ import type { ReactNode } from 'react';
  * Internal dependencies
  */
 import type { HeadingSize } from '../heading/types';
+import type { DropdownMenu } from '../dropdown-menu';
 
 export type ResetAllFilter = ( attributes?: any ) => any;
 type ResetAll = ( filters?: ResetAllFilter[] ) => void;
@@ -16,6 +17,10 @@ export type ToolsPanelProps = {
 	 * The child elements.
 	 */
 	children: ReactNode;
+	/**
+	 * The dropdown menu props to configure the panel's `DropdownMenu`.
+	 */
+	dropdownMenuProps?: React.ComponentProps< typeof DropdownMenu >;
 	/**
 	 * Flags that the items in this ToolsPanel will be contained within an inner
 	 * wrapper element allowing the panel to lay them out accordingly.
@@ -69,6 +74,10 @@ export type ToolsPanelProps = {
 };
 
 export type ToolsPanelHeaderProps = {
+	/**
+	 * The dropdown menu props to configure the panel's `DropdownMenu`.
+	 */
+	dropdownMenuProps?: React.ComponentProps< typeof DropdownMenu >;
 	/**
 	 * The heading level of the panel's header.
 	 *
@@ -167,6 +176,7 @@ export type ToolsPanelContext = {
 	registerResetAllFilter: ( filter: ResetAllFilter ) => void;
 	deregisterResetAllFilter: ( filter: ResetAllFilter ) => void;
 	flagItemCustomization: (
+		value: boolean,
 		label: string,
 		group?: ToolsPanelMenuItemKey
 	) => void;
diff --git a/packages/components/src/tooltip/README.md b/packages/components/src/tooltip/README.md
index 9b214e8fc6b00e..ef2cd35d25543e 100644
--- a/packages/components/src/tooltip/README.md
+++ b/packages/components/src/tooltip/README.md
@@ -16,6 +16,10 @@ const MyTooltip = () => (
 );
 ```
 
+### Nested tooltips
+
+In case one or more `Tooltip` components are rendered inside another `Tooltip` component, only the tooltip associated to the outermost `Tooltip` component will be rendered in the browser and shown to the user appropriately. The rest of the nested `Tooltip` components will simply no-op and pass-through their anchor.
+
 ## Props
 
 The component accepts the following props:
diff --git a/packages/components/src/tooltip/index.native.js b/packages/components/src/tooltip/index.native.js
index 61b08c052dfacc..ff880d38e19822 100644
--- a/packages/components/src/tooltip/index.native.js
+++ b/packages/components/src/tooltip/index.native.js
@@ -62,9 +62,7 @@ const useKeyboardVisibility = () => {
 			showListener.remove();
 			hideListener.remove();
 		};
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [] );
 
 	return keyboardVisible;
@@ -105,9 +103,7 @@ const Tooltip = ( {
 			} );
 		}
 		return () => onHandleScreenTouch( null );
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ visible ] );
 
 	// Manage visibility animation.
@@ -121,9 +117,7 @@ const Tooltip = ( {
 			setAnimating( true );
 			startAnimation();
 		}
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ visible ] );
 
 	// Manage tooltip visibility and position in relation to keyboard.
@@ -142,9 +136,7 @@ const Tooltip = ( {
 			setAnimating( true );
 			setVisible( false );
 		}
-		// Disable reason: deferring this refactor to the native team.
-		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
+		// See https://github.com/WordPress/gutenberg/pull/41166
 	}, [ visible, keyboardVisible ] );
 
 	// Manage tooltip position during keyboard frame changes.
@@ -273,9 +265,7 @@ const TooltipSlot = ( { children, ...rest } ) => {
 		setHandleScreenTouch( null );
 	};
 	// Memoize context value to avoid unnecessary rerenders of the Provider's children
-	// Disable reason: deferring this refactor to the native team.
-	// see https://github.com/WordPress/gutenberg/pull/41166
-	// eslint-disable-next-line react-hooks/exhaustive-deps
+	// See https://github.com/WordPress/gutenberg/pull/41166
 	const value = useMemo( () => ( { onHandleScreenTouch } ) );
 
 	return (
diff --git a/packages/components/src/tooltip/index.tsx b/packages/components/src/tooltip/index.tsx
index 80407def54cd45..ce94daf67bfaba 100644
--- a/packages/components/src/tooltip/index.tsx
+++ b/packages/components/src/tooltip/index.tsx
@@ -1,39 +1,65 @@
 /**
  * External dependencies
  */
-// eslint-disable-next-line no-restricted-imports
 import * as Ariakit from '@ariakit/react';
+import { useStoreState } from '@ariakit/react';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { Children } from '@wordpress/element';
+import {
+	Children,
+	useContext,
+	createContext,
+	forwardRef,
+	cloneElement,
+} from '@wordpress/element';
 import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
-import type { TooltipProps } from './types';
+import type {
+	TooltipProps,
+	TooltipInternalContext as TooltipInternalContextType,
+} from './types';
 import Shortcut from '../shortcut';
 import { positionToPlacement } from '../popover/utils';
 
+const TooltipInternalContext = createContext< TooltipInternalContextType >( {
+	isNestedInTooltip: false,
+} );
+
 /**
  * Time over anchor to wait before showing tooltip
  */
 export const TOOLTIP_DELAY = 700;
 
-function Tooltip( props: TooltipProps ) {
+const CONTEXT_VALUE = {
+	isNestedInTooltip: true,
+};
+
+function UnforwardedTooltip(
+	props: TooltipProps,
+	ref: React.ForwardedRef< any >
+) {
 	const {
 		children,
+		className,
 		delay = TOOLTIP_DELAY,
 		hideOnClick = true,
 		placement,
 		position,
 		shortcut,
 		text,
+
+		...restProps
 	} = props;
 
+	const { isNestedInTooltip } = useContext( TooltipInternalContext );
+
 	const baseId = useInstanceId( Tooltip, 'tooltip' );
 	const describedById = text || shortcut ? baseId : undefined;
 
@@ -43,7 +69,7 @@ function Tooltip( props: TooltipProps ) {
 		if ( 'development' === process.env.NODE_ENV ) {
 			// eslint-disable-next-line no-console
 			console.error(
-				'Tooltip should be called with only a single child element.'
+				'wp-components.Tooltip should be called with only a single child element.'
 			);
 		}
 	}
@@ -66,22 +92,52 @@ function Tooltip( props: TooltipProps ) {
 
 	const tooltipStore = Ariakit.useTooltipStore( {
 		placement: computedPlacement,
-		timeout: delay,
+		showTimeout: delay,
 	} );
+	const mounted = useStoreState( tooltipStore, 'mounted' );
+
+	if ( isNestedInTooltip ) {
+		return isOnlyChild ? (
+			<Ariakit.Role { ...restProps } render={ children } />
+		) : (
+			children
+		);
+	}
+
+	// TODO: this is a temporary workaround to minimize the effects of the
+	// Ariakit upgrade. Ariakit doesn't pass the `aria-describedby` prop to
+	// the tooltip anchor anymore since 0.4.0, so we need to add it manually.
+	// The `aria-describedby` attribute is added only if the anchor doesn't have
+	// one already, and if the tooltip text is not the same as the anchor's
+	// `aria-label`
+	// See: https://github.com/WordPress/gutenberg/pull/64066
+	// See: https://github.com/WordPress/gutenberg/pull/65989
+	function addDescribedById( element: React.ReactElement ) {
+		return describedById &&
+			mounted &&
+			element.props[ 'aria-describedby' ] === undefined &&
+			element.props[ 'aria-label' ] !== text
+			? cloneElement( element, { 'aria-describedby': describedById } )
+			: element;
+	}
 
 	return (
-		<>
+		<TooltipInternalContext.Provider value={ CONTEXT_VALUE }>
 			<Ariakit.TooltipAnchor
 				onClick={ hideOnClick ? tooltipStore.hide : undefined }
 				store={ tooltipStore }
-				render={ isOnlyChild ? children : undefined }
+				render={
+					isOnlyChild ? addDescribedById( children ) : undefined
+				}
+				ref={ ref }
 			>
 				{ isOnlyChild ? undefined : children }
 			</Ariakit.TooltipAnchor>
 			{ isOnlyChild && ( text || shortcut ) && (
 				<Ariakit.Tooltip
+					{ ...restProps }
+					className={ clsx( 'components-tooltip', className ) }
 					unmountOnHide
-					className="components-tooltip"
 					gutter={ 4 }
 					id={ describedById }
 					overflowPadding={ 0.5 }
@@ -98,8 +154,9 @@ function Tooltip( props: TooltipProps ) {
 					) }
 				</Ariakit.Tooltip>
 			) }
-		</>
+		</TooltipInternalContext.Provider>
 	);
 }
+export const Tooltip = forwardRef( UnforwardedTooltip );
 
 export default Tooltip;
diff --git a/packages/components/src/tooltip/stories/index.story.tsx b/packages/components/src/tooltip/stories/index.story.tsx
index 760f3dcc23e2fd..b006bc03aced96 100644
--- a/packages/components/src/tooltip/stories/index.story.tsx
+++ b/packages/components/src/tooltip/stories/index.story.tsx
@@ -30,7 +30,7 @@ const meta: Meta< typeof Tooltip > = {
 				'bottom right',
 			],
 		},
-		shortcut: { control: { type: 'text' } },
+		shortcut: { control: { type: 'object' } },
 	},
 	parameters: {
 		controls: { expanded: true },
@@ -57,3 +57,20 @@ KeyboardShortcut.args = {
 		ariaLabel: shortcutAriaLabel.primaryShift( ',' ),
 	},
 };
+
+/**
+ * In case one or more `Tooltip` components are rendered inside another
+ * `Tooltip` component, only the tooltip associated to the outermost `Tooltip`
+ * component will be rendered in the browser and shown to the user
+ * appropriately. The rest of the nested `Tooltip` components will simply no-op
+ * and pass-through their anchor.
+ */
+export const Nested: StoryFn< typeof Tooltip > = Template.bind( {} );
+Nested.args = {
+	children: (
+		<Tooltip text="Nested tooltip text (that will never show)">
+			<Button variant="primary">Tooltip Anchor</Button>
+		</Tooltip>
+	),
+	text: 'Outer tooltip text',
+};
diff --git a/packages/components/src/tooltip/style.scss b/packages/components/src/tooltip/style.scss
index c42249e529556f..e84946e4a9176c 100644
--- a/packages/components/src/tooltip/style.scss
+++ b/packages/components/src/tooltip/style.scss
@@ -1,12 +1,14 @@
 .components-tooltip {
-	background: $black; // TODO: Discuss with designers.
-	border-radius: $radius-block-ui;
+	background: $black;
+	font-family: $default-font;
+	border-radius: $radius-small;
 	color: $gray-100;
 	text-align: center;
 	line-height: 1.4;
 	font-size: 12px;
 	padding: $grid-unit-05 $grid-unit-10;
 	z-index: z-index(".components-tooltip");
+	box-shadow: $elevation-small;
 }
 
 .components-tooltip__shortcut {
diff --git a/packages/components/src/tooltip/test/index.native.js b/packages/components/src/tooltip/test/index.native.js
index bad45978f6a8ce..4b9691313e3d1e 100644
--- a/packages/components/src/tooltip/test/index.native.js
+++ b/packages/components/src/tooltip/test/index.native.js
@@ -4,15 +4,11 @@
 import { fireEvent, render, act } from 'test/helpers';
 import { Keyboard, Text } from 'react-native';
 
-/**
- * WordPress dependencies
- */
-import { SlotFillProvider } from '@wordpress/components';
-
 /**
  * Internal dependencies
  */
 import Tooltip from '../index';
+import { Provider as SlotFillProvider } from '../../slot-fill';
 
 // Minimal tree to render tooltip.
 const TooltipSlot = ( { children } ) => (
@@ -44,7 +40,7 @@ afterAll( () => {
 it( 'displays the message', () => {
 	const screen = render(
 		<TooltipSlot>
-			<Tooltip visible={ true } text="A helpful message">
+			<Tooltip visible text="A helpful message">
 				<Text>I need help</Text>
 			</Tooltip>
 		</TooltipSlot>
@@ -56,7 +52,7 @@ it( 'displays the message', () => {
 it( 'dismisses when the screen is tapped', () => {
 	const screen = render(
 		<TooltipSlot>
-			<Tooltip visible={ true } text="A helpful message">
+			<Tooltip visible text="A helpful message">
 				<Text>I need help</Text>
 			</Tooltip>
 		</TooltipSlot>
@@ -72,7 +68,7 @@ it( 'dismisses when the screen is tapped', () => {
 it( 'dismisses when the keyboard closes', () => {
 	const screen = render(
 		<TooltipSlot>
-			<Tooltip visible={ true } text="A helpful message">
+			<Tooltip visible text="A helpful message">
 				<Text>I need help</Text>
 			</Tooltip>
 		</TooltipSlot>
diff --git a/packages/components/src/tooltip/test/index.tsx b/packages/components/src/tooltip/test/index.tsx
index 4d58498e278d36..3679b597b2cb14 100644
--- a/packages/components/src/tooltip/test/index.tsx
+++ b/packages/components/src/tooltip/test/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { press, hover, click, sleep } from '@ariakit/test';
 
 /**
  * WordPress dependencies
@@ -12,324 +12,586 @@ import { shortcutAriaLabel } from '@wordpress/keycodes';
 /**
  * Internal dependencies
  */
-import Button from '../../button';
 import Modal from '../../modal';
 import Tooltip, { TOOLTIP_DELAY } from '..';
-import cleanupTooltip from './utils/';
 
 const props = {
-	children: <Button>Button</Button>,
+	children: <button>Tooltip anchor</button>,
 	text: 'tooltip text',
 };
 
-describe( 'Tooltip', () => {
-	it( 'should not render the tooltip if multiple children are passed', async () => {
-		render(
-			// expected TS error since Tooltip cannot have more than one child element
-			// @ts-expect-error
-			<Tooltip { ...props }>
-				<Button>This is a button</Button>
-				<Button>This is another button</Button>
-			</Tooltip>
-		);
-
-		expect(
-			screen.queryByRole( 'tooltip', { name: /tooltip text/i } )
-		).not.toBeInTheDocument();
-	} );
+const expectTooltipToBeVisible = () =>
+	expect(
+		screen.getByRole( 'tooltip', { name: 'tooltip text' } )
+	).toBeVisible();
 
-	it( 'should not render the tooltip if there is no focus', () => {
-		render( <Tooltip { ...props } /> );
+const expectTooltipToBeHidden = () =>
+	expect(
+		screen.queryByRole( 'tooltip', { name: 'tooltip text' } )
+	).not.toBeInTheDocument();
 
-		expect(
-			screen.getByRole( 'button', { name: /Button/i } )
-		).toBeVisible();
+const waitExpectTooltipToShow = async ( timeout = TOOLTIP_DELAY ) =>
+	await waitFor( expectTooltipToBeVisible, { timeout } );
 
-		expect(
-			screen.queryByRole( 'tooltip', { name: /tooltip text/i } )
-		).not.toBeInTheDocument();
-	} );
+const waitExpectTooltipToHide = async () =>
+	await waitFor( expectTooltipToBeHidden );
 
-	it( 'should render the tooltip when focusing on the tooltip anchor via tab', async () => {
-		const user = userEvent.setup();
+const hoverOutside = async () => {
+	await hover( document.body );
+	await hover( document.body, { clientX: 10, clientY: 10 } );
+};
 
-		render( <Tooltip { ...props } /> );
+describe( 'Tooltip', () => {
+	describe( 'basic behavior', () => {
+		it( 'should not render the tooltip if multiple children are passed', async () => {
+			render(
+				// @ts-expect-error Tooltip cannot have more than one child element
+				<Tooltip { ...props }>
+					<button>First button</button>
+					<button>Second button</button>
+				</Tooltip>
+			);
 
-		await user.tab();
+			expect(
+				screen.getByRole( 'button', { name: 'First button' } )
+			).toBeVisible();
+			expect(
+				screen.getByRole( 'button', { name: 'Second button' } )
+			).toBeVisible();
 
-		expect(
-			screen.getByRole( 'button', { name: /Button/i } )
-		).toHaveFocus();
+			await press.Tab();
 
-		expect(
-			await screen.findByRole( 'tooltip', { name: /tooltip text/i } )
-		).toBeVisible();
+			expectTooltipToBeHidden();
+		} );
 
-		await cleanupTooltip( user );
-	} );
+		it( 'should associate the tooltip text with its anchor via the accessible description when visible', async () => {
+			render( <Tooltip { ...props } /> );
 
-	it( 'should render the tooltip when the tooltip anchor is hovered', async () => {
-		const user = userEvent.setup();
+			// The anchor can not be found by querying for its description,
+			// since that is present only when the tooltip is visible
+			expect(
+				screen.queryByRole( 'button', { description: 'tooltip text' } )
+			).not.toBeInTheDocument();
+
+			// Hover the anchor. The tooltip shows and its text is used to describe
+			// the tooltip anchor
+			await hover(
+				screen.getByRole( 'button', {
+					name: 'Tooltip anchor',
+				} )
+			);
+			expect(
+				await screen.findByRole( 'button', {
+					description: 'tooltip text',
+				} )
+			).toBeInTheDocument();
+
+			// Hover outside of the anchor, tooltip should hide
+			await hoverOutside();
+			await waitExpectTooltipToHide();
+			expect(
+				screen.queryByRole( 'button', { description: 'tooltip text' } )
+			).not.toBeInTheDocument();
+		} );
+
+		it( 'should not leak Tooltip props to the tooltip anchor', () => {
+			render(
+				<Tooltip data-foo>
+					<button>Anchor</button>
+				</Tooltip>
+			);
+			expect(
+				screen.getByRole( 'button', { name: 'Anchor' } )
+			).not.toHaveAttribute( 'data-foo' );
+		} );
+
+		it( 'should add default and custom class names to the tooltip', async () => {
+			render( <Tooltip { ...props } className="foo" /> );
+
+			// Hover over the anchor, tooltip should show
+			await hover(
+				screen.getByRole( 'button', { name: 'Tooltip anchor' } )
+			);
+
+			// Check default and custom classnames
+			await waitFor( () =>
+				expect(
+					screen.getByRole( 'tooltip', {
+						name: 'tooltip text',
+					} )
+				).toHaveClass( 'components-tooltip', 'foo' )
+			);
+		} );
+	} );
 
-		render( <Tooltip { ...props } /> );
+	describe( 'keyboard focus', () => {
+		it( 'should not render the tooltip if there is no focus', () => {
+			render( <Tooltip { ...props } /> );
 
-		await user.hover( screen.getByRole( 'button', { name: /Button/i } ) );
+			expect(
+				screen.getByRole( 'button', { name: 'Tooltip anchor' } )
+			).toBeVisible();
+
+			expectTooltipToBeHidden();
+		} );
+
+		it( 'should show the tooltip when focusing on the tooltip anchor and hide it the anchor loses focus', async () => {
+			render(
+				<>
+					<Tooltip { ...props } />
+					<button>Focus me</button>
+				</>
+			);
+
+			// Focus the anchor, tooltip should show
+			await press.Tab();
+			expect(
+				screen.getByRole( 'button', { name: 'Tooltip anchor' } )
+			).toHaveFocus();
+			await waitExpectTooltipToShow();
 
-		expect(
-			await screen.findByRole( 'tooltip', { name: /tooltip text/i } )
-		).toBeVisible();
+			// Focus the other button, tooltip should hide
+			await press.Tab();
+			expect(
+				screen.getByRole( 'button', { name: 'Focus me' } )
+			).toHaveFocus();
+			await waitExpectTooltipToHide();
+		} );
+
+		it( 'should show tooltip when focussing a disabled (but focussable) anchor button', async () => {
+			render(
+				<>
+					<Tooltip { ...props }>
+						<button aria-disabled="true">Tooltip anchor</button>
+					</Tooltip>
+					<button>Focus me</button>
+				</>
+			);
+
+			const anchor = screen.getByRole( 'button', {
+				name: 'Tooltip anchor',
+			} );
+
+			expect( anchor ).toBeVisible();
+			expect( anchor ).toHaveAttribute( 'aria-disabled', 'true' );
+
+			// Focus anchor, tooltip should show
+			await press.Tab();
+			expect( anchor ).toHaveFocus();
+			await waitExpectTooltipToShow();
+
+			// Focus another button, tooltip should hide
+			await press.Tab();
+			expect(
+				screen.getByRole( 'button', {
+					name: 'Focus me',
+				} )
+			).toHaveFocus();
+			await waitExpectTooltipToHide();
+		} );
+	} );
 
-		await cleanupTooltip( user );
+	describe( 'mouse hover', () => {
+		it( 'should show the tooltip when the tooltip anchor is hovered and hide it when the cursor stops hovering the anchor', async () => {
+			render( <Tooltip { ...props } /> );
+
+			const anchor = screen.getByRole( 'button', {
+				name: 'Tooltip anchor',
+			} );
+
+			expect( anchor ).toBeVisible();
+
+			// Hover over the anchor, tooltip should show
+			await hover( anchor );
+			await waitExpectTooltipToShow();
+
+			// Hover outside of the anchor, tooltip should hide
+			await hoverOutside();
+			await waitExpectTooltipToHide();
+		} );
+
+		it( 'should show tooltip when hovering over a disabled (but focussable) anchor button', async () => {
+			render(
+				<>
+					<Tooltip { ...props }>
+						<button aria-disabled="true">Tooltip anchor</button>
+					</Tooltip>
+					<button>Focus me</button>
+				</>
+			);
+
+			const anchor = screen.getByRole( 'button', {
+				name: 'Tooltip anchor',
+			} );
+
+			expect( anchor ).toBeVisible();
+			expect( anchor ).toHaveAttribute( 'aria-disabled', 'true' );
+
+			// Hover over the anchor, tooltip should show
+			await hover( anchor );
+			await waitExpectTooltipToShow();
+
+			// Hover outside of the anchor, tooltip should hide
+			await hoverOutside();
+			await waitExpectTooltipToHide();
+		} );
 	} );
 
-	it( 'should not show tooltip on focus as result of mouse click', async () => {
-		const user = userEvent.setup();
+	describe( 'mouse click', () => {
+		it( 'should hide tooltip when the tooltip anchor is clicked', async () => {
+			render( <Tooltip { ...props } /> );
 
-		render( <Tooltip { ...props } /> );
+			const anchor = screen.getByRole( 'button', {
+				name: 'Tooltip anchor',
+			} );
 
-		await user.click( screen.getByRole( 'button', { name: /Button/i } ) );
+			expect( anchor ).toBeVisible();
 
-		expect(
-			screen.queryByRole( 'tooltip', { name: /tooltip text/i } )
-		).not.toBeInTheDocument();
+			// Hover over the anchor, tooltip should show
+			await hover( anchor );
+			await waitExpectTooltipToShow();
 
-		await cleanupTooltip( user );
-	} );
+			// Click the anchor, tooltip should hide
+			await click( anchor );
+			await waitExpectTooltipToHide();
+		} );
 
-	it( 'should respect custom delay prop when showing tooltip', async () => {
-		const user = userEvent.setup();
-		const ADDITIONAL_DELAY = 100;
+		it( 'should not hide tooltip when the tooltip anchor is clicked and the `hideOnClick` prop is `false', async () => {
+			render(
+				<>
+					<Tooltip { ...props } hideOnClick={ false } />
+					<button>Click me</button>
+				</>
+			);
 
-		render(
-			<Tooltip { ...props } delay={ TOOLTIP_DELAY + ADDITIONAL_DELAY } />
-		);
+			const anchor = screen.getByRole( 'button', {
+				name: 'Tooltip anchor',
+			} );
 
-		await user.hover( screen.getByRole( 'button', { name: /Button/i } ) );
+			expect( anchor ).toBeVisible();
 
-		// Advance time by default delay
-		await new Promise( ( resolve ) =>
-			setTimeout( resolve, TOOLTIP_DELAY )
-		);
+			// Hover over the anchor, tooltip should show
+			await hover( anchor );
+			await waitExpectTooltipToShow();
 
-		// Tooltip hasn't appeared yet
-		expect(
-			screen.queryByRole( 'tooltip', { name: /tooltip text/i } )
-		).not.toBeInTheDocument();
+			// Click the anchor, tooltip should not hide
+			await click( anchor );
+			await waitExpectTooltipToShow();
 
-		// wait for additional delay for tooltip to appear
-		await waitFor(
-			() =>
-				new Promise( ( resolve ) =>
-					setTimeout( resolve, ADDITIONAL_DELAY )
-				)
-		);
+			// Click another button, tooltip should hide
+			await click( screen.getByRole( 'button', { name: 'Click me' } ) );
+			await waitExpectTooltipToHide();
+		} );
+	} );
 
-		expect(
-			screen.getByRole( 'tooltip', { name: /tooltip text/i } )
-		).toBeVisible();
+	describe( 'delay', () => {
+		it( 'should respect custom delay prop when showing tooltip', async () => {
+			const ADDITIONAL_DELAY = 100;
 
-		await cleanupTooltip( user );
-	} );
+			render(
+				<Tooltip
+					{ ...props }
+					delay={ TOOLTIP_DELAY + ADDITIONAL_DELAY }
+				/>
+			);
 
-	it( 'should show tooltip when an element is disabled', async () => {
-		const user = userEvent.setup();
+			const anchor = screen.getByRole( 'button', {
+				name: 'Tooltip anchor',
+			} );
+			expect( anchor ).toBeVisible();
 
-		render(
-			<Tooltip { ...props }>
-				<Button aria-disabled>Button</Button>
-			</Tooltip>
-		);
+			// Hover over the anchor
+			await hover( anchor );
+			expectTooltipToBeHidden();
 
-		const button = screen.getByRole( 'button', { name: /Button/i } );
+			// Advance time by default delay
+			await sleep( TOOLTIP_DELAY );
 
-		expect( button ).toBeVisible();
-		expect( button ).toHaveAttribute( 'aria-disabled' );
+			// Tooltip hasn't appeared yet
+			expectTooltipToBeHidden();
 
-		await user.hover( button );
+			// Wait for additional delay for tooltip to appear
+			await sleep( ADDITIONAL_DELAY );
+			await waitExpectTooltipToShow();
 
-		expect(
-			await screen.findByRole( 'tooltip', { name: /tooltip text/i } )
-		).toBeVisible();
+			// Hover outside of the anchor, tooltip should hide
+			await hoverOutside();
+			await waitExpectTooltipToHide();
 
-		await cleanupTooltip( user );
-	} );
+			// Prevent this test from interfering with the next one.
+			// "Tooltips appear instantly if another tooltip has just been hidden."
+			// See: https://github.com/WordPress/gutenberg/pull/57345#discussion_r1435495655
+			await sleep( 3000 );
+		} );
 
-	it( 'should not show tooltip if the mouse leaves the tooltip anchor before set delay', async () => {
-		const user = userEvent.setup();
-		const onMouseEnterMock = jest.fn();
-		const onMouseLeaveMock = jest.fn();
-		const MOUSE_LEAVE_DELAY = TOOLTIP_DELAY - 200;
+		it( 'should not show tooltip if the mouse leaves the tooltip anchor before set delay', async () => {
+			const onMouseEnterMock = jest.fn();
+			const onMouseLeaveMock = jest.fn();
+			const HOVER_OUTSIDE_ANTICIPATION = 200;
 
-		render(
-			<>
+			render(
 				<Tooltip { ...props }>
-					<Button
+					<button
 						onMouseEnter={ onMouseEnterMock }
 						onMouseLeave={ onMouseLeaveMock }
 					>
-						Button 1
-					</Button>
+						Tooltip anchor
+					</button>
 				</Tooltip>
-				<Button>Button 2</Button>
-			</>
-		);
-
-		await user.hover(
-			screen.getByRole( 'button', {
-				name: 'Button 1',
-			} )
-		);
-
-		// Tooltip hasn't appeared yet
-		expect(
-			screen.queryByRole( 'tooltip', { name: /tooltip text/i } )
-		).not.toBeInTheDocument();
-		expect( onMouseEnterMock ).toHaveBeenCalledTimes( 1 );
-
-		// Advance time by MOUSE_LEAVE_DELAY time
-		await new Promise( ( resolve ) =>
-			setTimeout( resolve, MOUSE_LEAVE_DELAY )
-		);
-
-		expect(
-			screen.queryByRole( 'tooltip', { name: /tooltip text/i } )
-		).not.toBeInTheDocument();
-
-		// Hover the other button, meaning that the mouse will leave the tooltip anchor
-		await user.hover(
-			screen.getByRole( 'button', {
-				name: 'Button 2',
-			} )
-		);
-
-		// Tooltip still hasn't appeared yet
-		expect(
-			screen.queryByRole( 'tooltip', { name: /tooltip text/i } )
-		).not.toBeInTheDocument();
-		expect( onMouseEnterMock ).toHaveBeenCalledTimes( 1 );
-		expect( onMouseLeaveMock ).toHaveBeenCalledTimes( 1 );
-
-		// Advance time again, so that we reach the full TOOLTIP_DELAY time
-		await new Promise( ( resolve ) =>
-			setTimeout( resolve, TOOLTIP_DELAY )
-		);
-
-		// Tooltip won't show, since the mouse has left the tooltip anchor
-		expect(
-			screen.queryByRole( 'tooltip', { name: /tooltip text/i } )
-		).not.toBeInTheDocument();
-
-		await cleanupTooltip( user );
-	} );
+			);
 
-	it( 'should render the shortcut display text when a string is passed as the shortcut', async () => {
-		const user = userEvent.setup();
+			const anchor = screen.getByRole( 'button', {
+				name: 'Tooltip anchor',
+			} );
+			expect( anchor ).toBeVisible();
 
-		render( <Tooltip { ...props } shortcut="shortcut text" /> );
+			// Hover over the anchor, tooltip hasn't appeared yet
+			await hover( anchor );
+			expect( onMouseEnterMock ).toHaveBeenCalledTimes( 1 );
+			expectTooltipToBeHidden();
 
-		await user.hover( screen.getByRole( 'button', { name: /Button/i } ) );
+			// Advance time, tooltip hasn't appeared yet because TOOLTIP_DELAY time
+			// hasn't passed yet
+			await sleep( TOOLTIP_DELAY - HOVER_OUTSIDE_ANTICIPATION );
+			expectTooltipToBeHidden();
 
-		await waitFor( () =>
-			expect( screen.getByText( 'shortcut text' ) ).toBeVisible()
-		);
+			// Hover outside of the anchor, tooltip still hasn't appeared yet
+			await hoverOutside();
+			expectTooltipToBeHidden();
 
-		await cleanupTooltip( user );
-	} );
-
-	it( 'should render the keyboard shortcut display text and aria-label when an object is passed as the shortcut', async () => {
-		const user = userEvent.setup();
-
-		render(
-			<Tooltip
-				{ ...props }
-				shortcut={ {
-					display: '⇧⌘,',
-					ariaLabel: shortcutAriaLabel.primaryShift( ',' ),
-				} }
-			/>
-		);
-
-		await user.hover( screen.getByRole( 'button', { name: /Button/i } ) );
+			expect( onMouseEnterMock ).toHaveBeenCalledTimes( 1 );
+			expect( onMouseLeaveMock ).toHaveBeenCalledTimes( 1 );
 
-		await waitFor( () =>
-			expect( screen.getByText( '⇧⌘,' ) ).toBeVisible()
-		);
+			// Advance time again, so that we reach the full TOOLTIP_DELAY time
+			await sleep( HOVER_OUTSIDE_ANTICIPATION );
 
-		expect( screen.getByText( '⇧⌘,' ) ).toHaveAttribute(
-			'aria-label',
-			'Control + Shift + Comma'
-		);
-
-		await cleanupTooltip( user );
+			// Tooltip won't show, since the mouse has left the tooltip anchor
+			expectTooltipToBeHidden();
+		} );
 	} );
 
-	it( 'esc should close modal even when tooltip is visible', async () => {
-		const user = userEvent.setup();
-		const onRequestClose = jest.fn();
-		render(
-			<Modal onRequestClose={ onRequestClose }>
-				<p>Modal content</p>
-			</Modal>
-		);
-
-		expect(
-			screen.queryByRole( 'tooltip', { name: /close/i } )
-		).not.toBeInTheDocument();
-
-		await user.hover(
-			screen.getByRole( 'button', {
-				name: /Close/i,
-			} )
-		);
-
-		await waitFor( () =>
+	describe( 'shortcut', () => {
+		it( 'should show the shortcut in the tooltip when a string is passed as the shortcut', async () => {
+			render( <Tooltip { ...props } shortcut="shortcut text" /> );
+
+			// Hover over the anchor, tooltip should show
+			await hover(
+				screen.getByRole( 'button', { name: 'Tooltip anchor' } )
+			);
+			await waitFor( () =>
+				expect(
+					screen.getByRole( 'tooltip', {
+						name: 'tooltip text shortcut text',
+					} )
+				).toBeVisible()
+			);
+
+			// Hover outside of the anchor, tooltip should hide
+			await hoverOutside();
+			await waitExpectTooltipToHide();
+		} );
+
+		it( 'should show the shortcut in the tooltip when an object is passed as the shortcut', async () => {
+			render(
+				<Tooltip
+					{ ...props }
+					shortcut={ {
+						display: '⇧⌘,',
+						ariaLabel: shortcutAriaLabel.primaryShift( ',' ),
+					} }
+				/>
+			);
+
+			// Hover over the anchor, tooltip should show
+			await hover(
+				screen.getByRole( 'button', { name: 'Tooltip anchor' } )
+			);
+			await waitFor( () =>
+				expect(
+					screen.getByRole( 'tooltip', {
+						name: 'tooltip text Control + Shift + Comma',
+					} )
+				).toBeVisible()
+			);
 			expect(
-				screen.getByRole( 'tooltip', { name: /close/i } )
-			).toBeVisible()
-		);
-
-		await user.keyboard( '[Escape]' );
-
-		expect( onRequestClose ).toHaveBeenCalled();
-
-		await cleanupTooltip( user );
+				screen.getByRole( 'tooltip', {
+					name: 'tooltip text Control + Shift + Comma',
+				} )
+			).toHaveTextContent( /⇧⌘,/i );
+
+			// Hover outside of the anchor, tooltip should hide
+			await hoverOutside();
+			await waitExpectTooltipToHide();
+		} );
 	} );
 
-	it( 'should associate the tooltip text with its anchor via the accessible description when visible', async () => {
-		const user = userEvent.setup();
-
-		render( <Tooltip { ...props } /> );
-
-		await user.hover(
-			screen.getByRole( 'button', {
-				name: /Button/i,
-			} )
-		);
+	describe( 'event propagation', () => {
+		it( 'should close the parent dialog component when pressing the Escape key while the tooltip is visible', async () => {
+			const onRequestClose = jest.fn();
+			render(
+				<Modal onRequestClose={ onRequestClose }>
+					<p>Modal content</p>
+				</Modal>
+			);
+
+			expectTooltipToBeHidden();
+
+			const closeButton = screen.getByRole( 'button', {
+				name: /close/i,
+			} );
+
+			// Hover over the anchor, tooltip should show
+			await hover( closeButton );
+			await waitFor( () =>
+				expect(
+					screen.getByRole( 'tooltip', { name: /close/i } )
+				).toBeVisible()
+			);
+
+			// Press the Escape key, Modal should request to be closed
+			await press.Escape();
+			expect( onRequestClose ).toHaveBeenCalled();
+
+			// Hover outside of the anchor, tooltip should hide
+			await hoverOutside();
+			await waitExpectTooltipToHide();
+		} );
+	} );
 
-		expect(
-			await screen.findByRole( 'button', { description: 'tooltip text' } )
-		).toBeInTheDocument();
+	describe( 'nested', () => {
+		it( 'should render the outer tooltip and ignore nested tooltips', async () => {
+			render(
+				<Tooltip text="Outer tooltip">
+					<Tooltip text="Middle tooltip">
+						<Tooltip text="Inner tooltip">
+							<button>Tooltip anchor</button>
+						</Tooltip>
+					</Tooltip>
+				</Tooltip>
+			);
+
+			// Hover the anchor. Only the outer tooltip should show.
+			await hover(
+				screen.getByRole( 'button', {
+					name: 'Tooltip anchor',
+				} )
+			);
+
+			await waitFor( () =>
+				expect(
+					screen.getByRole( 'tooltip', { name: 'Outer tooltip' } )
+				).toBeVisible()
+			);
+			expect(
+				screen.queryByRole( 'tooltip', { name: 'Middle tooltip' } )
+			).not.toBeInTheDocument();
+			expect(
+				screen.queryByRole( 'tooltip', { name: 'Inner tooltip' } )
+			).not.toBeInTheDocument();
+			expect(
+				screen.getByRole( 'button', {
+					description: 'Outer tooltip',
+				} )
+			).toBeVisible();
+
+			// Hover outside of the anchor, tooltip should hide
+			await hoverOutside();
+			await waitFor( () =>
+				expect(
+					screen.queryByRole( 'tooltip', { name: 'Outer tooltip' } )
+				).not.toBeInTheDocument()
+			);
+		} );
+
+		it( 'should not leak Tooltip component classname to the anchor element', () => {
+			render(
+				<Tooltip>
+					<Tooltip>
+						<button>Anchor</button>
+					</Tooltip>
+				</Tooltip>
+			);
+			expect(
+				screen.getByRole( 'button', { name: 'Anchor' } )
+			).not.toHaveClass( 'components-tooltip' );
+		} );
 	} );
 
-	it( 'should not hide tooltip when the anchor is clicked if hideOnClick is false', async () => {
-		const user = userEvent.setup();
+	describe( 'aria-describedby', () => {
+		it( "should not override the anchor's aria-describedby attribute if specified", async () => {
+			render(
+				<>
+					<Tooltip { ...props }>
+						<button aria-describedby="tooltip-test-description">
+							Tooltip anchor
+						</button>
+					</Tooltip>
+					{ /* eslint-disable-next-line no-restricted-syntax */ }
+					<p id="tooltip-test-description">Tooltip description</p>
+					<button>focus trap outside</button>
+				</>
+			);
 
-		render( <Tooltip { ...props } hideOnClick={ false } /> );
+			expect(
+				screen.getByRole( 'button', { name: 'Tooltip anchor' } )
+			).toHaveAccessibleDescription( 'Tooltip description' );
 
-		const button = screen.getByRole( 'button', { name: /Button/i } );
+			// Focus the anchor, tooltip should show
+			await press.Tab();
+			expect(
+				screen.getByRole( 'button', { name: 'Tooltip anchor' } )
+			).toHaveFocus();
+			await waitExpectTooltipToShow();
 
-		await user.hover( button );
+			// The anchors should retain its previous accessible description,
+			// since the tooltip shouldn't override it.
+			expect(
+				screen.getByRole( 'button', { name: 'Tooltip anchor' } )
+			).toHaveAccessibleDescription( 'Tooltip description' );
 
-		expect(
-			await screen.findByRole( 'tooltip', { name: /tooltip text/i } )
-		).toBeVisible();
+			// Focus the other button, tooltip should hide
+			await press.Tab();
+			expect(
+				screen.getByRole( 'button', { name: 'focus trap outside' } )
+			).toHaveFocus();
+			await waitExpectTooltipToHide();
+		} );
+
+		it( "should not add the aria-describedby attribute to the anchor if the tooltip text matches the anchor's aria-label", async () => {
+			render(
+				<>
+					<Tooltip { ...props }>
+						<button aria-label={ props.text }>
+							Tooltip anchor
+						</button>
+					</Tooltip>
+					<button>focus trap outside</button>
+				</>
+			);
+
+			expect(
+				screen.getByRole( 'button', { name: props.text } )
+			).not.toHaveAccessibleDescription();
 
-		await user.click( button );
+			// Focus the anchor, tooltip should show
+			await press.Tab();
+			expect(
+				screen.getByRole( 'button', { name: props.text } )
+			).toHaveFocus();
+			await waitExpectTooltipToShow();
 
-		expect(
-			screen.getByRole( 'tooltip', { name: /tooltip text/i } )
-		).toBeVisible();
+			// The anchor shouldn't have an aria-describedby prop
+			// because its aria-label matches the tooltip text.
+			expect(
+				screen.getByRole( 'button', { name: props.text } )
+			).not.toHaveAccessibleDescription();
 
-		await cleanupTooltip( user );
+			// Focus the other button, tooltip should hide
+			await press.Tab();
+			expect(
+				screen.getByRole( 'button', { name: 'focus trap outside' } )
+			).toHaveFocus();
+			await waitExpectTooltipToHide();
+		} );
 	} );
 } );
diff --git a/packages/components/src/tooltip/test/utils/index.tsx b/packages/components/src/tooltip/test/utils/index.tsx
index 01b0931c1a7900..1e32a10f71bd20 100644
--- a/packages/components/src/tooltip/test/utils/index.tsx
+++ b/packages/components/src/tooltip/test/utils/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import type { UserEvent } from '@testing-library/user-event/dist/types/setup/setup';
+import { click, press } from '@ariakit/test';
 
 // TODO: may need to be tested with Playwright; further context:
 // https://github.com/WordPress/gutenberg/pull/52133#issuecomment-1613691258
@@ -13,8 +13,8 @@ import type { UserEvent } from '@testing-library/user-event/dist/types/setup/set
  * to avoid leaking into other tests
  *
  */
-export default async function cleanupTooltip( user: UserEvent ) {
-	await user.tab();
-	await user.tab();
-	await user.click( document.body );
+export default async function cleanupTooltip() {
+	await press.Tab();
+	await press.Tab();
+	await click( document.body );
 }
diff --git a/packages/components/src/tooltip/types.ts b/packages/components/src/tooltip/types.ts
index 8708ae7005f5b3..3d42b02428de07 100644
--- a/packages/components/src/tooltip/types.ts
+++ b/packages/components/src/tooltip/types.ts
@@ -16,6 +16,10 @@ export type TooltipProps = {
 	 * **Note**: Accepts only one child element.
 	 */
 	children: React.ReactElement;
+	/**
+	 * Custom class name for the tooltip.
+	 */
+	className?: string;
 	/**
 	 * Option to hide the tooltip when the anchor is clicked.
 	 *
@@ -59,3 +63,7 @@ export type TooltipProps = {
 	 */
 	text?: string;
 };
+
+export type TooltipInternalContext = {
+	isNestedInTooltip: boolean;
+};
diff --git a/packages/components/src/tree-grid/README.md b/packages/components/src/tree-grid/README.md
index f6de1bab2ddcb2..d6e861a7b9b18b 100644
--- a/packages/components/src/tree-grid/README.md
+++ b/packages/components/src/tree-grid/README.md
@@ -3,10 +3,6 @@
 <div class="callout callout-alert">
 This feature is still experimental. “Experimental” means this is an early implementation subject to drastic and breaking changes.
 </div>
-## Table of contents
-
-1. [Development guidelines](#development-guidelines)
-2. [Related components](#related-components)
 
 ## Development guidelines
 
diff --git a/packages/components/src/tree-grid/roving-tab-index-item.tsx b/packages/components/src/tree-grid/roving-tab-index-item.tsx
index 6bcea5862bf160..d5ed3410ddf684 100644
--- a/packages/components/src/tree-grid/roving-tab-index-item.tsx
+++ b/packages/components/src/tree-grid/roving-tab-index-item.tsx
@@ -41,7 +41,9 @@ export const RovingTabIndexItem = forwardRef(
 			return children( allProps );
 		}
 
-		if ( ! Component ) return null;
+		if ( ! Component ) {
+			return null;
+		}
 
 		return <Component { ...allProps }>{ children }</Component>;
 	}
diff --git a/packages/components/src/tree-grid/test/index.tsx b/packages/components/src/tree-grid/test/index.tsx
index 74294be24f8b5e..b4b9d5d370fb44 100644
--- a/packages/components/src/tree-grid/test/index.tsx
+++ b/packages/components/src/tree-grid/test/index.tsx
@@ -123,7 +123,7 @@ describe( 'TreeGrid', () => {
 						level={ 1 }
 						positionInSet={ 1 }
 						setSize={ 3 }
-						isExpanded={ true }
+						isExpanded
 					>
 						<TreeGridCell withoutGridItem>
 							<TestButton aria-expanded="true">Row 1</TestButton>
diff --git a/packages/components/src/tree-select/README.md b/packages/components/src/tree-select/README.md
index 753e7bd6d052db..3d26488478bd0c 100644
--- a/packages/components/src/tree-select/README.md
+++ b/packages/components/src/tree-select/README.md
@@ -15,6 +15,7 @@ const MyTreeSelect = () => {
 
 	return (
 		<TreeSelect
+		  __nextHasNoMarginBottom
 			label="Parent page"
 			noOptionLabel="No parent page"
 			onChange={ ( newPage ) => setPage( newPage ) }
@@ -89,3 +90,11 @@ An array containing the tree objects with the possible nodes the user can select
 
 -   Type: `Object[]`
 -   Required: No
+
+#### __nextHasNoMarginBottom
+
+Start opting into the new margin-free styles that will become the default in a future version.
+
+-   Type: `Boolean`
+-   Required: No
+-   Default: `false`
diff --git a/packages/components/src/tree-select/index.tsx b/packages/components/src/tree-select/index.tsx
index 6b7b61b7487a23..bd92807bff4cc9 100644
--- a/packages/components/src/tree-select/index.tsx
+++ b/packages/components/src/tree-select/index.tsx
@@ -10,6 +10,15 @@ import { decodeEntities } from '@wordpress/html-entities';
 import { SelectControl } from '../select-control';
 import type { TreeSelectProps, Tree, Truthy } from './types';
 import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props';
+import { ContextSystemProvider } from '../context';
+
+const CONTEXT_VALUE = {
+	BaseControl: {
+		// Temporary during deprecation grace period: Overrides the underlying `__associatedWPComponentName`
+		// via the context system to override the value set by SelectControl.
+		_overrides: { __associatedWPComponentName: 'TreeSelect' },
+	},
+};
 
 function getSelectOptions(
 	tree: Tree[],
@@ -37,6 +46,7 @@ function getSelectOptions(
  *
  * 	return (
  * 		<TreeSelect
+ * 			__nextHasNoMarginBottom
  * 			label="Parent page"
  * 			noOptionLabel="No parent page"
  * 			onChange={ ( newPage ) => setPage( newPage ) }
@@ -72,7 +82,6 @@ function getSelectOptions(
  * }
  * ```
  */
-
 export function TreeSelect( props: TreeSelectProps ) {
 	const {
 		label,
@@ -81,11 +90,7 @@ export function TreeSelect( props: TreeSelectProps ) {
 		selectedId,
 		tree = [],
 		...restProps
-	} = useDeprecated36pxDefaultSizeProp(
-		props,
-		'wp.components.TreeSelect',
-		'6.4'
-	);
+	} = useDeprecated36pxDefaultSizeProp( props );
 
 	const options = useMemo( () => {
 		return [
@@ -95,11 +100,13 @@ export function TreeSelect( props: TreeSelectProps ) {
 	}, [ noOptionLabel, tree ] );
 
 	return (
-		<SelectControl
-			{ ...{ label, options, onChange } }
-			value={ selectedId }
-			{ ...restProps }
-		/>
+		<ContextSystemProvider value={ CONTEXT_VALUE }>
+			<SelectControl
+				{ ...{ label, options, onChange } }
+				value={ selectedId }
+				{ ...restProps }
+			/>
+		</ContextSystemProvider>
 	);
 }
 
diff --git a/packages/components/src/tree-select/stories/index.story.tsx b/packages/components/src/tree-select/stories/index.story.tsx
index 0a4212dc791227..33103786bbc541 100644
--- a/packages/components/src/tree-select/stories/index.story.tsx
+++ b/packages/components/src/tree-select/stories/index.story.tsx
@@ -48,6 +48,7 @@ const TreeSelectWithState: StoryFn< typeof TreeSelect > = ( props ) => {
 
 export const Default = TreeSelectWithState.bind( {} );
 Default.args = {
+	__nextHasNoMarginBottom: true,
 	label: 'Label Text',
 	noOptionLabel: 'No parent page',
 	help: 'Help text to explain the select control.',
diff --git a/packages/components/src/truncate/README.md b/packages/components/src/truncate/README.md
index d173edb14977cd..6d5285244078e5 100644
--- a/packages/components/src/truncate/README.md
+++ b/packages/components/src/truncate/README.md
@@ -24,14 +24,22 @@ function Example() {
 
 ## Props
 
-##### `ellipsis`: `string`
+### `children`: `ReactNode`
+
+The children elements.
+
+Note: text truncation will be attempted only if the `children` are either of type `string` or `number`. In any other scenarios, the component will not attempt to truncate the text, and will pass through the `children`.
+
+-   Required: Yes
+
+### `ellipsis`: `string`
 
 The ellipsis string when truncating the text by the `limit` prop's value.
 
 -   Required: No
 -   Default: `…`
 
-##### `ellipsizeMode`: `'auto' | 'head' | 'tail' | 'middle' | 'none'`
+### `ellipsizeMode`: `'auto' | 'head' | 'tail' | 'middle' | 'none'`
 
 Determines where to truncate. For example, we can truncate text right in the middle. To do this, we need to set `ellipsizeMode` to `middle` and a text `limit`.
 
@@ -43,14 +51,14 @@ Determines where to truncate. For example, we can truncate text right in the mid
 -   Required: No
 -   Default: `auto`
 
-##### `limit`: `number`
+### `limit`: `number`
 
 Determines the max number of characters to be displayed before the rest of the text gets truncated. Requires `ellipsizeMode` to assume values different from `auto` and `none`.
 
 -   Required: No
 -   Default: `0`
 
-##### `numberOfLines`: `number`
+### `numberOfLines`: `number`
 
 Clamps the text content to the specified `numberOfLines`, adding an ellipsis at the end. Note: this feature ignores the value of the `ellipsis` prop and always displays the default `…` ellipsis.
 
diff --git a/packages/components/src/truncate/hook.ts b/packages/components/src/truncate/hook.ts
index 3877e216ba5801..940e3b0127b085 100644
--- a/packages/components/src/truncate/hook.ts
+++ b/packages/components/src/truncate/hook.ts
@@ -33,20 +33,31 @@ export default function useTruncate(
 
 	const cx = useCx();
 
-	const truncatedContent = truncateContent(
-		typeof children === 'string' ? children : '',
-		{
-			ellipsis,
-			ellipsizeMode,
-			limit,
-			numberOfLines,
-		}
-	);
+	let childrenAsText;
+	if ( typeof children === 'string' ) {
+		childrenAsText = children;
+	} else if ( typeof children === 'number' ) {
+		childrenAsText = children.toString();
+	}
 
-	const shouldTruncate = ellipsizeMode === TRUNCATE_TYPE.auto;
+	const truncatedContent = childrenAsText
+		? truncateContent( childrenAsText, {
+				ellipsis,
+				ellipsizeMode,
+				limit,
+				numberOfLines,
+		  } )
+		: children;
+
+	const shouldTruncate =
+		!! childrenAsText && ellipsizeMode === TRUNCATE_TYPE.auto;
 
 	const classes = useMemo( () => {
+		// The `word-break: break-all` property first makes sure a text line
+		// breaks even when it contains 'unbreakable' content such as long URLs.
+		// See https://github.com/WordPress/gutenberg/issues/60860.
 		const truncateLines = css`
+			${ numberOfLines === 1 ? 'word-break: break-all;' : '' }
 			-webkit-box-orient: vertical;
 			-webkit-line-clamp: ${ numberOfLines };
 			display: -webkit-box;
diff --git a/packages/components/src/truncate/test/index.tsx b/packages/components/src/truncate/test/index.tsx
index 082b6aa232d477..399393a25e4201 100644
--- a/packages/components/src/truncate/test/index.tsx
+++ b/packages/components/src/truncate/test/index.tsx
@@ -8,36 +8,63 @@ import { render, screen } from '@testing-library/react';
  */
 import { Truncate } from '..';
 
-describe( 'props', () => {
-	test( 'should render correctly', () => {
-		render( <Truncate>Lorem ipsum.</Truncate> );
-		expect( screen.getByText( 'Lorem ipsum.' ) ).toBeVisible();
-	} );
+describe( 'Truncate', () => {
+	describe( 'with string or number children', () => {
+		test( 'should pass through when no truncation props are set', () => {
+			render( <Truncate>Lorem ipsum</Truncate> );
+			expect( screen.getByText( 'Lorem ipsum' ) ).toBeVisible();
+		} );
 
-	test( 'should render limit', () => {
-		render(
-			<Truncate limit={ 1 } ellipsizeMode="tail">
-				Lorem ipsum.
-			</Truncate>
-		);
-		expect( screen.getByText( 'L…' ) ).toBeVisible();
-	} );
+		test( 'should render numbers correctly', () => {
+			render( <Truncate>{ 14 }</Truncate> );
+			expect( screen.getByText( '14' ) ).toBeVisible();
+		} );
+
+		test( 'should truncate text from the start when the limit prop is set and the ellipsizeMode is tail', () => {
+			render(
+				<Truncate limit={ 1 } ellipsizeMode="tail">
+					Lorem ipsum
+				</Truncate>
+			);
+			expect( screen.getByText( 'L…' ) ).toBeVisible();
+		} );
+
+		test( 'should truncate text from the end when the limit prop is set and the ellipsizeMode is head', () => {
+			render(
+				<Truncate limit={ 1 } ellipsizeMode="head">
+					Lorem ipsum
+				</Truncate>
+			);
+			expect( screen.getByText( '…m' ) ).toBeVisible();
+		} );
+
+		test( 'should render custom ellipsis', () => {
+			render(
+				<Truncate ellipsis="!!!" limit={ 5 } ellipsizeMode="tail">
+					Lorem ipsum.
+				</Truncate>
+			);
+			expect( screen.getByText( 'Lorem!!!' ) ).toBeVisible();
+		} );
 
-	test( 'should render custom ellipsis', () => {
-		render(
-			<Truncate ellipsis="!!!" limit={ 5 } ellipsizeMode="tail">
-				Lorem ipsum.
-			</Truncate>
-		);
-		expect( screen.getByText( 'Lorem!!!' ) ).toBeVisible();
+		test( 'should render custom ellipsizeMode', () => {
+			render(
+				<Truncate ellipsis="!!!" ellipsizeMode="middle" limit={ 5 }>
+					Lorem ipsum.
+				</Truncate>
+			);
+			expect( screen.getByText( 'Lo!!!m.' ) ).toBeVisible();
+		} );
 	} );
 
-	test( 'should render custom ellipsizeMode', () => {
-		render(
-			<Truncate ellipsis="!!!" ellipsizeMode="middle" limit={ 5 }>
-				Lorem ipsum.
-			</Truncate>
-		);
-		expect( screen.getByText( 'Lo!!!m.' ) ).toBeVisible();
+	describe( 'with other children types', () => {
+		test( 'should no-op and output a warning to console', () => {
+			render(
+				<Truncate>
+					<>Lorem ipsum</>
+				</Truncate>
+			);
+			expect( screen.getByText( 'Lorem ipsum' ) ).toBeVisible();
+		} );
 	} );
 } );
diff --git a/packages/components/src/truncate/types.ts b/packages/components/src/truncate/types.ts
index f9b720657d9b59..6725f9e225f8a4 100644
--- a/packages/components/src/truncate/types.ts
+++ b/packages/components/src/truncate/types.ts
@@ -48,6 +48,10 @@ export type TruncateProps = {
 	numberOfLines?: number;
 	/**
 	 * The children elements.
+	 *
+	 * Note: text truncation will be attempted only if the `children` are either
+	 * of type `string` or `number`. In any other scenarios, the component will
+	 * not attempt to truncate the text, and will pass through the `children`.
 	 */
 	children: ReactNode;
 };
diff --git a/packages/components/src/unit-control/README.md b/packages/components/src/unit-control/README.md
index b3c0496f86b800..dd54de80357d8e 100644
--- a/packages/components/src/unit-control/README.md
+++ b/packages/components/src/unit-control/README.md
@@ -147,3 +147,10 @@ Example:
 ```
 
 -   Required: No
+
+### `__next40pxDefaultSize`: `boolean`
+
+Start opting into the larger default height that will become the default size in a future version.
+
+-   Required: No
+-   Default: `false`
diff --git a/packages/components/src/unit-control/index.native.js b/packages/components/src/unit-control/index.native.js
index a4c0b913f53432..4aae14de65779e 100644
--- a/packages/components/src/unit-control/index.native.js
+++ b/packages/components/src/unit-control/index.native.js
@@ -47,10 +47,8 @@ function UnitControl( {
 		if ( pickerRef?.current ) {
 			pickerRef.current.presentPicker();
 		}
-		// Disable reason: this should be fixed by the native team.
-		// It would be great if this could be done in the context of
+		// It would be great if the deps could be addressed in the context of
 		// https://github.com/WordPress/gutenberg/pull/39218
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [ pickerRef?.current ] );
 
 	const currentInputValue = currentInput === null ? value : currentInput;
@@ -106,10 +104,8 @@ function UnitControl( {
 			anchorNodeRef?.current
 				? findNodeHandle( anchorNodeRef?.current )
 				: undefined,
-		// Disable reason: this should be fixed by the native team.
-		// It would be great if this could be done in the context of
+		// It would be great if the deps could be addressed in the context of
 		// https://github.com/WordPress/gutenberg/pull/39218
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[ anchorNodeRef?.current ]
 	);
 
diff --git a/packages/components/src/unit-control/index.tsx b/packages/components/src/unit-control/index.tsx
index cc657f5fd67f40..2dd08cc155225f 100644
--- a/packages/components/src/unit-control/index.tsx
+++ b/packages/components/src/unit-control/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import type { KeyboardEvent, ForwardedRef, SyntheticEvent } from 'react';
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -56,11 +56,7 @@ function UnforwardedUnitControl(
 		value: valueProp,
 		onFocus: onFocusProp,
 		...props
-	} = useDeprecated36pxDefaultSizeProp(
-		unitControlProps,
-		'wp.components.UnitControl',
-		'6.4'
-	);
+	} = useDeprecated36pxDefaultSizeProp( unitControlProps );
 
 	if ( 'unit' in unitControlProps ) {
 		deprecated( 'UnitControl unit prop', {
@@ -112,7 +108,7 @@ function UnforwardedUnitControl(
 		}
 	}, [ parsedUnit, setUnit ] );
 
-	const classes = classnames(
+	const classes = clsx(
 		'components-unit-control',
 		// This class is added for legacy purposes to maintain it on the outer
 		// wrapper. See: https://github.com/WordPress/gutenberg/pull/45139
@@ -171,11 +167,16 @@ function UnforwardedUnitControl(
 	if ( ! disableUnits && isUnitSelectTabbable && units.length ) {
 		handleOnKeyDown = ( event: KeyboardEvent< HTMLInputElement > ) => {
 			props.onKeyDown?.( event );
-			// Unless the meta key was pressed (to avoid interfering with
-			// shortcuts, e.g. pastes), moves focus to the unit select if a key
+			// Unless the meta or ctrl key was pressed (to avoid interfering with
+			// shortcuts, e.g. pastes), move focus to the unit select if a key
 			// matches the first character of a unit.
-			if ( ! event.metaKey && reFirstCharacterOfUnits.test( event.key ) )
+			if (
+				! event.metaKey &&
+				! event.ctrlKey &&
+				reFirstCharacterOfUnits.test( event.key )
+			) {
 				refInputSuffix.current?.focus();
+			}
 		};
 	}
 
@@ -188,7 +189,7 @@ function UnforwardedUnitControl(
 			isUnitSelectTabbable={ isUnitSelectTabbable }
 			onChange={ handleOnUnitChange }
 			size={
-				size === 'small' ||
+				[ 'small', 'compact' ].includes( size ) ||
 				( size === 'default' && ! props.__next40pxDefaultSize )
 					? 'small'
 					: 'default'
diff --git a/packages/components/src/unit-control/styles/unit-control-styles.ts b/packages/components/src/unit-control/styles/unit-control-styles.ts
index d89e9b65a12a1a..8ec575c8499ec2 100644
--- a/packages/components/src/unit-control/styles/unit-control-styles.ts
+++ b/packages/components/src/unit-control/styles/unit-control-styles.ts
@@ -40,12 +40,15 @@ const baseUnitLabelStyles = ( { selectSize }: SelectProps ) => {
 			box-sizing: border-box;
 			padding: 2px 1px;
 			width: 20px;
-			color: ${ COLORS.gray[ 800 ] };
 			font-size: 8px;
 			line-height: 1;
 			letter-spacing: -0.5px;
 			text-transform: uppercase;
 			text-align-last: center;
+
+			&:not( :disabled ) {
+				color: ${ COLORS.gray[ 800 ] };
+			}
 		`,
 		default: css`
 			box-sizing: border-box;
@@ -54,13 +57,18 @@ const baseUnitLabelStyles = ( { selectSize }: SelectProps ) => {
 			height: 24px;
 			margin-inline-end: ${ space( 2 ) };
 			padding: ${ space( 1 ) };
-			color: ${ COLORS.theme.accent };
+
 			font-size: 13px;
 			line-height: 1;
 			text-align-last: center;
 			white-space: nowrap;
 			overflow: hidden;
 			text-overflow: ellipsis;
+			field-sizing: content;
+
+			&:not( :disabled ) {
+				color: ${ COLORS.theme.accent };
+			}
 		`,
 	};
 
@@ -106,9 +114,8 @@ const unitSelectSizes = ( { selectSize = 'default' }: SelectProps ) => {
 			justify-content: center;
 			align-items: center;
 
-			&:hover {
-				color: ${ COLORS.ui.borderFocus };
-				box-shadow: inset 0 0 0
+			&:where( :not( :disabled ) ):hover {
+				box-shadow: 0 0 0
 					${ CONFIG.borderWidth + ' ' + COLORS.ui.borderFocus };
 				outline: ${ CONFIG.borderWidth } solid transparent; // For High Contrast Mode
 			}
@@ -129,7 +136,7 @@ export const UnitSelect = styled.select< SelectProps >`
 	&&& {
 		appearance: none;
 		background: transparent;
-		border-radius: 2px;
+		border-radius: ${ CONFIG.radiusXSmall };
 		border: none;
 		display: block;
 		outline: none;
diff --git a/packages/components/src/unit-control/test/index.tsx b/packages/components/src/unit-control/test/index.tsx
index 777004a6e8ae27..d91498d46478b3 100644
--- a/packages/components/src/unit-control/test/index.tsx
+++ b/packages/components/src/unit-control/test/index.tsx
@@ -138,7 +138,7 @@ describe( 'UnitControl', () => {
 			const user = userEvent.setup();
 			const onChangeSpy = jest.fn();
 
-			render( <UnitControl value={ '50px' } onChange={ onChangeSpy } /> );
+			render( <UnitControl value="50px" onChange={ onChangeSpy } /> );
 
 			const input = getInput();
 			await user.clear( input );
@@ -159,7 +159,7 @@ describe( 'UnitControl', () => {
 			const user = userEvent.setup();
 			const onChangeSpy = jest.fn();
 
-			render( <UnitControl value={ '50px' } onChange={ onChangeSpy } /> );
+			render( <UnitControl value="50px" onChange={ onChangeSpy } /> );
 
 			const input = getInput();
 			await user.type( input, '{ArrowUp}' );
@@ -175,7 +175,7 @@ describe( 'UnitControl', () => {
 			const user = userEvent.setup();
 			const onChangeSpy = jest.fn();
 
-			render( <UnitControl value={ '50px' } onChange={ onChangeSpy } /> );
+			render( <UnitControl value="50px" onChange={ onChangeSpy } /> );
 
 			const input = getInput();
 			await user.type( input, '{Shift>}{ArrowUp}{/Shift}' );
@@ -253,7 +253,7 @@ describe( 'UnitControl', () => {
 
 			render(
 				<UnitControl
-					value={ '33%' }
+					value="33%"
 					onChange={ onChangeSpy }
 					onBlur={ onBlurSpy }
 				/>
@@ -282,7 +282,7 @@ describe( 'UnitControl', () => {
 
 			render(
 				<UnitControl
-					value={ '15px' }
+					value="15px"
 					onChange={ onChangeSpy }
 					isPressEnterToChange
 				/>
@@ -348,7 +348,7 @@ describe( 'UnitControl', () => {
 
 			render(
 				<UnitControl
-					value={ '14rem' }
+					value="14rem"
 					onChange={ onChangeSpy }
 					onUnitChange={ onUnitChangeSpy }
 				/>
@@ -468,7 +468,7 @@ describe( 'UnitControl', () => {
 
 			render(
 				<UnitControl
-					value={ '50%' }
+					value="50%"
 					units={ [ { value: '%', label: '%' } ] }
 					onChange={ onChangeSpy }
 				/>
@@ -570,19 +570,19 @@ describe( 'UnitControl', () => {
 
 	describe( 'Unit Parser', () => {
 		it( 'should update unit after initial render and with new unit prop', async () => {
-			const { rerender } = render( <UnitControl value={ '10%' } /> );
+			const { rerender } = render( <UnitControl value="10%" /> );
 
 			const select = getSelect();
 
 			expect( select.value ).toBe( '%' );
 
-			rerender( <UnitControl value={ '20vh' } /> );
+			rerender( <UnitControl value="20vh" /> );
 
 			expect( select.value ).toBe( 'vh' );
 		} );
 
 		it( 'should fallback to default unit if parsed unit is invalid', () => {
-			render( <UnitControl value={ '10null' } /> );
+			render( <UnitControl value="10null" /> );
 
 			expect( getSelect().value ).toBe( 'px' );
 		} );
@@ -590,7 +590,7 @@ describe( 'UnitControl', () => {
 		it( 'should display valid CSS unit when not explicitly included in units list', () => {
 			render(
 				<UnitControl
-					value={ '10%' }
+					value="10%"
 					units={ [
 						{ value: 'px', label: 'px' },
 						{ value: 'em', label: 'em' },
@@ -616,7 +616,7 @@ describe( 'UnitControl', () => {
 
 				render(
 					<UnitControl
-						value={ '10%' }
+						value="10%"
 						onChange={ onChangeSpy }
 						onUnitChange={ onUnitChangeSpy }
 					/>
diff --git a/packages/components/src/unit-control/unit-select-control.tsx b/packages/components/src/unit-control/unit-select-control.tsx
index c3019fb830c224..3bd3266a0a9af0 100644
--- a/packages/components/src/unit-control/unit-select-control.tsx
+++ b/packages/components/src/unit-control/unit-select-control.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 import type { ChangeEvent, ForwardedRef } from 'react';
 
 /**
@@ -47,7 +47,7 @@ function UnitSelectControl(
 		onChange?.( unitValue, { event, data } );
 	};
 
-	const classes = classnames( 'components-unit-control__select', className );
+	const classes = clsx( 'components-unit-control__select', className );
 
 	return (
 		<UnitSelect
diff --git a/packages/components/src/utils/colors-values.js b/packages/components/src/utils/colors-values.js
index 1f2cdab6729094..1ad528d13f0108 100644
--- a/packages/components/src/utils/colors-values.js
+++ b/packages/components/src/utils/colors-values.js
@@ -1,8 +1,6 @@
 /**
  * Internal dependencies
  */
-import { rgba } from './colors';
-
 const white = '#fff';
 
 // Matches the grays in @wordpress/base-styles
@@ -29,41 +27,65 @@ const ALERT = {
 	green: '#4ab866',
 };
 
-// Matches the Modern admin scheme in @wordpress/base-styles
-const ADMIN = {
-	theme: 'var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9))',
-	themeDark10:
-		'var(--wp-components-color-accent-darker-10, var(--wp-admin-theme-color-darker-10, #2145e6))',
+// Should match packages/components/src/utils/theme-variables.scss
+const THEME = {
+	accent: `var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9))`,
+	accentDarker10: `var(--wp-components-color-accent-darker-10, var(--wp-admin-theme-color-darker-10, #2145e6))`,
+	accentDarker20: `var(--wp-components-color-accent-darker-20, var(--wp-admin-theme-color-darker-20, #183ad6))`,
+	/** Used when placing text on the accent color. */
+	accentInverted: `var(--wp-components-color-accent-inverted, ${ white })`,
+
+	background: `var(--wp-components-color-background, ${ white })`,
+
+	foreground: `var(--wp-components-color-foreground, ${ GRAY[ 900 ] })`,
+	/** Used when placing text on the foreground color. */
+	foregroundInverted: `var(--wp-components-color-foreground-inverted, ${ white })`,
+
+	gray: {
+		/** @deprecated Use `COLORS.theme.foreground` instead. */
+		900: `var(--wp-components-color-foreground, ${ GRAY[ 900 ] })`,
+		800: `var(--wp-components-color-gray-800, ${ GRAY[ 800 ] })`,
+		700: `var(--wp-components-color-gray-700, ${ GRAY[ 700 ] })`,
+		600: `var(--wp-components-color-gray-600, ${ GRAY[ 600 ] })`,
+		400: `var(--wp-components-color-gray-400, ${ GRAY[ 400 ] })`,
+		300: `var(--wp-components-color-gray-300, ${ GRAY[ 300 ] })`,
+		200: `var(--wp-components-color-gray-200, ${ GRAY[ 200 ] })`,
+		100: `var(--wp-components-color-gray-100, ${ GRAY[ 100 ] })`,
+	},
 };
 
 const UI = {
-	background: white,
-	backgroundDisabled: GRAY[ 100 ],
-	border: GRAY[ 600 ],
-	borderHover: GRAY[ 700 ],
-	borderFocus: ADMIN.theme,
-	borderDisabled: GRAY[ 400 ],
-	textDisabled: GRAY[ 600 ],
-	textDark: white,
+	background: THEME.background,
+	backgroundDisabled: THEME.gray[ 100 ],
+	border: THEME.gray[ 600 ],
+	borderHover: THEME.gray[ 700 ],
+	borderFocus: THEME.accent,
+	borderDisabled: THEME.gray[ 400 ],
+	textDisabled: THEME.gray[ 600 ],
 
 	// Matches @wordpress/base-styles
-	darkGrayPlaceholder: rgba( GRAY[ 900 ], 0.62 ),
-	lightGrayPlaceholder: rgba( white, 0.65 ),
-};
-
-const THEME = {
-	accent: ADMIN.theme,
-	accentDarker10: ADMIN.themeDark10,
+	darkGrayPlaceholder: `color-mix(in srgb, ${ THEME.foreground }, transparent 38%)`,
+	lightGrayPlaceholder: `color-mix(in srgb, ${ THEME.background }, transparent 35%)`,
 };
 
 export const COLORS = Object.freeze( {
 	/**
 	 * The main gray color object.
+	 *
+	 * @deprecated Use semantic aliases in `COLORS.ui` or theme-ready variables in `COLORS.theme.gray`.
 	 */
-	gray: GRAY,
+	gray: GRAY, // TODO: Stop exporting this when everything is migrated to `theme` or `ui`
 	white,
 	alert: ALERT,
+	/**
+	 * Theme-ready variables with fallbacks.
+	 *
+	 * Prefer semantic aliases in `COLORS.ui` when applicable.
+	 */
 	theme: THEME,
+	/**
+	 * Semantic aliases (prefer these over raw variables when applicable).
+	 */
 	ui: UI,
 } );
 
diff --git a/packages/components/src/utils/colors.js b/packages/components/src/utils/colors.js
index 25e7e2063cabde..cab2202b0ce56c 100644
--- a/packages/components/src/utils/colors.js
+++ b/packages/components/src/utils/colors.js
@@ -29,7 +29,9 @@ export function rgba( hexValue = '', alpha = 1 ) {
  * @return {HTMLDivElement | undefined} The HTML element for color computation.
  */
 function getColorComputationNode() {
-	if ( typeof document === 'undefined' ) return;
+	if ( typeof document === 'undefined' ) {
+		return;
+	}
 
 	if ( ! colorComputationNode ) {
 		// Create a temporary element for style computation.
@@ -49,7 +51,9 @@ function getColorComputationNode() {
  * @return {boolean} Whether the value is a valid color.
  */
 function isColor( value ) {
-	if ( typeof value !== 'string' ) return false;
+	if ( typeof value !== 'string' ) {
+		return false;
+	}
 	const test = colord( value );
 
 	return test.isValid();
@@ -64,16 +68,26 @@ function isColor( value ) {
  * @return {string} The computed background color.
  */
 function _getComputedBackgroundColor( backgroundColor ) {
-	if ( typeof backgroundColor !== 'string' ) return '';
+	if ( typeof backgroundColor !== 'string' ) {
+		return '';
+	}
 
-	if ( isColor( backgroundColor ) ) return backgroundColor;
+	if ( isColor( backgroundColor ) ) {
+		return backgroundColor;
+	}
 
-	if ( ! backgroundColor.includes( 'var(' ) ) return '';
-	if ( typeof document === 'undefined' ) return '';
+	if ( ! backgroundColor.includes( 'var(' ) ) {
+		return '';
+	}
+	if ( typeof document === 'undefined' ) {
+		return '';
+	}
 
 	// Attempts to gracefully handle CSS variables color values.
 	const el = getColorComputationNode();
-	if ( ! el ) return '';
+	if ( ! el ) {
+		return '';
+	}
 
 	el.style.background = backgroundColor;
 	// Grab the style.
diff --git a/packages/components/src/utils/config-values.js b/packages/components/src/utils/config-values.js
index f279bce888b9d9..1bc3945f9b3b16 100644
--- a/packages/components/src/utils/config-values.js
+++ b/packages/components/src/utils/config-values.js
@@ -5,19 +5,15 @@ import { space } from './space';
 import { COLORS } from './colors-values';
 
 const CONTROL_HEIGHT = '36px';
-const CONTROL_PADDING_X = '12px';
 
 const CONTROL_PROPS = {
-	controlSurfaceColor: COLORS.white,
-	controlTextActiveColor: COLORS.theme.accent,
-	controlPaddingX: CONTROL_PADDING_X,
-	controlPaddingXLarge: `calc(${ CONTROL_PADDING_X } * 1.3334)`,
-	controlPaddingXSmall: `calc(${ CONTROL_PADDING_X } / 1.3334)`,
+	// These values should be shared with TextControl.
+	controlPaddingX: 12,
+	controlPaddingXSmall: 8,
+	controlPaddingXLarge: 12 * 1.3334, // TODO: Deprecate
+
 	controlBackgroundColor: COLORS.white,
-	controlBorderRadius: '2px',
-	controlBoxShadow: 'transparent',
 	controlBoxShadowFocus: `0 0 0 0.5px ${ COLORS.theme.accent }`,
-	controlDestructiveBorderColor: COLORS.alert.red,
 	controlHeight: CONTROL_HEIGHT,
 	controlHeightXSmall: `calc( ${ CONTROL_HEIGHT } * 0.6 )`,
 	controlHeightSmall: `calc( ${ CONTROL_HEIGHT } * 0.8 )`,
@@ -25,24 +21,20 @@ const CONTROL_PROPS = {
 	controlHeightXLarge: `calc( ${ CONTROL_HEIGHT } * 1.4 )`,
 };
 
-const TOGGLE_GROUP_CONTROL_PROPS = {
-	toggleGroupControlBackgroundColor: CONTROL_PROPS.controlBackgroundColor,
-	toggleGroupControlBorderColor: COLORS.ui.border,
-	toggleGroupControlBackdropBackgroundColor:
-		CONTROL_PROPS.controlSurfaceColor,
-	toggleGroupControlBackdropBorderColor: COLORS.ui.border,
-	toggleGroupControlButtonColorActive: CONTROL_PROPS.controlBackgroundColor,
-};
-
 // Using Object.assign to avoid creating circular references when emitting
 // TypeScript type declarations.
-export default Object.assign( {}, CONTROL_PROPS, TOGGLE_GROUP_CONTROL_PROPS, {
+export default Object.assign( {}, CONTROL_PROPS, {
 	colorDivider: 'rgba(0, 0, 0, 0.1)',
 	colorScrollbarThumb: 'rgba(0, 0, 0, 0.2)',
 	colorScrollbarThumbHover: 'rgba(0, 0, 0, 0.5)',
 	colorScrollbarTrack: 'rgba(0, 0, 0, 0.04)',
 	elevationIntensity: 1,
-	radiusBlockUi: '2px',
+	radiusXSmall: '1px',
+	radiusSmall: '2px',
+	radiusMedium: '4px',
+	radiusLarge: '8px',
+	radiusFull: '9999px',
+	radiusRound: '50%',
 	borderWidth: '1px',
 	borderWidthFocus: '1.5px',
 	borderWidthTab: '4px',
@@ -58,16 +50,18 @@ export default Object.assign( {}, CONTROL_PROPS, TOGGLE_GROUP_CONTROL_PROPS, {
 	fontSizeMobile: '15px',
 	fontSizeSmall: 'calc(0.92 * 13px)',
 	fontSizeXSmall: 'calc(0.75 * 13px)',
-	fontLineHeightBase: '1.2',
+	fontLineHeightBase: '1.4',
 	fontWeight: 'normal',
 	fontWeightHeading: '600',
 	gridBase: '4px',
-	cardBorderRadius: '2px',
 	cardPaddingXSmall: `${ space( 2 ) }`,
 	cardPaddingSmall: `${ space( 4 ) }`,
 	cardPaddingMedium: `${ space( 4 ) } ${ space( 6 ) }`,
 	cardPaddingLarge: `${ space( 6 ) } ${ space( 8 ) }`,
-	popoverShadow: `0 0.7px 1px rgba(0, 0, 0, 0.1), 0 1.2px 1.7px -0.2px rgba(0, 0, 0, 0.1), 0 2.3px 3.3px -0.5px rgba(0, 0, 0, 0.1)`,
+	elevationXSmall: `0 1px 1px rgba(0, 0, 0, 0.03), 0 1px 2px rgba(0, 0, 0, 0.02), 0 3px 3px rgba(0, 0, 0, 0.02), 0 4px 4px rgba(0, 0, 0, 0.01)`,
+	elevationSmall: `0 1px 2px rgba(0, 0, 0, 0.05), 0 2px 3px rgba(0, 0, 0, 0.04), 0 6px 6px rgba(0, 0, 0, 0.03), 0 8px 8px rgba(0, 0, 0, 0.02)`,
+	elevationMedium: `0 2px 3px rgba(0, 0, 0, 0.05), 0 4px 5px rgba(0, 0, 0, 0.04), 0 12px 12px rgba(0, 0, 0, 0.03), 0 16px 16px rgba(0, 0, 0, 0.02)`,
+	elevationLarge: `0 5px 15px rgba(0, 0, 0, 0.08), 0 15px 27px rgba(0, 0, 0, 0.07), 0 30px 36px rgba(0, 0, 0, 0.04), 0 50px 43px rgba(0, 0, 0, 0.02)`,
 	surfaceBackgroundColor: COLORS.white,
 	surfaceBackgroundSubtleColor: '#F3F3F3',
 	surfaceBackgroundTintColor: '#F5F5F5',
diff --git a/packages/components/src/utils/element-rect.ts b/packages/components/src/utils/element-rect.ts
new file mode 100644
index 00000000000000..0f58ea6d7caf54
--- /dev/null
+++ b/packages/components/src/utils/element-rect.ts
@@ -0,0 +1,189 @@
+/* eslint-disable jsdoc/require-param */
+/**
+ * WordPress dependencies
+ */
+import { useLayoutEffect, useRef, useState } from '@wordpress/element';
+import { useEvent, useResizeObserver } from '@wordpress/compose';
+
+/**
+ * The position and dimensions of an element, relative to its offset parent.
+ */
+export type ElementOffsetRect = {
+	/**
+	 * The element the rect belongs to.
+	 */
+	element: HTMLElement | undefined;
+	/**
+	 * The distance from the top edge of the offset parent to the top edge of
+	 * the element.
+	 */
+	top: number;
+	/**
+	 * The distance from the right edge of the offset parent to the right edge
+	 * of the element.
+	 */
+	right: number;
+	/**
+	 * The distance from the bottom edge of the offset parent to the bottom edge
+	 * of the element.
+	 */
+	bottom: number;
+	/**
+	 * The distance from the left edge of the offset parent to the left edge of
+	 * the element.
+	 */
+	left: number;
+	/**
+	 * The width of the element.
+	 */
+	width: number;
+	/**
+	 * The height of the element.
+	 */
+	height: number;
+};
+
+/**
+ * An `ElementOffsetRect` object with all values set to zero.
+ */
+export const NULL_ELEMENT_OFFSET_RECT = {
+	element: undefined,
+	top: 0,
+	right: 0,
+	bottom: 0,
+	left: 0,
+	width: 0,
+	height: 0,
+} satisfies ElementOffsetRect;
+
+/**
+ * Returns the position and dimensions of an element, relative to its offset
+ * parent, with subpixel precision. Values reflect the real measures before any
+ * potential scaling distortions along the X and Y axes.
+ *
+ * Useful in contexts where plain `getBoundingClientRect` calls or `ResizeObserver`
+ * entries are not suitable, such as when the element is transformed, and when
+ * `element.offset<Top|Left|Width|Height>` methods are not precise enough.
+ *
+ * **Note:** in some contexts, like when the scale is 0, this method will fail
+ * because it's impossible to calculate a scaling ratio. When that happens, it
+ * will return `undefined`.
+ */
+export function getElementOffsetRect(
+	element: HTMLElement
+): ElementOffsetRect | undefined {
+	// Position and dimension values computed with `getBoundingClientRect` have
+	// subpixel precision, but are affected by distortions since they represent
+	// the "real" measures, or in other words, the actual final values as rendered
+	// by the browser.
+	const rect = element.getBoundingClientRect();
+	if ( rect.width === 0 || rect.height === 0 ) {
+		return;
+	}
+	const offsetParent = element.offsetParent;
+	const offsetParentRect =
+		offsetParent?.getBoundingClientRect() ?? NULL_ELEMENT_OFFSET_RECT;
+	const offsetParentScrollX = offsetParent?.scrollLeft ?? 0;
+	const offsetParentScrollY = offsetParent?.scrollTop ?? 0;
+
+	// Computed widths and heights have subpixel precision, and are not affected
+	// by distortions.
+	const computedWidth = parseFloat( getComputedStyle( element ).width );
+	const computedHeight = parseFloat( getComputedStyle( element ).height );
+
+	// We can obtain the current scale factor for the element by comparing "computed"
+	// dimensions with the "real" ones.
+	const scaleX = computedWidth / rect.width;
+	const scaleY = computedHeight / rect.height;
+
+	return {
+		element,
+		// To obtain the adjusted values for the position:
+		// 1. Compute the element's position relative to the offset parent.
+		// 2. Correct for the scale factor.
+		// 3. Adjust for the scroll position of the offset parent.
+		top:
+			( rect.top - offsetParentRect?.top ) * scaleY + offsetParentScrollY,
+		right:
+			( offsetParentRect?.right - rect.right ) * scaleX -
+			offsetParentScrollX,
+		bottom:
+			( offsetParentRect?.bottom - rect.bottom ) * scaleY -
+			offsetParentScrollY,
+		left:
+			( rect.left - offsetParentRect?.left ) * scaleX +
+			offsetParentScrollX,
+		// Computed dimensions don't need any adjustments.
+		width: computedWidth,
+		height: computedHeight,
+	};
+}
+
+const POLL_RATE = 100;
+
+/**
+ * Tracks the position and dimensions of an element, relative to its offset
+ * parent. The element can be changed dynamically.
+ *
+ * When no element is provided (`null` or `undefined`), the hook will return
+ * a "null" rect, in which all values are `0` and `element` is `undefined`.
+ *
+ * **Note:** sometimes, the measurement will fail (see `getElementOffsetRect`'s
+ * documentation for more details). When that happens, this hook will attempt
+ * to measure again after a frame, and if that fails, it will poll every 100
+ * milliseconds until it succeeds.
+ */
+export function useTrackElementOffsetRect(
+	targetElement: HTMLElement | undefined | null,
+	deps: unknown[] = []
+) {
+	const [ indicatorPosition, setIndicatorPosition ] =
+		useState< ElementOffsetRect >( NULL_ELEMENT_OFFSET_RECT );
+	const intervalRef = useRef< ReturnType< typeof setInterval > >();
+
+	const measure = useEvent( () => {
+		// Check that the targetElement is still attached to the DOM, in case
+		// it was removed since the last `measure` call.
+		if ( targetElement && targetElement.isConnected ) {
+			const elementOffsetRect = getElementOffsetRect( targetElement );
+			if ( elementOffsetRect ) {
+				setIndicatorPosition( elementOffsetRect );
+				clearInterval( intervalRef.current );
+				return true;
+			}
+		} else {
+			clearInterval( intervalRef.current );
+		}
+		return false;
+	} );
+
+	const setElement = useResizeObserver( () => {
+		if ( ! measure() ) {
+			requestAnimationFrame( () => {
+				if ( ! measure() ) {
+					intervalRef.current = setInterval( measure, POLL_RATE );
+				}
+			} );
+		}
+	} );
+
+	useLayoutEffect( () => {
+		setElement( targetElement );
+		if ( ! targetElement ) {
+			setIndicatorPosition( NULL_ELEMENT_OFFSET_RECT );
+		}
+	}, [ setElement, targetElement ] );
+
+	// Escape hatch to force a remeasurement when something else changes rather
+	// than the target elements' ref or size (for example, the target element
+	// can change its position within the tablist).
+	useLayoutEffect( () => {
+		measure();
+		// `measure` is a stable function, so it's safe to omit it from the deps array.
+		// deps can't be statically analyzed by ESLint
+	}, deps );
+
+	return indicatorPosition;
+}
+
+/* eslint-enable jsdoc/require-param */
diff --git a/packages/components/src/utils/font-size.ts b/packages/components/src/utils/font-size.ts
index e1a5a543709f43..c9a3b044b55a22 100644
--- a/packages/components/src/utils/font-size.ts
+++ b/packages/components/src/utils/font-size.ts
@@ -51,7 +51,9 @@ export function getFontSize(
 
 	if ( typeof size !== 'number' ) {
 		const parsed = parseFloat( size );
-		if ( Number.isNaN( parsed ) ) return size;
+		if ( Number.isNaN( parsed ) ) {
+			return size;
+		}
 		size = parsed;
 	}
 
diff --git a/packages/components/src/utils/get-valid-children.ts b/packages/components/src/utils/get-valid-children.ts
index 726630cd6516b9..07d4aa038e8a27 100644
--- a/packages/components/src/utils/get-valid-children.ts
+++ b/packages/components/src/utils/get-valid-children.ts
@@ -18,7 +18,9 @@ import { Children, isValidElement } from '@wordpress/element';
 export function getValidChildren(
 	children: ReactNode
 ): Array< ReactChild | ReactFragment | ReactPortal > {
-	if ( typeof children === 'string' ) return [ children ];
+	if ( typeof children === 'string' ) {
+		return [ children ];
+	}
 
 	return Children.toArray( children ).filter( ( child ) =>
 		isValidElement( child )
diff --git a/packages/components/src/utils/hooks/index.js b/packages/components/src/utils/hooks/index.js
index beacf31b7562cd..896f691cdc5427 100644
--- a/packages/components/src/utils/hooks/index.js
+++ b/packages/components/src/utils/hooks/index.js
@@ -2,4 +2,3 @@ export { default as useControlledState } from './use-controlled-state';
 export { default as useUpdateEffect } from './use-update-effect';
 export { useControlledValue } from './use-controlled-value';
 export { useCx } from './use-cx';
-export { useLatestRef } from './use-latest-ref';
diff --git a/packages/components/src/utils/hooks/stories/use-cx.js b/packages/components/src/utils/hooks/stories/use-cx.js
deleted file mode 100644
index e7054a8f53952b..00000000000000
--- a/packages/components/src/utils/hooks/stories/use-cx.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * External dependencies
- */
-import { css } from '@emotion/react';
-
-/**
- * WordPress dependencies
- */
-import { __unstableIframe as Iframe } from '@wordpress/block-editor';
-import { useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { useCx } from '..';
-import StyleProvider from '../../../style-provider';
-import {
-	createSlotFill,
-	Provider as SlotFillProvider,
-} from '../../../slot-fill';
-
-export default {
-	title: 'Components (Experimental)/useCx',
-};
-
-const Example = ( { serializedStyles, children } ) => {
-	const cx = useCx();
-	const classes = cx( serializedStyles );
-	return <span className={ classes }>{ children }</span>;
-};
-
-const ExampleWithUseMemoWrong = ( { serializedStyles, children } ) => {
-	const cx = useCx();
-	// Wrong: using 'useMemo' without adding 'cx' to the dependency list.
-	const classes = useMemo(
-		() => cx( serializedStyles ),
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[ serializedStyles ]
-	);
-	return <span className={ classes }>{ children }</span>;
-};
-
-const ExampleWithUseMemoRight = ( { serializedStyles, children } ) => {
-	const cx = useCx();
-	// Right: using 'useMemo' with 'cx' listed as a dependency.
-	const classes = useMemo(
-		() => cx( serializedStyles ),
-		[ cx, serializedStyles ]
-	);
-	return <span className={ classes }>{ children }</span>;
-};
-
-export const _slotFill = () => {
-	const { Fill, Slot } = createSlotFill( 'UseCxExampleSlot' );
-
-	const redText = css`
-		color: red;
-	`;
-	const blueText = css`
-		color: blue;
-	`;
-	const greenText = css`
-		color: green;
-	`;
-
-	return (
-		<SlotFillProvider>
-			<StyleProvider document={ document }>
-				<Iframe>
-					<Iframe>
-						<Example serializedStyles={ redText }>
-							This text is inside an iframe and should be red
-						</Example>
-						<Fill name="test-slot">
-							<Example serializedStyles={ blueText }>
-								This text is also inside the iframe, but is
-								relocated by a slot/fill and should be blue
-							</Example>
-						</Fill>
-						<Fill name="outside-frame">
-							<Example serializedStyles={ greenText }>
-								This text is also inside the iframe, but is
-								relocated by a slot/fill and should be green
-							</Example>
-						</Fill>
-					</Iframe>
-					<StyleProvider document={ document }>
-						<Slot bubblesVirtually name="test-slot" />
-					</StyleProvider>
-				</Iframe>
-				<Slot bubblesVirtually name="outside-frame" />
-			</StyleProvider>
-		</SlotFillProvider>
-	);
-};
-
-export const _slotFillSimple = () => {
-	const { Fill, Slot } = createSlotFill( 'UseCxExampleSlotTwo' );
-
-	const redText = css`
-		color: red;
-	`;
-
-	return (
-		<SlotFillProvider>
-			<Iframe>
-				<Fill name="test-slot">
-					<Example serializedStyles={ redText }>
-						This text should be red
-					</Example>
-				</Fill>
-			</Iframe>
-			<Slot bubblesVirtually name="test-slot" />
-		</SlotFillProvider>
-	);
-};
-
-export const _useMemoBadPractices = () => {
-	const redText = css`
-		color: red;
-	`;
-	const blueText = css`
-		color: blue;
-	`;
-
-	return (
-		<>
-			<Example serializedStyles={ redText }>
-				This text should be red
-			</Example>
-			<ExampleWithUseMemoRight serializedStyles={ blueText }>
-				This text should be blue
-			</ExampleWithUseMemoRight>
-			<Iframe>
-				<Example serializedStyles={ redText }>
-					This text should be red
-				</Example>
-				<ExampleWithUseMemoWrong serializedStyles={ blueText }>
-					This text should be blue but it&apos;s not!
-				</ExampleWithUseMemoWrong>
-			</Iframe>
-		</>
-	);
-};
-
-export const _default = () => {
-	const redText = css`
-		color: red;
-	`;
-	return (
-		<Iframe>
-			<Example serializedStyles={ redText }>
-				This text is inside an iframe and is red!
-			</Example>
-		</Iframe>
-	);
-};
diff --git a/packages/components/src/utils/hooks/test/use-latest-ref.js b/packages/components/src/utils/hooks/test/use-latest-ref.js
deleted file mode 100644
index 0c424a62390332..00000000000000
--- a/packages/components/src/utils/hooks/test/use-latest-ref.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
-
-/**
- * WordPress dependencies
- */
-import { useState } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { useLatestRef } from '..';
-
-function debounce( callback, timeout = 0 ) {
-	let timeoutId = 0;
-	return ( ...args ) => {
-		window.clearTimeout( timeoutId );
-		timeoutId = window.setTimeout( () => callback( ...args ), timeout );
-	};
-}
-
-function useDebounce( callback, timeout = 0 ) {
-	const callbackRef = useLatestRef( callback );
-	return debounce( ( ...args ) => callbackRef.current( ...args ), timeout );
-}
-
-function Example() {
-	const [ count, setCount ] = useState( 0 );
-	const increment = () => setCount( count + 1 );
-	const incrementDebounced = debounce( increment, 50 );
-	const incrementDebouncedWithLatestRef = useDebounce( increment, 50 );
-
-	return (
-		<>
-			<div>Count: { count }</div>
-			<button onClick={ incrementDebounced }>Increment debounced</button>
-			<button onClick={ increment }>Increment immediately</button>
-			<br />
-			<button onClick={ incrementDebouncedWithLatestRef }>
-				Increment debounced with latest ref
-			</button>
-		</>
-	);
-}
-
-function getCount() {
-	return screen.getByText( /Count:/ ).innerHTML;
-}
-
-function incrementCount() {
-	fireEvent.click( screen.getByText( 'Increment immediately' ) );
-}
-
-function incrementCountDebounced() {
-	fireEvent.click( screen.getByText( 'Increment debounced' ) );
-}
-
-function incrementCountDebouncedRef() {
-	fireEvent.click(
-		screen.getByText( 'Increment debounced with latest ref' )
-	);
-}
-
-describe( 'useLatestRef', () => {
-	describe( 'Example', () => {
-		// Prove the example works as expected.
-		it( 'should start at 0', () => {
-			render( <Example /> );
-
-			expect( getCount() ).toEqual( 'Count: 0' );
-		} );
-
-		it( 'should increment immediately', () => {
-			render( <Example /> );
-
-			incrementCount();
-
-			expect( getCount() ).toEqual( 'Count: 1' );
-		} );
-
-		it( 'should increment after debouncing', async () => {
-			render( <Example /> );
-
-			incrementCountDebounced();
-
-			expect( getCount() ).toEqual( 'Count: 0' );
-			await waitFor( () => expect( getCount() ).toEqual( 'Count: 1' ) );
-		} );
-
-		it( 'should increment after debouncing with latest ref', async () => {
-			render( <Example /> );
-
-			incrementCountDebouncedRef();
-
-			expect( getCount() ).toEqual( 'Count: 0' );
-			await waitFor( () => expect( getCount() ).toEqual( 'Count: 1' ) );
-		} );
-	} );
-
-	it( 'should increment to one', async () => {
-		render( <Example /> );
-
-		incrementCountDebounced();
-		incrementCount();
-
-		await waitFor( () => expect( getCount() ).toEqual( 'Count: 1' ) );
-	} );
-
-	it( 'should increment to two', async () => {
-		render( <Example /> );
-
-		incrementCountDebouncedRef();
-		incrementCount();
-
-		await waitFor( () => expect( getCount() ).toEqual( 'Count: 2' ) );
-	} );
-} );
diff --git a/packages/components/src/utils/hooks/use-animated-offset-rect.ts b/packages/components/src/utils/hooks/use-animated-offset-rect.ts
new file mode 100644
index 00000000000000..35e2a54aa02f2f
--- /dev/null
+++ b/packages/components/src/utils/hooks/use-animated-offset-rect.ts
@@ -0,0 +1,119 @@
+/* eslint-disable jsdoc/require-param */
+
+/**
+ * WordPress dependencies
+ */
+import { useEvent } from '@wordpress/compose';
+import { useLayoutEffect } from '@wordpress/element';
+/**
+ * Internal dependencies
+ */
+import type { ElementOffsetRect } from '../element-rect';
+import { useOnValueUpdate } from './use-on-value-update';
+
+/**
+ * A utility used to animate something in a container component based on the "offset
+ * rect" (position relative to the container and size) of a subelement. For example,
+ * this is useful to render an indicator for the selected option of a component, and
+ * to animate it when the selected option changes.
+ *
+ * Takes in a container element and the up-to-date "offset rect" of the target
+ * subelement, obtained with `useTrackElementOffsetRect`. Then it does the following:
+ *
+ * - Adds CSS variables with rect information to the container, so that the indicator
+ *   can be rendered and animated with them. These are kept up-to-date, enabling CSS
+ *   transitions on change.
+ * - Sets an attribute (`data-subelement-animated` by default) when the tracked
+ *   element changes, so that the target (e.g. the indicator) can be animated to its
+ *   new size and position.
+ * - Removes the attribute when the animation is done.
+ *
+ * The need for the attribute is due to the fact that the rect might update in
+ * situations other than when the tracked element changes, e.g. the tracked element
+ * might be resized. In such cases, there is no need to animate the indicator, and
+ * the change in size or position of the indicator needs to be reflected immediately.
+ */
+export function useAnimatedOffsetRect(
+	/**
+	 * The container element.
+	 */
+	container: HTMLElement | undefined,
+	/**
+	 * The rect of the tracked element.
+	 */
+	rect: ElementOffsetRect,
+	{
+		prefix = 'subelement',
+		dataAttribute = `${ prefix }-animated`,
+		transitionEndFilter = () => true,
+		roundRect = false,
+	}: {
+		/**
+		 * The prefix used for the CSS variables, e.g. if `prefix` is `selected`, the
+		 * CSS variables will be `--selected-top`, `--selected-left`, etc.
+		 * @default 'subelement'
+		 */
+		prefix?: string;
+		/**
+		 * The name of the data attribute used to indicate that the animation is in
+		 * progress. The `data-` prefix is added automatically.
+		 *
+		 * For example, if `dataAttribute` is `indicator-animated`, the attribute will
+		 * be `data-indicator-animated`.
+		 * @default `${ prefix }-animated`
+		 */
+		dataAttribute?: string;
+		/**
+		 * A function that is called with the transition event and returns a boolean
+		 * indicating whether the animation should be stopped. The default is a function
+		 * that always returns `true`.
+		 *
+		 * For example, if the animated element is the `::before` pseudo-element, the
+		 * function can be written as `( event ) => event.pseudoElement === '::before'`.
+		 * @default () => true
+		 */
+		transitionEndFilter?: ( event: TransitionEvent ) => boolean;
+		/**
+		 * Whether the `rect` measurements should be rounded down when applied
+		 * to the CSS variables. This can be useful to avoid blurry animations or
+		 * to avoid subpixel rendering issues.
+		 * @default false
+		 */
+		roundRect?: boolean;
+	} = {}
+) {
+	const setProperties = useEvent( () => {
+		( Object.keys( rect ) as Array< keyof typeof rect > ).forEach(
+			( property ) =>
+				property !== 'element' &&
+				container?.style.setProperty(
+					`--${ prefix }-${ property }`,
+					String(
+						roundRect
+							? Math.floor( rect[ property ] )
+							: rect[ property ]
+					)
+				)
+		);
+	} );
+	useLayoutEffect( () => {
+		setProperties();
+	}, [ rect, setProperties ] );
+	useOnValueUpdate( rect.element, ( { previousValue } ) => {
+		// Only enable the animation when moving from one element to another.
+		if ( rect.element && previousValue ) {
+			container?.setAttribute( `data-${ dataAttribute }`, '' );
+		}
+	} );
+	useLayoutEffect( () => {
+		function onTransitionEnd( event: TransitionEvent ) {
+			if ( transitionEndFilter( event ) ) {
+				container?.removeAttribute( `data-${ dataAttribute }` );
+			}
+		}
+		container?.addEventListener( 'transitionend', onTransitionEnd );
+		return () =>
+			container?.removeEventListener( 'transitionend', onTransitionEnd );
+	}, [ dataAttribute, container, transitionEndFilter ] );
+}
+/* eslint-enable jsdoc/require-param */
diff --git a/packages/components/src/utils/hooks/use-latest-ref.ts b/packages/components/src/utils/hooks/use-latest-ref.ts
deleted file mode 100644
index 5db9591b9e073c..00000000000000
--- a/packages/components/src/utils/hooks/use-latest-ref.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * External dependencies
- */
-import type { RefObject } from 'react';
-
-/**
- * WordPress dependencies
- */
-import { useRef } from '@wordpress/element';
-import { useIsomorphicLayoutEffect } from '@wordpress/compose';
-
-/**
- * Creates a reference for a prop. This is useful for preserving dependency
- * memoization for hooks like useCallback.
- *
- * @see https://codesandbox.io/s/uselatestref-mlj3i?file=/src/App.tsx
- *
- * @param value The value to reference
- * @return The prop reference.
- */
-export function useLatestRef< T >( value: T ): RefObject< T > {
-	const ref = useRef( value );
-
-	useIsomorphicLayoutEffect( () => {
-		ref.current = value;
-	} );
-
-	return ref;
-}
diff --git a/packages/components/src/utils/hooks/use-on-value-update.ts b/packages/components/src/utils/hooks/use-on-value-update.ts
new file mode 100644
index 00000000000000..15cfc321359e7c
--- /dev/null
+++ b/packages/components/src/utils/hooks/use-on-value-update.ts
@@ -0,0 +1,39 @@
+/* eslint-disable jsdoc/require-param */
+/**
+ * WordPress dependencies
+ */
+import { useEvent } from '@wordpress/compose';
+import { useRef, useLayoutEffect } from '@wordpress/element';
+
+/**
+ * Context object for the `onUpdate` callback of `useOnValueUpdate`.
+ */
+export type ValueUpdateContext< T > = {
+	previousValue: T;
+};
+
+/**
+ * Calls the `onUpdate` callback when the `value` changes.
+ */
+export function useOnValueUpdate< T >(
+	/**
+	 * The value to watch for changes.
+	 */
+	value: T,
+	/**
+	 * Callback to fire when the value changes.
+	 */
+	onUpdate: ( context: ValueUpdateContext< T > ) => void
+) {
+	const previousValueRef = useRef( value );
+	const updateCallbackEvent = useEvent( onUpdate );
+	useLayoutEffect( () => {
+		if ( previousValueRef.current !== value ) {
+			updateCallbackEvent( {
+				previousValue: previousValueRef.current,
+			} );
+			previousValueRef.current = value;
+		}
+	}, [ updateCallbackEvent, value ] );
+}
+/* eslint-enable jsdoc/require-param */
diff --git a/packages/components/src/utils/hooks/use-update-effect.js b/packages/components/src/utils/hooks/use-update-effect.js
index ab96caf5799756..e371647f033de6 100644
--- a/packages/components/src/utils/hooks/use-update-effect.js
+++ b/packages/components/src/utils/hooks/use-update-effect.js
@@ -6,25 +6,30 @@ import { useRef, useEffect } from '@wordpress/element';
 /**
  * A `React.useEffect` that will not run on the first render.
  * Source:
- * https://github.com/reakit/reakit/blob/HEAD/packages/reakit-utils/src/useUpdateEffect.ts
+ * https://github.com/ariakit/ariakit/blob/main/packages/ariakit-react-core/src/utils/hooks.ts
  *
  * @param {import('react').EffectCallback} effect
  * @param {import('react').DependencyList} deps
  */
 function useUpdateEffect( effect, deps ) {
-	const mounted = useRef( false );
+	const mountedRef = useRef( false );
 	useEffect( () => {
-		if ( mounted.current ) {
+		if ( mountedRef.current ) {
 			return effect();
 		}
-		mounted.current = true;
+		mountedRef.current = true;
 		return undefined;
-		// Disable reasons:
 		// 1. This hook needs to pass a dep list that isn't an array literal
 		// 2. `effect` is missing from the array, and will need to be added carefully to avoid additional warnings
 		// see https://github.com/WordPress/gutenberg/pull/41166
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, deps );
+
+	useEffect(
+		() => () => {
+			mountedRef.current = false;
+		},
+		[]
+	);
 }
 
 export default useUpdateEffect;
diff --git a/packages/components/src/utils/input/base.js b/packages/components/src/utils/input/base.js
deleted file mode 100644
index e657664493a965..00000000000000
--- a/packages/components/src/utils/input/base.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * External dependencies
- */
-import { css } from '@emotion/react';
-
-/**
- * Internal dependencies
- */
-import { reduceMotion } from '../reduce-motion';
-import { COLORS } from '../colors-values';
-import { CONFIG } from '../';
-
-export const inputStyleNeutral = css`
-	box-shadow: 0 0 0 transparent;
-	transition: box-shadow 0.1s linear;
-	border-radius: ${ CONFIG.radiusBlockUi };
-	border: ${ CONFIG.borderWidth } solid ${ COLORS.ui.border } };
-	${ reduceMotion( 'transition' ) }
-`;
-
-export const inputStyleFocus = css`
-	border-color: ${ COLORS.theme.accent };
-	box-shadow: 0 0 0
-		calc( ${ CONFIG.borderWidthFocus } - ${ CONFIG.borderWidth } )
-		${ COLORS.theme.accent };
-
-	// Windows High Contrast mode will show this outline, but not the box-shadow.
-	outline: 2px solid transparent;
-`;
diff --git a/packages/components/src/utils/input/index.js b/packages/components/src/utils/input/index.js
deleted file mode 100644
index 23fd731db99d94..00000000000000
--- a/packages/components/src/utils/input/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './input-control';
diff --git a/packages/components/src/utils/input/input-control.js b/packages/components/src/utils/input/input-control.js
deleted file mode 100644
index 8af838247d9c25..00000000000000
--- a/packages/components/src/utils/input/input-control.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * External dependencies
- */
-import { css } from '@emotion/react';
-
-/**
- * Internal dependencies
- */
-import { inputStyleNeutral, inputStyleFocus } from './base';
-import { font } from '../font';
-import { COLORS } from '../colors-values';
-import { breakpoint } from '../breakpoint';
-
-export const inputControl = css`
-	display: block;
-	font-family: ${ font( 'default.fontFamily' ) };
-	padding: 6px 8px;
-	${ inputStyleNeutral };
-
-	/* Fonts smaller than 16px causes mobile safari to zoom. */
-	font-size: ${ font( 'mobileTextMinFontSize' ) };
-	/* Override core line-height. To be reviewed. */
-	line-height: normal;
-
-	${ breakpoint( 'small' ) } {
-		font-size: ${ font( 'default.fontSize' ) };
-		/* Override core line-height. To be reviewed. */
-		line-height: normal;
-	}
-
-	&:focus {
-		${ inputStyleFocus }
-	}
-
-	// Use opacity to work in various editor styles.
-	&::-webkit-input-placeholder {
-		color: ${ COLORS.ui.darkGrayPlaceholder };
-	}
-
-	&::-moz-placeholder {
-		opacity: 1; // Necessary because Firefox reduces this from 1.
-		color: ${ COLORS.ui.darkGrayPlaceholder };
-	}
-
-	&:-ms-input-placeholder {
-		color: ${ COLORS.ui.darkGrayPlaceholder };
-	}
-
-	.is-dark-theme & {
-		&::-webkit-input-placeholder {
-			color: ${ COLORS.ui.lightGrayPlaceholder };
-		}
-
-		&::-moz-placeholder {
-			opacity: 1; // Necessary because Firefox reduces this from 1.
-			color: ${ COLORS.ui.lightGrayPlaceholder };
-		}
-
-		&:-ms-input-placeholder {
-			color: ${ COLORS.ui.lightGrayPlaceholder };
-		}
-	}
-`;
diff --git a/packages/components/src/utils/reduce-motion.js b/packages/components/src/utils/reduce-motion.js
deleted file mode 100644
index 761656f5881da0..00000000000000
--- a/packages/components/src/utils/reduce-motion.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Allows users to opt-out of animations via OS-level preferences.
- *
- * @param {'transition' | 'animation' | string} [prop='transition'] CSS Property name
- * @return {string} Generated CSS code for the reduced style
- */
-export function reduceMotion( prop = 'transition' ) {
-	let style;
-
-	switch ( prop ) {
-		case 'transition':
-			style = 'transition-duration: 0ms;';
-			break;
-
-		case 'animation':
-			style = 'animation-duration: 1ms;';
-			break;
-
-		default:
-			style = `
-				animation-duration: 1ms;
-				transition-duration: 0ms;
-			`;
-	}
-
-	return `
-		@media ( prefers-reduced-motion: reduce ) {
-			${ style };
-		}
-	`;
-}
diff --git a/packages/components/src/utils/strings.ts b/packages/components/src/utils/strings.ts
index e4d1d8f73bda1e..e15886da61f5a6 100644
--- a/packages/components/src/utils/strings.ts
+++ b/packages/components/src/utils/strings.ts
@@ -2,67 +2,20 @@
  * External dependencies
  */
 import removeAccents from 'remove-accents';
+import { paramCase } from 'change-case';
 
+/**
+ * All unicode characters that we consider "dash-like":
+ * - `\u007e`: ~ (tilde)
+ * - `\u00ad`: ­ (soft hyphen)
+ * - `\u2053`: ⁓ (swung dash)
+ * - `\u207b`: ⁻ (superscript minus)
+ * - `\u208b`: ₋ (subscript minus)
+ * - `\u2212`: − (minus sign)
+ * - `\\p{Pd}`: any other Unicode dash character
+ */
 const ALL_UNICODE_DASH_CHARACTERS = new RegExp(
-	`[${ [
-		// - (hyphen-minus)
-		'\u002d',
-		// ~ (tilde)
-		'\u007e',
-		// ­ (soft hyphen)
-		'\u00ad',
-		// ֊ (armenian hyphen)
-		'\u058a',
-		// ־ (hebrew punctuation maqaf)
-		'\u05be',
-		// ᐀ (canadian syllabics hyphen)
-		'\u1400',
-		// ᠆ (mongolian todo soft hyphen)
-		'\u1806',
-		// ‐ (hyphen)
-		'\u2010',
-		// non-breaking hyphen)
-		'\u2011',
-		// ‒ (figure dash)
-		'\u2012',
-		// – (en dash)
-		'\u2013',
-		// — (em dash)
-		'\u2014',
-		// ― (horizontal bar)
-		'\u2015',
-		// ⁓ (swung dash)
-		'\u2053',
-		// superscript minus)
-		'\u207b',
-		// subscript minus)
-		'\u208b',
-		// − (minus sign)
-		'\u2212',
-		// ⸗ (double oblique hyphen)
-		'\u2e17',
-		// ⸺ (two-em dash)
-		'\u2e3a',
-		// ⸻ (three-em dash)
-		'\u2e3b',
-		// 〜 (wave dash)
-		'\u301c',
-		// 〰 (wavy dash)
-		'\u3030',
-		// ゠ (katakana-hiragana double hyphen)
-		'\u30a0',
-		// ︱ (presentation form for vertical em dash)
-		'\ufe31',
-		// ︲ (presentation form for vertical en dash)
-		'\ufe32',
-		// ﹘ (small em dash)
-		'\ufe58',
-		// ﹣ (small hyphen-minus)
-		'\ufe63',
-		// － (fullwidth hyphen-minus)
-		'\uff0d',
-	].join( '' ) }]`,
-	'g'
+	/[\u007e\u00ad\u2053\u207b\u208b\u2212\p{Pd}]/gu
 );
 
 export const normalizeTextString = ( value: string ): string => {
@@ -71,12 +24,39 @@ export const normalizeTextString = ( value: string ): string => {
 		.replace( ALL_UNICODE_DASH_CHARACTERS, '-' );
 };
 
+/**
+ * Converts any string to kebab case.
+ * Backwards compatible with Lodash's `_.kebabCase()`.
+ * Backwards compatible with `_wp_to_kebab_case()`.
+ *
+ * @see https://lodash.com/docs/4.17.15#kebabCase
+ * @see https://developer.wordpress.org/reference/functions/_wp_to_kebab_case/
+ *
+ * @param str String to convert.
+ * @return Kebab-cased string
+ */
+export function kebabCase( str: unknown ) {
+	let input = str?.toString?.() ?? '';
+
+	// See https://github.com/lodash/lodash/blob/b185fcee26b2133bd071f4aaca14b455c2ed1008/lodash.js#L4970
+	input = input.replace( /['\u2019]/, '' );
+
+	return paramCase( input, {
+		splitRegexp: [
+			/(?!(?:1ST|2ND|3RD|[4-9]TH)(?![a-z]))([a-z0-9])([A-Z])/g, // fooBar => foo-bar, 3Bar => 3-bar
+			/(?!(?:1st|2nd|3rd|[4-9]th)(?![a-z]))([0-9])([a-z])/g, // 3bar => 3-bar
+			/([A-Za-z])([0-9])/g, // Foo3 => foo-3, foo3 => foo-3
+			/([A-Z])([A-Z][a-z])/g, // FOOBar => foo-bar
+		],
+	} );
+}
+
 /**
  * Escapes the RegExp special characters.
  *
- * @param {string} string Input string.
+ * @param string Input string.
  *
- * @return {string} Regex-escaped string.
+ * @return Regex-escaped string.
  */
 export function escapeRegExp( string: string ): string {
 	return string.replace( /[\\^$.*+?()[\]{}|]/g, '\\$&' );
diff --git a/packages/components/src/utils/style-mixins.js b/packages/components/src/utils/style-mixins.js
index c858e8731fc523..46ee1183f59698 100644
--- a/packages/components/src/utils/style-mixins.js
+++ b/packages/components/src/utils/style-mixins.js
@@ -1,6 +1,5 @@
 export { boxSizingReset } from './box-sizing';
 export { rgba } from './colors';
-export { reduceMotion } from './reduce-motion';
 export { rtl } from './rtl';
 export { font } from './font';
 export { breakpoint } from './breakpoint';
diff --git a/packages/components/src/utils/test/strings.js b/packages/components/src/utils/test/strings.js
index 43682a0e2853f3..7d03075897318f 100644
--- a/packages/components/src/utils/test/strings.js
+++ b/packages/components/src/utils/test/strings.js
@@ -1,7 +1,102 @@
 /**
  * Internal dependencies
  */
-import { normalizeTextString } from '../strings';
+import { kebabCase, normalizeTextString } from '../strings';
+
+describe( 'kebabCase', () => {
+	it( 'separates lowercase letters, followed by uppercase letters', () => {
+		expect( kebabCase( 'fooBar' ) ).toEqual( 'foo-bar' );
+	} );
+
+	it( 'separates numbers, followed by uppercase letters', () => {
+		expect( kebabCase( '123FOO' ) ).toEqual( '123-foo' );
+	} );
+
+	it( 'separates numbers, followed by lowercase characters', () => {
+		expect( kebabCase( '123bar' ) ).toEqual( '123-bar' );
+	} );
+
+	it( 'separates uppercase letters, followed by numbers', () => {
+		expect( kebabCase( 'FOO123' ) ).toEqual( 'foo-123' );
+	} );
+
+	it( 'separates lowercase letters, followed by numbers', () => {
+		expect( kebabCase( 'foo123' ) ).toEqual( 'foo-123' );
+	} );
+
+	it( 'separates uppercase groups from capitalized groups', () => {
+		expect( kebabCase( 'FOOBar' ) ).toEqual( 'foo-bar' );
+	} );
+
+	it( 'removes any non-dash special characters', () => {
+		expect(
+			kebabCase( 'foo±§!@#$%^&*()-_=+/?.>,<\\|{}[]`~\'";:bar' )
+		).toEqual( 'foo-bar' );
+	} );
+
+	it( 'removes any spacing characters', () => {
+		expect( kebabCase( ' foo \t \n \r \f \v bar ' ) ).toEqual( 'foo-bar' );
+	} );
+
+	it( 'groups multiple dashes into a single one', () => {
+		expect( kebabCase( 'foo---bar' ) ).toEqual( 'foo-bar' );
+	} );
+
+	it( 'returns an empty string unchanged', () => {
+		expect( kebabCase( '' ) ).toEqual( '' );
+	} );
+
+	it( 'returns an existing kebab case string unchanged', () => {
+		expect( kebabCase( 'foo-123-bar' ) ).toEqual( 'foo-123-bar' );
+	} );
+
+	it( 'returns an empty string if any nullish type is passed', () => {
+		expect( kebabCase( undefined ) ).toEqual( '' );
+		expect( kebabCase( null ) ).toEqual( '' );
+	} );
+
+	it( 'converts any unexpected non-nullish type to a string', () => {
+		expect( kebabCase( 12345 ) ).toEqual( '12345' );
+		expect( kebabCase( [] ) ).toEqual( '' );
+		expect( kebabCase( {} ) ).toEqual( 'object-object' );
+	} );
+
+	/**
+	 * Should cover all test cases of `_wp_to_kebab_case()`.
+	 *
+	 * @see https://developer.wordpress.org/reference/functions/_wp_to_kebab_case/
+	 * @see https://github.com/WordPress/wordpress-develop/blob/76376fdbc3dc0b3261de377dffc350677345e7ba/tests/phpunit/tests/functions/wpToKebabCase.php#L35-L62
+	 */
+	it.each( [
+		[ 'white', 'white' ],
+		[ 'white+black', 'white-black' ],
+		[ 'white:black', 'white-black' ],
+		[ 'white*black', 'white-black' ],
+		[ 'white.black', 'white-black' ],
+		[ 'white black', 'white-black' ],
+		[ 'white	black', 'white-black' ],
+		[ 'white-to-black', 'white-to-black' ],
+		[ 'white2white', 'white-2-white' ],
+		[ 'white2nd', 'white-2nd' ],
+		[ 'white2ndcolor', 'white-2-ndcolor' ],
+		[ 'white2ndColor', 'white-2nd-color' ],
+		[ 'white2nd_color', 'white-2nd-color' ],
+		[ 'white23color', 'white-23-color' ],
+		[ 'white23', 'white-23' ],
+		[ '23color', '23-color' ],
+		[ 'white4th', 'white-4th' ],
+		[ 'font2xl', 'font-2-xl' ],
+		[ 'whiteToWhite', 'white-to-white' ],
+		[ 'whiteTOwhite', 'white-t-owhite' ],
+		[ 'WHITEtoWHITE', 'whit-eto-white' ],
+		[ 42, '42' ],
+		[ "i've done", 'ive-done' ],
+		[ '#ffffff', 'ffffff' ],
+		[ '$ffffff', 'ffffff' ],
+	] )( 'converts %s properly to %s', ( input, expected ) => {
+		expect( kebabCase( input ) ).toEqual( expected );
+	} );
+} );
 
 describe( 'normalizeTextString', () => {
 	it( 'should normalize hyphen-like characters to hyphens', () => {
@@ -11,5 +106,67 @@ describe( 'normalizeTextString', () => {
 		expect( normalizeTextString( 'foo⸻bar' ) ).toBe( 'foo-bar' );
 		expect( normalizeTextString( 'foo゠bar' ) ).toBe( 'foo-bar' );
 		expect( normalizeTextString( 'foo－bar' ) ).toBe( 'foo-bar' );
+
+		const dashCharacters = [
+			// - (hyphen-minus)
+			'\u002d',
+			// ~ (tilde)
+			'\u007e',
+			// ­ (soft hyphen)
+			'\u00ad',
+			// ֊ (armenian hyphen)
+			'\u058a',
+			// ־ (hebrew punctuation maqaf)
+			'\u05be',
+			// ᐀ (canadian syllabics hyphen)
+			'\u1400',
+			// ᠆ (mongolian todo soft hyphen)
+			'\u1806',
+			// ‐ (hyphen)
+			'\u2010',
+			// non-breaking hyphen)
+			'\u2011',
+			// ‒ (figure dash)
+			'\u2012',
+			// – (en dash)
+			'\u2013',
+			// — (em dash)
+			'\u2014',
+			// ― (horizontal bar)
+			'\u2015',
+			// ⁓ (swung dash)
+			'\u2053',
+			// ⁻ (superscript minus)
+			'\u207b',
+			// ₋ (subscript minus)
+			'\u208b',
+			// − (minus sign)
+			'\u2212',
+			// ⸗ (double oblique hyphen)
+			'\u2e17',
+			// ⸺ (two-em dash)
+			'\u2e3a',
+			// ⸻ (three-em dash)
+			'\u2e3b',
+			// 〜 (wave dash)
+			'\u301c',
+			// 〰 (wavy dash)
+			'\u3030',
+			// ゠ (katakana-hiragana double hyphen)
+			'\u30a0',
+			// ︱ (presentation form for vertical em dash)
+			'\ufe31',
+			// ︲ (presentation form for vertical en dash)
+			'\ufe32',
+			// ﹘ (small em dash)
+			'\ufe58',
+			// ﹣ (small hyphen-minus)
+			'\ufe63',
+			// － (fullwidth hyphen-minus)
+			'\uff0d',
+		];
+		expect( normalizeTextString( dashCharacters.join( '' ) ) ).toBe(
+			'-'.repeat( dashCharacters.length )
+		);
 	} );
 } );
diff --git a/packages/components/src/utils/theme-variables.scss b/packages/components/src/utils/theme-variables.scss
index 14e44f3ddc7d2f..8c8c2d8a5633f7 100644
--- a/packages/components/src/utils/theme-variables.scss
+++ b/packages/components/src/utils/theme-variables.scss
@@ -4,6 +4,10 @@
 // `--wp-admin-theme-color`. If the `--wp-admin-theme-color` variable is not
 // defined, fallback to the default theme color (WP blueberry).
 $components-color-accent: var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+
+// Define accent color transparent variants.
+$components-color-accent-transparent-40: rgba(var(--wp-components-color-accent--rgb, var(--wp-admin-theme-color--rgb)), 0.04);
+
 $components-color-accent-darker-10: var(--wp-components-color-accent-darker-10, var(--wp-admin-theme-color-darker-10, #2145e6));
 $components-color-accent-darker-20: var(--wp-components-color-accent-darker-20, var(--wp-admin-theme-color-darker-20, #183ad6));
 
diff --git a/packages/components/src/utils/use-deprecated-props.ts b/packages/components/src/utils/use-deprecated-props.ts
index 6df8e25303738c..856aa2e0d1a2c4 100644
--- a/packages/components/src/utils/use-deprecated-props.ts
+++ b/packages/components/src/utils/use-deprecated-props.ts
@@ -1,28 +1,11 @@
-/**
- * WordPress dependencies
- */
-import deprecated from '@wordpress/deprecated';
-
 export function useDeprecated36pxDefaultSizeProp<
 	P extends Record< string, any > & {
 		__next36pxDefaultSize?: boolean;
 		__next40pxDefaultSize?: boolean;
 	},
->(
-	props: P,
-	/** The component identifier in dot notation, e.g. `wp.components.ComponentName`. */
-	componentIdentifier: string,
-	/** Version in which the prop was deprecated. */
-	since: string = '6.3'
-) {
+>( props: P ) {
 	const { __next36pxDefaultSize, __next40pxDefaultSize, ...otherProps } =
 		props;
-	if ( typeof __next36pxDefaultSize !== 'undefined' ) {
-		deprecated( '`__next36pxDefaultSize` prop in ' + componentIdentifier, {
-			alternative: '`__next40pxDefaultSize`',
-			since,
-		} );
-	}
 
 	return {
 		...otherProps,
diff --git a/packages/components/src/utils/use-responsive-value.ts b/packages/components/src/utils/use-responsive-value.ts
index d8b324b097a525..be986cb4fe3c02 100644
--- a/packages/components/src/utils/use-responsive-value.ts
+++ b/packages/components/src/utils/use-responsive-value.ts
@@ -60,8 +60,9 @@ export function useResponsiveValue< T >(
 	const index = useBreakpointIndex( options );
 
 	// Allow calling the function with a "normal" value without having to check on the outside.
-	if ( ! Array.isArray( values ) && typeof values !== 'function' )
+	if ( ! Array.isArray( values ) && typeof values !== 'function' ) {
 		return values;
+	}
 
 	const array = values || [];
 
diff --git a/packages/components/src/utils/with-ignore-ime-events.ts b/packages/components/src/utils/with-ignore-ime-events.ts
new file mode 100644
index 00000000000000..26c5cd67b25397
--- /dev/null
+++ b/packages/components/src/utils/with-ignore-ime-events.ts
@@ -0,0 +1,32 @@
+/**
+ * A higher-order function that wraps a keydown event handler to ensure it is not an IME event.
+ *
+ * In CJK languages, an IME (Input Method Editor) is used to input complex characters.
+ * During an IME composition, keydown events (e.g. Enter or Escape) can be fired
+ * which are intended to control the IME and not the application.
+ * These events should be ignored by any application logic.
+ *
+ * @param keydownHandler The keydown event handler to execute after ensuring it was not an IME event.
+ *
+ * @return A wrapped version of the given event handler that ignores IME events.
+ */
+export function withIgnoreIMEEvents<
+	E extends React.KeyboardEvent | KeyboardEvent,
+>( keydownHandler: ( event: E ) => void ) {
+	return ( event: E ) => {
+		const { isComposing } =
+			'nativeEvent' in event ? event.nativeEvent : event;
+
+		if (
+			isComposing ||
+			// Workaround for Mac Safari where the final Enter/Backspace of an IME composition
+			// is `isComposing=false`, even though it's technically still part of the composition.
+			// These can only be detected by keyCode.
+			event.keyCode === 229
+		) {
+			return;
+		}
+
+		keydownHandler( event );
+	};
+}
diff --git a/packages/components/src/v-stack/README.md b/packages/components/src/v-stack/README.md
index c3ea4e4c0389ca..2f447b18015e51 100644
--- a/packages/components/src/v-stack/README.md
+++ b/packages/components/src/v-stack/README.md
@@ -29,7 +29,7 @@ function Example() {
 
 ## Props
 
-##### `alignment`: `HStackAlignment | CSSProperties['alignItems']`
+### `alignment`: `HStackAlignment | CSSProperties['alignItems']`
 
 Determines how the child elements are aligned.
 
@@ -45,25 +45,25 @@ Determines how the child elements are aligned.
 -   `edge`: Justifies content to be evenly spread out up to the main axis edges of the container.
 -   `stretch`: Stretches content to the cross axis edges of the container.
 
-##### `direction`: `FlexDirection`
+### `direction`: `FlexDirection`
 
 The direction flow of the children content can be adjusted with `direction`. `column` will align children vertically and `row` will align children horizontally.
 
-##### `expanded`: `boolean`
+### `expanded`: `boolean`
 
 Expands to the maximum available width (if horizontal) or height (if vertical).
 
-##### `justify`: `CSSProperties['justifyContent']`
+### `justify`: `CSSProperties['justifyContent']`
 
 Horizontally aligns content if the `direction` is `row`, or vertically aligns content if the `direction` is `column`.
 In the example below, `flex-start` will align the children content to the left.
 
-##### `spacing`: `CSSProperties['width']`
+### `spacing`: `CSSProperties['width']`
 
 The amount of space between each child element. Spacing in between each child can be adjusted by using `spacing`.
 The value of `spacing` works as a multiplier to the library's grid system (base of `4px`).
 
-##### `wrap`: `boolean`
+### `wrap`: `boolean`
 
 Determines if children should wrap.
 
diff --git a/packages/components/src/v-stack/test/index.tsx b/packages/components/src/v-stack/test/index.tsx
index cf35691d0858f6..e8ea1ab0ee396f 100644
--- a/packages/components/src/v-stack/test/index.tsx
+++ b/packages/components/src/v-stack/test/index.tsx
@@ -39,4 +39,14 @@ describe( 'props', () => {
 		);
 		expect( container ).toMatchSnapshot();
 	} );
+
+	test( 'should not pass through invalid props to the `as` component', () => {
+		const AsComponent = ( props: JSX.IntrinsicElements[ 'div' ] ) => {
+			return <div { ...props } />;
+		};
+
+		render( <VStack as={ AsComponent }>foobar</VStack> );
+
+		expect( console ).not.toHaveErrored();
+	} );
 } );
diff --git a/packages/components/src/view/component.tsx b/packages/components/src/view/component.tsx
index a970c5c757431f..6742bd9f52e510 100644
--- a/packages/components/src/view/component.tsx
+++ b/packages/components/src/view/component.tsx
@@ -2,13 +2,25 @@
  * External dependencies
  */
 import styled from '@emotion/styled';
-import type { RefAttributes } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import type { WordPressComponent } from '../context/wordpress-component';
-import type { ViewProps } from './types';
+import type { WordPressComponentProps } from '../context';
+
+const PolymorphicDiv = styled.div``;
+
+function UnforwardedView< T extends React.ElementType = 'div' >(
+	{ as, ...restProps }: WordPressComponentProps< {}, T >,
+	ref: React.ForwardedRef< any >
+) {
+	return <PolymorphicDiv as={ as } ref={ ref } { ...restProps } />;
+}
 
 /**
  * `View` is a core component that renders everything in the library.
@@ -26,13 +38,8 @@ import type { ViewProps } from './types';
  * }
  * ```
  */
-export const View: WordPressComponent<
-	'div',
-	ViewProps & RefAttributes< any >,
-	true
-> = styled.div``;
-
-View.selector = '.components-view';
-View.displayName = 'View';
+export const View = Object.assign( forwardRef( UnforwardedView ), {
+	selector: '.components-view',
+} );
 
 export default View;
diff --git a/packages/components/src/view/types.ts b/packages/components/src/view/types.ts
deleted file mode 100644
index 6c7e1508812c8c..00000000000000
--- a/packages/components/src/view/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * External dependencies
- */
-import type { ReactNode } from 'react';
-
-export type ViewProps = { children?: ReactNode };
diff --git a/packages/components/src/visually-hidden/stories/index.story.tsx b/packages/components/src/visually-hidden/stories/index.story.tsx
index 149b2da6b5c891..8abe45a94aab4f 100644
--- a/packages/components/src/visually-hidden/stories/index.story.tsx
+++ b/packages/components/src/visually-hidden/stories/index.story.tsx
@@ -10,7 +10,8 @@ import { VisuallyHidden } from '..';
 
 const meta: Meta< typeof VisuallyHidden > = {
 	component: VisuallyHidden,
-	title: 'Components/VisuallyHidden',
+	title: 'Components/Utilities/VisuallyHidden',
+	id: 'components-visuallyhidden',
 	argTypes: {
 		children: { control: { type: null } },
 		as: { control: { type: 'text' } },
diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
index 1ee9a35f1a8b22..2033a6f43fede6 100644
--- a/packages/components/tsconfig.json
+++ b/packages/components/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
@@ -6,14 +7,9 @@
 		"types": [
 			"gutenberg-env",
 			"gutenberg-test-env",
-			"dom-scroll-into-view",
 			"jest",
 			"@testing-library/jest-dom"
-		],
-		// TODO: Remove `skipLibCheck` after resolving duplicate declaration of the `process` variable
-		// between `@types/webpack-env` (from @storybook packages) and `gutenberg-env`.
-		"skipLibCheck": true,
-		"strictNullChecks": true
+		]
 	},
 	"references": [
 		{ "path": "../a11y" },
diff --git a/packages/compose/.npmrc b/packages/compose/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/compose/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/compose/CHANGELOG.md b/packages/compose/CHANGELOG.md
index 4218db129273da..f9d18eed43141d 100644
--- a/packages/compose/CHANGELOG.md
+++ b/packages/compose/CHANGELOG.md
@@ -2,6 +2,73 @@
 
 ## Unreleased
 
+## 7.10.0 (2024-10-16)
+
+## 7.9.0 (2024-10-03)
+
+### Bug Fixes
+
+-   `useResizeObserver`: export legacy API at top-level for React Native ([#65588](https://github.com/WordPress/gutenberg/pull/65588)).
+
+## 7.8.0 (2024-09-19)
+
+### New Features
+
+-   `useEvent`: a new utility that creates a stable callback function that has access to the latest state and can be used within event handlers and effect callbacks ([#64943](https://github.com/WordPress/gutenberg/pull/64943)).
+-   `useResizeObserver`: new and improved version of the utility (legacy API is still supported) ([#64943](https://github.com/WordPress/gutenberg/pull/64943)).
+
+## 7.7.0 (2024-09-05)
+
+## 7.6.0 (2024-08-21)
+
+## 7.5.0 (2024-08-07)
+
+## 7.4.0 (2024-07-24)
+
+## 7.3.0 (2024-07-10)
+
+### Internal
+
+-   Method style type signatures have been changed to function style ([#62718](https://github.com/WordPress/gutenberg/pull/62718)).
+
+## 7.2.0 (2024-06-26)
+
+## 7.1.0 (2024-06-15)
+
+## 7.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 6.35.0 (2024-05-16)
+
+## 6.34.0 (2024-05-02)
+
+-   Added new `observableMap` data structure and `useObservableValue` React hook ([#60945](https://github.com/WordPress/gutenberg/pull/60945)).
+
+## 6.33.0 (2024-04-19)
+
+## 6.32.0 (2024-04-03)
+
+## 6.31.0 (2024-03-21)
+
+## 6.30.0 (2024-03-06)
+
+## 6.29.0 (2024-02-21)
+
+## 6.28.0 (2024-02-09)
+
+## 6.27.0 (2024-01-24)
+
+### Deprecations
+
+-   The `pure` HoC has been deprecated. Use `memo` or `PureComponent` instead ([#57173](https://github.com/WordPress/gutenberg/pull/57173)).
+
+## 6.26.0 (2024-01-10)
+
+## 6.25.0 (2023-12-13)
+
 ## 6.24.0 (2023-11-29)
 
 ## 6.23.0 (2023-11-16)
@@ -14,7 +81,7 @@
 
 ## 6.19.0 (2023-09-20)
 
-### Features
+### New Features
 
 -   `useStateWithHistory`: Add a new hook to manage state with undo/redo support.
 
@@ -107,7 +174,7 @@
 
 ## 5.7.0 (2022-05-18)
 
-### Bug Fix
+### Bug Fixes
 
 -   `useRefEffect`: Allow `void` as a valid callback return type ([#40798](https://github.com/WordPress/gutenberg/pull/40798)).
 
@@ -133,7 +200,7 @@
 
 ## 5.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -153,8 +220,8 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 
 ## 3.25.0 (2021-03-17)
 
@@ -182,7 +249,7 @@
 
 ## 2.1.0 (2018-10-29)
 
-### Deprecation
+### Deprecations
 
 -   `remountOnPropChange` has been deprecated.
 
@@ -192,6 +259,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/compose/README.md b/packages/compose/README.md
index ce393f2b5fd18c..b4e20a79bab0cc 100644
--- a/packages/compose/README.md
+++ b/packages/compose/README.md
@@ -1,6 +1,6 @@
 # Compose
 
-The `compose` package is a collection of handy [Hooks](https://reactjs.org/docs/hooks-intro.html) and [Higher Order Components](https://facebook.github.io/react/docs/higher-order-components.html) (HOCs) you can use to wrap your WordPress components and provide some basic features like: state, instance id, pure...
+The `compose` package is a collection of handy [Hooks](https://react.dev/reference/react/hooks) and [Higher Order Components](https://legacy.reactjs.org/docs/higher-order-components.html) (HOCs) you can use to wrap your WordPress components and provide some basic features like: state, instance id, pure...
 
 The `compose` function is inspired by [flowRight](https://lodash.com/docs/#flowRight) from Lodash and works the same way. It comes from functional programming, and allows you to compose any number of functions. You might also think of this as layering functions; `compose` will execute the last function first, then sequentially move back through the previous functions passing the result of each function upward.
 
@@ -11,7 +11,7 @@ const compose = ( f, g ) => x
     => f( g( x ) );
 ```
 
-Here's a simplified example of **compose** in use from Gutenberg's [`PluginSidebar` component](https://github.com/WordPress/gutenberg/blob/HEAD/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js):
+Here's a simplified example of **compose** in use from Gutenberg's [`PluginSidebar` component](https://github.com/WordPress/gutenberg/blob/HEAD/packages/editor/src/components/plugin-sidebar/index.js):
 
 Using compose:
 
@@ -69,7 +69,7 @@ This is inspired by `lodash`'s `flowRight` function.
 
 _Related_
 
--   <https://docs-lodash.com/v4/flow-right/>
+-   <https://lodash.com/docs/4#flow-right>
 
 ### createHigherOrderComponent
 
@@ -129,6 +129,14 @@ _Returns_
 
 -   Higher-order component.
 
+### observableMap
+
+A constructor (factory) for `ObservableMap`, a map-like key/value data structure where the individual entries are observable: using the `subscribe` method, you can subscribe to updates for a particular keys. Each subscriber always observes one specific key and is not notified about any unrelated changes (for different keys) in the `ObservableMap`.
+
+_Returns_
+
+-   `ObservableMap< K, V >`: A new instance of the `ObservableMap` type.
+
 ### pipe
 
 Composes multiple higher-order components into a single higher-order component. Performs left-to-right function composition, where each successive invocation is supplied the return value of the previous.
@@ -137,10 +145,12 @@ This is inspired by `lodash`'s `flow` function.
 
 _Related_
 
--   <https://docs-lodash.com/v4/flow/>
+-   <https://lodash.com/docs/4#flow>
 
 ### pure
 
+> **Deprecated** Use `memo` or `PureComponent` instead.
+
 Given a component returns the enhanced component augmented with a component only re-rendering when its props/state change
 
 ### throttle
@@ -237,7 +247,7 @@ Debounces a function similar to Lodash's `debounce`. A new debounced function wi
 
 _Related_
 
--   <https://docs-lodash.com/v4/debounce/>
+-   <https://lodash.com/docs/4#debounce>
 
 _Parameters_
 
@@ -255,11 +265,11 @@ Helper hook for input fields that need to debounce the value before using it.
 
 _Parameters_
 
--   _defaultValue_ `any`: The default value to use.
+-   _defaultValue_ The default value to use.
 
 _Returns_
 
--   `[string, Function, string]`: The input value, the setter and the debounced input value.
+-   `[ string, ( value: string ) => void, string ]`: The input value, the setter and the debounced input value.
 
 ### useDisabled
 
@@ -295,6 +305,29 @@ _Returns_
 
 -   `import('react').RefCallback<HTMLElement>`: Element Ref.
 
+### useEvent
+
+Creates a stable callback function that has access to the latest state and can be used within event handlers and effect callbacks. Throws when used in the render phase.
+
+_Usage_
+
+```tsx
+function Component( props ) {
+	const onClick = useEvent( props.onClick );
+	useEffect( () => {
+		onClick();
+		// Won't trigger the effect again when props.onClick is updated.
+	}, [ onClick ] );
+	// Won't re-render Button when props.onClick is updated (if `Button` is
+	// wrapped in `React.memo`).
+	return <Button onClick={ onClick } />;
+}
+```
+
+_Parameters_
+
+-   _callback_ `T`: The callback function to wrap.
+
 ### useFocusableIframe
 
 Dispatches a bubbling focus event when the iframe receives focus. Use `onFocus` as usual on the iframe or a parent element.
@@ -440,6 +473,19 @@ _Returns_
 
 -   `import('react').RefCallback<TypeFromRef<TRef>>`: The merged ref callback.
 
+### useObservableValue
+
+React hook that lets you observe an entry in an `ObservableMap`. The hook returns the current value corresponding to the key, or `undefined` when there is no value stored. It also observes changes to the value and triggers an update of the calling component in case the value changes.
+
+_Parameters_
+
+-   _map_ `ObservableMap< K, V >`: The `ObservableMap` to observe.
+-   _name_ `K`: The map key to observe.
+
+_Returns_
+
+-   `V | undefined`: The value corresponding to the map key requested.
+
 ### usePrevious
 
 Use something's value from the previous render. Based on <https://usehooks.com/usePrevious/>.
@@ -477,23 +523,30 @@ _Returns_
 
 ### useResizeObserver
 
-Hook which allows to listen the resize event of any target element when it changes sizes. \_Note: `useResizeObserver` will report `null` until after first render.
+Sets up a [`ResizeObserver`](https://developer.mozilla.org/en-US/docs/Web/API/Resize_Observer_API) for an HTML or SVG element.
+
+Pass the returned setter as a callback ref to the React element you want to observe, or use it in layout effects for advanced use cases.
 
 _Usage_
 
-```js
-const App = () => {
-	const [ resizeListener, sizes ] = useResizeObserver();
+```tsx
+const setElement = useResizeObserver(
+	( resizeObserverEntries ) => console.log( resizeObserverEntries ),
+	{ box: 'border-box' }
+);
+<div ref={ setElement } />;
 
-	return (
-		<div>
-			{ resizeListener }
-			Your content here
-		</div>
-	);
-};
+// The setter can be used in other ways, for example:
+useLayoutEffect( () => {
+	setElement( document.querySelector( `data-element-id="${ elementId }"` ) );
+}, [ elementId ] );
 ```
 
+_Parameters_
+
+-   _callback_ `ResizeObserverCallback`: The `ResizeObserver` callback - [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver/ResizeObserver#callback).
+-   _options_ `ResizeObserverOptions`: Options passed to `ResizeObserver.observe` when called - [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver/observe#options). Changes will be ignored.
+
 ### useStateWithHistory
 
 useState with undo/redo history.
@@ -512,7 +565,7 @@ Throttles a function similar to Lodash's `throttle`. A new throttled function wi
 
 _Related_
 
--   <https://docs-lodash.com/v4/throttle/>
+-   <https://lodash.com/docs/4#throttle>
 
 _Parameters_
 
@@ -579,7 +632,7 @@ _Returns_
 
 ### withInstanceId
 
-A Higher Order Component used to be provide a unique instance ID by component.
+A Higher Order Component used to provide a unique instance ID by component.
 
 ### withSafeTimeout
 
diff --git a/packages/compose/package.json b/packages/compose/package.json
index eca27f66245657..f7aa8a3bf9b3bc 100644
--- a/packages/compose/package.json
+++ b/packages/compose/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/compose",
-	"version": "6.24.0",
+	"version": "7.10.0",
 	"description": "WordPress higher-order components (HOCs).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -29,17 +30,17 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"@types/mousetrap": "^1.6.8",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/element": "file:../element",
-		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/priority-queue": "file:../priority-queue",
-		"@wordpress/undo-manager": "file:../undo-manager",
+		"@wordpress/deprecated": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/element": "*",
+		"@wordpress/is-shallow-equal": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/priority-queue": "*",
+		"@wordpress/undo-manager": "*",
 		"change-case": "^4.1.2",
-		"clipboard": "^2.0.8",
+		"clipboard": "^2.0.11",
 		"mousetrap": "^1.6.5",
 		"use-memo-one": "^1.1.1"
 	},
@@ -48,5 +49,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/compose/src/higher-order/compose.ts b/packages/compose/src/higher-order/compose.ts
index 2b7b598c70c958..1fcaa55eb4512b 100644
--- a/packages/compose/src/higher-order/compose.ts
+++ b/packages/compose/src/higher-order/compose.ts
@@ -9,7 +9,7 @@ import { basePipe } from './pipe';
  *
  * This is inspired by `lodash`'s `flowRight` function.
  *
- * @see https://docs-lodash.com/v4/flow-right/
+ * @see https://lodash.com/docs/4#flow-right
  */
 const compose = basePipe( true );
 
diff --git a/packages/compose/src/higher-order/pipe.ts b/packages/compose/src/higher-order/pipe.ts
index ced7618ad81bfd..29003d818ccc3a 100644
--- a/packages/compose/src/higher-order/pipe.ts
+++ b/packages/compose/src/higher-order/pipe.ts
@@ -43,7 +43,7 @@
  *
  * Allows to choose whether to perform left-to-right or right-to-left composition.
  *
- * @see https://docs-lodash.com/v4/flow/
+ * @see https://lodash.com/docs/4#flow
  *
  * @param {boolean} reverse True if right-to-left, false for left-to-right composition.
  */
@@ -67,7 +67,7 @@ const basePipe =
  *
  * This is inspired by `lodash`'s `flow` function.
  *
- * @see https://docs-lodash.com/v4/flow/
+ * @see https://lodash.com/docs/4#flow
  */
 const pipe = basePipe();
 
diff --git a/packages/compose/src/higher-order/pure/index.tsx b/packages/compose/src/higher-order/pure/index.tsx
index 65684738b708ac..38a85a5eebe9ab 100644
--- a/packages/compose/src/higher-order/pure/index.tsx
+++ b/packages/compose/src/higher-order/pure/index.tsx
@@ -17,6 +17,8 @@ import { createHigherOrderComponent } from '../../utils/create-higher-order-comp
 /**
  * Given a component returns the enhanced component augmented with a component
  * only re-rendering when its props/state change
+ *
+ * @deprecated Use `memo` or `PureComponent` instead.
  */
 const pure = createHigherOrderComponent( function < Props extends {} >(
 	WrappedComponent: ComponentType< Props >
diff --git a/packages/compose/src/higher-order/test/compose.ts b/packages/compose/src/higher-order/test/compose.ts
index 8c27a0b9b4401d..d53710015b89f4 100644
--- a/packages/compose/src/higher-order/test/compose.ts
+++ b/packages/compose/src/higher-order/test/compose.ts
@@ -30,7 +30,6 @@ describe( 'compose', () => {
 		const c = ( value ) => ( value += 'c' );
 		const d = ( value ) => ( value += 'd' );
 		const e = ( value ) => ( value += 'e' );
-		const f = ( value ) => ( value += 'f' );
 
 		expect( compose( [ a, b ], c, [ d ], e )( 'test' ) ).toBe(
 			'testedcba'
diff --git a/packages/compose/src/higher-order/test/pipe.ts b/packages/compose/src/higher-order/test/pipe.ts
index b15a7a3319128b..2f4119d724dbd2 100644
--- a/packages/compose/src/higher-order/test/pipe.ts
+++ b/packages/compose/src/higher-order/test/pipe.ts
@@ -30,7 +30,6 @@ describe( 'pipe', () => {
 		const c = ( value ) => ( value += 'c' );
 		const d = ( value ) => ( value += 'd' );
 		const e = ( value ) => ( value += 'e' );
-		const f = ( value ) => ( value += 'f' );
 
 		expect( pipe( [ a, b ], c, [ d ], e )( 'test' ) ).toBe( 'testabcde' );
 	} );
diff --git a/packages/compose/src/higher-order/with-instance-id/index.tsx b/packages/compose/src/higher-order/with-instance-id/index.tsx
index f2e78e7a80cfc4..3b4131930bf1bf 100644
--- a/packages/compose/src/higher-order/with-instance-id/index.tsx
+++ b/packages/compose/src/higher-order/with-instance-id/index.tsx
@@ -11,8 +11,7 @@ import useInstanceId from '../../hooks/use-instance-id';
 type InstanceIdProps = { instanceId: string | number };
 
 /**
- * A Higher Order Component used to be provide a unique instance ID by
- * component.
+ * A Higher Order Component used to provide a unique instance ID by component.
  */
 const withInstanceId = createHigherOrderComponent(
 	< C extends WithInjectedProps< C, InstanceIdProps > >(
diff --git a/packages/compose/src/higher-order/with-network-connectivity/README.md b/packages/compose/src/higher-order/with-network-connectivity/README.md
new file mode 100644
index 00000000000000..7ae64c09499737
--- /dev/null
+++ b/packages/compose/src/higher-order/with-network-connectivity/README.md
@@ -0,0 +1,20 @@
+# withNetworkConnectivity
+
+`withNetworkConnectivity` provides a true/false mobile connectivity status based on the `useNetworkConnectivity` hook.
+
+## Usage
+
+```jsx
+/**
+ * WordPress dependencies
+ */
+import { withNetworkConnectivity } from '@wordpress/compose';
+
+export class MyComponent extends Component {
+	if ( this.props.isConnected !== true ) {
+		console.log( 'You are currently offline.' )
+	}
+}
+
+export default withNetworkConnectivity( MyComponent )
+```
diff --git a/packages/compose/src/higher-order/with-network-connectivity/index.native.js b/packages/compose/src/higher-order/with-network-connectivity/index.native.js
new file mode 100644
index 00000000000000..1a416966d45be9
--- /dev/null
+++ b/packages/compose/src/higher-order/with-network-connectivity/index.native.js
@@ -0,0 +1,19 @@
+/**
+ * Internal dependencies
+ */
+import { createHigherOrderComponent } from '../../utils/create-higher-order-component';
+import useNetworkConnectivity from '../../hooks/use-network-connectivity';
+
+const withNetworkConnectivity = createHigherOrderComponent(
+	( WrappedComponent ) => {
+		return ( props ) => {
+			const { isConnected } = useNetworkConnectivity();
+			return (
+				<WrappedComponent { ...props } isConnected={ isConnected } />
+			);
+		};
+	},
+	'withNetworkConnectivity'
+);
+
+export default withNetworkConnectivity;
diff --git a/packages/compose/src/hooks/use-constrained-tabbing/index.js b/packages/compose/src/hooks/use-constrained-tabbing/index.js
index 97b8a2a0a5eb52..b9aca94222db6a 100644
--- a/packages/compose/src/hooks/use-constrained-tabbing/index.js
+++ b/packages/compose/src/hooks/use-constrained-tabbing/index.js
@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import { TAB } from '@wordpress/keycodes';
 import { focus } from '@wordpress/dom';
 
 /**
@@ -33,9 +32,9 @@ import useRefEffect from '../use-ref-effect';
 function useConstrainedTabbing() {
 	return useRefEffect( ( /** @type {HTMLElement} */ node ) => {
 		function onKeyDown( /** @type {KeyboardEvent} */ event ) {
-			const { keyCode, shiftKey, target } = event;
+			const { key, shiftKey, target } = event;
 
-			if ( keyCode !== TAB ) {
+			if ( key !== 'Tab' ) {
 				return;
 			}
 
@@ -55,7 +54,7 @@ function useConstrainedTabbing() {
 				/** @type {HTMLElement} */ ( target ).contains( nextElement )
 			) {
 				event.preventDefault();
-				/** @type {HTMLElement} */ ( nextElement )?.focus();
+				nextElement?.focus();
 				return;
 			}
 
diff --git a/packages/compose/src/hooks/use-copy-on-click/index.js b/packages/compose/src/hooks/use-copy-on-click/index.js
index 383be2b957342c..eab34045f3c21a 100644
--- a/packages/compose/src/hooks/use-copy-on-click/index.js
+++ b/packages/compose/src/hooks/use-copy-on-click/index.js
@@ -31,7 +31,7 @@ export default function useCopyOnClick( ref, text, timeout = 4000 ) {
 	} );
 
 	/** @type {import('react').MutableRefObject<Clipboard | undefined>} */
-	const clipboard = useRef();
+	const clipboardRef = useRef();
 	const [ hasCopied, setHasCopied ] = useState( false );
 
 	useEffect( () => {
@@ -43,11 +43,11 @@ export default function useCopyOnClick( ref, text, timeout = 4000 ) {
 		}
 
 		// Clipboard listens to click events.
-		clipboard.current = new Clipboard( ref.current, {
+		clipboardRef.current = new Clipboard( ref.current, {
 			text: () => ( typeof text === 'function' ? text() : text ),
 		} );
 
-		clipboard.current.on( 'success', ( { clearSelection, trigger } ) => {
+		clipboardRef.current.on( 'success', ( { clearSelection, trigger } ) => {
 			// Clearing selection will move focus back to the triggering button,
 			// ensuring that it is not reset to the body, and further that it is
 			// kept within the rendered node.
@@ -66,8 +66,8 @@ export default function useCopyOnClick( ref, text, timeout = 4000 ) {
 		} );
 
 		return () => {
-			if ( clipboard.current ) {
-				clipboard.current.destroy();
+			if ( clipboardRef.current ) {
+				clipboardRef.current.destroy();
 			}
 			clearTimeout( timeoutId );
 		};
diff --git a/packages/compose/src/hooks/use-copy-to-clipboard/index.js b/packages/compose/src/hooks/use-copy-to-clipboard/index.js
index 1d838a1158ecfb..fbd7b77fecc4ce 100644
--- a/packages/compose/src/hooks/use-copy-to-clipboard/index.js
+++ b/packages/compose/src/hooks/use-copy-to-clipboard/index.js
@@ -6,7 +6,7 @@ import Clipboard from 'clipboard';
 /**
  * WordPress dependencies
  */
-import { useRef } from '@wordpress/element';
+import { useRef, useLayoutEffect } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -20,7 +20,9 @@ import useRefEffect from '../use-ref-effect';
  */
 function useUpdatedRef( value ) {
 	const ref = useRef( value );
-	ref.current = value;
+	useLayoutEffect( () => {
+		ref.current = value;
+	}, [ value ] );
 	return ref;
 }
 
@@ -54,9 +56,6 @@ export default function useCopyToClipboard( text, onSuccess ) {
 			// button, ensuring that it is not reset to the body, and
 			// further that it is kept within the rendered node.
 			clearSelection();
-			// Handle ClipboardJS focus bug, see
-			// https://github.com/zenorocha/clipboard.js/issues/680
-			node.focus();
 
 			if ( onSuccessRef.current ) {
 				onSuccessRef.current();
diff --git a/packages/compose/src/hooks/use-debounce/index.js b/packages/compose/src/hooks/use-debounce/index.js
index 5d48dba91bde6e..6da42f159a8640 100644
--- a/packages/compose/src/hooks/use-debounce/index.js
+++ b/packages/compose/src/hooks/use-debounce/index.js
@@ -19,7 +19,7 @@ import { debounce } from '../../utils/debounce';
  * including the function to debounce, so please wrap functions created on
  * render in components in `useCallback`.
  *
- * @see https://docs-lodash.com/v4/debounce/
+ * @see https://lodash.com/docs/4#debounce
  *
  * @template {(...args: any[]) => void} TFunc
  *
diff --git a/packages/compose/src/hooks/use-debounced-input/index.js b/packages/compose/src/hooks/use-debounced-input/index.js
deleted file mode 100644
index 91a01073fcfee8..00000000000000
--- a/packages/compose/src/hooks/use-debounced-input/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useEffect, useState } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import useDebounce from '../use-debounce';
-
-/**
- * Helper hook for input fields that need to debounce the value before using it.
- *
- * @param {any} defaultValue The default value to use.
- * @return {[string, Function, string]} The input value, the setter and the debounced input value.
- */
-export default function useDebouncedInput( defaultValue = '' ) {
-	const [ input, setInput ] = useState( defaultValue );
-	const [ debouncedInput, setDebouncedState ] = useState( defaultValue );
-
-	const setDebouncedInput = useDebounce( setDebouncedState, 250 );
-
-	useEffect( () => {
-		setDebouncedInput( input );
-	}, [ input ] );
-
-	return [ input, setInput, debouncedInput ];
-}
diff --git a/packages/compose/src/hooks/use-debounced-input/index.ts b/packages/compose/src/hooks/use-debounced-input/index.ts
new file mode 100644
index 00000000000000..643b0ba68026c3
--- /dev/null
+++ b/packages/compose/src/hooks/use-debounced-input/index.ts
@@ -0,0 +1,30 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect, useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import useDebounce from '../use-debounce';
+
+/**
+ * Helper hook for input fields that need to debounce the value before using it.
+ *
+ * @param defaultValue The default value to use.
+ * @return The input value, the setter and the debounced input value.
+ */
+export default function useDebouncedInput(
+	defaultValue = ''
+): [ string, ( value: string ) => void, string ] {
+	const [ input, setInput ] = useState< string >( defaultValue );
+	const [ debouncedInput, setDebouncedState ] = useState( defaultValue );
+
+	const setDebouncedInput = useDebounce( setDebouncedState, 250 );
+
+	useEffect( () => {
+		setDebouncedInput( input );
+	}, [ input, setDebouncedInput ] );
+
+	return [ input, setInput, debouncedInput ];
+}
diff --git a/packages/compose/src/hooks/use-dialog/index.ts b/packages/compose/src/hooks/use-dialog/index.ts
index 66974b60e07035..1b517478fa0bd2 100644
--- a/packages/compose/src/hooks/use-dialog/index.ts
+++ b/packages/compose/src/hooks/use-dialog/index.ts
@@ -19,7 +19,26 @@ import useFocusOutside from '../use-focus-outside';
 import useMergeRefs from '../use-merge-refs';
 
 type DialogOptions = {
+	/**
+	 * Determines whether focus should be automatically moved to the popover
+	 * when it mounts. `false` causes no focus shift, `true` causes the popover
+	 * itself to gain focus, and `firstElement` focuses the first focusable
+	 * element within the popover.
+	 *
+	 * @default 'firstElement'
+	 */
 	focusOnMount?: Parameters< typeof useFocusOnMount >[ 0 ];
+	/**
+	 * Determines whether tabbing is constrained to within the popover,
+	 * preventing keyboard focus from leaving the popover content without
+	 * explicit focus elsewhere, or whether the popover remains part of the
+	 * wider tab order.
+	 * If no value is passed, it will be derived from `focusOnMount`.
+	 *
+	 * @see focusOnMount
+	 * @default `focusOnMount` !== false
+	 */
+	constrainTabbing?: boolean;
 	onClose?: () => void;
 	/**
 	 * Use the `onClose` prop instead.
@@ -48,6 +67,7 @@ type useDialogReturn = [
  */
 function useDialog( options: DialogOptions ): useDialogReturn {
 	const currentOptions = useRef< DialogOptions | undefined >();
+	const { constrainTabbing = options.focusOnMount !== false } = options;
 	useEffect( () => {
 		currentOptions.current = options;
 	}, Object.values( options ) );
@@ -83,7 +103,7 @@ function useDialog( options: DialogOptions ): useDialogReturn {
 
 	return [
 		useMergeRefs( [
-			options.focusOnMount !== false ? constrainedTabbingRef : null,
+			constrainTabbing ? constrainedTabbingRef : null,
 			options.focusOnMount !== false ? focusReturnRef : null,
 			options.focusOnMount !== false ? focusOnMountRef : null,
 			closeOnEscapeRef,
diff --git a/packages/compose/src/hooks/use-disabled/test/index.js b/packages/compose/src/hooks/use-disabled/test/index.js
index 6f4c7bfe36256d..d51b2d5bf2d6e6 100644
--- a/packages/compose/src/hooks/use-disabled/test/index.js
+++ b/packages/compose/src/hooks/use-disabled/test/index.js
@@ -19,7 +19,7 @@ describe( 'useDisabled', () => {
 			<form ref={ ref }>
 				<input />
 				<a href="https://wordpress.org/">A link</a>
-				<p role="document" contentEditable={ true } tabIndex="0"></p>
+				<p role="document" contentEditable tabIndex="0"></p>
 				{ showButton && <button>Button</button> }
 			</form>
 		);
@@ -48,7 +48,7 @@ describe( 'useDisabled', () => {
 		);
 
 		expect( screen.queryByText( 'Button' ) ).not.toBeInTheDocument();
-		rerender( <DisabledComponent showButton={ true } /> );
+		rerender( <DisabledComponent showButton /> );
 
 		const button = screen.getByText( 'Button' );
 		await waitFor( () => {
diff --git a/packages/compose/src/hooks/use-drop-zone/index.js b/packages/compose/src/hooks/use-drop-zone/index.js
index b537f0a5ab6227..c570c034415923 100644
--- a/packages/compose/src/hooks/use-drop-zone/index.js
+++ b/packages/compose/src/hooks/use-drop-zone/index.js
@@ -86,6 +86,7 @@ export default function useDropZone( {
 			 */
 			function isElementInZone( targetToCheck ) {
 				const { defaultView } = ownerDocument;
+
 				if (
 					! targetToCheck ||
 					! defaultView ||
@@ -165,6 +166,7 @@ export default function useDropZone( {
 				// zone.
 				// Note: This is not entirely reliable in Safari due to this bug
 				// https://bugs.webkit.org/show_bug.cgi?id=66547
+
 				if ( isElementInZone( event.relatedTarget ) ) {
 					return;
 				}
diff --git a/packages/compose/src/hooks/use-event/index.ts b/packages/compose/src/hooks/use-event/index.ts
new file mode 100644
index 00000000000000..d381bcb595bf65
--- /dev/null
+++ b/packages/compose/src/hooks/use-event/index.ts
@@ -0,0 +1,51 @@
+/**
+ * WordPress dependencies
+ */
+import { useRef, useInsertionEffect, useCallback } from '@wordpress/element';
+
+/**
+ * Any function.
+ */
+export type AnyFunction = ( ...args: any ) => any;
+
+/**
+ * Creates a stable callback function that has access to the latest state and
+ * can be used within event handlers and effect callbacks. Throws when used in
+ * the render phase.
+ *
+ * @param callback The callback function to wrap.
+ *
+ * @example
+ *
+ * ```tsx
+ * function Component( props ) {
+ *   const onClick = useEvent( props.onClick );
+ *   useEffect( () => {
+ *     onClick();
+ *     // Won't trigger the effect again when props.onClick is updated.
+ *   }, [ onClick ] );
+ *   // Won't re-render Button when props.onClick is updated (if `Button` is
+ *   // wrapped in `React.memo`).
+ *   return <Button onClick={ onClick } />;
+ * }
+ * ```
+ */
+export default function useEvent< T extends AnyFunction >(
+	/**
+	 * The callback function to wrap.
+	 */
+	callback?: T
+) {
+	const ref = useRef< AnyFunction | undefined >( () => {
+		throw new Error(
+			'Callbacks created with `useEvent` cannot be called during rendering.'
+		);
+	} );
+	useInsertionEffect( () => {
+		ref.current = callback;
+	} );
+	return useCallback< AnyFunction >(
+		( ...args ) => ref.current?.( ...args ),
+		[]
+	) as T;
+}
diff --git a/packages/compose/src/hooks/use-focus-on-mount/index.js b/packages/compose/src/hooks/use-focus-on-mount/index.js
index c5176b17e9ceab..bb02eb78e5689a 100644
--- a/packages/compose/src/hooks/use-focus-on-mount/index.js
+++ b/packages/compose/src/hooks/use-focus-on-mount/index.js
@@ -1,9 +1,14 @@
 /**
  * WordPress dependencies
  */
-import { useRef, useEffect, useCallback } from '@wordpress/element';
+import { useRef, useEffect } from '@wordpress/element';
 import { focus } from '@wordpress/dom';
 
+/**
+ * Internal dependencies
+ */
+import useRefEffect from '../use-ref-effect';
+
 /**
  * Hook used to focus the first tabbable element on mount.
  *
@@ -44,21 +49,13 @@ export default function useFocusOnMount( focusOnMount = 'firstElement' ) {
 	};
 
 	/** @type {import('react').MutableRefObject<ReturnType<setTimeout> | undefined>} */
-	const timerId = useRef();
+	const timerIdRef = useRef();
 
 	useEffect( () => {
 		focusOnMountRef.current = focusOnMount;
 	}, [ focusOnMount ] );
 
-	useEffect( () => {
-		return () => {
-			if ( timerId.current ) {
-				clearTimeout( timerId.current );
-			}
-		};
-	}, [] );
-
-	return useCallback( ( node ) => {
+	return useRefEffect( ( node ) => {
 		if ( ! node || focusOnMountRef.current === false ) {
 			return;
 		}
@@ -67,18 +64,22 @@ export default function useFocusOnMount( focusOnMount = 'firstElement' ) {
 			return;
 		}
 
-		if ( focusOnMountRef.current === 'firstElement' ) {
-			timerId.current = setTimeout( () => {
-				const firstTabbable = focus.tabbable.find( node )[ 0 ];
-
-				if ( firstTabbable ) {
-					setFocus( /** @type {HTMLElement} */ ( firstTabbable ) );
-				}
-			}, 0 );
-
+		if ( focusOnMountRef.current !== 'firstElement' ) {
+			setFocus( node );
 			return;
 		}
 
-		setFocus( node );
+		timerIdRef.current = setTimeout( () => {
+			const firstTabbable = focus.tabbable.find( node )[ 0 ];
+			if ( firstTabbable ) {
+				setFocus( firstTabbable );
+			}
+		}, 0 );
+
+		return () => {
+			if ( timerIdRef.current ) {
+				clearTimeout( timerIdRef.current );
+			}
+		};
 	}, [] );
 }
diff --git a/packages/compose/src/hooks/use-focus-outside/index.ts b/packages/compose/src/hooks/use-focus-outside/index.ts
index 3d85b588a9ab3a..812621a09d21d0 100644
--- a/packages/compose/src/hooks/use-focus-outside/index.ts
+++ b/packages/compose/src/hooks/use-focus-outside/index.ts
@@ -71,20 +71,20 @@ type UseFocusOutsideReturn = {
 export default function useFocusOutside(
 	onFocusOutside: ( ( event: React.FocusEvent ) => void ) | undefined
 ): UseFocusOutsideReturn {
-	const currentOnFocusOutside = useRef( onFocusOutside );
+	const currentOnFocusOutsideRef = useRef( onFocusOutside );
 	useEffect( () => {
-		currentOnFocusOutside.current = onFocusOutside;
+		currentOnFocusOutsideRef.current = onFocusOutside;
 	}, [ onFocusOutside ] );
 
-	const preventBlurCheck = useRef( false );
+	const preventBlurCheckRef = useRef( false );
 
-	const blurCheckTimeoutId = useRef< number | undefined >();
+	const blurCheckTimeoutIdRef = useRef< number | undefined >();
 
 	/**
 	 * Cancel a blur check timeout.
 	 */
 	const cancelBlurCheck = useCallback( () => {
-		clearTimeout( blurCheckTimeoutId.current );
+		clearTimeout( blurCheckTimeoutIdRef.current );
 	}, [] );
 
 	// Cancel blur checks on unmount.
@@ -116,9 +116,9 @@ export default function useFocusOutside(
 		const isInteractionEnd = [ 'mouseup', 'touchend' ].includes( type );
 
 		if ( isInteractionEnd ) {
-			preventBlurCheck.current = false;
+			preventBlurCheckRef.current = false;
 		} else if ( isFocusNormalizedButton( target ) ) {
-			preventBlurCheck.current = true;
+			preventBlurCheckRef.current = true;
 		}
 	}, [] );
 
@@ -135,7 +135,7 @@ export default function useFocusOutside(
 		event.persist();
 
 		// Skip blur check if clicking button. See `normalizeButtonFocus`.
-		if ( preventBlurCheck.current ) {
+		if ( preventBlurCheckRef.current ) {
 			return;
 		}
 
@@ -156,7 +156,7 @@ export default function useFocusOutside(
 			return;
 		}
 
-		blurCheckTimeoutId.current = setTimeout( () => {
+		blurCheckTimeoutIdRef.current = setTimeout( () => {
 			// If document is not focused then focus should remain
 			// inside the wrapped component and therefore we cancel
 			// this blur event thereby leaving focus in place.
@@ -166,8 +166,8 @@ export default function useFocusOutside(
 				return;
 			}
 
-			if ( 'function' === typeof currentOnFocusOutside.current ) {
-				currentOnFocusOutside.current( event );
+			if ( 'function' === typeof currentOnFocusOutsideRef.current ) {
+				currentOnFocusOutsideRef.current( event );
 			}
 		}, 0 );
 	}, [] );
diff --git a/packages/compose/src/hooks/use-focusable-iframe/index.ts b/packages/compose/src/hooks/use-focusable-iframe/index.ts
index a184bde4045588..31024bd8246d12 100644
--- a/packages/compose/src/hooks/use-focusable-iframe/index.ts
+++ b/packages/compose/src/hooks/use-focusable-iframe/index.ts
@@ -17,9 +17,13 @@ import useRefEffect from '../use-ref-effect';
 export default function useFocusableIframe(): RefCallback< HTMLIFrameElement > {
 	return useRefEffect( ( element ) => {
 		const { ownerDocument } = element;
-		if ( ! ownerDocument ) return;
+		if ( ! ownerDocument ) {
+			return;
+		}
 		const { defaultView } = ownerDocument;
-		if ( ! defaultView ) return;
+		if ( ! defaultView ) {
+			return;
+		}
 
 		/**
 		 * Checks whether the iframe is the activeElement, inferring that it has
diff --git a/packages/compose/src/hooks/use-instance-id/index.ts b/packages/compose/src/hooks/use-instance-id/index.ts
index 8f21c9657e8fa5..65edc2a5d05d0f 100644
--- a/packages/compose/src/hooks/use-instance-id/index.ts
+++ b/packages/compose/src/hooks/use-instance-id/index.ts
@@ -51,7 +51,9 @@ function useInstanceId(
 	preferredId?: string | number
 ): string | number {
 	return useMemo( () => {
-		if ( preferredId ) return preferredId;
+		if ( preferredId ) {
+			return preferredId;
+		}
 		const id = createId( object );
 
 		return prefix ? `${ prefix }-${ id }` : id;
diff --git a/packages/compose/src/hooks/use-keyboard-shortcut/index.js b/packages/compose/src/hooks/use-keyboard-shortcut/index.js
index be27d15864633a..be3f3a2554c7f3 100644
--- a/packages/compose/src/hooks/use-keyboard-shortcut/index.js
+++ b/packages/compose/src/hooks/use-keyboard-shortcut/index.js
@@ -42,9 +42,9 @@ function useKeyboardShortcut(
 		target,
 	} = {}
 ) {
-	const currentCallback = useRef( callback );
+	const currentCallbackRef = useRef( callback );
 	useEffect( () => {
-		currentCallback.current = callback;
+		currentCallbackRef.current = callback;
 	}, [ callback ] );
 
 	useEffect( () => {
@@ -93,7 +93,7 @@ function useKeyboardShortcut(
 					/** @type {[e: import('mousetrap').ExtendedKeyboardEvent, combo: string]} */ ...args
 				) =>
 					/* eslint-enable jsdoc/valid-types */
-					currentCallback.current( ...args ),
+					currentCallbackRef.current( ...args ),
 				eventName
 			);
 		} );
diff --git a/packages/compose/src/hooks/use-media-query/index.js b/packages/compose/src/hooks/use-media-query/index.js
index 59e6e5d99a4af3..598ab006ecb747 100644
--- a/packages/compose/src/hooks/use-media-query/index.js
+++ b/packages/compose/src/hooks/use-media-query/index.js
@@ -3,6 +3,8 @@
  */
 import { useMemo, useSyncExternalStore } from '@wordpress/element';
 
+const matchMediaCache = new Map();
+
 /**
  * A new MediaQueryList object for the media query
  *
@@ -10,12 +12,23 @@ import { useMemo, useSyncExternalStore } from '@wordpress/element';
  * @return {MediaQueryList|null} A new object for the media query
  */
 function getMediaQueryList( query ) {
+	if ( ! query ) {
+		return null;
+	}
+
+	let match = matchMediaCache.get( query );
+
+	if ( match ) {
+		return match;
+	}
+
 	if (
-		query &&
 		typeof window !== 'undefined' &&
 		typeof window.matchMedia === 'function'
 	) {
-		return window.matchMedia( query );
+		match = window.matchMedia( query );
+		matchMediaCache.set( query, match );
+		return match;
 	}
 
 	return null;
diff --git a/packages/compose/src/hooks/use-media-query/test/index.js b/packages/compose/src/hooks/use-media-query/test/index.js
index 88b2c1b0a3bd24..f8a61a8469c070 100644
--- a/packages/compose/src/hooks/use-media-query/test/index.js
+++ b/packages/compose/src/hooks/use-media-query/test/index.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { act, render } from '@testing-library/react';
-import { matchMedia, setMedia, cleanup } from 'mock-match-media';
+import { matchMedia, setMedia } from 'mock-match-media';
 
 /**
  * Internal dependencies
@@ -26,10 +26,11 @@ describe( 'useMediaQuery', () => {
 	} );
 
 	afterEach( () => {
-		cleanup();
+		// Do not clean up, this will break our cache. Browsers also do not
+		// reset media queries.
 	} );
 
-	it( 'should return true when query matches', async () => {
+	it( 'should return true when the query matches', async () => {
 		const { container } = render(
 			<TestComponent query="(min-width: 782px)" />
 		);
@@ -53,7 +54,7 @@ describe( 'useMediaQuery', () => {
 		expect( container ).toHaveTextContent( 'useMediaQuery: false' );
 	} );
 
-	it( 'should return false when the query does not matches', async () => {
+	it( 'should return false when the query does not match', async () => {
 		const { container } = render(
 			<TestComponent query="(max-width: 782px)" />
 		);
diff --git a/packages/compose/src/hooks/use-merge-refs/index.js b/packages/compose/src/hooks/use-merge-refs/index.js
index f39160444c5229..ed7f4247018be1 100644
--- a/packages/compose/src/hooks/use-merge-refs/index.js
+++ b/packages/compose/src/hooks/use-merge-refs/index.js
@@ -71,28 +71,28 @@ function assignRef( ref, value ) {
  */
 export default function useMergeRefs( refs ) {
 	const element = useRef();
-	const isAttached = useRef( false );
-	const didElementChange = useRef( false );
+	const isAttachedRef = useRef( false );
+	const didElementChangeRef = useRef( false );
 	/* eslint-disable jsdoc/no-undefined-types */
 	/** @type {import('react').MutableRefObject<TRef[]>} */
 	/* eslint-enable jsdoc/no-undefined-types */
-	const previousRefs = useRef( [] );
-	const currentRefs = useRef( refs );
+	const previousRefsRef = useRef( [] );
+	const currentRefsRef = useRef( refs );
 
 	// Update on render before the ref callback is called, so the ref callback
 	// always has access to the current refs.
-	currentRefs.current = refs;
+	currentRefsRef.current = refs;
 
 	// If any of the refs change, call the previous ref with `null` and the new
 	// ref with the node, except when the element changes in the same cycle, in
 	// which case the ref callbacks will already have been called.
 	useLayoutEffect( () => {
 		if (
-			didElementChange.current === false &&
-			isAttached.current === true
+			didElementChangeRef.current === false &&
+			isAttachedRef.current === true
 		) {
 			refs.forEach( ( ref, index ) => {
-				const previousRef = previousRefs.current[ index ];
+				const previousRef = previousRefsRef.current[ index ];
 				if ( ref !== previousRef ) {
 					assignRef( previousRef, null );
 					assignRef( ref, element.current );
@@ -100,13 +100,13 @@ export default function useMergeRefs( refs ) {
 			} );
 		}
 
-		previousRefs.current = refs;
+		previousRefsRef.current = refs;
 	}, refs );
 
 	// No dependencies, must be reset after every render so ref callbacks are
 	// correctly called after a ref change.
 	useLayoutEffect( () => {
-		didElementChange.current = false;
+		didElementChangeRef.current = false;
 	} );
 
 	// There should be no dependencies so that `callback` is only called when
@@ -116,12 +116,14 @@ export default function useMergeRefs( refs ) {
 		// dependency change.
 		assignRef( element, value );
 
-		didElementChange.current = true;
-		isAttached.current = value !== null;
+		didElementChangeRef.current = true;
+		isAttachedRef.current = value !== null;
 
 		// When an element changes, the current ref callback should be called
 		// with the new element and the previous one with `null`.
-		const refsToAssign = value ? currentRefs.current : previousRefs.current;
+		const refsToAssign = value
+			? currentRefsRef.current
+			: previousRefsRef.current;
 
 		// Update the latest refs.
 		for ( const ref of refsToAssign ) {
diff --git a/packages/compose/src/hooks/use-network-connectivity/index.native.js b/packages/compose/src/hooks/use-network-connectivity/index.native.js
new file mode 100644
index 00000000000000..1a806cc99a5a76
--- /dev/null
+++ b/packages/compose/src/hooks/use-network-connectivity/index.native.js
@@ -0,0 +1,59 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect, useState } from '@wordpress/element';
+import {
+	requestConnectionStatus,
+	subscribeConnectionStatus,
+} from '@wordpress/react-native-bridge';
+
+/**
+ * @typedef {Object} NetworkInformation
+ *
+ * @property {boolean} [isConnected] Whether the device is connected to a network.
+ */
+
+/**
+ * Returns the current network connectivity status provided by the native bridge.
+ *
+ * @example
+ *
+ * ```jsx
+ * const { isConnected } = useNetworkConnectivity();
+ * ```
+ *
+ * @return {NetworkInformation} Network information.
+ */
+export default function useNetworkConnectivity() {
+	const [ isConnected, setIsConnected ] = useState( true );
+
+	useEffect( () => {
+		let isCurrent = true;
+
+		requestConnectionStatus( ( isBridgeConnected ) => {
+			if ( ! isCurrent ) {
+				return;
+			}
+
+			setIsConnected( isBridgeConnected );
+		} );
+
+		return () => {
+			isCurrent = false;
+		};
+	}, [] );
+
+	useEffect( () => {
+		const subscription = subscribeConnectionStatus(
+			( { isConnected: isBridgeConnected } ) => {
+				setIsConnected( isBridgeConnected );
+			}
+		);
+
+		return () => {
+			subscription.remove();
+		};
+	}, [] );
+
+	return { isConnected };
+}
diff --git a/packages/compose/src/hooks/use-network-connectivity/test/index.native.js b/packages/compose/src/hooks/use-network-connectivity/test/index.native.js
new file mode 100644
index 00000000000000..82dce664b8b9cd
--- /dev/null
+++ b/packages/compose/src/hooks/use-network-connectivity/test/index.native.js
@@ -0,0 +1,87 @@
+/**
+ * External dependencies
+ */
+import { act, renderHook } from 'test/helpers';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	requestConnectionStatus,
+	subscribeConnectionStatus,
+} from '@wordpress/react-native-bridge';
+
+/**
+ * Internal dependencies
+ */
+import useNetworkConnectivity from '../index';
+
+describe( 'useNetworkConnectivity', () => {
+	it( 'should optimisitically presume network connectivity', () => {
+		const { result } = renderHook( () => useNetworkConnectivity() );
+
+		expect( result.current.isConnected ).toBe( true );
+	} );
+
+	describe( 'when network connectivity is available', () => {
+		beforeAll( () => {
+			requestConnectionStatus.mockImplementation( ( callback ) => {
+				callback( true );
+				return { remove: jest.fn() };
+			} );
+		} );
+
+		it( 'should return true', () => {
+			const { result } = renderHook( () => useNetworkConnectivity() );
+
+			expect( result.current.isConnected ).toBe( true );
+		} );
+
+		it( 'should update the status when network connectivity changes', () => {
+			let subscriptionCallback;
+			subscribeConnectionStatus.mockImplementation( ( callback ) => {
+				subscriptionCallback = callback;
+				return { remove: jest.fn() };
+			} );
+
+			const { result } = renderHook( () => useNetworkConnectivity() );
+
+			expect( result.current.isConnected ).toBe( true );
+
+			act( () => subscriptionCallback( { isConnected: false } ) );
+
+			expect( result.current.isConnected ).toBe( false );
+		} );
+	} );
+
+	describe( 'when network connectivity is unavailable', () => {
+		beforeAll( () => {
+			requestConnectionStatus.mockImplementation( ( callback ) => {
+				callback( false );
+				return { remove: jest.fn() };
+			} );
+		} );
+
+		it( 'should return false', () => {
+			const { result } = renderHook( () => useNetworkConnectivity() );
+
+			expect( result.current.isConnected ).toBe( false );
+		} );
+
+		it( 'should update the status when network connectivity changes', () => {
+			let subscriptionCallback;
+			subscribeConnectionStatus.mockImplementation( ( callback ) => {
+				subscriptionCallback = callback;
+				return { remove: jest.fn() };
+			} );
+
+			const { result } = renderHook( () => useNetworkConnectivity() );
+
+			expect( result.current.isConnected ).toBe( false );
+
+			act( () => subscriptionCallback( { isConnected: true } ) );
+
+			expect( result.current.isConnected ).toBe( true );
+		} );
+	} );
+} );
diff --git a/packages/compose/src/hooks/use-observable-value/index.ts b/packages/compose/src/hooks/use-observable-value/index.ts
new file mode 100644
index 00000000000000..b07bf41f9b20b6
--- /dev/null
+++ b/packages/compose/src/hooks/use-observable-value/index.ts
@@ -0,0 +1,35 @@
+/**
+ * WordPress dependencies
+ */
+import { useMemo, useSyncExternalStore } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { ObservableMap } from '../../utils/observable-map';
+
+/**
+ * React hook that lets you observe an entry in an `ObservableMap`. The hook returns the
+ * current value corresponding to the key, or `undefined` when there is no value stored.
+ * It also observes changes to the value and triggers an update of the calling component
+ * in case the value changes.
+ *
+ * @template K    The type of the keys in the map.
+ * @template V    The type of the values in the map.
+ * @param    map  The `ObservableMap` to observe.
+ * @param    name The map key to observe.
+ * @return   The value corresponding to the map key requested.
+ */
+export default function useObservableValue< K, V >(
+	map: ObservableMap< K, V >,
+	name: K
+): V | undefined {
+	const [ subscribe, getValue ] = useMemo(
+		() => [
+			( listener: () => void ) => map.subscribe( name, listener ),
+			() => map.get( name ),
+		],
+		[ map, name ]
+	);
+	return useSyncExternalStore( subscribe, getValue, getValue );
+}
diff --git a/packages/compose/src/hooks/use-observable-value/test/index.js b/packages/compose/src/hooks/use-observable-value/test/index.js
new file mode 100644
index 00000000000000..b53adf22f76b1e
--- /dev/null
+++ b/packages/compose/src/hooks/use-observable-value/test/index.js
@@ -0,0 +1,42 @@
+/**
+ * External dependencies
+ */
+import { render, screen, act } from '@testing-library/react';
+
+/**
+ * Internal dependencies
+ */
+import { observableMap } from '../../../utils/observable-map';
+import useObservableValue from '..';
+
+describe( 'useObservableValue', () => {
+	test( 'reacts only to the specified key', () => {
+		const map = observableMap();
+		map.set( 'a', 1 );
+
+		const MapUI = jest.fn( () => {
+			const value = useObservableValue( map, 'a' );
+			return <div>value is { value }</div>;
+		} );
+
+		render( <MapUI /> );
+		expect( screen.getByText( /^value is/ ) ).toHaveTextContent(
+			'value is 1'
+		);
+		expect( MapUI ).toHaveBeenCalledTimes( 1 );
+
+		act( () => {
+			map.set( 'a', 2 );
+		} );
+		expect( screen.getByText( /^value is/ ) ).toHaveTextContent(
+			'value is 2'
+		);
+		expect( MapUI ).toHaveBeenCalledTimes( 2 );
+
+		// check that setting unobserved map key doesn't trigger a render at all
+		act( () => {
+			map.set( 'b', 1 );
+		} );
+		expect( MapUI ).toHaveBeenCalledTimes( 2 );
+	} );
+} );
diff --git a/packages/compose/src/hooks/use-ref-effect/index.ts b/packages/compose/src/hooks/use-ref-effect/index.ts
index 06d826229980c1..89cc3bc2392c21 100644
--- a/packages/compose/src/hooks/use-ref-effect/index.ts
+++ b/packages/compose/src/hooks/use-ref-effect/index.ts
@@ -31,12 +31,12 @@ export default function useRefEffect< TElement = Node >(
 	callback: ( node: TElement ) => ( () => void ) | void,
 	dependencies: DependencyList
 ): RefCallback< TElement | null > {
-	const cleanup = useRef< ( () => void ) | void >();
+	const cleanupRef = useRef< ( () => void ) | void >();
 	return useCallback( ( node: TElement | null ) => {
 		if ( node ) {
-			cleanup.current = callback( node );
-		} else if ( cleanup.current ) {
-			cleanup.current();
+			cleanupRef.current = callback( node );
+		} else if ( cleanupRef.current ) {
+			cleanupRef.current();
 		}
 	}, dependencies );
 }
diff --git a/packages/compose/src/hooks/use-resize-observer/index.native.js b/packages/compose/src/hooks/use-resize-observer/index.native.js
index 3b171ee00bf47c..79eb3e569e332a 100644
--- a/packages/compose/src/hooks/use-resize-observer/index.native.js
+++ b/packages/compose/src/hooks/use-resize-observer/index.native.js
@@ -1,59 +1 @@
-/**
- * External dependencies
- */
-import { View, StyleSheet } from 'react-native';
-/**
- * WordPress dependencies
- */
-import { useState, useCallback } from '@wordpress/element';
-
-/**
- * Hook which allows to listen the resize event of any target element when it changes sizes.
- *
- * @example
- *
- * ```js
- * const App = () => {
- * 	const [ resizeListener, sizes ] = useResizeObserver();
- *
- * 	return (
- * 		<View>
- * 			{ resizeListener }
- * 			Your content here
- * 		</View>
- * 	);
- * };
- * ```
- */
-const useResizeObserver = () => {
-	const [ measurements, setMeasurements ] = useState( null );
-
-	const onLayout = useCallback( ( { nativeEvent } ) => {
-		const { width, height } = nativeEvent.layout;
-		setMeasurements( ( prevState ) => {
-			if (
-				! prevState ||
-				prevState.width !== width ||
-				prevState.height !== height
-			) {
-				return {
-					width: Math.floor( width ),
-					height: Math.floor( height ),
-				};
-			}
-			return prevState;
-		} );
-	}, [] );
-
-	const observer = (
-		<View
-			testID="resize-observer"
-			style={ StyleSheet.absoluteFill }
-			onLayout={ onLayout }
-		/>
-	);
-
-	return [ observer, measurements ];
-};
-
-export default useResizeObserver;
+export { default } from './legacy/index.native';
diff --git a/packages/compose/src/hooks/use-resize-observer/index.ts b/packages/compose/src/hooks/use-resize-observer/index.ts
new file mode 100644
index 00000000000000..1bd0f074cc49f2
--- /dev/null
+++ b/packages/compose/src/hooks/use-resize-observer/index.ts
@@ -0,0 +1,80 @@
+/**
+ * Internal dependencies
+ */
+import { useResizeObserver as _useResizeObserver } from './use-resize-observer';
+import type { ObservedSize } from './legacy';
+import _useLegacyResizeObserver from './legacy';
+/**
+ * External dependencies
+ */
+import type { ReactElement } from 'react';
+
+/**
+ * Sets up a [`ResizeObserver`](https://developer.mozilla.org/en-US/docs/Web/API/Resize_Observer_API)
+ * for an HTML or SVG element.
+ *
+ * Pass the returned setter as a callback ref to the React element you want
+ * to observe, or use it in layout effects for advanced use cases.
+ *
+ * @example
+ *
+ * ```tsx
+ * const setElement = useResizeObserver(
+ * 	( resizeObserverEntries ) => console.log( resizeObserverEntries ),
+ * 	{ box: 'border-box' }
+ * );
+ * <div ref={ setElement } />;
+ *
+ * // The setter can be used in other ways, for example:
+ * useLayoutEffect( () => {
+ * 	setElement( document.querySelector( `data-element-id="${ elementId }"` ) );
+ * }, [ elementId ] );
+ * ```
+ *
+ * @param callback The `ResizeObserver` callback - [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver/ResizeObserver#callback).
+ * @param options  Options passed to `ResizeObserver.observe` when called - [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver/observe#options). Changes will be ignored.
+ */
+export default function useResizeObserver< T extends Element >(
+	/**
+	 * The `ResizeObserver` callback - [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver/ResizeObserver#callback).
+	 */
+	callback: ResizeObserverCallback,
+	/**
+	 * Options passed to `ResizeObserver.observe` when called - [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver/observe#options). Changes will be ignored.
+	 */
+	options?: ResizeObserverOptions
+): ( element?: T | null ) => void;
+
+/**
+ * **This is a legacy API and should not be used.**
+ *
+ * @deprecated Use the other `useResizeObserver` API instead: `const ref = useResizeObserver( ( entries ) => { ... } )`.
+ *
+ * Hook which allows to listen to the resize event of any target element when it changes size.
+ * _Note: `useResizeObserver` will report `null` sizes until after first render.
+ *
+ * @example
+ *
+ * ```js
+ * const App = () => {
+ * 	const [ resizeListener, sizes ] = useResizeObserver();
+ *
+ * 	return (
+ * 		<div>
+ * 			{ resizeListener }
+ * 			Your content here
+ * 		</div>
+ * 	);
+ * };
+ * ```
+ */
+export default function useResizeObserver(): [ ReactElement, ObservedSize ];
+
+export default function useResizeObserver< T extends HTMLElement >(
+	callback?: ResizeObserverCallback,
+	options: ResizeObserverOptions = {}
+): ( ( element?: T | null ) => void ) | [ ReactElement, ObservedSize ] {
+	return callback
+		? _useResizeObserver( callback, options )
+		: _useLegacyResizeObserver();
+}
diff --git a/packages/compose/src/hooks/use-resize-observer/index.tsx b/packages/compose/src/hooks/use-resize-observer/index.tsx
deleted file mode 100644
index 21fcd0bff4f4d0..00000000000000
--- a/packages/compose/src/hooks/use-resize-observer/index.tsx
+++ /dev/null
@@ -1,362 +0,0 @@
-/**
- * External dependencies
- */
-import type { ReactElement, RefCallback, RefObject } from 'react';
-
-/**
- * WordPress dependencies
- */
-import {
-	useMemo,
-	useRef,
-	useCallback,
-	useEffect,
-	useState,
-} from '@wordpress/element';
-
-type SubscriberCleanup = () => void;
-type SubscriberResponse = SubscriberCleanup | void;
-
-// This of course could've been more streamlined with internal state instead of
-// refs, but then host hooks / components could not opt out of renders.
-// This could've been exported to its own module, but the current build doesn't
-// seem to work with module imports and I had no more time to spend on this...
-function useResolvedElement< T extends HTMLElement >(
-	subscriber: ( element: T ) => SubscriberResponse,
-	refOrElement?: T | RefObject< T > | null
-): RefCallback< T > {
-	const callbackRefElement = useRef< T | null >( null );
-	const lastReportRef = useRef< {
-		reporter: () => void;
-		element: T | null;
-	} | null >( null );
-	const cleanupRef = useRef< SubscriberResponse | null >();
-
-	const callSubscriber = useCallback( () => {
-		let element = null;
-		if ( callbackRefElement.current ) {
-			element = callbackRefElement.current;
-		} else if ( refOrElement ) {
-			if ( refOrElement instanceof HTMLElement ) {
-				element = refOrElement;
-			} else {
-				element = refOrElement.current;
-			}
-		}
-
-		if (
-			lastReportRef.current &&
-			lastReportRef.current.element === element &&
-			lastReportRef.current.reporter === callSubscriber
-		) {
-			return;
-		}
-
-		if ( cleanupRef.current ) {
-			cleanupRef.current();
-			// Making sure the cleanup is not called accidentally multiple times.
-			cleanupRef.current = null;
-		}
-		lastReportRef.current = {
-			reporter: callSubscriber,
-			element,
-		};
-
-		// Only calling the subscriber, if there's an actual element to report.
-		if ( element ) {
-			cleanupRef.current = subscriber( element );
-		}
-	}, [ refOrElement, subscriber ] );
-
-	// On each render, we check whether a ref changed, or if we got a new raw
-	// element.
-	useEffect( () => {
-		// With this we're *technically* supporting cases where ref objects' current value changes, but only if there's a
-		// render accompanying that change as well.
-		// To guarantee we always have the right element, one must use the ref callback provided instead, but we support
-		// RefObjects to make the hook API more convenient in certain cases.
-		callSubscriber();
-	}, [ callSubscriber ] );
-
-	return useCallback< RefCallback< T > >(
-		( element ) => {
-			callbackRefElement.current = element;
-			callSubscriber();
-		},
-		[ callSubscriber ]
-	);
-}
-
-type ObservedSize = {
-	width: number | undefined;
-	height: number | undefined;
-};
-
-type ResizeHandler = ( size: ObservedSize ) => void;
-
-type HookResponse< T extends HTMLElement > = {
-	ref: RefCallback< T >;
-} & ObservedSize;
-
-// Declaring my own type here instead of using the one provided by TS (available since 4.2.2), because this way I'm not
-// forcing consumers to use a specific TS version.
-type ResizeObserverBoxOptions =
-	| 'border-box'
-	| 'content-box'
-	| 'device-pixel-content-box';
-
-declare global {
-	interface ResizeObserverEntry {
-		readonly devicePixelContentBoxSize: ReadonlyArray< ResizeObserverSize >;
-	}
-}
-
-// We're only using the first element of the size sequences, until future versions of the spec solidify on how
-// exactly it'll be used for fragments in multi-column scenarios:
-// From the spec:
-// > The box size properties are exposed as FrozenArray in order to support elements that have multiple fragments,
-// > which occur in multi-column scenarios. However the current definitions of content rect and border box do not
-// > mention how those boxes are affected by multi-column layout. In this spec, there will only be a single
-// > ResizeObserverSize returned in the FrozenArray, which will correspond to the dimensions of the first column.
-// > A future version of this spec will extend the returned FrozenArray to contain the per-fragment size information.
-// (https://drafts.csswg.org/resize-observer/#resize-observer-entry-interface)
-//
-// Also, testing these new box options revealed that in both Chrome and FF everything is returned in the callback,
-// regardless of the "box" option.
-// The spec states the following on this:
-// > This does not have any impact on which box dimensions are returned to the defined callback when the event
-// > is fired, it solely defines which box the author wishes to observe layout changes on.
-// (https://drafts.csswg.org/resize-observer/#resize-observer-interface)
-// I'm not exactly clear on what this means, especially when you consider a later section stating the following:
-// > This section is non-normative. An author may desire to observe more than one CSS box.
-// > In this case, author will need to use multiple ResizeObservers.
-// (https://drafts.csswg.org/resize-observer/#resize-observer-interface)
-// Which is clearly not how current browser implementations behave, and seems to contradict the previous quote.
-// For this reason I decided to only return the requested size,
-// even though it seems we have access to results for all box types.
-// This also means that we get to keep the current api, being able to return a simple { width, height } pair,
-// regardless of box option.
-const extractSize = (
-	entry: ResizeObserverEntry,
-	boxProp: 'borderBoxSize' | 'contentBoxSize' | 'devicePixelContentBoxSize',
-	sizeType: keyof ResizeObserverSize
-): number | undefined => {
-	if ( ! entry[ boxProp ] ) {
-		if ( boxProp === 'contentBoxSize' ) {
-			// The dimensions in `contentBoxSize` and `contentRect` are equivalent according to the spec.
-			// See the 6th step in the description for the RO algorithm:
-			// https://drafts.csswg.org/resize-observer/#create-and-populate-resizeobserverentry-h
-			// > Set this.contentRect to logical this.contentBoxSize given target and observedBox of "content-box".
-			// In real browser implementations of course these objects differ, but the width/height values should be equivalent.
-			return entry.contentRect[
-				sizeType === 'inlineSize' ? 'width' : 'height'
-			];
-		}
-
-		return undefined;
-	}
-
-	// A couple bytes smaller than calling Array.isArray() and just as effective here.
-	return entry[ boxProp ][ 0 ]
-		? entry[ boxProp ][ 0 ][ sizeType ]
-		: // TS complains about this, because the RO entry type follows the spec and does not reflect Firefox's current
-		  // behaviour of returning objects instead of arrays for `borderBoxSize` and `contentBoxSize`.
-		  // @ts-ignore
-		  entry[ boxProp ][ sizeType ];
-};
-
-type RoundingFunction = ( n: number ) => number;
-
-function useResizeObserver< T extends HTMLElement >(
-	opts: {
-		ref?: RefObject< T > | T | null | undefined;
-		onResize?: ResizeHandler;
-		box?: ResizeObserverBoxOptions;
-		round?: RoundingFunction;
-	} = {}
-): HookResponse< T > {
-	// Saving the callback as a ref. With this, I don't need to put onResize in the
-	// effect dep array, and just passing in an anonymous function without memoising
-	// will not reinstantiate the hook's ResizeObserver.
-	const onResize = opts.onResize;
-	const onResizeRef = useRef< ResizeHandler | undefined >( undefined );
-	onResizeRef.current = onResize;
-	const round = opts.round || Math.round;
-
-	// Using a single instance throughout the hook's lifetime
-	const resizeObserverRef = useRef< {
-		box?: ResizeObserverBoxOptions;
-		round?: RoundingFunction;
-		instance: ResizeObserver;
-	} >();
-
-	const [ size, setSize ] = useState< {
-		width?: number;
-		height?: number;
-	} >( {
-		width: undefined,
-		height: undefined,
-	} );
-
-	// In certain edge cases the RO might want to report a size change just after
-	// the component unmounted.
-	const didUnmount = useRef( false );
-	useEffect( () => {
-		didUnmount.current = false;
-		return () => {
-			didUnmount.current = true;
-		};
-	}, [] );
-
-	// Using a ref to track the previous width / height to avoid unnecessary renders.
-	const previous: {
-		current: {
-			width?: number;
-			height?: number;
-		};
-	} = useRef( {
-		width: undefined,
-		height: undefined,
-	} );
-
-	// This block is kinda like a useEffect, only it's called whenever a new
-	// element could be resolved based on the ref option. It also has a cleanup
-	// function.
-	const refCallback = useResolvedElement< T >(
-		useCallback(
-			( element ) => {
-				// We only use a single Resize Observer instance, and we're instantiating it on demand, only once there's something to observe.
-				// This instance is also recreated when the `box` option changes, so that a new observation is fired if there was a previously observed element with a different box option.
-				if (
-					! resizeObserverRef.current ||
-					resizeObserverRef.current.box !== opts.box ||
-					resizeObserverRef.current.round !== round
-				) {
-					resizeObserverRef.current = {
-						box: opts.box,
-						round,
-						instance: new ResizeObserver( ( entries ) => {
-							const entry = entries[ 0 ];
-
-							let boxProp:
-								| 'borderBoxSize'
-								| 'contentBoxSize'
-								| 'devicePixelContentBoxSize' = 'borderBoxSize';
-							if ( opts.box === 'border-box' ) {
-								boxProp = 'borderBoxSize';
-							} else {
-								boxProp =
-									opts.box === 'device-pixel-content-box'
-										? 'devicePixelContentBoxSize'
-										: 'contentBoxSize';
-							}
-
-							const reportedWidth = extractSize(
-								entry,
-								boxProp,
-								'inlineSize'
-							);
-							const reportedHeight = extractSize(
-								entry,
-								boxProp,
-								'blockSize'
-							);
-
-							const newWidth = reportedWidth
-								? round( reportedWidth )
-								: undefined;
-							const newHeight = reportedHeight
-								? round( reportedHeight )
-								: undefined;
-
-							if (
-								previous.current.width !== newWidth ||
-								previous.current.height !== newHeight
-							) {
-								const newSize = {
-									width: newWidth,
-									height: newHeight,
-								};
-								previous.current.width = newWidth;
-								previous.current.height = newHeight;
-								if ( onResizeRef.current ) {
-									onResizeRef.current( newSize );
-								} else if ( ! didUnmount.current ) {
-									setSize( newSize );
-								}
-							}
-						} ),
-					};
-				}
-
-				resizeObserverRef.current.instance.observe( element, {
-					box: opts.box,
-				} );
-
-				return () => {
-					if ( resizeObserverRef.current ) {
-						resizeObserverRef.current.instance.unobserve( element );
-					}
-				};
-			},
-			[ opts.box, round ]
-		),
-		opts.ref
-	);
-
-	return useMemo(
-		() => ( {
-			ref: refCallback,
-			width: size.width,
-			height: size.height,
-		} ),
-		[ refCallback, size ? size.width : null, size ? size.height : null ]
-	);
-}
-
-/**
- * Hook which allows to listen the resize event of any target element when it changes sizes.
- * _Note: `useResizeObserver` will report `null` until after first render.
- *
- * @example
- *
- * ```js
- * const App = () => {
- * 	const [ resizeListener, sizes ] = useResizeObserver();
- *
- * 	return (
- * 		<div>
- * 			{ resizeListener }
- * 			Your content here
- * 		</div>
- * 	);
- * };
- * ```
- */
-export default function useResizeAware(): [
-	ReactElement,
-	{ width: number | null; height: number | null },
-] {
-	const { ref, width, height } = useResizeObserver();
-	const sizes = useMemo( () => {
-		return { width: width ?? null, height: height ?? null };
-	}, [ width, height ] );
-	const resizeListener = (
-		<div
-			style={ {
-				position: 'absolute',
-				top: 0,
-				left: 0,
-				right: 0,
-				bottom: 0,
-				pointerEvents: 'none',
-				opacity: 0,
-				overflow: 'hidden',
-				zIndex: -1,
-			} }
-			aria-hidden="true"
-			ref={ ref }
-		/>
-	);
-	return [ resizeListener, sizes ];
-}
diff --git a/packages/compose/src/hooks/use-resize-observer/legacy/index.native.js b/packages/compose/src/hooks/use-resize-observer/legacy/index.native.js
new file mode 100644
index 00000000000000..3b171ee00bf47c
--- /dev/null
+++ b/packages/compose/src/hooks/use-resize-observer/legacy/index.native.js
@@ -0,0 +1,59 @@
+/**
+ * External dependencies
+ */
+import { View, StyleSheet } from 'react-native';
+/**
+ * WordPress dependencies
+ */
+import { useState, useCallback } from '@wordpress/element';
+
+/**
+ * Hook which allows to listen the resize event of any target element when it changes sizes.
+ *
+ * @example
+ *
+ * ```js
+ * const App = () => {
+ * 	const [ resizeListener, sizes ] = useResizeObserver();
+ *
+ * 	return (
+ * 		<View>
+ * 			{ resizeListener }
+ * 			Your content here
+ * 		</View>
+ * 	);
+ * };
+ * ```
+ */
+const useResizeObserver = () => {
+	const [ measurements, setMeasurements ] = useState( null );
+
+	const onLayout = useCallback( ( { nativeEvent } ) => {
+		const { width, height } = nativeEvent.layout;
+		setMeasurements( ( prevState ) => {
+			if (
+				! prevState ||
+				prevState.width !== width ||
+				prevState.height !== height
+			) {
+				return {
+					width: Math.floor( width ),
+					height: Math.floor( height ),
+				};
+			}
+			return prevState;
+		} );
+	}, [] );
+
+	const observer = (
+		<View
+			testID="resize-observer"
+			style={ StyleSheet.absoluteFill }
+			onLayout={ onLayout }
+		/>
+	);
+
+	return [ observer, measurements ];
+};
+
+export default useResizeObserver;
diff --git a/packages/compose/src/hooks/use-resize-observer/legacy/index.tsx b/packages/compose/src/hooks/use-resize-observer/legacy/index.tsx
new file mode 100644
index 00000000000000..fe765810982226
--- /dev/null
+++ b/packages/compose/src/hooks/use-resize-observer/legacy/index.tsx
@@ -0,0 +1,143 @@
+/**
+ * External dependencies
+ */
+import type { ReactElement } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import { useCallback, useRef, useState } from '@wordpress/element';
+/**
+ * Internal dependencies
+ */
+import { useResizeObserver } from '../use-resize-observer';
+
+export type ObservedSize = {
+	width: number | null;
+	height: number | null;
+};
+
+// We're only using the first element of the size sequences, until future versions of the spec solidify on how
+// exactly it'll be used for fragments in multi-column scenarios:
+// From the spec:
+// > The box size properties are exposed as FrozenArray in order to support elements that have multiple fragments,
+// > which occur in multi-column scenarios. However the current definitions of content rect and border box do not
+// > mention how those boxes are affected by multi-column layout. In this spec, there will only be a single
+// > ResizeObserverSize returned in the FrozenArray, which will correspond to the dimensions of the first column.
+// > A future version of this spec will extend the returned FrozenArray to contain the per-fragment size information.
+// (https://drafts.csswg.org/resize-observer/#resize-observer-entry-interface)
+//
+// Also, testing these new box options revealed that in both Chrome and FF everything is returned in the callback,
+// regardless of the "box" option.
+// The spec states the following on this:
+// > This does not have any impact on which box dimensions are returned to the defined callback when the event
+// > is fired, it solely defines which box the author wishes to observe layout changes on.
+// (https://drafts.csswg.org/resize-observer/#resize-observer-interface)
+// I'm not exactly clear on what this means, especially when you consider a later section stating the following:
+// > This section is non-normative. An author may desire to observe more than one CSS box.
+// > In this case, author will need to use multiple ResizeObservers.
+// (https://drafts.csswg.org/resize-observer/#resize-observer-interface)
+// Which is clearly not how current browser implementations behave, and seems to contradict the previous quote.
+// For this reason I decided to only return the requested size,
+// even though it seems we have access to results for all box types.
+// This also means that we get to keep the current api, being able to return a simple { width, height } pair,
+// regardless of box option.
+const extractSize = ( entry: ResizeObserverEntry ): ObservedSize => {
+	let entrySize;
+	if ( ! entry.contentBoxSize ) {
+		// The dimensions in `contentBoxSize` and `contentRect` are equivalent according to the spec.
+		// See the 6th step in the description for the RO algorithm:
+		// https://drafts.csswg.org/resize-observer/#create-and-populate-resizeobserverentry-h
+		// > Set this.contentRect to logical this.contentBoxSize given target and observedBox of "content-box".
+		// In real browser implementations of course these objects differ, but the width/height values should be equivalent.
+		entrySize = [ entry.contentRect.width, entry.contentRect.height ];
+	} else if ( entry.contentBoxSize[ 0 ] ) {
+		const contentBoxSize = entry.contentBoxSize[ 0 ];
+		entrySize = [ contentBoxSize.inlineSize, contentBoxSize.blockSize ];
+	} else {
+		// TS complains about this, because the RO entry type follows the spec and does not reflect Firefox's buggy
+		// behaviour of returning objects instead of arrays for `borderBoxSize` and `contentBoxSize`.
+		const contentBoxSize =
+			entry.contentBoxSize as unknown as ResizeObserverSize;
+		entrySize = [ contentBoxSize.inlineSize, contentBoxSize.blockSize ];
+	}
+
+	const [ width, height ] = entrySize.map( ( d ) => Math.round( d ) );
+	return { width, height };
+};
+
+const RESIZE_ELEMENT_STYLES = {
+	position: 'absolute',
+	top: 0,
+	left: 0,
+	right: 0,
+	bottom: 0,
+	pointerEvents: 'none',
+	opacity: 0,
+	overflow: 'hidden',
+	zIndex: -1,
+} as const;
+
+type ResizeElementProps = {
+	onResize: ( s: ObservedSize ) => void;
+};
+
+function ResizeElement( { onResize }: ResizeElementProps ) {
+	const resizeElementRef = useResizeObserver( ( entries ) => {
+		const newSize = extractSize( entries.at( -1 )! ); // Entries are never empty.
+		onResize( newSize );
+	} );
+
+	return (
+		<div
+			ref={ resizeElementRef }
+			style={ RESIZE_ELEMENT_STYLES }
+			aria-hidden="true"
+		/>
+	);
+}
+
+function sizeEquals( a: ObservedSize, b: ObservedSize ) {
+	return a.width === b.width && a.height === b.height;
+}
+
+const NULL_SIZE: ObservedSize = { width: null, height: null };
+
+/**
+ * Hook which allows to listen to the resize event of any target element when it changes size.
+ * _Note: `useResizeObserver` will report `null` sizes until after first render.
+ *
+ * @example
+ *
+ * ```js
+ * const App = () => {
+ * 	const [ resizeListener, sizes ] = useResizeObserver();
+ *
+ * 	return (
+ * 		<div>
+ * 			{ resizeListener }
+ * 			Your content here
+ * 		</div>
+ * 	);
+ * };
+ * ```
+ */
+export default function useLegacyResizeObserver(): [
+	ReactElement,
+	ObservedSize,
+] {
+	const [ size, setSize ] = useState( NULL_SIZE );
+
+	// Using a ref to track the previous width / height to avoid unnecessary renders.
+	const previousSizeRef = useRef( NULL_SIZE );
+
+	const handleResize = useCallback( ( newSize: ObservedSize ) => {
+		if ( ! sizeEquals( previousSizeRef.current, newSize ) ) {
+			previousSizeRef.current = newSize;
+			setSize( newSize );
+		}
+	}, [] );
+
+	const resizeElement = <ResizeElement onResize={ handleResize } />;
+	return [ resizeElement, size ];
+}
diff --git a/packages/compose/src/hooks/use-resize-observer/legacy/test/index.native.js b/packages/compose/src/hooks/use-resize-observer/legacy/test/index.native.js
new file mode 100644
index 00000000000000..8ff90d0c778fd4
--- /dev/null
+++ b/packages/compose/src/hooks/use-resize-observer/legacy/test/index.native.js
@@ -0,0 +1,46 @@
+/**
+ * External dependencies
+ */
+import { render, fireEvent } from 'test/helpers';
+import { View } from 'react-native';
+
+/**
+ * Internal dependencies
+ */
+import useResizeObserver from '..';
+
+const TestComponent = ( { onLayout } ) => {
+	const [ resizeObserver, sizes ] = useResizeObserver();
+
+	return (
+		<View testID="test-component" sizes={ sizes } onLayout={ onLayout }>
+			{ resizeObserver }
+		</View>
+	);
+};
+
+describe( 'useResizeObserver()', () => {
+	it( 'should return "{ width: 300, height: 500 }"', () => {
+		const mockNativeEvent = {
+			nativeEvent: {
+				layout: {
+					width: 300,
+					height: 500,
+				},
+			},
+		};
+
+		const { getByTestId } = render(
+			<TestComponent onLayout={ mockNativeEvent } />
+		);
+
+		const resizeObserver = getByTestId( 'resize-observer' );
+		fireEvent( resizeObserver, 'layout', mockNativeEvent );
+
+		const testComponent = getByTestId( 'test-component' );
+		expect( testComponent.props.sizes ).toMatchObject( {
+			width: 300,
+			height: 500,
+		} );
+	} );
+} );
diff --git a/packages/compose/src/hooks/use-resize-observer/test/index.native.js b/packages/compose/src/hooks/use-resize-observer/test/index.native.js
deleted file mode 100644
index 6370b3f9cd054b..00000000000000
--- a/packages/compose/src/hooks/use-resize-observer/test/index.native.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * External dependencies
- */
-import { render, fireEvent } from 'test/helpers';
-import { View } from 'react-native';
-
-/**
- * Internal dependencies
- */
-import useResizeObserver from '../';
-
-const TestComponent = ( { onLayout } ) => {
-	const [ resizeObserver, sizes ] = useResizeObserver();
-
-	return (
-		<View testID="test-component" sizes={ sizes } onLayout={ onLayout }>
-			{ resizeObserver }
-		</View>
-	);
-};
-
-describe( 'useResizeObserver()', () => {
-	it( 'should return "{ width: 300, height: 500 }"', () => {
-		const mockNativeEvent = {
-			nativeEvent: {
-				layout: {
-					width: 300,
-					height: 500,
-				},
-			},
-		};
-
-		const { getByTestId } = render(
-			<TestComponent onLayout={ mockNativeEvent } />
-		);
-
-		const resizeObserver = getByTestId( 'resize-observer' );
-		fireEvent( resizeObserver, 'layout', mockNativeEvent );
-
-		const testComponent = getByTestId( 'test-component' );
-		expect( testComponent.props.sizes ).toMatchObject( {
-			width: 300,
-			height: 500,
-		} );
-	} );
-} );
diff --git a/packages/compose/src/hooks/use-resize-observer/use-resize-observer.ts b/packages/compose/src/hooks/use-resize-observer/use-resize-observer.ts
new file mode 100644
index 00000000000000..4c1031b9839dc3
--- /dev/null
+++ b/packages/compose/src/hooks/use-resize-observer/use-resize-observer.ts
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { useRef } from '@wordpress/element';
+/**
+ * Internal dependencies
+ */
+import useEvent from '../use-event';
+
+// This is the current implementation of `useResizeObserver`.
+//
+// The legacy implementation is still supported for backwards compatibility.
+// This is achieved by overloading the exported function with both signatures,
+// and detecting which API is being used at runtime.
+export function useResizeObserver< T extends HTMLElement >(
+	callback: ResizeObserverCallback,
+	resizeObserverOptions: ResizeObserverOptions = {}
+): ( element?: T | null ) => void {
+	const callbackEvent = useEvent( callback );
+
+	const observedElementRef = useRef< T | null >();
+	const resizeObserverRef = useRef< ResizeObserver >();
+	return useEvent( ( element?: T | null ) => {
+		if ( element === observedElementRef.current ) {
+			return;
+		}
+
+		// Set up `ResizeObserver`.
+		resizeObserverRef.current ??= new ResizeObserver( callbackEvent );
+		const { current: resizeObserver } = resizeObserverRef;
+
+		// Unobserve previous element.
+		if ( observedElementRef.current ) {
+			resizeObserver.unobserve( observedElementRef.current );
+		}
+
+		// Observe new element.
+		observedElementRef.current = element;
+		if ( element ) {
+			resizeObserver.observe( element, resizeObserverOptions );
+		}
+	} );
+}
diff --git a/packages/compose/src/hooks/use-throttle/index.js b/packages/compose/src/hooks/use-throttle/index.js
index 8cade9a8442ac8..4bf6cc6e85555a 100644
--- a/packages/compose/src/hooks/use-throttle/index.js
+++ b/packages/compose/src/hooks/use-throttle/index.js
@@ -19,7 +19,7 @@ import { throttle } from '../../utils/throttle';
  * including the function to throttle, so please wrap functions created on
  * render in components in `useCallback`.
  *
- * @see https://docs-lodash.com/v4/throttle/
+ * @see https://lodash.com/docs/4#throttle
  *
  * @template {(...args: any[]) => void} TFunc
  *
diff --git a/packages/compose/src/hooks/use-viewport-match/index.js b/packages/compose/src/hooks/use-viewport-match/index.js
index ebec934b480123..4186045f7d08c4 100644
--- a/packages/compose/src/hooks/use-viewport-match/index.js
+++ b/packages/compose/src/hooks/use-viewport-match/index.js
@@ -9,7 +9,7 @@ import { createContext, useContext } from '@wordpress/element';
 import useMediaQuery from '../use-media-query';
 
 /**
- * @typedef {"huge" | "wide" | "large" | "medium" | "small" | "mobile"} WPBreakpoint
+ * @typedef {"xhuge" | "huge" | "wide" | "xlarge" | "large" | "medium" | "small" | "mobile"} WPBreakpoint
  */
 
 /**
@@ -20,8 +20,10 @@ import useMediaQuery from '../use-media-query';
  * @type {Record<WPBreakpoint, number>}
  */
 const BREAKPOINTS = {
+	xhuge: 1920,
 	huge: 1440,
 	wide: 1280,
+	xlarge: 1080,
 	large: 960,
 	medium: 782,
 	small: 600,
diff --git a/packages/compose/src/index.js b/packages/compose/src/index.js
index 3d03463f490794..29a9aa61737440 100644
--- a/packages/compose/src/index.js
+++ b/packages/compose/src/index.js
@@ -4,6 +4,8 @@ export * from './utils/create-higher-order-component';
 export * from './utils/debounce';
 // The `throttle` helper and its types.
 export * from './utils/throttle';
+// The `ObservableMap` data structure
+export * from './utils/observable-map';
 
 // The `compose` and `pipe` helpers (inspired by `flowRight` and `flow` from Lodash).
 export { default as compose } from './higher-order/compose';
@@ -23,6 +25,7 @@ export { default as useCopyOnClick } from './hooks/use-copy-on-click';
 export { default as useCopyToClipboard } from './hooks/use-copy-to-clipboard';
 export { default as __experimentalUseDialog } from './hooks/use-dialog';
 export { default as useDisabled } from './hooks/use-disabled';
+export { default as useEvent } from './hooks/use-event';
 export { default as __experimentalUseDragging } from './hooks/use-dragging';
 export { default as useFocusOnMount } from './hooks/use-focus-on-mount';
 export { default as __experimentalUseFocusOutside } from './hooks/use-focus-outside';
@@ -46,3 +49,4 @@ export { default as useRefEffect } from './hooks/use-ref-effect';
 export { default as __experimentalUseDropZone } from './hooks/use-drop-zone';
 export { default as useFocusableIframe } from './hooks/use-focusable-iframe';
 export { default as __experimentalUseFixedWindowList } from './hooks/use-fixed-window-list';
+export { default as useObservableValue } from './hooks/use-observable-value';
diff --git a/packages/compose/src/index.native.js b/packages/compose/src/index.native.js
index a3f959e644f32a..4f3bf5f7603816 100644
--- a/packages/compose/src/index.native.js
+++ b/packages/compose/src/index.native.js
@@ -4,6 +4,8 @@ export * from './utils/create-higher-order-component';
 export * from './utils/debounce';
 // The `throttle` helper and its types.
 export * from './utils/throttle';
+// The `ObservableMap` data structure
+export * from './utils/observable-map';
 
 // The `compose` and `pipe` helpers (inspired by `flowRight` and `flow` from Lodash).
 export { default as compose } from './higher-order/compose';
@@ -17,6 +19,7 @@ export { default as withInstanceId } from './higher-order/with-instance-id';
 export { default as withSafeTimeout } from './higher-order/with-safe-timeout';
 export { default as withState } from './higher-order/with-state';
 export { default as withPreferredColorScheme } from './higher-order/with-preferred-color-scheme';
+export { default as withNetworkConnectivity } from './higher-order/with-network-connectivity';
 
 // Hooks.
 export { default as useConstrainedTabbing } from './hooks/use-constrained-tabbing';
@@ -37,3 +40,5 @@ export { default as useDebouncedInput } from './hooks/use-debounced-input';
 export { default as useThrottle } from './hooks/use-throttle';
 export { default as useMergeRefs } from './hooks/use-merge-refs';
 export { default as useRefEffect } from './hooks/use-ref-effect';
+export { default as useNetworkConnectivity } from './hooks/use-network-connectivity';
+export { default as useObservableValue } from './hooks/use-observable-value';
diff --git a/packages/compose/src/utils/debounce/index.ts b/packages/compose/src/utils/debounce/index.ts
index ea9d97050baa4a..d86fefeea8791c 100644
--- a/packages/compose/src/utils/debounce/index.ts
+++ b/packages/compose/src/utils/debounce/index.ts
@@ -59,7 +59,7 @@ export interface DebouncedFunc< T extends ( ...args: any[] ) => any > {
 	/**
 	 * Throw away any pending invocation of the debounced function.
 	 */
-	cancel(): void;
+	cancel: () => void;
 
 	/**
 	 * If there is a pending invocation of the debounced function, invoke it immediately and return
@@ -68,7 +68,7 @@ export interface DebouncedFunc< T extends ( ...args: any[] ) => any > {
 	 * Otherwise, return the value from the last invocation, or undefined if the debounced function
 	 * was never invoked.
 	 */
-	flush(): ReturnType< T > | undefined;
+	flush: () => ReturnType< T > | undefined;
 }
 
 /**
diff --git a/packages/compose/src/utils/observable-map/index.ts b/packages/compose/src/utils/observable-map/index.ts
new file mode 100644
index 00000000000000..904b8df7ec670c
--- /dev/null
+++ b/packages/compose/src/utils/observable-map/index.ts
@@ -0,0 +1,61 @@
+export type ObservableMap< K, V > = {
+	get: ( name: K ) => V | undefined;
+	set: ( name: K, value: V ) => void;
+	delete: ( name: K ) => void;
+	subscribe: ( name: K, listener: () => void ) => () => void;
+};
+
+/**
+ * A constructor (factory) for `ObservableMap`, a map-like key/value data structure
+ * where the individual entries are observable: using the `subscribe` method, you can
+ * subscribe to updates for a particular keys. Each subscriber always observes one
+ * specific key and is not notified about any unrelated changes (for different keys)
+ * in the `ObservableMap`.
+ *
+ * @template K The type of the keys in the map.
+ * @template V The type of the values in the map.
+ * @return   A new instance of the `ObservableMap` type.
+ */
+export function observableMap< K, V >(): ObservableMap< K, V > {
+	const map = new Map< K, V >();
+	const listeners = new Map< K, Set< () => void > >();
+
+	function callListeners( name: K ) {
+		const list = listeners.get( name );
+		if ( ! list ) {
+			return;
+		}
+		for ( const listener of list ) {
+			listener();
+		}
+	}
+
+	return {
+		get( name ) {
+			return map.get( name );
+		},
+		set( name, value ) {
+			map.set( name, value );
+			callListeners( name );
+		},
+		delete( name ) {
+			map.delete( name );
+			callListeners( name );
+		},
+		subscribe( name, listener ) {
+			let list = listeners.get( name );
+			if ( ! list ) {
+				list = new Set();
+				listeners.set( name, list );
+			}
+			list.add( listener );
+
+			return () => {
+				list.delete( listener );
+				if ( list.size === 0 ) {
+					listeners.delete( name );
+				}
+			};
+		},
+	};
+}
diff --git a/packages/compose/src/utils/observable-map/test/index.js b/packages/compose/src/utils/observable-map/test/index.js
new file mode 100644
index 00000000000000..5383189c106306
--- /dev/null
+++ b/packages/compose/src/utils/observable-map/test/index.js
@@ -0,0 +1,43 @@
+/**
+ * Internal dependencies
+ */
+import { observableMap } from '..';
+
+describe( 'ObservableMap', () => {
+	test( 'should observe individual values', () => {
+		const map = observableMap();
+
+		const listenerA = jest.fn();
+		const listenerB = jest.fn();
+
+		const unsubA = map.subscribe( 'a', listenerA );
+		const unsubB = map.subscribe( 'b', listenerB );
+
+		// check that setting `a` doesn't notify the `b` listener
+		map.set( 'a', 1 );
+		expect( listenerA ).toHaveBeenCalledTimes( 1 );
+		expect( listenerB ).toHaveBeenCalledTimes( 0 );
+
+		// check that setting `b` doesn't notify the `a` listener
+		map.set( 'b', 2 );
+		expect( listenerA ).toHaveBeenCalledTimes( 1 );
+		expect( listenerB ).toHaveBeenCalledTimes( 1 );
+
+		// check that `delete` triggers notifications, too
+		map.delete( 'a' );
+		expect( listenerA ).toHaveBeenCalledTimes( 2 );
+		expect( listenerB ).toHaveBeenCalledTimes( 1 );
+
+		// check that the subscription survived the `delete`
+		map.set( 'a', 2 );
+		expect( listenerA ).toHaveBeenCalledTimes( 3 );
+		expect( listenerB ).toHaveBeenCalledTimes( 1 );
+
+		// check that unsubscription really works
+		unsubA();
+		unsubB();
+		map.set( 'a', 3 );
+		expect( listenerA ).toHaveBeenCalledTimes( 3 );
+		expect( listenerB ).toHaveBeenCalledTimes( 1 );
+	} );
+} );
diff --git a/packages/compose/tsconfig.json b/packages/compose/tsconfig.json
index a1ea50bcc54be1..90ab223f044987 100644
--- a/packages/compose/tsconfig.json
+++ b/packages/compose/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/core-commands/.npmrc b/packages/core-commands/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/core-commands/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/core-commands/CHANGELOG.md b/packages/core-commands/CHANGELOG.md
index e090ad810fc529..83b809ad526302 100644
--- a/packages/core-commands/CHANGELOG.md
+++ b/packages/core-commands/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 1.10.0 (2024-10-16)
+
+## 1.9.0 (2024-10-03)
+
+## 1.8.0 (2024-09-19)
+
+## 1.7.0 (2024-09-05)
+
+## 1.6.0 (2024-08-21)
+
+## 1.5.0 (2024-08-07)
+
+## 1.4.0 (2024-07-24)
+
+## 1.3.0 (2024-07-10)
+
+## 1.2.0 (2024-06-26)
+
+## 1.1.0 (2024-06-15)
+
+## 1.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 0.27.0 (2024-05-16)
+
+## 0.26.0 (2024-05-02)
+
+## 0.25.0 (2024-04-19)
+
+## 0.24.0 (2024-04-03)
+
+## 0.23.0 (2024-03-21)
+
+## 0.22.0 (2024-03-06)
+
+## 0.21.0 (2024-02-21)
+
+## 0.20.0 (2024-02-09)
+
+## 0.19.0 (2024-01-24)
+
+## 0.18.0 (2024-01-10)
+
+## 0.17.0 (2023-12-13)
+
 ## 0.16.0 (2023-11-29)
 
 ## 0.15.0 (2023-11-16)
@@ -32,4 +80,4 @@
 
 ## 0.2.0 (2023-05-10)
 
-Initial release.
\ No newline at end of file
+Initial release.
diff --git a/packages/core-commands/package.json b/packages/core-commands/package.json
index 25d90652709643..adad0ee55afc23 100644
--- a/packages/core-commands/package.json
+++ b/packages/core-commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-commands",
-	"version": "0.16.0",
+	"version": "1.10.0",
 	"description": "WordPress core reusable commands.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,24 +19,28 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/commands": "file:../commands",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/router": "file:../router",
-		"@wordpress/url": "file:../url"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/block-editor": "*",
+		"@wordpress/commands": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/element": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/router": "*",
+		"@wordpress/url": "*"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -44,5 +48,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/core-commands/src/admin-navigation-commands.js b/packages/core-commands/src/admin-navigation-commands.js
index 0ba4df82920d9a..c0d8bb084b46ad 100644
--- a/packages/core-commands/src/admin-navigation-commands.js
+++ b/packages/core-commands/src/admin-navigation-commands.js
@@ -1,29 +1,94 @@
 /**
  * WordPress dependencies
  */
-import { useCommand } from '@wordpress/commands';
+import { useCommand, useCommandLoader } from '@wordpress/commands';
 import { __ } from '@wordpress/i18n';
-import { plus, symbol } from '@wordpress/icons';
-import { addQueryArgs, getPath } from '@wordpress/url';
+import { plus } from '@wordpress/icons';
+import { getPath } from '@wordpress/url';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useCallback, useMemo } from '@wordpress/element';
+import { store as noticesStore } from '@wordpress/notices';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
-import { useIsTemplatesAccessible, useIsBlockBasedTheme } from './hooks';
 import { unlock } from './lock-unlock';
 
 const { useHistory } = unlock( routerPrivateApis );
 
-export function useAdminNavigationCommands() {
-	const history = useHistory();
-	const isTemplatesAccessible = useIsTemplatesAccessible();
-	const isBlockBasedTheme = useIsBlockBasedTheme();
-
+function useAddNewPageCommand() {
 	const isSiteEditor = getPath( window.location.href )?.includes(
 		'site-editor.php'
 	);
+	const history = useHistory();
+	const isBlockBasedTheme = useSelect( ( select ) => {
+		return select( coreStore ).getCurrentTheme()?.is_block_theme;
+	}, [] );
+	const { saveEntityRecord } = useDispatch( coreStore );
+	const { createErrorNotice } = useDispatch( noticesStore );
+
+	const createPageEntity = useCallback(
+		async ( { close } ) => {
+			try {
+				const page = await saveEntityRecord(
+					'postType',
+					'page',
+					{
+						status: 'draft',
+					},
+					{
+						throwOnError: true,
+					}
+				);
+				if ( page?.id ) {
+					history.push( {
+						postId: page.id,
+						postType: 'page',
+						canvas: 'edit',
+					} );
+				}
+			} catch ( error ) {
+				const errorMessage =
+					error.message && error.code !== 'unknown_error'
+						? error.message
+						: __( 'An error occurred while creating the item.' );
+
+				createErrorNotice( errorMessage, {
+					type: 'snackbar',
+				} );
+			} finally {
+				close();
+			}
+		},
+		[ createErrorNotice, history, saveEntityRecord ]
+	);
+
+	const commands = useMemo( () => {
+		const addNewPage =
+			isSiteEditor && isBlockBasedTheme
+				? createPageEntity
+				: () =>
+						( document.location.href =
+							'post-new.php?post_type=page' );
+		return [
+			{
+				name: 'core/add-new-page',
+				label: __( 'Add new page' ),
+				icon: plus,
+				callback: addNewPage,
+			},
+		];
+	}, [ createPageEntity, isSiteEditor, isBlockBasedTheme ] );
+
+	return {
+		isLoading: false,
+		commands,
+	};
+}
 
+export function useAdminNavigationCommands() {
 	useCommand( {
 		name: 'core/add-new-post',
 		label: __( 'Add new post' ),
@@ -32,32 +97,9 @@ export function useAdminNavigationCommands() {
 			document.location.href = 'post-new.php';
 		},
 	} );
-	useCommand( {
+
+	useCommandLoader( {
 		name: 'core/add-new-page',
-		label: __( 'Add new page' ),
-		icon: plus,
-		callback: () => {
-			document.location.href = 'post-new.php?post_type=page';
-		},
-	} );
-	useCommand( {
-		name: 'core/manage-reusable-blocks',
-		label: __( 'Patterns' ),
-		icon: symbol,
-		callback: ( { close } ) => {
-			if ( isTemplatesAccessible && isBlockBasedTheme ) {
-				const args = {
-					path: '/patterns',
-				};
-				if ( isSiteEditor ) {
-					history.push( args );
-				} else {
-					document.location = addQueryArgs( 'site-editor.php', args );
-				}
-				close();
-			} else {
-				document.location.href = 'edit.php?post_type=wp_block';
-			}
-		},
+		hook: useAddNewPageCommand,
 	} );
 }
diff --git a/packages/core-commands/src/hooks.js b/packages/core-commands/src/hooks.js
deleted file mode 100644
index 6d744e3223234d..00000000000000
--- a/packages/core-commands/src/hooks.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { store as coreStore } from '@wordpress/core-data';
-import { useSelect } from '@wordpress/data';
-
-export function useIsTemplatesAccessible() {
-	return useSelect(
-		( select ) => select( coreStore ).canUser( 'read', 'templates' ),
-		[]
-	);
-}
-
-export function useIsBlockBasedTheme() {
-	return useSelect(
-		( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,
-		[]
-	);
-}
diff --git a/packages/core-commands/src/lock-unlock.js b/packages/core-commands/src/lock-unlock.js
index 6f0712a8069fdd..de47c0eeb81552 100644
--- a/packages/core-commands/src/lock-unlock.js
+++ b/packages/core-commands/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/core-commands'
 	);
diff --git a/packages/core-commands/src/site-editor-navigation-commands.js b/packages/core-commands/src/site-editor-navigation-commands.js
index 45d2dc6c47ad77..4679d4d1523c89 100644
--- a/packages/core-commands/src/site-editor-navigation-commands.js
+++ b/packages/core-commands/src/site-editor-navigation-commands.js
@@ -3,28 +3,30 @@
  */
 import { useCommandLoader } from '@wordpress/commands';
 import { __ } from '@wordpress/i18n';
-import { useMemo } from '@wordpress/element';
+import { useMemo, useEffect, useState } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import {
 	post,
 	page,
 	layout,
+	symbol,
 	symbolFilled,
 	styles,
 	navigation,
 } from '@wordpress/icons';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-import { getQueryArg, addQueryArgs, getPath } from '@wordpress/url';
+import { addQueryArgs, getPath } from '@wordpress/url';
+import { useDebounce } from '@wordpress/compose';
+import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Internal dependencies
  */
-import { useIsTemplatesAccessible, useIsBlockBasedTheme } from './hooks';
 import { unlock } from './lock-unlock';
 import { orderEntityRecordsBySearch } from './utils/order-entity-records-by-search';
 
-const { useHistory, useLocation } = unlock( routerPrivateApis );
+const { useHistory } = unlock( routerPrivateApis );
 
 const icons = {
 	post,
@@ -33,17 +35,47 @@ const icons = {
 	wp_template_part: symbolFilled,
 };
 
+function useDebouncedValue( value ) {
+	const [ debouncedValue, setDebouncedValue ] = useState( '' );
+	const debounced = useDebounce( setDebouncedValue, 250 );
+
+	useEffect( () => {
+		debounced( value );
+		return () => debounced.cancel();
+	}, [ debounced, value ] );
+
+	return debouncedValue;
+}
+
 const getNavigationCommandLoaderPerPostType = ( postType ) =>
 	function useNavigationCommandLoader( { search } ) {
 		const history = useHistory();
-		const isBlockBasedTheme = useIsBlockBasedTheme();
+		const { isBlockBasedTheme, canCreateTemplate } = useSelect(
+			( select ) => {
+				return {
+					isBlockBasedTheme:
+						select( coreStore ).getCurrentTheme()?.is_block_theme,
+					canCreateTemplate: select( coreStore ).canUser( 'create', {
+						kind: 'postType',
+						name: 'wp_template',
+					} ),
+				};
+			},
+			[]
+		);
+		const delayedSearch = useDebouncedValue( search );
 		const { records, isLoading } = useSelect(
 			( select ) => {
-				const { getEntityRecords } = select( coreStore );
+				if ( ! delayedSearch ) {
+					return {
+						isLoading: false,
+					};
+				}
+
 				const query = {
-					search: !! search ? search : undefined,
+					search: delayedSearch,
 					per_page: 10,
-					orderby: search ? 'relevance' : 'date',
+					orderby: 'relevance',
 					status: [
 						'publish',
 						'future',
@@ -53,14 +85,18 @@ const getNavigationCommandLoaderPerPostType = ( postType ) =>
 					],
 				};
 				return {
-					records: getEntityRecords( 'postType', postType, query ),
+					records: select( coreStore ).getEntityRecords(
+						'postType',
+						postType,
+						query
+					),
 					isLoading: ! select( coreStore ).hasFinishedResolution(
 						'getEntityRecords',
 						[ 'postType', postType, query ]
 					),
 				};
 			},
-			[ search ]
+			[ delayedSearch ]
 		);
 
 		const commands = useMemo( () => {
@@ -69,12 +105,13 @@ const getNavigationCommandLoaderPerPostType = ( postType ) =>
 					name: postType + '-' + record.id,
 					searchLabel: record.title?.rendered + ' ' + record.id,
 					label: record.title?.rendered
-						? record.title?.rendered
+						? decodeEntities( record.title?.rendered )
 						: __( '(no title)' ),
 					icon: icons[ postType ],
 				};
 
 				if (
+					! canCreateTemplate ||
 					postType === 'post' ||
 					( postType === 'page' && ! isBlockBasedTheme )
 				) {
@@ -95,14 +132,6 @@ const getNavigationCommandLoaderPerPostType = ( postType ) =>
 				const isSiteEditor = getPath( window.location.href )?.includes(
 					'site-editor.php'
 				);
-				const extraArgs = isSiteEditor
-					? {
-							canvas: getQueryArg(
-								window.location.href,
-								'canvas'
-							),
-					  }
-					: {};
 
 				return {
 					...command,
@@ -110,7 +139,7 @@ const getNavigationCommandLoaderPerPostType = ( postType ) =>
 						const args = {
 							postType,
 							postId: record.id,
-							...extraArgs,
+							canvas: 'edit',
 						};
 						const targetUrl = addQueryArgs(
 							'site-editor.php',
@@ -125,7 +154,7 @@ const getNavigationCommandLoaderPerPostType = ( postType ) =>
 					},
 				};
 			} );
-		}, [ records, isBlockBasedTheme, history ] );
+		}, [ canCreateTemplate, records, isBlockBasedTheme, history ] );
 
 		return {
 			commands,
@@ -136,15 +165,19 @@ const getNavigationCommandLoaderPerPostType = ( postType ) =>
 const getNavigationCommandLoaderPerTemplate = ( templateType ) =>
 	function useNavigationCommandLoader( { search } ) {
 		const history = useHistory();
-		const location = useLocation();
-
-		const isPatternsPage =
-			location?.params?.path === '/patterns' ||
-			location?.params?.postType === 'wp_block';
-		const didAccessPatternsPage =
-			!! location?.params?.didAccessPatternsPage;
-
-		const isBlockBasedTheme = useIsBlockBasedTheme();
+		const { isBlockBasedTheme, canCreateTemplate } = useSelect(
+			( select ) => {
+				return {
+					isBlockBasedTheme:
+						select( coreStore ).getCurrentTheme()?.is_block_theme,
+					canCreateTemplate: select( coreStore ).canUser( 'create', {
+						kind: 'postType',
+						name: templateType,
+					} ),
+				};
+			},
+			[]
+		);
 		const { records, isLoading } = useSelect( ( select ) => {
 			const { getEntityRecords } = select( coreStore );
 			const query = { per_page: -1 };
@@ -168,36 +201,57 @@ const getNavigationCommandLoaderPerTemplate = ( templateType ) =>
 
 		const commands = useMemo( () => {
 			if (
-				! isBlockBasedTheme &&
-				! templateType === 'wp_template_part'
+				! canCreateTemplate ||
+				( ! isBlockBasedTheme && ! templateType === 'wp_template_part' )
 			) {
 				return [];
 			}
-			return orderedRecords.map( ( record ) => {
-				const isSiteEditor = getPath( window.location.href )?.includes(
-					'site-editor.php'
-				);
-				const extraArgs = isSiteEditor
-					? { canvas: getQueryArg( window.location.href, 'canvas' ) }
-					: {};
+			const isSiteEditor = getPath( window.location.href )?.includes(
+				'site-editor.php'
+			);
+			const result = [];
+			result.push(
+				...orderedRecords.map( ( record ) => {
+					return {
+						name: templateType + '-' + record.id,
+						searchLabel: record.title?.rendered + ' ' + record.id,
+						label: record.title?.rendered
+							? record.title?.rendered
+							: __( '(no title)' ),
+						icon: icons[ templateType ],
+						callback: ( { close } ) => {
+							const args = {
+								postType: templateType,
+								postId: record.id,
+								canvas: 'edit',
+							};
+							const targetUrl = addQueryArgs(
+								'site-editor.php',
+								args
+							);
+							if ( isSiteEditor ) {
+								history.push( args );
+							} else {
+								document.location = targetUrl;
+							}
+							close();
+						},
+					};
+				} )
+			);
 
-				return {
-					name: templateType + '-' + record.id,
-					searchLabel: record.title?.rendered + ' ' + record.id,
-					label: record.title?.rendered
-						? record.title?.rendered
-						: __( '(no title)' ),
-					icon: icons[ templateType ],
+			if (
+				orderedRecords?.length > 0 &&
+				templateType === 'wp_template_part'
+			) {
+				result.push( {
+					name: 'core/edit-site/open-template-parts',
+					label: __( 'Template parts' ),
+					icon: symbolFilled,
 					callback: ( { close } ) => {
 						const args = {
-							postType: templateType,
-							postId: record.id,
-							didAccessPatternsPage:
-								! isBlockBasedTheme &&
-								( isPatternsPage || didAccessPatternsPage )
-									? 1
-									: undefined,
-							...extraArgs,
+							postType: 'wp_template_part',
+							categoryId: 'all-parts',
 						};
 						const targetUrl = addQueryArgs(
 							'site-editor.php',
@@ -210,9 +264,10 @@ const getNavigationCommandLoaderPerTemplate = ( templateType ) =>
 						}
 						close();
 					},
-				};
-			} );
-		}, [ isBlockBasedTheme, orderedRecords, history ] );
+				} );
+			}
+			return result;
+		}, [ canCreateTemplate, isBlockBasedTheme, orderedRecords, history ] );
 
 		return {
 			commands,
@@ -234,89 +289,118 @@ function useSiteEditorBasicNavigationCommands() {
 	const isSiteEditor = getPath( window.location.href )?.includes(
 		'site-editor.php'
 	);
-	const isTemplatesAccessible = useIsTemplatesAccessible();
-	const isBlockBasedTheme = useIsBlockBasedTheme();
+	const { isBlockBasedTheme, canCreateTemplate } = useSelect( ( select ) => {
+		return {
+			isBlockBasedTheme:
+				select( coreStore ).getCurrentTheme()?.is_block_theme,
+			canCreateTemplate: select( coreStore ).canUser( 'create', {
+				kind: 'postType',
+				name: 'wp_template',
+			} ),
+		};
+	}, [] );
 	const commands = useMemo( () => {
 		const result = [];
 
-		if ( ! isTemplatesAccessible || ! isBlockBasedTheme ) {
-			return result;
-		}
+		if ( canCreateTemplate && isBlockBasedTheme ) {
+			result.push( {
+				name: 'core/edit-site/open-navigation',
+				label: __( 'Navigation' ),
+				icon: navigation,
+				callback: ( { close } ) => {
+					const args = {
+						postType: 'wp_navigation',
+					};
+					const targetUrl = addQueryArgs( 'site-editor.php', args );
+					if ( isSiteEditor ) {
+						history.push( args );
+					} else {
+						document.location = targetUrl;
+					}
+					close();
+				},
+			} );
 
-		result.push( {
-			name: 'core/edit-site/open-navigation',
-			label: __( 'Navigation' ),
-			icon: navigation,
-			callback: ( { close } ) => {
-				const args = {
-					path: '/navigation',
-				};
-				const targetUrl = addQueryArgs( 'site-editor.php', args );
-				if ( isSiteEditor ) {
-					history.push( args );
-				} else {
-					document.location = targetUrl;
-				}
-				close();
-			},
-		} );
+			result.push( {
+				name: 'core/edit-site/open-styles',
+				label: __( 'Styles' ),
+				icon: styles,
+				callback: ( { close } ) => {
+					const args = {
+						path: '/wp_global_styles',
+					};
+					const targetUrl = addQueryArgs( 'site-editor.php', args );
+					if ( isSiteEditor ) {
+						history.push( args );
+					} else {
+						document.location = targetUrl;
+					}
+					close();
+				},
+			} );
 
-		result.push( {
-			name: 'core/edit-site/open-styles',
-			label: __( 'Styles' ),
-			icon: styles,
-			callback: ( { close } ) => {
-				const args = {
-					path: '/wp_global_styles',
-				};
-				const targetUrl = addQueryArgs( 'site-editor.php', args );
-				if ( isSiteEditor ) {
-					history.push( args );
-				} else {
-					document.location = targetUrl;
-				}
-				close();
-			},
-		} );
+			result.push( {
+				name: 'core/edit-site/open-pages',
+				label: __( 'Pages' ),
+				icon: page,
+				callback: ( { close } ) => {
+					const args = {
+						postType: 'page',
+					};
+					const targetUrl = addQueryArgs( 'site-editor.php', args );
+					if ( isSiteEditor ) {
+						history.push( args );
+					} else {
+						document.location = targetUrl;
+					}
+					close();
+				},
+			} );
 
-		result.push( {
-			name: 'core/edit-site/open-pages',
-			label: __( 'Pages' ),
-			icon: page,
-			callback: ( { close } ) => {
-				const args = {
-					path: '/page',
-				};
-				const targetUrl = addQueryArgs( 'site-editor.php', args );
-				if ( isSiteEditor ) {
-					history.push( args );
-				} else {
-					document.location = targetUrl;
-				}
-				close();
-			},
-		} );
+			result.push( {
+				name: 'core/edit-site/open-templates',
+				label: __( 'Templates' ),
+				icon: layout,
+				callback: ( { close } ) => {
+					const args = {
+						postType: 'wp_template',
+					};
+					const targetUrl = addQueryArgs( 'site-editor.php', args );
+					if ( isSiteEditor ) {
+						history.push( args );
+					} else {
+						document.location = targetUrl;
+					}
+					close();
+				},
+			} );
+		}
 
 		result.push( {
-			name: 'core/edit-site/open-templates',
-			label: __( 'Templates' ),
-			icon: layout,
+			name: 'core/edit-site/open-patterns',
+			label: __( 'Patterns' ),
+			icon: symbol,
 			callback: ( { close } ) => {
-				const args = {
-					path: '/wp_template',
-				};
-				const targetUrl = addQueryArgs( 'site-editor.php', args );
-				if ( isSiteEditor ) {
-					history.push( args );
+				if ( canCreateTemplate ) {
+					const args = {
+						postType: 'wp_block',
+					};
+					const targetUrl = addQueryArgs( 'site-editor.php', args );
+					if ( isSiteEditor ) {
+						history.push( args );
+					} else {
+						document.location = targetUrl;
+					}
+					close();
 				} else {
-					document.location = targetUrl;
+					// If a user cannot access the site editor
+					document.location.href = 'edit.php?post_type=wp_block';
 				}
-				close();
 			},
 		} );
 
 		return result;
-	}, [ history, isSiteEditor, isTemplatesAccessible, isBlockBasedTheme ] );
+	}, [ history, isSiteEditor, canCreateTemplate, isBlockBasedTheme ] );
 
 	return {
 		commands,
diff --git a/packages/core-data/.npmrc b/packages/core-data/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/core-data/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/core-data/CHANGELOG.md b/packages/core-data/CHANGELOG.md
index 12d2f6d3cac7bc..980f552ee0fca7 100644
--- a/packages/core-data/CHANGELOG.md
+++ b/packages/core-data/CHANGELOG.md
@@ -2,6 +2,55 @@
 
 ## Unreleased
 
+## 7.10.0 (2024-10-16)
+
+## 7.9.0 (2024-10-03)
+
+## 7.8.0 (2024-09-19)
+
+## 7.7.0 (2024-09-05)
+
+## 7.6.0 (2024-08-21)
+
+## 7.5.0 (2024-08-07)
+
+## 7.4.0 (2024-07-24)
+
+## 7.3.0 (2024-07-10)
+
+## 7.2.0 (2024-06-26)
+
+## 7.1.0 (2024-06-15)
+
+## 7.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 6.35.0 (2024-05-16)
+
+## 6.34.0 (2024-05-02)
+
+## 6.33.0 (2024-04-19)
+
+## 6.32.0 (2024-04-03)
+
+## 6.31.0 (2024-03-21)
+
+## 6.30.0 (2024-03-06)
+
+## 6.29.0 (2024-02-21)
+
+## 6.28.0 (2024-02-09)
+
+## 6.27.0 (2024-01-24)
+
+## 6.26.0 (2024-01-10)
+
+## 6.25.0 (2023-12-13)
+
 ## 6.24.0 (2023-11-29)
 
 ## 6.23.0 (2023-11-16)
@@ -10,7 +59,7 @@
 
 ## 6.21.0 (2023-10-18)
 
-## Enhancements
+### Enhancements
 
 -   Add `getEntityRecordsTotalItems` and `getEntityRecordsTotalPages` selectors. [#55164](https://github.com/WordPress/gutenberg/pull/55164).
 -   Revisions: add new selectors, `getRevisions` and `getRevision`, to fetch entity revisions. [#54046](https://github.com/WordPress/gutenberg/pull/54046).
@@ -75,7 +124,7 @@
 
 ### Breaking Changes
 
-–   Add TypeScript types to the built package (via "types": "build-types" in the package.json)
+– Add TypeScript types to the built package (via "types": "build-types" in the package.json)
 
 ## 4.14.0 (2022-08-24)
 
@@ -110,6 +159,7 @@
 ## 4.3.0 (2022-03-23)
 
 ### New Features
+
 -   The saveEntityRecord, saveEditedEntityRecord, and deleteEntityRecord actions now accept an optional throwOnError option (defaults to false). When set to true, any exceptions occurring when the action was executing are re-thrown, causing dispatch().saveEntityRecord() to reject with an error. ([#39258](https://github.com/WordPress/gutenberg/pull/39258))
 -   Added support for fetching block patterns and their categories, with the `getBlockPatterns` and `getBlockPatternCategories` selectors.
 
@@ -129,7 +179,7 @@
 
 ## 4.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -152,13 +202,13 @@
 
 ## 2.25.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the core data namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
 ## 2.21.0 (2020-09-03)
 
-### New Feature
+### New Features
 
 -   The `deleteEntityRecord` and `removeItems` actions have been added.
 -   The `isDeletingEntityRecord` and `getLastEntityDeleteError` selectors have been added.
@@ -166,7 +216,7 @@
 
 ## 2.3.0 (2019-05-21)
 
-### New features
+### New Features
 
 -   The `getAutosave`, `getAutosaves` and `getCurrentUser` selectors have been added.
 -   The `receiveAutosaves` and `receiveCurrentUser` actions have been added.
@@ -201,7 +251,7 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   `dispatch("core").receiveTerms` has been deprecated. Please use `dispatch("core").receiveEntityRecords` instead.
 -   `getCategories` resolvers has been deprecated. Please use `getEntityRecords` resolver instead.
diff --git a/packages/core-data/README.md b/packages/core-data/README.md
index 6677a32df08dc9..079f95ddbfc7a6 100644
--- a/packages/core-data/README.md
+++ b/packages/core-data/README.md
@@ -182,7 +182,7 @@ _Parameters_
 
 -   _kind_ `string`: Kind of the deleted entity.
 -   _name_ `string`: Name of the deleted entity.
--   _recordId_ `string`: Record ID of the deleted entity.
+-   _recordId_ `number|string`: Record ID of the deleted entity.
 -   _query_ `?Object`: Special query parameters for the DELETE API call.
 -   _options_ `[Object]`: Delete options.
 -   _options.\_\_unstableFetch_ `[Function]`: Internal use only. Function to call instead of `apiFetch()`. Must return a promise.
@@ -264,7 +264,7 @@ _Parameters_
 
 ### receiveThemeSupports
 
-> **Deprecated** since WP 5.9, this is not useful anymore, use the selector direclty.
+> **Deprecated** since WP 5.9, this is not useful anymore, use the selector directly.
 
 Returns an action object used in signalling that the index has been received.
 
@@ -299,7 +299,7 @@ _Parameters_
 -   _kind_ `string`: Kind of the entity.
 -   _name_ `string`: Name of the entity.
 -   _recordId_ `Object`: ID of the record.
--   _options_ `Object`: Saving options.
+-   _options_ `Object=`: Saving options.
 
 ### saveEntityRecord
 
@@ -339,7 +339,7 @@ _Parameters_
 
 -   _state_ `State`: Data state.
 -   _action_ `string`: Action to check. One of: 'create', 'read', 'update', 'delete'.
--   _resource_ `string`: REST resource to check, e.g. 'media' or 'posts'.
+-   _resource_ `string | EntityResource`: Entity resource to check. Accepts entity object `{ kind: 'root', name: 'media', id: 1 }` or REST base as a string - `media`.
 -   _id_ `EntityRecordKey`: Optional ID of the rest resource to check.
 
 _Returns_
@@ -471,7 +471,7 @@ _Parameters_
 
 _Returns_
 
--   `undefined< 'edit' >`: Current user object.
+-   `ET.User< 'edit' >`: Current user object.
 
 ### getDefaultTemplateId
 
@@ -499,7 +499,7 @@ _Parameters_
 
 _Returns_
 
--   `undefined< EntityRecord > | undefined`: The entity record, merged with its edits.
+-   `ET.Updatable< EntityRecord > | false`: The entity record, merged with its edits.
 
 ### getEmbedPreview
 
@@ -825,7 +825,7 @@ _Parameters_
 
 _Returns_
 
--   `undefined< 'edit' >[]`: Users list.
+-   `ET.User< 'edit' >[]`: Users list.
 
 ### hasEditsForEntityRecord
 
@@ -976,6 +976,47 @@ The following set of react hooks available to import from the `@wordpress/core-d
 
 <!-- START TOKEN(Autogenerated hooks|src/hooks/index.ts) -->
 
+### useEntityBlockEditor
+
+Hook that returns block content getters and setters for the nearest provided entity of the specified type.
+
+The return value has the shape `[ blocks, onInput, onChange ]`. `onInput` is for block changes that don't create undo levels or dirty the post, non-persistent changes, and `onChange` is for persistent changes. They map directly to the props of a `BlockEditorProvider` and are intended to be used with it, or similar components or hooks.
+
+_Parameters_
+
+-   _kind_ `string`: The entity kind.
+-   _name_ `string`: The entity name.
+-   _options_ `Object`:
+-   _options.id_ `[string]`: An entity ID to use instead of the context-provided one.
+
+_Returns_
+
+-   `[unknown[], Function, Function]`: The block array and setters.
+
+### useEntityId
+
+Hook that returns the ID for the nearest provided entity of the specified type.
+
+_Parameters_
+
+-   _kind_ `string`: The entity kind.
+-   _name_ `string`: The entity name.
+
+### useEntityProp
+
+Hook that returns the value and a setter for the specified property of the nearest provided entity of the specified type.
+
+_Parameters_
+
+-   _kind_ `string`: The entity kind.
+-   _name_ `string`: The entity name.
+-   _prop_ `string`: The property name.
+-   _\_id_ `[number|string]`: An entity ID to use instead of the context-provided one.
+
+_Returns_
+
+-   `[*, Function, *]`: An array where the first item is the property value, the second is the setter and the third is the full value object from REST API containing more information like `raw`, `rendered` and `protected` props.
+
 ### useEntityRecord
 
 Resolves the specified entity record.
@@ -1132,7 +1173,10 @@ _Usage_
 import { useResourcePermissions } from '@wordpress/core-data';
 
 function PagesList() {
-	const { canCreate, isResolving } = useResourcePermissions( 'pages' );
+	const { canCreate, isResolving } = useResourcePermissions( {
+		kind: 'postType',
+		name: 'page',
+	} );
 
 	if ( isResolving ) {
 		return 'Loading ...';
@@ -1155,7 +1199,11 @@ import { useResourcePermissions } from '@wordpress/core-data';
 
 function Page( { pageId } ) {
 	const { canCreate, canUpdate, canDelete, isResolving } =
-		useResourcePermissions( 'pages', pageId );
+		useResourcePermissions( {
+			kind: 'postType',
+			name: 'page',
+			id: pageId,
+		} );
 
 	if ( isResolving ) {
 		return 'Loading ...';
@@ -1181,8 +1229,8 @@ the store state using `canUser()`, or resolved if missing.
 
 _Parameters_
 
--   _resource_ `string`: The resource in question, e.g. media.
--   _id_ `IdType`: ID of a specific resource entry, if needed, e.g. 10.
+-   _resource_ `string | EntityResource`: Entity resource to check. Accepts entity object `{ kind: 'root', name: 'media', id: 1 }` or REST base as a string - `media`.
+-   _id_ `IdType`: Optional ID of the resource to check, e.g. 10. Note: This argument is discouraged when using an entity object as a resource to check permissions and will be ignored.
 
 _Returns_
 
diff --git a/packages/core-data/package.json b/packages/core-data/package.json
index 8998e8419bac7e..6b70fb0af3a8f4 100644
--- a/packages/core-data/package.json
+++ b/packages/core-data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "6.24.0",
+	"version": "7.10.0",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -30,27 +31,27 @@
 		"{src,build,build-module}/index.js"
 	],
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/element": "file:../element",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/rich-text": "file:../rich-text",
-		"@wordpress/sync": "file:../sync",
-		"@wordpress/undo-manager": "file:../undo-manager",
-		"@wordpress/url": "file:../url",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/element": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/is-shallow-equal": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/rich-text": "*",
+		"@wordpress/sync": "*",
+		"@wordpress/undo-manager": "*",
+		"@wordpress/url": "*",
+		"@wordpress/warning": "*",
 		"change-case": "^4.1.2",
 		"equivalent-key-map": "^0.2.2",
 		"fast-deep-equal": "^3.1.3",
 		"memize": "^2.1.0",
-		"rememo": "^4.0.2",
 		"uuid": "^9.0.1"
 	},
 	"peerDependencies": {
@@ -59,5 +60,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/core-data/src/actions.js b/packages/core-data/src/actions.js
index 49776d0562984f..e83ad02828cfe7 100644
--- a/packages/core-data/src/actions.js
+++ b/packages/core-data/src/actions.js
@@ -200,7 +200,7 @@ export function __experimentalReceiveThemeGlobalStyleVariations(
 /**
  * Returns an action object used in signalling that the index has been received.
  *
- * @deprecated since WP 5.9, this is not useful anymore, use the selector direclty.
+ * @deprecated since WP 5.9, this is not useful anymore, use the selector directly.
  *
  * @return {Object} Action object.
  */
@@ -265,17 +265,17 @@ export function receiveEmbedPreview( url, preview ) {
 /**
  * Action triggered to delete an entity record.
  *
- * @param {string}   kind                         Kind of the deleted entity.
- * @param {string}   name                         Name of the deleted entity.
- * @param {string}   recordId                     Record ID of the deleted entity.
- * @param {?Object}  query                        Special query parameters for the
- *                                                DELETE API call.
- * @param {Object}   [options]                    Delete options.
- * @param {Function} [options.__unstableFetch]    Internal use only. Function to
- *                                                call instead of `apiFetch()`.
- *                                                Must return a promise.
- * @param {boolean}  [options.throwOnError=false] If false, this action suppresses all
- *                                                the exceptions. Defaults to false.
+ * @param {string}        kind                         Kind of the deleted entity.
+ * @param {string}        name                         Name of the deleted entity.
+ * @param {number|string} recordId                     Record ID of the deleted entity.
+ * @param {?Object}       query                        Special query parameters for the
+ *                                                     DELETE API call.
+ * @param {Object}        [options]                    Delete options.
+ * @param {Function}      [options.__unstableFetch]    Internal use only. Function to
+ *                                                     call instead of `apiFetch()`.
+ *                                                     Must return a promise.
+ * @param {boolean}       [options.throwOnError=false] If false, this action suppresses all
+ *                                                     the exceptions. Defaults to false.
  */
 export const deleteEntityRecord =
 	(
@@ -286,13 +286,13 @@ export const deleteEntityRecord =
 		{ __unstableFetch = apiFetch, throwOnError = false } = {}
 	) =>
 	async ( { dispatch } ) => {
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
+		const configs = await dispatch( getOrLoadEntitiesConfig( kind, name ) );
 		const entityConfig = configs.find(
 			( config ) => config.kind === kind && config.name === name
 		);
 		let error;
 		let deletedRecord = false;
-		if ( ! entityConfig || entityConfig?.__experimentalNoFetch ) {
+		if ( ! entityConfig ) {
 			return;
 		}
 
@@ -396,7 +396,7 @@ export const editEntityRecord =
 			}, {} ),
 		};
 		if ( window.__experimentalEnableSync && entityConfig.syncConfig ) {
-			if ( process.env.IS_GUTENBERG_PLUGIN ) {
+			if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 				const objectId = entityConfig.getSyncObjectId( recordId );
 				getSyncProvider().update(
 					entityConfig.syncObjectType + '--edit',
@@ -503,11 +503,11 @@ export const saveEntityRecord =
 		} = {}
 	) =>
 	async ( { select, resolveSelect, dispatch } ) => {
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
+		const configs = await dispatch( getOrLoadEntitiesConfig( kind, name ) );
 		const entityConfig = configs.find(
 			( config ) => config.kind === kind && config.name === name
 		);
-		if ( ! entityConfig || entityConfig?.__experimentalNoFetch ) {
+		if ( ! entityConfig ) {
 			return;
 		}
 		const entityIdKey = entityConfig.key || DEFAULT_ENTITY_KEY;
@@ -598,10 +598,14 @@ export const saveEntityRecord =
 							return acc;
 						},
 						{
+							// Do not update the `status` if we have edited it when auto saving.
+							// It's very important to let the user explicitly save this change,
+							// because it can lead to unexpected results. An example would be to
+							// have a draft post and change the status to publish.
 							status:
 								data.status === 'auto-draft'
 									? 'draft'
-									: data.status,
+									: undefined,
 						}
 					);
 					updatedRecord = await __unstableFetch( {
@@ -769,10 +773,10 @@ export const __experimentalBatch =
 /**
  * Action triggered to save an entity record's edits.
  *
- * @param {string} kind     Kind of the entity.
- * @param {string} name     Name of the entity.
- * @param {Object} recordId ID of the record.
- * @param {Object} options  Saving options.
+ * @param {string}  kind     Kind of the entity.
+ * @param {string}  name     Name of the entity.
+ * @param {Object}  recordId ID of the record.
+ * @param {Object=} options  Saving options.
  */
 export const saveEditedEntityRecord =
 	( kind, name, recordId, options ) =>
@@ -780,7 +784,7 @@ export const saveEditedEntityRecord =
 		if ( ! select.hasEditsForEntityRecord( kind, name, recordId ) ) {
 			return;
 		}
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
+		const configs = await dispatch( getOrLoadEntitiesConfig( kind, name ) );
 		const entityConfig = configs.find(
 			( config ) => config.kind === kind && config.name === name
 		);
@@ -801,11 +805,11 @@ export const saveEditedEntityRecord =
 /**
  * Action triggered to save only specified properties for the entity.
  *
- * @param {string} kind        Kind of the entity.
- * @param {string} name        Name of the entity.
- * @param {Object} recordId    ID of the record.
- * @param {Array}  itemsToSave List of entity properties or property paths to save.
- * @param {Object} options     Saving options.
+ * @param {string}        kind        Kind of the entity.
+ * @param {string}        name        Name of the entity.
+ * @param {number|string} recordId    ID of the record.
+ * @param {Array}         itemsToSave List of entity properties or property paths to save.
+ * @param {Object}        options     Saving options.
  */
 export const __experimentalSaveSpecifiedEntityEdits =
 	( kind, name, recordId, itemsToSave, options ) =>
@@ -824,7 +828,7 @@ export const __experimentalSaveSpecifiedEntityEdits =
 			setNestedValue( editsToSave, item, getNestedValue( edits, item ) );
 		}
 
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
+		const configs = await dispatch( getOrLoadEntitiesConfig( kind, name ) );
 		const entityConfig = configs.find(
 			( config ) => config.kind === kind && config.name === name
 		);
@@ -884,6 +888,28 @@ export function receiveUserPermission( key, isAllowed ) {
 	};
 }
 
+/**
+ * Returns an action object used in signalling that the current user has
+ * permission to perform an action on a REST resource. Ignored from
+ * documentation as it's internal to the data store.
+ *
+ * @ignore
+ *
+ * @param {Object<string, boolean>} permissions An object where keys represent
+ *                                              actions and REST resources, and
+ *                                              values indicate whether the user
+ *                                              is allowed to perform the
+ *                                              action.
+ *
+ * @return {Object} Action object.
+ */
+export function receiveUserPermissions( permissions ) {
+	return {
+		type: 'RECEIVE_USER_PERMISSIONS',
+		permissions,
+	};
+}
+
 /**
  * Returns an action object used in signalling that the autosaves for a
  * post have been received.
@@ -948,7 +974,7 @@ export function receiveDefaultTemplateId( query, templateId ) {
 export const receiveRevisions =
 	( kind, name, recordKey, records, query, invalidateCache = false, meta ) =>
 	async ( { dispatch } ) => {
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
+		const configs = await dispatch( getOrLoadEntitiesConfig( kind, name ) );
 		const entityConfig = configs.find(
 			( config ) => config.kind === kind && config.name === name
 		);
diff --git a/packages/core-data/src/entities.js b/packages/core-data/src/entities.js
index a2c60c45aaa032..8d09402087cf90 100644
--- a/packages/core-data/src/entities.js
+++ b/packages/core-data/src/entities.js
@@ -8,6 +8,7 @@ import { capitalCase, pascalCase } from 'change-case';
  */
 import apiFetch from '@wordpress/api-fetch';
 import { __ } from '@wordpress/i18n';
+import { RichTextData } from '@wordpress/rich-text';
 
 /**
  * Internal dependencies
@@ -38,6 +39,9 @@ export const rootEntitiesConfig = [
 				'url',
 			].join( ',' ),
 		},
+		// The entity doesn't support selecting multiple records.
+		// The property is maintained for backward compatibility.
+		plural: '__unstableBases',
 		syncConfig: {
 			fetch: async () => {
 				return apiFetch( { path: '/' } );
@@ -57,33 +61,6 @@ export const rootEntitiesConfig = [
 		syncObjectType: 'root/base',
 		getSyncObjectId: () => 'index',
 	},
-	{
-		label: __( 'Site' ),
-		name: 'site',
-		kind: 'root',
-		baseURL: '/wp/v2/settings',
-		getTitle: ( record ) => {
-			return record?.title ?? __( 'Site Title' );
-		},
-		syncConfig: {
-			fetch: async () => {
-				return apiFetch( { path: '/wp/v2/settings' } );
-			},
-			applyChangesToDoc: ( doc, changes ) => {
-				const document = doc.getMap( 'document' );
-				Object.entries( changes ).forEach( ( [ key, value ] ) => {
-					if ( document.get( key ) !== value ) {
-						document.set( key, value );
-					}
-				} );
-			},
-			fromCRDTDoc: ( doc ) => {
-				return doc.getMap( 'document' ).toJSON();
-			},
-		},
-		syncObjectType: 'root/site',
-		getSyncObjectId: () => 'index',
-	},
 	{
 		label: __( 'Post Type' ),
 		name: 'postType',
@@ -91,6 +68,7 @@ export const rootEntitiesConfig = [
 		key: 'slug',
 		baseURL: '/wp/v2/types',
 		baseURLParams: { context: 'edit' },
+		plural: 'postTypes',
 		syncConfig: {
 			fetch: async ( id ) => {
 				return apiFetch( {
@@ -219,6 +197,7 @@ export const rootEntitiesConfig = [
 		kind: 'root',
 		baseURL: '/wp/v2/themes',
 		baseURLParams: { context: 'edit' },
+		plural: 'themes',
 		key: 'stylesheet',
 	},
 	{
@@ -227,6 +206,7 @@ export const rootEntitiesConfig = [
 		kind: 'root',
 		baseURL: '/wp/v2/plugins',
 		baseURLParams: { context: 'edit' },
+		plural: 'plugins',
 		key: 'plugin',
 	},
 	{
@@ -243,6 +223,12 @@ export const rootEntitiesConfig = [
 export const additionalEntityConfigLoaders = [
 	{ kind: 'postType', loadEntities: loadPostTypeEntities },
 	{ kind: 'taxonomy', loadEntities: loadTaxonomyEntities },
+	{
+		kind: 'root',
+		name: 'site',
+		plural: 'sites',
+		loadEntities: loadSiteEntity,
+	},
 ];
 
 /**
@@ -275,6 +261,29 @@ export const prePersistPostType = ( persistedRecord, edits ) => {
 	return newEdits;
 };
 
+const serialisableBlocksCache = new WeakMap();
+
+function makeBlockAttributesSerializable( attributes ) {
+	const newAttributes = { ...attributes };
+	for ( const [ key, value ] of Object.entries( attributes ) ) {
+		if ( value instanceof RichTextData ) {
+			newAttributes[ key ] = value.valueOf();
+		}
+	}
+	return newAttributes;
+}
+
+function makeBlocksSerializable( blocks ) {
+	return blocks.map( ( block ) => {
+		const { innerBlocks, attributes, ...rest } = block;
+		return {
+			...rest,
+			attributes: makeBlockAttributesSerializable( attributes ),
+			innerBlocks: makeBlocksSerializable( innerBlocks ),
+		};
+	} );
+}
+
 /**
  * Returns the list of post type entities.
  *
@@ -317,12 +326,23 @@ async function loadPostTypeEntities() {
 				},
 				applyChangesToDoc: ( doc, changes ) => {
 					const document = doc.getMap( 'document' );
+
 					Object.entries( changes ).forEach( ( [ key, value ] ) => {
-						if (
-							document.get( key ) !== value &&
-							typeof value !== 'function'
-						) {
-							document.set( key, value );
+						if ( typeof value !== 'function' ) {
+							if ( key === 'blocks' ) {
+								if ( ! serialisableBlocksCache.has( value ) ) {
+									serialisableBlocksCache.set(
+										value,
+										makeBlocksSerializable( value )
+									);
+								}
+
+								value = serialisableBlocksCache.get( value );
+							}
+
+							if ( document.get( key ) !== value ) {
+								document.set( key, value );
+							}
 						}
 					} );
 				},
@@ -366,39 +386,76 @@ async function loadTaxonomyEntities() {
 }
 
 /**
- * Returns the entity's getter method name given its kind and name.
+ * Returns the Site entity.
+ *
+ * @return {Promise} Entity promise
+ */
+async function loadSiteEntity() {
+	const entity = {
+		label: __( 'Site' ),
+		name: 'site',
+		kind: 'root',
+		baseURL: '/wp/v2/settings',
+		syncConfig: {
+			fetch: async () => {
+				return apiFetch( { path: '/wp/v2/settings' } );
+			},
+			applyChangesToDoc: ( doc, changes ) => {
+				const document = doc.getMap( 'document' );
+				Object.entries( changes ).forEach( ( [ key, value ] ) => {
+					if ( document.get( key ) !== value ) {
+						document.set( key, value );
+					}
+				} );
+			},
+			fromCRDTDoc: ( doc ) => {
+				return doc.getMap( 'document' ).toJSON();
+			},
+		},
+		syncObjectType: 'root/site',
+		getSyncObjectId: () => 'index',
+		meta: {},
+	};
+
+	const site = await apiFetch( {
+		path: entity.baseURL,
+		method: 'OPTIONS',
+	} );
+
+	const labels = {};
+	Object.entries( site?.schema?.properties ?? {} ).forEach(
+		( [ key, value ] ) => {
+			// Ignore properties `title` and `type` keys.
+			if ( typeof value === 'object' && value.title ) {
+				labels[ key ] = value.title;
+			}
+		}
+	);
+
+	return [ { ...entity, meta: { labels } } ];
+}
+
+/**
+ * Returns the entity's getter method name given its kind and name or plural name.
  *
  * @example
  * ```js
  * const nameSingular = getMethodName( 'root', 'theme', 'get' );
  * // nameSingular is getRootTheme
  *
- * const namePlural = getMethodName( 'root', 'theme', 'set' );
+ * const namePlural = getMethodName( 'root', 'themes', 'set' );
  * // namePlural is setRootThemes
  * ```
  *
- * @param {string}  kind      Entity kind.
- * @param {string}  name      Entity name.
- * @param {string}  prefix    Function prefix.
- * @param {boolean} usePlural Whether to use the plural form or not.
+ * @param {string} kind   Entity kind.
+ * @param {string} name   Entity name or plural name.
+ * @param {string} prefix Function prefix.
  *
  * @return {string} Method name
  */
-export const getMethodName = (
-	kind,
-	name,
-	prefix = 'get',
-	usePlural = false
-) => {
-	const entityConfig = rootEntitiesConfig.find(
-		( config ) => config.kind === kind && config.name === name
-	);
+export const getMethodName = ( kind, name, prefix = 'get' ) => {
 	const kindPrefix = kind === 'root' ? '' : pascalCase( kind );
-	const nameSuffix = pascalCase( name ) + ( usePlural ? 's' : '' );
-	const suffix =
-		usePlural && 'plural' in entityConfig && entityConfig?.plural
-			? pascalCase( entityConfig.plural )
-			: nameSuffix;
+	const suffix = pascalCase( name );
 	return `${ prefix }${ kindPrefix }${ suffix }`;
 };
 
@@ -412,19 +469,23 @@ function registerSyncConfigs( configs ) {
 }
 
 /**
- * Loads the kind entities into the store.
+ * Loads the entities into the store.
  *
- * @param {string} kind Kind
+ * Note: The `name` argument is used for `root` entities requiring additional server data.
  *
+ * @param {string} kind Kind
+ * @param {string} name Name
  * @return {(thunkArgs: object) => Promise<Array>} Entities
  */
 export const getOrLoadEntitiesConfig =
-	( kind ) =>
+	( kind, name ) =>
 	async ( { select, dispatch } ) => {
 		let configs = select.getEntitiesConfig( kind );
-		if ( configs && configs.length !== 0 ) {
+		const hasConfig = !! select.getEntityConfig( kind, name );
+
+		if ( configs?.length > 0 && hasConfig ) {
 			if ( window.__experimentalEnableSync ) {
-				if ( process.env.IS_GUTENBERG_PLUGIN ) {
+				if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 					registerSyncConfigs( configs );
 				}
 			}
@@ -432,16 +493,20 @@ export const getOrLoadEntitiesConfig =
 			return configs;
 		}
 
-		const loader = additionalEntityConfigLoaders.find(
-			( l ) => l.kind === kind
-		);
+		const loader = additionalEntityConfigLoaders.find( ( l ) => {
+			if ( ! name || ! l.name ) {
+				return l.kind === kind;
+			}
+
+			return l.kind === kind && l.name === name;
+		} );
 		if ( ! loader ) {
 			return [];
 		}
 
 		configs = await loader.loadEntities();
 		if ( window.__experimentalEnableSync ) {
-			if ( process.env.IS_GUTENBERG_PLUGIN ) {
+			if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 				registerSyncConfigs( configs );
 			}
 		}
diff --git a/packages/core-data/src/entity-context.js b/packages/core-data/src/entity-context.js
new file mode 100644
index 00000000000000..9a2e597527065a
--- /dev/null
+++ b/packages/core-data/src/entity-context.js
@@ -0,0 +1,6 @@
+/**
+ * WordPress dependencies
+ */
+import { createContext } from '@wordpress/element';
+
+export const EntityContext = createContext( {} );
diff --git a/packages/core-data/src/entity-provider.js b/packages/core-data/src/entity-provider.js
index 4b82b62e318bc9..322d53f7f3a29d 100644
--- a/packages/core-data/src/entity-provider.js
+++ b/packages/core-data/src/entity-provider.js
@@ -1,58 +1,12 @@
 /**
  * WordPress dependencies
  */
-import {
-	createContext,
-	useContext,
-	useCallback,
-	useMemo,
-} from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { parse, __unstableSerializeAndClean } from '@wordpress/blocks';
+import { useContext, useMemo } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import { STORE_NAME } from './name';
-import { updateFootnotesFromMeta } from './footnotes';
-
-/** @typedef {import('@wordpress/blocks').WPBlock} WPBlock */
-
-const EMPTY_ARRAY = [];
-
-/**
- * Internal dependencies
- */
-import { rootEntitiesConfig, additionalEntityConfigLoaders } from './entities';
-
-const entityContexts = {
-	...rootEntitiesConfig.reduce( ( acc, loader ) => {
-		if ( ! acc[ loader.kind ] ) {
-			acc[ loader.kind ] = {};
-		}
-		acc[ loader.kind ][ loader.name ] = {
-			context: createContext( undefined ),
-		};
-		return acc;
-	}, {} ),
-	...additionalEntityConfigLoaders.reduce( ( acc, loader ) => {
-		acc[ loader.kind ] = {};
-		return acc;
-	}, {} ),
-};
-const getEntityContext = ( kind, name ) => {
-	if ( ! entityContexts[ kind ] ) {
-		throw new Error( `Missing entity config for kind: ${ kind }.` );
-	}
-
-	if ( ! entityContexts[ kind ][ name ] ) {
-		entityContexts[ kind ][ name ] = {
-			context: createContext( undefined ),
-		};
-	}
-
-	return entityContexts[ kind ][ name ].context;
-};
+import { EntityContext } from './entity-context';
 
 /**
  * Context provider component for providing
@@ -68,169 +22,20 @@ const getEntityContext = ( kind, name ) => {
  *                   the entity's context provider.
  */
 export default function EntityProvider( { kind, type: name, id, children } ) {
-	const Provider = getEntityContext( kind, name ).Provider;
-	return <Provider value={ id }>{ children }</Provider>;
-}
-
-/**
- * Hook that returns the ID for the nearest
- * provided entity of the specified type.
- *
- * @param {string} kind The entity kind.
- * @param {string} name The entity name.
- */
-export function useEntityId( kind, name ) {
-	return useContext( getEntityContext( kind, name ) );
-}
-
-/**
- * Hook that returns the value and a setter for the
- * specified property of the nearest provided
- * entity of the specified type.
- *
- * @param {string} kind  The entity kind.
- * @param {string} name  The entity name.
- * @param {string} prop  The property name.
- * @param {string} [_id] An entity ID to use instead of the context-provided one.
- *
- * @return {[*, Function, *]} An array where the first item is the
- *                            property value, the second is the
- *                            setter and the third is the full value
- * 							  object from REST API containing more
- * 							  information like `raw`, `rendered` and
- * 							  `protected` props.
- */
-export function useEntityProp( kind, name, prop, _id ) {
-	const providerId = useEntityId( kind, name );
-	const id = _id ?? providerId;
-
-	const { value, fullValue } = useSelect(
-		( select ) => {
-			const { getEntityRecord, getEditedEntityRecord } =
-				select( STORE_NAME );
-			const record = getEntityRecord( kind, name, id ); // Trigger resolver.
-			const editedRecord = getEditedEntityRecord( kind, name, id );
-			return record && editedRecord
-				? {
-						value: editedRecord[ prop ],
-						fullValue: record[ prop ],
-				  }
-				: {};
-		},
-		[ kind, name, id, prop ]
+	const parent = useContext( EntityContext );
+	const childContext = useMemo(
+		() => ( {
+			...parent,
+			[ kind ]: {
+				...parent?.[ kind ],
+				[ name ]: id,
+			},
+		} ),
+		[ parent, kind, name, id ]
 	);
-	const { editEntityRecord } = useDispatch( STORE_NAME );
-	const setValue = useCallback(
-		( newValue ) => {
-			editEntityRecord( kind, name, id, {
-				[ prop ]: newValue,
-			} );
-		},
-		[ editEntityRecord, kind, name, id, prop ]
+	return (
+		<EntityContext.Provider value={ childContext }>
+			{ children }
+		</EntityContext.Provider>
 	);
-
-	return [ value, setValue, fullValue ];
-}
-
-/**
- * Hook that returns block content getters and setters for
- * the nearest provided entity of the specified type.
- *
- * The return value has the shape `[ blocks, onInput, onChange ]`.
- * `onInput` is for block changes that don't create undo levels
- * or dirty the post, non-persistent changes, and `onChange` is for
- * persistent changes. They map directly to the props of a
- * `BlockEditorProvider` and are intended to be used with it,
- * or similar components or hooks.
- *
- * @param {string} kind         The entity kind.
- * @param {string} name         The entity name.
- * @param {Object} options
- * @param {string} [options.id] An entity ID to use instead of the context-provided one.
- *
- * @return {[WPBlock[], Function, Function]} The block array and setters.
- */
-export function useEntityBlockEditor( kind, name, { id: _id } = {} ) {
-	const providerId = useEntityId( kind, name );
-	const id = _id ?? providerId;
-	const { content, editedBlocks, meta } = useSelect(
-		( select ) => {
-			if ( ! id ) {
-				return {};
-			}
-			const { getEditedEntityRecord } = select( STORE_NAME );
-			const editedRecord = getEditedEntityRecord( kind, name, id );
-			return {
-				editedBlocks: editedRecord.blocks,
-				content: editedRecord.content,
-				meta: editedRecord.meta,
-			};
-		},
-		[ kind, name, id ]
-	);
-	const { __unstableCreateUndoLevel, editEntityRecord } =
-		useDispatch( STORE_NAME );
-
-	const blocks = useMemo( () => {
-		if ( ! id ) {
-			return undefined;
-		}
-
-		if ( editedBlocks ) {
-			return editedBlocks;
-		}
-
-		return content && typeof content !== 'function'
-			? parse( content )
-			: EMPTY_ARRAY;
-	}, [ id, editedBlocks, content ] );
-
-	const updateFootnotes = useCallback(
-		( _blocks ) => updateFootnotesFromMeta( _blocks, meta ),
-		[ meta ]
-	);
-
-	const onChange = useCallback(
-		( newBlocks, options ) => {
-			const noChange = blocks === newBlocks;
-			if ( noChange ) {
-				return __unstableCreateUndoLevel( kind, name, id );
-			}
-			const { selection } = options;
-
-			// We create a new function here on every persistent edit
-			// to make sure the edit makes the post dirty and creates
-			// a new undo level.
-			const edits = {
-				selection,
-				content: ( { blocks: blocksForSerialization = [] } ) =>
-					__unstableSerializeAndClean( blocksForSerialization ),
-				...updateFootnotes( newBlocks ),
-			};
-
-			editEntityRecord( kind, name, id, edits, { isCached: false } );
-		},
-		[
-			kind,
-			name,
-			id,
-			blocks,
-			updateFootnotes,
-			__unstableCreateUndoLevel,
-			editEntityRecord,
-		]
-	);
-
-	const onInput = useCallback(
-		( newBlocks, options ) => {
-			const { selection } = options;
-			const footnotesChanges = updateFootnotes( newBlocks );
-			const edits = { selection, ...footnotesChanges };
-
-			editEntityRecord( kind, name, id, edits, { isCached: true } );
-		},
-		[ kind, name, id, updateFootnotes, editEntityRecord ]
-	);
-
-	return [ blocks, onInput, onChange ];
 }
diff --git a/packages/core-data/src/entity-types/attachment.ts b/packages/core-data/src/entity-types/attachment.ts
index 703a08611c0e2b..3d4e6814e29cf6 100644
--- a/packages/core-data/src/entity-types/attachment.ts
+++ b/packages/core-data/src/entity-types/attachment.ts
@@ -14,6 +14,40 @@ import type {
 
 import type { BaseEntityRecords as _BaseEntityRecords } from './base-entity-records';
 
+interface MediaDetails {
+	width: number;
+	height: number;
+	file: string;
+	filesize: number;
+	sizes: { [ key: string ]: Size };
+	image_meta: ImageMeta;
+	original_image?: string;
+}
+interface ImageMeta {
+	aperture: string;
+	credit: string;
+	camera: string;
+	caption: string;
+	created_timestamp: string;
+	copyright: string;
+	focal_length: string;
+	iso: string;
+	shutter_speed: string;
+	title: string;
+	orientation: string;
+	keywords: any[];
+}
+
+interface Size {
+	file: string;
+	width: number;
+	height: number;
+	filesize?: number;
+	mime_type: string;
+	source_url: string;
+	uncropped?: boolean;
+}
+
 declare module './base-entity-records' {
 	export namespace BaseEntityRecords {
 		export interface Attachment< C extends Context > {
@@ -124,7 +158,7 @@ declare module './base-entity-records' {
 			/**
 			 * Details about the media file, specific to its type.
 			 */
-			media_details: Record< string, string >;
+			media_details: MediaDetails;
 			/**
 			 * The ID for the associated post of the attachment.
 			 */
diff --git a/packages/core-data/src/entity-types/helpers.ts b/packages/core-data/src/entity-types/helpers.ts
index 943dece90e353c..5d5c5b44e64970 100644
--- a/packages/core-data/src/entity-types/helpers.ts
+++ b/packages/core-data/src/entity-types/helpers.ts
@@ -132,7 +132,7 @@ export interface RenderedText< C extends Context > {
  * For example, in the block editor, content.rendered could used as a visual preview, and
  * content.raw could be used to populate the code editor.
  *
- * When updating these rendered fields, Javascript is not be able to properly render arbitrary block
+ * When updating these rendered fields, JavaScript is not be able to properly render arbitrary block
  * markup. Therefore, it stores only the raw markup without the rendered part. And since that's a string,
  * the entire field becomes a string.
  *
diff --git a/packages/core-data/src/entity-types/menu-location.ts b/packages/core-data/src/entity-types/menu-location.ts
index 9bc3e5f7189b0e..d5e01f45738c6d 100644
--- a/packages/core-data/src/entity-types/menu-location.ts
+++ b/packages/core-data/src/entity-types/menu-location.ts
@@ -7,6 +7,7 @@ import type { BaseEntityRecords as _BaseEntityRecords } from './base-entity-reco
 
 declare module './base-entity-records' {
 	export namespace BaseEntityRecords {
+		/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 		export interface MenuLocation< C extends Context > {
 			/**
 			 * The name of the menu location.
diff --git a/packages/core-data/src/entity-types/plugin.ts b/packages/core-data/src/entity-types/plugin.ts
index 61954ec8535310..4ebea97c27996d 100644
--- a/packages/core-data/src/entity-types/plugin.ts
+++ b/packages/core-data/src/entity-types/plugin.ts
@@ -73,7 +73,7 @@ declare module './base-entity-records' {
 	}
 }
 
-export type PluginStatus = 'active' | 'inactive';
+export type PluginStatus = 'active' | 'inactive' | 'network-active';
 export type Plugin< C extends Context = 'edit' > = OmitNevers<
 	_BaseEntityRecords.Plugin< C >
 >;
diff --git a/packages/core-data/src/entity-types/settings.ts b/packages/core-data/src/entity-types/settings.ts
index 23bd223571d39e..2ce7eff89d8889 100644
--- a/packages/core-data/src/entity-types/settings.ts
+++ b/packages/core-data/src/entity-types/settings.ts
@@ -12,6 +12,7 @@ import type { BaseEntityRecords as _BaseEntityRecords } from './base-entity-reco
 
 declare module './base-entity-records' {
 	export namespace BaseEntityRecords {
+		/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 		export interface Settings< C extends Context > {
 			/**
 			 * What to show on the front page
diff --git a/packages/core-data/src/entity-types/theme.ts b/packages/core-data/src/entity-types/theme.ts
index 761c6461d4aca8..87074f674a0b6e 100644
--- a/packages/core-data/src/entity-types/theme.ts
+++ b/packages/core-data/src/entity-types/theme.ts
@@ -7,6 +7,7 @@ import type { BaseEntityRecords as _BaseEntityRecords } from './base-entity-reco
 
 declare module './base-entity-records' {
 	export namespace BaseEntityRecords {
+		/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 		export interface Theme< C extends Context > {
 			/**
 			 * The theme's stylesheet. This uniquely identifies the theme.
@@ -129,6 +130,10 @@ declare module './base-entity-records' {
 			 * Custom font sizes if defined by the theme.
 			 */
 			'editor-font-sizes': boolean | FontSize[];
+			/**
+			 * Custom spacing sizes if defined by the theme.
+			 */
+			'editor-spacing-sizes': boolean | SpacingSize[];
 			/**
 			 * Custom gradient presets if defined by the theme.
 			 */
@@ -212,6 +217,12 @@ declare module './base-entity-records' {
 			slug: string;
 		}
 
+		export interface SpacingSize {
+			name: string;
+			size: number;
+			slug: string;
+		}
+
 		export interface GradientPreset {
 			name: string;
 			gradient: string;
diff --git a/packages/core-data/src/entity-types/widget-type.ts b/packages/core-data/src/entity-types/widget-type.ts
index 29c47d5a9635c1..d1f0aa7f72578f 100644
--- a/packages/core-data/src/entity-types/widget-type.ts
+++ b/packages/core-data/src/entity-types/widget-type.ts
@@ -7,6 +7,7 @@ import type { BaseEntityRecords as _BaseEntityRecords } from './base-entity-reco
 
 declare module './base-entity-records' {
 	export namespace BaseEntityRecords {
+		/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 		export interface WidgetType< C extends Context > {
 			/**
 			 * Unique slug identifying the widget type.
diff --git a/packages/core-data/src/entity-types/wp-template.ts b/packages/core-data/src/entity-types/wp-template.ts
index ac6db09035f193..70d3e40c295dcf 100644
--- a/packages/core-data/src/entity-types/wp-template.ts
+++ b/packages/core-data/src/entity-types/wp-template.ts
@@ -73,6 +73,10 @@ declare module './base-entity-records' {
 			 * Post ID.
 			 */
 			wp_id: number;
+			/**
+			 * Plugin that registered the template.
+			 */
+			plugin?: string;
 			/**
 			 * Theme file exists.
 			 */
diff --git a/packages/core-data/src/fetch/__experimental-fetch-link-suggestions.js b/packages/core-data/src/fetch/__experimental-fetch-link-suggestions.js
deleted file mode 100644
index 3bba760b20c459..00000000000000
--- a/packages/core-data/src/fetch/__experimental-fetch-link-suggestions.js
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * WordPress dependencies
- */
-import apiFetch from '@wordpress/api-fetch';
-import { addQueryArgs } from '@wordpress/url';
-import { decodeEntities } from '@wordpress/html-entities';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Filters the search by type
- *
- * @typedef { 'attachment' | 'post' | 'term' | 'post-format' } WPLinkSearchType
- */
-
-/**
- * A link with an id may be of kind post-type or taxonomy
- *
- * @typedef { 'post-type' | 'taxonomy' } WPKind
- */
-
-/**
- * @typedef WPLinkSearchOptions
- *
- * @property {boolean}          [isInitialSuggestions] Displays initial search suggestions, when true.
- * @property {WPLinkSearchType} [type]                 Filters by search type.
- * @property {string}           [subtype]              Slug of the post-type or taxonomy.
- * @property {number}           [page]                 Which page of results to return.
- * @property {number}           [perPage]              Search results per page.
- */
-
-/**
- * @typedef WPLinkSearchResult
- *
- * @property {number} id     Post or term id.
- * @property {string} url    Link url.
- * @property {string} title  Title of the link.
- * @property {string} type   The taxonomy or post type slug or type URL.
- * @property {WPKind} [kind] Link kind of post-type or taxonomy
- */
-
-/**
- * @typedef WPLinkSearchResultAugments
- *
- * @property {{kind: WPKind}} [meta]    Contains kind information.
- * @property {WPKind}         [subtype] Optional subtype if it exists.
- */
-
-/**
- * @typedef {WPLinkSearchResult & WPLinkSearchResultAugments} WPLinkSearchResultAugmented
- */
-
-/**
- * @typedef WPEditorSettings
- *
- * @property {boolean} [ disablePostFormats ] Disables post formats, when true.
- */
-
-/**
- * Fetches link suggestions from the API.
- *
- * @async
- * @param {string}              search
- * @param {WPLinkSearchOptions} [searchOptions]
- * @param {WPEditorSettings}    [settings]
- *
- * @example
- * ```js
- * import { __experimentalFetchLinkSuggestions as fetchLinkSuggestions } from '@wordpress/core-data';
- *
- * //...
- *
- * export function initialize( id, settings ) {
- *
- * settings.__experimentalFetchLinkSuggestions = (
- *     search,
- *     searchOptions
- * ) => fetchLinkSuggestions( search, searchOptions, settings );
- * ```
- * @return {Promise< WPLinkSearchResult[] >} List of search suggestions
- */
-const fetchLinkSuggestions = async (
-	search,
-	searchOptions = {},
-	settings = {}
-) => {
-	const {
-		isInitialSuggestions = false,
-		initialSuggestionsSearchOptions = undefined,
-	} = searchOptions;
-
-	const { disablePostFormats = false } = settings;
-
-	let {
-		type = undefined,
-		subtype = undefined,
-		page = undefined,
-		perPage = isInitialSuggestions ? 3 : 20,
-	} = searchOptions;
-
-	/** @type {Promise<WPLinkSearchResult>[]} */
-	const queries = [];
-
-	if ( isInitialSuggestions && initialSuggestionsSearchOptions ) {
-		type = initialSuggestionsSearchOptions.type || type;
-		subtype = initialSuggestionsSearchOptions.subtype || subtype;
-		page = initialSuggestionsSearchOptions.page || page;
-		perPage = initialSuggestionsSearchOptions.perPage || perPage;
-	}
-
-	if ( ! type || type === 'post' ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					page,
-					per_page: perPage,
-					type: 'post',
-					subtype,
-				} ),
-			} )
-				.then( ( results ) => {
-					return results.map( ( result ) => {
-						return {
-							...result,
-							meta: { kind: 'post-type', subtype },
-						};
-					} );
-				} )
-				.catch( () => [] ) // Fail by returning no results.
-		);
-	}
-
-	if ( ! type || type === 'term' ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					page,
-					per_page: perPage,
-					type: 'term',
-					subtype,
-				} ),
-			} )
-				.then( ( results ) => {
-					return results.map( ( result ) => {
-						return {
-							...result,
-							meta: { kind: 'taxonomy', subtype },
-						};
-					} );
-				} )
-				.catch( () => [] ) // Fail by returning no results.
-		);
-	}
-
-	if ( ! disablePostFormats && ( ! type || type === 'post-format' ) ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/search', {
-					search,
-					page,
-					per_page: perPage,
-					type: 'post-format',
-					subtype,
-				} ),
-			} )
-				.then( ( results ) => {
-					return results.map( ( result ) => {
-						return {
-							...result,
-							meta: { kind: 'taxonomy', subtype },
-						};
-					} );
-				} )
-				.catch( () => [] ) // Fail by returning no results.
-		);
-	}
-
-	if ( ! type || type === 'attachment' ) {
-		queries.push(
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/media', {
-					search,
-					page,
-					per_page: perPage,
-				} ),
-			} )
-				.then( ( results ) => {
-					return results.map( ( result ) => {
-						return {
-							...result,
-							meta: { kind: 'media' },
-						};
-					} );
-				} )
-				.catch( () => [] ) // Fail by returning no results.
-		);
-	}
-
-	return Promise.all( queries ).then( ( results ) => {
-		return results
-			.reduce(
-				( /** @type {WPLinkSearchResult[]} */ accumulator, current ) =>
-					accumulator.concat( current ), // Flatten list.
-				[]
-			)
-			.filter(
-				/**
-				 * @param {{ id: number }} result
-				 */
-				( result ) => {
-					return !! result.id;
-				}
-			)
-			.slice( 0, perPage )
-			.map( ( /** @type {WPLinkSearchResultAugmented} */ result ) => {
-				const isMedia = result.type === 'attachment';
-
-				return {
-					id: result.id,
-					// @ts-ignore fix when we make this a TS file
-					url: isMedia ? result.source_url : result.url,
-					title:
-						decodeEntities(
-							isMedia
-								? // @ts-ignore fix when we make this a TS file
-								  result.title.rendered
-								: result.title || ''
-						) || __( '(no title)' ),
-					type: result.subtype || result.type,
-					kind: result?.meta?.kind,
-				};
-			} );
-	} );
-};
-
-export default fetchLinkSuggestions;
diff --git a/packages/core-data/src/fetch/__experimental-fetch-link-suggestions.ts b/packages/core-data/src/fetch/__experimental-fetch-link-suggestions.ts
new file mode 100644
index 00000000000000..e1a166ee272dbe
--- /dev/null
+++ b/packages/core-data/src/fetch/__experimental-fetch-link-suggestions.ts
@@ -0,0 +1,298 @@
+/**
+ * WordPress dependencies
+ */
+import apiFetch from '@wordpress/api-fetch';
+import { addQueryArgs } from '@wordpress/url';
+import { decodeEntities } from '@wordpress/html-entities';
+import { __ } from '@wordpress/i18n';
+
+export type SearchOptions = {
+	/**
+	 * Displays initial search suggestions, when true.
+	 */
+	isInitialSuggestions?: boolean;
+	/**
+	 * Search options for initial suggestions.
+	 */
+	initialSuggestionsSearchOptions?: Omit<
+		SearchOptions,
+		'isInitialSuggestions' | 'initialSuggestionsSearchOptions'
+	>;
+	/**
+	 * Filters by search type.
+	 */
+	type?: 'attachment' | 'post' | 'term' | 'post-format';
+	/**
+	 * Slug of the post-type or taxonomy.
+	 */
+	subtype?: string;
+	/**
+	 * Which page of results to return.
+	 */
+	page?: number;
+	/**
+	 * Search results per page.
+	 */
+	perPage?: number;
+};
+
+export type EditorSettings = {
+	/**
+	 * Disables post formats, when true.
+	 */
+	disablePostFormats?: boolean;
+};
+
+type SearchAPIResult = {
+	id: number;
+	title: string;
+	url: string;
+	type: string;
+	subtype: string;
+};
+
+type MediaAPIResult = {
+	id: number;
+	title: { rendered: string };
+	source_url: string;
+	type: string;
+};
+
+export type SearchResult = {
+	/**
+	 * Post or term id.
+	 */
+	id: number;
+	/**
+	 * Link url.
+	 */
+	url: string;
+	/**
+	 * Title of the link.
+	 */
+	title: string;
+	/**
+	 * The taxonomy or post type slug or type URL.
+	 */
+	type: string;
+	/**
+	 * Link kind of post-type or taxonomy
+	 */
+	kind?: string;
+};
+
+/**
+ * Fetches link suggestions from the WordPress API.
+ *
+ * WordPress does not support searching multiple tables at once, e.g. posts and terms, so we
+ * perform multiple queries at the same time and then merge the results together.
+ *
+ * @param search
+ * @param searchOptions
+ * @param editorSettings
+ *
+ * @example
+ * ```js
+ * import { __experimentalFetchLinkSuggestions as fetchLinkSuggestions } from '@wordpress/core-data';
+ *
+ * //...
+ *
+ * export function initialize( id, settings ) {
+ *
+ * settings.__experimentalFetchLinkSuggestions = (
+ *     search,
+ *     searchOptions
+ * ) => fetchLinkSuggestions( search, searchOptions, settings );
+ * ```
+ */
+export default async function fetchLinkSuggestions(
+	search: string,
+	searchOptions: SearchOptions = {},
+	editorSettings: EditorSettings = {}
+): Promise< SearchResult[] > {
+	const searchOptionsToUse =
+		searchOptions.isInitialSuggestions &&
+		searchOptions.initialSuggestionsSearchOptions
+			? {
+					...searchOptions,
+					...searchOptions.initialSuggestionsSearchOptions,
+			  }
+			: searchOptions;
+
+	const {
+		type,
+		subtype,
+		page,
+		perPage = searchOptions.isInitialSuggestions ? 3 : 20,
+	} = searchOptionsToUse;
+
+	const { disablePostFormats = false } = editorSettings;
+
+	const queries: Promise< SearchResult[] >[] = [];
+
+	if ( ! type || type === 'post' ) {
+		queries.push(
+			apiFetch< SearchAPIResult[] >( {
+				path: addQueryArgs( '/wp/v2/search', {
+					search,
+					page,
+					per_page: perPage,
+					type: 'post',
+					subtype,
+				} ),
+			} )
+				.then( ( results ) => {
+					return results.map( ( result ) => {
+						return {
+							id: result.id,
+							url: result.url,
+							title:
+								decodeEntities( result.title || '' ) ||
+								__( '(no title)' ),
+							type: result.subtype || result.type,
+							kind: 'post-type',
+						};
+					} );
+				} )
+				.catch( () => [] ) // Fail by returning no results.
+		);
+	}
+
+	if ( ! type || type === 'term' ) {
+		queries.push(
+			apiFetch< SearchAPIResult[] >( {
+				path: addQueryArgs( '/wp/v2/search', {
+					search,
+					page,
+					per_page: perPage,
+					type: 'term',
+					subtype,
+				} ),
+			} )
+				.then( ( results ) => {
+					return results.map( ( result ) => {
+						return {
+							id: result.id,
+							url: result.url,
+							title:
+								decodeEntities( result.title || '' ) ||
+								__( '(no title)' ),
+							type: result.subtype || result.type,
+							kind: 'taxonomy',
+						};
+					} );
+				} )
+				.catch( () => [] ) // Fail by returning no results.
+		);
+	}
+
+	if ( ! disablePostFormats && ( ! type || type === 'post-format' ) ) {
+		queries.push(
+			apiFetch< SearchAPIResult[] >( {
+				path: addQueryArgs( '/wp/v2/search', {
+					search,
+					page,
+					per_page: perPage,
+					type: 'post-format',
+					subtype,
+				} ),
+			} )
+				.then( ( results ) => {
+					return results.map( ( result ) => {
+						return {
+							id: result.id,
+							url: result.url,
+							title:
+								decodeEntities( result.title || '' ) ||
+								__( '(no title)' ),
+							type: result.subtype || result.type,
+							kind: 'taxonomy',
+						};
+					} );
+				} )
+				.catch( () => [] ) // Fail by returning no results.
+		);
+	}
+
+	if ( ! type || type === 'attachment' ) {
+		queries.push(
+			apiFetch< MediaAPIResult[] >( {
+				path: addQueryArgs( '/wp/v2/media', {
+					search,
+					page,
+					per_page: perPage,
+				} ),
+			} )
+				.then( ( results ) => {
+					return results.map( ( result ) => {
+						return {
+							id: result.id,
+							url: result.source_url,
+							title:
+								decodeEntities( result.title.rendered || '' ) ||
+								__( '(no title)' ),
+							type: result.type,
+							kind: 'media',
+						};
+					} );
+				} )
+				.catch( () => [] ) // Fail by returning no results.
+		);
+	}
+
+	const responses = await Promise.all( queries );
+
+	let results = responses.flat();
+	results = results.filter( ( result ) => !! result.id );
+	results = sortResults( results, search );
+	results = results.slice( 0, perPage );
+	return results;
+}
+
+/**
+ * Sort search results by relevance to the given query.
+ *
+ * Sorting is necessary as we're querying multiple endpoints and merging the results. For example
+ * a taxonomy title might be more relevant than a post title, but by default taxonomy results will
+ * be ordered after all the (potentially irrelevant) post results.
+ *
+ * We sort by scoring each result, where the score is the number of tokens in the title that are
+ * also in the search query, divided by the total number of tokens in the title. This gives us a
+ * score between 0 and 1, where 1 is a perfect match.
+ *
+ * @param results
+ * @param search
+ */
+export function sortResults( results: SearchResult[], search: string ) {
+	const searchTokens = tokenize( search );
+
+	const scores = {};
+	for ( const result of results ) {
+		if ( result.title ) {
+			const titleTokens = tokenize( result.title );
+			const matchingTokens = titleTokens.filter( ( titleToken ) =>
+				searchTokens.some( ( searchToken ) =>
+					titleToken.includes( searchToken )
+				)
+			);
+			scores[ result.id ] = matchingTokens.length / titleTokens.length;
+		} else {
+			scores[ result.id ] = 0;
+		}
+	}
+
+	return results.sort( ( a, b ) => scores[ b.id ] - scores[ a.id ] );
+}
+
+/**
+ * Turns text into an array of tokens, with whitespace and punctuation removed.
+ *
+ * For example, `"I'm having a ball."` becomes `[ "im", "having", "a", "ball" ]`.
+ *
+ * @param text
+ */
+export function tokenize( text: string ): string[] {
+	// \p{L} matches any kind of letter from any language.
+	// \p{N} matches any kind of numeric character.
+	return text.toLowerCase().match( /[\p{L}\p{N}]+/gu ) || [];
+}
diff --git a/packages/core-data/src/fetch/index.js b/packages/core-data/src/fetch/index.js
index 8d4d28e3b0db82..de45f3399dac87 100644
--- a/packages/core-data/src/fetch/index.js
+++ b/packages/core-data/src/fetch/index.js
@@ -1,2 +1,29 @@
+/**
+ * External dependencies
+ */
+import { camelCase } from 'change-case';
+
+/**
+ * WordPress dependencies
+ */
+import apiFetch from '@wordpress/api-fetch';
+
 export { default as __experimentalFetchLinkSuggestions } from './__experimental-fetch-link-suggestions';
 export { default as __experimentalFetchUrlData } from './__experimental-fetch-url-data';
+
+export async function fetchBlockPatterns() {
+	const restPatterns = await apiFetch( {
+		path: '/wp/v2/block-patterns/patterns',
+	} );
+	if ( ! restPatterns ) {
+		return [];
+	}
+	return restPatterns.map( ( pattern ) =>
+		Object.fromEntries(
+			Object.entries( pattern ).map( ( [ key, value ] ) => [
+				camelCase( key ),
+				value,
+			] )
+		)
+	);
+}
diff --git a/packages/core-data/src/fetch/test/__experimental-fetch-link-suggestions.js b/packages/core-data/src/fetch/test/__experimental-fetch-link-suggestions.js
index d283226cca0909..6878c74332c3d7 100644
--- a/packages/core-data/src/fetch/test/__experimental-fetch-link-suggestions.js
+++ b/packages/core-data/src/fetch/test/__experimental-fetch-link-suggestions.js
@@ -1,7 +1,11 @@
 /**
  * Internal dependencies
  */
-import fetchLinkSuggestions from '../__experimental-fetch-link-suggestions';
+import {
+	default as fetchLinkSuggestions,
+	sortResults,
+	tokenize,
+} from '../__experimental-fetch-link-suggestions';
 
 jest.mock( '@wordpress/api-fetch', () =>
 	jest.fn( ( { path } ) => {
@@ -317,3 +321,93 @@ describe( 'fetchLinkSuggestions', () => {
 		);
 	} );
 } );
+
+describe( 'sortResults', () => {
+	it( 'returns empty array for empty results', () => {
+		expect( sortResults( [], '' ) ).toEqual( [] );
+	} );
+
+	it( 'orders results', () => {
+		const results = [
+			{
+				id: 1,
+				title: 'How to get from Stockholm to Helsinki by boat',
+				url: 'http://wordpress.local/stockholm-helsinki-boat/',
+				type: 'page',
+				kind: 'post-type',
+			},
+			{
+				id: 2,
+				title: 'A day trip from Stockholm to Swedish countryside towns',
+				url: 'http://wordpress.local/day-trip-stockholm/',
+				type: 'page',
+				kind: 'post-type',
+			},
+			{
+				id: 3,
+				title: 'The art of packing lightly: How to travel with just a cabin bag',
+				url: 'http://wordpress.local/packing-lightly/',
+				type: 'page',
+				kind: 'post-type',
+			},
+			{
+				id: 4,
+				title: 'Tips for travel with a young baby',
+				url: 'http://wordpress.local/young-baby-tips/',
+				type: 'page',
+				kind: 'post-type',
+			},
+			{
+				id: 5,
+				title: '', // Test that empty titles don't cause an error.
+				url: 'http://wordpress.local/420/',
+				type: 'page',
+				kind: 'post-type',
+			},
+			{
+				id: 6,
+				title: 'City Guides',
+				url: 'http://wordpress.local/city-guides/',
+				type: 'category',
+				kind: 'taxonomy',
+			},
+			{
+				id: 7,
+				title: 'Travel Tips',
+				url: 'http://wordpress.local/travel-tips/',
+				type: 'category',
+				kind: 'taxonomy',
+			},
+		];
+		const order = sortResults( results, 'travel tips' ).map(
+			( result ) => result.id
+		);
+		expect( order ).toEqual( [
+			7, // exact match
+			4, // contains: travel, tips
+			3, // contains: travel
+			// same order as input:
+			1,
+			2,
+			5,
+			6,
+		] );
+	} );
+} );
+
+describe( 'tokenize', () => {
+	it( 'returns empty array for empty string', () => {
+		expect( tokenize( '' ) ).toEqual( [] );
+	} );
+
+	it( 'tokenizes a string', () => {
+		expect( tokenize( 'Hello, world!' ) ).toEqual( [ 'hello', 'world' ] );
+	} );
+
+	it( 'tokenizes non latin languages', () => {
+		expect( tokenize( 'こんにちは、世界！' ) ).toEqual( [
+			'こんにちは',
+			'世界',
+		] );
+	} );
+} );
diff --git a/packages/core-data/src/footnotes/get-footnotes-order.js b/packages/core-data/src/footnotes/get-footnotes-order.js
index 42adeed7621e8f..fcaeae660ec1aa 100644
--- a/packages/core-data/src/footnotes/get-footnotes-order.js
+++ b/packages/core-data/src/footnotes/get-footnotes-order.js
@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { create } from '@wordpress/rich-text';
-
 /**
  * Internal dependencies
  */
@@ -14,18 +9,16 @@ function getBlockFootnotesOrder( block ) {
 	if ( ! cache.has( block ) ) {
 		const order = [];
 		for ( const value of getRichTextValuesCached( block ) ) {
-			if ( ! value || ! value.includes( 'data-fn' ) ) {
+			if ( ! value ) {
 				continue;
 			}
 
 			// replacements is a sparse array, use forEach to skip empty slots.
-			create( { html: value } ).replacements.forEach(
-				( { type, attributes } ) => {
-					if ( type === 'core/footnote' ) {
-						order.push( attributes[ 'data-fn' ] );
-					}
+			value.replacements.forEach( ( { type, attributes } ) => {
+				if ( type === 'core/footnote' ) {
+					order.push( attributes[ 'data-fn' ] );
 				}
-			);
+			} );
 		}
 		cache.set( block, order );
 	}
diff --git a/packages/core-data/src/footnotes/get-rich-text-values-cached.js b/packages/core-data/src/footnotes/get-rich-text-values-cached.js
index 06a01c5ef63fdd..a5c2d258108612 100644
--- a/packages/core-data/src/footnotes/get-rich-text-values-cached.js
+++ b/packages/core-data/src/footnotes/get-rich-text-values-cached.js
@@ -6,7 +6,7 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 /**
  * Internal dependencies
  */
-import { unlock } from '../private-apis';
+import { unlock } from '../lock-unlock';
 
 // TODO: The following line should have been:
 //
diff --git a/packages/core-data/src/footnotes/index.js b/packages/core-data/src/footnotes/index.js
index fa1c5fad5c7e7d..3c267ae6f92cf2 100644
--- a/packages/core-data/src/footnotes/index.js
+++ b/packages/core-data/src/footnotes/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { create, toHTMLString } from '@wordpress/rich-text';
+import { RichTextData, create, toHTMLString } from '@wordpress/rich-text';
 
 /**
  * Internal dependencies
@@ -12,17 +12,23 @@ let oldFootnotes = {};
 
 export function updateFootnotesFromMeta( blocks, meta ) {
 	const output = { blocks };
-	if ( ! meta ) return output;
+	if ( ! meta ) {
+		return output;
+	}
 
 	// If meta.footnotes is empty, it means the meta is not registered.
-	if ( meta.footnotes === undefined ) return output;
+	if ( meta.footnotes === undefined ) {
+		return output;
+	}
 
 	const newOrder = getFootnotesOrder( blocks );
 
 	const footnotes = meta.footnotes ? JSON.parse( meta.footnotes ) : [];
 	const currentOrder = footnotes.map( ( fn ) => fn.id );
 
-	if ( currentOrder.join( '' ) === newOrder.join( '' ) ) return output;
+	if ( currentOrder.join( '' ) === newOrder.join( '' ) ) {
+		return output;
+	}
 
 	const newFootnotes = newOrder.map(
 		( fnId ) =>
@@ -53,15 +59,20 @@ export function updateFootnotesFromMeta( blocks, meta ) {
 				continue;
 			}
 
-			if ( typeof value !== 'string' ) {
+			// To do, remove support for string values?
+			if (
+				typeof value !== 'string' &&
+				! ( value instanceof RichTextData )
+			) {
 				continue;
 			}
 
-			if ( value.indexOf( 'data-fn' ) === -1 ) {
-				continue;
-			}
+			const richTextValue =
+				typeof value === 'string'
+					? RichTextData.fromHTMLString( value )
+					: new RichTextData( value );
 
-			const richTextValue = create( { html: value } );
+			let hasFootnotes = false;
 
 			richTextValue.replacements.forEach( ( replacement ) => {
 				if ( replacement.type === 'core/footnote' ) {
@@ -72,13 +83,27 @@ export function updateFootnotesFromMeta( blocks, meta ) {
 						html: replacement.innerHTML,
 					} );
 					countValue.text = String( index + 1 );
+					countValue.formats = Array.from(
+						{ length: countValue.text.length },
+						() => countValue.formats[ 0 ]
+					);
+					countValue.replacements = Array.from(
+						{ length: countValue.text.length },
+						() => countValue.replacements[ 0 ]
+					);
 					replacement.innerHTML = toHTMLString( {
 						value: countValue,
 					} );
+					hasFootnotes = true;
 				}
 			} );
 
-			attributes[ key ] = toHTMLString( { value: richTextValue } );
+			if ( hasFootnotes ) {
+				attributes[ key ] =
+					typeof value === 'string'
+						? richTextValue.toHTMLString()
+						: richTextValue;
+			}
 		}
 
 		return attributes;
diff --git a/packages/core-data/src/hooks/index.ts b/packages/core-data/src/hooks/index.ts
index a12269616b2f0c..8e5210acdd448c 100644
--- a/packages/core-data/src/hooks/index.ts
+++ b/packages/core-data/src/hooks/index.ts
@@ -10,3 +10,6 @@ export {
 	default as useResourcePermissions,
 	__experimentalUseResourcePermissions,
 } from './use-resource-permissions';
+export { default as useEntityBlockEditor } from './use-entity-block-editor';
+export { default as useEntityId } from './use-entity-id';
+export { default as useEntityProp } from './use-entity-prop';
diff --git a/packages/core-data/src/hooks/test/use-entity-record.js b/packages/core-data/src/hooks/test/use-entity-record.js
index fa1dea6df8146c..d83957abe06a1b 100644
--- a/packages/core-data/src/hooks/test/use-entity-record.js
+++ b/packages/core-data/src/hooks/test/use-entity-record.js
@@ -27,10 +27,11 @@ describe( 'useEntityRecord', () => {
 	} );
 
 	const TEST_RECORD = { id: 1, hello: 'world' };
+	const TEST_RECORD_RESPONSE = { json: () => Promise.resolve( TEST_RECORD ) };
 
 	it( 'resolves the entity record when missing from the state', async () => {
 		// Provide response
-		triggerFetch.mockImplementation( () => TEST_RECORD );
+		triggerFetch.mockImplementation( () => TEST_RECORD_RESPONSE );
 
 		let data;
 		const TestComponent = () => {
@@ -45,12 +46,13 @@ describe( 'useEntityRecord', () => {
 
 		expect( data ).toEqual( {
 			edit: expect.any( Function ),
-			editedRecord: {},
+			editedRecord: false,
 			hasEdits: false,
 			edits: {},
 			record: undefined,
 			save: expect.any( Function ),
 			hasResolved: false,
+			hasStarted: false,
 			isResolving: false,
 			status: 'IDLE',
 		} );
@@ -59,6 +61,7 @@ describe( 'useEntityRecord', () => {
 		await waitFor( () =>
 			expect( triggerFetch ).toHaveBeenCalledWith( {
 				path: '/wp/v2/widgets/1?context=edit',
+				parse: false,
 			} )
 		);
 
@@ -70,6 +73,7 @@ describe( 'useEntityRecord', () => {
 			record: { hello: 'world', id: 1 },
 			save: expect.any( Function ),
 			hasResolved: true,
+			hasStarted: true,
 			isResolving: false,
 			status: 'SUCCESS',
 		} );
@@ -77,7 +81,7 @@ describe( 'useEntityRecord', () => {
 
 	it( 'applies edits to the entity record', async () => {
 		// Provide response
-		triggerFetch.mockImplementation( () => TEST_RECORD );
+		triggerFetch.mockImplementation( () => TEST_RECORD_RESPONSE );
 
 		let widget;
 		const TestComponent = () => {
@@ -99,6 +103,7 @@ describe( 'useEntityRecord', () => {
 				record: { hello: 'world', id: 1 },
 				save: expect.any( Function ),
 				hasResolved: true,
+				hasStarted: true,
 				isResolving: false,
 				status: 'SUCCESS',
 			} )
@@ -116,7 +121,7 @@ describe( 'useEntityRecord', () => {
 	} );
 
 	it( 'does not resolve entity record when disabled via options', async () => {
-		triggerFetch.mockImplementation( () => TEST_RECORD );
+		triggerFetch.mockImplementation( () => TEST_RECORD_RESPONSE );
 
 		let data;
 		const TestComponent = ( { enabled } ) => {
@@ -129,7 +134,7 @@ describe( 'useEntityRecord', () => {
 			</RegistryProvider>
 		);
 
-		const { rerender } = render( <UI enabled={ true } /> );
+		const { rerender } = render( <UI enabled /> );
 
 		// A minimum delay for a fetch request. The same delay is used again as a control.
 		await act(
diff --git a/packages/core-data/src/hooks/test/use-entity-records.js b/packages/core-data/src/hooks/test/use-entity-records.js
index af490b65096290..f1d69e85a051dc 100644
--- a/packages/core-data/src/hooks/test/use-entity-records.js
+++ b/packages/core-data/src/hooks/test/use-entity-records.js
@@ -49,6 +49,7 @@ describe( 'useEntityRecords', () => {
 		expect( data ).toEqual( {
 			records: null,
 			hasResolved: false,
+			hasStarted: false,
 			isResolving: false,
 			status: 'IDLE',
 			totalItems: null,
@@ -65,10 +66,11 @@ describe( 'useEntityRecords', () => {
 		expect( data ).toEqual( {
 			records: TEST_RECORDS,
 			hasResolved: true,
+			hasStarted: true,
 			isResolving: false,
 			status: 'SUCCESS',
-			totalItems: null,
-			totalPages: null,
+			totalItems: 3,
+			totalPages: 1,
 		} );
 	} );
 } );
diff --git a/packages/core-data/src/hooks/test/use-query-select.js b/packages/core-data/src/hooks/test/use-query-select.js
index 52435f44eddfb3..894851f79a9c78 100644
--- a/packages/core-data/src/hooks/test/use-query-select.js
+++ b/packages/core-data/src/hooks/test/use-query-select.js
@@ -50,11 +50,9 @@ describe( 'useQuerySelect', () => {
 				<TestComponent keyName="foo" />
 			</RegistryProvider>
 		);
-		// 2 times expected
-		// - 1 for initial mount
-		// - 1 for after mount before subscription set.
-		expect( selectSpy ).toHaveBeenCalledTimes( 2 );
-		expect( TestComponent ).toHaveBeenCalledTimes( 2 );
+
+		expect( selectSpy ).toHaveBeenCalledTimes( 1 );
+		expect( TestComponent ).toHaveBeenCalledTimes( 1 );
 
 		// ensure expected state was rendered
 		expect( screen.getByText( 'bar' ) ).toBeInTheDocument();
@@ -81,10 +79,9 @@ describe( 'useQuerySelect', () => {
 		);
 
 		// ensure the selectors were properly memoized
-		expect( selectors ).toHaveLength( 4 );
+		expect( selectors ).toHaveLength( 2 );
 		expect( selectors[ 0 ] ).toHaveProperty( 'testSelector' );
 		expect( selectors[ 0 ] ).toBe( selectors[ 1 ] );
-		expect( selectors[ 1 ] ).toBe( selectors[ 2 ] );
 
 		// Re-render
 		render(
@@ -94,9 +91,10 @@ describe( 'useQuerySelect', () => {
 		);
 
 		// ensure we still got the memoized results after re-rendering
-		expect( selectors ).toHaveLength( 8 );
-		expect( selectors[ 3 ] ).toHaveProperty( 'testSelector' );
-		expect( selectors[ 5 ] ).toBe( selectors[ 6 ] );
+		expect( selectors ).toHaveLength( 4 );
+		expect( selectors[ 2 ] ).toHaveProperty( 'testSelector' );
+		expect( selectors[ 1 ] ).toBe( selectors[ 2 ] );
+		expect( selectors[ 2 ] ).toBe( selectors[ 3 ] );
 	} );
 
 	it( 'returns the expected "response" details – no resolvers and arguments', () => {
@@ -118,6 +116,7 @@ describe( 'useQuerySelect', () => {
 			data: 'bar',
 			isResolving: false,
 			hasResolved: false,
+			hasStarted: false,
 			status: 'IDLE',
 		} );
 	} );
@@ -167,6 +166,7 @@ describe( 'useQuerySelect', () => {
 			data: 10,
 			isResolving: false,
 			hasResolved: false,
+			hasStarted: false,
 			status: 'IDLE',
 		} );
 
@@ -182,6 +182,7 @@ describe( 'useQuerySelect', () => {
 				data: 15,
 				isResolving: false,
 				hasResolved: true,
+				hasStarted: true,
 				status: 'SUCCESS',
 			} )
 		);
diff --git a/packages/core-data/src/hooks/test/use-resource-permissions.js b/packages/core-data/src/hooks/test/use-resource-permissions.js
index b7b206c3a879b7..b1c43b7947874d 100644
--- a/packages/core-data/src/hooks/test/use-resource-permissions.js
+++ b/packages/core-data/src/hooks/test/use-resource-permissions.js
@@ -24,11 +24,9 @@ describe( 'useResourcePermissions', () => {
 		registry.register( coreDataStore );
 
 		triggerFetch.mockImplementation( () => ( {
-			headers: {
-				get: () => ( {
-					allow: 'POST',
-				} ),
-			},
+			headers: new Headers( {
+				allow: 'POST',
+			} ),
 		} ) );
 	} );
 
@@ -95,4 +93,97 @@ describe( 'useResourcePermissions', () => {
 			} )
 		);
 	} );
+
+	it( 'retrieves the relevant permissions for a id-less entity', async () => {
+		let data;
+		const TestComponent = () => {
+			data = useResourcePermissions( {
+				kind: 'root',
+				name: 'media',
+			} );
+			return <div />;
+		};
+		render(
+			<RegistryProvider value={ registry }>
+				<TestComponent />
+			</RegistryProvider>
+		);
+		expect( data ).toEqual( {
+			status: 'IDLE',
+			isResolving: false,
+			hasResolved: false,
+			canCreate: false,
+			canRead: false,
+		} );
+
+		await waitFor( () =>
+			expect( data ).toEqual( {
+				status: 'SUCCESS',
+				isResolving: false,
+				hasResolved: true,
+				canCreate: true,
+				canRead: false,
+			} )
+		);
+	} );
+
+	it( 'retrieves the relevant permissions for an entity', async () => {
+		let data;
+		const TestComponent = () => {
+			data = useResourcePermissions( {
+				kind: 'root',
+				name: 'media',
+				id: 1,
+			} );
+			return <div />;
+		};
+		render(
+			<RegistryProvider value={ registry }>
+				<TestComponent />
+			</RegistryProvider>
+		);
+		expect( data ).toEqual( {
+			status: 'IDLE',
+			isResolving: false,
+			hasResolved: false,
+			canCreate: false,
+			canRead: false,
+			canUpdate: false,
+			canDelete: false,
+		} );
+
+		await waitFor( () =>
+			expect( data ).toEqual( {
+				status: 'SUCCESS',
+				isResolving: false,
+				hasResolved: true,
+				canCreate: true,
+				canRead: false,
+				canUpdate: false,
+				canDelete: false,
+			} )
+		);
+	} );
+
+	it( 'should warn when called with incorrect arguments signature', () => {
+		const TestComponent = () => {
+			useResourcePermissions(
+				{
+					kind: 'root',
+					name: 'media',
+				},
+				1
+			);
+			return null;
+		};
+		render(
+			<RegistryProvider value={ registry }>
+				<TestComponent />
+			</RegistryProvider>
+		);
+
+		expect( console ).toHaveWarnedWith(
+			`When 'resource' is an entity object, passing 'id' as a separate argument isn't supported.`
+		);
+	} );
 } );
diff --git a/packages/core-data/src/hooks/use-entity-block-editor.js b/packages/core-data/src/hooks/use-entity-block-editor.js
new file mode 100644
index 00000000000000..df213898659e7d
--- /dev/null
+++ b/packages/core-data/src/hooks/use-entity-block-editor.js
@@ -0,0 +1,143 @@
+/**
+ * WordPress dependencies
+ */
+import { useCallback, useMemo } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { parse, __unstableSerializeAndClean } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { STORE_NAME } from '../name';
+import useEntityId from './use-entity-id';
+import { updateFootnotesFromMeta } from '../footnotes';
+
+const EMPTY_ARRAY = [];
+const parsedBlocksCache = new WeakMap();
+
+/**
+ * Hook that returns block content getters and setters for
+ * the nearest provided entity of the specified type.
+ *
+ * The return value has the shape `[ blocks, onInput, onChange ]`.
+ * `onInput` is for block changes that don't create undo levels
+ * or dirty the post, non-persistent changes, and `onChange` is for
+ * persistent changes. They map directly to the props of a
+ * `BlockEditorProvider` and are intended to be used with it,
+ * or similar components or hooks.
+ *
+ * @param {string} kind         The entity kind.
+ * @param {string} name         The entity name.
+ * @param {Object} options
+ * @param {string} [options.id] An entity ID to use instead of the context-provided one.
+ *
+ * @return {[unknown[], Function, Function]} The block array and setters.
+ */
+export default function useEntityBlockEditor( kind, name, { id: _id } = {} ) {
+	const providerId = useEntityId( kind, name );
+	const id = _id ?? providerId;
+	const { getEntityRecord, getEntityRecordEdits } = useSelect( STORE_NAME );
+	const { content, editedBlocks, meta } = useSelect(
+		( select ) => {
+			if ( ! id ) {
+				return {};
+			}
+			const { getEditedEntityRecord } = select( STORE_NAME );
+			const editedRecord = getEditedEntityRecord( kind, name, id );
+			return {
+				editedBlocks: editedRecord.blocks,
+				content: editedRecord.content,
+				meta: editedRecord.meta,
+			};
+		},
+		[ kind, name, id ]
+	);
+	const { __unstableCreateUndoLevel, editEntityRecord } =
+		useDispatch( STORE_NAME );
+
+	const blocks = useMemo( () => {
+		if ( ! id ) {
+			return undefined;
+		}
+
+		if ( editedBlocks ) {
+			return editedBlocks;
+		}
+
+		if ( ! content || typeof content !== 'string' ) {
+			return EMPTY_ARRAY;
+		}
+
+		// If there's an edit, cache the parsed blocks by the edit.
+		// If not, cache by the original enity record.
+		const edits = getEntityRecordEdits( kind, name, id );
+		const isUnedited = ! edits || ! Object.keys( edits ).length;
+		const cackeKey = isUnedited ? getEntityRecord( kind, name, id ) : edits;
+		let _blocks = parsedBlocksCache.get( cackeKey );
+
+		if ( ! _blocks ) {
+			_blocks = parse( content );
+			parsedBlocksCache.set( cackeKey, _blocks );
+		}
+
+		return _blocks;
+	}, [
+		kind,
+		name,
+		id,
+		editedBlocks,
+		content,
+		getEntityRecord,
+		getEntityRecordEdits,
+	] );
+
+	const onChange = useCallback(
+		( newBlocks, options ) => {
+			const noChange = blocks === newBlocks;
+			if ( noChange ) {
+				return __unstableCreateUndoLevel( kind, name, id );
+			}
+			const { selection, ...rest } = options;
+
+			// We create a new function here on every persistent edit
+			// to make sure the edit makes the post dirty and creates
+			// a new undo level.
+			const edits = {
+				selection,
+				content: ( { blocks: blocksForSerialization = [] } ) =>
+					__unstableSerializeAndClean( blocksForSerialization ),
+				...updateFootnotesFromMeta( newBlocks, meta ),
+			};
+
+			editEntityRecord( kind, name, id, edits, {
+				isCached: false,
+				...rest,
+			} );
+		},
+		[
+			kind,
+			name,
+			id,
+			blocks,
+			meta,
+			__unstableCreateUndoLevel,
+			editEntityRecord,
+		]
+	);
+
+	const onInput = useCallback(
+		( newBlocks, options ) => {
+			const { selection, ...rest } = options;
+			const footnotesChanges = updateFootnotesFromMeta( newBlocks, meta );
+			const edits = { selection, ...footnotesChanges };
+
+			editEntityRecord( kind, name, id, edits, {
+				isCached: true,
+				...rest,
+			} );
+		},
+		[ kind, name, id, meta, editEntityRecord ]
+	);
+
+	return [ blocks, onInput, onChange ];
+}
diff --git a/packages/core-data/src/hooks/use-entity-id.js b/packages/core-data/src/hooks/use-entity-id.js
new file mode 100644
index 00000000000000..7fb9d33fb7bdf3
--- /dev/null
+++ b/packages/core-data/src/hooks/use-entity-id.js
@@ -0,0 +1,21 @@
+/**
+ * WordPress dependencies
+ */
+import { useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { EntityContext } from '../entity-context';
+
+/**
+ * Hook that returns the ID for the nearest
+ * provided entity of the specified type.
+ *
+ * @param {string} kind The entity kind.
+ * @param {string} name The entity name.
+ */
+export default function useEntityId( kind, name ) {
+	const context = useContext( EntityContext );
+	return context?.[ kind ]?.[ name ];
+}
diff --git a/packages/core-data/src/hooks/use-entity-prop.js b/packages/core-data/src/hooks/use-entity-prop.js
new file mode 100644
index 00000000000000..ac2f22ace70792
--- /dev/null
+++ b/packages/core-data/src/hooks/use-entity-prop.js
@@ -0,0 +1,60 @@
+/**
+ * WordPress dependencies
+ */
+import { useCallback } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { STORE_NAME } from '../name';
+import useEntityId from './use-entity-id';
+
+/**
+ * Hook that returns the value and a setter for the
+ * specified property of the nearest provided
+ * entity of the specified type.
+ *
+ * @param {string}        kind  The entity kind.
+ * @param {string}        name  The entity name.
+ * @param {string}        prop  The property name.
+ * @param {number|string} [_id] An entity ID to use instead of the context-provided one.
+ *
+ * @return {[*, Function, *]} An array where the first item is the
+ *                            property value, the second is the
+ *                            setter and the third is the full value
+ * 							  object from REST API containing more
+ * 							  information like `raw`, `rendered` and
+ * 							  `protected` props.
+ */
+export default function useEntityProp( kind, name, prop, _id ) {
+	const providerId = useEntityId( kind, name );
+	const id = _id ?? providerId;
+
+	const { value, fullValue } = useSelect(
+		( select ) => {
+			const { getEntityRecord, getEditedEntityRecord } =
+				select( STORE_NAME );
+			const record = getEntityRecord( kind, name, id ); // Trigger resolver.
+			const editedRecord = getEditedEntityRecord( kind, name, id );
+			return record && editedRecord
+				? {
+						value: editedRecord[ prop ],
+						fullValue: record[ prop ],
+				  }
+				: {};
+		},
+		[ kind, name, id, prop ]
+	);
+	const { editEntityRecord } = useDispatch( STORE_NAME );
+	const setValue = useCallback(
+		( newValue ) => {
+			editEntityRecord( kind, name, id, {
+				[ prop ]: newValue,
+			} );
+		},
+		[ editEntityRecord, kind, name, id, prop ]
+	);
+
+	return [ value, setValue, fullValue ];
+}
diff --git a/packages/core-data/src/hooks/use-entity-records.ts b/packages/core-data/src/hooks/use-entity-records.ts
index 5d643ab8896925..e2659b88bc0198 100644
--- a/packages/core-data/src/hooks/use-entity-records.ts
+++ b/packages/core-data/src/hooks/use-entity-records.ts
@@ -4,6 +4,7 @@
 import { addQueryArgs } from '@wordpress/url';
 import deprecated from '@wordpress/deprecated';
 import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -12,6 +13,7 @@ import useQuerySelect from './use-query-select';
 import { store as coreStore } from '../';
 import type { Options } from './use-entity-record';
 import type { Status } from './constants';
+import { unlock } from '../lock-unlock';
 
 interface EntityRecordsResolution< RecordType > {
 	/** The requested entity record */
@@ -152,3 +154,51 @@ export function __experimentalUseEntityRecords(
 	} );
 	return useEntityRecords( kind, name, queryArgs, options );
 }
+
+export function useEntityRecordsWithPermissions< RecordType >(
+	kind: string,
+	name: string,
+	queryArgs: Record< string, unknown > = {},
+	options: Options = { enabled: true }
+): EntityRecordsResolution< RecordType > {
+	const entityConfig = useSelect(
+		( select ) => select( coreStore ).getEntityConfig( kind, name ),
+		[ kind, name ]
+	);
+	const { records: data, ...ret } = useEntityRecords(
+		kind,
+		name,
+		queryArgs,
+		options
+	);
+	const ids = useMemo(
+		() =>
+			data?.map(
+				// @ts-ignore
+				( record: RecordType ) => record[ entityConfig?.key ?? 'id' ]
+			) ?? [],
+		[ data, entityConfig?.key ]
+	);
+
+	const permissions = useSelect(
+		( select ) => {
+			const { getEntityRecordsPermissions } = unlock(
+				select( coreStore )
+			);
+			return getEntityRecordsPermissions( kind, name, ids );
+		},
+		[ ids, kind, name ]
+	);
+
+	const dataWithPermissions = useMemo(
+		() =>
+			data?.map( ( record, index ) => ( {
+				// @ts-ignore
+				...record,
+				permissions: permissions[ index ],
+			} ) ) ?? [],
+		[ data, permissions ]
+	);
+
+	return { records: dataWithPermissions, ...ret };
+}
diff --git a/packages/core-data/src/hooks/use-query-select.ts b/packages/core-data/src/hooks/use-query-select.ts
index 401c2e471dc3b2..abee3323895afd 100644
--- a/packages/core-data/src/hooks/use-query-select.ts
+++ b/packages/core-data/src/hooks/use-query-select.ts
@@ -21,7 +21,7 @@ interface QuerySelectResponse< Data > {
 	/** the requested selector return value */
 	data: Data;
 
-	/** is the record still being resolved? Via the `getIsResolving` meta-selector */
+	/** is the record still being resolved? Via the `isResolving` meta-selector */
 	isResolving: boolean;
 
 	/** was the resolution started? Via the `hasStartedResolution` meta-selector */
@@ -108,31 +108,36 @@ const enrichSelectors = memoize( ( ( selectors ) => {
 			get:
 				() =>
 				( ...args: unknown[] ) => {
-					const { getIsResolving, hasFinishedResolution } = selectors;
-					const isResolving = !! getIsResolving( selectorName, args );
-					const hasResolved =
-						! isResolving &&
-						hasFinishedResolution( selectorName, args );
 					const data = selectors[ selectorName ]( ...args );
+					const resolutionStatus = selectors.getResolutionState(
+						selectorName,
+						args
+					)?.status;
 
 					let status;
-					if ( isResolving ) {
-						status = Status.Resolving;
-					} else if ( hasResolved ) {
-						if ( data ) {
+					switch ( resolutionStatus ) {
+						case 'resolving':
+							status = Status.Resolving;
+							break;
+						case 'finished':
 							status = Status.Success;
-						} else {
+							break;
+						case 'error':
 							status = Status.Error;
-						}
-					} else {
-						status = Status.Idle;
+							break;
+						case undefined:
+							status = Status.Idle;
+							break;
 					}
 
 					return {
 						data,
 						status,
-						isResolving,
-						hasResolved,
+						isResolving: status === Status.Resolving,
+						hasStarted: status !== Status.Idle,
+						hasResolved:
+							status === Status.Success ||
+							status === Status.Error,
 					};
 				},
 		} );
diff --git a/packages/core-data/src/hooks/use-resource-permissions.ts b/packages/core-data/src/hooks/use-resource-permissions.ts
index 7da7189e2e5067..38dfc1ed77a3e6 100644
--- a/packages/core-data/src/hooks/use-resource-permissions.ts
+++ b/packages/core-data/src/hooks/use-resource-permissions.ts
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import deprecated from '@wordpress/deprecated';
+import warning from '@wordpress/warning';
 
 /**
  * Internal dependencies
@@ -41,20 +42,34 @@ type ResourcePermissionsResolution< IdType > = [
 		( IdType extends void ? SpecificResourcePermissionsResolution : {} ),
 ];
 
+type EntityResource = { kind: string; name: string; id?: string | number };
+
+function useResourcePermissions< IdType = void >(
+	resource: string,
+	id?: IdType
+): ResourcePermissionsResolution< IdType >;
+
+function useResourcePermissions< IdType = void >(
+	resource: EntityResource,
+	id?: never
+): ResourcePermissionsResolution< IdType >;
+
 /**
  * Resolves resource permissions.
  *
  * @since 6.1.0 Introduced in WordPress core.
  *
- * @param    resource The resource in question, e.g. media.
- * @param    id       ID of a specific resource entry, if needed, e.g. 10.
+ * @param    resource Entity resource to check. Accepts entity object `{ kind: 'root', name: 'media', id: 1 }`
+ *                    or REST base as a string - `media`.
+ * @param    id       Optional ID of the resource to check, e.g. 10. Note: This argument is discouraged
+ *                    when using an entity object as a resource to check permissions and will be ignored.
  *
  * @example
  * ```js
  * import { useResourcePermissions } from '@wordpress/core-data';
  *
  * function PagesList() {
- *   const { canCreate, isResolving } = useResourcePermissions( 'pages' );
+ *   const { canCreate, isResolving } = useResourcePermissions( { kind: 'postType', name: 'page' } );
  *
  *   if ( isResolving ) {
  *     return 'Loading ...';
@@ -82,7 +97,7 @@ type ResourcePermissionsResolution< IdType > = [
  *     canUpdate,
  *     canDelete,
  *     isResolving
- *   } = useResourcePermissions( 'pages', pageId );
+ *   } = useResourcePermissions( { kind: 'postType', name: 'page', id: pageId } );
  *
  *   if ( isResolving ) {
  *     return 'Loading ...';
@@ -109,15 +124,35 @@ type ResourcePermissionsResolution< IdType > = [
  * @return Entity records data.
  * @template IdType
  */
-export default function useResourcePermissions< IdType = void >(
-	resource: string,
+function useResourcePermissions< IdType = void >(
+	resource: string | EntityResource,
 	id?: IdType
 ): ResourcePermissionsResolution< IdType > {
+	// Serialize `resource` to a string that can be safely used as a React dep.
+	// We can't just pass `resource` as one of the deps, because if it is passed
+	// as an object literal, then it will be a different object on each call even
+	// if the values remain the same.
+	const isEntity = typeof resource === 'object';
+	const resourceAsString = isEntity ? JSON.stringify( resource ) : resource;
+
+	if ( isEntity && typeof id !== 'undefined' ) {
+		warning(
+			`When 'resource' is an entity object, passing 'id' as a separate argument isn't supported.`
+		);
+	}
+
 	return useQuerySelect(
 		( resolve ) => {
+			const hasId = isEntity ? !! resource.id : !! id;
 			const { canUser } = resolve( coreStore );
-			const create = canUser( 'create', resource );
-			if ( ! id ) {
+			const create = canUser(
+				'create',
+				isEntity
+					? { kind: resource.kind, name: resource.name }
+					: resource
+			);
+
+			if ( ! hasId ) {
 				const read = canUser( 'read', resource );
 
 				const isResolving = create.isResolving || read.isResolving;
@@ -168,10 +203,12 @@ export default function useResourcePermissions< IdType = void >(
 				canDelete: hasResolved && _delete.data,
 			};
 		},
-		[ resource, id ]
+		[ resourceAsString, id ]
 	);
 }
 
+export default useResourcePermissions;
+
 export function __experimentalUseResourcePermissions(
 	resource: string,
 	id?: unknown
diff --git a/packages/core-data/src/index.js b/packages/core-data/src/index.js
index 5b42b6731716ff..99507a914f377b 100644
--- a/packages/core-data/src/index.js
+++ b/packages/core-data/src/index.js
@@ -10,44 +10,59 @@ import reducer from './reducer';
 import * as selectors from './selectors';
 import * as privateSelectors from './private-selectors';
 import * as actions from './actions';
+import * as privateActions from './private-actions';
 import * as resolvers from './resolvers';
 import createLocksActions from './locks/actions';
-import { rootEntitiesConfig, getMethodName } from './entities';
+import {
+	rootEntitiesConfig,
+	additionalEntityConfigLoaders,
+	getMethodName,
+} from './entities';
 import { STORE_NAME } from './name';
-import { unlock } from './private-apis';
+import { unlock } from './lock-unlock';
 
 // The entity selectors/resolvers and actions are shortcuts to their generic equivalents
 // (getEntityRecord, getEntityRecords, updateEntityRecord, updateEntityRecords)
 // Instead of getEntityRecord, the consumer could use more user-friendly named selector: getPostType, getTaxonomy...
 // The "kind" and the "name" of the entity are combined to generate these shortcuts.
+const entitiesConfig = [
+	...rootEntitiesConfig,
+	...additionalEntityConfigLoaders.filter( ( config ) => !! config.name ),
+];
 
-const entitySelectors = rootEntitiesConfig.reduce( ( result, entity ) => {
-	const { kind, name } = entity;
+const entitySelectors = entitiesConfig.reduce( ( result, entity ) => {
+	const { kind, name, plural } = entity;
 	result[ getMethodName( kind, name ) ] = ( state, key, query ) =>
 		selectors.getEntityRecord( state, kind, name, key, query );
-	result[ getMethodName( kind, name, 'get', true ) ] = ( state, query ) =>
-		selectors.getEntityRecords( state, kind, name, query );
+
+	if ( plural ) {
+		result[ getMethodName( kind, plural, 'get' ) ] = ( state, query ) =>
+			selectors.getEntityRecords( state, kind, name, query );
+	}
 	return result;
 }, {} );
 
-const entityResolvers = rootEntitiesConfig.reduce( ( result, entity ) => {
-	const { kind, name } = entity;
+const entityResolvers = entitiesConfig.reduce( ( result, entity ) => {
+	const { kind, name, plural } = entity;
 	result[ getMethodName( kind, name ) ] = ( key, query ) =>
 		resolvers.getEntityRecord( kind, name, key, query );
-	const pluralMethodName = getMethodName( kind, name, 'get', true );
-	result[ pluralMethodName ] = ( ...args ) =>
-		resolvers.getEntityRecords( kind, name, ...args );
-	result[ pluralMethodName ].shouldInvalidate = ( action ) =>
-		resolvers.getEntityRecords.shouldInvalidate( action, kind, name );
+
+	if ( plural ) {
+		const pluralMethodName = getMethodName( kind, plural, 'get' );
+		result[ pluralMethodName ] = ( ...args ) =>
+			resolvers.getEntityRecords( kind, name, ...args );
+		result[ pluralMethodName ].shouldInvalidate = ( action ) =>
+			resolvers.getEntityRecords.shouldInvalidate( action, kind, name );
+	}
 	return result;
 }, {} );
 
-const entityActions = rootEntitiesConfig.reduce( ( result, entity ) => {
+const entityActions = entitiesConfig.reduce( ( result, entity ) => {
 	const { kind, name } = entity;
-	result[ getMethodName( kind, name, 'save' ) ] = ( key ) =>
-		actions.saveEntityRecord( kind, name, key );
-	result[ getMethodName( kind, name, 'delete' ) ] = ( key, query ) =>
-		actions.deleteEntityRecord( kind, name, key, query );
+	result[ getMethodName( kind, name, 'save' ) ] = ( record, options ) =>
+		actions.saveEntityRecord( kind, name, record, options );
+	result[ getMethodName( kind, name, 'delete' ) ] = ( key, query, options ) =>
+		actions.deleteEntityRecord( kind, name, key, query, options );
 	return result;
 }, {} );
 
@@ -65,6 +80,7 @@ const storeConfig = () => ( {
  */
 export const store = createReduxStore( STORE_NAME, storeConfig() );
 unlock( store ).registerPrivateSelectors( privateSelectors );
+unlock( store ).registerPrivateActions( privateActions );
 register( store ); // Register store after unlocking private selectors to allow resolvers to use them.
 
 export { default as EntityProvider } from './entity-provider';
@@ -72,3 +88,4 @@ export * from './entity-provider';
 export * from './entity-types';
 export * from './fetch';
 export * from './hooks';
+export * from './private-apis';
diff --git a/packages/core-data/src/lock-unlock.js b/packages/core-data/src/lock-unlock.js
new file mode 100644
index 00000000000000..91bf30792c970a
--- /dev/null
+++ b/packages/core-data/src/lock-unlock.js
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+		'@wordpress/core-data'
+	);
diff --git a/packages/core-data/src/private-actions.js b/packages/core-data/src/private-actions.js
new file mode 100644
index 00000000000000..df76d2693e54f3
--- /dev/null
+++ b/packages/core-data/src/private-actions.js
@@ -0,0 +1,16 @@
+/**
+ * Returns an action object used in signalling that the registered post meta
+ * fields for a post type have been received.
+ *
+ * @param {string} postType           Post type slug.
+ * @param {Object} registeredPostMeta Registered post meta.
+ *
+ * @return {Object} Action object.
+ */
+export function receiveRegisteredPostMeta( postType, registeredPostMeta ) {
+	return {
+		type: 'RECEIVE_REGISTERED_POST_META',
+		postType,
+		registeredPostMeta,
+	};
+}
diff --git a/packages/core-data/src/private-apis.js b/packages/core-data/src/private-apis.js
index 53f0dc2dfa133d..443db97957285d 100644
--- a/packages/core-data/src/private-apis.js
+++ b/packages/core-data/src/private-apis.js
@@ -1,10 +1,10 @@
 /**
- * WordPress dependencies
+ * Internal dependencies
  */
-import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+import { useEntityRecordsWithPermissions } from './hooks/use-entity-records';
+import { lock } from './lock-unlock';
 
-export const { lock, unlock } =
-	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
-		'@wordpress/core-data'
-	);
+export const privateApis = {};
+lock( privateApis, {
+	useEntityRecordsWithPermissions,
+} );
diff --git a/packages/core-data/src/private-selectors.ts b/packages/core-data/src/private-selectors.ts
index 94aa00e1c8de45..b2f6fa7def9858 100644
--- a/packages/core-data/src/private-selectors.ts
+++ b/packages/core-data/src/private-selectors.ts
@@ -1,7 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { createSelector, createRegistrySelector } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
 import type { State } from './selectors';
+import { STORE_NAME } from './name';
 
 type EntityRecordKey = string | number;
 
@@ -28,3 +34,74 @@ export function getNavigationFallbackId(
 ): EntityRecordKey | undefined {
 	return state.navigationFallbackId;
 }
+
+export const getBlockPatternsForPostType = createRegistrySelector(
+	( select: any ) =>
+		createSelector(
+			( state, postType ) =>
+				select( STORE_NAME )
+					.getBlockPatterns()
+					.filter(
+						( { postTypes } ) =>
+							! postTypes ||
+							( Array.isArray( postTypes ) &&
+								postTypes.includes( postType ) )
+					),
+			() => [ select( STORE_NAME ).getBlockPatterns() ]
+		)
+);
+
+/**
+ * Returns the entity records permissions for the given entity record ids.
+ */
+export const getEntityRecordsPermissions = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state: State, kind: string, name: string, ids: string[] ) => {
+			const normalizedIds = Array.isArray( ids ) ? ids : [ ids ];
+			return normalizedIds.map( ( id ) => ( {
+				delete: select( STORE_NAME ).canUser( 'delete', {
+					kind,
+					name,
+					id,
+				} ),
+				update: select( STORE_NAME ).canUser( 'update', {
+					kind,
+					name,
+					id,
+				} ),
+			} ) );
+		},
+		( state ) => [ state.userPermissions ]
+	)
+);
+
+/**
+ * Returns the entity record permissions for the given entity record id.
+ *
+ * @param state Data state.
+ * @param kind  Entity kind.
+ * @param name  Entity name.
+ * @param id    Entity record id.
+ *
+ * @return The entity record permissions.
+ */
+export function getEntityRecordPermissions(
+	state: State,
+	kind: string,
+	name: string,
+	id: string
+) {
+	return getEntityRecordsPermissions( state, kind, name, id )[ 0 ];
+}
+
+/**
+ * Returns the registered post meta fields for a given post type.
+ *
+ * @param state    Data state.
+ * @param postType Post type.
+ *
+ * @return Registered post meta fields.
+ */
+export function getRegisteredPostMeta( state: State, postType: string ) {
+	return state.registeredPostMeta?.[ postType ] ?? {};
+}
diff --git a/packages/core-data/src/queried-data/reducer.js b/packages/core-data/src/queried-data/reducer.js
index 1f9bb64c7889d7..3a0c8869175c47 100644
--- a/packages/core-data/src/queried-data/reducer.js
+++ b/packages/core-data/src/queried-data/reducer.js
@@ -110,7 +110,8 @@ export function items( state = {}, action ) {
 				[ context ]: {
 					...state[ context ],
 					...action.items.reduce( ( accumulator, value ) => {
-						const itemId = value[ key ];
+						const itemId = value?.[ key ];
+
 						accumulator[ itemId ] = conservativeMapItem(
 							state?.[ context ]?.[ itemId ],
 							value
@@ -164,7 +165,7 @@ export function itemIsComplete( state = {}, action ) {
 				[ context ]: {
 					...state[ context ],
 					...action.items.reduce( ( result, item ) => {
-						const itemId = item[ key ];
+						const itemId = item?.[ key ];
 
 						// Defer to completeness if already assigned. Technically the
 						// data may be outdated if receiving items for a field subset.
@@ -232,7 +233,7 @@ const receiveQueries = compose( [
 	return {
 		itemIds: getMergedItemIds(
 			state?.itemIds || [],
-			action.items.map( ( item ) => item[ key ] ),
+			action.items.map( ( item ) => item?.[ key ] ).filter( Boolean ),
 			page,
 			perPage
 		),
diff --git a/packages/core-data/src/queried-data/selectors.js b/packages/core-data/src/queried-data/selectors.js
index f605b8c26e52d7..6fb213f81c1a92 100644
--- a/packages/core-data/src/queried-data/selectors.js
+++ b/packages/core-data/src/queried-data/selectors.js
@@ -1,9 +1,13 @@
 /**
  * External dependencies
  */
-import createSelector from 'rememo';
 import EquivalentKeyMap from 'equivalent-key-map';
 
+/**
+ * WordPress dependencies
+ */
+import { createSelector } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
@@ -126,3 +130,9 @@ export function getQueriedTotalItems( state, query = {} ) {
 
 	return state.queries?.[ context ]?.[ stableKey ]?.meta?.totalItems ?? null;
 }
+
+export function getQueriedTotalPages( state, query = {} ) {
+	const { stableKey, context } = getQueryParts( query );
+
+	return state.queries?.[ context ]?.[ stableKey ]?.meta?.totalPages ?? null;
+}
diff --git a/packages/core-data/src/reducer.js b/packages/core-data/src/reducer.js
index 8e6be425244687..9748355fc5caf6 100644
--- a/packages/core-data/src/reducer.js
+++ b/packages/core-data/src/reducer.js
@@ -256,7 +256,7 @@ function entity( entityConfig ) {
 						const nextState = { ...state };
 
 						for ( const record of action.items ) {
-							const recordId = record[ action.key ];
+							const recordId = record?.[ action.key ];
 							const edits = nextState[ recordId ];
 							if ( ! edits ) {
 								continue;
@@ -521,6 +521,11 @@ export function userPermissions( state = {}, action ) {
 				...state,
 				[ action.key ]: action.isAllowed,
 			};
+		case 'RECEIVE_USER_PERMISSIONS':
+			return {
+				...state,
+				...action.permissions,
+			};
 	}
 
 	return state;
@@ -623,6 +628,25 @@ export function defaultTemplates( state = {}, action ) {
 	return state;
 }
 
+/**
+ * Reducer returning an object of registered post meta.
+ *
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
+ *
+ * @return {Object} Updated state.
+ */
+export function registeredPostMeta( state = {}, action ) {
+	switch ( action.type ) {
+		case 'RECEIVE_REGISTERED_POST_META':
+			return {
+				...state,
+				[ action.postType ]: action.registeredPostMeta,
+			};
+	}
+	return state;
+}
+
 export default combineReducers( {
 	terms,
 	users,
@@ -644,4 +668,5 @@ export default combineReducers( {
 	userPatternCategories,
 	navigationFallbackId,
 	defaultTemplates,
+	registeredPostMeta,
 } );
diff --git a/packages/core-data/src/resolvers.js b/packages/core-data/src/resolvers.js
index 807005ec4a6e8d..91a73a0b3511c2 100644
--- a/packages/core-data/src/resolvers.js
+++ b/packages/core-data/src/resolvers.js
@@ -15,8 +15,15 @@ import apiFetch from '@wordpress/api-fetch';
  */
 import { STORE_NAME } from './name';
 import { getOrLoadEntitiesConfig, DEFAULT_ENTITY_KEY } from './entities';
-import { forwardResolver, getNormalizedCommaSeparable } from './utils';
+import {
+	forwardResolver,
+	getNormalizedCommaSeparable,
+	getUserPermissionCacheKey,
+	getUserPermissionsFromAllowHeader,
+	ALLOWED_RESOURCE_ACTIONS,
+} from './utils';
 import { getSyncProvider } from './sync';
+import { fetchBlockPatterns } from './fetch';
 
 /**
  * Requests authors from the REST API.
@@ -57,12 +64,12 @@ export const getCurrentUser =
  */
 export const getEntityRecord =
 	( kind, name, key = '', query ) =>
-	async ( { select, dispatch } ) => {
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
+	async ( { select, dispatch, registry } ) => {
+		const configs = await dispatch( getOrLoadEntitiesConfig( kind, name ) );
 		const entityConfig = configs.find(
 			( config ) => config.name === name && config.kind === kind
 		);
-		if ( ! entityConfig || entityConfig?.__experimentalNoFetch ) {
+		if ( ! entityConfig ) {
 			return;
 		}
 
@@ -80,7 +87,7 @@ export const getEntityRecord =
 				entityConfig.syncConfig &&
 				! query
 			) {
-				if ( process.env.IS_GUTENBERG_PLUGIN ) {
+				if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 					const objectId = entityConfig.getSyncObjectId( key );
 
 					// Loads the persisted document.
@@ -148,7 +155,7 @@ export const getEntityRecord =
 					}
 				);
 
-				if ( query !== undefined ) {
+				if ( query !== undefined && query._fields ) {
 					query = { ...query, include: [ key ] };
 
 					// The resolution cache won't consider query as reusable based on the
@@ -164,8 +171,39 @@ export const getEntityRecord =
 					}
 				}
 
-				const record = await apiFetch( { path } );
-				dispatch.receiveEntityRecords( kind, name, record, query );
+				const response = await apiFetch( { path, parse: false } );
+				const record = await response.json();
+				const permissions = getUserPermissionsFromAllowHeader(
+					response.headers?.get( 'allow' )
+				);
+
+				const canUserResolutionsArgs = [];
+				const receiveUserPermissionArgs = {};
+				for ( const action of ALLOWED_RESOURCE_ACTIONS ) {
+					receiveUserPermissionArgs[
+						getUserPermissionCacheKey( action, {
+							kind,
+							name,
+							id: key,
+						} )
+					] = permissions[ action ];
+
+					canUserResolutionsArgs.push( [
+						action,
+						{ kind, name, id: key },
+					] );
+				}
+
+				registry.batch( () => {
+					dispatch.receiveEntityRecords( kind, name, record, query );
+					dispatch.receiveUserPermissions(
+						receiveUserPermissionArgs
+					);
+					dispatch.finishResolutions(
+						'canUser',
+						canUserResolutionsArgs
+					);
+				} );
 			}
 		} finally {
 			dispatch.__unstableReleaseStoreLock( lock );
@@ -192,12 +230,12 @@ export const getEditedEntityRecord = forwardResolver( 'getEntityRecord' );
  */
 export const getEntityRecords =
 	( kind, name, query = {} ) =>
-	async ( { dispatch } ) => {
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
+	async ( { dispatch, registry } ) => {
+		const configs = await dispatch( getOrLoadEntitiesConfig( kind, name ) );
 		const entityConfig = configs.find(
 			( config ) => config.name === name && config.kind === kind
 		);
-		if ( ! entityConfig || entityConfig?.__experimentalNoFetch ) {
+		if ( ! entityConfig ) {
 			return;
 		}
 
@@ -237,9 +275,16 @@ export const getEntityRecords =
 					totalItems: parseInt(
 						response.headers.get( 'X-WP-Total' )
 					),
+					totalPages: parseInt(
+						response.headers.get( 'X-WP-TotalPages' )
+					),
 				};
 			} else {
 				records = Object.values( await apiFetch( { path } ) );
+				meta = {
+					totalItems: records.length,
+					totalPages: 1,
+				};
 			}
 
 			// If we request fields but the result doesn't contain the fields,
@@ -257,37 +302,71 @@ export const getEntityRecords =
 				} );
 			}
 
-			dispatch.receiveEntityRecords(
-				kind,
-				name,
-				records,
-				query,
-				false,
-				undefined,
-				meta
-			);
+			registry.batch( () => {
+				dispatch.receiveEntityRecords(
+					kind,
+					name,
+					records,
+					query,
+					false,
+					undefined,
+					meta
+				);
 
-			// When requesting all fields, the list of results can be used to
-			// resolve the `getEntityRecord` selector in addition to `getEntityRecords`.
-			// See https://github.com/WordPress/gutenberg/pull/26575
-			if ( ! query?._fields && ! query.context ) {
-				const key = entityConfig.key || DEFAULT_ENTITY_KEY;
-				const resolutionsArgs = records
-					.filter( ( record ) => record[ key ] )
-					.map( ( record ) => [ kind, name, record[ key ] ] );
-
-				dispatch( {
-					type: 'START_RESOLUTIONS',
-					selectorName: 'getEntityRecord',
-					args: resolutionsArgs,
-				} );
-				dispatch( {
-					type: 'FINISH_RESOLUTIONS',
-					selectorName: 'getEntityRecord',
-					args: resolutionsArgs,
-				} );
-			}
-		} finally {
+				// When requesting all fields, the list of results can be used to resolve
+				// the `getEntityRecord` and `canUser` selectors in addition to `getEntityRecords`.
+				// See https://github.com/WordPress/gutenberg/pull/26575
+				// See https://github.com/WordPress/gutenberg/pull/64504
+				if ( ! query?._fields && ! query.context ) {
+					const key = entityConfig.key || DEFAULT_ENTITY_KEY;
+					const resolutionsArgs = records
+						.filter( ( record ) => record?.[ key ] )
+						.map( ( record ) => [ kind, name, record[ key ] ] );
+
+					const targetHints = records
+						.filter( ( record ) => record?.[ key ] )
+						.map( ( record ) => ( {
+							id: record[ key ],
+							permissions: getUserPermissionsFromAllowHeader(
+								record?._links?.self?.[ 0 ].targetHints.allow
+							),
+						} ) );
+
+					const canUserResolutionsArgs = [];
+					const receiveUserPermissionArgs = {};
+					for ( const targetHint of targetHints ) {
+						for ( const action of ALLOWED_RESOURCE_ACTIONS ) {
+							canUserResolutionsArgs.push( [
+								action,
+								{ kind, name, id: targetHint.id },
+							] );
+
+							receiveUserPermissionArgs[
+								getUserPermissionCacheKey( action, {
+									kind,
+									name,
+									id: targetHint.id,
+								} )
+							] = targetHint.permissions[ action ];
+						}
+					}
+
+					dispatch.receiveUserPermissions(
+						receiveUserPermissionArgs
+					);
+					dispatch.finishResolutions(
+						'getEntityRecord',
+						resolutionsArgs
+					);
+					dispatch.finishResolutions(
+						'canUser',
+						canUserResolutionsArgs
+					);
+				}
+
+				dispatch.__unstableReleaseStoreLock( lock );
+			} );
+		} catch ( e ) {
 			dispatch.__unstableReleaseStoreLock( lock );
 		}
 	};
@@ -344,25 +423,47 @@ export const getEmbedPreview =
  * Checks whether the current user can perform the given action on the given
  * REST resource.
  *
- * @param {string}  requestedAction Action to check. One of: 'create', 'read', 'update',
- *                                  'delete'.
- * @param {string}  resource        REST resource to check, e.g. 'media' or 'posts'.
- * @param {?string} id              ID of the rest resource to check.
+ * @param {string}        requestedAction Action to check. One of: 'create', 'read', 'update',
+ *                                        'delete'.
+ * @param {string|Object} resource        Entity resource to check. Accepts entity object `{ kind: 'root', name: 'media', id: 1 }`
+ *                                        or REST base as a string - `media`.
+ * @param {?string}       id              ID of the rest resource to check.
  */
 export const canUser =
 	( requestedAction, resource, id ) =>
 	async ( { dispatch, registry } ) => {
-		const { hasStartedResolution } = registry.select( STORE_NAME );
+		if ( ! ALLOWED_RESOURCE_ACTIONS.includes( requestedAction ) ) {
+			throw new Error( `'${ requestedAction }' is not a valid action.` );
+		}
 
-		const resourcePath = id ? `${ resource }/${ id }` : resource;
-		const retrievedActions = [ 'create', 'read', 'update', 'delete' ];
+		let resourcePath = null;
+		if ( typeof resource === 'object' ) {
+			if ( ! resource.kind || ! resource.name ) {
+				throw new Error( 'The entity resource object is not valid.' );
+			}
 
-		if ( ! retrievedActions.includes( requestedAction ) ) {
-			throw new Error( `'${ requestedAction }' is not a valid action.` );
+			const configs = await dispatch(
+				getOrLoadEntitiesConfig( resource.kind, resource.name )
+			);
+			const entityConfig = configs.find(
+				( config ) =>
+					config.name === resource.name &&
+					config.kind === resource.kind
+			);
+			if ( ! entityConfig ) {
+				return;
+			}
+
+			resourcePath =
+				entityConfig.baseURL + ( resource.id ? '/' + resource.id : '' );
+		} else {
+			resourcePath = `/wp/v2/${ resource }` + ( id ? '/' + id : '' );
 		}
 
+		const { hasStartedResolution } = registry.select( STORE_NAME );
+
 		// Prevent resolving the same resource twice.
-		for ( const relatedAction of retrievedActions ) {
+		for ( const relatedAction of ALLOWED_RESOURCE_ACTIONS ) {
 			if ( relatedAction === requestedAction ) {
 				continue;
 			}
@@ -379,7 +480,7 @@ export const canUser =
 		let response;
 		try {
 			response = await apiFetch( {
-				path: `/wp/v2/${ resourcePath }`,
+				path: resourcePath,
 				method: 'OPTIONS',
 				parse: false,
 			} );
@@ -390,51 +491,41 @@ export const canUser =
 		}
 
 		// Optional chaining operator is used here because the API requests don't
-		// return the expected result in the native version. Instead, API requests
+		// return the expected result in the React native version. Instead, API requests
 		// only return the result, without including response properties like the headers.
-		const allowHeader = response.headers?.get( 'allow' );
-		const allowedMethods = allowHeader?.allow || allowHeader || '';
-
-		const permissions = {};
-		const methods = {
-			create: 'POST',
-			read: 'GET',
-			update: 'PUT',
-			delete: 'DELETE',
-		};
-		for ( const [ actionName, methodName ] of Object.entries( methods ) ) {
-			permissions[ actionName ] = allowedMethods.includes( methodName );
-		}
-
-		for ( const action of retrievedActions ) {
-			dispatch.receiveUserPermission(
-				`${ action }/${ resourcePath }`,
-				permissions[ action ]
-			);
-		}
+		const permissions = getUserPermissionsFromAllowHeader(
+			response.headers?.get( 'allow' )
+		);
+		registry.batch( () => {
+			for ( const action of ALLOWED_RESOURCE_ACTIONS ) {
+				const key = getUserPermissionCacheKey( action, resource, id );
+
+				dispatch.receiveUserPermission( key, permissions[ action ] );
+
+				// Mark related action resolutions as finished.
+				if ( action !== requestedAction ) {
+					dispatch.finishResolution( 'canUser', [
+						action,
+						resource,
+						id,
+					] );
+				}
+			}
+		} );
 	};
 
 /**
  * Checks whether the current user can perform the given action on the given
  * REST resource.
  *
- * @param {string} kind     Entity kind.
- * @param {string} name     Entity name.
- * @param {string} recordId Record's id.
+ * @param {string}        kind     Entity kind.
+ * @param {string}        name     Entity name.
+ * @param {number|string} recordId Record's id.
  */
 export const canUserEditEntityRecord =
 	( kind, name, recordId ) =>
 	async ( { dispatch } ) => {
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
-		const entityConfig = configs.find(
-			( config ) => config.name === name && config.kind === kind
-		);
-		if ( ! entityConfig ) {
-			return;
-		}
-
-		const resource = entityConfig.__unstable_rest_base;
-		await dispatch( canUser( 'update', resource, recordId ) );
+		await dispatch( canUser( 'update', { kind, name, id: recordId } ) );
 	};
 
 /**
@@ -535,13 +626,17 @@ export const __experimentalGetCurrentGlobalStylesId =
 		const globalStylesURL =
 			activeThemes?.[ 0 ]?._links?.[ 'wp:user-global-styles' ]?.[ 0 ]
 				?.href;
-		if ( globalStylesURL ) {
-			const globalStylesObject = await apiFetch( {
-				url: globalStylesURL,
-			} );
-			dispatch.__experimentalReceiveCurrentGlobalStylesId(
-				globalStylesObject.id
-			);
+		if ( ! globalStylesURL ) {
+			return;
+		}
+
+		// Regex matches the ID at the end of a URL or immediately before
+		// the query string.
+		const matches = globalStylesURL.match( /\/(\d+)(?:\?|$)/ );
+		const id = matches ? Number( matches[ 1 ] ) : null;
+
+		if ( id ) {
+			dispatch.__experimentalReceiveCurrentGlobalStylesId( id );
 		}
 	};
 
@@ -550,7 +645,7 @@ export const __experimentalGetCurrentThemeBaseGlobalStyles =
 	async ( { resolveSelect, dispatch } ) => {
 		const currentTheme = await resolveSelect.getCurrentTheme();
 		const themeGlobalStyles = await apiFetch( {
-			path: `/wp/v2/global-styles/themes/${ currentTheme.stylesheet }`,
+			path: `/wp/v2/global-styles/themes/${ currentTheme.stylesheet }?context=view`,
 		} );
 		dispatch.__experimentalReceiveThemeBaseGlobalStyles(
 			currentTheme.stylesheet,
@@ -563,7 +658,7 @@ export const __experimentalGetCurrentThemeGlobalStylesVariations =
 	async ( { resolveSelect, dispatch } ) => {
 		const currentTheme = await resolveSelect.getCurrentTheme();
 		const variations = await apiFetch( {
-			path: `/wp/v2/global-styles/themes/${ currentTheme.stylesheet }/variations`,
+			path: `/wp/v2/global-styles/themes/${ currentTheme.stylesheet }/variations?context=view`,
 		} );
 		dispatch.__experimentalReceiveThemeGlobalStyleVariations(
 			currentTheme.stylesheet,
@@ -619,17 +714,7 @@ getCurrentThemeGlobalStylesRevisions.shouldInvalidate = ( action ) => {
 export const getBlockPatterns =
 	() =>
 	async ( { dispatch } ) => {
-		const restPatterns = await apiFetch( {
-			path: '/wp/v2/block-patterns/patterns',
-		} );
-		const patterns = restPatterns?.map( ( pattern ) =>
-			Object.fromEntries(
-				Object.entries( pattern ).map( ( [ key, value ] ) => [
-					camelCase( key ),
-					value,
-				] )
-			)
-		);
+		const patterns = await fetchBlockPatterns();
 		dispatch( { type: 'RECEIVE_BLOCK_PATTERNS', patterns } );
 	};
 
@@ -670,7 +755,7 @@ export const getUserPatternCategories =
 
 export const getNavigationFallbackId =
 	() =>
-	async ( { dispatch, select } ) => {
+	async ( { dispatch, select, registry } ) => {
 		const fallback = await apiFetch( {
 			path: addQueryArgs( '/wp-block-editor/v1/navigation-fallback', {
 				_embed: true,
@@ -679,16 +764,20 @@ export const getNavigationFallbackId =
 
 		const record = fallback?._embedded?.self;
 
-		dispatch.receiveNavigationFallbackId( fallback?.id );
+		registry.batch( () => {
+			dispatch.receiveNavigationFallbackId( fallback?.id );
+
+			if ( ! record ) {
+				return;
+			}
 
-		if ( record ) {
 			// If the fallback is already in the store, don't invalidate navigation queries.
 			// Otherwise, invalidate the cache for the scenario where there were no Navigation
 			// posts in the state and the fallback created one.
 			const existingFallbackEntityRecord = select.getEntityRecord(
 				'postType',
 				'wp_navigation',
-				fallback?.id
+				fallback.id
 			);
 			const invalidateNavigationQueries = ! existingFallbackEntityRecord;
 			dispatch.receiveEntityRecords(
@@ -703,9 +792,9 @@ export const getNavigationFallbackId =
 			dispatch.finishResolution( 'getEntityRecord', [
 				'postType',
 				'wp_navigation',
-				fallback?.id,
+				fallback.id,
 			] );
-		}
+		} );
 	};
 
 export const getDefaultTemplateId =
@@ -714,7 +803,8 @@ export const getDefaultTemplateId =
 		const template = await apiFetch( {
 			path: addQueryArgs( '/wp/v2/templates/lookup', query ),
 		} );
-		if ( template ) {
+		// Endpoint may return an empty object if no template is found.
+		if ( template?.id ) {
 			dispatch.receiveDefaultTemplateId( query, template.id );
 		}
 	};
@@ -731,13 +821,13 @@ export const getDefaultTemplateId =
  */
 export const getRevisions =
 	( kind, name, recordKey, query = {} ) =>
-	async ( { dispatch } ) => {
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
+	async ( { dispatch, registry } ) => {
+		const configs = await dispatch( getOrLoadEntitiesConfig( kind, name ) );
 		const entityConfig = configs.find(
 			( config ) => config.name === name && config.kind === kind
 		);
 
-		if ( ! entityConfig || entityConfig?.__experimentalNoFetch ) {
+		if ( ! entityConfig ) {
 			return;
 		}
 
@@ -798,40 +888,36 @@ export const getRevisions =
 				} );
 			}
 
-			dispatch.receiveRevisions(
-				kind,
-				name,
-				recordKey,
-				records,
-				query,
-				false,
-				meta
-			);
-
-			// When requesting all fields, the list of results can be used to
-			// resolve the `getRevision` selector in addition to `getRevisions`.
-			if ( ! query?._fields && ! query.context ) {
-				const key = entityConfig.key || DEFAULT_ENTITY_KEY;
-				const resolutionsArgs = records
-					.filter( ( record ) => record[ key ] )
-					.map( ( record ) => [
-						kind,
-						name,
-						recordKey,
-						record[ key ],
-					] );
+			registry.batch( () => {
+				dispatch.receiveRevisions(
+					kind,
+					name,
+					recordKey,
+					records,
+					query,
+					false,
+					meta
+				);
 
-				dispatch( {
-					type: 'START_RESOLUTIONS',
-					selectorName: 'getRevision',
-					args: resolutionsArgs,
-				} );
-				dispatch( {
-					type: 'FINISH_RESOLUTIONS',
-					selectorName: 'getRevision',
-					args: resolutionsArgs,
-				} );
-			}
+				// When requesting all fields, the list of results can be used to
+				// resolve the `getRevision` selector in addition to `getRevisions`.
+				if ( ! query?._fields && ! query.context ) {
+					const key = entityConfig.key || DEFAULT_ENTITY_KEY;
+					const resolutionsArgs = records
+						.filter( ( record ) => record[ key ] )
+						.map( ( record ) => [
+							kind,
+							name,
+							recordKey,
+							record[ key ],
+						] );
+
+					dispatch.finishResolutions(
+						'getRevision',
+						resolutionsArgs
+					);
+				}
+			} );
 		}
 	};
 
@@ -857,12 +943,12 @@ getRevisions.shouldInvalidate = ( action, kind, name, recordKey ) =>
 export const getRevision =
 	( kind, name, recordKey, revisionKey, query ) =>
 	async ( { dispatch } ) => {
-		const configs = await dispatch( getOrLoadEntitiesConfig( kind ) );
+		const configs = await dispatch( getOrLoadEntitiesConfig( kind, name ) );
 		const entityConfig = configs.find(
 			( config ) => config.name === name && config.kind === kind
 		);
 
-		if ( ! entityConfig || entityConfig?.__experimentalNoFetch ) {
+		if ( ! entityConfig ) {
 			return;
 		}
 
@@ -898,3 +984,34 @@ export const getRevision =
 			dispatch.receiveRevisions( kind, name, recordKey, record, query );
 		}
 	};
+
+/**
+ * Requests a specific post type options from the REST API.
+ *
+ * @param {string} postType Post type slug.
+ */
+export const getRegisteredPostMeta =
+	( postType ) =>
+	async ( { dispatch, resolveSelect } ) => {
+		let options;
+		try {
+			const {
+				rest_namespace: restNamespace = 'wp/v2',
+				rest_base: restBase,
+			} = ( await resolveSelect.getPostType( postType ) ) || {};
+			options = await apiFetch( {
+				path: `${ restNamespace }/${ restBase }/?context=edit`,
+				method: 'OPTIONS',
+			} );
+		} catch ( error ) {
+			// Do nothing if the request comes back with an API error.
+			return;
+		}
+
+		if ( options ) {
+			dispatch.receiveRegisteredPostMeta(
+				postType,
+				options?.schema?.properties?.meta?.properties
+			);
+		}
+	};
diff --git a/packages/core-data/src/selectors.ts b/packages/core-data/src/selectors.ts
index 5751a80b9106cd..9acadd5c0c0e70 100644
--- a/packages/core-data/src/selectors.ts
+++ b/packages/core-data/src/selectors.ts
@@ -1,12 +1,7 @@
-/**
- * External dependencies
- */
-import createSelector from 'rememo';
-
 /**
  * WordPress dependencies
  */
-import { createRegistrySelector } from '@wordpress/data';
+import { createSelector, createRegistrySelector } from '@wordpress/data';
 import { addQueryArgs } from '@wordpress/url';
 import deprecated from '@wordpress/deprecated';
 
@@ -14,13 +9,18 @@ import deprecated from '@wordpress/deprecated';
  * Internal dependencies
  */
 import { STORE_NAME } from './name';
-import { getQueriedItems, getQueriedTotalItems } from './queried-data';
+import {
+	getQueriedItems,
+	getQueriedTotalItems,
+	getQueriedTotalPages,
+} from './queried-data';
 import { DEFAULT_ENTITY_KEY } from './entities';
 import {
 	getNormalizedCommaSeparable,
 	isRawAttribute,
 	setNestedValue,
 	isNumericID,
+	getUserPermissionCacheKey,
 } from './utils';
 import type * as ET from './entity-types';
 import type { UndoManager } from '@wordpress/undo-manager';
@@ -47,6 +47,7 @@ export interface State {
 	navigationFallbackId: EntityRecordKey;
 	userPatternCategories: Array< UserPatternCategory >;
 	defaultTemplates: Record< string, string >;
+	registeredPostMeta: Record< string, Object >;
 }
 
 type EntityRecordKey = string | number;
@@ -121,6 +122,8 @@ type EntityRecordArgs =
 	| [ string, string, EntityRecordKey ]
 	| [ string, string, EntityRecordKey, GetRecordsHttpQuery ];
 
+type EntityResource = { kind: string; name: string; id?: EntityRecordKey };
+
 /**
  * Shared reference to an empty object for cases where it is important to avoid
  * returning a new object reference on every invocation, as in a connected or
@@ -230,10 +233,13 @@ export function getEntitiesByKind( state: State, kind: string ): Array< any > {
  *
  * @return Array of entities with config matching kind.
  */
-export function getEntitiesConfig( state: State, kind: string ): Array< any > {
-	return state.entities.config.filter( ( entity ) => entity.kind === kind );
-}
-
+export const getEntitiesConfig = createSelector(
+	( state: State, kind: string ): Array< any > =>
+		state.entities.config.filter( ( entity ) => entity.kind === kind ),
+	/* eslint-disable @typescript-eslint/no-unused-vars */
+	( state: State, kind: string ) => state.entities.config
+	/* eslint-enable @typescript-eslint/no-unused-vars */
+);
 /**
  * Returns the entity config given its kind and name.
  *
@@ -619,9 +625,18 @@ export const getEntityRecordsTotalPages = (
 	if ( ! queriedState ) {
 		return null;
 	}
-	if ( query.per_page === -1 ) return 1;
+	if ( query.per_page === -1 ) {
+		return 1;
+	}
 	const totalItems = getQueriedTotalItems( queriedState, query );
-	if ( ! totalItems ) return totalItems;
+	if ( ! totalItems ) {
+		return totalItems;
+	}
+	// If `per_page` is not set and the query relies on the defaults of the
+	// REST endpoint, get the info from query's meta.
+	if ( ! query.per_page ) {
+		return getQueriedTotalPages( queriedState, query );
+	}
 	return Math.ceil( totalItems / query.per_page );
 };
 
@@ -841,10 +856,21 @@ export const getEditedEntityRecord = createSelector(
 		kind: string,
 		name: string,
 		recordId: EntityRecordKey
-	): ET.Updatable< EntityRecord > | undefined => ( {
-		...getRawEntityRecord( state, kind, name, recordId ),
-		...getEntityRecordEdits( state, kind, name, recordId ),
-	} ),
+	): ET.Updatable< EntityRecord > | false => {
+		const raw = getRawEntityRecord( state, kind, name, recordId );
+		const edited = getEntityRecordEdits( state, kind, name, recordId );
+		// Never return a non-falsy empty object. Unfortunately we can't return
+		// undefined or null because we were previously returning an empty
+		// object, so trying to read properties from the result would throw.
+		// Using false here is a workaround to avoid breaking changes.
+		if ( ! raw && ! edited ) {
+			return false;
+		}
+		return {
+			...raw,
+			...edited,
+		};
+	},
 	(
 		state: State,
 		kind: string,
@@ -972,6 +998,7 @@ export function getLastEntityDeleteError(
 		?.error;
 }
 
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Returns the previous edit from the current undo offset
  * for the entity records edits history, if any.
@@ -988,7 +1015,9 @@ export function getUndoEdit( state: State ): Optional< any > {
 	} );
 	return undefined;
 }
+/* eslint-enable @typescript-eslint/no-unused-vars */
 
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Returns the next edit from the current undo offset
  * for the entity records edits history, if any.
@@ -1005,6 +1034,7 @@ export function getRedoEdit( state: State ): Optional< any > {
 	} );
 	return undefined;
 }
+/* eslint-enable @typescript-eslint/no-unused-vars */
 
 /**
  * Returns true if there is a previous edit from the current undo offset
@@ -1110,7 +1140,8 @@ export function isPreviewEmbedFallback( state: State, url: string ): boolean {
  *
  * @param state    Data state.
  * @param action   Action to check. One of: 'create', 'read', 'update', 'delete'.
- * @param resource REST resource to check, e.g. 'media' or 'posts'.
+ * @param resource Entity resource to check. Accepts entity object `{ kind: 'root', name: 'media', id: 1 }`
+ *                 or REST base as a string - `media`.
  * @param id       Optional ID of the rest resource to check.
  *
  * @return Whether or not the user can perform the action,
@@ -1119,10 +1150,16 @@ export function isPreviewEmbedFallback( state: State, url: string ): boolean {
 export function canUser(
 	state: State,
 	action: string,
-	resource: string,
+	resource: string | EntityResource,
 	id?: EntityRecordKey
 ): boolean | undefined {
-	const key = [ action, resource, id ].filter( Boolean ).join( '/' );
+	const isEntity = typeof resource === 'object';
+	if ( isEntity && ( ! resource.kind || ! resource.name ) ) {
+		return false;
+	}
+
+	const key = getUserPermissionCacheKey( action, resource, id );
+
 	return state.userPermissions[ key ];
 }
 
@@ -1147,13 +1184,12 @@ export function canUserEditEntityRecord(
 	name: string,
 	recordId: EntityRecordKey
 ): boolean | undefined {
-	const entityConfig = getEntityConfig( state, kind, name );
-	if ( ! entityConfig ) {
-		return false;
-	}
-	const resource = entityConfig.__unstable_rest_base;
+	deprecated( `wp.data.select( 'core' ).canUserEditEntityRecord()`, {
+		since: '6.7',
+		alternative: `wp.data.select( 'core' ).canUser( 'update', { kind, name, id } )`,
+	} );
 
-	return canUser( state, 'update', resource, recordId );
+	return canUser( state, 'update', { kind, name, id: recordId } );
 }
 
 /**
@@ -1259,7 +1295,7 @@ export function getReferenceByDistinctEdits( state ) {
 export function __experimentalGetTemplateForLink(
 	state: State,
 	link: string
-): Optional< ET.Updatable< ET.WpTemplate > > | null {
+): Optional< ET.Updatable< ET.WpTemplate > > | null | false {
 	const records = getEntityRecords< ET.WpTemplate >(
 		state,
 		'postType',
diff --git a/packages/core-data/src/test/entities.js b/packages/core-data/src/test/entities.js
index c9a432c92c1442..27b3d56e76865d 100644
--- a/packages/core-data/src/test/entities.js
+++ b/packages/core-data/src/test/entities.js
@@ -27,14 +27,8 @@ describe( 'getMethodName', () => {
 		expect( methodName ).toEqual( 'setPostType' );
 	} );
 
-	it( 'should use the plural form', () => {
-		const methodName = getMethodName( 'root', 'postType', 'get', true );
-
-		expect( methodName ).toEqual( 'getPostTypes' );
-	} );
-
 	it( 'should use the given plural form', () => {
-		const methodName = getMethodName( 'root', 'taxonomy', 'get', true );
+		const methodName = getMethodName( 'root', 'taxonomies', 'get' );
 
 		expect( methodName ).toEqual( 'getTaxonomies' );
 	} );
@@ -58,9 +52,16 @@ describe( 'getKindEntities', () => {
 		const dispatch = jest.fn();
 		const select = {
 			getEntitiesConfig: jest.fn( () => entities ),
+			getEntityConfig: jest.fn( () => ( {
+				kind: 'postType',
+				name: 'post',
+			} ) ),
 		};
 		const entities = [ { kind: 'postType' } ];
-		await getOrLoadEntitiesConfig( 'postType' )( { dispatch, select } );
+		await getOrLoadEntitiesConfig(
+			'postType',
+			'post'
+		)( { dispatch, select } );
 		expect( dispatch ).not.toHaveBeenCalled();
 	} );
 
@@ -68,8 +69,12 @@ describe( 'getKindEntities', () => {
 		const dispatch = jest.fn();
 		const select = {
 			getEntitiesConfig: jest.fn( () => [] ),
+			getEntityConfig: jest.fn( () => undefined ),
 		};
-		await getOrLoadEntitiesConfig( 'unknownKind' )( { dispatch, select } );
+		await getOrLoadEntitiesConfig(
+			'unknownKind',
+			undefined
+		)( { dispatch, select } );
 		expect( dispatch ).not.toHaveBeenCalled();
 	} );
 
@@ -88,10 +93,14 @@ describe( 'getKindEntities', () => {
 		const dispatch = jest.fn();
 		const select = {
 			getEntitiesConfig: jest.fn( () => [] ),
+			getEntityConfig: jest.fn( () => undefined ),
 		};
 		triggerFetch.mockImplementation( () => fetchedEntities );
 
-		await getOrLoadEntitiesConfig( 'postType' )( { dispatch, select } );
+		await getOrLoadEntitiesConfig(
+			'postType',
+			'post'
+		)( { dispatch, select } );
 		expect( dispatch ).toHaveBeenCalledTimes( 1 );
 		expect( dispatch.mock.calls[ 0 ][ 0 ].type ).toBe( 'ADD_ENTITIES' );
 		expect( dispatch.mock.calls[ 0 ][ 0 ].entities.length ).toBe( 1 );
diff --git a/packages/core-data/src/test/entity-provider.js b/packages/core-data/src/test/entity-provider.js
index aa373e6304aad1..4dc0d8a51663e8 100644
--- a/packages/core-data/src/test/entity-provider.js
+++ b/packages/core-data/src/test/entity-provider.js
@@ -14,13 +14,14 @@ import {
 } from '@wordpress/blocks';
 import { RichText, useBlockProps } from '@wordpress/block-editor';
 import { createRegistry, RegistryProvider } from '@wordpress/data';
-import '@wordpress/block-library';
+import { registerCoreBlocks } from '@wordpress/block-library';
+import { unregisterFormatType } from '@wordpress/rich-text';
 
 /**
  * Internal dependencies
  */
 import { store as coreDataStore } from '../index';
-import { useEntityBlockEditor } from '../entity-provider';
+import useEntityBlockEditor from '../hooks/use-entity-block-editor';
 
 const postTypeConfig = {
 	kind: 'postType',
@@ -103,7 +104,7 @@ describe( 'useEntityBlockEditor', () => {
 					source: 'html',
 					selector: 'p',
 					default: '',
-					__experimentalRole: 'content',
+					role: 'content',
 				},
 			},
 			title: 'block title',
@@ -137,12 +138,15 @@ describe( 'useEntityBlockEditor', () => {
 			title: 'block title',
 			edit,
 		} );
+
+		registerCoreBlocks();
 	} );
 
 	afterEach( () => {
 		getBlockTypes().forEach( ( block ) => {
 			unregisterBlockType( block.name );
 		} );
+		unregisterFormatType( 'core/footnote' );
 	} );
 
 	it( 'does not mutate block attributes that include an array of strings or null values', async () => {
diff --git a/packages/core-data/src/test/resolvers.js b/packages/core-data/src/test/resolvers.js
index 544caad0c2dbc4..f15bee3b3c2b9b 100644
--- a/packages/core-data/src/test/resolvers.js
+++ b/packages/core-data/src/test/resolvers.js
@@ -19,6 +19,7 @@ import {
 
 describe( 'getEntityRecord', () => {
 	const POST_TYPE = { slug: 'post' };
+	const POST_TYPE_RESPONSE = { json: () => Promise.resolve( POST_TYPE ) };
 	const ENTITIES = [
 		{
 			name: 'postType',
@@ -27,28 +28,37 @@ describe( 'getEntityRecord', () => {
 			baseURLParams: { context: 'edit' },
 		},
 	];
+	const registry = { batch: ( callback ) => callback() };
 
+	let dispatch;
 	beforeEach( async () => {
-		triggerFetch.mockReset();
-	} );
-
-	it( 'yields with requested post type', async () => {
-		const dispatch = Object.assign( jest.fn(), {
+		dispatch = Object.assign( jest.fn(), {
 			receiveEntityRecords: jest.fn(),
 			__unstableAcquireStoreLock: jest.fn(),
 			__unstableReleaseStoreLock: jest.fn(),
+			receiveUserPermissions: jest.fn(),
+			finishResolutions: jest.fn(),
 		} );
+		triggerFetch.mockReset();
+	} );
+
+	it( 'yields with requested post type', async () => {
 		// Provide entities
 		dispatch.mockReturnValueOnce( ENTITIES );
 
 		// Provide response
-		triggerFetch.mockImplementation( () => POST_TYPE );
+		triggerFetch.mockImplementation( () => POST_TYPE_RESPONSE );
 
-		await getEntityRecord( 'root', 'postType', 'post' )( { dispatch } );
+		await getEntityRecord(
+			'root',
+			'postType',
+			'post'
+		)( { dispatch, registry } );
 
 		// Fetch request should have been issued.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
 			path: '/wp/v2/types/post?context=edit',
+			parse: false,
 		} );
 
 		// The record should have been received.
@@ -70,40 +80,27 @@ describe( 'getEntityRecord', () => {
 
 	it( 'accepts a query that overrides default api path', async () => {
 		const query = { context: 'view', _envelope: '1' };
-		const queryObj = { include: [ 'post' ], ...query };
 
 		const select = {
 			hasEntityRecords: jest.fn( () => {} ),
 		};
-
-		const dispatch = Object.assign( jest.fn(), {
-			receiveEntityRecords: jest.fn(),
-			__unstableAcquireStoreLock: jest.fn(),
-			__unstableReleaseStoreLock: jest.fn(),
-		} );
 		// Provide entities
 		dispatch.mockReturnValueOnce( ENTITIES );
 
 		// Provide response
-		triggerFetch.mockImplementation( () => POST_TYPE );
+		triggerFetch.mockImplementation( () => POST_TYPE_RESPONSE );
 
 		await getEntityRecord(
 			'root',
 			'postType',
 			'post',
 			query
-		)( { dispatch, select } );
-
-		// Check resolution cache for an existing entity that fulfills the request with query.
-		expect( select.hasEntityRecords ).toHaveBeenCalledWith(
-			'root',
-			'postType',
-			queryObj
-		);
+		)( { dispatch, select, registry } );
 
 		// Trigger apiFetch, test that the query is present in the url.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
 			path: '/wp/v2/types/post?context=view&_envelope=1',
+			parse: false,
 		} );
 
 		// The record should have been received.
@@ -111,7 +108,7 @@ describe( 'getEntityRecord', () => {
 			'root',
 			'postType',
 			POST_TYPE,
-			queryObj
+			query
 		);
 
 		// Locks should have been acquired and released.
@@ -143,6 +140,7 @@ describe( 'getEntityRecords', () => {
 			baseURLParams: { context: 'edit' },
 		},
 	];
+	const registry = { batch: ( callback ) => callback() };
 
 	beforeEach( async () => {
 		triggerFetch.mockReset();
@@ -160,7 +158,7 @@ describe( 'getEntityRecords', () => {
 		// Provide response
 		triggerFetch.mockImplementation( () => POST_TYPES );
 
-		await getEntityRecords( 'root', 'postType' )( { dispatch } );
+		await getEntityRecords( 'root', 'postType' )( { dispatch, registry } );
 
 		// Fetch request should have been issued.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
@@ -175,7 +173,7 @@ describe( 'getEntityRecords', () => {
 			{},
 			false,
 			undefined,
-			undefined
+			{ totalItems: 2, totalPages: 1 }
 		);
 	} );
 
@@ -191,7 +189,7 @@ describe( 'getEntityRecords', () => {
 		// Provide response
 		triggerFetch.mockImplementation( () => POST_TYPES );
 
-		await getEntityRecords( 'root', 'postType' )( { dispatch } );
+		await getEntityRecords( 'root', 'postType' )( { dispatch, registry } );
 
 		// Fetch request should have been issued.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
@@ -210,10 +208,13 @@ describe( 'getEntityRecords', () => {
 	} );
 
 	it( 'marks specific entity records as resolved', async () => {
+		const finishResolutions = jest.fn();
 		const dispatch = Object.assign( jest.fn(), {
 			receiveEntityRecords: jest.fn(),
+			receiveUserPermissions: jest.fn(),
 			__unstableAcquireStoreLock: jest.fn(),
 			__unstableReleaseStoreLock: jest.fn(),
+			finishResolutions,
 		} );
 		// Provide entities
 		dispatch.mockReturnValueOnce( ENTITIES );
@@ -221,7 +222,7 @@ describe( 'getEntityRecords', () => {
 		// Provide response
 		triggerFetch.mockImplementation( () => POST_TYPES );
 
-		await getEntityRecords( 'root', 'postType' )( { dispatch } );
+		await getEntityRecords( 'root', 'postType' )( { dispatch, registry } );
 
 		// Fetch request should have been issued.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
@@ -229,16 +230,9 @@ describe( 'getEntityRecords', () => {
 		} );
 
 		// The record should have been received.
-		expect( dispatch ).toHaveBeenCalledWith( {
-			type: 'START_RESOLUTIONS',
-			selectorName: 'getEntityRecord',
-			args: [ [ ENTITIES[ 1 ].kind, ENTITIES[ 1 ].name, 2 ] ],
-		} );
-		expect( dispatch ).toHaveBeenCalledWith( {
-			type: 'FINISH_RESOLUTIONS',
-			selectorName: 'getEntityRecord',
-			args: [ [ ENTITIES[ 1 ].kind, ENTITIES[ 1 ].name, 2 ] ],
-		} );
+		expect( finishResolutions ).toHaveBeenCalledWith( 'getEntityRecord', [
+			[ ENTITIES[ 1 ].kind, ENTITIES[ 1 ].name, 2 ],
+		] );
 	} );
 } );
 
@@ -282,26 +276,47 @@ describe( 'getEmbedPreview', () => {
 } );
 
 describe( 'canUser', () => {
-	let registry;
+	const ENTITIES = [
+		{
+			name: 'media',
+			kind: 'root',
+			baseURL: '/wp/v2/media',
+			baseURLParams: { context: 'edit' },
+		},
+		{
+			name: 'wp_block',
+			kind: 'postType',
+			baseURL: '/wp/v2/blocks',
+			baseURLParams: { context: 'edit' },
+		},
+	];
+
+	let dispatch, registry;
 	beforeEach( async () => {
 		registry = {
 			select: jest.fn( () => ( {
 				hasStartedResolution: () => false,
 			} ) ),
+			batch: ( callback ) => callback(),
 		};
+		dispatch = Object.assign( jest.fn(), {
+			receiveUserPermission: jest.fn(),
+			finishResolution: jest.fn(),
+		} );
+		dispatch.mockReturnValue( ENTITIES );
 		triggerFetch.mockReset();
 	} );
 
 	it( 'does nothing when there is an API error', async () => {
-		const dispatch = Object.assign( jest.fn(), {
-			receiveUserPermission: jest.fn(),
-		} );
-
 		triggerFetch.mockImplementation( () =>
 			Promise.reject( { status: 404 } )
 		);
 
 		await canUser( 'create', 'media' )( { dispatch, registry } );
+		await canUser( 'create', { kind: 'root', name: 'media' } )( {
+			dispatch,
+			registry,
+		} );
 
 		expect( triggerFetch ).toHaveBeenCalledWith( {
 			path: '/wp/v2/media',
@@ -312,11 +327,16 @@ describe( 'canUser', () => {
 		expect( dispatch.receiveUserPermission ).not.toHaveBeenCalled();
 	} );
 
-	it( 'receives false when the user is not allowed to perform an action', async () => {
-		const dispatch = Object.assign( jest.fn(), {
-			receiveUserPermission: jest.fn(),
-		} );
+	it( 'throws an error when an entity resource object is malformed', async () => {
+		await expect(
+			canUser( 'create', { name: 'wp_block' } )( {
+				dispatch,
+				registry,
+			} )
+		).rejects.toThrow( 'The entity resource object is not valid.' );
+	} );
 
+	it( 'receives false when the user is not allowed to perform an action', async () => {
 		triggerFetch.mockImplementation( () => ( {
 			headers: new Map( [ [ 'allow', 'GET' ] ] ),
 		} ) );
@@ -335,11 +355,29 @@ describe( 'canUser', () => {
 		);
 	} );
 
-	it( 'receives true when the user is allowed to perform an action', async () => {
-		const dispatch = Object.assign( jest.fn(), {
-			receiveUserPermission: jest.fn(),
+	it( 'receives false when the user is not allowed to perform an action on entities', async () => {
+		triggerFetch.mockImplementation( () => ( {
+			headers: new Map( [ [ 'allow', 'GET' ] ] ),
+		} ) );
+
+		await canUser( 'create', { kind: 'root', name: 'media' } )( {
+			dispatch,
+			registry,
 		} );
 
+		expect( triggerFetch ).toHaveBeenCalledWith( {
+			path: '/wp/v2/media',
+			method: 'OPTIONS',
+			parse: false,
+		} );
+
+		expect( dispatch.receiveUserPermission ).toHaveBeenCalledWith(
+			'create/root/media',
+			false
+		);
+	} );
+
+	it( 'receives true when the user is allowed to perform an action', async () => {
 		triggerFetch.mockImplementation( () => ( {
 			headers: new Map( [ [ 'allow', 'POST, GET, PUT, DELETE' ] ] ),
 		} ) );
@@ -358,11 +396,29 @@ describe( 'canUser', () => {
 		);
 	} );
 
-	it( 'receives true when the user is allowed to perform an action on a specific resource', async () => {
-		const dispatch = Object.assign( jest.fn(), {
-			receiveUserPermission: jest.fn(),
+	it( 'receives true when the user is allowed to perform an action on entities', async () => {
+		triggerFetch.mockImplementation( () => ( {
+			headers: new Map( [ [ 'allow', 'POST, GET, PUT, DELETE' ] ] ),
+		} ) );
+
+		await canUser( 'create', { kind: 'root', name: 'media' } )( {
+			dispatch,
+			registry,
+		} );
+
+		expect( triggerFetch ).toHaveBeenCalledWith( {
+			path: '/wp/v2/media',
+			method: 'OPTIONS',
+			parse: false,
 		} );
 
+		expect( dispatch.receiveUserPermission ).toHaveBeenCalledWith(
+			'create/root/media',
+			true
+		);
+	} );
+
+	it( 'receives true when the user is allowed to perform an action on a specific resource', async () => {
 		triggerFetch.mockImplementation( () => ( {
 			headers: new Map( [ [ 'allow', 'POST, GET, PUT, DELETE' ] ] ),
 		} ) );
@@ -381,12 +437,35 @@ describe( 'canUser', () => {
 		);
 	} );
 
-	it( 'runs apiFetch only once per resource', async () => {
-		const dispatch = Object.assign( jest.fn(), {
-			receiveUserPermission: jest.fn(),
+	it( 'receives true when the user is allowed to perform an action on a specific entity', async () => {
+		triggerFetch.mockImplementation( () => ( {
+			headers: new Map( [ [ 'allow', 'POST, GET, PUT, DELETE' ] ] ),
+		} ) );
+
+		await canUser( 'create', {
+			kind: 'postType',
+			name: 'wp_block',
+			id: 123,
+		} )( {
+			dispatch,
+			registry,
+		} );
+
+		expect( triggerFetch ).toHaveBeenCalledWith( {
+			path: '/wp/v2/blocks/123',
+			method: 'OPTIONS',
+			parse: false,
 		} );
 
+		expect( dispatch.receiveUserPermission ).toHaveBeenCalledWith(
+			'create/postType/wp_block/123',
+			true
+		);
+	} );
+
+	it( 'runs apiFetch only once per resource', async () => {
 		registry = {
+			...registry,
 			select: () => ( {
 				hasStartedResolution: ( _, [ action ] ) => action === 'read',
 			} ),
@@ -411,12 +490,48 @@ describe( 'canUser', () => {
 		);
 	} );
 
-	it( 'retrieves all permissions even when ID is not given', async () => {
-		const dispatch = Object.assign( jest.fn(), {
-			receiveUserPermission: jest.fn(),
+	it( 'runs apiFetch only once per entity', async () => {
+		registry = {
+			...registry,
+			select: () => ( {
+				hasStartedResolution: ( _, [ action ] ) => action === 'read',
+			} ),
+		};
+
+		triggerFetch.mockImplementation( () => ( {
+			headers: new Map( [ [ 'allow', 'POST, GET' ] ] ),
+		} ) );
+
+		await canUser( 'create', {
+			kind: 'postType',
+			name: 'wp_block',
+		} )( {
+			dispatch,
+			registry,
 		} );
+		await canUser( 'read', {
+			kind: 'postType',
+			name: 'wp_block',
+		} )( {
+			dispatch,
+			registry,
+		} );
+
+		expect( triggerFetch ).toHaveBeenCalledTimes( 1 );
 
+		expect( dispatch.receiveUserPermission ).toHaveBeenCalledWith(
+			'create/postType/wp_block',
+			true
+		);
+		expect( dispatch.receiveUserPermission ).toHaveBeenCalledWith(
+			'read/postType/wp_block',
+			true
+		);
+	} );
+
+	it( 'retrieves all permissions even when ID is not given', async () => {
 		registry = {
+			...registry,
 			select: () => ( {
 				hasStartedResolution: ( _, [ action ] ) => action === 'read',
 			} ),
@@ -450,11 +565,8 @@ describe( 'canUser', () => {
 	} );
 
 	it( 'runs apiFetch only once per resource ID', async () => {
-		const dispatch = Object.assign( jest.fn(), {
-			receiveUserPermission: jest.fn(),
-		} );
-
 		registry = {
+			...registry,
 			select: () => ( {
 				hasStartedResolution: ( _, [ action ] ) => action === 'create',
 			} ),
@@ -488,6 +600,59 @@ describe( 'canUser', () => {
 			true
 		);
 	} );
+
+	it( 'runs apiFetch only once per entity ID', async () => {
+		registry = {
+			...registry,
+			select: () => ( {
+				hasStartedResolution: ( _, [ action ] ) => action === 'create',
+			} ),
+		};
+
+		triggerFetch.mockImplementation( () => ( {
+			headers: new Map( [ [ 'allow', 'POST, GET, PUT, DELETE' ] ] ),
+		} ) );
+
+		await canUser( 'create', {
+			kind: 'postType',
+			name: 'wp_block',
+			id: 123,
+		} )( { dispatch, registry } );
+		await canUser( 'read', {
+			kind: 'postType',
+			name: 'wp_block',
+			id: 123,
+		} )( { dispatch, registry } );
+		await canUser( 'update', {
+			kind: 'postType',
+			name: 'wp_block',
+			id: 123,
+		} )( { dispatch, registry } );
+		await canUser( 'delete', {
+			kind: 'postType',
+			name: 'wp_block',
+			id: 123,
+		} )( { dispatch, registry } );
+
+		expect( triggerFetch ).toHaveBeenCalledTimes( 1 );
+
+		expect( dispatch.receiveUserPermission ).toHaveBeenCalledWith(
+			'create/postType/wp_block/123',
+			true
+		);
+		expect( dispatch.receiveUserPermission ).toHaveBeenCalledWith(
+			'read/postType/wp_block/123',
+			true
+		);
+		expect( dispatch.receiveUserPermission ).toHaveBeenCalledWith(
+			'update/postType/wp_block/123',
+			true
+		);
+		expect( dispatch.receiveUserPermission ).toHaveBeenCalledWith(
+			'delete/postType/wp_block/123',
+			true
+		);
+	} );
 } );
 
 describe( 'getAutosaves', () => {
diff --git a/packages/core-data/src/test/selectors.js b/packages/core-data/src/test/selectors.js
index 43c84a3e978917..4b5e8417ad2028 100644
--- a/packages/core-data/src/test/selectors.js
+++ b/packages/core-data/src/test/selectors.js
@@ -18,7 +18,6 @@ import {
 	getEmbedPreview,
 	isPreviewEmbedFallback,
 	canUser,
-	canUserEditEntityRecord,
 	getAutosave,
 	getAutosaves,
 	getCurrentUser,
@@ -690,79 +689,43 @@ describe( 'canUser', () => {
 			userPermissions: {},
 		} );
 		expect( canUser( state, 'create', 'media' ) ).toBe( undefined );
+		expect(
+			canUser( state, 'create', { kind: 'root', name: 'media' } )
+		).toBe( undefined );
+	} );
+
+	it( 'returns null when entity kind or name is missing', () => {
+		const state = deepFreeze( {
+			userPermissions: {},
+		} );
+		expect( canUser( state, 'create', { name: 'media' } ) ).toBe( false );
+		expect( canUser( state, 'create', { kind: 'root' } ) ).toBe( false );
 	} );
 
 	it( 'returns whether an action can be performed', () => {
 		const state = deepFreeze( {
 			userPermissions: {
 				'create/media': false,
+				'create/root/media': false,
 			},
 		} );
 		expect( canUser( state, 'create', 'media' ) ).toBe( false );
+		expect(
+			canUser( state, 'create', { kind: 'root', name: 'media' } )
+		).toBe( false );
 	} );
 
 	it( 'returns whether an action can be performed for a given resource', () => {
 		const state = deepFreeze( {
 			userPermissions: {
 				'create/media/123': false,
+				'create/root/media/123': false,
 			},
 		} );
 		expect( canUser( state, 'create', 'media', 123 ) ).toBe( false );
-	} );
-} );
-
-describe( 'canUserEditEntityRecord', () => {
-	it( 'returns false by default', () => {
-		const state = deepFreeze( {
-			userPermissions: {},
-			entities: { records: {} },
-		} );
-		expect( canUserEditEntityRecord( state, 'postType', 'post' ) ).toBe(
-			false
-		);
-	} );
-
-	it( 'returns whether the user can edit', () => {
-		const state = deepFreeze( {
-			userPermissions: {
-				'create/posts': false,
-				'update/posts/1': true,
-			},
-			entities: {
-				config: [
-					{
-						kind: 'postType',
-						name: 'post',
-						__unstable_rest_base: 'posts',
-					},
-				],
-				records: {
-					root: {
-						postType: {
-							queriedData: {
-								items: {
-									default: {
-										post: {
-											slug: 'post',
-											__unstable: 'posts',
-										},
-									},
-								},
-								itemIsComplete: {
-									default: {
-										post: true,
-									},
-								},
-								queries: {},
-							},
-						},
-					},
-				},
-			},
-		} );
 		expect(
-			canUserEditEntityRecord( state, 'postType', 'post', '1' )
-		).toBe( true );
+			canUser( state, 'create', { kind: 'root', name: 'media', id: 123 } )
+		).toBe( false );
 	} );
 } );
 
diff --git a/packages/core-data/src/utils/index.js b/packages/core-data/src/utils/index.js
index d4d491fab9827d..189635647779e5 100644
--- a/packages/core-data/src/utils/index.js
+++ b/packages/core-data/src/utils/index.js
@@ -9,3 +9,8 @@ export { default as isRawAttribute } from './is-raw-attribute';
 export { default as setNestedValue } from './set-nested-value';
 export { default as getNestedValue } from './get-nested-value';
 export { default as isNumericID } from './is-numeric-id';
+export {
+	getUserPermissionCacheKey,
+	getUserPermissionsFromAllowHeader,
+	ALLOWED_RESOURCE_ACTIONS,
+} from './user-permissions';
diff --git a/packages/core-data/src/utils/user-permissions.js b/packages/core-data/src/utils/user-permissions.js
new file mode 100644
index 00000000000000..f1f02b5f5ba702
--- /dev/null
+++ b/packages/core-data/src/utils/user-permissions.js
@@ -0,0 +1,37 @@
+export const ALLOWED_RESOURCE_ACTIONS = [
+	'create',
+	'read',
+	'update',
+	'delete',
+];
+
+export function getUserPermissionsFromAllowHeader( allowedMethods ) {
+	const permissions = {};
+	if ( ! allowedMethods ) {
+		return permissions;
+	}
+
+	const methods = {
+		create: 'POST',
+		read: 'GET',
+		update: 'PUT',
+		delete: 'DELETE',
+	};
+	for ( const [ actionName, methodName ] of Object.entries( methods ) ) {
+		permissions[ actionName ] = allowedMethods.includes( methodName );
+	}
+
+	return permissions;
+}
+
+export function getUserPermissionCacheKey( action, resource, id ) {
+	const key = (
+		typeof resource === 'object'
+			? [ action, resource.kind, resource.name, resource.id ]
+			: [ action, resource, id ]
+	)
+		.filter( Boolean )
+		.join( '/' );
+
+	return key;
+}
diff --git a/packages/core-data/tsconfig.json b/packages/core-data/tsconfig.json
index 0fb848f411d8ea..26602d82ab0c01 100644
--- a/packages/core-data/tsconfig.json
+++ b/packages/core-data/tsconfig.json
@@ -1,9 +1,9 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
 		"declarationDir": "build-types",
-		"noUnusedParameters": false,
 		"checkJs": false,
 		"noImplicitAny": false
 	},
@@ -21,7 +21,8 @@
 		{ "path": "../rich-text" },
 		{ "path": "../sync" },
 		{ "path": "../undo-manager" },
-		{ "path": "../url" }
+		{ "path": "../url" },
+		{ "path": "../warning" }
 	],
 	"include": [ "src/**/*" ]
 }
diff --git a/packages/create-block-interactive-template/.npmrc b/packages/create-block-interactive-template/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/create-block-interactive-template/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/create-block-interactive-template/CHANGELOG.md b/packages/create-block-interactive-template/CHANGELOG.md
index fbe3a8c8c857c8..24dcfd52b7b586 100644
--- a/packages/create-block-interactive-template/CHANGELOG.md
+++ b/packages/create-block-interactive-template/CHANGELOG.md
@@ -1,14 +1,77 @@
 <!-- Learn how to maintain this file at https://github.com/WordPress/gutenberg/tree/HEAD/packages#maintaining-changelogs. -->
 
-## Unreleased
+## 2.8.0 (2024-09-19)
 
--   Update template to use modules instead of scripts. [#56694](https://github.com/WordPress/gutenberg/pull/56694)
+### Enhancements
+
+-   Added TypeScript variant of the template ([#64577](https://github.com/WordPress/gutenberg/pull/64577)).
+
+## 2.7.0 (2024-09-05)
+
+### Enhancements
+
+-   Set the minimum supported WordPress version to 6.6 to make it work seamlessly with the latest version of `@wordpress/scripts` package ([#64920](https://github.com/WordPress/gutenberg/pull/64920)).
+
+## 2.6.0 (2024-08-21)
+
+## 2.5.0 (2024-08-07)
+
+## 2.4.0 (2024-07-24)
+
+## 2.3.0 (2024-07-10)
+
+## 2.2.0 (2024-06-26)
+
+## 2.1.0 (2024-06-15)
+
+## 2.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 1.21.0 (2024-05-16)
+
+## 1.20.0 (2024-05-02)
+
+## 1.19.0 (2024-04-19)
+
+## 1.18.0 (2024-04-03)
+
+## 1.17.0 (2024-03-21)
+
+### Enhancements
+
+-   Update the template to use `wp_interactivity_data_wp_context` for the context attribute ([#59995](https://github.com/WordPress/gutenberg/pull/59995)).
+
+## 1.16.0 (2024-03-06)
+
+## 1.15.0 (2024-02-21)
+
+## 1.14.0 (2024-02-09)
+
+## 1.13.0 (2024-01-24)
+
+## 1.12.0 (2024-01-10)
+
+### Enhancements
+
+-   Update the template to use `viewModule` in block.json ([#57712](https://github.com/WordPress/gutenberg/pull/57712)).
+
+## 1.11.0 (2023-12-13)
+
+-   Add all files to the generated plugin zip ([#56943](https://github.com/WordPress/gutenberg/pull/56943)).
+-   Prevent crash when Gutenberg plugin is not installed ([#56941](https://github.com/WordPress/gutenberg/pull/56941)).
+
+## 1.10.1 (2023-12-07)
+
+-   Update template to use modules instead of scripts ([#56694](https://github.com/WordPress/gutenberg/pull/56694)).
 
 ## 1.10.0 (2023-11-29)
 
-### Enhancement
+### Enhancements
 
--   Update `view.js` and `render.php` templates to the new `store()` API. [#56613](https://github.com/WordPress/gutenberg/pull/56613)
+-   Update `view.js` and `render.php` templates to the new `store()` API ([#56613](https://github.com/WordPress/gutenberg/pull/56613)).
 
 ## 1.9.0 (2023-11-16)
 
@@ -26,6 +89,6 @@
 
 ## 1.2.0 (2023-08-10)
 
-### Enhancement
+### Enhancements
 
--   Moves the `example` property into block.json by leveraging changes to create-block to now support `example`. [#52801](https://github.com/WordPress/gutenberg/pull/52801)
+-   Moves the `example` property into block.json by leveraging changes to create-block to now support `example` ([#52801](https://github.com/WordPress/gutenberg/pull/52801)).
diff --git a/packages/create-block-interactive-template/README.md b/packages/create-block-interactive-template/README.md
index cc0530c0630549..b50adb49265245 100644
--- a/packages/create-block-interactive-template/README.md
+++ b/packages/create-block-interactive-template/README.md
@@ -1,15 +1,17 @@
 # Create Block Interactive Template
 
-This is a template for [`@wordpress/create-block`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/create-block/README.md) to create interactive blocks
+This is a template for [`@wordpress/create-block`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/create-block/README.md) to create interactive blocks.
 
 ## Usage
 
 This block template can be used by running the following command:
 
 ```bash
-npx  @wordpress/create-block --template @wordpress/create-block-interactive-template
+npx @wordpress/create-block --template @wordpress/create-block-interactive-template
 ```
 
+It requires at least WordPress 6.5 or Gutenberg 17.7.
+
 ## Contributing to this package
 
 This is an individual package that's part of the Gutenberg project. The project is organized as a monorepo. It's made up of multiple self-contained software packages, each with a specific purpose. The packages in this monorepo are published to [npm](https://www.npmjs.com/) and used by [WordPress](https://make.wordpress.org/core/) as well as other software projects.
diff --git a/packages/create-block-interactive-template/block-templates/README.md.mustache b/packages/create-block-interactive-template/block-templates/README.md.mustache
index 728f37b8c0e39f..4a13743750f748 100644
--- a/packages/create-block-interactive-template/block-templates/README.md.mustache
+++ b/packages/create-block-interactive-template/block-templates/README.md.mustache
@@ -1,16 +1,6 @@
 # Interactive Block
 
-> **Warning**
-> **This block requires Gutenberg 16.2 or superior to work**. The Interactivity API is, at the moment, not part of WordPress Core as it is still very experimental, and very likely to change. 
-
 > **Note**
-> This block uses the API shared at [Proposal: The Interactivity API – A better developer experience in building interactive blocks](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/). 
+> Check the [Interactivity API Reference docs in the Block Editor handbook](https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/) to learn more about the Interactivity API.
 
-{{#isBasicVariant}}
 This block has been created with the `create-block-interactive-template` and shows a basic structure of an interactive block that uses the Interactivity API.
-{{/isBasicVariant}}
-
-Check the following resources for more info about the Interactivity API:
-- [`@wordpress/interactivity` package](https://github.com/WordPress/gutenberg/blob/trunk/packages/interactivity/README.md)
-- [Proposal: The Interactivity API – A better developer experience in building interactive blocks](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/)
-- [“Interactivity API” category](https://github.com/WordPress/gutenberg/discussions/categories/interactivity-api) in Gutenberg repo discussions
\ No newline at end of file
diff --git a/packages/create-block-interactive-template/block-templates/render.php.mustache b/packages/create-block-interactive-template/block-templates/render.php.mustache
index 01cbe6ed83cfb5..4f84b30dbcdbdd 100644
--- a/packages/create-block-interactive-template/block-templates/render.php.mustache
+++ b/packages/create-block-interactive-template/block-templates/render.php.mustache
@@ -1,4 +1,3 @@
-{{#isBasicVariant}}
 <?php
 /**
  * PHP file to use when rendering the block type on the server to show on the front end.
@@ -11,21 +10,35 @@
  * @see https://github.com/WordPress/gutenberg/blob/trunk/docs/reference-guides/block-api/block-metadata.md#render
  */
 
-// Generate unique id for aria-controls.
+// Generates a unique id for aria-controls.
 $unique_id = wp_unique_id( 'p-' );
 
-// Enqueue the view file.
-gutenberg_enqueue_module( '{{namespace}}-view' );
+// Adds the global state.
+wp_interactivity_state(
+	'{{namespace}}',
+	array(
+		'isDark'    => false,
+		'darkText'  => esc_html__( 'Switch to Light', '{{textdomain}}' ),
+		'lightText' => esc_html__( 'Switch to Dark', '{{textdomain}}' ),
+		'themeText'	=> esc_html__( 'Switch to Dark', '{{textdomain}}' ),
+	)
+);
 ?>
 
 <div
 	<?php echo get_block_wrapper_attributes(); ?>
-	data-wp-interactive='{ "namespace": "{{namespace}}" }'
-	data-wp-context='{ "isOpen": false }'
+	data-wp-interactive="{{namespace}}"
+	<?php echo wp_interactivity_data_wp_context( array( 'isOpen' => false ) ); ?>
 	data-wp-watch="callbacks.logIsOpen"
+	data-wp-class--dark-theme="state.isDark"
 >
 	<button
-		data-wp-on--click="actions.toggle"
+		data-wp-on--click="actions.toggleTheme"
+		data-wp-text="state.themeText"
+	></button>
+
+	<button
+		data-wp-on--click="actions.toggleOpen"
 		data-wp-bind--aria-expanded="context.isOpen"
 		aria-controls="<?php echo esc_attr( $unique_id ); ?>"
 	>
@@ -41,4 +54,3 @@ gutenberg_enqueue_module( '{{namespace}}-view' );
 		?>
 	</p>
 </div>
-{{/isBasicVariant}}
diff --git a/packages/create-block-interactive-template/block-templates/style.scss.mustache b/packages/create-block-interactive-template/block-templates/style.scss.mustache
index 1c73fa1c38ff94..c8aa9f232136e2 100644
--- a/packages/create-block-interactive-template/block-templates/style.scss.mustache
+++ b/packages/create-block-interactive-template/block-templates/style.scss.mustache
@@ -9,4 +9,19 @@
 	font-size: 1em;
 	background: #ffff001a;
 	padding: 1em;
+
+	&.dark-theme {
+		background: #333;
+		color: #fff;
+
+		button {
+			background: #555;
+			color: #fff;
+			border: 1px solid #777;
+		}
+
+		p {
+			color: #ddd;
+		}
+	}
 }
diff --git a/packages/create-block-interactive-template/block-templates/view.js.mustache b/packages/create-block-interactive-template/block-templates/view.js.mustache
index b4bae3939461dd..3fcf1ba365d265 100644
--- a/packages/create-block-interactive-template/block-templates/view.js.mustache
+++ b/packages/create-block-interactive-template/block-templates/view.js.mustache
@@ -1,15 +1,23 @@
-{{#isBasicVariant}}
+{{#isDefaultVariant}}
 /**
  * WordPress dependencies
  */
-import { store, getContext } from "@wordpress/interactivity";
+import { store, getContext } from '@wordpress/interactivity';
 
-store( '{{namespace}}', {
+const { state } = store( '{{namespace}}', {
+	state: {
+		get themeText() {
+			return state.isDark ? state.darkText : state.lightText;
+		}
+	},
 	actions: {
-		toggle: () => {
+		toggleOpen() {
 			const context = getContext();
 			context.isOpen = ! context.isOpen;
 		},
+		toggleTheme() {
+			state.isDark = ! state.isDark;
+		}
 	},
 	callbacks: {
 		logIsOpen: () => {
@@ -19,5 +27,4 @@ store( '{{namespace}}', {
 		},
 	},
 } );
-
-{{/isBasicVariant}}
+{{/isDefaultVariant}}
diff --git a/packages/create-block-interactive-template/block-templates/view.ts.mustache b/packages/create-block-interactive-template/block-templates/view.ts.mustache
new file mode 100644
index 00000000000000..11670442d73704
--- /dev/null
+++ b/packages/create-block-interactive-template/block-templates/view.ts.mustache
@@ -0,0 +1,46 @@
+{{#isTypescriptVariant}}
+/**
+ * WordPress dependencies
+ */
+import { store, getContext } from '@wordpress/interactivity';
+
+type ServerState = {
+	state: {
+		isDark: boolean;
+		darkText: string;
+		lightText: string;
+	};
+};
+
+type Context = {
+	isOpen: boolean;
+};
+
+const storeDef = {
+	state: {
+		get themeText(): string {
+			return state.isDark ? state.darkText : state.lightText;
+		}
+	},
+	actions: {
+		toggleOpen() {
+			const context = getContext< Context >();
+			context.isOpen = ! context.isOpen;
+		},
+		toggleTheme() {
+			state.isDark = ! state.isDark;
+		}
+	},
+	callbacks: {
+		logIsOpen: () => {
+			const { isOpen } = getContext< Context >();
+			// Log the value of `isOpen` each time it changes.
+			console.log( `Is open: ${ isOpen }` );
+		},
+	},
+};
+
+type Store = ServerState & typeof storeDef;
+
+const { state } = store< Store >( '{{namespace}}', storeDef );
+{{/isTypescriptVariant}}
diff --git a/packages/create-block-interactive-template/index.js b/packages/create-block-interactive-template/index.js
index b2682600f7af6d..94f615df2747f2 100644
--- a/packages/create-block-interactive-template/index.js
+++ b/packages/create-block-interactive-template/index.js
@@ -7,17 +7,31 @@ module.exports = {
 	defaultValues: {
 		slug: 'example-interactive',
 		title: 'Example Interactive',
-		description: 'An interactive block with the Interactivity API',
+		description: 'An interactive block with the Interactivity API.',
 		dashicon: 'media-interactive',
 		npmDependencies: [ '@wordpress/interactivity' ],
+		customPackageJSON: { files: [ '[^.]*' ] },
 		supports: {
 			interactivity: true,
 		},
+		viewScript: null,
+		viewScriptModule: 'file:./view.js',
 		render: 'file:./render.php',
 		example: {},
+		customScripts: {
+			build: 'wp-scripts build --experimental-modules',
+			start: 'wp-scripts start --experimental-modules',
+		},
 	},
 	variants: {
-		basic: {},
+		default: {},
+		typescript: {
+			slug: 'example-interactive-typescript',
+			title: 'Example Interactive TypeScript',
+			description:
+				'An interactive block with the Interactivity API using TypeScript.',
+			viewScriptModule: 'file:./view.ts',
+		},
 	},
 	pluginTemplatesPath: join( __dirname, 'plugin-templates' ),
 	blockTemplatesPath: join( __dirname, 'block-templates' ),
diff --git a/packages/create-block-interactive-template/package.json b/packages/create-block-interactive-template/package.json
index 48723b3b756d12..d400d77a49ab67 100644
--- a/packages/create-block-interactive-template/package.json
+++ b/packages/create-block-interactive-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-interactive-template",
-	"version": "1.10.0",
+	"version": "2.10.0",
 	"description": "Template for @wordpress/create-block to create interactive blocks with the Interactivity API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,6 +19,10 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
 	"publishConfig": {
 		"access": "public"
 	}
diff --git a/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache b/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache
index 73726b930e4728..48469aa7d0d931 100644
--- a/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache
+++ b/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache
@@ -8,8 +8,8 @@
  * Description:       {{description}}
 {{/description}}
  * Version:           {{version}}
- * Requires at least: 6.1
- * Requires PHP:      7.0
+ * Requires at least: 6.6
+ * Requires PHP:      7.2
 {{#author}}
  * Author:            {{author}}
 {{/author}}
@@ -42,13 +42,6 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function {{namespaceSnakeCase}}_{{slugSnakeCase}}_block_init() {
-	register_block_type( __DIR__ . '/build' );
-
-	gutenberg_register_module(
-		'{{namespace}}-view',
-		plugin_dir_url( __FILE__ ) . 'src/view.js',
-		array( '@wordpress/interactivity' ),
-		'{{version}}'
-	);
+	register_block_type_from_metadata( __DIR__ . '/build' );
 }
 add_action( 'init', '{{namespaceSnakeCase}}_{{slugSnakeCase}}_block_init' );
diff --git a/packages/create-block-interactive-template/plugin-templates/readme.txt.mustache b/packages/create-block-interactive-template/plugin-templates/readme.txt.mustache
index f069906fb19fa5..c3abf5ae4ec024 100644
--- a/packages/create-block-interactive-template/plugin-templates/readme.txt.mustache
+++ b/packages/create-block-interactive-template/plugin-templates/readme.txt.mustache
@@ -3,7 +3,7 @@
 Contributors:      {{author}}
 {{/author}}
 Tags:              block
-Tested up to:      6.1
+Tested up to:      6.6
 Stable tag:        {{version}}
 {{#license}}
 License:           {{license}}
diff --git a/packages/create-block-tutorial-template/.npmrc b/packages/create-block-tutorial-template/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/create-block-tutorial-template/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/create-block-tutorial-template/CHANGELOG.md b/packages/create-block-tutorial-template/CHANGELOG.md
index b64329f7c7856c..8b4b467a1b4366 100644
--- a/packages/create-block-tutorial-template/CHANGELOG.md
+++ b/packages/create-block-tutorial-template/CHANGELOG.md
@@ -2,11 +2,63 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+### Enhancements
+
+-   Set the minimum supported WordPress version to 6.6 to make it work seamlessly with the latest version of `@wordpress/scripts` package ([#64920](https://github.com/WordPress/gutenberg/pull/64920)).
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.12.0 (2024-05-16)
+
+## 3.11.0 (2024-05-02)
+
+## 3.10.0 (2024-04-19)
+
+## 3.9.0 (2024-04-03)
+
+## 3.8.0 (2024-03-21)
+
+## 3.7.0 (2024-03-06)
+
+## 3.6.0 (2024-02-21)
+
+## 3.5.0 (2024-02-09)
+
+## 3.4.0 (2024-01-24)
+
+## 3.3.0 (2024-01-10)
+
+## 3.2.0 (2023-12-13)
+
 ## 3.1.0 (2023-11-29)
 
 ## 3.0.0 (2023-11-16)
 
-### Breaking Change
+### Breaking Changes
 
 -   Update the block example scaffolded by the template.
 
@@ -60,7 +112,7 @@
 
 ## 2.9.0 (2022-11-02)
 
-### Enhancement
+### Enhancements
 
 -   Update templates to use the `render` field in `block.json` introduced in WordPress 6.1 ([#44185](https://github.com/WordPress/gutenberg/pull/44185)).
 
@@ -72,59 +124,59 @@
 
 ## 2.5.0 (2022-08-24)
 
-### Enhancement
+### Enhancements
 
 -   Add support to the `dynamic` variant ([#41289](https://github.com/WordPress/gutenberg/pull/41289), [#43481](https://github.com/WordPress/gutenberg/pull/43481)).
 
 ## 2.3.0 (2022-06-01)
 
-### Enhancement
+### Enhancements
 
 -   Read the block name from `block.json` file in JavaScript files ([#41273](https://github.com/WordPress/gutenberg/pull/41273)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix the issue with the block wrapper in the editor ([#41273](https://github.com/WordPress/gutenberg/pull/41273)).
 
 ## 2.1.0 (2022-04-21)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix some CSS Coding Standards violations in file templates ([#40479](https://github.com/WordPress/gutenberg/pull/40479)).
 
 ## 2.0.0 (2022-03-03)
 
-### Breaking Change
+### Breaking Changes
 
 -   Bring project's template compatibility with `@wordpress/create-block` v3 ([#39049](https://github.com/WordPress/gutenberg/pull/39049)).
 
-### Enhancement
+### Enhancements
 
 -   Update project template configuration and templates to synchronize with the updated [Create a Block Tutorial](https://developer.wordpress.org/block-editor/getting-started/create-block/) ([#39049](https://github.com/WordPress/gutenberg/pull/39049)).
 
 ## 1.4.0 (2022-01-27)
 
-### Enhancement
+### Enhancements
 
 -   Speed up scaffolding process by omitting WordPress dependencies in the template ([#37639](https://github.com/WordPress/gutenberg/pull/37639)).
 -   Update link to block registration reference ([#37674](https://github.com/WordPress/gutenberg/pull/37674))
 
 ## 1.3.0 (2021-07-21)
 
-### Enhancement
+### Enhancements
 
 -   Plugin scaffolded requires WordPress 5.8 now ([#33252](https://github.com/WordPress/gutenberg/pull/33252).
 -   Scaffolded block is now registered from `block.json` with the `register_block_type` helper ([#33252](https://github.com/WordPress/gutenberg/pull/33252)).
 
 ## 1.2.0 (2021-04-06)
 
-### Enhancement
+### Enhancements
 
 -   Scaffolded plugin requires WordPress 5.7 now ([#29757](https://github.com/WordPress/gutenberg/pull/29757).
 
 ## 1.1.0 (2021-03-17)
 
-### Enhancement
+### Enhancements
 
 -   Scaffolded block is now registered from `block.json` with the `register_block_type_from_metadata` helper ([#28883](https://github.com/WordPress/gutenberg/pull/28883)).
 
diff --git a/packages/create-block-tutorial-template/README.md b/packages/create-block-tutorial-template/README.md
index f883ff5fb79d47..cf9cfe99a0d376 100644
--- a/packages/create-block-tutorial-template/README.md
+++ b/packages/create-block-tutorial-template/README.md
@@ -7,7 +7,7 @@ This is a template for [`@wordpress/create-block`](https://github.com/WordPress/
 This block template can be used by running the following command:
 
 ```bash
-npx  @wordpress/create-block --template @wordpress/create-block-tutorial-template
+npx @wordpress/create-block --template @wordpress/create-block-tutorial-template
 ```
 
 Use the default options when prompted in the terminal.
diff --git a/packages/create-block-tutorial-template/package.json b/packages/create-block-tutorial-template/package.json
index 0fb9df38f3ae72..42ae74d8eeeb90 100644
--- a/packages/create-block-tutorial-template/package.json
+++ b/packages/create-block-tutorial-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-tutorial-template",
-	"version": "3.1.0",
+	"version": "4.10.0",
 	"description": "This is a template for @wordpress/create-block that creates an example 'Copyright Date' block. This block is used in the official WordPress block development Quick Start Guide.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,6 +19,10 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
 	"publishConfig": {
 		"access": "public"
 	}
diff --git a/packages/create-block-tutorial-template/plugin-templates/$slug.php.mustache b/packages/create-block-tutorial-template/plugin-templates/$slug.php.mustache
index 6de24df94c8d83..7ce4be3f7cc739 100644
--- a/packages/create-block-tutorial-template/plugin-templates/$slug.php.mustache
+++ b/packages/create-block-tutorial-template/plugin-templates/$slug.php.mustache
@@ -8,8 +8,8 @@
  * Description:       {{description}}
 {{/description}}
  * Version:           {{version}}
- * Requires at least: 6.2
- * Requires PHP:      7.0
+ * Requires at least: 6.6
+ * Requires PHP:      7.2
 {{#author}}
  * Author:            {{author}}
 {{/author}}
diff --git a/packages/create-block-tutorial-template/plugin-templates/readme.txt.mustache b/packages/create-block-tutorial-template/plugin-templates/readme.txt.mustache
index d2b31bed6c0e60..c3abf5ae4ec024 100644
--- a/packages/create-block-tutorial-template/plugin-templates/readme.txt.mustache
+++ b/packages/create-block-tutorial-template/plugin-templates/readme.txt.mustache
@@ -3,7 +3,7 @@
 Contributors:      {{author}}
 {{/author}}
 Tags:              block
-Tested up to:      6.4
+Tested up to:      6.6
 Stable tag:        {{version}}
 {{#license}}
 License:           {{license}}
diff --git a/packages/create-block/.npmrc b/packages/create-block/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/create-block/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/create-block/CHANGELOG.md b/packages/create-block/CHANGELOG.md
index b01e01038d12fa..87e647ec03dc03 100644
--- a/packages/create-block/CHANGELOG.md
+++ b/packages/create-block/CHANGELOG.md
@@ -2,6 +2,78 @@
 
 ## Unreleased
 
+## 4.53.0 (2024-10-16)
+
+## 4.52.0 (2024-10-03)
+
+## 4.51.0 (2024-09-19)
+
+## 4.50.0 (2024-09-05)
+
+### Enhancements
+
+-   Unpin the `@wordpress/scripts` version and set the minimum supported WordPress version to 6.6 ([#64920](https://github.com/WordPress/gutenberg/pull/64920)).
+
+## 4.49.0 (2024-08-21)
+
+## 4.48.0 (2024-08-07)
+
+## 4.47.0 (2024-07-24)
+
+## 4.46.0 (2024-07-10)
+
+## 4.45.0 (2024-06-26)
+
+## 4.44.0 (2024-06-15)
+
+### Bug fix
+
+-   Pin the `@wordpress/scripts` version to a version supported by WordPress 6.5 ([#62234](https://github.com/WordPress/gutenberg/pull/62234)).
+
+## 4.43.0 (2024-05-31)
+
+## 4.42.0 (2024-05-16)
+
+### Breaking Change
+
+-   Increase the minimum required Node.js version to v20.10.0 matching the support defined for Gutenberg and WordPress core ([#61430](https://github.com/WordPress/gutenberg/pull/61430)).
+
+## 4.41.0 (2024-05-02)
+
+## 4.40.0 (2024-04-19)
+
+## 4.39.0 (2024-04-03)
+
+### New Features
+
+-   Add new `namespacePascalCase` template variable ([#60223](https://github.com/WordPress/gutenberg/pull/60223)).
+
+## 4.38.0 (2024-03-21)
+
+## 4.37.0 (2024-03-06)
+
+## 4.36.0 (2024-02-21)
+
+### Bug Fixes
+
+-   Add missing `viewScriptModule` field ([#59140](https://github.com/WordPress/gutenberg/pull/59140)).
+
+### Internal
+
+-   Remove deprecated `viewModule` field ([#59198](https://github.com/WordPress/gutenberg/pull/59198)).
+
+## 4.35.0 (2024-02-09)
+
+## 4.34.0 (2024-01-24)
+
+## 4.33.0 (2024-01-10)
+
+### New Features
+
+-   Add support for the `viewModule` property ([#57712](https://github.com/WordPress/gutenberg/pull/57712)).
+
+## 4.32.0 (2023-12-13)
+
 ## 4.31.0 (2023-11-29)
 
 ## 4.30.0 (2023-11-16)
@@ -10,7 +82,7 @@
 
 ## 4.28.0 (2023-10-18)
 
-### New Feature
+### New Features
 
 -   Add new `transformer` property to external templates to allow customization of any values being passed from cli or the template.[#55423](https://github.com/WordPress/gutenberg/pull/55423)
 
@@ -24,13 +96,13 @@
 
 ## 4.23.0 (2023-08-10)
 
-### Enhancement
+### Enhancements
 
 -   Add support for the `example` property and add it to the default template ([#52803](https://github.com/WordPress/gutenberg/pull/52803)).
 
 ## 4.22.0 (2023-07-20)
 
-### Enhancement
+### Enhancements
 
 -   Add support for the `viewScript` property ([#52612](https://github.com/WordPress/gutenberg/pull/52612)).
 
@@ -68,13 +140,13 @@
 
 ## 4.5.0 (2022-11-02)
 
-### Enhancement
+### Enhancements
 
 -   Update templates to use the `render` field in `block.json` introduced in WordPress 6.1 ([#44185](https://github.com/WordPress/gutenberg/pull/44185)).
 
 ## 4.4.0 (2022-10-19)
 
-### New Feature
+### New Features
 
 -   Add new `customPackageJSON` and `customBlockJSON` keys to allow templates to define custom keys for the resulting `package.json` and `block.json` files respectively.[#44649](https://github.com/WordPress/gutenberg/pull/44649)
 
@@ -84,30 +156,30 @@
 
 ## 4.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 and minimum npm version to 6.14.4 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
-### New Feature
+### New Features
 
 -   Add `--no-plugin` flag to allow scaffolding of a block in an existing plugin ([#41642](https://github.com/WordPress/gutenberg/pull/41642))
 -   Introduce the `--variant` flag to allow selection of a variant as defined in the template ([#41289](https://github.com/WordPress/gutenberg/pull/41289), [#43481](https://github.com/WordPress/gutenberg/pull/43481)).
 
 ## 3.6.0 (2022-07-13)
 
-### Enhancement
+### Enhancements
 
 -   Added prompt to continue when minimum system requirements not met ([#42151](https://github.com/WordPress/gutenberg/pull/42151)).
 
 ## 3.3.0 (2022-06-01)
 
-### Enhancement
+### Enhancements
 
 -   Read the block name from `block.json` file in JavaScript files ([#41273](https://github.com/WordPress/gutenberg/pull/41273)).
 
 ## 3.2.0 (2022-05-18)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix the `.editorconfig` file include to work correctly with YAML files ([#40994](https://github.com/WordPress/gutenberg/pull/40994)).
 
@@ -156,7 +228,7 @@
 -   Add support for handling block templates with the `blockTemplatesPath` field in the external template configuration ([#37612](https://github.com/WordPress/gutenberg/pull/37612)).
 -   Add a new field `folderName` for setting the location for the `block.json` file and other optional block files generated from block templates included in the folder set with the `blockTemplatesPath` setting ([#37612](https://github.com/WordPress/gutenberg/pull/37612)).
 
-### Enhancement
+### Enhancements
 
 -   Speed up scaffolding process by omitting WordPress dependencies in the template ([#37639](https://github.com/WordPress/gutenberg/pull/37639)).
 -   Update link to block registration reference ([#37674](https://github.com/WordPress/gutenberg/pull/37674))
@@ -186,21 +258,21 @@
 
 ## 2.4.0 (2021-07-21)
 
-### Enhancement
+### Enhancements
 
 -   Plugin scaffolded with the `esnext` template requires WordPress 5.8 now ([#33252](https://github.com/WordPress/gutenberg/pull/33252).
 -   Block scaffolded with the `esnext` template is now registered from `block.json` with the `register_block_type` helper ([#33252](https://github.com/WordPress/gutenberg/pull/33252)).
 
 ## 2.3.0 (2021-04-29)
 
-### Enhancement
+### Enhancements
 
 -   Rename `format:js` script to `format` ([#30240](https://github.com/WordPress/gutenberg/pull/30240)).
 -   Updated `.editorconfig` template files to work with automatic file formatting ([#30794](https://github.com/WordPress/gutenberg/pull/30794)).
 
 ## 2.2.0 (2021-04-06)
 
-### Enhancement
+### Enhancements
 
 -   Scaffolded plugin requires WordPress 5.7 now ([#29757](https://github.com/WordPress/gutenberg/pull/29757)).
 
@@ -214,7 +286,7 @@
 
 -   Add a way to provide a default value in the template for `attributes` and `supports` Block API fields ([#28883](https://github.com/WordPress/gutenberg/pull/28883)).
 
-### Enhancement
+### Enhancements
 
 -   Block scaffolded with `esnext` template is now registered from `block.json` with the `register_block_type_from_metadata` helper ([#28883](https://github.com/WordPress/gutenberg/pull/28883)).
 
@@ -225,7 +297,7 @@
 
 ## 2.0.1 (2021-02-01)
 
-### Bug Fix
+### Bug Fixes
 
 -   Extract the package name from the value passed as an external template ([#28383](https://github.com/WordPress/gutenberg/pull/28383)).
 
@@ -247,24 +319,24 @@
 
 ## 1.1.0 (2021-01-05)
 
-### New Feature
+### New Features
 
 -   Adds the `npmDependencies` field to the template configuration. It allows listing remote npm dependencies that will be installed in the scaffolded project ([#27880](https://github.com/WordPress/gutenberg/pull/27880)).
 -   Installs WordPress npm dependencies used in the `esnext` template during the scaffolding process ([#27880](https://github.com/WordPress/gutenberg/pull/27880)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Print the block class name in the `save` method in scaffolded templates ([#27988](https://github.com/WordPress/gutenberg/pull/27988)).
 
 ## 1.0.2 (2020-12-17)
 
-### Bug Fix
+### Bug Fixes
 
 -   Second attempt to fix support for external templates by using a temporary folder when downloading npm package.
 
 ## 1.0.1 (2020-12-17)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix support for external templates hosted on npm.
 
@@ -288,29 +360,29 @@
 
 ## 0.16.0 (2020-06-25)
 
-### New Feature
+### New Features
 
 -   Generate `block.json` file with all metadata necessary for Block Directory ([#23399](https://github.com/WordPress/gutenberg/pull/23399)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix the error in the scaffolding process caused by the missing `scripts` section in `package.json` file ([#23443](https://github.com/WordPress/gutenberg/pull/23443)).
 
 ## 0.15.0-rc.0 (2020-06-24)
 
-### New Feature
+### New Features
 
 -   Add new CLI options: `--no-wp-scripts` and `--wp-scripts` to let users override the settings that template defines for supports for `@wordpress/scripts` package integration ([#23195](https://github.com/WordPress/gutenberg/pull/23195)).
 
 ## 0.14.2 (2020-06-16)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix errors reported by CSS linter in ESNext template by using hex colors in CSS files ([#23188](https://github.com/WordPress/gutenberg/pull/23188)).
 
 ## 0.14.1 (2020-06-15)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix an error reported by JavaScript linter by improving JSDoc comment in ESNext template in `src/edit.js` file ([#23164](https://github.com/WordPress/gutenberg/pull/23164)).
 
@@ -390,7 +462,7 @@
 
 ## 0.4.3 (2020-01-08)
 
-### Bug Fix
+### Bug Fixes
 
 -   Print available commands only for ESNext template.
 
@@ -406,7 +478,7 @@
 
 ## 0.3.2 (2019-12-16)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix the paths pointing to the JS build file listed in PHP file in the ESNext template.
 
diff --git a/packages/create-block/README.md b/packages/create-block/README.md
index 20bb6c62ccf66c..55cea45c9afe71 100644
--- a/packages/create-block/README.md
+++ b/packages/create-block/README.md
@@ -8,18 +8,6 @@ _It is largely inspired by [create-react-app](https://create-react-app.dev/docs/
 
 > _Learn more about the [Block API at the Gutenberg HandBook](https://developer.wordpress.org/block-editor/developers/block-api/block-registration/)._
 
-## Table of Contents
-
-- [Quick start](#quick-start)
-- [Usage](#usage)
-    - [Interactive Mode](#interactive-mode)
-    - [`slug`](#slug)
-    - [`options`](#options)
-- [Available Commands](#available-commands-in-the-scaffolded-project)
-- [External Project Templates](#external-project-templates)
-- [Contributing to this package](#contributing-to-this-package)
-
-
 ## Quick start
 
 ```bash
@@ -31,7 +19,7 @@ $ npm start
 The `slug` provided (`todo-list` in the example) defines the folder name for the scaffolded plugin and the internal block name. The WordPress plugin generated must [be installed manually](https://wordpress.org/documentation/article/manage-plugins/#manual-plugin-installation-1).
 
 
-_(requires `node` version `14.0.0` or above, and `npm` version `6.14.4` or above)_
+_(requires `node` version `20.10.0` or above, and `npm` version `10.2.3` or above)_
 
 
 > [Watch a video introduction to create-block on Learn.wordpress.org](https://learn.wordpress.org/tutorial/using-the-create-block-tool/)
diff --git a/packages/create-block/docs/external-template.md b/packages/create-block/docs/external-template.md
index 3bbd5a1a06ddf9..45c3cba8c9271d 100644
--- a/packages/create-block/docs/external-template.md
+++ b/packages/create-block/docs/external-template.md
@@ -88,7 +88,7 @@ The following configurable variables are used with the template files. Template
 
 **Block metadata** ([learn more](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/)):
 
--   `folderName` (default: `.`) – the location for the `block.json` file and other optional block files generated from block templates included in the folder set with the `blockTemplatesPath` setting.
+-   `folderName` (default: `src`) – the location for the `block.json` file and other optional block files generated from block templates included in the folder set with the `blockTemplatesPath` setting.
 -   `$schema` (default: `https://schemas.wp.org/trunk/block.json`) – the schema URL used for block validation.
 -   `apiVersion` (default: `2`) – the block API version ([related dev note](https://make.wordpress.org/core/2020/11/18/block-api-version-2/)).
 -   `slug` (no default) – the block slug used for identification in the block name.
@@ -104,3 +104,67 @@ The following configurable variables are used with the template files. Template
 -   `style` (default: `'file:./style-index.css'`) – a frontend and editor style definition.
 -   `render` (no default) – a path to the PHP file used when rendering the block type on the server before presenting on the front end.
 -   `customBlockJSON` (no default) - allows definition of additional properties for the generated block.json file.
+-   `transformer` (default: `( view ) => view` ) - a function that receives all variables generated by the create-block tool and returns an object of values. This function provides the ability to modify existing values and add new variables.
+
+#### `transformer` examples
+
+This examples adds a generated value to the slug variable.
+
+```js
+transformer: ( view ) => {
+    const hex = getRandomHexCode();
+      return {
+         ...view,
+         slug: `${ view.slug }-${ hex }`,
+      };
+},
+```
+
+This example creates a new custom variable that can be used in the associated mustache templates as `{{customVariable}}`
+
+```js
+transformer: ( view ) => {
+      return {
+         ...view,
+         customVariable: `Custom Value`,
+      };
+},
+```
+
+### `variants`
+
+Variants are used to create variations for a template. Variants can override any `defaultValues` by providing their own.
+
+```js
+module.exports = {
+	defaultValues: {
+		slug: 'my-fantastic-block',
+		title: 'My fantastic block',
+		dashicon: 'palmtree',
+		version: '1.2.3',
+	},
+	variants: {
+		primary: {},
+		secondary: {
+			title: 'My fantastic block - secondary variant',
+		},
+	},
+};
+```
+
+Variants are accessed using the `--variant` flag, i.e`--variant secondary`.
+
+If no variant is provided, the first variant is used if any are defined.
+
+Mustache variables are created for variants that can be used to conditionally output content in files. The format is `{{isVARIANT_NAMEVariant}}`.
+
+```mustache
+{{#isPrimaryVariant}}
+This content is only rendered if `--variant primary` is passed.
+{{/isPrimaryVariant}}
+
+{{#isSecondaryVariant}}
+This content is only rendered if `--variant secondary` is passed.
+{{/isSecondaryVariant}}
+
+```
diff --git a/packages/create-block/lib/init-block.js b/packages/create-block/lib/init-block.js
index 9c0bda20a40097..0882bdd3404631 100644
--- a/packages/create-block/lib/init-block.js
+++ b/packages/create-block/lib/init-block.js
@@ -29,7 +29,9 @@ async function initBlockJSON( {
 	editorScript,
 	editorStyle,
 	style,
+	viewStyle,
 	render,
+	viewScriptModule,
 	viewScript,
 	customBlockJSON,
 	example,
@@ -61,7 +63,9 @@ async function initBlockJSON( {
 					editorScript,
 					editorStyle,
 					style,
+					viewStyle,
 					render,
+					viewScriptModule,
 					viewScript,
 					...customBlockJSON,
 				} ).filter( ( [ , value ] ) => !! value )
diff --git a/packages/create-block/lib/scaffold.js b/packages/create-block/lib/scaffold.js
index 49d3cbf794777a..b7d4addde6a82c 100644
--- a/packages/create-block/lib/scaffold.js
+++ b/packages/create-block/lib/scaffold.js
@@ -43,7 +43,9 @@ module.exports = async (
 		editorScript,
 		editorStyle,
 		style,
+		viewStyle,
 		render,
+		viewScriptModule,
 		viewScript,
 		variantVars,
 		customPackageJSON,
@@ -83,7 +85,9 @@ module.exports = async (
 		editorScript,
 		editorStyle,
 		style,
+		viewStyle,
 		render,
+		viewScriptModule,
 		viewScript,
 		variantVars,
 		customPackageJSON,
@@ -94,7 +98,8 @@ module.exports = async (
 
 	const view = {
 		...transformedValues,
-		namespaceSnakeCase: snakeCase( transformedValues.slug ),
+		namespaceSnakeCase: snakeCase( transformedValues.namespace ),
+		namespacePascalCase: pascalCase( transformedValues.namespace ),
 		slugSnakeCase: snakeCase( transformedValues.slug ),
 		slugPascalCase: pascalCase( transformedValues.slug ),
 		...variantVars,
diff --git a/packages/create-block/lib/templates.js b/packages/create-block/lib/templates.js
index 5edaa3fcc8ba83..4e70ee66fd3a40 100644
--- a/packages/create-block/lib/templates.js
+++ b/packages/create-block/lib/templates.js
@@ -33,6 +33,7 @@ const predefinedPluginTemplates = {
 			editorScript: null,
 			editorStyle: null,
 			style: null,
+			viewStyle: null,
 			viewScript: 'file:./view.js',
 			example: {},
 		},
diff --git a/packages/create-block/lib/templates/es5/$slug.php.mustache b/packages/create-block/lib/templates/es5/$slug.php.mustache
index 0f64471e434a7f..825fd1bfd8b5aa 100644
--- a/packages/create-block/lib/templates/es5/$slug.php.mustache
+++ b/packages/create-block/lib/templates/es5/$slug.php.mustache
@@ -7,8 +7,8 @@
 {{#description}}
  * Description:       {{description}}
 {{/description}}
- * Requires at least: 6.1
- * Requires PHP:      7.0
+ * Requires at least: 6.6
+ * Requires PHP:      7.2
  * Version:           {{version}}
 {{#author}}
  * Author:            {{author}}
diff --git a/packages/create-block/lib/templates/es5/readme.txt.mustache b/packages/create-block/lib/templates/es5/readme.txt.mustache
index f069906fb19fa5..c3abf5ae4ec024 100644
--- a/packages/create-block/lib/templates/es5/readme.txt.mustache
+++ b/packages/create-block/lib/templates/es5/readme.txt.mustache
@@ -3,7 +3,7 @@
 Contributors:      {{author}}
 {{/author}}
 Tags:              block
-Tested up to:      6.1
+Tested up to:      6.6
 Stable tag:        {{version}}
 {{#license}}
 License:           {{license}}
diff --git a/packages/create-block/lib/templates/plugin/$slug.php.mustache b/packages/create-block/lib/templates/plugin/$slug.php.mustache
index 90f293f1472f4e..75666af3a850b2 100644
--- a/packages/create-block/lib/templates/plugin/$slug.php.mustache
+++ b/packages/create-block/lib/templates/plugin/$slug.php.mustache
@@ -7,8 +7,8 @@
 {{#description}}
  * Description:       {{description}}
 {{/description}}
- * Requires at least: 6.1
- * Requires PHP:      7.0
+ * Requires at least: 6.6
+ * Requires PHP:      7.2
  * Version:           {{version}}
 {{#author}}
  * Author:            {{author}}
@@ -27,7 +27,7 @@
  * Update URI:        {{{updateURI}}}
 {{/updateURI}}
  *
- * @package           {{namespace}}
+ * @package {{namespacePascalCase}}
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/packages/create-block/lib/templates/plugin/readme.txt.mustache b/packages/create-block/lib/templates/plugin/readme.txt.mustache
index f069906fb19fa5..c3abf5ae4ec024 100644
--- a/packages/create-block/lib/templates/plugin/readme.txt.mustache
+++ b/packages/create-block/lib/templates/plugin/readme.txt.mustache
@@ -3,7 +3,7 @@
 Contributors:      {{author}}
 {{/author}}
 Tags:              block
-Tested up to:      6.1
+Tested up to:      6.6
 Stable tag:        {{version}}
 {{#license}}
 License:           {{license}}
diff --git a/packages/create-block/package.json b/packages/create-block/package.json
index 025e290929a200..a9215bb2699d32 100644
--- a/packages/create-block/package.json
+++ b/packages/create-block/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block",
-	"version": "4.31.0",
+	"version": "4.53.0",
 	"description": "Generates PHP, JS and CSS code for registering a block for a WordPress plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,8 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14",
-		"npm": ">=6.14.4"
+		"node": ">=20.10.0",
+		"npm": ">=10.2.3"
 	},
 	"files": [
 		"lib"
@@ -31,7 +31,7 @@
 		"wp-create-block": "./index.js"
 	},
 	"dependencies": {
-		"@wordpress/lazy-import": "file:../lazy-import",
+		"@wordpress/lazy-import": "*",
 		"chalk": "^4.0.0",
 		"change-case": "^4.1.2",
 		"check-node-version": "^4.1.0",
diff --git a/packages/customize-widgets/.npmrc b/packages/customize-widgets/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/customize-widgets/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/customize-widgets/CHANGELOG.md b/packages/customize-widgets/CHANGELOG.md
index 7a0d7900ca5fe8..4c308aff491268 100644
--- a/packages/customize-widgets/CHANGELOG.md
+++ b/packages/customize-widgets/CHANGELOG.md
@@ -2,6 +2,55 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.35.0 (2024-05-16)
+
+## 4.34.0 (2024-05-02)
+
+## 4.33.0 (2024-04-19)
+
+## 4.32.0 (2024-04-03)
+
+## 4.31.0 (2024-03-21)
+
+## 4.30.0 (2024-03-06)
+
+## 4.29.0 (2024-02-21)
+
+## 4.28.0 (2024-02-09)
+
+## 4.27.0 (2024-01-24)
+
+## 4.26.0 (2024-01-10)
+
+## 4.25.0 (2023-12-13)
+
 ## 4.24.0 (2023-11-29)
 
 ## 4.23.0 (2023-11-16)
@@ -96,11 +145,11 @@
 
 ## 3.0.0 (2022-02-10)
 
-### Breaking Change
+### Breaking Changes
 
 -   The `GUTENBERG_PHASE` environment variable has been renamed to `IS_GUTENBERG_PLUGIN` and is now a boolean ([#38202](https://github.com/WordPress/gutenberg/pull/38202)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/a11y` dependency ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -108,7 +157,7 @@
 
 ## 2.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
diff --git a/packages/customize-widgets/package.json b/packages/customize-widgets/package.json
index 65a64d7826a7f7..68e736c566c110 100644
--- a/packages/customize-widgets/package.json
+++ b/packages/customize-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/customize-widgets",
-	"version": "4.24.0",
+	"version": "5.10.0",
 	"description": "Widgets blocks in Customizer Module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -17,34 +17,36 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/block-library": "file:../block-library",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/element": "file:../element",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/interface": "file:../interface",
-		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/media-utils": "file:../media-utils",
-		"@wordpress/preferences": "file:../preferences",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/widgets": "file:../widgets",
-		"classnames": "^2.3.1",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/block-editor": "*",
+		"@wordpress/block-library": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/editor": "*",
+		"@wordpress/element": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/interface": "*",
+		"@wordpress/is-shallow-equal": "*",
+		"@wordpress/keyboard-shortcuts": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/media-utils": "*",
+		"@wordpress/preferences": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/widgets": "*",
+		"clsx": "^2.1.1",
 		"fast-deep-equal": "^3.1.3"
 	},
 	"peerDependencies": {
@@ -53,5 +55,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/customize-widgets/src/components/error-boundary/index.js b/packages/customize-widgets/src/components/error-boundary/index.js
index d1aece49b91736..0fff18a616d11c 100644
--- a/packages/customize-widgets/src/components/error-boundary/index.js
+++ b/packages/customize-widgets/src/components/error-boundary/index.js
@@ -11,7 +11,7 @@ import { doAction } from '@wordpress/hooks';
 function CopyButton( { text, children } ) {
 	const ref = useCopyToClipboard( text );
 	return (
-		<Button variant="secondary" ref={ ref }>
+		<Button size="compact" variant="secondary" ref={ ref }>
 			{ children }
 		</Button>
 	);
diff --git a/packages/customize-widgets/src/components/error-boundary/test/error-boundary.js b/packages/customize-widgets/src/components/error-boundary/test/error-boundary.js
new file mode 100644
index 00000000000000..27ec4c80419676
--- /dev/null
+++ b/packages/customize-widgets/src/components/error-boundary/test/error-boundary.js
@@ -0,0 +1,40 @@
+/**
+ * External dependencies
+ */
+import { render } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import * as wpHooks from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import ErrorBoundary from '../index';
+
+const theError = new Error( 'Kaboom' );
+
+const ChildComponent = () => {
+	throw theError;
+};
+
+describe( 'Error Boundary', () => {
+	describe( 'when error is thrown from a Child component', () => {
+		it( 'calls the `editor.ErrorBoundary.errorLogged` hook action with the error object', () => {
+			const doAction = jest.spyOn( wpHooks, 'doAction' );
+
+			render(
+				<ErrorBoundary>
+					<ChildComponent />
+				</ErrorBoundary>
+			);
+
+			expect( doAction ).toHaveBeenCalledWith(
+				'editor.ErrorBoundary.errorLogged',
+				theError
+			);
+			expect( console ).toHaveErrored();
+		} );
+	} );
+} );
diff --git a/packages/customize-widgets/src/components/header/index.js b/packages/customize-widgets/src/components/header/index.js
index 34e4573c719dd5..3ba81a2589fdd5 100644
--- a/packages/customize-widgets/src/components/header/index.js
+++ b/packages/customize-widgets/src/components/header/index.js
@@ -1,18 +1,14 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { Popover, ToolbarButton } from '@wordpress/components';
-import { useViewportMatch } from '@wordpress/compose';
-import {
-	NavigableToolbar,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import { createPortal, useEffect, useRef, useState } from '@wordpress/element';
+import { ToolbarButton } from '@wordpress/components';
+import { NavigableToolbar } from '@wordpress/block-editor';
+import { createPortal, useEffect, useState } from '@wordpress/element';
 import { displayShortcut, isAppleOS } from '@wordpress/keycodes';
 import { __, _x, isRTL } from '@wordpress/i18n';
 import { plus, undo as undoIcon, redo as redoIcon } from '@wordpress/icons';
@@ -22,9 +18,6 @@ import { plus, undo as undoIcon, redo as redoIcon } from '@wordpress/icons';
  */
 import Inserter from '../inserter';
 import MoreMenu from '../more-menu';
-import { unlock } from '../../lock-unlock';
-
-const { BlockContextualToolbar } = unlock( blockEditorPrivateApis );
 
 function Header( {
 	sidebar,
@@ -33,8 +26,6 @@ function Header( {
 	setIsInserterOpened,
 	isFixedToolbarActive,
 } ) {
-	const isLargeViewport = useViewportMatch( 'medium' );
-	const blockToolbarRef = useRef();
 	const [ [ hasUndo, hasRedo ], setUndoRedo ] = useState( [
 		sidebar.hasUndo(),
 		sidebar.hasRedo(),
@@ -53,7 +44,7 @@ function Header( {
 	return (
 		<>
 			<div
-				className={ classnames( 'customize-widgets-header', {
+				className={ clsx( 'customize-widgets-header', {
 					'is-fixed-toolbar-active': isFixedToolbarActive,
 				} ) }
 			>
@@ -66,10 +57,7 @@ function Header( {
 						/* translators: button label text should, if possible, be under 16 characters. */
 						label={ __( 'Undo' ) }
 						shortcut={ displayShortcut.primary( 'z' ) }
-						// If there are no undo levels we don't want to actually disable this
-						// button, because it will remove focus for keyboard users.
-						// See: https://github.com/WordPress/gutenberg/issues/3486
-						aria-disabled={ ! hasUndo }
+						disabled={ ! hasUndo }
 						onClick={ sidebar.undo }
 						className="customize-widgets-editor-history-button undo-button"
 					/>
@@ -78,10 +66,7 @@ function Header( {
 						/* translators: button label text should, if possible, be under 16 characters. */
 						label={ __( 'Redo' ) }
 						shortcut={ shortcut }
-						// If there are no undo levels we don't want to actually disable this
-						// button, because it will remove focus for keyboard users.
-						// See: https://github.com/WordPress/gutenberg/issues/3486
-						aria-disabled={ ! hasRedo }
+						disabled={ ! hasRedo }
 						onClick={ sidebar.redo }
 						className="customize-widgets-editor-history-button redo-button"
 					/>
@@ -107,18 +92,6 @@ function Header( {
 				<Inserter setIsOpened={ setIsInserterOpened } />,
 				inserter.contentContainer[ 0 ]
 			) }
-
-			{ isFixedToolbarActive && isLargeViewport && (
-				<>
-					<div className="selected-block-tools-wrapper">
-						<BlockContextualToolbar isFixed />
-					</div>
-					<Popover.Slot
-						ref={ blockToolbarRef }
-						name="block-toolbar"
-					/>
-				</>
-			) }
 		</>
 	);
 }
diff --git a/packages/customize-widgets/src/components/header/style.scss b/packages/customize-widgets/src/components/header/style.scss
index d9d4a487e647c1..5c3f37a0bf0d42 100644
--- a/packages/customize-widgets/src/components/header/style.scss
+++ b/packages/customize-widgets/src/components/header/style.scss
@@ -1,5 +1,5 @@
 .customize-widgets-header {
-	@include break-medium() {
+	@include break-small() {
 		// Make space for the floating toolbar.
 		margin-bottom: $grid-unit-20 + $default-block-margin;
 	}
@@ -30,7 +30,7 @@
 	align-items: center;
 
 	.customize-widgets-header-toolbar__inserter-toggle.components-button.has-icon {
-		border-radius: 2px;
+		border-radius: $radius-small;
 		color: $white;
 		padding: 0;
 		min-width: $grid-unit-30;
diff --git a/packages/customize-widgets/src/components/inserter/index.js b/packages/customize-widgets/src/components/inserter/index.js
index c0156cf774ddc6..4f271bef9e9a3f 100644
--- a/packages/customize-widgets/src/components/inserter/index.js
+++ b/packages/customize-widgets/src/components/inserter/index.js
@@ -37,7 +37,7 @@ function Inserter( { setIsOpened } ) {
 					{ __( 'Add a block' ) }
 				</h2>
 				<Button
-					className="customize-widgets-layout__inserter-panel-header-close-button"
+					size="small"
 					icon={ closeSmall }
 					onClick={ () => setIsOpened( false ) }
 					aria-label={ __( 'Close inserter' ) }
diff --git a/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/config.js b/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/config.js
index bd8bb53f5453d3..0380028aa100c0 100644
--- a/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/config.js
+++ b/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/config.js
@@ -37,7 +37,16 @@ export const textFormattingShortcuts = [
 		description: __( 'Make the selected text inline code.' ),
 	},
 	{
-		keyCombination: { modifier: 'access', character: '0' },
+		keyCombination: {
+			modifier: 'access',
+			character: '0',
+		},
+		aliases: [
+			{
+				modifier: 'access',
+				character: '7',
+			},
+		],
 		description: __( 'Convert the current heading to a paragraph.' ),
 	},
 	{
@@ -46,4 +55,8 @@ export const textFormattingShortcuts = [
 			'Convert the current paragraph or heading to a heading of level 1 to 6.'
 		),
 	},
+	{
+		keyCombination: { modifier: 'primaryShift', character: 'SPACE' },
+		description: __( 'Add non breaking space.' ),
+	},
 ];
diff --git a/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/index.js b/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/index.js
index f8467d31b52b47..b4c7a1bcd46d01 100644
--- a/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/index.js
+++ b/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -49,7 +49,7 @@ const ShortcutList = ( { shortcuts } ) => (
 
 const ShortcutSection = ( { title, shortcuts, className } ) => (
 	<section
-		className={ classnames(
+		className={ clsx(
 			'customize-widgets-keyboard-shortcut-help-modal__section',
 			className
 		) }
diff --git a/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/style.scss b/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/style.scss
index f26955fe3a497e..638b8e7b422191 100644
--- a/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/style.scss
+++ b/packages/customize-widgets/src/components/keyboard-shortcut-help-modal/style.scss
@@ -33,9 +33,6 @@
 	&__shortcut-description {
 		flex: 1;
 		margin: 0;
-
-		// IE 11 flex item fix - ensure the item does not collapse.
-		flex-basis: auto;
 	}
 
 	&__shortcut-key-combination {
diff --git a/packages/customize-widgets/src/components/keyboard-shortcuts/index.js b/packages/customize-widgets/src/components/keyboard-shortcuts/index.js
index b7cdc1d42de863..5c5f3ea2bca832 100644
--- a/packages/customize-widgets/src/components/keyboard-shortcuts/index.js
+++ b/packages/customize-widgets/src/components/keyboard-shortcuts/index.js
@@ -7,44 +7,10 @@ import {
 	store as keyboardShortcutsStore,
 } from '@wordpress/keyboard-shortcuts';
 import { isAppleOS } from '@wordpress/keycodes';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { createBlock } from '@wordpress/blocks';
 
 function KeyboardShortcuts( { undo, redo, save } ) {
-	const { replaceBlocks } = useDispatch( blockEditorStore );
-	const { getBlockName, getSelectedBlockClientId, getBlockAttributes } =
-		useSelect( blockEditorStore );
-
-	const handleTextLevelShortcut = ( event, level ) => {
-		event.preventDefault();
-		const destinationBlockName =
-			level === 0 ? 'core/paragraph' : 'core/heading';
-		const currentClientId = getSelectedBlockClientId();
-		if ( currentClientId === null ) {
-			return;
-		}
-		const blockName = getBlockName( currentClientId );
-		if ( blockName !== 'core/paragraph' && blockName !== 'core/heading' ) {
-			return;
-		}
-		const attributes = getBlockAttributes( currentClientId );
-		const textAlign =
-			blockName === 'core/paragraph' ? 'align' : 'textAlign';
-		const destinationTextAlign =
-			destinationBlockName === 'core/paragraph' ? 'align' : 'textAlign';
-
-		replaceBlocks(
-			currentClientId,
-			createBlock( destinationBlockName, {
-				level,
-				content: attributes.content,
-				...{ [ destinationTextAlign ]: attributes[ textAlign ] },
-			} )
-		);
-	};
-
 	useShortcut( 'core/customize-widgets/undo', ( event ) => {
 		undo();
 		event.preventDefault();
@@ -60,21 +26,6 @@ function KeyboardShortcuts( { undo, redo, save } ) {
 		save();
 	} );
 
-	useShortcut(
-		'core/customize-widgets/transform-heading-to-paragraph',
-		( event ) => handleTextLevelShortcut( event, 0 )
-	);
-
-	[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
-		//the loop is based off on a constant therefore
-		//the hook will execute the same way every time
-		//eslint-disable-next-line react-hooks/rules-of-hooks
-		useShortcut(
-			`core/customize-widgets/transform-paragraph-to-heading-${ level }`,
-			( event ) => handleTextLevelShortcut( event, level )
-		);
-	} );
-
 	return null;
 }
 
@@ -126,28 +77,6 @@ function KeyboardShortcutsRegister() {
 			},
 		} );
 
-		registerShortcut( {
-			name: 'core/customize-widgets/transform-heading-to-paragraph',
-			category: 'block-library',
-			description: __( 'Transform heading to paragraph.' ),
-			keyCombination: {
-				modifier: 'access',
-				character: `0`,
-			},
-		} );
-
-		[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
-			registerShortcut( {
-				name: `core/customize-widgets/transform-paragraph-to-heading-${ level }`,
-				category: 'block-library',
-				description: __( 'Transform paragraph to heading.' ),
-				keyCombination: {
-					modifier: 'access',
-					character: `${ level }`,
-				},
-			} );
-		} );
-
 		return () => {
 			unregisterShortcut( 'core/customize-widgets/undo' );
 			unregisterShortcut( 'core/customize-widgets/redo' );
diff --git a/packages/customize-widgets/src/components/more-menu/index.js b/packages/customize-widgets/src/components/more-menu/index.js
index 9a276976dc1fd8..a0fb374057ec3d 100644
--- a/packages/customize-widgets/src/components/more-menu/index.js
+++ b/packages/customize-widgets/src/components/more-menu/index.js
@@ -9,10 +9,9 @@ import {
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { __, _x } from '@wordpress/i18n';
-import { external } from '@wordpress/icons';
+import { external, moreVertical } from '@wordpress/icons';
 import { displayShortcut } from '@wordpress/keycodes';
 import { useShortcut } from '@wordpress/keyboard-shortcuts';
-import { MoreMenuDropdown } from '@wordpress/interface';
 import { PreferenceToggleMenuItem } from '@wordpress/preferences';
 
 /**
@@ -35,7 +34,18 @@ export default function MoreMenu() {
 
 	return (
 		<>
-			<MoreMenuDropdown as={ ToolbarDropdownMenu }>
+			<ToolbarDropdownMenu
+				icon={ moreVertical }
+				label={ __( 'Options' ) }
+				popoverProps={ {
+					placement: 'bottom-end',
+					className: 'more-menu-dropdown__content',
+				} }
+				toggleProps={ {
+					tooltipPosition: 'bottom',
+					size: 'compact',
+				} }
+			>
 				{ () => (
 					<>
 						<MenuGroup label={ _x( 'View', 'noun' ) }>
@@ -106,7 +116,7 @@ export default function MoreMenu() {
 						</MenuGroup>
 					</>
 				) }
-			</MoreMenuDropdown>
+			</ToolbarDropdownMenu>
 			<KeyboardShortcutHelpModal
 				isModalActive={ isKeyboardShortcutsModalActive }
 				toggleModal={ toggleKeyboardShortcutsModal }
diff --git a/packages/customize-widgets/src/components/more-menu/style.scss b/packages/customize-widgets/src/components/more-menu/style.scss
new file mode 100644
index 00000000000000..e618ba729c1ab5
--- /dev/null
+++ b/packages/customize-widgets/src/components/more-menu/style.scss
@@ -0,0 +1,3 @@
+.components-popover.more-menu-dropdown__content {
+	z-index: z-index(".components-popover.more-menu__content");
+}
diff --git a/packages/customize-widgets/src/components/sidebar-block-editor/index.js b/packages/customize-widgets/src/components/sidebar-block-editor/index.js
index ccb6fca871429e..d3c78a3d6d012a 100644
--- a/packages/customize-widgets/src/components/sidebar-block-editor/index.js
+++ b/packages/customize-widgets/src/components/sidebar-block-editor/index.js
@@ -1,18 +1,20 @@
 /**
  * WordPress dependencies
  */
+import { useViewportMatch } from '@wordpress/compose';
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { useMemo, createPortal } from '@wordpress/element';
 import {
 	BlockList,
-	BlockTools,
+	BlockToolbar,
 	BlockInspector,
 	privateApis as blockEditorPrivateApis,
 	__unstableBlockSettingsMenuFirstItem,
 } from '@wordpress/block-editor';
 import { uploadMedia } from '@wordpress/media-utils';
 import { store as preferencesStore } from '@wordpress/preferences';
+import { privateApis as blockLibraryPrivateApis } from '@wordpress/block-library';
 
 /**
  * Internal dependencies
@@ -30,6 +32,8 @@ const { ExperimentalBlockCanvas: BlockCanvas } = unlock(
 	blockEditorPrivateApis
 );
 
+const { BlockKeyboardShortcuts } = unlock( blockLibraryPrivateApis );
+
 export default function SidebarBlockEditor( {
 	blockEditorSettings,
 	sidebar,
@@ -37,6 +41,7 @@ export default function SidebarBlockEditor( {
 	inspector,
 } ) {
 	const [ isInserterOpened, setIsInserterOpened ] = useInserter( inserter );
+	const isMediumViewport = useViewportMatch( 'small' );
 	const {
 		hasUploadPermissions,
 		isFixedToolbarActive,
@@ -46,7 +51,10 @@ export default function SidebarBlockEditor( {
 		const { get } = select( preferencesStore );
 		return {
 			hasUploadPermissions:
-				select( coreStore ).canUser( 'create', 'media' ) ?? true,
+				select( coreStore ).canUser( 'create', {
+					kind: 'root',
+					name: 'media',
+				} ) ?? true,
 			isFixedToolbarActive: !! get(
 				'core/customize-widgets',
 				'fixedToolbar'
@@ -77,7 +85,7 @@ export default function SidebarBlockEditor( {
 			...blockEditorSettings,
 			__experimentalSetIsInserterOpened: setIsInserterOpened,
 			mediaUpload: mediaUploadBlockEditor,
-			hasFixedToolbar: isFixedToolbarActive,
+			hasFixedToolbar: isFixedToolbarActive || ! isMediumViewport,
 			keepCaretInsideBlock,
 			__unstableHasCustomAppender: true,
 		};
@@ -85,6 +93,7 @@ export default function SidebarBlockEditor( {
 		hasUploadPermissions,
 		blockEditorSettings,
 		isFixedToolbarActive,
+		isMediumViewport,
 		keepCaretInsideBlock,
 		setIsInserterOpened,
 	] );
@@ -96,6 +105,7 @@ export default function SidebarBlockEditor( {
 	return (
 		<>
 			<KeyboardShortcuts.Register />
+			<BlockKeyboardShortcuts />
 
 			<SidebarEditorProvider sidebar={ sidebar } settings={ settings }>
 				<KeyboardShortcuts
@@ -109,18 +119,20 @@ export default function SidebarBlockEditor( {
 					inserter={ inserter }
 					isInserterOpened={ isInserterOpened }
 					setIsInserterOpened={ setIsInserterOpened }
-					isFixedToolbarActive={ isFixedToolbarActive }
+					isFixedToolbarActive={
+						isFixedToolbarActive || ! isMediumViewport
+					}
 				/>
-
-				<BlockTools>
-					<BlockCanvas
-						shouldIframe={ false }
-						styles={ settings.defaultEditorStyles }
-						height="100%"
-					>
-						<BlockList renderAppender={ BlockAppender } />
-					</BlockCanvas>
-				</BlockTools>
+				{ ( isFixedToolbarActive || ! isMediumViewport ) && (
+					<BlockToolbar hideDragHandle />
+				) }
+				<BlockCanvas
+					shouldIframe={ false }
+					styles={ settings.defaultEditorStyles }
+					height="100%"
+				>
+					<BlockList renderAppender={ BlockAppender } />
+				</BlockCanvas>
 
 				{ createPortal(
 					// This is a temporary hack to prevent button component inside <BlockInspector>
diff --git a/packages/customize-widgets/src/components/sidebar-block-editor/style.scss b/packages/customize-widgets/src/components/sidebar-block-editor/style.scss
index a1b99447155eb2..1aa62ed32e847c 100644
--- a/packages/customize-widgets/src/components/sidebar-block-editor/style.scss
+++ b/packages/customize-widgets/src/components/sidebar-block-editor/style.scss
@@ -1,23 +1,3 @@
-.block-editor-block-contextual-toolbar.is-fixed {
-	// The top position used for the 'sticky' positioning.
-	top: 0;
-
-	// Offset the customizer's sidebar padding.
-	margin-left: -$grid-unit-15;
-	margin-right: -$grid-unit-15;
-	// added important to override the inline style coming from
-	// the block-editor/block-contextual-toolbar component.
-	width: calc(100% + #{ $grid-unit-30 }) !important;
-
-	& > .block-editor-block-toolbar__group-collapse-fixed-toolbar {
-		display: none;
-	}
-
-	// Scroll sideways.
-	overflow-y: auto;
-	z-index: z-index(".customize-widgets__block-toolbar");
-}
-
 .customize-control-sidebar_block_editor .block-editor-block-list__block-popover {
 	// FloatingUI library used in Popover component forces us to have an "absolute" inline style.
 	// We need to override this in the customizer.
diff --git a/packages/customize-widgets/src/components/test/error-boundary.js b/packages/customize-widgets/src/components/test/error-boundary.js
deleted file mode 100644
index 7b9977e10f1315..00000000000000
--- a/packages/customize-widgets/src/components/test/error-boundary.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * WordPress dependencies
- */
-import * as wpHooks from '@wordpress/hooks';
-/**
- * Internal dependencies
- */
-import ErrorBoundary from '../error-boundary';
-/**
- * External dependencies
- */
-import { render } from '@testing-library/react';
-
-const theError = new Error( 'Kaboom' );
-
-const ChildComponent = () => {
-	throw theError;
-};
-
-describe( 'Error Boundary', () => {
-	describe( 'when error is thrown from a Child component', () => {
-		it( 'calls the `editor.ErrorBoundary.errorLogged` hook action with the error object', () => {
-			const doAction = jest.spyOn( wpHooks, 'doAction' );
-
-			render(
-				<ErrorBoundary>
-					<ChildComponent />
-				</ErrorBoundary>
-			);
-
-			expect( doAction ).toHaveBeenCalledWith(
-				'editor.ErrorBoundary.errorLogged',
-				theError
-			);
-			expect( console ).toHaveErrored();
-		} );
-	} );
-} );
diff --git a/packages/customize-widgets/src/components/welcome-guide/index.js b/packages/customize-widgets/src/components/welcome-guide/index.js
index 52807118baec7c..3f7b2f45d86b7a 100644
--- a/packages/customize-widgets/src/components/welcome-guide/index.js
+++ b/packages/customize-widgets/src/components/welcome-guide/index.js
@@ -43,7 +43,7 @@ export default function WelcomeGuide( { sidebar } ) {
 					  ) }
 			</p>
 			<Button
-				className="customize-widgets-welcome-guide__button"
+				size="compact"
 				variant="primary"
 				onClick={ () =>
 					toggle( 'core/customize-widgets', 'welcomeGuide' )
diff --git a/packages/customize-widgets/src/filters/move-to-sidebar.js b/packages/customize-widgets/src/filters/move-to-sidebar.js
index 7677a5e1726cfe..4562afb3817c64 100644
--- a/packages/customize-widgets/src/filters/move-to-sidebar.js
+++ b/packages/customize-widgets/src/filters/move-to-sidebar.js
@@ -83,7 +83,7 @@ const withMoveToSidebarToolbarItem = createHigherOrderComponent(
 
 		return (
 			<>
-				<BlockEdit { ...props } />
+				<BlockEdit key="edit" { ...props } />
 				{ hasMultipleSidebars && canInsertBlockInSidebar && (
 					<BlockControls>
 						<MoveToWidgetArea
diff --git a/packages/customize-widgets/src/filters/wide-widget-display.js b/packages/customize-widgets/src/filters/wide-widget-display.js
index abcaa3514b640e..2d3052822e19fc 100644
--- a/packages/customize-widgets/src/filters/wide-widget-display.js
+++ b/packages/customize-widgets/src/filters/wide-widget-display.js
@@ -14,7 +14,7 @@ const withWideWidgetDisplay = createHigherOrderComponent(
 				( widget ) => widget.id_base === idBase
 			)?.is_wide ?? false;
 
-		return <BlockEdit { ...props } isWide={ isWide } />;
+		return <BlockEdit key="edit" { ...props } isWide={ isWide } />;
 	},
 	'withWideWidgetDisplay'
 );
diff --git a/packages/customize-widgets/src/index.js b/packages/customize-widgets/src/index.js
index 5b438cac86f49b..df96d645ee7007 100644
--- a/packages/customize-widgets/src/index.js
+++ b/packages/customize-widgets/src/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createRoot } from '@wordpress/element';
+import { createRoot, StrictMode } from '@wordpress/element';
 import {
 	registerCoreBlocks,
 	__experimentalGetCoreBlocks,
@@ -17,6 +17,7 @@ import {
 	store as blocksStore,
 } from '@wordpress/blocks';
 import { dispatch } from '@wordpress/data';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
@@ -26,6 +27,7 @@ import CustomizeWidgets from './components/customize-widgets';
 import getSidebarSection from './controls/sidebar-section';
 import getSidebarControl from './controls/sidebar-control';
 import './filters';
+import { unlock } from './lock-unlock';
 
 const { wp } = window;
 
@@ -37,6 +39,8 @@ const DISABLED_BLOCKS = [
 ];
 const ENABLE_EXPERIMENTAL_FSE_BLOCKS = false;
 
+const { registerCoreBlockBindingsSources } = unlock( editorPrivateApis );
+
 /**
  * Initializes the widgets block editor in the customizer.
  *
@@ -60,8 +64,9 @@ export function initialize( editorName, blockEditorSettings ) {
 		);
 	} );
 	registerCoreBlocks( coreBlocks );
+	registerCoreBlockBindingsSources();
 	registerLegacyWidgetBlock();
-	if ( process.env.IS_GUTENBERG_PLUGIN ) {
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 		__experimentalRegisterExperimentalCoreBlocks( {
 			enableFSEBlocks: ENABLE_EXPERIMENTAL_FSE_BLOCKS,
 		} );
@@ -92,11 +97,13 @@ export function initialize( editorName, blockEditorSettings ) {
 		} );
 
 		createRoot( container ).render(
-			<CustomizeWidgets
-				api={ wp.customize }
-				sidebarControls={ sidebarControls }
-				blockEditorSettings={ blockEditorSettings }
-			/>
+			<StrictMode>
+				<CustomizeWidgets
+					api={ wp.customize }
+					sidebarControls={ sidebarControls }
+					blockEditorSettings={ blockEditorSettings }
+				/>
+			</StrictMode>
 		);
 	} );
 }
diff --git a/packages/customize-widgets/src/lock-unlock.js b/packages/customize-widgets/src/lock-unlock.js
index 01d57a2835d5d7..92ef5147b1713e 100644
--- a/packages/customize-widgets/src/lock-unlock.js
+++ b/packages/customize-widgets/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/customize-widgets'
 	);
diff --git a/packages/customize-widgets/src/style.scss b/packages/customize-widgets/src/style.scss
index 3bf341c34c0eb1..9596237895953f 100644
--- a/packages/customize-widgets/src/style.scss
+++ b/packages/customize-widgets/src/style.scss
@@ -2,6 +2,7 @@
 @import "./components/header/style.scss";
 @import "./components/inserter/style.scss";
 @import "./components/keyboard-shortcut-help-modal/style.scss";
+@import "./components/more-menu/style.scss";
 @import "./components/sidebar-block-editor/style.scss";
 @import "./components/welcome-guide/style.scss";
 @import "./controls/style.scss";
@@ -13,7 +14,6 @@
 
 // Include reset CSS for the customizer.
 .customize-control-sidebar_block_editor,
-.customize-widgets-layout__inspector,
-.customize-widgets-popover {
+.customize-widgets-layout__inspector {
 	@include reset;
 }
diff --git a/packages/data-controls/CHANGELOG.md b/packages/data-controls/CHANGELOG.md
index f8ee4e0ccff3d1..cfbe9d3ea46632 100644
--- a/packages/data-controls/CHANGELOG.md
+++ b/packages/data-controls/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.27.0 (2024-05-16)
+
+## 3.26.0 (2024-05-02)
+
+## 3.25.0 (2024-04-19)
+
+## 3.24.0 (2024-04-03)
+
+## 3.23.0 (2024-03-21)
+
+## 3.22.0 (2024-03-06)
+
+## 3.21.0 (2024-02-21)
+
+## 3.20.0 (2024-02-09)
+
+## 3.19.0 (2024-01-24)
+
+## 3.18.0 (2024-01-10)
+
+## 3.17.0 (2023-12-13)
+
 ## 3.16.0 (2023-11-29)
 
 ## 3.15.0 (2023-11-16)
@@ -111,7 +159,7 @@
 
 ## 1.18.0 (2020-10-06)
 
-### New Feature
+### New Features
 
 -   Expose the `syncSelect` control for synchronous calls of registry selectors
 
diff --git a/packages/data-controls/package.json b/packages/data-controls/package.json
index 8f8e92e390d7a9..84462f49e5c0c8 100644
--- a/packages/data-controls/package.json
+++ b/packages/data-controls/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data-controls",
-	"version": "3.16.0",
+	"version": "4.10.0",
 	"description": "A set of common controls for the @wordpress/data api.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,22 +20,24 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/data-controls/src/index.ts b/packages/data-controls/src/index.ts
index 9edc6502ef881f..c0898d214224f5 100644
--- a/packages/data-controls/src/index.ts
+++ b/packages/data-controls/src/index.ts
@@ -154,7 +154,9 @@ export const __unstableAwaitPromise = function < T >( promise: Promise< T > ) {
  * store.
  */
 export const controls = {
-	AWAIT_PROMISE: < T >( { promise }: { promise: Promise< T > } ) => promise,
+	AWAIT_PROMISE< T >( { promise }: { promise: Promise< T > } ) {
+		return promise;
+	},
 	API_FETCH( { request }: { request: APIFetchOptions } ) {
 		return triggerFetch( request );
 	},
diff --git a/packages/data-controls/tsconfig.json b/packages/data-controls/tsconfig.json
index 965853e7c46b33..5ccc6045880d4a 100644
--- a/packages/data-controls/tsconfig.json
+++ b/packages/data-controls/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/data/.npmrc b/packages/data/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/data/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/data/CHANGELOG.md b/packages/data/CHANGELOG.md
index 0cb8eb1f397a1a..44d7aa5f954ef2 100644
--- a/packages/data/CHANGELOG.md
+++ b/packages/data/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 10.10.0 (2024-10-16)
+
+## 10.9.0 (2024-10-03)
+
+## 10.8.0 (2024-09-19)
+
+## 10.7.0 (2024-09-05)
+
+## 10.6.0 (2024-08-21)
+
+## 10.5.0 (2024-08-07)
+
+## 10.4.0 (2024-07-24)
+
+## 10.3.0 (2024-07-10)
+
+## 10.2.0 (2024-06-26)
+
+## 10.1.0 (2024-06-15)
+
+## 10.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 9.28.0 (2024-05-16)
+
+## 9.27.0 (2024-05-02)
+
+## 9.26.0 (2024-04-19)
+
+-   Add new `createSelector` function for creating memoized store selectors ([#60370](https://github.com/WordPress/gutenberg/pull/60370)).
+
+## 9.25.0 (2024-04-03)
+
+## 9.24.0 (2024-03-21)
+
+-   Deprecate the `getIsResolved` meta-selector ([#59679](https://github.com/WordPress/gutenberg/pull/59679)).
+
+## 9.23.0 (2024-03-06)
+
+## 9.22.0 (2024-02-21)
+
+## 9.21.0 (2024-02-09)
+
+## 9.20.0 (2024-01-24)
+
+## 9.19.0 (2024-01-10)
+
+## 9.18.0 (2023-12-13)
+
 ## 9.17.0 (2023-11-29)
 
 ## 9.16.0 (2023-11-16)
@@ -12,15 +64,15 @@
 
 ## 9.13.1 (2023-10-12)
 
-### Bug Fix
+### Bug Fixes
 
--  Fix `combineReducers()` types ([#55321](https://github.com/WordPress/gutenberg/pull/55321)).
+-   Fix `combineReducers()` types ([#55321](https://github.com/WordPress/gutenberg/pull/55321)).
 
 ## 9.13.0 (2023-10-05)
 
 ### Enhancements
 
--  Change implementation of `combineReducers` so that it doesn't use `eval` internally, and can run with a CSP policy that doesn't allow `unsafe-eval` ([#54606](https://github.com/WordPress/gutenberg/pull/54606)).
+-   Change implementation of `combineReducers` so that it doesn't use `eval` internally, and can run with a CSP policy that doesn't allow `unsafe-eval` ([#54606](https://github.com/WordPress/gutenberg/pull/54606)).
 
 ## 9.12.0 (2023-09-20)
 
@@ -30,11 +82,11 @@
 
 ### Enhancements
 
--  Warn if the `useSelect` hook returns different values when called with the same state and parameters ([#53666](https://github.com/WordPress/gutenberg/pull/53666)).
+-   Warn if the `useSelect` hook returns different values when called with the same state and parameters ([#53666](https://github.com/WordPress/gutenberg/pull/53666)).
 
 ## 9.9.0 (2023-08-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Update the type definitions for dispatched actions by accounting for Promisified return values and thunks. Previously, a dispatched action's return type was the same as the return type of the original action creator, which did not account for how dispatch works internally. (Plain actions get wrapped in a Promise, and thunk actions ultimately resolve to the innermost function's return type).
 -   Update the type definition for dispatch() to handle string store descriptors correctly.
@@ -101,7 +153,7 @@
 
 – Add TypeScript types to the built package (via "types": "build-types" in the package.json)
 
-### Bug Fix
+### Bug Fixes
 
 -   Packages: Replace `is-plain-obj` with `is-plain-object` ([#43511](https://github.com/WordPress/gutenberg/pull/43511)).
 
@@ -143,13 +195,13 @@
 
 ## 6.2.1 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `memize` dependency ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
 ## 6.2.0 (2022-01-27)
 
-### Bug Fix
+### Bug Fixes
 
 -   Corrected expect type of action creators and selectors in Redux store configuration type
 -   Move `redux` to regular dependencies and update it to version `^4.1.2`.
@@ -169,7 +221,7 @@
 
 ## 6.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -214,7 +266,7 @@
 
 ## 4.6.0 (2019-06-12)
 
-### New Feature
+### New Features
 
 -   Expose `useSelect` hook for usage in functional components. ([#15737](https://github.com/WordPress/gutenberg/pull/15737))
 -   Expose `useDispatch` hook for usage in functional components. ([#15896](https://github.com/WordPress/gutenberg/pull/15896))
@@ -226,7 +278,7 @@
 
 ## 4.5.0 (2019-05-21)
 
-### Bug Fix
+### Bug Fixes
 
 -   Restore functionality of action-generators returning a Promise. Clarify intent and behaviour for `dispatch` behaviour. Dispatch actions now always
     return a promise ([#14830](https://github.com/WordPress/gutenberg/pull/14830)
@@ -243,7 +295,7 @@
 -   Introduce new `invalidateResolutionForStore` dispatch action for signalling to invalidate the resolution cache for an entire given store.
 -   Introduce new `invalidateResolutionForStoreSelector` dispatch action for signalling to invalidate the resolution cache for a store selector (and all variations of arguments on that selector).
 
-### Bug Fix
+### Bug Fixes
 
 -   Resolves issue in the persistence plugin where passing `persist` as an array of reducer keys would wrongly replace state values for the unpersisted reducer keys.
 -   Restores a behavior in the persistence plugin where a default state provided as an object will be deeply merged as a base for the persisted value. This allows for a developer to include additional new keys in a persisted value default in future iterations of their store.
@@ -256,7 +308,7 @@
 
 ## 4.1.0 (2018-12-12)
 
-### New Feature
+### New Features
 
 -   `withDispatch`'s `mapDispatchToProps` function takes the `registry` object as the 3rd param ([#11851](https://github.com/WordPress/gutenberg/pull/11851)).
 -   `withSelect`'s `mapSelectToProps` function takes the `registry` object as the 3rd param ([#11851](https://github.com/WordPress/gutenberg/pull/11851)).
@@ -272,7 +324,7 @@
 -   `registry.registerActions` has been removed. Use `registry.registerStore` instead.
 -   `registry.registerResolvers` has been removed. Use `registry.registerStore` instead.
 
-### Bug Fix
+### Bug Fixes
 
 -   Resolve an issue where `withSelect`'s `mapSelectToProps` would not be rerun if the wrapped component had incurred a store change during its mount lifecycle.
 
@@ -315,7 +367,7 @@
 
 -   Adding support for using controls in resolvers using the controls plugin.
 
-### Polish
+### Internal
 
 -   Updated `redux` dependency to the latest version.
 
@@ -329,7 +381,7 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   The `withRehdyration` function is removed. Use the persistence plugin instead.
 -   The `loadAndPersist` function is removed. Use the persistence plugin instead.
diff --git a/packages/data/README.md b/packages/data/README.md
index 7a12a913e661e2..25dd75820fb5db 100644
--- a/packages/data/README.md
+++ b/packages/data/README.md
@@ -482,6 +482,23 @@ _Returns_
 
 -   `Function`: Registry selector that can be registered with a store.
 
+### createSelector
+
+Creates a memoized selector that caches the computed values according to the array of "dependants" and the selector parameters, and recomputes the values only when any of them changes.
+
+_Related_
+
+-   The documentation for the `rememo` package from which the `createSelector` function is reexported.
+
+_Parameters_
+
+-   _selector_ `Function`: Selector function that calculates a value from state and parameters.
+-   _getDependants_ `Function`: Function that returns an array of "dependant" objects.
+
+_Returns_
+
+-   `Function`: A memoized version of `selector` that caches the calculated return values.
+
 ### dispatch
 
 Given a store descriptor, returns an object of the store's action creators. Calling an action creator will cause it to be dispatched, updating the state value accordingly.
@@ -569,7 +586,7 @@ _Returns_
 
 A custom react Context consumer exposing the provided `registry` to children components. Used along with the RegistryProvider.
 
-You can read more about the react context api here: <https://reactjs.org/docs/context.html#contextprovider>
+You can read more about the react context api here: <https://react.dev/learn/passing-data-deeply-with-context#step-3-provide-the-context>
 
 _Usage_
 
@@ -779,7 +796,7 @@ _Returns_
 
 Custom react hook for retrieving props from registered selectors.
 
-In general, this custom React hook follows the [rules of hooks](https://reactjs.org/docs/hooks-rules.html).
+In general, this custom React hook follows the [rules of hooks](https://react.dev/reference/rules/rules-of-hooks).
 
 _Usage_
 
@@ -842,16 +859,16 @@ _Returns_
 
 ### useSuspenseSelect
 
-A variant of the `useSelect` hook that has the same API, but will throw a suspense Promise if any of the called selectors is in an unresolved state.
+A variant of the `useSelect` hook that has the same API, but is a compatible Suspense-enabled data source.
 
 _Parameters_
 
--   _mapSelect_ `Function`: Function called on every state change. The returned value is exposed to the component using this hook. The function receives the `registry.suspendSelect` method as the first argument and the `registry` as the second one.
+-   _mapSelect_ `T`: Function called on every state change. The returned value is exposed to the component using this hook. The function receives the `registry.suspendSelect` method as the first argument and the `registry` as the second one.
 -   _deps_ `Array`: A dependency array used to memoize the `mapSelect` so that the same `mapSelect` is invoked on every state change unless the dependencies change.
 
 _Returns_
 
--   `Object`: Data object returned by the `mapSelect` function.
+-   `ReturnType<T>`: Data object returned by the `mapSelect` function.
 
 ### withDispatch
 
diff --git a/packages/data/package.json b/packages/data/package.json
index 2ffac0ab80d85b..5e1817f0fb6ad8 100644
--- a/packages/data/package.json
+++ b/packages/data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data",
-	"version": "9.17.0",
+	"version": "10.10.0",
 	"description": "Data module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,14 +29,14 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/element": "file:../element",
-		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
-		"@wordpress/priority-queue": "file:../priority-queue",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/redux-routine": "file:../redux-routine",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/compose": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/element": "*",
+		"@wordpress/is-shallow-equal": "*",
+		"@wordpress/priority-queue": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/redux-routine": "*",
 		"deepmerge": "^4.3.0",
 		"equivalent-key-map": "^0.2.2",
 		"is-plain-object": "^5.0.0",
@@ -49,5 +50,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/data/src/components/registry-provider/context.js b/packages/data/src/components/registry-provider/context.js
index e784f4fd5c2810..04a24974a6ff25 100644
--- a/packages/data/src/components/registry-provider/context.js
+++ b/packages/data/src/components/registry-provider/context.js
@@ -17,7 +17,7 @@ const { Consumer, Provider } = Context;
  * children components. Used along with the RegistryProvider.
  *
  * You can read more about the react context api here:
- * https://reactjs.org/docs/context.html#contextprovider
+ * https://react.dev/learn/passing-data-deeply-with-context#step-3-provide-the-context
  *
  * @example
  * ```js
diff --git a/packages/data/src/components/use-dispatch/use-dispatch-with-map.js b/packages/data/src/components/use-dispatch/use-dispatch-with-map.js
index 7b595b9740eeb3..f6fce490a68871 100644
--- a/packages/data/src/components/use-dispatch/use-dispatch-with-map.js
+++ b/packages/data/src/components/use-dispatch/use-dispatch-with-map.js
@@ -25,14 +25,14 @@ import useRegistry from '../registry-provider/use-registry';
  */
 const useDispatchWithMap = ( dispatchMap, deps ) => {
 	const registry = useRegistry();
-	const currentDispatchMap = useRef( dispatchMap );
+	const currentDispatchMapRef = useRef( dispatchMap );
 
 	useIsomorphicLayoutEffect( () => {
-		currentDispatchMap.current = dispatchMap;
+		currentDispatchMapRef.current = dispatchMap;
 	} );
 
 	return useMemo( () => {
-		const currentDispatchProps = currentDispatchMap.current(
+		const currentDispatchProps = currentDispatchMapRef.current(
 			registry.dispatch,
 			registry
 		);
@@ -48,7 +48,7 @@ const useDispatchWithMap = ( dispatchMap, deps ) => {
 					return [
 						propName,
 						( ...args ) =>
-							currentDispatchMap
+							currentDispatchMapRef
 								.current( registry.dispatch, registry )
 								[ propName ]( ...args ),
 					];
diff --git a/packages/data/src/components/use-select/index.js b/packages/data/src/components/use-select/index.js
index 84cf7ed617f185..3e28e9489e977e 100644
--- a/packages/data/src/components/use-select/index.js
+++ b/packages/data/src/components/use-select/index.js
@@ -44,6 +44,14 @@ function Store( registry, suspense ) {
 	let lastIsAsync;
 	let subscriber;
 	let didWarnUnstableReference;
+	const storeStatesOnMount = new Map();
+
+	function getStoreState( name ) {
+		// If there's no store property (custom generic store), return an empty
+		// object. When comparing the state, the empty objects will cause the
+		// equality check to fail, setting `lastMapResultValid` to false.
+		return registry.stores[ name ]?.store?.getState?.() ?? {};
+	}
 
 	const createSubscriber = ( stores ) => {
 		// The set of stores the `subscribe` function is supposed to subscribe to. Here it is
@@ -56,12 +64,24 @@ function Store( registry, suspense ) {
 		const activeSubscriptions = new Set();
 
 		function subscribe( listener ) {
-			// Invalidate the value right after subscription was created. React will
-			// call `getValue` after subscribing, to detect store updates that happened
-			// in the interval between the `getValue` call during render and creating
-			// the subscription, which is slightly delayed. We need to ensure that this
-			// second `getValue` call will compute a fresh value.
-			lastMapResultValid = false;
+			// Maybe invalidate the value right after subscription was created.
+			// React will call `getValue` after subscribing, to detect store
+			// updates that happened in the interval between the `getValue` call
+			// during render and creating the subscription, which is slightly
+			// delayed. We need to ensure that this second `getValue` call will
+			// compute a fresh value only if any of the store states have
+			// changed in the meantime.
+			if ( lastMapResultValid ) {
+				for ( const name of activeStores ) {
+					if (
+						storeStatesOnMount.get( name ) !== getStoreState( name )
+					) {
+						lastMapResultValid = false;
+					}
+				}
+			}
+
+			storeStatesOnMount.clear();
 
 			const onStoreChange = () => {
 				// Invalidate the value on store update, so that a fresh value is computed.
@@ -149,6 +169,9 @@ function Store( registry, suspense ) {
 			}
 
 			if ( ! subscriber ) {
+				for ( const name of listeningStores.current ) {
+					storeStatesOnMount.set( name, getStoreState( name ) );
+				}
 				subscriber = createSubscriber( listeningStores.current );
 			} else {
 				subscriber.updateStores( listeningStores.current );
@@ -200,7 +223,6 @@ function useMappingSelect( suspense, mapSelect, deps ) {
 
 	// These are "pass-through" dependencies from the parent hook,
 	// and the parent should catch any hook rule violations.
-	// eslint-disable-next-line react-hooks/exhaustive-deps
 	const selector = useCallback( mapSelect, deps );
 	const { subscribe, getValue } = store( selector, isAsync );
 	const result = useSyncExternalStore( subscribe, getValue, getValue );
@@ -212,7 +234,7 @@ function useMappingSelect( suspense, mapSelect, deps ) {
  * Custom react hook for retrieving props from registered selectors.
  *
  * In general, this custom React hook follows the
- * [rules of hooks](https://reactjs.org/docs/hooks-rules.html).
+ * [rules of hooks](https://react.dev/reference/rules/rules-of-hooks).
  *
  * @template {MapSelect | StoreDescriptor<any>} T
  * @param {T}         mapSelect Function called on every state change. The returned value is
@@ -296,19 +318,23 @@ export default function useSelect( mapSelect, deps ) {
 }
 
 /**
- * A variant of the `useSelect` hook that has the same API, but will throw a
- * suspense Promise if any of the called selectors is in an unresolved state.
+ * A variant of the `useSelect` hook that has the same API, but is a compatible
+ * Suspense-enabled data source.
+ *
+ * @template {MapSelect} T
+ * @param {T}     mapSelect Function called on every state change. The
+ *                          returned value is exposed to the component
+ *                          using this hook. The function receives the
+ *                          `registry.suspendSelect` method as the first
+ *                          argument and the `registry` as the second one.
+ * @param {Array} deps      A dependency array used to memoize the `mapSelect`
+ *                          so that the same `mapSelect` is invoked on every
+ *                          state change unless the dependencies change.
  *
- * @param {Function} mapSelect Function called on every state change. The
- *                             returned value is exposed to the component
- *                             using this hook. The function receives the
- *                             `registry.suspendSelect` method as the first
- *                             argument and the `registry` as the second one.
- * @param {Array}    deps      A dependency array used to memoize the `mapSelect`
- *                             so that the same `mapSelect` is invoked on every
- *                             state change unless the dependencies change.
+ * @throws {Promise} A suspense Promise that is thrown if any of the called
+ * selectors is in an unresolved state.
  *
- * @return {Object} Data object returned by the `mapSelect` function.
+ * @return {ReturnType<T>} Data object returned by the `mapSelect` function.
  */
 export function useSuspenseSelect( mapSelect, deps ) {
 	return useMappingSelect( true, mapSelect, deps );
diff --git a/packages/data/src/components/use-select/test/index.js b/packages/data/src/components/use-select/test/index.js
index 93ebf800be0a84..6cd4b1bf70f690 100644
--- a/packages/data/src/components/use-select/test/index.js
+++ b/packages/data/src/components/use-select/test/index.js
@@ -61,10 +61,7 @@ describe( 'useSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 selectSpy calls expected
-		// - 1 for initial mount
-		// - 1 for the subscription effect checking if value has changed
-		expect( selectSpy ).toHaveBeenCalledTimes( 2 );
+		expect( selectSpy ).toHaveBeenCalledTimes( 1 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 1 );
 
 		// Ensure expected state was rendered.
@@ -89,11 +86,11 @@ describe( 'useSelect', () => {
 
 		const { rerender } = render(
 			<RegistryProvider value={ registry }>
-				<TestComponent keyName="foo" change={ true } />
+				<TestComponent keyName="foo" change />
 			</RegistryProvider>
 		);
 
-		expect( selectSpyFoo ).toHaveBeenCalledTimes( 2 );
+		expect( selectSpyFoo ).toHaveBeenCalledTimes( 1 );
 		expect( selectSpyBar ).toHaveBeenCalledTimes( 0 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 1 );
 
@@ -107,7 +104,7 @@ describe( 'useSelect', () => {
 			</RegistryProvider>
 		);
 
-		expect( selectSpyFoo ).toHaveBeenCalledTimes( 2 );
+		expect( selectSpyFoo ).toHaveBeenCalledTimes( 1 );
 		expect( selectSpyBar ).toHaveBeenCalledTimes( 0 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 
@@ -121,7 +118,7 @@ describe( 'useSelect', () => {
 			</RegistryProvider>
 		);
 
-		expect( selectSpyFoo ).toHaveBeenCalledTimes( 2 );
+		expect( selectSpyFoo ).toHaveBeenCalledTimes( 1 );
 		expect( selectSpyBar ).toHaveBeenCalledTimes( 1 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 3 );
 
@@ -163,7 +160,7 @@ describe( 'useSelect', () => {
 
 		// Initial render renders only parent and subscribes the parent to store.
 		expect( screen.getByText( 'none' ) ).toBeInTheDocument();
-		expect( mapSelectParent ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectParent ).toHaveBeenCalledTimes( 1 );
 		expect( mapSelectChild ).toHaveBeenCalledTimes( 0 );
 		expect( Parent ).toHaveBeenCalledTimes( 1 );
 		expect( Child ).toHaveBeenCalledTimes( 0 );
@@ -174,8 +171,8 @@ describe( 'useSelect', () => {
 
 		// Child was rendered and subscribed to the store, as the _second_ subscription.
 		expect( screen.getByText( 'yes' ) ).toBeInTheDocument();
-		expect( mapSelectParent ).toHaveBeenCalledTimes( 3 );
-		expect( mapSelectChild ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectParent ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectChild ).toHaveBeenCalledTimes( 1 );
 		expect( Parent ).toHaveBeenCalledTimes( 2 );
 		expect( Child ).toHaveBeenCalledTimes( 1 );
 
@@ -187,8 +184,8 @@ describe( 'useSelect', () => {
 		// I.e., `mapSelectChild` was called again, and state update was scheduled, we cannot
 		// avoid that, but the state update is never executed and doesn't do a rerender.
 		expect( screen.getByText( 'none' ) ).toBeInTheDocument();
-		expect( mapSelectParent ).toHaveBeenCalledTimes( 4 );
-		expect( mapSelectChild ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelectParent ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelectChild ).toHaveBeenCalledTimes( 2 );
 		expect( Parent ).toHaveBeenCalledTimes( 3 );
 		expect( Child ).toHaveBeenCalledTimes( 1 );
 	} );
@@ -217,7 +214,7 @@ describe( 'useSelect', () => {
 			</RegistryProvider>
 		);
 
-		expect( mapSelect ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelect ).toHaveBeenCalledTimes( 1 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 1 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0:0' );
 
@@ -226,7 +223,7 @@ describe( 'useSelect', () => {
 			registry.dispatch( 'store-even' ).inc();
 		} );
 
-		expect( mapSelect ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelect ).toHaveBeenCalledTimes( 2 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0:2' );
 
@@ -235,7 +232,7 @@ describe( 'useSelect', () => {
 			registry.dispatch( 'store-odd' ).inc();
 		} );
 
-		expect( mapSelect ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelect ).toHaveBeenCalledTimes( 2 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0:2' );
 
@@ -244,7 +241,7 @@ describe( 'useSelect', () => {
 			registry.dispatch( 'store-main' ).inc();
 		} );
 
-		expect( mapSelect ).toHaveBeenCalledTimes( 4 );
+		expect( mapSelect ).toHaveBeenCalledTimes( 3 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 3 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( '1:3' );
 
@@ -253,7 +250,7 @@ describe( 'useSelect', () => {
 			registry.dispatch( 'store-odd' ).inc();
 		} );
 
-		expect( mapSelect ).toHaveBeenCalledTimes( 5 );
+		expect( mapSelect ).toHaveBeenCalledTimes( 4 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 4 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( '1:5' );
 
@@ -263,7 +260,7 @@ describe( 'useSelect', () => {
 			registry.dispatch( 'store-even' ).inc();
 		} );
 
-		expect( mapSelect ).toHaveBeenCalledTimes( 6 );
+		expect( mapSelect ).toHaveBeenCalledTimes( 5 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 4 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( '1:5' );
 	} );
@@ -336,7 +333,7 @@ describe( 'useSelect', () => {
 				expect( screen.getByRole( 'status' ).dataset.d ).toBe(
 					JSON.stringify( valueB )
 				);
-				expect( mapSelectSpy ).toHaveBeenCalledTimes( 3 );
+				expect( mapSelectSpy ).toHaveBeenCalledTimes( 2 );
 			}
 		);
 	} );
@@ -368,8 +365,8 @@ describe( 'useSelect', () => {
 				</RegistryProvider>
 			);
 
-			expect( selectCount1 ).toHaveBeenCalledTimes( 2 );
-			expect( selectCount2 ).toHaveBeenCalledTimes( 2 );
+			expect( selectCount1 ).toHaveBeenCalledTimes( 1 );
+			expect( selectCount2 ).toHaveBeenCalledTimes( 1 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 1 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0' );
 
@@ -377,8 +374,8 @@ describe( 'useSelect', () => {
 				registry.dispatch( 'store-2' ).inc();
 			} );
 
-			expect( selectCount1 ).toHaveBeenCalledTimes( 2 );
-			expect( selectCount2 ).toHaveBeenCalledTimes( 3 );
+			expect( selectCount1 ).toHaveBeenCalledTimes( 1 );
+			expect( selectCount2 ).toHaveBeenCalledTimes( 2 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0' );
 
@@ -386,8 +383,8 @@ describe( 'useSelect', () => {
 				registry.dispatch( 'store-1' ).inc();
 			} );
 
-			expect( selectCount1 ).toHaveBeenCalledTimes( 3 );
-			expect( selectCount2 ).toHaveBeenCalledTimes( 3 );
+			expect( selectCount1 ).toHaveBeenCalledTimes( 2 );
+			expect( selectCount2 ).toHaveBeenCalledTimes( 2 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 3 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent( '1' );
 
@@ -425,21 +422,21 @@ describe( 'useSelect', () => {
 				</RegistryProvider>
 			);
 
-			expect( selectCount1And2 ).toHaveBeenCalledTimes( 2 );
+			expect( selectCount1And2 ).toHaveBeenCalledTimes( 1 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0,0' );
 
 			act( () => {
 				registry.dispatch( 'store-2' ).inc();
 			} );
 
-			expect( selectCount1And2 ).toHaveBeenCalledTimes( 3 );
+			expect( selectCount1And2 ).toHaveBeenCalledTimes( 2 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0,1' );
 
 			act( () => {
 				registry.dispatch( 'store-3' ).inc();
 			} );
 
-			expect( selectCount1And2 ).toHaveBeenCalledTimes( 3 );
+			expect( selectCount1And2 ).toHaveBeenCalledTimes( 2 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0,1' );
 		} );
 
@@ -475,7 +472,7 @@ describe( 'useSelect', () => {
 				</RegistryProvider>
 			);
 
-			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 2 );
+			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 1 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent(
 				'count:0,dep:0'
 			);
@@ -484,7 +481,7 @@ describe( 'useSelect', () => {
 				setDep( 1 );
 			} );
 
-			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 3 );
+			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 2 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent(
 				'count:0,dep:1'
 			);
@@ -493,7 +490,7 @@ describe( 'useSelect', () => {
 				registry.dispatch( 'store-1' ).inc();
 			} );
 
-			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 4 );
+			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 3 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent(
 				'count:1,dep:1'
 			);
@@ -525,8 +522,8 @@ describe( 'useSelect', () => {
 				</RegistryProvider>
 			);
 
-			// One select on initial render, and one in `checkIfSnapshotChanged` after subscribing.
-			// There's a third selector call on the second render, but that one returns a memoized value.
+			// One select on initial render.
+			// There's a second selector call on the second render, but that one returns a memoized value.
 			expect( selectCount1 ).toHaveBeenCalledTimes( 2 );
 
 			// Initial render and second render after counter increment (which is expected to be detected).
@@ -636,7 +633,7 @@ describe( 'useSelect', () => {
 				</RegistryProvider>
 			);
 
-			expect( selectCount1And2 ).toHaveBeenCalledTimes( 2 );
+			expect( selectCount1And2 ).toHaveBeenCalledTimes( 1 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent(
 				'count1:0,count2:0'
 			);
@@ -645,7 +642,7 @@ describe( 'useSelect', () => {
 				registry.dispatch( 'store-2' ).inc();
 			} );
 
-			expect( selectCount1And2 ).toHaveBeenCalledTimes( 3 );
+			expect( selectCount1And2 ).toHaveBeenCalledTimes( 2 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent(
 				'count1:0,count2:1'
 			);
@@ -691,7 +688,7 @@ describe( 'useSelect', () => {
 			);
 
 			expect( selectCount1 ).toHaveBeenCalledTimes( 0 );
-			expect( selectCount2 ).toHaveBeenCalledTimes( 2 );
+			expect( selectCount2 ).toHaveBeenCalledTimes( 1 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent(
 				'count2:0'
 			);
@@ -699,7 +696,7 @@ describe( 'useSelect', () => {
 			act( () => screen.getByText( 'Toggle' ).click() );
 
 			expect( selectCount1 ).toHaveBeenCalledTimes( 1 );
-			expect( selectCount2 ).toHaveBeenCalledTimes( 2 );
+			expect( selectCount2 ).toHaveBeenCalledTimes( 1 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent(
 				'count1:0'
 			);
@@ -710,7 +707,7 @@ describe( 'useSelect', () => {
 			} );
 
 			expect( selectCount1 ).toHaveBeenCalledTimes( 2 );
-			expect( selectCount2 ).toHaveBeenCalledTimes( 2 );
+			expect( selectCount2 ).toHaveBeenCalledTimes( 1 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent(
 				'count1:1'
 			);
@@ -960,15 +957,15 @@ describe( 'useSelect', () => {
 			} );
 
 			render(
-				<AsyncModeProvider value={ true }>
+				<AsyncModeProvider value>
 					<RegistryProvider value={ registry }>
 						<TestComponent />
 					</RegistryProvider>
 				</AsyncModeProvider>
 			);
 
-			// initial render + missed update catcher in subscribing effect
-			expect( selectSpy ).toHaveBeenCalledTimes( 2 );
+			// initial render
+			expect( selectSpy ).toHaveBeenCalledTimes( 1 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 1 );
 
 			// Ensure expected state was rendered.
@@ -979,12 +976,12 @@ describe( 'useSelect', () => {
 			} );
 
 			// still not called right after increment
-			expect( selectSpy ).toHaveBeenCalledTimes( 2 );
+			expect( selectSpy ).toHaveBeenCalledTimes( 1 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0' );
 
 			expect( await screen.findByText( 1 ) ).toBeInTheDocument();
 
-			expect( selectSpy ).toHaveBeenCalledTimes( 3 );
+			expect( selectSpy ).toHaveBeenCalledTimes( 2 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 		} );
 
@@ -1007,7 +1004,7 @@ describe( 'useSelect', () => {
 				</AsyncModeProvider>
 			);
 
-			const { rerender } = render( <App async={ true } /> );
+			const { rerender } = render( <App async /> );
 
 			// Ensure expected state was rendered.
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent( '0' );
@@ -1026,9 +1023,8 @@ describe( 'useSelect', () => {
 			// Ensure the async update was flushed during the rerender.
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent( '1' );
 
-			// initial render + subscription check + rerender with isAsync=false
-			expect( selectSpy ).toHaveBeenCalledTimes( 3 );
 			// initial render + rerender with isAsync=false
+			expect( selectSpy ).toHaveBeenCalledTimes( 2 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 		} );
 
@@ -1048,7 +1044,7 @@ describe( 'useSelect', () => {
 			} );
 
 			const App = ( { variant } ) => (
-				<AsyncModeProvider value={ true }>
+				<AsyncModeProvider value>
 					<RegistryProvider value={ registry }>
 						<TestComponent variant={ variant } />
 					</RegistryProvider>
@@ -1077,7 +1073,7 @@ describe( 'useSelect', () => {
 			// Give the async update time to run in case it wasn't cancelled
 			await new Promise( setImmediate );
 
-			expect( selectA ).toHaveBeenCalledTimes( 2 );
+			expect( selectA ).toHaveBeenCalledTimes( 1 );
 			expect( selectB ).toHaveBeenCalledTimes( 2 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 		} );
@@ -1093,7 +1089,7 @@ describe( 'useSelect', () => {
 			} );
 
 			const App = () => (
-				<AsyncModeProvider value={ true }>
+				<AsyncModeProvider value>
 					<RegistryProvider value={ registry }>
 						<TestComponent />
 					</RegistryProvider>
@@ -1120,7 +1116,7 @@ describe( 'useSelect', () => {
 			await new Promise( setImmediate );
 
 			// only the initial render, no state updates
-			expect( selectSpy ).toHaveBeenCalledTimes( 2 );
+			expect( selectSpy ).toHaveBeenCalledTimes( 1 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 1 );
 		} );
 
@@ -1138,7 +1134,7 @@ describe( 'useSelect', () => {
 			} );
 
 			const App = ( { reg } ) => (
-				<AsyncModeProvider value={ true }>
+				<AsyncModeProvider value>
 					<RegistryProvider value={ reg }>
 						<TestComponent />
 					</RegistryProvider>
@@ -1163,7 +1159,7 @@ describe( 'useSelect', () => {
 			await new Promise( setImmediate );
 
 			// initial render + registry change rerender, no state updates
-			expect( selectSpy ).toHaveBeenCalledTimes( 4 );
+			expect( selectSpy ).toHaveBeenCalledTimes( 2 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 		} );
 	} );
diff --git a/packages/data/src/components/with-dispatch/test/index.js b/packages/data/src/components/with-dispatch/test/index.js
index f4e38d28edba0a..6bcda99ba9c0f0 100644
--- a/packages/data/src/components/with-dispatch/test/index.js
+++ b/packages/data/src/components/with-dispatch/test/index.js
@@ -58,7 +58,9 @@ describe( 'withDispatch', () => {
 					} );
 				},
 			};
-		} )( ( props ) => <Button onClick={ props.increment } /> );
+		} )( ( props ) => (
+			<Button __next40pxDefaultSize onClick={ props.increment } />
+		) );
 
 		const { rerender } = render(
 			<RegistryProvider value={ registry }>
diff --git a/packages/data/src/components/with-select/test/index.js b/packages/data/src/components/with-select/test/index.js
index 01afcfe5db6ad1..fe798354cba20d 100644
--- a/packages/data/src/components/with-select/test/index.js
+++ b/packages/data/src/components/with-select/test/index.js
@@ -52,10 +52,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// Expected two times:
-		// - Once on initial render.
-		// - Once on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 
 		// Wrapper is the enhanced component.
@@ -107,10 +104,7 @@ describe( 'withSelect', () => {
 		);
 
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( mapDispatchToProps ).toHaveBeenCalledTimes( 1 );
 
 		// Simulate a click on the button.
@@ -119,16 +113,14 @@ describe( 'withSelect', () => {
 		await user.click( button );
 
 		expect( button ).toHaveTextContent( '1' );
-		// 2 times =
-		//  1. Initial mount
+		// 1. Initial mount
 		// 2. When click handler is called.
 		expect( mapDispatchToProps ).toHaveBeenCalledTimes( 2 );
-		// 4 times
+		// 3 times
 		// - 1 on initial render
-		// - 1 on effect before subscription set.
 		// - 1 on click triggering subscription firing.
 		// - 1 on rerender.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 4 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 3 );
 		// Verifies component only renders twice.
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 	} );
@@ -151,7 +143,7 @@ describe( 'withSelect', () => {
 			},
 		} );
 
-		// @todo, Should we allow this behaviour? Side-effects
+		// @todo Should we allow this behaviour? Side-effects
 		// on mount are discouraged in React (breaks Suspense and React Async Mode)
 		// leaving in place for now under the assumption there's current usage
 		// of withSelect in GB that expects support.
@@ -253,10 +245,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 
 		rerender(
@@ -266,7 +255,7 @@ describe( 'withSelect', () => {
 		);
 
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( '10' );
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 	} );
 
@@ -296,10 +285,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 
 		rerender(
@@ -308,7 +294,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 	} );
 
@@ -339,15 +325,12 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 
 		await act( async () => registry.dispatch( 'demo' ).update() );
 
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 	} );
 
@@ -373,10 +356,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 
 		rerender(
@@ -385,7 +365,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 	} );
 
@@ -411,15 +391,12 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 
 		await act( async () => store.dispatch( { type: 'dummy' } ) );
 
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 	} );
 
@@ -451,10 +428,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent(
@@ -470,7 +444,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent(
 			JSON.stringify( {
@@ -510,10 +484,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( 'Unknown' );
 
@@ -523,7 +494,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 3 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( 'OK' );
 
@@ -533,7 +504,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 4 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 3 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 3 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( 'Unknown' );
 	} );
@@ -574,11 +545,8 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( childMapSelectToProps ).toHaveBeenCalledTimes( 2 );
-		expect( parentMapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( childMapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( parentMapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( ChildOriginalComponent ).toHaveBeenCalledTimes( 1 );
 		expect( ParentOriginalComponent ).toHaveBeenCalledTimes( 1 );
 
@@ -588,8 +556,8 @@ describe( 'withSelect', () => {
 			registry.dispatch( 'childRender' ).toggleRender();
 		} );
 
-		expect( childMapSelectToProps ).toHaveBeenCalledTimes( 2 );
-		expect( parentMapSelectToProps ).toHaveBeenCalledTimes( 4 );
+		expect( childMapSelectToProps ).toHaveBeenCalledTimes( 1 );
+		expect( parentMapSelectToProps ).toHaveBeenCalledTimes( 3 );
 		expect( ChildOriginalComponent ).toHaveBeenCalledTimes( 1 );
 		expect( ParentOriginalComponent ).toHaveBeenCalledTimes( 2 );
 	} );
@@ -620,10 +588,7 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 2 times:
-		// - 1 on initial render
-		// - 1 on effect before subscription set.
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 1 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 1 );
 
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( 'first' );
@@ -642,12 +607,10 @@ describe( 'withSelect', () => {
 			</RegistryProvider>
 		);
 
-		// 4 times:
+		// 2 times:
 		// - 1 on initial render
-		// - 1 on effect before subscription set.
 		// - 1 on re-render
-		// - 1 on effect before new subscription set (because registry has changed)
-		expect( mapSelectToProps ).toHaveBeenCalledTimes( 4 );
+		expect( mapSelectToProps ).toHaveBeenCalledTimes( 2 );
 		expect( OriginalComponent ).toHaveBeenCalledTimes( 2 );
 		expect( screen.getByRole( 'status' ) ).toHaveTextContent( 'second' );
 	} );
diff --git a/packages/data/src/controls.js b/packages/data/src/controls.js
index 508dba8e50c40d..8e2795b516e0ed 100644
--- a/packages/data/src/controls.js
+++ b/packages/data/src/controls.js
@@ -95,7 +95,7 @@ function resolveSelect( storeNameOrDescriptor, selectorName, ...args ) {
  *
  * // Action generator using dispatch
  * export function* myAction() {
- *   yield controls.dispatch( 'core/edit-post', 'togglePublishSidebar' );
+ *   yield controls.dispatch( 'core/editor', 'togglePublishSidebar' );
  *   // do some other things.
  * }
  * ```
diff --git a/packages/data/src/create-selector.js b/packages/data/src/create-selector.js
new file mode 100644
index 00000000000000..069932e8007e28
--- /dev/null
+++ b/packages/data/src/create-selector.js
@@ -0,0 +1,11 @@
+/**
+ * Creates a memoized selector that caches the computed values according to the array of "dependants"
+ * and the selector parameters, and recomputes the values only when any of them changes.
+ *
+ * @see The documentation for the `rememo` package from which the `createSelector` function is reexported.
+ *
+ * @param {Function} selector      Selector function that calculates a value from state and parameters.
+ * @param {Function} getDependants Function that returns an array of "dependant" objects.
+ * @return {Function} A memoized version of `selector` that caches the calculated return values.
+ */
+export { default as createSelector } from 'rememo';
diff --git a/packages/data/src/factory.js b/packages/data/src/factory.js
index a4adc4dcf42517..be4ef8cf673c5e 100644
--- a/packages/data/src/factory.js
+++ b/packages/data/src/factory.js
@@ -39,11 +39,22 @@
  * @return {Function} Registry selector that can be registered with a store.
  */
 export function createRegistrySelector( registrySelector ) {
+	const selectorsByRegistry = new WeakMap();
 	// Create a selector function that is bound to the registry referenced by `selector.registry`
 	// and that has the same API as a regular selector. Binding it in such a way makes it
 	// possible to call the selector directly from another selector.
-	const selector = ( ...args ) =>
-		registrySelector( selector.registry.select )( ...args );
+	const wrappedSelector = ( ...args ) => {
+		let selector = selectorsByRegistry.get( wrappedSelector.registry );
+		// We want to make sure the cache persists even when new registry
+		// instances are created. For example patterns create their own editors
+		// with their own core/block-editor stores, so we should keep track of
+		// the cache for each registry instance.
+		if ( ! selector ) {
+			selector = registrySelector( wrappedSelector.registry.select );
+			selectorsByRegistry.set( wrappedSelector.registry, selector );
+		}
+		return selector( ...args );
+	};
 
 	/**
 	 * Flag indicating that the selector is a registry selector that needs the correct registry
@@ -52,9 +63,9 @@ export function createRegistrySelector( registrySelector ) {
 	 *
 	 * @type {boolean}
 	 */
-	selector.isRegistrySelector = true;
+	wrappedSelector.isRegistrySelector = true;
 
-	return selector;
+	return wrappedSelector;
 }
 
 /**
diff --git a/packages/data/src/index.js b/packages/data/src/index.js
index 2807ef7e9708ff..43ea843d1a64a5 100644
--- a/packages/data/src/index.js
+++ b/packages/data/src/index.js
@@ -23,6 +23,7 @@ export { useDispatch } from './components/use-dispatch';
 export { AsyncModeProvider } from './components/async-mode-provider';
 export { createRegistry } from './registry';
 export { createRegistrySelector, createRegistryControl } from './factory';
+export { createSelector } from './create-selector';
 export { controls } from './controls';
 export { default as createReduxStore } from './redux-store';
 export { dispatch } from './dispatch';
diff --git a/packages/data/src/lock-unlock.js b/packages/data/src/lock-unlock.js
index b5b1f9cbed5a56..99596d756f66e7 100644
--- a/packages/data/src/lock-unlock.js
+++ b/packages/data/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/data'
 	);
diff --git a/packages/data/src/redux-store/index.js b/packages/data/src/redux-store/index.js
index e8394087215428..979c3127b9ed52 100644
--- a/packages/data/src/redux-store/index.js
+++ b/packages/data/src/redux-store/index.js
@@ -64,12 +64,16 @@ const mapValues = ( obj, callback ) =>
 		] )
 	);
 
-// Convert Map objects to plain objects
-const mapToObject = ( key, state ) => {
+// Convert  non serializable types to plain objects
+const devToolsReplacer = ( key, state ) => {
 	if ( state instanceof Map ) {
 		return Object.fromEntries( state );
 	}
 
+	if ( state instanceof window.HTMLElement ) {
+		return null;
+	}
+
 	return state;
 };
 
@@ -237,6 +241,11 @@ export default function createReduxStore( key, options ) {
 				const boundSelector = ( ...args ) => {
 					args = normalize( selector, args );
 					const state = store.__unstableOriginalGetState();
+					// Before calling the selector, switch to the correct
+					// registry.
+					if ( selector.isRegistrySelector ) {
+						selector.registry = registry;
+					}
 					return selector( state.root, ...args );
 				};
 
@@ -416,7 +425,7 @@ function instantiateReduxStore( key, options, registry, thunkArgs ) {
 				name: key,
 				instanceId: key,
 				serialize: {
-					replacer: mapToObject,
+					replacer: devToolsReplacer,
 				},
 			} )
 		);
diff --git a/packages/data/src/redux-store/metadata/selectors.js b/packages/data/src/redux-store/metadata/selectors.js
index 884ec714efd574..306bb89977d2dc 100644
--- a/packages/data/src/redux-store/metadata/selectors.js
+++ b/packages/data/src/redux-store/metadata/selectors.js
@@ -1,11 +1,12 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import createSelector from 'rememo';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
+import { createSelector } from '../../create-selector';
 import { selectorArgsToStateKey } from './utils';
 
 /** @typedef {Record<string, import('./reducer').State>} State */
@@ -34,10 +35,16 @@ export function getResolutionState( state, selectorName, args ) {
 }
 
 /**
- * Returns the raw `isResolving` value for a given selector name,
- * and arguments set. May be undefined if the selector has never been resolved
- * or not resolved for the given set of arguments, otherwise true or false for
- * resolution started and completed respectively.
+ * Returns an `isResolving`-like value for a given selector name and arguments set.
+ * Its value is either `undefined` if the selector has never been resolved or has been
+ * invalidated, or a `true`/`false` boolean value if the resolution is in progress or
+ * has finished, respectively.
+ *
+ * This is a legacy selector that was implemented when the "raw" internal data had
+ * this `undefined | boolean` format. Nowadays the internal value is an object that
+ * can be retrieved with `getResolutionState`.
+ *
+ * @deprecated
  *
  * @param {State}      state        Data state.
  * @param {string}     selectorName Selector name.
@@ -46,8 +53,13 @@ export function getResolutionState( state, selectorName, args ) {
  * @return {boolean | undefined} isResolving value.
  */
 export function getIsResolving( state, selectorName, args ) {
-	const resolutionState = getResolutionState( state, selectorName, args );
+	deprecated( 'wp.data.select( store ).getIsResolving', {
+		since: '6.6',
+		version: '6.8',
+		alternative: 'wp.data.select( store ).getResolutionState',
+	} );
 
+	const resolutionState = getResolutionState( state, selectorName, args );
 	return resolutionState && resolutionState.status === 'resolving';
 }
 
diff --git a/packages/data/src/redux-store/metadata/test/selectors.js b/packages/data/src/redux-store/metadata/test/selectors.js
index faf9da3a169853..37eb820889cc15 100644
--- a/packages/data/src/redux-store/metadata/test/selectors.js
+++ b/packages/data/src/redux-store/metadata/test/selectors.js
@@ -31,12 +31,16 @@ describe( 'getIsResolving', () => {
 		registry.registerStore( 'testStore', testStore );
 	} );
 
+	const DEPRECATION_MESSAGE =
+		'wp.data.select( store ).getIsResolving is deprecated since version 6.6 and will be removed in version 6.8. Please use wp.data.select( store ).getResolutionState instead.';
+
 	it( 'should return undefined if no state by reducerKey, selectorName', () => {
 		const result = registry
 			.select( 'testStore' )
 			.getIsResolving( 'getFoo', [] );
 
 		expect( result ).toBe( undefined );
+		expect( console ).toHaveWarnedWith( DEPRECATION_MESSAGE );
 	} );
 
 	it( 'should return undefined if state by reducerKey, selectorName, but not args', () => {
diff --git a/packages/data/src/registry.js b/packages/data/src/registry.js
index 02a0b19136a3e0..3e7a8fdd8b5a07 100644
--- a/packages/data/src/registry.js
+++ b/packages/data/src/registry.js
@@ -322,9 +322,14 @@ export function createRegistry( storeConfigs = {}, parent = null ) {
 
 		emitter.pause();
 		Object.values( stores ).forEach( ( store ) => store.emitter.pause() );
-		callback();
-		emitter.resume();
-		Object.values( stores ).forEach( ( store ) => store.emitter.resume() );
+		try {
+			callback();
+		} finally {
+			emitter.resume();
+			Object.values( stores ).forEach( ( store ) =>
+				store.emitter.resume()
+			);
+		}
 	}
 
 	let registry = {
diff --git a/packages/data/src/test/registry-selectors.js b/packages/data/src/test/registry-selectors.js
new file mode 100644
index 00000000000000..b9e8e61a90a647
--- /dev/null
+++ b/packages/data/src/test/registry-selectors.js
@@ -0,0 +1,150 @@
+/**
+ * Internal dependencies
+ */
+import { createRegistry } from '../registry';
+import { createRegistrySelector } from '../factory';
+import { createSelector } from '..';
+import createReduxStore from '../redux-store';
+
+const getElementCount = createRegistrySelector( ( select ) => () => {
+	return select( 'elements' ).getElements().length;
+} );
+
+const getFilterValue = ( state ) => state;
+
+const getFilteredElements = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state ) => {
+			const filter = getFilterValue( state );
+			const elements = select( 'elements' ).getElements();
+			if ( ! filter ) {
+				return elements;
+			}
+			return elements.filter( ( el ) => el.startsWith( filter ) );
+		},
+		( state ) => [
+			select( 'elements' ).getElements(),
+			getFilterValue( state ),
+		]
+	)
+);
+
+const elementsStore = createReduxStore( 'elements', {
+	reducer( state = [], action ) {
+		if ( action.type === 'ADD' ) {
+			return [ ...state, ...action.elements ];
+		}
+		return state;
+	},
+	actions: {
+		add: ( ...elements ) => ( { type: 'ADD', elements } ),
+	},
+	selectors: {
+		getElements: ( state ) => state,
+	},
+} );
+
+const uiStore = createReduxStore( 'ui', {
+	reducer( state = '', action ) {
+		if ( action.type === 'FILTER' ) {
+			return action.value;
+		}
+		return state;
+	},
+	actions: {
+		filter: ( value ) => ( { type: 'FILTER', value } ),
+	},
+	selectors: {
+		getFilterValue,
+		getElementCount,
+		getFilteredElements,
+	},
+} );
+
+describe( 'createRegistrySelector', () => {
+	it( 'can bind one selector to a registry', () => {
+		const registry = createRegistry();
+		registry.register( elementsStore );
+		registry.register( uiStore );
+
+		expect( registry.select( uiStore ).getElementCount() ).toBe( 0 );
+
+		registry.dispatch( elementsStore ).add( 'Carbon' );
+
+		expect( registry.select( uiStore ).getElementCount() ).toBe( 1 );
+	} );
+
+	it( 'can bind one selector to multiple registries (createRegistrySelector)', () => {
+		const registry1 = createRegistry();
+		const registry2 = createRegistry();
+
+		registry1.register( elementsStore );
+		registry1.register( uiStore );
+		registry2.register( elementsStore );
+		registry2.register( uiStore );
+
+		expect( registry1.select( uiStore ).getElementCount() ).toBe( 0 );
+		expect( registry2.select( uiStore ).getElementCount() ).toBe( 0 );
+
+		registry1.dispatch( elementsStore ).add( 'Carbon' );
+
+		expect( registry1.select( uiStore ).getElementCount() ).toBe( 1 );
+		expect( registry2.select( uiStore ).getElementCount() ).toBe( 0 );
+
+		registry2.dispatch( elementsStore ).add( 'Helium' );
+
+		expect( registry1.select( uiStore ).getElementCount() ).toBe( 1 );
+		expect( registry2.select( uiStore ).getElementCount() ).toBe( 1 );
+	} );
+
+	it( 'can bind one selector to multiple registries (createRegistrySelector + createSelector)', () => {
+		const registry1 = createRegistry();
+		registry1.register( elementsStore );
+		registry1.register( uiStore );
+		registry1.dispatch( elementsStore ).add( 'Carbon' );
+
+		const registry2 = createRegistry();
+		registry2.register( elementsStore );
+		registry2.register( uiStore );
+		registry2.dispatch( elementsStore ).add( 'Helium' );
+
+		// Expects the `getFilteredElements` to be bound separately and independently to the two registries
+		expect( registry1.select( uiStore ).getFilteredElements() ).toEqual( [
+			'Carbon',
+		] );
+		expect( registry2.select( uiStore ).getFilteredElements() ).toEqual( [
+			'Helium',
+		] );
+	} );
+
+	it( 'can bind a memoized selector to a registry', () => {
+		const registry = createRegistry();
+		registry.register( elementsStore );
+		registry.register( uiStore );
+
+		registry.dispatch( elementsStore ).add( 'Carbon', 'Nitrogen' );
+		registry.dispatch( uiStore ).filter( 'Ca' );
+
+		// check that `getFilteredElements` return value is a memoized array
+		const elements1 = registry.select( uiStore ).getFilteredElements();
+		expect( elements1 ).toEqual( [ 'Carbon' ] );
+		const elements2 = registry.select( uiStore ).getFilteredElements();
+		expect( elements2 ).toBe( elements1 ); // memoized
+
+		// check that adding a new element triggers recalculation
+		registry.dispatch( elementsStore ).add( 'Calcium' );
+
+		const elements3 = registry.select( uiStore ).getFilteredElements();
+		expect( elements3 ).toEqual( [ 'Carbon', 'Calcium' ] );
+		const elements4 = registry.select( uiStore ).getFilteredElements();
+		expect( elements4 ).toBe( elements3 ); // memoized
+
+		// check that changing the filter triggers recalculation
+		registry.dispatch( uiStore ).filter( 'Ni' );
+
+		const elements5 = registry.select( uiStore ).getFilteredElements();
+		expect( elements5 ).toEqual( [ 'Nitrogen' ] );
+		const elements6 = registry.select( uiStore ).getFilteredElements();
+		expect( elements6 ).toBe( elements5 ); // memoized
+	} );
+} );
diff --git a/packages/data/src/test/registry.js b/packages/data/src/test/registry.js
index df9cb774dfc8cf..46b914d776f132 100644
--- a/packages/data/src/test/registry.js
+++ b/packages/data/src/test/registry.js
@@ -755,6 +755,28 @@ describe( 'createRegistry', () => {
 			} );
 			expect( listener ).toHaveBeenCalledTimes( 1 );
 		} );
+
+		it( 'should handle errors', () => {
+			const store = registry.registerStore( 'myAwesomeReducer', {
+				reducer: ( state = 0 ) => state + 1,
+			} );
+			const listener = jest.fn();
+			const error = new Error( 'Whoops' );
+			subscribeWithUnsubscribe( listener );
+
+			expect( () => {
+				registry.batch( () => {
+					throw error;
+				} );
+			} ).toThrow( error );
+			expect( listener ).not.toHaveBeenCalled();
+
+			registry.batch( () => {
+				store.dispatch( { type: 'dummy' } );
+				store.dispatch( { type: 'dummy' } );
+			} );
+			expect( listener ).toHaveBeenCalledTimes( 1 );
+		} );
 	} );
 
 	describe( 'use', () => {
diff --git a/packages/data/tsconfig.json b/packages/data/tsconfig.json
index 91fd705aab72fc..2bfc881dc6216e 100644
--- a/packages/data/tsconfig.json
+++ b/packages/data/tsconfig.json
@@ -1,9 +1,9 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
 		"declarationDir": "build-types",
-		"noUnusedParameters": false,
 		"checkJs": false
 	},
 	"references": [
diff --git a/packages/dataviews/.npmrc b/packages/dataviews/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/dataviews/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/dataviews/CHANGELOG.md b/packages/dataviews/CHANGELOG.md
index 6ed52df1077824..d5054b8578d95c 100644
--- a/packages/dataviews/CHANGELOG.md
+++ b/packages/dataviews/CHANGELOG.md
@@ -1,3 +1,128 @@
 <!-- Learn how to maintain this file at https://github.com/WordPress/gutenberg/tree/HEAD/packages#maintaining-changelogs. -->
 
 ## Unreleased
+
+## 4.6.0 (2024-10-16)
+
+-   Invert the logic for which icon to show in `DataViews` when using the filter view. Icons now match the action of the button label. ([#65914](https://github.com/WordPress/gutenberg/pull/65914)).
+
+## 4.5.0 (2024-10-03)
+
+## 4.4.0 (2024-09-19)
+
+## 4.3.0 (2024-09-05)
+
+## 4.2.0 (2024-08-21)
+
+## New features
+
+-   Support using a component for field headers or names by providing a `header` property in the field object. The string `label` property (or `id`) is still mandatory. ([#64642](https://github.com/WordPress/gutenberg/pull/64642)).
+
+## Internal
+
+-   The "move left/move right" controls in the table layout (popup displayed on cliking header) are always visible. ([#64646](https://github.com/WordPress/gutenberg/pull/64646)). Before this, its visibility depending on filters, enableSorting, and enableHiding.
+- Filters no longer display the elements' description. ([#64674](https://github.com/WordPress/gutenberg/pull/64674))
+
+
+## Enhancements
+
+-   Adjust layout of filter / actions row, increase width of search control when the container is narrower. ([#64681](https://github.com/WordPress/gutenberg/pull/64681)).
+
+## 4.1.0 (2024-08-07)
+
+## Internal
+
+-   Upgraded `@ariakit/react` (v0.4.7) ([#64066](https://github.com/WordPress/gutenberg/pull/64066)).
+
+## 4.0.0 (2024-07-24)
+
+### Breaking Changes
+
+-   `onSelectionChange` prop has been renamed to `onChangeSelection` and its argument has been updated to be a list of ids.
+-   `setSelection` prop has been removed. Please use `onChangeSelection` instead.
+-   `header` field property has been renamed to `label`.
+-   `DataForm`'s `visibleFields` prop has been renamed to `fields`.
+-   `DataForm`'s `onChange` prop has been update to receive as argument only the fields that have changed.
+
+### New features
+
+-   Support multiple layouts in `DataForm` component and introduce the `panel` layout.
+
+## 3.0.0 (2024-07-10)
+
+### Breaking Changes
+
+-   Replace the `hiddenFields` property in the view prop of `DataViews` with a `fields` property that accepts an array of visible fields instead.
+-   Replace the `supportedLayouts` prop in the `DataViews` component with a `defaultLayouts` prop that accepts an object whose keys are the layout names and values are the default view objects for these layouts.
+
+### New features
+
+-   Added a new `DataForm` component to render controls from a given configuration (fields, form), and data.
+
+### Internal
+
+-   Method style type signatures have been changed to function style ([#62718](https://github.com/WordPress/gutenberg/pull/62718)).
+
+## 2.2.0 (2024-06-26)
+
+## 2.1.0 (2024-06-15)
+
+## 2.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Legacy support for `in` and `notIn` operators introduced in 0.8 .0 has been removed and they no longer work. Please, convert them to `is` and `isNot` respectively.
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+### Internal
+
+-   Remove some unused dependencies ([#62010](https://github.com/WordPress/gutenberg/pull/62010)).
+
+### Enhancements
+
+-   `label` prop in Actions API can be either a `string` value or a `function`, in case we want to use information from the selected items. ([#61942](https://github.com/WordPress/gutenberg/pull/61942)).
+-   Add `registry` argument to the callback of the actions API. ([#62505](https://github.com/WordPress/gutenberg/pull/62505)).
+
+## 1.2.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 1.1.0 (2024-05-02)
+
+## 1.0.0 (2024-04-19)
+
+### Breaking Changes
+
+-   Removed the `onDetailsChange` event only available for the list layout. We are looking into adding actions to the list layout, including primary ones.
+
+## 0.9.0 (2024-04-03)
+
+### Enhancements
+
+-   The `enumeration` type has been removed and we'll introduce new field types soon. The existing filters will still work as before given they checked for field.elements, which is still a condition filters should have.
+
+## 0.8.0 (2024-03-21)
+
+### Enhancements
+
+-   Two new operators have been added: `isAll` and `isNotAll`. These are meant to represent `AND` operations. For example, `Category is all: Book, Review, Science Fiction` would represent all items that have all three categories selected.
+-   DataViews now supports multi-selection. A new set of filter operators has been introduced: `is`, `isNot`, `isAny`, `isNone`. Single-selection operators are `is` and `isNot`, and multi-selection operators are `isAny` and `isNone`. If no operators are declared for a filter, it will support multi-selection. Additionally, the old filter operators `in` and `notIn` operators have been deprecated and will work as `is` and `isNot` respectively. Please, migrate to the new operators as they'll be removed soon.
+
+### Breaking Changes
+
+-   Removed the `getPaginationResults` and `sortByTextFields` utils and replaced them with a unique `filterSortAndPaginate` function.
+
+## 0.7.0 (2024-03-06)
+
+## 0.6.0 (2024-02-21)
+
+## 0.5.0 (2024-02-09)
+
+## 0.4.0 (2024-01-24)
+
+## 0.3.0 (2024-01-10)
+
+## 0.2.0 (2023-12-13)
diff --git a/packages/dataviews/README.md b/packages/dataviews/README.md
index 2ee1d7f42eff5b..95b8fc898555c3 100644
--- a/packages/dataviews/README.md
+++ b/packages/dataviews/README.md
@@ -2,6 +2,10 @@
 
 DataViews is a component that provides an API to render datasets using different types of layouts (table, grid, list, etc.).
 
+DataViews is data agnostic, it can work with data coming from a static (JSON file) or dynamic source (HTTP Request) — it just requires the data to be an array of objects that have an unique identifier. Consumers are responsible to query the data source appropiately based on the DataViews props:
+
+![DataViews flow](https://developer.wordpress.org/files/2024/09/368600071-20aa078f-7c3d-406d-8dd0-8b764addd22a.png "DataViews flow")
+
 ## Installation
 
 Install the module
@@ -12,75 +16,189 @@ npm install @wordpress/dataviews --save
 
 ## Usage
 
-```js
-<DataViews
-	data={ pages }
-	getItemId={ ( item ) => item.id }
-	isLoading={ isLoadingPages }
-	view={ view }
-	onChangeView={ onChangeView }
-	fields={ fields }
-	actions={ [ trashPostAction ] }
-	paginationInfo={ { totalItems, totalPages } }
-/>
+```jsx
+const Example = () => {
+	// Declare data, fields, etc.
+
+	return (
+		<DataViews
+			data={ data }
+			fields={ fields }
+			view={ view }
+			onChangeView={ onChangeView }
+			defaultLayouts={ defaultLayouts }
+			actions={ actions }
+			paginationInfo={ paginationInfo }
+		/>
+	);
+};
 ```
 
-## Data
+<div class="callout callout-info">At <a href="https://wordpress.github.io/gutenberg/">WordPress Gutenberg's Storybook</a> there's and <a href="https://wordpress.github.io/gutenberg/?path=/docs/dataviews-dataviews--docs">example implementation of the Dataviews component</a></div>
+
+## Properties
+
+### `data`: `Object[]`
 
 The dataset to work with, represented as a one-dimensional array.
 
 Example:
 
 ```js
-[
-	{ id: 1, title: "Title", ... },
-	{ ... }
-]
+const data = [
+	{
+		id: 1,
+		title: 'Title',
+		author: 'Admin',
+		date: '2012-04-23T18:25:43.511Z',
+	},
+	{
+		/* ... */
+	},
+];
+```
+
+By default, dataviews would use each record's `id` as an unique identifier. If it's not, the consumer should provide a `getItemId` function that returns one.
+
+### `fields`: `Object[]`
+
+The fields describe the visible items for each record in the dataset.
+
+Example:
+
+```js
+const STATUSES = [
+	{ value: 'draft', label: __( 'Draft' ) },
+	{ value: 'future', label: __( 'Scheduled' ) },
+	{ value: 'pending', label: __( 'Pending Review' ) },
+	{ value: 'private', label: __( 'Private' ) },
+	{ value: 'publish', label: __( 'Published' ) },
+	{ value: 'trash', label: __( 'Trash' ) },
+];
+const fields = [
+	{
+		id: 'title',
+		label: 'Title',
+		enableHiding: false,
+	},
+	{
+		id: 'date',
+		label: 'Date',
+		render: ( { item } ) => {
+			return <time>{ getFormattedDate( item.date ) }</time>;
+		},
+	},
+	{
+		id: 'author',
+		label: __( 'Author' ),
+		render: ( { item } ) => {
+			return <a href="...">{ item.author }</a>;
+		},
+		elements: [
+			{ value: 1, label: 'Admin' },
+			{ value: 2, label: 'User' },
+		],
+		filterBy: {
+			operators: [ 'is', 'isNot' ],
+		},
+		enableSorting: false,
+	},
+	{
+		label: __( 'Status' ),
+		id: 'status',
+		getValue: ( { item } ) =>
+			STATUSES.find( ( { value } ) => value === item.status )?.label ??
+			item.status,
+		elements: STATUSES,
+		filterBy: {
+			operators: [ 'isAny' ],
+		},
+		enableSorting: false,
+	},
+];
 ```
 
-## View
+Each field is an object with the following properties:
+
+-   `id`: identifier for the field. Unique.
+-   `label`: the field's name to be shown in the UI.
+-   `getValue`: function that returns the value of the field, defaults to `field[id]`.
+-   `render`: function that renders the field. Optional, `getValue` will be used if `render` is not defined.
+-   <code id="fields-elements">elements</code>: The list of options to pick from when using the field as a filter or when editing (DataForm component). It expects an array of objects with the following properties:
+
+    -   `value`: The id of the value to filter to (for internal use)
+    -   `label`: The text that will be displayed in the UI for the item.
+    -   `description`: A longer description that describes the element, to also be displayed. Optional.
+
+    To enable the filter by a field we just need to set a proper value to the `elements` property of the field we'd like to filter by.
+
+-   `type`: the type of the field. See "Field types".
+-   `enableSorting`: whether the data can be sorted by the given field. True by default.
+-   `enableHiding`: whether the field can be hidden. True by default.
+-   `enableGlobalSearch`: whether the field is searchable. False by default.
+-   `filterBy`: configuration for the filters enabled by the `elements` property.
+    -   `operators`: the list of [operators](#operators) supported by the field.
+    -   `isPrimary`: whether it is a primary filter. A primary filter is always visible and is not listed in the "Add filter" component, except for the list layout where it behaves like a secondary filter.
+
+### `view`: `object`
 
 The view object configures how the dataset is visible to the user.
 
 Example:
 
 ```js
-{
+const view = {
 	type: 'table',
-	perPage: 5,
+	search: '',
+	filters: [
+		{ field: 'author', operator: 'is', value: 2 },
+		{ field: 'status', operator: 'isAny', value: [ 'publish', 'draft' ] },
+	],
 	page: 1,
+	perPage: 5,
 	sort: {
 		field: 'date',
 		direction: 'desc',
 	},
-	search: '',
-	filters: [
-		{ field: 'author', operator: 'in', value: 2 },
-		{ field: 'status', operator: 'in', value: 'publish,draft' }
-	],
-	hiddenFields: [ 'date', 'featured-image' ],
+	fields: [ 'author', 'status' ],
 	layout: {},
-}
+};
 ```
 
--   `type`: view type, one of `table`, `grid`, `list`. See "View types".
--   `perPage`: number of records to show per page.
--   `page`: the page that is visible.
--   `sort.field`: field used for sorting the dataset.
--   `sort.direction`: the direction to use for sorting, one of `asc` or `desc`.
+Properties:
+
+-   `type`: view type, one of `table`, `grid`, `list`. See "Layout types".
 -   `search`: the text search applied to the dataset.
 -   `filters`: the filters applied to the dataset. Each item describes:
     -   `field`: which field this filter is bound to.
-    -   `operator`: which type of filter it is. One of `in`, `notIn`. See "Operator types".
+    -   `operator`: which type of filter it is. See "Operator types".
     -   `value`: the actual value selected by the user.
--   `hiddenFields`: the `id` of the fields that are hidden in the UI.
+-   `perPage`: number of records to show per page.
+-   `page`: the page that is visible.
+-   `sort`:
+
+    -   `field`: the field used for sorting the dataset.
+    -   `direction`: the direction to use for sorting, one of `asc` or `desc`.
+
+-   `fields`: the `id` of the fields that are visible in the UI and the specific order in which they are displayed.
 -   `layout`: config that is specific to a particular layout type.
-    -   `mediaField`: used by the `grid` layout. The `id` of the field to be used for rendering each card's media.
-    -   `primaryField`: used by the `grid` layout. The `id` of the field to be used for rendering each card's title.
 
-### View <=> data
+#### Properties of `layout`
+
+| Properties of `layout`                                                                                          | Table | Grid | List |
+| --------------------------------------------------------------------------------------------------------------- | ----- | ---- | ---- |
+| `primaryField`: the field's `id` to be highlighted in each layout. It's not hidable.                            | ✓     | ✓    | ✓    |
+| `mediaField`: the field's `id` to be used for rendering each card's media. It's not hiddable.                   |       | ✓    | ✓    |
+| `columnFields`: a list of field's `id` to render vertically stacked instead of horizontally (the default).      |       | ✓    |      |
+| `badgeFields`: a list of field's `id` to render without label and styled as badges.                             |       | ✓    |      |
+| `combinedFields`: a list of "virtual" fields that are made by combining others. See "Combining fields" section. | ✓     |      |      |
+| `styles`: additional `width`, `maxWidth`, `minWidth` styles for each field column.                              | ✓     |      |      |
 
-The view is a representation of the visible state of the dataset. Note, however, that it's the consumer's responsibility to work with the data provider to make sure the user options defined through the view's config (sort, pagination, filters, etc.) are respected.
+### `onChangeView`: `function`
+
+The view is a representation of the visible state of the dataset: what type of layout is used to display it (table, grid, etc.), how the dataset is filtered, how it is sorted or paginated.
+
+It's the consumer's responsibility to work with the data provider to make sure the user options defined through the view's config (sort, pagination, filters, etc.) are respected. The `onChangeView` prop allows the consumer to provide a callback to be called when the view config changes, to process the data accordingly.
 
 The following example shows how a view object is used to query the WordPress REST API via the entities abstraction. The same can be done with any other data provider.
 
@@ -96,20 +214,24 @@ function MyCustomPageTable() {
 		},
 		search: '',
 		filters: [
-			{ field: 'author', operator: 'in', value: 2 },
-			{ field: 'status', operator: 'in', value: 'publish,draft' }
+			{ field: 'author', operator: 'is', value: 2 },
+			{
+				field: 'status',
+				operator: 'isAny',
+				value: [ 'publish', 'draft' ],
+			},
 		],
-		hiddenFields: [ 'date', 'featured-image' ],
+		fields: [ 'author', 'status' ],
 		layout: {},
 	} );
 
 	const queryArgs = useMemo( () => {
 		const filters = {};
 		view.filters.forEach( ( filter ) => {
-			if ( filter.field === 'status' && filter.operator === 'in' ) {
+			if ( filter.field === 'status' && filter.operator === 'isAny' ) {
 				filters.status = filter.value;
 			}
-			if ( filter.field === 'author' && filter.operator === 'in' ) {
+			if ( filter.field === 'author' && filter.operator === 'is' ) {
 				filters.author = filter.value;
 			}
 		} );
@@ -124,76 +246,27 @@ function MyCustomPageTable() {
 		};
 	}, [ view ] );
 
-	const {
-		records
-	} = useEntityRecords( 'postType', 'page', queryArgs );
+	const { records } = useEntityRecords( 'postType', 'page', queryArgs );
 
 	return (
 		<DataViews
 			data={ records }
 			view={ view }
 			onChangeView={ setView }
-			"..."
+			// ...
 		/>
 	);
 }
 ```
 
-## Fields
-
-The fields describe the visible items for each record in the dataset.
-
-Example:
-
-```js
-[
-	{
-		id: 'date',
-		header: __( 'Date' ),
-		getValue: ( { item } ) => item.date,
-		render: ( { item } ) => {
-			return (
-				<time>{ getFormattedDate( item.date ) }</time>
-			);
-		},
-		enableHiding: false
-	},
-	{
-		id: 'author',
-		header: __( 'Author' ),
-		getValue: ( { item } ) => item.author,
-		render: ( { item } ) => {
-			return (
-				<a href="...">{ item.author }</a>
-			);
-		},
-		type: 'enumeration',
-		elements: [
-			{ value: 1, label: 'Admin' }
-			{ value: 2, label: 'User' }
-		]
-		enableSorting: false
-	}
-]
-```
-
--   `id`: identifier for the field. Unique.
--   `header`: the field's name to be shown in the UI.
--   `getValue`: function that returns the value of the field.
--   `render`: function that renders the field.
--   `elements`: the set of valid values for the field's value.
--   `type`: the type of the field. Used to generate the proper filters. Only `enumeration` available at the moment. See "Field types".
--   `enableSorting`: whether the data can be sorted by the given field. True by default.
--   `enableHiding`: whether the field can be hidden. True by default.
--   `filterBy`: configuration for the filters.
-    - `operators`: the list of operators supported by the field.
+### `actions`: `Object[]`
 
-## Actions
+Collection of operations that can be performed upon each record.
 
-Array of operations that can be performed upon each record. Each action is an object with the following properties:
+Each action is an object with the following properties:
 
 -   `id`: string, required. Unique identifier of the action. For example, `move-to-trash`.
--   `label`: string, required. User facing description of the action. For example, `Move to Trash`.
+-   `label`: string|function, required. User facing description of the action. For example, `Move to Trash`. In case we want to adjust the label based on the selected items, a function which accepts the selected records as input can be provided. This function should always return a `string` value.
 -   `isPrimary`: boolean, optional. Whether the action should be listed inline (primary) or in hidden in the more actions menu (secondary).
 -   `icon`: icon to show for primary actions. It's required for a primary action, otherwise the action would be considered secondary.
 -   `isEligible`: function, optional. Whether the action can be performed for a given record. If not present, the action is considered to be eligible for all items. It takes the given record as input.
@@ -201,18 +274,109 @@ Array of operations that can be performed upon each record. Each action is an ob
 -   `callback`: function, required unless `RenderModal` is provided. Callback function that takes the record as input and performs the required action.
 -   `RenderModal`: ReactElement, optional. If an action requires that some UI be rendered in a modal, it can provide a component which takes as props the record as `item` and a `closeModal` function. When this prop is provided, the `callback` property is ignored.
 -   `hideModalHeader`: boolean, optional. This property is used in combination with `RenderModal` and controls the visibility of the modal's header. If the action renders a modal and doesn't hide the header, the action's label is going to be used in the modal's header.
+-   `supportsBulk`: Whether the action can be used as a bulk action. False by default.
+-   `disabled`: Whether the action is disabled. False by default.
+
+### `paginationInfo`: `Object`
+
+-   `totalItems`: the total number of items in the datasets.
+-   `totalPages`: the total number of pages, taking into account the total items in the dataset and the number of items per page provided by the user.
+
+### `search`: `boolean`
+
+Whether the search input is enabled. `true` by default.
+
+### `searchLabel`: `string`
+
+What text to show in the search input. "Search" by default.
+
+### `getItemId`: `function`
+
+Function that receives an item and returns an unique identifier for it. By default, it uses the `id` of the item as unique identifier. If it's not, the consumer should provide their own.
+
+### `isLoading`: `boolean`
+
+Whether the data is loading. `false` by default.
+
+### `defaultLayouts`: `Record< string, view >`
+
+This property provides layout information about the view types that are active. If empty, enables all layout types (see "Layout Types") with empty layout data.
+
+For example, this is how you'd enable only the table view type:
+
+```js
+const defaultLayouts = {
+	table: {
+		layout: {
+			primaryField: 'my-key',
+		},
+	},
+};
+```
+
+The `defaultLayouts` property should be an object that includes properties named `table`, `grid`, or `list`. Each of these properties should contain a `layout` property, which holds the configuration for each specific layout type. Check [here](#properties-of-layout) the full list of properties available for each layout's configuration
+
+### `onChangeSelection`: `function`
+
+Callback that signals the user selected one of more items, and takes them as parameter. So far, only the `list` view implements it.
 
 ## Types
 
-- Layout types:
-    - `table`: the view uses a table layout.
-    - `grid`: the view uses a grid layout.
-    - `list`: the view uses a list layout.
-- Field types:
-    - `enumeration`: the field value should be taken and can be filtered from a closed list of elements.
-- Operator types:
-    - `in`: operator to be used in filters for fields of type `enumeration`.
-    - `notIn`: operator to be used in filters for fields of type `enumeration`.
+### Layouts
+
+-   `table`: the view uses a table layout.
+-   `grid`: the view uses a grid layout.
+-   `list`: the view uses a list layout.
+
+### Fields
+
+> The `enumeration` type was removed as it was deemed redundant with the field.elements metadata. New types will be introduced soon.
+
+## Combining fields
+
+The `table` layout has the ability to create "virtual" fields that are made out by combining existing ones.
+
+Each "virtual field", has to provide an `id` and `label` (optionally a `header` instead), which have the same meaning as any other field.
+
+Additionally, they need to provide:
+
+-   `children`: a list of field's `id` to combine
+-   `direction`: how should they be stacked, `vertical` or `horizontal`
+
+For example, this is how you'd define a `site` field which is a combination of a `title` and `description` fields, which are not displayed:
+
+```js
+{
+	fields: [ 'site', 'status' ],
+	layout: {
+		combinedFields: [
+			{
+				id: 'site',
+				label: 'Site',
+				children: [ 'title', 'description' ],
+				direction: 'vertical',
+			}
+		]
+	}
+}
+```
+
+### Operators
+
+Allowed operators:
+
+| Operator   | Selection      | Description                                                             | Example                                            |
+| ---------- | -------------- | ----------------------------------------------------------------------- | -------------------------------------------------- |
+| `is`       | Single item    | `EQUAL TO`. The item's field is equal to a single value.                | Author is Admin                                    |
+| `isNot`    | Single item    | `NOT EQUAL TO`. The item's field is not equal to a single value.        | Author is not Admin                                |
+| `isAny`    | Multiple items | `OR`. The item's field is present in a list of values.                  | Author is any: Admin, Editor                       |
+| `isNone`   | Multiple items | `NOT OR`. The item's field is not present in a list of values.          | Author is none: Admin, Editor                      |
+| `isAll`    | Multiple items | `AND`. The item's field has all of the values in the list.              | Category is all: Book, Review, Science Fiction     |
+| `isNotAll` | Multiple items | `NOT AND`. The item's field doesn't have all of the values in the list. | Category is not all: Book, Review, Science Fiction |
+
+`is` and `isNot` are single-selection operators, while `isAny`, `isNone`, `isAll`, and `isNotALl` are multi-selection. By default, a filter with no operators declared will support the `isAny` and `isNone` multi-selection operators. A filter cannot mix single-selection & multi-selection operators; if a single-selection operator is present in the list of valid operators, the multi-selection ones will be discarded and the filter won't allow selecting more than one item.
+
+> The legacy operators `in` and `notIn` have been deprecated and will be removed soon. In the meantime, they work as `is` and `isNot` operators, respectively.
 
 ## Contributing to this package
 
diff --git a/packages/dataviews/package.json b/packages/dataviews/package.json
index 40a09050b94321..a83fd163517d0a 100644
--- a/packages/dataviews/package.json
+++ b/packages/dataviews/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dataviews",
-	"version": "0.1.0",
+	"version": "4.6.0",
 	"description": "DataViews is a component that provides an API to render datasets using different types of layouts (table, grid, list, etc.).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,16 +28,18 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@tanstack/react-table": "^8.10.3",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/private-apis": "file:../private-apis",
-		"classnames": "^2.3.1",
+		"@ariakit/react": "^0.4.10",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/primitives": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/warning": "*",
+		"clsx": "^2.1.1",
 		"remove-accents": "^0.5.0"
 	},
 	"peerDependencies": {
@@ -44,5 +47,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/dataviews/src/add-filter.js b/packages/dataviews/src/add-filter.js
deleted file mode 100644
index 715135a533fb4b..00000000000000
--- a/packages/dataviews/src/add-filter.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	privateApis as componentsPrivateApis,
-	Button,
-	Icon,
-} from '@wordpress/components';
-import { chevronRightSmall, plus } from '@wordpress/icons';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import { unlock } from './lock-unlock';
-import { ENUMERATION_TYPE, OPERATOR_IN } from './constants';
-
-const {
-	DropdownMenuV2: DropdownMenu,
-	DropdownSubMenuV2: DropdownSubMenu,
-	DropdownSubMenuTriggerV2: DropdownSubMenuTrigger,
-	DropdownMenuItemV2: DropdownMenuItem,
-} = unlock( componentsPrivateApis );
-
-export default function AddFilter( { fields, view, onChangeView } ) {
-	const filters = [];
-	fields.forEach( ( field ) => {
-		if ( ! field.type ) {
-			return;
-		}
-
-		switch ( field.type ) {
-			case ENUMERATION_TYPE:
-				filters.push( {
-					field: field.id,
-					name: field.header,
-					elements: field.elements || [],
-					isVisible: view.filters.some(
-						( f ) => f.field === field.id
-					),
-				} );
-		}
-	} );
-
-	if ( filters.length === 0 ) {
-		return null;
-	}
-
-	return (
-		<DropdownMenu
-			label={ __( 'Add filter' ) }
-			trigger={
-				<Button
-					disabled={ filters.length === view.filters?.length }
-					__experimentalIsFocusable
-					variant="tertiary"
-					size="compact"
-				>
-					<Icon icon={ plus } style={ { flexShrink: 0 } } />
-					{ __( 'Add filter' ) }
-				</Button>
-			}
-		>
-			{ filters.map( ( filter ) => {
-				if ( filter.isVisible ) {
-					return null;
-				}
-
-				return (
-					<DropdownSubMenu
-						key={ filter.field }
-						trigger={
-							<DropdownSubMenuTrigger
-								suffix={ <Icon icon={ chevronRightSmall } /> }
-							>
-								{ filter.name }
-							</DropdownSubMenuTrigger>
-						}
-					>
-						{ filter.elements.map( ( element ) => (
-							<DropdownMenuItem
-								key={ element.value }
-								onSelect={ () => {
-									onChangeView( ( currentView ) => ( {
-										...currentView,
-										page: 1,
-										filters: [
-											...currentView.filters,
-											{
-												field: filter.field,
-												operator: OPERATOR_IN,
-												value: element.value,
-											},
-										],
-									} ) );
-								} }
-							>
-								{ element.label }
-							</DropdownMenuItem>
-						) ) }
-					</DropdownSubMenu>
-				);
-			} ) }
-		</DropdownMenu>
-	);
-}
diff --git a/packages/dataviews/src/components/dataform-combined-edit/index.tsx b/packages/dataviews/src/components/dataform-combined-edit/index.tsx
new file mode 100644
index 00000000000000..6b2a752fa8de52
--- /dev/null
+++ b/packages/dataviews/src/components/dataform-combined-edit/index.tsx
@@ -0,0 +1,66 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	__experimentalHeading as Heading,
+	__experimentalSpacer as Spacer,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import type { DataFormCombinedEditProps, NormalizedField } from '../../types';
+
+function Header( { title }: { title: string } ) {
+	return (
+		<VStack className="dataforms-layouts__dropdown-header" spacing={ 4 }>
+			<HStack alignment="center">
+				<Heading level={ 2 } size={ 13 }>
+					{ title }
+				</Heading>
+				<Spacer />
+			</HStack>
+		</VStack>
+	);
+}
+
+function DataFormCombinedEdit< Item >( {
+	field,
+	data,
+	onChange,
+	hideLabelFromVision,
+}: DataFormCombinedEditProps< Item > ) {
+	const className = 'dataforms-combined-edit';
+	const visibleChildren = ( field.children ?? [] )
+		.map( ( fieldId ) => field.fields.find( ( { id } ) => id === fieldId ) )
+		.filter(
+			( childField ): childField is NormalizedField< Item > =>
+				!! childField
+		);
+	const children = visibleChildren.map( ( child ) => {
+		return (
+			<div className="dataforms-combined-edit__field" key={ child.id }>
+				<child.Edit
+					data={ data }
+					field={ child }
+					onChange={ onChange }
+				/>
+			</div>
+		);
+	} );
+
+	const Stack = field.direction === 'horizontal' ? HStack : VStack;
+
+	return (
+		<>
+			{ ! hideLabelFromVision && <Header title={ field.label } /> }
+			<Stack spacing={ 4 } className={ className } as="fieldset">
+				{ children }
+			</Stack>
+		</>
+	);
+}
+
+export default DataFormCombinedEdit;
diff --git a/packages/dataviews/src/components/dataform-combined-edit/style.scss b/packages/dataviews/src/components/dataform-combined-edit/style.scss
new file mode 100644
index 00000000000000..0b59cbc9a47768
--- /dev/null
+++ b/packages/dataviews/src/components/dataform-combined-edit/style.scss
@@ -0,0 +1,12 @@
+.dataforms-layouts-panel__field-dropdown {
+	.dataforms-combined-edit {
+		border: none;
+		padding: 0;
+	}
+}
+
+.dataforms-combined-edit {
+	&__field {
+		flex: 1 1 auto;
+	}
+}
diff --git a/packages/dataviews/src/components/dataform/index.tsx b/packages/dataviews/src/components/dataform/index.tsx
new file mode 100644
index 00000000000000..58f0bf06afb414
--- /dev/null
+++ b/packages/dataviews/src/components/dataform/index.tsx
@@ -0,0 +1,17 @@
+/**
+ * Internal dependencies
+ */
+import type { DataFormProps } from '../../types';
+import { getFormLayout } from '../../dataforms-layouts';
+
+export default function DataForm< Item >( {
+	form,
+	...props
+}: DataFormProps< Item > ) {
+	const layout = getFormLayout( form.type ?? 'regular' );
+	if ( ! layout ) {
+		return null;
+	}
+
+	return <layout.component form={ form } { ...props } />;
+}
diff --git a/packages/dataviews/src/components/dataform/stories/index.story.tsx b/packages/dataviews/src/components/dataform/stories/index.story.tsx
new file mode 100644
index 00000000000000..c929c21f1c21a9
--- /dev/null
+++ b/packages/dataviews/src/components/dataform/stories/index.story.tsx
@@ -0,0 +1,185 @@
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import DataForm from '../index';
+import type { CombinedFormField } from '../../../types';
+
+const meta = {
+	title: 'DataViews/DataForm',
+	component: DataForm,
+	argTypes: {
+		type: {
+			control: { type: 'select' },
+			description:
+				'Chooses the layout of the form. "regular" is the default layout.',
+			options: [ 'regular', 'panel' ],
+		},
+	},
+};
+export default meta;
+
+const fields = [
+	{
+		id: 'title',
+		label: 'Title',
+		type: 'text' as const,
+	},
+	{
+		id: 'order',
+		label: 'Order',
+		type: 'integer' as const,
+	},
+	{
+		id: 'date',
+		label: 'Date',
+		type: 'datetime' as const,
+	},
+	{
+		id: 'birthdate',
+		label: 'Date as options',
+		type: 'datetime' as const,
+		elements: [
+			{ value: '1970-02-23T12:00:00', label: "Jane's birth date" },
+			{ value: '1950-02-23T12:00:00', label: "John's birth date" },
+		],
+	},
+	{
+		id: 'author',
+		label: 'Author',
+		type: 'integer' as const,
+		elements: [
+			{ value: 1, label: 'Jane' },
+			{ value: 2, label: 'John' },
+		],
+	},
+	{
+		id: 'reviewer',
+		label: 'Reviewer',
+		type: 'text' as const,
+		Edit: 'radio' as const,
+		elements: [
+			{ value: 'fulano', label: 'Fulano' },
+			{ value: 'mengano', label: 'Mengano' },
+			{ value: 'zutano', label: 'Zutano' },
+		],
+	},
+	{
+		id: 'status',
+		label: 'Status',
+		type: 'text' as const,
+		elements: [
+			{ value: 'draft', label: 'Draft' },
+			{ value: 'published', label: 'Published' },
+		],
+	},
+	{
+		id: 'password',
+		label: 'Password',
+		type: 'text' as const,
+	},
+];
+
+export const Default = ( { type }: { type: 'panel' | 'regular' } ) => {
+	const [ post, setPost ] = useState( {
+		title: 'Hello, World!',
+		order: 2,
+		author: 1,
+		status: 'draft',
+		reviewer: 'fulano',
+		date: '2021-01-01T12:00:00',
+		birthdate: '1950-02-23T12:00:00',
+	} );
+
+	const form = {
+		fields: [
+			'title',
+			'order',
+			'author',
+			'reviewer',
+			'status',
+			'date',
+			'birthdate',
+		],
+	};
+
+	return (
+		<DataForm
+			data={ post }
+			fields={ fields }
+			form={ {
+				...form,
+				type,
+			} }
+			onChange={ ( edits ) =>
+				setPost( ( prev ) => ( {
+					...prev,
+					...edits,
+				} ) )
+			}
+		/>
+	);
+};
+
+const CombinedFieldsComponent = ( {
+	type = 'regular',
+	combinedFieldDirection = 'vertical',
+}: {
+	type: 'panel' | 'regular';
+	combinedFieldDirection: 'vertical' | 'horizontal';
+} ) => {
+	const [ post, setPost ] = useState( {
+		title: 'Hello, World!',
+		order: 2,
+		author: 1,
+		status: 'draft',
+	} );
+
+	const form = {
+		fields: [ 'title', 'status_and_visibility', 'order', 'author' ],
+		combinedFields: [
+			{
+				id: 'status_and_visibility',
+				label: 'Status & Visibility',
+				children: [ 'status', 'password' ],
+				direction: combinedFieldDirection,
+				render: ( { item } ) => item.status,
+			},
+		] as CombinedFormField< any >[],
+	};
+
+	return (
+		<DataForm
+			data={ post }
+			fields={ fields }
+			form={ {
+				...form,
+				type,
+			} }
+			onChange={ ( edits ) =>
+				setPost( ( prev ) => ( {
+					...prev,
+					...edits,
+				} ) )
+			}
+		/>
+	);
+};
+
+export const CombinedFields = {
+	title: 'DataViews/CombinedFields',
+	render: CombinedFieldsComponent,
+	argTypes: {
+		...meta.argTypes,
+		combinedFieldDirection: {
+			control: { type: 'select' },
+			description:
+				'Chooses the direction of the combined field. "vertical" is the default layout.',
+			options: [ 'vertical', 'horizontal' ],
+		},
+	},
+};
diff --git a/packages/dataviews/src/components/dataviews-bulk-actions/index.tsx b/packages/dataviews/src/components/dataviews-bulk-actions/index.tsx
new file mode 100644
index 00000000000000..92a3fe85f67e74
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-bulk-actions/index.tsx
@@ -0,0 +1,356 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	Button,
+	CheckboxControl,
+	__experimentalHStack as HStack,
+} from '@wordpress/components';
+import { __, sprintf, _n } from '@wordpress/i18n';
+import { useMemo, useState, useRef, useContext } from '@wordpress/element';
+import { useRegistry } from '@wordpress/data';
+import { closeSmall } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import DataViewsContext from '../dataviews-context';
+import { ActionWithModal } from '../dataviews-item-actions';
+import type { Action } from '../../types';
+import type { SetSelection } from '../../private-types';
+import type { ActionTriggerProps } from '../dataviews-item-actions';
+
+export function useHasAPossibleBulkAction< Item >(
+	actions: Action< Item >[],
+	item: Item
+) {
+	return useMemo( () => {
+		return actions.some( ( action ) => {
+			return (
+				action.supportsBulk &&
+				( ! action.isEligible || action.isEligible( item ) )
+			);
+		} );
+	}, [ actions, item ] );
+}
+
+export function useSomeItemHasAPossibleBulkAction< Item >(
+	actions: Action< Item >[],
+	data: Item[]
+) {
+	return useMemo( () => {
+		return data.some( ( item ) => {
+			return actions.some( ( action ) => {
+				return (
+					action.supportsBulk &&
+					( ! action.isEligible || action.isEligible( item ) )
+				);
+			} );
+		} );
+	}, [ actions, data ] );
+}
+
+interface BulkSelectionCheckboxProps< Item > {
+	selection: string[];
+	onChangeSelection: SetSelection;
+	data: Item[];
+	actions: Action< Item >[];
+	getItemId: ( item: Item ) => string;
+}
+
+export function BulkSelectionCheckbox< Item >( {
+	selection,
+	onChangeSelection,
+	data,
+	actions,
+	getItemId,
+}: BulkSelectionCheckboxProps< Item > ) {
+	const selectableItems = useMemo( () => {
+		return data.filter( ( item ) => {
+			return actions.some(
+				( action ) =>
+					action.supportsBulk &&
+					( ! action.isEligible || action.isEligible( item ) )
+			);
+		} );
+	}, [ data, actions ] );
+	const selectedItems = data.filter(
+		( item ) =>
+			selection.includes( getItemId( item ) ) &&
+			selectableItems.includes( item )
+	);
+	const areAllSelected = selectedItems.length === selectableItems.length;
+	return (
+		<CheckboxControl
+			className="dataviews-view-table-selection-checkbox"
+			__nextHasNoMarginBottom
+			checked={ areAllSelected }
+			indeterminate={ ! areAllSelected && !! selectedItems.length }
+			onChange={ () => {
+				if ( areAllSelected ) {
+					onChangeSelection( [] );
+				} else {
+					onChangeSelection(
+						selectableItems.map( ( item ) => getItemId( item ) )
+					);
+				}
+			} }
+			aria-label={
+				areAllSelected ? __( 'Deselect all' ) : __( 'Select all' )
+			}
+		/>
+	);
+}
+
+interface ActionButtonProps< Item > {
+	action: Action< Item >;
+	selectedItems: Item[];
+	actionInProgress: string | null;
+	setActionInProgress: ( actionId: string | null ) => void;
+}
+
+interface ToolbarContentProps< Item > {
+	selection: string[];
+	onChangeSelection: SetSelection;
+	data: Item[];
+	actions: Action< Item >[];
+	getItemId: ( item: Item ) => string;
+}
+
+function ActionTrigger< Item >( {
+	action,
+	onClick,
+	isBusy,
+	items,
+}: ActionTriggerProps< Item > ) {
+	const label =
+		typeof action.label === 'string' ? action.label : action.label( items );
+	return (
+		<Button
+			disabled={ isBusy }
+			accessibleWhenDisabled
+			label={ label }
+			icon={ action.icon }
+			isDestructive={ action.isDestructive }
+			size="compact"
+			onClick={ onClick }
+			isBusy={ isBusy }
+			tooltipPosition="top"
+		/>
+	);
+}
+
+const EMPTY_ARRAY: [] = [];
+
+function ActionButton< Item >( {
+	action,
+	selectedItems,
+	actionInProgress,
+	setActionInProgress,
+}: ActionButtonProps< Item > ) {
+	const registry = useRegistry();
+	const selectedEligibleItems = useMemo( () => {
+		return selectedItems.filter( ( item ) => {
+			return ! action.isEligible || action.isEligible( item );
+		} );
+	}, [ action, selectedItems ] );
+	if ( 'RenderModal' in action ) {
+		return (
+			<ActionWithModal
+				key={ action.id }
+				action={ action }
+				items={ selectedEligibleItems }
+				ActionTrigger={ ActionTrigger }
+			/>
+		);
+	}
+	return (
+		<ActionTrigger
+			key={ action.id }
+			action={ action }
+			onClick={ async () => {
+				setActionInProgress( action.id );
+				await action.callback( selectedItems, {
+					registry,
+				} );
+				setActionInProgress( null );
+			} }
+			items={ selectedEligibleItems }
+			isBusy={ actionInProgress === action.id }
+		/>
+	);
+}
+
+function renderFooterContent< Item >(
+	data: Item[],
+	actions: Action< Item >[],
+	getItemId: ( item: Item ) => string,
+	selection: string[],
+	actionsToShow: Action< Item >[],
+	selectedItems: Item[],
+	actionInProgress: string | null,
+	setActionInProgress: ( actionId: string | null ) => void,
+	onChangeSelection: SetSelection
+) {
+	const message =
+		selectedItems.length > 0
+			? sprintf(
+					/* translators: %d: number of items. */
+					_n(
+						'%d Item selected',
+						'%d Items selected',
+						selectedItems.length
+					),
+					selectedItems.length
+			  )
+			: sprintf(
+					/* translators: %d: number of items. */
+					_n( '%d Item', '%d Items', data.length ),
+					data.length
+			  );
+	return (
+		<HStack
+			expanded={ false }
+			className="dataviews-bulk-actions-footer__container"
+			spacing={ 3 }
+		>
+			<BulkSelectionCheckbox
+				selection={ selection }
+				onChangeSelection={ onChangeSelection }
+				data={ data }
+				actions={ actions }
+				getItemId={ getItemId }
+			/>
+			<span className="dataviews-bulk-actions-footer__item-count">
+				{ message }
+			</span>
+			<HStack
+				className="dataviews-bulk-actions-footer__action-buttons"
+				expanded={ false }
+				spacing={ 1 }
+			>
+				{ actionsToShow.map( ( action ) => {
+					return (
+						<ActionButton
+							key={ action.id }
+							action={ action }
+							selectedItems={ selectedItems }
+							actionInProgress={ actionInProgress }
+							setActionInProgress={ setActionInProgress }
+						/>
+					);
+				} ) }
+				{ selectedItems.length > 0 && (
+					<Button
+						icon={ closeSmall }
+						showTooltip
+						tooltipPosition="top"
+						size="compact"
+						label={ __( 'Cancel' ) }
+						disabled={ !! actionInProgress }
+						accessibleWhenDisabled={ false }
+						onClick={ () => {
+							onChangeSelection( EMPTY_ARRAY );
+						} }
+					/>
+				) }
+			</HStack>
+		</HStack>
+	);
+}
+
+function FooterContent< Item >( {
+	selection,
+	actions,
+	onChangeSelection,
+	data,
+	getItemId,
+}: ToolbarContentProps< Item > ) {
+	const [ actionInProgress, setActionInProgress ] = useState< string | null >(
+		null
+	);
+	const footerContentRef = useRef< JSX.Element | null >( null );
+
+	const bulkActions = useMemo(
+		() => actions.filter( ( action ) => action.supportsBulk ),
+		[ actions ]
+	);
+	const selectableItems = useMemo( () => {
+		return data.filter( ( item ) => {
+			return bulkActions.some(
+				( action ) => ! action.isEligible || action.isEligible( item )
+			);
+		} );
+	}, [ data, bulkActions ] );
+
+	const selectedItems = useMemo( () => {
+		return data.filter(
+			( item ) =>
+				selection.includes( getItemId( item ) ) &&
+				selectableItems.includes( item )
+		);
+	}, [ selection, data, getItemId, selectableItems ] );
+
+	const actionsToShow = useMemo(
+		() =>
+			actions.filter( ( action ) => {
+				return (
+					action.supportsBulk &&
+					action.icon &&
+					selectedItems.some(
+						( item ) =>
+							! action.isEligible || action.isEligible( item )
+					)
+				);
+			} ),
+		[ actions, selectedItems ]
+	);
+	if ( ! actionInProgress ) {
+		if ( footerContentRef.current ) {
+			footerContentRef.current = null;
+		}
+		return renderFooterContent(
+			data,
+			actions,
+			getItemId,
+			selection,
+			actionsToShow,
+			selectedItems,
+			actionInProgress,
+			setActionInProgress,
+			onChangeSelection
+		);
+	} else if ( ! footerContentRef.current ) {
+		footerContentRef.current = renderFooterContent(
+			data,
+			actions,
+			getItemId,
+			selection,
+			actionsToShow,
+			selectedItems,
+			actionInProgress,
+			setActionInProgress,
+			onChangeSelection
+		);
+	}
+	return footerContentRef.current;
+}
+
+export function BulkActionsFooter() {
+	const {
+		data,
+		selection,
+		actions = EMPTY_ARRAY,
+		onChangeSelection,
+		getItemId,
+	} = useContext( DataViewsContext );
+	return (
+		<FooterContent
+			selection={ selection }
+			onChangeSelection={ onChangeSelection }
+			data={ data }
+			actions={ actions }
+			getItemId={ getItemId }
+		/>
+	);
+}
diff --git a/packages/dataviews/src/components/dataviews-bulk-actions/style.scss b/packages/dataviews/src/components/dataviews-bulk-actions/style.scss
new file mode 100644
index 00000000000000..b2e946aa202abe
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-bulk-actions/style.scss
@@ -0,0 +1,12 @@
+
+.dataviews-bulk-actions-footer__item-count {
+	color: $gray-900;
+	font-weight: 500;
+	font-size: 11px;
+	text-transform: uppercase;
+}
+
+.dataviews-bulk-actions-footer__container {
+	margin-right: auto;
+	min-height: $grid-unit-40;
+}
diff --git a/packages/dataviews/src/components/dataviews-context/index.ts b/packages/dataviews/src/components/dataviews-context/index.ts
new file mode 100644
index 00000000000000..3936288b3095b0
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-context/index.ts
@@ -0,0 +1,49 @@
+/**
+ * WordPress dependencies
+ */
+import { createContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { View, Action, NormalizedField } from '../../types';
+import type { SetSelection } from '../../private-types';
+import { LAYOUT_TABLE } from '../../constants';
+
+type DataViewsContextType< Item > = {
+	view: View;
+	onChangeView: ( view: View ) => void;
+	fields: NormalizedField< Item >[];
+	actions?: Action< Item >[];
+	data: Item[];
+	isLoading?: boolean;
+	paginationInfo: {
+		totalItems: number;
+		totalPages: number;
+	};
+	selection: string[];
+	onChangeSelection: SetSelection;
+	openedFilter: string | null;
+	setOpenedFilter: ( openedFilter: string | null ) => void;
+	getItemId: ( item: Item ) => string;
+	density: number;
+};
+
+const DataViewsContext = createContext< DataViewsContextType< any > >( {
+	view: { type: LAYOUT_TABLE },
+	onChangeView: () => {},
+	fields: [],
+	data: [],
+	paginationInfo: {
+		totalItems: 0,
+		totalPages: 0,
+	},
+	selection: [],
+	onChangeSelection: () => {},
+	setOpenedFilter: () => {},
+	openedFilter: null,
+	getItemId: ( item ) => item.id,
+	density: 0,
+} );
+
+export default DataViewsContext;
diff --git a/packages/dataviews/src/components/dataviews-filters/add-filter.tsx b/packages/dataviews/src/components/dataviews-filters/add-filter.tsx
new file mode 100644
index 00000000000000..c8b6b5fda38fcc
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-filters/add-filter.tsx
@@ -0,0 +1,100 @@
+/**
+ * External dependencies
+ */
+import type { Ref } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	privateApis as componentsPrivateApis,
+	Button,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import type { NormalizedFilter, View } from '../../types';
+
+const { DropdownMenuV2 } = unlock( componentsPrivateApis );
+
+interface AddFilterProps {
+	filters: NormalizedFilter[];
+	view: View;
+	onChangeView: ( view: View ) => void;
+	setOpenedFilter: ( filter: string | null ) => void;
+}
+
+export function AddFilterDropdownMenu( {
+	filters,
+	view,
+	onChangeView,
+	setOpenedFilter,
+	trigger,
+}: AddFilterProps & {
+	trigger: React.ReactNode;
+} ) {
+	const inactiveFilters = filters.filter( ( filter ) => ! filter.isVisible );
+	return (
+		<DropdownMenuV2 trigger={ trigger }>
+			{ inactiveFilters.map( ( filter ) => {
+				return (
+					<DropdownMenuV2.Item
+						key={ filter.field }
+						onClick={ () => {
+							setOpenedFilter( filter.field );
+							onChangeView( {
+								...view,
+								page: 1,
+								filters: [
+									...( view.filters || [] ),
+									{
+										field: filter.field,
+										value: undefined,
+										operator: filter.operators[ 0 ],
+									},
+								],
+							} );
+						} }
+					>
+						<DropdownMenuV2.ItemLabel>
+							{ filter.name }
+						</DropdownMenuV2.ItemLabel>
+					</DropdownMenuV2.Item>
+				);
+			} ) }
+		</DropdownMenuV2>
+	);
+}
+
+function AddFilter(
+	{ filters, view, onChangeView, setOpenedFilter }: AddFilterProps,
+	ref: Ref< HTMLButtonElement >
+) {
+	if ( ! filters.length || filters.every( ( { isPrimary } ) => isPrimary ) ) {
+		return null;
+	}
+	const inactiveFilters = filters.filter( ( filter ) => ! filter.isVisible );
+	return (
+		<AddFilterDropdownMenu
+			trigger={
+				<Button
+					accessibleWhenDisabled
+					size="compact"
+					className="dataviews-filters-button"
+					variant="tertiary"
+					disabled={ ! inactiveFilters.length }
+					ref={ ref }
+				>
+					{ __( 'Add filter' ) }
+				</Button>
+			}
+			{ ...{ filters, view, onChangeView, setOpenedFilter } }
+		/>
+	);
+}
+
+export default forwardRef( AddFilter );
diff --git a/packages/dataviews/src/components/dataviews-filters/filter-summary.tsx b/packages/dataviews/src/components/dataviews-filters/filter-summary.tsx
new file mode 100644
index 00000000000000..7e4c7db9a29aa9
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-filters/filter-summary.tsx
@@ -0,0 +1,338 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+import type { RefObject } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	Dropdown,
+	__experimentalVStack as VStack,
+	__experimentalHStack as HStack,
+	FlexItem,
+	SelectControl,
+	Tooltip,
+	Icon,
+} from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+import { useRef, createInterpolateElement } from '@wordpress/element';
+import { closeSmall } from '@wordpress/icons';
+
+const ENTER = 'Enter';
+const SPACE = ' ';
+
+/**
+ * Internal dependencies
+ */
+import SearchWidget from './search-widget';
+import {
+	OPERATORS,
+	OPERATOR_IS,
+	OPERATOR_IS_NOT,
+	OPERATOR_IS_ANY,
+	OPERATOR_IS_NONE,
+	OPERATOR_IS_ALL,
+	OPERATOR_IS_NOT_ALL,
+} from '../../constants';
+import type {
+	Filter,
+	NormalizedFilter,
+	Operator,
+	Option,
+	View,
+} from '../../types';
+
+interface FilterTextProps {
+	activeElements: Option[];
+	filterInView?: Filter;
+	filter: NormalizedFilter;
+}
+
+interface OperatorSelectorProps {
+	filter: NormalizedFilter;
+	view: View;
+	onChangeView: ( view: View ) => void;
+}
+
+interface FilterSummaryProps extends OperatorSelectorProps {
+	addFilterRef: RefObject< HTMLButtonElement >;
+	openedFilter: string | null;
+}
+
+const FilterText = ( {
+	activeElements,
+	filterInView,
+	filter,
+}: FilterTextProps ) => {
+	if ( activeElements === undefined || activeElements.length === 0 ) {
+		return filter.name;
+	}
+
+	const filterTextWrappers = {
+		Name: <span className="dataviews-filters__summary-filter-text-name" />,
+		Value: (
+			<span className="dataviews-filters__summary-filter-text-value" />
+		),
+	};
+
+	if ( filterInView?.operator === OPERATOR_IS_ANY ) {
+		return createInterpolateElement(
+			sprintf(
+				/* translators: 1: Filter name. 3: Filter value. e.g.: "Author is any: Admin, Editor". */
+				__( '<Name>%1$s is any: </Name><Value>%2$s</Value>' ),
+				filter.name,
+				activeElements.map( ( element ) => element.label ).join( ', ' )
+			),
+			filterTextWrappers
+		);
+	}
+
+	if ( filterInView?.operator === OPERATOR_IS_NONE ) {
+		return createInterpolateElement(
+			sprintf(
+				/* translators: 1: Filter name. 3: Filter value. e.g.: "Author is none: Admin, Editor". */
+				__( '<Name>%1$s is none: </Name><Value>%2$s</Value>' ),
+				filter.name,
+				activeElements.map( ( element ) => element.label ).join( ', ' )
+			),
+			filterTextWrappers
+		);
+	}
+
+	if ( filterInView?.operator === OPERATOR_IS_ALL ) {
+		return createInterpolateElement(
+			sprintf(
+				/* translators: 1: Filter name. 3: Filter value. e.g.: "Author is all: Admin, Editor". */
+				__( '<Name>%1$s is all: </Name><Value>%2$s</Value>' ),
+				filter.name,
+				activeElements.map( ( element ) => element.label ).join( ', ' )
+			),
+			filterTextWrappers
+		);
+	}
+
+	if ( filterInView?.operator === OPERATOR_IS_NOT_ALL ) {
+		return createInterpolateElement(
+			sprintf(
+				/* translators: 1: Filter name. 3: Filter value. e.g.: "Author is not all: Admin, Editor". */
+				__( '<Name>%1$s is not all: </Name><Value>%2$s</Value>' ),
+				filter.name,
+				activeElements.map( ( element ) => element.label ).join( ', ' )
+			),
+			filterTextWrappers
+		);
+	}
+
+	if ( filterInView?.operator === OPERATOR_IS ) {
+		return createInterpolateElement(
+			sprintf(
+				/* translators: 1: Filter name. 3: Filter value. e.g.: "Author is: Admin". */
+				__( '<Name>%1$s is: </Name><Value>%2$s</Value>' ),
+				filter.name,
+				activeElements[ 0 ].label
+			),
+			filterTextWrappers
+		);
+	}
+
+	if ( filterInView?.operator === OPERATOR_IS_NOT ) {
+		return createInterpolateElement(
+			sprintf(
+				/* translators: 1: Filter name. 3: Filter value. e.g.: "Author is not: Admin". */
+				__( '<Name>%1$s is not: </Name><Value>%2$s</Value>' ),
+				filter.name,
+				activeElements[ 0 ].label
+			),
+			filterTextWrappers
+		);
+	}
+
+	return sprintf(
+		/* translators: 1: Filter name e.g.: "Unknown status for Author". */
+		__( 'Unknown status for %1$s' ),
+		filter.name
+	);
+};
+
+function OperatorSelector( {
+	filter,
+	view,
+	onChangeView,
+}: OperatorSelectorProps ) {
+	const operatorOptions = filter.operators?.map( ( operator ) => ( {
+		value: operator,
+		label: OPERATORS[ operator ]?.label,
+	} ) );
+	const currentFilter = view.filters?.find(
+		( _filter ) => _filter.field === filter.field
+	);
+	const value = currentFilter?.operator || filter.operators[ 0 ];
+	return (
+		operatorOptions.length > 1 && (
+			<HStack
+				spacing={ 2 }
+				justify="flex-start"
+				className="dataviews-filters__summary-operators-container"
+			>
+				<FlexItem className="dataviews-filters__summary-operators-filter-name">
+					{ filter.name }
+				</FlexItem>
+
+				<SelectControl
+					label={ __( 'Conditions' ) }
+					value={ value }
+					options={ operatorOptions }
+					onChange={ ( newValue ) => {
+						const operator = newValue as Operator;
+						const newFilters = currentFilter
+							? [
+									...( view.filters ?? [] ).map(
+										( _filter ) => {
+											if (
+												_filter.field === filter.field
+											) {
+												return {
+													..._filter,
+													operator,
+												};
+											}
+											return _filter;
+										}
+									),
+							  ]
+							: [
+									...( view.filters ?? [] ),
+									{
+										field: filter.field,
+										operator,
+										value: undefined,
+									},
+							  ];
+						onChangeView( {
+							...view,
+							page: 1,
+							filters: newFilters,
+						} );
+					} }
+					size="small"
+					__nextHasNoMarginBottom
+					hideLabelFromVision
+				/>
+			</HStack>
+		)
+	);
+}
+
+export default function FilterSummary( {
+	addFilterRef,
+	openedFilter,
+	...commonProps
+}: FilterSummaryProps ) {
+	const toggleRef = useRef< HTMLDivElement >( null );
+	const { filter, view, onChangeView } = commonProps;
+	const filterInView = view.filters?.find(
+		( f ) => f.field === filter.field
+	);
+	const activeElements = filter.elements.filter( ( element ) => {
+		if ( filter.singleSelection ) {
+			return element.value === filterInView?.value;
+		}
+		return filterInView?.value?.includes( element.value );
+	} );
+	const isPrimary = filter.isPrimary;
+	const hasValues = filterInView?.value !== undefined;
+	const canResetOrRemove = ! isPrimary || hasValues;
+	return (
+		<Dropdown
+			defaultOpen={ openedFilter === filter.field }
+			contentClassName="dataviews-filters__summary-popover"
+			popoverProps={ { placement: 'bottom-start', role: 'dialog' } }
+			onClose={ () => {
+				toggleRef.current?.focus();
+			} }
+			renderToggle={ ( { isOpen, onToggle } ) => (
+				<div className="dataviews-filters__summary-chip-container">
+					<Tooltip
+						text={ sprintf(
+							/* translators: 1: Filter name. */
+							__( 'Filter by: %1$s' ),
+							filter.name.toLowerCase()
+						) }
+						placement="top"
+					>
+						<div
+							className={ clsx(
+								'dataviews-filters__summary-chip',
+								{
+									'has-reset': canResetOrRemove,
+									'has-values': hasValues,
+								}
+							) }
+							role="button"
+							tabIndex={ 0 }
+							onClick={ onToggle }
+							onKeyDown={ ( event ) => {
+								if ( [ ENTER, SPACE ].includes( event.key ) ) {
+									onToggle();
+									event.preventDefault();
+								}
+							} }
+							aria-pressed={ isOpen }
+							aria-expanded={ isOpen }
+							ref={ toggleRef }
+						>
+							<FilterText
+								activeElements={ activeElements }
+								filterInView={ filterInView }
+								filter={ filter }
+							/>
+						</div>
+					</Tooltip>
+					{ canResetOrRemove && (
+						<Tooltip
+							text={ isPrimary ? __( 'Reset' ) : __( 'Remove' ) }
+							placement="top"
+						>
+							<button
+								className={ clsx(
+									'dataviews-filters__summary-chip-remove',
+									{ 'has-values': hasValues }
+								) }
+								onClick={ () => {
+									onChangeView( {
+										...view,
+										page: 1,
+										filters: view.filters?.filter(
+											( _filter ) =>
+												_filter.field !== filter.field
+										),
+									} );
+									// If the filter is not primary and can be removed, it will be added
+									// back to the available filters from `Add filter` component.
+									if ( ! isPrimary ) {
+										addFilterRef.current?.focus();
+									} else {
+										// If is primary, focus the toggle button.
+										toggleRef.current?.focus();
+									}
+								} }
+							>
+								<Icon icon={ closeSmall } />
+							</button>
+						</Tooltip>
+					) }
+				</div>
+			) }
+			renderContent={ () => {
+				return (
+					<VStack spacing={ 0 } justify="flex-start">
+						<OperatorSelector { ...commonProps } />
+						<SearchWidget { ...commonProps } />
+					</VStack>
+				);
+			} }
+		/>
+	);
+}
diff --git a/packages/dataviews/src/components/dataviews-filters/index.tsx b/packages/dataviews/src/components/dataviews-filters/index.tsx
new file mode 100644
index 00000000000000..96e7f5b5d7b9d9
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-filters/index.tsx
@@ -0,0 +1,202 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	memo,
+	useContext,
+	useRef,
+	useMemo,
+	useCallback,
+} from '@wordpress/element';
+import { __experimentalHStack as HStack, Button } from '@wordpress/components';
+import { funnel } from '@wordpress/icons';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import FilterSummary from './filter-summary';
+import { default as AddFilter, AddFilterDropdownMenu } from './add-filter';
+import ResetFilters from './reset-filters';
+import DataViewsContext from '../dataviews-context';
+import { sanitizeOperators } from '../../utils';
+import { ALL_OPERATORS, OPERATOR_IS, OPERATOR_IS_NOT } from '../../constants';
+import type { NormalizedFilter, NormalizedField, View } from '../../types';
+
+export function useFilters( fields: NormalizedField< any >[], view: View ) {
+	return useMemo( () => {
+		const filters: NormalizedFilter[] = [];
+		fields.forEach( ( field ) => {
+			if ( ! field.elements?.length ) {
+				return;
+			}
+
+			const operators = sanitizeOperators( field );
+			if ( operators.length === 0 ) {
+				return;
+			}
+
+			const isPrimary = !! field.filterBy?.isPrimary;
+			filters.push( {
+				field: field.id,
+				name: field.label,
+				elements: field.elements,
+				singleSelection: operators.some( ( op ) =>
+					[ OPERATOR_IS, OPERATOR_IS_NOT ].includes( op )
+				),
+				operators,
+				isVisible:
+					isPrimary ||
+					!! view.filters?.some(
+						( f ) =>
+							f.field === field.id &&
+							ALL_OPERATORS.includes( f.operator )
+					),
+				isPrimary,
+			} );
+		} );
+		// Sort filters by primary property. We need the primary filters to be first.
+		// Then we sort by name.
+		filters.sort( ( a, b ) => {
+			if ( a.isPrimary && ! b.isPrimary ) {
+				return -1;
+			}
+			if ( ! a.isPrimary && b.isPrimary ) {
+				return 1;
+			}
+			return a.name.localeCompare( b.name );
+		} );
+		return filters;
+	}, [ fields, view ] );
+}
+
+export function FilterVisibilityToggle( {
+	filters,
+	view,
+	onChangeView,
+	setOpenedFilter,
+	isShowingFilter,
+	setIsShowingFilter,
+}: {
+	filters: NormalizedFilter[];
+	view: View;
+	onChangeView: ( view: View ) => void;
+	setOpenedFilter: ( filter: string | null ) => void;
+	isShowingFilter: boolean;
+	setIsShowingFilter: React.Dispatch< React.SetStateAction< boolean > >;
+} ) {
+	const onChangeViewWithFilterVisibility = useCallback(
+		( _view: View ) => {
+			onChangeView( _view );
+			setIsShowingFilter( true );
+		},
+		[ onChangeView, setIsShowingFilter ]
+	);
+	const visibleFilters = filters.filter( ( filter ) => filter.isVisible );
+
+	const hasVisibleFilters = !! visibleFilters.length;
+	if ( filters.length === 0 ) {
+		return null;
+	}
+	if ( ! hasVisibleFilters ) {
+		return (
+			<AddFilterDropdownMenu
+				filters={ filters }
+				view={ view }
+				onChangeView={ onChangeViewWithFilterVisibility }
+				setOpenedFilter={ setOpenedFilter }
+				trigger={
+					<Button
+						className="dataviews-filters__visibility-toggle"
+						size="compact"
+						icon={ funnel }
+						label={ __( 'Add filter' ) }
+						isPressed={ false }
+						aria-expanded={ false }
+					/>
+				}
+			/>
+		);
+	}
+	return (
+		<div className="dataviews-filters__container-visibility-toggle">
+			<Button
+				className="dataviews-filters__visibility-toggle"
+				size="compact"
+				icon={ funnel }
+				label={ __( 'Toggle filter display' ) }
+				onClick={ () => {
+					if ( ! isShowingFilter ) {
+						setOpenedFilter( null );
+					}
+					setIsShowingFilter( ! isShowingFilter );
+				} }
+				isPressed={ isShowingFilter }
+				aria-expanded={ isShowingFilter }
+			/>
+			{ hasVisibleFilters && !! view.filters?.length && (
+				<span className="dataviews-filters-toggle__count">
+					{ view.filters?.length }
+				</span>
+			) }
+		</div>
+	);
+}
+
+function Filters() {
+	const { fields, view, onChangeView, openedFilter, setOpenedFilter } =
+		useContext( DataViewsContext );
+	const addFilterRef = useRef< HTMLButtonElement >( null );
+	const filters = useFilters( fields, view );
+	const addFilter = (
+		<AddFilter
+			key="add-filter"
+			filters={ filters }
+			view={ view }
+			onChangeView={ onChangeView }
+			ref={ addFilterRef }
+			setOpenedFilter={ setOpenedFilter }
+		/>
+	);
+	const visibleFilters = filters.filter( ( filter ) => filter.isVisible );
+	if ( visibleFilters.length === 0 ) {
+		return null;
+	}
+	const filterComponents = [
+		...visibleFilters.map( ( filter ) => {
+			return (
+				<FilterSummary
+					key={ filter.field }
+					filter={ filter }
+					view={ view }
+					onChangeView={ onChangeView }
+					addFilterRef={ addFilterRef }
+					openedFilter={ openedFilter }
+				/>
+			);
+		} ),
+		addFilter,
+	];
+
+	filterComponents.push(
+		<ResetFilters
+			key="reset-filters"
+			filters={ filters }
+			view={ view }
+			onChangeView={ onChangeView }
+		/>
+	);
+
+	return (
+		<HStack
+			justify="flex-start"
+			style={ { width: 'fit-content' } }
+			className="dataviews-filters__container"
+			wrap
+		>
+			{ filterComponents }
+		</HStack>
+	);
+}
+
+export default memo( Filters );
diff --git a/packages/dataviews/src/components/dataviews-filters/reset-filters.tsx b/packages/dataviews/src/components/dataviews-filters/reset-filters.tsx
new file mode 100644
index 00000000000000..4e4c44d8a1c311
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-filters/reset-filters.tsx
@@ -0,0 +1,52 @@
+/**
+ * WordPress dependencies
+ */
+import { Button } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import type { NormalizedFilter, View } from '../../types';
+
+interface ResetFilterProps {
+	filters: NormalizedFilter[];
+	view: View;
+	onChangeView: ( view: View ) => void;
+}
+
+export default function ResetFilter( {
+	filters,
+	view,
+	onChangeView,
+}: ResetFilterProps ) {
+	const isPrimary = ( field: string ) =>
+		filters.some(
+			( _filter ) => _filter.field === field && _filter.isPrimary
+		);
+	const isDisabled =
+		! view.search &&
+		! view.filters?.some(
+			( _filter ) =>
+				_filter.value !== undefined || ! isPrimary( _filter.field )
+		);
+	return (
+		<Button
+			disabled={ isDisabled }
+			accessibleWhenDisabled
+			size="compact"
+			variant="tertiary"
+			className="dataviews-filters__reset-button"
+			onClick={ () => {
+				onChangeView( {
+					...view,
+					page: 1,
+					search: '',
+					filters: [],
+				} );
+			} }
+		>
+			{ __( 'Reset' ) }
+		</Button>
+	);
+}
diff --git a/packages/dataviews/src/components/dataviews-filters/search-widget.tsx b/packages/dataviews/src/components/dataviews-filters/search-widget.tsx
new file mode 100644
index 00000000000000..459b68990753c1
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-filters/search-widget.tsx
@@ -0,0 +1,324 @@
+/**
+ * External dependencies
+ */
+// eslint-disable-next-line no-restricted-imports
+import * as Ariakit from '@ariakit/react';
+import removeAccents from 'remove-accents';
+
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId } from '@wordpress/compose';
+import { __, sprintf } from '@wordpress/i18n';
+import { useState, useMemo, useDeferredValue } from '@wordpress/element';
+import { VisuallyHidden, Icon, Composite } from '@wordpress/components';
+import { search, check } from '@wordpress/icons';
+import { SVG, Circle } from '@wordpress/primitives';
+
+/**
+ * Internal dependencies
+ */
+import type { Filter, NormalizedFilter, View } from '../../types';
+
+interface SearchWidgetProps {
+	view: View;
+	filter: NormalizedFilter;
+	onChangeView: ( view: View ) => void;
+}
+
+const radioCheck = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Circle cx={ 12 } cy={ 12 } r={ 3 }></Circle>
+	</SVG>
+);
+
+function normalizeSearchInput( input = '' ) {
+	return removeAccents( input.trim().toLowerCase() );
+}
+
+const EMPTY_ARRAY: [] = [];
+const getCurrentValue = (
+	filterDefinition: NormalizedFilter,
+	currentFilter?: Filter
+) => {
+	if ( filterDefinition.singleSelection ) {
+		return currentFilter?.value;
+	}
+
+	if ( Array.isArray( currentFilter?.value ) ) {
+		return currentFilter.value;
+	}
+
+	if ( ! Array.isArray( currentFilter?.value ) && !! currentFilter?.value ) {
+		return [ currentFilter.value ];
+	}
+
+	return EMPTY_ARRAY;
+};
+
+const getNewValue = (
+	filterDefinition: NormalizedFilter,
+	currentFilter: Filter | undefined,
+	value: any
+) => {
+	if ( filterDefinition.singleSelection ) {
+		return value;
+	}
+
+	if ( Array.isArray( currentFilter?.value ) ) {
+		return currentFilter.value.includes( value )
+			? currentFilter.value.filter( ( v ) => v !== value )
+			: [ ...currentFilter.value, value ];
+	}
+
+	return [ value ];
+};
+
+function generateFilterElementCompositeItemId(
+	prefix: string,
+	filterElementValue: string
+) {
+	return `${ prefix }-${ filterElementValue }`;
+}
+
+function ListBox( { view, filter, onChangeView }: SearchWidgetProps ) {
+	const baseId = useInstanceId( ListBox, 'dataviews-filter-list-box' );
+
+	const [ activeCompositeId, setActiveCompositeId ] = useState<
+		string | null | undefined
+	>(
+		// When there are one or less operators, the first item is set as active
+		// (by setting the initial `activeId` to `undefined`).
+		// With 2 or more operators, the focus is moved on the operators control
+		// (by setting the initial `activeId` to `null`), meaning that there won't
+		// be an active item initially. Focus is then managed via the
+		// `onFocusVisible` callback.
+		filter.operators?.length === 1 ? undefined : null
+	);
+	const currentFilter = view.filters?.find(
+		( f ) => f.field === filter.field
+	);
+	const currentValue = getCurrentValue( filter, currentFilter );
+	return (
+		<Composite
+			virtualFocus
+			focusLoop
+			activeId={ activeCompositeId }
+			setActiveId={ setActiveCompositeId }
+			role="listbox"
+			className="dataviews-filters__search-widget-listbox"
+			aria-label={ sprintf(
+				/* translators: List of items for a filter. 1: Filter name. e.g.: "List of: Author". */
+				__( 'List of: %1$s' ),
+				filter.name
+			) }
+			onFocusVisible={ () => {
+				// `onFocusVisible` needs the `Composite` component to be focusable,
+				// which is implicitly achieved via the `virtualFocus` prop.
+				if ( ! activeCompositeId && filter.elements.length ) {
+					setActiveCompositeId(
+						generateFilterElementCompositeItemId(
+							baseId,
+							filter.elements[ 0 ].value
+						)
+					);
+				}
+			} }
+			render={ <Composite.Typeahead /> }
+		>
+			{ filter.elements.map( ( element ) => (
+				<Composite.Hover
+					key={ element.value }
+					render={
+						<Composite.Item
+							id={ generateFilterElementCompositeItemId(
+								baseId,
+								element.value
+							) }
+							render={
+								<div
+									aria-label={ element.label }
+									role="option"
+									className="dataviews-filters__search-widget-listitem"
+								/>
+							}
+							onClick={ () => {
+								const newFilters = currentFilter
+									? [
+											...( view.filters ?? [] ).map(
+												( _filter ) => {
+													if (
+														_filter.field ===
+														filter.field
+													) {
+														return {
+															..._filter,
+															operator:
+																currentFilter.operator ||
+																filter
+																	.operators[ 0 ],
+															value: getNewValue(
+																filter,
+																currentFilter,
+																element.value
+															),
+														};
+													}
+													return _filter;
+												}
+											),
+									  ]
+									: [
+											...( view.filters ?? [] ),
+											{
+												field: filter.field,
+												operator: filter.operators[ 0 ],
+												value: getNewValue(
+													filter,
+													currentFilter,
+													element.value
+												),
+											},
+									  ];
+								onChangeView( {
+									...view,
+									page: 1,
+									filters: newFilters,
+								} );
+							} }
+						/>
+					}
+				>
+					<span className="dataviews-filters__search-widget-listitem-check">
+						{ filter.singleSelection &&
+							currentValue === element.value && (
+								<Icon icon={ radioCheck } />
+							) }
+						{ ! filter.singleSelection &&
+							currentValue.includes( element.value ) && (
+								<Icon icon={ check } />
+							) }
+					</span>
+					<span>{ element.label }</span>
+				</Composite.Hover>
+			) ) }
+		</Composite>
+	);
+}
+
+function ComboboxList( { view, filter, onChangeView }: SearchWidgetProps ) {
+	const [ searchValue, setSearchValue ] = useState( '' );
+	const deferredSearchValue = useDeferredValue( searchValue );
+	const currentFilter = view.filters?.find(
+		( _filter ) => _filter.field === filter.field
+	);
+	const currentValue = getCurrentValue( filter, currentFilter );
+	const matches = useMemo( () => {
+		const normalizedSearch = normalizeSearchInput( deferredSearchValue );
+		return filter.elements.filter( ( item ) =>
+			normalizeSearchInput( item.label ).includes( normalizedSearch )
+		);
+	}, [ filter.elements, deferredSearchValue ] );
+	return (
+		<Ariakit.ComboboxProvider
+			selectedValue={ currentValue }
+			setSelectedValue={ ( value ) => {
+				const newFilters = currentFilter
+					? [
+							...( view.filters ?? [] ).map( ( _filter ) => {
+								if ( _filter.field === filter.field ) {
+									return {
+										..._filter,
+										operator:
+											currentFilter.operator ||
+											filter.operators[ 0 ],
+										value,
+									};
+								}
+								return _filter;
+							} ),
+					  ]
+					: [
+							...( view.filters ?? [] ),
+							{
+								field: filter.field,
+								operator: filter.operators[ 0 ],
+								value,
+							},
+					  ];
+				onChangeView( {
+					...view,
+					page: 1,
+					filters: newFilters,
+				} );
+			} }
+			setValue={ setSearchValue }
+		>
+			<div className="dataviews-filters__search-widget-filter-combobox__wrapper">
+				<Ariakit.ComboboxLabel
+					render={
+						<VisuallyHidden>
+							{ __( 'Search items' ) }
+						</VisuallyHidden>
+					}
+				>
+					{ __( 'Search items' ) }
+				</Ariakit.ComboboxLabel>
+				<Ariakit.Combobox
+					autoSelect="always"
+					placeholder={ __( 'Search' ) }
+					className="dataviews-filters__search-widget-filter-combobox__input"
+				/>
+				<div className="dataviews-filters__search-widget-filter-combobox__icon">
+					<Icon icon={ search } />
+				</div>
+			</div>
+			<Ariakit.ComboboxList
+				className="dataviews-filters__search-widget-filter-combobox-list"
+				alwaysVisible
+			>
+				{ matches.map( ( element ) => {
+					return (
+						<Ariakit.ComboboxItem
+							resetValueOnSelect={ false }
+							key={ element.value }
+							value={ element.value }
+							className="dataviews-filters__search-widget-listitem"
+							hideOnClick={ false }
+							setValueOnClick={ false }
+							focusOnHover
+						>
+							<span className="dataviews-filters__search-widget-listitem-check">
+								{ filter.singleSelection &&
+									currentValue === element.value && (
+										<Icon icon={ radioCheck } />
+									) }
+								{ ! filter.singleSelection &&
+									currentValue.includes( element.value ) && (
+										<Icon icon={ check } />
+									) }
+							</span>
+							<span>
+								<Ariakit.ComboboxItemValue
+									className="dataviews-filters__search-widget-filter-combobox-item-value"
+									value={ element.label }
+								/>
+								{ !! element.description && (
+									<span className="dataviews-filters__search-widget-listitem-description">
+										{ element.description }
+									</span>
+								) }
+							</span>
+						</Ariakit.ComboboxItem>
+					);
+				} ) }
+				{ ! matches.length && <p>{ __( 'No results found' ) }</p> }
+			</Ariakit.ComboboxList>
+		</Ariakit.ComboboxProvider>
+	);
+}
+
+export default function SearchWidget( props: SearchWidgetProps ) {
+	const Widget = props.filter.elements.length > 10 ? ComboboxList : ListBox;
+	return <Widget { ...props } />;
+}
diff --git a/packages/dataviews/src/components/dataviews-filters/style.scss b/packages/dataviews/src/components/dataviews-filters/style.scss
new file mode 100644
index 00000000000000..130ef8872615a5
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-filters/style.scss
@@ -0,0 +1,291 @@
+.dataviews-filters__button {
+	position: relative;
+}
+
+.dataviews-filters__container {
+	padding-top: 0;
+}
+
+.dataviews-filters__reset-button.dataviews-filters__reset-button[aria-disabled="true"] {
+	&,
+	&:hover {
+		opacity: 0;
+	}
+
+	&:focus {
+		opacity: 1;
+	}
+}
+
+.dataviews-filters__summary-popover {
+	font-size: $default-font-size;
+	line-height: $default-line-height;
+
+	.components-popover__content {
+		width: 230px;
+		border-radius: $grid-unit-05;
+	}
+
+	&.components-dropdown__content {
+		.components-popover__content {
+			padding: 0;
+		}
+	}
+}
+
+.dataviews-filters__summary-operators-container {
+	padding: $grid-unit-10 $grid-unit-10 0;
+
+	&:has(+ .dataviews-filters__search-widget-listbox) {
+		border-bottom: 1px solid $gray-200;
+		padding-bottom: $grid-unit-10;
+	}
+
+	&:empty {
+		display: none;
+	}
+
+	.dataviews-filters__summary-operators-filter-name {
+		color: $gray-700;
+	}
+}
+
+.dataviews-filters__summary-chip-container {
+	position: relative;
+	white-space: pre-wrap;
+
+	.dataviews-filters__summary-chip {
+		border-radius: $grid-unit-20;
+		border: $border-width solid transparent;
+		cursor: pointer;
+		padding: $grid-unit-05 $grid-unit-15;
+		min-height: $grid-unit-40;
+		background: $gray-100;
+		color: $gray-800;
+		position: relative;
+		display: flex;
+		align-items: center;
+		box-sizing: border-box;
+
+		&.has-reset {
+			padding-inline-end: $button-size-small + $grid-unit-05;
+		}
+
+		&:hover,
+		&:focus-visible,
+		&[aria-expanded="true"] {
+			background: $gray-200;
+			color: $gray-900;
+		}
+
+		&.has-values {
+			color: var(--wp-admin-theme-color);
+			background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
+
+			&:hover,
+			&[aria-expanded="true"] {
+				background: rgba(var(--wp-admin-theme-color--rgb), 0.12);
+			}
+		}
+
+		&:focus-visible {
+			outline: none;
+			box-shadow:
+				0 0 0 var(--wp-admin-border-width-focus)
+				var(--wp-admin-theme-color);
+		}
+
+		.dataviews-filters-__summary-filter-text-name {
+			font-weight: 500;
+		}
+	}
+
+	.dataviews-filters__summary-chip-remove {
+		width: $icon-size;
+		height: $icon-size;
+		border-radius: 50%;
+		border: 0;
+		padding: 0;
+		position: absolute;
+		right: $grid-unit-05;
+		top: 50%;
+		transform: translateY(-50%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: transparent;
+		cursor: pointer;
+
+		svg {
+			fill: $gray-700;
+		}
+
+		&:hover,
+		&:focus {
+			background: $gray-200;
+			svg {
+				fill: $gray-900;
+			}
+		}
+
+		&.has-values {
+			svg {
+				fill: var(--wp-admin-theme-color);
+			}
+			&:hover {
+				background: rgba(var(--wp-admin-theme-color--rgb), 0.08);
+			}
+		}
+
+		&:focus-visible {
+			outline: none;
+			box-shadow:
+				0 0 0 var(--wp-admin-border-width-focus)
+				var(--wp-admin-theme-color);
+		}
+	}
+}
+
+.dataviews-filters__search-widget-filter-combobox-list {
+	max-height: $grid-unit * 23;
+	padding: $grid-unit-05;
+	overflow: auto;
+	border-top: 1px solid $gray-200;
+
+	.dataviews-filters__search-widget-filter-combobox-item-value {
+		[data-user-value] {
+			font-weight: 600;
+		}
+	}
+}
+
+.dataviews-filters__search-widget-listbox {
+	padding: $grid-unit-05;
+	overflow: auto;
+}
+
+.dataviews-filters__search-widget-listitem {
+	display: flex;
+	align-items: center;
+	gap: $grid-unit-10;
+	border-radius: $radius-small;
+	box-sizing: border-box;
+	padding: $grid-unit-10 $grid-unit-15;
+	cursor: default;
+	margin-block-end: 2px;
+
+	&:last-child {
+		margin-block-end: 0;
+	}
+
+	&:hover,
+	&[data-active-item],
+	&:focus {
+		background-color: var(--wp-admin-theme-color);
+		color: $white;
+
+		.dataviews-filters__search-widget-listitem-check {
+			fill: $white;
+		}
+
+		.dataviews-filters__search-widget-listitem-description {
+			color: $white;
+		}
+	}
+
+	.dataviews-filters__search-widget-listitem-check {
+		width: 24px;
+		height: 24px;
+		flex-shrink: 0;
+	}
+
+	.dataviews-filters__search-widget-listitem-description {
+		display: block;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		font-size: $helptext-font-size;
+		line-height: 16px;
+		color: $gray-700;
+	}
+}
+
+.dataviews-filters__search-widget-filter-combobox__wrapper {
+	position: relative;
+	padding: $grid-unit-10;
+
+	.dataviews-filters__search-widget-filter-combobox__input {
+		@include input-control;
+		display: block;
+		padding: 0 $grid-unit-40 0 $grid-unit-10;
+		background: $gray-100;
+		border: none;
+		width: 100%;
+		height: $grid-unit-40;
+
+		// Unset inherited values.
+		margin-left: 0;
+		margin-right: 0;
+
+		/* Fonts smaller than 16px causes mobile safari to zoom. */
+		font-size: $mobile-text-min-font-size;
+		@include break-small {
+			font-size: $default-font-size;
+		}
+
+		&:focus {
+			background: $white;
+			box-shadow:
+				inset 0 0 0 var(--wp-admin-border-width-focus)
+				var(--wp-admin-theme-color);
+		}
+
+		&::placeholder {
+			color: $gray-700;
+		}
+
+		&::-webkit-search-decoration,
+		&::-webkit-search-cancel-button,
+		&::-webkit-search-results-button,
+		&::-webkit-search-results-decoration {
+			-webkit-appearance: none;
+		}
+	}
+
+	.dataviews-filters__search-widget-filter-combobox__icon {
+		position: absolute;
+		right: $grid-unit-15;
+		top: 50%;
+		transform: translateY(-50%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: $icon-size;
+	}
+}
+
+.dataviews-filters__container-visibility-toggle {
+	position: relative;
+	flex-shrink: 0;
+}
+
+.dataviews-filters-toggle__count {
+	position: absolute;
+	top: 0;
+	right: 0;
+	transform: translate(50%, -50%);
+	background: var(--wp-admin-theme-color, #3858e9);
+	height: $grid-unit-20;
+	min-width: $grid-unit-20;
+	line-height: $grid-unit-20;
+	padding: 0 $grid-unit-05;
+	text-align: center;
+	border-radius: $grid-unit-10;
+	font-size: 11px;
+	outline: var(--wp-admin-border-width-focus) solid $white;
+	color: $white;
+	box-sizing: border-box;
+}
+
+.dataviews-search {
+	width: fit-content;
+}
diff --git a/packages/dataviews/src/components/dataviews-footer/index.tsx b/packages/dataviews/src/components/dataviews-footer/index.tsx
new file mode 100644
index 00000000000000..191e16f47e2c96
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-footer/index.tsx
@@ -0,0 +1,50 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalHStack as HStack } from '@wordpress/components';
+import { useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import DataViewsContext from '../dataviews-context';
+import DataViewsPagination from '../dataviews-pagination';
+import {
+	BulkActionsFooter,
+	useSomeItemHasAPossibleBulkAction,
+} from '../dataviews-bulk-actions';
+import { LAYOUT_GRID, LAYOUT_TABLE } from '../../constants';
+
+const EMPTY_ARRAY: [] = [];
+
+export default function DataViewsFooter() {
+	const {
+		view,
+		paginationInfo: { totalItems = 0, totalPages },
+		data,
+		actions = EMPTY_ARRAY,
+	} = useContext( DataViewsContext );
+	const hasBulkActions =
+		useSomeItemHasAPossibleBulkAction( actions, data ) &&
+		[ LAYOUT_TABLE, LAYOUT_GRID ].includes( view.type );
+
+	if (
+		! totalItems ||
+		! totalPages ||
+		( totalPages <= 1 && ! hasBulkActions )
+	) {
+		return null;
+	}
+	return (
+		!! totalItems && (
+			<HStack
+				expanded={ false }
+				justify="end"
+				className="dataviews-footer"
+			>
+				{ hasBulkActions && <BulkActionsFooter /> }
+				<DataViewsPagination />
+			</HStack>
+		)
+	);
+}
diff --git a/packages/dataviews/src/components/dataviews-footer/style.scss b/packages/dataviews/src/components/dataviews-footer/style.scss
new file mode 100644
index 00000000000000..cdb1359ccee393
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-footer/style.scss
@@ -0,0 +1,40 @@
+.dataviews-footer {
+	position: sticky;
+	bottom: 0;
+	left: 0;
+	background-color: $white;
+	padding: $grid-unit-15 $grid-unit-60;
+	border-top: $border-width solid $gray-100;
+	flex-shrink: 0;
+	transition: padding ease-out 0.1s;
+	@include reduce-motion("transition");
+	z-index: z-index(".dataviews-footer");
+}
+
+
+/* stylelint-disable-next-line scss/at-rule-no-unknown -- '@container' not globally permitted */
+@container (max-width: 430px) {
+	.dataviews-footer {
+		padding: $grid-unit-15 $grid-unit-30;
+	}
+}
+
+/* stylelint-disable-next-line scss/at-rule-no-unknown -- '@container' not globally permitted */
+@container (max-width: 560px) {
+	.dataviews-footer {
+		flex-direction: column !important;
+
+		.dataviews-bulk-actions-footer__container {
+			width: 100%;
+		}
+
+		.dataviews-bulk-actions-footer__item-count {
+			flex-grow: 1;
+		}
+
+		.dataviews-pagination {
+			width: 100%;
+			justify-content: space-between;
+		}
+	}
+}
diff --git a/packages/dataviews/src/components/dataviews-item-actions/index.tsx b/packages/dataviews/src/components/dataviews-item-actions/index.tsx
new file mode 100644
index 00000000000000..e33cb0fe56d0ed
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-item-actions/index.tsx
@@ -0,0 +1,264 @@
+/**
+ * External dependencies
+ */
+import type { MouseEventHandler, ReactElement } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	Button,
+	Modal,
+	__experimentalHStack as HStack,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useMemo, useState } from '@wordpress/element';
+import { moreVertical } from '@wordpress/icons';
+import { useRegistry } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import type { Action, ActionModal as ActionModalType } from '../../types';
+
+const { DropdownMenuV2, kebabCase } = unlock( componentsPrivateApis );
+
+export interface ActionTriggerProps< Item > {
+	action: Action< Item >;
+	onClick: MouseEventHandler;
+	isBusy?: boolean;
+	items: Item[];
+}
+
+interface ActionModalProps< Item > {
+	action: ActionModalType< Item >;
+	items: Item[];
+	closeModal?: () => void;
+}
+
+interface ActionWithModalProps< Item > extends ActionModalProps< Item > {
+	ActionTrigger: ( props: ActionTriggerProps< Item > ) => ReactElement;
+	isBusy?: boolean;
+}
+
+interface ActionsDropdownMenuGroupProps< Item > {
+	actions: Action< Item >[];
+	item: Item;
+}
+
+interface ItemActionsProps< Item > {
+	item: Item;
+	actions: Action< Item >[];
+	isCompact?: boolean;
+}
+
+interface CompactItemActionsProps< Item > {
+	item: Item;
+	actions: Action< Item >[];
+}
+
+function ButtonTrigger< Item >( {
+	action,
+	onClick,
+	items,
+}: ActionTriggerProps< Item > ) {
+	const label =
+		typeof action.label === 'string' ? action.label : action.label( items );
+	return (
+		<Button
+			label={ label }
+			icon={ action.icon }
+			isDestructive={ action.isDestructive }
+			size="compact"
+			onClick={ onClick }
+		/>
+	);
+}
+
+function DropdownMenuItemTrigger< Item >( {
+	action,
+	onClick,
+	items,
+}: ActionTriggerProps< Item > ) {
+	const label =
+		typeof action.label === 'string' ? action.label : action.label( items );
+	return (
+		<DropdownMenuV2.Item
+			onClick={ onClick }
+			hideOnClick={ ! ( 'RenderModal' in action ) }
+		>
+			<DropdownMenuV2.ItemLabel>{ label }</DropdownMenuV2.ItemLabel>
+		</DropdownMenuV2.Item>
+	);
+}
+
+export function ActionModal< Item >( {
+	action,
+	items,
+	closeModal,
+}: ActionModalProps< Item > ) {
+	const label =
+		typeof action.label === 'string' ? action.label : action.label( items );
+	return (
+		<Modal
+			title={ action.modalHeader || label }
+			__experimentalHideHeader={ !! action.hideModalHeader }
+			onRequestClose={ closeModal ?? ( () => {} ) }
+			focusOnMount="firstContentElement"
+			size="small"
+			overlayClassName={ `dataviews-action-modal dataviews-action-modal__${ kebabCase(
+				action.id
+			) }` }
+		>
+			<action.RenderModal items={ items } closeModal={ closeModal } />
+		</Modal>
+	);
+}
+
+export function ActionWithModal< Item >( {
+	action,
+	items,
+	ActionTrigger,
+	isBusy,
+}: ActionWithModalProps< Item > ) {
+	const [ isModalOpen, setIsModalOpen ] = useState( false );
+	const actionTriggerProps = {
+		action,
+		onClick: () => {
+			setIsModalOpen( true );
+		},
+		items,
+		isBusy,
+	};
+	return (
+		<>
+			<ActionTrigger { ...actionTriggerProps } />
+			{ isModalOpen && (
+				<ActionModal
+					action={ action }
+					items={ items }
+					closeModal={ () => setIsModalOpen( false ) }
+				/>
+			) }
+		</>
+	);
+}
+
+export function ActionsDropdownMenuGroup< Item >( {
+	actions,
+	item,
+}: ActionsDropdownMenuGroupProps< Item > ) {
+	const registry = useRegistry();
+	return (
+		<DropdownMenuV2.Group>
+			{ actions.map( ( action ) => {
+				if ( 'RenderModal' in action ) {
+					return (
+						<ActionWithModal
+							key={ action.id }
+							action={ action }
+							items={ [ item ] }
+							ActionTrigger={ DropdownMenuItemTrigger }
+						/>
+					);
+				}
+				return (
+					<DropdownMenuItemTrigger
+						key={ action.id }
+						action={ action }
+						onClick={ () => {
+							action.callback( [ item ], { registry } );
+						} }
+						items={ [ item ] }
+					/>
+				);
+			} ) }
+		</DropdownMenuV2.Group>
+	);
+}
+
+export default function ItemActions< Item >( {
+	item,
+	actions,
+	isCompact,
+}: ItemActionsProps< Item > ) {
+	const registry = useRegistry();
+	const { primaryActions, eligibleActions } = useMemo( () => {
+		// If an action is eligible for all items, doesn't need
+		// to provide the `isEligible` function.
+		const _eligibleActions = actions.filter(
+			( action ) => ! action.isEligible || action.isEligible( item )
+		);
+		const _primaryActions = _eligibleActions.filter(
+			( action ) => action.isPrimary && !! action.icon
+		);
+		return {
+			primaryActions: _primaryActions,
+			eligibleActions: _eligibleActions,
+		};
+	}, [ actions, item ] );
+	if ( isCompact ) {
+		return <CompactItemActions item={ item } actions={ eligibleActions } />;
+	}
+	return (
+		<HStack
+			spacing={ 1 }
+			justify="flex-end"
+			className="dataviews-item-actions"
+			style={ {
+				flexShrink: '0',
+				width: 'auto',
+			} }
+		>
+			{ !! primaryActions.length &&
+				primaryActions.map( ( action ) => {
+					if ( 'RenderModal' in action ) {
+						return (
+							<ActionWithModal
+								key={ action.id }
+								action={ action }
+								items={ [ item ] }
+								ActionTrigger={ ButtonTrigger }
+							/>
+						);
+					}
+					return (
+						<ButtonTrigger
+							key={ action.id }
+							action={ action }
+							onClick={ () => {
+								action.callback( [ item ], { registry } );
+							} }
+							items={ [ item ] }
+						/>
+					);
+				} ) }
+			<CompactItemActions item={ item } actions={ eligibleActions } />
+		</HStack>
+	);
+}
+
+function CompactItemActions< Item >( {
+	item,
+	actions,
+}: CompactItemActionsProps< Item > ) {
+	return (
+		<DropdownMenuV2
+			trigger={
+				<Button
+					size="compact"
+					icon={ moreVertical }
+					label={ __( 'Actions' ) }
+					accessibleWhenDisabled
+					disabled={ ! actions.length }
+					className="dataviews-all-actions-button"
+				/>
+			}
+			placement="bottom-end"
+		>
+			<ActionsDropdownMenuGroup actions={ actions } item={ item } />
+		</DropdownMenuV2>
+	);
+}
diff --git a/packages/dataviews/src/components/dataviews-item-actions/style.scss b/packages/dataviews/src/components/dataviews-item-actions/style.scss
new file mode 100644
index 00000000000000..9a0327ccb673ff
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-item-actions/style.scss
@@ -0,0 +1,3 @@
+.dataviews-action-modal {
+	z-index: z-index(".dataviews-action-modal");
+}
diff --git a/packages/dataviews/src/components/dataviews-layout/index.tsx b/packages/dataviews/src/components/dataviews-layout/index.tsx
new file mode 100644
index 00000000000000..bae4071fe2f773
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-layout/index.tsx
@@ -0,0 +1,51 @@
+/**
+ * External dependencies
+ */
+import type { ComponentType } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import { useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import DataViewsContext from '../dataviews-context';
+import { VIEW_LAYOUTS } from '../../dataviews-layouts';
+import type { ViewBaseProps } from '../../types';
+
+export default function DataViewsLayout() {
+	const {
+		actions = [],
+		data,
+		fields,
+		getItemId,
+		isLoading,
+		view,
+		onChangeView,
+		selection,
+		onChangeSelection,
+		setOpenedFilter,
+		density,
+	} = useContext( DataViewsContext );
+
+	const ViewComponent = VIEW_LAYOUTS.find( ( v ) => v.type === view.type )
+		?.component as ComponentType< ViewBaseProps< any > >;
+
+	return (
+		<ViewComponent
+			actions={ actions }
+			data={ data }
+			fields={ fields }
+			getItemId={ getItemId }
+			isLoading={ isLoading }
+			onChangeView={ onChangeView }
+			onChangeSelection={ onChangeSelection }
+			selection={ selection }
+			setOpenedFilter={ setOpenedFilter }
+			view={ view }
+			density={ density }
+		/>
+	);
+}
diff --git a/packages/dataviews/src/components/dataviews-pagination/index.tsx b/packages/dataviews/src/components/dataviews-pagination/index.tsx
new file mode 100644
index 00000000000000..08a25ea01224e0
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-pagination/index.tsx
@@ -0,0 +1,129 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	Button,
+	__experimentalHStack as HStack,
+	SelectControl,
+} from '@wordpress/components';
+import { createInterpolateElement, memo, useContext } from '@wordpress/element';
+import { sprintf, __, _x, isRTL } from '@wordpress/i18n';
+import { next, previous } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import DataViewsContext from '../dataviews-context';
+
+function DataViewsPagination() {
+	const {
+		view,
+		onChangeView,
+		paginationInfo: { totalItems = 0, totalPages },
+	} = useContext( DataViewsContext );
+
+	if ( ! totalItems || ! totalPages ) {
+		return null;
+	}
+
+	const currentPage = view.page ?? 1;
+	const pageSelectOptions = Array.from( Array( totalPages ) ).map(
+		( _, i ) => {
+			const page = i + 1;
+			return {
+				value: page.toString(),
+				label: page.toString(),
+				'aria-label':
+					currentPage === page
+						? sprintf(
+								// translators: Current page number in total number of pages
+								__( 'Page %1$s of %2$s' ),
+								currentPage,
+								totalPages
+						  )
+						: page.toString(),
+			};
+		}
+	);
+
+	return (
+		!! totalItems &&
+		totalPages !== 1 && (
+			<HStack
+				expanded={ false }
+				className="dataviews-pagination"
+				justify="end"
+				spacing={ 6 }
+			>
+				<HStack
+					justify="flex-start"
+					expanded={ false }
+					spacing={ 1 }
+					className="dataviews-pagination__page-select"
+				>
+					{ createInterpolateElement(
+						sprintf(
+							// translators: 1: Current page number, 2: Total number of pages.
+							_x(
+								'<div>Page</div>%1$s<div>of %2$s</div>',
+								'paging'
+							),
+							'<CurrentPage />',
+							totalPages
+						),
+						{
+							div: <div aria-hidden />,
+							CurrentPage: (
+								<SelectControl
+									aria-label={ __( 'Current page' ) }
+									value={ currentPage.toString() }
+									options={ pageSelectOptions }
+									onChange={ ( newValue ) => {
+										onChangeView( {
+											...view,
+											page: +newValue,
+										} );
+									} }
+									size="small"
+									__nextHasNoMarginBottom
+									variant="minimal"
+								/>
+							),
+						}
+					) }
+				</HStack>
+				<HStack expanded={ false } spacing={ 1 }>
+					<Button
+						onClick={ () =>
+							onChangeView( {
+								...view,
+								page: currentPage - 1,
+							} )
+						}
+						disabled={ currentPage === 1 }
+						accessibleWhenDisabled
+						label={ __( 'Previous page' ) }
+						icon={ isRTL() ? next : previous }
+						showTooltip
+						size="compact"
+						tooltipPosition="top"
+					/>
+					<Button
+						onClick={ () =>
+							onChangeView( { ...view, page: currentPage + 1 } )
+						}
+						disabled={ currentPage >= totalPages }
+						accessibleWhenDisabled
+						label={ __( 'Next page' ) }
+						icon={ isRTL() ? previous : next }
+						showTooltip
+						size="compact"
+						tooltipPosition="top"
+					/>
+				</HStack>
+			</HStack>
+		)
+	);
+}
+
+export default memo( DataViewsPagination );
diff --git a/packages/dataviews/src/components/dataviews-pagination/style.scss b/packages/dataviews/src/components/dataviews-pagination/style.scss
new file mode 100644
index 00000000000000..c8079c6b3ee828
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-pagination/style.scss
@@ -0,0 +1,12 @@
+.dataviews-pagination__page-select {
+	font-size: 11px;
+	font-weight: 500;
+	text-transform: uppercase;
+
+	@include break-small() {
+		.components-select-control__input {
+			font-size: 11px !important;
+			font-weight: 500;
+		}
+	}
+}
diff --git a/packages/dataviews/src/components/dataviews-search/index.tsx b/packages/dataviews/src/components/dataviews-search/index.tsx
new file mode 100644
index 00000000000000..1aef99872960be
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-search/index.tsx
@@ -0,0 +1,55 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useEffect, useRef, memo, useContext } from '@wordpress/element';
+import { SearchControl } from '@wordpress/components';
+import { useDebouncedInput } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import DataViewsContext from '../dataviews-context';
+
+interface SearchProps {
+	label?: string;
+}
+
+const DataViewsSearch = memo( function Search( { label }: SearchProps ) {
+	const { view, onChangeView } = useContext( DataViewsContext );
+	const [ search, setSearch, debouncedSearch ] = useDebouncedInput(
+		view.search
+	);
+	useEffect( () => {
+		setSearch( view.search ?? '' );
+	}, [ view.search, setSearch ] );
+	const onChangeViewRef = useRef( onChangeView );
+	const viewRef = useRef( view );
+	useEffect( () => {
+		onChangeViewRef.current = onChangeView;
+		viewRef.current = view;
+	}, [ onChangeView, view ] );
+	useEffect( () => {
+		if ( debouncedSearch !== viewRef.current?.search ) {
+			onChangeViewRef.current( {
+				...viewRef.current,
+				page: 1,
+				search: debouncedSearch,
+			} );
+		}
+	}, [ debouncedSearch ] );
+	const searchLabel = label || __( 'Search' );
+	return (
+		<SearchControl
+			className="dataviews-search"
+			__nextHasNoMarginBottom
+			onChange={ setSearch }
+			value={ search }
+			label={ searchLabel }
+			placeholder={ searchLabel }
+			size="compact"
+		/>
+	);
+} );
+
+export default DataViewsSearch;
diff --git a/packages/dataviews/src/components/dataviews-selection-checkbox/index.tsx b/packages/dataviews/src/components/dataviews-selection-checkbox/index.tsx
new file mode 100644
index 00000000000000..b81bdad9a54614
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-selection-checkbox/index.tsx
@@ -0,0 +1,65 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+import { CheckboxControl } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import type { Field } from '../../types';
+import type { SetSelection } from '../../private-types';
+
+interface DataViewsSelectionCheckboxProps< Item > {
+	selection: string[];
+	onChangeSelection: SetSelection;
+	item: Item;
+	getItemId: ( item: Item ) => string;
+	primaryField?: Field< Item >;
+	disabled: boolean;
+}
+
+export default function DataViewsSelectionCheckbox< Item >( {
+	selection,
+	onChangeSelection,
+	item,
+	getItemId,
+	primaryField,
+	disabled,
+}: DataViewsSelectionCheckboxProps< Item > ) {
+	const id = getItemId( item );
+	const checked = ! disabled && selection.includes( id );
+	let selectionLabel;
+	if ( primaryField?.getValue && item ) {
+		// eslint-disable-next-line @wordpress/valid-sprintf
+		selectionLabel = sprintf(
+			/* translators: %s: item title. */
+			checked ? __( 'Deselect item: %s' ) : __( 'Select item: %s' ),
+			primaryField.getValue( { item } )
+		);
+	} else {
+		selectionLabel = checked
+			? __( 'Select a new item' )
+			: __( 'Deselect item' );
+	}
+	return (
+		<CheckboxControl
+			className="dataviews-selection-checkbox"
+			__nextHasNoMarginBottom
+			aria-label={ selectionLabel }
+			aria-disabled={ disabled }
+			checked={ checked }
+			onChange={ () => {
+				if ( disabled ) {
+					return;
+				}
+
+				onChangeSelection(
+					selection.includes( id )
+						? selection.filter( ( itemId ) => id !== itemId )
+						: [ ...selection, id ]
+				);
+			} }
+		/>
+	);
+}
diff --git a/packages/dataviews/src/components/dataviews-selection-checkbox/style.scss b/packages/dataviews/src/components/dataviews-selection-checkbox/style.scss
new file mode 100644
index 00000000000000..d2724cae3feb9b
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-selection-checkbox/style.scss
@@ -0,0 +1,14 @@
+.dataviews-selection-checkbox {
+	// Experimental override for CheckboxControl size (fragile)
+	--checkbox-input-size: 24px;
+	@include break-small() {
+		--checkbox-input-size: 16px;
+	}
+
+	line-height: 0;
+	flex-shrink: 0;
+
+	.components-checkbox-control__input-container {
+		margin: 0;
+	}
+}
diff --git a/packages/dataviews/src/components/dataviews-view-config/index.tsx b/packages/dataviews/src/components/dataviews-view-config/index.tsx
new file mode 100644
index 00000000000000..ec4a5f9a7f1d0a
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-view-config/index.tsx
@@ -0,0 +1,596 @@
+/**
+ * External dependencies
+ */
+import type { ChangeEvent } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	Button,
+	__experimentalDropdownContentWrapper as DropdownContentWrapper,
+	Dropdown,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
+	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
+	SelectControl,
+	__experimentalItemGroup as ItemGroup,
+	__experimentalItem as Item,
+	__experimentalGrid as Grid,
+	__experimentalVStack as VStack,
+	__experimentalHStack as HStack,
+	__experimentalHeading as Heading,
+	__experimentalText as Text,
+	privateApis as componentsPrivateApis,
+	BaseControl,
+} from '@wordpress/components';
+import { __, _x, sprintf } from '@wordpress/i18n';
+import { memo, useContext, useMemo } from '@wordpress/element';
+import { chevronDown, chevronUp, cog, seen, unseen } from '@wordpress/icons';
+import warning from '@wordpress/warning';
+import { useInstanceId } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import {
+	SORTING_DIRECTIONS,
+	LAYOUT_GRID,
+	LAYOUT_TABLE,
+	sortIcons,
+	sortLabels,
+} from '../../constants';
+import {
+	VIEW_LAYOUTS,
+	getNotHidableFieldIds,
+	getVisibleFieldIds,
+	getHiddenFieldIds,
+} from '../../dataviews-layouts';
+import type { SupportedLayouts, View, Field } from '../../types';
+import DataViewsContext from '../dataviews-context';
+import { unlock } from '../../lock-unlock';
+import DensityPicker from '../../dataviews-layouts/grid/density-picker';
+
+const { DropdownMenuV2 } = unlock( componentsPrivateApis );
+
+interface ViewTypeMenuProps {
+	defaultLayouts?: SupportedLayouts;
+}
+
+const DATAVIEWS_CONFIG_POPOVER_PROPS = { placement: 'bottom-end', offset: 9 };
+
+function ViewTypeMenu( {
+	defaultLayouts = { list: {}, grid: {}, table: {} },
+}: ViewTypeMenuProps ) {
+	const { view, onChangeView } = useContext( DataViewsContext );
+	const availableLayouts = Object.keys( defaultLayouts );
+	if ( availableLayouts.length <= 1 ) {
+		return null;
+	}
+	const activeView = VIEW_LAYOUTS.find( ( v ) => view.type === v.type );
+	return (
+		<DropdownMenuV2
+			trigger={
+				<Button
+					size="compact"
+					icon={ activeView?.icon }
+					label={ __( 'Layout' ) }
+				/>
+			}
+		>
+			{ availableLayouts.map( ( layout ) => {
+				const config = VIEW_LAYOUTS.find( ( v ) => v.type === layout );
+				if ( ! config ) {
+					return null;
+				}
+				return (
+					<DropdownMenuV2.RadioItem
+						key={ layout }
+						value={ layout }
+						name="view-actions-available-view"
+						checked={ layout === view.type }
+						hideOnClick
+						onChange={ ( e: ChangeEvent< HTMLInputElement > ) => {
+							switch ( e.target.value ) {
+								case 'list':
+								case 'grid':
+								case 'table':
+									return onChangeView( {
+										...view,
+										type: e.target.value,
+										...defaultLayouts[ e.target.value ],
+									} );
+							}
+							warning( 'Invalid dataview' );
+						} }
+					>
+						<DropdownMenuV2.ItemLabel>
+							{ config.label }
+						</DropdownMenuV2.ItemLabel>
+					</DropdownMenuV2.RadioItem>
+				);
+			} ) }
+		</DropdownMenuV2>
+	);
+}
+
+function SortFieldControl() {
+	const { view, fields, onChangeView } = useContext( DataViewsContext );
+	const orderOptions = useMemo( () => {
+		const sortableFields = fields.filter(
+			( field ) => field.enableSorting !== false
+		);
+		return sortableFields.map( ( field ) => {
+			return {
+				label: field.label,
+				value: field.id,
+			};
+		} );
+	}, [ fields ] );
+
+	return (
+		<SelectControl
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			label={ __( 'Sort by' ) }
+			value={ view.sort?.field }
+			options={ orderOptions }
+			onChange={ ( value: string ) => {
+				onChangeView( {
+					...view,
+					sort: {
+						direction: view?.sort?.direction || 'desc',
+						field: value,
+					},
+				} );
+			} }
+		/>
+	);
+}
+
+function SortDirectionControl() {
+	const { view, fields, onChangeView } = useContext( DataViewsContext );
+
+	const sortableFields = fields.filter(
+		( field ) => field.enableSorting !== false
+	);
+	if ( sortableFields.length === 0 ) {
+		return null;
+	}
+
+	let value = view.sort?.direction;
+	if ( ! value && view.sort?.field ) {
+		value = 'desc';
+	}
+	return (
+		<ToggleGroupControl
+			className="dataviews-view-config__sort-direction"
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			isBlock
+			label={ __( 'Order' ) }
+			value={ value }
+			onChange={ ( newDirection ) => {
+				if ( newDirection === 'asc' || newDirection === 'desc' ) {
+					onChangeView( {
+						...view,
+						sort: {
+							direction: newDirection,
+							field:
+								view.sort?.field ||
+								// If there is no field assigned as the sorting field assign the first sortable field.
+								fields.find(
+									( field ) => field.enableSorting !== false
+								)?.id ||
+								'',
+						},
+					} );
+					return;
+				}
+				warning( 'Invalid direction' );
+			} }
+		>
+			{ SORTING_DIRECTIONS.map( ( direction ) => {
+				return (
+					<ToggleGroupControlOptionIcon
+						key={ direction }
+						value={ direction }
+						icon={ sortIcons[ direction ] }
+						label={ sortLabels[ direction ] }
+					/>
+				);
+			} ) }
+		</ToggleGroupControl>
+	);
+}
+
+const PAGE_SIZE_VALUES = [ 10, 20, 50, 100 ];
+function ItemsPerPageControl() {
+	const { view, onChangeView } = useContext( DataViewsContext );
+	return (
+		<ToggleGroupControl
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			isBlock
+			label={ __( 'Items per page' ) }
+			value={ view.perPage || 10 }
+			disabled={ ! view?.sort?.field }
+			onChange={ ( newItemsPerPage ) => {
+				const newItemsPerPageNumber =
+					typeof newItemsPerPage === 'number' ||
+					newItemsPerPage === undefined
+						? newItemsPerPage
+						: parseInt( newItemsPerPage, 10 );
+				onChangeView( {
+					...view,
+					perPage: newItemsPerPageNumber,
+					page: 1,
+				} );
+			} }
+		>
+			{ PAGE_SIZE_VALUES.map( ( value ) => {
+				return (
+					<ToggleGroupControlOption
+						key={ value }
+						value={ value }
+						label={ value.toString() }
+					/>
+				);
+			} ) }
+		</ToggleGroupControl>
+	);
+}
+
+interface FieldItemProps {
+	id: any;
+	label: string;
+	index: number;
+	isVisible: boolean;
+	isHidable: boolean;
+}
+
+function FieldItem( {
+	field: { id, label, index, isVisible, isHidable },
+	fields,
+	view,
+	onChangeView,
+}: {
+	field: FieldItemProps;
+	fields: Field< any >[];
+	view: View;
+	onChangeView: ( view: View ) => void;
+} ) {
+	const visibleFieldIds = getVisibleFieldIds( view, fields );
+
+	return (
+		<Item key={ id }>
+			<HStack
+				expanded
+				className={ `dataviews-field-control__field dataviews-field-control__field-${ id }` }
+			>
+				<span>{ label }</span>
+				<HStack
+					justify="flex-end"
+					expanded={ false }
+					className="dataviews-field-control__actions"
+				>
+					{ view.type === LAYOUT_TABLE && isVisible && (
+						<>
+							<Button
+								disabled={ index < 1 }
+								accessibleWhenDisabled
+								size="compact"
+								onClick={ () => {
+									onChangeView( {
+										...view,
+										fields: [
+											...( visibleFieldIds.slice(
+												0,
+												index - 1
+											) ?? [] ),
+											id,
+											visibleFieldIds[ index - 1 ],
+											...visibleFieldIds.slice(
+												index + 1
+											),
+										],
+									} );
+								} }
+								icon={ chevronUp }
+								label={ sprintf(
+									/* translators: %s: field label */
+									__( 'Move %s up' ),
+									label
+								) }
+							/>
+							<Button
+								disabled={ index >= visibleFieldIds.length - 1 }
+								accessibleWhenDisabled
+								size="compact"
+								onClick={ () => {
+									onChangeView( {
+										...view,
+										fields: [
+											...( visibleFieldIds.slice(
+												0,
+												index
+											) ?? [] ),
+											visibleFieldIds[ index + 1 ],
+											id,
+											...visibleFieldIds.slice(
+												index + 2
+											),
+										],
+									} );
+								} }
+								icon={ chevronDown }
+								label={ sprintf(
+									/* translators: %s: field label */
+									__( 'Move %s down' ),
+									label
+								) }
+							/>{ ' ' }
+						</>
+					) }
+					<Button
+						className="dataviews-field-control__field-visibility-button"
+						disabled={ ! isHidable }
+						accessibleWhenDisabled
+						size="compact"
+						onClick={ () => {
+							onChangeView( {
+								...view,
+								fields: isVisible
+									? visibleFieldIds.filter(
+											( fieldId ) => fieldId !== id
+									  )
+									: [ ...visibleFieldIds, id ],
+							} );
+							// Focus the visibility button to avoid focus loss.
+							// Our code is safe against the component being unmounted, so we don't need to worry about cleaning the timeout.
+							// eslint-disable-next-line @wordpress/react-no-unsafe-timeout
+							setTimeout( () => {
+								const element = document.querySelector(
+									`.dataviews-field-control__field-${ id } .dataviews-field-control__field-visibility-button`
+								);
+								if ( element instanceof HTMLElement ) {
+									element.focus();
+								}
+							}, 50 );
+						} }
+						icon={ isVisible ? unseen : seen }
+						label={
+							isVisible
+								? sprintf(
+										/* translators: %s: field label */
+										__( 'Hide %s' ),
+										label
+								  )
+								: sprintf(
+										/* translators: %s: field label */
+										__( 'Show %s' ),
+										label
+								  )
+						}
+					/>
+				</HStack>
+			</HStack>
+		</Item>
+	);
+}
+
+function FieldControl() {
+	const { view, fields, onChangeView } = useContext( DataViewsContext );
+
+	const visibleFieldIds = useMemo(
+		() => getVisibleFieldIds( view, fields ),
+		[ view, fields ]
+	);
+	const hiddenFieldIds = useMemo(
+		() => getHiddenFieldIds( view, fields ),
+		[ view, fields ]
+	);
+	const notHidableFieldIds = useMemo(
+		() => getNotHidableFieldIds( view ),
+		[ view ]
+	);
+
+	const visibleFields = fields
+		.filter( ( { id } ) => visibleFieldIds.includes( id ) )
+		.map( ( { id, label, enableHiding } ) => {
+			return {
+				id,
+				label,
+				index: visibleFieldIds.indexOf( id ),
+				isVisible: true,
+				isHidable: notHidableFieldIds.includes( id )
+					? false
+					: enableHiding,
+			};
+		} );
+	if ( view.type === LAYOUT_TABLE && view.layout?.combinedFields ) {
+		view.layout.combinedFields.forEach( ( { id, label } ) => {
+			visibleFields.push( {
+				id,
+				label,
+				index: visibleFieldIds.indexOf( id ),
+				isVisible: true,
+				isHidable: notHidableFieldIds.includes( id ),
+			} );
+		} );
+	}
+	visibleFields.sort( ( a, b ) => a.index - b.index );
+
+	const hiddenFields = fields
+		.filter( ( { id } ) => hiddenFieldIds.includes( id ) )
+		.map( ( { id, label, enableHiding }, index ) => {
+			return {
+				id,
+				label,
+				index,
+				isVisible: false,
+				isHidable: enableHiding,
+			};
+		} );
+
+	if ( ! visibleFields?.length && ! hiddenFields?.length ) {
+		return null;
+	}
+
+	return (
+		<VStack spacing={ 6 } className="dataviews-field-control">
+			{ !! visibleFields?.length && (
+				<ItemGroup isBordered isSeparated>
+					{ visibleFields.map( ( field ) => (
+						<FieldItem
+							key={ field.id }
+							field={ field }
+							fields={ fields }
+							view={ view }
+							onChangeView={ onChangeView }
+						/>
+					) ) }
+				</ItemGroup>
+			) }
+			{ !! hiddenFields?.length && (
+				<>
+					<VStack spacing={ 4 }>
+						<BaseControl.VisualLabel style={ { margin: 0 } }>
+							{ __( 'Hidden' ) }
+						</BaseControl.VisualLabel>
+						<ItemGroup isBordered isSeparated>
+							{ hiddenFields.map( ( field ) => (
+								<FieldItem
+									key={ field.id }
+									field={ field }
+									fields={ fields }
+									view={ view }
+									onChangeView={ onChangeView }
+								/>
+							) ) }
+						</ItemGroup>
+					</VStack>
+				</>
+			) }
+		</VStack>
+	);
+}
+
+function SettingsSection( {
+	title,
+	description,
+	children,
+}: {
+	title: string;
+	description?: string;
+	children: React.ReactNode;
+} ) {
+	return (
+		<Grid columns={ 12 } className="dataviews-settings-section" gap={ 4 }>
+			<div className="dataviews-settings-section__sidebar">
+				<Heading
+					level={ 2 }
+					className="dataviews-settings-section__title"
+				>
+					{ title }
+				</Heading>
+				{ description && (
+					<Text
+						variant="muted"
+						className="dataviews-settings-section__description"
+					>
+						{ description }
+					</Text>
+				) }
+			</div>
+			<Grid
+				columns={ 8 }
+				gap={ 4 }
+				className="dataviews-settings-section__content"
+			>
+				{ children }
+			</Grid>
+		</Grid>
+	);
+}
+
+function DataviewsViewConfigDropdown( {
+	density,
+	setDensity,
+}: {
+	density: number;
+	setDensity: React.Dispatch< React.SetStateAction< number > >;
+} ) {
+	const { view } = useContext( DataViewsContext );
+	const popoverId = useInstanceId(
+		_DataViewsViewConfig,
+		'dataviews-view-config-dropdown'
+	);
+
+	return (
+		<Dropdown
+			popoverProps={ {
+				...DATAVIEWS_CONFIG_POPOVER_PROPS,
+				id: popoverId,
+			} }
+			renderToggle={ ( { onToggle, isOpen } ) => {
+				return (
+					<Button
+						size="compact"
+						icon={ cog }
+						label={ _x( 'View options', 'View is used as a noun' ) }
+						onClick={ onToggle }
+						aria-expanded={ isOpen ? 'true' : 'false' }
+						aria-controls={ popoverId }
+					/>
+				);
+			} }
+			renderContent={ () => (
+				<DropdownContentWrapper paddingSize="medium">
+					<VStack className="dataviews-view-config" spacing={ 6 }>
+						<SettingsSection title={ __( 'Appearance' ) }>
+							<HStack expanded className="is-divided-in-two">
+								<SortFieldControl />
+								<SortDirectionControl />
+							</HStack>
+							{ view.type === LAYOUT_GRID && (
+								<DensityPicker
+									density={ density }
+									setDensity={ setDensity }
+								/>
+							) }
+							<ItemsPerPageControl />
+						</SettingsSection>
+						<SettingsSection title={ __( 'Properties' ) }>
+							<FieldControl />
+						</SettingsSection>
+					</VStack>
+				</DropdownContentWrapper>
+			) }
+		/>
+	);
+}
+
+function _DataViewsViewConfig( {
+	density,
+	setDensity,
+	defaultLayouts = { list: {}, grid: {}, table: {} },
+}: {
+	density: number;
+	setDensity: React.Dispatch< React.SetStateAction< number > >;
+	defaultLayouts?: SupportedLayouts;
+} ) {
+	return (
+		<>
+			<ViewTypeMenu defaultLayouts={ defaultLayouts } />
+			<DataviewsViewConfigDropdown
+				density={ density }
+				setDensity={ setDensity }
+			/>
+		</>
+	);
+}
+
+const DataViewsViewConfig = memo( _DataViewsViewConfig );
+
+export default DataViewsViewConfig;
diff --git a/packages/dataviews/src/components/dataviews-view-config/style.scss b/packages/dataviews/src/components/dataviews-view-config/style.scss
new file mode 100644
index 00000000000000..7fff110337ee3a
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews-view-config/style.scss
@@ -0,0 +1,69 @@
+.dataviews-view-config {
+	width: 320px;
+	/* stylelint-disable-next-line property-no-unknown -- the linter needs to be updated to accepted the container-type property */
+	container-type: inline-size;
+	font-size: $default-font-size;
+	line-height: $default-line-height;
+}
+
+.dataviews-view-config__sort-direction .components-toggle-group-control-option-base {
+	text-transform: uppercase;
+}
+
+.dataviews-settings-section__title.dataviews-settings-section__title {
+	line-height: $grid-unit-30;
+	font-size: 15px;
+}
+
+.dataviews-settings-section__sidebar {
+	grid-column: span 4;
+}
+
+.dataviews-settings-section__content,
+.dataviews-settings-section__content > * {
+	grid-column: span 8;
+}
+
+.dataviews-settings-section__content .is-divided-in-two {
+	display: contents;
+	& > * {
+		grid-column: span 4;
+	}
+}
+
+.dataviews-settings-section:has(.dataviews-settings-section__content:empty) {
+	display: none;
+}
+
+/* stylelint-disable-next-line scss/at-rule-no-unknown -- '@container' not globally permitted */
+@container (max-width: 500px) {
+	.dataviews-settings-section.dataviews-settings-section {
+		grid-template-columns: repeat(2, 1fr);
+		.dataviews-settings-section__sidebar {
+			grid-column: span 2;
+		}
+
+		.dataviews-settings-section__content {
+			grid-column: span 2;
+		}
+	}
+}
+.dataviews-field-control__field {
+	height: $grid-unit-40;
+}
+
+.dataviews-field-control__actions {
+	position: absolute;
+	top: -9999em;
+}
+.dataviews-field-control__actions.dataviews-field-control__actions {
+	gap: $grid-unit-05;
+}
+
+.dataviews-field-control__field:hover,
+.dataviews-field-control__field:focus-within {
+	.dataviews-field-control__actions {
+		position: unset;
+		top: unset;
+	}
+}
diff --git a/packages/dataviews/src/components/dataviews/index.tsx b/packages/dataviews/src/components/dataviews/index.tsx
new file mode 100644
index 00000000000000..da60ab15ecadec
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews/index.tsx
@@ -0,0 +1,157 @@
+/**
+ * External dependencies
+ */
+import type { ReactNode } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import { __experimentalHStack as HStack } from '@wordpress/components';
+import { useMemo, useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import DataViewsContext from '../dataviews-context';
+import {
+	default as DataViewsFilters,
+	useFilters,
+	FilterVisibilityToggle,
+} from '../dataviews-filters';
+import DataViewsLayout from '../dataviews-layout';
+import DataViewsFooter from '../dataviews-footer';
+import DataViewsSearch from '../dataviews-search';
+import DataViewsViewConfig from '../dataviews-view-config';
+import { normalizeFields } from '../../normalize-fields';
+import type { Action, Field, View, SupportedLayouts } from '../../types';
+import type { SelectionOrUpdater } from '../../private-types';
+
+type ItemWithId = { id: string };
+
+type DataViewsProps< Item > = {
+	view: View;
+	onChangeView: ( view: View ) => void;
+	fields: Field< Item >[];
+	search?: boolean;
+	searchLabel?: string;
+	actions?: Action< Item >[];
+	data: Item[];
+	isLoading?: boolean;
+	paginationInfo: {
+		totalItems: number;
+		totalPages: number;
+	};
+	defaultLayouts: SupportedLayouts;
+	selection?: string[];
+	onChangeSelection?: ( items: string[] ) => void;
+	header?: ReactNode;
+} & ( Item extends ItemWithId
+	? { getItemId?: ( item: Item ) => string }
+	: { getItemId: ( item: Item ) => string } );
+
+const defaultGetItemId = ( item: ItemWithId ) => item.id;
+
+export default function DataViews< Item >( {
+	view,
+	onChangeView,
+	fields,
+	search = true,
+	searchLabel = undefined,
+	actions = [],
+	data,
+	getItemId = defaultGetItemId,
+	isLoading = false,
+	paginationInfo,
+	defaultLayouts,
+	selection: selectionProperty,
+	onChangeSelection,
+	header,
+}: DataViewsProps< Item > ) {
+	const [ selectionState, setSelectionState ] = useState< string[] >( [] );
+	const [ density, setDensity ] = useState< number >( 0 );
+	const isUncontrolled =
+		selectionProperty === undefined || onChangeSelection === undefined;
+	const selection = isUncontrolled ? selectionState : selectionProperty;
+	const [ openedFilter, setOpenedFilter ] = useState< string | null >( null );
+	function setSelectionWithChange( value: SelectionOrUpdater ) {
+		const newValue =
+			typeof value === 'function' ? value( selection ) : value;
+		if ( isUncontrolled ) {
+			setSelectionState( newValue );
+		}
+		if ( onChangeSelection ) {
+			onChangeSelection( newValue );
+		}
+	}
+	const _fields = useMemo( () => normalizeFields( fields ), [ fields ] );
+	const _selection = useMemo( () => {
+		return selection.filter( ( id ) =>
+			data.some( ( item ) => getItemId( item ) === id )
+		);
+	}, [ selection, data, getItemId ] );
+
+	const filters = useFilters( _fields, view );
+	const [ isShowingFilter, setIsShowingFilter ] = useState< boolean >( () =>
+		( filters || [] ).some( ( filter ) => filter.isPrimary )
+	);
+
+	return (
+		<DataViewsContext.Provider
+			value={ {
+				view,
+				onChangeView,
+				fields: _fields,
+				actions,
+				data,
+				isLoading,
+				paginationInfo,
+				selection: _selection,
+				onChangeSelection: setSelectionWithChange,
+				openedFilter,
+				setOpenedFilter,
+				getItemId,
+				density,
+			} }
+		>
+			<div className="dataviews-wrapper">
+				<HStack
+					alignment="top"
+					justify="space-between"
+					className="dataviews__view-actions"
+					spacing={ 1 }
+				>
+					<HStack
+						justify="start"
+						expanded={ false }
+						className="dataviews__search"
+					>
+						{ search && <DataViewsSearch label={ searchLabel } /> }
+						<FilterVisibilityToggle
+							filters={ filters }
+							view={ view }
+							onChangeView={ onChangeView }
+							setOpenedFilter={ setOpenedFilter }
+							setIsShowingFilter={ setIsShowingFilter }
+							isShowingFilter={ isShowingFilter }
+						/>
+					</HStack>
+					<HStack
+						spacing={ 1 }
+						expanded={ false }
+						style={ { flexShrink: 0 } }
+					>
+						<DataViewsViewConfig
+							defaultLayouts={ defaultLayouts }
+							density={ density }
+							setDensity={ setDensity }
+						/>
+						{ header }
+					</HStack>
+				</HStack>
+				{ isShowingFilter && <DataViewsFilters /> }
+				<DataViewsLayout />
+				<DataViewsFooter />
+			</div>
+		</DataViewsContext.Provider>
+	);
+}
diff --git a/packages/dataviews/src/components/dataviews/stories/fixtures.tsx b/packages/dataviews/src/components/dataviews/stories/fixtures.tsx
new file mode 100644
index 00000000000000..ff098209b34684
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews/stories/fixtures.tsx
@@ -0,0 +1,698 @@
+/**
+ * WordPress dependencies
+ */
+import { trash, image, Icon, category } from '@wordpress/icons';
+import {
+	Button,
+	__experimentalText as Text,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import type { Field, Action } from '../../../types';
+
+export type Theme = {
+	slug: string;
+	name: string;
+	description: string;
+	requires: string;
+	tested: string;
+	tags: string[];
+};
+
+export type SpaceObject = {
+	id: number;
+	title: string;
+	description: string;
+	image: string;
+	type: string;
+	categories: string[];
+	satellites: number;
+	date: string;
+};
+
+export const data: SpaceObject[] = [
+	{
+		id: 1,
+		title: 'Apollo',
+		description: 'Apollo description',
+		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
+		type: 'Not a planet',
+		categories: [ 'Space', 'NASA' ],
+		satellites: 0,
+		date: '2021-01-01T00:00:00Z',
+	},
+	{
+		id: 2,
+		title: 'Space',
+		description: 'Space description',
+		image: 'https://live.staticflickr.com/5678/21911065441_92e2d44708_b.jpg',
+		type: 'Not a planet',
+		categories: [ 'Space' ],
+		satellites: 0,
+		date: '2019-01-02T00:00:00Z',
+	},
+	{
+		id: 3,
+		title: 'NASA',
+		description: 'NASA photo',
+		image: 'https://live.staticflickr.com/742/21712365770_8f70a2c91e_b.jpg',
+		type: 'Not a planet',
+		categories: [ 'NASA' ],
+		satellites: 0,
+		date: '2025-01-03T00:00:00Z',
+	},
+	{
+		id: 4,
+		title: 'Neptune',
+		description: 'Neptune description',
+		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
+		type: 'Ice giant',
+		categories: [ 'Space', 'Planet', 'Solar system' ],
+		satellites: 14,
+		date: '2020-01-01T00:00:00Z',
+	},
+	{
+		id: 5,
+		title: 'Mercury',
+		description: 'Mercury description',
+		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
+		type: 'Terrestrial',
+		categories: [ 'Space', 'Planet', 'Solar system' ],
+		satellites: 0,
+		date: '2020-01-02T01:00:00Z',
+	},
+	{
+		id: 6,
+		title: 'Venus',
+		description: 'La planète Vénus',
+		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
+		type: 'Terrestrial',
+		categories: [ 'Space', 'Planet', 'Solar system' ],
+		satellites: 0,
+		date: '2020-01-02T00:00:00Z',
+	},
+	{
+		id: 7,
+		title: 'Earth',
+		description: 'Earth description',
+		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
+		type: 'Terrestrial',
+		categories: [ 'Space', 'Planet', 'Solar system' ],
+		satellites: 1,
+		date: '2023-01-03T00:00:00Z',
+	},
+	{
+		id: 8,
+		title: 'Mars',
+		description: 'Mars description',
+		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
+		type: 'Terrestrial',
+		categories: [ 'Space', 'Planet', 'Solar system' ],
+		satellites: 2,
+		date: '2020-01-01T00:00:00Z',
+	},
+	{
+		id: 9,
+		title: 'Jupiter',
+		description: 'Jupiter description',
+		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
+		type: 'Gas giant',
+		categories: [ 'Space', 'Planet', 'Solar system' ],
+		satellites: 95,
+		date: '2017-01-01T00:01:00Z',
+	},
+	{
+		id: 10,
+		title: 'Saturn',
+		description: 'Saturn description',
+		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
+		type: 'Gas giant',
+		categories: [ 'Space', 'Planet', 'Solar system' ],
+		satellites: 146,
+		date: '2020-02-01T00:02:00Z',
+	},
+	{
+		id: 11,
+		title: 'Uranus',
+		description: 'Uranus description',
+		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
+		type: 'Ice giant',
+		categories: [ 'Space', 'Ice giant', 'Solar system' ],
+		satellites: 28,
+		date: '2020-03-01T00:00:00Z',
+	},
+];
+
+export const themeData: Theme[] = [
+	{
+		slug: 'twentyeleven',
+		name: 'Twenty Eleven',
+		description:
+			'The 2011 theme for WordPress is sophisticated, lightweight, and adaptable. Make it yours with a custom menu, header image, and background -- then go further with available theme options for light or dark color scheme, custom link colors, and three layout choices. Twenty Eleven comes equipped with a Showcase page template that transforms your front page into a showcase to show off your best content, widget support galore (sidebar, three footer areas, and a Showcase page widget area), and a custom "Ephemera" widget to display your Aside, Link, Quote, or Status posts. Included are styles for print and for the admin editor, support for featured images (as custom header images on posts and pages and as large images on featured "sticky" posts), and special styles for six different post formats.',
+		requires: '3.2',
+		tested: '6.6',
+		tags: [
+			'blog',
+			'one-column',
+			'two-columns',
+			'left-sidebar',
+			'right-sidebar',
+			'custom-background',
+			'custom-colors',
+			'custom-header',
+			'custom-menu',
+			'editor-style',
+			'featured-image-header',
+			'featured-images',
+			'flexible-header',
+			'footer-widgets',
+			'full-width-template',
+			'microformats',
+			'post-formats',
+			'rtl-language-support',
+			'sticky-post',
+			'theme-options',
+			'translation-ready',
+			'block-patterns',
+		],
+	},
+	{
+		slug: 'twentyfifteen',
+		name: 'Twenty Fifteen',
+		description:
+			"Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty Fifteen's simple, straightforward typography is readable on a wide variety of screen sizes, and suitable for multiple languages. We designed it using a mobile-first approach, meaning your content takes center-stage, regardless of whether your visitors arrive by smartphone, tablet, laptop, or desktop computer.",
+		requires: '4.1',
+		tested: '6.6',
+		tags: [
+			'blog',
+			'two-columns',
+			'left-sidebar',
+			'accessibility-ready',
+			'custom-background',
+			'custom-colors',
+			'custom-header',
+			'custom-logo',
+			'custom-menu',
+			'editor-style',
+			'featured-images',
+			'microformats',
+			'post-formats',
+			'rtl-language-support',
+			'sticky-post',
+			'threaded-comments',
+			'translation-ready',
+			'block-patterns',
+		],
+	},
+	{
+		slug: 'twentyfourteen',
+		name: 'Twenty Fourteen',
+		description:
+			"In 2014, our default theme lets you create a responsive magazine website with a sleek, modern design. Feature your favorite homepage content in either a grid or a slider. Use the three widget areas to customize your website, and change your content's layout with a full-width page template and a contributor page to show off your authors. Creating a magazine website with WordPress has never been easier.",
+		requires: '3.6',
+		tested: '6.6',
+		tags: [
+			'blog',
+			'news',
+			'two-columns',
+			'three-columns',
+			'left-sidebar',
+			'right-sidebar',
+			'custom-background',
+			'custom-header',
+			'custom-menu',
+			'editor-style',
+			'featured-images',
+			'flexible-header',
+			'footer-widgets',
+			'full-width-template',
+			'microformats',
+			'post-formats',
+			'rtl-language-support',
+			'sticky-post',
+			'theme-options',
+			'translation-ready',
+			'accessibility-ready',
+			'block-patterns',
+		],
+	},
+	{
+		slug: 'twentynineteen',
+		name: 'Twenty Nineteen',
+		description:
+			"Our 2019 default theme is designed to show off the power of the block editor. It features custom styles for all the default blocks, and is built so that what you see in the editor looks like what you'll see on your website. Twenty Nineteen is designed to be adaptable to a wide range of websites, whether you’re running a photo blog, launching a new business, or supporting a non-profit. Featuring ample whitespace and modern sans-serif headlines paired with classic serif body text, it's built to be beautiful on all screen sizes.",
+		requires: '4.7',
+		tested: '6.6',
+		tags: [
+			'one-column',
+			'accessibility-ready',
+			'custom-colors',
+			'custom-menu',
+			'custom-logo',
+			'editor-style',
+			'featured-images',
+			'footer-widgets',
+			'rtl-language-support',
+			'sticky-post',
+			'threaded-comments',
+			'translation-ready',
+			'block-patterns',
+		],
+	},
+	{
+		slug: 'twentyseventeen',
+		name: 'Twenty Seventeen',
+		description:
+			'Twenty Seventeen brings your site to life with header video and immersive featured images. With a focus on business sites, it features multiple sections on the front page as well as widgets, navigation and social menus, a logo, and more. Personalize its asymmetrical grid with a custom color scheme and showcase your multimedia content with post formats. Our default theme for 2017 works great in many languages, for any abilities, and on any device.',
+		requires: '4.7',
+		tested: '6.6',
+		tags: [
+			'one-column',
+			'two-columns',
+			'right-sidebar',
+			'flexible-header',
+			'accessibility-ready',
+			'custom-colors',
+			'custom-header',
+			'custom-menu',
+			'custom-logo',
+			'editor-style',
+			'featured-images',
+			'footer-widgets',
+			'post-formats',
+			'rtl-language-support',
+			'sticky-post',
+			'theme-options',
+			'threaded-comments',
+			'translation-ready',
+			'block-patterns',
+		],
+	},
+	{
+		slug: 'twentysixteen',
+		name: 'Twenty Sixteen',
+		description:
+			'Twenty Sixteen is a modernized take on an ever-popular WordPress layout — the horizontal masthead with an optional right sidebar that works perfectly for blogs and websites. It has custom color options with beautiful default color schemes, a harmonious fluid grid using a mobile-first approach, and impeccable polish in every detail. Twenty Sixteen will make your WordPress look beautiful everywhere.',
+		requires: '4.4',
+		tested: '6.6',
+		tags: [
+			'one-column',
+			'two-columns',
+			'right-sidebar',
+			'accessibility-ready',
+			'custom-background',
+			'custom-colors',
+			'custom-header',
+			'custom-menu',
+			'editor-style',
+			'featured-images',
+			'flexible-header',
+			'microformats',
+			'post-formats',
+			'rtl-language-support',
+			'sticky-post',
+			'threaded-comments',
+			'translation-ready',
+			'blog',
+			'block-patterns',
+		],
+	},
+	{
+		slug: 'twentyten',
+		name: 'Twenty Ten',
+		description:
+			'The 2010 theme for WordPress is stylish, customizable, simple, and readable -- make it yours with a custom menu, header image, and background. Twenty Ten supports six widgetized areas (two in the sidebar, four in the footer) and featured images (thumbnails for gallery posts and custom header images for posts and pages). It includes stylesheets for print and the admin Visual Editor, special styles for posts in the "Asides" and "Gallery" categories, and has an optional one-column page template that removes the sidebar.',
+		requires: '5.6',
+		tested: '6.6',
+		tags: [
+			'blog',
+			'two-columns',
+			'custom-header',
+			'custom-background',
+			'threaded-comments',
+			'sticky-post',
+			'translation-ready',
+			'microformats',
+			'rtl-language-support',
+			'editor-style',
+			'custom-menu',
+			'flexible-header',
+			'featured-images',
+			'footer-widgets',
+			'featured-image-header',
+			'block-patterns',
+		],
+	},
+	{
+		slug: 'twentythirteen',
+		name: 'Twenty Thirteen',
+		description:
+			'The 2013 theme for WordPress takes us back to the blog, featuring a full range of post formats, each displayed beautifully in their own unique way. Design details abound, starting with a vibrant color scheme and matching header images, beautiful typography and icons, and a flexible layout that looks great on any device, big or small.',
+		requires: '3.6',
+		tested: '6.6',
+		tags: [
+			'blog',
+			'one-column',
+			'two-columns',
+			'right-sidebar',
+			'custom-header',
+			'custom-menu',
+			'editor-style',
+			'featured-images',
+			'footer-widgets',
+			'microformats',
+			'post-formats',
+			'rtl-language-support',
+			'sticky-post',
+			'translation-ready',
+			'accessibility-ready',
+			'block-patterns',
+		],
+	},
+	{
+		slug: 'twentytwelve',
+		name: 'Twenty Twelve',
+		description:
+			'The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.',
+		requires: '3.5',
+		tested: '6.6',
+		tags: [
+			'blog',
+			'one-column',
+			'two-columns',
+			'right-sidebar',
+			'custom-background',
+			'custom-header',
+			'custom-menu',
+			'editor-style',
+			'featured-images',
+			'flexible-header',
+			'footer-widgets',
+			'full-width-template',
+			'microformats',
+			'post-formats',
+			'rtl-language-support',
+			'sticky-post',
+			'theme-options',
+			'translation-ready',
+			'block-patterns',
+		],
+	},
+	{
+		slug: 'twentytwenty',
+		name: 'Twenty Twenty',
+		description:
+			'Our default theme for 2020 is designed to take full advantage of the flexibility of the block editor. Organizations and businesses have the ability to create dynamic landing pages with endless layouts using the group and column blocks. The centered content column and fine-tuned typography also makes it perfect for traditional blogs. Complete editor styles give you a good idea of what your content will look like, even before you publish. You can give your site a personal touch by changing the background colors and the accent color in the Customizer. The colors of all elements on your site are automatically calculated based on the colors you pick, ensuring a high, accessible color contrast for your visitors.',
+		requires: '4.7',
+		tested: '6.6',
+		tags: [
+			'blog',
+			'one-column',
+			'custom-background',
+			'custom-colors',
+			'custom-logo',
+			'custom-menu',
+			'editor-style',
+			'featured-images',
+			'footer-widgets',
+			'full-width-template',
+			'rtl-language-support',
+			'sticky-post',
+			'theme-options',
+			'threaded-comments',
+			'translation-ready',
+			'block-patterns',
+			'block-styles',
+			'wide-blocks',
+			'accessibility-ready',
+		],
+	},
+	{
+		slug: 'twentytwentyfour',
+		name: 'Twenty Twenty-Four',
+		description:
+			'Twenty Twenty-Four is designed to be flexible, versatile and applicable to any website. Its collection of templates and patterns tailor to different needs, such as presenting a business, blogging and writing or showcasing work. A multitude of possibilities open up with just a few adjustments to color and typography. Twenty Twenty-Four comes with style variations and full page designs to help speed up the site building process, is fully compatible with the site editor, and takes advantage of new design tools introduced in WordPress 6.4.',
+		requires: '6.4',
+		tested: '6.6',
+		tags: [
+			'one-column',
+			'custom-colors',
+			'custom-menu',
+			'custom-logo',
+			'editor-style',
+			'featured-images',
+			'full-site-editing',
+			'block-patterns',
+			'rtl-language-support',
+			'sticky-post',
+			'threaded-comments',
+			'translation-ready',
+			'wide-blocks',
+			'block-styles',
+			'style-variations',
+			'accessibility-ready',
+			'blog',
+			'portfolio',
+			'news',
+		],
+	},
+	{
+		slug: 'twentytwentyone',
+		name: 'Twenty Twenty-One',
+		description:
+			'Twenty Twenty-One is a blank canvas for your ideas and it makes the block editor your best brush. With new block patterns, which allow you to create a beautiful layout in a matter of seconds, this theme’s soft colors and eye-catching — yet timeless — design will let your work shine. Take it for a spin! See how Twenty Twenty-One elevates your portfolio, business website, or personal blog.',
+		requires: '5.3',
+		tested: '6.6',
+		tags: [
+			'one-column',
+			'accessibility-ready',
+			'custom-colors',
+			'custom-menu',
+			'custom-logo',
+			'editor-style',
+			'featured-images',
+			'footer-widgets',
+			'block-patterns',
+			'rtl-language-support',
+			'sticky-post',
+			'threaded-comments',
+			'translation-ready',
+			'blog',
+			'portfolio',
+		],
+	},
+	{
+		slug: 'twentytwentythree',
+		name: 'Twenty Twenty-Three',
+		description:
+			'Twenty Twenty-Three is designed to take advantage of the new design tools introduced in WordPress 6.1. With a clean, blank base as a starting point, this default theme includes ten diverse style variations created by members of the WordPress community. Whether you want to build a complex or incredibly simple website, you can do it quickly and intuitively through the bundled styles or dive into creation and full customization yourself.',
+		requires: '6.1',
+		tested: '6.6',
+		tags: [
+			'one-column',
+			'custom-colors',
+			'custom-menu',
+			'custom-logo',
+			'editor-style',
+			'featured-images',
+			'full-site-editing',
+			'block-patterns',
+			'rtl-language-support',
+			'sticky-post',
+			'threaded-comments',
+			'translation-ready',
+			'wide-blocks',
+			'block-styles',
+			'style-variations',
+			'accessibility-ready',
+			'blog',
+			'portfolio',
+			'news',
+		],
+	},
+	{
+		slug: 'twentytwentytwo',
+		name: 'Twenty Twenty-Two',
+		description:
+			'Built on a solidly designed foundation, Twenty Twenty-Two embraces the idea that everyone deserves a truly unique website. The theme’s subtle styles are inspired by the diversity and versatility of birds: its typography is lightweight yet strong, its color palette is drawn from nature, and its layout elements sit gently on the page. The true richness of Twenty Twenty-Two lies in its opportunity for customization. The theme is built to take advantage of the Site Editor features introduced in WordPress 5.9, which means that colors, typography, and the layout of every single page on your site can be customized to suit your vision. It also includes dozens of block patterns, opening the door to a wide range of professionally designed layouts in just a few clicks. Whether you’re building a single-page website, a blog, a business website, or a portfolio, Twenty Twenty-Two will help you create a site that is uniquely yours.',
+		requires: '5.9',
+		tested: '6.6',
+		tags: [
+			'one-column',
+			'custom-colors',
+			'custom-menu',
+			'custom-logo',
+			'editor-style',
+			'featured-images',
+			'full-site-editing',
+			'block-patterns',
+			'rtl-language-support',
+			'sticky-post',
+			'threaded-comments',
+			'style-variations',
+			'wide-blocks',
+			'block-styles',
+			'accessibility-ready',
+			'blog',
+			'portfolio',
+			'news',
+		],
+	},
+];
+
+export const themeFields: Field< Theme >[] = [
+	{ id: 'slug', label: 'Slug' },
+	{ id: 'name', label: 'Name' },
+	{
+		id: 'description',
+		label: 'Description',
+		render: ( { item } ) => (
+			<span className="theme-field-description">
+				{ item.description }
+			</span>
+		),
+	},
+	{ id: 'requires', label: 'Requires at least' },
+	{ id: 'tested', label: 'Tested up to' },
+	{
+		id: 'tags',
+		label: 'Tags',
+		render: ( { item } ) => item.tags.join( ', ' ),
+	},
+];
+
+export const DEFAULT_VIEW = {
+	type: 'table' as const,
+	search: '',
+	page: 1,
+	perPage: 10,
+	layout: {},
+	filters: [],
+};
+
+export const actions: Action< SpaceObject >[] = [
+	{
+		id: 'delete',
+		label: 'Delete item',
+		isPrimary: true,
+		icon: trash,
+		hideModalHeader: true,
+		RenderModal: ( { items, closeModal } ) => {
+			return (
+				<VStack spacing="5">
+					<Text>
+						{ `Are you sure you want to delete "${ items[ 0 ].title }"?` }
+					</Text>
+					<HStack justify="right">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ closeModal }
+						>
+							Cancel
+						</Button>
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							onClick={ closeModal }
+						>
+							Delete
+						</Button>
+					</HStack>
+				</VStack>
+			);
+		},
+	},
+	{
+		id: 'secondary',
+		label: 'Secondary action',
+		callback() {},
+	},
+];
+
+export const fields: Field< SpaceObject >[] = [
+	{
+		label: 'Image',
+		id: 'image',
+		header: (
+			<HStack spacing={ 1 } justify="start">
+				<Icon icon={ image } />
+				<span>Image</span>
+			</HStack>
+		),
+		render: ( { item } ) => {
+			return (
+				<img src={ item.image } alt="" style={ { width: '100%' } } />
+			);
+		},
+		enableSorting: false,
+	},
+	{
+		label: 'Title',
+		id: 'title',
+		enableHiding: false,
+		enableGlobalSearch: true,
+		render: ( { item } ) => {
+			return <a href="#nothing">{ item.title }</a>;
+		},
+	},
+	{
+		id: 'date',
+		label: 'Date',
+		type: 'datetime',
+	},
+	{
+		label: 'Type',
+		id: 'type',
+		enableHiding: false,
+		elements: [
+			{ value: 'Not a planet', label: 'Not a planet' },
+			{ value: 'Ice giant', label: 'Ice giant' },
+			{ value: 'Terrestrial', label: 'Terrestrial' },
+			{ value: 'Gas giant', label: 'Gas giant' },
+		],
+	},
+	{
+		label: 'Satellites',
+		id: 'satellites',
+		type: 'integer',
+		enableSorting: true,
+	},
+	{
+		label: 'Description',
+		id: 'description',
+		enableSorting: false,
+		enableGlobalSearch: true,
+	},
+	{
+		label: 'Categories',
+		id: 'categories',
+		header: (
+			<HStack spacing={ 1 } justify="start">
+				<Icon icon={ category } />
+				<span>Categories</span>
+			</HStack>
+		),
+		elements: [
+			{ value: 'Space', label: 'Space' },
+			{ value: 'NASA', label: 'NASA' },
+			{ value: 'Planet', label: 'Planet' },
+			{ value: 'Solar system', label: 'Solar system' },
+			{ value: 'Ice giant', label: 'Ice giant' },
+		],
+		filterBy: {
+			operators: [ 'isAny', 'isNone', 'isAll', 'isNotAll' ],
+		},
+		getValue: ( { item } ) => {
+			return item.categories;
+		},
+		render: ( { item } ) => {
+			return item.categories.join( ',' );
+		},
+		enableSorting: false,
+	},
+];
diff --git a/packages/dataviews/src/components/dataviews/stories/index.story.tsx b/packages/dataviews/src/components/dataviews/stories/index.story.tsx
new file mode 100644
index 00000000000000..3b3e1326115b0e
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews/stories/index.story.tsx
@@ -0,0 +1,186 @@
+/**
+ * WordPress dependencies
+ */
+import { useState, useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import DataViews from '../index';
+import {
+	DEFAULT_VIEW,
+	actions,
+	data,
+	fields,
+	themeData,
+	themeFields,
+} from './fixtures';
+import { LAYOUT_GRID, LAYOUT_LIST, LAYOUT_TABLE } from '../../../constants';
+import { filterSortAndPaginate } from '../../../filter-and-sort-data-view';
+import type { CombinedField, View } from '../../../types';
+
+import './style.css';
+
+const meta = {
+	title: 'DataViews/DataViews',
+	component: DataViews,
+};
+export default meta;
+
+const defaultLayouts = {
+	[ LAYOUT_TABLE ]: {
+		layout: {
+			primaryField: 'title',
+			styles: {
+				image: {
+					width: 50,
+				},
+				title: {
+					maxWidth: 400,
+				},
+				type: {
+					maxWidth: 400,
+				},
+				description: {
+					maxWidth: 200,
+				},
+			},
+		},
+	},
+	[ LAYOUT_GRID ]: {
+		layout: {
+			mediaField: 'image',
+			primaryField: 'title',
+		},
+	},
+	[ LAYOUT_LIST ]: {
+		layout: {
+			mediaField: 'image',
+			primaryField: 'title',
+		},
+	},
+};
+
+export const Default = () => {
+	const [ view, setView ] = useState< View >( {
+		...DEFAULT_VIEW,
+		fields: [ 'title', 'description', 'categories' ],
+	} );
+	const { data: shownData, paginationInfo } = useMemo( () => {
+		return filterSortAndPaginate( data, view, fields );
+	}, [ view ] );
+	return (
+		<DataViews
+			getItemId={ ( item ) => item.id.toString() }
+			paginationInfo={ paginationInfo }
+			data={ shownData }
+			view={ view }
+			fields={ fields }
+			onChangeView={ setView }
+			actions={ actions }
+			defaultLayouts={ defaultLayouts }
+		/>
+	);
+};
+
+export const Empty = () => {
+	const [ view, setView ] = useState< View >( {
+		...DEFAULT_VIEW,
+		fields: [ 'title', 'description', 'categories' ],
+	} );
+
+	return (
+		<DataViews
+			getItemId={ ( item ) => item.id.toString() }
+			paginationInfo={ { totalItems: 0, totalPages: 0 } }
+			data={ [] }
+			view={ view }
+			fields={ fields }
+			onChangeView={ setView }
+			actions={ actions }
+			defaultLayouts={ defaultLayouts }
+		/>
+	);
+};
+
+export const FieldsNoSortableNoHidable = () => {
+	const [ view, setView ] = useState< View >( {
+		...DEFAULT_VIEW,
+		fields: [ 'title', 'description', 'categories' ],
+	} );
+	const { data: shownData, paginationInfo } = useMemo( () => {
+		return filterSortAndPaginate( data, view, fields );
+	}, [ view ] );
+
+	const _fields = fields.map( ( field ) => ( {
+		...field,
+		enableSorting: false,
+		enableHiding: false,
+	} ) );
+
+	return (
+		<DataViews
+			getItemId={ ( item ) => item.id.toString() }
+			paginationInfo={ paginationInfo }
+			data={ shownData }
+			view={ view }
+			fields={ _fields }
+			onChangeView={ setView }
+			defaultLayouts={ {
+				table: {},
+			} }
+		/>
+	);
+};
+
+export const CombinedFields = () => {
+	const defaultLayoutsThemes = {
+		table: {
+			fields: [ 'theme', 'requires', 'tested' ],
+			layout: {
+				primaryField: 'name',
+				combinedFields: [
+					{
+						id: 'theme',
+						label: 'Theme',
+						children: [ 'name', 'description' ],
+						direction: 'vertical',
+					},
+				] as CombinedField[],
+				styles: {
+					theme: {
+						maxWidth: 300,
+					},
+				},
+			},
+		},
+		grid: {
+			fields: [ 'description', 'requires', 'tested' ],
+			layout: { primaryField: 'name', columnFields: [ 'description' ] },
+		},
+		list: {
+			fields: [ 'requires', 'tested' ],
+			layout: { primaryField: 'name' },
+		},
+	};
+	const [ view, setView ] = useState< View >( {
+		...DEFAULT_VIEW,
+		fields: defaultLayoutsThemes.table.fields,
+		layout: defaultLayoutsThemes.table.layout,
+	} );
+	const { data: shownData, paginationInfo } = useMemo( () => {
+		return filterSortAndPaginate( themeData, view, themeFields );
+	}, [ view ] );
+
+	return (
+		<DataViews
+			getItemId={ ( item ) => item.name }
+			paginationInfo={ paginationInfo }
+			data={ shownData }
+			view={ view }
+			fields={ themeFields }
+			onChangeView={ setView }
+			defaultLayouts={ defaultLayoutsThemes }
+		/>
+	);
+};
diff --git a/packages/dataviews/src/components/dataviews/stories/style.css b/packages/dataviews/src/components/dataviews/stories/style.css
new file mode 100644
index 00000000000000..7c0c6565a6edf4
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews/stories/style.css
@@ -0,0 +1,4 @@
+.theme-field-description {
+    text-wrap: balance;
+    text-wrap: pretty;
+}
\ No newline at end of file
diff --git a/packages/dataviews/src/components/dataviews/style.scss b/packages/dataviews/src/components/dataviews/style.scss
new file mode 100644
index 00000000000000..aa8fbcfb009c05
--- /dev/null
+++ b/packages/dataviews/src/components/dataviews/style.scss
@@ -0,0 +1,89 @@
+.dataviews-wrapper {
+	height: 100%;
+	overflow: auto;
+	box-sizing: border-box;
+	scroll-padding-bottom: $grid-unit-80;
+	/* stylelint-disable-next-line property-no-unknown -- '@container' not globally permitted */
+	container: dataviews-wrapper / inline-size;
+	display: flex;
+	flex-direction: column;
+	font-size: $default-font-size;
+	line-height: $default-line-height;
+}
+
+.dataviews__view-actions,
+.dataviews-filters__container {
+	box-sizing: border-box;
+	padding: $grid-unit-20 $grid-unit-60;
+	flex-shrink: 0;
+	position: sticky;
+	left: 0;
+	transition: padding ease-out 0.1s;
+	@include reduce-motion("transition");
+}
+
+.dataviews-view-list__primary-field,
+.dataviews-view-grid__primary-field,
+.dataviews-view-table__primary-field {
+	font-size: $default-font-size;
+	font-weight: 500;
+	color: $gray-700;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	width: 100%;
+
+	a {
+		text-decoration: none;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+		display: block;
+		flex-grow: 0;
+		color: $gray-900;
+
+		&:hover {
+			color: var(--wp-admin-theme-color);
+		}
+		@include link-reset();
+	}
+
+	button.components-button.is-link {
+		text-decoration: none;
+		font-weight: inherit;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+		display: block;
+		width: 100%;
+		color: $gray-900;
+		&:hover {
+			color: var(--wp-admin-theme-color);
+		}
+	}
+}
+
+.dataviews-no-results,
+.dataviews-loading {
+	padding: 0 $grid-unit-60;
+	flex-grow: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	transition: padding ease-out 0.1s;
+	@include reduce-motion("transition");
+}
+
+/* stylelint-disable-next-line scss/at-rule-no-unknown -- '@container' not globally permitted */
+@container (max-width: 430px) {
+	.dataviews__view-actions,
+	.dataviews-filters__container {
+		padding: $grid-unit-15 $grid-unit-30;
+	}
+
+	.dataviews-no-results,
+	.dataviews-loading {
+		padding-left: $grid-unit-30;
+		padding-right: $grid-unit-30;
+	}
+}
+
diff --git a/packages/dataviews/src/constants.js b/packages/dataviews/src/constants.js
deleted file mode 100644
index c4d1d9242f08a3..00000000000000
--- a/packages/dataviews/src/constants.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { blockTable, category, drawerLeft } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import ViewTable from './view-table';
-import ViewGrid from './view-grid';
-import ViewList from './view-list';
-
-// Field types.
-export const ENUMERATION_TYPE = 'enumeration';
-
-// Filter operators.
-export const OPERATOR_IN = 'in';
-export const OPERATOR_NOT_IN = 'notIn';
-
-// View layouts.
-export const LAYOUT_TABLE = 'table';
-export const LAYOUT_GRID = 'grid';
-export const LAYOUT_LIST = 'list';
-
-export const VIEW_LAYOUTS = [
-	{
-		type: LAYOUT_TABLE,
-		label: __( 'Table' ),
-		component: ViewTable,
-		icon: blockTable,
-		supports: {
-			preview: false,
-		},
-	},
-	{
-		type: LAYOUT_GRID,
-		label: __( 'Grid' ),
-		component: ViewGrid,
-		icon: category,
-		supports: {
-			preview: false,
-		},
-	},
-	{
-		type: LAYOUT_LIST,
-		label: __( 'List' ),
-		component: ViewList,
-		icon: drawerLeft,
-		supports: {
-			preview: true,
-		},
-	},
-];
diff --git a/packages/dataviews/src/constants.ts b/packages/dataviews/src/constants.ts
new file mode 100644
index 00000000000000..5ae94c7eb4a135
--- /dev/null
+++ b/packages/dataviews/src/constants.ts
@@ -0,0 +1,70 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { arrowDown, arrowUp } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import type { Operator } from './types';
+
+// Filter operators.
+export const OPERATOR_IS = 'is';
+export const OPERATOR_IS_NOT = 'isNot';
+export const OPERATOR_IS_ANY = 'isAny';
+export const OPERATOR_IS_NONE = 'isNone';
+export const OPERATOR_IS_ALL = 'isAll';
+export const OPERATOR_IS_NOT_ALL = 'isNotAll';
+
+export const ALL_OPERATORS = [
+	OPERATOR_IS,
+	OPERATOR_IS_NOT,
+	OPERATOR_IS_ANY,
+	OPERATOR_IS_NONE,
+	OPERATOR_IS_ALL,
+	OPERATOR_IS_NOT_ALL,
+];
+export const OPERATORS: Record< Operator, { key: string; label: string } > = {
+	[ OPERATOR_IS ]: {
+		key: 'is-filter',
+		label: __( 'Is' ),
+	},
+	[ OPERATOR_IS_NOT ]: {
+		key: 'is-not-filter',
+		label: __( 'Is not' ),
+	},
+	[ OPERATOR_IS_ANY ]: {
+		key: 'is-any-filter',
+		label: __( 'Is any' ),
+	},
+	[ OPERATOR_IS_NONE ]: {
+		key: 'is-none-filter',
+		label: __( 'Is none' ),
+	},
+	[ OPERATOR_IS_ALL ]: {
+		key: 'is-all-filter',
+		label: __( 'Is all' ),
+	},
+	[ OPERATOR_IS_NOT_ALL ]: {
+		key: 'is-not-all-filter',
+		label: __( 'Is not all' ),
+	},
+};
+
+export const SORTING_DIRECTIONS = [ 'asc', 'desc' ] as const;
+export const sortArrows = { asc: '↑', desc: '↓' };
+export const sortValues = { asc: 'ascending', desc: 'descending' } as const;
+export const sortLabels = {
+	asc: __( 'Sort ascending' ),
+	desc: __( 'Sort descending' ),
+};
+export const sortIcons = {
+	asc: arrowUp,
+	desc: arrowDown,
+};
+
+// View layouts.
+export const LAYOUT_TABLE = 'table';
+export const LAYOUT_GRID = 'grid';
+export const LAYOUT_LIST = 'list';
diff --git a/packages/dataviews/src/dataform-controls/datetime.tsx b/packages/dataviews/src/dataform-controls/datetime.tsx
new file mode 100644
index 00000000000000..b31c5c60bb9c6e
--- /dev/null
+++ b/packages/dataviews/src/dataform-controls/datetime.tsx
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { BaseControl, TimePicker, VisuallyHidden } from '@wordpress/components';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { DataFormControlProps } from '../types';
+
+export default function DateTime< Item >( {
+	data,
+	field,
+	onChange,
+	hideLabelFromVision,
+}: DataFormControlProps< Item > ) {
+	const { id, label } = field;
+	const value = field.getValue( { item: data } );
+
+	const onChangeControl = useCallback(
+		( newValue: string | null ) => onChange( { [ id ]: newValue } ),
+		[ id, onChange ]
+	);
+
+	return (
+		<fieldset className="dataviews-controls__datetime">
+			{ ! hideLabelFromVision && (
+				<BaseControl.VisualLabel as="legend">
+					{ label }
+				</BaseControl.VisualLabel>
+			) }
+			{ hideLabelFromVision && (
+				<VisuallyHidden as="legend">{ label }</VisuallyHidden>
+			) }
+			<TimePicker
+				currentTime={ value }
+				onChange={ onChangeControl }
+				hideLabelFromVision
+			/>
+		</fieldset>
+	);
+}
diff --git a/packages/dataviews/src/dataform-controls/index.tsx b/packages/dataviews/src/dataform-controls/index.tsx
new file mode 100644
index 00000000000000..297e73c28f837c
--- /dev/null
+++ b/packages/dataviews/src/dataform-controls/index.tsx
@@ -0,0 +1,61 @@
+/**
+ * External dependencies
+ */
+import type { ComponentType } from 'react';
+
+/**
+ * Internal dependencies
+ */
+import type {
+	DataFormControlProps,
+	Field,
+	FieldTypeDefinition,
+} from '../types';
+import datetime from './datetime';
+import integer from './integer';
+import radio from './radio';
+import select from './select';
+import text from './text';
+
+interface FormControls {
+	[ key: string ]: ComponentType< DataFormControlProps< any > >;
+}
+
+const FORM_CONTROLS: FormControls = {
+	datetime,
+	integer,
+	radio,
+	select,
+	text,
+};
+
+export function getControl< Item >(
+	field: Field< Item >,
+	fieldTypeDefinition: FieldTypeDefinition< Item >
+) {
+	if ( typeof field.Edit === 'function' ) {
+		return field.Edit;
+	}
+
+	if ( typeof field.Edit === 'string' ) {
+		return getControlByType( field.Edit );
+	}
+
+	if ( field.elements ) {
+		return getControlByType( 'select' );
+	}
+
+	if ( typeof fieldTypeDefinition.Edit === 'string' ) {
+		return getControlByType( fieldTypeDefinition.Edit );
+	}
+
+	return fieldTypeDefinition.Edit;
+}
+
+export function getControlByType( type: string ) {
+	if ( Object.keys( FORM_CONTROLS ).includes( type ) ) {
+		return FORM_CONTROLS[ type ];
+	}
+
+	throw 'Control ' + type + ' not found';
+}
diff --git a/packages/dataviews/src/dataform-controls/integer.tsx b/packages/dataviews/src/dataform-controls/integer.tsx
new file mode 100644
index 00000000000000..f70a90ffe15239
--- /dev/null
+++ b/packages/dataviews/src/dataform-controls/integer.tsx
@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalNumberControl as NumberControl } from '@wordpress/components';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { DataFormControlProps } from '../types';
+
+export default function Integer< Item >( {
+	data,
+	field,
+	onChange,
+	hideLabelFromVision,
+}: DataFormControlProps< Item > ) {
+	const { id, label, description } = field;
+	const value = field.getValue( { item: data } ) ?? '';
+	const onChangeControl = useCallback(
+		( newValue: string | undefined ) =>
+			onChange( {
+				[ id ]: Number( newValue ),
+			} ),
+		[ id, onChange ]
+	);
+
+	return (
+		<NumberControl
+			label={ label }
+			help={ description }
+			value={ value }
+			onChange={ onChangeControl }
+			__next40pxDefaultSize
+			hideLabelFromVision={ hideLabelFromVision }
+		/>
+	);
+}
diff --git a/packages/dataviews/src/dataform-controls/radio.tsx b/packages/dataviews/src/dataform-controls/radio.tsx
new file mode 100644
index 00000000000000..3d616404e0c053
--- /dev/null
+++ b/packages/dataviews/src/dataform-controls/radio.tsx
@@ -0,0 +1,42 @@
+/**
+ * WordPress dependencies
+ */
+import { RadioControl } from '@wordpress/components';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { DataFormControlProps } from '../types';
+
+export default function Radio< Item >( {
+	data,
+	field,
+	onChange,
+	hideLabelFromVision,
+}: DataFormControlProps< Item > ) {
+	const { id, label } = field;
+	const value = field.getValue( { item: data } );
+
+	const onChangeControl = useCallback(
+		( newValue: string ) =>
+			onChange( {
+				[ id ]: newValue,
+			} ),
+		[ id, onChange ]
+	);
+
+	if ( field.elements ) {
+		return (
+			<RadioControl
+				label={ label }
+				onChange={ onChangeControl }
+				options={ field.elements }
+				selected={ value }
+				hideLabelFromVision={ hideLabelFromVision }
+			/>
+		);
+	}
+
+	return null;
+}
diff --git a/packages/dataviews/src/dataform-controls/select.tsx b/packages/dataviews/src/dataform-controls/select.tsx
new file mode 100644
index 00000000000000..2b3bd9373fc155
--- /dev/null
+++ b/packages/dataviews/src/dataform-controls/select.tsx
@@ -0,0 +1,52 @@
+/**
+ * WordPress dependencies
+ */
+import { SelectControl } from '@wordpress/components';
+import { useCallback } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import type { DataFormControlProps } from '../types';
+
+export default function Select< Item >( {
+	data,
+	field,
+	onChange,
+	hideLabelFromVision,
+}: DataFormControlProps< Item > ) {
+	const { id, label } = field;
+	const value = field.getValue( { item: data } ) ?? '';
+	const onChangeControl = useCallback(
+		( newValue: any ) =>
+			onChange( {
+				[ id ]: newValue,
+			} ),
+		[ id, onChange ]
+	);
+
+	const elements = [
+		/*
+		 * Value can be undefined when:
+		 *
+		 * - the field is not required
+		 * - in bulk editing
+		 *
+		 */
+		{ label: __( 'Select item' ), value: '' },
+		...( field?.elements ?? [] ),
+	];
+
+	return (
+		<SelectControl
+			label={ label }
+			value={ value }
+			options={ elements }
+			onChange={ onChangeControl }
+			__next40pxDefaultSize
+			__nextHasNoMarginBottom
+			hideLabelFromVision={ hideLabelFromVision }
+		/>
+	);
+}
diff --git a/packages/dataviews/src/dataform-controls/style.scss b/packages/dataviews/src/dataform-controls/style.scss
new file mode 100644
index 00000000000000..230826c0adf823
--- /dev/null
+++ b/packages/dataviews/src/dataform-controls/style.scss
@@ -0,0 +1,4 @@
+.dataviews-controls__datetime {
+	border: none;
+	padding: 0;
+}
diff --git a/packages/dataviews/src/dataform-controls/text.tsx b/packages/dataviews/src/dataform-controls/text.tsx
new file mode 100644
index 00000000000000..7ac095f4abede7
--- /dev/null
+++ b/packages/dataviews/src/dataform-controls/text.tsx
@@ -0,0 +1,40 @@
+/**
+ * WordPress dependencies
+ */
+import { TextControl } from '@wordpress/components';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { DataFormControlProps } from '../types';
+
+export default function Text< Item >( {
+	data,
+	field,
+	onChange,
+	hideLabelFromVision,
+}: DataFormControlProps< Item > ) {
+	const { id, label, placeholder } = field;
+	const value = field.getValue( { item: data } );
+
+	const onChangeControl = useCallback(
+		( newValue: string ) =>
+			onChange( {
+				[ id ]: newValue,
+			} ),
+		[ id, onChange ]
+	);
+
+	return (
+		<TextControl
+			label={ label }
+			placeholder={ placeholder }
+			value={ value ?? '' }
+			onChange={ onChangeControl }
+			__next40pxDefaultSize
+			__nextHasNoMarginBottom
+			hideLabelFromVision={ hideLabelFromVision }
+		/>
+	);
+}
diff --git a/packages/dataviews/src/dataforms-layouts/get-visible-fields.ts b/packages/dataviews/src/dataforms-layouts/get-visible-fields.ts
new file mode 100644
index 00000000000000..d95d59a88394e4
--- /dev/null
+++ b/packages/dataviews/src/dataforms-layouts/get-visible-fields.ts
@@ -0,0 +1,29 @@
+/**
+ * Internal dependencies
+ */
+import { normalizeCombinedFields } from '../normalize-fields';
+import type {
+	Field,
+	CombinedFormField,
+	NormalizedCombinedFormField,
+} from '../types';
+
+export function getVisibleFields< Item >(
+	fields: Field< Item >[],
+	formFields: string[] = [],
+	combinedFields?: CombinedFormField< Item >[]
+): Field< Item >[] {
+	const visibleFields: Array<
+		Field< Item > | NormalizedCombinedFormField< Item >
+	> = [ ...fields ];
+	if ( combinedFields ) {
+		visibleFields.push(
+			...normalizeCombinedFields( combinedFields, fields )
+		);
+	}
+	return formFields
+		.map( ( fieldId ) =>
+			visibleFields.find( ( { id } ) => id === fieldId )
+		)
+		.filter( ( field ): field is Field< Item > => !! field );
+}
diff --git a/packages/dataviews/src/dataforms-layouts/index.tsx b/packages/dataviews/src/dataforms-layouts/index.tsx
new file mode 100644
index 00000000000000..9434ea724ed4ca
--- /dev/null
+++ b/packages/dataviews/src/dataforms-layouts/index.tsx
@@ -0,0 +1,20 @@
+/**
+ * Internal dependencies
+ */
+import FormRegular from './regular';
+import FormPanel from './panel';
+
+const FORM_LAYOUTS = [
+	{
+		type: 'regular',
+		component: FormRegular,
+	},
+	{
+		type: 'panel',
+		component: FormPanel,
+	},
+];
+
+export function getFormLayout( type: string ) {
+	return FORM_LAYOUTS.find( ( layout ) => layout.type === type );
+}
diff --git a/packages/dataviews/src/dataforms-layouts/panel/index.tsx b/packages/dataviews/src/dataforms-layouts/panel/index.tsx
new file mode 100644
index 00000000000000..5d3bbc532ad457
--- /dev/null
+++ b/packages/dataviews/src/dataforms-layouts/panel/index.tsx
@@ -0,0 +1,169 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalVStack as VStack,
+	__experimentalHStack as HStack,
+	__experimentalHeading as Heading,
+	__experimentalSpacer as Spacer,
+	Dropdown,
+	Button,
+} from '@wordpress/components';
+import { useState, useMemo } from '@wordpress/element';
+import { sprintf, __ } from '@wordpress/i18n';
+import { closeSmall } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import { normalizeFields } from '../../normalize-fields';
+import { getVisibleFields } from '../get-visible-fields';
+import type { DataFormProps, NormalizedField } from '../../types';
+
+interface FormFieldProps< Item > {
+	data: Item;
+	field: NormalizedField< Item >;
+	onChange: ( value: any ) => void;
+}
+
+function DropdownHeader( {
+	title,
+	onClose,
+}: {
+	title: string;
+	onClose: () => void;
+} ) {
+	return (
+		<VStack
+			className="dataforms-layouts-panel__dropdown-header"
+			spacing={ 4 }
+		>
+			<HStack alignment="center">
+				<Heading level={ 2 } size={ 13 }>
+					{ title }
+				</Heading>
+				<Spacer />
+				{ onClose && (
+					<Button
+						label={ __( 'Close' ) }
+						icon={ closeSmall }
+						onClick={ onClose }
+						size="small"
+					/>
+				) }
+			</HStack>
+		</VStack>
+	);
+}
+
+function FormField< Item >( {
+	data,
+	field,
+	onChange,
+}: FormFieldProps< Item > ) {
+	// Use internal state instead of a ref to make sure that the component
+	// re-renders when the popover's anchor updates.
+	const [ popoverAnchor, setPopoverAnchor ] = useState< HTMLElement | null >(
+		null
+	);
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor ]
+	);
+
+	return (
+		<HStack
+			ref={ setPopoverAnchor }
+			className="dataforms-layouts-panel__field"
+		>
+			<div className="dataforms-layouts-panel__field-label">
+				{ field.label }
+			</div>
+			<div>
+				<Dropdown
+					contentClassName="dataforms-layouts-panel__field-dropdown"
+					popoverProps={ popoverProps }
+					focusOnMount
+					toggleProps={ {
+						size: 'compact',
+						variant: 'tertiary',
+						tooltipPosition: 'middle left',
+					} }
+					renderToggle={ ( { isOpen, onToggle } ) => (
+						<Button
+							className="dataforms-layouts-panel__field-control"
+							size="compact"
+							variant="tertiary"
+							aria-expanded={ isOpen }
+							aria-label={ sprintf(
+								// translators: %s: Field name.
+								__( 'Edit %s' ),
+								field.label
+							) }
+							onClick={ onToggle }
+						>
+							<field.render item={ data } />
+						</Button>
+					) }
+					renderContent={ ( { onClose } ) => (
+						<>
+							<DropdownHeader
+								title={ field.label }
+								onClose={ onClose }
+							/>
+							<field.Edit
+								key={ field.id }
+								data={ data }
+								field={ field }
+								onChange={ onChange }
+								hideLabelFromVision
+							/>
+						</>
+					) }
+				/>
+			</div>
+		</HStack>
+	);
+}
+
+export default function FormPanel< Item >( {
+	data,
+	fields,
+	form,
+	onChange,
+}: DataFormProps< Item > ) {
+	const visibleFields = useMemo(
+		() =>
+			normalizeFields(
+				getVisibleFields< Item >(
+					fields,
+					form.fields,
+					form.combinedFields
+				)
+			),
+		[ fields, form.fields, form.combinedFields ]
+	);
+
+	return (
+		<VStack spacing={ 2 }>
+			{ visibleFields.map( ( field ) => {
+				return (
+					<FormField
+						key={ field.id }
+						data={ data }
+						field={ field }
+						onChange={ onChange }
+					/>
+				);
+			} ) }
+		</VStack>
+	);
+}
diff --git a/packages/dataviews/src/dataforms-layouts/panel/style.scss b/packages/dataviews/src/dataforms-layouts/panel/style.scss
new file mode 100644
index 00000000000000..ae69c4ff45243a
--- /dev/null
+++ b/packages/dataviews/src/dataforms-layouts/panel/style.scss
@@ -0,0 +1,46 @@
+.dataforms-layouts-panel__field {
+	width: 100%;
+	min-height: $grid-unit-40;
+	justify-content: flex-start !important;
+	align-items: flex-start !important;
+}
+
+.dataforms-layouts-panel__field-label {
+	width: 38%;
+	flex-shrink: 0;
+	min-height: $grid-unit-40;
+	display: flex;
+	align-items: center;
+	padding: 6px 0; // Matches button to ensure alignment
+	line-height: $grid-unit-05 * 5;
+	hyphens: auto;
+}
+
+.dataforms-layouts-panel__field-control {
+	flex-grow: 1;
+	min-height: $grid-unit-40;
+	display: flex;
+	align-items: center;
+
+	.components-button {
+		max-width: 100%;
+		text-align: left;
+		white-space: normal;
+		text-wrap: balance; // Fallback for Safari.
+		text-wrap: pretty;
+		min-height: $button-size-compact;
+	}
+
+	.components-dropdown {
+		max-width: 100%;
+	}
+}
+
+.dataforms-layouts-panel__field-dropdown .components-popover__content {
+	min-width: 320px;
+	padding: $grid-unit-20;
+}
+
+.dataforms-layouts-panel__dropdown-header {
+	margin-bottom: $grid-unit-20;
+}
diff --git a/packages/dataviews/src/dataforms-layouts/regular/index.tsx b/packages/dataviews/src/dataforms-layouts/regular/index.tsx
new file mode 100644
index 00000000000000..57aa163b890e5f
--- /dev/null
+++ b/packages/dataviews/src/dataforms-layouts/regular/index.tsx
@@ -0,0 +1,46 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalVStack as VStack } from '@wordpress/components';
+import { useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { normalizeFields } from '../../normalize-fields';
+import { getVisibleFields } from '../get-visible-fields';
+import type { DataFormProps } from '../../types';
+
+export default function FormRegular< Item >( {
+	data,
+	fields,
+	form,
+	onChange,
+}: DataFormProps< Item > ) {
+	const visibleFields = useMemo(
+		() =>
+			normalizeFields(
+				getVisibleFields< Item >(
+					fields,
+					form.fields,
+					form.combinedFields
+				)
+			),
+		[ fields, form.fields, form.combinedFields ]
+	);
+
+	return (
+		<VStack spacing={ 4 }>
+			{ visibleFields.map( ( field ) => {
+				return (
+					<field.Edit
+						key={ field.id }
+						data={ data }
+						field={ field }
+						onChange={ onChange }
+					/>
+				);
+			} ) }
+		</VStack>
+	);
+}
diff --git a/packages/dataviews/src/dataviews-layouts/grid/density-picker.tsx b/packages/dataviews/src/dataviews-layouts/grid/density-picker.tsx
new file mode 100644
index 00000000000000..34ddf6c3fe52f3
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/grid/density-picker.tsx
@@ -0,0 +1,102 @@
+/**
+ * WordPress dependencies
+ */
+import { RangeControl } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useViewportMatch } from '@wordpress/compose';
+import { useEffect, useMemo } from '@wordpress/element';
+
+const viewportBreaks = {
+	xhuge: { min: 3, max: 6, default: 5 },
+	huge: { min: 2, max: 4, default: 4 },
+	xlarge: { min: 2, max: 3, default: 3 },
+	large: { min: 1, max: 2, default: 2 },
+	mobile: { min: 1, max: 2, default: 2 },
+};
+
+function useViewPortBreakpoint() {
+	const isXHuge = useViewportMatch( 'xhuge', '>=' );
+	const isHuge = useViewportMatch( 'huge', '>=' );
+	const isXlarge = useViewportMatch( 'xlarge', '>=' );
+	const isLarge = useViewportMatch( 'large', '>=' );
+	const isMobile = useViewportMatch( 'mobile', '>=' );
+
+	if ( isXHuge ) {
+		return 'xhuge';
+	}
+	if ( isHuge ) {
+		return 'huge';
+	}
+	if ( isXlarge ) {
+		return 'xlarge';
+	}
+	if ( isLarge ) {
+		return 'large';
+	}
+	if ( isMobile ) {
+		return 'mobile';
+	}
+	return null;
+}
+
+export default function DensityPicker( {
+	density,
+	setDensity,
+}: {
+	density: number;
+	setDensity: React.Dispatch< React.SetStateAction< number > >;
+} ) {
+	const viewport = useViewPortBreakpoint();
+	useEffect( () => {
+		setDensity( ( _density ) => {
+			if ( ! viewport || ! _density ) {
+				return 0;
+			}
+			const breakValues = viewportBreaks[ viewport ];
+			if ( _density < breakValues.min ) {
+				return breakValues.min;
+			}
+			if ( _density > breakValues.max ) {
+				return breakValues.max;
+			}
+			return _density;
+		} );
+	}, [ setDensity, viewport ] );
+	const breakValues = viewportBreaks[ viewport || 'mobile' ];
+	const densityToUse = density || breakValues.default;
+
+	const marks = useMemo(
+		() =>
+			Array.from(
+				{ length: breakValues.max - breakValues.min + 1 },
+				( _, i ) => {
+					return {
+						value: breakValues.min + i,
+					};
+				}
+			),
+		[ breakValues ]
+	);
+
+	if ( ! viewport ) {
+		return null;
+	}
+
+	return (
+		<RangeControl
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			showTooltip={ false }
+			label={ __( 'Preview size' ) }
+			value={ breakValues.max + breakValues.min - densityToUse }
+			marks={ marks }
+			min={ breakValues.min }
+			max={ breakValues.max }
+			withInputField={ false }
+			onChange={ ( value = 0 ) => {
+				setDensity( breakValues.max + breakValues.min - value );
+			} }
+			step={ 1 }
+		/>
+	);
+}
diff --git a/packages/dataviews/src/dataviews-layouts/grid/index.tsx b/packages/dataviews/src/dataviews-layouts/grid/index.tsx
new file mode 100644
index 00000000000000..230ffe0dc50b5c
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/grid/index.tsx
@@ -0,0 +1,251 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalGrid as Grid,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	Spinner,
+	Flex,
+	FlexItem,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import ItemActions from '../../components/dataviews-item-actions';
+import SingleSelectionCheckbox from '../../components/dataviews-selection-checkbox';
+import { useHasAPossibleBulkAction } from '../../components/dataviews-bulk-actions';
+import type { Action, NormalizedField, ViewGridProps } from '../../types';
+import type { SetSelection } from '../../private-types';
+
+interface GridItemProps< Item > {
+	selection: string[];
+	onChangeSelection: SetSelection;
+	getItemId: ( item: Item ) => string;
+	item: Item;
+	actions: Action< Item >[];
+	mediaField?: NormalizedField< Item >;
+	primaryField?: NormalizedField< Item >;
+	visibleFields: NormalizedField< Item >[];
+	badgeFields: NormalizedField< Item >[];
+	columnFields?: string[];
+}
+
+function GridItem< Item >( {
+	selection,
+	onChangeSelection,
+	getItemId,
+	item,
+	actions,
+	mediaField,
+	primaryField,
+	visibleFields,
+	badgeFields,
+	columnFields,
+}: GridItemProps< Item > ) {
+	const hasBulkAction = useHasAPossibleBulkAction( actions, item );
+	const id = getItemId( item );
+	const isSelected = selection.includes( id );
+	const renderedMediaField = mediaField?.render ? (
+		<mediaField.render item={ item } />
+	) : null;
+	const renderedPrimaryField = primaryField?.render ? (
+		<primaryField.render item={ item } />
+	) : null;
+	return (
+		<VStack
+			spacing={ 0 }
+			key={ id }
+			className={ clsx( 'dataviews-view-grid__card', {
+				'is-selected': hasBulkAction && isSelected,
+			} ) }
+			onClickCapture={ ( event ) => {
+				if ( event.ctrlKey || event.metaKey ) {
+					event.stopPropagation();
+					event.preventDefault();
+					if ( ! hasBulkAction ) {
+						return;
+					}
+					onChangeSelection(
+						selection.includes( id )
+							? selection.filter( ( itemId ) => id !== itemId )
+							: [ ...selection, id ]
+					);
+				}
+			} }
+		>
+			<div className="dataviews-view-grid__media">
+				{ renderedMediaField }
+			</div>
+			<SingleSelectionCheckbox
+				item={ item }
+				selection={ selection }
+				onChangeSelection={ onChangeSelection }
+				getItemId={ getItemId }
+				primaryField={ primaryField }
+				disabled={ ! hasBulkAction }
+			/>
+			<HStack
+				justify="space-between"
+				className="dataviews-view-grid__title-actions"
+			>
+				<HStack className="dataviews-view-grid__primary-field">
+					{ renderedPrimaryField }
+				</HStack>
+				<ItemActions item={ item } actions={ actions } isCompact />
+			</HStack>
+			{ !! badgeFields?.length && (
+				<HStack
+					className="dataviews-view-grid__badge-fields"
+					spacing={ 2 }
+					wrap
+					alignment="top"
+					justify="flex-start"
+				>
+					{ badgeFields.map( ( field ) => {
+						return (
+							<FlexItem
+								key={ field.id }
+								className="dataviews-view-grid__field-value"
+							>
+								<field.render item={ item } />
+							</FlexItem>
+						);
+					} ) }
+				</HStack>
+			) }
+			{ !! visibleFields?.length && (
+				<VStack className="dataviews-view-grid__fields" spacing={ 1 }>
+					{ visibleFields.map( ( field ) => {
+						return (
+							<Flex
+								className={ clsx(
+									'dataviews-view-grid__field',
+									columnFields?.includes( field.id )
+										? 'is-column'
+										: 'is-row'
+								) }
+								key={ field.id }
+								gap={ 1 }
+								justify="flex-start"
+								expanded
+								style={ { height: 'auto' } }
+								direction={
+									columnFields?.includes( field.id )
+										? 'column'
+										: 'row'
+								}
+							>
+								<>
+									<FlexItem className="dataviews-view-grid__field-name">
+										{ field.header }
+									</FlexItem>
+									<FlexItem
+										className="dataviews-view-grid__field-value"
+										style={ { maxHeight: 'none' } }
+									>
+										<field.render item={ item } />
+									</FlexItem>
+								</>
+							</Flex>
+						);
+					} ) }
+				</VStack>
+			) }
+		</VStack>
+	);
+}
+
+export default function ViewGrid< Item >( {
+	actions,
+	data,
+	fields,
+	getItemId,
+	isLoading,
+	onChangeSelection,
+	selection,
+	view,
+	density,
+}: ViewGridProps< Item > ) {
+	const mediaField = fields.find(
+		( field ) => field.id === view.layout?.mediaField
+	);
+	const primaryField = fields.find(
+		( field ) => field.id === view.layout?.primaryField
+	);
+	const viewFields = view.fields || fields.map( ( field ) => field.id );
+	const { visibleFields, badgeFields } = fields.reduce(
+		( accumulator: Record< string, NormalizedField< Item >[] >, field ) => {
+			if (
+				! viewFields.includes( field.id ) ||
+				[
+					view.layout?.mediaField,
+					view?.layout?.primaryField,
+				].includes( field.id )
+			) {
+				return accumulator;
+			}
+			// If the field is a badge field, add it to the badgeFields array
+			// otherwise add it to the rest visibleFields array.
+			const key = view.layout?.badgeFields?.includes( field.id )
+				? 'badgeFields'
+				: 'visibleFields';
+			accumulator[ key ].push( field );
+			return accumulator;
+		},
+		{ visibleFields: [], badgeFields: [] }
+	);
+	const hasData = !! data?.length;
+	const gridStyle = density
+		? { gridTemplateColumns: `repeat(${ density }, minmax(0, 1fr))` }
+		: {};
+	return (
+		<>
+			{ hasData && (
+				<Grid
+					gap={ 8 }
+					columns={ 2 }
+					alignment="top"
+					className="dataviews-view-grid"
+					style={ gridStyle }
+					aria-busy={ isLoading }
+				>
+					{ data.map( ( item ) => {
+						return (
+							<GridItem
+								key={ getItemId( item ) }
+								selection={ selection }
+								onChangeSelection={ onChangeSelection }
+								getItemId={ getItemId }
+								item={ item }
+								actions={ actions }
+								mediaField={ mediaField }
+								primaryField={ primaryField }
+								visibleFields={ visibleFields }
+								badgeFields={ badgeFields }
+								columnFields={ view.layout?.columnFields }
+							/>
+						);
+					} ) }
+				</Grid>
+			) }
+			{ ! hasData && (
+				<div
+					className={ clsx( {
+						'dataviews-loading': isLoading,
+						'dataviews-no-results': ! isLoading,
+					} ) }
+				>
+					<p>{ isLoading ? <Spinner /> : __( 'No results' ) }</p>
+				</div>
+			) }
+		</>
+	);
+}
diff --git a/packages/dataviews/src/dataviews-layouts/grid/style.scss b/packages/dataviews/src/dataviews-layouts/grid/style.scss
new file mode 100644
index 00000000000000..6286ed94685a04
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/grid/style.scss
@@ -0,0 +1,173 @@
+.dataviews-view-grid {
+	margin-bottom: auto;
+	grid-template-rows: max-content;
+	padding: 0 $grid-unit-60 $grid-unit-30;
+	transition: padding ease-out 0.1s;
+	@include reduce-motion("transition");
+
+
+	.dataviews-view-grid__card {
+		height: 100%;
+		justify-content: flex-start;
+		position: relative;
+
+		.dataviews-view-grid__title-actions {
+			padding: $grid-unit-10 0 $grid-unit-05;
+		}
+
+		.dataviews-view-grid__primary-field {
+			min-height: $grid-unit-40; // Preserve layout when there is no ellipsis button
+		}
+
+		&.is-selected {
+			.dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-value {
+				color: $gray-900;
+			}
+
+			.dataviews-view-grid__media::after {
+				background-color: rgba(var(--wp-admin-theme-color--rgb), 0.08);
+				box-shadow: inset 0 0 0 $border-width var(--wp-admin-theme-color);
+			}
+		}
+	}
+
+	.dataviews-view-grid__media {
+		width: 100%;
+		min-height: 200px;
+		aspect-ratio: 1/1;
+		background-color: $gray-100;
+		border-radius: $grid-unit-05;
+		position: relative;
+
+		img {
+			object-fit: cover;
+			width: 100%;
+			height: 100%;
+		}
+
+		&::after {
+			content: "";
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			box-shadow: inset 0 0 0 $border-width rgba(0, 0, 0, 0.1);
+			border-radius: $grid-unit-05;
+			pointer-events: none;
+		}
+	}
+
+	.dataviews-view-grid__fields {
+		position: relative;
+		font-size: 12px;
+		line-height: 16px;
+
+		&:not(:empty) {
+			padding: 0 0 $grid-unit-15;
+		}
+
+		.dataviews-view-grid__field-value:not(:empty) {
+			min-height: $grid-unit-30;
+			line-height: $grid-unit-05 * 5;
+			padding-top: math.div($grid-unit-05, 2);
+		}
+
+		.dataviews-view-grid__field {
+			align-items: flex-start;
+			min-height: $grid-unit-30;
+
+			&:not(:has(.dataviews-view-grid__field-value:not(:empty))) {
+				display: none;
+			}
+
+			&:not(.is-column) {
+				align-items: center;
+
+				.dataviews-view-grid__field-name {
+					width: 35%;
+				}
+
+				.dataviews-view-grid__field-value {
+					width: 65%;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+			}
+
+			&.is-column {
+				& + .is-row {
+					margin-top: $grid-unit-05;
+				}
+			}
+
+			.dataviews-view-grid__field-name {
+				color: $gray-700;
+			}
+		}
+	}
+
+	.dataviews-view-grid__badge-fields {
+		&:not(:empty) {
+			padding-bottom: $grid-unit-15;
+		}
+
+		.dataviews-view-grid__field-value {
+			width: fit-content;
+			background: $gray-100;
+			padding: 0 $grid-unit-10;
+			min-height: $grid-unit-30;
+			border-radius: $radius-small;
+			display: flex;
+			align-items: center;
+			font-size: 12px;
+		}
+	}
+}
+
+.dataviews-view-grid.dataviews-view-grid {
+	grid-template-columns: repeat(1, minmax(0, 1fr));
+
+	@include break-mobile() {
+		grid-template-columns: repeat(2, minmax(0, 1fr));
+	}
+
+	@include break-xlarge() {
+		grid-template-columns: repeat(3, minmax(0, 1fr));
+	}
+
+	@include break-huge() {
+		grid-template-columns: repeat(4, minmax(0, 1fr));
+	}
+
+	@include break-xhuge() {
+		grid-template-columns: repeat(5, minmax(0, 1fr));
+	}
+}
+
+.dataviews-view-grid__field-value:empty,
+.dataviews-view-grid__field:empty {
+	display: none;
+}
+
+.dataviews-view-grid__card .dataviews-selection-checkbox {
+	position: absolute;
+	top: -9999em;
+	left: $grid-unit-10;
+	z-index: z-index(".dataviews-view-grid__card .dataviews-selection-checkbox");
+}
+
+.dataviews-view-grid__card:hover .dataviews-selection-checkbox,
+.dataviews-view-grid__card:focus-within .dataviews-selection-checkbox,
+.dataviews-view-grid__card.is-selected .dataviews-selection-checkbox {
+	top: $grid-unit-10;
+}
+
+/* stylelint-disable-next-line scss/at-rule-no-unknown -- '@container' not globally permitted */
+@container (max-width: 430px) {
+	.dataviews-view-grid {
+		padding-left: $grid-unit-30;
+		padding-right: $grid-unit-30;
+	}
+}
diff --git a/packages/dataviews/src/dataviews-layouts/index.ts b/packages/dataviews/src/dataviews-layouts/index.ts
new file mode 100644
index 00000000000000..eece17d0f4f10c
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/index.ts
@@ -0,0 +1,127 @@
+/**
+ * WordPress dependencies
+ */
+import { __, isRTL } from '@wordpress/i18n';
+import {
+	blockTable,
+	category,
+	formatListBullets,
+	formatListBulletsRTL,
+} from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import ViewTable from './table';
+import ViewGrid from './grid';
+import ViewList from './list';
+import { LAYOUT_GRID, LAYOUT_LIST, LAYOUT_TABLE } from '../constants';
+import type { View, Field } from '../types';
+
+export const VIEW_LAYOUTS = [
+	{
+		type: LAYOUT_TABLE,
+		label: __( 'Table' ),
+		component: ViewTable,
+		icon: blockTable,
+	},
+	{
+		type: LAYOUT_GRID,
+		label: __( 'Grid' ),
+		component: ViewGrid,
+		icon: category,
+	},
+	{
+		type: LAYOUT_LIST,
+		label: __( 'List' ),
+		component: ViewList,
+		icon: isRTL() ? formatListBulletsRTL : formatListBullets,
+	},
+];
+
+export function getNotHidableFieldIds( view: View ): string[] {
+	if ( view.type === 'table' ) {
+		return [ view.layout?.primaryField ]
+			.concat(
+				view.layout?.combinedFields?.flatMap(
+					( field ) => field.children
+				) ?? []
+			)
+			.filter( ( item ): item is string => !! item );
+	}
+
+	if ( view.type === 'grid' ) {
+		return [ view.layout?.primaryField, view.layout?.mediaField ].filter(
+			( item ): item is string => !! item
+		);
+	}
+
+	if ( view.type === 'list' ) {
+		return [ view.layout?.primaryField, view.layout?.mediaField ].filter(
+			( item ): item is string => !! item
+		);
+	}
+
+	return [];
+}
+
+function getCombinedFieldIds( view: View ): string[] {
+	const combinedFields: string[] = [];
+	if ( view.type === LAYOUT_TABLE && view.layout?.combinedFields ) {
+		view.layout.combinedFields.forEach( ( combination ) => {
+			combinedFields.push( ...combination.children );
+		} );
+	}
+	return combinedFields;
+}
+
+export function getVisibleFieldIds(
+	view: View,
+	fields: Field< any >[]
+): string[] {
+	const fieldsToExclude = getCombinedFieldIds( view );
+
+	if ( view.fields ) {
+		return view.fields.filter( ( id ) => ! fieldsToExclude.includes( id ) );
+	}
+
+	const visibleFields = [];
+	if ( view.type === LAYOUT_TABLE && view.layout?.combinedFields ) {
+		visibleFields.push(
+			...view.layout.combinedFields.map( ( { id } ) => id )
+		);
+	}
+	visibleFields.push(
+		...fields
+			.filter( ( { id } ) => ! fieldsToExclude.includes( id ) )
+			.map( ( { id } ) => id )
+	);
+
+	return visibleFields;
+}
+
+export function getHiddenFieldIds(
+	view: View,
+	fields: Field< any >[]
+): string[] {
+	const fieldsToExclude = [
+		...getCombinedFieldIds( view ),
+		...getVisibleFieldIds( view, fields ),
+	];
+
+	// The media field does not need to be in the view.fields to be displayed.
+	if ( view.type === LAYOUT_GRID && view.layout?.mediaField ) {
+		fieldsToExclude.push( view.layout?.mediaField );
+	}
+
+	if ( view.type === LAYOUT_LIST && view.layout?.mediaField ) {
+		fieldsToExclude.push( view.layout?.mediaField );
+	}
+
+	return fields
+		.filter(
+			( { id, enableHiding } ) =>
+				! fieldsToExclude.includes( id ) && enableHiding
+		)
+		.map( ( { id } ) => id );
+}
diff --git a/packages/dataviews/src/dataviews-layouts/list/index.tsx b/packages/dataviews/src/dataviews-layouts/list/index.tsx
new file mode 100644
index 00000000000000..e737b18f5b02a9
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/list/index.tsx
@@ -0,0 +1,480 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId, usePrevious } from '@wordpress/compose';
+import {
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	Button,
+	privateApis as componentsPrivateApis,
+	Spinner,
+	VisuallyHidden,
+	Composite,
+} from '@wordpress/components';
+import {
+	useCallback,
+	useEffect,
+	useMemo,
+	useRef,
+	useState,
+} from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import { moreVertical } from '@wordpress/icons';
+import { useRegistry } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import {
+	ActionsDropdownMenuGroup,
+	ActionModal,
+} from '../../components/dataviews-item-actions';
+import type { Action, NormalizedField, ViewListProps } from '../../types';
+
+interface ListViewItemProps< Item > {
+	actions: Action< Item >[];
+	idPrefix: string;
+	isSelected: boolean;
+	item: Item;
+	mediaField?: NormalizedField< Item >;
+	onSelect: ( item: Item ) => void;
+	primaryField?: NormalizedField< Item >;
+	visibleFields: NormalizedField< Item >[];
+	onDropdownTriggerKeyDown: React.KeyboardEventHandler< HTMLButtonElement >;
+}
+
+const { DropdownMenuV2: DropdownMenu } = unlock( componentsPrivateApis );
+
+function generateItemWrapperCompositeId( idPrefix: string ) {
+	return `${ idPrefix }-item-wrapper`;
+}
+function generatePrimaryActionCompositeId(
+	idPrefix: string,
+	primaryActionId: string
+) {
+	return `${ idPrefix }-primary-action-${ primaryActionId }`;
+}
+function generateDropdownTriggerCompositeId( idPrefix: string ) {
+	return `${ idPrefix }-dropdown`;
+}
+
+function PrimaryActionGridCell< Item >( {
+	idPrefix,
+	primaryAction,
+	item,
+}: {
+	idPrefix: string;
+	primaryAction: Action< Item >;
+	item: Item;
+} ) {
+	const registry = useRegistry();
+	const [ isModalOpen, setIsModalOpen ] = useState( false );
+
+	const compositeItemId = generatePrimaryActionCompositeId(
+		idPrefix,
+		primaryAction.id
+	);
+
+	const label =
+		typeof primaryAction.label === 'string'
+			? primaryAction.label
+			: primaryAction.label( [ item ] );
+
+	return 'RenderModal' in primaryAction ? (
+		<div role="gridcell" key={ primaryAction.id }>
+			<Composite.Item
+				id={ compositeItemId }
+				render={
+					<Button
+						label={ label }
+						icon={ primaryAction.icon }
+						isDestructive={ primaryAction.isDestructive }
+						size="small"
+						onClick={ () => setIsModalOpen( true ) }
+					/>
+				}
+			>
+				{ isModalOpen && (
+					<ActionModal< Item >
+						action={ primaryAction }
+						items={ [ item ] }
+						closeModal={ () => setIsModalOpen( false ) }
+					/>
+				) }
+			</Composite.Item>
+		</div>
+	) : (
+		<div role="gridcell" key={ primaryAction.id }>
+			<Composite.Item
+				id={ compositeItemId }
+				render={
+					<Button
+						label={ label }
+						icon={ primaryAction.icon }
+						isDestructive={ primaryAction.isDestructive }
+						size="small"
+						onClick={ () => {
+							primaryAction.callback( [ item ], { registry } );
+						} }
+					/>
+				}
+			/>
+		</div>
+	);
+}
+
+function ListItem< Item >( {
+	actions,
+	idPrefix,
+	isSelected,
+	item,
+	mediaField,
+	onSelect,
+	primaryField,
+	visibleFields,
+	onDropdownTriggerKeyDown,
+}: ListViewItemProps< Item > ) {
+	const itemRef = useRef< HTMLDivElement >( null );
+	const labelId = `${ idPrefix }-label`;
+	const descriptionId = `${ idPrefix }-description`;
+
+	const [ isHovered, setIsHovered ] = useState( false );
+	const handleHover: React.MouseEventHandler = ( { type } ) => {
+		const isHover = type === 'mouseenter';
+		setIsHovered( isHover );
+	};
+
+	useEffect( () => {
+		if ( isSelected ) {
+			itemRef.current?.scrollIntoView( {
+				behavior: 'auto',
+				block: 'nearest',
+				inline: 'nearest',
+			} );
+		}
+	}, [ isSelected ] );
+
+	const { primaryAction, eligibleActions } = useMemo( () => {
+		// If an action is eligible for all items, doesn't need
+		// to provide the `isEligible` function.
+		const _eligibleActions = actions.filter(
+			( action ) => ! action.isEligible || action.isEligible( item )
+		);
+		const _primaryActions = _eligibleActions.filter(
+			( action ) => action.isPrimary && !! action.icon
+		);
+		return {
+			primaryAction: _primaryActions?.[ 0 ],
+			eligibleActions: _eligibleActions,
+		};
+	}, [ actions, item ] );
+
+	const renderedMediaField = mediaField?.render ? (
+		<mediaField.render item={ item } />
+	) : (
+		<div className="dataviews-view-list__media-placeholder"></div>
+	);
+
+	const renderedPrimaryField = primaryField?.render ? (
+		<primaryField.render item={ item } />
+	) : null;
+
+	const usedActions = eligibleActions?.length > 0 && (
+		<HStack spacing={ 3 } className="dataviews-view-list__item-actions">
+			{ primaryAction && (
+				<PrimaryActionGridCell
+					idPrefix={ idPrefix }
+					primaryAction={ primaryAction }
+					item={ item }
+				/>
+			) }
+			<div role="gridcell">
+				<DropdownMenu
+					trigger={
+						<Composite.Item
+							id={ generateDropdownTriggerCompositeId(
+								idPrefix
+							) }
+							render={
+								<Button
+									size="small"
+									icon={ moreVertical }
+									label={ __( 'Actions' ) }
+									accessibleWhenDisabled
+									disabled={ ! actions.length }
+									onKeyDown={ onDropdownTriggerKeyDown }
+								/>
+							}
+						/>
+					}
+					placement="bottom-end"
+				>
+					<ActionsDropdownMenuGroup
+						actions={ eligibleActions }
+						item={ item }
+					/>
+				</DropdownMenu>
+			</div>
+		</HStack>
+	);
+
+	return (
+		<Composite.Row
+			ref={ itemRef }
+			render={ <li /> }
+			role="row"
+			className={ clsx( {
+				'is-selected': isSelected,
+				'is-hovered': isHovered,
+			} ) }
+			onMouseEnter={ handleHover }
+			onMouseLeave={ handleHover }
+		>
+			<HStack className="dataviews-view-list__item-wrapper" spacing={ 0 }>
+				<div role="gridcell">
+					<Composite.Item
+						id={ generateItemWrapperCompositeId( idPrefix ) }
+						aria-pressed={ isSelected }
+						aria-labelledby={ labelId }
+						aria-describedby={ descriptionId }
+						className="dataviews-view-list__item"
+						onClick={ () => onSelect( item ) }
+					/>
+				</div>
+				<HStack spacing={ 3 } justify="start" alignment="flex-start">
+					<div className="dataviews-view-list__media-wrapper">
+						{ renderedMediaField }
+					</div>
+					<VStack
+						spacing={ 1 }
+						className="dataviews-view-list__field-wrapper"
+					>
+						<HStack spacing={ 0 }>
+							<div
+								className="dataviews-view-list__primary-field"
+								id={ labelId }
+							>
+								{ renderedPrimaryField }
+							</div>
+							{ usedActions }
+						</HStack>
+						<div
+							className="dataviews-view-list__fields"
+							id={ descriptionId }
+						>
+							{ visibleFields.map( ( field ) => (
+								<div
+									key={ field.id }
+									className="dataviews-view-list__field"
+								>
+									<VisuallyHidden
+										as="span"
+										className="dataviews-view-list__field-label"
+									>
+										{ field.label }
+									</VisuallyHidden>
+									<span className="dataviews-view-list__field-value">
+										<field.render item={ item } />
+									</span>
+								</div>
+							) ) }
+						</div>
+					</VStack>
+				</HStack>
+			</HStack>
+		</Composite.Row>
+	);
+}
+
+export default function ViewList< Item >( props: ViewListProps< Item > ) {
+	const {
+		actions,
+		data,
+		fields,
+		getItemId,
+		isLoading,
+		onChangeSelection,
+		selection,
+		view,
+	} = props;
+	const baseId = useInstanceId( ViewList, 'view-list' );
+
+	const selectedItem = data?.findLast( ( item ) =>
+		selection.includes( getItemId( item ) )
+	);
+
+	const mediaField = fields.find(
+		( field ) => field.id === view.layout?.mediaField
+	);
+	const primaryField = fields.find(
+		( field ) => field.id === view.layout?.primaryField
+	);
+	const viewFields = view.fields || fields.map( ( field ) => field.id );
+	const visibleFields = fields.filter(
+		( field ) =>
+			viewFields.includes( field.id ) &&
+			! [ view.layout?.primaryField, view.layout?.mediaField ].includes(
+				field.id
+			)
+	);
+
+	const onSelect = ( item: Item ) =>
+		onChangeSelection( [ getItemId( item ) ] );
+
+	const generateCompositeItemIdPrefix = useCallback(
+		( item: Item ) => `${ baseId }-${ getItemId( item ) }`,
+		[ baseId, getItemId ]
+	);
+
+	const isActiveCompositeItem = useCallback(
+		( item: Item, idToCheck: string ) => {
+			// All composite items use the same prefix in their IDs.
+			return idToCheck.startsWith(
+				generateCompositeItemIdPrefix( item )
+			);
+		},
+		[ generateCompositeItemIdPrefix ]
+	);
+
+	// Controlled state for the active composite item.
+	const [ activeCompositeId, setActiveCompositeId ] = useState<
+		string | null | undefined
+	>( undefined );
+
+	// Update the active composite item when the selected item changes.
+	useEffect( () => {
+		if ( selectedItem ) {
+			setActiveCompositeId(
+				generateItemWrapperCompositeId(
+					generateCompositeItemIdPrefix( selectedItem )
+				)
+			);
+		}
+	}, [ selectedItem, generateCompositeItemIdPrefix ] );
+
+	const activeItemIndex = data.findIndex( ( item ) =>
+		isActiveCompositeItem( item, activeCompositeId ?? '' )
+	);
+	const previousActiveItemIndex = usePrevious( activeItemIndex );
+	const isActiveIdInList = activeItemIndex !== -1;
+
+	const selectCompositeItem = useCallback(
+		(
+			targetIndex: number,
+			// Allows invokers to specify a custom function to generate the
+			// target composite item ID
+			generateCompositeId: ( idPrefix: string ) => string
+		) => {
+			// Clamping between 0 and data.length - 1 to avoid out of bounds.
+			const clampedIndex = Math.min(
+				data.length - 1,
+				Math.max( 0, targetIndex )
+			);
+			if ( ! data[ clampedIndex ] ) {
+				return;
+			}
+			const itemIdPrefix = generateCompositeItemIdPrefix(
+				data[ clampedIndex ]
+			);
+			const targetCompositeItemId = generateCompositeId( itemIdPrefix );
+
+			setActiveCompositeId( targetCompositeItemId );
+			document.getElementById( targetCompositeItemId )?.focus();
+		},
+		[ data, generateCompositeItemIdPrefix ]
+	);
+
+	// Select a new active composite item when the current active item
+	// is removed from the list.
+	useEffect( () => {
+		const wasActiveIdInList =
+			previousActiveItemIndex !== undefined &&
+			previousActiveItemIndex !== -1;
+		if ( ! isActiveIdInList && wasActiveIdInList ) {
+			// By picking `previousActiveItemIndex` as the next item index, we are
+			// basically picking the item that would have been after the deleted one.
+			// If the previously active (and removed) item was the last of the list,
+			// we will select the item before it — which is the new last item.
+			selectCompositeItem(
+				previousActiveItemIndex,
+				generateItemWrapperCompositeId
+			);
+		}
+	}, [ isActiveIdInList, selectCompositeItem, previousActiveItemIndex ] );
+
+	// Prevent the default behavior (open dropdown menu) and instead select the
+	// dropdown menu trigger on the previous/next row.
+	// https://github.com/ariakit/ariakit/issues/3768
+	const onDropdownTriggerKeyDown = useCallback(
+		( event: React.KeyboardEvent< HTMLButtonElement > ) => {
+			if ( event.key === 'ArrowDown' ) {
+				// Select the dropdown menu trigger item in the next row.
+				event.preventDefault();
+				selectCompositeItem(
+					activeItemIndex + 1,
+					generateDropdownTriggerCompositeId
+				);
+			}
+			if ( event.key === 'ArrowUp' ) {
+				// Select the dropdown menu trigger item in the previous row.
+				event.preventDefault();
+				selectCompositeItem(
+					activeItemIndex - 1,
+					generateDropdownTriggerCompositeId
+				);
+			}
+		},
+		[ selectCompositeItem, activeItemIndex ]
+	);
+
+	const hasData = data?.length;
+	if ( ! hasData ) {
+		return (
+			<div
+				className={ clsx( {
+					'dataviews-loading': isLoading,
+					'dataviews-no-results': ! hasData && ! isLoading,
+				} ) }
+			>
+				{ ! hasData && (
+					<p>{ isLoading ? <Spinner /> : __( 'No results' ) }</p>
+				) }
+			</div>
+		);
+	}
+
+	return (
+		<Composite
+			id={ baseId }
+			render={ <ul /> }
+			className="dataviews-view-list"
+			role="grid"
+			activeId={ activeCompositeId }
+			setActiveId={ setActiveCompositeId }
+		>
+			{ data.map( ( item ) => {
+				const id = generateCompositeItemIdPrefix( item );
+				return (
+					<ListItem
+						key={ id }
+						idPrefix={ id }
+						actions={ actions }
+						item={ item }
+						isSelected={ item === selectedItem }
+						onSelect={ onSelect }
+						mediaField={ mediaField }
+						primaryField={ primaryField }
+						visibleFields={ visibleFields }
+						onDropdownTriggerKeyDown={ onDropdownTriggerKeyDown }
+					/>
+				);
+			} ) }
+		</Composite>
+	);
+}
diff --git a/packages/dataviews/src/dataviews-layouts/list/style.scss b/packages/dataviews/src/dataviews-layouts/list/style.scss
new file mode 100644
index 00000000000000..429f2397c96019
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/list/style.scss
@@ -0,0 +1,187 @@
+ul.dataviews-view-list {
+	list-style-type: none;
+}
+
+.dataviews-view-list {
+	margin: 0 0 auto;
+
+	li {
+		margin: 0;
+		border-top: 1px solid $gray-100;
+
+		.dataviews-view-list__item-wrapper {
+			position: relative;
+			padding: $grid-unit-20 $grid-unit-30;
+		}
+
+		.dataviews-view-list__item-actions {
+			flex: 0;
+			overflow: hidden;
+
+			> div {
+				height: $button-size-small;
+			}
+
+			.components-button {
+				position: relative;
+				z-index: 1;
+				opacity: 0;
+			}
+		}
+
+		&:where(.is-selected, .is-hovered, :focus-within) {
+			.dataviews-view-list__item-actions {
+				flex-basis: min-content;
+				overflow: unset;
+				padding-inline-end: $grid-unit-05;
+
+				.components-button {
+					opacity: 1;
+				}
+			}
+		}
+
+		&.is-selected.is-selected {
+			border-top: 1px solid rgba(var(--wp-admin-theme-color--rgb), 0.12);
+
+			& + li {
+				border-top: 1px solid rgba(var(--wp-admin-theme-color--rgb), 0.12);
+			}
+		}
+
+		&:not(.is-selected) {
+			.dataviews-view-list__primary-field {
+				color: $gray-900;
+			}
+			&:hover,
+			&.is-hovered,
+			&:focus-within {
+				color: var(--wp-admin-theme-color);
+				background-color: #f8f8f8;
+
+				.dataviews-view-list__primary-field,
+				.dataviews-view-list__fields {
+					color: var(--wp-admin-theme-color);
+				}
+			}
+		}
+
+	}
+
+	li.is-selected,
+	li.is-selected:focus-within {
+		.dataviews-view-list__item-wrapper {
+			background-color: rgba(var(--wp-admin-theme-color--rgb), 0.04);
+			color: $gray-900;
+
+			.dataviews-view-list__primary-field,
+			.dataviews-view-list__fields {
+				color: var(--wp-admin-theme-color);
+			}
+		}
+	}
+
+	.dataviews-view-list__item {
+		position: absolute;
+		z-index: 1;
+		inset: 0;
+		scroll-margin: $grid-unit-10 0;
+		appearance: none;
+		border: none;
+		background: none;
+		padding: 0;
+		cursor: pointer;
+
+		&:focus-visible {
+			outline: none;
+
+			&::before {
+				position: absolute;
+				content: "";
+				inset: var(--wp-admin-border-width-focus);
+				box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+				border-radius: $radius-small;
+				// Windows High Contrast mode will show this outline, but not the box-shadow.
+				outline: 2px solid transparent;
+			}
+		}
+	}
+	.dataviews-view-list__primary-field {
+		flex: 1;
+		min-height: $grid-unit-30;
+		line-height: $grid-unit-30;
+		overflow: hidden;
+		// The field should be in front of the main button in case it has a link/button.
+		&:has(a, button) {
+			z-index: 1;
+		}
+	}
+
+	.dataviews-view-list__media-wrapper {
+		width: $grid-unit-05 * 13;
+		height: $grid-unit-05 * 13;
+		overflow: hidden;
+		position: relative;
+		flex-shrink: 0;
+		background-color: $gray-100;
+		border-radius: $grid-unit-05;
+
+		img {
+			width: 100%;
+			height: 100%;
+			object-fit: cover;
+		}
+
+		&::after {
+			content: "";
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			box-shadow: inset 0 0 0 $border-width rgba(0, 0, 0, 0.1);
+			border-radius: $grid-unit-05;
+		}
+	}
+
+	.dataviews-view-list__media-placeholder {
+		width: $grid-unit-05 * 13;
+		height: $grid-unit-05 * 13;
+		background-color: $gray-200;
+	}
+
+	.dataviews-view-list__field-wrapper {
+		min-height: $grid-unit-05 * 13; // Ensures title is centrally aligned when all fields are hidden
+		flex-grow: 1;
+	}
+
+	.dataviews-view-list__fields {
+		color: $gray-700;
+		display: flex;
+		gap: $grid-unit-15;
+		row-gap: $grid-unit-05;
+		flex-wrap: wrap;
+		font-size: 12px;
+
+		&:empty {
+			display: none;
+		}
+
+		.dataviews-view-list__field {
+			&:has(.dataviews-view-list__field-value:empty) {
+				display: none;
+			}
+		}
+
+		.dataviews-view-list__field-value {
+			min-height: $grid-unit-30;
+			line-height: $grid-unit-05 * 5;
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	& + .dataviews-pagination {
+		justify-content: space-between;
+	}
+}
diff --git a/packages/dataviews/src/dataviews-layouts/table/column-header-menu.tsx b/packages/dataviews/src/dataviews-layouts/table/column-header-menu.tsx
new file mode 100644
index 00000000000000..aff211fb613dcf
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/table/column-header-menu.tsx
@@ -0,0 +1,264 @@
+/**
+ * External dependencies
+ */
+import type { ReactNode, Ref, PropsWithoutRef, RefAttributes } from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { arrowLeft, arrowRight, unseen, funnel } from '@wordpress/icons';
+import {
+	Button,
+	Icon,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
+import { forwardRef, Children, Fragment } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { sanitizeOperators } from '../../utils';
+import { SORTING_DIRECTIONS, sortArrows, sortLabels } from '../../constants';
+import type {
+	NormalizedField,
+	SortDirection,
+	ViewTable as ViewTableType,
+	Operator,
+} from '../../types';
+import { getVisibleFieldIds } from '../index';
+
+const { DropdownMenuV2 } = unlock( componentsPrivateApis );
+
+interface HeaderMenuProps< Item > {
+	fieldId: string;
+	view: ViewTableType;
+	fields: NormalizedField< Item >[];
+	onChangeView: ( view: ViewTableType ) => void;
+	onHide: ( field: NormalizedField< Item > ) => void;
+	setOpenedFilter: ( fieldId: string ) => void;
+}
+
+function WithDropDownMenuSeparators( { children }: { children: ReactNode } ) {
+	return Children.toArray( children )
+		.filter( Boolean )
+		.map( ( child, i ) => (
+			<Fragment key={ i }>
+				{ i > 0 && <DropdownMenuV2.Separator /> }
+				{ child }
+			</Fragment>
+		) );
+}
+
+const _HeaderMenu = forwardRef( function HeaderMenu< Item >(
+	{
+		fieldId,
+		view,
+		fields,
+		onChangeView,
+		onHide,
+		setOpenedFilter,
+	}: HeaderMenuProps< Item >,
+	ref: Ref< HTMLButtonElement >
+) {
+	const visibleFieldIds = getVisibleFieldIds( view, fields );
+	const index = visibleFieldIds?.indexOf( fieldId ) as number;
+	const isSorted = view.sort?.field === fieldId;
+	let isHidable = false;
+	let isSortable = false;
+	let canAddFilter = false;
+	let header;
+	let operators: Operator[] = [];
+
+	const combinedField = view.layout?.combinedFields?.find(
+		( f ) => f.id === fieldId
+	);
+	const field = fields.find( ( f ) => f.id === fieldId );
+
+	if ( ! combinedField ) {
+		if ( ! field ) {
+			// No combined or regular field found.
+			return null;
+		}
+
+		isHidable = field.enableHiding !== false;
+		isSortable = field.enableSorting !== false;
+		header = field.header;
+
+		operators = sanitizeOperators( field );
+		// Filter can be added:
+		// 1. If the field is not already part of a view's filters.
+		// 2. If the field meets the type and operator requirements.
+		// 3. If it's not primary. If it is, it should be already visible.
+		canAddFilter =
+			! view.filters?.some( ( _filter ) => fieldId === _filter.field ) &&
+			!! field.elements?.length &&
+			!! operators.length &&
+			! field.filterBy?.isPrimary;
+	} else {
+		header = combinedField.header || combinedField.label;
+	}
+
+	return (
+		<DropdownMenuV2
+			align="start"
+			trigger={
+				<Button
+					size="compact"
+					className="dataviews-view-table-header-button"
+					ref={ ref }
+					variant="tertiary"
+				>
+					{ header }
+					{ view.sort && isSorted && (
+						<span aria-hidden="true">
+							{ sortArrows[ view.sort.direction ] }
+						</span>
+					) }
+				</Button>
+			}
+			style={ { minWidth: '240px' } }
+		>
+			<WithDropDownMenuSeparators>
+				{ isSortable && (
+					<DropdownMenuV2.Group>
+						{ SORTING_DIRECTIONS.map(
+							( direction: SortDirection ) => {
+								const isChecked =
+									view.sort &&
+									isSorted &&
+									view.sort.direction === direction;
+
+								const value = `${ fieldId }-${ direction }`;
+
+								return (
+									<DropdownMenuV2.RadioItem
+										key={ value }
+										// All sorting radio items share the same name, so that
+										// selecting a sorting option automatically deselects the
+										// previously selected one, even if it is displayed in
+										// another submenu. The field and direction are passed via
+										// the `value` prop.
+										name="view-table-sorting"
+										value={ value }
+										checked={ isChecked }
+										onChange={ () => {
+											onChangeView( {
+												...view,
+												sort: {
+													field: fieldId,
+													direction,
+												},
+											} );
+										} }
+									>
+										<DropdownMenuV2.ItemLabel>
+											{ sortLabels[ direction ] }
+										</DropdownMenuV2.ItemLabel>
+									</DropdownMenuV2.RadioItem>
+								);
+							}
+						) }
+					</DropdownMenuV2.Group>
+				) }
+				{ canAddFilter && (
+					<DropdownMenuV2.Group>
+						<DropdownMenuV2.Item
+							prefix={ <Icon icon={ funnel } /> }
+							onClick={ () => {
+								setOpenedFilter( fieldId );
+								onChangeView( {
+									...view,
+									page: 1,
+									filters: [
+										...( view.filters || [] ),
+										{
+											field: fieldId,
+											value: undefined,
+											operator: operators[ 0 ],
+										},
+									],
+								} );
+							} }
+						>
+							<DropdownMenuV2.ItemLabel>
+								{ __( 'Add filter' ) }
+							</DropdownMenuV2.ItemLabel>
+						</DropdownMenuV2.Item>
+					</DropdownMenuV2.Group>
+				) }
+				<DropdownMenuV2.Group>
+					<DropdownMenuV2.Item
+						prefix={ <Icon icon={ arrowLeft } /> }
+						disabled={ index < 1 }
+						onClick={ () => {
+							onChangeView( {
+								...view,
+								fields: [
+									...( visibleFieldIds.slice(
+										0,
+										index - 1
+									) ?? [] ),
+									fieldId,
+									visibleFieldIds[ index - 1 ],
+									...visibleFieldIds.slice( index + 1 ),
+								],
+							} );
+						} }
+					>
+						<DropdownMenuV2.ItemLabel>
+							{ __( 'Move left' ) }
+						</DropdownMenuV2.ItemLabel>
+					</DropdownMenuV2.Item>
+					<DropdownMenuV2.Item
+						prefix={ <Icon icon={ arrowRight } /> }
+						disabled={ index >= visibleFieldIds.length - 1 }
+						onClick={ () => {
+							onChangeView( {
+								...view,
+								fields: [
+									...( visibleFieldIds.slice( 0, index ) ??
+										[] ),
+									visibleFieldIds[ index + 1 ],
+									fieldId,
+									...visibleFieldIds.slice( index + 2 ),
+								],
+							} );
+						} }
+					>
+						<DropdownMenuV2.ItemLabel>
+							{ __( 'Move right' ) }
+						</DropdownMenuV2.ItemLabel>
+					</DropdownMenuV2.Item>
+					{ isHidable && field && (
+						<DropdownMenuV2.Item
+							prefix={ <Icon icon={ unseen } /> }
+							onClick={ () => {
+								onHide( field );
+								onChangeView( {
+									...view,
+									fields: visibleFieldIds.filter(
+										( id ) => id !== fieldId
+									),
+								} );
+							} }
+						>
+							<DropdownMenuV2.ItemLabel>
+								{ __( 'Hide column' ) }
+							</DropdownMenuV2.ItemLabel>
+						</DropdownMenuV2.Item>
+					) }
+				</DropdownMenuV2.Group>
+			</WithDropDownMenuSeparators>
+		</DropdownMenuV2>
+	);
+} );
+
+// @ts-expect-error Lift the `Item` type argument through the forwardRef.
+const ColumnHeaderMenu: < Item >(
+	props: PropsWithoutRef< HeaderMenuProps< Item > > &
+		RefAttributes< HTMLButtonElement >
+) => ReturnType< typeof _HeaderMenu > = _HeaderMenu;
+
+export default ColumnHeaderMenu;
diff --git a/packages/dataviews/src/dataviews-layouts/table/index.tsx b/packages/dataviews/src/dataviews-layouts/table/index.tsx
new file mode 100644
index 00000000000000..4e1607b01489c2
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/table/index.tsx
@@ -0,0 +1,414 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import {
+	Spinner,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { useEffect, useId, useRef, useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import SingleSelectionCheckbox from '../../components/dataviews-selection-checkbox';
+import ItemActions from '../../components/dataviews-item-actions';
+import { sortValues } from '../../constants';
+import {
+	useSomeItemHasAPossibleBulkAction,
+	useHasAPossibleBulkAction,
+	BulkSelectionCheckbox,
+} from '../../components/dataviews-bulk-actions';
+import type {
+	Action,
+	NormalizedField,
+	ViewTable as ViewTableType,
+	ViewTableProps,
+	CombinedField,
+} from '../../types';
+import type { SetSelection } from '../../private-types';
+import ColumnHeaderMenu from './column-header-menu';
+import { getVisibleFieldIds } from '../index';
+
+interface TableColumnFieldProps< Item > {
+	primaryField?: NormalizedField< Item >;
+	field: NormalizedField< Item >;
+	item: Item;
+}
+
+interface TableColumnCombinedProps< Item > {
+	primaryField?: NormalizedField< Item >;
+	fields: NormalizedField< Item >[];
+	field: CombinedField;
+	item: Item;
+	view: ViewTableType;
+}
+
+interface TableColumnProps< Item > {
+	primaryField?: NormalizedField< Item >;
+	fields: NormalizedField< Item >[];
+	item: Item;
+	column: string;
+	view: ViewTableType;
+}
+
+interface TableRowProps< Item > {
+	hasBulkActions: boolean;
+	item: Item;
+	actions: Action< Item >[];
+	fields: NormalizedField< Item >[];
+	id: string;
+	view: ViewTableType;
+	primaryField?: NormalizedField< Item >;
+	selection: string[];
+	getItemId: ( item: Item ) => string;
+	onChangeSelection: SetSelection;
+}
+
+function TableColumn< Item >( {
+	column,
+	fields,
+	view,
+	...props
+}: TableColumnProps< Item > ) {
+	const field = fields.find( ( f ) => f.id === column );
+	if ( !! field ) {
+		return <TableColumnField { ...props } field={ field } />;
+	}
+	const combinedField = view.layout?.combinedFields?.find(
+		( f ) => f.id === column
+	);
+	if ( !! combinedField ) {
+		return (
+			<TableColumnCombined
+				{ ...props }
+				fields={ fields }
+				view={ view }
+				field={ combinedField }
+			/>
+		);
+	}
+
+	return null;
+}
+
+function TableColumnField< Item >( {
+	primaryField,
+	item,
+	field,
+}: TableColumnFieldProps< Item > ) {
+	return (
+		<div
+			className={ clsx( 'dataviews-view-table__cell-content-wrapper', {
+				'dataviews-view-table__primary-field':
+					primaryField?.id === field.id,
+			} ) }
+		>
+			<field.render { ...{ item } } />
+		</div>
+	);
+}
+
+function TableColumnCombined< Item >( {
+	field,
+	...props
+}: TableColumnCombinedProps< Item > ) {
+	const children = field.children.map( ( child ) => (
+		<TableColumn key={ child } { ...props } column={ child } />
+	) );
+
+	if ( field.direction === 'horizontal' ) {
+		return <HStack spacing={ 3 }>{ children }</HStack>;
+	}
+	return <VStack spacing={ 0 }>{ children }</VStack>;
+}
+
+function TableRow< Item >( {
+	hasBulkActions,
+	item,
+	actions,
+	fields,
+	id,
+	view,
+	primaryField,
+	selection,
+	getItemId,
+	onChangeSelection,
+}: TableRowProps< Item > ) {
+	const hasPossibleBulkAction = useHasAPossibleBulkAction( actions, item );
+	const isSelected = hasPossibleBulkAction && selection.includes( id );
+	const [ isHovered, setIsHovered ] = useState( false );
+
+	const handleMouseEnter = () => {
+		setIsHovered( true );
+	};
+	const handleMouseLeave = () => {
+		setIsHovered( false );
+	};
+
+	// Will be set to true if `onTouchStart` fires. This happens before
+	// `onClick` and can be used to exclude touchscreen devices from certain
+	// behaviours.
+	const isTouchDeviceRef = useRef( false );
+	const columns = getVisibleFieldIds( view, fields );
+
+	return (
+		<tr
+			className={ clsx( 'dataviews-view-table__row', {
+				'is-selected': hasPossibleBulkAction && isSelected,
+				'is-hovered': isHovered,
+				'has-bulk-actions': hasPossibleBulkAction,
+			} ) }
+			onMouseEnter={ handleMouseEnter }
+			onMouseLeave={ handleMouseLeave }
+			onTouchStart={ () => {
+				isTouchDeviceRef.current = true;
+			} }
+			onClick={ () => {
+				if ( ! hasPossibleBulkAction ) {
+					return;
+				}
+				if (
+					! isTouchDeviceRef.current &&
+					document.getSelection()?.type !== 'Range'
+				) {
+					onChangeSelection(
+						selection.includes( id )
+							? selection.filter( ( itemId ) => id !== itemId )
+							: [ id ]
+					);
+				}
+			} }
+		>
+			{ hasBulkActions && (
+				<td
+					className="dataviews-view-table__checkbox-column"
+					style={ {
+						width: '1%',
+					} }
+				>
+					<div className="dataviews-view-table__cell-content-wrapper">
+						<SingleSelectionCheckbox
+							item={ item }
+							selection={ selection }
+							onChangeSelection={ onChangeSelection }
+							getItemId={ getItemId }
+							primaryField={ primaryField }
+							disabled={ ! hasPossibleBulkAction }
+						/>
+					</div>
+				</td>
+			) }
+			{ columns.map( ( column: string ) => {
+				// Explicits picks the supported styles.
+				const { width, maxWidth, minWidth } =
+					view.layout?.styles?.[ column ] ?? {};
+
+				return (
+					<td key={ column } style={ { width, maxWidth, minWidth } }>
+						<TableColumn
+							primaryField={ primaryField }
+							fields={ fields }
+							item={ item }
+							column={ column }
+							view={ view }
+						/>
+					</td>
+				);
+			} ) }
+			{ !! actions?.length && (
+				// Disable reason: we are not making the element interactive,
+				// but preventing any click events from bubbling up to the
+				// table row. This allows us to add a click handler to the row
+				// itself (to toggle row selection) without erroneously
+				// intercepting click events from ItemActions.
+
+				/* eslint-disable jsx-a11y/no-noninteractive-element-interactions, jsx-a11y/click-events-have-key-events */
+				<td
+					className="dataviews-view-table__actions-column"
+					onClick={ ( e ) => e.stopPropagation() }
+				>
+					<ItemActions item={ item } actions={ actions } />
+				</td>
+				/* eslint-enable jsx-a11y/no-noninteractive-element-interactions, jsx-a11y/click-events-have-key-events */
+			) }
+		</tr>
+	);
+}
+
+function ViewTable< Item >( {
+	actions,
+	data,
+	fields,
+	getItemId,
+	isLoading = false,
+	onChangeView,
+	onChangeSelection,
+	selection,
+	setOpenedFilter,
+	view,
+}: ViewTableProps< Item > ) {
+	const headerMenuRefs = useRef<
+		Map< string, { node: HTMLButtonElement; fallback: string } >
+	>( new Map() );
+	const headerMenuToFocusRef = useRef< HTMLButtonElement >();
+	const [ nextHeaderMenuToFocus, setNextHeaderMenuToFocus ] =
+		useState< HTMLButtonElement >();
+	const hasBulkActions = useSomeItemHasAPossibleBulkAction( actions, data );
+
+	useEffect( () => {
+		if ( headerMenuToFocusRef.current ) {
+			headerMenuToFocusRef.current.focus();
+			headerMenuToFocusRef.current = undefined;
+		}
+	} );
+
+	const tableNoticeId = useId();
+
+	if ( nextHeaderMenuToFocus ) {
+		// If we need to force focus, we short-circuit rendering here
+		// to prevent any additional work while we handle that.
+		// Clearing out the focus directive is necessary to make sure
+		// future renders don't cause unexpected focus jumps.
+		headerMenuToFocusRef.current = nextHeaderMenuToFocus;
+		setNextHeaderMenuToFocus( undefined );
+		return;
+	}
+
+	const onHide = ( field: NormalizedField< Item > ) => {
+		const hidden = headerMenuRefs.current.get( field.id );
+		const fallback = hidden
+			? headerMenuRefs.current.get( hidden.fallback )
+			: undefined;
+		setNextHeaderMenuToFocus( fallback?.node );
+	};
+
+	const columns = getVisibleFieldIds( view, fields );
+	const hasData = !! data?.length;
+
+	const primaryField = fields.find(
+		( field ) => field.id === view.layout?.primaryField
+	);
+
+	return (
+		<>
+			<table
+				className="dataviews-view-table"
+				aria-busy={ isLoading }
+				aria-describedby={ tableNoticeId }
+			>
+				<thead>
+					<tr className="dataviews-view-table__row">
+						{ hasBulkActions && (
+							<th
+								className="dataviews-view-table__checkbox-column"
+								style={ {
+									width: '1%',
+								} }
+								scope="col"
+							>
+								<BulkSelectionCheckbox
+									selection={ selection }
+									onChangeSelection={ onChangeSelection }
+									data={ data }
+									actions={ actions }
+									getItemId={ getItemId }
+								/>
+							</th>
+						) }
+						{ columns.map( ( column, index ) => {
+							// Explicits picks the supported styles.
+							const { width, maxWidth, minWidth } =
+								view.layout?.styles?.[ column ] ?? {};
+							return (
+								<th
+									key={ column }
+									style={ { width, maxWidth, minWidth } }
+									aria-sort={
+										view.sort?.field === column
+											? sortValues[ view.sort.direction ]
+											: undefined
+									}
+									scope="col"
+								>
+									<ColumnHeaderMenu
+										ref={ ( node ) => {
+											if ( node ) {
+												headerMenuRefs.current.set(
+													column,
+													{
+														node,
+														fallback:
+															columns[
+																index > 0
+																	? index - 1
+																	: 1
+															],
+													}
+												);
+											} else {
+												headerMenuRefs.current.delete(
+													column
+												);
+											}
+										} }
+										fieldId={ column }
+										view={ view }
+										fields={ fields }
+										onChangeView={ onChangeView }
+										onHide={ onHide }
+										setOpenedFilter={ setOpenedFilter }
+									/>
+								</th>
+							);
+						} ) }
+						{ !! actions?.length && (
+							<th className="dataviews-view-table__actions-column">
+								<span className="dataviews-view-table-header">
+									{ __( 'Actions' ) }
+								</span>
+							</th>
+						) }
+					</tr>
+				</thead>
+				<tbody>
+					{ hasData &&
+						data.map( ( item, index ) => (
+							<TableRow
+								key={ getItemId( item ) }
+								item={ item }
+								hasBulkActions={ hasBulkActions }
+								actions={ actions }
+								fields={ fields }
+								id={ getItemId( item ) || index.toString() }
+								view={ view }
+								primaryField={ primaryField }
+								selection={ selection }
+								getItemId={ getItemId }
+								onChangeSelection={ onChangeSelection }
+							/>
+						) ) }
+				</tbody>
+			</table>
+			<div
+				className={ clsx( {
+					'dataviews-loading': isLoading,
+					'dataviews-no-results': ! hasData && ! isLoading,
+				} ) }
+				id={ tableNoticeId }
+			>
+				{ ! hasData && (
+					<p>{ isLoading ? <Spinner /> : __( 'No results' ) }</p>
+				) }
+			</div>
+		</>
+	);
+}
+
+export default ViewTable;
diff --git a/packages/dataviews/src/dataviews-layouts/table/style.scss b/packages/dataviews/src/dataviews-layouts/table/style.scss
new file mode 100644
index 00000000000000..ea2c614e4339df
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/table/style.scss
@@ -0,0 +1,192 @@
+.dataviews-view-table {
+	width: 100%;
+	text-indent: 0;
+	border-color: inherit;
+	border-collapse: collapse;
+	position: relative;
+	color: $gray-700;
+	margin-bottom: auto;
+
+	th {
+		text-align: left;
+		color: $gray-900;
+		font-weight: normal;
+		font-size: $default-font-size;
+	}
+	td,
+	th {
+		padding: $grid-unit-15;
+		white-space: nowrap;
+
+		&.dataviews-view-table__actions-column {
+			text-align: right;
+		}
+
+		&.dataviews-view-table__checkbox-column {
+			padding-right: 0;
+		}
+	}
+	tr {
+		border-top: 1px solid $gray-100;
+
+		.dataviews-view-table-header-button {
+			gap: $grid-unit-05;
+		}
+
+		td:first-child,
+		th:first-child {
+			padding-left: $grid-unit-60;
+
+			.dataviews-view-table-header-button,
+			.dataviews-view-table-header {
+				margin-left: - #{$grid-unit-10};
+			}
+		}
+
+		td:last-child,
+		th:last-child {
+			padding-right: $grid-unit-60;
+		}
+
+		&:last-child {
+			border-bottom: 0;
+		}
+
+		&.is-hovered {
+			background-color: #f8f8f8;
+		}
+
+		.components-checkbox-control__input.components-checkbox-control__input {
+			opacity: 0;
+
+			&:checked,
+			&:indeterminate,
+			&:focus {
+				opacity: 1;
+			}
+		}
+
+		.dataviews-item-actions .components-button:not(.dataviews-all-actions-button) {
+			opacity: 0;
+		}
+
+		&:focus-within,
+		&.is-hovered,
+		&:hover {
+			.components-checkbox-control__input,
+			.dataviews-item-actions .components-button:not(.dataviews-all-actions-button) {
+				opacity: 1;
+			}
+		}
+
+		@media (hover: none) {
+			// Show checkboxes and quick-actions on devices that do not support hover.
+			.components-checkbox-control__input.components-checkbox-control__input,
+			.dataviews-item-actions .components-button:not(.dataviews-all-actions-button) {
+				opacity: 1;
+			}
+		}
+
+		&.is-selected {
+			background-color: rgba(var(--wp-admin-theme-color--rgb), 0.04);
+			color: $gray-700;
+
+			&,
+			& + tr {
+				border-top: 1px solid rgba(var(--wp-admin-theme-color--rgb), 0.12);
+			}
+
+			&:hover {
+				background-color: rgba(var(--wp-admin-theme-color--rgb), 0.08);
+			}
+		}
+	}
+	thead {
+		position: sticky;
+		inset-block-start: 0;
+		z-index: z-index(".dataviews-view-table thead");
+
+		tr {
+			border: 0;
+		}
+		th {
+			background-color: $white;
+			padding-top: $grid-unit-10;
+			padding-bottom: $grid-unit-10;
+			padding-left: $grid-unit-15;
+			font-size: 11px;
+			text-transform: uppercase;
+			font-weight: 500;
+
+			&:has(.dataviews-view-table-header-button):not(:first-child) {
+				padding-left: $grid-unit-05;
+			}
+		}
+	}
+	tbody {
+		td {
+			vertical-align: top;
+		}
+		.dataviews-view-table__cell-content-wrapper {
+			min-height: $grid-unit-40;
+			display: flex;
+			align-items: center;
+		}
+
+		.components-v-stack > .dataviews-view-table__cell-content-wrapper:not(:first-child) {
+			min-height: 0;
+		}
+	}
+	.dataviews-view-table-header-button {
+		padding: $grid-unit-05 $grid-unit-10;
+		font-size: 11px;
+		text-transform: uppercase;
+		font-weight: 500;
+
+		&:not(:hover) {
+			color: $gray-900;
+		}
+
+		span {
+			speak: none;
+
+			&:empty {
+				display: none;
+			}
+		}
+	}
+
+	.dataviews-view-table-header {
+		padding-left: $grid-unit-05;
+	}
+
+	.dataviews-view-table__actions-column {
+		width: 1%;
+	}
+
+	&:has(tr.is-selected) {
+		.components-checkbox-control__input {
+			opacity: 1;
+		}
+	}
+}
+
+/* stylelint-disable-next-line scss/at-rule-no-unknown -- '@container' not globally permitted */
+@container (max-width: 430px) {
+	.dataviews-view-table tr td:first-child,
+	.dataviews-view-table tr th:first-child {
+		padding-left: $grid-unit-30;
+	}
+
+	.dataviews-view-table tr td:last-child,
+	.dataviews-view-table tr th:last-child {
+		padding-right: $grid-unit-30;
+	}
+}
+
+.dataviews-view-table-selection-checkbox {
+	--checkbox-input-size: 24px;
+	@include break-small() {
+		--checkbox-input-size: 16px;
+	}
+}
diff --git a/packages/dataviews/src/dataviews.js b/packages/dataviews/src/dataviews.js
deleted file mode 100644
index b75155e8fddf0a..00000000000000
--- a/packages/dataviews/src/dataviews.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalVStack as VStack,
-	__experimentalHStack as HStack,
-} from '@wordpress/components';
-import { useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import Pagination from './pagination';
-import ViewActions from './view-actions';
-import Filters from './filters';
-import Search from './search';
-import { VIEW_LAYOUTS } from './constants';
-
-export default function DataViews( {
-	view,
-	onChangeView,
-	fields,
-	search = true,
-	searchLabel = undefined,
-	actions,
-	data,
-	getItemId,
-	isLoading = false,
-	paginationInfo,
-	supportedLayouts,
-} ) {
-	const ViewComponent = VIEW_LAYOUTS.find(
-		( v ) => v.type === view.type
-	).component;
-	const _fields = useMemo( () => {
-		return fields.map( ( field ) => ( {
-			...field,
-			render: field.render || field.getValue,
-		} ) );
-	}, [ fields ] );
-	return (
-		<div className="dataviews-wrapper">
-			<VStack spacing={ 4 } justify="flex-start">
-				<HStack alignment="flex-start">
-					<HStack justify="start" wrap>
-						{ search && (
-							<Search
-								label={ searchLabel }
-								view={ view }
-								onChangeView={ onChangeView }
-							/>
-						) }
-						<Filters
-							fields={ fields }
-							view={ view }
-							onChangeView={ onChangeView }
-						/>
-					</HStack>
-					<ViewActions
-						fields={ fields }
-						view={ view }
-						onChangeView={ onChangeView }
-						supportedLayouts={ supportedLayouts }
-					/>
-				</HStack>
-				<ViewComponent
-					fields={ _fields }
-					view={ view }
-					onChangeView={ onChangeView }
-					paginationInfo={ paginationInfo }
-					actions={ actions }
-					data={ data }
-					getItemId={ getItemId }
-					isLoading={ isLoading }
-				/>
-				<Pagination
-					view={ view }
-					onChangeView={ onChangeView }
-					paginationInfo={ paginationInfo }
-				/>
-			</VStack>
-		</div>
-	);
-}
diff --git a/packages/dataviews/src/field-types/datetime.tsx b/packages/dataviews/src/field-types/datetime.tsx
new file mode 100644
index 00000000000000..aa97fc86c318c2
--- /dev/null
+++ b/packages/dataviews/src/field-types/datetime.tsx
@@ -0,0 +1,28 @@
+/**
+ * Internal dependencies
+ */
+import type { SortDirection, ValidationContext } from '../types';
+
+function sort( a: any, b: any, direction: SortDirection ) {
+	const timeA = new Date( a ).getTime();
+	const timeB = new Date( b ).getTime();
+
+	return direction === 'asc' ? timeA - timeB : timeB - timeA;
+}
+
+function isValid( value: any, context?: ValidationContext ) {
+	if ( context?.elements ) {
+		const validValues = context?.elements.map( ( f ) => f.value );
+		if ( ! validValues.includes( value ) ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+export default {
+	sort,
+	isValid,
+	Edit: 'datetime',
+};
diff --git a/packages/dataviews/src/field-types/index.tsx b/packages/dataviews/src/field-types/index.tsx
new file mode 100644
index 00000000000000..eb9dada479c6bf
--- /dev/null
+++ b/packages/dataviews/src/field-types/index.tsx
@@ -0,0 +1,50 @@
+/**
+ * Internal dependencies
+ */
+import type { FieldType, SortDirection, ValidationContext } from '../types';
+import { default as integer } from './integer';
+import { default as text } from './text';
+import { default as datetime } from './datetime';
+
+/**
+ *
+ * @param {FieldType} type The field type definition to get.
+ *
+ * @return A field type definition.
+ */
+export default function getFieldTypeDefinition( type?: FieldType ) {
+	if ( 'integer' === type ) {
+		return integer;
+	}
+
+	if ( 'text' === type ) {
+		return text;
+	}
+
+	if ( 'datetime' === type ) {
+		return datetime;
+	}
+
+	return {
+		sort: ( a: any, b: any, direction: SortDirection ) => {
+			if ( typeof a === 'number' && typeof b === 'number' ) {
+				return direction === 'asc' ? a - b : b - a;
+			}
+
+			return direction === 'asc'
+				? a.localeCompare( b )
+				: b.localeCompare( a );
+		},
+		isValid: ( value: any, context?: ValidationContext ) => {
+			if ( context?.elements ) {
+				const validValues = context?.elements?.map( ( f ) => f.value );
+				if ( ! validValues.includes( value ) ) {
+					return false;
+				}
+			}
+
+			return true;
+		},
+		Edit: () => null,
+	};
+}
diff --git a/packages/dataviews/src/field-types/integer.tsx b/packages/dataviews/src/field-types/integer.tsx
new file mode 100644
index 00000000000000..f57c8e382db816
--- /dev/null
+++ b/packages/dataviews/src/field-types/integer.tsx
@@ -0,0 +1,34 @@
+/**
+ * Internal dependencies
+ */
+import type { SortDirection, ValidationContext } from '../types';
+
+function sort( a: any, b: any, direction: SortDirection ) {
+	return direction === 'asc' ? a - b : b - a;
+}
+
+function isValid( value: any, context?: ValidationContext ) {
+	// TODO: this implicitely means the value is required.
+	if ( value === '' ) {
+		return false;
+	}
+
+	if ( ! Number.isInteger( Number( value ) ) ) {
+		return false;
+	}
+
+	if ( context?.elements ) {
+		const validValues = context?.elements.map( ( f ) => f.value );
+		if ( ! validValues.includes( Number( value ) ) ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+export default {
+	sort,
+	isValid,
+	Edit: 'integer',
+};
diff --git a/packages/dataviews/src/field-types/text.tsx b/packages/dataviews/src/field-types/text.tsx
new file mode 100644
index 00000000000000..76ff699d0848c4
--- /dev/null
+++ b/packages/dataviews/src/field-types/text.tsx
@@ -0,0 +1,27 @@
+/**
+ * Internal dependencies
+ */
+import type { SortDirection, ValidationContext } from '../types';
+
+function sort( valueA: any, valueB: any, direction: SortDirection ) {
+	return direction === 'asc'
+		? valueA.localeCompare( valueB )
+		: valueB.localeCompare( valueA );
+}
+
+function isValid( value: any, context?: ValidationContext ) {
+	if ( context?.elements ) {
+		const validValues = context?.elements?.map( ( f ) => f.value );
+		if ( ! validValues.includes( value ) ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+export default {
+	sort,
+	isValid,
+	Edit: 'text',
+};
diff --git a/packages/dataviews/src/filter-and-sort-data-view.ts b/packages/dataviews/src/filter-and-sort-data-view.ts
new file mode 100644
index 00000000000000..da2e9915d515ba
--- /dev/null
+++ b/packages/dataviews/src/filter-and-sort-data-view.ts
@@ -0,0 +1,165 @@
+/**
+ * External dependencies
+ */
+import removeAccents from 'remove-accents';
+
+/**
+ * Internal dependencies
+ */
+import {
+	OPERATOR_IS,
+	OPERATOR_IS_NOT,
+	OPERATOR_IS_NONE,
+	OPERATOR_IS_ANY,
+	OPERATOR_IS_ALL,
+	OPERATOR_IS_NOT_ALL,
+} from './constants';
+import { normalizeFields } from './normalize-fields';
+import type { Field, View } from './types';
+
+function normalizeSearchInput( input = '' ) {
+	return removeAccents( input.trim().toLowerCase() );
+}
+
+const EMPTY_ARRAY: [] = [];
+
+/**
+ * Applies the filtering, sorting and pagination to the raw data based on the view configuration.
+ *
+ * @param data   Raw data.
+ * @param view   View config.
+ * @param fields Fields config.
+ *
+ * @return Filtered, sorted and paginated data.
+ */
+export function filterSortAndPaginate< Item >(
+	data: Item[],
+	view: View,
+	fields: Field< Item >[]
+): {
+	data: Item[];
+	paginationInfo: { totalItems: number; totalPages: number };
+} {
+	if ( ! data ) {
+		return {
+			data: EMPTY_ARRAY,
+			paginationInfo: { totalItems: 0, totalPages: 0 },
+		};
+	}
+	const _fields = normalizeFields( fields );
+	let filteredData = [ ...data ];
+	// Handle global search.
+	if ( view.search ) {
+		const normalizedSearch = normalizeSearchInput( view.search );
+		filteredData = filteredData.filter( ( item ) => {
+			return _fields
+				.filter( ( field ) => field.enableGlobalSearch )
+				.map( ( field ) => {
+					return normalizeSearchInput( field.getValue( { item } ) );
+				} )
+				.some( ( field ) => field.includes( normalizedSearch ) );
+		} );
+	}
+
+	if ( view.filters && view.filters?.length > 0 ) {
+		view.filters.forEach( ( filter ) => {
+			const field = _fields.find(
+				( _field ) => _field.id === filter.field
+			);
+			if ( field ) {
+				if (
+					filter.operator === OPERATOR_IS_ANY &&
+					filter?.value?.length > 0
+				) {
+					filteredData = filteredData.filter( ( item ) => {
+						const fieldValue = field.getValue( { item } );
+						if ( Array.isArray( fieldValue ) ) {
+							return filter.value.some( ( filterValue: any ) =>
+								fieldValue.includes( filterValue )
+							);
+						} else if ( typeof fieldValue === 'string' ) {
+							return filter.value.includes( fieldValue );
+						}
+						return false;
+					} );
+				} else if (
+					filter.operator === OPERATOR_IS_NONE &&
+					filter?.value?.length > 0
+				) {
+					filteredData = filteredData.filter( ( item ) => {
+						const fieldValue = field.getValue( { item } );
+						if ( Array.isArray( fieldValue ) ) {
+							return ! filter.value.some( ( filterValue: any ) =>
+								fieldValue.includes( filterValue )
+							);
+						} else if ( typeof fieldValue === 'string' ) {
+							return ! filter.value.includes( fieldValue );
+						}
+						return false;
+					} );
+				} else if (
+					filter.operator === OPERATOR_IS_ALL &&
+					filter?.value?.length > 0
+				) {
+					filteredData = filteredData.filter( ( item ) => {
+						return filter.value.every( ( value: any ) => {
+							return field
+								.getValue( { item } )
+								?.includes( value );
+						} );
+					} );
+				} else if (
+					filter.operator === OPERATOR_IS_NOT_ALL &&
+					filter?.value?.length > 0
+				) {
+					filteredData = filteredData.filter( ( item ) => {
+						return filter.value.every( ( value: any ) => {
+							return ! field
+								.getValue( { item } )
+								?.includes( value );
+						} );
+					} );
+				} else if ( filter.operator === OPERATOR_IS ) {
+					filteredData = filteredData.filter( ( item ) => {
+						return filter.value === field.getValue( { item } );
+					} );
+				} else if ( filter.operator === OPERATOR_IS_NOT ) {
+					filteredData = filteredData.filter( ( item ) => {
+						return filter.value !== field.getValue( { item } );
+					} );
+				}
+			}
+		} );
+	}
+
+	// Handle sorting.
+	if ( view.sort ) {
+		const fieldId = view.sort.field;
+		const fieldToSort = _fields.find( ( field ) => {
+			return field.id === fieldId;
+		} );
+		if ( fieldToSort ) {
+			filteredData.sort( ( a, b ) => {
+				return fieldToSort.sort( a, b, view.sort?.direction ?? 'desc' );
+			} );
+		}
+	}
+
+	// Handle pagination.
+	let totalItems = filteredData.length;
+	let totalPages = 1;
+	if ( view.page !== undefined && view.perPage !== undefined ) {
+		const start = ( view.page - 1 ) * view.perPage;
+		totalItems = filteredData?.length || 0;
+		totalPages = Math.ceil( totalItems / view.perPage );
+		filteredData = filteredData?.slice( start, start + view.perPage );
+	}
+
+	return {
+		data: filteredData,
+		paginationInfo: {
+			totalItems,
+			totalPages,
+		},
+	};
+}
diff --git a/packages/dataviews/src/filter-summary.js b/packages/dataviews/src/filter-summary.js
deleted file mode 100644
index 3c30c6837103a7..00000000000000
--- a/packages/dataviews/src/filter-summary.js
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	Button,
-	privateApis as componentsPrivateApis,
-	Icon,
-} from '@wordpress/components';
-import { chevronDown, chevronRightSmall, check } from '@wordpress/icons';
-import { __, sprintf } from '@wordpress/i18n';
-import { Children, Fragment } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { OPERATOR_IN, OPERATOR_NOT_IN } from './constants';
-import { unlock } from './lock-unlock';
-
-const {
-	DropdownMenuV2: DropdownMenu,
-	DropdownMenuGroupV2: DropdownMenuGroup,
-	DropdownMenuItemV2: DropdownMenuItem,
-	DropdownMenuSeparatorV2: DropdownMenuSeparator,
-	DropdownSubMenuV2: DropdownSubMenu,
-	DropdownSubMenuTriggerV2: DropdownSubMenuTrigger,
-} = unlock( componentsPrivateApis );
-
-const FilterText = ( { activeElement, filterInView, filter } ) => {
-	if ( activeElement === undefined ) {
-		return filter.name;
-	}
-
-	if (
-		activeElement !== undefined &&
-		filterInView?.operator === OPERATOR_IN
-	) {
-		return sprintf(
-			/* translators: 1: Filter name. 2: Filter value. e.g.: "Author is Admin". */
-			__( '%1$s is %2$s' ),
-			filter.name,
-			activeElement.label
-		);
-	}
-
-	if (
-		activeElement !== undefined &&
-		filterInView?.operator === OPERATOR_NOT_IN
-	) {
-		return sprintf(
-			/* translators: 1: Filter name. 2: Filter value. e.g.: "Author is not Admin". */
-			__( '%1$s is not %2$s' ),
-			filter.name,
-			activeElement.label
-		);
-	}
-
-	return sprintf(
-		/* translators: 1: Filter name e.g.: "Unknown status for Author". */
-		__( 'Unknown status for %1$s' ),
-		filter.name
-	);
-};
-
-function WithSeparators( { children } ) {
-	return Children.toArray( children )
-		.filter( Boolean )
-		.map( ( child, i ) => (
-			<Fragment key={ i }>
-				{ i > 0 && <DropdownMenuSeparator /> }
-				{ child }
-			</Fragment>
-		) );
-}
-
-export default function FilterSummary( { filter, view, onChangeView } ) {
-	const filterInView = view.filters.find( ( f ) => f.field === filter.field );
-	const activeElement = filter.elements.find(
-		( element ) => element.value === filterInView?.value
-	);
-
-	return (
-		<DropdownMenu
-			key={ filter.field }
-			trigger={
-				<Button variant="tertiary" size="compact" label={ filter.name }>
-					<FilterText
-						activeElement={ activeElement }
-						filterInView={ filterInView }
-						filter={ filter }
-					/>
-					<Icon icon={ chevronDown } style={ { flexShrink: 0 } } />
-				</Button>
-			}
-		>
-			<WithSeparators>
-				<DropdownMenuGroup>
-					{ filter.elements.map( ( element ) => {
-						return (
-							<DropdownMenuItem
-								key={ element.value }
-								role="menuitemradio"
-								aria-checked={
-									activeElement?.value === element.value
-								}
-								prefix={
-									activeElement?.value === element.value && (
-										<Icon icon={ check } />
-									)
-								}
-								onSelect={ () =>
-									onChangeView( ( currentView ) => ( {
-										...currentView,
-										page: 1,
-										filters: [
-											...view.filters.filter(
-												( f ) =>
-													f.field !== filter.field
-											),
-											{
-												field: filter.field,
-												operator:
-													filterInView?.operator ||
-													filter.operators[ 0 ],
-												value:
-													activeElement?.value ===
-													element.value
-														? undefined
-														: element.value,
-											},
-										],
-									} ) )
-								}
-							>
-								{ element.label }
-							</DropdownMenuItem>
-						);
-					} ) }
-				</DropdownMenuGroup>
-				{ filter.operators.length > 1 && (
-					<DropdownSubMenu
-						trigger={
-							<DropdownSubMenuTrigger
-								suffix={
-									<>
-										{ filterInView.operator === OPERATOR_IN
-											? __( 'Is' )
-											: __( 'Is not' ) }
-										<Icon icon={ chevronRightSmall } />{ ' ' }
-									</>
-								}
-							>
-								{ __( 'Conditions' ) }
-							</DropdownSubMenuTrigger>
-						}
-					>
-						<DropdownMenuItem
-							key="in-filter"
-							role="menuitemradio"
-							aria-checked={
-								filterInView?.operator === OPERATOR_IN
-							}
-							prefix={
-								filterInView?.operator === OPERATOR_IN && (
-									<Icon icon={ check } />
-								)
-							}
-							onSelect={ () =>
-								onChangeView( ( currentView ) => ( {
-									...currentView,
-									page: 1,
-									filters: [
-										...view.filters.filter(
-											( f ) => f.field !== filter.field
-										),
-										{
-											field: filter.field,
-											operator: OPERATOR_IN,
-											value: filterInView?.value,
-										},
-									],
-								} ) )
-							}
-						>
-							{ __( 'Is' ) }
-						</DropdownMenuItem>
-						<DropdownMenuItem
-							key="not-in-filter"
-							role="menuitemradio"
-							aria-checked={
-								filterInView?.operator === OPERATOR_NOT_IN
-							}
-							prefix={
-								filterInView?.operator === OPERATOR_NOT_IN && (
-									<Icon icon={ check } />
-								)
-							}
-							onSelect={ () =>
-								onChangeView( ( currentView ) => ( {
-									...currentView,
-									page: 1,
-									filters: [
-										...view.filters.filter(
-											( f ) => f.field !== filter.field
-										),
-										{
-											field: filter.field,
-											operator: OPERATOR_NOT_IN,
-											value: filterInView?.value,
-										},
-									],
-								} ) )
-							}
-						>
-							{ __( 'Is not' ) }
-						</DropdownMenuItem>
-					</DropdownSubMenu>
-				) }
-			</WithSeparators>
-		</DropdownMenu>
-	);
-}
diff --git a/packages/dataviews/src/filters.js b/packages/dataviews/src/filters.js
deleted file mode 100644
index e2d24e7a848eea..00000000000000
--- a/packages/dataviews/src/filters.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Internal dependencies
- */
-import FilterSummary from './filter-summary';
-import AddFilter from './add-filter';
-import ResetFilters from './reset-filters';
-import { ENUMERATION_TYPE, OPERATOR_IN, OPERATOR_NOT_IN } from './constants';
-
-const operatorsFromField = ( field ) => {
-	let operators = field.filterBy?.operators;
-	if ( ! operators || ! Array.isArray( operators ) ) {
-		operators = [ OPERATOR_IN, OPERATOR_NOT_IN ];
-	}
-	return operators.filter( ( operator ) =>
-		[ OPERATOR_IN, OPERATOR_NOT_IN ].includes( operator )
-	);
-};
-
-export default function Filters( { fields, view, onChangeView } ) {
-	const filters = [];
-	fields.forEach( ( field ) => {
-		if ( ! field.type ) {
-			return;
-		}
-
-		const operators = operatorsFromField( field );
-		if ( operators.length === 0 ) {
-			return;
-		}
-
-		switch ( field.type ) {
-			case ENUMERATION_TYPE:
-				filters.push( {
-					field: field.id,
-					name: field.header,
-					elements: field.elements || [],
-					operators,
-					isVisible: view.filters.some(
-						( f ) =>
-							f.field === field.id &&
-							[ OPERATOR_IN, OPERATOR_NOT_IN ].includes(
-								f.operator
-							)
-					),
-				} );
-		}
-	} );
-
-	const filterComponents = filters.map( ( filter ) => {
-		if ( ! filter.isVisible ) {
-			return null;
-		}
-
-		return (
-			<FilterSummary
-				key={ filter.field + '.' + filter.operator }
-				filter={ filter }
-				view={ view }
-				onChangeView={ onChangeView }
-			/>
-		);
-	} );
-
-	filterComponents.push(
-		<AddFilter
-			key="add-filter"
-			fields={ fields }
-			view={ view }
-			onChangeView={ onChangeView }
-		/>
-	);
-
-	if ( filterComponents.length > 1 ) {
-		filterComponents.push(
-			<ResetFilters
-				key="reset-filters"
-				view={ view }
-				onChangeView={ onChangeView }
-			/>
-		);
-	}
-
-	return filterComponents;
-}
diff --git a/packages/dataviews/src/index.js b/packages/dataviews/src/index.js
deleted file mode 100644
index 01c67b34c5c99d..00000000000000
--- a/packages/dataviews/src/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as DataViews } from './dataviews';
-export { VIEW_LAYOUTS } from './constants';
diff --git a/packages/dataviews/src/index.ts b/packages/dataviews/src/index.ts
new file mode 100644
index 00000000000000..4ca0cf3db0bd3f
--- /dev/null
+++ b/packages/dataviews/src/index.ts
@@ -0,0 +1,6 @@
+export { default as DataViews } from './components/dataviews';
+export { default as DataForm } from './components/dataform';
+export { VIEW_LAYOUTS } from './dataviews-layouts';
+export { filterSortAndPaginate } from './filter-and-sort-data-view';
+export type * from './types';
+export { isItemValid } from './validation';
diff --git a/packages/dataviews/src/item-actions.js b/packages/dataviews/src/item-actions.js
deleted file mode 100644
index 1b0bd5f213ca8e..00000000000000
--- a/packages/dataviews/src/item-actions.js
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	Button,
-	Modal,
-	__experimentalHStack as HStack,
-	privateApis as componentsPrivateApis,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useMemo, useState } from '@wordpress/element';
-import { moreVertical } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import { unlock } from './lock-unlock';
-
-const {
-	DropdownMenuV2Ariakit: DropdownMenu,
-	DropdownMenuGroupV2Ariakit: DropdownMenuGroup,
-	DropdownMenuItemV2Ariakit: DropdownMenuItem,
-	DropdownMenuItemLabelV2Ariakit: DropdownMenuItemLabel,
-} = unlock( componentsPrivateApis );
-
-function ButtonTrigger( { action, onClick } ) {
-	return (
-		<Button
-			label={ action.label }
-			icon={ action.icon }
-			isDestructive={ action.isDestructive }
-			size="compact"
-			onClick={ onClick }
-		/>
-	);
-}
-
-function DropdownMenuItemTrigger( { action, onClick } ) {
-	return (
-		<DropdownMenuItem
-			onClick={ onClick }
-			hideOnClick={ ! action.RenderModal }
-		>
-			<DropdownMenuItemLabel>{ action.label }</DropdownMenuItemLabel>
-		</DropdownMenuItem>
-	);
-}
-
-function ActionWithModal( { action, item, ActionTrigger } ) {
-	const [ isModalOpen, setIsModalOpen ] = useState( false );
-	const actionTriggerProps = {
-		action,
-		onClick: () => setIsModalOpen( true ),
-	};
-	const { RenderModal, hideModalHeader } = action;
-	return (
-		<>
-			<ActionTrigger { ...actionTriggerProps } />
-			{ isModalOpen && (
-				<Modal
-					title={ ! hideModalHeader && action.label }
-					__experimentalHideHeader={ !! hideModalHeader }
-					onRequestClose={ () => {
-						setIsModalOpen( false );
-					} }
-					overlayClassName="dataviews-action-modal"
-				>
-					<RenderModal
-						item={ item }
-						closeModal={ () => setIsModalOpen( false ) }
-					/>
-				</Modal>
-			) }
-		</>
-	);
-}
-
-function ActionsDropdownMenuGroup( { actions, item } ) {
-	return (
-		<DropdownMenuGroup>
-			{ actions.map( ( action ) => {
-				if ( !! action.RenderModal ) {
-					return (
-						<ActionWithModal
-							key={ action.id }
-							action={ action }
-							item={ item }
-							ActionTrigger={ DropdownMenuItemTrigger }
-						/>
-					);
-				}
-				return (
-					<DropdownMenuItemTrigger
-						key={ action.id }
-						action={ action }
-						onClick={ () => action.callback( item ) }
-					/>
-				);
-			} ) }
-		</DropdownMenuGroup>
-	);
-}
-
-export default function ItemActions( { item, actions, isCompact } ) {
-	const { primaryActions, secondaryActions } = useMemo( () => {
-		return actions.reduce(
-			( accumulator, action ) => {
-				// If an action is eligible for all items, doesn't need
-				// to provide the `isEligible` function.
-				if ( action.isEligible && ! action.isEligible( item ) ) {
-					return accumulator;
-				}
-				if ( action.isPrimary && !! action.icon ) {
-					accumulator.primaryActions.push( action );
-				} else {
-					accumulator.secondaryActions.push( action );
-				}
-				return accumulator;
-			},
-			{ primaryActions: [], secondaryActions: [] }
-		);
-	}, [ actions, item ] );
-	if ( ! primaryActions.length && ! secondaryActions.length ) {
-		return null;
-	}
-	if ( isCompact ) {
-		return (
-			<CompactItemActions
-				item={ item }
-				primaryActions={ primaryActions }
-				secondaryActions={ secondaryActions }
-			/>
-		);
-	}
-	return (
-		<HStack
-			spacing={ 1 }
-			justify="flex-end"
-			style={ {
-				flexShrink: '0',
-				width: 'auto',
-			} }
-		>
-			{ !! primaryActions.length &&
-				primaryActions.map( ( action ) => {
-					if ( !! action.RenderModal ) {
-						return (
-							<ActionWithModal
-								key={ action.id }
-								action={ action }
-								item={ item }
-								ActionTrigger={ ButtonTrigger }
-							/>
-						);
-					}
-					return (
-						<ButtonTrigger
-							key={ action.id }
-							action={ action }
-							onClick={ () => action.callback( item ) }
-						/>
-					);
-				} ) }
-			{ !! secondaryActions.length && (
-				<DropdownMenu
-					trigger={
-						<Button
-							size="compact"
-							icon={ moreVertical }
-							label={ __( 'Actions' ) }
-						/>
-					}
-					placement="bottom-end"
-				>
-					<ActionsDropdownMenuGroup
-						actions={ secondaryActions }
-						item={ item }
-					/>
-				</DropdownMenu>
-			) }
-		</HStack>
-	);
-}
-
-function CompactItemActions( { item, primaryActions, secondaryActions } ) {
-	return (
-		<DropdownMenu
-			trigger={
-				<Button
-					size="compact"
-					icon={ moreVertical }
-					label={ __( 'Actions' ) }
-				/>
-			}
-			placement="bottom-end"
-		>
-			{ !! primaryActions.length && (
-				<ActionsDropdownMenuGroup
-					actions={ primaryActions }
-					item={ item }
-				/>
-			) }
-			{ !! secondaryActions.length && (
-				<ActionsDropdownMenuGroup
-					actions={ secondaryActions }
-					item={ item }
-				/>
-			) }
-		</DropdownMenu>
-	);
-}
diff --git a/packages/dataviews/src/lock-unlock.js b/packages/dataviews/src/lock-unlock.js
deleted file mode 100644
index 18318773cefefe..00000000000000
--- a/packages/dataviews/src/lock-unlock.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
-
-export const { lock, unlock } =
-	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
-		'@wordpress/dataviews'
-	);
diff --git a/packages/dataviews/src/lock-unlock.ts b/packages/dataviews/src/lock-unlock.ts
new file mode 100644
index 00000000000000..d1533da413cfc3
--- /dev/null
+++ b/packages/dataviews/src/lock-unlock.ts
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+		'@wordpress/dataviews'
+	);
diff --git a/packages/dataviews/src/normalize-fields.ts b/packages/dataviews/src/normalize-fields.ts
new file mode 100644
index 00000000000000..5ef219e45a4787
--- /dev/null
+++ b/packages/dataviews/src/normalize-fields.ts
@@ -0,0 +1,100 @@
+/**
+ * Internal dependencies
+ */
+import getFieldTypeDefinition from './field-types';
+import type {
+	CombinedFormField,
+	Field,
+	NormalizedField,
+	NormalizedCombinedFormField,
+} from './types';
+import { getControl } from './dataform-controls';
+import DataFormCombinedEdit from './components/dataform-combined-edit';
+
+/**
+ * Apply default values and normalize the fields config.
+ *
+ * @param fields Fields config.
+ * @return Normalized fields config.
+ */
+export function normalizeFields< Item >(
+	fields: Field< Item >[]
+): NormalizedField< Item >[] {
+	return fields.map( ( field ) => {
+		const fieldTypeDefinition = getFieldTypeDefinition( field.type );
+
+		const getValue =
+			field.getValue || ( ( { item } ) => ( item as any )[ field.id ] );
+
+		const sort =
+			field.sort ??
+			function sort( a, b, direction ) {
+				return fieldTypeDefinition.sort(
+					getValue( { item: a } ),
+					getValue( { item: b } ),
+					direction
+				);
+			};
+
+		const isValid =
+			field.isValid ??
+			function isValid( item, context ) {
+				return fieldTypeDefinition.isValid(
+					getValue( { item } ),
+					context
+				);
+			};
+
+		const Edit = getControl( field, fieldTypeDefinition );
+
+		const renderFromElements = ( { item }: { item: Item } ) => {
+			const value = getValue( { item } );
+			return (
+				field?.elements?.find( ( element ) => element.value === value )
+					?.label || getValue( { item } )
+			);
+		};
+
+		const render =
+			field.render || ( field.elements ? renderFromElements : getValue );
+
+		return {
+			...field,
+			label: field.label || field.id,
+			header: field.header || field.label || field.id,
+			getValue,
+			render,
+			sort,
+			isValid,
+			Edit,
+			enableHiding: field.enableHiding ?? true,
+			enableSorting: field.enableSorting ?? true,
+		};
+	} );
+}
+
+/**
+ * Apply default values and normalize the fields config.
+ *
+ * @param combinedFields combined field list.
+ * @param fields         Fields config.
+ * @return Normalized fields config.
+ */
+export function normalizeCombinedFields< Item >(
+	combinedFields: CombinedFormField< Item >[],
+	fields: Field< Item >[]
+): NormalizedCombinedFormField< Item >[] {
+	return combinedFields.map( ( combinedField ) => {
+		return {
+			...combinedField,
+			Edit: DataFormCombinedEdit,
+			fields: normalizeFields(
+				combinedField.children
+					.map( ( fieldId ) =>
+						fields.find( ( { id } ) => id === fieldId )
+					)
+					.filter( ( field ): field is Field< Item > => !! field )
+			),
+		};
+	} );
+}
diff --git a/packages/dataviews/src/pagination.js b/packages/dataviews/src/pagination.js
deleted file mode 100644
index 25672208d993ca..00000000000000
--- a/packages/dataviews/src/pagination.js
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	Button,
-	__experimentalHStack as HStack,
-	__experimentalText as Text,
-	__experimentalNumberControl as NumberControl,
-} from '@wordpress/components';
-import { createInterpolateElement } from '@wordpress/element';
-import { sprintf, __, _x, _n } from '@wordpress/i18n';
-import { chevronRight, chevronLeft, previous, next } from '@wordpress/icons';
-
-function Pagination( {
-	view,
-	onChangeView,
-	paginationInfo: { totalItems = 0, totalPages },
-} ) {
-	if ( ! totalItems || ! totalPages ) {
-		return null;
-	}
-	return (
-		<HStack
-			expanded={ false }
-			spacing={ 3 }
-			justify="space-between"
-			className="dataviews-pagination"
-		>
-			<Text variant="muted">
-				{
-					// translators: %s: Total number of entries.
-					sprintf(
-						// translators: %s: Total number of entries.
-						_n( '%s item', '%s items', totalItems ),
-						totalItems
-					)
-				}
-			</Text>
-			{ !! totalItems && (
-				<HStack expanded={ false } spacing={ 3 }>
-					<HStack
-						justify="flex-start"
-						expanded={ false }
-						spacing={ 1 }
-					>
-						<Button
-							onClick={ () =>
-								onChangeView( { ...view, page: 1 } )
-							}
-							disabled={ view.page === 1 }
-							__experimentalIsFocusable
-							label={ __( 'First page' ) }
-							icon={ previous }
-							showTooltip
-							size="compact"
-						/>
-						<Button
-							onClick={ () =>
-								onChangeView( { ...view, page: view.page - 1 } )
-							}
-							disabled={ view.page === 1 }
-							__experimentalIsFocusable
-							label={ __( 'Previous page' ) }
-							icon={ chevronLeft }
-							showTooltip
-							size="compact"
-						/>
-					</HStack>
-					<HStack
-						justify="flex-start"
-						expanded={ false }
-						spacing={ 2 }
-					>
-						{ createInterpolateElement(
-							sprintf(
-								// translators: %1$s: Current page number, %2$s: Total number of pages.
-								_x( '<CurrenPageControl /> of %2$s', 'paging' ),
-								view.page,
-								totalPages
-							),
-							{
-								CurrenPageControl: (
-									<NumberControl
-										aria-label={ __( 'Current page' ) }
-										min={ 1 }
-										max={ totalPages }
-										onChange={ ( value ) => {
-											const _value = +value;
-											if (
-												! _value ||
-												_value < 1 ||
-												_value > totalPages
-											) {
-												return;
-											}
-											onChangeView( {
-												...view,
-												page: _value,
-											} );
-										} }
-										step="1"
-										value={ view.page }
-										isDragEnabled={ false }
-										spinControls="none"
-									/>
-								),
-							}
-						) }
-					</HStack>
-					<HStack
-						justify="flex-start"
-						expanded={ false }
-						spacing={ 1 }
-					>
-						<Button
-							onClick={ () =>
-								onChangeView( { ...view, page: view.page + 1 } )
-							}
-							disabled={ view.page >= totalPages }
-							__experimentalIsFocusable
-							label={ __( 'Next page' ) }
-							icon={ chevronRight }
-							showTooltip
-							size="compact"
-						/>
-						<Button
-							onClick={ () =>
-								onChangeView( { ...view, page: totalPages } )
-							}
-							disabled={ view.page >= totalPages }
-							__experimentalIsFocusable
-							label={ __( 'Last page' ) }
-							icon={ next }
-							showTooltip
-							size="compact"
-						/>
-					</HStack>
-				</HStack>
-			) }
-		</HStack>
-	);
-}
-
-export default Pagination;
diff --git a/packages/dataviews/src/private-types.tsx b/packages/dataviews/src/private-types.tsx
new file mode 100644
index 00000000000000..d2d453e63599c9
--- /dev/null
+++ b/packages/dataviews/src/private-types.tsx
@@ -0,0 +1,2 @@
+export type SelectionOrUpdater = string[] | ( ( prev: string[] ) => string[] );
+export type SetSelection = ( selection: SelectionOrUpdater ) => void;
diff --git a/packages/dataviews/src/reset-filters.js b/packages/dataviews/src/reset-filters.js
deleted file mode 100644
index d78c06624087a7..00000000000000
--- a/packages/dataviews/src/reset-filters.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Button } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-export default ( { view, onChangeView } ) => {
-	return (
-		<Button
-			disabled={ view.search === '' && view.filters?.length === 0 }
-			__experimentalIsFocusable
-			size="compact"
-			variant="tertiary"
-			onClick={ () => {
-				onChangeView( ( currentView ) => ( {
-					...currentView,
-					page: 1,
-					search: '',
-					filters: [],
-				} ) );
-			} }
-		>
-			{ __( 'Reset filters' ) }
-		</Button>
-	);
-};
diff --git a/packages/dataviews/src/search.js b/packages/dataviews/src/search.js
deleted file mode 100644
index 2e58b721d6e2eb..00000000000000
--- a/packages/dataviews/src/search.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { useEffect, useRef } from '@wordpress/element';
-import { SearchControl } from '@wordpress/components';
-import { useDebouncedInput } from '@wordpress/compose';
-
-export default function Search( { label, view, onChangeView } ) {
-	const [ search, setSearch, debouncedSearch ] = useDebouncedInput(
-		view.search
-	);
-	useEffect( () => {
-		setSearch( view.search );
-	}, [ view ] );
-	const onChangeViewRef = useRef( onChangeView );
-	useEffect( () => {
-		onChangeViewRef.current = onChangeView;
-	}, [ onChangeView ] );
-	useEffect( () => {
-		onChangeViewRef.current( ( currentView ) => ( {
-			...currentView,
-			page: 1,
-			search: debouncedSearch,
-		} ) );
-	}, [ debouncedSearch ] );
-	const searchLabel = label || __( 'Filter list' );
-	return (
-		<SearchControl
-			__nextHasNoMarginBottom
-			onChange={ setSearch }
-			value={ search }
-			label={ searchLabel }
-			placeholder={ searchLabel }
-			size="compact"
-		/>
-	);
-}
diff --git a/packages/dataviews/src/stories/fixtures.js b/packages/dataviews/src/stories/fixtures.js
deleted file mode 100644
index 6b9073e2cc78da..00000000000000
--- a/packages/dataviews/src/stories/fixtures.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { trash } from '@wordpress/icons';
-import {
-	Button,
-	__experimentalText as Text,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import { LAYOUT_TABLE } from '../constants';
-
-export const data = [
-	{
-		id: 1,
-		title: 'Apollo',
-		description: 'Apollo description',
-		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
-	},
-	{
-		id: 2,
-		title: 'Space',
-		description: 'Space description',
-		image: 'https://live.staticflickr.com/5678/21911065441_92e2d44708_b.jpg',
-	},
-	{
-		id: 3,
-		title: 'NASA',
-		description: 'NASA photo',
-		image: 'https://live.staticflickr.com/742/21712365770_8f70a2c91e_b.jpg',
-	},
-	{
-		id: 4,
-		title: 'Neptune',
-		description: 'Neptune description',
-		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
-	},
-	{
-		id: 5,
-		title: 'Mercury',
-		description: 'Mercury description',
-		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
-	},
-	{
-		id: 6,
-		title: 'Venus',
-		description: 'Venus description',
-		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
-	},
-	{
-		id: 7,
-		title: 'Earth',
-		description: 'Earth description',
-		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
-	},
-	{
-		id: 8,
-		title: 'Mars',
-		description: 'Mars description',
-		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
-	},
-	{
-		id: 9,
-		title: 'Jupiter',
-		description: 'Jupiter description',
-		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
-	},
-	{
-		id: 10,
-		title: 'Saturn',
-		description: 'Saturn description',
-		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
-	},
-	{
-		id: 11,
-		title: 'Uranus',
-		description: 'Uranus description',
-		image: 'https://live.staticflickr.com/5725/21726228300_51333bd62c_b.jpg',
-	},
-];
-
-export const DEFAULT_VIEW = {
-	type: LAYOUT_TABLE,
-	search: '',
-	page: 1,
-	perPage: 10,
-	hiddenFields: [ 'image' ],
-	layout: {},
-	filters: [],
-};
-
-export const actions = [
-	{
-		id: 'delete',
-		label: 'Delete item',
-		isPrimary: true,
-		icon: trash,
-		hideModalHeader: true,
-		RenderModal: ( { item, closeModal } ) => {
-			return (
-				<VStack spacing="5">
-					<Text>
-						{ `Are you sure you want to delete "${ item.title }"?` }
-					</Text>
-					<HStack justify="right">
-						<Button variant="tertiary" onClick={ closeModal }>
-							Cancel
-						</Button>
-						<Button variant="primary" onClick={ closeModal }>
-							Delete
-						</Button>
-					</HStack>
-				</VStack>
-			);
-		},
-	},
-	{
-		id: 'secondary',
-		label: 'Secondary action',
-		callback() {},
-	},
-];
diff --git a/packages/dataviews/src/stories/index.story.js b/packages/dataviews/src/stories/index.story.js
deleted file mode 100644
index e0bea0c92c2b21..00000000000000
--- a/packages/dataviews/src/stories/index.story.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useState, useMemo, useCallback } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { DataViews, LAYOUT_GRID, LAYOUT_TABLE } from '../index';
-
-import { DEFAULT_VIEW, actions, data } from './fixtures';
-
-const meta = {
-	title: 'DataViews (Experimental)/DataViews',
-	component: DataViews,
-};
-export default meta;
-
-const defaultConfigPerViewType = {
-	[ LAYOUT_TABLE ]: {},
-	[ LAYOUT_GRID ]: {
-		mediaField: 'image',
-		primaryField: 'title',
-	},
-};
-
-function normalizeSearchInput( input = '' ) {
-	return input.trim().toLowerCase();
-}
-
-const fields = [
-	{
-		header: 'Image',
-		id: 'image',
-		render: ( { item } ) => {
-			return (
-				<img src={ item.image } alt="" style={ { width: '100%' } } />
-			);
-		},
-		width: 50,
-		enableSorting: false,
-	},
-	{
-		header: 'Title',
-		id: 'title',
-		getValue: ( { item } ) => item.title,
-		maxWidth: 400,
-		enableHiding: false,
-	},
-	{
-		header: 'Description',
-		id: 'description',
-		getValue: ( { item } ) => item.description,
-		maxWidth: 200,
-		enableSorting: false,
-	},
-];
-
-export const Default = ( props ) => {
-	const [ view, setView ] = useState( DEFAULT_VIEW );
-	const { shownData, paginationInfo } = useMemo( () => {
-		let filteredData = [ ...data ];
-		// Handle global search.
-		if ( view.search ) {
-			const normalizedSearch = normalizeSearchInput( view.search );
-			filteredData = filteredData.filter( ( item ) => {
-				return [
-					normalizeSearchInput( item.title ),
-					normalizeSearchInput( item.description ),
-				].some( ( field ) => field.includes( normalizedSearch ) );
-			} );
-		}
-		// Handle sorting.
-		if ( view.sort ) {
-			const stringSortingFields = [ 'title' ];
-			const fieldId = view.sort.field;
-			if ( stringSortingFields.includes( fieldId ) ) {
-				const fieldToSort = fields.find( ( field ) => {
-					return field.id === fieldId;
-				} );
-				filteredData.sort( ( a, b ) => {
-					const valueA = fieldToSort.getValue( { item: a } ) ?? '';
-					const valueB = fieldToSort.getValue( { item: b } ) ?? '';
-					return view.sort.direction === 'asc'
-						? valueA.localeCompare( valueB )
-						: valueB.localeCompare( valueA );
-				} );
-			}
-		}
-		// Handle pagination.
-		const start = ( view.page - 1 ) * view.perPage;
-		const totalItems = filteredData?.length || 0;
-		filteredData = filteredData?.slice( start, start + view.perPage );
-		return {
-			shownData: filteredData,
-			paginationInfo: {
-				totalItems,
-				totalPages: Math.ceil( totalItems / view.perPage ),
-			},
-		};
-	}, [ view ] );
-	const onChangeView = useCallback(
-		( viewUpdater ) => {
-			let updatedView =
-				typeof viewUpdater === 'function'
-					? viewUpdater( view )
-					: viewUpdater;
-			if ( updatedView.type !== view.type ) {
-				updatedView = {
-					...updatedView,
-					layout: {
-						...defaultConfigPerViewType[ updatedView.type ],
-					},
-				};
-			}
-
-			setView( updatedView );
-		},
-		[ view, setView ]
-	);
-	return (
-		<DataViews
-			{ ...props }
-			paginationInfo={ paginationInfo }
-			data={ shownData }
-			view={ view }
-			fields={ fields }
-			onChangeView={ onChangeView }
-		/>
-	);
-};
-Default.args = {
-	actions,
-	getItemId: ( item ) => item.id,
-	isLoading: false,
-	supportedLayouts: [ LAYOUT_TABLE, LAYOUT_GRID ],
-};
diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 5dd89f4c279707..26c6ecea645f43 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -1,132 +1,16 @@
-.dataviews-wrapper {
-	width: 100%;
-	height: calc(100% - #{$grid-unit-40} * 2);
-	overflow: auto;
-	padding: $grid-unit-40 $grid-unit-40 0;
-	box-sizing: border-box;
-
-	> div {
-		min-height: 100%;
-	}
-}
-
-.dataviews-pagination {
-	margin-top: auto;
-	position: sticky;
-	bottom: 0;
-	background-color: $white;
-	padding: $grid-unit-20 0;
-	border-top: $border-width solid $gray-200;
-}
-
-.dataviews-filters-options {
-	margin: $grid-unit-40 0 $grid-unit-20;
-}
-
-.dataviews-table-view {
-	width: 100%;
-	text-indent: 0;
-	border-color: inherit;
-	border-collapse: collapse;
-	position: relative;
-
-	a {
-		text-decoration: none;
-	}
-	th {
-		text-align: left;
-		color: var(--wp-components-color-foreground, $gray-900);
-		font-weight: normal;
-		font-size: $default-font-size;
-	}
-	td,
-	th {
-		padding: $grid-unit-15;
-		&[data-field-id="actions"] {
-			text-align: right;
-		}
-	}
-	tr {
-		border-bottom: 1px solid $gray-100;
-
-		&:last-child {
-			border-bottom: 0;
-		}
-	}
-	thead {
-		tr {
-			border: 0;
-		}
-		th {
-			position: sticky;
-			top: - #{$grid-unit-40}; // Offset the container padding
-			background-color: $white;
-			box-shadow: inset 0 -#{$border-width} 0 $gray-200;
-		}
-	}
-}
-
-.dataviews-grid-view {
-	margin-bottom: $grid-unit-30;
-	grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
-
-	@include break-xlarge() {
-		grid-template-columns: repeat(3, minmax(0, 1fr)) !important; // Todo: eliminate !important dependency
-	}
-
-	@include break-huge() {
-		grid-template-columns: repeat(4, minmax(0, 1fr)) !important; // Todo: eliminate !important dependency
-	}
-
-	.dataviews-view-grid__card {
-		h3 { // Todo: A better way to target this
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-	}
-
-	.dataviews-view-grid__media {
-		width: 100%;
-		min-height: 200px;
-		aspect-ratio: 1/1;
-		box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-		border-radius: $radius-block-ui * 2;
-		overflow: hidden;
-
-		> * {
-			object-fit: cover;
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.dataviews-view-grid__primary-field {
-		min-height: $grid-unit-30;
-
-		a {
-			color: $gray-900;
-			text-decoration: none;
-			font-weight: 500;
-		}
-	}
-
-	.dataviews-view-grid__fields {
-		position: relative;
-		font-size: 12px;
-		line-height: 16px;
-
-		.dataviews-view-grid__field {
-			.dataviews-view-grid__field-header {
-				color: $gray-700;
-			}
-			.dataviews-view-grid__field-value {
-				color: $gray-900;
-			}
-		}
-	}
-}
-
-.dataviews-action-modal {
-	z-index: z-index(".dataviews-action-modal");
-}
+@import "./components/dataviews/style.scss";
+@import "./components/dataviews-bulk-actions/style.scss";
+@import "./components/dataviews-filters/style.scss";
+@import "./components/dataviews-footer/style.scss";
+@import "./components/dataviews-pagination/style.scss";
+@import "./components/dataviews-item-actions/style.scss";
+@import "./components/dataviews-selection-checkbox/style.scss";
+@import "./components/dataviews-view-config/style.scss";
+@import "./components/dataform-combined-edit/style.scss";
+
+@import "./dataviews-layouts/grid/style.scss";
+@import "./dataviews-layouts/list/style.scss";
+@import "./dataviews-layouts/table/style.scss";
+
+@import "./dataform-controls/style.scss";
+@import "./dataforms-layouts/panel/style.scss";
diff --git a/packages/dataviews/src/test/filter-and-sort-data-view.js b/packages/dataviews/src/test/filter-and-sort-data-view.js
new file mode 100644
index 00000000000000..7f0b3a30e8587c
--- /dev/null
+++ b/packages/dataviews/src/test/filter-and-sort-data-view.js
@@ -0,0 +1,362 @@
+/**
+ * Internal dependencies
+ */
+import { filterSortAndPaginate } from '../filter-and-sort-data-view';
+import { data, fields } from '../components/dataviews/stories/fixtures';
+
+describe( 'filters', () => {
+	it( 'should return empty if the data is empty', () => {
+		expect( filterSortAndPaginate( null, {}, [] ) ).toStrictEqual( {
+			data: [],
+			paginationInfo: { totalItems: 0, totalPages: 0 },
+		} );
+	} );
+
+	it( 'should return the same data if no filters are applied', () => {
+		expect(
+			filterSortAndPaginate(
+				data,
+				{
+					filters: [],
+				},
+				[]
+			)
+		).toStrictEqual( {
+			data,
+			paginationInfo: { totalItems: data.length, totalPages: 1 },
+		} );
+	} );
+
+	it( 'should search using searchable fields (title)', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				search: 'Neptu',
+				filters: [],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 1 );
+		expect( result[ 0 ].title ).toBe( 'Neptune' );
+	} );
+
+	it( 'should search using searchable fields (description)', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				search: 'photo',
+				filters: [],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 1 );
+		expect( result[ 0 ].description ).toBe( 'NASA photo' );
+	} );
+
+	it( 'should perform case-insensitive and accent-insensitive search', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				search: 'nete ven',
+				filters: [],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 1 );
+		expect( result[ 0 ].description ).toBe( 'La planète Vénus' );
+	} );
+
+	it( 'should search using IS filter', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				filters: [
+					{
+						field: 'type',
+						operator: 'is',
+						value: 'Ice giant',
+					},
+				],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 2 );
+		expect( result[ 0 ].title ).toBe( 'Neptune' );
+		expect( result[ 1 ].title ).toBe( 'Uranus' );
+	} );
+
+	it( 'should search using IS NOT filter', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				filters: [
+					{
+						field: 'type',
+						operator: 'isNot',
+						value: 'Ice giant',
+					},
+				],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 9 );
+		expect( result[ 0 ].title ).toBe( 'Apollo' );
+		expect( result[ 1 ].title ).toBe( 'Space' );
+		expect( result[ 2 ].title ).toBe( 'NASA' );
+		expect( result[ 3 ].title ).toBe( 'Mercury' );
+		expect( result[ 4 ].title ).toBe( 'Venus' );
+		expect( result[ 5 ].title ).toBe( 'Earth' );
+		expect( result[ 6 ].title ).toBe( 'Mars' );
+		expect( result[ 7 ].title ).toBe( 'Jupiter' );
+		expect( result[ 8 ].title ).toBe( 'Saturn' );
+	} );
+
+	it( 'should search using IS ANY filter for STRING values', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				filters: [
+					{
+						field: 'type',
+						operator: 'isAny',
+						value: [ 'Ice giant' ],
+					},
+				],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 2 );
+		expect( result[ 0 ].title ).toBe( 'Neptune' );
+		expect( result[ 1 ].title ).toBe( 'Uranus' );
+	} );
+
+	it( 'should search using IS NONE filter for STRING values', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				filters: [
+					{
+						field: 'type',
+						operator: 'isNone',
+						value: [ 'Ice giant', 'Gas giant', 'Terrestrial' ],
+					},
+				],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 3 );
+		expect( result[ 0 ].title ).toBe( 'Apollo' );
+		expect( result[ 1 ].title ).toBe( 'Space' );
+		expect( result[ 2 ].title ).toBe( 'NASA' );
+	} );
+
+	it( 'should search using IS ANY filter for ARRAY values', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				filters: [
+					{
+						field: 'categories',
+						operator: 'isAny',
+						value: [ 'NASA' ],
+					},
+				],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 2 );
+		expect( result[ 0 ].title ).toBe( 'Apollo' );
+		expect( result[ 1 ].title ).toBe( 'NASA' );
+	} );
+
+	it( 'should search using IS NONE filter for ARRAY values', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				filters: [
+					{
+						field: 'categories',
+						operator: 'isNone',
+						value: [ 'Space' ],
+					},
+				],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 1 );
+		expect( result[ 0 ].title ).toBe( 'NASA' );
+	} );
+
+	it( 'should search using IS ALL filter', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				filters: [
+					{
+						field: 'categories',
+						operator: 'isAll',
+						value: [ 'Planet', 'Solar system' ],
+					},
+				],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 7 );
+		expect( result[ 0 ].title ).toBe( 'Neptune' );
+		expect( result[ 1 ].title ).toBe( 'Mercury' );
+		expect( result[ 2 ].title ).toBe( 'Venus' );
+		expect( result[ 3 ].title ).toBe( 'Earth' );
+		expect( result[ 4 ].title ).toBe( 'Mars' );
+		expect( result[ 5 ].title ).toBe( 'Jupiter' );
+		expect( result[ 6 ].title ).toBe( 'Saturn' );
+	} );
+
+	it( 'should search using IS NOT ALL filter', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				filters: [
+					{
+						field: 'categories',
+						operator: 'isNotAll',
+						value: [ 'Planet', 'Solar system' ],
+					},
+				],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 3 );
+		expect( result[ 0 ].title ).toBe( 'Apollo' );
+		expect( result[ 1 ].title ).toBe( 'Space' );
+		expect( result[ 2 ].title ).toBe( 'NASA' );
+	} );
+} );
+
+describe( 'sorting', () => {
+	it( 'should sort integer field types', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				sort: { field: 'satellites', direction: 'desc' },
+			},
+			fields
+		);
+
+		expect( result ).toHaveLength( 11 );
+		expect( result[ 0 ].title ).toBe( 'Saturn' );
+		expect( result[ 1 ].title ).toBe( 'Jupiter' );
+		expect( result[ 2 ].title ).toBe( 'Uranus' );
+	} );
+
+	it( 'should sort text field types', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				sort: { field: 'title', direction: 'desc' },
+				filters: [
+					{
+						field: 'type',
+						operator: 'isAny',
+						value: [ 'Ice giant' ],
+					},
+				],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 2 );
+		expect( result[ 0 ].title ).toBe( 'Uranus' );
+		expect( result[ 1 ].title ).toBe( 'Neptune' );
+	} );
+
+	it( 'should sort datetime field types', () => {
+		const { data: resultDesc } = filterSortAndPaginate(
+			data,
+			{
+				sort: { field: 'date', direction: 'desc' },
+			},
+			fields
+		);
+		expect( resultDesc ).toHaveLength( 11 );
+		expect( resultDesc[ 0 ].title ).toBe( 'NASA' );
+		expect( resultDesc[ 1 ].title ).toBe( 'Earth' );
+		expect( resultDesc[ 9 ].title ).toBe( 'Space' );
+		expect( resultDesc[ 10 ].title ).toBe( 'Jupiter' );
+
+		const { data: resultAsc } = filterSortAndPaginate(
+			data,
+			{
+				sort: { field: 'date', direction: 'asc' },
+			},
+			fields
+		);
+		expect( resultAsc ).toHaveLength( 11 );
+		expect( resultAsc[ 0 ].title ).toBe( 'Jupiter' );
+		expect( resultAsc[ 1 ].title ).toBe( 'Space' );
+		expect( resultAsc[ 9 ].title ).toBe( 'Earth' );
+		expect( resultAsc[ 10 ].title ).toBe( 'NASA' );
+	} );
+
+	it( 'should sort untyped fields if the value is a number', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				sort: { field: 'satellites', direction: 'desc' },
+			},
+			// Remove type information for satellites field to test sorting untyped fields.
+			fields.map( ( field ) =>
+				field.id === 'satellites'
+					? { ...field, type: undefined }
+					: field
+			)
+		);
+
+		expect( result ).toHaveLength( 11 );
+		expect( result[ 0 ].title ).toBe( 'Saturn' );
+		expect( result[ 1 ].title ).toBe( 'Jupiter' );
+		expect( result[ 2 ].title ).toBe( 'Uranus' );
+	} );
+
+	it( 'should sort untyped fields if the value is string', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				sort: { field: 'title', direction: 'desc' },
+				filters: [
+					{
+						field: 'type',
+						operator: 'isAny',
+						value: [ 'Ice giant' ],
+					},
+				],
+			},
+			// Remove type information for the title field to test sorting untyped fields.
+			fields.map( ( field ) =>
+				field.id === 'title' ? { ...field, type: undefined } : field
+			)
+		);
+		expect( result ).toHaveLength( 2 );
+		expect( result[ 0 ].title ).toBe( 'Uranus' );
+		expect( result[ 1 ].title ).toBe( 'Neptune' );
+	} );
+} );
+
+describe( 'pagination', () => {
+	it( 'should paginate', () => {
+		const { data: result, paginationInfo } = filterSortAndPaginate(
+			data,
+			{
+				perPage: 2,
+				page: 2,
+				filters: [],
+			},
+			fields
+		);
+		expect( result ).toHaveLength( 2 );
+		expect( result[ 0 ].title ).toBe( 'NASA' );
+		expect( result[ 1 ].title ).toBe( 'Neptune' );
+		expect( paginationInfo ).toStrictEqual( {
+			totalItems: data.length,
+			totalPages: 6,
+		} );
+	} );
+} );
diff --git a/packages/dataviews/src/test/validation.ts b/packages/dataviews/src/test/validation.ts
new file mode 100644
index 00000000000000..6a81ba16425f85
--- /dev/null
+++ b/packages/dataviews/src/test/validation.ts
@@ -0,0 +1,131 @@
+/**
+ * Internal dependencies
+ */
+import { isItemValid } from '../validation';
+import type { Field } from '../types';
+
+describe( 'validation', () => {
+	it( 'fields not visible in form are not validated', () => {
+		const item = { id: 1, valid_order: 2, invalid_order: 'd' };
+		const fields: Field< {} >[] = [
+			{
+				id: 'valid_order',
+				type: 'integer',
+			},
+			{
+				id: 'invalid_order',
+				type: 'integer',
+			},
+		];
+		const form = { fields: [ 'valid_order' ] };
+		const result = isItemValid( item, fields, form );
+		expect( result ).toBe( true );
+	} );
+
+	it( 'integer field is valid if value is integer', () => {
+		const item = { id: 1, order: 2, title: 'hi' };
+		const fields: Field< {} >[] = [
+			{
+				type: 'integer',
+				id: 'order',
+			},
+		];
+		const form = { fields: [ 'order' ] };
+		const result = isItemValid( item, fields, form );
+		expect( result ).toBe( true );
+	} );
+
+	it( 'integer field is invalid if value is not integer', () => {
+		const item = { id: 1, order: 'd' };
+		const fields: Field< {} >[] = [
+			{
+				id: 'order',
+				type: 'integer',
+			},
+		];
+		const form = { fields: [ 'order' ] };
+		const result = isItemValid( item, fields, form );
+		expect( result ).toBe( false );
+	} );
+
+	it( 'integer field is invalid if value is empty', () => {
+		const item = { id: 1, order: '' };
+		const fields: Field< {} >[] = [
+			{
+				id: 'order',
+				type: 'integer',
+			},
+		];
+		const form = { fields: [ 'order' ] };
+		const result = isItemValid( item, fields, form );
+		expect( result ).toBe( false );
+	} );
+
+	it( 'integer field is invalid if value is not one of the elements', () => {
+		const item = { id: 1, author: 3 };
+		const fields: Field< {} >[] = [
+			{
+				id: 'author',
+				type: 'integer',
+				elements: [
+					{ value: 1, label: 'Jane' },
+					{ value: 2, label: 'John' },
+				],
+			},
+		];
+		const form = { fields: [ 'author' ] };
+		const result = isItemValid( item, fields, form );
+		expect( result ).toBe( false );
+	} );
+
+	it( 'text field is invalid if value is not one of the elements', () => {
+		const item = { id: 1, author: 'not-in-elements' };
+		const fields: Field< {} >[] = [
+			{
+				id: 'author',
+				type: 'text',
+				elements: [
+					{ value: 'jane', label: 'Jane' },
+					{ value: 'john', label: 'John' },
+				],
+			},
+		];
+		const form = { fields: [ 'author' ] };
+		const result = isItemValid( item, fields, form );
+		expect( result ).toBe( false );
+	} );
+
+	it( 'untyped field is invalid if value is not one of the elements', () => {
+		const item = { id: 1, author: 'not-in-elements' };
+		const fields: Field< {} >[] = [
+			{
+				id: 'author',
+				elements: [
+					{ value: 'jane', label: 'Jane' },
+					{ value: 'john', label: 'John' },
+				],
+			},
+		];
+		const form = { fields: [ 'author' ] };
+		const result = isItemValid( item, fields, form );
+		expect( result ).toBe( false );
+	} );
+
+	it( 'fields can provide its own isValid function', () => {
+		const item = { id: 1, order: 'd' };
+		const fields: Field< {} >[] = [
+			{
+				id: 'order',
+				type: 'integer',
+				elements: [
+					{ value: 'a', label: 'A' },
+					{ value: 'b', label: 'B' },
+				],
+				isValid: () => true, // Overrides the validation provided for integer types.
+			},
+		];
+		const form = { fields: [ 'order' ] };
+		const result = isItemValid( item, fields, form );
+		expect( result ).toBe( true );
+	} );
+} );
diff --git a/packages/dataviews/src/types.ts b/packages/dataviews/src/types.ts
new file mode 100644
index 00000000000000..2a335dce3af32b
--- /dev/null
+++ b/packages/dataviews/src/types.ts
@@ -0,0 +1,556 @@
+/**
+ * External dependencies
+ */
+import type { ReactElement, ComponentType } from 'react';
+
+/**
+ * Internal dependencies
+ */
+import type { SetSelection } from './private-types';
+
+export type SortDirection = 'asc' | 'desc';
+
+/**
+ * Generic option type.
+ */
+export interface Option< Value extends any = any > {
+	value: Value;
+	label: string;
+	description?: string;
+}
+
+interface FilterByConfig {
+	/**
+	 * The list of operators supported by the field.
+	 */
+	operators?: Operator[];
+
+	/**
+	 * Whether it is a primary filter.
+	 *
+	 * A primary filter is always visible and is not listed in the "Add filter" component,
+	 * except for the list layout where it behaves like a secondary filter.
+	 */
+	isPrimary?: boolean;
+}
+
+export type Operator =
+	| 'is'
+	| 'isNot'
+	| 'isAny'
+	| 'isNone'
+	| 'isAll'
+	| 'isNotAll';
+
+export type FieldType = 'text' | 'integer' | 'datetime';
+
+export type ValidationContext = {
+	elements?: Option[];
+};
+
+/**
+ * An abstract interface for Field based on the field type.
+ */
+export type FieldTypeDefinition< Item > = {
+	/**
+	 * Callback used to sort the field.
+	 */
+	sort: ( a: Item, b: Item, direction: SortDirection ) => number;
+
+	/**
+	 * Callback used to validate the field.
+	 */
+	isValid: ( item: Item, context?: ValidationContext ) => boolean;
+
+	/**
+	 * Callback used to render an edit control for the field or control name.
+	 */
+	Edit: ComponentType< DataFormControlProps< Item > > | string;
+};
+
+/**
+ * A dataview field for a specific property of a data type.
+ */
+export type Field< Item > = {
+	/**
+	 * Type of the fields.
+	 */
+	type?: FieldType;
+
+	/**
+	 * The unique identifier of the field.
+	 */
+	id: string;
+
+	/**
+	 * The label of the field. Defaults to the id.
+	 */
+	label?: string;
+
+	/**
+	 * The header of the field. Defaults to the label.
+	 * It allows the usage of a React Element to render the field labels.
+	 */
+	header?: string | ReactElement;
+
+	/**
+	 * A description of the field.
+	 */
+	description?: string;
+
+	/**
+	 * Placeholder for the field.
+	 */
+	placeholder?: string;
+
+	/**
+	 * Callback used to render the field. Defaults to `field.getValue`.
+	 */
+	render?: ComponentType< DataViewRenderFieldProps< Item > >;
+
+	/**
+	 * Callback used to render an edit control for the field.
+	 */
+	Edit?: ComponentType< DataFormControlProps< Item > > | string;
+
+	/**
+	 * Callback used to sort the field.
+	 */
+	sort?: ( a: Item, b: Item, direction: SortDirection ) => number;
+
+	/**
+	 * Callback used to validate the field.
+	 */
+	isValid?: ( item: Item, context?: ValidationContext ) => boolean;
+
+	/**
+	 * Whether the field is sortable.
+	 */
+	enableSorting?: boolean;
+
+	/**
+	 * Whether the field is searchable.
+	 */
+	enableGlobalSearch?: boolean;
+
+	/**
+	 * Whether the field is filterable.
+	 */
+	enableHiding?: boolean;
+
+	/**
+	 * The list of options to pick from when using the field as a filter.
+	 */
+	elements?: Option[];
+
+	/**
+	 * Filter config for the field.
+	 */
+	filterBy?: FilterByConfig | undefined;
+
+	/**
+	 * Callback used to retrieve the value of the field from the item.
+	 * Defaults to `item[ field.id ]`.
+	 */
+	getValue?: ( args: { item: Item } ) => any;
+};
+
+export type NormalizedField< Item > = Field< Item > & {
+	label: string;
+	header: string | ReactElement;
+	getValue: ( args: { item: Item } ) => any;
+	render: ComponentType< DataViewRenderFieldProps< Item > >;
+	Edit: ComponentType< DataFormControlProps< Item > >;
+	sort: ( a: Item, b: Item, direction: SortDirection ) => number;
+	isValid: ( item: Item, context?: ValidationContext ) => boolean;
+	enableHiding: boolean;
+	enableSorting: boolean;
+};
+
+/**
+ * A collection of dataview fields for a data type.
+ */
+export type Fields< Item > = Field< Item >[];
+
+export type Data< Item > = Item[];
+
+export type DataFormControlProps< Item > = {
+	data: Item;
+	field: NormalizedField< Item >;
+	onChange: ( value: Record< string, any > ) => void;
+	hideLabelFromVision?: boolean;
+};
+
+export type DataViewRenderFieldProps< Item > = {
+	item: Item;
+};
+
+/**
+ * The filters applied to the dataset.
+ */
+export interface Filter {
+	/**
+	 * The field to filter by.
+	 */
+	field: string;
+
+	/**
+	 * The operator to use.
+	 */
+	operator: Operator;
+
+	/**
+	 * The value to filter by.
+	 */
+	value: any;
+}
+
+export interface NormalizedFilter {
+	/**
+	 * The field to filter by.
+	 */
+	field: string;
+
+	/**
+	 * The field name.
+	 */
+	name: string;
+
+	/**
+	 * The list of options to pick from when using the field as a filter.
+	 */
+	elements: Option[];
+
+	/**
+	 * Is a single selection filter.
+	 */
+	singleSelection: boolean;
+
+	/**
+	 * The list of operators supported by the field.
+	 */
+	operators: Operator[];
+
+	/**
+	 * Whether the filter is visible.
+	 */
+	isVisible: boolean;
+
+	/**
+	 * Whether it is a primary filter.
+	 */
+	isPrimary: boolean;
+}
+
+interface ViewBase {
+	/**
+	 * The layout of the view.
+	 */
+	type: string;
+
+	/**
+	 * The global search term.
+	 */
+	search?: string;
+
+	/**
+	 * The filters to apply.
+	 */
+	filters?: Filter[];
+
+	/**
+	 * The sorting configuration.
+	 */
+	sort?: {
+		/**
+		 * The field to sort by.
+		 */
+		field: string;
+
+		/**
+		 * The direction to sort by.
+		 */
+		direction: SortDirection;
+	};
+
+	/**
+	 * The active page
+	 */
+	page?: number;
+
+	/**
+	 * The number of items per page
+	 */
+	perPage?: number;
+
+	/**
+	 * The fields to render
+	 */
+	fields?: string[];
+}
+
+export interface CombinedField {
+	id: string;
+
+	label: string;
+
+	header?: string | ReactElement;
+
+	/**
+	 * The fields to use as columns.
+	 */
+	children: string[];
+
+	/**
+	 * The direction of the stack.
+	 */
+	direction: 'horizontal' | 'vertical';
+}
+
+export interface ColumnStyle {
+	/**
+	 * The width of the field column.
+	 */
+	width?: string | number;
+
+	/**
+	 * The minimum width of the field column.
+	 */
+	maxWidth?: string | number;
+
+	/**
+	 * The maximum width of the field column.
+	 */
+	minWidth?: string | number;
+}
+
+export interface ViewTable extends ViewBase {
+	type: 'table';
+
+	layout?: {
+		/**
+		 * The field to use as the primary field.
+		 */
+		primaryField?: string;
+
+		/**
+		 * The fields to use as columns.
+		 */
+		combinedFields?: CombinedField[];
+
+		/**
+		 * The styles for the columns.
+		 */
+		styles?: Record< string, ColumnStyle >;
+	};
+}
+
+export interface ViewList extends ViewBase {
+	type: 'list';
+
+	layout?: {
+		/**
+		 * The field to use as the primary field.
+		 */
+		primaryField?: string;
+
+		/**
+		 * The field to use as the media field.
+		 */
+		mediaField?: string;
+	};
+}
+
+export interface ViewGrid extends ViewBase {
+	type: 'grid';
+
+	layout?: {
+		/**
+		 * The field to use as the primary field.
+		 */
+		primaryField?: string;
+
+		/**
+		 * The field to use as the media field.
+		 */
+		mediaField?: string;
+
+		/**
+		 * The fields to use as columns.
+		 */
+		columnFields?: string[];
+
+		/**
+		 * The fields to use as badge fields.
+		 */
+		badgeFields?: string[];
+	};
+}
+
+export type View = ViewList | ViewGrid | ViewTable;
+
+interface ActionBase< Item > {
+	/**
+	 * The unique identifier of the action.
+	 */
+	id: string;
+
+	/**
+	 * The label of the action.
+	 * In case we want to adjust the label based on the selected items,
+	 * a function can be provided.
+	 */
+	label: string | ( ( items: Item[] ) => string );
+
+	/**
+	 * The icon of the action. (Either a string or an SVG element)
+	 * This should be IconType from the components package
+	 * but that import is breaking typescript build for the moment.
+	 */
+	icon?: any;
+
+	/**
+	 * Whether the action is disabled.
+	 */
+	disabled?: boolean;
+
+	/**
+	 * Whether the action is destructive.
+	 */
+	isDestructive?: boolean;
+
+	/**
+	 * Whether the action is a primary action.
+	 */
+	isPrimary?: boolean;
+
+	/**
+	 * Whether the item passed as an argument supports the current action.
+	 */
+	isEligible?: ( item: Item ) => boolean;
+
+	/**
+	 * Whether the action can be used as a bulk action.
+	 */
+	supportsBulk?: boolean;
+
+	/**
+	 * The context in which the action is visible.
+	 * This is only a "meta" information for now.
+	 */
+	context?: 'list' | 'single';
+}
+
+export interface RenderModalProps< Item > {
+	items: Item[];
+	closeModal?: () => void;
+	onActionPerformed?: ( items: Item[] ) => void;
+}
+
+export interface ActionModal< Item > extends ActionBase< Item > {
+	/**
+	 * Modal to render when the action is triggered.
+	 */
+	RenderModal: ( {
+		items,
+		closeModal,
+		onActionPerformed,
+	}: RenderModalProps< Item > ) => ReactElement;
+
+	/**
+	 * Whether to hide the modal header.
+	 */
+	hideModalHeader?: boolean;
+
+	/**
+	 * The header of the modal.
+	 */
+	modalHeader?: string;
+}
+
+export interface ActionButton< Item > extends ActionBase< Item > {
+	/**
+	 * The callback to execute when the action is triggered.
+	 */
+	callback: (
+		items: Item[],
+		context: {
+			registry: any;
+			onActionPerformed?: ( items: Item[] ) => void;
+		}
+	) => void;
+}
+
+export type Action< Item > = ActionModal< Item > | ActionButton< Item >;
+
+export interface ViewBaseProps< Item > {
+	actions: Action< Item >[];
+	data: Item[];
+	fields: NormalizedField< Item >[];
+	getItemId: ( item: Item ) => string;
+	isLoading?: boolean;
+	onChangeView: ( view: View ) => void;
+	onChangeSelection: SetSelection;
+	selection: string[];
+	setOpenedFilter: ( fieldId: string ) => void;
+	view: View;
+	density: number;
+}
+
+export interface ViewTableProps< Item > extends ViewBaseProps< Item > {
+	view: ViewTable;
+}
+
+export interface ViewListProps< Item > extends ViewBaseProps< Item > {
+	view: ViewList;
+}
+
+export interface ViewGridProps< Item > extends ViewBaseProps< Item > {
+	view: ViewGrid;
+}
+
+export type ViewProps< Item > =
+	| ViewTableProps< Item >
+	| ViewGridProps< Item >
+	| ViewListProps< Item >;
+
+export interface SupportedLayouts {
+	list?: Omit< ViewList, 'type' >;
+	grid?: Omit< ViewGrid, 'type' >;
+	table?: Omit< ViewTable, 'type' >;
+}
+
+export interface CombinedFormField< Item > extends CombinedField {
+	render?: ComponentType< { item: Item } >;
+}
+
+export interface DataFormCombinedEditProps< Item > {
+	field: NormalizedCombinedFormField< Item >;
+	data: Item;
+	onChange: ( value: Record< string, any > ) => void;
+	hideLabelFromVision?: boolean;
+}
+
+export type NormalizedCombinedFormField< Item > = CombinedFormField< Item > & {
+	fields: NormalizedField< Item >[];
+	Edit?: ComponentType< DataFormCombinedEditProps< Item > >;
+};
+
+/**
+ * The form configuration.
+ */
+export type Form< Item > = {
+	type?: 'regular' | 'panel';
+	fields?: string[];
+	/**
+	 * The fields to combine.
+	 */
+	combinedFields?: CombinedFormField< Item >[];
+};
+
+export interface DataFormProps< Item > {
+	data: Item;
+	fields: Field< Item >[];
+	form: Form< Item >;
+	onChange: ( value: Record< string, any > ) => void;
+}
diff --git a/packages/dataviews/src/utils.ts b/packages/dataviews/src/utils.ts
new file mode 100644
index 00000000000000..408288c5174897
--- /dev/null
+++ b/packages/dataviews/src/utils.ts
@@ -0,0 +1,38 @@
+/**
+ * Internal dependencies
+ */
+import {
+	ALL_OPERATORS,
+	OPERATOR_IS,
+	OPERATOR_IS_NOT,
+	OPERATOR_IS_ANY,
+	OPERATOR_IS_NONE,
+} from './constants';
+import type { NormalizedField } from './types';
+
+export function sanitizeOperators< Item >( field: NormalizedField< Item > ) {
+	let operators = field.filterBy?.operators;
+
+	// Assign default values.
+	if ( ! operators || ! Array.isArray( operators ) ) {
+		operators = [ OPERATOR_IS_ANY, OPERATOR_IS_NONE ];
+	}
+
+	// Make sure only valid operators are used.
+	operators = operators.filter( ( operator ) =>
+		ALL_OPERATORS.includes( operator )
+	);
+
+	// Do not allow mixing single & multiselection operators.
+	// Remove multiselection operators if any of the single selection ones is present.
+	if (
+		operators.includes( OPERATOR_IS ) ||
+		operators.includes( OPERATOR_IS_NOT )
+	) {
+		operators = operators.filter( ( operator ) =>
+			[ OPERATOR_IS, OPERATOR_IS_NOT ].includes( operator )
+		);
+	}
+
+	return operators;
+}
diff --git a/packages/dataviews/src/validation.ts b/packages/dataviews/src/validation.ts
new file mode 100644
index 00000000000000..41969a7960af65
--- /dev/null
+++ b/packages/dataviews/src/validation.ts
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import { normalizeFields } from './normalize-fields';
+import type { Field, Form } from './types';
+
+export function isItemValid< Item >(
+	item: Item,
+	fields: Field< Item >[],
+	form: Form< Item >
+): boolean {
+	const _fields = normalizeFields(
+		fields.filter( ( { id } ) => !! form.fields?.includes( id ) )
+	);
+	return _fields.every( ( field ) => {
+		return field.isValid( item, { elements: field.elements } );
+	} );
+}
diff --git a/packages/dataviews/src/view-actions.js b/packages/dataviews/src/view-actions.js
deleted file mode 100644
index ff01155727e697..00000000000000
--- a/packages/dataviews/src/view-actions.js
+++ /dev/null
@@ -1,304 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	Button,
-	Icon,
-	privateApis as componentsPrivateApis,
-} from '@wordpress/components';
-import { chevronRightSmall, check, arrowUp, arrowDown } from '@wordpress/icons';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import { unlock } from './lock-unlock';
-import { VIEW_LAYOUTS, LAYOUT_TABLE } from './constants';
-
-const {
-	DropdownMenuV2: DropdownMenu,
-	DropdownMenuGroupV2: DropdownMenuGroup,
-	DropdownMenuItemV2: DropdownMenuItem,
-	DropdownSubMenuV2: DropdownSubMenu,
-	DropdownSubMenuTriggerV2: DropdownSubMenuTrigger,
-} = unlock( componentsPrivateApis );
-
-function ViewTypeMenu( { view, onChangeView, supportedLayouts } ) {
-	let _availableViews = VIEW_LAYOUTS;
-	if ( supportedLayouts ) {
-		_availableViews = _availableViews.filter( ( _view ) =>
-			supportedLayouts.includes( _view.type )
-		);
-	}
-	if ( _availableViews.length === 1 ) {
-		return null;
-	}
-	const activeView = _availableViews.find( ( v ) => view.type === v.type );
-	return (
-		<DropdownSubMenu
-			trigger={
-				<DropdownSubMenuTrigger
-					suffix={
-						<>
-							{ activeView.label }
-							<Icon icon={ chevronRightSmall } />
-						</>
-					}
-				>
-					{ __( 'Layout' ) }
-				</DropdownSubMenuTrigger>
-			}
-		>
-			{ _availableViews.map( ( availableView ) => {
-				return (
-					<DropdownMenuItem
-						key={ availableView.type }
-						role="menuitemradio"
-						aria-checked={ availableView.id === view.type }
-						prefix={
-							availableView.type === view.type && (
-								<Icon icon={ check } />
-							)
-						}
-						onSelect={ ( event ) => {
-							// We need to handle this on DropDown component probably..
-							event.preventDefault();
-							onChangeView( {
-								...view,
-								type: availableView.type,
-							} );
-						} }
-					>
-						{ availableView.label }
-					</DropdownMenuItem>
-				);
-			} ) }
-		</DropdownSubMenu>
-	);
-}
-
-const PAGE_SIZE_VALUES = [ 10, 20, 50, 100 ];
-function PageSizeMenu( { view, onChangeView } ) {
-	return (
-		<DropdownSubMenu
-			trigger={
-				<DropdownSubMenuTrigger
-					suffix={
-						<>
-							{ view.perPage }
-							<Icon icon={ chevronRightSmall } />
-						</>
-					}
-				>
-					{ /* TODO: probably label per view type. */ }
-					{ __( 'Rows per page' ) }
-				</DropdownSubMenuTrigger>
-			}
-		>
-			{ PAGE_SIZE_VALUES.map( ( size ) => {
-				return (
-					<DropdownMenuItem
-						key={ size }
-						role="menuitemradio"
-						aria-checked={ view.perPage === size }
-						prefix={
-							view.perPage === size && <Icon icon={ check } />
-						}
-						onSelect={ ( event ) => {
-							// We need to handle this on DropDown component probably..
-							event.preventDefault();
-							onChangeView( { ...view, perPage: size, page: 1 } );
-						} }
-					>
-						{ size }
-					</DropdownMenuItem>
-				);
-			} ) }
-		</DropdownSubMenu>
-	);
-}
-
-function FieldsVisibilityMenu( { view, onChangeView, fields } ) {
-	const hidableFields = fields.filter(
-		( field ) =>
-			field.enableHiding !== false && field.id !== view.layout.mediaField
-	);
-	if ( ! hidableFields?.length ) {
-		return null;
-	}
-	return (
-		<DropdownSubMenu
-			trigger={
-				<DropdownSubMenuTrigger
-					suffix={ <Icon icon={ chevronRightSmall } /> }
-				>
-					{ __( 'Fields' ) }
-				</DropdownSubMenuTrigger>
-			}
-		>
-			{ hidableFields?.map( ( field ) => {
-				return (
-					<DropdownMenuItem
-						key={ field.id }
-						role="menuitemcheckbox"
-						prefix={
-							! view.hiddenFields?.includes( field.id ) && (
-								<Icon icon={ check } />
-							)
-						}
-						onSelect={ ( event ) => {
-							event.preventDefault();
-							onChangeView( {
-								...view,
-								hiddenFields: view.hiddenFields?.includes(
-									field.id
-								)
-									? view.hiddenFields.filter(
-											( id ) => id !== field.id
-									  )
-									: [ ...view.hiddenFields, field.id ],
-							} );
-						} }
-					>
-						{ field.header }
-					</DropdownMenuItem>
-				);
-			} ) }
-		</DropdownSubMenu>
-	);
-}
-
-// This object is used to construct the sorting options per sortable field.
-const sortingItemsInfo = {
-	asc: { icon: arrowUp, label: __( 'Sort ascending' ) },
-	desc: { icon: arrowDown, label: __( 'Sort descending' ) },
-};
-function SortMenu( { fields, view, onChangeView } ) {
-	const sortableFields = fields.filter(
-		( field ) => field.enableSorting !== false
-	);
-	if ( ! sortableFields?.length ) {
-		return null;
-	}
-	const currentSortedField = fields.find(
-		( field ) => field.id === view.sort?.field
-	);
-	return (
-		<DropdownSubMenu
-			trigger={
-				<DropdownSubMenuTrigger
-					suffix={
-						<>
-							{ currentSortedField?.header }
-							<Icon icon={ chevronRightSmall } />
-						</>
-					}
-				>
-					{ __( 'Sort by' ) }
-				</DropdownSubMenuTrigger>
-			}
-		>
-			{ sortableFields?.map( ( field ) => {
-				const sortedDirection = view.sort?.direction;
-				return (
-					<DropdownSubMenu
-						key={ field.id }
-						trigger={
-							<DropdownSubMenuTrigger
-								suffix={ <Icon icon={ chevronRightSmall } /> }
-							>
-								{ field.header }
-							</DropdownSubMenuTrigger>
-						}
-						side="left"
-					>
-						{ Object.entries( sortingItemsInfo ).map(
-							( [ direction, info ] ) => {
-								const isActive =
-									currentSortedField &&
-									sortedDirection === direction &&
-									field.id === currentSortedField.id;
-								return (
-									<DropdownMenuItem
-										key={ direction }
-										role="menuitemradio"
-										aria-checked={ isActive }
-										prefix={ <Icon icon={ info.icon } /> }
-										suffix={
-											isActive && <Icon icon={ check } />
-										}
-										onSelect={ ( event ) => {
-											event.preventDefault();
-											if (
-												sortedDirection === direction
-											) {
-												onChangeView( {
-													...view,
-													sort: undefined,
-												} );
-											} else {
-												onChangeView( {
-													...view,
-													sort: {
-														field: field.id,
-														direction,
-													},
-												} );
-											}
-										} }
-									>
-										{ info.label }
-									</DropdownMenuItem>
-								);
-							}
-						) }
-					</DropdownSubMenu>
-				);
-			} ) }
-		</DropdownSubMenu>
-	);
-}
-
-export default function ViewActions( {
-	fields,
-	view,
-	onChangeView,
-	supportedLayouts,
-} ) {
-	return (
-		<DropdownMenu
-			trigger={
-				<Button
-					variant="tertiary"
-					size="compact"
-					icon={
-						VIEW_LAYOUTS.find( ( v ) => v.type === view.type )
-							?.icon ||
-						VIEW_LAYOUTS.find( ( v ) => v.type === LAYOUT_TABLE )
-							.icon
-					}
-					label={ __( 'View options' ) }
-				/>
-			}
-		>
-			<DropdownMenuGroup>
-				<ViewTypeMenu
-					view={ view }
-					onChangeView={ onChangeView }
-					supportedLayouts={ supportedLayouts }
-				/>
-				<SortMenu
-					fields={ fields }
-					view={ view }
-					onChangeView={ onChangeView }
-				/>
-				<FieldsVisibilityMenu
-					fields={ fields }
-					view={ view }
-					onChangeView={ onChangeView }
-				/>
-				<PageSizeMenu view={ view } onChangeView={ onChangeView } />
-			</DropdownMenuGroup>
-		</DropdownMenu>
-	);
-}
diff --git a/packages/dataviews/src/view-grid.js b/packages/dataviews/src/view-grid.js
deleted file mode 100644
index 89dd7d393430d9..00000000000000
--- a/packages/dataviews/src/view-grid.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	FlexBlock,
-	__experimentalGrid as Grid,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { useAsyncList } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import ItemActions from './item-actions';
-
-export default function ViewGrid( { data, fields, view, actions, getItemId } ) {
-	const mediaField = fields.find(
-		( field ) => field.id === view.layout.mediaField
-	);
-	const primaryField = fields.find(
-		( field ) => field.id === view.layout.primaryField
-	);
-	const visibleFields = fields.filter(
-		( field ) =>
-			! view.hiddenFields.includes( field.id ) &&
-			! [ view.layout.mediaField, view.layout.primaryField ].includes(
-				field.id
-			)
-	);
-	const shownData = useAsyncList( data, { step: 3 } );
-	return (
-		<Grid
-			gap={ 8 }
-			columns={ 2 }
-			alignment="top"
-			className="dataviews-grid-view"
-		>
-			{ shownData.map( ( item, index ) => (
-				<VStack
-					spacing={ 3 }
-					key={ getItemId?.( item ) || index }
-					className="dataviews-view-grid__card"
-				>
-					<div className="dataviews-view-grid__media">
-						{ mediaField?.render( { item, view } ) }
-					</div>
-					<HStack
-						className="dataviews-view-grid__primary-field"
-						justify="space-between"
-					>
-						<FlexBlock>
-							{ primaryField?.render( { item, view } ) }
-						</FlexBlock>
-						<ItemActions
-							item={ item }
-							actions={ actions }
-							isCompact
-						/>
-					</HStack>
-					<VStack
-						className="dataviews-view-grid__fields"
-						spacing={ 3 }
-					>
-						{ visibleFields.map( ( field ) => {
-							const renderedValue = field.render( {
-								item,
-								view,
-							} );
-							if ( ! renderedValue ) {
-								return null;
-							}
-							return (
-								<VStack
-									className="dataviews-view-grid__field"
-									key={ field.id }
-									spacing={ 1 }
-								>
-									<div className="dataviews-view-grid__field-header">
-										{ field.header }
-									</div>
-									<div className="dataviews-view-grid__field-value">
-										{ field.render( { item, view } ) }
-									</div>
-								</VStack>
-							);
-						} ) }
-					</VStack>
-				</VStack>
-			) ) }
-		</Grid>
-	);
-}
diff --git a/packages/dataviews/src/view-list.js b/packages/dataviews/src/view-list.js
deleted file mode 100644
index 7d781b0fb2ed69..00000000000000
--- a/packages/dataviews/src/view-list.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Internal dependencies
- */
-import ViewTable from './view-table';
-
-export default function ViewList( props ) {
-	// To do: change to email-like preview list.
-	return <ViewTable { ...props } />;
-}
diff --git a/packages/dataviews/src/view-table.js b/packages/dataviews/src/view-table.js
deleted file mode 100644
index 8b6422b4be11a7..00000000000000
--- a/packages/dataviews/src/view-table.js
+++ /dev/null
@@ -1,614 +0,0 @@
-/**
- * External dependencies
- */
-import {
-	getCoreRowModel,
-	getFilteredRowModel,
-	getSortedRowModel,
-	getPaginationRowModel,
-	useReactTable,
-	flexRender,
-} from '@tanstack/react-table';
-
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { useAsyncList } from '@wordpress/compose';
-import {
-	chevronDown,
-	chevronUp,
-	unseen,
-	check,
-	arrowUp,
-	arrowDown,
-	chevronRightSmall,
-	funnel,
-} from '@wordpress/icons';
-import {
-	Button,
-	Icon,
-	privateApis as componentsPrivateApis,
-} from '@wordpress/components';
-import { useMemo, Children, Fragment } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { unlock } from './lock-unlock';
-import ItemActions from './item-actions';
-import { ENUMERATION_TYPE, OPERATOR_IN, OPERATOR_NOT_IN } from './constants';
-
-const {
-	DropdownMenuV2: DropdownMenu,
-	DropdownMenuGroupV2: DropdownMenuGroup,
-	DropdownMenuItemV2: DropdownMenuItem,
-	DropdownMenuSeparatorV2: DropdownMenuSeparator,
-	DropdownSubMenuV2: DropdownSubMenu,
-	DropdownSubMenuTriggerV2: DropdownSubMenuTrigger,
-} = unlock( componentsPrivateApis );
-
-const EMPTY_OBJECT = {};
-const sortingItemsInfo = {
-	asc: { icon: arrowUp, label: __( 'Sort ascending' ) },
-	desc: { icon: arrowDown, label: __( 'Sort descending' ) },
-};
-const sortIcons = { asc: chevronUp, desc: chevronDown };
-
-function HeaderMenu( { dataView, header } ) {
-	if ( header.isPlaceholder ) {
-		return null;
-	}
-	const text = flexRender(
-		header.column.columnDef.header,
-		header.getContext()
-	);
-	const isSortable = !! header.column.getCanSort();
-	const isHidable = !! header.column.getCanHide();
-	if ( ! isSortable && ! isHidable ) {
-		return text;
-	}
-	const sortedDirection = header.column.getIsSorted();
-
-	let filter, filterInView;
-	const otherFilters = [];
-	if ( header.column.columnDef.type === ENUMERATION_TYPE ) {
-		let columnOperators = header.column.columnDef.filterBy?.operators;
-		if ( ! columnOperators || ! Array.isArray( columnOperators ) ) {
-			columnOperators = [ OPERATOR_IN, OPERATOR_NOT_IN ];
-		}
-		const operators = columnOperators.filter( ( operator ) =>
-			[ OPERATOR_IN, OPERATOR_NOT_IN ].includes( operator )
-		);
-		if ( operators.length >= 0 ) {
-			filter = {
-				field: header.column.columnDef.id,
-				operators,
-				elements: header.column.columnDef.elements || [],
-			};
-			filterInView = {
-				field: filter.field,
-				operator: filter.operators[ 0 ],
-				value: undefined,
-			};
-		}
-	}
-	const isFilterable = !! filter;
-
-	if ( isFilterable ) {
-		const columnFilters = dataView.getState().columnFilters;
-		columnFilters.forEach( ( columnFilter ) => {
-			const [ field, operator ] =
-				Object.keys( columnFilter )[ 0 ].split( ':' );
-			const value = Object.values( columnFilter )[ 0 ];
-			if ( field === filter.field ) {
-				filterInView = {
-					field,
-					operator,
-					value,
-				};
-			} else {
-				otherFilters.push( columnFilter );
-			}
-		} );
-	}
-
-	return (
-		<DropdownMenu
-			align="start"
-			trigger={
-				<Button
-					icon={ sortIcons[ header.column.getIsSorted() ] }
-					iconPosition="right"
-					text={ text }
-					style={ { padding: 0 } }
-				/>
-			}
-		>
-			<WithSeparators>
-				{ isSortable && (
-					<DropdownMenuGroup>
-						{ Object.entries( sortingItemsInfo ).map(
-							( [ direction, info ] ) => (
-								<DropdownMenuItem
-									key={ direction }
-									role="menuitemradio"
-									aria-checked={
-										sortedDirection === direction
-									}
-									prefix={ <Icon icon={ info.icon } /> }
-									suffix={
-										sortedDirection === direction && (
-											<Icon icon={ check } />
-										)
-									}
-									onSelect={ ( event ) => {
-										event.preventDefault();
-										if ( sortedDirection === direction ) {
-											dataView.resetSorting();
-										} else {
-											dataView.setSorting( [
-												{
-													id: header.column.id,
-													desc: direction === 'desc',
-												},
-											] );
-										}
-									} }
-								>
-									{ info.label }
-								</DropdownMenuItem>
-							)
-						) }
-					</DropdownMenuGroup>
-				) }
-				{ isHidable && (
-					<DropdownMenuItem
-						role="menuitemradio"
-						aria-checked={ ! header.column.getIsVisible() }
-						prefix={ <Icon icon={ unseen } /> }
-						onSelect={ ( event ) => {
-							event.preventDefault();
-							header.column.getToggleVisibilityHandler()( event );
-						} }
-					>
-						{ __( 'Hide' ) }
-					</DropdownMenuItem>
-				) }
-				{ isFilterable && (
-					<DropdownMenuGroup>
-						<DropdownSubMenu
-							key={ filter.field }
-							trigger={
-								<DropdownSubMenuTrigger
-									prefix={ <Icon icon={ funnel } /> }
-									suffix={
-										<Icon icon={ chevronRightSmall } />
-									}
-								>
-									{ __( 'Filter by' ) }
-								</DropdownSubMenuTrigger>
-							}
-						>
-							<WithSeparators>
-								<DropdownMenuGroup>
-									{ filter.elements.map( ( element ) => {
-										let isActive = false;
-										if ( filterInView ) {
-											// Intentionally use loose comparison, so it does type conversion.
-											// This covers the case where a top-level filter for the same field converts a number into a string.
-											/* eslint-disable eqeqeq */
-											isActive =
-												element.value ==
-												filterInView.value;
-											/* eslint-enable eqeqeq */
-										}
-
-										return (
-											<DropdownMenuItem
-												key={ element.value }
-												role="menuitemradio"
-												aria-checked={ isActive }
-												prefix={
-													isActive && (
-														<Icon icon={ check } />
-													)
-												}
-												onSelect={ () => {
-													dataView.setColumnFilters( [
-														...otherFilters,
-														{
-															[ filter.field +
-															':' +
-															filterInView?.operator ]:
-																isActive
-																	? undefined
-																	: element.value,
-														},
-													] );
-												} }
-											>
-												{ element.label }
-											</DropdownMenuItem>
-										);
-									} ) }
-								</DropdownMenuGroup>
-								{ filter.operators.length > 1 && (
-									<DropdownSubMenu
-										trigger={
-											<DropdownSubMenuTrigger
-												suffix={
-													<>
-														{ filterInView.operator ===
-														OPERATOR_IN
-															? __( 'Is' )
-															: __( 'Is not' ) }
-														<Icon
-															icon={
-																chevronRightSmall
-															}
-														/>{ ' ' }
-													</>
-												}
-											>
-												{ __( 'Conditions' ) }
-											</DropdownSubMenuTrigger>
-										}
-									>
-										<DropdownMenuItem
-											key="in-filter"
-											role="menuitemradio"
-											aria-checked={
-												filterInView?.operator ===
-												OPERATOR_IN
-											}
-											prefix={
-												filterInView?.operator ===
-													OPERATOR_IN && (
-													<Icon icon={ check } />
-												)
-											}
-											onSelect={ () =>
-												dataView.setColumnFilters( [
-													...otherFilters,
-													{
-														[ filter.field +
-														':' +
-														OPERATOR_IN ]:
-															filterInView?.value,
-													},
-												] )
-											}
-										>
-											{ __( 'Is' ) }
-										</DropdownMenuItem>
-										<DropdownMenuItem
-											key="not-in-filter"
-											role="menuitemradio"
-											aria-checked={
-												filterInView?.operator ===
-												OPERATOR_NOT_IN
-											}
-											prefix={
-												filterInView?.operator ===
-													OPERATOR_NOT_IN && (
-													<Icon icon={ check } />
-												)
-											}
-											onSelect={ () =>
-												dataView.setColumnFilters( [
-													...otherFilters,
-													{
-														[ filter.field +
-														':' +
-														OPERATOR_NOT_IN ]:
-															filterInView?.value,
-													},
-												] )
-											}
-										>
-											{ __( 'Is not' ) }
-										</DropdownMenuItem>
-									</DropdownSubMenu>
-								) }
-							</WithSeparators>
-						</DropdownSubMenu>
-					</DropdownMenuGroup>
-				) }
-			</WithSeparators>
-		</DropdownMenu>
-	);
-}
-
-function WithSeparators( { children } ) {
-	return Children.toArray( children )
-		.filter( Boolean )
-		.map( ( child, i ) => (
-			<Fragment key={ i }>
-				{ i > 0 && <DropdownMenuSeparator /> }
-				{ child }
-			</Fragment>
-		) );
-}
-
-function ViewTable( {
-	view,
-	onChangeView,
-	fields,
-	actions,
-	data,
-	getItemId,
-	isLoading = false,
-	paginationInfo,
-} ) {
-	const columns = useMemo( () => {
-		const _columns = fields.map( ( field ) => {
-			const { render, getValue, ...column } = field;
-			column.cell = ( props ) =>
-				render( { item: props.row.original, view } );
-			if ( getValue ) {
-				column.accessorFn = ( item ) => getValue( { item } );
-			}
-			return column;
-		} );
-		if ( actions?.length ) {
-			_columns.push( {
-				header: __( 'Actions' ),
-				id: 'actions',
-				cell: ( props ) => {
-					return (
-						<ItemActions
-							item={ props.row.original }
-							actions={ actions }
-						/>
-					);
-				},
-				enableHiding: false,
-			} );
-		}
-
-		return _columns;
-	}, [ fields, actions, view ] );
-
-	const columnVisibility = useMemo( () => {
-		if ( ! view.hiddenFields?.length ) {
-			return;
-		}
-		return view.hiddenFields.reduce(
-			( accumulator, fieldId ) => ( {
-				...accumulator,
-				[ fieldId ]: false,
-			} ),
-			{}
-		);
-	}, [ view.hiddenFields ] );
-
-	/**
-	 * Transform the filters from the view format into the tanstack columns filter format.
-	 *
-	 * Input:
-	 *
-	 * view.filters = [
-	 *   { field: 'date', operator: 'before', value: '2020-01-01' },
-	 *   { field: 'date', operator: 'after', value: '2020-01-01' },
-	 * ]
-	 *
-	 * Output:
-	 *
-	 * columnFilters = [
-	 *   { "date:before": '2020-01-01' },
-	 *   { "date:after": '2020-01-01' }
-	 * ]
-	 *
-	 * @param {Array} filters The view filters to transform.
-	 * @return {Array} The transformed TanStack column filters.
-	 */
-	const toTanStackColumnFilters = ( filters ) =>
-		filters?.map( ( filter ) => ( {
-			[ filter.field + ':' + filter.operator ]: filter.value,
-		} ) );
-
-	/**
-	 * Transform the filters from the view format into the tanstack columns filter format.
-	 *
-	 * Input:
-	 *
-	 * columnFilters = [
-	 *   { "date:before": '2020-01-01'},
-	 *   { "date:after": '2020-01-01' }
-	 * ]
-	 *
-	 * Output:
-	 *
-	 * view.filters = [
-	 *   { field: 'date', operator: 'before', value: '2020-01-01' },
-	 *   { field: 'date', operator: 'after', value: '2020-01-01' },
-	 * ]
-	 *
-	 * @param {Array} filters The TanStack column filters to transform.
-	 * @return {Array} The transformed view filters.
-	 */
-	const fromTanStackColumnFilters = ( filters ) =>
-		filters.map( ( filter ) => {
-			const [ key, value ] = Object.entries( filter )[ 0 ];
-			const [ field, operator ] = key.split( ':' );
-			return { field, operator, value };
-		} );
-
-	const shownData = useAsyncList( data );
-	const dataView = useReactTable( {
-		data: shownData,
-		columns,
-		manualSorting: true,
-		manualFiltering: true,
-		manualPagination: true,
-		enableRowSelection: true,
-		state: {
-			sorting: view.sort
-				? [
-						{
-							id: view.sort.field,
-							desc: view.sort.direction === 'desc',
-						},
-				  ]
-				: [],
-			globalFilter: view.search,
-			columnFilters: toTanStackColumnFilters( view.filters ),
-			pagination: {
-				pageIndex: view.page,
-				pageSize: view.perPage,
-			},
-			columnVisibility: columnVisibility ?? EMPTY_OBJECT,
-		},
-		getRowId: getItemId,
-		onSortingChange: ( sortingUpdater ) => {
-			onChangeView( ( currentView ) => {
-				const sort =
-					typeof sortingUpdater === 'function'
-						? sortingUpdater(
-								currentView.sort
-									? [
-											{
-												id: currentView.sort.field,
-												desc:
-													currentView.sort
-														.direction === 'desc',
-											},
-									  ]
-									: []
-						  )
-						: sortingUpdater;
-				if ( ! sort.length ) {
-					return {
-						...currentView,
-						sort: {},
-					};
-				}
-				const [ { id, desc } ] = sort;
-				return {
-					...currentView,
-					sort: { field: id, direction: desc ? 'desc' : 'asc' },
-				};
-			} );
-		},
-		onColumnVisibilityChange: ( columnVisibilityUpdater ) => {
-			onChangeView( ( currentView ) => {
-				const hiddenFields = Object.entries(
-					columnVisibilityUpdater()
-				).reduce(
-					( accumulator, [ fieldId, value ] ) => {
-						if ( value ) {
-							return accumulator.filter(
-								( id ) => id !== fieldId
-							);
-						}
-						return [ ...accumulator, fieldId ];
-					},
-					[ ...( currentView.hiddenFields || [] ) ]
-				);
-				return {
-					...currentView,
-					hiddenFields,
-				};
-			} );
-		},
-		onGlobalFilterChange: ( value ) => {
-			onChangeView( { ...view, search: value, page: 1 } );
-		},
-		onColumnFiltersChange: ( columnFiltersUpdater ) => {
-			onChangeView( {
-				...view,
-				filters: fromTanStackColumnFilters( columnFiltersUpdater() ),
-				page: 1,
-			} );
-		},
-		onPaginationChange: ( paginationUpdater ) => {
-			onChangeView( ( currentView ) => {
-				const { pageIndex, pageSize } = paginationUpdater( {
-					pageIndex: currentView.page,
-					pageSize: currentView.perPage,
-				} );
-				return { ...view, page: pageIndex, perPage: pageSize };
-			} );
-		},
-		getCoreRowModel: getCoreRowModel(),
-		getFilteredRowModel: getFilteredRowModel(),
-		getSortedRowModel: getSortedRowModel(),
-		getPaginationRowModel: getPaginationRowModel(),
-		pageCount: paginationInfo.totalPages,
-	} );
-
-	const { rows } = dataView.getRowModel();
-	const hasRows = !! rows?.length;
-	if ( isLoading ) {
-		// TODO:Add spinner or progress bar..
-		return <h3>{ __( 'Loading' ) }</h3>;
-	}
-	return (
-		<div className="dataviews-table-view-wrapper">
-			{ hasRows && (
-				<table className="dataviews-table-view">
-					<thead>
-						{ dataView.getHeaderGroups().map( ( headerGroup ) => (
-							<tr key={ headerGroup.id }>
-								{ headerGroup.headers.map( ( header ) => (
-									<th
-										key={ header.id }
-										colSpan={ header.colSpan }
-										style={ {
-											width:
-												header.column.columnDef.width ||
-												undefined,
-											minWidth:
-												header.column.columnDef
-													.minWidth || undefined,
-											maxWidth:
-												header.column.columnDef
-													.maxWidth || undefined,
-										} }
-										data-field-id={ header.id }
-									>
-										<HeaderMenu
-											dataView={ dataView }
-											header={ header }
-										/>
-									</th>
-								) ) }
-							</tr>
-						) ) }
-					</thead>
-					<tbody>
-						{ rows.map( ( row ) => (
-							<tr key={ row.id }>
-								{ row.getVisibleCells().map( ( cell ) => (
-									<td
-										key={ cell.column.id }
-										style={ {
-											width:
-												cell.column.columnDef.width ||
-												undefined,
-											minWidth:
-												cell.column.columnDef
-													.minWidth || undefined,
-											maxWidth:
-												cell.column.columnDef
-													.maxWidth || undefined,
-										} }
-									>
-										{ flexRender(
-											cell.column.columnDef.cell,
-											cell.getContext()
-										) }
-									</td>
-								) ) }
-							</tr>
-						) ) }
-					</tbody>
-				</table>
-			) }
-			{ ! hasRows && <p>{ __( 'no results' ) }</p> }
-		</div>
-	);
-}
-
-export default ViewTable;
diff --git a/packages/dataviews/tsconfig.json b/packages/dataviews/tsconfig.json
new file mode 100644
index 00000000000000..78e68b5a7c98b4
--- /dev/null
+++ b/packages/dataviews/tsconfig.json
@@ -0,0 +1,21 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig.json",
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"declarationDir": "build-types",
+		"checkJs": false
+	},
+	"references": [
+		{ "path": "../components" },
+		{ "path": "../compose" },
+		{ "path": "../data" },
+		{ "path": "../element" },
+		{ "path": "../i18n" },
+		{ "path": "../icons" },
+		{ "path": "../primitives" },
+		{ "path": "../private-apis" },
+		{ "path": "../warning" }
+	],
+	"include": [ "src" ]
+}
diff --git a/packages/date/.npmrc b/packages/date/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/date/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/date/CHANGELOG.md b/packages/date/CHANGELOG.md
index d2acf021c7de43..4f35e1c2fcd475 100644
--- a/packages/date/CHANGELOG.md
+++ b/packages/date/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.58.0 (2024-05-16)
+
+## 4.57.0 (2024-05-02)
+
+## 4.56.0 (2024-04-19)
+
+## 4.55.0 (2024-04-03)
+
+## 4.54.0 (2024-03-21)
+
+## 4.53.0 (2024-03-06)
+
+## 4.52.0 (2024-02-21)
+
+## 4.51.0 (2024-02-09)
+
+## 4.50.0 (2024-01-24)
+
+## 4.49.0 (2024-01-10)
+
+## 4.48.0 (2023-12-13)
+
 ## 4.47.0 (2023-11-29)
 
 ## 4.46.0 (2023-11-16)
@@ -64,7 +112,7 @@
 
 ## 4.17.0 (2022-09-13)
 
-## Deprecations
+### Deprecations
 
 -   `__experimentalGetSettings` has been renamed to `getSettings`.
 
@@ -109,7 +157,7 @@
 
 ## 3.15.0 (2021-04-06)
 
-### New Feature
+### New Features
 
 -   Bundle type definitions.
 
@@ -134,7 +182,7 @@
 
 ## 2.1.0 (2018-10-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Marked getSettings as experimental
 
@@ -146,6 +194,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/date/package.json b/packages/date/package.json
index 553cda7f431d47..a5925869f2acc0 100644
--- a/packages/date/package.json
+++ b/packages/date/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/date",
-	"version": "4.47.0",
+	"version": "5.10.0",
 	"description": "Date module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,19 +19,21 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/deprecated": "file:../deprecated",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/deprecated": "*",
 		"moment": "^2.29.4",
 		"moment-timezone": "^0.5.40"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/date/src/index.js b/packages/date/src/index.js
index 3267f6cce92357..90f65f62628dc8 100644
--- a/packages/date/src/index.js
+++ b/packages/date/src/index.js
@@ -31,9 +31,10 @@ import deprecated from '@wordpress/deprecated';
 
 /**
  * @typedef TimezoneConfig
- * @property {string} offset Offset setting.
- * @property {string} string The timezone as a string (e.g., `'America/Los_Angeles'`).
- * @property {string} abbr   Abbreviation for the timezone.
+ * @property {string} offset          Offset setting.
+ * @property {string} offsetFormatted Offset setting with decimals formatted to minutes.
+ * @property {string} string          The timezone as a string (e.g., `'America/Los_Angeles'`).
+ * @property {string} abbr            Abbreviation for the timezone.
  */
 
 /* eslint-disable jsdoc/valid-types */
@@ -63,8 +64,8 @@ const WP_ZONE = 'WP';
 // See: https://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC
 const VALID_UTC_OFFSET = /^[+-][0-1][0-9](:?[0-9][0-9])?$/;
 
-// Changes made here will likely need to be made in `lib/client-assets.php` as
-// well because it uses the `setSettings()` function to change these settings.
+// Changes made here will likely need to be synced with Core in the file
+// src/wp-includes/script-loader.php in `wp_default_packages_inline_scripts()`.
 /** @type {DateSettings} */
 let settings = {
 	l10n: {
@@ -132,7 +133,7 @@ let settings = {
 		datetime: 'F j, Y g: i a',
 		datetimeAbbreviated: 'M j, Y g: i a',
 	},
-	timezone: { offset: '0', string: '', abbr: '' },
+	timezone: { offset: '0', offsetFormatted: '0', string: '', abbr: '' },
 };
 
 /**
diff --git a/packages/date/tsconfig.json b/packages/date/tsconfig.json
index 5ba00433fe8555..0c9e6d5ed02b0b 100644
--- a/packages/date/tsconfig.json
+++ b/packages/date/tsconfig.json
@@ -1,9 +1,9 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
-		"declarationDir": "build-types",
-		"noUnusedParameters": false
+		"declarationDir": "build-types"
 	},
 	"references": [ { "path": "../deprecated" } ],
 	"include": [ "src/**/*" ]
diff --git a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
index 50e894da1b905c..4170d698ca5654 100644
--- a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
+++ b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,78 @@
 
 ## Unreleased
 
+## 6.10.0 (2024-10-16)
+
+## 6.9.0 (2024-10-03)
+
+### Enhancements
+
+-   Detection of magic comments is now done before minification ([#65582](https://github.com/WordPress/gutenberg/pull/65582)).
+
+### Bug Fixes
+
+-   Fix a bug where cycles in dependent modules could enter infinite recursion ([#65291](https://github.com/WordPress/gutenberg/pull/65291)).
+
+## 6.8.0 (2024-09-19)
+
+## 6.7.0 (2024-09-05)
+
+## 6.6.0 (2024-08-21)
+
+## 6.5.0 (2024-08-07)
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### Breaking Changes
+
+**Note** If you're using @wordpress/scripts for building JS scripts to target WordPress 6.5 or earlier, you should not upgrade to this version and continue using @wordpress/dependency-extraction-webpack-plugin@5.
+
+-   Use React's automatic runtime to transform JSX ([#61692](https://github.com/WordPress/gutenberg/pull/61692)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 5.9.0 (2024-05-16)
+
+## 5.8.0 (2024-05-02)
+
+## 5.7.0 (2024-04-19)
+
+## 5.6.0 (2024-04-03)
+
+## 5.5.0 (2024-03-21)
+
+## 5.4.0 (2024-03-06)
+
+## 5.3.0 (2024-02-21)
+
+## 5.2.0 (2024-02-09)
+
+### Bug Fixes
+
+-   Fix import type field in script module asset files ([#58770](https://github.com/WordPress/gutenberg/pull/58770)).
+
+## 5.1.0 (2024-01-24)
+
+## 5.0.0 (2024-01-10)
+
+### Breaking Changes
+
+-   Drop support for webpack 4.
+-   Drop support for Node.js versions < 18.
+
+### New Features
+
+-   Add support for producing module-compatible asset files ([#57199](https://github.com/WordPress/gutenberg/pull/57199)).
+
+## 4.31.0 (2023-12-13)
+
 ## 4.30.0 (2023-11-29)
 
 ## 4.29.0 (2023-11-16)
@@ -44,7 +116,7 @@
 
 ## 4.10.0 (2023-02-15)
 
-### Bug Fix
+### Bug Fixes
 
 -   The bundled `json2php` dependency has been upgraded from requiring `^0.0.5` to `^0.0.7` ([#47831](https://github.com/WordPress/gutenberg/pull/47831)).
 
@@ -72,7 +144,7 @@
 
 ## 4.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -84,7 +156,7 @@
 
 ## 3.5.0 (2022-05-18)
 
-### Bug Fix
+### Bug Fixes
 
 -   Use OpenSSL provider supported in Node 17+ when calling `crypto.createHash` ([#40503](https://github.com/WordPress/gutenberg/pull/40503)).
 -   Add new line at the end of generated `*.asset.php` files ([#40753](https://github.com/WordPress/gutenberg/pull/40753)).
@@ -102,13 +174,13 @@
 
 ## 2.9.0 (2020-12-17)
 
-### New feature
+### New Features
 
 -   Make the plugin compatible with webpack 5.
 
 ## 2.7.0 (2020-06-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#22498](https://github.com/WordPress/gutenberg/pull/22498))
 
@@ -138,6 +210,6 @@
 
 ## 1.0.0 (2019-05-21)
 
-### New Feature
+### New Features
 
 -   Introduce the `@wordpress/dependency-extraction-webpack-plugin` package.
diff --git a/packages/dependency-extraction-webpack-plugin/README.md b/packages/dependency-extraction-webpack-plugin/README.md
index eac1e8e27ffc5c..9e6b183672f86d 100644
--- a/packages/dependency-extraction-webpack-plugin/README.md
+++ b/packages/dependency-extraction-webpack-plugin/README.md
@@ -2,11 +2,15 @@
 
 This webpack plugin serves two purposes:
 
--   Externalize dependencies that are available as script dependencies on modern WordPress sites.
--   Add an asset file for each entry point that declares an object with the list of WordPress script dependencies for the entry point. The asset file also contains the current version calculated for the current source code.
+-   Externalize dependencies that are available as shared scripts or modules on WordPress sites.
+-   Add an asset file for each entry point that declares an object with the list of WordPress script or module dependencies for the entry point. The asset file also contains the current version calculated for the current source code.
 
 This allows JavaScript bundles produced by webpack to leverage WordPress style dependency sharing without an error-prone process of manually maintaining a dependency list.
 
+Version 5 of this plugin adds support for module bundling. [Webpack's `output.module` option](https://webpack.js.org/configuration/output/#outputmodule) should
+be used to opt-in to this behavior. This plugin will adapt it's behavior based on the
+`output.module` option, producing an asset file suitable for use with the WordPress Module API.
+
 Consult the [webpack website](https://webpack.js.org) for additional information on webpack concepts.
 
 ## Installation
@@ -17,7 +21,7 @@ Install the module
 npm install @wordpress/dependency-extraction-webpack-plugin --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It also requires webpack 4.8.3 and newer. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It also requires webpack 5.0.0 or newer. It is not compatible with older versions.
 
 ## Usage
 
@@ -39,7 +43,7 @@ module.exports = {
 
 ```js
 const defaultConfig = require( '@wordpress/scripts/config/webpack.config' );
-const config = {
+const webpackConfig = {
 	...defaultConfig,
 	plugins: [
 		...defaultConfig.plugins.filter(
@@ -56,7 +60,9 @@ const config = {
 };
 ```
 
-Each entry point in the webpack bundle will include an asset file that declares the WordPress script dependencies that should be enqueued. Such file also contains the unique version hash calculated based on the file content.
+### Behavior with scripts
+
+Each entry point in the webpack bundle will include an asset file that declares the WordPress script dependencies that should be enqueued. This file also contains the unique version hash calculated based on the file content.
 
 For example:
 
@@ -88,6 +94,68 @@ By default, the following module requests are handled:
 
 This plugin is compatible with `externals`, but they may conflict. For example, adding `{ externals: { '@wordpress/blob': 'wp.blob' } }` to webpack configuration will effectively hide the `@wordpress/blob` module from the plugin and it will not be included in dependency lists.
 
+### Behavior with script modules
+
+**Warning:** Script modules support is considered experimental at this time.
+
+This section describes the behavior of this package to bundle ECMAScript modules and generate asset
+files suitable for use with the WordPress Script Modules API.
+
+Some of this plugin's options change, and webpack requires configuration to output script modules. Refer to
+[webpack's documentation](https://webpack.js.org/configuration/output/#outputmodule) for up-to-date details.
+
+```js
+const webpackConfig = {
+	...defaultConfig,
+
+	// These lines are necessary to enable module compilation at time-of-writing:
+	output: { module: true },
+	experiments: { outputModule: true },
+
+	plugins: [
+		...defaultConfig.plugins.filter(
+			( plugin ) =>
+				plugin.constructor.name !== 'DependencyExtractionWebpackPlugin'
+		),
+		new DependencyExtractionWebpackPlugin( {
+			// With modules, use `requestToExternalModule`:
+			requestToExternalModule( request ) {
+				if ( request === 'my-registered-module' ) {
+					return request;
+				}
+			},
+		} ),
+	],
+};
+```
+
+Each entry point in the webpack bundle will include an asset file that declares the WordPress script module dependencies that should be enqueued. This file also contains the unique version hash calculated based on the file content.
+
+For example:
+
+```
+// Source file entrypoint.js
+import { store, getContext } from '@wordpress/interactivity';
+
+// Webpack will produce the output output/entrypoint.js
+/* bundled JavaScript output */
+
+// Webpack will also produce output/entrypoint.asset.php declaring script dependencies
+<?php return array('dependencies' => array('@wordpress/interactivity'), 'version' => 'dd4c2dc50d046ed9d4c063a7ca95702f');
+```
+
+By default, the following script module requests are handled:
+
+| Request                      |
+| ---------------------------- |
+| `@wordpress/interactivity  ` |
+
+(`@wordpress/interactivity` is currently the only available WordPress script module.)
+
+**Note:** This plugin overlaps with the functionality provided by [webpack `externals`](https://webpack.js.org/configuration/externals). This plugin is intended to extract script module identifiers from bundle compilation so that a list of script module dependencies does not need to be manually maintained. If you don't need to extract a list of script module dependencies, use the `externals` option directly.
+
+This plugin is compatible with `externals`, but they may conflict. For example, adding `{ externals: { '@wordpress/blob': 'wp.blob' } }` to webpack configuration will effectively hide the `@wordpress/blob` module from the plugin and it will not be included in dependency lists.
+
 #### Options
 
 An object can be passed to the constructor to customize the behavior, for example:
@@ -142,6 +210,8 @@ Pass `useDefaults: false` to disable the default request handling.
 
 Force `wp-polyfill` to be included in each entry point's dependency list. This would be the same as adding `import '@wordpress/polyfill';` to each entry point.
 
+**Note**: This option is not available with script modules.
+
 ##### `externalizedReport`
 
 -   Type: boolean | string
@@ -152,6 +222,8 @@ You can provide a filename, or set it to `true` to report to a default `external
 
 ##### `requestToExternal`
 
+**Note**: This option is not available with script modules. See [`requestToExternalModule`](#requestToExternalModule) for module usage.
+
 -   Type: function
 
 `requestToExternal` allows the module handling to be customized. The function should accept a module request string and may return a string representing the global variable to use. An array of strings may be used to access globals via an object path, e.g. `wp.i18n` may be represented as `[ 'wp', 'i18n' ]`.
@@ -179,8 +251,46 @@ module.exports = {
 };
 ```
 
+##### `requestToExternalModule`
+
+**Note**: This option is only available with script modules. See [`requestToExternal`](#requestToExternal) for script usage.
+
+-   Type: function
+
+`requestToExternalModule` allows the script module handling to be customized. The function should accept a script module request string and may return a string representing the script module to use. Often, the script module will have the same name.
+
+`requestToExternalModule` provided via configuration has precedence over default external handling. Unhandled requests will be handled by the default unless `useDefaults` is set to `false`.
+
+```js
+/**
+ * Externalize 'my-module'
+ *
+ * @param {string} request Requested script module
+ *
+ * @return {(string|boolean|undefined)} Script module ID
+ */
+function requestToExternalModule( request ) {
+	// Handle imports like `import myModule from 'my-module'`
+	if ( request === 'my-module' ) {
+		// Import should be of the form `import { something } from "myModule";` in the final bundle.
+		return 'myModule';
+	}
+
+	// If the script module ID in source is the same as the external script module, `true` can be returned.
+	return request === 'external-module-id-no-change-required';
+}
+
+module.exports = {
+	plugins: [
+		new DependencyExtractionWebpackPlugin( { requestToExternalModule } ),
+	],
+};
+```
+
 ##### `requestToHandle`
 
+**Note**: This option is not available with script modules. It has no corresponding module configuration.
+
 -   Type: function
 
 All of the external modules handled by the plugin are expected to be WordPress script dependencies
@@ -207,7 +317,7 @@ function requestToHandle( request ) {
 }
 
 module.exports = {
-	plugins: [ new DependencyExtractionWebpackPlugin( { requestToExternal } ) ],
+	plugins: [ new DependencyExtractionWebpackPlugin( { requestToHandle } ) ],
 };
 ```
 
@@ -233,6 +343,19 @@ $script_url = plugins_url( $script_path, __FILE__ );
 wp_enqueue_script( 'script', $script_url, $script_asset['dependencies'], $script_asset['version'] );
 ```
 
+Or with modules (the Script Module API is only available in WordPress > 6.5):
+
+```php
+$module_path       = 'path/to/module.js';
+$module_asset_path = 'path/to/module.asset.php';
+$module_asset      = file_exists( $module_asset_path )
+	? require( $module_asset_path )
+	: array( 'dependencies' => array(), 'version' => filemtime( $module_path ) );
+$module_url = plugins_url( $module_path, __FILE__ );
+wp_register_script_module( 'my-module', $module_url, $module_asset['dependencies'], $module_asset['version'] );
+wp_enqueue_script_module( 'my-module' );
+```
+
 ## Contributing to this package
 
 This is an individual package that's part of the Gutenberg project. The project is organized as a monorepo. It's made up of multiple self-contained software packages, each with a specific purpose. The packages in this monorepo are published to [npm](https://www.npmjs.com/) and used by [WordPress](https://make.wordpress.org/core/) as well as other software projects.
diff --git a/packages/dependency-extraction-webpack-plugin/lib/.eslintrc.json b/packages/dependency-extraction-webpack-plugin/lib/.eslintrc.json
index 305ba4347aedd3..5e1457134b16a7 100644
--- a/packages/dependency-extraction-webpack-plugin/lib/.eslintrc.json
+++ b/packages/dependency-extraction-webpack-plugin/lib/.eslintrc.json
@@ -1,6 +1,4 @@
 {
-	// Use the default eslint parser. Prevent babel transforms.
-	"parser": "espree",
 	"env": {
 		"node": true
 	}
diff --git a/packages/dependency-extraction-webpack-plugin/lib/index.js b/packages/dependency-extraction-webpack-plugin/lib/index.js
index 581274c3684f93..cf780d7370dcfc 100644
--- a/packages/dependency-extraction-webpack-plugin/lib/index.js
+++ b/packages/dependency-extraction-webpack-plugin/lib/index.js
@@ -3,10 +3,7 @@
  */
 const path = require( 'path' );
 const webpack = require( 'webpack' );
-// In webpack 5 there is a `webpack.sources` field but for webpack 4 we have to fallback to the `webpack-sources` package.
-const { RawSource } = webpack.sources || require( 'webpack-sources' );
 const json2php = require( 'json2php' );
-const isWebpack4 = webpack.version.startsWith( '4.' );
 const { createHash } = webpack.util;
 
 /**
@@ -14,9 +11,13 @@ const { createHash } = webpack.util;
  */
 const {
 	defaultRequestToExternal,
+	defaultRequestToExternalModule,
 	defaultRequestToHandle,
 } = require( './util' );
 
+const { RawSource } = webpack.sources;
+const { AsyncDependenciesBlock } = webpack;
+
 const defaultExternalizedReportFileName = 'externalized-dependencies.json';
 
 class DependencyExtractionWebpackPlugin {
@@ -34,38 +35,65 @@ class DependencyExtractionWebpackPlugin {
 			options
 		);
 
-		/*
+		/**
 		 * Track requests that are externalized.
 		 *
 		 * Because we don't have a closed set of dependencies, we need to track what has
 		 * been externalized so we can recognize them in a later phase when the dependency
 		 * lists are generated.
+		 *
+		 * @type {Set<string>}
 		 */
 		this.externalizedDeps = new Set();
 
-		// Offload externalization work to the ExternalsPlugin.
-		this.externalsPlugin = new webpack.ExternalsPlugin(
-			'window',
-			isWebpack4
-				? this.externalizeWpDeps.bind( this )
-				: this.externalizeWpDepsV5.bind( this )
-		);
+		/**
+		 * Should we use modules. This will be set later to match webpack's
+		 * output.module option.
+		 *
+		 * @type {boolean}
+		 */
+		this.useModules = false;
 	}
 
-	externalizeWpDeps( _context, request, callback ) {
+	/**
+	 * @param {webpack.ExternalItemFunctionData}                             data
+	 * @param { ( err?: null | Error, result?: string | string[] ) => void } callback
+	 */
+	externalizeWpDeps( { request }, callback ) {
 		let externalRequest;
 
-		// Handle via options.requestToExternal first.
-		if ( typeof this.options.requestToExternal === 'function' ) {
-			externalRequest = this.options.requestToExternal( request );
-		}
+		try {
+			// Handle via options.requestToExternal(Module)  first.
+			if ( this.useModules ) {
+				if (
+					typeof this.options.requestToExternalModule === 'function'
+				) {
+					externalRequest =
+						this.options.requestToExternalModule( request );
+
+					// requestToExternalModule allows a boolean shorthand
+					if ( externalRequest === false ) {
+						externalRequest = undefined;
+					}
+					if ( externalRequest === true ) {
+						externalRequest = request;
+					}
+				}
+			} else if ( typeof this.options.requestToExternal === 'function' ) {
+				externalRequest = this.options.requestToExternal( request );
+			}
 
-		// Cascade to default if unhandled and enabled.
-		if (
-			typeof externalRequest === 'undefined' &&
-			this.options.useDefaults
-		) {
-			externalRequest = defaultRequestToExternal( request );
+			// Cascade to default if unhandled and enabled.
+			if (
+				typeof externalRequest === 'undefined' &&
+				this.options.useDefaults
+			) {
+				externalRequest = this.useModules
+					? defaultRequestToExternalModule( request )
+					: defaultRequestToExternal( request );
+			}
+		} catch ( err ) {
+			return callback( err );
 		}
 
 		if ( externalRequest ) {
@@ -77,10 +105,10 @@ class DependencyExtractionWebpackPlugin {
 		return callback();
 	}
 
-	externalizeWpDepsV5( { context, request }, callback ) {
-		return this.externalizeWpDeps( context, request, callback );
-	}
-
+	/**
+	 * @param {string} request
+	 * @return {string} Mapped dependency name
+	 */
 	mapRequestToDependency( request ) {
 		// Handle via options.requestToHandle first.
 		if ( typeof this.options.requestToHandle === 'function' ) {
@@ -102,6 +130,10 @@ class DependencyExtractionWebpackPlugin {
 		return request;
 	}
 
+	/**
+	 * @param {any} asset Asset Data
+	 * @return {string} Stringified asset data suitable for output
+	 */
 	stringify( asset ) {
 		if ( this.options.outputFormat === 'php' ) {
 			return `<?php return ${ json2php(
@@ -112,30 +144,99 @@ class DependencyExtractionWebpackPlugin {
 		return JSON.stringify( asset );
 	}
 
+	/** @type {webpack.WebpackPluginInstance['apply']} */
 	apply( compiler ) {
+		this.useModules = Boolean( compiler.options.output?.module );
+
+		/**
+		 * Offload externalization work to the ExternalsPlugin.
+		 * @type {webpack.ExternalsPlugin}
+		 */
+		this.externalsPlugin = new webpack.ExternalsPlugin(
+			this.useModules ? 'import' : 'window',
+			this.externalizeWpDeps.bind( this )
+		);
+
 		this.externalsPlugin.apply( compiler );
 
-		if ( isWebpack4 ) {
-			compiler.hooks.emit.tap( this.constructor.name, ( compilation ) =>
-				this.addAssets( compilation )
+		compiler.hooks.thisCompilation.tap(
+			this.constructor.name,
+			( compilation ) => {
+				compilation.hooks.processAssets.tap(
+					{
+						name: this.constructor.name,
+						stage: compiler.webpack.Compilation
+							.PROCESS_ASSETS_STAGE_OPTIMIZE_COMPATIBILITY,
+					},
+					() => this.checkForMagicComments( compilation )
+				);
+				compilation.hooks.processAssets.tap(
+					{
+						name: this.constructor.name,
+						stage: compiler.webpack.Compilation
+							.PROCESS_ASSETS_STAGE_ANALYSE,
+					},
+					() => this.addAssets( compilation )
+				);
+			}
+		);
+	}
+
+	/**
+	 * Check for magic comments before minification, so minification doesn't have to preserve them.
+	 * @param {webpack.Compilation} compilation
+	 */
+	checkForMagicComments( compilation ) {
+		// Accumulate all entrypoint chunks, some of them shared
+		const entrypointChunks = new Set();
+		for ( const entrypoint of compilation.entrypoints.values() ) {
+			for ( const chunk of entrypoint.chunks ) {
+				entrypointChunks.add( chunk );
+			}
+		}
+
+		// Process each entrypoint chunk independently
+		for ( const chunk of entrypointChunks ) {
+			const chunkFiles = Array.from( chunk.files );
+
+			const jsExtensionRegExp = this.useModules ? /\.m?js$/i : /\.js$/i;
+
+			const chunkJSFile = chunkFiles.find( ( f ) =>
+				jsExtensionRegExp.test( f )
 			);
-		} else {
-			compiler.hooks.thisCompilation.tap(
-				this.constructor.name,
-				( compilation ) => {
-					compilation.hooks.processAssets.tap(
-						{
-							name: this.constructor.name,
-							stage: compiler.webpack.Compilation
-								.PROCESS_ASSETS_STAGE_ANALYSE,
-						},
-						() => this.addAssets( compilation )
-					);
+			if ( ! chunkJSFile ) {
+				// There's no JS file in this chunk, no work for us. Typically a `style.css` from cache group.
+				continue;
+			}
+
+			// Prepare to look for magic comments, in order to decide whether
+			// `wp-polyfill` is needed.
+			const processContentsForMagicComments = ( content ) => {
+				const magicComments = [];
+
+				if ( content.includes( '/* wp:polyfill */' ) ) {
+					magicComments.push( 'wp-polyfill' );
 				}
-			);
+
+				return magicComments;
+			};
+
+			// Go through the assets to process the sources.
+			// This allows us to look for magic comments.
+			chunkFiles.sort().forEach( ( filename ) => {
+				const asset = compilation.getAsset( filename );
+				const content = asset.source.buffer();
+
+				const wpMagicComments =
+					processContentsForMagicComments( content );
+				compilation.updateAsset( filename, ( v ) => v, {
+					wpMagicComments,
+				} );
+			} );
 		}
 	}
 
+	/** @param {webpack.Compilation} compilation */
 	addAssets( compilation ) {
 		const {
 			combineAssets,
@@ -174,28 +275,53 @@ class DependencyExtractionWebpackPlugin {
 		for ( const chunk of entrypointChunks ) {
 			const chunkFiles = Array.from( chunk.files );
 
-			const chunkJSFile = chunkFiles.find( ( f ) => /\.js$/i.test( f ) );
+			const jsExtensionRegExp = this.useModules ? /\.m?js$/i : /\.js$/i;
+
+			const chunkJSFile = chunkFiles.find( ( f ) =>
+				jsExtensionRegExp.test( f )
+			);
 			if ( ! chunkJSFile ) {
 				// There's no JS file in this chunk, no work for us. Typically a `style.css` from cache group.
 				continue;
 			}
 
-			const chunkDeps = new Set();
+			/** @type {Set<string>} */
+			const chunkStaticDeps = new Set();
+			/** @type {Set<string>} */
+			const chunkDynamicDeps = new Set();
+
 			if ( injectPolyfill ) {
-				chunkDeps.add( 'wp-polyfill' );
+				chunkStaticDeps.add( 'wp-polyfill' );
 			}
 
-			const processModule = ( { userRequest } ) => {
+			/**
+			 * @param {webpack.Module} m
+			 */
+			const processModule = ( m ) => {
+				const { userRequest } = m;
 				if ( this.externalizedDeps.has( userRequest ) ) {
-					chunkDeps.add( this.mapRequestToDependency( userRequest ) );
+					if ( this.useModules ) {
+						const isStatic =
+							DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
+								compilation,
+								m
+							);
+
+						( isStatic ? chunkStaticDeps : chunkDynamicDeps ).add(
+							m.request
+						);
+					} else {
+						chunkStaticDeps.add(
+							this.mapRequestToDependency( userRequest )
+						);
+					}
 				}
 			};
 
 			// Search for externalized modules in all chunks.
-			const modulesIterable = isWebpack4
-				? chunk.modulesIterable
-				: compilation.chunkGraph.getChunkModules( chunk );
-			for ( const chunkModule of modulesIterable ) {
+			for ( const chunkModule of compilation.chunkGraph.getChunkModulesIterable(
+				chunk
+			) ) {
 				processModule( chunkModule );
 				// Loop through submodules of ConcatenatedModule.
 				if ( chunkModule.modules ) {
@@ -205,7 +331,7 @@ class DependencyExtractionWebpackPlugin {
 				}
 			}
 
-			// Go through the assets and hash the sources. We can't just use
+			// Prepare to hash the sources. We can't just use
 			// `chunk.contentHash` because that's not updated when
 			// assets are minified. In practice the hash is updated by
 			// `RealContentHashPlugin` after minification, but it only modifies
@@ -214,21 +340,53 @@ class DependencyExtractionWebpackPlugin {
 			const { hashFunction, hashDigest, hashDigestLength } =
 				compilation.outputOptions;
 
-			const contentHash = chunkFiles
-				.sort()
-				.reduce( ( hash, filename ) => {
-					const asset = compilation.getAsset( filename );
-					return hash.update( asset.source.buffer() );
-				}, createHash( hashFunction ) )
+			const hashBuilder = createHash( hashFunction );
+
+			const processContentsForHash = ( content ) => {
+				hashBuilder.update( content );
+			};
+
+			// Prepare to look for magic comments, in order to decide whether
+			// `wp-polyfill` is needed.
+			const handleMagicComments = ( info ) => {
+				if ( ! info ) {
+					return;
+				}
+				if ( info.includes( 'wp-polyfill' ) ) {
+					chunkStaticDeps.add( 'wp-polyfill' );
+				}
+			};
+
+			// Go through the assets to process the sources.
+			// This allows us to generate hashes, as well as look for magic comments.
+			chunkFiles.sort().forEach( ( filename ) => {
+				const asset = compilation.getAsset( filename );
+				const content = asset.source.buffer();
+
+				processContentsForHash( content );
+				handleMagicComments( asset.info.wpMagicComments );
+			} );
+
+			// Finalise hash.
+			const contentHash = hashBuilder
 				.digest( hashDigest )
 				.slice( 0, hashDigestLength );
 
 			const assetData = {
-				// Get a sorted array so we can produce a stable, stringified representation.
-				dependencies: Array.from( chunkDeps ).sort(),
+				dependencies: [
+					// Sort these so we can produce a stable, stringified representation.
+					...Array.from( chunkStaticDeps ).sort(),
+					...Array.from( chunkDynamicDeps )
+						.sort()
+						.map( ( id ) => ( { id, import: 'dynamic' } ) ),
+				],
 				version: contentHash,
 			};
 
+			if ( this.useModules ) {
+				assetData.type = 'module';
+			}
+
 			if ( combineAssets ) {
 				combinedAssetsData[ chunkJSFile ] = assetData;
 				continue;
@@ -246,14 +404,14 @@ class DependencyExtractionWebpackPlugin {
 					'.asset.' + ( outputFormat === 'php' ? 'php' : 'json' );
 				assetFilename = compilation
 					.getPath( '[file]', { filename: chunkJSFile } )
-					.replace( /\.js$/i, suffix );
+					.replace( /\.m?js$/i, suffix );
 			}
 
 			// Add source and file into compilation for webpack to output.
 			compilation.assets[ assetFilename ] = new RawSource(
 				this.stringify( assetData )
 			);
-			chunk.files[ isWebpack4 ? 'push' : 'add' ]( assetFilename );
+			chunk.files.add( assetFilename );
 		}
 
 		if ( combineAssets ) {
@@ -275,6 +433,94 @@ class DependencyExtractionWebpackPlugin {
 			);
 		}
 	}
+
+	static #staticDepsCurrent = new WeakSet();
+	static #staticDepsCache = new WeakMap();
+
+	/**
+	 * Can we trace a line of static dependencies from an entry to a module
+	 *
+	 * @param {webpack.Compilation}       compilation
+	 * @param {webpack.DependenciesBlock} block
+	 *
+	 * @return {boolean} True if there is a static import path to the root
+	 */
+	static hasStaticDependencyPathToRoot( compilation, block ) {
+		if ( DependencyExtractionWebpackPlugin.#staticDepsCache.has( block ) ) {
+			return DependencyExtractionWebpackPlugin.#staticDepsCache.get(
+				block
+			);
+		}
+
+		if (
+			DependencyExtractionWebpackPlugin.#staticDepsCurrent.has( block )
+		) {
+			return false;
+		}
+
+		DependencyExtractionWebpackPlugin.#staticDepsCurrent.add( block );
+
+		const incomingConnections = [
+			...compilation.moduleGraph.getIncomingConnections( block ),
+		].filter(
+			( connection ) =>
+				// Library connections don't have a dependency, this is a root
+				connection.dependency &&
+				// Entry dependencies are another root
+				connection.dependency.constructor.name !== 'EntryDependency'
+		);
+
+		// If we don't have non-entry, non-library incoming connections,
+		// we've reached a root of
+		if ( ! incomingConnections.length ) {
+			DependencyExtractionWebpackPlugin.#staticDepsCache.set(
+				block,
+				true
+			);
+			DependencyExtractionWebpackPlugin.#staticDepsCurrent.delete(
+				block
+			);
+			return true;
+		}
+
+		const staticDependentModules = incomingConnections.flatMap(
+			( connection ) => {
+				const { dependency } = connection;
+				const parentBlock =
+					compilation.moduleGraph.getParentBlock( dependency );
+
+				return parentBlock.constructor.name !==
+					AsyncDependenciesBlock.name
+					? [ compilation.moduleGraph.getParentModule( dependency ) ]
+					: [];
+			}
+		);
+
+		// All the dependencies were Async, the module was reached via a dynamic import
+		if ( ! staticDependentModules.length ) {
+			DependencyExtractionWebpackPlugin.#staticDepsCache.set(
+				block,
+				false
+			);
+			DependencyExtractionWebpackPlugin.#staticDepsCurrent.delete(
+				block
+			);
+			return false;
+		}
+
+		// Continue to explore any static dependencies
+		const result = staticDependentModules.some(
+			( parentStaticDependentModule ) =>
+				DependencyExtractionWebpackPlugin.hasStaticDependencyPathToRoot(
+					compilation,
+					parentStaticDependentModule
+				)
+		);
+
+		DependencyExtractionWebpackPlugin.#staticDepsCache.set( block, result );
+		DependencyExtractionWebpackPlugin.#staticDepsCurrent.delete( block );
+		return result;
+	}
 }
 
 module.exports = DependencyExtractionWebpackPlugin;
diff --git a/packages/dependency-extraction-webpack-plugin/lib/types.d.ts b/packages/dependency-extraction-webpack-plugin/lib/types.d.ts
index 179b4dab593bd6..5a1bff90aa49ad 100644
--- a/packages/dependency-extraction-webpack-plugin/lib/types.d.ts
+++ b/packages/dependency-extraction-webpack-plugin/lib/types.d.ts
@@ -13,6 +13,9 @@ declare interface DependencyExtractionWebpackPluginOptions {
 	outputFormat?: 'php' | 'json';
 	outputFilename?: string | Function;
 	requestToExternal?: ( request: string ) => string | string[] | undefined;
+	requestToExternalModule?: (
+		request: string
+	) => string | boolean | undefined;
 	requestToHandle?: ( request: string ) => string | undefined;
 	combinedOutputFile?: string | null;
 	combineAssets?: boolean;
diff --git a/packages/dependency-extraction-webpack-plugin/lib/util.js b/packages/dependency-extraction-webpack-plugin/lib/util.js
index bd328430313ce9..cc999860244760 100644
--- a/packages/dependency-extraction-webpack-plugin/lib/util.js
+++ b/packages/dependency-extraction-webpack-plugin/lib/util.js
@@ -1,10 +1,15 @@
 const WORDPRESS_NAMESPACE = '@wordpress/';
+
+// !!
+// This list must be kept in sync with the same list in tools/webpack/packages.js
+// !!
 const BUNDLED_PACKAGES = [
+	'@wordpress/dataviews',
 	'@wordpress/icons',
 	'@wordpress/interface',
-	'@wordpress/undo-manager',
 	'@wordpress/sync',
-	'@wordpress/dataviews',
+	'@wordpress/undo-manager',
+	'@wordpress/fields',
 ];
 
 /**
@@ -38,6 +43,10 @@ function defaultRequestToExternal( request ) {
 
 		case 'react-dom':
 			return 'ReactDOM';
+
+		case 'react/jsx-runtime':
+		case 'react/jsx-dev-runtime':
+			return 'ReactJSXRuntime';
 	}
 
 	if ( request.includes( 'react-refresh/runtime' ) ) {
@@ -56,6 +65,46 @@ function defaultRequestToExternal( request ) {
 	}
 }
 
+/**
+ * Default request to external module transformation
+ *
+ * Currently only @wordpress/interactivity and `@wordpress/interactivity-router`
+ * are supported.
+ *
+ * Do not use the boolean shorthand here, it's only handled for the
+ * `requestToExternalModule` option.
+ *
+ * @param {string} request Module request (the module name in `import from`) to be transformed
+ * @return {string|Error|undefined} The resulting external definition.
+ *   - Return `undefined` to ignore the request (do not externalize).
+ *   - Return `string` to map the request to an external.
+ *   - Return `Error` to emit an error.
+ */
+function defaultRequestToExternalModule( request ) {
+	if ( request === '@wordpress/interactivity' ) {
+		// This is a special case. Interactivity does not support dynamic imports at
+		// this time. We add the external "module" type to indicate that webpack
+		// should externalize this as a module (instead of our default `import()`
+		// external type) which forces @wordpress/interactivity imports to be
+		// hoisted to static imports.
+		return `module ${ request }`;
+	}
+
+	switch ( request ) {
+		case '@wordpress/interactivity-router':
+		case '@wordpress/a11y':
+			return `import ${ request }`;
+	}
+
+	const isWordPressScript = Boolean( defaultRequestToExternal( request ) );
+
+	if ( isWordPressScript ) {
+		throw new Error(
+			`Attempted to use WordPress script in a module: ${ request }, which is not supported yet.`
+		);
+	}
+}
+
 /**
  * Default request to WordPress script handle transformation
  *
@@ -70,10 +119,13 @@ function defaultRequestToExternal( request ) {
 function defaultRequestToHandle( request ) {
 	switch ( request ) {
 		case '@babel/runtime/regenerator':
-			return 'wp-polyfill';
+			return 'regenerator-runtime';
 
 		case 'lodash-es':
 			return 'lodash';
+
+		case 'react/jsx-runtime':
+			return 'react-jsx-runtime';
 	}
 
 	if ( request.includes( 'react-refresh/runtime' ) ) {
@@ -101,5 +153,6 @@ function camelCaseDash( string ) {
 module.exports = {
 	camelCaseDash,
 	defaultRequestToExternal,
+	defaultRequestToExternalModule,
 	defaultRequestToHandle,
 };
diff --git a/packages/dependency-extraction-webpack-plugin/package.json b/packages/dependency-extraction-webpack-plugin/package.json
index cd97d3ccc3a533..f1b3c0f87bdb9b 100644
--- a/packages/dependency-extraction-webpack-plugin/package.json
+++ b/packages/dependency-extraction-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dependency-extraction-webpack-plugin",
-	"version": "4.30.0",
+	"version": "6.10.0",
 	"description": "Extract WordPress script dependencies from webpack bundles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"lib",
@@ -29,11 +30,10 @@
 	"main": "lib/index.js",
 	"types": "lib/types.d.ts",
 	"dependencies": {
-		"json2php": "^0.0.7",
-		"webpack-sources": "^3.2.2"
+		"json2php": "^0.0.7"
 	},
 	"peerDependencies": {
-		"webpack": "^4.8.3 || ^5.0.0"
+		"webpack": "^5.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
diff --git a/packages/dependency-extraction-webpack-plugin/test/__snapshots__/build.js.snap b/packages/dependency-extraction-webpack-plugin/test/__snapshots__/build.js.snap
index 254950316e4963..8ea40b00d7c2d1 100644
--- a/packages/dependency-extraction-webpack-plugin/test/__snapshots__/build.js.snap
+++ b/packages/dependency-extraction-webpack-plugin/test/__snapshots__/build.js.snap
@@ -1,11 +1,385 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`combine-assets\` should produce expected output: Asset file 'assets.php' should match snapshot 1`] = `
-"<?php return array('fileA.js' => array('dependencies' => array('lodash', 'wp-blob'), 'version' => '52d35a0af8a5fb869915'), 'fileB.js' => array('dependencies' => array('wp-token-list'), 'version' => '0af6c51a8e6ac934b85a'));
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`combine-assets\` should produce expected output: Asset file 'assets.php' should match snapshot 1`] = `
+"<?php return array('fileA.mjs' => array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => '4ab8cc4b6b7619053443', 'type' => 'module'), 'fileB.mjs' => array('dependencies' => array('@wordpress/token-list'), 'version' => '5c4197fd48811f25807f', 'type' => 'module'));
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`combine-assets\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`combine-assets\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "@wordpress/token-list",
+    "userRequest": "@wordpress/token-list",
+  },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`cyclic-dependency-graph\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/interactivity'), 'version' => '1e02dcb4017382a2799f', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`cyclic-dependency-graph\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "module",
+    "request": "@wordpress/interactivity",
+    "userRequest": "@wordpress/interactivity",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`cyclic-dynamic-dependency-graph\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array(array('id' => '@wordpress/interactivity', 'import' => 'dynamic')), 'version' => '3e43f50123c85675372f', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`cyclic-dynamic-dependency-graph\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "module",
+    "request": "@wordpress/interactivity",
+    "userRequest": "@wordpress/interactivity",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`cyclic-external-deps\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array(array('id' => '@wordpress/interactivity', 'import' => 'dynamic')), 'version' => '095eb9129a2ad858900d', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`cyclic-external-deps\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "module",
+    "request": "@wordpress/interactivity",
+    "userRequest": "@wordpress/interactivity",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`dynamic-import\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array(array('id' => '@wordpress/blob', 'import' => 'dynamic')), 'version' => '1c950858231a54e241b8', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`dynamic-import\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`error\` should produce expected output 1`] = `
+"ERROR in ./index.js 5:0-23
+Module not found: Error: Attempted to use WordPress script in a module: jquery, which is not supported yet.
+
+ERROR in ./index.js 6:23-55
+Module not found: Error: Attempted to use WordPress script in a module: @wordpress/api-fetch, which is not supported yet.
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`function-output-filename\` should produce expected output: Asset file 'chunk--main--main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'e325da3aa7dbb0c0c151', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`function-output-filename\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`has-extension-suffix\` should produce expected output: Asset file 'index.min.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => '8308f1ac78c21f09c721', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`has-extension-suffix\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`module-renames\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('renamed--@my/module', 'renamed--other-module'), 'version' => '91070a8471d11e83a5f6', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`module-renames\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "renamed--@my/module",
+    "userRequest": "@my/module",
+  },
+  {
+    "externalType": "import",
+    "request": "renamed--other-module",
+    "userRequest": "other-module",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`no-default\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array(), 'version' => 'fcac76462c8a830d8d92', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`no-default\` should produce expected output: External modules should match snapshot 1`] = `[]`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`no-deps\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array(), 'version' => 'e37fbd452a6188261d74', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`no-deps\` should produce expected output: External modules should match snapshot 1`] = `[]`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`option-function-output-filename\` should produce expected output: Asset file 'chunk--main--main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'e325da3aa7dbb0c0c151', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`option-function-output-filename\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`option-output-filename\` should produce expected output: Asset file 'main-foo.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'e325da3aa7dbb0c0c151', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`option-output-filename\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`output-format-json\` should produce expected output: Asset file 'main.asset.json' should match snapshot 1`] = `"{"dependencies":["lodash"],"version":"4e62c01516f9dab8041f","type":"module"}"`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`output-format-json\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`overrides\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob', '@wordpress/url', 'rxjs', 'rxjs/operators'), 'version' => '259fc706528651fc00c1', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`overrides\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "@wordpress/url",
+    "userRequest": "@wordpress/url",
+  },
+  {
+    "externalType": "import",
+    "request": "rxjs",
+    "userRequest": "rxjs",
+  },
+  {
+    "externalType": "import",
+    "request": "rxjs/operators",
+    "userRequest": "rxjs/operators",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`polyfill-magic-comment\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-polyfill'), 'version' => '9725ab782f6b09598d3d', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`polyfill-magic-comment\` should produce expected output: External modules should match snapshot 1`] = `[]`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`polyfill-magic-comment-minified\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-polyfill'), 'version' => '31d6cfe0d16ae931b73c', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`polyfill-magic-comment-minified\` should produce expected output: External modules should match snapshot 1`] = `[]`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'a.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob'), 'version' => 'ee5ac21a1f0003d732e6', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'b.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => '5b112b32c6db548c2997', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'runtime.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array(), 'version' => 'b1ca4106075e0bd94f9c', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`runtime-chunk-single\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`style-imports\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => '22d18a3461df47fbaa79', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`style-imports\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'e325da3aa7dbb0c0c151', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress-interactivity\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', array('id' => '@wordpress/interactivity', 'import' => 'dynamic')), 'version' => '363140026eaa9abcaf33', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress-interactivity\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+  {
+    "externalType": "module",
+    "request": "@wordpress/interactivity",
+    "userRequest": "@wordpress/interactivity",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress-require\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'ee5a6866beeb5643397c', 'type' => 'module');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress-require\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "@wordpress/blob",
+    "userRequest": "@wordpress/blob",
+  },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`combine-assets\` should produce expected output: Asset file 'assets.php' should match snapshot 1`] = `
+"<?php return array('fileA.js' => array('dependencies' => array('lodash', 'wp-blob'), 'version' => 'e1840d27f0719ffa42d3'), 'fileB.js' => array('dependencies' => array('wp-token-list'), 'version' => '1e60e007d6496c9b46cf'));
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`combine-assets\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -31,12 +405,66 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`combine-assets\` should pro
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`dynamic-import\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('wp-blob'), 'version' => '47f8a22aa6c04c930f5f');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`cyclic-dependency-graph\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-interactivity'), 'version' => '82601013091064d44360');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`dynamic-import\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`cyclic-dependency-graph\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "window",
+    "request": [
+      "wp",
+      "interactivity",
+    ],
+    "userRequest": "@wordpress/interactivity",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`cyclic-dynamic-dependency-graph\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-interactivity'), 'version' => '162f4d352c99e6c37be1');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`cyclic-dynamic-dependency-graph\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "window",
+    "request": [
+      "wp",
+      "interactivity",
+    ],
+    "userRequest": "@wordpress/interactivity",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`cyclic-external-deps\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-interactivity'), 'version' => '4c336c2cbbbff439b43e');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`cyclic-external-deps\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "window",
+    "request": [
+      "wp",
+      "interactivity",
+    ],
+    "userRequest": "@wordpress/interactivity",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`dynamic-import\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-blob'), 'version' => '29070464c1c503708675');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`dynamic-import\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -49,12 +477,18 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`dynamic-import\` should pro
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`function-output-filename\` should produce expected output: Asset file 'chunk--main--main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '35d057cb1c8a30094445');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`error\` should produce expected output 1`] = `
+"ERROR in main
+Module not found: Error: Ensure error in script build.
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`function-output-filename\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`function-output-filename\` should produce expected output: Asset file 'chunk--main--main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '0633d70f7567175ad0d5');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`function-output-filename\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -72,12 +506,12 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`function-output-filename\`
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`has-extension-suffix\` should produce expected output: Asset file 'index.min.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '27e49c80f699647ec11c');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`has-extension-suffix\` should produce expected output: Asset file 'index.min.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '91d6fc79d8288f1bd30f');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`has-extension-suffix\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`has-extension-suffix\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -95,26 +529,52 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`has-extension-suffix\` shou
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`no-default\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array(), 'version' => 'cdc72dbcdf872f6141c7');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`module-renames\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('renamed--@my/module', 'renamed--other-module'), 'version' => '728ec64636a1f078764f');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`module-renames\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "window",
+    "request": [
+      "my-namespace",
+      "renamed--@my/module",
+    ],
+    "userRequest": "@my/module",
+  },
+  {
+    "externalType": "window",
+    "request": [
+      "my-namespace",
+      "renamed--other-module",
+    ],
+    "userRequest": "other-module",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`no-default\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array(), 'version' => '43880e6c42e7c39fcdf1');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`no-default\` should produce expected output: External modules should match snapshot 1`] = `[]`;
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`no-default\` should produce expected output: External modules should match snapshot 1`] = `[]`;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`no-deps\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array(), 'version' => '091ffcd70d94dd16e773');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`no-deps\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array(), 'version' => 'b922a4320dd8b7a352f4');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`no-deps\` should produce expected output: External modules should match snapshot 1`] = `[]`;
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`no-deps\` should produce expected output: External modules should match snapshot 1`] = `[]`;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`option-function-output-filename\` should produce expected output: Asset file 'chunk--main--main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '35d057cb1c8a30094445');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`option-function-output-filename\` should produce expected output: Asset file 'chunk--main--main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '0633d70f7567175ad0d5');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`option-function-output-filename\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`option-function-output-filename\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -132,12 +592,12 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`option-function-output-file
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`option-output-filename\` should produce expected output: Asset file 'main-foo.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '35d057cb1c8a30094445');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`option-output-filename\` should produce expected output: Asset file 'main-foo.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '0633d70f7567175ad0d5');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`option-output-filename\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`option-output-filename\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -155,9 +615,9 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`option-output-filename\` sh
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`output-format-json\` should produce expected output: Asset file 'main.asset.json' should match snapshot 1`] = `"{"dependencies":["lodash"],"version":"abdb687afe609197ad7e"}"`;
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`output-format-json\` should produce expected output: Asset file 'main.asset.json' should match snapshot 1`] = `"{"dependencies":["lodash"],"version":"b36983b739da7af0ccd4"}"`;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`output-format-json\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`output-format-json\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -167,12 +627,12 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`output-format-json\` should
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`overrides\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('wp-blob', 'wp-script-handle-for-rxjs', 'wp-url'), 'version' => '2a29b245fc3d0509b5a8');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`overrides\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-blob', 'wp-script-handle-for-rxjs', 'wp-url'), 'version' => '35e570db18559a76b3e6');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`overrides\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`overrides\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -206,22 +666,36 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`overrides\` should produce
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'a.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('wp-blob'), 'version' => '4514ed711f6c035e0887');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`polyfill-magic-comment\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-polyfill'), 'version' => '48f720dd907eea75c1fd');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`polyfill-magic-comment\` should produce expected output: External modules should match snapshot 1`] = `[]`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`polyfill-magic-comment-minified\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-polyfill'), 'version' => '31d6cfe0d16ae931b73c');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'b.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '168d32b5fb42f9e5d8ce');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`polyfill-magic-comment-minified\` should produce expected output: External modules should match snapshot 1`] = `[]`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'a.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('wp-blob'), 'version' => 'd091f1cbbf7603d6e12c');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'runtime.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array(), 'version' => 'b4058959bcd0df37cd79');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'b.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '845bc6d4ffbdb9419ebd');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`runtime-chunk-single\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'runtime.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array(), 'version' => '717eb779e609d175a7dd');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`runtime-chunk-single\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -239,12 +713,12 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`runtime-chunk-single\` shou
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`style-imports\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => 'beb3f6752168c2983cdd');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`style-imports\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '041fb611b5192ffe83f9');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`style-imports\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`style-imports\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -262,12 +736,12 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`style-imports\` should prod
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`wordpress\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '35d057cb1c8a30094445');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`wordpress\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '0633d70f7567175ad0d5');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`wordpress\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`wordpress\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
@@ -285,12 +759,35 @@ exports[`DependencyExtractionWebpackPlugin Webpack \`wordpress\` should produce
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`wordpress-require\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => 'ed2bd4e7df46768bb3c2');
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`wordpress-interactivity\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', 'wp-interactivity'), 'version' => 'b16015e38aea0509f75f');
+"
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`wordpress-interactivity\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "window",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+  {
+    "externalType": "window",
+    "request": [
+      "wp",
+      "interactivity",
+    ],
+    "userRequest": "@wordpress/interactivity",
+  },
+]
+`;
+
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`wordpress-require\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
+"<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => '7087050d1490e856fec8');
 "
 `;
 
-exports[`DependencyExtractionWebpackPlugin Webpack \`wordpress-require\` should produce expected output: External modules should match snapshot 1`] = `
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`wordpress-require\` should produce expected output: External modules should match snapshot 1`] = `
 [
   {
     "externalType": "window",
diff --git a/packages/dependency-extraction-webpack-plugin/test/build.js b/packages/dependency-extraction-webpack-plugin/test/build.js
index 6eeb051a07888f..050b816ded3432 100644
--- a/packages/dependency-extraction-webpack-plugin/test/build.js
+++ b/packages/dependency-extraction-webpack-plugin/test/build.js
@@ -11,25 +11,33 @@ const webpack = require( 'webpack' );
 const fixturesPath = path.join( __dirname, 'fixtures' );
 const configFixtures = fs.readdirSync( fixturesPath ).sort();
 
-describe( 'DependencyExtractionWebpackPlugin', () => {
-	afterAll( () => rimraf( path.join( __dirname, 'build' ) ) );
+afterAll( () => rimraf( path.join( __dirname, 'build' ) ) );
 
-	describe.each( configFixtures )( 'Webpack `%s`', ( configCase ) => {
-		const testDirectory = path.join( fixturesPath, configCase );
-		const outputDirectory = path.join( __dirname, 'build', configCase );
+describe.each( /** @type {const} */ ( [ 'scripts', 'modules' ] ) )(
+	'DependencyExtractionWebpackPlugin %s',
+	( moduleMode ) => {
+		describe.each( configFixtures )( 'Webpack `%s`', ( configCase ) => {
+			const testDirectory = path.join( fixturesPath, configCase );
+			const outputDirectory = path.join(
+				__dirname,
+				'build',
+				moduleMode,
+				configCase
+			);
 
-		beforeEach( () => {
-			rimraf( outputDirectory );
-			mkdirp( outputDirectory );
-		} );
+			beforeEach( () => {
+				rimraf( outputDirectory );
+				mkdirp( outputDirectory );
+			} );
 
-		// This afterEach is necessary to prevent watched tests from retriggering on every run.
-		afterEach( () => rimraf( outputDirectory ) );
+			// This afterEach is necessary to prevent watched tests from retriggering on every run.
+			afterEach( () => rimraf( outputDirectory ) );
 
-		test( 'should produce expected output', () =>
-			new Promise( ( resolve ) => {
+			test( 'should produce expected output', async () => {
 				const options = Object.assign(
 					{
+						name: `${ configCase }-${ moduleMode }`,
+						target: 'web',
 						context: testDirectory,
 						entry: './index.js',
 						mode: 'production',
@@ -39,56 +47,89 @@ describe( 'DependencyExtractionWebpackPlugin', () => {
 							moduleIds: 'named',
 						},
 						output: {},
+						experiments: {},
 					},
 					require( path.join( testDirectory, 'webpack.config.js' ) )
 				);
 				options.output.path = outputDirectory;
 
-				webpack( options, ( err, stats ) => {
-					expect( err ).toBeNull();
+				if ( moduleMode === 'modules' ) {
+					options.target = 'es2024';
+					options.output.module = true;
+					options.output.chunkFormat = 'module';
+					options.output.library = options.output.library || {};
+					options.output.library.type = 'module';
+					options.experiments.outputModule = true;
+				}
 
-					const assetFiles = glob(
-						`${ outputDirectory }/+(*.asset|assets).@(json|php)`
-					);
+				/** @type {webpack.Stats} */
+				const stats = await new Promise( ( resolve, reject ) =>
+					webpack( options, ( err, _stats ) => {
+						if ( err ) {
+							return reject( err );
+						}
+						resolve( _stats );
+					} )
+				);
+
+				/* eslint-disable jest/no-conditional-expect */
+				if ( configCase.includes( 'error' ) ) {
+					expect( stats.hasErrors() ).toBe( true );
+					expect(
+						stats.toString( { errors: true, all: false } )
+					).toMatchSnapshot();
+					return;
+				}
+				/* eslint-enable jest/no-conditional-expect */
 
-					expect( assetFiles.length ).toBeGreaterThan( 0 );
-
-					// Asset files should match.
-					assetFiles.forEach( ( assetFile ) => {
-						const assetBasename = path.basename( assetFile );
-
-						expect(
-							fs.readFileSync( assetFile, 'utf-8' )
-						).toMatchSnapshot(
-							`Asset file '${ assetBasename }' should match snapshot`
-						);
-					} );
-
-					const compareByModuleIdentifier = ( m1, m2 ) => {
-						const i1 = m1.identifier();
-						const i2 = m2.identifier();
-						if ( i1 < i2 ) return -1;
-						if ( i1 > i2 ) return 1;
-						return 0;
-					};
-
-					// Webpack stats external modules should match.
-					const externalModules = Array.from(
-						stats.compilation.modules
-					)
-						.filter( ( { externalType } ) => externalType )
-						.sort( compareByModuleIdentifier )
-						.map( ( module ) => ( {
-							externalType: module.externalType,
-							request: module.request,
-							userRequest: module.userRequest,
-						} ) );
-					expect( externalModules ).toMatchSnapshot(
-						'External modules should match snapshot'
+				if ( stats.hasErrors() ) {
+					throw new Error(
+						stats.toString( { errors: true, all: false } )
 					);
+				}
+
+				const assetFiles = glob(
+					`${ outputDirectory }/+(*.asset|assets).@(json|php)`
+				);
+
+				expect( assetFiles.length ).toBeGreaterThan( 0 );
 
-					resolve();
+				// Asset files should match.
+				assetFiles.forEach( ( assetFile ) => {
+					const assetBasename = path.basename( assetFile );
+
+					expect(
+						fs.readFileSync( assetFile, 'utf-8' )
+					).toMatchSnapshot(
+						`Asset file '${ assetBasename }' should match snapshot`
+					);
 				} );
-			} ) );
-	} );
-} );
+
+				const compareByModuleIdentifier = ( m1, m2 ) => {
+					const i1 = m1.identifier();
+					const i2 = m2.identifier();
+					if ( i1 < i2 ) {
+						return -1;
+					}
+					if ( i1 > i2 ) {
+						return 1;
+					}
+					return 0;
+				};
+
+				// Webpack stats external modules should match.
+				const externalModules = Array.from( stats.compilation.modules )
+					.filter( ( { externalType } ) => externalType )
+					.sort( compareByModuleIdentifier )
+					.map( ( module ) => ( {
+						externalType: module.externalType,
+						request: module.request,
+						userRequest: module.userRequest,
+					} ) );
+				expect( externalModules ).toMatchSnapshot(
+					'External modules should match snapshot'
+				);
+			} );
+		} );
+	}
+);
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/combine-assets/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/combine-assets/webpack.config.js
index 2ce7ba1be98e25..ab407815bbee48 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/combine-assets/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/combine-assets/webpack.config.js
@@ -11,6 +11,11 @@ module.exports = {
 	plugins: [
 		new DependencyExtractionWebpackPlugin( {
 			combineAssets: true,
+			requestToExternalModule( request ) {
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
+			},
 		} ),
 	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/a.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/a.js
new file mode 100644
index 00000000000000..11dd7764ad5f92
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/a.js
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { store } from '@wordpress/interactivity';
+
+/**
+ * Internal dependencies
+ */
+import { identity } from './b.js';
+
+identity( 1 );
+
+export { identity, store };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/b.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/b.js
new file mode 100644
index 00000000000000..ce109acccbd370
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/b.js
@@ -0,0 +1,10 @@
+/**
+ * Internal dependencies
+ */
+import { store } from './a.js';
+
+export function identity( x ) {
+	return x;
+}
+
+export { store };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/index.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/index.js
new file mode 100644
index 00000000000000..13b17a73ad4af8
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/index.js
@@ -0,0 +1,8 @@
+/**
+ * Internal dependencies
+ */
+import { identity as aIdentity, store as aStore } from './a.js';
+import { identity as bIdentity, store as bStore } from './b.js';
+
+aStore( aIdentity( 'a' ), { a: aIdentity( 'a' ) } );
+bStore( bIdentity( 'b' ), { b: bIdentity( 'b' ) } );
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/webpack.config.js
new file mode 100644
index 00000000000000..bfffff3ae78319
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dependency-graph/webpack.config.js
@@ -0,0 +1,8 @@
+/**
+ * Internal dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '../../..' );
+
+module.exports = {
+	plugins: [ new DependencyExtractionWebpackPlugin() ],
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/a.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/a.js
new file mode 100644
index 00000000000000..11dd7764ad5f92
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/a.js
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { store } from '@wordpress/interactivity';
+
+/**
+ * Internal dependencies
+ */
+import { identity } from './b.js';
+
+identity( 1 );
+
+export { identity, store };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/b.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/b.js
new file mode 100644
index 00000000000000..25a6aa127d26fd
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/b.js
@@ -0,0 +1,10 @@
+/**
+ * Internal dependencies
+ */
+const { store } = import( './a.js' );
+
+export function identity( x ) {
+	return x;
+}
+
+export { store };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/index.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/index.js
new file mode 100644
index 00000000000000..073b4244dcea26
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/index.js
@@ -0,0 +1,9 @@
+/**
+ * Internal dependencies
+ */
+import { identity as bIdentity, store as bStore } from './b.js';
+
+const { identity: aIdentity, store: aStore } = await import( './a.js' );
+
+aStore( aIdentity( 'a' ), { a: aIdentity( 'a' ) } );
+bStore( bIdentity( 'b' ), { b: bIdentity( 'b' ) } );
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/webpack.config.js
new file mode 100644
index 00000000000000..bfffff3ae78319
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-dynamic-dependency-graph/webpack.config.js
@@ -0,0 +1,8 @@
+/**
+ * Internal dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '../../..' );
+
+module.exports = {
+	plugins: [ new DependencyExtractionWebpackPlugin() ],
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-external-deps/a.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-external-deps/a.js
new file mode 100644
index 00000000000000..1f0edffe27efd3
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-external-deps/a.js
@@ -0,0 +1,8 @@
+/**
+ * Internal dependencies
+ */
+import { someFunction } from '.';
+
+someFunction();
+
+export const a = 'test';
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-external-deps/index.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-external-deps/index.js
new file mode 100644
index 00000000000000..01d7eff466bfbd
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-external-deps/index.js
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import { a } from './a';
+
+/**
+ * WordPress dependencies
+ */
+import { store } from '@wordpress/interactivity';
+
+export const someFunction = () => {
+	store( 'test', {
+		state: {
+			a,
+		},
+	} );
+	return a;
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-external-deps/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-external-deps/webpack.config.js
new file mode 100644
index 00000000000000..bfffff3ae78319
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/cyclic-external-deps/webpack.config.js
@@ -0,0 +1,8 @@
+/**
+ * Internal dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '../../..' );
+
+module.exports = {
+	plugins: [ new DependencyExtractionWebpackPlugin() ],
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/dynamic-import/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/dynamic-import/webpack.config.js
index bfffff3ae78319..59d4c5d2ead3ab 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/dynamic-import/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/dynamic-import/webpack.config.js
@@ -4,5 +4,11 @@
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {
-	plugins: [ new DependencyExtractionWebpackPlugin() ],
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternalModule( request ) {
+				return request.startsWith( '@wordpress/' );
+			},
+		} ),
+	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/error/index.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/error/index.js
new file mode 100644
index 00000000000000..388963c34de897
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/error/index.js
@@ -0,0 +1,10 @@
+/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable eslint-comments/no-unlimited-disable */
+/* eslint-disable */
+
+import $ from 'jquery';
+const apiFetch = await import( '@wordpress/api-fetch' );
+
+$( () => {
+	apiFetch( { path: '/' } );
+} );
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/error/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/error/webpack.config.js
new file mode 100644
index 00000000000000..5f2e5f899237c2
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/error/webpack.config.js
@@ -0,0 +1,15 @@
+/**
+ * Internal dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '../../..' );
+
+module.exports = {
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			// eslint-disable-next-line no-unused-vars
+			requestToExternal( request ) {
+				throw new Error( 'Ensure error in script build.' );
+			},
+		} ),
+	],
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/function-output-filename/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/function-output-filename/webpack.config.js
index 2d5b2e43b735ec..7ec1c7ce8a5de1 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/function-output-filename/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/function-output-filename/webpack.config.js
@@ -9,5 +9,13 @@ module.exports = {
 			return `chunk--${ chunkData.chunk.name }--[name].js`;
 		},
 	},
-	plugins: [ new DependencyExtractionWebpackPlugin() ],
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternalModule( request ) {
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
+			},
+		} ),
+	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/has-extension-suffix/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/has-extension-suffix/webpack.config.js
index d814beacdf4dc3..4816746976c5b6 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/has-extension-suffix/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/has-extension-suffix/webpack.config.js
@@ -7,5 +7,13 @@ module.exports = {
 	output: {
 		filename: 'index.min.js',
 	},
-	plugins: [ new DependencyExtractionWebpackPlugin() ],
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternalModule( request ) {
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
+			},
+		} ),
+	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/module-renames/index.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/module-renames/index.js
new file mode 100644
index 00000000000000..dc3702922c6ff4
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/module-renames/index.js
@@ -0,0 +1,7 @@
+/**
+ * External dependencies
+ */
+import * as m from '@my/module';
+import { other } from 'other-module';
+
+m.load( other );
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/module-renames/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/module-renames/webpack.config.js
new file mode 100644
index 00000000000000..8b78e1fdea1505
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/module-renames/webpack.config.js
@@ -0,0 +1,32 @@
+/**
+ * Internal dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '../../..' );
+
+module.exports = {
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternal( request ) {
+				switch ( request ) {
+					case '@my/module':
+					case 'other-module':
+						return [ 'my-namespace', `renamed--${ request }` ];
+				}
+			},
+			requestToHandle( request ) {
+				switch ( request ) {
+					case '@my/module':
+					case 'other-module':
+						return `renamed--${ request }`;
+				}
+			},
+			requestToExternalModule( request ) {
+				switch ( request ) {
+					case '@my/module':
+					case 'other-module':
+						return `renamed--${ request }`;
+				}
+			},
+		} ),
+	],
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/option-function-output-filename/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/option-function-output-filename/webpack.config.js
index e328c817851ce1..f65d51ffa5152f 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/option-function-output-filename/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/option-function-output-filename/webpack.config.js
@@ -9,6 +9,11 @@ module.exports = {
 			outputFilename( chunkData ) {
 				return `chunk--${ chunkData.chunk.name }--[name].asset.php`;
 			},
+			requestToExternalModule( request ) {
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
+			},
 		} ),
 	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/option-output-filename/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/option-output-filename/webpack.config.js
index 9ec78f6437a18b..30aa1f0233e93e 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/option-output-filename/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/option-output-filename/webpack.config.js
@@ -7,6 +7,11 @@ module.exports = {
 	plugins: [
 		new DependencyExtractionWebpackPlugin( {
 			outputFilename: '[name]-foo.asset.php',
+			requestToExternalModule( request ) {
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
+			},
 		} ),
 	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/output-format-json/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/output-format-json/webpack.config.js
index b82f422f949f81..3a6099354c86bb 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/output-format-json/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/output-format-json/webpack.config.js
@@ -5,6 +5,11 @@ const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {
 	plugins: [
-		new DependencyExtractionWebpackPlugin( { outputFormat: 'json' } ),
+		new DependencyExtractionWebpackPlugin( {
+			outputFormat: 'json',
+			requestToExternalModule( request ) {
+				return request === 'lodash';
+			},
+		} ),
 	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/overrides/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/overrides/webpack.config.js
index 9885e5cade7e96..5e28a677f1d5b0 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/overrides/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/overrides/webpack.config.js
@@ -15,6 +15,16 @@ module.exports = {
 					return [ 'rxjs', 'operators' ];
 				}
 			},
+			requestToExternalModule( request ) {
+				if ( request === 'rxjs' ) {
+					return request;
+				}
+
+				if ( request === 'rxjs/operators' ) {
+					return request;
+				}
+				return request.startsWith( '@wordpress/' );
+			},
 			requestToHandle( request ) {
 				if ( request === 'rxjs' || request === 'rxjs/operators' ) {
 					return 'wp-script-handle-for-rxjs';
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment-minified/index.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment-minified/index.js
new file mode 100644
index 00000000000000..d98678f44cb697
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment-minified/index.js
@@ -0,0 +1,3 @@
+/* wp:polyfill */
+
+// Nothing else, really.
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment-minified/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment-minified/webpack.config.js
new file mode 100644
index 00000000000000..be01328d675d0a
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment-minified/webpack.config.js
@@ -0,0 +1,11 @@
+/**
+ * Internal dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '../../..' );
+
+module.exports = {
+	optimization: {
+		minimize: true,
+	},
+	plugins: [ new DependencyExtractionWebpackPlugin() ],
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment/index.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment/index.js
new file mode 100644
index 00000000000000..d98678f44cb697
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment/index.js
@@ -0,0 +1,3 @@
+/* wp:polyfill */
+
+// Nothing else, really.
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment/webpack.config.js
new file mode 100644
index 00000000000000..bfffff3ae78319
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/polyfill-magic-comment/webpack.config.js
@@ -0,0 +1,8 @@
+/**
+ * Internal dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '../../..' );
+
+module.exports = {
+	plugins: [ new DependencyExtractionWebpackPlugin() ],
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/runtime-chunk-single/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/runtime-chunk-single/webpack.config.js
index e16f6b6b0fe70a..0c6608a814b45e 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/runtime-chunk-single/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/runtime-chunk-single/webpack.config.js
@@ -8,7 +8,15 @@ module.exports = {
 		a: './a',
 		b: './b',
 	},
-	plugins: [ new DependencyExtractionWebpackPlugin() ],
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternalModule( request ) {
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
+			},
+		} ),
+	],
 	optimization: {
 		runtimeChunk: 'single',
 	},
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/style-imports/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/style-imports/webpack.config.js
index 52cb718a579de4..0f5ac2b955538a 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/style-imports/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/style-imports/webpack.config.js
@@ -10,7 +10,13 @@ const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {
 	plugins: [
-		new DependencyExtractionWebpackPlugin(),
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternalModule( request ) {
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
+			},
+		} ),
 		new MiniCSSExtractPlugin(),
 	],
 	module: {
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/index.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/index.js
new file mode 100644
index 00000000000000..b4dd2f288661ea
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/index.js
@@ -0,0 +1,12 @@
+/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable eslint-comments/no-unlimited-disable */
+/* eslint-disable */
+
+import _ from 'lodash';
+
+// This module should be externalized
+const { store, getContext } = await import( '@wordpress/interactivity' );
+
+store( _.identity( 'my-namespace' ), { state: 'is great' } );
+
+getContext();
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/webpack.config.js
new file mode 100644
index 00000000000000..7d18e80a8d4ea3
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/webpack.config.js
@@ -0,0 +1,14 @@
+/**
+ * Internal dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '../../..' );
+
+module.exports = {
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternalModule( request ) {
+				return request === 'lodash';
+			},
+		} ),
+	],
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-require/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-require/webpack.config.js
index bfffff3ae78319..bf6cb387dbd18f 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-require/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-require/webpack.config.js
@@ -4,5 +4,13 @@
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {
-	plugins: [ new DependencyExtractionWebpackPlugin() ],
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternalModule( request ) {
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
+			},
+		} ),
+	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress/webpack.config.js
index bfffff3ae78319..bf6cb387dbd18f 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress/webpack.config.js
@@ -4,5 +4,13 @@
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {
-	plugins: [ new DependencyExtractionWebpackPlugin() ],
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternalModule( request ) {
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
+			},
+		} ),
+	],
 };
diff --git a/packages/deprecated/.npmrc b/packages/deprecated/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/deprecated/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/deprecated/CHANGELOG.md b/packages/deprecated/CHANGELOG.md
index beeda0252ba186..8289aedd728b6f 100644
--- a/packages/deprecated/CHANGELOG.md
+++ b/packages/deprecated/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -107,13 +155,13 @@
 
 ## 2.11.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Include TypeScript type declarations ([#26429](https://github.com/WordPress/gutenberg/pull/26429))
 
 ## 2.6.0 (2019-08-29)
 
-### Bug Fix
+### Bug Fixes
 
 -   When there is no `options.version` param provided `deprecated` method warns with more relaxed tone.
 
@@ -121,10 +169,10 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
 
-### New Feature
+### New Features
 
 -   Call `doAction` hook when a deprecated feature is encountered ([#8110](https://github.com/WordPress/gutenberg/pull/8110))
diff --git a/packages/deprecated/package.json b/packages/deprecated/package.json
index 21f6a5c04399bd..4871d5772dbb64 100644
--- a/packages/deprecated/package.json
+++ b/packages/deprecated/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/deprecated",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "Deprecation utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,10 +28,11 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/hooks": "file:../hooks"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/hooks": "*"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/deprecated/tsconfig.json b/packages/deprecated/tsconfig.json
index 9d3c2f54d7b7e6..f90e327f124d7e 100644
--- a/packages/deprecated/tsconfig.json
+++ b/packages/deprecated/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/docgen/.npmrc b/packages/docgen/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/docgen/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/docgen/CHANGELOG.md b/packages/docgen/CHANGELOG.md
index 3efd1867d4cb60..139f85f8a62191 100644
--- a/packages/docgen/CHANGELOG.md
+++ b/packages/docgen/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 2.10.0 (2024-10-16)
+
+## 2.9.0 (2024-10-03)
+
+## 2.8.0 (2024-09-19)
+
+## 2.7.0 (2024-09-05)
+
+## 2.6.0 (2024-08-21)
+
+## 2.5.0 (2024-08-07)
+
+## 2.4.0 (2024-07-24)
+
+## 2.3.0 (2024-07-10)
+
+### Bug Fixes
+
+-   Fix getting param annotations for exported variables assigned to function expressions ([#tbd](https://github.com/WordPress/gutenberg/pull/tbd)).
+
+## 2.2.0 (2024-06-26)
+
+## 2.1.0 (2024-06-15)
+
+## 2.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 1.67.0 (2024-05-16)
+
+## 1.66.0 (2024-05-02)
+
+## 1.65.0 (2024-04-19)
+
+## 1.64.0 (2024-04-03)
+
+## 1.63.0 (2024-03-21)
+
+## 1.62.0 (2024-03-06)
+
+## 1.61.0 (2024-02-21)
+
+## 1.60.0 (2024-02-09)
+
+## 1.59.0 (2024-01-24)
+
+## 1.58.0 (2024-01-10)
+
+## 1.57.0 (2023-12-13)
+
 ## 1.56.0 (2023-11-29)
 
 ## 1.55.0 (2023-11-16)
@@ -66,7 +118,7 @@
 
 ### Bug Fixes
 
--	Fix getting param annotations for default exported functions. ([#31603](https://github.com/WordPress/gutenberg/pull/31603))
+-   Fix getting param annotations for default exported functions ([#31603](https://github.com/WordPress/gutenberg/pull/31603)).
 
 ## 1.17.0 (2021-04-29)
 
@@ -95,7 +147,7 @@
 
 ## 1.2.0 (2019-05-21)
 
-### Enhancement
+### Enhancements
 
 -   Docblocks including a `@private` tag will be omitted from the generated result.
 
diff --git a/packages/docgen/README.md b/packages/docgen/README.md
index f54cd6b9e5773d..4f60d0a3c7a26a 100644
--- a/packages/docgen/README.md
+++ b/packages/docgen/README.md
@@ -16,6 +16,8 @@ Install the module
 npm install @wordpress/docgen --save-dev
 ```
 
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
+
 ## Usage
 
 ```bash
diff --git a/packages/docgen/lib/get-intermediate-representation.js b/packages/docgen/lib/get-intermediate-representation.js
index 2f8e155c575650..9f49fc4d4f93a2 100644
--- a/packages/docgen/lib/get-intermediate-representation.js
+++ b/packages/docgen/lib/get-intermediate-representation.js
@@ -20,7 +20,9 @@ const hasVariableWithName = ( node, name ) =>
 	node.declarations.some( ( declaration ) => {
 		if ( declaration.id.type === 'ObjectPattern' ) {
 			return declaration.id.properties.some(
-				( property ) => property.key.name === name
+				( property ) =>
+					property.key?.name === name ||
+					property.argument?.name === name
 			);
 		}
 		return declaration.id.name === name;
diff --git a/packages/docgen/lib/get-type-annotation.js b/packages/docgen/lib/get-type-annotation.js
index b0a920cefce031..5e72724952f29e 100644
--- a/packages/docgen/lib/get-type-annotation.js
+++ b/packages/docgen/lib/get-type-annotation.js
@@ -237,16 +237,20 @@ function getMappedTypeAnnotation( typeAnnotation ) {
  * @param {babelTypes.TSTypeReference} typeAnnotation
  */
 function getTypeReferenceTypeAnnotation( typeAnnotation ) {
-	if ( ! typeAnnotation.typeParameters ) {
-		if ( babelTypes.isTSQualifiedName( typeAnnotation.typeName ) ) {
-			return unifyQualifiedName( typeAnnotation.typeName );
-		}
-		return typeAnnotation.typeName.name;
+	let typeName;
+	if ( babelTypes.isTSQualifiedName( typeAnnotation.typeName ) ) {
+		typeName = unifyQualifiedName( typeAnnotation.typeName );
+	} else {
+		typeName = typeAnnotation.typeName.name;
 	}
-	const typeParams = typeAnnotation.typeParameters.params
-		.map( getTypeAnnotation )
-		.join( ', ' );
-	return `${ typeAnnotation.typeName.name }< ${ typeParams } >`;
+
+	if ( typeAnnotation.typeParameters ) {
+		const typeParams = typeAnnotation.typeParameters.params
+			.map( getTypeAnnotation )
+			.join( ', ' );
+		typeName = `${ typeName }< ${ typeParams } >`;
+	}
+	return typeName;
 }
 
 /**
@@ -397,10 +401,18 @@ function getTypeAnnotation( typeAnnotation ) {
  *                        TODO: Remove the special-casing here once we're able to infer the types from TypeScript itself.
  */
 function unwrapWrappedSelectors( token ) {
+	if ( babelTypes.isTSDeclareFunction( token ) ) {
+		return token;
+	}
+
 	if ( babelTypes.isFunctionDeclaration( token ) ) {
 		return token;
 	}
 
+	if ( babelTypes.isFunctionExpression( token ) ) {
+		return token;
+	}
+
 	if ( babelTypes.isArrowFunctionExpression( token ) ) {
 		return token;
 	}
@@ -429,7 +441,7 @@ function unwrapWrappedSelectors( token ) {
 
 /**
  * @param {ASTNode} token
- * @return {babelTypes.ArrowFunctionExpression | babelTypes.FunctionDeclaration} The function token.
+ * @return {babelTypes.ArrowFunctionExpression | babelTypes.FunctionDeclaration | babelTypes.FunctionExpression} The function token.
  */
 function getFunctionToken( token ) {
 	let resolvedToken = token;
@@ -513,8 +525,7 @@ function getQualifiedObjectPatternTypeAnnotation( tag, paramType ) {
 function getParamTypeAnnotation( tag, declarationToken, paramIndex ) {
 	const functionToken = getFunctionToken( declarationToken );
 
-	// Otherwise find the corresponding parameter token for the documented parameter.
-	let paramToken = functionToken.params[ paramIndex ];
+	let paramToken = functionToken?.params[ paramIndex ];
 
 	// This shouldn't happen due to our ESLint enforcing correctly documented parameter names but just in case
 	// we'll give a descriptive error so that it's easy to diagnose the issue.
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
index eaff29998d5938..e7d7447226ce4e 100644
--- a/packages/docgen/package.json
+++ b/packages/docgen/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/docgen",
-	"version": "1.56.0",
+	"version": "2.10.0",
 	"description": "Autogenerate public API documentation from exports and JSDoc comments.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,6 +19,10 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
 	"files": [
 		"bin",
 		"lib"
@@ -27,7 +31,7 @@
 		"docgen": "./bin/cli.js"
 	},
 	"dependencies": {
-		"@babel/core": "^7.16.0",
+		"@babel/core": "7.25.7",
 		"comment-parser": "^1.1.1",
 		"mdast-util-inject": "1.1.0",
 		"optionator": "0.8.2",
diff --git a/packages/docgen/test/get-intermediate-representation.js b/packages/docgen/test/get-intermediate-representation.js
index 43001aaedeeae3..e61f3101ad8438 100644
--- a/packages/docgen/test/get-intermediate-representation.js
+++ b/packages/docgen/test/get-intermediate-representation.js
@@ -284,6 +284,47 @@ describe( 'Intermediate Representation', () => {
 					} ),
 				] ) );
 
+			it( 'named identifier with RestElements', () => {
+				expect(
+					parse( `
+						/**
+						 * RestElement example.
+						 */
+						const { someKey, ...someApi } = { someKey: 2, restOne: 1, restTwo: 2 };
+
+						export {someApi};
+					` )
+				).toEqual( [
+					{
+						description: 'RestElement example.',
+						lineEnd: 6,
+						lineStart: 6,
+						name: 'someApi',
+						path: 'test-code.ts',
+						tags: [],
+					},
+				] );
+			} );
+
+			it( 'named identifier with undocumented RestElement', () => {
+				expect(
+					parse( `
+						const { someKey, ...otherKeys } = { someKey: 2, restOne: 1, restTwo: 2 };
+
+						export const someApi = {};
+					` )
+				).toEqual( [
+					{
+						description: 'Undocumented declaration.',
+						lineEnd: 3,
+						lineStart: 3,
+						name: 'someApi',
+						path: 'test-code.ts',
+						tags: [],
+					},
+				] );
+			} );
+
 			it( 'named identifier with destructuring', () =>
 				expect(
 					parse( `
diff --git a/packages/docgen/test/get-type-annotation.js b/packages/docgen/test/get-type-annotation.js
index fdf114dfd1f674..4c9a74efe06b45 100644
--- a/packages/docgen/test/get-type-annotation.js
+++ b/packages/docgen/test/get-type-annotation.js
@@ -31,12 +31,12 @@ describe( 'Type annotations', () => {
 		expect( result ).toBeFalsy();
 	} );
 
-	const paramTag = {
+	const paramTag = /** @type {const} */ ( {
 		tag: 'param',
 		type: '',
 		name: 'foo',
 		description: 'A foo parameter',
-	};
+	} );
 
 	describe( 'simple types', () => {
 		const keywordTypes = [
@@ -100,6 +100,26 @@ describe( 'Type annotations', () => {
 		} );
 	} );
 
+	describe( 'qualified types', () => {
+		const node = parse( `
+			function fn( foo: My.Foo< string >, bar: My.Bar ) {
+				return 0;
+			}
+		` );
+
+		it( 'should get the qualified param type with type parameters', () => {
+			expect(
+				getTypeAnnotation( { tag: 'param', name: 'foo' }, node, 0 )
+			).toBe( 'My.Foo< string >' );
+		} );
+
+		it( 'should get the qualified param type without type parameters', () => {
+			expect(
+				getTypeAnnotation( { tag: 'param', name: 'bar' }, node, 1 )
+			).toBe( 'My.Bar' );
+		} );
+	} );
+
 	describe( 'literal values', () => {
 		it.each( [ "'a-string-literal'", '1000n', 'true', '1000' ] )(
 			'should handle %s',
@@ -443,4 +463,22 @@ describe( 'Type annotations', () => {
 			expect( getStateArgType( code ) ).toBe( 'number' );
 		} );
 	} );
+
+	it( 'should find types in a constant function expression assignment', () => {
+		const node = parse( `
+				export const __unstableAwaitPromise = function < T >( promise: Promise< T > ): {
+					type: 'AWAIT_PROMISE';
+					promise: Promise< T >;
+				} {
+					return {
+						type: 'AWAIT_PROMISE',
+						promise,
+					};
+				};
+			 ` );
+
+		expect(
+			getTypeAnnotation( { tag: 'param', name: 'promise' }, node, 0 )
+		).toBe( 'Promise< T >' );
+	} );
 } );
diff --git a/packages/docgen/tsconfig.json b/packages/docgen/tsconfig.json
index 7dd12ba6ccf829..df0072645c53ba 100644
--- a/packages/docgen/tsconfig.json
+++ b/packages/docgen/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "lib",
diff --git a/packages/dom-ready/.npmrc b/packages/dom-ready/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/dom-ready/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/dom-ready/CHANGELOG.md b/packages/dom-ready/CHANGELOG.md
index 78e95106b384ff..ce17d989eac98d 100644
--- a/packages/dom-ready/CHANGELOG.md
+++ b/packages/dom-ready/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -107,22 +155,22 @@
 
 ## 2.9.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
 
 ## 1.1.0 (2018-07-12)
 
-### New Feature
+### New Features
 
 -   Updated build to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
-### Polish
+### Internal
 
 -   Moved `@WordPress/packages` repository to `@WordPress/gutenberg` ([#7805](https://github.com/WordPress/gutenberg/pull/7805))
diff --git a/packages/dom-ready/package.json b/packages/dom-ready/package.json
index 53a6d17dce2c6a..65334a21bd1373 100644
--- a/packages/dom-ready/package.json
+++ b/packages/dom-ready/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom-ready",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "Execute callback after the DOM is loaded.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,9 +28,10 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/dom-ready/tsconfig.json b/packages/dom-ready/tsconfig.json
index 3c2c31f506f132..6e33d8ff82d47e 100644
--- a/packages/dom-ready/tsconfig.json
+++ b/packages/dom-ready/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/dom/.npmrc b/packages/dom/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/dom/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/dom/CHANGELOG.md b/packages/dom/CHANGELOG.md
index cf594423e28d1f..51c8de37b61982 100644
--- a/packages/dom/CHANGELOG.md
+++ b/packages/dom/CHANGELOG.md
@@ -2,6 +2,56 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+-   fix return types of `focus.tabbable` methods to be `HTMLElement` instead of `Element`.
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -70,7 +120,7 @@
 
 ## 3.14.0 (2022-07-27)
 
-- `getRectangleFromRange` may now return `null`.
+-   `getRectangleFromRange` may now return `null`.
 
 ## 3.13.0 (2022-07-13)
 
@@ -82,9 +132,9 @@
 
 ## 3.9.0 (2022-05-18)
 
-### Deprecation
+### Deprecations
 
-- Deprecate `isNumberInput`, as it is no longer used internally ([#40896](https://github.com/WordPress/gutenberg/pull/40896)).
+-   Deprecate `isNumberInput`, as it is no longer used internally ([#40896](https://github.com/WordPress/gutenberg/pull/40896)).
 
 ## 3.8.0 (2022-05-04)
 
@@ -111,7 +161,7 @@
 
 ## 2.18.0 (2021-04-29)
 
-### New Feature
+### New Features
 
 -   Export type definitions.
 
@@ -119,19 +169,19 @@
 
 ## 2.11.0 (2020-06-15)
 
-### New Feature
+### New Features
 
 -   Add `documentHasUncollapsedSelection` to inquire about ranges of selected text in the document, including the separately managed selections inside <input> and <textarea> elements.
 
 ## 2.10.0 (2020-05-28)
 
-### New Feature
+### New Features
 
 -   Add `documentHasTextSelection` to inquire specifically about ranges of selected text, in addition to the existing `documentHasSelection`.
 
 ## 2.1.0 (2019-03-06)
 
-### Bug Fix
+### Bug Fixes
 
 -   Update `isHorizontalEdge` to account for empty text nodes.
 -   `tabbables.find` considers at most a single radio input for a given name. The checked input is given priority, falling back to the first in the tabindex-sorted set if there is no checked input.
@@ -150,6 +200,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/dom/README.md b/packages/dom/README.md
index 5440ff2820ccc6..26740c74e8561e 100644
--- a/packages/dom/README.md
+++ b/packages/dom/README.md
@@ -239,6 +239,22 @@ _Returns_
 
 -   `boolean`: True if rtl, false if ltr.
 
+### isSelectionForward
+
+Returns true if the given selection object is in the forward direction, or false otherwise.
+
+_Related_
+
+-   <https://developer.mozilla.org/en-US/docs/Web/API/Node/compareDocumentPosition>
+
+_Parameters_
+
+-   _selection_ `Selection`: Selection object to check.
+
+_Returns_
+
+-   `boolean`: Whether the selection is forward.
+
 ### isTextContent
 
 _Parameters_
diff --git a/packages/dom/package.json b/packages/dom/package.json
index f8499debc0fe10..9d738a07b89b99 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "DOM utilities module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,10 +29,11 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/deprecated": "file:../deprecated"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/deprecated": "*"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/dom/src/dom/get-rectangle-from-range.js b/packages/dom/src/dom/get-rectangle-from-range.js
index 1874a331a641f3..12946c753b43f5 100644
--- a/packages/dom/src/dom/get-rectangle-from-range.js
+++ b/packages/dom/src/dom/get-rectangle-from-range.js
@@ -43,10 +43,18 @@ export default function getRectangleFromRange( range ) {
 		} = filteredRects[ 0 ];
 
 		for ( const { top, bottom, left, right } of filteredRects ) {
-			if ( top < furthestTop ) furthestTop = top;
-			if ( bottom > furthestBottom ) furthestBottom = bottom;
-			if ( left < furthestLeft ) furthestLeft = left;
-			if ( right > furthestRight ) furthestRight = right;
+			if ( top < furthestTop ) {
+				furthestTop = top;
+			}
+			if ( bottom > furthestBottom ) {
+				furthestBottom = bottom;
+			}
+			if ( left < furthestLeft ) {
+				furthestLeft = left;
+			}
+			if ( right > furthestRight ) {
+				furthestRight = right;
+			}
 		}
 
 		return new window.DOMRect(
diff --git a/packages/dom/src/dom/index.js b/packages/dom/src/dom/index.js
index f21ec1e4e85e66..4522ac1fd1b89c 100644
--- a/packages/dom/src/dom/index.js
+++ b/packages/dom/src/dom/index.js
@@ -24,3 +24,4 @@ export { default as isEmpty } from './is-empty';
 export { default as removeInvalidHTML } from './remove-invalid-html';
 export { default as isRTL } from './is-rtl';
 export { default as safeHTML } from './safe-html';
+export { default as isSelectionForward } from './is-selection-forward';
diff --git a/packages/dom/src/dom/is-edge.js b/packages/dom/src/dom/is-edge.js
index 64df2bc139be56..366c5b8155c8dd 100644
--- a/packages/dom/src/dom/is-edge.js
+++ b/packages/dom/src/dom/is-edge.js
@@ -37,7 +37,7 @@ export default function isEdge( container, isReverse, onlyVertical = false ) {
 		return container.value.length === container.selectionStart;
 	}
 
-	if ( ! ( /** @type {HTMLElement} */ ( container ).isContentEditable ) ) {
+	if ( ! container.isContentEditable ) {
 		return true;
 	}
 
diff --git a/packages/dom/src/dom/place-caret-at-edge.js b/packages/dom/src/dom/place-caret-at-edge.js
index 9cb9958dc88439..4075fc7c439586 100644
--- a/packages/dom/src/dom/place-caret-at-edge.js
+++ b/packages/dom/src/dom/place-caret-at-edge.js
@@ -75,7 +75,9 @@ export default function placeCaretAtEdge( container, isReverse, x ) {
 		getRange( container, isReverse, x )
 	);
 
-	if ( ! range ) return;
+	if ( ! range ) {
+		return;
+	}
 
 	const { ownerDocument } = container;
 	const { defaultView } = ownerDocument;
diff --git a/packages/dom/src/focusable.js b/packages/dom/src/focusable.js
index 373dc54522cdee..ed0326fd264139 100644
--- a/packages/dom/src/focusable.js
+++ b/packages/dom/src/focusable.js
@@ -98,9 +98,7 @@ function isValidFocusableArea( element ) {
  * @return {HTMLElement[]} Focusable elements.
  */
 export function find( context, { sequential = false } = {} ) {
-	/* eslint-disable jsdoc/no-undefined-types */
 	/** @type {NodeListOf<HTMLElement>} */
-	/* eslint-enable jsdoc/no-undefined-types */
 	const elements = context.querySelectorAll( buildSelector( sequential ) );
 
 	return Array.from( elements ).filter( ( element ) => {
diff --git a/packages/dom/src/phrasing-content.js b/packages/dom/src/phrasing-content.js
index 571d081c2843a1..c9ed0981629747 100644
--- a/packages/dom/src/phrasing-content.js
+++ b/packages/dom/src/phrasing-content.js
@@ -114,6 +114,7 @@ const embeddedContentSchema = {
 			'src',
 			'poster',
 			'preload',
+			'playsinline',
 			'autoplay',
 			'mediagroup',
 			'loop',
diff --git a/packages/dom/src/tabbable.js b/packages/dom/src/tabbable.js
index 25bc81f2154582..29447150423248 100644
--- a/packages/dom/src/tabbable.js
+++ b/packages/dom/src/tabbable.js
@@ -31,7 +31,7 @@ export function isTabbableIndex( element ) {
 	return getTabIndex( element ) !== -1;
 }
 
-/** @typedef {Element & { type?: string, checked?: boolean, name?: string }} MaybeHTMLInputElement */
+/** @typedef {HTMLElement & { type?: string, checked?: boolean, name?: string }} MaybeHTMLInputElement */
 
 /**
  * Returns a stateful reducer function which constructs a filtered array of
@@ -84,10 +84,10 @@ function createStatefulCollapseRadioGroup() {
  * sort where equal tabIndex should be left in order of their occurrence in the
  * document.
  *
- * @param {Element} element Element.
- * @param {number}  index   Array index of element.
+ * @param {HTMLElement} element Element.
+ * @param {number}      index   Array index of element.
  *
- * @return {{ element: Element, index: number }} Mapped object with element, index.
+ * @return {{ element: HTMLElement, index: number }} Mapped object with element, index.
  */
 function mapElementToObjectTabbable( element, index ) {
 	return { element, index };
@@ -97,9 +97,9 @@ function mapElementToObjectTabbable( element, index ) {
  * An array map callback, returning an element of the given mapped object's
  * element value.
  *
- * @param {{ element: Element }} object Mapped object with element.
+ * @param {{ element: HTMLElement }} object Mapped object with element.
  *
- * @return {Element} Mapped object element.
+ * @return {HTMLElement} Mapped object element.
  */
 function mapObjectTabbableToElement( object ) {
 	return object.element;
@@ -110,8 +110,8 @@ function mapObjectTabbableToElement( object ) {
  *
  * @see mapElementToObjectTabbable
  *
- * @param {{ element: Element, index: number }} a First object to compare.
- * @param {{ element: Element, index: number }} b Second object to compare.
+ * @param {{ element: HTMLElement, index: number }} a First object to compare.
+ * @param {{ element: HTMLElement, index: number }} b Second object to compare.
  *
  * @return {number} Comparator result.
  */
@@ -129,9 +129,9 @@ function compareObjectTabbables( a, b ) {
 /**
  * Givin focusable elements, filters out tabbable element.
  *
- * @param {Element[]} focusables Focusable elements to filter.
+ * @param {HTMLElement[]} focusables Focusable elements to filter.
  *
- * @return {Element[]} Tabbable elements.
+ * @return {HTMLElement[]} Tabbable elements.
  */
 function filterTabbable( focusables ) {
 	return focusables
@@ -144,7 +144,7 @@ function filterTabbable( focusables ) {
 
 /**
  * @param {Element} context
- * @return {Element[]} Tabbable elements within the context.
+ * @return {HTMLElement[]} Tabbable elements within the context.
  */
 export function find( context ) {
 	return filterTabbable( findFocusable( context ) );
@@ -156,18 +156,17 @@ export function find( context ) {
  * @param {Element} element The focusable element before which to look. Defaults
  *                          to the active element.
  *
- * @return {Element|undefined} Preceding tabbable element.
+ * @return {HTMLElement|undefined} Preceding tabbable element.
  */
 export function findPrevious( element ) {
 	return filterTabbable( findFocusable( element.ownerDocument.body ) )
 		.reverse()
-		.find( ( focusable ) => {
-			return (
+		.find(
+			( focusable ) =>
 				// eslint-disable-next-line no-bitwise
 				element.compareDocumentPosition( focusable ) &
 				element.DOCUMENT_POSITION_PRECEDING
-			);
-		} );
+		);
 }
 
 /**
@@ -176,16 +175,13 @@ export function findPrevious( element ) {
  * @param {Element} element The focusable element after which to look. Defaults
  *                          to the active element.
  *
- * @return {Element|undefined} Next tabbable element.
+ * @return {HTMLElement|undefined} Next tabbable element.
  */
 export function findNext( element ) {
 	return filterTabbable( findFocusable( element.ownerDocument.body ) ).find(
-		( focusable ) => {
-			return (
-				// eslint-disable-next-line no-bitwise
-				element.compareDocumentPosition( focusable ) &
-				element.DOCUMENT_POSITION_FOLLOWING
-			);
-		}
+		( focusable ) =>
+			// eslint-disable-next-line no-bitwise
+			element.compareDocumentPosition( focusable ) &
+			element.DOCUMENT_POSITION_FOLLOWING
 	);
 }
diff --git a/packages/dom/tsconfig.json b/packages/dom/tsconfig.json
index a12c83344f044b..7cdff6c141151b 100644
--- a/packages/dom/tsconfig.json
+++ b/packages/dom/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/e2e-test-utils-playwright/.npmrc b/packages/e2e-test-utils-playwright/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/e2e-test-utils-playwright/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/e2e-test-utils-playwright/CHANGELOG.md b/packages/e2e-test-utils-playwright/CHANGELOG.md
index f9b414cdd4927e..5b262e27f5e48b 100644
--- a/packages/e2e-test-utils-playwright/CHANGELOG.md
+++ b/packages/e2e-test-utils-playwright/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 1.10.0 (2024-10-16)
+
+## 1.9.0 (2024-10-03)
+
+## 1.8.0 (2024-09-19)
+
+## 1.7.0 (2024-09-05)
+
+## 1.6.0 (2024-08-21)
+
+## 1.5.0 (2024-08-07)
+
+## 1.4.0 (2024-07-24)
+
+## 1.3.0 (2024-07-10)
+
+## 1.2.0 (2024-06-26)
+
+## 1.1.0 (2024-06-15)
+
+## 1.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 0.26.0 (2024-05-16)
+
+## 0.25.0 (2024-05-02)
+
+## 0.24.0 (2024-04-19)
+
+## 0.23.0 (2024-04-03)
+
+## 0.22.0 (2024-03-21)
+
+## 0.21.0 (2024-03-06)
+
+## 0.20.0 (2024-02-21)
+
+## 0.19.0 (2024-02-09)
+
+## 0.18.0 (2024-01-24)
+
+## 0.17.0 (2024-01-10)
+
+## 0.16.0 (2023-12-13)
+
 ## 0.15.0 (2023-11-29)
 
 ## 0.14.0 (2023-11-16)
@@ -32,4 +80,4 @@
 
 ## 0.1.0 (2023-05-10)
 
-- Initial version of the package.
+-   Initial version of the package.
diff --git a/packages/e2e-test-utils-playwright/README.md b/packages/e2e-test-utils-playwright/README.md
index d03a6ced191f96..883bd87fb9c3c6 100644
--- a/packages/e2e-test-utils-playwright/README.md
+++ b/packages/e2e-test-utils-playwright/README.md
@@ -16,7 +16,7 @@ Install the module
 npm install @wordpress/e2e-test-utils-playwright --save-dev
 ```
 
-**Note**: This package requires Node.js 12.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## API
 
@@ -42,6 +42,7 @@ await admin.visitAdminPage( 'options-general.php' );
 End to end test utilities for the WordPress Block Editor.
 
 To use these utilities, instantiate them within each test file:
+
 ```js
 test.use( {
 	editor: async ( { page }, use ) => {
@@ -53,7 +54,7 @@ test.use( {
 Within a test or test utility, use the `canvas` property to select elements within the iframe canvas:
 
 ```js
-await editor.canvas.locator( 'role=document[name="Paragraph block"i]' )
+await editor.canvas.locator( 'role=document[name="Paragraph block"i]' );
 ```
 
 ### PageUtils
diff --git a/packages/e2e-test-utils-playwright/package.json b/packages/e2e-test-utils-playwright/package.json
index 2e21a1ec485fdd..353d19decb8f8a 100644
--- a/packages/e2e-test-utils-playwright/package.json
+++ b/packages/e2e-test-utils-playwright/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils-playwright",
-	"version": "0.15.0",
+	"version": "1.10.0",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"build",
@@ -30,15 +31,12 @@
 	"main": "./build/index.js",
 	"types": "./build-types",
 	"dependencies": {
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/url": "file:../url",
 		"change-case": "^4.1.2",
 		"form-data": "^4.0.0",
 		"get-port": "^5.1.1",
 		"lighthouse": "^10.4.0",
 		"mime": "^3.0.0",
-		"web-vitals": "^3.5.0"
+		"web-vitals": "^4.2.1"
 	},
 	"peerDependencies": {
 		"@playwright/test": ">=1"
diff --git a/packages/e2e-test-utils-playwright/src/admin/create-new-post.ts b/packages/e2e-test-utils-playwright/src/admin/create-new-post.ts
index e9cfefd9f65d5a..a5d6617946ae31 100644
--- a/packages/e2e-test-utils-playwright/src/admin/create-new-post.ts
+++ b/packages/e2e-test-utils-playwright/src/admin/create-new-post.ts
@@ -9,6 +9,7 @@ interface NewPostOptions {
 	content?: string;
 	excerpt?: string;
 	showWelcomeGuide?: boolean;
+	fullscreenMode?: boolean;
 }
 
 /**
@@ -24,15 +25,23 @@ export async function createNewPost(
 	const query = new URLSearchParams();
 	const { postType, title, content, excerpt } = options;
 
-	if ( postType ) query.set( 'post_type', postType );
-	if ( title ) query.set( 'post_title', title );
-	if ( content ) query.set( 'content', content );
-	if ( excerpt ) query.set( 'excerpt', excerpt );
+	if ( postType ) {
+		query.set( 'post_type', postType );
+	}
+	if ( title ) {
+		query.set( 'post_title', title );
+	}
+	if ( content ) {
+		query.set( 'content', content );
+	}
+	if ( excerpt ) {
+		query.set( 'excerpt', excerpt );
+	}
 
 	await this.visitAdminPage( 'post-new.php', query.toString() );
 
 	await this.editor.setPreferences( 'core/edit-post', {
 		welcomeGuide: options.showWelcomeGuide ?? false,
-		fullscreenMode: false,
+		fullscreenMode: options.fullscreenMode ?? false,
 	} );
 }
diff --git a/packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts b/packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts
index 5883a2b92a5bcc..f0a7db5ad966ff 100644
--- a/packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts
+++ b/packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts
@@ -24,13 +24,46 @@ export async function visitSiteEditor(
 	const { postId, postType, path, canvas } = options;
 	const query = new URLSearchParams();
 
-	if ( postId ) query.set( 'postId', String( postId ) );
-	if ( postType ) query.set( 'postType', postType );
-	if ( path ) query.set( 'path', path );
-	if ( canvas ) query.set( 'canvas', canvas );
+	if ( postId ) {
+		query.set( 'postId', String( postId ) );
+	}
+	if ( postType ) {
+		query.set( 'postType', postType );
+	}
+	if ( path ) {
+		query.set( 'path', path );
+	}
+	if ( canvas ) {
+		query.set( 'canvas', canvas );
+	}
 
 	await this.visitAdminPage( 'site-editor.php', query.toString() );
 
+	/**
+	 * @todo This is a workaround for the fact that the editor canvas is seen as
+	 * ready and visible before the loading spinner is hidden. Ideally, the
+	 * content underneath the loading overlay should be marked inert until the
+	 * loading is done.
+	 */
+	if ( ! query.size || postId || canvas === 'edit' ) {
+		const canvasLoader = this.page.locator(
+			// Spinner was used instead of the progress bar in an earlier
+			// version of the site editor.
+			'.edit-site-canvas-loader, .edit-site-canvas-spinner'
+		);
+
+		// Wait for the canvas loader to appear first, so that the locator that
+		// waits for the hidden state doesn't resolve prematurely.
+		await canvasLoader.waitFor( { state: 'visible' } );
+		await canvasLoader.waitFor( {
+			state: 'hidden',
+			// Bigger timeout is needed for larger entities, like the Large Post
+			// HTML fixture that we load for performance tests, which often
+			// doesn't make it under the default timeout value.
+			timeout: 60_000,
+		} );
+	}
+
 	if ( ! options.showWelcomeGuide ) {
 		await this.editor.setPreferences( 'core/edit-site', {
 			welcomeGuide: false,
@@ -39,19 +72,4 @@ export async function visitSiteEditor(
 			welcomeGuideTemplate: false,
 		} );
 	}
-
-	/**
-	 * @todo This is a workaround for the fact that the editor canvas is seen as
-	 * ready and visible before the loading spinner is hidden. Ideally, the
-	 * content underneath the loading overlay should be marked inert until the
-	 * loading is done.
-	 */
-	await this.page
-		// Spinner was used instead of the progress bar in an earlier version of
-		// the site editor.
-		.locator( '.edit-site-canvas-loader, .edit-site-canvas-spinner' )
-		// Bigger timeout is needed for larger entities, for example the large
-		// post html fixture that we load for performance tests, which often
-		// doesn't make it under the default 10 seconds.
-		.waitFor( { state: 'hidden', timeout: 60_000 } );
 }
diff --git a/packages/e2e-test-utils-playwright/src/editor/get-blocks.ts b/packages/e2e-test-utils-playwright/src/editor/get-blocks.ts
index 858c9da980fc13..36e4e23e587f9d 100644
--- a/packages/e2e-test-utils-playwright/src/editor/get-blocks.ts
+++ b/packages/e2e-test-utils-playwright/src/editor/get-blocks.ts
@@ -14,22 +14,43 @@ type Block = {
  *
  * @param this
  * @param options
- * @param options.full Whether to return the full block data or just the name and attributes.
+ * @param options.clientId Limit the results to be only under a partial tree of the specified clientId.
+ * @param options.full     Whether to return the full block data or just the name and attributes.
  *
  * @return  The blocks.
  */
-export async function getBlocks( this: Editor, { full = false } = {} ) {
+export async function getBlocks(
+	this: Editor,
+	{ clientId, full = false }: { clientId?: string; full?: boolean } = {}
+) {
 	await this.page.waitForFunction(
 		() => window?.wp?.blocks && window?.wp?.data
 	);
 
 	return await this.page.evaluate(
-		( [ _full ] ) => {
+		( [ _full, _clientId ] ) => {
+			// Serialize serializable attributes of blocks.
+			function serializeAttributes(
+				attributes: Record< string, unknown >
+			) {
+				return Object.fromEntries(
+					Object.entries( attributes ).map( ( [ key, value ] ) => {
+						// Serialize RichTextData to string.
+						if (
+							value instanceof window.wp.richText.RichTextData
+						) {
+							return [ key, ( value as string ).toString() ];
+						}
+						return [ key, value ];
+					} )
+				);
+			}
+
 			// Remove other unpredictable properties like clientId from blocks for testing purposes.
 			function recursivelyTransformBlocks( blocks: Block[] ): Block[] {
 				return blocks.map( ( block ) => ( {
 					name: block.name,
-					attributes: block.attributes,
+					attributes: serializeAttributes( block.attributes ),
 					innerBlocks: recursivelyTransformBlocks(
 						block.innerBlocks
 					),
@@ -38,7 +59,7 @@ export async function getBlocks( this: Editor, { full = false } = {} ) {
 
 			const blocks = window.wp.data
 				.select( 'core/block-editor' )
-				.getBlocks();
+				.getBlocks( _clientId ) as Block[];
 
 			// The editor might still contain an unmodified empty block even when it's technically "empty".
 			if (
@@ -50,6 +71,6 @@ export async function getBlocks( this: Editor, { full = false } = {} ) {
 
 			return _full ? blocks : recursivelyTransformBlocks( blocks );
 		},
-		[ full ]
+		[ full, clientId ]
 	);
 }
diff --git a/packages/e2e-test-utils-playwright/src/editor/index.ts b/packages/e2e-test-utils-playwright/src/editor/index.ts
index c222f68aecc90a..4ed32134f0979a 100644
--- a/packages/e2e-test-utils-playwright/src/editor/index.ts
+++ b/packages/e2e-test-utils-playwright/src/editor/index.ts
@@ -28,6 +28,7 @@ import { saveSiteEditorEntities } from './site-editor';
 import { setIsFixedToolbar } from './set-is-fixed-toolbar';
 import { switchToLegacyCanvas } from './switch-to-legacy-canvas';
 import { transformBlockTo } from './transform-block-to';
+import { switchEditorTool } from './switch-editor-tool';
 
 type EditorConstructorProps = {
 	page: Page;
@@ -84,6 +85,8 @@ export class Editor {
 	/** @borrows setIsFixedToolbar as this.setIsFixedToolbar */
 	setIsFixedToolbar: typeof setIsFixedToolbar =
 		setIsFixedToolbar.bind( this );
+	/** @borrows switchEditorTool as this.switchEditorTool */
+	switchEditorTool: typeof switchEditorTool = switchEditorTool.bind( this );
 	/** @borrows switchToLegacyCanvas as this.switchToLegacyCanvas */
 	switchToLegacyCanvas: typeof switchToLegacyCanvas =
 		switchToLegacyCanvas.bind( this );
diff --git a/packages/e2e-test-utils-playwright/src/editor/insert-block.ts b/packages/e2e-test-utils-playwright/src/editor/insert-block.ts
index ef923cf667d37f..a0a08ac6f847a9 100644
--- a/packages/e2e-test-utils-playwright/src/editor/insert-block.ts
+++ b/packages/e2e-test-utils-playwright/src/editor/insert-block.ts
@@ -14,33 +14,41 @@ interface BlockRepresentation {
  *
  * @param this
  * @param blockRepresentation Inserted block representation.
+ * @param options
+ * @param options.clientId    Client ID of the parent block to insert into.
  */
 async function insertBlock(
 	this: Editor,
-	blockRepresentation: BlockRepresentation
+	blockRepresentation: BlockRepresentation,
+	{ clientId }: { clientId?: string } = {}
 ) {
 	await this.page.waitForFunction(
 		() => window?.wp?.blocks && window?.wp?.data
 	);
 
-	await this.page.evaluate( ( _blockRepresentation ) => {
-		function recursiveCreateBlock( {
-			name,
-			attributes = {},
-			innerBlocks = [],
-		}: BlockRepresentation ): Object {
-			return window.wp.blocks.createBlock(
+	await this.page.evaluate(
+		( [ _blockRepresentation, _clientId ] ) => {
+			function recursiveCreateBlock( {
 				name,
-				attributes,
-				innerBlocks.map( ( innerBlock ) =>
-					recursiveCreateBlock( innerBlock )
-				)
-			);
-		}
-		const block = recursiveCreateBlock( _blockRepresentation );
+				attributes = {},
+				innerBlocks = [],
+			}: BlockRepresentation ): Object {
+				return window.wp.blocks.createBlock(
+					name,
+					attributes,
+					innerBlocks.map( ( innerBlock ) =>
+						recursiveCreateBlock( innerBlock )
+					)
+				);
+			}
+			const block = recursiveCreateBlock( _blockRepresentation );
 
-		window.wp.data.dispatch( 'core/block-editor' ).insertBlock( block );
-	}, blockRepresentation );
+			window.wp.data
+				.dispatch( 'core/block-editor' )
+				.insertBlock( block, undefined, _clientId );
+		},
+		[ blockRepresentation, clientId ] as const
+	);
 }
 
 export type { BlockRepresentation };
diff --git a/packages/e2e-test-utils-playwright/src/editor/preview.ts b/packages/e2e-test-utils-playwright/src/editor/preview.ts
index 97d3ef1d1d6603..c697ca714fe969 100644
--- a/packages/e2e-test-utils-playwright/src/editor/preview.ts
+++ b/packages/e2e-test-utils-playwright/src/editor/preview.ts
@@ -19,9 +19,7 @@ export async function openPreviewPage( this: Editor ): Promise< Page > {
 	const editorTopBar = this.page.locator(
 		'role=region[name="Editor top bar"i]'
 	);
-	const previewButton = editorTopBar.locator(
-		'role=button[name="Preview"i]'
-	);
+	const previewButton = editorTopBar.locator( 'role=button[name="View"i]' );
 
 	await previewButton.click();
 
diff --git a/packages/e2e-test-utils-playwright/src/editor/publish-post.ts b/packages/e2e-test-utils-playwright/src/editor/publish-post.ts
index 0a2b9e64dc597d..81451cd516f0ed 100644
--- a/packages/e2e-test-utils-playwright/src/editor/publish-post.ts
+++ b/packages/e2e-test-utils-playwright/src/editor/publish-post.ts
@@ -10,11 +10,21 @@ import type { Editor } from './index';
  * @param this
  */
 export async function publishPost( this: Editor ) {
-	await this.page.click( 'role=button[name="Publish"i]' );
-	const entitiesSaveButton = this.page.locator(
-		'role=region[name="Editor publish"i] >> role=button[name="Save"i]'
-	);
+	// If we have changes in other entities, the label is `Save` instead of `Publish`.
+	const saveButton = this.page
+		.getByRole( 'region', { name: 'Editor top bar' } )
+		.getByRole( 'button', { name: 'Save', exact: true } );
+	const publishButton = this.page
+		.getByRole( 'region', { name: 'Editor top bar' } )
+		.getByRole( 'button', { name: 'Publish', exact: true } );
+	const buttonToClick = ( await saveButton.isVisible() )
+		? saveButton
+		: publishButton;
+	await buttonToClick.click();
 
+	const entitiesSaveButton = this.page
+		.getByRole( 'region', { name: 'Editor publish' } )
+		.getByRole( 'button', { name: 'Save', exact: true } );
 	const isEntitiesSavePanelVisible = await entitiesSaveButton.isVisible();
 
 	// Save any entities.
diff --git a/packages/e2e-test-utils-playwright/src/editor/set-is-fixed-toolbar.ts b/packages/e2e-test-utils-playwright/src/editor/set-is-fixed-toolbar.ts
index 93c2cd14e1ebc5..ab7baef5967f0f 100644
--- a/packages/e2e-test-utils-playwright/src/editor/set-is-fixed-toolbar.ts
+++ b/packages/e2e-test-utils-playwright/src/editor/set-is-fixed-toolbar.ts
@@ -15,6 +15,6 @@ export async function setIsFixedToolbar( this: Editor, isFixed: boolean ) {
 	await this.page.evaluate( ( _isFixed ) => {
 		window.wp.data
 			.dispatch( 'core/preferences' )
-			.set( 'core/edit-post', 'fixedToolbar', _isFixed );
+			.set( 'core', 'fixedToolbar', _isFixed );
 	}, isFixed );
 }
diff --git a/packages/e2e-test-utils-playwright/src/editor/site-editor.ts b/packages/e2e-test-utils-playwright/src/editor/site-editor.ts
index b81f9983e2813e..02723a60ed0dba 100644
--- a/packages/e2e-test-utils-playwright/src/editor/site-editor.ts
+++ b/packages/e2e-test-utils-playwright/src/editor/site-editor.ts
@@ -3,29 +3,52 @@
  */
 import type { Editor } from './index';
 
+interface Options {
+	// If the only dirty entity is the current one, skip opening the save panel.
+	isOnlyCurrentEntityDirty?: boolean;
+}
+
 /**
  * Save entities in the site editor. Assumes the editor is in a dirty state.
  *
  * @param this
+ * @param options
  */
-export async function saveSiteEditorEntities( this: Editor ) {
+export async function saveSiteEditorEntities(
+	this: Editor,
+	options: Options = {}
+) {
 	const editorTopBar = this.page.getByRole( 'region', {
 		name: 'Editor top bar',
 	} );
-	const savePanel = this.page.getByRole( 'region', { name: 'Save panel' } );
 
+	// If we have changes in a single entity which can be published the label is `Publish`.
+	const saveButton = editorTopBar.getByRole( 'button', {
+		name: 'Save',
+		exact: true,
+	} );
+	const publishButton = editorTopBar.getByRole( 'button', {
+		name: 'Publish',
+	} );
+	const publishButtonIsVisible = ! ( await saveButton.isVisible() );
 	// First Save button in the top bar.
-	await editorTopBar
-		.getByRole( 'button', { name: 'Save', exact: true } )
-		.click();
-
-	// Second Save button in the entities panel.
-	await savePanel
-		.getByRole( 'button', { name: 'Save', exact: true } )
-		.click();
+	const buttonToClick = publishButtonIsVisible ? publishButton : saveButton;
+	await buttonToClick.click();
 
+	if ( ! options.isOnlyCurrentEntityDirty ) {
+		// Second Save button in the entities panel.
+		await this.page
+			.getByRole( 'region', {
+				name: /(Editor publish|Save panel)/,
+			} )
+			.getByRole( 'button', { name: 'Save', exact: true } )
+			.click();
+	}
+	// The text in the notice can be different based on the edited entity, whether
+	// we are saving multiple entities and whether we publish or update. So for now,
+	// we locate it based on the last part.
 	await this.page
 		.getByRole( 'button', { name: 'Dismiss this notice' } )
-		.getByText( 'Site updated.' )
+		.getByText( /(updated|published)\./ )
 		.waitFor();
 }
diff --git a/packages/e2e-test-utils-playwright/src/editor/switch-editor-tool.ts b/packages/e2e-test-utils-playwright/src/editor/switch-editor-tool.ts
new file mode 100644
index 00000000000000..67894abe0dcf7f
--- /dev/null
+++ b/packages/e2e-test-utils-playwright/src/editor/switch-editor-tool.ts
@@ -0,0 +1,34 @@
+/**
+ * Internal dependencies
+ */
+import type { Editor } from './index';
+
+/**
+ * Switch the editor tool being used.
+ *
+ * @param this
+ * @param label The text string of the button label.
+ */
+export async function switchEditorTool( this: Editor, label: string ) {
+	const toolsToolbar = this.page.getByRole( 'toolbar', {
+		name: 'Document tools',
+	} );
+	await toolsToolbar
+		.getByRole( 'button', {
+			name: 'Tools',
+		} )
+		.click();
+	const menu = this.page.getByRole( 'menu', {
+		name: 'Tools',
+	} );
+	await menu
+		.getByRole( 'menuitemradio', {
+			name: label,
+		} )
+		.click();
+	await toolsToolbar
+		.getByRole( 'button', {
+			name: 'Tools',
+		} )
+		.click();
+}
diff --git a/packages/e2e-test-utils-playwright/src/metrics/index.ts b/packages/e2e-test-utils-playwright/src/metrics/index.ts
index fac05d9004bd8d..9a9513d4bea510 100644
--- a/packages/e2e-test-utils-playwright/src/metrics/index.ts
+++ b/packages/e2e-test-utils-playwright/src/metrics/index.ts
@@ -332,17 +332,17 @@ export class Metrics {
 				window.__reportVitals__( JSON.stringify( measurement ) );
 
 			window.addEventListener( 'DOMContentLoaded', () => {
-				// @ts-ignore
+				// @ts-expect-error This is valid but web-vitals does not register the global types.
 				window.webVitals.onCLS( reportVitals );
-				// @ts-ignore
+				// @ts-expect-error This is valid but web-vitals does not register the global types.
 				window.webVitals.onFCP( reportVitals );
-				// @ts-ignore
+				// @ts-expect-error This is valid but web-vitals does not register the global types.
 				window.webVitals.onFID( reportVitals );
-				// @ts-ignore
+				// @ts-expect-error This is valid but web-vitals does not register the global types.
 				window.webVitals.onINP( reportVitals );
-				// @ts-ignore
+				// @ts-expect-error This is valid but web-vitals does not register the global types.
 				window.webVitals.onLCP( reportVitals );
-				// @ts-ignore
+				// @ts-expect-error This is valid but web-vitals does not register the global types.
 				window.webVitals.onTTFB( reportVitals );
 			} );
 		} );
@@ -368,6 +368,7 @@ export class Metrics {
 		this.webVitals = {};
 
 		const hasScript = await this.page.evaluate(
+			// @ts-expect-error This is valid but web-vitals does not register the global types.
 			() => typeof window.webVitals !== 'undefined'
 		);
 
diff --git a/packages/e2e-test-utils-playwright/src/page-utils/keycodes.ts b/packages/e2e-test-utils-playwright/src/page-utils/keycodes.ts
new file mode 100644
index 00000000000000..3a848ac8fb7667
--- /dev/null
+++ b/packages/e2e-test-utils-playwright/src/page-utils/keycodes.ts
@@ -0,0 +1,48 @@
+/**
+ * This filed is partially copied from @wordpress/keycodes to keep the package
+ * (internal-)dependencies free.
+ */
+
+/**
+ * Keycode for ALT key.
+ */
+export const ALT = 'alt';
+
+/**
+ * Keycode for CTRL key.
+ */
+export const CTRL = 'ctrl';
+
+/**
+ * Keycode for COMMAND key.
+ */
+export const COMMAND = 'meta';
+
+/**
+ * Keycode for SHIFT key.
+ */
+export const SHIFT = 'shift';
+
+/**
+ * Object that contains functions that return the available modifier
+ * depending on platform.
+ */
+export const modifiers: Record<
+	string,
+	( _isApple: () => boolean ) => string[]
+> = {
+	primary: ( _isApple ) => ( _isApple() ? [ COMMAND ] : [ CTRL ] ),
+	primaryShift: ( _isApple ) =>
+		_isApple() ? [ SHIFT, COMMAND ] : [ CTRL, SHIFT ],
+	primaryAlt: ( _isApple ) =>
+		_isApple() ? [ ALT, COMMAND ] : [ CTRL, ALT ],
+	secondary: ( _isApple ) =>
+		_isApple() ? [ SHIFT, ALT, COMMAND ] : [ CTRL, SHIFT, ALT ],
+	access: ( _isApple ) => ( _isApple() ? [ CTRL, ALT ] : [ SHIFT, ALT ] ),
+	ctrl: () => [ CTRL ],
+	alt: () => [ ALT ],
+	ctrlShift: () => [ CTRL, SHIFT ],
+	shift: () => [ SHIFT ],
+	shiftAlt: () => [ SHIFT, ALT ],
+	undefined: () => [],
+};
diff --git a/packages/e2e-test-utils-playwright/src/page-utils/press-keys.ts b/packages/e2e-test-utils-playwright/src/page-utils/press-keys.ts
index 3b187625fd47cf..f3ab7503a8f98a 100644
--- a/packages/e2e-test-utils-playwright/src/page-utils/press-keys.ts
+++ b/packages/e2e-test-utils-playwright/src/page-utils/press-keys.ts
@@ -8,16 +8,7 @@ import type { Page } from '@playwright/test';
  * Internal dependencies
  */
 import type { PageUtils } from './';
-
-/**
- * WordPress dependencies
- */
-import {
-	modifiers as baseModifiers,
-	SHIFT,
-	ALT,
-	CTRL,
-} from '@wordpress/keycodes';
+import { modifiers as baseModifiers, SHIFT, ALT, CTRL } from './keycodes';
 
 let clipboardDataHolder: {
 	'text/plain': string;
@@ -50,23 +41,31 @@ export function setClipboardData(
 }
 
 async function emulateClipboard( page: Page, type: 'copy' | 'cut' | 'paste' ) {
-	clipboardDataHolder = await page.evaluate(
+	const output = await page.evaluate(
 		( [ _type, _clipboardData ] ) => {
 			const canvasDoc =
 				// @ts-ignore
 				document.activeElement?.contentDocument ?? document;
-			const clipboardDataTransfer = new DataTransfer();
+			const event = new ClipboardEvent( _type, {
+				bubbles: true,
+				cancelable: true,
+				clipboardData: new DataTransfer(),
+			} );
+
+			if ( ! event.clipboardData ) {
+				throw new Error( 'ClipboardEvent.clipboardData is null' );
+			}
 
 			if ( _type === 'paste' ) {
-				clipboardDataTransfer.setData(
+				event.clipboardData.setData(
 					'text/plain',
 					_clipboardData[ 'text/plain' ]
 				);
-				clipboardDataTransfer.setData(
+				event.clipboardData.setData(
 					'text/html',
 					_clipboardData[ 'text/html' ]
 				);
-				clipboardDataTransfer.setData(
+				event.clipboardData.setData(
 					'rich-text',
 					_clipboardData[ 'rich-text' ]
 				);
@@ -85,26 +84,35 @@ async function emulateClipboard( page: Page, type: 'copy' | 'cut' | 'paste' ) {
 						)
 						.join( '' );
 				}
-				clipboardDataTransfer.setData( 'text/plain', plainText );
-				clipboardDataTransfer.setData( 'text/html', html );
+				event.clipboardData.setData( 'text/plain', plainText );
+				event.clipboardData.setData( 'text/html', html );
 			}
 
-			canvasDoc.activeElement?.dispatchEvent(
-				new ClipboardEvent( _type, {
-					bubbles: true,
-					cancelable: true,
-					clipboardData: clipboardDataTransfer,
-				} )
-			);
+			canvasDoc.activeElement.dispatchEvent( event );
+
+			if ( _type === 'paste' ) {
+				return event.defaultPrevented;
+			}
 
 			return {
-				'text/plain': clipboardDataTransfer.getData( 'text/plain' ),
-				'text/html': clipboardDataTransfer.getData( 'text/html' ),
-				'rich-text': clipboardDataTransfer.getData( 'rich-text' ),
+				'text/plain': event.clipboardData.getData( 'text/plain' ),
+				'text/html': event.clipboardData.getData( 'text/html' ),
+				'rich-text': event.clipboardData.getData( 'rich-text' ),
 			};
 		},
 		[ type, clipboardDataHolder ] as const
 	);
+
+	if ( typeof output === 'object' ) {
+		clipboardDataHolder = output;
+	}
+
+	if ( output === false ) {
+		// Emulate paste by typing the clipboard content, which works across all
+		// elements and documents (keyboard.type does uses the nested active
+		// element automatically).
+		await page.keyboard.type( clipboardDataHolder[ 'text/plain' ] );
+	}
 }
 
 const isAppleOS = () => process.platform === 'darwin';
diff --git a/packages/e2e-test-utils-playwright/src/request-utils/gutenberg-experiments.ts b/packages/e2e-test-utils-playwright/src/request-utils/gutenberg-experiments.ts
new file mode 100644
index 00000000000000..6a21ba7d90aec6
--- /dev/null
+++ b/packages/e2e-test-utils-playwright/src/request-utils/gutenberg-experiments.ts
@@ -0,0 +1,40 @@
+/**
+ * Internal dependencies
+ */
+import type { RequestUtils } from './index';
+
+/**
+ * Sets the Gutenberg experiments.
+ *
+ * @param this
+ * @param experiments Array of experimental flags to enable. Pass in an empty array to disable all experiments.
+ */
+async function setGutenbergExperiments(
+	this: RequestUtils,
+	experiments: string[]
+) {
+	const response = await this.request.get(
+		'/wp-admin/admin.php?page=gutenberg-experiments'
+	);
+	const html = await response.text();
+	const nonce = html.match( /name="_wpnonce" value="([^"]+)"/ )![ 1 ];
+
+	await this.request.post( '/wp-admin/options.php', {
+		form: {
+			option_page: 'gutenberg-experiments',
+			action: 'update',
+			_wpnonce: nonce,
+			_wp_http_referer: '/wp-admin/admin.php?page=gutenberg-experiments',
+			...Object.fromEntries(
+				experiments.map( ( experiment ) => [
+					`gutenberg-experiments[${ experiment }]`,
+					1,
+				] )
+			),
+			submit: 'Save Changes',
+		},
+		failOnStatusCode: true,
+	} );
+}
+
+export { setGutenbergExperiments };
diff --git a/packages/e2e-test-utils-playwright/src/request-utils/index.ts b/packages/e2e-test-utils-playwright/src/request-utils/index.ts
index 064894793b8f31..f6818945e16936 100644
--- a/packages/e2e-test-utils-playwright/src/request-utils/index.ts
+++ b/packages/e2e-test-utils-playwright/src/request-utils/index.ts
@@ -36,6 +36,7 @@ import { resetPreferences } from './preferences';
 import { getSiteSettings, updateSiteSettings } from './site-settings';
 import { deleteAllWidgets, addWidgetBlock } from './widgets';
 import { deleteAllPatternCategories } from './patterns';
+import { setGutenbergExperiments } from './gutenberg-experiments';
 
 interface StorageState {
 	cookies: Cookie[];
@@ -92,7 +93,7 @@ class RequestUtils {
 			},
 		} );
 
-		const requestUtils = new RequestUtils( requestContext, {
+		const requestUtils = new this( requestContext, {
 			user,
 			storageState,
 			storageStatePath,
@@ -205,6 +206,9 @@ class RequestUtils {
 		getThemeGlobalStylesRevisions.bind( this );
 	/** @borrows deleteAllPatternCategories as this.deleteAllPatternCategories */
 	deleteAllPatternCategories = deleteAllPatternCategories.bind( this );
+	/** @borrows setGutenbergExperiments as this.setGutenbergExperiments */
+	setGutenbergExperiments: typeof setGutenbergExperiments =
+		setGutenbergExperiments.bind( this );
 }
 
 export type { StorageState };
diff --git a/packages/e2e-test-utils-playwright/src/request-utils/posts.ts b/packages/e2e-test-utils-playwright/src/request-utils/posts.ts
index 5e32c0c877555c..3b1231619df6e9 100644
--- a/packages/e2e-test-utils-playwright/src/request-utils/posts.ts
+++ b/packages/e2e-test-utils-playwright/src/request-utils/posts.ts
@@ -64,7 +64,7 @@ export async function createPost(
 	const post = await this.rest< Post >( {
 		method: 'POST',
 		path: `/wp/v2/posts`,
-		params: { ...payload },
+		data: { ...payload },
 	} );
 
 	return post;
diff --git a/packages/e2e-test-utils-playwright/src/request-utils/rest.ts b/packages/e2e-test-utils-playwright/src/request-utils/rest.ts
index 667ccc1d9294d9..79b49dc3c7b646 100644
--- a/packages/e2e-test-utils-playwright/src/request-utils/rest.ts
+++ b/packages/e2e-test-utils-playwright/src/request-utils/rest.ts
@@ -3,6 +3,7 @@
  */
 import * as fs from 'fs/promises';
 import { dirname } from 'path';
+import { expect } from '@playwright/test';
 import type { APIRequestContext } from '@playwright/test';
 
 /**
@@ -39,10 +40,32 @@ async function getAPIRootURL( request: APIRequestContext ) {
 }
 
 async function setupRest( this: RequestUtils ): Promise< StorageState > {
-	const [ nonce, rootURL ] = await Promise.all( [
-		this.login(),
-		getAPIRootURL( this.request ),
-	] );
+	let nonce = '';
+	let rootURL = '';
+
+	// Poll until the REST API is discovered.
+	// See https://github.com/WordPress/gutenberg/issues/61627
+	await expect
+		.poll(
+			async () => {
+				try {
+					[ nonce, rootURL ] = await Promise.all( [
+						this.login(),
+						getAPIRootURL( this.request ),
+					] );
+				} catch ( error ) {
+					// Prints the error if the timeout is reached.
+					return error;
+				}
+
+				return nonce && rootURL ? true : false;
+			},
+			{
+				message: 'Failed to setup REST API.',
+				timeout: 60_000, // 1 minute.
+			}
+		)
+		.toBe( true );
 
 	const { cookies } = await this.request.storageState();
 
diff --git a/packages/e2e-test-utils-playwright/src/request-utils/site-settings.ts b/packages/e2e-test-utils-playwright/src/request-utils/site-settings.ts
index 4540402ca827a9..d655f23c4f487c 100644
--- a/packages/e2e-test-utils-playwright/src/request-utils/site-settings.ts
+++ b/packages/e2e-test-utils-playwright/src/request-utils/site-settings.ts
@@ -19,6 +19,9 @@ type SiteSettings = {
 	posts_per_page: number;
 	default_ping_status: 'open' | 'closed';
 	default_comment_status: 'open' | 'closed';
+	show_on_front: 'posts' | 'page';
+	page_on_front: number;
+	page_for_posts: number;
 };
 
 /**
diff --git a/packages/e2e-test-utils-playwright/src/request-utils/themes.ts b/packages/e2e-test-utils-playwright/src/request-utils/themes.ts
index 6b4fd175887371..1f56814346d6ed 100644
--- a/packages/e2e-test-utils-playwright/src/request-utils/themes.ts
+++ b/packages/e2e-test-utils-playwright/src/request-utils/themes.ts
@@ -13,12 +13,25 @@ async function activateTheme(
 	let response = await this.request.get( THEMES_URL );
 	const html = await response.text();
 	const optionalFolder = '([a-z0-9-]+%2F)?';
-	const matchGroup = html.match(
-		`action=activate&amp;stylesheet=${ optionalFolder }${ encodeURIComponent(
+
+	// The `optionalFolder` regex part matches paths with a folder,
+	// so it will return the first match, which might contain a folder.
+	// First try to honor the included theme slug, that is, without a folder.
+	let matchGroup = html.match(
+		`action=activate&amp;stylesheet=${ encodeURIComponent(
 			themeSlug
 		) }&amp;_wpnonce=[a-z0-9]+`
 	);
 
+	// If the theme is not found, try to match the theme slug with a folder.
+	if ( ! matchGroup ) {
+		matchGroup = html.match(
+			`action=activate&amp;stylesheet=${ optionalFolder }${ encodeURIComponent(
+				themeSlug
+			) }&amp;_wpnonce=[a-z0-9]+`
+		);
+	}
+
 	if ( ! matchGroup ) {
 		if ( html.includes( `data-slug="${ themeSlug }"` ) ) {
 			// The theme is already activated.
diff --git a/packages/e2e-test-utils-playwright/src/request-utils/users.ts b/packages/e2e-test-utils-playwright/src/request-utils/users.ts
index 0997a7f51b5cb0..11df5f37468ca6 100644
--- a/packages/e2e-test-utils-playwright/src/request-utils/users.ts
+++ b/packages/e2e-test-utils-playwright/src/request-utils/users.ts
@@ -5,6 +5,7 @@ import type { RequestUtils } from './index';
 
 export interface User {
 	id: number;
+	name: string;
 	email: string;
 }
 
@@ -110,8 +111,11 @@ async function deleteAllUsers( this: RequestUtils ) {
 	// The users endpoint doesn't support batch request yet.
 	const responses = await Promise.all(
 		users
-			// Do not delete root user.
-			.filter( ( user: User ) => user.id !== 1 )
+			// Do not delete neither root user nor the current user.
+			.filter(
+				( user: User ) =>
+					user.id !== 1 && user.name !== this.user.username
+			)
 			.map( ( user: User ) => deleteUser.bind( this )( user.id ) )
 	);
 
diff --git a/packages/e2e-test-utils-playwright/src/test.ts b/packages/e2e-test-utils-playwright/src/test.ts
index 677eff31955bd1..6ef614024d7d97 100644
--- a/packages/e2e-test-utils-playwright/src/test.ts
+++ b/packages/e2e-test-utils-playwright/src/test.ts
@@ -60,7 +60,12 @@ function observeConsoleLogging( message: ConsoleMessage ) {
 	// See: https://core.trac.wordpress.org/ticket/37000
 	// See: https://www.chromestatus.com/feature/5088147346030592
 	// See: https://www.chromestatus.com/feature/5633521622188032
-	if ( text.includes( 'A cookie associated with a cross-site resource' ) ) {
+	if (
+		text.includes( 'A cookie associated with a cross-site resource' ) ||
+		text.includes(
+			'https://developer.mozilla.org/docs/Web/HTTP/Headers/Set-Cookie/SameSite'
+		)
+	) {
 		return;
 	}
 
@@ -93,6 +98,18 @@ function observeConsoleLogging( message: ConsoleMessage ) {
 		return;
 	}
 
+	// https://bugzilla.mozilla.org/show_bug.cgi?id=1404468
+	if (
+		text.includes( 'Layout was forced before the page was fully loaded' )
+	) {
+		return;
+	}
+
+	// Deprecated warnings coming from the third-party libraries.
+	if ( text.includes( 'MouseEvent.moz' ) ) {
+		return;
+	}
+
 	const logFunction =
 		type as ( typeof OBSERVED_CONSOLE_MESSAGE_TYPES )[ number ];
 
@@ -100,7 +117,6 @@ function observeConsoleLogging( message: ConsoleMessage ) {
 	// which, unless the test explicitly anticipates the logging via
 	// @wordpress/jest-console matchers, will cause the intended test
 	// failure.
-
 	// eslint-disable-next-line no-console
 	console[ logFunction ]( text );
 }
diff --git a/packages/e2e-test-utils-playwright/tsconfig.json b/packages/e2e-test-utils-playwright/tsconfig.json
index 5c8c8af8487ed4..5e52bb94f706d9 100644
--- a/packages/e2e-test-utils-playwright/tsconfig.json
+++ b/packages/e2e-test-utils-playwright/tsconfig.json
@@ -1,9 +1,10 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"incremental": false,
 		"composite": false,
-		"module": "CommonJS",
+		"module": "Node16",
 		"moduleResolution": "node16",
 		"types": [ "node" ],
 		"rootDir": "src",
@@ -17,10 +18,5 @@
 		"allowJs": true,
 		"checkJs": false
 	},
-	"references": [
-		{ "path": "../api-fetch" },
-		{ "path": "../keycodes" },
-		{ "path": "../url" }
-	],
 	"include": [ "src/**/*" ]
 }
diff --git a/packages/e2e-test-utils/.npmrc b/packages/e2e-test-utils/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/e2e-test-utils/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/e2e-test-utils/CHANGELOG.md b/packages/e2e-test-utils/CHANGELOG.md
index e22c44b53f7db3..84e4d4d564d659 100644
--- a/packages/e2e-test-utils/CHANGELOG.md
+++ b/packages/e2e-test-utils/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 11.10.0 (2024-10-16)
+
+## 11.9.0 (2024-10-03)
+
+## 11.8.0 (2024-09-19)
+
+## 11.7.0 (2024-09-05)
+
+## 11.6.0 (2024-08-21)
+
+## 11.5.0 (2024-08-07)
+
+## 11.4.0 (2024-07-24)
+
+## 11.3.0 (2024-07-10)
+
+## 11.2.0 (2024-06-26)
+
+## 11.1.0 (2024-06-15)
+
+## 11.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 10.29.0 (2024-05-16)
+
+## 10.28.0 (2024-05-02)
+
+## 10.27.0 (2024-04-19)
+
+## 10.26.0 (2024-04-03)
+
+## 10.25.0 (2024-03-21)
+
+## 10.24.0 (2024-03-06)
+
+## 10.23.0 (2024-02-21)
+
+## 10.22.0 (2024-02-09)
+
+## 10.21.0 (2024-01-24)
+
+## 10.20.0 (2024-01-10)
+
+## 10.19.0 (2023-12-13)
+
 ## 10.18.0 (2023-11-29)
 
 ## 10.17.0 (2023-11-16)
@@ -14,11 +62,11 @@
 
 ## 10.13.0 (2023-09-20)
 
-### Enhancement
+### Enhancements
 
--    Update promise order in `loginUser` to avoid any flakiness in the tests.
--    Update `activateTheme` to redirect to `themes.php` after theme activation, if theme redirects to some other page.
--    Update `activatePlugin` to redirect to `plugins.php` after plugin activation, if plugin redirects to some other page.
+-   Update promise order in `loginUser` to avoid any flakiness in the tests.
+-   Update `activateTheme` to redirect to `themes.php` after theme activation, if theme redirects to some other page.
+-   Update `activatePlugin` to redirect to `plugins.php` after plugin activation, if plugin redirects to some other page.
 
 ## 10.12.0 (2023-08-31)
 
@@ -48,7 +96,7 @@
 
 ### Breaking Changes
 
--  Started requiring Jest v29 instead of v27 as a peer dependency. See [breaking changes in Jest 28](https://jestjs.io/blog/2022/04/25/jest-28) and [in jest 29](https://jestjs.io/blog/2022/08/25/jest-29) ([#47388](https://github.com/WordPress/gutenberg/pull/47388))
+-   Started requiring Jest v29 instead of v27 as a peer dependency. See [breaking changes in Jest 28](https://jestjs.io/blog/2022/04/25/jest-28) and [in jest 29](https://jestjs.io/blog/2022/08/25/jest-29) ([#47388](https://github.com/WordPress/gutenberg/pull/47388))
 
 ## 9.5.0 (2023-03-01)
 
@@ -62,7 +110,7 @@
 
 ## 9.0.0 (2022-12-14)
 
-### Breaking changes
+### Breaking Changes
 
 -   Remove all the site editor navigation panel related utils: getSiteEditorMenuItem, isSiteEditorRoot, navigateSiteEditorBack, navigateSiteEditorBackToRoot, openSiteEditorNavigationPanel, siteEditorNavigateSequence, clickSiteEditorMenuItem, closeSiteEditorNavigationPanel.
 
@@ -82,13 +130,13 @@
 
 ## 8.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
 ## 7.2.0 (2022-04-08)
 
-### Enhancement
+### Enhancements
 
 -   Changed `setOption` to use `options.php`, to allow setting any option (and to be more consistent with `getOption`). [#39502](https://github.com/WordPress/gutenberg/pull/39502)
 -   Changed `setOption` to return the changed setting's previous value (to make restoring it easier). [#39502](https://github.com/WordPress/gutenberg/pull/39502)
@@ -100,7 +148,7 @@
 
 -   Updated `clickMenuItem` method to use exact label matching instead of partial [#39274](https://github.com/WordPress/gutenberg/pull/39274).
 
-### Enhancement
+### Enhancements
 
 -   The `toggleMoreMenu` and `clickMoreMenuItem` utilities no longer require a second 'context' parameter.
 
@@ -165,7 +213,7 @@
 
 -   The disableNavigationMode utility was removed. By default, the editor is in edit mode now.
 
-### Improvements
+### Enhancements
 
 -   `setBrowserViewport` accepts an object of `width`, `height` values, to assign a viewport of arbitrary size.
 
@@ -177,7 +225,7 @@
 
 ## 2.0.0 (2019-05-21)
 
-### Requirements
+### Breaking Changes
 
 -   The minimum version of Gutenberg `5.6.0` or the minimum version of WordPress `5.2.0`.
 
@@ -194,7 +242,7 @@
 -   New Function: `openAllBlockInserterCategories` - Opens all block inserter categories.
 -   New Function: `getAllBlockInserterItemTitles` - Opens the global block inserter.
 
-### Requirements
+### Breaking Changes
 
 -   The minimum version of Gutenberg `5.3.0` or the minimum version of WordPress `5.2.0`.
 
@@ -202,8 +250,4 @@
 
 ### New Features
 
--   Initial release.
-
-### Requirements
-
--   The minimum version of Gutenberg `5.2.0` or the minimum version of WordPress `5.2.0`.
+-   Initial release. The minimum version of Gutenberg `5.2.0` or the minimum version of WordPress `5.2.0`.
diff --git a/packages/e2e-test-utils/README.md b/packages/e2e-test-utils/README.md
index bce7c84d73716d..196768b0e2487c 100644
--- a/packages/e2e-test-utils/README.md
+++ b/packages/e2e-test-utils/README.md
@@ -14,7 +14,7 @@ Install the module
 npm install @wordpress/e2e-test-utils --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## API
 
diff --git a/packages/e2e-test-utils/package.json b/packages/e2e-test-utils/package.json
index 3927c478a3433c..ca116dd0264a71 100644
--- a/packages/e2e-test-utils/package.json
+++ b/packages/e2e-test-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils",
-	"version": "10.18.0",
+	"version": "11.10.0",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"build",
@@ -29,13 +30,13 @@
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/url": "file:../url",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/url": "*",
 		"change-case": "^4.1.2",
 		"form-data": "^4.0.0",
-		"node-fetch": "^2.6.0"
+		"node-fetch": "2.7.0"
 	},
 	"peerDependencies": {
 		"jest": ">=29",
diff --git a/packages/e2e-test-utils/src/are-pre-publish-checks-enabled.js b/packages/e2e-test-utils/src/are-pre-publish-checks-enabled.js
index 9d8eaf38f3ffd6..0b0d18042aa6ce 100644
--- a/packages/e2e-test-utils/src/are-pre-publish-checks-enabled.js
+++ b/packages/e2e-test-utils/src/are-pre-publish-checks-enabled.js
@@ -9,5 +9,5 @@ import { wpDataSelect } from './wp-data-select';
  * @return {Promise<boolean>} Boolean which represents the state of prepublish checks.
  */
 export async function arePrePublishChecksEnabled() {
-	return wpDataSelect( 'core/editor', 'isPublishSidebarEnabled' );
+	return wpDataSelect( 'core', 'isPublishSidebarEnabled' );
 }
diff --git a/packages/e2e-test-utils/src/disable-pre-publish-checks.js b/packages/e2e-test-utils/src/disable-pre-publish-checks.js
index 25660e48c9555d..a3a80effbde643 100644
--- a/packages/e2e-test-utils/src/disable-pre-publish-checks.js
+++ b/packages/e2e-test-utils/src/disable-pre-publish-checks.js
@@ -10,7 +10,7 @@ import { toggleMoreMenu } from './toggle-more-menu';
 export async function disablePrePublishChecks() {
 	await togglePreferencesOption(
 		'General',
-		'Enable pre-publish flow',
+		'Enable pre-publish checks',
 		false
 	);
 	await toggleMoreMenu( 'close' );
diff --git a/packages/e2e-test-utils/src/enable-pre-publish-checks.js b/packages/e2e-test-utils/src/enable-pre-publish-checks.js
index 5a65ba6fc1353d..817e2414b09405 100644
--- a/packages/e2e-test-utils/src/enable-pre-publish-checks.js
+++ b/packages/e2e-test-utils/src/enable-pre-publish-checks.js
@@ -8,6 +8,10 @@ import { toggleMoreMenu } from './toggle-more-menu';
  * Enables Pre-publish checks.
  */
 export async function enablePrePublishChecks() {
-	await togglePreferencesOption( 'General', 'Enable pre-publish flow', true );
+	await togglePreferencesOption(
+		'General',
+		'Enable pre-publish checks',
+		true
+	);
 	await toggleMoreMenu( 'close' );
 }
diff --git a/packages/e2e-test-utils/src/ensure-sidebar-opened.js b/packages/e2e-test-utils/src/ensure-sidebar-opened.js
index 5ea99c629c15ef..95c674e980643a 100644
--- a/packages/e2e-test-utils/src/ensure-sidebar-opened.js
+++ b/packages/e2e-test-utils/src/ensure-sidebar-opened.js
@@ -8,7 +8,8 @@ export async function ensureSidebarOpened() {
 		'.edit-post-header__settings [aria-label="Settings"][aria-expanded="false"],' +
 			'.edit-site-header__actions [aria-label="Settings"][aria-expanded="false"],' +
 			'.edit-widgets-header__actions [aria-label="Settings"][aria-expanded="false"],' +
-			'.edit-site-header-edit-mode__actions [aria-label="Settings"][aria-expanded="false"]'
+			'.edit-site-header-edit-mode__actions [aria-label="Settings"][aria-expanded="false"],' +
+			'.editor-header__settings [aria-label="Settings"][aria-expanded="false"]'
 	);
 
 	if ( toggleSidebarButton ) {
diff --git a/packages/e2e-test-utils/src/find-sidebar-panel-toggle-button-with-title.js b/packages/e2e-test-utils/src/find-sidebar-panel-toggle-button-with-title.js
index 3faff193ba7ece..bbd838c0cc583f 100644
--- a/packages/e2e-test-utils/src/find-sidebar-panel-toggle-button-with-title.js
+++ b/packages/e2e-test-utils/src/find-sidebar-panel-toggle-button-with-title.js
@@ -9,7 +9,7 @@
  */
 export async function findSidebarPanelToggleButtonWithTitle( panelTitle ) {
 	const buttons = await page.$x(
-		`//div[contains(@class,"edit-post-sidebar")]//button[@class="components-button components-panel__body-toggle"][contains(text(),"${ panelTitle }")]`
+		`//div[contains(@class,"editor-sidebar")]//button[@class="components-button components-panel__body-toggle"][contains(text(),"${ panelTitle }")]`
 	);
 	return buttons[ 0 ];
 }
diff --git a/packages/e2e-test-utils/src/find-sidebar-panel-with-title.js b/packages/e2e-test-utils/src/find-sidebar-panel-with-title.js
index 9c29081260a008..989912c6851252 100644
--- a/packages/e2e-test-utils/src/find-sidebar-panel-with-title.js
+++ b/packages/e2e-test-utils/src/find-sidebar-panel-with-title.js
@@ -8,7 +8,7 @@
  * @return {Promise<ElementHandle|undefined>} Object that represents an in-page DOM element.
  */
 export async function findSidebarPanelWithTitle( panelTitle ) {
-	const panelToggleSelector = `//div[contains(@class, "edit-post-sidebar")]//button[contains(@class, "components-panel__body-toggle") and contains(text(),"${ panelTitle }")]`;
+	const panelToggleSelector = `//div[contains(@class, "editor-sidebar")]//button[contains(@class, "components-panel__body-toggle") and contains(text(),"${ panelTitle }")]`;
 	const panelSelector = `${ panelToggleSelector }/ancestor::*[contains(concat(" ", @class, " "), " components-panel__body ")]`;
 	return await page.waitForXPath( panelSelector );
 }
diff --git a/packages/e2e-test-utils/src/inserter.js b/packages/e2e-test-utils/src/inserter.js
index ebbda244d18564..90ea39b49f00d6 100644
--- a/packages/e2e-test-utils/src/inserter.js
+++ b/packages/e2e-test-utils/src/inserter.js
@@ -49,11 +49,12 @@ async function isGlobalInserterOpen() {
 		return !! document.querySelector(
 			'.edit-post-header [aria-label="Add block"].is-pressed,' +
 				'.edit-site-header-edit-mode [aria-label="Add block"].is-pressed,' +
-				'.edit-post-header [aria-label="Toggle block inserter"].is-pressed,' +
-				'.edit-site-header [aria-label="Toggle block inserter"].is-pressed,' +
-				'.edit-widgets-header [aria-label="Toggle block inserter"].is-pressed,' +
+				'.edit-post-header [aria-label="Block Inserter"].is-pressed,' +
+				'.edit-site-header [aria-label="Block Inserter"].is-pressed,' +
+				'.edit-widgets-header [aria-label="Block Inserter"].is-pressed,' +
 				'.edit-widgets-header [aria-label="Add block"].is-pressed,' +
-				'.edit-site-header-edit-mode__inserter-toggle.is-pressed'
+				'.edit-site-header-edit-mode__inserter-toggle.is-pressed,' +
+				'.editor-header [aria-label="Block Inserter"].is-pressed'
 		);
 	} );
 }
@@ -64,12 +65,13 @@ export async function toggleGlobalBlockInserter() {
 	// "Add block" selector is required to make sure performance comparison
 	// doesn't fail on older branches where we still had "Add block" as label.
 	await page.click(
-		'.edit-post-header [aria-label="Add block"],' +
+		'.editor-document-tools__inserter-toggle,' +
+			'.edit-post-header [aria-label="Add block"],' +
 			'.edit-site-header [aria-label="Add block"],' +
-			'.edit-post-header [aria-label="Toggle block inserter"],' +
-			'.edit-site-header [aria-label="Toggle block inserter"],' +
+			'.edit-post-header [aria-label="Block Inserter"],' +
+			'.edit-site-header [aria-label="Block Inserter"],' +
 			'.edit-widgets-header [aria-label="Add block"],' +
-			'.edit-widgets-header [aria-label="Toggle block inserter"],' +
+			'.edit-widgets-header [aria-label="Block Inserter"],' +
 			'.edit-site-header-edit-mode__inserter-toggle'
 	);
 }
@@ -86,7 +88,10 @@ export async function selectGlobalInserterTab( label ) {
 	}
 
 	const activeTab = await page.waitForSelector(
-		'.block-editor-inserter__tabs button.is-active'
+		// Targeting a class name is necessary here, because there are likely
+		// two implementations of the `Tabs` component visible to this test, and
+		// we want to confirm that it's waiting for the correct one.
+		'.block-editor-inserter__tabs [role="tab"][aria-selected="true"]'
 	);
 
 	const activeTabLabel = await page.evaluate(
diff --git a/packages/e2e-test-utils/src/list-view.js b/packages/e2e-test-utils/src/list-view.js
index f02b5d1729dccd..21861d023a9f90 100644
--- a/packages/e2e-test-utils/src/list-view.js
+++ b/packages/e2e-test-utils/src/list-view.js
@@ -1,7 +1,7 @@
 async function toggleListView() {
 	// selector .edit-post-header-toolbar__list-view-toggle is still required because the performance tests also execute against older versions that still use that selector.
 	await page.click(
-		'.edit-post-header-toolbar__document-overview-toggle, .edit-post-header-toolbar__list-view-toggle, .edit-site-header-edit-mode__list-view-toggle, .edit-widgets-header-toolbar__list-view-toggle'
+		'.edit-post-header-toolbar__document-overview-toggle, .edit-post-header-toolbar__list-view-toggle, .edit-site-header-edit-mode__list-view-toggle, .edit-widgets-header-toolbar__list-view-toggle, editor-document-tools__document-overview-toggle'
 	);
 }
 
@@ -9,7 +9,7 @@ export async function isListViewOpen() {
 	return await page.evaluate( () => {
 		// selector .edit-post-header-toolbar__list-view-toggle is still required because the performance tests also execute against older versions that still use that selector.
 		return !! document.querySelector(
-			'.edit-post-header-toolbar__document-overview-toggle.is-pressed, .edit-post-header-toolbar__list-view-toggle.is-pressed, .edit-site-header-edit-mode__list-view-toggle.is-pressed, .edit-widgets-header-toolbar__list-view-toggle.is-pressed'
+			'.edit-post-header-toolbar__document-overview-toggle.is-pressed, .edit-post-header-toolbar__list-view-toggle.is-pressed, .edit-site-header-edit-mode__list-view-toggle.is-pressed, .edit-widgets-header-toolbar__list-view-toggle.is-pressed, editor-document-tools__document-overview-toggle.is-pressed'
 		);
 	} );
 }
diff --git a/packages/e2e-test-utils/src/open-document-settings-sidebar.js b/packages/e2e-test-utils/src/open-document-settings-sidebar.js
index 8d50c8c74b996a..3e607897af6930 100644
--- a/packages/e2e-test-utils/src/open-document-settings-sidebar.js
+++ b/packages/e2e-test-utils/src/open-document-settings-sidebar.js
@@ -13,6 +13,6 @@ export async function openDocumentSettingsSidebar() {
 
 	if ( isClosed ) {
 		await toggleButton.click();
-		await page.waitForSelector( '.edit-post-sidebar' );
+		await page.waitForSelector( '.editor-sidebar' );
 	}
 }
diff --git a/packages/e2e-test-utils/src/preview.js b/packages/e2e-test-utils/src/preview.js
index 1d96eda1766751..24c5dc69dd0e2e 100644
--- a/packages/e2e-test-utils/src/preview.js
+++ b/packages/e2e-test-utils/src/preview.js
@@ -10,13 +10,13 @@ export async function openPreviewPage( editorPage = page ) {
 	let openTabs = await browser.pages();
 	const expectedTabsCount = openTabs.length + 1;
 	await page.waitForSelector(
-		'.block-editor-post-preview__button-toggle:not([disabled])'
+		'.editor-preview-dropdown__toggle:not([disabled])'
 	);
-	await editorPage.click( '.block-editor-post-preview__button-toggle' );
+	await editorPage.click( '.editor-preview-dropdown__toggle' );
 	await editorPage.waitForSelector(
-		'.edit-post-header-preview__button-external'
+		'.editor-preview-dropdown__button-external'
 	);
-	await editorPage.click( '.edit-post-header-preview__button-external' );
+	await editorPage.click( '.editor-preview-dropdown__button-external' );
 
 	// Wait for the new tab to open.
 	while ( openTabs.length < expectedTabsCount ) {
diff --git a/packages/e2e-test-utils/src/site-editor.js b/packages/e2e-test-utils/src/site-editor.js
index 02c3d05f74cc16..98ba34f7db4f51 100644
--- a/packages/e2e-test-utils/src/site-editor.js
+++ b/packages/e2e-test-utils/src/site-editor.js
@@ -97,9 +97,7 @@ export async function visitSiteEditor( query, skipWelcomeGuide = true ) {
  * Toggles the global styles sidebar (opens it if closed and closes it if open).
  */
 export async function toggleGlobalStyles() {
-	await page.click(
-		'.edit-site-header-edit-mode__actions button[aria-label="Styles"]'
-	);
+	await page.click( '.editor-header__settings button[aria-label="Styles"]' );
 }
 
 /**
@@ -117,7 +115,7 @@ export async function openGlobalStylesPanel( panelName ) {
  */
 export async function openPreviousGlobalStylesPanel() {
 	await page.click(
-		'div[aria-label="Editor settings"] button[aria-label="Navigate to the previous view"]'
+		'div[aria-label="Editor settings"] button[aria-label="Back"]'
 	);
 }
 
diff --git a/packages/e2e-tests/.npmrc b/packages/e2e-tests/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/e2e-tests/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md
index 2543ddb4cb12e2..9268bec00239f9 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/CHANGELOG.md
@@ -2,6 +2,55 @@
 
 ## Unreleased
 
+## 8.10.0 (2024-10-16)
+
+## 8.9.0 (2024-10-03)
+
+## 8.8.0 (2024-09-19)
+
+## 8.7.0 (2024-09-05)
+
+## 8.6.0 (2024-08-21)
+
+## 8.5.0 (2024-08-07)
+
+## 8.4.0 (2024-07-24)
+
+## 8.3.0 (2024-07-10)
+
+## 8.2.0 (2024-06-26)
+
+## 8.1.0 (2024-06-15)
+
+## 8.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 7.29.0 (2024-05-16)
+
+## 7.28.0 (2024-05-02)
+
+## 7.27.0 (2024-04-19)
+
+## 7.26.0 (2024-04-03)
+
+## 7.25.0 (2024-03-21)
+
+## 7.24.0 (2024-03-06)
+
+## 7.23.0 (2024-02-21)
+
+## 7.22.0 (2024-02-09)
+
+## 7.21.0 (2024-01-24)
+
+## 7.20.0 (2024-01-10)
+
+## 7.19.0 (2023-12-13)
+
 ## 7.18.0 (2023-11-29)
 
 ## 7.17.0 (2023-11-16)
@@ -42,7 +91,7 @@
 
 ### Breaking Changes
 
--  Started requiring Jest v29 instead of v27 as a peer dependency. See [breaking changes in Jest 28](https://jestjs.io/blog/2022/04/25/jest-28) and [in jest 29](https://jestjs.io/blog/2022/08/25/jest-29) ([#47388](https://github.com/WordPress/gutenberg/pull/47388))
+-   Started requiring Jest v29 instead of v27 as a peer dependency. See [breaking changes in Jest 28](https://jestjs.io/blog/2022/04/25/jest-28) and [in jest 29](https://jestjs.io/blog/2022/08/25/jest-29) ([#47388](https://github.com/WordPress/gutenberg/pull/47388))
 
 ## 6.5.0 (2023-03-01)
 
@@ -68,7 +117,7 @@
 
 ## 5.3.0 (2022-10-05)
 
-### New features
+### New Features
 
 -   Added Autocomplete Component e2e test suite. [#42905](https://github.com/WordPress/gutenberg/pull/42905).
 
@@ -76,7 +125,7 @@
 
 ## 5.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -127,7 +176,7 @@
 
 ## 1.2.0 (2019-05-21)
 
-### New features
+### New Features
 
 -   Added Axe (the Accessibility Engine) API integration with e2e tests suite.
 
diff --git a/packages/e2e-tests/README.md b/packages/e2e-tests/README.md
index 8629700263ebe7..75283a3d9ecc82 100644
--- a/packages/e2e-tests/README.md
+++ b/packages/e2e-tests/README.md
@@ -80,7 +80,7 @@ Debugging in a Chrome browser can be replaced with `vscode`'s debugger by adding
 
 This will run jest, targetting the spec file currently open in the editor. `vscode`'s debugger can now be used to add breakpoints and inspect tests as you would in Chrome DevTools.
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Contributing to this package
 
diff --git a/packages/e2e-tests/config/is-gutenberg-plugin.js b/packages/e2e-tests/config/is-gutenberg-plugin.js
index d03b70b3ec11a3..5cfe3ada705df2 100644
--- a/packages/e2e-tests/config/is-gutenberg-plugin.js
+++ b/packages/e2e-tests/config/is-gutenberg-plugin.js
@@ -1,6 +1,3 @@
-global.process.env = {
-	...global.process.env,
-	// Inject the `IS_GUTENBERG_PLUGIN` global, used for feature flagging.
-	// eslint-disable-next-line @wordpress/is-gutenberg-plugin
-	IS_GUTENBERG_PLUGIN: process.env.npm_package_config_IS_GUTENBERG_PLUGIN,
-};
+// eslint-disable-next-line @wordpress/wp-global-usage
+globalThis.IS_GUTENBERG_PLUGIN =
+	process.env.npm_package_config_IS_GUTENBERG_PLUGIN === 'true';
diff --git a/packages/e2e-tests/jest.config.js b/packages/e2e-tests/jest.config.js
index 0800a62e4869c5..c20e9ba7bcda11 100644
--- a/packages/e2e-tests/jest.config.js
+++ b/packages/e2e-tests/jest.config.js
@@ -12,7 +12,6 @@ module.exports = {
 		'@wordpress/jest-console',
 		'@wordpress/jest-puppeteer-axe',
 		'expect-puppeteer',
-		'puppeteer-testing-library/extend-expect',
 	],
 	testPathIgnorePatterns: [ '/node_modules/' ],
 	snapshotFormat: {
diff --git a/packages/e2e-tests/mu-plugins/server-timing.php b/packages/e2e-tests/mu-plugins/server-timing.php
new file mode 100644
index 00000000000000..84771f980ff7fc
--- /dev/null
+++ b/packages/e2e-tests/mu-plugins/server-timing.php
@@ -0,0 +1,91 @@
+<?php
+
+add_filter(
+	'template_include',
+	static function ( $template ) {
+
+		global $timestart, $wpdb;
+
+		$server_timing_values = array();
+		$template_start       = microtime( true );
+
+		$server_timing_values['wpBeforeTemplate'] = $template_start - $timestart;
+
+		ob_start();
+
+		add_action(
+			'shutdown',
+			static function () use ( $server_timing_values, $template_start, $wpdb ) {
+				$output = ob_get_clean();
+
+				$server_timing_values['wpTemplate'] = microtime( true ) - $template_start;
+
+				$server_timing_values['wpTotal'] = $server_timing_values['wpBeforeTemplate'] + $server_timing_values['wpTemplate'];
+
+				/*
+				 * While values passed via Server-Timing are intended to be durations,
+				 * any numeric value can actually be passed.
+				 * This is a nice little trick as it allows to easily get this information in JS.
+				 */
+				$server_timing_values['wpMemoryUsage'] = memory_get_usage();
+				$server_timing_values['wpDbQueries']   = $wpdb->num_queries;
+
+				$header_values = array();
+				foreach ( $server_timing_values as $slug => $value ) {
+					if ( is_float( $value ) ) {
+						$value = round( $value * 1000.0, 2 );
+					}
+					$header_values[] = sprintf( '%1$s;dur=%2$s', $slug, $value );
+				}
+				header( 'Server-Timing: ' . implode( ', ', $header_values ) );
+
+				echo $output;
+			},
+			PHP_INT_MIN
+		);
+
+		return $template;
+	},
+	PHP_INT_MAX
+);
+
+add_action(
+	'admin_init',
+	static function () {
+		global $timestart, $wpdb;
+
+		ob_start();
+
+		add_action(
+			'shutdown',
+			static function () use ( $wpdb, $timestart ) {
+				$output = ob_get_clean();
+
+				$server_timing_values = array();
+
+				$server_timing_values['wpTotal'] = microtime( true ) - $timestart;
+
+				/*
+				 * While values passed via Server-Timing are intended to be durations,
+				 * any numeric value can actually be passed.
+				 * This is a nice little trick as it allows to easily get this information in JS.
+				 */
+				$server_timing_values['wpMemoryUsage'] = memory_get_usage();
+				$server_timing_values['wpDbQueries']   = $wpdb->num_queries;
+
+				$header_values = array();
+				foreach ( $server_timing_values as $slug => $value ) {
+					if ( is_float( $value ) ) {
+						$value = round( $value * 1000.0, 2 );
+					}
+					$header_values[] = sprintf( '%1$s;dur=%2$s', $slug, $value );
+				}
+				header( 'Server-Timing: ' . implode( ', ', $header_values ) );
+
+				echo $output;
+			},
+			PHP_INT_MIN
+		);
+	},
+	PHP_INT_MAX
+);
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 7327336b19b9b3..5bf2b5c8663ac7 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "7.18.0",
+	"version": "8.10.1",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,21 +20,22 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"dependencies": {
-		"@wordpress/e2e-test-utils": "file:../e2e-test-utils",
-		"@wordpress/interactivity": "file:../interactivity",
-		"@wordpress/jest-console": "file:../jest-console",
-		"@wordpress/jest-puppeteer-axe": "file:../jest-puppeteer-axe",
-		"@wordpress/scripts": "file:../scripts",
-		"@wordpress/url": "file:../url",
+		"@wordpress/e2e-test-utils": "*",
+		"@wordpress/interactivity": "*",
+		"@wordpress/interactivity-router": "*",
+		"@wordpress/jest-console": "*",
+		"@wordpress/jest-puppeteer-axe": "*",
+		"@wordpress/scripts": "*",
+		"@wordpress/url": "*",
 		"chalk": "^4.0.0",
 		"expect-puppeteer": "^4.4.0",
 		"filenamify": "^4.2.0",
 		"jest-message-util": "^29.6.2",
 		"jest-snapshot": "^29.6.2",
-		"puppeteer-testing-library": "^0.5.0",
 		"uuid": "^9.0.1"
 	},
 	"peerDependencies": {
diff --git a/packages/e2e-tests/plugins/block-bindings.php b/packages/e2e-tests/plugins/block-bindings.php
new file mode 100644
index 00000000000000..b86673c2c523d0
--- /dev/null
+++ b/packages/e2e-tests/plugins/block-bindings.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * Plugin Name: Gutenberg Test Block Bindings
+ * Plugin URI: https://github.com/WordPress/gutenberg
+ * Author: Gutenberg Team
+ *
+ * @package gutenberg-test-block-bindings
+ */
+
+/**
+ * Code necessary for testing block bindings:
+ * - Enqueues a custom script to register sources in the client.
+ * - Registers sources in the server.
+ * - Registers a custom post type and custom fields.
+ */
+function gutenberg_test_block_bindings_registration() {
+	// Define fields list.
+	$upload_dir  = wp_upload_dir();
+	$testing_url = $upload_dir['url'] . '/1024x768_e2e_test_image_size.jpeg';
+	$fields_list = array(
+		'text_field'  => array(
+			'label' => 'Text Field Label',
+			'value' => 'Text Field Value',
+			'type'  => 'string',
+		),
+		'url_field'   => array(
+			'label' => 'URL Field Label',
+			'value' => $testing_url,
+			'type'  => 'string',
+		),
+		'empty_field' => array(
+			'label' => 'Empty Field Label',
+			'value' => '',
+			'type'  => 'string',
+		),
+	);
+
+	// Enqueue a custom script for the plugin.
+	wp_enqueue_script(
+		'gutenberg-test-block-bindings',
+		plugins_url( 'block-bindings/index.js', __FILE__ ),
+		array(
+			'wp-blocks',
+			'wp-private-apis',
+		),
+		filemtime( plugin_dir_path( __FILE__ ) . 'block-bindings/index.js' ),
+		true
+	);
+
+	// Pass data to the script.
+	wp_localize_script(
+		'gutenberg-test-block-bindings',
+		'testingBindings',
+		array(
+			'fieldsList' => $fields_list,
+		)
+	);
+
+	// Register custom block bindings sources.
+	register_block_bindings_source(
+		'testing/complete-source',
+		array(
+			'label'              => 'Complete Source',
+			'get_value_callback' => function ( $source_args ) use ( $fields_list ) {
+				if ( ! isset( $source_args['key'] ) || ! isset( $fields_list[ $source_args['key'] ] ) ) {
+					return null;
+				}
+				return $fields_list[ $source_args['key'] ]['value']; },
+		)
+	);
+	register_block_bindings_source(
+		'testing/server-only-source',
+		array(
+			'label'              => 'Server Source',
+			'get_value_callback' => function () {},
+		)
+	);
+
+	// Register "movie" custom post type.
+	register_post_type(
+		'movie',
+		array(
+			'label'        => 'Movie',
+			'public'       => true,
+			'supports'     => array( 'title', 'editor', 'comments', 'revisions', 'trackbacks', 'author', 'excerpt', 'page-attributes', 'thumbnail', 'custom-fields', 'post-formats' ),
+			'has_archive'  => true,
+			'show_in_rest' => true,
+		)
+	);
+
+	// Register global custom fields.
+	register_meta(
+		'post',
+		'text_custom_field',
+		array(
+			'default'      => 'Value of the text custom field',
+			'show_in_rest' => true,
+			'single'       => true,
+			'type'         => 'string',
+		)
+	);
+	register_meta(
+		'post',
+		'url_custom_field',
+		array(
+			'default'      => '#url-custom-field',
+			'show_in_rest' => true,
+			'single'       => true,
+			'type'         => 'string',
+		)
+	);
+	// Register different types of custom fields for testing.
+	register_meta(
+		'post',
+		'string_custom_field',
+		array(
+			'label'        => 'String custom field',
+			'default'      => '',
+			'show_in_rest' => true,
+			'single'       => true,
+			'type'         => 'string',
+		)
+	);
+	register_meta(
+		'post',
+		'object_custom_field',
+		array(
+			'label'        => 'Object custom field',
+			'show_in_rest' => array(
+				'schema' => array(
+					'type'       => 'object',
+					'properties' => array(
+						'foo' => array(
+							'type' => 'string',
+						),
+					),
+				),
+			),
+			'single'       => true,
+			'type'         => 'object',
+		)
+	);
+	register_meta(
+		'post',
+		'array_custom_field',
+		array(
+			'label'        => 'Array custom field',
+			'show_in_rest' => array(
+				'schema' => array(
+					'type'  => 'array',
+					'items' => array(
+						'type' => 'string',
+					),
+				),
+			),
+			'single'       => true,
+			'type'         => 'array',
+			'default'      => array(),
+		)
+	);
+	register_meta(
+		'post',
+		'number',
+		array(
+			'label'        => 'Number custom field',
+			'type'         => 'number',
+			'show_in_rest' => true,
+			'single'       => true,
+			'default'      => 5.5,
+		)
+	);
+	register_meta(
+		'post',
+		'integer',
+		array(
+			'label'        => 'Integer custom field',
+			'type'         => 'integer',
+			'show_in_rest' => true,
+			'single'       => true,
+			'default'      => 5,
+		)
+	);
+	register_meta(
+		'post',
+		'boolean',
+		array(
+			'label'        => 'Boolean custom field',
+			'type'         => 'boolean',
+			'show_in_rest' => true,
+			'single'       => true,
+			'default'      => true,
+		)
+	);
+
+	// Register CPT custom fields.
+	register_meta(
+		'post',
+		'movie_field',
+		array(
+			'label'          => 'Movie field label',
+			'default'        => 'Movie field default value',
+			'object_subtype' => 'movie',
+			'show_in_rest'   => true,
+			'single'         => true,
+			'type'           => 'string',
+		)
+	);
+	register_meta(
+		'post',
+		'field_with_only_label',
+		array(
+			'label'          => 'Field with only label',
+			'object_subtype' => 'movie',
+			'show_in_rest'   => true,
+			'single'         => true,
+			'type'           => 'string',
+		)
+	);
+	register_meta(
+		'post',
+		'field_without_label_or_default',
+		array(
+			'object_subtype' => 'movie',
+			'show_in_rest'   => true,
+			'single'         => true,
+			'type'           => 'string',
+		)
+	);
+	register_meta(
+		'post',
+		'_protected_field',
+		array(
+			'default'        => 'Protected field value',
+			'object_subtype' => 'movie',
+			'show_in_rest'   => true,
+			'single'         => true,
+			'type'           => 'string',
+		)
+	);
+	register_meta(
+		'post',
+		'show_in_rest_false_field',
+		array(
+			'default'        => 'show_in_rest false field value',
+			'object_subtype' => 'movie',
+			'show_in_rest'   => false,
+			'single'         => true,
+			'type'           => 'string',
+		)
+	);
+}
+add_action( 'init', 'gutenberg_test_block_bindings_registration' );
diff --git a/packages/e2e-tests/plugins/block-bindings/index.js b/packages/e2e-tests/plugins/block-bindings/index.js
new file mode 100644
index 00000000000000..5c364257caed19
--- /dev/null
+++ b/packages/e2e-tests/plugins/block-bindings/index.js
@@ -0,0 +1,48 @@
+const { registerBlockBindingsSource } = wp.blocks;
+const { fieldsList } = window.testingBindings || {};
+
+const getValues = ( { bindings } ) => {
+	const newValues = {};
+	for ( const [ attributeName, source ] of Object.entries( bindings ) ) {
+		newValues[ attributeName ] = fieldsList[ source.args.key ]?.value;
+	}
+	return newValues;
+};
+const setValues = ( { dispatch, bindings } ) => {
+	Object.values( bindings ).forEach( ( { args, newValue } ) => {
+		// Example of what could be done.
+		dispatch( 'core' ).editEntityRecord( 'postType', 'post', 1, {
+			meta: { [ args?.key ]: newValue },
+		} );
+	} );
+};
+
+registerBlockBindingsSource( {
+	name: 'testing/complete-source',
+	getValues,
+	setValues,
+	canUserEditValue: () => true,
+	getFieldsList: () => fieldsList,
+} );
+
+registerBlockBindingsSource( {
+	name: 'testing/can-user-edit-false',
+	label: 'Can User Edit: False',
+	getValues,
+	setValues,
+	canUserEditValue: () => false,
+} );
+
+registerBlockBindingsSource( {
+	name: 'testing/can-user-edit-undefined',
+	label: 'Can User Edit: Undefined',
+	getValues,
+	setValues,
+} );
+
+registerBlockBindingsSource( {
+	name: 'testing/set-values-undefined',
+	label: 'Set Values: Undefined',
+	getValues,
+	canUserEditValue: () => true,
+} );
diff --git a/packages/e2e-tests/plugins/block-template-registration.php b/packages/e2e-tests/plugins/block-template-registration.php
new file mode 100644
index 00000000000000..f93deb19688c4b
--- /dev/null
+++ b/packages/e2e-tests/plugins/block-template-registration.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Plugin Name: Gutenberg Test Block Template Registration
+ * Plugin URI: https://github.com/WordPress/gutenberg
+ * Author: Gutenberg Team
+ *
+ * @package gutenberg-test-block-template-registration
+ */
+
+add_action(
+	'init',
+	function () {
+		// Custom template used by most tests.
+		register_block_template(
+			'gutenberg//plugin-template',
+			array(
+				'title'       => 'Plugin Template',
+				'description' => 'A template registered by a plugin.',
+				'content'     => '<!-- wp:template-part {"slug":"header","tagName":"header"} /--><!-- wp:group {"tagName":"main","layout":{"inherit":true}} --><main class="wp-block-group"><!-- wp:paragraph --><p>This is a plugin-registered template.</p><!-- /wp:paragraph --></main><!-- /wp:group -->',
+				'post_types'  => array( 'post' ),
+			)
+		);
+		add_action(
+			'category_template_hierarchy',
+			function () {
+				return array( 'plugin-template' );
+			}
+		);
+
+		// Custom template overridden by the theme.
+		register_block_template(
+			'gutenberg//custom-template',
+			array(
+				'title'       => 'Custom Template (overridden by the theme)',
+				'description' => 'A custom template registered by a plugin and overridden by a theme.',
+				'content'     => '<!-- wp:template-part {"slug":"header","tagName":"header"} /--><!-- wp:group {"tagName":"main","layout":{"inherit":true}} --><main class="wp-block-group"><!-- wp:paragraph --><p>This is a plugin-registered template and overridden by a theme.</p><!-- /wp:paragraph --></main><!-- /wp:group -->',
+				'post_types'  => array( 'post' ),
+			)
+		);
+
+		// Custom template used to test unregistration.
+		register_block_template(
+			'gutenberg//plugin-unregistered-template',
+			array(
+				'title'       => 'Plugin Unregistered Template',
+				'description' => 'A plugin-registered template that is unregistered.',
+				'content'     => '<!-- wp:template-part {"slug":"header","tagName":"header"} /--><!-- wp:group {"tagName":"main","layout":{"inherit":true}} --><main class="wp-block-group"><!-- wp:paragraph --><p>This is a plugin-registered template that is also unregistered.</p><!-- /wp:paragraph --></main><!-- /wp:group -->',
+			)
+		);
+		unregister_block_template( 'gutenberg//plugin-unregistered-template' );
+
+		// Custom template used to test overriding default WP templates.
+		register_block_template(
+			'gutenberg//page',
+			array(
+				'title'       => 'Plugin Page Template',
+				'description' => 'A plugin-registered page template.',
+				'content'     => '<!-- wp:template-part {"slug":"header","tagName":"header"} /--><!-- wp:group {"tagName":"main","layout":{"inherit":true}} --><main class="wp-block-group"><!-- wp:paragraph --><p>This is a plugin-registered page template.</p><!-- /wp:paragraph --></main><!-- /wp:group -->',
+			)
+		);
+
+		// Custom template used to test overriding default WP templates which can be created by the user.
+		register_block_template(
+			'gutenberg//author-admin',
+			array(
+				'title'       => 'Plugin Author Template',
+				'description' => 'A plugin-registered author template.',
+				'content'     => '<!-- wp:template-part {"slug":"header","tagName":"header"} /--><!-- wp:group {"tagName":"main","layout":{"inherit":true}} --><main class="wp-block-group"><!-- wp:paragraph --><p>This is a plugin-registered author template.</p><!-- /wp:paragraph --></main><!-- /wp:group -->',
+			)
+		);
+	}
+);
diff --git a/packages/e2e-tests/plugins/class-test-widget.php b/packages/e2e-tests/plugins/class-test-widget.php
index 12b1d2f34a6fa4..450c97b1163967 100644
--- a/packages/e2e-tests/plugins/class-test-widget.php
+++ b/packages/e2e-tests/plugins/class-test-widget.php
@@ -56,12 +56,13 @@ public function form( $instance ) {
 	/**
 	 * Handles updating settings for the current widget instance.
 	 *
+	 * @since 4.8.1
+	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
 	 * @param array $old_instance Old settings for this instance.
 	 *
 	 * @return array Settings to save or bool false to cancel saving.
-	 * @since 4.8.1
 	 */
 	// @codingStandardsIgnoreStart – to prevent phpcs from complaining about unused function argument.
 	public function update( $new_instance, $old_instance ) {
diff --git a/packages/e2e-tests/plugins/dataviews.php b/packages/e2e-tests/plugins/dataviews.php
deleted file mode 100644
index 60a611fcae8f12..00000000000000
--- a/packages/e2e-tests/plugins/dataviews.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Plugin Name: Gutenberg Test DataViews
- * Plugin URI: https://github.com/WordPress/gutenberg
- * Author: Gutenberg Team
- *
- * @package gutenberg-test-dataviews
- */
-
-/**
- * Disables the DataViews experiment on plugin deactivation.
- */
-function disable_dataviews_experiment() {
-	update_option( 'gutenberg-experiments', array() );
-}
-
-/**
- * Enables the DataViews experiment.
- */
-function enable_dataviews_experiment() {
-	update_option( 'gutenberg-experiments', array( 'gutenberg-dataviews' => true ) );
-	register_deactivation_hook( __FILE__, 'disable_dataviews_experiment' );
-}
-
-add_action( 'init', 'enable_dataviews_experiment' );
diff --git a/packages/e2e-tests/plugins/delete-installed-fonts.php b/packages/e2e-tests/plugins/delete-installed-fonts.php
new file mode 100644
index 00000000000000..871d19f82e635e
--- /dev/null
+++ b/packages/e2e-tests/plugins/delete-installed-fonts.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Plugin Name: Gutenberg Test Delete Installed Fonts
+ * Plugin URI: https://github.com/WordPress/gutenberg
+ * Author: Gutenberg Team
+ *
+ * @package gutenberg-test-delete-installed-fonts
+ */
+
+/**
+ * Saves a randomly generated temporary font directory to use for e2e tests.
+ */
+function gutenberg_e2e_set_temp_font_dir() {
+	update_option( 'gutenberg_e2e_font_dir', '/e2e_fonts_' . wp_generate_uuid4() );
+}
+register_activation_hook( __FILE__, 'gutenberg_e2e_set_temp_font_dir' );
+
+/**
+ * Uses the randomly generated font directory for the duration of the font tests.
+ */
+function gutenberg_filter_e2e_font_dir( $font_dir ) {
+	$subdir = get_option( 'gutenberg_e2e_font_dir' );
+
+	$font_dir['path']    .= $subdir;
+	$font_dir['url']     .= $subdir;
+	$font_dir['basedir'] .= $subdir;
+	$font_dir['baseurl'] .= $subdir;
+
+	return $font_dir;
+}
+add_filter( 'font_dir', 'gutenberg_filter_e2e_font_dir' );
+
+/**
+ * Deletes all user installed fonts, associated font files, the fonts directory, and user global styles typography
+ * setings for the current theme so that we can test uploading/installing fonts in a clean environment.
+ */
+function gutenberg_delete_installed_fonts() {
+	$font_family_ids = new WP_Query(
+		array(
+			'post_type'      => 'wp_font_family',
+			'posts_per_page' => -1,
+			'fields'         => 'ids',
+		)
+	);
+
+	// Delete all font families, their child font faces, and associated font files.
+	foreach ( $font_family_ids->posts as $font_family_id ) {
+		wp_delete_post( $font_family_id, true );
+	}
+
+	// Delete the font directory, which should now be empty.
+	$font_path = wp_get_font_dir()['path'];
+
+	if ( is_dir( $font_path ) ) {
+		rmdir( $font_path );
+	}
+
+	// Delete any installed fonts from global styles.
+	$global_styles_post_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_global_styles_post_id();
+	$request               = new WP_REST_Request( 'POST', '/wp/v2/global-styles/' . $global_styles_post_id );
+	$request->set_body_params( array( 'settings' => array( 'typography' => array( 'fontFamilies' => array() ) ) ) );
+
+	rest_do_request( $request );
+}
+
+// Clean up fonts on plugin activation and deactivation.
+register_activation_hook( __FILE__, 'gutenberg_delete_installed_fonts' );
+register_deactivation_hook( __FILE__, 'gutenberg_delete_installed_fonts' );
diff --git a/packages/e2e-tests/plugins/deprecated-node-matcher/index.js b/packages/e2e-tests/plugins/deprecated-node-matcher/index.js
index 94b59f6190166e..3cb1afd56f18ef 100644
--- a/packages/e2e-tests/plugins/deprecated-node-matcher/index.js
+++ b/packages/e2e-tests/plugins/deprecated-node-matcher/index.js
@@ -70,7 +70,7 @@
 						} );
 					},
 				} )
-			)
+			);
 		},
 		save( { attributes } ) {
 			return el(
diff --git a/packages/e2e-tests/plugins/hooks-api/index.js b/packages/e2e-tests/plugins/hooks-api/index.js
index 1ace5145e26880..9c8fff9bfa4562 100644
--- a/packages/e2e-tests/plugins/hooks-api/index.js
+++ b/packages/e2e-tests/plugins/hooks-api/index.js
@@ -16,8 +16,7 @@
 				Button,
 				{
 					className: 'e2e-reset-block-button',
-					variant: "secondary",
-					isLarge: true,
+					variant: 'secondary',
 					onClick() {
 						const emptyBlock = createBlock( props.name );
 						props.onReplace( emptyBlock );
diff --git a/packages/e2e-tests/plugins/iframed-block/block.json b/packages/e2e-tests/plugins/iframed-block/block.json
index 85f86dea8131d9..0665636a253af2 100644
--- a/packages/e2e-tests/plugins/iframed-block/block.json
+++ b/packages/e2e-tests/plugins/iframed-block/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "test/iframed-block",
 	"title": "Iframed Block",
diff --git a/packages/e2e-tests/plugins/iframed-block/jquery.test.js b/packages/e2e-tests/plugins/iframed-block/jquery.test.js
index 901a6f1281927b..03a790d3f3526c 100644
--- a/packages/e2e-tests/plugins/iframed-block/jquery.test.js
+++ b/packages/e2e-tests/plugins/iframed-block/jquery.test.js
@@ -1,6 +1,6 @@
 ( ( $ ) => {
-	$.fn.test = function() {
-		return this.each( function() {
+	$.fn.test = function () {
+		return this.each( function () {
 			$( this ).text( 'Iframed Block (set with jQuery)' );
 		} );
 	};
diff --git a/packages/e2e-tests/plugins/iframed-block/script.js b/packages/e2e-tests/plugins/iframed-block/script.js
index f8872070f682b7..6da6a8487bdb2c 100644
--- a/packages/e2e-tests/plugins/iframed-block/script.js
+++ b/packages/e2e-tests/plugins/iframed-block/script.js
@@ -4,4 +4,3 @@
 		$( '.wp-block-test-iframed-block' ).test();
 	} );
 } )( window );
-
diff --git a/packages/e2e-tests/plugins/iframed-enqueue-block-assets/script.js b/packages/e2e-tests/plugins/iframed-enqueue-block-assets/script.js
index f0eddd65c70ebe..4067d55bc5bea9 100644
--- a/packages/e2e-tests/plugins/iframed-enqueue-block-assets/script.js
+++ b/packages/e2e-tests/plugins/iframed-enqueue-block-assets/script.js
@@ -1,3 +1,4 @@
 window.addEventListener( 'load', () => {
-    document.body.dataset.iframedEnqueueBlockAssetsL10n = window.iframedEnqueueBlockAssetsL10n.test;
+	document.body.dataset.iframedEnqueueBlockAssetsL10n =
+		window.iframedEnqueueBlockAssetsL10n.test;
 } );
diff --git a/packages/e2e-tests/plugins/iframed-inline-styles/block.json b/packages/e2e-tests/plugins/iframed-inline-styles/block.json
index 293b5af5e971f4..1231f1d33404bc 100644
--- a/packages/e2e-tests/plugins/iframed-inline-styles/block.json
+++ b/packages/e2e-tests/plugins/iframed-inline-styles/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "test/iframed-inline-styles",
 	"title": "Iframed Inline Styles",
diff --git a/packages/e2e-tests/plugins/iframed-masonry-block/block.json b/packages/e2e-tests/plugins/iframed-masonry-block/block.json
index b9b3f17234e30d..a77600805752cd 100644
--- a/packages/e2e-tests/plugins/iframed-masonry-block/block.json
+++ b/packages/e2e-tests/plugins/iframed-masonry-block/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "test/iframed-masonry-block",
 	"title": "Iframed Masonry Block",
diff --git a/packages/e2e-tests/plugins/iframed-masonry-block/editor.js b/packages/e2e-tests/plugins/iframed-masonry-block/editor.js
index eebd7d370e085a..f481ad54b6ac60 100644
--- a/packages/e2e-tests/plugins/iframed-masonry-block/editor.js
+++ b/packages/e2e-tests/plugins/iframed-masonry-block/editor.js
@@ -6,18 +6,24 @@
 
 	const content = [
 		el( 'div', { className: 'grid-item' } ),
-		el( 'div', { className: 'grid-item grid-item--width2 grid-item--height2' } ),
+		el( 'div', {
+			className: 'grid-item grid-item--width2 grid-item--height2',
+		} ),
 		el( 'div', { className: 'grid-item grid-item--height3' } ),
 		el( 'div', { className: 'grid-item grid-item--height2' } ),
 		el( 'div', { className: 'grid-item grid-item--width3' } ),
 		el( 'div', { className: 'grid-item' } ),
 		el( 'div', { className: 'grid-item' } ),
 		el( 'div', { className: 'grid-item grid-item--height2' } ),
-		el( 'div', { className: 'grid-item grid-item--width2 grid-item--height3' } ),
+		el( 'div', {
+			className: 'grid-item grid-item--width2 grid-item--height3',
+		} ),
 		el( 'div', { className: 'grid-item' } ),
 		el( 'div', { className: 'grid-item grid-item--height2' } ),
 		el( 'div', { className: 'grid-item' } ),
-		el( 'div', { className: 'grid-item grid-item--width2 grid-item--height2' } ),
+		el( 'div', {
+			className: 'grid-item grid-item--width2 grid-item--height2',
+		} ),
 		el( 'div', { className: 'grid-item grid-item--width2' } ),
 		el( 'div', { className: 'grid-item' } ),
 		el( 'div', { className: 'grid-item grid-item--height2' } ),
diff --git a/packages/e2e-tests/plugins/iframed-masonry-block/script.js b/packages/e2e-tests/plugins/iframed-masonry-block/script.js
index e287e6ec2e9745..0b2ae603fcdc97 100644
--- a/packages/e2e-tests/plugins/iframed-masonry-block/script.js
+++ b/packages/e2e-tests/plugins/iframed-masonry-block/script.js
@@ -10,4 +10,3 @@
 			} );
 	} );
 } )( window );
-
diff --git a/packages/e2e-tests/plugins/iframed-multiple-stylesheets/block.json b/packages/e2e-tests/plugins/iframed-multiple-stylesheets/block.json
index 4db03f471177d7..d803e6412ecb00 100644
--- a/packages/e2e-tests/plugins/iframed-multiple-stylesheets/block.json
+++ b/packages/e2e-tests/plugins/iframed-multiple-stylesheets/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "test/iframed-multiple-stylesheets",
 	"title": "Iframed Multiple Stylesheets",
@@ -11,5 +12,9 @@
 	"textdomain": "iframed-multiple-stylesheets",
 	"editorScript": "iframed-multiple-stylesheets-editor-script",
 	"editorStyle": "file:./editor.css",
-	"style": [ "iframed-multiple-stylesheets-style", "iframed-multiple-stylesheets-style2", "file:./style3.css" ]
+	"style": [
+		"iframed-multiple-stylesheets-style",
+		"iframed-multiple-stylesheets-style2",
+		"file:./style3.css"
+	]
 }
diff --git a/packages/e2e-tests/plugins/inner-blocks-allowed-blocks/index.js b/packages/e2e-tests/plugins/inner-blocks-allowed-blocks/index.js
index 5bcfed61519833..5b382cfa7d6339 100644
--- a/packages/e2e-tests/plugins/inner-blocks-allowed-blocks/index.js
+++ b/packages/e2e-tests/plugins/inner-blocks-allowed-blocks/index.js
@@ -10,7 +10,11 @@
 
 	const allowedBlocksWhenSingleEmptyChild = [ 'core/image', 'core/list' ];
 	const allowedBlocksWhenTwoChildren = [ 'core/gallery', 'core/video' ];
-	const allowedBlocksWhenTreeOrMoreChildren = [ 'core/gallery', 'core/video', 'core/list'  ];
+	const allowedBlocksWhenTreeOrMoreChildren = [
+		'core/gallery',
+		'core/video',
+		'core/list',
+	];
 
 	registerBlockType( 'test/allowed-blocks-dynamic', {
 		apiVersion: 3,
@@ -26,15 +30,15 @@
 				},
 				[ props.clientId ]
 			);
-			const blockProps = useBlockProps({
+			const blockProps = useBlockProps( {
 				...divProps,
 				'data-number-of-children': numberOfChildren,
-			});
+			} );
 
 			let allowedBlocks = allowedBlocksWhenSingleEmptyChild;
 			if ( numberOfChildren === 2 ) {
 				allowedBlocks = allowedBlocksWhenTwoChildren;
-			} else if( numberOfChildren > 2 ){
+			} else if ( numberOfChildren > 2 ) {
 				allowedBlocks = allowedBlocksWhenTreeOrMoreChildren;
 			}
 
@@ -42,12 +46,12 @@
 				'div',
 				blockProps,
 				el( InnerBlocks, {
-					allowedBlocks
+					allowedBlocks,
 				} )
 			);
 		},
 		save() {
 			return el( 'div', divProps, el( InnerBlocks.Content ) );
-		}
+		},
 	} );
 } )();
diff --git a/packages/e2e-tests/plugins/inner-blocks-prioritized-inserter-blocks/index.js b/packages/e2e-tests/plugins/inner-blocks-prioritized-inserter-blocks/index.js
index d5ded59237a182..b5b407a650c7cb 100644
--- a/packages/e2e-tests/plugins/inner-blocks-prioritized-inserter-blocks/index.js
+++ b/packages/e2e-tests/plugins/inner-blocks-prioritized-inserter-blocks/index.js
@@ -3,16 +3,14 @@
 	const { createElement: el } = wp.element;
 	const { InnerBlocks } = wp.blockEditor;
 
-    const divProps = {
+	const divProps = {
 		className: 'product',
 		style: { outline: '1px solid gray', padding: 5 },
 	};
 
-    // without a placeholder within the inner blocks it can be difficult to select the block using e2e tests
-    // especially using Puppeteer, so we use an image block which has a placeholder.
-	const template = [
-		[ 'core/image' ],
-    ];
+	// without a placeholder within the inner blocks it can be difficult to select the block using e2e tests
+	// especially using Puppeteer, so we use an image block which has a placeholder.
+	const template = [ [ 'core/image' ] ];
 
 	const save = function () {
 		return el( 'div', divProps, el( InnerBlocks.Content ) );
@@ -38,11 +36,11 @@
 				'div',
 				divProps,
 				el( InnerBlocks, {
-                    template,
+					template,
 					prioritizedInserterBlocks: [
-                        'core/audio',
+						'core/audio',
 						'core/spacer',
-                        'core/code',
+						'core/code',
 					],
 				} )
 			);
@@ -51,32 +49,34 @@
 		save,
 	} );
 
-    registerBlockType( 'test/prioritized-inserter-blocks-set-with-conflicting-allowed-blocks', {
-		title: 'Prioritized Inserter Blocks Set With Conflicting Allowed Blocks',
-		icon: 'carrot',
-		category: 'text',
-		edit() {
-			return el(
-				'div',
-				divProps,
-				el( InnerBlocks, {
-                    template,
-                    allowedBlocks: [
-                        'core/spacer',
-                        'core/code',
-                        'core/paragraph',
-                        'core/heading'
-                    ],
-					prioritizedInserterBlocks: [
-                        'core/audio', // this is **not** in the allowedBlocks list
-						'core/spacer',
-                        'core/code',
-					],
-				} )
-			);
-		},
-
-		save,
-	} );
+	registerBlockType(
+		'test/prioritized-inserter-blocks-set-with-conflicting-allowed-blocks',
+		{
+			title: 'Prioritized Inserter Blocks Set With Conflicting Allowed Blocks',
+			icon: 'carrot',
+			category: 'text',
+			edit() {
+				return el(
+					'div',
+					divProps,
+					el( InnerBlocks, {
+						template,
+						allowedBlocks: [
+							'core/spacer',
+							'core/code',
+							'core/paragraph',
+							'core/heading',
+						],
+						prioritizedInserterBlocks: [
+							'core/audio', // this is **not** in the allowedBlocks list
+							'core/spacer',
+							'core/code',
+						],
+					} )
+				);
+			},
 
+			save,
+		}
+	);
 } )();
diff --git a/packages/e2e-tests/plugins/inner-blocks-templates/index.js b/packages/e2e-tests/plugins/inner-blocks-templates/index.js
index 5a49a0fa0aa057..d3d9b3e3097d56 100644
--- a/packages/e2e-tests/plugins/inner-blocks-templates/index.js
+++ b/packages/e2e-tests/plugins/inner-blocks-templates/index.js
@@ -53,9 +53,13 @@
 		category: 'text',
 
 		edit: function InnerBlocksNoLockingEdit() {
-			return el( 'div', useBlockProps(), el( InnerBlocks, {
-				template: TEMPLATE,
-			} ) );
+			return el(
+				'div',
+				useBlockProps(),
+				el( InnerBlocks, {
+					template: TEMPLATE,
+				} )
+			);
 		},
 
 		save,
@@ -68,10 +72,14 @@
 		category: 'text',
 
 		edit: function InnerBlocksBlocksLockingAllEdit() {
-			return el( 'div', useBlockProps(), el( InnerBlocks, {
-				template: TEMPLATE,
-				templateLock: 'all',
-			} ) );
+			return el(
+				'div',
+				useBlockProps(),
+				el( InnerBlocks, {
+					template: TEMPLATE,
+					templateLock: 'all',
+				} )
+			);
 		},
 
 		save,
@@ -92,7 +100,9 @@
 
 		edit: function InnerBlocksUpdateLockedTemplateEdit( props ) {
 			const hasUpdatedTemplated = props.attributes.hasUpdatedTemplate;
-			return el( 'div', null, [
+			return el(
+				'div',
+				null,
 				el(
 					'button',
 					{
@@ -102,13 +112,17 @@
 					},
 					'Update template'
 				),
-				el( 'div', useBlockProps(), el( InnerBlocks, {
-					template: hasUpdatedTemplated
-						? TEMPLATE_TWO_PARAGRAPHS
-						: TEMPLATE,
-					templateLock: 'all',
-				} ) ),
-			] );
+				el(
+					'div',
+					useBlockProps(),
+					el( InnerBlocks, {
+						template: hasUpdatedTemplated
+							? TEMPLATE_TWO_PARAGRAPHS
+							: TEMPLATE,
+						templateLock: 'all',
+					} )
+				)
+			);
 		},
 
 		save,
@@ -121,10 +135,14 @@
 		category: 'text',
 
 		edit: function InnerBlocksParagraphPlaceholderEdit() {
-			return el( 'div', useBlockProps(), el( InnerBlocks, {
-				template: TEMPLATE_PARAGRAPH_PLACEHOLDER,
-				templateInsertUpdatesSelection: true,
-			} ) );
+			return el(
+				'div',
+				useBlockProps(),
+				el( InnerBlocks, {
+					template: TEMPLATE_PARAGRAPH_PLACEHOLDER,
+					templateInsertUpdatesSelection: true,
+				} )
+			);
 		},
 
 		save,
@@ -171,36 +189,41 @@
 		},
 
 		edit: function InnerBlocksTransformerTargetEdit() {
-			return el( 'div', useBlockProps(), el( InnerBlocks, {
-				template: TEMPLATE,
-			} ) );
+			return el(
+				'div',
+				useBlockProps(),
+				el( InnerBlocks, {
+					template: TEMPLATE,
+				} )
+			);
 		},
 
 		save,
 	} );
 
-	registerBlockType(
-		'test/test-inner-blocks-async-template',
-		{
-			apiVersion: 3,
-			title: 'Test Inner Blocks Async Template',
-			icon: 'cart',
-			category: 'text',
+	registerBlockType( 'test/test-inner-blocks-async-template', {
+		apiVersion: 3,
+		title: 'Test Inner Blocks Async Template',
+		icon: 'cart',
+		category: 'text',
 
-			edit: function InnerBlocksAsyncTemplateEdit() {
-				const [ template, setTemplate ] = useState( [] );
+		edit: function InnerBlocksAsyncTemplateEdit() {
+			const [ template, setTemplate ] = useState( [] );
 
-				setInterval( () => {
-					setTemplate( TEMPLATE_TWO_PARAGRAPHS );
-				}, 1000 );
+			setInterval( () => {
+				setTemplate( TEMPLATE_TWO_PARAGRAPHS );
+			}, 1000 );
 
-				return el('div', useBlockProps(), el( InnerBlocks, {
+			return el(
+				'div',
+				useBlockProps(),
+				el( InnerBlocks, {
 					template,
-				} ) );
-			},
+				} )
+			);
+		},
 
-			// Purposely do not save inner blocks so that it's possible to test template resolution.
-			save() {},
-		}
-	);
+		// Purposely do not save inner blocks so that it's possible to test template resolution.
+		save() {},
+	} );
 } )();
diff --git a/packages/e2e-tests/plugins/interactive-blocks.php b/packages/e2e-tests/plugins/interactive-blocks.php
index 1236ecd7d277f5..54bd4325bb29b1 100644
--- a/packages/e2e-tests/plugins/interactive-blocks.php
+++ b/packages/e2e-tests/plugins/interactive-blocks.php
@@ -15,33 +15,21 @@ function () {
 			$block_json_files = glob( __DIR__ . '/interactive-blocks/**/block.json' );
 
 			// Auto register all blocks that were found.
-			foreach ( $block_json_files as $filename ) {
-				$block_folder = dirname( $filename );
-				$name         = basename( $block_folder );
-
-				$view_file = plugin_dir_url( $block_folder ) . $name . '/' . 'view.js';
-
-				gutenberg_register_module(
-					$name . '-view',
-					$view_file,
-					array( '@wordpress/interactivity' ),
-					filemtime( $view_file ),
-					true
-				);
-
-				register_block_type_from_metadata( $block_folder );
+			foreach ( $block_json_files as $block_json_file ) {
+				register_block_type( $block_json_file );
 			}
 		}
 
-		// Temporary fix to disable SSR of directives during E2E testing. This
-		// is required at this moment, as SSR for directives is not stabilized
-		// yet and we need to ensure hydration works, even when the rendered
-		// HTML is not correct or malformed.
-		if ( 'true' === $_GET['disable_directives_ssr'] ) {
-			remove_filter(
-				'render_block_data',
-				'gutenberg_interactivity_mark_root_blocks'
-			);
+		/*
+		 * Disable the server directive processing during E2E testing. This is
+		 * required to ensure that client hydration works even when the rendered
+		 * HTML contains unbalanced tags and it couldn't be processed in the server.
+		 */
+		if ( 'true' === $_GET['disable_server_directive_processing'] ) {
+			// Ensure the interactivity API is loaded.
+			wp_interactivity();
+			// But remove the server directive processing.
+			add_filter( 'interactivity_process_directives', '__return_false' );
 		}
 	}
 );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/deferred-store/block.json b/packages/e2e-tests/plugins/interactive-blocks/deferred-store/block.json
new file mode 100644
index 00000000000000..088572086f000c
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/deferred-store/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/deferred-store",
+	"title": "E2E Interactivity tests - deferred store",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/deferred-store/render.php b/packages/e2e-tests/plugins/interactive-blocks/deferred-store/render.php
new file mode 100644
index 00000000000000..0d8c2cbeb5125d
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/deferred-store/render.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * HTML for testing scope restoration with generators.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div
+	data-wp-interactive="test/deferred-store"
+	<?php echo wp_interactivity_data_wp_context( array( 'text' => '!dlrow ,olleH' ) ); ?>
+>
+	<span data-wp-text="state.reversedText" data-testid="result"></span>
+	<span data-wp-text="state.reversedTextGetter" data-testid="result-getter"></span>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/deferred-store/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/deferred-store/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/deferred-store/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/deferred-store/view.js b/packages/e2e-tests/plugins/interactive-blocks/deferred-store/view.js
new file mode 100644
index 00000000000000..d3803788c0d1b0
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/deferred-store/view.js
@@ -0,0 +1,22 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getContext } from '@wordpress/interactivity';
+
+window.addEventListener(
+	'_test_proceed_',
+	() => {
+		store( 'test/deferred-store', {
+			state: {
+				reversedText() {
+					return [ ...getContext().text ].reverse().join( '' );
+				},
+
+				get reversedTextGetter() {
+					return [ ...getContext().text ].reverse().join( '' );
+				},
+			},
+		} );
+	},
+	{ once: true }
+);
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-bind/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/block.json
index f0775cecd8ae69..e30436b40605f3 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-bind/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-bind",
 	"title": "E2E Interactivity tests - directive bind",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-bind-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-bind/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/render.php
index efa62c3a18b7e6..c629e098b6e780 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-bind/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/render.php
@@ -4,11 +4,9 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-bind-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "directive-bind" }'>
+<div data-wp-interactive="directive-bind">
 	<a
 		data-wp-bind--href="state.url"
 		data-testid="add missing href at hydration"
@@ -95,6 +93,7 @@
 		<button
 			data-testid="toggle value"
 			data-wp-on--click="actions.toggleValue"
+			data-wp-bind--data-toggle-count="context.count"
 		>Toggle</button>
 	</div>
 	<?php endforeach; ?>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-bind/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-bind/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/view.js
index 0d93e93ba14504..47d1262f37ed20 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-bind/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/view.js
@@ -32,6 +32,7 @@ const { state, foo } = store( 'directive-bind', {
 
 			context.previousValue = context.value;
 			context.value = previousValue;
+			context.count = ( context.count ?? 0 ) + 1;
 		},
 	},
 } );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-body/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-body/block.json
deleted file mode 100644
index 61b48396be08ae..00000000000000
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-body/block.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"apiVersion": 2,
-	"name": "test/directive-body",
-	"title": "E2E Interactivity tests - directive body",
-	"category": "text",
-	"icon": "heart",
-	"description": "",
-	"supports": {
-		"interactivity": true
-	},
-	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-body-view",
-	"render": "file:./render.php"
-}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-body/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-body/render.php
deleted file mode 100644
index 16178815c24869..00000000000000
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-body/render.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * HTML for testing the directive `data-wp-body`.
- *
- * @package gutenberg-test-interactive-blocks
- */
-
-gutenberg_enqueue_module( 'directive-body-view' );
-?>
-
-<div
-	data-wp-interactive='{ "namespace":"directive-body" }'
-	data-wp-context='{"text":"text-1"}'
->
-	<div data-testid="container">
-		<aside data-wp-body data-testid="element with data-wp-body">
-			<p data-wp-text="context.text" data-testid="text">initial</p>
-		</aside>
-	</div>
-	<button
-		data-wp-on--click="actions.toggleText"
-		data-testid="toggle text"
-	>toggle text</button>
-</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-body/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-body/view.js
deleted file mode 100644
index 40f3f9e3be5d11..00000000000000
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-body/view.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { store, getContext } from '@wordpress/interactivity';
-
-store( 'directive-body', {
-	actions: {
-		toggleText: () => {
-			const context = getContext();
-			context.text = context.text === 'text-1' ? 'text-2' : 'text-1';
-		},
-	},
-} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-class/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-class/block.json
index af2764db986919..5af93d526dca13 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-class/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-class/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-class",
 	"title": "E2E Interactivity tests - directive class",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-class-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-class/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-class/render.php
index 96b3b086abdbf9..3f03ba210470f0 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-class/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-class/render.php
@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-class-view' );
 ?>
 
 <div data-wp-interactive='{"namespace": "directive-class"}'>
@@ -61,17 +59,17 @@ class="foo bar baz"
 		data-testid="can toggle class when class attribute is missing"
 	></div>
 
-	<div data-wp-context='{ "falseValue": false }'>
+	<div data-wp-context='{ "value": false }'>
 		<div
 			class="foo"
-			data-wp-class--foo="context.falseValue"
+			data-wp-class--foo="context.value"
 			data-testid="can use context values"
 		></div>
 		<button
-			data-wp-on--click="actions.toggleContextFalseValue"
+			data-wp-on--click="actions.toggleContextValue"
 			data-testid="toggle context false value"
 		>
-			Toggle context falseValue
+			Toggle context value
 		</button>
 	</div>
 
@@ -85,4 +83,16 @@ class="foo"
 		data-testid="can use classes with several dashes"
 	></div>
 
+	<div data-wp-context='{ "value": false }'>
+		<div
+			data-wp-class--default="context.value"
+			data-testid="class name default"
+		></div>
+		<button
+			data-wp-on--click="actions.toggleContextValue"
+			data-testid="toggle class name default"
+		>
+			Toggle context val
+		</button>
+	</div>
 </div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-class/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-class/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-class/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-class/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-class/view.js
index f008ae910673fd..9ae5207c0e05c5 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-class/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-class/view.js
@@ -15,9 +15,9 @@ const { state } = store( 'directive-class', {
 		toggleFalseValue: () => {
 			state.falseValue = ! state.falseValue;
 		},
-		toggleContextFalseValue: () => {
+		toggleContextValue: () => {
 			const context = getContext();
-			context.falseValue = ! context.falseValue;
+			context.value = ! context.value;
 		},
 	},
 } );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-context/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-context/block.json
index 1b3c448cc62aac..aaebb9abeff6a3 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-context/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-context/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-context",
 	"title": "E2E Interactivity tests - directive context",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-context-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php
index fe9a6c4f85a161..76635e37a26086 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php
@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-context-view' );
 ?>
 
 <div data-wp-interactive='{"namespace": "directive-context"}'>
@@ -18,6 +16,7 @@
 		>
 			<!-- rendered during hydration -->
 		</pre>
+		<button data-testid="parent replace" data-wp-on--click="actions.replaceObj">Replace obj</button>
 		<button
 			data-testid="parent prop1"
 			name="prop1"
@@ -50,6 +49,14 @@
 		>
 			obj.prop5
 		</button>
+		<button
+			data-testid="parent new"
+			name="new"
+			value="modifiedFromParent"
+			data-wp-on--click="actions.updateContext"
+		>
+			new
+		</button>
 		<div
 			data-wp-context='{ "prop2":"child","prop3":"child","obj":{"prop5":"child","prop6":"child"},"array":[4,5,6] }'
 		>
@@ -59,6 +66,7 @@
 			>
 				<!-- rendered during hydration -->
 			</pre>
+			<button data-testid="child replace" data-wp-on--click="actions.replaceObj">Replace obj</button>
 			<button
 				data-testid="child prop1"
 				name="prop1"
@@ -107,6 +115,24 @@
 			>
 				obj.prop6
 			</button>
+			<button
+				data-testid="child copy obj"
+				data-wp-on--click="actions.copyObj"
+			>
+				Copy obj
+			</button>
+			<div>
+				Is proxy preserved? <span
+					data-testid="is proxy preserved"
+					data-wp-text="state.isProxyPreserved"
+				></span>
+			</div>
+			<div>
+				Is proxy preserved on copy? <span
+					data-testid="is proxy preserved on copy"
+					data-wp-text="state.isProxyPreservedOnCopy"
+				></span>
+			</div>
 		</div>
 		<br />
 
@@ -124,13 +150,86 @@
 
 <div
 	data-wp-interactive='{"namespace": "directive-context-navigate"}'
-	data-wp-navigation-id="navigation"
+	data-wp-router-region="navigation"
 	data-wp-context='{ "text": "first page" }'
 >
+	<div data-wp-context='{}'>
+		<div data-testid="navigation inherited text" data-wp-text="context.text"></div>
+		<div data-testid="navigation inherited text2" data-wp-text="context.text2"></div>
+	</div>
 	<div data-testid="navigation text" data-wp-text="context.text"></div>
 	<div data-testid="navigation new text" data-wp-text="context.newText"></div>
 	<button data-testid="toggle text" data-wp-on--click="actions.toggleText">Toggle Text</button>
 	<button data-testid="add new text" data-wp-on--click="actions.addNewText">Add New Text</button>
+	<button data-testid="add text2" data-wp-on--click="actions.addText2">Add Text 2</button>
 	<button data-testid="navigate" data-wp-on--click="actions.navigate">Navigate</button>
 	<button data-testid="async navigate" data-wp-on--click="actions.asyncNavigate">Async Navigate</button>
 </div>
+
+<div
+	data-wp-interactive='{"namespace": "directive-context-non-default"}'
+	data-wp-context--non-default='{ "text": "non default" }'
+	data-wp-context='{ "defaultText": "default" }'
+>
+	<span data-testid="non-default suffix context" data-wp-text="context.text"></span>
+	<span data-testid="default suffix context" data-wp-text="context.defaultText"></span>
+</div>
+
+<div
+	data-wp-interactive='directive-context'
+	data-wp-context='{ "list": [
+		{ "id": 1, "text": "Text 1" },
+		{ "id": 2, "text": "Text 2" }
+	] }'
+>
+	<button data-testid="select 1" data-wp-on--click="actions.selectItem" value=1>Select 1</button>
+	<button data-testid="select 2" data-wp-on--click="actions.selectItem" value=2>Select 2</button>
+	<div data-testid="selected" data-wp-text="state.selected"></div>
+</div>
+
+<div
+	data-wp-interactive="directive-context-watch"
+	data-wp-context='{"counter":0}'
+>
+	<button
+		data-testid="counter parent"
+		data-wp-on--click="actions.increment"
+		data-wp-text="context.counter"
+	></button>
+	<div
+		data-wp-context='{"counter":0, "changes":0}'
+		data-wp-watch="callbacks.countChanges"
+	>
+		<button
+			data-testid="counter child"
+			data-wp-on--click="actions.increment"
+			data-wp-text="context.counter"
+		>
+		</button>
+		<span
+			data-testid="counter changes"
+			data-wp-text="context.changes"
+		></span>
+	</div>
+</div>
+
+
+<div
+	data-testid="inheritance from other namespaces"
+	data-wp-interactive="directive-context/parent"
+	data-wp-context='{ "prop": "fromParentNs" }'
+>
+	<div
+		data-wp-interactive="directive-context/child"
+		data-wp-context='{ "prop": "fromChildNs" }'
+	>
+		<span
+			data-testid="parent"
+			data-wp-text="directive-context/parent::context.prop"
+		></span>
+		<span
+			data-testid="child"
+			data-wp-text="directive-context/child::context.prop"
+		></span>
+	</div>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.asset.php
new file mode 100644
index 00000000000000..bdaec8d1b67a9d
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.asset.php
@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
index 8317f155d190e9..7515ad5ad92266 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, navigate, getContext } from '@wordpress/interactivity';
+import { store, getContext } from '@wordpress/interactivity';
 
 store( 'directive-context', {
 	state: {
@@ -9,6 +9,19 @@ store( 'directive-context', {
 			const ctx = getContext();
 			return JSON.stringify( ctx, undefined, 2 );
 		},
+		get selected() {
+			const { list, selected } = getContext();
+			return list.find( ( obj ) => obj === selected )?.text;
+		},
+		get isProxyPreserved() {
+			const ctx = getContext();
+			const pointer = ctx.obj;
+			return pointer === ctx.obj;
+		},
+		get isProxyPreservedOnCopy() {
+			const { obj, obj2 } = getContext();
+			return obj === obj2;
+		},
 	},
 	actions: {
 		updateContext( event ) {
@@ -22,19 +35,37 @@ store( 'directive-context', {
 			const ctx = getContext();
 			ctx.text = ctx.text === 'Text 1' ? 'Text 2' : 'Text 1';
 		},
+		selectItem( event ) {
+			const ctx = getContext();
+			const value = parseInt( event.target.value );
+			ctx.selected = ctx.list.find( ( { id } ) => id === value );
+		},
+		replaceObj() {
+			const ctx = getContext();
+			ctx.obj = { overwritten: true };
+		},
+		copyObj() {
+			const ctx = getContext();
+			ctx.obj2 = ctx.obj;
+		},
 	},
 } );
 
 const html = `
 		<div
-			data-wp-interactive='{ "namespace": "directive-context-navigate" }'
-			data-wp-navigation-id="navigation"
-			data-wp-context='{ "text": "second page" }'
+			data-wp-interactive="directive-context-navigate"
+			data-wp-router-region="navigation"
+			data-wp-context='{ "text": "second page", "text2": "second page" }'
 		>
+			<div data-wp-context='{}'>
+				<div data-testid="navigation inherited text" data-wp-text="context.text"></div>
+				<div data-testid="navigation inherited text2" data-wp-text="context.text2"></div>
+			</div>
 			<div data-testid="navigation text" data-wp-text="context.text"></div>
 			<div data-testid="navigation new text" data-wp-text="context.newText"></div>
 			<button data-testid="toggle text" data-wp-on--click="actions.toggleText">Toggle Text</button>
-			<button data-testid="add new text" data-wp-on--click="actions.addNewText">Add new text</button>
+			<button data-testid="add new text" data-wp-on--click="actions.addNewText">Add New Text</button>
+			<button data-testid="add text2" data-wp-on--click="actions.addText2">Add Text 2</button>
 			<button data-testid="navigate" data-wp-on--click="actions.navigate">Navigate</button>
 			<button data-testid="async navigate" data-wp-on--click="actions.asyncNavigate">Async Navigate</button>
 		</div>`;
@@ -49,11 +80,18 @@ const { actions } = store( 'directive-context-navigate', {
 			const ctx = getContext();
 			ctx.newText = 'some new text';
 		},
+		addText2() {
+			const ctx = getContext();
+			ctx.text2 = 'some new text';
+		},
 		navigate() {
-			return navigate( window.location, {
-				force: true,
-				html,
-			} );
+			return import( '@wordpress/interactivity-router' ).then(
+				( { actions: routerActions } ) => {
+					const url = new URL( window.location.href );
+					url.searchParams.set( 'next_page', 'true' );
+					return routerActions.navigate( url, { force: true, html } );
+				}
+			);
 		},
 		*asyncNavigate() {
 			yield actions.navigate();
@@ -62,3 +100,21 @@ const { actions } = store( 'directive-context-navigate', {
 		},
 	},
 } );
+
+store( 'directive-context-watch', {
+	actions: {
+		increment: () => {
+			const ctx = getContext();
+			ctx.counter = ctx.counter + 1;
+		},
+	},
+	callbacks: {
+		countChanges: () => {
+			const ctx = getContext();
+			// Subscribe to changes in counter.
+			// eslint-disable-next-line no-unused-expressions
+			ctx.counter;
+			ctx.changes = ctx.changes + 1;
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-each/block.json
new file mode 100644
index 00000000000000..7a0bd2c9ac5198
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/directive-each",
+	"title": "E2E Interactivity tests - directive each",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
new file mode 100644
index 00000000000000..47eb351d837e78
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-each`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div data-wp-interactive="directive-each">
+	<div data-testid="letters">
+		<template data-wp-each="state.letters">
+			<p data-wp-text="context.item" data-testid="item"></p>
+		</template>
+		<!-- SSRed elements; they should be removed on hydration -->
+		<p data-testid="item" data-wp-each-child>A</p>
+		<p data-testid="item" data-wp-each-child>B</p>
+		<p data-testid="item" data-wp-each-child>C</p>
+	</div>
+
+	<hr>
+
+	<div data-testid="letters-kebab-case">
+		<template data-wp-each--my-item="state.letters">
+			<p data-wp-text="context.myItem" data-testid="item"></p>
+		</template>
+		<!-- SSRed elements; they should be removed on hydration -->
+		<p data-testid="item" data-wp-each-child>A</p>
+		<p data-testid="item" data-wp-each-child>B</p>
+		<p data-testid="item" data-wp-each-child>C</p>
+	</div>
+
+	<hr>
+
+	<div data-testid="fruits">
+		<button
+			data-testid="rotate" data-wp-on--click="actions.rotateFruits"
+		>Rotate</button>
+		<button
+			data-testid="add" data-wp-on--click="actions.addFruit"
+		>Add</button>
+		<button
+			data-testid="replace" data-wp-on--click="actions.replaceFruit"
+		>Replace</button>
+		<template data-wp-each--fruit="state.fruits">
+			<p
+				data-testid="item"
+				data-wp-text="context.fruit"
+				data-wp-on--click="actions.removeFruit"
+			></p>
+		</template>
+		<!-- SSRed elements; they should be removed on hydration -->
+		<p data-testid="item" data-wp-each-child>avocado</p>
+		<p data-testid="item" data-wp-each-child>banana</p>
+		<p data-testid="item" data-wp-each-child>cherimoya</p>
+	</div>
+
+	<hr>
+
+	<div data-testid="books">
+		<button
+			data-testid="rotate" data-wp-on--click="actions.rotateBooks"
+		>Rotate</button>
+		<button
+			data-testid="add" data-wp-on--click="actions.addBook"
+		>Add</button>
+		<button
+			data-testid="replace" data-wp-on--click="actions.replaceBook"
+		>Replace</button>
+		<button
+			data-testid="modify" data-wp-on--click="actions.modifyBook"
+		>Modify</button>
+		<template
+			data-wp-each--book="state.books"
+			data-wp-each-key="context.book.isbn"
+		>
+			<p
+				data-testid="item"
+				data-wp-text="context.book.title"
+				data-wp-on--click="actions.removeBook"
+			></p>
+		</template>
+		<!-- SSRed elements; they should be removed on hydration -->
+		<p data-testid="item" data-wp-each-child>A Game of Thrones</p>
+		<p data-testid="item" data-wp-each-child>A Clash of Kings</p>
+		<p data-testid="item" data-wp-each-child>A Storm of Swords</p>
+	</div>
+
+	<hr>
+
+	<div data-testid="numbers">
+		<button
+			data-testid="shift" data-wp-on--click="actions.shiftNumber"
+		>Shift</button>
+		<button
+			data-testid="unshift" data-wp-on--click="actions.unshiftNumber"
+		>Unshift</button>
+		<template data-wp-each="state.numbers">
+			<p data-wp-text="context.item" data-testid="item"></p>
+		</template>
+		<p data-testid="item" data-wp-each-child>1</p>
+		<p data-testid="item" data-wp-each-child>2</p>
+		<p data-testid="item" data-wp-each-child>3</p>
+		<p data-testid="item">4</p>
+	</div>
+
+	<hr>
+
+	<div data-testid="empty">
+		<button
+			data-testid="add" data-wp-on--click="actions.addItem"
+		>Add</button>
+		<template data-wp-each="state.emptyList">
+			<p data-wp-text="context.item" data-testid="item"></p>
+		</template>
+		<p data-testid="item">item X</p>
+	</div>
+
+	<div data-testid="siblings">
+		<button
+			data-testid="unshift"
+			data-wp-on--click="actions.unshiftNumberAndName"
+		>Unshift</button>
+		<template
+			data-wp-each="state.numbersAndNames"
+			data-wp-each-key="context.item.value"
+		>
+			<p data-wp-text="context.item.name" data-testid="item"></p>
+			<p data-wp-text="context.item.value" data-testid="item"></p>
+		</template>
+		<p data-testid="item" data-wp-each-child>two</p>
+		<p data-testid="item" data-wp-each-child>2</p>
+		<p data-testid="item" data-wp-each-child>three</p>
+		<p data-testid="item" data-wp-each-child>3</p>
+		<p data-testid="item">four</p>
+		<p data-testid="item">4</p>
+	</div>
+
+	<div data-testid="nested">
+		<button
+			data-testid="add animal"
+			data-wp-on--click="actions.addAnimal"
+		>Add animal</button>
+		<button
+			data-testid="add breeds"
+			data-wp-on--click="actions.addBreeds"
+		>Add breeds</button>
+
+		<ul>
+			<template
+				data-wp-each--animal="state.animalBreeds"
+				data-wp-each-key="context.animal.name"
+			>
+				<li data-testid="animal">
+					<span
+						data-testid="name"
+						data-wp-text="context.animal.name"
+					></span>
+					<ul>
+						<template data-wp-each--breed="context.animal.breeds">
+							<li data-wp-text="context.breed"></li>
+						</template>
+					</ul>
+				</li>
+			</template>
+			<!-- SSRed elements; they should be removed on hydration -->
+			<li data-testid="animal" data-wp-each-child>
+				<span data-testid="name">Dog</span>
+				<ul>
+					<template data-wp-each--breed="context.animal.breeds">
+						<li data-wp-text="context.breed"></li>
+					</template>
+					<li data-wp-each-child>Chihuahua</li>
+					<li data-wp-each-child>Rottweiler</li>
+				</ul>
+			</li>
+			<li data-testid="animal" data-wp-each-child>
+				<span data-testid="name">Cat</span>
+				<ul>
+					<template data-wp-each--breed="context.animal.breeds">
+						<li data-wp-text="context.breed"></li>
+					</template>
+					<li data-wp-each-child>Sphynx</li>
+					<li data-wp-each-child>Siamese</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+
+	<div data-testid="invalid tag">
+		<div data-wp-each="state.letters">
+			<p data-wp-text="context.item" data-testid="item"></p>
+		</div>
+	</div>
+
+
+	<div data-testid="derived state">
+		<button
+			data-testid="rotate" data-wp-on--click="actions.rotateFruits"
+		>Rotate</button>
+		<template
+			data-wp-context='{ "idPrefix": "fruit-" }'
+			data-wp-each--fruit="state.fruits"
+			data-wp-each-key="state.fruitId"
+		>
+			<p
+				data-testid="item"
+				data-wp-text="context.fruit"
+				data-wp-bind--data-fruit-id="state.fruitId"
+			></p>
+		</template>
+		<!-- SSRed elements; they should be removed on hydration -->
+		<p data-testid="item" data-wp-each-child>avocado</p>
+		<p data-testid="item" data-wp-each-child>banana</p>
+		<p data-testid="item" data-wp-each-child>cherimoya</p>
+	</div>
+</div>
+
+<hr>
+
+<div
+	data-wp-interactive="directive-each"
+	data-wp-router-region="navigation-updated list"
+	data-wp-context='{ "b": 2, "c": 3, "d": 4 }'
+	data-testid="navigation-updated list"
+>
+	<button
+		data-testid="navigate"
+		data-wp-on--click="actions.navigate"
+	>Navigate</button>
+	<template data-wp-each="state.list">
+		<p data-wp-text="context.item" data-testid="item"></p>
+	</template>
+	<p data-testid="item" data-wp-each-child>beta</p>
+	<p data-testid="item" data-wp-each-child>gamma</p>
+	<p data-testid="item" data-wp-each-child>delta</p>
+</div>
+
+<hr>
+
+<div
+	data-wp-interactive="directive-each"
+	data-wp-context='{ "list": [ "beta" ], "callbackRunCount": 0 }'
+	data-testid="elements with directives"
+>
+	<template data-wp-each="context.list">
+		<div
+			data-testid="item"
+			data-wp-text="context.item"
+			data-wp-priority-2-init="callbacks.updateCallbackRunCount"
+		></div>
+	</template>
+	<div
+		data-wp-each-child
+		data-testid="item"
+		data-wp-text="context.item"
+		data-wp-priority-2-init="callbacks.updateCallbackRunCount"
+	></div>
+	<data
+		data-testid="callbackRunCount"
+		data-wp-text="context.callbackRunCount"
+	></data>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.asset.php
new file mode 100644
index 00000000000000..bdaec8d1b67a9d
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.asset.php
@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
new file mode 100644
index 00000000000000..6ceef82864d9db
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
@@ -0,0 +1,234 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	store,
+	getContext,
+	useInit,
+	privateApis,
+} from '@wordpress/interactivity';
+
+const { state } = store( 'directive-each' );
+
+store( 'directive-each', {
+	state: {
+		letters: [ 'A', 'B', 'C' ],
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		fruits: [ 'avocado', 'banana', 'cherimoya' ],
+		get fruitId() {
+			const { idPrefix, fruit } = getContext();
+			return `${ idPrefix }${ fruit }`;
+		},
+	},
+	actions: {
+		removeFruit() {
+			const { fruit } = getContext();
+			state.fruits.splice( state.fruits.indexOf( fruit ), 1 );
+		},
+		rotateFruits() {
+			const fruit = state.fruits.pop();
+			state.fruits.splice( 0, 0, fruit );
+		},
+		addFruit() {
+			state.fruits.splice( 0, 0, 'ananas' );
+		},
+		replaceFruit() {
+			state.fruits.splice( 0, 1, 'ananas' );
+		},
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		books: [
+			{
+				title: 'A Game of Thrones',
+				author: 'George R.R. Martin',
+				isbn: '9780553588484',
+			},
+			{
+				title: 'A Clash of Kings',
+				author: 'George R.R. Martin',
+				isbn: '9780553381696',
+			},
+			{
+				title: 'A Storm of Swords',
+				author: 'George R.R. Martin',
+				isbn: '9780553573428',
+			},
+		],
+	},
+	actions: {
+		removeBook() {
+			const { book } = getContext();
+			state.books.splice( state.books.indexOf( book ), 1 );
+		},
+		rotateBooks() {
+			const book = state.books.pop();
+			state.books.splice( 0, 0, book );
+		},
+		addBook() {
+			const book = {
+				title: 'A Feast for Crows',
+				author: 'George R.R. Martin',
+				isbn: '9780553582024',
+			};
+			state.books.splice( 0, 0, book );
+		},
+		replaceBook() {
+			const book = {
+				title: 'A Feast for Crows',
+				author: 'George R.R. Martin',
+				isbn: '9780553582024',
+			};
+			state.books.splice( 0, 1, book );
+		},
+		modifyBook() {
+			const [ book ] = state.books;
+			book.title = book.title.toUpperCase();
+		},
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		numbers: [ 1, 2, 3 ],
+	},
+	actions: {
+		shiftNumber() {
+			state.numbers.shift();
+		},
+		unshiftNumber() {
+			if ( state.numbers.length > 0 ) {
+				state.numbers.unshift( state.numbers[ 0 ] - 1 );
+			}
+		},
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		emptyList: [],
+	},
+	actions: {
+		addItem() {
+			state.emptyList.push( `item ${ state.emptyList.length }` );
+		},
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		numbersAndNames: [
+			{ name: 'two', value: 2 },
+			{ name: 'three', value: 3 },
+		],
+	},
+	actions: {
+		unshiftNumberAndName() {
+			state.numbersAndNames.unshift( { name: 'one', value: 1 } );
+		},
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		animalBreeds: [
+			{ name: 'Dog', breeds: [ 'chihuahua', 'rottweiler' ] },
+			{ name: 'Cat', breeds: [ 'sphynx', 'siamese' ] },
+		],
+	},
+	actions: {
+		addAnimal() {
+			state.animalBreeds.unshift( {
+				name: 'Rat',
+				breeds: [ 'dumbo', 'rex' ],
+			} );
+		},
+		addBreeds() {
+			state.animalBreeds.forEach( ( { name, breeds } ) => {
+				if ( name === 'Dog' ) {
+					breeds.unshift( 'german shepherd' );
+				}
+				if ( name === 'Cat' ) {
+					breeds.unshift( 'maine coon' );
+				}
+				if ( name === 'Rat' ) {
+					breeds.unshift( 'satin' );
+				}
+			} );
+		},
+	},
+} );
+
+const html = `
+<div
+	data-wp-interactive="directive-each"
+	data-wp-router-region="navigation-updated list"
+	data-wp-context='{ "a": 1, "b": 2, "c": 3, "d": 4 }'
+	data-testid="navigation-updated list"
+>
+	<button
+		data-testid="navigate"
+		data-wp-on--click="actions.navigate"
+	>Navigate</button>
+	<template data-wp-each="state.list">
+		<p data-wp-text="context.item" data-testid="item"></p>
+	</template>
+	<p data-testid="item" data-wp-each-child>alpha</p>
+	<p data-testid="item" data-wp-each-child>beta</p>
+	<p data-testid="item" data-wp-each-child>gamma</p>
+	<p data-testid="item" data-wp-each-child>delta</p>
+</div>
+`;
+
+store( 'directive-each', {
+	state: {
+		get list() {
+			const ctx = getContext();
+			return Object.keys( ctx ).sort();
+		},
+	},
+	actions: {
+		*navigate() {
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			return actions.navigate( window.location, {
+				force: true,
+				html,
+			} );
+		},
+	},
+} );
+
+const { directive } = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
+
+/*
+ * This is a high-priority version of the wp-init directive, to test directives
+ * with such priority or lower don't run in elements with wp-each-child.
+ */
+directive(
+	'priority-2-init',
+	( { directives: { 'priority-2-init': init }, evaluate } ) => {
+		init.forEach( ( entry ) => {
+			useInit( () => evaluate( entry ) );
+		} );
+	},
+	{ priority: 2 }
+);
+
+store( 'directive-each', {
+	callbacks: {
+		updateCallbackRunCount() {
+			const ctx = getContext();
+			ctx.callbackRunCount += 1;
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-init/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-init/block.json
index a7e195d2e4884a..dda09ee898276d 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-init/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-init/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-init",
 	"title": "E2E Interactivity tests - directive init",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-init-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-init/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-init/render.php
index 6ee0115ff05bac..1262c66f386d92 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-init/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-init/render.php
@@ -4,11 +4,9 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-init-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "directive-init" }'>
+<div data-wp-interactive="directive-init">
 	<div
 		data-testid="single init"
 		data-wp-context='{"isReady":[false],"calls":[0]}'
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-init/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-init/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-init/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-init/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-init/view.js
index 333dbd6d7f5013..a8c70a4a907207 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-init/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-init/view.js
@@ -1,14 +1,18 @@
 /**
  * WordPress dependencies
  */
-import { store, directive, getContext } from '@wordpress/interactivity';
+import { store, getContext, privateApis } from '@wordpress/interactivity';
+
+const { directive } = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
 
 // Mock `data-wp-show` directive to test when things are removed from the
 // DOM.  Replace with `data-wp-show` when it's ready.
 directive(
 	'show-mock',
 	( { directives: { 'show-mock': showMock }, element, evaluate } ) => {
-		const entry = showMock.find( ( { suffix } ) => suffix === 'default' );
+		const entry = showMock.find( ( { suffix } ) => suffix === null );
 		if ( ! evaluate( entry ) ) {
 			return null;
 		}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-key/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-key/block.json
index 0cbdd065e63a1d..745e7f9bb3f829 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-key/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-key/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-key",
 	"title": "E2E Interactivity tests - directive key",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-key-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php
index 1a5f57b526fbf2..7c25ec2649561d 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php
@@ -4,13 +4,11 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-key-view' );
 ?>
 
 <div
-	data-wp-interactive='{ "namespace": "directive-key" }'
-	data-wp-navigation-id="some-id"
+	data-wp-interactive="directive-key"
+	data-wp-router-region="some-id"
 >
 	<ul>
 		<li data-wp-key="id-2" data-testid="first-item">2</li>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.asset.php
new file mode 100644
index 00000000000000..bdaec8d1b67a9d
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.asset.php
@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
index cdbcb5b5973046..2efea222c0faf6 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
@@ -1,12 +1,12 @@
 /**
  * WordPress dependencies
  */
-import { store, navigate } from '@wordpress/interactivity';
+import { store } from '@wordpress/interactivity';
 
 const html = `
 		<div
-			data-wp-interactive='{ "namespace": "directive-key" }'
-			data-wp-navigation-id="some-id"
+			data-wp-interactive="directive-key"
+			data-wp-router-region="some-id"
 		>
 			<ul>
 				<li data-wp-key="id-1">1</li>
@@ -17,8 +17,11 @@ const html = `
 
 store( 'directive-key', {
 	actions: {
-		navigate() {
-			navigate( window.location, {
+		*navigate() {
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			return actions.navigate( window.location, {
 				force: true,
 				html,
 			} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/block.json
new file mode 100644
index 00000000000000..b40fc99a1d4481
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/directive-on-document",
+	"title": "E2E Interactivity tests - directive on document",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
new file mode 100644
index 00000000000000..a491a52161dfb7
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-on`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div data-wp-interactive="directive-on-document">
+	<button
+		data-testid="visibility"
+		data-wp-on--click="actions.visibilityHandler"
+	>
+		Switch visibility
+	</button>
+
+	<div data-wp-text="state.isEventAttached" data-testid="isEventAttached">no</div>
+
+	<div data-wp-show-mock="state.isVisible">
+		<div
+			data-wp-on-document--keydown="callbacks.keydownHandler"
+			data-wp-init="callbacks.init"
+		>
+			<p data-wp-text="state.counter" data-testid="counter">0</p>
+		</div>
+	</div>
+	<div data-wp-on-document--keydown="actions.keydownHandler" data-wp-on-document--keydown--second="actions.keydownSecondHandler">
+		<p data-wp-text="state.keydownHandler" data-testid="keydownHandler">no</p>
+		<p data-wp-text="state.keydownSecondHandler" data-testid="keydownSecondHandler">no</p>
+	</div>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js
new file mode 100644
index 00000000000000..b9689ac978f85f
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js
@@ -0,0 +1,51 @@
+/**
+ * WordPress dependencies
+ */
+import { store, privateApis } from '@wordpress/interactivity';
+
+const { directive } = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
+
+// Mock `data-wp-show` directive to test when things are removed from the
+// DOM.  Replace with `data-wp-show` when it's ready.
+directive(
+	'show-mock',
+	( { directives: { 'show-mock': showMock }, element, evaluate } ) => {
+		const entry = showMock.find( ( { suffix } ) => suffix === null );
+		if ( ! evaluate( entry ) ) {
+			return null;
+		}
+		return element;
+	}
+);
+
+const { state } = store( 'directive-on-document', {
+	state: {
+		counter: 0,
+		isVisible: true,
+		isEventAttached: 'no',
+		keydownHandler: 'no',
+		keydownSecondHandler: 'no',
+	},
+	callbacks: {
+		keydownHandler() {
+			state.counter += 1;
+		},
+		init() {
+			state.isEventAttached = 'yes';
+		},
+	},
+	actions: {
+		visibilityHandler: () => {
+			state.isEventAttached = 'no';
+			state.isVisible = ! state.isVisible;
+		},
+		keydownHandler: () => {
+			state.keydownHandler = 'yes';
+		},
+		keydownSecondHandler: () => {
+			state.keydownSecondHandler = 'yes';
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json
new file mode 100644
index 00000000000000..993312c44b0648
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/directive-on-window",
+	"title": "E2E Interactivity tests - directive on window",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
new file mode 100644
index 00000000000000..c72d80e892b15a
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-on`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div data-wp-interactive="directive-on-window">
+	<button
+		data-wp-on--click="actions.visibilityHandler"
+		data-testid="visibility">
+		Switch visibility
+	</button>
+	<div data-wp-text="state.isEventAttached" data-testid="isEventAttached">no</div>
+	<div data-wp-show-mock="state.isVisible">
+		<div
+			data-wp-on-window--resize="callbacks.resizeHandler"
+			data-wp-init="callbacks.init"
+		>
+			<p data-wp-text="state.counter" data-testid="counter">0</p>
+		</div>
+	</div>
+	<div data-wp-on-window--resize="actions.resizeHandler" data-wp-on-window--resize--second="actions.resizeSecondHandler">
+		<p data-wp-text="state.resizeHandler" data-testid="resizeHandler">no</p>
+		<p data-wp-text="state.resizeSecondHandler" data-testid="resizeSecondHandler">no</p>
+	</div>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js
new file mode 100644
index 00000000000000..ef72e266e10759
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js
@@ -0,0 +1,51 @@
+/**
+ * WordPress dependencies
+ */
+import { store, privateApis } from '@wordpress/interactivity';
+
+const { directive } = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
+
+// Mock `data-wp-show` directive to test when things are removed from the
+// DOM.  Replace with `data-wp-show` when it's ready.
+directive(
+	'show-mock',
+	( { directives: { 'show-mock': showMock }, element, evaluate } ) => {
+		const entry = showMock.find( ( { suffix } ) => suffix === null );
+		if ( ! evaluate( entry ) ) {
+			return null;
+		}
+		return element;
+	}
+);
+
+const { state } = store( 'directive-on-window', {
+	state: {
+		counter: 0,
+		isVisible: true,
+		isEventAttached: 'no',
+		resizeHandler: 'no',
+		resizeSecondHandler: 'no',
+	},
+	callbacks: {
+		resizeHandler() {
+			state.counter += 1;
+		},
+		init() {
+			state.isEventAttached = 'yes';
+		},
+	},
+	actions: {
+		visibilityHandler: () => {
+			state.isEventAttached = 'no';
+			state.isVisible = ! state.isVisible;
+		},
+		resizeHandler: () => {
+			state.resizeHandler = 'yes';
+		},
+		resizeSecondHandler: () => {
+			state.resizeSecondHandler = 'yes';
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-on/block.json
index b9d8aa5f9ce57d..7502d4fcfdab4c 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-on",
 	"title": "E2E Interactivity tests - directive on",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-on-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on/render.php
index ebf144660fd2af..127d6080f8f5b3 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on/render.php
@@ -4,11 +4,10 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-on-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "directive-on" }'>
+<?php // A wrong directive name like "data-wp-on--" should not kill the interactivity. ?>
+<div data-wp-interactive="directive-on" data-wp-on--="">
 	<div>
 		<p data-wp-text="state.counter" data-testid="counter">0</p>
 		<button
@@ -51,4 +50,24 @@
 			data-wp-on--click="actions.clickHandler"
 		>Click me!</button>
 	</div>
+	<div data-wp-context='{"clicked":false,"clickCount":0,"isOpen":true}'>
+		<p
+			data-wp-text="context.clicked"
+			data-testid="multiple handlers clicked"
+		>false</p>
+		<p
+			data-wp-text="context.clickCount"
+			data-testid="multiple handlers clickCount"
+		>0</p>
+		<p
+			data-wp-text="context.isOpen"
+			data-testid="multiple handlers isOpen"
+		>true</p>
+		<button
+			data-testid="multiple handlers button"
+			data-wp-on--click="actions.setClicked"
+			data-wp-on--click--counter="actions.countClick"
+			data-wp-on--click--toggle="actions.toggle"
+		>Click me!</button>
+	</div>
 </div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-on/view.js
index 69378b53e14c0a..8b0bcc0e115eca 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on/view.js
@@ -26,5 +26,17 @@ const { state } = store( 'directive-on', {
 			const context = getContext();
 			context.customEvents += 1;
 		},
+		setClicked: () => {
+			const context = getContext();
+			context.clicked = true;
+		},
+		countClick: () => {
+			const context = getContext();
+			context.clickCount += 1;
+		},
+		toggle: () => {
+			const context = getContext();
+			context.isOpen = ! context.isOpen;
+		},
 	},
 } );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/block.json
index c7361c3d5f121a..31c7b633d25e3e 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-priorities",
 	"title": "E2E Interactivity tests - directive priorities",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-priorities-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/render.php
index f082d44dd8fdfa..baadbbe118a81a 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/render.php
@@ -4,11 +4,9 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-priorities-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "directive-priorities" }'>
+<div data-wp-interactive="directive-priorities">
 	<pre data-testid="execution order"></pre>
 
 	<!-- Element with test directives -->
@@ -25,5 +23,5 @@
 	<!-- WARNING: the `div` with `data-wp-non-existent-directive` should remain
 		inline (i.e., without new line or blank characters in between) to
 		ensure it is the only child node. Otherwise, tests could fail. -->
-	<div data-wp-interactive='{ "namespace": "directive-priorities" }'><div data-wp-non-existent-directive></div></div>
+	<div data-wp-interactive="directive-priorities"><div data-wp-non-existent-directive></div></div>
 </div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/view.js
index 4d47084e343625..77f2f25c5f9a41 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/view.js
@@ -4,12 +4,14 @@
 import {
 	store,
 	getContext,
-	directive,
-	deepSignal,
 	useEffect,
-	createElement as h,
+	privateApis,
 } from '@wordpress/interactivity';
 
+const { directive, proxifyState, h } = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
+
 /**
  * Namespace used in custom directives and store.
  */
@@ -22,8 +24,11 @@ const namespace = 'directive-priorities';
  */
 const executionProof = ( n ) => {
 	const el = document.querySelector( '[data-testid="execution order"]' );
-	if ( ! el.textContent ) el.textContent = n;
-	else el.textContent += `, ${ n }`;
+	if ( ! el.textContent ) {
+		el.textContent = n;
+	} else {
+		el.textContent += `, ${ n }`;
+	}
 };
 
 /**
@@ -36,13 +41,13 @@ directive(
 	'test-context',
 	( { context: { Provider }, props: { children } } ) => {
 		executionProof( 'context' );
-		const value = deepSignal( {
-			[ namespace ]: {
+		const client = {
+			[ namespace ]: proxifyState( namespace, {
 				attribute: 'from context',
 				text: 'from context',
-			},
-		} );
-		return h( Provider, { value }, children );
+			} ),
+		};
+		return h( Provider, { value: { client } }, children );
 	},
 	{ priority: 8 }
 );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-run/block.json
new file mode 100644
index 00000000000000..af266aea8f63b1
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/directive-run",
+	"title": "E2E Interactivity tests - directive run",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
new file mode 100644
index 00000000000000..5b37955ca3227b
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-run`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div
+	data-wp-interactive="directive-run"
+	data-wp-router-region='test-directive-run'
+>
+	<div data-testid="hydrated" data-wp-text="state.isHydrated"></div>
+	<div data-testid="mounted" data-wp-text="state.isMounted"></div>
+	<div data-testid="renderCount" data-wp-text="state.renderCount"></div>
+	<div data-testid="navigated">no</div>
+
+	<div
+		data-wp-run--hydrated="callbacks.updateIsHydrated"
+		data-wp-run--renderCount="callbacks.updateRenderCount"
+		data-wp-text="state.clickCount"
+	></div>
+</div>
+
+<div data-wp-interactive="directive-run" >
+	<button data-testid="toggle" data-wp-on--click="actions.toggle">
+		Toggle
+	</button>
+
+	<button data-testid="increment" data-wp-on--click="actions.increment">
+		Increment
+	</button>
+
+	<button data-testid="navigate" data-wp-on--click="actions.navigate">
+		Navigate
+	</button>
+
+	<!-- Hook execution results are stored in this element as attributes. -->
+	<div
+		data-testid="wp-run hooks results"
+		data-wp-show-children="state.isOpen"
+		data-init=""
+		data-watch=""
+	>
+		<div
+			data-wp-run--mounted="callbacks.updateIsMounted"
+			data-wp-run--hooks="callbacks.useHooks"
+		>
+			Element with wp-run using hooks
+		</div>
+	</div>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.asset.php
new file mode 100644
index 00000000000000..bdaec8d1b67a9d
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.asset.php
@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
new file mode 100644
index 00000000000000..125ac392042306
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
@@ -0,0 +1,115 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	store,
+	useInit,
+	useWatch,
+	getElement,
+	privateApis,
+} from '@wordpress/interactivity';
+
+const { directive, cloneElement } = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
+
+// Custom directive to show hide the content elements in which it is placed.
+directive(
+	'show-children',
+	( {
+		directives: { 'show-children': showChildren },
+		element,
+		evaluate,
+	} ) => {
+		const entry = showChildren.find( ( { suffix } ) => suffix === null );
+		return evaluate( entry )
+			? element
+			: cloneElement( element, { children: null } );
+	},
+	{ priority: 9 }
+);
+
+const html = `
+<div
+	data-wp-interactive="directive-run"
+	data-wp-router-region='test-directive-run'
+>
+	<div data-testid="hydrated" data-wp-text="state.isHydrated"></div>
+	<div data-testid="mounted" data-wp-text="state.isMounted"></div>
+	<div data-testid="renderCount" data-wp-text="state.renderCount"></div>
+	<div data-testid="navigated">yes</div>
+
+	<div
+		data-wp-run--hydrated="callbacks.updateIsHydrated"
+		data-wp-run--renderCount="callbacks.updateRenderCount"
+		data-wp-text="state.clickCount"
+	></div>
+</div>
+`;
+
+const { state } = store( 'directive-run', {
+	state: {
+		isOpen: false,
+		isHydrated: 'no',
+		isMounted: 'no',
+		renderCount: 0,
+		clickCount: 0,
+	},
+	actions: {
+		toggle() {
+			state.isOpen = ! state.isOpen;
+		},
+		increment() {
+			state.clickCount = state.clickCount + 1;
+		},
+		*navigate() {
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			return actions.navigate( window.location, {
+				force: true,
+				html,
+			} );
+		},
+	},
+	callbacks: {
+		updateIsHydrated() {
+			setTimeout( () => ( state.isHydrated = 'yes' ) );
+		},
+		updateIsMounted() {
+			setTimeout( () => ( state.isMounted = 'yes' ) );
+		},
+		updateRenderCount() {
+			setTimeout( () => ( state.renderCount = state.renderCount + 1 ) );
+		},
+		useHooks() {
+			// Runs only on first render.
+			useInit( () => {
+				const { ref } = getElement();
+				ref.closest(
+					'[data-testid="wp-run hooks results"]'
+				).setAttribute( 'data-init', 'initialized' );
+				return () => {
+					ref.closest(
+						'[data-testid="wp-run hooks results"]'
+					).setAttribute( 'data-init', 'cleaned up' );
+				};
+			} );
+
+			// Runs whenever a signal consumed inside updates its value. Also
+			// executes for the first render.
+			useWatch( () => {
+				const { ref } = getElement();
+				const { clickCount } = state;
+				ref.closest(
+					'[data-testid="wp-run hooks results"]'
+				).setAttribute( 'data-watch', clickCount );
+				return () => {
+					ref.closest(
+						'[data-testid="wp-run hooks results"]'
+					).setAttribute( 'data-watch', 'cleaned up' );
+				};
+			} );
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json
deleted file mode 100644
index f79f89a6e81b8a..00000000000000
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"apiVersion": 2,
-	"name": "test/directive-slots",
-	"title": "E2E Interactivity tests - directive slots",
-	"category": "text",
-	"icon": "heart",
-	"description": "",
-	"supports": {
-		"interactivity": true
-	},
-	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-slots-view",
-	"render": "file:./render.php"
-}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-slots/render.php
deleted file mode 100644
index c9a989ccaf0275..00000000000000
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/render.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * HTML for testing the directive `data-wp-bind`.
- *
- * @package gutenberg-test-interactive-blocks
- */
-
-gutenberg_enqueue_module( 'directive-slots-view' );
-?>
-
-<div
-	data-wp-interactive='{ "namespace": "directive-slots" }'
-	data-wp-slot-provider
-	data-wp-context='{ "text": "fill" }'
->
-	<div data-testid="slots" data-wp-context='{ "text": "fill inside slots" }'>
-		<div
-			data-testid="slot-1"
-			data-wp-key="slot-1"
-			data-wp-slot="slot-1"
-			data-wp-context='{ "text": "fill inside slot 1" }'
-		>[1]</div>
-		<div
-			data-testid="slot-2"
-			data-wp-key="slot-2"
-			data-wp-slot='{ "name": "slot-2", "position": "before" }'
-			data-wp-context='{ "text": "[2]" }'
-			data-wp-text='context.text'
-			data-wp-on--click="actions.updateSlotText"
-		>[2]</div>
-		<div
-			data-testid="slot-3"
-			data-wp-key="slot-3"
-			data-wp-slot='{ "name": "slot-3", "position": "after" }'
-			data-wp-context='{ "text": "[3]" }'
-			data-wp-text='context.text'
-			data-wp-on--click="actions.updateSlotText"
-		>[3]</div>
-		<div
-			data-testid="slot-4"
-			data-wp-key="slot-4"
-			data-wp-slot='{ "name": "slot-4", "position": "children" }'
-			data-wp-context='{ "text": "fill inside slot 4" }'
-		>[4]</div>
-		<div
-			data-testid="slot-5"
-			data-wp-key="slot-5"
-			data-wp-slot='{ "name": "slot-5", "position": "replace" }'
-			data-wp-context='{ "text": "fill inside slot 5" }'
-		>[5]</div>
-	</div>
-
-	<div data-testid="fill-container">
-		<span
-			data-testid="fill"
-			data-wp-fill="state.slot"
-			data-wp-text="context.text"
-		>initial</span>
-	</div>
-
-	<div data-wp-on--click="actions.changeSlot">
-		<button data-testid="slot-1-button" data-slot="slot-1">slot-1</button>
-		<button data-testid="slot-2-button" data-slot="slot-2">slot-2</button>
-		<button data-testid="slot-3-button" data-slot="slot-3">slot-3</button>
-		<button data-testid="slot-4-button" data-slot="slot-4">slot-4</button>
-		<button data-testid="slot-5-button" data-slot="slot-5">slot-5</button>
-		<button data-testid="reset" data-slot="">reset</button>
-	</div>
-</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-slots/view.js
deleted file mode 100644
index a8673fea9eba92..00000000000000
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/view.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { store, getContext } from '@wordpress/interactivity';
-
-const { state } = store( 'directive-slots', {
-	state: {
-		slot: '',
-	},
-	actions: {
-		changeSlot( event ) {
-			state.slot = event.target.dataset.slot;
-		},
-		updateSlotText() {
-			const context = getContext();
-			const n = context.text[ 1 ];
-			context.text = `[${ n } updated]`;
-		},
-	},
-} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-style/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-style/block.json
index 6cbfa57b0784f1..a3b1c3fdb999c6 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-style/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-style/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-style",
 	"title": "E2E Interactivity tests - directive style",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-style-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-style/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-style/render.php
index b31f13cf1335c0..a783c5d97c216a 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-style/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-style/render.php
@@ -4,11 +4,9 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-style-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "directive-style" }'>
+<div data-wp-interactive="directive-style">
 	<button
 		data-wp-on--click="actions.toggleColor"
 		data-testid="toggle color"
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-style/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-style/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-style/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-text/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-text/block.json
index 7295849b9912d7..d8541ef3b0560d 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-text/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-text/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-text",
 	"title": "E2E Interactivity tests - directive text",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-text-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
index 98803669c6b0bc..ac1bc8d8e8476a 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
@@ -4,11 +4,9 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-text-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "directive-context" }'>
+<div data-wp-interactive="directive-context">
 	<div>
 		<span
 			data-wp-text="state.text"
@@ -34,4 +32,18 @@
 			Toggle Context Text
 		</button>
 	</div>
+	<div>
+		<span
+			data-wp-text="state.component"
+			data-testid="show state component"
+		></span>
+		<span
+			data-wp-text="state.number"
+			data-testid="show state number"
+		></span>
+		<span
+			data-wp-text="state.boolean"
+			data-testid="show state boolean"
+		></span>
+	</div>
 </div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.js
index 82f37f4f78f1fe..21ac110bf64395 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.js
@@ -1,11 +1,18 @@
 /**
  * WordPress dependencies
  */
-import { store, getContext } from '@wordpress/interactivity';
+import { store, getContext, privateApis } from '@wordpress/interactivity';
+
+const { h } = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
 
 const { state } = store( 'directive-context', {
 	state: {
 		text: 'Text 1',
+		component: () => h( 'div', {}, state.text ),
+		number: 1,
+		boolean: true,
 	},
 	actions: {
 		toggleStateText() {
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-watch/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/block.json
index 89285837ede3e4..cea78e32cbdc0b 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-watch/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/directive-watch",
 	"title": "E2E Interactivity tests - directive watch",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-watch-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-watch/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/render.php
index 4fc7dd96ee883d..a09e9df551e2ad 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-watch/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/render.php
@@ -4,11 +4,9 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'directive-watch-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "directive-watch" }'>
+<div data-wp-interactive="directive-watch">
 	<div data-wp-show-mock="state.isOpen">
 		<input
 			data-testid="input"
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-watch/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-watch/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/view.js
index d1acd45970dd6a..ad035811a0bcd7 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-watch/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/view.js
@@ -1,15 +1,21 @@
 /**
  * WordPress dependencies
  */
-import { store, directive } from '@wordpress/interactivity';
+import { store, privateApis } from '@wordpress/interactivity';
+
+const { directive } = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
 
 // Fake `data-wp-show-mock` directive to test when things are removed from the
 // DOM.  Replace with `data-wp-show` when it's ready.
 directive(
 	'show-mock',
 	( { directives: { 'show-mock': showMock }, element, evaluate } ) => {
-		const entry = showMock.find( ( { suffix } ) => suffix === 'default' );
-		if ( ! evaluate( entry ) ) return null;
+		const entry = showMock.find( ( { suffix } ) => suffix === null );
+		if ( ! evaluate( entry ) ) {
+			return null;
+		}
 		return element;
 	}
 );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/generator-scope/block.json b/packages/e2e-tests/plugins/interactive-blocks/generator-scope/block.json
new file mode 100644
index 00000000000000..32388d7a641d60
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/generator-scope/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/generator-scope",
+	"title": "E2E Interactivity tests - generator scope",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/generator-scope/render.php b/packages/e2e-tests/plugins/interactive-blocks/generator-scope/render.php
new file mode 100644
index 00000000000000..c9991e441627d1
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/generator-scope/render.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * HTML for testing scope restoration with generators.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div
+	data-wp-interactive="test/generator-scope"
+	<?php echo wp_interactivity_data_wp_context( array( 'result' => '' ) ); ?>
+>
+	<input readonly data-wp-bind--value="context.result" data-testid="result" />
+	<button type="button" data-wp-on--click="callbacks.resolve" data-testid="resolve">Async resolve</button>
+	<button type="button" data-wp-on--click="callbacks.reject" data-testid="reject">Async reject</button>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/generator-scope/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/generator-scope/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/generator-scope/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/generator-scope/view.js b/packages/e2e-tests/plugins/interactive-blocks/generator-scope/view.js
new file mode 100644
index 00000000000000..26d526263cb462
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/generator-scope/view.js
@@ -0,0 +1,23 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getContext } from '@wordpress/interactivity';
+
+store( 'test/generator-scope', {
+	callbacks: {
+		*resolve() {
+			try {
+				getContext().result = yield Promise.resolve( 'ok' );
+			} catch ( err ) {
+				getContext().result = err.toString();
+			}
+		},
+		*reject() {
+			try {
+				getContext().result = yield Promise.reject( new Error( '😘' ) );
+			} catch ( err ) {
+				getContext().result = err.toString();
+			}
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/get-server-context/block.json b/packages/e2e-tests/plugins/interactive-blocks/get-server-context/block.json
new file mode 100644
index 00000000000000..c635846328b9e4
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/get-server-context/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/get-server-context",
+	"title": "E2E Interactivity tests - getServerContext",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/get-server-context/render.php b/packages/e2e-tests/plugins/interactive-blocks/get-server-context/render.php
new file mode 100644
index 00000000000000..a71ced20dc46a1
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/get-server-context/render.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * HTML for testing the getServerContext() function.
+ *
+ * @package gutenberg-test-interactive-blocks
+ *
+ * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+ */
+
+$link1      = $attributes['links']['modified'];
+$link2      = $attributes['links']['newProps'];
+$parent_ctx = $attributes['parentContext'];
+$child_ctx  = $attributes['childContext'];
+?>
+
+<nav
+	data-testid="navigate"
+	data-wp-interactive="test/get-server-context"
+	data-wp-on--click="actions.navigate"
+>
+	<a data-testid="modified" href="<?php echo esc_url( $link1 ); ?>">modified</a>
+	<a data-testid="newProps" href="<?php echo esc_url( $link2 ); ?>">newProps</a>
+</nav>
+
+<div
+	data-wp-interactive="test/get-server-context"
+	data-wp-router-region="server-context"
+	data-wp-watch="callbacks.updateServerContextParent"
+	<?php echo wp_interactivity_data_wp_context( $parent_ctx ); ?>
+>
+	<div
+		data-wp-watch="callbacks.updateServerContextChild"
+		<?php echo wp_interactivity_data_wp_context( $child_ctx ); ?>
+	>
+		<div data-testid="prop" data-wp-text="context.prop"></div>
+		<div data-testid="nested.prop" data-wp-text="context.nested.prop"></div>
+		<div data-testid="newProp" data-wp-text="context.newProp"></div>
+		<div data-testid="nested.newProp" data-wp-text="context.nested.newProp"></div>
+		<div data-testid="inherited.prop" data-wp-text="context.inherited.prop"></div>
+		<div data-testid="inherited.newProp" data-wp-text="context.inherited.newProp"></div>
+
+		<button
+			data-testid="tryToModifyServerContext"
+			<?php echo wp_interactivity_data_wp_context( array( 'result' => 'modify' ) ); ?>
+			data-wp-on--click="actions.attemptModification"
+			data-wp-text="context.result">
+		>
+			modify
+		</button>
+	</div>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/get-server-context/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/get-server-context/view.asset.php
new file mode 100644
index 00000000000000..bdaec8d1b67a9d
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/get-server-context/view.asset.php
@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);
diff --git a/packages/e2e-tests/plugins/interactive-blocks/get-server-context/view.js b/packages/e2e-tests/plugins/interactive-blocks/get-server-context/view.js
new file mode 100644
index 00000000000000..83f016e2eac16a
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/get-server-context/view.js
@@ -0,0 +1,46 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getContext, getServerContext } from '@wordpress/interactivity';
+
+store( 'test/get-server-context', {
+	actions: {
+		*navigate( e ) {
+			e.preventDefault();
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			yield actions.navigate( e.target.href );
+		},
+		attemptModification() {
+			try {
+				getServerContext().prop = 'updated from client';
+				getContext().result = 'unexpectedly modified ❌';
+			} catch ( e ) {
+				getContext().result = 'not modified ✅';
+			}
+		},
+	},
+	callbacks: {
+		updateServerContextParent() {
+			const ctx = getContext();
+			const { prop, newProp, nested, inherited } = getServerContext();
+			ctx.prop = prop;
+			ctx.newProp = newProp;
+			ctx.nested.prop = nested.prop;
+			ctx.nested.newProp = nested.newProp;
+			ctx.inherited.prop = inherited.prop;
+			ctx.inherited.newProp = inherited.newProp;
+		},
+		updateServerContextChild() {
+			const ctx = getContext();
+			const { prop, newProp, nested, inherited } = getServerContext();
+			ctx.prop = prop;
+			ctx.newProp = newProp;
+			ctx.nested.prop = nested.prop;
+			ctx.nested.newProp = nested.newProp;
+			ctx.inherited.prop = inherited.prop;
+			ctx.inherited.newProp = inherited.newProp;
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/get-server-state/block.json b/packages/e2e-tests/plugins/interactive-blocks/get-server-state/block.json
new file mode 100644
index 00000000000000..abf76eb9beddcc
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/get-server-state/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/get-server-state",
+	"title": "E2E Interactivity tests - getServerState",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/get-server-state/render.php b/packages/e2e-tests/plugins/interactive-blocks/get-server-state/render.php
new file mode 100644
index 00000000000000..abc4efd8272d5b
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/get-server-state/render.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * HTML for testing the getServerState() function.
+ *
+ * @package gutenberg-test-interactive-blocks
+ *
+ * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+ */
+
+if ( isset( $attributes['state'] ) ) {
+	wp_interactivity_state( 'test/get-server-state', $attributes['state'] );
+}
+?>
+
+<div
+	data-wp-interactive="test/get-server-state"
+	data-wp-watch="callbacks.updateState"
+>
+	<div data-testid="prop" data-wp-text="state.prop"></div>
+	<div data-testid="nested.prop" data-wp-text="state.nested.prop"></div>
+	<div data-testid="newProp" data-wp-text="state.newProp"></div>
+	<div data-testid="nested.newProp" data-wp-text="state.nested.newProp"></div>
+
+	<button
+		data-testid="tryToModifyServerState"
+		<?php echo wp_interactivity_data_wp_context( array( 'result' => 'modify' ) ); ?>
+		data-wp-on--click="actions.attemptModification"
+		data-wp-text="context.result">
+	>
+		modify
+	</button>
+
+
+	<nav>
+		<?php
+		if ( isset( $attributes['links'] ) ) {
+			foreach ( $attributes['links'] as $key => $link ) {
+				$i = $key += 1;
+				echo <<<HTML
+				<a
+					data-testid="link $i"
+					data-wp-on--click="actions.navigate"
+					href="$link"
+				>link $i</a>
+HTML;
+			}
+		}
+		?>
+	</nav>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/get-server-state/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/get-server-state/view.asset.php
new file mode 100644
index 00000000000000..bdaec8d1b67a9d
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/get-server-state/view.asset.php
@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);
diff --git a/packages/e2e-tests/plugins/interactive-blocks/get-server-state/view.js b/packages/e2e-tests/plugins/interactive-blocks/get-server-state/view.js
new file mode 100644
index 00000000000000..db2992ec4a5863
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/get-server-state/view.js
@@ -0,0 +1,33 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getServerState, getContext } from '@wordpress/interactivity';
+
+const { state } = store( 'test/get-server-state', {
+	actions: {
+		*navigate( e ) {
+			e.preventDefault();
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			yield actions.navigate( e.target.href );
+		},
+		attemptModification() {
+			try {
+				getServerState().prop = 'updated from client';
+				getContext().result = 'unexpectedly modified ❌';
+			} catch ( e ) {
+				getContext().result = 'not modified ✅';
+			}
+		},
+	},
+	callbacks: {
+		updateState() {
+			const { prop, newProp, nested } = getServerState();
+			state.prop = prop;
+			state.newProp = newProp;
+			state.nested.prop = nested.prop;
+			state.nested.newProp = nested.newProp;
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/namespace/block.json b/packages/e2e-tests/plugins/interactive-blocks/namespace/block.json
new file mode 100644
index 00000000000000..c0382286a16216
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/namespace/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test-namespace/directive-bind",
+	"title": "E2E Interactivity tests - directive bind",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/namespace/render.php b/packages/e2e-tests/plugins/interactive-blocks/namespace/render.php
new file mode 100644
index 00000000000000..0b7e40b6c1653b
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/namespace/render.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-bind`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div data-wp-interactive="">
+	<a data-wp-bind--href="state.url" data-testid="empty namespace"></a>
+</div>
+
+<div data-wp-interactive="namespace">
+	<a data-wp-bind--href="state.url" data-testid="correct namespace"></a>
+</div>
+
+<div data-wp-interactive="{}">
+	<a data-wp-bind--href="state.url" data-testid="object namespace"></a>
+</div>
+
+<div data-wp-interactive="null">
+	<a data-wp-bind--href="state.url" data-testid="null namespace"></a>
+</div>
+
+<div data-wp-interactive="2">
+	<a data-wp-bind--href="state.url" data-testid="number namespace"></a>
+</div>
+
+<div data-wp-interactive>
+	<a data-wp-bind--href="other::state.url" data-testid="other namespace"></a>
+</div>
+
+<div data-wp-interactive="true">
+	<a data-wp-bind--href="state.url" data-testid="true namespace"></a>
+</div>
+
+<div data-wp-interactive="false">
+	<a data-wp-bind--href="state.url" data-testid="false namespace"></a>
+</div>
+<div data-wp-interactive="[]">
+	<a data-wp-bind--href="state.url" data-testid="[] namespace"></a>
+</div>
+<div data-wp-interactive='"quoted string"'>
+	<a data-wp-bind--href="state.url" data-testid="quoted namespace"></a>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/namespace/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/namespace/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/namespace/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/namespace/view.js b/packages/e2e-tests/plugins/interactive-blocks/namespace/view.js
new file mode 100644
index 00000000000000..24f61fb03290ad
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/namespace/view.js
@@ -0,0 +1,64 @@
+/**
+ * WordPress dependencies
+ */
+import { store } from '@wordpress/interactivity';
+
+store( '', {
+	state: {
+		url: '/empty-string-url',
+	},
+} );
+
+store( 'namespace', {
+	state: {
+		url: '/namespace-url',
+	},
+} );
+
+store( 'other', {
+	state: {
+		url: '/other-store-url',
+	},
+} );
+
+store( 'null', {
+	state: {
+		url: '/null-url',
+	},
+} );
+
+store( '2', {
+	state: {
+		url: '/number-url',
+	},
+} );
+
+store( '{}', {
+	state: {
+		url: '/object-url',
+	},
+} );
+
+store( 'true', {
+	state: {
+		url: '/true-url',
+	},
+} );
+
+store( 'false', {
+	state: {
+		url: '/false-url',
+	},
+} );
+
+store( '[]', {
+	state: {
+		url: '/array-url',
+	},
+} );
+
+store( '"quoted string"', {
+	state: {
+		url: '/quoted-url',
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/negation-operator/block.json b/packages/e2e-tests/plugins/interactive-blocks/negation-operator/block.json
index 68da53367ad63a..44ff7fc68c5a3c 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/negation-operator/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/negation-operator/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/negation-operator",
 	"title": "E2E Interactivity tests - negation operator",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "negation-operator-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/negation-operator/render.php b/packages/e2e-tests/plugins/interactive-blocks/negation-operator/render.php
index 8d686e6c3ff464..2e68c91d39f1e1 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/negation-operator/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/negation-operator/render.php
@@ -4,11 +4,9 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'negation-operator-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "negation-operator" }'>
+<div data-wp-interactive="negation-operator">
 	<button
 		data-wp-on--click="actions.toggle"
 		data-testid="toggle active value"
diff --git a/packages/e2e-tests/plugins/interactive-blocks/negation-operator/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/negation-operator/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/negation-operator/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/block.json b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/block.json
index bdb5a19e030624..40b8739fcb81ad 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/router-navigate",
 	"title": "E2E Interactivity tests - router navigate",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "router-navigate-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php
index 6dceffa32da8f8..d7264eceda7c9e 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php
@@ -3,21 +3,38 @@
  * HTML for testing the router navigate function.
  *
  * @package gutenberg-test-interactive-blocks
+ *
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
 
-gutenberg_enqueue_module( 'router-navigate-view' );
+if ( $attributes['disableNavigation'] ) {
+	wp_interactivity_config(
+		'core/router',
+		array( 'clientNavigationDisabled' => true )
+	);
+}
+
+if ( isset( $attributes['data'] ) ) {
+	wp_interactivity_state(
+		'router',
+		array( 'data' => $attributes['data'] )
+	);
+}
 ?>
 
 <div
-	data-wp-interactive='{ "namespace": "router" }'
-	data-wp-navigation-id="region-1"
+	data-wp-interactive="router"
+	data-wp-router-region="region-1"
 >
 	<h2 data-testid="title"><?php echo $attributes['title']; ?></h2>
 
 	<output
-		data-testid="router navigations"
-		data-wp-text="state.navigations"
+		data-testid="router navigations pending"
+		data-wp-text="state.navigations.pending"
+	>NaN</output>
+	<output
+		data-testid="router navigations count"
+		data-wp-text="state.navigations.count"
 	>NaN</output>
 	<output
 		data-testid="router status"
@@ -31,24 +48,30 @@
 		Timeout <span data-wp-text="state.timeout">NaN</span>
 	</button>
 
-	<?php
-	if ( isset( $attributes['links'] ) ) {
-		foreach ( $attributes['links'] as $key => $link ) {
-			$i = $key += 1;
-			echo <<<HTML
-			<a
-				data-testid="link $i"
-				data-wp-on--click="actions.navigate"
-				href="$link"
-			>link $i</a>
-			<a
-				data-testid="link $i with hash"
-				data-wp-on--click="actions.navigate"
-				data-force-navigation="true"
-				href="$link#link-$i-with-hash"
-			>link $i with hash</a>
+	<nav>
+		<?php
+		if ( isset( $attributes['links'] ) ) {
+			foreach ( $attributes['links'] as $key => $link ) {
+				$i = $key += 1;
+				echo <<<HTML
+				<a
+					data-testid="link $i"
+					data-wp-on--click="actions.navigate"
+					href="$link"
+				>link $i</a>
+				<a
+					data-testid="link $i with hash"
+					data-wp-on--click="actions.navigate"
+					data-force-navigation="true"
+					href="$link#link-$i-with-hash"
+				>link $i with hash</a>
 HTML;
+			}
 		}
-	}
-	?>
+		?>
+	</nav>
+	<div data-testid="getterProp" data-wp-text="state.data.getterProp"></div>
+	<div data-testid="prop1" data-wp-text="state.data.prop1"></div>
+	<div data-testid="prop2" data-wp-text="state.data.prop2"></div>
+	<div data-testid="prop3" data-wp-text="state.data.prop3"></div>
 </div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.asset.php
new file mode 100644
index 00000000000000..bdaec8d1b67a9d
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.asset.php
@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js
index 59d0e4b56f70c7..bd1d6e11647799 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js
@@ -1,29 +1,41 @@
 /**
  * WordPress dependencies
  */
-import { store, navigate } from '@wordpress/interactivity';
+import { store } from '@wordpress/interactivity';
 
 const { state } = store( 'router', {
 	state: {
 		status: 'idle',
-		navigations: 0,
+		navigations: {
+			pending: 0,
+			count: 0,
+		},
 		timeout: 10000,
+		data: {
+			get getterProp() {
+				return `value from getter (${ state.data.prop1 })`;
+			},
+		},
 	},
 	actions: {
 		*navigate( e ) {
 			e.preventDefault();
 
-			state.navigations += 1;
+			state.navigations.count += 1;
+			state.navigations.pending += 1;
 			state.status = 'busy';
 
 			const force = e.target.dataset.forceNavigation === 'true';
 			const { timeout } = state;
 
-			yield navigate( e.target.href, { force, timeout } );
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			yield actions.navigate( e.target.href, { force, timeout } );
 
-			state.navigations -= 1;
+			state.navigations.pending -= 1;
 
-			if ( state.navigations === 0 ) {
+			if ( state.navigations.pending === 0 ) {
 				state.status = 'idle';
 			}
 		},
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-regions/block.json b/packages/e2e-tests/plugins/interactive-blocks/router-regions/block.json
index 44cc260d87d3f6..453d26d6d792ef 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-regions/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-regions/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/router-regions",
 	"title": "E2E Interactivity tests - router regions",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "router-regions-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php b/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
index 0bcc14ccb266f7..7cdd8f0cccdd35 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
@@ -3,17 +3,16 @@
  * HTML for testing the hydration of router regions.
  *
  * @package gutenberg-test-interactive-blocks
+ *
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
-
-gutenberg_enqueue_module( 'router-regions-view' );
 ?>
 
 <section>
 	<h2>Region 1</h2>
 	<div
 		data-wp-interactive='{"namespace": "router-regions"}'
-		data-wp-navigation-id="region-1"
+		data-wp-router-region="region-1"
 	>
 		<p
 			data-testid="region-1-text"
@@ -57,7 +56,7 @@
 	<h2>Region 2</h2>
 	<div
 		data-wp-interactive='{"namespace": "router-regions"}'
-		data-wp-navigation-id="region-2"
+		data-wp-router-region="region-2"
 	>
 		<p
 			data-testid="region-2-text"
@@ -87,7 +86,7 @@
 				<h2>Nested region</h2>
 				<div
 					data-wp-interactive='{"namespace": "router-regions"}'
-					data-wp-navigation-id="nested-region"
+					data-wp-router-region="nested-region"
 				>
 					<p
 						data-testid="nested-region-ssr"
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.asset.php
new file mode 100644
index 00000000000000..bdaec8d1b67a9d
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.asset.php
@@ -0,0 +1,9 @@
+<?php return array(
+	'dependencies' => array(
+		'@wordpress/interactivity',
+		array(
+			'id'     => '@wordpress/interactivity-router',
+			'import' => 'dynamic',
+		),
+	),
+);
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js b/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js
index 302086c8168f22..f3468eb88aff01 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, navigate, getContext } from '@wordpress/interactivity';
+import { store, getContext } from '@wordpress/interactivity';
 
 const { state } = store( 'router-regions', {
 	state: {
@@ -19,7 +19,10 @@ const { state } = store( 'router-regions', {
 		router: {
 			*navigate( e ) {
 				e.preventDefault();
-				yield navigate( e.target.href );
+				const { actions } = yield import(
+					'@wordpress/interactivity-router'
+				);
+				yield actions.navigate( e.target.href );
 			},
 			back() {
 				history.back();
diff --git a/packages/e2e-tests/plugins/interactive-blocks/store-tag/block.json b/packages/e2e-tests/plugins/interactive-blocks/store-tag/block.json
index 4611288de796c9..6b7fbe48b75aaf 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/store-tag/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/store-tag/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/store-tag",
 	"title": "E2E Interactivity tests - store tag",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "store-tag-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php b/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php
index 57200f295c33b4..73a58042ec7af5 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php
@@ -3,17 +3,16 @@
  * HTML for testing the hydration of the serialized store.
  *
  * @package gutenberg-test-interactive-blocks
+ *
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
 
-gutenberg_enqueue_module( 'store-tag-view' );
-
 // These variables simulates SSR.
 $test_store_tag_counter = 'ok' === $attributes['condition'] ? 3 : 0;
 $test_store_tag_double  = $test_store_tag_counter * 2;
 ?>
 
-<div data-wp-interactive='{ "namespace": "store-tag" }'>
+<div data-wp-interactive="store-tag">
 	<div>
 		Counter:
 		<span
@@ -48,7 +47,7 @@
 if ( 'missing' !== $attributes['condition'] ) {
 
 	if ( 'ok' === $attributes['condition'] ) {
-		$test_store_tag_json = '{ "store-tag": { "counter": { "value": 3 } } }';
+		$test_store_tag_json = '{ "state": { "store-tag": { "counter": { "value": 3 } } } }';
 	}
 
 	if ( 'corrupted-json' === $attributes['condition'] ) {
@@ -60,7 +59,7 @@
 	}
 
 	echo <<<HTML
-	<script type="application/json" id="wp-interactivity-initial-state">
+	<script type="application/json" id="wp-interactivity-data">
 		$test_store_tag_json
 	</script>
 HTML;
diff --git a/packages/e2e-tests/plugins/interactive-blocks/store-tag/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/store-tag/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/store-tag/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/store/block.json b/packages/e2e-tests/plugins/interactive-blocks/store/block.json
new file mode 100644
index 00000000000000..bbf42f832de29f
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/store/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/store",
+	"title": "E2E Interactivity tests - store definition",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/store/render.php b/packages/e2e-tests/plugins/interactive-blocks/store/render.php
new file mode 100644
index 00000000000000..325d27b9d5aab3
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/store/render.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * HTML for testing the `store` function.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div data-wp-interactive="test/store">
+	<div data-wp-text="state.0" data-testid="state-0"></div>
+	<div
+		data-testid="non-plain object"
+		data-wp-text="state.isNotProxified"
+		data-wp-init="callbacks.init"
+	></div>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/store/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/store/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/store/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/store/view.js b/packages/e2e-tests/plugins/interactive-blocks/store/view.js
new file mode 100644
index 00000000000000..269be9b23bcbbf
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/store/view.js
@@ -0,0 +1,23 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getElement } from '@wordpress/interactivity';
+
+// A non-object state should never be allowed.
+store( 'test/store', { state: [ 'wrong' ] } );
+
+const { state } = store( 'test/store', {
+	state: {
+		0: 'right',
+		get isNotProxified() {
+			const { ref } = getElement();
+			return state.elementRef === ref;
+		},
+	},
+	callbacks: {
+		init() {
+			const { ref } = getElement();
+			state.elementRef = ref; // HTMLElement
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/block.json b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/block.json
index fb852acefb9116..7885dc4be47903 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/tovdom-islands",
 	"title": "E2E Interactivity tests - tovdom islands",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "tovdom-islands-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/render.php b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/render.php
index 7b1bc6513977b8..f42dda598c1f6e 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/render.php
@@ -4,8 +4,6 @@
  *
  * @package gutenberg-test-interactive-blocks
  */
-
-gutenberg_enqueue_module( 'tovdom-islands-view' );
 ?>
 
 <div>
@@ -15,15 +13,23 @@
 		</span>
 	</div>
 
-	<div data-wp-interactive='{ "namespace": "tovdom-islands" }'>
+	<div data-wp-interactive="tovdom-islands">
+		<div data-wp-show-mock="state.falseValue">
+			<span data-testid="inside an island with json object">
+				This should not be shown because it is inside an island.
+			</span>
+		</div>
+	</div>
+
+	<div data-wp-interactive="tovdom-islands">
 		<div data-wp-show-mock="state.falseValue">
-			<span data-testid="inside an island">
+			<span data-testid="inside an island with string">
 				This should not be shown because it is inside an island.
 			</span>
 		</div>
 	</div>
 
-	<div data-wp-interactive='{ "namespace": "tovdom-islands" }'>
+	<div data-wp-interactive="tovdom-islands">
 		<div data-wp-ignore>
 			<div data-wp-show-mock="state.falseValue">
 				<span
@@ -36,8 +42,8 @@
 		</div>
 	</div>
 
-	<div data-wp-interactive='{ "namespace": "tovdom-islands" }'>
-		<div data-wp-interactive='{ "namespace": "tovdom-islands" }'>
+	<div data-wp-interactive="tovdom-islands">
+		<div data-wp-interactive="tovdom-islands">
 			<div
 				data-wp-show-mock="state.falseValue"
 				data-testid="island inside another island"
@@ -50,10 +56,10 @@
 		</div>
 	</div>
 
-	<div data-wp-interactive='{ "namespace": "tovdom-islands" }'>
+	<div data-wp-interactive="tovdom-islands">
 		<div>
 			<div
-				data-wp-interactive='{ "namespace": "tovdom-islands" }'
+				data-wp-interactive="tovdom-islands"
 				data-wp-ignore
 			>
 				<div data-wp-show-mock="state.falseValue">
@@ -68,4 +74,14 @@
 			</div>
 		</div>
 	</div>
+
+	<div data-wp-interactive="tovdom-islands">
+		<div data-wp-interactive="something-new"></div>
+		<div data-wp-show-mock="state.falseValue">
+			<span data-testid="directive after different namespace">
+				The directive above should keep the `tovdom-island` namespace,
+				so this message should not be visible.
+			</span>
+		</div>
+	</div>
 </div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/view.js b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/view.js
index ba6106801fbc7d..8016e931624a16 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/view.js
@@ -1,14 +1,18 @@
 /**
  * WordPress dependencies
  */
-import { store, directive, createElement as h } from '@wordpress/interactivity';
+import { store, privateApis } from '@wordpress/interactivity';
+
+const { directive, h } = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
 
 // Fake `data-wp-show-mock` directive to test when things are removed from the
 // DOM.  Replace with `data-wp-show` when it's ready.
 directive(
 	'show-mock',
 	( { directives: { 'show-mock': showMock }, element, evaluate } ) => {
-		const entry = showMock.find( ( { suffix } ) => suffix === 'default' );
+		const entry = showMock.find( ( { suffix } ) => suffix === null );
 
 		if ( ! evaluate( entry ) ) {
 			element.props.children = h(
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom/block.json b/packages/e2e-tests/plugins/interactive-blocks/tovdom/block.json
index b685919e164821..00d0c1ac51c375 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/tovdom/block.json
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "test/tovdom",
 	"title": "E2E Interactivity tests - tovdom",
@@ -9,6 +10,6 @@
 		"interactivity": true
 	},
 	"textdomain": "e2e-interactivity",
-	"viewScript": "tovdom-view",
+	"viewScriptModule": "file:./view.js",
 	"render": "file:./render.php"
 }
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom/cdata.js b/packages/e2e-tests/plugins/interactive-blocks/tovdom/cdata.js
index 506e899e42850c..ca0f8009d1ae4f 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/tovdom/cdata.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom/cdata.js
@@ -10,6 +10,4 @@ const cdata = `
 const cdataElement = new DOMParser()
 	.parseFromString( cdata, 'text/xml' )
 	.querySelector( 'div' );
-document
-	.getElementById( 'replace-with-cdata' )
-	.replaceWith( cdataElement );
+document.getElementById( 'replace-with-cdata' ).replaceWith( cdataElement );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom/render.php b/packages/e2e-tests/plugins/interactive-blocks/tovdom/render.php
index 309b42a5829359..5dc4e6d30097bd 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/tovdom/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom/render.php
@@ -8,11 +8,9 @@
 $plugin_url   = plugin_dir_url( __DIR__ );
 $src_proc_ins = $plugin_url . 'tovdom/processing-instructions.js';
 $src_cdata    = $plugin_url . 'tovdom/cdata.js';
-
-gutenberg_enqueue_module( 'tovdom-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "tovdom" }'>
+<div data-wp-interactive="tovdom">
 	<div data-testid="it should delete comments">
 		<!-- ##1## -->
 		<div data-testid="it should keep this node between comments">
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/tovdom/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/with-scope/block.json b/packages/e2e-tests/plugins/interactive-blocks/with-scope/block.json
new file mode 100644
index 00000000000000..e73c0c04fa6450
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/with-scope/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/with-scope",
+	"title": "E2E Interactivity tests - with scope",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScriptModule": "file:./view.js",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php b/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php
new file mode 100644
index 00000000000000..725bb539a30a6c
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-on`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+?>
+
+<div data-wp-interactive="with-scope" data-wp-context='{"asyncCounter": 0, "syncCounter": 0}' data-wp-init--a='callbacks.asyncInit' data-wp-init--b='callbacks.syncInit'>
+		<p data-wp-text="context.asyncCounter" data-testid="asyncCounter">0</p>
+		<p data-wp-text="context.syncCounter" data-testid="syncCounter">0</p>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/with-scope/view.asset.php b/packages/e2e-tests/plugins/interactive-blocks/with-scope/view.asset.php
new file mode 100644
index 00000000000000..db23afdf657a19
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/with-scope/view.asset.php
@@ -0,0 +1 @@
+<?php return array( 'dependencies' => array( '@wordpress/interactivity' ) );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/with-scope/view.js b/packages/e2e-tests/plugins/interactive-blocks/with-scope/view.js
new file mode 100644
index 00000000000000..daa3b824d309ac
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/with-scope/view.js
@@ -0,0 +1,24 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getContext, withScope } from '@wordpress/interactivity';
+
+store( 'with-scope', {
+	callbacks: {
+		asyncInit: () => {
+			setTimeout(
+				withScope( function* () {
+					yield new Promise( ( resolve ) =>
+						setTimeout( resolve, 1 )
+					);
+					const context = getContext();
+					context.asyncCounter += 1;
+				}, 1 )
+			);
+		},
+		syncInit: () => {
+			const context = getContext();
+			context.syncCounter += 1;
+		},
+	},
+} );
diff --git a/packages/e2e-tests/plugins/lightbox-allow-editing-false-enabled-false.php b/packages/e2e-tests/plugins/lightbox-allow-editing-false-enabled-false.php
new file mode 100644
index 00000000000000..c5197cc7198965
--- /dev/null
+++ b/packages/e2e-tests/plugins/lightbox-allow-editing-false-enabled-false.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Plugin Name: Lightbox Allow Editing False Enabled False
+ * Plugin URI: https://github.com/WordPress/gutenberg
+ * Author: Gutenberg Team
+ *
+ * @package gutenberg-lightbox-allow-editing-false-enabled-false
+ */
+
+function filter_theme_json_theme( $theme_json ) {
+	$new_data = array(
+		'version'  => 2,
+		'settings' => array(
+			'blocks' => array(
+				'core/image' => array(
+					'lightbox' => array(
+						'allowEditing' => false,
+						'enabled'      => false,
+					),
+				),
+			),
+		),
+	);
+	return $theme_json->update_with( $new_data );
+}
+add_filter( 'wp_theme_json_data_theme', 'filter_theme_json_theme' );
diff --git a/packages/e2e-tests/plugins/observe-typing.php b/packages/e2e-tests/plugins/observe-typing.php
new file mode 100644
index 00000000000000..a9152bc79684c5
--- /dev/null
+++ b/packages/e2e-tests/plugins/observe-typing.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Plugin Name: Gutenberg Test Observe Typing
+ * Plugin URI: https://github.com/WordPress/gutenberg
+ * Author: Gutenberg Team
+ *
+ * @package gutenberg-test-block-api
+ */
+
+/**
+ * Registers a custom script for the plugin.
+ */
+function enqueue_observe_typing_plugin_script() {
+	wp_enqueue_script(
+		'gutenberg-test-observe-typing',
+		plugins_url( 'observe-typing/index.js', __FILE__ ),
+		array(
+			'wp-blocks',
+			'wp-block-editor',
+			'wp-components',
+			'wp-element',
+		),
+		filemtime( plugin_dir_path( __FILE__ ) . 'observe-typing/index.js' ),
+		true
+	);
+}
+
+add_action( 'init', 'enqueue_observe_typing_plugin_script' );
diff --git a/packages/e2e-tests/plugins/observe-typing/index.js b/packages/e2e-tests/plugins/observe-typing/index.js
new file mode 100644
index 00000000000000..fbfb6a5de757d9
--- /dev/null
+++ b/packages/e2e-tests/plugins/observe-typing/index.js
@@ -0,0 +1,45 @@
+( function () {
+	const { registerBlockType } = wp.blocks;
+	const { useBlockProps, BlockControls } = wp.blockEditor;
+	const { Dropdown, ToolbarButton, TextControl } = wp.components;
+	const { createElement: el, useState } = wp.element;
+
+	registerBlockType( 'e2e-tests/observe-typing', {
+		apiVersion: 3,
+		title: 'Observe Typing',
+		description: 'Observe Typing test block.',
+		category: 'widgets',
+		edit: function Edit() {
+			const [ value, setValue ] = useState( '' );
+			const blockProps = useBlockProps();
+
+			return el(
+				'div',
+				blockProps,
+				el(
+					BlockControls,
+					{ group: 'block' },
+					el( Dropdown, {
+						renderToggle: ( { onToggle } ) =>
+							el(
+								ToolbarButton,
+								{
+									onClick: onToggle,
+								},
+								'Open Dropdown'
+							),
+						renderContent: () =>
+							el( TextControl, {
+								label: 'Dropdown field',
+								value,
+								onChange: setValue,
+								__next40pxDefaultSize: true,
+							} ),
+					} )
+				),
+				el( 'p', {}, 'Hello Editor!' )
+			);
+		},
+		save: () => null,
+	} );
+} )();
diff --git a/packages/e2e-tests/plugins/pattern-recursion.php b/packages/e2e-tests/plugins/pattern-recursion.php
new file mode 100644
index 00000000000000..eb3a2051551a26
--- /dev/null
+++ b/packages/e2e-tests/plugins/pattern-recursion.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Plugin Name: Gutenberg Test Protection Against Recursive Patterns
+ * Plugin URI: https://github.com/WordPress/gutenberg
+ * Author: Gutenberg Team
+ *
+ * @package gutenberg-test-pattern-recursion
+ */
+
+add_filter(
+	'init',
+	function () {
+		register_block_pattern(
+			'evil/recursive',
+			array(
+				'title'       => 'Evil recursive',
+				'description' => 'Evil recursive',
+				'content'     => '<!-- wp:paragraph --><p>Hello</p><!-- /wp:paragraph --><!-- wp:pattern {"slug":"evil/recursive"} /-->',
+			)
+		);
+	}
+);
diff --git a/packages/e2e-tests/plugins/plugins-api.php b/packages/e2e-tests/plugins/plugins-api.php
index 1accfb3fc718da..10e35f16226f2a 100644
--- a/packages/e2e-tests/plugins/plugins-api.php
+++ b/packages/e2e-tests/plugins/plugins-api.php
@@ -15,7 +15,7 @@ function enqueue_plugins_api_plugin_scripts() {
 		'gutenberg-test-plugins-api-post-status-info',
 		plugins_url( 'plugins-api/post-status-info.js', __FILE__ ),
 		array(
-			'wp-edit-post',
+			'wp-editor',
 			'wp-element',
 			'wp-i18n',
 			'wp-plugins',
@@ -28,7 +28,7 @@ function enqueue_plugins_api_plugin_scripts() {
 		'gutenberg-test-plugins-api-publish-pane;',
 		plugins_url( 'plugins-api/publish-panel.js', __FILE__ ),
 		array(
-			'wp-edit-post',
+			'wp-editor',
 			'wp-element',
 			'wp-i18n',
 			'wp-plugins',
@@ -44,7 +44,7 @@ function enqueue_plugins_api_plugin_scripts() {
 			'wp-components',
 			'wp-compose',
 			'wp-data',
-			'wp-edit-post',
+			'wp-editor',
 			'wp-block-editor',
 			'wp-editor',
 			'wp-element',
@@ -63,7 +63,7 @@ function enqueue_plugins_api_plugin_scripts() {
 			'wp-components',
 			'wp-compose',
 			'wp-data',
-			'wp-edit-post',
+			'wp-editor',
 			'wp-block-editor',
 			'wp-element',
 			'wp-i18n',
@@ -78,7 +78,7 @@ function enqueue_plugins_api_plugin_scripts() {
 		'gutenberg-test-plugins-api-document-setting',
 		plugins_url( 'plugins-api/document-setting.js', __FILE__ ),
 		array(
-			'wp-edit-post',
+			'wp-editor',
 			'wp-element',
 			'wp-i18n',
 			'wp-plugins',
@@ -86,6 +86,19 @@ function enqueue_plugins_api_plugin_scripts() {
 		filemtime( plugin_dir_path( __FILE__ ) . 'plugins-api/document-setting.js' ),
 		true
 	);
+
+	wp_enqueue_script(
+		'gutenberg-test-plugins-api-preview-menu',
+		plugins_url( 'plugins-api/preview-menu.js', __FILE__ ),
+		array(
+			'wp-editor',
+			'wp-element',
+			'wp-i18n',
+			'wp-plugins',
+		),
+		filemtime( plugin_dir_path( __FILE__ ) . 'plugins-api/preview-menu.js' ),
+		true
+	);
 }
 
 add_action( 'init', 'enqueue_plugins_api_plugin_scripts' );
diff --git a/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js b/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js
index f73ad5c68013b6..87ee3a4f65590c 100644
--- a/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js
+++ b/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js
@@ -8,8 +8,8 @@
 	const Component = wp.element.Component;
 	const __ = wp.i18n.__;
 	const registerPlugin = wp.plugins.registerPlugin;
-	const PluginSidebar = wp.editPost.PluginSidebar;
-	const PluginSidebarMoreMenuItem = wp.editPost.PluginSidebarMoreMenuItem;
+	const PluginSidebar = wp.editor.PluginSidebar;
+	const PluginSidebarMoreMenuItem = wp.editor.PluginSidebarMoreMenuItem;
 
 	class SidebarContents extends Component {
 		constructor( props ) {
@@ -48,15 +48,16 @@
 				el(
 					Button,
 					{
-						variant: "primary",
+						variant: 'primary',
 						onClick: () => {
 							dispatch(
 								'core/annotations'
 							).__experimentalAddAnnotation( {
 								source: 'e2e-tests',
-								blockClientId: select(
-									'core/block-editor'
-								).getBlockOrder()[ 0 ],
+								blockClientId:
+									select(
+										'core/block-editor'
+									).getBlockOrder()[ 0 ],
 								richTextIdentifier: 'content',
 								range: {
 									start: parseInt( this.state.start, 10 ),
@@ -70,7 +71,7 @@
 				el(
 					Button,
 					{
-						variant: "primary",
+						variant: 'primary',
 						onClick: () => {
 							dispatch(
 								'core/annotations'
diff --git a/packages/e2e-tests/plugins/plugins-api/document-setting.js b/packages/e2e-tests/plugins/plugins-api/document-setting.js
index be1aa491244b66..e591d5256207b6 100644
--- a/packages/e2e-tests/plugins/plugins-api/document-setting.js
+++ b/packages/e2e-tests/plugins/plugins-api/document-setting.js
@@ -2,7 +2,7 @@
 	const el = wp.element.createElement;
 	const __ = wp.i18n.__;
 	const registerPlugin = wp.plugins.registerPlugin;
-	const PluginDocumentSettingPanel = wp.editPost.PluginDocumentSettingPanel;
+	const PluginDocumentSettingPanel = wp.editor.PluginDocumentSettingPanel;
 
 	function MyDocumentSettingPlugin() {
 		return el(
diff --git a/packages/e2e-tests/plugins/plugins-api/error-boundary.js b/packages/e2e-tests/plugins/plugins-api/error-boundary.js
index aca34d5c786ca9..5179555967b653 100644
--- a/packages/e2e-tests/plugins/plugins-api/error-boundary.js
+++ b/packages/e2e-tests/plugins/plugins-api/error-boundary.js
@@ -2,7 +2,7 @@
 	const registerPlugin = wp.plugins.registerPlugin;
 
 	function MyErrorPlugin() {
-		throw new Error('Whoops!');
+		throw new Error( 'Whoops!' );
 	}
 
 	registerPlugin( 'my-error-plugin', {
diff --git a/packages/e2e-tests/plugins/plugins-api/post-status-info.js b/packages/e2e-tests/plugins/plugins-api/post-status-info.js
index 9782de8e5c2561..73f4228a9f3171 100644
--- a/packages/e2e-tests/plugins/plugins-api/post-status-info.js
+++ b/packages/e2e-tests/plugins/plugins-api/post-status-info.js
@@ -2,7 +2,7 @@
 	const el = wp.element.createElement;
 	const __ = wp.i18n.__;
 	const registerPlugin = wp.plugins.registerPlugin;
-	const PluginPostStatusInfo = wp.editPost.PluginPostStatusInfo;
+	const PluginPostStatusInfo = wp.editor.PluginPostStatusInfo;
 
 	function MyPostStatusInfoPlugin() {
 		return el(
diff --git a/packages/e2e-tests/plugins/plugins-api/preview-menu.js b/packages/e2e-tests/plugins/plugins-api/preview-menu.js
new file mode 100644
index 00000000000000..1aa53b2e8509ac
--- /dev/null
+++ b/packages/e2e-tests/plugins/plugins-api/preview-menu.js
@@ -0,0 +1,14 @@
+( function () {
+	const { __ } = wp.i18n;
+	const { registerPlugin } = wp.plugins;
+	const PluginPreviewMenuItem = wp.editor.PluginPreviewMenuItem;
+	const el = wp.element.createElement;
+
+	function CustomPreviewMenuItem() {
+		return el( PluginPreviewMenuItem, {}, __( 'Custom Preview' ) );
+	}
+
+	registerPlugin( 'custom-preview-menu-item', {
+		render: CustomPreviewMenuItem,
+	} );
+} )();
diff --git a/packages/e2e-tests/plugins/plugins-api/publish-panel.js b/packages/e2e-tests/plugins/plugins-api/publish-panel.js
index 9a9df3f8efc7c0..79e44e0af7d573 100644
--- a/packages/e2e-tests/plugins/plugins-api/publish-panel.js
+++ b/packages/e2e-tests/plugins/plugins-api/publish-panel.js
@@ -3,8 +3,8 @@
 	const Fragment = wp.element.Fragment;
 	const __ = wp.i18n.__;
 	const registerPlugin = wp.plugins.registerPlugin;
-	const PluginPostPublishPanel = wp.editPost.PluginPostPublishPanel;
-	const PluginPrePublishPanel = wp.editPost.PluginPrePublishPanel;
+	const PluginPostPublishPanel = wp.editor.PluginPostPublishPanel;
+	const PluginPrePublishPanel = wp.editor.PluginPrePublishPanel;
 
 	function PanelContent() {
 		return el( 'p', {}, __( 'Here is the panel content!' ) );
diff --git a/packages/e2e-tests/plugins/plugins-api/sidebar.js b/packages/e2e-tests/plugins/plugins-api/sidebar.js
index 01e0a80de78363..fe7d76126683f6 100644
--- a/packages/e2e-tests/plugins/plugins-api/sidebar.js
+++ b/packages/e2e-tests/plugins/plugins-api/sidebar.js
@@ -10,8 +10,8 @@
 	const el = wp.element.createElement;
 	const __ = wp.i18n.__;
 	const registerPlugin = wp.plugins.registerPlugin;
-	const PluginSidebar = wp.editPost.PluginSidebar;
-	const PluginSidebarMoreMenuItem = wp.editPost.PluginSidebarMoreMenuItem;
+	const PluginSidebar = wp.editor.PluginSidebar;
+	const PluginSidebarMoreMenuItem = wp.editor.PluginSidebarMoreMenuItem;
 
 	function SidebarContents() {
 		const postTitle = useSelect( ( select ) =>
diff --git a/packages/e2e-tests/plugins/test-autocompleter/index.js b/packages/e2e-tests/plugins/test-autocompleter/index.js
index 4f294e55b55cd3..738a86e137297e 100644
--- a/packages/e2e-tests/plugins/test-autocompleter/index.js
+++ b/packages/e2e-tests/plugins/test-autocompleter/index.js
@@ -1,4 +1,4 @@
-(function () {
+( function () {
 	const fruits = {
 		name: 'fruit',
 		// The prefix that triggers this completer
@@ -20,9 +20,7 @@
 		// Declares that the Grapes option is disabled
 		isOptionDisabled: ( option ) => option.name === 'Grapes',
 		// Declares completions should be inserted as abbreviations
-		getOptionCompletion: ( option ) => (
-			option.visual 
-		),
+		getOptionCompletion: ( option ) => option.visual,
 	};
 
 	function duplicateUserMentions( completers ) {
@@ -43,7 +41,7 @@
 			? [ ...completers, fruits, copiedUsers ]
 			: completers;
 	}
-	
+
 	// Adding the filter with a priority of 11
 	// to ensure it fires after the default user mentions are added.
 	wp.hooks.addFilter(
@@ -52,4 +50,4 @@
 		appendTestCompleters,
 		11
 	);
-})()
+} )();
diff --git a/packages/e2e-tests/specs/editor/fixtures/menu-items-request-fixture.json b/packages/e2e-tests/specs/editor/fixtures/menu-items-request-fixture.json
deleted file mode 100644
index 01b844c45ceee4..00000000000000
--- a/packages/e2e-tests/specs/editor/fixtures/menu-items-request-fixture.json
+++ /dev/null
@@ -1,84 +0,0 @@
-[
-	{
-		"title": "Home",
-		"url": "http://localhost:8889/",
-		"menu_order": 1
-	},
-	{
-		"title": "About",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 2
-	},
-	{
-		"title": "Our team",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 3,
-		"parent": 1
-	},
-	{
-		"title": "Shop",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 4
-	},
-	{
-		"title": "Winter apparel",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 5,
-		"parent": 3
-	},
-	{
-		"title": "Chunky socks",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 6,
-		"parent": 4
-	},
-	{
-		"title": "Hideous hats",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 7,
-		"parent": 4
-	},
-	{
-		"title": "Glorious gloves",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 8,
-		"parent": 4
-	},
-	{
-		"title": "Jazzy Jumpers",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 9,
-		"parent": 4
-	},
-	{
-		"title": "Shipping",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 10
-	},
-	{
-		"title": "Contact Us",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 11
-	},
-	{
-		"title": "WordPress.org",
-		"url": "https://wordpress.org",
-		"menu_order": 12
-	},
-	{
-		"title": "Google",
-		"url": "https://google.com",
-		"menu_order": 13,
-		"parent": 11
-	}
-]
diff --git a/packages/e2e-tests/specs/editor/fixtures/menu-items-response-fixture.json b/packages/e2e-tests/specs/editor/fixtures/menu-items-response-fixture.json
deleted file mode 100644
index 4de75a5c0bacc6..00000000000000
--- a/packages/e2e-tests/specs/editor/fixtures/menu-items-response-fixture.json
+++ /dev/null
@@ -1,1261 +0,0 @@
-[
-	{
-		"id": 94,
-		"title": {
-			"raw": "Home",
-			"rendered": "Home"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/",
-		"attr_title": "",
-		"description": "",
-		"type": "custom",
-		"type_label": "Custom Link",
-		"object": "custom",
-		"object_id": 94,
-		"parent": 0,
-		"menu_order": 1,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=94"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 95,
-		"title": {
-			"raw": "",
-			"rendered": "Accusamus quo repellat illum magnam quas"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=41",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 41,
-		"parent": 0,
-		"menu_order": 2,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=95"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/41"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 96,
-		"title": {
-			"raw": "",
-			"rendered": "Debitis cum consequatur sit doloremque"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=51",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 51,
-		"parent": 95,
-		"menu_order": 3,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=96"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/51"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 97,
-		"title": {
-			"raw": "",
-			"rendered": "Est ea vero non nihil officiis in"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=53",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 53,
-		"parent": 0,
-		"menu_order": 4,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=97"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/53"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 98,
-		"title": {
-			"raw": "",
-			"rendered": "Fuga odio quis tempora"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=56",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 56,
-		"parent": 97,
-		"menu_order": 5,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=98"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/56"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 99,
-		"title": {
-			"raw": "",
-			"rendered": "In consectetur repellendus eveniet maiores aperiam"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=15",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 15,
-		"parent": 98,
-		"menu_order": 6,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=99"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/15"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 100,
-		"title": {
-			"raw": "",
-			"rendered": "Mollitia maiores consequatur ea dolorem blanditiis"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=45",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 45,
-		"parent": 99,
-		"menu_order": 7,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=100"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/45"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 101,
-		"title": {
-			"raw": "",
-			"rendered": "Necessitatibus nisi qui qui necessitatibus quaerat possimus"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=27",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 27,
-		"parent": 100,
-		"menu_order": 8,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=101"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/27"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 102,
-		"title": {
-			"raw": "",
-			"rendered": "Nulla omnis autem dolores eligendi"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=43",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 43,
-		"parent": 0,
-		"menu_order": 9,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=102"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/43"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 103,
-		"title": {
-			"raw": "",
-			"rendered": "Sample Page"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=2",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 2,
-		"parent": 0,
-		"menu_order": 10,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=103"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/2"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 104,
-		"title": {
-			"raw": "",
-			"rendered": "Beatae qui labore voluptas eveniet officia quia voluptas qui porro sequi et aut est"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?cat=7",
-		"attr_title": "",
-		"description": "Ratione nemo ut aut ullam sed assumenda quis est exercitationem",
-		"type": "taxonomy",
-		"type_label": "Category",
-		"object": "category",
-		"object_id": 7,
-		"parent": 0,
-		"menu_order": 11,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=104"
-				}
-			],
-			"wp:object": [
-				{
-					"taxonomy": "taxonomy",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/categories/7"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 105,
-		"title": {
-			"raw": "",
-			"rendered": "Et minus itaque velit tempore hic quisquam saepe quas asperiores"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?cat=19",
-		"attr_title": "",
-		"description": "Vel fuga enim rerum perspiciatis sapiente mollitia magni ut molestiae labore quae quia quia libero perspiciatis voluptatem quidem deleniti eveniet laboriosam doloribus dolor laborum accusantium modi ducimus itaque rerum cum nostrum",
-		"type": "taxonomy",
-		"type_label": "Category",
-		"object": "category",
-		"object_id": 19,
-		"parent": 104,
-		"menu_order": 12,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=105"
-				}
-			],
-			"wp:object": [
-				{
-					"taxonomy": "taxonomy",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/categories/19"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 106,
-		"title": {
-			"raw": "",
-			"rendered": "Et quas a et mollitia et voluptas optio voluptate quia quo unde aut in nostrum iste impedit quisquam id aut"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?cat=6",
-		"attr_title": "",
-		"description": "Quas sit labore earum omnis eos sint iste est possimus harum aut soluta sint optio quos distinctio inventore voluptate non ut aliquam ad ut voluptates fugiat numquam magnam modi repellendus modi laudantium et debitis officia est voluptatum quidem unde molestiae animi vero fuga accusamus nam",
-		"type": "taxonomy",
-		"type_label": "Category",
-		"object": "category",
-		"object_id": 6,
-		"parent": 105,
-		"menu_order": 13,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=106"
-				}
-			],
-			"wp:object": [
-				{
-					"taxonomy": "taxonomy",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/categories/6"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 107,
-		"title": {
-			"raw": "",
-			"rendered": "Illo quis sit impedit itaque expedita earum deserunt magni doloremque velit eum id error"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?cat=16",
-		"attr_title": "",
-		"description": "Doloremque vero sunt officiis iste voluptatibus voluptas molestiae sint asperiores recusandae amet praesentium et explicabo nesciunt similique voluptatum laudantium amet officiis quas distinctio quis enim nihil tempora",
-		"type": "taxonomy",
-		"type_label": "Category",
-		"object": "category",
-		"object_id": 16,
-		"parent": 106,
-		"menu_order": 14,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=107"
-				}
-			],
-			"wp:object": [
-				{
-					"taxonomy": "taxonomy",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/categories/16"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 108,
-		"title": {
-			"raw": "WordPress.org",
-			"rendered": "WordPress.org"
-		},
-		"status": "publish",
-		"url": "https://wordpress.org",
-		"attr_title": "",
-		"description": "",
-		"type": "custom",
-		"type_label": "Custom Link",
-		"object": "custom",
-		"object_id": 108,
-		"parent": 0,
-		"menu_order": 15,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=108"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 109,
-		"title": {
-			"raw": "Google",
-			"rendered": "Google"
-		},
-		"status": "publish",
-		"url": "https://google.com",
-		"attr_title": "",
-		"description": "",
-		"type": "custom",
-		"type_label": "Custom Link",
-		"object": "custom",
-		"object_id": 109,
-		"parent": 108,
-		"menu_order": 16,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=109"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	}
-]
diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/block-editor-keyboard-shortcuts.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/block-editor-keyboard-shortcuts.test.js.snap
deleted file mode 100644
index ccce7a2b3c3833..00000000000000
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/block-editor-keyboard-shortcuts.test.js.snap
+++ /dev/null
@@ -1,153 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`block editor keyboard shortcuts move blocks multiple blocks selected should move the blocks down 1`] = `
-"<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`block editor keyboard shortcuts move blocks multiple blocks selected should move the blocks down 2`] = `
-"<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`block editor keyboard shortcuts move blocks multiple blocks selected should move the blocks up 1`] = `
-"<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`block editor keyboard shortcuts move blocks multiple blocks selected should move the blocks up 2`] = `
-"<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`block editor keyboard shortcuts move blocks single block selected should move the block down 1`] = `
-"<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`block editor keyboard shortcuts move blocks single block selected should move the block down 2`] = `
-"<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`block editor keyboard shortcuts move blocks single block selected should move the block up 1`] = `
-"<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`block editor keyboard shortcuts move blocks single block selected should move the block up 2`] = `
-"<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`block editor keyboard shortcuts test shortcuts handling through portals in the same tree should prevent deleting multiple selected blocks from inputs 1`] = `
-"<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`block editor keyboard shortcuts test shortcuts handling through portals in the same tree should propagate properly and duplicate selected blocks 1`] = `
-"<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>1st</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>2nd</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>3rd</p>
-<!-- /wp:paragraph -->"
-`;
diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/block-grouping.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/block-grouping.test.js.snap
deleted file mode 100644
index 5ffca68763f42e..00000000000000
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/block-grouping.test.js.snap
+++ /dev/null
@@ -1,115 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Block Grouping Group creation creates a group from multiple blocks of different types via block transforms 1`] = `
-"<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:heading -->
-<h2 class="wp-block-heading">Group Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:image -->
-<figure class="wp-block-image"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:paragraph -->
-<p>Some paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Group creation creates a group from multiple blocks of the same type via block transforms 1`] = `
-"<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:paragraph -->
-<p>First Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Second Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Third Paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Group creation creates a group from multiple blocks of the same type via options toolbar 1`] = `
-"<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:paragraph -->
-<p>First Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Second Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Third Paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Group creation groups and ungroups multiple blocks of different types via options toolbar 1`] = `
-"<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:heading -->
-<h2 class="wp-block-heading">Group Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:image -->
-<figure class="wp-block-image"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:paragraph -->
-<p>Some paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Group creation groups and ungroups multiple blocks of different types via options toolbar 2`] = `
-"<!-- wp:heading -->
-<h2 class="wp-block-heading">Group Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:image -->
-<figure class="wp-block-image"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:paragraph -->
-<p>Some paragraph</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Block Grouping Preserving selected blocks attributes preserves width alignment settings of selected blocks 1`] = `
-"<!-- wp:group {"align":"full","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull"><!-- wp:heading -->
-<h2 class="wp-block-heading">Group Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:image {"align":"full"} -->
-<figure class="wp-block-image alignfull"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:image {"align":"wide"} -->
-<figure class="wp-block-image alignwide"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:paragraph -->
-<p>Some paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Registering alternative Blocks to handle Grouping interactions should use registered grouping block for grouping interactions 1`] = `
-"<!-- wp:test/alternative-group-block -->
-<!-- wp:paragraph -->
-<p>First Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Second Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Third Paragraph</p>
-<!-- /wp:paragraph -->
-<!-- /wp:test/alternative-group-block -->"
-`;
diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap
deleted file mode 100644
index 328b727ac6533b..00000000000000
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap
+++ /dev/null
@@ -1,67 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Embedding content should allow the user to convert unembeddable URLs to a paragraph with a link in it 1`] = `
-"<!-- wp:paragraph -->
-<p><a href="https://twitter.com/wooyaygutenberg123454312">https://twitter.com/wooyaygutenberg123454312</a></p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Embedding content should allow the user to try embedding a failed URL again 1`] = `
-"<!-- wp:embed {"url":"https://twitter.com/wooyaygutenberg123454312","type":"rich","providerNameSlug":"twitter","responsive":true} -->
-<figure class="wp-block-embed is-type-rich is-provider-twitter wp-block-embed-twitter"><div class="wp-block-embed__wrapper">
-https://twitter.com/wooyaygutenberg123454312
-</div></figure>
-<!-- /wp:embed -->"
-`;
-
-exports[`Embedding content should render embeds in the correct state 1`] = `
-"<!-- wp:embed {"url":"https://twitter.com/notnownikki","type":"rich","providerNameSlug":"twitter","responsive":true} -->
-<figure class="wp-block-embed is-type-rich is-provider-twitter wp-block-embed-twitter"><div class="wp-block-embed__wrapper">
-https://twitter.com/notnownikki
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://twitter.com/wooyaygutenberg123454312","type":"rich","providerNameSlug":"embed-handler","responsive":true} -->
-<figure class="wp-block-embed is-type-rich is-provider-embed-handler wp-block-embed-embed-handler"><div class="wp-block-embed__wrapper">
-https://twitter.com/wooyaygutenberg123454312
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://wordpress.org/gutenberg/handbook/"} -->
-<figure class="wp-block-embed"><div class="wp-block-embed__wrapper">
-https://wordpress.org/gutenberg/handbook/
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://twitter.com/thatbunty"} -->
-<figure class="wp-block-embed"><div class="wp-block-embed__wrapper">
-https://twitter.com/thatbunty
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://wordpress.org/gutenberg/handbook/block-api/attributes/","type":"wp-embed","providerNameSlug":"wordpress"} -->
-<figure class="wp-block-embed is-type-wp-embed is-provider-wordpress wp-block-embed-wordpress"><div class="wp-block-embed__wrapper">
-https://wordpress.org/gutenberg/handbook/block-api/attributes/
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://www.youtube.com/watch?v=lXMskKTw3Bc","type":"video","providerNameSlug":"youtube","responsive":true,"className":"wp-embed-aspect-16-9 wp-has-aspect-ratio"} -->
-<figure class="wp-block-embed is-type-video is-provider-youtube wp-block-embed-youtube wp-embed-aspect-16-9 wp-has-aspect-ratio"><div class="wp-block-embed__wrapper">
-https://www.youtube.com/watch?v=lXMskKTw3Bc
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://cloudup.com/cQFlxqtY4ob","type":"photo","providerNameSlug":"cloudup","responsive":true} -->
-<figure class="wp-block-embed is-type-photo is-provider-cloudup wp-block-embed-cloudup"><div class="wp-block-embed__wrapper">
-https://cloudup.com/cQFlxqtY4ob
-</div></figure>
-<!-- /wp:embed -->"
-`;
-
-exports[`Embedding content should retry embeds that could not be embedded with trailing slashes, without the trailing slashes 1`] = `
-"<!-- wp:embed {"url":"https://twitter.com/notnownikki/","type":"rich","providerNameSlug":"embed-handler","responsive":true} -->
-<figure class="wp-block-embed is-type-rich is-provider-embed-handler wp-block-embed-embed-handler"><div class="wp-block-embed__wrapper">
-https://twitter.com/notnownikki/
-</div></figure>
-<!-- /wp:embed -->"
-`;
diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/inserting-blocks.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/inserting-blocks.test.js.snap
deleted file mode 100644
index fa3400670a602d..00000000000000
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/inserting-blocks.test.js.snap
+++ /dev/null
@@ -1,118 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Inserting blocks Should insert content using the placeholder and the regular inserter 1`] = `
-"<!-- wp:paragraph -->
-<p>Paragraph block</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>Quote block</p></blockquote>
-<!-- /wp:quote -->
-
-<!-- wp:image -->
-<figure class=\\"wp-block-image\\"><img alt=\\"\\"/></figure>
-<!-- /wp:image -->
-
-<!-- wp:paragraph -->
-<p></p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Inserting blocks Should insert content using the placeholder and the regular inserter 2`] = `
-"<!-- wp:paragraph -->
-<p>Paragraph block</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>Quote block</p></blockquote>
-<!-- /wp:quote -->"
-`;
-
-exports[`Inserting blocks Should insert content using the placeholder and the regular inserter 3`] = `
-"<!-- wp:paragraph -->
-<p>Paragraph block</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Second paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:quote -->
-<blockquote class=\\"wp-block-quote\\"><p>Quote block</p></blockquote>
-<!-- /wp:quote -->
-
-<!-- wp:preformatted -->
-<pre class=\\"wp-block-preformatted\\">Pre text
-
-Foo</pre>
-<!-- /wp:preformatted -->
-
-<!-- wp:shortcode -->
-[myshortcode]With multiple
-lines preserved[/myshortcode]
-<!-- /wp:shortcode -->"
-`;
-
-exports[`Inserting blocks inserts a block in proper place after having clicked \`Browse All\` from block appender 1`] = `
-"<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:paragraph -->
-<p>Paragraph inside group</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->
-
-<!-- wp:paragraph -->
-<p>Paragraph after group</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Inserting blocks inserts a block in proper place after having clicked \`Browse All\` from inline inserter 1`] = `
-"<!-- wp:paragraph -->
-<p>First paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:heading -->
-<h2 class="wp-block-heading">Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:paragraph -->
-<p>Second paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Third paragraph</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Inserting blocks inserts a block in proper place after having clicked \`Browse All\` from inline inserter 2`] = `
-"<!-- wp:paragraph -->
-<p>First paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:cover {"layout":{"type":"constrained"}} -->
-<div class="wp-block-cover"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container"></div></div>
-<!-- /wp:cover -->
-
-<!-- wp:heading -->
-<h2 class="wp-block-heading">Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:paragraph -->
-<p>Second paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Third paragraph</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Inserting blocks inserts blocks at root level when using the root appender while selection is in an inner block 1`] = `
-"<!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button -->
-<div class="wp-block-button"><a class="wp-block-button__link wp-element-button">1.1</a></div>
-<!-- /wp:button --></div>
-<!-- /wp:buttons -->
-
-<!-- wp:paragraph -->
-<p>2</p>
-<!-- /wp:paragraph -->"
-`;
diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap
deleted file mode 100644
index db3efc512a0a7e..00000000000000
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap
+++ /dev/null
@@ -1,17 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Pattern blocks allows conversion back to blocks when the reusable block has unsaved edits 1`] = `
-"<!-- wp:paragraph -->
-<p>12</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Pattern blocks can be created from multiselection and converted back to regular blocks 1`] = `
-"<!-- wp:paragraph -->
-<p>Hello there!</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Second paragraph</p>
-<!-- /wp:paragraph -->"
-`;
diff --git a/packages/e2e-tests/specs/editor/various/allowed-patterns.test.js b/packages/e2e-tests/specs/editor/various/allowed-patterns.test.js
deleted file mode 100644
index 449306f06d18d2..00000000000000
--- a/packages/e2e-tests/specs/editor/various/allowed-patterns.test.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	activatePlugin,
-	createNewPost,
-	deactivatePlugin,
-	searchForPattern,
-	toggleGlobalBlockInserter,
-} from '@wordpress/e2e-test-utils';
-
-const checkPatternExistence = async ( name, available = true ) => {
-	await searchForPattern( name );
-	const patternElement = await page.waitForXPath(
-		`//div[@role = 'option']//div[contains(text(), '${ name }')]`,
-		{ timeout: 5000, visible: available, hidden: ! available }
-	);
-	const patternExists = !! patternElement;
-	await toggleGlobalBlockInserter();
-	return patternExists;
-};
-
-const TEST_PATTERNS = [
-	[ 'Test: Single heading', true ],
-	[ 'Test: Single paragraph', false ],
-	[ 'Test: Paragraph inside group', false ],
-];
-
-describe( 'Allowed Patterns', () => {
-	beforeAll( async () => {
-		await activatePlugin( 'gutenberg-test-allowed-patterns' );
-		await createNewPost();
-	} );
-	afterAll( async () => {
-		await deactivatePlugin( 'gutenberg-test-allowed-patterns' );
-	} );
-
-	describe( 'Disable blocks plugin disabled', () => {
-		for ( const [ patternName ] of TEST_PATTERNS ) {
-			it( `should show test pattern "${ patternName }"`, async () => {
-				expect( await checkPatternExistence( patternName, true ) ).toBe(
-					true
-				);
-			} );
-		}
-	} );
-
-	describe( 'Disable blocks plugin enabled', () => {
-		beforeAll( async () => {
-			await activatePlugin(
-				'gutenberg-test-allowed-patterns-disable-blocks'
-			);
-			await createNewPost();
-		} );
-		afterAll( async () => {
-			await deactivatePlugin(
-				'gutenberg-test-allowed-patterns-disable-blocks'
-			);
-		} );
-
-		for ( const [ patternName, shouldBeAvailable ] of TEST_PATTERNS ) {
-			it( `should${
-				shouldBeAvailable ? '' : ' not'
-			} show test "pattern ${ patternName }"`, async () => {
-				expect(
-					await checkPatternExistence(
-						patternName,
-						shouldBeAvailable
-					)
-				).toBe( shouldBeAvailable );
-			} );
-		}
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/autosave.test.js b/packages/e2e-tests/specs/editor/various/autosave.test.js
deleted file mode 100644
index 528efc2d463167..00000000000000
--- a/packages/e2e-tests/specs/editor/various/autosave.test.js
+++ /dev/null
@@ -1,346 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	clickBlockAppender,
-	createNewPost,
-	getEditedPostContent,
-	pressKeyWithModifier,
-	publishPost,
-	saveDraft,
-	toggleOfflineMode,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-// Constant to override editor preference
-const AUTOSAVE_INTERVAL_SECONDS = 5;
-
-const AUTOSAVE_NOTICE_REMOTE =
-	'There is an autosave of this post that is more recent than the version below.';
-const AUTOSAVE_NOTICE_LOCAL =
-	'The backup of this post in your browser is different from the version below.';
-
-// Save and wait for "Saved" to confirm save complete. Preserves focus in the
-// editing area.
-async function saveDraftWithKeyboard() {
-	await page.waitForSelector( '.editor-post-save-draft' );
-	await Promise.all( [
-		page.waitForSelector( '.editor-post-saved-state.is-saved' ),
-		pressKeyWithModifier( 'primary', 'S' ),
-	] );
-}
-
-async function sleep( durationInSeconds ) {
-	// Rule `no-restricted-syntax` recommends `waitForSelector` against
-	// `waitFor`, which isn't apt for the use case, when provided an integer,
-	// of waiting for a given amount of time.
-	// eslint-disable-next-line no-restricted-syntax
-	await page.waitForTimeout( durationInSeconds * 1000 );
-}
-
-async function clearSessionStorage() {
-	await page.evaluate( () => window.sessionStorage.clear() );
-}
-
-async function readSessionStorageAutosave( postId ) {
-	return page.evaluate(
-		( key ) => window.sessionStorage.getItem( key ),
-		`wp-autosave-block-editor-post-${ postId ? postId : 'auto-draft' }`
-	);
-}
-
-async function getCurrentPostId() {
-	return page.evaluate( () =>
-		window.wp.data.select( 'core/editor' ).getCurrentPostId()
-	);
-}
-
-async function setLocalAutosaveInterval( value ) {
-	return page.evaluate( ( _value ) => {
-		window.wp.data.dispatch( 'core/editor' ).updateEditorSettings( {
-			localAutosaveInterval: _value,
-		} );
-	}, value );
-}
-
-function wrapParagraph( text ) {
-	return `<!-- wp:paragraph -->
-<p>${ text }</p>
-<!-- /wp:paragraph -->`;
-}
-
-describe( 'autosave', () => {
-	beforeEach( async () => {
-		await clearSessionStorage();
-		await createNewPost();
-		await setLocalAutosaveInterval( AUTOSAVE_INTERVAL_SECONDS );
-	} );
-
-	it( 'should save to sessionStorage', async () => {
-		// Wait for the original timeout to kick in, it will schedule
-		// another run using the updated interval length of AUTOSAVE_INTERVAL_SECONDS.
-		await sleep( 15 );
-
-		await clickBlockAppender();
-		await page.keyboard.type( 'before save' );
-		await saveDraftWithKeyboard();
-		await sleep( 1 );
-		await page.keyboard.type( ' after save' );
-
-		// Wait long enough for local autosave to kick in.
-		await sleep( AUTOSAVE_INTERVAL_SECONDS + 1 );
-
-		const id = await getCurrentPostId();
-		const autosave = await readSessionStorageAutosave( id );
-		const { content } = JSON.parse( autosave );
-		expect( content ).toBe( wrapParagraph( 'before save after save' ) );
-	} );
-
-	it( 'should recover from sessionStorage', async () => {
-		await clickBlockAppender();
-		await page.keyboard.type( 'before save' );
-		await saveDraftWithKeyboard();
-		await page.keyboard.type( ' after save' );
-
-		// Trigger local autosave.
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
-		);
-		// Reload without saving on the server.
-		await page.reload();
-		await page.waitForSelector( '.edit-post-layout' );
-
-		const notice = await page.$eval(
-			'.components-notice__content',
-			( element ) => element.innerText
-		);
-		expect( notice ).toContain( AUTOSAVE_NOTICE_LOCAL );
-
-		expect( await getEditedPostContent() ).toEqual(
-			wrapParagraph( 'before save' )
-		);
-		await page.click( '.components-notice__action' );
-		expect( await getEditedPostContent() ).toEqual(
-			wrapParagraph( 'before save after save' )
-		);
-	} );
-
-	it( "shouldn't contaminate other posts", async () => {
-		await clickBlockAppender();
-		await page.keyboard.type( 'before save' );
-		await saveDraft();
-
-		// Fake local autosave.
-		await page.evaluate(
-			( postId ) =>
-				window.sessionStorage.setItem(
-					`wp-autosave-block-editor-post-${ postId }`,
-					JSON.stringify( {
-						post_title: 'A',
-						content: 'B',
-						excerpt: 'C',
-					} )
-				),
-			await getCurrentPostId()
-		);
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBe( 1 );
-
-		await page.reload();
-		await page.waitForSelector( '.edit-post-layout' );
-		const notice = await page.$eval(
-			'.components-notice__content',
-			( element ) => element.innerText
-		);
-		expect( notice ).toContain(
-			'The backup of this post in your browser is different from the version below.'
-		);
-
-		await createNewPost();
-		expect( await page.$( '.components-notice__content' ) ).toBe( null );
-	} );
-
-	it( 'should clear local autosave after successful remote autosave', async () => {
-		// Edit, save draft, edit again.
-		await clickBlockAppender();
-		await page.keyboard.type( 'before save' );
-		await saveDraftWithKeyboard();
-		await page.keyboard.type( ' after save' );
-
-		// Trigger local autosave.
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
-		);
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBeGreaterThanOrEqual( 1 );
-
-		// Trigger remote autosave.
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/editor' ).autosave()
-		);
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBe( 0 );
-	} );
-
-	it( "shouldn't clear local autosave if remote autosave fails", async () => {
-		// Edit, save draft, edit again.
-		await clickBlockAppender();
-		await page.keyboard.type( 'before save' );
-		await saveDraftWithKeyboard();
-		await page.keyboard.type( ' after save' );
-
-		// Trigger local autosave.
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
-		);
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBe( 1 );
-
-		// Bring network down and attempt to autosave remotely.
-		toggleOfflineMode( true );
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/editor' ).autosave()
-		);
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBe( 1 );
-	} );
-
-	it( 'should clear local autosave after successful save', async () => {
-		// Edit, save draft, edit again.
-		await clickBlockAppender();
-		await page.keyboard.type( 'before save' );
-		await saveDraftWithKeyboard();
-		await page.keyboard.type( ' after save' );
-
-		// Trigger local autosave.
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
-		);
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBe( 1 );
-
-		await saveDraftWithKeyboard();
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBe( 0 );
-	} );
-
-	it( "shouldn't clear local autosave if save fails", async () => {
-		// Edit, save draft, edit again.
-		await clickBlockAppender();
-		await page.keyboard.type( 'before save' );
-		await saveDraftWithKeyboard();
-		await page.keyboard.type( ' after save' );
-
-		// Trigger local autosave.
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
-		);
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBeGreaterThanOrEqual( 1 );
-
-		// Bring network down and attempt to save.
-		toggleOfflineMode( true );
-		saveDraftWithKeyboard();
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBeGreaterThanOrEqual( 1 );
-	} );
-
-	it( "shouldn't conflict with server-side autosave", async () => {
-		await clickBlockAppender();
-		await page.keyboard.type( 'before publish' );
-		await publishPost();
-
-		await canvas().click( '[data-type="core/paragraph"]' );
-		await page.keyboard.type( ' after publish' );
-
-		// Trigger remote autosave.
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/editor' ).autosave()
-		);
-
-		// Force conflicting local autosave.
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
-		);
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBeGreaterThanOrEqual( 1 );
-
-		await page.reload();
-		await page.waitForSelector( '.edit-post-layout' );
-
-		// FIXME: Occasionally, upon reload, there is no server-provided
-		// autosave value available, despite our having previously explicitly
-		// autosaved. The reasons for this are still unknown. Since this is
-		// unrelated to *local* autosave, until we can understand them, we'll
-		// drop this test's expectations if we don't have an autosave object
-		// available.
-		const stillHasRemoteAutosave = await page.evaluate(
-			() =>
-				window.wp.data.select( 'core/editor' ).getEditorSettings()
-					.autosave
-		);
-		if ( ! stillHasRemoteAutosave ) {
-			return;
-		}
-
-		// Only one autosave notice should be displayed.
-		const notices = await page.$$( '.components-notice' );
-		expect( notices.length ).toBe( 1 );
-		const notice = await page.$eval(
-			'.components-notice__content',
-			( element ) => element.innerText
-		);
-		expect( notice ).toContain( AUTOSAVE_NOTICE_REMOTE );
-	} );
-
-	it( 'should clear sessionStorage upon user logout', async () => {
-		await clickBlockAppender();
-		await page.keyboard.type( 'before save' );
-		await saveDraft();
-
-		// Fake local autosave.
-		await page.evaluate(
-			( postId ) =>
-				window.sessionStorage.setItem(
-					`wp-autosave-block-editor-post-${ postId }`,
-					JSON.stringify( {
-						post_title: 'A',
-						content: 'B',
-						excerpt: 'C',
-					} )
-				),
-			await getCurrentPostId()
-		);
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBe( 1 );
-
-		await Promise.all( [
-			page.waitForSelector( '#wp-admin-bar-logout', { visible: true } ),
-			page.hover( '#wp-admin-bar-my-account' ),
-		] );
-		await Promise.all( [
-			page.waitForNavigation(),
-			page.click( '#wp-admin-bar-logout' ),
-		] );
-
-		expect(
-			await page.evaluate( () => window.sessionStorage.length )
-		).toBe( 0 );
-	} );
-
-	afterEach( async () => {
-		toggleOfflineMode( false );
-		await clearSessionStorage();
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/block-editor-keyboard-shortcuts.test.js b/packages/e2e-tests/specs/editor/various/block-editor-keyboard-shortcuts.test.js
deleted file mode 100644
index b8f43f31cd77bb..00000000000000
--- a/packages/e2e-tests/specs/editor/various/block-editor-keyboard-shortcuts.test.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	createNewPost,
-	clickBlockAppender,
-	getEditedPostContent,
-	pressKeyWithModifier,
-	clickBlockToolbarButton,
-	clickMenuItem,
-	clickOnCloseModalButton,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-const createTestParagraphBlocks = async () => {
-	await clickBlockAppender();
-	await page.keyboard.type( '1st' );
-	await page.keyboard.press( 'Enter' );
-	await page.keyboard.type( '2nd' );
-	await page.keyboard.press( 'Enter' );
-	await page.keyboard.type( '3rd' );
-};
-
-describe( 'block editor keyboard shortcuts', () => {
-	beforeEach( async () => {
-		await createNewPost();
-	} );
-
-	describe( 'move blocks', () => {
-		const moveUp = async () => pressKeyWithModifier( 'secondary', 't' );
-		const moveDown = async () => pressKeyWithModifier( 'secondary', 'y' );
-		describe( 'single block selected', () => {
-			it( 'should move the block up', async () => {
-				await createTestParagraphBlocks();
-				expect( await getEditedPostContent() ).toMatchSnapshot();
-				await moveUp();
-				await moveUp();
-				expect( await getEditedPostContent() ).toMatchSnapshot();
-			} );
-
-			it( 'should move the block down', async () => {
-				await createTestParagraphBlocks();
-				expect( await getEditedPostContent() ).toMatchSnapshot();
-				await page.keyboard.press( 'ArrowUp' );
-				await moveDown();
-				expect( await getEditedPostContent() ).toMatchSnapshot();
-			} );
-		} );
-
-		describe( 'multiple blocks selected', () => {
-			it( 'should move the blocks up', async () => {
-				await createTestParagraphBlocks();
-				expect( await getEditedPostContent() ).toMatchSnapshot();
-				await pressKeyWithModifier( 'shift', 'ArrowUp' );
-				await canvas().waitForSelector(
-					'[aria-label="Multiple selected blocks"]'
-				);
-				await moveUp();
-				expect( await getEditedPostContent() ).toMatchSnapshot();
-			} );
-
-			it( 'should move the blocks down', async () => {
-				await createTestParagraphBlocks();
-				expect( await getEditedPostContent() ).toMatchSnapshot();
-				await page.keyboard.press( 'ArrowUp' );
-				await pressKeyWithModifier( 'shift', 'ArrowUp' );
-				await canvas().waitForSelector(
-					'[aria-label="Multiple selected blocks"]'
-				);
-				await moveDown();
-				expect( await getEditedPostContent() ).toMatchSnapshot();
-			} );
-		} );
-	} );
-	describe( 'test shortcuts handling through portals in the same tree', () => {
-		beforeEach( async () => {
-			await createTestParagraphBlocks();
-			// Multiselect via keyboard.
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-		} );
-		it( 'should propagate properly and duplicate selected blocks', async () => {
-			await clickBlockToolbarButton( 'Options' );
-			const label = 'Duplicate';
-			await page.$x(
-				`//div[@role="menu"]//span[contains(concat(" ", @class, " "), " components-menu-item__item ")][contains(text(), "${ label }")]`
-			);
-			await pressKeyWithModifier( 'primaryShift', 'd' );
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-		it( 'should prevent deleting multiple selected blocks from inputs', async () => {
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Create pattern' );
-			const reusableBlockNameInputSelector =
-				'.patterns-menu-items__convert-modal .components-text-control__input';
-			const nameInput = await page.waitForSelector(
-				reusableBlockNameInputSelector
-			);
-			await nameInput.click();
-			await page.keyboard.type( 'hi' );
-			await page.keyboard.press( 'Backspace' );
-			await page.keyboard.press( 'ArrowLeft' );
-			await page.keyboard.press( 'Delete' );
-			await clickOnCloseModalButton(
-				'.patterns-menu-items__convert-modal'
-			);
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/block-grouping.test.js b/packages/e2e-tests/specs/editor/various/block-grouping.test.js
deleted file mode 100644
index f67273a550d1c2..00000000000000
--- a/packages/e2e-tests/specs/editor/various/block-grouping.test.js
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	insertBlock,
-	createNewPost,
-	clickBlockToolbarButton,
-	clickMenuItem,
-	pressKeyWithModifier,
-	getEditedPostContent,
-	transformBlockTo,
-	getAllBlocks,
-	getAvailableBlockTransforms,
-	activatePlugin,
-	deactivatePlugin,
-	createReusableBlock,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-async function insertBlocksOfSameType() {
-	await insertBlock( 'Paragraph' );
-	await page.keyboard.type( 'First Paragraph' );
-
-	await insertBlock( 'Paragraph' );
-	await page.keyboard.type( 'Second Paragraph' );
-
-	await insertBlock( 'Paragraph' );
-	await page.keyboard.type( 'Third Paragraph' );
-}
-
-async function insertBlocksOfMultipleTypes() {
-	await insertBlock( 'Heading' );
-	await page.keyboard.type( 'Group Heading' );
-
-	await insertBlock( 'Image' );
-
-	await insertBlock( 'Paragraph' );
-	await page.keyboard.type( 'Some paragraph' );
-}
-
-describe( 'Block Grouping', () => {
-	beforeEach( async () => {
-		// Posts are auto-removed at the end of each test run.
-		await createNewPost();
-	} );
-
-	describe( 'Group creation', () => {
-		it( 'creates a group from multiple blocks of the same type via block transforms', async () => {
-			// Creating test blocks.
-			await insertBlocksOfSameType();
-
-			// Multiselect via keyboard.
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			await transformBlockTo( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-
-		it( 'creates a group from multiple blocks of different types via block transforms', async () => {
-			// Creating test blocks.
-			await insertBlocksOfMultipleTypes();
-
-			// Multiselect via keyboard.
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			await transformBlockTo( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-
-		it( 'creates a group from multiple blocks of the same type via options toolbar', async () => {
-			// Creating test blocks.
-			await insertBlocksOfSameType();
-
-			// Multiselect via keyboard.
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-
-		it( 'groups and ungroups multiple blocks of different types via options toolbar', async () => {
-			// Creating test blocks.
-			await insertBlocksOfMultipleTypes();
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			// Group.
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-
-			// UnGroup.
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Ungroup' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-
-		it( 'does not allow ungrouping a group block that has no children', async () => {
-			await insertBlock( 'Group' );
-			await clickBlockToolbarButton( 'Options' );
-			const ungroupButtons = await page.$x(
-				'//button/span[text()="Ungroup"]'
-			);
-			expect( ungroupButtons ).toHaveLength( 0 );
-		} );
-		it( 'should group and ungroup a controlled block properly', async () => {
-			const getParagraphText = async () => {
-				const paragraphInReusableSelector =
-					'.block-editor-block-list__block[data-type="core/block"] p';
-				await canvas().waitForSelector( paragraphInReusableSelector );
-				return canvas().$eval(
-					paragraphInReusableSelector,
-					( element ) => element.innerText
-				);
-			};
-
-			const paragraphText = 'hi';
-			await createReusableBlock( paragraphText, 'Block' );
-			// Group
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-
-			let group = await canvas().$$( '[data-type="core/group"]' );
-			expect( group ).toHaveLength( 1 );
-			// Make sure the paragraph in reusable block exists.
-			expect( await getParagraphText() ).toMatch( paragraphText );
-
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Ungroup' );
-			group = await canvas().$$( '[data-type="core/group"]' );
-			expect( group ).toHaveLength( 0 );
-			// Make sure the paragraph in reusable block exists.
-			expect( await getParagraphText() ).toEqual( paragraphText );
-		} );
-		it( 'should group another Group block via options toolbar', async () => {
-			await insertBlock( 'Paragraph' );
-			await page.keyboard.type( '1' );
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-			expect( await getEditedPostContent() ).toMatchInlineSnapshot( `
-			"<!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group"><!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group"><!-- wp:paragraph -->
-			<p>1</p>
-			<!-- /wp:paragraph --></div>
-			<!-- /wp:group --></div>
-			<!-- /wp:group -->"
-		` );
-		} );
-	} );
-
-	describe( 'Grouping Block availability', () => {
-		beforeEach( async () => {
-			// Disable the Group block.
-			await page.evaluate( () => {
-				const { dispatch } = wp.data;
-				dispatch( 'core/edit-post' ).hideBlockTypes( [ 'core/group' ] );
-			} );
-
-			// Create a Group.
-			await insertBlocksOfMultipleTypes();
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-		} );
-
-		afterAll( async () => {
-			// Re-enable the Group block.
-			await page.evaluate( () => {
-				const { dispatch } = wp.data;
-				dispatch( 'core/edit-post' ).showBlockTypes( [ 'core/group' ] );
-			} );
-		} );
-
-		it( 'does not show group transform if Grouping block is disabled', async () => {
-			const availableTransforms = await getAvailableBlockTransforms();
-
-			expect( availableTransforms ).not.toContain( 'Group' );
-		} );
-
-		it( 'does not show group option in the options toolbar if Grouping block is disabled', async () => {
-			await clickBlockToolbarButton( 'Options' );
-
-			const blockOptionsDropdownHTML = await page.evaluate(
-				() =>
-					document.querySelector(
-						'.block-editor-block-settings-menu__popover'
-					).innerHTML
-			);
-
-			expect( blockOptionsDropdownHTML ).not.toContain( 'Group' );
-		} );
-	} );
-
-	describe( 'Preserving selected blocks attributes', () => {
-		it( 'preserves width alignment settings of selected blocks', async () => {
-			await insertBlock( 'Heading' );
-			await page.keyboard.type( 'Group Heading' );
-
-			// Full width image.
-			await insertBlock( 'Image' );
-			await clickBlockToolbarButton( 'Align' );
-			const fullButton = await page.waitForXPath(
-				`//button[contains(@class,'components-dropdown-menu__menu-item')]//span[contains(text(), 'Full width')]`
-			);
-			await fullButton.evaluate( ( element ) =>
-				element.scrollIntoView()
-			);
-			await fullButton.click();
-
-			// Wide width image.
-			await insertBlock( 'Image' );
-			await clickBlockToolbarButton( 'Align' );
-			const wideButton = await page.waitForXPath(
-				`//button[contains(@class,'components-dropdown-menu__menu-item')]//span[contains(text(), 'Wide width')]`
-			);
-			await wideButton.evaluate( ( element ) =>
-				element.scrollIntoView()
-			);
-			await wideButton.click();
-
-			await insertBlock( 'Paragraph' );
-			await page.keyboard.type( 'Some paragraph' );
-
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			await transformBlockTo( 'Group' );
-
-			const allBlocks = await getAllBlocks();
-
-			// We expect Group block align setting to match that
-			// of the widest of it's "child" innerBlocks
-			expect( allBlocks[ 0 ].attributes.align ).toBe( 'full' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-	} );
-
-	describe( 'Registering alternative Blocks to handle Grouping interactions', () => {
-		beforeAll( async () => {
-			await activatePlugin( 'gutenberg-test-custom-grouping-block' );
-		} );
-
-		afterAll( async () => {
-			await deactivatePlugin( 'gutenberg-test-custom-grouping-block' );
-		} );
-
-		it( 'should use registered grouping block for grouping interactions', async () => {
-			// Set custom Block as the Block to use for Grouping.
-			await page.evaluate( () => {
-				window.wp.blocks.setGroupingBlockName(
-					'test/alternative-group-block'
-				);
-			} );
-
-			// Creating test blocks.
-			await insertBlocksOfSameType();
-
-			// Multiselect via keyboard.
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			// Group - this will use whichever Block is registered as the Grouping Block
-			// as opposed to "transformTo()" which uses whatever is passed to it. To
-			// ensure this test is meaningful we must rely on what is registered.
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/block-switcher.test.js b/packages/e2e-tests/specs/editor/various/block-switcher.test.js
deleted file mode 100644
index 61278881077ba7..00000000000000
--- a/packages/e2e-tests/specs/editor/various/block-switcher.test.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	hasBlockSwitcher,
-	getAvailableBlockTransforms,
-	createNewPost,
-	insertBlock,
-	pressKeyWithModifier,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'Block Switcher', () => {
-	beforeEach( async () => {
-		await createNewPost();
-	} );
-
-	it( 'Should show the expected block transforms on the list block when the blocks are removed', async () => {
-		// Insert a list block.
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( '- List content' );
-		await page.keyboard.press( 'ArrowUp' );
-		await pressKeyWithModifier( 'alt', 'F10' );
-
-		// Verify the block switcher exists.
-		expect( await hasBlockSwitcher() ).toBeTruthy();
-
-		// Verify the correct block transforms appear.
-		expect( await getAvailableBlockTransforms() ).toEqual(
-			expect.arrayContaining( [
-				'Group',
-				'Paragraph',
-				'Heading',
-				'Quote',
-				'Columns',
-			] )
-		);
-	} );
-
-	it( 'Should show the expected block transforms on the list block when the quote block is removed', async () => {
-		// Remove the quote block from the list of registered blocks.
-		await page.evaluate( () => {
-			wp.blocks.unregisterBlockType( 'core/quote' );
-		} );
-
-		// Insert a list block.
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( '- List content' );
-		await page.keyboard.press( 'ArrowUp' );
-		await pressKeyWithModifier( 'alt', 'F10' );
-
-		// Verify the block switcher exists.
-		expect( await hasBlockSwitcher() ).toBeTruthy();
-
-		// Verify the correct block transforms appear.
-		expect( await getAvailableBlockTransforms() ).toEqual(
-			expect.arrayContaining( [
-				'Group',
-				'Paragraph',
-				'Heading',
-				'Columns',
-			] )
-		);
-	} );
-
-	it( 'Should not show the block switcher if all the blocks the list block transforms into are removed', async () => {
-		// Insert a list block.
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( '- List content' );
-
-		// Remove the paragraph and quote block from the list of registered blocks.
-		await page.evaluate( () => {
-			[
-				'core/quote',
-				'core/pullquote',
-				'core/paragraph',
-				'core/group',
-				'core/heading',
-				'core/columns',
-			].forEach( ( block ) => wp.blocks.unregisterBlockType( block ) );
-		} );
-
-		await page.keyboard.press( 'ArrowUp' );
-		await pressKeyWithModifier( 'alt', 'F10' );
-
-		// Verify the block switcher exists.
-		expect( await hasBlockSwitcher() ).toBeFalsy();
-		// Verify the correct block transforms appear.
-		expect( await getAvailableBlockTransforms() ).toHaveLength( 0 );
-	} );
-
-	describe( 'Conditional tranformation options', () => {
-		describe( 'Columns tranforms', () => {
-			it( 'Should show Columns block only if selected blocks are between limits (1-6)', async () => {
-				await page.keyboard.press( 'Enter' );
-				await page.keyboard.type( '- List content' );
-				await page.keyboard.press( 'ArrowUp' );
-				await insertBlock( 'Heading' );
-				await page.keyboard.type( 'I am a header' );
-				await page.keyboard.down( 'Shift' );
-				await page.keyboard.press( 'ArrowUp' );
-				await page.keyboard.up( 'Shift' );
-				expect( await getAvailableBlockTransforms() ).toEqual(
-					expect.arrayContaining( [ 'Columns' ] )
-				);
-			} );
-			it( 'Should NOT show Columns transform only if selected blocks are more than max limit(6)', async () => {
-				await page.keyboard.press( 'Enter' );
-				await page.keyboard.type( '- List content' );
-				await page.keyboard.press( 'ArrowUp' );
-				await insertBlock( 'Heading' );
-				await page.keyboard.type( 'I am a header' );
-				await page.keyboard.press( 'Enter' );
-				await page.keyboard.type( 'First paragraph' );
-				await page.keyboard.press( 'Enter' );
-				await page.keyboard.type( 'Second paragraph' );
-				await page.keyboard.press( 'Enter' );
-				await page.keyboard.type( 'Third paragraph' );
-				await page.keyboard.press( 'Enter' );
-				await page.keyboard.type( 'Fourth paragraph' );
-				await page.keyboard.press( 'Enter' );
-				await page.keyboard.type( 'Fifth paragraph' );
-				await pressKeyWithModifier( 'primary', 'a' );
-				await pressKeyWithModifier( 'primary', 'a' );
-				expect( await getAvailableBlockTransforms() ).not.toEqual(
-					expect.arrayContaining( [ 'Columns' ] )
-				);
-			} );
-		} );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/change-detection.test.js b/packages/e2e-tests/specs/editor/various/change-detection.test.js
deleted file mode 100644
index 62057c4cbb2bc0..00000000000000
--- a/packages/e2e-tests/specs/editor/various/change-detection.test.js
+++ /dev/null
@@ -1,413 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	clickBlockAppender,
-	createNewPost,
-	pressKeyWithModifier,
-	ensureSidebarOpened,
-	publishPost,
-	saveDraft,
-	openDocumentSettingsSidebar,
-	isCurrentURL,
-	openTypographyToolsPanelMenu,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'Change detection', () => {
-	let handleInterceptedRequest, hadInterceptedSave;
-
-	beforeEach( async () => {
-		hadInterceptedSave = false;
-
-		await createNewPost();
-	} );
-
-	afterEach( async () => {
-		if ( handleInterceptedRequest ) {
-			await releaseSaveIntercept();
-		}
-	} );
-
-	async function assertIsDirty( isDirty ) {
-		let hadDialog = false;
-
-		function handleOnDialog() {
-			hadDialog = true;
-		}
-
-		try {
-			page.on( 'dialog', handleOnDialog );
-			await page.reload();
-
-			// Ensure whether it was expected that dialog was encountered.
-			expect( hadDialog ).toBe( isDirty );
-		} catch ( error ) {
-			throw error;
-		} finally {
-			page.removeListener( 'dialog', handleOnDialog );
-		}
-	}
-
-	async function interceptSave() {
-		await page.setRequestInterception( true );
-
-		handleInterceptedRequest = ( interceptedRequest ) => {
-			if ( interceptedRequest.url().includes( '/wp/v2/posts' ) ) {
-				hadInterceptedSave = true;
-			} else {
-				interceptedRequest.continue();
-			}
-		};
-		page.on( 'request', handleInterceptedRequest );
-	}
-
-	async function releaseSaveIntercept() {
-		page.removeListener( 'request', handleInterceptedRequest );
-		await page.setRequestInterception( false );
-		hadInterceptedSave = false;
-		handleInterceptedRequest = null;
-	}
-
-	it( 'Should not save on new unsaved post', async () => {
-		await interceptSave();
-
-		// Keyboard shortcut Ctrl+S save.
-		await pressKeyWithModifier( 'primary', 'S' );
-
-		expect( hadInterceptedSave ).toBe( false );
-	} );
-
-	it( 'Should autosave post', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Force autosave to occur immediately.
-		await Promise.all( [
-			page.evaluate( () =>
-				window.wp.data.dispatch( 'core/editor' ).autosave()
-			),
-			page.waitForSelector( '.editor-post-saved-state.is-autosaving' ),
-			page.waitForSelector( '.editor-post-saved-state.is-saved' ),
-		] );
-
-		// Autosave draft as same user should do full save, i.e. not dirty.
-		await assertIsDirty( false );
-	} );
-
-	it( 'Should prompt to confirm unsaved changes for autosaved draft for non-content fields', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Toggle post as needing review (not persisted for autosave).
-		await ensureSidebarOpened();
-
-		const postPendingReviewButton = (
-			await page.$x( "//label[contains(text(), 'Pending review')]" )
-		)[ 0 ];
-		await postPendingReviewButton.click( 'button' );
-
-		// Force autosave to occur immediately.
-		await Promise.all( [
-			page.evaluate( () =>
-				window.wp.data.dispatch( 'core/editor' ).autosave()
-			),
-			page.waitForSelector( '.editor-post-saved-state.is-autosaving' ),
-			page.waitForSelector( '.editor-post-saved-state.is-saved' ),
-		] );
-
-		await assertIsDirty( true );
-	} );
-
-	it( 'Should prompt to confirm unsaved changes for autosaved published post', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		await publishPost();
-
-		// Close publish panel.
-		await Promise.all( [
-			page.waitForFunction(
-				() => ! document.querySelector( '.editor-post-publish-panel' )
-			),
-			page.click( '.editor-post-publish-panel__header button' ),
-		] );
-
-		// Should be dirty after autosave change of published post.
-		await canvas().type( '.editor-post-title__input', '!' );
-
-		await Promise.all( [
-			page.waitForSelector(
-				'.editor-post-publish-button[aria-disabled="true"]'
-			),
-			page.waitForSelector(
-				'.editor-post-publish-button[aria-disabled="false"]'
-			),
-			page.evaluate( () =>
-				window.wp.data.dispatch( 'core/editor' ).autosave()
-			),
-		] );
-
-		await assertIsDirty( true );
-	} );
-
-	it( 'Should not prompt to confirm unsaved changes for new post', async () => {
-		await assertIsDirty( false );
-	} );
-
-	it( 'Should prompt to confirm unsaved changes for new post with initial edits', async () => {
-		await createNewPost( {
-			title: 'My New Post',
-			content: 'My content',
-			excerpt: 'My excerpt',
-		} );
-
-		await assertIsDirty( true );
-	} );
-
-	it( 'Should prompt if property changed without save', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		await assertIsDirty( true );
-	} );
-
-	it( 'Should prompt if content added without save', async () => {
-		await clickBlockAppender();
-		await page.keyboard.type( 'Paragraph' );
-
-		await assertIsDirty( true );
-	} );
-
-	it( 'Should not prompt if changes saved', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		await saveDraft();
-
-		await assertIsDirty( false );
-	} );
-
-	it( 'Should not prompt if changes saved right after typing', async () => {
-		await clickBlockAppender();
-		await page.keyboard.type( 'Hello World' );
-
-		await saveDraft();
-
-		await assertIsDirty( false );
-	} );
-
-	it( 'Should not save if all changes saved', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		await saveDraft();
-
-		await interceptSave();
-
-		// Keyboard shortcut Ctrl+S save.
-		await pressKeyWithModifier( 'primary', 'S' );
-
-		expect( hadInterceptedSave ).toBe( false );
-	} );
-
-	it( 'Should prompt if save failed', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		await page.setOfflineMode( true );
-
-		await Promise.all( [
-			// Keyboard shortcut Ctrl+S save.
-			pressKeyWithModifier( 'primary', 'S' ),
-
-			// Ensure save update fails and presents button.
-			page.waitForXPath(
-				'//*[contains(@class, "components-notice") and contains(@class, "is-error")]/*[text()="Updating failed. You are probably offline."]'
-			),
-			page.waitForSelector( '.editor-post-save-draft' ),
-		] );
-
-		// Need to disable offline to allow reload.
-		await page.setOfflineMode( false );
-
-		await assertIsDirty( true );
-
-		expect( console ).toHaveErroredWith(
-			'Failed to load resource: net::ERR_INTERNET_DISCONNECTED'
-		);
-	} );
-
-	it( 'Should prompt if changes and save is in-flight', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Hold the posts request so we don't deal with race conditions of the
-		// save completing early. Other requests should be allowed to continue,
-		// for example the page reload test.
-		await interceptSave();
-
-		// Keyboard shortcut Ctrl+S save.
-		await pressKeyWithModifier( 'primary', 'S' );
-
-		await assertIsDirty( true );
-
-		await releaseSaveIntercept();
-	} );
-
-	it( 'Should prompt if changes made while save is in-flight', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Hold the posts request so we don't deal with race conditions of the
-		// save completing early. Other requests should be allowed to continue,
-		// for example the page reload test.
-		await interceptSave();
-
-		// Keyboard shortcut Ctrl+S save.
-		await pressKeyWithModifier( 'primary', 'S' );
-
-		await canvas().type( '.editor-post-title__input', '!' );
-		await page.waitForSelector( '.editor-post-save-draft' );
-
-		await releaseSaveIntercept();
-
-		await assertIsDirty( true );
-	} );
-
-	it( 'Should prompt if property changes made while save is in-flight, and save completes', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Hold the posts request so we don't deal with race conditions of the
-		// save completing early.
-		await interceptSave();
-
-		// Keyboard shortcut Ctrl+S save.
-		await pressKeyWithModifier( 'primary', 'S' );
-
-		// Start this check immediately after save since dirtying the post will
-		// remove the "Saved" with the Save button.
-		const savedPromise = page.waitForSelector(
-			'.editor-post-saved-state.is-saved'
-		);
-
-		// Dirty post while save is in-flight.
-		await canvas().type( '.editor-post-title__input', '!' );
-
-		// Allow save to complete. Disabling interception flushes pending.
-		await Promise.all( [ savedPromise, releaseSaveIntercept() ] );
-
-		await assertIsDirty( true );
-	} );
-
-	it( 'Should prompt if block revision is made while save is in-flight, and save completes', async () => {
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Hold the posts request so we don't deal with race conditions of the
-		// save completing early.
-		await interceptSave();
-
-		// Keyboard shortcut Ctrl+S save.
-		await pressKeyWithModifier( 'primary', 'S' );
-
-		// Start this check immediately after save since dirtying the post will
-		// remove the "Saved" with the Save button.
-		const savedPromise = page.waitForSelector(
-			'.editor-post-saved-state.is-saved'
-		);
-
-		await clickBlockAppender();
-		await page.keyboard.type( 'Paragraph' );
-
-		// Allow save to complete. Disabling interception flushes pending.
-		await Promise.all( [ savedPromise, releaseSaveIntercept() ] );
-
-		await assertIsDirty( true );
-	} );
-
-	it( 'should save posts without titles and persist and overwrite the auto draft title', async () => {
-		// Enter content.
-		await clickBlockAppender();
-		await page.keyboard.type( 'Paragraph' );
-
-		// Save.
-		await saveDraft();
-
-		// Verify that the title is empty.
-		const title = await canvas().$eval(
-			'.editor-post-title__input',
-			// Trim padding non-breaking space.
-			( element ) => element.textContent.trim()
-		);
-		expect( title ).toBe( '' );
-
-		// Verify that the post is not dirty.
-		await assertIsDirty( false );
-	} );
-
-	it( 'should not prompt to confirm unsaved changes when trashing an existing post', async () => {
-		// Enter title.
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Save.
-		await saveDraft();
-		const postId = await page.evaluate( () =>
-			window.wp.data.select( 'core/editor' ).getCurrentPostId()
-		);
-
-		// Trash post.
-		await openDocumentSettingsSidebar();
-		await page.click( '.editor-post-trash.components-button' );
-		await page.click( '.components-confirm-dialog .is-primary' );
-
-		await Promise.all( [
-			// Wait for "Saved" to confirm save complete.
-			await page.waitForSelector( '.editor-post-saved-state.is-saved' ),
-
-			// Make sure redirection happens.
-			await page.waitForNavigation(),
-		] );
-
-		expect(
-			isCurrentURL(
-				'/wp-admin/edit.php',
-				`post_type=post&ids=${ postId }`
-			)
-		).toBe( true );
-	} );
-
-	it( 'consecutive edits to the same attribute should mark the post as dirty after a save', async () => {
-		// Open the sidebar block settings.
-		await openDocumentSettingsSidebar();
-		await page.click( '.edit-post-sidebar__panel-tab[data-label="Block"]' );
-
-		// Insert a paragraph.
-		await clickBlockAppender();
-		await page.keyboard.type( 'Hello, World!' );
-
-		// Save and wait till the post is clean.
-		await Promise.all( [
-			page.waitForSelector( '.editor-post-saved-state.is-saved' ),
-			pressKeyWithModifier( 'primary', 'S' ),
-		] );
-
-		// Change the paragraph's `drop cap`.
-		await canvas().click( '[data-type="core/paragraph"]' );
-
-		await openTypographyToolsPanelMenu();
-		await page.click( 'button[aria-label="Show Drop cap"]' );
-
-		const [ dropCapToggle ] = await page.$x(
-			"//label[contains(text(), 'Drop cap')]"
-		);
-		await dropCapToggle.click();
-		await canvas().click( '[data-type="core/paragraph"]' );
-
-		// Check that the post is dirty.
-		await page.waitForSelector( '.editor-post-save-draft' );
-
-		// Save and wait till the post is clean.
-		await Promise.all( [
-			page.waitForSelector( '.editor-post-saved-state.is-saved' ),
-			pressKeyWithModifier( 'primary', 'S' ),
-		] );
-
-		// Change the paragraph's `drop cap` again.
-		await canvas().click( '[data-type="core/paragraph"]' );
-		await dropCapToggle.click();
-
-		// Check that the post is dirty.
-		await page.waitForSelector( '.editor-post-save-draft' );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/core-settings.test.js b/packages/e2e-tests/specs/editor/various/core-settings.test.js
deleted file mode 100644
index 0eb98a2de050b4..00000000000000
--- a/packages/e2e-tests/specs/editor/various/core-settings.test.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { visitAdminPage } from '@wordpress/e2e-test-utils';
-
-async function getOptionsValues( selector ) {
-	await visitAdminPage( 'options.php' );
-	return page.evaluate( ( theSelector ) => {
-		const inputs = Array.from( document.querySelectorAll( theSelector ) );
-		return inputs.reduce( ( memo, input ) => {
-			memo[ input.id ] = input.value;
-			return memo;
-		}, {} );
-	}, selector );
-}
-
-// It might make sense to include a similar test in WP core (or move this one over).
-// See discussion here: https://github.com/WordPress/gutenberg/pull/32797#issuecomment-864192088.
-describe( 'Settings', () => {
-	test( 'Regression: updating a specific option will only change its value and will not corrupt others', async () => {
-		// We won't select the option that we updated and will also remove some
-		// _transient options that seem to change at every update.
-		const optionsInputsSelector =
-			'form#all-options table.form-table input:not([id*="_transient"]):not([id="blogdescription"])';
-		const optionsBefore = await getOptionsValues( optionsInputsSelector );
-
-		await visitAdminPage( 'options-general.php' );
-		await page.type(
-			'input#blogdescription',
-			'Just another Gutenberg site'
-		);
-		await page.click( 'input#submit' );
-
-		const optionsAfter = await getOptionsValues( optionsInputsSelector );
-
-		Object.entries( optionsBefore ).forEach( ( optionBefore ) => {
-			const [ id ] = optionBefore;
-			const optionAfter = [ id, optionsAfter[ id ] ];
-			expect( optionAfter ).toStrictEqual( optionBefore );
-		} );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/datepicker.test.js b/packages/e2e-tests/specs/editor/various/datepicker.test.js
deleted file mode 100644
index 6838fd56a2ba9a..00000000000000
--- a/packages/e2e-tests/specs/editor/various/datepicker.test.js
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createNewPost, changeSiteTimezone } from '@wordpress/e2e-test-utils';
-
-async function getInputValue( selector ) {
-	return page.$eval( selector, ( element ) => element.value );
-}
-
-async function getSelectedOptionLabel( selector ) {
-	return page.$eval(
-		selector,
-		( element ) => element.options[ element.selectedIndex ].text
-	);
-}
-
-async function getDatePickerValues() {
-	const year = await getInputValue(
-		'.components-datetime__time-field-year input'
-	);
-	const month = await getInputValue(
-		'.components-datetime__time-field-month select'
-	);
-	const monthLabel = await getSelectedOptionLabel(
-		'.components-datetime__time-field-month select'
-	);
-	const day = await getInputValue(
-		'.components-datetime__time-field-day input'
-	);
-	const hours = await getInputValue(
-		'.components-datetime__time-field-hours-input input'
-	);
-	const minutes = await getInputValue(
-		'.components-datetime__time-field-minutes-input input'
-	);
-	const amOrPm = await page.$eval(
-		'.components-datetime__time-field-am-pm .is-primary',
-		( element ) => element.innerText.toLowerCase()
-	);
-
-	return { year, month, monthLabel, day, hours, minutes, amOrPm };
-}
-
-function trimLeadingZero( str ) {
-	return str[ 0 ] === '0' ? str.slice( 1 ) : str;
-}
-
-function formatDatePickerValues(
-	{ year, monthLabel, day, hours, minutes, amOrPm },
-	timezone
-) {
-	const dayTrimmed = trimLeadingZero( day );
-	const hoursTrimmed = trimLeadingZero( hours );
-	return `${ monthLabel } ${ dayTrimmed }, ${ year } ${ hoursTrimmed }:${ minutes }\xa0${ amOrPm } ${ timezone }`;
-}
-
-async function getPublishingDate() {
-	return page.$eval(
-		'.editor-post-schedule__dialog-toggle',
-		( dateLabel ) => dateLabel.textContent
-	);
-}
-
-describe.each( [ [ 'UTC-10' ], [ 'UTC' ], [ 'UTC+10' ] ] )(
-	`Datepicker %s`,
-	( timezone ) => {
-		let oldTimezone;
-		beforeEach( async () => {
-			await page.emulateTimezone( 'America/New_York' ); // Set browser to a timezone that's different to `timezone`.
-			oldTimezone = await changeSiteTimezone( timezone );
-			await createNewPost();
-		} );
-		afterEach( async () => {
-			await changeSiteTimezone( oldTimezone );
-			await page.emulateTimezone( null );
-		} );
-
-		it( 'should show the publishing date as "Immediately" if the date is not altered', async () => {
-			const publishingDate = await getPublishingDate();
-
-			expect( publishingDate ).toEqual( 'Immediately' );
-		} );
-
-		it( 'should show the publishing date if the date is in the past', async () => {
-			// Open the datepicker.
-			await page.click( '.editor-post-schedule__dialog-toggle' );
-
-			// Change the publishing date to a year in the past.
-			await page.click( '.components-datetime__time-field-year' );
-			await page.keyboard.press( 'ArrowDown' );
-			const datePickerValues = await getDatePickerValues();
-
-			// Close the datepicker.
-			await page.click( '.editor-post-schedule__dialog-toggle' );
-
-			const publishingDate = await getPublishingDate();
-
-			expect( publishingDate ).toBe(
-				formatDatePickerValues( datePickerValues, timezone )
-			);
-		} );
-
-		it( 'should show the publishing date if the date is in the future', async () => {
-			// Open the datepicker.
-			await page.click( '.editor-post-schedule__dialog-toggle' );
-
-			// Change the publishing date to a year in the future.
-			await page.click( '.components-datetime__time-field-year' );
-			await page.keyboard.press( 'ArrowUp' );
-			const datePickerValues = await getDatePickerValues();
-
-			// Close the datepicker.
-			await page.click( '.editor-post-schedule__dialog-toggle' );
-
-			const publishingDate = await getPublishingDate();
-
-			expect( publishingDate ).not.toEqual( 'Immediately' );
-			// The expected date format will be "Sep 26, 2018 11:52 pm".
-			expect( publishingDate ).toBe(
-				formatDatePickerValues( datePickerValues, timezone )
-			);
-		} );
-
-		it( `should show the publishing date as "Immediately" if the date is cleared`, async () => {
-			// Open the datepicker.
-			await page.click( '.editor-post-schedule__dialog-toggle' );
-
-			// Change the publishing date to a year in the future.
-			await page.click( '.components-datetime__time-field-year' );
-			await page.keyboard.press( 'ArrowUp' );
-
-			// Close the datepicker.
-			await page.click( '.editor-post-schedule__dialog-toggle' );
-
-			// Open the datepicker.
-			await page.click( '.editor-post-schedule__dialog-toggle' );
-
-			// Clear the date.
-			await page.click(
-				'.block-editor-publish-date-time-picker button[aria-label="Now"]'
-			);
-
-			const publishingDate = await getPublishingDate();
-
-			expect( publishingDate ).toEqual( 'Immediately' );
-		} );
-	}
-);
diff --git a/packages/e2e-tests/specs/editor/various/dropdown-menu.test.js b/packages/e2e-tests/specs/editor/various/dropdown-menu.test.js
deleted file mode 100644
index 1ab5730ab66777..00000000000000
--- a/packages/e2e-tests/specs/editor/various/dropdown-menu.test.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createNewPost, pressKeyTimes } from '@wordpress/e2e-test-utils';
-
-const moreMenuButtonSelector = '.components-button[aria-label="Options"]';
-const moreMenuDropdownSelector =
-	'.components-dropdown-menu__menu[aria-label="Options"]';
-const menuItemsSelector = [ 'menuitem', 'menuitemcheckbox', 'menuitemradio' ]
-	.map( ( role ) => `${ moreMenuDropdownSelector } [role="${ role }"]` )
-	.join( ',' );
-
-describe( 'Dropdown Menu', () => {
-	beforeEach( async () => {
-		await createNewPost();
-	} );
-
-	it( 'allows navigation through each item using arrow keys', async () => {
-		await page.click( moreMenuButtonSelector );
-		const menuItems = await page.$$( menuItemsSelector );
-
-		// Catch any issues with the selector, which could cause a false positive test result.
-		expect( menuItems.length ).toBeGreaterThan( 0 );
-
-		let activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-		const [ firstMenuItem ] = menuItems;
-		const firstMenuItemText = await firstMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the first menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-
-		// Arrow down to the last item.
-		await pressKeyTimes( 'ArrowDown', menuItems.length - 1 );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		const [ lastMenuItem ] = menuItems.slice( -1 );
-		const lastMenuItemText = await lastMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the last menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( lastMenuItemText );
-
-		// Arrow back up to the first item.
-		await pressKeyTimes( 'ArrowUp', menuItems.length - 1 );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		// Expect the first menu item to be focused again.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-	} );
-
-	it( 'loops to the beginning and end when navigating past the boundaries of the menu', async () => {
-		await page.click( moreMenuButtonSelector );
-		const menuItems = await page.$$( menuItemsSelector );
-
-		// Catch any issues with the selector, which could cause a false positive test result.
-		expect( menuItems.length ).toBeGreaterThan( 0 );
-
-		let activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-		const [ firstMenuItem ] = menuItems;
-		const firstMenuItemText = await firstMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the first menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-
-		// Arrow up to the last item.
-		await page.keyboard.press( 'ArrowUp' );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		const [ lastMenuItem ] = menuItems.slice( -1 );
-		const lastMenuItemText = await lastMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the last menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( lastMenuItemText );
-
-		// Arrow back down to the first item.
-		await page.keyboard.press( 'ArrowDown' );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		// Expect the first menu item to be focused again.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-	} );
-
-	it( 'ignores arrow key navigation that is orthogonal to the orientation of the menu, but stays open', async () => {
-		await page.click( moreMenuButtonSelector );
-		const menuItems = await page.$$( menuItemsSelector );
-
-		// Catch any issues with the selector, which could cause a false positive test result.
-		expect( menuItems.length ).toBeGreaterThan( 0 );
-
-		let activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-		const [ firstMenuItem ] = menuItems;
-		const firstMenuItemText = await firstMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the first menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-
-		// Press left and right keys an arbitrary (but > 1) number of times.
-		await pressKeyTimes( 'ArrowLeft', 5 );
-		await pressKeyTimes( 'ArrowRight', 5 );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		// Expect the first menu item to still be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/editor-modes.test.js b/packages/e2e-tests/specs/editor/various/editor-modes.test.js
deleted file mode 100644
index 81878ebf7208e3..00000000000000
--- a/packages/e2e-tests/specs/editor/various/editor-modes.test.js
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	clickBlockAppender,
-	clickBlockToolbarButton,
-	clickMenuItem,
-	createNewPost,
-	getCurrentPostContent,
-	switchEditorModeTo,
-	pressKeyTimes,
-	pressKeyWithModifier,
-	openTypographyToolsPanelMenu,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'Editing modes (visual/HTML)', () => {
-	beforeEach( async () => {
-		await createNewPost();
-		await clickBlockAppender();
-		await page.keyboard.type( 'Hello world!' );
-	} );
-
-	it( 'should switch between visual and HTML modes', async () => {
-		// This block should be in "visual" mode by default.
-		let visualBlock = await canvas().$$( '[data-block].rich-text' );
-		expect( visualBlock ).toHaveLength( 1 );
-
-		// Change editing mode from "Visual" to "HTML".
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Edit as HTML' );
-
-		// Wait for the block to be converted to HTML editing mode.
-		const htmlBlock = await canvas().$$(
-			'[data-block] .block-editor-block-list__block-html-textarea'
-		);
-		expect( htmlBlock ).toHaveLength( 1 );
-
-		// Change editing mode from "HTML" back to "Visual".
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Edit visually' );
-
-		// This block should be in "visual" mode by default.
-		visualBlock = await canvas().$$( '[data-block].rich-text' );
-		expect( visualBlock ).toHaveLength( 1 );
-	} );
-
-	it( 'should display sidebar in HTML mode', async () => {
-		// Change editing mode from "Visual" to "HTML".
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Edit as HTML' );
-
-		// The `drop cap` toggle for the paragraph block should appear, even in
-		// HTML editing mode.
-		await openTypographyToolsPanelMenu();
-		await page.click( 'button[aria-label="Show Drop cap"]' );
-
-		const dropCapToggle = await page.$x(
-			"//label[contains(text(), 'Drop cap')]"
-		);
-
-		expect( dropCapToggle ).toHaveLength( 1 );
-	} );
-
-	it( 'should update HTML in HTML mode when sidebar is used', async () => {
-		// Change editing mode from "Visual" to "HTML".
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Edit as HTML' );
-
-		// Make sure the paragraph content is rendered as expected.
-		let htmlBlockContent = await canvas().$eval(
-			'.block-editor-block-list__layout .block-editor-block-list__block .block-editor-block-list__block-html-textarea',
-			( node ) => node.textContent
-		);
-		expect( htmlBlockContent ).toEqual( '<p>Hello world!</p>' );
-
-		// Change the `drop cap` using the sidebar.
-		await openTypographyToolsPanelMenu();
-		await page.click( 'button[aria-label="Show Drop cap"]' );
-
-		const [ dropCapToggle ] = await page.$x(
-			"//label[contains(text(), 'Drop cap')]"
-		);
-		await dropCapToggle.click();
-
-		// Make sure the HTML content updated.
-		htmlBlockContent = await canvas().$eval(
-			'.block-editor-block-list__layout .block-editor-block-list__block .block-editor-block-list__block-html-textarea',
-			( node ) => node.textContent
-		);
-		expect( htmlBlockContent ).toEqual(
-			'<p class="has-drop-cap">Hello world!</p>'
-		);
-	} );
-
-	it( 'the code editor should unselect blocks and disable the inserter', async () => {
-		// The paragraph block should be selected.
-		const title = await page.$eval(
-			'.block-editor-block-card__title',
-			( element ) => element.innerText
-		);
-		expect( title ).toBe( 'Paragraph' );
-
-		// The Block inspector should be active.
-		let blockInspectorTab = await page.$(
-			'.edit-post-sidebar__panel-tab.is-active[data-label="Block"]'
-		);
-		expect( blockInspectorTab ).not.toBeNull();
-
-		await switchEditorModeTo( 'Code' );
-
-		// The Block inspector should not be active anymore.
-		blockInspectorTab = await page.$(
-			'.edit-post-sidebar__panel-tab.is-active[data-label="Block"]'
-		);
-		expect( blockInspectorTab ).toBeNull();
-
-		// No block is selected.
-		await page.click( '.edit-post-sidebar__panel-tab[data-label="Block"]' );
-		const noBlocksElement = await page.$(
-			'.block-editor-block-inspector__no-blocks'
-		);
-		expect( noBlocksElement ).not.toBeNull();
-
-		// The inserter is disabled.
-		const disabledInserter = await page.$(
-			'.edit-post-header-toolbar__inserter-toggle:disabled, .edit-post-header-toolbar__inserter-toggle[aria-disabled="true"]'
-		);
-		expect( disabledInserter ).not.toBeNull();
-	} );
-
-	// Test for regressions of https://github.com/WordPress/gutenberg/issues/24054.
-	it( 'saves content when using the shortcut in the Code Editor', async () => {
-		await switchEditorModeTo( 'Code' );
-
-		const textContent = await page.evaluate(
-			() => document.querySelector( '.editor-post-text-editor' ).value
-		);
-		const editPosition = textContent.indexOf( 'Hello' );
-
-		// Replace the word 'Hello' with 'Hi'.
-		await canvas().click( '.editor-post-title__input' );
-		await page.keyboard.press( 'Tab' );
-		await pressKeyTimes( 'ArrowRight', editPosition );
-		await pressKeyTimes( 'Delete', 5 );
-		await page.keyboard.type( 'Hi' );
-
-		// Save the post using the shortcut.
-		await pressKeyWithModifier( 'primary', 's' );
-		await page.waitForSelector( '.editor-post-saved-state.is-saved' );
-
-		await switchEditorModeTo( 'Visual' );
-
-		expect( await getCurrentPostContent() ).toMatchInlineSnapshot( `
-		"<!-- wp:paragraph -->
-		<p>Hi world!</p>
-		<!-- /wp:paragraph -->"
-	` );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/embedding.test.js b/packages/e2e-tests/specs/editor/various/embedding.test.js
deleted file mode 100644
index 4461fc62330530..00000000000000
--- a/packages/e2e-tests/specs/editor/various/embedding.test.js
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	clickBlockAppender,
-	createEmbeddingMatcher,
-	createJSONResponse,
-	createNewPost,
-	createURLMatcher,
-	getEditedPostContent,
-	insertBlock,
-	publishPost,
-	setUpResponseMocking,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-const MOCK_EMBED_WORDPRESS_SUCCESS_RESPONSE = {
-	url: 'https://wordpress.org/gutenberg/handbook/block-api/attributes/',
-	html: '<div class="wp-embedded-content" data-secret="shhhh it is a secret"></div>',
-	type: 'rich',
-	provider_name: 'WordPress',
-	provider_url: 'https://wordpress.org',
-	version: '1.0',
-};
-
-const MOCK_EMBED_RICH_SUCCESS_RESPONSE = {
-	url: 'https://twitter.com/notnownikki',
-	html: '<p>Mock success response.</p>',
-	type: 'rich',
-	provider_name: 'Twitter',
-	provider_url: 'https://twitter.com',
-	version: '1.0',
-};
-
-const MOCK_EMBED_PHOTO_SUCCESS_RESPONSE = {
-	url: 'https://cloudup.com/cQFlxqtY4ob',
-	html: '<p>Mock success response.</p>',
-	type: 'photo',
-	provider_name: 'Cloudup',
-	provider_url: 'https://cloudup.com',
-	version: '1.0',
-};
-
-const MOCK_EMBED_VIDEO_SUCCESS_RESPONSE = {
-	url: 'https://www.youtube.com/watch?v=lXMskKTw3Bc',
-	html: '<iframe width="16" height="9"></iframe>',
-	type: 'video',
-	provider_name: 'YouTube',
-	provider_url: 'https://youtube.com',
-	version: '1.0',
-};
-
-const MOCK_EMBED_AUDIO_SUCCESS_RESPONSE = {
-	url: 'https://soundcloud.com/a-boogie-wit-da-hoodie/swervin',
-	html: '<iframe width="16" height="9"></iframe>',
-	type: 'audio',
-	provider_name: 'SoundCloud',
-	provider_url: 'https://soundcloud.com',
-	version: '1.0',
-};
-
-const MOCK_EMBED_IMAGE_SUCCESS_RESPONSE = {
-	url: 'https://www.instagram.com/p/Bvl97o2AK6x/',
-	html: '<iframe width="16" height="9"></iframe>',
-	type: 'video',
-	provider_name: 'Instagram',
-	provider_url: 'https://www.instagram.com',
-	version: '1.0',
-};
-
-const MOCK_BAD_EMBED_PROVIDER_RESPONSE = {
-	url: 'https://twitter.com/thatbunty',
-	html: false,
-	provider_name: 'Embed Provider',
-	version: '1.0',
-};
-
-const MOCK_CANT_EMBED_RESPONSE = {
-	provider_name: 'Embed Handler',
-	html: '<a href="https://twitter.com/wooyaygutenberg123454312">https://twitter.com/wooyaygutenberg123454312</a>',
-};
-
-const MOCK_BAD_WORDPRESS_RESPONSE = {
-	code: 'oembed_invalid_url',
-	message: 'Not Found',
-	data: {
-		status: 404,
-	},
-	html: false,
-};
-
-const MOCK_RESPONSES = [
-	{
-		match: createEmbeddingMatcher(
-			'https://wordpress.org/gutenberg/handbook'
-		),
-		onRequestMatch: createJSONResponse( MOCK_BAD_WORDPRESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://wordpress.org/gutenberg/handbook/'
-		),
-		onRequestMatch: createJSONResponse( MOCK_BAD_WORDPRESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://wordpress.org/gutenberg/handbook/block-api/attributes/'
-		),
-		onRequestMatch: createJSONResponse(
-			MOCK_EMBED_WORDPRESS_SUCCESS_RESPONSE
-		),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://www.youtube.com/watch?v=lXMskKTw3Bc'
-		),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_VIDEO_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://soundcloud.com/a-boogie-wit-da-hoodie/swervin'
-		),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_AUDIO_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://www.instagram.com/p/Bvl97o2AK6x/'
-		),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_IMAGE_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher( 'https://cloudup.com/cQFlxqtY4ob' ),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_PHOTO_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher( 'https://twitter.com/notnownikki' ),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_RICH_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher( 'https://twitter.com/notnownikki/' ),
-		onRequestMatch: createJSONResponse( MOCK_CANT_EMBED_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher( 'https://twitter.com/thatbunty' ),
-		onRequestMatch: createJSONResponse( MOCK_BAD_EMBED_PROVIDER_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://twitter.com/wooyaygutenberg123454312'
-		),
-		onRequestMatch: createJSONResponse( MOCK_CANT_EMBED_RESPONSE ),
-	},
-	// Respond to the instagram URL with a non-image response, doesn't matter what it is,
-	// just make sure the image errors.
-	{
-		match: createURLMatcher( 'https://www.instagram.com/p/Bvl97o2AK6x/' ),
-		onRequestMatch: createJSONResponse( MOCK_CANT_EMBED_RESPONSE ),
-	},
-];
-
-async function insertEmbed( URL ) {
-	await clickBlockAppender();
-	await page.keyboard.type( '/embed' );
-	await page.waitForXPath(
-		`//*[contains(@class, "components-autocomplete__result") and contains(@class, "is-selected") and contains(text(), 'Embed')]`
-	);
-	await page.keyboard.press( 'Enter' );
-	await page.keyboard.type( URL );
-	await page.keyboard.press( 'Enter' );
-}
-
-describe( 'Embedding content', () => {
-	beforeEach( async () => {
-		await setUpResponseMocking( MOCK_RESPONSES );
-		await createNewPost();
-	} );
-
-	it( 'should render embeds in the correct state', async () => {
-		// Valid embed. Should render valid figure element.
-		await insertEmbed( 'https://twitter.com/notnownikki' );
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-
-		// Valid provider; invalid content. Should render failed, edit state.
-		await insertEmbed( 'https://twitter.com/wooyaygutenberg123454312' );
-		await canvas().waitForSelector(
-			'input[value="https://twitter.com/wooyaygutenberg123454312"]'
-		);
-
-		// WordPress invalid content. Should render failed, edit state.
-		await insertEmbed( 'https://wordpress.org/gutenberg/handbook/' );
-		await canvas().waitForSelector(
-			'input[value="https://wordpress.org/gutenberg/handbook/"]'
-		);
-
-		// Provider whose oembed API has gone wrong. Should render failed, edit
-		// state.
-		await insertEmbed( 'https://twitter.com/thatbunty' );
-		await canvas().waitForSelector(
-			'input[value="https://twitter.com/thatbunty"]'
-		);
-
-		// WordPress content that can be embedded. Should render valid figure
-		// element.
-		await insertEmbed(
-			'https://wordpress.org/gutenberg/handbook/block-api/attributes/'
-		);
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-
-		// Video content. Should render valid figure element, and include the
-		// aspect ratio class.
-		await insertEmbed( 'https://www.youtube.com/watch?v=lXMskKTw3Bc' );
-		await canvas().waitForSelector(
-			'figure.wp-block-embed.is-type-video.wp-embed-aspect-16-9'
-		);
-
-		// Photo content. Should render valid figure element.
-		await insertEmbed( 'https://cloudup.com/cQFlxqtY4ob' );
-		await canvas().waitForSelector(
-			'iframe[title="Embedded content from cloudup"'
-		);
-
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'should allow the user to convert unembeddable URLs to a paragraph with a link in it', async () => {
-		// URL that can't be embedded.
-		await insertEmbed( 'https://twitter.com/wooyaygutenberg123454312' );
-
-		// Wait for the request to fail and present an error. Since placeholder
-		// has styles applied which depend on resize observer, wait for the
-		// expected size class to settle before clicking, since otherwise a race
-		// condition could occur on the placeholder layout vs. click intent.
-		await canvas().waitForSelector(
-			'.components-placeholder.is-large .components-placeholder__error'
-		);
-
-		const button = await canvas().waitForXPath(
-			`//button[contains(text(), 'Convert to link')]`
-		);
-		await button.click();
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'should retry embeds that could not be embedded with trailing slashes, without the trailing slashes', async () => {
-		await insertEmbed( 'https://twitter.com/notnownikki/' );
-		// The twitter block should appear correctly.
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'should allow the user to try embedding a failed URL again', async () => {
-		// URL that can't be embedded.
-		await insertEmbed( 'https://twitter.com/wooyaygutenberg123454312' );
-
-		// Wait for the request to fail and present an error. Since placeholder
-		// has styles applied which depend on resize observer, wait for the
-		// expected size class to settle before clicking, since otherwise a race
-		// condition could occur on the placeholder layout vs. click intent.
-		await canvas().waitForSelector(
-			'.components-placeholder.is-large .components-placeholder__error'
-		);
-
-		// Set up a different mock to make sure that try again actually does make the request again.
-		await setUpResponseMocking( [
-			{
-				match: createEmbeddingMatcher(
-					'https://twitter.com/wooyaygutenberg123454312'
-				),
-				onRequestMatch: createJSONResponse(
-					MOCK_EMBED_RICH_SUCCESS_RESPONSE
-				),
-			},
-		] );
-		const button = await canvas().waitForXPath(
-			`//button[contains(text(), 'Try again')]`
-		);
-		await button.click();
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'should switch to the WordPress block correctly', async () => {
-		// This test is to make sure that WordPress embeds are detected correctly,
-		// because the HTML can vary, and the block is detected by looking for
-		// classes in the HTML, so we need to flag up if the HTML changes.
-
-		// Publish a post to embed.
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'Hello there!' );
-		await publishPost();
-		const postUrl = await page.$eval(
-			'.editor-post-publish-panel [id^=inspector-text-control-]',
-			( el ) => el.value
-		);
-
-		// Start a new post, embed the previous post.
-		await createNewPost();
-		await insertEmbed( postUrl );
-
-		// Check the block has become a WordPress block.
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js b/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js
deleted file mode 100644
index 4285a410f891e5..00000000000000
--- a/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js
+++ /dev/null
@@ -1,390 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	closeGlobalBlockInserter,
-	createNewPost,
-	getEditedPostContent,
-	insertBlock,
-	openGlobalBlockInserter,
-	pressKeyTimes,
-	searchForBlock,
-	setBrowserViewport,
-	pressKeyWithModifier,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-/** @typedef {import('puppeteer-core').ElementHandle} ElementHandle */
-
-/**
- * Waits for all patterns in the inserter to have a height, which should
- * indicate they've been parsed and are visible.
- *
- * This allows a test to wait for the layout in the inserter menu to stabilize
- * before attempting to interact with the menu contents.
- */
-async function waitForInserterPatternLoad() {
-	await page.waitForFunction( () => {
-		const previewElements = document.querySelectorAll(
-			'.block-editor-block-preview__container'
-		);
-
-		if ( ! previewElements.length ) {
-			return true;
-		}
-
-		return Array.from( previewElements ).every(
-			( previewElement ) => previewElement.offsetHeight > 0
-		);
-	} );
-}
-
-describe( 'Inserting blocks', () => {
-	beforeEach( async () => {
-		await createNewPost();
-	} );
-
-	/**
-	 * Given a Puppeteer ElementHandle, clicks below its bounding box.
-	 *
-	 * @param {ElementHandle} elementHandle Element handle.
-	 *
-	 * @return {Promise} Promise resolving when click occurs.
-	 */
-	async function clickAtBottom( elementHandle ) {
-		const box = await elementHandle.boundingBox();
-		const x = box.x + box.width / 2;
-		const y = box.y + box.height - 50;
-		return page.mouse.click( x, y );
-	}
-
-	it.skip( 'Should insert content using the placeholder and the regular inserter', async () => {
-		// This ensures the editor is loaded in navigation mode.
-		await page.reload();
-		await page.waitForSelector( '.edit-post-layout' );
-
-		// Set a tall viewport. The typewriter's intrinsic height can be enough
-		// to scroll the page on a shorter viewport, thus obscuring the presence
-		// of any potential buggy behavior with the "stretched" click redirect.
-		await setBrowserViewport( { width: 960, height: 1400 } );
-
-		// Click below editor to focus last field (block appender)
-		await clickAtBottom(
-			await page.$( '.interface-interface-skeleton__content' )
-		);
-		expect(
-			await page.waitForSelector( '[data-type="core/paragraph"]' )
-		).not.toBeNull();
-		await page.keyboard.type( 'Paragraph block' );
-
-		// Using the slash command.
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( '/quote' );
-		await page.waitForXPath(
-			`//*[contains(@class, "components-autocomplete__result") and contains(@class, "is-selected") and contains(text(), 'Quote')]`
-		);
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Quote block' );
-
-		// Arrow down into default appender.
-		await page.keyboard.press( 'ArrowDown' );
-		await page.keyboard.press( 'ArrowDown' );
-
-		// Focus should be moved to block focus boundary on a block which does
-		// not have its own inputs (e.g. image). Proceeding to press enter will
-		// append the default block. Pressing backspace on the focused block
-		// will remove it.
-		await page.keyboard.type( '/image' );
-		await page.waitForXPath(
-			`//*[contains(@class, "components-autocomplete__result") and contains(@class, "is-selected") and contains(text(), 'Image')]`
-		);
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.press( 'Enter' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-		await page.keyboard.press( 'Backspace' );
-		await page.keyboard.press( 'Backspace' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-
-		// Using the regular inserter.
-		await insertBlock( 'Preformatted' );
-		await page.keyboard.type( 'Pre block' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.press( 'Enter' );
-
-		// Verify vertical traversal at offset. This has been buggy in the past
-		// where verticality on a blank newline would skip into previous block.
-		await page.keyboard.type( 'Foo' );
-		await page.keyboard.press( 'ArrowUp' );
-		await page.keyboard.press( 'ArrowUp' );
-		await pressKeyTimes( 'Delete', 6 );
-		await page.keyboard.type( ' text' );
-
-		// Ensure newline preservation in shortcode block.
-		// See: https://github.com/WordPress/gutenberg/issues/4456
-		await insertBlock( 'Shortcode' );
-		await page.keyboard.type( '[myshortcode]With multiple' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'lines preserved[/myshortcode]' );
-
-		// Unselect blocks to avoid conflicts with the inbetween inserter
-		await page.click( '.editor-post-title__input' );
-		await closeGlobalBlockInserter();
-
-		// Using the between inserter.
-		const insertionPoint = await page.$( '[data-type="core/quote"]' );
-		const rect = await insertionPoint.boundingBox();
-		await page.mouse.move( rect.x + rect.width / 2, rect.y - 10, {
-			steps: 10,
-		} );
-		const lineInserter = await page.waitForSelector(
-			'.block-editor-block-list__insertion-point .block-editor-inserter__toggle'
-		);
-		await lineInserter.click();
-		// [TODO]: Search input should be focused immediately. It shouldn't be
-		// necessary to have `waitForFunction`.
-		await page.waitForFunction(
-			() =>
-				document.activeElement &&
-				document.activeElement.classList.contains(
-					'components-search-control__input'
-				)
-		);
-		await page.keyboard.type( 'para' );
-		await pressKeyTimes( 'Tab', 2 );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Second paragraph' );
-
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'should insert block with the slash inserter when using multiple words', async () => {
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( '/tag cloud' );
-		await page.waitForXPath(
-			`//*[contains(@class, "components-autocomplete__result") and contains(@class, "is-selected") and contains(text(), 'Tag Cloud')]`
-		);
-		await page.keyboard.press( 'Enter' );
-
-		expect(
-			await canvas().waitForSelector( '[data-type="core/tag-cloud"]' )
-		).not.toBeNull();
-	} );
-
-	// Check for regression of https://github.com/WordPress/gutenberg/issues/23263
-	it( 'inserts blocks at root level when using the root appender while selection is in an inner block', async () => {
-		await insertBlock( 'Buttons' );
-		await page.keyboard.type( '1.1' );
-
-		// After inserting the Buttons block the inner button block should be selected.
-		const selectedButtonBlocks = await canvas().$$(
-			'.wp-block-button.is-selected'
-		);
-		expect( selectedButtonBlocks.length ).toBe( 1 );
-
-		// The block appender is only visible when there's no selection.
-		await page.evaluate( () =>
-			window.wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock()
-		);
-		// Specifically click the root container appender.
-		await canvas().click(
-			'.block-editor-block-list__layout.is-root-container > .block-list-appender .block-editor-inserter__toggle'
-		);
-
-		// Insert a paragraph block.
-		await page.waitForSelector( '.block-editor-inserter__search input' );
-
-		// Search for the paragraph block if it's not in the list of blocks shown.
-		if ( ! page.$( '.editor-block-list-item-paragraph' ) ) {
-			await page.keyboard.type( 'Paragraph' );
-			await page.waitForSelector( '.editor-block-list-item-paragraph' );
-			await waitForInserterPatternLoad();
-		}
-
-		// Add the block.
-		await page.click( '.editor-block-list-item-paragraph' );
-		await page.keyboard.type( '2' );
-
-		// The snapshot should show a buttons block followed by a paragraph.
-		// The buttons block should contain a single button.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	// Check for regression of https://github.com/WordPress/gutenberg/issues/24262
-	it( 'inserts a block in proper place after having clicked `Browse All` from inline inserter', async () => {
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'First paragraph' );
-		await insertBlock( 'Heading' );
-		await page.keyboard.type( 'Heading' );
-		await page.keyboard.press( 'Enter' );
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'Second paragraph' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Third paragraph' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-
-		// Using the between inserter.
-		const insertionPoint = await canvas().$( '[data-type="core/heading"]' );
-		const rect = await insertionPoint.boundingBox();
-		await page.mouse.move( rect.x + rect.width / 2, rect.y - 10, {
-			steps: 10,
-		} );
-		const insertionLine = await page.waitForSelector(
-			'.block-editor-block-list__insertion-point .block-editor-inserter__toggle'
-		);
-		await insertionLine.click();
-		const browseAll = await page.waitForSelector(
-			'button.block-editor-inserter__quick-inserter-expand'
-		);
-		await browseAll.click();
-		// `insertBlock` uses the currently open panel.
-		await insertBlock( 'Cover' );
-
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	// Check for regression of https://github.com/WordPress/gutenberg/issues/25785
-	it( 'inserts a block should show a blue line indicator', async () => {
-		// First insert a random Paragraph.
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'First paragraph' );
-		await insertBlock( 'Image' );
-		const paragraphBlock = await canvas().$(
-			'p[aria-label="Block: Paragraph"]'
-		);
-		paragraphBlock.click();
-		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
-
-		// Open the global inserter and search for the Heading block.
-		await searchForBlock( 'Heading' );
-
-		const headingButton = (
-			await page.$x( `//button//span[contains(text(), 'Heading')]` )
-		)[ 0 ];
-		// Hover over the block should show the blue line indicator.
-		await headingButton.hover();
-
-		// Should show the blue line indicator somewhere.
-		const indicator = await page.waitForSelector(
-			'.block-editor-block-list__insertion-point-indicator'
-		);
-		const indicatorRect = await indicator.boundingBox();
-		const paragraphRect = await paragraphBlock.boundingBox();
-
-		// The blue line indicator should be below the last block.
-		expect( indicatorRect.x ).toBe( paragraphRect.x );
-		expect( indicatorRect.y > paragraphRect.y ).toBe( true );
-	} );
-
-	// Check for regression of https://github.com/WordPress/gutenberg/issues/24403
-	it( 'inserts a block in proper place after having clicked `Browse All` from block appender', async () => {
-		await insertBlock( 'Group' );
-		// Select the default, selected Group layout from the variation picker.
-		await canvas().click(
-			'button[aria-label="Group: Gather blocks in a container."]'
-		);
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'Paragraph after group' );
-		// Click the Group first to make the appender inside it clickable.
-		await canvas().click( '[data-type="core/group"]' );
-		await canvas().click(
-			'[data-type="core/group"] [aria-label="Add block"]'
-		);
-		const browseAll = await page.waitForXPath(
-			'//button[text()="Browse all"]'
-		);
-		await browseAll.click();
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'Paragraph inside group' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'passes the search value in the main inserter when clicking `Browse all`', async () => {
-		const INSERTER_SEARCH_SELECTOR =
-			'.block-editor-inserter__search input,.block-editor-inserter__search-input,input.block-editor-inserter__search';
-		await insertBlock( 'Group' );
-		// Select the default, selected Group layout from the variation picker.
-		await canvas().click(
-			'button[aria-label="Group: Gather blocks in a container."]'
-		);
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'Text' );
-		// Click the Group first to make the appender inside it clickable.
-		await canvas().click( '[data-type="core/group"]' );
-		await canvas().click(
-			'[data-type="core/group"] [aria-label="Add block"]'
-		);
-		await page.waitForSelector( INSERTER_SEARCH_SELECTOR );
-		await page.focus( INSERTER_SEARCH_SELECTOR );
-		await pressKeyWithModifier( 'primary', 'a' );
-		const searchTerm = 'Verse';
-		await page.keyboard.type( searchTerm );
-		const browseAll = await page.waitForXPath(
-			'//button[text()="Browse all"]'
-		);
-		await browseAll.click();
-		const availableBlocks = await page.$$(
-			'.edit-post-editor__inserter-panel .block-editor-block-types-list__list-item'
-		);
-		expect( availableBlocks ).toHaveLength( 1 );
-	} );
-
-	// Check for regression of https://github.com/WordPress/gutenberg/issues/27586
-	it( 'closes the main inserter after inserting a single-use block, like the More block', async () => {
-		await insertBlock( 'More' );
-		await page.waitForSelector(
-			'.edit-post-header-toolbar__inserter-toggle:not(.is-pressed)'
-		);
-
-		// The inserter panel should've closed.
-		const inserterPanels = await page.$$(
-			'.edit-post-editor__inserter-panel'
-		);
-		expect( inserterPanels.length ).toBe( 0 );
-
-		// The editable 'Read More' text should be focused.
-		const isFocusInBlock = await canvas().evaluate( () =>
-			document
-				.querySelector( '[data-type="core/more"]' )
-				.contains( document.activeElement )
-		);
-		expect( isFocusInBlock ).toBe( true );
-	} );
-
-	it( 'shows block preview when hovering over block in inserter', async () => {
-		await openGlobalBlockInserter();
-		const paragraphButton = (
-			await page.$x( `//button//span[contains(text(), 'Paragraph')]` )
-		)[ 0 ];
-		await paragraphButton.hover();
-		const preview = await page.waitForSelector(
-			'.block-editor-inserter__preview',
-			{
-				visible: true,
-			}
-		);
-		const isPreviewVisible = await preview.isIntersectingViewport();
-		expect( isPreviewVisible ).toBe( true );
-	} );
-
-	it.each( [ 'large', 'small' ] )(
-		'last-inserted block should be given and keep the focus (%s viewport)',
-		async ( viewport ) => {
-			await setBrowserViewport( viewport );
-
-			await canvas().type(
-				'.block-editor-default-block-appender__content',
-				'Testing inserted block focus'
-			);
-
-			await insertBlock( 'Image' );
-
-			await canvas().waitForSelector( 'figure[data-type="core/image"]' );
-
-			const selectedBlock = await page.evaluate( () => {
-				return wp.data.select( 'core/block-editor' ).getSelectedBlock();
-			} );
-
-			expect( selectedBlock.name ).toBe( 'core/image' );
-		}
-	);
-} );
diff --git a/packages/e2e-tests/specs/editor/various/invalid-block.test.js b/packages/e2e-tests/specs/editor/various/invalid-block.test.js
deleted file mode 100644
index 354c370434be92..00000000000000
--- a/packages/e2e-tests/specs/editor/various/invalid-block.test.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	clickMenuItem,
-	createNewPost,
-	clickBlockAppender,
-	clickBlockToolbarButton,
-	setPostContent,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'invalid blocks', () => {
-	beforeEach( async () => {
-		await createNewPost();
-	} );
-
-	it( 'Should show an invalid block message with clickable options', async () => {
-		// Create an empty paragraph with the focus in the block.
-		await clickBlockAppender();
-		await page.keyboard.type( 'hello' );
-
-		await clickBlockToolbarButton( 'Options' );
-
-		// Change to HTML mode and close the options.
-		await clickMenuItem( 'Edit as HTML' );
-
-		// Focus on the textarea and enter an invalid paragraph
-		await canvas().click(
-			'.block-editor-block-list__layout .block-editor-block-list__block .block-editor-block-list__block-html-textarea'
-		);
-		await page.keyboard.type( '<p>invalid paragraph' );
-
-		// Takes the focus away from the block so the invalid warning is triggered
-		await page.click( '.editor-post-save-draft' );
-
-		// Click on the 'three-dots' menu toggle.
-		await canvas().click(
-			'.block-editor-warning__actions button[aria-label="More options"]'
-		);
-
-		await clickMenuItem( 'Resolve' );
-
-		// Check we get the resolve modal with the appropriate contents.
-		const htmlBlockContent = await page.$eval(
-			'.block-editor-block-compare__html',
-			( node ) => node.textContent
-		);
-		expect( htmlBlockContent ).toEqual(
-			'<p>hello</p><p>invalid paragraph'
-		);
-	} );
-
-	it( 'should strip potentially malicious on* attributes', async () => {
-		let hasAlert = false;
-
-		page.on( 'dialog', () => {
-			hasAlert = true;
-		} );
-
-		// The paragraph block contains invalid HTML, which causes it to be an
-		// invalid block.
-		await setPostContent(
-			`
-			<!-- wp:paragraph -->
-			<p>aaaa <img src onerror=alert(1)></x dde></x>1
-			<!-- /wp:paragraph -->
-			`
-		);
-
-		// Give the browser time to show the alert.
-		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
-
-		expect( console ).toHaveWarned();
-		expect( console ).toHaveErrored();
-		expect( hasAlert ).toBe( false );
-	} );
-
-	it( 'should not trigger malicious script tags when using a shortcode block', async () => {
-		let hasAlert = false;
-
-		page.on( 'dialog', () => {
-			hasAlert = true;
-		} );
-
-		// The shortcode block contains invalid HTML, which causes it to be an
-		// invalid block.
-		await setPostContent(
-			`
-			<!-- wp:shortcode -->
-			<animate onbegin=alert(1) attributeName=x dur=1s><script>alert("EVIL");</script><style>@keyframes x{}</style><a style="animation-name:x" onanimationstart="alert(2)"></a>
-			<!-- /wp:shortcode -->
-			`
-		);
-
-		// Give the browser time to show the alert.
-		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
-		expect( hasAlert ).toBe( false );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/nux.test.js b/packages/e2e-tests/specs/editor/various/nux.test.js
deleted file mode 100644
index 8ea151686d2eb0..00000000000000
--- a/packages/e2e-tests/specs/editor/various/nux.test.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	createNewPost,
-	clickOnMoreMenuItem,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'New User Experience (NUX)', () => {
-	it( 'should show the guide to first-time users', async () => {
-		let welcomeGuideText, welcomeGuide;
-
-		// Create a new post as a first-time user.
-		await createNewPost( { showWelcomeGuide: true } );
-
-		// Guide should be on page 1 of 4
-		welcomeGuideText = await page.$eval(
-			'.edit-post-welcome-guide',
-			( element ) => element.innerText
-		);
-		expect( welcomeGuideText ).toContain( 'Welcome to the block editor' );
-
-		// Click on the 'Next' button.
-		const [ nextButton ] = await page.$x(
-			'//button[contains(text(), "Next")]'
-		);
-		await nextButton.click();
-
-		// Guide should be on page 2 of 4
-		welcomeGuideText = await page.$eval(
-			'.edit-post-welcome-guide',
-			( element ) => element.innerText
-		);
-		expect( welcomeGuideText ).toContain( 'Make each block your own' );
-
-		// Click on the 'Previous' button.
-		const [ previousButton ] = await page.$x(
-			'//button[contains(text(), "Previous")]'
-		);
-		await previousButton.click();
-
-		// Guide should be on page 1 of 4
-		welcomeGuideText = await page.$eval(
-			'.edit-post-welcome-guide',
-			( element ) => element.innerText
-		);
-		expect( welcomeGuideText ).toContain( 'Welcome to the block editor' );
-
-		// Press the button for Page 2.
-		await page.click( 'button[aria-label="Page 2 of 4"]' );
-		await page.waitForXPath(
-			'//h1[contains(text(), "Make each block your own")]'
-		);
-		// This shouldn't be necessary
-		// eslint-disable-next-line no-restricted-syntax
-		await page.waitForTimeout( 500 );
-
-		// Press the right arrow key for Page 3.
-		await page.keyboard.press( 'ArrowRight' );
-		await page.waitForXPath(
-			'//h1[contains(text(), "Get to know the block library")]'
-		);
-
-		// Press the right arrow key for Page 4.
-		await page.keyboard.press( 'ArrowRight' );
-		await page.waitForXPath(
-			'//h1[contains(text(), "Learn how to use the block editor")]'
-		);
-
-		// Click on the *visible* 'Get started' button. There are two in the DOM
-		// but only one is shown depending on viewport size.
-		let getStartedButton;
-		for ( const buttonHandle of await page.$x(
-			'//button[contains(text(), "Get started")]'
-		) ) {
-			if (
-				await page.evaluate(
-					( button ) => button.style.display !== 'none',
-					buttonHandle
-				)
-			) {
-				getStartedButton = buttonHandle;
-			}
-		}
-		await getStartedButton.click();
-
-		// Guide should be closed
-		welcomeGuide = await page.$( '.edit-post-welcome-guide' );
-		expect( welcomeGuide ).toBeNull();
-
-		// Reload the editor.
-		await page.reload();
-		await page.waitForSelector( '.edit-post-layout' );
-
-		// Guide should be closed
-		welcomeGuide = await page.$( '.edit-post-welcome-guide' );
-		expect( welcomeGuide ).toBeNull();
-	} );
-
-	it( 'should not show the welcome guide again if it is dismissed', async () => {
-		let welcomeGuide;
-
-		// Create a new post as a first-time user.
-		await createNewPost( { showWelcomeGuide: true } );
-
-		// Guide should be open
-		welcomeGuide = await page.$( '.edit-post-welcome-guide' );
-		expect( welcomeGuide ).not.toBeNull();
-
-		// Close the guide
-		await page.click( '[role="dialog"] button[aria-label="Close"]' );
-
-		// Reload the editor.
-		await page.reload();
-		await page.waitForSelector( '.edit-post-layout' );
-
-		// Guide should be closed
-		welcomeGuide = await page.$( '.edit-post-welcome-guide' );
-		expect( welcomeGuide ).toBeNull();
-	} );
-
-	it( 'should focus post title field after welcome guide is dismissed and post is empty', async () => {
-		// Create a new post as a first-time user.
-		await createNewPost( { showWelcomeGuide: true } );
-
-		// Guide should be open.
-		const welcomeGuide = await page.$( '.edit-post-welcome-guide' );
-		expect( welcomeGuide ).not.toBeNull();
-
-		// Close the guide.
-		await page.click( '[role="dialog"] button[aria-label="Close"]' );
-
-		// Focus should be in post title field.
-		const postTitle = await canvas().waitForSelector(
-			'h1[aria-label="Add title"'
-		);
-		await expect( postTitle ).toHaveFocus();
-	} );
-
-	it( 'should show the welcome guide if it is manually opened', async () => {
-		let welcomeGuide;
-
-		// Create a new post as a returning user.
-		await createNewPost();
-
-		// Guide should be closed
-		welcomeGuide = await page.$( '.edit-post-welcome-guide' );
-		expect( welcomeGuide ).toBeNull();
-
-		// Manually open the guide
-		await clickOnMoreMenuItem( 'Welcome Guide' );
-
-		// Guide should be open
-		welcomeGuide = await page.$( '.edit-post-welcome-guide' );
-		expect( welcomeGuide ).not.toBeNull();
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js b/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js
deleted file mode 100644
index 0d00e3d9a545b9..00000000000000
--- a/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js
+++ /dev/null
@@ -1,398 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	clickMenuItem,
-	insertBlock,
-	insertPattern,
-	createNewPost,
-	clickBlockToolbarButton,
-	pressKeyWithModifier,
-	getEditedPostContent,
-	trashAllPosts,
-	visitAdminPage,
-	toggleGlobalBlockInserter,
-	openDocumentSettingsSidebar,
-	saveDraft,
-	createReusableBlock,
-	publishPost,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-const patternBlockNameInputSelector =
-	'.patterns-menu-items__convert-modal .components-text-control__input';
-const patternBlockInspectorNameInputSelector =
-	'.block-editor-block-inspector .components-text-control__input';
-const syncToggleSelectorChecked =
-	'.patterns-menu-items__convert-modal .components-form-toggle.is-checked';
-
-const saveAll = async () => {
-	const publishButtonSelector =
-		'.editor-post-publish-button__button.has-changes-dot';
-	// Wait for the Publish button to become enabled in case the editor is autosaving ATM:.
-	const publishButton = await page.waitForSelector(
-		publishButtonSelector + '[aria-disabled="false"]'
-	);
-	await publishButton.click();
-
-	const saveButtonSelector =
-		'button.editor-entities-saved-states__save-button';
-	const saveButton = await page.waitForSelector( saveButtonSelector );
-	await saveButton.click();
-};
-
-const saveAllButDontPublish = async () => {
-	await saveAll();
-
-	// No need to publish the post.
-	const cancelPublish = await page.waitForSelector(
-		'.editor-post-publish-panel__header-cancel-button button'
-	);
-	await cancelPublish.click();
-};
-
-const clearAllBlocks = async () => {
-	// Remove all blocks from the post so that we're working with a clean slate.
-	await page.evaluate( () => {
-		const blocks = wp.data.select( 'core/block-editor' ).getBlocks();
-		const clientIds = blocks.map( ( block ) => block.clientId );
-		wp.data.dispatch( 'core/block-editor' ).removeBlocks( clientIds );
-	} );
-};
-
-describe( 'Pattern blocks', () => {
-	afterAll( async () => {
-		await trashAllPosts( 'wp_block' );
-	} );
-
-	beforeEach( async () => {
-		await createNewPost();
-	} );
-
-	it( 'can be created, inserted, edited and converted to a regular block.', async () => {
-		await createReusableBlock( 'Hello there!', 'Greeting block' );
-		await clearAllBlocks();
-
-		// Insert the reusable block we created above.
-		await insertPattern( 'Greeting block' );
-
-		// Change the block's title.
-		await openDocumentSettingsSidebar();
-		const nameInput = await page.waitForSelector(
-			patternBlockInspectorNameInputSelector
-		);
-		await nameInput.click();
-		await pressKeyWithModifier( 'primary', 'a' );
-		await page.keyboard.type( 'Surprised greeting block' );
-
-		// Quickly focus the paragraph block.
-		await canvas().click(
-			'.block-editor-block-list__block[data-type="core/block"] p'
-		);
-		await page.keyboard.press( 'Escape' ); // Enter navigation mode.
-		await page.keyboard.press( 'Enter' ); // Enter edit mode.
-
-		// Change the block's content.
-		await page.keyboard.type( 'Oh! ' );
-
-		// Save the reusable block.
-		await saveAllButDontPublish();
-
-		// Check that its content is up to date.
-		const text = await canvas().$eval(
-			'.block-editor-block-list__block[data-type="core/block"] p',
-			( element ) => element.innerText
-		);
-		expect( text ).toMatch( 'Oh! Hello there!' );
-
-		await clearAllBlocks();
-
-		// Insert the reusable block we edited above.
-		await insertPattern( 'Surprised greeting block' );
-
-		// Convert block to a regular block.
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Detach' );
-
-		// Check that we have a paragraph block on the page.
-		const paragraphBlock = await canvas().$(
-			'.block-editor-block-list__block[data-type="core/paragraph"]'
-		);
-		expect( paragraphBlock ).not.toBeNull();
-
-		// Check that its content is up to date.
-		const paragraphContent = await canvas().$eval(
-			'.block-editor-block-list__block[data-type="core/paragraph"]',
-			( element ) => element.innerText
-		);
-		expect( paragraphContent ).toMatch( 'Oh! Hello there!' );
-	} );
-
-	// Check for regressions of https://github.com/WordPress/gutenberg/issues/33072.
-	it( 'can be saved when modified inside of a published post', async () => {
-		await createReusableBlock(
-			'Guten Berg!',
-			'Alternative greeting block'
-		);
-
-		// Make sure the reusable block has loaded properly before attempting to publish the post.
-		await canvas().waitForSelector( 'p[aria-label="Block: Paragraph"]' );
-
-		await publishPost();
-
-		// Close publish panel.
-		const closePublishPanelSelector =
-			'.editor-post-publish-panel__header button[aria-label="Close panel"]';
-		await page.waitForSelector( closePublishPanelSelector );
-		await page.click( closePublishPanelSelector );
-
-		await canvas().waitForSelector( 'p[aria-label="Block: Paragraph"]' );
-		await canvas().focus( 'p[aria-label="Block: Paragraph"]' );
-
-		// Change the block's content.
-		await page.keyboard.type( 'Einen ' );
-
-		// Save the reusable block and update the post.
-		await saveAll();
-
-		// Check that its content is up to date.
-		const paragraphContent = await canvas().$eval(
-			'p[aria-label="Block: Paragraph"]',
-			( element ) => element.innerText
-		);
-		expect( paragraphContent ).toMatch( 'Einen Guten Berg!' );
-	} );
-
-	it( 'can be inserted after refresh', async () => {
-		await createReusableBlock( 'Awesome Paragraph', 'Awesome block' );
-
-		// Step 2. Create new post.
-		await createNewPost();
-
-		// Step 3. Insert the block created in Step 1.
-		await insertPattern( 'Awesome block' );
-
-		// Check the title.
-		await openDocumentSettingsSidebar();
-		const title = await page.$eval(
-			patternBlockInspectorNameInputSelector,
-			( element ) => element.value
-		);
-		expect( title ).toBe( 'Awesome block' );
-	} );
-
-	it( 'can be created from multiselection and converted back to regular blocks', async () => {
-		await createNewPost();
-
-		// Insert a Two paragraphs block.
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'Hello there!' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Second paragraph' );
-
-		// Select all the blocks.
-		await pressKeyWithModifier( 'primary', 'a' );
-		await pressKeyWithModifier( 'primary', 'a' );
-
-		// Convert block to a reusable block.
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Create pattern' );
-
-		// Set title.
-		const nameInput = await page.waitForSelector(
-			patternBlockNameInputSelector
-		);
-		await nameInput.click();
-		await page.keyboard.type( 'Multi-selection reusable block' );
-		await page.waitForSelector( syncToggleSelectorChecked );
-		await page.keyboard.press( 'Enter' );
-
-		// Wait for creation to finish.
-		await page.waitForXPath(
-			'//*[contains(@class, "components-snackbar")]/*[contains(text(),"pattern created:")]'
-		);
-
-		await clearAllBlocks();
-
-		// Insert the reusable block we edited above.
-		await insertPattern( 'Multi-selection reusable block' );
-
-		// Convert block to a regular block.
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Detach' );
-
-		// Check that we have two paragraph blocks on the page.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'will not break the editor if empty', async () => {
-		await createReusableBlock(
-			'Awesome Paragraph',
-			'Random reusable block'
-		);
-		await clearAllBlocks();
-		await insertPattern( 'Random reusable block' );
-
-		await visitAdminPage( 'edit.php', [ 'post_type=wp_block' ] );
-
-		const [ editButton ] = await page.$x(
-			`//a[contains(@aria-label, 'Random reusable block')]`
-		);
-		await editButton.click();
-
-		await page.waitForNavigation();
-		await page.waitForSelector( 'iframe[name="editor-canvas"]' );
-
-		// Click the block to give it focus.
-		const blockSelector = 'p[data-title="Paragraph"]';
-		await canvas().waitForSelector( blockSelector );
-		await canvas().click( blockSelector );
-
-		// Delete the block, leaving the reusable block empty.
-		await clickBlockToolbarButton( 'Options' );
-		const deleteButton = await page.waitForXPath(
-			'//button/span[text()="Delete"]'
-		);
-		deleteButton.click();
-
-		// Wait for the Update button to become enabled.
-		const publishButtonSelector = '.editor-post-publish-button__button';
-		await page.waitForSelector(
-			publishButtonSelector + '[aria-disabled="false"]'
-		);
-
-		// Save the reusable block.
-		await page.click( publishButtonSelector );
-		await page.waitForXPath(
-			'//*[contains(@class, "components-snackbar")]/*[text()="Pattern updated."]'
-		);
-
-		await createNewPost();
-
-		await toggleGlobalBlockInserter();
-
-		expect( console ).not.toHaveErrored();
-	} );
-
-	it( 'Should show a proper message when the reusable block is missing', async () => {
-		// Insert a non-existant reusable block.
-		await page.evaluate( () => {
-			const { createBlock } = window.wp.blocks;
-			const { dispatch } = window.wp.data;
-			dispatch( 'core/block-editor' ).resetBlocks( [
-				createBlock( 'core/block', { ref: 123456 } ),
-			] );
-		} );
-
-		await canvas().waitForXPath(
-			'//*[contains(@class, "block-editor-warning")]/*[text()="Block has been deleted or is unavailable."]'
-		);
-
-		// This happens when the 404 is returned.
-		expect( console ).toHaveErrored();
-	} );
-
-	it( 'should be able to insert a reusable block twice', async () => {
-		await createReusableBlock(
-			'Awesome Paragraph',
-			'Duplicated reusable block'
-		);
-		await clearAllBlocks();
-		await insertPattern( 'Duplicated reusable block' );
-		await insertPattern( 'Duplicated reusable block' );
-		await saveDraft();
-		await page.reload();
-		await page.waitForSelector( 'iframe[name="editor-canvas"]' );
-
-		// Wait for the paragraph to be loaded.
-		await canvas().waitForSelector(
-			'.block-editor-block-list__block[data-type="core/paragraph"]'
-		);
-		// The first click selects the reusable block wrapper.
-		// The second click selects the actual paragraph block.
-		await canvas().click( '.wp-block-block' );
-		await canvas().focus(
-			'.block-editor-block-list__block[data-type="core/paragraph"]'
-		);
-		await pressKeyWithModifier( 'primary', 'a' );
-		await page.keyboard.press( 'End' );
-		await page.keyboard.type( ' modified' );
-
-		// Wait for async mode to dispatch the update.
-		// eslint-disable-next-line no-restricted-syntax
-		await page.waitForTimeout( 1000 );
-
-		// Check that the content of the second reusable block has been updated.
-		const reusableBlocks = await page.$$( '.wp-block-block' );
-		await Promise.all(
-			reusableBlocks.map( async ( paragraph ) => {
-				const content = await paragraph.$eval(
-					'p',
-					( element ) => element.textContent
-				);
-				expect( content ).toEqual( 'Awesome Paragraph modified' );
-			} )
-		);
-	} );
-
-	// Check for regressions of https://github.com/WordPress/gutenberg/issues/26421.
-	it( 'allows conversion back to blocks when the reusable block has unsaved edits', async () => {
-		await createReusableBlock( '1', 'Edited block' );
-
-		// Make an edit to the reusable block and assert that there's only a
-		// paragraph in a reusable block.
-		await canvas().waitForSelector( 'p[aria-label="Block: Paragraph"]' );
-		await canvas().click( 'p[aria-label="Block: Paragraph"]' );
-		await page.keyboard.type( '2' );
-		const selector =
-			'//div[@aria-label="Block: Pattern"]//p[@aria-label="Block: Paragraph"][.="12"]';
-		const reusableBlockWithParagraph = await page.$x( selector );
-		expect( reusableBlockWithParagraph ).toBeTruthy();
-
-		// Convert back to regular blocks.
-		await clickBlockToolbarButton( 'Select parent block: Edited block' );
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Detach' );
-		await page.waitForXPath( selector, {
-			hidden: true,
-		} );
-
-		// Check that there's only a paragraph.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	// Test for regressions of https://github.com/WordPress/gutenberg/issues/27243.
-	it( 'should allow a block with styles to be converted to a reusable block', async () => {
-		// Insert a quote and reload the page.
-		insertBlock( 'Quote' );
-		await saveDraft();
-		await page.reload();
-		await page.waitForSelector( 'iframe[name="editor-canvas"]' );
-
-		// The quote block should have a visible preview in the sidebar for this test to be valid.
-		const quoteBlock = await canvas().waitForSelector(
-			'.block-editor-block-list__block[aria-label="Block: Quote"]'
-		);
-		// Select the quote block.
-		await quoteBlock.focus();
-		await openDocumentSettingsSidebar();
-		await page.waitForXPath(
-			'//*[@role="region"][@aria-label="Editor settings"]//button[.="Styles"]'
-		);
-
-		// Convert to reusable.
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Create pattern' );
-		const nameInput = await page.waitForSelector(
-			patternBlockNameInputSelector
-		);
-		await nameInput.click();
-		await page.keyboard.type( 'Block with styles' );
-		await page.waitForSelector( syncToggleSelectorChecked );
-		await page.keyboard.press( 'Enter' );
-		const reusableBlock = await canvas().waitForSelector(
-			'.block-editor-block-list__block[aria-label="Block: Pattern"]'
-		);
-		expect( reusableBlock ).toBeTruthy();
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/preferences.test.js b/packages/e2e-tests/specs/editor/various/preferences.test.js
deleted file mode 100644
index 98249637c7e968..00000000000000
--- a/packages/e2e-tests/specs/editor/various/preferences.test.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createNewPost } from '@wordpress/e2e-test-utils';
-
-describe( 'preferences', () => {
-	beforeAll( async () => {
-		await createNewPost();
-	} );
-
-	/**
-	 * Returns a promise which resolves to the text content of the active
-	 * editor sidebar tab, or null if there is no active sidebar tab (closed).
-	 *
-	 * @return {Promise} Promise resolving to active tab.
-	 */
-	async function getActiveSidebarTabText() {
-		try {
-			return await page.$eval(
-				'.edit-post-sidebar__panel-tab.is-active',
-				( node ) => node.textContent
-			);
-		} catch ( error ) {
-			// page.$eval throws when it does not find the selector, which we
-			// can intentionally intercept and consider as there being no
-			// active sidebar tab (no sidebar).
-			return null;
-		}
-	}
-
-	it( 'remembers sidebar dismissal between sessions', async () => {
-		// Open by default.
-		expect( await getActiveSidebarTabText() ).toBe( 'Post' );
-
-		// Change to "Block" tab.
-		await page.click( '.edit-post-sidebar__panel-tab[aria-label="Block"]' );
-		expect( await getActiveSidebarTabText() ).toBe( 'Block' );
-
-		// Regression test: Reload resets to document tab.
-		//
-		// See: https://github.com/WordPress/gutenberg/issues/6377
-		// See: https://github.com/WordPress/gutenberg/pull/8995
-		await page.reload();
-		await page.waitForSelector( '.edit-post-layout' );
-		expect( await getActiveSidebarTabText() ).toBe( 'Post' );
-
-		// Dismiss.
-		await page.click(
-			'.edit-post-sidebar__panel-tabs [aria-label="Close Settings"]'
-		);
-		expect( await getActiveSidebarTabText() ).toBe( null );
-
-		// Remember after reload.
-		await page.reload();
-		await page.waitForSelector( '.edit-post-layout' );
-		expect( await getActiveSidebarTabText() ).toBe( null );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/publish-panel.test.js b/packages/e2e-tests/specs/editor/various/publish-panel.test.js
deleted file mode 100644
index 333f2f1c2a8b3b..00000000000000
--- a/packages/e2e-tests/specs/editor/various/publish-panel.test.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	arePrePublishChecksEnabled,
-	disablePrePublishChecks,
-	enablePrePublishChecks,
-	createNewPost,
-	openPublishPanel,
-	pressKeyWithModifier,
-	publishPost,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'PostPublishPanel', () => {
-	let werePrePublishChecksEnabled;
-	beforeEach( async () => {
-		await createNewPost();
-		werePrePublishChecksEnabled = await arePrePublishChecksEnabled();
-		if ( ! werePrePublishChecksEnabled ) {
-			await enablePrePublishChecks();
-		}
-	} );
-
-	afterEach( async () => {
-		if ( ! werePrePublishChecksEnabled ) {
-			await disablePrePublishChecks();
-		}
-	} );
-
-	it( 'PrePublish: publish button should have the focus', async () => {
-		await canvas().type( '.editor-post-title__input', 'E2E Test Post' );
-		await openPublishPanel();
-
-		const focusedElementClassList = await page.$eval(
-			':focus',
-			( focusedElement ) => {
-				return Object.values( focusedElement.classList );
-			}
-		);
-		expect( focusedElementClassList ).toContain(
-			'editor-post-publish-button'
-		);
-	} );
-
-	it( 'PostPublish: post link should have the focus', async () => {
-		const postTitle = 'E2E Test Post';
-		await canvas().type( '.editor-post-title__input', postTitle );
-		await publishPost();
-
-		const focusedElementTag = await page.$eval(
-			':focus',
-			( focusedElement ) => {
-				return focusedElement.tagName.toLowerCase();
-			}
-		);
-		const focusedElementText = await page.$eval(
-			':focus',
-			( focusedElement ) => {
-				return focusedElement.text;
-			}
-		);
-		expect( focusedElementTag ).toBe( 'a' );
-		expect( focusedElementText ).toBe( postTitle );
-	} );
-
-	it( 'should retain focus within the panel', async () => {
-		await canvas().type( '.editor-post-title__input', 'E2E Test Post' );
-		await openPublishPanel();
-		await pressKeyWithModifier( 'shift', 'Tab' );
-
-		const focusedElementClassList = await page.$eval(
-			':focus',
-			( focusedElement ) => {
-				return Object.values( focusedElement.classList );
-			}
-		);
-		expect( focusedElementClassList ).toContain(
-			'components-checkbox-control__input'
-		);
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/publishing.test.js b/packages/e2e-tests/specs/editor/various/publishing.test.js
deleted file mode 100644
index fbac8cf98638bb..00000000000000
--- a/packages/e2e-tests/specs/editor/various/publishing.test.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	createNewPost,
-	publishPost,
-	publishPostWithPrePublishChecksDisabled,
-	enablePrePublishChecks,
-	disablePrePublishChecks,
-	arePrePublishChecksEnabled,
-	setBrowserViewport,
-	openPublishPanel,
-	pressKeyWithModifier,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'Publishing', () => {
-	describe.each( [ 'post', 'page' ] )(
-		'%s locking prevent saving',
-		( postType ) => {
-			beforeEach( async () => {
-				await createNewPost( postType );
-			} );
-
-			it( `disables the publish button when a ${ postType } is locked`, async () => {
-				await canvas().type(
-					'.editor-post-title__input',
-					'E2E Test Post lock check publish button'
-				);
-				await page.evaluate( () =>
-					wp.data
-						.dispatch( 'core/editor' )
-						.lockPostSaving( 'futurelock' )
-				);
-
-				await openPublishPanel();
-
-				expect(
-					await page.$(
-						'.editor-post-publish-button[aria-disabled="true"]'
-					)
-				).not.toBeNull();
-			} );
-
-			it( `disables the save shortcut when a ${ postType } is locked`, async () => {
-				await canvas().type(
-					'.editor-post-title__input',
-					'E2E Test Post check save shortcut'
-				);
-				await page.evaluate( () =>
-					wp.data
-						.dispatch( 'core/editor' )
-						.lockPostSaving( 'futurelock' )
-				);
-				await pressKeyWithModifier( 'primary', 'S' );
-
-				expect( await page.$( '.editor-post-saved-state' ) ).toBeNull();
-				expect(
-					await page.$( '.editor-post-save-draft' )
-				).not.toBeNull();
-			} );
-		}
-	);
-
-	describe.each( [ 'post', 'page' ] )( 'a %s', ( postType ) => {
-		let werePrePublishChecksEnabled;
-
-		beforeEach( async () => {
-			await createNewPost( postType );
-			werePrePublishChecksEnabled = await arePrePublishChecksEnabled();
-			if ( ! werePrePublishChecksEnabled ) {
-				await enablePrePublishChecks();
-			}
-		} );
-
-		afterEach( async () => {
-			if ( ! werePrePublishChecksEnabled ) {
-				await disablePrePublishChecks();
-			}
-		} );
-
-		it( `should publish the ${ postType } and close the panel once we start editing again.`, async () => {
-			await canvas().type( '.editor-post-title__input', 'E2E Test Post' );
-
-			await publishPost();
-
-			// The post-publishing panel is visible.
-			expect(
-				await page.$( '.editor-post-publish-panel' )
-			).not.toBeNull();
-
-			// Start editing again.
-			await canvas().type( '.editor-post-title__input', ' (Updated)' );
-
-			// The post-publishing panel is not visible anymore.
-			expect( await page.$( '.editor-post-publish-panel' ) ).toBeNull();
-		} );
-	} );
-
-	describe.each( [ 'post', 'page' ] )(
-		'a %s with pre-publish checks disabled',
-		( postType ) => {
-			let werePrePublishChecksEnabled;
-
-			beforeEach( async () => {
-				await createNewPost( postType );
-				werePrePublishChecksEnabled =
-					await arePrePublishChecksEnabled();
-				if ( werePrePublishChecksEnabled ) {
-					await disablePrePublishChecks();
-				}
-			} );
-
-			afterEach( async () => {
-				if ( werePrePublishChecksEnabled ) {
-					await enablePrePublishChecks();
-				}
-			} );
-
-			it( `should publish the ${ postType } without opening the post-publish sidebar.`, async () => {
-				await canvas().type(
-					'.editor-post-title__input',
-					'E2E Test Post'
-				);
-
-				// The "Publish" button should be shown instead of the "Publish..." toggle.
-				expect(
-					await page.$( '.editor-post-publish-panel__toggle' )
-				).toBeNull();
-				expect(
-					await page.$( '.editor-post-publish-button' )
-				).not.toBeNull();
-
-				await publishPostWithPrePublishChecksDisabled();
-
-				// The post-publishing panel should have been not shown.
-				expect(
-					await page.$( '.editor-post-publish-panel' )
-				).toBeNull();
-			} );
-		}
-	);
-
-	describe.each( [ 'post', 'page' ] )(
-		'a %s in small viewports',
-		( postType ) => {
-			let werePrePublishChecksEnabled;
-
-			beforeEach( async () => {
-				await createNewPost( postType );
-				werePrePublishChecksEnabled =
-					await arePrePublishChecksEnabled();
-				if ( werePrePublishChecksEnabled ) {
-					await disablePrePublishChecks();
-				}
-				await setBrowserViewport( 'small' );
-			} );
-
-			afterEach( async () => {
-				await setBrowserViewport( 'large' );
-				if ( werePrePublishChecksEnabled ) {
-					await enablePrePublishChecks();
-				}
-			} );
-
-			it( `should ignore the pre-publish checks and show the Publish... toggle instead of the Publish button`, async () => {
-				expect(
-					await page.$( '.editor-post-publish-panel__toggle' )
-				).not.toBeNull();
-				expect(
-					await page.$( '.editor-post-publish-button' )
-				).toBeNull();
-			} );
-		}
-	);
-} );
diff --git a/packages/e2e-tests/specs/editor/various/scheduling.test.js b/packages/e2e-tests/specs/editor/various/scheduling.test.js
deleted file mode 100644
index df75dcb92f2820..00000000000000
--- a/packages/e2e-tests/specs/editor/various/scheduling.test.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createNewPost, changeSiteTimezone } from '@wordpress/e2e-test-utils';
-
-async function getPublishButtonText() {
-	return page.$eval(
-		'.editor-post-publish-button__button',
-		( element ) => element.textContent
-	);
-}
-
-describe( 'Scheduling', () => {
-	const isDateTimeComponentFocused = () => {
-		return page.evaluate( () => {
-			const dateTimeElement = document.querySelector(
-				'.components-datetime__date'
-			);
-			if ( ! dateTimeElement || ! document.activeElement ) {
-				return false;
-			}
-			return dateTimeElement.contains( document.activeElement );
-		} );
-	};
-
-	describe.each( [ [ 'UTC-10' ], [ 'UTC' ], [ 'UTC+10' ] ] )(
-		`Timezone %s`,
-		( timezone ) => {
-			let oldTimezone;
-			beforeEach( async () => {
-				oldTimezone = await changeSiteTimezone( timezone );
-				await createNewPost();
-			} );
-			afterEach( async () => {
-				await changeSiteTimezone( oldTimezone );
-			} );
-
-			it( `should change publishing button text from "Publish" to "Schedule"`, async () => {
-				expect( await getPublishButtonText() ).toBe( 'Publish' );
-
-				// Open the datepicker.
-				await page.click( '*[aria-label^="Change date"]' );
-
-				// Change the publishing date to a year in the future.
-				await page.click( '.components-datetime__time-field-year' );
-				await page.keyboard.press( 'ArrowUp' );
-
-				// Close the datepicker.
-				await page.click( '.editor-post-schedule__dialog-toggle' );
-
-				expect( await getPublishButtonText() ).toBe( 'Schedule…' );
-			} );
-		}
-	);
-
-	it( 'Should keep date time UI focused when the previous and next month buttons are clicked', async () => {
-		await createNewPost();
-
-		await page.click( '*[aria-label^="Change date"]' );
-		await page.click( '*[aria-label="View previous month"]' );
-		expect( await isDateTimeComponentFocused() ).toBe( true );
-		await page.click( '*[aria-label="View next month"]' );
-		expect( await isDateTimeComponentFocused() ).toBe( true );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/sidebar.test.js b/packages/e2e-tests/specs/editor/various/sidebar.test.js
deleted file mode 100644
index 2e5d46eec2f7a2..00000000000000
--- a/packages/e2e-tests/specs/editor/various/sidebar.test.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	clearLocalStorage,
-	createNewPost,
-	findSidebarPanelWithTitle,
-	enableFocusLossObservation,
-	disableFocusLossObservation,
-	openDocumentSettingsSidebar,
-	pressKeyWithModifier,
-	setBrowserViewport,
-} from '@wordpress/e2e-test-utils';
-
-const SIDEBAR_SELECTOR = '.edit-post-sidebar';
-const ACTIVE_SIDEBAR_TAB_SELECTOR = '.edit-post-sidebar__panel-tab.is-active';
-const ACTIVE_SIDEBAR_BUTTON_TEXT = 'Post';
-
-describe( 'Sidebar', () => {
-	afterEach( () => {
-		disableFocusLossObservation();
-	} );
-
-	it( 'should have sidebar visible at the start with document sidebar active on desktop', async () => {
-		await setBrowserViewport( 'large' );
-		await clearLocalStorage();
-		await createNewPost();
-		await enableFocusLossObservation();
-		const { nodesCount, content, height, width } = await page.$$eval(
-			ACTIVE_SIDEBAR_TAB_SELECTOR,
-			( nodes ) => {
-				const firstNode = nodes[ 0 ];
-				return {
-					nodesCount: nodes.length,
-					content: firstNode.innerText,
-					height: firstNode.offsetHeight,
-					width: firstNode.offsetWidth,
-				};
-			}
-		);
-
-		// should have only one active sidebar tab.
-		expect( nodesCount ).toBe( 1 );
-
-		// the active sidebar tab should be document.
-		expect( content ).toBe( ACTIVE_SIDEBAR_BUTTON_TEXT );
-
-		// the active sidebar tab should be visible
-		expect( width ).toBeGreaterThan( 10 );
-		expect( height ).toBeGreaterThan( 10 );
-	} );
-
-	it( 'should have the sidebar closed by default on mobile', async () => {
-		await setBrowserViewport( 'small' );
-		await clearLocalStorage();
-		await createNewPost();
-		await enableFocusLossObservation();
-		const sidebar = await page.$( SIDEBAR_SELECTOR );
-		expect( sidebar ).toBeNull();
-	} );
-
-	it( 'should close the sidebar when resizing from desktop to mobile', async () => {
-		await setBrowserViewport( 'large' );
-		await clearLocalStorage();
-		await createNewPost();
-		await enableFocusLossObservation();
-
-		const sidebars = await page.$$( SIDEBAR_SELECTOR );
-		expect( sidebars ).toHaveLength( 1 );
-
-		await setBrowserViewport( 'small' );
-
-		const sidebarsMobile = await page.$$( SIDEBAR_SELECTOR );
-		// sidebar should be closed when resizing to mobile.
-		expect( sidebarsMobile ).toHaveLength( 0 );
-	} );
-
-	it( 'should reopen sidebar the sidebar when resizing from mobile to desktop if the sidebar was closed automatically', async () => {
-		await setBrowserViewport( 'large' );
-		await clearLocalStorage();
-		await createNewPost();
-		await enableFocusLossObservation();
-		await setBrowserViewport( 'small' );
-
-		const sidebarsMobile = await page.$$( SIDEBAR_SELECTOR );
-		expect( sidebarsMobile ).toHaveLength( 0 );
-
-		await setBrowserViewport( 'large' );
-
-		await page.waitForSelector( SIDEBAR_SELECTOR );
-	} );
-
-	it( 'should preserve tab order while changing active tab', async () => {
-		await createNewPost();
-		await enableFocusLossObservation();
-
-		// Region navigate to Sidebar.
-		await pressKeyWithModifier( 'ctrl', '`' );
-
-		// Tab lands at first (presumed selected) option "Post".
-		await page.keyboard.press( 'Tab' );
-		const isActiveDocumentTab = await page.evaluate(
-			() =>
-				document.activeElement.textContent === 'Post' &&
-				document.activeElement.classList.contains( 'is-active' )
-		);
-		expect( isActiveDocumentTab ).toBe( true );
-
-		// Tab into and activate "Block".
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.press( 'Space' );
-		const isActiveBlockTab = await page.evaluate(
-			() =>
-				document.activeElement.textContent === 'Block' &&
-				document.activeElement.classList.contains( 'is-active' )
-		);
-		expect( isActiveBlockTab ).toBe( true );
-	} );
-
-	it( 'should be possible to programmatically remove Document Settings panels', async () => {
-		await createNewPost();
-		await enableFocusLossObservation();
-		await openDocumentSettingsSidebar();
-
-		expect( await findSidebarPanelWithTitle( 'Categories' ) ).toBeDefined();
-		expect( await findSidebarPanelWithTitle( 'Tags' ) ).toBeDefined();
-		expect(
-			await findSidebarPanelWithTitle( 'Featured image' )
-		).toBeDefined();
-		expect( await findSidebarPanelWithTitle( 'Excerpt' ) ).toBeDefined();
-		expect( await findSidebarPanelWithTitle( 'Discussion' ) ).toBeDefined();
-		expect( await findSidebarPanelWithTitle( 'Summary' ) ).toBeDefined();
-
-		await page.evaluate( () => {
-			const { removeEditorPanel } = wp.data.dispatch( 'core/edit-post' );
-
-			removeEditorPanel( 'taxonomy-panel-category' );
-			removeEditorPanel( 'taxonomy-panel-post_tag' );
-			removeEditorPanel( 'featured-image' );
-			removeEditorPanel( 'post-excerpt' );
-			removeEditorPanel( 'discussion-panel' );
-			removeEditorPanel( 'post-status' );
-		} );
-
-		const getPanelToggleSelector = ( panelTitle ) => {
-			return `//div[contains(@class, "edit-post-sidebar")]//button[contains(@class, "components-panel__body-toggle") and contains(text(),"${ panelTitle }")]`;
-		};
-
-		expect(
-			await page.$x( getPanelToggleSelector( 'Categories' ) )
-		).toEqual( [] );
-		expect( await page.$x( getPanelToggleSelector( 'Tags' ) ) ).toEqual(
-			[]
-		);
-		expect(
-			await page.$x( getPanelToggleSelector( 'Featured image' ) )
-		).toEqual( [] );
-		expect( await page.$x( getPanelToggleSelector( 'Excerpt' ) ) ).toEqual(
-			[]
-		);
-		expect(
-			await page.$x( getPanelToggleSelector( 'Discussion' ) )
-		).toEqual( [] );
-		expect( await page.$x( getPanelToggleSelector( 'Summary' ) ) ).toEqual(
-			[]
-		);
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/taxonomies.test.js b/packages/e2e-tests/specs/editor/various/taxonomies.test.js
deleted file mode 100644
index a1804307fe74e5..00000000000000
--- a/packages/e2e-tests/specs/editor/various/taxonomies.test.js
+++ /dev/null
@@ -1,251 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	createNewPost,
-	findSidebarPanelWithTitle,
-	openDocumentSettingsSidebar,
-	publishPost,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-/**
- * Module constants
- */
-const TAG_TOKEN_SELECTOR =
-	'.components-form-token-field__token-text span:not(.components-visually-hidden)';
-
-function generateRandomNumber() {
-	// Using `Math.random()` directly is fine in this testing context.
-	// eslint-disable-next-line no-restricted-syntax
-	return Math.round( 1 + Math.random() * ( Number.MAX_SAFE_INTEGER - 1 ) );
-}
-
-describe( 'Taxonomies', () => {
-	const canCreatTermInTaxonomy = ( taxonomy ) => {
-		return page.evaluate( ( _taxonomy ) => {
-			const post = wp.data.select( 'core/editor' ).getCurrentPost();
-			if ( ! post._links ) {
-				return false;
-			}
-			return !! post._links[ `wp:action-create-${ _taxonomy }` ];
-		}, taxonomy );
-	};
-
-	const getSelectCategories = () => {
-		return page.evaluate( () => {
-			return Array.from(
-				document.querySelectorAll(
-					'.editor-post-taxonomies__hierarchical-terms-choice .components-checkbox-control__input:checked'
-				)
-			).map( ( node ) => {
-				return node.parentElement.nextSibling.innerText;
-			} );
-		} );
-	};
-
-	const getCurrentTags = async () => {
-		const tagsPanel = await findSidebarPanelWithTitle( 'Tags' );
-		return page.evaluate(
-			( node, selector ) => {
-				return Array.from( node.querySelectorAll( selector ) ).map(
-					( field ) => {
-						return field.innerText;
-					}
-				);
-			},
-			tagsPanel,
-			TAG_TOKEN_SELECTOR
-		);
-	};
-
-	const openSidebarPanelWithTitle = async ( title ) => {
-		const panel = await page.waitForXPath(
-			`//div[contains(@class,"edit-post-sidebar")]//button[@class="components-button components-panel__body-toggle"][contains(text(),"${ title }")]`
-		);
-		await panel.click();
-	};
-
-	it( 'should be able to open the categories panel and create a new main category if the user has the right capabilities', async () => {
-		await createNewPost();
-
-		await openDocumentSettingsSidebar();
-
-		await openSidebarPanelWithTitle( 'Categories' );
-
-		await page.waitForSelector(
-			'.editor-post-taxonomies__hierarchical-terms-list'
-		);
-
-		// If the user has no permission to add a new category finish the test.
-		if ( ! ( await canCreatTermInTaxonomy( 'categories' ) ) ) {
-			return;
-		}
-
-		await page.waitForSelector(
-			'button.editor-post-taxonomies__hierarchical-terms-add'
-		);
-
-		// Click add new category button.
-		await page.click(
-			'button.editor-post-taxonomies__hierarchical-terms-add'
-		);
-
-		// Type the category name in the field.
-		await page.type(
-			'.editor-post-taxonomies__hierarchical-terms-input input[type=text]',
-			'z rand category 1'
-		);
-
-		// Click the submit button.
-		await page.click(
-			'.editor-post-taxonomies__hierarchical-terms-submit'
-		);
-
-		// Wait for the categories to load.
-		await page.waitForSelector(
-			'.editor-post-taxonomies__hierarchical-terms-choice .components-checkbox-control__input:checked'
-		);
-
-		let selectedCategories = await getSelectCategories();
-
-		// The new category is selected.
-		expect( selectedCategories ).toHaveLength( 1 );
-		expect( selectedCategories[ 0 ] ).toEqual( 'z rand category 1' );
-
-		// Type something in the title so we can publish the post.
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Publish the post.
-		await publishPost();
-
-		// Reload the editor.
-		await page.reload();
-
-		// Wait for the categories to load.
-		await page.waitForSelector(
-			'.editor-post-taxonomies__hierarchical-terms-choice .components-checkbox-control__input:checked'
-		);
-
-		selectedCategories = await getSelectCategories();
-
-		// The category selection was persisted after the publish process.
-		expect( selectedCategories ).toHaveLength( 1 );
-		expect( selectedCategories[ 0 ] ).toEqual( 'z rand category 1' );
-	} );
-
-	it( "should be able to create a new tag with ' on the name", async () => {
-		await createNewPost();
-
-		await openDocumentSettingsSidebar();
-
-		await openSidebarPanelWithTitle( 'Tags' );
-
-		// If the user has no permission to add a new tag finish the test.
-		if ( ! ( await canCreatTermInTaxonomy( 'tags' ) ) ) {
-			return;
-		}
-
-		const tagsPanel = await findSidebarPanelWithTitle( 'Tags' );
-		const tagInput = await tagsPanel.$(
-			'.components-form-token-field__input'
-		);
-
-		// Click the tag input field.
-		await tagInput.click();
-
-		const tagName = "tag'-" + generateRandomNumber();
-
-		// Type the category name in the field.
-		await tagInput.type( tagName );
-
-		// Press enter to create a new tag.
-		await tagInput.press( 'Enter' );
-
-		await page.waitForSelector( TAG_TOKEN_SELECTOR );
-
-		// Get an array with the tags of the post.
-		let tags = await getCurrentTags();
-
-		// The post should only contain the tag we added.
-		expect( tags ).toHaveLength( 1 );
-		expect( tags[ 0 ] ).toEqual( tagName );
-
-		// Type something in the title so we can publish the post.
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Publish the post.
-		await publishPost();
-
-		// Reload the editor.
-		await page.reload();
-
-		// Wait for the tags to load.
-		await page.waitForSelector( '.components-form-token-field__token' );
-
-		tags = await getCurrentTags();
-
-		// The tag selection was persisted after the publish process.
-		expect( tags ).toHaveLength( 1 );
-		expect( tags[ 0 ] ).toEqual( tagName );
-	} );
-
-	it( 'should be able to open the tags panel and create a new tag if the user has the right capabilities', async () => {
-		await createNewPost();
-
-		await openDocumentSettingsSidebar();
-
-		await openSidebarPanelWithTitle( 'Tags' );
-
-		// If the user has no permission to add a new tag finish the test.
-		if ( ! ( await canCreatTermInTaxonomy( 'tags' ) ) ) {
-			return;
-		}
-
-		// At the start there are no tag tokens.
-		expect( await page.$$( TAG_TOKEN_SELECTOR ) ).toHaveLength( 0 );
-
-		const tagsPanel = await findSidebarPanelWithTitle( 'Tags' );
-		const tagInput = await tagsPanel.$(
-			'.components-form-token-field__input'
-		);
-
-		// Click the tag input field.
-		await tagInput.click();
-
-		const tagName = 'tag-' + generateRandomNumber();
-
-		// Type the category name in the field.
-		await tagInput.type( tagName );
-
-		// Press enter to create a new tag.
-		await tagInput.press( 'Enter' );
-
-		await page.waitForSelector( TAG_TOKEN_SELECTOR );
-
-		// Get an array with the tags of the post.
-		let tags = await getCurrentTags();
-
-		// The post should only contain the tag we added.
-		expect( tags ).toHaveLength( 1 );
-		expect( tags[ 0 ] ).toEqual( tagName );
-
-		// Type something in the title so we can publish the post.
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Publish the post.
-		await publishPost();
-
-		// Reload the editor.
-		await page.reload();
-
-		// Wait for the tags to load.
-		await page.waitForSelector( '.components-form-token-field__token' );
-
-		tags = await getCurrentTags();
-
-		// The tag selection was persisted after the publish process.
-		expect( tags ).toHaveLength( 1 );
-		expect( tags[ 0 ] ).toEqual( tagName );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/editor/various/typewriter.test.js b/packages/e2e-tests/specs/editor/various/typewriter.test.js
deleted file mode 100644
index d935197b14f87f..00000000000000
--- a/packages/e2e-tests/specs/editor/various/typewriter.test.js
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createNewPost } from '@wordpress/e2e-test-utils';
-
-describe( 'TypeWriter', () => {
-	beforeEach( async () => {
-		await createNewPost();
-	} );
-
-	const getCaretPosition = async () =>
-		await page.evaluate(
-			() =>
-				wp.dom.computeCaretRect(
-					document.activeElement?.contentWindow ?? window
-				).y
-		);
-
-	// Allow the scroll position to be 1px off.
-	const BUFFER = 1;
-
-	const getDiff = async ( caretPosition ) =>
-		Math.abs( ( await getCaretPosition() ) - caretPosition );
-
-	it( 'should maintain caret position', async () => {
-		// Create first block.
-		await page.keyboard.press( 'Enter' );
-
-		// Create second block.
-		await page.keyboard.press( 'Enter' );
-
-		const initialPosition = await getCaretPosition();
-
-		// The page shouldn't be scrolled when it's being filled.
-		await page.keyboard.press( 'Enter' );
-
-		expect( await getCaretPosition() ).toBeGreaterThan( initialPosition );
-
-		// Create blocks until the typewriter effect kicks in.
-		while (
-			await page.evaluate( () => {
-				const { activeElement } =
-					document.activeElement?.contentDocument ?? document;
-				return (
-					wp.dom.getScrollContainer( activeElement ).scrollTop === 0
-				);
-			} )
-		) {
-			await page.keyboard.press( 'Enter' );
-		}
-
-		const newPosition = await getCaretPosition();
-
-		// Now the scroll position should be maintained.
-		await page.keyboard.press( 'Enter' );
-
-		expect( await getDiff( newPosition ) ).toBeLessThanOrEqual( BUFFER );
-
-		// Type until the text wraps.
-		while (
-			await page.evaluate( () => {
-				const { activeElement } =
-					document.activeElement?.contentDocument ?? document;
-				return (
-					activeElement.clientHeight <=
-					parseInt( getComputedStyle( activeElement ).lineHeight, 10 )
-				);
-			} )
-		) {
-			await page.keyboard.type( 'a' );
-		}
-
-		expect( await getDiff( newPosition ) ).toBeLessThanOrEqual( BUFFER );
-
-		// Pressing backspace will reposition the caret to the previous line.
-		// Scroll position should be adjusted again.
-		await page.keyboard.press( 'Backspace' );
-
-		expect( await getDiff( newPosition ) ).toBeLessThanOrEqual( BUFFER );
-
-		// Should reset scroll position to maintain.
-		await page.keyboard.press( 'ArrowUp' );
-
-		const positionAfterArrowUp = await getCaretPosition();
-
-		expect( positionAfterArrowUp ).toBeLessThanOrEqual( newPosition );
-
-		// Should be scrolled to new position.
-		await page.keyboard.press( 'Enter' );
-
-		expect( await getDiff( positionAfterArrowUp ) ).toBeLessThanOrEqual(
-			BUFFER
-		);
-	} );
-
-	it( 'should maintain caret position after scroll', async () => {
-		// Create first block.
-		await page.keyboard.press( 'Enter' );
-
-		// Create zero or more blocks until there is a scrollable container.
-		// No blocks should be created if there's already a scrollbar.
-		while (
-			await page.evaluate( () => {
-				const { activeElement } =
-					document.activeElement?.contentDocument ?? document;
-				const scrollContainer =
-					wp.dom.getScrollContainer( activeElement );
-				return (
-					scrollContainer.scrollHeight ===
-					scrollContainer.clientHeight
-				);
-			} )
-		) {
-			await page.keyboard.press( 'Enter' );
-		}
-
-		const scrollPosition = await page.evaluate( () => {
-			const { activeElement } =
-				document.activeElement?.contentDocument ?? document;
-			return wp.dom.getScrollContainer( activeElement ).scrollTop;
-		} );
-		// Expect scrollbar to be at the top.
-		expect( scrollPosition ).toBe( 0 );
-
-		// Move the mouse to the scroll container, and scroll down
-		// a small amount to trigger the typewriter mode.
-		await page.evaluate( () => {
-			const { activeElement } =
-				document.activeElement?.contentDocument ?? document;
-			wp.dom.getScrollContainer( activeElement ).scrollTop += 2;
-		} );
-		// Wait for the caret rectangle to be recalculated.
-		await page.evaluate(
-			() => new Promise( window.requestAnimationFrame )
-		);
-
-		// After hitting Enter to create a new block, the caret screen
-		// coordinates should be the same.
-		const initialPosition = await getCaretPosition();
-		await page.keyboard.press( 'Enter' );
-		await page.waitForFunction( () => {
-			const { activeElement } =
-				document.activeElement?.contentDocument ?? document;
-			// Wait for the Typewriter to scroll down past the initial position.
-			return wp.dom.getScrollContainer( activeElement ).scrollTop > 2;
-		} );
-		expect( await getDiff( initialPosition ) ).toBe( 0 );
-	} );
-
-	it( 'should maintain caret position after leaving last editable', async () => {
-		// Create first block.
-		await page.keyboard.press( 'Enter' );
-		// Create second block.
-		await page.keyboard.press( 'Enter' );
-		// Create third block.
-		await page.keyboard.press( 'Enter' );
-		// Move to first block.
-		await page.keyboard.press( 'ArrowUp' );
-		await page.keyboard.press( 'ArrowUp' );
-
-		const initialPosition = await getCaretPosition();
-
-		// Should maintain scroll position.
-		await page.keyboard.press( 'Enter' );
-
-		expect( await getDiff( initialPosition ) ).toBeLessThanOrEqual(
-			BUFFER
-		);
-	} );
-
-	it( 'should scroll caret into view from the top', async () => {
-		// Create first block.
-		await page.keyboard.press( 'Enter' );
-
-		// Create blocks until there is a scrollable container.
-		while (
-			await page.evaluate( () => {
-				const { activeElement } =
-					document.activeElement?.contentDocument ?? document;
-				return ! wp.dom.getScrollContainer( activeElement );
-			} )
-		) {
-			await page.keyboard.press( 'Enter' );
-		}
-
-		let count = 0;
-
-		// Create blocks until the typewriter effect kicks in, create at
-		// least 10 blocks to properly test the .
-		while (
-			( await page.evaluate( () => {
-				const { activeElement } =
-					document.activeElement?.contentDocument ?? document;
-				return (
-					wp.dom.getScrollContainer( activeElement ).scrollTop === 0
-				);
-			} ) ) ||
-			count < 10
-		) {
-			await page.keyboard.press( 'Enter' );
-			count++;
-		}
-
-		// Scroll the active element to the very bottom of the scroll container,
-		// then scroll up, so the caret is partially hidden.
-		await page.evaluate( () => {
-			const { activeElement } =
-				document.activeElement?.contentDocument ?? document;
-			activeElement.scrollIntoView( false );
-			wp.dom.getScrollContainer( activeElement ).scrollTop -=
-				activeElement.offsetHeight + 10;
-		} );
-
-		const bottomPostition = await getCaretPosition();
-
-		// Should scroll the caret back into view (preserve browser behaviour).
-		await page.keyboard.type( 'a' );
-
-		const newBottomPosition = await getCaretPosition();
-
-		expect( newBottomPosition ).toBeLessThanOrEqual( bottomPostition );
-
-		// Should maintain new caret position.
-		await page.keyboard.press( 'Enter' );
-
-		expect( await getDiff( newBottomPosition ) ).toBeLessThanOrEqual(
-			BUFFER
-		);
-
-		await page.keyboard.press( 'Backspace' );
-
-		while ( count-- ) {
-			await page.keyboard.press( 'ArrowUp' );
-		}
-
-		// Scroll the active element to the very top of the scroll container,
-		// then scroll down, so the caret is partially hidden.
-		await page.evaluate( () => {
-			const { activeElement } =
-				document.activeElement?.contentDocument ?? document;
-			activeElement.scrollIntoView();
-			wp.dom.getScrollContainer( activeElement ).scrollTop +=
-				activeElement.offsetHeight + 10;
-		} );
-
-		const topPostition = await getCaretPosition();
-
-		// Should scroll the caret back into view (preserve browser behaviour).
-		await page.keyboard.type( 'a' );
-
-		const newTopPosition = await getCaretPosition();
-
-		expect( newTopPosition ).toBeGreaterThan( topPostition );
-
-		// Should maintain new caret position.
-		await page.keyboard.press( 'Enter' );
-
-		expect( await getDiff( newTopPosition ) ).toBeLessThanOrEqual( BUFFER );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/experiments/blocks/post-comments-form.test.js b/packages/e2e-tests/specs/experiments/blocks/post-comments-form.test.js
deleted file mode 100644
index 0a26788b2d442d..00000000000000
--- a/packages/e2e-tests/specs/experiments/blocks/post-comments-form.test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	insertBlock,
-	activateTheme,
-	setOption,
-	visitSiteEditor,
-	enterEditMode,
-	deleteAllTemplates,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-describe( 'Comments Form', () => {
-	let previousCommentStatus;
-
-	beforeAll( async () => {
-		await activateTheme( 'emptytheme' );
-		await deleteAllTemplates( 'wp_template' );
-		previousCommentStatus = await setOption(
-			'default_comment_status',
-			'closed'
-		);
-	} );
-
-	afterAll( async () => {
-		await setOption( 'default_comment_status', previousCommentStatus );
-	} );
-
-	describe( 'placeholder', () => {
-		it( 'displays in site editor even when comments are closed by default', async () => {
-			// Navigate to "Singular" post template
-			await visitSiteEditor();
-			await expect( page ).toClick(
-				'.edit-site-sidebar-navigation-item',
-				{ text: /templates/i }
-			);
-			await expect( page ).toClick(
-				'.edit-site-sidebar-navigation-item',
-				{ text: /single entries/i }
-			);
-			await enterEditMode();
-
-			// Insert post comments form
-			await insertBlock( 'Comments Form' );
-
-			// Ensure the placeholder is there
-			await expect( canvas() ).toMatchElement(
-				'.wp-block-post-comments-form .comment-form'
-			);
-		} );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/experiments/experimental-features.js b/packages/e2e-tests/specs/experiments/experimental-features.js
deleted file mode 100644
index 3c33f930012dde..00000000000000
--- a/packages/e2e-tests/specs/experiments/experimental-features.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { addQueryArgs } from '@wordpress/url';
-import { visitAdminPage } from '@wordpress/e2e-test-utils';
-
-async function setExperimentalFeaturesState( features, enable ) {
-	const query = addQueryArgs( '', {
-		page: 'gutenberg-experiments',
-	} );
-	await visitAdminPage( '/admin.php', query );
-
-	await Promise.all(
-		features.map( async ( feature ) => {
-			await page.waitForSelector( feature );
-			const checkedSelector = `${ feature }[checked=checked]`;
-			const isChecked = !! ( await page.$( checkedSelector ) );
-			if ( ( ! isChecked && enable ) || ( isChecked && ! enable ) ) {
-				await page.click( feature );
-			}
-		} )
-	);
-	await Promise.all( [
-		page.waitForNavigation( { waitUntil: 'networkidle0' } ),
-		page.click( '#submit' ),
-	] );
-}
-
-/**
- * Establishes test lifecycle to enable experimental feature for the duration of
- * the grouped test block.
- *
- * @param {Array} features Array of {string} selectors of settings to enable.
- *                         Assumes they can be enabled with one click.
- */
-export function useExperimentalFeatures( features ) {
-	beforeAll( () => setExperimentalFeaturesState( features, true ) );
-	afterAll( () => setExperimentalFeaturesState( features, false ) );
-}
diff --git a/packages/e2e-tests/specs/experiments/fixtures/menu-items-request-fixture.json b/packages/e2e-tests/specs/experiments/fixtures/menu-items-request-fixture.json
deleted file mode 100644
index 01b844c45ceee4..00000000000000
--- a/packages/e2e-tests/specs/experiments/fixtures/menu-items-request-fixture.json
+++ /dev/null
@@ -1,84 +0,0 @@
-[
-	{
-		"title": "Home",
-		"url": "http://localhost:8889/",
-		"menu_order": 1
-	},
-	{
-		"title": "About",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 2
-	},
-	{
-		"title": "Our team",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 3,
-		"parent": 1
-	},
-	{
-		"title": "Shop",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 4
-	},
-	{
-		"title": "Winter apparel",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 5,
-		"parent": 3
-	},
-	{
-		"title": "Chunky socks",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 6,
-		"parent": 4
-	},
-	{
-		"title": "Hideous hats",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 7,
-		"parent": 4
-	},
-	{
-		"title": "Glorious gloves",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 8,
-		"parent": 4
-	},
-	{
-		"title": "Jazzy Jumpers",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 9,
-		"parent": 4
-	},
-	{
-		"title": "Shipping",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 10
-	},
-	{
-		"title": "Contact Us",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 11
-	},
-	{
-		"title": "WordPress.org",
-		"url": "https://wordpress.org",
-		"menu_order": 12
-	},
-	{
-		"title": "Google",
-		"url": "https://google.com",
-		"menu_order": 13,
-		"parent": 11
-	}
-]
diff --git a/packages/e2e-tests/specs/site-editor/settings-sidebar.test.js b/packages/e2e-tests/specs/site-editor/settings-sidebar.test.js
deleted file mode 100644
index 6b589ec7ea33d4..00000000000000
--- a/packages/e2e-tests/specs/site-editor/settings-sidebar.test.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	deleteAllTemplates,
-	activateTheme,
-	getAllBlocks,
-	selectBlockByClientId,
-	insertBlock,
-	visitSiteEditor,
-	enterEditMode,
-} from '@wordpress/e2e-test-utils';
-
-async function toggleSidebar() {
-	await page.click(
-		'.edit-site-header-edit-mode__actions button[aria-label="Settings"]'
-	);
-}
-
-async function getActiveTabLabel() {
-	return await page.$eval(
-		'.edit-site-sidebar-edit-mode__panel-tab.is-active',
-		( element ) => element.getAttribute( 'aria-label' )
-	);
-}
-
-async function getTemplateCard() {
-	return {
-		title: await page.$eval(
-			'.edit-site-sidebar-card__title',
-			( element ) => element.innerText
-		),
-		description: await page.$eval(
-			'.edit-site-sidebar-card__description',
-			( element ) => element.innerText
-		),
-	};
-}
-
-describe( 'Settings sidebar', () => {
-	beforeAll( async () => {
-		await activateTheme( 'emptytheme' );
-		await deleteAllTemplates( 'wp_template' );
-		await deleteAllTemplates( 'wp_template_part' );
-	} );
-	afterAll( async () => {
-		await deleteAllTemplates( 'wp_template' );
-		await deleteAllTemplates( 'wp_template_part' );
-		await activateTheme( 'twentytwentyone' );
-	} );
-	beforeEach( async () => {
-		await visitSiteEditor();
-		await enterEditMode();
-	} );
-
-	describe( 'Template tab', () => {
-		it( 'should open template tab by default if no block is selected', async () => {
-			await toggleSidebar();
-
-			expect( await getActiveTabLabel() ).toEqual(
-				'Template (selected)'
-			);
-		} );
-
-		it( "should show the currently selected template's title and description", async () => {
-			await toggleSidebar();
-
-			const templateCardBeforeNavigation = await getTemplateCard();
-			await visitSiteEditor( {
-				postId: 'emptytheme//singular',
-				postType: 'wp_template',
-			} );
-			await enterEditMode();
-			const templateCardAfterNavigation = await getTemplateCard();
-
-			expect( templateCardBeforeNavigation ).toMatchObject( {
-				title: 'Index',
-				description:
-					'Used as a fallback template for all pages when a more specific template is not defined.',
-			} );
-			expect( templateCardAfterNavigation ).toMatchObject( {
-				title: 'Single Entries',
-				description:
-					'Displays any single entry, such as a post or a page. This template will serve as a fallback when a more specific template (e.g. Single Post, Page, or Attachment) cannot be found.',
-			} );
-		} );
-	} );
-
-	describe( 'Block tab', () => {
-		it( 'should open block tab by default if a block is selected', async () => {
-			const allBlocks = await getAllBlocks();
-			await selectBlockByClientId( allBlocks[ 0 ].clientId );
-
-			await toggleSidebar();
-
-			expect( await getActiveTabLabel() ).toEqual( 'Block (selected)' );
-		} );
-	} );
-
-	describe( 'Tab switch based on selection', () => {
-		it( 'should switch to block tab if we select a block, when Template is selected', async () => {
-			await toggleSidebar();
-			expect( await getActiveTabLabel() ).toEqual(
-				'Template (selected)'
-			);
-			// By inserting the block is also selected.
-			await insertBlock( 'Heading' );
-			expect( await getActiveTabLabel() ).toEqual( 'Block (selected)' );
-		} );
-		it( 'should switch to Template tab when a block was selected and we select the Template', async () => {
-			await insertBlock( 'Heading' );
-			await toggleSidebar();
-			expect( await getActiveTabLabel() ).toEqual( 'Block (selected)' );
-			await page.evaluate( () => {
-				wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock();
-			} );
-			expect( await getActiveTabLabel() ).toEqual(
-				'Template (selected)'
-			);
-		} );
-	} );
-} );
diff --git a/packages/e2e-tests/specs/widgets/editing-widgets.test.js b/packages/e2e-tests/specs/widgets/editing-widgets.test.js
deleted file mode 100644
index e944e90a92fae8..00000000000000
--- a/packages/e2e-tests/specs/widgets/editing-widgets.test.js
+++ /dev/null
@@ -1,962 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalActivatePlugin as activatePlugin,
-	activateTheme,
-	clickBlockToolbarButton,
-	__experimentalDeactivatePlugin as deactivatePlugin,
-	showBlockToolbar,
-	visitAdminPage,
-	deleteAllWidgets,
-	pressKeyWithModifier,
-	__experimentalRest as rest,
-	openListView,
-	closeListView,
-	openGlobalBlockInserter,
-	searchForBlock,
-	closeGlobalBlockInserter,
-	setBrowserViewport,
-} from '@wordpress/e2e-test-utils';
-
-/**
- * External dependencies
- */
-// eslint-disable-next-line no-restricted-imports
-import { find, findAll } from 'puppeteer-testing-library';
-
-describe( 'Widgets screen', () => {
-	beforeEach( async () => {
-		await visitWidgetsScreen();
-
-		// Disable welcome guide if it is enabled.
-		const isWelcomeGuideActive = await page.evaluate(
-			() =>
-				!! wp.data
-					.select( 'core/preferences' )
-					.get( 'core/edit-widgets', 'welcomeGuide' )
-		);
-		if ( isWelcomeGuideActive ) {
-			await page.evaluate( () =>
-				wp.data
-					.dispatch( 'core/preferences' )
-					.toggle( 'core/edit-widgets', 'welcomeGuide' )
-			);
-		}
-
-		// Wait for the widget areas to load.
-		await findAll( {
-			role: 'document',
-			name: 'Block: Widget Area',
-		} );
-	} );
-
-	afterEach( async () => {
-		await deleteAllWidgets();
-	} );
-
-	beforeAll( async () => {
-		// TODO: Ideally we can bundle our test theme directly in the repo.
-		await activateTheme( 'twentytwenty' );
-		await deleteAllWidgets();
-	} );
-
-	afterAll( async () => {
-		await activateTheme( 'twentytwentyone' );
-	} );
-
-	async function getBlockInGlobalInserter( blockName ) {
-		await openGlobalBlockInserter();
-
-		const blockLibrary = await find( {
-			role: 'region',
-			name: 'Block Library',
-		} );
-
-		// Check that there are categorizations in the inserter (#26329).
-		const categoryHeaders = await findAll(
-			{
-				role: 'heading',
-				level: 2,
-			},
-			{
-				root: blockLibrary,
-			}
-		);
-		expect( categoryHeaders.length > 0 ).toBe( true );
-
-		const searchBox = await find( {
-			role: 'searchbox',
-			name: 'Search for blocks and patterns',
-		} );
-		await searchBox.type( blockName );
-
-		await searchForBlock( blockName );
-
-		return await page.waitForXPath(
-			`//button//span[contains(text(), '${ blockName }')]`
-		);
-	}
-
-	async function expectInsertionPointIndicatorToBeBelowLastBlock(
-		widgetArea
-	) {
-		const childBlocks = await findAll(
-			{ selector: '[data-block]' },
-			{ root: widgetArea }
-		);
-		// The initial block appender also has the [data-block] property, adding to the count.
-		const lastBlock = childBlocks[ childBlocks.length - 2 ];
-		const lastBlockBoundingBox = await lastBlock.boundingBox();
-
-		const insertionPointIndicator = await page.$(
-			'.block-editor-block-list__insertion-point-indicator'
-		);
-		const insertionPointIndicatorBoundingBox =
-			await insertionPointIndicator.boundingBox();
-
-		expect(
-			insertionPointIndicatorBoundingBox.y > lastBlockBoundingBox.y
-		).toBe( true );
-	}
-
-	it.skip( 'Should insert content using the global inserter', async () => {
-		const updateButton = await find( {
-			role: 'button',
-			name: 'Update',
-		} );
-
-		// Update button should start out disabled.
-		expect(
-			await updateButton.evaluate( ( button ) => button.disabled )
-		).toBe( true );
-
-		const widgetAreas = await findAll( {
-			role: 'document',
-			name: 'Block: Widget Area',
-		} );
-		const [ firstWidgetArea, secondWidgetArea ] = widgetAreas;
-
-		let addParagraphBlock = await getBlockInGlobalInserter( 'Paragraph' );
-		await addParagraphBlock.hover();
-
-		// FIXME: The insertion point indicator is not showing when the widget area has no blocks.
-		// await expectInsertionPointIndicatorToBeBelowLastBlock(
-		// 	firstWidgetArea
-		// );
-
-		await addParagraphBlock.click();
-
-		// Adding content should enable the Update button.
-		expect(
-			await updateButton.evaluate( ( button ) => button.disabled )
-		).toBe( false );
-
-		let addedParagraphBlockInFirstWidgetArea = await find(
-			{
-				name: /^Empty block/,
-				selector: '[data-block][data-type="core/paragraph"]',
-			},
-			{
-				root: firstWidgetArea,
-			}
-		);
-
-		await addedParagraphBlockInFirstWidgetArea.focus();
-
-		await page.keyboard.type( 'First Paragraph' );
-
-		addParagraphBlock = await getBlockInGlobalInserter( 'Paragraph' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.press( 'Tab' );
-
-		await expectInsertionPointIndicatorToBeBelowLastBlock(
-			firstWidgetArea
-		);
-		await addParagraphBlock.focus();
-		await addParagraphBlock.click();
-
-		addedParagraphBlockInFirstWidgetArea = await firstWidgetArea.$(
-			'[data-block][data-type="core/paragraph"][aria-label^="Empty block"]'
-		);
-		await addedParagraphBlockInFirstWidgetArea.focus();
-		await page.keyboard.type( 'Second Paragraph' );
-
-		const addShortCodeBlock = await getBlockInGlobalInserter( 'Shortcode' );
-		await addShortCodeBlock.click();
-
-		const shortCodeInput = await page.waitForSelector(
-			'textarea[aria-label="Shortcode text"]'
-		);
-		await shortCodeInput.focus();
-		// The famous Big Buck Bunny video.
-		await shortCodeInput.type(
-			'[video src="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"]'
-		);
-
-		// Add to the second widget area.
-		await secondWidgetArea.click();
-
-		addParagraphBlock = await getBlockInGlobalInserter( 'Paragraph' );
-		await addParagraphBlock.click();
-
-		const addedParagraphBlockInSecondWidgetArea = await secondWidgetArea.$(
-			'[data-block][data-type="core/paragraph"][aria-label^="Empty block"]'
-		);
-		await addedParagraphBlockInSecondWidgetArea.focus();
-		await page.keyboard.type( 'Third Paragraph' );
-
-		await saveWidgets();
-
-		// The Update button should be disabled again after saving.
-		expect(
-			await updateButton.evaluate( ( button ) => button.disabled )
-		).toBe( true );
-
-		const serializedWidgetAreas = await getSerializedWidgetAreas();
-		expect( serializedWidgetAreas ).toMatchInlineSnapshot( `
-		Object {
-		  "sidebar-1": "<div class=\\"widget widget_block widget_text\\"><div class=\\"widget-content\\">
-		<p>First Paragraph</p>
-		</div></div>
-		<div class=\\"widget widget_block widget_text\\"><div class=\\"widget-content\\">
-		<p>Second Paragraph</p>
-		</div></div>
-		<div class=\\"widget widget_block\\"><div class=\\"widget-content\\"><p><div style=\\"width: 580px;\\" class=\\"wp-video\\"><!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->
-		<video class=\\"wp-video-shortcode\\" id=\\"video-0-1\\" width=\\"580\\" height=\\"326\\" preload=\\"metadata\\" controls=\\"controls\\"><source type=\\"video/mp4\\" src=\\"http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4?_=1\\" /><a href=\\"http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4\\">http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4</a></video></div></p>
-		</div></div>",
-		  "sidebar-2": "<div class=\\"widget widget_block widget_text\\"><div class=\\"widget-content\\">
-		<p>Third Paragraph</p>
-		</div></div>",
-		}
-	` );
-	} );
-
-	it.skip( 'Should insert content using the inline inserter', async () => {
-		const [ firstWidgetArea ] = await findAll( {
-			role: 'document',
-			name: 'Block: Widget Area',
-		} );
-
-		// Scroll to the end of the first widget area.
-		await firstWidgetArea.evaluate( ( node ) =>
-			node.scrollIntoView( { block: 'end' } )
-		);
-
-		const firstWidgetAreaBoundingBox = await firstWidgetArea.boundingBox();
-
-		// Click near the end of the widget area to select it.
-		await page.mouse.click(
-			firstWidgetAreaBoundingBox.x + firstWidgetAreaBoundingBox.width / 2,
-			firstWidgetAreaBoundingBox.y +
-				firstWidgetAreaBoundingBox.height -
-				10
-		);
-
-		let inlineInserterButton = await find( {
-			role: 'combobox',
-			name: 'Add block',
-		} );
-		await inlineInserterButton.click();
-
-		let inlineQuickInserter = await find( {
-			role: 'listbox',
-			name: 'Blocks',
-		} );
-
-		const paragraphBlock = await find(
-			{
-				role: 'option',
-				name: 'Paragraph',
-			},
-			{
-				root: inlineQuickInserter,
-			}
-		);
-		await paragraphBlock.click();
-
-		const firstParagraphBlock = await find(
-			{
-				name: /^Empty block/,
-				selector: '[data-block][data-type="core/paragraph"]',
-			},
-			{
-				root: firstWidgetArea,
-			}
-		);
-
-		await firstParagraphBlock.focus();
-		await page.keyboard.type( 'First Paragraph' );
-
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Second Paragraph' );
-
-		const secondParagraphBlock = await page.evaluateHandle(
-			() => document.activeElement
-		);
-		await expect( secondParagraphBlock ).not.toBeElement(
-			firstParagraphBlock
-		);
-
-		const secondParagraphBlockBoundingBox =
-			await secondParagraphBlock.boundingBox();
-
-		// Click outside the block to move the focus back to the widget area.
-		await page.mouse.click(
-			secondParagraphBlockBoundingBox.x +
-				firstWidgetAreaBoundingBox.width / 2,
-			secondParagraphBlockBoundingBox.y +
-				secondParagraphBlockBoundingBox.height +
-				10
-		);
-
-		// Hover above the last block to trigger the inline inserter between blocks.
-		await page.mouse.move(
-			secondParagraphBlockBoundingBox.x +
-				secondParagraphBlockBoundingBox.width / 2,
-			secondParagraphBlockBoundingBox.y - 10
-		);
-
-		// There will be 2 matches here.
-		// One is the in-between inserter,
-		// and the other one is the button block appender.
-		[ inlineInserterButton ] = await findAll( {
-			role: 'combobox',
-			name: 'Add block',
-		} );
-		await inlineInserterButton.click();
-
-		const inserterSearchBox = await find( {
-			role: 'searchbox',
-			name: 'Search for blocks and patterns',
-		} );
-		await expect( inserterSearchBox ).toHaveFocus();
-
-		await page.keyboard.type( 'Heading' );
-
-		inlineQuickInserter = await find( {
-			role: 'listbox',
-			name: 'Blocks',
-		} );
-		const headingBlockOption = await find(
-			{
-				role: 'option',
-				name: 'Heading',
-			},
-			{
-				root: inlineQuickInserter,
-			}
-		);
-		await headingBlockOption.click();
-
-		// Get the added heading block as second last block.
-		const addedHeadingBlock = await secondParagraphBlock.evaluateHandle(
-			( node ) => node.previousSibling
-		);
-
-		await expect( addedHeadingBlock ).toHaveFocus();
-
-		await page.keyboard.type( 'My Heading' );
-
-		await expect( addedHeadingBlock ).toMatchQuery( {
-			name: 'Block: Heading',
-			level: 2,
-			value: 'My Heading',
-		} );
-
-		await saveWidgets();
-		const serializedWidgetAreas = await getSerializedWidgetAreas();
-		expect( serializedWidgetAreas ).toMatchInlineSnapshot( `
-		Object {
-		  "sidebar-1": "<div class=\\"widget widget_block widget_text\\"><div class=\\"widget-content\\">
-		<p>First Paragraph</p>
-		</div></div>
-		<div class=\\"widget widget_block\\"><div class=\\"widget-content\\">
-		<h2 id=\\"my-heading\\">My Heading</h2>
-		</div></div>
-		<div class=\\"widget widget_block widget_text\\"><div class=\\"widget-content\\">
-		<p>Second Paragraph</p>
-		</div></div>",
-		}
-	` );
-	} );
-
-	describe( 'Function widgets', () => {
-		async function addMarquee( nbExpectedMarquees ) {
-			const [ firstWidgetArea ] = await findAll( {
-				role: 'document',
-				name: 'Block: Widget Area',
-			} );
-			await firstWidgetArea.focus();
-			const marqueeBlock =
-				await getBlockInGlobalInserter( 'Marquee Greeting' );
-			await marqueeBlock.click();
-			await page.waitForFunction(
-				( expectedMarquees ) => {
-					return (
-						document.querySelectorAll(
-							'[data-testid="marquee-greeting"]'
-						).length === expectedMarquees
-					);
-				},
-				{},
-				nbExpectedMarquees
-			);
-		}
-
-		async function deleteExistingMarquees() {
-			const widgetAreasHoldingMarqueeWidgets = await page.$x(
-				'//input[@data-testid="marquee-greeting"]/ancestor::div[@aria-label="Block: Widget Area"]'
-			);
-			for ( const widgetArea of widgetAreasHoldingMarqueeWidgets ) {
-				const closedPanelBody = await widgetArea.$(
-					'.components-panel__body:not(.is-opened)'
-				);
-				if ( closedPanelBody ) {
-					await closedPanelBody.focus();
-					await closedPanelBody.click();
-				}
-
-				const [ existingMarqueeWidgets ] = await widgetArea.$x(
-					'//input[@data-testid="marquee-greeting"]/ancestor::div[@data-block][contains(@class, "wp-block-legacy-widget")]'
-				);
-				if ( existingMarqueeWidgets ) {
-					await existingMarqueeWidgets.focus();
-					await pressKeyWithModifier( 'access', 'z' );
-				}
-			}
-		}
-
-		beforeAll( async () => {
-			await activatePlugin( 'gutenberg-test-marquee-widget' );
-		} );
-
-		beforeEach( async () => {
-			await deleteExistingMarquees();
-		} );
-
-		afterAll( async () => {
-			await deactivatePlugin( 'gutenberg-test-marquee-widget' );
-		} );
-
-		it( 'Should add and save the marquee widget', async () => {
-			await addMarquee( 1 );
-
-			// Use find because the input might not be visible at first.
-			const marqueeInput = await find( {
-				selector: '[data-testid="marquee-greeting"]',
-			} );
-			// Clear the input.
-			await marqueeInput.evaluate( ( input ) => {
-				input.value = '';
-			} );
-			await marqueeInput.type( 'Howdy' );
-
-			// The first marquee is saved after clicking the form save button.
-			const marqueeSaveButton = await marqueeInput.evaluateHandle(
-				( input ) =>
-					input
-						// Get the parent block element.
-						.closest( '[data-block]' )
-						// Get the save button.
-						.querySelector( 'button[type="submit"]' )
-			);
-			await marqueeSaveButton.click();
-
-			await saveWidgets();
-			let editedSerializedWidgetAreas = await getSerializedWidgetAreas();
-			await expect( editedSerializedWidgetAreas ).toMatchInlineSnapshot( `
-			{
-			  "sidebar-1": "<marquee>Howdy</marquee>",
-			}
-		` );
-
-			await page.reload();
-
-			editedSerializedWidgetAreas = await getSerializedWidgetAreas();
-			await expect( editedSerializedWidgetAreas ).toMatchInlineSnapshot( `
-			{
-			  "sidebar-1": "<marquee>Howdy</marquee>",
-			}
-		` );
-
-			await addMarquee( 2 );
-
-			const marqueeInputs = await page.$$(
-				'[data-testid="marquee-greeting"]'
-			);
-
-			expect( marqueeInputs ).toHaveLength( 2 );
-			await marqueeInputs[ 0 ].type( 'first ' );
-			await marqueeInputs[ 1 ].type( 'Second ' );
-
-			// No marquee should be changed without clicking on their "save" button.
-			// The second marquee shouldn't be stored as a widget.
-			// See #32978 for more info.
-			await saveWidgets();
-			editedSerializedWidgetAreas = await getSerializedWidgetAreas();
-			await expect( editedSerializedWidgetAreas ).toMatchInlineSnapshot( `
-			{
-			  "sidebar-1": "<marquee>Howdy</marquee>",
-			}
-		` );
-
-			await page.reload();
-			const marqueesAfter = await findAll( {
-				selector: '[data-testid="marquee-greeting"]',
-			} );
-			expect( marqueesAfter ).toHaveLength( 1 );
-		} );
-	} );
-
-	it.skip( 'Should duplicate the widgets', async () => {
-		let [ firstWidgetArea ] = await findAll( {
-			role: 'document',
-			name: 'Block: Widget Area',
-		} );
-
-		const addParagraphBlock = await getBlockInGlobalInserter( 'Paragraph' );
-		await addParagraphBlock.click();
-
-		let firstParagraphBlock = await find(
-			{
-				role: 'document',
-				name: /^Empty block/,
-			},
-			{ root: firstWidgetArea }
-		);
-		await firstParagraphBlock.focus();
-		await page.keyboard.type( 'First Paragraph' );
-
-		await saveWidgets();
-		await page.reload();
-		// Wait for the widget areas to load.
-		[ firstWidgetArea ] = await findAll( {
-			role: 'document',
-			name: 'Block: Widget Area',
-		} );
-
-		const initialSerializedWidgetAreas = await getSerializedWidgetAreas();
-		expect( initialSerializedWidgetAreas ).toMatchInlineSnapshot( `
-		Object {
-		  "sidebar-1": "<div class=\\"widget widget_block widget_text\\"><div class=\\"widget-content\\">
-		<p>First Paragraph</p>
-		</div></div>",
-		}
-	` );
-
-		firstParagraphBlock = await firstWidgetArea.$(
-			'[data-block][data-type="core/paragraph"]'
-		);
-		await firstParagraphBlock.focus();
-
-		await showBlockToolbar();
-		await clickBlockToolbarButton( 'Options' );
-		const duplicateButton = await find( {
-			role: 'menuitem',
-			name: /^Duplicate/,
-		} );
-		await duplicateButton.click();
-
-		await page.waitForFunction(
-			( paragraph ) =>
-				paragraph.nextSibling &&
-				paragraph.nextSibling.matches( '[data-block]' ),
-			{},
-			firstParagraphBlock
-		);
-		const duplicatedParagraphBlock =
-			await firstParagraphBlock.evaluateHandle(
-				( paragraph ) => paragraph.nextSibling
-			);
-
-		const firstParagraphBlockClientId = await firstParagraphBlock.evaluate(
-			( node ) => node.dataset.block
-		);
-		const duplicatedParagraphBlockClientId =
-			await duplicatedParagraphBlock.evaluate(
-				( node ) => node.dataset.block
-			);
-
-		expect( firstParagraphBlockClientId ).not.toBe(
-			duplicatedParagraphBlockClientId
-		);
-		await expect( duplicatedParagraphBlock ).toMatchQuery( {
-			text: 'First Paragraph',
-		} );
-		await expect( duplicatedParagraphBlock ).toHaveFocus();
-
-		await saveWidgets();
-		const editedSerializedWidgetAreas = await getSerializedWidgetAreas();
-		expect( editedSerializedWidgetAreas ).toMatchInlineSnapshot( `
-		Object {
-		  "sidebar-1": "<div class=\\"widget widget_block widget_text\\"><div class=\\"widget-content\\">
-		<p>First Paragraph</p>
-		</div></div>
-		<div class=\\"widget widget_block widget_text\\"><div class=\\"widget-content\\">
-		<p>First Paragraph</p>
-		</div></div>",
-		}
-	` );
-		expect( editedSerializedWidgetAreas[ 'sidebar-1' ] ).toBe(
-			[
-				initialSerializedWidgetAreas[ 'sidebar-1' ],
-				initialSerializedWidgetAreas[ 'sidebar-1' ],
-			].join( '\n' )
-		);
-	} );
-
-	it.skip( 'Should display legacy widgets', async () => {
-		// Get the default empty instance of a legacy search widget.
-		const { instance: defaultSearchInstance } = await rest( {
-			method: 'POST',
-			path: '/wp/v2/widget-types/search/encode',
-			data: { instance: {} },
-		} );
-
-		// Create a search widget in the first sidebar using the default instance.
-		await rest( {
-			method: 'POST',
-			path: '/wp/v2/widgets',
-			data: {
-				id_base: 'search',
-				sidebar: 'sidebar-1',
-				instance: defaultSearchInstance,
-			},
-		} );
-
-		await page.reload();
-
-		// Wait for the Legacy Widget block's preview iframe to load.
-		const frame = await new Promise( ( resolve ) => {
-			const checkFrame = async () => {
-				const frameElement = await page.$(
-					'iframe.wp-block-legacy-widget__edit-preview-iframe'
-				);
-				if ( frameElement ) {
-					page.off( 'frameattached', checkFrame );
-					page.off( 'framenavigated', checkFrame );
-					resolve( frameElement.contentFrame() );
-				}
-			};
-			page.on( 'frameattached', checkFrame );
-			page.on( 'framenavigated', checkFrame );
-		} );
-
-		// Expect to have search input.
-		await find(
-			{
-				role: 'searchbox',
-			},
-			{
-				page: frame,
-			}
-		);
-
-		// Focus the Legacy Widget block.
-		const legacyWidget = await find( {
-			role: 'document',
-			name: 'Block: Legacy Widget',
-		} );
-		await legacyWidget.focus();
-
-		// There should be a title at the top of the widget form.
-		const legacyWidgetName = await find(
-			{
-				role: 'heading',
-				level: 3,
-			},
-			{
-				root: legacyWidget,
-			}
-		);
-		expect( legacyWidgetName ).toMatchQuery( { text: 'Search' } );
-
-		// Update the widget form.
-		// TODO: Convert to find() API from puppeteer-testing-library.
-		const titleInput = await page.waitForSelector(
-			`#widget-search-1-title`
-		);
-		await titleInput.type( 'Search Title' );
-
-		// Switch to Navigation mode.
-		await page.keyboard.press( 'Escape' );
-
-		// Wait for the preview to update.
-		await frame.waitForNavigation();
-
-		// Expect to have search title.
-		await find(
-			{
-				role: 'heading',
-				name: 'Search Title',
-			},
-			{
-				page: frame,
-			}
-		);
-
-		await saveWidgets();
-		const serializedWidgetAreas = await getSerializedWidgetAreas();
-		expect( serializedWidgetAreas ).toMatchInlineSnapshot( `
-		Object {
-		  "sidebar-1": "<div class=\\"widget widget_search\\"><div class=\\"widget-content\\"><h2 class=\\"widget-title subheading heading-size-3\\">Search Title</h2><form role=\\"search\\"  method=\\"get\\" class=\\"search-form\\" action=\\"http://localhost:8889/\\">
-			<label for=\\"search-form-1\\">
-				<span class=\\"screen-reader-text\\">Search for:</span>
-				<input type=\\"search\\" id=\\"search-form-1\\" class=\\"search-field\\" placeholder=\\"Search &hellip;\\" value=\\"\\" name=\\"s\\" />
-			</label>
-			<input type=\\"submit\\" class=\\"search-submit\\" value=\\"Search\\" />
-		</form>
-		</div></div>",
-		}
-	` );
-	} );
-
-	it.skip( 'allows widgets to be moved between widget areas using the dropdown in the block toolbar', async () => {
-		const widgetAreas = await findAll( {
-			role: 'document',
-			name: 'Block: Widget Area',
-		} );
-		const [ firstWidgetArea, secondWidgetArea ] = widgetAreas;
-
-		// Insert a paragraph it should be in the first widget area.
-		const inserterParagraphBlock =
-			await getBlockInGlobalInserter( 'Paragraph' );
-		await inserterParagraphBlock.hover();
-		await inserterParagraphBlock.click();
-		const addedParagraphBlockInFirstWidgetArea = await find(
-			{
-				role: 'document',
-				name: /^Empty block/,
-			},
-			{ root: firstWidgetArea }
-		);
-		await addedParagraphBlockInFirstWidgetArea.focus();
-		await page.keyboard.type( 'First Paragraph' );
-
-		// Check that the block exists in the first widget area.
-		await find(
-			{
-				role: 'document',
-				name: 'Block: Paragraph',
-				value: 'First Paragraph',
-			},
-			{
-				root: firstWidgetArea,
-			}
-		);
-
-		// Move the block to the second widget area.
-		await showBlockToolbar();
-		await clickBlockToolbarButton( 'Move to widget area' );
-		const widgetAreaButton = await find( {
-			role: 'menuitemradio',
-			name: /^Footer #2/,
-		} );
-		await widgetAreaButton.click();
-
-		// Check that the block exists in the second widget area.
-		await find(
-			{
-				role: 'document',
-				name: 'Block: Paragraph',
-				value: 'First Paragraph',
-			},
-			{
-				root: secondWidgetArea,
-			}
-		);
-
-		// Assert that the serialized widget areas shows the block as in the second widget area.
-		await saveWidgets();
-		const serializedWidgetAreas2 = await getSerializedWidgetAreas();
-		expect( serializedWidgetAreas2 ).toMatchInlineSnapshot( `
-		Object {
-		  "sidebar-2": "<div class=\\"widget widget_block widget_text\\"><div class=\\"widget-content\\">
-		<p>First Paragraph</p>
-		</div></div>",
-		}
-	` );
-	} );
-
-	it( 'Allows widget deletion to be undone', async () => {
-		const [ firstWidgetArea ] = await findAll( {
-			role: 'document',
-			name: 'Block: Widget Area',
-		} );
-
-		let addParagraphBlock = await getBlockInGlobalInserter( 'Paragraph' );
-		await addParagraphBlock.click();
-
-		let addedParagraphBlockInFirstWidgetArea = await find(
-			{
-				name: /^Empty block/,
-				selector: '[data-block][data-type="core/paragraph"]',
-			},
-			{
-				root: firstWidgetArea,
-			}
-		);
-		await addedParagraphBlockInFirstWidgetArea.focus();
-		await page.keyboard.type( 'First Paragraph' );
-
-		addParagraphBlock = await getBlockInGlobalInserter( 'Paragraph' );
-		await addParagraphBlock.click();
-
-		addedParagraphBlockInFirstWidgetArea = await firstWidgetArea.$(
-			'[data-block][data-type="core/paragraph"][aria-label^="Empty block"]'
-		);
-		await addedParagraphBlockInFirstWidgetArea.focus();
-		await page.keyboard.type( 'Second Paragraph' );
-
-		await saveWidgets();
-		await page.focus( '.block-editor-writing-flow' );
-
-		// Delete the last block and save again.
-		await pressKeyWithModifier( 'access', 'z' );
-		await saveWidgets();
-		// To do: clicking on the Snackbar causes focus loss.
-		await page.focus( '.block-editor-writing-flow' );
-
-		// Undo block deletion and save again.
-		await pressKeyWithModifier( 'primary', 'z' );
-		await saveWidgets();
-
-		// Reload the page to make sure changes were actually saved.
-		await page.reload();
-
-		const serializedWidgetAreas = await getSerializedWidgetAreas();
-		expect( serializedWidgetAreas ).toMatchInlineSnapshot( `
-		{
-		  "sidebar-1": "<div class="widget widget_block widget_text"><div class="widget-content">
-		<p>First Paragraph</p>
-		</div></div>
-		<div class="widget widget_block widget_text"><div class="widget-content">
-		<p>Second Paragraph</p>
-		</div></div>",
-		}
-	` );
-	} );
-
-	it( 'can toggle sidebar list view', async () => {
-		const widgetAreas = await findAll( {
-			role: 'document',
-			name: 'Block: Widget Area',
-		} );
-		await openListView();
-		const listItems = await page.$$(
-			'.edit-widgets-editor__list-view-panel .block-editor-list-view-leaf'
-		);
-		expect( listItems.length >= widgetAreas.length ).toEqual( true );
-		await closeListView();
-	} );
-
-	// Check for regressions of https://github.com/WordPress/gutenberg/issues/38002.
-	it( 'allows blocks to be added on mobile viewports', async () => {
-		await setBrowserViewport( 'small' );
-		const [ firstWidgetArea ] = await findAll( {
-			role: 'document',
-			name: 'Block: Widget Area',
-		} );
-
-		const addParagraphBlock = await getBlockInGlobalInserter( 'Paragraph' );
-		await addParagraphBlock.click();
-
-		const addedParagraphBlockInFirstWidgetArea = await find(
-			{
-				name: /^Empty block/,
-				selector: '[data-block][data-type="core/paragraph"]',
-			},
-			{
-				root: firstWidgetArea,
-			}
-		);
-		await addedParagraphBlockInFirstWidgetArea.focus();
-		await page.keyboard.type( 'First Paragraph' );
-		const updatedParagraphBlockInFirstWidgetArea = await find(
-			{
-				name: 'Block: Paragraph',
-				value: 'First Paragraph',
-			},
-			{
-				root: firstWidgetArea,
-			}
-		);
-
-		expect( updatedParagraphBlockInFirstWidgetArea ).toBeTruthy();
-	} );
-} );
-
-/**
- * Visit the widgets screen via link clicking. The widgets screen currently
- * has different URLs during the integration to core.
- * We should be able to refactor it once it's fully merged into core.
- */
-async function visitWidgetsScreen() {
-	// Visit the Appearance page.
-	await visitAdminPage( 'themes.php' );
-
-	// Go to the Widgets page.
-	const appearanceMenu = await page.$( '#menu-appearance' );
-	await appearanceMenu.hover();
-	const widgetsLink = await find(
-		{ role: 'link', name: 'Widgets' },
-		{ root: appearanceMenu }
-	);
-	await Promise.all( [
-		page.waitForNavigation(),
-		// Click on the link no matter if it's visible or not.
-		widgetsLink.evaluate( ( link ) => {
-			link.click();
-		} ),
-	] );
-}
-
-async function saveWidgets() {
-	await closeListView();
-	await closeGlobalBlockInserter();
-	const updateButton = await find( {
-		role: 'button',
-		name: 'Update',
-	} );
-	await updateButton.click();
-
-	// Expect the "Widgets saved." snackbar to appear.
-	const savedSnackbarQuery = {
-		role: 'button',
-		name: 'Dismiss this notice',
-		text: 'Widgets saved.',
-	};
-	await expect( savedSnackbarQuery ).toBeFound();
-
-	// Close the snackbar.
-	const savedSnackbar = await find( savedSnackbarQuery );
-	await savedSnackbar.click();
-	// Expect focus not to be lost.
-	await expect(
-		await page.evaluate( () => document.activeElement.className )
-	).toBe( 'components-snackbar-list edit-widgets-notices__snackbar' );
-	await expect( savedSnackbarQuery ).not.toBeFound();
-}
-
-async function getSerializedWidgetAreas() {
-	const widgets = await rest( { path: '/wp/v2/widgets' } );
-
-	const serializedWidgetAreas = widgets.reduce(
-		( acc, { sidebar, rendered } ) => {
-			const currentWidgets = acc[ sidebar ] || '';
-			let newWidgets = Boolean( rendered ) ? rendered : '';
-			if ( currentWidgets.length && newWidgets.length ) {
-				newWidgets = '\n' + newWidgets;
-			}
-
-			return {
-				...acc,
-				[ sidebar ]: currentWidgets + newWidgets,
-			};
-		},
-		{}
-	);
-
-	return serializedWidgetAreas;
-}
diff --git a/packages/edit-post/.npmrc b/packages/edit-post/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/edit-post/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/edit-post/CHANGELOG.md b/packages/edit-post/CHANGELOG.md
index 70c562e812f1ea..409af4ead284fd 100644
--- a/packages/edit-post/CHANGELOG.md
+++ b/packages/edit-post/CHANGELOG.md
@@ -2,6 +2,67 @@
 
 ## Unreleased
 
+## 8.10.0 (2024-10-16)
+
+## 8.9.0 (2024-10-03)
+
+## 8.8.0 (2024-09-19)
+
+## 8.7.0 (2024-09-05)
+
+## 8.6.0 (2024-08-21)
+
+## 8.5.0 (2024-08-07)
+
+## 8.4.0 (2024-07-24)
+
+## 8.3.0 (2024-07-10)
+
+## 8.2.0 (2024-06-26)
+
+## 8.1.0 (2024-06-15)
+
+### Bug Fixes
+
+-   Add ´@wordpress/html-entities´ package to the list of dependencies in package.json. ([#62313](https://github.com/WordPress/gutenberg/pull/62313))
+
+## 8.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 7.35.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 7.34.0 (2024-05-02)
+
+## 7.33.0 (2024-04-19)
+
+## 7.32.0 (2024-04-03)
+
+## 7.31.0 (2024-03-21)
+
+## 7.30.0 (2024-03-06)
+
+## 7.29.0 (2024-02-21)
+
+## 7.28.0 (2024-02-09)
+
+## 7.27.0 (2024-01-24)
+
+## 7.26.0 (2024-01-10)
+
+### Deprecations
+
+-   Move the panels visibility actions and selectors to the editor package deprecating `toggleEditorPanelEnabled`, `toggleEditorPanelOpened`, `removeEditorPanel`, `isEditorPanelRemoved`, `isEditorPanelOpened` and `isEditorPanelEnabled`.
+
+## 7.25.0 (2023-12-13)
+
 ## 7.24.0 (2023-11-29)
 
 ## 7.23.0 (2023-11-16)
@@ -58,7 +119,7 @@
 
 ## 6.19.0 (2022-11-16)
 
-### Enhancement
+### Enhancements
 
 -   ` BlockTypesChecklist`: Move BlockIcon component out of CheckboxControl label ([#45535](https://github.com/WordPress/gutenberg/pull/45535))
 
@@ -100,11 +161,11 @@
 
 ## 6.0.0 (2022-02-10)
 
-### Breaking Change
+### Breaking Changes
 
 -   The `GUTENBERG_PHASE` environment variable has been renamed to `IS_GUTENBERG_PLUGIN` and is now a boolean ([#38202](https://github.com/WordPress/gutenberg/pull/38202)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/api-fetch`, `@wordpress/primitives` and `uuid` dependencies ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -112,7 +173,7 @@
 
 ## 5.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -124,8 +185,8 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 
 ## 3.27.0 (2021-03-17)
 
@@ -147,23 +208,23 @@
 
 ## 3.6.0 (2019-08-05)
 
-### Refactor
+### Internal
 
 -   Create EditorInitializer component and implement for various things to initialize as the editor is loaded. This replaces the `__unstableInitialize` refactor done in #14740. ([#15444](https://github.com/WordPress/gutenberg/pull/15444))
 
 ## 3.4.0 (2019-05-21)
 
-### New Feature
+### New Features
 
 -   Implement the `addToGallery` option in the `MediaUpload` hook. The option allows users to open the media modal in the `gallery-library`instead of `gallery-edit` state.
 
-### Refactor
+### Internal
 
 -   convert `INIT` effect to controls & actions [#14740](https://github.com/WordPress/gutenberg/pull/14740)
 
 ## 3.2.0 (2019-03-06)
 
-### Polish
+### Internal
 
 -   Expose the `className` property to style the `PluginSidebar` component.
 
@@ -192,7 +253,7 @@
 
 ## 3.1.0 (2018-11-20)
 
-### New Feature
+### New Features
 
 -   The new `AdminNotices` component will transparently upgrade any `.notice` elements on the page to the equivalent `@wordpress/notices` module notice state.
 
@@ -202,7 +263,7 @@
 
 ## 3.0.0 (2018-11-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   `isEditorSidebarPanelOpened` selector (`core/edit-post`) has been removed. Please use `isEditorPanelEnabled` instead.
 -   `toggleGeneralSidebarEditorPanel` action (`core/edit-post`) has been removed. Please use `toggleEditorPanelOpened` instead.
@@ -233,7 +294,7 @@
 -   `getMetaBoxes` selector (`core/edit-post`) has been removed. Use `getActiveMetaBoxLocations` selector (`core/edit-post`) instead.
 -   `getMetaBox` selector (`core/edit-post`) has been removed. Use `isMetaBoxLocationActive` selector (`core/edit-post`) instead.
 
-### Polish
+### Internal
 
 -   Add the editor styles support's wrapper className.
 
diff --git a/packages/edit-post/README.md b/packages/edit-post/README.md
index ef96e0b16f3488..82b106daaf6b6c 100644
--- a/packages/edit-post/README.md
+++ b/packages/edit-post/README.md
@@ -41,436 +41,51 @@ _Parameters_
 
 ### PluginBlockSettingsMenuItem
 
-Renders a new item in the block settings menu.
-
-_Usage_
-
-```js
-// Using ES5 syntax
-var __ = wp.i18n.__;
-var PluginBlockSettingsMenuItem = wp.editPost.PluginBlockSettingsMenuItem;
-
-function doOnClick() {
-	// To be called when the user clicks the menu item.
-}
-
-function MyPluginBlockSettingsMenuItem() {
-	return React.createElement( PluginBlockSettingsMenuItem, {
-		allowedBlocks: [ 'core/paragraph' ],
-		icon: 'dashicon-name',
-		label: __( 'Menu item text' ),
-		onClick: doOnClick,
-	} );
-}
-```
-
-```jsx
-// Using ESNext syntax
-import { __ } from '@wordpress/i18n';
-import { PluginBlockSettingsMenuItem } from '@wordpress/edit-post';
-
-const doOnClick = () => {
-	// To be called when the user clicks the menu item.
-};
-
-const MyPluginBlockSettingsMenuItem = () => (
-	<PluginBlockSettingsMenuItem
-		allowedBlocks={ [ 'core/paragraph' ] }
-		icon="dashicon-name"
-		label={ __( 'Menu item text' ) }
-		onClick={ doOnClick }
-	/>
-);
-```
-
-_Parameters_
-
--   _props_ `Object`: Component props.
--   _props.allowedBlocks_ `[Array]`: An array containing a list of block names for which the item should be shown. If not present, it'll be rendered for any block. If multiple blocks are selected, it'll be shown if and only if all of them are in the allowed list.
--   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element.
--   _props.label_ `string`: The menu item text.
--   _props.onClick_ `Function`: Callback function to be executed when the user click the menu item.
--   _props.small_ `[boolean]`: Whether to render the label or not.
--   _props.role_ `[string]`: The ARIA role for the menu item.
-
-_Returns_
+_Related_
 
--   `Component`: The component to be rendered.
+-   PluginBlockSettingsMenuItem in @wordpress/editor package.
 
 ### PluginDocumentSettingPanel
 
-Renders items below the Status & Availability panel in the Document Sidebar.
-
-_Usage_
-
-```js
-// Using ES5 syntax
-var el = React.createElement;
-var __ = wp.i18n.__;
-var registerPlugin = wp.plugins.registerPlugin;
-var PluginDocumentSettingPanel = wp.editPost.PluginDocumentSettingPanel;
-
-function MyDocumentSettingPlugin() {
-	return el(
-		PluginDocumentSettingPanel,
-		{
-			className: 'my-document-setting-plugin',
-			title: 'My Panel',
-			name: 'my-panel',
-		},
-		__( 'My Document Setting Panel' )
-	);
-}
-
-registerPlugin( 'my-document-setting-plugin', {
-	render: MyDocumentSettingPlugin,
-} );
-```
-
-```jsx
-// Using ESNext syntax
-import { registerPlugin } from '@wordpress/plugins';
-import { PluginDocumentSettingPanel } from '@wordpress/edit-post';
-
-const MyDocumentSettingTest = () => (
-	<PluginDocumentSettingPanel
-		className="my-document-setting-plugin"
-		title="My Panel"
-		name="my-panel"
-	>
-		<p>My Document Setting Panel</p>
-	</PluginDocumentSettingPanel>
-);
-
-registerPlugin( 'document-setting-test', { render: MyDocumentSettingTest } );
-```
-
-_Parameters_
-
--   _props_ `Object`: Component properties.
--   _props.name_ `string`: Required. A machine-friendly name for the panel.
--   _props.className_ `[string]`: An optional class name added to the row.
--   _props.title_ `[string]`: The title of the panel
--   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
--   _props.children_ `Element`: Children to be rendered
-
-_Returns_
+_Related_
 
--   `Component`: The component to be rendered.
+-   PluginDocumentSettingPanel in @wordpress/editor package.
 
 ### PluginMoreMenuItem
 
-Renders a menu item in `Plugins` group in `More Menu` drop down, and can be used to as a button or link depending on the props provided. The text within the component appears as the menu item label.
-
-_Usage_
-
-```js
-// Using ES5 syntax
-var __ = wp.i18n.__;
-var PluginMoreMenuItem = wp.editPost.PluginMoreMenuItem;
-var moreIcon = React.createElement( 'svg' ); //... svg element.
-
-function onButtonClick() {
-	alert( 'Button clicked.' );
-}
-
-function MyButtonMoreMenuItem() {
-	return React.createElement(
-		PluginMoreMenuItem,
-		{
-			icon: moreIcon,
-			onClick: onButtonClick,
-		},
-		__( 'My button title' )
-	);
-}
-```
-
-```jsx
-// Using ESNext syntax
-import { __ } from '@wordpress/i18n';
-import { PluginMoreMenuItem } from '@wordpress/edit-post';
-import { more } from '@wordpress/icons';
-
-function onButtonClick() {
-	alert( 'Button clicked.' );
-}
-
-const MyButtonMoreMenuItem = () => (
-	<PluginMoreMenuItem icon={ more } onClick={ onButtonClick }>
-		{ __( 'My button title' ) }
-	</PluginMoreMenuItem>
-);
-```
-
-_Parameters_
-
--   _props_ `Object`: Component properties.
--   _props.href_ `[string]`: When `href` is provided then the menu item is represented as an anchor rather than button. It corresponds to the `href` attribute of the anchor.
--   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
--   _props.onClick_ `[Function]`: The callback function to be executed when the user clicks the menu item.
--   _props.other_ `[...*]`: Any additional props are passed through to the underlying [MenuItem](https://github.com/WordPress/gutenberg/tree/HEAD/packages/components/src/menu-item/README.md) component.
-
-_Returns_
+_Related_
 
--   `Component`: The component to be rendered.
+-   PluginMoreMenuItem in @wordpress/editor package.
 
 ### PluginPostPublishPanel
 
-Renders provided content to the post-publish panel in the publish flow (side panel that opens after a user publishes the post).
-
-_Usage_
-
-```js
-// Using ES5 syntax
-var __ = wp.i18n.__;
-var PluginPostPublishPanel = wp.editPost.PluginPostPublishPanel;
-
-function MyPluginPostPublishPanel() {
-	return React.createElement(
-		PluginPostPublishPanel,
-		{
-			className: 'my-plugin-post-publish-panel',
-			title: __( 'My panel title' ),
-			initialOpen: true,
-		},
-		__( 'My panel content' )
-	);
-}
-```
-
-```jsx
-// Using ESNext syntax
-import { __ } from '@wordpress/i18n';
-import { PluginPostPublishPanel } from '@wordpress/edit-post';
-
-const MyPluginPostPublishPanel = () => (
-	<PluginPostPublishPanel
-		className="my-plugin-post-publish-panel"
-		title={ __( 'My panel title' ) }
-		initialOpen={ true }
-	>
-		{ __( 'My panel content' ) }
-	</PluginPostPublishPanel>
-);
-```
-
-_Parameters_
-
--   _props_ `Object`: Component properties.
--   _props.className_ `[string]`: An optional class name added to the panel.
--   _props.title_ `[string]`: Title displayed at the top of the panel.
--   _props.initialOpen_ `[boolean]`: Whether to have the panel initially opened. When no title is provided it is always opened.
--   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
--   _props.children_ `Element`: Children to be rendered
-
-_Returns_
+_Related_
 
--   `Component`: The component to be rendered.
+-   PluginPostPublishPanel in @wordpress/editor package.
 
 ### PluginPostStatusInfo
 
-Renders a row in the Summary panel of the Document sidebar. It should be noted that this is named and implemented around the function it serves and not its location, which may change in future iterations.
-
-_Usage_
-
-```js
-// Using ES5 syntax
-var __ = wp.i18n.__;
-var PluginPostStatusInfo = wp.editPost.PluginPostStatusInfo;
-
-function MyPluginPostStatusInfo() {
-	return React.createElement(
-		PluginPostStatusInfo,
-		{
-			className: 'my-plugin-post-status-info',
-		},
-		__( 'My post status info' )
-	);
-}
-```
-
-```jsx
-// Using ESNext syntax
-import { __ } from '@wordpress/i18n';
-import { PluginPostStatusInfo } from '@wordpress/edit-post';
-
-const MyPluginPostStatusInfo = () => (
-	<PluginPostStatusInfo className="my-plugin-post-status-info">
-		{ __( 'My post status info' ) }
-	</PluginPostStatusInfo>
-);
-```
-
-_Parameters_
-
--   _props_ `Object`: Component properties.
--   _props.className_ `[string]`: An optional class name added to the row.
--   _props.children_ `Element`: Children to be rendered.
-
-_Returns_
+_Related_
 
--   `Component`: The component to be rendered.
+-   PluginPostStatusInfo in @wordpress/editor package.
 
 ### PluginPrePublishPanel
 
-Renders provided content to the pre-publish side panel in the publish flow (side panel that opens when a user first pushes "Publish" from the main editor).
-
-_Usage_
-
-```js
-// Using ES5 syntax
-var __ = wp.i18n.__;
-var PluginPrePublishPanel = wp.editPost.PluginPrePublishPanel;
-
-function MyPluginPrePublishPanel() {
-	return React.createElement(
-		PluginPrePublishPanel,
-		{
-			className: 'my-plugin-pre-publish-panel',
-			title: __( 'My panel title' ),
-			initialOpen: true,
-		},
-		__( 'My panel content' )
-	);
-}
-```
-
-```jsx
-// Using ESNext syntax
-import { __ } from '@wordpress/i18n';
-import { PluginPrePublishPanel } from '@wordpress/edit-post';
-
-const MyPluginPrePublishPanel = () => (
-	<PluginPrePublishPanel
-		className="my-plugin-pre-publish-panel"
-		title={ __( 'My panel title' ) }
-		initialOpen={ true }
-	>
-		{ __( 'My panel content' ) }
-	</PluginPrePublishPanel>
-);
-```
-
-_Parameters_
-
--   _props_ `Object`: Component props.
--   _props.className_ `[string]`: An optional class name added to the panel.
--   _props.title_ `[string]`: Title displayed at the top of the panel.
--   _props.initialOpen_ `[boolean]`: Whether to have the panel initially opened. When no title is provided it is always opened.
--   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
--   _props.children_ `Element`: Children to be rendered
-
-_Returns_
+_Related_
 
--   `Component`: The component to be rendered.
+-   PluginPrePublishPanel in @wordpress/editor package.
 
 ### PluginSidebar
 
-Renders a sidebar when activated. The contents within the `PluginSidebar` will appear as content within the sidebar. It also automatically renders a corresponding `PluginSidebarMenuItem` component when `isPinnable` flag is set to `true`. If you wish to display the sidebar, you can with use the `PluginSidebarMoreMenuItem` component or the `wp.data.dispatch` API:
-
-```js
-wp.data
-	.dispatch( 'core/edit-post' )
-	.openGeneralSidebar( 'plugin-name/sidebar-name' );
-```
-
 _Related_
 
--   PluginSidebarMoreMenuItem
-
-_Usage_
-
-```js
-// Using ES5 syntax
-var __ = wp.i18n.__;
-var el = React.createElement;
-var PanelBody = wp.components.PanelBody;
-var PluginSidebar = wp.editPost.PluginSidebar;
-var moreIcon = React.createElement( 'svg' ); //... svg element.
-
-function MyPluginSidebar() {
-	return el(
-		PluginSidebar,
-		{
-			name: 'my-sidebar',
-			title: 'My sidebar title',
-			icon: moreIcon,
-		},
-		el( PanelBody, {}, __( 'My sidebar content' ) )
-	);
-}
-```
-
-```jsx
-// Using ESNext syntax
-import { __ } from '@wordpress/i18n';
-import { PanelBody } from '@wordpress/components';
-import { PluginSidebar } from '@wordpress/edit-post';
-import { more } from '@wordpress/icons';
-
-const MyPluginSidebar = () => (
-	<PluginSidebar name="my-sidebar" title="My sidebar title" icon={ more }>
-		<PanelBody>{ __( 'My sidebar content' ) }</PanelBody>
-	</PluginSidebar>
-);
-```
-
-_Parameters_
-
--   _props_ `Object`: Element props.
--   _props.name_ `string`: A string identifying the sidebar. Must be unique for every sidebar registered within the scope of your plugin.
--   _props.className_ `[string]`: An optional class name added to the sidebar body.
--   _props.title_ `string`: Title displayed at the top of the sidebar.
--   _props.isPinnable_ `[boolean]`: Whether to allow to pin sidebar to the toolbar. When set to `true` it also automatically renders a corresponding menu item.
--   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
+-   PluginSidebar in @wordpress/editor package.
 
 ### PluginSidebarMoreMenuItem
 
-Renders a menu item in `Plugins` group in `More Menu` drop down, and can be used to activate the corresponding `PluginSidebar` component. The text within the component appears as the menu item label.
-
-_Usage_
-
-```js
-// Using ES5 syntax
-var __ = wp.i18n.__;
-var PluginSidebarMoreMenuItem = wp.editPost.PluginSidebarMoreMenuItem;
-var moreIcon = React.createElement( 'svg' ); //... svg element.
-
-function MySidebarMoreMenuItem() {
-	return React.createElement(
-		PluginSidebarMoreMenuItem,
-		{
-			target: 'my-sidebar',
-			icon: moreIcon,
-		},
-		__( 'My sidebar title' )
-	);
-}
-```
-
-```jsx
-// Using ESNext syntax
-import { __ } from '@wordpress/i18n';
-import { PluginSidebarMoreMenuItem } from '@wordpress/edit-post';
-import { more } from '@wordpress/icons';
-
-const MySidebarMoreMenuItem = () => (
-	<PluginSidebarMoreMenuItem target="my-sidebar" icon={ more }>
-		{ __( 'My sidebar title' ) }
-	</PluginSidebarMoreMenuItem>
-);
-```
-
-_Parameters_
-
--   _props_ `Object`: Component props.
--   _props.target_ `string`: A string identifying the target sidebar you wish to be activated by this menu item. Must be the same as the `name` prop you have given to that sidebar.
--   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
-
-_Returns_
+_Related_
 
--   `Component`: The component to be rendered.
+-   PluginSidebarMoreMenuItem in @wordpress/editor package.
 
 ### reinitializeEditor
 
diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
index 0bc4376cedec94..028520e79cad7a 100644
--- a/packages/edit-post/package.json
+++ b/packages/edit-post/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "7.24.0",
+	"version": "8.10.0",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,46 +20,45 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/block-library": "file:../block-library",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/commands": "file:../commands",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-commands": "file:../core-commands",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/editor": "file:../editor",
-		"@wordpress/element": "file:../element",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/interface": "file:../interface",
-		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/media-utils": "file:../media-utils",
-		"@wordpress/notices": "file:../notices",
-		"@wordpress/plugins": "file:../plugins",
-		"@wordpress/preferences": "file:../preferences",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/url": "file:../url",
-		"@wordpress/viewport": "file:../viewport",
-		"@wordpress/warning": "file:../warning",
-		"@wordpress/widgets": "file:../widgets",
-		"classnames": "^2.3.1",
-		"memize": "^2.1.0",
-		"rememo": "^4.0.2"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/block-library": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/commands": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-commands": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/editor": "*",
+		"@wordpress/element": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/keyboard-shortcuts": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/plugins": "*",
+		"@wordpress/preferences": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/url": "*",
+		"@wordpress/viewport": "*",
+		"@wordpress/warning": "*",
+		"@wordpress/widgets": "*",
+		"clsx": "^2.1.1",
+		"memize": "^2.1.0"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -67,5 +66,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/edit-post/src/classic.scss b/packages/edit-post/src/classic.scss
index 8cba8020e0b912..263315ab18f084 100644
--- a/packages/edit-post/src/classic.scss
+++ b/packages/edit-post/src/classic.scss
@@ -1,7 +1,8 @@
 // Provide baseline auto margin for centering blocks.
 // Specificity is kept at this level as many classic themes output
 // rules like figure { margin: 0; } which would break centering.
-.editor-styles-wrapper .wp-block {
+// These rules should also not apply to direct children of flex layout blocks.
+.editor-styles-wrapper :where(:not(.is-layout-flex, .is-layout-grid)) > .wp-block {
 	margin-left: auto;
 	margin-right: auto;
 }
diff --git a/packages/edit-post/src/commands/use-commands.js b/packages/edit-post/src/commands/use-commands.js
new file mode 100644
index 00000000000000..edd2a6a5b84042
--- /dev/null
+++ b/packages/edit-post/src/commands/use-commands.js
@@ -0,0 +1,48 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+import { fullscreen } from '@wordpress/icons';
+import { useCommand } from '@wordpress/commands';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { store as noticesStore } from '@wordpress/notices';
+
+export default function useCommands() {
+	const { isFullscreen } = useSelect( ( select ) => {
+		const { get } = select( preferencesStore );
+
+		return {
+			isFullscreen: get( 'core/edit-post', 'fullscreenMode' ),
+		};
+	}, [] );
+	const { toggle } = useDispatch( preferencesStore );
+	const { createInfoNotice } = useDispatch( noticesStore );
+
+	useCommand( {
+		name: 'core/toggle-fullscreen-mode',
+		label: isFullscreen
+			? __( 'Exit fullscreen' )
+			: __( 'Enter fullscreen' ),
+		icon: fullscreen,
+		callback: ( { close } ) => {
+			toggle( 'core/edit-post', 'fullscreenMode' );
+			close();
+			createInfoNotice(
+				isFullscreen ? __( 'Fullscreen off.' ) : __( 'Fullscreen on.' ),
+				{
+					id: 'core/edit-post/toggle-fullscreen-mode/notice',
+					type: 'snackbar',
+					actions: [
+						{
+							label: __( 'Undo' ),
+							onClick: () => {
+								toggle( 'core/edit-post', 'fullscreenMode' );
+							},
+						},
+					],
+				}
+			);
+		},
+	} );
+}
diff --git a/packages/edit-post/src/components/back-button/fullscreen-mode-close.js b/packages/edit-post/src/components/back-button/fullscreen-mode-close.js
new file mode 100644
index 00000000000000..ffb64a8ba07035
--- /dev/null
+++ b/packages/edit-post/src/components/back-button/fullscreen-mode-close.js
@@ -0,0 +1,106 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import {
+	Button,
+	Icon,
+	__unstableMotion as motion,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { addQueryArgs } from '@wordpress/url';
+import { wordpress } from '@wordpress/icons';
+import { store as editorStore } from '@wordpress/editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { useReducedMotion } from '@wordpress/compose';
+
+function FullscreenModeClose( { showTooltip, icon, href, initialPost } ) {
+	const { isRequestingSiteIcon, postType, siteIconUrl } = useSelect(
+		( select ) => {
+			const { getCurrentPostType } = select( editorStore );
+			const { getEntityRecord, getPostType, isResolving } =
+				select( coreStore );
+			const siteData =
+				getEntityRecord( 'root', '__unstableBase', undefined ) || {};
+			const _postType = initialPost?.type || getCurrentPostType();
+			return {
+				isRequestingSiteIcon: isResolving( 'getEntityRecord', [
+					'root',
+					'__unstableBase',
+					undefined,
+				] ),
+				postType: getPostType( _postType ),
+				siteIconUrl: siteData.site_icon_url,
+			};
+		},
+		[]
+	);
+
+	const disableMotion = useReducedMotion();
+
+	if ( ! postType ) {
+		return null;
+	}
+
+	let buttonIcon = <Icon size="36px" icon={ wordpress } />;
+
+	const effect = {
+		expand: {
+			scale: 1.25,
+			transition: { type: 'tween', duration: '0.3' },
+		},
+	};
+
+	if ( siteIconUrl ) {
+		buttonIcon = (
+			<motion.img
+				variants={ ! disableMotion && effect }
+				alt={ __( 'Site Icon' ) }
+				className="edit-post-fullscreen-mode-close_site-icon"
+				src={ siteIconUrl }
+			/>
+		);
+	}
+
+	if ( isRequestingSiteIcon ) {
+		buttonIcon = null;
+	}
+
+	// Override default icon if custom icon is provided via props.
+	if ( icon ) {
+		buttonIcon = <Icon size="36px" icon={ icon } />;
+	}
+
+	const classes = clsx( 'edit-post-fullscreen-mode-close', {
+		'has-icon': siteIconUrl,
+	} );
+
+	const buttonHref =
+		href ??
+		addQueryArgs( 'edit.php', {
+			post_type: postType.slug,
+		} );
+
+	const buttonLabel = postType?.labels?.view_items ?? __( 'Back' );
+
+	return (
+		<motion.div whileHover="expand">
+			<Button
+				__next40pxDefaultSize
+				className={ classes }
+				href={ buttonHref }
+				label={ buttonLabel }
+				showTooltip={ showTooltip }
+			>
+				{ buttonIcon }
+			</Button>
+		</motion.div>
+	);
+}
+
+export default FullscreenModeClose;
diff --git a/packages/edit-post/src/components/back-button/index.js b/packages/edit-post/src/components/back-button/index.js
new file mode 100644
index 00000000000000..04e1b205051767
--- /dev/null
+++ b/packages/edit-post/src/components/back-button/index.js
@@ -0,0 +1,41 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+import { __unstableMotion as motion } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import FullscreenModeClose from './fullscreen-mode-close';
+import { unlock } from '../../lock-unlock';
+
+const { BackButton: BackButtonFill } = unlock( editorPrivateApis );
+
+const slideX = {
+	hidden: { x: '-100%' },
+	distractionFreeInactive: { x: 0 },
+	hover: { x: 0, transition: { type: 'tween', delay: 0.2 } },
+};
+
+function BackButton( { initialPost } ) {
+	return (
+		<BackButtonFill>
+			{ ( { length } ) =>
+				length <= 1 && (
+					<motion.div
+						variants={ slideX }
+						transition={ { type: 'tween', delay: 0.8 } }
+					>
+						<FullscreenModeClose
+							showTooltip
+							initialPost={ initialPost }
+						/>
+					</motion.div>
+				)
+			}
+		</BackButtonFill>
+	);
+}
+
+export default BackButton;
diff --git a/packages/edit-post/src/components/back-button/style.scss b/packages/edit-post/src/components/back-button/style.scss
new file mode 100644
index 00000000000000..aced752bfedfae
--- /dev/null
+++ b/packages/edit-post/src/components/back-button/style.scss
@@ -0,0 +1,77 @@
+// Developer notes: these rules are duplicated for the site editor.
+// They need to be updated in both places.
+
+.edit-post-fullscreen-mode-close.components-button {
+	@include break-medium() {
+		display: flex;
+		align-items: center;
+		align-self: stretch;
+		border: none;
+		background: $gray-900;
+		color: $white;
+		border-radius: 0;
+		height: $header-height;
+		width: $header-height;
+		position: relative;
+
+		&:active {
+			color: $white;
+		}
+
+		&:focus {
+			box-shadow: none;
+		}
+
+		&::before {
+			transition: box-shadow 0.1s ease;
+			@include reduce-motion("transition");
+			content: "";
+			display: block;
+			position: absolute;
+			top: 9px;
+			right: 9px;
+			bottom: 9px + $border-width; // Height of toolbar in edit-post (not edit-site) is 61px tall.
+			left: 9px;
+			border-radius: $radius-small + $border-width + $border-width;
+			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $gray-900;
+		}
+
+		// Hover color.
+		&:hover::before {
+			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $gray-700;
+		}
+
+		&.has-icon:hover::before {
+			box-shadow: none;
+		}
+
+		// Lightened spot color focus.
+		&:focus::before {
+			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) rgba($white, 0.1), inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+		}
+	}
+
+	.edit-post-fullscreen-mode-close_site-icon {
+		width: $button-size;
+		height: $button-size;
+		border-radius: $radius-small;
+		object-fit: cover;
+		// Compensate for the top-bar border.
+		margin-top: -($border-width);
+	}
+}
+
+/**
+ *  Show icon label overrides.
+ */
+.show-icon-labels .editor-header {
+	.edit-post-fullscreen-mode-close.has-icon {
+		width: $header-height;
+		svg {
+			display: block;
+		}
+		&::after {
+			content: none;
+		}
+	}
+}
diff --git a/packages/edit-post/src/components/back-button/test/__snapshots__/fullscreen-mode-close.js.snap b/packages/edit-post/src/components/back-button/test/__snapshots__/fullscreen-mode-close.js.snap
new file mode 100644
index 00000000000000..4f6d298952e70a
--- /dev/null
+++ b/packages/edit-post/src/components/back-button/test/__snapshots__/fullscreen-mode-close.js.snap
@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`FullscreenModeClose when in full screen mode should display a default site icon if no user uploaded site icon exists 1`] = `
+<div>
+  <div>
+    <a
+      aria-label="Back"
+      class="components-button edit-post-fullscreen-mode-close is-next-40px-default-size"
+      href="edit.php?"
+    >
+      <svg
+        aria-hidden="true"
+        focusable="false"
+        height="36px"
+        viewBox="-2 -2 24 24"
+        width="36px"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M20 10c0-5.51-4.49-10-10-10C4.48 0 0 4.49 0 10c0 5.52 4.48 10 10 10 5.51 0 10-4.48 10-10zM7.78 15.37L4.37 6.22c.55-.02 1.17-.08 1.17-.08.5-.06.44-1.13-.06-1.11 0 0-1.45.11-2.37.11-.18 0-.37 0-.58-.01C4.12 2.69 6.87 1.11 10 1.11c2.33 0 4.45.87 6.05 2.34-.68-.11-1.65.39-1.65 1.58 0 .74.45 1.36.9 2.1.35.61.55 1.36.55 2.46 0 1.49-1.4 5-1.4 5l-3.03-8.37c.54-.02.82-.17.82-.17.5-.05.44-1.25-.06-1.22 0 0-1.44.12-2.38.12-.87 0-2.33-.12-2.33-.12-.5-.03-.56 1.2-.06 1.22l.92.08 1.26 3.41zM17.41 10c.24-.64.74-1.87.43-4.25.7 1.29 1.05 2.71 1.05 4.25 0 3.29-1.73 6.24-4.4 7.78.97-2.59 1.94-5.2 2.92-7.78zM6.1 18.09C3.12 16.65 1.11 13.53 1.11 10c0-1.3.23-2.48.72-3.59C3.25 10.3 4.67 14.2 6.1 18.09zm4.03-6.63l2.58 6.98c-.86.29-1.76.45-2.71.45-.79 0-1.57-.11-2.29-.33.81-2.38 1.62-4.74 2.42-7.1z"
+        />
+      </svg>
+    </a>
+  </div>
+</div>
+`;
diff --git a/packages/edit-post/src/components/back-button/test/fullscreen-mode-close.js b/packages/edit-post/src/components/back-button/test/fullscreen-mode-close.js
new file mode 100644
index 00000000000000..4a549370d0f056
--- /dev/null
+++ b/packages/edit-post/src/components/back-button/test/fullscreen-mode-close.js
@@ -0,0 +1,94 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import FullscreenModeClose from '../fullscreen-mode-close';
+
+jest.mock( '@wordpress/data/src/components/use-select', () => {
+	// This allows us to tweak the returned value on each test.
+	return jest.fn();
+} );
+
+jest.mock( '@wordpress/core-data' );
+
+describe( 'FullscreenModeClose', () => {
+	describe( 'when in full screen mode', () => {
+		it( 'should display a user uploaded site icon if it exists', () => {
+			useSelect.mockImplementation( ( cb ) => {
+				return cb( () => ( {
+					isResolving: () => false,
+					isFeatureActive: () => true,
+					getPostType: () => true,
+					getEntityRecord: () => ( {
+						site_icon_url: 'https://fakeUrl.com',
+					} ),
+					getCurrentPostType: () => 'post',
+				} ) );
+			} );
+
+			render( <FullscreenModeClose /> );
+			const siteIcon = screen.getByAltText( 'Site Icon' );
+
+			expect( siteIcon ).toBeVisible();
+		} );
+
+		it( 'should display a default site icon if no user uploaded site icon exists', () => {
+			useSelect.mockImplementation( ( cb ) => {
+				return cb( () => ( {
+					isResolving: () => false,
+					isFeatureActive: () => true,
+					getPostType: () => true,
+					getEntityRecord: () => ( {
+						site_icon_url: '',
+					} ),
+					getCurrentPostType: () => 'post',
+				} ) );
+			} );
+
+			const { container } = render( <FullscreenModeClose /> );
+
+			expect(
+				screen.queryByAltText( 'Site Icon' )
+			).not.toBeInTheDocument();
+
+			expect( container ).toMatchSnapshot();
+		} );
+
+		it( 'should add correct href using post type from initialPost props', () => {
+			useSelect.mockImplementation( ( cb ) => {
+				return cb( () => ( {
+					isResolving: () => false,
+					isFeatureActive: () => true,
+					getPostType: () => {
+						return {
+							slug: 'page',
+							labels: {
+								view_items: 'View Pages',
+							},
+						};
+					},
+					getEntityRecord: () => ( {
+						site_icon_url: '',
+					} ),
+					getCurrentPostType: () => 'post',
+				} ) );
+			} );
+
+			render( <FullscreenModeClose initialPost={ { type: 'page' } } /> );
+
+			const button = screen.getByLabelText( 'View Pages' );
+			expect( button.href ).toBe(
+				'http://localhost/edit.php?post_type=page'
+			);
+		} );
+	} );
+} );
diff --git a/packages/edit-post/src/components/block-manager/category.js b/packages/edit-post/src/components/block-manager/category.js
deleted file mode 100644
index 6a64563366d633..00000000000000
--- a/packages/edit-post/src/components/block-manager/category.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useMemo, useCallback } from '@wordpress/element';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { useInstanceId } from '@wordpress/compose';
-import { CheckboxControl } from '@wordpress/components';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import BlockTypesChecklist from './checklist';
-import { store as editPostStore } from '../../store';
-
-function BlockManagerCategory( { title, blockTypes } ) {
-	const instanceId = useInstanceId( BlockManagerCategory );
-	const { defaultAllowedBlockTypes, hiddenBlockTypes } = useSelect(
-		( select ) => {
-			const { getEditorSettings } = select( editorStore );
-			const { getHiddenBlockTypes } = select( editPostStore );
-			return {
-				defaultAllowedBlockTypes:
-					getEditorSettings().defaultAllowedBlockTypes,
-				hiddenBlockTypes: getHiddenBlockTypes(),
-			};
-		},
-		[]
-	);
-	const filteredBlockTypes = useMemo( () => {
-		if ( defaultAllowedBlockTypes === true ) {
-			return blockTypes;
-		}
-		return blockTypes.filter( ( { name } ) => {
-			return defaultAllowedBlockTypes?.includes( name );
-		} );
-	}, [ defaultAllowedBlockTypes, blockTypes ] );
-	const { showBlockTypes, hideBlockTypes } = useDispatch( editPostStore );
-	const toggleVisible = useCallback( ( blockName, nextIsChecked ) => {
-		if ( nextIsChecked ) {
-			showBlockTypes( blockName );
-		} else {
-			hideBlockTypes( blockName );
-		}
-	}, [] );
-	const toggleAllVisible = useCallback(
-		( nextIsChecked ) => {
-			const blockNames = blockTypes.map( ( { name } ) => name );
-			if ( nextIsChecked ) {
-				showBlockTypes( blockNames );
-			} else {
-				hideBlockTypes( blockNames );
-			}
-		},
-		[ blockTypes ]
-	);
-
-	if ( ! filteredBlockTypes.length ) {
-		return null;
-	}
-
-	const checkedBlockNames = filteredBlockTypes
-		.map( ( { name } ) => name )
-		.filter( ( type ) => ! hiddenBlockTypes.includes( type ) );
-
-	const titleId = 'edit-post-block-manager__category-title-' + instanceId;
-
-	const isAllChecked = checkedBlockNames.length === filteredBlockTypes.length;
-	const isIndeterminate = ! isAllChecked && checkedBlockNames.length > 0;
-
-	return (
-		<div
-			role="group"
-			aria-labelledby={ titleId }
-			className="edit-post-block-manager__category"
-		>
-			<CheckboxControl
-				__nextHasNoMarginBottom
-				checked={ isAllChecked }
-				onChange={ toggleAllVisible }
-				className="edit-post-block-manager__category-title"
-				indeterminate={ isIndeterminate }
-				label={ <span id={ titleId }>{ title }</span> }
-			/>
-			<BlockTypesChecklist
-				blockTypes={ filteredBlockTypes }
-				value={ checkedBlockNames }
-				onItemChange={ toggleVisible }
-			/>
-		</div>
-	);
-}
-
-export default BlockManagerCategory;
diff --git a/packages/edit-post/src/components/block-manager/index.js b/packages/edit-post/src/components/block-manager/index.js
deleted file mode 100644
index 685c274f03a846..00000000000000
--- a/packages/edit-post/src/components/block-manager/index.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { store as blocksStore } from '@wordpress/blocks';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { SearchControl, Button } from '@wordpress/components';
-import { __, _n, sprintf } from '@wordpress/i18n';
-import { useEffect, useState } from '@wordpress/element';
-import { useDebounce, compose } from '@wordpress/compose';
-import { speak } from '@wordpress/a11y';
-
-/**
- * Internal dependencies
- */
-import BlockManagerCategory from './category';
-import { store as editPostStore } from '../../store';
-
-function BlockManager( {
-	blockTypes,
-	categories,
-	hasBlockSupport,
-	isMatchingSearchTerm,
-	numberOfHiddenBlocks,
-	enableAllBlockTypes,
-} ) {
-	const debouncedSpeak = useDebounce( speak, 500 );
-	const [ search, setSearch ] = useState( '' );
-
-	// Filtering occurs here (as opposed to `withSelect`) to avoid
-	// wasted renders by consequence of `Array#filter` producing
-	// a new value reference on each call.
-	blockTypes = blockTypes.filter(
-		( blockType ) =>
-			hasBlockSupport( blockType, 'inserter', true ) &&
-			( ! search || isMatchingSearchTerm( blockType, search ) ) &&
-			( ! blockType.parent ||
-				blockType.parent.includes( 'core/post-content' ) )
-	);
-
-	// Announce search results on change
-	useEffect( () => {
-		if ( ! search ) {
-			return;
-		}
-		const count = blockTypes.length;
-		const resultsFoundMessage = sprintf(
-			/* translators: %d: number of results. */
-			_n( '%d result found.', '%d results found.', count ),
-			count
-		);
-		debouncedSpeak( resultsFoundMessage );
-	}, [ blockTypes.length, search, debouncedSpeak ] );
-
-	return (
-		<div className="edit-post-block-manager__content">
-			{ !! numberOfHiddenBlocks && (
-				<div className="edit-post-block-manager__disabled-blocks-count">
-					{ sprintf(
-						/* translators: %d: number of blocks. */
-						_n(
-							'%d block is hidden.',
-							'%d blocks are hidden.',
-							numberOfHiddenBlocks
-						),
-						numberOfHiddenBlocks
-					) }
-					<Button
-						variant="link"
-						onClick={ () => enableAllBlockTypes( blockTypes ) }
-					>
-						{ __( 'Reset' ) }
-					</Button>
-				</div>
-			) }
-			<SearchControl
-				__nextHasNoMarginBottom
-				label={ __( 'Search for a block' ) }
-				placeholder={ __( 'Search for a block' ) }
-				value={ search }
-				onChange={ ( nextSearch ) => setSearch( nextSearch ) }
-				className="edit-post-block-manager__search"
-			/>
-			<div
-				tabIndex="0"
-				role="region"
-				aria-label={ __( 'Available block types' ) }
-				className="edit-post-block-manager__results"
-			>
-				{ blockTypes.length === 0 && (
-					<p className="edit-post-block-manager__no-results">
-						{ __( 'No blocks found.' ) }
-					</p>
-				) }
-				{ categories.map( ( category ) => (
-					<BlockManagerCategory
-						key={ category.slug }
-						title={ category.title }
-						blockTypes={ blockTypes.filter(
-							( blockType ) =>
-								blockType.category === category.slug
-						) }
-					/>
-				) ) }
-				<BlockManagerCategory
-					title={ __( 'Uncategorized' ) }
-					blockTypes={ blockTypes.filter(
-						( { category } ) => ! category
-					) }
-				/>
-			</div>
-		</div>
-	);
-}
-
-export default compose( [
-	withSelect( ( select ) => {
-		const {
-			getBlockTypes,
-			getCategories,
-			hasBlockSupport,
-			isMatchingSearchTerm,
-		} = select( blocksStore );
-		const { getHiddenBlockTypes } = select( editPostStore );
-
-		// Some hidden blocks become unregistered
-		// by removing for instance the plugin that registered them, yet
-		// they're still remain as hidden by the user's action.
-		// We consider "hidden", blocks which were hidden and
-		// are still registered.
-		const blockTypes = getBlockTypes();
-		const hiddenBlockTypes = getHiddenBlockTypes().filter(
-			( hiddenBlock ) => {
-				return blockTypes.some(
-					( registeredBlock ) => registeredBlock.name === hiddenBlock
-				);
-			}
-		);
-		const numberOfHiddenBlocks =
-			Array.isArray( hiddenBlockTypes ) && hiddenBlockTypes.length;
-
-		return {
-			blockTypes,
-			categories: getCategories(),
-			hasBlockSupport,
-			isMatchingSearchTerm,
-			numberOfHiddenBlocks,
-		};
-	} ),
-	withDispatch( ( dispatch ) => {
-		const { showBlockTypes } = dispatch( editPostStore );
-		return {
-			enableAllBlockTypes: ( blockTypes ) => {
-				const blockNames = blockTypes.map( ( { name } ) => name );
-				showBlockTypes( blockNames );
-			},
-		};
-	} ),
-] )( BlockManager );
diff --git a/packages/edit-post/src/components/block-manager/style.scss b/packages/edit-post/src/components/block-manager/style.scss
deleted file mode 100644
index e1b92c7c4da430..00000000000000
--- a/packages/edit-post/src/components/block-manager/style.scss
+++ /dev/null
@@ -1,82 +0,0 @@
-.edit-post-block-manager__no-results {
-	font-style: italic;
-	padding: $grid-unit-30 0;
-	text-align: center;
-}
-
-.edit-post-block-manager__search {
-	margin: $grid-unit-20 0;
-}
-
-.edit-post-block-manager__disabled-blocks-count {
-	border: 1px solid $gray-300;
-	border-width: 1px 0;
-	// Cover up horizontal areas off the sides of the box rectangle
-	box-shadow: -$grid-unit-40 0 0 0 $white, $grid-unit-40 0 0 0 $white;
-	padding: $grid-unit-10;
-	background-color: $white;
-	text-align: center;
-	position: sticky;
-	// When sticking, tuck the top border beneath the modal header border
-	top: ($grid-unit-05 + 1) * -1;
-	z-index: z-index(".edit-post-block-manager__disabled-blocks-count");
-
-	// Stick the category titles to the bottom
-	~ .edit-post-block-manager__results .edit-post-block-manager__category-title {
-		top: $grid-unit-40 - 1;
-	}
-	.is-link {
-		margin-left: 12px;
-	}
-}
-
-.edit-post-block-manager__category {
-	margin: 0 0 $grid-unit-30 0;
-}
-
-.edit-post-block-manager__category-title {
-	position: sticky;
-	top: - $grid-unit-05; // Offsets the top padding on the modal content container
-	padding: $grid-unit-20 0;
-	background-color: $white;
-	z-index: z-index(".edit-post-block-manager__category-title");
-
-	.components-checkbox-control__label {
-		font-weight: 600;
-	}
-}
-
-.edit-post-block-manager__checklist {
-	margin-top: 0;
-}
-
-.edit-post-block-manager__category-title,
-.edit-post-block-manager__checklist-item {
-	border-bottom: 1px solid $gray-300;
-}
-
-.edit-post-block-manager__checklist-item {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-bottom: 0;
-	padding: $grid-unit-10 0 $grid-unit-10 $grid-unit-20;
-
-	.components-modal__content &.components-checkbox-control__input-container {
-		margin: 0 $grid-unit-10;
-	}
-
-	.block-editor-block-icon {
-		margin-right: 10px;
-		fill: $gray-900;
-	}
-}
-
-.edit-post-block-manager__results {
-	border-top: $border-width solid $gray-300;
-}
-
-// Remove the top border from results when adjacent to the disabled block count
-.edit-post-block-manager__disabled-blocks-count + .edit-post-block-manager__results {
-	border-top-width: 0;
-}
diff --git a/packages/edit-post/src/components/browser-url/index.js b/packages/edit-post/src/components/browser-url/index.js
index 798753cfea357a..12292cb8447217 100644
--- a/packages/edit-post/src/components/browser-url/index.js
+++ b/packages/edit-post/src/components/browser-url/index.js
@@ -17,22 +17,6 @@ export function getPostEditURL( postId ) {
 	return addQueryArgs( 'post.php', { post: postId, action: 'edit' } );
 }
 
-/**
- * Returns the Post's Trashed URL.
- *
- * @param {number} postId   Post ID.
- * @param {string} postType Post Type.
- *
- * @return {string} Post trashed URL.
- */
-export function getPostTrashedURL( postId, postType ) {
-	return addQueryArgs( 'edit.php', {
-		trashed: 1,
-		post_type: postType,
-		ids: postId,
-	} );
-}
-
 export class BrowserURL extends Component {
 	constructor() {
 		super( ...arguments );
@@ -43,35 +27,19 @@ export class BrowserURL extends Component {
 	}
 
 	componentDidUpdate( prevProps ) {
-		const { postId, postStatus, postType, isSavingPost } = this.props;
+		const { postId, postStatus, hasHistory } = this.props;
 		const { historyId } = this.state;
 
-		// Posts are still dirty while saving so wait for saving to finish
-		// to avoid the unsaved changes warning when trashing posts.
-		if ( postStatus === 'trash' && ! isSavingPost ) {
-			this.setTrashURL( postId, postType );
-			return;
-		}
-
 		if (
 			( postId !== prevProps.postId || postId !== historyId ) &&
 			postStatus !== 'auto-draft' &&
-			postId
+			postId &&
+			! hasHistory
 		) {
 			this.setBrowserURL( postId );
 		}
 	}
 
-	/**
-	 * Navigates the browser to the post trashed URL to show a notice about the trashed post.
-	 *
-	 * @param {number} postId   Post ID.
-	 * @param {string} postType Post Type.
-	 */
-	setTrashURL( postId, postType ) {
-		window.location.href = getPostTrashedURL( postId, postType );
-	}
-
 	/**
 	 * Replaces the browser URL with a post editor link for the given post ID.
 	 *
@@ -99,7 +67,7 @@ export class BrowserURL extends Component {
 }
 
 export default withSelect( ( select ) => {
-	const { getCurrentPost, isSavingPost } = select( editorStore );
+	const { getCurrentPost } = select( editorStore );
 	const post = getCurrentPost();
 	let { id, status, type } = post;
 	const isTemplate = [ 'wp_template', 'wp_template_part' ].includes( type );
@@ -110,7 +78,5 @@ export default withSelect( ( select ) => {
 	return {
 		postId: id,
 		postStatus: status,
-		postType: type,
-		isSavingPost: isSavingPost(),
 	};
 } )( BrowserURL );
diff --git a/packages/edit-post/src/components/browser-url/test/index.js b/packages/edit-post/src/components/browser-url/test/index.js
index d4b09fc29d7eff..01522680419fe2 100644
--- a/packages/edit-post/src/components/browser-url/test/index.js
+++ b/packages/edit-post/src/components/browser-url/test/index.js
@@ -6,7 +6,7 @@ import { render } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import { getPostEditURL, getPostTrashedURL, BrowserURL } from '../';
+import { getPostEditURL, BrowserURL } from '../';
 
 describe( 'getPostEditURL', () => {
 	it( 'should generate relative path with post and action arguments', () => {
@@ -16,14 +16,6 @@ describe( 'getPostEditURL', () => {
 	} );
 } );
 
-describe( 'getPostTrashedURL', () => {
-	it( 'should generate relative path with post and action arguments', () => {
-		const url = getPostTrashedURL( 1, 'page' );
-
-		expect( url ).toBe( 'edit.php?trashed=1&post_type=page&ids=1' );
-	} );
-} );
-
 describe( 'BrowserURL', () => {
 	let replaceStateSpy;
 
diff --git a/packages/edit-post/src/components/device-preview/index.js b/packages/edit-post/src/components/device-preview/index.js
deleted file mode 100644
index a10688d1850237..00000000000000
--- a/packages/edit-post/src/components/device-preview/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Icon, MenuGroup } from '@wordpress/components';
-import { PostPreviewButton, store as editorStore } from '@wordpress/editor';
-import { external } from '@wordpress/icons';
-import { __ } from '@wordpress/i18n';
-import { __experimentalPreviewOptions as PreviewOptions } from '@wordpress/block-editor';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-
-export default function DevicePreview() {
-	const {
-		hasActiveMetaboxes,
-		isPostSaveable,
-		isViewable,
-		deviceType,
-		showIconLabels,
-	} = useSelect( ( select ) => {
-		const { getEditedPostAttribute } = select( editorStore );
-		const { getPostType } = select( coreStore );
-		const postType = getPostType( getEditedPostAttribute( 'type' ) );
-
-		return {
-			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
-			isPostSaveable: select( editorStore ).isEditedPostSaveable(),
-			isViewable: postType?.viewable ?? false,
-			deviceType:
-				select( editPostStore ).__experimentalGetPreviewDeviceType(),
-			showIconLabels:
-				select( editPostStore ).isFeatureActive( 'showIconLabels' ),
-		};
-	}, [] );
-	const { __experimentalSetPreviewDeviceType: setPreviewDeviceType } =
-		useDispatch( editPostStore );
-
-	return (
-		<PreviewOptions
-			isEnabled={ isPostSaveable }
-			className="edit-post-post-preview-dropdown"
-			deviceType={ deviceType }
-			setDeviceType={ setPreviewDeviceType }
-			label={ __( 'Preview' ) }
-			showIconLabels={ showIconLabels }
-		>
-			{ ( { onClose } ) =>
-				isViewable && (
-					<MenuGroup>
-						<div className="edit-post-header-preview__grouping-external">
-							<PostPreviewButton
-								className="edit-post-header-preview__button-external"
-								role="menuitem"
-								forceIsAutosaveable={ hasActiveMetaboxes }
-								textContent={
-									<>
-										{ __( 'Preview in new tab' ) }
-										<Icon icon={ external } />
-									</>
-								}
-								onPreview={ onClose }
-							/>
-						</div>
-					</MenuGroup>
-				)
-			}
-		</PreviewOptions>
-	);
-}
diff --git a/packages/edit-post/src/components/editor-initialization/index.js b/packages/edit-post/src/components/editor-initialization/index.js
index 0ba9cc863f473f..b240ca245827c9 100644
--- a/packages/edit-post/src/components/editor-initialization/index.js
+++ b/packages/edit-post/src/components/editor-initialization/index.js
@@ -1,20 +1,15 @@
 /**
  * Internal dependencies
  */
-import {
-	useBlockSelectionListener,
-	useUpdatePostLinkListener,
-} from './listener-hooks';
+import { useUpdatePostLinkListener } from './listener-hooks';
 
 /**
  * Data component used for initializing the editor and re-initializes
  * when postId changes or on unmount.
  *
- * @param {number} postId The id of the post.
  * @return {null} This is a data component so does not render any ui.
  */
-export default function EditorInitialization( { postId } ) {
-	useBlockSelectionListener( postId );
-	useUpdatePostLinkListener( postId );
+export default function EditorInitialization() {
+	useUpdatePostLinkListener();
 	return null;
 }
diff --git a/packages/edit-post/src/components/editor-initialization/listener-hooks.js b/packages/edit-post/src/components/editor-initialization/listener-hooks.js
index 57f5f67721ba72..968031d59adbc3 100644
--- a/packages/edit-post/src/components/editor-initialization/listener-hooks.js
+++ b/packages/edit-post/src/components/editor-initialization/listener-hooks.js
@@ -1,75 +1,41 @@
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { useEffect, useRef } from '@wordpress/element';
-import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as editorStore } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
 import {
-	STORE_NAME,
 	VIEW_AS_LINK_SELECTOR,
 	VIEW_AS_PREVIEW_LINK_SELECTOR,
 } from '../../store/constants';
 
-/**
- * This listener hook monitors for block selection and triggers the appropriate
- * sidebar state.
- *
- * @param {number} postId The current post id.
- */
-export const useBlockSelectionListener = ( postId ) => {
-	const { hasBlockSelection, isEditorSidebarOpened } = useSelect(
-		( select ) => ( {
-			hasBlockSelection:
-				!! select( blockEditorStore ).getBlockSelectionStart(),
-			isEditorSidebarOpened: select( STORE_NAME ).isEditorSidebarOpened(),
-		} ),
-		[ postId ]
-	);
-
-	const { openGeneralSidebar } = useDispatch( STORE_NAME );
-
-	useEffect( () => {
-		if ( ! isEditorSidebarOpened ) {
-			return;
-		}
-		if ( hasBlockSelection ) {
-			openGeneralSidebar( 'edit-post/block' );
-		} else {
-			openGeneralSidebar( 'edit-post/document' );
-		}
-	}, [ hasBlockSelection, isEditorSidebarOpened ] );
-};
-
 /**
  * This listener hook monitors any change in permalink and updates the view
  * post link in the admin bar.
- *
- * @param {number} postId
  */
-export const useUpdatePostLinkListener = ( postId ) => {
+export const useUpdatePostLinkListener = () => {
 	const { newPermalink } = useSelect(
 		( select ) => ( {
 			newPermalink: select( editorStore ).getCurrentPost().link,
 		} ),
-		[ postId ]
+		[]
 	);
-	const nodeToUpdate = useRef();
+	const nodeToUpdateRef = useRef();
 
 	useEffect( () => {
-		nodeToUpdate.current =
+		nodeToUpdateRef.current =
 			document.querySelector( VIEW_AS_PREVIEW_LINK_SELECTOR ) ||
 			document.querySelector( VIEW_AS_LINK_SELECTOR );
-	}, [ postId ] );
+	}, [] );
 
 	useEffect( () => {
-		if ( ! newPermalink || ! nodeToUpdate.current ) {
+		if ( ! newPermalink || ! nodeToUpdateRef.current ) {
 			return;
 		}
-		nodeToUpdate.current.setAttribute( 'href', newPermalink );
+		nodeToUpdateRef.current.setAttribute( 'href', newPermalink );
 	}, [ newPermalink ] );
 };
diff --git a/packages/edit-post/src/components/editor-initialization/test/listener-hooks.js b/packages/edit-post/src/components/editor-initialization/test/listener-hooks.js
index c263d993982978..21b7a045a0dd53 100644
--- a/packages/edit-post/src/components/editor-initialization/test/listener-hooks.js
+++ b/packages/edit-post/src/components/editor-initialization/test/listener-hooks.js
@@ -11,10 +11,7 @@ import { RegistryProvider, createRegistry } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import {
-	useBlockSelectionListener,
-	useUpdatePostLinkListener,
-} from '../listener-hooks';
+import { useUpdatePostLinkListener } from '../listener-hooks';
 import { STORE_NAME } from '../../../store/constants';
 
 describe( 'listener hook tests', () => {
@@ -44,6 +41,12 @@ describe( 'listener hook tests', () => {
 				isViewportMatch: jest.fn(),
 			},
 		},
+		'core/preferences': {
+			...storeConfig,
+			selectors: {
+				get: jest.fn(),
+			},
+		},
 		[ STORE_NAME ]: {
 			...storeConfig,
 			actions: {
@@ -65,10 +68,6 @@ describe( 'listener hook tests', () => {
 	const setMockReturnValue = ( store, functionName, value ) => {
 		mockStores[ store ].selectors[ functionName ].mockReturnValue( value );
 	};
-	const getSpyedFunction = ( store, functionName ) =>
-		mockStores[ store ].selectors[ functionName ];
-	const getSpyedAction = ( store, actionName ) =>
-		mockStores[ store ].actions[ actionName ];
 
 	afterEach( () => {
 		Object.values( mockStores ).forEach( ( storeMocks ) => {
@@ -80,71 +79,17 @@ describe( 'listener hook tests', () => {
 			} );
 		} );
 	} );
-	describe( 'useBlockSelectionListener', () => {
-		const registry = createRegistry( mockStores );
-		const TestComponent = ( { postId } ) => {
-			useBlockSelectionListener( postId );
-			return null;
-		};
-		const TestedOutput = () => {
-			return (
-				<RegistryProvider value={ registry }>
-					<TestComponent postId={ 10 } />
-				</RegistryProvider>
-			);
-		};
-
-		it( 'does nothing when editor sidebar is not open', () => {
-			setMockReturnValue( STORE_NAME, 'isEditorSidebarOpened', false );
-			render( <TestedOutput /> );
-
-			expect(
-				getSpyedFunction( STORE_NAME, 'isEditorSidebarOpened' )
-			).toHaveBeenCalled();
-			expect(
-				getSpyedAction( STORE_NAME, 'openGeneralSidebar' )
-			).not.toHaveBeenCalled();
-		} );
-		it( 'opens block sidebar if block is selected', () => {
-			setMockReturnValue( STORE_NAME, 'isEditorSidebarOpened', true );
-			setMockReturnValue(
-				'core/block-editor',
-				'getBlockSelectionStart',
-				true
-			);
-
-			render( <TestedOutput /> );
-
-			expect(
-				getSpyedAction( STORE_NAME, 'openGeneralSidebar' )
-			).toHaveBeenCalledWith( 'edit-post/block' );
-		} );
-		it( 'opens document sidebar if block is not selected', () => {
-			setMockReturnValue( STORE_NAME, 'isEditorSidebarOpened', true );
-			setMockReturnValue(
-				'core/block-editor',
-				'getBlockSelectionStart',
-				false
-			);
-
-			render( <TestedOutput /> );
-
-			expect(
-				getSpyedAction( STORE_NAME, 'openGeneralSidebar' )
-			).toHaveBeenCalledWith( 'edit-post/document' );
-		} );
-	} );
 
 	describe( 'useUpdatePostLinkListener', () => {
 		const registry = createRegistry( mockStores );
-		const TestComponent = ( { postId } ) => {
-			useUpdatePostLinkListener( postId );
+		const TestComponent = () => {
+			useUpdatePostLinkListener();
 			return null;
 		};
-		const TestedOutput = ( { postId = 10 } ) => {
+		const TestedOutput = () => {
 			return (
 				<RegistryProvider value={ registry }>
-					<TestComponent postId={ postId } />
+					<TestComponent />
 				</RegistryProvider>
 			);
 		};
@@ -182,7 +127,7 @@ describe( 'listener hook tests', () => {
 			} );
 			const { rerender } = render( <TestedOutput /> );
 
-			rerender( <TestedOutput id={ 20 } /> );
+			rerender( <TestedOutput /> );
 
 			expect( mockSelector ).toHaveBeenCalledTimes( 1 );
 			act( () => {
diff --git a/packages/edit-post/src/components/header/fullscreen-mode-close/index.js b/packages/edit-post/src/components/header/fullscreen-mode-close/index.js
deleted file mode 100644
index a6445a1982dd2f..00000000000000
--- a/packages/edit-post/src/components/header/fullscreen-mode-close/index.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import {
-	Button,
-	Icon,
-	__unstableMotion as motion,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { addQueryArgs } from '@wordpress/url';
-import { wordpress } from '@wordpress/icons';
-import { store as editorStore } from '@wordpress/editor';
-import { store as coreStore } from '@wordpress/core-data';
-import { useReducedMotion } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-function FullscreenModeClose( { showTooltip, icon, href } ) {
-	const { isActive, isRequestingSiteIcon, postType, siteIconUrl } = useSelect(
-		( select ) => {
-			const { getCurrentPostType } = select( editorStore );
-			const { isFeatureActive } = select( editPostStore );
-			const { getEntityRecord, getPostType, isResolving } =
-				select( coreStore );
-			const siteData =
-				getEntityRecord( 'root', '__unstableBase', undefined ) || {};
-
-			return {
-				isActive: isFeatureActive( 'fullscreenMode' ),
-				isRequestingSiteIcon: isResolving( 'getEntityRecord', [
-					'root',
-					'__unstableBase',
-					undefined,
-				] ),
-				postType: getPostType( getCurrentPostType() ),
-				siteIconUrl: siteData.site_icon_url,
-			};
-		},
-		[]
-	);
-
-	const disableMotion = useReducedMotion();
-
-	if ( ! isActive || ! postType ) {
-		return null;
-	}
-
-	let buttonIcon = <Icon size="36px" icon={ wordpress } />;
-
-	const effect = {
-		expand: {
-			scale: 1.25,
-			transition: { type: 'tween', duration: '0.3' },
-		},
-	};
-
-	if ( siteIconUrl ) {
-		buttonIcon = (
-			<motion.img
-				variants={ ! disableMotion && effect }
-				alt={ __( 'Site Icon' ) }
-				className="edit-post-fullscreen-mode-close_site-icon"
-				src={ siteIconUrl }
-			/>
-		);
-	}
-
-	if ( isRequestingSiteIcon ) {
-		buttonIcon = null;
-	}
-
-	// Override default icon if custom icon is provided via props.
-	if ( icon ) {
-		buttonIcon = <Icon size="36px" icon={ icon } />;
-	}
-
-	const classes = classnames( {
-		'edit-post-fullscreen-mode-close': true,
-		'has-icon': siteIconUrl,
-	} );
-
-	return (
-		<motion.div whileHover="expand">
-			<Button
-				className={ classes }
-				href={
-					href ??
-					addQueryArgs( 'edit.php', {
-						post_type: postType.slug,
-					} )
-				}
-				label={ postType?.labels?.view_items ?? __( 'Back' ) }
-				showTooltip={ showTooltip }
-			>
-				{ buttonIcon }
-			</Button>
-		</motion.div>
-	);
-}
-
-export default FullscreenModeClose;
diff --git a/packages/edit-post/src/components/header/fullscreen-mode-close/style.scss b/packages/edit-post/src/components/header/fullscreen-mode-close/style.scss
deleted file mode 100644
index 911445344febcd..00000000000000
--- a/packages/edit-post/src/components/header/fullscreen-mode-close/style.scss
+++ /dev/null
@@ -1,67 +0,0 @@
-// Developer notes: these rules are duplicated for the site editor.
-// They need to be updated in both places.
-
-.edit-post-fullscreen-mode-close.components-button {
-	// Do not show the toolbar icon on small screens,
-	// when Fullscreen Mode is not an option in the "More" menu.
-	display: none;
-
-	@include break-medium() {
-		display: flex;
-		align-items: center;
-		align-self: stretch;
-		border: none;
-		background: $gray-900;
-		color: $white;
-		border-radius: 0;
-		height: $header-height + $border-width;
-		width: $header-height;
-		position: relative;
-		margin-bottom: - $border-width;
-
-		&:active {
-			color: $white;
-		}
-
-		&:focus {
-			box-shadow: none;
-		}
-
-		&::before {
-			transition: box-shadow 0.1s ease;
-			@include reduce-motion("transition");
-			content: "";
-			display: block;
-			position: absolute;
-			top: 9px;
-			right: 9px;
-			bottom: 9px + $border-width; // Height of toolbar in edit-post (not edit-site) is 61px tall.
-			left: 9px;
-			border-radius: $radius-block-ui + $border-width + $border-width;
-			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $gray-900;
-		}
-
-		// Hover color.
-		&:hover::before {
-			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $gray-700;
-		}
-
-		&.has-icon:hover::before {
-			box-shadow: none;
-		}
-
-		// Lightened spot color focus.
-		&:focus::before {
-			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) rgba($white, 0.1), inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-		}
-	}
-
-	.edit-post-fullscreen-mode-close_site-icon {
-		width: $button-size;
-		height: $button-size;
-		border-radius: $radius-block-ui;
-		object-fit: cover;
-		// Compensate for the top-bar border.
-		margin-top: -($border-width);
-	}
-}
diff --git a/packages/edit-post/src/components/header/fullscreen-mode-close/test/__snapshots__/index.js.snap b/packages/edit-post/src/components/header/fullscreen-mode-close/test/__snapshots__/index.js.snap
deleted file mode 100644
index 900d822cdcc050..00000000000000
--- a/packages/edit-post/src/components/header/fullscreen-mode-close/test/__snapshots__/index.js.snap
+++ /dev/null
@@ -1,26 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`FullscreenModeClose when in full screen mode should display a default site icon if no user uploaded site icon exists 1`] = `
-<div>
-  <div>
-    <a
-      aria-label="Back"
-      class="components-button edit-post-fullscreen-mode-close"
-      href="edit.php?"
-    >
-      <svg
-        aria-hidden="true"
-        focusable="false"
-        height="36px"
-        viewBox="-2 -2 24 24"
-        width="36px"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M20 10c0-5.51-4.49-10-10-10C4.48 0 0 4.49 0 10c0 5.52 4.48 10 10 10 5.51 0 10-4.48 10-10zM7.78 15.37L4.37 6.22c.55-.02 1.17-.08 1.17-.08.5-.06.44-1.13-.06-1.11 0 0-1.45.11-2.37.11-.18 0-.37 0-.58-.01C4.12 2.69 6.87 1.11 10 1.11c2.33 0 4.45.87 6.05 2.34-.68-.11-1.65.39-1.65 1.58 0 .74.45 1.36.9 2.1.35.61.55 1.36.55 2.46 0 1.49-1.4 5-1.4 5l-3.03-8.37c.54-.02.82-.17.82-.17.5-.05.44-1.25-.06-1.22 0 0-1.44.12-2.38.12-.87 0-2.33-.12-2.33-.12-.5-.03-.56 1.2-.06 1.22l.92.08 1.26 3.41zM17.41 10c.24-.64.74-1.87.43-4.25.7 1.29 1.05 2.71 1.05 4.25 0 3.29-1.73 6.24-4.4 7.78.97-2.59 1.94-5.2 2.92-7.78zM6.1 18.09C3.12 16.65 1.11 13.53 1.11 10c0-1.3.23-2.48.72-3.59C3.25 10.3 4.67 14.2 6.1 18.09zm4.03-6.63l2.58 6.98c-.86.29-1.76.45-2.71.45-.79 0-1.57-.11-2.29-.33.81-2.38 1.62-4.74 2.42-7.1z"
-        />
-      </svg>
-    </a>
-  </div>
-</div>
-`;
diff --git a/packages/edit-post/src/components/header/fullscreen-mode-close/test/index.js b/packages/edit-post/src/components/header/fullscreen-mode-close/test/index.js
deleted file mode 100644
index 59088779a5241e..00000000000000
--- a/packages/edit-post/src/components/header/fullscreen-mode-close/test/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen } from '@testing-library/react';
-
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import FullscreenModeClose from '../';
-
-jest.mock( '@wordpress/data/src/components/use-select', () => {
-	// This allows us to tweak the returned value on each test.
-	const mock = jest.fn();
-	return mock;
-} );
-
-jest.mock( '@wordpress/core-data' );
-
-describe( 'FullscreenModeClose', () => {
-	describe( 'when in full screen mode', () => {
-		it( 'should display a user uploaded site icon if it exists', () => {
-			useSelect.mockImplementation( ( cb ) => {
-				return cb( () => ( {
-					isResolving: () => false,
-					isFeatureActive: () => true,
-					getCurrentPostType: () => {},
-					getPostType: () => true,
-					getEntityRecord: () => ( {
-						site_icon_url: 'https://fakeUrl.com',
-					} ),
-				} ) );
-			} );
-
-			render( <FullscreenModeClose /> );
-
-			const siteIcon = screen.getByAltText( 'Site Icon' );
-
-			expect( siteIcon ).toBeVisible();
-		} );
-
-		it( 'should display a default site icon if no user uploaded site icon exists', () => {
-			useSelect.mockImplementation( ( cb ) => {
-				return cb( () => ( {
-					isResolving: () => false,
-					isFeatureActive: () => true,
-					getCurrentPostType: () => {},
-					getPostType: () => true,
-					getEntityRecord: () => ( {
-						site_icon_url: '',
-					} ),
-				} ) );
-			} );
-
-			const { container } = render( <FullscreenModeClose /> );
-
-			expect(
-				screen.queryByAltText( 'Site Icon' )
-			).not.toBeInTheDocument();
-
-			expect( container ).toMatchSnapshot();
-		} );
-	} );
-} );
diff --git a/packages/edit-post/src/components/header/header-toolbar/index.js b/packages/edit-post/src/components/header/header-toolbar/index.js
deleted file mode 100644
index 9c007da8e115f0..00000000000000
--- a/packages/edit-post/src/components/header/header-toolbar/index.js
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useViewportMatch } from '@wordpress/compose';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { __, _x } from '@wordpress/i18n';
-import {
-	NavigableToolbar,
-	ToolSelector,
-	store as blockEditorStore,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import {
-	EditorHistoryRedo,
-	EditorHistoryUndo,
-	store as editorStore,
-} from '@wordpress/editor';
-import { Button, ToolbarItem } from '@wordpress/components';
-import { listView, plus } from '@wordpress/icons';
-import { useRef, useCallback } from '@wordpress/element';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-import { unlock } from '../../../lock-unlock';
-
-const { useShouldContextualToolbarShow } = unlock( blockEditorPrivateApis );
-
-const preventDefault = ( event ) => {
-	event.preventDefault();
-};
-
-function HeaderToolbar( { hasFixedToolbar, setListViewToggleElement } ) {
-	const inserterButton = useRef();
-	const { setIsInserterOpened, setIsListViewOpened } =
-		useDispatch( editPostStore );
-	const {
-		isInserterEnabled,
-		isInserterOpened,
-		isTextModeEnabled,
-		showIconLabels,
-		isListViewOpen,
-		listViewShortcut,
-	} = useSelect( ( select ) => {
-		const { hasInserterItems, getBlockRootClientId, getBlockSelectionEnd } =
-			select( blockEditorStore );
-		const { getEditorSettings } = select( editorStore );
-		const { getEditorMode, isFeatureActive, isListViewOpened } =
-			select( editPostStore );
-		const { getShortcutRepresentation } = select( keyboardShortcutsStore );
-
-		return {
-			// This setting (richEditingEnabled) should not live in the block editor's setting.
-			isInserterEnabled:
-				getEditorMode() === 'visual' &&
-				getEditorSettings().richEditingEnabled &&
-				hasInserterItems(
-					getBlockRootClientId( getBlockSelectionEnd() )
-				),
-			isInserterOpened: select( editPostStore ).isInserterOpened(),
-			isTextModeEnabled: getEditorMode() === 'text',
-			showIconLabels: isFeatureActive( 'showIconLabels' ),
-			isListViewOpen: isListViewOpened(),
-			listViewShortcut: getShortcutRepresentation(
-				'core/edit-post/toggle-list-view'
-			),
-		};
-	}, [] );
-
-	const isLargeViewport = useViewportMatch( 'medium' );
-	const isWideViewport = useViewportMatch( 'wide' );
-	const {
-		shouldShowContextualToolbar,
-		canFocusHiddenToolbar,
-		fixedToolbarCanBeFocused,
-	} = useShouldContextualToolbarShow();
-	// If there's a block toolbar to be focused, disable the focus shortcut for the document toolbar.
-	// There's a fixed block toolbar when the fixed toolbar option is enabled or when the browser width is less than the large viewport.
-	const blockToolbarCanBeFocused =
-		shouldShowContextualToolbar ||
-		canFocusHiddenToolbar ||
-		fixedToolbarCanBeFocused;
-	/* translators: accessibility text for the editor toolbar */
-	const toolbarAriaLabel = __( 'Document tools' );
-
-	const toggleListView = useCallback(
-		() => setIsListViewOpened( ! isListViewOpen ),
-		[ setIsListViewOpened, isListViewOpen ]
-	);
-	const overflowItems = (
-		<>
-			<ToolbarItem
-				as={ Button }
-				className="edit-post-header-toolbar__document-overview-toggle"
-				icon={ listView }
-				disabled={ isTextModeEnabled }
-				isPressed={ isListViewOpen }
-				/* translators: button label text should, if possible, be under 16 characters. */
-				label={ __( 'Document Overview' ) }
-				onClick={ toggleListView }
-				shortcut={ listViewShortcut }
-				showTooltip={ ! showIconLabels }
-				variant={ showIconLabels ? 'tertiary' : undefined }
-				aria-expanded={ isListViewOpen }
-				ref={ setListViewToggleElement }
-				size="compact"
-			/>
-		</>
-	);
-	const toggleInserter = useCallback( () => {
-		if ( isInserterOpened ) {
-			// Focusing the inserter button should close the inserter popover.
-			// However, there are some cases it won't close when the focus is lost.
-			// See https://github.com/WordPress/gutenberg/issues/43090 for more details.
-			inserterButton.current.focus();
-			setIsInserterOpened( false );
-		} else {
-			setIsInserterOpened( true );
-		}
-	}, [ isInserterOpened, setIsInserterOpened ] );
-
-	/* translators: button label text should, if possible, be under 16 characters. */
-	const longLabel = _x(
-		'Toggle block inserter',
-		'Generic label for block inserter button'
-	);
-	const shortLabel = ! isInserterOpened ? __( 'Add' ) : __( 'Close' );
-
-	return (
-		<NavigableToolbar
-			className="edit-post-header-toolbar"
-			aria-label={ toolbarAriaLabel }
-			shouldUseKeyboardFocusShortcut={ ! blockToolbarCanBeFocused }
-			variant="unstyled"
-		>
-			<div className="edit-post-header-toolbar__left">
-				<ToolbarItem
-					ref={ inserterButton }
-					as={ Button }
-					className="edit-post-header-toolbar__inserter-toggle"
-					variant="primary"
-					isPressed={ isInserterOpened }
-					onMouseDown={ preventDefault }
-					onClick={ toggleInserter }
-					disabled={ ! isInserterEnabled }
-					icon={ plus }
-					label={ showIconLabels ? shortLabel : longLabel }
-					showTooltip={ ! showIconLabels }
-					aria-expanded={ isInserterOpened }
-				/>
-				{ ( isWideViewport || ! showIconLabels ) && (
-					<>
-						{ isLargeViewport && ! hasFixedToolbar && (
-							<ToolbarItem
-								as={ ToolSelector }
-								showTooltip={ ! showIconLabels }
-								variant={
-									showIconLabels ? 'tertiary' : undefined
-								}
-								disabled={ isTextModeEnabled }
-								size="compact"
-							/>
-						) }
-						<ToolbarItem
-							as={ EditorHistoryUndo }
-							showTooltip={ ! showIconLabels }
-							variant={ showIconLabels ? 'tertiary' : undefined }
-							size="compact"
-						/>
-						<ToolbarItem
-							as={ EditorHistoryRedo }
-							showTooltip={ ! showIconLabels }
-							variant={ showIconLabels ? 'tertiary' : undefined }
-							size="compact"
-						/>
-						{ overflowItems }
-					</>
-				) }
-			</div>
-		</NavigableToolbar>
-	);
-}
-
-export default HeaderToolbar;
diff --git a/packages/edit-post/src/components/header/header-toolbar/index.native.js b/packages/edit-post/src/components/header/header-toolbar/index.native.js
index 53574b15306cee..dc256c87053dfa 100644
--- a/packages/edit-post/src/components/header/header-toolbar/index.native.js
+++ b/packages/edit-post/src/components/header/header-toolbar/index.native.js
@@ -181,7 +181,7 @@ function HeaderToolbar( {
 			<ScrollView
 				ref={ scrollViewRef }
 				onContentSizeChange={ scrollToStart }
-				horizontal={ true }
+				horizontal
 				showsHorizontalScrollIndicator={ false }
 				keyboardShouldPersistTaps="always"
 				alwaysBounceHorizontal={ false }
diff --git a/packages/edit-post/src/components/header/header-toolbar/style.scss b/packages/edit-post/src/components/header/header-toolbar/style.scss
deleted file mode 100644
index 717d5cd760db58..00000000000000
--- a/packages/edit-post/src/components/header/header-toolbar/style.scss
+++ /dev/null
@@ -1,116 +0,0 @@
-.edit-post-header-toolbar {
-	display: inline-flex;
-	align-items: center;
-
-	// Hide all action buttons except the inserter on mobile.
-	.edit-post-header-toolbar__left > .components-button {
-		display: none;
-
-		@include break-small() {
-			display: inline-flex;
-		}
-	}
-
-	.edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle {
-		display: inline-flex;
-
-		svg {
-			transition: transform cubic-bezier(0.165, 0.84, 0.44, 1) 0.2s;
-			@include reduce-motion("transition");
-		}
-
-		&.is-pressed {
-			svg {
-				transform: rotate(45deg);
-			}
-		}
-	}
-
-	// Hide table of contents and list view on mobile.
-	.block-editor-list-view {
-		display: none;
-
-		@include break-small() {
-			display: flex;
-		}
-	}
-
-	// The Toolbar component adds different styles to buttons, so we reset them
-	// here to the original button styles
-	.edit-post-header-toolbar__left > .components-button.has-icon,
-	.edit-post-header-toolbar__left > .components-dropdown > .components-button.has-icon {
-		// @todo: override toolbar group inherited paddings from components/block-tools/style.scss.
-		// This is best fixed by making the mover control area a proper single toolbar group.
-		// It needs specificity due to style inherited from .components-accessible-toolbar .components-button.has-icon.has-icon.
-		height: $button-size-compact;
-		min-width: $button-size-compact;
-		padding: 4px;
-
-		&.is-pressed {
-			background: $gray-900;
-		}
-
-		&:focus:not(:disabled) {
-			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 0 0 $border-width $white;
-			outline: $border-width solid transparent;
-		}
-
-		&::before {
-			display: none;
-		}
-	}
-}
-
-// Reduced UI.
-.edit-post-header.has-reduced-ui {
-	@include break-small () {
-		// Apply transition to every button but the first one.
-		.edit-post-header-toolbar__left > * + .components-button,
-		.edit-post-header-toolbar__left > * + .components-dropdown > [aria-expanded="false"] {
-			transition: opacity 0.1s linear;
-			@include reduce-motion("transition");
-		}
-
-		// Zero out opacity unless hovered.
-		&:not(:hover) .edit-post-header-toolbar__left > * + .components-button,
-		&:not(:hover) .edit-post-header-toolbar__left > * + .components-dropdown > [aria-expanded="false"] {
-			opacity: 0;
-		}
-	}
-}
-
-.edit-post-header-toolbar__left {
-	display: inline-flex;
-	align-items: center;
-	padding-left: $grid-unit-20;
-	gap: $grid-unit-10;
-
-	// Some plugins add buttons here despite best practices.
-	// Push them a bit rightwards to fit the top toolbar.
-	margin-right: $grid-unit-10;
-
-	@include break-medium() {
-		padding-left: $grid-unit-50 * 0.5;
-	}
-
-	@include break-wide() {
-		padding-right: $grid-unit-10;
-	}
-}
-
-.edit-post-header-toolbar .edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle.has-icon {
-	min-width: $button-size-compact;
-	width: $button-size-compact;
-	height: $button-size-compact;
-	padding: 0;
-
-	.show-icon-labels & {
-		width: auto;
-		height: $button-size-compact;
-		padding: 0 $grid-unit-10;
-	}
-}
-
-.show-icon-labels .edit-post-header-toolbar__left > * + * {
-	margin-left: $grid-unit-10;
-}
diff --git a/packages/edit-post/src/components/header/index.js b/packages/edit-post/src/components/header/index.js
deleted file mode 100644
index 0b9a77206f2a61..00000000000000
--- a/packages/edit-post/src/components/header/index.js
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	privateApis as blockEditorPrivateApis,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import {
-	PostSavedState,
-	PostPreviewButton,
-	store as editorStore,
-	DocumentBar,
-} from '@wordpress/editor';
-import { useEffect, useRef, useState } from '@wordpress/element';
-import { useSelect } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { next, previous } from '@wordpress/icons';
-import { PinnedItems } from '@wordpress/interface';
-import { useViewportMatch } from '@wordpress/compose';
-import {
-	Button,
-	__unstableMotion as motion,
-	Popover,
-} from '@wordpress/components';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-/**
- * Internal dependencies
- */
-import FullscreenModeClose from './fullscreen-mode-close';
-import HeaderToolbar from './header-toolbar';
-import MoreMenu from './more-menu';
-import PostPublishButtonOrToggle from './post-publish-button-or-toggle';
-import { default as DevicePreview } from '../device-preview';
-import ViewLink from '../view-link';
-import MainDashboardButton from './main-dashboard-button';
-import { store as editPostStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-
-const { BlockContextualToolbar } = unlock( blockEditorPrivateApis );
-
-const slideY = {
-	hidden: { y: '-50px' },
-	distractionFreeInactive: { y: 0 },
-	hover: { y: 0, transition: { type: 'tween', delay: 0.2 } },
-};
-
-const slideX = {
-	hidden: { x: '-100%' },
-	distractionFreeInactive: { x: 0 },
-	hover: { x: 0, transition: { type: 'tween', delay: 0.2 } },
-};
-
-function Header( {
-	setEntitiesSavedStatesCallback,
-	setListViewToggleElement,
-} ) {
-	const isWideViewport = useViewportMatch( 'large' );
-	const isLargeViewport = useViewportMatch( 'medium' );
-	const blockToolbarRef = useRef();
-	const {
-		blockSelectionStart,
-		hasActiveMetaboxes,
-		hasFixedToolbar,
-		isEditingTemplate,
-		isPublishSidebarOpened,
-		showIconLabels,
-	} = useSelect( ( select ) => {
-		const { get: getPreference } = select( preferencesStore );
-
-		return {
-			blockSelectionStart:
-				select( blockEditorStore ).getBlockSelectionStart(),
-			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
-			isEditingTemplate:
-				select( editorStore ).getRenderingMode() !== 'post-only',
-			isPublishSidebarOpened:
-				select( editPostStore ).isPublishSidebarOpened(),
-			hasFixedToolbar: getPreference( 'core/edit-post', 'fixedToolbar' ),
-			showIconLabels:
-				select( editPostStore ).isFeatureActive( 'showIconLabels' ),
-		};
-	}, [] );
-
-	const [ isBlockToolsCollapsed, setIsBlockToolsCollapsed ] =
-		useState( true );
-
-	const hasBlockSelected = !! blockSelectionStart;
-
-	useEffect( () => {
-		// If we have a new block selection, show the block tools
-		if ( blockSelectionStart ) {
-			setIsBlockToolsCollapsed( false );
-		}
-	}, [ blockSelectionStart ] );
-
-	return (
-		<div className="edit-post-header">
-			<MainDashboardButton.Slot>
-				<motion.div
-					variants={ slideX }
-					transition={ { type: 'tween', delay: 0.8 } }
-				>
-					<FullscreenModeClose showTooltip />
-				</motion.div>
-			</MainDashboardButton.Slot>
-			<motion.div
-				variants={ slideY }
-				transition={ { type: 'tween', delay: 0.8 } }
-				className="edit-post-header__toolbar"
-			>
-				<HeaderToolbar
-					hasFixedToolbar={ hasFixedToolbar }
-					setListViewToggleElement={ setListViewToggleElement }
-				/>
-				{ hasFixedToolbar && isLargeViewport && (
-					<>
-						<div
-							className={ classnames(
-								'selected-block-tools-wrapper',
-								{
-									'is-collapsed':
-										isEditingTemplate &&
-										isBlockToolsCollapsed,
-								}
-							) }
-						>
-							<BlockContextualToolbar isFixed />
-						</div>
-						<Popover.Slot
-							ref={ blockToolbarRef }
-							name="block-toolbar"
-						/>
-						{ isEditingTemplate && hasBlockSelected && (
-							<Button
-								className="edit-post-header__block-tools-toggle"
-								icon={ isBlockToolsCollapsed ? next : previous }
-								onClick={ () => {
-									setIsBlockToolsCollapsed(
-										( collapsed ) => ! collapsed
-									);
-								} }
-								label={
-									isBlockToolsCollapsed
-										? __( 'Show block tools' )
-										: __( 'Hide block tools' )
-								}
-							/>
-						) }
-					</>
-				) }
-				<div
-					className={ classnames( 'edit-post-header__center', {
-						'is-collapsed':
-							isEditingTemplate &&
-							hasBlockSelected &&
-							! isBlockToolsCollapsed &&
-							hasFixedToolbar &&
-							isLargeViewport,
-					} ) }
-				>
-					{ isEditingTemplate && <DocumentBar /> }
-				</div>
-			</motion.div>
-			<motion.div
-				variants={ slideY }
-				transition={ { type: 'tween', delay: 0.8 } }
-				className="edit-post-header__settings"
-			>
-				{ ! isPublishSidebarOpened && (
-					// This button isn't completely hidden by the publish sidebar.
-					// We can't hide the whole toolbar when the publish sidebar is open because
-					// we want to prevent mounting/unmounting the PostPublishButtonOrToggle DOM node.
-					// We track that DOM node to return focus to the PostPublishButtonOrToggle
-					// when the publish sidebar has been closed.
-					<PostSavedState
-						forceIsDirty={ hasActiveMetaboxes }
-						showIconLabels={ showIconLabels }
-					/>
-				) }
-				<DevicePreview />
-				<PostPreviewButton forceIsAutosaveable={ hasActiveMetaboxes } />
-				<ViewLink />
-				<PostPublishButtonOrToggle
-					forceIsDirty={ hasActiveMetaboxes }
-					setEntitiesSavedStatesCallback={
-						setEntitiesSavedStatesCallback
-					}
-				/>
-				{ ( isWideViewport || ! showIconLabels ) && (
-					<>
-						<PinnedItems.Slot scope="core/edit-post" />
-						<MoreMenu showIconLabels={ showIconLabels } />
-					</>
-				) }
-				{ showIconLabels && ! isWideViewport && (
-					<MoreMenu showIconLabels={ showIconLabels } />
-				) }
-			</motion.div>
-		</div>
-	);
-}
-
-export default Header;
diff --git a/packages/edit-post/src/components/header/index.native.js b/packages/edit-post/src/components/header/index.native.js
index aada04e264490a..ff892dd6916606 100644
--- a/packages/edit-post/src/components/header/index.native.js
+++ b/packages/edit-post/src/components/header/index.native.js
@@ -7,7 +7,7 @@ import { Keyboard } from 'react-native';
  * WordPress dependencies
  */
 import { Component } from '@wordpress/element';
-import '@wordpress/interface';
+import '@wordpress/editor';
 
 /**
  * Internal dependencies
diff --git a/packages/edit-post/src/components/header/main-dashboard-button/index.js b/packages/edit-post/src/components/header/main-dashboard-button/index.js
deleted file mode 100644
index 0878a7cce49012..00000000000000
--- a/packages/edit-post/src/components/header/main-dashboard-button/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalUseSlotFills as useSlotFills,
-	createSlotFill,
-} from '@wordpress/components';
-
-const slotName = '__experimentalMainDashboardButton';
-
-const { Fill, Slot: MainDashboardButtonSlot } = createSlotFill( slotName );
-
-const MainDashboardButton = Fill;
-
-const Slot = ( { children } ) => {
-	const fills = useSlotFills( slotName );
-	const hasFills = Boolean( fills && fills.length );
-
-	if ( ! hasFills ) {
-		return children;
-	}
-
-	return <MainDashboardButtonSlot bubblesVirtually />;
-};
-
-MainDashboardButton.Slot = Slot;
-
-export default MainDashboardButton;
diff --git a/packages/edit-post/src/components/header/mode-switcher/index.js b/packages/edit-post/src/components/header/mode-switcher/index.js
deleted file mode 100644
index 93c4ead745ffb4..00000000000000
--- a/packages/edit-post/src/components/header/mode-switcher/index.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { MenuItemsChoice, MenuGroup } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-/**
- * Set of available mode options.
- *
- * @type {Array}
- */
-const MODES = [
-	{
-		value: 'visual',
-		label: __( 'Visual editor' ),
-	},
-	{
-		value: 'text',
-		label: __( 'Code editor' ),
-	},
-];
-
-function ModeSwitcher() {
-	const {
-		shortcut,
-		isRichEditingEnabled,
-		isCodeEditingEnabled,
-		isEditingTemplate,
-		mode,
-	} = useSelect(
-		( select ) => ( {
-			shortcut: select(
-				keyboardShortcutsStore
-			).getShortcutRepresentation( 'core/edit-post/toggle-mode' ),
-			isRichEditingEnabled:
-				select( editorStore ).getEditorSettings().richEditingEnabled,
-			isCodeEditingEnabled:
-				select( editorStore ).getEditorSettings().codeEditingEnabled,
-			isEditingTemplate:
-				select( editorStore ).getRenderingMode() !== 'post-only',
-			mode: select( editPostStore ).getEditorMode(),
-		} ),
-		[]
-	);
-	const { switchEditorMode } = useDispatch( editPostStore );
-
-	if ( isEditingTemplate ) {
-		return null;
-	}
-
-	let selectedMode = mode;
-	if ( ! isRichEditingEnabled && mode === 'visual' ) {
-		selectedMode = 'text';
-	}
-	if ( ! isCodeEditingEnabled && mode === 'text' ) {
-		selectedMode = 'visual';
-	}
-
-	const choices = MODES.map( ( choice ) => {
-		if ( ! isCodeEditingEnabled && choice.value === 'text' ) {
-			choice = {
-				...choice,
-				disabled: true,
-			};
-		}
-		if ( ! isRichEditingEnabled && choice.value === 'visual' ) {
-			choice = {
-				...choice,
-				disabled: true,
-				info: __(
-					'You can enable the visual editor in your profile settings.'
-				),
-			};
-		}
-		if ( choice.value !== selectedMode && ! choice.disabled ) {
-			return { ...choice, shortcut };
-		}
-		return choice;
-	} );
-
-	return (
-		<MenuGroup label={ __( 'Editor' ) }>
-			<MenuItemsChoice
-				choices={ choices }
-				value={ selectedMode }
-				onSelect={ switchEditorMode }
-			/>
-		</MenuGroup>
-	);
-}
-
-export default ModeSwitcher;
diff --git a/packages/edit-post/src/components/header/more-menu/index.js b/packages/edit-post/src/components/header/more-menu/index.js
deleted file mode 100644
index 3ac1178b8815a9..00000000000000
--- a/packages/edit-post/src/components/header/more-menu/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { MenuGroup } from '@wordpress/components';
-import {
-	ActionItem,
-	MoreMenuDropdown,
-	PinnedItems,
-} from '@wordpress/interface';
-import { useViewportMatch } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import ModeSwitcher from '../mode-switcher';
-import PreferencesMenuItem from '../preferences-menu-item';
-import ToolsMoreMenuGroup from '../tools-more-menu-group';
-import WritingMenu from '../writing-menu';
-
-const MoreMenu = ( { showIconLabels } ) => {
-	const isLargeViewport = useViewportMatch( 'large' );
-
-	return (
-		<MoreMenuDropdown
-			toggleProps={ {
-				showTooltip: ! showIconLabels,
-				...( showIconLabels && { variant: 'tertiary' } ),
-				size: 'compact',
-			} }
-		>
-			{ ( { onClose } ) => (
-				<>
-					{ showIconLabels && ! isLargeViewport && (
-						<PinnedItems.Slot
-							className={ showIconLabels && 'show-icon-labels' }
-							scope="core/edit-post"
-						/>
-					) }
-					<WritingMenu />
-					<ModeSwitcher />
-					<ActionItem.Slot
-						name="core/edit-post/plugin-more-menu"
-						label={ __( 'Plugins' ) }
-						as={ MenuGroup }
-						fillProps={ { onClick: onClose } }
-					/>
-					<ToolsMoreMenuGroup.Slot fillProps={ { onClose } } />
-					<MenuGroup>
-						<PreferencesMenuItem />
-					</MenuGroup>
-				</>
-			) }
-		</MoreMenuDropdown>
-	);
-};
-
-export default MoreMenu;
diff --git a/packages/edit-post/src/components/header/plugin-more-menu-item/index.js b/packages/edit-post/src/components/header/plugin-more-menu-item/index.js
deleted file mode 100644
index d9675974704626..00000000000000
--- a/packages/edit-post/src/components/header/plugin-more-menu-item/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { ActionItem } from '@wordpress/interface';
-import { compose } from '@wordpress/compose';
-import { MenuItem } from '@wordpress/components';
-import { withPluginContext } from '@wordpress/plugins';
-
-/**
- * Renders a menu item in `Plugins` group in `More Menu` drop down, and can be used to as a button or link depending on the props provided.
- * The text within the component appears as the menu item label.
- *
- * @param {Object}                props                                 Component properties.
- * @param {string}                [props.href]                          When `href` is provided then the menu item is represented as an anchor rather than button. It corresponds to the `href` attribute of the anchor.
- * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
- * @param {Function}              [props.onClick=noop]                  The callback function to be executed when the user clicks the menu item.
- * @param {...*}                  [props.other]                         Any additional props are passed through to the underlying [MenuItem](https://github.com/WordPress/gutenberg/tree/HEAD/packages/components/src/menu-item/README.md) component.
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginMoreMenuItem = wp.editPost.PluginMoreMenuItem;
- * var moreIcon = React.createElement( 'svg' ); //... svg element.
- *
- * function onButtonClick() {
- * 	alert( 'Button clicked.' );
- * }
- *
- * function MyButtonMoreMenuItem() {
- * 	return React.createElement(
- * 		PluginMoreMenuItem,
- * 		{
- * 			icon: moreIcon,
- * 			onClick: onButtonClick,
- * 		},
- * 		__( 'My button title' )
- * 	);
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginMoreMenuItem } from '@wordpress/edit-post';
- * import { more } from '@wordpress/icons';
- *
- * function onButtonClick() {
- * 	alert( 'Button clicked.' );
- * }
- *
- * const MyButtonMoreMenuItem = () => (
- * 	<PluginMoreMenuItem
- * 		icon={ more }
- * 		onClick={ onButtonClick }
- * 	>
- * 		{ __( 'My button title' ) }
- * 	</PluginMoreMenuItem>
- * );
- * ```
- *
- * @return {Component} The component to be rendered.
- */
-export default compose(
-	withPluginContext( ( context, ownProps ) => {
-		return {
-			as: ownProps.as ?? MenuItem,
-			icon: ownProps.icon || context.icon,
-			name: 'core/edit-post/plugin-more-menu',
-		};
-	} )
-)( ActionItem );
diff --git a/packages/edit-post/src/components/header/plugin-sidebar-more-menu-item/index.js b/packages/edit-post/src/components/header/plugin-sidebar-more-menu-item/index.js
deleted file mode 100644
index 133e5ae2ba301f..00000000000000
--- a/packages/edit-post/src/components/header/plugin-sidebar-more-menu-item/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { ComplementaryAreaMoreMenuItem } from '@wordpress/interface';
-
-/**
- * Renders a menu item in `Plugins` group in `More Menu` drop down,
- * and can be used to activate the corresponding `PluginSidebar` component.
- * The text within the component appears as the menu item label.
- *
- * @param {Object}                props                                 Component props.
- * @param {string}                props.target                          A string identifying the target sidebar you wish to be activated by this menu item. Must be the same as the `name` prop you have given to that sidebar.
- * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginSidebarMoreMenuItem = wp.editPost.PluginSidebarMoreMenuItem;
- * var moreIcon = React.createElement( 'svg' ); //... svg element.
- *
- * function MySidebarMoreMenuItem() {
- * 	return React.createElement(
- * 		PluginSidebarMoreMenuItem,
- * 		{
- * 			target: 'my-sidebar',
- * 			icon: moreIcon,
- * 		},
- * 		__( 'My sidebar title' )
- * 	)
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginSidebarMoreMenuItem } from '@wordpress/edit-post';
- * import { more } from '@wordpress/icons';
- *
- * const MySidebarMoreMenuItem = () => (
- * 	<PluginSidebarMoreMenuItem
- * 		target="my-sidebar"
- * 		icon={ more }
- * 	>
- * 		{ __( 'My sidebar title' ) }
- * 	</PluginSidebarMoreMenuItem>
- * );
- * ```
- *
- * @return {Component} The component to be rendered.
- */
-
-export default function PluginSidebarMoreMenuItem( props ) {
-	return (
-		<ComplementaryAreaMoreMenuItem
-			// Menu item is marked with unstable prop for backward compatibility.
-			// @see https://github.com/WordPress/gutenberg/issues/14457
-			__unstableExplicitMenuItem
-			scope="core/edit-post"
-			{ ...props }
-		/>
-	);
-}
diff --git a/packages/edit-post/src/components/header/post-publish-button-or-toggle.js b/packages/edit-post/src/components/header/post-publish-button-or-toggle.js
deleted file mode 100644
index c01f31454e7460..00000000000000
--- a/packages/edit-post/src/components/header/post-publish-button-or-toggle.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useViewportMatch, compose } from '@wordpress/compose';
-import { withDispatch, withSelect } from '@wordpress/data';
-import { PostPublishButton, store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-
-export function PostPublishButtonOrToggle( {
-	forceIsDirty,
-	hasPublishAction,
-	isBeingScheduled,
-	isPending,
-	isPublished,
-	isPublishSidebarEnabled,
-	isPublishSidebarOpened,
-	isScheduled,
-	togglePublishSidebar,
-	setEntitiesSavedStatesCallback,
-} ) {
-	const IS_TOGGLE = 'toggle';
-	const IS_BUTTON = 'button';
-	const isSmallerThanMediumViewport = useViewportMatch( 'medium', '<' );
-	let component;
-
-	/**
-	 * Conditions to show a BUTTON (publish directly) or a TOGGLE (open publish sidebar):
-	 *
-	 * 1) We want to show a BUTTON when the post status is at the _final stage_
-	 * for a particular role (see https://wordpress.org/documentation/article/post-status/):
-	 *
-	 * - is published
-	 * - is scheduled to be published
-	 * - is pending and can't be published (but only for viewports >= medium).
-	 * 	 Originally, we considered showing a button for pending posts that couldn't be published
-	 * 	 (for example, for an author with the contributor role). Some languages can have
-	 * 	 long translations for "Submit for review", so given the lack of UI real estate available
-	 * 	 we decided to take into account the viewport in that case.
-	 *  	 See: https://github.com/WordPress/gutenberg/issues/10475
-	 *
-	 * 2) Then, in small viewports, we'll show a TOGGLE.
-	 *
-	 * 3) Finally, we'll use the publish sidebar status to decide:
-	 *
-	 * - if it is enabled, we show a TOGGLE
-	 * - if it is disabled, we show a BUTTON
-	 */
-	if (
-		isPublished ||
-		( isScheduled && isBeingScheduled ) ||
-		( isPending && ! hasPublishAction && ! isSmallerThanMediumViewport )
-	) {
-		component = IS_BUTTON;
-	} else if ( isSmallerThanMediumViewport ) {
-		component = IS_TOGGLE;
-	} else if ( isPublishSidebarEnabled ) {
-		component = IS_TOGGLE;
-	} else {
-		component = IS_BUTTON;
-	}
-
-	return (
-		<PostPublishButton
-			forceIsDirty={ forceIsDirty }
-			isOpen={ isPublishSidebarOpened }
-			isToggle={ component === IS_TOGGLE }
-			onToggle={ togglePublishSidebar }
-			setEntitiesSavedStatesCallback={ setEntitiesSavedStatesCallback }
-		/>
-	);
-}
-
-export default compose(
-	withSelect( ( select ) => ( {
-		hasPublishAction:
-			select( editorStore ).getCurrentPost()?._links?.[
-				'wp:action-publish'
-			] ?? false,
-		isBeingScheduled: select( editorStore ).isEditedPostBeingScheduled(),
-		isPending: select( editorStore ).isCurrentPostPending(),
-		isPublished: select( editorStore ).isCurrentPostPublished(),
-		isPublishSidebarEnabled:
-			select( editorStore ).isPublishSidebarEnabled(),
-		isPublishSidebarOpened:
-			select( editPostStore ).isPublishSidebarOpened(),
-		isScheduled: select( editorStore ).isCurrentPostScheduled(),
-	} ) ),
-	withDispatch( ( dispatch ) => {
-		const { togglePublishSidebar } = dispatch( editPostStore );
-		return {
-			togglePublishSidebar,
-		};
-	} )
-)( PostPublishButtonOrToggle );
diff --git a/packages/edit-post/src/components/header/preferences-menu-item/index.js b/packages/edit-post/src/components/header/preferences-menu-item/index.js
deleted file mode 100644
index 037a896fc7f070..00000000000000
--- a/packages/edit-post/src/components/header/preferences-menu-item/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useDispatch } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { MenuItem } from '@wordpress/components';
-import { store as interfaceStore } from '@wordpress/interface';
-
-/**
- * Internal dependencies
- */
-import { PREFERENCES_MODAL_NAME } from '../../../components/preferences-modal';
-
-export default function PreferencesMenuItem() {
-	const { openModal } = useDispatch( interfaceStore );
-	return (
-		<MenuItem
-			onClick={ () => {
-				openModal( PREFERENCES_MODAL_NAME );
-			} }
-		>
-			{ __( 'Preferences' ) }
-		</MenuItem>
-	);
-}
diff --git a/packages/edit-post/src/components/header/style.scss b/packages/edit-post/src/components/header/style.scss
deleted file mode 100644
index 6e634427e21986..00000000000000
--- a/packages/edit-post/src/components/header/style.scss
+++ /dev/null
@@ -1,271 +0,0 @@
-.edit-post-header {
-	height: $header-height;
-	background: $white;
-	display: flex;
-	flex-wrap: wrap;
-	align-items: center;
-	// The header should never be wider than the viewport, or buttons might be hidden. Especially relevant at high zoom levels. Related to https://core.trac.wordpress.org/ticket/47603#ticket.
-	max-width: 100vw;
-	justify-content: space-between;
-
-	// Make toolbar sticky on larger breakpoints
-	@include break-zoomed-in {
-		flex-wrap: nowrap;
-	}
-
-	// Some browsers, most notably IE11, honor an older version of the flexbox spec
-	// which takes absolutely positioned items into account when calculating `space-between`.
-	// https://www.w3.org/TR/2012/WD-css3-flexbox-20120612/#abspos-flex-items
-	//
-	// This difference is causing our header layout to break when focused in IE11.
-	// Our focused region styles use an absolutely positioned :after pseudo element to draw an outline,
-	// and IE11 is adding space between it and our last real child, shifting righthand UI elements
-	// to the left. For a workaround, we change the flex order to move the undesired spacing to the middle
-	// where it is no longer noticeable.
-	> .edit-post-header__settings {
-		order: 1;
-
-		// Restore default order for all other browsers
-		@supports (position: sticky) {
-			order: initial;
-		}
-	}
-}
-
-.edit-post-header__toolbar {
-	display: flex;
-	// Allow this area to shrink to fit the toolbar buttons.
-	flex-shrink: 8;
-	// Take up the space of the toolbar so it can be justified to the left side of the toolbar.
-	flex-grow: 3;
-	// Hide the overflow so flex will limit its width. Block toolbar will allow scrolling on fixed toolbar.
-	overflow: hidden;
-	// Leave enough room for the focus ring to show.
-	padding: 2px 0;
-	align-items: center;
-
-	.table-of-contents {
-		display: none;
-
-		@include break-small() {
-			display: block;
-		}
-	}
-
-	.block-editor-block-contextual-toolbar.is-fixed {
-		border: none;
-	}
-
-	.selected-block-tools-wrapper {
-		overflow-x: hidden;
-
-		&.is-collapsed {
-			display: none;
-		}
-	}
-}
-
-.edit-post-header__block-tools-toggle {
-	margin-left: 2px; // Allow focus ring to be fully visible
-}
-
-.edit-post-header__center {
-	flex-grow: 1;
-	display: flex;
-	justify-content: center;
-
-	&.is-collapsed {
-		display: none;
-	}
-}
-
-/**
- * Buttons on the right side
- */
-
-.edit-post-header__settings {
-	display: inline-flex;
-	align-items: center;
-	flex-wrap: nowrap;
-	padding-right: $grid-unit-05;
-
-	@include break-small () {
-		padding-right: $grid-unit-20 - ($grid-unit-15 * 0.5);
-	}
-
-	gap: $grid-unit-10;
-}
-
-.edit-post-header-preview__grouping-external {
-	display: flex;
-	position: relative;
-	padding-bottom: 0;
-}
-
-.edit-post-header-preview__button-external {
-	padding-left: $grid-unit-10;
-
-	margin-right: auto;
-	width: 100%;
-	display: flex;
-	justify-content: flex-start;
-
-	svg {
-		margin-left: auto;
-	}
-}
-
-.edit-post-post-preview-dropdown .components-popover__content {
-	padding-bottom: 0;
-}
-
-/**
- * Show icon labels.
- */
-
-.show-icon-labels.interface-pinned-items,
-.show-icon-labels .edit-post-header,
-.edit-post-header__dropdown {
-	.components-button.has-icon {
-		width: auto;
-
-		// Hide the button icons when labels are set to display...
-		svg {
-			display: none;
-		}
-		// ... and display labels.
-		&::after {
-			content: attr(aria-label);
-		}
-		&[aria-disabled="true"] {
-			background-color: transparent;
-		}
-	}
-	.is-tertiary {
-		&:active {
-			box-shadow: 0 0 0 1.5px var(--wp-admin-theme-color);
-			background-color: transparent;
-		}
-	}
-	// Exception for drodpdown toggle buttons.
-	// Exception for the fullscreen mode button.
-	.edit-post-fullscreen-mode-close.has-icon,
-	.components-button.has-icon.button-toggle {
-		svg {
-			display: block;
-		}
-		&::after {
-			content: none;
-		}
-	}
-	// Undo the width override for fullscreen mode button.
-	.edit-post-fullscreen-mode-close.has-icon {
-		width: $header-height;
-	}
-	// Don't hide MenuItemsChoice check icons
-	.components-menu-items-choice .components-menu-items__item-icon.components-menu-items__item-icon {
-		display: block;
-	}
-	.edit-post-header-toolbar__inserter-toggle.edit-post-header-toolbar__inserter-toggle,
-	.interface-pinned-items .components-button {
-		padding-left: $grid-unit;
-		padding-right: $grid-unit;
-
-		@include break-small {
-			padding-left: $grid-unit-15;
-			padding-right: $grid-unit-15;
-		}
-	}
-
-	.editor-post-save-draft.editor-post-save-draft,
-	.editor-post-saved-state.editor-post-saved-state {
-		&::after {
-			content: none;
-		}
-	}
-}
-
-.edit-post-header__dropdown {
-	.components-menu-item__button.components-menu-item__button,
-	.components-button.editor-history__undo,
-	.components-button.editor-history__redo,
-	.table-of-contents .components-button,
-	.components-button.block-editor-list-view {
-		margin: 0;
-		padding: 6px 6px 6px $grid-unit-50;
-		width: 14.625rem;
-		text-align: left;
-		justify-content: flex-start;
-	}
-}
-
-.show-icon-labels.interface-pinned-items {
-	padding: 6px $grid-unit-15 $grid-unit-15;
-	margin-top: 0;
-	margin-bottom: 0;
-	margin-left: -$grid-unit-15;
-	margin-right: -$grid-unit-15;
-	border-bottom: 1px solid $gray-400;
-	display: block;
-
-	> .components-button.has-icon {
-		margin: 0;
-		padding: 6px 6px 6px $grid-unit;
-		width: 14.625rem;
-		justify-content: flex-start;
-
-		&[aria-expanded="true"] svg {
-			display: block;
-			max-width: $grid-unit-30;
-		}
-		&[aria-expanded="false"] {
-			padding-left: $grid-unit-50;
-		}
-		svg {
-			margin-right: 8px;
-		}
-	}
-}
-
-.is-distraction-free {
-	.interface-interface-skeleton__header {
-		border-bottom: none;
-	}
-
-	.edit-post-header {
-		backdrop-filter: blur(20px) !important;
-		background-color: rgba(255, 255, 255, 0.9);
-		border-bottom: 1px solid #e0e0e0;
-		position: absolute;
-		width: 100%;
-
-
-		// hide some parts
-		& > .edit-post-header__settings > .editor-post-preview {
-			visibility: hidden;
-		}
-
-		& > .edit-post-header__toolbar .edit-post-header-toolbar__inserter-toggle,
-		& > .edit-post-header__toolbar .edit-post-header-toolbar__document-overview-toggle,
-		& > .edit-post-header__settings > .block-editor-post-preview__dropdown,
-		& > .edit-post-header__settings > .interface-pinned-items {
-			display: none;
-		}
-
-	}
-
-	// We need ! important because we override inline styles
-	// set by the motion component.
-	.interface-interface-skeleton__header:focus-within {
-		opacity: 1 !important;
-		div {
-			transform: translateX(0) translateZ(0) !important;
-		}
-
-	}
-
-	.components-editor-notices__dismissible {
-		position: absolute;
-		z-index: 35;
-	}
-}
diff --git a/packages/edit-post/src/components/header/test/index.js b/packages/edit-post/src/components/header/test/index.js
deleted file mode 100644
index 8dc1178c5b4fb4..00000000000000
--- a/packages/edit-post/src/components/header/test/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen } from '@testing-library/react';
-
-/**
- * Internal dependencies
- */
-import { PostPublishButtonOrToggle } from '../post-publish-button-or-toggle';
-
-describe( 'PostPublishButtonOrToggle should render a', () => {
-	it( 'button when the post is published (1)', () => {
-		render( <PostPublishButtonOrToggle isPublished={ true } /> );
-		expect(
-			screen.getByRole( 'button', { name: 'Submit for Review' } )
-		).toBeVisible();
-	} );
-
-	it( 'button when the post is scheduled (2)', () => {
-		render(
-			<PostPublishButtonOrToggle
-				isScheduled={ true }
-				isBeingScheduled={ true }
-			/>
-		);
-		expect(
-			screen.getByRole( 'button', { name: 'Submit for Review' } )
-		).toBeVisible();
-	} );
-
-	it( 'button when the post is pending and cannot be published but the viewport is >= medium (3)', () => {
-		render(
-			<PostPublishButtonOrToggle
-				isPending={ true }
-				hasPublishAction={ false }
-			/>
-		);
-
-		expect(
-			screen.getByRole( 'button', { name: 'Submit for Review' } )
-		).toBeVisible();
-	} );
-
-	it( 'toggle when post is not (1), (2), (3), the viewport is >= medium, and the publish sidebar is enabled', () => {
-		render(
-			<PostPublishButtonOrToggle isPublishSidebarEnabled={ true } />
-		);
-		expect(
-			screen.getByRole( 'button', { name: 'Publish' } )
-		).toBeVisible();
-	} );
-
-	it( 'button when post is not (1), (2), (3), the viewport is >= medium, and the publish sidebar is disabled', () => {
-		render(
-			<PostPublishButtonOrToggle isPublishSidebarEnabled={ false } />
-		);
-		expect(
-			screen.getByRole( 'button', { name: 'Submit for Review' } )
-		).toBeVisible();
-	} );
-} );
diff --git a/packages/edit-post/src/components/header/tools-more-menu-group/index.js b/packages/edit-post/src/components/header/tools-more-menu-group/index.js
deleted file mode 100644
index b7ff7b8ce25f22..00000000000000
--- a/packages/edit-post/src/components/header/tools-more-menu-group/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createSlotFill, MenuGroup } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-const { Fill: ToolsMoreMenuGroup, Slot } =
-	createSlotFill( 'ToolsMoreMenuGroup' );
-
-ToolsMoreMenuGroup.Slot = ( { fillProps } ) => (
-	<Slot fillProps={ fillProps }>
-		{ ( fills ) =>
-			fills.length > 0 && (
-				<MenuGroup label={ __( 'Tools' ) }>{ fills }</MenuGroup>
-			)
-		}
-	</Slot>
-);
-
-export default ToolsMoreMenuGroup;
diff --git a/packages/edit-post/src/components/header/writing-menu/index.js b/packages/edit-post/src/components/header/writing-menu/index.js
deleted file mode 100644
index 26cc6bc5871650..00000000000000
--- a/packages/edit-post/src/components/header/writing-menu/index.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useDispatch, useRegistry } from '@wordpress/data';
-import { MenuGroup } from '@wordpress/components';
-import { __, _x } from '@wordpress/i18n';
-import { useViewportMatch } from '@wordpress/compose';
-import { displayShortcut } from '@wordpress/keycodes';
-import {
-	PreferenceToggleMenuItem,
-	store as preferencesStore,
-} from '@wordpress/preferences';
-
-/**
- * Internal dependencies
- */
-import { store as postEditorStore } from '../../../store';
-
-function WritingMenu() {
-	const registry = useRegistry();
-
-	const { setIsInserterOpened, setIsListViewOpened, closeGeneralSidebar } =
-		useDispatch( postEditorStore );
-	const { set: setPreference } = useDispatch( preferencesStore );
-
-	const toggleDistractionFree = () => {
-		registry.batch( () => {
-			setPreference( 'core/edit-post', 'fixedToolbar', true );
-			setIsInserterOpened( false );
-			setIsListViewOpened( false );
-			closeGeneralSidebar();
-		} );
-	};
-
-	const turnOffDistractionFree = () => {
-		setPreference( 'core/edit-post', 'distractionFree', false );
-	};
-
-	const isLargeViewport = useViewportMatch( 'medium' );
-	if ( ! isLargeViewport ) {
-		return null;
-	}
-
-	return (
-		<MenuGroup label={ _x( 'View', 'noun' ) }>
-			<PreferenceToggleMenuItem
-				scope="core/edit-post"
-				name="fixedToolbar"
-				onToggle={ turnOffDistractionFree }
-				label={ __( 'Top toolbar' ) }
-				info={ __(
-					'Access all block and document tools in a single place'
-				) }
-				messageActivated={ __( 'Top toolbar activated' ) }
-				messageDeactivated={ __( 'Top toolbar deactivated' ) }
-			/>
-			<PreferenceToggleMenuItem
-				scope="core/edit-post"
-				name="distractionFree"
-				onToggle={ toggleDistractionFree }
-				label={ __( 'Distraction free' ) }
-				info={ __( 'Write with calmness' ) }
-				messageActivated={ __( 'Distraction free mode activated' ) }
-				messageDeactivated={ __( 'Distraction free mode deactivated' ) }
-				shortcut={ displayShortcut.primaryShift( '\\' ) }
-			/>
-			<PreferenceToggleMenuItem
-				scope="core/edit-post"
-				name="focusMode"
-				label={ __( 'Spotlight mode' ) }
-				info={ __( 'Focus on one block at a time' ) }
-				messageActivated={ __( 'Spotlight mode activated' ) }
-				messageDeactivated={ __( 'Spotlight mode deactivated' ) }
-			/>
-			<PreferenceToggleMenuItem
-				scope="core/edit-post"
-				name="fullscreenMode"
-				label={ __( 'Fullscreen mode' ) }
-				info={ __( 'Show and hide admin UI' ) }
-				messageActivated={ __( 'Fullscreen mode activated' ) }
-				messageDeactivated={ __( 'Fullscreen mode deactivated' ) }
-				shortcut={ displayShortcut.secondary( 'f' ) }
-			/>
-		</MenuGroup>
-	);
-}
-
-export default WritingMenu;
diff --git a/packages/edit-post/src/components/init-pattern-modal/index.js b/packages/edit-post/src/components/init-pattern-modal/index.js
new file mode 100644
index 00000000000000..1bfeadd73f94a6
--- /dev/null
+++ b/packages/edit-post/src/components/init-pattern-modal/index.js
@@ -0,0 +1,100 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { __, _x } from '@wordpress/i18n';
+import {
+	Modal,
+	Button,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	ToggleControl,
+	TextControl,
+} from '@wordpress/components';
+import { useState } from '@wordpress/element';
+import { store as editorStore } from '@wordpress/editor';
+
+export default function InitPatternModal() {
+	const { editPost } = useDispatch( editorStore );
+	const [ syncType, setSyncType ] = useState( undefined );
+	const [ title, setTitle ] = useState( '' );
+
+	const { postType, isNewPost } = useSelect( ( select ) => {
+		const { getEditedPostAttribute, isCleanNewPost } =
+			select( editorStore );
+		return {
+			postType: getEditedPostAttribute( 'type' ),
+			isNewPost: isCleanNewPost(),
+		};
+	}, [] );
+	const [ isModalOpen, setIsModalOpen ] = useState(
+		() => isNewPost && postType === 'wp_block'
+	);
+
+	if ( postType !== 'wp_block' || ! isNewPost ) {
+		return null;
+	}
+
+	return (
+		<>
+			{ isModalOpen && (
+				<Modal
+					title={ __( 'Create pattern' ) }
+					onRequestClose={ () => {
+						setIsModalOpen( false );
+					} }
+					overlayClassName="reusable-blocks-menu-items__convert-modal"
+				>
+					<form
+						onSubmit={ ( event ) => {
+							event.preventDefault();
+							setIsModalOpen( false );
+							editPost( {
+								title,
+								meta: {
+									wp_pattern_sync_status: syncType,
+								},
+							} );
+						} }
+					>
+						<VStack spacing="5">
+							<TextControl
+								label={ __( 'Name' ) }
+								value={ title }
+								onChange={ setTitle }
+								placeholder={ __( 'My pattern' ) }
+								className="patterns-create-modal__name-input"
+								__nextHasNoMarginBottom
+								__next40pxDefaultSize
+							/>
+							<ToggleControl
+								__nextHasNoMarginBottom
+								label={ _x( 'Synced', 'pattern (singular)' ) }
+								help={ __(
+									'Sync this pattern across multiple locations.'
+								) }
+								checked={ ! syncType }
+								onChange={ () => {
+									setSyncType(
+										! syncType ? 'unsynced' : undefined
+									);
+								} }
+							/>
+							<HStack justify="right">
+								<Button
+									__next40pxDefaultSize
+									variant="primary"
+									type="submit"
+									disabled={ ! title }
+									accessibleWhenDisabled
+								>
+									{ __( 'Create' ) }
+								</Button>
+							</HStack>
+						</VStack>
+					</form>
+				</Modal>
+			) }
+		</>
+	);
+}
diff --git a/packages/edit-post/src/components/keyboard-shortcut-help-modal/config.js b/packages/edit-post/src/components/keyboard-shortcut-help-modal/config.js
deleted file mode 100644
index bd8bb53f5453d3..00000000000000
--- a/packages/edit-post/src/components/keyboard-shortcut-help-modal/config.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
-export const textFormattingShortcuts = [
-	{
-		keyCombination: { modifier: 'primary', character: 'b' },
-		description: __( 'Make the selected text bold.' ),
-	},
-	{
-		keyCombination: { modifier: 'primary', character: 'i' },
-		description: __( 'Make the selected text italic.' ),
-	},
-	{
-		keyCombination: { modifier: 'primary', character: 'k' },
-		description: __( 'Convert the selected text into a link.' ),
-	},
-	{
-		keyCombination: { modifier: 'primaryShift', character: 'k' },
-		description: __( 'Remove a link.' ),
-	},
-	{
-		keyCombination: { character: '[[' },
-		description: __( 'Insert a link to a post or page.' ),
-	},
-	{
-		keyCombination: { modifier: 'primary', character: 'u' },
-		description: __( 'Underline the selected text.' ),
-	},
-	{
-		keyCombination: { modifier: 'access', character: 'd' },
-		description: __( 'Strikethrough the selected text.' ),
-	},
-	{
-		keyCombination: { modifier: 'access', character: 'x' },
-		description: __( 'Make the selected text inline code.' ),
-	},
-	{
-		keyCombination: { modifier: 'access', character: '0' },
-		description: __( 'Convert the current heading to a paragraph.' ),
-	},
-	{
-		keyCombination: { modifier: 'access', character: '1-6' },
-		description: __(
-			'Convert the current paragraph or heading to a heading of level 1 to 6.'
-		),
-	},
-];
diff --git a/packages/edit-post/src/components/keyboard-shortcut-help-modal/index.js b/packages/edit-post/src/components/keyboard-shortcut-help-modal/index.js
deleted file mode 100644
index 9a7ce46704d479..00000000000000
--- a/packages/edit-post/src/components/keyboard-shortcut-help-modal/index.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { Modal } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import {
-	useShortcut,
-	store as keyboardShortcutsStore,
-} from '@wordpress/keyboard-shortcuts';
-import { withSelect, withDispatch, useSelect } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
-import { store as interfaceStore } from '@wordpress/interface';
-
-/**
- * Internal dependencies
- */
-import { textFormattingShortcuts } from './config';
-import Shortcut from './shortcut';
-import DynamicShortcut from './dynamic-shortcut';
-
-export const KEYBOARD_SHORTCUT_HELP_MODAL_NAME =
-	'edit-post/keyboard-shortcut-help';
-
-const ShortcutList = ( { shortcuts } ) => (
-	/*
-	 * Disable reason: The `list` ARIA role is redundant but
-	 * Safari+VoiceOver won't announce the list otherwise.
-	 */
-	/* eslint-disable jsx-a11y/no-redundant-roles */
-	<ul
-		className="edit-post-keyboard-shortcut-help-modal__shortcut-list"
-		role="list"
-	>
-		{ shortcuts.map( ( shortcut, index ) => (
-			<li
-				className="edit-post-keyboard-shortcut-help-modal__shortcut"
-				key={ index }
-			>
-				{ typeof shortcut === 'string' ? (
-					<DynamicShortcut name={ shortcut } />
-				) : (
-					<Shortcut { ...shortcut } />
-				) }
-			</li>
-		) ) }
-	</ul>
-	/* eslint-enable jsx-a11y/no-redundant-roles */
-);
-
-const ShortcutSection = ( { title, shortcuts, className } ) => (
-	<section
-		className={ classnames(
-			'edit-post-keyboard-shortcut-help-modal__section',
-			className
-		) }
-	>
-		{ !! title && (
-			<h2 className="edit-post-keyboard-shortcut-help-modal__section-title">
-				{ title }
-			</h2>
-		) }
-		<ShortcutList shortcuts={ shortcuts } />
-	</section>
-);
-
-const ShortcutCategorySection = ( {
-	title,
-	categoryName,
-	additionalShortcuts = [],
-} ) => {
-	const categoryShortcuts = useSelect(
-		( select ) => {
-			return select( keyboardShortcutsStore ).getCategoryShortcuts(
-				categoryName
-			);
-		},
-		[ categoryName ]
-	);
-
-	return (
-		<ShortcutSection
-			title={ title }
-			shortcuts={ categoryShortcuts.concat( additionalShortcuts ) }
-		/>
-	);
-};
-
-export function KeyboardShortcutHelpModal( { isModalActive, toggleModal } ) {
-	useShortcut( 'core/edit-post/keyboard-shortcuts', toggleModal );
-
-	if ( ! isModalActive ) {
-		return null;
-	}
-
-	return (
-		<Modal
-			className="edit-post-keyboard-shortcut-help-modal"
-			title={ __( 'Keyboard shortcuts' ) }
-			closeButtonLabel={ __( 'Close' ) }
-			onRequestClose={ toggleModal }
-		>
-			<ShortcutSection
-				className="edit-post-keyboard-shortcut-help-modal__main-shortcuts"
-				shortcuts={ [ 'core/edit-post/keyboard-shortcuts' ] }
-			/>
-			<ShortcutCategorySection
-				title={ __( 'Global shortcuts' ) }
-				categoryName="global"
-			/>
-
-			<ShortcutCategorySection
-				title={ __( 'Selection shortcuts' ) }
-				categoryName="selection"
-			/>
-
-			<ShortcutCategorySection
-				title={ __( 'Block shortcuts' ) }
-				categoryName="block"
-				additionalShortcuts={ [
-					{
-						keyCombination: { character: '/' },
-						description: __(
-							'Change the block type after adding a new paragraph.'
-						),
-						/* translators: The forward-slash character. e.g. '/'. */
-						ariaLabel: __( 'Forward-slash' ),
-					},
-				] }
-			/>
-			<ShortcutSection
-				title={ __( 'Text formatting' ) }
-				shortcuts={ textFormattingShortcuts }
-			/>
-		</Modal>
-	);
-}
-
-export default compose( [
-	withSelect( ( select ) => ( {
-		isModalActive: select( interfaceStore ).isModalActive(
-			KEYBOARD_SHORTCUT_HELP_MODAL_NAME
-		),
-	} ) ),
-	withDispatch( ( dispatch, { isModalActive } ) => {
-		const { openModal, closeModal } = dispatch( interfaceStore );
-
-		return {
-			toggleModal: () =>
-				isModalActive
-					? closeModal()
-					: openModal( KEYBOARD_SHORTCUT_HELP_MODAL_NAME ),
-		};
-	} ),
-] )( KeyboardShortcutHelpModal );
diff --git a/packages/edit-post/src/components/keyboard-shortcut-help-modal/shortcut.js b/packages/edit-post/src/components/keyboard-shortcut-help-modal/shortcut.js
deleted file mode 100644
index 2b18cd099a3388..00000000000000
--- a/packages/edit-post/src/components/keyboard-shortcut-help-modal/shortcut.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Fragment } from '@wordpress/element';
-import { displayShortcutList, shortcutAriaLabel } from '@wordpress/keycodes';
-
-function KeyCombination( { keyCombination, forceAriaLabel } ) {
-	const shortcut = keyCombination.modifier
-		? displayShortcutList[ keyCombination.modifier ](
-				keyCombination.character
-		  )
-		: keyCombination.character;
-	const ariaLabel = keyCombination.modifier
-		? shortcutAriaLabel[ keyCombination.modifier ](
-				keyCombination.character
-		  )
-		: keyCombination.character;
-
-	return (
-		<kbd
-			className="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-			aria-label={ forceAriaLabel || ariaLabel }
-		>
-			{ ( Array.isArray( shortcut ) ? shortcut : [ shortcut ] ).map(
-				( character, index ) => {
-					if ( character === '+' ) {
-						return <Fragment key={ index }>{ character }</Fragment>;
-					}
-
-					return (
-						<kbd
-							key={ index }
-							className="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-						>
-							{ character }
-						</kbd>
-					);
-				}
-			) }
-		</kbd>
-	);
-}
-
-function Shortcut( { description, keyCombination, aliases = [], ariaLabel } ) {
-	return (
-		<>
-			<div className="edit-post-keyboard-shortcut-help-modal__shortcut-description">
-				{ description }
-			</div>
-			<div className="edit-post-keyboard-shortcut-help-modal__shortcut-term">
-				<KeyCombination
-					keyCombination={ keyCombination }
-					forceAriaLabel={ ariaLabel }
-				/>
-				{ aliases.map( ( alias, index ) => (
-					<KeyCombination
-						keyCombination={ alias }
-						forceAriaLabel={ ariaLabel }
-						key={ index }
-					/>
-				) ) }
-			</div>
-		</>
-	);
-}
-
-export default Shortcut;
diff --git a/packages/edit-post/src/components/keyboard-shortcut-help-modal/style.scss b/packages/edit-post/src/components/keyboard-shortcut-help-modal/style.scss
deleted file mode 100644
index c21c5a5fc7db2f..00000000000000
--- a/packages/edit-post/src/components/keyboard-shortcut-help-modal/style.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-.edit-post-keyboard-shortcut-help-modal {
-	&__section {
-		margin: 0 0 2rem 0;
-	}
-
-	&__section-title {
-		font-size: 0.9rem;
-		font-weight: 600;
-	}
-
-	&__shortcut {
-		display: flex;
-		align-items: baseline;
-		padding: 0.6rem 0;
-		border-top: 1px solid $gray-300;
-		margin-bottom: 0;
-
-		&:last-child {
-			border-bottom: 1px solid $gray-300;
-		}
-
-		&:empty {
-			display: none;
-		}
-	}
-
-	&__shortcut-term {
-		font-weight: 600;
-		margin: 0 0 0 1rem;
-		text-align: right;
-	}
-
-	&__shortcut-description {
-		flex: 1;
-		margin: 0;
-
-		// IE 11 flex item fix - ensure the item does not collapse.
-		flex-basis: auto;
-	}
-
-	&__shortcut-key-combination {
-		display: block;
-		background: none;
-		margin: 0;
-		padding: 0;
-
-		& + .edit-post-keyboard-shortcut-help-modal__shortcut-key-combination {
-			margin-top: 10px;
-		}
-	}
-
-	&__shortcut-key {
-		padding: 0.25rem 0.5rem;
-		border-radius: 8%;
-		margin: 0 0.2rem 0 0.2rem;
-
-		&:last-child {
-			margin: 0 0 0 0.2rem;
-		}
-	}
-}
diff --git a/packages/edit-post/src/components/keyboard-shortcut-help-modal/test/__snapshots__/index.js.snap b/packages/edit-post/src/components/keyboard-shortcut-help-modal/test/__snapshots__/index.js.snap
deleted file mode 100644
index b98bd562f0a6a3..00000000000000
--- a/packages/edit-post/src/components/keyboard-shortcut-help-modal/test/__snapshots__/index.js.snap
+++ /dev/null
@@ -1,929 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`KeyboardShortcutHelpModal should match snapshot when the modal is active 1`] = `
-<div
-  aria-labelledby="components-modal-header-0"
-  class="components-modal__frame edit-post-keyboard-shortcut-help-modal"
-  role="dialog"
-  tabindex="-1"
->
-  <div
-    class="components-modal__content"
-    role="document"
-  >
-    <div
-      class="components-modal__header"
-    >
-      <div
-        class="components-modal__header-heading-container"
-      >
-        <h1
-          class="components-modal__header-heading"
-          id="components-modal-header-0"
-        >
-          Keyboard shortcuts
-        </h1>
-      </div>
-      <button
-        aria-label="Close"
-        class="components-button has-icon"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          focusable="false"
-          height="24"
-          viewBox="0 0 24 24"
-          width="24"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"
-          />
-        </svg>
-      </button>
-    </div>
-    <div>
-      <section
-        class="edit-post-keyboard-shortcut-help-modal__section edit-post-keyboard-shortcut-help-modal__main-shortcuts"
-      >
-        <ul
-          class="edit-post-keyboard-shortcut-help-modal__shortcut-list"
-          role="list"
-        >
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          />
-        </ul>
-      </section>
-      <section
-        class="edit-post-keyboard-shortcut-help-modal__section"
-      >
-        <h2
-          class="edit-post-keyboard-shortcut-help-modal__section-title"
-        >
-          Global shortcuts
-        </h2>
-        <ul
-          class="edit-post-keyboard-shortcut-help-modal__shortcut-list"
-          role="list"
-        >
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Navigate to the nearest toolbar.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Alt + F10"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  F10
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Save your changes.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + S"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  S
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Undo your last changes.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + Z"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Z
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Redo your last undo.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + Shift + Z"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Z
-                </kbd>
-              </kbd>
-              <kbd
-                aria-label="Control + Y"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Y
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-        </ul>
-      </section>
-      <section
-        class="edit-post-keyboard-shortcut-help-modal__section"
-      >
-        <h2
-          class="edit-post-keyboard-shortcut-help-modal__section-title"
-        >
-          Selection shortcuts
-        </h2>
-        <ul
-          class="edit-post-keyboard-shortcut-help-modal__shortcut-list"
-          role="list"
-        >
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Select all text when typing. Press again to select all blocks.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + A"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  A
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Clear selection.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="escape"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  escape
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Select text across multiple blocks.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Shift + Arrow"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Arrow
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-        </ul>
-      </section>
-      <section
-        class="edit-post-keyboard-shortcut-help-modal__section"
-      >
-        <h2
-          class="edit-post-keyboard-shortcut-help-modal__section-title"
-        >
-          Block shortcuts
-        </h2>
-        <ul
-          class="edit-post-keyboard-shortcut-help-modal__shortcut-list"
-          role="list"
-        >
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Duplicate the selected block(s).
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + Shift + D"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  D
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Remove the selected block(s).
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Shift + Alt + Z"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Z
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Insert a new block before the selected block(s).
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + Alt + T"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  T
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Insert a new block after the selected block(s).
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + Alt + Y"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Y
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Delete selection.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="del"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  del
-                </kbd>
-              </kbd>
-              <kbd
-                aria-label="backspace"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  backspace
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Move the selected block(s) up.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + Shift + Alt + T"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  T
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Move the selected block(s) down.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + Shift + Alt + Y"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Y
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Change the block type after adding a new paragraph.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Forward-slash"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  /
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-        </ul>
-      </section>
-      <section
-        class="edit-post-keyboard-shortcut-help-modal__section"
-      >
-        <h2
-          class="edit-post-keyboard-shortcut-help-modal__section-title"
-        >
-          Text formatting
-        </h2>
-        <ul
-          class="edit-post-keyboard-shortcut-help-modal__shortcut-list"
-          role="list"
-        >
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Make the selected text bold.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + B"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  B
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Make the selected text italic.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + I"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  I
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Convert the selected text into a link.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + K"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  K
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Remove a link.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + Shift + K"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  K
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Insert a link to a post or page.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="[["
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  [[
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Underline the selected text.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Control + U"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Ctrl
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  U
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Strikethrough the selected text.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Shift + Alt + D"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  D
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Make the selected text inline code.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Shift + Alt + X"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  X
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Convert the current heading to a paragraph.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Shift + Alt + 0"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  0
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-          <li
-            class="edit-post-keyboard-shortcut-help-modal__shortcut"
-          >
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-description"
-            >
-              Convert the current paragraph or heading to a heading of level 1 to 6.
-            </div>
-            <div
-              class="edit-post-keyboard-shortcut-help-modal__shortcut-term"
-            >
-              <kbd
-                aria-label="Shift + Alt + 1 6"
-                class="edit-post-keyboard-shortcut-help-modal__shortcut-key-combination"
-              >
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Shift
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  Alt
-                </kbd>
-                +
-                <kbd
-                  class="edit-post-keyboard-shortcut-help-modal__shortcut-key"
-                >
-                  1-6
-                </kbd>
-              </kbd>
-            </div>
-          </li>
-        </ul>
-      </section>
-    </div>
-  </div>
-</div>
-`;
diff --git a/packages/edit-post/src/components/keyboard-shortcut-help-modal/test/index.js b/packages/edit-post/src/components/keyboard-shortcut-help-modal/test/index.js
deleted file mode 100644
index 0380e648a17331..00000000000000
--- a/packages/edit-post/src/components/keyboard-shortcut-help-modal/test/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen } from '@testing-library/react';
-
-/**
- * WordPress dependencies
- */
-import { EditorKeyboardShortcutsRegister } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { KeyboardShortcutHelpModal } from '../index';
-
-const noop = () => {};
-
-describe( 'KeyboardShortcutHelpModal', () => {
-	it( 'should match snapshot when the modal is active', () => {
-		render(
-			<>
-				<EditorKeyboardShortcutsRegister />
-				<KeyboardShortcutHelpModal isModalActive toggleModal={ noop } />
-			</>
-		);
-
-		expect(
-			screen.getByRole( 'dialog', {
-				name: 'Keyboard shortcuts',
-			} )
-		).toMatchSnapshot();
-	} );
-
-	it( 'should not render the modal when inactive', () => {
-		render(
-			<>
-				<EditorKeyboardShortcutsRegister />
-				<KeyboardShortcutHelpModal
-					isModalActive={ false }
-					toggleModal={ noop }
-				/>
-			</>
-		);
-
-		expect(
-			screen.queryByRole( 'dialog', {
-				name: 'Keyboard shortcuts',
-			} )
-		).not.toBeInTheDocument();
-	} );
-} );
diff --git a/packages/edit-post/src/components/keyboard-shortcuts/index.js b/packages/edit-post/src/components/keyboard-shortcuts/index.js
index 48f9b185cd9435..108671a8f66321 100644
--- a/packages/edit-post/src/components/keyboard-shortcuts/index.js
+++ b/packages/edit-post/src/components/keyboard-shortcuts/index.js
@@ -2,15 +2,12 @@
  * WordPress dependencies
  */
 import { useEffect } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useDispatch } from '@wordpress/data';
 import {
 	useShortcut,
 	store as keyboardShortcutsStore,
 } from '@wordpress/keyboard-shortcuts';
 import { __ } from '@wordpress/i18n';
-import { store as editorStore } from '@wordpress/editor';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -18,81 +15,10 @@ import { createBlock } from '@wordpress/blocks';
 import { store as editPostStore } from '../../store';
 
 function KeyboardShortcuts() {
-	const { getEditorMode, isEditorSidebarOpened, isListViewOpened } =
-		useSelect( editPostStore );
-	const isModeToggleDisabled = useSelect( ( select ) => {
-		const { richEditingEnabled, codeEditingEnabled } =
-			select( editorStore ).getEditorSettings();
-		return ! richEditingEnabled || ! codeEditingEnabled;
-	}, [] );
-
-	const {
-		switchEditorMode,
-		openGeneralSidebar,
-		closeGeneralSidebar,
-		toggleFeature,
-		setIsListViewOpened,
-		toggleDistractionFree,
-	} = useDispatch( editPostStore );
+	const { toggleFeature } = useDispatch( editPostStore );
 	const { registerShortcut } = useDispatch( keyboardShortcutsStore );
 
-	const { replaceBlocks } = useDispatch( blockEditorStore );
-	const {
-		getBlockName,
-		getSelectedBlockClientId,
-		getBlockAttributes,
-		getBlockSelectionStart,
-	} = useSelect( blockEditorStore );
-
-	const handleTextLevelShortcut = ( event, level ) => {
-		event.preventDefault();
-		const destinationBlockName =
-			level === 0 ? 'core/paragraph' : 'core/heading';
-		const currentClientId = getSelectedBlockClientId();
-		if ( currentClientId === null ) {
-			return;
-		}
-		const blockName = getBlockName( currentClientId );
-		if ( blockName !== 'core/paragraph' && blockName !== 'core/heading' ) {
-			return;
-		}
-		const attributes = getBlockAttributes( currentClientId );
-		const textAlign =
-			blockName === 'core/paragraph' ? 'align' : 'textAlign';
-		const destinationTextAlign =
-			destinationBlockName === 'core/paragraph' ? 'align' : 'textAlign';
-
-		replaceBlocks(
-			currentClientId,
-			createBlock( destinationBlockName, {
-				level,
-				content: attributes.content,
-				...{ [ destinationTextAlign ]: attributes[ textAlign ] },
-			} )
-		);
-	};
-
 	useEffect( () => {
-		registerShortcut( {
-			name: 'core/edit-post/toggle-mode',
-			category: 'global',
-			description: __( 'Switch between visual editor and code editor.' ),
-			keyCombination: {
-				modifier: 'secondary',
-				character: 'm',
-			},
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-post/toggle-distraction-free',
-			category: 'global',
-			description: __( 'Toggle distraction free mode.' ),
-			keyCombination: {
-				modifier: 'primaryShift',
-				character: '\\',
-			},
-		} );
-
 		registerShortcut( {
 			name: 'core/edit-post/toggle-fullscreen',
 			category: 'global',
@@ -102,153 +28,12 @@ function KeyboardShortcuts() {
 				character: 'f',
 			},
 		} );
-
-		registerShortcut( {
-			name: 'core/edit-post/toggle-list-view',
-			category: 'global',
-			description: __( 'Open the block list view.' ),
-			keyCombination: {
-				modifier: 'access',
-				character: 'o',
-			},
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-post/toggle-sidebar',
-			category: 'global',
-			description: __( 'Show or hide the Settings sidebar.' ),
-			keyCombination: {
-				modifier: 'primaryShift',
-				character: ',',
-			},
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-post/next-region',
-			category: 'global',
-			description: __( 'Navigate to the next part of the editor.' ),
-			keyCombination: {
-				modifier: 'ctrl',
-				character: '`',
-			},
-			aliases: [
-				{
-					modifier: 'access',
-					character: 'n',
-				},
-			],
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-post/previous-region',
-			category: 'global',
-			description: __( 'Navigate to the previous part of the editor.' ),
-			keyCombination: {
-				modifier: 'ctrlShift',
-				character: '`',
-			},
-			aliases: [
-				{
-					modifier: 'access',
-					character: 'p',
-				},
-				{
-					modifier: 'ctrlShift',
-					character: '~',
-				},
-			],
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-post/keyboard-shortcuts',
-			category: 'main',
-			description: __( 'Display these keyboard shortcuts.' ),
-			keyCombination: {
-				modifier: 'access',
-				character: 'h',
-			},
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-post/transform-heading-to-paragraph',
-			category: 'block-library',
-			description: __( 'Transform heading to paragraph.' ),
-			keyCombination: {
-				modifier: 'access',
-				character: `0`,
-			},
-		} );
-
-		[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
-			registerShortcut( {
-				name: `core/edit-post/transform-paragraph-to-heading-${ level }`,
-				category: 'block-library',
-				description: __( 'Transform paragraph to heading.' ),
-				keyCombination: {
-					modifier: 'access',
-					character: `${ level }`,
-				},
-			} );
-		} );
 	}, [] );
 
-	useShortcut(
-		'core/edit-post/toggle-mode',
-		() => {
-			switchEditorMode(
-				getEditorMode() === 'visual' ? 'text' : 'visual'
-			);
-		},
-		{
-			isDisabled: isModeToggleDisabled,
-		}
-	);
-
 	useShortcut( 'core/edit-post/toggle-fullscreen', () => {
 		toggleFeature( 'fullscreenMode' );
 	} );
 
-	useShortcut( 'core/edit-post/toggle-distraction-free', () => {
-		toggleDistractionFree();
-	} );
-
-	useShortcut( 'core/edit-post/toggle-sidebar', ( event ) => {
-		// This shortcut has no known clashes, but use preventDefault to prevent any
-		// obscure shortcuts from triggering.
-		event.preventDefault();
-
-		if ( isEditorSidebarOpened() ) {
-			closeGeneralSidebar();
-		} else {
-			const sidebarToOpen = getBlockSelectionStart()
-				? 'edit-post/block'
-				: 'edit-post/document';
-			openGeneralSidebar( sidebarToOpen );
-		}
-	} );
-
-	// Only opens the list view. Other functionality for this shortcut happens in the rendered sidebar.
-	useShortcut( 'core/edit-post/toggle-list-view', ( event ) => {
-		if ( ! isListViewOpened() ) {
-			event.preventDefault();
-			setIsListViewOpened( true );
-		}
-	} );
-
-	useShortcut( 'core/edit-post/transform-heading-to-paragraph', ( event ) =>
-		handleTextLevelShortcut( event, 0 )
-	);
-
-	[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
-		//the loop is based off on a constant therefore
-		//the hook will execute the same way every time
-		//eslint-disable-next-line react-hooks/rules-of-hooks
-		useShortcut(
-			`core/edit-post/transform-paragraph-to-heading-${ level }`,
-			( event ) => handleTextLevelShortcut( event, level )
-		);
-	} );
-
 	return null;
 }
 
diff --git a/packages/edit-post/src/components/layout/actions-panel.js b/packages/edit-post/src/components/layout/actions-panel.js
deleted file mode 100644
index d8dd73ed4c6031..00000000000000
--- a/packages/edit-post/src/components/layout/actions-panel.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	EntitiesSavedStates,
-	PostPublishPanel,
-	store as editorStore,
-} from '@wordpress/editor';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { Button, createSlotFill } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useCallback } from '@wordpress/element';
-/**
- * Internal dependencies
- */
-import PluginPostPublishPanel from '../sidebar/plugin-post-publish-panel';
-import PluginPrePublishPanel from '../sidebar/plugin-pre-publish-panel';
-import { store as editPostStore } from '../../store';
-
-const { Fill, Slot } = createSlotFill( 'ActionsPanel' );
-
-export const ActionsPanelFill = Fill;
-
-export default function ActionsPanel( {
-	setEntitiesSavedStatesCallback,
-	closeEntitiesSavedStates,
-	isEntitiesSavedStatesOpen,
-} ) {
-	const { closePublishSidebar, togglePublishSidebar } =
-		useDispatch( editPostStore );
-	const {
-		publishSidebarOpened,
-		hasActiveMetaboxes,
-		hasNonPostEntityChanges,
-	} = useSelect(
-		( select ) => ( {
-			publishSidebarOpened:
-				select( editPostStore ).isPublishSidebarOpened(),
-			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
-			hasNonPostEntityChanges:
-				select( editorStore ).hasNonPostEntityChanges(),
-		} ),
-		[]
-	);
-
-	const openEntitiesSavedStates = useCallback(
-		() => setEntitiesSavedStatesCallback( true ),
-		[]
-	);
-
-	// It is ok for these components to be unmounted when not in visual use.
-	// We don't want more than one present at a time, decide which to render.
-	let unmountableContent;
-	if ( publishSidebarOpened ) {
-		unmountableContent = (
-			<PostPublishPanel
-				onClose={ closePublishSidebar }
-				forceIsDirty={ hasActiveMetaboxes }
-				PrePublishExtension={ PluginPrePublishPanel.Slot }
-				PostPublishExtension={ PluginPostPublishPanel.Slot }
-			/>
-		);
-	} else if ( hasNonPostEntityChanges ) {
-		unmountableContent = (
-			<div className="edit-post-layout__toggle-entities-saved-states-panel">
-				<Button
-					variant="secondary"
-					className="edit-post-layout__toggle-entities-saved-states-panel-button"
-					onClick={ openEntitiesSavedStates }
-					aria-expanded={ false }
-				>
-					{ __( 'Open save panel' ) }
-				</Button>
-			</div>
-		);
-	} else {
-		unmountableContent = (
-			<div className="edit-post-layout__toggle-publish-panel">
-				<Button
-					variant="secondary"
-					className="edit-post-layout__toggle-publish-panel-button"
-					onClick={ togglePublishSidebar }
-					aria-expanded={ false }
-				>
-					{ __( 'Open publish panel' ) }
-				</Button>
-			</div>
-		);
-	}
-
-	// Since EntitiesSavedStates controls its own panel, we can keep it
-	// always mounted to retain its own component state (such as checkboxes).
-	return (
-		<>
-			{ isEntitiesSavedStatesOpen && (
-				<EntitiesSavedStates close={ closeEntitiesSavedStates } />
-			) }
-			<Slot bubblesVirtually />
-			{ ! isEntitiesSavedStatesOpen && unmountableContent }
-		</>
-	);
-}
diff --git a/packages/edit-post/src/components/layout/index.js b/packages/edit-post/src/components/layout/index.js
index bbf33613cb4241..42250054a70873 100644
--- a/packages/edit-post/src/components/layout/index.js
+++ b/packages/edit-post/src/components/layout/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -10,85 +10,93 @@ import {
 	AutosaveMonitor,
 	LocalAutosaveMonitor,
 	UnsavedChangesWarning,
-	EditorNotices,
 	EditorKeyboardShortcutsRegister,
-	EditorKeyboardShortcuts,
 	EditorSnackbars,
-	PostSyncStatusModal,
+	ErrorBoundary,
+	PostLockedModal,
 	store as editorStore,
+	privateApis as editorPrivateApis,
 } from '@wordpress/editor';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
-	useBlockCommands,
-	BlockBreadcrumb,
 	privateApis as blockEditorPrivateApis,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { Button, ScrollLock } from '@wordpress/components';
-import { useViewportMatch } from '@wordpress/compose';
 import { PluginArea } from '@wordpress/plugins';
-import { __, _x, sprintf } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 import {
-	ComplementaryArea,
-	FullscreenMode,
-	InterfaceSkeleton,
-	store as interfaceStore,
-} from '@wordpress/interface';
-import { useState, useEffect, useCallback, useMemo } from '@wordpress/element';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
+	useCallback,
+	useMemo,
+	useId,
+	useRef,
+	useState,
+} from '@wordpress/element';
+import { chevronDown, chevronUp } from '@wordpress/icons';
 import { store as noticesStore } from '@wordpress/notices';
-
-import { privateApis as commandsPrivateApis } from '@wordpress/commands';
+import { store as preferencesStore } from '@wordpress/preferences';
+import {
+	CommandMenu,
+	privateApis as commandsPrivateApis,
+} from '@wordpress/commands';
 import { privateApis as coreCommandsPrivateApis } from '@wordpress/core-commands';
-
-const { useCommands } = unlock( coreCommandsPrivateApis );
-const { useCommandContext } = unlock( commandsPrivateApis );
+import { privateApis as blockLibraryPrivateApis } from '@wordpress/block-library';
+import { addQueryArgs } from '@wordpress/url';
+import { decodeEntities } from '@wordpress/html-entities';
+import { store as coreStore } from '@wordpress/core-data';
+import {
+	Icon,
+	ResizableBox,
+	SlotFillProvider,
+	Tooltip,
+	VisuallyHidden,
+	__unstableUseNavigateRegions as useNavigateRegions,
+} from '@wordpress/components';
+import {
+	useMediaQuery,
+	useRefEffect,
+	useViewportMatch,
+} from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
-import TextEditor from '../text-editor';
-import VisualEditor from '../visual-editor';
+import BackButton from '../back-button';
+import EditorInitialization from '../editor-initialization';
 import EditPostKeyboardShortcuts from '../keyboard-shortcuts';
-import KeyboardShortcutHelpModal from '../keyboard-shortcut-help-modal';
-import EditPostPreferencesModal from '../preferences-modal';
+import InitPatternModal from '../init-pattern-modal';
 import BrowserURL from '../browser-url';
-import Header from '../header';
-import InserterSidebar from '../secondary-sidebar/inserter-sidebar';
-import ListViewSidebar from '../secondary-sidebar/list-view-sidebar';
-import SettingsSidebar from '../sidebar/settings-sidebar';
 import MetaBoxes from '../meta-boxes';
+import PostEditorMoreMenu from '../more-menu';
 import WelcomeGuide from '../welcome-guide';
-import ActionsPanel from './actions-panel';
-import StartPageOptions from '../start-page-options';
 import { store as editPostStore } from '../../store';
 import { unlock } from '../../lock-unlock';
-import useCommonCommands from '../../hooks/commands/use-common-commands';
+import useEditPostCommands from '../../commands/use-commands';
+import { usePaddingAppender } from './use-padding-appender';
+import { useShouldIframe } from './use-should-iframe';
+import useNavigateToEntityRecord from '../../hooks/use-navigate-to-entity-record';
 
 const { getLayoutStyles } = unlock( blockEditorPrivateApis );
+const { useCommands } = unlock( coreCommandsPrivateApis );
+const { useCommandContext } = unlock( commandsPrivateApis );
+const { Editor, FullscreenMode, NavigableRegion } = unlock( editorPrivateApis );
+const { BlockKeyboardShortcuts } = unlock( blockLibraryPrivateApis );
+const DESIGN_POST_TYPES = [
+	'wp_template',
+	'wp_template_part',
+	'wp_block',
+	'wp_navigation',
+];
 
-const interfaceLabels = {
-	/* translators: accessibility text for the editor top bar landmark region. */
-	header: __( 'Editor top bar' ),
-	/* translators: accessibility text for the editor content landmark region. */
-	body: __( 'Editor content' ),
-	/* translators: accessibility text for the editor settings landmark region. */
-	sidebar: __( 'Editor settings' ),
-	/* translators: accessibility text for the editor publish landmark region. */
-	actions: __( 'Editor publish' ),
-	/* translators: accessibility text for the editor footer landmark region. */
-	footer: __( 'Editor footer' ),
-};
-
-function useEditorStyles() {
-	const { hasThemeStyleSupport, editorSettings } = useSelect(
-		( select ) => ( {
+function useEditorStyles( ...additionalStyles ) {
+	const { hasThemeStyleSupport, editorSettings } = useSelect( ( select ) => {
+		return {
 			hasThemeStyleSupport:
 				select( editPostStore ).isFeatureActive( 'themeStyles' ),
 			editorSettings: select( editorStore ).getEditorSettings(),
-		} ),
-		[]
-	);
+		};
+	}, [] );
+
+	const addedStyles = additionalStyles.join( '\n' );
 
 	// Compute the default styles.
 	return useMemo( () => {
@@ -99,7 +107,7 @@ function useEditorStyles() {
 			) ?? [];
 
 		const defaultEditorStyles = [
-			...editorSettings.defaultEditorStyles,
+			...( editorSettings?.defaultEditorStyles ?? [] ),
 			...presetStyles,
 		];
 
@@ -122,127 +130,338 @@ function useEditorStyles() {
 			} );
 		}
 
-		return hasThemeStyles ? editorSettings.styles : defaultEditorStyles;
+		const baseStyles = hasThemeStyles
+			? editorSettings.styles ?? []
+			: defaultEditorStyles;
+
+		if ( addedStyles ) {
+			return [ ...baseStyles, { css: addedStyles } ];
+		}
+
+		return baseStyles;
 	}, [
 		editorSettings.defaultEditorStyles,
 		editorSettings.disableLayoutStyles,
 		editorSettings.styles,
 		hasThemeStyleSupport,
+		addedStyles,
 	] );
 }
 
-function Layout() {
+/**
+ * @param {Object}  props
+ * @param {boolean} props.isLegacy True when the editor canvas is not in an iframe.
+ */
+function MetaBoxesMain( { isLegacy } ) {
+	const [ isOpen, openHeight, hasAnyVisible ] = useSelect( ( select ) => {
+		const { get } = select( preferencesStore );
+		const { isMetaBoxLocationVisible } = select( editPostStore );
+		return [
+			get( 'core/edit-post', 'metaBoxesMainIsOpen' ),
+			get( 'core/edit-post', 'metaBoxesMainOpenHeight' ),
+			isMetaBoxLocationVisible( 'normal' ) ||
+				isMetaBoxLocationVisible( 'advanced' ) ||
+				isMetaBoxLocationVisible( 'side' ),
+		];
+	}, [] );
+	const { set: setPreference } = useDispatch( preferencesStore );
+	const metaBoxesMainRef = useRef();
+	const isShort = useMediaQuery( '(max-height: 549px)' );
+
+	const [ { min, max }, setHeightConstraints ] = useState( () => ( {} ) );
+	// Keeps the resizable area’s size constraints updated taking into account
+	// editor notices. The constraints are also used to derive the value for the
+	// aria-valuenow attribute on the seperator.
+	const effectSizeConstraints = useRefEffect( ( node ) => {
+		const container = node.closest(
+			'.interface-interface-skeleton__content'
+		);
+		const noticeLists = container.querySelectorAll(
+			':scope > .components-notice-list'
+		);
+		const resizeHandle = container.querySelector(
+			'.edit-post-meta-boxes-main__presenter'
+		);
+		const deriveConstraints = () => {
+			const fullHeight = container.offsetHeight;
+			let nextMax = fullHeight;
+			for ( const element of noticeLists ) {
+				nextMax -= element.offsetHeight;
+			}
+			const nextMin = resizeHandle.offsetHeight;
+			setHeightConstraints( { min: nextMin, max: nextMax } );
+		};
+		const observer = new window.ResizeObserver( deriveConstraints );
+		observer.observe( container );
+		for ( const element of noticeLists ) {
+			observer.observe( element );
+		}
+		return () => observer.disconnect();
+	}, [] );
+
+	const separatorRef = useRef();
+	const separatorHelpId = useId();
+
+	const [ isUntouched, setIsUntouched ] = useState( true );
+	const applyHeight = ( candidateHeight, isPersistent, isInstant ) => {
+		const nextHeight = Math.min( max, Math.max( min, candidateHeight ) );
+		if ( isPersistent ) {
+			setPreference(
+				'core/edit-post',
+				'metaBoxesMainOpenHeight',
+				nextHeight
+			);
+		} else {
+			separatorRef.current.ariaValueNow = getAriaValueNow( nextHeight );
+		}
+		if ( isInstant ) {
+			metaBoxesMainRef.current.updateSize( {
+				height: nextHeight,
+				// Oddly, when the event that triggered this was not from the mouse (e.g. keydown),
+				// if `width` is left unspecified a subsequent drag gesture applies a fixed
+				// width and the pane fails to widen/narrow with parent width changes from
+				// sidebars opening/closing or window resizes.
+				width: 'auto',
+			} );
+		}
+	};
+
+	if ( ! hasAnyVisible ) {
+		return;
+	}
+
+	const contents = (
+		<div
+			className={ clsx(
+				// The class name 'edit-post-layout__metaboxes' is retained because some plugins use it.
+				'edit-post-layout__metaboxes',
+				! isLegacy && 'edit-post-meta-boxes-main__liner'
+			) }
+			hidden={ ! isLegacy && isShort && ! isOpen }
+		>
+			<MetaBoxes location="normal" />
+			<MetaBoxes location="advanced" />
+		</div>
+	);
+
+	if ( isLegacy ) {
+		return contents;
+	}
+
+	const isAutoHeight = openHeight === undefined;
+	let usedMax = '50%'; // Approximation before max has a value.
+	if ( max !== undefined ) {
+		// Halves the available max height until a user height is set.
+		usedMax = isAutoHeight && isUntouched ? max / 2 : max;
+	}
+
+	const getAriaValueNow = ( height ) =>
+		Math.round( ( ( height - min ) / ( max - min ) ) * 100 );
+	const usedAriaValueNow =
+		max === undefined || isAutoHeight ? 50 : getAriaValueNow( openHeight );
+
+	const toggle = () =>
+		setPreference( 'core/edit-post', 'metaBoxesMainIsOpen', ! isOpen );
+
+	// TODO: Support more/all keyboard interactions from the window splitter pattern:
+	// https://www.w3.org/WAI/ARIA/apg/patterns/windowsplitter/
+	const onSeparatorKeyDown = ( event ) => {
+		const delta = { ArrowUp: 20, ArrowDown: -20 }[ event.key ];
+		if ( delta ) {
+			const pane = metaBoxesMainRef.current.resizable;
+			const fromHeight = isAutoHeight ? pane.offsetHeight : openHeight;
+			const nextHeight = delta + fromHeight;
+			applyHeight( nextHeight, true, true );
+			event.preventDefault();
+		}
+	};
+	const className = 'edit-post-meta-boxes-main';
+	const paneLabel = __( 'Meta Boxes' );
+	let Pane, paneProps;
+	if ( isShort ) {
+		Pane = NavigableRegion;
+		paneProps = {
+			className: clsx( className, 'is-toggle-only' ),
+		};
+	} else {
+		Pane = ResizableBox;
+		paneProps = /** @type {Parameters<typeof ResizableBox>[0]} */ ( {
+			as: NavigableRegion,
+			ref: metaBoxesMainRef,
+			className: clsx( className, 'is-resizable' ),
+			defaultSize: { height: openHeight },
+			minHeight: min,
+			maxHeight: usedMax,
+			enable: {
+				top: true,
+				right: false,
+				bottom: false,
+				left: false,
+				topLeft: false,
+				topRight: false,
+				bottomRight: false,
+				bottomLeft: false,
+			},
+			handleClasses: { top: 'edit-post-meta-boxes-main__presenter' },
+			handleComponent: {
+				top: (
+					<>
+						<Tooltip text={ __( 'Drag to resize' ) }>
+							<button // eslint-disable-line jsx-a11y/role-supports-aria-props
+								ref={ separatorRef }
+								role="separator" // eslint-disable-line jsx-a11y/no-interactive-element-to-noninteractive-role
+								aria-valuenow={ usedAriaValueNow }
+								aria-label={ __( 'Drag to resize' ) }
+								aria-describedby={ separatorHelpId }
+								onKeyDown={ onSeparatorKeyDown }
+							/>
+						</Tooltip>
+						<VisuallyHidden id={ separatorHelpId }>
+							{ __(
+								'Use up and down arrow keys to resize the metabox pane.'
+							) }
+						</VisuallyHidden>
+					</>
+				),
+			},
+			// Avoids hiccups while dragging over objects like iframes and ensures that
+			// the event to end the drag is captured by the target (resize handle)
+			// whether or not it’s under the pointer.
+			onPointerDown: ( { pointerId, target } ) => {
+				target.setPointerCapture( pointerId );
+			},
+			onResizeStart: ( event, direction, elementRef ) => {
+				if ( isAutoHeight ) {
+					// Sets the starting height to avoid visual jumps in height and
+					// aria-valuenow being `NaN` for the first (few) resize events.
+					applyHeight( elementRef.offsetHeight, false, true );
+					setIsUntouched( false );
+				}
+			},
+			onResize: () =>
+				applyHeight( metaBoxesMainRef.current.state.height ),
+			onResizeStop: () =>
+				applyHeight( metaBoxesMainRef.current.state.height, true ),
+		} );
+	}
+
+	return (
+		<Pane aria-label={ paneLabel } { ...paneProps }>
+			{ isShort ? (
+				<button
+					aria-expanded={ isOpen }
+					className="edit-post-meta-boxes-main__presenter"
+					onClick={ toggle }
+				>
+					{ paneLabel }
+					<Icon icon={ isOpen ? chevronUp : chevronDown } />
+				</button>
+			) : (
+				<meta ref={ effectSizeConstraints } />
+			) }
+			{ contents }
+		</Pane>
+	);
+}
+
+function Layout( {
+	postId: initialPostId,
+	postType: initialPostType,
+	settings,
+	initialEdits,
+} ) {
 	useCommands();
-	useCommonCommands();
-	useBlockCommands();
-
-	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const isHugeViewport = useViewportMatch( 'huge', '>=' );
-	const isLargeViewport = useViewportMatch( 'large' );
-	const { openGeneralSidebar, closeGeneralSidebar, setIsInserterOpened } =
-		useDispatch( editPostStore );
+	useEditPostCommands();
+	const shouldIframe = useShouldIframe();
 	const { createErrorNotice } = useDispatch( noticesStore );
+	const {
+		currentPost: { postId: currentPostId, postType: currentPostType },
+		onNavigateToEntityRecord,
+		onNavigateToPreviousEntityRecord,
+	} = useNavigateToEntityRecord(
+		initialPostId,
+		initialPostType,
+		'post-only'
+	);
+	const isEditingTemplate = currentPostType === 'wp_template';
 	const {
 		mode,
 		isFullscreenActive,
-		isRichEditingEnabled,
-		sidebarIsOpened,
 		hasActiveMetaboxes,
-		hasFixedToolbar,
-		previousShortcut,
-		nextShortcut,
 		hasBlockSelected,
-		isInserterOpened,
-		isListViewOpened,
 		showIconLabels,
 		isDistractionFree,
-		showBlockBreadcrumbs,
-		isTemplateMode,
-		documentLabel,
-	} = useSelect( ( select ) => {
-		const { getEditorSettings, getPostTypeLabel } = select( editorStore );
-		const editorSettings = getEditorSettings();
-		const postTypeLabel = getPostTypeLabel();
+		showMetaBoxes,
+		hasHistory,
+		isWelcomeGuideVisible,
+		templateId,
+		enablePaddingAppender,
+	} = useSelect(
+		( select ) => {
+			const { get } = select( preferencesStore );
+			const { isFeatureActive, getEditedPostTemplateId } = unlock(
+				select( editPostStore )
+			);
+			const { canUser, getPostType } = select( coreStore );
 
-		return {
-			isTemplateMode:
-				select( editorStore ).getRenderingMode() !== 'post-only',
-			hasFixedToolbar:
-				select( editPostStore ).isFeatureActive( 'fixedToolbar' ),
-			sidebarIsOpened: !! (
-				select( interfaceStore ).getActiveComplementaryArea(
-					editPostStore.name
-				) || select( editPostStore ).isPublishSidebarOpened()
-			),
-			isFullscreenActive:
-				select( editPostStore ).isFeatureActive( 'fullscreenMode' ),
-			isInserterOpened: select( editPostStore ).isInserterOpened(),
-			isListViewOpened: select( editPostStore ).isListViewOpened(),
-			mode: select( editPostStore ).getEditorMode(),
-			isRichEditingEnabled: editorSettings.richEditingEnabled,
-			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
-			previousShortcut: select(
-				keyboardShortcutsStore
-			).getAllShortcutKeyCombinations( 'core/edit-post/previous-region' ),
-			nextShortcut: select(
-				keyboardShortcutsStore
-			).getAllShortcutKeyCombinations( 'core/edit-post/next-region' ),
-			showIconLabels:
-				select( editPostStore ).isFeatureActive( 'showIconLabels' ),
-			isDistractionFree:
-				select( editPostStore ).isFeatureActive( 'distractionFree' ),
-			showBlockBreadcrumbs: select( editPostStore ).isFeatureActive(
-				'showBlockBreadcrumbs'
-			),
-			// translators: Default label for the Document in the Block Breadcrumb.
-			documentLabel: postTypeLabel || _x( 'Document', 'noun' ),
-			hasBlockSelected:
-				select( blockEditorStore ).getBlockSelectionStart(),
-		};
-	}, [] );
+			const supportsTemplateMode = settings.supportsTemplateMode;
+			const isViewable =
+				getPostType( currentPostType )?.viewable ?? false;
+			const canViewTemplate = canUser( 'read', {
+				kind: 'postType',
+				name: 'wp_template',
+			} );
+			const { isZoomOut } = unlock( select( blockEditorStore ) );
+			const { getEditorMode, getRenderingMode } = select( editorStore );
+			const isRenderingPostOnly = getRenderingMode() === 'post-only';
+
+			return {
+				mode: getEditorMode(),
+				isFullscreenActive:
+					select( editPostStore ).isFeatureActive( 'fullscreenMode' ),
+				hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
+				hasBlockSelected:
+					!! select( blockEditorStore ).getBlockSelectionStart(),
+				showIconLabels: get( 'core', 'showIconLabels' ),
+				isDistractionFree: get( 'core', 'distractionFree' ),
+				showMetaBoxes:
+					! DESIGN_POST_TYPES.includes( currentPostType ) &&
+					isRenderingPostOnly,
+				isWelcomeGuideVisible: isFeatureActive( 'welcomeGuide' ),
+				templateId:
+					supportsTemplateMode &&
+					isViewable &&
+					canViewTemplate &&
+					! isEditingTemplate
+						? getEditedPostTemplateId()
+						: null,
+				enablePaddingAppender:
+					! isZoomOut() &&
+					isRenderingPostOnly &&
+					! DESIGN_POST_TYPES.includes( currentPostType ),
+			};
+		},
+		[ currentPostType, isEditingTemplate, settings.supportsTemplateMode ]
+	);
+	const [ paddingAppenderRef, paddingStyle ] = usePaddingAppender(
+		enablePaddingAppender
+	);
 
 	// Set the right context for the command palette
 	const commandContext = hasBlockSelected
 		? 'block-selection-edit'
-		: 'post-editor-edit';
+		: 'entity-edit';
 	useCommandContext( commandContext );
-
-	const styles = useEditorStyles();
-
-	const openSidebarPanel = () =>
-		openGeneralSidebar(
-			hasBlockSelected ? 'edit-post/block' : 'edit-post/document'
-		);
-
-	// Inserter and Sidebars are mutually exclusive
-	useEffect( () => {
-		if ( sidebarIsOpened && ! isHugeViewport ) {
-			setIsInserterOpened( false );
-		}
-	}, [ sidebarIsOpened, isHugeViewport ] );
-	useEffect( () => {
-		if ( isInserterOpened && ! isHugeViewport ) {
-			closeGeneralSidebar();
-		}
-	}, [ isInserterOpened, isHugeViewport ] );
-
-	// Local state for save panel.
-	// Note 'truthy' callback implies an open panel.
-	const [ entitiesSavedStatesCallback, setEntitiesSavedStatesCallback ] =
-		useState( false );
-
-	const [ listViewToggleElement, setListViewToggleElement ] =
-		useState( null );
-
-	const closeEntitiesSavedStates = useCallback(
-		( arg ) => {
-			if ( typeof entitiesSavedStatesCallback === 'function' ) {
-				entitiesSavedStatesCallback( arg );
-			}
-			setEntitiesSavedStatesCallback( false );
-		},
-		[ entitiesSavedStatesCallback ]
+	const editorSettings = useMemo(
+		() => ( {
+			...settings,
+			onNavigateToEntityRecord,
+			onNavigateToPreviousEntityRecord,
+			defaultRenderingMode: 'post-only',
+		} ),
+		[ settings, onNavigateToEntityRecord, onNavigateToPreviousEntityRecord ]
 	);
+	const styles = useEditorStyles( paddingStyle );
 
 	// We need to add the show-icon-labels class to the body element so it is applied to modals.
 	if ( showIconLabels ) {
@@ -251,33 +470,12 @@ function Layout() {
 		document.body.classList.remove( 'show-icon-labels' );
 	}
 
-	const className = classnames( 'edit-post-layout', 'is-mode-' + mode, {
-		'is-sidebar-opened': sidebarIsOpened,
-		'has-fixed-toolbar': hasFixedToolbar,
+	const navigateRegionsProps = useNavigateRegions();
+
+	const className = clsx( 'edit-post-layout', 'is-mode-' + mode, {
 		'has-metaboxes': hasActiveMetaboxes,
-		'is-distraction-free': isDistractionFree && isLargeViewport,
-		'is-entity-save-view-open': !! entitiesSavedStatesCallback,
 	} );
 
-	const secondarySidebarLabel = isListViewOpened
-		? __( 'Document Overview' )
-		: __( 'Block Library' );
-
-	const secondarySidebar = () => {
-		if ( mode === 'visual' && isInserterOpened ) {
-			return <InserterSidebar />;
-		}
-		if ( mode === 'visual' && isListViewOpened ) {
-			return (
-				<ListViewSidebar
-					listViewToggleElement={ listViewToggleElement }
-				/>
-			);
-		}
-
-		return null;
-	};
-
 	function onPluginAreaError( name ) {
 		createErrorNotice(
 			sprintf(
@@ -290,111 +488,124 @@ function Layout() {
 		);
 	}
 
+	const { createSuccessNotice } = useDispatch( noticesStore );
+
+	const onActionPerformed = useCallback(
+		( actionId, items ) => {
+			switch ( actionId ) {
+				case 'move-to-trash':
+					{
+						document.location.href = addQueryArgs( 'edit.php', {
+							trashed: 1,
+							post_type: items[ 0 ].type,
+							ids: items[ 0 ].id,
+						} );
+					}
+					break;
+				case 'duplicate-post':
+					{
+						const newItem = items[ 0 ];
+						const title =
+							typeof newItem.title === 'string'
+								? newItem.title
+								: newItem.title?.rendered;
+						createSuccessNotice(
+							sprintf(
+								// translators: %s: Title of the created post e.g: "Post 1".
+								__( '"%s" successfully created.' ),
+								decodeEntities( title )
+							),
+							{
+								type: 'snackbar',
+								id: 'duplicate-post-action',
+								actions: [
+									{
+										label: __( 'Edit' ),
+										onClick: () => {
+											const postId = newItem.id;
+											document.location.href =
+												addQueryArgs( 'post.php', {
+													post: postId,
+													action: 'edit',
+												} );
+										},
+									},
+								],
+							}
+						);
+					}
+					break;
+			}
+		},
+		[ createSuccessNotice ]
+	);
+
+	const initialPost = useMemo( () => {
+		return {
+			type: initialPostType,
+			id: initialPostId,
+		};
+	}, [ initialPostType, initialPostId ] );
+
+	const backButton =
+		useViewportMatch( 'medium' ) && isFullscreenActive ? (
+			<BackButton initialPost={ initialPost } />
+		) : null;
+
 	return (
-		<>
-			<FullscreenMode isActive={ isFullscreenActive } />
-			<BrowserURL />
-			<UnsavedChangesWarning />
-			<AutosaveMonitor />
-			<LocalAutosaveMonitor />
-			<EditPostKeyboardShortcuts />
-			<EditorKeyboardShortcutsRegister />
-			<EditorKeyboardShortcuts />
-
-			<InterfaceSkeleton
-				isDistractionFree={ isDistractionFree && isLargeViewport }
-				className={ className }
-				labels={ {
-					...interfaceLabels,
-					secondarySidebar: secondarySidebarLabel,
-				} }
-				header={
-					<Header
-						setEntitiesSavedStatesCallback={
-							setEntitiesSavedStatesCallback
-						}
-						setListViewToggleElement={ setListViewToggleElement }
-					/>
-				}
-				editorNotices={ <EditorNotices /> }
-				secondarySidebar={ secondarySidebar() }
-				sidebar={
-					( ! isMobileViewport || sidebarIsOpened ) && (
-						<>
-							{ ! isMobileViewport && ! sidebarIsOpened && (
-								<div className="edit-post-layout__toggle-sidebar-panel">
-									<Button
-										variant="secondary"
-										className="edit-post-layout__toggle-sidebar-panel-button"
-										onClick={ openSidebarPanel }
-										aria-expanded={ false }
-									>
-										{ hasBlockSelected
-											? __( 'Open block settings' )
-											: __( 'Open document settings' ) }
-									</Button>
-								</div>
-							) }
-							<ComplementaryArea.Slot scope="core/edit-post" />
-						</>
-					)
-				}
-				notices={ <EditorSnackbars /> }
-				content={
-					<>
-						{ ! isDistractionFree && <EditorNotices /> }
-						{ ( mode === 'text' || ! isRichEditingEnabled ) && (
-							<TextEditor />
-						) }
-						{ isRichEditingEnabled && mode === 'visual' && (
-							<VisualEditor styles={ styles } />
-						) }
-						{ ! isDistractionFree && ! isTemplateMode && (
-							<div className="edit-post-layout__metaboxes">
-								<MetaBoxes location="normal" />
-								<MetaBoxes location="advanced" />
-							</div>
-						) }
-						{ isMobileViewport && sidebarIsOpened && (
-							<ScrollLock />
-						) }
-					</>
-				}
-				footer={
-					! isDistractionFree &&
-					! isMobileViewport &&
-					showBlockBreadcrumbs &&
-					isRichEditingEnabled &&
-					mode === 'visual' && (
-						<div className="edit-post-layout__footer">
-							<BlockBreadcrumb rootLabelText={ documentLabel } />
-						</div>
-					)
-				}
-				actions={
-					<ActionsPanel
-						closeEntitiesSavedStates={ closeEntitiesSavedStates }
-						isEntitiesSavedStatesOpen={
-							entitiesSavedStatesCallback
+		<SlotFillProvider>
+			<ErrorBoundary>
+				<CommandMenu />
+				<WelcomeGuide postType={ currentPostType } />
+				<div
+					className={ navigateRegionsProps.className }
+					{ ...navigateRegionsProps }
+					ref={ navigateRegionsProps.ref }
+				>
+					<Editor
+						settings={ editorSettings }
+						initialEdits={ initialEdits }
+						postType={ currentPostType }
+						postId={ currentPostId }
+						templateId={ templateId }
+						className={ className }
+						styles={ styles }
+						forceIsDirty={ hasActiveMetaboxes }
+						contentRef={ paddingAppenderRef }
+						disableIframe={ ! shouldIframe }
+						// We should auto-focus the canvas (title) on load.
+						// eslint-disable-next-line jsx-a11y/no-autofocus
+						autoFocus={ ! isWelcomeGuideVisible }
+						onActionPerformed={ onActionPerformed }
+						extraSidebarPanels={
+							showMetaBoxes && <MetaBoxes location="side" />
 						}
-						setEntitiesSavedStatesCallback={
-							setEntitiesSavedStatesCallback
+						extraContent={
+							! isDistractionFree &&
+							showMetaBoxes && (
+								<MetaBoxesMain isLegacy={ ! shouldIframe } />
+							)
 						}
-					/>
-				}
-				shortcuts={ {
-					previous: previousShortcut,
-					next: nextShortcut,
-				} }
-			/>
-			<EditPostPreferencesModal />
-			<KeyboardShortcutHelpModal />
-			<WelcomeGuide />
-			<PostSyncStatusModal />
-			<StartPageOptions />
-			<PluginArea onError={ onPluginAreaError } />
-			<SettingsSidebar />
-		</>
+					>
+						<PostLockedModal />
+						<EditorInitialization />
+						<FullscreenMode isActive={ isFullscreenActive } />
+						<BrowserURL hasHistory={ hasHistory } />
+						<UnsavedChangesWarning />
+						<AutosaveMonitor />
+						<LocalAutosaveMonitor />
+						<EditPostKeyboardShortcuts />
+						<EditorKeyboardShortcutsRegister />
+						<BlockKeyboardShortcuts />
+						<InitPatternModal />
+						<PluginArea onError={ onPluginAreaError } />
+						<PostEditorMoreMenu />
+						{ backButton }
+						<EditorSnackbars />
+					</Editor>
+				</div>
+			</ErrorBoundary>
+		</SlotFillProvider>
 	);
 }
 
diff --git a/packages/edit-post/src/components/layout/index.native.js b/packages/edit-post/src/components/layout/index.native.js
index a9c38ee1ccb8d5..a3943f30597870 100644
--- a/packages/edit-post/src/components/layout/index.native.js
+++ b/packages/edit-post/src/components/layout/index.native.js
@@ -22,7 +22,11 @@ import {
 	Tooltip,
 	__unstableAutocompletionItemsSlot as AutocompletionItemsSlot,
 } from '@wordpress/components';
-import { AutosaveMonitor, store as editorStore } from '@wordpress/editor';
+import {
+	AutosaveMonitor,
+	OfflineStatus,
+	store as editorStore,
+} from '@wordpress/editor';
 import { sendNativeEditorDidLayout } from '@wordpress/react-native-bridge';
 
 /**
@@ -32,7 +36,6 @@ import styles from './style.scss';
 import headerToolbarStyles from '../header/header-toolbar/style.scss';
 import Header from '../header';
 import VisualEditor from '../visual-editor';
-import { store as editPostStore } from '../../store';
 
 class Layout extends Component {
 	constructor() {
@@ -148,6 +151,7 @@ class Layout extends Component {
 					onLayout={ this.onRootViewLayout }
 				>
 					<AutosaveMonitor disableIntervalChecks />
+					<OfflineStatus />
 					<View style={ editorStyles }>
 						{ isHtmlView ? this.renderHTML() : this.renderVisual() }
 						{ ! isHtmlView && Platform.OS === 'android' && (
@@ -187,9 +191,8 @@ class Layout extends Component {
 
 export default compose( [
 	withSelect( ( select ) => {
-		const { __unstableIsEditorReady: isEditorReady } =
+		const { __unstableIsEditorReady: isEditorReady, getEditorMode } =
 			select( editorStore );
-		const { getEditorMode } = select( editPostStore );
 		const { getSettings } = select( blockEditorStore );
 		const globalStyles =
 			getSettings()?.__experimentalGlobalStylesBaseStyles?.color;
diff --git a/packages/edit-post/src/components/layout/style.scss b/packages/edit-post/src/components/layout/style.scss
index 229ab58a4e14b0..18f12c1dbfbb92 100644
--- a/packages/edit-post/src/components/layout/style.scss
+++ b/packages/edit-post/src/components/layout/style.scss
@@ -1,101 +1,126 @@
-.edit-post-layout__metaboxes {
-	flex-shrink: 0;
-	clear: both;
-}
+.edit-post-meta-boxes-main {
+	filter: drop-shadow(0 -1px rgba($color: #000, $alpha: 0.133)); // 0.133 = $gray-200 but with alpha.
+	// Windows High Contrast mode will show this outline, but not the shadow.
+	outline: 1px solid transparent;
+	background-color: $white;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
 
-// Adjust the position of the notices
-.edit-post-layout .components-editor-notices__snackbar {
-	position: fixed;
-	right: 0;
-	bottom: 40px;
-	padding-left: 16px;
-	padding-right: 16px;
+	&.is-resizable {
+		padding-block-start: $grid-unit-30;
+	}
 }
 
-.is-distraction-free {
-	.components-editor-notices__snackbar {
-		bottom: 20px;
+.edit-post-meta-boxes-main__presenter {
+	display: flex;
+	box-shadow: 0 $border-width $gray-300;
+	// Windows High Contrast mode will show this outline, but not the shadow.
+	outline: 1px solid transparent;
+	position: relative;
+	z-index: 1;
+
+	// Button style reset for both toggle or resizable.
+	.is-toggle-only > &,
+	.is-resizable.edit-post-meta-boxes-main & > button {
+		appearance: none;
+		padding: 0;
+		border: none;
+		outline: none;
+		background-color: transparent;
 	}
-}
 
-@include editor-left(".edit-post-layout .components-editor-notices__snackbar");
+	.is-toggle-only > & {
+		flex-shrink: 0;
+		cursor: pointer;
+		height: $button-size-compact;
+		justify-content: space-between;
+		align-items: center;
+		padding-inline: $grid-unit-30 $grid-unit-15;
 
-.edit-post-layout .editor-post-publish-panel {
-	position: fixed;
-	z-index: z-index(".edit-post-layout .edit-post-post-publish-panel");
-	top: $admin-bar-height-big;
-	bottom: 0;
-	right: 0;
-	left: 0;
-	overflow: auto;
+		&:is(:hover, :focus-visible) {
+			color: var(--wp-admin-theme-color);
+		}
+		&:focus-visible::after {
+			content: "";
+			position: absolute;
+			inset: var(--wp-admin-border-width-focus);
+			@include button-style__focus();
+		}
+		> svg {
+			fill: currentColor;
+		}
+	}
+
+	.is-resizable.edit-post-meta-boxes-main & {
+		inset: 0 0 auto;
+
+		> button {
+			cursor: inherit;
+			width: $grid-unit-80;
+			height: $grid-unit-30;
+			margin: auto;
 
-	@include break-medium() {
-		z-index: z-index(".edit-post-layout .edit-post-post-publish-panel {greater than small}");
-		top: $admin-bar-height;
-		left: auto;
-		width: $sidebar-width + $border-width;
-		border-left: $border-width solid $gray-300;
-		transform: translateX(+100%);
-		animation: edit-post-post-publish-panel__slide-in-animation 0.1s forwards;
-		@include reduce-motion("animation");
-
-		body.is-fullscreen-mode & {
-			top: 0;
+			&::before {
+				content: "";
+				background-color: $gray-300;
+				// Windows High Contrast mode will show this outline, but not the background-color.
+				outline: 2px solid transparent;
+				outline-offset: -2px;
+				position: absolute;
+				inset-block: calc(50% - #{$grid-unit-05} / 2) auto;
+				transform: translateX(-50%);
+				width: inherit;
+				height: $grid-unit-05;
+				border-radius: $radius-small;
+				transition: width 0.3s ease-out;
+				@include reduce-motion("transition");
+			}
 		}
 
-		// Keep it open on focus to avoid conflict with navigate-regions animation.
-		[role="region"]:focus & {
-			transform: translateX(0%);
+		&:is(:hover, :focus-within) > button::before {
+			background-color: var(--wp-admin-theme-color);
+			width: $grid-unit-80 + $grid-unit-20;
 		}
 	}
 }
 
-@keyframes edit-post-post-publish-panel__slide-in-animation {
-	100% {
-		transform: translateX(0%);
+@media (pointer: coarse) {
+	.is-resizable.edit-post-meta-boxes-main {
+		padding-block-start: $button-size-compact;
+
+		.edit-post-meta-boxes-main__presenter > button {
+			height: $button-size-compact;
+		}
 	}
 }
 
-.edit-post-layout .editor-post-publish-panel__header-publish-button {
-	justify-content: center;
+.edit-post-meta-boxes-main__liner {
+	overflow: auto;
+	// Keep the contents behind the resize handle or details summary.
+	isolation: isolate;
 }
 
-.edit-post-layout__toggle-publish-panel,
-.edit-post-layout__toggle-sidebar-panel,
-.edit-post-layout__toggle-entities-saved-states-panel {
-	z-index: z-index(".edit-post-layout__toggle-sidebar-panel");
-	position: fixed !important; // Need to override the default relative positionning
-	top: -9999em;
-	bottom: auto;
-	left: auto;
-	right: 0;
-	box-sizing: border-box;
-	width: $sidebar-width;
-	background-color: $white;
-	border: 1px dotted $gray-300;
-	height: auto !important; // Need to override the default sidebar positionnings
-	padding: $grid-unit-30;
-	display: flex;
-	justify-content: center;
+// In case the canvas is not iframe’d.
+.edit-post-layout__metaboxes {
+	clear: both;
 }
 
-.edit-post-layout__toggle-sidebar-panel {
-	.interface-interface-skeleton__sidebar:focus &,
-	.interface-interface-skeleton__sidebar:focus-within & {
-		top: auto;
-		bottom: 0;
-	}
-}
+.has-metaboxes .editor-visual-editor {
+	flex: 1;
 
-.edit-post-layout__toggle-entities-saved-states-panel,
-.edit-post-layout__toggle-publish-panel {
-	.interface-interface-skeleton__actions:focus &,
-	.interface-interface-skeleton__actions:focus-within & {
-		top: auto;
-		bottom: 0;
+	&.is-iframed {
+		isolation: isolate;
 	}
 }
 
-.edit-post-layout .entities-saved-states__panel-header {
-	height: $header-height + $border-width;
+// Adjust the position of the notices
+.components-editor-notices__snackbar {
+	position: fixed;
+	right: 0;
+	bottom: 24px;
+	padding-left: 24px;
+	padding-right: 24px;
 }
+
+@include editor-left(".edit-post-layout .components-editor-notices__snackbar");
diff --git a/packages/edit-post/src/components/layout/use-padding-appender.js b/packages/edit-post/src/components/layout/use-padding-appender.js
new file mode 100644
index 00000000000000..ee1484f518d7a0
--- /dev/null
+++ b/packages/edit-post/src/components/layout/use-padding-appender.js
@@ -0,0 +1,70 @@
+/**
+ * WordPress dependencies
+ */
+import { useRegistry } from '@wordpress/data';
+import { useRefEffect } from '@wordpress/compose';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';
+
+// Ruleset to add space for the typewriter effect. When typing in the last
+// block, there needs to be room to scroll up.
+const CSS =
+	':root :where(.editor-styles-wrapper)::after {content: ""; display: block; height: 40vh;}';
+
+export function usePaddingAppender( enabled ) {
+	const registry = useRegistry();
+	const effect = useRefEffect(
+		( node ) => {
+			function onMouseDown( event ) {
+				if (
+					event.target !== node &&
+					// Tests for the parent element because in the iframed editor if the click is
+					// below the padding the target will be the parent element (html) and should
+					// still be treated as intent to append.
+					event.target !== node.parentElement
+				) {
+					return;
+				}
+
+				// Only handle clicks under the last child.
+				const lastChild = node.lastElementChild;
+				if ( ! lastChild ) {
+					return;
+				}
+
+				const lastChildRect = lastChild.getBoundingClientRect();
+				if ( event.clientY < lastChildRect.bottom ) {
+					return;
+				}
+
+				event.preventDefault();
+
+				const blockOrder = registry
+					.select( blockEditorStore )
+					.getBlockOrder( '' );
+				const lastBlockClientId = blockOrder[ blockOrder.length - 1 ];
+
+				const lastBlock = registry
+					.select( blockEditorStore )
+					.getBlock( lastBlockClientId );
+				const { selectBlock, insertDefaultBlock } =
+					registry.dispatch( blockEditorStore );
+
+				if ( lastBlock && isUnmodifiedDefaultBlock( lastBlock ) ) {
+					selectBlock( lastBlockClientId );
+				} else {
+					insertDefaultBlock();
+				}
+			}
+			const { ownerDocument } = node;
+			// Adds the listener on the document so that in the iframed editor clicks below the
+			// padding can be handled as they too should be treated as intent to append.
+			ownerDocument.addEventListener( 'mousedown', onMouseDown );
+			return () => {
+				ownerDocument.removeEventListener( 'mousedown', onMouseDown );
+			};
+		},
+		[ registry ]
+	);
+	return enabled ? [ effect, CSS ] : [];
+}
diff --git a/packages/edit-post/src/components/layout/use-should-iframe.js b/packages/edit-post/src/components/layout/use-should-iframe.js
new file mode 100644
index 00000000000000..6da344c138f64b
--- /dev/null
+++ b/packages/edit-post/src/components/layout/use-should-iframe.js
@@ -0,0 +1,49 @@
+/**
+ * WordPress dependencies
+ */
+import { store as editorStore } from '@wordpress/editor';
+import { useSelect } from '@wordpress/data';
+import { store as blocksStore } from '@wordpress/blocks';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const isGutenbergPlugin = globalThis.IS_GUTENBERG_PLUGIN ? true : false;
+
+export function useShouldIframe() {
+	const {
+		isBlockBasedTheme,
+		hasV3BlocksOnly,
+		isEditingTemplateOrPattern,
+		isZoomOutMode,
+		deviceType,
+	} = useSelect( ( select ) => {
+		const { getEditorSettings, getCurrentPostType, getDeviceType } =
+			select( editorStore );
+		const { isZoomOut } = unlock( select( blockEditorStore ) );
+		const { getBlockTypes } = select( blocksStore );
+		const editorSettings = getEditorSettings();
+		return {
+			isBlockBasedTheme: editorSettings.__unstableIsBlockBasedTheme,
+			hasV3BlocksOnly: getBlockTypes().every( ( type ) => {
+				return type.apiVersion >= 3;
+			} ),
+			isEditingTemplateOrPattern: [ 'wp_template', 'wp_block' ].includes(
+				getCurrentPostType()
+			),
+			isZoomOutMode: isZoomOut(),
+			deviceType: getDeviceType(),
+		};
+	}, [] );
+
+	return (
+		hasV3BlocksOnly ||
+		( isGutenbergPlugin && isBlockBasedTheme ) ||
+		isEditingTemplateOrPattern ||
+		isZoomOutMode ||
+		[ 'Tablet', 'Mobile' ].includes( deviceType )
+	);
+}
diff --git a/packages/edit-post/src/components/meta-boxes/index.js b/packages/edit-post/src/components/meta-boxes/index.js
index 6575a78be7a6cc..14728c97cf6b68 100644
--- a/packages/edit-post/src/components/meta-boxes/index.js
+++ b/packages/edit-post/src/components/meta-boxes/index.js
@@ -30,14 +30,16 @@ export default function MetaBoxes( { location } ) {
 		[ location ]
 	);
 
+	const hasMetaBoxes = !! metaBoxes?.length;
+
 	// When editor is ready, initialize postboxes (wp core script) and metabox
 	// saving. This initializes all meta box locations, not just this specific
 	// one.
 	useEffect( () => {
-		if ( isEditorReady && ! areMetaBoxesInitialized ) {
+		if ( isEditorReady && hasMetaBoxes && ! areMetaBoxesInitialized ) {
 			registry.dispatch( editPostStore ).initializeMetaBoxes();
 		}
-	}, [ isEditorReady, areMetaBoxesInitialized ] );
+	}, [ isEditorReady, hasMetaBoxes, areMetaBoxesInitialized ] );
 
 	if ( ! areMetaBoxesInitialized ) {
 		return null;
diff --git a/packages/edit-post/src/components/meta-boxes/meta-box-visibility.js b/packages/edit-post/src/components/meta-boxes/meta-box-visibility.js
index 488d73e1a76e03..26b69d37f00210 100644
--- a/packages/edit-post/src/components/meta-boxes/meta-box-visibility.js
+++ b/packages/edit-post/src/components/meta-boxes/meta-box-visibility.js
@@ -3,11 +3,7 @@
  */
 import { Component } from '@wordpress/element';
 import { withSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
+import { store as editorStore } from '@wordpress/editor';
 
 class MetaBoxVisibility extends Component {
 	componentDidMount() {
@@ -41,7 +37,5 @@ class MetaBoxVisibility extends Component {
 }
 
 export default withSelect( ( select, { id } ) => ( {
-	isVisible: select( editPostStore ).isEditorPanelEnabled(
-		`meta-box-${ id }`
-	),
+	isVisible: select( editorStore ).isEditorPanelEnabled( `meta-box-${ id }` ),
 } ) )( MetaBoxVisibility );
diff --git a/packages/edit-post/src/components/meta-boxes/meta-boxes-area/index.js b/packages/edit-post/src/components/meta-boxes/meta-boxes-area/index.js
index 6d66115923e7b0..908c4b5a6f6696 100644
--- a/packages/edit-post/src/components/meta-boxes/meta-boxes-area/index.js
+++ b/packages/edit-post/src/components/meta-boxes/meta-boxes-area/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -48,13 +48,9 @@ function MetaBoxesArea( { location } ) {
 		return select( editPostStore ).isSavingMetaBoxes();
 	}, [] );
 
-	const classes = classnames(
-		'edit-post-meta-boxes-area',
-		`is-${ location }`,
-		{
-			'is-loading': isSaving,
-		}
-	);
+	const classes = clsx( 'edit-post-meta-boxes-area', `is-${ location }`, {
+		'is-loading': isSaving,
+	} );
 
 	return (
 		<div className={ classes }>
diff --git a/packages/edit-post/src/components/meta-boxes/meta-boxes-area/style.scss b/packages/edit-post/src/components/meta-boxes/meta-boxes-area/style.scss
index a77adb1c8d354d..6637cdcaf17f4c 100644
--- a/packages/edit-post/src/components/meta-boxes/meta-boxes-area/style.scss
+++ b/packages/edit-post/src/components/meta-boxes/meta-boxes-area/style.scss
@@ -88,7 +88,7 @@
 
 	// Until checkboxes WordPress-wide are updated to match the new style,
 	// checkboxes used in metaboxes have to be slightly unstyled here.
-	// @todo: remove this entire rule once checkboxes are the same everywhere.
+	// @todo remove this entire rule once checkboxes are the same everywhere.
 	// See: https://github.com/WordPress/gutenberg/issues/18053
 	.metabox-location-side .postbox input[type="checkbox"] {
 		border: $border-width solid $gray-700;
diff --git a/packages/edit-post/src/components/more-menu/index.js b/packages/edit-post/src/components/more-menu/index.js
new file mode 100644
index 00000000000000..136742a19dddd4
--- /dev/null
+++ b/packages/edit-post/src/components/more-menu/index.js
@@ -0,0 +1,49 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useViewportMatch } from '@wordpress/compose';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+import { PreferenceToggleMenuItem } from '@wordpress/preferences';
+import { displayShortcut } from '@wordpress/keycodes';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import ManagePatternsMenuItem from './manage-patterns-menu-item';
+import WelcomeGuideMenuItem from './welcome-guide-menu-item';
+import EditPostPreferencesModal from '../preferences-modal';
+
+const { ToolsMoreMenuGroup, ViewMoreMenuGroup } = unlock( editorPrivateApis );
+
+const MoreMenu = () => {
+	const isLargeViewport = useViewportMatch( 'large' );
+
+	return (
+		<>
+			{ isLargeViewport && (
+				<ViewMoreMenuGroup>
+					<PreferenceToggleMenuItem
+						scope="core/edit-post"
+						name="fullscreenMode"
+						label={ __( 'Fullscreen mode' ) }
+						info={ __( 'Show and hide the admin user interface' ) }
+						messageActivated={ __( 'Fullscreen mode activated' ) }
+						messageDeactivated={ __(
+							'Fullscreen mode deactivated'
+						) }
+						shortcut={ displayShortcut.secondary( 'f' ) }
+					/>
+				</ViewMoreMenuGroup>
+			) }
+			<ToolsMoreMenuGroup>
+				<ManagePatternsMenuItem />
+				<WelcomeGuideMenuItem />
+			</ToolsMoreMenuGroup>
+			<EditPostPreferencesModal />
+		</>
+	);
+};
+
+export default MoreMenu;
diff --git a/packages/edit-post/src/components/more-menu/manage-patterns-menu-item.js b/packages/edit-post/src/components/more-menu/manage-patterns-menu-item.js
new file mode 100644
index 00000000000000..786ba91f5e04a3
--- /dev/null
+++ b/packages/edit-post/src/components/more-menu/manage-patterns-menu-item.js
@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import { MenuItem } from '@wordpress/components';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+import { addQueryArgs } from '@wordpress/url';
+
+function ManagePatternsMenuItem() {
+	const url = useSelect( ( select ) => {
+		const { canUser } = select( coreStore );
+		const defaultUrl = addQueryArgs( 'edit.php', {
+			post_type: 'wp_block',
+		} );
+		const patternsUrl = addQueryArgs( 'site-editor.php', {
+			path: '/patterns',
+		} );
+
+		// The site editor and templates both check whether the user has
+		// edit_theme_options capabilities. We can leverage that here and not
+		// display the manage patterns link if the user can't access it.
+		return canUser( 'create', {
+			kind: 'postType',
+			name: 'wp_template',
+		} )
+			? patternsUrl
+			: defaultUrl;
+	}, [] );
+
+	return (
+		<MenuItem role="menuitem" href={ url }>
+			{ __( 'Manage patterns' ) }
+		</MenuItem>
+	);
+}
+
+export default ManagePatternsMenuItem;
diff --git a/packages/edit-post/src/components/more-menu/welcome-guide-menu-item.js b/packages/edit-post/src/components/more-menu/welcome-guide-menu-item.js
new file mode 100644
index 00000000000000..c454fee8588dbd
--- /dev/null
+++ b/packages/edit-post/src/components/more-menu/welcome-guide-menu-item.js
@@ -0,0 +1,23 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { PreferenceToggleMenuItem } from '@wordpress/preferences';
+import { __ } from '@wordpress/i18n';
+import { store as editorStore } from '@wordpress/editor';
+
+export default function WelcomeGuideMenuItem() {
+	const isEditingTemplate = useSelect(
+		( select ) =>
+			select( editorStore ).getCurrentPostType() === 'wp_template',
+		[]
+	);
+
+	return (
+		<PreferenceToggleMenuItem
+			scope="core/edit-post"
+			name={ isEditingTemplate ? 'welcomeGuideTemplate' : 'welcomeGuide' }
+			label={ __( 'Welcome Guide' ) }
+		/>
+	);
+}
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-custom-fields.js b/packages/edit-post/src/components/preferences-modal/enable-custom-fields.js
similarity index 84%
rename from packages/edit-post/src/components/preferences-modal/options/enable-custom-fields.js
rename to packages/edit-post/src/components/preferences-modal/enable-custom-fields.js
index 15521b80b361b2..b8125e96c7c2cf 100644
--- a/packages/edit-post/src/components/preferences-modal/options/enable-custom-fields.js
+++ b/packages/edit-post/src/components/preferences-modal/enable-custom-fields.js
@@ -6,9 +6,16 @@ import { __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
 import { withSelect } from '@wordpress/data';
 import { store as editorStore } from '@wordpress/editor';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
 import { getPathAndQueryString } from '@wordpress/url';
 
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { PreferenceBaseOption } = unlock( preferencesPrivateApis );
+
 function submitCustomFieldsForm() {
 	const customFieldsForm = document.getElementById(
 		'toggle-custom-fields-form'
@@ -32,9 +39,10 @@ export function CustomFieldsConfirmation( { willEnable } ) {
 				) }
 			</p>
 			<Button
-				className="edit-post-preferences-modal__custom-fields-confirmation-button"
+				__next40pxDefaultSize
 				variant="secondary"
 				isBusy={ isReloading }
+				accessibleWhenDisabled
 				disabled={ isReloading }
 				onClick={ () => {
 					setIsReloading( true );
@@ -53,7 +61,7 @@ export function EnableCustomFieldsOption( { label, areCustomFieldsEnabled } ) {
 	const [ isChecked, setIsChecked ] = useState( areCustomFieldsEnabled );
 
 	return (
-		<BaseOption
+		<PreferenceBaseOption
 			label={ label }
 			isChecked={ isChecked }
 			onChange={ setIsChecked }
@@ -61,7 +69,7 @@ export function EnableCustomFieldsOption( { label, areCustomFieldsEnabled } ) {
 			{ isChecked !== areCustomFieldsEnabled && (
 				<CustomFieldsConfirmation willEnable={ isChecked } />
 			) }
-		</BaseOption>
+		</PreferenceBaseOption>
 	);
 }
 
diff --git a/packages/edit-post/src/components/preferences-modal/enable-panel.js b/packages/edit-post/src/components/preferences-modal/enable-panel.js
new file mode 100644
index 00000000000000..d698cdc360cae2
--- /dev/null
+++ b/packages/edit-post/src/components/preferences-modal/enable-panel.js
@@ -0,0 +1,30 @@
+/**
+ * WordPress dependencies
+ */
+import { compose, ifCondition } from '@wordpress/compose';
+import { withSelect, withDispatch } from '@wordpress/data';
+import { store as editorStore } from '@wordpress/editor';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { PreferenceBaseOption } = unlock( preferencesPrivateApis );
+
+export default compose(
+	withSelect( ( select, { panelName } ) => {
+		const { isEditorPanelEnabled, isEditorPanelRemoved } =
+			select( editorStore );
+		return {
+			isRemoved: isEditorPanelRemoved( panelName ),
+			isChecked: isEditorPanelEnabled( panelName ),
+		};
+	} ),
+	ifCondition( ( { isRemoved } ) => ! isRemoved ),
+	withDispatch( ( dispatch, { panelName } ) => ( {
+		onChange: () =>
+			dispatch( editorStore ).toggleEditorPanelEnabled( panelName ),
+	} ) )
+)( PreferenceBaseOption );
diff --git a/packages/edit-post/src/components/preferences-modal/index.js b/packages/edit-post/src/components/preferences-modal/index.js
index 833a10fce13c33..9ed517cc76d283 100644
--- a/packages/edit-post/src/components/preferences-modal/index.js
+++ b/packages/edit-post/src/components/preferences-modal/index.js
@@ -3,278 +3,30 @@
  */
 
 import { __ } from '@wordpress/i18n';
-import { useViewportMatch } from '@wordpress/compose';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useMemo } from '@wordpress/element';
-import {
-	PostTaxonomies,
-	PostExcerptCheck,
-	PageAttributesCheck,
-	PostFeaturedImageCheck,
-	PostTypeSupportCheck,
-	store as editorStore,
-} from '@wordpress/editor';
-import {
-	PreferencesModal,
-	PreferencesModalTabs,
-	PreferencesModalSection,
-	store as interfaceStore,
-} from '@wordpress/interface';
-import { store as preferencesStore } from '@wordpress/preferences';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
-
-import {
-	EnablePluginDocumentSettingPanelOption,
-	EnablePublishSidebarOption,
-	EnablePanelOption,
-	EnableFeature,
-} from './options';
+import { unlock } from '../../lock-unlock';
 import MetaBoxesSection from './meta-boxes-section';
-import { store as editPostStore } from '../../store';
-import BlockManager from '../block-manager';
 
-export const PREFERENCES_MODAL_NAME = 'edit-post/preferences';
+const { PreferenceToggleControl } = unlock( preferencesPrivateApis );
+const { PreferencesModal } = unlock( editorPrivateApis );
 
 export default function EditPostPreferencesModal() {
-	const isLargeViewport = useViewportMatch( 'medium' );
-	const { closeModal } = useDispatch( interfaceStore );
-	const [ isModalActive, showBlockBreadcrumbsOption ] = useSelect(
-		( select ) => {
-			const { getEditorSettings } = select( editorStore );
-			const { getEditorMode, isFeatureActive } = select( editPostStore );
-			const modalActive = select( interfaceStore ).isModalActive(
-				PREFERENCES_MODAL_NAME
-			);
-			const mode = getEditorMode();
-			const isRichEditingEnabled = getEditorSettings().richEditingEnabled;
-			const isDistractionFreeEnabled =
-				isFeatureActive( 'distractionFree' );
-			return [
-				modalActive,
-				! isDistractionFreeEnabled &&
-					isLargeViewport &&
-					isRichEditingEnabled &&
-					mode === 'visual',
-				isDistractionFreeEnabled,
-			];
-		},
-		[ isLargeViewport ]
-	);
-
-	const { closeGeneralSidebar, setIsListViewOpened, setIsInserterOpened } =
-		useDispatch( editPostStore );
-
-	const { set: setPreference } = useDispatch( preferencesStore );
-
-	const toggleDistractionFree = () => {
-		setPreference( 'core/edit-post', 'fixedToolbar', true );
-		setIsInserterOpened( false );
-		setIsListViewOpened( false );
-		closeGeneralSidebar();
+	const extraSections = {
+		general: <MetaBoxesSection title={ __( 'Advanced' ) } />,
+		appearance: (
+			<PreferenceToggleControl
+				scope="core/edit-post"
+				featureName="themeStyles"
+				help={ __( 'Make the editor look like your theme.' ) }
+				label={ __( 'Use theme styles' ) }
+			/>
+		),
 	};
 
-	const turnOffDistractionFree = () => {
-		setPreference( 'core/edit-post', 'distractionFree', false );
-	};
-
-	const sections = useMemo(
-		() => [
-			{
-				name: 'general',
-				tabLabel: __( 'General' ),
-				content: (
-					<>
-						{ isLargeViewport && (
-							<PreferencesModalSection
-								title={ __( 'Publishing' ) }
-							>
-								<EnablePublishSidebarOption
-									help={ __(
-										'Review settings, such as visibility and tags.'
-									) }
-									label={ __( 'Enable pre-publish flow' ) }
-								/>
-							</PreferencesModalSection>
-						) }
-						<PreferencesModalSection title={ __( 'Interface' ) }>
-							<EnableFeature
-								featureName="showListViewByDefault"
-								help={ __(
-									'Opens the block list view sidebar by default.'
-								) }
-								label={ __( 'Always open list view' ) }
-							/>
-							{ showBlockBreadcrumbsOption && (
-								<EnableFeature
-									featureName="showBlockBreadcrumbs"
-									help={ __(
-										'Display the block hierarchy trail at the bottom of the editor.'
-									) }
-									label={ __( 'Show block breadcrumbs' ) }
-								/>
-							) }
-						</PreferencesModalSection>
-						<PreferencesModalSection
-							title={ __( 'Document settings' ) }
-							description={ __(
-								'Select what settings are shown in the document panel.'
-							) }
-						>
-							<EnablePluginDocumentSettingPanelOption.Slot />
-							<PostTaxonomies
-								taxonomyWrapper={ ( content, taxonomy ) => (
-									<EnablePanelOption
-										label={ taxonomy.labels.menu_name }
-										panelName={ `taxonomy-panel-${ taxonomy.slug }` }
-									/>
-								) }
-							/>
-							<PostFeaturedImageCheck>
-								<EnablePanelOption
-									label={ __( 'Featured image' ) }
-									panelName="featured-image"
-								/>
-							</PostFeaturedImageCheck>
-							<PostExcerptCheck>
-								<EnablePanelOption
-									label={ __( 'Excerpt' ) }
-									panelName="post-excerpt"
-								/>
-							</PostExcerptCheck>
-							<PostTypeSupportCheck
-								supportKeys={ [ 'comments', 'trackbacks' ] }
-							>
-								<EnablePanelOption
-									label={ __( 'Discussion' ) }
-									panelName="discussion-panel"
-								/>
-							</PostTypeSupportCheck>
-							<PageAttributesCheck>
-								<EnablePanelOption
-									label={ __( 'Page attributes' ) }
-									panelName="page-attributes"
-								/>
-							</PageAttributesCheck>
-						</PreferencesModalSection>
-						<MetaBoxesSection title={ __( 'Advanced' ) } />
-					</>
-				),
-			},
-			{
-				name: 'appearance',
-				tabLabel: __( 'Appearance' ),
-				content: (
-					<PreferencesModalSection
-						title={ __( 'Appearance' ) }
-						description={ __(
-							'Customize the editor interface to suit your needs.'
-						) }
-					>
-						<EnableFeature
-							featureName="fixedToolbar"
-							onToggle={ turnOffDistractionFree }
-							help={ __(
-								'Access all block and document tools in a single place.'
-							) }
-							label={ __( 'Top toolbar' ) }
-						/>
-						<EnableFeature
-							featureName="distractionFree"
-							onToggle={ toggleDistractionFree }
-							help={ __(
-								'Reduce visual distractions by hiding the toolbar and other elements to focus on writing.'
-							) }
-							label={ __( 'Distraction free' ) }
-						/>
-						<EnableFeature
-							featureName="focusMode"
-							help={ __(
-								'Highlights the current block and fades other content.'
-							) }
-							label={ __( 'Spotlight mode' ) }
-						/>
-						<EnableFeature
-							featureName="themeStyles"
-							help={ __(
-								'Make the editor look like your theme.'
-							) }
-							label={ __( 'Use theme styles' ) }
-						/>
-					</PreferencesModalSection>
-				),
-			},
-			{
-				name: 'accessibility',
-				tabLabel: __( 'Accessibility' ),
-				content: (
-					<>
-						<PreferencesModalSection
-							title={ __( 'Navigation' ) }
-							description={ __(
-								'Optimize the editing experience for enhanced control.'
-							) }
-						>
-							<EnableFeature
-								featureName="keepCaretInsideBlock"
-								help={ __(
-									'Keeps the text cursor within the block boundaries, aiding users with screen readers by preventing unintentional cursor movement outside the block.'
-								) }
-								label={ __(
-									'Contain text cursor inside block'
-								) }
-							/>
-						</PreferencesModalSection>
-						<PreferencesModalSection title={ __( 'Interface' ) }>
-							<EnableFeature
-								featureName="showIconLabels"
-								label={ __( 'Show button text labels' ) }
-								help={ __(
-									'Show text instead of icons on buttons across the interface.'
-								) }
-							/>
-						</PreferencesModalSection>
-					</>
-				),
-			},
-			{
-				name: 'blocks',
-				tabLabel: __( 'Blocks' ),
-				content: (
-					<>
-						<PreferencesModalSection title={ __( 'Inserter' ) }>
-							<EnableFeature
-								featureName="mostUsedBlocks"
-								help={ __(
-									'Adds a category with the most frequently used blocks in the inserter.'
-								) }
-								label={ __( 'Show most used blocks' ) }
-							/>
-						</PreferencesModalSection>
-						<PreferencesModalSection
-							title={ __( 'Manage block visibility' ) }
-							description={ __(
-								"Disable blocks that you don't want to appear in the inserter. They can always be toggled back on later."
-							) }
-						>
-							<BlockManager />
-						</PreferencesModalSection>
-					</>
-				),
-			},
-		],
-		[ isLargeViewport, showBlockBreadcrumbsOption ]
-	);
-
-	if ( ! isModalActive ) {
-		return null;
-	}
-
-	return (
-		<PreferencesModal closeModal={ closeModal }>
-			<PreferencesModalTabs sections={ sections } />
-		</PreferencesModal>
-	);
+	return <PreferencesModal extraSections={ extraSections } />;
 }
diff --git a/packages/edit-post/src/components/preferences-modal/meta-boxes-section.js b/packages/edit-post/src/components/preferences-modal/meta-boxes-section.js
index c160137cfa4518..2974e81547dbd6 100644
--- a/packages/edit-post/src/components/preferences-modal/meta-boxes-section.js
+++ b/packages/edit-post/src/components/preferences-modal/meta-boxes-section.js
@@ -4,13 +4,17 @@
 import { __ } from '@wordpress/i18n';
 import { withSelect } from '@wordpress/data';
 import { store as editorStore } from '@wordpress/editor';
-import { PreferencesModalSection } from '@wordpress/interface';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
  */
-import { EnableCustomFieldsOption, EnablePanelOption } from './options';
+import EnableCustomFieldsOption from './enable-custom-fields';
+import EnablePanelOption from './enable-panel';
 import { store as editPostStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const { PreferencesModalSection } = unlock( preferencesPrivateApis );
 
 export function MetaBoxesSection( {
 	areCustomFieldsRegistered,
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-feature.js b/packages/edit-post/src/components/preferences-modal/options/enable-feature.js
deleted file mode 100644
index a92407c00d4167..00000000000000
--- a/packages/edit-post/src/components/preferences-modal/options/enable-feature.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { compose } from '@wordpress/compose';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-export default compose(
-	withSelect( ( select, { featureName } ) => {
-		const { isFeatureActive } = select( editPostStore );
-		return {
-			isChecked: isFeatureActive( featureName ),
-		};
-	} ),
-	withDispatch( ( dispatch, { featureName, onToggle = () => {} } ) => ( {
-		onChange: () => {
-			onToggle();
-			dispatch( editPostStore ).toggleFeature( featureName );
-		},
-	} ) )
-)( BaseOption );
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-panel.js b/packages/edit-post/src/components/preferences-modal/options/enable-panel.js
deleted file mode 100644
index bbde5c80eedfd4..00000000000000
--- a/packages/edit-post/src/components/preferences-modal/options/enable-panel.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { compose, ifCondition } from '@wordpress/compose';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-export default compose(
-	withSelect( ( select, { panelName } ) => {
-		const { isEditorPanelEnabled, isEditorPanelRemoved } =
-			select( editPostStore );
-		return {
-			isRemoved: isEditorPanelRemoved( panelName ),
-			isChecked: isEditorPanelEnabled( panelName ),
-		};
-	} ),
-	ifCondition( ( { isRemoved } ) => ! isRemoved ),
-	withDispatch( ( dispatch, { panelName } ) => ( {
-		onChange: () =>
-			dispatch( editPostStore ).toggleEditorPanelEnabled( panelName ),
-	} ) )
-)( BaseOption );
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-publish-sidebar.js b/packages/edit-post/src/components/preferences-modal/options/enable-publish-sidebar.js
deleted file mode 100644
index fa309bedf24616..00000000000000
--- a/packages/edit-post/src/components/preferences-modal/options/enable-publish-sidebar.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { compose } from '@wordpress/compose';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { ifViewportMatches } from '@wordpress/viewport';
-import { store as editorStore } from '@wordpress/editor';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
-
-export default compose(
-	withSelect( ( select ) => ( {
-		isChecked: select( editorStore ).isPublishSidebarEnabled(),
-	} ) ),
-	withDispatch( ( dispatch ) => {
-		const { enablePublishSidebar, disablePublishSidebar } =
-			dispatch( editorStore );
-		return {
-			onChange: ( isEnabled ) =>
-				isEnabled ? enablePublishSidebar() : disablePublishSidebar(),
-		};
-	} ),
-	// In < medium viewports we override this option and always show the publish sidebar.
-	// See the edit-post's header component for the specific logic.
-	ifViewportMatches( 'medium' )
-)( BaseOption );
diff --git a/packages/edit-post/src/components/preferences-modal/options/index.js b/packages/edit-post/src/components/preferences-modal/options/index.js
deleted file mode 100644
index b5cb1c6c4fe1b7..00000000000000
--- a/packages/edit-post/src/components/preferences-modal/options/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export { default as EnableCustomFieldsOption } from './enable-custom-fields';
-export { default as EnablePanelOption } from './enable-panel';
-export { default as EnablePluginDocumentSettingPanelOption } from './enable-plugin-document-setting-panel';
-export { default as EnablePublishSidebarOption } from './enable-publish-sidebar';
-export { default as EnableFeature } from './enable-feature';
diff --git a/packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap b/packages/edit-post/src/components/preferences-modal/test/__snapshots__/enable-custom-fields.js.snap
similarity index 94%
rename from packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap
rename to packages/edit-post/src/components/preferences-modal/test/__snapshots__/enable-custom-fields.js.snap
index 781cff283f1646..bf12d7d0d8facc 100644
--- a/packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap
+++ b/packages/edit-post/src/components/preferences-modal/test/__snapshots__/enable-custom-fields.js.snap
@@ -29,7 +29,7 @@ exports[`EnableCustomFieldsOption renders a checked checkbox and a confirmation
   -webkit-flex-direction: row;
   -ms-flex-direction: row;
   flex-direction: row;
-  gap: calc(4px * 3);
+  gap: calc(4px * 2);
   -webkit-box-pack: start;
   -ms-flex-pack: start;
   -webkit-justify-content: flex-start;
@@ -54,7 +54,7 @@ exports[`EnableCustomFieldsOption renders a checked checkbox and a confirmation
 
 <div>
   <div
-    class="interface-preferences-modal__option"
+    class="preference-base-option"
   >
     <div
       class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -97,7 +97,7 @@ exports[`EnableCustomFieldsOption renders a checked checkbox and a confirmation
       A page reload is required for this change. Make sure your content is saved before reloading.
     </p>
     <button
-      class="components-button edit-post-preferences-modal__custom-fields-confirmation-button is-secondary"
+      class="components-button is-next-40px-default-size is-secondary"
       type="button"
     >
       Show & Reload Page
@@ -135,7 +135,7 @@ exports[`EnableCustomFieldsOption renders a checked checkbox when custom fields
   -webkit-flex-direction: row;
   -ms-flex-direction: row;
   flex-direction: row;
-  gap: calc(4px * 3);
+  gap: calc(4px * 2);
   -webkit-box-pack: start;
   -ms-flex-pack: start;
   -webkit-justify-content: flex-start;
@@ -160,7 +160,7 @@ exports[`EnableCustomFieldsOption renders a checked checkbox when custom fields
 
 <div>
   <div
-    class="interface-preferences-modal__option"
+    class="preference-base-option"
   >
     <div
       class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -231,7 +231,7 @@ exports[`EnableCustomFieldsOption renders an unchecked checkbox and a confirmati
   -webkit-flex-direction: row;
   -ms-flex-direction: row;
   flex-direction: row;
-  gap: calc(4px * 3);
+  gap: calc(4px * 2);
   -webkit-box-pack: start;
   -ms-flex-pack: start;
   -webkit-justify-content: flex-start;
@@ -256,7 +256,7 @@ exports[`EnableCustomFieldsOption renders an unchecked checkbox and a confirmati
 
 <div>
   <div
-    class="interface-preferences-modal__option"
+    class="preference-base-option"
   >
     <div
       class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -300,7 +300,7 @@ exports[`EnableCustomFieldsOption renders an unchecked checkbox and a confirmati
       A page reload is required for this change. Make sure your content is saved before reloading.
     </p>
     <button
-      class="components-button edit-post-preferences-modal__custom-fields-confirmation-button is-secondary"
+      class="components-button is-next-40px-default-size is-secondary"
       type="button"
     >
       Hide & Reload Page
@@ -338,7 +338,7 @@ exports[`EnableCustomFieldsOption renders an unchecked checkbox when custom fiel
   -webkit-flex-direction: row;
   -ms-flex-direction: row;
   flex-direction: row;
-  gap: calc(4px * 3);
+  gap: calc(4px * 2);
   -webkit-box-pack: start;
   -ms-flex-pack: start;
   -webkit-justify-content: flex-start;
@@ -363,7 +363,7 @@ exports[`EnableCustomFieldsOption renders an unchecked checkbox when custom fiel
 
 <div>
   <div
-    class="interface-preferences-modal__option"
+    class="preference-base-option"
   >
     <div
       class="components-base-control components-toggle-control emotion-0 emotion-1"
diff --git a/packages/edit-post/src/components/preferences-modal/test/__snapshots__/meta-boxes-section.js.snap b/packages/edit-post/src/components/preferences-modal/test/__snapshots__/meta-boxes-section.js.snap
index 2246e0f12fdef7..f9fb99199a3197 100644
--- a/packages/edit-post/src/components/preferences-modal/test/__snapshots__/meta-boxes-section.js.snap
+++ b/packages/edit-post/src/components/preferences-modal/test/__snapshots__/meta-boxes-section.js.snap
@@ -29,7 +29,7 @@ exports[`MetaBoxesSection renders a Custom Fields option 1`] = `
   -webkit-flex-direction: row;
   -ms-flex-direction: row;
   flex-direction: row;
-  gap: calc(4px * 3);
+  gap: calc(4px * 2);
   -webkit-box-pack: start;
   -ms-flex-pack: start;
   -webkit-justify-content: flex-start;
@@ -53,54 +53,58 @@ exports[`MetaBoxesSection renders a Custom Fields option 1`] = `
 }
 
 <fieldset
-  class="interface-preferences-modal__section"
+  class="preferences-modal__section"
 >
   <legend
-    class="interface-preferences-modal__section-legend"
+    class="preferences-modal__section-legend"
   >
     <h2
-      class="interface-preferences-modal__section-title"
+      class="preferences-modal__section-title"
     >
       Advanced panels
     </h2>
   </legend>
   <div
-    class="interface-preferences-modal__option"
+    class="preferences-modal__section-content"
   >
     <div
-      class="components-base-control components-toggle-control emotion-0 emotion-1"
+      class="preference-base-option"
     >
       <div
-        class="components-base-control__field emotion-2 emotion-3"
+        class="components-base-control components-toggle-control emotion-0 emotion-1"
       >
         <div
-          class="components-flex components-h-stack emotion-4 emotion-5"
-          data-wp-c16t="true"
-          data-wp-component="HStack"
+          class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-form-toggle"
-          >
-            <input
-              class="components-form-toggle__input"
-              id="inspector-toggle-control-0"
-              type="checkbox"
-            />
-            <span
-              class="components-form-toggle__track"
-            />
-            <span
-              class="components-form-toggle__thumb"
-            />
-          </span>
-          <label
-            class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+          <div
+            class="components-flex components-h-stack emotion-4 emotion-5"
             data-wp-c16t="true"
-            data-wp-component="FlexBlock"
-            for="inspector-toggle-control-0"
+            data-wp-component="HStack"
           >
-            Custom fields
-          </label>
+            <span
+              class="components-form-toggle"
+            >
+              <input
+                class="components-form-toggle__input"
+                id="inspector-toggle-control-0"
+                type="checkbox"
+              />
+              <span
+                class="components-form-toggle__track"
+              />
+              <span
+                class="components-form-toggle__thumb"
+              />
+            </span>
+            <label
+              class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+              for="inspector-toggle-control-0"
+            >
+              Custom fields
+            </label>
+          </div>
         </div>
       </div>
     </div>
@@ -137,7 +141,7 @@ exports[`MetaBoxesSection renders a Custom Fields option and meta box options 1`
   -webkit-flex-direction: row;
   -ms-flex-direction: row;
   flex-direction: row;
-  gap: calc(4px * 3);
+  gap: calc(4px * 2);
   -webkit-box-pack: start;
   -ms-flex-pack: start;
   -webkit-justify-content: flex-start;
@@ -161,138 +165,142 @@ exports[`MetaBoxesSection renders a Custom Fields option and meta box options 1`
 }
 
 <fieldset
-  class="interface-preferences-modal__section"
+  class="preferences-modal__section"
 >
   <legend
-    class="interface-preferences-modal__section-legend"
+    class="preferences-modal__section-legend"
   >
     <h2
-      class="interface-preferences-modal__section-title"
+      class="preferences-modal__section-title"
     >
       Advanced panels
     </h2>
   </legend>
   <div
-    class="interface-preferences-modal__option"
+    class="preferences-modal__section-content"
   >
     <div
-      class="components-base-control components-toggle-control emotion-0 emotion-1"
+      class="preference-base-option"
     >
       <div
-        class="components-base-control__field emotion-2 emotion-3"
+        class="components-base-control components-toggle-control emotion-0 emotion-1"
       >
         <div
-          class="components-flex components-h-stack emotion-4 emotion-5"
-          data-wp-c16t="true"
-          data-wp-component="HStack"
+          class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-form-toggle"
-          >
-            <input
-              class="components-form-toggle__input"
-              id="inspector-toggle-control-3"
-              type="checkbox"
-            />
-            <span
-              class="components-form-toggle__track"
-            />
-            <span
-              class="components-form-toggle__thumb"
-            />
-          </span>
-          <label
-            class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+          <div
+            class="components-flex components-h-stack emotion-4 emotion-5"
             data-wp-c16t="true"
-            data-wp-component="FlexBlock"
-            for="inspector-toggle-control-3"
+            data-wp-component="HStack"
           >
-            Custom fields
-          </label>
+            <span
+              class="components-form-toggle"
+            >
+              <input
+                class="components-form-toggle__input"
+                id="inspector-toggle-control-3"
+                type="checkbox"
+              />
+              <span
+                class="components-form-toggle__track"
+              />
+              <span
+                class="components-form-toggle__thumb"
+              />
+            </span>
+            <label
+              class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+              for="inspector-toggle-control-3"
+            >
+              Custom fields
+            </label>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-  <div
-    class="interface-preferences-modal__option"
-  >
     <div
-      class="components-base-control components-toggle-control emotion-0 emotion-1"
+      class="preference-base-option"
     >
       <div
-        class="components-base-control__field emotion-2 emotion-3"
+        class="components-base-control components-toggle-control emotion-0 emotion-1"
       >
         <div
-          class="components-flex components-h-stack emotion-4 emotion-5"
-          data-wp-c16t="true"
-          data-wp-component="HStack"
+          class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-form-toggle is-checked"
-          >
-            <input
-              checked=""
-              class="components-form-toggle__input"
-              id="inspector-toggle-control-4"
-              type="checkbox"
-            />
-            <span
-              class="components-form-toggle__track"
-            />
-            <span
-              class="components-form-toggle__thumb"
-            />
-          </span>
-          <label
-            class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+          <div
+            class="components-flex components-h-stack emotion-4 emotion-5"
             data-wp-c16t="true"
-            data-wp-component="FlexBlock"
-            for="inspector-toggle-control-4"
+            data-wp-component="HStack"
           >
-            Meta Box 1
-          </label>
+            <span
+              class="components-form-toggle is-checked"
+            >
+              <input
+                checked=""
+                class="components-form-toggle__input"
+                id="inspector-toggle-control-4"
+                type="checkbox"
+              />
+              <span
+                class="components-form-toggle__track"
+              />
+              <span
+                class="components-form-toggle__thumb"
+              />
+            </span>
+            <label
+              class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+              for="inspector-toggle-control-4"
+            >
+              Meta Box 1
+            </label>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-  <div
-    class="interface-preferences-modal__option"
-  >
     <div
-      class="components-base-control components-toggle-control emotion-0 emotion-1"
+      class="preference-base-option"
     >
       <div
-        class="components-base-control__field emotion-2 emotion-3"
+        class="components-base-control components-toggle-control emotion-0 emotion-1"
       >
         <div
-          class="components-flex components-h-stack emotion-4 emotion-5"
-          data-wp-c16t="true"
-          data-wp-component="HStack"
+          class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-form-toggle is-checked"
-          >
-            <input
-              checked=""
-              class="components-form-toggle__input"
-              id="inspector-toggle-control-5"
-              type="checkbox"
-            />
-            <span
-              class="components-form-toggle__track"
-            />
-            <span
-              class="components-form-toggle__thumb"
-            />
-          </span>
-          <label
-            class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+          <div
+            class="components-flex components-h-stack emotion-4 emotion-5"
             data-wp-c16t="true"
-            data-wp-component="FlexBlock"
-            for="inspector-toggle-control-5"
+            data-wp-component="HStack"
           >
-            Meta Box 2
-          </label>
+            <span
+              class="components-form-toggle is-checked"
+            >
+              <input
+                checked=""
+                class="components-form-toggle__input"
+                id="inspector-toggle-control-5"
+                type="checkbox"
+              />
+              <span
+                class="components-form-toggle__track"
+              />
+              <span
+                class="components-form-toggle__thumb"
+              />
+            </span>
+            <label
+              class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+              for="inspector-toggle-control-5"
+            >
+              Meta Box 2
+            </label>
+          </div>
         </div>
       </div>
     </div>
@@ -329,7 +337,7 @@ exports[`MetaBoxesSection renders meta box options 1`] = `
   -webkit-flex-direction: row;
   -ms-flex-direction: row;
   flex-direction: row;
-  gap: calc(4px * 3);
+  gap: calc(4px * 2);
   -webkit-box-pack: start;
   -ms-flex-pack: start;
   -webkit-justify-content: flex-start;
@@ -353,97 +361,101 @@ exports[`MetaBoxesSection renders meta box options 1`] = `
 }
 
 <fieldset
-  class="interface-preferences-modal__section"
+  class="preferences-modal__section"
 >
   <legend
-    class="interface-preferences-modal__section-legend"
+    class="preferences-modal__section-legend"
   >
     <h2
-      class="interface-preferences-modal__section-title"
+      class="preferences-modal__section-title"
     >
       Advanced panels
     </h2>
   </legend>
   <div
-    class="interface-preferences-modal__option"
+    class="preferences-modal__section-content"
   >
     <div
-      class="components-base-control components-toggle-control emotion-0 emotion-1"
+      class="preference-base-option"
     >
       <div
-        class="components-base-control__field emotion-2 emotion-3"
+        class="components-base-control components-toggle-control emotion-0 emotion-1"
       >
         <div
-          class="components-flex components-h-stack emotion-4 emotion-5"
-          data-wp-c16t="true"
-          data-wp-component="HStack"
+          class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-form-toggle is-checked"
-          >
-            <input
-              checked=""
-              class="components-form-toggle__input"
-              id="inspector-toggle-control-1"
-              type="checkbox"
-            />
-            <span
-              class="components-form-toggle__track"
-            />
-            <span
-              class="components-form-toggle__thumb"
-            />
-          </span>
-          <label
-            class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+          <div
+            class="components-flex components-h-stack emotion-4 emotion-5"
             data-wp-c16t="true"
-            data-wp-component="FlexBlock"
-            for="inspector-toggle-control-1"
+            data-wp-component="HStack"
           >
-            Meta Box 1
-          </label>
+            <span
+              class="components-form-toggle is-checked"
+            >
+              <input
+                checked=""
+                class="components-form-toggle__input"
+                id="inspector-toggle-control-1"
+                type="checkbox"
+              />
+              <span
+                class="components-form-toggle__track"
+              />
+              <span
+                class="components-form-toggle__thumb"
+              />
+            </span>
+            <label
+              class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+              for="inspector-toggle-control-1"
+            >
+              Meta Box 1
+            </label>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-  <div
-    class="interface-preferences-modal__option"
-  >
     <div
-      class="components-base-control components-toggle-control emotion-0 emotion-1"
+      class="preference-base-option"
     >
       <div
-        class="components-base-control__field emotion-2 emotion-3"
+        class="components-base-control components-toggle-control emotion-0 emotion-1"
       >
         <div
-          class="components-flex components-h-stack emotion-4 emotion-5"
-          data-wp-c16t="true"
-          data-wp-component="HStack"
+          class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-form-toggle is-checked"
-          >
-            <input
-              checked=""
-              class="components-form-toggle__input"
-              id="inspector-toggle-control-2"
-              type="checkbox"
-            />
-            <span
-              class="components-form-toggle__track"
-            />
-            <span
-              class="components-form-toggle__thumb"
-            />
-          </span>
-          <label
-            class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+          <div
+            class="components-flex components-h-stack emotion-4 emotion-5"
             data-wp-c16t="true"
-            data-wp-component="FlexBlock"
-            for="inspector-toggle-control-2"
+            data-wp-component="HStack"
           >
-            Meta Box 2
-          </label>
+            <span
+              class="components-form-toggle is-checked"
+            >
+              <input
+                checked=""
+                class="components-form-toggle__input"
+                id="inspector-toggle-control-2"
+                type="checkbox"
+              />
+              <span
+                class="components-form-toggle__track"
+              />
+              <span
+                class="components-form-toggle__thumb"
+              />
+            </span>
+            <label
+              class="components-flex-item components-flex-block components-toggle-control__label emotion-6 emotion-5"
+              data-wp-c16t="true"
+              data-wp-component="FlexBlock"
+              for="inspector-toggle-control-2"
+            >
+              Meta Box 2
+            </label>
+          </div>
         </div>
       </div>
     </div>
diff --git a/packages/edit-post/src/components/preferences-modal/options/test/enable-custom-fields.js b/packages/edit-post/src/components/preferences-modal/test/enable-custom-fields.js
similarity index 100%
rename from packages/edit-post/src/components/preferences-modal/options/test/enable-custom-fields.js
rename to packages/edit-post/src/components/preferences-modal/test/enable-custom-fields.js
diff --git a/packages/edit-post/src/components/secondary-sidebar/inserter-sidebar.js b/packages/edit-post/src/components/secondary-sidebar/inserter-sidebar.js
deleted file mode 100644
index e87488ffa6e656..00000000000000
--- a/packages/edit-post/src/components/secondary-sidebar/inserter-sidebar.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useDispatch, useSelect } from '@wordpress/data';
-import { Button, VisuallyHidden } from '@wordpress/components';
-import { __experimentalLibrary as Library } from '@wordpress/block-editor';
-import { close } from '@wordpress/icons';
-import {
-	useViewportMatch,
-	__experimentalUseDialog as useDialog,
-} from '@wordpress/compose';
-import { __ } from '@wordpress/i18n';
-import { useEffect, useRef } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-
-export default function InserterSidebar() {
-	const { insertionPoint, showMostUsedBlocks } = useSelect( ( select ) => {
-		const { isFeatureActive, __experimentalGetInsertionPoint } =
-			select( editPostStore );
-		return {
-			insertionPoint: __experimentalGetInsertionPoint(),
-			showMostUsedBlocks: isFeatureActive( 'mostUsedBlocks' ),
-		};
-	}, [] );
-	const { setIsInserterOpened } = useDispatch( editPostStore );
-
-	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const TagName = ! isMobileViewport ? VisuallyHidden : 'div';
-	const [ inserterDialogRef, inserterDialogProps ] = useDialog( {
-		onClose: () => setIsInserterOpened( false ),
-		focusOnMount: null,
-	} );
-
-	const libraryRef = useRef();
-	useEffect( () => {
-		libraryRef.current.focusSearch();
-	}, [] );
-
-	return (
-		<div
-			ref={ inserterDialogRef }
-			{ ...inserterDialogProps }
-			className="edit-post-editor__inserter-panel"
-		>
-			<TagName className="edit-post-editor__inserter-panel-header">
-				<Button
-					icon={ close }
-					label={ __( 'Close block inserter' ) }
-					onClick={ () => setIsInserterOpened( false ) }
-				/>
-			</TagName>
-			<div className="edit-post-editor__inserter-panel-content">
-				<Library
-					showMostUsedBlocks={ showMostUsedBlocks }
-					showInserterHelpPanel
-					shouldFocusBlock={ isMobileViewport }
-					rootClientId={ insertionPoint.rootClientId }
-					__experimentalInsertionIndex={
-						insertionPoint.insertionIndex
-					}
-					__experimentalFilterValue={ insertionPoint.filterValue }
-					ref={ libraryRef }
-				/>
-			</div>
-		</div>
-	);
-}
diff --git a/packages/edit-post/src/components/secondary-sidebar/list-view-outline.js b/packages/edit-post/src/components/secondary-sidebar/list-view-outline.js
deleted file mode 100644
index 6d27767bdfd0bd..00000000000000
--- a/packages/edit-post/src/components/secondary-sidebar/list-view-outline.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import {
-	DocumentOutline,
-	WordCount,
-	TimeToRead,
-	CharacterCount,
-} from '@wordpress/editor';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import {
-	__experimentalText as Text,
-	Path,
-	SVG,
-	Line,
-	Rect,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-function EmptyOutlineIllustration() {
-	return (
-		<SVG
-			width="138"
-			height="148"
-			viewBox="0 0 138 148"
-			fill="none"
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<Rect width="138" height="148" rx="4" fill="#F0F6FC" />
-			<Line x1="44" y1="28" x2="24" y2="28" stroke="#DDDDDD" />
-			<Rect x="48" y="16" width="27" height="23" rx="4" fill="#DDDDDD" />
-			<Path
-				d="M54.7585 32V23.2727H56.6037V26.8736H60.3494V23.2727H62.1903V32H60.3494V28.3949H56.6037V32H54.7585ZM67.4574 23.2727V32H65.6122V25.0241H65.5611L63.5625 26.277V24.6406L65.723 23.2727H67.4574Z"
-				fill="black"
-			/>
-			<Line x1="55" y1="59" x2="24" y2="59" stroke="#DDDDDD" />
-			<Rect x="59" y="47" width="29" height="23" rx="4" fill="#DDDDDD" />
-			<Path
-				d="M65.7585 63V54.2727H67.6037V57.8736H71.3494V54.2727H73.1903V63H71.3494V59.3949H67.6037V63H65.7585ZM74.6605 63V61.6705L77.767 58.794C78.0313 58.5384 78.2528 58.3082 78.4318 58.1037C78.6136 57.8991 78.7514 57.6989 78.8452 57.5028C78.9389 57.304 78.9858 57.0895 78.9858 56.8594C78.9858 56.6037 78.9276 56.3835 78.8111 56.1989C78.6946 56.0114 78.5355 55.8679 78.3338 55.7685C78.1321 55.6662 77.9034 55.6151 77.6477 55.6151C77.3807 55.6151 77.1477 55.669 76.9489 55.777C76.75 55.8849 76.5966 56.0398 76.4886 56.2415C76.3807 56.4432 76.3267 56.6832 76.3267 56.9616H74.5753C74.5753 56.3906 74.7045 55.8949 74.9631 55.4744C75.2216 55.054 75.5838 54.7287 76.0497 54.4986C76.5156 54.2685 77.0526 54.1534 77.6605 54.1534C78.2855 54.1534 78.8295 54.2642 79.2926 54.4858C79.7585 54.7045 80.1207 55.0085 80.3793 55.3977C80.6378 55.7869 80.767 56.233 80.767 56.7358C80.767 57.0653 80.7017 57.3906 80.571 57.7116C80.4432 58.0327 80.2145 58.3892 79.8849 58.7812C79.5554 59.1705 79.0909 59.6378 78.4915 60.1832L77.2173 61.4318V61.4915H80.8821V63H74.6605Z"
-				fill="black"
-			/>
-			<Line x1="80" y1="90" x2="24" y2="90" stroke="#DDDDDD" />
-			<Rect x="84" y="78" width="30" height="23" rx="4" fill="#F0B849" />
-			<Path
-				d="M90.7585 94V85.2727H92.6037V88.8736H96.3494V85.2727H98.1903V94H96.3494V90.3949H92.6037V94H90.7585ZM99.5284 92.4659V91.0128L103.172 85.2727H104.425V87.2841H103.683L101.386 90.919V90.9872H106.564V92.4659H99.5284ZM103.717 94V92.0227L103.751 91.3793V85.2727H105.482V94H103.717Z"
-				fill="black"
-			/>
-			<Line x1="66" y1="121" x2="24" y2="121" stroke="#DDDDDD" />
-			<Rect x="70" y="109" width="29" height="23" rx="4" fill="#DDDDDD" />
-			<Path
-				d="M76.7585 125V116.273H78.6037V119.874H82.3494V116.273H84.1903V125H82.3494V121.395H78.6037V125H76.7585ZM88.8864 125.119C88.25 125.119 87.6832 125.01 87.1861 124.791C86.6918 124.57 86.3011 124.266 86.0142 123.879C85.7301 123.49 85.5838 123.041 85.5753 122.533H87.4332C87.4446 122.746 87.5142 122.933 87.642 123.095C87.7727 123.254 87.946 123.378 88.1619 123.466C88.3778 123.554 88.6207 123.598 88.8906 123.598C89.1719 123.598 89.4205 123.548 89.6364 123.449C89.8523 123.349 90.0213 123.212 90.1435 123.036C90.2656 122.859 90.3267 122.656 90.3267 122.426C90.3267 122.193 90.2614 121.987 90.1307 121.808C90.0028 121.626 89.8182 121.484 89.5767 121.382C89.3381 121.28 89.054 121.229 88.7244 121.229H87.9105V119.874H88.7244C89.0028 119.874 89.2486 119.825 89.4616 119.729C89.6776 119.632 89.8452 119.499 89.9645 119.328C90.0838 119.155 90.1435 118.953 90.1435 118.723C90.1435 118.504 90.0909 118.312 89.9858 118.148C89.8835 117.98 89.7386 117.849 89.5511 117.756C89.3665 117.662 89.1506 117.615 88.9034 117.615C88.6534 117.615 88.4247 117.661 88.2173 117.751C88.0099 117.839 87.8438 117.966 87.7188 118.131C87.5938 118.295 87.527 118.489 87.5185 118.71H85.75C85.7585 118.207 85.902 117.764 86.1804 117.381C86.4588 116.997 86.8338 116.697 87.3054 116.482C87.7798 116.263 88.3153 116.153 88.9119 116.153C89.5142 116.153 90.0412 116.263 90.4929 116.482C90.9446 116.7 91.2955 116.996 91.5455 117.368C91.7983 117.737 91.9233 118.152 91.9205 118.612C91.9233 119.101 91.7713 119.509 91.4645 119.835C91.1605 120.162 90.7642 120.369 90.2756 120.457V120.526C90.9176 120.608 91.4063 120.831 91.7415 121.195C92.0795 121.555 92.2472 122.007 92.2443 122.55C92.2472 123.047 92.1037 123.489 91.8139 123.875C91.527 124.261 91.1307 124.565 90.625 124.787C90.1193 125.009 89.5398 125.119 88.8864 125.119Z"
-				fill="black"
-			/>
-		</SVG>
-	);
-}
-
-export default function ListViewOutline() {
-	const { headingCount } = useSelect( ( select ) => {
-		const { getGlobalBlockCount } = select( blockEditorStore );
-		return {
-			headingCount: getGlobalBlockCount( 'core/heading' ),
-		};
-	}, [] );
-	return (
-		<>
-			<div className="edit-post-editor__list-view-overview">
-				<div>
-					<Text>{ __( 'Characters:' ) }</Text>
-					<Text>
-						<CharacterCount />
-					</Text>
-				</div>
-				<div>
-					<Text>{ __( 'Words:' ) }</Text>
-					<WordCount />
-				</div>
-				<div>
-					<Text>{ __( 'Time to read:' ) }</Text>
-					<TimeToRead />
-				</div>
-			</div>
-			{ headingCount > 0 ? (
-				<DocumentOutline />
-			) : (
-				<div className="edit-post-editor__list-view-empty-headings">
-					<EmptyOutlineIllustration />
-					<p>
-						{ __(
-							'Navigate the structure of your document and address issues like empty or incorrect heading levels.'
-						) }
-					</p>
-				</div>
-			) }
-		</>
-	);
-}
diff --git a/packages/edit-post/src/components/secondary-sidebar/list-view-sidebar.js b/packages/edit-post/src/components/secondary-sidebar/list-view-sidebar.js
deleted file mode 100644
index 0d96606e9e0434..00000000000000
--- a/packages/edit-post/src/components/secondary-sidebar/list-view-sidebar.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __experimentalListView as ListView } from '@wordpress/block-editor';
-import { Button, TabPanel } from '@wordpress/components';
-import { useFocusOnMount, useMergeRefs } from '@wordpress/compose';
-import { useDispatch } from '@wordpress/data';
-import { focus } from '@wordpress/dom';
-import { useCallback, useRef, useState } from '@wordpress/element';
-import { __, _x } from '@wordpress/i18n';
-import { closeSmall } from '@wordpress/icons';
-import { useShortcut } from '@wordpress/keyboard-shortcuts';
-import { ESCAPE } from '@wordpress/keycodes';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-import ListViewOutline from './list-view-outline';
-
-export default function ListViewSidebar( { listViewToggleElement } ) {
-	const { setIsListViewOpened } = useDispatch( editPostStore );
-
-	// This hook handles focus when the sidebar first renders.
-	const focusOnMountRef = useFocusOnMount( 'firstElement' );
-
-	// When closing the list view, focus should return to the toggle button.
-	const closeListView = useCallback( () => {
-		setIsListViewOpened( false );
-		listViewToggleElement?.focus();
-	}, [ listViewToggleElement, setIsListViewOpened ] );
-
-	const closeOnEscape = useCallback(
-		( event ) => {
-			if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
-				event.preventDefault();
-				closeListView();
-			}
-		},
-		[ closeListView ]
-	);
-
-	// Use internal state instead of a ref to make sure that the component
-	// re-renders when the dropZoneElement updates.
-	const [ dropZoneElement, setDropZoneElement ] = useState( null );
-	// Tracks our current tab.
-	const [ tab, setTab ] = useState( 'list-view' );
-
-	// This ref refers to the sidebar as a whole.
-	const sidebarRef = useRef();
-	// This ref refers to the tab panel.
-	const tabPanelRef = useRef();
-	// This ref refers to the list view application area.
-	const listViewRef = useRef();
-
-	// Must merge the refs together so focus can be handled properly in the next function.
-	const listViewContainerRef = useMergeRefs( [
-		focusOnMountRef,
-		listViewRef,
-		setDropZoneElement,
-	] );
-
-	/*
-	 * Callback function to handle list view or outline focus.
-	 *
-	 * @param {string} currentTab The current tab. Either list view or outline.
-	 *
-	 * @return void
-	 */
-	function handleSidebarFocus( currentTab ) {
-		// Tab panel focus.
-		const tabPanelFocus = focus.tabbable.find( tabPanelRef.current )[ 0 ];
-		// List view tab is selected.
-		if ( currentTab === 'list-view' ) {
-			// Either focus the list view or the tab panel. Must have a fallback because the list view does not render when there are no blocks.
-			const listViewApplicationFocus = focus.tabbable.find(
-				listViewRef.current
-			)[ 0 ];
-			const listViewFocusArea = sidebarRef.current.contains(
-				listViewApplicationFocus
-			)
-				? listViewApplicationFocus
-				: tabPanelFocus;
-			listViewFocusArea.focus();
-			// Outline tab is selected.
-		} else {
-			tabPanelFocus.focus();
-		}
-	}
-
-	const handleToggleListViewShortcut = useCallback( () => {
-		// If the sidebar has focus, it is safe to close.
-		if (
-			sidebarRef.current.contains(
-				sidebarRef.current.ownerDocument.activeElement
-			)
-		) {
-			closeListView();
-		} else {
-			// If the list view or outline does not have focus, focus should be moved to it.
-			handleSidebarFocus( tab );
-		}
-	}, [ closeListView, tab ] );
-
-	// This only fires when the sidebar is open because of the conditional rendering.
-	// It is the same shortcut to open but that is defined as a global shortcut and only fires when the sidebar is closed.
-	useShortcut(
-		'core/edit-post/toggle-list-view',
-		handleToggleListViewShortcut
-	);
-
-	/**
-	 * Render tab content for a given tab name.
-	 *
-	 * @param {string} tabName The name of the tab to render.
-	 */
-	function renderTabContent( tabName ) {
-		if ( tabName === 'list-view' ) {
-			return (
-				<div className="edit-post-editor__list-view-panel-content">
-					<ListView dropZoneElement={ dropZoneElement } />
-				</div>
-			);
-		}
-		return <ListViewOutline />;
-	}
-
-	return (
-		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
-		<div
-			className="edit-post-editor__document-overview-panel"
-			onKeyDown={ closeOnEscape }
-			ref={ sidebarRef }
-		>
-			<Button
-				className="edit-post-editor__document-overview-panel__close-button"
-				icon={ closeSmall }
-				label={ __( 'Close' ) }
-				onClick={ closeListView }
-			/>
-			<TabPanel
-				className="edit-post-editor__document-overview-panel__tab-panel"
-				ref={ tabPanelRef }
-				onSelect={ ( tabName ) => setTab( tabName ) }
-				selectOnMove={ false }
-				tabs={ [
-					{
-						name: 'list-view',
-						title: _x( 'List View', 'Post overview' ),
-						className: 'edit-post-sidebar__panel-tab',
-					},
-					{
-						name: 'outline',
-						title: _x( 'Outline', 'Post overview' ),
-						className: 'edit-post-sidebar__panel-tab',
-					},
-				] }
-			>
-				{ ( currentTab ) => (
-					<div
-						className="edit-post-editor__list-view-container"
-						ref={ listViewContainerRef }
-					>
-						{ renderTabContent( currentTab.name ) }
-					</div>
-				) }
-			</TabPanel>
-		</div>
-	);
-}
diff --git a/packages/edit-post/src/components/secondary-sidebar/style.scss b/packages/edit-post/src/components/secondary-sidebar/style.scss
deleted file mode 100644
index 122d2ec3c9c525..00000000000000
--- a/packages/edit-post/src/components/secondary-sidebar/style.scss
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Note that this CSS file should be in sync with its counterpart in the other editor:
- * packages/edit-site/src/components/secondary-sidebar/style.scss
- */
-
-.edit-post-editor__inserter-panel,
-.edit-post-editor__document-overview-panel {
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-}
-
-.edit-post-editor__document-overview-panel {
-	@include break-medium() {
-		// Same width as the Inserter.
-		// @see packages/block-editor/src/components/inserter/style.scss
-		width: 350px;
-	}
-
-	.edit-post-editor__document-overview-panel__close-button {
-		position: absolute;
-		right: $grid-unit-10;
-		top: math.div($grid-unit-60 - $button-size, 2); // ( tab height - button size ) / 2
-		z-index: 1;
-		background: $white;
-	}
-
-	// The TabPanel style overrides in the following blocks should be removed when the new TabPanel is available.
-	.components-tab-panel__tabs {
-		border-bottom: $border-width solid $gray-300;
-		box-sizing: border-box;
-		display: flex;
-		width: 100%;
-		padding-right: $grid-unit-70;
-
-		.edit-post-sidebar__panel-tab {
-			width: 50%;
-			margin-bottom: -$border-width;
-		}
-	}
-
-	.components-tab-panel__tab-content {
-		height: calc(100% - #{$grid-unit-60 - $border-width});
-	}
-}
-
-.edit-post-editor__inserter-panel-header {
-	padding-top: $grid-unit-10;
-	padding-right: $grid-unit-10;
-	display: flex;
-	justify-content: flex-end;
-}
-
-.edit-post-editor__inserter-panel-content {
-	// Leave space for the close button
-	height: calc(100% - #{$button-size} - #{$grid-unit-10});
-	@include break-medium() {
-		height: 100%;
-	}
-}
-
-.edit-post-editor__list-view-panel-content,
-.edit-post-editor__list-view-container > .document-outline,
-.edit-post-editor__list-view-empty-headings {
-	height: 100%;
-
-	// Include custom scrollbars, invisible until hovered.
-	@include custom-scrollbars-on-hover(transparent, $gray-600);
-	overflow: auto;
-
-	// Only reserve space for scrollbars when there is content to scroll.
-	// This allows items in the list view to have equidistant padding left and right
-	// right up until a scrollbar is present.
-	scrollbar-gutter: auto;
-
-	// The table cells use an extra pixels of space left and right. We compensate for that here.
-	padding: $grid-unit-10 ($grid-unit-10 - $border-width - $border-width);
-}
-
-.edit-post-editor__list-view-empty-headings {
-	& > svg {
-		margin-top: $grid-unit-30 + $grid-unit-05;
-	}
-	& > p {
-		padding-left: $grid-unit-40;
-		padding-right: $grid-unit-40;
-	}
-	text-align: center;
-	color: $gray-700;
-}
-
-.edit-post-editor__list-view-overview {
-	display: flex;
-	flex-direction: column;
-	gap: $grid-unit-10;
-	border-bottom: $border-width solid $gray-300;
-	padding: $grid-unit-20;
-
-	& > div > span:first-child {
-		// Width of the text information fields.
-		width: 90px;
-		display: inline-block;
-	}
-
-	& > div > span {
-		font-size: $helptext-font-size;
-		line-height: $default-line-height;
-		color: $gray-700;
-	}
-}
-
-.edit-post-editor__list-view-container {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-
-.edit-post-editor__document-overview-panel__tab-panel {
-	height: 100%;
-}
diff --git a/packages/edit-post/src/components/sidebar/discussion-panel/index.js b/packages/edit-post/src/components/sidebar/discussion-panel/index.js
deleted file mode 100644
index c8e63f23fac8dd..00000000000000
--- a/packages/edit-post/src/components/sidebar/discussion-panel/index.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { PanelBody, PanelRow } from '@wordpress/components';
-import {
-	PostComments,
-	PostPingbacks,
-	PostTypeSupportCheck,
-} from '@wordpress/editor';
-import { useDispatch, useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-/**
- * Module Constants
- */
-const PANEL_NAME = 'discussion-panel';
-
-function DiscussionPanel() {
-	const { isEnabled, isOpened } = useSelect( ( select ) => {
-		const { isEditorPanelEnabled, isEditorPanelOpened } =
-			select( editPostStore );
-		return {
-			isEnabled: isEditorPanelEnabled( PANEL_NAME ),
-			isOpened: isEditorPanelOpened( PANEL_NAME ),
-		};
-	}, [] );
-
-	const { toggleEditorPanelOpened } = useDispatch( editPostStore );
-
-	if ( ! isEnabled ) {
-		return null;
-	}
-
-	return (
-		<PostTypeSupportCheck supportKeys={ [ 'comments', 'trackbacks' ] }>
-			<PanelBody
-				title={ __( 'Discussion' ) }
-				opened={ isOpened }
-				onToggle={ () => toggleEditorPanelOpened( PANEL_NAME ) }
-			>
-				<PostTypeSupportCheck supportKeys="comments">
-					<PanelRow>
-						<PostComments />
-					</PanelRow>
-				</PostTypeSupportCheck>
-
-				<PostTypeSupportCheck supportKeys="trackbacks">
-					<PanelRow>
-						<PostPingbacks />
-					</PanelRow>
-				</PostTypeSupportCheck>
-			</PanelBody>
-		</PostTypeSupportCheck>
-	);
-}
-
-export default DiscussionPanel;
diff --git a/packages/edit-post/src/components/sidebar/featured-image/index.js b/packages/edit-post/src/components/sidebar/featured-image/index.js
deleted file mode 100644
index 42215c5de93805..00000000000000
--- a/packages/edit-post/src/components/sidebar/featured-image/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { PanelBody } from '@wordpress/components';
-import {
-	PostFeaturedImage,
-	PostFeaturedImageCheck,
-	store as editorStore,
-} from '@wordpress/editor';
-import { compose } from '@wordpress/compose';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-/**
- * Module Constants
- */
-const PANEL_NAME = 'featured-image';
-
-function FeaturedImage( { isEnabled, isOpened, postType, onTogglePanel } ) {
-	if ( ! isEnabled ) {
-		return null;
-	}
-
-	return (
-		<PostFeaturedImageCheck>
-			<PanelBody
-				title={
-					postType?.labels?.featured_image ?? __( 'Featured image' )
-				}
-				opened={ isOpened }
-				onToggle={ onTogglePanel }
-			>
-				<PostFeaturedImage />
-			</PanelBody>
-		</PostFeaturedImageCheck>
-	);
-}
-
-const applyWithSelect = withSelect( ( select ) => {
-	const { getEditedPostAttribute } = select( editorStore );
-	const { getPostType } = select( coreStore );
-	const { isEditorPanelEnabled, isEditorPanelOpened } =
-		select( editPostStore );
-
-	return {
-		postType: getPostType( getEditedPostAttribute( 'type' ) ),
-		isEnabled: isEditorPanelEnabled( PANEL_NAME ),
-		isOpened: isEditorPanelOpened( PANEL_NAME ),
-	};
-} );
-
-const applyWithDispatch = withDispatch( ( dispatch ) => {
-	const { toggleEditorPanelOpened } = dispatch( editPostStore );
-
-	return {
-		onTogglePanel: ( ...args ) =>
-			toggleEditorPanelOpened( PANEL_NAME, ...args ),
-	};
-} );
-
-export default compose( applyWithSelect, applyWithDispatch )( FeaturedImage );
diff --git a/packages/edit-post/src/components/sidebar/last-revision/index.js b/packages/edit-post/src/components/sidebar/last-revision/index.js
deleted file mode 100644
index 354d1104302889..00000000000000
--- a/packages/edit-post/src/components/sidebar/last-revision/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { PanelBody } from '@wordpress/components';
-import { PostLastRevision, PostLastRevisionCheck } from '@wordpress/editor';
-
-function LastRevision() {
-	return (
-		<PostLastRevisionCheck>
-			<PanelBody className="edit-post-last-revision__panel">
-				<PostLastRevision />
-			</PanelBody>
-		</PostLastRevisionCheck>
-	);
-}
-
-export default LastRevision;
diff --git a/packages/edit-post/src/components/sidebar/last-revision/style.scss b/packages/edit-post/src/components/sidebar/last-revision/style.scss
deleted file mode 100644
index fbc3bd465e2a66..00000000000000
--- a/packages/edit-post/src/components/sidebar/last-revision/style.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// Needs specificity, because this panel is just a button
-.components-panel__body.is-opened.edit-post-last-revision__panel {
-	padding: 0;
-	height: $grid-unit-60;
-}
-
-// Needs specificity to override button styles.
-.editor-post-last-revision__title.components-button.components-button {
-	padding: $grid-unit-20;
-}
diff --git a/packages/edit-post/src/components/sidebar/page-attributes/index.js b/packages/edit-post/src/components/sidebar/page-attributes/index.js
deleted file mode 100644
index e34680e42a7b52..00000000000000
--- a/packages/edit-post/src/components/sidebar/page-attributes/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { PanelBody, PanelRow } from '@wordpress/components';
-import {
-	store as editorStore,
-	PageAttributesCheck,
-	PageAttributesOrder,
-	PageAttributesParent,
-} from '@wordpress/editor';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-/**
- * Module Constants
- */
-const PANEL_NAME = 'page-attributes';
-
-export function PageAttributes() {
-	const { isEnabled, isOpened, postType } = useSelect( ( select ) => {
-		const { getEditedPostAttribute } = select( editorStore );
-		const { isEditorPanelEnabled, isEditorPanelOpened } =
-			select( editPostStore );
-		const { getPostType } = select( coreStore );
-		return {
-			isEnabled: isEditorPanelEnabled( PANEL_NAME ),
-			isOpened: isEditorPanelOpened( PANEL_NAME ),
-			postType: getPostType( getEditedPostAttribute( 'type' ) ),
-		};
-	}, [] );
-
-	const { toggleEditorPanelOpened } = useDispatch( editPostStore );
-
-	if ( ! isEnabled || ! postType ) {
-		return null;
-	}
-
-	const onTogglePanel = ( ...args ) =>
-		toggleEditorPanelOpened( PANEL_NAME, ...args );
-
-	return (
-		<PageAttributesCheck>
-			<PanelBody
-				title={
-					postType?.labels?.attributes ?? __( 'Page attributes' )
-				}
-				opened={ isOpened }
-				onToggle={ onTogglePanel }
-			>
-				<PageAttributesParent />
-				<PanelRow>
-					<PageAttributesOrder />
-				</PanelRow>
-			</PanelBody>
-		</PageAttributesCheck>
-	);
-}
-
-export default PageAttributes;
diff --git a/packages/edit-post/src/components/sidebar/plugin-document-setting-panel/index.js b/packages/edit-post/src/components/sidebar/plugin-document-setting-panel/index.js
deleted file mode 100644
index 7ee3f96498e53c..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-document-setting-panel/index.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createSlotFill, PanelBody } from '@wordpress/components';
-import { usePluginContext } from '@wordpress/plugins';
-import { useDispatch, useSelect } from '@wordpress/data';
-import warning from '@wordpress/warning';
-
-/**
- * Internal dependencies
- */
-import { EnablePluginDocumentSettingPanelOption } from '../../preferences-modal/options';
-import { store as editPostStore } from '../../../store';
-
-const { Fill, Slot } = createSlotFill( 'PluginDocumentSettingPanel' );
-
-/**
- * Renders items below the Status & Availability panel in the Document Sidebar.
- *
- * @param {Object}                props                                 Component properties.
- * @param {string}                props.name                            Required. A machine-friendly name for the panel.
- * @param {string}                [props.className]                     An optional class name added to the row.
- * @param {string}                [props.title]                         The title of the panel
- * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
- * @param {Element}               props.children                        Children to be rendered
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var el = React.createElement;
- * var __ = wp.i18n.__;
- * var registerPlugin = wp.plugins.registerPlugin;
- * var PluginDocumentSettingPanel = wp.editPost.PluginDocumentSettingPanel;
- *
- * function MyDocumentSettingPlugin() {
- * 	return el(
- * 		PluginDocumentSettingPanel,
- * 		{
- * 			className: 'my-document-setting-plugin',
- * 			title: 'My Panel',
- * 			name: 'my-panel',
- * 		},
- * 		__( 'My Document Setting Panel' )
- * 	);
- * }
- *
- * registerPlugin( 'my-document-setting-plugin', {
- * 		render: MyDocumentSettingPlugin
- * } );
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { registerPlugin } from '@wordpress/plugins';
- * import { PluginDocumentSettingPanel } from '@wordpress/edit-post';
- *
- * const MyDocumentSettingTest = () => (
- * 		<PluginDocumentSettingPanel className="my-document-setting-plugin" title="My Panel" name="my-panel">
- *			<p>My Document Setting Panel</p>
- *		</PluginDocumentSettingPanel>
- *	);
- *
- *  registerPlugin( 'document-setting-test', { render: MyDocumentSettingTest } );
- * ```
- *
- * @return {Component} The component to be rendered.
- */
-const PluginDocumentSettingPanel = ( {
-	name,
-	className,
-	title,
-	icon,
-	children,
-} ) => {
-	const { name: pluginName } = usePluginContext();
-	const panelName = `${ pluginName }/${ name }`;
-	const { opened, isEnabled } = useSelect(
-		( select ) => {
-			const { isEditorPanelOpened, isEditorPanelEnabled } =
-				select( editPostStore );
-
-			return {
-				opened: isEditorPanelOpened( panelName ),
-				isEnabled: isEditorPanelEnabled( panelName ),
-			};
-		},
-		[ panelName ]
-	);
-	const { toggleEditorPanelOpened } = useDispatch( editPostStore );
-
-	if ( undefined === name ) {
-		warning( 'PluginDocumentSettingPanel requires a name property.' );
-	}
-
-	return (
-		<>
-			<EnablePluginDocumentSettingPanelOption
-				label={ title }
-				panelName={ panelName }
-			/>
-			<Fill>
-				{ isEnabled && (
-					<PanelBody
-						className={ className }
-						title={ title }
-						icon={ icon }
-						opened={ opened }
-						onToggle={ () => toggleEditorPanelOpened( panelName ) }
-					>
-						{ children }
-					</PanelBody>
-				) }
-			</Fill>
-		</>
-	);
-};
-
-PluginDocumentSettingPanel.Slot = Slot;
-
-export default PluginDocumentSettingPanel;
diff --git a/packages/edit-post/src/components/sidebar/plugin-post-excerpt/index.js b/packages/edit-post/src/components/sidebar/plugin-post-excerpt/index.js
deleted file mode 100644
index 2bef6bc3452145..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-post-excerpt/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Defines as extensibility slot for the Excerpt panel.
- */
-
-/**
- * WordPress dependencies
- */
-import { createSlotFill, PanelRow } from '@wordpress/components';
-
-const { Fill, Slot } = createSlotFill( 'PluginPostExcerpt' );
-
-/**
- * Renders a post excerpt panel in the post sidebar.
- *
- * @param {Object}  props             Component properties.
- * @param {string}  [props.className] An optional class name added to the row.
- * @param {Element} props.children    Children to be rendered.
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginPostExcerpt = wp.editPost.PluginPostExcerpt;
- *
- * function MyPluginPostExcerpt() {
- * 	return React.createElement(
- * 		PluginPostExcerpt,
- * 		{
- * 			className: 'my-plugin-post-excerpt',
- * 		},
- * 		__( 'Post excerpt custom content' )
- * 	)
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginPostExcerpt } from '@wordpress/edit-post';
- *
- * const MyPluginPostExcerpt = () => (
- * 	<PluginPostExcerpt className="my-plugin-post-excerpt">
- * 		{ __( 'Post excerpt custom content' ) }
- * 	</PluginPostExcerpt>
- * );
- * ```
- *
- * @return {Component} The component to be rendered.
- */
-const PluginPostExcerpt = ( { children, className } ) => {
-	return (
-		<Fill>
-			<PanelRow className={ className }>{ children }</PanelRow>
-		</Fill>
-	);
-};
-
-PluginPostExcerpt.Slot = Slot;
-
-export default PluginPostExcerpt;
diff --git a/packages/edit-post/src/components/sidebar/plugin-post-excerpt/test/index.js b/packages/edit-post/src/components/sidebar/plugin-post-excerpt/test/index.js
deleted file mode 100644
index 4b81a1326d5176..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-post-excerpt/test/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen } from '@testing-library/react';
-
-/**
- * WordPress dependencies
- */
-import { SlotFillProvider } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import PluginPostExcerptPanel from '../';
-
-describe( 'PluginPostExcerptPanel', () => {
-	test( 'renders fill properly', () => {
-		render(
-			<SlotFillProvider>
-				<PluginPostExcerptPanel className="my-plugin-post-excerpt-custom-content">
-					Post Excerpt - Custom content
-				</PluginPostExcerptPanel>
-				<div role="tabpanel">
-					<PluginPostExcerptPanel.Slot />
-				</div>
-			</SlotFillProvider>
-		);
-
-		expect( screen.getByRole( 'tabpanel' ) ).toHaveTextContent(
-			'Post Excerpt - Custom content'
-		);
-		expect(
-			screen.getByText( 'Post Excerpt - Custom content' )
-		).toHaveClass( 'my-plugin-post-excerpt-custom-content' );
-	} );
-} );
diff --git a/packages/edit-post/src/components/sidebar/plugin-post-publish-panel/index.js b/packages/edit-post/src/components/sidebar/plugin-post-publish-panel/index.js
deleted file mode 100644
index 71de03b35b56ab..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-post-publish-panel/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { usePluginContext } from '@wordpress/plugins';
-import { createSlotFill, PanelBody } from '@wordpress/components';
-
-const { Fill, Slot } = createSlotFill( 'PluginPostPublishPanel' );
-
-/**
- * Renders provided content to the post-publish panel in the publish flow
- * (side panel that opens after a user publishes the post).
- *
- * @param {Object}                props                                 Component properties.
- * @param {string}                [props.className]                     An optional class name added to the panel.
- * @param {string}                [props.title]                         Title displayed at the top of the panel.
- * @param {boolean}               [props.initialOpen=false]             Whether to have the panel initially opened. When no title is provided it is always opened.
- * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
- * @param {Element}               props.children                        Children to be rendered
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginPostPublishPanel = wp.editPost.PluginPostPublishPanel;
- *
- * function MyPluginPostPublishPanel() {
- * 	return React.createElement(
- * 		PluginPostPublishPanel,
- * 		{
- * 			className: 'my-plugin-post-publish-panel',
- * 			title: __( 'My panel title' ),
- * 			initialOpen: true,
- * 		},
- * 		__( 'My panel content' )
- * 	);
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginPostPublishPanel } from '@wordpress/edit-post';
- *
- * const MyPluginPostPublishPanel = () => (
- * 	<PluginPostPublishPanel
- * 		className="my-plugin-post-publish-panel"
- * 		title={ __( 'My panel title' ) }
- * 		initialOpen={ true }
- * 	>
- *         { __( 'My panel content' ) }
- * 	</PluginPostPublishPanel>
- * );
- * ```
- *
- * @return {Component} The component to be rendered.
- */
-const PluginPostPublishPanel = ( {
-	children,
-	className,
-	title,
-	initialOpen = false,
-	icon,
-} ) => {
-	const { icon: pluginIcon } = usePluginContext();
-
-	return (
-		<Fill>
-			<PanelBody
-				className={ className }
-				initialOpen={ initialOpen || ! title }
-				title={ title }
-				icon={ icon ?? pluginIcon }
-			>
-				{ children }
-			</PanelBody>
-		</Fill>
-	);
-};
-
-PluginPostPublishPanel.Slot = Slot;
-
-export default PluginPostPublishPanel;
diff --git a/packages/edit-post/src/components/sidebar/plugin-post-publish-panel/test/index.js b/packages/edit-post/src/components/sidebar/plugin-post-publish-panel/test/index.js
deleted file mode 100644
index 7f650eeff3818c..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-post-publish-panel/test/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * External dependencies
- */
-import { render } from '@testing-library/react';
-
-/**
- * WordPress dependencies
- */
-import { SlotFillProvider } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import PluginPostPublishPanel from '../';
-
-describe( 'PluginPostPublishPanel', () => {
-	test( 'renders fill properly', () => {
-		const { container } = render(
-			<SlotFillProvider>
-				<PluginPostPublishPanel
-					className="my-plugin-post-publish-panel"
-					title="My panel title"
-					initialOpen={ true }
-				>
-					My panel content
-				</PluginPostPublishPanel>
-				<PluginPostPublishPanel.Slot />
-			</SlotFillProvider>
-		);
-
-		expect( container ).toMatchSnapshot();
-	} );
-} );
diff --git a/packages/edit-post/src/components/sidebar/plugin-post-status-info/index.js b/packages/edit-post/src/components/sidebar/plugin-post-status-info/index.js
deleted file mode 100644
index 29af3832947d6f..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-post-status-info/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Defines as extensibility slot for the Summary panel.
- */
-
-/**
- * WordPress dependencies
- */
-import { createSlotFill, PanelRow } from '@wordpress/components';
-
-const { Fill, Slot } = createSlotFill( 'PluginPostStatusInfo' );
-
-/**
- * Renders a row in the Summary panel of the Document sidebar.
- * It should be noted that this is named and implemented around the function it serves
- * and not its location, which may change in future iterations.
- *
- * @param {Object}  props             Component properties.
- * @param {string}  [props.className] An optional class name added to the row.
- * @param {Element} props.children    Children to be rendered.
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginPostStatusInfo = wp.editPost.PluginPostStatusInfo;
- *
- * function MyPluginPostStatusInfo() {
- * 	return React.createElement(
- * 		PluginPostStatusInfo,
- * 		{
- * 			className: 'my-plugin-post-status-info',
- * 		},
- * 		__( 'My post status info' )
- * 	)
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginPostStatusInfo } from '@wordpress/edit-post';
- *
- * const MyPluginPostStatusInfo = () => (
- * 	<PluginPostStatusInfo
- * 		className="my-plugin-post-status-info"
- * 	>
- * 		{ __( 'My post status info' ) }
- * 	</PluginPostStatusInfo>
- * );
- * ```
- *
- * @return {Component} The component to be rendered.
- */
-const PluginPostStatusInfo = ( { children, className } ) => (
-	<Fill>
-		<PanelRow className={ className }>{ children }</PanelRow>
-	</Fill>
-);
-
-PluginPostStatusInfo.Slot = Slot;
-
-export default PluginPostStatusInfo;
diff --git a/packages/edit-post/src/components/sidebar/plugin-post-status-info/test/__snapshots__/index.js.snap b/packages/edit-post/src/components/sidebar/plugin-post-status-info/test/__snapshots__/index.js.snap
deleted file mode 100644
index f4861349d4434e..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-post-status-info/test/__snapshots__/index.js.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PluginPostStatusInfo renders fill properly 1`] = `
-<div>
-  <div
-    class="components-panel__row my-plugin-post-status-info"
-  >
-    My plugin post status info
-  </div>
-</div>
-`;
diff --git a/packages/edit-post/src/components/sidebar/plugin-post-status-info/test/index.js b/packages/edit-post/src/components/sidebar/plugin-post-status-info/test/index.js
deleted file mode 100644
index f989a162a559fa..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-post-status-info/test/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * External dependencies
- */
-import { render } from '@testing-library/react';
-
-/**
- * WordPress dependencies
- */
-import { SlotFillProvider } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import PluginPostStatusInfo from '../';
-
-describe( 'PluginPostStatusInfo', () => {
-	test( 'renders fill properly', () => {
-		const { container } = render(
-			<SlotFillProvider>
-				<PluginPostStatusInfo className="my-plugin-post-status-info">
-					My plugin post status info
-				</PluginPostStatusInfo>
-				<PluginPostStatusInfo.Slot />
-			</SlotFillProvider>
-		);
-
-		expect( container ).toMatchSnapshot();
-	} );
-} );
diff --git a/packages/edit-post/src/components/sidebar/plugin-pre-publish-panel/index.js b/packages/edit-post/src/components/sidebar/plugin-pre-publish-panel/index.js
deleted file mode 100644
index 014a7b31176a29..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-pre-publish-panel/index.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createSlotFill, PanelBody } from '@wordpress/components';
-import { usePluginContext } from '@wordpress/plugins';
-
-const { Fill, Slot } = createSlotFill( 'PluginPrePublishPanel' );
-
-/**
- * Renders provided content to the pre-publish side panel in the publish flow
- * (side panel that opens when a user first pushes "Publish" from the main editor).
- *
- * @param {Object}                props                                 Component props.
- * @param {string}                [props.className]                     An optional class name added to the panel.
- * @param {string}                [props.title]                         Title displayed at the top of the panel.
- * @param {boolean}               [props.initialOpen=false]             Whether to have the panel initially opened.
- *                                                                      When no title is provided it is always opened.
- * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/)
- *                                                                      icon slug string, or an SVG WP element, to be rendered when
- *                                                                      the sidebar is pinned to toolbar.
- * @param {Element}               props.children                        Children to be rendered
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginPrePublishPanel = wp.editPost.PluginPrePublishPanel;
- *
- * function MyPluginPrePublishPanel() {
- * 	return React.createElement(
- * 		PluginPrePublishPanel,
- * 		{
- * 			className: 'my-plugin-pre-publish-panel',
- * 			title: __( 'My panel title' ),
- * 			initialOpen: true,
- * 		},
- * 		__( 'My panel content' )
- * 	);
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginPrePublishPanel } from '@wordpress/edit-post';
- *
- * const MyPluginPrePublishPanel = () => (
- * 	<PluginPrePublishPanel
- * 		className="my-plugin-pre-publish-panel"
- * 		title={ __( 'My panel title' ) }
- * 		initialOpen={ true }
- * 	>
- * 	    { __( 'My panel content' ) }
- * 	</PluginPrePublishPanel>
- * );
- * ```
- *
- * @return {Component} The component to be rendered.
- */
-const PluginPrePublishPanel = ( {
-	children,
-	className,
-	title,
-	initialOpen = false,
-	icon,
-} ) => {
-	const { icon: pluginIcon } = usePluginContext();
-
-	return (
-		<Fill>
-			<PanelBody
-				className={ className }
-				initialOpen={ initialOpen || ! title }
-				title={ title }
-				icon={ icon ?? pluginIcon }
-			>
-				{ children }
-			</PanelBody>
-		</Fill>
-	);
-};
-
-PluginPrePublishPanel.Slot = Slot;
-
-export default PluginPrePublishPanel;
diff --git a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
deleted file mode 100644
index 39b9e4362ce32c..00000000000000
--- a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { ComplementaryArea } from '@wordpress/interface';
-import { useSelect } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-/**
- * Renders a sidebar when activated. The contents within the `PluginSidebar` will appear as content within the sidebar.
- * It also automatically renders a corresponding `PluginSidebarMenuItem` component when `isPinnable` flag is set to `true`.
- * If you wish to display the sidebar, you can with use the `PluginSidebarMoreMenuItem` component or the `wp.data.dispatch` API:
- *
- * ```js
- * wp.data.dispatch( 'core/edit-post' ).openGeneralSidebar( 'plugin-name/sidebar-name' );
- * ```
- *
- * @see PluginSidebarMoreMenuItem
- *
- * @param {Object}                props                                 Element props.
- * @param {string}                props.name                            A string identifying the sidebar. Must be unique for every sidebar registered within the scope of your plugin.
- * @param {string}                [props.className]                     An optional class name added to the sidebar body.
- * @param {string}                props.title                           Title displayed at the top of the sidebar.
- * @param {boolean}               [props.isPinnable=true]               Whether to allow to pin sidebar to the toolbar. When set to `true` it also automatically renders a corresponding menu item.
- * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var el = React.createElement;
- * var PanelBody = wp.components.PanelBody;
- * var PluginSidebar = wp.editPost.PluginSidebar;
- * var moreIcon = React.createElement( 'svg' ); //... svg element.
- *
- * function MyPluginSidebar() {
- * 	return el(
- * 			PluginSidebar,
- * 			{
- * 				name: 'my-sidebar',
- * 				title: 'My sidebar title',
- * 				icon: moreIcon,
- * 			},
- * 			el(
- * 				PanelBody,
- * 				{},
- * 				__( 'My sidebar content' )
- * 			)
- * 	);
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PanelBody } from '@wordpress/components';
- * import { PluginSidebar } from '@wordpress/edit-post';
- * import { more } from '@wordpress/icons';
- *
- * const MyPluginSidebar = () => (
- * 	<PluginSidebar
- * 		name="my-sidebar"
- * 		title="My sidebar title"
- * 		icon={ more }
- * 	>
- * 		<PanelBody>
- * 			{ __( 'My sidebar content' ) }
- * 		</PanelBody>
- * 	</PluginSidebar>
- * );
- * ```
- */
-export default function PluginSidebarEditPost( { className, ...props } ) {
-	const { postTitle, shortcut, showIconLabels } = useSelect( ( select ) => {
-		return {
-			postTitle: select( editorStore ).getEditedPostAttribute( 'title' ),
-			shortcut: select(
-				keyboardShortcutsStore
-			).getShortcutRepresentation( 'core/edit-post/toggle-sidebar' ),
-			showIconLabels:
-				select( editPostStore ).isFeatureActive( 'showIconLabels' ),
-		};
-	}, [] );
-	return (
-		<ComplementaryArea
-			panelClassName={ className }
-			className="edit-post-sidebar"
-			smallScreenTitle={ postTitle || __( '(no title)' ) }
-			scope="core/edit-post"
-			toggleShortcut={ shortcut }
-			showIconLabels={ showIconLabels }
-			{ ...props }
-		/>
-	);
-}
diff --git a/packages/edit-post/src/components/sidebar/post-excerpt/index.js b/packages/edit-post/src/components/sidebar/post-excerpt/index.js
deleted file mode 100644
index c2b9c0c48370eb..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-excerpt/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { PanelBody } from '@wordpress/components';
-import {
-	PostExcerpt as PostExcerptForm,
-	PostExcerptCheck,
-} from '@wordpress/editor';
-import { useDispatch, useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-import PluginPostExcerpt from '../plugin-post-excerpt';
-
-/**
- * Module Constants
- */
-const PANEL_NAME = 'post-excerpt';
-
-export default function PostExcerpt() {
-	const { isOpened, isEnabled } = useSelect( ( select ) => {
-		const { isEditorPanelOpened, isEditorPanelEnabled } =
-			select( editPostStore );
-
-		return {
-			isOpened: isEditorPanelOpened( PANEL_NAME ),
-			isEnabled: isEditorPanelEnabled( PANEL_NAME ),
-		};
-	}, [] );
-
-	const { toggleEditorPanelOpened } = useDispatch( editPostStore );
-	const toggleExcerptPanel = () => toggleEditorPanelOpened( PANEL_NAME );
-
-	if ( ! isEnabled ) {
-		return null;
-	}
-
-	return (
-		<PostExcerptCheck>
-			<PanelBody
-				title={ __( 'Excerpt' ) }
-				opened={ isOpened }
-				onToggle={ toggleExcerptPanel }
-			>
-				<PluginPostExcerpt.Slot>
-					{ ( fills ) => (
-						<>
-							<PostExcerptForm />
-							{ fills }
-						</>
-					) }
-				</PluginPostExcerpt.Slot>
-			</PanelBody>
-		</PostExcerptCheck>
-	);
-}
diff --git a/packages/edit-post/src/components/sidebar/post-format/index.js b/packages/edit-post/src/components/sidebar/post-format/index.js
deleted file mode 100644
index 5127fa0930f3fc..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-format/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { PanelRow } from '@wordpress/components';
-import {
-	PostFormat as PostFormatForm,
-	PostFormatCheck,
-} from '@wordpress/editor';
-
-export function PostFormat() {
-	return (
-		<PostFormatCheck>
-			<PanelRow className="edit-post-post-format">
-				<PostFormatForm />
-			</PanelRow>
-		</PostFormatCheck>
-	);
-}
-
-export default PostFormat;
diff --git a/packages/edit-post/src/components/sidebar/post-format/style.scss b/packages/edit-post/src/components/sidebar/post-format/style.scss
deleted file mode 100644
index 53d68ea219743d..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-format/style.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.edit-post-post-format {
-	display: flex;
-	flex-direction: column;
-	align-items: stretch;
-}
diff --git a/packages/edit-post/src/components/sidebar/post-pending-status/index.js b/packages/edit-post/src/components/sidebar/post-pending-status/index.js
deleted file mode 100644
index de1f02b00d746b..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-pending-status/index.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	PostPendingStatus as PostPendingStatusForm,
-	PostPendingStatusCheck,
-	privateApis as editorPrivateApis,
-} from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../../lock-unlock';
-
-const { PostPanelRow } = unlock( editorPrivateApis );
-
-export function PostPendingStatus() {
-	return (
-		<PostPendingStatusCheck>
-			<PostPanelRow>
-				<PostPendingStatusForm />
-			</PostPanelRow>
-		</PostPendingStatusCheck>
-	);
-}
-
-export default PostPendingStatus;
diff --git a/packages/edit-post/src/components/sidebar/post-slug/index.js b/packages/edit-post/src/components/sidebar/post-slug/index.js
deleted file mode 100644
index 8b52f94bd33f5d..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-slug/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { PanelRow } from '@wordpress/components';
-import { PostSlug as PostSlugForm, PostSlugCheck } from '@wordpress/editor';
-
-export function PostSlug() {
-	return (
-		<PostSlugCheck>
-			<PanelRow className="edit-post-post-slug">
-				<PostSlugForm />
-			</PanelRow>
-		</PostSlugCheck>
-	);
-}
-
-export default PostSlug;
diff --git a/packages/edit-post/src/components/sidebar/post-slug/style.scss b/packages/edit-post/src/components/sidebar/post-slug/style.scss
deleted file mode 100644
index 067dfcb08d6f06..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-slug/style.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.edit-post-post-slug {
-	display: flex;
-	flex-direction: column;
-	align-items: stretch;
-}
diff --git a/packages/edit-post/src/components/sidebar/post-status/index.js b/packages/edit-post/src/components/sidebar/post-status/index.js
deleted file mode 100644
index 1b24de6082d160..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-status/index.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import {
-	__experimentalHStack as HStack,
-	PanelBody,
-} from '@wordpress/components';
-import { useDispatch, useSelect } from '@wordpress/data';
-import {
-	PostAuthorPanel,
-	PostSchedulePanel,
-	PostSwitchToDraftButton,
-	PostSyncStatus,
-	PostURLPanel,
-} from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import PostVisibility from '../post-visibility';
-import PostTrash from '../post-trash';
-import PostSticky from '../post-sticky';
-import PostSlug from '../post-slug';
-import PostFormat from '../post-format';
-import PostPendingStatus from '../post-pending-status';
-import PluginPostStatusInfo from '../plugin-post-status-info';
-import { store as editPostStore } from '../../../store';
-import PostTemplate from '../post-template';
-
-/**
- * Module Constants
- */
-const PANEL_NAME = 'post-status';
-
-export default function PostStatus() {
-	const { isOpened, isRemoved } = useSelect( ( select ) => {
-		// We use isEditorPanelRemoved to hide the panel if it was programatically removed. We do
-		// not use isEditorPanelEnabled since this panel should not be disabled through the UI.
-		const { isEditorPanelRemoved, isEditorPanelOpened } =
-			select( editPostStore );
-		return {
-			isRemoved: isEditorPanelRemoved( PANEL_NAME ),
-			isOpened: isEditorPanelOpened( PANEL_NAME ),
-		};
-	}, [] );
-	const { toggleEditorPanelOpened } = useDispatch( editPostStore );
-
-	if ( isRemoved ) {
-		return null;
-	}
-
-	return (
-		<PanelBody
-			className="edit-post-post-status"
-			title={ __( 'Summary' ) }
-			opened={ isOpened }
-			onToggle={ () => toggleEditorPanelOpened( PANEL_NAME ) }
-		>
-			<PluginPostStatusInfo.Slot>
-				{ ( fills ) => (
-					<>
-						<PostVisibility />
-						<PostSchedulePanel />
-						<PostTemplate />
-						<PostURLPanel />
-						<PostSyncStatus />
-						<PostSticky />
-						<PostPendingStatus />
-						<PostFormat />
-						<PostSlug />
-						<PostAuthorPanel />
-						{ fills }
-						<HStack
-							style={ {
-								marginTop: '16px',
-							} }
-							spacing={ 4 }
-							wrap
-						>
-							<PostSwitchToDraftButton />
-							<PostTrash />
-						</HStack>
-					</>
-				) }
-			</PluginPostStatusInfo.Slot>
-		</PanelBody>
-	);
-}
diff --git a/packages/edit-post/src/components/sidebar/post-sticky/index.js b/packages/edit-post/src/components/sidebar/post-sticky/index.js
deleted file mode 100644
index 1b31297a41294f..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-sticky/index.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	PostSticky as PostStickyForm,
-	PostStickyCheck,
-	privateApis as editorPrivateApis,
-} from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../../lock-unlock';
-
-const { PostPanelRow } = unlock( editorPrivateApis );
-
-export function PostSticky() {
-	return (
-		<PostStickyCheck>
-			<PostPanelRow>
-				<PostStickyForm />
-			</PostPanelRow>
-		</PostStickyCheck>
-	);
-}
-
-export default PostSticky;
diff --git a/packages/edit-post/src/components/sidebar/post-taxonomies/index.js b/packages/edit-post/src/components/sidebar/post-taxonomies/index.js
deleted file mode 100644
index d44815ee98b71b..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-taxonomies/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	PostTaxonomies as PostTaxonomiesForm,
-	PostTaxonomiesCheck,
-} from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import TaxonomyPanel from './taxonomy-panel';
-
-function PostTaxonomies() {
-	return (
-		<PostTaxonomiesCheck>
-			<PostTaxonomiesForm
-				taxonomyWrapper={ ( content, taxonomy ) => {
-					return (
-						<TaxonomyPanel taxonomy={ taxonomy }>
-							{ content }
-						</TaxonomyPanel>
-					);
-				} }
-			/>
-		</PostTaxonomiesCheck>
-	);
-}
-
-export default PostTaxonomies;
diff --git a/packages/edit-post/src/components/sidebar/post-taxonomies/taxonomy-panel.js b/packages/edit-post/src/components/sidebar/post-taxonomies/taxonomy-panel.js
deleted file mode 100644
index 88c4366d1cfe8a..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-taxonomies/taxonomy-panel.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { PanelBody } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-function TaxonomyPanel( { taxonomy, children } ) {
-	const slug = taxonomy?.slug;
-	const panelName = slug ? `taxonomy-panel-${ slug }` : '';
-	const { isEnabled, isOpened } = useSelect(
-		( select ) => {
-			const { isEditorPanelEnabled, isEditorPanelOpened } =
-				select( editPostStore );
-			return {
-				isEnabled: slug ? isEditorPanelEnabled( panelName ) : false,
-				isOpened: slug ? isEditorPanelOpened( panelName ) : false,
-			};
-		},
-		[ panelName, slug ]
-	);
-	const { toggleEditorPanelOpened } = useDispatch( editPostStore );
-
-	if ( ! isEnabled ) {
-		return null;
-	}
-
-	const taxonomyMenuName = taxonomy?.labels?.menu_name;
-	if ( ! taxonomyMenuName ) {
-		return null;
-	}
-
-	return (
-		<PanelBody
-			title={ taxonomyMenuName }
-			opened={ isOpened }
-			onToggle={ () => toggleEditorPanelOpened( panelName ) }
-		>
-			{ children }
-		</PanelBody>
-	);
-}
-
-export default TaxonomyPanel;
diff --git a/packages/edit-post/src/components/sidebar/post-template/create-modal.js b/packages/edit-post/src/components/sidebar/post-template/create-modal.js
deleted file mode 100644
index a25cfa5c25cb30..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-template/create-modal.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as editorStore } from '@wordpress/editor';
-import { useState } from '@wordpress/element';
-import { serialize, createBlock } from '@wordpress/blocks';
-import {
-	Modal,
-	TextControl,
-	Button,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { cleanForSlug } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-const DEFAULT_TITLE = __( 'Custom Template' );
-
-export default function PostTemplateCreateModal( { onClose } ) {
-	const defaultBlockTemplate = useSelect(
-		( select ) =>
-			select( editorStore ).getEditorSettings().defaultBlockTemplate,
-		[]
-	);
-
-	const { __unstableCreateTemplate, __unstableSwitchToTemplateMode } =
-		useDispatch( editPostStore );
-
-	const [ title, setTitle ] = useState( '' );
-
-	const [ isBusy, setIsBusy ] = useState( false );
-
-	const cancel = () => {
-		setTitle( '' );
-		onClose();
-	};
-
-	const submit = async ( event ) => {
-		event.preventDefault();
-
-		if ( isBusy ) {
-			return;
-		}
-
-		setIsBusy( true );
-
-		const newTemplateContent =
-			defaultBlockTemplate ??
-			serialize( [
-				createBlock(
-					'core/group',
-					{
-						tagName: 'header',
-						layout: { inherit: true },
-					},
-					[
-						createBlock( 'core/site-title' ),
-						createBlock( 'core/site-tagline' ),
-					]
-				),
-				createBlock( 'core/separator' ),
-				createBlock(
-					'core/group',
-					{
-						tagName: 'main',
-					},
-					[
-						createBlock(
-							'core/group',
-							{
-								layout: { inherit: true },
-							},
-							[ createBlock( 'core/post-title' ) ]
-						),
-						createBlock( 'core/post-content', {
-							layout: { inherit: true },
-						} ),
-					]
-				),
-			] );
-
-		await __unstableCreateTemplate( {
-			slug: cleanForSlug( title || DEFAULT_TITLE ),
-			content: newTemplateContent,
-			title: title || DEFAULT_TITLE,
-		} );
-
-		setIsBusy( false );
-		cancel();
-
-		__unstableSwitchToTemplateMode( true );
-	};
-
-	return (
-		<Modal
-			title={ __( 'Create custom template' ) }
-			onRequestClose={ cancel }
-			className="edit-post-post-template__create-modal"
-		>
-			<form
-				className="edit-post-post-template__create-form"
-				onSubmit={ submit }
-			>
-				<VStack spacing="3">
-					<TextControl
-						__nextHasNoMarginBottom
-						label={ __( 'Name' ) }
-						value={ title }
-						onChange={ setTitle }
-						placeholder={ DEFAULT_TITLE }
-						disabled={ isBusy }
-						help={ __(
-							'Describe the template, e.g. "Post with sidebar". A custom template can be manually applied to any post or page.'
-						) }
-					/>
-					<HStack justify="right">
-						<Button variant="tertiary" onClick={ cancel }>
-							{ __( 'Cancel' ) }
-						</Button>
-
-						<Button
-							variant="primary"
-							type="submit"
-							isBusy={ isBusy }
-							aria-disabled={ isBusy }
-						>
-							{ __( 'Create' ) }
-						</Button>
-					</HStack>
-				</VStack>
-			</form>
-		</Modal>
-	);
-}
diff --git a/packages/edit-post/src/components/sidebar/post-template/form.js b/packages/edit-post/src/components/sidebar/post-template/form.js
deleted file mode 100644
index 14c1e6dee76c7d..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-template/form.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useState, useMemo } from '@wordpress/element';
-import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
-import { __ } from '@wordpress/i18n';
-import { addTemplate } from '@wordpress/icons';
-import { Notice, SelectControl, Button } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as editorStore } from '@wordpress/editor';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-import PostTemplateCreateModal from './create-modal';
-
-export default function PostTemplateForm( { onClose } ) {
-	const {
-		isPostsPage,
-		availableTemplates,
-		fetchedTemplates,
-		selectedTemplateSlug,
-		canCreate,
-		canEdit,
-	} = useSelect( ( select ) => {
-		const { canUser, getEntityRecord, getEntityRecords } =
-			select( coreStore );
-		const editorSettings = select( editorStore ).getEditorSettings();
-		const siteSettings = canUser( 'read', 'settings' )
-			? getEntityRecord( 'root', 'site' )
-			: undefined;
-		const _isPostsPage =
-			select( editorStore ).getCurrentPostId() ===
-			siteSettings?.page_for_posts;
-		const canCreateTemplates = canUser( 'create', 'templates' );
-
-		return {
-			isPostsPage: _isPostsPage,
-			availableTemplates: editorSettings.availableTemplates,
-			fetchedTemplates: canCreateTemplates
-				? getEntityRecords( 'postType', 'wp_template', {
-						post_type: select( editorStore ).getCurrentPostType(),
-						per_page: -1,
-				  } )
-				: undefined,
-			selectedTemplateSlug:
-				select( editorStore ).getEditedPostAttribute( 'template' ),
-			canCreate:
-				canCreateTemplates &&
-				! _isPostsPage &&
-				editorSettings.supportsTemplateMode,
-			canEdit:
-				canCreateTemplates &&
-				editorSettings.supportsTemplateMode &&
-				!! select( editPostStore ).getEditedPostTemplate(),
-		};
-	}, [] );
-
-	const options = useMemo(
-		() =>
-			Object.entries( {
-				...availableTemplates,
-				...Object.fromEntries(
-					( fetchedTemplates ?? [] ).map( ( { slug, title } ) => [
-						slug,
-						title.rendered,
-					] )
-				),
-			} ).map( ( [ slug, title ] ) => ( { value: slug, label: title } ) ),
-		[ availableTemplates, fetchedTemplates ]
-	);
-
-	const selectedOption =
-		options.find( ( option ) => option.value === selectedTemplateSlug ) ??
-		options.find( ( option ) => ! option.value ); // The default option has '' value.
-
-	const { editPost } = useDispatch( editorStore );
-	const { __unstableSwitchToTemplateMode } = useDispatch( editPostStore );
-
-	const [ isCreateModalOpen, setIsCreateModalOpen ] = useState( false );
-
-	return (
-		<div className="edit-post-post-template__form">
-			<InspectorPopoverHeader
-				title={ __( 'Template' ) }
-				help={ __(
-					'Templates define the way content is displayed when viewing your site.'
-				) }
-				actions={
-					canCreate
-						? [
-								{
-									icon: addTemplate,
-									label: __( 'Add template' ),
-									onClick: () => setIsCreateModalOpen( true ),
-								},
-						  ]
-						: []
-				}
-				onClose={ onClose }
-			/>
-			{ isPostsPage ? (
-				<Notice
-					className="edit-post-post-template__notice"
-					status="warning"
-					isDismissible={ false }
-				>
-					{ __( 'The posts page template cannot be changed.' ) }
-				</Notice>
-			) : (
-				<SelectControl
-					__nextHasNoMarginBottom
-					hideLabelFromVision
-					label={ __( 'Template' ) }
-					value={ selectedOption?.value ?? '' }
-					options={ options }
-					onChange={ ( slug ) =>
-						editPost( { template: slug || '' } )
-					}
-				/>
-			) }
-			{ canEdit && (
-				<p>
-					<Button
-						variant="link"
-						onClick={ () => __unstableSwitchToTemplateMode() }
-					>
-						{ __( 'Edit template' ) }
-					</Button>
-				</p>
-			) }
-			{ isCreateModalOpen && (
-				<PostTemplateCreateModal
-					onClose={ () => setIsCreateModalOpen( false ) }
-				/>
-			) }
-		</div>
-	);
-}
diff --git a/packages/edit-post/src/components/sidebar/post-template/index.js b/packages/edit-post/src/components/sidebar/post-template/index.js
deleted file mode 100644
index fa1579fa3a82a2..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-template/index.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useState, useMemo } from '@wordpress/element';
-import { Dropdown, Button } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
-import { useSelect } from '@wordpress/data';
-import {
-	store as editorStore,
-	privateApis as editorPrivateApis,
-} from '@wordpress/editor';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import PostTemplateForm from './form';
-import { store as editPostStore } from '../../../store';
-import { unlock } from '../../../lock-unlock';
-
-const { PostPanelRow } = unlock( editorPrivateApis );
-
-export default function PostTemplate() {
-	// Use internal state instead of a ref to make sure that the component
-	// re-renders when the popover's anchor updates.
-	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
-	// Memoize popoverProps to avoid returning a new object every time.
-	const popoverProps = useMemo(
-		() => ( { anchor: popoverAnchor, placement: 'bottom-end' } ),
-		[ popoverAnchor ]
-	);
-
-	const isVisible = useSelect( ( select ) => {
-		const postTypeSlug = select( editorStore ).getCurrentPostType();
-		const postType = select( coreStore ).getPostType( postTypeSlug );
-		if ( ! postType?.viewable ) {
-			return false;
-		}
-
-		const settings = select( editorStore ).getEditorSettings();
-		const hasTemplates =
-			!! settings.availableTemplates &&
-			Object.keys( settings.availableTemplates ).length > 0;
-		if ( hasTemplates ) {
-			return true;
-		}
-
-		if ( ! settings.supportsTemplateMode ) {
-			return false;
-		}
-
-		const canCreateTemplates =
-			select( coreStore ).canUser( 'create', 'templates' ) ?? false;
-		return canCreateTemplates;
-	}, [] );
-
-	if ( ! isVisible ) {
-		return null;
-	}
-
-	return (
-		<PostPanelRow label={ __( 'Template' ) } ref={ setPopoverAnchor }>
-			<Dropdown
-				popoverProps={ popoverProps }
-				contentClassName="edit-post-post-template__dialog"
-				focusOnMount
-				renderToggle={ ( { isOpen, onToggle } ) => (
-					<PostTemplateToggle
-						isOpen={ isOpen }
-						onClick={ onToggle }
-					/>
-				) }
-				renderContent={ ( { onClose } ) => (
-					<PostTemplateForm onClose={ onClose } />
-				) }
-			/>
-		</PostPanelRow>
-	);
-}
-
-function PostTemplateToggle( { isOpen, onClick } ) {
-	const templateTitle = useSelect( ( select ) => {
-		const templateSlug =
-			select( editorStore ).getEditedPostAttribute( 'template' );
-
-		const { supportsTemplateMode, availableTemplates } =
-			select( editorStore ).getEditorSettings();
-		if ( ! supportsTemplateMode && availableTemplates[ templateSlug ] ) {
-			return availableTemplates[ templateSlug ];
-		}
-		const template =
-			select( coreStore ).canUser( 'create', 'templates' ) &&
-			select( editPostStore ).getEditedPostTemplate();
-		return (
-			template?.title ||
-			template?.slug ||
-			availableTemplates?.[ templateSlug ]
-		);
-	}, [] );
-
-	return (
-		<Button
-			className="edit-post-post-template__toggle"
-			variant="tertiary"
-			aria-expanded={ isOpen }
-			aria-label={
-				templateTitle
-					? sprintf(
-							// translators: %s: Name of the currently selected template.
-							__( 'Select template: %s' ),
-							templateTitle
-					  )
-					: __( 'Select template' )
-			}
-			onClick={ onClick }
-		>
-			{ templateTitle ?? __( 'Default template' ) }
-		</Button>
-	);
-}
diff --git a/packages/edit-post/src/components/sidebar/post-template/style.scss b/packages/edit-post/src/components/sidebar/post-template/style.scss
deleted file mode 100644
index 91f82d4d0f9f30..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-template/style.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-.components-button.edit-post-post-template__toggle {
-	display: inline-block;
-	width: 100%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.edit-post-post-template__dialog {
-	z-index: z-index(".edit-post-post-template__dialog");
-}
-
-.edit-post-post-template__form {
-	// sidebar width - popover padding - form margin
-	min-width: $sidebar-width - $grid-unit-20 - $grid-unit-20;
-	margin: $grid-unit-10;
-}
-
-.edit-post-post-template__create-form {
-	@include break-medium() {
-		width: $grid-unit * 40;
-	}
-}
diff --git a/packages/edit-post/src/components/sidebar/post-trash/index.js b/packages/edit-post/src/components/sidebar/post-trash/index.js
deleted file mode 100644
index d77c7a6d82988c..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-trash/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { PostTrash as PostTrashLink, PostTrashCheck } from '@wordpress/editor';
-
-export default function PostTrash() {
-	return (
-		<PostTrashCheck>
-			<PostTrashLink />
-		</PostTrashCheck>
-	);
-}
diff --git a/packages/edit-post/src/components/sidebar/post-visibility/index.js b/packages/edit-post/src/components/sidebar/post-visibility/index.js
deleted file mode 100644
index 9a70d636388af7..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-visibility/index.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, sprintf } from '@wordpress/i18n';
-import { Dropdown, Button } from '@wordpress/components';
-import {
-	PostVisibility as PostVisibilityForm,
-	PostVisibilityLabel,
-	PostVisibilityCheck,
-	usePostVisibilityLabel,
-	privateApis as editorPrivateApis,
-} from '@wordpress/editor';
-import { useMemo, useState } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../../lock-unlock';
-
-const { PostPanelRow } = unlock( editorPrivateApis );
-
-export function PostVisibility() {
-	// Use internal state instead of a ref to make sure that the component
-	// re-renders when the popover's anchor updates.
-	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
-	// Memoize popoverProps to avoid returning a new object every time.
-	const popoverProps = useMemo(
-		() => ( {
-			// Anchor the popover to the middle of the entire row so that it doesn't
-			// move around when the label changes.
-			anchor: popoverAnchor,
-			placement: 'bottom-end',
-		} ),
-		[ popoverAnchor ]
-	);
-
-	return (
-		<PostVisibilityCheck
-			render={ ( { canEdit } ) => (
-				<PostPanelRow
-					label={ __( 'Visibility' ) }
-					ref={ setPopoverAnchor }
-				>
-					{ ! canEdit && (
-						<span>
-							<PostVisibilityLabel />
-						</span>
-					) }
-					{ canEdit && (
-						<Dropdown
-							contentClassName="edit-post-post-visibility__dialog"
-							popoverProps={ popoverProps }
-							focusOnMount
-							renderToggle={ ( { isOpen, onToggle } ) => (
-								<PostVisibilityToggle
-									isOpen={ isOpen }
-									onClick={ onToggle }
-								/>
-							) }
-							renderContent={ ( { onClose } ) => (
-								<PostVisibilityForm onClose={ onClose } />
-							) }
-						/>
-					) }
-				</PostPanelRow>
-			) }
-		/>
-	);
-}
-
-function PostVisibilityToggle( { isOpen, onClick } ) {
-	const label = usePostVisibilityLabel();
-	return (
-		<Button
-			className="edit-post-post-visibility__toggle"
-			variant="tertiary"
-			aria-expanded={ isOpen }
-			// translators: %s: Current post visibility.
-			aria-label={ sprintf( __( 'Select visibility: %s' ), label ) }
-			onClick={ onClick }
-		>
-			{ label }
-		</Button>
-	);
-}
-
-export default PostVisibility;
diff --git a/packages/edit-post/src/components/sidebar/post-visibility/style.scss b/packages/edit-post/src/components/sidebar/post-visibility/style.scss
deleted file mode 100644
index 0dd9824e5bde76..00000000000000
--- a/packages/edit-post/src/components/sidebar/post-visibility/style.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.edit-post-post-visibility__dialog .editor-post-visibility {
-	// sidebar width - popover padding - form margin
-	min-width: $sidebar-width - $grid-unit-20 - $grid-unit-20;
-	margin: $grid-unit-10;
-}
diff --git a/packages/edit-post/src/components/sidebar/settings-header/index.js b/packages/edit-post/src/components/sidebar/settings-header/index.js
deleted file mode 100644
index fb2bf8f486f51c..00000000000000
--- a/packages/edit-post/src/components/sidebar/settings-header/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Button } from '@wordpress/components';
-import { __, _x, sprintf } from '@wordpress/i18n';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-const SettingsHeader = ( { sidebarName } ) => {
-	const { openGeneralSidebar } = useDispatch( editPostStore );
-	const openDocumentSettings = () =>
-		openGeneralSidebar( 'edit-post/document' );
-	const openBlockSettings = () => openGeneralSidebar( 'edit-post/block' );
-
-	const { documentLabel, isTemplateMode } = useSelect( ( select ) => {
-		const { getPostTypeLabel, getRenderingMode } = select( editorStore );
-
-		return {
-			// translators: Default label for the Document sidebar tab, not selected.
-			documentLabel: getPostTypeLabel() || _x( 'Document', 'noun' ),
-			isTemplateMode: getRenderingMode() !== 'post-only',
-		};
-	}, [] );
-
-	const [ documentAriaLabel, documentActiveClass ] =
-		sidebarName === 'edit-post/document'
-			? // translators: ARIA label for the Document sidebar tab, selected. %s: Document label.
-			  [ sprintf( __( '%s (selected)' ), documentLabel ), 'is-active' ]
-			: [ documentLabel, '' ];
-
-	const [ blockAriaLabel, blockActiveClass ] =
-		sidebarName === 'edit-post/block'
-			? // translators: ARIA label for the Block Settings Sidebar tab, selected.
-			  [ __( 'Block (selected)' ), 'is-active' ]
-			: // translators: ARIA label for the Block Settings Sidebar tab, not selected.
-			  [ __( 'Block' ), '' ];
-
-	const [ templateAriaLabel, templateActiveClass ] =
-		sidebarName === 'edit-post/document'
-			? [ __( 'Template (selected)' ), 'is-active' ]
-			: [ __( 'Template' ), '' ];
-
-	/* Use a list so screen readers will announce how many tabs there are. */
-	return (
-		<ul>
-			{ ! isTemplateMode && (
-				<li>
-					<Button
-						onClick={ openDocumentSettings }
-						className={ `edit-post-sidebar__panel-tab ${ documentActiveClass }` }
-						aria-label={ documentAriaLabel }
-						data-label={ documentLabel }
-					>
-						{ documentLabel }
-					</Button>
-				</li>
-			) }
-			{ isTemplateMode && (
-				<li>
-					<Button
-						onClick={ openDocumentSettings }
-						className={ `edit-post-sidebar__panel-tab ${ templateActiveClass }` }
-						aria-label={ templateAriaLabel }
-						data-label={ __( 'Template' ) }
-					>
-						{ __( 'Template' ) }
-					</Button>
-				</li>
-			) }
-			<li>
-				<Button
-					onClick={ openBlockSettings }
-					className={ `edit-post-sidebar__panel-tab ${ blockActiveClass }` }
-					aria-label={ blockAriaLabel }
-					// translators: Data label for the Block Settings Sidebar tab.
-					data-label={ __( 'Block' ) }
-				>
-					{
-						// translators: Text label for the Block Settings Sidebar tab.
-						__( 'Block' )
-					}
-				</Button>
-			</li>
-		</ul>
-	);
-};
-
-export default SettingsHeader;
diff --git a/packages/edit-post/src/components/sidebar/settings-header/style.scss b/packages/edit-post/src/components/sidebar/settings-header/style.scss
deleted file mode 100644
index aaf7698cb6ddb6..00000000000000
--- a/packages/edit-post/src/components/sidebar/settings-header/style.scss
+++ /dev/null
@@ -1,74 +0,0 @@
-// This tab style CSS is duplicated verbatim in
-// /packages/components/src/tab-panel/style.scss
-.components-button.edit-post-sidebar__panel-tab {
-	position: relative;
-	border-radius: 0;
-	height: $grid-unit-60;
-	background: transparent;
-	border: none;
-	box-shadow: none;
-	cursor: pointer;
-	padding: 3px $grid-unit-20; // Use padding to offset the is-active border, this benefits Windows High Contrast mode
-	margin-left: 0;
-	font-weight: 500;
-
-	&:focus:not(:disabled) {
-		position: relative;
-		box-shadow: none;
-		outline: none;
-	}
-
-	// Tab indicator
-	&::after {
-		content: "";
-		position: absolute;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		pointer-events: none;
-
-		// Draw the indicator.
-		background: var(--wp-admin-theme-color);
-		height: calc(0 * var(--wp-admin-border-width-focus));
-		border-radius: 0;
-
-		// Animation
-		transition: all 0.1s linear;
-		@include reduce-motion("transition");
-	}
-
-	// Active.
-	&.is-active::after {
-		height: calc(1 * var(--wp-admin-border-width-focus));
-
-		// Windows high contrast mode.
-		outline: 2px solid transparent;
-		outline-offset: -1px;
-	}
-
-	// Focus.
-	&::before {
-		content: "";
-		position: absolute;
-		top: $grid-unit-15;
-		right: $grid-unit-15;
-		bottom: $grid-unit-15;
-		left: $grid-unit-15;
-		pointer-events: none;
-
-		// Draw the indicator.
-		box-shadow: 0 0 0 0 transparent;
-		border-radius: $radius-block-ui;
-
-		// Animation
-		transition: all 0.1s linear;
-		@include reduce-motion("transition");
-	}
-
-	&:focus-visible::before {
-		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-
-		// Windows high contrast mode.
-		outline: 2px solid transparent;
-	}
-}
diff --git a/packages/edit-post/src/components/sidebar/settings-sidebar/index.js b/packages/edit-post/src/components/sidebar/settings-sidebar/index.js
deleted file mode 100644
index 42ad255d79e053..00000000000000
--- a/packages/edit-post/src/components/sidebar/settings-sidebar/index.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	BlockInspector,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { useSelect } from '@wordpress/data';
-import { Platform } from '@wordpress/element';
-import { isRTL, __ } from '@wordpress/i18n';
-import { drawerLeft, drawerRight } from '@wordpress/icons';
-import { store as interfaceStore } from '@wordpress/interface';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import SettingsHeader from '../settings-header';
-import PostStatus from '../post-status';
-import LastRevision from '../last-revision';
-import PostTaxonomies from '../post-taxonomies';
-import FeaturedImage from '../featured-image';
-import PostExcerpt from '../post-excerpt';
-import DiscussionPanel from '../discussion-panel';
-import PageAttributes from '../page-attributes';
-import MetaBoxes from '../../meta-boxes';
-import PluginDocumentSettingPanel from '../plugin-document-setting-panel';
-import PluginSidebarEditPost from '../plugin-sidebar';
-import TemplateSummary from '../template-summary';
-import { store as editPostStore } from '../../../store';
-
-const SIDEBAR_ACTIVE_BY_DEFAULT = Platform.select( {
-	web: true,
-	native: false,
-} );
-
-const SettingsSidebar = () => {
-	const { sidebarName, keyboardShortcut, isTemplateMode } = useSelect(
-		( select ) => {
-			// The settings sidebar is used by the edit-post/document and edit-post/block sidebars.
-			// sidebarName represents the sidebar that is active or that should be active when the SettingsSidebar toggle button is pressed.
-			// If one of the two sidebars is active the component will contain the content of that sidebar.
-			// When neither of the two sidebars is active we can not simply return null, because the PluginSidebarEditPost
-			// component, besides being used to render the sidebar, also renders the toggle button. In that case sidebarName
-			// should contain the sidebar that will be active when the toggle button is pressed. If a block
-			// is selected, that should be edit-post/block otherwise it's edit-post/document.
-			let sidebar = select( interfaceStore ).getActiveComplementaryArea(
-				editPostStore.name
-			);
-			if (
-				! [ 'edit-post/document', 'edit-post/block' ].includes(
-					sidebar
-				)
-			) {
-				if ( select( blockEditorStore ).getBlockSelectionStart() ) {
-					sidebar = 'edit-post/block';
-				}
-				sidebar = 'edit-post/document';
-			}
-			const shortcut = select(
-				keyboardShortcutsStore
-			).getShortcutRepresentation( 'core/edit-post/toggle-sidebar' );
-			return {
-				sidebarName: sidebar,
-				keyboardShortcut: shortcut,
-				isTemplateMode:
-					select( editorStore ).getRenderingMode() !== 'post-only',
-			};
-		},
-		[]
-	);
-
-	return (
-		<PluginSidebarEditPost
-			identifier={ sidebarName }
-			header={ <SettingsHeader sidebarName={ sidebarName } /> }
-			closeLabel={ __( 'Close Settings' ) }
-			headerClassName="edit-post-sidebar__panel-tabs"
-			/* translators: button label text should, if possible, be under 16 characters. */
-			title={ __( 'Settings' ) }
-			toggleShortcut={ keyboardShortcut }
-			icon={ isRTL() ? drawerLeft : drawerRight }
-			isActiveByDefault={ SIDEBAR_ACTIVE_BY_DEFAULT }
-		>
-			{ ! isTemplateMode && sidebarName === 'edit-post/document' && (
-				<>
-					<PostStatus />
-					<PluginDocumentSettingPanel.Slot />
-					<LastRevision />
-					<PostTaxonomies />
-					<FeaturedImage />
-					<PostExcerpt />
-					<DiscussionPanel />
-					<PageAttributes />
-					<MetaBoxes location="side" />
-				</>
-			) }
-			{ isTemplateMode && sidebarName === 'edit-post/document' && (
-				<TemplateSummary />
-			) }
-			{ sidebarName === 'edit-post/block' && <BlockInspector /> }
-		</PluginSidebarEditPost>
-	);
-};
-
-export default SettingsSidebar;
diff --git a/packages/edit-post/src/components/sidebar/style.scss b/packages/edit-post/src/components/sidebar/style.scss
deleted file mode 100644
index 7b10eaec0d2248..00000000000000
--- a/packages/edit-post/src/components/sidebar/style.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.components-panel__header.edit-post-sidebar__panel-tabs {
-	justify-content: flex-start;
-	padding-left: 0;
-	padding-right: $grid-unit-20;
-	border-top: 0;
-	margin-top: 0;
-
-	ul {
-		display: flex;
-	}
-	li {
-		margin: 0;
-	}
-
-	.components-button.has-icon {
-		display: none;
-		margin: 0 0 0 auto;
-		padding: 0;
-		min-width: $icon-size;
-		height: $icon-size;
-
-		@include break-medium() {
-			display: flex;
-		}
-	}
-}
diff --git a/packages/edit-post/src/components/sidebar/template-summary/index.js b/packages/edit-post/src/components/sidebar/template-summary/index.js
deleted file mode 100644
index 30358038ffb5b6..00000000000000
--- a/packages/edit-post/src/components/sidebar/template-summary/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Icon, layout } from '@wordpress/icons';
-import { useSelect } from '@wordpress/data';
-import { Flex, FlexItem, FlexBlock, PanelBody } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../../store';
-
-function TemplateSummary() {
-	const template = useSelect( ( select ) => {
-		const { getEditedPostTemplate } = select( editPostStore );
-		return getEditedPostTemplate();
-	}, [] );
-
-	if ( ! template ) {
-		return null;
-	}
-
-	return (
-		<PanelBody>
-			<Flex align="flex-start" gap="3">
-				<FlexItem>
-					<Icon icon={ layout } />
-				</FlexItem>
-
-				<FlexBlock>
-					<h2 className="edit-post-template-summary__title">
-						{ template?.title || template?.slug }
-					</h2>
-					<p>{ template?.description }</p>
-				</FlexBlock>
-			</Flex>
-		</PanelBody>
-	);
-}
-
-export default TemplateSummary;
diff --git a/packages/edit-post/src/components/sidebar/template-summary/style.scss b/packages/edit-post/src/components/sidebar/template-summary/style.scss
deleted file mode 100644
index bfec3bc7b32461..00000000000000
--- a/packages/edit-post/src/components/sidebar/template-summary/style.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-h2.edit-post-template-summary__title {
-	line-height: $icon-size;
-	margin: 0 0 $grid-unit-05;
-	font-weight: 500;
-}
diff --git a/packages/edit-post/src/components/sidebar/template/style.scss b/packages/edit-post/src/components/sidebar/template/style.scss
deleted file mode 100644
index 38d593f44d76dc..00000000000000
--- a/packages/edit-post/src/components/sidebar/template/style.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-.edit-post-template__modal {
-	.components-base-control {
-		@include break-medium() {
-			width: $grid-unit * 40;
-		}
-	}
-}
-
-.edit-post-template__modal-actions {
-	margin-top: $grid-unit-15;
-}
-
-.edit-post-template-modal__tip {
-	padding: $grid-unit-20 $grid-unit-30;
-	background: $gray-100;
-	border-radius: $radius-block-ui;
-
-	@include break-medium() {
-		width: $grid-unit * 30;
-	}
-}
-
-.edit-post-template__notice {
-	margin: 0 0 $grid-unit-10 0;
-
-	.components-notice__content {
-		margin: 0;
-	}
-}
-
-.edit-post-template__actions {
-	button:not(:last-child) {
-		margin-right: $grid-unit-10;
-	}
-}
diff --git a/packages/edit-post/src/components/start-page-options/index.js b/packages/edit-post/src/components/start-page-options/index.js
deleted file mode 100644
index 0ef3e166e8ee1a..00000000000000
--- a/packages/edit-post/src/components/start-page-options/index.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Modal } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useState, useMemo } from '@wordpress/element';
-import {
-	store as blockEditorStore,
-	__experimentalBlockPatternsList as BlockPatternsList,
-} from '@wordpress/block-editor';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useAsyncList } from '@wordpress/compose';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-
-function useStartPatterns() {
-	// A pattern is a start pattern if it includes 'core/post-content' in its blockTypes,
-	// and it has no postTypes declared and the current post type is page or if
-	// the current post type is part of the postTypes declared.
-	const { blockPatternsWithPostContentBlockType, postType } = useSelect(
-		( select ) => {
-			const { getPatternsByBlockTypes } = select( blockEditorStore );
-			const { getCurrentPostType } = select( editorStore );
-			return {
-				blockPatternsWithPostContentBlockType:
-					getPatternsByBlockTypes( 'core/post-content' ),
-				postType: getCurrentPostType(),
-			};
-		},
-		[]
-	);
-
-	return useMemo( () => {
-		// filter patterns without postTypes declared if the current postType is page
-		// or patterns that declare the current postType in its post type array.
-		return blockPatternsWithPostContentBlockType.filter( ( pattern ) => {
-			return (
-				( postType === 'page' && ! pattern.postTypes ) ||
-				( Array.isArray( pattern.postTypes ) &&
-					pattern.postTypes.includes( postType ) )
-			);
-		} );
-	}, [ postType, blockPatternsWithPostContentBlockType ] );
-}
-
-function PatternSelection( { blockPatterns, onChoosePattern } ) {
-	const shownBlockPatterns = useAsyncList( blockPatterns );
-	const { resetEditorBlocks } = useDispatch( editorStore );
-	return (
-		<BlockPatternsList
-			blockPatterns={ blockPatterns }
-			shownPatterns={ shownBlockPatterns }
-			onClickPattern={ ( _pattern, blocks ) => {
-				resetEditorBlocks( blocks );
-				onChoosePattern();
-			} }
-		/>
-	);
-}
-
-function StartPageOptionsModal( { onClose } ) {
-	const startPatterns = useStartPatterns();
-	const hasStartPattern = startPatterns.length > 0;
-
-	if ( ! hasStartPattern ) {
-		return null;
-	}
-
-	return (
-		<Modal
-			className="edit-post-start-page-options__modal"
-			title={ __( 'Choose a pattern' ) }
-			isFullScreen
-			onRequestClose={ onClose }
-		>
-			<div className="edit-post-start-page-options__modal-content">
-				<PatternSelection
-					blockPatterns={ startPatterns }
-					onChoosePattern={ onClose }
-				/>
-			</div>
-		</Modal>
-	);
-}
-
-export default function StartPageOptions() {
-	const [ isClosed, setIsClosed ] = useState( false );
-	const shouldEnableModal = useSelect( ( select ) => {
-		const { isCleanNewPost, getRenderingMode } = select( editorStore );
-		const { isFeatureActive } = select( editPostStore );
-
-		return (
-			getRenderingMode() === 'post-only' &&
-			! isFeatureActive( 'welcomeGuide' ) &&
-			isCleanNewPost()
-		);
-	}, [] );
-
-	if ( ! shouldEnableModal || isClosed ) {
-		return null;
-	}
-
-	return <StartPageOptionsModal onClose={ () => setIsClosed( true ) } />;
-}
diff --git a/packages/edit-post/src/components/start-page-options/style.scss b/packages/edit-post/src/components/start-page-options/style.scss
deleted file mode 100644
index 52f3f5ff9a8889..00000000000000
--- a/packages/edit-post/src/components/start-page-options/style.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-// 2 column masonry layout.
-.edit-post-start-page-options__modal-content .block-editor-block-patterns-list {
-	column-count: 2;
-	column-gap: $grid-unit-30;
-
-	@include break-medium() {
-		column-count: 3;
-	}
-
-	@include break-wide() {
-		column-count: 4;
-	}
-
-	.block-editor-block-patterns-list__list-item {
-		break-inside: avoid-column;
-		margin-bottom: $grid-unit-30;
-
-		.block-editor-block-preview__container {
-			min-height: 100px;
-		}
-
-		.block-editor-block-preview__content {
-			width: 100%;
-		}
-	}
-}
diff --git a/packages/edit-post/src/components/text-editor/index.js b/packages/edit-post/src/components/text-editor/index.js
deleted file mode 100644
index 871273c4a9e83c..00000000000000
--- a/packages/edit-post/src/components/text-editor/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	PostTextEditor,
-	PostTitleRaw,
-	store as editorStore,
-} from '@wordpress/editor';
-import { Button } from '@wordpress/components';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { displayShortcut } from '@wordpress/keycodes';
-import { useEffect, useRef } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-
-export default function TextEditor() {
-	const isRichEditingEnabled = useSelect( ( select ) => {
-		return select( editorStore ).getEditorSettings().richEditingEnabled;
-	}, [] );
-	const { switchEditorMode } = useDispatch( editPostStore );
-
-	const { isWelcomeGuideVisible } = useSelect( ( select ) => {
-		const { isFeatureActive } = select( editPostStore );
-
-		return {
-			isWelcomeGuideVisible: isFeatureActive( 'welcomeGuide' ),
-		};
-	}, [] );
-
-	const titleRef = useRef();
-
-	useEffect( () => {
-		if ( isWelcomeGuideVisible ) {
-			return;
-		}
-		titleRef?.current?.focus();
-	}, [ isWelcomeGuideVisible ] );
-
-	return (
-		<div className="edit-post-text-editor">
-			{ isRichEditingEnabled && (
-				<div className="edit-post-text-editor__toolbar">
-					<h2>{ __( 'Editing code' ) }</h2>
-					<Button
-						variant="tertiary"
-						onClick={ () => switchEditorMode( 'visual' ) }
-						shortcut={ displayShortcut.secondary( 'm' ) }
-					>
-						{ __( 'Exit code editor' ) }
-					</Button>
-				</div>
-			) }
-			<div className="edit-post-text-editor__body">
-				<PostTitleRaw ref={ titleRef } />
-				<PostTextEditor />
-			</div>
-		</div>
-	);
-}
diff --git a/packages/edit-post/src/components/text-editor/style.scss b/packages/edit-post/src/components/text-editor/style.scss
deleted file mode 100644
index c02e983057e6ef..00000000000000
--- a/packages/edit-post/src/components/text-editor/style.scss
+++ /dev/null
@@ -1,77 +0,0 @@
-.edit-post-text-editor {
-	position: relative;
-	width: 100%;
-	background-color: $white;
-	flex-grow: 1;
-
-	// Post title.
-	.editor-post-title:not(.is-raw-text),
-	.editor-post-title.is-raw-text textarea {
-		max-width: none;
-		line-height: $default-line-height;
-
-		font-family: $editor-html-font;
-		font-size: 2.5em;
-		font-weight: normal;
-
-		border: $border-width solid $gray-600;
-		border-radius: 0;
-
-		// Same padding as body.
-		padding: $grid-unit-20;
-
-		@include break-small() {
-			padding: $grid-unit-30;
-		}
-
-		&:focus {
-			border-color: var(--wp-admin-theme-color);
-			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-		}
-	}
-}
-
-.edit-post-text-editor__body {
-	width: 100%;
-	padding: 0 $grid-unit-15 $grid-unit-15 $grid-unit-15;
-	max-width: $break-xlarge;
-	margin-left: auto;
-	margin-right: auto;
-
-	@include break-large() {
-		padding: $grid-unit-20 $grid-unit-30 #{ $grid-unit-60 * 2 } $grid-unit-30;
-		padding: 0 $grid-unit-30 $grid-unit-30 $grid-unit-30;
-	}
-
-}
-
-// Exit code editor toolbar.
-.edit-post-text-editor__toolbar {
-	position: sticky;
-	z-index: z-index(".edit-post-text-editor__toolbar");
-	top: 0;
-	left: 0;
-	right: 0;
-	display: flex;
-	background: rgba($white, 0.8);
-	padding: $grid-unit-05 $grid-unit-15;
-
-	@include break-small() {
-		padding: $grid-unit-15;
-	}
-
-	@include break-large() {
-		padding: $grid-unit-15 $grid-unit-30;
-	}
-
-	h2 {
-		line-height: $button-size;
-		margin: 0 auto 0 0;
-		font-size: $default-font-size;
-		color: $gray-900;
-	}
-
-	.components-button svg {
-		order: 1;
-	}
-}
diff --git a/packages/edit-post/src/components/view-link/index.js b/packages/edit-post/src/components/view-link/index.js
deleted file mode 100644
index 3ebf78b851e1f7..00000000000000
--- a/packages/edit-post/src/components/view-link/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { Button } from '@wordpress/components';
-import { external } from '@wordpress/icons';
-import { store as editorStore } from '@wordpress/editor';
-import { store as coreStore } from '@wordpress/core-data';
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-
-export default function ViewLink() {
-	const { permalink, isPublished, label, showIconLabels } = useSelect(
-		( select ) => {
-			// Grab post type to retrieve the view_item label.
-			const postTypeSlug = select( editorStore ).getCurrentPostType();
-			const postType = select( coreStore ).getPostType( postTypeSlug );
-
-			return {
-				permalink: select( editorStore ).getPermalink(),
-				isPublished: select( editorStore ).isCurrentPostPublished(),
-				label: postType?.labels.view_item,
-				showIconLabels:
-					select( editPostStore ).isFeatureActive( 'showIconLabels' ),
-			};
-		},
-		[]
-	);
-
-	// Only render the view button if the post is published and has a permalink.
-	if ( ! isPublished || ! permalink ) {
-		return null;
-	}
-
-	return (
-		<Button
-			icon={ external }
-			label={ label || __( 'View post' ) }
-			href={ permalink }
-			target="_blank"
-			showTooltip={ ! showIconLabels }
-		/>
-	);
-}
diff --git a/packages/edit-post/src/components/visual-editor/block-inspector-button.js b/packages/edit-post/src/components/visual-editor/block-inspector-button.js
deleted file mode 100644
index 271580b7ea7cad..00000000000000
--- a/packages/edit-post/src/components/visual-editor/block-inspector-button.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { MenuItem } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { speak } from '@wordpress/a11y';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-
-const noop = () => {};
-
-export function BlockInspectorButton( { onClick = noop, small = false } ) {
-	const { shortcut, areAdvancedSettingsOpened } = useSelect(
-		( select ) => ( {
-			shortcut: select(
-				keyboardShortcutsStore
-			).getShortcutRepresentation( 'core/edit-post/toggle-sidebar' ),
-			areAdvancedSettingsOpened:
-				select( editPostStore ).getActiveGeneralSidebarName() ===
-				'edit-post/block',
-		} ),
-		[]
-	);
-	const { openGeneralSidebar, closeGeneralSidebar } =
-		useDispatch( editPostStore );
-
-	const label = areAdvancedSettingsOpened
-		? __( 'Hide more settings' )
-		: __( 'Show more settings' );
-
-	return (
-		<MenuItem
-			onClick={ () => {
-				if ( areAdvancedSettingsOpened ) {
-					closeGeneralSidebar();
-					speak( __( 'Block settings closed' ) );
-				} else {
-					openGeneralSidebar( 'edit-post/block' );
-					speak(
-						__(
-							'Additional settings are now available in the Editor block settings sidebar'
-						)
-					);
-				}
-				onClick();
-			} }
-			shortcut={ shortcut }
-		>
-			{ ! small && label }
-		</MenuItem>
-	);
-}
-
-export default BlockInspectorButton;
diff --git a/packages/edit-post/src/components/visual-editor/index.js b/packages/edit-post/src/components/visual-editor/index.js
deleted file mode 100644
index 3c5ba8d0373049..00000000000000
--- a/packages/edit-post/src/components/visual-editor/index.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	store as editorStore,
-	privateApis as editorPrivateApis,
-} from '@wordpress/editor';
-import {
-	BlockTools,
-	__unstableUseTypewriter as useTypewriter,
-	__experimentalUseResizeCanvas as useResizeCanvas,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import { useRef, useMemo } from '@wordpress/element';
-import { __unstableMotion as motion } from '@wordpress/components';
-import { useSelect } from '@wordpress/data';
-import { useMergeRefs } from '@wordpress/compose';
-import { store as blocksStore } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { store as editPostStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-
-const { ExperimentalBlockCanvas: BlockCanvas } = unlock(
-	blockEditorPrivateApis
-);
-const { EditorCanvas } = unlock( editorPrivateApis );
-
-const isGutenbergPlugin = process.env.IS_GUTENBERG_PLUGIN ? true : false;
-
-export default function VisualEditor( { styles } ) {
-	const {
-		deviceType,
-		isWelcomeGuideVisible,
-		isTemplateMode,
-		isBlockBasedTheme,
-		hasV3BlocksOnly,
-	} = useSelect( ( select ) => {
-		const { isFeatureActive, __experimentalGetPreviewDeviceType } =
-			select( editPostStore );
-		const { getEditorSettings, getRenderingMode } = select( editorStore );
-		const { getBlockTypes } = select( blocksStore );
-		const editorSettings = getEditorSettings();
-
-		return {
-			deviceType: __experimentalGetPreviewDeviceType(),
-			isWelcomeGuideVisible: isFeatureActive( 'welcomeGuide' ),
-			isTemplateMode: getRenderingMode() !== 'post-only',
-			isBlockBasedTheme: editorSettings.__unstableIsBlockBasedTheme,
-			hasV3BlocksOnly: getBlockTypes().every( ( type ) => {
-				return type.apiVersion >= 3;
-			} ),
-		};
-	}, [] );
-	const hasMetaBoxes = useSelect(
-		( select ) => select( editPostStore ).hasMetaBoxes(),
-		[]
-	);
-	const desktopCanvasStyles = {
-		height: '100%',
-		width: '100%',
-		marginLeft: 'auto',
-		marginRight: 'auto',
-		display: 'flex',
-		flexFlow: 'column',
-		// Default background color so that grey
-		// .edit-post-editor-regions__content color doesn't show through.
-		background: 'white',
-	};
-	const templateModeStyles = {
-		...desktopCanvasStyles,
-		borderRadius: '2px 2px 0 0',
-		border: '1px solid #ddd',
-		borderBottom: 0,
-	};
-	const resizedCanvasStyles = useResizeCanvas( deviceType, isTemplateMode );
-	const previewMode = 'is-' + deviceType.toLowerCase() + '-preview';
-
-	let animatedStyles = isTemplateMode
-		? templateModeStyles
-		: desktopCanvasStyles;
-	if ( resizedCanvasStyles ) {
-		animatedStyles = resizedCanvasStyles;
-	}
-
-	let paddingBottom;
-
-	// Add a constant padding for the typewritter effect. When typing at the
-	// bottom, there needs to be room to scroll up.
-	if ( ! hasMetaBoxes && ! resizedCanvasStyles && ! isTemplateMode ) {
-		paddingBottom = '40vh';
-	}
-
-	const ref = useRef();
-	const contentRef = useMergeRefs( [ ref, useTypewriter() ] );
-
-	styles = useMemo(
-		() => [
-			...styles,
-			{
-				// We should move this in to future to the body.
-				css: paddingBottom
-					? `body{padding-bottom:${ paddingBottom }}`
-					: '',
-			},
-		],
-		[ styles ]
-	);
-
-	const isToBeIframed =
-		( ( hasV3BlocksOnly || ( isGutenbergPlugin && isBlockBasedTheme ) ) &&
-			! hasMetaBoxes ) ||
-		isTemplateMode ||
-		deviceType === 'Tablet' ||
-		deviceType === 'Mobile';
-
-	return (
-		<BlockTools
-			__unstableContentRef={ ref }
-			className={ classnames( 'edit-post-visual-editor', {
-				'is-template-mode': isTemplateMode,
-				'has-inline-canvas': ! isToBeIframed,
-			} ) }
-		>
-			<motion.div
-				className="edit-post-visual-editor__content-area"
-				animate={ {
-					padding: isTemplateMode ? '48px 48px 0' : 0,
-				} }
-			>
-				<motion.div
-					animate={ animatedStyles }
-					initial={ desktopCanvasStyles }
-					className={ previewMode }
-				>
-					<BlockCanvas
-						shouldIframe={ isToBeIframed }
-						contentRef={ contentRef }
-						styles={ styles }
-						height="100%"
-					>
-						<EditorCanvas
-							dropZoneElement={
-								// When iframed, pass in the html element of the iframe to
-								// ensure the drop zone extends to the edges of the iframe.
-								isToBeIframed
-									? ref.current?.parentNode
-									: ref.current
-							}
-							// We should auto-focus the canvas (title) on load.
-							// eslint-disable-next-line jsx-a11y/no-autofocus
-							autoFocus={ ! isWelcomeGuideVisible }
-						/>
-					</BlockCanvas>
-				</motion.div>
-			</motion.div>
-		</BlockTools>
-	);
-}
diff --git a/packages/edit-post/src/components/visual-editor/style.scss b/packages/edit-post/src/components/visual-editor/style.scss
deleted file mode 100644
index 46838c97f8799c..00000000000000
--- a/packages/edit-post/src/components/visual-editor/style.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-.edit-post-visual-editor {
-	position: relative;
-	display: flex;
-	flex-flow: column;
-	// In the iframed canvas this keeps extra scrollbars from appearing (when block toolbars overflow). In the
-	// legacy (non-iframed) canvas, overflow must not be hidden in order to maintain support for sticky positioning.
-	&:not(.has-inline-canvas) {
-		overflow: hidden;
-	}
-
-	// Gray preview overlay (desktop/tablet/mobile) is intentionally not set on an element with scrolling content like
-	// interface-interface-skeleton__content. This causes graphical glitches (flashes of the background color)
-	// when scrolling in Safari due to incorrect ordering of large compositing layers (GPU acceleration).
-	background-color: $gray-900;
-
-	// The button element easily inherits styles that are meant for the editor style.
-	// These rules enhance the specificity to reduce that inheritance.
-	// This is duplicated in edit-site.
-	& .components-button {
-		font-family: $default-font;
-		font-size: $default-font-size;
-		padding: 6px 12px;
-
-		&.has-icon {
-			padding: 6px;
-		}
-	}
-
-	// The following flex rule is important for the canvas layout, please be careful when refactoring,
-	// as older browser interpret flex height behavior differently. Be sure to test on Safari 13.
-	// The syntax is `flex: [flex-grow] [flex-shrink] [flex-basis];`
-	// We set the canvas to be allowed to grow (vertically), but not shrink.
-	flex: 1 0 auto;
-
-	// Since the parent container is also a flex container, a `flex-basis: 100%;` is not needed,
-	// as align-items: stretch is inherited by default.Additionally due to older browser's flex height
-	// interpretation, any percentage value is likely going to cause issues, such as metaboxes overlapping.
-	// See also https://www.w3.org/TR/CSS22/visudet.html#the-height-property.
-}
-
-.edit-post-visual-editor__content-area {
-	width: 100%;
-	height: 100%;
-	position: relative;
-	box-sizing: border-box;
-	display: flex;
-
-	// This is necessary for older browsers due to their flex height interpretation.
-	// These browsers (including Safari 13) ignore the percentage value entirely.
-	// By setting flex-grow, the element stretches to fill the parent.
-	// See also https://www.w3.org/TR/CSS22/visudet.html#the-height-property
-	flex-grow: 1;
-}
diff --git a/packages/edit-post/src/components/welcome-guide/default.js b/packages/edit-post/src/components/welcome-guide/default.js
index c4723c65a33df2..cdaf2c7608b43e 100644
--- a/packages/edit-post/src/components/welcome-guide/default.js
+++ b/packages/edit-post/src/components/welcome-guide/default.js
@@ -105,16 +105,20 @@ export default function WelcomeGuideDefault() {
 								{ __( 'Learn how to use the block editor' ) }
 							</h1>
 							<p className="edit-post-welcome-guide__text">
-								{ __(
-									'New to the block editor? Want to learn more about using it? '
+								{ createInterpolateElement(
+									__(
+										"New to the block editor? Want to learn more about using it? <a>Here's a detailed guide.</a>"
+									),
+									{
+										a: (
+											<ExternalLink
+												href={ __(
+													'https://wordpress.org/documentation/article/wordpress-block-editor/'
+												) }
+											/>
+										),
+									}
 								) }
-								<ExternalLink
-									href={ __(
-										'https://wordpress.org/documentation/article/wordpress-block-editor/'
-									) }
-								>
-									{ __( "Here's a detailed guide." ) }
-								</ExternalLink>
 							</p>
 						</>
 					),
diff --git a/packages/edit-post/src/components/welcome-guide/index.js b/packages/edit-post/src/components/welcome-guide/index.js
index 2809d9daa88a0a..fc7039fd7a87a3 100644
--- a/packages/edit-post/src/components/welcome-guide/index.js
+++ b/packages/edit-post/src/components/welcome-guide/index.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { store as editorStore } from '@wordpress/editor';
 
 /**
  * Internal dependencies
@@ -11,24 +10,30 @@ import WelcomeGuideDefault from './default';
 import WelcomeGuideTemplate from './template';
 import { store as editPostStore } from '../../store';
 
-export default function WelcomeGuide() {
-	const { isActive, isTemplateMode } = useSelect( ( select ) => {
-		const { isFeatureActive } = select( editPostStore );
-		const { getRenderingMode } = select( editorStore );
-		const _isTemplateMode = getRenderingMode() !== 'post-only';
-		const feature = _isTemplateMode
-			? 'welcomeGuideTemplate'
-			: 'welcomeGuide';
+export default function WelcomeGuide( { postType } ) {
+	const { isActive, isEditingTemplate } = useSelect(
+		( select ) => {
+			const { isFeatureActive } = select( editPostStore );
+			const _isEditingTemplate = postType === 'wp_template';
+			const feature = _isEditingTemplate
+				? 'welcomeGuideTemplate'
+				: 'welcomeGuide';
 
-		return {
-			isActive: isFeatureActive( feature ),
-			isTemplateMode: _isTemplateMode,
-		};
-	}, [] );
+			return {
+				isActive: isFeatureActive( feature ),
+				isEditingTemplate: _isEditingTemplate,
+			};
+		},
+		[ postType ]
+	);
 
 	if ( ! isActive ) {
 		return null;
 	}
 
-	return isTemplateMode ? <WelcomeGuideTemplate /> : <WelcomeGuideDefault />;
+	return isEditingTemplate ? (
+		<WelcomeGuideTemplate />
+	) : (
+		<WelcomeGuideDefault />
+	);
 }
diff --git a/packages/edit-post/src/deprecated.js b/packages/edit-post/src/deprecated.js
new file mode 100644
index 00000000000000..0e736cb2459ea8
--- /dev/null
+++ b/packages/edit-post/src/deprecated.js
@@ -0,0 +1,139 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	privateApis as editorPrivateApis,
+	PluginBlockSettingsMenuItem as EditorPluginBlockSettingsMenuItem,
+	PluginDocumentSettingPanel as EditorPluginDocumentSettingPanel,
+	PluginMoreMenuItem as EditorPluginMoreMenuItem,
+	PluginPrePublishPanel as EditorPluginPrePublishPanel,
+	PluginPostPublishPanel as EditorPluginPostPublishPanel,
+	PluginPostStatusInfo as EditorPluginPostStatusInfo,
+	PluginSidebar as EditorPluginSidebar,
+	PluginSidebarMoreMenuItem as EditorPluginSidebarMoreMenuItem,
+} from '@wordpress/editor';
+import { getPath } from '@wordpress/url';
+import deprecated from '@wordpress/deprecated';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from './lock-unlock';
+const { PluginPostExcerpt } = unlock( editorPrivateApis );
+
+const isSiteEditor = getPath( window.location.href )?.includes(
+	'site-editor.php'
+);
+
+const deprecateSlot = ( name ) => {
+	deprecated( `wp.editPost.${ name }`, {
+		since: '6.6',
+		alternative: `wp.editor.${ name }`,
+	} );
+};
+
+/* eslint-disable jsdoc/require-param */
+/**
+ * @see PluginBlockSettingsMenuItem in @wordpress/editor package.
+ */
+export function PluginBlockSettingsMenuItem( props ) {
+	if ( isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginBlockSettingsMenuItem' );
+	return <EditorPluginBlockSettingsMenuItem { ...props } />;
+}
+
+/**
+ * @see PluginDocumentSettingPanel in @wordpress/editor package.
+ */
+export function PluginDocumentSettingPanel( props ) {
+	if ( isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginDocumentSettingPanel' );
+	return <EditorPluginDocumentSettingPanel { ...props } />;
+}
+
+/**
+ * @see PluginMoreMenuItem in @wordpress/editor package.
+ */
+export function PluginMoreMenuItem( props ) {
+	if ( isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginMoreMenuItem' );
+	return <EditorPluginMoreMenuItem { ...props } />;
+}
+
+/**
+ * @see PluginPrePublishPanel in @wordpress/editor package.
+ */
+export function PluginPrePublishPanel( props ) {
+	if ( isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginPrePublishPanel' );
+	return <EditorPluginPrePublishPanel { ...props } />;
+}
+
+/**
+ * @see PluginPostPublishPanel in @wordpress/editor package.
+ */
+export function PluginPostPublishPanel( props ) {
+	if ( isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginPostPublishPanel' );
+	return <EditorPluginPostPublishPanel { ...props } />;
+}
+
+/**
+ * @see PluginPostStatusInfo in @wordpress/editor package.
+ */
+export function PluginPostStatusInfo( props ) {
+	if ( isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginPostStatusInfo' );
+	return <EditorPluginPostStatusInfo { ...props } />;
+}
+
+/**
+ * @see PluginSidebar in @wordpress/editor package.
+ */
+export function PluginSidebar( props ) {
+	if ( isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginSidebar' );
+	return <EditorPluginSidebar { ...props } />;
+}
+
+/**
+ * @see PluginSidebarMoreMenuItem in @wordpress/editor package.
+ */
+export function PluginSidebarMoreMenuItem( props ) {
+	if ( isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginSidebarMoreMenuItem' );
+	return <EditorPluginSidebarMoreMenuItem { ...props } />;
+}
+
+/**
+ * @see PluginPostExcerpt in @wordpress/editor package.
+ */
+export function __experimentalPluginPostExcerpt() {
+	if ( isSiteEditor ) {
+		return null;
+	}
+	deprecated( 'wp.editPost.__experimentalPluginPostExcerpt', {
+		since: '6.6',
+		hint: 'Core and custom panels can be access programmatically using their panel name.',
+		link: 'https://developer.wordpress.org/block-editor/reference-guides/slotfills/plugin-document-setting-panel/#accessing-a-panel-programmatically',
+	} );
+	return PluginPostExcerpt;
+}
+
+/* eslint-enable jsdoc/require-param */
diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js
deleted file mode 100644
index 2394ebb3a3a742..00000000000000
--- a/packages/edit-post/src/editor.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { store as blocksStore } from '@wordpress/blocks';
-import { useSelect, useDispatch } from '@wordpress/data';
-import {
-	ErrorBoundary,
-	PostLockedModal,
-	store as editorStore,
-	privateApis as editorPrivateApis,
-} from '@wordpress/editor';
-import { useEffect, useMemo } from '@wordpress/element';
-import { SlotFillProvider } from '@wordpress/components';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as preferencesStore } from '@wordpress/preferences';
-import { CommandMenu } from '@wordpress/commands';
-
-/**
- * Internal dependencies
- */
-import Layout from './components/layout';
-import EditorInitialization from './components/editor-initialization';
-import { store as editPostStore } from './store';
-import { unlock } from './lock-unlock';
-
-const { ExperimentalEditorProvider } = unlock( editorPrivateApis );
-
-function Editor( { postId, postType, settings, initialEdits, ...props } ) {
-	const {
-		hasFixedToolbar,
-		focusMode,
-		isDistractionFree,
-		hasInlineToolbar,
-		post,
-		preferredStyleVariations,
-		hiddenBlockTypes,
-		blockTypes,
-		keepCaretInsideBlock,
-		template,
-	} = useSelect(
-		( select ) => {
-			const {
-				isFeatureActive,
-				getEditedPostTemplate,
-				getHiddenBlockTypes,
-			} = select( editPostStore );
-			const { getEntityRecord, getPostType, getEntityRecords, canUser } =
-				select( coreStore );
-			const { getEditorSettings } = select( editorStore );
-			const { getBlockTypes } = select( blocksStore );
-			const isTemplate = [ 'wp_template', 'wp_template_part' ].includes(
-				postType
-			);
-			// Ideally the initializeEditor function should be called using the ID of the REST endpoint.
-			// to avoid the special case.
-			let postObject;
-			if ( isTemplate ) {
-				const posts = getEntityRecords( 'postType', postType, {
-					wp_id: postId,
-				} );
-				postObject = posts?.[ 0 ];
-			} else {
-				postObject = getEntityRecord( 'postType', postType, postId );
-			}
-			const supportsTemplateMode =
-				getEditorSettings().supportsTemplateMode;
-			const isViewable = getPostType( postType )?.viewable ?? false;
-			const canEditTemplate = canUser( 'create', 'templates' );
-
-			return {
-				hasFixedToolbar: isFeatureActive( 'fixedToolbar' ),
-				focusMode: isFeatureActive( 'focusMode' ),
-				isDistractionFree: isFeatureActive( 'distractionFree' ),
-				hasInlineToolbar: isFeatureActive( 'inlineToolbar' ),
-				preferredStyleVariations: select( preferencesStore ).get(
-					'core/edit-post',
-					'preferredStyleVariations'
-				),
-				hiddenBlockTypes: getHiddenBlockTypes(),
-				blockTypes: getBlockTypes(),
-				keepCaretInsideBlock: isFeatureActive( 'keepCaretInsideBlock' ),
-				template:
-					supportsTemplateMode && isViewable && canEditTemplate
-						? getEditedPostTemplate()
-						: null,
-				post: postObject,
-			};
-		},
-		[ postType, postId ]
-	);
-
-	const { updatePreferredStyleVariations, setIsInserterOpened } =
-		useDispatch( editPostStore );
-
-	const editorSettings = useMemo( () => {
-		const result = {
-			...settings,
-			__experimentalPreferredStyleVariations: {
-				value: preferredStyleVariations,
-				onChange: updatePreferredStyleVariations,
-			},
-			hasFixedToolbar,
-			focusMode,
-			isDistractionFree,
-			hasInlineToolbar,
-
-			// This is marked as experimental to give time for the quick inserter to mature.
-			__experimentalSetIsInserterOpened: setIsInserterOpened,
-			keepCaretInsideBlock,
-			// Keep a reference of the `allowedBlockTypes` from the server to handle use cases
-			// where we need to differentiate if a block is disabled by the user or some plugin.
-			defaultAllowedBlockTypes: settings.allowedBlockTypes,
-		};
-
-		// Omit hidden block types if exists and non-empty.
-		if ( hiddenBlockTypes.length > 0 ) {
-			// Defer to passed setting for `allowedBlockTypes` if provided as
-			// anything other than `true` (where `true` is equivalent to allow
-			// all block types).
-			const defaultAllowedBlockTypes =
-				true === settings.allowedBlockTypes
-					? blockTypes.map( ( { name } ) => name )
-					: settings.allowedBlockTypes || [];
-
-			result.allowedBlockTypes = defaultAllowedBlockTypes.filter(
-				( type ) => ! hiddenBlockTypes.includes( type )
-			);
-		}
-
-		return result;
-	}, [
-		settings,
-		hasFixedToolbar,
-		hasInlineToolbar,
-		focusMode,
-		isDistractionFree,
-		hiddenBlockTypes,
-		blockTypes,
-		preferredStyleVariations,
-		setIsInserterOpened,
-		updatePreferredStyleVariations,
-		keepCaretInsideBlock,
-	] );
-
-	// The default mode of the post editor is "post-only" mode.
-	const { setRenderingMode } = useDispatch( editorStore );
-	useEffect( () => {
-		setRenderingMode( 'post-only' );
-	}, [ setRenderingMode ] );
-
-	if ( ! post ) {
-		return null;
-	}
-
-	return (
-		<SlotFillProvider>
-			<ExperimentalEditorProvider
-				settings={ editorSettings }
-				post={ post }
-				initialEdits={ initialEdits }
-				useSubRegistry={ false }
-				__unstableTemplate={ template }
-				{ ...props }
-			>
-				<ErrorBoundary>
-					<CommandMenu />
-					<EditorInitialization postId={ postId } />
-					<Layout />
-				</ErrorBoundary>
-				<PostLockedModal />
-			</ExperimentalEditorProvider>
-		</SlotFillProvider>
-	);
-}
-
-export default Editor;
diff --git a/packages/edit-post/src/editor.native.js b/packages/edit-post/src/editor.native.js
index b031601186c72f..69185a5f3073e6 100644
--- a/packages/edit-post/src/editor.native.js
+++ b/packages/edit-post/src/editor.native.js
@@ -9,8 +9,12 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
  * WordPress dependencies
  */
 import { Component } from '@wordpress/element';
-import { EditorProvider } from '@wordpress/editor';
-import { parse, serialize, store as blocksStore } from '@wordpress/blocks';
+import {
+	EditorProvider,
+	ErrorBoundary,
+	store as editorStore,
+} from '@wordpress/editor';
+import { parse, serialize } from '@wordpress/blocks';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
 import {
@@ -24,17 +28,11 @@ import { store as coreStore } from '@wordpress/core-data';
  * Internal dependencies
  */
 import Layout from './components/layout';
-import { store as editPostStore } from './store';
 
 class Editor extends Component {
 	constructor( props ) {
 		super( ...arguments );
 
-		// need to set this globally to avoid race with deprecations
-		// defaulting to true to avoid issues with a not-yet-cached value
-		const { galleryWithImageBlocks = true } = props;
-		window.wp.galleryBlockV2Enabled = galleryWithImageBlocks;
-
 		if ( props.initialHtmlModeEnabled && props.mode === 'visual' ) {
 			// Enable html mode if the initial mode the parent wants it but we're not already in it.
 			this.props.switchEditorMode( 'text' );
@@ -47,40 +45,12 @@ class Editor extends Component {
 		this.setTitleRef = this.setTitleRef.bind( this );
 	}
 
-	getEditorSettings(
-		settings,
-		hasFixedToolbar,
-		focusMode,
-		hiddenBlockTypes,
-		blockTypes
-	) {
+	getEditorSettings( settings ) {
 		settings = {
 			...settings,
 			isRTL: I18nManager.isRTL,
-			hasFixedToolbar,
-			focusMode,
 		};
 
-		// Omit hidden block types if exists and non-empty.
-		if ( hiddenBlockTypes.length > 0 ) {
-			if ( settings.allowedBlockTypes === undefined ) {
-				// If no specific flags for allowedBlockTypes are set, assume `true`
-				// meaning allow all block types.
-				settings.allowedBlockTypes = true;
-			}
-			// Defer to passed setting for `allowedBlockTypes` if provided as
-			// anything other than `true` (where `true` is equivalent to allow
-			// all block types).
-			const defaultAllowedBlockTypes =
-				true === settings.allowedBlockTypes
-					? blockTypes.map( ( { name } ) => name )
-					: settings.allowedBlockTypes || [];
-
-			settings.allowedBlockTypes = defaultAllowedBlockTypes.filter(
-				( type ) => ! hiddenBlockTypes.includes( type )
-			);
-		}
-
 		return settings;
 	}
 
@@ -134,11 +104,7 @@ class Editor extends Component {
 	render() {
 		const {
 			settings,
-			hasFixedToolbar,
-			focusMode,
 			initialEdits,
-			hiddenBlockTypes,
-			blockTypes,
 			post,
 			postId,
 			postType,
@@ -147,13 +113,7 @@ class Editor extends Component {
 			...props
 		} = this.props;
 
-		const editorSettings = this.getEditorSettings(
-			settings,
-			hasFixedToolbar,
-			focusMode,
-			hiddenBlockTypes,
-			blockTypes
-		);
+		const editorSettings = this.getEditorSettings( settings );
 
 		const normalizedPost = post || {
 			id: postId,
@@ -182,7 +142,9 @@ class Editor extends Component {
 						useSubRegistry={ false }
 						{ ...props }
 					>
-						<Layout setTitleRef={ this.setTitleRef } />
+						<ErrorBoundary>
+							<Layout setTitleRef={ this.setTitleRef } />
+						</ErrorBoundary>
 					</EditorProvider>
 				</SlotFillProvider>
 			</GestureHandlerRootView>
@@ -192,26 +154,14 @@ class Editor extends Component {
 
 export default compose( [
 	withSelect( ( select ) => {
-		const {
-			isFeatureActive,
-			getEditorMode,
-			__experimentalGetPreviewDeviceType,
-			getHiddenBlockTypes,
-		} = select( editPostStore );
-		const { getBlockTypes } = select( blocksStore );
+		const { getEditorMode } = select( editorStore );
 
 		return {
-			hasFixedToolbar:
-				isFeatureActive( 'fixedToolbar' ) ||
-				__experimentalGetPreviewDeviceType() !== 'Desktop',
-			focusMode: isFeatureActive( 'focusMode' ),
 			mode: getEditorMode(),
-			hiddenBlockTypes: getHiddenBlockTypes(),
-			blockTypes: getBlockTypes(),
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
-		const { switchEditorMode } = dispatch( editPostStore );
+		const { switchEditorMode } = dispatch( editorStore );
 		const { editEntityRecord } = dispatch( coreStore );
 		return {
 			switchEditorMode,
diff --git a/packages/edit-post/src/hooks/commands/use-common-commands.js b/packages/edit-post/src/hooks/commands/use-common-commands.js
deleted file mode 100644
index e9534b190416a3..00000000000000
--- a/packages/edit-post/src/hooks/commands/use-common-commands.js
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { __, isRTL } from '@wordpress/i18n';
-import {
-	code,
-	drawerLeft,
-	drawerRight,
-	blockDefault,
-	keyboard,
-	desktop,
-	listView,
-	external,
-	formatListBullets,
-} from '@wordpress/icons';
-import { useCommand } from '@wordpress/commands';
-import { store as preferencesStore } from '@wordpress/preferences';
-import { store as interfaceStore } from '@wordpress/interface';
-import { store as editorStore } from '@wordpress/editor';
-import { store as noticesStore } from '@wordpress/notices';
-
-/**
- * Internal dependencies
- */
-import { KEYBOARD_SHORTCUT_HELP_MODAL_NAME } from '../../components/keyboard-shortcut-help-modal';
-import { PREFERENCES_MODAL_NAME } from '../../components/preferences-modal';
-import { store as editPostStore } from '../../store';
-
-export default function useCommonCommands() {
-	const {
-		openGeneralSidebar,
-		closeGeneralSidebar,
-		switchEditorMode,
-		setIsListViewOpened,
-		toggleDistractionFree,
-	} = useDispatch( editPostStore );
-	const { openModal } = useDispatch( interfaceStore );
-	const {
-		editorMode,
-		activeSidebar,
-		isListViewOpen,
-		isPublishSidebarEnabled,
-		showBlockBreadcrumbs,
-		isDistractionFree,
-	} = useSelect( ( select ) => {
-		const { getEditorMode, isListViewOpened, isFeatureActive } =
-			select( editPostStore );
-		return {
-			activeSidebar: select( interfaceStore ).getActiveComplementaryArea(
-				editPostStore.name
-			),
-			editorMode: getEditorMode(),
-			isListViewOpen: isListViewOpened(),
-			isPublishSidebarEnabled:
-				select( editorStore ).isPublishSidebarEnabled(),
-			showBlockBreadcrumbs: isFeatureActive( 'showBlockBreadcrumbs' ),
-			isDistractionFree: select( preferencesStore ).get(
-				editPostStore.name,
-				'distractionFree'
-			),
-		};
-	}, [] );
-	const { toggle } = useDispatch( preferencesStore );
-	const { createInfoNotice } = useDispatch( noticesStore );
-	const { __unstableSaveForPreview } = useDispatch( editorStore );
-	const { getCurrentPostId } = useSelect( editorStore );
-
-	useCommand( {
-		name: 'core/open-settings-sidebar',
-		label: __( 'Toggle settings sidebar' ),
-		icon: isRTL() ? drawerLeft : drawerRight,
-		callback: ( { close } ) => {
-			close();
-			if ( activeSidebar === 'edit-post/document' ) {
-				closeGeneralSidebar();
-			} else {
-				openGeneralSidebar( 'edit-post/document' );
-			}
-		},
-	} );
-
-	useCommand( {
-		name: 'core/open-block-inspector',
-		label: __( 'Toggle block inspector' ),
-		icon: blockDefault,
-		callback: ( { close } ) => {
-			close();
-			if ( activeSidebar === 'edit-post/block' ) {
-				closeGeneralSidebar();
-			} else {
-				openGeneralSidebar( 'edit-post/block' );
-			}
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-distraction-free',
-		label: __( 'Toggle distraction free' ),
-		callback: ( { close } ) => {
-			toggleDistractionFree();
-			close();
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-spotlight-mode',
-		label: __( 'Toggle spotlight mode' ),
-		callback: ( { close } ) => {
-			toggle( 'core/edit-post', 'focusMode' );
-			close();
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-fullscreen-mode',
-		label: __( 'Toggle fullscreen mode' ),
-		icon: desktop,
-		callback: ( { close } ) => {
-			toggle( 'core/edit-post', 'fullscreenMode' );
-			close();
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-list-view',
-		label: __( 'Toggle list view' ),
-		icon: listView,
-		callback: ( { close } ) => {
-			setIsListViewOpened( ! isListViewOpen );
-			close();
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-top-toolbar',
-		label: __( 'Toggle top toolbar' ),
-		callback: ( { close } ) => {
-			toggle( 'core/edit-post', 'fixedToolbar' );
-			if ( isDistractionFree ) {
-				toggleDistractionFree();
-			}
-			close();
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-code-editor',
-		label: __( 'Toggle code editor' ),
-		icon: code,
-		callback: ( { close } ) => {
-			switchEditorMode( editorMode === 'visual' ? 'text' : 'visual' );
-			close();
-		},
-	} );
-
-	useCommand( {
-		name: 'core/open-preferences',
-		label: __( 'Editor preferences' ),
-		callback: () => {
-			openModal( PREFERENCES_MODAL_NAME );
-		},
-	} );
-
-	useCommand( {
-		name: 'core/open-shortcut-help',
-		label: __( 'Keyboard shortcuts' ),
-		icon: keyboard,
-		callback: () => {
-			openModal( KEYBOARD_SHORTCUT_HELP_MODAL_NAME );
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-breadcrumbs',
-		label: showBlockBreadcrumbs
-			? __( 'Hide block breadcrumbs' )
-			: __( 'Show block breadcrumbs' ),
-		callback: ( { close } ) => {
-			toggle( 'core/edit-post', 'showBlockBreadcrumbs' );
-			close();
-			createInfoNotice(
-				showBlockBreadcrumbs
-					? __( 'Breadcrumbs hidden.' )
-					: __( 'Breadcrumbs visible.' ),
-				{
-					id: 'core/edit-post/toggle-breadcrumbs/notice',
-					type: 'snackbar',
-				}
-			);
-		},
-	} );
-
-	useCommand( {
-		name: 'core/toggle-publish-sidebar',
-		label: isPublishSidebarEnabled
-			? __( 'Disable pre-publish checklist' )
-			: __( 'Enable pre-publish checklist' ),
-		icon: formatListBullets,
-		callback: ( { close } ) => {
-			close();
-			toggle( 'core/edit-post', 'isPublishSidebarEnabled' );
-			createInfoNotice(
-				isPublishSidebarEnabled
-					? __( 'Pre-publish checklist off.' )
-					: __( 'Pre-publish checklist on.' ),
-				{
-					id: 'core/edit-post/publish-sidebar/notice',
-					type: 'snackbar',
-				}
-			);
-		},
-	} );
-
-	useCommand( {
-		name: 'core/preview-link',
-		label: __( 'Preview in a new tab' ),
-		icon: external,
-		callback: async ( { close } ) => {
-			close();
-			const postId = getCurrentPostId();
-			const link = await __unstableSaveForPreview();
-			window.open( link, `wp-preview-${ postId }` );
-		},
-	} );
-}
diff --git a/packages/edit-post/src/hooks/components/index.js b/packages/edit-post/src/hooks/components/index.js
deleted file mode 100644
index 709d89d013ed5a..00000000000000
--- a/packages/edit-post/src/hooks/components/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { addFilter } from '@wordpress/hooks';
-import { MediaUpload } from '@wordpress/media-utils';
-
-const replaceMediaUpload = () => MediaUpload;
-
-addFilter(
-	'editor.MediaUpload',
-	'core/edit-post/replace-media-upload',
-	replaceMediaUpload
-);
diff --git a/packages/edit-post/src/hooks/index.js b/packages/edit-post/src/hooks/index.js
deleted file mode 100644
index dc90f62760a7d1..00000000000000
--- a/packages/edit-post/src/hooks/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Internal dependencies
- */
-import './components';
-import './validate-multiple-use';
diff --git a/packages/edit-post/src/hooks/use-navigate-to-entity-record.js b/packages/edit-post/src/hooks/use-navigate-to-entity-record.js
new file mode 100644
index 00000000000000..b8c39865ecee8a
--- /dev/null
+++ b/packages/edit-post/src/hooks/use-navigate-to-entity-record.js
@@ -0,0 +1,82 @@
+/**
+ * WordPress dependencies
+ */
+import { useCallback, useReducer } from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as editorStore } from '@wordpress/editor';
+
+/**
+ * A hook that records the 'entity' history in the post editor as a user
+ * navigates between editing a post and editing the post template or patterns.
+ *
+ * Implemented as a stack, so a little similar to the browser history API.
+ *
+ * Used to control displaying UI elements like the back button.
+ *
+ * @param {number} initialPostId        The post id of the post when the editor loaded.
+ * @param {string} initialPostType      The post type of the post when the editor loaded.
+ * @param {string} defaultRenderingMode The rendering mode to switch to when navigating.
+ *
+ * @return {Object} An object containing the `currentPost` variable and
+ *                 `onNavigateToEntityRecord` and `onNavigateToPreviousEntityRecord` functions.
+ */
+export default function useNavigateToEntityRecord(
+	initialPostId,
+	initialPostType,
+	defaultRenderingMode
+) {
+	const [ postHistory, dispatch ] = useReducer(
+		( historyState, { type, post, previousRenderingMode } ) => {
+			if ( type === 'push' ) {
+				return [ ...historyState, { post, previousRenderingMode } ];
+			}
+			if ( type === 'pop' ) {
+				// Try to leave one item in the history.
+				if ( historyState.length > 1 ) {
+					return historyState.slice( 0, -1 );
+				}
+			}
+			return historyState;
+		},
+		[
+			{
+				post: { postId: initialPostId, postType: initialPostType },
+			},
+		]
+	);
+
+	const { post, previousRenderingMode } =
+		postHistory[ postHistory.length - 1 ];
+
+	const { getRenderingMode } = useSelect( editorStore );
+	const { setRenderingMode } = useDispatch( editorStore );
+
+	const onNavigateToEntityRecord = useCallback(
+		( params ) => {
+			dispatch( {
+				type: 'push',
+				post: { postId: params.postId, postType: params.postType },
+				// Save the current rendering mode so we can restore it when navigating back.
+				previousRenderingMode: getRenderingMode(),
+			} );
+			setRenderingMode( defaultRenderingMode );
+		},
+		[ getRenderingMode, setRenderingMode, defaultRenderingMode ]
+	);
+
+	const onNavigateToPreviousEntityRecord = useCallback( () => {
+		dispatch( { type: 'pop' } );
+		if ( previousRenderingMode ) {
+			setRenderingMode( previousRenderingMode );
+		}
+	}, [ setRenderingMode, previousRenderingMode ] );
+
+	return {
+		currentPost: post,
+		onNavigateToEntityRecord,
+		onNavigateToPreviousEntityRecord:
+			postHistory.length > 1
+				? onNavigateToPreviousEntityRecord
+				: undefined,
+	};
+}
diff --git a/packages/edit-post/src/hooks/validate-multiple-use/index.js b/packages/edit-post/src/hooks/validate-multiple-use/index.js
deleted file mode 100644
index 31444a86467c70..00000000000000
--- a/packages/edit-post/src/hooks/validate-multiple-use/index.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	createBlock,
-	findTransform,
-	getBlockTransforms,
-	getBlockType,
-	hasBlockSupport,
-} from '@wordpress/blocks';
-import { Button } from '@wordpress/components';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { Warning, store as blockEditorStore } from '@wordpress/block-editor';
-import { addFilter } from '@wordpress/hooks';
-import { __ } from '@wordpress/i18n';
-import { compose, createHigherOrderComponent } from '@wordpress/compose';
-
-const enhance = compose(
-	/**
-	 * For blocks whose block type doesn't support `multiple`, provides the
-	 * wrapped component with `originalBlockClientId` -- a reference to the
-	 * first block of the same type in the content -- if and only if that
-	 * "original" block is not the current one. Thus, an inexisting
-	 * `originalBlockClientId` prop signals that the block is valid.
-	 *
-	 * @param {Component} WrappedBlockEdit A filtered BlockEdit instance.
-	 *
-	 * @return {Component} Enhanced component with merged state data props.
-	 */
-	withSelect( ( select, block ) => {
-		const multiple = hasBlockSupport( block.name, 'multiple', true );
-
-		// For block types with `multiple` support, there is no "original
-		// block" to be found in the content, as the block itself is valid.
-		if ( multiple ) {
-			return {};
-		}
-
-		// Otherwise, only pass `originalBlockClientId` if it refers to a different
-		// block from the current one.
-		const blocks = select( blockEditorStore ).getBlocks();
-		const firstOfSameType = blocks.find(
-			( { name } ) => block.name === name
-		);
-		const isInvalid =
-			firstOfSameType && firstOfSameType.clientId !== block.clientId;
-		return {
-			originalBlockClientId: isInvalid && firstOfSameType.clientId,
-		};
-	} ),
-	withDispatch( ( dispatch, { originalBlockClientId } ) => ( {
-		selectFirst: () =>
-			dispatch( blockEditorStore ).selectBlock( originalBlockClientId ),
-	} ) )
-);
-
-const withMultipleValidation = createHigherOrderComponent( ( BlockEdit ) => {
-	return enhance( ( { originalBlockClientId, selectFirst, ...props } ) => {
-		if ( ! originalBlockClientId ) {
-			return <BlockEdit { ...props } />;
-		}
-
-		const blockType = getBlockType( props.name );
-		const outboundType = getOutboundType( props.name );
-
-		return [
-			<div key="invalid-preview" style={ { minHeight: '60px' } }>
-				<BlockEdit key="block-edit" { ...props } />
-			</div>,
-			<Warning
-				key="multiple-use-warning"
-				actions={ [
-					<Button
-						key="find-original"
-						variant="secondary"
-						onClick={ selectFirst }
-					>
-						{ __( 'Find original' ) }
-					</Button>,
-					<Button
-						key="remove"
-						variant="secondary"
-						onClick={ () => props.onReplace( [] ) }
-					>
-						{ __( 'Remove' ) }
-					</Button>,
-					outboundType && (
-						<Button
-							key="transform"
-							variant="secondary"
-							onClick={ () =>
-								props.onReplace(
-									createBlock(
-										outboundType.name,
-										props.attributes
-									)
-								)
-							}
-						>
-							{ __( 'Transform into:' ) } { outboundType.title }
-						</Button>
-					),
-				] }
-			>
-				<strong>{ blockType?.title }: </strong>
-				{ __( 'This block can only be used once.' ) }
-			</Warning>,
-		];
-	} );
-}, 'withMultipleValidation' );
-
-/**
- * Given a base block name, returns the default block type to which to offer
- * transforms.
- *
- * @param {string} blockName Base block name.
- *
- * @return {?Object} The chosen default block type.
- */
-function getOutboundType( blockName ) {
-	// Grab the first outbound transform.
-	const transform = findTransform(
-		getBlockTransforms( 'to', blockName ),
-		( { type, blocks } ) => type === 'block' && blocks.length === 1 // What about when .length > 1?
-	);
-
-	if ( ! transform ) {
-		return null;
-	}
-
-	return getBlockType( transform.blocks[ 0 ] );
-}
-
-addFilter(
-	'editor.BlockEdit',
-	'core/edit-post/validate-multiple-use/with-multiple-validation',
-	withMultipleValidation
-);
diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js
index 64ddf1d9fb08ba..685ffc56f63a80 100644
--- a/packages/edit-post/src/index.js
+++ b/packages/edit-post/src/index.js
@@ -7,23 +7,28 @@ import {
 	__experimentalRegisterExperimentalCoreBlocks,
 } from '@wordpress/block-library';
 import deprecated from '@wordpress/deprecated';
-import { createRoot } from '@wordpress/element';
+import { createRoot, StrictMode } from '@wordpress/element';
 import { dispatch, select } from '@wordpress/data';
-import { addFilter } from '@wordpress/hooks';
 import { store as preferencesStore } from '@wordpress/preferences';
 import {
 	registerLegacyWidgetBlock,
 	registerWidgetGroupBlock,
 } from '@wordpress/widgets';
-import { store as editorStore } from '@wordpress/editor';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
-import './hooks';
-import './plugins';
-import Editor from './editor';
-import { store as editPostStore } from './store';
+import Layout from './components/layout';
+import { unlock } from './lock-unlock';
+
+const {
+	BackButton: __experimentalMainDashboardButton,
+	registerCoreBlockBindingsSources,
+} = unlock( editorPrivateApis );
 
 /**
  * Initializes and returns an instance of Editor.
@@ -43,94 +48,61 @@ export function initializeEditor(
 	settings,
 	initialEdits
 ) {
+	const isMediumOrBigger = window.matchMedia( '(min-width: 782px)' ).matches;
 	const target = document.getElementById( id );
 	const root = createRoot( target );
 
 	dispatch( preferencesStore ).setDefaults( 'core/edit-post', {
+		fullscreenMode: true,
+		themeStyles: true,
+		welcomeGuide: true,
+		welcomeGuideTemplate: true,
+	} );
+
+	dispatch( preferencesStore ).setDefaults( 'core', {
+		allowRightClickOverrides: true,
 		editorMode: 'visual',
 		fixedToolbar: false,
-		fullscreenMode: true,
 		hiddenBlockTypes: [],
 		inactivePanels: [],
-		isPublishSidebarEnabled: true,
 		openPanels: [ 'post-status' ],
-		preferredStyleVariations: {},
 		showBlockBreadcrumbs: true,
 		showIconLabels: false,
 		showListViewByDefault: false,
-		themeStyles: true,
-		welcomeGuide: true,
-		welcomeGuideTemplate: true,
+		enableChoosePatternModal: true,
+		isPublishSidebarEnabled: true,
 	} );
 
+	if ( window.__experimentalMediaProcessing ) {
+		dispatch( preferencesStore ).setDefaults( 'core/media', {
+			requireApproval: true,
+			optimizeOnUpload: true,
+		} );
+	}
+
 	dispatch( blocksStore ).reapplyBlockTypeFilters();
 
 	// Check if the block list view should be open by default.
 	// If `distractionFree` mode is enabled, the block list view should not be open.
+	// This behavior is disabled for small viewports.
 	if (
-		select( editPostStore ).isFeatureActive( 'showListViewByDefault' ) &&
-		! select( editPostStore ).isFeatureActive( 'distractionFree' )
+		isMediumOrBigger &&
+		select( preferencesStore ).get( 'core', 'showListViewByDefault' ) &&
+		! select( preferencesStore ).get( 'core', 'distractionFree' )
 	) {
-		dispatch( editPostStore ).setIsListViewOpened( true );
+		dispatch( editorStore ).setIsListViewOpened( true );
 	}
 
 	registerCoreBlocks();
+	registerCoreBlockBindingsSources();
 	registerLegacyWidgetBlock( { inserter: false } );
 	registerWidgetGroupBlock( { inserter: false } );
-	if ( process.env.IS_GUTENBERG_PLUGIN ) {
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 		__experimentalRegisterExperimentalCoreBlocks( {
 			enableFSEBlocks: settings.__unstableEnableFullSiteEditingBlocks,
 		} );
 	}
 
-	/*
-	 * Prevent adding template part in the post editor.
-	 * Only add the filter when the post editor is initialized, not imported.
-	 * Also only add the filter(s) after registerCoreBlocks()
-	 * so that common filters in the block library are not overwritten.
-	 */
-	addFilter(
-		'blockEditor.__unstableCanInsertBlockType',
-		'removeTemplatePartsFromInserter',
-		( canInsert, blockType ) => {
-			if (
-				select( editorStore ).getRenderingMode() === 'post-only' &&
-				blockType.name === 'core/template-part'
-			) {
-				return false;
-			}
-			return canInsert;
-		}
-	);
-
-	/*
-	 * Prevent adding post content block (except in query block) in the post editor.
-	 * Only add the filter when the post editor is initialized, not imported.
-	 * Also only add the filter(s) after registerCoreBlocks()
-	 * so that common filters in the block library are not overwritten.
-	 */
-	addFilter(
-		'blockEditor.__unstableCanInsertBlockType',
-		'removePostContentFromInserter',
-		(
-			canInsert,
-			blockType,
-			rootClientId,
-			{ getBlockParentsByBlockName }
-		) => {
-			if (
-				select( editorStore ).getRenderingMode() === 'post-only' &&
-				blockType.name === 'core/post-content'
-			) {
-				return (
-					getBlockParentsByBlockName( rootClientId, 'core/query' )
-						.length > 0
-				);
-			}
-			return canInsert;
-		}
-	);
-
 	// Show a console log warning if the browser is not in Standards rendering mode.
 	const documentMode =
 		document.compatMode === 'CSS1Compat' ? 'Standards' : 'Quirks';
@@ -176,12 +148,14 @@ export function initializeEditor(
 	window.addEventListener( 'drop', ( e ) => e.preventDefault(), false );
 
 	root.render(
-		<Editor
-			settings={ settings }
-			postId={ postId }
-			postType={ postType }
-			initialEdits={ initialEdits }
-		/>
+		<StrictMode>
+			<Layout
+				settings={ settings }
+				postId={ postId }
+				postType={ postType }
+				initialEdits={ initialEdits }
+			/>
+		</StrictMode>
 	);
 
 	return root;
@@ -197,15 +171,7 @@ export function reinitializeEditor() {
 	} );
 }
 
-export { default as PluginBlockSettingsMenuItem } from './components/block-settings-menu/plugin-block-settings-menu-item';
-export { default as PluginDocumentSettingPanel } from './components/sidebar/plugin-document-setting-panel';
-export { default as PluginMoreMenuItem } from './components/header/plugin-more-menu-item';
-export { default as PluginPostPublishPanel } from './components/sidebar/plugin-post-publish-panel';
-export { default as PluginPostStatusInfo } from './components/sidebar/plugin-post-status-info';
-export { default as PluginPrePublishPanel } from './components/sidebar/plugin-pre-publish-panel';
-export { default as PluginSidebar } from './components/sidebar/plugin-sidebar';
-export { default as PluginSidebarMoreMenuItem } from './components/header/plugin-sidebar-more-menu-item';
-export { default as __experimentalFullscreenModeClose } from './components/header/fullscreen-mode-close';
-export { default as __experimentalMainDashboardButton } from './components/header/main-dashboard-button';
-export { default as __experimentalPluginPostExcerpt } from './components/sidebar/plugin-post-excerpt';
+export { default as __experimentalFullscreenModeClose } from './components/back-button/fullscreen-mode-close';
+export { __experimentalMainDashboardButton };
 export { store } from './store';
+export * from './deprecated';
diff --git a/packages/edit-post/src/index.native.js b/packages/edit-post/src/index.native.js
index b825d50ace0c01..613f394134e0ca 100644
--- a/packages/edit-post/src/index.native.js
+++ b/packages/edit-post/src/index.native.js
@@ -23,15 +23,18 @@ import Editor from './editor';
 export function initializeEditor( id, postType, postId ) {
 	dispatch( preferencesStore ).setDefaults( 'core/edit-post', {
 		editorMode: 'visual',
-		fixedToolbar: false,
 		fullscreenMode: true,
-		hiddenBlockTypes: [],
 		inactivePanels: [],
-		isPublishSidebarEnabled: true,
 		openPanels: [ 'post-status' ],
-		preferredStyleVariations: {},
 		welcomeGuide: true,
 	} );
+	dispatch( preferencesStore ).setDefaults( 'core', {
+		hiddenBlockTypes: [],
+		inactivePanels: [],
+		openPanels: [ 'post-status' ],
+		isPublishSidebarEnabled: true,
+		fixedToolbar: false,
+	} );
 
 	return <Editor postId={ postId } postType={ postType } />;
 }
diff --git a/packages/edit-post/src/lock-unlock.js b/packages/edit-post/src/lock-unlock.js
index bf65b262d9f484..6ef97785cd0a67 100644
--- a/packages/edit-post/src/lock-unlock.js
+++ b/packages/edit-post/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/edit-post'
 	);
diff --git a/packages/edit-post/src/plugins/copy-content-menu-item/index.js b/packages/edit-post/src/plugins/copy-content-menu-item/index.js
deleted file mode 100644
index 60bbbf9c83d6eb..00000000000000
--- a/packages/edit-post/src/plugins/copy-content-menu-item/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { MenuItem } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { useCopyToClipboard } from '@wordpress/compose';
-import { store as noticesStore } from '@wordpress/notices';
-import { store as editorStore } from '@wordpress/editor';
-
-export default function CopyContentMenuItem() {
-	const { createNotice } = useDispatch( noticesStore );
-	const { getEditedPostAttribute } = useSelect( editorStore );
-
-	function getText() {
-		return getEditedPostAttribute( 'content' );
-	}
-
-	function onSuccess() {
-		createNotice( 'info', __( 'All content copied.' ), {
-			isDismissible: true,
-			type: 'snackbar',
-		} );
-	}
-
-	const ref = useCopyToClipboard( getText, onSuccess );
-
-	return <MenuItem ref={ ref }>{ __( 'Copy all blocks' ) }</MenuItem>;
-}
diff --git a/packages/edit-post/src/plugins/index.js b/packages/edit-post/src/plugins/index.js
deleted file mode 100644
index aa663659acbdc1..00000000000000
--- a/packages/edit-post/src/plugins/index.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { MenuItem, VisuallyHidden } from '@wordpress/components';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as editorStore } from '@wordpress/editor';
-import { useSelect } from '@wordpress/data';
-import { external } from '@wordpress/icons';
-import { __ } from '@wordpress/i18n';
-import { registerPlugin } from '@wordpress/plugins';
-import { addQueryArgs } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
-import CopyContentMenuItem from './copy-content-menu-item';
-import KeyboardShortcutsHelpMenuItem from './keyboard-shortcuts-help-menu-item';
-import ToolsMoreMenuGroup from '../components/header/tools-more-menu-group';
-import WelcomeGuideMenuItem from './welcome-guide-menu-item';
-
-function ManagePatternsMenuItem() {
-	const url = useSelect( ( select ) => {
-		const { canUser } = select( coreStore );
-		const { getEditorSettings } = select( editorStore );
-
-		const isBlockTheme = getEditorSettings().__unstableIsBlockBasedTheme;
-		const defaultUrl = addQueryArgs( 'edit.php', {
-			post_type: 'wp_block',
-		} );
-		const patternsUrl = addQueryArgs( 'site-editor.php', {
-			path: '/patterns',
-		} );
-
-		// The site editor and templates both check whether the user has
-		// edit_theme_options capabilities. We can leverage that here and not
-		// display the manage patterns link if the user can't access it.
-		return canUser( 'read', 'templates' ) && isBlockTheme
-			? patternsUrl
-			: defaultUrl;
-	}, [] );
-
-	return (
-		<MenuItem role="menuitem" href={ url }>
-			{ __( 'Manage patterns' ) }
-		</MenuItem>
-	);
-}
-
-registerPlugin( 'edit-post', {
-	render() {
-		return (
-			<>
-				<ToolsMoreMenuGroup>
-					{ ( { onClose } ) => (
-						<>
-							<ManagePatternsMenuItem />
-							<KeyboardShortcutsHelpMenuItem
-								onSelect={ onClose }
-							/>
-							<WelcomeGuideMenuItem />
-							<CopyContentMenuItem />
-							<MenuItem
-								role="menuitem"
-								icon={ external }
-								href={ __(
-									'https://wordpress.org/documentation/article/wordpress-block-editor/'
-								) }
-								target="_blank"
-								rel="noopener noreferrer"
-							>
-								{ __( 'Help' ) }
-								<VisuallyHidden as="span">
-									{
-										/* translators: accessibility text */
-										__( '(opens in a new tab)' )
-									}
-								</VisuallyHidden>
-							</MenuItem>
-						</>
-					) }
-				</ToolsMoreMenuGroup>
-			</>
-		);
-	},
-} );
diff --git a/packages/edit-post/src/plugins/keyboard-shortcuts-help-menu-item/index.js b/packages/edit-post/src/plugins/keyboard-shortcuts-help-menu-item/index.js
deleted file mode 100644
index 930f420a241299..00000000000000
--- a/packages/edit-post/src/plugins/keyboard-shortcuts-help-menu-item/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { MenuItem } from '@wordpress/components';
-import { withDispatch } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { displayShortcut } from '@wordpress/keycodes';
-import { store as interfaceStore } from '@wordpress/interface';
-
-/**
- * Internal dependencies
- */
-import { KEYBOARD_SHORTCUT_HELP_MODAL_NAME } from '../../components/keyboard-shortcut-help-modal';
-
-export function KeyboardShortcutsHelpMenuItem( { openModal } ) {
-	return (
-		<MenuItem
-			onClick={ () => {
-				openModal( KEYBOARD_SHORTCUT_HELP_MODAL_NAME );
-			} }
-			shortcut={ displayShortcut.access( 'h' ) }
-		>
-			{ __( 'Keyboard shortcuts' ) }
-		</MenuItem>
-	);
-}
-
-export default withDispatch( ( dispatch ) => {
-	const { openModal } = dispatch( interfaceStore );
-
-	return {
-		openModal,
-	};
-} )( KeyboardShortcutsHelpMenuItem );
diff --git a/packages/edit-post/src/plugins/welcome-guide-menu-item/index.js b/packages/edit-post/src/plugins/welcome-guide-menu-item/index.js
deleted file mode 100644
index 394e148603eb0a..00000000000000
--- a/packages/edit-post/src/plugins/welcome-guide-menu-item/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { PreferenceToggleMenuItem } from '@wordpress/preferences';
-import { __ } from '@wordpress/i18n';
-import { store as editorStore } from '@wordpress/editor';
-
-export default function WelcomeGuideMenuItem() {
-	const isTemplateMode = useSelect(
-		( select ) => select( editorStore ).getRenderingMode() !== 'post-only',
-		[]
-	);
-
-	return (
-		<PreferenceToggleMenuItem
-			scope="core/edit-post"
-			name={ isTemplateMode ? 'welcomeGuideTemplate' : 'welcomeGuide' }
-			label={ __( 'Welcome Guide' ) }
-		/>
-	);
-}
diff --git a/packages/edit-post/src/store/actions.js b/packages/edit-post/src/store/actions.js
index 3d93e59c38a324..7ab0a965379be2 100644
--- a/packages/edit-post/src/store/actions.js
+++ b/packages/edit-post/src/store/actions.js
@@ -1,23 +1,23 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
 import apiFetch from '@wordpress/api-fetch';
-import { store as interfaceStore } from '@wordpress/interface';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { speak } from '@wordpress/a11y';
-import { store as noticesStore } from '@wordpress/notices';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { store as editorStore } from '@wordpress/editor';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 import deprecated from '@wordpress/deprecated';
-import { addFilter } from '@wordpress/hooks';
+import { addAction } from '@wordpress/hooks';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
 import { getMetaBoxContainer } from '../utils/meta-boxes';
-import { store as editPostStore } from '.';
+import { unlock } from '../lock-unlock';
+
+const { interfaceStore } = unlock( editorPrivateApis );
 
 /**
  * Returns an action object used in signalling that the user opened an editor sidebar.
@@ -26,16 +26,10 @@ import { store as editPostStore } from '.';
  */
 export const openGeneralSidebar =
 	( name ) =>
-	( { dispatch, registry } ) => {
-		const isDistractionFree = registry
-			.select( preferencesStore )
-			.get( 'core/edit-post', 'distractionFree' );
-		if ( isDistractionFree ) {
-			dispatch.toggleDistractionFree();
-		}
+	( { registry } ) => {
 		registry
 			.dispatch( interfaceStore )
-			.enableComplementaryArea( editPostStore.name, name );
+			.enableComplementaryArea( 'core', name );
 	};
 
 /**
@@ -44,9 +38,7 @@ export const openGeneralSidebar =
 export const closeGeneralSidebar =
 	() =>
 	( { registry } ) =>
-		registry
-			.dispatch( interfaceStore )
-			.disableComplementaryArea( editPostStore.name );
+		registry.dispatch( interfaceStore ).disableComplementaryArea( 'core' );
 
 /**
  * Returns an action object used in signalling that the user opened a modal.
@@ -88,41 +80,58 @@ export const closeModal =
 /**
  * Returns an action object used in signalling that the user opened the publish
  * sidebar.
+ * @deprecated
  *
  * @return {Object} Action object
  */
-export function openPublishSidebar() {
-	return {
-		type: 'OPEN_PUBLISH_SIDEBAR',
+export const openPublishSidebar =
+	() =>
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-post' ).openPublishSidebar", {
+			since: '6.6',
+			alternative: "dispatch( 'core/editor').openPublishSidebar",
+		} );
+		registry.dispatch( editorStore ).openPublishSidebar();
 	};
-}
 
 /**
  * Returns an action object used in signalling that the user closed the
  * publish sidebar.
+ * @deprecated
  *
  * @return {Object} Action object.
  */
-export function closePublishSidebar() {
-	return {
-		type: 'CLOSE_PUBLISH_SIDEBAR',
+export const closePublishSidebar =
+	() =>
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-post' ).closePublishSidebar", {
+			since: '6.6',
+			alternative: "dispatch( 'core/editor').closePublishSidebar",
+		} );
+		registry.dispatch( editorStore ).closePublishSidebar();
 	};
-}
 
 /**
  * Returns an action object used in signalling that the user toggles the publish sidebar.
+ * @deprecated
  *
  * @return {Object} Action object
  */
-export function togglePublishSidebar() {
-	return {
-		type: 'TOGGLE_PUBLISH_SIDEBAR',
+export const togglePublishSidebar =
+	() =>
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-post' ).togglePublishSidebar", {
+			since: '6.6',
+			alternative: "dispatch( 'core/editor').togglePublishSidebar",
+		} );
+		registry.dispatch( editorStore ).togglePublishSidebar();
 	};
-}
 
 /**
  * Returns an action object used to enable or disable a panel in the editor.
  *
+ * @deprecated
+ *
  * @param {string} panelName A string that identifies the panel to enable or disable.
  *
  * @return {Object} Action object.
@@ -130,73 +139,48 @@ export function togglePublishSidebar() {
 export const toggleEditorPanelEnabled =
 	( panelName ) =>
 	( { registry } ) => {
-		const inactivePanels =
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'inactivePanels' ) ?? [];
-
-		const isPanelInactive = !! inactivePanels?.includes( panelName );
-
-		// If the panel is inactive, remove it to enable it, else add it to
-		// make it inactive.
-		let updatedInactivePanels;
-		if ( isPanelInactive ) {
-			updatedInactivePanels = inactivePanels.filter(
-				( invactivePanelName ) => invactivePanelName !== panelName
-			);
-		} else {
-			updatedInactivePanels = [ ...inactivePanels, panelName ];
-		}
-
-		registry
-			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'inactivePanels', updatedInactivePanels );
+		deprecated( "dispatch( 'core/edit-post' ).toggleEditorPanelEnabled", {
+			since: '6.5',
+			alternative: "dispatch( 'core/editor').toggleEditorPanelEnabled",
+		} );
+		registry.dispatch( editorStore ).toggleEditorPanelEnabled( panelName );
 	};
 
 /**
  * Opens a closed panel and closes an open panel.
  *
+ * @deprecated
+ *
  * @param {string} panelName A string that identifies the panel to open or close.
  */
 export const toggleEditorPanelOpened =
 	( panelName ) =>
 	( { registry } ) => {
-		const openPanels =
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'openPanels' ) ?? [];
-
-		const isPanelOpen = !! openPanels?.includes( panelName );
-
-		// If the panel is open, remove it to close it, else add it to
-		// make it open.
-		let updatedOpenPanels;
-		if ( isPanelOpen ) {
-			updatedOpenPanels = openPanels.filter(
-				( openPanelName ) => openPanelName !== panelName
-			);
-		} else {
-			updatedOpenPanels = [ ...openPanels, panelName ];
-		}
-
-		registry
-			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'openPanels', updatedOpenPanels );
+		deprecated( "dispatch( 'core/edit-post' ).toggleEditorPanelOpened", {
+			since: '6.5',
+			alternative: "dispatch( 'core/editor').toggleEditorPanelOpened",
+		} );
+		registry.dispatch( editorStore ).toggleEditorPanelOpened( panelName );
 	};
 
 /**
  * Returns an action object used to remove a panel from the editor.
  *
+ * @deprecated
+ *
  * @param {string} panelName A string that identifies the panel to remove.
  *
  * @return {Object} Action object.
  */
-export function removeEditorPanel( panelName ) {
-	return {
-		type: 'REMOVE_PANEL',
-		panelName,
+export const removeEditorPanel =
+	( panelName ) =>
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-post' ).removeEditorPanel", {
+			since: '6.5',
+			alternative: "dispatch( 'core/editor').removeEditorPanel",
+		} );
+		registry.dispatch( editorStore ).removeEditorPanel( panelName );
 	};
-}
 
 /**
  * Triggers an action used to toggle a feature flag.
@@ -213,34 +197,18 @@ export const toggleFeature =
 /**
  * Triggers an action used to switch editor mode.
  *
+ * @deprecated
+ *
  * @param {string} mode The editor mode.
  */
 export const switchEditorMode =
 	( mode ) =>
-	( { dispatch, registry } ) => {
-		registry
-			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'editorMode', mode );
-
-		// Unselect blocks when we switch to the code editor.
-		if ( mode !== 'visual' ) {
-			registry.dispatch( blockEditorStore ).clearSelectedBlock();
-		}
-
-		if (
-			mode === 'text' &&
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'distractionFree' )
-		) {
-			dispatch.toggleDistractionFree();
-		}
-
-		const message =
-			mode === 'visual'
-				? __( 'Visual editor selected' )
-				: __( 'Code editor selected' );
-		speak( message, 'assertive' );
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-post' ).switchEditorMode", {
+			since: '6.6',
+			alternative: "dispatch( 'core/editor').switchEditorMode",
+		} );
+		registry.dispatch( editorStore ).switchEditorMode( mode );
 	};
 
 /**
@@ -253,59 +221,25 @@ export const togglePinnedPluginItem =
 	( { registry } ) => {
 		const isPinned = registry
 			.select( interfaceStore )
-			.isItemPinned( 'core/edit-post', pluginName );
+			.isItemPinned( 'core', pluginName );
 
 		registry
 			.dispatch( interfaceStore )
-			[ isPinned ? 'unpinItem' : 'pinItem' ](
-				'core/edit-post',
-				pluginName
-			);
+			[ isPinned ? 'unpinItem' : 'pinItem' ]( 'core', pluginName );
 	};
 
 /**
  * Returns an action object used in signaling that a style should be auto-applied when a block is created.
  *
- * @param {string}  blockName  Name of the block.
- * @param {?string} blockStyle Name of the style that should be auto applied. If undefined, the "auto apply" setting of the block is removed.
+ * @deprecated
  */
-export const updatePreferredStyleVariations =
-	( blockName, blockStyle ) =>
-	( { registry } ) => {
-		if ( ! blockName ) {
-			return;
-		}
-
-		const existingVariations =
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'preferredStyleVariations' ) ?? {};
-
-		// When the blockStyle is omitted, remove the block's preferred variation.
-		if ( ! blockStyle ) {
-			const updatedVariations = {
-				...existingVariations,
-			};
-
-			delete updatedVariations[ blockName ];
-
-			registry
-				.dispatch( preferencesStore )
-				.set(
-					'core/edit-post',
-					'preferredStyleVariations',
-					updatedVariations
-				);
-		} else {
-			// Else add the variation.
-			registry
-				.dispatch( preferencesStore )
-				.set( 'core/edit-post', 'preferredStyleVariations', {
-					...existingVariations,
-					[ blockName ]: blockStyle,
-				} );
-		}
-	};
+export function updatePreferredStyleVariations() {
+	deprecated( "dispatch( 'core/edit-post' ).updatePreferredStyleVariations", {
+		since: '6.6',
+		hint: 'Preferred Style Variations are not supported anymore.',
+	} );
+	return { type: 'NOTHING' };
+}
 
 /**
  * Update the provided block types to be visible.
@@ -315,21 +249,7 @@ export const updatePreferredStyleVariations =
 export const showBlockTypes =
 	( blockNames ) =>
 	( { registry } ) => {
-		const existingBlockNames =
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'hiddenBlockTypes' ) ?? [];
-
-		const newBlockNames = existingBlockNames.filter(
-			( type ) =>
-				! (
-					Array.isArray( blockNames ) ? blockNames : [ blockNames ]
-				).includes( type )
-		);
-
-		registry
-			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'hiddenBlockTypes', newBlockNames );
+		unlock( registry.dispatch( editorStore ) ).showBlockTypes( blockNames );
 	};
 
 /**
@@ -340,21 +260,7 @@ export const showBlockTypes =
 export const hideBlockTypes =
 	( blockNames ) =>
 	( { registry } ) => {
-		const existingBlockNames =
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'hiddenBlockTypes' ) ?? [];
-
-		const mergedBlockNames = new Set( [
-			...existingBlockNames,
-			...( Array.isArray( blockNames ) ? blockNames : [ blockNames ] ),
-		] );
-
-		registry
-			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'hiddenBlockTypes', [
-				...mergedBlockNames,
-			] );
+		unlock( registry.dispatch( editorStore ) ).hideBlockTypes( blockNames );
 	};
 
 /**
@@ -384,9 +290,21 @@ export const requestMetaBoxUpdates =
 			window.tinyMCE.triggerSave();
 		}
 
+		// We gather the base form data.
+		const baseFormData = new window.FormData(
+			document.querySelector( '.metabox-base-form' )
+		);
+
+		const postId = baseFormData.get( 'post_ID' );
+		const postType = baseFormData.get( 'post_type' );
+
 		// Additional data needed for backward compatibility.
 		// If we do not provide this data, the post will be overridden with the default values.
-		const post = registry.select( editorStore ).getCurrentPost();
+		// We cannot rely on getCurrentPost because right now on the editor we may be editing a pattern or a template.
+		// We need to retrieve the post that the base form data is referring to.
+		const post = registry
+			.select( coreStore )
+			.getEditedEntityRecord( 'postType', postType, postId );
 		const additionalData = [
 			post.comment_status
 				? [ 'comment_status', post.comment_status ]
@@ -396,10 +314,7 @@ export const requestMetaBoxUpdates =
 			post.author ? [ 'post_author', post.author ] : false,
 		].filter( Boolean );
 
-		// We gather all the metaboxes locations data and the base form data.
-		const baseFormData = new window.FormData(
-			document.querySelector( '.metabox-base-form' )
-		);
+		// We gather all the metaboxes locations.
 		const activeMetaBoxLocations = select.getActiveMetaBoxLocations();
 		const formDataToMerge = [
 			baseFormData,
@@ -457,57 +372,58 @@ export function metaBoxUpdatesFailure() {
 }
 
 /**
- * Returns an action object used to toggle the width of the editing canvas.
+ * Action that changes the width of the editing canvas.
  *
- * @param {string} deviceType
+ * @deprecated
  *
- * @return {Object} Action object.
+ * @param {string} deviceType
  */
-export function __experimentalSetPreviewDeviceType( deviceType ) {
-	return {
-		type: 'SET_PREVIEW_DEVICE_TYPE',
-		deviceType,
+export const __experimentalSetPreviewDeviceType =
+	( deviceType ) =>
+	( { registry } ) => {
+		deprecated(
+			"dispatch( 'core/edit-post' ).__experimentalSetPreviewDeviceType",
+			{
+				since: '6.5',
+				version: '6.7',
+				hint: 'registry.dispatch( editorStore ).setDeviceType',
+			}
+		);
+		registry.dispatch( editorStore ).setDeviceType( deviceType );
 	};
-}
 
 /**
  * Returns an action object used to open/close the inserter.
  *
- * @param {boolean|Object} value                Whether the inserter should be
- *                                              opened (true) or closed (false).
- *                                              To specify an insertion point,
- *                                              use an object.
- * @param {string}         value.rootClientId   The root client ID to insert at.
- * @param {number}         value.insertionIndex The index to insert at.
+ * @deprecated
  *
- * @return {Object} Action object.
+ * @param {boolean|Object} value Whether the inserter should be opened (true) or closed (false).
  */
-export function setIsInserterOpened( value ) {
-	return {
-		type: 'SET_IS_INSERTER_OPENED',
-		value,
+export const setIsInserterOpened =
+	( value ) =>
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-post' ).setIsInserterOpened", {
+			since: '6.5',
+			alternative: "dispatch( 'core/editor').setIsInserterOpened",
+		} );
+		registry.dispatch( editorStore ).setIsInserterOpened( value );
 	};
-}
 
 /**
  * Returns an action object used to open/close the list view.
  *
+ * @deprecated
+ *
  * @param {boolean} isOpen A boolean representing whether the list view should be opened or closed.
- * @return {Object} Action object.
  */
 export const setIsListViewOpened =
 	( isOpen ) =>
-	( { dispatch, registry } ) => {
-		const isDistractionFree = registry
-			.select( preferencesStore )
-			.get( 'core/edit-post', 'distractionFree' );
-		if ( isDistractionFree && isOpen ) {
-			dispatch.toggleDistractionFree();
-		}
-		dispatch( {
-			type: 'SET_IS_LIST_VIEW_OPENED',
-			isOpen,
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-post' ).setIsListViewOpened", {
+			since: '6.5',
+			alternative: "dispatch( 'core/editor').setIsListViewOpened",
 		} );
+		registry.dispatch( editorStore ).setIsListViewOpened( isOpen );
 	};
 
 /**
@@ -523,48 +439,17 @@ export function setIsEditingTemplate() {
 	return { type: 'NOTHING' };
 }
 
-/**
- * Switches to the template mode.
- *
- * @param {boolean} newTemplate Is new template.
- */
-export const __unstableSwitchToTemplateMode =
-	( newTemplate = false ) =>
-	( { registry, select } ) => {
-		registry.dispatch( editorStore ).setRenderingMode( 'template-only' );
-		const isWelcomeGuideActive = select.isFeatureActive(
-			'welcomeGuideTemplate'
-		);
-		if ( ! isWelcomeGuideActive ) {
-			const message = newTemplate
-				? __( "Custom template created. You're in template mode now." )
-				: __(
-						'Editing template. Changes made here affect all posts and pages that use the template.'
-				  );
-			registry.dispatch( noticesStore ).createSuccessNotice( message, {
-				type: 'snackbar',
-			} );
-		}
-	};
-
 /**
  * Create a block based template.
  *
- * @param {Object?} template Template to create and assign.
+ * @deprecated
  */
-export const __unstableCreateTemplate =
-	( template ) =>
-	async ( { registry } ) => {
-		const savedTemplate = await registry
-			.dispatch( coreStore )
-			.saveEntityRecord( 'postType', 'wp_template', template );
-		const post = registry.select( editorStore ).getCurrentPost();
-		registry
-			.dispatch( coreStore )
-			.editEntityRecord( 'postType', post.type, post.id, {
-				template: savedTemplate.slug,
-			} );
-	};
+export function __unstableCreateTemplate() {
+	deprecated( "dispatch( 'core/edit-post' ).__unstableCreateTemplate", {
+		since: '6.5',
+	} );
+	return { type: 'NOTHING' };
+}
 
 let metaBoxesInitialized = false;
 
@@ -593,21 +478,14 @@ export const initializeMetaBoxes =
 		metaBoxesInitialized = true;
 
 		// Save metaboxes on save completion, except for autosaves.
-		addFilter(
-			'editor.__unstableSavePost',
+		addAction(
+			'editor.savePost',
 			'core/edit-post/save-metaboxes',
-			( previous, options ) =>
-				previous.then( () => {
-					if ( options.isAutosave ) {
-						return;
-					}
-
-					if ( ! select.hasMetaBoxes() ) {
-						return;
-					}
-
-					return dispatch.requestMetaBoxUpdates();
-				} )
+			async ( post, options ) => {
+				if ( ! options.isAutosave && select.hasMetaBoxes() ) {
+					await dispatch.requestMetaBoxUpdates();
+				}
+			}
 		);
 
 		dispatch( {
@@ -619,41 +497,15 @@ export const initializeMetaBoxes =
  * Action that toggles Distraction free mode.
  * Distraction free mode expects there are no sidebars, as due to the
  * z-index values set, you can't close sidebars.
+ *
+ * @deprecated
  */
 export const toggleDistractionFree =
 	() =>
-	( { dispatch, registry } ) => {
-		const isDistractionFree = registry
-			.select( preferencesStore )
-			.get( 'core/edit-post', 'distractionFree' );
-		if ( ! isDistractionFree ) {
-			registry.batch( () => {
-				registry
-					.dispatch( preferencesStore )
-					.set( 'core/edit-post', 'fixedToolbar', true );
-				dispatch.setIsInserterOpened( false );
-				dispatch.setIsListViewOpened( false );
-				dispatch.closeGeneralSidebar();
-			} );
-		}
-		registry.batch( () => {
-			registry
-				.dispatch( preferencesStore )
-				.set(
-					'core/edit-post',
-					'distractionFree',
-					! isDistractionFree
-				);
-			registry
-				.dispatch( noticesStore )
-				.createInfoNotice(
-					isDistractionFree
-						? __( 'Distraction free off.' )
-						: __( 'Distraction free on.' ),
-					{
-						id: 'core/edit-post/distraction-free-mode/notice',
-						type: 'snackbar',
-					}
-				);
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-post' ).toggleDistractionFree", {
+			since: '6.6',
+			alternative: "dispatch( 'core/editor').toggleDistractionFree",
 		} );
+		registry.dispatch( editorStore ).toggleDistractionFree();
 	};
diff --git a/packages/edit-post/src/store/index.js b/packages/edit-post/src/store/index.js
index 567c022d2eb71b..17033b759292d7 100644
--- a/packages/edit-post/src/store/index.js
+++ b/packages/edit-post/src/store/index.js
@@ -9,7 +9,9 @@ import { createReduxStore, register } from '@wordpress/data';
 import reducer from './reducer';
 import * as actions from './actions';
 import * as selectors from './selectors';
+import * as privateSelectors from './private-selectors';
 import { STORE_NAME } from './constants';
+import { unlock } from '../lock-unlock';
 
 /**
  * Store definition for the edit post namespace.
@@ -23,5 +25,5 @@ export const store = createReduxStore( STORE_NAME, {
 	actions,
 	selectors,
 } );
-
 register( store );
+unlock( store ).registerPrivateSelectors( privateSelectors );
diff --git a/packages/edit-post/src/store/private-selectors.js b/packages/edit-post/src/store/private-selectors.js
new file mode 100644
index 00000000000000..246b2754d895ab
--- /dev/null
+++ b/packages/edit-post/src/store/private-selectors.js
@@ -0,0 +1,61 @@
+/**
+ * WordPress dependencies
+ */
+import { createRegistrySelector } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { store as editorStore } from '@wordpress/editor';
+
+export const getEditedPostTemplateId = createRegistrySelector(
+	( select ) => () => {
+		const {
+			id: postId,
+			type: postType,
+			slug,
+		} = select( editorStore ).getCurrentPost();
+		const { getEntityRecord, getEntityRecords, canUser } =
+			select( coreStore );
+		const siteSettings = canUser( 'read', {
+			kind: 'root',
+			name: 'site',
+		} )
+			? getEntityRecord( 'root', 'site' )
+			: undefined;
+		// First check if the current page is set as the posts page.
+		const isPostsPage = +postId === siteSettings?.page_for_posts;
+		if ( isPostsPage ) {
+			return select( coreStore ).getDefaultTemplateId( { slug: 'home' } );
+		}
+		const currentTemplate =
+			select( editorStore ).getEditedPostAttribute( 'template' );
+		if ( currentTemplate ) {
+			const templateWithSameSlug = getEntityRecords(
+				'postType',
+				'wp_template',
+				{ per_page: -1 }
+			)?.find( ( template ) => template.slug === currentTemplate );
+			if ( ! templateWithSameSlug ) {
+				return templateWithSameSlug;
+			}
+			return templateWithSameSlug.id;
+		}
+		let slugToCheck;
+		// In `draft` status we might not have a slug available, so we use the `single`
+		// post type templates slug(ex page, single-post, single-product etc..).
+		// Pages do not need the `single` prefix in the slug to be prioritized
+		// through template hierarchy.
+		if ( slug ) {
+			slugToCheck =
+				postType === 'page'
+					? `${ postType }-${ slug }`
+					: `single-${ postType }-${ slug }`;
+		} else {
+			slugToCheck = postType === 'page' ? 'page' : `single-${ postType }`;
+		}
+
+		if ( postType ) {
+			return select( coreStore ).getDefaultTemplateId( {
+				slug: slugToCheck,
+			} );
+		}
+	}
+);
diff --git a/packages/edit-post/src/store/reducer.js b/packages/edit-post/src/store/reducer.js
index 4748c4fff49723..edd316854fb576 100644
--- a/packages/edit-post/src/store/reducer.js
+++ b/packages/edit-post/src/store/reducer.js
@@ -3,37 +3,6 @@
  */
 import { combineReducers } from '@wordpress/data';
 
-/**
- * Reducer storing the list of all programmatically removed panels.
- *
- * @param {Array}  state  Current state.
- * @param {Object} action Action object.
- *
- * @return {Array} Updated state.
- */
-export function removedPanels( state = [], action ) {
-	switch ( action.type ) {
-		case 'REMOVE_PANEL':
-			if ( ! state.includes( action.panelName ) ) {
-				return [ ...state, action.panelName ];
-			}
-	}
-
-	return state;
-}
-
-export function publishSidebarActive( state = false, action ) {
-	switch ( action.type ) {
-		case 'OPEN_PUBLISH_SIDEBAR':
-			return true;
-		case 'CLOSE_PUBLISH_SIDEBAR':
-			return false;
-		case 'TOGGLE_PUBLISH_SIDEBAR':
-			return ! state;
-	}
-	return state;
-}
-
 /**
  * Reducer keeping track of the meta boxes isSaving state.
  * A "true" value means the meta boxes saving request is in-flight.
@@ -98,61 +67,6 @@ export function metaBoxLocations( state = {}, action ) {
 	return state;
 }
 
-/**
- * Reducer returning the editing canvas device type.
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- *
- * @return {Object} Updated state.
- */
-export function deviceType( state = 'Desktop', action ) {
-	switch ( action.type ) {
-		case 'SET_PREVIEW_DEVICE_TYPE':
-			return action.deviceType;
-	}
-
-	return state;
-}
-
-/**
- * Reducer to set the block inserter panel open or closed.
- *
- * Note: this reducer interacts with the list view panel reducer
- * to make sure that only one of the two panels is open at the same time.
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- */
-export function blockInserterPanel( state = false, action ) {
-	switch ( action.type ) {
-		case 'SET_IS_LIST_VIEW_OPENED':
-			return action.isOpen ? false : state;
-		case 'SET_IS_INSERTER_OPENED':
-			return action.value;
-	}
-	return state;
-}
-
-/**
- * Reducer to set the list view panel open or closed.
- *
- * Note: this reducer interacts with the inserter panel reducer
- * to make sure that only one of the two panels is open at the same time.
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- */
-export function listViewPanel( state = false, action ) {
-	switch ( action.type ) {
-		case 'SET_IS_INSERTER_OPENED':
-			return action.value ? false : state;
-		case 'SET_IS_LIST_VIEW_OPENED':
-			return action.isOpen;
-	}
-	return state;
-}
-
 /**
  * Reducer tracking whether meta boxes are initialized.
  *
@@ -177,9 +91,4 @@ const metaBoxes = combineReducers( {
 
 export default combineReducers( {
 	metaBoxes,
-	publishSidebarActive,
-	removedPanels,
-	deviceType,
-	blockInserterPanel,
-	listViewPanel,
 } );
diff --git a/packages/edit-post/src/store/selectors.js b/packages/edit-post/src/store/selectors.js
index f7b8f91d380dc0..8d85249e8100ba 100644
--- a/packages/edit-post/src/store/selectors.js
+++ b/packages/edit-post/src/store/selectors.js
@@ -1,25 +1,24 @@
-/**
- * External dependencies
- */
-import createSelector from 'rememo';
-
 /**
  * WordPress dependencies
  */
-import { createRegistrySelector } from '@wordpress/data';
-import { store as interfaceStore } from '@wordpress/interface';
+import { createSelector, createRegistrySelector } from '@wordpress/data';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { store as coreStore } from '@wordpress/core-data';
-import { store as editorStore } from '@wordpress/editor';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 import deprecated from '@wordpress/deprecated';
 
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../lock-unlock';
+import { getEditedPostTemplateId } from './private-selectors';
+
+const { interfaceStore } = unlock( editorPrivateApis );
 const EMPTY_ARRAY = [];
 const EMPTY_OBJECT = {};
-const EMPTY_INSERTION_POINT = {
-	rootClientId: undefined,
-	insertionIndex: undefined,
-	filterValue: undefined,
-};
 
 /**
  * Returns the current editing mode.
@@ -30,8 +29,7 @@ const EMPTY_INSERTION_POINT = {
  */
 export const getEditorMode = createRegistrySelector(
 	( select ) => () =>
-		select( preferencesStore ).get( 'core/edit-post', 'editorMode' ) ??
-		'visual'
+		select( preferencesStore ).get( 'core', 'editorMode' ) ?? 'visual'
 );
 
 /**
@@ -44,9 +42,7 @@ export const getEditorMode = createRegistrySelector(
 export const isEditorSidebarOpened = createRegistrySelector(
 	( select ) => () => {
 		const activeGeneralSidebar =
-			select( interfaceStore ).getActiveComplementaryArea(
-				'core/edit-post'
-			);
+			select( interfaceStore ).getActiveComplementaryArea( 'core' );
 		return [ 'edit-post/document', 'edit-post/block' ].includes(
 			activeGeneralSidebar
 		);
@@ -63,9 +59,7 @@ export const isEditorSidebarOpened = createRegistrySelector(
 export const isPluginSidebarOpened = createRegistrySelector(
 	( select ) => () => {
 		const activeGeneralSidebar =
-			select( interfaceStore ).getActiveComplementaryArea(
-				'core/edit-post'
-			);
+			select( interfaceStore ).getActiveComplementaryArea( 'core' );
 		return (
 			!! activeGeneralSidebar &&
 			! [ 'edit-post/document', 'edit-post/block' ].includes(
@@ -91,9 +85,7 @@ export const isPluginSidebarOpened = createRegistrySelector(
  */
 export const getActiveGeneralSidebarName = createRegistrySelector(
 	( select ) => () => {
-		return select( interfaceStore ).getActiveComplementaryArea(
-			'core/edit-post'
-		);
+		return select( interfaceStore ).getActiveComplementaryArea( 'core' );
 	}
 );
 
@@ -162,41 +154,34 @@ export const getPreferences = createRegistrySelector( ( select ) => () => {
 		alternative: `select( 'core/preferences' ).get`,
 	} );
 
-	// These preferences now exist in the preferences store.
-	// Fetch them so that they can be merged into the post
-	// editor preferences.
-	const preferences = [
-		'hiddenBlockTypes',
-		'editorMode',
-		'preferredStyleVariations',
-	].reduce( ( accumulatedPrefs, preferenceKey ) => {
-		const value = select( preferencesStore ).get(
-			'core/edit-post',
-			preferenceKey
-		);
+	const corePreferences = [ 'editorMode', 'hiddenBlockTypes' ].reduce(
+		( accumulatedPrefs, preferenceKey ) => {
+			const value = select( preferencesStore ).get(
+				'core',
+				preferenceKey
+			);
 
-		return {
-			...accumulatedPrefs,
-			[ preferenceKey ]: value,
-		};
-	}, {} );
+			return {
+				...accumulatedPrefs,
+				[ preferenceKey ]: value,
+			};
+		},
+		{}
+	);
 
 	// Panels were a preference, but the data structure changed when the state
 	// was migrated to the preferences store. They need to be converted from
 	// the new preferences store format to old format to ensure no breaking
 	// changes for plugins.
 	const inactivePanels = select( preferencesStore ).get(
-		'core/edit-post',
+		'core',
 		'inactivePanels'
 	);
-	const openPanels = select( preferencesStore ).get(
-		'core/edit-post',
-		'openPanels'
-	);
+	const openPanels = select( preferencesStore ).get( 'core', 'openPanels' );
 	const panels = convertPanelsToOldFormat( inactivePanels, openPanels );
 
 	return {
-		...preferences,
+		...corePreferences,
 		panels,
 	};
 } );
@@ -228,41 +213,57 @@ export function getPreference( state, preferenceKey, defaultValue ) {
  */
 export const getHiddenBlockTypes = createRegistrySelector( ( select ) => () => {
 	return (
-		select( preferencesStore ).get(
-			'core/edit-post',
-			'hiddenBlockTypes'
-		) ?? EMPTY_ARRAY
+		select( preferencesStore ).get( 'core', 'hiddenBlockTypes' ) ??
+		EMPTY_ARRAY
 	);
 } );
 
 /**
  * Returns true if the publish sidebar is opened.
  *
+ * @deprecated
+ *
  * @param {Object} state Global application state
  *
  * @return {boolean} Whether the publish sidebar is open.
  */
-export function isPublishSidebarOpened( state ) {
-	return state.publishSidebarActive;
-}
+export const isPublishSidebarOpened = createRegistrySelector(
+	( select ) => () => {
+		deprecated( `select( 'core/edit-post' ).isPublishSidebarOpened`, {
+			since: '6.6',
+			alternative: `select( 'core/editor' ).isPublishSidebarOpened`,
+		} );
+		return select( editorStore ).isPublishSidebarOpened();
+	}
+);
 
 /**
  * Returns true if the given panel was programmatically removed, or false otherwise.
  * All panels are not removed by default.
  *
+ * @deprecated
+ *
  * @param {Object} state     Global application state.
  * @param {string} panelName A string that identifies the panel.
  *
  * @return {boolean} Whether or not the panel is removed.
  */
-export function isEditorPanelRemoved( state, panelName ) {
-	return state.removedPanels.includes( panelName );
-}
+export const isEditorPanelRemoved = createRegistrySelector(
+	( select ) => ( state, panelName ) => {
+		deprecated( `select( 'core/edit-post' ).isEditorPanelRemoved`, {
+			since: '6.5',
+			alternative: `select( 'core/editor' ).isEditorPanelRemoved`,
+		} );
+		return select( editorStore ).isEditorPanelRemoved( panelName );
+	}
+);
 
 /**
  * Returns true if the given panel is enabled, or false otherwise. Panels are
  * enabled by default.
  *
+ * @deprecated
+ *
  * @param {Object} state     Global application state.
  * @param {string} panelName A string that identifies the panel.
  *
@@ -270,14 +271,11 @@ export function isEditorPanelRemoved( state, panelName ) {
  */
 export const isEditorPanelEnabled = createRegistrySelector(
 	( select ) => ( state, panelName ) => {
-		const inactivePanels = select( preferencesStore ).get(
-			'core/edit-post',
-			'inactivePanels'
-		);
-		return (
-			! isEditorPanelRemoved( state, panelName ) &&
-			! inactivePanels?.includes( panelName )
-		);
+		deprecated( `select( 'core/edit-post' ).isEditorPanelEnabled`, {
+			since: '6.5',
+			alternative: `select( 'core/editor' ).isEditorPanelEnabled`,
+		} );
+		return select( editorStore ).isEditorPanelEnabled( panelName );
 	}
 );
 
@@ -285,6 +283,8 @@ export const isEditorPanelEnabled = createRegistrySelector(
  * Returns true if the given panel is open, or false otherwise. Panels are
  * closed by default.
  *
+ * @deprecated
+ *
  * @param {Object} state     Global application state.
  * @param {string} panelName A string that identifies the panel.
  *
@@ -292,11 +292,11 @@ export const isEditorPanelEnabled = createRegistrySelector(
  */
 export const isEditorPanelOpened = createRegistrySelector(
 	( select ) => ( state, panelName ) => {
-		const openPanels = select( preferencesStore ).get(
-			'core/edit-post',
-			'openPanels'
-		);
-		return !! openPanels?.includes( panelName );
+		deprecated( `select( 'core/edit-post' ).isEditorPanelOpened`, {
+			since: '6.5',
+			alternative: `select( 'core/editor' ).isEditorPanelOpened`,
+		} );
+		return select( editorStore ).isEditorPanelOpened( panelName );
 	}
 );
 
@@ -345,10 +345,7 @@ export const isFeatureActive = createRegistrySelector(
  */
 export const isPluginItemPinned = createRegistrySelector(
 	( select ) => ( state, pluginName ) => {
-		return select( interfaceStore ).isItemPinned(
-			'core/edit-post',
-			pluginName
-		);
+		return select( interfaceStore ).isItemPinned( 'core', pluginName );
 	}
 );
 
@@ -376,14 +373,18 @@ export const getActiveMetaBoxLocations = createSelector(
  *
  * @return {boolean} Whether the meta box location is active and visible.
  */
-export function isMetaBoxLocationVisible( state, location ) {
-	return (
-		isMetaBoxLocationActive( state, location ) &&
-		getMetaBoxesPerLocation( state, location )?.some( ( { id } ) => {
-			return isEditorPanelEnabled( state, `meta-box-${ id }` );
-		} )
-	);
-}
+export const isMetaBoxLocationVisible = createRegistrySelector(
+	( select ) => ( state, location ) => {
+		return (
+			isMetaBoxLocationActive( state, location ) &&
+			getMetaBoxesPerLocation( state, location )?.some( ( { id } ) => {
+				return select( editorStore ).isEditorPanelEnabled(
+					`meta-box-${ id }`
+				);
+			} )
+		);
+	}
+);
 
 /**
  * Returns true if there is an active meta box in the given location, or false
@@ -450,39 +451,64 @@ export function isSavingMetaBoxes( state ) {
 /**
  * Returns the current editing canvas device type.
  *
+ * @deprecated
+ *
  * @param {Object} state Global application state.
  *
  * @return {string} Device type.
  */
-export function __experimentalGetPreviewDeviceType( state ) {
-	return state.deviceType;
-}
+export const __experimentalGetPreviewDeviceType = createRegistrySelector(
+	( select ) => () => {
+		deprecated(
+			`select( 'core/edit-site' ).__experimentalGetPreviewDeviceType`,
+			{
+				since: '6.5',
+				version: '6.7',
+				alternative: `select( 'core/editor' ).getDeviceType`,
+			}
+		);
+		return select( editorStore ).getDeviceType();
+	}
+);
 
 /**
  * Returns true if the inserter is opened.
  *
+ * @deprecated
+ *
  * @param {Object} state Global application state.
  *
  * @return {boolean} Whether the inserter is opened.
  */
-export function isInserterOpened( state ) {
-	return !! state.blockInserterPanel;
-}
+export const isInserterOpened = createRegistrySelector( ( select ) => () => {
+	deprecated( `select( 'core/edit-post' ).isInserterOpened`, {
+		since: '6.5',
+		alternative: `select( 'core/editor' ).isInserterOpened`,
+	} );
+	return select( editorStore ).isInserterOpened();
+} );
 
 /**
  * Get the insertion point for the inserter.
  *
+ * @deprecated
+ *
  * @param {Object} state Global application state.
  *
  * @return {Object} The root client ID, index to insert at and starting filter value.
  */
-export function __experimentalGetInsertionPoint( state ) {
-	if ( typeof state.blockInserterPanel === 'boolean' ) {
-		return EMPTY_INSERTION_POINT;
+export const __experimentalGetInsertionPoint = createRegistrySelector(
+	( select ) => () => {
+		deprecated(
+			`select( 'core/edit-post' ).__experimentalGetInsertionPoint`,
+			{
+				since: '6.5',
+				version: '6.7',
+			}
+		);
+		return unlock( select( editorStore ) ).getInserter();
 	}
-
-	return state.blockInserterPanel;
-}
+);
 
 /**
  * Returns true if the list view is opened.
@@ -491,9 +517,13 @@ export function __experimentalGetInsertionPoint( state ) {
  *
  * @return {boolean} Whether the list view is opened.
  */
-export function isListViewOpened( state ) {
-	return state.listViewPanel;
-}
+export const isListViewOpened = createRegistrySelector( ( select ) => () => {
+	deprecated( `select( 'core/edit-post' ).isListViewOpened`, {
+		since: '6.5',
+		alternative: `select( 'core/editor' ).isListViewOpened`,
+	} );
+	return select( editorStore ).isListViewOpened();
+} );
 
 /**
  * Returns true if the template editing mode is enabled.
@@ -505,7 +535,7 @@ export const isEditingTemplate = createRegistrySelector( ( select ) => () => {
 		since: '6.5',
 		alternative: `select( 'core/editor' ).getRenderingMode`,
 	} );
-	return select( editorStore ).getRenderingMode() !== 'post-only';
+	return select( editorStore ).getCurrentPostType() === 'wp_template';
 } );
 
 /**
@@ -525,30 +555,15 @@ export function areMetaBoxesInitialized( state ) {
  * @return {Object?} Post Template.
  */
 export const getEditedPostTemplate = createRegistrySelector(
-	( select ) => () => {
-		const currentTemplate =
-			select( editorStore ).getEditedPostAttribute( 'template' );
-		if ( currentTemplate ) {
-			const templateWithSameSlug = select( coreStore )
-				.getEntityRecords( 'postType', 'wp_template', { per_page: -1 } )
-				?.find( ( template ) => template.slug === currentTemplate );
-			if ( ! templateWithSameSlug ) {
-				return templateWithSameSlug;
-			}
-			return select( coreStore ).getEditedEntityRecord(
-				'postType',
-				'wp_template',
-				templateWithSameSlug.id
-			);
+	( select ) => ( state ) => {
+		const templateId = getEditedPostTemplateId( state );
+		if ( ! templateId ) {
+			return undefined;
 		}
-
-		const post = select( editorStore ).getCurrentPost();
-		if ( post.link ) {
-			return select( coreStore ).__experimentalGetTemplateForLink(
-				post.link
-			);
-		}
-
-		return null;
+		return select( coreStore ).getEditedEntityRecord(
+			'postType',
+			'wp_template',
+			templateId
+		);
 	}
 );
diff --git a/packages/edit-post/src/store/test/actions.js b/packages/edit-post/src/store/test/actions.js
index 39b889f2fdcbc0..73918dabb93b97 100644
--- a/packages/edit-post/src/store/test/actions.js
+++ b/packages/edit-post/src/store/test/actions.js
@@ -2,17 +2,22 @@
  * WordPress dependencies
  */
 import { createRegistry } from '@wordpress/data';
-import { store as interfaceStore } from '@wordpress/interface';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { store as noticesStore } from '@wordpress/notices';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
-import { store as editorStore } from '@wordpress/editor';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
 import { store as editPostStore } from '..';
+import { unlock } from '../../lock-unlock';
+
+const { interfaceStore } = unlock( editorPrivateApis );
 
 function createRegistryWithStores() {
 	// Create a registry and register used stores.
@@ -40,7 +45,7 @@ describe( 'actions', () => {
 		expect(
 			registry
 				.select( interfaceStore )
-				.getActiveComplementaryArea( 'core/edit-post' )
+				.getActiveComplementaryArea( 'core' )
 		).toBe( 'test/sidebar' );
 
 		registry
@@ -49,24 +54,10 @@ describe( 'actions', () => {
 		expect(
 			registry
 				.select( interfaceStore )
-				.getActiveComplementaryArea( 'core/edit-post' )
+				.getActiveComplementaryArea( 'core' )
 		).toBeNull();
 	} );
 
-	it( 'openGeneralSidebar - should turn off distraction free mode when opening a general sidebar', () => {
-		registry
-			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'distractionFree', true );
-		registry
-			.dispatch( editPostStore )
-			.openGeneralSidebar( 'edit-post/block' );
-		expect(
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'distractionFree' )
-		).toBe( false );
-	} );
-
 	it( 'toggleFeature', () => {
 		registry.dispatch( editPostStore ).toggleFeature( 'welcomeGuide' );
 		expect(
@@ -83,66 +74,16 @@ describe( 'actions', () => {
 		).toBe( false );
 	} );
 
-	describe( 'switchEditorMode', () => {
-		it( 'to visual', () => {
-			// Switch to text first, since the default is visual.
-			registry.dispatch( editPostStore ).switchEditorMode( 'text' );
-			expect( registry.select( editPostStore ).getEditorMode() ).toEqual(
-				'text'
-			);
-			registry.dispatch( editPostStore ).switchEditorMode( 'visual' );
-			expect( registry.select( editPostStore ).getEditorMode() ).toEqual(
-				'visual'
-			);
-		} );
-
-		it( 'to text', () => {
-			// It defaults to visual.
-			expect( registry.select( editPostStore ).getEditorMode() ).toEqual(
-				'visual'
-			);
-			// Add a selected client id and make sure it's there.
-			const clientId = 'clientId_1';
-			registry.dispatch( blockEditorStore ).selectionChange( clientId );
-			expect(
-				registry.select( blockEditorStore ).getSelectedBlockClientId()
-			).toEqual( clientId );
-
-			registry.dispatch( editPostStore ).switchEditorMode( 'text' );
-			expect(
-				registry.select( blockEditorStore ).getSelectedBlockClientId()
-			).toBeNull();
-			expect( registry.select( editPostStore ).getEditorMode() ).toEqual(
-				'text'
-			);
-		} );
-		it( 'should turn off distraction free mode when switching to code editor', () => {
-			registry
-				.dispatch( preferencesStore )
-				.set( 'core/edit-post', 'distractionFree', true );
-			registry.dispatch( editPostStore ).switchEditorMode( 'text' );
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-post', 'distractionFree' )
-			).toBe( false );
-		} );
-	} );
-
 	it( 'togglePinnedPluginItem', () => {
 		registry.dispatch( editPostStore ).togglePinnedPluginItem( 'rigatoni' );
 		// Sidebars are pinned by default.
 		// @See https://github.com/WordPress/gutenberg/pull/21645
 		expect(
-			registry
-				.select( interfaceStore )
-				.isItemPinned( editPostStore.name, 'rigatoni' )
+			registry.select( interfaceStore ).isItemPinned( 'core', 'rigatoni' )
 		).toBe( false );
 		registry.dispatch( editPostStore ).togglePinnedPluginItem( 'rigatoni' );
 		expect(
-			registry
-				.select( interfaceStore )
-				.isItemPinned( editPostStore.name, 'rigatoni' )
+			registry.select( interfaceStore ).isItemPinned( 'core', 'rigatoni' )
 		).toBe( true );
 	} );
 
@@ -156,16 +97,13 @@ describe( 'actions', () => {
 
 			expect(
 				registry
-					.select( editPostStore )
-					.getPreference( 'hiddenBlockTypes' )
+					.select( preferencesStore )
+					.get( 'core', 'hiddenBlockTypes' )
 			).toEqual( expected );
 
 			expect(
 				registry.select( editPostStore ).getHiddenBlockTypes()
 			).toEqual( expected );
-
-			// Expect a deprecation message for `getPreference`.
-			expect( console ).toHaveWarned();
 		} );
 	} );
 
@@ -179,8 +117,8 @@ describe( 'actions', () => {
 
 			expect(
 				registry
-					.select( editPostStore )
-					.getPreference( 'hiddenBlockTypes' )
+					.select( preferencesStore )
+					.get( 'core', 'hiddenBlockTypes' )
 			).toEqual( expectedA );
 
 			expect(
@@ -195,8 +133,8 @@ describe( 'actions', () => {
 
 			expect(
 				registry
-					.select( editPostStore )
-					.getPreference( 'hiddenBlockTypes' )
+					.select( preferencesStore )
+					.get( 'core', 'hiddenBlockTypes' )
 			).toEqual( expectedB );
 
 			expect(
@@ -204,180 +142,4 @@ describe( 'actions', () => {
 			).toEqual( expectedB );
 		} );
 	} );
-
-	describe( 'toggleEditorPanelEnabled', () => {
-		it( 'toggles panels to be enabled and not enabled', () => {
-			// This will switch it off, since the default is on.
-			registry
-				.dispatch( editPostStore )
-				.toggleEditorPanelEnabled( 'control-panel' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.isEditorPanelEnabled( 'control-panel' )
-			).toBe( false );
-
-			// Also check that the `getPreference` selector includes panels.
-			expect(
-				registry.select( editPostStore ).getPreference( 'panels' )
-			).toEqual( {
-				'control-panel': {
-					enabled: false,
-				},
-			} );
-
-			// Switch it on again.
-			registry
-				.dispatch( editPostStore )
-				.toggleEditorPanelEnabled( 'control-panel' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.isEditorPanelEnabled( 'control-panel' )
-			).toBe( true );
-
-			expect(
-				registry.select( editPostStore ).getPreference( 'panels' )
-			).toEqual( {} );
-		} );
-	} );
-
-	describe( 'toggleEditorPanelOpened', () => {
-		it( 'toggles panels open and closed', () => {
-			// This will open it, since the default is closed.
-			registry
-				.dispatch( editPostStore )
-				.toggleEditorPanelOpened( 'control-panel' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.isEditorPanelOpened( 'control-panel' )
-			).toBe( true );
-
-			expect(
-				registry.select( editPostStore ).getPreference( 'panels' )
-			).toEqual( {
-				'control-panel': {
-					opened: true,
-				},
-			} );
-
-			// Close it.
-			registry
-				.dispatch( editPostStore )
-				.toggleEditorPanelOpened( 'control-panel' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.isEditorPanelOpened( 'control-panel' )
-			).toBe( false );
-
-			expect(
-				registry.select( editPostStore ).getPreference( 'panels' )
-			).toEqual( {} );
-		} );
-	} );
-
-	describe( 'updatePreferredStyleVariations', () => {
-		it( 'sets a preferred style variation for a block when a style name is passed', () => {
-			registry
-				.dispatch( 'core/edit-post' )
-				.updatePreferredStyleVariations( 'core/paragraph', 'fancy' );
-			registry
-				.dispatch( 'core/edit-post' )
-				.updatePreferredStyleVariations( 'core/quote', 'posh' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.getPreference( 'preferredStyleVariations' )
-			).toEqual( {
-				'core/paragraph': 'fancy',
-				'core/quote': 'posh',
-			} );
-		} );
-
-		it( 'removes a preferred style variation for a block when a style name is omitted', () => {
-			registry
-				.dispatch( 'core/edit-post' )
-				.updatePreferredStyleVariations( 'core/paragraph', 'fancy' );
-			registry
-				.dispatch( 'core/edit-post' )
-				.updatePreferredStyleVariations( 'core/quote', 'posh' );
-			expect(
-				registry
-					.select( editPostStore )
-					.getPreference( 'preferredStyleVariations' )
-			).toEqual( {
-				'core/paragraph': 'fancy',
-				'core/quote': 'posh',
-			} );
-
-			registry
-				.dispatch( 'core/edit-post' )
-				.updatePreferredStyleVariations( 'core/paragraph' );
-
-			expect(
-				registry
-					.select( editPostStore )
-					.getPreference( 'preferredStyleVariations' )
-			).toEqual( {
-				'core/quote': 'posh',
-			} );
-		} );
-	} );
-
-	describe( 'toggleDistractionFree', () => {
-		it( 'should properly update settings to prevent layout corruption when enabling distraction free mode', () => {
-			// Enable everything that shouldn't be enabled in distraction free mode.
-			registry
-				.dispatch( preferencesStore )
-				.set( 'core/edit-post', 'fixedToolbar', true );
-			registry.dispatch( editPostStore ).setIsListViewOpened( true );
-			registry
-				.dispatch( editPostStore )
-				.openGeneralSidebar( 'edit-post/block' );
-			// Initial state is falsy.
-			registry.dispatch( editPostStore ).toggleDistractionFree();
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-post', 'fixedToolbar' )
-			).toBe( true );
-			expect( registry.select( editPostStore ).isListViewOpened() ).toBe(
-				false
-			);
-			expect( registry.select( editPostStore ).isInserterOpened() ).toBe(
-				false
-			);
-			expect(
-				registry
-					.select( interfaceStore )
-					.getActiveComplementaryArea( editPostStore.name )
-			).toBeNull();
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-post', 'distractionFree' )
-			).toBe( true );
-		} );
-	} );
-
-	describe( 'setIsListViewOpened', () => {
-		it( 'should turn off distraction free mode when opening the list view', () => {
-			registry
-				.dispatch( preferencesStore )
-				.set( 'core/edit-post', 'distractionFree', true );
-			registry.dispatch( editPostStore ).setIsListViewOpened( true );
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-post', 'distractionFree' )
-			).toBe( false );
-		} );
-	} );
 } );
diff --git a/packages/edit-post/src/store/test/reducer.js b/packages/edit-post/src/store/test/reducer.js
index 2e8d923d022f36..6e4055b2998022 100644
--- a/packages/edit-post/src/store/test/reducer.js
+++ b/packages/edit-post/src/store/test/reducer.js
@@ -1,20 +1,7 @@
-/**
- * External dependencies
- */
-import deepFreeze from 'deep-freeze';
-
 /**
  * Internal dependencies
  */
-import {
-	isSavingMetaBoxes,
-	metaBoxLocations,
-	removedPanels,
-	blockInserterPanel,
-	listViewPanel,
-} from '../reducer';
-
-import { setIsInserterOpened } from '../actions';
+import { isSavingMetaBoxes, metaBoxLocations } from '../reducer';
 
 describe( 'state', () => {
 	describe( 'isSavingMetaBoxes', () => {
@@ -94,98 +81,4 @@ describe( 'state', () => {
 			} );
 		} );
 	} );
-
-	describe( 'removedPanels', () => {
-		it( 'should remove panel', () => {
-			const original = deepFreeze( [] );
-			const state = removedPanels( original, {
-				type: 'REMOVE_PANEL',
-				panelName: 'post-status',
-			} );
-			expect( state ).toEqual( [ 'post-status' ] );
-		} );
-
-		it( 'should not remove already removed panel', () => {
-			const original = deepFreeze( [ 'post-status' ] );
-			const state = removedPanels( original, {
-				type: 'REMOVE_PANEL',
-				panelName: 'post-status',
-			} );
-			expect( state ).toBe( original );
-		} );
-	} );
-
-	describe( 'blockInserterPanel()', () => {
-		it( 'should apply default state', () => {
-			expect( blockInserterPanel( undefined, {} ) ).toEqual( false );
-		} );
-
-		it( 'should default to returning the same state', () => {
-			expect( blockInserterPanel( true, {} ) ).toBe( true );
-		} );
-
-		it( 'should set the open state of the inserter panel', () => {
-			expect(
-				blockInserterPanel( false, setIsInserterOpened( true ) )
-			).toBe( true );
-			expect(
-				blockInserterPanel( true, setIsInserterOpened( false ) )
-			).toBe( false );
-		} );
-
-		it( 'should close the inserter when opening the list view panel', () => {
-			expect(
-				blockInserterPanel( true, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: true,
-				} )
-			).toBe( false );
-		} );
-
-		it( 'should not change the state when closing the list view panel', () => {
-			expect(
-				blockInserterPanel( true, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: false,
-				} )
-			).toBe( true );
-		} );
-	} );
-
-	describe( 'listViewPanel()', () => {
-		it( 'should apply default state', () => {
-			expect( listViewPanel( undefined, {} ) ).toEqual( false );
-		} );
-
-		it( 'should default to returning the same state', () => {
-			expect( listViewPanel( true, {} ) ).toBe( true );
-		} );
-
-		it( 'should set the open state of the list view panel', () => {
-			expect(
-				listViewPanel( false, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: true,
-				} )
-			).toBe( true );
-			expect(
-				listViewPanel( true, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: false,
-				} )
-			).toBe( false );
-		} );
-
-		it( 'should close the list view when opening the inserter panel', () => {
-			expect( listViewPanel( true, setIsInserterOpened( true ) ) ).toBe(
-				false
-			);
-		} );
-
-		it( 'should not change the state when closing the inserter panel', () => {
-			expect( listViewPanel( true, setIsInserterOpened( false ) ) ).toBe(
-				true
-			);
-		} );
-	} );
 } );
diff --git a/packages/edit-post/src/store/test/selectors.js b/packages/edit-post/src/store/test/selectors.js
index 34c66ed7cf8e67..5098c6f95ad221 100644
--- a/packages/edit-post/src/store/test/selectors.js
+++ b/packages/edit-post/src/store/test/selectors.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import deepFreeze from 'deep-freeze';
-
 /**
  * Internal dependencies
  */
@@ -11,32 +6,9 @@ import {
 	isSavingMetaBoxes,
 	getActiveMetaBoxLocations,
 	isMetaBoxLocationActive,
-	isEditorPanelRemoved,
-	isInserterOpened,
-	isListViewOpened,
 } from '../selectors';
 
 describe( 'selectors', () => {
-	describe( 'isEditorPanelRemoved', () => {
-		it( 'should return false by default', () => {
-			const state = deepFreeze( {
-				removedPanels: [],
-			} );
-
-			expect( isEditorPanelRemoved( state, 'post-status' ) ).toBe(
-				false
-			);
-		} );
-
-		it( 'should return true when panel was removed', () => {
-			const state = deepFreeze( {
-				removedPanels: [ 'post-status' ],
-			} );
-
-			expect( isEditorPanelRemoved( state, 'post-status' ) ).toBe( true );
-		} );
-	} );
-
 	describe( 'hasMetaBoxes', () => {
 		it( 'should return true if there are active meta boxes', () => {
 			const state = {
@@ -133,26 +105,4 @@ describe( 'selectors', () => {
 			expect( result ).toBe( true );
 		} );
 	} );
-
-	describe( 'isInserterOpened', () => {
-		it( 'returns the block inserter panel isOpened state', () => {
-			const state = {
-				blockInserterPanel: true,
-			};
-			expect( isInserterOpened( state ) ).toBe( true );
-			state.blockInserterPanel = false;
-			expect( isInserterOpened( state ) ).toBe( false );
-		} );
-	} );
-
-	describe( 'isListViewOpened', () => {
-		it( 'returns the list view panel isOpened state', () => {
-			const state = {
-				listViewPanel: true,
-			};
-			expect( isListViewOpened( state ) ).toBe( true );
-			state.listViewPanel = false;
-			expect( isListViewOpened( state ) ).toBe( false );
-		} );
-	} );
 } );
diff --git a/packages/edit-post/src/style.scss b/packages/edit-post/src/style.scss
index 474467ab2e25a4..7230d7b2b15e66 100644
--- a/packages/edit-post/src/style.scss
+++ b/packages/edit-post/src/style.scss
@@ -1,40 +1,7 @@
-@import "../../interface/src/style.scss";
-@import "./components/header/style.scss";
-@import "./components/header/fullscreen-mode-close/style.scss";
-@import "./components/header/header-toolbar/style.scss";
-@import "./components/keyboard-shortcut-help-modal/style.scss";
+@import "./components/back-button/style.scss";
 @import "./components/layout/style.scss";
-@import "./components/block-manager/style.scss";
 @import "./components/meta-boxes/meta-boxes-area/style.scss";
-@import "./components/secondary-sidebar/style.scss";
-@import "./components/sidebar/style.scss";
-@import "./components/sidebar/last-revision/style.scss";
-@import "./components/sidebar/post-format/style.scss";
-@import "./components/sidebar/post-slug/style.scss";
-@import "./components/sidebar/post-template/style.scss";
-@import "./components/sidebar/post-visibility/style.scss";
-@import "./components/sidebar/settings-header/style.scss";
-@import "./components/sidebar/template-summary/style.scss";
-@import "./components/text-editor/style.scss";
-@import "./components/visual-editor/style.scss";
 @import "./components/welcome-guide/style.scss";
-@import "./components/start-page-options/style.scss";
-
-/**
- * Animations
- */
-
-// These keyframes should not be part of the _animations.scss mixins file.
-// Because keyframe animations can't be defined as mixins properly, they are duplicated.
-// Since hey are intended only for the editor, we add them here instead.
-@keyframes edit-post__fade-in-animation {
-	from {
-		opacity: 0;
-	}
-	to {
-		opacity: 1;
-	}
-}
 
 body.js.block-editor-page {
 	@include wp-admin-reset( ".block-editor" );
@@ -48,14 +15,13 @@ body.js.block-editor-page {
 	}
 }
 
-// Target the editor UI excluding the visual editor contents, metaboxes and custom fields areas.
-.edit-post-header,
-.edit-post-text-editor,
-.edit-post-sidebar,
+// Target the editor UI excluding the non-iframed visual editor contents, metaboxes
+//  and custom fields areas.
+.editor-header,
+.editor-text-editor,
+.editor-sidebar,
 .editor-post-publish-panel,
-.components-popover,
-.components-modal__frame,
-.edit-post-editor__inserter-panel {
+.edit-post-visual-editor.is-iframed {
 	@include reset;
 }
 
@@ -87,18 +53,3 @@ body.js.block-editor-page {
 }
 
 @include wordpress-admin-schemes();
-
-// The edit-site package adds or removes the sidebar when it's opened or closed.
-// The edit-post package, however, always has the sidebar in the canvas.
-// These edit-post specific rules ensures there isn't a border on the right of
-// the canvas when a sidebar is visually closed.
-.interface-interface-skeleton__sidebar {
-	border-left: none;
-
-	.is-sidebar-opened & {
-		@include break-medium() {
-			border-left: $border-width solid $gray-200;
-			overflow: hidden scroll;
-		}
-	}
-}
diff --git a/packages/edit-post/src/test/__snapshots__/editor.native.js.snap b/packages/edit-post/src/test/__snapshots__/editor.native.js.snap
new file mode 100644
index 00000000000000..4a88b249a1db66
--- /dev/null
+++ b/packages/edit-post/src/test/__snapshots__/editor.native.js.snap
@@ -0,0 +1,105 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Editor adds empty image block when pasting unsupported HTML local image path 1`] = `
+"<!-- wp:image -->
+<figure class="wp-block-image"><img src="" alt=""/></figure>
+<!-- /wp:image -->"
+`;
+
+exports[`Editor adds image block when pasting HTML local image path 1`] = `
+"<!-- wp:image -->
+<figure class="wp-block-image"><img src="file:///path/to/file.png" alt=""/></figure>
+<!-- /wp:image -->"
+`;
+
+exports[`Editor appends media correctly for allowed types 1`] = `
+"<!-- wp:image -->
+<figure class="wp-block-image"><img src="https://test-site.files.wordpress.com/local-image-1.jpeg" alt=""/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image -->
+<figure class="wp-block-image"><img src="https://test-site.files.wordpress.com/local-image-3.jpeg" alt=""/></figure>
+<!-- /wp:image -->"
+`;
+
+exports[`Editor appends media correctly for allowed types and skips unsupported ones 1`] = `
+"<!-- wp:image -->
+<figure class="wp-block-image"><img src="https://test-site.files.wordpress.com/local-image-1.jpeg" alt=""/></figure>
+<!-- /wp:image -->
+
+<!-- wp:video -->
+<figure class="wp-block-video"><video controls src="file:///local-video-4.mp4"></video></figure>
+<!-- /wp:video -->"
+`;
+
+exports[`Editor on content update parses markdown into blocks 1`] = `
+"<!-- wp:paragraph -->
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing<br />elit.</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:heading -->
+<h2 class="wp-block-heading">Overview</h2>
+<!-- /wp:heading -->
+
+<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li>Lorem ipsum dolor sit amet</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Consectetur adipiscing<br>elit</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Integer nec odio</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->
+
+<!-- wp:heading -->
+<h2 class="wp-block-heading">Details</h2>
+<!-- /wp:heading -->
+
+<!-- wp:list {"ordered":true} -->
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li>Sed cursus ante dapibus diam</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Nulla quis sem at nibh elementum imperdiet</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Duis sagittis ipsum <code>## Mixed Lists</code></li>
+<!-- /wp:list-item --></ol>
+<!-- /wp:list -->
+
+<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li>Key Points:</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->
+
+<!-- wp:list {"ordered":true} -->
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li>Lorem ipsum dolor sit amet</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li><br>Consectetur adipiscing elit</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Integer nec odio</li>
+<!-- /wp:list-item --></ol>
+<!-- /wp:list -->
+
+<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li>Additional Info:<br>-<br>Sed cursus ante dapibus diam</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Nulla quis sem at nibh elementum imperdiet</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->"
+`;
diff --git a/packages/edit-post/src/test/editor.native.js b/packages/edit-post/src/test/editor.native.js
index 4911fb5128655c..8fe116758608b5 100644
--- a/packages/edit-post/src/test/editor.native.js
+++ b/packages/edit-post/src/test/editor.native.js
@@ -6,93 +6,258 @@ import {
 	addBlock,
 	fireEvent,
 	getBlock,
+	getEditorHtml,
+	getEditorTitle,
 	initializeEditor,
-	render,
+	pasteIntoRichText,
+	screen,
 	setupCoreBlocks,
+	within,
 } from 'test/helpers';
+import { BackHandler } from 'react-native';
 
 /**
  * WordPress dependencies
  */
-import RNReactNativeGutenbergBridge, {
+import {
+	requestMediaImport,
+	subscribeMediaAppend,
 	subscribeParentToggleHTMLMode,
+	subscribeToContentUpdate,
 } from '@wordpress/react-native-bridge';
-// Force register 'core/editor' store.
-import { store } from '@wordpress/editor'; // eslint-disable-line no-unused-vars
 
-/**
- * Internal dependencies
- */
-import '..';
-import Editor from '../editor';
+setupCoreBlocks();
 
-const unsupportedBlock = `
-<!-- wp:notablock -->
-<p>Not supported</p>
-<!-- /wp:notablock -->
-`;
+let toggleModeCallback;
+subscribeParentToggleHTMLMode.mockImplementation( ( callback ) => {
+	toggleModeCallback = callback;
+} );
 
-beforeAll( () => {
-	jest.useFakeTimers( { legacyFakeTimers: true } );
+let mediaAppendCallback;
+subscribeMediaAppend.mockImplementation( ( callback ) => {
+	mediaAppendCallback = callback;
 } );
 
-afterAll( () => {
-	jest.runOnlyPendingTimers();
-	jest.useRealTimers();
+let onContentUpdateCallback;
+subscribeToContentUpdate.mockImplementation( ( callback ) => {
+	onContentUpdateCallback = callback;
 } );
 
-setupCoreBlocks();
+const MEDIA = [
+	{
+		localId: 1,
+		mediaUrl: 'file:///local-image-1.jpeg',
+		mediaType: 'image',
+		serverId: 2000,
+		serverUrl: 'https://test-site.files.wordpress.com/local-image-1.jpeg',
+	},
+	{
+		localId: 2,
+		mediaUrl: 'file:///local-file-1.pdf',
+		mediaType: 'other',
+		serverId: 2001,
+		serverUrl: 'https://test-site.files.wordpress.com/local-file-1.pdf',
+	},
+	{
+		localId: 3,
+		mediaUrl: 'file:///local-image-3.jpeg',
+		mediaType: 'image',
+		serverId: 2002,
+		serverUrl: 'https://test-site.files.wordpress.com/local-image-3.jpeg',
+	},
+	{
+		localId: 4,
+		mediaUrl: 'file:///local-video-4.mp4',
+		mediaType: 'video',
+		serverId: 2003,
+		serverUrl: 'https://test-site.files.wordpress.com/local-video-4.mp4',
+	},
+];
 
 describe( 'Editor', () => {
-	it( 'detects unsupported block and sends hasUnsupportedBlocks true to native', () => {
-		RNReactNativeGutenbergBridge.editorDidMount = jest.fn();
-
-		const appContainer = renderEditorWith( unsupportedBlock );
-		// For some reason resetEditorBlocks() is asynchronous when dispatching editEntityRecord.
-		act( () => {
-			jest.runAllTicks();
-		} );
-		appContainer.unmount();
-
-		expect(
-			RNReactNativeGutenbergBridge.editorDidMount
-		).toHaveBeenCalledTimes( 1 );
-		expect(
-			RNReactNativeGutenbergBridge.editorDidMount
-		).toHaveBeenCalledWith( [ 'core/notablock' ] );
+	afterEach( () => {
+		jest.clearAllMocks();
 	} );
 
 	it( 'toggles the editor from Visual to HTML mode', async () => {
 		// Arrange
-		let toggleMode;
-		subscribeParentToggleHTMLMode.mockImplementation( ( callback ) => {
-			toggleMode = callback;
-		} );
-		const screen = await initializeEditor();
+		await initializeEditor();
 		await addBlock( screen, 'Paragraph' );
 
 		// Act
 		const paragraphBlock = getBlock( screen, 'Paragraph' );
 		fireEvent.press( paragraphBlock );
 		act( () => {
-			toggleMode();
+			toggleModeCallback();
 		} );
 
 		// Assert
 		const htmlEditor = screen.getByLabelText( 'html-view-content' );
 		expect( htmlEditor ).toBeVisible();
+
+		act( () => {
+			toggleModeCallback();
+		} );
 	} );
-} );
 
-// Utilities.
-const renderEditorWith = ( content ) => {
-	return render(
-		<Editor
-			initialHtml={ content }
-			initialHtmlModeEnabled={ false }
-			initialTitle={ '' }
-			postType="post"
-			postId="1"
-		/>
-	);
-};
+	it( 'adds empty image block when pasting unsupported HTML local image path', async () => {
+		await initializeEditor();
+		await addBlock( screen, 'Paragraph' );
+
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+
+		pasteIntoRichText( paragraphTextInput, {
+			text: '<div><img src="file:LOW-RES.png"></div>',
+		} );
+
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'adds image block when pasting HTML local image path', async () => {
+		await initializeEditor();
+		await addBlock( screen, 'Paragraph' );
+
+		const paragraphBlock = getBlock( screen, 'Paragraph' );
+		fireEvent.press( paragraphBlock );
+		const paragraphTextInput =
+			within( paragraphBlock ).getByPlaceholderText( 'Start writing…' );
+
+		pasteIntoRichText( paragraphTextInput, {
+			files: [ 'file:///path/to/file.png' ],
+		} );
+
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'appends media correctly for allowed types', async () => {
+		// Arrange
+		requestMediaImport
+			.mockImplementationOnce( ( _, callback ) =>
+				callback( MEDIA[ 0 ].id, MEDIA[ 0 ].serverUrl )
+			)
+			.mockImplementationOnce( ( _, callback ) =>
+				callback( MEDIA[ 2 ].id, MEDIA[ 2 ].serverUrl )
+			);
+		await initializeEditor();
+
+		// Act
+		act( () => mediaAppendCallback( MEDIA[ 0 ] ) );
+		act( () => mediaAppendCallback( MEDIA[ 2 ] ) );
+		await screen.findByTestId( `network-image-${ MEDIA[ 0 ].serverUrl }` );
+		await screen.findByTestId( `network-image-${ MEDIA[ 2 ].serverUrl }` );
+
+		// Assert
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'appends media correctly for allowed types and skips unsupported ones', async () => {
+		// Arrange
+		requestMediaImport
+			.mockImplementationOnce( ( _, callback ) =>
+				callback( MEDIA[ 0 ].id, MEDIA[ 0 ].serverUrl )
+			)
+			.mockImplementationOnce( ( _, callback ) =>
+				callback( MEDIA[ 3 ].id, MEDIA[ 3 ].serverUrl )
+			);
+		await initializeEditor();
+
+		// Act
+		act( () => mediaAppendCallback( MEDIA[ 0 ] ) );
+		// Unsupported type (PDF file)
+		act( () => mediaAppendCallback( MEDIA[ 1 ] ) );
+		act( () => mediaAppendCallback( MEDIA[ 3 ] ) );
+		await screen.findByTestId( `network-image-${ MEDIA[ 0 ].serverUrl }` );
+
+		// Assert
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'unselects current block when tapping on the hardware back button', async () => {
+		// Arrange
+		await initializeEditor();
+		await addBlock( screen, 'Spacer' );
+
+		// Act
+		act( () => {
+			BackHandler.mockPressBack();
+		} );
+
+		// Assert
+		const openBlockSettingsButton =
+			screen.queryAllByLabelText( 'Open Settings' );
+		expect( openBlockSettingsButton.length ).toBe( 0 );
+	} );
+
+	describe( 'on content update', () => {
+		const MARKDOWN = `# Sample Document\nLorem ipsum dolor sit amet, consectetur adipiscing 
+						elit.\n## Overview\n- Lorem ipsum dolor sit amet\n- Consectetur adipiscing
+						 elit\n- Integer nec odio\n## Details\n1. Sed cursus ante dapibus diam\n2. 
+						 Nulla quis sem at nibh elementum imperdiet\n3. Duis sagittis ipsum\n
+						 ## Mixed Lists\n- Key Points:\n 1. Lorem ipsum dolor sit amet\n 2. 
+						 Consectetur adipiscing elit\n 3. Integer nec odio\n- Additional Info:\n -
+						  Sed cursus ante dapibus diam\n - Nulla quis sem at nibh elementum imperdiet\n`;
+
+		it( 'parses markdown into blocks', async () => {
+			// Arrange
+			await initializeEditor( {
+				initialTitle: null,
+			} );
+
+			// Act
+			act( () => {
+				onContentUpdateCallback( {
+					content: MARKDOWN,
+				} );
+			} );
+
+			// Assert
+			// Needed to for the "Processed HTML piece" log.
+			expect( console ).toHaveLogged();
+			expect( getEditorTitle() ).toBe( 'Sample Document' );
+			expect( getEditorHtml() ).toMatchSnapshot();
+		} );
+
+		it( 'parses a markdown heading into a title', async () => {
+			// Arrange
+			await initializeEditor( {
+				initialTitle: null,
+			} );
+
+			// Act
+			act( () => {
+				onContentUpdateCallback( {
+					content: `# Sample Document`,
+				} );
+			} );
+
+			// Assert
+			// Needed to for the "Processed HTML piece" log.
+			expect( console ).toHaveLogged();
+			expect( getEditorTitle() ).toBe( 'Sample Document' );
+			expect( getEditorHtml() ).toBe( '' );
+		} );
+
+		it( 'parses standard text into blocks', async () => {
+			// Arrange
+			await initializeEditor( {
+				initialTitle: null,
+			} );
+
+			// Act
+			act( () => {
+				onContentUpdateCallback( {
+					content: `Lorem ipsum dolor sit amet`,
+				} );
+			} );
+
+			// Assert
+			// Needed to for the "Processed HTML piece" log.
+			expect( console ).toHaveLogged();
+			expect( getEditorTitle() ).toBe( 'Lorem ipsum dolor sit amet' );
+			expect( getEditorHtml() ).toBe( '' );
+		} );
+	} );
+} );
diff --git a/packages/edit-site/.npmrc b/packages/edit-site/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/edit-site/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/edit-site/CHANGELOG.md b/packages/edit-site/CHANGELOG.md
index de75adec15e5a9..e1c4f09222ae67 100644
--- a/packages/edit-site/CHANGELOG.md
+++ b/packages/edit-site/CHANGELOG.md
@@ -2,6 +2,59 @@
 
 ## Unreleased
 
+## 6.10.0 (2024-10-16)
+
+## 6.9.0 (2024-10-03)
+
+## 6.8.0 (2024-09-19)
+
+## 6.7.0 (2024-09-05)
+
+## 6.6.0 (2024-08-21)
+
+## 6.5.0 (2024-08-07)
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 5.35.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 5.34.0 (2024-05-02)
+
+## 5.33.0 (2024-04-19)
+
+## 5.32.0 (2024-04-03)
+
+## 5.31.0 (2024-03-21)
+
+## 5.30.0 (2024-03-06)
+
+## 5.29.0 (2024-02-21)
+
+## 5.28.0 (2024-02-09)
+
+## 5.27.0 (2024-01-24)
+
+## 5.26.0 (2024-01-10)
+
+## 5.25.0 (2023-12-13)
+
 ## 5.24.0 (2023-11-29)
 
 ## 5.23.0 (2023-11-16)
@@ -27,6 +80,7 @@
 ## 5.13.0 (2023-06-23)
 
 ### Enhancements
+
 -   Site editor sidebar: add home template details and controls [#51223](https://github.com/WordPress/gutenberg/pull/51223).
 -   Site editor sidebar: add footer to template part and ensure nested template areas display [#51669](https://github.com/WordPress/gutenberg/pull/51669).
 -   Global styles: split styles menus into revisions and other styles actions ([#51318](https://github.com/WordPress/gutenberg/pull/51318)).
@@ -51,7 +105,7 @@
 
 ## 5.3.0 (2023-02-01)
 
-### Bug Fix
+### Bug Fixes
 
 -   Force visual editor in browse mode ([#47329](https://github.com/WordPress/gutenberg/pull/47329)).
 -   Style Book: Exclude blocks that are not allowed to insert ([#47461](https://github.com/WordPress/gutenberg/pull/47461)).
@@ -70,11 +124,10 @@
 
 -   Fluid typography: add configurable fluid typography settings for minimum font size to theme.json ([#42489](https://github.com/WordPress/gutenberg/pull/42489)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Don't show block inserter when the canvas is view mode ([#46763](https://github.com/WordPress/gutenberg/pull/46763)).
 
-
 ## 4.19.0 (2022-11-16)
 
 ## 4.18.0 (2022-11-02)
@@ -115,11 +168,11 @@
 
 ## 4.0.0 (2022-02-10)
 
-### Breaking Change
+### Breaking Changes
 
 -   The `GUTENBERG_PHASE` environment variable has been renamed to `IS_GUTENBERG_PLUGIN` and is now a boolean ([#38202](https://github.com/WordPress/gutenberg/pull/38202)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/primitives`, `file-saver` and `jszip` dependencies ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -127,7 +180,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -139,13 +192,13 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 
 ## 1.17.0 (2021-03-17)
 
 ## 1.0.0 (2020-01-13)
 
-### New Feature
+### New Features
 
 -   Initial version of the package.
diff --git a/packages/edit-site/lib/inflate.js b/packages/edit-site/lib/inflate.js
index 6455f401137f78..596d1cb5b8013c 100644
--- a/packages/edit-site/lib/inflate.js
+++ b/packages/edit-site/lib/inflate.js
@@ -1,733 +1,602 @@
+/**
+ * Credits:
+ *
+ * lib-font
+ * https://github.com/Pomax/lib-font
+ * https://github.com/Pomax/lib-font/blob/master/lib/inflate.js
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 pomax@nihongoresources.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 /* eslint eslint-comments/no-unlimited-disable: 0 */
 /* eslint-disable */
-/* pako 1.0.10 nodeca/pako */ ( function ( f ) {
-	if ( typeof exports === 'object' && typeof module !== 'undefined' ) {
-		module.exports = f();
-	} else if ( typeof define === 'function' && define.amd ) {
-		define( [], f );
-	} else {
-		var g;
-		if ( typeof window !== 'undefined' ) {
-			g = window;
-		} else if ( typeof global !== 'undefined' ) {
-			g = global;
-		} else if ( typeof self !== 'undefined' ) {
-			g = self;
-		} else {
-			g = this;
-		}
-		g.pako = f();
-	}
-} )( function () {
-	var define, module, exports;
-	return ( function () {
-		function r( e, n, t ) {
-			function o( i, f ) {
-				if ( ! n[ i ] ) {
-					if ( ! e[ i ] ) {
-						var c = 'function' == typeof require && require;
-						if ( ! f && c ) return c( i, ! 0 );
-						if ( u ) return u( i, ! 0 );
-						var a = new Error( "Cannot find module '" + i + "'" );
-						throw ( ( a.code = 'MODULE_NOT_FOUND' ), a );
-					}
-					var p = ( n[ i ] = { exports: {} } );
-					e[ i ][ 0 ].call(
-						p.exports,
-						function ( r ) {
-							var n = e[ i ][ 1 ][ r ];
-							return o( n || r );
-						},
-						p,
-						p.exports,
-						r,
-						e,
-						n,
-						t
-					);
-				}
-				return n[ i ].exports;
-			}
-			for (
-				var u = 'function' == typeof require && require, i = 0;
-				i < t.length;
-				i++
-			)
-				o( t[ i ] );
-			return o;
-		}
-		return r;
-	} )()(
-		{
-			1: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					var TYPED_OK =
-						typeof Uint8Array !== 'undefined' &&
-						typeof Uint16Array !== 'undefined' &&
-						typeof Int32Array !== 'undefined';
-
-					function _has( obj, key ) {
-						return Object.prototype.hasOwnProperty.call( obj, key );
-					}
-
-					exports.assign = function (
-						obj /*from1, from2, from3, ...*/
-					) {
-						var sources = Array.prototype.slice.call(
-							arguments,
-							1
-						);
-						while ( sources.length ) {
-							var source = sources.shift();
-							if ( ! source ) {
-								continue;
-							}
-
-							if ( typeof source !== 'object' ) {
-								throw new TypeError(
-									source + 'must be non-object'
-								);
-							}
-
-							for ( var p in source ) {
-								if ( _has( source, p ) ) {
-									obj[ p ] = source[ p ];
-								}
-							}
-						}
-
-						return obj;
-					};
-
-					// reduce buffer size, avoiding mem copy
-					exports.shrinkBuf = function ( buf, size ) {
-						if ( buf.length === size ) {
-							return buf;
-						}
-						if ( buf.subarray ) {
-							return buf.subarray( 0, size );
-						}
-						buf.length = size;
-						return buf;
-					};
-
-					var fnTyped = {
-						arraySet: function (
-							dest,
-							src,
-							src_offs,
-							len,
-							dest_offs
-						) {
-							if ( src.subarray && dest.subarray ) {
-								dest.set(
-									src.subarray( src_offs, src_offs + len ),
-									dest_offs
-								);
-								return;
-							}
-							// Fallback to ordinary array
-							for ( var i = 0; i < len; i++ ) {
-								dest[ dest_offs + i ] = src[ src_offs + i ];
-							}
-						},
-						// Join array of chunks to single array.
-						flattenChunks: function ( chunks ) {
-							var i, l, len, pos, chunk, result;
-
-							// calculate data length
-							len = 0;
-							for ( i = 0, l = chunks.length; i < l; i++ ) {
-								len += chunks[ i ].length;
-							}
-
-							// join chunks
-							result = new Uint8Array( len );
-							pos = 0;
-							for ( i = 0, l = chunks.length; i < l; i++ ) {
-								chunk = chunks[ i ];
-								result.set( chunk, pos );
-								pos += chunk.length;
-							}
-
-							return result;
-						},
-					};
-
-					var fnUntyped = {
-						arraySet: function (
-							dest,
-							src,
-							src_offs,
-							len,
-							dest_offs
-						) {
-							for ( var i = 0; i < len; i++ ) {
-								dest[ dest_offs + i ] = src[ src_offs + i ];
-							}
-						},
-						// Join array of chunks to single array.
-						flattenChunks: function ( chunks ) {
-							return [].concat.apply( [], chunks );
-						},
-					};
-
-					// Enable/Disable typed arrays use, for testing
-					//
-					exports.setTyped = function ( on ) {
-						if ( on ) {
-							exports.Buf8 = Uint8Array;
-							exports.Buf16 = Uint16Array;
-							exports.Buf32 = Int32Array;
-							exports.assign( exports, fnTyped );
-						} else {
-							exports.Buf8 = Array;
-							exports.Buf16 = Array;
-							exports.Buf32 = Array;
-							exports.assign( exports, fnUntyped );
-						}
-					};
-
-					exports.setTyped( TYPED_OK );
-				},
-				{},
-			],
-			2: [
-				function ( require, module, exports ) {
-					// String encode/decode helpers
-					'use strict';
-
-					var utils = require( './common' );
-
-					// Quick check if we can use fast array to bin string conversion
-					//
-					// - apply(Array) can fail on Android 2.2
-					// - apply(Uint8Array) can fail on iOS 5.1 Safari
-					//
-					var STR_APPLY_OK = true;
-					var STR_APPLY_UIA_OK = true;
-
-					try {
-						String.fromCharCode.apply( null, [ 0 ] );
-					} catch ( __ ) {
-						STR_APPLY_OK = false;
-					}
-					try {
-						String.fromCharCode.apply( null, new Uint8Array( 1 ) );
-					} catch ( __ ) {
-						STR_APPLY_UIA_OK = false;
-					}
-
-					// Table with utf8 lengths (calculated by first byte of sequence)
-					// Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
-					// because max possible codepoint is 0x10ffff
-					var _utf8len = new utils.Buf8( 256 );
-					for ( var q = 0; q < 256; q++ ) {
-						_utf8len[ q ] =
-							q >= 252
-								? 6
-								: q >= 248
-								? 5
-								: q >= 240
-								? 4
-								: q >= 224
-								? 3
-								: q >= 192
-								? 2
-								: 1;
-					}
-					_utf8len[ 254 ] = _utf8len[ 254 ] = 1; // Invalid sequence start
-
-					// convert string to array (typed, when possible)
-					exports.string2buf = function ( str ) {
-						var buf,
-							c,
-							c2,
-							m_pos,
-							i,
-							str_len = str.length,
-							buf_len = 0;
-
-						// count binary size
-						for ( m_pos = 0; m_pos < str_len; m_pos++ ) {
-							c = str.charCodeAt( m_pos );
-							if (
-								( c & 0xfc00 ) === 0xd800 &&
-								m_pos + 1 < str_len
-							) {
-								c2 = str.charCodeAt( m_pos + 1 );
-								if ( ( c2 & 0xfc00 ) === 0xdc00 ) {
-									c =
-										0x10000 +
-										( ( c - 0xd800 ) << 10 ) +
-										( c2 - 0xdc00 );
-									m_pos++;
-								}
-							}
-							buf_len +=
-								c < 0x80
-									? 1
-									: c < 0x800
-									? 2
-									: c < 0x10000
-									? 3
-									: 4;
-						}
-
-						// allocate buffer
-						buf = new utils.Buf8( buf_len );
-
-						// convert
-						for ( i = 0, m_pos = 0; i < buf_len; m_pos++ ) {
-							c = str.charCodeAt( m_pos );
-							if (
-								( c & 0xfc00 ) === 0xd800 &&
-								m_pos + 1 < str_len
-							) {
-								c2 = str.charCodeAt( m_pos + 1 );
-								if ( ( c2 & 0xfc00 ) === 0xdc00 ) {
-									c =
-										0x10000 +
-										( ( c - 0xd800 ) << 10 ) +
-										( c2 - 0xdc00 );
-									m_pos++;
-								}
-							}
-							if ( c < 0x80 ) {
-								/* one byte */
-								buf[ i++ ] = c;
-							} else if ( c < 0x800 ) {
-								/* two bytes */
-								buf[ i++ ] = 0xc0 | ( c >>> 6 );
-								buf[ i++ ] = 0x80 | ( c & 0x3f );
-							} else if ( c < 0x10000 ) {
-								/* three bytes */
-								buf[ i++ ] = 0xe0 | ( c >>> 12 );
-								buf[ i++ ] = 0x80 | ( ( c >>> 6 ) & 0x3f );
-								buf[ i++ ] = 0x80 | ( c & 0x3f );
-							} else {
-								/* four bytes */
-								buf[ i++ ] = 0xf0 | ( c >>> 18 );
-								buf[ i++ ] = 0x80 | ( ( c >>> 12 ) & 0x3f );
-								buf[ i++ ] = 0x80 | ( ( c >>> 6 ) & 0x3f );
-								buf[ i++ ] = 0x80 | ( c & 0x3f );
-							}
-						}
-
-						return buf;
-					};
-
-					// Helper (used in 2 places)
-					function buf2binstring( buf, len ) {
-						// On Chrome, the arguments in a function call that are allowed is `65534`.
-						// If the length of the buffer is smaller than that, we can use this optimization,
-						// otherwise we will take a slower path.
-						if ( len < 65534 ) {
-							if (
-								( buf.subarray && STR_APPLY_UIA_OK ) ||
-								( ! buf.subarray && STR_APPLY_OK )
-							) {
-								return String.fromCharCode.apply(
-									null,
-									utils.shrinkBuf( buf, len )
-								);
-							}
-						}
-
-						var result = '';
-						for ( var i = 0; i < len; i++ ) {
-							result += String.fromCharCode( buf[ i ] );
-						}
-						return result;
-					}
-
-					// Convert byte array to binary string
-					exports.buf2binstring = function ( buf ) {
-						return buf2binstring( buf, buf.length );
-					};
-
-					// Convert binary string (typed, when possible)
-					exports.binstring2buf = function ( str ) {
-						var buf = new utils.Buf8( str.length );
-						for ( var i = 0, len = buf.length; i < len; i++ ) {
-							buf[ i ] = str.charCodeAt( i );
-						}
-						return buf;
-					};
-
-					// convert array to string
-					exports.buf2string = function ( buf, max ) {
-						var i, out, c, c_len;
-						var len = max || buf.length;
-
-						// Reserve max possible length (2 words per char)
-						// NB: by unknown reasons, Array is significantly faster for
-						//     String.fromCharCode.apply than Uint16Array.
-						var utf16buf = new Array( len * 2 );
-
-						for ( out = 0, i = 0; i < len;  ) {
-							c = buf[ i++ ];
-							// quick process ascii
-							if ( c < 0x80 ) {
-								utf16buf[ out++ ] = c;
-								continue;
-							}
-
-							c_len = _utf8len[ c ];
-							// skip 5 & 6 byte codes
-							if ( c_len > 4 ) {
-								utf16buf[ out++ ] = 0xfffd;
-								i += c_len - 1;
-								continue;
-							}
-
-							// apply mask on first byte
-							c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
-							// join the rest
-							while ( c_len > 1 && i < len ) {
-								c = ( c << 6 ) | ( buf[ i++ ] & 0x3f );
-								c_len--;
-							}
-
-							// terminated by end of string?
-							if ( c_len > 1 ) {
-								utf16buf[ out++ ] = 0xfffd;
-								continue;
-							}
-
-							if ( c < 0x10000 ) {
-								utf16buf[ out++ ] = c;
-							} else {
-								c -= 0x10000;
-								utf16buf[ out++ ] =
-									0xd800 | ( ( c >> 10 ) & 0x3ff );
-								utf16buf[ out++ ] = 0xdc00 | ( c & 0x3ff );
-							}
-						}
-
-						return buf2binstring( utf16buf, out );
-					};
-
-					// Calculate max possible position in utf8 buffer,
-					// that will not break sequence. If that's not possible
-					// - (very small limits) return max size as is.
-					//
-					// buf[] - utf8 bytes array
-					// max   - length limit (mandatory);
-					exports.utf8border = function ( buf, max ) {
-						var pos;
-
-						max = max || buf.length;
-						if ( max > buf.length ) {
-							max = buf.length;
-						}
-
-						// go back from last position, until start of sequence found
-						pos = max - 1;
-						while ( pos >= 0 && ( buf[ pos ] & 0xc0 ) === 0x80 ) {
-							pos--;
-						}
-
-						// Very small and broken sequence,
-						// return max, because we should return something anyway.
-						if ( pos < 0 ) {
-							return max;
-						}
-
-						// If we came to start of buffer - that means buffer is too small,
-						// return max too.
-						if ( pos === 0 ) {
-							return max;
-						}
-
-						return pos + _utf8len[ buf[ pos ] ] > max ? pos : max;
-					};
-				},
-				{ './common': 1 },
-			],
-			3: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					// Note: adler32 takes 12% for level 0 and 2% for level 6.
-					// It isn't worth it to make additional optimizations as in original.
-					// Small size is preferable.
-
-					// (C) 1995-2013 Jean-loup Gailly and Mark Adler
-					// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
-					//
-					// This software is provided 'as-is', without any express or implied
-					// warranty. In no event will the authors be held liable for any damages
-					// arising from the use of this software.
-					//
-					// Permission is granted to anyone to use this software for any purpose,
-					// including commercial applications, and to alter it and redistribute it
-					// freely, subject to the following restrictions:
-					//
-					// 1. The origin of this software must not be misrepresented; you must not
-					//   claim that you wrote the original software. If you use this software
-					//   in a product, an acknowledgment in the product documentation would be
-					//   appreciated but is not required.
-					// 2. Altered source versions must be plainly marked as such, and must not be
-					//   misrepresented as being the original software.
-					// 3. This notice may not be removed or altered from any source distribution.
-
-					function adler32( adler, buf, len, pos ) {
-						var s1 = ( adler & 0xffff ) | 0,
-							s2 = ( ( adler >>> 16 ) & 0xffff ) | 0,
-							n = 0;
-
-						while ( len !== 0 ) {
-							// Set limit ~ twice less than 5552, to keep
-							// s2 in 31-bits, because we force signed ints.
-							// in other case %= will fail.
-							n = len > 2000 ? 2000 : len;
-							len -= n;
-
-							do {
-								s1 = ( s1 + buf[ pos++ ] ) | 0;
-								s2 = ( s2 + s1 ) | 0;
-							} while ( --n );
-
-							s1 %= 65521;
-							s2 %= 65521;
-						}
-
-						return s1 | ( s2 << 16 ) | 0;
-					}
-
-					module.exports = adler32;
-				},
-				{},
-			],
-			4: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					// (C) 1995-2013 Jean-loup Gailly and Mark Adler
-					// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
-					//
-					// This software is provided 'as-is', without any express or implied
-					// warranty. In no event will the authors be held liable for any damages
-					// arising from the use of this software.
-					//
-					// Permission is granted to anyone to use this software for any purpose,
-					// including commercial applications, and to alter it and redistribute it
-					// freely, subject to the following restrictions:
-					//
-					// 1. The origin of this software must not be misrepresented; you must not
-					//   claim that you wrote the original software. If you use this software
-					//   in a product, an acknowledgment in the product documentation would be
-					//   appreciated but is not required.
-					// 2. Altered source versions must be plainly marked as such, and must not be
-					//   misrepresented as being the original software.
-					// 3. This notice may not be removed or altered from any source distribution.
-
-					module.exports = {
-						/* Allowed flush values; see deflate() and inflate() below for details */
-						Z_NO_FLUSH: 0,
-						Z_PARTIAL_FLUSH: 1,
-						Z_SYNC_FLUSH: 2,
-						Z_FULL_FLUSH: 3,
-						Z_FINISH: 4,
-						Z_BLOCK: 5,
-						Z_TREES: 6,
-
-						/* Return codes for the compression/decompression functions. Negative values
-						 * are errors, positive values are used for special but normal events.
-						 */
-						Z_OK: 0,
-						Z_STREAM_END: 1,
-						Z_NEED_DICT: 2,
-						Z_ERRNO: -1,
-						Z_STREAM_ERROR: -2,
-						Z_DATA_ERROR: -3,
-						//Z_MEM_ERROR:     -4,
-						Z_BUF_ERROR: -5,
-						//Z_VERSION_ERROR: -6,
-
-						/* compression levels */
-						Z_NO_COMPRESSION: 0,
-						Z_BEST_SPEED: 1,
-						Z_BEST_COMPRESSION: 9,
-						Z_DEFAULT_COMPRESSION: -1,
-
-						Z_FILTERED: 1,
-						Z_HUFFMAN_ONLY: 2,
-						Z_RLE: 3,
-						Z_FIXED: 4,
-						Z_DEFAULT_STRATEGY: 0,
-
-						/* Possible values of the data_type field (though see inflate()) */
-						Z_BINARY: 0,
-						Z_TEXT: 1,
-						//Z_ASCII:                1, // = Z_TEXT (deprecated)
-						Z_UNKNOWN: 2,
-
-						/* The deflate compression method */
-						Z_DEFLATED: 8,
-						//Z_NULL:                 null // Use -1 or null inline, depending on var type
-					};
-				},
-				{},
-			],
-			5: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					// Note: we can't get significant speed boost here.
-					// So write code to minimize size - no pregenerated tables
-					// and array tools dependencies.
-
-					// (C) 1995-2013 Jean-loup Gailly and Mark Adler
-					// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
-					//
-					// This software is provided 'as-is', without any express or implied
-					// warranty. In no event will the authors be held liable for any damages
-					// arising from the use of this software.
-					//
-					// Permission is granted to anyone to use this software for any purpose,
-					// including commercial applications, and to alter it and redistribute it
-					// freely, subject to the following restrictions:
-					//
-					// 1. The origin of this software must not be misrepresented; you must not
-					//   claim that you wrote the original software. If you use this software
-					//   in a product, an acknowledgment in the product documentation would be
-					//   appreciated but is not required.
-					// 2. Altered source versions must be plainly marked as such, and must not be
-					//   misrepresented as being the original software.
-					// 3. This notice may not be removed or altered from any source distribution.
-
-					// Use ordinary array, since untyped makes no boost here
-					function makeTable() {
-						var c,
-							table = [];
-
-						for ( var n = 0; n < 256; n++ ) {
-							c = n;
-							for ( var k = 0; k < 8; k++ ) {
-								c = c & 1 ? 0xedb88320 ^ ( c >>> 1 ) : c >>> 1;
-							}
-							table[ n ] = c;
-						}
-
-						return table;
-					}
-
-					// Create table on load. Just 255 signed longs. Not a problem.
-					var crcTable = makeTable();
-
-					function crc32( crc, buf, len, pos ) {
-						var t = crcTable,
-							end = pos + len;
-
-						crc ^= -1;
-
-						for ( var i = pos; i < end; i++ ) {
-							crc =
-								( crc >>> 8 ) ^ t[ ( crc ^ buf[ i ] ) & 0xff ];
-						}
-
-						return crc ^ -1; // >>> 0;
-					}
-
-					module.exports = crc32;
-				},
-				{},
-			],
-			6: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					// (C) 1995-2013 Jean-loup Gailly and Mark Adler
-					// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
-					//
-					// This software is provided 'as-is', without any express or implied
-					// warranty. In no event will the authors be held liable for any damages
-					// arising from the use of this software.
-					//
-					// Permission is granted to anyone to use this software for any purpose,
-					// including commercial applications, and to alter it and redistribute it
-					// freely, subject to the following restrictions:
-					//
-					// 1. The origin of this software must not be misrepresented; you must not
-					//   claim that you wrote the original software. If you use this software
-					//   in a product, an acknowledgment in the product documentation would be
-					//   appreciated but is not required.
-					// 2. Altered source versions must be plainly marked as such, and must not be
-					//   misrepresented as being the original software.
-					// 3. This notice may not be removed or altered from any source distribution.
-
-					function GZheader() {
-						/* true if compressed data believed to be text */
-						this.text = 0;
-						/* modification time */
-						this.time = 0;
-						/* extra flags (not used when writing a gzip file) */
-						this.xflags = 0;
-						/* operating system */
-						this.os = 0;
-						/* pointer to extra field or Z_NULL if none */
-						this.extra = null;
-						/* extra field length (valid if extra != Z_NULL) */
-						this.extra_len = 0; // Actually, we don't need it in JS,
-						// but leave for few code modifications
-
-						//
-						// Setup limits is not necessary because in js we should not preallocate memory
-						// for inflate use constant limit in 65536 bytes
-						//
-
-						/* space at extra (only when reading header) */
-						// this.extra_max  = 0;
-						/* pointer to zero-terminated file name or Z_NULL */
-						this.name = '';
-						/* space at name (only when reading header) */
-						// this.name_max   = 0;
-						/* pointer to zero-terminated comment or Z_NULL */
-						this.comment = '';
-						/* space at comment (only when reading header) */
-						// this.comm_max   = 0;
-						/* true if there was or will be a header crc */
-						this.hcrc = 0;
-						/* true when done reading gzip header (not used when writing a gzip file) */
-						this.done = false;
-					}
-
-					module.exports = GZheader;
-				},
-				{},
-			],
-			7: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					// (C) 1995-2013 Jean-loup Gailly and Mark Adler
-					// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
-					//
-					// This software is provided 'as-is', without any express or implied
-					// warranty. In no event will the authors be held liable for any damages
-					// arising from the use of this software.
-					//
-					// Permission is granted to anyone to use this software for any purpose,
-					// including commercial applications, and to alter it and redistribute it
-					// freely, subject to the following restrictions:
-					//
-					// 1. The origin of this software must not be misrepresented; you must not
-					//   claim that you wrote the original software. If you use this software
-					//   in a product, an acknowledgment in the product documentation would be
-					//   appreciated but is not required.
-					// 2. Altered source versions must be plainly marked as such, and must not be
-					//   misrepresented as being the original software.
-					// 3. This notice may not be removed or altered from any source distribution.
-
-					// See state defs from inflate.js
-					var BAD = 30; /* got a data error -- remain here until reset */
-					var TYPE = 12; /* i: waiting for type bits, including last-flag bit */
-
-					/*
+/* pako 1.0.10 nodeca/pako */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.pako = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+  'use strict';
+
+
+  var TYPED_OK =  (typeof Uint8Array !== 'undefined') &&
+                  (typeof Uint16Array !== 'undefined') &&
+                  (typeof Int32Array !== 'undefined');
+
+  function _has(obj, key) {
+    return Object.prototype.hasOwnProperty.call(obj, key);
+  }
+
+  exports.assign = function (obj /*from1, from2, from3, ...*/) {
+    var sources = Array.prototype.slice.call(arguments, 1);
+    while (sources.length) {
+      var source = sources.shift();
+      if (!source) { continue; }
+
+      if (typeof source !== 'object') {
+        throw new TypeError(source + 'must be non-object');
+      }
+
+      for (var p in source) {
+        if (_has(source, p)) {
+          obj[p] = source[p];
+        }
+      }
+    }
+
+    return obj;
+  };
+
+
+  // reduce buffer size, avoiding mem copy
+  exports.shrinkBuf = function (buf, size) {
+    if (buf.length === size) { return buf; }
+    if (buf.subarray) { return buf.subarray(0, size); }
+    buf.length = size;
+    return buf;
+  };
+
+
+  var fnTyped = {
+    arraySet: function (dest, src, src_offs, len, dest_offs) {
+      if (src.subarray && dest.subarray) {
+        dest.set(src.subarray(src_offs, src_offs + len), dest_offs);
+        return;
+      }
+      // Fallback to ordinary array
+      for (var i = 0; i < len; i++) {
+        dest[dest_offs + i] = src[src_offs + i];
+      }
+    },
+    // Join array of chunks to single array.
+    flattenChunks: function (chunks) {
+      var i, l, len, pos, chunk, result;
+
+      // calculate data length
+      len = 0;
+      for (i = 0, l = chunks.length; i < l; i++) {
+        len += chunks[i].length;
+      }
+
+      // join chunks
+      result = new Uint8Array(len);
+      pos = 0;
+      for (i = 0, l = chunks.length; i < l; i++) {
+        chunk = chunks[i];
+        result.set(chunk, pos);
+        pos += chunk.length;
+      }
+
+      return result;
+    }
+  };
+
+  var fnUntyped = {
+    arraySet: function (dest, src, src_offs, len, dest_offs) {
+      for (var i = 0; i < len; i++) {
+        dest[dest_offs + i] = src[src_offs + i];
+      }
+    },
+    // Join array of chunks to single array.
+    flattenChunks: function (chunks) {
+      return [].concat.apply([], chunks);
+    }
+  };
+
+
+  // Enable/Disable typed arrays use, for testing
+  //
+  exports.setTyped = function (on) {
+    if (on) {
+      exports.Buf8  = Uint8Array;
+      exports.Buf16 = Uint16Array;
+      exports.Buf32 = Int32Array;
+      exports.assign(exports, fnTyped);
+    } else {
+      exports.Buf8  = Array;
+      exports.Buf16 = Array;
+      exports.Buf32 = Array;
+      exports.assign(exports, fnUntyped);
+    }
+  };
+
+  exports.setTyped(TYPED_OK);
+
+  },{}],2:[function(require,module,exports){
+  // String encode/decode helpers
+  'use strict';
+
+
+  var utils = require('./common');
+
+
+  // Quick check if we can use fast array to bin string conversion
+  //
+  // - apply(Array) can fail on Android 2.2
+  // - apply(Uint8Array) can fail on iOS 5.1 Safari
+  //
+  var STR_APPLY_OK = true;
+  var STR_APPLY_UIA_OK = true;
+
+  try { String.fromCharCode.apply(null, [ 0 ]); } catch (__) { STR_APPLY_OK = false; }
+  try { String.fromCharCode.apply(null, new Uint8Array(1)); } catch (__) { STR_APPLY_UIA_OK = false; }
+
+
+  // Table with utf8 lengths (calculated by first byte of sequence)
+  // Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
+  // because max possible codepoint is 0x10ffff
+  var _utf8len = new utils.Buf8(256);
+  for (var q = 0; q < 256; q++) {
+    _utf8len[q] = (q >= 252 ? 6 : q >= 248 ? 5 : q >= 240 ? 4 : q >= 224 ? 3 : q >= 192 ? 2 : 1);
+  }
+  _utf8len[254] = _utf8len[254] = 1; // Invalid sequence start
+
+
+  // convert string to array (typed, when possible)
+  exports.string2buf = function (str) {
+    var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
+
+    // count binary size
+    for (m_pos = 0; m_pos < str_len; m_pos++) {
+      c = str.charCodeAt(m_pos);
+      if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) {
+        c2 = str.charCodeAt(m_pos + 1);
+        if ((c2 & 0xfc00) === 0xdc00) {
+          c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
+          m_pos++;
+        }
+      }
+      buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4;
+    }
+
+    // allocate buffer
+    buf = new utils.Buf8(buf_len);
+
+    // convert
+    for (i = 0, m_pos = 0; i < buf_len; m_pos++) {
+      c = str.charCodeAt(m_pos);
+      if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) {
+        c2 = str.charCodeAt(m_pos + 1);
+        if ((c2 & 0xfc00) === 0xdc00) {
+          c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
+          m_pos++;
+        }
+      }
+      if (c < 0x80) {
+        /* one byte */
+        buf[i++] = c;
+      } else if (c < 0x800) {
+        /* two bytes */
+        buf[i++] = 0xC0 | (c >>> 6);
+        buf[i++] = 0x80 | (c & 0x3f);
+      } else if (c < 0x10000) {
+        /* three bytes */
+        buf[i++] = 0xE0 | (c >>> 12);
+        buf[i++] = 0x80 | (c >>> 6 & 0x3f);
+        buf[i++] = 0x80 | (c & 0x3f);
+      } else {
+        /* four bytes */
+        buf[i++] = 0xf0 | (c >>> 18);
+        buf[i++] = 0x80 | (c >>> 12 & 0x3f);
+        buf[i++] = 0x80 | (c >>> 6 & 0x3f);
+        buf[i++] = 0x80 | (c & 0x3f);
+      }
+    }
+
+    return buf;
+  };
+
+  // Helper (used in 2 places)
+  function buf2binstring(buf, len) {
+    // On Chrome, the arguments in a function call that are allowed is `65534`.
+    // If the length of the buffer is smaller than that, we can use this optimization,
+    // otherwise we will take a slower path.
+    if (len < 65534) {
+      if ((buf.subarray && STR_APPLY_UIA_OK) || (!buf.subarray && STR_APPLY_OK)) {
+        return String.fromCharCode.apply(null, utils.shrinkBuf(buf, len));
+      }
+    }
+
+    var result = '';
+    for (var i = 0; i < len; i++) {
+      result += String.fromCharCode(buf[i]);
+    }
+    return result;
+  }
+
+
+  // Convert byte array to binary string
+  exports.buf2binstring = function (buf) {
+    return buf2binstring(buf, buf.length);
+  };
+
+
+  // Convert binary string (typed, when possible)
+  exports.binstring2buf = function (str) {
+    var buf = new utils.Buf8(str.length);
+    for (var i = 0, len = buf.length; i < len; i++) {
+      buf[i] = str.charCodeAt(i);
+    }
+    return buf;
+  };
+
+
+  // convert array to string
+  exports.buf2string = function (buf, max) {
+    var i, out, c, c_len;
+    var len = max || buf.length;
+
+    // Reserve max possible length (2 words per char)
+    // NB: by unknown reasons, Array is significantly faster for
+    //     String.fromCharCode.apply than Uint16Array.
+    var utf16buf = new Array(len * 2);
+
+    for (out = 0, i = 0; i < len;) {
+      c = buf[i++];
+      // quick process ascii
+      if (c < 0x80) { utf16buf[out++] = c; continue; }
+
+      c_len = _utf8len[c];
+      // skip 5 & 6 byte codes
+      if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len - 1; continue; }
+
+      // apply mask on first byte
+      c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
+      // join the rest
+      while (c_len > 1 && i < len) {
+        c = (c << 6) | (buf[i++] & 0x3f);
+        c_len--;
+      }
+
+      // terminated by end of string?
+      if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; }
+
+      if (c < 0x10000) {
+        utf16buf[out++] = c;
+      } else {
+        c -= 0x10000;
+        utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff);
+        utf16buf[out++] = 0xdc00 | (c & 0x3ff);
+      }
+    }
+
+    return buf2binstring(utf16buf, out);
+  };
+
+
+  // Calculate max possible position in utf8 buffer,
+  // that will not break sequence. If that's not possible
+  // - (very small limits) return max size as is.
+  //
+  // buf[] - utf8 bytes array
+  // max   - length limit (mandatory);
+  exports.utf8border = function (buf, max) {
+    var pos;
+
+    max = max || buf.length;
+    if (max > buf.length) { max = buf.length; }
+
+    // go back from last position, until start of sequence found
+    pos = max - 1;
+    while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
+
+    // Very small and broken sequence,
+    // return max, because we should return something anyway.
+    if (pos < 0) { return max; }
+
+    // If we came to start of buffer - that means buffer is too small,
+    // return max too.
+    if (pos === 0) { return max; }
+
+    return (pos + _utf8len[buf[pos]] > max) ? pos : max;
+  };
+
+  },{"./common":1}],3:[function(require,module,exports){
+  'use strict';
+
+  // Note: adler32 takes 12% for level 0 and 2% for level 6.
+  // It isn't worth it to make additional optimizations as in original.
+  // Small size is preferable.
+
+  // (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  // (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+  //
+  // This software is provided 'as-is', without any express or implied
+  // warranty. In no event will the authors be held liable for any damages
+  // arising from the use of this software.
+  //
+  // Permission is granted to anyone to use this software for any purpose,
+  // including commercial applications, and to alter it and redistribute it
+  // freely, subject to the following restrictions:
+  //
+  // 1. The origin of this software must not be misrepresented; you must not
+  //   claim that you wrote the original software. If you use this software
+  //   in a product, an acknowledgment in the product documentation would be
+  //   appreciated but is not required.
+  // 2. Altered source versions must be plainly marked as such, and must not be
+  //   misrepresented as being the original software.
+  // 3. This notice may not be removed or altered from any source distribution.
+
+  function adler32(adler, buf, len, pos) {
+    var s1 = (adler & 0xffff) |0,
+        s2 = ((adler >>> 16) & 0xffff) |0,
+        n = 0;
+
+    while (len !== 0) {
+      // Set limit ~ twice less than 5552, to keep
+      // s2 in 31-bits, because we force signed ints.
+      // in other case %= will fail.
+      n = len > 2000 ? 2000 : len;
+      len -= n;
+
+      do {
+        s1 = (s1 + buf[pos++]) |0;
+        s2 = (s2 + s1) |0;
+      } while (--n);
+
+      s1 %= 65521;
+      s2 %= 65521;
+    }
+
+    return (s1 | (s2 << 16)) |0;
+  }
+
+
+  module.exports = adler32;
+
+  },{}],4:[function(require,module,exports){
+  'use strict';
+
+  // (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  // (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+  //
+  // This software is provided 'as-is', without any express or implied
+  // warranty. In no event will the authors be held liable for any damages
+  // arising from the use of this software.
+  //
+  // Permission is granted to anyone to use this software for any purpose,
+  // including commercial applications, and to alter it and redistribute it
+  // freely, subject to the following restrictions:
+  //
+  // 1. The origin of this software must not be misrepresented; you must not
+  //   claim that you wrote the original software. If you use this software
+  //   in a product, an acknowledgment in the product documentation would be
+  //   appreciated but is not required.
+  // 2. Altered source versions must be plainly marked as such, and must not be
+  //   misrepresented as being the original software.
+  // 3. This notice may not be removed or altered from any source distribution.
+
+  module.exports = {
+
+    /* Allowed flush values; see deflate() and inflate() below for details */
+    Z_NO_FLUSH:         0,
+    Z_PARTIAL_FLUSH:    1,
+    Z_SYNC_FLUSH:       2,
+    Z_FULL_FLUSH:       3,
+    Z_FINISH:           4,
+    Z_BLOCK:            5,
+    Z_TREES:            6,
+
+    /* Return codes for the compression/decompression functions. Negative values
+    * are errors, positive values are used for special but normal events.
+    */
+    Z_OK:               0,
+    Z_STREAM_END:       1,
+    Z_NEED_DICT:        2,
+    Z_ERRNO:           -1,
+    Z_STREAM_ERROR:    -2,
+    Z_DATA_ERROR:      -3,
+    //Z_MEM_ERROR:     -4,
+    Z_BUF_ERROR:       -5,
+    //Z_VERSION_ERROR: -6,
+
+    /* compression levels */
+    Z_NO_COMPRESSION:         0,
+    Z_BEST_SPEED:             1,
+    Z_BEST_COMPRESSION:       9,
+    Z_DEFAULT_COMPRESSION:   -1,
+
+
+    Z_FILTERED:               1,
+    Z_HUFFMAN_ONLY:           2,
+    Z_RLE:                    3,
+    Z_FIXED:                  4,
+    Z_DEFAULT_STRATEGY:       0,
+
+    /* Possible values of the data_type field (though see inflate()) */
+    Z_BINARY:                 0,
+    Z_TEXT:                   1,
+    //Z_ASCII:                1, // = Z_TEXT (deprecated)
+    Z_UNKNOWN:                2,
+
+    /* The deflate compression method */
+    Z_DEFLATED:               8
+    //Z_NULL:                 null // Use -1 or null inline, depending on var type
+  };
+
+  },{}],5:[function(require,module,exports){
+  'use strict';
+
+  // Note: we can't get significant speed boost here.
+  // So write code to minimize size - no pregenerated tables
+  // and array tools dependencies.
+
+  // (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  // (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+  //
+  // This software is provided 'as-is', without any express or implied
+  // warranty. In no event will the authors be held liable for any damages
+  // arising from the use of this software.
+  //
+  // Permission is granted to anyone to use this software for any purpose,
+  // including commercial applications, and to alter it and redistribute it
+  // freely, subject to the following restrictions:
+  //
+  // 1. The origin of this software must not be misrepresented; you must not
+  //   claim that you wrote the original software. If you use this software
+  //   in a product, an acknowledgment in the product documentation would be
+  //   appreciated but is not required.
+  // 2. Altered source versions must be plainly marked as such, and must not be
+  //   misrepresented as being the original software.
+  // 3. This notice may not be removed or altered from any source distribution.
+
+  // Use ordinary array, since untyped makes no boost here
+  function makeTable() {
+    var c, table = [];
+
+    for (var n = 0; n < 256; n++) {
+      c = n;
+      for (var k = 0; k < 8; k++) {
+        c = ((c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
+      }
+      table[n] = c;
+    }
+
+    return table;
+  }
+
+  // Create table on load. Just 255 signed longs. Not a problem.
+  var crcTable = makeTable();
+
+
+  function crc32(crc, buf, len, pos) {
+    var t = crcTable,
+        end = pos + len;
+
+    crc ^= -1;
+
+    for (var i = pos; i < end; i++) {
+      crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF];
+    }
+
+    return (crc ^ (-1)); // >>> 0;
+  }
+
+
+  module.exports = crc32;
+
+  },{}],6:[function(require,module,exports){
+  'use strict';
+
+  // (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  // (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+  //
+  // This software is provided 'as-is', without any express or implied
+  // warranty. In no event will the authors be held liable for any damages
+  // arising from the use of this software.
+  //
+  // Permission is granted to anyone to use this software for any purpose,
+  // including commercial applications, and to alter it and redistribute it
+  // freely, subject to the following restrictions:
+  //
+  // 1. The origin of this software must not be misrepresented; you must not
+  //   claim that you wrote the original software. If you use this software
+  //   in a product, an acknowledgment in the product documentation would be
+  //   appreciated but is not required.
+  // 2. Altered source versions must be plainly marked as such, and must not be
+  //   misrepresented as being the original software.
+  // 3. This notice may not be removed or altered from any source distribution.
+
+  function GZheader() {
+    /* true if compressed data believed to be text */
+    this.text       = 0;
+    /* modification time */
+    this.time       = 0;
+    /* extra flags (not used when writing a gzip file) */
+    this.xflags     = 0;
+    /* operating system */
+    this.os         = 0;
+    /* pointer to extra field or Z_NULL if none */
+    this.extra      = null;
+    /* extra field length (valid if extra != Z_NULL) */
+    this.extra_len  = 0; // Actually, we don't need it in JS,
+                         // but leave for few code modifications
+
+    //
+    // Setup limits is not necessary because in js we should not preallocate memory
+    // for inflate use constant limit in 65536 bytes
+    //
+
+    /* space at extra (only when reading header) */
+    // this.extra_max  = 0;
+    /* pointer to zero-terminated file name or Z_NULL */
+    this.name       = '';
+    /* space at name (only when reading header) */
+    // this.name_max   = 0;
+    /* pointer to zero-terminated comment or Z_NULL */
+    this.comment    = '';
+    /* space at comment (only when reading header) */
+    // this.comm_max   = 0;
+    /* true if there was or will be a header crc */
+    this.hcrc       = 0;
+    /* true when done reading gzip header (not used when writing a gzip file) */
+    this.done       = false;
+  }
+
+  module.exports = GZheader;
+
+  },{}],7:[function(require,module,exports){
+  'use strict';
+
+  // (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  // (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+  //
+  // This software is provided 'as-is', without any express or implied
+  // warranty. In no event will the authors be held liable for any damages
+  // arising from the use of this software.
+  //
+  // Permission is granted to anyone to use this software for any purpose,
+  // including commercial applications, and to alter it and redistribute it
+  // freely, subject to the following restrictions:
+  //
+  // 1. The origin of this software must not be misrepresented; you must not
+  //   claim that you wrote the original software. If you use this software
+  //   in a product, an acknowledgment in the product documentation would be
+  //   appreciated but is not required.
+  // 2. Altered source versions must be plainly marked as such, and must not be
+  //   misrepresented as being the original software.
+  // 3. This notice may not be removed or altered from any source distribution.
+
+  // See state defs from inflate.js
+  var BAD = 30;       /* got a data error -- remain here until reset */
+  var TYPE = 12;      /* i: waiting for type bits, including last-flag bit */
+
+  /*
      Decode literal, length, and distance codes and write out the resulting
      literal and match bytes until either not enough input or output is
      available, an end-of-block is encountered, or a data error is encountered.
@@ -762,656 +631,570 @@
         requires strm.avail_out >= 258 for each loop to avoid checking for
         output space.
    */
-					module.exports = function inflate_fast( strm, start ) {
-						var state;
-						var _in; /* local strm.input */
-						var last; /* have enough input while in < last */
-						var _out; /* local strm.output */
-						var beg; /* inflate()'s initial strm.output */
-						var end; /* while out < end, enough space available */
-						//#ifdef INFLATE_STRICT
-						var dmax; /* maximum distance from zlib header */
-						//#endif
-						var wsize; /* window size or zero if not using window */
-						var whave; /* valid bytes in the window */
-						var wnext; /* window write index */
-						// Use `s_window` instead `window`, avoid conflict with instrumentation tools
-						var s_window; /* allocated sliding window, if wsize != 0 */
-						var hold; /* local strm.hold */
-						var bits; /* local strm.bits */
-						var lcode; /* local strm.lencode */
-						var dcode; /* local strm.distcode */
-						var lmask; /* mask for first level of length codes */
-						var dmask; /* mask for first level of distance codes */
-						var here; /* retrieved table entry */
-						var op; /* code bits, operation, extra bits, or */
-						/*  window position, window bytes to copy */
-						var len; /* match length, unused bytes */
-						var dist; /* match distance */
-						var from; /* where to copy match from */
-						var from_source;
-
-						var input, output; // JS specific, because we have no pointers
-
-						/* copy state to local variables */
-						state = strm.state;
-						//here = state.here;
-						_in = strm.next_in;
-						input = strm.input;
-						last = _in + ( strm.avail_in - 5 );
-						_out = strm.next_out;
-						output = strm.output;
-						beg = _out - ( start - strm.avail_out );
-						end = _out + ( strm.avail_out - 257 );
-						//#ifdef INFLATE_STRICT
-						dmax = state.dmax;
-						//#endif
-						wsize = state.wsize;
-						whave = state.whave;
-						wnext = state.wnext;
-						s_window = state.window;
-						hold = state.hold;
-						bits = state.bits;
-						lcode = state.lencode;
-						dcode = state.distcode;
-						lmask = ( 1 << state.lenbits ) - 1;
-						dmask = ( 1 << state.distbits ) - 1;
-
-						/* decode literals and length/distances until end-of-block or not enough
+  module.exports = function inflate_fast(strm, start) {
+    var state;
+    var _in;                    /* local strm.input */
+    var last;                   /* have enough input while in < last */
+    var _out;                   /* local strm.output */
+    var beg;                    /* inflate()'s initial strm.output */
+    var end;                    /* while out < end, enough space available */
+  //#ifdef INFLATE_STRICT
+    var dmax;                   /* maximum distance from zlib header */
+  //#endif
+    var wsize;                  /* window size or zero if not using window */
+    var whave;                  /* valid bytes in the window */
+    var wnext;                  /* window write index */
+    // Use `s_window` instead `window`, avoid conflict with instrumentation tools
+    var s_window;               /* allocated sliding window, if wsize != 0 */
+    var hold;                   /* local strm.hold */
+    var bits;                   /* local strm.bits */
+    var lcode;                  /* local strm.lencode */
+    var dcode;                  /* local strm.distcode */
+    var lmask;                  /* mask for first level of length codes */
+    var dmask;                  /* mask for first level of distance codes */
+    var here;                   /* retrieved table entry */
+    var op;                     /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    var len;                    /* match length, unused bytes */
+    var dist;                   /* match distance */
+    var from;                   /* where to copy match from */
+    var from_source;
+
+
+    var input, output; // JS specific, because we have no pointers
+
+    /* copy state to local variables */
+    state = strm.state;
+    //here = state.here;
+    _in = strm.next_in;
+    input = strm.input;
+    last = _in + (strm.avail_in - 5);
+    _out = strm.next_out;
+    output = strm.output;
+    beg = _out - (start - strm.avail_out);
+    end = _out + (strm.avail_out - 257);
+  //#ifdef INFLATE_STRICT
+    dmax = state.dmax;
+  //#endif
+    wsize = state.wsize;
+    whave = state.whave;
+    wnext = state.wnext;
+    s_window = state.window;
+    hold = state.hold;
+    bits = state.bits;
+    lcode = state.lencode;
+    dcode = state.distcode;
+    lmask = (1 << state.lenbits) - 1;
+    dmask = (1 << state.distbits) - 1;
+
+
+    /* decode literals and length/distances until end-of-block or not enough
        input data or output space */
 
-						top: do {
-							if ( bits < 15 ) {
-								hold += input[ _in++ ] << bits;
-								bits += 8;
-								hold += input[ _in++ ] << bits;
-								bits += 8;
-							}
-
-							here = lcode[ hold & lmask ];
-
-							dolen: for (;;) {
-								// Goto emulation
-								op = here >>> 24 /*here.bits*/;
-								hold >>>= op;
-								bits -= op;
-								op = ( here >>> 16 ) & 0xff /*here.op*/;
-								if ( op === 0 ) {
-									/* literal */
-									//Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-									//        "inflate:         literal '%c'\n" :
-									//        "inflate:         literal 0x%02x\n", here.val));
-									output[ _out++ ] =
-										here & 0xffff /*here.val*/;
-								} else if ( op & 16 ) {
-									/* length base */
-									len = here & 0xffff /*here.val*/;
-									op &= 15; /* number of extra bits */
-									if ( op ) {
-										if ( bits < op ) {
-											hold += input[ _in++ ] << bits;
-											bits += 8;
-										}
-										len += hold & ( ( 1 << op ) - 1 );
-										hold >>>= op;
-										bits -= op;
-									}
-									//Tracevv((stderr, "inflate:         length %u\n", len));
-									if ( bits < 15 ) {
-										hold += input[ _in++ ] << bits;
-										bits += 8;
-										hold += input[ _in++ ] << bits;
-										bits += 8;
-									}
-									here = dcode[ hold & dmask ];
-
-									dodist: for (;;) {
-										// goto emulation
-										op = here >>> 24 /*here.bits*/;
-										hold >>>= op;
-										bits -= op;
-										op = ( here >>> 16 ) & 0xff /*here.op*/;
-
-										if ( op & 16 ) {
-											/* distance base */
-											dist = here & 0xffff /*here.val*/;
-											op &= 15; /* number of extra bits */
-											if ( bits < op ) {
-												hold += input[ _in++ ] << bits;
-												bits += 8;
-												if ( bits < op ) {
-													hold +=
-														input[ _in++ ] << bits;
-													bits += 8;
-												}
-											}
-											dist += hold & ( ( 1 << op ) - 1 );
-											//#ifdef INFLATE_STRICT
-											if ( dist > dmax ) {
-												strm.msg =
-													'invalid distance too far back';
-												state.mode = BAD;
-												break top;
-											}
-											//#endif
-											hold >>>= op;
-											bits -= op;
-											//Tracevv((stderr, "inflate:         distance %u\n", dist));
-											op =
-												_out -
-												beg; /* max distance in output */
-											if ( dist > op ) {
-												/* see if copy from window */
-												op =
-													dist -
-													op; /* distance back in window */
-												if ( op > whave ) {
-													if ( state.sane ) {
-														strm.msg =
-															'invalid distance too far back';
-														state.mode = BAD;
-														break top;
-													}
-
-													// (!) This block is disabled in zlib defaults,
-													// don't enable it for binary compatibility
-													//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-													//                if (len <= op - whave) {
-													//                  do {
-													//                    output[_out++] = 0;
-													//                  } while (--len);
-													//                  continue top;
-													//                }
-													//                len -= op - whave;
-													//                do {
-													//                  output[_out++] = 0;
-													//                } while (--op > whave);
-													//                if (op === 0) {
-													//                  from = _out - dist;
-													//                  do {
-													//                    output[_out++] = output[from++];
-													//                  } while (--len);
-													//                  continue top;
-													//                }
-													//#endif
-												}
-												from = 0; // window index
-												from_source = s_window;
-												if ( wnext === 0 ) {
-													/* very common case */
-													from += wsize - op;
-													if ( op < len ) {
-														/* some from window */
-														len -= op;
-														do {
-															output[ _out++ ] =
-																s_window[
-																	from++
-																];
-														} while ( --op );
-														from =
-															_out -
-															dist; /* rest from output */
-														from_source = output;
-													}
-												} else if ( wnext < op ) {
-													/* wrap around window */
-													from += wsize + wnext - op;
-													op -= wnext;
-													if ( op < len ) {
-														/* some from end of window */
-														len -= op;
-														do {
-															output[ _out++ ] =
-																s_window[
-																	from++
-																];
-														} while ( --op );
-														from = 0;
-														if ( wnext < len ) {
-															/* some from start of window */
-															op = wnext;
-															len -= op;
-															do {
-																output[
-																	_out++
-																] =
-																	s_window[
-																		from++
-																	];
-															} while ( --op );
-															from =
-																_out -
-																dist; /* rest from output */
-															from_source =
-																output;
-														}
-													}
-												} else {
-													/* contiguous in window */
-													from += wnext - op;
-													if ( op < len ) {
-														/* some from window */
-														len -= op;
-														do {
-															output[ _out++ ] =
-																s_window[
-																	from++
-																];
-														} while ( --op );
-														from =
-															_out -
-															dist; /* rest from output */
-														from_source = output;
-													}
-												}
-												while ( len > 2 ) {
-													output[ _out++ ] =
-														from_source[ from++ ];
-													output[ _out++ ] =
-														from_source[ from++ ];
-													output[ _out++ ] =
-														from_source[ from++ ];
-													len -= 3;
-												}
-												if ( len ) {
-													output[ _out++ ] =
-														from_source[ from++ ];
-													if ( len > 1 ) {
-														output[ _out++ ] =
-															from_source[
-																from++
-															];
-													}
-												}
-											} else {
-												from =
-													_out -
-													dist; /* copy direct from output */
-												do {
-													/* minimum length is three */
-													output[ _out++ ] =
-														output[ from++ ];
-													output[ _out++ ] =
-														output[ from++ ];
-													output[ _out++ ] =
-														output[ from++ ];
-													len -= 3;
-												} while ( len > 2 );
-												if ( len ) {
-													output[ _out++ ] =
-														output[ from++ ];
-													if ( len > 1 ) {
-														output[ _out++ ] =
-															output[ from++ ];
-													}
-												}
-											}
-										} else if ( ( op & 64 ) === 0 ) {
-											/* 2nd level distance code */
-											here =
-												dcode[
-													( here &
-														0xffff ) /*here.val*/ +
-														( hold &
-															( ( 1 << op ) -
-																1 ) )
-												];
-											continue dodist;
-										} else {
-											strm.msg = 'invalid distance code';
-											state.mode = BAD;
-											break top;
-										}
-
-										break; // need to emulate goto via "continue"
-									}
-								} else if ( ( op & 64 ) === 0 ) {
-									/* 2nd level length code */
-									here =
-										lcode[
-											( here & 0xffff ) /*here.val*/ +
-												( hold & ( ( 1 << op ) - 1 ) )
-										];
-									continue dolen;
-								} else if ( op & 32 ) {
-									/* end-of-block */
-									//Tracevv((stderr, "inflate:         end of block\n"));
-									state.mode = TYPE;
-									break top;
-								} else {
-									strm.msg = 'invalid literal/length code';
-									state.mode = BAD;
-									break top;
-								}
-
-								break; // need to emulate goto via "continue"
-							}
-						} while ( _in < last && _out < end );
-
-						/* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-						len = bits >> 3;
-						_in -= len;
-						bits -= len << 3;
-						hold &= ( 1 << bits ) - 1;
-
-						/* update state and return */
-						strm.next_in = _in;
-						strm.next_out = _out;
-						strm.avail_in =
-							_in < last
-								? 5 + ( last - _in )
-								: 5 - ( _in - last );
-						strm.avail_out =
-							_out < end
-								? 257 + ( end - _out )
-								: 257 - ( _out - end );
-						state.hold = hold;
-						state.bits = bits;
-						return;
-					};
-				},
-				{},
-			],
-			8: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					// (C) 1995-2013 Jean-loup Gailly and Mark Adler
-					// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
-					//
-					// This software is provided 'as-is', without any express or implied
-					// warranty. In no event will the authors be held liable for any damages
-					// arising from the use of this software.
-					//
-					// Permission is granted to anyone to use this software for any purpose,
-					// including commercial applications, and to alter it and redistribute it
-					// freely, subject to the following restrictions:
-					//
-					// 1. The origin of this software must not be misrepresented; you must not
-					//   claim that you wrote the original software. If you use this software
-					//   in a product, an acknowledgment in the product documentation would be
-					//   appreciated but is not required.
-					// 2. Altered source versions must be plainly marked as such, and must not be
-					//   misrepresented as being the original software.
-					// 3. This notice may not be removed or altered from any source distribution.
-
-					var utils = require( '../utils/common' );
-					var adler32 = require( './adler32' );
-					var crc32 = require( './crc32' );
-					var inflate_fast = require( './inffast' );
-					var inflate_table = require( './inftrees' );
-
-					var CODES = 0;
-					var LENS = 1;
-					var DISTS = 2;
-
-					/* Public constants ==========================================================*/
-					/* ===========================================================================*/
-
-					/* Allowed flush values; see deflate() and inflate() below for details */
-					//var Z_NO_FLUSH      = 0;
-					//var Z_PARTIAL_FLUSH = 1;
-					//var Z_SYNC_FLUSH    = 2;
-					//var Z_FULL_FLUSH    = 3;
-					var Z_FINISH = 4;
-					var Z_BLOCK = 5;
-					var Z_TREES = 6;
-
-					/* Return codes for the compression/decompression functions. Negative values
-					 * are errors, positive values are used for special but normal events.
-					 */
-					var Z_OK = 0;
-					var Z_STREAM_END = 1;
-					var Z_NEED_DICT = 2;
-					//var Z_ERRNO         = -1;
-					var Z_STREAM_ERROR = -2;
-					var Z_DATA_ERROR = -3;
-					var Z_MEM_ERROR = -4;
-					var Z_BUF_ERROR = -5;
-					//var Z_VERSION_ERROR = -6;
-
-					/* The deflate compression method */
-					var Z_DEFLATED = 8;
-
-					/* STATES ====================================================================*/
-					/* ===========================================================================*/
-
-					var HEAD = 1; /* i: waiting for magic header */
-					var FLAGS = 2; /* i: waiting for method and flags (gzip) */
-					var TIME = 3; /* i: waiting for modification time (gzip) */
-					var OS = 4; /* i: waiting for extra flags and operating system (gzip) */
-					var EXLEN = 5; /* i: waiting for extra length (gzip) */
-					var EXTRA = 6; /* i: waiting for extra bytes (gzip) */
-					var NAME = 7; /* i: waiting for end of file name (gzip) */
-					var COMMENT = 8; /* i: waiting for end of comment (gzip) */
-					var HCRC = 9; /* i: waiting for header crc (gzip) */
-					var DICTID = 10; /* i: waiting for dictionary check value */
-					var DICT = 11; /* waiting for inflateSetDictionary() call */
-					var TYPE = 12; /* i: waiting for type bits, including last-flag bit */
-					var TYPEDO = 13; /* i: same, but skip check to exit inflate on new block */
-					var STORED = 14; /* i: waiting for stored size (length and complement) */
-					var COPY_ = 15; /* i/o: same as COPY below, but only first time in */
-					var COPY = 16; /* i/o: waiting for input or output to copy stored block */
-					var TABLE = 17; /* i: waiting for dynamic block table lengths */
-					var LENLENS = 18; /* i: waiting for code length code lengths */
-					var CODELENS = 19; /* i: waiting for length/lit and distance code lengths */
-					var LEN_ = 20; /* i: same as LEN below, but only first time in */
-					var LEN = 21; /* i: waiting for length/lit/eob code */
-					var LENEXT = 22; /* i: waiting for length extra bits */
-					var DIST = 23; /* i: waiting for distance code */
-					var DISTEXT = 24; /* i: waiting for distance extra bits */
-					var MATCH = 25; /* o: waiting for output space to copy string */
-					var LIT = 26; /* o: waiting for output space to write literal */
-					var CHECK = 27; /* i: waiting for 32-bit check value */
-					var LENGTH = 28; /* i: waiting for 32-bit length (gzip) */
-					var DONE = 29; /* finished check, done -- remain here until reset */
-					var BAD = 30; /* got a data error -- remain here until reset */
-					var MEM = 31; /* got an inflate() memory error -- remain here until reset */
-					var SYNC = 32; /* looking for synchronization bytes to restart inflate() */
-
-					/* ===========================================================================*/
-
-					var ENOUGH_LENS = 852;
-					var ENOUGH_DISTS = 592;
-					//var ENOUGH =  (ENOUGH_LENS+ENOUGH_DISTS);
-
-					var MAX_WBITS = 15;
-					/* 32K LZ77 window */
-					var DEF_WBITS = MAX_WBITS;
-
-					function zswap32( q ) {
-						return (
-							( ( q >>> 24 ) & 0xff ) +
-							( ( q >>> 8 ) & 0xff00 ) +
-							( ( q & 0xff00 ) << 8 ) +
-							( ( q & 0xff ) << 24 )
-						);
-					}
-
-					function InflateState() {
-						this.mode = 0; /* current inflate mode */
-						this.last = false; /* true if processing last block */
-						this.wrap = 0; /* bit 0 true for zlib, bit 1 true for gzip */
-						this.havedict = false; /* true if dictionary provided */
-						this.flags = 0; /* gzip header method and flags (0 if zlib) */
-						this.dmax = 0; /* zlib header max distance (INFLATE_STRICT) */
-						this.check = 0; /* protected copy of check value */
-						this.total = 0; /* protected copy of output count */
-						// TODO: may be {}
-						this.head =
-							null; /* where to save gzip header information */
-
-						/* sliding window */
-						this.wbits = 0; /* log base 2 of requested window size */
-						this.wsize = 0; /* window size or zero if not using window */
-						this.whave = 0; /* valid bytes in the window */
-						this.wnext = 0; /* window write index */
-						this.window =
-							null; /* allocated sliding window, if needed */
-
-						/* bit accumulator */
-						this.hold = 0; /* input bit accumulator */
-						this.bits = 0; /* number of bits in "in" */
-
-						/* for string and stored block copying */
-						this.length = 0; /* literal or length of data to copy */
-						this.offset = 0; /* distance back to copy string from */
-
-						/* for table and code decoding */
-						this.extra = 0; /* extra bits needed */
-
-						/* fixed and dynamic code tables */
-						this.lencode =
-							null; /* starting table for length/literal codes */
-						this.distcode =
-							null; /* starting table for distance codes */
-						this.lenbits = 0; /* index bits for lencode */
-						this.distbits = 0; /* index bits for distcode */
-
-						/* dynamic table building */
-						this.ncode = 0; /* number of code length code lengths */
-						this.nlen = 0; /* number of length code lengths */
-						this.ndist = 0; /* number of distance code lengths */
-						this.have = 0; /* number of code lengths in lens[] */
-						this.next = null; /* next available space in codes[] */
-
-						this.lens = new utils.Buf16(
-							320
-						); /* temporary storage for code lengths */
-						this.work = new utils.Buf16(
-							288
-						); /* work area for code table building */
-
-						/*
+    top:
+    do {
+      if (bits < 15) {
+        hold += input[_in++] << bits;
+        bits += 8;
+        hold += input[_in++] << bits;
+        bits += 8;
+      }
+
+      here = lcode[hold & lmask];
+
+      dolen:
+      for (;;) { // Goto emulation
+        op = here >>> 24/*here.bits*/;
+        hold >>>= op;
+        bits -= op;
+        op = (here >>> 16) & 0xff/*here.op*/;
+        if (op === 0) {                          /* literal */
+          //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+          //        "inflate:         literal '%c'\n" :
+          //        "inflate:         literal 0x%02x\n", here.val));
+          output[_out++] = here & 0xffff/*here.val*/;
+        }
+        else if (op & 16) {                     /* length base */
+          len = here & 0xffff/*here.val*/;
+          op &= 15;                           /* number of extra bits */
+          if (op) {
+            if (bits < op) {
+              hold += input[_in++] << bits;
+              bits += 8;
+            }
+            len += hold & ((1 << op) - 1);
+            hold >>>= op;
+            bits -= op;
+          }
+          //Tracevv((stderr, "inflate:         length %u\n", len));
+          if (bits < 15) {
+            hold += input[_in++] << bits;
+            bits += 8;
+            hold += input[_in++] << bits;
+            bits += 8;
+          }
+          here = dcode[hold & dmask];
+
+          dodist:
+          for (;;) { // goto emulation
+            op = here >>> 24/*here.bits*/;
+            hold >>>= op;
+            bits -= op;
+            op = (here >>> 16) & 0xff/*here.op*/;
+
+            if (op & 16) {                      /* distance base */
+              dist = here & 0xffff/*here.val*/;
+              op &= 15;                       /* number of extra bits */
+              if (bits < op) {
+                hold += input[_in++] << bits;
+                bits += 8;
+                if (bits < op) {
+                  hold += input[_in++] << bits;
+                  bits += 8;
+                }
+              }
+              dist += hold & ((1 << op) - 1);
+  //#ifdef INFLATE_STRICT
+              if (dist > dmax) {
+                strm.msg = 'invalid distance too far back';
+                state.mode = BAD;
+                break top;
+              }
+  //#endif
+              hold >>>= op;
+              bits -= op;
+              //Tracevv((stderr, "inflate:         distance %u\n", dist));
+              op = _out - beg;                /* max distance in output */
+              if (dist > op) {                /* see if copy from window */
+                op = dist - op;               /* distance back in window */
+                if (op > whave) {
+                  if (state.sane) {
+                    strm.msg = 'invalid distance too far back';
+                    state.mode = BAD;
+                    break top;
+                  }
+
+  // (!) This block is disabled in zlib defaults,
+  // don't enable it for binary compatibility
+  //#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+  //                if (len <= op - whave) {
+  //                  do {
+  //                    output[_out++] = 0;
+  //                  } while (--len);
+  //                  continue top;
+  //                }
+  //                len -= op - whave;
+  //                do {
+  //                  output[_out++] = 0;
+  //                } while (--op > whave);
+  //                if (op === 0) {
+  //                  from = _out - dist;
+  //                  do {
+  //                    output[_out++] = output[from++];
+  //                  } while (--len);
+  //                  continue top;
+  //                }
+  //#endif
+                }
+                from = 0; // window index
+                from_source = s_window;
+                if (wnext === 0) {           /* very common case */
+                  from += wsize - op;
+                  if (op < len) {         /* some from window */
+                    len -= op;
+                    do {
+                      output[_out++] = s_window[from++];
+                    } while (--op);
+                    from = _out - dist;  /* rest from output */
+                    from_source = output;
+                  }
+                }
+                else if (wnext < op) {      /* wrap around window */
+                  from += wsize + wnext - op;
+                  op -= wnext;
+                  if (op < len) {         /* some from end of window */
+                    len -= op;
+                    do {
+                      output[_out++] = s_window[from++];
+                    } while (--op);
+                    from = 0;
+                    if (wnext < len) {  /* some from start of window */
+                      op = wnext;
+                      len -= op;
+                      do {
+                        output[_out++] = s_window[from++];
+                      } while (--op);
+                      from = _out - dist;      /* rest from output */
+                      from_source = output;
+                    }
+                  }
+                }
+                else {                      /* contiguous in window */
+                  from += wnext - op;
+                  if (op < len) {         /* some from window */
+                    len -= op;
+                    do {
+                      output[_out++] = s_window[from++];
+                    } while (--op);
+                    from = _out - dist;  /* rest from output */
+                    from_source = output;
+                  }
+                }
+                while (len > 2) {
+                  output[_out++] = from_source[from++];
+                  output[_out++] = from_source[from++];
+                  output[_out++] = from_source[from++];
+                  len -= 3;
+                }
+                if (len) {
+                  output[_out++] = from_source[from++];
+                  if (len > 1) {
+                    output[_out++] = from_source[from++];
+                  }
+                }
+              }
+              else {
+                from = _out - dist;          /* copy direct from output */
+                do {                        /* minimum length is three */
+                  output[_out++] = output[from++];
+                  output[_out++] = output[from++];
+                  output[_out++] = output[from++];
+                  len -= 3;
+                } while (len > 2);
+                if (len) {
+                  output[_out++] = output[from++];
+                  if (len > 1) {
+                    output[_out++] = output[from++];
+                  }
+                }
+              }
+            }
+            else if ((op & 64) === 0) {          /* 2nd level distance code */
+              here = dcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
+              continue dodist;
+            }
+            else {
+              strm.msg = 'invalid distance code';
+              state.mode = BAD;
+              break top;
+            }
+
+            break; // need to emulate goto via "continue"
+          }
+        }
+        else if ((op & 64) === 0) {              /* 2nd level length code */
+          here = lcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
+          continue dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+          //Tracevv((stderr, "inflate:         end of block\n"));
+          state.mode = TYPE;
+          break top;
+        }
+        else {
+          strm.msg = 'invalid literal/length code';
+          state.mode = BAD;
+          break top;
+        }
+
+        break; // need to emulate goto via "continue"
+      }
+    } while (_in < last && _out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    _in -= len;
+    bits -= len << 3;
+    hold &= (1 << bits) - 1;
+
+    /* update state and return */
+    strm.next_in = _in;
+    strm.next_out = _out;
+    strm.avail_in = (_in < last ? 5 + (last - _in) : 5 - (_in - last));
+    strm.avail_out = (_out < end ? 257 + (end - _out) : 257 - (_out - end));
+    state.hold = hold;
+    state.bits = bits;
+    return;
+  };
+
+  },{}],8:[function(require,module,exports){
+  'use strict';
+
+  // (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  // (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+  //
+  // This software is provided 'as-is', without any express or implied
+  // warranty. In no event will the authors be held liable for any damages
+  // arising from the use of this software.
+  //
+  // Permission is granted to anyone to use this software for any purpose,
+  // including commercial applications, and to alter it and redistribute it
+  // freely, subject to the following restrictions:
+  //
+  // 1. The origin of this software must not be misrepresented; you must not
+  //   claim that you wrote the original software. If you use this software
+  //   in a product, an acknowledgment in the product documentation would be
+  //   appreciated but is not required.
+  // 2. Altered source versions must be plainly marked as such, and must not be
+  //   misrepresented as being the original software.
+  // 3. This notice may not be removed or altered from any source distribution.
+
+  var utils         = require('../utils/common');
+  var adler32       = require('./adler32');
+  var crc32         = require('./crc32');
+  var inflate_fast  = require('./inffast');
+  var inflate_table = require('./inftrees');
+
+  var CODES = 0;
+  var LENS = 1;
+  var DISTS = 2;
+
+  /* Public constants ==========================================================*/
+  /* ===========================================================================*/
+
+
+  /* Allowed flush values; see deflate() and inflate() below for details */
+  //var Z_NO_FLUSH      = 0;
+  //var Z_PARTIAL_FLUSH = 1;
+  //var Z_SYNC_FLUSH    = 2;
+  //var Z_FULL_FLUSH    = 3;
+  var Z_FINISH        = 4;
+  var Z_BLOCK         = 5;
+  var Z_TREES         = 6;
+
+
+  /* Return codes for the compression/decompression functions. Negative values
+   * are errors, positive values are used for special but normal events.
+   */
+  var Z_OK            = 0;
+  var Z_STREAM_END    = 1;
+  var Z_NEED_DICT     = 2;
+  //var Z_ERRNO         = -1;
+  var Z_STREAM_ERROR  = -2;
+  var Z_DATA_ERROR    = -3;
+  var Z_MEM_ERROR     = -4;
+  var Z_BUF_ERROR     = -5;
+  //var Z_VERSION_ERROR = -6;
+
+  /* The deflate compression method */
+  var Z_DEFLATED  = 8;
+
+
+  /* STATES ====================================================================*/
+  /* ===========================================================================*/
+
+
+  var    HEAD = 1;       /* i: waiting for magic header */
+  var    FLAGS = 2;      /* i: waiting for method and flags (gzip) */
+  var    TIME = 3;       /* i: waiting for modification time (gzip) */
+  var    OS = 4;         /* i: waiting for extra flags and operating system (gzip) */
+  var    EXLEN = 5;      /* i: waiting for extra length (gzip) */
+  var    EXTRA = 6;      /* i: waiting for extra bytes (gzip) */
+  var    NAME = 7;       /* i: waiting for end of file name (gzip) */
+  var    COMMENT = 8;    /* i: waiting for end of comment (gzip) */
+  var    HCRC = 9;       /* i: waiting for header crc (gzip) */
+  var    DICTID = 10;    /* i: waiting for dictionary check value */
+  var    DICT = 11;      /* waiting for inflateSetDictionary() call */
+  var        TYPE = 12;      /* i: waiting for type bits, including last-flag bit */
+  var        TYPEDO = 13;    /* i: same, but skip check to exit inflate on new block */
+  var        STORED = 14;    /* i: waiting for stored size (length and complement) */
+  var        COPY_ = 15;     /* i/o: same as COPY below, but only first time in */
+  var        COPY = 16;      /* i/o: waiting for input or output to copy stored block */
+  var        TABLE = 17;     /* i: waiting for dynamic block table lengths */
+  var        LENLENS = 18;   /* i: waiting for code length code lengths */
+  var        CODELENS = 19;  /* i: waiting for length/lit and distance code lengths */
+  var            LEN_ = 20;      /* i: same as LEN below, but only first time in */
+  var            LEN = 21;       /* i: waiting for length/lit/eob code */
+  var            LENEXT = 22;    /* i: waiting for length extra bits */
+  var            DIST = 23;      /* i: waiting for distance code */
+  var            DISTEXT = 24;   /* i: waiting for distance extra bits */
+  var            MATCH = 25;     /* o: waiting for output space to copy string */
+  var            LIT = 26;       /* o: waiting for output space to write literal */
+  var    CHECK = 27;     /* i: waiting for 32-bit check value */
+  var    LENGTH = 28;    /* i: waiting for 32-bit length (gzip) */
+  var    DONE = 29;      /* finished check, done -- remain here until reset */
+  var    BAD = 30;       /* got a data error -- remain here until reset */
+  var    MEM = 31;       /* got an inflate() memory error -- remain here until reset */
+  var    SYNC = 32;      /* looking for synchronization bytes to restart inflate() */
+
+  /* ===========================================================================*/
+
+
+
+  var ENOUGH_LENS = 852;
+  var ENOUGH_DISTS = 592;
+  //var ENOUGH =  (ENOUGH_LENS+ENOUGH_DISTS);
+
+  var MAX_WBITS = 15;
+  /* 32K LZ77 window */
+  var DEF_WBITS = MAX_WBITS;
+
+
+  function zswap32(q) {
+    return  (((q >>> 24) & 0xff) +
+            ((q >>> 8) & 0xff00) +
+            ((q & 0xff00) << 8) +
+            ((q & 0xff) << 24));
+  }
+
+
+  function InflateState() {
+    this.mode = 0;             /* current inflate mode */
+    this.last = false;          /* true if processing last block */
+    this.wrap = 0;              /* bit 0 true for zlib, bit 1 true for gzip */
+    this.havedict = false;      /* true if dictionary provided */
+    this.flags = 0;             /* gzip header method and flags (0 if zlib) */
+    this.dmax = 0;              /* zlib header max distance (INFLATE_STRICT) */
+    this.check = 0;             /* protected copy of check value */
+    this.total = 0;             /* protected copy of output count */
+    // TODO: may be {}
+    this.head = null;           /* where to save gzip header information */
+
+    /* sliding window */
+    this.wbits = 0;             /* log base 2 of requested window size */
+    this.wsize = 0;             /* window size or zero if not using window */
+    this.whave = 0;             /* valid bytes in the window */
+    this.wnext = 0;             /* window write index */
+    this.window = null;         /* allocated sliding window, if needed */
+
+    /* bit accumulator */
+    this.hold = 0;              /* input bit accumulator */
+    this.bits = 0;              /* number of bits in "in" */
+
+    /* for string and stored block copying */
+    this.length = 0;            /* literal or length of data to copy */
+    this.offset = 0;            /* distance back to copy string from */
+
+    /* for table and code decoding */
+    this.extra = 0;             /* extra bits needed */
+
+    /* fixed and dynamic code tables */
+    this.lencode = null;          /* starting table for length/literal codes */
+    this.distcode = null;         /* starting table for distance codes */
+    this.lenbits = 0;           /* index bits for lencode */
+    this.distbits = 0;          /* index bits for distcode */
+
+    /* dynamic table building */
+    this.ncode = 0;             /* number of code length code lengths */
+    this.nlen = 0;              /* number of length code lengths */
+    this.ndist = 0;             /* number of distance code lengths */
+    this.have = 0;              /* number of code lengths in lens[] */
+    this.next = null;              /* next available space in codes[] */
+
+    this.lens = new utils.Buf16(320); /* temporary storage for code lengths */
+    this.work = new utils.Buf16(288); /* work area for code table building */
+
+    /*
      because we don't have pointers in js, we use lencode and distcode directly
      as buffers so we don't need codes
     */
-						//this.codes = new utils.Buf32(ENOUGH);       /* space for code tables */
-						this.lendyn =
-							null; /* dynamic table for length/literal codes (JS specific) */
-						this.distdyn =
-							null; /* dynamic table for distance codes (JS specific) */
-						this.sane = 0; /* if false, allow invalid distance too far */
-						this.back = 0; /* bits back of last unprocessed length/lit */
-						this.was = 0; /* initial length of match */
-					}
-
-					function inflateResetKeep( strm ) {
-						var state;
-
-						if ( ! strm || ! strm.state ) {
-							return Z_STREAM_ERROR;
-						}
-						state = strm.state;
-						strm.total_in = strm.total_out = state.total = 0;
-						strm.msg = ''; /*Z_NULL*/
-						if ( state.wrap ) {
-							/* to support ill-conceived Java test suite */
-							strm.adler = state.wrap & 1;
-						}
-						state.mode = HEAD;
-						state.last = 0;
-						state.havedict = 0;
-						state.dmax = 32768;
-						state.head = null /*Z_NULL*/;
-						state.hold = 0;
-						state.bits = 0;
-						//state.lencode = state.distcode = state.next = state.codes;
-						state.lencode = state.lendyn = new utils.Buf32(
-							ENOUGH_LENS
-						);
-						state.distcode = state.distdyn = new utils.Buf32(
-							ENOUGH_DISTS
-						);
-
-						state.sane = 1;
-						state.back = -1;
-						//Tracev((stderr, "inflate: reset\n"));
-						return Z_OK;
-					}
-
-					function inflateReset( strm ) {
-						var state;
-
-						if ( ! strm || ! strm.state ) {
-							return Z_STREAM_ERROR;
-						}
-						state = strm.state;
-						state.wsize = 0;
-						state.whave = 0;
-						state.wnext = 0;
-						return inflateResetKeep( strm );
-					}
-
-					function inflateReset2( strm, windowBits ) {
-						var wrap;
-						var state;
-
-						/* get the state */
-						if ( ! strm || ! strm.state ) {
-							return Z_STREAM_ERROR;
-						}
-						state = strm.state;
-
-						/* extract wrap request from windowBits parameter */
-						if ( windowBits < 0 ) {
-							wrap = 0;
-							windowBits = -windowBits;
-						} else {
-							wrap = ( windowBits >> 4 ) + 1;
-							if ( windowBits < 48 ) {
-								windowBits &= 15;
-							}
-						}
-
-						/* set number of window bits, free window if different */
-						if (
-							windowBits &&
-							( windowBits < 8 || windowBits > 15 )
-						) {
-							return Z_STREAM_ERROR;
-						}
-						if (
-							state.window !== null &&
-							state.wbits !== windowBits
-						) {
-							state.window = null;
-						}
-
-						/* update state and reset the rest of it */
-						state.wrap = wrap;
-						state.wbits = windowBits;
-						return inflateReset( strm );
-					}
-
-					function inflateInit2( strm, windowBits ) {
-						var ret;
-						var state;
-
-						if ( ! strm ) {
-							return Z_STREAM_ERROR;
-						}
-						//strm.msg = Z_NULL;                 /* in case we return an error */
-
-						state = new InflateState();
-
-						//if (state === Z_NULL) return Z_MEM_ERROR;
-						//Tracev((stderr, "inflate: allocated\n"));
-						strm.state = state;
-						state.window = null /*Z_NULL*/;
-						ret = inflateReset2( strm, windowBits );
-						if ( ret !== Z_OK ) {
-							strm.state = null /*Z_NULL*/;
-						}
-						return ret;
-					}
-
-					function inflateInit( strm ) {
-						return inflateInit2( strm, DEF_WBITS );
-					}
-
-					/*
+    //this.codes = new utils.Buf32(ENOUGH);       /* space for code tables */
+    this.lendyn = null;              /* dynamic table for length/literal codes (JS specific) */
+    this.distdyn = null;             /* dynamic table for distance codes (JS specific) */
+    this.sane = 0;                   /* if false, allow invalid distance too far */
+    this.back = 0;                   /* bits back of last unprocessed length/lit */
+    this.was = 0;                    /* initial length of match */
+  }
+
+  function inflateResetKeep(strm) {
+    var state;
+
+    if (!strm || !strm.state) { return Z_STREAM_ERROR; }
+    state = strm.state;
+    strm.total_in = strm.total_out = state.total = 0;
+    strm.msg = ''; /*Z_NULL*/
+    if (state.wrap) {       /* to support ill-conceived Java test suite */
+      strm.adler = state.wrap & 1;
+    }
+    state.mode = HEAD;
+    state.last = 0;
+    state.havedict = 0;
+    state.dmax = 32768;
+    state.head = null/*Z_NULL*/;
+    state.hold = 0;
+    state.bits = 0;
+    //state.lencode = state.distcode = state.next = state.codes;
+    state.lencode = state.lendyn = new utils.Buf32(ENOUGH_LENS);
+    state.distcode = state.distdyn = new utils.Buf32(ENOUGH_DISTS);
+
+    state.sane = 1;
+    state.back = -1;
+    //Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+  }
+
+  function inflateReset(strm) {
+    var state;
+
+    if (!strm || !strm.state) { return Z_STREAM_ERROR; }
+    state = strm.state;
+    state.wsize = 0;
+    state.whave = 0;
+    state.wnext = 0;
+    return inflateResetKeep(strm);
+
+  }
+
+  function inflateReset2(strm, windowBits) {
+    var wrap;
+    var state;
+
+    /* get the state */
+    if (!strm || !strm.state) { return Z_STREAM_ERROR; }
+    state = strm.state;
+
+    /* extract wrap request from windowBits parameter */
+    if (windowBits < 0) {
+      wrap = 0;
+      windowBits = -windowBits;
+    }
+    else {
+      wrap = (windowBits >> 4) + 1;
+      if (windowBits < 48) {
+        windowBits &= 15;
+      }
+    }
+
+    /* set number of window bits, free window if different */
+    if (windowBits && (windowBits < 8 || windowBits > 15)) {
+      return Z_STREAM_ERROR;
+    }
+    if (state.window !== null && state.wbits !== windowBits) {
+      state.window = null;
+    }
+
+    /* update state and reset the rest of it */
+    state.wrap = wrap;
+    state.wbits = windowBits;
+    return inflateReset(strm);
+  }
+
+  function inflateInit2(strm, windowBits) {
+    var ret;
+    var state;
+
+    if (!strm) { return Z_STREAM_ERROR; }
+    //strm.msg = Z_NULL;                 /* in case we return an error */
+
+    state = new InflateState();
+
+    //if (state === Z_NULL) return Z_MEM_ERROR;
+    //Tracev((stderr, "inflate: allocated\n"));
+    strm.state = state;
+    state.window = null/*Z_NULL*/;
+    ret = inflateReset2(strm, windowBits);
+    if (ret !== Z_OK) {
+      strm.state = null/*Z_NULL*/;
+    }
+    return ret;
+  }
+
+  function inflateInit(strm) {
+    return inflateInit2(strm, DEF_WBITS);
+  }
+
+
+  /*
    Return state with length and distance decoding tables and index sizes set to
    fixed code decoding.  Normally this returns fixed tables from inffixed.h.
    If BUILDFIXED is defined, then instead this routine builds the tables the
@@ -1421,72 +1204,45 @@
    used for threaded applications, since the rewriting of the tables and virgin
    may not be thread-safe.
    */
-					var virgin = true;
-
-					var lenfix, distfix; // We have no pointers in JS, so keep tables separate
-
-					function fixedtables( state ) {
-						/* build fixed huffman tables if first call (may not be thread safe) */
-						if ( virgin ) {
-							var sym;
-
-							lenfix = new utils.Buf32( 512 );
-							distfix = new utils.Buf32( 32 );
-
-							/* literal/length table */
-							sym = 0;
-							while ( sym < 144 ) {
-								state.lens[ sym++ ] = 8;
-							}
-							while ( sym < 256 ) {
-								state.lens[ sym++ ] = 9;
-							}
-							while ( sym < 280 ) {
-								state.lens[ sym++ ] = 7;
-							}
-							while ( sym < 288 ) {
-								state.lens[ sym++ ] = 8;
-							}
-
-							inflate_table(
-								LENS,
-								state.lens,
-								0,
-								288,
-								lenfix,
-								0,
-								state.work,
-								{ bits: 9 }
-							);
-
-							/* distance table */
-							sym = 0;
-							while ( sym < 32 ) {
-								state.lens[ sym++ ] = 5;
-							}
-
-							inflate_table(
-								DISTS,
-								state.lens,
-								0,
-								32,
-								distfix,
-								0,
-								state.work,
-								{ bits: 5 }
-							);
-
-							/* do this just once */
-							virgin = false;
-						}
-
-						state.lencode = lenfix;
-						state.lenbits = 9;
-						state.distcode = distfix;
-						state.distbits = 5;
-					}
-
-					/*
+  var virgin = true;
+
+  var lenfix, distfix; // We have no pointers in JS, so keep tables separate
+
+  function fixedtables(state) {
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+      var sym;
+
+      lenfix = new utils.Buf32(512);
+      distfix = new utils.Buf32(32);
+
+      /* literal/length table */
+      sym = 0;
+      while (sym < 144) { state.lens[sym++] = 8; }
+      while (sym < 256) { state.lens[sym++] = 9; }
+      while (sym < 280) { state.lens[sym++] = 7; }
+      while (sym < 288) { state.lens[sym++] = 8; }
+
+      inflate_table(LENS,  state.lens, 0, 288, lenfix,   0, state.work, { bits: 9 });
+
+      /* distance table */
+      sym = 0;
+      while (sym < 32) { state.lens[sym++] = 5; }
+
+      inflate_table(DISTS, state.lens, 0, 32,   distfix, 0, state.work, { bits: 5 });
+
+      /* do this just once */
+      virgin = false;
+    }
+
+    state.lencode = lenfix;
+    state.lenbits = 9;
+    state.distcode = distfix;
+    state.distbits = 5;
+  }
+
+
+  /*
    Update the window with the last wsize (normally 32K) bytes written before
    returning.  If window does not exist yet, create it.  This is only called
    when a window is already in use, or when output has been written during this
@@ -1500,1592 +1256,1216 @@
    output will fall in the output data, making match copies simpler and faster.
    The advantage may be dependent on the size of the processor's data caches.
    */
-					function updatewindow( strm, src, end, copy ) {
-						var dist;
-						var state = strm.state;
-
-						/* if it hasn't been done already, allocate space for the window */
-						if ( state.window === null ) {
-							state.wsize = 1 << state.wbits;
-							state.wnext = 0;
-							state.whave = 0;
-
-							state.window = new utils.Buf8( state.wsize );
-						}
-
-						/* copy state->wsize or less output bytes into the circular window */
-						if ( copy >= state.wsize ) {
-							utils.arraySet(
-								state.window,
-								src,
-								end - state.wsize,
-								state.wsize,
-								0
-							);
-							state.wnext = 0;
-							state.whave = state.wsize;
-						} else {
-							dist = state.wsize - state.wnext;
-							if ( dist > copy ) {
-								dist = copy;
-							}
-							//zmemcpy(state->window + state->wnext, end - copy, dist);
-							utils.arraySet(
-								state.window,
-								src,
-								end - copy,
-								dist,
-								state.wnext
-							);
-							copy -= dist;
-							if ( copy ) {
-								//zmemcpy(state->window, end - copy, copy);
-								utils.arraySet(
-									state.window,
-									src,
-									end - copy,
-									copy,
-									0
-								);
-								state.wnext = copy;
-								state.whave = state.wsize;
-							} else {
-								state.wnext += dist;
-								if ( state.wnext === state.wsize ) {
-									state.wnext = 0;
-								}
-								if ( state.whave < state.wsize ) {
-									state.whave += dist;
-								}
-							}
-						}
-						return 0;
-					}
-
-					function inflate( strm, flush ) {
-						var state;
-						var input, output; // input/output buffers
-						var next; /* next input INDEX */
-						var put; /* next output INDEX */
-						var have, left; /* available input and output */
-						var hold; /* bit buffer */
-						var bits; /* bits in bit buffer */
-						var _in,
-							_out; /* save starting available input and output */
-						var copy; /* number of stored or match bytes to copy */
-						var from; /* where to copy match bytes from */
-						var from_source;
-						var here = 0; /* current decoding table entry */
-						var here_bits, here_op, here_val; // paked "here" denormalized (JS specific)
-						//var last;                   /* parent table entry */
-						var last_bits, last_op, last_val; // paked "last" denormalized (JS specific)
-						var len; /* length to copy for repeats, bits to drop */
-						var ret; /* return code */
-						var hbuf = new utils.Buf8(
-							4
-						); /* buffer for gzip header crc calculation */
-						var opts;
-
-						var n; // temporary var for NEED_BITS
-
-						var order =
-							/* permutation of code lengths */
-							[
-								16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3,
-								13, 2, 14, 1, 15,
-							];
-
-						if (
-							! strm ||
-							! strm.state ||
-							! strm.output ||
-							( ! strm.input && strm.avail_in !== 0 )
-						) {
-							return Z_STREAM_ERROR;
-						}
-
-						state = strm.state;
-						if ( state.mode === TYPE ) {
-							state.mode = TYPEDO;
-						} /* skip check */
-
-						//--- LOAD() ---
-						put = strm.next_out;
-						output = strm.output;
-						left = strm.avail_out;
-						next = strm.next_in;
-						input = strm.input;
-						have = strm.avail_in;
-						hold = state.hold;
-						bits = state.bits;
-						//---
-
-						_in = have;
-						_out = left;
-						ret = Z_OK;
-
-						// goto emulation
-						inf_leave: for (;;) {
-							switch ( state.mode ) {
-								case HEAD:
-									if ( state.wrap === 0 ) {
-										state.mode = TYPEDO;
-										break;
-									}
-									//=== NEEDBITS(16);
-									while ( bits < 16 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-									}
-									//===//
-									if ( state.wrap & 2 && hold === 0x8b1f ) {
-										/* gzip header */
-										state.check = 0 /*crc32(0L, Z_NULL, 0)*/;
-										//=== CRC2(state.check, hold);
-										hbuf[ 0 ] = hold & 0xff;
-										hbuf[ 1 ] = ( hold >>> 8 ) & 0xff;
-										state.check = crc32(
-											state.check,
-											hbuf,
-											2,
-											0
-										);
-										//===//
-
-										//=== INITBITS();
-										hold = 0;
-										bits = 0;
-										//===//
-										state.mode = FLAGS;
-										break;
-									}
-									state.flags = 0; /* expect zlib header */
-									if ( state.head ) {
-										state.head.done = false;
-									}
-									if (
-										! (
-											state.wrap & 1
-										) /* check if zlib header allowed */ ||
-										( ( ( hold & 0xff ) /*BITS(8)*/ << 8 ) +
-											( hold >> 8 ) ) %
-											31
-									) {
-										strm.msg = 'incorrect header check';
-										state.mode = BAD;
-										break;
-									}
-									if (
-										( hold & 0x0f ) /*BITS(4)*/ !==
-										Z_DEFLATED
-									) {
-										strm.msg = 'unknown compression method';
-										state.mode = BAD;
-										break;
-									}
-									//--- DROPBITS(4) ---//
-									hold >>>= 4;
-									bits -= 4;
-									//---//
-									len = ( hold & 0x0f ) /*BITS(4)*/ + 8;
-									if ( state.wbits === 0 ) {
-										state.wbits = len;
-									} else if ( len > state.wbits ) {
-										strm.msg = 'invalid window size';
-										state.mode = BAD;
-										break;
-									}
-									state.dmax = 1 << len;
-									//Tracev((stderr, "inflate:   zlib header ok\n"));
-									strm.adler =
-										state.check = 1 /*adler32(0L, Z_NULL, 0)*/;
-									state.mode = hold & 0x200 ? DICTID : TYPE;
-									//=== INITBITS();
-									hold = 0;
-									bits = 0;
-									//===//
-									break;
-								case FLAGS:
-									//=== NEEDBITS(16); */
-									while ( bits < 16 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-									}
-									//===//
-									state.flags = hold;
-									if (
-										( state.flags & 0xff ) !==
-										Z_DEFLATED
-									) {
-										strm.msg = 'unknown compression method';
-										state.mode = BAD;
-										break;
-									}
-									if ( state.flags & 0xe000 ) {
-										strm.msg = 'unknown header flags set';
-										state.mode = BAD;
-										break;
-									}
-									if ( state.head ) {
-										state.head.text = ( hold >> 8 ) & 1;
-									}
-									if ( state.flags & 0x0200 ) {
-										//=== CRC2(state.check, hold);
-										hbuf[ 0 ] = hold & 0xff;
-										hbuf[ 1 ] = ( hold >>> 8 ) & 0xff;
-										state.check = crc32(
-											state.check,
-											hbuf,
-											2,
-											0
-										);
-										//===//
-									}
-									//=== INITBITS();
-									hold = 0;
-									bits = 0;
-									//===//
-									state.mode = TIME;
-								/* falls through */
-								case TIME:
-									//=== NEEDBITS(32); */
-									while ( bits < 32 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-									}
-									//===//
-									if ( state.head ) {
-										state.head.time = hold;
-									}
-									if ( state.flags & 0x0200 ) {
-										//=== CRC4(state.check, hold)
-										hbuf[ 0 ] = hold & 0xff;
-										hbuf[ 1 ] = ( hold >>> 8 ) & 0xff;
-										hbuf[ 2 ] = ( hold >>> 16 ) & 0xff;
-										hbuf[ 3 ] = ( hold >>> 24 ) & 0xff;
-										state.check = crc32(
-											state.check,
-											hbuf,
-											4,
-											0
-										);
-										//===
-									}
-									//=== INITBITS();
-									hold = 0;
-									bits = 0;
-									//===//
-									state.mode = OS;
-								/* falls through */
-								case OS:
-									//=== NEEDBITS(16); */
-									while ( bits < 16 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-									}
-									//===//
-									if ( state.head ) {
-										state.head.xflags = hold & 0xff;
-										state.head.os = hold >> 8;
-									}
-									if ( state.flags & 0x0200 ) {
-										//=== CRC2(state.check, hold);
-										hbuf[ 0 ] = hold & 0xff;
-										hbuf[ 1 ] = ( hold >>> 8 ) & 0xff;
-										state.check = crc32(
-											state.check,
-											hbuf,
-											2,
-											0
-										);
-										//===//
-									}
-									//=== INITBITS();
-									hold = 0;
-									bits = 0;
-									//===//
-									state.mode = EXLEN;
-								/* falls through */
-								case EXLEN:
-									if ( state.flags & 0x0400 ) {
-										//=== NEEDBITS(16); */
-										while ( bits < 16 ) {
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											hold += input[ next++ ] << bits;
-											bits += 8;
-										}
-										//===//
-										state.length = hold;
-										if ( state.head ) {
-											state.head.extra_len = hold;
-										}
-										if ( state.flags & 0x0200 ) {
-											//=== CRC2(state.check, hold);
-											hbuf[ 0 ] = hold & 0xff;
-											hbuf[ 1 ] = ( hold >>> 8 ) & 0xff;
-											state.check = crc32(
-												state.check,
-												hbuf,
-												2,
-												0
-											);
-											//===//
-										}
-										//=== INITBITS();
-										hold = 0;
-										bits = 0;
-										//===//
-									} else if ( state.head ) {
-										state.head.extra = null /*Z_NULL*/;
-									}
-									state.mode = EXTRA;
-								/* falls through */
-								case EXTRA:
-									if ( state.flags & 0x0400 ) {
-										copy = state.length;
-										if ( copy > have ) {
-											copy = have;
-										}
-										if ( copy ) {
-											if ( state.head ) {
-												len =
-													state.head.extra_len -
-													state.length;
-												if ( ! state.head.extra ) {
-													// Use untyped array for more convenient processing later
-													state.head.extra =
-														new Array(
-															state.head.extra_len
-														);
-												}
-												utils.arraySet(
-													state.head.extra,
-													input,
-													next,
-													// extra field is limited to 65536 bytes
-													// - no need for additional size check
-													copy,
-													/*len + copy > state.head.extra_max - len ? state.head.extra_max : copy,*/
-													len
-												);
-												//zmemcpy(state.head.extra + len, next,
-												//        len + copy > state.head.extra_max ?
-												//        state.head.extra_max - len : copy);
-											}
-											if ( state.flags & 0x0200 ) {
-												state.check = crc32(
-													state.check,
-													input,
-													copy,
-													next
-												);
-											}
-											have -= copy;
-											next += copy;
-											state.length -= copy;
-										}
-										if ( state.length ) {
-											break inf_leave;
-										}
-									}
-									state.length = 0;
-									state.mode = NAME;
-								/* falls through */
-								case NAME:
-									if ( state.flags & 0x0800 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										copy = 0;
-										do {
-											// TODO: 2 or 1 bytes?
-											len = input[ next + copy++ ];
-											/* use constant limit because in js we should not preallocate memory */
-											if (
-												state.head &&
-												len &&
-												state.length <
-													65536 /*state.head.name_max*/
-											) {
-												state.head.name +=
-													String.fromCharCode( len );
-											}
-										} while ( len && copy < have );
-
-										if ( state.flags & 0x0200 ) {
-											state.check = crc32(
-												state.check,
-												input,
-												copy,
-												next
-											);
-										}
-										have -= copy;
-										next += copy;
-										if ( len ) {
-											break inf_leave;
-										}
-									} else if ( state.head ) {
-										state.head.name = null;
-									}
-									state.length = 0;
-									state.mode = COMMENT;
-								/* falls through */
-								case COMMENT:
-									if ( state.flags & 0x1000 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										copy = 0;
-										do {
-											len = input[ next + copy++ ];
-											/* use constant limit because in js we should not preallocate memory */
-											if (
-												state.head &&
-												len &&
-												state.length <
-													65536 /*state.head.comm_max*/
-											) {
-												state.head.comment +=
-													String.fromCharCode( len );
-											}
-										} while ( len && copy < have );
-										if ( state.flags & 0x0200 ) {
-											state.check = crc32(
-												state.check,
-												input,
-												copy,
-												next
-											);
-										}
-										have -= copy;
-										next += copy;
-										if ( len ) {
-											break inf_leave;
-										}
-									} else if ( state.head ) {
-										state.head.comment = null;
-									}
-									state.mode = HCRC;
-								/* falls through */
-								case HCRC:
-									if ( state.flags & 0x0200 ) {
-										//=== NEEDBITS(16); */
-										while ( bits < 16 ) {
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											hold += input[ next++ ] << bits;
-											bits += 8;
-										}
-										//===//
-										if (
-											hold !==
-											( state.check & 0xffff )
-										) {
-											strm.msg = 'header crc mismatch';
-											state.mode = BAD;
-											break;
-										}
-										//=== INITBITS();
-										hold = 0;
-										bits = 0;
-										//===//
-									}
-									if ( state.head ) {
-										state.head.hcrc =
-											( state.flags >> 9 ) & 1;
-										state.head.done = true;
-									}
-									strm.adler = state.check = 0;
-									state.mode = TYPE;
-									break;
-								case DICTID:
-									//=== NEEDBITS(32); */
-									while ( bits < 32 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-									}
-									//===//
-									strm.adler = state.check = zswap32( hold );
-									//=== INITBITS();
-									hold = 0;
-									bits = 0;
-									//===//
-									state.mode = DICT;
-								/* falls through */
-								case DICT:
-									if ( state.havedict === 0 ) {
-										//--- RESTORE() ---
-										strm.next_out = put;
-										strm.avail_out = left;
-										strm.next_in = next;
-										strm.avail_in = have;
-										state.hold = hold;
-										state.bits = bits;
-										//---
-										return Z_NEED_DICT;
-									}
-									strm.adler =
-										state.check = 1 /*adler32(0L, Z_NULL, 0)*/;
-									state.mode = TYPE;
-								/* falls through */
-								case TYPE:
-									if (
-										flush === Z_BLOCK ||
-										flush === Z_TREES
-									) {
-										break inf_leave;
-									}
-								/* falls through */
-								case TYPEDO:
-									if ( state.last ) {
-										//--- BYTEBITS() ---//
-										hold >>>= bits & 7;
-										bits -= bits & 7;
-										//---//
-										state.mode = CHECK;
-										break;
-									}
-									//=== NEEDBITS(3); */
-									while ( bits < 3 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-									}
-									//===//
-									state.last = hold & 0x01 /*BITS(1)*/;
-									//--- DROPBITS(1) ---//
-									hold >>>= 1;
-									bits -= 1;
-									//---//
-
-									switch ( hold & 0x03 /*BITS(2)*/ ) {
-										case 0 /* stored block */:
-											//Tracev((stderr, "inflate:     stored block%s\n",
-											//        state.last ? " (last)" : ""));
-											state.mode = STORED;
-											break;
-										case 1 /* fixed block */:
-											fixedtables( state );
-											//Tracev((stderr, "inflate:     fixed codes block%s\n",
-											//        state.last ? " (last)" : ""));
-											state.mode =
-												LEN_; /* decode codes */
-											if ( flush === Z_TREES ) {
-												//--- DROPBITS(2) ---//
-												hold >>>= 2;
-												bits -= 2;
-												//---//
-												break inf_leave;
-											}
-											break;
-										case 2 /* dynamic block */:
-											//Tracev((stderr, "inflate:     dynamic codes block%s\n",
-											//        state.last ? " (last)" : ""));
-											state.mode = TABLE;
-											break;
-										case 3:
-											strm.msg = 'invalid block type';
-											state.mode = BAD;
-									}
-									//--- DROPBITS(2) ---//
-									hold >>>= 2;
-									bits -= 2;
-									//---//
-									break;
-								case STORED:
-									//--- BYTEBITS() ---// /* go to byte boundary */
-									hold >>>= bits & 7;
-									bits -= bits & 7;
-									//---//
-									//=== NEEDBITS(32); */
-									while ( bits < 32 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-									}
-									//===//
-									if (
-										( hold & 0xffff ) !==
-										( ( hold >>> 16 ) ^ 0xffff )
-									) {
-										strm.msg =
-											'invalid stored block lengths';
-										state.mode = BAD;
-										break;
-									}
-									state.length = hold & 0xffff;
-									//Tracev((stderr, "inflate:       stored length %u\n",
-									//        state.length));
-									//=== INITBITS();
-									hold = 0;
-									bits = 0;
-									//===//
-									state.mode = COPY_;
-									if ( flush === Z_TREES ) {
-										break inf_leave;
-									}
-								/* falls through */
-								case COPY_:
-									state.mode = COPY;
-								/* falls through */
-								case COPY:
-									copy = state.length;
-									if ( copy ) {
-										if ( copy > have ) {
-											copy = have;
-										}
-										if ( copy > left ) {
-											copy = left;
-										}
-										if ( copy === 0 ) {
-											break inf_leave;
-										}
-										//--- zmemcpy(put, next, copy); ---
-										utils.arraySet(
-											output,
-											input,
-											next,
-											copy,
-											put
-										);
-										//---//
-										have -= copy;
-										next += copy;
-										left -= copy;
-										put += copy;
-										state.length -= copy;
-										break;
-									}
-									//Tracev((stderr, "inflate:       stored end\n"));
-									state.mode = TYPE;
-									break;
-								case TABLE:
-									//=== NEEDBITS(14); */
-									while ( bits < 14 ) {
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-									}
-									//===//
-									state.nlen =
-										( hold & 0x1f ) /*BITS(5)*/ + 257;
-									//--- DROPBITS(5) ---//
-									hold >>>= 5;
-									bits -= 5;
-									//---//
-									state.ndist =
-										( hold & 0x1f ) /*BITS(5)*/ + 1;
-									//--- DROPBITS(5) ---//
-									hold >>>= 5;
-									bits -= 5;
-									//---//
-									state.ncode =
-										( hold & 0x0f ) /*BITS(4)*/ + 4;
-									//--- DROPBITS(4) ---//
-									hold >>>= 4;
-									bits -= 4;
-									//---//
-									//#ifndef PKZIP_BUG_WORKAROUND
-									if (
-										state.nlen > 286 ||
-										state.ndist > 30
-									) {
-										strm.msg =
-											'too many length or distance symbols';
-										state.mode = BAD;
-										break;
-									}
-									//#endif
-									//Tracev((stderr, "inflate:       table sizes ok\n"));
-									state.have = 0;
-									state.mode = LENLENS;
-								/* falls through */
-								case LENLENS:
-									while ( state.have < state.ncode ) {
-										//=== NEEDBITS(3);
-										while ( bits < 3 ) {
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											hold += input[ next++ ] << bits;
-											bits += 8;
-										}
-										//===//
-										state.lens[ order[ state.have++ ] ] =
-											hold & 0x07; //BITS(3);
-										//--- DROPBITS(3) ---//
-										hold >>>= 3;
-										bits -= 3;
-										//---//
-									}
-									while ( state.have < 19 ) {
-										state.lens[ order[ state.have++ ] ] = 0;
-									}
-									// We have separate tables & no pointers. 2 commented lines below not needed.
-									//state.next = state.codes;
-									//state.lencode = state.next;
-									// Switch to use dynamic table
-									state.lencode = state.lendyn;
-									state.lenbits = 7;
-
-									opts = { bits: state.lenbits };
-									ret = inflate_table(
-										CODES,
-										state.lens,
-										0,
-										19,
-										state.lencode,
-										0,
-										state.work,
-										opts
-									);
-									state.lenbits = opts.bits;
-
-									if ( ret ) {
-										strm.msg = 'invalid code lengths set';
-										state.mode = BAD;
-										break;
-									}
-									//Tracev((stderr, "inflate:       code lengths ok\n"));
-									state.have = 0;
-									state.mode = CODELENS;
-								/* falls through */
-								case CODELENS:
-									while (
-										state.have <
-										state.nlen + state.ndist
-									) {
-										for (;;) {
-											here =
-												state.lencode[
-													hold &
-														( ( 1 <<
-															state.lenbits ) -
-															1 )
-												]; /*BITS(state.lenbits)*/
-											here_bits = here >>> 24;
-											here_op = ( here >>> 16 ) & 0xff;
-											here_val = here & 0xffff;
-
-											if ( here_bits <= bits ) {
-												break;
-											}
-											//--- PULLBYTE() ---//
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											hold += input[ next++ ] << bits;
-											bits += 8;
-											//---//
-										}
-										if ( here_val < 16 ) {
-											//--- DROPBITS(here.bits) ---//
-											hold >>>= here_bits;
-											bits -= here_bits;
-											//---//
-											state.lens[ state.have++ ] =
-												here_val;
-										} else {
-											if ( here_val === 16 ) {
-												//=== NEEDBITS(here.bits + 2);
-												n = here_bits + 2;
-												while ( bits < n ) {
-													if ( have === 0 ) {
-														break inf_leave;
-													}
-													have--;
-													hold +=
-														input[ next++ ] << bits;
-													bits += 8;
-												}
-												//===//
-												//--- DROPBITS(here.bits) ---//
-												hold >>>= here_bits;
-												bits -= here_bits;
-												//---//
-												if ( state.have === 0 ) {
-													strm.msg =
-														'invalid bit length repeat';
-													state.mode = BAD;
-													break;
-												}
-												len =
-													state.lens[
-														state.have - 1
-													];
-												copy = 3 + ( hold & 0x03 ); //BITS(2);
-												//--- DROPBITS(2) ---//
-												hold >>>= 2;
-												bits -= 2;
-												//---//
-											} else if ( here_val === 17 ) {
-												//=== NEEDBITS(here.bits + 3);
-												n = here_bits + 3;
-												while ( bits < n ) {
-													if ( have === 0 ) {
-														break inf_leave;
-													}
-													have--;
-													hold +=
-														input[ next++ ] << bits;
-													bits += 8;
-												}
-												//===//
-												//--- DROPBITS(here.bits) ---//
-												hold >>>= here_bits;
-												bits -= here_bits;
-												//---//
-												len = 0;
-												copy = 3 + ( hold & 0x07 ); //BITS(3);
-												//--- DROPBITS(3) ---//
-												hold >>>= 3;
-												bits -= 3;
-												//---//
-											} else {
-												//=== NEEDBITS(here.bits + 7);
-												n = here_bits + 7;
-												while ( bits < n ) {
-													if ( have === 0 ) {
-														break inf_leave;
-													}
-													have--;
-													hold +=
-														input[ next++ ] << bits;
-													bits += 8;
-												}
-												//===//
-												//--- DROPBITS(here.bits) ---//
-												hold >>>= here_bits;
-												bits -= here_bits;
-												//---//
-												len = 0;
-												copy = 11 + ( hold & 0x7f ); //BITS(7);
-												//--- DROPBITS(7) ---//
-												hold >>>= 7;
-												bits -= 7;
-												//---//
-											}
-											if (
-												state.have + copy >
-												state.nlen + state.ndist
-											) {
-												strm.msg =
-													'invalid bit length repeat';
-												state.mode = BAD;
-												break;
-											}
-											while ( copy-- ) {
-												state.lens[ state.have++ ] =
-													len;
-											}
-										}
-									}
-
-									/* handle error breaks in while */
-									if ( state.mode === BAD ) {
-										break;
-									}
-
-									/* check for end-of-block code (better have one) */
-									if ( state.lens[ 256 ] === 0 ) {
-										strm.msg =
-											'invalid code -- missing end-of-block';
-										state.mode = BAD;
-										break;
-									}
-
-									/* build code tables -- note: do not change the lenbits or distbits
+  function updatewindow(strm, src, end, copy) {
+    var dist;
+    var state = strm.state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state.window === null) {
+      state.wsize = 1 << state.wbits;
+      state.wnext = 0;
+      state.whave = 0;
+
+      state.window = new utils.Buf8(state.wsize);
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    if (copy >= state.wsize) {
+      utils.arraySet(state.window, src, end - state.wsize, state.wsize, 0);
+      state.wnext = 0;
+      state.whave = state.wsize;
+    }
+    else {
+      dist = state.wsize - state.wnext;
+      if (dist > copy) {
+        dist = copy;
+      }
+      //zmemcpy(state->window + state->wnext, end - copy, dist);
+      utils.arraySet(state.window, src, end - copy, dist, state.wnext);
+      copy -= dist;
+      if (copy) {
+        //zmemcpy(state->window, end - copy, copy);
+        utils.arraySet(state.window, src, end - copy, copy, 0);
+        state.wnext = copy;
+        state.whave = state.wsize;
+      }
+      else {
+        state.wnext += dist;
+        if (state.wnext === state.wsize) { state.wnext = 0; }
+        if (state.whave < state.wsize) { state.whave += dist; }
+      }
+    }
+    return 0;
+  }
+
+  function inflate(strm, flush) {
+    var state;
+    var input, output;          // input/output buffers
+    var next;                   /* next input INDEX */
+    var put;                    /* next output INDEX */
+    var have, left;             /* available input and output */
+    var hold;                   /* bit buffer */
+    var bits;                   /* bits in bit buffer */
+    var _in, _out;              /* save starting available input and output */
+    var copy;                   /* number of stored or match bytes to copy */
+    var from;                   /* where to copy match bytes from */
+    var from_source;
+    var here = 0;               /* current decoding table entry */
+    var here_bits, here_op, here_val; // paked "here" denormalized (JS specific)
+    //var last;                   /* parent table entry */
+    var last_bits, last_op, last_val; // paked "last" denormalized (JS specific)
+    var len;                    /* length to copy for repeats, bits to drop */
+    var ret;                    /* return code */
+    var hbuf = new utils.Buf8(4);    /* buffer for gzip header crc calculation */
+    var opts;
+
+    var n; // temporary var for NEED_BITS
+
+    var order = /* permutation of code lengths */
+      [ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 ];
+
+
+    if (!strm || !strm.state || !strm.output ||
+        (!strm.input && strm.avail_in !== 0)) {
+      return Z_STREAM_ERROR;
+    }
+
+    state = strm.state;
+    if (state.mode === TYPE) { state.mode = TYPEDO; }    /* skip check */
+
+
+    //--- LOAD() ---
+    put = strm.next_out;
+    output = strm.output;
+    left = strm.avail_out;
+    next = strm.next_in;
+    input = strm.input;
+    have = strm.avail_in;
+    hold = state.hold;
+    bits = state.bits;
+    //---
+
+    _in = have;
+    _out = left;
+    ret = Z_OK;
+
+    inf_leave: // goto emulation
+    for (;;) {
+      switch (state.mode) {
+        case HEAD:
+          if (state.wrap === 0) {
+            state.mode = TYPEDO;
+            break;
+          }
+          //=== NEEDBITS(16);
+          while (bits < 16) {
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+          }
+          //===//
+          if ((state.wrap & 2) && hold === 0x8b1f) {  /* gzip header */
+            state.check = 0/*crc32(0L, Z_NULL, 0)*/;
+            //=== CRC2(state.check, hold);
+            hbuf[0] = hold & 0xff;
+            hbuf[1] = (hold >>> 8) & 0xff;
+            state.check = crc32(state.check, hbuf, 2, 0);
+            //===//
+
+            //=== INITBITS();
+            hold = 0;
+            bits = 0;
+            //===//
+            state.mode = FLAGS;
+            break;
+          }
+          state.flags = 0;           /* expect zlib header */
+          if (state.head) {
+            state.head.done = false;
+          }
+          if (!(state.wrap & 1) ||   /* check if zlib header allowed */
+            (((hold & 0xff)/*BITS(8)*/ << 8) + (hold >> 8)) % 31) {
+            strm.msg = 'incorrect header check';
+            state.mode = BAD;
+            break;
+          }
+          if ((hold & 0x0f)/*BITS(4)*/ !== Z_DEFLATED) {
+            strm.msg = 'unknown compression method';
+            state.mode = BAD;
+            break;
+          }
+          //--- DROPBITS(4) ---//
+          hold >>>= 4;
+          bits -= 4;
+          //---//
+          len = (hold & 0x0f)/*BITS(4)*/ + 8;
+          if (state.wbits === 0) {
+            state.wbits = len;
+          }
+          else if (len > state.wbits) {
+            strm.msg = 'invalid window size';
+            state.mode = BAD;
+            break;
+          }
+          state.dmax = 1 << len;
+          //Tracev((stderr, "inflate:   zlib header ok\n"));
+          strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
+          state.mode = hold & 0x200 ? DICTID : TYPE;
+          //=== INITBITS();
+          hold = 0;
+          bits = 0;
+          //===//
+          break;
+        case FLAGS:
+          //=== NEEDBITS(16); */
+          while (bits < 16) {
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+          }
+          //===//
+          state.flags = hold;
+          if ((state.flags & 0xff) !== Z_DEFLATED) {
+            strm.msg = 'unknown compression method';
+            state.mode = BAD;
+            break;
+          }
+          if (state.flags & 0xe000) {
+            strm.msg = 'unknown header flags set';
+            state.mode = BAD;
+            break;
+          }
+          if (state.head) {
+            state.head.text = ((hold >> 8) & 1);
+          }
+          if (state.flags & 0x0200) {
+            //=== CRC2(state.check, hold);
+            hbuf[0] = hold & 0xff;
+            hbuf[1] = (hold >>> 8) & 0xff;
+            state.check = crc32(state.check, hbuf, 2, 0);
+            //===//
+          }
+          //=== INITBITS();
+          hold = 0;
+          bits = 0;
+          //===//
+          state.mode = TIME;
+          /* falls through */
+        case TIME:
+          //=== NEEDBITS(32); */
+          while (bits < 32) {
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+          }
+          //===//
+          if (state.head) {
+            state.head.time = hold;
+          }
+          if (state.flags & 0x0200) {
+            //=== CRC4(state.check, hold)
+            hbuf[0] = hold & 0xff;
+            hbuf[1] = (hold >>> 8) & 0xff;
+            hbuf[2] = (hold >>> 16) & 0xff;
+            hbuf[3] = (hold >>> 24) & 0xff;
+            state.check = crc32(state.check, hbuf, 4, 0);
+            //===
+          }
+          //=== INITBITS();
+          hold = 0;
+          bits = 0;
+          //===//
+          state.mode = OS;
+          /* falls through */
+        case OS:
+          //=== NEEDBITS(16); */
+          while (bits < 16) {
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+          }
+          //===//
+          if (state.head) {
+            state.head.xflags = (hold & 0xff);
+            state.head.os = (hold >> 8);
+          }
+          if (state.flags & 0x0200) {
+            //=== CRC2(state.check, hold);
+            hbuf[0] = hold & 0xff;
+            hbuf[1] = (hold >>> 8) & 0xff;
+            state.check = crc32(state.check, hbuf, 2, 0);
+            //===//
+          }
+          //=== INITBITS();
+          hold = 0;
+          bits = 0;
+          //===//
+          state.mode = EXLEN;
+          /* falls through */
+        case EXLEN:
+          if (state.flags & 0x0400) {
+            //=== NEEDBITS(16); */
+            while (bits < 16) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            state.length = hold;
+            if (state.head) {
+              state.head.extra_len = hold;
+            }
+            if (state.flags & 0x0200) {
+              //=== CRC2(state.check, hold);
+              hbuf[0] = hold & 0xff;
+              hbuf[1] = (hold >>> 8) & 0xff;
+              state.check = crc32(state.check, hbuf, 2, 0);
+              //===//
+            }
+            //=== INITBITS();
+            hold = 0;
+            bits = 0;
+            //===//
+          }
+          else if (state.head) {
+            state.head.extra = null/*Z_NULL*/;
+          }
+          state.mode = EXTRA;
+          /* falls through */
+        case EXTRA:
+          if (state.flags & 0x0400) {
+            copy = state.length;
+            if (copy > have) { copy = have; }
+            if (copy) {
+              if (state.head) {
+                len = state.head.extra_len - state.length;
+                if (!state.head.extra) {
+                  // Use untyped array for more convenient processing later
+                  state.head.extra = new Array(state.head.extra_len);
+                }
+                utils.arraySet(
+                  state.head.extra,
+                  input,
+                  next,
+                  // extra field is limited to 65536 bytes
+                  // - no need for additional size check
+                  copy,
+                  /*len + copy > state.head.extra_max - len ? state.head.extra_max : copy,*/
+                  len
+                );
+                //zmemcpy(state.head.extra + len, next,
+                //        len + copy > state.head.extra_max ?
+                //        state.head.extra_max - len : copy);
+              }
+              if (state.flags & 0x0200) {
+                state.check = crc32(state.check, input, copy, next);
+              }
+              have -= copy;
+              next += copy;
+              state.length -= copy;
+            }
+            if (state.length) { break inf_leave; }
+          }
+          state.length = 0;
+          state.mode = NAME;
+          /* falls through */
+        case NAME:
+          if (state.flags & 0x0800) {
+            if (have === 0) { break inf_leave; }
+            copy = 0;
+            do {
+              // TODO: 2 or 1 bytes?
+              len = input[next + copy++];
+              /* use constant limit because in js we should not preallocate memory */
+              if (state.head && len &&
+                  (state.length < 65536 /*state.head.name_max*/)) {
+                state.head.name += String.fromCharCode(len);
+              }
+            } while (len && copy < have);
+
+            if (state.flags & 0x0200) {
+              state.check = crc32(state.check, input, copy, next);
+            }
+            have -= copy;
+            next += copy;
+            if (len) { break inf_leave; }
+          }
+          else if (state.head) {
+            state.head.name = null;
+          }
+          state.length = 0;
+          state.mode = COMMENT;
+          /* falls through */
+        case COMMENT:
+          if (state.flags & 0x1000) {
+            if (have === 0) { break inf_leave; }
+            copy = 0;
+            do {
+              len = input[next + copy++];
+              /* use constant limit because in js we should not preallocate memory */
+              if (state.head && len &&
+                  (state.length < 65536 /*state.head.comm_max*/)) {
+                state.head.comment += String.fromCharCode(len);
+              }
+            } while (len && copy < have);
+            if (state.flags & 0x0200) {
+              state.check = crc32(state.check, input, copy, next);
+            }
+            have -= copy;
+            next += copy;
+            if (len) { break inf_leave; }
+          }
+          else if (state.head) {
+            state.head.comment = null;
+          }
+          state.mode = HCRC;
+          /* falls through */
+        case HCRC:
+          if (state.flags & 0x0200) {
+            //=== NEEDBITS(16); */
+            while (bits < 16) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            if (hold !== (state.check & 0xffff)) {
+              strm.msg = 'header crc mismatch';
+              state.mode = BAD;
+              break;
+            }
+            //=== INITBITS();
+            hold = 0;
+            bits = 0;
+            //===//
+          }
+          if (state.head) {
+            state.head.hcrc = ((state.flags >> 9) & 1);
+            state.head.done = true;
+          }
+          strm.adler = state.check = 0;
+          state.mode = TYPE;
+          break;
+        case DICTID:
+          //=== NEEDBITS(32); */
+          while (bits < 32) {
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+          }
+          //===//
+          strm.adler = state.check = zswap32(hold);
+          //=== INITBITS();
+          hold = 0;
+          bits = 0;
+          //===//
+          state.mode = DICT;
+          /* falls through */
+        case DICT:
+          if (state.havedict === 0) {
+            //--- RESTORE() ---
+            strm.next_out = put;
+            strm.avail_out = left;
+            strm.next_in = next;
+            strm.avail_in = have;
+            state.hold = hold;
+            state.bits = bits;
+            //---
+            return Z_NEED_DICT;
+          }
+          strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
+          state.mode = TYPE;
+          /* falls through */
+        case TYPE:
+          if (flush === Z_BLOCK || flush === Z_TREES) { break inf_leave; }
+          /* falls through */
+        case TYPEDO:
+          if (state.last) {
+            //--- BYTEBITS() ---//
+            hold >>>= bits & 7;
+            bits -= bits & 7;
+            //---//
+            state.mode = CHECK;
+            break;
+          }
+          //=== NEEDBITS(3); */
+          while (bits < 3) {
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+          }
+          //===//
+          state.last = (hold & 0x01)/*BITS(1)*/;
+          //--- DROPBITS(1) ---//
+          hold >>>= 1;
+          bits -= 1;
+          //---//
+
+          switch ((hold & 0x03)/*BITS(2)*/) {
+            case 0:                             /* stored block */
+              //Tracev((stderr, "inflate:     stored block%s\n",
+              //        state.last ? " (last)" : ""));
+              state.mode = STORED;
+              break;
+            case 1:                             /* fixed block */
+              fixedtables(state);
+              //Tracev((stderr, "inflate:     fixed codes block%s\n",
+              //        state.last ? " (last)" : ""));
+              state.mode = LEN_;             /* decode codes */
+              if (flush === Z_TREES) {
+                //--- DROPBITS(2) ---//
+                hold >>>= 2;
+                bits -= 2;
+                //---//
+                break inf_leave;
+              }
+              break;
+            case 2:                             /* dynamic block */
+              //Tracev((stderr, "inflate:     dynamic codes block%s\n",
+              //        state.last ? " (last)" : ""));
+              state.mode = TABLE;
+              break;
+            case 3:
+              strm.msg = 'invalid block type';
+              state.mode = BAD;
+          }
+          //--- DROPBITS(2) ---//
+          hold >>>= 2;
+          bits -= 2;
+          //---//
+          break;
+        case STORED:
+          //--- BYTEBITS() ---// /* go to byte boundary */
+          hold >>>= bits & 7;
+          bits -= bits & 7;
+          //---//
+          //=== NEEDBITS(32); */
+          while (bits < 32) {
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+          }
+          //===//
+          if ((hold & 0xffff) !== ((hold >>> 16) ^ 0xffff)) {
+            strm.msg = 'invalid stored block lengths';
+            state.mode = BAD;
+            break;
+          }
+          state.length = hold & 0xffff;
+          //Tracev((stderr, "inflate:       stored length %u\n",
+          //        state.length));
+          //=== INITBITS();
+          hold = 0;
+          bits = 0;
+          //===//
+          state.mode = COPY_;
+          if (flush === Z_TREES) { break inf_leave; }
+          /* falls through */
+        case COPY_:
+          state.mode = COPY;
+          /* falls through */
+        case COPY:
+          copy = state.length;
+          if (copy) {
+            if (copy > have) { copy = have; }
+            if (copy > left) { copy = left; }
+            if (copy === 0) { break inf_leave; }
+            //--- zmemcpy(put, next, copy); ---
+            utils.arraySet(output, input, next, copy, put);
+            //---//
+            have -= copy;
+            next += copy;
+            left -= copy;
+            put += copy;
+            state.length -= copy;
+            break;
+          }
+          //Tracev((stderr, "inflate:       stored end\n"));
+          state.mode = TYPE;
+          break;
+        case TABLE:
+          //=== NEEDBITS(14); */
+          while (bits < 14) {
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+          }
+          //===//
+          state.nlen = (hold & 0x1f)/*BITS(5)*/ + 257;
+          //--- DROPBITS(5) ---//
+          hold >>>= 5;
+          bits -= 5;
+          //---//
+          state.ndist = (hold & 0x1f)/*BITS(5)*/ + 1;
+          //--- DROPBITS(5) ---//
+          hold >>>= 5;
+          bits -= 5;
+          //---//
+          state.ncode = (hold & 0x0f)/*BITS(4)*/ + 4;
+          //--- DROPBITS(4) ---//
+          hold >>>= 4;
+          bits -= 4;
+          //---//
+  //#ifndef PKZIP_BUG_WORKAROUND
+          if (state.nlen > 286 || state.ndist > 30) {
+            strm.msg = 'too many length or distance symbols';
+            state.mode = BAD;
+            break;
+          }
+  //#endif
+          //Tracev((stderr, "inflate:       table sizes ok\n"));
+          state.have = 0;
+          state.mode = LENLENS;
+          /* falls through */
+        case LENLENS:
+          while (state.have < state.ncode) {
+            //=== NEEDBITS(3);
+            while (bits < 3) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            state.lens[order[state.have++]] = (hold & 0x07);//BITS(3);
+            //--- DROPBITS(3) ---//
+            hold >>>= 3;
+            bits -= 3;
+            //---//
+          }
+          while (state.have < 19) {
+            state.lens[order[state.have++]] = 0;
+          }
+          // We have separate tables & no pointers. 2 commented lines below not needed.
+          //state.next = state.codes;
+          //state.lencode = state.next;
+          // Switch to use dynamic table
+          state.lencode = state.lendyn;
+          state.lenbits = 7;
+
+          opts = { bits: state.lenbits };
+          ret = inflate_table(CODES, state.lens, 0, 19, state.lencode, 0, state.work, opts);
+          state.lenbits = opts.bits;
+
+          if (ret) {
+            strm.msg = 'invalid code lengths set';
+            state.mode = BAD;
+            break;
+          }
+          //Tracev((stderr, "inflate:       code lengths ok\n"));
+          state.have = 0;
+          state.mode = CODELENS;
+          /* falls through */
+        case CODELENS:
+          while (state.have < state.nlen + state.ndist) {
+            for (;;) {
+              here = state.lencode[hold & ((1 << state.lenbits) - 1)];/*BITS(state.lenbits)*/
+              here_bits = here >>> 24;
+              here_op = (here >>> 16) & 0xff;
+              here_val = here & 0xffff;
+
+              if ((here_bits) <= bits) { break; }
+              //--- PULLBYTE() ---//
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+              //---//
+            }
+            if (here_val < 16) {
+              //--- DROPBITS(here.bits) ---//
+              hold >>>= here_bits;
+              bits -= here_bits;
+              //---//
+              state.lens[state.have++] = here_val;
+            }
+            else {
+              if (here_val === 16) {
+                //=== NEEDBITS(here.bits + 2);
+                n = here_bits + 2;
+                while (bits < n) {
+                  if (have === 0) { break inf_leave; }
+                  have--;
+                  hold += input[next++] << bits;
+                  bits += 8;
+                }
+                //===//
+                //--- DROPBITS(here.bits) ---//
+                hold >>>= here_bits;
+                bits -= here_bits;
+                //---//
+                if (state.have === 0) {
+                  strm.msg = 'invalid bit length repeat';
+                  state.mode = BAD;
+                  break;
+                }
+                len = state.lens[state.have - 1];
+                copy = 3 + (hold & 0x03);//BITS(2);
+                //--- DROPBITS(2) ---//
+                hold >>>= 2;
+                bits -= 2;
+                //---//
+              }
+              else if (here_val === 17) {
+                //=== NEEDBITS(here.bits + 3);
+                n = here_bits + 3;
+                while (bits < n) {
+                  if (have === 0) { break inf_leave; }
+                  have--;
+                  hold += input[next++] << bits;
+                  bits += 8;
+                }
+                //===//
+                //--- DROPBITS(here.bits) ---//
+                hold >>>= here_bits;
+                bits -= here_bits;
+                //---//
+                len = 0;
+                copy = 3 + (hold & 0x07);//BITS(3);
+                //--- DROPBITS(3) ---//
+                hold >>>= 3;
+                bits -= 3;
+                //---//
+              }
+              else {
+                //=== NEEDBITS(here.bits + 7);
+                n = here_bits + 7;
+                while (bits < n) {
+                  if (have === 0) { break inf_leave; }
+                  have--;
+                  hold += input[next++] << bits;
+                  bits += 8;
+                }
+                //===//
+                //--- DROPBITS(here.bits) ---//
+                hold >>>= here_bits;
+                bits -= here_bits;
+                //---//
+                len = 0;
+                copy = 11 + (hold & 0x7f);//BITS(7);
+                //--- DROPBITS(7) ---//
+                hold >>>= 7;
+                bits -= 7;
+                //---//
+              }
+              if (state.have + copy > state.nlen + state.ndist) {
+                strm.msg = 'invalid bit length repeat';
+                state.mode = BAD;
+                break;
+              }
+              while (copy--) {
+                state.lens[state.have++] = len;
+              }
+            }
+          }
+
+          /* handle error breaks in while */
+          if (state.mode === BAD) { break; }
+
+          /* check for end-of-block code (better have one) */
+          if (state.lens[256] === 0) {
+            strm.msg = 'invalid code -- missing end-of-block';
+            state.mode = BAD;
+            break;
+          }
+
+          /* build code tables -- note: do not change the lenbits or distbits
              values here (9 and 6) without reading the comments in inftrees.h
              concerning the ENOUGH constants, which depend on those values */
-									state.lenbits = 9;
-
-									opts = { bits: state.lenbits };
-									ret = inflate_table(
-										LENS,
-										state.lens,
-										0,
-										state.nlen,
-										state.lencode,
-										0,
-										state.work,
-										opts
-									);
-									// We have separate tables & no pointers. 2 commented lines below not needed.
-									// state.next_index = opts.table_index;
-									state.lenbits = opts.bits;
-									// state.lencode = state.next;
-
-									if ( ret ) {
-										strm.msg =
-											'invalid literal/lengths set';
-										state.mode = BAD;
-										break;
-									}
-
-									state.distbits = 6;
-									//state.distcode.copy(state.codes);
-									// Switch to use dynamic table
-									state.distcode = state.distdyn;
-									opts = { bits: state.distbits };
-									ret = inflate_table(
-										DISTS,
-										state.lens,
-										state.nlen,
-										state.ndist,
-										state.distcode,
-										0,
-										state.work,
-										opts
-									);
-									// We have separate tables & no pointers. 2 commented lines below not needed.
-									// state.next_index = opts.table_index;
-									state.distbits = opts.bits;
-									// state.distcode = state.next;
-
-									if ( ret ) {
-										strm.msg = 'invalid distances set';
-										state.mode = BAD;
-										break;
-									}
-									//Tracev((stderr, 'inflate:       codes ok\n'));
-									state.mode = LEN_;
-									if ( flush === Z_TREES ) {
-										break inf_leave;
-									}
-								/* falls through */
-								case LEN_:
-									state.mode = LEN;
-								/* falls through */
-								case LEN:
-									if ( have >= 6 && left >= 258 ) {
-										//--- RESTORE() ---
-										strm.next_out = put;
-										strm.avail_out = left;
-										strm.next_in = next;
-										strm.avail_in = have;
-										state.hold = hold;
-										state.bits = bits;
-										//---
-										inflate_fast( strm, _out );
-										//--- LOAD() ---
-										put = strm.next_out;
-										output = strm.output;
-										left = strm.avail_out;
-										next = strm.next_in;
-										input = strm.input;
-										have = strm.avail_in;
-										hold = state.hold;
-										bits = state.bits;
-										//---
-
-										if ( state.mode === TYPE ) {
-											state.back = -1;
-										}
-										break;
-									}
-									state.back = 0;
-									for (;;) {
-										here =
-											state.lencode[
-												hold &
-													( ( 1 << state.lenbits ) -
-														1 )
-											]; /*BITS(state.lenbits)*/
-										here_bits = here >>> 24;
-										here_op = ( here >>> 16 ) & 0xff;
-										here_val = here & 0xffff;
-
-										if ( here_bits <= bits ) {
-											break;
-										}
-										//--- PULLBYTE() ---//
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-										//---//
-									}
-									if ( here_op && ( here_op & 0xf0 ) === 0 ) {
-										last_bits = here_bits;
-										last_op = here_op;
-										last_val = here_val;
-										for (;;) {
-											here =
-												state.lencode[
-													last_val +
-														( ( hold &
-															( ( 1 <<
-																( last_bits +
-																	last_op ) ) -
-																1 ) ) /*BITS(last.bits + last.op)*/ >>
-															last_bits )
-												];
-											here_bits = here >>> 24;
-											here_op = ( here >>> 16 ) & 0xff;
-											here_val = here & 0xffff;
-
-											if (
-												last_bits + here_bits <=
-												bits
-											) {
-												break;
-											}
-											//--- PULLBYTE() ---//
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											hold += input[ next++ ] << bits;
-											bits += 8;
-											//---//
-										}
-										//--- DROPBITS(last.bits) ---//
-										hold >>>= last_bits;
-										bits -= last_bits;
-										//---//
-										state.back += last_bits;
-									}
-									//--- DROPBITS(here.bits) ---//
-									hold >>>= here_bits;
-									bits -= here_bits;
-									//---//
-									state.back += here_bits;
-									state.length = here_val;
-									if ( here_op === 0 ) {
-										//Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-										//        "inflate:         literal '%c'\n" :
-										//        "inflate:         literal 0x%02x\n", here.val));
-										state.mode = LIT;
-										break;
-									}
-									if ( here_op & 32 ) {
-										//Tracevv((stderr, "inflate:         end of block\n"));
-										state.back = -1;
-										state.mode = TYPE;
-										break;
-									}
-									if ( here_op & 64 ) {
-										strm.msg =
-											'invalid literal/length code';
-										state.mode = BAD;
-										break;
-									}
-									state.extra = here_op & 15;
-									state.mode = LENEXT;
-								/* falls through */
-								case LENEXT:
-									if ( state.extra ) {
-										//=== NEEDBITS(state.extra);
-										n = state.extra;
-										while ( bits < n ) {
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											hold += input[ next++ ] << bits;
-											bits += 8;
-										}
-										//===//
-										state.length +=
-											hold &
-											( ( 1 << state.extra ) -
-												1 ) /*BITS(state.extra)*/;
-										//--- DROPBITS(state.extra) ---//
-										hold >>>= state.extra;
-										bits -= state.extra;
-										//---//
-										state.back += state.extra;
-									}
-									//Tracevv((stderr, "inflate:         length %u\n", state.length));
-									state.was = state.length;
-									state.mode = DIST;
-								/* falls through */
-								case DIST:
-									for (;;) {
-										here =
-											state.distcode[
-												hold &
-													( ( 1 << state.distbits ) -
-														1 )
-											]; /*BITS(state.distbits)*/
-										here_bits = here >>> 24;
-										here_op = ( here >>> 16 ) & 0xff;
-										here_val = here & 0xffff;
-
-										if ( here_bits <= bits ) {
-											break;
-										}
-										//--- PULLBYTE() ---//
-										if ( have === 0 ) {
-											break inf_leave;
-										}
-										have--;
-										hold += input[ next++ ] << bits;
-										bits += 8;
-										//---//
-									}
-									if ( ( here_op & 0xf0 ) === 0 ) {
-										last_bits = here_bits;
-										last_op = here_op;
-										last_val = here_val;
-										for (;;) {
-											here =
-												state.distcode[
-													last_val +
-														( ( hold &
-															( ( 1 <<
-																( last_bits +
-																	last_op ) ) -
-																1 ) ) /*BITS(last.bits + last.op)*/ >>
-															last_bits )
-												];
-											here_bits = here >>> 24;
-											here_op = ( here >>> 16 ) & 0xff;
-											here_val = here & 0xffff;
-
-											if (
-												last_bits + here_bits <=
-												bits
-											) {
-												break;
-											}
-											//--- PULLBYTE() ---//
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											hold += input[ next++ ] << bits;
-											bits += 8;
-											//---//
-										}
-										//--- DROPBITS(last.bits) ---//
-										hold >>>= last_bits;
-										bits -= last_bits;
-										//---//
-										state.back += last_bits;
-									}
-									//--- DROPBITS(here.bits) ---//
-									hold >>>= here_bits;
-									bits -= here_bits;
-									//---//
-									state.back += here_bits;
-									if ( here_op & 64 ) {
-										strm.msg = 'invalid distance code';
-										state.mode = BAD;
-										break;
-									}
-									state.offset = here_val;
-									state.extra = here_op & 15;
-									state.mode = DISTEXT;
-								/* falls through */
-								case DISTEXT:
-									if ( state.extra ) {
-										//=== NEEDBITS(state.extra);
-										n = state.extra;
-										while ( bits < n ) {
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											hold += input[ next++ ] << bits;
-											bits += 8;
-										}
-										//===//
-										state.offset +=
-											hold &
-											( ( 1 << state.extra ) -
-												1 ) /*BITS(state.extra)*/;
-										//--- DROPBITS(state.extra) ---//
-										hold >>>= state.extra;
-										bits -= state.extra;
-										//---//
-										state.back += state.extra;
-									}
-									//#ifdef INFLATE_STRICT
-									if ( state.offset > state.dmax ) {
-										strm.msg =
-											'invalid distance too far back';
-										state.mode = BAD;
-										break;
-									}
-									//#endif
-									//Tracevv((stderr, "inflate:         distance %u\n", state.offset));
-									state.mode = MATCH;
-								/* falls through */
-								case MATCH:
-									if ( left === 0 ) {
-										break inf_leave;
-									}
-									copy = _out - left;
-									if ( state.offset > copy ) {
-										/* copy from window */
-										copy = state.offset - copy;
-										if ( copy > state.whave ) {
-											if ( state.sane ) {
-												strm.msg =
-													'invalid distance too far back';
-												state.mode = BAD;
-												break;
-											}
-											// (!) This block is disabled in zlib defaults,
-											// don't enable it for binary compatibility
-											//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-											//          Trace((stderr, "inflate.c too far\n"));
-											//          copy -= state.whave;
-											//          if (copy > state.length) { copy = state.length; }
-											//          if (copy > left) { copy = left; }
-											//          left -= copy;
-											//          state.length -= copy;
-											//          do {
-											//            output[put++] = 0;
-											//          } while (--copy);
-											//          if (state.length === 0) { state.mode = LEN; }
-											//          break;
-											//#endif
-										}
-										if ( copy > state.wnext ) {
-											copy -= state.wnext;
-											from = state.wsize - copy;
-										} else {
-											from = state.wnext - copy;
-										}
-										if ( copy > state.length ) {
-											copy = state.length;
-										}
-										from_source = state.window;
-									} else {
-										/* copy from output */
-										from_source = output;
-										from = put - state.offset;
-										copy = state.length;
-									}
-									if ( copy > left ) {
-										copy = left;
-									}
-									left -= copy;
-									state.length -= copy;
-									do {
-										output[ put++ ] = from_source[ from++ ];
-									} while ( --copy );
-									if ( state.length === 0 ) {
-										state.mode = LEN;
-									}
-									break;
-								case LIT:
-									if ( left === 0 ) {
-										break inf_leave;
-									}
-									output[ put++ ] = state.length;
-									left--;
-									state.mode = LEN;
-									break;
-								case CHECK:
-									if ( state.wrap ) {
-										//=== NEEDBITS(32);
-										while ( bits < 32 ) {
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											// Use '|' instead of '+' to make sure that result is signed
-											hold |= input[ next++ ] << bits;
-											bits += 8;
-										}
-										//===//
-										_out -= left;
-										strm.total_out += _out;
-										state.total += _out;
-										if ( _out ) {
-											strm.adler = state.check =
-												/*UPDATE(state.check, put - _out, _out);*/
-												state.flags
-													? crc32(
-															state.check,
-															output,
-															_out,
-															put - _out
-													  )
-													: adler32(
-															state.check,
-															output,
-															_out,
-															put - _out
-													  );
-										}
-										_out = left;
-										// NB: crc32 stored as signed 32-bit int, zswap32 returns signed too
-										if (
-											( state.flags
-												? hold
-												: zswap32( hold ) ) !==
-											state.check
-										) {
-											strm.msg = 'incorrect data check';
-											state.mode = BAD;
-											break;
-										}
-										//=== INITBITS();
-										hold = 0;
-										bits = 0;
-										//===//
-										//Tracev((stderr, "inflate:   check matches trailer\n"));
-									}
-									state.mode = LENGTH;
-								/* falls through */
-								case LENGTH:
-									if ( state.wrap && state.flags ) {
-										//=== NEEDBITS(32);
-										while ( bits < 32 ) {
-											if ( have === 0 ) {
-												break inf_leave;
-											}
-											have--;
-											hold += input[ next++ ] << bits;
-											bits += 8;
-										}
-										//===//
-										if (
-											hold !==
-											( state.total & 0xffffffff )
-										) {
-											strm.msg = 'incorrect length check';
-											state.mode = BAD;
-											break;
-										}
-										//=== INITBITS();
-										hold = 0;
-										bits = 0;
-										//===//
-										//Tracev((stderr, "inflate:   length matches trailer\n"));
-									}
-									state.mode = DONE;
-								/* falls through */
-								case DONE:
-									ret = Z_STREAM_END;
-									break inf_leave;
-								case BAD:
-									ret = Z_DATA_ERROR;
-									break inf_leave;
-								case MEM:
-									return Z_MEM_ERROR;
-								case SYNC:
-								/* falls through */
-								default:
-									return Z_STREAM_ERROR;
-							}
-						}
-
-						// inf_leave <- here is real place for "goto inf_leave", emulated via "break inf_leave"
-
-						/*
+          state.lenbits = 9;
+
+          opts = { bits: state.lenbits };
+          ret = inflate_table(LENS, state.lens, 0, state.nlen, state.lencode, 0, state.work, opts);
+          // We have separate tables & no pointers. 2 commented lines below not needed.
+          // state.next_index = opts.table_index;
+          state.lenbits = opts.bits;
+          // state.lencode = state.next;
+
+          if (ret) {
+            strm.msg = 'invalid literal/lengths set';
+            state.mode = BAD;
+            break;
+          }
+
+          state.distbits = 6;
+          //state.distcode.copy(state.codes);
+          // Switch to use dynamic table
+          state.distcode = state.distdyn;
+          opts = { bits: state.distbits };
+          ret = inflate_table(DISTS, state.lens, state.nlen, state.ndist, state.distcode, 0, state.work, opts);
+          // We have separate tables & no pointers. 2 commented lines below not needed.
+          // state.next_index = opts.table_index;
+          state.distbits = opts.bits;
+          // state.distcode = state.next;
+
+          if (ret) {
+            strm.msg = 'invalid distances set';
+            state.mode = BAD;
+            break;
+          }
+          //Tracev((stderr, 'inflate:       codes ok\n'));
+          state.mode = LEN_;
+          if (flush === Z_TREES) { break inf_leave; }
+          /* falls through */
+        case LEN_:
+          state.mode = LEN;
+          /* falls through */
+        case LEN:
+          if (have >= 6 && left >= 258) {
+            //--- RESTORE() ---
+            strm.next_out = put;
+            strm.avail_out = left;
+            strm.next_in = next;
+            strm.avail_in = have;
+            state.hold = hold;
+            state.bits = bits;
+            //---
+            inflate_fast(strm, _out);
+            //--- LOAD() ---
+            put = strm.next_out;
+            output = strm.output;
+            left = strm.avail_out;
+            next = strm.next_in;
+            input = strm.input;
+            have = strm.avail_in;
+            hold = state.hold;
+            bits = state.bits;
+            //---
+
+            if (state.mode === TYPE) {
+              state.back = -1;
+            }
+            break;
+          }
+          state.back = 0;
+          for (;;) {
+            here = state.lencode[hold & ((1 << state.lenbits) - 1)];  /*BITS(state.lenbits)*/
+            here_bits = here >>> 24;
+            here_op = (here >>> 16) & 0xff;
+            here_val = here & 0xffff;
+
+            if (here_bits <= bits) { break; }
+            //--- PULLBYTE() ---//
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+            //---//
+          }
+          if (here_op && (here_op & 0xf0) === 0) {
+            last_bits = here_bits;
+            last_op = here_op;
+            last_val = here_val;
+            for (;;) {
+              here = state.lencode[last_val +
+                      ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)];
+              here_bits = here >>> 24;
+              here_op = (here >>> 16) & 0xff;
+              here_val = here & 0xffff;
+
+              if ((last_bits + here_bits) <= bits) { break; }
+              //--- PULLBYTE() ---//
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+              //---//
+            }
+            //--- DROPBITS(last.bits) ---//
+            hold >>>= last_bits;
+            bits -= last_bits;
+            //---//
+            state.back += last_bits;
+          }
+          //--- DROPBITS(here.bits) ---//
+          hold >>>= here_bits;
+          bits -= here_bits;
+          //---//
+          state.back += here_bits;
+          state.length = here_val;
+          if (here_op === 0) {
+            //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+            //        "inflate:         literal '%c'\n" :
+            //        "inflate:         literal 0x%02x\n", here.val));
+            state.mode = LIT;
+            break;
+          }
+          if (here_op & 32) {
+            //Tracevv((stderr, "inflate:         end of block\n"));
+            state.back = -1;
+            state.mode = TYPE;
+            break;
+          }
+          if (here_op & 64) {
+            strm.msg = 'invalid literal/length code';
+            state.mode = BAD;
+            break;
+          }
+          state.extra = here_op & 15;
+          state.mode = LENEXT;
+          /* falls through */
+        case LENEXT:
+          if (state.extra) {
+            //=== NEEDBITS(state.extra);
+            n = state.extra;
+            while (bits < n) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            state.length += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/;
+            //--- DROPBITS(state.extra) ---//
+            hold >>>= state.extra;
+            bits -= state.extra;
+            //---//
+            state.back += state.extra;
+          }
+          //Tracevv((stderr, "inflate:         length %u\n", state.length));
+          state.was = state.length;
+          state.mode = DIST;
+          /* falls through */
+        case DIST:
+          for (;;) {
+            here = state.distcode[hold & ((1 << state.distbits) - 1)];/*BITS(state.distbits)*/
+            here_bits = here >>> 24;
+            here_op = (here >>> 16) & 0xff;
+            here_val = here & 0xffff;
+
+            if ((here_bits) <= bits) { break; }
+            //--- PULLBYTE() ---//
+            if (have === 0) { break inf_leave; }
+            have--;
+            hold += input[next++] << bits;
+            bits += 8;
+            //---//
+          }
+          if ((here_op & 0xf0) === 0) {
+            last_bits = here_bits;
+            last_op = here_op;
+            last_val = here_val;
+            for (;;) {
+              here = state.distcode[last_val +
+                      ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)];
+              here_bits = here >>> 24;
+              here_op = (here >>> 16) & 0xff;
+              here_val = here & 0xffff;
+
+              if ((last_bits + here_bits) <= bits) { break; }
+              //--- PULLBYTE() ---//
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+              //---//
+            }
+            //--- DROPBITS(last.bits) ---//
+            hold >>>= last_bits;
+            bits -= last_bits;
+            //---//
+            state.back += last_bits;
+          }
+          //--- DROPBITS(here.bits) ---//
+          hold >>>= here_bits;
+          bits -= here_bits;
+          //---//
+          state.back += here_bits;
+          if (here_op & 64) {
+            strm.msg = 'invalid distance code';
+            state.mode = BAD;
+            break;
+          }
+          state.offset = here_val;
+          state.extra = (here_op) & 15;
+          state.mode = DISTEXT;
+          /* falls through */
+        case DISTEXT:
+          if (state.extra) {
+            //=== NEEDBITS(state.extra);
+            n = state.extra;
+            while (bits < n) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            state.offset += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/;
+            //--- DROPBITS(state.extra) ---//
+            hold >>>= state.extra;
+            bits -= state.extra;
+            //---//
+            state.back += state.extra;
+          }
+  //#ifdef INFLATE_STRICT
+          if (state.offset > state.dmax) {
+            strm.msg = 'invalid distance too far back';
+            state.mode = BAD;
+            break;
+          }
+  //#endif
+          //Tracevv((stderr, "inflate:         distance %u\n", state.offset));
+          state.mode = MATCH;
+          /* falls through */
+        case MATCH:
+          if (left === 0) { break inf_leave; }
+          copy = _out - left;
+          if (state.offset > copy) {         /* copy from window */
+            copy = state.offset - copy;
+            if (copy > state.whave) {
+              if (state.sane) {
+                strm.msg = 'invalid distance too far back';
+                state.mode = BAD;
+                break;
+              }
+  // (!) This block is disabled in zlib defaults,
+  // don't enable it for binary compatibility
+  //#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+  //          Trace((stderr, "inflate.c too far\n"));
+  //          copy -= state.whave;
+  //          if (copy > state.length) { copy = state.length; }
+  //          if (copy > left) { copy = left; }
+  //          left -= copy;
+  //          state.length -= copy;
+  //          do {
+  //            output[put++] = 0;
+  //          } while (--copy);
+  //          if (state.length === 0) { state.mode = LEN; }
+  //          break;
+  //#endif
+            }
+            if (copy > state.wnext) {
+              copy -= state.wnext;
+              from = state.wsize - copy;
+            }
+            else {
+              from = state.wnext - copy;
+            }
+            if (copy > state.length) { copy = state.length; }
+            from_source = state.window;
+          }
+          else {                              /* copy from output */
+            from_source = output;
+            from = put - state.offset;
+            copy = state.length;
+          }
+          if (copy > left) { copy = left; }
+          left -= copy;
+          state.length -= copy;
+          do {
+            output[put++] = from_source[from++];
+          } while (--copy);
+          if (state.length === 0) { state.mode = LEN; }
+          break;
+        case LIT:
+          if (left === 0) { break inf_leave; }
+          output[put++] = state.length;
+          left--;
+          state.mode = LEN;
+          break;
+        case CHECK:
+          if (state.wrap) {
+            //=== NEEDBITS(32);
+            while (bits < 32) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              // Use '|' instead of '+' to make sure that result is signed
+              hold |= input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            _out -= left;
+            strm.total_out += _out;
+            state.total += _out;
+            if (_out) {
+              strm.adler = state.check =
+                  /*UPDATE(state.check, put - _out, _out);*/
+                  (state.flags ? crc32(state.check, output, _out, put - _out) : adler32(state.check, output, _out, put - _out));
+
+            }
+            _out = left;
+            // NB: crc32 stored as signed 32-bit int, zswap32 returns signed too
+            if ((state.flags ? hold : zswap32(hold)) !== state.check) {
+              strm.msg = 'incorrect data check';
+              state.mode = BAD;
+              break;
+            }
+            //=== INITBITS();
+            hold = 0;
+            bits = 0;
+            //===//
+            //Tracev((stderr, "inflate:   check matches trailer\n"));
+          }
+          state.mode = LENGTH;
+          /* falls through */
+        case LENGTH:
+          if (state.wrap && state.flags) {
+            //=== NEEDBITS(32);
+            while (bits < 32) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            if (hold !== (state.total & 0xffffffff)) {
+              strm.msg = 'incorrect length check';
+              state.mode = BAD;
+              break;
+            }
+            //=== INITBITS();
+            hold = 0;
+            bits = 0;
+            //===//
+            //Tracev((stderr, "inflate:   length matches trailer\n"));
+          }
+          state.mode = DONE;
+          /* falls through */
+        case DONE:
+          ret = Z_STREAM_END;
+          break inf_leave;
+        case BAD:
+          ret = Z_DATA_ERROR;
+          break inf_leave;
+        case MEM:
+          return Z_MEM_ERROR;
+        case SYNC:
+          /* falls through */
+        default:
+          return Z_STREAM_ERROR;
+      }
+    }
+
+    // inf_leave <- here is real place for "goto inf_leave", emulated via "break inf_leave"
+
+    /*
        Return from inflate(), updating the total counts and the check value.
        If there was no progress during the inflate() call, return a buffer
        error.  Call updatewindow() to create and/or update the window state.
        Note: a memory error from inflate() is non-recoverable.
      */
 
-						//--- RESTORE() ---
-						strm.next_out = put;
-						strm.avail_out = left;
-						strm.next_in = next;
-						strm.avail_in = have;
-						state.hold = hold;
-						state.bits = bits;
-						//---
-
-						if (
-							state.wsize ||
-							( _out !== strm.avail_out &&
-								state.mode < BAD &&
-								( state.mode < CHECK || flush !== Z_FINISH ) )
-						) {
-							if (
-								updatewindow(
-									strm,
-									strm.output,
-									strm.next_out,
-									_out - strm.avail_out
-								)
-							) {
-								state.mode = MEM;
-								return Z_MEM_ERROR;
-							}
-						}
-						_in -= strm.avail_in;
-						_out -= strm.avail_out;
-						strm.total_in += _in;
-						strm.total_out += _out;
-						state.total += _out;
-						if ( state.wrap && _out ) {
-							strm.adler = state.check =
-								/*UPDATE(state.check, strm.next_out - _out, _out);*/
-								state.flags
-									? crc32(
-											state.check,
-											output,
-											_out,
-											strm.next_out - _out
-									  )
-									: adler32(
-											state.check,
-											output,
-											_out,
-											strm.next_out - _out
-									  );
-						}
-						strm.data_type =
-							state.bits +
-							( state.last ? 64 : 0 ) +
-							( state.mode === TYPE ? 128 : 0 ) +
-							( state.mode === LEN_ || state.mode === COPY_
-								? 256
-								: 0 );
-						if (
-							( ( _in === 0 && _out === 0 ) ||
-								flush === Z_FINISH ) &&
-							ret === Z_OK
-						) {
-							ret = Z_BUF_ERROR;
-						}
-						return ret;
-					}
-
-					function inflateEnd( strm ) {
-						if (
-							! strm ||
-							! strm.state /*|| strm->zfree == (free_func)0*/
-						) {
-							return Z_STREAM_ERROR;
-						}
-
-						var state = strm.state;
-						if ( state.window ) {
-							state.window = null;
-						}
-						strm.state = null;
-						return Z_OK;
-					}
-
-					function inflateGetHeader( strm, head ) {
-						var state;
-
-						/* check state */
-						if ( ! strm || ! strm.state ) {
-							return Z_STREAM_ERROR;
-						}
-						state = strm.state;
-						if ( ( state.wrap & 2 ) === 0 ) {
-							return Z_STREAM_ERROR;
-						}
-
-						/* save header structure */
-						state.head = head;
-						head.done = false;
-						return Z_OK;
-					}
-
-					function inflateSetDictionary( strm, dictionary ) {
-						var dictLength = dictionary.length;
-
-						var state;
-						var dictid;
-						var ret;
-
-						/* check state */
-						if (
-							! strm /* == Z_NULL */ ||
-							! strm.state /* == Z_NULL */
-						) {
-							return Z_STREAM_ERROR;
-						}
-						state = strm.state;
-
-						if ( state.wrap !== 0 && state.mode !== DICT ) {
-							return Z_STREAM_ERROR;
-						}
-
-						/* check for correct dictionary identifier */
-						if ( state.mode === DICT ) {
-							dictid = 1; /* adler32(0, null, 0)*/
-							/* dictid = adler32(dictid, dictionary, dictLength); */
-							dictid = adler32(
-								dictid,
-								dictionary,
-								dictLength,
-								0
-							);
-							if ( dictid !== state.check ) {
-								return Z_DATA_ERROR;
-							}
-						}
-						/* copy dictionary to window using updatewindow(), which will amend the
+    //--- RESTORE() ---
+    strm.next_out = put;
+    strm.avail_out = left;
+    strm.next_in = next;
+    strm.avail_in = have;
+    state.hold = hold;
+    state.bits = bits;
+    //---
+
+    if (state.wsize || (_out !== strm.avail_out && state.mode < BAD &&
+                        (state.mode < CHECK || flush !== Z_FINISH))) {
+      if (updatewindow(strm, strm.output, strm.next_out, _out - strm.avail_out)) {
+        state.mode = MEM;
+        return Z_MEM_ERROR;
+      }
+    }
+    _in -= strm.avail_in;
+    _out -= strm.avail_out;
+    strm.total_in += _in;
+    strm.total_out += _out;
+    state.total += _out;
+    if (state.wrap && _out) {
+      strm.adler = state.check = /*UPDATE(state.check, strm.next_out - _out, _out);*/
+        (state.flags ? crc32(state.check, output, _out, strm.next_out - _out) : adler32(state.check, output, _out, strm.next_out - _out));
+    }
+    strm.data_type = state.bits + (state.last ? 64 : 0) +
+                      (state.mode === TYPE ? 128 : 0) +
+                      (state.mode === LEN_ || state.mode === COPY_ ? 256 : 0);
+    if (((_in === 0 && _out === 0) || flush === Z_FINISH) && ret === Z_OK) {
+      ret = Z_BUF_ERROR;
+    }
+    return ret;
+  }
+
+  function inflateEnd(strm) {
+
+    if (!strm || !strm.state /*|| strm->zfree == (free_func)0*/) {
+      return Z_STREAM_ERROR;
+    }
+
+    var state = strm.state;
+    if (state.window) {
+      state.window = null;
+    }
+    strm.state = null;
+    return Z_OK;
+  }
+
+  function inflateGetHeader(strm, head) {
+    var state;
+
+    /* check state */
+    if (!strm || !strm.state) { return Z_STREAM_ERROR; }
+    state = strm.state;
+    if ((state.wrap & 2) === 0) { return Z_STREAM_ERROR; }
+
+    /* save header structure */
+    state.head = head;
+    head.done = false;
+    return Z_OK;
+  }
+
+  function inflateSetDictionary(strm, dictionary) {
+    var dictLength = dictionary.length;
+
+    var state;
+    var dictid;
+    var ret;
+
+    /* check state */
+    if (!strm /* == Z_NULL */ || !strm.state /* == Z_NULL */) { return Z_STREAM_ERROR; }
+    state = strm.state;
+
+    if (state.wrap !== 0 && state.mode !== DICT) {
+      return Z_STREAM_ERROR;
+    }
+
+    /* check for correct dictionary identifier */
+    if (state.mode === DICT) {
+      dictid = 1; /* adler32(0, null, 0)*/
+      /* dictid = adler32(dictid, dictionary, dictLength); */
+      dictid = adler32(dictid, dictionary, dictLength, 0);
+      if (dictid !== state.check) {
+        return Z_DATA_ERROR;
+      }
+    }
+    /* copy dictionary to window using updatewindow(), which will amend the
      existing dictionary if appropriate */
-						ret = updatewindow(
-							strm,
-							dictionary,
-							dictLength,
-							dictLength
-						);
-						if ( ret ) {
-							state.mode = MEM;
-							return Z_MEM_ERROR;
-						}
-						state.havedict = 1;
-						// Tracev((stderr, "inflate:   dictionary set\n"));
-						return Z_OK;
-					}
-
-					exports.inflateReset = inflateReset;
-					exports.inflateReset2 = inflateReset2;
-					exports.inflateResetKeep = inflateResetKeep;
-					exports.inflateInit = inflateInit;
-					exports.inflateInit2 = inflateInit2;
-					exports.inflate = inflate;
-					exports.inflateEnd = inflateEnd;
-					exports.inflateGetHeader = inflateGetHeader;
-					exports.inflateSetDictionary = inflateSetDictionary;
-					exports.inflateInfo = 'pako inflate (from Nodeca project)';
-
-					/* Not implemented
+    ret = updatewindow(strm, dictionary, dictLength, dictLength);
+    if (ret) {
+      state.mode = MEM;
+      return Z_MEM_ERROR;
+    }
+    state.havedict = 1;
+    // Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+  }
+
+  exports.inflateReset = inflateReset;
+  exports.inflateReset2 = inflateReset2;
+  exports.inflateResetKeep = inflateResetKeep;
+  exports.inflateInit = inflateInit;
+  exports.inflateInit2 = inflateInit2;
+  exports.inflate = inflate;
+  exports.inflateEnd = inflateEnd;
+  exports.inflateGetHeader = inflateGetHeader;
+  exports.inflateSetDictionary = inflateSetDictionary;
+  exports.inflateInfo = 'pako inflate (from Nodeca project)';
+
+  /* Not implemented
   exports.inflateCopy = inflateCopy;
   exports.inflateGetDictionary = inflateGetDictionary;
   exports.inflateMark = inflateMark;
@@ -3094,114 +2474,93 @@
   exports.inflateSyncPoint = inflateSyncPoint;
   exports.inflateUndermine = inflateUndermine;
   */
-				},
-				{
-					'../utils/common': 1,
-					'./adler32': 3,
-					'./crc32': 5,
-					'./inffast': 7,
-					'./inftrees': 9,
-				},
-			],
-			9: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					// (C) 1995-2013 Jean-loup Gailly and Mark Adler
-					// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
-					//
-					// This software is provided 'as-is', without any express or implied
-					// warranty. In no event will the authors be held liable for any damages
-					// arising from the use of this software.
-					//
-					// Permission is granted to anyone to use this software for any purpose,
-					// including commercial applications, and to alter it and redistribute it
-					// freely, subject to the following restrictions:
-					//
-					// 1. The origin of this software must not be misrepresented; you must not
-					//   claim that you wrote the original software. If you use this software
-					//   in a product, an acknowledgment in the product documentation would be
-					//   appreciated but is not required.
-					// 2. Altered source versions must be plainly marked as such, and must not be
-					//   misrepresented as being the original software.
-					// 3. This notice may not be removed or altered from any source distribution.
-
-					var utils = require( '../utils/common' );
-
-					var MAXBITS = 15;
-					var ENOUGH_LENS = 852;
-					var ENOUGH_DISTS = 592;
-					//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS);
-
-					var CODES = 0;
-					var LENS = 1;
-					var DISTS = 2;
-
-					var lbase = [
-						/* Length codes 257..285 base */ 3, 4, 5, 6, 7, 8, 9,
-						10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67,
-						83, 99, 115, 131, 163, 195, 227, 258, 0, 0,
-					];
-
-					var lext = [
-						/* Length codes 257..285 extra */ 16, 16, 16, 16, 16,
-						16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19,
-						19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78,
-					];
-
-					var dbase = [
-						/* Distance codes 0..29 base */ 1, 2, 3, 4, 5, 7, 9, 13,
-						17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769,
-						1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385,
-						24577, 0, 0,
-					];
-
-					var dext = [
-						/* Distance codes 0..29 extra */ 16, 16, 16, 16, 17, 17,
-						18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24,
-						25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 64, 64,
-					];
-
-					module.exports = function inflate_table(
-						type,
-						lens,
-						lens_index,
-						codes,
-						table,
-						table_index,
-						work,
-						opts
-					) {
-						var bits = opts.bits;
-						//here = opts.here; /* table entry for duplication */
-
-						var len = 0; /* a code's length in bits */
-						var sym = 0; /* index of code symbols */
-						var min = 0,
-							max = 0; /* minimum and maximum code lengths */
-						var root = 0; /* number of index bits for root table */
-						var curr = 0; /* number of index bits for current table */
-						var drop = 0; /* code bits to drop for sub-table */
-						var left = 0; /* number of prefix codes available */
-						var used = 0; /* code entries in table used */
-						var huff = 0; /* Huffman code */
-						var incr; /* for incrementing code, index */
-						var fill; /* index for replicating entries */
-						var low; /* low bits for current root entry */
-						var mask; /* mask for low root bits */
-						var next; /* next available space in table */
-						var base = null; /* base value table to use */
-						var base_index = 0;
-						//  var shoextra;    /* extra bits table to use */
-						var end; /* use base and extra for symbol > end */
-						var count = new utils.Buf16( MAXBITS + 1 ); //[MAXBITS+1];    /* number of codes of each length */
-						var offs = new utils.Buf16( MAXBITS + 1 ); //[MAXBITS+1];     /* offsets in table for each length */
-						var extra = null;
-						var extra_index = 0;
-
-						var here_bits, here_op, here_val;
-
-						/*
+
+  },{"../utils/common":1,"./adler32":3,"./crc32":5,"./inffast":7,"./inftrees":9}],9:[function(require,module,exports){
+  'use strict';
+
+  // (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  // (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+  //
+  // This software is provided 'as-is', without any express or implied
+  // warranty. In no event will the authors be held liable for any damages
+  // arising from the use of this software.
+  //
+  // Permission is granted to anyone to use this software for any purpose,
+  // including commercial applications, and to alter it and redistribute it
+  // freely, subject to the following restrictions:
+  //
+  // 1. The origin of this software must not be misrepresented; you must not
+  //   claim that you wrote the original software. If you use this software
+  //   in a product, an acknowledgment in the product documentation would be
+  //   appreciated but is not required.
+  // 2. Altered source versions must be plainly marked as such, and must not be
+  //   misrepresented as being the original software.
+  // 3. This notice may not be removed or altered from any source distribution.
+
+  var utils = require('../utils/common');
+
+  var MAXBITS = 15;
+  var ENOUGH_LENS = 852;
+  var ENOUGH_DISTS = 592;
+  //var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS);
+
+  var CODES = 0;
+  var LENS = 1;
+  var DISTS = 2;
+
+  var lbase = [ /* Length codes 257..285 base */
+    3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+    35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
+  ];
+
+  var lext = [ /* Length codes 257..285 extra */
+    16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+    19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78
+  ];
+
+  var dbase = [ /* Distance codes 0..29 base */
+    1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+    257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+    8193, 12289, 16385, 24577, 0, 0
+  ];
+
+  var dext = [ /* Distance codes 0..29 extra */
+    16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+    23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+    28, 28, 29, 29, 64, 64
+  ];
+
+  module.exports = function inflate_table(type, lens, lens_index, codes, table, table_index, work, opts)
+  {
+    var bits = opts.bits;
+        //here = opts.here; /* table entry for duplication */
+
+    var len = 0;               /* a code's length in bits */
+    var sym = 0;               /* index of code symbols */
+    var min = 0, max = 0;          /* minimum and maximum code lengths */
+    var root = 0;              /* number of index bits for root table */
+    var curr = 0;              /* number of index bits for current table */
+    var drop = 0;              /* code bits to drop for sub-table */
+    var left = 0;                   /* number of prefix codes available */
+    var used = 0;              /* code entries in table used */
+    var huff = 0;              /* Huffman code */
+    var incr;              /* for incrementing code, index */
+    var fill;              /* index for replicating entries */
+    var low;               /* low bits for current root entry */
+    var mask;              /* mask for low root bits */
+    var next;             /* next available space in table */
+    var base = null;     /* base value table to use */
+    var base_index = 0;
+  //  var shoextra;    /* extra bits table to use */
+    var end;                    /* use base and extra for symbol > end */
+    var count = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1];    /* number of codes of each length */
+    var offs = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1];     /* offsets in table for each length */
+    var extra = null;
+    var extra_index = 0;
+
+    var here_bits, here_op, here_val;
+
+    /*
      Process a set of code lengths to create a canonical Huffman code.  The
      code lengths are lens[0..codes-1].  Each length corresponds to the
      symbols 0..codes-1.  The Huffman code is generated by first sorting the
@@ -3232,78 +2591,71 @@
      decoding tables.
      */
 
-						/* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-						for ( len = 0; len <= MAXBITS; len++ ) {
-							count[ len ] = 0;
-						}
-						for ( sym = 0; sym < codes; sym++ ) {
-							count[ lens[ lens_index + sym ] ]++;
-						}
-
-						/* bound code lengths, force root to be within code lengths */
-						root = bits;
-						for ( max = MAXBITS; max >= 1; max-- ) {
-							if ( count[ max ] !== 0 ) {
-								break;
-							}
-						}
-						if ( root > max ) {
-							root = max;
-						}
-						if ( max === 0 ) {
-							/* no symbols to code at all */
-							//table.op[opts.table_index] = 64;  //here.op = (var char)64;    /* invalid code marker */
-							//table.bits[opts.table_index] = 1;   //here.bits = (var char)1;
-							//table.val[opts.table_index++] = 0;   //here.val = (var short)0;
-							table[ table_index++ ] =
-								( 1 << 24 ) | ( 64 << 16 ) | 0;
-
-							//table.op[opts.table_index] = 64;
-							//table.bits[opts.table_index] = 1;
-							//table.val[opts.table_index++] = 0;
-							table[ table_index++ ] =
-								( 1 << 24 ) | ( 64 << 16 ) | 0;
-
-							opts.bits = 1;
-							return 0; /* no symbols, but wait for decoding to report error */
-						}
-						for ( min = 1; min < max; min++ ) {
-							if ( count[ min ] !== 0 ) {
-								break;
-							}
-						}
-						if ( root < min ) {
-							root = min;
-						}
-
-						/* check for an over-subscribed or incomplete set of lengths */
-						left = 1;
-						for ( len = 1; len <= MAXBITS; len++ ) {
-							left <<= 1;
-							left -= count[ len ];
-							if ( left < 0 ) {
-								return -1;
-							} /* over-subscribed */
-						}
-						if ( left > 0 && ( type === CODES || max !== 1 ) ) {
-							return -1; /* incomplete set */
-						}
-
-						/* generate offsets into symbol table for each length for sorting */
-						offs[ 1 ] = 0;
-						for ( len = 1; len < MAXBITS; len++ ) {
-							offs[ len + 1 ] = offs[ len ] + count[ len ];
-						}
-
-						/* sort symbols by length, by symbol order within each length */
-						for ( sym = 0; sym < codes; sym++ ) {
-							if ( lens[ lens_index + sym ] !== 0 ) {
-								work[ offs[ lens[ lens_index + sym ] ]++ ] =
-									sym;
-							}
-						}
-
-						/*
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++) {
+      count[len] = 0;
+    }
+    for (sym = 0; sym < codes; sym++) {
+      count[lens[lens_index + sym]]++;
+    }
+
+    /* bound code lengths, force root to be within code lengths */
+    root = bits;
+    for (max = MAXBITS; max >= 1; max--) {
+      if (count[max] !== 0) { break; }
+    }
+    if (root > max) {
+      root = max;
+    }
+    if (max === 0) {                     /* no symbols to code at all */
+      //table.op[opts.table_index] = 64;  //here.op = (var char)64;    /* invalid code marker */
+      //table.bits[opts.table_index] = 1;   //here.bits = (var char)1;
+      //table.val[opts.table_index++] = 0;   //here.val = (var short)0;
+      table[table_index++] = (1 << 24) | (64 << 16) | 0;
+
+
+      //table.op[opts.table_index] = 64;
+      //table.bits[opts.table_index] = 1;
+      //table.val[opts.table_index++] = 0;
+      table[table_index++] = (1 << 24) | (64 << 16) | 0;
+
+      opts.bits = 1;
+      return 0;     /* no symbols, but wait for decoding to report error */
+    }
+    for (min = 1; min < max; min++) {
+      if (count[min] !== 0) { break; }
+    }
+    if (root < min) {
+      root = min;
+    }
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+      left <<= 1;
+      left -= count[len];
+      if (left < 0) {
+        return -1;
+      }        /* over-subscribed */
+    }
+    if (left > 0 && (type === CODES || max !== 1)) {
+      return -1;                      /* incomplete set */
+    }
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++) {
+      offs[len + 1] = offs[len] + count[len];
+    }
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++) {
+      if (lens[lens_index + sym] !== 0) {
+        work[offs[lens[lens_index + sym]]++] = sym;
+      }
+    }
+
+    /*
      Create and fill in decoding tables.  In this loop, the table being
      filled is at next and has curr index bits.  The code being used is huff
      with length len.  That code is converted to an index by dropping drop
@@ -3334,749 +2686,648 @@
      in the rest of the decoding tables with invalid code markers.
      */
 
-						/* set up for code type */
-						// poor man optimization - use if-else instead of switch,
-						// to avoid deopts in old v8
-						if ( type === CODES ) {
-							base = extra = work; /* dummy value--not used */
-							end = 19;
-						} else if ( type === LENS ) {
-							base = lbase;
-							base_index -= 257;
-							extra = lext;
-							extra_index -= 257;
-							end = 256;
-						} else {
-							/* DISTS */
-							base = dbase;
-							extra = dext;
-							end = -1;
-						}
-
-						/* initialize opts for loop */
-						huff = 0; /* starting code */
-						sym = 0; /* starting code symbol */
-						len = min; /* starting code length */
-						next = table_index; /* current table to fill in */
-						curr = root; /* current table index bits */
-						drop = 0; /* current bits to drop from code for index */
-						low = -1; /* trigger new sub-table when len > root */
-						used = 1 << root; /* use root table entries */
-						mask = used - 1; /* mask for comparing low */
-
-						/* check available table space */
-						if (
-							( type === LENS && used > ENOUGH_LENS ) ||
-							( type === DISTS && used > ENOUGH_DISTS )
-						) {
-							return 1;
-						}
-
-						/* process all codes and make table entries */
-						for (;;) {
-							/* create table entry */
-							here_bits = len - drop;
-							if ( work[ sym ] < end ) {
-								here_op = 0;
-								here_val = work[ sym ];
-							} else if ( work[ sym ] > end ) {
-								here_op = extra[ extra_index + work[ sym ] ];
-								here_val = base[ base_index + work[ sym ] ];
-							} else {
-								here_op = 32 + 64; /* end of block */
-								here_val = 0;
-							}
-
-							/* replicate for those indices with low len bits equal to huff */
-							incr = 1 << ( len - drop );
-							fill = 1 << curr;
-							min = fill; /* save offset to next table */
-							do {
-								fill -= incr;
-								table[ next + ( huff >> drop ) + fill ] =
-									( here_bits << 24 ) |
-									( here_op << 16 ) |
-									here_val |
-									0;
-							} while ( fill !== 0 );
-
-							/* backwards increment the len-bit code huff */
-							incr = 1 << ( len - 1 );
-							while ( huff & incr ) {
-								incr >>= 1;
-							}
-							if ( incr !== 0 ) {
-								huff &= incr - 1;
-								huff += incr;
-							} else {
-								huff = 0;
-							}
-
-							/* go to next symbol, update count, len */
-							sym++;
-							if ( --count[ len ] === 0 ) {
-								if ( len === max ) {
-									break;
-								}
-								len = lens[ lens_index + work[ sym ] ];
-							}
-
-							/* create new sub-table if needed */
-							if ( len > root && ( huff & mask ) !== low ) {
-								/* if first time, transition to sub-tables */
-								if ( drop === 0 ) {
-									drop = root;
-								}
-
-								/* increment past last table */
-								next += min; /* here min is 1 << curr */
-
-								/* determine length of next table */
-								curr = len - drop;
-								left = 1 << curr;
-								while ( curr + drop < max ) {
-									left -= count[ curr + drop ];
-									if ( left <= 0 ) {
-										break;
-									}
-									curr++;
-									left <<= 1;
-								}
-
-								/* check for enough space */
-								used += 1 << curr;
-								if (
-									( type === LENS && used > ENOUGH_LENS ) ||
-									( type === DISTS && used > ENOUGH_DISTS )
-								) {
-									return 1;
-								}
-
-								/* point entry in root table to sub-table */
-								low = huff & mask;
-								/*table.op[low] = curr;
+    /* set up for code type */
+    // poor man optimization - use if-else instead of switch,
+    // to avoid deopts in old v8
+    if (type === CODES) {
+      base = extra = work;    /* dummy value--not used */
+      end = 19;
+
+    } else if (type === LENS) {
+      base = lbase;
+      base_index -= 257;
+      extra = lext;
+      extra_index -= 257;
+      end = 256;
+
+    } else {                    /* DISTS */
+      base = dbase;
+      extra = dext;
+      end = -1;
+    }
+
+    /* initialize opts for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = table_index;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = -1;                   /* trigger new sub-table when len > root */
+    used = 1 << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if ((type === LENS && used > ENOUGH_LENS) ||
+      (type === DISTS && used > ENOUGH_DISTS)) {
+      return 1;
+    }
+
+    /* process all codes and make table entries */
+    for (;;) {
+      /* create table entry */
+      here_bits = len - drop;
+      if (work[sym] < end) {
+        here_op = 0;
+        here_val = work[sym];
+      }
+      else if (work[sym] > end) {
+        here_op = extra[extra_index + work[sym]];
+        here_val = base[base_index + work[sym]];
+      }
+      else {
+        here_op = 32 + 64;         /* end of block */
+        here_val = 0;
+      }
+
+      /* replicate for those indices with low len bits equal to huff */
+      incr = 1 << (len - drop);
+      fill = 1 << curr;
+      min = fill;                 /* save offset to next table */
+      do {
+        fill -= incr;
+        table[next + (huff >> drop) + fill] = (here_bits << 24) | (here_op << 16) | here_val |0;
+      } while (fill !== 0);
+
+      /* backwards increment the len-bit code huff */
+      incr = 1 << (len - 1);
+      while (huff & incr) {
+        incr >>= 1;
+      }
+      if (incr !== 0) {
+        huff &= incr - 1;
+        huff += incr;
+      } else {
+        huff = 0;
+      }
+
+      /* go to next symbol, update count, len */
+      sym++;
+      if (--count[len] === 0) {
+        if (len === max) { break; }
+        len = lens[lens_index + work[sym]];
+      }
+
+      /* create new sub-table if needed */
+      if (len > root && (huff & mask) !== low) {
+        /* if first time, transition to sub-tables */
+        if (drop === 0) {
+          drop = root;
+        }
+
+        /* increment past last table */
+        next += min;            /* here min is 1 << curr */
+
+        /* determine length of next table */
+        curr = len - drop;
+        left = 1 << curr;
+        while (curr + drop < max) {
+          left -= count[curr + drop];
+          if (left <= 0) { break; }
+          curr++;
+          left <<= 1;
+        }
+
+        /* check for enough space */
+        used += 1 << curr;
+        if ((type === LENS && used > ENOUGH_LENS) ||
+          (type === DISTS && used > ENOUGH_DISTS)) {
+          return 1;
+        }
+
+        /* point entry in root table to sub-table */
+        low = huff & mask;
+        /*table.op[low] = curr;
         table.bits[low] = root;
         table.val[low] = next - opts.table_index;*/
-								table[ low ] =
-									( root << 24 ) |
-									( curr << 16 ) |
-									( next - table_index ) |
-									0;
-							}
-						}
-
-						/* fill in remaining table entry if code is incomplete (guaranteed to have
+        table[low] = (root << 24) | (curr << 16) | (next - table_index) |0;
+      }
+    }
+
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
      at most one remaining entry, since if the code is incomplete, the
      maximum code length that was allowed to get this far is one bit) */
-						if ( huff !== 0 ) {
-							//table.op[next + huff] = 64;            /* invalid code marker */
-							//table.bits[next + huff] = len - drop;
-							//table.val[next + huff] = 0;
-							table[ next + huff ] =
-								( ( len - drop ) << 24 ) | ( 64 << 16 ) | 0;
-						}
-
-						/* set return parameters */
-						//opts.table_index += used;
-						opts.bits = root;
-						return 0;
-					};
-				},
-				{ '../utils/common': 1 },
-			],
-			10: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					// (C) 1995-2013 Jean-loup Gailly and Mark Adler
-					// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
-					//
-					// This software is provided 'as-is', without any express or implied
-					// warranty. In no event will the authors be held liable for any damages
-					// arising from the use of this software.
-					//
-					// Permission is granted to anyone to use this software for any purpose,
-					// including commercial applications, and to alter it and redistribute it
-					// freely, subject to the following restrictions:
-					//
-					// 1. The origin of this software must not be misrepresented; you must not
-					//   claim that you wrote the original software. If you use this software
-					//   in a product, an acknowledgment in the product documentation would be
-					//   appreciated but is not required.
-					// 2. Altered source versions must be plainly marked as such, and must not be
-					//   misrepresented as being the original software.
-					// 3. This notice may not be removed or altered from any source distribution.
-
-					module.exports = {
-						2: 'need dictionary' /* Z_NEED_DICT       2  */,
-						1: 'stream end' /* Z_STREAM_END      1  */,
-						0: '' /* Z_OK              0  */,
-						'-1': 'file error' /* Z_ERRNO         (-1) */,
-						'-2': 'stream error' /* Z_STREAM_ERROR  (-2) */,
-						'-3': 'data error' /* Z_DATA_ERROR    (-3) */,
-						'-4': 'insufficient memory' /* Z_MEM_ERROR     (-4) */,
-						'-5': 'buffer error' /* Z_BUF_ERROR     (-5) */,
-						'-6': 'incompatible version' /* Z_VERSION_ERROR (-6) */,
-					};
-				},
-				{},
-			],
-			11: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					// (C) 1995-2013 Jean-loup Gailly and Mark Adler
-					// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
-					//
-					// This software is provided 'as-is', without any express or implied
-					// warranty. In no event will the authors be held liable for any damages
-					// arising from the use of this software.
-					//
-					// Permission is granted to anyone to use this software for any purpose,
-					// including commercial applications, and to alter it and redistribute it
-					// freely, subject to the following restrictions:
-					//
-					// 1. The origin of this software must not be misrepresented; you must not
-					//   claim that you wrote the original software. If you use this software
-					//   in a product, an acknowledgment in the product documentation would be
-					//   appreciated but is not required.
-					// 2. Altered source versions must be plainly marked as such, and must not be
-					//   misrepresented as being the original software.
-					// 3. This notice may not be removed or altered from any source distribution.
-
-					function ZStream() {
-						/* next input byte */
-						this.input = null; // JS specific, because we have no pointers
-						this.next_in = 0;
-						/* number of bytes available at input */
-						this.avail_in = 0;
-						/* total number of input bytes read so far */
-						this.total_in = 0;
-						/* next output byte should be put there */
-						this.output = null; // JS specific, because we have no pointers
-						this.next_out = 0;
-						/* remaining free space at output */
-						this.avail_out = 0;
-						/* total number of bytes output so far */
-						this.total_out = 0;
-						/* last error message, NULL if no error */
-						this.msg = '' /*Z_NULL*/;
-						/* not visible by applications */
-						this.state = null;
-						/* best guess about the data type: binary or text */
-						this.data_type = 2 /*Z_UNKNOWN*/;
-						/* adler32 value of the uncompressed data */
-						this.adler = 0;
-					}
-
-					module.exports = ZStream;
-				},
-				{},
-			],
-			'/lib/inflate.js': [
-				function ( require, module, exports ) {
-					'use strict';
-
-					var zlib_inflate = require( './zlib/inflate' );
-					var utils = require( './utils/common' );
-					var strings = require( './utils/strings' );
-					var c = require( './zlib/constants' );
-					var msg = require( './zlib/messages' );
-					var ZStream = require( './zlib/zstream' );
-					var GZheader = require( './zlib/gzheader' );
-
-					var toString = Object.prototype.toString;
-
-					/**
-					 * class Inflate
-					 *
-					 * Generic JS-style wrapper for zlib calls. If you don't need
-					 * streaming behaviour - use more simple functions: [[inflate]]
-					 * and [[inflateRaw]].
-					 **/
-
-					/* internal
-					 * inflate.chunks -> Array
-					 *
-					 * Chunks of output data, if [[Inflate#onData]] not overridden.
-					 **/
-
-					/**
-					 * Inflate.result -> Uint8Array|Array|String
-					 *
-					 * Uncompressed result, generated by default [[Inflate#onData]]
-					 * and [[Inflate#onEnd]] handlers. Filled after you push last chunk
-					 * (call [[Inflate#push]] with `Z_FINISH` / `true` param) or if you
-					 * push a chunk with explicit flush (call [[Inflate#push]] with
-					 * `Z_SYNC_FLUSH` param).
-					 **/
-
-					/**
-					 * Inflate.err -> Number
-					 *
-					 * Error code after inflate finished. 0 (Z_OK) on success.
-					 * Should be checked if broken data possible.
-					 **/
-
-					/**
-					 * Inflate.msg -> String
-					 *
-					 * Error message, if [[Inflate.err]] != 0
-					 **/
-
-					/**
-					 * new Inflate(options)
-					 * - options (Object): zlib inflate options.
-					 *
-					 * Creates new inflator instance with specified params. Throws exception
-					 * on bad params. Supported options:
-					 *
-					 * - `windowBits`
-					 * - `dictionary`
-					 *
-					 * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
-					 * for more information on these.
-					 *
-					 * Additional options, for internal needs:
-					 *
-					 * - `chunkSize` - size of generated data chunks (16K by default)
-					 * - `raw` (Boolean) - do raw inflate
-					 * - `to` (String) - if equal to 'string', then result will be converted
-					 *   from utf8 to utf16 (javascript) string. When string output requested,
-					 *   chunk length can differ from `chunkSize`, depending on content.
-					 *
-					 * By default, when no options set, autodetect deflate/gzip data format via
-					 * wrapper header.
-					 *
-					 * ##### Example:
-					 *
-					 * ```javascript
-					 * var pako = require('pako')
-					 *   , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
-					 *   , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
-					 *
-					 * var inflate = new pako.Inflate({ level: 3});
-					 *
-					 * inflate.push(chunk1, false);
-					 * inflate.push(chunk2, true);  // true -> last chunk
-					 *
-					 * if (inflate.err) { throw new Error(inflate.err); }
-					 *
-					 * console.log(inflate.result);
-					 * ```
-					 **/
-					function Inflate( options ) {
-						if ( ! ( this instanceof Inflate ) )
-							return new Inflate( options );
-
-						this.options = utils.assign(
-							{
-								chunkSize: 16384,
-								windowBits: 0,
-								to: '',
-							},
-							options || {}
-						);
-
-						var opt = this.options;
-
-						// Force window size for `raw` data, if not set directly,
-						// because we have no header for autodetect.
-						if (
-							opt.raw &&
-							opt.windowBits >= 0 &&
-							opt.windowBits < 16
-						) {
-							opt.windowBits = -opt.windowBits;
-							if ( opt.windowBits === 0 ) {
-								opt.windowBits = -15;
-							}
-						}
-
-						// If `windowBits` not defined (and mode not raw) - set autodetect flag for gzip/deflate
-						if (
-							opt.windowBits >= 0 &&
-							opt.windowBits < 16 &&
-							! ( options && options.windowBits )
-						) {
-							opt.windowBits += 32;
-						}
-
-						// Gzip header has no info about windows size, we can do autodetect only
-						// for deflate. So, if window size not set, force it to max when gzip possible
-						if ( opt.windowBits > 15 && opt.windowBits < 48 ) {
-							// bit 3 (16) -> gzipped data
-							// bit 4 (32) -> autodetect gzip/deflate
-							if ( ( opt.windowBits & 15 ) === 0 ) {
-								opt.windowBits |= 15;
-							}
-						}
-
-						this.err = 0; // error code, if happens (0 = Z_OK)
-						this.msg = ''; // error message
-						this.ended = false; // used to avoid multiple onEnd() calls
-						this.chunks = []; // chunks of compressed data
-
-						this.strm = new ZStream();
-						this.strm.avail_out = 0;
-
-						var status = zlib_inflate.inflateInit2(
-							this.strm,
-							opt.windowBits
-						);
-
-						if ( status !== c.Z_OK ) {
-							throw new Error( msg[ status ] );
-						}
-
-						this.header = new GZheader();
-
-						zlib_inflate.inflateGetHeader( this.strm, this.header );
-
-						// Setup dictionary
-						if ( opt.dictionary ) {
-							// Convert data if needed
-							if ( typeof opt.dictionary === 'string' ) {
-								opt.dictionary = strings.string2buf(
-									opt.dictionary
-								);
-							} else if (
-								toString.call( opt.dictionary ) ===
-								'[object ArrayBuffer]'
-							) {
-								opt.dictionary = new Uint8Array(
-									opt.dictionary
-								);
-							}
-							if ( opt.raw ) {
-								//In raw mode we need to set the dictionary early
-								status = zlib_inflate.inflateSetDictionary(
-									this.strm,
-									opt.dictionary
-								);
-								if ( status !== c.Z_OK ) {
-									throw new Error( msg[ status ] );
-								}
-							}
-						}
-					}
-
-					/**
-					 * Inflate#push(data[, mode]) -> Boolean
-					 * - data (Uint8Array|Array|ArrayBuffer|String): input data
-					 * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
-					 *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` means Z_FINISH.
-					 *
-					 * Sends input data to inflate pipe, generating [[Inflate#onData]] calls with
-					 * new output chunks. Returns `true` on success. The last data block must have
-					 * mode Z_FINISH (or `true`). That will flush internal pending buffers and call
-					 * [[Inflate#onEnd]]. For interim explicit flushes (without ending the stream) you
-					 * can use mode Z_SYNC_FLUSH, keeping the decompression context.
-					 *
-					 * On fail call [[Inflate#onEnd]] with error code and return false.
-					 *
-					 * We strongly recommend to use `Uint8Array` on input for best speed (output
-					 * format is detected automatically). Also, don't skip last param and always
-					 * use the same type in your code (boolean or number). That will improve JS speed.
-					 *
-					 * For regular `Array`-s make sure all elements are [0..255].
-					 *
-					 * ##### Example
-					 *
-					 * ```javascript
-					 * push(chunk, false); // push one of data chunks
-					 * ...
-					 * push(chunk, true);  // push last chunk
-					 * ```
-					 **/
-					Inflate.prototype.push = function ( data, mode ) {
-						var strm = this.strm;
-						var chunkSize = this.options.chunkSize;
-						var dictionary = this.options.dictionary;
-						var status, _mode;
-						var next_out_utf8, tail, utf8str;
-
-						// Flag to properly process Z_BUF_ERROR on testing inflate call
-						// when we check that all output data was flushed.
-						var allowBufError = false;
-
-						if ( this.ended ) {
-							return false;
-						}
-						_mode =
-							mode === ~~mode
-								? mode
-								: mode === true
-								? c.Z_FINISH
-								: c.Z_NO_FLUSH;
-
-						// Convert data if needed
-						if ( typeof data === 'string' ) {
-							// Only binary strings can be decompressed on practice
-							strm.input = strings.binstring2buf( data );
-						} else if (
-							toString.call( data ) === '[object ArrayBuffer]'
-						) {
-							strm.input = new Uint8Array( data );
-						} else {
-							strm.input = data;
-						}
-
-						strm.next_in = 0;
-						strm.avail_in = strm.input.length;
-
-						do {
-							if ( strm.avail_out === 0 ) {
-								strm.output = new utils.Buf8( chunkSize );
-								strm.next_out = 0;
-								strm.avail_out = chunkSize;
-							}
-
-							status = zlib_inflate.inflate(
-								strm,
-								c.Z_NO_FLUSH
-							); /* no bad return value */
-
-							if ( status === c.Z_NEED_DICT && dictionary ) {
-								status = zlib_inflate.inflateSetDictionary(
-									this.strm,
-									dictionary
-								);
-							}
-
-							if (
-								status === c.Z_BUF_ERROR &&
-								allowBufError === true
-							) {
-								status = c.Z_OK;
-								allowBufError = false;
-							}
-
-							if (
-								status !== c.Z_STREAM_END &&
-								status !== c.Z_OK
-							) {
-								this.onEnd( status );
-								this.ended = true;
-								return false;
-							}
-
-							if ( strm.next_out ) {
-								if (
-									strm.avail_out === 0 ||
-									status === c.Z_STREAM_END ||
-									( strm.avail_in === 0 &&
-										( _mode === c.Z_FINISH ||
-											_mode === c.Z_SYNC_FLUSH ) )
-								) {
-									if ( this.options.to === 'string' ) {
-										next_out_utf8 = strings.utf8border(
-											strm.output,
-											strm.next_out
-										);
-
-										tail = strm.next_out - next_out_utf8;
-										utf8str = strings.buf2string(
-											strm.output,
-											next_out_utf8
-										);
-
-										// move tail
-										strm.next_out = tail;
-										strm.avail_out = chunkSize - tail;
-										if ( tail ) {
-											utils.arraySet(
-												strm.output,
-												strm.output,
-												next_out_utf8,
-												tail,
-												0
-											);
-										}
-
-										this.onData( utf8str );
-									} else {
-										this.onData(
-											utils.shrinkBuf(
-												strm.output,
-												strm.next_out
-											)
-										);
-									}
-								}
-							}
-
-							// When no more input data, we should check that internal inflate buffers
-							// are flushed. The only way to do it when avail_out = 0 - run one more
-							// inflate pass. But if output data not exists, inflate return Z_BUF_ERROR.
-							// Here we set flag to process this error properly.
-							//
-							// NOTE. Deflate does not return error in this case and does not needs such
-							// logic.
-							if ( strm.avail_in === 0 && strm.avail_out === 0 ) {
-								allowBufError = true;
-							}
-						} while (
-							( strm.avail_in > 0 || strm.avail_out === 0 ) &&
-							status !== c.Z_STREAM_END
-						);
-
-						if ( status === c.Z_STREAM_END ) {
-							_mode = c.Z_FINISH;
-						}
-
-						// Finalize on the last chunk.
-						if ( _mode === c.Z_FINISH ) {
-							status = zlib_inflate.inflateEnd( this.strm );
-							this.onEnd( status );
-							this.ended = true;
-							return status === c.Z_OK;
-						}
-
-						// callback interim results if Z_SYNC_FLUSH.
-						if ( _mode === c.Z_SYNC_FLUSH ) {
-							this.onEnd( c.Z_OK );
-							strm.avail_out = 0;
-							return true;
-						}
-
-						return true;
-					};
-
-					/**
-					 * Inflate#onData(chunk) -> Void
-					 * - chunk (Uint8Array|Array|String): output data. Type of array depends
-					 *   on js engine support. When string output requested, each chunk
-					 *   will be string.
-					 *
-					 * By default, stores data blocks in `chunks[]` property and glue
-					 * those in `onEnd`. Override this handler, if you need another behaviour.
-					 **/
-					Inflate.prototype.onData = function ( chunk ) {
-						this.chunks.push( chunk );
-					};
-
-					/**
-					 * Inflate#onEnd(status) -> Void
-					 * - status (Number): inflate status. 0 (Z_OK) on success,
-					 *   other if not.
-					 *
-					 * Called either after you tell inflate that the input stream is
-					 * complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH)
-					 * or if an error happened. By default - join collected chunks,
-					 * free memory and fill `results` / `err` properties.
-					 **/
-					Inflate.prototype.onEnd = function ( status ) {
-						// On success - join
-						if ( status === c.Z_OK ) {
-							if ( this.options.to === 'string' ) {
-								// Glue & convert here, until we teach pako to send
-								// utf8 aligned strings to onData
-								this.result = this.chunks.join( '' );
-							} else {
-								this.result = utils.flattenChunks(
-									this.chunks
-								);
-							}
-						}
-						this.chunks = [];
-						this.err = status;
-						this.msg = this.strm.msg;
-					};
-
-					/**
-					 * inflate(data[, options]) -> Uint8Array|Array|String
-					 * - data (Uint8Array|Array|String): input data to decompress.
-					 * - options (Object): zlib inflate options.
-					 *
-					 * Decompress `data` with inflate/ungzip and `options`. Autodetect
-					 * format via wrapper header by default. That's why we don't provide
-					 * separate `ungzip` method.
-					 *
-					 * Supported options are:
-					 *
-					 * - windowBits
-					 *
-					 * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
-					 * for more information.
-					 *
-					 * Sugar (options):
-					 *
-					 * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
-					 *   negative windowBits implicitly.
-					 * - `to` (String) - if equal to 'string', then result will be converted
-					 *   from utf8 to utf16 (javascript) string. When string output requested,
-					 *   chunk length can differ from `chunkSize`, depending on content.
-					 *
-					 *
-					 * ##### Example:
-					 *
-					 * ```javascript
-					 * var pako = require('pako')
-					 *   , input = pako.deflate([1,2,3,4,5,6,7,8,9])
-					 *   , output;
-					 *
-					 * try {
-					 *   output = pako.inflate(input);
-					 * } catch (err)
-					 *   console.log(err);
-					 * }
-					 * ```
-					 **/
-					function inflate( input, options ) {
-						var inflator = new Inflate( options );
-
-						inflator.push( input, true );
-
-						// That will never happens, if you don't cheat with options :)
-						if ( inflator.err ) {
-							throw inflator.msg || msg[ inflator.err ];
-						}
-
-						return inflator.result;
-					}
-
-					/**
-					 * inflateRaw(data[, options]) -> Uint8Array|Array|String
-					 * - data (Uint8Array|Array|String): input data to decompress.
-					 * - options (Object): zlib inflate options.
-					 *
-					 * The same as [[inflate]], but creates raw data, without wrapper
-					 * (header and adler32 crc).
-					 **/
-					function inflateRaw( input, options ) {
-						options = options || {};
-						options.raw = true;
-						return inflate( input, options );
-					}
-
-					/**
-					 * ungzip(data[, options]) -> Uint8Array|Array|String
-					 * - data (Uint8Array|Array|String): input data to decompress.
-					 * - options (Object): zlib inflate options.
-					 *
-					 * Just shortcut to [[inflate]], because it autodetects format
-					 * by header.content. Done for convenience.
-					 **/
-
-					exports.Inflate = Inflate;
-					exports.inflate = inflate;
-					exports.inflateRaw = inflateRaw;
-					exports.ungzip = inflate;
-				},
-				{
-					'./utils/common': 1,
-					'./utils/strings': 2,
-					'./zlib/constants': 4,
-					'./zlib/gzheader': 6,
-					'./zlib/inflate': 8,
-					'./zlib/messages': 10,
-					'./zlib/zstream': 11,
-				},
-			],
-		},
-		{},
-		[]
-	)( '/lib/inflate.js' );
-} );
+    if (huff !== 0) {
+      //table.op[next + huff] = 64;            /* invalid code marker */
+      //table.bits[next + huff] = len - drop;
+      //table.val[next + huff] = 0;
+      table[next + huff] = ((len - drop) << 24) | (64 << 16) |0;
+    }
+
+    /* set return parameters */
+    //opts.table_index += used;
+    opts.bits = root;
+    return 0;
+  };
+
+  },{"../utils/common":1}],10:[function(require,module,exports){
+  'use strict';
+
+  // (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  // (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+  //
+  // This software is provided 'as-is', without any express or implied
+  // warranty. In no event will the authors be held liable for any damages
+  // arising from the use of this software.
+  //
+  // Permission is granted to anyone to use this software for any purpose,
+  // including commercial applications, and to alter it and redistribute it
+  // freely, subject to the following restrictions:
+  //
+  // 1. The origin of this software must not be misrepresented; you must not
+  //   claim that you wrote the original software. If you use this software
+  //   in a product, an acknowledgment in the product documentation would be
+  //   appreciated but is not required.
+  // 2. Altered source versions must be plainly marked as such, and must not be
+  //   misrepresented as being the original software.
+  // 3. This notice may not be removed or altered from any source distribution.
+
+  module.exports = {
+    2:      'need dictionary',     /* Z_NEED_DICT       2  */
+    1:      'stream end',          /* Z_STREAM_END      1  */
+    0:      '',                    /* Z_OK              0  */
+    '-1':   'file error',          /* Z_ERRNO         (-1) */
+    '-2':   'stream error',        /* Z_STREAM_ERROR  (-2) */
+    '-3':   'data error',          /* Z_DATA_ERROR    (-3) */
+    '-4':   'insufficient memory', /* Z_MEM_ERROR     (-4) */
+    '-5':   'buffer error',        /* Z_BUF_ERROR     (-5) */
+    '-6':   'incompatible version' /* Z_VERSION_ERROR (-6) */
+  };
+
+  },{}],11:[function(require,module,exports){
+  'use strict';
+
+  // (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  // (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+  //
+  // This software is provided 'as-is', without any express or implied
+  // warranty. In no event will the authors be held liable for any damages
+  // arising from the use of this software.
+  //
+  // Permission is granted to anyone to use this software for any purpose,
+  // including commercial applications, and to alter it and redistribute it
+  // freely, subject to the following restrictions:
+  //
+  // 1. The origin of this software must not be misrepresented; you must not
+  //   claim that you wrote the original software. If you use this software
+  //   in a product, an acknowledgment in the product documentation would be
+  //   appreciated but is not required.
+  // 2. Altered source versions must be plainly marked as such, and must not be
+  //   misrepresented as being the original software.
+  // 3. This notice may not be removed or altered from any source distribution.
+
+  function ZStream() {
+    /* next input byte */
+    this.input = null; // JS specific, because we have no pointers
+    this.next_in = 0;
+    /* number of bytes available at input */
+    this.avail_in = 0;
+    /* total number of input bytes read so far */
+    this.total_in = 0;
+    /* next output byte should be put there */
+    this.output = null; // JS specific, because we have no pointers
+    this.next_out = 0;
+    /* remaining free space at output */
+    this.avail_out = 0;
+    /* total number of bytes output so far */
+    this.total_out = 0;
+    /* last error message, NULL if no error */
+    this.msg = ''/*Z_NULL*/;
+    /* not visible by applications */
+    this.state = null;
+    /* best guess about the data type: binary or text */
+    this.data_type = 2/*Z_UNKNOWN*/;
+    /* adler32 value of the uncompressed data */
+    this.adler = 0;
+  }
+
+  module.exports = ZStream;
+
+  },{}],"/lib/inflate.js":[function(require,module,exports){
+  'use strict';
+
+
+  var zlib_inflate = require('./zlib/inflate');
+  var utils        = require('./utils/common');
+  var strings      = require('./utils/strings');
+  var c            = require('./zlib/constants');
+  var msg          = require('./zlib/messages');
+  var ZStream      = require('./zlib/zstream');
+  var GZheader     = require('./zlib/gzheader');
+
+  var toString = Object.prototype.toString;
+
+  /**
+   * class Inflate
+   *
+   * Generic JS-style wrapper for zlib calls. If you don't need
+   * streaming behaviour - use more simple functions: [[inflate]]
+   * and [[inflateRaw]].
+   **/
+
+  /* internal
+   * inflate.chunks -> Array
+   *
+   * Chunks of output data, if [[Inflate#onData]] not overridden.
+   **/
+
+  /**
+   * Inflate.result -> Uint8Array|Array|String
+   *
+   * Uncompressed result, generated by default [[Inflate#onData]]
+   * and [[Inflate#onEnd]] handlers. Filled after you push last chunk
+   * (call [[Inflate#push]] with `Z_FINISH` / `true` param) or if you
+   * push a chunk with explicit flush (call [[Inflate#push]] with
+   * `Z_SYNC_FLUSH` param).
+   **/
+
+  /**
+   * Inflate.err -> Number
+   *
+   * Error code after inflate finished. 0 (Z_OK) on success.
+   * Should be checked if broken data possible.
+   **/
+
+  /**
+   * Inflate.msg -> String
+   *
+   * Error message, if [[Inflate.err]] != 0
+   **/
+
+
+  /**
+   * new Inflate(options)
+   * - options (Object): zlib inflate options.
+   *
+   * Creates new inflator instance with specified params. Throws exception
+   * on bad params. Supported options:
+   *
+   * - `windowBits`
+   * - `dictionary`
+   *
+   * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
+   * for more information on these.
+   *
+   * Additional options, for internal needs:
+   *
+   * - `chunkSize` - size of generated data chunks (16K by default)
+   * - `raw` (Boolean) - do raw inflate
+   * - `to` (String) - if equal to 'string', then result will be converted
+   *   from utf8 to utf16 (javascript) string. When string output requested,
+   *   chunk length can differ from `chunkSize`, depending on content.
+   *
+   * By default, when no options set, autodetect deflate/gzip data format via
+   * wrapper header.
+   *
+   * ##### Example:
+   *
+   * ```javascript
+   * var pako = require('pako')
+   *   , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
+   *   , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
+   *
+   * var inflate = new pako.Inflate({ level: 3});
+   *
+   * inflate.push(chunk1, false);
+   * inflate.push(chunk2, true);  // true -> last chunk
+   *
+   * if (inflate.err) { throw new Error(inflate.err); }
+   *
+   * console.log(inflate.result);
+   * ```
+   **/
+  function Inflate(options) {
+    if (!(this instanceof Inflate)) return new Inflate(options);
+
+    this.options = utils.assign({
+      chunkSize: 16384,
+      windowBits: 0,
+      to: ''
+    }, options || {});
+
+    var opt = this.options;
+
+    // Force window size for `raw` data, if not set directly,
+    // because we have no header for autodetect.
+    if (opt.raw && (opt.windowBits >= 0) && (opt.windowBits < 16)) {
+      opt.windowBits = -opt.windowBits;
+      if (opt.windowBits === 0) { opt.windowBits = -15; }
+    }
+
+    // If `windowBits` not defined (and mode not raw) - set autodetect flag for gzip/deflate
+    if ((opt.windowBits >= 0) && (opt.windowBits < 16) &&
+        !(options && options.windowBits)) {
+      opt.windowBits += 32;
+    }
+
+    // Gzip header has no info about windows size, we can do autodetect only
+    // for deflate. So, if window size not set, force it to max when gzip possible
+    if ((opt.windowBits > 15) && (opt.windowBits < 48)) {
+      // bit 3 (16) -> gzipped data
+      // bit 4 (32) -> autodetect gzip/deflate
+      if ((opt.windowBits & 15) === 0) {
+        opt.windowBits |= 15;
+      }
+    }
+
+    this.err    = 0;      // error code, if happens (0 = Z_OK)
+    this.msg    = '';     // error message
+    this.ended  = false;  // used to avoid multiple onEnd() calls
+    this.chunks = [];     // chunks of compressed data
+
+    this.strm   = new ZStream();
+    this.strm.avail_out = 0;
+
+    var status  = zlib_inflate.inflateInit2(
+      this.strm,
+      opt.windowBits
+    );
+
+    if (status !== c.Z_OK) {
+      throw new Error(msg[status]);
+    }
+
+    this.header = new GZheader();
+
+    zlib_inflate.inflateGetHeader(this.strm, this.header);
+
+    // Setup dictionary
+    if (opt.dictionary) {
+      // Convert data if needed
+      if (typeof opt.dictionary === 'string') {
+        opt.dictionary = strings.string2buf(opt.dictionary);
+      } else if (toString.call(opt.dictionary) === '[object ArrayBuffer]') {
+        opt.dictionary = new Uint8Array(opt.dictionary);
+      }
+      if (opt.raw) { //In raw mode we need to set the dictionary early
+        status = zlib_inflate.inflateSetDictionary(this.strm, opt.dictionary);
+        if (status !== c.Z_OK) {
+          throw new Error(msg[status]);
+        }
+      }
+    }
+  }
+
+  /**
+   * Inflate#push(data[, mode]) -> Boolean
+   * - data (Uint8Array|Array|ArrayBuffer|String): input data
+   * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
+   *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` means Z_FINISH.
+   *
+   * Sends input data to inflate pipe, generating [[Inflate#onData]] calls with
+   * new output chunks. Returns `true` on success. The last data block must have
+   * mode Z_FINISH (or `true`). That will flush internal pending buffers and call
+   * [[Inflate#onEnd]]. For interim explicit flushes (without ending the stream) you
+   * can use mode Z_SYNC_FLUSH, keeping the decompression context.
+   *
+   * On fail call [[Inflate#onEnd]] with error code and return false.
+   *
+   * We strongly recommend to use `Uint8Array` on input for best speed (output
+   * format is detected automatically). Also, don't skip last param and always
+   * use the same type in your code (boolean or number). That will improve JS speed.
+   *
+   * For regular `Array`-s make sure all elements are [0..255].
+   *
+   * ##### Example
+   *
+   * ```javascript
+   * push(chunk, false); // push one of data chunks
+   * ...
+   * push(chunk, true);  // push last chunk
+   * ```
+   **/
+  Inflate.prototype.push = function (data, mode) {
+    var strm = this.strm;
+    var chunkSize = this.options.chunkSize;
+    var dictionary = this.options.dictionary;
+    var status, _mode;
+    var next_out_utf8, tail, utf8str;
+
+    // Flag to properly process Z_BUF_ERROR on testing inflate call
+    // when we check that all output data was flushed.
+    var allowBufError = false;
+
+    if (this.ended) { return false; }
+    _mode = (mode === ~~mode) ? mode : ((mode === true) ? c.Z_FINISH : c.Z_NO_FLUSH);
+
+    // Convert data if needed
+    if (typeof data === 'string') {
+      // Only binary strings can be decompressed on practice
+      strm.input = strings.binstring2buf(data);
+    } else if (toString.call(data) === '[object ArrayBuffer]') {
+      strm.input = new Uint8Array(data);
+    } else {
+      strm.input = data;
+    }
+
+    strm.next_in = 0;
+    strm.avail_in = strm.input.length;
+
+    do {
+      if (strm.avail_out === 0) {
+        strm.output = new utils.Buf8(chunkSize);
+        strm.next_out = 0;
+        strm.avail_out = chunkSize;
+      }
+
+      status = zlib_inflate.inflate(strm, c.Z_NO_FLUSH);    /* no bad return value */
+
+      if (status === c.Z_NEED_DICT && dictionary) {
+        status = zlib_inflate.inflateSetDictionary(this.strm, dictionary);
+      }
+
+      if (status === c.Z_BUF_ERROR && allowBufError === true) {
+        status = c.Z_OK;
+        allowBufError = false;
+      }
+
+      if (status !== c.Z_STREAM_END && status !== c.Z_OK) {
+        this.onEnd(status);
+        this.ended = true;
+        return false;
+      }
+
+      if (strm.next_out) {
+        if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && (_mode === c.Z_FINISH || _mode === c.Z_SYNC_FLUSH))) {
+
+          if (this.options.to === 'string') {
+
+            next_out_utf8 = strings.utf8border(strm.output, strm.next_out);
+
+            tail = strm.next_out - next_out_utf8;
+            utf8str = strings.buf2string(strm.output, next_out_utf8);
+
+            // move tail
+            strm.next_out = tail;
+            strm.avail_out = chunkSize - tail;
+            if (tail) { utils.arraySet(strm.output, strm.output, next_out_utf8, tail, 0); }
+
+            this.onData(utf8str);
+
+          } else {
+            this.onData(utils.shrinkBuf(strm.output, strm.next_out));
+          }
+        }
+      }
+
+      // When no more input data, we should check that internal inflate buffers
+      // are flushed. The only way to do it when avail_out = 0 - run one more
+      // inflate pass. But if output data not exists, inflate return Z_BUF_ERROR.
+      // Here we set flag to process this error properly.
+      //
+      // NOTE. Deflate does not return error in this case and does not needs such
+      // logic.
+      if (strm.avail_in === 0 && strm.avail_out === 0) {
+        allowBufError = true;
+      }
+
+    } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== c.Z_STREAM_END);
+
+    if (status === c.Z_STREAM_END) {
+      _mode = c.Z_FINISH;
+    }
+
+    // Finalize on the last chunk.
+    if (_mode === c.Z_FINISH) {
+      status = zlib_inflate.inflateEnd(this.strm);
+      this.onEnd(status);
+      this.ended = true;
+      return status === c.Z_OK;
+    }
+
+    // callback interim results if Z_SYNC_FLUSH.
+    if (_mode === c.Z_SYNC_FLUSH) {
+      this.onEnd(c.Z_OK);
+      strm.avail_out = 0;
+      return true;
+    }
+
+    return true;
+  };
+
+
+  /**
+   * Inflate#onData(chunk) -> Void
+   * - chunk (Uint8Array|Array|String): output data. Type of array depends
+   *   on js engine support. When string output requested, each chunk
+   *   will be string.
+   *
+   * By default, stores data blocks in `chunks[]` property and glue
+   * those in `onEnd`. Override this handler, if you need another behaviour.
+   **/
+  Inflate.prototype.onData = function (chunk) {
+    this.chunks.push(chunk);
+  };
+
+
+  /**
+   * Inflate#onEnd(status) -> Void
+   * - status (Number): inflate status. 0 (Z_OK) on success,
+   *   other if not.
+   *
+   * Called either after you tell inflate that the input stream is
+   * complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH)
+   * or if an error happened. By default - join collected chunks,
+   * free memory and fill `results` / `err` properties.
+   **/
+  Inflate.prototype.onEnd = function (status) {
+    // On success - join
+    if (status === c.Z_OK) {
+      if (this.options.to === 'string') {
+        // Glue & convert here, until we teach pako to send
+        // utf8 aligned strings to onData
+        this.result = this.chunks.join('');
+      } else {
+        this.result = utils.flattenChunks(this.chunks);
+      }
+    }
+    this.chunks = [];
+    this.err = status;
+    this.msg = this.strm.msg;
+  };
+
+
+  /**
+   * inflate(data[, options]) -> Uint8Array|Array|String
+   * - data (Uint8Array|Array|String): input data to decompress.
+   * - options (Object): zlib inflate options.
+   *
+   * Decompress `data` with inflate/ungzip and `options`. Autodetect
+   * format via wrapper header by default. That's why we don't provide
+   * separate `ungzip` method.
+   *
+   * Supported options are:
+   *
+   * - windowBits
+   *
+   * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
+   * for more information.
+   *
+   * Sugar (options):
+   *
+   * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
+   *   negative windowBits implicitly.
+   * - `to` (String) - if equal to 'string', then result will be converted
+   *   from utf8 to utf16 (javascript) string. When string output requested,
+   *   chunk length can differ from `chunkSize`, depending on content.
+   *
+   *
+   * ##### Example:
+   *
+   * ```javascript
+   * var pako = require('pako')
+   *   , input = pako.deflate([1,2,3,4,5,6,7,8,9])
+   *   , output;
+   *
+   * try {
+   *   output = pako.inflate(input);
+   * } catch (err)
+   *   console.log(err);
+   * }
+   * ```
+   **/
+  function inflate(input, options) {
+    var inflator = new Inflate(options);
+
+    inflator.push(input, true);
+
+    // That will never happens, if you don't cheat with options :)
+    if (inflator.err) { throw inflator.msg || msg[inflator.err]; }
+
+    return inflator.result;
+  }
+
+
+  /**
+   * inflateRaw(data[, options]) -> Uint8Array|Array|String
+   * - data (Uint8Array|Array|String): input data to decompress.
+   * - options (Object): zlib inflate options.
+   *
+   * The same as [[inflate]], but creates raw data, without wrapper
+   * (header and adler32 crc).
+   **/
+  function inflateRaw(input, options) {
+    options = options || {};
+    options.raw = true;
+    return inflate(input, options);
+  }
+
+
+  /**
+   * ungzip(data[, options]) -> Uint8Array|Array|String
+   * - data (Uint8Array|Array|String): input data to decompress.
+   * - options (Object): zlib inflate options.
+   *
+   * Just shortcut to [[inflate]], because it autodetects format
+   * by header.content. Done for convenience.
+   **/
+
+
+  exports.Inflate = Inflate;
+  exports.inflate = inflate;
+  exports.inflateRaw = inflateRaw;
+  exports.ungzip  = inflate;
+
+  },{"./utils/common":1,"./utils/strings":2,"./zlib/constants":4,"./zlib/gzheader":6,"./zlib/inflate":8,"./zlib/messages":10,"./zlib/zstream":11}]},{},[])("/lib/inflate.js")
+  });
 /* eslint-enable */
diff --git a/packages/edit-site/lib/lib-font.browser.js b/packages/edit-site/lib/lib-font.browser.js
index 6d16f0e195e882..a39901c377e42b 100644
--- a/packages/edit-site/lib/lib-font.browser.js
+++ b/packages/edit-site/lib/lib-font.browser.js
@@ -1,8 +1,38 @@
+/**
+ * Credits:
+ *
+ * lib-font
+ * https://github.com/Pomax/lib-font
+ * https://github.com/Pomax/lib-font/blob/master/lib-font.browser.js
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 pomax@nihongoresources.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 /* eslint eslint-comments/no-unlimited-disable: 0 */
 /* eslint-disable */
 // import pako from 'pako';
-import unbrotli from './unbrotli';
-import GzipDecode from './inflate';
+import unbrotli from "./unbrotli";
+import GzipDecode from "./inflate";
 
 let fetchFunction = globalThis.fetch;
 // if ( ! fetchFunction ) {
diff --git a/packages/edit-site/lib/unbrotli.js b/packages/edit-site/lib/unbrotli.js
index 74d14ded17dfee..63293e6cc473cf 100644
--- a/packages/edit-site/lib/unbrotli.js
+++ b/packages/edit-site/lib/unbrotli.js
@@ -1,67 +1,37 @@
+/**
+ * Credits:
+ *
+ * lib-font
+ * https://github.com/Pomax/lib-font
+ * https://github.com/Pomax/lib-font/blob/master/lib/unbrotli.js
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 pomax@nihongoresources.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 /* eslint eslint-comments/no-unlimited-disable: 0 */
 /* eslint-disable */
-( function ( f ) {
-	if ( typeof exports === 'object' && typeof module !== 'undefined' ) {
-		module.exports = f();
-	} else if ( typeof define === 'function' && define.amd ) {
-		define( [], f );
-	} else {
-		var g;
-		if ( typeof window !== 'undefined' ) {
-			g = window;
-		} else if ( typeof global !== 'undefined' ) {
-			g = global;
-		} else if ( typeof self !== 'undefined' ) {
-			g = self;
-		} else {
-			g = this;
-		}
-		g.unbrotli = f();
-	}
-} )( function () {
-	var define, module, exports;
-	return ( function () {
-		function r( e, n, t ) {
-			function o( i, f ) {
-				if ( ! n[ i ] ) {
-					if ( ! e[ i ] ) {
-						var c = 'function' == typeof require && require;
-						if ( ! f && c ) return c( i, ! 0 );
-						if ( u ) return u( i, ! 0 );
-						var a = new Error( "Cannot find module '" + i + "'" );
-						throw ( ( a.code = 'MODULE_NOT_FOUND' ), a );
-					}
-					var p = ( n[ i ] = { exports: {} } );
-					e[ i ][ 0 ].call(
-						p.exports,
-						function ( r ) {
-							var n = e[ i ][ 1 ][ r ];
-							return o( n || r );
-						},
-						p,
-						p.exports,
-						r,
-						e,
-						n,
-						t
-					);
-				}
-				return n[ i ].exports;
-			}
-			for (
-				var u = 'function' == typeof require && require, i = 0;
-				i < t.length;
-				i++
-			)
-				o( t[ i ] );
-			return o;
-		}
-		return r;
-	} )()(
-		{
-			1: [
-				function ( require, module, exports ) {
-					/* Copyright 2013 Google Inc. All Rights Reserved.
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.unbrotli = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+/* Copyright 2013 Google Inc. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -78,46 +48,45 @@
    Bit reading helpers
 */
 
-					var BROTLI_READ_SIZE = 4096;
-					var BROTLI_IBUF_SIZE = 2 * BROTLI_READ_SIZE + 32;
-					var BROTLI_IBUF_MASK = 2 * BROTLI_READ_SIZE - 1;
+var BROTLI_READ_SIZE = 4096;
+var BROTLI_IBUF_SIZE =  (2 * BROTLI_READ_SIZE + 32);
+var BROTLI_IBUF_MASK =  (2 * BROTLI_READ_SIZE - 1);
 
-					var kBitMask = new Uint32Array( [
-						0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095,
-						8191, 16383, 32767, 65535, 131071, 262143, 524287,
-						1048575, 2097151, 4194303, 8388607, 16777215,
-					] );
+var kBitMask = new Uint32Array([
+  0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767,
+  65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215
+]);
 
-					/* Input byte buffer, consist of a ringbuffer and a "slack" region where */
-					/* bytes from the start of the ringbuffer are copied. */
-					function BrotliBitReader( input ) {
-						this.buf_ = new Uint8Array( BROTLI_IBUF_SIZE );
-						this.input_ = input; /* input callback */
+/* Input byte buffer, consist of a ringbuffer and a "slack" region where */
+/* bytes from the start of the ringbuffer are copied. */
+function BrotliBitReader(input) {
+  this.buf_ = new Uint8Array(BROTLI_IBUF_SIZE);
+  this.input_ = input;    /* input callback */
 
-						this.reset();
-					}
+  this.reset();
+}
 
-					BrotliBitReader.READ_SIZE = BROTLI_READ_SIZE;
-					BrotliBitReader.IBUF_MASK = BROTLI_IBUF_MASK;
+BrotliBitReader.READ_SIZE = BROTLI_READ_SIZE;
+BrotliBitReader.IBUF_MASK = BROTLI_IBUF_MASK;
 
-					BrotliBitReader.prototype.reset = function () {
-						this.buf_ptr_ = 0; /* next input will write here */
-						this.val_ = 0; /* pre-fetched bits */
-						this.pos_ = 0; /* byte position in stream */
-						this.bit_pos_ = 0; /* current bit-reading position in val_ */
-						this.bit_end_pos_ = 0; /* bit-reading end position from LSB of val_ */
-						this.eos_ = 0; /* input stream is finished */
+BrotliBitReader.prototype.reset = function() {
+  this.buf_ptr_ = 0;      /* next input will write here */
+  this.val_ = 0;          /* pre-fetched bits */
+  this.pos_ = 0;          /* byte position in stream */
+  this.bit_pos_ = 0;      /* current bit-reading position in val_ */
+  this.bit_end_pos_ = 0;  /* bit-reading end position from LSB of val_ */
+  this.eos_ = 0;          /* input stream is finished */
 
-						this.readMoreInput();
-						for ( var i = 0; i < 4; i++ ) {
-							this.val_ |= this.buf_[ this.pos_ ] << ( 8 * i );
-							++this.pos_;
-						}
+  this.readMoreInput();
+  for (var i = 0; i < 4; i++) {
+    this.val_ |= this.buf_[this.pos_] << (8 * i);
+    ++this.pos_;
+  }
 
-						return this.bit_end_pos_ > 0;
-					};
+  return this.bit_end_pos_ > 0;
+};
 
-					/* Fills up the input ringbuffer by calling the input callback.
+/* Fills up the input ringbuffer by calling the input callback.
 
    Does nothing if there are at least 32 bytes present after current position.
 
@@ -129,82 +98,66 @@
    copied to the ringbuffer, therefore it is safe to call this function after
    every 32 bytes of input is read.
 */
-					BrotliBitReader.prototype.readMoreInput = function () {
-						if ( this.bit_end_pos_ > 256 ) {
-							return;
-						} else if ( this.eos_ ) {
-							if ( this.bit_pos_ > this.bit_end_pos_ )
-								throw new Error(
-									'Unexpected end of input ' +
-										this.bit_pos_ +
-										' ' +
-										this.bit_end_pos_
-								);
-						} else {
-							var dst = this.buf_ptr_;
-							var bytes_read = this.input_.read(
-								this.buf_,
-								dst,
-								BROTLI_READ_SIZE
-							);
-							if ( bytes_read < 0 ) {
-								throw new Error( 'Unexpected end of input' );
-							}
-
-							if ( bytes_read < BROTLI_READ_SIZE ) {
-								this.eos_ = 1;
-								/* Store 32 bytes of zero after the stream end. */
-								for ( var p = 0; p < 32; p++ )
-									this.buf_[ dst + bytes_read + p ] = 0;
-							}
-
-							if ( dst === 0 ) {
-								/* Copy the head of the ringbuffer to the slack region. */
-								for ( var p = 0; p < 32; p++ )
-									this.buf_[ ( BROTLI_READ_SIZE << 1 ) + p ] =
-										this.buf_[ p ];
-
-								this.buf_ptr_ = BROTLI_READ_SIZE;
-							} else {
-								this.buf_ptr_ = 0;
-							}
-
-							this.bit_end_pos_ += bytes_read << 3;
-						}
-					};
-
-					/* Guarantees that there are at least 24 bits in the buffer. */
-					BrotliBitReader.prototype.fillBitWindow = function () {
-						while ( this.bit_pos_ >= 8 ) {
-							this.val_ >>>= 8;
-							this.val_ |=
-								this.buf_[ this.pos_ & BROTLI_IBUF_MASK ] << 24;
-							++this.pos_;
-							this.bit_pos_ = ( this.bit_pos_ - 8 ) >>> 0;
-							this.bit_end_pos_ = ( this.bit_end_pos_ - 8 ) >>> 0;
-						}
-					};
-
-					/* Reads the specified number of bits from Read Buffer. */
-					BrotliBitReader.prototype.readBits = function ( n_bits ) {
-						if ( 32 - this.bit_pos_ < n_bits ) {
-							this.fillBitWindow();
-						}
-
-						var val =
-							( this.val_ >>> this.bit_pos_ ) &
-							kBitMask[ n_bits ];
-						this.bit_pos_ += n_bits;
-						return val;
-					};
-
-					module.exports = BrotliBitReader;
-				},
-				{},
-			],
-			2: [
-				function ( require, module, exports ) {
-					/* Copyright 2013 Google Inc. All Rights Reserved.
+BrotliBitReader.prototype.readMoreInput = function() {
+  if (this.bit_end_pos_ > 256) {
+    return;
+  } else if (this.eos_) {
+    if (this.bit_pos_ > this.bit_end_pos_)
+      throw new Error('Unexpected end of input ' + this.bit_pos_ + ' ' + this.bit_end_pos_);
+  } else {
+    var dst = this.buf_ptr_;
+    var bytes_read = this.input_.read(this.buf_, dst, BROTLI_READ_SIZE);
+    if (bytes_read < 0) {
+      throw new Error('Unexpected end of input');
+    }
+
+    if (bytes_read < BROTLI_READ_SIZE) {
+      this.eos_ = 1;
+      /* Store 32 bytes of zero after the stream end. */
+      for (var p = 0; p < 32; p++)
+        this.buf_[dst + bytes_read + p] = 0;
+    }
+
+    if (dst === 0) {
+      /* Copy the head of the ringbuffer to the slack region. */
+      for (var p = 0; p < 32; p++)
+        this.buf_[(BROTLI_READ_SIZE << 1) + p] = this.buf_[p];
+
+      this.buf_ptr_ = BROTLI_READ_SIZE;
+    } else {
+      this.buf_ptr_ = 0;
+    }
+
+    this.bit_end_pos_ += bytes_read << 3;
+  }
+};
+
+/* Guarantees that there are at least 24 bits in the buffer. */
+BrotliBitReader.prototype.fillBitWindow = function() {
+  while (this.bit_pos_ >= 8) {
+    this.val_ >>>= 8;
+    this.val_ |= this.buf_[this.pos_ & BROTLI_IBUF_MASK] << 24;
+    ++this.pos_;
+    this.bit_pos_ = this.bit_pos_ - 8 >>> 0;
+    this.bit_end_pos_ = this.bit_end_pos_ - 8 >>> 0;
+  }
+};
+
+/* Reads the specified number of bits from Read Buffer. */
+BrotliBitReader.prototype.readBits = function(n_bits) {
+  if (32 - this.bit_pos_ < n_bits) {
+    this.fillBitWindow();
+  }
+
+  var val = ((this.val_ >>> this.bit_pos_) & kBitMask[n_bits]);
+  this.bit_pos_ += n_bits;
+  return val;
+};
+
+module.exports = BrotliBitReader;
+
+},{}],2:[function(require,module,exports){
+/* Copyright 2013 Google Inc. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -310,154 +263,153 @@
    where offset1 and offset2 are dependent on the context mode.
 */
 
-					var CONTEXT_LSB6 = 0;
-					var CONTEXT_MSB6 = 1;
-					var CONTEXT_UTF8 = 2;
-					var CONTEXT_SIGNED = 3;
-
-					/* Common context lookup table for all context modes. */
-					exports.lookup = new Uint8Array( [
-						/* CONTEXT_UTF8, last byte. */
-						/* ASCII range. */
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 0, 0, 4, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 12, 16, 12,
-						12, 20, 12, 16, 24, 28, 12, 12, 32, 12, 36, 12, 44, 44,
-						44, 44, 44, 44, 44, 44, 44, 44, 32, 32, 24, 40, 28, 12,
-						12, 48, 52, 52, 52, 48, 52, 52, 52, 48, 52, 52, 52, 52,
-						52, 48, 52, 52, 52, 52, 52, 48, 52, 52, 52, 52, 52, 24,
-						12, 28, 12, 12, 12, 56, 60, 60, 60, 56, 60, 60, 60, 56,
-						60, 60, 60, 60, 60, 56, 60, 60, 60, 60, 60, 56, 60, 60,
-						60, 60, 60, 24, 12, 28, 12, 0,
-						/* UTF8 continuation byte range. */
-						0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
-						1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
-						0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
-						1, 0, 1, 0, 1, 0, 1, /* UTF8 lead byte range. */
-						2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2,
-						3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
-						2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2,
-						3, 2, 3, 2, 3, 2, 3,
-						/* CONTEXT_UTF8 second last byte. */
-						/* ASCII range. */
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
-						1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1,
-						1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-						3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 0,
-						/* UTF8 continuation byte range. */
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, /* UTF8 lead byte range. */
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2,
-						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						/* CONTEXT_SIGNED, second last byte. */
-						0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
-						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-						2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-						3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-						3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-						3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4,
-						4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-						4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-						4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-						4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-						5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-						5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6,
-						6, 6, 6, 6, 6, 6, 6, 6, 7,
-						/* CONTEXT_SIGNED, last byte, same as the above values shifted by 3 bits. */
-						0,
-						8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 16, 16, 16,
-						16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-						16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-						16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-						16, 16, 16, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-						24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-						24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-						24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-						24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 32, 32, 32,
-						32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-						32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-						32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-						32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-						32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-						40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-						40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-						40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 48, 48, 48,
-						48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 56,
-						/* CONTEXT_LSB6, last byte. */
-						0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-						16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-						30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
-						44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
-						58, 59, 60, 61, 62, 63, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-						10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-						24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-						38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
-						52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 0, 1, 2,
-						3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-						19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
-						33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
-						47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
-						61, 62, 63, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
-						13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-						27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-						41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-						55, 56, 57, 58, 59, 60, 61, 62, 63,
-						/* CONTEXT_MSB6, last byte. */
-						0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4,
-						4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9,
-						9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12,
-						13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16,
-						16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19,
-						20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 23, 23,
-						23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, 26, 26, 26,
-						27, 27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30,
-						30, 30, 31, 31, 31, 31, 32, 32, 32, 32, 33, 33, 33, 33,
-						34, 34, 34, 34, 35, 35, 35, 35, 36, 36, 36, 36, 37, 37,
-						37, 37, 38, 38, 38, 38, 39, 39, 39, 39, 40, 40, 40, 40,
-						41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43, 44, 44,
-						44, 44, 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47,
-						48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 51, 51,
-						51, 51, 52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54,
-						55, 55, 55, 55, 56, 56, 56, 56, 57, 57, 57, 57, 58, 58,
-						58, 58, 59, 59, 59, 59, 60, 60, 60, 60, 61, 61, 61, 61,
-						62, 62, 62, 62, 63, 63, 63, 63,
-						/* CONTEXT_{M,L}SB6, second last byte, */
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-						0, 0, 0, 0, 0, 0, 0, 0, 0,
-					] );
-
-					exports.lookupOffsets = new Uint16Array( [
-						/* CONTEXT_LSB6 */
-						1024, 1536, /* CONTEXT_MSB6 */
-						1280, 1536, /* CONTEXT_UTF8 */
-						0, 256, /* CONTEXT_SIGNED */
-						768, 512,
-					] );
-				},
-				{},
-			],
-			3: [
-				function ( require, module, exports ) {
-					/* Copyright 2013 Google Inc. All Rights Reserved.
+var CONTEXT_LSB6         = 0;
+var CONTEXT_MSB6         = 1;
+var CONTEXT_UTF8         = 2;
+var CONTEXT_SIGNED       = 3;
+
+/* Common context lookup table for all context modes. */
+exports.lookup = new Uint8Array([
+  /* CONTEXT_UTF8, last byte. */
+  /* ASCII range. */
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  4,  0,  0,  4,  0,  0,
+   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   8, 12, 16, 12, 12, 20, 12, 16, 24, 28, 12, 12, 32, 12, 36, 12,
+  44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 32, 32, 24, 40, 28, 12,
+  12, 48, 52, 52, 52, 48, 52, 52, 52, 48, 52, 52, 52, 52, 52, 48,
+  52, 52, 52, 52, 52, 48, 52, 52, 52, 52, 52, 24, 12, 28, 12, 12,
+  12, 56, 60, 60, 60, 56, 60, 60, 60, 56, 60, 60, 60, 60, 60, 56,
+  60, 60, 60, 60, 60, 56, 60, 60, 60, 60, 60, 24, 12, 28, 12,  0,
+  /* UTF8 continuation byte range. */
+  0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+  0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+  0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+  0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+  /* UTF8 lead byte range. */
+  2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
+  2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
+  2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
+  2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
+  /* CONTEXT_UTF8 second last byte. */
+  /* ASCII range. */
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1,
+  1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 0,
+  /* UTF8 continuation byte range. */
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  /* UTF8 lead byte range. */
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  /* CONTEXT_SIGNED, second last byte. */
+  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7,
+  /* CONTEXT_SIGNED, last byte, same as the above values shifted by 3 bits. */
+   0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+  24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+  24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+  24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+  24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 56,
+  /* CONTEXT_LSB6, last byte. */
+   0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+  /* CONTEXT_MSB6, last byte. */
+   0,  0,  0,  0,  1,  1,  1,  1,  2,  2,  2,  2,  3,  3,  3,  3,
+   4,  4,  4,  4,  5,  5,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,
+   8,  8,  8,  8,  9,  9,  9,  9, 10, 10, 10, 10, 11, 11, 11, 11,
+  12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15,
+  16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19,
+  20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23,
+  24, 24, 24, 24, 25, 25, 25, 25, 26, 26, 26, 26, 27, 27, 27, 27,
+  28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31,
+  32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35,
+  36, 36, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 39, 39,
+  40, 40, 40, 40, 41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43,
+  44, 44, 44, 44, 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47,
+  48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 51, 51, 51, 51,
+  52, 52, 52, 52, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 55, 55,
+  56, 56, 56, 56, 57, 57, 57, 57, 58, 58, 58, 58, 59, 59, 59, 59,
+  60, 60, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 63, 63, 63, 63,
+  /* CONTEXT_{M,L}SB6, second last byte, */
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+]);
+
+exports.lookupOffsets = new Uint16Array([
+  /* CONTEXT_LSB6 */
+  1024, 1536,
+  /* CONTEXT_MSB6 */
+  1280, 1536,
+  /* CONTEXT_UTF8 */
+  0, 256,
+  /* CONTEXT_SIGNED */
+  768, 512,
+]);
+
+},{}],3:[function(require,module,exports){
+/* Copyright 2013 Google Inc. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -472,1378 +424,952 @@
    limitations under the License.
 */
 
-					var BrotliInput = require( './streams' ).BrotliInput;
-					var BrotliOutput = require( './streams' ).BrotliOutput;
-					var BrotliBitReader = require( './bit_reader' );
-					var BrotliDictionary = require( './dictionary' );
-					var HuffmanCode = require( './huffman' ).HuffmanCode;
-					var BrotliBuildHuffmanTable =
-						require( './huffman' ).BrotliBuildHuffmanTable;
-					var Context = require( './context' );
-					var Prefix = require( './prefix' );
-					var Transform = require( './transform' );
-
-					var kDefaultCodeLength = 8;
-					var kCodeLengthRepeatCode = 16;
-					var kNumLiteralCodes = 256;
-					var kNumInsertAndCopyCodes = 704;
-					var kNumBlockLengthCodes = 26;
-					var kLiteralContextBits = 6;
-					var kDistanceContextBits = 2;
-
-					var HUFFMAN_TABLE_BITS = 8;
-					var HUFFMAN_TABLE_MASK = 0xff;
-					/* Maximum possible Huffman table size for an alphabet size of 704, max code
-					 * length 15 and root table bits 8. */
-					var HUFFMAN_MAX_TABLE_SIZE = 1080;
-
-					var CODE_LENGTH_CODES = 18;
-					var kCodeLengthCodeOrder = new Uint8Array( [
-						1, 2, 3, 4, 0, 5, 17, 6, 16, 7, 8, 9, 10, 11, 12, 13,
-						14, 15,
-					] );
-
-					var NUM_DISTANCE_SHORT_CODES = 16;
-					var kDistanceShortCodeIndexOffset = new Uint8Array( [
-						3, 2, 1, 0, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2,
-					] );
-
-					var kDistanceShortCodeValueOffset = new Int8Array( [
-						0, 0, 0, 0, -1, 1, -2, 2, -3, 3, -1, 1, -2, 2, -3, 3,
-					] );
-
-					var kMaxHuffmanTableSize = new Uint16Array( [
-						256, 402, 436, 468, 500, 534, 566, 598, 630, 662, 694,
-						726, 758, 790, 822, 854, 886, 920, 952, 984, 1016, 1048,
-						1080,
-					] );
-
-					function DecodeWindowBits( br ) {
-						var n;
-						if ( br.readBits( 1 ) === 0 ) {
-							return 16;
-						}
-
-						n = br.readBits( 3 );
-						if ( n > 0 ) {
-							return 17 + n;
-						}
-
-						n = br.readBits( 3 );
-						if ( n > 0 ) {
-							return 8 + n;
-						}
-
-						return 17;
-					}
-
-					/* Decodes a number in the range [0..255], by reading 1 - 11 bits. */
-					function DecodeVarLenUint8( br ) {
-						if ( br.readBits( 1 ) ) {
-							var nbits = br.readBits( 3 );
-							if ( nbits === 0 ) {
-								return 1;
-							} else {
-								return br.readBits( nbits ) + ( 1 << nbits );
-							}
-						}
-						return 0;
-					}
-
-					function MetaBlockLength() {
-						this.meta_block_length = 0;
-						this.input_end = 0;
-						this.is_uncompressed = 0;
-						this.is_metadata = false;
-					}
-
-					function DecodeMetaBlockLength( br ) {
-						var out = new MetaBlockLength();
-						var size_nibbles;
-						var size_bytes;
-						var i;
-
-						out.input_end = br.readBits( 1 );
-						if ( out.input_end && br.readBits( 1 ) ) {
-							return out;
-						}
-
-						size_nibbles = br.readBits( 2 ) + 4;
-						if ( size_nibbles === 7 ) {
-							out.is_metadata = true;
-
-							if ( br.readBits( 1 ) !== 0 )
-								throw new Error( 'Invalid reserved bit' );
-
-							size_bytes = br.readBits( 2 );
-							if ( size_bytes === 0 ) return out;
-
-							for ( i = 0; i < size_bytes; i++ ) {
-								var next_byte = br.readBits( 8 );
-								if (
-									i + 1 === size_bytes &&
-									size_bytes > 1 &&
-									next_byte === 0
-								)
-									throw new Error( 'Invalid size byte' );
-
-								out.meta_block_length |= next_byte << ( i * 8 );
-							}
-						} else {
-							for ( i = 0; i < size_nibbles; ++i ) {
-								var next_nibble = br.readBits( 4 );
-								if (
-									i + 1 === size_nibbles &&
-									size_nibbles > 4 &&
-									next_nibble === 0
-								)
-									throw new Error( 'Invalid size nibble' );
-
-								out.meta_block_length |=
-									next_nibble << ( i * 4 );
-							}
-						}
-
-						++out.meta_block_length;
-
-						if ( ! out.input_end && ! out.is_metadata ) {
-							out.is_uncompressed = br.readBits( 1 );
-						}
-
-						return out;
-					}
-
-					/* Decodes the next Huffman code from bit-stream. */
-					function ReadSymbol( table, index, br ) {
-						var start_index = index;
-
-						var nbits;
-						br.fillBitWindow();
-						index +=
-							( br.val_ >>> br.bit_pos_ ) & HUFFMAN_TABLE_MASK;
-						nbits = table[ index ].bits - HUFFMAN_TABLE_BITS;
-						if ( nbits > 0 ) {
-							br.bit_pos_ += HUFFMAN_TABLE_BITS;
-							index += table[ index ].value;
-							index +=
-								( br.val_ >>> br.bit_pos_ ) &
-								( ( 1 << nbits ) - 1 );
-						}
-						br.bit_pos_ += table[ index ].bits;
-						return table[ index ].value;
-					}
-
-					function ReadHuffmanCodeLengths(
-						code_length_code_lengths,
-						num_symbols,
-						code_lengths,
-						br
-					) {
-						var symbol = 0;
-						var prev_code_len = kDefaultCodeLength;
-						var repeat = 0;
-						var repeat_code_len = 0;
-						var space = 32768;
-
-						var table = [];
-						for ( var i = 0; i < 32; i++ )
-							table.push( new HuffmanCode( 0, 0 ) );
-
-						BrotliBuildHuffmanTable(
-							table,
-							0,
-							5,
-							code_length_code_lengths,
-							CODE_LENGTH_CODES
-						);
-
-						while ( symbol < num_symbols && space > 0 ) {
-							var p = 0;
-							var code_len;
-
-							br.readMoreInput();
-							br.fillBitWindow();
-							p += ( br.val_ >>> br.bit_pos_ ) & 31;
-							br.bit_pos_ += table[ p ].bits;
-							code_len = table[ p ].value & 0xff;
-							if ( code_len < kCodeLengthRepeatCode ) {
-								repeat = 0;
-								code_lengths[ symbol++ ] = code_len;
-								if ( code_len !== 0 ) {
-									prev_code_len = code_len;
-									space -= 32768 >> code_len;
-								}
-							} else {
-								var extra_bits = code_len - 14;
-								var old_repeat;
-								var repeat_delta;
-								var new_len = 0;
-								if ( code_len === kCodeLengthRepeatCode ) {
-									new_len = prev_code_len;
-								}
-								if ( repeat_code_len !== new_len ) {
-									repeat = 0;
-									repeat_code_len = new_len;
-								}
-								old_repeat = repeat;
-								if ( repeat > 0 ) {
-									repeat -= 2;
-									repeat <<= extra_bits;
-								}
-								repeat += br.readBits( extra_bits ) + 3;
-								repeat_delta = repeat - old_repeat;
-								if ( symbol + repeat_delta > num_symbols ) {
-									throw new Error(
-										'[ReadHuffmanCodeLengths] symbol + repeat_delta > num_symbols'
-									);
-								}
-
-								for ( var x = 0; x < repeat_delta; x++ )
-									code_lengths[ symbol + x ] =
-										repeat_code_len;
-
-								symbol += repeat_delta;
-
-								if ( repeat_code_len !== 0 ) {
-									space -=
-										repeat_delta <<
-										( 15 - repeat_code_len );
-								}
-							}
-						}
-						if ( space !== 0 ) {
-							throw new Error(
-								'[ReadHuffmanCodeLengths] space = ' + space
-							);
-						}
-
-						for ( ; symbol < num_symbols; symbol++ )
-							code_lengths[ symbol ] = 0;
-					}
-
-					function ReadHuffmanCode(
-						alphabet_size,
-						tables,
-						table,
-						br
-					) {
-						var table_size = 0;
-						var simple_code_or_skip;
-						var code_lengths = new Uint8Array( alphabet_size );
-
-						br.readMoreInput();
-
-						/* simple_code_or_skip is used as follows:
+var BrotliInput = require('./streams').BrotliInput;
+var BrotliOutput = require('./streams').BrotliOutput;
+var BrotliBitReader = require('./bit_reader');
+var BrotliDictionary = require('./dictionary');
+var HuffmanCode = require('./huffman').HuffmanCode;
+var BrotliBuildHuffmanTable = require('./huffman').BrotliBuildHuffmanTable;
+var Context = require('./context');
+var Prefix = require('./prefix');
+var Transform = require('./transform');
+
+var kDefaultCodeLength = 8;
+var kCodeLengthRepeatCode = 16;
+var kNumLiteralCodes = 256;
+var kNumInsertAndCopyCodes = 704;
+var kNumBlockLengthCodes = 26;
+var kLiteralContextBits = 6;
+var kDistanceContextBits = 2;
+
+var HUFFMAN_TABLE_BITS = 8;
+var HUFFMAN_TABLE_MASK = 0xff;
+/* Maximum possible Huffman table size for an alphabet size of 704, max code
+ * length 15 and root table bits 8. */
+var HUFFMAN_MAX_TABLE_SIZE = 1080;
+
+var CODE_LENGTH_CODES = 18;
+var kCodeLengthCodeOrder = new Uint8Array([
+  1, 2, 3, 4, 0, 5, 17, 6, 16, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+]);
+
+var NUM_DISTANCE_SHORT_CODES = 16;
+var kDistanceShortCodeIndexOffset = new Uint8Array([
+  3, 2, 1, 0, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2
+]);
+
+var kDistanceShortCodeValueOffset = new Int8Array([
+  0, 0, 0, 0, -1, 1, -2, 2, -3, 3, -1, 1, -2, 2, -3, 3
+]);
+
+var kMaxHuffmanTableSize = new Uint16Array([
+  256, 402, 436, 468, 500, 534, 566, 598, 630, 662, 694, 726, 758, 790, 822,
+  854, 886, 920, 952, 984, 1016, 1048, 1080
+]);
+
+function DecodeWindowBits(br) {
+  var n;
+  if (br.readBits(1) === 0) {
+    return 16;
+  }
+
+  n = br.readBits(3);
+  if (n > 0) {
+    return 17 + n;
+  }
+
+  n = br.readBits(3);
+  if (n > 0) {
+    return 8 + n;
+  }
+
+  return 17;
+}
+
+/* Decodes a number in the range [0..255], by reading 1 - 11 bits. */
+function DecodeVarLenUint8(br) {
+  if (br.readBits(1)) {
+    var nbits = br.readBits(3);
+    if (nbits === 0) {
+      return 1;
+    } else {
+      return br.readBits(nbits) + (1 << nbits);
+    }
+  }
+  return 0;
+}
+
+function MetaBlockLength() {
+  this.meta_block_length = 0;
+  this.input_end = 0;
+  this.is_uncompressed = 0;
+  this.is_metadata = false;
+}
+
+function DecodeMetaBlockLength(br) {
+  var out = new MetaBlockLength;
+  var size_nibbles;
+  var size_bytes;
+  var i;
+
+  out.input_end = br.readBits(1);
+  if (out.input_end && br.readBits(1)) {
+    return out;
+  }
+
+  size_nibbles = br.readBits(2) + 4;
+  if (size_nibbles === 7) {
+    out.is_metadata = true;
+
+    if (br.readBits(1) !== 0)
+      throw new Error('Invalid reserved bit');
+
+    size_bytes = br.readBits(2);
+    if (size_bytes === 0)
+      return out;
+
+    for (i = 0; i < size_bytes; i++) {
+      var next_byte = br.readBits(8);
+      if (i + 1 === size_bytes && size_bytes > 1 && next_byte === 0)
+        throw new Error('Invalid size byte');
+
+      out.meta_block_length |= next_byte << (i * 8);
+    }
+  } else {
+    for (i = 0; i < size_nibbles; ++i) {
+      var next_nibble = br.readBits(4);
+      if (i + 1 === size_nibbles && size_nibbles > 4 && next_nibble === 0)
+        throw new Error('Invalid size nibble');
+
+      out.meta_block_length |= next_nibble << (i * 4);
+    }
+  }
+
+  ++out.meta_block_length;
+
+  if (!out.input_end && !out.is_metadata) {
+    out.is_uncompressed = br.readBits(1);
+  }
+
+  return out;
+}
+
+/* Decodes the next Huffman code from bit-stream. */
+function ReadSymbol(table, index, br) {
+  var start_index = index;
+
+  var nbits;
+  br.fillBitWindow();
+  index += (br.val_ >>> br.bit_pos_) & HUFFMAN_TABLE_MASK;
+  nbits = table[index].bits - HUFFMAN_TABLE_BITS;
+  if (nbits > 0) {
+    br.bit_pos_ += HUFFMAN_TABLE_BITS;
+    index += table[index].value;
+    index += (br.val_ >>> br.bit_pos_) & ((1 << nbits) - 1);
+  }
+  br.bit_pos_ += table[index].bits;
+  return table[index].value;
+}
+
+function ReadHuffmanCodeLengths(code_length_code_lengths, num_symbols, code_lengths, br) {
+  var symbol = 0;
+  var prev_code_len = kDefaultCodeLength;
+  var repeat = 0;
+  var repeat_code_len = 0;
+  var space = 32768;
+
+  var table = [];
+  for (var i = 0; i < 32; i++)
+    table.push(new HuffmanCode(0, 0));
+
+  BrotliBuildHuffmanTable(table, 0, 5, code_length_code_lengths, CODE_LENGTH_CODES);
+
+  while (symbol < num_symbols && space > 0) {
+    var p = 0;
+    var code_len;
+
+    br.readMoreInput();
+    br.fillBitWindow();
+    p += (br.val_ >>> br.bit_pos_) & 31;
+    br.bit_pos_ += table[p].bits;
+    code_len = table[p].value & 0xff;
+    if (code_len < kCodeLengthRepeatCode) {
+      repeat = 0;
+      code_lengths[symbol++] = code_len;
+      if (code_len !== 0) {
+        prev_code_len = code_len;
+        space -= 32768 >> code_len;
+      }
+    } else {
+      var extra_bits = code_len - 14;
+      var old_repeat;
+      var repeat_delta;
+      var new_len = 0;
+      if (code_len === kCodeLengthRepeatCode) {
+        new_len = prev_code_len;
+      }
+      if (repeat_code_len !== new_len) {
+        repeat = 0;
+        repeat_code_len = new_len;
+      }
+      old_repeat = repeat;
+      if (repeat > 0) {
+        repeat -= 2;
+        repeat <<= extra_bits;
+      }
+      repeat += br.readBits(extra_bits) + 3;
+      repeat_delta = repeat - old_repeat;
+      if (symbol + repeat_delta > num_symbols) {
+        throw new Error('[ReadHuffmanCodeLengths] symbol + repeat_delta > num_symbols');
+      }
+
+      for (var x = 0; x < repeat_delta; x++)
+        code_lengths[symbol + x] = repeat_code_len;
+
+      symbol += repeat_delta;
+
+      if (repeat_code_len !== 0) {
+        space -= repeat_delta << (15 - repeat_code_len);
+      }
+    }
+  }
+  if (space !== 0) {
+    throw new Error("[ReadHuffmanCodeLengths] space = " + space);
+  }
+
+  for (; symbol < num_symbols; symbol++)
+    code_lengths[symbol] = 0;
+}
+
+function ReadHuffmanCode(alphabet_size, tables, table, br) {
+  var table_size = 0;
+  var simple_code_or_skip;
+  var code_lengths = new Uint8Array(alphabet_size);
+
+  br.readMoreInput();
+
+  /* simple_code_or_skip is used as follows:
      1 for simple code;
      0 for no skipping, 2 skips 2 code lengths, 3 skips 3 code lengths */
-						simple_code_or_skip = br.readBits( 2 );
-						if ( simple_code_or_skip === 1 ) {
-							/* Read symbols, codes & code lengths directly. */
-							var i;
-							var max_bits_counter = alphabet_size - 1;
-							var max_bits = 0;
-							var symbols = new Int32Array( 4 );
-							var num_symbols = br.readBits( 2 ) + 1;
-							while ( max_bits_counter ) {
-								max_bits_counter >>= 1;
-								++max_bits;
-							}
-
-							for ( i = 0; i < num_symbols; ++i ) {
-								symbols[ i ] =
-									br.readBits( max_bits ) % alphabet_size;
-								code_lengths[ symbols[ i ] ] = 2;
-							}
-							code_lengths[ symbols[ 0 ] ] = 1;
-							switch ( num_symbols ) {
-								case 1:
-									break;
-								case 3:
-									if (
-										symbols[ 0 ] === symbols[ 1 ] ||
-										symbols[ 0 ] === symbols[ 2 ] ||
-										symbols[ 1 ] === symbols[ 2 ]
-									) {
-										throw new Error(
-											'[ReadHuffmanCode] invalid symbols'
-										);
-									}
-									break;
-								case 2:
-									if ( symbols[ 0 ] === symbols[ 1 ] ) {
-										throw new Error(
-											'[ReadHuffmanCode] invalid symbols'
-										);
-									}
-
-									code_lengths[ symbols[ 1 ] ] = 1;
-									break;
-								case 4:
-									if (
-										symbols[ 0 ] === symbols[ 1 ] ||
-										symbols[ 0 ] === symbols[ 2 ] ||
-										symbols[ 0 ] === symbols[ 3 ] ||
-										symbols[ 1 ] === symbols[ 2 ] ||
-										symbols[ 1 ] === symbols[ 3 ] ||
-										symbols[ 2 ] === symbols[ 3 ]
-									) {
-										throw new Error(
-											'[ReadHuffmanCode] invalid symbols'
-										);
-									}
-
-									if ( br.readBits( 1 ) ) {
-										code_lengths[ symbols[ 2 ] ] = 3;
-										code_lengths[ symbols[ 3 ] ] = 3;
-									} else {
-										code_lengths[ symbols[ 0 ] ] = 2;
-									}
-									break;
-							}
-						} else {
-							/* Decode Huffman-coded code lengths. */
-							var i;
-							var code_length_code_lengths = new Uint8Array(
-								CODE_LENGTH_CODES
-							);
-							var space = 32;
-							var num_codes = 0;
-							/* Static Huffman code for the code length code lengths */
-							var huff = [
-								new HuffmanCode( 2, 0 ),
-								new HuffmanCode( 2, 4 ),
-								new HuffmanCode( 2, 3 ),
-								new HuffmanCode( 3, 2 ),
-								new HuffmanCode( 2, 0 ),
-								new HuffmanCode( 2, 4 ),
-								new HuffmanCode( 2, 3 ),
-								new HuffmanCode( 4, 1 ),
-								new HuffmanCode( 2, 0 ),
-								new HuffmanCode( 2, 4 ),
-								new HuffmanCode( 2, 3 ),
-								new HuffmanCode( 3, 2 ),
-								new HuffmanCode( 2, 0 ),
-								new HuffmanCode( 2, 4 ),
-								new HuffmanCode( 2, 3 ),
-								new HuffmanCode( 4, 5 ),
-							];
-							for (
-								i = simple_code_or_skip;
-								i < CODE_LENGTH_CODES && space > 0;
-								++i
-							) {
-								var code_len_idx = kCodeLengthCodeOrder[ i ];
-								var p = 0;
-								var v;
-								br.fillBitWindow();
-								p += ( br.val_ >>> br.bit_pos_ ) & 15;
-								br.bit_pos_ += huff[ p ].bits;
-								v = huff[ p ].value;
-								code_length_code_lengths[ code_len_idx ] = v;
-								if ( v !== 0 ) {
-									space -= 32 >> v;
-									++num_codes;
-								}
-							}
-
-							if ( ! ( num_codes === 1 || space === 0 ) )
-								throw new Error(
-									'[ReadHuffmanCode] invalid num_codes or space'
-								);
-
-							ReadHuffmanCodeLengths(
-								code_length_code_lengths,
-								alphabet_size,
-								code_lengths,
-								br
-							);
-						}
-
-						table_size = BrotliBuildHuffmanTable(
-							tables,
-							table,
-							HUFFMAN_TABLE_BITS,
-							code_lengths,
-							alphabet_size
-						);
-
-						if ( table_size === 0 ) {
-							throw new Error(
-								'[ReadHuffmanCode] BuildHuffmanTable failed: '
-							);
-						}
-
-						return table_size;
-					}
-
-					function ReadBlockLength( table, index, br ) {
-						var code;
-						var nbits;
-						code = ReadSymbol( table, index, br );
-						nbits = Prefix.kBlockLengthPrefixCode[ code ].nbits;
-						return (
-							Prefix.kBlockLengthPrefixCode[ code ].offset +
-							br.readBits( nbits )
-						);
-					}
-
-					function TranslateShortCodes( code, ringbuffer, index ) {
-						var val;
-						if ( code < NUM_DISTANCE_SHORT_CODES ) {
-							index += kDistanceShortCodeIndexOffset[ code ];
-							index &= 3;
-							val =
-								ringbuffer[ index ] +
-								kDistanceShortCodeValueOffset[ code ];
-						} else {
-							val = code - NUM_DISTANCE_SHORT_CODES + 1;
-						}
-						return val;
-					}
-
-					function MoveToFront( v, index ) {
-						var value = v[ index ];
-						var i = index;
-						for ( ; i; --i ) v[ i ] = v[ i - 1 ];
-						v[ 0 ] = value;
-					}
-
-					function InverseMoveToFrontTransform( v, v_len ) {
-						var mtf = new Uint8Array( 256 );
-						var i;
-						for ( i = 0; i < 256; ++i ) {
-							mtf[ i ] = i;
-						}
-						for ( i = 0; i < v_len; ++i ) {
-							var index = v[ i ];
-							v[ i ] = mtf[ index ];
-							if ( index ) MoveToFront( mtf, index );
-						}
-					}
-
-					/* Contains a collection of huffman trees with the same alphabet size. */
-					function HuffmanTreeGroup( alphabet_size, num_htrees ) {
-						this.alphabet_size = alphabet_size;
-						this.num_htrees = num_htrees;
-						this.codes = new Array(
-							num_htrees +
-								num_htrees *
-									kMaxHuffmanTableSize[
-										( alphabet_size + 31 ) >>> 5
-									]
-						);
-						this.htrees = new Uint32Array( num_htrees );
-					}
-
-					HuffmanTreeGroup.prototype.decode = function ( br ) {
-						var i;
-						var table_size;
-						var next = 0;
-						for ( i = 0; i < this.num_htrees; ++i ) {
-							this.htrees[ i ] = next;
-							table_size = ReadHuffmanCode(
-								this.alphabet_size,
-								this.codes,
-								next,
-								br
-							);
-							next += table_size;
-						}
-					};
-
-					function DecodeContextMap( context_map_size, br ) {
-						var out = { num_htrees: null, context_map: null };
-						var use_rle_for_zeros;
-						var max_run_length_prefix = 0;
-						var table;
-						var i;
-
-						br.readMoreInput();
-						var num_htrees = ( out.num_htrees =
-							DecodeVarLenUint8( br ) + 1 );
-
-						var context_map = ( out.context_map = new Uint8Array(
-							context_map_size
-						) );
-						if ( num_htrees <= 1 ) {
-							return out;
-						}
-
-						use_rle_for_zeros = br.readBits( 1 );
-						if ( use_rle_for_zeros ) {
-							max_run_length_prefix = br.readBits( 4 ) + 1;
-						}
-
-						table = [];
-						for ( i = 0; i < HUFFMAN_MAX_TABLE_SIZE; i++ ) {
-							table[ i ] = new HuffmanCode( 0, 0 );
-						}
-
-						ReadHuffmanCode(
-							num_htrees + max_run_length_prefix,
-							table,
-							0,
-							br
-						);
-
-						for ( i = 0; i < context_map_size;  ) {
-							var code;
-
-							br.readMoreInput();
-							code = ReadSymbol( table, 0, br );
-							if ( code === 0 ) {
-								context_map[ i ] = 0;
-								++i;
-							} else if ( code <= max_run_length_prefix ) {
-								var reps =
-									1 + ( 1 << code ) + br.readBits( code );
-								while ( --reps ) {
-									if ( i >= context_map_size ) {
-										throw new Error(
-											'[DecodeContextMap] i >= context_map_size'
-										);
-									}
-									context_map[ i ] = 0;
-									++i;
-								}
-							} else {
-								context_map[ i ] = code - max_run_length_prefix;
-								++i;
-							}
-						}
-						if ( br.readBits( 1 ) ) {
-							InverseMoveToFrontTransform(
-								context_map,
-								context_map_size
-							);
-						}
-
-						return out;
-					}
-
-					function DecodeBlockType(
-						max_block_type,
-						trees,
-						tree_type,
-						block_types,
-						ringbuffers,
-						indexes,
-						br
-					) {
-						var ringbuffer = tree_type * 2;
-						var index = tree_type;
-						var type_code = ReadSymbol(
-							trees,
-							tree_type * HUFFMAN_MAX_TABLE_SIZE,
-							br
-						);
-						var block_type;
-						if ( type_code === 0 ) {
-							block_type =
-								ringbuffers[
-									ringbuffer + ( indexes[ index ] & 1 )
-								];
-						} else if ( type_code === 1 ) {
-							block_type =
-								ringbuffers[
-									ringbuffer +
-										( ( indexes[ index ] - 1 ) & 1 )
-								] + 1;
-						} else {
-							block_type = type_code - 2;
-						}
-						if ( block_type >= max_block_type ) {
-							block_type -= max_block_type;
-						}
-						block_types[ tree_type ] = block_type;
-						ringbuffers[ ringbuffer + ( indexes[ index ] & 1 ) ] =
-							block_type;
-						++indexes[ index ];
-					}
-
-					function CopyUncompressedBlockToOutput(
-						output,
-						len,
-						pos,
-						ringbuffer,
-						ringbuffer_mask,
-						br
-					) {
-						var rb_size = ringbuffer_mask + 1;
-						var rb_pos = pos & ringbuffer_mask;
-						var br_pos = br.pos_ & BrotliBitReader.IBUF_MASK;
-						var nbytes;
-
-						/* For short lengths copy byte-by-byte */
-						if (
-							len < 8 ||
-							br.bit_pos_ + ( len << 3 ) < br.bit_end_pos_
-						) {
-							while ( len-- > 0 ) {
-								br.readMoreInput();
-								ringbuffer[ rb_pos++ ] = br.readBits( 8 );
-								if ( rb_pos === rb_size ) {
-									output.write( ringbuffer, rb_size );
-									rb_pos = 0;
-								}
-							}
-							return;
-						}
-
-						if ( br.bit_end_pos_ < 32 ) {
-							throw new Error(
-								'[CopyUncompressedBlockToOutput] br.bit_end_pos_ < 32'
-							);
-						}
-
-						/* Copy remaining 0-4 bytes from br.val_ to ringbuffer. */
-						while ( br.bit_pos_ < 32 ) {
-							ringbuffer[ rb_pos ] = br.val_ >>> br.bit_pos_;
-							br.bit_pos_ += 8;
-							++rb_pos;
-							--len;
-						}
-
-						/* Copy remaining bytes from br.buf_ to ringbuffer. */
-						nbytes = ( br.bit_end_pos_ - br.bit_pos_ ) >> 3;
-						if ( br_pos + nbytes > BrotliBitReader.IBUF_MASK ) {
-							var tail = BrotliBitReader.IBUF_MASK + 1 - br_pos;
-							for ( var x = 0; x < tail; x++ )
-								ringbuffer[ rb_pos + x ] =
-									br.buf_[ br_pos + x ];
-
-							nbytes -= tail;
-							rb_pos += tail;
-							len -= tail;
-							br_pos = 0;
-						}
-
-						for ( var x = 0; x < nbytes; x++ )
-							ringbuffer[ rb_pos + x ] = br.buf_[ br_pos + x ];
-
-						rb_pos += nbytes;
-						len -= nbytes;
-
-						/* If we wrote past the logical end of the ringbuffer, copy the tail of the
+  simple_code_or_skip = br.readBits(2);
+  if (simple_code_or_skip === 1) {
+    /* Read symbols, codes & code lengths directly. */
+    var i;
+    var max_bits_counter = alphabet_size - 1;
+    var max_bits = 0;
+    var symbols = new Int32Array(4);
+    var num_symbols = br.readBits(2) + 1;
+    while (max_bits_counter) {
+      max_bits_counter >>= 1;
+      ++max_bits;
+    }
+
+    for (i = 0; i < num_symbols; ++i) {
+      symbols[i] = br.readBits(max_bits) % alphabet_size;
+      code_lengths[symbols[i]] = 2;
+    }
+    code_lengths[symbols[0]] = 1;
+    switch (num_symbols) {
+      case 1:
+        break;
+      case 3:
+        if ((symbols[0] === symbols[1]) ||
+            (symbols[0] === symbols[2]) ||
+            (symbols[1] === symbols[2])) {
+          throw new Error('[ReadHuffmanCode] invalid symbols');
+        }
+        break;
+      case 2:
+        if (symbols[0] === symbols[1]) {
+          throw new Error('[ReadHuffmanCode] invalid symbols');
+        }
+
+        code_lengths[symbols[1]] = 1;
+        break;
+      case 4:
+        if ((symbols[0] === symbols[1]) ||
+            (symbols[0] === symbols[2]) ||
+            (symbols[0] === symbols[3]) ||
+            (symbols[1] === symbols[2]) ||
+            (symbols[1] === symbols[3]) ||
+            (symbols[2] === symbols[3])) {
+          throw new Error('[ReadHuffmanCode] invalid symbols');
+        }
+
+        if (br.readBits(1)) {
+          code_lengths[symbols[2]] = 3;
+          code_lengths[symbols[3]] = 3;
+        } else {
+          code_lengths[symbols[0]] = 2;
+        }
+        break;
+    }
+  } else {  /* Decode Huffman-coded code lengths. */
+    var i;
+    var code_length_code_lengths = new Uint8Array(CODE_LENGTH_CODES);
+    var space = 32;
+    var num_codes = 0;
+    /* Static Huffman code for the code length code lengths */
+    var huff = [
+      new HuffmanCode(2, 0), new HuffmanCode(2, 4), new HuffmanCode(2, 3), new HuffmanCode(3, 2),
+      new HuffmanCode(2, 0), new HuffmanCode(2, 4), new HuffmanCode(2, 3), new HuffmanCode(4, 1),
+      new HuffmanCode(2, 0), new HuffmanCode(2, 4), new HuffmanCode(2, 3), new HuffmanCode(3, 2),
+      new HuffmanCode(2, 0), new HuffmanCode(2, 4), new HuffmanCode(2, 3), new HuffmanCode(4, 5)
+    ];
+    for (i = simple_code_or_skip; i < CODE_LENGTH_CODES && space > 0; ++i) {
+      var code_len_idx = kCodeLengthCodeOrder[i];
+      var p = 0;
+      var v;
+      br.fillBitWindow();
+      p += (br.val_ >>> br.bit_pos_) & 15;
+      br.bit_pos_ += huff[p].bits;
+      v = huff[p].value;
+      code_length_code_lengths[code_len_idx] = v;
+      if (v !== 0) {
+        space -= (32 >> v);
+        ++num_codes;
+      }
+    }
+
+    if (!(num_codes === 1 || space === 0))
+      throw new Error('[ReadHuffmanCode] invalid num_codes or space');
+
+    ReadHuffmanCodeLengths(code_length_code_lengths, alphabet_size, code_lengths, br);
+  }
+
+  table_size = BrotliBuildHuffmanTable(tables, table, HUFFMAN_TABLE_BITS, code_lengths, alphabet_size);
+
+  if (table_size === 0) {
+    throw new Error("[ReadHuffmanCode] BuildHuffmanTable failed: ");
+  }
+
+  return table_size;
+}
+
+function ReadBlockLength(table, index, br) {
+  var code;
+  var nbits;
+  code = ReadSymbol(table, index, br);
+  nbits = Prefix.kBlockLengthPrefixCode[code].nbits;
+  return Prefix.kBlockLengthPrefixCode[code].offset + br.readBits(nbits);
+}
+
+function TranslateShortCodes(code, ringbuffer, index) {
+  var val;
+  if (code < NUM_DISTANCE_SHORT_CODES) {
+    index += kDistanceShortCodeIndexOffset[code];
+    index &= 3;
+    val = ringbuffer[index] + kDistanceShortCodeValueOffset[code];
+  } else {
+    val = code - NUM_DISTANCE_SHORT_CODES + 1;
+  }
+  return val;
+}
+
+function MoveToFront(v, index) {
+  var value = v[index];
+  var i = index;
+  for (; i; --i) v[i] = v[i - 1];
+  v[0] = value;
+}
+
+function InverseMoveToFrontTransform(v, v_len) {
+  var mtf = new Uint8Array(256);
+  var i;
+  for (i = 0; i < 256; ++i) {
+    mtf[i] = i;
+  }
+  for (i = 0; i < v_len; ++i) {
+    var index = v[i];
+    v[i] = mtf[index];
+    if (index) MoveToFront(mtf, index);
+  }
+}
+
+/* Contains a collection of huffman trees with the same alphabet size. */
+function HuffmanTreeGroup(alphabet_size, num_htrees) {
+  this.alphabet_size = alphabet_size;
+  this.num_htrees = num_htrees;
+  this.codes = new Array(num_htrees + num_htrees * kMaxHuffmanTableSize[(alphabet_size + 31) >>> 5]);
+  this.htrees = new Uint32Array(num_htrees);
+}
+
+HuffmanTreeGroup.prototype.decode = function(br) {
+  var i;
+  var table_size;
+  var next = 0;
+  for (i = 0; i < this.num_htrees; ++i) {
+    this.htrees[i] = next;
+    table_size = ReadHuffmanCode(this.alphabet_size, this.codes, next, br);
+    next += table_size;
+  }
+};
+
+function DecodeContextMap(context_map_size, br) {
+  var out = { num_htrees: null, context_map: null };
+  var use_rle_for_zeros;
+  var max_run_length_prefix = 0;
+  var table;
+  var i;
+
+  br.readMoreInput();
+  var num_htrees = out.num_htrees = DecodeVarLenUint8(br) + 1;
+
+  var context_map = out.context_map = new Uint8Array(context_map_size);
+  if (num_htrees <= 1) {
+    return out;
+  }
+
+  use_rle_for_zeros = br.readBits(1);
+  if (use_rle_for_zeros) {
+    max_run_length_prefix = br.readBits(4) + 1;
+  }
+
+  table = [];
+  for (i = 0; i < HUFFMAN_MAX_TABLE_SIZE; i++) {
+    table[i] = new HuffmanCode(0, 0);
+  }
+
+  ReadHuffmanCode(num_htrees + max_run_length_prefix, table, 0, br);
+
+  for (i = 0; i < context_map_size;) {
+    var code;
+
+    br.readMoreInput();
+    code = ReadSymbol(table, 0, br);
+    if (code === 0) {
+      context_map[i] = 0;
+      ++i;
+    } else if (code <= max_run_length_prefix) {
+      var reps = 1 + (1 << code) + br.readBits(code);
+      while (--reps) {
+        if (i >= context_map_size) {
+          throw new Error("[DecodeContextMap] i >= context_map_size");
+        }
+        context_map[i] = 0;
+        ++i;
+      }
+    } else {
+      context_map[i] = code - max_run_length_prefix;
+      ++i;
+    }
+  }
+  if (br.readBits(1)) {
+    InverseMoveToFrontTransform(context_map, context_map_size);
+  }
+
+  return out;
+}
+
+function DecodeBlockType(max_block_type, trees, tree_type, block_types, ringbuffers, indexes, br) {
+  var ringbuffer = tree_type * 2;
+  var index = tree_type;
+  var type_code = ReadSymbol(trees, tree_type * HUFFMAN_MAX_TABLE_SIZE, br);
+  var block_type;
+  if (type_code === 0) {
+    block_type = ringbuffers[ringbuffer + (indexes[index] & 1)];
+  } else if (type_code === 1) {
+    block_type = ringbuffers[ringbuffer + ((indexes[index] - 1) & 1)] + 1;
+  } else {
+    block_type = type_code - 2;
+  }
+  if (block_type >= max_block_type) {
+    block_type -= max_block_type;
+  }
+  block_types[tree_type] = block_type;
+  ringbuffers[ringbuffer + (indexes[index] & 1)] = block_type;
+  ++indexes[index];
+}
+
+function CopyUncompressedBlockToOutput(output, len, pos, ringbuffer, ringbuffer_mask, br) {
+  var rb_size = ringbuffer_mask + 1;
+  var rb_pos = pos & ringbuffer_mask;
+  var br_pos = br.pos_ & BrotliBitReader.IBUF_MASK;
+  var nbytes;
+
+  /* For short lengths copy byte-by-byte */
+  if (len < 8 || br.bit_pos_ + (len << 3) < br.bit_end_pos_) {
+    while (len-- > 0) {
+      br.readMoreInput();
+      ringbuffer[rb_pos++] = br.readBits(8);
+      if (rb_pos === rb_size) {
+        output.write(ringbuffer, rb_size);
+        rb_pos = 0;
+      }
+    }
+    return;
+  }
+
+  if (br.bit_end_pos_ < 32) {
+    throw new Error('[CopyUncompressedBlockToOutput] br.bit_end_pos_ < 32');
+  }
+
+  /* Copy remaining 0-4 bytes from br.val_ to ringbuffer. */
+  while (br.bit_pos_ < 32) {
+    ringbuffer[rb_pos] = (br.val_ >>> br.bit_pos_);
+    br.bit_pos_ += 8;
+    ++rb_pos;
+    --len;
+  }
+
+  /* Copy remaining bytes from br.buf_ to ringbuffer. */
+  nbytes = (br.bit_end_pos_ - br.bit_pos_) >> 3;
+  if (br_pos + nbytes > BrotliBitReader.IBUF_MASK) {
+    var tail = BrotliBitReader.IBUF_MASK + 1 - br_pos;
+    for (var x = 0; x < tail; x++)
+      ringbuffer[rb_pos + x] = br.buf_[br_pos + x];
+
+    nbytes -= tail;
+    rb_pos += tail;
+    len -= tail;
+    br_pos = 0;
+  }
+
+  for (var x = 0; x < nbytes; x++)
+    ringbuffer[rb_pos + x] = br.buf_[br_pos + x];
+
+  rb_pos += nbytes;
+  len -= nbytes;
+
+  /* If we wrote past the logical end of the ringbuffer, copy the tail of the
      ringbuffer to its beginning and flush the ringbuffer to the output. */
-						if ( rb_pos >= rb_size ) {
-							output.write( ringbuffer, rb_size );
-							rb_pos -= rb_size;
-							for ( var x = 0; x < rb_pos; x++ )
-								ringbuffer[ x ] = ringbuffer[ rb_size + x ];
-						}
-
-						/* If we have more to copy than the remaining size of the ringbuffer, then we
+  if (rb_pos >= rb_size) {
+    output.write(ringbuffer, rb_size);
+    rb_pos -= rb_size;
+    for (var x = 0; x < rb_pos; x++)
+      ringbuffer[x] = ringbuffer[rb_size + x];
+  }
+
+  /* If we have more to copy than the remaining size of the ringbuffer, then we
      first fill the ringbuffer from the input and then flush the ringbuffer to
      the output */
-						while ( rb_pos + len >= rb_size ) {
-							nbytes = rb_size - rb_pos;
-							if (
-								br.input_.read( ringbuffer, rb_pos, nbytes ) <
-								nbytes
-							) {
-								throw new Error(
-									'[CopyUncompressedBlockToOutput] not enough bytes'
-								);
-							}
-							output.write( ringbuffer, rb_size );
-							len -= nbytes;
-							rb_pos = 0;
-						}
-
-						/* Copy straight from the input onto the ringbuffer. The ringbuffer will be
+  while (rb_pos + len >= rb_size) {
+    nbytes = rb_size - rb_pos;
+    if (br.input_.read(ringbuffer, rb_pos, nbytes) < nbytes) {
+      throw new Error('[CopyUncompressedBlockToOutput] not enough bytes');
+    }
+    output.write(ringbuffer, rb_size);
+    len -= nbytes;
+    rb_pos = 0;
+  }
+
+  /* Copy straight from the input onto the ringbuffer. The ringbuffer will be
      flushed to the output at a later time. */
-						if ( br.input_.read( ringbuffer, rb_pos, len ) < len ) {
-							throw new Error(
-								'[CopyUncompressedBlockToOutput] not enough bytes'
-							);
-						}
+  if (br.input_.read(ringbuffer, rb_pos, len) < len) {
+    throw new Error('[CopyUncompressedBlockToOutput] not enough bytes');
+  }
 
-						/* Restore the state of the bit reader. */
-						br.reset();
-					}
+  /* Restore the state of the bit reader. */
+  br.reset();
+}
 
-					/* Advances the bit reader position to the next byte boundary and verifies
+/* Advances the bit reader position to the next byte boundary and verifies
    that any skipped bits are set to zero. */
-					function JumpToByteBoundary( br ) {
-						var new_bit_pos = ( br.bit_pos_ + 7 ) & ~7;
-						var pad_bits = br.readBits( new_bit_pos - br.bit_pos_ );
-						return pad_bits == 0;
-					}
-
-					function BrotliDecompressedSize( buffer ) {
-						var input = new BrotliInput( buffer );
-						var br = new BrotliBitReader( input );
-						DecodeWindowBits( br );
-						var out = DecodeMetaBlockLength( br );
-						return out.meta_block_length;
-					}
-
-					exports.BrotliDecompressedSize = BrotliDecompressedSize;
-
-					function BrotliDecompressBuffer( buffer, output_size ) {
-						var input = new BrotliInput( buffer );
-
-						if ( output_size == null ) {
-							output_size = BrotliDecompressedSize( buffer );
-						}
-
-						var output_buffer = new Uint8Array( output_size );
-						var output = new BrotliOutput( output_buffer );
-
-						BrotliDecompress( input, output );
-
-						if ( output.pos < output.buffer.length ) {
-							output.buffer = output.buffer.subarray(
-								0,
-								output.pos
-							);
-						}
-
-						return output.buffer;
-					}
-
-					exports.BrotliDecompressBuffer = BrotliDecompressBuffer;
-
-					function BrotliDecompress( input, output ) {
-						var i;
-						var pos = 0;
-						var input_end = 0;
-						var window_bits = 0;
-						var max_backward_distance;
-						var max_distance = 0;
-						var ringbuffer_size;
-						var ringbuffer_mask;
-						var ringbuffer;
-						var ringbuffer_end;
-						/* This ring buffer holds a few past copy distances that will be used by */
-						/* some special distance codes. */
-						var dist_rb = [ 16, 15, 11, 4 ];
-						var dist_rb_idx = 0;
-						/* The previous 2 bytes used for context. */
-						var prev_byte1 = 0;
-						var prev_byte2 = 0;
-						var hgroup = [
-							new HuffmanTreeGroup( 0, 0 ),
-							new HuffmanTreeGroup( 0, 0 ),
-							new HuffmanTreeGroup( 0, 0 ),
-						];
-						var block_type_trees;
-						var block_len_trees;
-						var br;
-
-						/* We need the slack region for the following reasons:
+function JumpToByteBoundary(br) {
+  var new_bit_pos = (br.bit_pos_ + 7) & ~7;
+  var pad_bits = br.readBits(new_bit_pos - br.bit_pos_);
+  return pad_bits == 0;
+}
+
+function BrotliDecompressedSize(buffer) {
+  var input = new BrotliInput(buffer);
+  var br = new BrotliBitReader(input);
+  DecodeWindowBits(br);
+  var out = DecodeMetaBlockLength(br);
+  return out.meta_block_length;
+}
+
+exports.BrotliDecompressedSize = BrotliDecompressedSize;
+
+function BrotliDecompressBuffer(buffer, output_size) {
+  var input = new BrotliInput(buffer);
+
+  if (output_size == null) {
+    output_size = BrotliDecompressedSize(buffer);
+  }
+
+  var output_buffer = new Uint8Array(output_size);
+  var output = new BrotliOutput(output_buffer);
+
+  BrotliDecompress(input, output);
+
+  if (output.pos < output.buffer.length) {
+    output.buffer = output.buffer.subarray(0, output.pos);
+  }
+
+  return output.buffer;
+}
+
+exports.BrotliDecompressBuffer = BrotliDecompressBuffer;
+
+function BrotliDecompress(input, output) {
+  var i;
+  var pos = 0;
+  var input_end = 0;
+  var window_bits = 0;
+  var max_backward_distance;
+  var max_distance = 0;
+  var ringbuffer_size;
+  var ringbuffer_mask;
+  var ringbuffer;
+  var ringbuffer_end;
+  /* This ring buffer holds a few past copy distances that will be used by */
+  /* some special distance codes. */
+  var dist_rb = [ 16, 15, 11, 4 ];
+  var dist_rb_idx = 0;
+  /* The previous 2 bytes used for context. */
+  var prev_byte1 = 0;
+  var prev_byte2 = 0;
+  var hgroup = [new HuffmanTreeGroup(0, 0), new HuffmanTreeGroup(0, 0), new HuffmanTreeGroup(0, 0)];
+  var block_type_trees;
+  var block_len_trees;
+  var br;
+
+  /* We need the slack region for the following reasons:
        - always doing two 8-byte copies for fast backward copying
        - transforms
        - flushing the input ringbuffer when decoding uncompressed blocks */
-						var kRingBufferWriteAheadSlack =
-							128 + BrotliBitReader.READ_SIZE;
-
-						br = new BrotliBitReader( input );
-
-						/* Decode window size. */
-						window_bits = DecodeWindowBits( br );
-						max_backward_distance = ( 1 << window_bits ) - 16;
-
-						ringbuffer_size = 1 << window_bits;
-						ringbuffer_mask = ringbuffer_size - 1;
-						ringbuffer = new Uint8Array(
-							ringbuffer_size +
-								kRingBufferWriteAheadSlack +
-								BrotliDictionary.maxDictionaryWordLength
-						);
-						ringbuffer_end = ringbuffer_size;
-
-						block_type_trees = [];
-						block_len_trees = [];
-						for ( var x = 0; x < 3 * HUFFMAN_MAX_TABLE_SIZE; x++ ) {
-							block_type_trees[ x ] = new HuffmanCode( 0, 0 );
-							block_len_trees[ x ] = new HuffmanCode( 0, 0 );
-						}
-
-						while ( ! input_end ) {
-							var meta_block_remaining_len = 0;
-							var is_uncompressed;
-							var block_length = [ 1 << 28, 1 << 28, 1 << 28 ];
-							var block_type = [ 0 ];
-							var num_block_types = [ 1, 1, 1 ];
-							var block_type_rb = [ 0, 1, 0, 1, 0, 1 ];
-							var block_type_rb_index = [ 0 ];
-							var distance_postfix_bits;
-							var num_direct_distance_codes;
-							var distance_postfix_mask;
-							var num_distance_codes;
-							var context_map = null;
-							var context_modes = null;
-							var num_literal_htrees;
-							var dist_context_map = null;
-							var num_dist_htrees;
-							var context_offset = 0;
-							var context_map_slice = null;
-							var literal_htree_index = 0;
-							var dist_context_offset = 0;
-							var dist_context_map_slice = null;
-							var dist_htree_index = 0;
-							var context_lookup_offset1 = 0;
-							var context_lookup_offset2 = 0;
-							var context_mode;
-							var htree_command;
-
-							for ( i = 0; i < 3; ++i ) {
-								hgroup[ i ].codes = null;
-								hgroup[ i ].htrees = null;
-							}
-
-							br.readMoreInput();
-
-							var _out = DecodeMetaBlockLength( br );
-							meta_block_remaining_len = _out.meta_block_length;
-							if (
-								pos + meta_block_remaining_len >
-								output.buffer.length
-							) {
-								/* We need to grow the output buffer to fit the additional data. */
-								var tmp = new Uint8Array(
-									pos + meta_block_remaining_len
-								);
-								tmp.set( output.buffer );
-								output.buffer = tmp;
-							}
-							input_end = _out.input_end;
-							is_uncompressed = _out.is_uncompressed;
-
-							if ( _out.is_metadata ) {
-								JumpToByteBoundary( br );
-
-								for (
-									;
-									meta_block_remaining_len > 0;
-									--meta_block_remaining_len
-								) {
-									br.readMoreInput();
-									/* Read one byte and ignore it. */
-									br.readBits( 8 );
-								}
-
-								continue;
-							}
-
-							if ( meta_block_remaining_len === 0 ) {
-								continue;
-							}
-
-							if ( is_uncompressed ) {
-								br.bit_pos_ = ( br.bit_pos_ + 7 ) & ~7;
-								CopyUncompressedBlockToOutput(
-									output,
-									meta_block_remaining_len,
-									pos,
-									ringbuffer,
-									ringbuffer_mask,
-									br
-								);
-								pos += meta_block_remaining_len;
-								continue;
-							}
-
-							for ( i = 0; i < 3; ++i ) {
-								num_block_types[ i ] =
-									DecodeVarLenUint8( br ) + 1;
-								if ( num_block_types[ i ] >= 2 ) {
-									ReadHuffmanCode(
-										num_block_types[ i ] + 2,
-										block_type_trees,
-										i * HUFFMAN_MAX_TABLE_SIZE,
-										br
-									);
-									ReadHuffmanCode(
-										kNumBlockLengthCodes,
-										block_len_trees,
-										i * HUFFMAN_MAX_TABLE_SIZE,
-										br
-									);
-									block_length[ i ] = ReadBlockLength(
-										block_len_trees,
-										i * HUFFMAN_MAX_TABLE_SIZE,
-										br
-									);
-									block_type_rb_index[ i ] = 1;
-								}
-							}
-
-							br.readMoreInput();
-
-							distance_postfix_bits = br.readBits( 2 );
-							num_direct_distance_codes =
-								NUM_DISTANCE_SHORT_CODES +
-								( br.readBits( 4 ) << distance_postfix_bits );
-							distance_postfix_mask =
-								( 1 << distance_postfix_bits ) - 1;
-							num_distance_codes =
-								num_direct_distance_codes +
-								( 48 << distance_postfix_bits );
-							context_modes = new Uint8Array(
-								num_block_types[ 0 ]
-							);
-
-							for ( i = 0; i < num_block_types[ 0 ]; ++i ) {
-								br.readMoreInput();
-								context_modes[ i ] = br.readBits( 2 ) << 1;
-							}
-
-							var _o1 = DecodeContextMap(
-								num_block_types[ 0 ] << kLiteralContextBits,
-								br
-							);
-							num_literal_htrees = _o1.num_htrees;
-							context_map = _o1.context_map;
-
-							var _o2 = DecodeContextMap(
-								num_block_types[ 2 ] << kDistanceContextBits,
-								br
-							);
-							num_dist_htrees = _o2.num_htrees;
-							dist_context_map = _o2.context_map;
-
-							hgroup[ 0 ] = new HuffmanTreeGroup(
-								kNumLiteralCodes,
-								num_literal_htrees
-							);
-							hgroup[ 1 ] = new HuffmanTreeGroup(
-								kNumInsertAndCopyCodes,
-								num_block_types[ 1 ]
-							);
-							hgroup[ 2 ] = new HuffmanTreeGroup(
-								num_distance_codes,
-								num_dist_htrees
-							);
-
-							for ( i = 0; i < 3; ++i ) {
-								hgroup[ i ].decode( br );
-							}
-
-							context_map_slice = 0;
-							dist_context_map_slice = 0;
-							context_mode = context_modes[ block_type[ 0 ] ];
-							context_lookup_offset1 =
-								Context.lookupOffsets[ context_mode ];
-							context_lookup_offset2 =
-								Context.lookupOffsets[ context_mode + 1 ];
-							htree_command = hgroup[ 1 ].htrees[ 0 ];
-
-							while ( meta_block_remaining_len > 0 ) {
-								var cmd_code;
-								var range_idx;
-								var insert_code;
-								var copy_code;
-								var insert_length;
-								var copy_length;
-								var distance_code;
-								var distance;
-								var context;
-								var j;
-								var copy_dst;
-
-								br.readMoreInput();
-
-								if ( block_length[ 1 ] === 0 ) {
-									DecodeBlockType(
-										num_block_types[ 1 ],
-										block_type_trees,
-										1,
-										block_type,
-										block_type_rb,
-										block_type_rb_index,
-										br
-									);
-									block_length[ 1 ] = ReadBlockLength(
-										block_len_trees,
-										HUFFMAN_MAX_TABLE_SIZE,
-										br
-									);
-									htree_command =
-										hgroup[ 1 ].htrees[ block_type[ 1 ] ];
-								}
-								--block_length[ 1 ];
-								cmd_code = ReadSymbol(
-									hgroup[ 1 ].codes,
-									htree_command,
-									br
-								);
-								range_idx = cmd_code >> 6;
-								if ( range_idx >= 2 ) {
-									range_idx -= 2;
-									distance_code = -1;
-								} else {
-									distance_code = 0;
-								}
-								insert_code =
-									Prefix.kInsertRangeLut[ range_idx ] +
-									( ( cmd_code >> 3 ) & 7 );
-								copy_code =
-									Prefix.kCopyRangeLut[ range_idx ] +
-									( cmd_code & 7 );
-								insert_length =
-									Prefix.kInsertLengthPrefixCode[
-										insert_code
-									].offset +
-									br.readBits(
-										Prefix.kInsertLengthPrefixCode[
-											insert_code
-										].nbits
-									);
-								copy_length =
-									Prefix.kCopyLengthPrefixCode[ copy_code ]
-										.offset +
-									br.readBits(
-										Prefix.kCopyLengthPrefixCode[
-											copy_code
-										].nbits
-									);
-								prev_byte1 =
-									ringbuffer[ ( pos - 1 ) & ringbuffer_mask ];
-								prev_byte2 =
-									ringbuffer[ ( pos - 2 ) & ringbuffer_mask ];
-								for ( j = 0; j < insert_length; ++j ) {
-									br.readMoreInput();
-
-									if ( block_length[ 0 ] === 0 ) {
-										DecodeBlockType(
-											num_block_types[ 0 ],
-											block_type_trees,
-											0,
-											block_type,
-											block_type_rb,
-											block_type_rb_index,
-											br
-										);
-										block_length[ 0 ] = ReadBlockLength(
-											block_len_trees,
-											0,
-											br
-										);
-										context_offset =
-											block_type[ 0 ] <<
-											kLiteralContextBits;
-										context_map_slice = context_offset;
-										context_mode =
-											context_modes[ block_type[ 0 ] ];
-										context_lookup_offset1 =
-											Context.lookupOffsets[
-												context_mode
-											];
-										context_lookup_offset2 =
-											Context.lookupOffsets[
-												context_mode + 1
-											];
-									}
-									context =
-										Context.lookup[
-											context_lookup_offset1 + prev_byte1
-										] |
-										Context.lookup[
-											context_lookup_offset2 + prev_byte2
-										];
-									literal_htree_index =
-										context_map[
-											context_map_slice + context
-										];
-									--block_length[ 0 ];
-									prev_byte2 = prev_byte1;
-									prev_byte1 = ReadSymbol(
-										hgroup[ 0 ].codes,
-										hgroup[ 0 ].htrees[
-											literal_htree_index
-										],
-										br
-									);
-									ringbuffer[ pos & ringbuffer_mask ] =
-										prev_byte1;
-									if (
-										( pos & ringbuffer_mask ) ===
-										ringbuffer_mask
-									) {
-										output.write(
-											ringbuffer,
-											ringbuffer_size
-										);
-									}
-									++pos;
-								}
-								meta_block_remaining_len -= insert_length;
-								if ( meta_block_remaining_len <= 0 ) break;
-
-								if ( distance_code < 0 ) {
-									var context;
-
-									br.readMoreInput();
-									if ( block_length[ 2 ] === 0 ) {
-										DecodeBlockType(
-											num_block_types[ 2 ],
-											block_type_trees,
-											2,
-											block_type,
-											block_type_rb,
-											block_type_rb_index,
-											br
-										);
-										block_length[ 2 ] = ReadBlockLength(
-											block_len_trees,
-											2 * HUFFMAN_MAX_TABLE_SIZE,
-											br
-										);
-										dist_context_offset =
-											block_type[ 2 ] <<
-											kDistanceContextBits;
-										dist_context_map_slice =
-											dist_context_offset;
-									}
-									--block_length[ 2 ];
-									context =
-										( copy_length > 4
-											? 3
-											: copy_length - 2 ) & 0xff;
-									dist_htree_index =
-										dist_context_map[
-											dist_context_map_slice + context
-										];
-									distance_code = ReadSymbol(
-										hgroup[ 2 ].codes,
-										hgroup[ 2 ].htrees[ dist_htree_index ],
-										br
-									);
-									if (
-										distance_code >=
-										num_direct_distance_codes
-									) {
-										var nbits;
-										var postfix;
-										var offset;
-										distance_code -=
-											num_direct_distance_codes;
-										postfix =
-											distance_code &
-											distance_postfix_mask;
-										distance_code >>= distance_postfix_bits;
-										nbits = ( distance_code >> 1 ) + 1;
-										offset =
-											( ( 2 + ( distance_code & 1 ) ) <<
-												nbits ) -
-											4;
-										distance_code =
-											num_direct_distance_codes +
-											( ( offset +
-												br.readBits( nbits ) ) <<
-												distance_postfix_bits ) +
-											postfix;
-									}
-								}
-
-								/* Convert the distance code to the actual distance by possibly looking */
-								/* up past distnaces from the ringbuffer. */
-								distance = TranslateShortCodes(
-									distance_code,
-									dist_rb,
-									dist_rb_idx
-								);
-								if ( distance < 0 ) {
-									throw new Error(
-										'[BrotliDecompress] invalid distance'
-									);
-								}
-
-								if (
-									pos < max_backward_distance &&
-									max_distance !== max_backward_distance
-								) {
-									max_distance = pos;
-								} else {
-									max_distance = max_backward_distance;
-								}
-
-								copy_dst = pos & ringbuffer_mask;
-
-								if ( distance > max_distance ) {
-									if (
-										copy_length >=
-											BrotliDictionary.minDictionaryWordLength &&
-										copy_length <=
-											BrotliDictionary.maxDictionaryWordLength
-									) {
-										var offset =
-											BrotliDictionary.offsetsByLength[
-												copy_length
-											];
-										var word_id =
-											distance - max_distance - 1;
-										var shift =
-											BrotliDictionary.sizeBitsByLength[
-												copy_length
-											];
-										var mask = ( 1 << shift ) - 1;
-										var word_idx = word_id & mask;
-										var transform_idx = word_id >> shift;
-										offset += word_idx * copy_length;
-										if (
-											transform_idx <
-											Transform.kNumTransforms
-										) {
-											var len =
-												Transform.transformDictionaryWord(
-													ringbuffer,
-													copy_dst,
-													offset,
-													copy_length,
-													transform_idx
-												);
-											copy_dst += len;
-											pos += len;
-											meta_block_remaining_len -= len;
-											if ( copy_dst >= ringbuffer_end ) {
-												output.write(
-													ringbuffer,
-													ringbuffer_size
-												);
-
-												for (
-													var _x = 0;
-													_x <
-													copy_dst - ringbuffer_end;
-													_x++
-												)
-													ringbuffer[ _x ] =
-														ringbuffer[
-															ringbuffer_end + _x
-														];
-											}
-										} else {
-											throw new Error(
-												'Invalid backward reference. pos: ' +
-													pos +
-													' distance: ' +
-													distance +
-													' len: ' +
-													copy_length +
-													' bytes left: ' +
-													meta_block_remaining_len
-											);
-										}
-									} else {
-										throw new Error(
-											'Invalid backward reference. pos: ' +
-												pos +
-												' distance: ' +
-												distance +
-												' len: ' +
-												copy_length +
-												' bytes left: ' +
-												meta_block_remaining_len
-										);
-									}
-								} else {
-									if ( distance_code > 0 ) {
-										dist_rb[ dist_rb_idx & 3 ] = distance;
-										++dist_rb_idx;
-									}
-
-									if (
-										copy_length > meta_block_remaining_len
-									) {
-										throw new Error(
-											'Invalid backward reference. pos: ' +
-												pos +
-												' distance: ' +
-												distance +
-												' len: ' +
-												copy_length +
-												' bytes left: ' +
-												meta_block_remaining_len
-										);
-									}
-
-									for ( j = 0; j < copy_length; ++j ) {
-										ringbuffer[ pos & ringbuffer_mask ] =
-											ringbuffer[
-												( pos - distance ) &
-													ringbuffer_mask
-											];
-										if (
-											( pos & ringbuffer_mask ) ===
-											ringbuffer_mask
-										) {
-											output.write(
-												ringbuffer,
-												ringbuffer_size
-											);
-										}
-										++pos;
-										--meta_block_remaining_len;
-									}
-								}
-
-								/* When we get here, we must have inserted at least one literal and */
-								/* made a copy of at least length two, therefore accessing the last 2 */
-								/* bytes is valid. */
-								prev_byte1 =
-									ringbuffer[ ( pos - 1 ) & ringbuffer_mask ];
-								prev_byte2 =
-									ringbuffer[ ( pos - 2 ) & ringbuffer_mask ];
-							}
-
-							/* Protect pos from overflow, wrap it around at every GB of input data */
-							pos &= 0x3fffffff;
-						}
-
-						output.write( ringbuffer, pos & ringbuffer_mask );
-					}
-
-					exports.BrotliDecompress = BrotliDecompress;
-
-					BrotliDictionary.init();
-				},
-				{
-					'./bit_reader': 1,
-					'./context': 2,
-					'./dictionary': 6,
-					'./huffman': 7,
-					'./prefix': 9,
-					'./streams': 10,
-					'./transform': 11,
-				},
-			],
-			4: [
-				function ( require, module, exports ) {
-					var base64 = require( 'base64-js' );
-					//var fs = require('fs');
-
-					/**
-					 * The normal dictionary-data.js is quite large, which makes it
-					 * unsuitable for browser usage. In order to make it smaller,
-					 * we read dictionary.bin, which is a compressed version of
-					 * the dictionary, and on initial load, Brotli decompresses
-					 * it's own dictionary. 😜
-					 */
-					exports.init = function () {
-						var BrotliDecompressBuffer =
-							require( './decode' ).BrotliDecompressBuffer;
-						var compressed = base64.toByteArray(
-							require( './dictionary.bin.js' )
-						);
-						return BrotliDecompressBuffer( compressed );
-					};
-				},
-				{ './decode': 3, './dictionary.bin.js': 5, 'base64-js': 8 },
-			],
-			5: [
-				function ( require, module, exports ) {
-					module.exports =
-						'W5/fcQLn5gKf2XUbAiQ1XULX+TZz6ADToDsgqk6qVfeC0e4m6OO2wcQ1J76ZBVRV1fRkEsdu//62zQsFEZWSTCnMhcsQKlS2qOhuVYYMGCkV0fXWEoMFbESXrKEZ9wdUEsyw9g4bJlEt1Y6oVMxMRTEVbCIwZzJzboK5j8m4YH02qgXYhv1V+PM435sLVxyHJihaJREEhZGqL03txGFQLm76caGO/ovxKvzCby/3vMTtX/459f0igi7WutnKiMQ6wODSoRh/8Lx1V3Q99MvKtwB6bHdERYRY0hStJoMjNeTsNX7bn+Y7e4EQ3bf8xBc7L0BsyfFPK43dGSXpL6clYC/I328h54/VYrQ5i0648FgbGtl837svJ35L3Mot/+nPlNpWgKx1gGXQYqX6n+bbZ7wuyCHKcUok12Xjqub7NXZGzqBx0SD+uziNf87t7ve42jxSKQoW3nyxVrWIGlFShhCKxjpZZ5MeGna0+lBkk+kaN8F9qFBAFgEogyMBdcX/T1W/WnMOi/7ycWUQloEBKGeC48MkiwqJkJO+12eQiOFHMmck6q/IjWW3RZlany23TBm+cNr/84/oi5GGmGBZWrZ6j+zykVozz5fT/QH/Da6WTbZYYPynVNO7kxzuNN2kxKKWche5WveitPKAecB8YcAHz/+zXLjcLzkdDSktNIDwZE9J9X+tto43oJy65wApM3mDzYtCwX9lM+N5VR3kXYo0Z3t0TtXfgBFg7gU8oN0Dgl7fZlUbhNll+0uuohRVKjrEd8egrSndy5/Tgd2gqjA4CAVuC7ESUmL3DZoGnfhQV8uwnpi8EGvAVVsowNRxPudck7+oqAUDkwZopWqFnW1riss0t1z6iCISVKreYGNvQcXv+1L9+jbP8cd/dPUiqBso2q+7ZyFBvENCkkVr44iyPbtOoOoCecWsiuqMSML5lv+vN5MzUr+Dnh73G7Q1YnRYJVYXHRJaNAOByiaK6CusgFdBPE40r0rvqXV7tksKO2DrHYXBTv8P5ysqxEx8VDXUDDqkPH6NNOV/a2WH8zlkXRELSa8P+heNyJBBP7PgsG1EtWtNef6/i+lcayzQwQCsduidpbKfhWUDgAEmyhGu/zVTacI6RS0zTABrOYueemnVa19u9fT23N/Ta6RvTpof5DWygqreCqrDAgM4LID1+1T/taU6yTFVLqXOv+/MuQOFnaF8vLMKD7tKWDoBdALgxF33zQccCcdHx8fKIVdW69O7qHtXpeGr9jbbpFA+qRMWr5hp0s67FPc7HAiLV0g0/peZlW7hJPYEhZyhpSwahnf93/tZgfqZWXFdmdXBzqxGHLrQKxoAY6fRoBhgCRPmmGueYZ5JexTVDKUIXzkG/fqp/0U3hAgQdJ9zumutK6nqWbaqvm1pgu03IYR+G+8s0jDBBz8cApZFSBeuWasyqo2OMDKAZCozS+GWSvL/HsE9rHxooe17U3s/lTE+VZAk4j3dp6uIGaC0JMiqR5CUsabPyM0dOYDR7Ea7ip4USZlya38YfPtvrX/tBlhHilj55nZ1nfN24AOAi9BVtz/Mbn8AEDJCqJgsVUa6nQnSxv2Fs7l/NlCzpfYEjmPrNyib/+t0ei2eEMjvNhLkHCZlci4WhBe7ePZTmzYqlY9+1pxtS4GB+5lM1BHT9tS270EWUDYFq1I0yY/fNiAk4bk9yBgmef/f2k6AlYQZHsNFnW8wBQxCd68iWv7/35bXfz3JZmfGligWAKRjIs3IpzxQ27vAglHSiOzCYzJ9L9A1CdiyFvyR66ucA4jKifu5ehwER26yV7HjKqn5Mfozo7Coxxt8LWWPT47BeMxX8p0Pjb7hZn+6bw7z3Lw+7653j5sI8CLu5kThpMlj1m4c2ch3jGcP1FsT13vuK3qjecKTZk2kHcOZY40UX+qdaxstZqsqQqgXz+QGF99ZJLqr3VYu4aecl1Ab5GmqS8k/GV5b95zxQ5d4EfXUJ6kTS/CXF/aiqKDOT1T7Jz5z0PwDUcwr9clLN1OJGCiKfqvah+h3XzrBOiLOW8wvn8gW6qE8vPxi+Efv+UH55T7PQFVMh6cZ1pZQlzJpKZ7P7uWvwPGJ6DTlR6wbyj3Iv2HyefnRo/dv7dNx+qaa0N38iBsR++Uil7Wd4afwDNsrzDAK4fXZwvEY/jdKuIKXlfrQd2C39dW7ntnRbIp9OtGy9pPBn/V2ASoi/2UJZfS+xuGLH8bnLuPlzdTNS6zdyk8Dt/h6sfOW5myxh1f+zf3zZ3MX/mO9cQPp5pOx967ZA6/pqHvclNfnUFF+rq+Vd7alKr6KWPcIDhpn6v2K6NlUu6LrKo8b/pYpU/Gazfvtwhn7tEOUuXht5rUJdSf6sLjYf0VTYDgwJ81yaqKTUYej/tbHckSRb/HZicwGJqh1mAHB/IuNs9dc9yuvF3D5Xocm3elWFdq5oEy70dYFit79yaLiNjPj5UUcVmZUVhQEhW5V2Z6Cm4HVH/R8qlamRYwBileuh07CbEce3TXa2JmXWBf+ozt319psboobeZhVnwhMZzOeQJzhpTDbP71Tv8HuZxxUI/+ma3XW6DFDDs4+qmpERwHGBd2edxwUKlODRdUWZ/g0GOezrbzOZauFMai4QU6GVHV6aPNBiBndHSsV4IzpvUiiYyg6OyyrL4Dj5q/Lw3N5kAwftEVl9rNd7Jk5PDij2hTH6wIXnsyXkKePxbmHYgC8A6an5Fob/KH5GtC0l4eFso+VpxedtJHdHpNm+Bvy4C79yVOkrZsLrQ3OHCeB0Ra+kBIRldUGlDCEmq2RwXnfyh6Dz+alk6eftI2n6sastRrGwbwszBeDRS/Fa/KwRJkCzTsLr/JCs5hOPE/MPLYdZ1F1fv7D+VmysX6NpOC8aU9F4Qs6HvDyUy9PvFGDKZ/P5101TYHFl8pjj6wm/qyS75etZhhfg0UEL4OYmHk6m6dO192AzoIyPSV9QedDA4Ml23rRbqxMPMxf7FJnDc5FTElVS/PyqgePzmwVZ26NWhRDQ+oaT7ly7ell4s3DypS1s0g+tOr7XHrrkZj9+x/mJBttrLx98lFIaRZzHz4aC7r52/JQ4VjHahY2/YVXZn/QC2ztQb/sY3uRlyc5vQS8nLPGT/n27495i8HPA152z7Fh5aFpyn1GPJKHuPL8Iw94DuW3KjkURAWZXn4EQy89xiKEHN1mk/tkM4gYDBxwNoYvRfE6LFqsxWJtPrDGbsnLMap3Ka3MUoytW0cvieozOmdERmhcqzG+3HmZv2yZeiIeQTKGdRT4HHNxekm1tY+/n06rGmFleqLscSERzctTKM6G9P0Pc1RmVvrascIxaO1CQCiYPE15bD7c3xSeW7gXxYjgxcrUlcbIvO0r+Yplhx0kTt3qafDOmFyMjgGxXu73rddMHpV1wMubyAGcf/v5dLr5P72Ta9lBF+fzMJrMycwv+9vnU3ANIl1cH9tfW7af8u0/HG0vV47jNFXzFTtaha1xvze/s8KMtCYucXc1nzfd/MQydUXn/b72RBt5wO/3jRcMH9BdhC/yctKBIveRYPrNpDWqBsO8VMmP+WvRaOcA4zRMR1PvSoO92rS7pYEv+fZfEfTMzEdM+6X5tLlyxExhqLRkms5EuLovLfx66de5fL2/yX02H52FPVwahrPqmN/E0oVXnsCKhbi/yRxX83nRbUKWhzYceXOntfuXn51NszJ6MO73pQf5Pl4in3ec4JU8hF7ppV34+mm9r1LY0ee/i1O1wpd8+zfLztE0cqBxggiBi5Bu95v9l3r9r/U5hweLn+TbfxowrWDqdJauKd8+q/dH8sbPkc9ttuyO94f7/XK/nHX46MPFLEb5qQlNPvhJ50/59t9ft3LXu7uVaWaO2bDrDCnRSzZyWvFKxO1+vT8MwwunR3bX0CkfPjqb4K9O19tn5X50PvmYpEwHtiW9WtzuV/s76B1zvLLNkViNd8ySxIl/3orfqP90TyTGaf7/rx8jQzeHJXdmh/N6YDvbvmTBwCdxfEQ1NcL6wNMdSIXNq7b1EUzRy1/Axsyk5p22GMG1b+GxFgbHErZh92wuvco0AuOLXct9hvw2nw/LqIcDRRmJmmZzcgUa7JpM/WV/S9IUfbF56TL2orzqwebdRD8nIYNJ41D/hz37Fo11p2Y21wzPcn713qVGhqtevStYfGH4n69OEJtPvbbLYWvscDqc3Hgnu166+tAyLnxrX0Y5zoYjV++1sI7t5kMr02KT/+uwtkc+rZLOf/qn/s3nYCf13Dg8/sB2diJgjGqjQ+TLhxbzyue2Ob7X6/9lUwW7a+lbznHzOYy8LKW1C/uRPbQY3KW/0gO9LXunHLvPL97afba9bFtc9hmz7GAttjVYlCvQAiOwAk/gC5+hkLEs6tr3AZKxLJtOEwk2dLxTYWsIB/j/ToWtIWzo906FrSG8iaqqqqqqiIiIiAgzMzMzNz+AyK+01/zi8n8S+Y1MjoRaQ80WU/G8MBlO+53VPXANrWm4wzGUVZUjjBJZVdhpcfkjsmcWaO+UEldXi1e+zq+HOsCpknYshuh8pOLISJun7TN0EIGW2xTnlOImeecnoGW4raxe2G1T3HEvfYUYMhG+gAFOAwh5nK8mZhwJMmN7r224QVsNFvZ87Z0qatvknklyPDK3Hy45PgVKXji52Wen4d4PlFVVYGnNap+fSpFbK90rYnhUc6n91Q3AY9E0tJOFrcfZtm/491XbcG/jsViUPPX76qmeuiz+qY1Hk7/1VPM405zWVuoheLUimpWYdVzCmUdKHebMdzgrYrb8mL2eeLSnRWHdonfZa8RsOU9F37w+591l5FLYHiOqWeHtE/lWrBHcRKp3uhtr8yXm8LU/5ms+NM6ZKsqu90cFZ4o58+k4rdrtB97NADFbwmEG7lXqvirhOTOqU14xuUF2myIjURcPHrPOQ4lmM3PeMg7bUuk0nnZi67bXsU6H8lhqIo8TaOrEafCO1ARK9PjC0QOoq2BxmMdgYB9G/lIb9++fqNJ2s7BHGFyBNmZAR8J3KCo012ikaSP8BCrf6VI0X5xdnbhHIO+B5rbOyB54zXkzfObyJ4ecwxfqBJMLFc7m59rNcw7hoHnFZ0b00zee+gTqvjm61Pb4xn0kcDX4jvHM0rBXZypG3DCKnD/Waa/ZtHmtFPgO5eETx+k7RrVg3aSwm2YoNXnCs3XPQDhNn+Fia6IlOOuIG6VJH7TP6ava26ehKHQa2T4N0tcZ9dPCGo3ZdnNltsHQbeYt5vPnJezV/cAeNypdml1vCHI8M81nSRP5Qi2+mI8v/sxiZru9187nRtp3f/42NemcONa+4eVC3PCZzc88aZh851CqSsshe70uPxeN/dmYwlwb3trwMrN1Gq8jbnApcVDx/yDPeYs5/7r62tsQ6lLg+DiFXTEhzR9dHqv0iT4tgj825W+H3XiRUNUZT2kR9Ri0+lp+UM3iQtS8uOE23Ly4KYtvqH13jghUntJRAewuzNLDXp8RxdcaA3cMY6TO2IeSFRXezeWIjCqyhsUdMYuCgYTZSKpBype1zRfq8FshvfBPc6BAQWl7/QxIDp3VGo1J3vn42OEs3qznws+YLRXbymyB19a9XBx6n/owcyxlEYyFWCi+kG9F+EyD/4yn80+agaZ9P7ay2Dny99aK2o91FkfEOY8hBwyfi5uwx2y5SaHmG+oq/zl1FX/8irOf8Y3vAcX/6uLP6A6nvMO24edSGPjQc827Rw2atX+z2bKq0CmW9mOtYnr5/AfDa1ZfPaXnKtlWborup7QYx+Or2uWb+N3N//2+yDcXMqIJdf55xl7/vsj4WoPPlxLxtVrkJ4w/tTe3mLdATOOYwxcq52w5Wxz5MbPdVs5O8/lhfE7dPj0bIiPQ3QV0iqm4m3YX8hRfc6jQ3fWepevMqUDJd86Z4vwM40CWHnn+WphsGHfieF02D3tmZvpWD+kBpNCFcLnZhcmmrhpGzzbdA+sQ1ar18OJD87IOKOFoRNznaHPNHUfUNhvY1iU+uhvEvpKHaUn3qK3exVVyX4joipp3um7FmYJWmA+WbIDshRpbVRx5/nqstCgy87FGbfVB8yDGCqS+2qCsnRwnSAN6zgzxfdB2nBT/vZ4/6uxb6oH8b4VBRxiIB93wLa47hG3w2SL/2Z27yOXJFwZpSJaBYyvajA7vRRYNKqljXKpt/CFD/tSMr18DKKbwB0xggBePatl1nki0yvqW5zchlyZmJ0OTxJ3D+fsYJs/mxYN5+Le5oagtcl+YsVvy8kSjI2YGvGjvmpkRS9W2dtXqWnVuxUhURm1lKtou/hdEq19VBp9OjGvHEQSmrpuf2R24mXGheil8KeiANY8fW1VERUfBImb64j12caBZmRViZHbeVMjCrPDg9A90IXrtnsYCuZtRQ0PyrKDjBNOsPfKsg1pA02gHlVr0OXiFhtp6nJqXVzcbfM0KnzC3ggOENPE9VBdmHKN6LYaijb4wXxJn5A0FSDF5j+h1ooZx885Jt3ZKzO5n7Z5WfNEOtyyPqQEnn7WLv5Fis3PdgMshjF1FRydbNyeBbyKI1oN1TRVrVK7kgsb/zjX4NDPIRMctVeaxVB38Vh1x5KbeJbU138AM5KzmZu3uny0ErygxiJF7GVXUrPzFxrlx1uFdAaZFDN9cvIb74qD9tzBMo7L7WIEYK+sla1DVMHpF0F7b3+Y6S+zjvLeDMCpapmJo1weBWuxKF3rOocih1gun4BoJh1kWnV/Jmiq6uOhK3VfKxEHEkafjLgK3oujaPzY6SXg8phhL4TNR1xvJd1Wa0aYFfPUMLrNBDCh4AuGRTbtKMc6Z1Udj8evY/ZpCuMAUefdo69DZUngoqE1P9A3PJfOf7WixCEj+Y6t7fYeHbbxUAoFV3M89cCKfma3fc1+jKRe7MFWEbQqEfyzO2x/wrO2VYH7iYdQ9BkPyI8/3kXBpLaCpU7eC0Yv/am/tEDu7HZpqg0EvHo0nf/R/gRzUWy33/HXMJQeu1GylKmOkXzlCfGFruAcPPhaGqZOtu19zsJ1SO2Jz4Ztth5cBX6mRQwWmDwryG9FUMlZzNckMdK+IoMJv1rOWnBamS2w2KHiaPMPLC15hCZm4KTpoZyj4E2TqC/P6r7/EhnDMhKicZZ1ZwxuC7DPzDGs53q8gXaI9kFTK+2LTq7bhwsTbrMV8Rsfua5lMS0FwbTitUVnVa1yTb5IX51mmYnUcP9wPr8Ji1tiYJeJV9GZTrQhF7vvdU2OTU42ogJ9FDwhmycI2LIg++03C6scYhUyUuMV5tkw6kGUoL+mjNC38+wMdWNljn6tGPpRES7veqrSn5TRuv+dh6JVL/iDHU1db4c9WK3++OrH3PqziF916UMUKn8G67nN60GfWiHrXYhUG3yVWmyYak59NHj8t1smG4UDiWz2rPHNrKnN4Zo1LBbr2/eF9YZ0n0blx2nG4X+EKFxvS3W28JESD+FWk61VCD3z/URGHiJl++7TdBwkCj6tGOH3qDb0QqcOF9Kzpj0HUb/KyFW3Yhj2VMKJqGZleFBH7vqvf7WqLC3XMuHV8q8a4sTFuxUtkD/6JIBvKaVjv96ndgruKZ1k/BHzqf2K9fLk7HGXANyLDd1vxkK/i055pnzl+zw6zLnwXlVYVtfmacJgEpRP1hbGgrYPVN6v2lG+idQNGmwcKXu/8xEj/P6qe/sB2WmwNp6pp8jaISMkwdleFXYK55NHWLTTbutSUqjBfDGWo/Yg918qQ+8BRZSAHZbfuNZz2O0sov1Ue4CWlVg3rFhM3Kljj9ksGd/NUhk4nH+a5UN2+1i8+NM3vRNp7uQ6sqexSCukEVlVZriHNqFi5rLm9TMWa4qm3idJqppQACol2l4VSuvWLfta4JcXy3bROPNbXOgdOhG47LC0CwW/dMlSx4Jf17aEU3yA1x9p+Yc0jupXgcMuYNku64iYOkGToVDuJvlbEKlJqsmiHbvNrIVZEH+yFdF8DbleZ6iNiWwMqvtMp/mSpwx5KxRrT9p3MAPTHGtMbfvdFhyj9vhaKcn3At8Lc16Ai+vBcSp1ztXi7rCJZx/ql7TXcclq6Q76UeKWDy9boS0WHIjUuWhPG8LBmW5y2rhuTpM5vsLt+HOLh1Yf0DqXa9tsfC+kaKt2htA0ai/L2i7RKoNjEwztkmRU0GfgW1TxUvPFhg0V7DdfWJk5gfrccpYv+MA9M0dkGTLECeYwUixRzjRFdmjG7zdZIl3XKB9YliNKI31lfa7i2JG5C8Ss+rHe0D7Z696/V3DEAOWHnQ9yNahMUl5kENWS6pHKKp2D1BaSrrHdE1w2qNxIztpXgUIrF0bm15YML4b6V1k+GpNysTahKMVrrS85lTVo9OGJ96I47eAy5rYWpRf/mIzeoYU1DKaQCTUVwrhHeyNoDqHel+lLxr9WKzhSYw7vrR6+V5q0pfi2k3L1zqkubY6rrd9ZLvSuWNf0uqnkY+FpTvFzSW9Fp0b9l8JA7THV9eCi/PY/SCZIUYx3BU2alj7Cm3VV6eYpios4b6WuNOJdYXUK3zTqj5CVG2FqYM4Z7CuIU0qO05XR0d71FHM0YhZmJmTRfLlXEumN82BGtzdX0S19t1e+bUieK8zRmqpa4Qc5TSjifmaQsY2ETLjhI36gMR1+7qpjdXXHiceUekfBaucHShAOiFXmv3sNmGQyU5iVgnoocuonQXEPTFwslHtS8R+A47StI9wj0iSrtbi5rMysczFiImsQ+bdFClnFjjpXXwMy6O7qfjOr8Fb0a7ODItisjnn3EQO16+ypd1cwyaAW5Yzxz5QknfMO7643fXW/I9y3U2xH27Oapqr56Z/tEzglj6IbT6HEHjopiXqeRbe5mQQvxtcbDOVverN0ZgMdzqRYRjaXtMRd56Q4cZSmdPvZJdSrhJ1D9zNXPqAEqPIavPdfubt5oke2kmv0dztIszSv2VYuoyf1UuopbsYb+uX9h6WpwjpgtZ6fNNawNJ4q8O3CFoSbioAaOSZMx2GYaPYB+rEb6qjQiNRFQ76TvwNFVKD+BhH9VhcKGsXzmMI7BptU/CNWolM7YzROvpFAntsiWJp6eR2d3GarcYShVYSUqhmYOWj5E96NK2WvmYNTeY7Zs4RUEdv9h9QT4EseKt6LzLrqEOs3hxAY1MaNWpSa6zZx8F3YOVeCYMS88W+CYHDuWe4yoc6YK+djDuEOrBR5lvh0r+Q9uM88lrjx9x9AtgpQVNE8r+3O6Gvw59D+kBF/UMXyhliYUtPjmvXGY6Dk3x+kEOW+GtdMVC4EZTqoS/jmR0P0LS75DOc/w2vnri97M4SdbZ8qeU7gg8DVbERkU5geaMQO3mYrSYyAngeUQqrN0C0/vsFmcgWNXNeidsTAj7/4MncJR0caaBUpbLK1yBCBNRjEv6KvuVSdpPnEMJdsRRtqJ+U8tN1gXA4ePHc6ZT0eviI73UOJF0fEZ8YaneAQqQdGphNvwM4nIqPnXxV0xA0fnCT+oAhJuyw/q8jO0y8CjSteZExwBpIN6SvNp6A5G/abi6egeND/1GTguhuNjaUbbnSbGd4L8937Ezm34Eyi6n1maeOBxh3PI0jzJDf5mh/BsLD7F2GOKvlA/5gtvxI3/eV4sLfKW5Wy+oio+es/u6T8UU+nsofy57Icb/JlZHPFtCgd/x+bwt3ZT+xXTtTtTrGAb4QehC6X9G+8YT+ozcLxDsdCjsuOqwPFnrdLYaFc92Ui0m4fr39lYmlCaqTit7G6O/3kWDkgtXjNH4BiEm/+jegQnihOtfffn33WxsFjhfMd48HT+f6o6X65j7XR8WLSHMFkxbvOYsrRsF1bowDuSQ18Mkxk4qz2zoGPL5fu9h2Hqmt1asl3Q3Yu3szOc+spiCmX4AETBM3pLoTYSp3sVxahyhL8eC4mPN9k2x3o0xkiixIzM3CZFzf5oR4mecQ5+ax2wCah3/crmnHoqR0+KMaOPxRif1oEFRFOO/kTPPmtww+NfMXxEK6gn6iU32U6fFruIz8Q4WgljtnaCVTBgWx7diUdshC9ZEa5yKpRBBeW12r/iNc/+EgNqmhswNB8SBoihHXeDF7rrWDLcmt3V8GYYN7pXRy4DZjj4DJuUBL5iC3DQAaoo4vkftqVTYRGLS3mHZ7gdmdTTqbgNN/PTdTCOTgXolc88MhXAEUMdX0iy1JMuk5wLsgeu0QUYlz2S4skTWwJz6pOm/8ihrmgGfFgri+ZWUK2gAPHgbWa8jaocdSuM4FJYoKicYX/ZSENkg9Q1ZzJfwScfVnR2DegOGwCvmogaWJCLQepv9WNlU6QgsmOwICquU28Mlk3d9W5E81lU/5Ez0LcX6lwKMWDNluNKfBDUy/phJgBcMnfkh9iRxrdOzgs08JdPB85Lwo+GUSb4t3nC+0byqMZtO2fQJ4U2zGIr49t/28qmmGv2RanDD7a3FEcdtutkW8twwwlUSpb8QalodddbBfNHKDQ828BdE7OBgFdiKYohLawFYqpybQoxATZrheLhdI7+0Zlu9Q1myRcd15r9UIm8K2LGJxqTegntqNVMKnf1a8zQiyUR1rxoqjiFxeHxqFcYUTHfDu7rhbWng6qOxOsI+5A1p9mRyEPdVkTlE24vY54W7bWc6jMgZvNXdfC9/9q7408KDsbdL7Utz7QFSDetz2picArzrdpL8OaCHC9V26RroemtDZ5yNM/KGkWMyTmfnInEvwtSD23UcFcjhaE3VKzkoaEMKGBft4XbIO6forTY1lmGQwVmKicBCiArDzE+1oIxE08fWeviIOD5TznqH+OoHadvoOP20drMPe5Irg3XBQziW2XDuHYzjqQQ4wySssjXUs5H+t3FWYMHppUnBHMx/nYIT5d7OmjDbgD9F6na3m4l7KdkeSO3kTEPXafiWinogag7b52taiZhL1TSvBFmEZafFq2H8khQaZXuitCewT5FBgVtPK0j4xUHPfUz3Q28eac1Z139DAP23dgki94EC8vbDPTQC97HPPSWjUNG5tWKMsaxAEMKC0665Xvo1Ntd07wCLNf8Q56mrEPVpCxlIMVlQlWRxM3oAfpgIc+8KC3rEXUog5g06vt7zgXY8grH7hhwVSaeuvC06YYRAwpbyk/Unzj9hLEZNs2oxPQB9yc+GnL6zTgq7rI++KDJwX2SP8Sd6YzTuw5lV/kU6eQxRD12omfQAW6caTR4LikYkBB1CMOrvgRr/VY75+NSB40Cni6bADAtaK+vyxVWpf9NeKJxN2KYQ8Q2xPB3K1s7fuhvWbr2XpgW044VD6DRs0qXoqKf1NFsaGvKJc47leUV3pppP/5VTKFhaGuol4Esfjf5zyCyUHmHthChcYh4hYLQF+AFWsuq4t0wJyWgdwQVOZiV0efRHPoK5+E1vjz9wTJmVkITC9oEstAsyZSgE/dbicwKr89YUxKZI+owD205Tm5lnnmDRuP/JnzxX3gMtlrcX0UesZdxyQqYQuEW4R51vmQ5xOZteUd8SJruMlTUzhtVw/Nq7eUBcqN2/HVotgfngif60yKEtoUx3WYOZlVJuJOh8u59fzSDPFYtQgqDUAGyGhQOAvKroXMcOYY0qjnStJR/G3aP+Jt1sLVlGV8POwr/6OGsqetnyF3TmTqZjENfnXh51oxe9qVUw2M78EzAJ+IM8lZ1MBPQ9ZWSVc4J3mWSrLKrMHReA5qdGoz0ODRsaA+vwxXA2cAM4qlfzBJA6581m4hzxItQw5dxrrBL3Y6kCbUcFxo1S8jyV44q//+7ASNNudZ6xeaNOSIUffqMn4A9lIjFctYn2gpEPAb3f7p3iIBN8H14FUGQ9ct2hPsL+cEsTgUrR47uJVN4n4wt/wgfwwHuOnLd4yobkofy8JvxSQTA7rMpDIc608SlZFJfZYcmbT0tAHpPE8MrtQ42siTUNWxqvWZOmvu9f0JPoQmg+6l7sZWwyfi6PXkxJnwBraUG0MYG4zYHQz3igy/XsFkx5tNQxw43qvI9dU3f0DdhOUlHKjmi1VAr2Kiy0HZwD8VeEbhh0OiDdMYspolQsYdSwjCcjeowIXNZVUPmL2wwIkYhmXKhGozdCJ4lRKbsf4NBh/XnQoS92NJEWOVOFs2YhN8c5QZFeK0pRdAG40hqvLbmoSA8xQmzOOEc7wLcme9JOsjPCEgpCwUs9E2DohMHRhUeyGIN6TFvrbny8nDuilsDpzrH5mS76APoIEJmItS67sQJ+nfwddzmjPxcBEBBCw0kWDwd0EZCkNeOD7NNQhtBm7KHL9mRxj6U1yWU2puzlIDtpYxdH4ZPeXBJkTGAJfUr/oTCz/iypY6uXaR2V1doPxJYlrw2ghH0D5gbrhFcIxzYwi4a/4hqVdf2DdxBp6vGYDjavxMAAoy+1+3aiO6S3W/QAKNVXagDtvsNtx7Ks+HKgo6U21B+QSZgIogV5Bt+BnXisdVfy9VyXV+2P5fMuvdpAjM1o/K9Z+XnE4EOCrue+kcdYHqAQ0/Y/OmNlQ6OI33jH/uD1RalPaHpJAm2av0/xtpqdXVKNDrc9F2izo23Wu7firgbURFDNX9eGGeYBhiypyXZft2j3hTvzE6PMWKsod//rEILDkzBXfi7xh0eFkfb3/1zzPK/PI5Nk3FbZyTl4mq5BfBoVoqiPHO4Q4QKZAlrQ3MdNfi3oxIjvsM3kAFv3fdufurqYR3PSwX/mpGy/GFI/B2MNPiNdOppWVbs/gjF3YH+QA9jMhlAbhvasAHstB0IJew09iAkmXHl1/TEj+jvHOpOGrPRQXbPADM+Ig2/OEcUcpgPTItMtW4DdqgfYVI/+4hAFWYjUGpOP/UwNuB7+BbKOcALbjobdgzeBQfjgNSp2GOpxzGLj70Vvq5cw2AoYENwKLUtJUX8sGRox4dVa/TN4xKwaKcl9XawQR/uNus700Hf17pyNnezrUgaY9e4MADhEDBpsJT6y1gDJs1q6wlwGhuUzGR7C8kgpjPyHWwsvrf3yn1zJEIRa5eSxoLAZOCR9xbuztxFRJW9ZmMYfCFJ0evm9F2fVnuje92Rc4Pl6A8bluN8MZyyJGZ0+sNSb//DvAFxC2BqlEsFwccWeAl6CyBcQV1bx4mQMBP1Jxqk1EUADNLeieS2dUFbQ/c/kvwItbZ7tx0st16viqd53WsRmPTKv2AD8CUnhtPWg5aUegNpsYgasaw2+EVooeNKmrW3MFtj76bYHJm5K9gpAXZXsE5U8DM8XmVOSJ1F1WnLy6nQup+jx52bAb+rCq6y9WXl2B2oZDhfDkW7H3oYfT/4xx5VncBuxMXP2lNfhUVQjSSzSRbuZFE4vFawlzveXxaYKVs8LpvAb8IRYF3ZHiRnm0ADeNPWocwxSzNseG7NrSEVZoHdKWqaGEBz1N8Pt7kFbqh3LYmAbm9i1IChIpLpM5AS6mr6OAPHMwwznVy61YpBYX8xZDN/a+lt7n+x5j4bNOVteZ8lj3hpAHSx1VR8vZHec4AHO9XFCdjZ9eRkSV65ljMmZVzaej2qFn/qt1lvWzNZEfHxK3qOJrHL6crr0CRzMox5f2e8ALBB4UGFZKA3tN6F6IXd32GTJXGQ7DTi9j/dNcLF9jCbDcWGKxoKTYblIwbLDReL00LRcDPMcQuXLMh5YzgtfjkFK1DP1iDzzYYVZz5M/kWYRlRpig1htVRjVCknm+h1M5LiEDXOyHREhvzCGpFZjHS0RsK27o2avgdilrJkalWqPW3D9gmwV37HKmfM3F8YZj2ar+vHFvf3B8CRoH4kDHIK9mrAg+owiEwNjjd9V+FsQKYR8czJrUkf7Qoi2YaW6EVDZp5zYlqiYtuXOTHk4fAcZ7qBbdLDiJq0WNV1l2+Hntk1mMWvxrYmc8kIx8G3rW36J6Ra4lLrTOCgiOihmow+YnzUT19jbV2B3RWqSHyxkhmgsBqMYWvOcUom1jDQ436+fcbu3xf2bbeqU/ca+C4DOKE+e3qvmeMqW3AxejfzBRFVcwVYPq4L0APSWWoJu+5UYX4qg5U6YTioqQGPG9XrnuZ/BkxuYpe6Li87+18EskyQW/uA+uk2rpHpr6hut2TlVbKgWkFpx+AZffweiw2+VittkEyf/ifinS/0ItRL2Jq3tQOcxPaWO2xrG68GdFoUpZgFXaP2wYVtRc6xYCfI1CaBqyWpg4bx8OHBQwsV4XWMibZZ0LYjWEy2IxQ1mZrf1/UNbYCJplWu3nZ4WpodIGVA05d+RWSS+ET9tH3RfGGmNI1cIY7evZZq7o+a0bjjygpmR3mVfalkT/SZGT27Q8QGalwGlDOS9VHCyFAIL0a1Q7JiW3saz9gqY8lqKynFrPCzxkU4SIfLc9VfCI5edgRhDXs0edO992nhTKHriREP1NJC6SROMgQ0xO5kNNZOhMOIT99AUElbxqeZF8A3xrfDJsWtDnUenAHdYWSwAbYjFqQZ+D5gi3hNK8CSxU9i6f6ClL9IGlj1OPMQAsr84YG6ijsJpCaGWj75c3yOZKBB9mNpQNPUKkK0D6wgLH8MGoyRxTX6Y05Q4AnYNXMZwXM4eij/9WpsM/9CoRnFQXGR6MEaY+FXvXEO3RO0JaStk6OXuHVATHJE+1W+TU3bSZ2ksMtqjO0zfSJCdBv7y2d8DMx6TfVme3q0ZpTKMMu4YL/t7ciTNtdDkwPogh3Cnjx7qk08SHwf+dksZ7M2vCOlfsF0hQ6J4ehPCaHTNrM/zBSOqD83dBEBCW/F/LEmeh0nOHd7oVl3/Qo/9GUDkkbj7yz+9cvvu+dDAtx8NzCDTP4iKdZvk9MWiizvtILLepysflSvTLFBZ37RLwiriqyRxYv/zrgFd/9XVHh/OmzBvDX4mitMR/lUavs2Vx6cR94lzAkplm3IRNy4TFfu47tuYs9EQPIPVta4P64tV+sZ7n3ued3cgEx2YK+QL5+xms6osk8qQbTyuKVGdaX9FQqk6qfDnT5ykxk0VK7KZ62b6DNDUfQlqGHxSMKv1P0XN5BqMeKG1P4Wp5QfZDUCEldppoX0U6ss2jIko2XpURKCIhfaOqLPfShdtS37ZrT+jFRSH2xYVV1rmT/MBtRQhxiO4MQ3iAGlaZi+9PWBEIXOVnu9jN1f921lWLZky9bqbM3J2MAAI9jmuAx3gyoEUa6P2ivs0EeNv/OR+AX6q5SW6l5HaoFuS6jr6yg9limu+P0KYKzfMXWcQSfTXzpOzKEKpwI3YGXZpSSy2LTlMgfmFA3CF6R5c9xWEtRuCg2ZPUQ2Nb6dRFTNd4TfGHrnEWSKHPuRyiJSDAZ+KX0VxmSHjGPbQTLVpqixia2uyhQ394gBMt7C3ZAmxn/DJS+l1fBsAo2Eir/C0jG9csd4+/tp12pPc/BVJGaK9mfvr7M/CeztrmCO5qY06Edi4xAGtiEhnWAbzLy2VEyazE1J5nPmgU4RpW4Sa0TnOT6w5lgt3/tMpROigHHmexBGAMY0mdcDbDxWIz41NgdD6oxgHsJRgr5RnT6wZAkTOcStU4NMOQNemSO7gxGahdEsC+NRVGxMUhQmmM0llWRbbmFGHzEqLM4Iw0H7577Kyo+Zf+2cUFIOw93gEY171vQaM0HLwpjpdRR6Jz7V0ckE7XzYJ0TmY9znLdzkva0vNrAGGT5SUZ5uaHDkcGvI0ySpwkasEgZPMseYcu85w8HPdSNi+4T6A83iAwDbxgeFcB1ZM2iGXzFcEOUlYVrEckaOyodfvaYSQ7GuB4ISE0nYJc15X/1ciDTPbPCgYJK55VkEor4LvzL9S2WDy4xj+6FOqVyTAC2ZNowheeeSI5hA/02l8UYkv4nk9iaVn+kCVEUstgk5Hyq+gJm6R9vG3rhuM904he/hFmNQaUIATB1y3vw+OmxP4X5Yi6A5I5jJufHCjF9+AGNwnEllZjUco6XhsO5T5+R3yxz5yLVOnAn0zuS+6zdj0nTJbEZCbXJdtpfYZfCeCOqJHoE2vPPFS6eRLjIJlG69X93nfR0mxSFXzp1Zc0lt/VafDaImhUMtbnqWVb9M4nGNQLN68BHP7AR8Il9dkcxzmBv8PCZlw9guY0lurbBsmNYlwJZsA/B15/HfkbjbwPddaVecls/elmDHNW2r4crAx43feNkfRwsaNq/yyJ0d/p5hZ6AZajz7DBfUok0ZU62gCzz7x8eVfJTKA8IWn45vINLSM1q+HF9CV9qF3zP6Ml21kPPL3CXzkuYUlnSqT+Ij4tI/od5KwIs+tDajDs64owN7tOAd6eucGz+KfO26iNcBFpbWA5732bBNWO4kHNpr9D955L61bvHCF/mwSrz6eQaDjfDEANqGMkFc+NGxpKZzCD2sj/JrHd+zlPQ8Iz7Q+2JVIiVCuCKoK/hlAEHzvk/Piq3mRL1rT/fEh9hoT5GJmeYswg1otiKydizJ/fS2SeKHVu6Z3JEHjiW8NaTQgP5xdBli8nC57XiN9hrquBu99hn9zqwo92+PM2JXtpeVZS0PdqR5mDyDreMMtEws+CpwaRyyzoYtfcvt9PJIW0fJVNNi/FFyRsea7peLvJrL+5b4GOXJ8tAr+ATk9f8KmiIsRhqRy0vFzwRV3Z5dZ3QqIU8JQ/uQpkJbjMUMFj2F9sCFeaBjI4+fL/oN3+LQgjI4zuAfQ+3IPIPFQBccf0clJpsfpnBxD84atwtupkGqKvrH7cGNl/QcWcSi6wcVDML6ljOgYbo+2BOAWNNjlUBPiyitUAwbnhFvLbnqw42kR3Yp2kv2dMeDdcGOX5kT4S6M44KHEB/SpCfl7xgsUvs+JNY9G3O2X/6FEt9FyAn57lrbiu+tl83sCymSvq9eZbe9mchL7MTf/Ta78e80zSf0hYY5eUU7+ff14jv7Xy8qjzfzzzvaJnrIdvFb5BLWKcWGy5/w7+vV2cvIfwHqdTB+RuJK5oj9mbt0Hy94AmjMjjwYNZlNS6uiyxNnwNyt3gdreLb64p/3+08nXkb92LTkkRgFOwk1oGEVllcOj5lv1hfAZywDows0944U8vUFw+A/nuVq/UCygsrmWIBnHyU01d0XJPwriEOvx/ISK6Pk4y2w0gmojZs7lU8TtakBAdne4v/aNxmMpK4VcGMp7si0yqsiolXRuOi1Z1P7SqD3Zmp0CWcyK4Ubmp2SXiXuI5nGLCieFHKHNRIlcY3Pys2dwMTYCaqlyWSITwr2oGXvyU3h1Pf8eQ3w1bnD7ilocVjYDkcXR3Oo1BXgMLTUjNw2xMVwjtp99NhSVc5aIWrDQT5DHPKtCtheBP4zHcw4dz2eRdTMamhlHhtfgqJJHI7NGDUw1XL8vsSeSHyKqDtqoAmrQqsYwvwi7HW3ojWyhIa5oz5xJTaq14NAzFLjVLR12rRNUQ6xohDnrWFb5bG9yf8aCD8d5phoackcNJp+Dw3Due3RM+5Rid7EuIgsnwgpX0rUWh/nqPtByMhMZZ69NpgvRTKZ62ViZ+Q7Dp5r4K0d7EfJuiy06KuIYauRh5Ecrhdt2QpTS1k1AscEHvapNbU3HL1F2TFyR33Wxb5MvH5iZsrn3SDcsxlnnshO8PLwmdGN+paWnQuORtZGX37uhFT64SeuPsx8UOokY6ON85WdQ1dki5zErsJGazcBOddWJEKqNPiJpsMD1GrVLrVY+AOdPWQneTyyP1hRX/lMM4ZogGGOhYuAdr7F/DOiAoc++cn5vlf0zkMUJ40Z1rlgv9BelPqVOpxKeOpzKdF8maK+1Vv23MO9k/8+qpLoxrIGH2EDQlnGmH8CD31G8QqlyQIcpmR5bwmSVw9/Ns6IHgulCRehvZ/+VrM60Cu/r3AontFfrljew74skYe2uyn7JKQtFQBQRJ9ryGic/zQOsbS4scUBctA8cPToQ3x6ZBQu6DPu5m1bnCtP8TllLYA0UTQNVqza5nfew3Mopy1GPUwG5jsl0OVXniPmAcmLqO5HG8Hv3nSLecE9oOjPDXcsTxoCBxYyzBdj4wmnyEV4kvFDunipS8SSkvdaMnTBN9brHUR8xdmmEAp/Pdqk9uextp1t+JrtXwpN/MG2w/qhRMpSNxQ1uhg/kKO30eQ/FyHUDkWHT8V6gGRU4DhDMxZu7xXij9Ui6jlpWmQCqJg3FkOTq3WKneCRYZxBXMNAVLQgHXSCGSqNdjebY94oyIpVjMYehAiFx/tqzBXFHZaL5PeeD74rW5OysFoUXY8sebUZleFTUa/+zBKVTFDopTReXNuZq47QjkWnxjirCommO4L/GrFtVV21EpMyw8wyThL5Y59d88xtlx1g1ttSICDwnof6lt/6zliPzgVUL8jWBjC0o2D6Kg+jNuThkAlaDJsq/AG2aKA//A76avw2KNqtv223P+Wq3StRDDNKFFgtsFukYt1GFDWooFVXitaNhb3RCyJi4cMeNjROiPEDb4k+G3+hD8tsg+5hhmSc/8t2JTSwYoCzAI75doq8QTHe+E/Tw0RQSUDlU+6uBeNN3h6jJGX/mH8oj0i3caCNsjvTnoh73BtyZpsflHLq6AfwJNCDX4S98h4+pCOhGKDhV3rtkKHMa3EG4J9y8zFWI4UsfNzC/Rl5midNn7gwoN9j23HGCQQ+OAZpTTPMdiVow740gIyuEtd0qVxMyNXhHcnuXRKdw5wDUSL358ktjMXmAkvIB73BLa1vfF9BAUZInPYJiwxqFWQQBVk7gQH4ojfUQ/KEjn+A/WR6EEe4CtbpoLe1mzHkajgTIoE0SLDHVauKhrq12zrAXBGbPPWKCt4DGedq3JyGRbmPFW32bE7T20+73BatV/qQhhBWfWBFHfhYWXjALts38FemnoT+9bn1jDBMcUMmYgSc0e7GQjv2MUBwLU8ionCpgV+Qrhg7iUIfUY6JFxR0Y+ZTCPM+rVuq0GNLyJXX6nrUTt8HzFBRY1E/FIm2EeVA9NcXrj7S6YYIChVQCWr/m2fYUjC4j0XLkzZ8GCSLfmkW3PB/xq+nlXsKVBOj7vTvqKCOMq7Ztqr3cQ+N8gBnPaAps+oGwWOkbuxnRYj/x/WjiDclVrs22xMK4qArE1Ztk1456kiJriw6abkNeRHogaPRBgbgF9Z8i/tbzWELN4CvbqtrqV9TtGSnmPS2F9kqOIBaazHYaJ9bi3AoDBvlZasMluxt0BDXfhp02Jn411aVt6S4TUB8ZgFDkI6TP6gwPY85w+oUQSsjIeXVminrwIdK2ZAawb8Se6XOJbOaliQxHSrnAeONDLuCnFejIbp4YDtBcQCwMsYiRZfHefuEJqJcwKTTJ8sx5hjHmJI1sPFHOr6W9AhZ2NAod38mnLQk1gOz2LCAohoQbgMbUK9RMEA3LkiF7Sr9tLZp6lkciIGhE2V546w3Mam53VtVkGbB9w0Yk2XiRnCmbpxmHr2k4eSC0RuNbjNsUfDIfc8DZvRvgUDe1IlKdZTzcT4ZGEb53dp8VtsoZlyXzLHOdAbsp1LPTVaHvLA0GYDFMbAW/WUBfUAdHwqLFAV+3uHvYWrCfhUOR2i89qvCBoOb48usAGdcF2M4aKn79k/43WzBZ+xR1L0uZfia70XP9soQReeuhZiUnXFDG1T8/OXNmssTSnYO+3kVLAgeiY719uDwL9FQycgLPessNihMZbAKG7qwPZyG11G1+ZA3jAX2yddpYfmaKBlmfcK/V0mwIRUDC0nJSOPUl2KB8h13F4dlVZiRhdGY5farwN+f9hEb1cRi41ZcGDn6Xe9MMSTOY81ULJyXIHSWFIQHstVYLiJEiUjktlHiGjntN5/btB8Fu+vp28zl2fZXN+dJDyN6EXhS+0yzqpl/LSJNEUVxmu7BsNdjAY0jVsAhkNuuY0E1G48ej25mSt+00yPbQ4SRCVkIwb6ISvYtmJRPz9Zt5dk76blf+lJwAPH5KDF+vHAmACLoCdG2Adii6dOHnNJnTmZtoOGO8Q1jy1veMw6gbLFToQmfJa7nT7Al89mRbRkZZQxJTKgK5Kc9INzmTJFp0tpAPzNmyL/F08bX3nhCumM/cR/2RPn9emZ3VljokttZD1zVWXlUIqEU7SLk5I0lFRU0AcENXBYazNaVzsVHA/sD3o9hm42wbHIRb/BBQTKzAi8s3+bMtpOOZgLdQzCYPfX3UUxKd1WYVkGH7lh/RBBgMZZwXzU9+GYxdBqlGs0LP+DZ5g2BWNh6FAcR944B+K/JTWI3t9YyVyRhlP4CCoUk/mmF7+r2pilVBjxXBHFaBfBtr9hbVn2zDuI0kEOG3kBx8CGdPOjX1ph1POOZJUO1JEGG0jzUy2tK4X0CgVNYhmkqqQysRNtKuPdCJqK3WW57kaV17vXgiyPrl4KEEWgiGF1euI4QkSFHFf0TDroQiLNKJiLbdhH0YBhriRNCHPxSqJmNNoketaioohqMglh6wLtEGWSM1EZbQg72h0UJAIPVFCAJOThpQGGdKfFovcwEeiBuZHN2Ob4uVM7+gwZLz1D9E7ta4RmMZ24OBBAg7Eh6dLXGofZ4U2TFOCQMKjwhVckjrydRS+YaqCw1kYt6UexuzbNEDyYLTZnrY1PzsHZJT4U+awO2xlqTSYu6n/U29O2wPXgGOEKDMSq+zTUtyc8+6iLp0ivav4FKx+xxVy4FxhIF/pucVDqpsVe2jFOfdZhTzLz2QjtzvsTCvDPU7bzDH2eXVKUV9TZ+qFtaSSxnYgYdXKwVreIgvWhT9eGDB2OvnWyPLfIIIfNnfIxU8nW7MbcH05nhlsYtaW9EZRsxWcKdEqInq1DiZPKCz7iGmAU9/ccnnQud2pNgIGFYOTAWjhIrd63aPDgfj8/sdlD4l+UTlcxTI9jbaMqqN0gQxSHs60IAcW3cH4p3V1aSciTKB29L1tz2eUQhRiTgTvmqc+sGtBNh4ky0mQJGsdycBREP+fAaSs1EREDVo5gvgi5+aCN7NECw30owbCc1mSpjiahyNVwJd1jiGgzSwfTpzf2c5XJvG/g1n0fH88KHNnf+u7ZiRMlXueSIsloJBUtW9ezvsx9grfsX/FNxnbxU1Lvg0hLxixypHKGFAaPu0xCD8oDTeFSyfRT6s8109GMUZL8m2xXp8X2dpPCWWdX84iga4BrTlOfqox4shqEgh/Ht4qRst52cA1xOIUuOxgfUivp6v5f8IVyaryEdpVk72ERAwdT4aoY1usBgmP+0m06Q216H/nubtNYxHaOIYjcach3A8Ez/zc0KcShhel0HCYjFsA0FjYqyJ5ZUH1aZw3+zWC0hLpM6GDfcAdn9fq2orPmZbW6XXrf+Krc9RtvII5jeD3dFoT1KwZJwxfUMvc5KLfn8rROW23Jw89sJ2a5dpB3qWDUBWF2iX8OCuKprHosJ2mflBR+Wqs86VvgI/XMnsqb97+VlKdPVysczPj8Jhzf+WCvGBHijAqYlavbF60soMWlHbvKT+ScvhprgeTln51xX0sF+Eadc/l2s2a5BgkVbHYyz0E85p0LstqH+gEGiR84nBRRFIn8hLSZrGwqjZ3E29cuGi+5Z5bp7EM8MWFa9ssS/vy4VrDfECSv7DSU84DaP0sXI3Ap4lWznQ65nQoTKRWU30gd7Nn8ZowUvGIx4aqyXGwmA/PB4qN8msJUODezUHEl0VP9uo+cZ8vPFodSIB4C7lQYjEFj8yu49C2KIV3qxMFYTevG8KqAr0TPlkbzHHnTpDpvpzziAiNFh8xiT7C/TiyH0EguUw4vxAgpnE27WIypV+uFN2zW7xniF/n75trs9IJ5amB1zXXZ1LFkJ6GbS/dFokzl4cc2mamVwhL4XU0Av5gDWAl+aEWhAP7t2VIwU+EpvfOPDcLASX7H7lZpXA2XQfbSlD4qU18NffNPoAKMNSccBfO9YVVgmlW4RydBqfHAV7+hrZ84WJGho6bNT0YMhxxLdOx/dwGj0oyak9aAkNJ8lRJzUuA8sR+fPyiyTgUHio5+Pp+YaKlHrhR41jY5NESPS3x+zTMe0S2HnLOKCOQPpdxKyviBvdHrCDRqO+l96HhhNBLXWv4yEMuEUYo8kXnYJM8oIgVM4XJ+xXOev4YbWeqsvgq0lmw4/PiYr9sYLt+W5EAuYSFnJEan8CwJwbtASBfLBBpJZiRPor/aCJBZsM+MhvS7ZepyHvU8m5WSmaZnxuLts8ojl6KkS8oSAHkq5GWlCB/NgJ5W3rO2Cj1MK7ahxsCrbTT3a0V/QQH+sErxV4XUWDHx0kkFy25bPmBMBQ6BU3HoHhhYcJB9JhP6NXUWKxnE0raXHB6U9KHpWdQCQI72qevp5fMzcm+AvC85rsynVQhruDA9fp9COe7N56cg1UKGSas89vrN+WlGLYTwi5W+0xYdKEGtGCeNJwXKDU0XqU5uQYnWsMwTENLGtbQMvoGjIFIEMzCRal4rnBAg7D/CSn8MsCvS+FDJJAzoiioJEhZJgAp9n2+1Yznr7H+6eT4YkJ9Mpj60ImcW4i4iHDLn9RydB8dx3QYm3rsX6n4VRrZDsYK6DCGwkwd5n3/INFEpk16fYpP6JtMQpqEMzcOfQGAHXBTEGzuLJ03GYQL9bmV2/7ExDlRf+Uvf1sM2frRtCWmal12pMgtonvSCtR4n1CLUZRdTHDHP1Otwqd+rcdlavnKjUB/OYXQHUJzpNyFoKpQK+2OgrEKpGyIgIBgn2y9QHnTJihZOpEvOKIoHAMGAXHmj21Lym39Mbiow4IF+77xNuewziNVBxr6KD5e+9HzZSBIlUa/AmsDFJFXeyrQakR3FwowTGcADJHcEfhGkXYNGSYo4dh4bxwLM+28xjiqkdn0/3R4UEkvcBrBfn/SzBc1XhKM2VPlJgKSorjDac96V2UnQYXl1/yZPT4DVelgO+soMjexXwYO58VLl5xInQUZI8jc3H2CPnCNb9X05nOxIy4MlecasTqGK6s2az4RjpF2cQP2G28R+7wDPsZDZC/kWtjdoHC7SpdPmqQrUAhMwKVuxCmYTiD9q/O7GHtZvPSN0CAUQN/rymXZNniYLlJDE70bsk6Xxsh4kDOdxe7A2wo7P9F5YvqqRDI6brf79yPCSp4I0jVoO4YnLYtX5nzspR5WB4AKOYtR1ujXbOQpPyYDvfRE3FN5zw0i7reehdi7yV0YDRKRllGCGRk5Yz+Uv1fYl2ZwrnGsqsjgAVo0xEUba8ohjaNMJNwTwZA/wBDWFSCpg1eUH8MYL2zdioxRTqgGQrDZxQyNzyBJPXZF0+oxITJAbj7oNC5JwgDMUJaM5GqlGCWc//KCIrI+aclEe4IA0uzv7cuj6GCdaJONpi13O544vbtIHBF+A+JeDFUQNy61Gki3rtyQ4aUywn6ru314/dkGiP8Iwjo0J/2Txs49ZkwEl4mx+iYUUO55I6pJzU4P+7RRs+DXZkyKUYZqVWrPF4I94m4Wx1tXeE74o9GuX977yvJ/jkdak8+AmoHVjI15V+WwBdARFV2IPirJgVMdsg1Pez2VNHqa7EHWdTkl3XTcyjG9BiueWFvQfXI8aWSkuuRmqi/HUuzqyvLJfNfs0txMqldYYflWB1BS31WkuPJGGwXUCpjiQSktkuBMWwHjSkQxeehqw1Kgz0Trzm7QbtgxiEPDVmWCNCAeCfROTphd1ZNOhzLy6XfJyG6Xgd5MCAZw4xie0Sj5AnY1/akDgNS9YFl3Y06vd6FAsg2gVQJtzG7LVq1OH2frbXNHWH/NY89NNZ4QUSJqL2yEcGADbT38X0bGdukqYlSoliKOcsSTuqhcaemUeYLLoI8+MZor2RxXTRThF1LrHfqf/5LcLAjdl4EERgUysYS2geE+yFdasU91UgUDsc2cSQ1ZoT9+uLOwdgAmifwQqF028INc2IQEDfTmUw3eZxvz7Ud1z3xc1PQfeCvfKsB9jOhRj7rFyb9XcDWLcYj0bByosychMezMLVkFiYcdBBQtvI6K0KRuOZQH2kBsYHJaXTkup8F0eIhO1/GcIwWKpr2mouB7g5TUDJNvORXPXa/mU8bh27TAZYBe2sKx4NSv5OjnHIWD2RuysCzBlUfeNXhDd2jxnHoUlheJ3jBApzURy0fwm2FwwsSU0caQGl0Kv8hopRQE211NnvtLRsmCNrhhpEDoNiZEzD2QdJWKbRRWnaFedXHAELSN0t0bfsCsMf0ktfBoXBoNA+nZN9+pSlmuzspFevmsqqcMllzzvkyXrzoA+Ryo1ePXpdGOoJvhyru+EBRsmOp7MXZ0vNUMUqHLUoKglg1p73sWeZmPc+KAw0pE2zIsFFE5H4192KwDvDxdxEYoDBDNZjbg2bmADTeUKK57IPD4fTYF4c6EnXx/teYMORBDtIhPJneiZny7Nv/zG+YmekIKCoxr6kauE2bZtBLufetNG0BtBY7f+/ImUypMBvdWu/Q7vTMRzw5aQGZWuc1V0HEsItFYMIBnoKGZ0xcarba/TYZq50kCaflFysYjA4EDKHqGdpYWdKYmm+a7TADmW35yfnOYpZYrkpVEtiqF0EujI00aeplNs2k+qyFZNeE3CDPL9P6b4PQ/kataHkVpLSEVGK7EX6rAa7IVNrvZtFvOA6okKvBgMtFDAGZOx88MeBcJ8AR3AgUUeIznAN6tjCUipGDZONm1FjWJp4A3QIzSaIOmZ7DvF/ysYYbM/fFDOV0jntAjRdapxJxL0eThpEhKOjCDDq2ks+3GrwxqIFKLe1WdOzII8XIOPGnwy6LKXVfpSDOTEfaRsGujhpS4hBIsMOqHbl16PJxc4EkaVu9wpEYlF/84NSv5Zum4drMfp9yXbzzAOJqqS4YkI4cBrFrC7bMPiCfgI3nNZAqkk3QOZqR+yyqx+nDQKBBBZ7QKrfGMCL+XpqFaBJU0wpkBdAhbR4hJsmT5aynlvkouoxm/NjD5oe6BzVIO9uktM+/5dEC5P7vZvarmuO/lKXz4sBabVPIATuKTrwbJP8XUkdM6uEctHKXICUJGjaZIWRbZp8czquQYfY6ynBUCfIU+gG6wqSIBmYIm9pZpXdaL121V7q0VjDjmQnXvMe7ysoEZnZL15B0SpxS1jjd83uNIOKZwu5MPzg2NhOx3xMOPYwEn2CUzbSrwAs5OAtrz3GAaUkJOU74XwjaYUmGJdZBS1NJVkGYrToINLKDjxcuIlyfVsKQSG/G4DyiO2SlQvJ0d0Ot1uOG5IFSAkq+PRVMgVMDvOIJMdqjeCFKUGRWBW9wigYvcbU7CQL/7meF2KZAaWl+4y9uhowAX7elogAvItAAxo2+SFxGRsHGEW9BnhlTuWigYxRcnVUBRQHV41LV+Fr5CJYV7sHfeywswx4XMtUx6EkBhR+q8AXXUA8uPJ73Pb49i9KG9fOljvXeyFj9ixgbo6CcbAJ7WHWqKHy/h+YjBwp6VcN7M89FGzQ04qbrQtgrOFybg3gQRTYG5xn73ArkfQWjCJROwy3J38Dx/D7jOa6BBNsitEw1wGq780EEioOeD+ZGp2J66ADiVGMayiHYucMk8nTK2zzT9CnEraAk95kQjy4k0GRElLL5YAKLQErJ5rp1eay9O4Fb6yJGm9U4FaMwPGxtKD6odIIHKoWnhKo1U8KIpFC+MVn59ZXmc7ZTBZfsg6FQ8W10YfTr4u0nYrpHZbZ1jXiLmooF0cOm0+mPnJBXQtepc7n0BqOipNCqI6yyloTeRShNKH04FIo0gcMk0H/xThyN4pPAWjDDkEp3lNNPRNVfpMI44CWRlRgViP64eK0JSRp0WUvCWYumlW/c58Vcz/yMwVcW5oYb9+26TEhwvbxiNg48hl1VI1UXTU//Eta+BMKnGUivctfL5wINDD0giQL1ipt6U7C9cd4+lgqY2lMUZ02Uv6Prs+ZEZer7ZfWBXVghlfOOrClwsoOFKzWEfz6RZu1eCs+K8fLvkts5+BX0gyrFYve0C3qHrn5U/Oh6D/CihmWIrY7HUZRhJaxde+tldu6adYJ+LeXupQw0XExC36RETdNFxcq9glMu4cNQSX9cqR/GQYp+IxUkIcNGWVU7ZtGa6P3XAyodRt0XeS3Tp01AnCh0ZbUh4VrSZeV9RWfSoWyxnY3hzcZ30G/InDq4wxRrEejreBxnhIQbkxenxkaxl+k7eLUQkUR6vKJ2iDFNGX3WmVA1yaOH+mvhBd+sE6vacQzFobwY5BqEAFmejwW5ne7HtVNolOUgJc8CsUxmc/LBi8N5mu9VsIA5HyErnS6zeCz7VLI9+n/hbT6hTokMXTVyXJRKSG2hd2labXTbtmK4fNH3IZBPreSA4FMeVouVN3zG5x9CiGpLw/3pceo4qGqp+rVp+z+7yQ98oEf+nyH4F3+J9IheDBa94Wi63zJbLBCIZm7P0asHGpIJt3PzE3m0S4YIWyXBCVXGikj8MudDPB/6Nm2v4IxJ5gU0ii0guy5SUHqGUYzTP0jIJU5E82RHUXtX4lDdrihBLdP1YaG1AGUC12rQKuIaGvCpMjZC9bWSCYnjDlvpWbkdXMTNeBHLKiuoozMGIvkczmP0aRJSJ8PYnLCVNhKHXBNckH79e8Z8Kc2wUej4sQZoH8qDRGkg86maW/ZQWGNnLcXmq3FlXM6ssR/3P6E/bHMvm6HLrv1yRixit25JsH3/IOr2UV4BWJhxXW5BJ6Xdr07n9kF3ZNAk6/Xpc5MSFmYJ2R7bdL8Kk7q1OU9Elg/tCxJ8giT27wSTySF0GOxg4PbYJdi/Nyia9Nn89CGDulfJemm1aiEr/eleGSN+5MRrVJ4K6lgyTTIW3i9cQ0dAi6FHt0YMbH3wDSAtGLSAccezzxHitt1QdhW36CQgPcA8vIIBh3/JNjf/Obmc2yzpk8edSlS4lVdwgW5vzbYEyFoF4GCBBby1keVNueHAH+evi+H7oOVfS3XuPQSNTXOONAbzJeSb5stwdQHl1ZjrGoE49I8+A9j3t+ahhQj74FCSWpZrj7wRSFJJnnwi1T9HL5qrCFW/JZq6P62XkMWTb+u4lGpKfmmwiJWx178GOG7KbrZGqyWwmuyKWPkNswkZ1q8uptUlviIi+AXh2bOOTOLsrtNkfqbQJeh24reebkINLkjut5r4d9GR/r8CBa9SU0UQhsnZp5cP+RqWCixRm7i4YRFbtZ4EAkhtNa6jHb6gPYQv7MKqkPLRmX3dFsK8XsRLVZ6IEVrCbmNDc8o5mqsogjAQfoC9Bc7R6gfw03m+lQpv6kTfhxscDIX6s0w+fBxtkhjXAXr10UouWCx3C/p/FYwJRS/AXRKkjOb5CLmK4XRe0+xeDDwVkJPZau52bzLEDHCqV0f44pPgKOkYKgTZJ33fmk3Tu8SdxJ02SHM8Fem5SMsWqRyi2F1ynfRJszcFKykdWlNqgDA/L9lKYBmc7Zu/q9ii1FPF47VJkqhirUob53zoiJtVVRVwMR34gV9iqcBaHbRu9kkvqk3yMpfRFG49pKKjIiq7h/VpRwPGTHoY4cg05X5028iHsLvUW/uz+kjPyIEhhcKUwCkJAwbR9pIEGOn8z6svAO8i89sJ3dL5qDWFYbS+HGPRMxYwJItFQN86YESeJQhn2urGiLRffQeLptDl8dAgb+Tp47UQPxWOw17OeChLN1WnzlkPL1T5O+O3Menpn4C3IY5LEepHpnPeZHbvuWfeVtPlkH4LZjPbBrkJT3NoRJzBt86CO0Xq59oQ+8dsm0ymRcmQyn8w71mhmcuEI5byuF+C88VPYly2sEzjlzAQ3vdn/1+Hzguw6qFNNbqenhZGbdiG6RwZaTG7jTA2X9RdXjDN9yj1uQpyO4Lx8KRAcZcbZMafp4wPOd5MdXoFY52V1A8M9hi3sso93+uprE0qYNMjkE22CvK4HuUxqN7oIz5pWuETq1lQAjqlSlqdD2Rnr/ggp/TVkQYjn9lMfYelk2sH5HPdopYo7MHwlV1or9Bxf+QCyLzm92vzG2wjiIjC/ZHEJzeroJl6bdFPTpZho5MV2U86fLQqxNlGIMqCGy+9WYhJ8ob1r0+Whxde9L2PdysETv97O+xVw+VNN1TZSQN5I6l9m5Ip6pLIqLm4a1B1ffH6gHyqT9p82NOjntRWGIofO3bJz5GhkvSWbsXueTAMaJDou99kGLqDlhwBZNEQ4mKPuDvVwSK4WmLluHyhA97pZiVe8g+JxmnJF8IkV/tCs4Jq/HgOoAEGR9tCDsDbDmi3OviUQpG5D8XmKcSAUaFLRXb2lmJTNYdhtYyfjBYZQmN5qT5CNuaD3BVnlkCk7bsMW3AtXkNMMTuW4HjUERSJnVQ0vsBGa1wo3Qh7115XGeTF3NTz8w0440AgU7c3bSXO/KMINaIWXd0oLpoq/0/QJxCQSJ9XnYy1W7TYLBJpHsVWD1ahsA7FjNvRd6mxCiHsm8g6Z0pnzqIpF1dHUtP2ITU5Z1hZHbu+L3BEEStBbL9XYvGfEakv1bmf+bOZGnoiuHEdlBnaChxYKNzB23b8sw8YyT7Ajxfk49eJIAvdbVkdFCe2J0gMefhQ0bIZxhx3fzMIysQNiN8PgOUKxOMur10LduigREDRMZyP4oGWrP1GFY4t6groASsZ421os48wAdnrbovNhLt7ScNULkwZ5AIZJTrbaKYTLjA1oJ3sIuN/aYocm/9uoQHEIlacF1s/TM1fLcPTL38O9fOsjMEIwoPKfvt7opuI9G2Hf/PR4aCLDQ7wNmIdEuXJ/QNL72k5q4NejAldPfe3UVVqzkys8YZ/jYOGOp6c+YzRCrCuq0M11y7TiN6qk7YXRMn/gukxrEimbMQjr3jwRM6dKVZ4RUfWQr8noPXLJq6yh5R3EH1IVOHESst/LItbG2D2vRsZRkAObzvQAAD3mb3/G4NzopI0FAiHfbpq0X72adg6SRj+8OHMShtFxxLZlf/nLgRLbClwl5WmaYSs+yEjkq48tY7Z2bE0N91mJwt+ua0NlRJIDh0HikF4UvSVorFj2YVu9YeS5tfvlVjPSoNu/Zu6dEUfBOT555hahBdN3Sa5Xuj2Rvau1lQNIaC944y0RWj9UiNDskAK1WoL+EfXcC6IbBXFRyVfX/WKXxPAwUyIAGW8ggZ08hcijKTt1YKnUO6QPvcrmDVAb0FCLIXn5id4fD/Jx4tw/gbXs7WF9b2RgXtPhLBG9vF5FEkdHAKrQHZAJC/HWvk7nvzzDzIXZlfFTJoC3JpGgLPBY7SQTjGlUvG577yNutZ1hTfs9/1nkSXK9zzKLRZ3VODeKUovJe0WCq1zVMYxCJMenmNzPIU2S8TA4E7wWmbNkxq9rI2dd6v0VpcAPVMxnDsvWTWFayyqvKZO7Z08a62i/oH2/jxf8rpmfO64in3FLiL1GX8IGtVE9M23yGsIqJbxDTy+LtaMWDaPqkymb5VrQdzOvqldeU0SUi6IirG8UZ3jcpRbwHa1C0Dww9G/SFX3gPvTJQE+kyz+g1BeMILKKO+olcHzctOWgzxYHnOD7dpCRtuZEXACjgqesZMasoPgnuDC4nUviAAxDc5pngjoAITIkvhKwg5d608pdrZcA+qn5TMT6Uo/QzBaOxBCLTJX3Mgk85rMfsnWx86oLxf7p2PX5ONqieTa/qM3tPw4ZXvlAp83NSD8F7+ZgctK1TpoYwtiU2h02HCGioH5tkVCqNVTMH5p00sRy2JU1qyDBP2CII/Dg4WDsIl+zgeX7589srx6YORRQMBfKbodbB743Tl4WLKOEnwWUVBsm94SOlCracU72MSyj068wdpYjyz1FwC2bjQnxnB6Mp/pZ+yyZXtguEaYB+kqhjQ6UUmwSFazOb+rhYjLaoiM+aN9/8KKn0zaCTFpN9eKwWy7/u4EHzO46TdFSNjMfn2iPSJwDPCFHc0I1+vjdAZw5ZjqR/uzi9Zn20oAa5JnLEk/EA3VRWE7J/XrupfFJPtCUuqHPpnlL7ISJtRpSVcB8qsZCm2QEkWoROtCKKxUh3yEcMbWYJwk6DlEBG0bZP6eg06FL3v6RPb7odGuwm7FN8fG4woqtB8e7M5klPpo97GoObNwt+ludTAmxyC5hmcFx+dIvEZKI6igFKHqLH01iY1o7903VzG9QGetyVx5RNmBYUU+zIuSva/yIcECUi4pRmE3VkF2avqulQEUY4yZ/wmNboBzPmAPey3+dSYtBZUjeWWT0pPwCz4Vozxp9xeClIU60qvEFMQCaPvPaA70WlOP9f/ey39macvpGCVa+zfa8gO44wbxpJUlC8GN/pRMTQtzY8Z8/hiNrU+Zq64ZfFGIkdj7m7abcK1EBtws1X4J/hnqvasPvvDSDYWN+QcQVGMqXalkDtTad5rYY0TIR1Eqox3czwPMjKPvF5sFv17Thujr1IZ1Ytl4VX1J0vjXKmLY4lmXipRAro0qVGEcXxEVMMEl54jQMd4J7RjgomU0j1ptjyxY+cLiSyXPfiEcIS2lWDK3ISAy6UZ3Hb5vnPncA94411jcy75ay6B6DSTzK6UTCZR9uDANtPBrvIDgjsfarMiwoax2OlLxaSoYn4iRgkpEGqEkwox5tyI8aKkLlfZ12lO11TxsqRMY89j5JaO55XfPJPDL1LGSnC88Re9Ai+Nu5bZjtwRrvFITUFHPR4ZmxGslQMecgbZO7nHk32qHxYkdvWpup07ojcMCaVrpFAyFZJJbNvBpZfdf39Hdo2kPtT7v0/f8R/B5Nz4f1t9/3zNM/7n6SUHfcWk5dfQFJvcJMgPolGCpOFb/WC0FGWU2asuQyT+rm88ZKZ78Cei/CAh939CH0JYbpZIPtxc2ufXqjS3pHH9lnWK4iJ7OjR/EESpCo2R3MYKyE7rHfhTvWho4cL1QdN4jFTyR6syMwFm124TVDDRXMNveI1Dp/ntwdz8k8kxw7iFSx6+Yx6O+1LzMVrN0BBzziZi9kneZSzgollBnVwBh6oSOPHXrglrOj+QmR/AESrhDpKrWT+8/AiMDxS/5wwRNuGQPLlJ9ovomhJWn8sMLVItQ8N/7IXvtD8kdOoHaw+vBSbFImQsv/OCAIui99E+YSIOMlMvBXkAt+NAZK8wB9Jf8CPtB+TOUOR+z71d/AFXpPBT6+A5FLjxMjLIEoJzrQfquvxEIi+WoUzGR1IzQFNvbYOnxb2PyQ0kGdyXKzW2axQL8lNAXPk6NEjqrRD1oZtKLlFoofrXw0dCNWASHzy+7PSzOUJ3XtaPZsxLDjr+o41fKuKWNmjiZtfkOzItvlV2MDGSheGF0ma04qE3TUEfqJMrXFm7DpK+27DSvCUVf7rbNoljPhha5W7KBqVq0ShUSTbRmuqPtQreVWH4JET5yMhuqMoSd4r/N8sDmeQiQQvi1tcZv7Moc7dT5X5AtCD6kNEGZOzVcNYlpX4AbTsLgSYYliiPyVoniuYYySxsBy5cgb3pD+EK0Gpb0wJg031dPgaL8JZt6sIvzNPEHfVPOjXmaXj4bd4voXzpZ5GApMhILgMbCEWZ2zwgdeQgjNHLbPIt+KqxRwWPLTN6HwZ0Ouijj4UF+Sg0Au8XuIKW0WxlexdrFrDcZJ8Shauat3X0XmHygqgL1nAu2hrJFb4wZXkcS+i36KMyU1yFvYv23bQUJi/3yQpqr/naUOoiEWOxckyq/gq43dFou1DVDaYMZK9tho7+IXXokBCs5GRfOcBK7g3A+jXQ39K4YA8PBRW4m5+yR0ZAxWJncjRVbITvIAPHYRt1EJ3YLiUbqIvoKHtzHKtUy1ddRUQ0AUO41vonZDUOW+mrszw+SW/6Q/IUgNpcXFjkM7F4CSSQ2ExZg85otsMs7kqsQD4OxYeBNDcSpifjMoLb7GEbGWTwasVObmB/bfPcUlq0wYhXCYEDWRW02TP5bBrYsKTGWjnWDDJ1F7zWai0zW/2XsCuvBQjPFcTYaQX3tSXRSm8hsAoDdjArK/OFp6vcWYOE7lizP0Yc+8p16i7/NiXIiiQTp7c7Xus925VEtlKAjUdFhyaiLT7VxDagprMFwix4wZ05u0qj7cDWFd0W9OYHIu3JbJKMXRJ1aYNovugg+QqRN7fNHSi26VSgBpn+JfMuPo3aeqPWik/wI5Rz3BWarPQX4i5+dM0npwVOsX+KsOhC7vDg+OJsz4Q5zlnIeflUWL6QYMbf9WDfLmosLF4Qev3mJiOuHjoor/dMeBpA9iKDkMjYBNbRo414HCxjsHrB4EXNbHzNMDHCLuNBG6Sf+J4MZ/ElVsDSLxjIiGsTPhw8BPjxbfQtskj+dyNMKOOcUYIRBEIqbazz3lmjlRQhplxq673VklMMY6597vu+d89ec/zq7Mi4gQvh87ehYbpOuZEXj5g/Q7S7BFDAAB9DzG35SC853xtWVcnZQoH54jeOqYLR9NDuwxsVthTV7V99n/B7HSbAytbEyVTz/5NhJ8gGIjG0E5j3griULUd5Rg7tQR+90hJgNQKQH2btbSfPcaTOfIexc1db1BxUOhM1vWCpLaYuKr3FdNTt/T3PWCpEUWDKEtzYrjpzlL/wri3MITKsFvtF8QVV/NhVo97aKIBgdliNc10dWdXVDpVtsNn+2UIolrgqdWA4EY8so0YvB4a+aLzMXiMAuOHQrXY0tr+CL10JbvZzgjJJuB1cRkdT7DUqTvnswVUp5kkUSFVtIIFYK05+tQxT6992HHNWVhWxUsD1PkceIrlXuUVRogwmfdhyrf6zzaL8+c0L7GXMZOteAhAVQVwdJh+7nrX7x4LaIIfz2F2v7Dg/uDfz2Fa+4gFm2zHAor8UqimJG3VTJtZEoFXhnDYXvxMJFc6ku2bhbCxzij2z5UNuK0jmp1mnvkVNUfR+SEmj1Lr94Lym75PO7Fs0MIr3GdsWXRXSfgLTVY0FLqba97u1In8NAcY7IC6TjWLigwKEIm43NxTdaVTv9mcKkzuzBkKd8x/xt1p/9BbP7Wyb4bpo1K1gnOpbLvKz58pWl3B55RJ/Z5mRDLPtNQg14jdOEs9+h/V5UVpwrAI8kGbX8KPVPDIMfIqKDjJD9UyDOPhjZ3vFAyecwyq4akUE9mDOtJEK1hpDyi6Ae87sWAClXGTiwPwN7PXWwjxaR79ArHRIPeYKTunVW24sPr/3HPz2IwH8oKH4OlWEmt4BLM6W5g4kMcYbLwj2usodD1088stZA7VOsUSpEVl4w7NMb1EUHMRxAxLF0CIV+0L3iZb+ekB1vSDSFjAZ3hfLJf7gFaXrOKn+mhR+rWw/eTXIcAgl4HvFuBg1LOmOAwJH3eoVEjjwheKA4icbrQCmvAtpQ0mXG0agYp5mj4Rb6mdQ+RV4QBPbxMqh9C7o8nP0Wko2ocnCHeRGhN1XVyT2b9ACsL+6ylUy+yC3QEnaKRIJK91YtaoSrcWZMMwxuM0E9J68Z+YyjA0g8p1PfHAAIROy6Sa04VXOuT6A351FOWhKfTGsFJ3RTJGWYPoLk5FVK4OaYR9hkJvezwF9vQN1126r6isMGXWTqFW+3HL3I/jurlIdDWIVvYY+s6yq7lrFSPAGRdnU7PVwY/SvWbZGpXzy3BQ2LmAJlrONUsZs4oGkly0V267xbD5KMY8woNNsmWG1VVgLCra8aQBBcI4DP2BlNwxhiCtHlaz6OWFoCW0vMR3ErrG7JyMjTSCnvRcsEHgmPnwA6iNpJ2DrFb4gLlhKJyZGaWkA97H6FFdwEcLT6DRQQL++fOkVC4cYGW1TG/3iK5dShRSuiBulmihqgjR45Vi03o2RbQbP3sxt90VxQ6vzdlGfkXmmKmjOi080JSHkLntjvsBJnv7gKscOaTOkEaRQqAnCA4HWtB4XnMtOhpRmH2FH8tTXrIjAGNWEmudQLCkcVlGTQ965Kh0H6ixXbgImQP6b42B49sO5C8pc7iRlgyvSYvcnH9FgQ3azLbQG2cUW96SDojTQStxkOJyOuDGTHAnnWkz29aEwN9FT8EJ4yhXOg+jLTrCPKeEoJ9a7lDXOjEr8AgX4BmnMQ668oW0zYPyQiVMPxKRHtpfnEEyaKhdzNVThlxxDQNdrHeZiUFb6NoY2KwvSb7BnRcpJy+/g/zAYx3fYSN5QEaVD2Y1VsNWxB0BSO12MRsRY8JLfAezRMz5lURuLUnG1ToKk6Q30FughqWN6gBNcFxP/nY/iv+iaUQOa+2Nuym46wtI/DvSfzSp1jEi4SdYBE7YhTiVV5cX9gwboVDMVgZp5YBQlHOQvaDNfcCoCJuYhf5kz5kwiIKPjzgpcRJHPbOhJajeoeRL53cuMahhV8Z7IRr6M4hW0JzT7mzaMUzQpm866zwM7Cs07fJYXuWvjAMkbe5O6V4bu71sOG6JQ4oL8zIeXHheFVavzxmlIyBkgc9IZlEDplMPr8xlcyss4pVUdwK1e7CK2kTsSdq7g5SHRAl3pYUB9Ko4fsh4qleOyJv1z3KFSTSvwEcRO/Ew8ozEDYZSqpfoVW9uhJfYrNAXR0Z3VmeoAD+rVWtwP/13sE/3ICX3HhDG3CMc476dEEC0K3umSAD4j+ZQLVdFOsWL2C1TH5+4KiSWH+lMibo+B55hR3Gq40G1n25sGcN0mEcoU2wN9FCVyQLBhYOu9aHVLWjEKx2JIUZi5ySoHUAI9b8hGzaLMxCZDMLhv8MkcpTqEwz9KFDpCpqQhVmsGQN8m24wyB82FAKNmjgfKRsXRmsSESovAwXjBIoMKSG51p6Um8b3i7GISs7kjTq/PZoioCfJzfKdJTN0Q45kQEQuh9H88M3yEs3DbtRTKALraM0YC8laiMiOOe6ADmTcCiREeAWZelBaEXRaSuj2lx0xHaRYqF65O0Lo5OCFU18A8cMDE4MLYm9w2QSr9NgQAIcRxZsNpA7UJR0e71JL+VU+ISWFk5I97lra8uGg7GlQYhGd4Gc6rxsLFRiIeGO4abP4S4ekQ1fiqDCy87GZHd52fn5aaDGuvOmIofrzpVwMvtbreZ/855OaXTRcNiNE0wzGZSxbjg26v8ko8L537v/XCCWP2MFaArJpvnkep0pA+O86MWjRAZPQRfznZiSIaTppy6m3p6HrNSsY7fDtz7Cl4V/DJAjQDoyiL2uwf1UHVd2AIrzBUSlJaTj4k6NL97a/GqhWKU9RUmjnYKpm2r+JYUcrkCuZKvcYvrg8pDoUKQywY9GDWg03DUFSirlUXBS5SWn/KAntnf0IdHGL/7mwXqDG+LZYjbEdQmqUqq4y54TNmWUP7IgcAw5816YBzwiNIJiE9M4lPCzeI/FGBeYy3p6IAmH4AjXXmvQ4Iy0Y82NTobcAggT2Cdqz6Mx4TdGoq9fn2etrWKUNFyatAHydQTVUQ2S5OWVUlugcNvoUrlA8cJJz9MqOa/W3iVno4zDHfE7zhoY5f5lRTVZDhrQbR8LS4eRLz8iPMyBL6o4PiLlp89FjdokQLaSBmKHUwWp0na5fE3v9zny2YcDXG/jfI9sctulHRbdkI5a4GOPJx4oAJQzVZ/yYAado8KNZUdEFs9ZPiBsausotXMNebEgr0dyopuqfScFJ3ODNPHgclACPdccwv0YJGQdsN2lhoV4HVGBxcEUeUX/alr4nqpcc1CCR3vR7g40zteQg/JvWmFlUE4mAiTpHlYGrB7w+U2KdSwQz2QJKBe/5eiixWipmfP15AFWrK8Sh1GBBYLgzki1wTMhGQmagXqJ2+FuqJ8f0XzXCVJFHQdMAw8xco11HhM347alrAu+wmX3pDFABOvkC+WPX0Uhg1Z5MVHKNROxaR84YV3s12UcM+70cJ460SzEaKLyh472vOMD3XnaK7zxZcXlWqenEvcjmgGNR2OKbI1s8U+iwiW+HotHalp3e1MGDy6BMVIvajnAzkFHbeVsgjmJUkrP9OAwnEHYXVBqYx3q7LvXjoVR0mY8h+ZaOnh053pdsGkmbqhyryN01eVHySr+CkDYkSMeZ1xjPNVM+gVLTDKu2VGsMUJqWO4TwPDP0VOg2/8ITbAUaMGb4LjL7L+Pi11lEVMXTYIlAZ/QHmTENjyx3kDkBdfcvvQt6tKk6jYFM4EG5UXDTaF5+1ZjRz6W7MdJPC+wTkbDUim4p5QQH3b9kGk2Bkilyeur8Bc20wm5uJSBO95GfYDI1EZipoRaH7uVveneqz43tlTZGRQ4a7CNmMHgXyOQQOL6WQkgMUTQDT8vh21aSdz7ERiZT1jK9F+v6wgFvuEmGngSvIUR2CJkc5tx1QygfZnAruONobB1idCLB1FCfO7N1ZdRocT8/Wye+EnDiO9pzqIpnLDl4bkaRKW+ekBVwHn46Shw1X0tclt/0ROijuUB4kIInrVJU4buWf4YITJtjOJ6iKdr1u+flgQeFH70GxKjhdgt/MrwfB4K/sXczQ+9zYcrD4dhY6qZhZ010rrxggWA8JaZyg2pYij8ieYEg1aZJkZK9O1Re7sB0iouf60rK0Gd+AYlp7soqCBCDGwfKeUQhCBn0E0o0GS6PdmjLi0TtCYZeqazqwN+yNINIA8Lk3iPDnWUiIPLGNcHmZDxfeK0iAdxm/T7LnN+gemRL61hHIc0NCAZaiYJR+OHnLWSe8sLrK905B5eEJHNlWq4RmEXIaFTmo49f8w61+NwfEUyuJAwVqZCLFcyHBKAcIVj3sNzfEOXzVKIndxHw+AR93owhbCxUZf6Gs8cz6/1VdrFEPrv330+9s6BtMVPJ3zl/Uf9rUi0Z/opexfdL3ykF76e999GPfVv8fJv/Y/+/5hEMon1tqNFyVRevV9y9/uIvsG3dbB8GRRrgaEXfhx+2xeOFt+cEn3RZanNxdEe2+B6MHpNbrRE53PlDifPvFcp4kO78ILR0T4xyW/WGPyBsqGdoA7zJJCu1TKbGfhnqgnRbxbB2B3UZoeQ2bz2sTVnUwokTcTU21RxN1PYPS3Sar7T0eRIsyCNowr9amwoMU/od9s2APtiKNL6ENOlyKADstAEWKA+sdKDhrJ6BOhRJmZ+QJbAaZ3/5Fq0/lumCgEzGEbu3yi0Y4I4EgVAjqxh4HbuQn0GrRhOWyAfsglQJAVL1y/6yezS2k8RE2MstJLh92NOB3GCYgFXznF4d25qiP4ZCyI4RYGesut6FXK6GwPpKK8WHEkhYui0AyEmr5Ml3uBFtPFdnioI8RiCooa7Z1G1WuyIi3nSNglutc+xY8BkeW3JJXPK6jd2VIMpaSxpVtFq+R+ySK9J6WG5Qvt+C+QH1hyYUOVK7857nFmyDBYgZ/o+AnibzNVqyYCJQvyDXDTK+iXdkA71bY7TL3bvuLxLBQ8kbTvTEY9aqkQ3+MiLWbEgjLzOH+lXgco1ERgzd80rDCymlpaRQbOYnKG/ODoFl46lzT0cjM5FYVvv0qLUbD5lyJtMUaC1pFlTkNONx6lliaX9o0i/1vws5bNKn5OuENQEKmLlcP4o2ZmJjD4zzd3Fk32uQ4uRWkPSUqb4LBe3EXHdORNB2BWsws5daRnMfNVX7isPSb1hMQdAJi1/qmDMfRUlCU74pmnzjbXfL8PVG8NsW6IQM2Ne23iCPIpryJjYbVnm5hCvKpMa7HLViNiNc+xTfDIaKm3jctViD8A1M9YPJNk003VVr4Zo2MuGW8vil8SLaGpPXqG7I4DLdtl8a4Rbx1Lt4w5Huqaa1XzZBtj208EJVGcmKYEuaeN27zT9EE6a09JerXdEbpaNgNqYJdhP1NdqiPKsbDRUi86XvvNC7rME5mrSQtrzAZVndtSjCMqd8BmaeGR4l4YFULGRBeXIV9Y4yxLFdyoUNpiy2IhePSWzBofYPP0eIa2q5JP4j9G8at/AqoSsLAUuRXtvgsqX/zYwsE+of6oSDbUOo4RMJw+DOUTJq+hnqwKim9Yy/napyZNTc2rCq6V9jHtJbxGPDwlzWj/Sk3zF/BHOlT/fSjSq7FqlPI1q6J+ru8Aku008SFINXZfOfnZNOvGPMtEmn2gLPt+H4QLA+/SYe4j398auzhKIp2Pok3mPC5q1IN1HgR+mnEfc4NeeHYwd2/kpszR3cBn7ni9NbIqhtSWFW8xbUJuUPVOeeXu3j0IGZmFNiwaNZ6rH4/zQ2ODz6tFxRLsUYZu1bfd1uIvfQDt4YD/efKYv8VF8bHGDgK22w2Wqwpi43vNCOXFJZCGMqWiPbL8mil6tsmOTXAWCyMCw73e2rADZj2IK6rqksM3EXF2cbLb4vjB14wa/yXK5vwU+05MzERJ5nXsXsW21o7M+gO0js2OyKciP5uF2iXyb2DiptwQeHeqygkrNsqVCSlldxBMpwHi1vfc8RKpP/4L3Lmpq6DZcvhDDfxTCE3splacTcOtXdK2g303dIWBVe2wD/Gvja1cClFQ67gw0t1ZUttsUgQ1Veky8oOpS6ksYEc4bqseCbZy766SvL3FodmnahlWJRgVCNjPxhL/fk2wyvlKhITH/VQCipOI0dNcRa5B1M5HmOBjTLeZQJy237e2mobwmDyJNHePhdDmiknvLKaDbShL+Is1XTCJuLQd2wmdJL7+mKvs294whXQD+vtd88KKk0DXP8B1Xu9J+xo69VOuFgexgTrcvI6SyltuLix9OPuE6/iRJYoBMEXxU4shQMf4Fjqwf1PtnJ/wWSZd29rhZjRmTGgiGTAUQqRz+nCdjeMfYhsBD5Lv60KILWEvNEHfmsDs2L0A252351eUoYxAysVaCJVLdH9QFWAmqJDCODUcdoo12+gd6bW2boY0pBVHWL6LQDK5bYWh1V8vFvi0cRpfwv7cJiMX3AZNJuTddHehTIdU0YQ/sQ1dLoF2xQPcCuHKiuCWOY30DHe1OwcClLAhqAKyqlnIbH/8u9ScJpcS4kgp6HKDUdiOgRaRGSiUCRBjzI5gSksMZKqy7Sd51aeg0tgJ+x0TH9YH2Mgsap9N7ENZdEB0bey2DMTrBA1hn56SErNHf3tKtqyL9b6yXEP97/rc+jgD2N1LNUH6RM9AzP3kSipr06RkKOolR7HO768jjWiH1X92jA7dkg7gcNcjqsZCgfqWw0tPXdLg20cF6vnQypg7gLtkazrHAodyYfENPQZsdfnjMZiNu4nJO97D1/sQE+3vNFzrSDOKw+keLECYf7RJwVHeP/j79833oZ0egonYB2FlFE5qj02B/LVOMJQlsB8uNg3Leg4qtZwntsOSNidR0abbZmAK4sCzvt8Yiuz2yrNCJoH5O8XvX/vLeR/BBYTWj0sOPYM/jyxRd5+/JziKAABaPcw/34UA3aj/gLZxZgRCWN6m4m3demanNgsx0P237/Q+Ew5VYnJPkyCY0cIVHoFn2Ay/e7U4P19APbPFXEHX94N6KhEMPG7iwB3+I+O1jd5n6VSgHegxgaSawO6iQCYFgDsPSMsNOcUj4q3sF6KzGaH/0u5PQoAj/8zq6Uc9MoNrGqhYeb2jQo0WlGlXjxtanZLS24/OIN5Gx/2g684BPDQpwlqnkFcxpmP/osnOXrFuu4PqifouQH0eF5qCkvITQbJw/Zvy5mAHWC9oU+cTiYhJmSfKsCyt1cGVxisKu+NymEQIAyaCgud/V09qT3nk/9s/SWsYtha7yNpzBIMM40rCSGaJ9u6lEkl00vXBiEt7p9P5IBCiavynEOv7FgLqPdeqxRiCwuFVMolSIUBcoyfUC2e2FJSAUgYdVGFf0b0Kn2EZlK97yyxrT2MVgvtRikfdaAW8RwEEfN+B7/eK8bBdp7URpbqn1xcrC6d2UjdsKbzCjBFqkKkoZt7Mrhg6YagE7spkqj0jOrWM+UGQ0MUlG2evP1uE1p2xSv4dMK0dna6ENcNUF+xkaJ7B764NdxLCpuvhblltVRAf7vK5qPttJ/9RYFUUSGcLdibnz6mf7WkPO3MkUUhR2mAOuGv8IWw5XG1ZvoVMnjSAZe6T7WYA99GENxoHkMiKxHlCuK5Gd0INrISImHQrQmv6F4mqU/TTQ8nHMDzCRivKySQ8dqkpQgnUMnwIkaAuc6/FGq1hw3b2Sba398BhUwUZSAIO8XZvnuLdY2n6hOXws+gq9BHUKcKFA6kz6FDnpxLPICa3qGhnc97bo1FT/XJk48LrkHJ2CAtBv0RtN97N21plfpXHvZ8gMJb7Zc4cfI6MbPwsW7AilCSXMFIEUEmir8XLEklA0ztYbGpTTGqttp5hpFTTIqUyaAIqvMT9A/x+Ji5ejA4Bhxb/cl1pUdOD6epd3yilIdO6j297xInoiBPuEDW2/UfslDyhGkQs7Wy253bVnlT+SWg89zYIK/9KXFl5fe+jow2rd5FXv8zDPrmfMXiUPt9QBO/iK4QGbX5j/7Rx1c1vzsY8ONbP3lVIaPrhL4+1QrECTN3nyKavGG0gBBtHvTKhGoBHgMXHStFowN+HKrPriYu+OZ05Frn8okQrPaaxoKP1ULCS/cmKFN3gcH7HQlVjraCeQmtjg1pSQxeuqXiSKgLpxc/1OiZsU4+n4lz4hpahGyWBURLi4642n1gn9qz9bIsaCeEPJ0uJmenMWp2tJmIwLQ6VSgDYErOeBCfSj9P4G/vI7oIF+l/n5fp956QgxGvur77ynawAu3G9MdFbJbu49NZnWnnFcQHjxRuhUYvg1U/e84N4JTecciDAKb/KYIFXzloyuE1eYXf54MmhjTq7B/yBToDzzpx3tJCTo3HCmVPYfmtBRe3mPYEE/6RlTIxbf4fSOcaKFGk4gbaUWe44hVk9SZzhW80yfW5QWBHxmtUzvMhfVQli4gZTktIOZd9mjJ5hsbmzttaHQB29Am3dZkmx3g/qvYocyhZ2PXAWsNQiIaf+Q8W/MWPIK7/TjvCx5q2XRp4lVWydMc2wIQkhadDB0xsnw/kSEyGjLKjI4coVIwtubTF3E7MJ6LS6UOsJKj82XVAVPJJcepfewbzE91ivXZvOvYfsmMevwtPpfMzGmC7WJlyW2j0jh7AF1JLmwEJSKYwIvu6DHc3YnyLH9ZdIBnQ+nOVDRiP+REpqv++typYHIvoJyICGA40d8bR7HR2k7do6UQTHF4oriYeIQbxKe4Th6+/l1BjUtS9hqORh3MbgvYrStXTfSwaBOmAVQZzpYNqsAmQyjY56MUqty3c/xH6GuhNvNaG9vGbG6cPtBM8UA3e8r51D0AR9kozKuGGSMgLz3nAHxDNnc7GTwpLj7/6HeWp1iksDeTjwCLpxejuMtpMnGJgsiku1sOACwQ9ukzESiDRN77YNESxR5LphOlcASXA5uIts1LnBIcn1J7BLWs49DMALSnuz95gdOrTZr0u1SeYHinno/pE58xYoXbVO/S+FEMMs5qyWkMnp8Q3ClyTlZP52Y9nq7b8fITPuVXUk9ohG5EFHw4gAEcjFxfKb3xuAsEjx2z1wxNbSZMcgS9GKyW3R6KwJONgtA64LTyxWm8Bvudp0M1FdJPEGopM4Fvg7G/hsptkhCfHFegv4ENwxPeXmYhxwZy7js+BeM27t9ODBMynVCLJ7RWcBMteZJtvjOYHb5lOnCLYWNEMKC59BA7covu1cANa2PXL05iGdufOzkgFqqHBOrgQVUmLEc+Mkz4Rq8O6WkNr7atNkH4M8d+SD1t/tSzt3oFql+neVs+AwEI5JaBJaxARtY2Z4mKoUqxds4UpZ0sv3zIbNoo0J4fihldQTX3XNcuNcZmcrB5LTWMdzeRuAtBk3cZHYQF6gTi3PNuDJ0nmR+4LPLoHvxQIxRgJ9iNNXqf2SYJhcvCtJiVWo85TsyFOuq7EyBPJrAdhEgE0cTq16FQXhYPJFqSfiVn0IQnPOy0LbU4BeG94QjdYNB0CiQ3QaxQqD2ebSMiNjaVaw8WaM4Z5WnzcVDsr4eGweSLa2DE3BWViaxhZFIcSTjgxNCAfelg+hznVOYoe5VqTYs1g7WtfTm3e4/WduC6p+qqAM8H4ZyrJCGpewThTDPe6H7CzX/zQ8Tm+r65HeZn+MsmxUciEWPlAVaK/VBaQBWfoG/aRL/jSZIQfep/89GjasWmbaWzeEZ2R1FOjvyJT37O9B8046SRSKVEnXWlBqbkb5XCS3qFeuE9xb9+frEknxWB5h1D/hruz2iVDEAS7+qkEz5Ot5agHJc7WCdY94Ws61sURcX5nG8UELGBAHZ3i+3VulAyT0nKNNz4K2LBHBWJcTBX1wzf+//u/j/9+//v87+9/l9Lbh/L/uyNYiTsWV2LwsjaA6MxTuzFMqmxW8Jw/+IppdX8t/Clgi1rI1SN0UC/r6tX/4lUc2VV1OQReSeCsjUpKZchw4XUcjHfw6ryCV3R8s6VXm67vp4n+lcPV9gJwmbKQEsmrJi9c2vkwrm8HFbVYNTaRGq8D91t9n5+U+aD/hNtN3HjC/nC/vUoGFSCkXP+NlRcmLUqLbiUBl4LYf1U/CCvwtd3ryCH8gUmGITAxiH1O5rnGTz7y1LuFjmnFGQ1UWuM7HwfXtWl2fPFKklYwNUpF2IL/TmaRETjQiM5SJacI+3Gv5MBU8lP5Io6gWkawpyzNEVGqOdx4YlO1dCvjbWFZWbCmeiFKPSlMKtKcMFLs/KQxtgAHi7NZNCQ32bBAW2mbHflVZ8wXKi1JKVHkW20bnYnl3dKWJeWJOiX3oKPBD6Zbi0ZvSIuWktUHB8qDR8DMMh1ZfkBL9FS9x5r0hBGLJ8pUCJv3NYH+Ae8p40mZWd5m5fhobFjQeQvqTT4VKWIYfRL0tfaXKiVl75hHReuTJEcqVlug+eOIIc4bdIydtn2K0iNZPsYWQvQio2qbO3OqAlPHDDOB7DfjGEfVF51FqqNacd6QmgFKJpMfLp5DHTv4wXlONKVXF9zTJpDV4m1sYZqJPhotcsliZM8yksKkCkzpiXt+EcRQvSQqmBS9WdWkxMTJXPSw94jqI3varCjQxTazjlMH8jTS8ilaW8014/vwA/LNa+YiFoyyx3s/KswP3O8QW1jtq45yTM/DX9a8M4voTVaO2ebvw1EooDw/yg6Y1faY+WwrdVs5Yt0hQ5EwRfYXSFxray1YvSM+kYmlpLG2/9mm1MfmbKHXr44Ih8nVKb1M537ZANUkCtdsPZ80JVKVKabVHCadaLXg+IV8i5GSwpZti0h6diTaKs9sdpUKEpd7jDUpYmHtiX33SKiO3tuydkaxA7pEc9XIQEOfWJlszj5YpL5bKeQyT7aZSBOamvSHl8xsWvgo26IP/bqk+0EJUz+gkkcvlUlyPp2kdKFtt7y5aCdks9ZJJcFp5ZWeaWKgtnXMN3ORwGLBE0PtkEIek5FY2aVssUZHtsWIvnljMVJtuVIjpZup/5VL1yPOHWWHkOMc6YySWMckczD5jUj2mlLVquFaMU8leGVaqeXis+aRRL8zm4WuBk6cyWfGMxgtr8useQEx7k/PvRoZyd9nde1GUCV84gMX8Ogu/BWezYPSR27llzQnA97oo0pYyxobYUJfsj+ysTm9zJ+S4pk0TGo9VTG0KjqYhTmALfoDZVKla2b5yhv241PxFaLJs3i05K0AAIdcGxCJZmT3ZdT7CliR7q+kur7WdQjygYtOWRL9B8E4s4LI8KpAj7bE0dg7DLOaX+MGeAi0hMMSSWZEz+RudXbZCsGYS0QqiXjH9XQbd8sCB+nIVTq7/T/FDS+zWY9q7Z2fdq1tdLb6v3hKKVDAw5gjj6o9r1wHFROdHc18MJp4SJ2Ucvu+iQ9EgkekW8VCM+psM6y+/2SBy8tNN4a3L1MzP+OLsyvESo5gS7IQOnIqMmviJBVc6zbVG1n8eXiA3j46kmvvtJlewwNDrxk4SbJOtP/TV/lIVK9ueShNbbMHfwnLTLLhbZuO79ec5XvfgRwLFK+w1r5ZWW15rVFZrE+wKqNRv5KqsLNfpGgnoUU6Y71NxEmN7MyqwqAQqoIULOw/LbuUB2+uE75gJt+kq1qY4LoxV+qR/zalupea3D5+WMeaRIn0sAI6DDWDh158fqUb4YhAxhREbUN0qyyJYkBU4V2KARXDT65gW3gRsiv7xSPYEKLwzgriWcWgPr0sbZnv7m1XHNFW6xPdGNZUdxFiUYlmXNjDVWuu7LCkX/nVkrXaJhiYktBISC2xgBXQnNEP+cptWl1eG62a7CPXrnrkTQ5BQASbEqUZWMDiZUisKyHDeLFOaJILUo5f6iDt4ZO8MlqaKLto0AmTHVVbkGuyPa1R/ywZsWRoRDoRdNMMHwYTsklMVnlAd2S0282bgMI8fiJpDh69OSL6K3qbo20KfpNMurnYGQSr/stFqZ7hYsxKlLnKAKhsmB8AIpEQ4bd/NrTLTXefsE6ChRmKWjXKVgpGoPs8GAicgKVw4K0qgDgy1A6hFq1WRat3fHF+FkU+b6H4NWpOU3KXTxrIb2qSHAb+qhm8hiSROi/9ofapjxhyKxxntPpge6KL5Z4+WBMYkAcE6+0Hd3Yh2zBsK2MV3iW0Y6cvOCroXlRb2MMJtdWx+3dkFzGh2Pe3DZ9QpSqpaR/rE1ImOrHqYYyccpiLC22amJIjRWVAherTfpQLmo6/K2pna85GrDuQPlH1Tsar8isAJbXLafSwOof4gg9RkAGm/oYpBQQiPUoyDk2BCQ1k+KILq48ErFo4WSRhHLq/y7mgw3+L85PpP6xWr6cgp9sOjYjKagOrxF148uhuaWtjet953fh1IQiEzgC+d2IgBCcUZqgTAICm2bR8oCjDLBsmg+ThyhfD+zBalsKBY1Ce54Y/t9cwfbLu9SFwEgphfopNA3yNxgyDafUM3mYTovZNgPGdd4ZFFOj1vtfFW3u7N+iHEN1HkeesDMXKPyoCDCGVMo4GCCD6PBhQ3dRZIHy0Y/3MaE5zU9mTCrwwnZojtE+qNpMSkJSpmGe0EzLyFelMJqhfFQ7a50uXxZ8pCc2wxtAKWgHoeamR2O7R+bq7IbPYItO0esdRgoTaY38hZLJ5y02oIVwoPokGIzxAMDuanQ1vn2WDQ00Rh6o5QOaCRu99fwDbQcN0XAuqkFpxT/cfz3slGRVokrNU0iqiMAJFEbKScZdmSkTUznC0U+MfwFOGdLgsewRyPKwBZYSmy6U325iUhBQNxbAC3FLKDV9VSOuQpOOukJ/GAmu/tyEbX9DgEp6dv1zoU0IqzpG6gssSjIYRVPGgU1QAQYRgIT8gEV0EXr1sqeh2I6rXjtmoCYyEDCe/PkFEi/Q48FuT29p557iN+LCwk5CK/CZ2WdAdfQZh2Z9QGrzPLSNRj5igUWzl9Vi0rCqH8G1Kp4QMLkuwMCAypdviDXyOIk0AHTM8HBYKh3b0/F+DxoNj4ZdoZfCpQVdnZarqoMaHWnMLNVcyevytGsrXQEoIbubqWYNo7NRHzdc0zvT21fWVirj7g36iy6pxogfvgHp1xH1Turbz8QyyHnXeBJicpYUctbzApwzZ1HT+FPEXMAgUZetgeGMwt4G+DHiDT2Lu+PT21fjJCAfV16a/Wu1PqOkUHSTKYhWW6PhhHUlNtWzFnA7MbY+r64vkwdpfNB2JfWgWXAvkzd42K4lN9x7Wrg4kIKgXCb4mcW595MCPJ/cTfPAMQMFWwnqwde4w8HZYJFpQwcSMhjVz4B8p6ncSCN1X4klxoIH4BN2J6taBMj6lHkAOs8JJAmXq5xsQtrPIPIIp/HG6i21xMGcFgqDXSRF0xQg14d2uy6HgKE13LSvQe52oShF5Jx1R6avyL4thhXQZHfC94oZzuPUBKFYf1VvDaxIrtV6dNGSx7DO0i1p6CzBkuAmEqyWceQY7F9+U0ObYDzoa1iKao/cOD/v6Q9gHrrr1uCeOk8fST9MG23Ul0KmM3r+Wn6Hi6WAcL7gEeaykicvgjzkjSwFsAXIR81Zx4QJ6oosVyJkCcT+4xAldCcihqvTf94HHUPXYp3REIaR4dhpQF6+FK1H0i9i7Pvh8owu3lO4PT1iuqu+DkL2Bj9+kdfGAg2TXw03iNHyobxofLE2ibjsYDPgeEQlRMR7afXbSGQcnPjI2D+sdtmuQ771dbASUsDndU7t58jrrNGRzISvwioAlHs5FA+cBE5Ccznkd8NMV6BR6ksnKLPZnMUawRDU1MZ/ib3xCdkTblHKu4blNiylH5n213yM0zubEie0o4JhzcfAy3H5qh2l17uLooBNLaO+gzonTH2uF8PQu9EyH+pjGsACTMy4cHzsPdymUSXYJOMP3yTkXqvO/lpvt0cX5ekDEu9PUfBeZODkFuAjXCaGdi6ew4qxJ8PmFfwmPpkgQjQlWqomFY6UkjmcnAtJG75EVR+NpzGpP1Ef5qUUbfowrC3zcSLX3BxgWEgEx/v9cP8H8u1Mvt9/rMDYf6sjwU1xSOPBgzFEeJLMRVFtKo5QHsUYT8ZRLCah27599EuqoC9PYjYO6aoAMHB8X1OHwEAYouHfHB3nyb2B+SnZxM/vw/bCtORjLMSy5aZoEpvgdGvlJfNPFUu/p7Z4VVK1hiI0/UTuB3ZPq4ohEbm7Mntgc1evEtknaosgZSwnDC2BdMmibpeg48X8Ixl+/8+xXdbshQXUPPvx8jT3fkELivHSmqbhblfNFShWAyQnJ3WBU6SMYSIpTDmHjdLVAdlADdz9gCplZw6mTiHqDwIsxbm9ErGusiVpg2w8Q3khKV/R9Oj8PFeF43hmW/nSd99nZzhyjCX3QOZkkB6BsH4H866WGyv9E0hVAzPYah2tkRfQZMmP2rinfOeQalge0ovhduBjJs9a1GBwReerceify49ctOh5/65ATYuMsAkVltmvTLBk4oHpdl6i+p8DoNj4Fb2vhdFYer2JSEilEwPd5n5zNoGBXEjreg/wh2NFnNRaIUHSOXa4eJRwygZoX6vnWnqVdCRT1ARxeFrNBJ+tsdooMwqnYhE7zIxnD8pZH+P0Nu1wWxCPTADfNWmqx626IBJJq6NeapcGeOmbtXvl0TeWG0Y7OGGV4+EHTtNBIT5Wd0Bujl7inXgZgfXTM5efD3qDTJ54O9v3Bkv+tdIRlq1kXcVD0BEMirmFxglNPt5pedb1AnxuCYMChUykwsTIWqT23XDpvTiKEru1cTcEMeniB+HQDehxPXNmkotFdwUPnilB/u4Nx5Xc6l8J9jH1EgKZUUt8t8cyoZleDBEt8oibDmJRAoMKJ5Oe9CSWS5ZMEJvacsGVdXDWjp/Ype5x0p9PXB2PAwt2LRD3d+ftNgpuyvxlP8pB84oB1i73vAVpwyrmXW72hfW6Dzn9Jkj4++0VQ4d0KSx1AsDA4OtXXDo63/w+GD+zC7w5SJaxsmnlYRQ4dgdjA7tTl2KNLnpJ+mvkoDxtt1a4oPaX3EVqj96o9sRKBQqU7ZOiupeAIyLMD+Y3YwHx30XWHB5CQiw7q3mj1EDlP2eBsZbz79ayUMbyHQ7s8gu4Lgip1LiGJj7NQj905/+rgUYKAA5qdrlHKIknWmqfuR+PB8RdBkDg/NgnlT89G72h2NvySnj7UyBwD+mi/IWs1xWbxuVwUIVXun5cMqBtFbrccI+DILjsVQg6eeq0itiRfedn89CvyFtpkxaauEvSANuZmB1p8FGPbU94J9medwsZ9HkUYjmI7OH5HuxendLbxTaYrPuIfE2ffXFKhoNBUp33HsFAXmCV/Vxpq5AYgFoRr5Ay93ZLRlgaIPjhZjXZZChT+aE5iWAXMX0oSFQEtwjiuhQQItTQX5IYrKfKB+queTNplR1Hoflo5/I6aPPmACwQCE2jTOYo5Dz1cs7Sod0KTG/3kEDGk3kUaUCON19xSJCab3kNpWZhSWkO8l+SpW70Wn3g0ciOIJO5JXma6dbos6jyisuxXwUUhj2+1uGhcvuliKtWwsUTw4gi1c/diEEpZHoKoxTBeMDmhPhKTx7TXWRakV8imJR355DcIHkR9IREHxohP4TbyR5LtFU24umRPRmEYHbpe1LghyxPx7YgUHjNbbQFRQhh4KeU1EabXx8FS3JAxp2rwRDoeWkJgWRUSKw6gGP5U2PuO9V4ZuiKXGGzFQuRuf+tkSSsbBtRJKhCi3ENuLlXhPbjTKD4djXVnfXFds6Zb+1XiUrRfyayGxJq1+SYBEfbKlgjiSmk0orgTqzSS+DZ5rTqsJbttiNtp+KMqGE2AHGFw6jQqM5vD6vMptmXV9OAjq49Uf/Lx9Opam+Hn5O9p8qoBBAQixzQZ4eNVkO9sPzJAMyR1y4/RCQQ1s0pV5KAU5sKLw3tkcFbI/JqrjCsK4Mw+W8aod4lioYuawUiCyVWBE/qPaFi5bnkgpfu/ae47174rI1fqQoTbW0HrU6FAejq7ByM0V4zkZTg02/YJK2N7hUQRCeZ4BIgSEqgD8XsjzG6LIsSbuHoIdz/LhFzbNn1clci1NHWJ0/6/O8HJMdIpEZbqi1RrrFfoo/rI/7ufm2MPG5lUI0IYJ4MAiHRTSOFJ2oTverFHYXThkYFIoyFx6rMYFgaOKM4xNWdlOnIcKb/suptptgTOTdVIf4YgdaAjJnIAm4qNNHNQqqAzvi53GkyRCEoseUBrHohZsjUbkR8gfKtc/+Oa72lwxJ8Mq6HDfDATbfbJhzeIuFQJSiw1uZprHlzUf90WgqG76zO0eCB1WdPv1IT6sNxxh91GEL2YpgC97ikFHyoaH92ndwduqZ6IYjkg20DX33MWdoZk7QkcKUCgisIYslOaaLyvIIqRKWQj16jE1DlQWJJaPopWTJjXfixEjRJJo8g4++wuQjbq+WVYjsqCuNIQW3YjnxKe2M5ZKEqq+cX7ZVgnkbsU3RWIyXA1rxv4kGersYJjD//auldXGmcEbcfTeF16Y1708FB1HIfmWv6dSFi6oD4E+RIjCsEZ+kY7dKnwReJJw3xCjKvi3kGN42rvyhUlIz0Bp+fNSV5xwFiuBzG296e5s/oHoFtUyUplmPulIPl+e1CQIQVtjlzLzzzbV+D/OVQtYzo5ixtMi5BmHuG4N/uKfJk5UIREp7+12oZlKtPBomXSzAY0KgtbPzzZoHQxujnREUgBU+O/jKKhgxVhRPtbqyHiUaRwRpHv7pgRPyUrnE7fYkVblGmfTY28tFCvlILC04Tz3ivkNWVazA+OsYrxvRM/hiNn8Fc4bQBeUZABGx5S/xFf9Lbbmk298X7iFg2yeimvsQqqJ+hYbt6uq+Zf9jC+Jcwiccd61NKQtFvGWrgJiHB5lwi6fR8KzYS7EaEHf/ka9EC7H8D+WEa3TEACHBkNSj/cXxFeq4RllC+fUFm2xtstYLL2nos1DfzsC9vqDDdRVcPA3Ho95aEQHvExVThXPqym65llkKlfRXbPTRiDepdylHjmV9YTWAEjlD9DdQnCem7Aj/ml58On366392214B5zrmQz/9ySG2mFqEwjq5sFl5tYJPw5hNz8lyZPUTsr5E0F2C9VMPnZckWP7+mbwp/BiN7f4kf7vtGnZF2JGvjK/sDX1RtcFY5oPQnE4lIAYV49U3C9SP0LCY/9i/WIFK9ORjzM9kG/KGrAuwFmgdEpdLaiqQNpCTGZVuAO65afkY1h33hrqyLjZy92JK3/twdj9pafFcwfXONmPQWldPlMe7jlP24Js0v9m8bIJ9TgS2IuRvE9ZVRaCwSJYOtAfL5H/YS4FfzKWKbek+GFulheyKtDNlBtrdmr+KU+ibHTdalzFUmMfxw3f36x+3cQbJLItSilW9cuvZEMjKw987jykZRlsH/UI+HlKfo2tLwemBEeBFtmxF2xmItA/dAIfQ+rXnm88dqvXa+GapOYVt/2waFimXFx3TC2MUiOi5/Ml+3rj/YU6Ihx2hXgiDXFsUeQkRAD6wF3SCPi2flk7XwKAA4zboqynuELD312EJ88lmDEVOMa1W/K/a8tGylZRMrMoILyoMQzzbDJHNZrhH77L9qSC42HVmKiZ5S0016UTp83gOhCwz9XItK9fgXfK3F5d7nZCBUekoLxrutQaPHa16Rjsa0gTrzyjqTnmcIcrxg6X6dkKiucudc0DD5W4pJPf0vuDW8r5/uw24YfMuxFRpD2ovT2mFX79xH6Jf+MVdv2TYqR6/955QgVPe3JCD/WjAYcLA9tpXgFiEjge2J5ljeI/iUzg91KQuHkII4mmHZxC3XQORLAC6G7uFn5LOmlnXkjFdoO976moNTxElS8HdxWoPAkjjocDR136m2l+f5t6xaaNgdodOvTu0rievnhNAB79WNrVs6EsPgkgfahF9gSFzzAd+rJSraw5Mllit7vUP5YxA843lUpu6/5jAR0RvH4rRXkSg3nE+O5GFyfe+L0s5r3k05FyghSFnKo4TTgs07qj4nTLqOYj6qaW9knJTDkF5OFMYbmCP+8H16Ty482OjvERV6OFyw043L9w3hoJi408sR+SGo1WviXUu8d7qS+ehKjpKwxeCthsm2LBFSFeetx0x4AaKPxtp3CxdWqCsLrB1s/j5TAhc1jNZsXWl6tjo/WDoewxzg8T8NnhZ1niUwL/nhfygLanCnRwaFGDyLw+sfZhyZ1UtYTp8TYB6dE7R3VsKKH95CUxJ8u8N+9u2/9HUNKHW3x3w5GQrfOPafk2w5qZq8MaHT0ebeY3wIsp3rN9lrpIsW9c1ws3VNV+JwNz0Lo9+V7zZr6GD56We6gWVIvtmam5GPPkVAbr74r6SwhuL+TRXtW/0pgyX16VNl4/EAD50TnUPuwrW6OcUO2VlWXS0inq872kk7GUlW6o/ozFKq+Sip6LcTtSDfDrPTcCHhx75H8BeRon+KG2wRwzfDgWhALmiWOMO6h3pm1UCZEPEjScyk7tdLx6WrdA2N1QTPENvNnhCQjW6kl057/qv7IwRryHrZBCwVSbLLnFRiHdTwk8mlYixFt1slEcPD7FVht13HyqVeyD55HOXrh2ElAxJyinGeoFzwKA91zfrdLvDxJSjzmImfvTisreI25EDcVfGsmxLVbfU8PGe/7NmWWKjXcdTJ11jAlVIY/Bv/mcxg/Q10vCHwKG1GW/XbJq5nxDhyLqiorn7Wd7VEVL8UgVzpHMjQ+Z8DUgSukiVwWAKkeTlVVeZ7t1DGnCgJVIdBPZAEK5f8CDyDNo7tK4/5DBjdD5MPV86TaEhGsLVFPQSI68KlBYy84FievdU9gWh6XZrugvtCZmi9vfd6db6V7FmoEcRHnG36VZH8N4aZaldq9zZawt1uBFgxYYx+Gs/qW1jwANeFy+LCoymyM6zgG7j8bGzUyLhvrbJkTYAEdICEb4kMKusKT9V3eIwMLsjdUdgijMc+7iKrr+TxrVWG0U+W95SGrxnxGrE4eaJFfgvAjUM4SAy8UaRwE9j6ZQH5qYAWGtXByvDiLSDfOD0yFA3UCMKSyQ30fyy1mIRg4ZcgZHLNHWl+c9SeijOvbOJxoQy7lTN2r3Y8p6ovxvUY74aOYbuVezryqXA6U+fcp6wSV9X5/OZKP18tB56Ua0gMyxJI7XyNT7IrqN8GsB9rL/kP5KMrjXxgqKLDa+V5OCH6a5hmOWemMUsea9vQl9t5Oce76PrTyTv50ExOqngE3PHPfSL//AItPdB7kGnyTRhVUUFNdJJ2z7RtktZwgmQzhBG/G7QsjZmJfCE7k75EmdIKH7xlnmDrNM/XbTT6FzldcH/rcRGxlPrv4qDScqE7JSmQABJWqRT/TUcJSwoQM+1jvDigvrjjH8oeK2in1S+/yO1j8xAws/T5u0VnIvAPqaE1atNuN0cuRliLcH2j0nTL4JpcR7w9Qya0JoaHgsOiALLCCzRkl1UUESz+ze/gIXHGtDwgYrK6pCFKJ1webSDog4zTlPkgXZqxlQDiYMjhDpwTtBW2WxthWbov9dt2X9XFLFmcF+eEc1UaQ74gqZiZsdj63pH1qcv3Vy8JYciogIVKsJ8Yy3J9w/GhjWVSQAmrS0BPOWK+RKV+0lWqXgYMnIFwpcZVD7zPSp547i9HlflB8gVnSTGmmq1ClO081OW/UH11pEQMfkEdDFzjLC1Cdo/BdL3s7cXb8J++Hzz1rhOUVZFIPehRiZ8VYu6+7Er7j5PSZu9g/GBdmNzJmyCD9wiswj9BZw+T3iBrg81re36ihMLjoVLoWc+62a1U/7qVX5CpvTVF7rocSAKwv4cBVqZm7lLDS/qoXs4fMs/VQi6BtVbNA3uSzKpQfjH1o3x4LrvkOn40zhm6hjduDglzJUwA0POabgdXIndp9fzhOo23Pe+Rk9GSLX0d71Poqry8NQDTzNlsa+JTNG9+UrEf+ngxCjGEsDCc0bz+udVRyHQI1jmEO3S+IOQycEq7XwB6z3wfMfa73m8PVRp+iOgtZfeSBl01xn03vMaQJkyj7vnhGCklsCWVRUl4y+5oNUzQ63B2dbjDF3vikd/3RUMifPYnX5Glfuk2FsV/7RqjI9yKTbE8wJY+74p7qXO8+dIYgjtLD/N8TJtRh04N9tXJA4H59IkMmLElgvr0Q5OCeVfdAt+5hkh4pQgfRMHpL74XatLQpPiOyHRs/OdmHtBf8nOZcxVKzdGclIN16lE7kJ+pVMjspOI+5+TqLRO6m0ZpNXJoZRv9MPDRcAfJUtNZHyig/s2wwReakFgPPJwCQmu1I30/tcBbji+Na53i1W1N+BqoY7Zxo+U/M9XyJ4Ok2SSkBtoOrwuhAY3a03Eu6l8wFdIG1cN+e8hopTkiKF093KuH/BcB39rMiGDLn6XVhGKEaaT/vqb/lufuAdpGExevF1+J9itkFhCfymWr9vGb3BTK4j598zRH7+e+MU9maruZqb0pkGxRDRE1CD4Z8LV4vhgPidk5w2Bq816g3nHw1//j3JStz7NR9HIWELO8TMn3QrP/zZp//+Dv9p429/ogv+GATR+n/UdF+ns9xNkXZQJXY4t9jMkJNUFygAtzndXwjss+yWH9HAnLQQfhAskdZS2l01HLWv7L7us5uTH409pqitvfSOQg/c+Zt7k879P3K9+WV68n7+3cZfuRd/dDPP/03rn+d+/nBvWfgDlt8+LzjqJ/vx3CnNOwiXhho778C96iD+1TBvRZYeP+EH81LE0vVwOOrmCLB3iKzI1x+vJEsrPH4uF0UB4TJ4X3uDfOCo3PYpYe0MF4bouh0DQ/l43fxUF7Y+dpWuvTSffB0yO2UQUETI/LwCZE3BvnevJ7c9zUlY3H58xzke6DNFDQG8n0WtDN4LAYN4nogKav1ezOfK/z+t6tsCTp+dhx4ymjWuCJk1dEUifDP+HyS4iP/Vg9B2jTo9L4NbiBuDS4nuuHW6H+JDQn2JtqRKGkEQPEYE7uzazXIkcxIAqUq1esasZBETlEZY7y7Jo+RoV/IsjY9eIMkUvr42Hc0xqtsavZvhz1OLwSxMOTuqzlhb0WbdOwBH9EYiyBjatz40bUxTHbiWxqJ0uma19qhPruvcWJlbiSSH48OLDDpaHPszvyct41ZfTu10+vjox6kOqK6v0K/gEPphEvMl/vwSv+A4Hhm36JSP9IXTyCZDm4kKsqD5ay8b1Sad/vaiyO5N/sDfEV6Z4q95E+yfjxpqBoBETW2C7xl4pIO2bDODDFurUPwE7EWC2Uplq+AHmBHvir2PSgkR12/Ry65O0aZtQPeXi9mTlF/Wj5GQ+vFkYyhXsLTjrBSP9hwk4GPqDP5rBn5/l8b0mLRAvRSzXHc293bs3s8EsdE3m2exxidWVB4joHR+S+dz5/W+v00K3TqN14CDBth8eWcsTbiwXPsygHdGid0PEdy6HHm2v/IUuV5RVapYmzGsX90mpnIdNGcOOq64Dbc5GUbYpD9M7S+6cLY//QmjxFLP5cuTFRm3vA5rkFZroFnO3bjHF35uU3s8mvL7Tp9nyTc4mymTJ5sLIp7umSnGkO23faehtz3mmTS7fbVx5rP7x3HXIjRNeq/A3xCs9JNB08c9S9BF2O3bOur0ItslFxXgRPdaapBIi4dRpKGxVz7ir69t/bc9qTxjvtOyGOfiLGDhR4fYywHv1WdOplxIV87TpLBy3Wc0QP0P9s4G7FBNOdITS/tep3o3h1TEa5XDDii7fWtqRzUEReP2fbxz7bHWWJdbIOxOUJZtItNZpTFRfj6vm9sYjRxQVO+WTdiOhdPeTJ+8YirPvoeL88l5iLYOHd3b/Imkq+1ZN1El3UikhftuteEYxf1Wujof8Pr4ICTu5ezZyZ4tHQMxlzUHLYO2VMOoNMGL/20S5i2o2obfk+8qqdR7xzbRDbgU0lnuIgz4LelQ5XS7xbLuSQtNS95v3ZUOdaUx/Qd8qxCt6xf2E62yb/HukLO6RyorV8KgYl5YNc75y+KvefrxY+lc/64y9kvWP0a0bDz/rojq+RWjO06WeruWqNFU7r3HPIcLWRql8ICZsz2Ls/qOm/CLn6++X+Qf7mGspYCrZod/lpl6Rw4xN/yuq8gqV4B6aHk1hVE1SfILxWu5gvXqbfARYQpspcxKp1F/c8XOPzkZvmoSw+vEqBLdrq1fr3wAPv5NnM9i8F+jdAuxkP5Z71c6uhK3enlnGymr7UsWZKC12qgUiG8XXGQ9mxnqz4GSIlybF9eXmbqj2sHX+a1jf0gRoONHRdRSrIq03Ty89eQ1GbV/Bk+du4+V15zls+vvERvZ4E7ZbnxWTVjDjb4o/k8jlw44pTIrUGxxuJvBeO+heuhOjpFsO6lVJ/aXnJDa/bM0Ql1cLbXE/Pbv3EZ3vj3iVrB5irjupZTzlnv677NrI9UNYNqbPgp/HZXS+lJmk87wec+7YOxTDo2aw2l3NfDr34VNlvqWJBknuK7oSlZ6/T10zuOoPZOeoIk81N+sL843WJ2Q4Z0fZ3scsqC/JV2fuhWi1jGURSKZV637lf53Xnnx16/vKEXY89aVJ0fv91jGdfG+G4+sniwHes4hS+udOr4RfhFhG/F5gUG35QaU+McuLmclb5ZWmR+sG5V6nf+PxYzlrnFGxpZaK8eqqVo0NfmAWoGfXDiT/FnUbWvzGDOTr8aktOZWg4BYvz5YH12ZbfCcGtNk+dDAZNGWvHov+PIOnY9Prjg8h/wLRrT69suaMVZ5bNuK00lSVpnqSX1NON/81FoP92rYndionwgOiA8WMf4vc8l15KqEEG4yAm2+WAN5Brfu1sq9suWYqgoajgOYt/JCk1gC8wPkK+XKCtRX6TAtgvrnuBgNRmn6I8lVDipOVB9kX6Oxkp4ZKyd1M6Gj8/v2U7k+YQBL95Kb9PQENucJb0JlW3b5tObN7m/Z1j1ev388d7o15zgXsI9CikAGAViR6lkJv7nb4Ak40M2G8TJ447kN+pvfHiOFjSUSP6PM+QfbAywKJCBaxSVxpizHseZUyUBhq59vFwrkyGoRiHbo0apweEZeSLuNiQ+HAekOnarFg00dZNXaPeoHPTRR0FmEyqYExOVaaaO8c0uFUh7U4e/UxdBmthlBDgg257Q33j1hA7HTxSeTTSuVnPZbgW1nodwmG16aKBDKxEetv7D9OjO0JhrbJTnoe+kcGoDJazFSO8/fUN9Jy/g4XK5PUkw2dgPDGpJqBfhe7GA+cjzfE/EGsMM+FV9nj9IAhrSfT/J3QE5TEIYyk5UjsI6ZZcCPr6A8FZUF4g9nnpVmjX90MLSQysIPD0nFzqwCcSJmIb5mYv2Cmk+C1MDFkZQyCBq4c/Yai9LJ6xYkGS/x2s5/frIW2vmG2Wrv0APpCdgCA9snFvfpe8uc0OwdRs4G9973PGEBnQB5qKrCQ6m6X/H7NInZ7y/1674/ZXOVp7OeuCRk8JFS516VHrnH1HkIUIlTIljjHaQtEtkJtosYul77cVwjk3gW1Ajaa6zWeyHGLlpk3VHE2VFzT2yI/EvlGUSz2H9zYE1s4nsKMtMqNyKNtL/59CpFJki5Fou6VXGm8vWATEPwrUVOLvoA8jLuwOzVBCgHB2Cr5V6OwEWtJEKokJkfc87h+sNHTvMb0KVTp5284QTPupoWvQVUwUeogZR3kBMESYo0mfukewRVPKh5+rzLQb7HKjFFIgWhj1w3yN/qCNoPI8XFiUgBNT1hCHBsAz8L7Oyt8wQWUFj92ONn/APyJFg8hzueqoJdNj57ROrFbffuS/XxrSXLTRgj5uxZjpgQYceeMc2wJrahReSKpm3QjHfqExTLAB2ipVumE8pqcZv8LYXQiPHHsgb5BMW8zM5pvQit+mQx8XGaVDcfVbLyMTlY8xcfmm/RSAT/H09UQol5gIz7rESDmnrQ4bURIB4iRXMDQwxgex1GgtDxKp2HayIkR+E/aDmCttNm2C6lytWdfOVzD6X2SpDWjQDlMRvAp1symWv4my1bPCD+E1EmGnMGWhNwmycJnDV2WrQNxO45ukEb08AAffizYKVULp15I4vbNK5DzWwCSUADfmKhfGSUqii1L2UsE8rB7mLuHuUJZOx4+WiizHBJ/hwboaBzhpNOVvgFTf5cJsHef7L1HCI9dOUUbb+YxUJWn6dYOLz+THi91kzY5dtO5c+grX7v0jEbsuoOGnoIreDIg/sFMyG+TyCLIcAWd1IZ1UNFxE8Uie13ucm40U2fcxC0u3WLvLOxwu+F7MWUsHsdtFQZ7W+nlfCASiAKyh8rnP3EyDByvtJb6Kax6/HkLzT9SyEyTMVM1zPtM0MJY14DmsWh4MgD15Ea9Hd00AdkTZ0EiG5NAGuIBzQJJ0JR0na+OB7lQA6UKxMfihIQ7GCCnVz694QvykWXTxpS2soDu+smru1UdIxSvAszBFD1c8c6ZOobA8bJiJIvuycgIXBQIXWwhyTgZDQxJTRXgEwRNAawGSXO0a1DKjdihLVNp/taE/xYhsgwe+VpKEEB4LlraQyE84gEihxCnbfoyOuJIEXy2FIYw+JjRusybKlU2g/vhTSGTydvCvXhYBdtAXtS2v7LkHtmXh/8fly1do8FI/D0f8UbzVb5h+KRhMGSAmR2mhi0YG/uj7wgxcfzCrMvdjitUIpXDX8ae2JcF/36qUWIMwN6JsjaRGNj+jEteGDcFyTUb8X/NHSucKMJp7pduxtD6KuxVlyxxwaeiC1FbGBESO84lbyrAugYxdl+2N8/6AgWpo/IeoAOcsG35IA/b3AuSyoa55L7llBLlaWlEWvuCFd8f8NfcTUgzJv6CbB+6ohWwodlk9nGWFpBAOaz5uEW5xBvmjnHFeDsb0mXwayj3mdYq5gxxNf3H3/tnCgHwjSrpSgVxLmiTtuszdRUFIsn6LiMPjL808vL1uQhDbM7aA43mISXReqjSskynIRcHCJ9qeFopJfx9tqyUoGbSwJex/0aDE3plBPGtNBYgWbdLom3+Q/bjdizR2/AS/c/dH/d3G7pyl1qDXgtOFtEqidwLqxPYtrNEveasWq3vPUUtqTeu8gpov4bdOQRI2kneFvRNMrShyVeEupK1PoLDPMSfWMIJcs267mGB8X9CehQCF0gIyhpP10mbyM7lwW1e6TGvHBV1sg/UyTghHPGRqMyaebC6pbB1WKNCQtlai1GGvmq9zUKaUzLaXsXEBYtHxmFbEZ2kJhR164LhWW2Tlp1dhsGE7ZgIWRBOx3Zcu2DxgH+G83WTPceKG0TgQKKiiNNOlWgvqNEbnrk6fVD+AqRam2OguZb0YWSTX88N+i/ELSxbaUUpPx4vJUzYg/WonSeA8xUK6u7DPHgpqWpEe6D4cXg5uK9FIYVba47V/nb+wyOtk+zG8RrS4EA0ouwa04iByRLSvoJA2FzaobbZtXnq8GdbfqEp5I2dpfpj59TCVif6+E75p665faiX8gS213RqBxTZqfHP46nF6NSenOneuT+vgbLUbdTH2/t0REFXZJOEB6DHvx6N6g9956CYrY/AYcm9gELJXYkrSi+0F0geKDZgOCIYkLU/+GOW5aGj8mvLFgtFH5+XC8hvAE3CvHRfl4ofM/Qwk4x2A+R+nyc9gNu/9Tem7XW4XRnyRymf52z09cTOdr+PG6+P/Vb4QiXlwauc5WB1z3o+IJjlbxI8MyWtSzT+k4sKVbhF3xa+vDts3NxXa87iiu+xRH9cAprnOL2h6vV54iQRXuOAj1s8nLFK8gZ70ThIQcWdF19/2xaJmT0efrkNDkWbpAQPdo92Z8+Hn/aLjbOzB9AI/k12fPs9HhUNDJ1u6ax2VxD3R6PywN7BrLJ26z6s3QoMp76qzzwetrDABKSGkfW5PwS1GvYNUbK6uRqxfyVGNyFB0E+OugMM8kKwmJmupuRWO8XkXXXQECyRVw9UyIrtCtcc4oNqXqr7AURBmKn6Khz3eBN96LwIJrAGP9mr/59uTOSx631suyT+QujDd4beUFpZ0kJEEnjlP+X/Kr2kCKhnENTg4BsMTOmMqlj2WMFLRUlVG0fzdCBgUta9odrJfpVdFomTi6ak0tFjXTcdqqvWBAzjY6hVrH9sbt3Z9gn+AVDpTcQImefbB4edirjzrsNievve4ZT4EUZWV3TxEsIW+9MT/RJoKfZZYSRGfC1CwPG/9rdMOM8qR/LUYvw5f/emUSoD7YSFuOoqchdUg2UePd1eCtFSKgxLSZ764oy4lvRCIH6bowPxZWwxNFctksLeil47pfevcBipkkBIc4ngZG+kxGZ71a72KQ7VaZ6MZOZkQJZXM6kb/Ac0/XkJx8dvyfJcWbI3zONEaEPIW8GbkYjsZcwy+eMoKrYjDmvEEixHzkCSCRPRzhOfJZuLdcbx19EL23MA8rnjTZZ787FGMnkqnpuzB5/90w1gtUSRaWcb0eta8198VEeZMUSfIhyuc4/nywFQ9uqn7jdqXh+5wwv+RK9XouNPbYdoEelNGo34KyySwigsrfCe0v/PlWPvQvQg8R0KgHO18mTVThhQrlbEQ0Kp/JxPdjHyR7E1QPw/ut0r+HDDG7BwZFm9IqEUZRpv2WpzlMkOemeLcAt5CsrzskLGaVOAxyySzZV/D2EY7ydNZMf8e8VhHcKGHAWNszf1EOq8fNstijMY4JXyATwTdncFFqcNDfDo+mWFvxJJpc4sEZtjXyBdoFcxbUmniCoKq5jydUHNjYJxMqN1KzYV62MugcELVhS3Bnd+TLLOh7dws/zSXWzxEb4Nj4aFun5x4kDWLK5TUF/yCXB/cZYvI9kPgVsG2jShtXkxfgT+xzjJofXqPEnIXIQ1lnIdmVzBOM90EXvJUW6a0nZ/7XjJGl8ToO3H/fdxnxmTNKBZxnkpXLVgLXCZywGT3YyS75w/PAH5I/jMuRspej8xZObU9kREbRA+kqjmKRFaKGWAmFQspC+QLbKPf0RaK3OXvBSWqo46p70ws/eZpu6jCtZUgQy6r4tHMPUdAgWGGUYNbuv/1a6K+MVFsd3T183+T8capSo6m0+Sh57fEeG/95dykGJBQMj09DSW2bY0mUonDy9a8trLnnL5B5LW3Nl8rJZNysO8Zb+80zXxqUGFpud3Qzwb7bf+8mq6x0TAnJU9pDQR9YQmZhlna2xuxJt0aCO/f1SU8gblOrbIyMsxTlVUW69VJPzYU2HlRXcqE2lLLxnObZuz2tT9CivfTAUYfmzJlt/lOPgsR6VN64/xQd4Jlk/RV7UKVv2Gx/AWsmTAuCWKhdwC+4HmKEKYZh2Xis4KsUR1BeObs1c13wqFRnocdmuheaTV30gvVXZcouzHKK5zwrN52jXJEuX6dGx3BCpV/++4f3hyaW/cQJLFKqasjsMuO3B3WlMq2gyYfdK1e7L2pO/tRye2mwzwZPfdUMrl5wdLqdd2Kv/wVtnpyWYhd49L6rsOV+8HXPrWH2Kup89l2tz6bf80iYSd+V4LROSOHeamvexR524q4r43rTmtFzQvArpvWfLYFZrbFspBsXNUqqenjxNNsFXatZvlIhk7teUPfK+YL32F8McTnjv0BZNppb+vshoCrtLXjIWq3EJXpVXIlG6ZNL0dh6qEm2WMwDjD3LfOfkGh1/czYc/0qhiD2ozNnH4882MVVt3JbVFkbwowNCO3KL5IoYW5wlVeGCViOuv1svZx7FbzxKzA4zGqBlRRaRWCobXaVq4yYCWbZf8eiJwt3OY+MFiSJengcFP2t0JMfzOiJ7cECvpx7neg1Rc5x+7myPJOXt2FohVRyXtD+/rDoTOyGYInJelZMjolecVHUhUNqvdZWg2J2t0jPmiLFeRD/8fOT4o+NGILb+TufCo9ceBBm3JLVn+MO2675n7qiEX/6W+188cYg3Zn5NSTjgOKfWFSAANa6raCxSoVU851oJLY11WIoYK0du0ec5E4tCnAPoKh71riTsjVIp3gKvBbEYQiNYrmH22oLQWA2AdwMnID6PX9b58dR2QKo4qag1D1Z+L/FwEKTR7osOZPWECPJIHQqPUsM5i/CH5YupVPfFA5pHUBcsesh8eO5YhyWnaVRPZn/BmdXVumZWPxMP5e28zm2uqHgFoT9CymHYNNrzrrjlXZM06HnzDxYNlI5b/QosxLmmrqDFqmogQdqk0WLkUceoAvQxHgkIyvWU69BPFr24VB6+lx75Rna6dGtrmOxDnvBojvi1/4dHjVeg8owofPe1cOnxU1ioh016s/Vudv9mhV9f35At+Sh28h1bpp8xhr09+vf47Elx3Ms6hyp6QvB3t0vnLbOhwo660cp7K0vvepabK7YJfxEWWfrC2YzJfYOjygPwfwd/1amTqa0hZ5ueebhWYVMubRTwIjj+0Oq0ohU3zfRfuL8gt59XsHdwKtxTQQ4Y2qz6gisxnm2UdlmpEkgOsZz7iEk6QOt8BuPwr+NR01LTqXmJo1C76o1N274twJvl+I069TiLpenK/miRxhyY8jvYV6W1WuSwhH9q7kuwnJMtm7IWcqs7HsnyHSqWXLSpYtZGaR1V3t0gauninFPZGtWskF65rtti48UV9uV9KM8kfDYs0pgB00S+TlzTXV6P8mxq15b9En8sz3jWSszcifZa/NuufPNnNTb031pptt0+sRSH/7UG8pzbsgtt3OG3ut7B9JzDMt2mTZuyRNIV8D54TuTrpNcHtgmMlYJeiY9XS83NYJicjRjtJSf9BZLsQv629QdDsKQhTK5CnXhpk7vMNkHzPhm0ExW/VCGApHfPyBagtZQTQmPHx7g5IXXsrQDPzIVhv2LB6Ih138iSDww1JNHrDvzUxvp73MsQBVhW8EbrReaVUcLB1R3PUXyaYG4HpJUcLVxMgDxcPkVRQpL7VTAGabDzbKcvg12t5P8TSGQkrj/gOrpnbiDHwluA73xbXts/L7u468cRWSWRtgTwlQnA47EKg0OiZDgFxAKQQUcsbGomITgeXUAAyKe03eA7Mp4gnyKQmm0LXJtEk6ddksMJCuxDmmHzmVhO+XaN2A54MIh3niw5CF7PwiXFZrnA8wOdeHLvvhdoqIDG9PDI7UnWWHq526T8y6ixJPhkuVKZnoUruOpUgOOp3iIKBjk+yi1vHo5cItHXb1PIKzGaZlRS0g5d3MV2pD8FQdGYLZ73aae/eEIUePMc4NFz8pIUfLCrrF4jVWH5gQneN3S8vANBmUXrEcKGn6hIUN95y1vpsvLwbGpzV9L0ZKTan6TDXM05236uLJcIEMKVAxKNT0K8WljuwNny3BNQRfzovA85beI9zr1AGNYnYCVkR1aGngWURUrgqR+gRrQhxW81l3CHevjvGEPzPMTxdsIfB9dfGRbZU0cg/1mcubtECX4tvaedmNAvTxCJtc2QaoUalGfENCGK7IS/O8CRpdOVca8EWCRwv2sSWE8CJPW5PCugjCXPd3h6U60cPD+bdhtXZuYB6stcoveE7Sm5MM2yvfUHXFSW7KzLmi7/EeEWL0wqcOH9MOSKjhCHHmw+JGLcYE/7SBZQCRggox0ZZTAxrlzNNXYXL5fNIjkdT4YMqVUz6p8YDt049v4OXGdg3qTrtLBUXOZf7ahPlZAY/O+7Sp0bvGSHdyQ8B1LOsplqMb9Se8VAE7gIdSZvxbRSrfl+Lk5Qaqi5QJceqjitdErcHXg/3MryljPSIAMaaloFm1cVwBJ8DNmkDqoGROSHFetrgjQ5CahuKkdH5pRPigMrgTtlFI8ufJPJSUlGgTjbBSvpRc0zypiUn6U5KZqcRoyrtzhmJ7/caeZkmVRwJQeLOG8LY6vP5ChpKhc8Js0El+n6FXqbx9ItdtLtYP92kKfaTLtCi8StLZdENJa9Ex1nOoz1kQ7qxoiZFKRyLf4O4CHRT0T/0W9F8epNKVoeyxUXhy3sQMMsJjQJEyMOjmOhMFgOmmlscV4eFi1CldU92yjwleirEKPW3bPAuEhRZV7JsKV3Lr5cETAiFuX5Nw5UlF7d2HZ96Bh0sgFIL5KGaKSoVYVlvdKpZJVP5+NZ7xDEkQhmDgsDKciazJCXJ6ZN2B3FY2f6VZyGl/t4aunGIAk/BHaS+i+SpdRfnB/OktOvyjinWNfM9Ksr6WwtCa1hCmeRI6icpFM4o8quCLsikU0tMoZI/9EqXRMpKGaWzofl4nQuVQm17d5fU5qXCQeCDqVaL9XJ9qJ08n3G3EFZS28SHEb3cdRBdtO0YcTzil3QknNKEe/smQ1fTb0XbpyNB5xAeuIlf+5KWlEY0DqJbsnzJlQxJPOVyHiKMx5Xu9FcEv1Fbg6Fhm4t+Jyy5JC1W3YO8dYLsO0PXPbxodBgttTbH3rt9Cp1lJIk2r3O1Zqu94eRbnIz2f50lWolYzuKsj4PMok4abHLO8NAC884hiXx5Fy5pWKO0bWL7uEGXaJCtznhP67SlQ4xjWIfgq6EpZ28QMtuZK7JC0RGbl9nA4XtFLug/NLMoH1pGt9IonAJqcEDLyH6TDROcbsmGPaGIxMo41IUAnQVPMPGByp4mOmh9ZQMkBAcksUK55LsZj7E5z5XuZoyWCKu6nHmDq22xI/9Z8YdxJy4kWpD16jLVrpwGLWfyOD0Wd+cBzFBxVaGv7S5k9qwh/5t/LQEXsRqI3Q9Rm3QIoaZW9GlsDaKOUyykyWuhNOprSEi0s1G4rgoiX1V743EELti+pJu5og6X0g6oTynUqlhH9k6ezyRi05NGZHz0nvp3HOJr7ebrAUFrDjbkFBObEvdQWkkUbL0pEvMU46X58vF9j9F3j6kpyetNUBItrEubW9ZvMPM4qNqLlsSBJqOH3XbNwv/cXDXNxN8iFLzUhteisYY+RlHYOuP29/Cb+L+xv+35Rv7xudnZ6ohK4cMPfCG8KI7dNmjNk/H4e84pOxn/sZHK9psfvj8ncA8qJz7O8xqbxESDivGJOZzF7o5PJLQ7g34qAWoyuA+x3btU98LT6ZyGyceIXjrqob2CAVql4VOTQPUQYvHV/g4zAuCZGvYQBtf0wmd5lilrvuEn1BXLny01B4h4SMDlYsnNpm9d7m9h578ufpef9Z4WplqWQvqo52fyUA7J24eZD5av6SyGIV9kpmHNqyvdfzcpEMw97BvknV2fq+MFHun9BT3Lsf8pbzvisWiIQvYkng+8Vxk1V+dli1u56kY50LRjaPdotvT5BwqtwyF+emo/z9J3yVUVGfKrxQtJMOAQWoQii/4dp9wgybSa5mkucmRLtEQZ/pz0tL/NVcgWAd95nEQ3Tg6tNbuyn3Iepz65L3huMUUBntllWuu4DbtOFSMSbpILV4fy6wlM0SOvi6CpLh81c1LreIvKd61uEWBcDw1lUBUW1I0Z+m/PaRlX+PQ/oxg0Ye6KUiIiTF4ADNk59Ydpt5/rkxmq9tV5Kcp/eQLUVVmBzQNVuytQCP6Ezd0G8eLxWyHpmZWJ3bAzkWTtg4lZlw42SQezEmiUPaJUuR/qklVA/87S4ArFCpALdY3QRdUw3G3XbWUp6aq9z0zUizcPa7351p9JXOZyfdZBFnqt90VzQndXB/mwf8LC9STj5kenVpNuqOQQP3mIRJj7eV21FxG8VAxKrEn3c+XfmZ800EPb9/5lIlijscUbB6da0RQaMook0zug1G0tKi/JBC4rw7/D3m4ARzAkzMcVrDcT2SyFtUdWAsFlsPDFqV3N+EjyXaoEePwroaZCiLqEzb8MW+PNE9TmTC01EzWli51PzZvUqkmyuROU+V6ik+Le/9qT6nwzUzf9tP68tYei0YaDGx6kAd7jn1cKqOCuYbiELH9zYqcc4MnRJjkeGiqaGwLImhyeKs+xKJMBlOJ05ow9gGCKZ1VpnMKoSCTbMS+X+23y042zOb5MtcY/6oBeAo1Vy89OTyhpavFP78jXCcFH0t7Gx24hMEOm2gsEfGabVpQgvFqbQKMsknFRRmuPHcZu0Su/WMFphZvB2r/EGbG72rpGGho3h+Msz0uGzJ7hNK2uqQiE1qmn0zgacKYYZBCqsxV+sjbpoVdSilW/b94n2xNb648VmNIoizqEWhBnsen+d0kbCPmRItfWqSBeOd9Wne3c6bcd6uvXOJ6WdiSsuXq0ndhqrQ4QoWUjCjYtZ0EAhnSOP1m44xkf0O7jXghrzSJWxP4a/t72jU29Vu2rvu4n7HfHkkmQOMGSS+NPeLGO5I73mC2B7+lMiBQQZRM9/9liLIfowupUFAbPBbR+lxDM6M8Ptgh1paJq5Rvs7yEuLQv/7d1oU2woFSb3FMPWQOKMuCuJ7pDDjpIclus5TeEoMBy2YdVB4fxmesaCeMNsEgTHKS5WDSGyNUOoEpcC2OFWtIRf0w27ck34/DjxRTVIcc9+kqZE6iMSiVDsiKdP/Xz5XfEhm/sBhO50p1rvJDlkyyxuJ9SPgs7YeUJBjXdeAkE+P9OQJm6SZnn1svcduI78dYmbkE2mtziPrcjVisXG78spLvbZaSFx/Rks9zP4LKn0Cdz/3JsetkT06A8f/yCgMO6Mb1Hme0JJ7b2wZz1qleqTuKBGokhPVUZ0dVu+tnQYNEY1fmkZSz6+EGZ5EzL7657mreZGR3jUfaEk458PDniBzsSmBKhDRzfXameryJv9/D5m6HIqZ0R+ouCE54Dzp4IJuuD1e4Dc5i+PpSORJfG23uVgqixAMDvchMR0nZdH5brclYwRoJRWv/rlxGRI5ffD5NPGmIDt7vDE1434pYdVZIFh89Bs94HGGJbTwrN8T6lh1HZFTOB4lWzWj6EVqxSMvC0/ljWBQ3F2kc/mO2b6tWonT2JEqEwFts8rz2h+oWNds9ceR2cb7zZvJTDppHaEhK5avWqsseWa2Dt5BBhabdWSktS80oMQrL4TvAM9b5HMmyDnO+OkkbMXfUJG7eXqTIG6lqSOEbqVR+qYdP7uWb57WEJqzyh411GAVsDinPs7KvUeXItlcMdOUWzXBH6zscymV1LLVCtc8IePojzXHF9m5b5zGwBRdzcyUJkiu938ApmAayRdJrX1PmVguWUvt2ThQ62czItTyWJMW2An/hdDfMK7SiFQlGIdAbltHz3ycoh7j9V7GxNWBpbtcSdqm4XxRwTawc3cbZ+xfSv9qQfEkDKfZTwCkqWGI/ur250ItXlMlh6vUNWEYIg9A3GzbgmbqvTN8js2YMo87CU5y6nZ4dbJLDQJj9fc7yM7tZzJDZFtqOcU8+mZjYlq4VmifI23iHb1ZoT9E+kT2dolnP1AfiOkt7PQCSykBiXy5mv637IegWSKj9IKrYZf4Lu9+I7ub+mkRdlvYzehh/jaJ9n7HUH5b2IbgeNdkY7wx1yVzxS7pbvky6+nmVUtRllEFfweUQ0/nG017WoUYSxs+j2B4FV/F62EtHlMWZXYrjGHpthnNb1x66LKZ0Qe92INWHdfR/vqp02wMS8r1G4dJqHok8KmQ7947G13a4YXbsGgHcBvRuVu1eAi4/A5+ZixmdSXM73LupB/LH7O9yxLTVXJTyBbI1S49TIROrfVCOb/czZ9pM4JsZx8kUz8dQGv7gUWKxXvTH7QM/3J2OuXXgciUhqY+cgtaOliQQVOYthBLV3xpESZT3rmfEYNZxmpBbb24CRao86prn+i9TNOh8VxRJGXJfXHATJHs1T5txgc/opYrY8XjlGQQbRcoxIBcnVsMjmU1ymmIUL4dviJXndMAJ0Yet+c7O52/p98ytlmAsGBaTAmMhimAnvp1TWNGM9BpuitGj+t810CU2UhorrjPKGtThVC8WaXw04WFnT5fTjqmPyrQ0tN3CkLsctVy2xr0ZWgiWVZ1OrlFjjxJYsOiZv2cAoOvE+7sY0I/TwWcZqMoyIKNOftwP7w++Rfg67ljfovKYa50if3fzE/8aPYVey/Nq35+nH2sLPh/fP5TsylSKGOZ4k69d2PnH43+kq++sRXHQqGArWdwhx+hpwQC6JgT2uxehYU4Zbw7oNb6/HLikPyJROGK2ouyr+vzseESp9G50T4AyFrSqOQ0rroCYP4sMDFBrHn342EyZTMlSyk47rHSq89Y9/nI3zG5lX16Z5lxphguLOcZUndL8wNcrkyjH82jqg8Bo8OYkynrxZvbFno5lUS3OPr8Ko3mX9NoRPdYOKKjD07bvgFgpZ/RF+YzkWvJ/Hs/tUbfeGzGWLxNAjfDzHHMVSDwB5SabQLsIZHiBp43FjGkaienYoDd18hu2BGwOK7U3o70K/WY/kuuKdmdrykIBUdG2mvE91L1JtTbh20mOLbk1vCAamu7utlXeGU2ooVikbU/actcgmsC1FKk2qmj3GWeIWbj4tGIxE7BLcBWUvvcnd/lYxsMV4F917fWeFB/XbINN3qGvIyTpCalz1lVewdIGqeAS/gB8Mi+sA+BqDiX3VGD2eUunTRbSY+AuDy4E3Qx3hAhwnSXX+B0zuj3eQ1miS8Vux2z/l6/BkWtjKGU72aJkOCWhGcSf3+kFkkB15vGOsQrSdFr6qTj0gBYiOlnBO41170gOWHSUoBVRU2JjwppYdhIFDfu7tIRHccSNM5KZOFDPz0TGMAjzzEpeLwTWp+kn201kU6NjbiMQJx83+LX1e1tZ10kuChJZ/XBUQ1dwaBHjTDJDqOympEk8X2M3VtVw21JksChA8w1tTefO3RJ1FMbqZ01bHHkudDB/OhLfe7P5GOHaI28ZXKTMuqo0hLWQ4HabBsGG7NbP1RiXtETz074er6w/OerJWEqjmkq2y51q1BVI+JUudnVa3ogBpzdhFE7fC7kybrAt2Z6RqDjATAUEYeYK45WMupBKQRtQlU+uNsjnzj6ZmGrezA+ASrWxQ6LMkHRXqXwNq7ftv28dUx/ZSJciDXP2SWJsWaN0FjPX9Yko6LobZ7aYW/IdUktI9apTLyHS8DyWPyuoZyxN1TK/vtfxk3HwWh6JczZC8Ftn0bIJay2g+n5wd7lm9rEsKO+svqVmi+c1j88hSCxbzrg4+HEP0Nt1/B6YW1XVm09T1CpAKjc9n18hjqsaFGdfyva1ZG0Xu3ip6N6JGpyTSqY5h4BOlpLPaOnyw45PdXTN+DtAKg7DLrLFTnWusoSBHk3s0d7YouJHq85/R09Tfc37ENXZF48eAYLnq9GLioNcwDZrC6FW6godB8JnqYUPvn0pWLfQz0lM0Yy8Mybgn84Ds3Q9bDP10bLyOV+qzxa4Rd9Dhu7cju8mMaONXK3UqmBQ9qIg7etIwEqM/kECk/Dzja4Bs1xR+Q/tCbc8IKrSGsTdJJ0vge7IG20W687uVmK6icWQ6cD3lwFzgNMGtFvO5qyJeKflGLAAcQZOrkxVwy3cWvqlGpvjmf9Qe6Ap20MPbV92DPV0OhFM4kz8Yr0ffC2zLWSQ1kqY6QdQrttR3kh1YLtQd1kCEv5hVoPIRWl5ERcUTttBIrWp6Xs5Ehh5OUUwI5aEBvuiDmUoENmnVw1FohCrbRp1A1E+XSlWVOTi7ADW+5Ohb9z1vK4qx5R5lPdGCPBJZ00mC+Ssp8VUbgpGAvXWMuWQQRbCqI6Rr2jtxZxtfP7W/8onz+yz0Gs76LaT5HX9ecyiZCB/ZR/gFtMxPsDwohoeCRtiuLxE1GM1vUEUgBv86+eehL58/P56QFGQ/MqOe/vC76L63jzmeax4exd/OKTUvkXg+fOJUHych9xt/9goJMrapSgvXrj8+8vk/N80f22Sewj6cyGqt1B6mztoeklVHHraouhvHJaG/OuBz6DHKMpFmQULU1bRWlyYE0RPXYYkUycIemN7TLtgNCJX6BqdyxDKkegO7nJK5xQ7OVYDZTMf9bVHidtk6DQX9Et+V9M7esgbsYBdEeUpsB0Xvw2kd9+rI7V+m47u+O/tq7mw7262HU1WlS9uFzsV6JxIHNmUCy0QS9e077JGRFbG65z3/dOKB/Zk+yDdKpUmdXjn/aS3N5nv4fK7bMHHmPlHd4E2+iTbV5rpzScRnxk6KARuDTJ8Q1LpK2mP8gj1EbuJ9RIyY+EWK4hCiIDBAS1Tm2IEXAFfgKPgdL9O6mAa06wjCcUAL6EsxPQWO9VNegBPm/0GgkZbDxCynxujX/92vmGcjZRMAY45puak2sFLCLSwXpEsyy5fnF0jGJBhm+fNSHKKUUfy+276A7/feLOFxxUuHRNJI2Osenxyvf8DAGObT60pfTTlhEg9u/KKkhJqm5U1/+BEcSkpFDA5XeCqxwXmPac1jcuZ3JWQ+p0NdWzb/5v1ZvF8GtMTFFEdQjpLO0bwPb0BHNWnip3liDXI2fXf05jjvfJ0NpjLCUgfTh9CMFYVFKEd4Z/OG/2C+N435mnK+9t1gvCiVcaaH7rK4+PjCvpVNiz+t2QyqH1O8x3JKZVl6Q+Lp/XK8wMjVMslOq9FdSw5FtUs/CptXH9PW+wbWHgrV17R5jTVOtGtKFu3nb80T+E0tv9QkzW3J2dbaw/8ddAKZ0pxIaEqLjlPrji3VgJ3GvdFvlqD8075woxh4fVt0JZE0KVFsAvqhe0dqN9b35jtSpnYMXkU+vZq+IAHad3IHc2s/LYrnD1anfG46IFiMIr9oNbZDWvwthqYNqOigaKd/XlLU4XHfk/PXIjPsLy/9/kAtQ+/wKH+hI/IROWj5FPvTZAT9f7j4ZXQyG4M0TujMAFXYkKvEHv1xhySekgXGGqNxWeWKlf8dDAlLuB1cb/qOD+rk7cmwt+1yKpk9cudqBanTi6zTbXRtV8qylNtjyOVKy1HTz0GW9rjt6sSjAZcT5R+KdtyYb0zyqG9pSLuCw5WBwAn7fjBjKLLoxLXMI+52L9cLwIR2B6OllJZLHJ8vDxmWdtF+QJnmt1rsHPIWY20lftk8fYePkAIg6Hgn532QoIpegMxiWgAOfe5/U44APR8Ac0NeZrVh3gEhs12W+tVSiWiUQekf/YBECUy5fdYbA08dd7VzPAP9aiVcIB9k6tY7WdJ1wNV+bHeydNtmC6G5ICtFC1ZwmJU/j8hf0I8TRVKSiz5oYIa93EpUI78X8GYIAZabx47/n8LDAAJ0nNtP1rpROprqKMBRecShca6qXuTSI3jZBLOB3Vp381B5rCGhjSvh/NSVkYp2qIdP/Bg=';
-				},
-				{},
-			],
-			6: [
-				function ( require, module, exports ) {
-					/* Copyright 2013 Google Inc. All Rights Reserved.
+  var kRingBufferWriteAheadSlack = 128 + BrotliBitReader.READ_SIZE;
+
+  br = new BrotliBitReader(input);
+
+  /* Decode window size. */
+  window_bits = DecodeWindowBits(br);
+  max_backward_distance = (1 << window_bits) - 16;
+
+  ringbuffer_size = 1 << window_bits;
+  ringbuffer_mask = ringbuffer_size - 1;
+  ringbuffer = new Uint8Array(ringbuffer_size + kRingBufferWriteAheadSlack + BrotliDictionary.maxDictionaryWordLength);
+  ringbuffer_end = ringbuffer_size;
+
+  block_type_trees = [];
+  block_len_trees = [];
+  for (var x = 0; x < 3 * HUFFMAN_MAX_TABLE_SIZE; x++) {
+    block_type_trees[x] = new HuffmanCode(0, 0);
+    block_len_trees[x] = new HuffmanCode(0, 0);
+  }
+
+  while (!input_end) {
+    var meta_block_remaining_len = 0;
+    var is_uncompressed;
+    var block_length = [ 1 << 28, 1 << 28, 1 << 28 ];
+    var block_type = [ 0 ];
+    var num_block_types = [ 1, 1, 1 ];
+    var block_type_rb = [ 0, 1, 0, 1, 0, 1 ];
+    var block_type_rb_index = [ 0 ];
+    var distance_postfix_bits;
+    var num_direct_distance_codes;
+    var distance_postfix_mask;
+    var num_distance_codes;
+    var context_map = null;
+    var context_modes = null;
+    var num_literal_htrees;
+    var dist_context_map = null;
+    var num_dist_htrees;
+    var context_offset = 0;
+    var context_map_slice = null;
+    var literal_htree_index = 0;
+    var dist_context_offset = 0;
+    var dist_context_map_slice = null;
+    var dist_htree_index = 0;
+    var context_lookup_offset1 = 0;
+    var context_lookup_offset2 = 0;
+    var context_mode;
+    var htree_command;
+
+    for (i = 0; i < 3; ++i) {
+      hgroup[i].codes = null;
+      hgroup[i].htrees = null;
+    }
+
+    br.readMoreInput();
+
+    var _out = DecodeMetaBlockLength(br);
+    meta_block_remaining_len = _out.meta_block_length;
+    if (pos + meta_block_remaining_len > output.buffer.length) {
+      /* We need to grow the output buffer to fit the additional data. */
+      var tmp = new Uint8Array( pos + meta_block_remaining_len );
+      tmp.set( output.buffer );
+      output.buffer = tmp;
+    }
+    input_end = _out.input_end;
+    is_uncompressed = _out.is_uncompressed;
+
+    if (_out.is_metadata) {
+      JumpToByteBoundary(br);
+
+      for (; meta_block_remaining_len > 0; --meta_block_remaining_len) {
+        br.readMoreInput();
+        /* Read one byte and ignore it. */
+        br.readBits(8);
+      }
+
+      continue;
+    }
+
+    if (meta_block_remaining_len === 0) {
+      continue;
+    }
+
+    if (is_uncompressed) {
+      br.bit_pos_ = (br.bit_pos_ + 7) & ~7;
+      CopyUncompressedBlockToOutput(output, meta_block_remaining_len, pos,
+                                    ringbuffer, ringbuffer_mask, br);
+      pos += meta_block_remaining_len;
+      continue;
+    }
+
+    for (i = 0; i < 3; ++i) {
+      num_block_types[i] = DecodeVarLenUint8(br) + 1;
+      if (num_block_types[i] >= 2) {
+        ReadHuffmanCode(num_block_types[i] + 2, block_type_trees, i * HUFFMAN_MAX_TABLE_SIZE, br);
+        ReadHuffmanCode(kNumBlockLengthCodes, block_len_trees, i * HUFFMAN_MAX_TABLE_SIZE, br);
+        block_length[i] = ReadBlockLength(block_len_trees, i * HUFFMAN_MAX_TABLE_SIZE, br);
+        block_type_rb_index[i] = 1;
+      }
+    }
+
+    br.readMoreInput();
+
+    distance_postfix_bits = br.readBits(2);
+    num_direct_distance_codes = NUM_DISTANCE_SHORT_CODES + (br.readBits(4) << distance_postfix_bits);
+    distance_postfix_mask = (1 << distance_postfix_bits) - 1;
+    num_distance_codes = (num_direct_distance_codes + (48 << distance_postfix_bits));
+    context_modes = new Uint8Array(num_block_types[0]);
+
+    for (i = 0; i < num_block_types[0]; ++i) {
+       br.readMoreInput();
+       context_modes[i] = (br.readBits(2) << 1);
+    }
+
+    var _o1 = DecodeContextMap(num_block_types[0] << kLiteralContextBits, br);
+    num_literal_htrees = _o1.num_htrees;
+    context_map = _o1.context_map;
+
+    var _o2 = DecodeContextMap(num_block_types[2] << kDistanceContextBits, br);
+    num_dist_htrees = _o2.num_htrees;
+    dist_context_map = _o2.context_map;
+
+    hgroup[0] = new HuffmanTreeGroup(kNumLiteralCodes, num_literal_htrees);
+    hgroup[1] = new HuffmanTreeGroup(kNumInsertAndCopyCodes, num_block_types[1]);
+    hgroup[2] = new HuffmanTreeGroup(num_distance_codes, num_dist_htrees);
+
+    for (i = 0; i < 3; ++i) {
+      hgroup[i].decode(br);
+    }
+
+    context_map_slice = 0;
+    dist_context_map_slice = 0;
+    context_mode = context_modes[block_type[0]];
+    context_lookup_offset1 = Context.lookupOffsets[context_mode];
+    context_lookup_offset2 = Context.lookupOffsets[context_mode + 1];
+    htree_command = hgroup[1].htrees[0];
+
+    while (meta_block_remaining_len > 0) {
+      var cmd_code;
+      var range_idx;
+      var insert_code;
+      var copy_code;
+      var insert_length;
+      var copy_length;
+      var distance_code;
+      var distance;
+      var context;
+      var j;
+      var copy_dst;
+
+      br.readMoreInput();
+
+      if (block_length[1] === 0) {
+        DecodeBlockType(num_block_types[1],
+                        block_type_trees, 1, block_type, block_type_rb,
+                        block_type_rb_index, br);
+        block_length[1] = ReadBlockLength(block_len_trees, HUFFMAN_MAX_TABLE_SIZE, br);
+        htree_command = hgroup[1].htrees[block_type[1]];
+      }
+      --block_length[1];
+      cmd_code = ReadSymbol(hgroup[1].codes, htree_command, br);
+      range_idx = cmd_code >> 6;
+      if (range_idx >= 2) {
+        range_idx -= 2;
+        distance_code = -1;
+      } else {
+        distance_code = 0;
+      }
+      insert_code = Prefix.kInsertRangeLut[range_idx] + ((cmd_code >> 3) & 7);
+      copy_code = Prefix.kCopyRangeLut[range_idx] + (cmd_code & 7);
+      insert_length = Prefix.kInsertLengthPrefixCode[insert_code].offset +
+          br.readBits(Prefix.kInsertLengthPrefixCode[insert_code].nbits);
+      copy_length = Prefix.kCopyLengthPrefixCode[copy_code].offset +
+          br.readBits(Prefix.kCopyLengthPrefixCode[copy_code].nbits);
+      prev_byte1 = ringbuffer[pos-1 & ringbuffer_mask];
+      prev_byte2 = ringbuffer[pos-2 & ringbuffer_mask];
+      for (j = 0; j < insert_length; ++j) {
+        br.readMoreInput();
+
+        if (block_length[0] === 0) {
+          DecodeBlockType(num_block_types[0],
+                          block_type_trees, 0, block_type, block_type_rb,
+                          block_type_rb_index, br);
+          block_length[0] = ReadBlockLength(block_len_trees, 0, br);
+          context_offset = block_type[0] << kLiteralContextBits;
+          context_map_slice = context_offset;
+          context_mode = context_modes[block_type[0]];
+          context_lookup_offset1 = Context.lookupOffsets[context_mode];
+          context_lookup_offset2 = Context.lookupOffsets[context_mode + 1];
+        }
+        context = (Context.lookup[context_lookup_offset1 + prev_byte1] |
+                   Context.lookup[context_lookup_offset2 + prev_byte2]);
+        literal_htree_index = context_map[context_map_slice + context];
+        --block_length[0];
+        prev_byte2 = prev_byte1;
+        prev_byte1 = ReadSymbol(hgroup[0].codes, hgroup[0].htrees[literal_htree_index], br);
+        ringbuffer[pos & ringbuffer_mask] = prev_byte1;
+        if ((pos & ringbuffer_mask) === ringbuffer_mask) {
+          output.write(ringbuffer, ringbuffer_size);
+        }
+        ++pos;
+      }
+      meta_block_remaining_len -= insert_length;
+      if (meta_block_remaining_len <= 0) break;
+
+      if (distance_code < 0) {
+        var context;
+
+        br.readMoreInput();
+        if (block_length[2] === 0) {
+          DecodeBlockType(num_block_types[2],
+                          block_type_trees, 2, block_type, block_type_rb,
+                          block_type_rb_index, br);
+          block_length[2] = ReadBlockLength(block_len_trees, 2 * HUFFMAN_MAX_TABLE_SIZE, br);
+          dist_context_offset = block_type[2] << kDistanceContextBits;
+          dist_context_map_slice = dist_context_offset;
+        }
+        --block_length[2];
+        context = (copy_length > 4 ? 3 : copy_length - 2) & 0xff;
+        dist_htree_index = dist_context_map[dist_context_map_slice + context];
+        distance_code = ReadSymbol(hgroup[2].codes, hgroup[2].htrees[dist_htree_index], br);
+        if (distance_code >= num_direct_distance_codes) {
+          var nbits;
+          var postfix;
+          var offset;
+          distance_code -= num_direct_distance_codes;
+          postfix = distance_code & distance_postfix_mask;
+          distance_code >>= distance_postfix_bits;
+          nbits = (distance_code >> 1) + 1;
+          offset = ((2 + (distance_code & 1)) << nbits) - 4;
+          distance_code = num_direct_distance_codes +
+              ((offset + br.readBits(nbits)) <<
+               distance_postfix_bits) + postfix;
+        }
+      }
+
+      /* Convert the distance code to the actual distance by possibly looking */
+      /* up past distnaces from the ringbuffer. */
+      distance = TranslateShortCodes(distance_code, dist_rb, dist_rb_idx);
+      if (distance < 0) {
+        throw new Error('[BrotliDecompress] invalid distance');
+      }
+
+      if (pos < max_backward_distance &&
+          max_distance !== max_backward_distance) {
+        max_distance = pos;
+      } else {
+        max_distance = max_backward_distance;
+      }
+
+      copy_dst = pos & ringbuffer_mask;
+
+      if (distance > max_distance) {
+        if (copy_length >= BrotliDictionary.minDictionaryWordLength &&
+            copy_length <= BrotliDictionary.maxDictionaryWordLength) {
+          var offset = BrotliDictionary.offsetsByLength[copy_length];
+          var word_id = distance - max_distance - 1;
+          var shift = BrotliDictionary.sizeBitsByLength[copy_length];
+          var mask = (1 << shift) - 1;
+          var word_idx = word_id & mask;
+          var transform_idx = word_id >> shift;
+          offset += word_idx * copy_length;
+          if (transform_idx < Transform.kNumTransforms) {
+            var len = Transform.transformDictionaryWord(ringbuffer, copy_dst, offset, copy_length, transform_idx);
+            copy_dst += len;
+            pos += len;
+            meta_block_remaining_len -= len;
+            if (copy_dst >= ringbuffer_end) {
+              output.write(ringbuffer, ringbuffer_size);
+
+              for (var _x = 0; _x < (copy_dst - ringbuffer_end); _x++)
+                ringbuffer[_x] = ringbuffer[ringbuffer_end + _x];
+            }
+          } else {
+            throw new Error("Invalid backward reference. pos: " + pos + " distance: " + distance +
+              " len: " + copy_length + " bytes left: " + meta_block_remaining_len);
+          }
+        } else {
+          throw new Error("Invalid backward reference. pos: " + pos + " distance: " + distance +
+            " len: " + copy_length + " bytes left: " + meta_block_remaining_len);
+        }
+      } else {
+        if (distance_code > 0) {
+          dist_rb[dist_rb_idx & 3] = distance;
+          ++dist_rb_idx;
+        }
+
+        if (copy_length > meta_block_remaining_len) {
+          throw new Error("Invalid backward reference. pos: " + pos + " distance: " + distance +
+            " len: " + copy_length + " bytes left: " + meta_block_remaining_len);
+        }
+
+        for (j = 0; j < copy_length; ++j) {
+          ringbuffer[pos & ringbuffer_mask] = ringbuffer[(pos - distance) & ringbuffer_mask];
+          if ((pos & ringbuffer_mask) === ringbuffer_mask) {
+            output.write(ringbuffer, ringbuffer_size);
+          }
+          ++pos;
+          --meta_block_remaining_len;
+        }
+      }
+
+      /* When we get here, we must have inserted at least one literal and */
+      /* made a copy of at least length two, therefore accessing the last 2 */
+      /* bytes is valid. */
+      prev_byte1 = ringbuffer[(pos - 1) & ringbuffer_mask];
+      prev_byte2 = ringbuffer[(pos - 2) & ringbuffer_mask];
+    }
+
+    /* Protect pos from overflow, wrap it around at every GB of input data */
+    pos &= 0x3fffffff;
+  }
+
+  output.write(ringbuffer, pos & ringbuffer_mask);
+}
+
+exports.BrotliDecompress = BrotliDecompress;
+
+BrotliDictionary.init();
+
+},{"./bit_reader":1,"./context":2,"./dictionary":6,"./huffman":7,"./prefix":9,"./streams":10,"./transform":11}],4:[function(require,module,exports){
+var base64 = require('base64-js');
+//var fs = require('fs');
+
+/**
+ * The normal dictionary-data.js is quite large, which makes it
+ * unsuitable for browser usage. In order to make it smaller,
+ * we read dictionary.bin, which is a compressed version of
+ * the dictionary, and on initial load, Brotli decompresses
+ * it's own dictionary. 😜
+ */
+exports.init = function() {
+  var BrotliDecompressBuffer = require('./decode').BrotliDecompressBuffer;
+  var compressed = base64.toByteArray(require('./dictionary.bin.js'));
+  return BrotliDecompressBuffer(compressed);
+};
+
+},{"./decode":3,"./dictionary.bin.js":5,"base64-js":8}],5:[function(require,module,exports){
+module.exports="W5/fcQLn5gKf2XUbAiQ1XULX+TZz6ADToDsgqk6qVfeC0e4m6OO2wcQ1J76ZBVRV1fRkEsdu//62zQsFEZWSTCnMhcsQKlS2qOhuVYYMGCkV0fXWEoMFbESXrKEZ9wdUEsyw9g4bJlEt1Y6oVMxMRTEVbCIwZzJzboK5j8m4YH02qgXYhv1V+PM435sLVxyHJihaJREEhZGqL03txGFQLm76caGO/ovxKvzCby/3vMTtX/459f0igi7WutnKiMQ6wODSoRh/8Lx1V3Q99MvKtwB6bHdERYRY0hStJoMjNeTsNX7bn+Y7e4EQ3bf8xBc7L0BsyfFPK43dGSXpL6clYC/I328h54/VYrQ5i0648FgbGtl837svJ35L3Mot/+nPlNpWgKx1gGXQYqX6n+bbZ7wuyCHKcUok12Xjqub7NXZGzqBx0SD+uziNf87t7ve42jxSKQoW3nyxVrWIGlFShhCKxjpZZ5MeGna0+lBkk+kaN8F9qFBAFgEogyMBdcX/T1W/WnMOi/7ycWUQloEBKGeC48MkiwqJkJO+12eQiOFHMmck6q/IjWW3RZlany23TBm+cNr/84/oi5GGmGBZWrZ6j+zykVozz5fT/QH/Da6WTbZYYPynVNO7kxzuNN2kxKKWche5WveitPKAecB8YcAHz/+zXLjcLzkdDSktNIDwZE9J9X+tto43oJy65wApM3mDzYtCwX9lM+N5VR3kXYo0Z3t0TtXfgBFg7gU8oN0Dgl7fZlUbhNll+0uuohRVKjrEd8egrSndy5/Tgd2gqjA4CAVuC7ESUmL3DZoGnfhQV8uwnpi8EGvAVVsowNRxPudck7+oqAUDkwZopWqFnW1riss0t1z6iCISVKreYGNvQcXv+1L9+jbP8cd/dPUiqBso2q+7ZyFBvENCkkVr44iyPbtOoOoCecWsiuqMSML5lv+vN5MzUr+Dnh73G7Q1YnRYJVYXHRJaNAOByiaK6CusgFdBPE40r0rvqXV7tksKO2DrHYXBTv8P5ysqxEx8VDXUDDqkPH6NNOV/a2WH8zlkXRELSa8P+heNyJBBP7PgsG1EtWtNef6/i+lcayzQwQCsduidpbKfhWUDgAEmyhGu/zVTacI6RS0zTABrOYueemnVa19u9fT23N/Ta6RvTpof5DWygqreCqrDAgM4LID1+1T/taU6yTFVLqXOv+/MuQOFnaF8vLMKD7tKWDoBdALgxF33zQccCcdHx8fKIVdW69O7qHtXpeGr9jbbpFA+qRMWr5hp0s67FPc7HAiLV0g0/peZlW7hJPYEhZyhpSwahnf93/tZgfqZWXFdmdXBzqxGHLrQKxoAY6fRoBhgCRPmmGueYZ5JexTVDKUIXzkG/fqp/0U3hAgQdJ9zumutK6nqWbaqvm1pgu03IYR+G+8s0jDBBz8cApZFSBeuWasyqo2OMDKAZCozS+GWSvL/HsE9rHxooe17U3s/lTE+VZAk4j3dp6uIGaC0JMiqR5CUsabPyM0dOYDR7Ea7ip4USZlya38YfPtvrX/tBlhHilj55nZ1nfN24AOAi9BVtz/Mbn8AEDJCqJgsVUa6nQnSxv2Fs7l/NlCzpfYEjmPrNyib/+t0ei2eEMjvNhLkHCZlci4WhBe7ePZTmzYqlY9+1pxtS4GB+5lM1BHT9tS270EWUDYFq1I0yY/fNiAk4bk9yBgmef/f2k6AlYQZHsNFnW8wBQxCd68iWv7/35bXfz3JZmfGligWAKRjIs3IpzxQ27vAglHSiOzCYzJ9L9A1CdiyFvyR66ucA4jKifu5ehwER26yV7HjKqn5Mfozo7Coxxt8LWWPT47BeMxX8p0Pjb7hZn+6bw7z3Lw+7653j5sI8CLu5kThpMlj1m4c2ch3jGcP1FsT13vuK3qjecKTZk2kHcOZY40UX+qdaxstZqsqQqgXz+QGF99ZJLqr3VYu4aecl1Ab5GmqS8k/GV5b95zxQ5d4EfXUJ6kTS/CXF/aiqKDOT1T7Jz5z0PwDUcwr9clLN1OJGCiKfqvah+h3XzrBOiLOW8wvn8gW6qE8vPxi+Efv+UH55T7PQFVMh6cZ1pZQlzJpKZ7P7uWvwPGJ6DTlR6wbyj3Iv2HyefnRo/dv7dNx+qaa0N38iBsR++Uil7Wd4afwDNsrzDAK4fXZwvEY/jdKuIKXlfrQd2C39dW7ntnRbIp9OtGy9pPBn/V2ASoi/2UJZfS+xuGLH8bnLuPlzdTNS6zdyk8Dt/h6sfOW5myxh1f+zf3zZ3MX/mO9cQPp5pOx967ZA6/pqHvclNfnUFF+rq+Vd7alKr6KWPcIDhpn6v2K6NlUu6LrKo8b/pYpU/Gazfvtwhn7tEOUuXht5rUJdSf6sLjYf0VTYDgwJ81yaqKTUYej/tbHckSRb/HZicwGJqh1mAHB/IuNs9dc9yuvF3D5Xocm3elWFdq5oEy70dYFit79yaLiNjPj5UUcVmZUVhQEhW5V2Z6Cm4HVH/R8qlamRYwBileuh07CbEce3TXa2JmXWBf+ozt319psboobeZhVnwhMZzOeQJzhpTDbP71Tv8HuZxxUI/+ma3XW6DFDDs4+qmpERwHGBd2edxwUKlODRdUWZ/g0GOezrbzOZauFMai4QU6GVHV6aPNBiBndHSsV4IzpvUiiYyg6OyyrL4Dj5q/Lw3N5kAwftEVl9rNd7Jk5PDij2hTH6wIXnsyXkKePxbmHYgC8A6an5Fob/KH5GtC0l4eFso+VpxedtJHdHpNm+Bvy4C79yVOkrZsLrQ3OHCeB0Ra+kBIRldUGlDCEmq2RwXnfyh6Dz+alk6eftI2n6sastRrGwbwszBeDRS/Fa/KwRJkCzTsLr/JCs5hOPE/MPLYdZ1F1fv7D+VmysX6NpOC8aU9F4Qs6HvDyUy9PvFGDKZ/P5101TYHFl8pjj6wm/qyS75etZhhfg0UEL4OYmHk6m6dO192AzoIyPSV9QedDA4Ml23rRbqxMPMxf7FJnDc5FTElVS/PyqgePzmwVZ26NWhRDQ+oaT7ly7ell4s3DypS1s0g+tOr7XHrrkZj9+x/mJBttrLx98lFIaRZzHz4aC7r52/JQ4VjHahY2/YVXZn/QC2ztQb/sY3uRlyc5vQS8nLPGT/n27495i8HPA152z7Fh5aFpyn1GPJKHuPL8Iw94DuW3KjkURAWZXn4EQy89xiKEHN1mk/tkM4gYDBxwNoYvRfE6LFqsxWJtPrDGbsnLMap3Ka3MUoytW0cvieozOmdERmhcqzG+3HmZv2yZeiIeQTKGdRT4HHNxekm1tY+/n06rGmFleqLscSERzctTKM6G9P0Pc1RmVvrascIxaO1CQCiYPE15bD7c3xSeW7gXxYjgxcrUlcbIvO0r+Yplhx0kTt3qafDOmFyMjgGxXu73rddMHpV1wMubyAGcf/v5dLr5P72Ta9lBF+fzMJrMycwv+9vnU3ANIl1cH9tfW7af8u0/HG0vV47jNFXzFTtaha1xvze/s8KMtCYucXc1nzfd/MQydUXn/b72RBt5wO/3jRcMH9BdhC/yctKBIveRYPrNpDWqBsO8VMmP+WvRaOcA4zRMR1PvSoO92rS7pYEv+fZfEfTMzEdM+6X5tLlyxExhqLRkms5EuLovLfx66de5fL2/yX02H52FPVwahrPqmN/E0oVXnsCKhbi/yRxX83nRbUKWhzYceXOntfuXn51NszJ6MO73pQf5Pl4in3ec4JU8hF7ppV34+mm9r1LY0ee/i1O1wpd8+zfLztE0cqBxggiBi5Bu95v9l3r9r/U5hweLn+TbfxowrWDqdJauKd8+q/dH8sbPkc9ttuyO94f7/XK/nHX46MPFLEb5qQlNPvhJ50/59t9ft3LXu7uVaWaO2bDrDCnRSzZyWvFKxO1+vT8MwwunR3bX0CkfPjqb4K9O19tn5X50PvmYpEwHtiW9WtzuV/s76B1zvLLNkViNd8ySxIl/3orfqP90TyTGaf7/rx8jQzeHJXdmh/N6YDvbvmTBwCdxfEQ1NcL6wNMdSIXNq7b1EUzRy1/Axsyk5p22GMG1b+GxFgbHErZh92wuvco0AuOLXct9hvw2nw/LqIcDRRmJmmZzcgUa7JpM/WV/S9IUfbF56TL2orzqwebdRD8nIYNJ41D/hz37Fo11p2Y21wzPcn713qVGhqtevStYfGH4n69OEJtPvbbLYWvscDqc3Hgnu166+tAyLnxrX0Y5zoYjV++1sI7t5kMr02KT/+uwtkc+rZLOf/qn/s3nYCf13Dg8/sB2diJgjGqjQ+TLhxbzyue2Ob7X6/9lUwW7a+lbznHzOYy8LKW1C/uRPbQY3KW/0gO9LXunHLvPL97afba9bFtc9hmz7GAttjVYlCvQAiOwAk/gC5+hkLEs6tr3AZKxLJtOEwk2dLxTYWsIB/j/ToWtIWzo906FrSG8iaqqqqqqiIiIiAgzMzMzNz+AyK+01/zi8n8S+Y1MjoRaQ80WU/G8MBlO+53VPXANrWm4wzGUVZUjjBJZVdhpcfkjsmcWaO+UEldXi1e+zq+HOsCpknYshuh8pOLISJun7TN0EIGW2xTnlOImeecnoGW4raxe2G1T3HEvfYUYMhG+gAFOAwh5nK8mZhwJMmN7r224QVsNFvZ87Z0qatvknklyPDK3Hy45PgVKXji52Wen4d4PlFVVYGnNap+fSpFbK90rYnhUc6n91Q3AY9E0tJOFrcfZtm/491XbcG/jsViUPPX76qmeuiz+qY1Hk7/1VPM405zWVuoheLUimpWYdVzCmUdKHebMdzgrYrb8mL2eeLSnRWHdonfZa8RsOU9F37w+591l5FLYHiOqWeHtE/lWrBHcRKp3uhtr8yXm8LU/5ms+NM6ZKsqu90cFZ4o58+k4rdrtB97NADFbwmEG7lXqvirhOTOqU14xuUF2myIjURcPHrPOQ4lmM3PeMg7bUuk0nnZi67bXsU6H8lhqIo8TaOrEafCO1ARK9PjC0QOoq2BxmMdgYB9G/lIb9++fqNJ2s7BHGFyBNmZAR8J3KCo012ikaSP8BCrf6VI0X5xdnbhHIO+B5rbOyB54zXkzfObyJ4ecwxfqBJMLFc7m59rNcw7hoHnFZ0b00zee+gTqvjm61Pb4xn0kcDX4jvHM0rBXZypG3DCKnD/Waa/ZtHmtFPgO5eETx+k7RrVg3aSwm2YoNXnCs3XPQDhNn+Fia6IlOOuIG6VJH7TP6ava26ehKHQa2T4N0tcZ9dPCGo3ZdnNltsHQbeYt5vPnJezV/cAeNypdml1vCHI8M81nSRP5Qi2+mI8v/sxiZru9187nRtp3f/42NemcONa+4eVC3PCZzc88aZh851CqSsshe70uPxeN/dmYwlwb3trwMrN1Gq8jbnApcVDx/yDPeYs5/7r62tsQ6lLg+DiFXTEhzR9dHqv0iT4tgj825W+H3XiRUNUZT2kR9Ri0+lp+UM3iQtS8uOE23Ly4KYtvqH13jghUntJRAewuzNLDXp8RxdcaA3cMY6TO2IeSFRXezeWIjCqyhsUdMYuCgYTZSKpBype1zRfq8FshvfBPc6BAQWl7/QxIDp3VGo1J3vn42OEs3qznws+YLRXbymyB19a9XBx6n/owcyxlEYyFWCi+kG9F+EyD/4yn80+agaZ9P7ay2Dny99aK2o91FkfEOY8hBwyfi5uwx2y5SaHmG+oq/zl1FX/8irOf8Y3vAcX/6uLP6A6nvMO24edSGPjQc827Rw2atX+z2bKq0CmW9mOtYnr5/AfDa1ZfPaXnKtlWborup7QYx+Or2uWb+N3N//2+yDcXMqIJdf55xl7/vsj4WoPPlxLxtVrkJ4w/tTe3mLdATOOYwxcq52w5Wxz5MbPdVs5O8/lhfE7dPj0bIiPQ3QV0iqm4m3YX8hRfc6jQ3fWepevMqUDJd86Z4vwM40CWHnn+WphsGHfieF02D3tmZvpWD+kBpNCFcLnZhcmmrhpGzzbdA+sQ1ar18OJD87IOKOFoRNznaHPNHUfUNhvY1iU+uhvEvpKHaUn3qK3exVVyX4joipp3um7FmYJWmA+WbIDshRpbVRx5/nqstCgy87FGbfVB8yDGCqS+2qCsnRwnSAN6zgzxfdB2nBT/vZ4/6uxb6oH8b4VBRxiIB93wLa47hG3w2SL/2Z27yOXJFwZpSJaBYyvajA7vRRYNKqljXKpt/CFD/tSMr18DKKbwB0xggBePatl1nki0yvqW5zchlyZmJ0OTxJ3D+fsYJs/mxYN5+Le5oagtcl+YsVvy8kSjI2YGvGjvmpkRS9W2dtXqWnVuxUhURm1lKtou/hdEq19VBp9OjGvHEQSmrpuf2R24mXGheil8KeiANY8fW1VERUfBImb64j12caBZmRViZHbeVMjCrPDg9A90IXrtnsYCuZtRQ0PyrKDjBNOsPfKsg1pA02gHlVr0OXiFhtp6nJqXVzcbfM0KnzC3ggOENPE9VBdmHKN6LYaijb4wXxJn5A0FSDF5j+h1ooZx885Jt3ZKzO5n7Z5WfNEOtyyPqQEnn7WLv5Fis3PdgMshjF1FRydbNyeBbyKI1oN1TRVrVK7kgsb/zjX4NDPIRMctVeaxVB38Vh1x5KbeJbU138AM5KzmZu3uny0ErygxiJF7GVXUrPzFxrlx1uFdAaZFDN9cvIb74qD9tzBMo7L7WIEYK+sla1DVMHpF0F7b3+Y6S+zjvLeDMCpapmJo1weBWuxKF3rOocih1gun4BoJh1kWnV/Jmiq6uOhK3VfKxEHEkafjLgK3oujaPzY6SXg8phhL4TNR1xvJd1Wa0aYFfPUMLrNBDCh4AuGRTbtKMc6Z1Udj8evY/ZpCuMAUefdo69DZUngoqE1P9A3PJfOf7WixCEj+Y6t7fYeHbbxUAoFV3M89cCKfma3fc1+jKRe7MFWEbQqEfyzO2x/wrO2VYH7iYdQ9BkPyI8/3kXBpLaCpU7eC0Yv/am/tEDu7HZpqg0EvHo0nf/R/gRzUWy33/HXMJQeu1GylKmOkXzlCfGFruAcPPhaGqZOtu19zsJ1SO2Jz4Ztth5cBX6mRQwWmDwryG9FUMlZzNckMdK+IoMJv1rOWnBamS2w2KHiaPMPLC15hCZm4KTpoZyj4E2TqC/P6r7/EhnDMhKicZZ1ZwxuC7DPzDGs53q8gXaI9kFTK+2LTq7bhwsTbrMV8Rsfua5lMS0FwbTitUVnVa1yTb5IX51mmYnUcP9wPr8Ji1tiYJeJV9GZTrQhF7vvdU2OTU42ogJ9FDwhmycI2LIg++03C6scYhUyUuMV5tkw6kGUoL+mjNC38+wMdWNljn6tGPpRES7veqrSn5TRuv+dh6JVL/iDHU1db4c9WK3++OrH3PqziF916UMUKn8G67nN60GfWiHrXYhUG3yVWmyYak59NHj8t1smG4UDiWz2rPHNrKnN4Zo1LBbr2/eF9YZ0n0blx2nG4X+EKFxvS3W28JESD+FWk61VCD3z/URGHiJl++7TdBwkCj6tGOH3qDb0QqcOF9Kzpj0HUb/KyFW3Yhj2VMKJqGZleFBH7vqvf7WqLC3XMuHV8q8a4sTFuxUtkD/6JIBvKaVjv96ndgruKZ1k/BHzqf2K9fLk7HGXANyLDd1vxkK/i055pnzl+zw6zLnwXlVYVtfmacJgEpRP1hbGgrYPVN6v2lG+idQNGmwcKXu/8xEj/P6qe/sB2WmwNp6pp8jaISMkwdleFXYK55NHWLTTbutSUqjBfDGWo/Yg918qQ+8BRZSAHZbfuNZz2O0sov1Ue4CWlVg3rFhM3Kljj9ksGd/NUhk4nH+a5UN2+1i8+NM3vRNp7uQ6sqexSCukEVlVZriHNqFi5rLm9TMWa4qm3idJqppQACol2l4VSuvWLfta4JcXy3bROPNbXOgdOhG47LC0CwW/dMlSx4Jf17aEU3yA1x9p+Yc0jupXgcMuYNku64iYOkGToVDuJvlbEKlJqsmiHbvNrIVZEH+yFdF8DbleZ6iNiWwMqvtMp/mSpwx5KxRrT9p3MAPTHGtMbfvdFhyj9vhaKcn3At8Lc16Ai+vBcSp1ztXi7rCJZx/ql7TXcclq6Q76UeKWDy9boS0WHIjUuWhPG8LBmW5y2rhuTpM5vsLt+HOLh1Yf0DqXa9tsfC+kaKt2htA0ai/L2i7RKoNjEwztkmRU0GfgW1TxUvPFhg0V7DdfWJk5gfrccpYv+MA9M0dkGTLECeYwUixRzjRFdmjG7zdZIl3XKB9YliNKI31lfa7i2JG5C8Ss+rHe0D7Z696/V3DEAOWHnQ9yNahMUl5kENWS6pHKKp2D1BaSrrHdE1w2qNxIztpXgUIrF0bm15YML4b6V1k+GpNysTahKMVrrS85lTVo9OGJ96I47eAy5rYWpRf/mIzeoYU1DKaQCTUVwrhHeyNoDqHel+lLxr9WKzhSYw7vrR6+V5q0pfi2k3L1zqkubY6rrd9ZLvSuWNf0uqnkY+FpTvFzSW9Fp0b9l8JA7THV9eCi/PY/SCZIUYx3BU2alj7Cm3VV6eYpios4b6WuNOJdYXUK3zTqj5CVG2FqYM4Z7CuIU0qO05XR0d71FHM0YhZmJmTRfLlXEumN82BGtzdX0S19t1e+bUieK8zRmqpa4Qc5TSjifmaQsY2ETLjhI36gMR1+7qpjdXXHiceUekfBaucHShAOiFXmv3sNmGQyU5iVgnoocuonQXEPTFwslHtS8R+A47StI9wj0iSrtbi5rMysczFiImsQ+bdFClnFjjpXXwMy6O7qfjOr8Fb0a7ODItisjnn3EQO16+ypd1cwyaAW5Yzxz5QknfMO7643fXW/I9y3U2xH27Oapqr56Z/tEzglj6IbT6HEHjopiXqeRbe5mQQvxtcbDOVverN0ZgMdzqRYRjaXtMRd56Q4cZSmdPvZJdSrhJ1D9zNXPqAEqPIavPdfubt5oke2kmv0dztIszSv2VYuoyf1UuopbsYb+uX9h6WpwjpgtZ6fNNawNJ4q8O3CFoSbioAaOSZMx2GYaPYB+rEb6qjQiNRFQ76TvwNFVKD+BhH9VhcKGsXzmMI7BptU/CNWolM7YzROvpFAntsiWJp6eR2d3GarcYShVYSUqhmYOWj5E96NK2WvmYNTeY7Zs4RUEdv9h9QT4EseKt6LzLrqEOs3hxAY1MaNWpSa6zZx8F3YOVeCYMS88W+CYHDuWe4yoc6YK+djDuEOrBR5lvh0r+Q9uM88lrjx9x9AtgpQVNE8r+3O6Gvw59D+kBF/UMXyhliYUtPjmvXGY6Dk3x+kEOW+GtdMVC4EZTqoS/jmR0P0LS75DOc/w2vnri97M4SdbZ8qeU7gg8DVbERkU5geaMQO3mYrSYyAngeUQqrN0C0/vsFmcgWNXNeidsTAj7/4MncJR0caaBUpbLK1yBCBNRjEv6KvuVSdpPnEMJdsRRtqJ+U8tN1gXA4ePHc6ZT0eviI73UOJF0fEZ8YaneAQqQdGphNvwM4nIqPnXxV0xA0fnCT+oAhJuyw/q8jO0y8CjSteZExwBpIN6SvNp6A5G/abi6egeND/1GTguhuNjaUbbnSbGd4L8937Ezm34Eyi6n1maeOBxh3PI0jzJDf5mh/BsLD7F2GOKvlA/5gtvxI3/eV4sLfKW5Wy+oio+es/u6T8UU+nsofy57Icb/JlZHPFtCgd/x+bwt3ZT+xXTtTtTrGAb4QehC6X9G+8YT+ozcLxDsdCjsuOqwPFnrdLYaFc92Ui0m4fr39lYmlCaqTit7G6O/3kWDkgtXjNH4BiEm/+jegQnihOtfffn33WxsFjhfMd48HT+f6o6X65j7XR8WLSHMFkxbvOYsrRsF1bowDuSQ18Mkxk4qz2zoGPL5fu9h2Hqmt1asl3Q3Yu3szOc+spiCmX4AETBM3pLoTYSp3sVxahyhL8eC4mPN9k2x3o0xkiixIzM3CZFzf5oR4mecQ5+ax2wCah3/crmnHoqR0+KMaOPxRif1oEFRFOO/kTPPmtww+NfMXxEK6gn6iU32U6fFruIz8Q4WgljtnaCVTBgWx7diUdshC9ZEa5yKpRBBeW12r/iNc/+EgNqmhswNB8SBoihHXeDF7rrWDLcmt3V8GYYN7pXRy4DZjj4DJuUBL5iC3DQAaoo4vkftqVTYRGLS3mHZ7gdmdTTqbgNN/PTdTCOTgXolc88MhXAEUMdX0iy1JMuk5wLsgeu0QUYlz2S4skTWwJz6pOm/8ihrmgGfFgri+ZWUK2gAPHgbWa8jaocdSuM4FJYoKicYX/ZSENkg9Q1ZzJfwScfVnR2DegOGwCvmogaWJCLQepv9WNlU6QgsmOwICquU28Mlk3d9W5E81lU/5Ez0LcX6lwKMWDNluNKfBDUy/phJgBcMnfkh9iRxrdOzgs08JdPB85Lwo+GUSb4t3nC+0byqMZtO2fQJ4U2zGIr49t/28qmmGv2RanDD7a3FEcdtutkW8twwwlUSpb8QalodddbBfNHKDQ828BdE7OBgFdiKYohLawFYqpybQoxATZrheLhdI7+0Zlu9Q1myRcd15r9UIm8K2LGJxqTegntqNVMKnf1a8zQiyUR1rxoqjiFxeHxqFcYUTHfDu7rhbWng6qOxOsI+5A1p9mRyEPdVkTlE24vY54W7bWc6jMgZvNXdfC9/9q7408KDsbdL7Utz7QFSDetz2picArzrdpL8OaCHC9V26RroemtDZ5yNM/KGkWMyTmfnInEvwtSD23UcFcjhaE3VKzkoaEMKGBft4XbIO6forTY1lmGQwVmKicBCiArDzE+1oIxE08fWeviIOD5TznqH+OoHadvoOP20drMPe5Irg3XBQziW2XDuHYzjqQQ4wySssjXUs5H+t3FWYMHppUnBHMx/nYIT5d7OmjDbgD9F6na3m4l7KdkeSO3kTEPXafiWinogag7b52taiZhL1TSvBFmEZafFq2H8khQaZXuitCewT5FBgVtPK0j4xUHPfUz3Q28eac1Z139DAP23dgki94EC8vbDPTQC97HPPSWjUNG5tWKMsaxAEMKC0665Xvo1Ntd07wCLNf8Q56mrEPVpCxlIMVlQlWRxM3oAfpgIc+8KC3rEXUog5g06vt7zgXY8grH7hhwVSaeuvC06YYRAwpbyk/Unzj9hLEZNs2oxPQB9yc+GnL6zTgq7rI++KDJwX2SP8Sd6YzTuw5lV/kU6eQxRD12omfQAW6caTR4LikYkBB1CMOrvgRr/VY75+NSB40Cni6bADAtaK+vyxVWpf9NeKJxN2KYQ8Q2xPB3K1s7fuhvWbr2XpgW044VD6DRs0qXoqKf1NFsaGvKJc47leUV3pppP/5VTKFhaGuol4Esfjf5zyCyUHmHthChcYh4hYLQF+AFWsuq4t0wJyWgdwQVOZiV0efRHPoK5+E1vjz9wTJmVkITC9oEstAsyZSgE/dbicwKr89YUxKZI+owD205Tm5lnnmDRuP/JnzxX3gMtlrcX0UesZdxyQqYQuEW4R51vmQ5xOZteUd8SJruMlTUzhtVw/Nq7eUBcqN2/HVotgfngif60yKEtoUx3WYOZlVJuJOh8u59fzSDPFYtQgqDUAGyGhQOAvKroXMcOYY0qjnStJR/G3aP+Jt1sLVlGV8POwr/6OGsqetnyF3TmTqZjENfnXh51oxe9qVUw2M78EzAJ+IM8lZ1MBPQ9ZWSVc4J3mWSrLKrMHReA5qdGoz0ODRsaA+vwxXA2cAM4qlfzBJA6581m4hzxItQw5dxrrBL3Y6kCbUcFxo1S8jyV44q//+7ASNNudZ6xeaNOSIUffqMn4A9lIjFctYn2gpEPAb3f7p3iIBN8H14FUGQ9ct2hPsL+cEsTgUrR47uJVN4n4wt/wgfwwHuOnLd4yobkofy8JvxSQTA7rMpDIc608SlZFJfZYcmbT0tAHpPE8MrtQ42siTUNWxqvWZOmvu9f0JPoQmg+6l7sZWwyfi6PXkxJnwBraUG0MYG4zYHQz3igy/XsFkx5tNQxw43qvI9dU3f0DdhOUlHKjmi1VAr2Kiy0HZwD8VeEbhh0OiDdMYspolQsYdSwjCcjeowIXNZVUPmL2wwIkYhmXKhGozdCJ4lRKbsf4NBh/XnQoS92NJEWOVOFs2YhN8c5QZFeK0pRdAG40hqvLbmoSA8xQmzOOEc7wLcme9JOsjPCEgpCwUs9E2DohMHRhUeyGIN6TFvrbny8nDuilsDpzrH5mS76APoIEJmItS67sQJ+nfwddzmjPxcBEBBCw0kWDwd0EZCkNeOD7NNQhtBm7KHL9mRxj6U1yWU2puzlIDtpYxdH4ZPeXBJkTGAJfUr/oTCz/iypY6uXaR2V1doPxJYlrw2ghH0D5gbrhFcIxzYwi4a/4hqVdf2DdxBp6vGYDjavxMAAoy+1+3aiO6S3W/QAKNVXagDtvsNtx7Ks+HKgo6U21B+QSZgIogV5Bt+BnXisdVfy9VyXV+2P5fMuvdpAjM1o/K9Z+XnE4EOCrue+kcdYHqAQ0/Y/OmNlQ6OI33jH/uD1RalPaHpJAm2av0/xtpqdXVKNDrc9F2izo23Wu7firgbURFDNX9eGGeYBhiypyXZft2j3hTvzE6PMWKsod//rEILDkzBXfi7xh0eFkfb3/1zzPK/PI5Nk3FbZyTl4mq5BfBoVoqiPHO4Q4QKZAlrQ3MdNfi3oxIjvsM3kAFv3fdufurqYR3PSwX/mpGy/GFI/B2MNPiNdOppWVbs/gjF3YH+QA9jMhlAbhvasAHstB0IJew09iAkmXHl1/TEj+jvHOpOGrPRQXbPADM+Ig2/OEcUcpgPTItMtW4DdqgfYVI/+4hAFWYjUGpOP/UwNuB7+BbKOcALbjobdgzeBQfjgNSp2GOpxzGLj70Vvq5cw2AoYENwKLUtJUX8sGRox4dVa/TN4xKwaKcl9XawQR/uNus700Hf17pyNnezrUgaY9e4MADhEDBpsJT6y1gDJs1q6wlwGhuUzGR7C8kgpjPyHWwsvrf3yn1zJEIRa5eSxoLAZOCR9xbuztxFRJW9ZmMYfCFJ0evm9F2fVnuje92Rc4Pl6A8bluN8MZyyJGZ0+sNSb//DvAFxC2BqlEsFwccWeAl6CyBcQV1bx4mQMBP1Jxqk1EUADNLeieS2dUFbQ/c/kvwItbZ7tx0st16viqd53WsRmPTKv2AD8CUnhtPWg5aUegNpsYgasaw2+EVooeNKmrW3MFtj76bYHJm5K9gpAXZXsE5U8DM8XmVOSJ1F1WnLy6nQup+jx52bAb+rCq6y9WXl2B2oZDhfDkW7H3oYfT/4xx5VncBuxMXP2lNfhUVQjSSzSRbuZFE4vFawlzveXxaYKVs8LpvAb8IRYF3ZHiRnm0ADeNPWocwxSzNseG7NrSEVZoHdKWqaGEBz1N8Pt7kFbqh3LYmAbm9i1IChIpLpM5AS6mr6OAPHMwwznVy61YpBYX8xZDN/a+lt7n+x5j4bNOVteZ8lj3hpAHSx1VR8vZHec4AHO9XFCdjZ9eRkSV65ljMmZVzaej2qFn/qt1lvWzNZEfHxK3qOJrHL6crr0CRzMox5f2e8ALBB4UGFZKA3tN6F6IXd32GTJXGQ7DTi9j/dNcLF9jCbDcWGKxoKTYblIwbLDReL00LRcDPMcQuXLMh5YzgtfjkFK1DP1iDzzYYVZz5M/kWYRlRpig1htVRjVCknm+h1M5LiEDXOyHREhvzCGpFZjHS0RsK27o2avgdilrJkalWqPW3D9gmwV37HKmfM3F8YZj2ar+vHFvf3B8CRoH4kDHIK9mrAg+owiEwNjjd9V+FsQKYR8czJrUkf7Qoi2YaW6EVDZp5zYlqiYtuXOTHk4fAcZ7qBbdLDiJq0WNV1l2+Hntk1mMWvxrYmc8kIx8G3rW36J6Ra4lLrTOCgiOihmow+YnzUT19jbV2B3RWqSHyxkhmgsBqMYWvOcUom1jDQ436+fcbu3xf2bbeqU/ca+C4DOKE+e3qvmeMqW3AxejfzBRFVcwVYPq4L0APSWWoJu+5UYX4qg5U6YTioqQGPG9XrnuZ/BkxuYpe6Li87+18EskyQW/uA+uk2rpHpr6hut2TlVbKgWkFpx+AZffweiw2+VittkEyf/ifinS/0ItRL2Jq3tQOcxPaWO2xrG68GdFoUpZgFXaP2wYVtRc6xYCfI1CaBqyWpg4bx8OHBQwsV4XWMibZZ0LYjWEy2IxQ1mZrf1/UNbYCJplWu3nZ4WpodIGVA05d+RWSS+ET9tH3RfGGmNI1cIY7evZZq7o+a0bjjygpmR3mVfalkT/SZGT27Q8QGalwGlDOS9VHCyFAIL0a1Q7JiW3saz9gqY8lqKynFrPCzxkU4SIfLc9VfCI5edgRhDXs0edO992nhTKHriREP1NJC6SROMgQ0xO5kNNZOhMOIT99AUElbxqeZF8A3xrfDJsWtDnUenAHdYWSwAbYjFqQZ+D5gi3hNK8CSxU9i6f6ClL9IGlj1OPMQAsr84YG6ijsJpCaGWj75c3yOZKBB9mNpQNPUKkK0D6wgLH8MGoyRxTX6Y05Q4AnYNXMZwXM4eij/9WpsM/9CoRnFQXGR6MEaY+FXvXEO3RO0JaStk6OXuHVATHJE+1W+TU3bSZ2ksMtqjO0zfSJCdBv7y2d8DMx6TfVme3q0ZpTKMMu4YL/t7ciTNtdDkwPogh3Cnjx7qk08SHwf+dksZ7M2vCOlfsF0hQ6J4ehPCaHTNrM/zBSOqD83dBEBCW/F/LEmeh0nOHd7oVl3/Qo/9GUDkkbj7yz+9cvvu+dDAtx8NzCDTP4iKdZvk9MWiizvtILLepysflSvTLFBZ37RLwiriqyRxYv/zrgFd/9XVHh/OmzBvDX4mitMR/lUavs2Vx6cR94lzAkplm3IRNy4TFfu47tuYs9EQPIPVta4P64tV+sZ7n3ued3cgEx2YK+QL5+xms6osk8qQbTyuKVGdaX9FQqk6qfDnT5ykxk0VK7KZ62b6DNDUfQlqGHxSMKv1P0XN5BqMeKG1P4Wp5QfZDUCEldppoX0U6ss2jIko2XpURKCIhfaOqLPfShdtS37ZrT+jFRSH2xYVV1rmT/MBtRQhxiO4MQ3iAGlaZi+9PWBEIXOVnu9jN1f921lWLZky9bqbM3J2MAAI9jmuAx3gyoEUa6P2ivs0EeNv/OR+AX6q5SW6l5HaoFuS6jr6yg9limu+P0KYKzfMXWcQSfTXzpOzKEKpwI3YGXZpSSy2LTlMgfmFA3CF6R5c9xWEtRuCg2ZPUQ2Nb6dRFTNd4TfGHrnEWSKHPuRyiJSDAZ+KX0VxmSHjGPbQTLVpqixia2uyhQ394gBMt7C3ZAmxn/DJS+l1fBsAo2Eir/C0jG9csd4+/tp12pPc/BVJGaK9mfvr7M/CeztrmCO5qY06Edi4xAGtiEhnWAbzLy2VEyazE1J5nPmgU4RpW4Sa0TnOT6w5lgt3/tMpROigHHmexBGAMY0mdcDbDxWIz41NgdD6oxgHsJRgr5RnT6wZAkTOcStU4NMOQNemSO7gxGahdEsC+NRVGxMUhQmmM0llWRbbmFGHzEqLM4Iw0H7577Kyo+Zf+2cUFIOw93gEY171vQaM0HLwpjpdRR6Jz7V0ckE7XzYJ0TmY9znLdzkva0vNrAGGT5SUZ5uaHDkcGvI0ySpwkasEgZPMseYcu85w8HPdSNi+4T6A83iAwDbxgeFcB1ZM2iGXzFcEOUlYVrEckaOyodfvaYSQ7GuB4ISE0nYJc15X/1ciDTPbPCgYJK55VkEor4LvzL9S2WDy4xj+6FOqVyTAC2ZNowheeeSI5hA/02l8UYkv4nk9iaVn+kCVEUstgk5Hyq+gJm6R9vG3rhuM904he/hFmNQaUIATB1y3vw+OmxP4X5Yi6A5I5jJufHCjF9+AGNwnEllZjUco6XhsO5T5+R3yxz5yLVOnAn0zuS+6zdj0nTJbEZCbXJdtpfYZfCeCOqJHoE2vPPFS6eRLjIJlG69X93nfR0mxSFXzp1Zc0lt/VafDaImhUMtbnqWVb9M4nGNQLN68BHP7AR8Il9dkcxzmBv8PCZlw9guY0lurbBsmNYlwJZsA/B15/HfkbjbwPddaVecls/elmDHNW2r4crAx43feNkfRwsaNq/yyJ0d/p5hZ6AZajz7DBfUok0ZU62gCzz7x8eVfJTKA8IWn45vINLSM1q+HF9CV9qF3zP6Ml21kPPL3CXzkuYUlnSqT+Ij4tI/od5KwIs+tDajDs64owN7tOAd6eucGz+KfO26iNcBFpbWA5732bBNWO4kHNpr9D955L61bvHCF/mwSrz6eQaDjfDEANqGMkFc+NGxpKZzCD2sj/JrHd+zlPQ8Iz7Q+2JVIiVCuCKoK/hlAEHzvk/Piq3mRL1rT/fEh9hoT5GJmeYswg1otiKydizJ/fS2SeKHVu6Z3JEHjiW8NaTQgP5xdBli8nC57XiN9hrquBu99hn9zqwo92+PM2JXtpeVZS0PdqR5mDyDreMMtEws+CpwaRyyzoYtfcvt9PJIW0fJVNNi/FFyRsea7peLvJrL+5b4GOXJ8tAr+ATk9f8KmiIsRhqRy0vFzwRV3Z5dZ3QqIU8JQ/uQpkJbjMUMFj2F9sCFeaBjI4+fL/oN3+LQgjI4zuAfQ+3IPIPFQBccf0clJpsfpnBxD84atwtupkGqKvrH7cGNl/QcWcSi6wcVDML6ljOgYbo+2BOAWNNjlUBPiyitUAwbnhFvLbnqw42kR3Yp2kv2dMeDdcGOX5kT4S6M44KHEB/SpCfl7xgsUvs+JNY9G3O2X/6FEt9FyAn57lrbiu+tl83sCymSvq9eZbe9mchL7MTf/Ta78e80zSf0hYY5eUU7+ff14jv7Xy8qjzfzzzvaJnrIdvFb5BLWKcWGy5/w7+vV2cvIfwHqdTB+RuJK5oj9mbt0Hy94AmjMjjwYNZlNS6uiyxNnwNyt3gdreLb64p/3+08nXkb92LTkkRgFOwk1oGEVllcOj5lv1hfAZywDows0944U8vUFw+A/nuVq/UCygsrmWIBnHyU01d0XJPwriEOvx/ISK6Pk4y2w0gmojZs7lU8TtakBAdne4v/aNxmMpK4VcGMp7si0yqsiolXRuOi1Z1P7SqD3Zmp0CWcyK4Ubmp2SXiXuI5nGLCieFHKHNRIlcY3Pys2dwMTYCaqlyWSITwr2oGXvyU3h1Pf8eQ3w1bnD7ilocVjYDkcXR3Oo1BXgMLTUjNw2xMVwjtp99NhSVc5aIWrDQT5DHPKtCtheBP4zHcw4dz2eRdTMamhlHhtfgqJJHI7NGDUw1XL8vsSeSHyKqDtqoAmrQqsYwvwi7HW3ojWyhIa5oz5xJTaq14NAzFLjVLR12rRNUQ6xohDnrWFb5bG9yf8aCD8d5phoackcNJp+Dw3Due3RM+5Rid7EuIgsnwgpX0rUWh/nqPtByMhMZZ69NpgvRTKZ62ViZ+Q7Dp5r4K0d7EfJuiy06KuIYauRh5Ecrhdt2QpTS1k1AscEHvapNbU3HL1F2TFyR33Wxb5MvH5iZsrn3SDcsxlnnshO8PLwmdGN+paWnQuORtZGX37uhFT64SeuPsx8UOokY6ON85WdQ1dki5zErsJGazcBOddWJEKqNPiJpsMD1GrVLrVY+AOdPWQneTyyP1hRX/lMM4ZogGGOhYuAdr7F/DOiAoc++cn5vlf0zkMUJ40Z1rlgv9BelPqVOpxKeOpzKdF8maK+1Vv23MO9k/8+qpLoxrIGH2EDQlnGmH8CD31G8QqlyQIcpmR5bwmSVw9/Ns6IHgulCRehvZ/+VrM60Cu/r3AontFfrljew74skYe2uyn7JKQtFQBQRJ9ryGic/zQOsbS4scUBctA8cPToQ3x6ZBQu6DPu5m1bnCtP8TllLYA0UTQNVqza5nfew3Mopy1GPUwG5jsl0OVXniPmAcmLqO5HG8Hv3nSLecE9oOjPDXcsTxoCBxYyzBdj4wmnyEV4kvFDunipS8SSkvdaMnTBN9brHUR8xdmmEAp/Pdqk9uextp1t+JrtXwpN/MG2w/qhRMpSNxQ1uhg/kKO30eQ/FyHUDkWHT8V6gGRU4DhDMxZu7xXij9Ui6jlpWmQCqJg3FkOTq3WKneCRYZxBXMNAVLQgHXSCGSqNdjebY94oyIpVjMYehAiFx/tqzBXFHZaL5PeeD74rW5OysFoUXY8sebUZleFTUa/+zBKVTFDopTReXNuZq47QjkWnxjirCommO4L/GrFtVV21EpMyw8wyThL5Y59d88xtlx1g1ttSICDwnof6lt/6zliPzgVUL8jWBjC0o2D6Kg+jNuThkAlaDJsq/AG2aKA//A76avw2KNqtv223P+Wq3StRDDNKFFgtsFukYt1GFDWooFVXitaNhb3RCyJi4cMeNjROiPEDb4k+G3+hD8tsg+5hhmSc/8t2JTSwYoCzAI75doq8QTHe+E/Tw0RQSUDlU+6uBeNN3h6jJGX/mH8oj0i3caCNsjvTnoh73BtyZpsflHLq6AfwJNCDX4S98h4+pCOhGKDhV3rtkKHMa3EG4J9y8zFWI4UsfNzC/Rl5midNn7gwoN9j23HGCQQ+OAZpTTPMdiVow740gIyuEtd0qVxMyNXhHcnuXRKdw5wDUSL358ktjMXmAkvIB73BLa1vfF9BAUZInPYJiwxqFWQQBVk7gQH4ojfUQ/KEjn+A/WR6EEe4CtbpoLe1mzHkajgTIoE0SLDHVauKhrq12zrAXBGbPPWKCt4DGedq3JyGRbmPFW32bE7T20+73BatV/qQhhBWfWBFHfhYWXjALts38FemnoT+9bn1jDBMcUMmYgSc0e7GQjv2MUBwLU8ionCpgV+Qrhg7iUIfUY6JFxR0Y+ZTCPM+rVuq0GNLyJXX6nrUTt8HzFBRY1E/FIm2EeVA9NcXrj7S6YYIChVQCWr/m2fYUjC4j0XLkzZ8GCSLfmkW3PB/xq+nlXsKVBOj7vTvqKCOMq7Ztqr3cQ+N8gBnPaAps+oGwWOkbuxnRYj/x/WjiDclVrs22xMK4qArE1Ztk1456kiJriw6abkNeRHogaPRBgbgF9Z8i/tbzWELN4CvbqtrqV9TtGSnmPS2F9kqOIBaazHYaJ9bi3AoDBvlZasMluxt0BDXfhp02Jn411aVt6S4TUB8ZgFDkI6TP6gwPY85w+oUQSsjIeXVminrwIdK2ZAawb8Se6XOJbOaliQxHSrnAeONDLuCnFejIbp4YDtBcQCwMsYiRZfHefuEJqJcwKTTJ8sx5hjHmJI1sPFHOr6W9AhZ2NAod38mnLQk1gOz2LCAohoQbgMbUK9RMEA3LkiF7Sr9tLZp6lkciIGhE2V546w3Mam53VtVkGbB9w0Yk2XiRnCmbpxmHr2k4eSC0RuNbjNsUfDIfc8DZvRvgUDe1IlKdZTzcT4ZGEb53dp8VtsoZlyXzLHOdAbsp1LPTVaHvLA0GYDFMbAW/WUBfUAdHwqLFAV+3uHvYWrCfhUOR2i89qvCBoOb48usAGdcF2M4aKn79k/43WzBZ+xR1L0uZfia70XP9soQReeuhZiUnXFDG1T8/OXNmssTSnYO+3kVLAgeiY719uDwL9FQycgLPessNihMZbAKG7qwPZyG11G1+ZA3jAX2yddpYfmaKBlmfcK/V0mwIRUDC0nJSOPUl2KB8h13F4dlVZiRhdGY5farwN+f9hEb1cRi41ZcGDn6Xe9MMSTOY81ULJyXIHSWFIQHstVYLiJEiUjktlHiGjntN5/btB8Fu+vp28zl2fZXN+dJDyN6EXhS+0yzqpl/LSJNEUVxmu7BsNdjAY0jVsAhkNuuY0E1G48ej25mSt+00yPbQ4SRCVkIwb6ISvYtmJRPz9Zt5dk76blf+lJwAPH5KDF+vHAmACLoCdG2Adii6dOHnNJnTmZtoOGO8Q1jy1veMw6gbLFToQmfJa7nT7Al89mRbRkZZQxJTKgK5Kc9INzmTJFp0tpAPzNmyL/F08bX3nhCumM/cR/2RPn9emZ3VljokttZD1zVWXlUIqEU7SLk5I0lFRU0AcENXBYazNaVzsVHA/sD3o9hm42wbHIRb/BBQTKzAi8s3+bMtpOOZgLdQzCYPfX3UUxKd1WYVkGH7lh/RBBgMZZwXzU9+GYxdBqlGs0LP+DZ5g2BWNh6FAcR944B+K/JTWI3t9YyVyRhlP4CCoUk/mmF7+r2pilVBjxXBHFaBfBtr9hbVn2zDuI0kEOG3kBx8CGdPOjX1ph1POOZJUO1JEGG0jzUy2tK4X0CgVNYhmkqqQysRNtKuPdCJqK3WW57kaV17vXgiyPrl4KEEWgiGF1euI4QkSFHFf0TDroQiLNKJiLbdhH0YBhriRNCHPxSqJmNNoketaioohqMglh6wLtEGWSM1EZbQg72h0UJAIPVFCAJOThpQGGdKfFovcwEeiBuZHN2Ob4uVM7+gwZLz1D9E7ta4RmMZ24OBBAg7Eh6dLXGofZ4U2TFOCQMKjwhVckjrydRS+YaqCw1kYt6UexuzbNEDyYLTZnrY1PzsHZJT4U+awO2xlqTSYu6n/U29O2wPXgGOEKDMSq+zTUtyc8+6iLp0ivav4FKx+xxVy4FxhIF/pucVDqpsVe2jFOfdZhTzLz2QjtzvsTCvDPU7bzDH2eXVKUV9TZ+qFtaSSxnYgYdXKwVreIgvWhT9eGDB2OvnWyPLfIIIfNnfIxU8nW7MbcH05nhlsYtaW9EZRsxWcKdEqInq1DiZPKCz7iGmAU9/ccnnQud2pNgIGFYOTAWjhIrd63aPDgfj8/sdlD4l+UTlcxTI9jbaMqqN0gQxSHs60IAcW3cH4p3V1aSciTKB29L1tz2eUQhRiTgTvmqc+sGtBNh4ky0mQJGsdycBREP+fAaSs1EREDVo5gvgi5+aCN7NECw30owbCc1mSpjiahyNVwJd1jiGgzSwfTpzf2c5XJvG/g1n0fH88KHNnf+u7ZiRMlXueSIsloJBUtW9ezvsx9grfsX/FNxnbxU1Lvg0hLxixypHKGFAaPu0xCD8oDTeFSyfRT6s8109GMUZL8m2xXp8X2dpPCWWdX84iga4BrTlOfqox4shqEgh/Ht4qRst52cA1xOIUuOxgfUivp6v5f8IVyaryEdpVk72ERAwdT4aoY1usBgmP+0m06Q216H/nubtNYxHaOIYjcach3A8Ez/zc0KcShhel0HCYjFsA0FjYqyJ5ZUH1aZw3+zWC0hLpM6GDfcAdn9fq2orPmZbW6XXrf+Krc9RtvII5jeD3dFoT1KwZJwxfUMvc5KLfn8rROW23Jw89sJ2a5dpB3qWDUBWF2iX8OCuKprHosJ2mflBR+Wqs86VvgI/XMnsqb97+VlKdPVysczPj8Jhzf+WCvGBHijAqYlavbF60soMWlHbvKT+ScvhprgeTln51xX0sF+Eadc/l2s2a5BgkVbHYyz0E85p0LstqH+gEGiR84nBRRFIn8hLSZrGwqjZ3E29cuGi+5Z5bp7EM8MWFa9ssS/vy4VrDfECSv7DSU84DaP0sXI3Ap4lWznQ65nQoTKRWU30gd7Nn8ZowUvGIx4aqyXGwmA/PB4qN8msJUODezUHEl0VP9uo+cZ8vPFodSIB4C7lQYjEFj8yu49C2KIV3qxMFYTevG8KqAr0TPlkbzHHnTpDpvpzziAiNFh8xiT7C/TiyH0EguUw4vxAgpnE27WIypV+uFN2zW7xniF/n75trs9IJ5amB1zXXZ1LFkJ6GbS/dFokzl4cc2mamVwhL4XU0Av5gDWAl+aEWhAP7t2VIwU+EpvfOPDcLASX7H7lZpXA2XQfbSlD4qU18NffNPoAKMNSccBfO9YVVgmlW4RydBqfHAV7+hrZ84WJGho6bNT0YMhxxLdOx/dwGj0oyak9aAkNJ8lRJzUuA8sR+fPyiyTgUHio5+Pp+YaKlHrhR41jY5NESPS3x+zTMe0S2HnLOKCOQPpdxKyviBvdHrCDRqO+l96HhhNBLXWv4yEMuEUYo8kXnYJM8oIgVM4XJ+xXOev4YbWeqsvgq0lmw4/PiYr9sYLt+W5EAuYSFnJEan8CwJwbtASBfLBBpJZiRPor/aCJBZsM+MhvS7ZepyHvU8m5WSmaZnxuLts8ojl6KkS8oSAHkq5GWlCB/NgJ5W3rO2Cj1MK7ahxsCrbTT3a0V/QQH+sErxV4XUWDHx0kkFy25bPmBMBQ6BU3HoHhhYcJB9JhP6NXUWKxnE0raXHB6U9KHpWdQCQI72qevp5fMzcm+AvC85rsynVQhruDA9fp9COe7N56cg1UKGSas89vrN+WlGLYTwi5W+0xYdKEGtGCeNJwXKDU0XqU5uQYnWsMwTENLGtbQMvoGjIFIEMzCRal4rnBAg7D/CSn8MsCvS+FDJJAzoiioJEhZJgAp9n2+1Yznr7H+6eT4YkJ9Mpj60ImcW4i4iHDLn9RydB8dx3QYm3rsX6n4VRrZDsYK6DCGwkwd5n3/INFEpk16fYpP6JtMQpqEMzcOfQGAHXBTEGzuLJ03GYQL9bmV2/7ExDlRf+Uvf1sM2frRtCWmal12pMgtonvSCtR4n1CLUZRdTHDHP1Otwqd+rcdlavnKjUB/OYXQHUJzpNyFoKpQK+2OgrEKpGyIgIBgn2y9QHnTJihZOpEvOKIoHAMGAXHmj21Lym39Mbiow4IF+77xNuewziNVBxr6KD5e+9HzZSBIlUa/AmsDFJFXeyrQakR3FwowTGcADJHcEfhGkXYNGSYo4dh4bxwLM+28xjiqkdn0/3R4UEkvcBrBfn/SzBc1XhKM2VPlJgKSorjDac96V2UnQYXl1/yZPT4DVelgO+soMjexXwYO58VLl5xInQUZI8jc3H2CPnCNb9X05nOxIy4MlecasTqGK6s2az4RjpF2cQP2G28R+7wDPsZDZC/kWtjdoHC7SpdPmqQrUAhMwKVuxCmYTiD9q/O7GHtZvPSN0CAUQN/rymXZNniYLlJDE70bsk6Xxsh4kDOdxe7A2wo7P9F5YvqqRDI6brf79yPCSp4I0jVoO4YnLYtX5nzspR5WB4AKOYtR1ujXbOQpPyYDvfRE3FN5zw0i7reehdi7yV0YDRKRllGCGRk5Yz+Uv1fYl2ZwrnGsqsjgAVo0xEUba8ohjaNMJNwTwZA/wBDWFSCpg1eUH8MYL2zdioxRTqgGQrDZxQyNzyBJPXZF0+oxITJAbj7oNC5JwgDMUJaM5GqlGCWc//KCIrI+aclEe4IA0uzv7cuj6GCdaJONpi13O544vbtIHBF+A+JeDFUQNy61Gki3rtyQ4aUywn6ru314/dkGiP8Iwjo0J/2Txs49ZkwEl4mx+iYUUO55I6pJzU4P+7RRs+DXZkyKUYZqVWrPF4I94m4Wx1tXeE74o9GuX977yvJ/jkdak8+AmoHVjI15V+WwBdARFV2IPirJgVMdsg1Pez2VNHqa7EHWdTkl3XTcyjG9BiueWFvQfXI8aWSkuuRmqi/HUuzqyvLJfNfs0txMqldYYflWB1BS31WkuPJGGwXUCpjiQSktkuBMWwHjSkQxeehqw1Kgz0Trzm7QbtgxiEPDVmWCNCAeCfROTphd1ZNOhzLy6XfJyG6Xgd5MCAZw4xie0Sj5AnY1/akDgNS9YFl3Y06vd6FAsg2gVQJtzG7LVq1OH2frbXNHWH/NY89NNZ4QUSJqL2yEcGADbT38X0bGdukqYlSoliKOcsSTuqhcaemUeYLLoI8+MZor2RxXTRThF1LrHfqf/5LcLAjdl4EERgUysYS2geE+yFdasU91UgUDsc2cSQ1ZoT9+uLOwdgAmifwQqF028INc2IQEDfTmUw3eZxvz7Ud1z3xc1PQfeCvfKsB9jOhRj7rFyb9XcDWLcYj0bByosychMezMLVkFiYcdBBQtvI6K0KRuOZQH2kBsYHJaXTkup8F0eIhO1/GcIwWKpr2mouB7g5TUDJNvORXPXa/mU8bh27TAZYBe2sKx4NSv5OjnHIWD2RuysCzBlUfeNXhDd2jxnHoUlheJ3jBApzURy0fwm2FwwsSU0caQGl0Kv8hopRQE211NnvtLRsmCNrhhpEDoNiZEzD2QdJWKbRRWnaFedXHAELSN0t0bfsCsMf0ktfBoXBoNA+nZN9+pSlmuzspFevmsqqcMllzzvkyXrzoA+Ryo1ePXpdGOoJvhyru+EBRsmOp7MXZ0vNUMUqHLUoKglg1p73sWeZmPc+KAw0pE2zIsFFE5H4192KwDvDxdxEYoDBDNZjbg2bmADTeUKK57IPD4fTYF4c6EnXx/teYMORBDtIhPJneiZny7Nv/zG+YmekIKCoxr6kauE2bZtBLufetNG0BtBY7f+/ImUypMBvdWu/Q7vTMRzw5aQGZWuc1V0HEsItFYMIBnoKGZ0xcarba/TYZq50kCaflFysYjA4EDKHqGdpYWdKYmm+a7TADmW35yfnOYpZYrkpVEtiqF0EujI00aeplNs2k+qyFZNeE3CDPL9P6b4PQ/kataHkVpLSEVGK7EX6rAa7IVNrvZtFvOA6okKvBgMtFDAGZOx88MeBcJ8AR3AgUUeIznAN6tjCUipGDZONm1FjWJp4A3QIzSaIOmZ7DvF/ysYYbM/fFDOV0jntAjRdapxJxL0eThpEhKOjCDDq2ks+3GrwxqIFKLe1WdOzII8XIOPGnwy6LKXVfpSDOTEfaRsGujhpS4hBIsMOqHbl16PJxc4EkaVu9wpEYlF/84NSv5Zum4drMfp9yXbzzAOJqqS4YkI4cBrFrC7bMPiCfgI3nNZAqkk3QOZqR+yyqx+nDQKBBBZ7QKrfGMCL+XpqFaBJU0wpkBdAhbR4hJsmT5aynlvkouoxm/NjD5oe6BzVIO9uktM+/5dEC5P7vZvarmuO/lKXz4sBabVPIATuKTrwbJP8XUkdM6uEctHKXICUJGjaZIWRbZp8czquQYfY6ynBUCfIU+gG6wqSIBmYIm9pZpXdaL121V7q0VjDjmQnXvMe7ysoEZnZL15B0SpxS1jjd83uNIOKZwu5MPzg2NhOx3xMOPYwEn2CUzbSrwAs5OAtrz3GAaUkJOU74XwjaYUmGJdZBS1NJVkGYrToINLKDjxcuIlyfVsKQSG/G4DyiO2SlQvJ0d0Ot1uOG5IFSAkq+PRVMgVMDvOIJMdqjeCFKUGRWBW9wigYvcbU7CQL/7meF2KZAaWl+4y9uhowAX7elogAvItAAxo2+SFxGRsHGEW9BnhlTuWigYxRcnVUBRQHV41LV+Fr5CJYV7sHfeywswx4XMtUx6EkBhR+q8AXXUA8uPJ73Pb49i9KG9fOljvXeyFj9ixgbo6CcbAJ7WHWqKHy/h+YjBwp6VcN7M89FGzQ04qbrQtgrOFybg3gQRTYG5xn73ArkfQWjCJROwy3J38Dx/D7jOa6BBNsitEw1wGq780EEioOeD+ZGp2J66ADiVGMayiHYucMk8nTK2zzT9CnEraAk95kQjy4k0GRElLL5YAKLQErJ5rp1eay9O4Fb6yJGm9U4FaMwPGxtKD6odIIHKoWnhKo1U8KIpFC+MVn59ZXmc7ZTBZfsg6FQ8W10YfTr4u0nYrpHZbZ1jXiLmooF0cOm0+mPnJBXQtepc7n0BqOipNCqI6yyloTeRShNKH04FIo0gcMk0H/xThyN4pPAWjDDkEp3lNNPRNVfpMI44CWRlRgViP64eK0JSRp0WUvCWYumlW/c58Vcz/yMwVcW5oYb9+26TEhwvbxiNg48hl1VI1UXTU//Eta+BMKnGUivctfL5wINDD0giQL1ipt6U7C9cd4+lgqY2lMUZ02Uv6Prs+ZEZer7ZfWBXVghlfOOrClwsoOFKzWEfz6RZu1eCs+K8fLvkts5+BX0gyrFYve0C3qHrn5U/Oh6D/CihmWIrY7HUZRhJaxde+tldu6adYJ+LeXupQw0XExC36RETdNFxcq9glMu4cNQSX9cqR/GQYp+IxUkIcNGWVU7ZtGa6P3XAyodRt0XeS3Tp01AnCh0ZbUh4VrSZeV9RWfSoWyxnY3hzcZ30G/InDq4wxRrEejreBxnhIQbkxenxkaxl+k7eLUQkUR6vKJ2iDFNGX3WmVA1yaOH+mvhBd+sE6vacQzFobwY5BqEAFmejwW5ne7HtVNolOUgJc8CsUxmc/LBi8N5mu9VsIA5HyErnS6zeCz7VLI9+n/hbT6hTokMXTVyXJRKSG2hd2labXTbtmK4fNH3IZBPreSA4FMeVouVN3zG5x9CiGpLw/3pceo4qGqp+rVp+z+7yQ98oEf+nyH4F3+J9IheDBa94Wi63zJbLBCIZm7P0asHGpIJt3PzE3m0S4YIWyXBCVXGikj8MudDPB/6Nm2v4IxJ5gU0ii0guy5SUHqGUYzTP0jIJU5E82RHUXtX4lDdrihBLdP1YaG1AGUC12rQKuIaGvCpMjZC9bWSCYnjDlvpWbkdXMTNeBHLKiuoozMGIvkczmP0aRJSJ8PYnLCVNhKHXBNckH79e8Z8Kc2wUej4sQZoH8qDRGkg86maW/ZQWGNnLcXmq3FlXM6ssR/3P6E/bHMvm6HLrv1yRixit25JsH3/IOr2UV4BWJhxXW5BJ6Xdr07n9kF3ZNAk6/Xpc5MSFmYJ2R7bdL8Kk7q1OU9Elg/tCxJ8giT27wSTySF0GOxg4PbYJdi/Nyia9Nn89CGDulfJemm1aiEr/eleGSN+5MRrVJ4K6lgyTTIW3i9cQ0dAi6FHt0YMbH3wDSAtGLSAccezzxHitt1QdhW36CQgPcA8vIIBh3/JNjf/Obmc2yzpk8edSlS4lVdwgW5vzbYEyFoF4GCBBby1keVNueHAH+evi+H7oOVfS3XuPQSNTXOONAbzJeSb5stwdQHl1ZjrGoE49I8+A9j3t+ahhQj74FCSWpZrj7wRSFJJnnwi1T9HL5qrCFW/JZq6P62XkMWTb+u4lGpKfmmwiJWx178GOG7KbrZGqyWwmuyKWPkNswkZ1q8uptUlviIi+AXh2bOOTOLsrtNkfqbQJeh24reebkINLkjut5r4d9GR/r8CBa9SU0UQhsnZp5cP+RqWCixRm7i4YRFbtZ4EAkhtNa6jHb6gPYQv7MKqkPLRmX3dFsK8XsRLVZ6IEVrCbmNDc8o5mqsogjAQfoC9Bc7R6gfw03m+lQpv6kTfhxscDIX6s0w+fBxtkhjXAXr10UouWCx3C/p/FYwJRS/AXRKkjOb5CLmK4XRe0+xeDDwVkJPZau52bzLEDHCqV0f44pPgKOkYKgTZJ33fmk3Tu8SdxJ02SHM8Fem5SMsWqRyi2F1ynfRJszcFKykdWlNqgDA/L9lKYBmc7Zu/q9ii1FPF47VJkqhirUob53zoiJtVVRVwMR34gV9iqcBaHbRu9kkvqk3yMpfRFG49pKKjIiq7h/VpRwPGTHoY4cg05X5028iHsLvUW/uz+kjPyIEhhcKUwCkJAwbR9pIEGOn8z6svAO8i89sJ3dL5qDWFYbS+HGPRMxYwJItFQN86YESeJQhn2urGiLRffQeLptDl8dAgb+Tp47UQPxWOw17OeChLN1WnzlkPL1T5O+O3Menpn4C3IY5LEepHpnPeZHbvuWfeVtPlkH4LZjPbBrkJT3NoRJzBt86CO0Xq59oQ+8dsm0ymRcmQyn8w71mhmcuEI5byuF+C88VPYly2sEzjlzAQ3vdn/1+Hzguw6qFNNbqenhZGbdiG6RwZaTG7jTA2X9RdXjDN9yj1uQpyO4Lx8KRAcZcbZMafp4wPOd5MdXoFY52V1A8M9hi3sso93+uprE0qYNMjkE22CvK4HuUxqN7oIz5pWuETq1lQAjqlSlqdD2Rnr/ggp/TVkQYjn9lMfYelk2sH5HPdopYo7MHwlV1or9Bxf+QCyLzm92vzG2wjiIjC/ZHEJzeroJl6bdFPTpZho5MV2U86fLQqxNlGIMqCGy+9WYhJ8ob1r0+Whxde9L2PdysETv97O+xVw+VNN1TZSQN5I6l9m5Ip6pLIqLm4a1B1ffH6gHyqT9p82NOjntRWGIofO3bJz5GhkvSWbsXueTAMaJDou99kGLqDlhwBZNEQ4mKPuDvVwSK4WmLluHyhA97pZiVe8g+JxmnJF8IkV/tCs4Jq/HgOoAEGR9tCDsDbDmi3OviUQpG5D8XmKcSAUaFLRXb2lmJTNYdhtYyfjBYZQmN5qT5CNuaD3BVnlkCk7bsMW3AtXkNMMTuW4HjUERSJnVQ0vsBGa1wo3Qh7115XGeTF3NTz8w0440AgU7c3bSXO/KMINaIWXd0oLpoq/0/QJxCQSJ9XnYy1W7TYLBJpHsVWD1ahsA7FjNvRd6mxCiHsm8g6Z0pnzqIpF1dHUtP2ITU5Z1hZHbu+L3BEEStBbL9XYvGfEakv1bmf+bOZGnoiuHEdlBnaChxYKNzB23b8sw8YyT7Ajxfk49eJIAvdbVkdFCe2J0gMefhQ0bIZxhx3fzMIysQNiN8PgOUKxOMur10LduigREDRMZyP4oGWrP1GFY4t6groASsZ421os48wAdnrbovNhLt7ScNULkwZ5AIZJTrbaKYTLjA1oJ3sIuN/aYocm/9uoQHEIlacF1s/TM1fLcPTL38O9fOsjMEIwoPKfvt7opuI9G2Hf/PR4aCLDQ7wNmIdEuXJ/QNL72k5q4NejAldPfe3UVVqzkys8YZ/jYOGOp6c+YzRCrCuq0M11y7TiN6qk7YXRMn/gukxrEimbMQjr3jwRM6dKVZ4RUfWQr8noPXLJq6yh5R3EH1IVOHESst/LItbG2D2vRsZRkAObzvQAAD3mb3/G4NzopI0FAiHfbpq0X72adg6SRj+8OHMShtFxxLZlf/nLgRLbClwl5WmaYSs+yEjkq48tY7Z2bE0N91mJwt+ua0NlRJIDh0HikF4UvSVorFj2YVu9YeS5tfvlVjPSoNu/Zu6dEUfBOT555hahBdN3Sa5Xuj2Rvau1lQNIaC944y0RWj9UiNDskAK1WoL+EfXcC6IbBXFRyVfX/WKXxPAwUyIAGW8ggZ08hcijKTt1YKnUO6QPvcrmDVAb0FCLIXn5id4fD/Jx4tw/gbXs7WF9b2RgXtPhLBG9vF5FEkdHAKrQHZAJC/HWvk7nvzzDzIXZlfFTJoC3JpGgLPBY7SQTjGlUvG577yNutZ1hTfs9/1nkSXK9zzKLRZ3VODeKUovJe0WCq1zVMYxCJMenmNzPIU2S8TA4E7wWmbNkxq9rI2dd6v0VpcAPVMxnDsvWTWFayyqvKZO7Z08a62i/oH2/jxf8rpmfO64in3FLiL1GX8IGtVE9M23yGsIqJbxDTy+LtaMWDaPqkymb5VrQdzOvqldeU0SUi6IirG8UZ3jcpRbwHa1C0Dww9G/SFX3gPvTJQE+kyz+g1BeMILKKO+olcHzctOWgzxYHnOD7dpCRtuZEXACjgqesZMasoPgnuDC4nUviAAxDc5pngjoAITIkvhKwg5d608pdrZcA+qn5TMT6Uo/QzBaOxBCLTJX3Mgk85rMfsnWx86oLxf7p2PX5ONqieTa/qM3tPw4ZXvlAp83NSD8F7+ZgctK1TpoYwtiU2h02HCGioH5tkVCqNVTMH5p00sRy2JU1qyDBP2CII/Dg4WDsIl+zgeX7589srx6YORRQMBfKbodbB743Tl4WLKOEnwWUVBsm94SOlCracU72MSyj068wdpYjyz1FwC2bjQnxnB6Mp/pZ+yyZXtguEaYB+kqhjQ6UUmwSFazOb+rhYjLaoiM+aN9/8KKn0zaCTFpN9eKwWy7/u4EHzO46TdFSNjMfn2iPSJwDPCFHc0I1+vjdAZw5ZjqR/uzi9Zn20oAa5JnLEk/EA3VRWE7J/XrupfFJPtCUuqHPpnlL7ISJtRpSVcB8qsZCm2QEkWoROtCKKxUh3yEcMbWYJwk6DlEBG0bZP6eg06FL3v6RPb7odGuwm7FN8fG4woqtB8e7M5klPpo97GoObNwt+ludTAmxyC5hmcFx+dIvEZKI6igFKHqLH01iY1o7903VzG9QGetyVx5RNmBYUU+zIuSva/yIcECUi4pRmE3VkF2avqulQEUY4yZ/wmNboBzPmAPey3+dSYtBZUjeWWT0pPwCz4Vozxp9xeClIU60qvEFMQCaPvPaA70WlOP9f/ey39macvpGCVa+zfa8gO44wbxpJUlC8GN/pRMTQtzY8Z8/hiNrU+Zq64ZfFGIkdj7m7abcK1EBtws1X4J/hnqvasPvvDSDYWN+QcQVGMqXalkDtTad5rYY0TIR1Eqox3czwPMjKPvF5sFv17Thujr1IZ1Ytl4VX1J0vjXKmLY4lmXipRAro0qVGEcXxEVMMEl54jQMd4J7RjgomU0j1ptjyxY+cLiSyXPfiEcIS2lWDK3ISAy6UZ3Hb5vnPncA94411jcy75ay6B6DSTzK6UTCZR9uDANtPBrvIDgjsfarMiwoax2OlLxaSoYn4iRgkpEGqEkwox5tyI8aKkLlfZ12lO11TxsqRMY89j5JaO55XfPJPDL1LGSnC88Re9Ai+Nu5bZjtwRrvFITUFHPR4ZmxGslQMecgbZO7nHk32qHxYkdvWpup07ojcMCaVrpFAyFZJJbNvBpZfdf39Hdo2kPtT7v0/f8R/B5Nz4f1t9/3zNM/7n6SUHfcWk5dfQFJvcJMgPolGCpOFb/WC0FGWU2asuQyT+rm88ZKZ78Cei/CAh939CH0JYbpZIPtxc2ufXqjS3pHH9lnWK4iJ7OjR/EESpCo2R3MYKyE7rHfhTvWho4cL1QdN4jFTyR6syMwFm124TVDDRXMNveI1Dp/ntwdz8k8kxw7iFSx6+Yx6O+1LzMVrN0BBzziZi9kneZSzgollBnVwBh6oSOPHXrglrOj+QmR/AESrhDpKrWT+8/AiMDxS/5wwRNuGQPLlJ9ovomhJWn8sMLVItQ8N/7IXvtD8kdOoHaw+vBSbFImQsv/OCAIui99E+YSIOMlMvBXkAt+NAZK8wB9Jf8CPtB+TOUOR+z71d/AFXpPBT6+A5FLjxMjLIEoJzrQfquvxEIi+WoUzGR1IzQFNvbYOnxb2PyQ0kGdyXKzW2axQL8lNAXPk6NEjqrRD1oZtKLlFoofrXw0dCNWASHzy+7PSzOUJ3XtaPZsxLDjr+o41fKuKWNmjiZtfkOzItvlV2MDGSheGF0ma04qE3TUEfqJMrXFm7DpK+27DSvCUVf7rbNoljPhha5W7KBqVq0ShUSTbRmuqPtQreVWH4JET5yMhuqMoSd4r/N8sDmeQiQQvi1tcZv7Moc7dT5X5AtCD6kNEGZOzVcNYlpX4AbTsLgSYYliiPyVoniuYYySxsBy5cgb3pD+EK0Gpb0wJg031dPgaL8JZt6sIvzNPEHfVPOjXmaXj4bd4voXzpZ5GApMhILgMbCEWZ2zwgdeQgjNHLbPIt+KqxRwWPLTN6HwZ0Ouijj4UF+Sg0Au8XuIKW0WxlexdrFrDcZJ8Shauat3X0XmHygqgL1nAu2hrJFb4wZXkcS+i36KMyU1yFvYv23bQUJi/3yQpqr/naUOoiEWOxckyq/gq43dFou1DVDaYMZK9tho7+IXXokBCs5GRfOcBK7g3A+jXQ39K4YA8PBRW4m5+yR0ZAxWJncjRVbITvIAPHYRt1EJ3YLiUbqIvoKHtzHKtUy1ddRUQ0AUO41vonZDUOW+mrszw+SW/6Q/IUgNpcXFjkM7F4CSSQ2ExZg85otsMs7kqsQD4OxYeBNDcSpifjMoLb7GEbGWTwasVObmB/bfPcUlq0wYhXCYEDWRW02TP5bBrYsKTGWjnWDDJ1F7zWai0zW/2XsCuvBQjPFcTYaQX3tSXRSm8hsAoDdjArK/OFp6vcWYOE7lizP0Yc+8p16i7/NiXIiiQTp7c7Xus925VEtlKAjUdFhyaiLT7VxDagprMFwix4wZ05u0qj7cDWFd0W9OYHIu3JbJKMXRJ1aYNovugg+QqRN7fNHSi26VSgBpn+JfMuPo3aeqPWik/wI5Rz3BWarPQX4i5+dM0npwVOsX+KsOhC7vDg+OJsz4Q5zlnIeflUWL6QYMbf9WDfLmosLF4Qev3mJiOuHjoor/dMeBpA9iKDkMjYBNbRo414HCxjsHrB4EXNbHzNMDHCLuNBG6Sf+J4MZ/ElVsDSLxjIiGsTPhw8BPjxbfQtskj+dyNMKOOcUYIRBEIqbazz3lmjlRQhplxq673VklMMY6597vu+d89ec/zq7Mi4gQvh87ehYbpOuZEXj5g/Q7S7BFDAAB9DzG35SC853xtWVcnZQoH54jeOqYLR9NDuwxsVthTV7V99n/B7HSbAytbEyVTz/5NhJ8gGIjG0E5j3griULUd5Rg7tQR+90hJgNQKQH2btbSfPcaTOfIexc1db1BxUOhM1vWCpLaYuKr3FdNTt/T3PWCpEUWDKEtzYrjpzlL/wri3MITKsFvtF8QVV/NhVo97aKIBgdliNc10dWdXVDpVtsNn+2UIolrgqdWA4EY8so0YvB4a+aLzMXiMAuOHQrXY0tr+CL10JbvZzgjJJuB1cRkdT7DUqTvnswVUp5kkUSFVtIIFYK05+tQxT6992HHNWVhWxUsD1PkceIrlXuUVRogwmfdhyrf6zzaL8+c0L7GXMZOteAhAVQVwdJh+7nrX7x4LaIIfz2F2v7Dg/uDfz2Fa+4gFm2zHAor8UqimJG3VTJtZEoFXhnDYXvxMJFc6ku2bhbCxzij2z5UNuK0jmp1mnvkVNUfR+SEmj1Lr94Lym75PO7Fs0MIr3GdsWXRXSfgLTVY0FLqba97u1In8NAcY7IC6TjWLigwKEIm43NxTdaVTv9mcKkzuzBkKd8x/xt1p/9BbP7Wyb4bpo1K1gnOpbLvKz58pWl3B55RJ/Z5mRDLPtNQg14jdOEs9+h/V5UVpwrAI8kGbX8KPVPDIMfIqKDjJD9UyDOPhjZ3vFAyecwyq4akUE9mDOtJEK1hpDyi6Ae87sWAClXGTiwPwN7PXWwjxaR79ArHRIPeYKTunVW24sPr/3HPz2IwH8oKH4OlWEmt4BLM6W5g4kMcYbLwj2usodD1088stZA7VOsUSpEVl4w7NMb1EUHMRxAxLF0CIV+0L3iZb+ekB1vSDSFjAZ3hfLJf7gFaXrOKn+mhR+rWw/eTXIcAgl4HvFuBg1LOmOAwJH3eoVEjjwheKA4icbrQCmvAtpQ0mXG0agYp5mj4Rb6mdQ+RV4QBPbxMqh9C7o8nP0Wko2ocnCHeRGhN1XVyT2b9ACsL+6ylUy+yC3QEnaKRIJK91YtaoSrcWZMMwxuM0E9J68Z+YyjA0g8p1PfHAAIROy6Sa04VXOuT6A351FOWhKfTGsFJ3RTJGWYPoLk5FVK4OaYR9hkJvezwF9vQN1126r6isMGXWTqFW+3HL3I/jurlIdDWIVvYY+s6yq7lrFSPAGRdnU7PVwY/SvWbZGpXzy3BQ2LmAJlrONUsZs4oGkly0V267xbD5KMY8woNNsmWG1VVgLCra8aQBBcI4DP2BlNwxhiCtHlaz6OWFoCW0vMR3ErrG7JyMjTSCnvRcsEHgmPnwA6iNpJ2DrFb4gLlhKJyZGaWkA97H6FFdwEcLT6DRQQL++fOkVC4cYGW1TG/3iK5dShRSuiBulmihqgjR45Vi03o2RbQbP3sxt90VxQ6vzdlGfkXmmKmjOi080JSHkLntjvsBJnv7gKscOaTOkEaRQqAnCA4HWtB4XnMtOhpRmH2FH8tTXrIjAGNWEmudQLCkcVlGTQ965Kh0H6ixXbgImQP6b42B49sO5C8pc7iRlgyvSYvcnH9FgQ3azLbQG2cUW96SDojTQStxkOJyOuDGTHAnnWkz29aEwN9FT8EJ4yhXOg+jLTrCPKeEoJ9a7lDXOjEr8AgX4BmnMQ668oW0zYPyQiVMPxKRHtpfnEEyaKhdzNVThlxxDQNdrHeZiUFb6NoY2KwvSb7BnRcpJy+/g/zAYx3fYSN5QEaVD2Y1VsNWxB0BSO12MRsRY8JLfAezRMz5lURuLUnG1ToKk6Q30FughqWN6gBNcFxP/nY/iv+iaUQOa+2Nuym46wtI/DvSfzSp1jEi4SdYBE7YhTiVV5cX9gwboVDMVgZp5YBQlHOQvaDNfcCoCJuYhf5kz5kwiIKPjzgpcRJHPbOhJajeoeRL53cuMahhV8Z7IRr6M4hW0JzT7mzaMUzQpm866zwM7Cs07fJYXuWvjAMkbe5O6V4bu71sOG6JQ4oL8zIeXHheFVavzxmlIyBkgc9IZlEDplMPr8xlcyss4pVUdwK1e7CK2kTsSdq7g5SHRAl3pYUB9Ko4fsh4qleOyJv1z3KFSTSvwEcRO/Ew8ozEDYZSqpfoVW9uhJfYrNAXR0Z3VmeoAD+rVWtwP/13sE/3ICX3HhDG3CMc476dEEC0K3umSAD4j+ZQLVdFOsWL2C1TH5+4KiSWH+lMibo+B55hR3Gq40G1n25sGcN0mEcoU2wN9FCVyQLBhYOu9aHVLWjEKx2JIUZi5ySoHUAI9b8hGzaLMxCZDMLhv8MkcpTqEwz9KFDpCpqQhVmsGQN8m24wyB82FAKNmjgfKRsXRmsSESovAwXjBIoMKSG51p6Um8b3i7GISs7kjTq/PZoioCfJzfKdJTN0Q45kQEQuh9H88M3yEs3DbtRTKALraM0YC8laiMiOOe6ADmTcCiREeAWZelBaEXRaSuj2lx0xHaRYqF65O0Lo5OCFU18A8cMDE4MLYm9w2QSr9NgQAIcRxZsNpA7UJR0e71JL+VU+ISWFk5I97lra8uGg7GlQYhGd4Gc6rxsLFRiIeGO4abP4S4ekQ1fiqDCy87GZHd52fn5aaDGuvOmIofrzpVwMvtbreZ/855OaXTRcNiNE0wzGZSxbjg26v8ko8L537v/XCCWP2MFaArJpvnkep0pA+O86MWjRAZPQRfznZiSIaTppy6m3p6HrNSsY7fDtz7Cl4V/DJAjQDoyiL2uwf1UHVd2AIrzBUSlJaTj4k6NL97a/GqhWKU9RUmjnYKpm2r+JYUcrkCuZKvcYvrg8pDoUKQywY9GDWg03DUFSirlUXBS5SWn/KAntnf0IdHGL/7mwXqDG+LZYjbEdQmqUqq4y54TNmWUP7IgcAw5816YBzwiNIJiE9M4lPCzeI/FGBeYy3p6IAmH4AjXXmvQ4Iy0Y82NTobcAggT2Cdqz6Mx4TdGoq9fn2etrWKUNFyatAHydQTVUQ2S5OWVUlugcNvoUrlA8cJJz9MqOa/W3iVno4zDHfE7zhoY5f5lRTVZDhrQbR8LS4eRLz8iPMyBL6o4PiLlp89FjdokQLaSBmKHUwWp0na5fE3v9zny2YcDXG/jfI9sctulHRbdkI5a4GOPJx4oAJQzVZ/yYAado8KNZUdEFs9ZPiBsausotXMNebEgr0dyopuqfScFJ3ODNPHgclACPdccwv0YJGQdsN2lhoV4HVGBxcEUeUX/alr4nqpcc1CCR3vR7g40zteQg/JvWmFlUE4mAiTpHlYGrB7w+U2KdSwQz2QJKBe/5eiixWipmfP15AFWrK8Sh1GBBYLgzki1wTMhGQmagXqJ2+FuqJ8f0XzXCVJFHQdMAw8xco11HhM347alrAu+wmX3pDFABOvkC+WPX0Uhg1Z5MVHKNROxaR84YV3s12UcM+70cJ460SzEaKLyh472vOMD3XnaK7zxZcXlWqenEvcjmgGNR2OKbI1s8U+iwiW+HotHalp3e1MGDy6BMVIvajnAzkFHbeVsgjmJUkrP9OAwnEHYXVBqYx3q7LvXjoVR0mY8h+ZaOnh053pdsGkmbqhyryN01eVHySr+CkDYkSMeZ1xjPNVM+gVLTDKu2VGsMUJqWO4TwPDP0VOg2/8ITbAUaMGb4LjL7L+Pi11lEVMXTYIlAZ/QHmTENjyx3kDkBdfcvvQt6tKk6jYFM4EG5UXDTaF5+1ZjRz6W7MdJPC+wTkbDUim4p5QQH3b9kGk2Bkilyeur8Bc20wm5uJSBO95GfYDI1EZipoRaH7uVveneqz43tlTZGRQ4a7CNmMHgXyOQQOL6WQkgMUTQDT8vh21aSdz7ERiZT1jK9F+v6wgFvuEmGngSvIUR2CJkc5tx1QygfZnAruONobB1idCLB1FCfO7N1ZdRocT8/Wye+EnDiO9pzqIpnLDl4bkaRKW+ekBVwHn46Shw1X0tclt/0ROijuUB4kIInrVJU4buWf4YITJtjOJ6iKdr1u+flgQeFH70GxKjhdgt/MrwfB4K/sXczQ+9zYcrD4dhY6qZhZ010rrxggWA8JaZyg2pYij8ieYEg1aZJkZK9O1Re7sB0iouf60rK0Gd+AYlp7soqCBCDGwfKeUQhCBn0E0o0GS6PdmjLi0TtCYZeqazqwN+yNINIA8Lk3iPDnWUiIPLGNcHmZDxfeK0iAdxm/T7LnN+gemRL61hHIc0NCAZaiYJR+OHnLWSe8sLrK905B5eEJHNlWq4RmEXIaFTmo49f8w61+NwfEUyuJAwVqZCLFcyHBKAcIVj3sNzfEOXzVKIndxHw+AR93owhbCxUZf6Gs8cz6/1VdrFEPrv330+9s6BtMVPJ3zl/Uf9rUi0Z/opexfdL3ykF76e999GPfVv8fJv/Y/+/5hEMon1tqNFyVRevV9y9/uIvsG3dbB8GRRrgaEXfhx+2xeOFt+cEn3RZanNxdEe2+B6MHpNbrRE53PlDifPvFcp4kO78ILR0T4xyW/WGPyBsqGdoA7zJJCu1TKbGfhnqgnRbxbB2B3UZoeQ2bz2sTVnUwokTcTU21RxN1PYPS3Sar7T0eRIsyCNowr9amwoMU/od9s2APtiKNL6ENOlyKADstAEWKA+sdKDhrJ6BOhRJmZ+QJbAaZ3/5Fq0/lumCgEzGEbu3yi0Y4I4EgVAjqxh4HbuQn0GrRhOWyAfsglQJAVL1y/6yezS2k8RE2MstJLh92NOB3GCYgFXznF4d25qiP4ZCyI4RYGesut6FXK6GwPpKK8WHEkhYui0AyEmr5Ml3uBFtPFdnioI8RiCooa7Z1G1WuyIi3nSNglutc+xY8BkeW3JJXPK6jd2VIMpaSxpVtFq+R+ySK9J6WG5Qvt+C+QH1hyYUOVK7857nFmyDBYgZ/o+AnibzNVqyYCJQvyDXDTK+iXdkA71bY7TL3bvuLxLBQ8kbTvTEY9aqkQ3+MiLWbEgjLzOH+lXgco1ERgzd80rDCymlpaRQbOYnKG/ODoFl46lzT0cjM5FYVvv0qLUbD5lyJtMUaC1pFlTkNONx6lliaX9o0i/1vws5bNKn5OuENQEKmLlcP4o2ZmJjD4zzd3Fk32uQ4uRWkPSUqb4LBe3EXHdORNB2BWsws5daRnMfNVX7isPSb1hMQdAJi1/qmDMfRUlCU74pmnzjbXfL8PVG8NsW6IQM2Ne23iCPIpryJjYbVnm5hCvKpMa7HLViNiNc+xTfDIaKm3jctViD8A1M9YPJNk003VVr4Zo2MuGW8vil8SLaGpPXqG7I4DLdtl8a4Rbx1Lt4w5Huqaa1XzZBtj208EJVGcmKYEuaeN27zT9EE6a09JerXdEbpaNgNqYJdhP1NdqiPKsbDRUi86XvvNC7rME5mrSQtrzAZVndtSjCMqd8BmaeGR4l4YFULGRBeXIV9Y4yxLFdyoUNpiy2IhePSWzBofYPP0eIa2q5JP4j9G8at/AqoSsLAUuRXtvgsqX/zYwsE+of6oSDbUOo4RMJw+DOUTJq+hnqwKim9Yy/napyZNTc2rCq6V9jHtJbxGPDwlzWj/Sk3zF/BHOlT/fSjSq7FqlPI1q6J+ru8Aku008SFINXZfOfnZNOvGPMtEmn2gLPt+H4QLA+/SYe4j398auzhKIp2Pok3mPC5q1IN1HgR+mnEfc4NeeHYwd2/kpszR3cBn7ni9NbIqhtSWFW8xbUJuUPVOeeXu3j0IGZmFNiwaNZ6rH4/zQ2ODz6tFxRLsUYZu1bfd1uIvfQDt4YD/efKYv8VF8bHGDgK22w2Wqwpi43vNCOXFJZCGMqWiPbL8mil6tsmOTXAWCyMCw73e2rADZj2IK6rqksM3EXF2cbLb4vjB14wa/yXK5vwU+05MzERJ5nXsXsW21o7M+gO0js2OyKciP5uF2iXyb2DiptwQeHeqygkrNsqVCSlldxBMpwHi1vfc8RKpP/4L3Lmpq6DZcvhDDfxTCE3splacTcOtXdK2g303dIWBVe2wD/Gvja1cClFQ67gw0t1ZUttsUgQ1Veky8oOpS6ksYEc4bqseCbZy766SvL3FodmnahlWJRgVCNjPxhL/fk2wyvlKhITH/VQCipOI0dNcRa5B1M5HmOBjTLeZQJy237e2mobwmDyJNHePhdDmiknvLKaDbShL+Is1XTCJuLQd2wmdJL7+mKvs294whXQD+vtd88KKk0DXP8B1Xu9J+xo69VOuFgexgTrcvI6SyltuLix9OPuE6/iRJYoBMEXxU4shQMf4Fjqwf1PtnJ/wWSZd29rhZjRmTGgiGTAUQqRz+nCdjeMfYhsBD5Lv60KILWEvNEHfmsDs2L0A252351eUoYxAysVaCJVLdH9QFWAmqJDCODUcdoo12+gd6bW2boY0pBVHWL6LQDK5bYWh1V8vFvi0cRpfwv7cJiMX3AZNJuTddHehTIdU0YQ/sQ1dLoF2xQPcCuHKiuCWOY30DHe1OwcClLAhqAKyqlnIbH/8u9ScJpcS4kgp6HKDUdiOgRaRGSiUCRBjzI5gSksMZKqy7Sd51aeg0tgJ+x0TH9YH2Mgsap9N7ENZdEB0bey2DMTrBA1hn56SErNHf3tKtqyL9b6yXEP97/rc+jgD2N1LNUH6RM9AzP3kSipr06RkKOolR7HO768jjWiH1X92jA7dkg7gcNcjqsZCgfqWw0tPXdLg20cF6vnQypg7gLtkazrHAodyYfENPQZsdfnjMZiNu4nJO97D1/sQE+3vNFzrSDOKw+keLECYf7RJwVHeP/j79833oZ0egonYB2FlFE5qj02B/LVOMJQlsB8uNg3Leg4qtZwntsOSNidR0abbZmAK4sCzvt8Yiuz2yrNCJoH5O8XvX/vLeR/BBYTWj0sOPYM/jyxRd5+/JziKAABaPcw/34UA3aj/gLZxZgRCWN6m4m3demanNgsx0P237/Q+Ew5VYnJPkyCY0cIVHoFn2Ay/e7U4P19APbPFXEHX94N6KhEMPG7iwB3+I+O1jd5n6VSgHegxgaSawO6iQCYFgDsPSMsNOcUj4q3sF6KzGaH/0u5PQoAj/8zq6Uc9MoNrGqhYeb2jQo0WlGlXjxtanZLS24/OIN5Gx/2g684BPDQpwlqnkFcxpmP/osnOXrFuu4PqifouQH0eF5qCkvITQbJw/Zvy5mAHWC9oU+cTiYhJmSfKsCyt1cGVxisKu+NymEQIAyaCgud/V09qT3nk/9s/SWsYtha7yNpzBIMM40rCSGaJ9u6lEkl00vXBiEt7p9P5IBCiavynEOv7FgLqPdeqxRiCwuFVMolSIUBcoyfUC2e2FJSAUgYdVGFf0b0Kn2EZlK97yyxrT2MVgvtRikfdaAW8RwEEfN+B7/eK8bBdp7URpbqn1xcrC6d2UjdsKbzCjBFqkKkoZt7Mrhg6YagE7spkqj0jOrWM+UGQ0MUlG2evP1uE1p2xSv4dMK0dna6ENcNUF+xkaJ7B764NdxLCpuvhblltVRAf7vK5qPttJ/9RYFUUSGcLdibnz6mf7WkPO3MkUUhR2mAOuGv8IWw5XG1ZvoVMnjSAZe6T7WYA99GENxoHkMiKxHlCuK5Gd0INrISImHQrQmv6F4mqU/TTQ8nHMDzCRivKySQ8dqkpQgnUMnwIkaAuc6/FGq1hw3b2Sba398BhUwUZSAIO8XZvnuLdY2n6hOXws+gq9BHUKcKFA6kz6FDnpxLPICa3qGhnc97bo1FT/XJk48LrkHJ2CAtBv0RtN97N21plfpXHvZ8gMJb7Zc4cfI6MbPwsW7AilCSXMFIEUEmir8XLEklA0ztYbGpTTGqttp5hpFTTIqUyaAIqvMT9A/x+Ji5ejA4Bhxb/cl1pUdOD6epd3yilIdO6j297xInoiBPuEDW2/UfslDyhGkQs7Wy253bVnlT+SWg89zYIK/9KXFl5fe+jow2rd5FXv8zDPrmfMXiUPt9QBO/iK4QGbX5j/7Rx1c1vzsY8ONbP3lVIaPrhL4+1QrECTN3nyKavGG0gBBtHvTKhGoBHgMXHStFowN+HKrPriYu+OZ05Frn8okQrPaaxoKP1ULCS/cmKFN3gcH7HQlVjraCeQmtjg1pSQxeuqXiSKgLpxc/1OiZsU4+n4lz4hpahGyWBURLi4642n1gn9qz9bIsaCeEPJ0uJmenMWp2tJmIwLQ6VSgDYErOeBCfSj9P4G/vI7oIF+l/n5fp956QgxGvur77ynawAu3G9MdFbJbu49NZnWnnFcQHjxRuhUYvg1U/e84N4JTecciDAKb/KYIFXzloyuE1eYXf54MmhjTq7B/yBToDzzpx3tJCTo3HCmVPYfmtBRe3mPYEE/6RlTIxbf4fSOcaKFGk4gbaUWe44hVk9SZzhW80yfW5QWBHxmtUzvMhfVQli4gZTktIOZd9mjJ5hsbmzttaHQB29Am3dZkmx3g/qvYocyhZ2PXAWsNQiIaf+Q8W/MWPIK7/TjvCx5q2XRp4lVWydMc2wIQkhadDB0xsnw/kSEyGjLKjI4coVIwtubTF3E7MJ6LS6UOsJKj82XVAVPJJcepfewbzE91ivXZvOvYfsmMevwtPpfMzGmC7WJlyW2j0jh7AF1JLmwEJSKYwIvu6DHc3YnyLH9ZdIBnQ+nOVDRiP+REpqv++typYHIvoJyICGA40d8bR7HR2k7do6UQTHF4oriYeIQbxKe4Th6+/l1BjUtS9hqORh3MbgvYrStXTfSwaBOmAVQZzpYNqsAmQyjY56MUqty3c/xH6GuhNvNaG9vGbG6cPtBM8UA3e8r51D0AR9kozKuGGSMgLz3nAHxDNnc7GTwpLj7/6HeWp1iksDeTjwCLpxejuMtpMnGJgsiku1sOACwQ9ukzESiDRN77YNESxR5LphOlcASXA5uIts1LnBIcn1J7BLWs49DMALSnuz95gdOrTZr0u1SeYHinno/pE58xYoXbVO/S+FEMMs5qyWkMnp8Q3ClyTlZP52Y9nq7b8fITPuVXUk9ohG5EFHw4gAEcjFxfKb3xuAsEjx2z1wxNbSZMcgS9GKyW3R6KwJONgtA64LTyxWm8Bvudp0M1FdJPEGopM4Fvg7G/hsptkhCfHFegv4ENwxPeXmYhxwZy7js+BeM27t9ODBMynVCLJ7RWcBMteZJtvjOYHb5lOnCLYWNEMKC59BA7covu1cANa2PXL05iGdufOzkgFqqHBOrgQVUmLEc+Mkz4Rq8O6WkNr7atNkH4M8d+SD1t/tSzt3oFql+neVs+AwEI5JaBJaxARtY2Z4mKoUqxds4UpZ0sv3zIbNoo0J4fihldQTX3XNcuNcZmcrB5LTWMdzeRuAtBk3cZHYQF6gTi3PNuDJ0nmR+4LPLoHvxQIxRgJ9iNNXqf2SYJhcvCtJiVWo85TsyFOuq7EyBPJrAdhEgE0cTq16FQXhYPJFqSfiVn0IQnPOy0LbU4BeG94QjdYNB0CiQ3QaxQqD2ebSMiNjaVaw8WaM4Z5WnzcVDsr4eGweSLa2DE3BWViaxhZFIcSTjgxNCAfelg+hznVOYoe5VqTYs1g7WtfTm3e4/WduC6p+qqAM8H4ZyrJCGpewThTDPe6H7CzX/zQ8Tm+r65HeZn+MsmxUciEWPlAVaK/VBaQBWfoG/aRL/jSZIQfep/89GjasWmbaWzeEZ2R1FOjvyJT37O9B8046SRSKVEnXWlBqbkb5XCS3qFeuE9xb9+frEknxWB5h1D/hruz2iVDEAS7+qkEz5Ot5agHJc7WCdY94Ws61sURcX5nG8UELGBAHZ3i+3VulAyT0nKNNz4K2LBHBWJcTBX1wzf+//u/j/9+//v87+9/l9Lbh/L/uyNYiTsWV2LwsjaA6MxTuzFMqmxW8Jw/+IppdX8t/Clgi1rI1SN0UC/r6tX/4lUc2VV1OQReSeCsjUpKZchw4XUcjHfw6ryCV3R8s6VXm67vp4n+lcPV9gJwmbKQEsmrJi9c2vkwrm8HFbVYNTaRGq8D91t9n5+U+aD/hNtN3HjC/nC/vUoGFSCkXP+NlRcmLUqLbiUBl4LYf1U/CCvwtd3ryCH8gUmGITAxiH1O5rnGTz7y1LuFjmnFGQ1UWuM7HwfXtWl2fPFKklYwNUpF2IL/TmaRETjQiM5SJacI+3Gv5MBU8lP5Io6gWkawpyzNEVGqOdx4YlO1dCvjbWFZWbCmeiFKPSlMKtKcMFLs/KQxtgAHi7NZNCQ32bBAW2mbHflVZ8wXKi1JKVHkW20bnYnl3dKWJeWJOiX3oKPBD6Zbi0ZvSIuWktUHB8qDR8DMMh1ZfkBL9FS9x5r0hBGLJ8pUCJv3NYH+Ae8p40mZWd5m5fhobFjQeQvqTT4VKWIYfRL0tfaXKiVl75hHReuTJEcqVlug+eOIIc4bdIydtn2K0iNZPsYWQvQio2qbO3OqAlPHDDOB7DfjGEfVF51FqqNacd6QmgFKJpMfLp5DHTv4wXlONKVXF9zTJpDV4m1sYZqJPhotcsliZM8yksKkCkzpiXt+EcRQvSQqmBS9WdWkxMTJXPSw94jqI3varCjQxTazjlMH8jTS8ilaW8014/vwA/LNa+YiFoyyx3s/KswP3O8QW1jtq45yTM/DX9a8M4voTVaO2ebvw1EooDw/yg6Y1faY+WwrdVs5Yt0hQ5EwRfYXSFxray1YvSM+kYmlpLG2/9mm1MfmbKHXr44Ih8nVKb1M537ZANUkCtdsPZ80JVKVKabVHCadaLXg+IV8i5GSwpZti0h6diTaKs9sdpUKEpd7jDUpYmHtiX33SKiO3tuydkaxA7pEc9XIQEOfWJlszj5YpL5bKeQyT7aZSBOamvSHl8xsWvgo26IP/bqk+0EJUz+gkkcvlUlyPp2kdKFtt7y5aCdks9ZJJcFp5ZWeaWKgtnXMN3ORwGLBE0PtkEIek5FY2aVssUZHtsWIvnljMVJtuVIjpZup/5VL1yPOHWWHkOMc6YySWMckczD5jUj2mlLVquFaMU8leGVaqeXis+aRRL8zm4WuBk6cyWfGMxgtr8useQEx7k/PvRoZyd9nde1GUCV84gMX8Ogu/BWezYPSR27llzQnA97oo0pYyxobYUJfsj+ysTm9zJ+S4pk0TGo9VTG0KjqYhTmALfoDZVKla2b5yhv241PxFaLJs3i05K0AAIdcGxCJZmT3ZdT7CliR7q+kur7WdQjygYtOWRL9B8E4s4LI8KpAj7bE0dg7DLOaX+MGeAi0hMMSSWZEz+RudXbZCsGYS0QqiXjH9XQbd8sCB+nIVTq7/T/FDS+zWY9q7Z2fdq1tdLb6v3hKKVDAw5gjj6o9r1wHFROdHc18MJp4SJ2Ucvu+iQ9EgkekW8VCM+psM6y+/2SBy8tNN4a3L1MzP+OLsyvESo5gS7IQOnIqMmviJBVc6zbVG1n8eXiA3j46kmvvtJlewwNDrxk4SbJOtP/TV/lIVK9ueShNbbMHfwnLTLLhbZuO79ec5XvfgRwLFK+w1r5ZWW15rVFZrE+wKqNRv5KqsLNfpGgnoUU6Y71NxEmN7MyqwqAQqoIULOw/LbuUB2+uE75gJt+kq1qY4LoxV+qR/zalupea3D5+WMeaRIn0sAI6DDWDh158fqUb4YhAxhREbUN0qyyJYkBU4V2KARXDT65gW3gRsiv7xSPYEKLwzgriWcWgPr0sbZnv7m1XHNFW6xPdGNZUdxFiUYlmXNjDVWuu7LCkX/nVkrXaJhiYktBISC2xgBXQnNEP+cptWl1eG62a7CPXrnrkTQ5BQASbEqUZWMDiZUisKyHDeLFOaJILUo5f6iDt4ZO8MlqaKLto0AmTHVVbkGuyPa1R/ywZsWRoRDoRdNMMHwYTsklMVnlAd2S0282bgMI8fiJpDh69OSL6K3qbo20KfpNMurnYGQSr/stFqZ7hYsxKlLnKAKhsmB8AIpEQ4bd/NrTLTXefsE6ChRmKWjXKVgpGoPs8GAicgKVw4K0qgDgy1A6hFq1WRat3fHF+FkU+b6H4NWpOU3KXTxrIb2qSHAb+qhm8hiSROi/9ofapjxhyKxxntPpge6KL5Z4+WBMYkAcE6+0Hd3Yh2zBsK2MV3iW0Y6cvOCroXlRb2MMJtdWx+3dkFzGh2Pe3DZ9QpSqpaR/rE1ImOrHqYYyccpiLC22amJIjRWVAherTfpQLmo6/K2pna85GrDuQPlH1Tsar8isAJbXLafSwOof4gg9RkAGm/oYpBQQiPUoyDk2BCQ1k+KILq48ErFo4WSRhHLq/y7mgw3+L85PpP6xWr6cgp9sOjYjKagOrxF148uhuaWtjet953fh1IQiEzgC+d2IgBCcUZqgTAICm2bR8oCjDLBsmg+ThyhfD+zBalsKBY1Ce54Y/t9cwfbLu9SFwEgphfopNA3yNxgyDafUM3mYTovZNgPGdd4ZFFOj1vtfFW3u7N+iHEN1HkeesDMXKPyoCDCGVMo4GCCD6PBhQ3dRZIHy0Y/3MaE5zU9mTCrwwnZojtE+qNpMSkJSpmGe0EzLyFelMJqhfFQ7a50uXxZ8pCc2wxtAKWgHoeamR2O7R+bq7IbPYItO0esdRgoTaY38hZLJ5y02oIVwoPokGIzxAMDuanQ1vn2WDQ00Rh6o5QOaCRu99fwDbQcN0XAuqkFpxT/cfz3slGRVokrNU0iqiMAJFEbKScZdmSkTUznC0U+MfwFOGdLgsewRyPKwBZYSmy6U325iUhBQNxbAC3FLKDV9VSOuQpOOukJ/GAmu/tyEbX9DgEp6dv1zoU0IqzpG6gssSjIYRVPGgU1QAQYRgIT8gEV0EXr1sqeh2I6rXjtmoCYyEDCe/PkFEi/Q48FuT29p557iN+LCwk5CK/CZ2WdAdfQZh2Z9QGrzPLSNRj5igUWzl9Vi0rCqH8G1Kp4QMLkuwMCAypdviDXyOIk0AHTM8HBYKh3b0/F+DxoNj4ZdoZfCpQVdnZarqoMaHWnMLNVcyevytGsrXQEoIbubqWYNo7NRHzdc0zvT21fWVirj7g36iy6pxogfvgHp1xH1Turbz8QyyHnXeBJicpYUctbzApwzZ1HT+FPEXMAgUZetgeGMwt4G+DHiDT2Lu+PT21fjJCAfV16a/Wu1PqOkUHSTKYhWW6PhhHUlNtWzFnA7MbY+r64vkwdpfNB2JfWgWXAvkzd42K4lN9x7Wrg4kIKgXCb4mcW595MCPJ/cTfPAMQMFWwnqwde4w8HZYJFpQwcSMhjVz4B8p6ncSCN1X4klxoIH4BN2J6taBMj6lHkAOs8JJAmXq5xsQtrPIPIIp/HG6i21xMGcFgqDXSRF0xQg14d2uy6HgKE13LSvQe52oShF5Jx1R6avyL4thhXQZHfC94oZzuPUBKFYf1VvDaxIrtV6dNGSx7DO0i1p6CzBkuAmEqyWceQY7F9+U0ObYDzoa1iKao/cOD/v6Q9gHrrr1uCeOk8fST9MG23Ul0KmM3r+Wn6Hi6WAcL7gEeaykicvgjzkjSwFsAXIR81Zx4QJ6oosVyJkCcT+4xAldCcihqvTf94HHUPXYp3REIaR4dhpQF6+FK1H0i9i7Pvh8owu3lO4PT1iuqu+DkL2Bj9+kdfGAg2TXw03iNHyobxofLE2ibjsYDPgeEQlRMR7afXbSGQcnPjI2D+sdtmuQ771dbASUsDndU7t58jrrNGRzISvwioAlHs5FA+cBE5Ccznkd8NMV6BR6ksnKLPZnMUawRDU1MZ/ib3xCdkTblHKu4blNiylH5n213yM0zubEie0o4JhzcfAy3H5qh2l17uLooBNLaO+gzonTH2uF8PQu9EyH+pjGsACTMy4cHzsPdymUSXYJOMP3yTkXqvO/lpvt0cX5ekDEu9PUfBeZODkFuAjXCaGdi6ew4qxJ8PmFfwmPpkgQjQlWqomFY6UkjmcnAtJG75EVR+NpzGpP1Ef5qUUbfowrC3zcSLX3BxgWEgEx/v9cP8H8u1Mvt9/rMDYf6sjwU1xSOPBgzFEeJLMRVFtKo5QHsUYT8ZRLCah27599EuqoC9PYjYO6aoAMHB8X1OHwEAYouHfHB3nyb2B+SnZxM/vw/bCtORjLMSy5aZoEpvgdGvlJfNPFUu/p7Z4VVK1hiI0/UTuB3ZPq4ohEbm7Mntgc1evEtknaosgZSwnDC2BdMmibpeg48X8Ixl+/8+xXdbshQXUPPvx8jT3fkELivHSmqbhblfNFShWAyQnJ3WBU6SMYSIpTDmHjdLVAdlADdz9gCplZw6mTiHqDwIsxbm9ErGusiVpg2w8Q3khKV/R9Oj8PFeF43hmW/nSd99nZzhyjCX3QOZkkB6BsH4H866WGyv9E0hVAzPYah2tkRfQZMmP2rinfOeQalge0ovhduBjJs9a1GBwReerceify49ctOh5/65ATYuMsAkVltmvTLBk4oHpdl6i+p8DoNj4Fb2vhdFYer2JSEilEwPd5n5zNoGBXEjreg/wh2NFnNRaIUHSOXa4eJRwygZoX6vnWnqVdCRT1ARxeFrNBJ+tsdooMwqnYhE7zIxnD8pZH+P0Nu1wWxCPTADfNWmqx626IBJJq6NeapcGeOmbtXvl0TeWG0Y7OGGV4+EHTtNBIT5Wd0Bujl7inXgZgfXTM5efD3qDTJ54O9v3Bkv+tdIRlq1kXcVD0BEMirmFxglNPt5pedb1AnxuCYMChUykwsTIWqT23XDpvTiKEru1cTcEMeniB+HQDehxPXNmkotFdwUPnilB/u4Nx5Xc6l8J9jH1EgKZUUt8t8cyoZleDBEt8oibDmJRAoMKJ5Oe9CSWS5ZMEJvacsGVdXDWjp/Ype5x0p9PXB2PAwt2LRD3d+ftNgpuyvxlP8pB84oB1i73vAVpwyrmXW72hfW6Dzn9Jkj4++0VQ4d0KSx1AsDA4OtXXDo63/w+GD+zC7w5SJaxsmnlYRQ4dgdjA7tTl2KNLnpJ+mvkoDxtt1a4oPaX3EVqj96o9sRKBQqU7ZOiupeAIyLMD+Y3YwHx30XWHB5CQiw7q3mj1EDlP2eBsZbz79ayUMbyHQ7s8gu4Lgip1LiGJj7NQj905/+rgUYKAA5qdrlHKIknWmqfuR+PB8RdBkDg/NgnlT89G72h2NvySnj7UyBwD+mi/IWs1xWbxuVwUIVXun5cMqBtFbrccI+DILjsVQg6eeq0itiRfedn89CvyFtpkxaauEvSANuZmB1p8FGPbU94J9medwsZ9HkUYjmI7OH5HuxendLbxTaYrPuIfE2ffXFKhoNBUp33HsFAXmCV/Vxpq5AYgFoRr5Ay93ZLRlgaIPjhZjXZZChT+aE5iWAXMX0oSFQEtwjiuhQQItTQX5IYrKfKB+queTNplR1Hoflo5/I6aPPmACwQCE2jTOYo5Dz1cs7Sod0KTG/3kEDGk3kUaUCON19xSJCab3kNpWZhSWkO8l+SpW70Wn3g0ciOIJO5JXma6dbos6jyisuxXwUUhj2+1uGhcvuliKtWwsUTw4gi1c/diEEpZHoKoxTBeMDmhPhKTx7TXWRakV8imJR355DcIHkR9IREHxohP4TbyR5LtFU24umRPRmEYHbpe1LghyxPx7YgUHjNbbQFRQhh4KeU1EabXx8FS3JAxp2rwRDoeWkJgWRUSKw6gGP5U2PuO9V4ZuiKXGGzFQuRuf+tkSSsbBtRJKhCi3ENuLlXhPbjTKD4djXVnfXFds6Zb+1XiUrRfyayGxJq1+SYBEfbKlgjiSmk0orgTqzSS+DZ5rTqsJbttiNtp+KMqGE2AHGFw6jQqM5vD6vMptmXV9OAjq49Uf/Lx9Opam+Hn5O9p8qoBBAQixzQZ4eNVkO9sPzJAMyR1y4/RCQQ1s0pV5KAU5sKLw3tkcFbI/JqrjCsK4Mw+W8aod4lioYuawUiCyVWBE/qPaFi5bnkgpfu/ae47174rI1fqQoTbW0HrU6FAejq7ByM0V4zkZTg02/YJK2N7hUQRCeZ4BIgSEqgD8XsjzG6LIsSbuHoIdz/LhFzbNn1clci1NHWJ0/6/O8HJMdIpEZbqi1RrrFfoo/rI/7ufm2MPG5lUI0IYJ4MAiHRTSOFJ2oTverFHYXThkYFIoyFx6rMYFgaOKM4xNWdlOnIcKb/suptptgTOTdVIf4YgdaAjJnIAm4qNNHNQqqAzvi53GkyRCEoseUBrHohZsjUbkR8gfKtc/+Oa72lwxJ8Mq6HDfDATbfbJhzeIuFQJSiw1uZprHlzUf90WgqG76zO0eCB1WdPv1IT6sNxxh91GEL2YpgC97ikFHyoaH92ndwduqZ6IYjkg20DX33MWdoZk7QkcKUCgisIYslOaaLyvIIqRKWQj16jE1DlQWJJaPopWTJjXfixEjRJJo8g4++wuQjbq+WVYjsqCuNIQW3YjnxKe2M5ZKEqq+cX7ZVgnkbsU3RWIyXA1rxv4kGersYJjD//auldXGmcEbcfTeF16Y1708FB1HIfmWv6dSFi6oD4E+RIjCsEZ+kY7dKnwReJJw3xCjKvi3kGN42rvyhUlIz0Bp+fNSV5xwFiuBzG296e5s/oHoFtUyUplmPulIPl+e1CQIQVtjlzLzzzbV+D/OVQtYzo5ixtMi5BmHuG4N/uKfJk5UIREp7+12oZlKtPBomXSzAY0KgtbPzzZoHQxujnREUgBU+O/jKKhgxVhRPtbqyHiUaRwRpHv7pgRPyUrnE7fYkVblGmfTY28tFCvlILC04Tz3ivkNWVazA+OsYrxvRM/hiNn8Fc4bQBeUZABGx5S/xFf9Lbbmk298X7iFg2yeimvsQqqJ+hYbt6uq+Zf9jC+Jcwiccd61NKQtFvGWrgJiHB5lwi6fR8KzYS7EaEHf/ka9EC7H8D+WEa3TEACHBkNSj/cXxFeq4RllC+fUFm2xtstYLL2nos1DfzsC9vqDDdRVcPA3Ho95aEQHvExVThXPqym65llkKlfRXbPTRiDepdylHjmV9YTWAEjlD9DdQnCem7Aj/ml58On366392214B5zrmQz/9ySG2mFqEwjq5sFl5tYJPw5hNz8lyZPUTsr5E0F2C9VMPnZckWP7+mbwp/BiN7f4kf7vtGnZF2JGvjK/sDX1RtcFY5oPQnE4lIAYV49U3C9SP0LCY/9i/WIFK9ORjzM9kG/KGrAuwFmgdEpdLaiqQNpCTGZVuAO65afkY1h33hrqyLjZy92JK3/twdj9pafFcwfXONmPQWldPlMe7jlP24Js0v9m8bIJ9TgS2IuRvE9ZVRaCwSJYOtAfL5H/YS4FfzKWKbek+GFulheyKtDNlBtrdmr+KU+ibHTdalzFUmMfxw3f36x+3cQbJLItSilW9cuvZEMjKw987jykZRlsH/UI+HlKfo2tLwemBEeBFtmxF2xmItA/dAIfQ+rXnm88dqvXa+GapOYVt/2waFimXFx3TC2MUiOi5/Ml+3rj/YU6Ihx2hXgiDXFsUeQkRAD6wF3SCPi2flk7XwKAA4zboqynuELD312EJ88lmDEVOMa1W/K/a8tGylZRMrMoILyoMQzzbDJHNZrhH77L9qSC42HVmKiZ5S0016UTp83gOhCwz9XItK9fgXfK3F5d7nZCBUekoLxrutQaPHa16Rjsa0gTrzyjqTnmcIcrxg6X6dkKiucudc0DD5W4pJPf0vuDW8r5/uw24YfMuxFRpD2ovT2mFX79xH6Jf+MVdv2TYqR6/955QgVPe3JCD/WjAYcLA9tpXgFiEjge2J5ljeI/iUzg91KQuHkII4mmHZxC3XQORLAC6G7uFn5LOmlnXkjFdoO976moNTxElS8HdxWoPAkjjocDR136m2l+f5t6xaaNgdodOvTu0rievnhNAB79WNrVs6EsPgkgfahF9gSFzzAd+rJSraw5Mllit7vUP5YxA843lUpu6/5jAR0RvH4rRXkSg3nE+O5GFyfe+L0s5r3k05FyghSFnKo4TTgs07qj4nTLqOYj6qaW9knJTDkF5OFMYbmCP+8H16Ty482OjvERV6OFyw043L9w3hoJi408sR+SGo1WviXUu8d7qS+ehKjpKwxeCthsm2LBFSFeetx0x4AaKPxtp3CxdWqCsLrB1s/j5TAhc1jNZsXWl6tjo/WDoewxzg8T8NnhZ1niUwL/nhfygLanCnRwaFGDyLw+sfZhyZ1UtYTp8TYB6dE7R3VsKKH95CUxJ8u8N+9u2/9HUNKHW3x3w5GQrfOPafk2w5qZq8MaHT0ebeY3wIsp3rN9lrpIsW9c1ws3VNV+JwNz0Lo9+V7zZr6GD56We6gWVIvtmam5GPPkVAbr74r6SwhuL+TRXtW/0pgyX16VNl4/EAD50TnUPuwrW6OcUO2VlWXS0inq872kk7GUlW6o/ozFKq+Sip6LcTtSDfDrPTcCHhx75H8BeRon+KG2wRwzfDgWhALmiWOMO6h3pm1UCZEPEjScyk7tdLx6WrdA2N1QTPENvNnhCQjW6kl057/qv7IwRryHrZBCwVSbLLnFRiHdTwk8mlYixFt1slEcPD7FVht13HyqVeyD55HOXrh2ElAxJyinGeoFzwKA91zfrdLvDxJSjzmImfvTisreI25EDcVfGsmxLVbfU8PGe/7NmWWKjXcdTJ11jAlVIY/Bv/mcxg/Q10vCHwKG1GW/XbJq5nxDhyLqiorn7Wd7VEVL8UgVzpHMjQ+Z8DUgSukiVwWAKkeTlVVeZ7t1DGnCgJVIdBPZAEK5f8CDyDNo7tK4/5DBjdD5MPV86TaEhGsLVFPQSI68KlBYy84FievdU9gWh6XZrugvtCZmi9vfd6db6V7FmoEcRHnG36VZH8N4aZaldq9zZawt1uBFgxYYx+Gs/qW1jwANeFy+LCoymyM6zgG7j8bGzUyLhvrbJkTYAEdICEb4kMKusKT9V3eIwMLsjdUdgijMc+7iKrr+TxrVWG0U+W95SGrxnxGrE4eaJFfgvAjUM4SAy8UaRwE9j6ZQH5qYAWGtXByvDiLSDfOD0yFA3UCMKSyQ30fyy1mIRg4ZcgZHLNHWl+c9SeijOvbOJxoQy7lTN2r3Y8p6ovxvUY74aOYbuVezryqXA6U+fcp6wSV9X5/OZKP18tB56Ua0gMyxJI7XyNT7IrqN8GsB9rL/kP5KMrjXxgqKLDa+V5OCH6a5hmOWemMUsea9vQl9t5Oce76PrTyTv50ExOqngE3PHPfSL//AItPdB7kGnyTRhVUUFNdJJ2z7RtktZwgmQzhBG/G7QsjZmJfCE7k75EmdIKH7xlnmDrNM/XbTT6FzldcH/rcRGxlPrv4qDScqE7JSmQABJWqRT/TUcJSwoQM+1jvDigvrjjH8oeK2in1S+/yO1j8xAws/T5u0VnIvAPqaE1atNuN0cuRliLcH2j0nTL4JpcR7w9Qya0JoaHgsOiALLCCzRkl1UUESz+ze/gIXHGtDwgYrK6pCFKJ1webSDog4zTlPkgXZqxlQDiYMjhDpwTtBW2WxthWbov9dt2X9XFLFmcF+eEc1UaQ74gqZiZsdj63pH1qcv3Vy8JYciogIVKsJ8Yy3J9w/GhjWVSQAmrS0BPOWK+RKV+0lWqXgYMnIFwpcZVD7zPSp547i9HlflB8gVnSTGmmq1ClO081OW/UH11pEQMfkEdDFzjLC1Cdo/BdL3s7cXb8J++Hzz1rhOUVZFIPehRiZ8VYu6+7Er7j5PSZu9g/GBdmNzJmyCD9wiswj9BZw+T3iBrg81re36ihMLjoVLoWc+62a1U/7qVX5CpvTVF7rocSAKwv4cBVqZm7lLDS/qoXs4fMs/VQi6BtVbNA3uSzKpQfjH1o3x4LrvkOn40zhm6hjduDglzJUwA0POabgdXIndp9fzhOo23Pe+Rk9GSLX0d71Poqry8NQDTzNlsa+JTNG9+UrEf+ngxCjGEsDCc0bz+udVRyHQI1jmEO3S+IOQycEq7XwB6z3wfMfa73m8PVRp+iOgtZfeSBl01xn03vMaQJkyj7vnhGCklsCWVRUl4y+5oNUzQ63B2dbjDF3vikd/3RUMifPYnX5Glfuk2FsV/7RqjI9yKTbE8wJY+74p7qXO8+dIYgjtLD/N8TJtRh04N9tXJA4H59IkMmLElgvr0Q5OCeVfdAt+5hkh4pQgfRMHpL74XatLQpPiOyHRs/OdmHtBf8nOZcxVKzdGclIN16lE7kJ+pVMjspOI+5+TqLRO6m0ZpNXJoZRv9MPDRcAfJUtNZHyig/s2wwReakFgPPJwCQmu1I30/tcBbji+Na53i1W1N+BqoY7Zxo+U/M9XyJ4Ok2SSkBtoOrwuhAY3a03Eu6l8wFdIG1cN+e8hopTkiKF093KuH/BcB39rMiGDLn6XVhGKEaaT/vqb/lufuAdpGExevF1+J9itkFhCfymWr9vGb3BTK4j598zRH7+e+MU9maruZqb0pkGxRDRE1CD4Z8LV4vhgPidk5w2Bq816g3nHw1//j3JStz7NR9HIWELO8TMn3QrP/zZp//+Dv9p429/ogv+GATR+n/UdF+ns9xNkXZQJXY4t9jMkJNUFygAtzndXwjss+yWH9HAnLQQfhAskdZS2l01HLWv7L7us5uTH409pqitvfSOQg/c+Zt7k879P3K9+WV68n7+3cZfuRd/dDPP/03rn+d+/nBvWfgDlt8+LzjqJ/vx3CnNOwiXhho778C96iD+1TBvRZYeP+EH81LE0vVwOOrmCLB3iKzI1x+vJEsrPH4uF0UB4TJ4X3uDfOCo3PYpYe0MF4bouh0DQ/l43fxUF7Y+dpWuvTSffB0yO2UQUETI/LwCZE3BvnevJ7c9zUlY3H58xzke6DNFDQG8n0WtDN4LAYN4nogKav1ezOfK/z+t6tsCTp+dhx4ymjWuCJk1dEUifDP+HyS4iP/Vg9B2jTo9L4NbiBuDS4nuuHW6H+JDQn2JtqRKGkEQPEYE7uzazXIkcxIAqUq1esasZBETlEZY7y7Jo+RoV/IsjY9eIMkUvr42Hc0xqtsavZvhz1OLwSxMOTuqzlhb0WbdOwBH9EYiyBjatz40bUxTHbiWxqJ0uma19qhPruvcWJlbiSSH48OLDDpaHPszvyct41ZfTu10+vjox6kOqK6v0K/gEPphEvMl/vwSv+A4Hhm36JSP9IXTyCZDm4kKsqD5ay8b1Sad/vaiyO5N/sDfEV6Z4q95E+yfjxpqBoBETW2C7xl4pIO2bDODDFurUPwE7EWC2Uplq+AHmBHvir2PSgkR12/Ry65O0aZtQPeXi9mTlF/Wj5GQ+vFkYyhXsLTjrBSP9hwk4GPqDP5rBn5/l8b0mLRAvRSzXHc293bs3s8EsdE3m2exxidWVB4joHR+S+dz5/W+v00K3TqN14CDBth8eWcsTbiwXPsygHdGid0PEdy6HHm2v/IUuV5RVapYmzGsX90mpnIdNGcOOq64Dbc5GUbYpD9M7S+6cLY//QmjxFLP5cuTFRm3vA5rkFZroFnO3bjHF35uU3s8mvL7Tp9nyTc4mymTJ5sLIp7umSnGkO23faehtz3mmTS7fbVx5rP7x3HXIjRNeq/A3xCs9JNB08c9S9BF2O3bOur0ItslFxXgRPdaapBIi4dRpKGxVz7ir69t/bc9qTxjvtOyGOfiLGDhR4fYywHv1WdOplxIV87TpLBy3Wc0QP0P9s4G7FBNOdITS/tep3o3h1TEa5XDDii7fWtqRzUEReP2fbxz7bHWWJdbIOxOUJZtItNZpTFRfj6vm9sYjRxQVO+WTdiOhdPeTJ+8YirPvoeL88l5iLYOHd3b/Imkq+1ZN1El3UikhftuteEYxf1Wujof8Pr4ICTu5ezZyZ4tHQMxlzUHLYO2VMOoNMGL/20S5i2o2obfk+8qqdR7xzbRDbgU0lnuIgz4LelQ5XS7xbLuSQtNS95v3ZUOdaUx/Qd8qxCt6xf2E62yb/HukLO6RyorV8KgYl5YNc75y+KvefrxY+lc/64y9kvWP0a0bDz/rojq+RWjO06WeruWqNFU7r3HPIcLWRql8ICZsz2Ls/qOm/CLn6++X+Qf7mGspYCrZod/lpl6Rw4xN/yuq8gqV4B6aHk1hVE1SfILxWu5gvXqbfARYQpspcxKp1F/c8XOPzkZvmoSw+vEqBLdrq1fr3wAPv5NnM9i8F+jdAuxkP5Z71c6uhK3enlnGymr7UsWZKC12qgUiG8XXGQ9mxnqz4GSIlybF9eXmbqj2sHX+a1jf0gRoONHRdRSrIq03Ty89eQ1GbV/Bk+du4+V15zls+vvERvZ4E7ZbnxWTVjDjb4o/k8jlw44pTIrUGxxuJvBeO+heuhOjpFsO6lVJ/aXnJDa/bM0Ql1cLbXE/Pbv3EZ3vj3iVrB5irjupZTzlnv677NrI9UNYNqbPgp/HZXS+lJmk87wec+7YOxTDo2aw2l3NfDr34VNlvqWJBknuK7oSlZ6/T10zuOoPZOeoIk81N+sL843WJ2Q4Z0fZ3scsqC/JV2fuhWi1jGURSKZV637lf53Xnnx16/vKEXY89aVJ0fv91jGdfG+G4+sniwHes4hS+udOr4RfhFhG/F5gUG35QaU+McuLmclb5ZWmR+sG5V6nf+PxYzlrnFGxpZaK8eqqVo0NfmAWoGfXDiT/FnUbWvzGDOTr8aktOZWg4BYvz5YH12ZbfCcGtNk+dDAZNGWvHov+PIOnY9Prjg8h/wLRrT69suaMVZ5bNuK00lSVpnqSX1NON/81FoP92rYndionwgOiA8WMf4vc8l15KqEEG4yAm2+WAN5Brfu1sq9suWYqgoajgOYt/JCk1gC8wPkK+XKCtRX6TAtgvrnuBgNRmn6I8lVDipOVB9kX6Oxkp4ZKyd1M6Gj8/v2U7k+YQBL95Kb9PQENucJb0JlW3b5tObN7m/Z1j1ev388d7o15zgXsI9CikAGAViR6lkJv7nb4Ak40M2G8TJ447kN+pvfHiOFjSUSP6PM+QfbAywKJCBaxSVxpizHseZUyUBhq59vFwrkyGoRiHbo0apweEZeSLuNiQ+HAekOnarFg00dZNXaPeoHPTRR0FmEyqYExOVaaaO8c0uFUh7U4e/UxdBmthlBDgg257Q33j1hA7HTxSeTTSuVnPZbgW1nodwmG16aKBDKxEetv7D9OjO0JhrbJTnoe+kcGoDJazFSO8/fUN9Jy/g4XK5PUkw2dgPDGpJqBfhe7GA+cjzfE/EGsMM+FV9nj9IAhrSfT/J3QE5TEIYyk5UjsI6ZZcCPr6A8FZUF4g9nnpVmjX90MLSQysIPD0nFzqwCcSJmIb5mYv2Cmk+C1MDFkZQyCBq4c/Yai9LJ6xYkGS/x2s5/frIW2vmG2Wrv0APpCdgCA9snFvfpe8uc0OwdRs4G9973PGEBnQB5qKrCQ6m6X/H7NInZ7y/1674/ZXOVp7OeuCRk8JFS516VHrnH1HkIUIlTIljjHaQtEtkJtosYul77cVwjk3gW1Ajaa6zWeyHGLlpk3VHE2VFzT2yI/EvlGUSz2H9zYE1s4nsKMtMqNyKNtL/59CpFJki5Fou6VXGm8vWATEPwrUVOLvoA8jLuwOzVBCgHB2Cr5V6OwEWtJEKokJkfc87h+sNHTvMb0KVTp5284QTPupoWvQVUwUeogZR3kBMESYo0mfukewRVPKh5+rzLQb7HKjFFIgWhj1w3yN/qCNoPI8XFiUgBNT1hCHBsAz8L7Oyt8wQWUFj92ONn/APyJFg8hzueqoJdNj57ROrFbffuS/XxrSXLTRgj5uxZjpgQYceeMc2wJrahReSKpm3QjHfqExTLAB2ipVumE8pqcZv8LYXQiPHHsgb5BMW8zM5pvQit+mQx8XGaVDcfVbLyMTlY8xcfmm/RSAT/H09UQol5gIz7rESDmnrQ4bURIB4iRXMDQwxgex1GgtDxKp2HayIkR+E/aDmCttNm2C6lytWdfOVzD6X2SpDWjQDlMRvAp1symWv4my1bPCD+E1EmGnMGWhNwmycJnDV2WrQNxO45ukEb08AAffizYKVULp15I4vbNK5DzWwCSUADfmKhfGSUqii1L2UsE8rB7mLuHuUJZOx4+WiizHBJ/hwboaBzhpNOVvgFTf5cJsHef7L1HCI9dOUUbb+YxUJWn6dYOLz+THi91kzY5dtO5c+grX7v0jEbsuoOGnoIreDIg/sFMyG+TyCLIcAWd1IZ1UNFxE8Uie13ucm40U2fcxC0u3WLvLOxwu+F7MWUsHsdtFQZ7W+nlfCASiAKyh8rnP3EyDByvtJb6Kax6/HkLzT9SyEyTMVM1zPtM0MJY14DmsWh4MgD15Ea9Hd00AdkTZ0EiG5NAGuIBzQJJ0JR0na+OB7lQA6UKxMfihIQ7GCCnVz694QvykWXTxpS2soDu+smru1UdIxSvAszBFD1c8c6ZOobA8bJiJIvuycgIXBQIXWwhyTgZDQxJTRXgEwRNAawGSXO0a1DKjdihLVNp/taE/xYhsgwe+VpKEEB4LlraQyE84gEihxCnbfoyOuJIEXy2FIYw+JjRusybKlU2g/vhTSGTydvCvXhYBdtAXtS2v7LkHtmXh/8fly1do8FI/D0f8UbzVb5h+KRhMGSAmR2mhi0YG/uj7wgxcfzCrMvdjitUIpXDX8ae2JcF/36qUWIMwN6JsjaRGNj+jEteGDcFyTUb8X/NHSucKMJp7pduxtD6KuxVlyxxwaeiC1FbGBESO84lbyrAugYxdl+2N8/6AgWpo/IeoAOcsG35IA/b3AuSyoa55L7llBLlaWlEWvuCFd8f8NfcTUgzJv6CbB+6ohWwodlk9nGWFpBAOaz5uEW5xBvmjnHFeDsb0mXwayj3mdYq5gxxNf3H3/tnCgHwjSrpSgVxLmiTtuszdRUFIsn6LiMPjL808vL1uQhDbM7aA43mISXReqjSskynIRcHCJ9qeFopJfx9tqyUoGbSwJex/0aDE3plBPGtNBYgWbdLom3+Q/bjdizR2/AS/c/dH/d3G7pyl1qDXgtOFtEqidwLqxPYtrNEveasWq3vPUUtqTeu8gpov4bdOQRI2kneFvRNMrShyVeEupK1PoLDPMSfWMIJcs267mGB8X9CehQCF0gIyhpP10mbyM7lwW1e6TGvHBV1sg/UyTghHPGRqMyaebC6pbB1WKNCQtlai1GGvmq9zUKaUzLaXsXEBYtHxmFbEZ2kJhR164LhWW2Tlp1dhsGE7ZgIWRBOx3Zcu2DxgH+G83WTPceKG0TgQKKiiNNOlWgvqNEbnrk6fVD+AqRam2OguZb0YWSTX88N+i/ELSxbaUUpPx4vJUzYg/WonSeA8xUK6u7DPHgpqWpEe6D4cXg5uK9FIYVba47V/nb+wyOtk+zG8RrS4EA0ouwa04iByRLSvoJA2FzaobbZtXnq8GdbfqEp5I2dpfpj59TCVif6+E75p665faiX8gS213RqBxTZqfHP46nF6NSenOneuT+vgbLUbdTH2/t0REFXZJOEB6DHvx6N6g9956CYrY/AYcm9gELJXYkrSi+0F0geKDZgOCIYkLU/+GOW5aGj8mvLFgtFH5+XC8hvAE3CvHRfl4ofM/Qwk4x2A+R+nyc9gNu/9Tem7XW4XRnyRymf52z09cTOdr+PG6+P/Vb4QiXlwauc5WB1z3o+IJjlbxI8MyWtSzT+k4sKVbhF3xa+vDts3NxXa87iiu+xRH9cAprnOL2h6vV54iQRXuOAj1s8nLFK8gZ70ThIQcWdF19/2xaJmT0efrkNDkWbpAQPdo92Z8+Hn/aLjbOzB9AI/k12fPs9HhUNDJ1u6ax2VxD3R6PywN7BrLJ26z6s3QoMp76qzzwetrDABKSGkfW5PwS1GvYNUbK6uRqxfyVGNyFB0E+OugMM8kKwmJmupuRWO8XkXXXQECyRVw9UyIrtCtcc4oNqXqr7AURBmKn6Khz3eBN96LwIJrAGP9mr/59uTOSx631suyT+QujDd4beUFpZ0kJEEnjlP+X/Kr2kCKhnENTg4BsMTOmMqlj2WMFLRUlVG0fzdCBgUta9odrJfpVdFomTi6ak0tFjXTcdqqvWBAzjY6hVrH9sbt3Z9gn+AVDpTcQImefbB4edirjzrsNievve4ZT4EUZWV3TxEsIW+9MT/RJoKfZZYSRGfC1CwPG/9rdMOM8qR/LUYvw5f/emUSoD7YSFuOoqchdUg2UePd1eCtFSKgxLSZ764oy4lvRCIH6bowPxZWwxNFctksLeil47pfevcBipkkBIc4ngZG+kxGZ71a72KQ7VaZ6MZOZkQJZXM6kb/Ac0/XkJx8dvyfJcWbI3zONEaEPIW8GbkYjsZcwy+eMoKrYjDmvEEixHzkCSCRPRzhOfJZuLdcbx19EL23MA8rnjTZZ787FGMnkqnpuzB5/90w1gtUSRaWcb0eta8198VEeZMUSfIhyuc4/nywFQ9uqn7jdqXh+5wwv+RK9XouNPbYdoEelNGo34KyySwigsrfCe0v/PlWPvQvQg8R0KgHO18mTVThhQrlbEQ0Kp/JxPdjHyR7E1QPw/ut0r+HDDG7BwZFm9IqEUZRpv2WpzlMkOemeLcAt5CsrzskLGaVOAxyySzZV/D2EY7ydNZMf8e8VhHcKGHAWNszf1EOq8fNstijMY4JXyATwTdncFFqcNDfDo+mWFvxJJpc4sEZtjXyBdoFcxbUmniCoKq5jydUHNjYJxMqN1KzYV62MugcELVhS3Bnd+TLLOh7dws/zSXWzxEb4Nj4aFun5x4kDWLK5TUF/yCXB/cZYvI9kPgVsG2jShtXkxfgT+xzjJofXqPEnIXIQ1lnIdmVzBOM90EXvJUW6a0nZ/7XjJGl8ToO3H/fdxnxmTNKBZxnkpXLVgLXCZywGT3YyS75w/PAH5I/jMuRspej8xZObU9kREbRA+kqjmKRFaKGWAmFQspC+QLbKPf0RaK3OXvBSWqo46p70ws/eZpu6jCtZUgQy6r4tHMPUdAgWGGUYNbuv/1a6K+MVFsd3T183+T8capSo6m0+Sh57fEeG/95dykGJBQMj09DSW2bY0mUonDy9a8trLnnL5B5LW3Nl8rJZNysO8Zb+80zXxqUGFpud3Qzwb7bf+8mq6x0TAnJU9pDQR9YQmZhlna2xuxJt0aCO/f1SU8gblOrbIyMsxTlVUW69VJPzYU2HlRXcqE2lLLxnObZuz2tT9CivfTAUYfmzJlt/lOPgsR6VN64/xQd4Jlk/RV7UKVv2Gx/AWsmTAuCWKhdwC+4HmKEKYZh2Xis4KsUR1BeObs1c13wqFRnocdmuheaTV30gvVXZcouzHKK5zwrN52jXJEuX6dGx3BCpV/++4f3hyaW/cQJLFKqasjsMuO3B3WlMq2gyYfdK1e7L2pO/tRye2mwzwZPfdUMrl5wdLqdd2Kv/wVtnpyWYhd49L6rsOV+8HXPrWH2Kup89l2tz6bf80iYSd+V4LROSOHeamvexR524q4r43rTmtFzQvArpvWfLYFZrbFspBsXNUqqenjxNNsFXatZvlIhk7teUPfK+YL32F8McTnjv0BZNppb+vshoCrtLXjIWq3EJXpVXIlG6ZNL0dh6qEm2WMwDjD3LfOfkGh1/czYc/0qhiD2ozNnH4882MVVt3JbVFkbwowNCO3KL5IoYW5wlVeGCViOuv1svZx7FbzxKzA4zGqBlRRaRWCobXaVq4yYCWbZf8eiJwt3OY+MFiSJengcFP2t0JMfzOiJ7cECvpx7neg1Rc5x+7myPJOXt2FohVRyXtD+/rDoTOyGYInJelZMjolecVHUhUNqvdZWg2J2t0jPmiLFeRD/8fOT4o+NGILb+TufCo9ceBBm3JLVn+MO2675n7qiEX/6W+188cYg3Zn5NSTjgOKfWFSAANa6raCxSoVU851oJLY11WIoYK0du0ec5E4tCnAPoKh71riTsjVIp3gKvBbEYQiNYrmH22oLQWA2AdwMnID6PX9b58dR2QKo4qag1D1Z+L/FwEKTR7osOZPWECPJIHQqPUsM5i/CH5YupVPfFA5pHUBcsesh8eO5YhyWnaVRPZn/BmdXVumZWPxMP5e28zm2uqHgFoT9CymHYNNrzrrjlXZM06HnzDxYNlI5b/QosxLmmrqDFqmogQdqk0WLkUceoAvQxHgkIyvWU69BPFr24VB6+lx75Rna6dGtrmOxDnvBojvi1/4dHjVeg8owofPe1cOnxU1ioh016s/Vudv9mhV9f35At+Sh28h1bpp8xhr09+vf47Elx3Ms6hyp6QvB3t0vnLbOhwo660cp7K0vvepabK7YJfxEWWfrC2YzJfYOjygPwfwd/1amTqa0hZ5ueebhWYVMubRTwIjj+0Oq0ohU3zfRfuL8gt59XsHdwKtxTQQ4Y2qz6gisxnm2UdlmpEkgOsZz7iEk6QOt8BuPwr+NR01LTqXmJo1C76o1N274twJvl+I069TiLpenK/miRxhyY8jvYV6W1WuSwhH9q7kuwnJMtm7IWcqs7HsnyHSqWXLSpYtZGaR1V3t0gauninFPZGtWskF65rtti48UV9uV9KM8kfDYs0pgB00S+TlzTXV6P8mxq15b9En8sz3jWSszcifZa/NuufPNnNTb031pptt0+sRSH/7UG8pzbsgtt3OG3ut7B9JzDMt2mTZuyRNIV8D54TuTrpNcHtgmMlYJeiY9XS83NYJicjRjtJSf9BZLsQv629QdDsKQhTK5CnXhpk7vMNkHzPhm0ExW/VCGApHfPyBagtZQTQmPHx7g5IXXsrQDPzIVhv2LB6Ih138iSDww1JNHrDvzUxvp73MsQBVhW8EbrReaVUcLB1R3PUXyaYG4HpJUcLVxMgDxcPkVRQpL7VTAGabDzbKcvg12t5P8TSGQkrj/gOrpnbiDHwluA73xbXts/L7u468cRWSWRtgTwlQnA47EKg0OiZDgFxAKQQUcsbGomITgeXUAAyKe03eA7Mp4gnyKQmm0LXJtEk6ddksMJCuxDmmHzmVhO+XaN2A54MIh3niw5CF7PwiXFZrnA8wOdeHLvvhdoqIDG9PDI7UnWWHq526T8y6ixJPhkuVKZnoUruOpUgOOp3iIKBjk+yi1vHo5cItHXb1PIKzGaZlRS0g5d3MV2pD8FQdGYLZ73aae/eEIUePMc4NFz8pIUfLCrrF4jVWH5gQneN3S8vANBmUXrEcKGn6hIUN95y1vpsvLwbGpzV9L0ZKTan6TDXM05236uLJcIEMKVAxKNT0K8WljuwNny3BNQRfzovA85beI9zr1AGNYnYCVkR1aGngWURUrgqR+gRrQhxW81l3CHevjvGEPzPMTxdsIfB9dfGRbZU0cg/1mcubtECX4tvaedmNAvTxCJtc2QaoUalGfENCGK7IS/O8CRpdOVca8EWCRwv2sSWE8CJPW5PCugjCXPd3h6U60cPD+bdhtXZuYB6stcoveE7Sm5MM2yvfUHXFSW7KzLmi7/EeEWL0wqcOH9MOSKjhCHHmw+JGLcYE/7SBZQCRggox0ZZTAxrlzNNXYXL5fNIjkdT4YMqVUz6p8YDt049v4OXGdg3qTrtLBUXOZf7ahPlZAY/O+7Sp0bvGSHdyQ8B1LOsplqMb9Se8VAE7gIdSZvxbRSrfl+Lk5Qaqi5QJceqjitdErcHXg/3MryljPSIAMaaloFm1cVwBJ8DNmkDqoGROSHFetrgjQ5CahuKkdH5pRPigMrgTtlFI8ufJPJSUlGgTjbBSvpRc0zypiUn6U5KZqcRoyrtzhmJ7/caeZkmVRwJQeLOG8LY6vP5ChpKhc8Js0El+n6FXqbx9ItdtLtYP92kKfaTLtCi8StLZdENJa9Ex1nOoz1kQ7qxoiZFKRyLf4O4CHRT0T/0W9F8epNKVoeyxUXhy3sQMMsJjQJEyMOjmOhMFgOmmlscV4eFi1CldU92yjwleirEKPW3bPAuEhRZV7JsKV3Lr5cETAiFuX5Nw5UlF7d2HZ96Bh0sgFIL5KGaKSoVYVlvdKpZJVP5+NZ7xDEkQhmDgsDKciazJCXJ6ZN2B3FY2f6VZyGl/t4aunGIAk/BHaS+i+SpdRfnB/OktOvyjinWNfM9Ksr6WwtCa1hCmeRI6icpFM4o8quCLsikU0tMoZI/9EqXRMpKGaWzofl4nQuVQm17d5fU5qXCQeCDqVaL9XJ9qJ08n3G3EFZS28SHEb3cdRBdtO0YcTzil3QknNKEe/smQ1fTb0XbpyNB5xAeuIlf+5KWlEY0DqJbsnzJlQxJPOVyHiKMx5Xu9FcEv1Fbg6Fhm4t+Jyy5JC1W3YO8dYLsO0PXPbxodBgttTbH3rt9Cp1lJIk2r3O1Zqu94eRbnIz2f50lWolYzuKsj4PMok4abHLO8NAC884hiXx5Fy5pWKO0bWL7uEGXaJCtznhP67SlQ4xjWIfgq6EpZ28QMtuZK7JC0RGbl9nA4XtFLug/NLMoH1pGt9IonAJqcEDLyH6TDROcbsmGPaGIxMo41IUAnQVPMPGByp4mOmh9ZQMkBAcksUK55LsZj7E5z5XuZoyWCKu6nHmDq22xI/9Z8YdxJy4kWpD16jLVrpwGLWfyOD0Wd+cBzFBxVaGv7S5k9qwh/5t/LQEXsRqI3Q9Rm3QIoaZW9GlsDaKOUyykyWuhNOprSEi0s1G4rgoiX1V743EELti+pJu5og6X0g6oTynUqlhH9k6ezyRi05NGZHz0nvp3HOJr7ebrAUFrDjbkFBObEvdQWkkUbL0pEvMU46X58vF9j9F3j6kpyetNUBItrEubW9ZvMPM4qNqLlsSBJqOH3XbNwv/cXDXNxN8iFLzUhteisYY+RlHYOuP29/Cb+L+xv+35Rv7xudnZ6ohK4cMPfCG8KI7dNmjNk/H4e84pOxn/sZHK9psfvj8ncA8qJz7O8xqbxESDivGJOZzF7o5PJLQ7g34qAWoyuA+x3btU98LT6ZyGyceIXjrqob2CAVql4VOTQPUQYvHV/g4zAuCZGvYQBtf0wmd5lilrvuEn1BXLny01B4h4SMDlYsnNpm9d7m9h578ufpef9Z4WplqWQvqo52fyUA7J24eZD5av6SyGIV9kpmHNqyvdfzcpEMw97BvknV2fq+MFHun9BT3Lsf8pbzvisWiIQvYkng+8Vxk1V+dli1u56kY50LRjaPdotvT5BwqtwyF+emo/z9J3yVUVGfKrxQtJMOAQWoQii/4dp9wgybSa5mkucmRLtEQZ/pz0tL/NVcgWAd95nEQ3Tg6tNbuyn3Iepz65L3huMUUBntllWuu4DbtOFSMSbpILV4fy6wlM0SOvi6CpLh81c1LreIvKd61uEWBcDw1lUBUW1I0Z+m/PaRlX+PQ/oxg0Ye6KUiIiTF4ADNk59Ydpt5/rkxmq9tV5Kcp/eQLUVVmBzQNVuytQCP6Ezd0G8eLxWyHpmZWJ3bAzkWTtg4lZlw42SQezEmiUPaJUuR/qklVA/87S4ArFCpALdY3QRdUw3G3XbWUp6aq9z0zUizcPa7351p9JXOZyfdZBFnqt90VzQndXB/mwf8LC9STj5kenVpNuqOQQP3mIRJj7eV21FxG8VAxKrEn3c+XfmZ800EPb9/5lIlijscUbB6da0RQaMook0zug1G0tKi/JBC4rw7/D3m4ARzAkzMcVrDcT2SyFtUdWAsFlsPDFqV3N+EjyXaoEePwroaZCiLqEzb8MW+PNE9TmTC01EzWli51PzZvUqkmyuROU+V6ik+Le/9qT6nwzUzf9tP68tYei0YaDGx6kAd7jn1cKqOCuYbiELH9zYqcc4MnRJjkeGiqaGwLImhyeKs+xKJMBlOJ05ow9gGCKZ1VpnMKoSCTbMS+X+23y042zOb5MtcY/6oBeAo1Vy89OTyhpavFP78jXCcFH0t7Gx24hMEOm2gsEfGabVpQgvFqbQKMsknFRRmuPHcZu0Su/WMFphZvB2r/EGbG72rpGGho3h+Msz0uGzJ7hNK2uqQiE1qmn0zgacKYYZBCqsxV+sjbpoVdSilW/b94n2xNb648VmNIoizqEWhBnsen+d0kbCPmRItfWqSBeOd9Wne3c6bcd6uvXOJ6WdiSsuXq0ndhqrQ4QoWUjCjYtZ0EAhnSOP1m44xkf0O7jXghrzSJWxP4a/t72jU29Vu2rvu4n7HfHkkmQOMGSS+NPeLGO5I73mC2B7+lMiBQQZRM9/9liLIfowupUFAbPBbR+lxDM6M8Ptgh1paJq5Rvs7yEuLQv/7d1oU2woFSb3FMPWQOKMuCuJ7pDDjpIclus5TeEoMBy2YdVB4fxmesaCeMNsEgTHKS5WDSGyNUOoEpcC2OFWtIRf0w27ck34/DjxRTVIcc9+kqZE6iMSiVDsiKdP/Xz5XfEhm/sBhO50p1rvJDlkyyxuJ9SPgs7YeUJBjXdeAkE+P9OQJm6SZnn1svcduI78dYmbkE2mtziPrcjVisXG78spLvbZaSFx/Rks9zP4LKn0Cdz/3JsetkT06A8f/yCgMO6Mb1Hme0JJ7b2wZz1qleqTuKBGokhPVUZ0dVu+tnQYNEY1fmkZSz6+EGZ5EzL7657mreZGR3jUfaEk458PDniBzsSmBKhDRzfXameryJv9/D5m6HIqZ0R+ouCE54Dzp4IJuuD1e4Dc5i+PpSORJfG23uVgqixAMDvchMR0nZdH5brclYwRoJRWv/rlxGRI5ffD5NPGmIDt7vDE1434pYdVZIFh89Bs94HGGJbTwrN8T6lh1HZFTOB4lWzWj6EVqxSMvC0/ljWBQ3F2kc/mO2b6tWonT2JEqEwFts8rz2h+oWNds9ceR2cb7zZvJTDppHaEhK5avWqsseWa2Dt5BBhabdWSktS80oMQrL4TvAM9b5HMmyDnO+OkkbMXfUJG7eXqTIG6lqSOEbqVR+qYdP7uWb57WEJqzyh411GAVsDinPs7KvUeXItlcMdOUWzXBH6zscymV1LLVCtc8IePojzXHF9m5b5zGwBRdzcyUJkiu938ApmAayRdJrX1PmVguWUvt2ThQ62czItTyWJMW2An/hdDfMK7SiFQlGIdAbltHz3ycoh7j9V7GxNWBpbtcSdqm4XxRwTawc3cbZ+xfSv9qQfEkDKfZTwCkqWGI/ur250ItXlMlh6vUNWEYIg9A3GzbgmbqvTN8js2YMo87CU5y6nZ4dbJLDQJj9fc7yM7tZzJDZFtqOcU8+mZjYlq4VmifI23iHb1ZoT9E+kT2dolnP1AfiOkt7PQCSykBiXy5mv637IegWSKj9IKrYZf4Lu9+I7ub+mkRdlvYzehh/jaJ9n7HUH5b2IbgeNdkY7wx1yVzxS7pbvky6+nmVUtRllEFfweUQ0/nG017WoUYSxs+j2B4FV/F62EtHlMWZXYrjGHpthnNb1x66LKZ0Qe92INWHdfR/vqp02wMS8r1G4dJqHok8KmQ7947G13a4YXbsGgHcBvRuVu1eAi4/A5+ZixmdSXM73LupB/LH7O9yxLTVXJTyBbI1S49TIROrfVCOb/czZ9pM4JsZx8kUz8dQGv7gUWKxXvTH7QM/3J2OuXXgciUhqY+cgtaOliQQVOYthBLV3xpESZT3rmfEYNZxmpBbb24CRao86prn+i9TNOh8VxRJGXJfXHATJHs1T5txgc/opYrY8XjlGQQbRcoxIBcnVsMjmU1ymmIUL4dviJXndMAJ0Yet+c7O52/p98ytlmAsGBaTAmMhimAnvp1TWNGM9BpuitGj+t810CU2UhorrjPKGtThVC8WaXw04WFnT5fTjqmPyrQ0tN3CkLsctVy2xr0ZWgiWVZ1OrlFjjxJYsOiZv2cAoOvE+7sY0I/TwWcZqMoyIKNOftwP7w++Rfg67ljfovKYa50if3fzE/8aPYVey/Nq35+nH2sLPh/fP5TsylSKGOZ4k69d2PnH43+kq++sRXHQqGArWdwhx+hpwQC6JgT2uxehYU4Zbw7oNb6/HLikPyJROGK2ouyr+vzseESp9G50T4AyFrSqOQ0rroCYP4sMDFBrHn342EyZTMlSyk47rHSq89Y9/nI3zG5lX16Z5lxphguLOcZUndL8wNcrkyjH82jqg8Bo8OYkynrxZvbFno5lUS3OPr8Ko3mX9NoRPdYOKKjD07bvgFgpZ/RF+YzkWvJ/Hs/tUbfeGzGWLxNAjfDzHHMVSDwB5SabQLsIZHiBp43FjGkaienYoDd18hu2BGwOK7U3o70K/WY/kuuKdmdrykIBUdG2mvE91L1JtTbh20mOLbk1vCAamu7utlXeGU2ooVikbU/actcgmsC1FKk2qmj3GWeIWbj4tGIxE7BLcBWUvvcnd/lYxsMV4F917fWeFB/XbINN3qGvIyTpCalz1lVewdIGqeAS/gB8Mi+sA+BqDiX3VGD2eUunTRbSY+AuDy4E3Qx3hAhwnSXX+B0zuj3eQ1miS8Vux2z/l6/BkWtjKGU72aJkOCWhGcSf3+kFkkB15vGOsQrSdFr6qTj0gBYiOlnBO41170gOWHSUoBVRU2JjwppYdhIFDfu7tIRHccSNM5KZOFDPz0TGMAjzzEpeLwTWp+kn201kU6NjbiMQJx83+LX1e1tZ10kuChJZ/XBUQ1dwaBHjTDJDqOympEk8X2M3VtVw21JksChA8w1tTefO3RJ1FMbqZ01bHHkudDB/OhLfe7P5GOHaI28ZXKTMuqo0hLWQ4HabBsGG7NbP1RiXtETz074er6w/OerJWEqjmkq2y51q1BVI+JUudnVa3ogBpzdhFE7fC7kybrAt2Z6RqDjATAUEYeYK45WMupBKQRtQlU+uNsjnzj6ZmGrezA+ASrWxQ6LMkHRXqXwNq7ftv28dUx/ZSJciDXP2SWJsWaN0FjPX9Yko6LobZ7aYW/IdUktI9apTLyHS8DyWPyuoZyxN1TK/vtfxk3HwWh6JczZC8Ftn0bIJay2g+n5wd7lm9rEsKO+svqVmi+c1j88hSCxbzrg4+HEP0Nt1/B6YW1XVm09T1CpAKjc9n18hjqsaFGdfyva1ZG0Xu3ip6N6JGpyTSqY5h4BOlpLPaOnyw45PdXTN+DtAKg7DLrLFTnWusoSBHk3s0d7YouJHq85/R09Tfc37ENXZF48eAYLnq9GLioNcwDZrC6FW6godB8JnqYUPvn0pWLfQz0lM0Yy8Mybgn84Ds3Q9bDP10bLyOV+qzxa4Rd9Dhu7cju8mMaONXK3UqmBQ9qIg7etIwEqM/kECk/Dzja4Bs1xR+Q/tCbc8IKrSGsTdJJ0vge7IG20W687uVmK6icWQ6cD3lwFzgNMGtFvO5qyJeKflGLAAcQZOrkxVwy3cWvqlGpvjmf9Qe6Ap20MPbV92DPV0OhFM4kz8Yr0ffC2zLWSQ1kqY6QdQrttR3kh1YLtQd1kCEv5hVoPIRWl5ERcUTttBIrWp6Xs5Ehh5OUUwI5aEBvuiDmUoENmnVw1FohCrbRp1A1E+XSlWVOTi7ADW+5Ohb9z1vK4qx5R5lPdGCPBJZ00mC+Ssp8VUbgpGAvXWMuWQQRbCqI6Rr2jtxZxtfP7W/8onz+yz0Gs76LaT5HX9ecyiZCB/ZR/gFtMxPsDwohoeCRtiuLxE1GM1vUEUgBv86+eehL58/P56QFGQ/MqOe/vC76L63jzmeax4exd/OKTUvkXg+fOJUHych9xt/9goJMrapSgvXrj8+8vk/N80f22Sewj6cyGqt1B6mztoeklVHHraouhvHJaG/OuBz6DHKMpFmQULU1bRWlyYE0RPXYYkUycIemN7TLtgNCJX6BqdyxDKkegO7nJK5xQ7OVYDZTMf9bVHidtk6DQX9Et+V9M7esgbsYBdEeUpsB0Xvw2kd9+rI7V+m47u+O/tq7mw7262HU1WlS9uFzsV6JxIHNmUCy0QS9e077JGRFbG65z3/dOKB/Zk+yDdKpUmdXjn/aS3N5nv4fK7bMHHmPlHd4E2+iTbV5rpzScRnxk6KARuDTJ8Q1LpK2mP8gj1EbuJ9RIyY+EWK4hCiIDBAS1Tm2IEXAFfgKPgdL9O6mAa06wjCcUAL6EsxPQWO9VNegBPm/0GgkZbDxCynxujX/92vmGcjZRMAY45puak2sFLCLSwXpEsyy5fnF0jGJBhm+fNSHKKUUfy+276A7/feLOFxxUuHRNJI2Osenxyvf8DAGObT60pfTTlhEg9u/KKkhJqm5U1/+BEcSkpFDA5XeCqxwXmPac1jcuZ3JWQ+p0NdWzb/5v1ZvF8GtMTFFEdQjpLO0bwPb0BHNWnip3liDXI2fXf05jjvfJ0NpjLCUgfTh9CMFYVFKEd4Z/OG/2C+N435mnK+9t1gvCiVcaaH7rK4+PjCvpVNiz+t2QyqH1O8x3JKZVl6Q+Lp/XK8wMjVMslOq9FdSw5FtUs/CptXH9PW+wbWHgrV17R5jTVOtGtKFu3nb80T+E0tv9QkzW3J2dbaw/8ddAKZ0pxIaEqLjlPrji3VgJ3GvdFvlqD8075woxh4fVt0JZE0KVFsAvqhe0dqN9b35jtSpnYMXkU+vZq+IAHad3IHc2s/LYrnD1anfG46IFiMIr9oNbZDWvwthqYNqOigaKd/XlLU4XHfk/PXIjPsLy/9/kAtQ+/wKH+hI/IROWj5FPvTZAT9f7j4ZXQyG4M0TujMAFXYkKvEHv1xhySekgXGGqNxWeWKlf8dDAlLuB1cb/qOD+rk7cmwt+1yKpk9cudqBanTi6zTbXRtV8qylNtjyOVKy1HTz0GW9rjt6sSjAZcT5R+KdtyYb0zyqG9pSLuCw5WBwAn7fjBjKLLoxLXMI+52L9cLwIR2B6OllJZLHJ8vDxmWdtF+QJnmt1rsHPIWY20lftk8fYePkAIg6Hgn532QoIpegMxiWgAOfe5/U44APR8Ac0NeZrVh3gEhs12W+tVSiWiUQekf/YBECUy5fdYbA08dd7VzPAP9aiVcIB9k6tY7WdJ1wNV+bHeydNtmC6G5ICtFC1ZwmJU/j8hf0I8TRVKSiz5oYIa93EpUI78X8GYIAZabx47/n8LDAAJ0nNtP1rpROprqKMBRecShca6qXuTSI3jZBLOB3Vp381B5rCGhjSvh/NSVkYp2qIdP/Bg=";
+
+},{}],6:[function(require,module,exports){
+/* Copyright 2013 Google Inc. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1860,396 +1386,306 @@
    Collection of static dictionary words.
 */
 
-					var data = require( './dictionary-browser' );
-					exports.init = function () {
-						exports.dictionary = data.init();
-					};
-
-					exports.offsetsByLength = new Uint32Array( [
-						0, 0, 0, 0, 0, 4096, 9216, 21504, 35840, 44032, 53248,
-						63488, 74752, 87040, 93696, 100864, 104704, 106752,
-						108928, 113536, 115968, 118528, 119872, 121280, 122016,
-					] );
-
-					exports.sizeBitsByLength = new Uint8Array( [
-						0, 0, 0, 0, 10, 10, 11, 11, 10, 10, 10, 10, 10, 9, 9, 8,
-						7, 7, 8, 7, 7, 6, 6, 5, 5,
-					] );
-
-					exports.minDictionaryWordLength = 4;
-					exports.maxDictionaryWordLength = 24;
-				},
-				{ './dictionary-browser': 4 },
-			],
-			7: [
-				function ( require, module, exports ) {
-					function HuffmanCode( bits, value ) {
-						this.bits =
-							bits; /* number of bits used for this symbol */
-						this.value = value; /* symbol value or table offset */
-					}
-
-					exports.HuffmanCode = HuffmanCode;
-
-					var MAX_LENGTH = 15;
-
-					/* Returns reverse(reverse(key, len) + 1, len), where reverse(key, len) is the
+var data = require('./dictionary-browser');
+exports.init = function() {
+  exports.dictionary = data.init();
+};
+
+exports.offsetsByLength = new Uint32Array([
+     0,     0,     0,     0,     0,  4096,  9216, 21504, 35840, 44032,
+ 53248, 63488, 74752, 87040, 93696, 100864, 104704, 106752, 108928, 113536,
+ 115968, 118528, 119872, 121280, 122016,
+]);
+
+exports.sizeBitsByLength = new Uint8Array([
+  0,  0,  0,  0, 10, 10, 11, 11, 10, 10,
+ 10, 10, 10,  9,  9,  8,  7,  7,  8,  7,
+  7,  6,  6,  5,  5,
+]);
+
+exports.minDictionaryWordLength = 4;
+exports.maxDictionaryWordLength = 24;
+
+},{"./dictionary-browser":4}],7:[function(require,module,exports){
+function HuffmanCode(bits, value) {
+  this.bits = bits;   /* number of bits used for this symbol */
+  this.value = value; /* symbol value or table offset */
+}
+
+exports.HuffmanCode = HuffmanCode;
+
+var MAX_LENGTH = 15;
+
+/* Returns reverse(reverse(key, len) + 1, len), where reverse(key, len) is the
    bit-wise reversal of the len least significant bits of key. */
-					function GetNextKey( key, len ) {
-						var step = 1 << ( len - 1 );
-						while ( key & step ) {
-							step >>= 1;
-						}
-						return ( key & ( step - 1 ) ) + step;
-					}
-
-					/* Stores code in table[0], table[step], table[2*step], ..., table[end] */
-					/* Assumes that end is an integer multiple of step */
-					function ReplicateValue( table, i, step, end, code ) {
-						do {
-							end -= step;
-							table[ i + end ] = new HuffmanCode(
-								code.bits,
-								code.value
-							);
-						} while ( end > 0 );
-					}
-
-					/* Returns the table width of the next 2nd level table. count is the histogram
+function GetNextKey(key, len) {
+  var step = 1 << (len - 1);
+  while (key & step) {
+    step >>= 1;
+  }
+  return (key & (step - 1)) + step;
+}
+
+/* Stores code in table[0], table[step], table[2*step], ..., table[end] */
+/* Assumes that end is an integer multiple of step */
+function ReplicateValue(table, i, step, end, code) {
+  do {
+    end -= step;
+    table[i + end] = new HuffmanCode(code.bits, code.value);
+  } while (end > 0);
+}
+
+/* Returns the table width of the next 2nd level table. count is the histogram
    of bit lengths for the remaining symbols, len is the code length of the next
    processed symbol */
-					function NextTableBitSize( count, len, root_bits ) {
-						var left = 1 << ( len - root_bits );
-						while ( len < MAX_LENGTH ) {
-							left -= count[ len ];
-							if ( left <= 0 ) break;
-							++len;
-							left <<= 1;
-						}
-						return len - root_bits;
-					}
-
-					exports.BrotliBuildHuffmanTable = function (
-						root_table,
-						table,
-						root_bits,
-						code_lengths,
-						code_lengths_size
-					) {
-						var start_table = table;
-						var code; /* current table entry */
-						var len; /* current code length */
-						var symbol; /* symbol index in original or sorted table */
-						var key; /* reversed prefix code */
-						var step; /* step size to replicate values in current table */
-						var low; /* low bits for current root entry */
-						var mask; /* mask for low bits */
-						var table_bits; /* key length of current table */
-						var table_size; /* size of current table */
-						var total_size; /* sum of root table size and 2nd level table sizes */
-						var sorted; /* symbols sorted by code length */
-						var count = new Int32Array(
-							MAX_LENGTH + 1
-						); /* number of codes of each length */
-						var offset = new Int32Array(
-							MAX_LENGTH + 1
-						); /* offsets in sorted table for each length */
-
-						sorted = new Int32Array( code_lengths_size );
-
-						/* build histogram of code lengths */
-						for (
-							symbol = 0;
-							symbol < code_lengths_size;
-							symbol++
-						) {
-							count[ code_lengths[ symbol ] ]++;
-						}
-
-						/* generate offsets into sorted symbol table by code length */
-						offset[ 1 ] = 0;
-						for ( len = 1; len < MAX_LENGTH; len++ ) {
-							offset[ len + 1 ] = offset[ len ] + count[ len ];
-						}
-
-						/* sort symbols by length, by symbol order within each length */
-						for (
-							symbol = 0;
-							symbol < code_lengths_size;
-							symbol++
-						) {
-							if ( code_lengths[ symbol ] !== 0 ) {
-								sorted[ offset[ code_lengths[ symbol ] ]++ ] =
-									symbol;
-							}
-						}
-
-						table_bits = root_bits;
-						table_size = 1 << table_bits;
-						total_size = table_size;
-
-						/* special case code with only one value */
-						if ( offset[ MAX_LENGTH ] === 1 ) {
-							for ( key = 0; key < total_size; ++key ) {
-								root_table[ table + key ] = new HuffmanCode(
-									0,
-									sorted[ 0 ] & 0xffff
-								);
-							}
-
-							return total_size;
-						}
-
-						/* fill in root table */
-						key = 0;
-						symbol = 0;
-						for (
-							len = 1, step = 2;
-							len <= root_bits;
-							++len, step <<= 1
-						) {
-							for ( ; count[ len ] > 0; --count[ len ] ) {
-								code = new HuffmanCode(
-									len & 0xff,
-									sorted[ symbol++ ] & 0xffff
-								);
-								ReplicateValue(
-									root_table,
-									table + key,
-									step,
-									table_size,
-									code
-								);
-								key = GetNextKey( key, len );
-							}
-						}
-
-						/* fill in 2nd level tables and add pointers to root table */
-						mask = total_size - 1;
-						low = -1;
-						for (
-							len = root_bits + 1, step = 2;
-							len <= MAX_LENGTH;
-							++len, step <<= 1
-						) {
-							for ( ; count[ len ] > 0; --count[ len ] ) {
-								if ( ( key & mask ) !== low ) {
-									table += table_size;
-									table_bits = NextTableBitSize(
-										count,
-										len,
-										root_bits
-									);
-									table_size = 1 << table_bits;
-									total_size += table_size;
-									low = key & mask;
-									root_table[ start_table + low ] =
-										new HuffmanCode(
-											( table_bits + root_bits ) & 0xff,
-											( table - start_table - low ) &
-												0xffff
-										);
-								}
-								code = new HuffmanCode(
-									( len - root_bits ) & 0xff,
-									sorted[ symbol++ ] & 0xffff
-								);
-								ReplicateValue(
-									root_table,
-									table + ( key >> root_bits ),
-									step,
-									table_size,
-									code
-								);
-								key = GetNextKey( key, len );
-							}
-						}
-
-						return total_size;
-					};
-				},
-				{},
-			],
-			8: [
-				function ( require, module, exports ) {
-					'use strict';
-
-					exports.byteLength = byteLength;
-					exports.toByteArray = toByteArray;
-					exports.fromByteArray = fromByteArray;
-
-					var lookup = [];
-					var revLookup = [];
-					var Arr =
-						typeof Uint8Array !== 'undefined' ? Uint8Array : Array;
-
-					var code =
-						'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-					for ( var i = 0, len = code.length; i < len; ++i ) {
-						lookup[ i ] = code[ i ];
-						revLookup[ code.charCodeAt( i ) ] = i;
-					}
-
-					// Support decoding URL-safe base64 strings, as Node.js does.
-					// See: https://en.wikipedia.org/wiki/Base64#URL_applications
-					revLookup[ '-'.charCodeAt( 0 ) ] = 62;
-					revLookup[ '_'.charCodeAt( 0 ) ] = 63;
-
-					function getLens( b64 ) {
-						var len = b64.length;
-
-						if ( len % 4 > 0 ) {
-							throw new Error(
-								'Invalid string. Length must be a multiple of 4'
-							);
-						}
-
-						// Trim off extra bytes after placeholder bytes are found
-						// See: https://github.com/beatgammit/base64-js/issues/42
-						var validLen = b64.indexOf( '=' );
-						if ( validLen === -1 ) validLen = len;
-
-						var placeHoldersLen =
-							validLen === len ? 0 : 4 - ( validLen % 4 );
-
-						return [ validLen, placeHoldersLen ];
-					}
-
-					// base64 is 4/3 + up to two characters of the original data
-					function byteLength( b64 ) {
-						var lens = getLens( b64 );
-						var validLen = lens[ 0 ];
-						var placeHoldersLen = lens[ 1 ];
-						return (
-							( ( validLen + placeHoldersLen ) * 3 ) / 4 -
-							placeHoldersLen
-						);
-					}
-
-					function _byteLength( b64, validLen, placeHoldersLen ) {
-						return (
-							( ( validLen + placeHoldersLen ) * 3 ) / 4 -
-							placeHoldersLen
-						);
-					}
-
-					function toByteArray( b64 ) {
-						var tmp;
-						var lens = getLens( b64 );
-						var validLen = lens[ 0 ];
-						var placeHoldersLen = lens[ 1 ];
-
-						var arr = new Arr(
-							_byteLength( b64, validLen, placeHoldersLen )
-						);
-
-						var curByte = 0;
-
-						// if there are placeholders, only get up to the last complete 4 chars
-						var len = placeHoldersLen > 0 ? validLen - 4 : validLen;
-
-						for ( var i = 0; i < len; i += 4 ) {
-							tmp =
-								( revLookup[ b64.charCodeAt( i ) ] << 18 ) |
-								( revLookup[ b64.charCodeAt( i + 1 ) ] << 12 ) |
-								( revLookup[ b64.charCodeAt( i + 2 ) ] << 6 ) |
-								revLookup[ b64.charCodeAt( i + 3 ) ];
-							arr[ curByte++ ] = ( tmp >> 16 ) & 0xff;
-							arr[ curByte++ ] = ( tmp >> 8 ) & 0xff;
-							arr[ curByte++ ] = tmp & 0xff;
-						}
-
-						if ( placeHoldersLen === 2 ) {
-							tmp =
-								( revLookup[ b64.charCodeAt( i ) ] << 2 ) |
-								( revLookup[ b64.charCodeAt( i + 1 ) ] >> 4 );
-							arr[ curByte++ ] = tmp & 0xff;
-						}
-
-						if ( placeHoldersLen === 1 ) {
-							tmp =
-								( revLookup[ b64.charCodeAt( i ) ] << 10 ) |
-								( revLookup[ b64.charCodeAt( i + 1 ) ] << 4 ) |
-								( revLookup[ b64.charCodeAt( i + 2 ) ] >> 2 );
-							arr[ curByte++ ] = ( tmp >> 8 ) & 0xff;
-							arr[ curByte++ ] = tmp & 0xff;
-						}
-
-						return arr;
-					}
-
-					function tripletToBase64( num ) {
-						return (
-							lookup[ ( num >> 18 ) & 0x3f ] +
-							lookup[ ( num >> 12 ) & 0x3f ] +
-							lookup[ ( num >> 6 ) & 0x3f ] +
-							lookup[ num & 0x3f ]
-						);
-					}
-
-					function encodeChunk( uint8, start, end ) {
-						var tmp;
-						var output = [];
-						for ( var i = start; i < end; i += 3 ) {
-							tmp =
-								( ( uint8[ i ] << 16 ) & 0xff0000 ) +
-								( ( uint8[ i + 1 ] << 8 ) & 0xff00 ) +
-								( uint8[ i + 2 ] & 0xff );
-							output.push( tripletToBase64( tmp ) );
-						}
-						return output.join( '' );
-					}
-
-					function fromByteArray( uint8 ) {
-						var tmp;
-						var len = uint8.length;
-						var extraBytes = len % 3; // if we have 1 byte left, pad 2 bytes
-						var parts = [];
-						var maxChunkLength = 16383; // must be multiple of 3
-
-						// go through the array every three bytes, we'll deal with trailing stuff later
-						for (
-							var i = 0, len2 = len - extraBytes;
-							i < len2;
-							i += maxChunkLength
-						) {
-							parts.push(
-								encodeChunk(
-									uint8,
-									i,
-									i + maxChunkLength > len2
-										? len2
-										: i + maxChunkLength
-								)
-							);
-						}
-
-						// pad the end with zeros, but make sure to not forget the extra bytes
-						if ( extraBytes === 1 ) {
-							tmp = uint8[ len - 1 ];
-							parts.push(
-								lookup[ tmp >> 2 ] +
-									lookup[ ( tmp << 4 ) & 0x3f ] +
-									'=='
-							);
-						} else if ( extraBytes === 2 ) {
-							tmp = ( uint8[ len - 2 ] << 8 ) + uint8[ len - 1 ];
-							parts.push(
-								lookup[ tmp >> 10 ] +
-									lookup[ ( tmp >> 4 ) & 0x3f ] +
-									lookup[ ( tmp << 2 ) & 0x3f ] +
-									'='
-							);
-						}
-
-						return parts.join( '' );
-					}
-				},
-				{},
-			],
-			9: [
-				function ( require, module, exports ) {
-					/* Copyright 2013 Google Inc. All Rights Reserved.
+function NextTableBitSize(count, len, root_bits) {
+  var left = 1 << (len - root_bits);
+  while (len < MAX_LENGTH) {
+    left -= count[len];
+    if (left <= 0) break;
+    ++len;
+    left <<= 1;
+  }
+  return len - root_bits;
+}
+
+exports.BrotliBuildHuffmanTable = function(root_table, table, root_bits, code_lengths, code_lengths_size) {
+  var start_table = table;
+  var code;            /* current table entry */
+  var len;             /* current code length */
+  var symbol;          /* symbol index in original or sorted table */
+  var key;             /* reversed prefix code */
+  var step;            /* step size to replicate values in current table */
+  var low;             /* low bits for current root entry */
+  var mask;            /* mask for low bits */
+  var table_bits;      /* key length of current table */
+  var table_size;      /* size of current table */
+  var total_size;      /* sum of root table size and 2nd level table sizes */
+  var sorted;          /* symbols sorted by code length */
+  var count = new Int32Array(MAX_LENGTH + 1);  /* number of codes of each length */
+  var offset = new Int32Array(MAX_LENGTH + 1);  /* offsets in sorted table for each length */
+
+  sorted = new Int32Array(code_lengths_size);
+
+  /* build histogram of code lengths */
+  for (symbol = 0; symbol < code_lengths_size; symbol++) {
+    count[code_lengths[symbol]]++;
+  }
+
+  /* generate offsets into sorted symbol table by code length */
+  offset[1] = 0;
+  for (len = 1; len < MAX_LENGTH; len++) {
+    offset[len + 1] = offset[len] + count[len];
+  }
+
+  /* sort symbols by length, by symbol order within each length */
+  for (symbol = 0; symbol < code_lengths_size; symbol++) {
+    if (code_lengths[symbol] !== 0) {
+      sorted[offset[code_lengths[symbol]]++] = symbol;
+    }
+  }
+
+  table_bits = root_bits;
+  table_size = 1 << table_bits;
+  total_size = table_size;
+
+  /* special case code with only one value */
+  if (offset[MAX_LENGTH] === 1) {
+    for (key = 0; key < total_size; ++key) {
+      root_table[table + key] = new HuffmanCode(0, sorted[0] & 0xffff);
+    }
+
+    return total_size;
+  }
+
+  /* fill in root table */
+  key = 0;
+  symbol = 0;
+  for (len = 1, step = 2; len <= root_bits; ++len, step <<= 1) {
+    for (; count[len] > 0; --count[len]) {
+      code = new HuffmanCode(len & 0xff, sorted[symbol++] & 0xffff);
+      ReplicateValue(root_table, table + key, step, table_size, code);
+      key = GetNextKey(key, len);
+    }
+  }
+
+  /* fill in 2nd level tables and add pointers to root table */
+  mask = total_size - 1;
+  low = -1;
+  for (len = root_bits + 1, step = 2; len <= MAX_LENGTH; ++len, step <<= 1) {
+    for (; count[len] > 0; --count[len]) {
+      if ((key & mask) !== low) {
+        table += table_size;
+        table_bits = NextTableBitSize(count, len, root_bits);
+        table_size = 1 << table_bits;
+        total_size += table_size;
+        low = key & mask;
+        root_table[start_table + low] = new HuffmanCode((table_bits + root_bits) & 0xff, ((table - start_table) - low) & 0xffff);
+      }
+      code = new HuffmanCode((len - root_bits) & 0xff, sorted[symbol++] & 0xffff);
+      ReplicateValue(root_table, table + (key >> root_bits), step, table_size, code);
+      key = GetNextKey(key, len);
+    }
+  }
+
+  return total_size;
+}
+
+},{}],8:[function(require,module,exports){
+'use strict'
+
+exports.byteLength = byteLength
+exports.toByteArray = toByteArray
+exports.fromByteArray = fromByteArray
+
+var lookup = []
+var revLookup = []
+var Arr = typeof Uint8Array !== 'undefined' ? Uint8Array : Array
+
+var code = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
+for (var i = 0, len = code.length; i < len; ++i) {
+  lookup[i] = code[i]
+  revLookup[code.charCodeAt(i)] = i
+}
+
+// Support decoding URL-safe base64 strings, as Node.js does.
+// See: https://en.wikipedia.org/wiki/Base64#URL_applications
+revLookup['-'.charCodeAt(0)] = 62
+revLookup['_'.charCodeAt(0)] = 63
+
+function getLens (b64) {
+  var len = b64.length
+
+  if (len % 4 > 0) {
+    throw new Error('Invalid string. Length must be a multiple of 4')
+  }
+
+  // Trim off extra bytes after placeholder bytes are found
+  // See: https://github.com/beatgammit/base64-js/issues/42
+  var validLen = b64.indexOf('=')
+  if (validLen === -1) validLen = len
+
+  var placeHoldersLen = validLen === len
+    ? 0
+    : 4 - (validLen % 4)
+
+  return [validLen, placeHoldersLen]
+}
+
+// base64 is 4/3 + up to two characters of the original data
+function byteLength (b64) {
+  var lens = getLens(b64)
+  var validLen = lens[0]
+  var placeHoldersLen = lens[1]
+  return ((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen
+}
+
+function _byteLength (b64, validLen, placeHoldersLen) {
+  return ((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen
+}
+
+function toByteArray (b64) {
+  var tmp
+  var lens = getLens(b64)
+  var validLen = lens[0]
+  var placeHoldersLen = lens[1]
+
+  var arr = new Arr(_byteLength(b64, validLen, placeHoldersLen))
+
+  var curByte = 0
+
+  // if there are placeholders, only get up to the last complete 4 chars
+  var len = placeHoldersLen > 0
+    ? validLen - 4
+    : validLen
+
+  for (var i = 0; i < len; i += 4) {
+    tmp =
+      (revLookup[b64.charCodeAt(i)] << 18) |
+      (revLookup[b64.charCodeAt(i + 1)] << 12) |
+      (revLookup[b64.charCodeAt(i + 2)] << 6) |
+      revLookup[b64.charCodeAt(i + 3)]
+    arr[curByte++] = (tmp >> 16) & 0xFF
+    arr[curByte++] = (tmp >> 8) & 0xFF
+    arr[curByte++] = tmp & 0xFF
+  }
+
+  if (placeHoldersLen === 2) {
+    tmp =
+      (revLookup[b64.charCodeAt(i)] << 2) |
+      (revLookup[b64.charCodeAt(i + 1)] >> 4)
+    arr[curByte++] = tmp & 0xFF
+  }
+
+  if (placeHoldersLen === 1) {
+    tmp =
+      (revLookup[b64.charCodeAt(i)] << 10) |
+      (revLookup[b64.charCodeAt(i + 1)] << 4) |
+      (revLookup[b64.charCodeAt(i + 2)] >> 2)
+    arr[curByte++] = (tmp >> 8) & 0xFF
+    arr[curByte++] = tmp & 0xFF
+  }
+
+  return arr
+}
+
+function tripletToBase64 (num) {
+  return lookup[num >> 18 & 0x3F] +
+    lookup[num >> 12 & 0x3F] +
+    lookup[num >> 6 & 0x3F] +
+    lookup[num & 0x3F]
+}
+
+function encodeChunk (uint8, start, end) {
+  var tmp
+  var output = []
+  for (var i = start; i < end; i += 3) {
+    tmp =
+      ((uint8[i] << 16) & 0xFF0000) +
+      ((uint8[i + 1] << 8) & 0xFF00) +
+      (uint8[i + 2] & 0xFF)
+    output.push(tripletToBase64(tmp))
+  }
+  return output.join('')
+}
+
+function fromByteArray (uint8) {
+  var tmp
+  var len = uint8.length
+  var extraBytes = len % 3 // if we have 1 byte left, pad 2 bytes
+  var parts = []
+  var maxChunkLength = 16383 // must be multiple of 3
+
+  // go through the array every three bytes, we'll deal with trailing stuff later
+  for (var i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
+    parts.push(encodeChunk(
+      uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength)
+    ))
+  }
+
+  // pad the end with zeros, but make sure to not forget the extra bytes
+  if (extraBytes === 1) {
+    tmp = uint8[len - 1]
+    parts.push(
+      lookup[tmp >> 2] +
+      lookup[(tmp << 4) & 0x3F] +
+      '=='
+    )
+  } else if (extraBytes === 2) {
+    tmp = (uint8[len - 2] << 8) + uint8[len - 1]
+    parts.push(
+      lookup[tmp >> 10] +
+      lookup[(tmp >> 4) & 0x3F] +
+      lookup[(tmp << 2) & 0x3F] +
+      '='
+    )
+  }
+
+  return parts.join('')
+}
+
+},{}],9:[function(require,module,exports){
+/* Copyright 2013 Google Inc. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -2267,146 +1703,87 @@
    decoding of the block lengths, literal insertion lengths and copy lengths.
 */
 
-					/* Represents the range of values belonging to a prefix code: */
-					/* [offset, offset + 2^nbits) */
-					function PrefixCodeRange( offset, nbits ) {
-						this.offset = offset;
-						this.nbits = nbits;
-					}
-
-					exports.kBlockLengthPrefixCode = [
-						new PrefixCodeRange( 1, 2 ),
-						new PrefixCodeRange( 5, 2 ),
-						new PrefixCodeRange( 9, 2 ),
-						new PrefixCodeRange( 13, 2 ),
-						new PrefixCodeRange( 17, 3 ),
-						new PrefixCodeRange( 25, 3 ),
-						new PrefixCodeRange( 33, 3 ),
-						new PrefixCodeRange( 41, 3 ),
-						new PrefixCodeRange( 49, 4 ),
-						new PrefixCodeRange( 65, 4 ),
-						new PrefixCodeRange( 81, 4 ),
-						new PrefixCodeRange( 97, 4 ),
-						new PrefixCodeRange( 113, 5 ),
-						new PrefixCodeRange( 145, 5 ),
-						new PrefixCodeRange( 177, 5 ),
-						new PrefixCodeRange( 209, 5 ),
-						new PrefixCodeRange( 241, 6 ),
-						new PrefixCodeRange( 305, 6 ),
-						new PrefixCodeRange( 369, 7 ),
-						new PrefixCodeRange( 497, 8 ),
-						new PrefixCodeRange( 753, 9 ),
-						new PrefixCodeRange( 1265, 10 ),
-						new PrefixCodeRange( 2289, 11 ),
-						new PrefixCodeRange( 4337, 12 ),
-						new PrefixCodeRange( 8433, 13 ),
-						new PrefixCodeRange( 16625, 24 ),
-					];
-
-					exports.kInsertLengthPrefixCode = [
-						new PrefixCodeRange( 0, 0 ),
-						new PrefixCodeRange( 1, 0 ),
-						new PrefixCodeRange( 2, 0 ),
-						new PrefixCodeRange( 3, 0 ),
-						new PrefixCodeRange( 4, 0 ),
-						new PrefixCodeRange( 5, 0 ),
-						new PrefixCodeRange( 6, 1 ),
-						new PrefixCodeRange( 8, 1 ),
-						new PrefixCodeRange( 10, 2 ),
-						new PrefixCodeRange( 14, 2 ),
-						new PrefixCodeRange( 18, 3 ),
-						new PrefixCodeRange( 26, 3 ),
-						new PrefixCodeRange( 34, 4 ),
-						new PrefixCodeRange( 50, 4 ),
-						new PrefixCodeRange( 66, 5 ),
-						new PrefixCodeRange( 98, 5 ),
-						new PrefixCodeRange( 130, 6 ),
-						new PrefixCodeRange( 194, 7 ),
-						new PrefixCodeRange( 322, 8 ),
-						new PrefixCodeRange( 578, 9 ),
-						new PrefixCodeRange( 1090, 10 ),
-						new PrefixCodeRange( 2114, 12 ),
-						new PrefixCodeRange( 6210, 14 ),
-						new PrefixCodeRange( 22594, 24 ),
-					];
-
-					exports.kCopyLengthPrefixCode = [
-						new PrefixCodeRange( 2, 0 ),
-						new PrefixCodeRange( 3, 0 ),
-						new PrefixCodeRange( 4, 0 ),
-						new PrefixCodeRange( 5, 0 ),
-						new PrefixCodeRange( 6, 0 ),
-						new PrefixCodeRange( 7, 0 ),
-						new PrefixCodeRange( 8, 0 ),
-						new PrefixCodeRange( 9, 0 ),
-						new PrefixCodeRange( 10, 1 ),
-						new PrefixCodeRange( 12, 1 ),
-						new PrefixCodeRange( 14, 2 ),
-						new PrefixCodeRange( 18, 2 ),
-						new PrefixCodeRange( 22, 3 ),
-						new PrefixCodeRange( 30, 3 ),
-						new PrefixCodeRange( 38, 4 ),
-						new PrefixCodeRange( 54, 4 ),
-						new PrefixCodeRange( 70, 5 ),
-						new PrefixCodeRange( 102, 5 ),
-						new PrefixCodeRange( 134, 6 ),
-						new PrefixCodeRange( 198, 7 ),
-						new PrefixCodeRange( 326, 8 ),
-						new PrefixCodeRange( 582, 9 ),
-						new PrefixCodeRange( 1094, 10 ),
-						new PrefixCodeRange( 2118, 24 ),
-					];
-
-					exports.kInsertRangeLut = [ 0, 0, 8, 8, 0, 16, 8, 16, 16 ];
-
-					exports.kCopyRangeLut = [ 0, 8, 0, 8, 16, 0, 16, 8, 16 ];
-				},
-				{},
-			],
-			10: [
-				function ( require, module, exports ) {
-					function BrotliInput( buffer ) {
-						this.buffer = buffer;
-						this.pos = 0;
-					}
-
-					BrotliInput.prototype.read = function ( buf, i, count ) {
-						if ( this.pos + count > this.buffer.length ) {
-							count = this.buffer.length - this.pos;
-						}
-
-						for ( var p = 0; p < count; p++ )
-							buf[ i + p ] = this.buffer[ this.pos + p ];
-
-						this.pos += count;
-						return count;
-					};
-
-					exports.BrotliInput = BrotliInput;
-
-					function BrotliOutput( buf ) {
-						this.buffer = buf;
-						this.pos = 0;
-					}
-
-					BrotliOutput.prototype.write = function ( buf, count ) {
-						if ( this.pos + count > this.buffer.length )
-							throw new Error(
-								'Output buffer is not large enough'
-							);
-
-						this.buffer.set( buf.subarray( 0, count ), this.pos );
-						this.pos += count;
-						return count;
-					};
-
-					exports.BrotliOutput = BrotliOutput;
-				},
-				{},
-			],
-			11: [
-				function ( require, module, exports ) {
-					/* Copyright 2013 Google Inc. All Rights Reserved.
+/* Represents the range of values belonging to a prefix code: */
+/* [offset, offset + 2^nbits) */
+function PrefixCodeRange(offset, nbits) {
+  this.offset = offset;
+  this.nbits = nbits;
+}
+
+exports.kBlockLengthPrefixCode = [
+  new PrefixCodeRange(1, 2), new PrefixCodeRange(5, 2), new PrefixCodeRange(9, 2), new PrefixCodeRange(13, 2),
+  new PrefixCodeRange(17, 3), new PrefixCodeRange(25, 3), new PrefixCodeRange(33, 3), new PrefixCodeRange(41, 3),
+  new PrefixCodeRange(49, 4), new PrefixCodeRange(65, 4), new PrefixCodeRange(81, 4), new PrefixCodeRange(97, 4),
+  new PrefixCodeRange(113, 5), new PrefixCodeRange(145, 5), new PrefixCodeRange(177, 5), new PrefixCodeRange(209, 5),
+  new PrefixCodeRange(241, 6), new PrefixCodeRange(305, 6), new PrefixCodeRange(369, 7), new PrefixCodeRange(497, 8),
+  new PrefixCodeRange(753, 9), new PrefixCodeRange(1265, 10), new PrefixCodeRange(2289, 11), new PrefixCodeRange(4337, 12),
+  new PrefixCodeRange(8433, 13), new PrefixCodeRange(16625, 24)
+];
+
+exports.kInsertLengthPrefixCode = [
+  new PrefixCodeRange(0, 0), new PrefixCodeRange(1, 0), new PrefixCodeRange(2, 0), new PrefixCodeRange(3, 0),
+  new PrefixCodeRange(4, 0), new PrefixCodeRange(5, 0), new PrefixCodeRange(6, 1), new PrefixCodeRange(8, 1),
+  new PrefixCodeRange(10, 2), new PrefixCodeRange(14, 2), new PrefixCodeRange(18, 3), new PrefixCodeRange(26, 3),
+  new PrefixCodeRange(34, 4), new PrefixCodeRange(50, 4), new PrefixCodeRange(66, 5), new PrefixCodeRange(98, 5),
+  new PrefixCodeRange(130, 6), new PrefixCodeRange(194, 7), new PrefixCodeRange(322, 8), new PrefixCodeRange(578, 9),
+  new PrefixCodeRange(1090, 10), new PrefixCodeRange(2114, 12), new PrefixCodeRange(6210, 14), new PrefixCodeRange(22594, 24),
+];
+
+exports.kCopyLengthPrefixCode = [
+  new PrefixCodeRange(2, 0), new PrefixCodeRange(3, 0), new PrefixCodeRange(4, 0), new PrefixCodeRange(5, 0),
+  new PrefixCodeRange(6, 0), new PrefixCodeRange(7, 0), new PrefixCodeRange(8, 0), new PrefixCodeRange(9, 0),
+  new PrefixCodeRange(10, 1), new PrefixCodeRange(12, 1), new PrefixCodeRange(14, 2), new PrefixCodeRange(18, 2),
+  new PrefixCodeRange(22, 3), new PrefixCodeRange(30, 3), new PrefixCodeRange(38, 4), new PrefixCodeRange(54, 4),
+  new PrefixCodeRange(70, 5), new PrefixCodeRange(102, 5), new PrefixCodeRange(134, 6), new PrefixCodeRange(198, 7),
+  new PrefixCodeRange(326, 8), new PrefixCodeRange(582, 9), new PrefixCodeRange(1094, 10), new PrefixCodeRange(2118, 24),
+];
+
+exports.kInsertRangeLut = [
+  0, 0, 8, 8, 0, 16, 8, 16, 16,
+];
+
+exports.kCopyRangeLut = [
+  0, 8, 0, 8, 16, 0, 16, 8, 16,
+];
+
+},{}],10:[function(require,module,exports){
+function BrotliInput(buffer) {
+  this.buffer = buffer;
+  this.pos = 0;
+}
+
+BrotliInput.prototype.read = function(buf, i, count) {
+  if (this.pos + count > this.buffer.length) {
+    count = this.buffer.length - this.pos;
+  }
+
+  for (var p = 0; p < count; p++)
+    buf[i + p] = this.buffer[this.pos + p];
+
+  this.pos += count;
+  return count;
+}
+
+exports.BrotliInput = BrotliInput;
+
+function BrotliOutput(buf) {
+  this.buffer = buf;
+  this.pos = 0;
+}
+
+BrotliOutput.prototype.write = function(buf, count) {
+  if (this.pos + count > this.buffer.length)
+    throw new Error('Output buffer is not large enough');
+
+  this.buffer.set(buf.subarray(0, count), this.pos);
+  this.pos += count;
+  return count;
+};
+
+exports.BrotliOutput = BrotliOutput;
+
+},{}],11:[function(require,module,exports){
+/* Copyright 2013 Google Inc. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -2423,257 +1800,240 @@
    Transformations on dictionary words.
 */
 
-					var BrotliDictionary = require( './dictionary' );
-
-					var kIdentity = 0;
-					var kOmitLast1 = 1;
-					var kOmitLast2 = 2;
-					var kOmitLast3 = 3;
-					var kOmitLast4 = 4;
-					var kOmitLast5 = 5;
-					var kOmitLast6 = 6;
-					var kOmitLast7 = 7;
-					var kOmitLast8 = 8;
-					var kOmitLast9 = 9;
-					var kUppercaseFirst = 10;
-					var kUppercaseAll = 11;
-					var kOmitFirst1 = 12;
-					var kOmitFirst2 = 13;
-					var kOmitFirst3 = 14;
-					var kOmitFirst4 = 15;
-					var kOmitFirst5 = 16;
-					var kOmitFirst6 = 17;
-					var kOmitFirst7 = 18;
-					var kOmitFirst8 = 19;
-					var kOmitFirst9 = 20;
-
-					function Transform( prefix, transform, suffix ) {
-						this.prefix = new Uint8Array( prefix.length );
-						this.transform = transform;
-						this.suffix = new Uint8Array( suffix.length );
-
-						for ( var i = 0; i < prefix.length; i++ )
-							this.prefix[ i ] = prefix.charCodeAt( i );
-
-						for ( var i = 0; i < suffix.length; i++ )
-							this.suffix[ i ] = suffix.charCodeAt( i );
-					}
-
-					var kTransforms = [
-						new Transform( '', kIdentity, '' ),
-						new Transform( '', kIdentity, ' ' ),
-						new Transform( ' ', kIdentity, ' ' ),
-						new Transform( '', kOmitFirst1, '' ),
-						new Transform( '', kUppercaseFirst, ' ' ),
-						new Transform( '', kIdentity, ' the ' ),
-						new Transform( ' ', kIdentity, '' ),
-						new Transform( 's ', kIdentity, ' ' ),
-						new Transform( '', kIdentity, ' of ' ),
-						new Transform( '', kUppercaseFirst, '' ),
-						new Transform( '', kIdentity, ' and ' ),
-						new Transform( '', kOmitFirst2, '' ),
-						new Transform( '', kOmitLast1, '' ),
-						new Transform( ', ', kIdentity, ' ' ),
-						new Transform( '', kIdentity, ', ' ),
-						new Transform( ' ', kUppercaseFirst, ' ' ),
-						new Transform( '', kIdentity, ' in ' ),
-						new Transform( '', kIdentity, ' to ' ),
-						new Transform( 'e ', kIdentity, ' ' ),
-						new Transform( '', kIdentity, '"' ),
-						new Transform( '', kIdentity, '.' ),
-						new Transform( '', kIdentity, '">' ),
-						new Transform( '', kIdentity, '\n' ),
-						new Transform( '', kOmitLast3, '' ),
-						new Transform( '', kIdentity, ']' ),
-						new Transform( '', kIdentity, ' for ' ),
-						new Transform( '', kOmitFirst3, '' ),
-						new Transform( '', kOmitLast2, '' ),
-						new Transform( '', kIdentity, ' a ' ),
-						new Transform( '', kIdentity, ' that ' ),
-						new Transform( ' ', kUppercaseFirst, '' ),
-						new Transform( '', kIdentity, '. ' ),
-						new Transform( '.', kIdentity, '' ),
-						new Transform( ' ', kIdentity, ', ' ),
-						new Transform( '', kOmitFirst4, '' ),
-						new Transform( '', kIdentity, ' with ' ),
-						new Transform( '', kIdentity, "'" ),
-						new Transform( '', kIdentity, ' from ' ),
-						new Transform( '', kIdentity, ' by ' ),
-						new Transform( '', kOmitFirst5, '' ),
-						new Transform( '', kOmitFirst6, '' ),
-						new Transform( ' the ', kIdentity, '' ),
-						new Transform( '', kOmitLast4, '' ),
-						new Transform( '', kIdentity, '. The ' ),
-						new Transform( '', kUppercaseAll, '' ),
-						new Transform( '', kIdentity, ' on ' ),
-						new Transform( '', kIdentity, ' as ' ),
-						new Transform( '', kIdentity, ' is ' ),
-						new Transform( '', kOmitLast7, '' ),
-						new Transform( '', kOmitLast1, 'ing ' ),
-						new Transform( '', kIdentity, '\n\t' ),
-						new Transform( '', kIdentity, ':' ),
-						new Transform( ' ', kIdentity, '. ' ),
-						new Transform( '', kIdentity, 'ed ' ),
-						new Transform( '', kOmitFirst9, '' ),
-						new Transform( '', kOmitFirst7, '' ),
-						new Transform( '', kOmitLast6, '' ),
-						new Transform( '', kIdentity, '(' ),
-						new Transform( '', kUppercaseFirst, ', ' ),
-						new Transform( '', kOmitLast8, '' ),
-						new Transform( '', kIdentity, ' at ' ),
-						new Transform( '', kIdentity, 'ly ' ),
-						new Transform( ' the ', kIdentity, ' of ' ),
-						new Transform( '', kOmitLast5, '' ),
-						new Transform( '', kOmitLast9, '' ),
-						new Transform( ' ', kUppercaseFirst, ', ' ),
-						new Transform( '', kUppercaseFirst, '"' ),
-						new Transform( '.', kIdentity, '(' ),
-						new Transform( '', kUppercaseAll, ' ' ),
-						new Transform( '', kUppercaseFirst, '">' ),
-						new Transform( '', kIdentity, '="' ),
-						new Transform( ' ', kIdentity, '.' ),
-						new Transform( '.com/', kIdentity, '' ),
-						new Transform( ' the ', kIdentity, ' of the ' ),
-						new Transform( '', kUppercaseFirst, "'" ),
-						new Transform( '', kIdentity, '. This ' ),
-						new Transform( '', kIdentity, ',' ),
-						new Transform( '.', kIdentity, ' ' ),
-						new Transform( '', kUppercaseFirst, '(' ),
-						new Transform( '', kUppercaseFirst, '.' ),
-						new Transform( '', kIdentity, ' not ' ),
-						new Transform( ' ', kIdentity, '="' ),
-						new Transform( '', kIdentity, 'er ' ),
-						new Transform( ' ', kUppercaseAll, ' ' ),
-						new Transform( '', kIdentity, 'al ' ),
-						new Transform( ' ', kUppercaseAll, '' ),
-						new Transform( '', kIdentity, "='" ),
-						new Transform( '', kUppercaseAll, '"' ),
-						new Transform( '', kUppercaseFirst, '. ' ),
-						new Transform( ' ', kIdentity, '(' ),
-						new Transform( '', kIdentity, 'ful ' ),
-						new Transform( ' ', kUppercaseFirst, '. ' ),
-						new Transform( '', kIdentity, 'ive ' ),
-						new Transform( '', kIdentity, 'less ' ),
-						new Transform( '', kUppercaseAll, "'" ),
-						new Transform( '', kIdentity, 'est ' ),
-						new Transform( ' ', kUppercaseFirst, '.' ),
-						new Transform( '', kUppercaseAll, '">' ),
-						new Transform( ' ', kIdentity, "='" ),
-						new Transform( '', kUppercaseFirst, ',' ),
-						new Transform( '', kIdentity, 'ize ' ),
-						new Transform( '', kUppercaseAll, '.' ),
-						new Transform( '\xc2\xa0', kIdentity, '' ),
-						new Transform( ' ', kIdentity, ',' ),
-						new Transform( '', kUppercaseFirst, '="' ),
-						new Transform( '', kUppercaseAll, '="' ),
-						new Transform( '', kIdentity, 'ous ' ),
-						new Transform( '', kUppercaseAll, ', ' ),
-						new Transform( '', kUppercaseFirst, "='" ),
-						new Transform( ' ', kUppercaseFirst, ',' ),
-						new Transform( ' ', kUppercaseAll, '="' ),
-						new Transform( ' ', kUppercaseAll, ', ' ),
-						new Transform( '', kUppercaseAll, ',' ),
-						new Transform( '', kUppercaseAll, '(' ),
-						new Transform( '', kUppercaseAll, '. ' ),
-						new Transform( ' ', kUppercaseAll, '.' ),
-						new Transform( '', kUppercaseAll, "='" ),
-						new Transform( ' ', kUppercaseAll, '. ' ),
-						new Transform( ' ', kUppercaseFirst, '="' ),
-						new Transform( ' ', kUppercaseAll, "='" ),
-						new Transform( ' ', kUppercaseFirst, "='" ),
-					];
-
-					exports.kTransforms = kTransforms;
-					exports.kNumTransforms = kTransforms.length;
-
-					function ToUpperCase( p, i ) {
-						if ( p[ i ] < 0xc0 ) {
-							if ( p[ i ] >= 97 && p[ i ] <= 122 ) {
-								p[ i ] ^= 32;
-							}
-							return 1;
-						}
-
-						/* An overly simplified uppercasing model for utf-8. */
-						if ( p[ i ] < 0xe0 ) {
-							p[ i + 1 ] ^= 32;
-							return 2;
-						}
-
-						/* An arbitrary transform for three byte characters. */
-						p[ i + 2 ] ^= 5;
-						return 3;
-					}
-
-					exports.transformDictionaryWord = function (
-						dst,
-						idx,
-						word,
-						len,
-						transform
-					) {
-						var prefix = kTransforms[ transform ].prefix;
-						var suffix = kTransforms[ transform ].suffix;
-						var t = kTransforms[ transform ].transform;
-						var skip =
-							t < kOmitFirst1 ? 0 : t - ( kOmitFirst1 - 1 );
-						var i = 0;
-						var start_idx = idx;
-						var uppercase;
-
-						if ( skip > len ) {
-							skip = len;
-						}
-
-						var prefix_pos = 0;
-						while ( prefix_pos < prefix.length ) {
-							dst[ idx++ ] = prefix[ prefix_pos++ ];
-						}
-
-						word += skip;
-						len -= skip;
-
-						if ( t <= kOmitLast9 ) {
-							len -= t;
-						}
-
-						for ( i = 0; i < len; i++ ) {
-							dst[ idx++ ] =
-								BrotliDictionary.dictionary[ word + i ];
-						}
-
-						uppercase = idx - len;
-
-						if ( t === kUppercaseFirst ) {
-							ToUpperCase( dst, uppercase );
-						} else if ( t === kUppercaseAll ) {
-							while ( len > 0 ) {
-								var step = ToUpperCase( dst, uppercase );
-								uppercase += step;
-								len -= step;
-							}
-						}
-
-						var suffix_pos = 0;
-						while ( suffix_pos < suffix.length ) {
-							dst[ idx++ ] = suffix[ suffix_pos++ ];
-						}
-
-						return idx - start_idx;
-					};
-				},
-				{ './dictionary': 6 },
-			],
-			12: [
-				function ( require, module, exports ) {
-					module.exports =
-						require( './dec/decode' ).BrotliDecompressBuffer;
-				},
-				{ './dec/decode': 3 },
-			],
-		},
-		{},
-		[ 12 ]
-	)( 12 );
-} );
+var BrotliDictionary = require('./dictionary');
+
+var kIdentity       = 0;
+var kOmitLast1      = 1;
+var kOmitLast2      = 2;
+var kOmitLast3      = 3;
+var kOmitLast4      = 4;
+var kOmitLast5      = 5;
+var kOmitLast6      = 6;
+var kOmitLast7      = 7;
+var kOmitLast8      = 8;
+var kOmitLast9      = 9;
+var kUppercaseFirst = 10;
+var kUppercaseAll   = 11;
+var kOmitFirst1     = 12;
+var kOmitFirst2     = 13;
+var kOmitFirst3     = 14;
+var kOmitFirst4     = 15;
+var kOmitFirst5     = 16;
+var kOmitFirst6     = 17;
+var kOmitFirst7     = 18;
+var kOmitFirst8     = 19;
+var kOmitFirst9     = 20;
+
+function Transform(prefix, transform, suffix) {
+  this.prefix = new Uint8Array(prefix.length);
+  this.transform = transform;
+  this.suffix = new Uint8Array(suffix.length);
+
+  for (var i = 0; i < prefix.length; i++)
+    this.prefix[i] = prefix.charCodeAt(i);
+
+  for (var i = 0; i < suffix.length; i++)
+    this.suffix[i] = suffix.charCodeAt(i);
+}
+
+var kTransforms = [
+     new Transform(         "", kIdentity,       ""           ),
+     new Transform(         "", kIdentity,       " "          ),
+     new Transform(        " ", kIdentity,       " "          ),
+     new Transform(         "", kOmitFirst1,     ""           ),
+     new Transform(         "", kUppercaseFirst, " "          ),
+     new Transform(         "", kIdentity,       " the "      ),
+     new Transform(        " ", kIdentity,       ""           ),
+     new Transform(       "s ", kIdentity,       " "          ),
+     new Transform(         "", kIdentity,       " of "       ),
+     new Transform(         "", kUppercaseFirst, ""           ),
+     new Transform(         "", kIdentity,       " and "      ),
+     new Transform(         "", kOmitFirst2,     ""           ),
+     new Transform(         "", kOmitLast1,      ""           ),
+     new Transform(       ", ", kIdentity,       " "          ),
+     new Transform(         "", kIdentity,       ", "         ),
+     new Transform(        " ", kUppercaseFirst, " "          ),
+     new Transform(         "", kIdentity,       " in "       ),
+     new Transform(         "", kIdentity,       " to "       ),
+     new Transform(       "e ", kIdentity,       " "          ),
+     new Transform(         "", kIdentity,       "\""         ),
+     new Transform(         "", kIdentity,       "."          ),
+     new Transform(         "", kIdentity,       "\">"        ),
+     new Transform(         "", kIdentity,       "\n"         ),
+     new Transform(         "", kOmitLast3,      ""           ),
+     new Transform(         "", kIdentity,       "]"          ),
+     new Transform(         "", kIdentity,       " for "      ),
+     new Transform(         "", kOmitFirst3,     ""           ),
+     new Transform(         "", kOmitLast2,      ""           ),
+     new Transform(         "", kIdentity,       " a "        ),
+     new Transform(         "", kIdentity,       " that "     ),
+     new Transform(        " ", kUppercaseFirst, ""           ),
+     new Transform(         "", kIdentity,       ". "         ),
+     new Transform(        ".", kIdentity,       ""           ),
+     new Transform(        " ", kIdentity,       ", "         ),
+     new Transform(         "", kOmitFirst4,     ""           ),
+     new Transform(         "", kIdentity,       " with "     ),
+     new Transform(         "", kIdentity,       "'"          ),
+     new Transform(         "", kIdentity,       " from "     ),
+     new Transform(         "", kIdentity,       " by "       ),
+     new Transform(         "", kOmitFirst5,     ""           ),
+     new Transform(         "", kOmitFirst6,     ""           ),
+     new Transform(    " the ", kIdentity,       ""           ),
+     new Transform(         "", kOmitLast4,      ""           ),
+     new Transform(         "", kIdentity,       ". The "     ),
+     new Transform(         "", kUppercaseAll,   ""           ),
+     new Transform(         "", kIdentity,       " on "       ),
+     new Transform(         "", kIdentity,       " as "       ),
+     new Transform(         "", kIdentity,       " is "       ),
+     new Transform(         "", kOmitLast7,      ""           ),
+     new Transform(         "", kOmitLast1,      "ing "       ),
+     new Transform(         "", kIdentity,       "\n\t"       ),
+     new Transform(         "", kIdentity,       ":"          ),
+     new Transform(        " ", kIdentity,       ". "         ),
+     new Transform(         "", kIdentity,       "ed "        ),
+     new Transform(         "", kOmitFirst9,     ""           ),
+     new Transform(         "", kOmitFirst7,     ""           ),
+     new Transform(         "", kOmitLast6,      ""           ),
+     new Transform(         "", kIdentity,       "("          ),
+     new Transform(         "", kUppercaseFirst, ", "         ),
+     new Transform(         "", kOmitLast8,      ""           ),
+     new Transform(         "", kIdentity,       " at "       ),
+     new Transform(         "", kIdentity,       "ly "        ),
+     new Transform(    " the ", kIdentity,       " of "       ),
+     new Transform(         "", kOmitLast5,      ""           ),
+     new Transform(         "", kOmitLast9,      ""           ),
+     new Transform(        " ", kUppercaseFirst, ", "         ),
+     new Transform(         "", kUppercaseFirst, "\""         ),
+     new Transform(        ".", kIdentity,       "("          ),
+     new Transform(         "", kUppercaseAll,   " "          ),
+     new Transform(         "", kUppercaseFirst, "\">"        ),
+     new Transform(         "", kIdentity,       "=\""        ),
+     new Transform(        " ", kIdentity,       "."          ),
+     new Transform(    ".com/", kIdentity,       ""           ),
+     new Transform(    " the ", kIdentity,       " of the "   ),
+     new Transform(         "", kUppercaseFirst, "'"          ),
+     new Transform(         "", kIdentity,       ". This "    ),
+     new Transform(         "", kIdentity,       ","          ),
+     new Transform(        ".", kIdentity,       " "          ),
+     new Transform(         "", kUppercaseFirst, "("          ),
+     new Transform(         "", kUppercaseFirst, "."          ),
+     new Transform(         "", kIdentity,       " not "      ),
+     new Transform(        " ", kIdentity,       "=\""        ),
+     new Transform(         "", kIdentity,       "er "        ),
+     new Transform(        " ", kUppercaseAll,   " "          ),
+     new Transform(         "", kIdentity,       "al "        ),
+     new Transform(        " ", kUppercaseAll,   ""           ),
+     new Transform(         "", kIdentity,       "='"         ),
+     new Transform(         "", kUppercaseAll,   "\""         ),
+     new Transform(         "", kUppercaseFirst, ". "         ),
+     new Transform(        " ", kIdentity,       "("          ),
+     new Transform(         "", kIdentity,       "ful "       ),
+     new Transform(        " ", kUppercaseFirst, ". "         ),
+     new Transform(         "", kIdentity,       "ive "       ),
+     new Transform(         "", kIdentity,       "less "      ),
+     new Transform(         "", kUppercaseAll,   "'"          ),
+     new Transform(         "", kIdentity,       "est "       ),
+     new Transform(        " ", kUppercaseFirst, "."          ),
+     new Transform(         "", kUppercaseAll,   "\">"        ),
+     new Transform(        " ", kIdentity,       "='"         ),
+     new Transform(         "", kUppercaseFirst, ","          ),
+     new Transform(         "", kIdentity,       "ize "       ),
+     new Transform(         "", kUppercaseAll,   "."          ),
+     new Transform( "\xc2\xa0", kIdentity,       ""           ),
+     new Transform(        " ", kIdentity,       ","          ),
+     new Transform(         "", kUppercaseFirst, "=\""        ),
+     new Transform(         "", kUppercaseAll,   "=\""        ),
+     new Transform(         "", kIdentity,       "ous "       ),
+     new Transform(         "", kUppercaseAll,   ", "         ),
+     new Transform(         "", kUppercaseFirst, "='"         ),
+     new Transform(        " ", kUppercaseFirst, ","          ),
+     new Transform(        " ", kUppercaseAll,   "=\""        ),
+     new Transform(        " ", kUppercaseAll,   ", "         ),
+     new Transform(         "", kUppercaseAll,   ","          ),
+     new Transform(         "", kUppercaseAll,   "("          ),
+     new Transform(         "", kUppercaseAll,   ". "         ),
+     new Transform(        " ", kUppercaseAll,   "."          ),
+     new Transform(         "", kUppercaseAll,   "='"         ),
+     new Transform(        " ", kUppercaseAll,   ". "         ),
+     new Transform(        " ", kUppercaseFirst, "=\""        ),
+     new Transform(        " ", kUppercaseAll,   "='"         ),
+     new Transform(        " ", kUppercaseFirst, "='"         )
+];
+
+exports.kTransforms = kTransforms;
+exports.kNumTransforms = kTransforms.length;
+
+function ToUpperCase(p, i) {
+  if (p[i] < 0xc0) {
+    if (p[i] >= 97 && p[i] <= 122) {
+      p[i] ^= 32;
+    }
+    return 1;
+  }
+
+  /* An overly simplified uppercasing model for utf-8. */
+  if (p[i] < 0xe0) {
+    p[i + 1] ^= 32;
+    return 2;
+  }
+
+  /* An arbitrary transform for three byte characters. */
+  p[i + 2] ^= 5;
+  return 3;
+}
+
+exports.transformDictionaryWord = function(dst, idx, word, len, transform) {
+  var prefix = kTransforms[transform].prefix;
+  var suffix = kTransforms[transform].suffix;
+  var t = kTransforms[transform].transform;
+  var skip = t < kOmitFirst1 ? 0 : t - (kOmitFirst1 - 1);
+  var i = 0;
+  var start_idx = idx;
+  var uppercase;
+
+  if (skip > len) {
+    skip = len;
+  }
+
+  var prefix_pos = 0;
+  while (prefix_pos < prefix.length) {
+    dst[idx++] = prefix[prefix_pos++];
+  }
+
+  word += skip;
+  len -= skip;
+
+  if (t <= kOmitLast9) {
+    len -= t;
+  }
+
+  for (i = 0; i < len; i++) {
+    dst[idx++] = BrotliDictionary.dictionary[word + i];
+  }
+
+  uppercase = idx - len;
+
+  if (t === kUppercaseFirst) {
+    ToUpperCase(dst, uppercase);
+  } else if (t === kUppercaseAll) {
+    while (len > 0) {
+      var step = ToUpperCase(dst, uppercase);
+      uppercase += step;
+      len -= step;
+    }
+  }
+
+  var suffix_pos = 0;
+  while (suffix_pos < suffix.length) {
+    dst[idx++] = suffix[suffix_pos++];
+  }
+
+  return idx - start_idx;
+}
+
+},{"./dictionary":6}],12:[function(require,module,exports){
+module.exports = require('./dec/decode').BrotliDecompressBuffer;
+
+},{"./dec/decode":3}]},{},[12])(12)
+});
 /* eslint-enable */
diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
index 92e9fd8bebe59a..f85a9e26a9d689 100644
--- a/packages/edit-site/package.json
+++ b/packages/edit-site/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.24.0",
+	"version": "6.10.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,63 +20,61 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/blob": "file:../blob",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/block-library": "file:../block-library",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/commands": "file:../commands",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-commands": "file:../core-commands",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/dataviews": "file:../dataviews",
-		"@wordpress/date": "file:../date",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/editor": "file:../editor",
-		"@wordpress/element": "file:../element",
-		"@wordpress/escape-html": "file:../escape-html",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/interface": "file:../interface",
-		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/media-utils": "file:../media-utils",
-		"@wordpress/notices": "file:../notices",
-		"@wordpress/patterns": "file:../patterns",
-		"@wordpress/plugins": "file:../plugins",
-		"@wordpress/preferences": "file:../preferences",
-		"@wordpress/primitives": "file:../primitives",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/reusable-blocks": "file:../reusable-blocks",
-		"@wordpress/router": "file:../router",
-		"@wordpress/style-engine": "file:../style-engine",
-		"@wordpress/url": "file:../url",
-		"@wordpress/viewport": "file:../viewport",
-		"@wordpress/widgets": "file:../widgets",
-		"@wordpress/wordcount": "file:../wordcount",
+		"@babel/runtime": "7.25.7",
+		"@react-spring/web": "^9.4.5",
+		"@wordpress/a11y": "*",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/blob": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/block-library": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/commands": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-commands": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/dataviews": "*",
+		"@wordpress/date": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/editor": "*",
+		"@wordpress/element": "*",
+		"@wordpress/escape-html": "*",
+		"@wordpress/fields": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/keyboard-shortcuts": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/patterns": "*",
+		"@wordpress/plugins": "*",
+		"@wordpress/preferences": "*",
+		"@wordpress/primitives": "*",
+		"@wordpress/priority-queue": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/reusable-blocks": "*",
+		"@wordpress/router": "*",
+		"@wordpress/style-engine": "*",
+		"@wordpress/url": "*",
+		"@wordpress/viewport": "*",
+		"@wordpress/widgets": "*",
+		"@wordpress/wordcount": "*",
 		"change-case": "^4.1.2",
-		"classnames": "^2.3.1",
+		"clsx": "^2.1.1",
 		"colord": "^2.9.2",
-		"deepmerge": "^4.3.0",
 		"fast-deep-equal": "^3.1.3",
-		"is-plain-object": "^5.0.0",
 		"memize": "^2.1.0",
-		"react-autosize-textarea": "^7.1.0",
-		"rememo": "^4.0.2",
-		"remove-accents": "^0.5.0"
+		"react-autosize-textarea": "^7.1.0"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -84,5 +82,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/edit-site/src/components/actions/index.js b/packages/edit-site/src/components/actions/index.js
deleted file mode 100644
index ca673e3867bdaf..00000000000000
--- a/packages/edit-site/src/components/actions/index.js
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { external, trash, backup } from '@wordpress/icons';
-import { addQueryArgs } from '@wordpress/url';
-import { useDispatch } from '@wordpress/data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { store as coreStore } from '@wordpress/core-data';
-import { __, sprintf } from '@wordpress/i18n';
-import { store as noticesStore } from '@wordpress/notices';
-import { useMemo } from '@wordpress/element';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-import {
-	Button,
-	__experimentalText as Text,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-
-const { useHistory } = unlock( routerPrivateApis );
-
-export const trashPostAction = {
-	id: 'move-to-trash',
-	label: __( 'Move to Trash' ),
-	isPrimary: true,
-	icon: trash,
-	isEligible( { status } ) {
-		return status !== 'trash';
-	},
-	hideModalHeader: true,
-	RenderModal: ( { item: post, closeModal } ) => {
-		const { createSuccessNotice, createErrorNotice } =
-			useDispatch( noticesStore );
-		const { deleteEntityRecord } = useDispatch( coreStore );
-		return (
-			<VStack spacing="5">
-				<Text>
-					{ sprintf(
-						// translators: %s: The page's title.
-						__( 'Are you sure you want to delete "%s"?' ),
-						decodeEntities( post.title.rendered )
-					) }
-				</Text>
-				<HStack justify="right">
-					<Button variant="tertiary" onClick={ closeModal }>
-						{ __( 'Cancel' ) }
-					</Button>
-					<Button
-						variant="primary"
-						onClick={ async () => {
-							try {
-								await deleteEntityRecord(
-									'postType',
-									post.type,
-									post.id,
-									{},
-									{ throwOnError: true }
-								);
-								createSuccessNotice(
-									sprintf(
-										/* translators: The page's title. */
-										__( '"%s" moved to the Trash.' ),
-										decodeEntities( post.title.rendered )
-									),
-									{
-										type: 'snackbar',
-										id: 'edit-site-page-trashed',
-									}
-								);
-							} catch ( error ) {
-								const errorMessage =
-									error.message &&
-									error.code !== 'unknown_error'
-										? error.message
-										: __(
-												'An error occurred while moving the page to the trash.'
-										  );
-
-								createErrorNotice( errorMessage, {
-									type: 'snackbar',
-								} );
-							}
-						} }
-					>
-						{ __( 'Delete' ) }
-					</Button>
-				</HStack>
-			</VStack>
-		);
-	},
-};
-
-export function usePermanentlyDeletePostAction() {
-	const { createSuccessNotice, createErrorNotice } =
-		useDispatch( noticesStore );
-	const { deleteEntityRecord } = useDispatch( coreStore );
-
-	return useMemo(
-		() => ( {
-			id: 'permanently-delete',
-			label: __( 'Permanently delete' ),
-			isPrimary: true,
-			icon: trash,
-			isEligible( { status } ) {
-				return status === 'trash';
-			},
-			async callback( post ) {
-				try {
-					await deleteEntityRecord(
-						'postType',
-						post.type,
-						post.id,
-						{ force: true },
-						{ throwOnError: true }
-					);
-					createSuccessNotice(
-						sprintf(
-							/* translators: The posts's title. */
-							__( '"%s" permanently deleted.' ),
-							decodeEntities( post.title.rendered )
-						),
-						{
-							type: 'snackbar',
-							id: 'edit-site-post-permanently-deleted',
-						}
-					);
-				} catch ( error ) {
-					const errorMessage =
-						error.message && error.code !== 'unknown_error'
-							? error.message
-							: __(
-									'An error occurred while permanently deleting the post.'
-							  );
-
-					createErrorNotice( errorMessage, { type: 'snackbar' } );
-				}
-			},
-		} ),
-		[ createSuccessNotice, createErrorNotice, deleteEntityRecord ]
-	);
-}
-
-export function useRestorePostAction() {
-	const { createSuccessNotice, createErrorNotice } =
-		useDispatch( noticesStore );
-	const { editEntityRecord, saveEditedEntityRecord } =
-		useDispatch( coreStore );
-
-	return useMemo(
-		() => ( {
-			id: 'restore',
-			label: __( 'Restore' ),
-			isPrimary: true,
-			icon: backup,
-			isEligible( { status } ) {
-				return status === 'trash';
-			},
-			async callback( post ) {
-				await editEntityRecord( 'postType', post.type, post.id, {
-					status: 'draft',
-				} );
-				try {
-					await saveEditedEntityRecord(
-						'postType',
-						post.type,
-						post.id,
-						{ throwOnError: true }
-					);
-					createSuccessNotice(
-						sprintf(
-							/* translators: The posts's title. */
-							__( '"%s" has been restored.' ),
-							decodeEntities( post.title.rendered )
-						),
-						{
-							type: 'snackbar',
-							id: 'edit-site-post-restored',
-						}
-					);
-				} catch ( error ) {
-					const errorMessage =
-						error.message && error.code !== 'unknown_error'
-							? error.message
-							: __(
-									'An error occurred while restoring the post.'
-							  );
-
-					createErrorNotice( errorMessage, { type: 'snackbar' } );
-				}
-			},
-		} ),
-		[
-			createSuccessNotice,
-			createErrorNotice,
-			editEntityRecord,
-			saveEditedEntityRecord,
-		]
-	);
-}
-
-export const viewPostAction = {
-	id: 'view-post',
-	label: __( 'View' ),
-	isPrimary: true,
-	icon: external,
-	isEligible( post ) {
-		return post.status !== 'trash';
-	},
-	callback( post ) {
-		document.location.href = post.link;
-	},
-};
-
-export function useEditPostAction() {
-	const history = useHistory();
-	return useMemo(
-		() => ( {
-			id: 'edit-post',
-			label: __( 'Edit' ),
-			isEligible( { status } ) {
-				return status !== 'trash';
-			},
-			callback( post ) {
-				history.push( {
-					postId: post.id,
-					postType: post.type,
-					canvas: 'edit',
-				} );
-			},
-		} ),
-		[ history ]
-	);
-}
-export const postRevisionsAction = {
-	id: 'view-post-revisions',
-	label: __( 'View revisions' ),
-	isPrimary: false,
-	isEligible: ( post ) => {
-		if ( post.status === 'trash' ) {
-			return false;
-		}
-		const lastRevisionId =
-			post?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id ?? null;
-		const revisionsCount =
-			post?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0;
-		return lastRevisionId && revisionsCount > 1;
-	},
-	callback( post ) {
-		const href = addQueryArgs( 'revision.php', {
-			revision: post?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id,
-		} );
-		document.location.href = href;
-	},
-};
diff --git a/packages/edit-site/src/components/add-new-page/index.js b/packages/edit-site/src/components/add-new-page/index.js
deleted file mode 100644
index 09d2e17ff94d1a..00000000000000
--- a/packages/edit-site/src/components/add-new-page/index.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	Button,
-	Modal,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-	TextControl,
-} from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
-import { useDispatch } from '@wordpress/data';
-import { useState } from '@wordpress/element';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as noticesStore } from '@wordpress/notices';
-
-export default function AddNewPageModal( { onSave, onClose } ) {
-	const [ isCreatingPage, setIsCreatingPage ] = useState( false );
-	const [ title, setTitle ] = useState( '' );
-
-	const { saveEntityRecord } = useDispatch( coreStore );
-	const { createErrorNotice, createSuccessNotice } =
-		useDispatch( noticesStore );
-
-	async function createPage( event ) {
-		event.preventDefault();
-
-		if ( isCreatingPage ) {
-			return;
-		}
-		setIsCreatingPage( true );
-		try {
-			const newPage = await saveEntityRecord(
-				'postType',
-				'page',
-				{
-					status: 'draft',
-					title,
-					slug: title || __( 'No title' ),
-				},
-				{ throwOnError: true }
-			);
-
-			onSave( newPage );
-
-			createSuccessNotice(
-				sprintf(
-					// translators: %s: Title of the created template e.g: "Category".
-					__( '"%s" successfully created.' ),
-					newPage.title?.rendered || title
-				),
-				{
-					type: 'snackbar',
-				}
-			);
-		} catch ( error ) {
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: __( 'An error occurred while creating the page.' );
-
-			createErrorNotice( errorMessage, {
-				type: 'snackbar',
-			} );
-		} finally {
-			setIsCreatingPage( false );
-		}
-	}
-
-	return (
-		<Modal title={ __( 'Draft a new page' ) } onRequestClose={ onClose }>
-			<form onSubmit={ createPage }>
-				<VStack spacing={ 3 }>
-					<TextControl
-						label={ __( 'Page title' ) }
-						onChange={ setTitle }
-						placeholder={ __( 'No title' ) }
-						value={ title }
-					/>
-					<HStack spacing={ 2 } justify="end">
-						<Button variant="tertiary" onClick={ onClose }>
-							{ __( 'Cancel' ) }
-						</Button>
-						<Button
-							variant="primary"
-							type="submit"
-							isBusy={ isCreatingPage }
-							aria-disabled={ isCreatingPage }
-						>
-							{ __( 'Create draft' ) }
-						</Button>
-					</HStack>
-				</VStack>
-			</form>
-		</Modal>
-	);
-}
diff --git a/packages/edit-site/src/components/add-new-pattern/index.js b/packages/edit-site/src/components/add-new-pattern/index.js
index 014ac6165aaef2..bb9e53da6a5660 100644
--- a/packages/edit-site/src/components/add-new-pattern/index.js
+++ b/packages/edit-site/src/components/add-new-pattern/index.js
@@ -4,55 +4,75 @@
 import { DropdownMenu } from '@wordpress/components';
 import { useState, useRef } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
-import { plus, symbol, symbolFilled, upload } from '@wordpress/icons';
+import { symbol, symbolFilled, upload } from '@wordpress/icons';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import {
 	privateApis as editPatternsPrivateApis,
 	store as patternsStore,
 } from '@wordpress/patterns';
-import { store as coreStore } from '@wordpress/core-data';
 import { store as noticesStore } from '@wordpress/notices';
+import { store as coreStore } from '@wordpress/core-data';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
-import CreateTemplatePartModal from '../create-template-part-modal';
-import SidebarButton from '../sidebar-button';
 import { unlock } from '../../lock-unlock';
 import {
 	PATTERN_TYPES,
 	PATTERN_DEFAULT_CATEGORY,
 	TEMPLATE_PART_POST_TYPE,
 } from '../../utils/constants';
-import usePatternCategories from '../sidebar-navigation-screen-patterns/use-pattern-categories';
 
-const { useHistory, useLocation } = unlock( routerPrivateApis );
-const { CreatePatternModal } = unlock( editPatternsPrivateApis );
+const { useHistory } = unlock( routerPrivateApis );
+const { CreatePatternModal, useAddPatternCategory } = unlock(
+	editPatternsPrivateApis
+);
+const { CreateTemplatePartModal } = unlock( editorPrivateApis );
 
 export default function AddNewPattern() {
 	const history = useHistory();
-	const { params } = useLocation();
 	const [ showPatternModal, setShowPatternModal ] = useState( false );
 	const [ showTemplatePartModal, setShowTemplatePartModal ] =
 		useState( false );
-	const isBlockBasedTheme = useSelect( ( select ) => {
-		return select( coreStore ).getCurrentTheme()?.is_block_theme;
-	}, [] );
+	// eslint-disable-next-line @wordpress/no-unused-vars-before-return
 	const { createPatternFromFile } = unlock( useDispatch( patternsStore ) );
 	const { createSuccessNotice, createErrorNotice } =
 		useDispatch( noticesStore );
 	const patternUploadInputRef = useRef();
-	const { patternCategories } = usePatternCategories();
+	const {
+		isBlockBasedTheme,
+		addNewPatternLabel,
+		addNewTemplatePartLabel,
+		canCreatePattern,
+		canCreateTemplatePart,
+	} = useSelect( ( select ) => {
+		const { getCurrentTheme, getPostType, canUser } = select( coreStore );
+		return {
+			isBlockBasedTheme: getCurrentTheme()?.is_block_theme,
+			addNewPatternLabel: getPostType( PATTERN_TYPES.user )?.labels
+				?.add_new_item,
+			addNewTemplatePartLabel: getPostType( TEMPLATE_PART_POST_TYPE )
+				?.labels?.add_new_item,
+			// Blocks refers to the wp_block post type, this checks the ability to create a post of that type.
+			canCreatePattern: canUser( 'create', {
+				kind: 'postType',
+				name: PATTERN_TYPES.user,
+			} ),
+			canCreateTemplatePart: canUser( 'create', {
+				kind: 'postType',
+				name: TEMPLATE_PART_POST_TYPE,
+			} ),
+		};
+	}, [] );
 
-	function handleCreatePattern( { pattern, categoryId } ) {
+	function handleCreatePattern( { pattern } ) {
 		setShowPatternModal( false );
 
 		history.push( {
 			postId: pattern.id,
 			postType: PATTERN_TYPES.user,
-			categoryType: PATTERN_TYPES.theme,
-			categoryId,
 			canvas: 'edit',
 		} );
 	}
@@ -73,40 +93,52 @@ export default function AddNewPattern() {
 		setShowTemplatePartModal( false );
 	}
 
-	const controls = [
-		{
+	const controls = [];
+	if ( canCreatePattern ) {
+		controls.push( {
 			icon: symbol,
 			onClick: () => setShowPatternModal( true ),
-			title: __( 'Create pattern' ),
-		},
-	];
+			title: addNewPatternLabel,
+		} );
+	}
 
-	if ( isBlockBasedTheme ) {
+	if ( isBlockBasedTheme && canCreateTemplatePart ) {
 		controls.push( {
 			icon: symbolFilled,
 			onClick: () => setShowTemplatePartModal( true ),
-			title: __( 'Create template part' ),
+			title: addNewTemplatePartLabel,
 		} );
 	}
 
-	controls.push( {
-		icon: upload,
-		onClick: () => {
-			patternUploadInputRef.current.click();
-		},
-		title: __( 'Import pattern from JSON' ),
-	} );
+	if ( canCreatePattern ) {
+		controls.push( {
+			icon: upload,
+			onClick: () => {
+				patternUploadInputRef.current.click();
+			},
+			title: __( 'Import pattern from JSON' ),
+		} );
+	}
 
+	const { categoryMap, findOrCreateTerm } = useAddPatternCategory();
+	if ( controls.length === 0 ) {
+		return null;
+	}
 	return (
 		<>
-			<DropdownMenu
-				controls={ controls }
-				toggleProps={ {
-					as: SidebarButton,
-				} }
-				icon={ plus }
-				label={ __( 'Create pattern' ) }
-			/>
+			{ addNewPatternLabel && (
+				<DropdownMenu
+					controls={ controls }
+					icon={ null }
+					toggleProps={ {
+						variant: 'primary',
+						showTooltip: false,
+						__next40pxDefaultSize: true,
+					} }
+					text={ addNewPatternLabel }
+					label={ addNewPatternLabel }
+				/>
+			) }
 			{ showPatternModal && (
 				<CreatePatternModal
 					onClose={ () => setShowPatternModal( false ) }
@@ -130,14 +162,33 @@ export default function AddNewPattern() {
 				ref={ patternUploadInputRef }
 				onChange={ async ( event ) => {
 					const file = event.target.files?.[ 0 ];
-					if ( ! file ) return;
+					if ( ! file ) {
+						return;
+					}
 					try {
-						const currentCategoryId =
-							params.categoryType !== TEMPLATE_PART_POST_TYPE &&
-							patternCategories.find(
-								( category ) =>
-									category.name === params.categoryId
-							)?.id;
+						const {
+							params: { postType, categoryId },
+						} = history.getLocationWithParams();
+						let currentCategoryId;
+						// When we're not handling template parts, we should
+						// add or create the proper pattern category.
+						if ( postType !== TEMPLATE_PART_POST_TYPE ) {
+							/*
+							 * categoryMap.values() returns an iterator.
+							 * Iterator.prototype.find() is not yet widely supported.
+							 * Convert to array to use the Array.prototype.find method.
+							 */
+							const currentCategory = Array.from(
+								categoryMap.values()
+							).find( ( term ) => term.name === categoryId );
+							if ( currentCategory ) {
+								currentCategoryId =
+									currentCategory.id ||
+									( await findOrCreateTerm(
+										currentCategory.label
+									) );
+							}
+						}
 						const pattern = await createPatternFromFile(
 							file,
 							currentCategoryId
@@ -146,11 +197,14 @@ export default function AddNewPattern() {
 						);
 
 						// Navigate to the All patterns category for the newly created pattern
-						// if we're not on that page already.
-						if ( ! currentCategoryId ) {
+						// if we're not on that page already and if we're not in the `my-patterns`
+						// category.
+						if (
+							! currentCategoryId &&
+							categoryId !== 'my-patterns'
+						) {
 							history.push( {
-								path: `/patterns`,
-								categoryType: PATTERN_TYPES.theme,
+								postType: PATTERN_TYPES.user,
 								categoryId: PATTERN_DEFAULT_CATEGORY,
 							} );
 						}
diff --git a/packages/edit-site/src/components/add-new-post/index.js b/packages/edit-site/src/components/add-new-post/index.js
new file mode 100644
index 00000000000000..044e3c703b9948
--- /dev/null
+++ b/packages/edit-site/src/components/add-new-post/index.js
@@ -0,0 +1,129 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	Button,
+	Modal,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	TextControl,
+} from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+import { useDispatch, useRegistry, useSelect } from '@wordpress/data';
+import { useState } from '@wordpress/element';
+import { store as coreStore } from '@wordpress/core-data';
+import { store as noticesStore } from '@wordpress/notices';
+import { decodeEntities } from '@wordpress/html-entities';
+import { serialize, synchronizeBlocksWithTemplate } from '@wordpress/blocks';
+
+export default function AddNewPostModal( { postType, onSave, onClose } ) {
+	const labels = useSelect(
+		( select ) => select( coreStore ).getPostType( postType )?.labels,
+		[ postType ]
+	);
+	const [ isCreatingPost, setIsCreatingPost ] = useState( false );
+	const [ title, setTitle ] = useState( '' );
+
+	const { saveEntityRecord } = useDispatch( coreStore );
+	const { createErrorNotice, createSuccessNotice } =
+		useDispatch( noticesStore );
+	const { resolveSelect } = useRegistry();
+
+	async function createPost( event ) {
+		event.preventDefault();
+
+		if ( isCreatingPost ) {
+			return;
+		}
+		setIsCreatingPost( true );
+		try {
+			const postTypeObject =
+				await resolveSelect( coreStore ).getPostType( postType );
+			const newPage = await saveEntityRecord(
+				'postType',
+				postType,
+				{
+					status: 'draft',
+					title,
+					slug: title || __( 'No title' ),
+					content:
+						!! postTypeObject.template &&
+						postTypeObject.template.length
+							? serialize(
+									synchronizeBlocksWithTemplate(
+										[],
+										postTypeObject.template
+									)
+							  )
+							: undefined,
+				},
+				{ throwOnError: true }
+			);
+
+			onSave( newPage );
+
+			createSuccessNotice(
+				sprintf(
+					// translators: %s: Title of the created post e.g: "Hello world".
+					__( '"%s" successfully created.' ),
+					decodeEntities( newPage.title?.rendered || title )
+				),
+				{ type: 'snackbar' }
+			);
+		} catch ( error ) {
+			const errorMessage =
+				error.message && error.code !== 'unknown_error'
+					? error.message
+					: __( 'An error occurred while creating the item.' );
+
+			createErrorNotice( errorMessage, {
+				type: 'snackbar',
+			} );
+		} finally {
+			setIsCreatingPost( false );
+		}
+	}
+
+	return (
+		<Modal
+			title={
+				// translators: %s: post type singular_name label e.g: "Page".
+				sprintf( __( 'Draft new: %s' ), labels?.singular_name )
+			}
+			onRequestClose={ onClose }
+			focusOnMount="firstContentElement"
+			size="small"
+		>
+			<form onSubmit={ createPost }>
+				<VStack spacing={ 4 }>
+					<TextControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
+						label={ __( 'Title' ) }
+						onChange={ setTitle }
+						placeholder={ __( 'No title' ) }
+						value={ title }
+					/>
+					<HStack spacing={ 2 } justify="end">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ onClose }
+						>
+							{ __( 'Cancel' ) }
+						</Button>
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							type="submit"
+							isBusy={ isCreatingPost }
+							aria-disabled={ isCreatingPost }
+						>
+							{ __( 'Create draft' ) }
+						</Button>
+					</HStack>
+				</VStack>
+			</form>
+		</Modal>
+	);
+}
diff --git a/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js b/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js
index 345d26a60e659d..746fd6c5314c31 100644
--- a/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js
+++ b/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js
@@ -43,6 +43,7 @@ function AddCustomGenericTemplateModalContent( { onClose, createTemplate } ) {
 		<form onSubmit={ onCreateTemplate }>
 			<VStack spacing={ 6 }>
 				<TextControl
+					__next40pxDefaultSize
 					__nextHasNoMarginBottom
 					label={ __( 'Name' ) }
 					value={ title }
@@ -58,6 +59,7 @@ function AddCustomGenericTemplateModalContent( { onClose, createTemplate } ) {
 					justify="right"
 				>
 					<Button
+						__next40pxDefaultSize
 						variant="tertiary"
 						onClick={ () => {
 							onClose();
@@ -66,6 +68,7 @@ function AddCustomGenericTemplateModalContent( { onClose, createTemplate } ) {
 						{ __( 'Cancel' ) }
 					</Button>
 					<Button
+						__next40pxDefaultSize
 						variant="primary"
 						type="submit"
 						isBusy={ isBusy }
diff --git a/packages/edit-site/src/components/add-new-template/add-custom-template-modal-content.js b/packages/edit-site/src/components/add-new-template/add-custom-template-modal-content.js
index 44554eac0dcd62..69f1925c7b0e44 100644
--- a/packages/edit-site/src/components/add-new-template/add-custom-template-modal-content.js
+++ b/packages/edit-site/src/components/add-new-template/add-custom-template-modal-content.js
@@ -9,7 +9,7 @@ import {
 	FlexItem,
 	SearchControl,
 	TextHighlight,
-	privateApis as componentsPrivateApis,
+	Composite,
 	__experimentalText as Text,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
@@ -20,15 +20,8 @@ import { useDebouncedInput } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
-import { unlock } from '../../lock-unlock';
 import { mapToIHasNameAndId } from './utils';
 
-const {
-	CompositeV2: Composite,
-	CompositeItemV2: CompositeItem,
-	useCompositeStoreV2: useCompositeStore,
-} = unlock( componentsPrivateApis );
-
 const EMPTY_ARRAY = [];
 
 function SuggestionListItem( {
@@ -40,9 +33,10 @@ function SuggestionListItem( {
 	const baseCssClass =
 		'edit-site-custom-template-modal__suggestions_list__list-item';
 	return (
-		<CompositeItem
+		<Composite.Item
 			render={
 				<Button
+					__next40pxDefaultSize
 					role="option"
 					className={ baseCssClass }
 					onClick={ () =>
@@ -75,7 +69,7 @@ function SuggestionListItem( {
 					{ suggestion.link }
 				</Text>
 			) }
-		</CompositeItem>
+		</Composite.Item>
 	);
 }
 
@@ -99,7 +93,9 @@ function useSearchSuggestions( entityForSuggestions, search ) {
 		);
 	const [ suggestions, setSuggestions ] = useState( EMPTY_ARRAY );
 	useEffect( () => {
-		if ( ! searchHasResolved ) return;
+		if ( ! searchHasResolved ) {
+			return;
+		}
 		let newSuggestions = EMPTY_ARRAY;
 		if ( searchResults?.length ) {
 			newSuggestions = searchResults;
@@ -118,7 +114,6 @@ function useSearchSuggestions( entityForSuggestions, search ) {
 }
 
 function SuggestionList( { entityForSuggestions, onSelect } ) {
-	const composite = useCompositeStore( { orientation: 'vertical' } );
 	const [ search, setSearch, debouncedSearch ] = useDebouncedInput();
 	const suggestions = useSearchSuggestions(
 		entityForSuggestions,
@@ -142,7 +137,7 @@ function SuggestionList( { entityForSuggestions, onSelect } ) {
 			) }
 			{ !! suggestions?.length && (
 				<Composite
-					store={ composite }
+					orientation="vertical"
 					role="listbox"
 					className="edit-site-custom-template-modal__suggestions_list"
 					aria-label={ __( 'Suggestions list' ) }
diff --git a/packages/edit-site/src/components/add-new-template/index.js b/packages/edit-site/src/components/add-new-template/index.js
index 1f1e855ccf38d3..bb0acbe62cd659 100644
--- a/packages/edit-site/src/components/add-new-template/index.js
+++ b/packages/edit-site/src/components/add-new-template/index.js
@@ -1,31 +1,433 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
+import {
+	Button,
+	Modal,
+	__experimentalGrid as Grid,
+	__experimentalText as Text,
+	__experimentalVStack as VStack,
+	Flex,
+	Icon,
+} from '@wordpress/components';
+import { decodeEntities } from '@wordpress/html-entities';
+import { useState, memo } from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
+import { useViewportMatch } from '@wordpress/compose';
+import {
+	archive,
+	blockMeta,
+	calendar,
+	category,
+	commentAuthorAvatar,
+	edit,
+	home,
+	layout,
+	list,
+	media,
+	notFound,
+	page,
+	pin,
+	verse,
+	search,
+	tag,
+} from '@wordpress/icons';
+import { __, sprintf } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
-import NewTemplate from './new-template';
 import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 
-export default function AddNewTemplate( {
-	templateType = TEMPLATE_POST_TYPE,
-	...props
+/**
+ * Internal dependencies
+ */
+import AddCustomTemplateModalContent from './add-custom-template-modal-content';
+import {
+	useExistingTemplates,
+	useDefaultTemplateTypes,
+	useTaxonomiesMenuItems,
+	usePostTypeMenuItems,
+	useAuthorMenuItem,
+	usePostTypeArchiveMenuItems,
+} from './utils';
+import AddCustomGenericTemplateModalContent from './add-custom-generic-template-modal-content';
+import { unlock } from '../../lock-unlock';
+
+const { useHistory } = unlock( routerPrivateApis );
+
+const DEFAULT_TEMPLATE_SLUGS = [
+	'front-page',
+	'home',
+	'single',
+	'page',
+	'index',
+	'archive',
+	'author',
+	'category',
+	'date',
+	'tag',
+	'search',
+	'404',
+];
+
+const TEMPLATE_ICONS = {
+	'front-page': home,
+	home: verse,
+	single: pin,
+	page,
+	archive,
+	search,
+	404: notFound,
+	index: list,
+	category,
+	author: commentAuthorAvatar,
+	taxonomy: blockMeta,
+	date: calendar,
+	tag,
+	attachment: media,
+};
+
+function TemplateListItem( {
+	title,
+	direction,
+	className,
+	description,
+	icon,
+	onClick,
+	children,
 } ) {
-	const postType = useSelect(
-		( select ) => select( coreStore ).getPostType( templateType ),
-		[ templateType ]
+	return (
+		<Button
+			__next40pxDefaultSize
+			className={ className }
+			onClick={ onClick }
+			label={ description }
+			showTooltip={ !! description }
+		>
+			<Flex
+				as="span"
+				spacing={ 2 }
+				align="center"
+				justify="center"
+				style={ { width: '100%' } }
+				direction={ direction }
+			>
+				<div className="edit-site-add-new-template__template-icon">
+					<Icon icon={ icon } />
+				</div>
+				<VStack
+					className="edit-site-add-new-template__template-name"
+					alignment="center"
+					spacing={ 0 }
+				>
+					<Text
+						align="center"
+						weight={ 500 }
+						lineHeight={ 1.53846153846 } // 20px
+					>
+						{ title }
+					</Text>
+					{ children }
+				</VStack>
+			</Flex>
+		</Button>
+	);
+}
+
+const modalContentMap = {
+	templatesList: 1,
+	customTemplate: 2,
+	customGenericTemplate: 3,
+};
+
+function NewTemplateModal( { onClose } ) {
+	const [ modalContent, setModalContent ] = useState(
+		modalContentMap.templatesList
+	);
+	const [ entityForSuggestions, setEntityForSuggestions ] = useState( {} );
+	const [ isSubmitting, setIsSubmitting ] = useState( false );
+	const missingTemplates = useMissingTemplates( setEntityForSuggestions, () =>
+		setModalContent( modalContentMap.customTemplate )
+	);
+	const history = useHistory();
+	const { saveEntityRecord } = useDispatch( coreStore );
+	const { createErrorNotice, createSuccessNotice } =
+		useDispatch( noticesStore );
+
+	const isMobile = useViewportMatch( 'medium', '<' );
+
+	const homeUrl = useSelect( ( select ) => {
+		// Site index.
+		return select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+			?.home;
+	}, [] );
+
+	const TEMPLATE_SHORT_DESCRIPTIONS = {
+		'front-page': homeUrl,
+		date: sprintf(
+			// translators: %s: The homepage url.
+			__( 'E.g. %s' ),
+			homeUrl + '/' + new Date().getFullYear()
+		),
+	};
+
+	async function createTemplate( template, isWPSuggestion = true ) {
+		if ( isSubmitting ) {
+			return;
+		}
+		setIsSubmitting( true );
+		try {
+			const { title, description, slug } = template;
+			const newTemplate = await saveEntityRecord(
+				'postType',
+				TEMPLATE_POST_TYPE,
+				{
+					description,
+					// Slugs need to be strings, so this is for template `404`
+					slug: slug.toString(),
+					status: 'publish',
+					title,
+					// This adds a post meta field in template that is part of `is_custom` value calculation.
+					is_wp_suggestion: isWPSuggestion,
+				},
+				{ throwOnError: true }
+			);
+
+			// Navigate to the created template editor.
+			history.push( {
+				postId: newTemplate.id,
+				postType: TEMPLATE_POST_TYPE,
+				canvas: 'edit',
+			} );
+
+			createSuccessNotice(
+				sprintf(
+					// translators: %s: Title of the created template e.g: "Category".
+					__( '"%s" successfully created.' ),
+					decodeEntities( newTemplate.title?.rendered || title )
+				),
+				{
+					type: 'snackbar',
+				}
+			);
+		} catch ( error ) {
+			const errorMessage =
+				error.message && error.code !== 'unknown_error'
+					? error.message
+					: __( 'An error occurred while creating the template.' );
+
+			createErrorNotice( errorMessage, {
+				type: 'snackbar',
+			} );
+		} finally {
+			setIsSubmitting( false );
+		}
+	}
+	const onModalClose = () => {
+		onClose();
+		setModalContent( modalContentMap.templatesList );
+	};
+
+	let modalTitle = __( 'Add template' );
+	if ( modalContent === modalContentMap.customTemplate ) {
+		modalTitle = sprintf(
+			// translators: %s: Name of the post type e.g: "Post".
+			__( 'Add template: %s' ),
+			entityForSuggestions.labels.singular_name
+		);
+	} else if ( modalContent === modalContentMap.customGenericTemplate ) {
+		modalTitle = __( 'Create custom template' );
+	}
+
+	return (
+		<Modal
+			title={ modalTitle }
+			className={ clsx( 'edit-site-add-new-template__modal', {
+				'edit-site-add-new-template__modal_template_list':
+					modalContent === modalContentMap.templatesList,
+				'edit-site-custom-template-modal':
+					modalContent === modalContentMap.customTemplate,
+			} ) }
+			onRequestClose={ onModalClose }
+			overlayClassName={
+				modalContent === modalContentMap.customGenericTemplate
+					? 'edit-site-custom-generic-template__modal'
+					: undefined
+			}
+		>
+			{ modalContent === modalContentMap.templatesList && (
+				<Grid
+					columns={ isMobile ? 2 : 3 }
+					gap={ 4 }
+					align="flex-start"
+					justify="center"
+					className="edit-site-add-new-template__template-list__contents"
+				>
+					<Flex className="edit-site-add-new-template__template-list__prompt">
+						{ __(
+							'Select what the new template should apply to:'
+						) }
+					</Flex>
+					{ missingTemplates.map( ( template ) => {
+						const { title, slug, onClick } = template;
+						return (
+							<TemplateListItem
+								key={ slug }
+								title={ title }
+								direction="column"
+								className="edit-site-add-new-template__template-button"
+								description={
+									TEMPLATE_SHORT_DESCRIPTIONS[ slug ]
+								}
+								icon={ TEMPLATE_ICONS[ slug ] || layout }
+								onClick={ () =>
+									onClick
+										? onClick( template )
+										: createTemplate( template )
+								}
+							/>
+						);
+					} ) }
+					<TemplateListItem
+						title={ __( 'Custom template' ) }
+						direction="row"
+						className="edit-site-add-new-template__custom-template-button"
+						icon={ edit }
+						onClick={ () =>
+							setModalContent(
+								modalContentMap.customGenericTemplate
+							)
+						}
+					>
+						<Text
+							lineHeight={ 1.53846153846 } // 20px
+						>
+							{ __(
+								'A custom template can be manually applied to any post or page.'
+							) }
+						</Text>
+					</TemplateListItem>
+				</Grid>
+			) }
+			{ modalContent === modalContentMap.customTemplate && (
+				<AddCustomTemplateModalContent
+					onSelect={ createTemplate }
+					entityForSuggestions={ entityForSuggestions }
+				/>
+			) }
+			{ modalContent === modalContentMap.customGenericTemplate && (
+				<AddCustomGenericTemplateModalContent
+					onClose={ onModalClose }
+					createTemplate={ createTemplate }
+				/>
+			) }
+		</Modal>
 	);
+}
+
+function NewTemplate() {
+	const [ showModal, setShowModal ] = useState( false );
+
+	const { postType } = useSelect( ( select ) => {
+		const { getPostType } = select( coreStore );
+
+		return {
+			postType: getPostType( TEMPLATE_POST_TYPE ),
+		};
+	}, [] );
 
 	if ( ! postType ) {
 		return null;
 	}
 
-	if ( templateType === TEMPLATE_POST_TYPE ) {
-		return <NewTemplate { ...props } postType={ postType } />;
-	}
+	return (
+		<>
+			<Button
+				variant="primary"
+				onClick={ () => setShowModal( true ) }
+				label={ postType.labels.add_new_item }
+				__next40pxDefaultSize
+			>
+				{ postType.labels.add_new_item }
+			</Button>
+			{ showModal && (
+				<NewTemplateModal onClose={ () => setShowModal( false ) } />
+			) }
+		</>
+	);
+}
 
-	return null;
+function useMissingTemplates( setEntityForSuggestions, onClick ) {
+	const existingTemplates = useExistingTemplates();
+	const defaultTemplateTypes = useDefaultTemplateTypes();
+	const existingTemplateSlugs = ( existingTemplates || [] ).map(
+		( { slug } ) => slug
+	);
+	const missingDefaultTemplates = ( defaultTemplateTypes || [] ).filter(
+		( template ) =>
+			DEFAULT_TEMPLATE_SLUGS.includes( template.slug ) &&
+			! existingTemplateSlugs.includes( template.slug )
+	);
+	const onClickMenuItem = ( _entityForSuggestions ) => {
+		onClick?.();
+		setEntityForSuggestions( _entityForSuggestions );
+	};
+	// We need to replace existing default template types with
+	// the create specific template functionality. The original
+	// info (title, description, etc.) is preserved in the
+	// used hooks.
+	const enhancedMissingDefaultTemplateTypes = [ ...missingDefaultTemplates ];
+	const { defaultTaxonomiesMenuItems, taxonomiesMenuItems } =
+		useTaxonomiesMenuItems( onClickMenuItem );
+	const { defaultPostTypesMenuItems, postTypesMenuItems } =
+		usePostTypeMenuItems( onClickMenuItem );
+
+	const authorMenuItem = useAuthorMenuItem( onClickMenuItem );
+	[
+		...defaultTaxonomiesMenuItems,
+		...defaultPostTypesMenuItems,
+		authorMenuItem,
+	].forEach( ( menuItem ) => {
+		if ( ! menuItem ) {
+			return;
+		}
+		const matchIndex = enhancedMissingDefaultTemplateTypes.findIndex(
+			( template ) => template.slug === menuItem.slug
+		);
+		// Some default template types might have been filtered above from
+		// `missingDefaultTemplates` because they only check for the general
+		// template. So here we either replace or append the item, augmented
+		// with the check if it has available specific item to create a
+		// template for.
+		if ( matchIndex > -1 ) {
+			enhancedMissingDefaultTemplateTypes[ matchIndex ] = menuItem;
+		} else {
+			enhancedMissingDefaultTemplateTypes.push( menuItem );
+		}
+	} );
+	// Update the sort order to match the DEFAULT_TEMPLATE_SLUGS order.
+	enhancedMissingDefaultTemplateTypes?.sort( ( template1, template2 ) => {
+		return (
+			DEFAULT_TEMPLATE_SLUGS.indexOf( template1.slug ) -
+			DEFAULT_TEMPLATE_SLUGS.indexOf( template2.slug )
+		);
+	} );
+	const missingTemplates = [
+		...enhancedMissingDefaultTemplateTypes,
+		...usePostTypeArchiveMenuItems(),
+		...postTypesMenuItems,
+		...taxonomiesMenuItems,
+	];
+	return missingTemplates;
 }
+
+export default memo( NewTemplate );
diff --git a/packages/edit-site/src/components/add-new-template/new-template.js b/packages/edit-site/src/components/add-new-template/new-template.js
deleted file mode 100644
index 95bb074c66ee6c..00000000000000
--- a/packages/edit-site/src/components/add-new-template/new-template.js
+++ /dev/null
@@ -1,429 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	Button,
-	Modal,
-	__experimentalGrid as Grid,
-	__experimentalText as Text,
-	__experimentalVStack as VStack,
-	Flex,
-	Icon,
-} from '@wordpress/components';
-import { decodeEntities } from '@wordpress/html-entities';
-import { useState } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import {
-	archive,
-	blockMeta,
-	calendar,
-	category,
-	commentAuthorAvatar,
-	edit,
-	home,
-	layout,
-	list,
-	media,
-	notFound,
-	page,
-	plus,
-	pin,
-	verse,
-	search,
-	tag,
-} from '@wordpress/icons';
-import { __, sprintf } from '@wordpress/i18n';
-import { store as noticesStore } from '@wordpress/notices';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
-
-/**
- * Internal dependencies
- */
-import AddCustomTemplateModalContent from './add-custom-template-modal-content';
-import {
-	useExistingTemplates,
-	useDefaultTemplateTypes,
-	useTaxonomiesMenuItems,
-	usePostTypeMenuItems,
-	useAuthorMenuItem,
-	usePostTypeArchiveMenuItems,
-} from './utils';
-import AddCustomGenericTemplateModalContent from './add-custom-generic-template-modal-content';
-import TemplateActionsLoadingScreen from './template-actions-loading-screen';
-import { unlock } from '../../lock-unlock';
-
-const { useHistory } = unlock( routerPrivateApis );
-
-const DEFAULT_TEMPLATE_SLUGS = [
-	'front-page',
-	'home',
-	'single',
-	'page',
-	'index',
-	'archive',
-	'author',
-	'category',
-	'date',
-	'tag',
-	'search',
-	'404',
-];
-
-const TEMPLATE_ICONS = {
-	'front-page': home,
-	home: verse,
-	single: pin,
-	page,
-	archive,
-	search,
-	404: notFound,
-	index: list,
-	category,
-	author: commentAuthorAvatar,
-	taxonomy: blockMeta,
-	date: calendar,
-	tag,
-	attachment: media,
-};
-
-function TemplateListItem( {
-	title,
-	direction,
-	className,
-	description,
-	icon,
-	onClick,
-	children,
-} ) {
-	return (
-		<Button
-			className={ className }
-			onClick={ onClick }
-			label={ description }
-			showTooltip={ !! description }
-		>
-			<Flex
-				as="span"
-				spacing={ 2 }
-				align="center"
-				justify="center"
-				style={ { width: '100%' } }
-				direction={ direction }
-			>
-				<div className="edit-site-add-new-template__template-icon">
-					<Icon icon={ icon } />
-				</div>
-				<VStack
-					className="edit-site-add-new-template__template-name"
-					alignment="center"
-					spacing={ 0 }
-				>
-					<Text
-						weight={ 500 }
-						lineHeight={ 1.53846153846 } // 20px
-					>
-						{ title }
-					</Text>
-					{ children }
-				</VStack>
-			</Flex>
-		</Button>
-	);
-}
-
-const modalContentMap = {
-	templatesList: 1,
-	customTemplate: 2,
-	customGenericTemplate: 3,
-};
-
-export default function NewTemplate( {
-	postType,
-	toggleProps,
-	showIcon = true,
-} ) {
-	const [ showModal, setShowModal ] = useState( false );
-	const [ modalContent, setModalContent ] = useState(
-		modalContentMap.templatesList
-	);
-	const [ entityForSuggestions, setEntityForSuggestions ] = useState( {} );
-	const [ isCreatingTemplate, setIsCreatingTemplate ] = useState( false );
-
-	const history = useHistory();
-	const { saveEntityRecord } = useDispatch( coreStore );
-	const { createErrorNotice, createSuccessNotice } =
-		useDispatch( noticesStore );
-
-	const { homeUrl } = useSelect( ( select ) => {
-		const {
-			getUnstableBase, // Site index.
-		} = select( coreStore );
-
-		return {
-			homeUrl: getUnstableBase()?.home,
-		};
-	}, [] );
-
-	const TEMPLATE_SHORT_DESCRIPTIONS = {
-		'front-page': homeUrl,
-		date: sprintf(
-			// translators: %s: The homepage url.
-			__( 'E.g. %s' ),
-			homeUrl + '/' + new Date().getFullYear()
-		),
-	};
-
-	async function createTemplate( template, isWPSuggestion = true ) {
-		if ( isCreatingTemplate ) {
-			return;
-		}
-		setIsCreatingTemplate( true );
-		try {
-			const { title, description, slug } = template;
-			const newTemplate = await saveEntityRecord(
-				'postType',
-				TEMPLATE_POST_TYPE,
-				{
-					description,
-					// Slugs need to be strings, so this is for template `404`
-					slug: slug.toString(),
-					status: 'publish',
-					title,
-					// This adds a post meta field in template that is part of `is_custom` value calculation.
-					is_wp_suggestion: isWPSuggestion,
-				},
-				{ throwOnError: true }
-			);
-
-			// Navigate to the created template editor.
-			history.push( {
-				postId: newTemplate.id,
-				postType: newTemplate.type,
-				canvas: 'edit',
-			} );
-
-			createSuccessNotice(
-				sprintf(
-					// translators: %s: Title of the created template e.g: "Category".
-					__( '"%s" successfully created.' ),
-					decodeEntities( newTemplate.title?.rendered || title )
-				),
-				{
-					type: 'snackbar',
-				}
-			);
-		} catch ( error ) {
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: __( 'An error occurred while creating the template.' );
-
-			createErrorNotice( errorMessage, {
-				type: 'snackbar',
-			} );
-		} finally {
-			setIsCreatingTemplate( false );
-		}
-	}
-	const onModalClose = () => {
-		setShowModal( false );
-		setModalContent( modalContentMap.templatesList );
-	};
-
-	const missingTemplates = useMissingTemplates( setEntityForSuggestions, () =>
-		setModalContent( modalContentMap.customTemplate )
-	);
-	if ( ! missingTemplates.length ) {
-		return null;
-	}
-	const { as: Toggle = Button, ...restToggleProps } = toggleProps ?? {};
-
-	let modalTitle = __( 'Add template' );
-	if ( modalContent === modalContentMap.customTemplate ) {
-		modalTitle = sprintf(
-			// translators: %s: Name of the post type e.g: "Post".
-			__( 'Add template: %s' ),
-			entityForSuggestions.labels.singular_name
-		);
-	} else if ( modalContent === modalContentMap.customGenericTemplate ) {
-		modalTitle = __( 'Create custom template' );
-	}
-	return (
-		<>
-			{ isCreatingTemplate && <TemplateActionsLoadingScreen /> }
-			<Toggle
-				{ ...restToggleProps }
-				onClick={ () => setShowModal( true ) }
-				icon={ showIcon ? plus : null }
-				label={ postType.labels.add_new_item }
-			>
-				{ showIcon ? null : postType.labels.add_new_item }
-			</Toggle>
-			{ showModal && (
-				<Modal
-					title={ modalTitle }
-					className={ classnames(
-						'edit-site-add-new-template__modal',
-						{
-							'edit-site-add-new-template__modal_template_list':
-								modalContent === modalContentMap.templatesList,
-							'edit-site-custom-template-modal':
-								modalContent === modalContentMap.customTemplate,
-						}
-					) }
-					onRequestClose={ onModalClose }
-					overlayClassName={
-						modalContent === modalContentMap.customGenericTemplate
-							? 'edit-site-custom-generic-template__modal'
-							: undefined
-					}
-				>
-					{ modalContent === modalContentMap.templatesList && (
-						<Grid
-							columns={ 3 }
-							gap={ 4 }
-							align="flex-start"
-							justify="center"
-							className="edit-site-add-new-template__template-list__contents"
-						>
-							<Flex className="edit-site-add-new-template__template-list__prompt">
-								{ __(
-									'Select what the new template should apply to:'
-								) }
-							</Flex>
-							{ missingTemplates.map( ( template ) => {
-								const { title, slug, onClick } = template;
-								return (
-									<TemplateListItem
-										key={ slug }
-										title={ title }
-										direction="column"
-										className="edit-site-add-new-template__template-button"
-										description={
-											TEMPLATE_SHORT_DESCRIPTIONS[ slug ]
-										}
-										icon={
-											TEMPLATE_ICONS[ slug ] || layout
-										}
-										onClick={ () =>
-											onClick
-												? onClick( template )
-												: createTemplate( template )
-										}
-									/>
-								);
-							} ) }
-							<TemplateListItem
-								title={ __( 'Custom template' ) }
-								direction="row"
-								className="edit-site-add-new-template__custom-template-button"
-								icon={ edit }
-								onClick={ () =>
-									setModalContent(
-										modalContentMap.customGenericTemplate
-									)
-								}
-							>
-								<Text
-									lineHeight={ 1.53846153846 } // 20px
-								>
-									{ __(
-										'A custom template can be manually applied to any post or page.'
-									) }
-								</Text>
-							</TemplateListItem>
-						</Grid>
-					) }
-					{ modalContent === modalContentMap.customTemplate && (
-						<AddCustomTemplateModalContent
-							onSelect={ createTemplate }
-							entityForSuggestions={ entityForSuggestions }
-						/>
-					) }
-					{ modalContent ===
-						modalContentMap.customGenericTemplate && (
-						<AddCustomGenericTemplateModalContent
-							onClose={ onModalClose }
-							createTemplate={ createTemplate }
-						/>
-					) }
-				</Modal>
-			) }
-		</>
-	);
-}
-
-function useMissingTemplates( setEntityForSuggestions, onClick ) {
-	const existingTemplates = useExistingTemplates();
-	const defaultTemplateTypes = useDefaultTemplateTypes();
-	const existingTemplateSlugs = ( existingTemplates || [] ).map(
-		( { slug } ) => slug
-	);
-	const missingDefaultTemplates = ( defaultTemplateTypes || [] ).filter(
-		( template ) =>
-			DEFAULT_TEMPLATE_SLUGS.includes( template.slug ) &&
-			! existingTemplateSlugs.includes( template.slug )
-	);
-	const onClickMenuItem = ( _entityForSuggestions ) => {
-		onClick?.();
-		setEntityForSuggestions( _entityForSuggestions );
-	};
-	// We need to replace existing default template types with
-	// the create specific template functionality. The original
-	// info (title, description, etc.) is preserved in the
-	// used hooks.
-	const enhancedMissingDefaultTemplateTypes = [ ...missingDefaultTemplates ];
-	const { defaultTaxonomiesMenuItems, taxonomiesMenuItems } =
-		useTaxonomiesMenuItems( onClickMenuItem );
-	const { defaultPostTypesMenuItems, postTypesMenuItems } =
-		usePostTypeMenuItems( onClickMenuItem );
-
-	const authorMenuItem = useAuthorMenuItem( onClickMenuItem );
-	[
-		...defaultTaxonomiesMenuItems,
-		...defaultPostTypesMenuItems,
-		authorMenuItem,
-	].forEach( ( menuItem ) => {
-		if ( ! menuItem ) {
-			return;
-		}
-		const matchIndex = enhancedMissingDefaultTemplateTypes.findIndex(
-			( template ) => template.slug === menuItem.slug
-		);
-		// Some default template types might have been filtered above from
-		// `missingDefaultTemplates` because they only check for the general
-		// template. So here we either replace or append the item, augmented
-		// with the check if it has available specific item to create a
-		// template for.
-		if ( matchIndex > -1 ) {
-			enhancedMissingDefaultTemplateTypes[ matchIndex ] = menuItem;
-		} else {
-			enhancedMissingDefaultTemplateTypes.push( menuItem );
-		}
-	} );
-	// Update the sort order to match the DEFAULT_TEMPLATE_SLUGS order.
-	enhancedMissingDefaultTemplateTypes?.sort( ( template1, template2 ) => {
-		return (
-			DEFAULT_TEMPLATE_SLUGS.indexOf( template1.slug ) -
-			DEFAULT_TEMPLATE_SLUGS.indexOf( template2.slug )
-		);
-	} );
-	const missingTemplates = [
-		...enhancedMissingDefaultTemplateTypes,
-		...usePostTypeArchiveMenuItems(),
-		...postTypesMenuItems,
-		...taxonomiesMenuItems,
-	];
-	return missingTemplates;
-}
diff --git a/packages/edit-site/src/components/add-new-template/style.scss b/packages/edit-site/src/components/add-new-template/style.scss
index b1c2b669e24cef..a83754ce2e547a 100644
--- a/packages/edit-site/src/components/add-new-template/style.scss
+++ b/packages/edit-site/src/components/add-new-template/style.scss
@@ -21,25 +21,14 @@
 		}
 	}
 
-	.components-search-control {
-		input[type="search"].components-search-control__input {
-			background: $white;
-			border: 1px solid $gray-300;
-
-			&:focus {
-				border-color: var(--wp-admin-theme-color);
-				box-shadow: 0 0 0 1px var(--wp-admin-theme-color);
-			}
-		}
-	}
-
 	@include break-medium() {
 		width: 456px;
 	}
 
 	.edit-site-custom-template-modal__suggestions_list {
 		@include break-small() {
-			overflow: scroll;
+			max-height: $grid-unit-70 * 4; // Height of four buttons
+			overflow-y: auto;
 		}
 
 		&__list-item {
@@ -92,8 +81,8 @@
 }
 
 .edit-site-custom-template-modal__no-results {
-	border: 1px solid $gray-400;
-	border-radius: $radius-block-ui;
+	border: $border-width solid $gray-400;
+	border-radius: $radius-small;
 	padding: $grid-unit-20;
 }
 
@@ -107,36 +96,13 @@
 	}
 }
 
-.edit-site-template-actions-loading-screen-modal {
-	backdrop-filter: none;
-	background-color: transparent;
-
-	&.is-full-screen {
-		background-color: $white;
-		box-shadow: 0 0 0 transparent;
-		min-width: 100%;
-		min-height: 100%;
-	}
-
-	&__content {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 100%;
-		position: absolute;
-		left: 50%;
-		transform: translateX(-50%);
-	}
-}
-
 .edit-site-add-new-template__modal {
-	max-width: $grid-unit-80 * 13;
-	width: calc(100% - #{$grid-unit-80});
-	margin-top: $grid-unit-80;
-	max-height: calc(100% - #{$grid-unit-80 * 2});
 
 	@include break-large() {
+		max-width: $grid-unit-80 * 13;
+		margin-top: $grid-unit-80;
 		width: calc(100% - #{$grid-unit-80 * 2});
+		max-height: calc(100% - #{$grid-unit-80 * 2});
 	}
 
 	.edit-site-add-new-template__template-button,
@@ -166,7 +132,6 @@
 .edit-site-add-new-template__template-list__contents {
 	> .components-button {
 		padding: $grid-unit-40;
-		border-radius: $radius-block-ui;
 		display: flex;
 		flex-direction: column;
 		border: $border-width solid $gray-300;
@@ -208,8 +173,7 @@
 
 	.edit-site-add-new-template__custom-template-button,
 	.edit-site-add-new-template__template-list__prompt {
-		grid-column-start: 1;
-		grid-column-end: 4;
+		grid-column: 1 / -1;
 	}
 }
 
diff --git a/packages/edit-site/src/components/add-new-template/template-actions-loading-screen.js b/packages/edit-site/src/components/add-new-template/template-actions-loading-screen.js
deleted file mode 100644
index a57880d8551f7c..00000000000000
--- a/packages/edit-site/src/components/add-new-template/template-actions-loading-screen.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Spinner, Modal } from '@wordpress/components';
-
-export default function TemplateActionsLoadingScreen() {
-	const baseCssClass = 'edit-site-template-actions-loading-screen-modal';
-	return (
-		<Modal
-			isFullScreen
-			isDismissible={ false }
-			shouldCloseOnClickOutside={ false }
-			shouldCloseOnEsc={ false }
-			onRequestClose={ () => {} }
-			__experimentalHideHeader
-			className={ baseCssClass }
-		>
-			<div className={ `${ baseCssClass }__content` }>
-				<Spinner />
-			</div>
-		</Modal>
-	);
-}
diff --git a/packages/edit-site/src/components/add-new-template/utils.js b/packages/edit-site/src/components/add-new-template/utils.js
index f94c230196053a..a2644ec4ad4da9 100644
--- a/packages/edit-site/src/components/add-new-template/utils.js
+++ b/packages/edit-site/src/components/add-new-template/utils.js
@@ -14,6 +14,8 @@ import { blockMeta, post, archive } from '@wordpress/icons';
  */
 import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 
+const EMPTY_OBJECT = {};
+
 /**
  * @typedef IHasNameAndId
  * @property {string|number} id   The entity's id.
@@ -98,24 +100,6 @@ const usePublicTaxonomies = () => {
 	}, [ taxonomies ] );
 };
 
-function usePostTypeNeedsUniqueIdentifier( publicPostTypes ) {
-	const postTypeLabels = useMemo( () =>
-		publicPostTypes?.reduce( ( accumulator, { labels } ) => {
-			const singularName = labels.singular_name.toLowerCase();
-			accumulator[ singularName ] =
-				( accumulator[ singularName ] || 0 ) + 1;
-			return accumulator;
-		}, {} )
-	);
-	return useCallback(
-		( { labels, slug } ) => {
-			const singularName = labels.singular_name.toLowerCase();
-			return postTypeLabels[ singularName ] > 1 && singularName !== slug;
-		},
-		[ postTypeLabels ]
-	);
-}
-
 export function usePostTypeArchiveMenuItems() {
 	const publicPostTypes = usePublicPostTypes();
 	const postTypesWithArchives = useMemo(
@@ -123,8 +107,24 @@ export function usePostTypeArchiveMenuItems() {
 		[ publicPostTypes ]
 	);
 	const existingTemplates = useExistingTemplates();
-	const needsUniqueIdentifier = usePostTypeNeedsUniqueIdentifier(
-		postTypesWithArchives
+	// We need to keep track of naming conflicts. If a conflict
+	// occurs, we need to add slug.
+	const postTypeLabels = useMemo(
+		() =>
+			publicPostTypes?.reduce( ( accumulator, { labels } ) => {
+				const singularName = labels.singular_name.toLowerCase();
+				accumulator[ singularName ] =
+					( accumulator[ singularName ] || 0 ) + 1;
+				return accumulator;
+			}, {} ),
+		[ publicPostTypes ]
+	);
+	const needsUniqueIdentifier = useCallback(
+		( { labels, slug } ) => {
+			const singularName = labels.singular_name.toLowerCase();
+			return postTypeLabels[ singularName ] > 1 && singularName !== slug;
+		},
+		[ postTypeLabels ]
 	);
 	return useMemo(
 		() =>
@@ -166,9 +166,11 @@ export function usePostTypeArchiveMenuItems() {
 						// `icon` is the `menu_icon` property of a post type. We
 						// only handle `dashicons` for now, even if the `menu_icon`
 						// also supports urls and svg as values.
-						icon: postType.icon?.startsWith( 'dashicons-' )
-							? postType.icon.slice( 10 )
-							: archive,
+						icon:
+							typeof postType.icon === 'string' &&
+							postType.icon.startsWith( 'dashicons-' )
+								? postType.icon.slice( 10 )
+								: archive,
 						templatePrefix: 'archive',
 					};
 				} ) || [],
@@ -180,8 +182,30 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 	const publicPostTypes = usePublicPostTypes();
 	const existingTemplates = useExistingTemplates();
 	const defaultTemplateTypes = useDefaultTemplateTypes();
-	const needsUniqueIdentifier =
-		usePostTypeNeedsUniqueIdentifier( publicPostTypes );
+	// We need to keep track of naming conflicts. If a conflict
+	// occurs, we need to add slug.
+	const templateLabels = useMemo(
+		() =>
+			publicPostTypes?.reduce( ( accumulator, { labels } ) => {
+				const templateName = (
+					labels.template_name || labels.singular_name
+				).toLowerCase();
+				accumulator[ templateName ] =
+					( accumulator[ templateName ] || 0 ) + 1;
+				return accumulator;
+			}, {} ),
+		[ publicPostTypes ]
+	);
+	const needsUniqueIdentifier = useCallback(
+		( { labels, slug } ) => {
+			const templateName = (
+				labels.template_name || labels.singular_name
+			).toLowerCase();
+			return templateLabels[ templateName ] > 1 && templateName !== slug;
+		},
+		[ templateLabels ]
+	);
+
 	// `page`is a special case in template hierarchy.
 	const templatePrefixes = useMemo(
 		() =>
@@ -212,18 +236,27 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 			const hasGeneralTemplate =
 				existingTemplateSlugs?.includes( generalTemplateSlug );
 			const _needsUniqueIdentifier = needsUniqueIdentifier( postType );
-			let menuItemTitle = sprintf(
-				// translators: %s: Name of the post type e.g: "Post".
-				__( 'Single item: %s' ),
-				labels.singular_name
-			);
-			if ( _needsUniqueIdentifier ) {
-				menuItemTitle = sprintf(
-					// translators: %1s: Name of the post type e.g: "Post"; %2s: Slug of the post type e.g: "book".
-					__( 'Single item: %1$s (%2$s)' ),
-					labels.singular_name,
-					slug
+			let menuItemTitle =
+				labels.template_name ||
+				sprintf(
+					// translators: %s: Name of the post type e.g: "Post".
+					__( 'Single item: %s' ),
+					labels.singular_name
 				);
+			if ( _needsUniqueIdentifier ) {
+				menuItemTitle = labels.template_name
+					? sprintf(
+							// translators: %1s: Name of the template e.g: "Single Item: Post"; %2s: Slug of the post type e.g: "book".
+							__( '%1$s (%2$s)' ),
+							labels.template_name,
+							slug
+					  )
+					: sprintf(
+							// translators: %1s: Name of the post type e.g: "Post"; %2s: Slug of the post type e.g: "book".
+							__( 'Single item: %1$s (%2$s)' ),
+							labels.singular_name,
+							slug
+					  );
 			}
 			const menuItem = defaultTemplateType
 				? {
@@ -241,9 +274,11 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 						// `icon` is the `menu_icon` property of a post type. We
 						// only handle `dashicons` for now, even if the `menu_icon`
 						// also supports urls and svg as values.
-						icon: icon?.startsWith( 'dashicons-' )
-							? icon.slice( 10 )
-							: post,
+						icon:
+							typeof icon === 'string' &&
+							icon.startsWith( 'dashicons-' )
+								? icon.slice( 10 )
+								: post,
 						templatePrefix: templatePrefixes[ slug ],
 				  };
 			const hasEntities = postTypesInfo?.[ slug ]?.hasEntities;
@@ -333,9 +368,11 @@ export const useTaxonomiesMenuItems = ( onClickMenuItem ) => {
 	// occurs, we need to add slug.
 	const taxonomyLabels = publicTaxonomies?.reduce(
 		( accumulator, { labels } ) => {
-			const singularName = labels.singular_name.toLowerCase();
-			accumulator[ singularName ] =
-				( accumulator[ singularName ] || 0 ) + 1;
+			const templateName = (
+				labels.template_name || labels.singular_name
+			).toLowerCase();
+			accumulator[ templateName ] =
+				( accumulator[ templateName ] || 0 ) + 1;
 			return accumulator;
 		},
 		{}
@@ -344,8 +381,10 @@ export const useTaxonomiesMenuItems = ( onClickMenuItem ) => {
 		if ( [ 'category', 'post_tag' ].includes( slug ) ) {
 			return false;
 		}
-		const singularName = labels.singular_name.toLowerCase();
-		return taxonomyLabels[ singularName ] > 1 && singularName !== slug;
+		const templateName = (
+			labels.template_name || labels.singular_name
+		).toLowerCase();
+		return taxonomyLabels[ templateName ] > 1 && templateName !== slug;
 	};
 	const taxonomiesInfo = useEntitiesInfo( 'taxonomy', templatePrefixes );
 	const existingTemplateSlugs = ( existingTemplates || [] ).map(
@@ -367,14 +406,21 @@ export const useTaxonomiesMenuItems = ( onClickMenuItem ) => {
 				labels,
 				slug
 			);
-			let menuItemTitle = labels.singular_name;
+			let menuItemTitle = labels.template_name || labels.singular_name;
 			if ( _needsUniqueIdentifier ) {
-				menuItemTitle = sprintf(
-					// translators: %1s: Name of the taxonomy e.g: "Category"; %2s: Slug of the taxonomy e.g: "product_cat".
-					__( '%1$s (%2$s)' ),
-					labels.singular_name,
-					slug
-				);
+				menuItemTitle = labels.template_name
+					? sprintf(
+							// translators: %1s: Name of the template e.g: "Products by Category"; %2s: Slug of the taxonomy e.g: "product_cat".
+							__( '%1$s (%2$s)' ),
+							labels.template_name,
+							slug
+					  )
+					: sprintf(
+							// translators: %1s: Name of the taxonomy e.g: "Category"; %2s: Slug of the taxonomy e.g: "product_cat".
+							__( '%1$s (%2$s)' ),
+							labels.singular_name,
+							slug
+					  );
 			}
 			const menuItem = defaultTemplateType
 				? {
@@ -622,14 +668,14 @@ const useTemplatesToExclude = (
 const useEntitiesInfo = (
 	entityName,
 	templatePrefixes,
-	additionalQueryParameters = {}
+	additionalQueryParameters = EMPTY_OBJECT
 ) => {
 	const recordsToExcludePerEntity = useTemplatesToExclude(
 		entityName,
 		templatePrefixes,
 		additionalQueryParameters
 	);
-	const entitiesInfo = useSelect(
+	const entitiesHasRecords = useSelect(
 		( select ) => {
 			return Object.keys( templatePrefixes || {} ).reduce(
 				( accumulator, slug ) => {
@@ -637,26 +683,42 @@ const useEntitiesInfo = (
 						recordsToExcludePerEntity?.[ slug ]?.map(
 							( { id } ) => id
 						) || [];
-					accumulator[ slug ] = {
-						hasEntities: !! select( coreStore ).getEntityRecords(
-							entityName,
-							slug,
-							{
-								per_page: 1,
-								_fields: 'id',
-								context: 'view',
-								exclude: existingEntitiesIds,
-								...additionalQueryParameters[ slug ],
-							}
-						)?.length,
-						existingEntitiesIds,
-					};
+					accumulator[ slug ] = !! select(
+						coreStore
+					).getEntityRecords( entityName, slug, {
+						per_page: 1,
+						_fields: 'id',
+						context: 'view',
+						exclude: existingEntitiesIds,
+						...additionalQueryParameters[ slug ],
+					} )?.length;
 					return accumulator;
 				},
 				{}
 			);
 		},
-		[ templatePrefixes, recordsToExcludePerEntity ]
+		[
+			templatePrefixes,
+			recordsToExcludePerEntity,
+			entityName,
+			additionalQueryParameters,
+		]
 	);
+	const entitiesInfo = useMemo( () => {
+		return Object.keys( templatePrefixes || {} ).reduce(
+			( accumulator, slug ) => {
+				const existingEntitiesIds =
+					recordsToExcludePerEntity?.[ slug ]?.map(
+						( { id } ) => id
+					) || [];
+				accumulator[ slug ] = {
+					hasEntities: entitiesHasRecords[ slug ],
+					existingEntitiesIds,
+				};
+				return accumulator;
+			},
+			{}
+		);
+	}, [ templatePrefixes, recordsToExcludePerEntity, entitiesHasRecords ] );
 	return entitiesInfo;
 };
diff --git a/packages/edit-site/src/components/app/index.js b/packages/edit-site/src/components/app/index.js
index cad76b3ea1fb83..133a376c9c246d 100644
--- a/packages/edit-site/src/components/app/index.js
+++ b/packages/edit-site/src/components/app/index.js
@@ -2,7 +2,10 @@
  * WordPress dependencies
  */
 import { SlotFillProvider } from '@wordpress/components';
-import { UnsavedChangesWarning } from '@wordpress/editor';
+import {
+	UnsavedChangesWarning,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 import { store as noticesStore } from '@wordpress/notices';
 import { useDispatch } from '@wordpress/data';
 import { __, sprintf } from '@wordpress/i18n';
@@ -13,10 +16,28 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
  * Internal dependencies
  */
 import Layout from '../layout';
-import { GlobalStylesProvider } from '../global-styles/global-styles-provider';
 import { unlock } from '../../lock-unlock';
+import { useCommonCommands } from '../../hooks/commands/use-common-commands';
+import { useEditModeCommands } from '../../hooks/commands/use-edit-mode-commands';
+import useInitEditedEntityFromURL from '../sync-state-with-url/use-init-edited-entity-from-url';
+import useActiveRoute from '../layout/router';
+import useSetCommandContext from '../../hooks/commands/use-set-command-context';
+import { useRegisterSiteEditorRoutes } from '../site-editor-routes';
 
 const { RouterProvider } = unlock( routerPrivateApis );
+const { GlobalStylesProvider } = unlock( editorPrivateApis );
+
+function AppLayout() {
+	// This ensures the edited entity id and type are initialized properly.
+	useInitEditedEntityFromURL();
+	useEditModeCommands();
+	useCommonCommands();
+	useSetCommandContext();
+	useRegisterSiteEditorRoutes();
+	const route = useActiveRoute();
+
+	return <Layout route={ route } />;
+}
 
 export default function App() {
 	const { createErrorNotice } = useDispatch( noticesStore );
@@ -38,7 +59,7 @@ export default function App() {
 			<GlobalStylesProvider>
 				<UnsavedChangesWarning />
 				<RouterProvider>
-					<Layout />
+					<AppLayout />
 					<PluginArea onError={ onPluginAreaError } />
 				</RouterProvider>
 			</GlobalStylesProvider>
diff --git a/packages/edit-site/src/components/async/index.js b/packages/edit-site/src/components/async/index.js
new file mode 100644
index 00000000000000..ecbc9618f93ba2
--- /dev/null
+++ b/packages/edit-site/src/components/async/index.js
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect, useState, flushSync } from '@wordpress/element';
+import { createQueue } from '@wordpress/priority-queue';
+
+const blockPreviewQueue = createQueue();
+
+/**
+ * Renders a component at the next idle time.
+ * @param {*} props
+ */
+export function Async( { children, placeholder } ) {
+	const [ shouldRender, setShouldRender ] = useState( false );
+
+	// In the future, we could try to use startTransition here, but currently
+	// react will batch all transitions, which means all previews will be
+	// rendered at the same time.
+	// https://react.dev/reference/react/startTransition#caveats
+	// > If there are multiple ongoing Transitions, React currently batches them
+	// > together. This is a limitation that will likely be removed in a future
+	// > release.
+
+	useEffect( () => {
+		const context = {};
+		blockPreviewQueue.add( context, () => {
+			// Synchronously run all renders so it consumes timeRemaining.
+			// See https://github.com/WordPress/gutenberg/pull/48238
+			flushSync( () => {
+				setShouldRender( true );
+			} );
+		} );
+		return () => {
+			blockPreviewQueue.cancel( context );
+		};
+	}, [] );
+
+	if ( ! shouldRender ) {
+		return placeholder;
+	}
+
+	return children;
+}
diff --git a/packages/edit-site/src/components/block-editor/back-button.js b/packages/edit-site/src/components/block-editor/back-button.js
deleted file mode 100644
index 924dedd4f853e1..00000000000000
--- a/packages/edit-site/src/components/block-editor/back-button.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Button } from '@wordpress/components';
-import { arrowLeft } from '@wordpress/icons';
-import { __ } from '@wordpress/i18n';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import {
-	TEMPLATE_PART_POST_TYPE,
-	NAVIGATION_POST_TYPE,
-} from '../../utils/constants';
-import { unlock } from '../../lock-unlock';
-
-const { useLocation, useHistory } = unlock( routerPrivateApis );
-
-function BackButton() {
-	const location = useLocation();
-	const history = useHistory();
-	const isTemplatePart = location.params.postType === TEMPLATE_PART_POST_TYPE;
-	const isNavigationMenu = location.params.postType === NAVIGATION_POST_TYPE;
-	const previousTemplateId = location.state?.fromTemplateId;
-
-	const isFocusMode = isTemplatePart || isNavigationMenu;
-
-	if ( ! isFocusMode || ! previousTemplateId ) {
-		return null;
-	}
-
-	return (
-		<Button
-			className="edit-site-visual-editor__back-button"
-			icon={ arrowLeft }
-			onClick={ () => {
-				history.back();
-			} }
-		>
-			{ __( 'Back' ) }
-		</Button>
-	);
-}
-
-export default BackButton;
diff --git a/packages/edit-site/src/components/block-editor/block-inspector-button.js b/packages/edit-site/src/components/block-editor/block-inspector-button.js
deleted file mode 100644
index 758ca50272adeb..00000000000000
--- a/packages/edit-site/src/components/block-editor/block-inspector-button.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { speak } from '@wordpress/a11y';
-import { MenuItem } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as interfaceStore } from '@wordpress/interface';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-import { STORE_NAME } from '../../store/constants';
-import { SIDEBAR_BLOCK } from '../sidebar-edit-mode/constants';
-
-export default function BlockInspectorButton( { onClick = () => {} } ) {
-	const { shortcut, isBlockInspectorOpen } = useSelect(
-		( select ) => ( {
-			shortcut: select(
-				keyboardShortcutsStore
-			).getShortcutRepresentation(
-				'core/edit-site/toggle-block-settings-sidebar'
-			),
-			isBlockInspectorOpen:
-				select( interfaceStore ).getActiveComplementaryArea(
-					editSiteStore.name
-				) === SIDEBAR_BLOCK,
-		} ),
-		[]
-	);
-	const { enableComplementaryArea, disableComplementaryArea } =
-		useDispatch( interfaceStore );
-
-	const label = isBlockInspectorOpen
-		? __( 'Hide more settings' )
-		: __( 'Show more settings' );
-
-	return (
-		<MenuItem
-			onClick={ () => {
-				if ( isBlockInspectorOpen ) {
-					disableComplementaryArea( STORE_NAME );
-					speak( __( 'Block settings closed' ) );
-				} else {
-					enableComplementaryArea( STORE_NAME, SIDEBAR_BLOCK );
-					speak(
-						__(
-							'Additional settings are now available in the Editor block settings sidebar'
-						)
-					);
-				}
-				// Close dropdown menu.
-				onClick();
-			} }
-			shortcut={ shortcut }
-		>
-			{ label }
-		</MenuItem>
-	);
-}
diff --git a/packages/edit-site/src/components/block-editor/editor-canvas.js b/packages/edit-site/src/components/block-editor/editor-canvas.js
deleted file mode 100644
index 15d638aa329e12..00000000000000
--- a/packages/edit-site/src/components/block-editor/editor-canvas.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalUseResizeCanvas as useResizeCanvas,
-	privateApis as blockEditorPrivateApis,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { ENTER, SPACE } from '@wordpress/keycodes';
-import { useState, useEffect } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { privateApis as editorPrivateApis } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-import { store as editSiteStore } from '../../store';
-import {
-	FOCUSABLE_ENTITIES,
-	NAVIGATION_POST_TYPE,
-} from '../../utils/constants';
-
-const { ExperimentalBlockCanvas: BlockCanvas } = unlock(
-	blockEditorPrivateApis
-);
-const { EditorCanvas: EditorCanvasRoot } = unlock( editorPrivateApis );
-
-function EditorCanvas( {
-	enableResizing,
-	settings,
-	children,
-	contentRef,
-	...props
-} ) {
-	const {
-		hasBlocks,
-		isFocusMode,
-		templateType,
-		canvasMode,
-		deviceType,
-		isZoomOutMode,
-	} = useSelect( ( select ) => {
-		const { getBlockCount, __unstableGetEditorMode } =
-			select( blockEditorStore );
-		const {
-			getEditedPostType,
-			__experimentalGetPreviewDeviceType,
-			getCanvasMode,
-		} = unlock( select( editSiteStore ) );
-		const _templateType = getEditedPostType();
-
-		return {
-			templateType: _templateType,
-			isFocusMode: FOCUSABLE_ENTITIES.includes( _templateType ),
-			deviceType: __experimentalGetPreviewDeviceType(),
-			isZoomOutMode: __unstableGetEditorMode() === 'zoom-out',
-			canvasMode: getCanvasMode(),
-			hasBlocks: !! getBlockCount(),
-		};
-	}, [] );
-	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
-	const deviceStyles = useResizeCanvas( deviceType );
-	const [ isFocused, setIsFocused ] = useState( false );
-
-	useEffect( () => {
-		if ( canvasMode === 'edit' ) {
-			setIsFocused( false );
-		}
-	}, [ canvasMode ] );
-
-	const viewModeProps = {
-		'aria-label': __( 'Editor Canvas' ),
-		role: 'button',
-		tabIndex: 0,
-		onFocus: () => setIsFocused( true ),
-		onBlur: () => setIsFocused( false ),
-		onKeyDown: ( event ) => {
-			const { keyCode } = event;
-			if ( keyCode === ENTER || keyCode === SPACE ) {
-				event.preventDefault();
-				setCanvasMode( 'edit' );
-			}
-		},
-		onClick: () => setCanvasMode( 'edit' ),
-		readonly: true,
-	};
-	const isTemplateTypeNavigation = templateType === NAVIGATION_POST_TYPE;
-	const isNavigationFocusMode = isTemplateTypeNavigation && isFocusMode;
-	// Hide the appender when:
-	// - In navigation focus mode (should only allow the root Nav block).
-	// - In view mode (i.e. not editing).
-	const showBlockAppender =
-		( isNavigationFocusMode && hasBlocks ) || canvasMode === 'view'
-			? false
-			: undefined;
-
-	return (
-		<BlockCanvas
-			height="100%"
-			iframeProps={ {
-				expand: isZoomOutMode,
-				scale: isZoomOutMode ? 0.45 : undefined,
-				frameSize: isZoomOutMode ? 100 : undefined,
-				style: enableResizing ? {} : deviceStyles,
-				className: classnames(
-					'edit-site-visual-editor__editor-canvas',
-					{
-						'is-focused': isFocused && canvasMode === 'view',
-					}
-				),
-				...props,
-				...( canvasMode === 'view' ? viewModeProps : {} ),
-			} }
-			styles={ settings.styles }
-			contentRef={ contentRef }
-		>
-			<style>{
-				// Forming a "block formatting context" to prevent margin collapsing.
-				// @see https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
-				`.is-root-container{display:flow-root;${
-					// Some themes will have `min-height: 100vh` for the root container,
-					// which isn't a requirement in auto resize mode.
-					enableResizing ? 'min-height:0!important;' : ''
-				}}body{position:relative; ${
-					canvasMode === 'view'
-						? 'cursor: pointer; min-height: 100vh;'
-						: ''
-				}}}`
-			}</style>
-			<EditorCanvasRoot
-				dropZoneElement={ contentRef.current?.parentNode }
-				className={ classnames( 'edit-site-editor-canvas__block-list', {
-					'is-navigation-block': isTemplateTypeNavigation,
-				} ) }
-				renderAppender={ showBlockAppender }
-			/>
-			{ children }
-		</BlockCanvas>
-	);
-}
-
-export default EditorCanvas;
diff --git a/packages/edit-site/src/components/block-editor/inserter-media-categories.js b/packages/edit-site/src/components/block-editor/inserter-media-categories.js
deleted file mode 100644
index af591d1fa24688..00000000000000
--- a/packages/edit-site/src/components/block-editor/inserter-media-categories.js
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * The `edit-site` settings here need to be in sync with the corresponding ones in `site-editor` package.
- * See `packages/edit-site/src/components/block-editor/inserter-media-categories.js`.
- *
- * In the future we could consider creating an Openvese package that can be used in both `editor` and `site-editor`.
- * The rest of the settings would still need to be in sync though.
- */
-
-/**
- * WordPress dependencies
- */
-import { __, sprintf, _x } from '@wordpress/i18n';
-import { resolveSelect } from '@wordpress/data';
-import { decodeEntities } from '@wordpress/html-entities';
-
-/**
- * Internal dependencies
- */
-import { store as coreStore } from '@wordpress/core-data';
-
-/** @typedef {import('@wordpress/block-editor').InserterMediaRequest} InserterMediaRequest */
-/** @typedef {import('@wordpress/block-editor').InserterMediaItem} InserterMediaItem */
-/** @typedef {import('@wordpress/block-editor').InserterMediaCategory} InserterMediaCategory */
-
-const getExternalLink = ( url, text ) =>
-	`<a ${ getExternalLinkAttributes( url ) }>${ text }</a>`;
-
-const getExternalLinkAttributes = ( url ) =>
-	`href="${ url }" target="_blank" rel="noreferrer noopener"`;
-
-const getOpenverseLicense = ( license, licenseVersion ) => {
-	let licenseName = license.trim();
-	// PDM has no abbreviation
-	if ( license !== 'pdm' ) {
-		licenseName = license.toUpperCase().replace( 'SAMPLING', 'Sampling' );
-	}
-	// If version is known, append version to the name.
-	// The license has to have a version to be valid. Only
-	// PDM (public domain mark) doesn't have a version.
-	if ( licenseVersion ) {
-		licenseName += ` ${ licenseVersion }`;
-	}
-	// For licenses other than public-domain marks, prepend 'CC' to the name.
-	if ( ! [ 'pdm', 'cc0' ].includes( license ) ) {
-		licenseName = `CC ${ licenseName }`;
-	}
-	return licenseName;
-};
-
-const getOpenverseCaption = ( item ) => {
-	const {
-		title,
-		foreign_landing_url: foreignLandingUrl,
-		creator,
-		creator_url: creatorUrl,
-		license,
-		license_version: licenseVersion,
-		license_url: licenseUrl,
-	} = item;
-	const fullLicense = getOpenverseLicense( license, licenseVersion );
-	const _creator = decodeEntities( creator );
-	let _caption;
-	if ( _creator ) {
-		_caption = title
-			? sprintf(
-					// translators: %1s: Title of a media work from Openverse; %2s: Name of the work's creator; %3s: Work's licence e.g: "CC0 1.0".
-					_x( '"%1$s" by %2$s/ %3$s', 'caption' ),
-					getExternalLink(
-						foreignLandingUrl,
-						decodeEntities( title )
-					),
-					creatorUrl
-						? getExternalLink( creatorUrl, _creator )
-						: _creator,
-					licenseUrl
-						? getExternalLink(
-								`${ licenseUrl }?ref=openverse`,
-								fullLicense
-						  )
-						: fullLicense
-			  )
-			: sprintf(
-					// translators: %1s: Link attributes for a given Openverse media work; %2s: Name of the work's creator; %3s: Works's licence e.g: "CC0 1.0".
-					_x( '<a %1$s>Work</a> by %2$s/ %3$s', 'caption' ),
-					getExternalLinkAttributes( foreignLandingUrl ),
-					creatorUrl
-						? getExternalLink( creatorUrl, _creator )
-						: _creator,
-					licenseUrl
-						? getExternalLink(
-								`${ licenseUrl }?ref=openverse`,
-								fullLicense
-						  )
-						: fullLicense
-			  );
-	} else {
-		_caption = title
-			? sprintf(
-					// translators: %1s: Title of a media work from Openverse; %2s: Work's licence e.g: "CC0 1.0".
-					_x( '"%1$s"/ %2$s', 'caption' ),
-					getExternalLink(
-						foreignLandingUrl,
-						decodeEntities( title )
-					),
-					licenseUrl
-						? getExternalLink(
-								`${ licenseUrl }?ref=openverse`,
-								fullLicense
-						  )
-						: fullLicense
-			  )
-			: sprintf(
-					// translators: %1s: Link attributes for a given Openverse media work; %2s: Works's licence e.g: "CC0 1.0".
-					_x( '<a %1$s>Work</a>/ %3$s', 'caption' ),
-					getExternalLinkAttributes( foreignLandingUrl ),
-					licenseUrl
-						? getExternalLink(
-								`${ licenseUrl }?ref=openverse`,
-								fullLicense
-						  )
-						: fullLicense
-			  );
-	}
-	return _caption.replace( /\s{2}/g, ' ' );
-};
-
-const coreMediaFetch = async ( query = {} ) => {
-	const mediaItems = await resolveSelect( coreStore ).getMediaItems( {
-		...query,
-		orderBy: !! query?.search ? 'relevance' : 'date',
-	} );
-	return mediaItems.map( ( mediaItem ) => ( {
-		...mediaItem,
-		alt: mediaItem.alt_text,
-		url: mediaItem.source_url,
-		previewUrl: mediaItem.media_details?.sizes?.medium?.source_url,
-		caption: mediaItem.caption?.raw,
-	} ) );
-};
-
-/** @type {InserterMediaCategory[]} */
-const inserterMediaCategories = [
-	{
-		name: 'images',
-		labels: {
-			name: __( 'Images' ),
-			search_items: __( 'Search images' ),
-		},
-		mediaType: 'image',
-		async fetch( query = {} ) {
-			return coreMediaFetch( { ...query, media_type: 'image' } );
-		},
-	},
-	{
-		name: 'videos',
-		labels: {
-			name: __( 'Videos' ),
-			search_items: __( 'Search videos' ),
-		},
-		mediaType: 'video',
-		async fetch( query = {} ) {
-			return coreMediaFetch( { ...query, media_type: 'video' } );
-		},
-	},
-	{
-		name: 'audio',
-		labels: {
-			name: __( 'Audio' ),
-			search_items: __( 'Search audio' ),
-		},
-		mediaType: 'audio',
-		async fetch( query = {} ) {
-			return coreMediaFetch( { ...query, media_type: 'audio' } );
-		},
-	},
-	{
-		name: 'openverse',
-		labels: {
-			name: __( 'Openverse' ),
-			search_items: __( 'Search Openverse' ),
-		},
-		mediaType: 'image',
-		async fetch( query = {} ) {
-			const defaultArgs = {
-				mature: false,
-				excluded_source: 'flickr,inaturalist,wikimedia',
-				license: 'pdm,cc0',
-			};
-			const finalQuery = { ...query, ...defaultArgs };
-			const mapFromInserterMediaRequest = {
-				per_page: 'page_size',
-				search: 'q',
-			};
-			const url = new URL(
-				'https://api.openverse.engineering/v1/images/'
-			);
-			Object.entries( finalQuery ).forEach( ( [ key, value ] ) => {
-				const queryKey = mapFromInserterMediaRequest[ key ] || key;
-				url.searchParams.set( queryKey, value );
-			} );
-			const response = await window.fetch( url, {
-				headers: {
-					'User-Agent': 'WordPress/inserter-media-fetch',
-				},
-			} );
-			const jsonResponse = await response.json();
-			const results = jsonResponse.results;
-			return results.map( ( result ) => ( {
-				...result,
-				// This is a temp solution for better titles, until Openverse API
-				// completes the cleaning up of some titles of their upstream data.
-				title: result.title?.toLowerCase().startsWith( 'file:' )
-					? result.title.slice( 5 )
-					: result.title,
-				sourceId: result.id,
-				id: undefined,
-				caption: getOpenverseCaption( result ),
-				previewUrl: result.thumbnail,
-			} ) );
-		},
-		getReportUrl: ( { sourceId } ) =>
-			`https://wordpress.org/openverse/image/${ sourceId }/report/`,
-		isExternalResource: true,
-	},
-];
-
-export default inserterMediaCategories;
diff --git a/packages/edit-site/src/components/block-editor/resizable-editor.js b/packages/edit-site/src/components/block-editor/resizable-editor.js
deleted file mode 100644
index 20fdd972528439..00000000000000
--- a/packages/edit-site/src/components/block-editor/resizable-editor.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useState, useRef, useCallback } from '@wordpress/element';
-import { ResizableBox } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import ResizeHandle from './resize-handle';
-
-// Removes the inline styles in the drag handles.
-const HANDLE_STYLES_OVERRIDE = {
-	position: undefined,
-	userSelect: undefined,
-	cursor: undefined,
-	width: undefined,
-	height: undefined,
-	top: undefined,
-	right: undefined,
-	bottom: undefined,
-	left: undefined,
-};
-
-function ResizableEditor( { enableResizing, height, children } ) {
-	const [ width, setWidth ] = useState( '100%' );
-	const resizableRef = useRef();
-	const resizeWidthBy = useCallback( ( deltaPixels ) => {
-		if ( resizableRef.current ) {
-			setWidth( resizableRef.current.offsetWidth + deltaPixels );
-		}
-	}, [] );
-	return (
-		<ResizableBox
-			ref={ ( api ) => {
-				resizableRef.current = api?.resizable;
-			} }
-			size={ {
-				width: enableResizing ? width : '100%',
-				height: enableResizing && height ? height : '100%',
-			} }
-			onResizeStop={ ( event, direction, element ) => {
-				setWidth( element.style.width );
-			} }
-			minWidth={ 300 }
-			maxWidth="100%"
-			maxHeight="100%"
-			enable={ {
-				right: enableResizing,
-				left: enableResizing,
-			} }
-			showHandle={ enableResizing }
-			// The editor is centered horizontally, resizing it only
-			// moves half the distance. Hence double the ratio to correctly
-			// align the cursor to the resizer handle.
-			resizeRatio={ 2 }
-			handleComponent={ {
-				left: (
-					<ResizeHandle
-						direction="left"
-						resizeWidthBy={ resizeWidthBy }
-					/>
-				),
-				right: (
-					<ResizeHandle
-						direction="right"
-						resizeWidthBy={ resizeWidthBy }
-					/>
-				),
-			} }
-			handleClasses={ undefined }
-			handleStyles={ {
-				left: HANDLE_STYLES_OVERRIDE,
-				right: HANDLE_STYLES_OVERRIDE,
-			} }
-		>
-			{ children }
-		</ResizableBox>
-	);
-}
-
-export default ResizableEditor;
diff --git a/packages/edit-site/src/components/block-editor/resize-handle.js b/packages/edit-site/src/components/block-editor/resize-handle.js
deleted file mode 100644
index 0e9fae084ec890..00000000000000
--- a/packages/edit-site/src/components/block-editor/resize-handle.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { LEFT, RIGHT } from '@wordpress/keycodes';
-import { VisuallyHidden } from '@wordpress/components';
-
-const DELTA_DISTANCE = 20; // The distance to resize per keydown in pixels.
-
-export default function ResizeHandle( {
-	variation = 'default',
-	direction,
-	resizeWidthBy,
-} ) {
-	function handleKeyDown( event ) {
-		const { keyCode } = event;
-
-		if (
-			( direction === 'left' && keyCode === LEFT ) ||
-			( direction === 'right' && keyCode === RIGHT )
-		) {
-			resizeWidthBy( DELTA_DISTANCE );
-		} else if (
-			( direction === 'left' && keyCode === RIGHT ) ||
-			( direction === 'right' && keyCode === LEFT )
-		) {
-			resizeWidthBy( -DELTA_DISTANCE );
-		}
-	}
-
-	return (
-		<>
-			<button
-				className={ `resizable-editor__drag-handle is-${ direction } is-variation-${ variation }` }
-				aria-label={ __( 'Drag to resize' ) }
-				aria-describedby={ `resizable-editor__resize-help-${ direction }` }
-				onKeyDown={ handleKeyDown }
-				type="button"
-			/>
-			<VisuallyHidden
-				id={ `resizable-editor__resize-help-${ direction }` }
-			>
-				{ __( 'Use left and right arrow keys to resize the canvas.' ) }
-			</VisuallyHidden>
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/block-editor/site-editor-canvas.js b/packages/edit-site/src/components/block-editor/site-editor-canvas.js
deleted file mode 100644
index bfbb2d3eac43ff..00000000000000
--- a/packages/edit-site/src/components/block-editor/site-editor-canvas.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useRef } from '@wordpress/element';
-import { BlockTools, store as blockEditorStore } from '@wordpress/block-editor';
-import { useViewportMatch, useResizeObserver } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import BackButton from './back-button';
-import ResizableEditor from './resizable-editor';
-import EditorCanvas from './editor-canvas';
-import EditorCanvasContainer from '../editor-canvas-container';
-import useSiteEditorSettings from './use-site-editor-settings';
-import { store as editSiteStore } from '../../store';
-import {
-	FOCUSABLE_ENTITIES,
-	NAVIGATION_POST_TYPE,
-} from '../../utils/constants';
-import { unlock } from '../../lock-unlock';
-import PageContentFocusNotifications from '../page-content-focus-notifications';
-
-export default function SiteEditorCanvas() {
-	const { clearSelectedBlock } = useDispatch( blockEditorStore );
-
-	const { templateType, isFocusMode, isViewMode } = useSelect( ( select ) => {
-		const { getEditedPostType, getCanvasMode } = unlock(
-			select( editSiteStore )
-		);
-
-		const _templateType = getEditedPostType();
-
-		return {
-			templateType: _templateType,
-			isFocusMode: FOCUSABLE_ENTITIES.includes( _templateType ),
-			isViewMode: getCanvasMode() === 'view',
-		};
-	}, [] );
-
-	const [ resizeObserver, sizes ] = useResizeObserver();
-
-	const settings = useSiteEditorSettings();
-
-	const isMobileViewport = useViewportMatch( 'small', '<' );
-	const enableResizing =
-		isFocusMode &&
-		! isViewMode &&
-		// Disable resizing in mobile viewport.
-		! isMobileViewport;
-
-	const contentRef = useRef();
-	const isTemplateTypeNavigation = templateType === NAVIGATION_POST_TYPE;
-	const isNavigationFocusMode = isTemplateTypeNavigation && isFocusMode;
-	const forceFullHeight = isNavigationFocusMode;
-
-	return (
-		<>
-			<EditorCanvasContainer.Slot>
-				{ ( [ editorCanvasView ] ) =>
-					editorCanvasView ? (
-						<div className="edit-site-visual-editor is-focus-mode">
-							{ editorCanvasView }
-						</div>
-					) : (
-						<BlockTools
-							className={ classnames( 'edit-site-visual-editor', {
-								'is-focus-mode':
-									isFocusMode || !! editorCanvasView,
-								'is-view-mode': isViewMode,
-							} ) }
-							__unstableContentRef={ contentRef }
-							onClick={ ( event ) => {
-								// Clear selected block when clicking on the gray background.
-								if ( event.target === event.currentTarget ) {
-									clearSelectedBlock();
-								}
-							} }
-						>
-							<BackButton />
-							<ResizableEditor
-								enableResizing={ enableResizing }
-								height={
-									sizes.height && ! forceFullHeight
-										? sizes.height
-										: '100%'
-								}
-							>
-								<EditorCanvas
-									enableResizing={ enableResizing }
-									settings={ settings }
-									contentRef={ contentRef }
-								>
-									{ resizeObserver }
-								</EditorCanvas>
-							</ResizableEditor>
-						</BlockTools>
-					)
-				}
-			</EditorCanvasContainer.Slot>
-			<PageContentFocusNotifications contentRef={ contentRef } />
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/block-editor/style.scss b/packages/edit-site/src/components/block-editor/style.scss
index e02240eb880992..3849eed24a4ea3 100644
--- a/packages/edit-site/src/components/block-editor/style.scss
+++ b/packages/edit-site/src/components/block-editor/style.scss
@@ -1,179 +1,6 @@
-// The button element easily inherits styles that are meant for the editor style.
-// These rules enhance the specificity to reduce that inheritance.
-// This is duplicated in visual-editor.
-.edit-site-block-editor__editor-styles-wrapper  .components-button {
-	font-family: $default-font;
-	font-size: $default-font-size;
-	padding: 6px 12px;
-
-	&.is-tertiary,
-	&.has-icon {
-		padding: 6px;
-	}
-}
-
-// Navigation focus mode requires padding around the root Navigation block
-// for presentational purposes.
-.edit-site-editor-canvas__block-list.is-navigation-block {
-	padding: $grid-unit-30;
-}
-
-.edit-site-visual-editor {
-	position: relative;
-	height: 100%;
-	display: block;
-	overflow: hidden;
-	background-color: $gray-900;
-	// Centralize the editor horizontally (flex-direction is column).
-	align-items: center;
-
-	iframe {
-		display: block;
-		width: 100%;
-		height: 100%;
-		background: $white;
-	}
-
-	.edit-site-visual-editor__editor-canvas {
-		height: 100%;
-
-		&.is-focused {
-			outline: calc(2 * var(--wp-admin-border-width-focus)) solid var(--wp-admin-theme-color);
-			outline-offset: calc(-2 * var(--wp-admin-border-width-focus));
-		}
-	}
-
-
-	&.is-focus-mode {
-		.edit-site-layout.is-full-canvas & {
-			padding: $grid-unit-60;
-		}
-
-		.edit-site-visual-editor__editor-canvas {
-			border-radius: $radius-block-ui;
-			max-height: 100%;
-		}
-
-		// To hide the horizontal scrollbar and show the drag handle on the
-		// left and right of the container.
-		.components-resizable-box__container {
-			overflow: visible;
-		}
-	}
-
-	.components-resizable-box__container {
-		margin: 0 auto;
-		// Removing this will cancel the bottom margins in the iframe.
-		overflow: auto;
-	}
-
-	&.is-view-mode {
-		box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.8), 0 8px 10px -6px rgba(0, 0, 0, 0.8);
-
-		/*
-			Temporary to hide the contextual toolbar in view mode.
-			See: https://github.com/WordPress/gutenberg/pull/46298
-			This rule can possibly be removed once the
-			contextual toolbar has been redesigned.
-			See: https://github.com/WordPress/gutenberg/issues/40450
-		*/
-		.block-editor-block-contextual-toolbar.is-fixed {
-			display: none;
-		}
-	}
-}
-
-.edit-site-visual-editor__back-button {
-	position: absolute;
-	top: $grid-unit-10;
-	left: $grid-unit-10;
-	color: $white;
-
-	&:active:not([aria-disabled="true"]),
-	&:focus:not([aria-disabled="true"]),
-	&:hover {
-		color: $gray-100;
-	}
-}
-
-// The toolbar header in distraction mode sits over the back button, which renders it unreachable.
-.is-distraction-free .edit-site-visual-editor__back-button {
-	display: none;
-}
-
-.resizable-editor__drag-handle {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	padding: 0;
-	margin: auto 0;
-	width: $grid-unit-15;
-	appearance: none;
-	cursor: ew-resize;
-	outline: none;
-	background: none;
-	border-radius: $radius-block-ui;
-	border: 0;
-
-	&.is-variation-default {
-		height: 100px;
-	}
-
-	&.is-variation-separator {
-		height: 100%;
-		width: $grid-unit-30;
-		right: 0;
-
-		&::after {
-			width: 2px;
-			border-radius: 0;
-			background: transparent;
-			left: 50%;
-			transform: translateX(-1px);
-			right: 0;
-			transition: all ease 0.2s;
-			transition-delay: 0.1s;
-			@include reduce-motion;
-		}
-	}
-
-	&::after {
-		position: absolute;
-		top: $grid-unit-30;
-		left: $grid-unit-05;
-		right: 0;
-		bottom: $grid-unit-30;
-		content: "";
-		width: $grid-unit-05;
-		background: $gray-600;
-		border-radius: $radius-block-ui;
-	}
-
-	&.is-left {
-		left: -$grid-unit-20;
-	}
-
-	&.is-right {
-		right: -$grid-unit-20;
-	}
-
-	&:hover,
-	&:active {
-		opacity: 1;
-		&.is-variation-default::after {
-			background: $gray-400;
-		}
-		&.is-variation-separator::after {
-			background: var(--wp-admin-theme-color);
-		}
-	}
-
-	&:focus::after {
-		box-shadow: 0 0 0 1px $gray-800, 0 0 0 calc(var(--wp-admin-border-width-focus) + 1px) var(--wp-admin-theme-color);
-	}
-
-	&.is-variation-separator:focus::after {
-		border-radius: $radius-block-ui;
-		box-shadow: inset 0 0 0 2px var(--wp-admin-theme-color);
+.edit-site-visual-editor__editor-canvas {
+	&.is-focused {
+		outline: calc(2 * var(--wp-admin-border-width-focus)) solid var(--wp-admin-theme-color);
+		outline-offset: calc(-2 * var(--wp-admin-border-width-focus));
 	}
 }
diff --git a/packages/edit-site/src/components/block-editor/use-editor-iframe-props.js b/packages/edit-site/src/components/block-editor/use-editor-iframe-props.js
new file mode 100644
index 00000000000000..46719a00c16aad
--- /dev/null
+++ b/packages/edit-site/src/components/block-editor/use-editor-iframe-props.js
@@ -0,0 +1,83 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { ENTER, SPACE } from '@wordpress/keycodes';
+import { useState, useEffect } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import { store as editorStore } from '@wordpress/editor';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { useLocation, useHistory } = unlock( routerPrivateApis );
+
+export default function useEditorIframeProps() {
+	const { params } = useLocation();
+	const history = useHistory();
+	const { canvas = 'view' } = params;
+	const currentPostIsTrashed = useSelect( ( select ) => {
+		return (
+			select( editorStore ).getCurrentPostAttribute( 'status' ) ===
+			'trash'
+		);
+	}, [] );
+	const [ isFocused, setIsFocused ] = useState( false );
+
+	useEffect( () => {
+		if ( canvas === 'edit' ) {
+			setIsFocused( false );
+		}
+	}, [ canvas ] );
+
+	// In view mode, make the canvas iframe be perceived and behave as a button
+	// to switch to edit mode, with a meaningful label and no title attribute.
+	const viewModeIframeProps = {
+		'aria-label': __( 'Edit' ),
+		'aria-disabled': currentPostIsTrashed,
+		title: null,
+		role: 'button',
+		tabIndex: 0,
+		onFocus: () => setIsFocused( true ),
+		onBlur: () => setIsFocused( false ),
+		onKeyDown: ( event ) => {
+			const { keyCode } = event;
+			if (
+				( keyCode === ENTER || keyCode === SPACE ) &&
+				! currentPostIsTrashed
+			) {
+				event.preventDefault();
+				history.push( { ...params, canvas: 'edit' }, undefined, {
+					transition: 'canvas-mode-edit-transition',
+				} );
+			}
+		},
+		onClick: () => {
+			history.push( { ...params, canvas: 'edit' }, undefined, {
+				transition: 'canvas-mode-edit-transition',
+			} );
+		},
+		onClickCapture: ( event ) => {
+			if ( currentPostIsTrashed ) {
+				event.preventDefault();
+				event.stopPropagation();
+			}
+		},
+		readonly: true,
+	};
+
+	return {
+		className: clsx( 'edit-site-visual-editor__editor-canvas', {
+			'is-focused': isFocused && canvas === 'view',
+		} ),
+		...( canvas === 'view' ? viewModeIframeProps : {} ),
+	};
+}
diff --git a/packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js b/packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js
new file mode 100644
index 00000000000000..120b15b8551d3d
--- /dev/null
+++ b/packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js
@@ -0,0 +1,25 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { useHistory } = unlock( routerPrivateApis );
+
+export default function useNavigateToEntityRecord() {
+	const history = useHistory();
+
+	const onNavigateToEntityRecord = useCallback(
+		( params ) => {
+			history.push( { ...params, focusMode: true, canvas: 'edit' } );
+		},
+		[ history ]
+	);
+
+	return onNavigateToEntityRecord;
+}
diff --git a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
index 962cfe09afb720..37fa0a2eaf30c2 100644
--- a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
+++ b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
@@ -1,187 +1,85 @@
 /**
  * WordPress dependencies
  */
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { useMemo } from '@wordpress/element';
-import { store as coreStore } from '@wordpress/core-data';
-import { privateApis as editorPrivateApis } from '@wordpress/editor';
-import { store as preferencesStore } from '@wordpress/preferences';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { usePrevious } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
+import useNavigateToEntityRecord from './use-navigate-to-entity-record';
+import { FOCUSABLE_ENTITIES } from '../../utils/constants';
 
-const { useBlockEditorSettings } = unlock( editorPrivateApis );
+const { useLocation, useHistory } = unlock( routerPrivateApis );
 
-function useArchiveLabel( templateSlug ) {
-	const taxonomyMatches = templateSlug?.match(
-		/^(category|tag|taxonomy-([^-]+))$|^(((category|tag)|taxonomy-([^-]+))-(.+))$/
-	);
-	let taxonomy;
-	let term;
-	let isAuthor = false;
-	let authorSlug;
-	if ( taxonomyMatches ) {
-		// If is for a all taxonomies of a type
-		if ( taxonomyMatches[ 1 ] ) {
-			taxonomy = taxonomyMatches[ 2 ]
-				? taxonomyMatches[ 2 ]
-				: taxonomyMatches[ 1 ];
-		}
-		// If is for a all taxonomies of a type
-		else if ( taxonomyMatches[ 3 ] ) {
-			taxonomy = taxonomyMatches[ 6 ]
-				? taxonomyMatches[ 6 ]
-				: taxonomyMatches[ 4 ];
-			term = taxonomyMatches[ 7 ];
-		}
-		taxonomy = taxonomy === 'tag' ? 'post_tag' : taxonomy;
+function useNavigateToPreviousEntityRecord() {
+	const location = useLocation();
+	const previousLocation = usePrevious( location );
+	const history = useHistory();
+	const goBack = useMemo( () => {
+		const isFocusMode =
+			location.params.focusMode ||
+			( location.params.postId &&
+				FOCUSABLE_ENTITIES.includes( location.params.postType ) );
+		const didComeFromEditorCanvas =
+			previousLocation?.params.canvas === 'edit';
+		const showBackButton = isFocusMode && didComeFromEditorCanvas;
+		return showBackButton ? () => history.back() : undefined;
+		// `previousLocation` changes when the component updates for any reason, not
+		// just when location changes. Until this is fixed we can't add it to deps. See
+		// https://github.com/WordPress/gutenberg/pull/58710#discussion_r1479219465.
+	}, [ location, history ] );
+	return goBack;
+}
 
-		//getTaxonomy( 'category' );
-		//wp.data.select('core').getEntityRecords( 'taxonomy', 'category', {slug: 'newcat'} );
-	} else {
-		const authorMatches = templateSlug?.match( /^(author)$|^author-(.+)$/ );
-		if ( authorMatches ) {
-			isAuthor = true;
-			if ( authorMatches[ 2 ] ) {
-				authorSlug = authorMatches[ 2 ];
-			}
-		}
-	}
-	return useSelect(
+export function useSpecificEditorSettings() {
+	const { params } = useLocation();
+	const { canvas = 'view' } = params;
+	const onNavigateToEntityRecord = useNavigateToEntityRecord();
+	const { settings, shouldUseTemplateAsDefaultRenderingMode } = useSelect(
 		( select ) => {
-			const { getEntityRecords, getTaxonomy, getAuthors } =
-				select( coreStore );
-			let archiveTypeLabel;
-			let archiveNameLabel;
-			if ( taxonomy ) {
-				archiveTypeLabel =
-					getTaxonomy( taxonomy )?.labels?.singular_name;
-			}
-			if ( term ) {
-				const records = getEntityRecords( 'taxonomy', taxonomy, {
-					slug: term,
-					per_page: 1,
-				} );
-				if ( records && records[ 0 ] ) {
-					archiveNameLabel = records[ 0 ].name;
-				}
-			}
-			if ( isAuthor ) {
-				archiveTypeLabel = 'Author';
-				if ( authorSlug ) {
-					const authorRecords = getAuthors( { slug: authorSlug } );
-					if ( authorRecords && authorRecords[ 0 ] ) {
-						archiveNameLabel = authorRecords[ 0 ].name;
-					}
-				}
-			}
+			const { getEditedPostContext, getSettings } = unlock(
+				select( editSiteStore )
+			);
+			const _context = getEditedPostContext();
 			return {
-				archiveTypeLabel,
-				archiveNameLabel,
+				settings: getSettings(),
+				// TODO: The `postType` check should be removed when the default rendering mode per post type is merged.
+				// @see https://github.com/WordPress/gutenberg/pull/62304/
+				shouldUseTemplateAsDefaultRenderingMode:
+					_context?.postId && _context?.postType !== 'post',
 			};
 		},
-		[ authorSlug, isAuthor, taxonomy, term ]
+		[]
 	);
-}
-
-export function useSpecificEditorSettings() {
-	const { setIsInserterOpened } = useDispatch( editSiteStore );
-	const {
-		templateSlug,
-		focusMode,
-		isDistractionFree,
-		hasFixedToolbar,
-		keepCaretInsideBlock,
-		canvasMode,
-		settings,
-		postWithTemplate,
-	} = useSelect( ( select ) => {
-		const {
-			getEditedPostType,
-			getEditedPostId,
-			getEditedPostContext,
-			getCanvasMode,
-			getSettings,
-		} = unlock( select( editSiteStore ) );
-		const { get: getPreference } = select( preferencesStore );
-		const { getEditedEntityRecord } = select( coreStore );
-		const usedPostType = getEditedPostType();
-		const usedPostId = getEditedPostId();
-		const _record = getEditedEntityRecord(
-			'postType',
-			usedPostType,
-			usedPostId
-		);
-		const _context = getEditedPostContext();
-		return {
-			templateSlug: _record.slug,
-			focusMode: !! getPreference( 'core/edit-site', 'focusMode' ),
-			isDistractionFree: !! getPreference(
-				'core/edit-site',
-				'distractionFree'
-			),
-			hasFixedToolbar: !! getPreference(
-				'core/edit-site',
-				'fixedToolbar'
-			),
-			keepCaretInsideBlock: !! getPreference(
-				'core/edit-site',
-				'keepCaretInsideBlock'
-			),
-			canvasMode: getCanvasMode(),
-			settings: getSettings(),
-			postWithTemplate: _context?.postId,
-		};
-	}, [] );
-	const archiveLabels = useArchiveLabel( templateSlug );
-	const defaultRenderingMode = postWithTemplate ? 'template-locked' : 'all';
+	const defaultRenderingMode = shouldUseTemplateAsDefaultRenderingMode
+		? 'template-locked'
+		: 'post-only';
+	const onNavigateToPreviousEntityRecord =
+		useNavigateToPreviousEntityRecord();
 	const defaultEditorSettings = useMemo( () => {
 		return {
 			...settings,
 
+			richEditingEnabled: true,
 			supportsTemplateMode: true,
-			__experimentalSetIsInserterOpened: setIsInserterOpened,
-			focusMode: canvasMode === 'view' && focusMode ? false : focusMode,
-			isDistractionFree,
-			hasFixedToolbar,
-			keepCaretInsideBlock,
+			focusMode: canvas !== 'view',
 			defaultRenderingMode,
-
-			// I wonder if they should be set in the post editor too
-			__experimentalArchiveTitleTypeLabel: archiveLabels.archiveTypeLabel,
-			__experimentalArchiveTitleNameLabel: archiveLabels.archiveNameLabel,
+			onNavigateToEntityRecord,
+			onNavigateToPreviousEntityRecord,
+			isPreviewMode: canvas === 'view',
 		};
 	}, [
 		settings,
-		setIsInserterOpened,
-		focusMode,
-		isDistractionFree,
-		hasFixedToolbar,
-		keepCaretInsideBlock,
-		canvasMode,
-		archiveLabels.archiveTypeLabel,
-		archiveLabels.archiveNameLabel,
+		canvas,
 		defaultRenderingMode,
+		onNavigateToEntityRecord,
+		onNavigateToPreviousEntityRecord,
 	] );
 
 	return defaultEditorSettings;
 }
-
-export default function useSiteEditorSettings() {
-	const defaultEditorSettings = useSpecificEditorSettings();
-	const { postType, postId } = useSelect( ( select ) => {
-		const { getEditedPostType, getEditedPostId } = unlock(
-			select( editSiteStore )
-		);
-		const usedPostType = getEditedPostType();
-		const usedPostId = getEditedPostId();
-		return {
-			postType: usedPostType,
-			postId: usedPostId,
-		};
-	}, [] );
-	return useBlockEditorSettings( defaultEditorSettings, postType, postId );
-}
diff --git a/packages/edit-site/src/components/canvas-loader/index.js b/packages/edit-site/src/components/canvas-loader/index.js
index 99d83c3ad69b3b..95dd8f24612938 100644
--- a/packages/edit-site/src/components/canvas-loader/index.js
+++ b/packages/edit-site/src/components/canvas-loader/index.js
@@ -2,7 +2,10 @@
  * WordPress dependencies
  */
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
-import { privateApis as componentsPrivateApis } from '@wordpress/components';
+import {
+	privateApis as componentsPrivateApis,
+	ProgressBar,
+} from '@wordpress/components';
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 
@@ -12,7 +15,7 @@ import { useSelect } from '@wordpress/data';
 import { unlock } from '../../lock-unlock';
 import { useStylesPreviewColors } from '../global-styles/hooks';
 
-const { ProgressBar, Theme } = unlock( componentsPrivateApis );
+const { Theme } = unlock( componentsPrivateApis );
 const { useGlobalStyle } = unlock( blockEditorPrivateApis );
 
 export default function CanvasLoader( { id } ) {
diff --git a/packages/edit-site/src/components/code-editor/index.js b/packages/edit-site/src/components/code-editor/index.js
deleted file mode 100644
index 1fb4a5b7cd6bfd..00000000000000
--- a/packages/edit-site/src/components/code-editor/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * External dependencies
- */
-import Textarea from 'react-autosize-textarea';
-
-/**
- * WordPress dependencies
- */
-import { __unstableSerializeAndClean } from '@wordpress/blocks';
-import { store as coreStore } from '@wordpress/core-data';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-import { __ } from '@wordpress/i18n';
-import { Button, VisuallyHidden } from '@wordpress/components';
-import { useMemo } from '@wordpress/element';
-import { useInstanceId } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-
-export default function CodeEditor() {
-	const instanceId = useInstanceId( CodeEditor );
-	const { shortcut, content, blocks, type, id } = useSelect( ( select ) => {
-		const { getEditedEntityRecord } = select( coreStore );
-		const { getEditedPostType, getEditedPostId } = select( editSiteStore );
-		const { getShortcutRepresentation } = select( keyboardShortcutsStore );
-		const _type = getEditedPostType();
-		const _id = getEditedPostId();
-		const editedRecord = getEditedEntityRecord( 'postType', _type, _id );
-
-		return {
-			shortcut: getShortcutRepresentation( 'core/edit-site/toggle-mode' ),
-			content: editedRecord?.content,
-			blocks: editedRecord?.blocks,
-			type: _type,
-			id: _id,
-		};
-	}, [] );
-	const { editEntityRecord } = useDispatch( coreStore );
-	// Replicates the logic found in getEditedPostContent().
-	const realContent = useMemo( () => {
-		if ( content instanceof Function ) {
-			return content( { blocks } );
-		} else if ( blocks ) {
-			// If we have parsed blocks already, they should be our source of truth.
-			// Parsing applies block deprecations and legacy block conversions that
-			// unparsed content will not have.
-			return __unstableSerializeAndClean( blocks );
-		}
-		return content;
-	}, [ content, blocks ] );
-
-	const { switchEditorMode } = useDispatch( editSiteStore );
-	return (
-		<div className="edit-site-code-editor">
-			<div className="edit-site-code-editor__toolbar">
-				<h2>{ __( 'Editing code' ) }</h2>
-				<Button
-					variant="tertiary"
-					onClick={ () => switchEditorMode( 'visual' ) }
-					shortcut={ shortcut }
-				>
-					{ __( 'Exit code editor' ) }
-				</Button>
-			</div>
-			<div className="edit-site-code-editor__body">
-				<VisuallyHidden
-					as="label"
-					htmlFor={ `code-editor-text-area-${ instanceId }` }
-				>
-					{ __( 'Type text or HTML' ) }
-				</VisuallyHidden>
-				<Textarea
-					autoComplete="off"
-					dir="auto"
-					value={ realContent }
-					onChange={ ( event ) => {
-						editEntityRecord( 'postType', type, id, {
-							content: event.target.value,
-							blocks: undefined,
-							selection: undefined,
-						} );
-					} }
-					className="edit-site-code-editor-text-area"
-					id={ `code-editor-text-area-${ instanceId }` }
-					placeholder={ __( 'Start writing with text or HTML' ) }
-				/>
-			</div>
-		</div>
-	);
-}
diff --git a/packages/edit-site/src/components/code-editor/style.scss b/packages/edit-site/src/components/code-editor/style.scss
deleted file mode 100644
index 0e79575c49f678..00000000000000
--- a/packages/edit-site/src/components/code-editor/style.scss
+++ /dev/null
@@ -1,99 +0,0 @@
-.edit-site-code-editor {
-	position: relative;
-	width: 100%;
-	min-height: 100%;
-	background-color: $white;
-
-	&__body {
-		width: 100%;
-		padding: $grid-unit-15;
-		max-width: $break-xlarge;
-		margin-left: auto;
-		margin-right: auto;
-
-		@include break-large() {
-			padding: $grid-unit-30;
-		}
-	}
-
-	// Exit code editor toolbar.
-	&__toolbar {
-		position: sticky;
-		z-index: z-index(".edit-site-code-editor__toolbar");
-		top: 0;
-		left: 0;
-		right: 0;
-		display: flex;
-		background: rgba($white, 0.8);
-		padding: $grid-unit-05 $grid-unit-15;
-
-		@include break-small() {
-			padding: $grid-unit-15;
-		}
-
-		@include break-large() {
-			padding: $grid-unit-15 $grid-unit-30;
-		}
-
-		h2 {
-			line-height: $button-size;
-			margin: 0 auto 0 0;
-			font-size: $default-font-size;
-			color: $gray-900;
-		}
-
-		.components-button svg {
-			order: 1;
-		}
-	}
-}
-
-textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area {
-	border: $border-width solid $gray-600;
-	border-radius: 0;
-	display: block;
-	margin: 0;
-	width: 100%;
-	box-shadow: none;
-	resize: none;
-	overflow: hidden;
-	font-family: $editor-html-font;
-	line-height: 2.4;
-	min-height: 200px;
-	transition: border 0.1s ease-out, box-shadow 0.1s linear;
-	@include reduce-motion("transition");
-
-	// Same padding as title.
-	padding: $grid-unit-20;
-	@include break-small() {
-		padding: $grid-unit-30;
-	}
-
-	/* Fonts smaller than 16px causes mobile safari to zoom. */
-	font-size: $mobile-text-min-font-size !important;
-	@include break-small {
-		font-size: $text-editor-font-size !important;
-	}
-
-	&:focus {
-		border-color: var(--wp-admin-theme-color);
-		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-
-		// Elevate the z-index on focus so the focus style is uncropped.
-		position: relative;
-	}
-
-	&::-webkit-input-placeholder {
-		color: $dark-gray-placeholder;
-	}
-
-	&::-moz-placeholder {
-		color: $dark-gray-placeholder;
-		// Override Firefox default.
-		opacity: 1;
-	}
-
-	&:-ms-input-placeholder {
-		color: $dark-gray-placeholder;
-	}
-}
diff --git a/packages/edit-site/src/components/create-template-part-modal/index.js b/packages/edit-site/src/components/create-template-part-modal/index.js
deleted file mode 100644
index 31f12b6cab56d3..00000000000000
--- a/packages/edit-site/src/components/create-template-part-modal/index.js
+++ /dev/null
@@ -1,195 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import {
-	Icon,
-	BaseControl,
-	TextControl,
-	Flex,
-	FlexItem,
-	FlexBlock,
-	Button,
-	Modal,
-	__experimentalRadioGroup as RadioGroup,
-	__experimentalRadio as Radio,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useState } from '@wordpress/element';
-import { useInstanceId } from '@wordpress/compose';
-import { store as editorStore } from '@wordpress/editor';
-import { store as noticesStore } from '@wordpress/notices';
-import { store as coreStore } from '@wordpress/core-data';
-import { check } from '@wordpress/icons';
-import { serialize } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import {
-	TEMPLATE_PART_POST_TYPE,
-	TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
-} from '../../utils/constants';
-import {
-	useExistingTemplateParts,
-	getUniqueTemplatePartTitle,
-	getCleanTemplatePartSlug,
-} from '../../utils/template-part-create';
-
-export default function CreateTemplatePartModal( {
-	defaultArea = TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
-	blocks = [],
-	confirmLabel = __( 'Create' ),
-	closeModal,
-	modalTitle = __( 'Create template part' ),
-	onCreate,
-	onError,
-	defaultTitle = '',
-} ) {
-	const { createErrorNotice } = useDispatch( noticesStore );
-	const { saveEntityRecord } = useDispatch( coreStore );
-	const existingTemplateParts = useExistingTemplateParts();
-
-	const [ title, setTitle ] = useState( defaultTitle );
-	const [ area, setArea ] = useState( defaultArea );
-	const [ isSubmitting, setIsSubmitting ] = useState( false );
-	const instanceId = useInstanceId( CreateTemplatePartModal );
-
-	const templatePartAreas = useSelect(
-		( select ) =>
-			select( editorStore ).__experimentalGetDefaultTemplatePartAreas(),
-		[]
-	);
-
-	async function createTemplatePart() {
-		if ( ! title || isSubmitting ) {
-			return;
-		}
-
-		try {
-			setIsSubmitting( true );
-			const uniqueTitle = getUniqueTemplatePartTitle(
-				title,
-				existingTemplateParts
-			);
-			const cleanSlug = getCleanTemplatePartSlug( uniqueTitle );
-
-			const templatePart = await saveEntityRecord(
-				'postType',
-				TEMPLATE_PART_POST_TYPE,
-				{
-					slug: cleanSlug,
-					title: uniqueTitle,
-					content: serialize( blocks ),
-					area,
-				},
-				{ throwOnError: true }
-			);
-			await onCreate( templatePart );
-
-			// TODO: Add a success notice?
-		} catch ( error ) {
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: __(
-							'An error occurred while creating the template part.'
-					  );
-
-			createErrorNotice( errorMessage, { type: 'snackbar' } );
-
-			onError?.();
-		} finally {
-			setIsSubmitting( false );
-		}
-	}
-
-	return (
-		<Modal
-			title={ modalTitle }
-			onRequestClose={ closeModal }
-			overlayClassName="edit-site-create-template-part-modal"
-		>
-			<form
-				onSubmit={ async ( event ) => {
-					event.preventDefault();
-					await createTemplatePart();
-				} }
-			>
-				<VStack spacing="4">
-					<TextControl
-						__nextHasNoMarginBottom
-						label={ __( 'Name' ) }
-						value={ title }
-						onChange={ setTitle }
-						required
-					/>
-					<BaseControl
-						label={ __( 'Area' ) }
-						id={ `edit-site-create-template-part-modal__area-selection-${ instanceId }` }
-						className="edit-site-create-template-part-modal__area-base-control"
-					>
-						<RadioGroup
-							label={ __( 'Area' ) }
-							className="edit-site-create-template-part-modal__area-radio-group"
-							id={ `edit-site-create-template-part-modal__area-selection-${ instanceId }` }
-							onChange={ setArea }
-							checked={ area }
-						>
-							{ templatePartAreas.map(
-								( {
-									icon,
-									label,
-									area: value,
-									description,
-								} ) => (
-									<Radio
-										key={ label }
-										value={ value }
-										className="edit-site-create-template-part-modal__area-radio"
-									>
-										<Flex align="start" justify="start">
-											<FlexItem>
-												<Icon icon={ icon } />
-											</FlexItem>
-											<FlexBlock className="edit-site-create-template-part-modal__option-label">
-												{ label }
-												<div>{ description }</div>
-											</FlexBlock>
-
-											<FlexItem className="edit-site-create-template-part-modal__checkbox">
-												{ area === value && (
-													<Icon icon={ check } />
-												) }
-											</FlexItem>
-										</Flex>
-									</Radio>
-								)
-							) }
-						</RadioGroup>
-					</BaseControl>
-					<HStack justify="right">
-						<Button
-							variant="tertiary"
-							onClick={ () => {
-								closeModal();
-							} }
-						>
-							{ __( 'Cancel' ) }
-						</Button>
-						<Button
-							variant="primary"
-							type="submit"
-							aria-disabled={ ! title || isSubmitting }
-							isBusy={ isSubmitting }
-						>
-							{ confirmLabel }
-						</Button>
-					</HStack>
-				</VStack>
-			</form>
-		</Modal>
-	);
-}
diff --git a/packages/edit-site/src/components/create-template-part-modal/style.scss b/packages/edit-site/src/components/create-template-part-modal/style.scss
deleted file mode 100644
index 1dba3be142cea2..00000000000000
--- a/packages/edit-site/src/components/create-template-part-modal/style.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-.edit-site-create-template-part-modal {
-	z-index: z-index(".edit-site-create-template-part-modal");
-
-	.components-modal__frame {
-		@include break-small {
-			max-width: 500px;
-		}
-	}
-}
-
-.edit-site-create-template-part-modal__area-radio-group {
-	width: 100%;
-	border: $border-width solid $gray-700;
-	border-radius: 2px;
-
-	.components-button.edit-site-create-template-part-modal__area-radio {
-		display: block;
-		width: 100%;
-		height: 100%;
-		text-align: left;
-		padding: $grid-unit-15;
-
-		&,
-		&.is-secondary:hover,
-		&.is-primary:hover {
-			margin: 0;
-			background-color: inherit;
-			border-bottom: $border-width solid $gray-700;
-			border-radius: 0;
-
-			&:not(:focus) {
-				box-shadow: none;
-			}
-
-			&:focus {
-				border-bottom: $border-width solid $white;
-			}
-
-			&:last-of-type {
-				border-bottom: none;
-			}
-		}
-
-		&:not(:hover),
-		&[aria-checked="true"] {
-			color: $gray-900;
-			cursor: auto;
-
-			.edit-site-create-template-part-modal__option-label div {
-				color: $gray-600;
-			}
-		}
-
-		.edit-site-create-template-part-modal__option-label {
-			padding-top: $grid-unit-05;
-			white-space: normal;
-
-			div {
-				padding-top: $grid-unit-05;
-				font-size: $helptext-font-size;
-			}
-		}
-
-		.edit-site-create-template-part-modal__checkbox {
-			margin-left: auto;
-			min-width: $grid-unit-30;
-		}
-	}
-}
diff --git a/packages/edit-site/src/components/dataviews-actions/index.js b/packages/edit-site/src/components/dataviews-actions/index.js
new file mode 100644
index 00000000000000..09b7597c6cb341
--- /dev/null
+++ b/packages/edit-site/src/components/dataviews-actions/index.js
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { edit } from '@wordpress/icons';
+import { useMemo } from '@wordpress/element';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
+/**
+ * Internal dependencies
+ */
+import { PATTERN_TYPES } from '../../utils/constants';
+import { unlock } from '../../lock-unlock';
+
+const { useHistory } = unlock( routerPrivateApis );
+
+export const useEditPostAction = () => {
+	const history = useHistory();
+	return useMemo(
+		() => ( {
+			id: 'edit-post',
+			label: __( 'Edit' ),
+			isPrimary: true,
+			icon: edit,
+			isEligible( post ) {
+				if ( post.status === 'trash' ) {
+					return false;
+				}
+				// It's eligible for all post types except theme patterns.
+				return post.type !== PATTERN_TYPES.theme;
+			},
+			callback( items ) {
+				const post = items[ 0 ];
+				history.push( {
+					postId: post.id,
+					postType: post.type,
+					canvas: 'edit',
+				} );
+			},
+		} ),
+		[ history ]
+	);
+};
diff --git a/packages/edit-site/src/components/editor-canvas-container/index.js b/packages/edit-site/src/components/editor-canvas-container/index.js
index c036374e7907e1..ac1083e69abd7e 100644
--- a/packages/edit-site/src/components/editor-canvas-container/index.js
+++ b/packages/edit-site/src/components/editor-canvas-container/index.js
@@ -1,10 +1,9 @@
 /**
  * WordPress dependencies
  */
-import { Children, cloneElement, useState, useMemo } from '@wordpress/element';
+import { Children, cloneElement, useState } from '@wordpress/element';
 import {
 	Button,
-	privateApis as componentsPrivateApis,
 	__experimentalUseSlotFills as useSlotFills,
 } from '@wordpress/components';
 import { ESCAPE } from '@wordpress/keycodes';
@@ -13,41 +12,38 @@ import { useDispatch, useSelect } from '@wordpress/data';
 import { closeSmall } from '@wordpress/icons';
 import { useFocusOnMount, useFocusReturn } from '@wordpress/compose';
 import { store as preferencesStore } from '@wordpress/preferences';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
 import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
-import ResizableEditor from '../block-editor/resizable-editor';
+
+const { EditorContentSlotFill, ResizableEditor } = unlock( editorPrivateApis );
 
 /**
  * Returns a translated string for the title of the editor canvas container.
  *
  * @param {string} view Editor canvas container view.
  *
- * @return {string} Translated string corresponding to value of view. Default is ''.
+ * @return {Object} Translated string for the view title and associated icon, both defaulting to ''.
  */
 function getEditorCanvasContainerTitle( view ) {
 	switch ( view ) {
 		case 'style-book':
 			return __( 'Style Book' );
 		case 'global-styles-revisions':
-			return __( 'Global styles revisions' );
+		case 'global-styles-revisions:style-book':
+			return __( 'Style Revisions' );
 		default:
 			return '';
 	}
 }
 
-// Creates a private slot fill.
-const { createPrivateSlotFill } = unlock( componentsPrivateApis );
-const SLOT_FILL_NAME = 'EditSiteEditorCanvasContainerSlot';
-const {
-	privateKey,
-	Slot: EditorCanvasContainerSlot,
-	Fill: EditorCanvasContainerFill,
-} = createPrivateSlotFill( SLOT_FILL_NAME );
-
 function EditorCanvasContainer( {
 	children,
 	closeButtonLabel,
@@ -61,7 +57,7 @@ function EditorCanvasContainer( {
 			).getEditorCanvasContainerView();
 
 			const _showListViewByDefault = select( preferencesStore ).get(
-				'core/edit-site',
+				'core',
 				'showListViewByDefault'
 			);
 
@@ -76,22 +72,18 @@ function EditorCanvasContainer( {
 	const { setEditorCanvasContainerView } = unlock(
 		useDispatch( editSiteStore )
 	);
+	const { setIsListViewOpened } = useDispatch( editorStore );
+
 	const focusOnMountRef = useFocusOnMount( 'firstElement' );
 	const sectionFocusReturnRef = useFocusReturn();
-	const title = useMemo(
-		() => getEditorCanvasContainerTitle( editorCanvasContainerView ),
-		[ editorCanvasContainerView ]
-	);
-
-	const { setIsListViewOpened } = useDispatch( editSiteStore );
 
 	function onCloseContainer() {
-		if ( typeof onClose === 'function' ) {
-			onClose();
-		}
 		setIsListViewOpened( showListViewByDefault );
 		setEditorCanvasContainerView( undefined );
 		setIsClosed( true );
+		if ( typeof onClose === 'function' ) {
+			onClose();
+		}
 	}
 
 	function closeOnEscape( event ) {
@@ -117,38 +109,41 @@ function EditorCanvasContainer( {
 		return null;
 	}
 
+	const title = getEditorCanvasContainerTitle( editorCanvasContainerView );
 	const shouldShowCloseButton = onClose || closeButtonLabel;
 
 	return (
-		<EditorCanvasContainerFill>
-			<ResizableEditor enableResizing={ enableResizing }>
-				{ /* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */ }
-				<section
-					className="edit-site-editor-canvas-container"
-					ref={ shouldShowCloseButton ? focusOnMountRef : null }
-					onKeyDown={ closeOnEscape }
-					aria-label={ title }
-				>
-					{ shouldShowCloseButton && (
-						<Button
-							className="edit-site-editor-canvas-container__close-button"
-							icon={ closeSmall }
-							label={ closeButtonLabel || __( 'Close' ) }
-							onClick={ onCloseContainer }
-							showTooltip={ false }
-						/>
-					) }
-					{ childrenWithProps }
-				</section>
-			</ResizableEditor>
-		</EditorCanvasContainerFill>
+		<EditorContentSlotFill.Fill>
+			<div className="edit-site-editor-canvas-container">
+				<ResizableEditor enableResizing={ enableResizing }>
+					{ /* eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions */ }
+					<section
+						className="edit-site-editor-canvas-container__section"
+						ref={ shouldShowCloseButton ? focusOnMountRef : null }
+						onKeyDown={ closeOnEscape }
+						aria-label={ title }
+					>
+						{ shouldShowCloseButton && (
+							<Button
+								size="compact"
+								className="edit-site-editor-canvas-container__close-button"
+								icon={ closeSmall }
+								label={ closeButtonLabel || __( 'Close' ) }
+								onClick={ onCloseContainer }
+							/>
+						) }
+						{ childrenWithProps }
+					</section>
+				</ResizableEditor>
+			</div>
+		</EditorContentSlotFill.Fill>
 	);
 }
+
 function useHasEditorCanvasContainer() {
-	const fills = useSlotFills( privateKey );
+	const fills = useSlotFills( EditorContentSlotFill.privateKey );
 	return !! fills?.length;
 }
 
-EditorCanvasContainer.Slot = EditorCanvasContainerSlot;
 export default EditorCanvasContainer;
 export { useHasEditorCanvasContainer, getEditorCanvasContainerTitle };
diff --git a/packages/edit-site/src/components/editor-canvas-container/style.scss b/packages/edit-site/src/components/editor-canvas-container/style.scss
index acc0e0872f0b42..0bdbc2bbe32355 100644
--- a/packages/edit-site/src/components/editor-canvas-container/style.scss
+++ b/packages/edit-site/src/components/editor-canvas-container/style.scss
@@ -1,6 +1,22 @@
 .edit-site-editor-canvas-container {
+	height: 100%;
+	background-color: $gray-300;
+
+	// Controls height of editor and editor canvas container (style book, global styles revisions previews etc.)
+	iframe {
+		display: block;
+		width: 100%;
+		height: 100%;
+	}
+
+	.edit-site-layout.is-full-canvas & {
+		padding: $grid-unit-30 $grid-unit-30 0;
+	}
+}
+
+.edit-site-editor-canvas-container__section {
 	background: $white; // Fallback color, overridden by JavaScript.
-	border-radius: $radius-block-ui;
+	border-radius: $radius-large;
 	bottom: 0;
 	left: 0;
 	overflow: hidden;
@@ -13,7 +29,7 @@
 .edit-site-editor-canvas-container__close-button {
 	position: absolute;
 	right: $grid-unit-10;
-	top: math.div($grid-unit-60 - $button-size, 2); // ( tab height - button size ) / 2
-	z-index: 1;
+	top: $grid-unit-10;
+	z-index: 2;
 	background: $white;
 }
diff --git a/packages/edit-site/src/components/editor/index.js b/packages/edit-site/src/components/editor/index.js
index 1d3fca36f5f4c0..c7481a1d12bd79 100644
--- a/packages/edit-site/src/components/editor/index.js
+++ b/packages/edit-site/src/components/editor/index.js
@@ -1,300 +1,326 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { Notice } from '@wordpress/components';
-import { useInstanceId } from '@wordpress/compose';
-import { store as preferencesStore } from '@wordpress/preferences';
-import {
-	BlockBreadcrumb,
-	store as blockEditorStore,
-	privateApis as blockEditorPrivateApis,
-	BlockInspector,
-} from '@wordpress/block-editor';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { Button, __unstableMotion as motion } from '@wordpress/components';
+import { useInstanceId, useReducedMotion } from '@wordpress/compose';
 import {
-	InterfaceSkeleton,
-	ComplementaryArea,
-	store as interfaceStore,
-} from '@wordpress/interface';
-import {
-	EditorNotices,
-	EditorSnackbars,
+	EditorKeyboardShortcutsRegister,
 	privateApis as editorPrivateApis,
 	store as editorStore,
 } from '@wordpress/editor';
 import { __, sprintf } from '@wordpress/i18n';
 import { store as coreDataStore } from '@wordpress/core-data';
-import { useEffect } from '@wordpress/element';
+import { privateApis as blockLibraryPrivateApis } from '@wordpress/block-library';
+import { useCallback, useMemo } from '@wordpress/element';
+import { store as noticesStore } from '@wordpress/notices';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { decodeEntities } from '@wordpress/html-entities';
+import { Icon, arrowUpLeft } from '@wordpress/icons';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
-import {
-	SidebarComplementaryAreaFills,
-	SidebarInspectorFill,
-} from '../sidebar-edit-mode';
-import CodeEditor from '../code-editor';
-import KeyboardShortcutsEditMode from '../keyboard-shortcuts/edit-mode';
-import InserterSidebar from '../secondary-sidebar/inserter-sidebar';
-import ListViewSidebar from '../secondary-sidebar/list-view-sidebar';
 import WelcomeGuide from '../welcome-guide';
-import StartTemplateOptions from '../start-template-options';
 import { store as editSiteStore } from '../../store';
 import { GlobalStylesRenderer } from '../global-styles-renderer';
-import useTitle from '../routes/use-title';
 import CanvasLoader from '../canvas-loader';
 import { unlock } from '../../lock-unlock';
-import useEditedEntityRecord from '../use-edited-entity-record';
-import { SidebarFixedBottomSlot } from '../sidebar-edit-mode/sidebar-fixed-bottom';
-import PatternModal from '../pattern-modal';
-import { POST_TYPE_LABELS, TEMPLATE_POST_TYPE } from '../../utils/constants';
-import SiteEditorCanvas from '../block-editor/site-editor-canvas';
-import TemplatePartConverter from '../template-part-converter';
 import { useSpecificEditorSettings } from '../block-editor/use-site-editor-settings';
+import PluginTemplateSettingPanel from '../plugin-template-setting-panel';
+import GlobalStylesSidebar from '../global-styles-sidebar';
+import { isPreviewingTheme } from '../../utils/is-previewing-theme';
+import {
+	getEditorCanvasContainerTitle,
+	useHasEditorCanvasContainer,
+} from '../editor-canvas-container';
+import SaveButton from '../save-button';
+import SavePanel from '../save-panel';
+import SiteEditorMoreMenu from '../more-menu';
+import SiteIcon from '../site-icon';
+import useEditorIframeProps from '../block-editor/use-editor-iframe-props';
+import useEditorTitle from './use-editor-title';
+import { useIsSiteEditorLoading } from '../layout/hooks';
+import { useAdaptEditorToCanvas } from './use-adapt-editor-to-canvas';
 
-const { BlockRemovalWarningModal } = unlock( blockEditorPrivateApis );
-const { ExperimentalEditorProvider: EditorProvider } =
-	unlock( editorPrivateApis );
+const { Editor, BackButton } = unlock( editorPrivateApis );
+const { useHistory, useLocation } = unlock( routerPrivateApis );
+const { BlockKeyboardShortcuts } = unlock( blockLibraryPrivateApis );
 
-const interfaceLabels = {
-	/* translators: accessibility text for the editor content landmark region. */
-	body: __( 'Editor content' ),
-	/* translators: accessibility text for the editor settings landmark region. */
-	sidebar: __( 'Editor settings' ),
-	/* translators: accessibility text for the editor publish landmark region. */
-	actions: __( 'Editor publish' ),
-	/* translators: accessibility text for the editor footer landmark region. */
-	footer: __( 'Editor footer' ),
+const toggleHomeIconVariants = {
+	edit: {
+		opacity: 0,
+		scale: 0.2,
+	},
+	hover: {
+		opacity: 1,
+		scale: 1,
+		clipPath: 'inset( 22% round 2px )',
+	},
 };
 
-// Prevent accidental removal of certain blocks, asking the user for
-// confirmation.
-const blockRemovalRules = {
-	'core/query': __( 'Query Loop displays a list of posts or pages.' ),
-	'core/post-content': __(
-		'Post Content displays the content of a post or page.'
-	),
-	'core/post-template': __(
-		'Post Template displays each post or page in a Query Loop.'
-	),
+const siteIconVariants = {
+	edit: {
+		clipPath: 'inset(0% round 0px)',
+	},
+	hover: {
+		clipPath: 'inset( 22% round 2px )',
+	},
+	tap: {
+		clipPath: 'inset(0% round 0px)',
+	},
 };
 
-export default function Editor( { listViewToggleElement, isLoading } ) {
-	const {
-		record: editedPost,
-		getTitle,
-		isLoaded: hasLoadedPost,
-	} = useEditedEntityRecord();
-
-	const { type: editedPostType } = editedPost;
-
+export default function EditSiteEditor( { isPostsList = false } ) {
+	const disableMotion = useReducedMotion();
+	const { params } = useLocation();
+	const { canvas = 'view' } = params;
+	const isLoading = useIsSiteEditorLoading();
+	useAdaptEditorToCanvas( canvas );
 	const {
-		context,
-		contextPost,
-		editorMode,
-		canvasMode,
-		renderingMode,
-		blockEditorMode,
-		isRightSidebarOpen,
-		isInserterOpen,
-		isListViewOpen,
+		editedPostType,
+		editedPostId,
+		contextPostType,
+		contextPostId,
+		isEditingPage,
+		supportsGlobalStyles,
 		showIconLabels,
-		showBlockBreadcrumbs,
+		editorCanvasView,
+		currentPostIsTrashed,
+		hasSiteIcon,
 	} = useSelect( ( select ) => {
 		const {
+			getEditorCanvasContainerView,
 			getEditedPostContext,
-			getEditorMode,
-			getCanvasMode,
-			isInserterOpened,
-			isListViewOpened,
+			isPage,
+			getEditedPostType,
+			getEditedPostId,
 		} = unlock( select( editSiteStore ) );
-		const { __unstableGetEditorMode } = select( blockEditorStore );
-		const { getActiveComplementaryArea } = select( interfaceStore );
-		const { getEntityRecord } = select( coreDataStore );
-		const { getRenderingMode } = select( editorStore );
+		const { get } = select( preferencesStore );
+		const { getCurrentTheme, getEntityRecord } = select( coreDataStore );
 		const _context = getEditedPostContext();
+		const siteData = getEntityRecord( 'root', '__unstableBase', undefined );
 
 		// The currently selected entity to display.
 		// Typically template or template part in the site editor.
 		return {
-			context: _context,
-			contextPost: _context?.postId
-				? getEntityRecord(
-						'postType',
-						_context.postType,
-						_context.postId
-				  )
-				: undefined,
-			editorMode: getEditorMode(),
-			canvasMode: getCanvasMode(),
-			renderingMode: getRenderingMode(),
-			blockEditorMode: __unstableGetEditorMode(),
-			isInserterOpen: isInserterOpened(),
-			isListViewOpen: isListViewOpened(),
-			isRightSidebarOpen: getActiveComplementaryArea(
-				editSiteStore.name
-			),
-			showIconLabels: select( preferencesStore ).get(
-				'core/edit-site',
-				'showIconLabels'
-			),
-			showBlockBreadcrumbs: select( preferencesStore ).get(
-				'core/edit-site',
-				'showBlockBreadcrumbs'
-			),
+			editedPostType: getEditedPostType(),
+			editedPostId: getEditedPostId(),
+			contextPostType: _context?.postId ? _context.postType : undefined,
+			contextPostId: _context?.postId ? _context.postId : undefined,
+			isEditingPage: isPage(),
+			supportsGlobalStyles: getCurrentTheme()?.is_block_theme,
+			showIconLabels: get( 'core', 'showIconLabels' ),
+			editorCanvasView: getEditorCanvasContainerView(),
+			currentPostIsTrashed:
+				select( editorStore ).getCurrentPostAttribute( 'status' ) ===
+				'trash',
+			hasSiteIcon: !! siteData?.site_icon_url,
 		};
 	}, [] );
-	const { setRenderingMode } = useDispatch( editorStore );
-
-	const isViewMode = canvasMode === 'view';
-	const isEditMode = canvasMode === 'edit';
-	const showVisualEditor = isViewMode || editorMode === 'visual';
-	const shouldShowBlockBreadcrumbs =
-		showBlockBreadcrumbs &&
-		isEditMode &&
-		showVisualEditor &&
-		blockEditorMode !== 'zoom-out';
-	const shouldShowInserter = isEditMode && showVisualEditor && isInserterOpen;
-	const shouldShowListView = isEditMode && showVisualEditor && isListViewOpen;
-	const secondarySidebarLabel = isListViewOpen
-		? __( 'List View' )
-		: __( 'Block Library' );
-	const postWithTemplate = !! context?.postId;
-
-	let title;
-	if ( hasLoadedPost ) {
-		title = sprintf(
-			// translators: A breadcrumb trail for the Admin document title. %1$s: title of template being edited, %2$s: type of template (Template or Template Part).
-			__( '%1$s ‹ %2$s' ),
-			getTitle(),
-			POST_TYPE_LABELS[ editedPostType ] ??
-				POST_TYPE_LABELS[ TEMPLATE_POST_TYPE ]
-		);
-	}
-
-	// Only announce the title once the editor is ready to prevent "Replace"
-	// action in <URLQueryController> from double-announcing.
-	useTitle( hasLoadedPost && title );
-
+	useEditorTitle();
+	const _isPreviewingTheme = isPreviewingTheme();
+	const hasDefaultEditorCanvasView = ! useHasEditorCanvasContainer();
+	const iframeProps = useEditorIframeProps();
+	const isEditMode = canvas === 'edit';
+	const postWithTemplate = !! contextPostId;
 	const loadingProgressId = useInstanceId(
 		CanvasLoader,
 		'edit-site-editor__loading-progress'
 	);
 
 	const settings = useSpecificEditorSettings();
-	const isReady =
-		! isLoading &&
-		( ( postWithTemplate && !! contextPost && !! editedPost ) ||
-			( ! postWithTemplate && !! editedPost ) );
+	const styles = useMemo(
+		() => [
+			...settings.styles,
+			{
+				// Forming a "block formatting context" to prevent margin collapsing.
+				// @see https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
+				css:
+					canvas === 'view'
+						? `body{min-height: 100vh; ${
+								currentPostIsTrashed ? '' : 'cursor: pointer;'
+						  }}`
+						: undefined,
+			},
+		],
+		[ settings.styles, canvas, currentPostIsTrashed ]
+	);
+	const { resetZoomLevel } = unlock( useDispatch( blockEditorStore ) );
+	const { createSuccessNotice } = useDispatch( noticesStore );
+	const history = useHistory();
+	const onActionPerformed = useCallback(
+		( actionId, items ) => {
+			switch ( actionId ) {
+				case 'move-to-trash':
+				case 'delete-post':
+					{
+						history.push( {
+							postType: items[ 0 ].type,
+						} );
+					}
+					break;
+				case 'duplicate-post':
+					{
+						const newItem = items[ 0 ];
+						const _title =
+							typeof newItem.title === 'string'
+								? newItem.title
+								: newItem.title?.rendered;
+						createSuccessNotice(
+							sprintf(
+								// translators: %s: Title of the created post e.g: "Post 1".
+								__( '"%s" successfully created.' ),
+								decodeEntities( _title )
+							),
+							{
+								type: 'snackbar',
+								id: 'duplicate-post-action',
+								actions: [
+									{
+										label: __( 'Edit' ),
+										onClick: () => {
+											history.push( {
+												postId: newItem.id,
+												postType: newItem.type,
+												canvas: 'edit',
+											} );
+										},
+									},
+								],
+							}
+						);
+					}
+					break;
+			}
+		},
+		[ history, createSuccessNotice ]
+	);
+
+	// Replace the title and icon displayed in the DocumentBar when there's an overlay visible.
+	const title = getEditorCanvasContainerTitle( editorCanvasView );
 
-	// This is the only reliable way I've found to reinitialize the rendering mode
-	// when the canvas mode or the edited entity changes.
-	useEffect( () => {
-		if ( canvasMode === 'edit' && postWithTemplate ) {
-			setRenderingMode( 'template-locked' );
-		} else {
-			setRenderingMode( 'all' );
-		}
-	}, [ canvasMode, postWithTemplate, setRenderingMode ] );
+	const isReady = ! isLoading;
+	const transition = {
+		duration: disableMotion ? 0 : 0.2,
+	};
 
 	return (
 		<>
+			<GlobalStylesRenderer />
+			<EditorKeyboardShortcutsRegister />
+			{ isEditMode && <BlockKeyboardShortcuts /> }
 			{ ! isReady ? <CanvasLoader id={ loadingProgressId } /> : null }
 			{ isEditMode && <WelcomeGuide /> }
-			{ hasLoadedPost && ! editedPost && (
-				<Notice status="warning" isDismissible={ false }>
-					{ __(
-						"You attempted to edit an item that doesn't exist. Perhaps it was deleted?"
-					) }
-				</Notice>
-			) }
 			{ isReady && (
-				<EditorProvider
-					post={ postWithTemplate ? contextPost : editedPost }
-					__unstableTemplate={
-						postWithTemplate ? editedPost : undefined
+				<Editor
+					postType={
+						postWithTemplate ? contextPostType : editedPostType
 					}
+					postId={ postWithTemplate ? contextPostId : editedPostId }
+					templateId={ postWithTemplate ? editedPostId : undefined }
 					settings={ settings }
-					useSubRegistry={ false }
+					className={ clsx( 'edit-site-editor__editor-interface', {
+						'show-icon-labels': showIconLabels,
+					} ) }
+					styles={ styles }
+					customSaveButton={
+						_isPreviewingTheme && <SaveButton size="compact" />
+					}
+					customSavePanel={ _isPreviewingTheme && <SavePanel /> }
+					forceDisableBlockTools={ ! hasDefaultEditorCanvasView }
+					title={ title }
+					iframeProps={ iframeProps }
+					onActionPerformed={ onActionPerformed }
+					extraSidebarPanels={
+						! isEditingPage && <PluginTemplateSettingPanel.Slot />
+					}
 				>
-					<SidebarComplementaryAreaFills />
-					{ isEditMode && <StartTemplateOptions /> }
-					<InterfaceSkeleton
-						isDistractionFree={ true }
-						enableRegionNavigation={ false }
-						className={ classnames(
-							'edit-site-editor__interface-skeleton',
-							{
-								'show-icon-labels': showIconLabels,
+					{ isEditMode && (
+						<BackButton>
+							{ ( { length } ) =>
+								length <= 1 && (
+									<motion.div
+										className="edit-site-editor__view-mode-toggle"
+										transition={ transition }
+										animate="edit"
+										initial="edit"
+										whileHover="hover"
+										whileTap="tap"
+									>
+										<Button
+											__next40pxDefaultSize
+											label={ __( 'Open Navigation' ) }
+											showTooltip
+											tooltipPosition="middle right"
+											onClick={ () => {
+												resetZoomLevel();
+
+												// TODO: this is a temporary solution to navigate to the posts list if we are
+												// come here through `posts list` and are in focus mode editing a template, template part etc..
+												if (
+													isPostsList &&
+													params?.focusMode
+												) {
+													history.push(
+														{
+															page: 'gutenberg-posts-dashboard',
+															postType: 'post',
+														},
+														undefined,
+														{
+															transition:
+																'canvas-mode-view-transition',
+														}
+													);
+												} else {
+													history.push(
+														{
+															...params,
+															canvas: undefined,
+														},
+														undefined,
+														{
+															transition:
+																'canvas-mode-view-transition',
+														}
+													);
+												}
+											} }
+										>
+											<motion.div
+												variants={ siteIconVariants }
+											>
+												<SiteIcon className="edit-site-editor__view-mode-toggle-icon" />
+											</motion.div>
+										</Button>
+										<motion.div
+											className={ clsx(
+												'edit-site-editor__back-icon',
+												{
+													'has-site-icon':
+														hasSiteIcon,
+												}
+											) }
+											variants={ toggleHomeIconVariants }
+										>
+											<Icon icon={ arrowUpLeft } />
+										</motion.div>
+									</motion.div>
+								)
 							}
-						) }
-						notices={ <EditorSnackbars /> }
-						content={
-							<>
-								<GlobalStylesRenderer />
-								{ isEditMode && <EditorNotices /> }
-								{ showVisualEditor && (
-									<>
-										<TemplatePartConverter />
-										<SidebarInspectorFill>
-											<BlockInspector />
-										</SidebarInspectorFill>
-										<SiteEditorCanvas />
-										<BlockRemovalWarningModal
-											rules={ blockRemovalRules }
-										/>
-										<PatternModal />
-									</>
-								) }
-								{ editorMode === 'text' && isEditMode && (
-									<CodeEditor />
-								) }
-								{ isEditMode && <KeyboardShortcutsEditMode /> }
-							</>
-						}
-						secondarySidebar={
-							isEditMode &&
-							( ( shouldShowInserter && <InserterSidebar /> ) ||
-								( shouldShowListView && (
-									<ListViewSidebar
-										listViewToggleElement={
-											listViewToggleElement
-										}
-									/>
-								) ) )
-						}
-						sidebar={
-							isEditMode &&
-							isRightSidebarOpen && (
-								<>
-									<ComplementaryArea.Slot scope="core/edit-site" />
-									<SidebarFixedBottomSlot />
-								</>
-							)
-						}
-						footer={
-							shouldShowBlockBreadcrumbs && (
-								<BlockBreadcrumb
-									rootLabelText={
-										postWithTemplate &&
-										renderingMode !== 'template-only'
-											? __( 'Page' )
-											: __( 'Template' )
-									}
-								/>
-							)
-						}
-						labels={ {
-							...interfaceLabels,
-							secondarySidebar: secondarySidebarLabel,
-						} }
-					/>
-				</EditorProvider>
+						</BackButton>
+					) }
+					<SiteEditorMoreMenu />
+					{ supportsGlobalStyles && <GlobalStylesSidebar /> }
+				</Editor>
 			) }
 		</>
 	);
diff --git a/packages/edit-site/src/components/editor/style.scss b/packages/edit-site/src/components/editor/style.scss
index 26403858ff22e0..a6cc5084966947 100644
--- a/packages/edit-site/src/components/editor/style.scss
+++ b/packages/edit-site/src/components/editor/style.scss
@@ -1,33 +1,81 @@
-.edit-site-editor__interface-skeleton {
+.edit-site-editor__editor-interface {
 	opacity: 1;
 	transition: opacity 0.1s ease-out;
-	@include reduce-motion("transition");
+	@include reduce-motion( "transition" );
 
 	&.is-loading {
 		opacity: 0;
 	}
-
-	.interface-interface-skeleton__header {
-		border: 0;
-	}
 }
 
 .edit-site-editor__toggle-save-panel {
 	box-sizing: border-box;
 	width: $sidebar-width;
 	background-color: $white;
-	border: 1px dotted $gray-300;
+	border: $border-width dotted $gray-300;
 	padding: $grid-unit-30;
 	display: flex;
 	justify-content: center;
 }
 
-// Adjust the position of the notices
-.edit-site .components-editor-notices__snackbar {
+.edit-site-editor__view-mode-toggle {
+	/* stylelint-disable -- Disable reason: View Transitions not supported properly by stylelint. */
+	view-transition-name: toggle;
+	/* stylelint-enable */
+	top: 0;
+	left: 0;
+	height: $header-height;
+	width: $header-height;
+	z-index: 100;
+
+	.components-button {
+		color: $white;
+		height: 100%;
+		width: 100%;
+		border-radius: 0;
+		overflow: hidden;
+		padding: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		&:hover,
+		&:active {
+			color: $white;
+		}
+
+		&:focus {
+			box-shadow: none;
+		}
+	}
+
+	.edit-site-editor__view-mode-toggle-icon {
+		svg,
+		img {
+			background: $gray-900;
+			display: block;
+		}
+	}
+}
+
+.edit-site-editor__back-icon {
 	position: absolute;
-	right: 0;
-	bottom: 40px;
-	padding-left: 16px;
-	padding-right: 16px;
+	top: 0;
+	left: 0;
+	width: 60px;
+	height: 60px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: hsla(0, 0%, 80%);
+	pointer-events: none;
+
+	svg {
+		fill: currentColor;
+	}
+
+	&.has-site-icon {
+		background-color: hsla(0, 0%, 100%, 0.6);
+		-webkit-backdrop-filter: saturate(180%) blur(15px);
+		backdrop-filter: saturate(180%) blur(15px);
+	}
 }
-@include editor-left(".edit-site .components-editor-notices__snackbar")
diff --git a/packages/edit-site/src/components/editor/use-adapt-editor-to-canvas.js b/packages/edit-site/src/components/editor/use-adapt-editor-to-canvas.js
new file mode 100644
index 00000000000000..a09adfb7a49d53
--- /dev/null
+++ b/packages/edit-site/src/components/editor/use-adapt-editor-to-canvas.js
@@ -0,0 +1,53 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect, useRegistry } from '@wordpress/data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { store as editorStore } from '@wordpress/editor';
+import { useLayoutEffect } from '@wordpress/element';
+import { store as preferencesStore } from '@wordpress/preferences';
+
+export function useAdaptEditorToCanvas( canvas ) {
+	const { clearSelectedBlock } = useDispatch( blockEditorStore );
+	const {
+		setDeviceType,
+		closePublishSidebar,
+		setIsListViewOpened,
+		setIsInserterOpened,
+	} = useDispatch( editorStore );
+	const { get: getPreference } = useSelect( preferencesStore );
+	const registry = useRegistry();
+	useLayoutEffect( () => {
+		const isMediumOrBigger =
+			window.matchMedia( '(min-width: 782px)' ).matches;
+		registry.batch( () => {
+			clearSelectedBlock();
+			setDeviceType( 'Desktop' );
+			closePublishSidebar();
+			setIsInserterOpened( false );
+
+			// Check if the block list view should be open by default.
+			// If `distractionFree` mode is enabled, the block list view should not be open.
+			// This behavior is disabled for small viewports.
+			if (
+				isMediumOrBigger &&
+				canvas === 'edit' &&
+				getPreference( 'core', 'showListViewByDefault' ) &&
+				! getPreference( 'core', 'distractionFree' )
+			) {
+				setIsListViewOpened( true );
+			} else {
+				setIsListViewOpened( false );
+			}
+		} );
+	}, [
+		canvas,
+		registry,
+		clearSelectedBlock,
+		setDeviceType,
+		closePublishSidebar,
+		setIsInserterOpened,
+		setIsListViewOpened,
+		getPreference,
+	] );
+}
diff --git a/packages/edit-site/src/components/editor/use-editor-title.js b/packages/edit-site/src/components/editor/use-editor-title.js
new file mode 100644
index 00000000000000..01e258a5db1073
--- /dev/null
+++ b/packages/edit-site/src/components/editor/use-editor-title.js
@@ -0,0 +1,35 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import useEditedEntityRecord from '../use-edited-entity-record';
+import useTitle from '../routes/use-title';
+import { POST_TYPE_LABELS, TEMPLATE_POST_TYPE } from '../../utils/constants';
+
+function useEditorTitle() {
+	const {
+		record: editedPost,
+		getTitle,
+		isLoaded: hasLoadedPost,
+	} = useEditedEntityRecord();
+	let title;
+	if ( hasLoadedPost ) {
+		title = sprintf(
+			// translators: A breadcrumb trail for the Admin document title. %1$s: title of template being edited, %2$s: type of template (Template or Template Part).
+			__( '%1$s ‹ %2$s' ),
+			getTitle(),
+			POST_TYPE_LABELS[ editedPost.type ] ??
+				POST_TYPE_LABELS[ TEMPLATE_POST_TYPE ]
+		);
+	}
+
+	// Only announce the title once the editor is ready to prevent "Replace"
+	// action in <URLQueryController> from double-announcing.
+	useTitle( hasLoadedPost && title );
+}
+
+export default useEditorTitle;
diff --git a/packages/edit-site/src/components/error-boundary/test/error-boundary.js b/packages/edit-site/src/components/error-boundary/test/error-boundary.js
new file mode 100644
index 00000000000000..27ec4c80419676
--- /dev/null
+++ b/packages/edit-site/src/components/error-boundary/test/error-boundary.js
@@ -0,0 +1,40 @@
+/**
+ * External dependencies
+ */
+import { render } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import * as wpHooks from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import ErrorBoundary from '../index';
+
+const theError = new Error( 'Kaboom' );
+
+const ChildComponent = () => {
+	throw theError;
+};
+
+describe( 'Error Boundary', () => {
+	describe( 'when error is thrown from a Child component', () => {
+		it( 'calls the `editor.ErrorBoundary.errorLogged` hook action with the error object', () => {
+			const doAction = jest.spyOn( wpHooks, 'doAction' );
+
+			render(
+				<ErrorBoundary>
+					<ChildComponent />
+				</ErrorBoundary>
+			);
+
+			expect( doAction ).toHaveBeenCalledWith(
+				'editor.ErrorBoundary.errorLogged',
+				theError
+			);
+			expect( console ).toHaveErrored();
+		} );
+	} );
+} );
diff --git a/packages/edit-site/src/components/error-boundary/warning.js b/packages/edit-site/src/components/error-boundary/warning.js
index af51b43be3431e..c4090c7e6b1190 100644
--- a/packages/edit-site/src/components/error-boundary/warning.js
+++ b/packages/edit-site/src/components/error-boundary/warning.js
@@ -9,7 +9,7 @@ import { useCopyToClipboard } from '@wordpress/compose';
 function CopyButton( { text, children } ) {
 	const ref = useCopyToClipboard( text );
 	return (
-		<Button variant="secondary" ref={ ref }>
+		<Button __next40pxDefaultSize variant="secondary" ref={ ref }>
 			{ children }
 		</Button>
 	);
diff --git a/packages/edit-site/src/components/global-styles-renderer/index.js b/packages/edit-site/src/components/global-styles-renderer/index.js
index 83c7c51bbe366b..2e840a7acdc375 100644
--- a/packages/edit-site/src/components/global-styles-renderer/index.js
+++ b/packages/edit-site/src/components/global-styles-renderer/index.js
@@ -10,11 +10,17 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
  */
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 
 const { useGlobalStylesOutput } = unlock( blockEditorPrivateApis );
 
 function useGlobalStylesRenderer() {
-	const [ styles, settings ] = useGlobalStylesOutput();
+	const postType = useSelect( ( select ) => {
+		return select( editSiteStore ).getEditedPostType();
+	} );
+	const [ styles, settings ] = useGlobalStylesOutput(
+		postType !== TEMPLATE_POST_TYPE
+	);
 	const { getSettings } = useSelect( editSiteStore );
 	const { updateSettings } = useDispatch( editSiteStore );
 
diff --git a/packages/edit-site/src/components/global-styles-sidebar/default-sidebar.js b/packages/edit-site/src/components/global-styles-sidebar/default-sidebar.js
new file mode 100644
index 00000000000000..1f24bb49aa9f80
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles-sidebar/default-sidebar.js
@@ -0,0 +1,51 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { ComplementaryArea, ComplementaryAreaMoreMenuItem } =
+	unlock( editorPrivateApis );
+
+export default function DefaultSidebar( {
+	className,
+	identifier,
+	title,
+	icon,
+	children,
+	closeLabel,
+	header,
+	headerClassName,
+	panelClassName,
+	isActiveByDefault,
+} ) {
+	return (
+		<>
+			<ComplementaryArea
+				className={ className }
+				scope="core"
+				identifier={ identifier }
+				title={ title }
+				icon={ icon }
+				closeLabel={ closeLabel }
+				header={ header }
+				headerClassName={ headerClassName }
+				panelClassName={ panelClassName }
+				isActiveByDefault={ isActiveByDefault }
+			>
+				{ children }
+			</ComplementaryArea>
+			<ComplementaryAreaMoreMenuItem
+				scope="core"
+				identifier={ identifier }
+				icon={ icon }
+			>
+				{ title }
+			</ComplementaryAreaMoreMenuItem>
+		</>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles-sidebar/index.js b/packages/edit-site/src/components/global-styles-sidebar/index.js
new file mode 100644
index 00000000000000..c0ad313d5d477c
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles-sidebar/index.js
@@ -0,0 +1,192 @@
+/**
+ * WordPress dependencies
+ */
+import { FlexItem, Flex, Button } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { styles, seen, backup } from '@wordpress/icons';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useEffect } from '@wordpress/element';
+import { store as preferencesStore } from '@wordpress/preferences';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
+import { useViewportMatch } from '@wordpress/compose';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
+/**
+ * Internal dependencies
+ */
+import { GlobalStylesUI } from '../global-styles';
+import { store as editSiteStore } from '../../store';
+import { GlobalStylesMenuSlot } from '../global-styles/ui';
+import { unlock } from '../../lock-unlock';
+import { store as coreStore } from '@wordpress/core-data';
+import DefaultSidebar from './default-sidebar';
+
+const { interfaceStore } = unlock( editorPrivateApis );
+const { useLocation } = unlock( routerPrivateApis );
+
+export default function GlobalStylesSidebar() {
+	const { params } = useLocation();
+	const { canvas = 'view' } = params;
+	const {
+		shouldClearCanvasContainerView,
+		isStyleBookOpened,
+		showListViewByDefault,
+		hasRevisions,
+		isRevisionsOpened,
+		isRevisionsStyleBookOpened,
+	} = useSelect(
+		( select ) => {
+			const { getActiveComplementaryArea } = select( interfaceStore );
+			const { getEditorCanvasContainerView } = unlock(
+				select( editSiteStore )
+			);
+			const canvasContainerView = getEditorCanvasContainerView();
+			const _isVisualEditorMode =
+				'visual' === select( editorStore ).getEditorMode();
+			const _isEditCanvasMode = 'edit' === canvas;
+			const _showListViewByDefault = select( preferencesStore ).get(
+				'core',
+				'showListViewByDefault'
+			);
+			const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =
+				select( coreStore );
+
+			const globalStylesId = __experimentalGetCurrentGlobalStylesId();
+			const globalStyles = globalStylesId
+				? getEntityRecord( 'root', 'globalStyles', globalStylesId )
+				: undefined;
+
+			return {
+				isStyleBookOpened: 'style-book' === canvasContainerView,
+				shouldClearCanvasContainerView:
+					'edit-site/global-styles' !==
+						getActiveComplementaryArea( 'core' ) ||
+					! _isVisualEditorMode ||
+					! _isEditCanvasMode,
+				showListViewByDefault: _showListViewByDefault,
+				hasRevisions:
+					!! globalStyles?._links?.[ 'version-history' ]?.[ 0 ]
+						?.count,
+				isRevisionsStyleBookOpened:
+					'global-styles-revisions:style-book' ===
+					canvasContainerView,
+				isRevisionsOpened:
+					'global-styles-revisions' === canvasContainerView,
+			};
+		},
+		[ canvas ]
+	);
+	const { setEditorCanvasContainerView } = unlock(
+		useDispatch( editSiteStore )
+	);
+	const isMobileViewport = useViewportMatch( 'medium', '<' );
+
+	useEffect( () => {
+		if ( shouldClearCanvasContainerView ) {
+			setEditorCanvasContainerView( undefined );
+		}
+	}, [ shouldClearCanvasContainerView, setEditorCanvasContainerView ] );
+
+	const { setIsListViewOpened } = useDispatch( editorStore );
+
+	const toggleRevisions = () => {
+		setIsListViewOpened( false );
+		if ( isRevisionsStyleBookOpened ) {
+			setEditorCanvasContainerView( 'style-book' );
+			return;
+		}
+		if ( isRevisionsOpened ) {
+			setEditorCanvasContainerView( undefined );
+			return;
+		}
+
+		if ( isStyleBookOpened ) {
+			setEditorCanvasContainerView(
+				'global-styles-revisions:style-book'
+			);
+		} else {
+			setEditorCanvasContainerView( 'global-styles-revisions' );
+		}
+	};
+	const toggleStyleBook = () => {
+		if ( isRevisionsOpened ) {
+			setEditorCanvasContainerView(
+				'global-styles-revisions:style-book'
+			);
+			return;
+		}
+		if ( isRevisionsStyleBookOpened ) {
+			setEditorCanvasContainerView( 'global-styles-revisions' );
+			return;
+		}
+		setIsListViewOpened( isStyleBookOpened && showListViewByDefault );
+		setEditorCanvasContainerView(
+			isStyleBookOpened ? undefined : 'style-book'
+		);
+	};
+
+	return (
+		<DefaultSidebar
+			className="edit-site-global-styles-sidebar"
+			identifier="edit-site/global-styles"
+			title={ __( 'Styles' ) }
+			icon={ styles }
+			closeLabel={ __( 'Close Styles' ) }
+			panelClassName="edit-site-global-styles-sidebar__panel"
+			header={
+				<Flex
+					className="edit-site-global-styles-sidebar__header"
+					gap={ 1 }
+				>
+					<FlexItem>
+						<h2 className="edit-site-global-styles-sidebar__header-title">
+							{ __( 'Styles' ) }
+						</h2>
+					</FlexItem>
+					<Flex
+						justify="flex-end"
+						gap={ 1 }
+						className="edit-site-global-styles-sidebar__header-actions"
+					>
+						{ ! isMobileViewport && (
+							<FlexItem>
+								<Button
+									icon={ seen }
+									label={ __( 'Style Book' ) }
+									isPressed={
+										isStyleBookOpened ||
+										isRevisionsStyleBookOpened
+									}
+									accessibleWhenDisabled
+									disabled={ shouldClearCanvasContainerView }
+									onClick={ toggleStyleBook }
+									size="compact"
+								/>
+							</FlexItem>
+						) }
+						<FlexItem>
+							<Button
+								label={ __( 'Revisions' ) }
+								icon={ backup }
+								onClick={ toggleRevisions }
+								accessibleWhenDisabled
+								disabled={ ! hasRevisions }
+								isPressed={
+									isRevisionsOpened ||
+									isRevisionsStyleBookOpened
+								}
+								size="compact"
+							/>
+						</FlexItem>
+						<GlobalStylesMenuSlot />
+					</Flex>
+				</Flex>
+			}
+		>
+			<GlobalStylesUI />
+		</DefaultSidebar>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles-sidebar/style.scss b/packages/edit-site/src/components/global-styles-sidebar/style.scss
new file mode 100644
index 00000000000000..30b1fc597ad707
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles-sidebar/style.scss
@@ -0,0 +1,96 @@
+.editor-sidebar {
+	width: $sidebar-width;
+
+	> .components-panel {
+		border-left: 0;
+		border-right: 0;
+		margin-bottom: -1px;
+		margin-top: -1px;
+
+		> .components-panel__header {
+			background: $gray-100;
+		}
+	}
+
+	.block-editor-block-inspector__card {
+		margin: 0;
+	}
+}
+
+.edit-site-global-styles-sidebar {
+	display: flex;
+	flex-direction: column;
+	min-height: 100%;
+
+	&__panel {
+		flex: 1;
+	}
+}
+
+.edit-site-global-styles-sidebar .edit-site-global-styles-sidebar__header-title {
+	margin: 0;
+}
+
+.edit-site-global-styles-sidebar .edit-site-global-styles-sidebar__header-actions {
+	flex: 1;
+}
+
+.edit-site-global-styles-sidebar .components-navigation__menu-title-heading {
+	font-size: $default-font-size * 1.2;
+	font-weight: 500;
+}
+
+.edit-site-global-styles-sidebar .components-navigation__item > button span {
+	font-weight: 500;
+}
+
+.edit-site-global-styles-sidebar .block-editor-panel-color-gradient-settings {
+	border: 0;
+}
+
+.edit-site-global-styles-sidebar .single-column {
+	grid-column: span 1;
+}
+
+.edit-site-global-styles-sidebar .components-tools-panel .span-columns {
+	grid-column: 1 / -1;
+}
+
+.edit-site-global-styles-sidebar__blocks-group {
+	padding-top: $grid-unit-30;
+	border-top: $border-width solid $gray-200;
+}
+
+.edit-site-global-styles-sidebar__blocks-group-help {
+	padding: 0 $grid-unit-20;
+}
+
+.edit-site-global-styles-color-palette-panel,
+.edit-site-global-styles-gradient-palette-panel {
+	padding: $grid-unit-20;
+}
+
+// Override the `hr` styles defined in the `ComplementaryArea` component
+// from the `@wordpress/interface` package.
+.edit-site-global-styles-sidebar hr {
+	margin: 0;
+}
+
+.show-icon-labels {
+	.edit-site-global-styles-sidebar__header {
+		.components-button.has-icon {
+			width: auto;
+
+			// Hide the button icons when labels are set to display...
+			svg {
+				display: none;
+			}
+			// ... and display labels.
+			&::after {
+				content: attr(aria-label);
+				font-size: $helptext-font-size;
+			}
+		}
+	}
+}
+
diff --git a/packages/edit-site/src/components/global-styles/background-panel.js b/packages/edit-site/src/components/global-styles/background-panel.js
new file mode 100644
index 00000000000000..e185079d8cee04
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/background-panel.js
@@ -0,0 +1,55 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+// Initial control values where no block style is set.
+const BACKGROUND_DEFAULT_VALUES = {
+	backgroundSize: 'auto',
+};
+
+const {
+	useGlobalStyle,
+	useGlobalSetting,
+	BackgroundPanel: StylesBackgroundPanel,
+} = unlock( blockEditorPrivateApis );
+
+/**
+ * Checks if there is a current value in the background image block support
+ * attributes.
+ *
+ * @param {Object} style Style attribute.
+ * @return {boolean}     Whether the block has a background image value set.
+ */
+export function hasBackgroundImageValue( style ) {
+	return (
+		!! style?.background?.backgroundImage?.id ||
+		!! style?.background?.backgroundImage?.url ||
+		typeof style?.background?.backgroundImage === 'string'
+	);
+}
+
+export default function BackgroundPanel() {
+	const [ style ] = useGlobalStyle( '', undefined, 'user', {
+		shouldDecodeEncode: false,
+	} );
+	const [ inheritedStyle, setStyle ] = useGlobalStyle( '', undefined, 'all', {
+		shouldDecodeEncode: false,
+	} );
+	const [ settings ] = useGlobalSetting( '' );
+
+	return (
+		<StylesBackgroundPanel
+			inheritedValue={ inheritedStyle }
+			value={ style }
+			onChange={ setStyle }
+			settings={ settings }
+			defaultValues={ BACKGROUND_DEFAULT_VALUES }
+		/>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles/block-preview-panel.js b/packages/edit-site/src/components/global-styles/block-preview-panel.js
index 24bd2e666eab3e..6b1b980377c9cb 100644
--- a/packages/edit-site/src/components/global-styles/block-preview-panel.js
+++ b/packages/edit-site/src/components/global-styles/block-preview-panel.js
@@ -6,6 +6,11 @@ import { getBlockType, getBlockFromExample } from '@wordpress/blocks';
 import { __experimentalSpacer as Spacer } from '@wordpress/components';
 import { useMemo } from '@wordpress/element';
 
+/**
+ * Internal dependencies
+ */
+import { getVariationClassName } from './utils';
+
 const BlockPreviewPanel = ( { name, variation = '' } ) => {
 	const blockExample = getBlockType( name )?.example;
 	const blocks = useMemo( () => {
@@ -19,7 +24,7 @@ const BlockPreviewPanel = ( { name, variation = '' } ) => {
 				...example,
 				attributes: {
 					...example.attributes,
-					className: 'is-style-' + variation,
+					className: getVariationClassName( variation ),
 				},
 			};
 		}
@@ -27,8 +32,15 @@ const BlockPreviewPanel = ( { name, variation = '' } ) => {
 		return getBlockFromExample( name, example );
 	}, [ name, blockExample, variation ] );
 
-	const viewportWidth = blockExample?.viewportWidth ?? null;
-	const previewHeight = '150px';
+	const viewportWidth = blockExample?.viewportWidth ?? 500;
+	// Same as height of InserterPreviewPanel.
+	const previewHeight = 144;
+	const sidebarWidth = 235;
+	const scale = sidebarWidth / viewportWidth;
+	const minHeight =
+		scale !== 0 && scale < 1 && previewHeight
+			? previewHeight / scale
+			: previewHeight;
 
 	if ( ! blockExample ) {
 		return null;
@@ -44,16 +56,22 @@ const BlockPreviewPanel = ( { name, variation = '' } ) => {
 					blocks={ blocks }
 					viewportWidth={ viewportWidth }
 					minHeight={ previewHeight }
-					additionalStyles={ [
-						{
-							css: `
+					additionalStyles={
+						//We want this CSS to be in sync with the one in InserterPreviewPanel.
+						[
+							{
+								css: `
 								body{
-									min-height:${ previewHeight };
-									display:flex;align-items:center;justify-content:center;
+									padding: 24px;
+									min-height:${ Math.round( minHeight ) }px;
+									display:flex;
+									align-items:center;
 								}
+								.is-root-container { width: 100%; }
 							`,
-						},
-					] }
+							},
+						]
+					}
 				/>
 			</div>
 		</Spacer>
diff --git a/packages/edit-site/src/components/global-styles/color-indicator-wrapper.js b/packages/edit-site/src/components/global-styles/color-indicator-wrapper.js
index 9466b2d2282ec0..242a5c77102687 100644
--- a/packages/edit-site/src/components/global-styles/color-indicator-wrapper.js
+++ b/packages/edit-site/src/components/global-styles/color-indicator-wrapper.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,7 +11,7 @@ import { Flex } from '@wordpress/components';
 function ColorIndicatorWrapper( { className, ...props } ) {
 	return (
 		<Flex
-			className={ classnames(
+			className={ clsx(
 				'edit-site-global-styles__color-indicator-wrapper',
 				className
 			) }
diff --git a/packages/edit-site/src/components/global-styles/color-palette-panel.js b/packages/edit-site/src/components/global-styles/color-palette-panel.js
index 03401cab9f80b5..0b1d482c0a1b3d 100644
--- a/packages/edit-site/src/components/global-styles/color-palette-panel.js
+++ b/packages/edit-site/src/components/global-styles/color-palette-panel.js
@@ -13,6 +13,7 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
  * Internal dependencies
  */
 import { unlock } from '../../lock-unlock';
+import ColorVariations from './variations/variations-color';
 
 const { useGlobalSetting } = unlock( blockEditorPrivateApis );
 const mobilePopoverProps = { placement: 'bottom-start', offset: 8 };
@@ -45,14 +46,13 @@ export default function ColorPalettePanel( { name } ) {
 		'color.defaultPalette',
 		name
 	);
-
 	const isMobileViewport = useViewportMatch( 'small', '<' );
 	const popoverProps = isMobileViewport ? mobilePopoverProps : undefined;
 
 	return (
 		<VStack
 			className="edit-site-global-styles-color-palette-panel"
-			spacing={ 10 }
+			spacing={ 8 }
 		>
 			{ !! themeColors && !! themeColors.length && (
 				<PaletteEdit
@@ -83,12 +83,10 @@ export default function ColorPalettePanel( { name } ) {
 				onChange={ setCustomColors }
 				paletteLabel={ __( 'Custom' ) }
 				paletteLabelHeadingLevel={ 3 }
-				emptyMessage={ __(
-					'Custom colors are empty! Add some colors to create your own color palette.'
-				) }
 				slugPrefix="custom-"
 				popoverProps={ popoverProps }
 			/>
+			<ColorVariations title={ __( 'Palettes' ) } />
 		</VStack>
 	);
 }
diff --git a/packages/edit-site/src/components/global-styles/font-families.js b/packages/edit-site/src/components/global-styles/font-families.js
index 06bf5953283323..f3e81efbe597b0 100644
--- a/packages/edit-site/src/components/global-styles/font-families.js
+++ b/packages/edit-site/src/components/global-styles/font-families.js
@@ -3,13 +3,14 @@
  */
 import { __ } from '@wordpress/i18n';
 import {
+	__experimentalText as Text,
 	__experimentalItemGroup as ItemGroup,
 	__experimentalVStack as VStack,
 	__experimentalHStack as HStack,
 	Button,
-	Tooltip,
 } from '@wordpress/components';
-import { typography } from '@wordpress/icons';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { settings } from '@wordpress/icons';
 import { useContext } from '@wordpress/element';
 
 /**
@@ -21,44 +22,100 @@ import FontLibraryProvider, {
 import FontLibraryModal from './font-library-modal';
 import FontFamilyItem from './font-family-item';
 import Subtitle from './subtitle';
+import { setUIValuesNeeded } from './font-library-modal/utils';
+import { unlock } from '../../lock-unlock';
+
+const { useGlobalSetting } = unlock( blockEditorPrivateApis );
+
+/**
+ * Maps the fonts with the source, if available.
+ *
+ * @param {Array}  fonts  The fonts to map.
+ * @param {string} source The source of the fonts.
+ * @return {Array} The mapped fonts.
+ */
+function mapFontsWithSource( fonts, source ) {
+	return fonts
+		? fonts.map( ( f ) => setUIValuesNeeded( f, { source } ) )
+		: [];
+}
 
 function FontFamilies() {
-	const { modalTabOpen, toggleModal, themeFonts, customFonts } =
+	const { baseCustomFonts, modalTabOpen, setModalTabOpen } =
 		useContext( FontLibraryContext );
+	const [ fontFamilies ] = useGlobalSetting( 'typography.fontFamilies' );
+	const [ baseFontFamilies ] = useGlobalSetting(
+		'typography.fontFamilies',
+		undefined,
+		'base'
+	);
+	const themeFonts = mapFontsWithSource( fontFamilies?.theme, 'theme' );
+	const customFonts = mapFontsWithSource( fontFamilies?.custom, 'custom' );
+	const activeFonts = [ ...themeFonts, ...customFonts ].sort( ( a, b ) =>
+		a.name.localeCompare( b.name )
+	);
+	const hasFonts = 0 < activeFonts.length;
+	const hasInstalledFonts =
+		hasFonts ||
+		baseFontFamilies?.theme?.length > 0 ||
+		baseCustomFonts?.length > 0;
 
 	return (
 		<>
 			{ !! modalTabOpen && (
 				<FontLibraryModal
-					onRequestClose={ () => toggleModal() }
-					initialTabName={ modalTabOpen }
+					onRequestClose={ () => setModalTabOpen( null ) }
+					defaultTabId={ modalTabOpen }
 				/>
 			) }
 
-			<VStack spacing={ 3 }>
+			<VStack spacing={ 2 }>
 				<HStack justify="space-between">
 					<Subtitle level={ 3 }>{ __( 'Fonts' ) }</Subtitle>
-					<HStack justify="flex-end">
-						<Tooltip text={ __( 'Manage fonts' ) }>
-							<Button
-								onClick={ () =>
-									toggleModal( 'installed-fonts' )
-								}
-								aria-label={ __( 'Manage fonts' ) }
-								icon={ typography }
-								size={ 'small' }
-							/>
-						</Tooltip>
-					</HStack>
+					<Button
+						onClick={ () => setModalTabOpen( 'installed-fonts' ) }
+						label={ __( 'Manage fonts' ) }
+						icon={ settings }
+						size="small"
+					/>
 				</HStack>
-				<ItemGroup isBordered isSeparated>
-					{ customFonts.map( ( font ) => (
-						<FontFamilyItem key={ font.slug } font={ font } />
-					) ) }
-					{ themeFonts.map( ( font ) => (
-						<FontFamilyItem key={ font.slug } font={ font } />
-					) ) }
-				</ItemGroup>
+				{ activeFonts.length > 0 && (
+					<>
+						<ItemGroup size="large" isBordered isSeparated>
+							{ activeFonts.map( ( font ) => (
+								<FontFamilyItem
+									key={ font.slug }
+									font={ font }
+								/>
+							) ) }
+						</ItemGroup>
+					</>
+				) }
+				{ ! hasFonts && (
+					<>
+						<Text as="p">
+							{ hasInstalledFonts
+								? __( 'No fonts activated.' )
+								: __( 'No fonts installed.' ) }
+						</Text>
+						<Button
+							className="edit-site-global-styles-font-families__manage-fonts"
+							variant="secondary"
+							__next40pxDefaultSize
+							onClick={ () => {
+								setModalTabOpen(
+									hasInstalledFonts
+										? 'installed-fonts'
+										: 'upload-fonts'
+								);
+							} }
+						>
+							{ hasInstalledFonts
+								? __( 'Manage fonts' )
+								: __( 'Add fonts' ) }
+						</Button>
+					</>
+				) }
 			</VStack>
 		</>
 	);
diff --git a/packages/edit-site/src/components/global-styles/font-family-item.js b/packages/edit-site/src/components/global-styles/font-family-item.js
index a0044e156c9fbd..b80865fd2e21af 100644
--- a/packages/edit-site/src/components/global-styles/font-family-item.js
+++ b/packages/edit-site/src/components/global-styles/font-family-item.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { _n } from '@wordpress/i18n';
+import { _n, sprintf } from '@wordpress/i18n';
 import {
 	__experimentalHStack as HStack,
 	__experimentalItem as Item,
@@ -16,14 +16,14 @@ import { FontLibraryContext } from './font-library-modal/context';
 import { getFamilyPreviewStyle } from './font-library-modal/utils/preview-styles';
 
 function FontFamilyItem( { font } ) {
-	const { handleSetLibraryFontSelected, toggleModal } =
+	const { handleSetLibraryFontSelected, setModalTabOpen } =
 		useContext( FontLibraryContext );
 
 	const variantsCount = font?.fontFace?.length || 1;
 
 	const handleClick = () => {
 		handleSetLibraryFontSelected( font );
-		toggleModal( 'installed-fonts' );
+		setModalTabOpen( 'installed-fonts' );
 	};
 
 	const previewStyle = getFamilyPreviewStyle( font );
@@ -32,9 +32,12 @@ function FontFamilyItem( { font } ) {
 		<Item onClick={ handleClick }>
 			<HStack justify="space-between">
 				<FlexItem style={ previewStyle }>{ font.name }</FlexItem>
-				<FlexItem style={ { color: '#9e9e9e' } }>
-					{ variantsCount }{ ' ' }
-					{ _n( 'variant', 'variants', variantsCount ) }
+				<FlexItem className="edit-site-global-styles-screen-typography__font-variants-count">
+					{ sprintf(
+						/* translators: %d: Number of font variants. */
+						_n( '%d variant', '%d variants', variantsCount ),
+						variantsCount
+					) }
 				</FlexItem>
 			</HStack>
 		</Item>
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-details.js b/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-details.js
deleted file mode 100644
index de0c1cfa16ec6e..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-details.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalVStack as VStack,
-	__experimentalSpacer as Spacer,
-} from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import CollectionFontVariant from './collection-font-variant';
-import { isFontFontFaceInOutline } from './utils/fonts-outline';
-import { sortFontFaces } from './utils/sort-font-faces';
-
-function CollectionFontDetails( {
-	font,
-	handleToggleVariant,
-	fontToInstallOutline,
-} ) {
-	const fontFaces =
-		font.fontFace && font.fontFace.length
-			? sortFontFaces( font.fontFace )
-			: [
-					{
-						fontFamily: font.fontFamily,
-						fontStyle: 'normal',
-						fontWeight: '400',
-					},
-			  ];
-
-	return (
-		<>
-			<Spacer margin={ 4 } />
-			<VStack spacing={ 0 }>
-				<Spacer margin={ 8 } />
-				{ fontFaces.map( ( face, i ) => (
-					<CollectionFontVariant
-						font={ font }
-						face={ face }
-						key={ `face${ i }` }
-						handleToggleVariant={ handleToggleVariant }
-						selected={ isFontFontFaceInOutline(
-							font.slug,
-							font.fontFace ? face : null, // If the font has no fontFace, we want to check if the font is in the outline
-							fontToInstallOutline
-						) }
-					/>
-				) ) }
-			</VStack>
-			<Spacer margin={ 8 } />
-		</>
-	);
-}
-
-export default CollectionFontDetails;
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js b/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js
index 8c2b36d3adee9f..0719cb873f8f78 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js
@@ -1,14 +1,20 @@
 /**
  * WordPress dependencies
  */
-import { CheckboxControl, Flex } from '@wordpress/components';
+import {
+	CheckboxControl,
+	Flex,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import { getFontFaceVariantName } from './utils';
-import FontFaceDemo from './font-demo';
-import { kebabCase } from '../../../../../block-editor/src/utils/object';
+import FontDemo from './font-demo';
+import { unlock } from '../../../lock-unlock';
+
+const { kebabCase } = unlock( componentsPrivateApis );
 
 function CollectionFontVariant( {
 	face,
@@ -30,21 +36,23 @@ function CollectionFontVariant( {
 	);
 
 	return (
-		<label
-			className="font-library-modal__library-font-variant"
-			htmlFor={ checkboxId }
-		>
-			<Flex justify="space-between" align="center" gap="1rem">
-				<FontFaceDemo fontFace={ face } text={ displayName } />
+		<div className="font-library-modal__font-card">
+			<Flex justify="flex-start" align="center" gap="1rem">
 				<CheckboxControl
 					checked={ selected }
 					onChange={ handleToggleActivation }
-					__nextHasNoMarginBottom={ true }
+					__nextHasNoMarginBottom
 					id={ checkboxId }
-					label={ false }
 				/>
+				<label htmlFor={ checkboxId }>
+					<FontDemo
+						font={ face }
+						text={ displayName }
+						onClick={ handleToggleActivation }
+					/>
+				</label>
 			</Flex>
-		</label>
+		</div>
 	);
 }
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/confirm-delete-dialog.js b/packages/edit-site/src/components/global-styles/font-library-modal/confirm-delete-dialog.js
deleted file mode 100644
index 259b6900dd16d5..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/confirm-delete-dialog.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, sprintf } from '@wordpress/i18n';
-import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components';
-
-function ConfirmDeleteDialog( {
-	font,
-	isConfirmDeleteOpen,
-	handleConfirmUninstall,
-	handleCancelUninstall,
-} ) {
-	return (
-		<ConfirmDialog
-			isOpen={ isConfirmDeleteOpen }
-			cancelButtonText={ __( 'No, keep the font' ) }
-			confirmButtonText={ __( 'Yes, uninstall' ) }
-			onCancel={ handleCancelUninstall }
-			onConfirm={ handleConfirmUninstall }
-		>
-			{ font &&
-				sprintf(
-					/* translators: %s: Name of the font. */
-					__(
-						'Would you like to remove %s and all its variants and assets?'
-					),
-					font.name
-				) }
-		</ConfirmDialog>
-	);
-}
-
-export default ConfirmDeleteDialog;
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/context.js b/packages/edit-site/src/components/global-styles/font-library-modal/context.js
index 58b8621adcf0c3..abfb5484e44bf5 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/context.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/context.js
@@ -9,13 +9,15 @@ import {
 	useEntityRecords,
 	store as coreStore,
 } from '@wordpress/core-data';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import {
-	fetchInstallFonts,
-	fetchUninstallFonts,
+	fetchGetFontFamilyBySlug,
+	fetchInstallFontFamily,
+	fetchUninstallFontFamily,
 	fetchFontCollections,
 	fetchFontCollection,
 } from './resolvers';
@@ -25,17 +27,20 @@ import {
 	setUIValuesNeeded,
 	mergeFontFamilies,
 	loadFontFaceInBrowser,
+	unloadFontFaceInBrowser,
 	getDisplaySrcFromFontFace,
-	makeFormDataFromFontFamilies,
+	makeFontFacesFormData,
+	makeFontFamilyFormData,
+	batchInstallFontFaces,
+	checkFontFaceInstalled,
 } from './utils';
 import { toggleFont } from './utils/toggleFont';
-import getIntersectingFontFaces from './utils/get-intersecting-font-faces';
+import setNestedValue from '../../../utils/set-nested-value';
 
 export const FontLibraryContext = createContext( {} );
 
 function FontLibraryProvider( { children } ) {
-	const { __experimentalSaveSpecifiedEntityEdits: saveSpecifiedEntityEdits } =
-		useDispatch( coreStore );
+	const { saveEntityRecord } = useDispatch( coreStore );
 	const { globalStylesId } = useSelect( ( select ) => {
 		const { __experimentalGetCurrentGlobalStylesId } = select( coreStore );
 		return { globalStylesId: __experimentalGetCurrentGlobalStylesId() };
@@ -46,8 +51,6 @@ function FontLibraryProvider( { children } ) {
 		'globalStyles',
 		globalStylesId
 	);
-	const fontFamiliesHasChanges =
-		!! globalStyles?.edits?.settings?.typography?.fontFamilies;
 
 	const [ isInstalling, setIsInstalling ] = useState( false );
 	const [ refreshKey, setRefreshKey ] = useState( 0 );
@@ -56,45 +59,60 @@ function FontLibraryProvider( { children } ) {
 		setRefreshKey( Date.now() );
 	};
 
-	const {
-		records: libraryPosts = [],
-		isResolving: isResolvingLibrary,
-		hasResolved: hasResolvedLibrary,
-	} = useEntityRecords( 'postType', 'wp_font_family', { refreshKey } );
+	const { records: libraryPosts = [], isResolving: isResolvingLibrary } =
+		useEntityRecords( 'postType', 'wp_font_family', {
+			refreshKey,
+			_embed: true,
+		} );
 
 	const libraryFonts =
-		( libraryPosts || [] ).map( ( post ) =>
-			JSON.parse( post.content.raw )
-		) || [];
+		( libraryPosts || [] ).map( ( fontFamilyPost ) => {
+			return {
+				id: fontFamilyPost.id,
+				...fontFamilyPost.font_family_settings,
+				fontFace:
+					fontFamilyPost?._embedded?.font_faces.map(
+						( face ) => face.font_face_settings
+					) || [],
+			};
+		} ) || [];
 
 	// Global Styles (settings) font families
 	const [ fontFamilies, setFontFamilies ] = useGlobalSetting(
 		'typography.fontFamilies'
 	);
-	// theme.json file font families
-	const [ baseFontFamilies ] = useGlobalSetting(
-		'typography.fontFamilies',
-		undefined,
-		'base'
-	);
 
-	// Save font families to the global styles post in the database.
-	const saveFontFamilies = () => {
-		saveSpecifiedEntityEdits( 'root', 'globalStyles', globalStylesId, [
-			'settings.typography.fontFamilies',
-		] );
+	/*
+	 * Save the font families to the database.
+
+	 * This function is called when the user activates or deactivates a font family.
+	 * It only updates the global styles post content in the database for new font families.
+	 * This avoids saving other styles/settings changed by the user using other parts of the editor.
+	 *
+	 * It uses the font families from the param to avoid using the font families from an outdated state.
+	 *
+	 * @param {Array} fonts - The font families that will be saved to the database.
+	 */
+	const saveFontFamilies = async ( fonts ) => {
+		// Gets the global styles database post content.
+		const updatedGlobalStyles = globalStyles.record;
+
+		// Updates the database version of global styles with the edited font families in the client.
+		setNestedValue(
+			updatedGlobalStyles,
+			[ 'settings', 'typography', 'fontFamilies' ],
+			fonts
+		);
+
+		// Saves a new version of the global styles in the database.
+		await saveEntityRecord( 'root', 'globalStyles', updatedGlobalStyles );
 	};
 
 	// Library Fonts
 	const [ modalTabOpen, setModalTabOpen ] = useState( false );
 	const [ libraryFontSelected, setLibraryFontSelected ] = useState( null );
 
-	const baseThemeFonts = baseFontFamilies?.theme
-		? baseFontFamilies.theme
-				.map( ( f ) => setUIValuesNeeded( f, { source: 'theme' } ) )
-				.sort( ( a, b ) => a.name.localeCompare( b.name ) )
-		: [];
-
+	// Themes Fonts are the fonts defined in the global styles (database persisted theme.json data).
 	const themeFonts = fontFamilies?.theme
 		? fontFamilies.theme
 				.map( ( f ) => setUIValuesNeeded( f, { source: 'theme' } ) )
@@ -126,8 +144,7 @@ function FontLibraryProvider( { children } ) {
 			return;
 		}
 
-		const fonts =
-			font.source === 'theme' ? baseThemeFonts : baseCustomFonts;
+		const fonts = font.source === 'theme' ? themeFonts : baseCustomFonts;
 
 		// Tries to find the font in the installed fonts
 		const fontSelected = fonts.find( ( f ) => f.slug === font.slug );
@@ -138,30 +155,17 @@ function FontLibraryProvider( { children } ) {
 		} );
 	};
 
-	const toggleModal = ( tabName ) => {
-		setModalTabOpen( tabName || null );
-	};
-
 	// Demo
 	const [ loadedFontUrls ] = useState( new Set() );
 
-	// Theme data
-	const { site, currentTheme } = useSelect( ( select ) => {
-		return {
-			site: select( coreStore ).getSite(),
-			currentTheme: select( coreStore ).getCurrentTheme(),
-		};
-	} );
-	const themeUrl =
-		site?.url + '/wp-content/themes/' + currentTheme?.stylesheet;
-
 	const getAvailableFontsOutline = ( availableFontFamilies ) => {
 		const outline = availableFontFamilies.reduce( ( acc, font ) => {
-			const availableFontFaces = Array.isArray( font?.fontFace )
-				? font?.fontFace.map(
-						( face ) => `${ face.fontStyle + face.fontWeight }`
-				  )
-				: [ 'normal400' ]; // If the font doesn't have fontFace, we assume it is a system font and we add the defaults: normal 400
+			const availableFontFaces =
+				font?.fontFace && font.fontFace?.length > 0
+					? font?.fontFace.map(
+							( face ) => `${ face.fontStyle + face.fontWeight }`
+					  )
+					: [ 'normal400' ]; // If the font doesn't have fontFace, we assume it is a system font and we add the defaults: normal 400
 
 			acc[ font.slug ] = availableFontFaces;
 			return acc;
@@ -192,62 +196,167 @@ function FontLibraryProvider( { children } ) {
 		return getActivatedFontsOutline( source )[ slug ] || [];
 	};
 
-	async function installFonts( fonts ) {
+	async function installFonts( fontFamiliesToInstall ) {
 		setIsInstalling( true );
 		try {
-			// Prepare formData to install.
-			const formData = makeFormDataFromFontFamilies( fonts );
-			// Install the fonts (upload the font files to the server and create the post in the database).
-			const response = await fetchInstallFonts( formData );
-			const fontsInstalled = response?.successes || [];
-			// Get intersecting font faces between the fonts we tried to installed and the fonts that were installed
-			// (to avoid activating a non installed font).
-			const fontToBeActivated = getIntersectingFontFaces(
-				fontsInstalled,
-				fonts
+			const fontFamiliesToActivate = [];
+			let installationErrors = [];
+
+			for ( const fontFamilyToInstall of fontFamiliesToInstall ) {
+				let isANewFontFamily = false;
+
+				// Get the font family if it already exists.
+				let installedFontFamily = await fetchGetFontFamilyBySlug(
+					fontFamilyToInstall.slug
+				);
+
+				// Otherwise create it.
+				if ( ! installedFontFamily ) {
+					isANewFontFamily = true;
+					// Prepare font family form data to install.
+					installedFontFamily = await fetchInstallFontFamily(
+						makeFontFamilyFormData( fontFamilyToInstall )
+					);
+				}
+
+				// Collect font faces that have already been installed (to be activated later)
+				const alreadyInstalledFontFaces =
+					installedFontFamily.fontFace && fontFamilyToInstall.fontFace
+						? installedFontFamily.fontFace.filter(
+								( fontFaceToInstall ) =>
+									checkFontFaceInstalled(
+										fontFaceToInstall,
+										fontFamilyToInstall.fontFace
+									)
+						  )
+						: [];
+
+				// Filter out Font Faces that have already been installed (so that they are not re-installed)
+				if (
+					installedFontFamily.fontFace &&
+					fontFamilyToInstall.fontFace
+				) {
+					fontFamilyToInstall.fontFace =
+						fontFamilyToInstall.fontFace.filter(
+							( fontFaceToInstall ) =>
+								! checkFontFaceInstalled(
+									fontFaceToInstall,
+									installedFontFamily.fontFace
+								)
+						);
+				}
+
+				// Install the fonts (upload the font files to the server and create the post in the database).
+				let successfullyInstalledFontFaces = [];
+				let unsuccessfullyInstalledFontFaces = [];
+				if ( fontFamilyToInstall?.fontFace?.length > 0 ) {
+					const response = await batchInstallFontFaces(
+						installedFontFamily.id,
+						makeFontFacesFormData( fontFamilyToInstall )
+					);
+					successfullyInstalledFontFaces = response?.successes;
+					unsuccessfullyInstalledFontFaces = response?.errors;
+				}
+
+				// Use the successfully installed font faces
+				// As well as any font faces that were already installed (those will be activated)
+				if (
+					successfullyInstalledFontFaces?.length > 0 ||
+					alreadyInstalledFontFaces?.length > 0
+				) {
+					// Use font data from REST API not from client to ensure
+					// correct font information is used.
+					installedFontFamily.fontFace = [
+						...successfullyInstalledFontFaces,
+					];
+
+					fontFamiliesToActivate.push( installedFontFamily );
+				}
+
+				// If it's a system font but was installed successfully, activate it.
+				if (
+					installedFontFamily &&
+					! fontFamilyToInstall?.fontFace?.length
+				) {
+					fontFamiliesToActivate.push( installedFontFamily );
+				}
+
+				// If the font family is new and is not a system font, delete it to avoid having font families without font faces.
+				if (
+					isANewFontFamily &&
+					fontFamilyToInstall?.fontFace?.length > 0 &&
+					successfullyInstalledFontFaces?.length === 0
+				) {
+					await fetchUninstallFontFamily( installedFontFamily.id );
+				}
+
+				installationErrors = installationErrors.concat(
+					unsuccessfullyInstalledFontFaces
+				);
+			}
+
+			installationErrors = installationErrors.reduce(
+				( unique, item ) =>
+					unique.includes( item.message )
+						? unique
+						: [ ...unique, item.message ],
+				[]
 			);
-			// Activate the font families (add the font families to the global styles).
-			activateCustomFontFamilies( fontToBeActivated );
-			// Save the global styles to the database.
-			saveSpecifiedEntityEdits( 'root', 'globalStyles', globalStylesId, [
-				'settings.typography.fontFamilies',
-			] );
-			refreshLibrary();
-			setIsInstalling( false );
 
-			return response;
-		} catch ( error ) {
+			if ( fontFamiliesToActivate.length > 0 ) {
+				// Activate the font family (add the font family to the global styles).
+				const activeFonts = activateCustomFontFamilies(
+					fontFamiliesToActivate
+				);
+				// Save the global styles to the database.
+				await saveFontFamilies( activeFonts );
+
+				refreshLibrary();
+			}
+
+			if ( installationErrors.length > 0 ) {
+				const installError = new Error(
+					__( 'There was an error installing fonts.' )
+				);
+
+				installError.installationErrors = installationErrors;
+
+				throw installError;
+			}
+		} finally {
 			setIsInstalling( false );
-			return {
-				errors: [ error ],
-			};
 		}
 	}
 
-	async function uninstallFont( font ) {
+	async function uninstallFontFamily( fontFamilyToUninstall ) {
 		try {
-			// Uninstall the font (remove the font files from the server and the post from the database).
-			const response = await fetchUninstallFonts( [ font ] );
-			// Deactivate the font family (remove the font family from the global styles).
-			if ( 0 === response.errors.length ) {
-				deactivateFontFamily( font );
-				// Save the global styles to the database.
-				await saveSpecifiedEntityEdits(
-					'root',
-					'globalStyles',
-					globalStylesId,
-					[ 'settings.typography.fontFamilies' ]
+			// Uninstall the font family.
+			// (Removes the font files from the server and the posts from the database).
+			const uninstalledFontFamily = await fetchUninstallFontFamily(
+				fontFamilyToUninstall.id
+			);
+
+			// Deactivate the font family if delete request is successful
+			// (Removes the font family from the global styles).
+			if ( uninstalledFontFamily.deleted ) {
+				const activeFonts = deactivateFontFamily(
+					fontFamilyToUninstall
 				);
+				// Save the global styles to the database.
+				await saveFontFamilies( activeFonts );
 			}
-			// Refresh the library (the the library font families from database).
+
+			// Refresh the library (the library font families from database).
 			refreshLibrary();
-			return response;
+
+			return uninstalledFontFamily;
 		} catch ( error ) {
 			// eslint-disable-next-line no-console
-			console.error( error );
-			return {
-				errors: [ error ],
-			};
+			console.error(
+				`There was an error uninstalling the font family:`,
+				error
+			);
+			throw error;
 		}
 	}
 
@@ -258,32 +367,61 @@ function FontLibraryProvider( { children } ) {
 		const newCustomFonts = initialCustomFonts.filter(
 			( f ) => f.slug !== font.slug
 		);
-		setFontFamilies( {
+		const activeFonts = {
 			...fontFamilies,
 			[ font.source ]: newCustomFonts,
-		} );
+		};
+		setFontFamilies( activeFonts );
+
+		if ( font.fontFace ) {
+			font.fontFace.forEach( ( face ) => {
+				unloadFontFaceInBrowser( face, 'all' );
+			} );
+		}
+		return activeFonts;
 	};
 
 	const activateCustomFontFamilies = ( fontsToAdd ) => {
-		// Merge the existing custom fonts with the new fonts.
-		const newCustomFonts = mergeFontFamilies(
-			fontFamilies?.custom,
-			fontsToAdd
-		);
-		// Activate the fonts by set the new custom fonts array.
-		setFontFamilies( {
+		const fontsToActivate = cleanFontsForSave( fontsToAdd );
+
+		const activeFonts = {
 			...fontFamilies,
-			custom: newCustomFonts,
-		} );
+			// Merge the existing custom fonts with the new fonts.
+			custom: mergeFontFamilies( fontFamilies?.custom, fontsToActivate ),
+		};
+
+		// Activate the fonts by set the new custom fonts array.
+		setFontFamilies( activeFonts );
+
+		loadFontsInBrowser( fontsToActivate );
+
+		return activeFonts;
+	};
+
+	// Removes the id from the families and faces to avoid saving that to global styles post content.
+	const cleanFontsForSave = ( fonts ) => {
+		return fonts.map( ( { id: _familyDbId, fontFace, ...font } ) => ( {
+			...font,
+			...( fontFace && fontFace.length > 0
+				? {
+						fontFace: fontFace.map(
+							( { id: _faceDbId, ...face } ) => face
+						),
+				  }
+				: {} ),
+		} ) );
+	};
+
+	const loadFontsInBrowser = ( fonts ) => {
 		// Add custom fonts to the browser.
-		fontsToAdd.forEach( ( font ) => {
+		fonts.forEach( ( font ) => {
 			if ( font.fontFace ) {
 				font.fontFace.forEach( ( face ) => {
 					// Load font faces just in the iframe because they already are in the document.
 					loadFontFaceInBrowser(
 						face,
 						getDisplaySrcFromFontFace( face.src ),
-						'iframe'
+						'all'
 					);
 				} );
 			}
@@ -301,15 +439,36 @@ function FontLibraryProvider( { children } ) {
 			...fontFamilies,
 			[ font.source ]: newFonts,
 		} );
+
+		const isFaceActivated = isFontActivated(
+			font.slug,
+			face?.fontStyle,
+			face?.fontWeight,
+			font.source
+		);
+
+		if ( isFaceActivated ) {
+			unloadFontFaceInBrowser( face, 'all' );
+		} else {
+			loadFontFaceInBrowser(
+				face,
+				getDisplaySrcFromFontFace( face?.src ),
+				'all'
+			);
+		}
 	};
 
 	const loadFontFaceAsset = async ( fontFace ) => {
 		// If the font doesn't have a src, don't load it.
-		if ( ! fontFace.src ) return;
+		if ( ! fontFace.src ) {
+			return;
+		}
 		// Get the src of the font.
-		const src = getDisplaySrcFromFontFace( fontFace.src, themeUrl );
+		const src = getDisplaySrcFromFontFace( fontFace.src );
 		// If the font is already loaded, don't load it again.
-		if ( ! src || loadedFontUrls.has( src ) ) return;
+		if ( ! src || loadedFontUrls.has( src ) ) {
+			return;
+		}
 		// Load the font in the browser.
 		loadFontFaceInBrowser( fontFace, src, 'document' );
 		// Add the font to the loaded fonts list.
@@ -322,16 +481,18 @@ function FontLibraryProvider( { children } ) {
 		const response = await fetchFontCollections();
 		setFontCollections( response );
 	};
-	const getFontCollection = async ( id ) => {
+	const getFontCollection = async ( slug ) => {
 		try {
 			const hasData = !! collections.find(
-				( collection ) => collection.id === id
-			)?.data;
-			if ( hasData ) return;
-			const response = await fetchFontCollection( id );
+				( collection ) => collection.slug === slug
+			)?.font_families;
+			if ( hasData ) {
+				return;
+			}
+			const response = await fetchFontCollection( slug );
 			const updatedCollections = collections.map( ( collection ) =>
-				collection.id === id
-					? { ...collection, data: { ...response?.data } }
+				collection.slug === slug
+					? { ...collection, ...response }
 					: collection
 			);
 			setFontCollections( updatedCollections );
@@ -351,24 +512,20 @@ function FontLibraryProvider( { children } ) {
 			value={ {
 				libraryFontSelected,
 				handleSetLibraryFontSelected,
-				themeFonts,
-				baseThemeFonts,
-				customFonts,
+				fontFamilies,
 				baseCustomFonts,
 				isFontActivated,
 				getFontFacesActivated,
 				loadFontFaceAsset,
 				installFonts,
-				uninstallFont,
+				uninstallFontFamily,
 				toggleActivateFont,
 				getAvailableFontsOutline,
 				modalTabOpen,
-				toggleModal,
+				setModalTabOpen,
 				refreshLibrary,
 				saveFontFamilies,
-				fontFamiliesHasChanges,
 				isResolvingLibrary,
-				hasResolvedLibrary,
 				isInstalling,
 				collections,
 				getFontCollection,
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/font-card.js b/packages/edit-site/src/components/global-styles/font-library-modal/font-card.js
index 7553d7cd42a492..61f8c28c77144f 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/font-card.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/font-card.js
@@ -1,8 +1,9 @@
 /**
  * WordPress dependencies
  */
-import { _n } from '@wordpress/i18n';
+import { _n, sprintf, isRTL } from '@wordpress/i18n';
 import {
+	useNavigator,
 	__experimentalText as Text,
 	Button,
 	Flex,
@@ -14,57 +15,48 @@ import {
  * Internal dependencies
  */
 import FontDemo from './font-demo';
-import { getFamilyPreviewStyle } from './utils/preview-styles';
-import { chevronRight } from '@wordpress/icons';
-
-function FontCard( { font, onClick, variantsText } ) {
-	const fakeFontFace = {
-		fontStyle: 'normal',
-		fontWeight: '400',
-		fontFamily: font.fontFamily,
-		fake: true,
-	};
-
-	const displayFontFace =
-		font.fontFace && font.fontFace.length
-			? font?.fontFace?.find(
-					( face ) =>
-						face.fontStyle === 'normal' && face.fontWeight === '400'
-			  ) || font.fontFace[ 0 ]
-			: fakeFontFace;
-
-	const demoStyle = getFamilyPreviewStyle( font );
+import { chevronLeft, chevronRight } from '@wordpress/icons';
 
+function FontCard( { font, onClick, variantsText, navigatorPath } ) {
 	const variantsCount = font.fontFace?.length || 1;
 
 	const style = {
 		cursor: !! onClick ? 'pointer' : 'default',
 	};
 
+	const navigator = useNavigator();
+
 	return (
 		<Button
-			onClick={ onClick }
+			__next40pxDefaultSize
+			onClick={ () => {
+				onClick();
+				if ( navigatorPath ) {
+					navigator.goTo( navigatorPath );
+				}
+			} }
 			style={ style }
 			className="font-library-modal__font-card"
 		>
 			<Flex justify="space-between" wrap={ false }>
-				<FontDemo
-					customPreviewUrl={ font.preview }
-					fontFace={ displayFontFace }
-					text={ font.name }
-					style={ demoStyle }
-				/>
+				<FontDemo font={ font } />
 				<Flex justify="flex-end">
 					<FlexItem>
 						<Text className="font-library-modal__font-card__count">
 							{ variantsText ||
-								variantsCount +
-									' ' +
-									_n( 'variant', 'variants', variantsCount ) }
+								sprintf(
+									/* translators: %d: Number of font variants. */
+									_n(
+										'%d variant',
+										'%d variants',
+										variantsCount
+									),
+									variantsCount
+								) }
 						</Text>
 					</FlexItem>
 					<FlexItem>
-						<Icon icon={ chevronRight } />
+						<Icon icon={ isRTL() ? chevronLeft : chevronRight } />
 					</FlexItem>
 				</Flex>
 			</Flex>
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
index 08ff1a95d6e41a..caf339091de752 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
@@ -1,63 +1,77 @@
 /**
  * WordPress dependencies
  */
-import { useContext, useEffect, useState, useMemo } from '@wordpress/element';
+import {
+	useContext,
+	useEffect,
+	useState,
+	useMemo,
+	createInterpolateElement,
+} from '@wordpress/element';
 import {
 	__experimentalSpacer as Spacer,
-	__experimentalInputControl as InputControl,
 	__experimentalText as Text,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	Navigator,
+	__experimentalHeading as Heading,
+	Notice,
 	SelectControl,
-	Spinner,
-	Icon,
 	FlexItem,
 	Flex,
 	Button,
-	Notice,
+	DropdownMenu,
+	SearchControl,
+	ProgressBar,
+	CheckboxControl,
 } from '@wordpress/components';
 import { debounce } from '@wordpress/compose';
-import { __ } from '@wordpress/i18n';
-import { search, closeSmall } from '@wordpress/icons';
+import { sprintf, __, _x, isRTL } from '@wordpress/i18n';
+import { moreVertical, chevronLeft, chevronRight } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
-import TabLayout from './tab-layout';
 import { FontLibraryContext } from './context';
-import FontsGrid from './fonts-grid';
 import FontCard from './font-card';
 import filterFonts from './utils/filter-fonts';
-import CollectionFontDetails from './collection-font-details';
 import { toggleFont } from './utils/toggleFont';
-import { getFontsOutline } from './utils/fonts-outline';
+import {
+	getFontsOutline,
+	isFontFontFaceInOutline,
+} from './utils/fonts-outline';
 import GoogleFontsConfirmDialog from './google-fonts-confirm-dialog';
-import { getNoticeFromInstallResponse } from './utils/get-notice-from-response';
+import { downloadFontFaceAssets } from './utils';
+import { sortFontFaces } from './utils/sort-font-faces';
+import CollectionFontVariant from './collection-font-variant';
 
 const DEFAULT_CATEGORY = {
-	id: 'all',
-	name: __( 'All' ),
+	slug: 'all',
+	name: _x( 'All', 'font categories' ),
 };
-function FontCollection( { id } ) {
-	const requiresPermission = id === 'default-font-collection';
+
+const LOCAL_STORAGE_ITEM = 'wp-font-library-google-fonts-permission';
+const MIN_WINDOW_HEIGHT = 500;
+
+function FontCollection( { slug } ) {
+	const requiresPermission = slug === 'google-fonts';
 
 	const getGoogleFontsPermissionFromStorage = () => {
-		return (
-			window.localStorage.getItem(
-				'wp-font-library-default-font-collection-permission'
-			) === 'true'
-		);
+		return window.localStorage.getItem( LOCAL_STORAGE_ITEM ) === 'true';
 	};
 
-	const [ notice, setNotice ] = useState( null );
 	const [ selectedFont, setSelectedFont ] = useState( null );
+	const [ notice, setNotice ] = useState( false );
 	const [ fontsToInstall, setFontsToInstall ] = useState( [] );
+	const [ page, setPage ] = useState( 1 );
 	const [ filters, setFilters ] = useState( {} );
 	const [ renderConfirmDialog, setRenderConfirmDialog ] = useState(
 		requiresPermission && ! getGoogleFontsPermissionFromStorage()
 	);
-	const { collections, getFontCollection, installFonts } =
+	const { collections, getFontCollection, installFonts, isInstalling } =
 		useContext( FontLibraryContext );
 	const selectedCollection = collections.find(
-		( collection ) => collection.id === id
+		( collection ) => collection.slug === slug
 	);
 
 	useEffect( () => {
@@ -69,44 +83,44 @@ function FontCollection( { id } ) {
 		handleStorage();
 		window.addEventListener( 'storage', handleStorage );
 		return () => window.removeEventListener( 'storage', handleStorage );
-	}, [ id, requiresPermission ] );
+	}, [ slug, requiresPermission ] );
+
+	const revokeAccess = () => {
+		window.localStorage.setItem( LOCAL_STORAGE_ITEM, 'false' );
+		window.dispatchEvent( new Event( 'storage' ) );
+	};
 
 	useEffect( () => {
 		const fetchFontCollection = async () => {
 			try {
-				await getFontCollection( id );
+				await getFontCollection( slug );
 				resetFilters();
 			} catch ( e ) {
-				setNotice( {
-					type: 'error',
-					message: e?.message,
-					duration: 0, // Don't auto-hide.
-				} );
+				if ( ! notice ) {
+					setNotice( {
+						type: 'error',
+						message: e?.message,
+					} );
+				}
 			}
 		};
 		fetchFontCollection();
-	}, [ id, getFontCollection ] );
+	}, [ slug, getFontCollection, setNotice, notice ] );
 
 	useEffect( () => {
 		setSelectedFont( null );
-		setNotice( null );
-	}, [ id ] );
+	}, [ slug ] );
 
-	// Reset notice after 5 seconds
 	useEffect( () => {
-		if ( notice && notice?.duration !== 0 ) {
-			const timeout = setTimeout( () => {
-				setNotice( null );
-			}, notice.duration ?? 5000 );
-			return () => clearTimeout( timeout );
-		}
-	}, [ notice ] );
+		// If the selected fonts change, reset the selected fonts to install
+		setFontsToInstall( [] );
+	}, [ selectedFont ] );
 
 	const collectionFonts = useMemo(
-		() => selectedCollection?.data?.fontFamilies ?? [],
+		() => selectedCollection?.font_families ?? [],
 		[ selectedCollection ]
 	);
-	const collectionCategories = selectedCollection?.data?.categories ?? [];
+	const collectionCategories = selectedCollection?.categories ?? [];
 
 	const categories = [ DEFAULT_CATEGORY, ...collectionCategories ];
 
@@ -115,26 +129,32 @@ function FontCollection( { id } ) {
 		[ collectionFonts, filters ]
 	);
 
+	const isLoading = ! selectedCollection?.font_families && ! notice;
+
+	// NOTE: The height of the font library modal unavailable to use for rendering font family items is roughly 417px
+	// The height of each font family item is 61px.
+	const windowHeight = Math.max( window.innerHeight, MIN_WINDOW_HEIGHT );
+	const pageSize = Math.floor( ( windowHeight - 417 ) / 61 );
+	const totalPages = Math.ceil( fonts.length / pageSize );
+	const itemsStart = ( page - 1 ) * pageSize;
+	const itemsLimit = page * pageSize;
+	const items = fonts.slice( itemsStart, itemsLimit );
+
 	const handleCategoryFilter = ( category ) => {
 		setFilters( { ...filters, category } );
+		setPage( 1 );
 	};
 
 	const handleUpdateSearchInput = ( value ) => {
 		setFilters( { ...filters, search: value } );
+		setPage( 1 );
 	};
 
 	const debouncedUpdateSearchInput = debounce( handleUpdateSearchInput, 300 );
 
 	const resetFilters = () => {
 		setFilters( {} );
-	};
-
-	const resetSearch = () => {
-		setFilters( { ...filters, search: '' } );
-	};
-
-	const handleUnselectFont = () => {
-		setSelectedFont( null );
+		setPage( 1 );
 	};
 
 	const handleToggleVariant = ( font, face ) => {
@@ -148,146 +168,394 @@ function FontCollection( { id } ) {
 		setFontsToInstall( [] );
 	};
 
+	const selectFontCount =
+		fontsToInstall.length > 0 ? fontsToInstall[ 0 ]?.fontFace?.length : 0;
+
+	// Check if any fonts are selected.
+	const isIndeterminate =
+		selectFontCount > 0 &&
+		selectFontCount !== selectedFont?.fontFace?.length;
+
+	// Check if all fonts are selected.
+	const isSelectAllChecked =
+		selectFontCount === selectedFont?.fontFace?.length;
+
+	// Toggle select all fonts.
+	const toggleSelectAll = () => {
+		const newFonts = isSelectAllChecked ? [] : [ selectedFont ];
+
+		setFontsToInstall( newFonts );
+	};
+
 	const handleInstall = async () => {
-		const response = await installFonts( fontsToInstall );
-		const installNotice = getNoticeFromInstallResponse( response );
-		setNotice( installNotice );
+		setNotice( null );
+
+		const fontFamily = fontsToInstall[ 0 ];
+
+		try {
+			if ( fontFamily?.fontFace ) {
+				await Promise.all(
+					fontFamily.fontFace.map( async ( fontFace ) => {
+						if ( fontFace.src ) {
+							fontFace.file = await downloadFontFaceAssets(
+								fontFace.src
+							);
+						}
+					} )
+				);
+			}
+		} catch ( error ) {
+			// If any of the fonts fail to download,
+			// show an error notice and stop the request from being sent.
+			setNotice( {
+				type: 'error',
+				message: __(
+					'Error installing the fonts, could not be downloaded.'
+				),
+			} );
+			return;
+		}
+
+		try {
+			await installFonts( [ fontFamily ] );
+			setNotice( {
+				type: 'success',
+				message: __( 'Fonts were installed successfully.' ),
+			} );
+		} catch ( error ) {
+			setNotice( {
+				type: 'error',
+				message: error.message,
+			} );
+		}
 		resetFontsToInstall();
 	};
 
+	const getSortedFontFaces = ( fontFamily ) => {
+		if ( ! fontFamily ) {
+			return [];
+		}
+		if ( ! fontFamily.fontFace || ! fontFamily.fontFace.length ) {
+			return [
+				{
+					fontFamily: fontFamily.fontFamily,
+					fontStyle: 'normal',
+					fontWeight: '400',
+				},
+			];
+		}
+		return sortFontFaces( fontFamily.fontFace );
+	};
+
+	if ( renderConfirmDialog ) {
+		return <GoogleFontsConfirmDialog />;
+	}
+
+	const ActionsComponent = () => {
+		if ( slug !== 'google-fonts' || renderConfirmDialog || selectedFont ) {
+			return null;
+		}
+		return (
+			<DropdownMenu
+				icon={ moreVertical }
+				label={ __( 'Actions' ) }
+				popoverProps={ {
+					position: 'bottom left',
+				} }
+				controls={ [
+					{
+						title: __( 'Revoke access to Google Fonts' ),
+						onClick: revokeAccess,
+					},
+				] }
+			/>
+		);
+	};
+
 	return (
-		<TabLayout
-			title={
-				! selectedFont ? selectedCollection.name : selectedFont.name
-			}
-			description={
-				! selectedFont
-					? selectedCollection.description
-					: __( 'Select font variants to install.' )
-			}
-			handleBack={ !! selectedFont && handleUnselectFont }
-			footer={
-				fontsToInstall.length > 0 && (
-					<Footer handleInstall={ handleInstall } />
-				)
-			}
-		>
-			{ renderConfirmDialog && (
-				<>
-					<Spacer margin={ 8 } />
-					<GoogleFontsConfirmDialog />
-				</>
+		<div className="font-library-modal__tabpanel-layout">
+			{ isLoading && (
+				<div className="font-library-modal__loading">
+					<ProgressBar />
+				</div>
 			) }
 
-			{ notice && (
+			{ ! isLoading && (
 				<>
-					<FlexItem>
-						<Spacer margin={ 2 } />
-						<Notice
-							isDismissible={ false }
-							status={ notice.type }
-							className="font-library-modal__font-collection__notice"
-						>
-							{ notice.message }
-						</Notice>
-					</FlexItem>
-					<Spacer margin={ 2 } />
-				</>
-			) }
-
-			{ ! renderConfirmDialog && ! selectedFont && (
-				<Flex>
-					<FlexItem>
-						<InputControl
-							value={ filters.search }
-							placeholder={ __( 'Font name…' ) }
-							label={ __( 'Search' ) }
-							onChange={ debouncedUpdateSearchInput }
-							prefix={ <Icon icon={ search } /> }
-							suffix={
-								filters?.search ? (
-									<Icon
-										icon={ closeSmall }
-										onClick={ resetSearch }
+					<Navigator
+						initialPath="/"
+						className="font-library-modal__tabpanel-layout"
+					>
+						<Navigator.Screen path="/">
+							<HStack justify="space-between">
+								<VStack>
+									<Heading level={ 2 } size={ 13 }>
+										{ selectedCollection.name }
+									</Heading>
+									<Text>
+										{ selectedCollection.description }
+									</Text>
+								</VStack>
+								<ActionsComponent />
+							</HStack>
+							<Spacer margin={ 4 } />
+							<Flex>
+								<FlexItem>
+									<SearchControl
+										className="font-library-modal__search"
+										value={ filters.search }
+										placeholder={ __( 'Font name…' ) }
+										label={ __( 'Search' ) }
+										onChange={ debouncedUpdateSearchInput }
+										__nextHasNoMarginBottom
+										hideLabelFromVision={ false }
 									/>
-								) : null
-							}
-						/>
-					</FlexItem>
-					<FlexItem>
-						<SelectControl
-							label={ __( 'Category' ) }
-							value={ filters.category }
-							onChange={ handleCategoryFilter }
-						>
-							{ categories &&
-								categories.map( ( category ) => (
-									<option
-										value={ category.id }
-										key={ category.id }
+								</FlexItem>
+								<FlexItem>
+									<SelectControl
+										__nextHasNoMarginBottom
+										__next40pxDefaultSize
+										label={ __( 'Category' ) }
+										value={ filters.category }
+										onChange={ handleCategoryFilter }
 									>
-										{ category.name }
-									</option>
-								) ) }
-						</SelectControl>
-					</FlexItem>
-				</Flex>
-			) }
+										{ categories &&
+											categories.map( ( category ) => (
+												<option
+													value={ category.slug }
+													key={ category.slug }
+												>
+													{ category.name }
+												</option>
+											) ) }
+									</SelectControl>
+								</FlexItem>
+							</Flex>
 
-			<Spacer margin={ 4 } />
-			{ ! renderConfirmDialog &&
-				! selectedCollection?.data?.fontFamilies &&
-				! notice && <Spinner /> }
-
-			{ ! renderConfirmDialog &&
-				!! selectedCollection?.data?.fontFamilies?.length &&
-				! fonts.length && (
-					<Text>
-						{ __(
-							'No fonts found. Try with a different search term'
-						) }
-					</Text>
-				) }
-
-			{ ! renderConfirmDialog && selectedFont && (
-				<CollectionFontDetails
-					font={ selectedFont }
-					handleToggleVariant={ handleToggleVariant }
-					fontToInstallOutline={ fontToInstallOutline }
-				/>
-			) }
+							<Spacer margin={ 4 } />
 
-			{ ! renderConfirmDialog && ! selectedFont && (
-				<FontsGrid>
-					{ fonts.map( ( font ) => (
-						<FontCard
-							key={ font.slug }
-							font={ font }
-							onClick={ () => {
-								setSelectedFont( font );
-							} }
-						/>
-					) ) }
-				</FontsGrid>
-			) }
-		</TabLayout>
-	);
-}
+							{ !! selectedCollection?.font_families?.length &&
+								! fonts.length && (
+									<Text>
+										{ __(
+											'No fonts found. Try with a different search term'
+										) }
+									</Text>
+								) }
 
-function Footer( { handleInstall } ) {
-	const { isInstalling } = useContext( FontLibraryContext );
+							<div className="font-library-modal__fonts-grid__main">
+								{ /*
+								 * Disable reason: The `list` ARIA role is redundant but
+								 * Safari+VoiceOver won't announce the list otherwise.
+								 */
+								/* eslint-disable jsx-a11y/no-redundant-roles */ }
+								<ul
+									role="list"
+									className="font-library-modal__fonts-list"
+								>
+									{ items.map( ( font ) => (
+										<li
+											key={
+												font.font_family_settings.slug
+											}
+											className="font-library-modal__fonts-list-item"
+										>
+											<FontCard
+												font={
+													font.font_family_settings
+												}
+												navigatorPath="/fontFamily"
+												onClick={ () => {
+													setSelectedFont(
+														font.font_family_settings
+													);
+												} }
+											/>
+										</li>
+									) ) }
+								</ul>
+								{ /* eslint-enable jsx-a11y/no-redundant-roles */ }
+							</div>
+						</Navigator.Screen>
 
-	return (
-		<Flex justify="flex-end">
-			<Button
-				variant="primary"
-				onClick={ handleInstall }
-				isBusy={ isInstalling }
-				disabled={ isInstalling }
-			>
-				{ __( 'Install' ) }
-			</Button>
-		</Flex>
+						<Navigator.Screen path="/fontFamily">
+							<Flex justify="flex-start">
+								<Navigator.BackButton
+									icon={
+										isRTL() ? chevronRight : chevronLeft
+									}
+									size="small"
+									onClick={ () => {
+										setSelectedFont( null );
+										setNotice( null );
+									} }
+									label={ __( 'Back' ) }
+								/>
+								<Heading
+									level={ 2 }
+									size={ 13 }
+									className="edit-site-global-styles-header"
+								>
+									{ selectedFont?.name }
+								</Heading>
+							</Flex>
+							{ notice && (
+								<>
+									<Spacer margin={ 1 } />
+									<Notice
+										status={ notice.type }
+										onRemove={ () => setNotice( null ) }
+									>
+										{ notice.message }
+									</Notice>
+									<Spacer margin={ 1 } />
+								</>
+							) }
+							<Spacer margin={ 4 } />
+							<Text>
+								{ __( 'Select font variants to install.' ) }
+							</Text>
+							<Spacer margin={ 4 } />
+							<CheckboxControl
+								className="font-library-modal__select-all"
+								label={ __( 'Select all' ) }
+								checked={ isSelectAllChecked }
+								onChange={ toggleSelectAll }
+								indeterminate={ isIndeterminate }
+								__nextHasNoMarginBottom
+							/>
+							<VStack spacing={ 0 }>
+								{ /*
+								 * Disable reason: The `list` ARIA role is redundant but
+								 * Safari+VoiceOver won't announce the list otherwise.
+								 */
+								/* eslint-disable jsx-a11y/no-redundant-roles */ }
+								<ul
+									role="list"
+									className="font-library-modal__fonts-list"
+								>
+									{ getSortedFontFaces( selectedFont ).map(
+										( face, i ) => (
+											<li
+												key={ `face${ i }` }
+												className="font-library-modal__fonts-list-item"
+											>
+												<CollectionFontVariant
+													font={ selectedFont }
+													face={ face }
+													handleToggleVariant={
+														handleToggleVariant
+													}
+													selected={ isFontFontFaceInOutline(
+														selectedFont.slug,
+														selectedFont.fontFace
+															? face
+															: null, // If the font has no fontFace, we want to check if the font is in the outline
+														fontToInstallOutline
+													) }
+												/>
+											</li>
+										)
+									) }
+								</ul>
+								{ /* eslint-enable jsx-a11y/no-redundant-roles */ }
+							</VStack>
+							<Spacer margin={ 16 } />
+						</Navigator.Screen>
+					</Navigator>
+
+					{ selectedFont && (
+						<Flex
+							justify="flex-end"
+							className="font-library-modal__footer"
+						>
+							<Button
+								__next40pxDefaultSize
+								variant="primary"
+								onClick={ handleInstall }
+								isBusy={ isInstalling }
+								disabled={
+									fontsToInstall.length === 0 || isInstalling
+								}
+								accessibleWhenDisabled
+							>
+								{ __( 'Install' ) }
+							</Button>
+						</Flex>
+					) }
+
+					{ ! selectedFont && (
+						<HStack
+							spacing={ 4 }
+							justify="center"
+							className="font-library-modal__footer"
+						>
+							<Button
+								label={ __( 'Previous page' ) }
+								size="compact"
+								onClick={ () => setPage( page - 1 ) }
+								disabled={ page === 1 }
+								showTooltip
+								accessibleWhenDisabled
+								icon={ isRTL() ? chevronRight : chevronLeft }
+								tooltipPosition="top"
+							/>
+							<HStack
+								justify="flex-start"
+								expanded={ false }
+								spacing={ 2 }
+								className="font-library-modal__page-selection"
+							>
+								{ createInterpolateElement(
+									sprintf(
+										// translators: %s: Total number of pages.
+										_x(
+											'Page <CurrentPageControl /> of %s',
+											'paging'
+										),
+										totalPages
+									),
+									{
+										CurrentPageControl: (
+											<SelectControl
+												aria-label={ __(
+													'Current page'
+												) }
+												value={ page }
+												options={ [
+													...Array( totalPages ),
+												].map( ( e, i ) => {
+													return {
+														label: i + 1,
+														value: i + 1,
+													};
+												} ) }
+												onChange={ ( newPage ) =>
+													setPage(
+														parseInt( newPage )
+													)
+												}
+												size="compact"
+												__nextHasNoMarginBottom
+											/>
+										),
+									}
+								) }
+							</HStack>
+							<Button
+								label={ __( 'Next page' ) }
+								size="compact"
+								onClick={ () => setPage( page + 1 ) }
+								disabled={ page === totalPages }
+								accessibleWhenDisabled
+								icon={ isRTL() ? chevronLeft : chevronRight }
+								tooltipPosition="top"
+							/>
+						</HStack>
+					) }
+				</>
+			) }
+		</div>
 	);
 }
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/font-demo.js b/packages/edit-site/src/components/global-styles/font-library-modal/font-demo.js
index 0c464ac2715806..0320bdd4e4893f 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/font-demo.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/font-demo.js
@@ -8,7 +8,10 @@ import { useContext, useEffect, useState, useRef } from '@wordpress/element';
  * Internal dependencies
  */
 import { FontLibraryContext } from './context';
-import { getFacePreviewStyle } from './utils/preview-styles';
+import {
+	getFacePreviewStyle,
+	getFamilyPreviewStyle,
+} from './utils/preview-styles';
 
 function getPreviewUrl( fontFace ) {
 	if ( fontFace.preview ) {
@@ -19,8 +22,39 @@ function getPreviewUrl( fontFace ) {
 	}
 }
 
-function FontFaceDemo( { customPreviewUrl, fontFace, text, style = {} } ) {
+function getDisplayFontFace( font ) {
+	// if this IS a font face return it
+	if ( font.fontStyle || font.fontWeight ) {
+		return font;
+	}
+	// if this is a font family with a collection of font faces
+	// return the first one that is normal and 400 OR just the first one
+	if ( font.fontFace && font.fontFace.length ) {
+		return (
+			font.fontFace.find(
+				( face ) =>
+					face.fontStyle === 'normal' && face.fontWeight === '400'
+			) || font.fontFace[ 0 ]
+		);
+	}
+	// This must be a font family with no font faces
+	// return a fake font face
+	return {
+		fontStyle: 'normal',
+		fontWeight: '400',
+		fontFamily: font.fontFamily,
+		fake: true,
+	};
+}
+
+function FontDemo( { font, text } ) {
 	const ref = useRef( null );
+
+	const fontFace = getDisplayFontFace( font );
+	const style = getFamilyPreviewStyle( font );
+	text = text || font.name;
+	const customPreviewUrl = font.preview;
+
 	const [ isIntersecting, setIsIntersecting ] = useState( false );
 	const [ isAssetLoaded, setIsAssetLoaded ] = useState( false );
 	const { loadFontFaceAsset } = useContext( FontLibraryContext );
@@ -31,17 +65,11 @@ function FontFaceDemo( { customPreviewUrl, fontFace, text, style = {} } ) {
 
 	const faceStyles = getFacePreviewStyle( fontFace );
 	const textDemoStyle = {
-		whiteSpace: 'nowrap',
-		flexShrink: 0,
 		fontSize: '18px',
+		lineHeight: 1,
 		opacity: isAssetLoaded ? '1' : '0',
-		transition: 'opacity 0.3s ease-in-out',
-		...faceStyles,
 		...style,
-	};
-	const imageDemoStyle = {
-		height: '23px',
-		width: 'auto',
+		...faceStyles,
 	};
 
 	useEffect( () => {
@@ -62,7 +90,7 @@ function FontFaceDemo( { customPreviewUrl, fontFace, text, style = {} } ) {
 			}
 		};
 		loadAsset();
-	}, [ fontFace, isIntersecting, loadFontFaceAsset ] );
+	}, [ fontFace, isIntersecting, loadFontFaceAsset, isPreviewImage ] );
 
 	return (
 		<div ref={ ref }>
@@ -71,13 +99,18 @@ function FontFaceDemo( { customPreviewUrl, fontFace, text, style = {} } ) {
 					src={ previewUrl }
 					loading="lazy"
 					alt={ text }
-					style={ imageDemoStyle }
+					className="font-library-modal__font-variant_demo-image"
 				/>
 			) : (
-				<Text style={ textDemoStyle }>{ text }</Text>
+				<Text
+					style={ textDemoStyle }
+					className="font-library-modal__font-variant_demo-text"
+				>
+					{ text }
+				</Text>
 			) }
 		</div>
 	);
 }
 
-export default FontFaceDemo;
+export default FontDemo;
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/font-variant.js b/packages/edit-site/src/components/global-styles/font-library-modal/font-variant.js
deleted file mode 100644
index cd6dcbdd5a3d4c..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/font-variant.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalText as Text,
-	__experimentalVStack as VStack,
-	__experimentalHStack as HStack,
-	CheckboxControl,
-} from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import FontFaceDemo from './font-demo';
-
-function FontVariant( {
-	fontFace,
-	variantName,
-	checked,
-	onClick,
-	text,
-	actionHandler,
-} ) {
-	const { fontStyle, fontWeight } = fontFace;
-	const displayVariantName = variantName || `${ fontWeight } ${ fontStyle }`;
-
-	return (
-		<div className="font-library-modal__font-variant">
-			<VStack spacing={ 1 }>
-				<HStack justify="flex-start" alignment="top">
-					{ !! actionHandler ? (
-						actionHandler
-					) : (
-						<CheckboxControl
-							checked={ checked }
-							onChange={ onClick }
-						/>
-					) }
-					{ typeof displayVariantName === 'string' ? (
-						<Text>{ displayVariantName }</Text>
-					) : (
-						displayVariantName
-					) }
-				</HStack>
-				<div className="font-library-modal__font-variant_demo-wrapper">
-					<FontFaceDemo fontFace={ fontFace } text={ text } />
-				</div>
-			</VStack>
-		</div>
-	);
-}
-
-export default FontVariant;
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/fonts-grid.js b/packages/edit-site/src/components/global-styles/font-library-modal/fonts-grid.js
deleted file mode 100644
index 55e7a8a5cf3935..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/fonts-grid.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalVStack as VStack,
-	__experimentalText as Text,
-	__experimentalSpacer as Spacer,
-} from '@wordpress/components';
-import { useState, useEffect } from '@wordpress/element';
-
-function FontsGrid( { title, children, pageSize = 32 } ) {
-	const [ lastItem, setLastItem ] = useState( null );
-	const [ page, setPage ] = useState( 1 );
-	const itemsLimit = page * pageSize;
-	const items = children.slice( 0, itemsLimit );
-
-	useEffect( () => {
-		if ( lastItem ) {
-			const observer = new window.IntersectionObserver( ( [ entry ] ) => {
-				if ( entry.isIntersecting ) {
-					setPage( ( prevPage ) => prevPage + 1 );
-				}
-			} );
-
-			observer.observe( lastItem );
-
-			return () => observer.disconnect();
-		}
-	}, [ lastItem ] );
-
-	return (
-		<div className="font-library-modal__fonts-grid">
-			<VStack spacing={ 0 }>
-				{ title && (
-					<>
-						<Text className="font-library-modal__subtitle">
-							{ title }
-						</Text>
-						<Spacer margin={ 2 } />
-					</>
-				) }
-				<div className="font-library-modal__fonts-grid__main">
-					{ items.map( ( child, i ) => {
-						if ( i === itemsLimit - 1 ) {
-							return <div ref={ setLastItem }>{ child }</div>;
-						}
-						return child;
-					} ) }
-				</div>
-			</VStack>
-		</div>
-	);
-}
-
-export default FontsGrid;
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/google-fonts-confirm-dialog.js b/packages/edit-site/src/components/global-styles/font-library-modal/google-fonts-confirm-dialog.js
index cb10ec89c4fc7a..369edc6c9ffb42 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/google-fonts-confirm-dialog.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/google-fonts-confirm-dialog.js
@@ -6,6 +6,7 @@ import {
 	Button,
 	Card,
 	CardBody,
+	__experimentalHeading as Heading,
 	__experimentalText as Text,
 	__experimentalSpacer as Spacer,
 } from '@wordpress/components';
@@ -14,7 +15,7 @@ function GoogleFontsConfirmDialog() {
 	const handleConfirm = () => {
 		// eslint-disable-next-line no-undef
 		window.localStorage.setItem(
-			'wp-font-library-default-font-collection-permission',
+			'wp-font-library-google-fonts-permission',
 			'true'
 		);
 		window.dispatchEvent( new Event( 'storage' ) );
@@ -24,7 +25,9 @@ function GoogleFontsConfirmDialog() {
 		<div className="font-library__google-fonts-confirm">
 			<Card>
 				<CardBody>
-					<Text as="h3">Connect to Google Fonts</Text>
+					<Heading level={ 2 }>
+						{ __( 'Connect to Google Fonts' ) }
+					</Heading>
 					<Spacer margin={ 6 } />
 					<Text as="p">
 						{ __(
@@ -34,11 +37,15 @@ function GoogleFontsConfirmDialog() {
 					<Spacer margin={ 3 } />
 					<Text as="p">
 						{ __(
-							'You can alternatively upload files directly on the Library tab.'
+							'You can alternatively upload files directly on the Upload tab.'
 						) }
 					</Text>
 					<Spacer margin={ 6 } />
-					<Button variant="primary" onClick={ handleConfirm }>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						onClick={ handleConfirm }
+					>
 						{ __( 'Allow access to Google Fonts' ) }
 					</Button>
 				</CardBody>
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/index.js b/packages/edit-site/src/components/global-styles/font-library-modal/index.js
index 1128ca0811977e..27093e0ef1cbba 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/index.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/index.js
@@ -1,8 +1,13 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
-import { Modal, TabPanel } from '@wordpress/components';
+import { __, _x } from '@wordpress/i18n';
+import {
+	Modal,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
 import { useContext } from '@wordpress/element';
 
 /**
@@ -12,40 +17,47 @@ import InstalledFonts from './installed-fonts';
 import FontCollection from './font-collection';
 import UploadFonts from './upload-fonts';
 import { FontLibraryContext } from './context';
+import { unlock } from '../../../lock-unlock';
 
-const DEFAULT_TABS = [
-	{
-		name: 'installed-fonts',
-		title: __( 'Library' ),
-		className: 'installed-fonts',
-	},
-	{
-		name: 'upload-fonts',
-		title: __( 'Upload' ),
-		className: 'upload-fonts',
-	},
-];
+const { Tabs } = unlock( componentsPrivateApis );
+
+const DEFAULT_TAB = {
+	id: 'installed-fonts',
+	title: _x( 'Library', 'Font library' ),
+};
+
+const UPLOAD_TAB = {
+	id: 'upload-fonts',
+	title: __( 'Upload' ),
+};
 
 const tabsFromCollections = ( collections ) =>
-	collections.map( ( { id, name } ) => ( {
-		name: id,
+	collections.map( ( { slug, name } ) => ( {
+		id: slug,
 		title:
-			collections.length === 1 && id === 'default-font-collection'
+			collections.length === 1 && slug === 'google-fonts'
 				? __( 'Install Fonts' )
 				: name,
-		className: 'collection',
 	} ) );
 
 function FontLibraryModal( {
 	onRequestClose,
-	initialTabName = 'installed-fonts',
+	defaultTabId = 'installed-fonts',
 } ) {
 	const { collections } = useContext( FontLibraryContext );
+	const canUserCreate = useSelect( ( select ) => {
+		return select( coreStore ).canUser( 'create', {
+			kind: 'postType',
+			name: 'wp_font_family',
+		} );
+	}, [] );
+
+	const tabs = [ DEFAULT_TAB ];
 
-	const tabs = [
-		...DEFAULT_TABS,
-		...tabsFromCollections( collections || [] ),
-	];
+	if ( canUserCreate ) {
+		tabs.push( UPLOAD_TAB );
+		tabs.push( ...tabsFromCollections( collections || [] ) );
+	}
 
 	return (
 		<Modal
@@ -54,22 +66,39 @@ function FontLibraryModal( {
 			isFullScreen
 			className="font-library-modal"
 		>
-			<TabPanel
-				className="font-library-modal__tab-panel"
-				initialTabName={ initialTabName }
-				tabs={ tabs }
-			>
-				{ ( tab ) => {
-					switch ( tab.name ) {
+			<Tabs defaultTabId={ defaultTabId }>
+				<div className="font-library-modal__tablist-container">
+					<Tabs.TabList>
+						{ tabs.map( ( { id, title } ) => (
+							<Tabs.Tab key={ id } tabId={ id }>
+								{ title }
+							</Tabs.Tab>
+						) ) }
+					</Tabs.TabList>
+				</div>
+				{ tabs.map( ( { id } ) => {
+					let contents;
+					switch ( id ) {
 						case 'upload-fonts':
-							return <UploadFonts />;
+							contents = <UploadFonts />;
+							break;
 						case 'installed-fonts':
-							return <InstalledFonts />;
+							contents = <InstalledFonts />;
+							break;
 						default:
-							return <FontCollection id={ tab.name } />;
+							contents = <FontCollection slug={ id } />;
 					}
-				} }
-			</TabPanel>
+					return (
+						<Tabs.TabPanel
+							key={ id }
+							tabId={ id }
+							focusable={ false }
+						>
+							{ contents }
+						</Tabs.TabPanel>
+					);
+				} ) }
+			</Tabs>
 		</Modal>
 	);
 }
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
index 2a8d1e591e084f..b7666a66afe0b3 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
@@ -1,203 +1,517 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
-import { useContext, useEffect, useState } from '@wordpress/element';
 import {
-	privateApis as componentsPrivateApis,
+	Button,
+	__experimentalConfirmDialog as ConfirmDialog,
 	__experimentalHStack as HStack,
+	__experimentalHeading as Heading,
+	Navigator,
+	useNavigator,
 	__experimentalSpacer as Spacer,
-	Button,
-	Spinner,
+	__experimentalText as Text,
+	__experimentalVStack as VStack,
+	Flex,
 	Notice,
-	FlexItem,
+	ProgressBar,
+	CheckboxControl,
 } from '@wordpress/components';
+import { useEntityRecord, store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import { useContext, useEffect, useState } from '@wordpress/element';
+import { __, _x, sprintf, isRTL } from '@wordpress/i18n';
+import { chevronLeft, chevronRight } from '@wordpress/icons';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
-import TabLayout from './tab-layout';
 import { FontLibraryContext } from './context';
-import FontsGrid from './fonts-grid';
-import LibraryFontDetails from './library-font-details';
-import LibraryFontCard from './library-font-card';
-import ConfirmDeleteDialog from './confirm-delete-dialog';
-import { getNoticeFromUninstallResponse } from './utils/get-notice-from-response';
+import FontCard from './font-card';
+import LibraryFontVariant from './library-font-variant';
+import { sortFontFaces } from './utils/sort-font-faces';
+import {
+	setUIValuesNeeded,
+	loadFontFaceInBrowser,
+	unloadFontFaceInBrowser,
+	getDisplaySrcFromFontFace,
+} from './utils';
 import { unlock } from '../../../lock-unlock';
-const { ProgressBar } = unlock( componentsPrivateApis );
+
+const { useGlobalSetting } = unlock( blockEditorPrivateApis );
 
 function InstalledFonts() {
 	const {
 		baseCustomFonts,
 		libraryFontSelected,
-		baseThemeFonts,
 		handleSetLibraryFontSelected,
 		refreshLibrary,
-		uninstallFont,
+		uninstallFontFamily,
 		isResolvingLibrary,
+		isInstalling,
+		saveFontFamilies,
+		getFontFacesActivated,
 	} = useContext( FontLibraryContext );
+
+	const [ fontFamilies, setFontFamilies ] = useGlobalSetting(
+		'typography.fontFamilies'
+	);
 	const [ isConfirmDeleteOpen, setIsConfirmDeleteOpen ] = useState( false );
+	const [ notice, setNotice ] = useState( false );
+	const [ baseFontFamilies ] = useGlobalSetting(
+		'typography.fontFamilies',
+		undefined,
+		'base'
+	);
+	const globalStylesId = useSelect( ( select ) => {
+		const { __experimentalGetCurrentGlobalStylesId } = select( coreStore );
+		return __experimentalGetCurrentGlobalStylesId();
+	} );
+	const globalStyles = useEntityRecord(
+		'root',
+		'globalStyles',
+		globalStylesId
+	);
+	const fontFamiliesHasChanges =
+		!! globalStyles?.edits?.settings?.typography?.fontFamilies;
 
-	const handleUnselectFont = () => {
-		handleSetLibraryFontSelected( null );
-	};
+	const themeFonts = fontFamilies?.theme
+		? fontFamilies.theme
+				.map( ( f ) => setUIValuesNeeded( f, { source: 'theme' } ) )
+				.sort( ( a, b ) => a.name.localeCompare( b.name ) )
+		: [];
+	const themeFontsSlugs = new Set( themeFonts.map( ( f ) => f.slug ) );
+	const baseThemeFonts = baseFontFamilies?.theme
+		? themeFonts.concat(
+				baseFontFamilies.theme
+					.filter( ( f ) => ! themeFontsSlugs.has( f.slug ) )
+					.map( ( f ) => setUIValuesNeeded( f, { source: 'theme' } ) )
+					.sort( ( a, b ) => a.name.localeCompare( b.name ) )
+		  )
+		: [];
 
-	const handleSelectFont = ( font ) => {
-		handleSetLibraryFontSelected( font );
-	};
+	const customFontFamilyId =
+		libraryFontSelected?.source === 'custom' && libraryFontSelected?.id;
 
-	const [ notice, setNotice ] = useState( null );
+	const canUserDelete = useSelect(
+		( select ) => {
+			const { canUser } = select( coreStore );
+			return (
+				customFontFamilyId &&
+				canUser( 'delete', {
+					kind: 'postType',
+					name: 'wp_font_family',
+					id: customFontFamilyId,
+				} )
+			);
+		},
+		[ customFontFamilyId ]
+	);
 
-	const handleConfirmUninstall = async () => {
-		const response = await uninstallFont( libraryFontSelected );
-		const uninstallNotice = getNoticeFromUninstallResponse( response );
-		setNotice( uninstallNotice );
-		// If the font was succesfully uninstalled it is unselected
-		if ( ! response?.errors?.length ) {
-			handleUnselectFont();
-		}
-		setIsConfirmDeleteOpen( false );
-	};
+	const shouldDisplayDeleteButton =
+		!! libraryFontSelected &&
+		libraryFontSelected?.source !== 'theme' &&
+		canUserDelete;
 
-	const handleUninstallClick = async () => {
+	const handleUninstallClick = () => {
 		setIsConfirmDeleteOpen( true );
 	};
 
-	const handleCancelUninstall = () => {
-		setIsConfirmDeleteOpen( false );
+	const handleUpdate = async () => {
+		setNotice( null );
+		try {
+			await saveFontFamilies( fontFamilies );
+			setNotice( {
+				type: 'success',
+				message: __( 'Font family updated successfully.' ),
+			} );
+		} catch ( error ) {
+			setNotice( {
+				type: 'error',
+				message: sprintf(
+					/* translators: %s: error message */
+					__( 'There was an error updating the font family. %s' ),
+					error.message
+				),
+			} );
+		}
 	};
 
-	const tabDescription = !! libraryFontSelected
-		? __(
-				'Choose font variants. Keep in mind that too many variants could make your site slower.'
-		  )
-		: null;
+	const getFontFacesToDisplay = ( font ) => {
+		if ( ! font ) {
+			return [];
+		}
+		if ( ! font.fontFace || ! font.fontFace.length ) {
+			return [
+				{
+					fontFamily: font.fontFamily,
+					fontStyle: 'normal',
+					fontWeight: '400',
+				},
+			];
+		}
+		return sortFontFaces( font.fontFace );
+	};
 
-	const shouldDisplayDeleteButton =
-		!! libraryFontSelected && libraryFontSelected?.source !== 'theme';
+	const getFontCardVariantsText = ( font ) => {
+		const variantsInstalled =
+			font?.fontFace?.length > 0 ? font.fontFace.length : 1;
+		const variantsActive = getFontFacesActivated(
+			font.slug,
+			font.source
+		).length;
+		return sprintf(
+			/* translators: 1: Active font variants, 2: Total font variants. */
+			__( '%1$s/%2$s variants active' ),
+			variantsActive,
+			variantsInstalled
+		);
+	};
 
 	useEffect( () => {
+		handleSetLibraryFontSelected( libraryFontSelected );
 		refreshLibrary();
-		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [] );
 
-	// Reset notice after 5 seconds
-	useEffect( () => {
-		if ( notice ) {
-			const timeout = setTimeout( () => {
-				setNotice( null );
-			}, 5000 );
-			return () => clearTimeout( timeout );
+	// Get activated fonts count.
+	const activeFontsCount = libraryFontSelected
+		? getFontFacesActivated(
+				libraryFontSelected.slug,
+				libraryFontSelected.source
+		  ).length
+		: 0;
+
+	const selectedFontsCount =
+		libraryFontSelected?.fontFace?.length ??
+		( libraryFontSelected?.fontFamily ? 1 : 0 );
+
+	// Check if any fonts are selected.
+	const isIndeterminate =
+		activeFontsCount > 0 && activeFontsCount !== selectedFontsCount;
+
+	// Check if all fonts are selected.
+	const isSelectAllChecked = activeFontsCount === selectedFontsCount;
+
+	// Toggle select all fonts.
+	const toggleSelectAll = () => {
+		const initialFonts =
+			fontFamilies?.[ libraryFontSelected.source ]?.filter(
+				( f ) => f.slug !== libraryFontSelected.slug
+			) ?? [];
+		const newFonts = isSelectAllChecked
+			? initialFonts
+			: [ ...initialFonts, libraryFontSelected ];
+
+		setFontFamilies( {
+			...fontFamilies,
+			[ libraryFontSelected.source ]: newFonts,
+		} );
+
+		if ( libraryFontSelected.fontFace ) {
+			libraryFontSelected.fontFace.forEach( ( face ) => {
+				if ( isSelectAllChecked ) {
+					unloadFontFaceInBrowser( face, 'all' );
+				} else {
+					loadFontFaceInBrowser(
+						face,
+						getDisplaySrcFromFontFace( face?.src ),
+						'all'
+					);
+				}
+			} );
 		}
-	}, [ notice ] );
+	};
 
+	const hasFonts = baseThemeFonts.length > 0 || baseCustomFonts.length > 0;
 	return (
-		<TabLayout
-			title={ libraryFontSelected?.name || '' }
-			description={ tabDescription }
-			handleBack={ !! libraryFontSelected && handleUnselectFont }
-			footer={
-				<Footer
-					shouldDisplayDeleteButton={ shouldDisplayDeleteButton }
-					handleUninstallClick={ handleUninstallClick }
-				/>
-			}
-		>
-			<ConfirmDeleteDialog
-				font={ libraryFontSelected }
-				isConfirmDeleteOpen={ isConfirmDeleteOpen }
-				handleConfirmUninstall={ handleConfirmUninstall }
-				handleCancelUninstall={ handleCancelUninstall }
-			/>
-
-			{ notice && (
-				<>
-					<FlexItem>
-						<Spacer margin={ 2 } />
-						<Notice
-							isDismissible={ false }
-							status={ notice.type }
-							className="font-library-modal__font-collection__notice"
-						>
-							{ notice.message }
-						</Notice>
-					</FlexItem>
-					<Spacer margin={ 4 } />
-				</>
+		<div className="font-library-modal__tabpanel-layout">
+			{ isResolvingLibrary && (
+				<div className="font-library-modal__loading">
+					<ProgressBar />
+				</div>
 			) }
 
-			{ ! libraryFontSelected && (
+			{ ! isResolvingLibrary && (
 				<>
-					{ isResolvingLibrary && <Spinner /> }
-					{ baseCustomFonts.length > 0 && (
-						<>
-							<Spacer margin={ 2 } />
-							<FontsGrid>
-								{ baseCustomFonts.map( ( font ) => (
-									<LibraryFontCard
-										font={ font }
-										key={ font.slug }
-										onClick={ () => {
-											handleSelectFont( font );
-										} }
-									/>
-								) ) }
-							</FontsGrid>
-							<Spacer margin={ 8 } />
-						</>
-					) }
-
-					{ baseThemeFonts.length > 0 && (
-						<>
-							<FontsGrid title={ __( 'Theme Fonts' ) }>
-								{ baseThemeFonts.map( ( font ) => (
-									<LibraryFontCard
-										font={ font }
-										key={ font.slug }
-										onClick={ () => {
-											handleSelectFont( font );
-										} }
-									/>
-								) ) }
-							</FontsGrid>
-						</>
-					) }
-				</>
-			) }
+					<Navigator
+						initialPath={
+							libraryFontSelected ? '/fontFamily' : '/'
+						}
+					>
+						<Navigator.Screen path="/">
+							<VStack spacing="8">
+								{ notice && (
+									<Notice
+										status={ notice.type }
+										onRemove={ () => setNotice( null ) }
+									>
+										{ notice.message }
+									</Notice>
+								) }
+								{ ! hasFonts && (
+									<Text as="p">
+										{ __( 'No fonts installed.' ) }
+									</Text>
+								) }
+								{ baseThemeFonts.length > 0 && (
+									<VStack>
+										<h2 className="font-library-modal__fonts-title">
+											{
+												/* translators: Heading for a list of fonts provided by the theme. */
+												_x( 'Theme', 'font source' )
+											}
+										</h2>
+										{ /*
+										 * Disable reason: The `list` ARIA role is redundant but
+										 * Safari+VoiceOver won't announce the list otherwise.
+										 */
+										/* eslint-disable jsx-a11y/no-redundant-roles */ }
+										<ul
+											role="list"
+											className="font-library-modal__fonts-list"
+										>
+											{ baseThemeFonts.map( ( font ) => (
+												<li
+													key={ font.slug }
+													className="font-library-modal__fonts-list-item"
+												>
+													<FontCard
+														font={ font }
+														navigatorPath="/fontFamily"
+														variantsText={ getFontCardVariantsText(
+															font
+														) }
+														onClick={ () => {
+															setNotice( null );
+															handleSetLibraryFontSelected(
+																font
+															);
+														} }
+													/>
+												</li>
+											) ) }
+										</ul>
+										{ /* eslint-enable jsx-a11y/no-redundant-roles */ }
+									</VStack>
+								) }
+								{ baseCustomFonts.length > 0 && (
+									<VStack>
+										<h2 className="font-library-modal__fonts-title">
+											{
+												/* translators: Heading for a list of fonts installed by the user. */
+												_x( 'Custom', 'font source' )
+											}
+										</h2>
+										{ /*
+										 * Disable reason: The `list` ARIA role is redundant but
+										 * Safari+VoiceOver won't announce the list otherwise.
+										 */
+										/* eslint-disable jsx-a11y/no-redundant-roles */ }
+										<ul
+											role="list"
+											className="font-library-modal__fonts-list"
+										>
+											{ baseCustomFonts.map( ( font ) => (
+												<li
+													key={ font.slug }
+													className="font-library-modal__fonts-list-item"
+												>
+													<FontCard
+														font={ font }
+														navigatorPath="/fontFamily"
+														variantsText={ getFontCardVariantsText(
+															font
+														) }
+														onClick={ () => {
+															setNotice( null );
+															handleSetLibraryFontSelected(
+																font
+															);
+														} }
+													/>
+												</li>
+											) ) }
+										</ul>
+										{ /* eslint-enable jsx-a11y/no-redundant-roles */ }
+									</VStack>
+								) }
+							</VStack>
+						</Navigator.Screen>
 
-			{ libraryFontSelected && (
-				<LibraryFontDetails
-					font={ libraryFontSelected }
-					isConfirmDeleteOpen={ isConfirmDeleteOpen }
-					handleConfirmUninstall={ handleConfirmUninstall }
-					handleCancelUninstall={ handleCancelUninstall }
-				/>
+						<Navigator.Screen path="/fontFamily">
+							<ConfirmDeleteDialog
+								font={ libraryFontSelected }
+								isOpen={ isConfirmDeleteOpen }
+								setIsOpen={ setIsConfirmDeleteOpen }
+								setNotice={ setNotice }
+								uninstallFontFamily={ uninstallFontFamily }
+								handleSetLibraryFontSelected={
+									handleSetLibraryFontSelected
+								}
+							/>
+
+							<Flex justify="flex-start">
+								<Navigator.BackButton
+									icon={
+										isRTL() ? chevronRight : chevronLeft
+									}
+									size="small"
+									onClick={ () => {
+										handleSetLibraryFontSelected( null );
+										setNotice( null );
+									} }
+									label={ __( 'Back' ) }
+								/>
+								<Heading
+									level={ 2 }
+									size={ 13 }
+									className="edit-site-global-styles-header"
+								>
+									{ libraryFontSelected?.name }
+								</Heading>
+							</Flex>
+							{ notice && (
+								<>
+									<Spacer margin={ 1 } />
+									<Notice
+										status={ notice.type }
+										onRemove={ () => setNotice( null ) }
+									>
+										{ notice.message }
+									</Notice>
+									<Spacer margin={ 1 } />
+								</>
+							) }
+							<Spacer margin={ 4 } />
+							<Text>
+								{ __(
+									'Choose font variants. Keep in mind that too many variants could make your site slower.'
+								) }
+							</Text>
+							<Spacer margin={ 4 } />
+							<VStack spacing={ 0 }>
+								<CheckboxControl
+									className="font-library-modal__select-all"
+									label={ __( 'Select all' ) }
+									checked={ isSelectAllChecked }
+									onChange={ toggleSelectAll }
+									indeterminate={ isIndeterminate }
+									__nextHasNoMarginBottom
+								/>
+								<Spacer margin={ 8 } />
+								{ /*
+								 * Disable reason: The `list` ARIA role is redundant but
+								 * Safari+VoiceOver won't announce the list otherwise.
+								 */
+								/* eslint-disable jsx-a11y/no-redundant-roles */ }
+								<ul
+									role="list"
+									className="font-library-modal__fonts-list"
+								>
+									{ getFontFacesToDisplay(
+										libraryFontSelected
+									).map( ( face, i ) => (
+										<li
+											key={ `face${ i }` }
+											className="font-library-modal__fonts-list-item"
+										>
+											<LibraryFontVariant
+												font={ libraryFontSelected }
+												face={ face }
+												key={ `face${ i }` }
+											/>
+										</li>
+									) ) }
+								</ul>
+								{ /* eslint-enable jsx-a11y/no-redundant-roles */ }
+							</VStack>
+						</Navigator.Screen>
+					</Navigator>
+
+					<HStack
+						justify="flex-end"
+						className="font-library-modal__footer"
+					>
+						{ isInstalling && <ProgressBar /> }
+						{ shouldDisplayDeleteButton && (
+							<Button
+								__next40pxDefaultSize
+								isDestructive
+								variant="tertiary"
+								onClick={ handleUninstallClick }
+							>
+								{ __( 'Delete' ) }
+							</Button>
+						) }
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							onClick={ handleUpdate }
+							disabled={ ! fontFamiliesHasChanges }
+							accessibleWhenDisabled
+						>
+							{ __( 'Update' ) }
+						</Button>
+					</HStack>
+				</>
 			) }
-		</TabLayout>
+		</div>
 	);
 }
 
-function Footer( { shouldDisplayDeleteButton, handleUninstallClick } ) {
-	const { saveFontFamilies, fontFamiliesHasChanges, isInstalling } =
-		useContext( FontLibraryContext );
+function ConfirmDeleteDialog( {
+	font,
+	isOpen,
+	setIsOpen,
+	setNotice,
+	uninstallFontFamily,
+	handleSetLibraryFontSelected,
+} ) {
+	const navigator = useNavigator();
+
+	const handleConfirmUninstall = async () => {
+		setNotice( null );
+		setIsOpen( false );
+		try {
+			await uninstallFontFamily( font );
+			navigator.goBack();
+			handleSetLibraryFontSelected( null );
+			setNotice( {
+				type: 'success',
+				message: __( 'Font family uninstalled successfully.' ),
+			} );
+		} catch ( error ) {
+			setNotice( {
+				type: 'error',
+				message:
+					__( 'There was an error uninstalling the font family.' ) +
+					error.message,
+			} );
+		}
+	};
+
+	const handleCancelUninstall = () => {
+		setIsOpen( false );
+	};
+
 	return (
-		<HStack justify="space-between">
-			{ isInstalling && <ProgressBar /> }
-			<div>
-				{ shouldDisplayDeleteButton && (
-					<Button variant="tertiary" onClick={ handleUninstallClick }>
-						{ __( 'Delete' ) }
-					</Button>
+		<ConfirmDialog
+			isOpen={ isOpen }
+			cancelButtonText={ __( 'Cancel' ) }
+			confirmButtonText={ __( 'Delete' ) }
+			onCancel={ handleCancelUninstall }
+			onConfirm={ handleConfirmUninstall }
+			size="medium"
+		>
+			{ font &&
+				sprintf(
+					/* translators: %s: Name of the font. */
+					__(
+						'Are you sure you want to delete "%s" font and all its variants and assets?'
+					),
+					font.name
 				) }
-			</div>
-			<Button
-				disabled={ ! fontFamiliesHasChanges }
-				variant="primary"
-				onClick={ saveFontFamilies }
-			>
-				{ __( 'Update' ) }
-			</Button>
-		</HStack>
+		</ConfirmDialog>
 	);
 }
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-card.js b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-card.js
deleted file mode 100644
index 16454595dc7f21..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-card.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, sprintf } from '@wordpress/i18n';
-import { useContext } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import FontCard from './font-card';
-import { FontLibraryContext } from './context';
-
-function LibraryFontCard( { font, ...props } ) {
-	const { getFontFacesActivated } = useContext( FontLibraryContext );
-
-	const variantsInstalled = font.fontFace?.length || 1;
-	const variantsActive = getFontFacesActivated(
-		font.slug,
-		font.source
-	).length;
-	const variantsText = sprintf(
-		/* translators: %1$d: Active font variants, %2$d: Total font variants */
-		__( '%1$s/%2$s variants active' ),
-		variantsActive,
-		variantsInstalled
-	);
-
-	return (
-		<FontCard font={ font } variantsText={ variantsText } { ...props } />
-	);
-}
-
-export default LibraryFontCard;
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
index 010f3efdbeb91a..2f84bd1f2c749c 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
@@ -2,31 +2,38 @@
  * WordPress dependencies
  */
 import { useContext } from '@wordpress/element';
-import { CheckboxControl, Flex } from '@wordpress/components';
+import {
+	CheckboxControl,
+	Flex,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import { getFontFaceVariantName } from './utils';
 import { FontLibraryContext } from './context';
-import FontFaceDemo from './font-demo';
-import { kebabCase } from '../../../../../block-editor/src/utils/object';
+import FontDemo from './font-demo';
+import { unlock } from '../../../lock-unlock';
+
+const { kebabCase } = unlock( componentsPrivateApis );
 
 function LibraryFontVariant( { face, font } ) {
 	const { isFontActivated, toggleActivateFont } =
 		useContext( FontLibraryContext );
 
-	const isIstalled = font?.fontFace
-		? isFontActivated(
-				font.slug,
-				face.fontStyle,
-				face.fontWeight,
-				font.source
-		  )
-		: isFontActivated( font.slug, null, null, font.source );
+	const isInstalled =
+		font?.fontFace?.length > 0
+			? isFontActivated(
+					font.slug,
+					face.fontStyle,
+					face.fontWeight,
+					font.source
+			  )
+			: isFontActivated( font.slug, null, null, font.source );
 
 	const handleToggleActivation = () => {
-		if ( font?.fontFace ) {
+		if ( font?.fontFace?.length > 0 ) {
 			toggleActivateFont( font, face );
 			return;
 		}
@@ -39,21 +46,23 @@ function LibraryFontVariant( { face, font } ) {
 	);
 
 	return (
-		<label
-			className="font-library-modal__library-font-variant"
-			htmlFor={ checkboxId }
-		>
-			<Flex justify="space-between" align="center" gap="1rem">
-				<FontFaceDemo fontFace={ face } text={ displayName } />
+		<div className="font-library-modal__font-card">
+			<Flex justify="flex-start" align="center" gap="1rem">
 				<CheckboxControl
-					checked={ isIstalled }
+					checked={ isInstalled }
 					onChange={ handleToggleActivation }
-					__nextHasNoMarginBottom={ true }
+					__nextHasNoMarginBottom
 					id={ checkboxId }
-					label={ false }
 				/>
+				<label htmlFor={ checkboxId }>
+					<FontDemo
+						font={ face }
+						text={ displayName }
+						onClick={ handleToggleActivation }
+					/>
+				</label>
 			</Flex>
-		</label>
+		</div>
 	);
 }
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js
deleted file mode 100644
index 9612f8be52f5ee..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, sprintf } from '@wordpress/i18n';
-import {
-	Button,
-	DropZone,
-	__experimentalSpacer as Spacer,
-	__experimentalText as Text,
-	__experimentalVStack as VStack,
-	FormFileUpload,
-	Notice,
-	FlexItem,
-} from '@wordpress/components';
-import { useContext, useState, useEffect } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { ALLOWED_FILE_EXTENSIONS } from './utils/constants';
-import { FontLibraryContext } from './context';
-import { Font } from '../../../../lib/lib-font.browser';
-import makeFamiliesFromFaces from './utils/make-families-from-faces';
-import { loadFontFaceInBrowser } from './utils';
-import { getNoticeFromInstallResponse } from './utils/get-notice-from-response';
-
-function LocalFonts() {
-	const { installFonts } = useContext( FontLibraryContext );
-	const [ notice, setNotice ] = useState( null );
-	const supportedFormats =
-		ALLOWED_FILE_EXTENSIONS.slice( 0, -1 )
-			.map( ( extension ) => `.${ extension }` )
-			.join( ', ' ) +
-		` ${ __( 'and' ) } .${ ALLOWED_FILE_EXTENSIONS.slice( -1 ) }`;
-
-	const handleDropZone = ( files ) => {
-		handleFilesUpload( files );
-	};
-	const onFilesUpload = ( event ) => {
-		handleFilesUpload( event.target.files );
-	};
-
-	// Reset notice after 5 seconds
-	useEffect( () => {
-		if ( notice ) {
-			const timeout = setTimeout( () => {
-				setNotice( null );
-			}, 5000 );
-			return () => clearTimeout( timeout );
-		}
-	}, [ notice ] );
-
-	/**
-	 * Filters the selected files to only allow the ones with the allowed extensions
-	 *
-	 * @param {Array} files The files to be filtered
-	 * @return {void}
-	 */
-	const handleFilesUpload = ( files ) => {
-		setNotice( null );
-		const uniqueFilenames = new Set();
-		const selectedFiles = [ ...files ];
-		const allowedFiles = selectedFiles.filter( ( file ) => {
-			if ( uniqueFilenames.has( file.name ) ) {
-				return false; // Discard duplicates
-			}
-			// Eliminates files that are not allowed
-			const fileExtension = file.name.split( '.' ).pop().toLowerCase();
-			if ( ALLOWED_FILE_EXTENSIONS.includes( fileExtension ) ) {
-				uniqueFilenames.add( file.name );
-				return true; // Keep file if the extension is allowed
-			}
-			return false; // Discard file extension not allowed
-		} );
-		if ( allowedFiles.length > 0 ) {
-			loadFiles( allowedFiles );
-		}
-	};
-
-	/**
-	 * Loads the selected files and reads the font metadata
-	 *
-	 * @param {Array} files The files to be loaded
-	 * @return {void}
-	 */
-	const loadFiles = async ( files ) => {
-		const fontFacesLoaded = await Promise.all(
-			files.map( async ( fontFile ) => {
-				const fontFaceData = await getFontFaceMetadata( fontFile );
-				await loadFontFaceInBrowser(
-					fontFaceData,
-					fontFaceData.file,
-					'all'
-				);
-				return fontFaceData;
-			} )
-		);
-		await handleInstall( fontFacesLoaded );
-	};
-
-	// Create a function to read the file as array buffer
-	async function readFileAsArrayBuffer( file ) {
-		return new Promise( ( resolve, reject ) => {
-			const reader = new window.FileReader();
-			reader.readAsArrayBuffer( file );
-			reader.onload = () => resolve( reader.result );
-			reader.onerror = reject;
-		} );
-	}
-
-	const getFontFaceMetadata = async ( fontFile ) => {
-		const buffer = await readFileAsArrayBuffer( fontFile );
-		const fontObj = new Font( 'Uploaded Font' );
-		fontObj.fromDataBuffer( buffer, fontFile.name );
-		// Assuming that fromDataBuffer triggers onload event and returning a Promise
-		const onloadEvent = await new Promise(
-			( resolve ) => ( fontObj.onload = resolve )
-		);
-		const font = onloadEvent.detail.font;
-		const { name } = font.opentype.tables;
-		const fontName = name.get( 16 ) || name.get( 1 );
-		const isItalic = name.get( 2 ).toLowerCase().includes( 'italic' );
-		const fontWeight =
-			font.opentype.tables[ 'OS/2' ].usWeightClass || 'normal';
-		const isVariable = !! font.opentype.tables.fvar;
-		const weightAxis =
-			isVariable &&
-			font.opentype.tables.fvar.axes.find(
-				( { tag } ) => tag === 'wght'
-			);
-		const weightRange = weightAxis
-			? `${ weightAxis.minValue } ${ weightAxis.maxValue }`
-			: null;
-		return {
-			file: fontFile,
-			fontFamily: fontName,
-			fontStyle: isItalic ? 'italic' : 'normal',
-			fontWeight: weightRange || fontWeight,
-		};
-	};
-
-	/**
-	 * Creates the font family definition and sends it to the server
-	 *
-	 * @param {Array} fontFaces The font faces to be installed
-	 * @return {void}
-	 */
-	const handleInstall = async ( fontFaces ) => {
-		const fontFamilies = makeFamiliesFromFaces( fontFaces );
-		const response = await installFonts( fontFamilies );
-		const installNotice = getNoticeFromInstallResponse( response );
-		setNotice( installNotice );
-	};
-
-	return (
-		<>
-			<Spacer margin={ 16 } />
-			<DropZone onFilesDrop={ handleDropZone } />
-			<VStack className="font-library-modal__local-fonts">
-				<FormFileUpload
-					accept={ ALLOWED_FILE_EXTENSIONS.map(
-						( ext ) => `.${ ext }`
-					).join( ',' ) }
-					multiple={ true }
-					onChange={ onFilesUpload }
-					render={ ( { openFileDialog } ) => (
-						<Button
-							className="font-library-modal__upload-area"
-							onClick={ openFileDialog }
-						>
-							<span>{ __( 'Upload font' ) }</span>
-						</Button>
-					) }
-				/>
-				{ notice && (
-					<FlexItem>
-						<Spacer margin={ 2 } />
-						<Notice
-							isDismissible={ false }
-							status={ notice.type }
-							className="font-library-modal__upload-area__notice"
-						>
-							{ notice.message }
-						</Notice>
-					</FlexItem>
-				) }
-				<Spacer margin={ 2 } />
-				<Text className="font-library-modal__upload-area__text">
-					{ sprintf(
-						/* translators: %s: supported font formats: ex: .ttf, .woff and .woff2 */
-						__(
-							'Uploaded fonts appear in your library and can be used in your theme. Supported formats: %s.'
-						),
-						supportedFormats
-					) }
-				</Text>
-			</VStack>
-		</>
-	);
-}
-
-export default LocalFonts;
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js b/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
index 425b3afb0e7c3c..a114630cfc08d1 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
@@ -1,45 +1,78 @@
-/**
- * WordPress dependencies
- *
- */
 /**
  * WordPress dependencies
  */
 import apiFetch from '@wordpress/api-fetch';
 
-export async function fetchInstallFonts( data ) {
+const FONT_FAMILIES_URL = '/wp/v2/font-families';
+const FONT_COLLECTIONS_URL = '/wp/v2/font-collections';
+
+export async function fetchInstallFontFamily( data ) {
 	const config = {
-		path: '/wp/v2/fonts',
+		path: FONT_FAMILIES_URL,
 		method: 'POST',
 		body: data,
 	};
-	return apiFetch( config );
+	const response = await apiFetch( config );
+	return {
+		id: response.id,
+		...response.font_family_settings,
+		fontFace: [],
+	};
 }
 
-export async function fetchUninstallFonts( fonts ) {
-	const data = {
-		font_families: fonts,
+export async function fetchInstallFontFace( fontFamilyId, data ) {
+	const config = {
+		path: `${ FONT_FAMILIES_URL }/${ fontFamilyId }/font-faces`,
+		method: 'POST',
+		body: data,
+	};
+	const response = await apiFetch( config );
+	return {
+		id: response.id,
+		...response.font_face_settings,
 	};
+}
+
+export async function fetchGetFontFamilyBySlug( slug ) {
+	const config = {
+		path: `${ FONT_FAMILIES_URL }?slug=${ slug }&_embed=true`,
+		method: 'GET',
+	};
+	const response = await apiFetch( config );
+	if ( ! response || response.length === 0 ) {
+		return null;
+	}
+	const fontFamilyPost = response[ 0 ];
+	return {
+		id: fontFamilyPost.id,
+		...fontFamilyPost.font_family_settings,
+		fontFace:
+			fontFamilyPost?._embedded?.font_faces.map(
+				( face ) => face.font_face_settings
+			) || [],
+	};
+}
+
+export async function fetchUninstallFontFamily( fontFamilyId ) {
 	const config = {
-		path: '/wp/v2/fonts',
+		path: `${ FONT_FAMILIES_URL }/${ fontFamilyId }?force=true`,
 		method: 'DELETE',
-		data,
 	};
-	return apiFetch( config );
+	return await apiFetch( config );
 }
 
 export async function fetchFontCollections() {
 	const config = {
-		path: '/wp/v2/fonts/collections',
+		path: `${ FONT_COLLECTIONS_URL }?_fields=slug,name,description`,
 		method: 'GET',
 	};
-	return apiFetch( config );
+	return await apiFetch( config );
 }
 
 export async function fetchFontCollection( id ) {
 	const config = {
-		path: `/wp/v2/fonts/collections/${ id }`,
+		path: `${ FONT_COLLECTIONS_URL }/${ id }`,
 		method: 'GET',
 	};
-	return apiFetch( config );
+	return await apiFetch( config );
 }
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/style.scss b/packages/edit-site/src/components/global-styles/font-library-modal/style.scss
index 86cac4244dea93..7d94376ac8d942 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/style.scss
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/style.scss
@@ -1,9 +1,12 @@
+// Fixed height for the modal footer.
+// Ensures that the footer is always visible when the modal content is scrollable.
+$footer-height: 70px;
+
 .font-library-modal {
-	// @todo: If a new prop is added to the Modal component that constrains
+	// @todo If a new prop is added to the Modal component that constrains
 	// the content width, we should use that prop instead of this style.
 	// see https://github.com/WordPress/gutenberg/issues/54471.
 	&.font-library-modal {
-
 		@include break-medium() {
 			width: 65vw;
 		}
@@ -15,6 +18,7 @@
 
 	.components-modal__content {
 		padding-top: 0;
+		margin-bottom: $footer-height;
 	}
 
 	.font-library-modal__subtitle {
@@ -22,79 +26,142 @@
 		font-weight: 500;
 		font-size: 11px;
 	}
-}
-
-.font-library-modal__tab-layout {
 
-	main {
-		padding-bottom: 4rem;
+	// Add padding so the focus state outline (box-shadow) of font list items is visible
+	.components-navigator-screen {
+		padding: 3px;
 	}
+}
 
-	footer {
-		border-top: 1px solid #e5e5e5;
-		margin: 0 -32px -32px;
-		padding: 16px 32px;
-		position: absolute;
-		bottom: 32px;
+.font-library-modal__tabpanel-layout {
+	margin-top: $grid-unit-40;
+
+	.font-library-modal__loading {
 		width: 100%;
-		background-color: #fff;
+		height: 100%;
+		display: flex;
+		position: absolute;
+		left: 0;
+		top: 0;
+		align-items: center;
+		justify-content: center;
+		// Push down so that the progress bar is centered vertically.
+		// It should be 120px (72px modal header height + 48px tab height)
+		padding-top: $header-height + $grid-unit-15 + $grid-unit-60;
 	}
+}
 
+.font-library-modal__footer {
+	border-top: 1px solid $gray-300;
+	margin: 0 #{$grid-unit-40 * -1} #{$grid-unit-40 * -1};
+	padding: $grid-unit-20 $grid-unit-40;
+	position: absolute;
+	bottom: $grid-unit-40;
+	width: 100%;
+	height: $footer-height;
+	background-color: $white;
 }
 
-.font-library-modal__fonts-grid {
-	.font-library-modal__fonts-grid__main {
-		display: flex;
-		flex-direction: column;
-	}
+.font-library-modal__page-selection {
+	font-size: 11px;
+	text-transform: uppercase;
+	font-weight: 500;
+	color: $gray-900;
+}
+
+// TODO: See if this can be removed after https://github.com/WordPress/gutenberg/issues/38730
+.font-library-modal__tabpanel-layout .components-base-control__field {
+	margin-bottom: 0;
+}
+
+.font-library-modal__fonts-title {
+	text-transform: uppercase;
+	font-size: 11px;
+	font-weight: 600;
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+.font-library-modal__fonts-list {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+.font-library-modal__fonts-list-item {
+	margin-bottom: 0;
 }
 
 .font-library-modal__font-card {
-	border: 1px solid #e5e5e5;
-	height: auto;
-	padding: 1rem;
+	border: $border-width solid $gray-200;
+	width: 100%;
+
+	// Override the default 40px height set by the Button component.
+	// Ref - https://github.com/WordPress/gutenberg/pull/65258#discussion_r1756147260
+	height: auto !important;
+
+	padding: $grid-unit-20;
 	margin-top: -1px; /* To collapse the margin with the previous element */
 
+	&:hover {
+		background-color: $gray-100;
+	}
+
 	.font-library-modal__font-card__name {
 		font-weight: bold;
 	}
 
 	.font-library-modal__font-card__count {
-		color: #6e6e6e;
+		color: $gray-700;
 	}
-}
 
-.font-library-modal__library-font-variant {
-	border: 1px solid #e5e5e5;
-	padding: 1rem;
-	margin-top: -1px; /* To collapse the margin with the previous element */
+	.font-library-modal__font-variant_demo-image {
+		display: block;
+		height: $grid-unit-30;
+		width: auto;
+	}
+
+	.font-library-modal__font-variant_demo-text {
+		white-space: nowrap;
+		flex-shrink: 0;
+		transition: opacity 0.3s ease-in-out;
+		@include reduce-motion("transition");
+	}
 }
 
 .font-library-modal__font-variant {
-	border-bottom: 1px solid #e5e5e5;
-	padding-bottom: 1rem;
+	border-bottom: 1px solid $gray-200;
+	padding-bottom: $grid-unit-20;
 }
 
-.font-library-modal__tab-panel {
+.font-library-modal__tablist-container {
+	position: sticky;
+	top: 0;
+	border-bottom: 1px solid $gray-300;
+	background: $white;
+	margin: 0 #{$grid-unit-40 * -1};
+	padding: 0 $grid-unit-20;
+	z-index: 1;
+
 	[role="tablist"] {
-		position: sticky;
-		top: 0;
-		width: calc(100% + 64px);
-		border-bottom: 1px solid #e6e6e6;
-		background: #fff;
-		margin: 0 -32px;
-		padding: 0 16px;
-		z-index: 1;
+		margin-bottom: -1px;
 	}
 }
 
+
 .font-library-modal__upload-area {
 	align-items: center;
 	display: flex;
 	justify-content: center;
-	height: 250px;
+
+	// Override the default 40px height set by the Button component.
+	// Ref - https://github.com/WordPress/gutenberg/pull/65258#discussion_r1756155039
+	height: $grid-unit-80 * 4 !important; // 256px
+
 	width: 100%;
-	background-color: #f0f0f0;
+}
+
+button.font-library-modal__upload-area {
+	background-color: $gray-100;
 }
 
 .font-library-modal__local-fonts {
@@ -102,36 +169,7 @@
 	width: 80%;
 
 	.font-library-modal__upload-area__text {
-		color: #6e6e6e;
-	}
-
-	.font-library-modal__upload-area__notice {
-		margin: 0;
-	}
-}
-
-.font-library-modal__font-name {
-	font-weight: bold;
-}
-
-.font-library-modal__font-filename {
-	color: #6e6e6e;
-}
-
-.font-library-modal__font-variant_demo-wrapper {
-	white-space: nowrap;
-	overflow: hidden;
-	width: 100%;
-	position: relative;
-
-	&::after {
-		content: "";
-		position: absolute;
-		bottom: 0;
-		right: 0;
-		width: 30vw;
-		height: 100%;
-		background: linear-gradient(to right, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1));
+		color: $gray-700;
 	}
 }
 
@@ -139,18 +177,32 @@
 	display: flex;
 	justify-content: center;
 	align-items: center;
+	margin-top: $grid-unit-80;
 
-	h3 {
-		font-size: 1.4rem;
+	p {
+		line-height: $default-line-height;
+	}
+
+	h2 {
+		font-size: 1.2rem;
+		font-weight: 400;
 	}
 
 	.components-card {
-		width: 50%;
-		min-width: 250px;
-		max-width: 350px;
+		padding: $grid-unit-20;
+		width: 400px;
+	}
+
+	.components-button {
+		width: 100%;
+		justify-content: center;
 	}
 }
 
-.font-library-modal__font-collection__notice {
-	margin: 0;
+.font-library-modal__select-all {
+	padding: $grid-unit-20 $grid-unit-20 $grid-unit-20 $grid-unit-20 + $border-width;
+
+	.components-checkbox-control__label {
+		padding-left: $grid-unit-20;
+	}
 }
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/tab-layout.js b/packages/edit-site/src/components/global-styles/font-library-modal/tab-layout.js
deleted file mode 100644
index 07f27cd31ea79c..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/tab-layout.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalText as Text,
-	__experimentalHeading as Heading,
-	__experimentalVStack as VStack,
-	__experimentalSpacer as Spacer,
-	__experimentalHStack as HStack,
-	Button,
-} from '@wordpress/components';
-import { chevronLeft } from '@wordpress/icons';
-
-function TabLayout( { title, description, handleBack, children, footer } ) {
-	return (
-		<div className="font-library-modal__tab-layout">
-			<Spacer margin={ 4 } />
-			<VStack spacing={ 4 } justify="space-between">
-				<header>
-					<VStack spacing={ 2 }>
-						<HStack justify="flex-start">
-							{ !! handleBack && (
-								<Button
-									variant="tertiary"
-									onClick={ handleBack }
-									icon={ chevronLeft }
-									size="small"
-								/>
-							) }
-							{ title && (
-								<Heading
-									level={ 2 }
-									size={ 13 }
-									className="edit-site-global-styles-header"
-								>
-									{ title }
-								</Heading>
-							) }
-						</HStack>
-						{ description && <Text>{ description }</Text> }
-					</VStack>
-				</header>
-				<main>{ children }</main>
-				{ footer && <footer>{ footer }</footer> }
-			</VStack>
-		</div>
-	);
-}
-
-export default TabLayout;
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/upload-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/upload-fonts.js
index effc4a2a5227ca..807f2aa354c25a 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/upload-fonts.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/upload-fonts.js
@@ -1,19 +1,252 @@
 /**
  * WordPress dependencies
  */
-import { __experimentalSpacer as Spacer } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import {
+	__experimentalSpacer as Spacer,
+	__experimentalText as Text,
+	__experimentalVStack as VStack,
+	Button,
+	DropZone,
+	Notice,
+	FormFileUpload,
+	FlexItem,
+	ProgressBar,
+} from '@wordpress/components';
+import { useContext, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import LocalFonts from './local-fonts';
+import { ALLOWED_FILE_EXTENSIONS } from './utils/constants';
+import { FontLibraryContext } from './context';
+import { Font } from '../../../../lib/lib-font.browser';
+import makeFamiliesFromFaces from './utils/make-families-from-faces';
+import { loadFontFaceInBrowser } from './utils';
 
 function UploadFonts() {
+	const { installFonts } = useContext( FontLibraryContext );
+	const [ isUploading, setIsUploading ] = useState( false );
+	const [ notice, setNotice ] = useState( false );
+
+	const handleDropZone = ( files ) => {
+		handleFilesUpload( files );
+	};
+	const onFilesUpload = ( event ) => {
+		handleFilesUpload( event.target.files );
+	};
+
+	/**
+	 * Filters the selected files to only allow the ones with the allowed extensions
+	 *
+	 * @param {Array} files The files to be filtered
+	 * @return {void}
+	 */
+	const handleFilesUpload = async ( files ) => {
+		setNotice( null );
+		setIsUploading( true );
+		const uniqueFilenames = new Set();
+		const selectedFiles = [ ...files ];
+		let hasInvalidFiles = false;
+
+		// Use map to create a promise for each file check, then filter with Promise.all.
+		const checkFilesPromises = selectedFiles.map( async ( file ) => {
+			const isFont = await isFontFile( file );
+			if ( ! isFont ) {
+				hasInvalidFiles = true;
+				return null; // Return null for invalid files.
+			}
+			// Check for duplicates
+			if ( uniqueFilenames.has( file.name ) ) {
+				return null; // Return null for duplicates.
+			}
+			// Check if the file extension is allowed.
+			const fileExtension = file.name.split( '.' ).pop().toLowerCase();
+			if ( ALLOWED_FILE_EXTENSIONS.includes( fileExtension ) ) {
+				uniqueFilenames.add( file.name );
+				return file; // Return the file if it passes all checks.
+			}
+			return null; // Return null for disallowed file extensions.
+		} );
+
+		// Filter out the nulls after all promises have resolved.
+		const allowedFiles = ( await Promise.all( checkFilesPromises ) ).filter(
+			( file ) => null !== file
+		);
+
+		if ( allowedFiles.length > 0 ) {
+			loadFiles( allowedFiles );
+		} else {
+			const message = hasInvalidFiles
+				? __( 'Sorry, you are not allowed to upload this file type.' )
+				: __( 'No fonts found to install.' );
+
+			setNotice( {
+				type: 'error',
+				message,
+			} );
+			setIsUploading( false );
+		}
+	};
+
+	/**
+	 * Loads the selected files and reads the font metadata
+	 *
+	 * @param {Array} files The files to be loaded
+	 * @return {void}
+	 */
+	const loadFiles = async ( files ) => {
+		const fontFacesLoaded = await Promise.all(
+			files.map( async ( fontFile ) => {
+				const fontFaceData = await getFontFaceMetadata( fontFile );
+				await loadFontFaceInBrowser(
+					fontFaceData,
+					fontFaceData.file,
+					'all'
+				);
+				return fontFaceData;
+			} )
+		);
+		handleInstall( fontFacesLoaded );
+	};
+
+	/**
+	 * Checks if a file is a valid Font file.
+	 *
+	 * @param {File} file The file to be checked.
+	 * @return {boolean} Whether the file is a valid font file.
+	 */
+	async function isFontFile( file ) {
+		const font = new Font( 'Uploaded Font' );
+		try {
+			const buffer = await readFileAsArrayBuffer( file );
+			await font.fromDataBuffer( buffer, 'font' );
+			return true;
+		} catch ( error ) {
+			return false;
+		}
+	}
+
+	// Create a function to read the file as array buffer
+	async function readFileAsArrayBuffer( file ) {
+		return new Promise( ( resolve, reject ) => {
+			const reader = new window.FileReader();
+			reader.readAsArrayBuffer( file );
+			reader.onload = () => resolve( reader.result );
+			reader.onerror = reject;
+		} );
+	}
+
+	const getFontFaceMetadata = async ( fontFile ) => {
+		const buffer = await readFileAsArrayBuffer( fontFile );
+		const fontObj = new Font( 'Uploaded Font' );
+		fontObj.fromDataBuffer( buffer, fontFile.name );
+		// Assuming that fromDataBuffer triggers onload event and returning a Promise
+		const onloadEvent = await new Promise(
+			( resolve ) => ( fontObj.onload = resolve )
+		);
+		const font = onloadEvent.detail.font;
+		const { name } = font.opentype.tables;
+		const fontName = name.get( 16 ) || name.get( 1 );
+		const isItalic = name.get( 2 ).toLowerCase().includes( 'italic' );
+		const fontWeight =
+			font.opentype.tables[ 'OS/2' ].usWeightClass || 'normal';
+		const isVariable = !! font.opentype.tables.fvar;
+		const weightAxis =
+			isVariable &&
+			font.opentype.tables.fvar.axes.find(
+				( { tag } ) => tag === 'wght'
+			);
+		const weightRange = weightAxis
+			? `${ weightAxis.minValue } ${ weightAxis.maxValue }`
+			: null;
+		return {
+			file: fontFile,
+			fontFamily: fontName,
+			fontStyle: isItalic ? 'italic' : 'normal',
+			fontWeight: weightRange || fontWeight,
+		};
+	};
+
+	/**
+	 * Creates the font family definition and sends it to the server
+	 *
+	 * @param {Array} fontFaces The font faces to be installed
+	 * @return {void}
+	 */
+	const handleInstall = async ( fontFaces ) => {
+		const fontFamilies = makeFamiliesFromFaces( fontFaces );
+
+		try {
+			await installFonts( fontFamilies );
+			setNotice( {
+				type: 'success',
+				message: __( 'Fonts were installed successfully.' ),
+			} );
+		} catch ( error ) {
+			setNotice( {
+				type: 'error',
+				message: error.message,
+				errors: error?.installationErrors,
+			} );
+		}
+
+		setIsUploading( false );
+	};
+
 	return (
-		<>
-			<Spacer margin={ 8 } />
-			<LocalFonts />
-		</>
+		<div className="font-library-modal__tabpanel-layout">
+			<DropZone onFilesDrop={ handleDropZone } />
+			<VStack className="font-library-modal__local-fonts">
+				{ notice && (
+					<Notice
+						status={ notice.type }
+						__unstableHTML
+						onRemove={ () => setNotice( null ) }
+					>
+						{ notice.message }
+						{ notice.errors && (
+							<ul>
+								{ notice.errors.map( ( error, index ) => (
+									<li key={ index }>{ error }</li>
+								) ) }
+							</ul>
+						) }
+					</Notice>
+				) }
+				{ isUploading && (
+					<FlexItem>
+						<div className="font-library-modal__upload-area">
+							<ProgressBar />
+						</div>
+					</FlexItem>
+				) }
+				{ ! isUploading && (
+					<FormFileUpload
+						accept={ ALLOWED_FILE_EXTENSIONS.map(
+							( ext ) => `.${ ext }`
+						).join( ',' ) }
+						multiple
+						onChange={ onFilesUpload }
+						render={ ( { openFileDialog } ) => (
+							<Button
+								__next40pxDefaultSize
+								className="font-library-modal__upload-area"
+								onClick={ openFileDialog }
+							>
+								{ __( 'Upload font' ) }
+							</Button>
+						) }
+					/>
+				) }
+				<Spacer margin={ 2 } />
+				<Text className="font-library-modal__upload-area__text">
+					{ __(
+						'Uploaded fonts appear in your library and can be used in your theme. Supported formats: .ttf, .otf, .woff, and .woff2.'
+					) }
+				</Text>
+			</VStack>
+		</div>
 	);
 }
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/filter-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/filter-fonts.js
index 7348eb6b054973..e493a70197acee 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/filter-fonts.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/filter-fonts.js
@@ -1,16 +1,33 @@
+/**
+ * Filters a list of fonts based on the specified filters.
+ *
+ * This function filters a given array of fonts based on the criteria provided in the filters object.
+ * It supports filtering by category and a search term. If the category is provided and not equal to 'all',
+ * the function filters the fonts array to include only those fonts that belong to the specified category.
+ * Additionally, if a search term is provided, it filters the fonts array to include only those fonts
+ * whose name includes the search term, case-insensitively.
+ *
+ * @param {Array}  fonts   Array of font objects in font-collection schema fashion to be filtered. Each font object should have a 'categories' property and a 'font_family_settings' property with a 'name' key.
+ * @param {Object} filters Object containing the filter criteria. It should have a 'category' key and/or a 'search' key.
+ *                         The 'category' key is a string representing the category to filter by.
+ *                         The 'search' key is a string representing the search term to filter by.
+ * @return {Array} Array of filtered font objects based on the provided criteria.
+ */
 export default function filterFonts( fonts, filters ) {
 	const { category, search } = filters;
 	let filteredFonts = fonts || [];
 
 	if ( category && category !== 'all' ) {
 		filteredFonts = filteredFonts.filter(
-			( font ) => font.category === category
+			( font ) => font.categories.indexOf( category ) !== -1
 		);
 	}
 
 	if ( search ) {
 		filteredFonts = filteredFonts.filter( ( font ) =>
-			font.name.toLowerCase().includes( search.toLowerCase() )
+			font.font_family_settings.name
+				.toLowerCase()
+				.includes( search.toLowerCase() )
 		);
 	}
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-intersecting-font-faces.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-intersecting-font-faces.js
deleted file mode 100644
index e21e72c58ed533..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-intersecting-font-faces.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Retrieves intersecting font faces between two sets of fonts.
- *
- * For each font in the `incoming` list, the function checks for a corresponding match
- * in the `existing` list based on the `slug` property. If a match is found and both
- * have `fontFace` properties, it further narrows down to matching font faces based on
- * the `fontWeight` and `fontStyle`. The result includes the properties of the matched
- * existing font but only with intersecting font faces.
- *
- * @param {Array.<{ slug: string, fontFace?: Array.<{ fontWeight: string, fontStyle: string }> }>} incoming - The list of fonts to compare.
- * @param {Array.<{ slug: string, fontFace?: Array.<{ fontWeight: string, fontStyle: string }> }>} existing - The reference list of fonts.
- *
- * @return {Array.<{ slug: string, fontFace?: Array.<{ fontWeight: string, fontStyle: string }> }>} An array of fonts from the `existing` list with intersecting font faces.
- *
- * @example
- * const incomingFonts = [
- *   { slug: 'arial', fontFace: [{ fontWeight: '400', fontStyle: 'normal' }] },
- *   { slug: 'times-new', fontFace: [{ fontWeight: '700', fontStyle: 'italic' }] }
- * ];
- *
- * const existingFonts = [
- *   { slug: 'arial', fontFace: [{ fontWeight: '400', fontStyle: 'normal' }, { fontWeight: '700', fontStyle: 'italic' }] },
- *   { slug: 'helvetica', fontFace: [{ fontWeight: '400', fontStyle: 'normal' }] }
- * ];
- *
- * getIntersectingFontFaces(incomingFonts, existingFonts);
- * // Returns:
- * // [{ slug: 'arial', fontFace: [{ fontWeight: '400', fontStyle: 'normal' }] }]
- */
-export default function getIntersectingFontFaces( incoming, existing ) {
-	const matches = [];
-
-	for ( const incomingFont of incoming ) {
-		const existingFont = existing.find(
-			( f ) => f.slug === incomingFont.slug
-		);
-
-		if ( existingFont ) {
-			if ( incomingFont?.fontFace ) {
-				const matchingFaces = incomingFont.fontFace.filter(
-					( face ) => {
-						return ( existingFont?.fontFace || [] ).find( ( f ) => {
-							return (
-								f.fontWeight === face.fontWeight &&
-								f.fontStyle === face.fontStyle
-							);
-						} );
-					}
-				);
-				matches.push( { ...incomingFont, fontFace: matchingFaces } );
-			} else {
-				matches.push( incomingFont );
-			}
-		}
-	}
-
-	return matches;
-}
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-notice-from-response.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-notice-from-response.js
deleted file mode 100644
index b22bd0afe23248..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-notice-from-response.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
-export function getNoticeFromInstallResponse( response ) {
-	const { errors = [], successes = [] } = response;
-	// Everything failed.
-	if ( errors.length && ! successes.length ) {
-		return {
-			type: 'error',
-			message: __( 'Error installing the fonts.' ),
-		};
-	}
-
-	// Eveerything succeeded.
-	if ( ! errors.length && successes.length ) {
-		return {
-			type: 'success',
-			message: __( 'Fonts were installed successfully.' ),
-		};
-	}
-
-	// Some succeeded, some failed.
-	if ( errors.length && successes.length ) {
-		return {
-			type: 'warning',
-			message: __(
-				'Some fonts were installed successfully and some failed.'
-			),
-		};
-	}
-}
-
-export function getNoticeFromUninstallResponse( response ) {
-	const { errors = [], successes = [] } = response;
-	// Everything failed.
-	if ( errors.length && ! successes.length ) {
-		return {
-			type: 'error',
-			message: __( 'Error uninstalling the fonts.' ),
-		};
-	}
-
-	// Everything succeeded.
-	if ( ! errors.length && successes.length ) {
-		return {
-			type: 'success',
-			message: __( 'Fonts were uninstalled successfully.' ),
-		};
-	}
-
-	// Some succeeded, some failed.
-	if ( errors.length && successes.length ) {
-		return {
-			type: 'warning',
-			message: __(
-				'Some fonts were uninstalled successfully and some failed.'
-			),
-		};
-	}
-}
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
index f5723f5814e983..1ca7bb68c87a06 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
@@ -1,12 +1,21 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import { paramCase as kebabCase } from 'change-case';
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import { FONT_WEIGHTS, FONT_STYLES } from './constants';
+import { unlock } from '../../../../lock-unlock';
+import { fetchInstallFontFace } from '../resolvers';
+import { formatFontFaceName } from './preview-styles';
+
+/**
+ * Browser dependencies
+ */
+const { File } = window;
+const { kebabCase } = unlock( componentsPrivateApis );
 
 export function setUIValuesNeeded( font, extraValues = {} ) {
 	if ( ! font.name && ( font.fontFamily || font.slug ) ) {
@@ -86,13 +95,18 @@ export async function loadFontFaceInBrowser( fontFace, source, addTo = 'all' ) {
 		// eslint-disable-next-line no-undef
 	} else if ( source instanceof File ) {
 		dataSource = await source.arrayBuffer();
+	} else {
+		return;
 	}
 
-	// eslint-disable-next-line no-undef
-	const newFont = new FontFace( fontFace.fontFamily, dataSource, {
-		style: fontFace.fontStyle,
-		weight: fontFace.fontWeight,
-	} );
+	const newFont = new window.FontFace(
+		formatFontFaceName( fontFace.fontFamily ),
+		dataSource,
+		{
+			style: fontFace.fontStyle,
+			weight: fontFace.fontWeight,
+		}
+	);
 
 	const loadedFace = await newFont.load();
 
@@ -108,7 +122,47 @@ export async function loadFontFaceInBrowser( fontFace, source, addTo = 'all' ) {
 	}
 }
 
-export function getDisplaySrcFromFontFace( input, urlPrefix ) {
+/*
+ * Unloads the font face and remove it from the browser.
+ * It also removes it from the iframe document.
+ *
+ * Note that Font faces that were added to the set using the CSS @font-face rule
+ * remain connected to the corresponding CSS, and cannot be deleted.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/FontFaceSet/delete.
+ */
+export function unloadFontFaceInBrowser( fontFace, removeFrom = 'all' ) {
+	const unloadFontFace = ( fonts ) => {
+		fonts.forEach( ( f ) => {
+			if (
+				f.family === formatFontFaceName( fontFace?.fontFamily ) &&
+				f.weight === fontFace?.fontWeight &&
+				f.style === fontFace?.fontStyle
+			) {
+				fonts.delete( f );
+			}
+		} );
+	};
+
+	if ( removeFrom === 'document' || removeFrom === 'all' ) {
+		unloadFontFace( document.fonts );
+	}
+
+	if ( removeFrom === 'iframe' || removeFrom === 'all' ) {
+		const iframeDocument = document.querySelector(
+			'iframe[name="editor-canvas"]'
+		).contentDocument;
+		unloadFontFace( iframeDocument.fonts );
+	}
+}
+
+/**
+ * Retrieves the display source from a font face src.
+ *
+ * @param {string|string[]} input - The font face src.
+ * @return {string|undefined} The display source or undefined if the input is invalid.
+ */
+export function getDisplaySrcFromFontFace( input ) {
 	if ( ! input ) {
 		return;
 	}
@@ -119,9 +173,9 @@ export function getDisplaySrcFromFontFace( input, urlPrefix ) {
 	} else {
 		src = input;
 	}
-	// If it is a theme font, we need to make the url absolute
-	if ( src.startsWith( 'file:.' ) && urlPrefix ) {
-		src = src.replace( 'file:.', urlPrefix );
+	// It's expected theme fonts will already be loaded in the browser.
+	if ( src.startsWith( 'file:.' ) ) {
+		return;
 	}
 	if ( ! isUrlEncoded( src ) ) {
 		src = encodeURI( src );
@@ -129,40 +183,151 @@ export function getDisplaySrcFromFontFace( input, urlPrefix ) {
 	return src;
 }
 
-// This function replicates one behavior of _wp_to_kebab_case().
-// Additional context: https://github.com/WordPress/gutenberg/issues/53695
-export function wpKebabCase( str ) {
-	// If a string contains a digit followed by a number, insert a dash between them.
-	return kebabCase( str ).replace(
-		/([a-zA-Z])(\d)|(\d)([a-zA-Z])/g,
-		'$1$3-$2$4'
+export function makeFontFamilyFormData( fontFamily ) {
+	const formData = new FormData();
+
+	const { fontFace, category, ...familyWithValidParameters } = fontFamily;
+	const fontFamilySettings = {
+		...familyWithValidParameters,
+		slug: kebabCase( fontFamily.slug ),
+	};
+
+	formData.append(
+		'font_family_settings',
+		JSON.stringify( fontFamilySettings )
 	);
+	return formData;
 }
 
-export function makeFormDataFromFontFamilies( fontFamilies ) {
-	const formData = new FormData();
-	const newFontFamilies = fontFamilies.map( ( family, familyIndex ) => {
-		family.slug = wpKebabCase( family.slug );
-		if ( family?.fontFace ) {
-			family.fontFace = family.fontFace.map( ( face, faceIndex ) => {
-				if ( face.file ) {
+export function makeFontFacesFormData( font ) {
+	if ( font?.fontFace ) {
+		const fontFacesFormData = font.fontFace.map( ( item, faceIndex ) => {
+			const face = { ...item };
+			const formData = new FormData();
+			if ( face.file ) {
+				// Normalize to an array, since face.file may be a single file or an array of files.
+				const files = Array.isArray( face.file )
+					? face.file
+					: [ face.file ];
+				const src = [];
+
+				files.forEach( ( file, key ) => {
 					// Slugified file name because the it might contain spaces or characters treated differently on the server.
-					const fileId = `file-${ familyIndex }-${ faceIndex }`;
+					const fileId = `file-${ faceIndex }-${ key }`;
 					// Add the files to the formData
-					formData.append( fileId, face.file, face.file.name );
-					// remove the file object from the face object the file is referenced by the uploadedFile key
-					const { file, ...faceWithoutFileProperty } = face;
-					const newFace = {
-						...faceWithoutFileProperty,
-						uploadedFile: fileId,
-					};
-					return newFace;
-				}
-				return face;
+					formData.append( fileId, file, file.name );
+					src.push( fileId );
+				} );
+
+				face.src = src.length === 1 ? src[ 0 ] : src;
+				delete face.file;
+
+				formData.append( 'font_face_settings', JSON.stringify( face ) );
+			} else {
+				formData.append( 'font_face_settings', JSON.stringify( face ) );
+			}
+			return formData;
+		} );
+
+		return fontFacesFormData;
+	}
+}
+
+export async function batchInstallFontFaces( fontFamilyId, fontFacesData ) {
+	const responses = [];
+
+	/*
+	 * Uses the same response format as Promise.allSettled, but executes requests in sequence to work
+	 * around a race condition that can cause an error when the fonts directory doesn't exist yet.
+	 */
+	for ( const faceData of fontFacesData ) {
+		try {
+			const response = await fetchInstallFontFace(
+				fontFamilyId,
+				faceData
+			);
+			responses.push( { status: 'fulfilled', value: response } );
+		} catch ( error ) {
+			responses.push( { status: 'rejected', reason: error } );
+		}
+	}
+
+	const results = {
+		errors: [],
+		successes: [],
+	};
+
+	responses.forEach( ( result, index ) => {
+		if ( result.status === 'fulfilled' ) {
+			const response = result.value;
+			if ( response.id ) {
+				results.successes.push( response );
+			} else {
+				results.errors.push( {
+					data: fontFacesData[ index ],
+					message: `Error: ${ response.message }`,
+				} );
+			}
+		} else {
+			// Handle network errors or other fetch-related errors
+			results.errors.push( {
+				data: fontFacesData[ index ],
+				message: result.reason.message,
 			} );
 		}
-		return family;
 	} );
-	formData.append( 'font_families', JSON.stringify( newFontFamilies ) );
-	return formData;
+
+	return results;
+}
+
+/*
+ * Downloads a font face asset from a URL to the client and returns a File object.
+ */
+export async function downloadFontFaceAssets( src ) {
+	// Normalize to an array, since `src` could be a string or array.
+	src = Array.isArray( src ) ? src : [ src ];
+
+	const files = await Promise.all(
+		src.map( async ( url ) => {
+			return fetch( new Request( url ) )
+				.then( ( response ) => {
+					if ( ! response.ok ) {
+						throw new Error(
+							`Error downloading font face asset from ${ url }. Server responded with status: ${ response.status }`
+						);
+					}
+					return response.blob();
+				} )
+				.then( ( blob ) => {
+					const filename = url.split( '/' ).pop();
+					const file = new File( [ blob ], filename, {
+						type: blob.type,
+					} );
+					return file;
+				} );
+		} )
+	);
+
+	// If we only have one file return it (not the array).  Otherwise return all of them in the array.
+	return files.length === 1 ? files[ 0 ] : files;
+}
+
+/*
+ * Determine if a given Font Face is present in a given collection.
+ * We determine that a font face has been installed by comparing the fontWeight and fontStyle
+ *
+ * @param {Object} fontFace The Font Face to seek
+ * @param {Array} collection The Collection to seek in
+ * @returns True if the font face is found in the collection.  Otherwise False.
+ */
+export function checkFontFaceInstalled( fontFace, collection ) {
+	return (
+		-1 !==
+		collection.findIndex( ( collectionFontFace ) => {
+			return (
+				collectionFontFace.fontWeight === fontFace.fontWeight &&
+				collectionFontFace.fontStyle === fontFace.fontStyle
+			);
+		} )
+	);
 }
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/make-families-from-faces.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/make-families-from-faces.js
index cbc995bedefd45..7cdbf405c0b5bc 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/make-families-from-faces.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/make-families-from-faces.js
@@ -1,10 +1,22 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../../../lock-unlock';
+
+const { kebabCase } = unlock( componentsPrivateApis );
+
 export default function makeFamiliesFromFaces( fontFaces ) {
 	const fontFamiliesObject = fontFaces.reduce( ( acc, item ) => {
 		if ( ! acc[ item.fontFamily ] ) {
 			acc[ item.fontFamily ] = {
 				name: item.fontFamily,
 				fontFamily: item.fontFamily,
-				slug: item.fontFamily.replace( /\s+/g, '-' ).toLowerCase(),
+				slug: kebabCase( item.fontFamily.toLowerCase() ),
 				fontFace: [],
 			};
 		}
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/preview-styles.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/preview-styles.js
index b47ffb781f0486..d0b5d1389d8019 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/preview-styles.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/preview-styles.js
@@ -30,18 +30,83 @@ function extractFontWeights( fontFaces ) {
 	return result;
 }
 
+/*
+ * Format the font family to use in the CSS font-family property of a CSS rule.
+ *
+ * The input can be a string with the font family name or a string with multiple font family names separated by commas.
+ * It follows the recommendations from the CSS Fonts Module Level 4.
+ * https://www.w3.org/TR/css-fonts-4/#font-family-prop
+ *
+ * @param {string} input - The font family.
+ * @return {string} The formatted font family.
+ *
+ * Example:
+ * formatFontFamily( "Open Sans, Font+Name, sans-serif" ) => '"Open Sans", "Font+Name", sans-serif'
+ * formatFontFamily( "'Open Sans', generic(kai), sans-serif" ) => '"Open Sans", sans-serif'
+ * formatFontFamily( "DotGothic16, Slabo 27px, serif" ) => '"DotGothic16","Slabo 27px",serif'
+ * formatFontFamily( "Mine's, Moe's Typography" ) => `"mine's","Moe's Typography"`
+ */
 export function formatFontFamily( input ) {
-	return input
-		.split( ',' )
-		.map( ( font ) => {
-			font = font.trim(); // Remove any leading or trailing white spaces
-			// If the font doesn't have single quotes and contains a space, then add single quotes around it
-			if ( ! font.startsWith( "'" ) && font.indexOf( ' ' ) !== -1 ) {
-				return `'${ font }'`;
-			}
-			return font; // Return font as is if no transformation is needed
-		} )
-		.join( ', ' );
+	// Matches strings that are not exclusively alphabetic characters or hyphens, and do not exactly follow the pattern generic(alphabetic characters or hyphens).
+	const regex = /^(?!generic\([ a-zA-Z\-]+\)$)(?!^[a-zA-Z\-]+$).+/;
+	const output = input.trim();
+
+	const formatItem = ( item ) => {
+		item = item.trim();
+		if ( item.match( regex ) ) {
+			// removes leading and trailing quotes.
+			item = item.replace( /^["']|["']$/g, '' );
+			return `"${ item }"`;
+		}
+		return item;
+	};
+
+	if ( output.includes( ',' ) ) {
+		return output
+			.split( ',' )
+			.map( formatItem )
+			.filter( ( item ) => item !== '' )
+			.join( ', ' );
+	}
+
+	return formatItem( output );
+}
+
+/*
+ * Format the font face name to use in the font-family property of a font face.
+ *
+ * The input can be a string with the font face name or a string with multiple font face names separated by commas.
+ * It removes the leading and trailing quotes from the font face name.
+ *
+ * @param {string} input - The font face name.
+ * @return {string} The formatted font face name.
+ *
+ * Example:
+ * formatFontFaceName("Open Sans") => "Open Sans"
+ * formatFontFaceName("'Open Sans', sans-serif") => "Open Sans"
+ * formatFontFaceName(", 'Open Sans', 'Helvetica Neue', sans-serif") => "Open Sans"
+ */
+export function formatFontFaceName( input ) {
+	if ( ! input ) {
+		return '';
+	}
+
+	let output = input.trim();
+	if ( output.includes( ',' ) ) {
+		output = output
+			.split( ',' )
+			// finds the first item that is not an empty string.
+			.find( ( item ) => item.trim() !== '' )
+			.trim();
+	}
+	// removes leading and trailing quotes.
+	output = output.replace( /^["']|["']$/g, '' );
+
+	// Firefox needs the font name to be wrapped in double quotes meanwhile other browsers don't.
+	if ( window.navigator.userAgent.toLowerCase().includes( 'firefox' ) ) {
+		output = `"${ output }"`;
+	}
+	return output;
 }
 
 export function getFamilyPreviewStyle( family ) {
@@ -56,7 +121,8 @@ export function getFamilyPreviewStyle( family ) {
 	if ( family.fontFace ) {
 		//get all the font faces with normal style
 		const normalFaces = family.fontFace.filter(
-			( face ) => face.fontStyle.toLowerCase() === 'normal'
+			( face ) =>
+				face?.fontStyle && face.fontStyle.toLowerCase() === 'normal'
 		);
 		if ( normalFaces.length > 0 ) {
 			style.fontStyle = 'normal';
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/sort-font-faces.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/sort-font-faces.js
index 4d94318c9b4476..69798112f07d3f 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/sort-font-faces.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/sort-font-faces.js
@@ -16,8 +16,12 @@ function getNumericFontWeight( value ) {
 export function sortFontFaces( faces ) {
 	return faces.sort( ( a, b ) => {
 		// Ensure 'normal' fontStyle is always first
-		if ( a.fontStyle === 'normal' && b.fontStyle !== 'normal' ) return -1;
-		if ( b.fontStyle === 'normal' && a.fontStyle !== 'normal' ) return 1;
+		if ( a.fontStyle === 'normal' && b.fontStyle !== 'normal' ) {
+			return -1;
+		}
+		if ( b.fontStyle === 'normal' && a.fontStyle !== 'normal' ) {
+			return 1;
+		}
 
 		// If both fontStyles are the same, sort by fontWeight
 		if ( a.fontStyle === b.fontStyle ) {
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/filter-fonts.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/filter-fonts.spec.js
index 4b171691d49d85..cd32e2b68f9cd1 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/filter-fonts.spec.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/filter-fonts.spec.js
@@ -5,11 +5,26 @@ import filterFonts from '../filter-fonts';
 
 describe( 'filterFonts', () => {
 	const mockFonts = [
-		{ name: 'Arial', category: 'sans-serif' },
-		{ name: 'Arial Condensed', category: 'sans-serif' },
-		{ name: 'Times New Roman', category: 'serif' },
-		{ name: 'Courier New', category: 'monospace' },
-		{ name: 'Romantic', category: 'cursive' },
+		{
+			font_family_settings: { name: 'Arial' },
+			categories: [ 'sans-serif' ],
+		},
+		{
+			font_family_settings: { name: 'Arial Condensed' },
+			categories: [ 'sans-serif' ],
+		},
+		{
+			font_family_settings: { name: 'Times New Roman' },
+			categories: [ 'serif' ],
+		},
+		{
+			font_family_settings: { name: 'Courier New' },
+			categories: [ 'monospace' ],
+		},
+		{
+			font_family_settings: { name: 'Romantic' },
+			categories: [ 'cursive' ],
+		},
 	];
 
 	it( 'should return all fonts if no filters are provided', () => {
@@ -20,7 +35,10 @@ describe( 'filterFonts', () => {
 	it( 'should filter by category', () => {
 		const result = filterFonts( mockFonts, { category: 'serif' } );
 		expect( result ).toEqual( [
-			{ name: 'Times New Roman', category: 'serif' },
+			{
+				font_family_settings: { name: 'Times New Roman' },
+				categories: [ 'serif' ],
+			},
 		] );
 	} );
 
@@ -32,15 +50,24 @@ describe( 'filterFonts', () => {
 	it( 'should filter by search', () => {
 		const result = filterFonts( mockFonts, { search: 'ari' } );
 		expect( result ).toEqual( [
-			{ name: 'Arial', category: 'sans-serif' },
-			{ name: 'Arial Condensed', category: 'sans-serif' },
+			{
+				font_family_settings: { name: 'Arial' },
+				categories: [ 'sans-serif' ],
+			},
+			{
+				font_family_settings: { name: 'Arial Condensed' },
+				categories: [ 'sans-serif' ],
+			},
 		] );
 	} );
 
 	it( 'should be case insensitive when filtering by search', () => {
 		const result = filterFonts( mockFonts, { search: 'RoMANtic' } );
 		expect( result ).toEqual( [
-			{ name: 'Romantic', category: 'cursive' },
+			{
+				font_family_settings: { name: 'Romantic' },
+				categories: [ 'cursive' ],
+			},
 		] );
 	} );
 
@@ -50,7 +77,10 @@ describe( 'filterFonts', () => {
 			search: 'Times',
 		} );
 		expect( result ).toEqual( [
-			{ name: 'Times New Roman', category: 'serif' },
+			{
+				font_family_settings: { name: 'Times New Roman' },
+				categories: [ 'serif' ],
+			},
 		] );
 	} );
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getDisplaySrcFromFontFace.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getDisplaySrcFromFontFace.spec.js
index 9c6235443a0992..3cbdc0283f1a9e 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getDisplaySrcFromFontFace.spec.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getDisplaySrcFromFontFace.spec.js
@@ -21,33 +21,22 @@ describe( 'getDisplaySrcFromFontFace', () => {
 		);
 	} );
 
-	it( 'makes URL absolute when it starts with file:. and urlPrefix is given', () => {
-		const input = 'file:./font1';
-		const urlPrefix = 'http://example.com';
-		expect( getDisplaySrcFromFontFace( input, urlPrefix ) ).toBe(
-			'http://example.com/font1'
-		);
-	} );
-
-	it( 'does not modify URL if it does not start with file:.', () => {
-		const input = [ 'http://some-other-place.com/font1' ];
-		const urlPrefix = 'http://example.com';
-		expect( getDisplaySrcFromFontFace( input, urlPrefix ) ).toBe(
-			'http://some-other-place.com/font1'
-		);
+	it( 'return undefined when the url starts with file:', () => {
+		const input = 'file:./theme/assets/font1.ttf';
+		expect( getDisplaySrcFromFontFace( input ) ).toBe( undefined );
 	} );
 
 	it( 'encodes the URL if it is not encoded', () => {
-		const input = 'file:./assets/font one with spaces.ttf';
+		const input = 'https://example.org/font one with spaces.ttf';
 		expect( getDisplaySrcFromFontFace( input ) ).toBe(
-			'file:./assets/font%20one%20with%20spaces.ttf'
+			'https://example.org/font%20one%20with%20spaces.ttf'
 		);
 	} );
 
 	it( 'does not encode the URL if it is already encoded', () => {
-		const input = 'file:./font%20one';
+		const input = 'https://example.org/fonts/font%20one.ttf';
 		expect( getDisplaySrcFromFontFace( input ) ).toBe(
-			'file:./font%20one'
+			'https://example.org/fonts/font%20one.ttf'
 		);
 	} );
 } );
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getIntersectingFontFaces.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getIntersectingFontFaces.spec.js
deleted file mode 100644
index 9899005ad65b89..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getIntersectingFontFaces.spec.js
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * Internal dependencies
- */
-import getIntersectingFontFaces from '../get-intersecting-font-faces';
-
-describe( 'getIntersectingFontFaces', () => {
-	it( 'returns matching font faces for matching font family', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( incomingFontFamilies );
-	} );
-
-	it( 'returns empty array when there is no match', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'montserrat',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( [] );
-	} );
-
-	it( 'returns matching font faces', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-					{
-						fontWeight: '700',
-						fontStyle: 'italic',
-					},
-				],
-			},
-			{
-				slug: 'times',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-					{
-						fontWeight: '800',
-						fontStyle: 'italic',
-					},
-					{
-						fontWeight: '900',
-						fontStyle: 'italic',
-					},
-				],
-			},
-		];
-
-		const expectedOutput = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( expectedOutput );
-	} );
-
-	it( 'returns empty array when the first list is empty', () => {
-		const incomingFontFamilies = [];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( [] );
-	} );
-
-	it( 'returns empty array when the second list is empty', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const existingFontFamilies = [];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( [] );
-	} );
-
-	it( 'returns intersecting font family when there are no fonfaces', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'piazzolla',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-			},
-			{
-				slug: 'lobster',
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( existingFontFamilies );
-	} );
-
-	it( 'returns intersecting if there is an intended font face and is not present in the returning it should not be returned', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'piazzolla',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-			},
-			{
-				slug: 'lobster',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-		const expected = [
-			{
-				slug: 'lobster',
-				fontFace: [],
-			},
-		];
-		expect( result ).toEqual( expected );
-	} );
-
-	it( 'updates font family definition using the incoming data', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'gothic-a1',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-				fontFamily: "'Gothic A1', serif",
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'gothic-a1',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-				fontFamily: 'Gothic A1, serif',
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-		const expected = [
-			{
-				slug: 'gothic-a1',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-				fontFamily: "'Gothic A1', serif",
-			},
-		];
-		expect( result ).toEqual( expected );
-	} );
-} );
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamilies.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamilies.spec.js
deleted file mode 100644
index 4adae7889cc5e5..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamilies.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Internal dependencies
- */
-import { makeFormDataFromFontFamilies } from '../index';
-
-/* global File */
-
-describe( 'makeFormDataFromFontFamilies', () => {
-	it( 'should process fontFamilies and return FormData', () => {
-		const mockFontFamilies = [
-			{
-				slug: 'bebas',
-				name: 'Bebas',
-				fontFamily: 'Bebas',
-				fontFace: [
-					{
-						file: new File( [ 'content' ], 'test-font1.woff2' ),
-						fontWeight: '500',
-						fontStyle: 'normal',
-					},
-					{
-						file: new File( [ 'content' ], 'test-font2.woff2' ),
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const formData = makeFormDataFromFontFamilies( mockFontFamilies );
-
-		expect( formData instanceof FormData ).toBeTruthy();
-
-		// Check if files are added correctly
-		expect( formData.get( 'file-0-0' ).name ).toBe( 'test-font1.woff2' );
-		expect( formData.get( 'file-0-1' ).name ).toBe( 'test-font2.woff2' );
-
-		// Check if 'fontFamilies' key in FormData is correct
-		const expectedFontFamilies = [
-			{
-				fontFace: [
-					{
-						fontWeight: '500',
-						fontStyle: 'normal',
-						uploadedFile: 'file-0-0',
-					},
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-						uploadedFile: 'file-0-1',
-					},
-				],
-				slug: 'bebas',
-				name: 'Bebas',
-				fontFamily: 'Bebas',
-			},
-		];
-		expect( JSON.parse( formData.get( 'font_families' ) ) ).toEqual(
-			expectedFontFamilies
-		);
-	} );
-} );
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/preview-styles.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/preview-styles.spec.js
index f9f789a61fd6c0..7e98b77964f7f2 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/preview-styles.spec.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/preview-styles.spec.js
@@ -1,7 +1,11 @@
 /**
  * Internal dependencies
  */
-import { getFamilyPreviewStyle, formatFontFamily } from '../preview-styles';
+import {
+	getFamilyPreviewStyle,
+	formatFontFamily,
+	formatFontFaceName,
+} from '../preview-styles';
 
 describe( 'getFamilyPreviewStyle', () => {
 	it( 'should return default fontStyle and fontWeight if fontFace is not provided', () => {
@@ -123,13 +127,13 @@ describe( 'getFamilyPreviewStyle', () => {
 describe( 'formatFontFamily', () => {
 	it( 'should transform "Baloo 2, system-ui" correctly', () => {
 		expect( formatFontFamily( 'Baloo 2, system-ui' ) ).toBe(
-			"'Baloo 2', system-ui"
+			'"Baloo 2", system-ui'
 		);
 	} );
 
 	it( 'should ignore extra spaces', () => {
 		expect( formatFontFamily( '  Baloo 2   , system-ui' ) ).toBe(
-			"'Baloo 2', system-ui"
+			'"Baloo 2", system-ui'
 		);
 	} );
 
@@ -139,23 +143,74 @@ describe( 'formatFontFamily', () => {
 				"Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif"
 			)
 		).toBe(
-			"Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif"
+			'Seravek, "Gill Sans Nova", Ubuntu, Calibri, "DejaVu Sans", source-sans-pro, sans-serif'
 		);
 	} );
 
 	it( 'should wrap single font name with spaces in quotes', () => {
-		expect( formatFontFamily( 'Baloo 2' ) ).toBe( "'Baloo 2'" );
+		expect( formatFontFamily( 'Baloo 2' ) ).toBe( '"Baloo 2"' );
 	} );
 
 	it( 'should wrap multiple font names with spaces in quotes', () => {
 		expect( formatFontFamily( 'Baloo Bhai 2, Baloo 2' ) ).toBe(
-			"'Baloo Bhai 2', 'Baloo 2'"
+			'"Baloo Bhai 2", "Baloo 2"'
 		);
 	} );
 
-	it( 'should wrap only those font names with spaces which are not already quoted', () => {
-		expect( formatFontFamily( 'Baloo Bhai 2, Arial' ) ).toBe(
-			"'Baloo Bhai 2', Arial"
+	it( 'should wrap names with special characters in quotes', () => {
+		expect(
+			formatFontFamily(
+				'Font+Name, Font*Name, _Font_Name_, generic(kai), sans-serif'
+			)
+		).toBe(
+			'"Font+Name", "Font*Name", "_Font_Name_", generic(kai), sans-serif'
+		);
+	} );
+
+	it( 'should fix empty wrong formatted font family', () => {
+		expect( formatFontFamily( ', Abril Fatface,Times,serif' ) ).toBe(
+			'"Abril Fatface", Times, serif'
+		);
+	} );
+
+	it( 'should not add quotes to generic names', () => {
+		expect(
+			formatFontFamily(
+				'Paren(thesis)Font, generic(kai), generic(fasongsong), generic( abc ), Helvetica Neue'
+			)
+		).toBe(
+			'"Paren(thesis)Font", generic(kai), generic(fasongsong), generic( abc ), "Helvetica Neue"'
 		);
 	} );
 } );
+
+describe( 'formatFontFaceName', () => {
+	it( 'should remove leading and trailing quotes', () => {
+		expect( formatFontFaceName( '"Open Sans"' ) ).toBe( 'Open Sans' );
+	} );
+
+	it( 'should remove leading and trailing quotes from multiple font face names', () => {
+		expect(
+			formatFontFaceName( "'Open Sans', 'Helvetica Neue', sans-serif" )
+		).toBe( 'Open Sans' );
+	} );
+
+	it( 'should remove leading and trailing quotes even from names with spaces and special characters', () => {
+		expect( formatFontFaceName( "'Font+Name 24', sans-serif" ) ).toBe(
+			'Font+Name 24'
+		);
+	} );
+
+	it( 'should ouput the font face name with quotes on Firefox', () => {
+		const mockUserAgent =
+			'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0';
+
+		// Mock the userAgent for this test
+		Object.defineProperty( window.navigator, 'userAgent', {
+			value: mockUserAgent,
+			configurable: true,
+		} );
+
+		expect( formatFontFaceName( 'Open Sans' ) ).toBe( '"Open Sans"' );
+	} );
+} );
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/wpKebabCase.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/wpKebabCase.spec.js
deleted file mode 100644
index d296117ff3a49b..00000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/wpKebabCase.spec.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Internal dependencies
- */
-import { wpKebabCase } from '../index';
-
-describe( 'wpKebabCase', () => {
-	it( 'should insert a dash between a letter and a digit', () => {
-		const input = 'abc1def';
-		const expectedOutput = 'abc-1def';
-		expect( wpKebabCase( input ) ).toEqual( expectedOutput );
-
-		const input2 = 'abc1def2ghi';
-		const expectedOutput2 = 'abc-1def-2ghi';
-		expect( wpKebabCase( input2 ) ).toEqual( expectedOutput2 );
-	} );
-
-	it( 'should not insert a dash between two letters', () => {
-		const input = 'abcdef';
-		const expectedOutput = 'abcdef';
-		expect( wpKebabCase( input ) ).toEqual( expectedOutput );
-	} );
-
-	it( 'should not insert a dash between a digit and a hyphen', () => {
-		const input = 'abc1-def';
-		const expectedOutput = 'abc-1-def';
-		expect( wpKebabCase( input ) ).toEqual( expectedOutput );
-	} );
-} );
diff --git a/packages/edit-site/src/components/global-styles/font-sizes/confirm-delete-font-size-dialog.js b/packages/edit-site/src/components/global-styles/font-sizes/confirm-delete-font-size-dialog.js
new file mode 100644
index 00000000000000..69d561ee0232a8
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/font-sizes/confirm-delete-font-size-dialog.js
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+
+function ConfirmDeleteFontSizeDialog( {
+	fontSize,
+	isOpen,
+	toggleOpen,
+	handleRemoveFontSize,
+} ) {
+	const handleConfirm = async () => {
+		toggleOpen();
+		handleRemoveFontSize( fontSize );
+	};
+
+	const handleCancel = () => {
+		toggleOpen();
+	};
+
+	return (
+		<ConfirmDialog
+			isOpen={ isOpen }
+			cancelButtonText={ __( 'Cancel' ) }
+			confirmButtonText={ __( 'Delete' ) }
+			onCancel={ handleCancel }
+			onConfirm={ handleConfirm }
+			size="medium"
+		>
+			{ fontSize &&
+				sprintf(
+					/* translators: %s: Name of the font size preset. */
+					__(
+						'Are you sure you want to delete "%s" font size preset?'
+					),
+					fontSize.name
+				) }
+		</ConfirmDialog>
+	);
+}
+
+export default ConfirmDeleteFontSizeDialog;
diff --git a/packages/edit-site/src/components/global-styles/font-sizes/confirm-reset-font-sizes-dialog.js b/packages/edit-site/src/components/global-styles/font-sizes/confirm-reset-font-sizes-dialog.js
new file mode 100644
index 00000000000000..fb1bd51ba1479a
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/font-sizes/confirm-reset-font-sizes-dialog.js
@@ -0,0 +1,37 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+function ConfirmResetFontSizesDialog( {
+	text,
+	confirmButtonText,
+	isOpen,
+	toggleOpen,
+	onConfirm,
+} ) {
+	const handleConfirm = async () => {
+		toggleOpen();
+		onConfirm();
+	};
+
+	const handleCancel = () => {
+		toggleOpen();
+	};
+
+	return (
+		<ConfirmDialog
+			isOpen={ isOpen }
+			cancelButtonText={ __( 'Cancel' ) }
+			confirmButtonText={ confirmButtonText }
+			onCancel={ handleCancel }
+			onConfirm={ handleConfirm }
+			size="medium"
+		>
+			{ text }
+		</ConfirmDialog>
+	);
+}
+
+export default ConfirmResetFontSizesDialog;
diff --git a/packages/edit-site/src/components/global-styles/font-sizes/font-size-preview.js b/packages/edit-site/src/components/global-styles/font-sizes/font-size-preview.js
new file mode 100644
index 00000000000000..e49ed0249e65a4
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/font-sizes/font-size-preview.js
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	getComputedFluidTypographyValue,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../../lock-unlock';
+const { useGlobalStyle } = unlock( blockEditorPrivateApis );
+
+function FontSizePreview( { fontSize } ) {
+	const [ font ] = useGlobalStyle( 'typography' );
+
+	const input =
+		fontSize?.fluid?.min && fontSize?.fluid?.max
+			? {
+					minimumFontSize: fontSize.fluid.min,
+					maximumFontSize: fontSize.fluid.max,
+			  }
+			: {
+					fontSize: fontSize.size,
+			  };
+
+	const computedFontSize = getComputedFluidTypographyValue( input );
+	return (
+		<div
+			className="edit-site-typography-preview"
+			style={ {
+				fontSize: computedFontSize,
+				fontFamily: font?.fontFamily ?? 'serif',
+			} }
+		>
+			{ __( 'Aa' ) }
+		</div>
+	);
+}
+
+export default FontSizePreview;
diff --git a/packages/edit-site/src/components/global-styles/font-sizes/font-size.js b/packages/edit-site/src/components/global-styles/font-sizes/font-size.js
new file mode 100644
index 00000000000000..43418f9caf5eb6
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/font-sizes/font-size.js
@@ -0,0 +1,260 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { __, sprintf } from '@wordpress/i18n';
+import {
+	__experimentalSpacer as Spacer,
+	useNavigator,
+	__experimentalView as View,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	privateApis as componentsPrivateApis,
+	Button,
+	FlexItem,
+	ToggleControl,
+} from '@wordpress/components';
+import { moreVertical } from '@wordpress/icons';
+import { useState, useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../../lock-unlock';
+import ScreenHeader from '../header';
+import FontSizePreview from './font-size-preview';
+import ConfirmDeleteFontSizeDialog from './confirm-delete-font-size-dialog';
+import RenameFontSizeDialog from './rename-font-size-dialog';
+import SizeControl from '../size-control';
+
+const { DropdownMenuV2 } = unlock( componentsPrivateApis );
+const { useGlobalSetting } = unlock( blockEditorPrivateApis );
+
+function FontSize() {
+	const [ isDeleteConfirmOpen, setIsDeleteConfirmOpen ] = useState( false );
+	const [ isRenameDialogOpen, setIsRenameDialogOpen ] = useState( false );
+
+	const {
+		params: { origin, slug },
+		goBack,
+	} = useNavigator();
+
+	const [ fontSizes, setFontSizes ] = useGlobalSetting(
+		'typography.fontSizes'
+	);
+
+	const [ globalFluid ] = useGlobalSetting( 'typography.fluid' );
+
+	// Get the font sizes from the origin, default to empty array.
+	const sizes = fontSizes[ origin ] ?? [];
+
+	// Get the font size by slug.
+	const fontSize = sizes.find( ( size ) => size.slug === slug );
+
+	// Navigate to the font sizes list if the font size is not available.
+	useEffect( () => {
+		if ( !! slug && ! fontSize ) {
+			goBack();
+		}
+	}, [ slug, fontSize, goBack ] );
+
+	if ( ! origin || ! slug || ! fontSize ) {
+		return null;
+	}
+
+	// Whether the font size is fluid. If not defined, use the global fluid value of the theme.
+	const isFluid =
+		fontSize?.fluid !== undefined ? !! fontSize.fluid : !! globalFluid;
+
+	// Whether custom fluid values are used.
+	const isCustomFluid = typeof fontSize?.fluid === 'object';
+
+	const handleNameChange = ( value ) => {
+		updateFontSize( 'name', value );
+	};
+
+	const handleFontSizeChange = ( value ) => {
+		updateFontSize( 'size', value );
+	};
+
+	const handleFluidChange = ( value ) => {
+		updateFontSize( 'fluid', value );
+	};
+
+	const handleCustomFluidValues = ( value ) => {
+		if ( value ) {
+			// If custom values are used, init the values with the current ones.
+			updateFontSize( 'fluid', {
+				min: fontSize.size,
+				max: fontSize.size,
+			} );
+		} else {
+			// If custom fluid values are disabled, set fluid to true.
+			updateFontSize( 'fluid', true );
+		}
+	};
+
+	const handleMinChange = ( value ) => {
+		updateFontSize( 'fluid', { ...fontSize.fluid, min: value } );
+	};
+
+	const handleMaxChange = ( value ) => {
+		updateFontSize( 'fluid', { ...fontSize.fluid, max: value } );
+	};
+
+	const updateFontSize = ( key, value ) => {
+		const newFontSizes = sizes.map( ( size ) => {
+			if ( size.slug === slug ) {
+				return { ...size, [ key ]: value }; // Create a new object with updated key
+			}
+			return size;
+		} );
+
+		setFontSizes( {
+			...fontSizes,
+			[ origin ]: newFontSizes,
+		} );
+	};
+
+	const handleRemoveFontSize = () => {
+		const newFontSizes = sizes.filter( ( size ) => size.slug !== slug );
+		setFontSizes( {
+			...fontSizes,
+			[ origin ]: newFontSizes,
+		} );
+	};
+
+	const toggleDeleteConfirm = () => {
+		setIsDeleteConfirmOpen( ! isDeleteConfirmOpen );
+	};
+
+	const toggleRenameDialog = () => {
+		setIsRenameDialogOpen( ! isRenameDialogOpen );
+	};
+
+	return (
+		<>
+			<ConfirmDeleteFontSizeDialog
+				fontSize={ fontSize }
+				isOpen={ isDeleteConfirmOpen }
+				toggleOpen={ toggleDeleteConfirm }
+				handleRemoveFontSize={ handleRemoveFontSize }
+			/>
+
+			{ isRenameDialogOpen && (
+				<RenameFontSizeDialog
+					fontSize={ fontSize }
+					toggleOpen={ toggleRenameDialog }
+					handleRename={ handleNameChange }
+				/>
+			) }
+
+			<VStack spacing={ 4 }>
+				<HStack justify="space-between" align="flex-start">
+					<ScreenHeader
+						title={ fontSize.name }
+						description={ sprintf(
+							/* translators: %s: font size preset name. */
+							__( 'Manage the font size %s.' ),
+							fontSize.name
+						) }
+					/>
+					{ origin === 'custom' && (
+						<FlexItem>
+							<Spacer
+								marginTop={ 3 }
+								marginBottom={ 0 }
+								paddingX={ 4 }
+							>
+								<DropdownMenuV2
+									trigger={
+										<Button
+											size="small"
+											icon={ moreVertical }
+											label={ __( 'Font size options' ) }
+										/>
+									}
+								>
+									<DropdownMenuV2.Item
+										onClick={ toggleRenameDialog }
+									>
+										<DropdownMenuV2.ItemLabel>
+											{ __( 'Rename' ) }
+										</DropdownMenuV2.ItemLabel>
+									</DropdownMenuV2.Item>
+									<DropdownMenuV2.Item
+										onClick={ toggleDeleteConfirm }
+									>
+										<DropdownMenuV2.ItemLabel>
+											{ __( 'Delete' ) }
+										</DropdownMenuV2.ItemLabel>
+									</DropdownMenuV2.Item>
+								</DropdownMenuV2>
+							</Spacer>
+						</FlexItem>
+					) }
+				</HStack>
+
+				<View>
+					<Spacer
+						paddingX={ 4 }
+						marginBottom={ 0 }
+						paddingBottom={ 6 }
+					>
+						<VStack spacing={ 4 }>
+							<FlexItem>
+								<FontSizePreview fontSize={ fontSize } />
+							</FlexItem>
+
+							<SizeControl
+								label={ __( 'Size' ) }
+								value={ ! isCustomFluid ? fontSize.size : '' }
+								onChange={ handleFontSizeChange }
+								disabled={ isCustomFluid }
+							/>
+
+							<ToggleControl
+								label={ __( 'Fluid typography' ) }
+								help={ __(
+									'Scale the font size dynamically to fit the screen or viewport.'
+								) }
+								checked={ isFluid }
+								onChange={ handleFluidChange }
+								__nextHasNoMarginBottom
+							/>
+
+							{ isFluid && (
+								<ToggleControl
+									label={ __( 'Custom fluid values' ) }
+									help={ __(
+										'Set custom min and max values for the fluid font size.'
+									) }
+									checked={ isCustomFluid }
+									onChange={ handleCustomFluidValues }
+									__nextHasNoMarginBottom
+								/>
+							) }
+
+							{ isCustomFluid && (
+								<>
+									<SizeControl
+										label={ __( 'Minimum' ) }
+										value={ fontSize.fluid?.min }
+										onChange={ handleMinChange }
+									/>
+									<SizeControl
+										label={ __( 'Maximum' ) }
+										value={ fontSize.fluid?.max }
+										onChange={ handleMaxChange }
+									/>
+								</>
+							) }
+						</VStack>
+					</Spacer>
+				</View>
+			</VStack>
+		</>
+	);
+}
+
+export default FontSize;
diff --git a/packages/edit-site/src/components/global-styles/font-sizes/font-sizes-count.js b/packages/edit-site/src/components/global-styles/font-sizes/font-sizes-count.js
new file mode 100644
index 00000000000000..fb23a38fe43bc2
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/font-sizes/font-sizes-count.js
@@ -0,0 +1,37 @@
+/**
+ * WordPress dependencies
+ */
+import { __, isRTL } from '@wordpress/i18n';
+import {
+	__experimentalItemGroup as ItemGroup,
+	__experimentalVStack as VStack,
+	__experimentalHStack as HStack,
+	FlexItem,
+} from '@wordpress/components';
+import { Icon, chevronLeft, chevronRight } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import Subtitle from '../subtitle';
+import { NavigationButtonAsItem } from '../navigation-button';
+
+function FontSizes() {
+	return (
+		<VStack spacing={ 2 }>
+			<HStack justify="space-between">
+				<Subtitle level={ 3 }>{ __( 'Font Sizes' ) }</Subtitle>
+			</HStack>
+			<ItemGroup isBordered isSeparated>
+				<NavigationButtonAsItem path="/typography/font-sizes">
+					<HStack direction="row">
+						<FlexItem>{ __( 'Font size presets' ) }</FlexItem>
+						<Icon icon={ isRTL() ? chevronLeft : chevronRight } />
+					</HStack>
+				</NavigationButtonAsItem>
+			</ItemGroup>
+		</VStack>
+	);
+}
+
+export default FontSizes;
diff --git a/packages/edit-site/src/components/global-styles/font-sizes/font-sizes.js b/packages/edit-site/src/components/global-styles/font-sizes/font-sizes.js
new file mode 100644
index 00000000000000..e09dda1a82fe81
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/font-sizes/font-sizes.js
@@ -0,0 +1,261 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { __, sprintf, isRTL } from '@wordpress/i18n';
+import {
+	privateApis as componentsPrivateApis,
+	__experimentalSpacer as Spacer,
+	__experimentalView as View,
+	__experimentalItemGroup as ItemGroup,
+	__experimentalVStack as VStack,
+	__experimentalHStack as HStack,
+	FlexItem,
+	FlexBlock,
+	Button,
+} from '@wordpress/components';
+import {
+	Icon,
+	plus,
+	moreVertical,
+	chevronLeft,
+	chevronRight,
+} from '@wordpress/icons';
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../../lock-unlock';
+const { DropdownMenuV2 } = unlock( componentsPrivateApis );
+const { useGlobalSetting } = unlock( blockEditorPrivateApis );
+import Subtitle from '../subtitle';
+import { NavigationButtonAsItem } from '../navigation-button';
+import { getNewIndexFromPresets } from '../utils';
+import ScreenHeader from '../header';
+import ConfirmResetFontSizesDialog from './confirm-reset-font-sizes-dialog';
+
+function FontSizeGroup( {
+	label,
+	origin,
+	sizes,
+	handleAddFontSize,
+	handleResetFontSizes,
+} ) {
+	const [ isResetDialogOpen, setIsResetDialogOpen ] = useState( false );
+
+	const toggleResetDialog = () => setIsResetDialogOpen( ! isResetDialogOpen );
+
+	const resetDialogText =
+		origin === 'custom'
+			? __(
+					'Are you sure you want to remove all custom font size presets?'
+			  )
+			: __(
+					'Are you sure you want to reset all font size presets to their default values?'
+			  );
+
+	return (
+		<>
+			{ isResetDialogOpen && (
+				<ConfirmResetFontSizesDialog
+					text={ resetDialogText }
+					confirmButtonText={
+						origin === 'custom' ? __( 'Remove' ) : __( 'Reset' )
+					}
+					isOpen={ isResetDialogOpen }
+					toggleOpen={ toggleResetDialog }
+					onConfirm={ handleResetFontSizes }
+				/>
+			) }
+			<VStack spacing={ 4 }>
+				<HStack justify="space-between" align="center">
+					<Subtitle level={ 3 }>{ label }</Subtitle>
+					<FlexItem>
+						{ origin === 'custom' && (
+							<Button
+								label={ __( 'Add font size' ) }
+								icon={ plus }
+								size="small"
+								onClick={ handleAddFontSize }
+							/>
+						) }
+						{ !! handleResetFontSizes && (
+							<DropdownMenuV2
+								trigger={
+									<Button
+										size="small"
+										icon={ moreVertical }
+										label={ __(
+											'Font size presets options'
+										) }
+									/>
+								}
+							>
+								<DropdownMenuV2.Item
+									onClick={ toggleResetDialog }
+								>
+									<DropdownMenuV2.ItemLabel>
+										{ origin === 'custom'
+											? __( 'Remove font size presets' )
+											: __( 'Reset font size presets' ) }
+									</DropdownMenuV2.ItemLabel>
+								</DropdownMenuV2.Item>
+							</DropdownMenuV2>
+						) }
+					</FlexItem>
+				</HStack>
+
+				{ !! sizes.length && (
+					<ItemGroup isBordered isSeparated>
+						{ sizes.map( ( size ) => (
+							<NavigationButtonAsItem
+								key={ size.slug }
+								path={ `/typography/font-sizes/${ origin }/${ size.slug }` }
+							>
+								<HStack direction="row">
+									<FlexItem className="edit-site-font-size__item">
+										{ size.name }
+									</FlexItem>
+									<FlexItem>
+										<HStack justify="flex-end">
+											<FlexBlock className="edit-site-font-size__item edit-site-font-size__item-value">
+												{ size.size }
+											</FlexBlock>
+											<Icon
+												icon={
+													isRTL()
+														? chevronLeft
+														: chevronRight
+												}
+											/>
+										</HStack>
+									</FlexItem>
+								</HStack>
+							</NavigationButtonAsItem>
+						) ) }
+					</ItemGroup>
+				) }
+			</VStack>
+		</>
+	);
+}
+
+function FontSizes() {
+	const [ themeFontSizes, setThemeFontSizes ] = useGlobalSetting(
+		'typography.fontSizes.theme'
+	);
+
+	const [ baseThemeFontSizes ] = useGlobalSetting(
+		'typography.fontSizes.theme',
+		null,
+		'base'
+	);
+	const [ defaultFontSizes, setDefaultFontSizes ] = useGlobalSetting(
+		'typography.fontSizes.default'
+	);
+
+	const [ baseDefaultFontSizes ] = useGlobalSetting(
+		'typography.fontSizes.default',
+		null,
+		'base'
+	);
+
+	const [ customFontSizes = [], setCustomFontSizes ] = useGlobalSetting(
+		'typography.fontSizes.custom'
+	);
+
+	const [ defaultFontSizesEnabled ] = useGlobalSetting(
+		'typography.defaultFontSizes'
+	);
+
+	const handleAddFontSize = () => {
+		const index = getNewIndexFromPresets( customFontSizes, 'custom-' );
+		const newFontSize = {
+			/* translators: %d: font size index */
+			name: sprintf( __( 'New Font Size %d' ), index ),
+			size: '16px',
+			slug: `custom-${ index }`,
+		};
+
+		setCustomFontSizes( [ ...customFontSizes, newFontSize ] );
+	};
+
+	const hasSameSizeValues = ( arr1, arr2 ) =>
+		arr1.map( ( item ) => item.size ).join( '' ) ===
+		arr2.map( ( item ) => item.size ).join( '' );
+
+	return (
+		<VStack spacing={ 2 }>
+			<ScreenHeader
+				title={ __( 'Font size presets' ) }
+				description={ __(
+					'Create and edit the presets used for font sizes across the site.'
+				) }
+			/>
+
+			<View>
+				<Spacer paddingX={ 4 }>
+					<VStack spacing={ 8 }>
+						{ !! themeFontSizes?.length && (
+							<FontSizeGroup
+								label={ __( 'Theme' ) }
+								origin="theme"
+								sizes={ themeFontSizes }
+								baseSizes={ baseThemeFontSizes }
+								handleAddFontSize={ handleAddFontSize }
+								handleResetFontSizes={
+									hasSameSizeValues(
+										themeFontSizes,
+										baseThemeFontSizes
+									)
+										? null
+										: () =>
+												setThemeFontSizes(
+													baseThemeFontSizes
+												)
+								}
+							/>
+						) }
+
+						{ defaultFontSizesEnabled &&
+							!! defaultFontSizes?.length && (
+								<FontSizeGroup
+									label={ __( 'Default' ) }
+									origin="default"
+									sizes={ defaultFontSizes }
+									baseSizes={ baseDefaultFontSizes }
+									handleAddFontSize={ handleAddFontSize }
+									handleResetFontSizes={
+										hasSameSizeValues(
+											defaultFontSizes,
+											baseDefaultFontSizes
+										)
+											? null
+											: () =>
+													setDefaultFontSizes(
+														baseDefaultFontSizes
+													)
+									}
+								/>
+							) }
+
+						<FontSizeGroup
+							label={ __( 'Custom' ) }
+							origin="custom"
+							sizes={ customFontSizes }
+							handleAddFontSize={ handleAddFontSize }
+							handleResetFontSizes={
+								customFontSizes.length > 0
+									? () => setCustomFontSizes( [] )
+									: null
+							}
+						/>
+					</VStack>
+				</Spacer>
+			</View>
+		</VStack>
+	);
+}
+
+export default FontSizes;
diff --git a/packages/edit-site/src/components/global-styles/font-sizes/rename-font-size-dialog.js b/packages/edit-site/src/components/global-styles/font-sizes/rename-font-size-dialog.js
new file mode 100644
index 00000000000000..cb718959c6c27a
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/font-sizes/rename-font-size-dialog.js
@@ -0,0 +1,70 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalInputControl as InputControl,
+	__experimentalVStack as VStack,
+	__experimentalHStack as HStack,
+	Button,
+	Modal,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useState } from '@wordpress/element';
+
+function RenameFontSizeDialog( { fontSize, toggleOpen, handleRename } ) {
+	const [ newName, setNewName ] = useState( fontSize.name );
+
+	const handleConfirm = () => {
+		// If the new name is not empty, call the handleRename function
+		if ( newName.trim() ) {
+			handleRename( newName );
+		}
+		toggleOpen();
+	};
+
+	return (
+		<Modal
+			onRequestClose={ toggleOpen }
+			focusOnMount="firstContentElement"
+			title={ __( 'Rename' ) }
+			size="small"
+		>
+			<form
+				onSubmit={ ( event ) => {
+					event.preventDefault();
+					handleConfirm();
+					toggleOpen();
+				} }
+			>
+				<VStack spacing="3">
+					<InputControl
+						__next40pxDefaultSize
+						autoComplete="off"
+						value={ newName }
+						onChange={ setNewName }
+						label={ __( 'Name' ) }
+						placeholder={ __( 'Font size preset name' ) }
+					/>
+					<HStack justify="right">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ toggleOpen }
+						>
+							{ __( 'Cancel' ) }
+						</Button>
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							type="submit"
+						>
+							{ __( 'Save' ) }
+						</Button>
+					</HStack>
+				</VStack>
+			</form>
+		</Modal>
+	);
+}
+
+export default RenameFontSizeDialog;
diff --git a/packages/edit-site/src/components/global-styles/global-styles-provider.js b/packages/edit-site/src/components/global-styles/global-styles-provider.js
deleted file mode 100644
index 1e2d43e267a2dd..00000000000000
--- a/packages/edit-site/src/components/global-styles/global-styles-provider.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * External dependencies
- */
-import deepmerge from 'deepmerge';
-import { isPlainObject } from 'is-plain-object';
-
-/**
- * WordPress dependencies
- */
-import { useMemo, useCallback } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-
-const { GlobalStylesContext, cleanEmptyObject } = unlock(
-	blockEditorPrivateApis
-);
-
-export function mergeBaseAndUserConfigs( base, user ) {
-	return deepmerge( base, user, {
-		// We only pass as arrays the presets,
-		// in which case we want the new array of values
-		// to override the old array (no merging).
-		isMergeableObject: isPlainObject,
-	} );
-}
-
-function useGlobalStylesUserConfig() {
-	const { globalStylesId, isReady, settings, styles } = useSelect(
-		( select ) => {
-			const { getEditedEntityRecord, hasFinishedResolution } =
-				select( coreStore );
-			const _globalStylesId =
-				select( coreStore ).__experimentalGetCurrentGlobalStylesId();
-			const record = _globalStylesId
-				? getEditedEntityRecord(
-						'root',
-						'globalStyles',
-						_globalStylesId
-				  )
-				: undefined;
-
-			let hasResolved = false;
-			if (
-				hasFinishedResolution(
-					'__experimentalGetCurrentGlobalStylesId'
-				)
-			) {
-				hasResolved = _globalStylesId
-					? hasFinishedResolution( 'getEditedEntityRecord', [
-							'root',
-							'globalStyles',
-							_globalStylesId,
-					  ] )
-					: true;
-			}
-
-			return {
-				globalStylesId: _globalStylesId,
-				isReady: hasResolved,
-				settings: record?.settings,
-				styles: record?.styles,
-			};
-		},
-		[]
-	);
-
-	const { getEditedEntityRecord } = useSelect( coreStore );
-	const { editEntityRecord } = useDispatch( coreStore );
-	const config = useMemo( () => {
-		return {
-			settings: settings ?? {},
-			styles: styles ?? {},
-		};
-	}, [ settings, styles ] );
-
-	const setConfig = useCallback(
-		( callback, options = {} ) => {
-			const record = getEditedEntityRecord(
-				'root',
-				'globalStyles',
-				globalStylesId
-			);
-			const currentConfig = {
-				styles: record?.styles ?? {},
-				settings: record?.settings ?? {},
-			};
-			const updatedConfig = callback( currentConfig );
-			editEntityRecord(
-				'root',
-				'globalStyles',
-				globalStylesId,
-				{
-					styles: cleanEmptyObject( updatedConfig.styles ) || {},
-					settings: cleanEmptyObject( updatedConfig.settings ) || {},
-				},
-				options
-			);
-		},
-		[ globalStylesId ]
-	);
-
-	return [ isReady, config, setConfig ];
-}
-
-function useGlobalStylesBaseConfig() {
-	const baseConfig = useSelect( ( select ) => {
-		return select(
-			coreStore
-		).__experimentalGetCurrentThemeBaseGlobalStyles();
-	}, [] );
-
-	return [ !! baseConfig, baseConfig ];
-}
-
-function useGlobalStylesContext() {
-	const [ isUserConfigReady, userConfig, setUserConfig ] =
-		useGlobalStylesUserConfig();
-	const [ isBaseConfigReady, baseConfig ] = useGlobalStylesBaseConfig();
-	const mergedConfig = useMemo( () => {
-		if ( ! baseConfig || ! userConfig ) {
-			return {};
-		}
-		return mergeBaseAndUserConfigs( baseConfig, userConfig );
-	}, [ userConfig, baseConfig ] );
-	const context = useMemo( () => {
-		return {
-			isReady: isUserConfigReady && isBaseConfigReady,
-			user: userConfig,
-			base: baseConfig,
-			merged: mergedConfig,
-			setUserConfig,
-		};
-	}, [
-		mergedConfig,
-		userConfig,
-		baseConfig,
-		setUserConfig,
-		isUserConfigReady,
-		isBaseConfigReady,
-	] );
-
-	return context;
-}
-
-export function GlobalStylesProvider( { children } ) {
-	const context = useGlobalStylesContext();
-	if ( ! context.isReady ) {
-		return null;
-	}
-
-	return (
-		<GlobalStylesContext.Provider value={ context }>
-			{ children }
-		</GlobalStylesContext.Provider>
-	);
-}
diff --git a/packages/edit-site/src/components/global-styles/gradients-palette-panel.js b/packages/edit-site/src/components/global-styles/gradients-palette-panel.js
index 384e033c5dbbcd..00eb8db83578db 100644
--- a/packages/edit-site/src/components/global-styles/gradients-palette-panel.js
+++ b/packages/edit-site/src/components/global-styles/gradients-palette-panel.js
@@ -71,7 +71,7 @@ export default function GradientPalettePanel( { name } ) {
 	return (
 		<VStack
 			className="edit-site-global-styles-gradient-palette-panel"
-			spacing={ 10 }
+			spacing={ 8 }
 		>
 			{ !! themeGradients && !! themeGradients.length && (
 				<PaletteEdit
@@ -102,9 +102,6 @@ export default function GradientPalettePanel( { name } ) {
 				onChange={ setCustomGradients }
 				paletteLabel={ __( 'Custom' ) }
 				paletteLabelLevel={ 3 }
-				emptyMessage={ __(
-					'Custom gradients are empty! Add some gradients to create your own palette.'
-				) }
 				slugPrefix="custom-"
 				popoverProps={ popoverProps }
 			/>
@@ -114,8 +111,8 @@ export default function GradientPalettePanel( { name } ) {
 					<Spacer margin={ 3 } />
 					<DuotonePicker
 						duotonePalette={ duotonePalette }
-						disableCustomDuotone={ true }
-						disableCustomColors={ true }
+						disableCustomDuotone
+						disableCustomColors
 						clearable={ false }
 						onChange={ noop }
 					/>
diff --git a/packages/edit-site/src/components/global-styles/header.js b/packages/edit-site/src/components/global-styles/header.js
index e6da4115217f57..1bbff8fb3d6a6d 100644
--- a/packages/edit-site/src/components/global-styles/header.js
+++ b/packages/edit-site/src/components/global-styles/header.js
@@ -7,7 +7,7 @@ import {
 	__experimentalSpacer as Spacer,
 	__experimentalHeading as Heading,
 	__experimentalView as View,
-	__experimentalNavigatorToParentButton as NavigatorToParentButton,
+	Navigator,
 } from '@wordpress/components';
 import { isRTL, __ } from '@wordpress/i18n';
 import { chevronRight, chevronLeft } from '@wordpress/icons';
@@ -18,15 +18,10 @@ function ScreenHeader( { title, description, onBack } ) {
 			<View>
 				<Spacer marginBottom={ 0 } paddingX={ 4 } paddingY={ 3 }>
 					<HStack spacing={ 2 }>
-						<NavigatorToParentButton
-							style={
-								// TODO: This style override is also used in ToolsPanelHeader.
-								// It should be supported out-of-the-box by Button.
-								{ minWidth: 24, padding: 0 }
-							}
+						<Navigator.BackButton
 							icon={ isRTL() ? chevronRight : chevronLeft }
-							isSmall
-							aria-label={ __( 'Navigate to the previous view' ) }
+							size="small"
+							label={ __( 'Back' ) }
 							onClick={ onBack }
 						/>
 						<Spacer>
diff --git a/packages/edit-site/src/components/global-styles/highlighted-colors.js b/packages/edit-site/src/components/global-styles/highlighted-colors.js
new file mode 100644
index 00000000000000..c2ffc4bed1d204
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/highlighted-colors.js
@@ -0,0 +1,39 @@
+/**
+ * WordPress dependencies
+ */
+import { __unstableMotion as motion } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { useStylesPreviewColors } from './hooks';
+
+export default function HighlightedColors( {
+	normalizedColorSwatchSize,
+	ratio,
+} ) {
+	const { highlightedColors } = useStylesPreviewColors();
+	const scaledSwatchSize = normalizedColorSwatchSize * ratio;
+	return highlightedColors.map( ( { slug, color }, index ) => (
+		<motion.div
+			key={ `${ slug }-${ index }` }
+			style={ {
+				height: scaledSwatchSize,
+				width: scaledSwatchSize,
+				background: color,
+				borderRadius: scaledSwatchSize / 2,
+			} }
+			animate={ {
+				scale: 1,
+				opacity: 1,
+			} }
+			initial={ {
+				scale: 0.1,
+				opacity: 0,
+			} }
+			transition={ {
+				delay: index === 1 ? 0.2 : 0.1,
+			} }
+		/>
+	) );
+}
diff --git a/packages/edit-site/src/components/global-styles/hooks.js b/packages/edit-site/src/components/global-styles/hooks.js
index 123bda74973209..ccae419be98c00 100644
--- a/packages/edit-site/src/components/global-styles/hooks.js
+++ b/packages/edit-site/src/components/global-styles/hooks.js
@@ -58,6 +58,13 @@ export function useStylesPreviewColors() {
 	const [ headingColor = textColor ] = useGlobalStyle(
 		'elements.h1.color.text'
 	);
+	const [ linkColor = headingColor ] = useGlobalStyle(
+		'elements.link.color.text'
+	);
+
+	const [ buttonBackgroundColor = linkColor ] = useGlobalStyle(
+		'elements.button.color.background'
+	);
 	const [ coreColors ] = useGlobalSetting( 'color.palette.core' );
 	const [ themeColors ] = useGlobalSetting( 'color.palette.theme' );
 	const [ customColors ] = useGlobalSetting( 'color.palette.custom' );
@@ -65,10 +72,20 @@ export function useStylesPreviewColors() {
 	const paletteColors = ( themeColors ?? [] )
 		.concat( customColors ?? [] )
 		.concat( coreColors ?? [] );
-	const highlightedColors = paletteColors
+
+	const textColorObject = paletteColors.filter(
+		( { color } ) => color === textColor
+	);
+	const buttonBackgroundColorObject = paletteColors.filter(
+		( { color } ) => color === buttonBackgroundColor
+	);
+
+	const highlightedColors = textColorObject
+		.concat( buttonBackgroundColorObject )
+		.concat( paletteColors )
 		.filter(
-			// we exclude these two colors because they are already visible in the preview.
-			( { color } ) => color !== backgroundColor && color !== headingColor
+			// we exclude these background color because it is already visible in the preview.
+			( { color } ) => color !== backgroundColor
 		)
 		.slice( 0, 2 );
 
diff --git a/packages/edit-site/src/components/global-styles/icon-with-current-color.js b/packages/edit-site/src/components/global-styles/icon-with-current-color.js
index f20289d90363b6..2c6f2245c84259 100644
--- a/packages/edit-site/src/components/global-styles/icon-with-current-color.js
+++ b/packages/edit-site/src/components/global-styles/icon-with-current-color.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,7 +11,7 @@ import { Icon } from '@wordpress/components';
 export function IconWithCurrentColor( { className, ...props } ) {
 	return (
 		<Icon
-			className={ classnames(
+			className={ clsx(
 				className,
 				'edit-site-global-styles-icon-with-current-color'
 			) }
diff --git a/packages/edit-site/src/components/global-styles/navigation-button.js b/packages/edit-site/src/components/global-styles/navigation-button.js
index 2053ba8a36fe6e..62af9740e8ae1a 100644
--- a/packages/edit-site/src/components/global-styles/navigation-button.js
+++ b/packages/edit-site/src/components/global-styles/navigation-button.js
@@ -2,8 +2,7 @@
  * WordPress dependencies
  */
 import {
-	__experimentalNavigatorButton as NavigatorButton,
-	__experimentalNavigatorToParentButton as NavigatorToParentButton,
+	Navigator,
 	__experimentalItem as Item,
 	FlexItem,
 	__experimentalHStack as HStack,
@@ -29,13 +28,11 @@ function GenericNavigationButton( { icon, children, ...props } ) {
 }
 
 function NavigationButtonAsItem( props ) {
-	return <NavigatorButton as={ GenericNavigationButton } { ...props } />;
+	return <Navigator.Button as={ GenericNavigationButton } { ...props } />;
 }
 
 function NavigationBackButtonAsItem( props ) {
-	return (
-		<NavigatorToParentButton as={ GenericNavigationButton } { ...props } />
-	);
+	return <Navigator.BackButton as={ GenericNavigationButton } { ...props } />;
 }
 
 export { NavigationButtonAsItem, NavigationBackButtonAsItem };
diff --git a/packages/edit-site/src/components/global-styles/palette.js b/packages/edit-site/src/components/global-styles/palette.js
index dc73f54a1701a8..9b8c3f829d2426 100644
--- a/packages/edit-site/src/components/global-styles/palette.js
+++ b/packages/edit-site/src/components/global-styles/palette.js
@@ -10,8 +10,8 @@ import {
 	ColorIndicator,
 	Button,
 } from '@wordpress/components';
-import { __, _n, sprintf } from '@wordpress/i18n';
-import { shuffle } from '@wordpress/icons';
+import { isRTL, __ } from '@wordpress/i18n';
+import { Icon, shuffle, chevronLeft, chevronRight } from '@wordpress/icons';
 import { useMemo } from '@wordpress/element';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
@@ -54,46 +54,43 @@ function Palette( { name } ) {
 	const screenPath = ! name
 		? '/colors/palette'
 		: '/blocks/' + encodeURIComponent( name ) + '/colors/palette';
-	const paletteButtonText =
-		colors.length > 0
-			? sprintf(
-					// Translators: %d: Number of palette colors.
-					_n( '%d color', '%d colors', colors.length ),
-					colors.length
-			  )
-			: __( 'Add custom colors' );
 
 	return (
 		<VStack spacing={ 3 }>
 			<Subtitle level={ 3 }>{ __( 'Palette' ) }</Subtitle>
 			<ItemGroup isBordered isSeparated>
-				<NavigationButtonAsItem
-					path={ screenPath }
-					aria-label={ __( 'Color palettes' ) }
-				>
-					<HStack
-						direction={
-							colors.length === 0 ? 'row-reverse' : 'row'
-						}
-					>
-						<ZStack isLayered={ false } offset={ -8 }>
-							{ colors
-								.slice( 0, 5 )
-								.map( ( { color }, index ) => (
-									<ColorIndicatorWrapper
-										key={ `${ color }-${ index }` }
-									>
-										<ColorIndicator colorValue={ color } />
-									</ColorIndicatorWrapper>
-								) ) }
-						</ZStack>
-						<FlexItem>{ paletteButtonText }</FlexItem>
+				<NavigationButtonAsItem path={ screenPath }>
+					<HStack direction="row">
+						{ colors.length > 0 ? (
+							<>
+								<ZStack isLayered={ false } offset={ -8 }>
+									{ colors
+										.slice( 0, 5 )
+										.map( ( { color }, index ) => (
+											<ColorIndicatorWrapper
+												key={ `${ color }-${ index }` }
+											>
+												<ColorIndicator
+													colorValue={ color }
+												/>
+											</ColorIndicatorWrapper>
+										) ) }
+								</ZStack>
+								<FlexItem isBlock>
+									{ __( 'Edit palette' ) }
+								</FlexItem>
+							</>
+						) : (
+							<FlexItem>{ __( 'Add colors' ) }</FlexItem>
+						) }
+						<Icon icon={ isRTL() ? chevronLeft : chevronRight } />
 					</HStack>
 				</NavigationButtonAsItem>
 			</ItemGroup>
 			{ window.__experimentalEnableColorRandomizer &&
 				themeColors?.length > 0 && (
 					<Button
+						__next40pxDefaultSize
 						variant="secondary"
 						icon={ shuffle }
 						onClick={ randomizeThemeColors }
diff --git a/packages/edit-site/src/components/global-styles/preset-colors.js b/packages/edit-site/src/components/global-styles/preset-colors.js
new file mode 100644
index 00000000000000..7977cd88a13c3f
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/preset-colors.js
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import { useStylesPreviewColors } from './hooks';
+
+export default function PresetColors() {
+	const { paletteColors } = useStylesPreviewColors();
+	return paletteColors.slice( 0, 4 ).map( ( { slug, color }, index ) => (
+		<div
+			key={ `${ slug }-${ index }` }
+			style={ {
+				flexGrow: 1,
+				height: '100%',
+				background: color,
+			} }
+		/>
+	) );
+}
diff --git a/packages/edit-site/src/components/global-styles/preview-colors.js b/packages/edit-site/src/components/global-styles/preview-colors.js
new file mode 100644
index 00000000000000..8c1008330ec068
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/preview-colors.js
@@ -0,0 +1,58 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalHStack as HStack,
+	__unstableMotion as motion,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import PresetColors from './preset-colors';
+import PreviewIframe from './preview-iframe';
+
+const firstFrameVariants = {
+	start: {
+		scale: 1,
+		opacity: 1,
+	},
+	hover: {
+		scale: 0,
+		opacity: 0,
+	},
+};
+
+const StylesPreviewColors = ( { label, isFocused, withHoverView } ) => {
+	return (
+		<PreviewIframe
+			label={ label }
+			isFocused={ isFocused }
+			withHoverView={ withHoverView }
+		>
+			{ ( { key } ) => (
+				<motion.div
+					key={ key }
+					variants={ firstFrameVariants }
+					style={ {
+						height: '100%',
+						overflow: 'hidden',
+					} }
+				>
+					<HStack
+						spacing={ 0 }
+						justify="center"
+						style={ {
+							height: '100%',
+							overflow: 'hidden',
+						} }
+					>
+						<PresetColors />
+					</HStack>
+				</motion.div>
+			) }
+		</PreviewIframe>
+	);
+};
+
+export default StylesPreviewColors;
diff --git a/packages/edit-site/src/components/global-styles/preview-iframe.js b/packages/edit-site/src/components/global-styles/preview-iframe.js
new file mode 100644
index 00000000000000..e830accf6d939b
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/preview-iframe.js
@@ -0,0 +1,152 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__unstableIframe as Iframe,
+	__unstableEditorStyles as EditorStyles,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+import { __unstableMotion as motion } from '@wordpress/components';
+import {
+	useThrottle,
+	useReducedMotion,
+	useResizeObserver,
+} from '@wordpress/compose';
+import { useLayoutEffect, useState, useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { useGlobalStyle, useGlobalStylesOutput } = unlock(
+	blockEditorPrivateApis
+);
+
+const normalizedWidth = 248;
+const normalizedHeight = 152;
+
+// Throttle options for useThrottle. Must be defined outside of the component,
+// so that the object reference is the same on each render.
+const THROTTLE_OPTIONS = {
+	leading: true,
+	trailing: true,
+};
+
+export default function PreviewIframe( {
+	children,
+	label,
+	isFocused,
+	withHoverView,
+} ) {
+	const [ backgroundColor = 'white' ] = useGlobalStyle( 'color.background' );
+	const [ gradientValue ] = useGlobalStyle( 'color.gradient' );
+	const [ styles ] = useGlobalStylesOutput();
+	const disableMotion = useReducedMotion();
+	const [ isHovered, setIsHovered ] = useState( false );
+	const [ containerResizeListener, { width } ] = useResizeObserver();
+	const [ throttledWidth, setThrottledWidthState ] = useState( width );
+	const [ ratioState, setRatioState ] = useState();
+
+	const setThrottledWidth = useThrottle(
+		setThrottledWidthState,
+		250,
+		THROTTLE_OPTIONS
+	);
+
+	// Must use useLayoutEffect to avoid a flash of the iframe at the wrong
+	// size before the width is set.
+	useLayoutEffect( () => {
+		if ( width ) {
+			setThrottledWidth( width );
+		}
+	}, [ width, setThrottledWidth ] );
+
+	// Must use useLayoutEffect to avoid a flash of the iframe at the wrong
+	// size before the width is set.
+	useLayoutEffect( () => {
+		const newRatio = throttledWidth ? throttledWidth / normalizedWidth : 1;
+		const ratioDiff = newRatio - ( ratioState || 0 );
+
+		// Only update the ratio state if the difference is big enough
+		// or if the ratio state is not yet set. This is to avoid an
+		// endless loop of updates at particular viewport heights when the
+		// presence of a scrollbar causes the width to change slightly.
+		const isRatioDiffBigEnough = Math.abs( ratioDiff ) > 0.1;
+
+		if ( isRatioDiffBigEnough || ! ratioState ) {
+			setRatioState( newRatio );
+		}
+	}, [ throttledWidth, ratioState ] );
+
+	// Set a fallbackRatio to use before the throttled ratio has been set.
+	const fallbackRatio = width ? width / normalizedWidth : 1;
+	/*
+	 * Use the throttled ratio if it has been calculated, otherwise
+	 * use the fallback ratio. The throttled ratio is used to avoid
+	 * an endless loop of updates at particular viewport heights.
+	 * See: https://github.com/WordPress/gutenberg/issues/55112
+	 */
+	const ratio = ratioState ? ratioState : fallbackRatio;
+
+	/*
+	 * Reset leaked styles from WP common.css and remove main content layout padding and border.
+	 * Add pointer cursor to the body to indicate the iframe is interactive,
+	 * similar to Typography variation previews.
+	 */
+	const editorStyles = useMemo( () => {
+		if ( styles ) {
+			return [
+				...styles,
+				{
+					css: 'html{overflow:hidden}body{min-width: 0;padding: 0;border: none;cursor: pointer;}',
+					isGlobalStyles: true,
+				},
+			];
+		}
+
+		return styles;
+	}, [ styles ] );
+	const isReady = !! width;
+
+	return (
+		<>
+			<div style={ { position: 'relative' } }>
+				{ containerResizeListener }
+			</div>
+			{ isReady && (
+				<Iframe
+					className="edit-site-global-styles-preview__iframe"
+					style={ {
+						height: normalizedHeight * ratio,
+					} }
+					onMouseEnter={ () => setIsHovered( true ) }
+					onMouseLeave={ () => setIsHovered( false ) }
+					tabIndex={ -1 }
+				>
+					<EditorStyles styles={ editorStyles } />
+					<motion.div
+						style={ {
+							height: normalizedHeight * ratio,
+							width: '100%',
+							background: gradientValue ?? backgroundColor,
+							cursor: withHoverView ? 'pointer' : undefined,
+						} }
+						initial="start"
+						animate={
+							( isHovered || isFocused ) &&
+							! disableMotion &&
+							label
+								? 'hover'
+								: 'start'
+						}
+					>
+						{ []
+							.concat( children ) // This makes sure children is always an array.
+							.map( ( child, key ) => child( { ratio, key } ) ) }
+					</motion.div>
+				</Iframe>
+			) }
+		</>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles/preview-styles.js b/packages/edit-site/src/components/global-styles/preview-styles.js
new file mode 100644
index 00000000000000..dff1ef5a6f42ba
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/preview-styles.js
@@ -0,0 +1,185 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import {
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	__unstableMotion as motion,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { useStylesPreviewColors } from './hooks';
+import TypographyExample from './typography-example';
+import HighlightedColors from './highlighted-colors';
+import PreviewIframe from './preview-iframe';
+
+const { useGlobalStyle } = unlock( blockEditorPrivateApis );
+
+const firstFrameVariants = {
+	start: {
+		scale: 1,
+		opacity: 1,
+	},
+	hover: {
+		scale: 0,
+		opacity: 0,
+	},
+};
+
+const midFrameVariants = {
+	hover: {
+		opacity: 1,
+	},
+	start: {
+		opacity: 0.5,
+	},
+};
+
+const secondFrameVariants = {
+	hover: {
+		scale: 1,
+		opacity: 1,
+	},
+	start: {
+		scale: 0,
+		opacity: 0,
+	},
+};
+
+const PreviewStyles = ( { label, isFocused, withHoverView, variation } ) => {
+	const [ fontWeight ] = useGlobalStyle( 'typography.fontWeight' );
+	const [ fontFamily = 'serif' ] = useGlobalStyle( 'typography.fontFamily' );
+	const [ headingFontFamily = fontFamily ] = useGlobalStyle(
+		'elements.h1.typography.fontFamily'
+	);
+	const [ headingFontWeight = fontWeight ] = useGlobalStyle(
+		'elements.h1.typography.fontWeight'
+	);
+	const [ textColor = 'black' ] = useGlobalStyle( 'color.text' );
+	const [ headingColor = textColor ] = useGlobalStyle(
+		'elements.h1.color.text'
+	);
+
+	const { paletteColors } = useStylesPreviewColors();
+
+	return (
+		<PreviewIframe
+			label={ label }
+			isFocused={ isFocused }
+			withHoverView={ withHoverView }
+		>
+			{ ( { ratio, key } ) => (
+				<motion.div
+					key={ key }
+					variants={ firstFrameVariants }
+					style={ {
+						height: '100%',
+						overflow: 'hidden',
+					} }
+				>
+					<HStack
+						spacing={ 10 * ratio }
+						justify="center"
+						style={ {
+							height: '100%',
+							overflow: 'hidden',
+						} }
+					>
+						<TypographyExample
+							fontSize={ 65 * ratio }
+							variation={ variation }
+						/>
+						<VStack spacing={ 4 * ratio }>
+							<HighlightedColors
+								normalizedColorSwatchSize={ 32 }
+								ratio={ ratio }
+							/>
+						</VStack>
+					</HStack>
+				</motion.div>
+			) }
+			{ ( { key } ) => (
+				<motion.div
+					key={ key }
+					variants={ withHoverView && midFrameVariants }
+					style={ {
+						height: '100%',
+						width: '100%',
+						position: 'absolute',
+						top: 0,
+						overflow: 'hidden',
+						filter: 'blur(60px)',
+						opacity: 0.1,
+					} }
+				>
+					<HStack
+						spacing={ 0 }
+						justify="flex-start"
+						style={ {
+							height: '100%',
+							overflow: 'hidden',
+						} }
+					>
+						{ paletteColors
+							.slice( 0, 4 )
+							.map( ( { color }, index ) => (
+								<div
+									key={ index }
+									style={ {
+										height: '100%',
+										background: color,
+										flexGrow: 1,
+									} }
+								/>
+							) ) }
+					</HStack>
+				</motion.div>
+			) }
+			{ ( { ratio, key } ) => (
+				<motion.div
+					key={ key }
+					variants={ secondFrameVariants }
+					style={ {
+						height: '100%',
+						width: '100%',
+						overflow: 'hidden',
+						position: 'absolute',
+						top: 0,
+					} }
+				>
+					<VStack
+						spacing={ 3 * ratio }
+						justify="center"
+						style={ {
+							height: '100%',
+							overflow: 'hidden',
+							padding: 10 * ratio,
+							boxSizing: 'border-box',
+						} }
+					>
+						{ label && (
+							<div
+								style={ {
+									fontSize: 40 * ratio,
+									fontFamily: headingFontFamily,
+									color: headingColor,
+									fontWeight: headingFontWeight,
+									lineHeight: '1em',
+									textAlign: 'center',
+								} }
+							>
+								{ label }
+							</div>
+						) }
+					</VStack>
+				</motion.div>
+			) }
+		</PreviewIframe>
+	);
+};
+
+export default PreviewStyles;
diff --git a/packages/edit-site/src/components/global-styles/preview-typography.js b/packages/edit-site/src/components/global-styles/preview-typography.js
new file mode 100644
index 00000000000000..26ae13eaa09083
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/preview-typography.js
@@ -0,0 +1,39 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalHStack as HStack } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import TypographyExample from './typography-example';
+import PreviewIframe from './preview-iframe';
+
+const StylesPreviewTypography = ( { variation, isFocused, withHoverView } ) => {
+	return (
+		<PreviewIframe
+			label={ variation.title }
+			isFocused={ isFocused }
+			withHoverView={ withHoverView }
+		>
+			{ ( { ratio, key } ) => (
+				<HStack
+					key={ key }
+					spacing={ 10 * ratio }
+					justify="center"
+					style={ {
+						height: '100%',
+						overflow: 'hidden',
+					} }
+				>
+					<TypographyExample
+						variation={ variation }
+						fontSize={ 85 * ratio }
+					/>
+				</HStack>
+			) }
+		</PreviewIframe>
+	);
+};
+
+export default StylesPreviewTypography;
diff --git a/packages/edit-site/src/components/global-styles/preview.js b/packages/edit-site/src/components/global-styles/preview.js
deleted file mode 100644
index 2cb9ca49bc7cef..00000000000000
--- a/packages/edit-site/src/components/global-styles/preview.js
+++ /dev/null
@@ -1,275 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__unstableIframe as Iframe,
-	__unstableEditorStyles as EditorStyles,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import {
-	__unstableMotion as motion,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { useReducedMotion, useResizeObserver } from '@wordpress/compose';
-import { useState, useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-import { useStylesPreviewColors } from './hooks';
-
-const { useGlobalStyle, useGlobalStylesOutput } = unlock(
-	blockEditorPrivateApis
-);
-
-const firstFrame = {
-	start: {
-		scale: 1,
-		opacity: 1,
-	},
-	hover: {
-		scale: 0,
-		opacity: 0,
-	},
-};
-
-const midFrame = {
-	hover: {
-		opacity: 1,
-	},
-	start: {
-		opacity: 0.5,
-	},
-};
-
-const secondFrame = {
-	hover: {
-		scale: 1,
-		opacity: 1,
-	},
-	start: {
-		scale: 0,
-		opacity: 0,
-	},
-};
-
-const normalizedWidth = 248;
-const normalizedHeight = 152;
-
-const normalizedColorSwatchSize = 32;
-
-const StylesPreview = ( { label, isFocused, withHoverView } ) => {
-	const [ fontWeight ] = useGlobalStyle( 'typography.fontWeight' );
-	const [ fontFamily = 'serif' ] = useGlobalStyle( 'typography.fontFamily' );
-	const [ headingFontFamily = fontFamily ] = useGlobalStyle(
-		'elements.h1.typography.fontFamily'
-	);
-	const [ headingFontWeight = fontWeight ] = useGlobalStyle(
-		'elements.h1.typography.fontWeight'
-	);
-	const [ textColor = 'black' ] = useGlobalStyle( 'color.text' );
-	const [ headingColor = textColor ] = useGlobalStyle(
-		'elements.h1.color.text'
-	);
-	const [ backgroundColor = 'white' ] = useGlobalStyle( 'color.background' );
-	const [ gradientValue ] = useGlobalStyle( 'color.gradient' );
-	const [ styles ] = useGlobalStylesOutput();
-	const disableMotion = useReducedMotion();
-	const [ isHovered, setIsHovered ] = useState( false );
-	const [ containerResizeListener, { width } ] = useResizeObserver();
-	const ratio = width ? width / normalizedWidth : 1;
-
-	const { paletteColors, highlightedColors } = useStylesPreviewColors();
-
-	// Reset leaked styles from WP common.css and remove main content layout padding and border.
-	const editorStyles = useMemo( () => {
-		if ( styles ) {
-			return [
-				...styles,
-				{
-					css: 'html{overflow:hidden}body{min-width: 0;padding: 0;border: none;}',
-					isGlobalStyles: true,
-				},
-			];
-		}
-
-		return styles;
-	}, [ styles ] );
-	const isReady = !! width;
-
-	return (
-		<>
-			<div style={ { position: 'relative' } }>
-				{ containerResizeListener }
-			</div>
-			{ isReady && (
-				<Iframe
-					className="edit-site-global-styles-preview__iframe"
-					style={ {
-						height: normalizedHeight * ratio,
-					} }
-					onMouseEnter={ () => setIsHovered( true ) }
-					onMouseLeave={ () => setIsHovered( false ) }
-					tabIndex={ -1 }
-				>
-					<EditorStyles styles={ editorStyles } />
-					<motion.div
-						style={ {
-							height: normalizedHeight * ratio,
-							width: '100%',
-							background: gradientValue ?? backgroundColor,
-							cursor: withHoverView ? 'pointer' : undefined,
-						} }
-						initial="start"
-						animate={
-							( isHovered || isFocused ) &&
-							! disableMotion &&
-							label
-								? 'hover'
-								: 'start'
-						}
-					>
-						<motion.div
-							variants={ firstFrame }
-							style={ {
-								height: '100%',
-								overflow: 'hidden',
-							} }
-						>
-							<HStack
-								spacing={ 10 * ratio }
-								justify="center"
-								style={ {
-									height: '100%',
-									overflow: 'hidden',
-								} }
-							>
-								<motion.div
-									style={ {
-										fontFamily: headingFontFamily,
-										fontSize: 65 * ratio,
-										color: headingColor,
-										fontWeight: headingFontWeight,
-									} }
-									animate={ { scale: 1, opacity: 1 } }
-									initial={ { scale: 0.1, opacity: 0 } }
-									transition={ { delay: 0.3, type: 'tween' } }
-								>
-									Aa
-								</motion.div>
-								<VStack spacing={ 4 * ratio }>
-									{ highlightedColors.map(
-										( { slug, color }, index ) => (
-											<motion.div
-												key={ slug }
-												style={ {
-													height:
-														normalizedColorSwatchSize *
-														ratio,
-													width:
-														normalizedColorSwatchSize *
-														ratio,
-													background: color,
-													borderRadius:
-														( normalizedColorSwatchSize *
-															ratio ) /
-														2,
-												} }
-												animate={ {
-													scale: 1,
-													opacity: 1,
-												} }
-												initial={ {
-													scale: 0.1,
-													opacity: 0,
-												} }
-												transition={ {
-													delay:
-														index === 1 ? 0.2 : 0.1,
-												} }
-											/>
-										)
-									) }
-								</VStack>
-							</HStack>
-						</motion.div>
-						<motion.div
-							variants={ withHoverView && midFrame }
-							style={ {
-								height: '100%',
-								width: '100%',
-								position: 'absolute',
-								top: 0,
-								overflow: 'hidden',
-								filter: 'blur(60px)',
-								opacity: 0.1,
-							} }
-						>
-							<HStack
-								spacing={ 0 }
-								justify="flex-start"
-								style={ {
-									height: '100%',
-									overflow: 'hidden',
-								} }
-							>
-								{ paletteColors
-									.slice( 0, 4 )
-									.map( ( { color }, index ) => (
-										<div
-											key={ index }
-											style={ {
-												height: '100%',
-												background: color,
-												flexGrow: 1,
-											} }
-										/>
-									) ) }
-							</HStack>
-						</motion.div>
-						<motion.div
-							variants={ secondFrame }
-							style={ {
-								height: '100%',
-								width: '100%',
-								overflow: 'hidden',
-								position: 'absolute',
-								top: 0,
-							} }
-						>
-							<VStack
-								spacing={ 3 * ratio }
-								justify="center"
-								style={ {
-									height: '100%',
-									overflow: 'hidden',
-									padding: 10 * ratio,
-									boxSizing: 'border-box',
-								} }
-							>
-								{ label && (
-									<div
-										style={ {
-											fontSize: 40 * ratio,
-											fontFamily: headingFontFamily,
-											color: headingColor,
-											fontWeight: headingFontWeight,
-											lineHeight: '1em',
-											textAlign: 'center',
-										} }
-									>
-										{ label }
-									</div>
-								) }
-							</VStack>
-						</motion.div>
-					</motion.div>
-				</Iframe>
-			) }
-		</>
-	);
-};
-
-export default StylesPreview;
diff --git a/packages/edit-site/src/components/global-styles/root-menu.js b/packages/edit-site/src/components/global-styles/root-menu.js
index 9edfd064acbf73..d8e8f5794f9d03 100644
--- a/packages/edit-site/src/components/global-styles/root-menu.js
+++ b/packages/edit-site/src/components/global-styles/root-menu.js
@@ -2,7 +2,13 @@
  * WordPress dependencies
  */
 import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
-import { typography, color, layout } from '@wordpress/icons';
+import {
+	background,
+	typography,
+	color,
+	layout,
+	shadow as shadowIcon,
+} from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
@@ -18,13 +24,20 @@ const {
 	useHasColorPanel,
 	useGlobalSetting,
 	useSettingsForBlockElement,
+	useHasBackgroundPanel,
 } = unlock( blockEditorPrivateApis );
 
 function RootMenu() {
 	const [ rawSettings ] = useGlobalSetting( '' );
 	const settings = useSettingsForBlockElement( rawSettings );
+	/*
+	 * Use the raw settings to determine if the background panel should be displayed,
+	 * as the background panel is not dependent on the block element settings.
+	 */
+	const hasBackgroundPanel = useHasBackgroundPanel( rawSettings );
 	const hasTypographyPanel = useHasTypographyPanel( settings );
 	const hasColorPanel = useHasColorPanel( settings );
+	const hasShadowPanel = true; // useHasShadowPanel( settings );
 	const hasDimensionsPanel = useHasDimensionsPanel( settings );
 	const hasLayoutPanel = hasDimensionsPanel;
 
@@ -35,26 +48,31 @@ function RootMenu() {
 					<NavigationButtonAsItem
 						icon={ typography }
 						path="/typography"
-						aria-label={ __( 'Typography styles' ) }
 					>
 						{ __( 'Typography' ) }
 					</NavigationButtonAsItem>
 				) }
 				{ hasColorPanel && (
-					<NavigationButtonAsItem
-						icon={ color }
-						path="/colors"
-						aria-label={ __( 'Colors styles' ) }
-					>
+					<NavigationButtonAsItem icon={ color } path="/colors">
 						{ __( 'Colors' ) }
 					</NavigationButtonAsItem>
 				) }
-				{ hasLayoutPanel && (
+				{ hasBackgroundPanel && (
 					<NavigationButtonAsItem
-						icon={ layout }
-						path="/layout"
-						aria-label={ __( 'Layout styles' ) }
+						icon={ background }
+						path="/background"
+						aria-label={ __( 'Background styles' ) }
 					>
+						{ __( 'Background' ) }
+					</NavigationButtonAsItem>
+				) }
+				{ hasShadowPanel && (
+					<NavigationButtonAsItem icon={ shadowIcon } path="/shadows">
+						{ __( 'Shadows' ) }
+					</NavigationButtonAsItem>
+				) }
+				{ hasLayoutPanel && (
+					<NavigationButtonAsItem icon={ layout } path="/layout">
 						{ __( 'Layout' ) }
 					</NavigationButtonAsItem>
 				) }
diff --git a/packages/edit-site/src/components/global-styles/screen-background.js b/packages/edit-site/src/components/global-styles/screen-background.js
new file mode 100644
index 00000000000000..df6492ba892976
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/screen-background.js
@@ -0,0 +1,37 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { __experimentalText as Text } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import BackgroundPanel from './background-panel';
+import ScreenHeader from './header';
+import { unlock } from '../../lock-unlock';
+
+const { useHasBackgroundPanel, useGlobalSetting } = unlock(
+	blockEditorPrivateApis
+);
+
+function ScreenBackground() {
+	const [ settings ] = useGlobalSetting( '' );
+	const hasBackgroundPanel = useHasBackgroundPanel( settings );
+	return (
+		<>
+			<ScreenHeader
+				title={ __( 'Background' ) }
+				description={
+					<Text>
+						{ __( 'Set styles for the site’s background.' ) }
+					</Text>
+				}
+			/>
+			{ hasBackgroundPanel && <BackgroundPanel /> }
+		</>
+	);
+}
+
+export default ScreenBackground;
diff --git a/packages/edit-site/src/components/global-styles/screen-block-list.js b/packages/edit-site/src/components/global-styles/screen-block-list.js
index b4adcd64e41361..441c4168f814aa 100644
--- a/packages/edit-site/src/components/global-styles/screen-block-list.js
+++ b/packages/edit-site/src/components/global-styles/screen-block-list.js
@@ -26,7 +26,7 @@ import { speak } from '@wordpress/a11y';
 /**
  * Internal dependencies
  */
-import { useBlockVariations } from './variations-panel';
+import { useBlockVariations } from './variations/variations-panel';
 import ScreenHeader from './header';
 import { NavigationButtonAsItem } from './navigation-button';
 import { unlock } from '../../lock-unlock';
@@ -86,16 +86,9 @@ function BlockMenuItem( { block } ) {
 		return null;
 	}
 
-	const navigationButtonLabel = sprintf(
-		// translators: %s: is the name of a block e.g., 'Image' or 'Table'.
-		__( '%s block styles' ),
-		block.title
-	);
-
 	return (
 		<NavigationButtonAsItem
 			path={ '/blocks/' + encodeURIComponent( block.name ) }
-			aria-label={ navigationButtonLabel }
 		>
 			<HStack justify="flex-start">
 				<BlockIcon icon={ block.icon } />
@@ -174,7 +167,7 @@ function ScreenBlockList() {
 				className="edit-site-block-types-search"
 				onChange={ setFilterValue }
 				value={ filterValue }
-				label={ __( 'Search for blocks' ) }
+				label={ __( 'Search' ) }
 				placeholder={ __( 'Search' ) }
 			/>
 			<MemoizedBlockList filterValue={ deferredFilterValue } />
diff --git a/packages/edit-site/src/components/global-styles/screen-block.js b/packages/edit-site/src/components/global-styles/screen-block.js
index def7d1d627fe46..b1489167f2dc75 100644
--- a/packages/edit-site/src/components/global-styles/screen-block.js
+++ b/packages/edit-site/src/components/global-styles/screen-block.js
@@ -20,7 +20,16 @@ import ScreenHeader from './header';
 import BlockPreviewPanel from './block-preview-panel';
 import { unlock } from '../../lock-unlock';
 import Subtitle from './subtitle';
-import { useBlockVariations, VariationsPanel } from './variations-panel';
+import {
+	useBlockVariations,
+	VariationsPanel,
+} from './variations/variations-panel';
+
+// Initial control values.
+const BACKGROUND_BLOCK_DEFAULT_VALUES = {
+	backgroundSize: 'cover',
+	backgroundPosition: '50% 50%', // used only when backgroundSize is 'contain'.
+};
 
 function applyFallbackStyle( border ) {
 	if ( ! border ) {
@@ -64,15 +73,15 @@ const {
 	useGlobalSetting,
 	useSettingsForBlockElement,
 	useHasColorPanel,
-	useHasEffectsPanel,
 	useHasFiltersPanel,
 	useHasImageSettingsPanel,
 	useGlobalStyle,
+	useHasBackgroundPanel,
+	BackgroundPanel: StylesBackgroundPanel,
 	BorderPanel: StylesBorderPanel,
 	ColorPanel: StylesColorPanel,
 	TypographyPanel: StylesTypographyPanel,
 	DimensionsPanel: StylesDimensionsPanel,
-	EffectsPanel: StylesEffectsPanel,
 	FiltersPanel: StylesFiltersPanel,
 	ImageSettingsPanel,
 	AdvancedPanel: StylesAdvancedPanel,
@@ -109,12 +118,22 @@ function ScreenBlock( { name, variation } ) {
 		settings.spacing.blockGap = false;
 	}
 
+	// Only allow `aspectRatio` support if the block is not the grouping block.
+	// The grouping block allows the user to use Group, Row and Stack variations,
+	// and it is highly likely that the user will not want to set an aspect ratio
+	// for all three at once. Until there is the ability to set a different aspect
+	// ratio for each variation, we disable the aspect ratio controls for the
+	// grouping block in global styles.
+	if ( settings?.dimensions?.aspectRatio && name === 'core/group' ) {
+		settings.dimensions.aspectRatio = false;
+	}
+
 	const blockVariations = useBlockVariations( name );
+	const hasBackgroundPanel = useHasBackgroundPanel( settings );
 	const hasTypographyPanel = useHasTypographyPanel( settings );
 	const hasColorPanel = useHasColorPanel( settings );
 	const hasBorderPanel = useHasBorderPanel( settings );
 	const hasDimensionsPanel = useHasDimensionsPanel( settings );
-	const hasEffectsPanel = useHasEffectsPanel( settings );
 	const hasFiltersPanel = useHasFiltersPanel( settings );
 	const hasImageSettingsPanel = useHasImageSettingsPanel(
 		name,
@@ -225,7 +244,7 @@ function ScreenBlock( { name, variation } ) {
 	return (
 		<>
 			<ScreenHeader
-				title={ variation ? currentBlockStyle.label : blockType.title }
+				title={ variation ? currentBlockStyle?.label : blockType.title }
 			/>
 			<BlockPreviewPanel name={ name } variation={ variation } />
 			{ hasVariationsPanel && (
@@ -244,6 +263,15 @@ function ScreenBlock( { name, variation } ) {
 					settings={ settings }
 				/>
 			) }
+			{ hasBackgroundPanel && (
+				<StylesBackgroundPanel
+					inheritedValue={ inheritedStyle }
+					value={ style }
+					onChange={ setStyle }
+					settings={ settings }
+					defaultValues={ BACKGROUND_BLOCK_DEFAULT_VALUES }
+				/>
+			) }
 			{ hasTypographyPanel && (
 				<StylesTypographyPanel
 					inheritedValue={ inheritedStyle }
@@ -269,15 +297,6 @@ function ScreenBlock( { name, variation } ) {
 					settings={ settings }
 				/>
 			) }
-			{ hasEffectsPanel && (
-				<StylesEffectsPanel
-					inheritedValue={ inheritedStyleWithLayout }
-					value={ styleWithLayout }
-					onChange={ setStyle }
-					settings={ settings }
-					includeLayoutControls
-				/>
-			) }
 			{ hasFiltersPanel && (
 				<StylesFiltersPanel
 					inheritedValue={ inheritedStyleWithLayout }
diff --git a/packages/edit-site/src/components/global-styles/screen-color-palette.js b/packages/edit-site/src/components/global-styles/screen-color-palette.js
index 0e5b9c5d960fc1..6d3bd6b2e130d9 100644
--- a/packages/edit-site/src/components/global-styles/screen-color-palette.js
+++ b/packages/edit-site/src/components/global-styles/screen-color-palette.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { TabPanel } from '@wordpress/components';
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -10,41 +10,31 @@ import { TabPanel } from '@wordpress/components';
 import ColorPalettePanel from './color-palette-panel';
 import GradientPalettePanel from './gradients-palette-panel';
 import ScreenHeader from './header';
+import { unlock } from '../../lock-unlock';
+
+const { Tabs } = unlock( componentsPrivateApis );
 
 function ScreenColorPalette( { name } ) {
 	return (
 		<>
 			<ScreenHeader
-				title={ __( 'Palette' ) }
+				title={ __( 'Edit palette' ) }
 				description={ __(
-					'Palettes are used to provide default color options for blocks and various design tools. Here you can edit the colors with their labels.'
+					'The combination of colors used across the site and in color pickers.'
 				) }
 			/>
-			<TabPanel
-				tabs={ [
-					{
-						name: 'solid',
-						title: 'Solid',
-						value: 'solid',
-					},
-					{
-						name: 'gradient',
-						title: 'Gradient',
-						value: 'gradient',
-					},
-				] }
-			>
-				{ ( tab ) => (
-					<>
-						{ tab.value === 'solid' && (
-							<ColorPalettePanel name={ name } />
-						) }
-						{ tab.value === 'gradient' && (
-							<GradientPalettePanel name={ name } />
-						) }
-					</>
-				) }
-			</TabPanel>
+			<Tabs>
+				<Tabs.TabList>
+					<Tabs.Tab tabId="color">{ __( 'Color' ) }</Tabs.Tab>
+					<Tabs.Tab tabId="gradient">{ __( 'Gradient' ) }</Tabs.Tab>
+				</Tabs.TabList>
+				<Tabs.TabPanel tabId="color" focusable={ false }>
+					<ColorPalettePanel name={ name } />
+				</Tabs.TabPanel>
+				<Tabs.TabPanel tabId="gradient" focusable={ false }>
+					<GradientPalettePanel name={ name } />
+				</Tabs.TabPanel>
+			</Tabs>
 		</>
 	);
 }
diff --git a/packages/edit-site/src/components/global-styles/screen-colors.js b/packages/edit-site/src/components/global-styles/screen-colors.js
index a19bd16c8839f2..2f0aaf2d701014 100644
--- a/packages/edit-site/src/components/global-styles/screen-colors.js
+++ b/packages/edit-site/src/components/global-styles/screen-colors.js
@@ -34,13 +34,12 @@ function ScreenColors() {
 			<ScreenHeader
 				title={ __( 'Colors' ) }
 				description={ __(
-					'Manage palettes and the default color of different global elements on the site.'
+					'Palette colors and the application of those colors on site elements.'
 				) }
 			/>
-			<div className="edit-site-global-styles-screen-colors">
-				<VStack spacing={ 10 }>
+			<div className="edit-site-global-styles-screen">
+				<VStack spacing={ 7 }>
 					<Palette />
-
 					<StylesColorPanel
 						inheritedValue={ inheritedStyle }
 						value={ style }
diff --git a/packages/edit-site/src/components/global-styles/screen-css.js b/packages/edit-site/src/components/global-styles/screen-css.js
index 71d47a52a50274..7d67bac28824fe 100644
--- a/packages/edit-site/src/components/global-styles/screen-css.js
+++ b/packages/edit-site/src/components/global-styles/screen-css.js
@@ -33,8 +33,11 @@ function ScreenCSS() {
 				description={
 					<>
 						{ description }
+						<br />
 						<ExternalLink
-							href="https://wordpress.org/documentation/article/css/"
+							href={ __(
+								'https://developer.wordpress.org/advanced-administration/wordpress/css/'
+							) }
 							className="edit-site-global-styles-screen-css-help-link"
 						>
 							{ __( 'Learn more about CSS' ) }
diff --git a/packages/edit-site/src/components/global-styles/screen-layout.js b/packages/edit-site/src/components/global-styles/screen-layout.js
index e7794985b7984f..b6fa9f18f18dee 100644
--- a/packages/edit-site/src/components/global-styles/screen-layout.js
+++ b/packages/edit-site/src/components/global-styles/screen-layout.js
@@ -18,6 +18,7 @@ function ScreenLayout() {
 	const [ rawSettings ] = useGlobalSetting( '' );
 	const settings = useSettingsForBlockElement( rawSettings );
 	const hasDimensionsPanel = useHasDimensionsPanel( settings );
+
 	return (
 		<>
 			<ScreenHeader title={ __( 'Layout' ) } />
diff --git a/packages/edit-site/src/components/global-styles/screen-revisions/index.js b/packages/edit-site/src/components/global-styles/screen-revisions/index.js
index 90bf68e579cb7c..a50b8f13d55cc2 100644
--- a/packages/edit-site/src/components/global-styles/screen-revisions/index.js
+++ b/packages/edit-site/src/components/global-styles/screen-revisions/index.js
@@ -3,14 +3,10 @@
  */
 import { __, sprintf } from '@wordpress/i18n';
 import {
-	Button,
-	__experimentalUseNavigator as useNavigator,
 	__experimentalConfirmDialog as ConfirmDialog,
 	Spinner,
-	__experimentalSpacer as Spacer,
 } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
 import { useContext, useState, useEffect } from '@wordpress/element';
 import {
 	privateApis as blockEditorPrivateApis,
@@ -23,51 +19,42 @@ import {
 import ScreenHeader from '../header';
 import { unlock } from '../../../lock-unlock';
 import Revisions from '../../revisions';
-import SidebarFixedBottom from '../../sidebar-edit-mode/sidebar-fixed-bottom';
 import { store as editSiteStore } from '../../../store';
 import useGlobalStylesRevisions from './use-global-styles-revisions';
 import RevisionsButtons from './revisions-buttons';
+import StyleBook from '../../style-book';
+import Pagination from '../../pagination';
 
 const { GlobalStylesContext, areGlobalStyleConfigsEqual } = unlock(
 	blockEditorPrivateApis
 );
 
+const PAGE_SIZE = 10;
+
 function ScreenRevisions() {
-	const { goTo } = useNavigator();
 	const { user: currentEditorGlobalStyles, setUserConfig } =
 		useContext( GlobalStylesContext );
-	const { blocks, editorCanvasContainerView, revisionsCount } = useSelect(
-		( select ) => {
-			const {
-				getEntityRecord,
-				__experimentalGetCurrentGlobalStylesId,
-				__experimentalGetDirtyEntityRecords,
-			} = select( coreStore );
-			const isDirty = __experimentalGetDirtyEntityRecords().length > 0;
-			const globalStylesId = __experimentalGetCurrentGlobalStylesId();
-			const globalStyles = globalStylesId
-				? getEntityRecord( 'root', 'globalStyles', globalStylesId )
-				: undefined;
-			let _revisionsCount =
-				globalStyles?._links?.[ 'version-history' ]?.[ 0 ]?.count || 0;
-			// one for the reset item.
-			_revisionsCount++;
-			// one for any dirty changes (unsaved).
-			if ( isDirty ) {
-				_revisionsCount++;
-			}
-			return {
-				editorCanvasContainerView: unlock(
-					select( editSiteStore )
-				).getEditorCanvasContainerView(),
-				blocks: select( blockEditorStore ).getBlocks(),
-				revisionsCount: _revisionsCount,
-			};
-		},
+	const { blocks, editorCanvasContainerView } = useSelect(
+		( select ) => ( {
+			editorCanvasContainerView: unlock(
+				select( editSiteStore )
+			).getEditorCanvasContainerView(),
+			blocks: select( blockEditorStore ).getBlocks(),
+		} ),
 		[]
 	);
-	const { revisions, isLoading, hasUnsavedChanges } =
-		useGlobalStylesRevisions();
+	const [ currentPage, setCurrentPage ] = useState( 1 );
+	const [ currentRevisions, setCurrentRevisions ] = useState( [] );
+	const { revisions, isLoading, hasUnsavedChanges, revisionsCount } =
+		useGlobalStylesRevisions( {
+			query: {
+				per_page: PAGE_SIZE,
+				page: currentPage,
+			},
+		} );
+
+	const numPages = Math.ceil( revisionsCount / PAGE_SIZE );
+
 	const [ currentlySelectedRevision, setCurrentlySelectedRevision ] =
 		useState( currentEditorGlobalStyles );
 	const [
@@ -82,34 +69,27 @@ function ScreenRevisions() {
 		currentEditorGlobalStyles
 	);
 
+	// The actual code that triggers the revisions screen to navigate back
+	// to the home screen in in `packages/edit-site/src/components/global-styles/ui.js`.
 	const onCloseRevisions = () => {
-		goTo( '/' ); // Return to global styles main panel.
-		setEditorCanvasContainerView( undefined );
+		const canvasContainerView =
+			editorCanvasContainerView === 'global-styles-revisions:style-book'
+				? 'style-book'
+				: undefined;
+		setEditorCanvasContainerView( canvasContainerView );
 	};
 
 	const restoreRevision = ( revision ) => {
-		setUserConfig( () => ( {
-			styles: revision?.styles,
-			settings: revision?.settings,
-		} ) );
+		setUserConfig( () => revision );
 		setIsLoadingRevisionWithUnsavedChanges( false );
 		onCloseRevisions();
 	};
 
-	const selectRevision = ( revision ) => {
-		setCurrentlySelectedRevision( {
-			styles: revision?.styles || {},
-			settings: revision?.settings || {},
-			id: revision?.id,
-		} );
-	};
-
 	useEffect( () => {
-		if ( editorCanvasContainerView !== 'global-styles-revisions' ) {
-			goTo( '/' ); // Return to global styles main panel.
-			setEditorCanvasContainerView( editorCanvasContainerView );
+		if ( ! isLoading && revisions.length ) {
+			setCurrentRevisions( revisions );
 		}
-	}, [ editorCanvasContainerView ] );
+	}, [ revisions, isLoading ] );
 
 	const firstRevision = revisions[ 0 ];
 	const currentlySelectedRevisionId = currentlySelectedRevision?.id;
@@ -127,18 +107,17 @@ function ScreenRevisions() {
 		 * See: https://github.com/WordPress/gutenberg/issues/55866
 		 */
 		if ( shouldSelectFirstItem ) {
-			setCurrentlySelectedRevision( {
-				styles: firstRevision?.styles || {},
-				settings: firstRevision?.settings || {},
-				id: firstRevision?.id,
-			} );
+			setCurrentlySelectedRevision( firstRevision );
 		}
 	}, [ shouldSelectFirstItem, firstRevision ] );
 
-	// Only display load button if there is a revision to load and it is different from the current editor styles.
+	// Only display load button if there is a revision to load,
+	// and it is different from the current editor styles.
 	const isLoadButtonEnabled =
-		!! currentlySelectedRevisionId && ! selectedRevisionMatchesEditorStyles;
-	const shouldShowRevisions = ! isLoading && revisions.length;
+		!! currentlySelectedRevisionId &&
+		currentlySelectedRevisionId !== 'unsaved' &&
+		! selectedRevisionMatchesEditorStyles;
+	const hasRevisions = !! currentRevisions.length;
 
 	return (
 		<>
@@ -153,76 +132,68 @@ function ScreenRevisions() {
 				) }
 				onBack={ onCloseRevisions }
 			/>
-			{ isLoading && (
+			{ ! hasRevisions && (
 				<Spinner className="edit-site-global-styles-screen-revisions__loading" />
 			) }
-			{ shouldShowRevisions ? (
-				<>
+			{ hasRevisions &&
+				( editorCanvasContainerView ===
+				'global-styles-revisions:style-book' ? (
+					<StyleBook
+						userConfig={ currentlySelectedRevision }
+						isSelected={ () => {} }
+						onClose={ () => {
+							setEditorCanvasContainerView(
+								'global-styles-revisions'
+							);
+						} }
+					/>
+				) : (
 					<Revisions
 						blocks={ blocks }
 						userConfig={ currentlySelectedRevision }
-						onClose={ onCloseRevisions }
+						closeButtonLabel={ __( 'Close revisions' ) }
 					/>
-					<div className="edit-site-global-styles-screen-revisions">
-						<RevisionsButtons
-							onChange={ selectRevision }
-							selectedRevisionId={ currentlySelectedRevisionId }
-							userRevisions={ revisions }
-						/>
-						{ isLoadButtonEnabled && (
-							<SidebarFixedBottom>
-								<Button
-									variant="primary"
-									className="edit-site-global-styles-screen-revisions__button"
-									disabled={
-										! currentlySelectedRevisionId ||
-										currentlySelectedRevisionId ===
-											'unsaved'
-									}
-									onClick={ () => {
-										if ( hasUnsavedChanges ) {
-											setIsLoadingRevisionWithUnsavedChanges(
-												true
-											);
-										} else {
-											restoreRevision(
-												currentlySelectedRevision
-											);
-										}
-									} }
-								>
-									{ currentlySelectedRevisionId === 'parent'
-										? __( 'Reset to defaults' )
-										: __( 'Apply' ) }
-								</Button>
-							</SidebarFixedBottom>
-						) }
-					</div>
-					{ isLoadingRevisionWithUnsavedChanges && (
-						<ConfirmDialog
-							isOpen={ isLoadingRevisionWithUnsavedChanges }
-							confirmButtonText={ __( 'Apply' ) }
-							onConfirm={ () =>
-								restoreRevision( currentlySelectedRevision )
-							}
-							onCancel={ () =>
-								setIsLoadingRevisionWithUnsavedChanges( false )
-							}
-						>
-							{ __(
-								'Any unsaved changes will be lost when you apply this revision.'
-							) }
-						</ConfirmDialog>
-					) }
-				</>
-			) : (
-				<Spacer marginX={ 4 } data-testid="global-styles-no-revisions">
-					{
-						// Adding an existing translation here in case these changes are shipped to WordPress 6.3.
-						// Later we could update to something better, e.g., "There are currently no style revisions.".
-						__( 'No results found.' )
+				) ) }
+			<RevisionsButtons
+				onChange={ setCurrentlySelectedRevision }
+				selectedRevisionId={ currentlySelectedRevisionId }
+				userRevisions={ currentRevisions }
+				canApplyRevision={ isLoadButtonEnabled }
+				onApplyRevision={ () =>
+					hasUnsavedChanges
+						? setIsLoadingRevisionWithUnsavedChanges( true )
+						: restoreRevision( currentlySelectedRevision )
+				}
+			/>
+			{ numPages > 1 && (
+				<div className="edit-site-global-styles-screen-revisions__footer">
+					<Pagination
+						className="edit-site-global-styles-screen-revisions__pagination"
+						currentPage={ currentPage }
+						numPages={ numPages }
+						changePage={ setCurrentPage }
+						totalItems={ revisionsCount }
+						disabled={ isLoading }
+						label={ __( 'Global Styles pagination navigation' ) }
+					/>
+				</div>
+			) }
+			{ isLoadingRevisionWithUnsavedChanges && (
+				<ConfirmDialog
+					isOpen={ isLoadingRevisionWithUnsavedChanges }
+					confirmButtonText={ __( 'Apply' ) }
+					onConfirm={ () =>
+						restoreRevision( currentlySelectedRevision )
 					}
-				</Spacer>
+					onCancel={ () =>
+						setIsLoadingRevisionWithUnsavedChanges( false )
+					}
+					size="medium"
+				>
+					{ __(
+						'Are you sure you want to apply this revision? Any unsaved changes will be lost.'
+					) }
+				</ConfirmDialog>
 			) }
 		</>
 	);
diff --git a/packages/edit-site/src/components/global-styles/screen-revisions/revisions-buttons.js b/packages/edit-site/src/components/global-styles/screen-revisions/revisions-buttons.js
index 2786bf6d791212..5d7c3f6cbded0a 100644
--- a/packages/edit-site/src/components/global-styles/screen-revisions/revisions-buttons.js
+++ b/packages/edit-site/src/components/global-styles/screen-revisions/revisions-buttons.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,23 +11,51 @@ import { Button } from '@wordpress/components';
 import { dateI18n, getDate, humanTimeDiff, getSettings } from '@wordpress/date';
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../../lock-unlock';
 
 const DAY_IN_MILLISECONDS = 60 * 60 * 1000 * 24;
+const { getGlobalStylesChanges } = unlock( blockEditorPrivateApis );
+
+function ChangesSummary( { revision, previousRevision } ) {
+	const changes = getGlobalStylesChanges( revision, previousRevision, {
+		maxResults: 7,
+	} );
+
+	if ( ! changes.length ) {
+		return null;
+	}
+
+	return (
+		<ul
+			data-testid="global-styles-revision-changes"
+			className="edit-site-global-styles-screen-revisions__changes"
+		>
+			{ changes.map( ( change ) => (
+				<li key={ change }>{ change }</li>
+			) ) }
+		</ul>
+	);
+}
 
 /**
  * Returns a button label for the revision.
  *
  * @param {string|number} id                    A revision object.
- * @param {boolean}       isLatest              Whether the revision is the most current.
  * @param {string}        authorDisplayName     Author name.
  * @param {string}        formattedModifiedDate Revision modified date formatted.
+ * @param {boolean}       areStylesEqual        Whether the revision matches the current editor styles.
  * @return {string} Translated label.
  */
 function getRevisionLabel(
 	id,
-	isLatest,
 	authorDisplayName,
-	formattedModifiedDate
+	formattedModifiedDate,
+	areStylesEqual
 ) {
 	if ( 'parent' === id ) {
 		return __( 'Reset the styles to the theme defaults' );
@@ -35,21 +63,23 @@ function getRevisionLabel(
 
 	if ( 'unsaved' === id ) {
 		return sprintf(
-			/* translators: %s author display name */
+			/* translators: %s: author display name */
 			__( 'Unsaved changes by %s' ),
 			authorDisplayName
 		);
 	}
 
-	return isLatest
+	return areStylesEqual
 		? sprintf(
-				/* translators: %1$s author display name, %2$s: revision creation date */
-				__( 'Changes saved by %1$s on %2$s (current)' ),
+				// translators: %1$s: author display name, %2$s: revision creation date.
+				__(
+					'Changes saved by %1$s on %2$s. This revision matches current editor styles.'
+				),
 				authorDisplayName,
 				formattedModifiedDate
 		  )
 		: sprintf(
-				/* translators: %1$s author display name, %2$s: revision creation date */
+				// translators: %1$s: author display name, %2$s: revision creation date.
 				__( 'Changes saved by %1$s on %2$s' ),
 				authorDisplayName,
 				formattedModifiedDate
@@ -67,7 +97,13 @@ function getRevisionLabel(
  * @param    {props}         Component          props.
  * @return {JSX.Element} The modal component.
  */
-function RevisionsButtons( { userRevisions, selectedRevisionId, onChange } ) {
+function RevisionsButtons( {
+	userRevisions,
+	selectedRevisionId,
+	onChange,
+	canApplyRevision,
+	onApplyRevision,
+} ) {
 	const { currentThemeName, currentUser } = useSelect( ( select ) => {
 		const { getCurrentTheme, getCurrentUser } = select( coreStore );
 		const currentTheme = getCurrentTheme();
@@ -78,56 +114,62 @@ function RevisionsButtons( { userRevisions, selectedRevisionId, onChange } ) {
 		};
 	}, [] );
 	const dateNowInMs = getDate().getTime();
-	const { date: dateFormat, datetimeAbbreviated } = getSettings().formats;
+	const { datetimeAbbreviated } = getSettings().formats;
 
 	return (
 		<ol
 			className="edit-site-global-styles-screen-revisions__revisions-list"
-			aria-label={ __( 'Global styles revisions' ) }
+			aria-label={ __( 'Global styles revisions list' ) }
 			role="group"
 		>
 			{ userRevisions.map( ( revision, index ) => {
-				const { id, isLatest, author, modified } = revision;
+				const { id, author, modified } = revision;
 				const isUnsaved = 'unsaved' === id;
 				// Unsaved changes are created by the current user.
 				const revisionAuthor = isUnsaved ? currentUser : author;
 				const authorDisplayName = revisionAuthor?.name || __( 'User' );
 				const authorAvatar = revisionAuthor?.avatar_urls?.[ '48' ];
+				const isFirstItem = index === 0;
 				const isSelected = selectedRevisionId
 					? selectedRevisionId === id
-					: index === 0;
+					: isFirstItem;
+				const areStylesEqual = ! canApplyRevision && isSelected;
 				const isReset = 'parent' === id;
 				const modifiedDate = getDate( modified );
 				const displayDate =
 					modified &&
 					dateNowInMs - modifiedDate.getTime() > DAY_IN_MILLISECONDS
-						? dateI18n( dateFormat, modifiedDate )
+						? dateI18n( datetimeAbbreviated, modifiedDate )
 						: humanTimeDiff( modified );
 				const revisionLabel = getRevisionLabel(
 					id,
-					isLatest,
 					authorDisplayName,
-					dateI18n( datetimeAbbreviated, modifiedDate )
+					dateI18n( datetimeAbbreviated, modifiedDate ),
+					areStylesEqual
 				);
 
 				return (
 					<li
-						className={ classnames(
+						className={ clsx(
 							'edit-site-global-styles-screen-revisions__revision-item',
 							{
 								'is-selected': isSelected,
+								'is-active': areStylesEqual,
 								'is-reset': isReset,
 							}
 						) }
 						key={ id }
+						aria-current={ isSelected }
 					>
 						<Button
+							__next40pxDefaultSize
 							className="edit-site-global-styles-screen-revisions__revision-button"
+							accessibleWhenDisabled
 							disabled={ isSelected }
 							onClick={ () => {
 								onChange( revision );
 							} }
-							label={ revisionLabel }
+							aria-label={ revisionLabel }
 						>
 							{ isReset ? (
 								<span className="edit-site-global-styles-screen-revisions__description">
@@ -157,9 +199,38 @@ function RevisionsButtons( { userRevisions, selectedRevisionId, onChange } ) {
 										/>
 										{ authorDisplayName }
 									</span>
+									{ isSelected && (
+										<ChangesSummary
+											revision={ revision }
+											previousRevision={
+												index < userRevisions.length
+													? userRevisions[ index + 1 ]
+													: {}
+											}
+										/>
+									) }
 								</span>
 							) }
 						</Button>
+						{ isSelected &&
+							( areStylesEqual ? (
+								<p className="edit-site-global-styles-screen-revisions__applied-text">
+									{ __(
+										'These styles are already applied to your site.'
+									) }
+								</p>
+							) : (
+								<Button
+									size="compact"
+									variant="primary"
+									className="edit-site-global-styles-screen-revisions__apply-button"
+									onClick={ onApplyRevision }
+								>
+									{ isReset
+										? __( 'Reset to defaults' )
+										: __( 'Apply' ) }
+								</Button>
+							) ) }
 					</li>
 				);
 			} ) }
diff --git a/packages/edit-site/src/components/global-styles/screen-revisions/style.scss b/packages/edit-site/src/components/global-styles/screen-revisions/style.scss
index 6598fcb5ce1c74..5d0e7cb185137a 100644
--- a/packages/edit-site/src/components/global-styles/screen-revisions/style.scss
+++ b/packages/edit-site/src/components/global-styles/screen-revisions/style.scss
@@ -1,11 +1,8 @@
-
-.edit-site-global-styles-screen-revisions {
-	margin: $grid-unit-20;
-}
-
 .edit-site-global-styles-screen-revisions__revisions-list {
 	list-style: none;
-	margin: 0;
+	margin: 0 $grid-unit-20 $grid-unit-20 $grid-unit-20;
+	// Forces subsequent flex items to the bottom.
+	flex-grow: 1;
 	li {
 		margin-bottom: 0;
 	}
@@ -13,9 +10,9 @@
 
 .edit-site-global-styles-screen-revisions__revision-item {
 	position: relative;
-	padding-left: $grid-unit-20;
-	overflow: hidden;
 	cursor: pointer;
+	display: flex;
+	flex-direction: column;
 
 	&:hover {
 		background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
@@ -40,9 +37,38 @@
 		left: $grid-unit-20 + 1; // So the circle is centered on the line.
 		transform: translate(-50%, -50%);
 		z-index: 1;
+
+		// This border serves as a background color in Windows High Contrast mode.
+		border: 4px solid transparent;
 	}
-	&.is-selected::before {
-		background: var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
+
+	&.is-selected {
+		border-radius: $radius-small;
+
+		// Only visible in Windows High Contrast mode.
+		outline: 3px solid transparent;
+		outline-offset: -2px;
+
+		color: var(--wp-admin-theme-color);
+		background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
+
+		.edit-site-global-styles-screen-revisions__revision-button {
+			opacity: 1;
+		}
+
+		.edit-site-global-styles-screen-revisions__date {
+			color: var(--wp-admin-theme-color);
+		}
+
+		&::before {
+			background: var(--wp-admin-theme-color);
+		}
+
+		.edit-site-global-styles-screen-revisions__changes > li,
+		.edit-site-global-styles-screen-revisions__meta,
+		.edit-site-global-styles-screen-revisions__applied-text {
+			color: $gray-900;
+		}
 	}
 
 	&::after {
@@ -66,29 +92,25 @@
 		width: 100%;
 		height: auto;
 		display: block;
-		padding: $grid-unit-15 $grid-unit-15 $grid-unit-15 $grid-unit-30;
-		&:focus,
-		&:active {
-			outline: 0;
-			box-shadow: none;
-		}
+		padding: $grid-unit-15 $grid-unit-15 $grid-unit-05 $grid-unit-50;
+		z-index: 1;
+		position: relative;
+		outline-offset: -2px;
 	}
 }
 
-.is-selected {
-	color: var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
-	background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
-	.edit-site-global-styles-screen-revisions__revision-button {
-		opacity: 1;
-	}
-	.edit-site-global-styles-screen-revisions__date {
-		color: var(--wp-admin-theme-color);
-	}
+.edit-site-global-styles-screen-revisions__apply-button.is-primary,
+.edit-site-global-styles-screen-revisions__applied-text {
+	align-self: flex-start;
+	// Left margin = left padding of .edit-site-global-styles-screen-revisions__revision-button.
+	margin: $grid-unit-05 $grid-unit-15 $grid-unit-15 $grid-unit-50;
 }
 
-.edit-site-global-styles-screen-revisions__button {
-	justify-content: center;
-	width: 100%;
+.edit-site-global-styles-screen-revisions__changes,
+.edit-site-global-styles-screen-revisions__meta,
+.edit-site-global-styles-screen-revisions__applied-text {
+	color: $gray-700;
+	font-size: 12px;
 }
 
 .edit-site-global-styles-screen-revisions__description {
@@ -104,12 +126,12 @@
 }
 
 .edit-site-global-styles-screen-revisions__meta {
-	color: $gray-600;
 	display: flex;
 	justify-content: start;
 	width: 100%;
-	align-items: center;
-	font-size: 12px;
+	align-items: flex-start;
+	text-align: left;
+	margin-bottom: $grid-unit-05;
 
 	img {
 		width: $grid-unit-20;
@@ -122,3 +144,53 @@
 .edit-site-global-styles-screen-revisions__loading {
 	margin: $grid-unit-30 auto !important;
 }
+
+.edit-site-global-styles-screen-revisions__changes {
+	text-align: left;
+	line-height: $default-line-height;
+	margin-left: $grid-unit-15;
+	list-style: disc;
+
+	li {
+		margin-bottom: $grid-unit-05;
+	}
+}
+
+.edit-site-global-styles-screen-revisions__pagination.edit-site-global-styles-screen-revisions__pagination {
+	justify-content: space-between;
+	gap: 2px;
+	.edit-site-pagination__total {
+		position: absolute;
+		left: -1000px;
+		height: 1px;
+		margin: -1px;
+		overflow: hidden;
+	}
+
+	.components-text {
+		font-size: 12px;
+		// `will-change` is required because something about flex props prevents
+		// Safari from rendering the page / total text.
+		will-change: opacity;
+	}
+
+	.components-button.is-tertiary {
+		color: $gray-900;
+	}
+
+	.components-button.is-tertiary:disabled,
+	.components-button.is-tertiary[aria-disabled="true"] {
+		color: $gray-600;
+	}
+}
+
+.edit-site-global-styles-screen-revisions__footer {
+	height: $grid-unit-70;
+	z-index: 1;
+	position: sticky;
+	min-width: 100%;
+	bottom: 0;
+	background: $white;
+	padding: $grid-unit-15;
+	border-top: $border-width solid $gray-300;
+}
diff --git a/packages/edit-site/src/components/global-styles/screen-revisions/test/use-global-styles-revisions.js b/packages/edit-site/src/components/global-styles/screen-revisions/test/use-global-styles-revisions.js
index 4b03e38fe34d27..0262086e58b2ad 100644
--- a/packages/edit-site/src/components/global-styles/screen-revisions/test/use-global-styles-revisions.js
+++ b/packages/edit-site/src/components/global-styles/screen-revisions/test/use-global-styles-revisions.js
@@ -50,6 +50,7 @@ describe( 'useGlobalStylesRevisions', () => {
 			},
 		],
 		isLoadingGlobalStylesRevisions: false,
+		revisionsCount: 1,
 	};
 
 	it( 'returns loaded revisions with no unsaved changes', () => {
@@ -158,4 +159,70 @@ describe( 'useGlobalStylesRevisions', () => {
 		expect( hasUnsavedChanges ).toBe( false );
 		expect( revisions ).toEqual( [] );
 	} );
+
+	it( 'should prepend unsaved changes item and append reset item to paginated results', () => {
+		useSelect.mockImplementation( () => ( {
+			...selectValue,
+			revisionsCount: 2,
+			isDirty: true,
+		} ) );
+
+		// Prepend unsaved changes item to paginated results.
+		const { result: resultPrepend } = renderHook( () =>
+			useGlobalStylesRevisions( {
+				query: {
+					per_page: 1,
+					page: 1,
+				},
+			} )
+		);
+		expect( resultPrepend.current.revisions ).toEqual( [
+			{
+				author: {
+					avatar_urls: {},
+					name: 'fred',
+				},
+				id: 'unsaved',
+				modified: resultPrepend.current.revisions[ 0 ].modified,
+				settings: 'cake',
+				styles: 'ice-cream',
+			},
+			{
+				author: {
+					id: 4,
+					name: 'sam',
+				},
+				id: 1,
+				isLatest: true,
+				settings: {},
+				styles: {},
+			},
+		] );
+
+		// Append reset item to paginated results.
+		const { result: resultAppend } = renderHook( () =>
+			useGlobalStylesRevisions( {
+				query: {
+					per_page: 1,
+					page: 2,
+				},
+			} )
+		);
+		expect( resultAppend.current.revisions ).toEqual( [
+			{
+				author: {
+					id: 4,
+					name: 'sam',
+				},
+				id: 1,
+				settings: {},
+				styles: {},
+			},
+			{
+				id: 'parent',
+				settings: {},
+				styles: {},
+			},
+		] );
+	} );
 } );
diff --git a/packages/edit-site/src/components/global-styles/screen-revisions/use-global-styles-revisions.js b/packages/edit-site/src/components/global-styles/screen-revisions/use-global-styles-revisions.js
index bacc79a97cb6de..024fb74ef97cf2 100644
--- a/packages/edit-site/src/components/global-styles/screen-revisions/use-global-styles-revisions.js
+++ b/packages/edit-site/src/components/global-styles/screen-revisions/use-global-styles-revisions.js
@@ -17,62 +17,77 @@ const SITE_EDITOR_AUTHORS_QUERY = {
 	context: 'view',
 	capabilities: [ 'edit_theme_options' ],
 };
+const DEFAULT_QUERY = { per_page: 100, page: 1 };
 const EMPTY_ARRAY = [];
 const { GlobalStylesContext } = unlock( blockEditorPrivateApis );
-export default function useGlobalStylesRevisions() {
+export default function useGlobalStylesRevisions( { query } = {} ) {
 	const { user: userConfig } = useContext( GlobalStylesContext );
+	const _query = { ...DEFAULT_QUERY, ...query };
 	const {
 		authors,
 		currentUser,
 		isDirty,
 		revisions,
 		isLoadingGlobalStylesRevisions,
-	} = useSelect( ( select ) => {
-		const {
-			__experimentalGetDirtyEntityRecords,
-			getCurrentUser,
-			getUsers,
-			getRevisions,
-			__experimentalGetCurrentGlobalStylesId,
-			isResolving,
-		} = select( coreStore );
-		const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
-		const _currentUser = getCurrentUser();
-		const _isDirty = dirtyEntityRecords.length > 0;
-		const query = {
-			per_page: 100,
-		};
-		const globalStylesId = __experimentalGetCurrentGlobalStylesId();
-		const globalStylesRevisions =
-			getRevisions( 'root', 'globalStyles', globalStylesId, query ) ||
-			EMPTY_ARRAY;
-		const _authors = getUsers( SITE_EDITOR_AUTHORS_QUERY ) || EMPTY_ARRAY;
-		const _isResolving = isResolving( 'getRevisions', [
-			'root',
-			'globalStyles',
-			globalStylesId,
-			query,
-		] );
-		return {
-			authors: _authors,
-			currentUser: _currentUser,
-			isDirty: _isDirty,
-			revisions: globalStylesRevisions,
-			isLoadingGlobalStylesRevisions: _isResolving,
-		};
-	}, [] );
+		revisionsCount,
+	} = useSelect(
+		( select ) => {
+			const {
+				__experimentalGetDirtyEntityRecords,
+				getCurrentUser,
+				getUsers,
+				getRevisions,
+				__experimentalGetCurrentGlobalStylesId,
+				getEntityRecord,
+				isResolving,
+			} = select( coreStore );
+			const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
+			const _currentUser = getCurrentUser();
+			const _isDirty = dirtyEntityRecords.length > 0;
+			const globalStylesId = __experimentalGetCurrentGlobalStylesId();
+			const globalStyles = globalStylesId
+				? getEntityRecord( 'root', 'globalStyles', globalStylesId )
+				: undefined;
+			const _revisionsCount =
+				globalStyles?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0;
+			const globalStylesRevisions =
+				getRevisions(
+					'root',
+					'globalStyles',
+					globalStylesId,
+					_query
+				) || EMPTY_ARRAY;
+			const _authors =
+				getUsers( SITE_EDITOR_AUTHORS_QUERY ) || EMPTY_ARRAY;
+			const _isResolving = isResolving( 'getRevisions', [
+				'root',
+				'globalStyles',
+				globalStylesId,
+				_query,
+			] );
+			return {
+				authors: _authors,
+				currentUser: _currentUser,
+				isDirty: _isDirty,
+				revisions: globalStylesRevisions,
+				isLoadingGlobalStylesRevisions: _isResolving,
+				revisionsCount: _revisionsCount,
+			};
+		},
+		[ query ]
+	);
 	return useMemo( () => {
-		let _modifiedRevisions = [];
 		if ( ! authors.length || isLoadingGlobalStylesRevisions ) {
 			return {
-				revisions: _modifiedRevisions,
+				revisions: EMPTY_ARRAY,
 				hasUnsavedChanges: isDirty,
 				isLoading: true,
+				revisionsCount,
 			};
 		}
 
 		// Adds author details to each revision.
-		_modifiedRevisions = revisions.map( ( revision ) => {
+		const _modifiedRevisions = revisions.map( ( revision ) => {
 			return {
 				...revision,
 				author: authors.find(
@@ -81,9 +96,14 @@ export default function useGlobalStylesRevisions() {
 			};
 		} );
 
-		if ( _modifiedRevisions.length ) {
+		const fetchedRevisionsCount = revisions.length;
+
+		if ( fetchedRevisionsCount ) {
 			// Flags the most current saved revision.
-			if ( _modifiedRevisions[ 0 ].id !== 'unsaved' ) {
+			if (
+				_modifiedRevisions[ 0 ].id !== 'unsaved' &&
+				_query.page === 1
+			) {
 				_modifiedRevisions[ 0 ].isLatest = true;
 			}
 
@@ -92,12 +112,14 @@ export default function useGlobalStylesRevisions() {
 				isDirty &&
 				userConfig &&
 				Object.keys( userConfig ).length > 0 &&
-				currentUser
+				currentUser &&
+				_query.page === 1
 			) {
 				const unsavedRevision = {
 					id: 'unsaved',
 					styles: userConfig?.styles,
 					settings: userConfig?.settings,
+					_links: userConfig?._links,
 					author: {
 						name: currentUser?.name,
 						avatar_urls: currentUser?.avatar_urls,
@@ -108,17 +130,23 @@ export default function useGlobalStylesRevisions() {
 				_modifiedRevisions.unshift( unsavedRevision );
 			}
 
-			_modifiedRevisions.push( {
-				id: 'parent',
-				styles: {},
-				settings: {},
-			} );
+			if (
+				_query.page === Math.ceil( revisionsCount / _query.per_page )
+			) {
+				// Adds an item for the default theme styles.
+				_modifiedRevisions.push( {
+					id: 'parent',
+					styles: {},
+					settings: {},
+				} );
+			}
 		}
 
 		return {
 			revisions: _modifiedRevisions,
 			hasUnsavedChanges: isDirty,
 			isLoading: false,
+			revisionsCount,
 		};
 	}, [
 		isDirty,
diff --git a/packages/edit-site/src/components/global-styles/screen-root.js b/packages/edit-site/src/components/global-styles/screen-root.js
index 28b3642ac09b45..ffa85b046ead71 100644
--- a/packages/edit-site/src/components/global-styles/screen-root.js
+++ b/packages/edit-site/src/components/global-styles/screen-root.js
@@ -24,7 +24,7 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { IconWithCurrentColor } from './icon-with-current-color';
 import { NavigationButtonAsItem } from './navigation-button';
 import RootMenu from './root-menu';
-import StylesPreview from './preview';
+import PreviewStyles from './preview-styles';
 import { unlock } from '../../lock-unlock';
 
 const { useGlobalStyle } = unlock( blockEditorPrivateApis );
@@ -53,20 +53,21 @@ function ScreenRoot() {
 	}, [] );
 
 	return (
-		<Card size="small" className="edit-site-global-styles-screen-root">
+		<Card
+			size="small"
+			className="edit-site-global-styles-screen-root"
+			isRounded={ false }
+		>
 			<CardBody>
 				<VStack spacing={ 4 }>
-					<Card>
-						<CardMedia>
-							<StylesPreview />
+					<Card className="edit-site-global-styles-screen-root__active-style-tile">
+						<CardMedia className="edit-site-global-styles-screen-root__active-style-tile-preview">
+							<PreviewStyles />
 						</CardMedia>
 					</Card>
 					{ hasVariations && (
 						<ItemGroup>
-							<NavigationButtonAsItem
-								path="/variations"
-								aria-label={ __( 'Browse styles' ) }
-							>
+							<NavigationButtonAsItem path="/variations">
 								<HStack justify="space-between">
 									<FlexItem>
 										{ __( 'Browse styles' ) }
@@ -103,10 +104,7 @@ function ScreenRoot() {
 					) }
 				</Spacer>
 				<ItemGroup>
-					<NavigationButtonAsItem
-						path="/blocks"
-						aria-label={ __( 'Blocks styles' ) }
-					>
+					<NavigationButtonAsItem path="/blocks">
 						<HStack justify="space-between">
 							<FlexItem>{ __( 'Blocks' ) }</FlexItem>
 							<IconWithCurrentColor
@@ -132,10 +130,7 @@ function ScreenRoot() {
 							) }
 						</Spacer>
 						<ItemGroup>
-							<NavigationButtonAsItem
-								path="/css"
-								aria-label={ __( 'Additional CSS' ) }
-							>
+							<NavigationButtonAsItem path="/css">
 								<HStack justify="space-between">
 									<FlexItem>
 										{ __( 'Additional CSS' ) }
diff --git a/packages/edit-site/src/components/global-styles/screen-shadows.js b/packages/edit-site/src/components/global-styles/screen-shadows.js
new file mode 100644
index 00000000000000..3645787f9a77f6
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/screen-shadows.js
@@ -0,0 +1,13 @@
+/**
+ * Internal dependencies
+ */
+import ShadowsPanel from './shadows-panel';
+import ShadowsEditPanel from './shadows-edit-panel';
+
+export function ScreenShadows() {
+	return <ShadowsPanel />;
+}
+
+export function ScreenShadowsEdit() {
+	return <ShadowsEditPanel />;
+}
diff --git a/packages/edit-site/src/components/global-styles/screen-style-variations.js b/packages/edit-site/src/components/global-styles/screen-style-variations.js
index cabf50531a6aeb..12690966ba3c4f 100644
--- a/packages/edit-site/src/components/global-styles/screen-style-variations.js
+++ b/packages/edit-site/src/components/global-styles/screen-style-variations.js
@@ -3,54 +3,30 @@
  */
 import { Card, CardBody } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { useEffect, useRef } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { useDispatch } from '@wordpress/data';
+import { store as editorStore } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
 import ScreenHeader from './header';
-import StyleVariationsContainer from './style-variations-container';
+import SidebarNavigationScreenGlobalStylesContent from '../sidebar-navigation-screen-global-styles/content';
+import { unlock } from '../../lock-unlock';
 
-function ScreenStyleVariations() {
-	const { mode } = useSelect( ( select ) => {
-		return {
-			mode: select( blockEditorStore ).__unstableGetEditorMode(),
-		};
-	}, [] );
-
-	const shouldRevertInitialMode = useRef( null );
-	useEffect( () => {
-		// ignore changes to zoom-out mode as we explictily change to it on mount.
-		if ( mode !== 'zoom-out' ) {
-			shouldRevertInitialMode.current = false;
-		}
-	}, [ mode ] );
+const { useZoomOut } = unlock( blockEditorPrivateApis );
 
-	// Intentionality left without any dependency.
-	// This effect should only run the first time the component is rendered.
-	// The effect opens the zoom-out view if it is not open before when applying a style variation.
-	useEffect( () => {
-		if ( mode !== 'zoom-out' ) {
-			__unstableSetEditorMode( 'zoom-out' );
-			shouldRevertInitialMode.current = true;
-			return () => {
-				// if there were not mode changes revert to the initial mode when unmounting.
-				if ( shouldRevertInitialMode.current ) {
-					__unstableSetEditorMode( mode );
-				}
-			};
-		}
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [] );
-
-	const { __unstableSetEditorMode } = useDispatch( blockEditorStore );
+function ScreenStyleVariations() {
+	// Style Variations should only be previewed in with
+	// - a "zoomed out" editor
+	// - "Desktop" device preview
+	const { setDeviceType } = useDispatch( editorStore );
+	useZoomOut();
+	setDeviceType( 'desktop' );
 
 	return (
 		<>
 			<ScreenHeader
-				back="/"
 				title={ __( 'Browse styles' ) }
 				description={ __(
 					'Choose a variation to change the look of the site.'
@@ -63,7 +39,7 @@ function ScreenStyleVariations() {
 				className="edit-site-global-styles-screen-style-variations"
 			>
 				<CardBody>
-					<StyleVariationsContainer />
+					<SidebarNavigationScreenGlobalStylesContent />
 				</CardBody>
 			</Card>
 		</>
diff --git a/packages/edit-site/src/components/global-styles/screen-typography-element.js b/packages/edit-site/src/components/global-styles/screen-typography-element.js
index c5e42399306499..8a8150e1578719 100644
--- a/packages/edit-site/src/components/global-styles/screen-typography-element.js
+++ b/packages/edit-site/src/components/global-styles/screen-typography-element.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 import {
 	__experimentalToggleGroupControl as ToggleGroupControl,
 	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
@@ -67,32 +67,44 @@ function ScreenTypographyElement( { element } ) {
 					>
 						<ToggleGroupControlOption
 							value="heading"
-							/* translators: 'All' refers to selecting all heading levels 
-							and applying the same style to h1-h6. */
-							label={ __( 'All' ) }
+							showTooltip
+							aria-label={ __( 'All headings' ) }
+							label={ _x( 'All', 'heading levels' ) }
 						/>
 						<ToggleGroupControlOption
 							value="h1"
+							showTooltip
+							aria-label={ __( 'Heading 1' ) }
 							label={ __( 'H1' ) }
 						/>
 						<ToggleGroupControlOption
 							value="h2"
+							showTooltip
+							aria-label={ __( 'Heading 2' ) }
 							label={ __( 'H2' ) }
 						/>
 						<ToggleGroupControlOption
 							value="h3"
+							showTooltip
+							aria-label={ __( 'Heading 3' ) }
 							label={ __( 'H3' ) }
 						/>
 						<ToggleGroupControlOption
 							value="h4"
+							showTooltip
+							aria-label={ __( 'Heading 4' ) }
 							label={ __( 'H4' ) }
 						/>
 						<ToggleGroupControlOption
 							value="h5"
+							showTooltip
+							aria-label={ __( 'Heading 5' ) }
 							label={ __( 'H5' ) }
 						/>
 						<ToggleGroupControlOption
 							value="h6"
+							showTooltip
+							aria-label={ __( 'Heading 6' ) }
 							label={ __( 'H6' ) }
 						/>
 					</ToggleGroupControl>
diff --git a/packages/edit-site/src/components/global-styles/screen-typography.js b/packages/edit-site/src/components/global-styles/screen-typography.js
index 2a895b68fa717f..3739e3234258bd 100644
--- a/packages/edit-site/src/components/global-styles/screen-typography.js
+++ b/packages/edit-site/src/components/global-styles/screen-typography.js
@@ -3,29 +3,39 @@
  */
 import { __ } from '@wordpress/i18n';
 import { __experimentalVStack as VStack } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { store as editorStore } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
-import TypographyElements from './typogrphy-elements';
-import FontFamilies from './font-families';
+import TypographyElements from './typography-elements';
 import ScreenHeader from './header';
+import TypographyVariations from './variations/variations-typography';
+import FontSizesCount from './font-sizes/font-sizes-count';
+import FontFamilies from './font-families';
 
 function ScreenTypography() {
+	const fontLibraryEnabled = useSelect(
+		( select ) =>
+			select( editorStore ).getEditorSettings().fontLibraryEnabled,
+		[]
+	);
+
 	return (
 		<>
 			<ScreenHeader
 				title={ __( 'Typography' ) }
 				description={ __(
-					'Manage the typography settings for different elements.'
+					'Available fonts, typographic styles, and the application of those styles.'
 				) }
 			/>
-			<div className="edit-site-global-styles-screen-typography">
-				<VStack spacing={ 6 }>
-					{ ! window.__experimentalDisableFontLibrary && (
-						<FontFamilies />
-					) }
+			<div className="edit-site-global-styles-screen">
+				<VStack spacing={ 7 }>
+					<TypographyVariations title={ __( 'Typesets' ) } />
+					{ fontLibraryEnabled && <FontFamilies /> }
 					<TypographyElements />
+					<FontSizesCount />
 				</VStack>
 			</div>
 		</>
diff --git a/packages/edit-site/src/components/global-styles/shadow-utils.js b/packages/edit-site/src/components/global-styles/shadow-utils.js
new file mode 100644
index 00000000000000..a98f6306bb3f35
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/shadow-utils.js
@@ -0,0 +1,158 @@
+export const CUSTOM_VALUE_SETTINGS = {
+	px: { max: 20, step: 1 },
+	'%': { max: 100, step: 1 },
+	vw: { max: 100, step: 1 },
+	vh: { max: 100, step: 1 },
+	em: { max: 10, step: 0.1 },
+	rm: { max: 10, step: 0.1 },
+	svw: { max: 100, step: 1 },
+	lvw: { max: 100, step: 1 },
+	dvw: { max: 100, step: 1 },
+	svh: { max: 100, step: 1 },
+	lvh: { max: 100, step: 1 },
+	dvh: { max: 100, step: 1 },
+	vi: { max: 100, step: 1 },
+	svi: { max: 100, step: 1 },
+	lvi: { max: 100, step: 1 },
+	dvi: { max: 100, step: 1 },
+	vb: { max: 100, step: 1 },
+	svb: { max: 100, step: 1 },
+	lvb: { max: 100, step: 1 },
+	dvb: { max: 100, step: 1 },
+	vmin: { max: 100, step: 1 },
+	svmin: { max: 100, step: 1 },
+	lvmin: { max: 100, step: 1 },
+	dvmin: { max: 100, step: 1 },
+	vmax: { max: 100, step: 1 },
+	svmax: { max: 100, step: 1 },
+	lvmax: { max: 100, step: 1 },
+	dvmax: { max: 100, step: 1 },
+};
+
+export function getShadowParts( shadow ) {
+	const shadowValues = shadow.match( /(?:[^,(]|\([^)]*\))+/g ) || [];
+	return shadowValues.map( ( value ) => value.trim() );
+}
+
+export function shadowStringToObject( shadowValue ) {
+	/*
+	 * Shadow spec: https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
+	 * Shadow string format: <offset-x> <offset-y> <blur-radius> <spread-radius> <color> [inset]
+	 *
+	 * A shadow to be valid it must satisfy the following.
+	 *
+	 * 1. Should not contain "none" keyword.
+	 * 2. Values x, y, blur, spread should be in the order. Color and inset can be anywhere in the string except in between x, y, blur, spread values.
+	 * 3. Should not contain more than one set of x, y, blur, spread values.
+	 * 4. Should contain at least x and y values. Others are optional.
+	 * 5. Should not contain more than one "inset" (case insensitive) keyword.
+	 * 6. Should not contain more than one color value.
+	 */
+
+	const defaultShadow = {
+		x: '0',
+		y: '0',
+		blur: '0',
+		spread: '0',
+		color: '#000',
+		inset: false,
+	};
+
+	if ( ! shadowValue ) {
+		return defaultShadow;
+	}
+
+	// Rule 1: Should not contain "none" keyword.
+	// if the shadow has "none" keyword, it is not a valid shadow string
+	if ( shadowValue.includes( 'none' ) ) {
+		return defaultShadow;
+	}
+
+	// Rule 2: Values x, y, blur, spread should be in the order.
+	//		   Color and inset can be anywhere in the string except in between x, y, blur, spread values.
+	// Extract length values (x, y, blur, spread) from shadow string
+	// Regex match groups of 1 to 4 length values.
+	const lengthsRegex =
+		/((?:^|\s+)(-?\d*\.?\d+(?:px|%|in|cm|mm|em|rem|ex|pt|pc|vh|vw|vmin|vmax|ch|lh)?)(?=\s|$)(?![^(]*\))){1,4}/g;
+	const matches = shadowValue.match( lengthsRegex ) || [];
+
+	// Rule 3: Should not contain more than one set of x, y, blur, spread values.
+	// if the string doesn't contain exactly 1 set of x, y, blur, spread values,
+	// it is not a valid shadow string
+	if ( matches.length !== 1 ) {
+		return defaultShadow;
+	}
+
+	// Extract length values (x, y, blur, spread) from shadow string
+	const lengths = matches[ 0 ]
+		.split( ' ' )
+		.map( ( value ) => value.trim() )
+		.filter( ( value ) => value );
+
+	// Rule 4: Should contain at least x and y values. Others are optional.
+	if ( lengths.length < 2 ) {
+		return defaultShadow;
+	}
+
+	// Rule 5: Should not contain more than one "inset" (case insensitive) keyword.
+	// check if the shadow string contains "inset" keyword
+	const insets = shadowValue.match( /inset/gi ) || [];
+	if ( insets.length > 1 ) {
+		return defaultShadow;
+	}
+
+	// Strip lengths and inset from shadow string, leaving just color.
+	const hasInset = insets.length === 1;
+	let colorString = shadowValue.replace( lengthsRegex, '' ).trim();
+	if ( hasInset ) {
+		colorString = colorString
+			.replace( 'inset', '' )
+			.replace( 'INSET', '' )
+			.trim();
+	}
+
+	// Rule 6: Should not contain more than one color value.
+	// validate color string with regular expression
+	// check if color has matching hex, rgb or hsl values
+	const colorRegex =
+		/^#([0-9a-f]{3}){1,2}$|^#([0-9a-f]{4}){1,2}$|^(?:rgb|hsl)a?\(?[\d*\.?\d+%?,?\/?\s]*\)$/gi;
+	let colorMatches = ( colorString.match( colorRegex ) || [] )
+		.map( ( value ) => value?.trim() )
+		.filter( ( value ) => value );
+
+	// If color string has more than one color values, it is not a valid
+	if ( colorMatches.length > 1 ) {
+		return defaultShadow;
+	} else if ( colorMatches.length === 0 ) {
+		// check if color string has multiple named color values separated by space
+		colorMatches = colorString
+			.trim()
+			.split( ' ' )
+			.filter( ( value ) => value );
+		// If color string has more than one color values, it is not a valid
+		if ( colorMatches.length > 1 ) {
+			return defaultShadow;
+		}
+	}
+
+	// Return parsed shadow object.
+	const [ x, y, blur, spread ] = lengths;
+	return {
+		x,
+		y,
+		blur: blur || defaultShadow.blur,
+		spread: spread || defaultShadow.spread,
+		inset: hasInset,
+		color: colorString || defaultShadow.color,
+	};
+}
+
+export function shadowObjectToString( shadowObj ) {
+	const shadowString = `${ shadowObj.x || '0px' } ${ shadowObj.y || '0px' } ${
+		shadowObj.blur || '0px'
+	} ${ shadowObj.spread || '0px' }`;
+
+	return `${ shadowObj.inset ? 'inset' : '' } ${ shadowString } ${
+		shadowObj.color || ''
+	}`.trim();
+}
diff --git a/packages/edit-site/src/components/global-styles/shadows-edit-panel.js b/packages/edit-site/src/components/global-styles/shadows-edit-panel.js
new file mode 100644
index 00000000000000..7321e927fbbae3
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/shadows-edit-panel.js
@@ -0,0 +1,519 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	__experimentalSpacer as Spacer,
+	__experimentalItemGroup as ItemGroup,
+	__experimentalInputControl as InputControl,
+	__experimentalUnitControl as UnitControl,
+	__experimentalGrid as Grid,
+	__experimentalDropdownContentWrapper as DropdownContentWrapper,
+	useNavigator,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
+	__experimentalConfirmDialog as ConfirmDialog,
+	Dropdown,
+	Button,
+	Flex,
+	FlexItem,
+	ColorPalette,
+	Modal,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import {
+	plus,
+	shadow as shadowIcon,
+	reset,
+	moreVertical,
+} from '@wordpress/icons';
+import { useState, useMemo, useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import Subtitle from './subtitle';
+import ScreenHeader from './header';
+import { defaultShadow } from './shadows-panel';
+import {
+	getShadowParts,
+	shadowStringToObject,
+	shadowObjectToString,
+} from './shadow-utils';
+
+const { useGlobalSetting } = unlock( blockEditorPrivateApis );
+const { DropdownMenuV2 } = unlock( componentsPrivateApis );
+
+const customShadowMenuItems = [
+	{
+		label: __( 'Rename' ),
+		action: 'rename',
+	},
+	{
+		label: __( 'Delete' ),
+		action: 'delete',
+	},
+];
+
+const presetShadowMenuItems = [
+	{
+		label: __( 'Reset' ),
+		action: 'reset',
+	},
+];
+
+export default function ShadowsEditPanel() {
+	const {
+		goBack,
+		params: { category, slug },
+	} = useNavigator();
+	const [ shadows, setShadows ] = useGlobalSetting(
+		`shadow.presets.${ category }`
+	);
+
+	useEffect( () => {
+		const hasCurrentShadow = shadows?.some(
+			( shadow ) => shadow.slug === slug
+		);
+		// If the shadow being edited doesn't exist anymore in the global styles setting, navigate back
+		// to prevent the user from editing a non-existent shadow entry.
+		// This can happen, for example:
+		// - when the user deletes the shadow
+		// - when the user resets the styles while editing a custom shadow
+		//
+		// The check on the slug is necessary to prevent a double back navigation when the user triggers
+		// a backward navigation by interacting with the screen's UI.
+		if ( !! slug && ! hasCurrentShadow ) {
+			goBack();
+		}
+	}, [ shadows, slug, goBack ] );
+
+	const [ baseShadows ] = useGlobalSetting(
+		`shadow.presets.${ category }`,
+		undefined,
+		'base'
+	);
+	const [ selectedShadow, setSelectedShadow ] = useState( () =>
+		( shadows || [] ).find( ( shadow ) => shadow.slug === slug )
+	);
+	const baseSelectedShadow = useMemo(
+		() => ( baseShadows || [] ).find( ( b ) => b.slug === slug ),
+		[ baseShadows, slug ]
+	);
+	const [ isConfirmDialogVisible, setIsConfirmDialogVisible ] =
+		useState( false );
+	const [ isRenameModalVisible, setIsRenameModalVisible ] = useState( false );
+	const [ shadowName, setShadowName ] = useState( selectedShadow.name );
+
+	if ( ! category || ! slug ) {
+		return null;
+	}
+
+	const onShadowChange = ( shadow ) => {
+		setSelectedShadow( { ...selectedShadow, shadow } );
+		const updatedShadows = shadows.map( ( s ) =>
+			s.slug === slug ? { ...selectedShadow, shadow } : s
+		);
+		setShadows( updatedShadows );
+	};
+
+	const onMenuClick = ( action ) => {
+		if ( action === 'reset' ) {
+			const updatedShadows = shadows.map( ( s ) =>
+				s.slug === slug ? baseSelectedShadow : s
+			);
+			setSelectedShadow( baseSelectedShadow );
+			setShadows( updatedShadows );
+		} else if ( action === 'delete' ) {
+			setIsConfirmDialogVisible( true );
+		} else if ( action === 'rename' ) {
+			setIsRenameModalVisible( true );
+		}
+	};
+
+	const handleShadowDelete = () => {
+		setShadows( shadows.filter( ( s ) => s.slug !== slug ) );
+	};
+
+	const handleShadowRename = ( newName ) => {
+		if ( ! newName ) {
+			return;
+		}
+		const updatedShadows = shadows.map( ( s ) =>
+			s.slug === slug ? { ...selectedShadow, name: newName } : s
+		);
+		setSelectedShadow( { ...selectedShadow, name: newName } );
+		setShadows( updatedShadows );
+	};
+
+	return ! selectedShadow ? (
+		<ScreenHeader title="" />
+	) : (
+		<>
+			<HStack justify="space-between">
+				<ScreenHeader title={ selectedShadow.name } />
+				<FlexItem>
+					<Spacer marginTop={ 2 } marginBottom={ 0 } paddingX={ 4 }>
+						<DropdownMenuV2
+							trigger={
+								<Button
+									size="small"
+									icon={ moreVertical }
+									label={ __( 'Menu' ) }
+								/>
+							}
+						>
+							{ ( category === 'custom'
+								? customShadowMenuItems
+								: presetShadowMenuItems
+							).map( ( item ) => (
+								<DropdownMenuV2.Item
+									key={ item.action }
+									onClick={ () => onMenuClick( item.action ) }
+									disabled={
+										item.action === 'reset' &&
+										selectedShadow.shadow ===
+											baseSelectedShadow.shadow
+									}
+								>
+									<DropdownMenuV2.ItemLabel>
+										{ item.label }
+									</DropdownMenuV2.ItemLabel>
+								</DropdownMenuV2.Item>
+							) ) }
+						</DropdownMenuV2>
+					</Spacer>
+				</FlexItem>
+			</HStack>
+			<div className="edit-site-global-styles-screen">
+				<ShadowsPreview shadow={ selectedShadow.shadow } />
+				<ShadowEditor
+					shadow={ selectedShadow.shadow }
+					onChange={ onShadowChange }
+				/>
+			</div>
+			{ isConfirmDialogVisible && (
+				<ConfirmDialog
+					isOpen
+					onConfirm={ () => {
+						handleShadowDelete();
+						setIsConfirmDialogVisible( false );
+					} }
+					onCancel={ () => {
+						setIsConfirmDialogVisible( false );
+					} }
+					confirmButtonText={ __( 'Delete' ) }
+					size="medium"
+				>
+					{ sprintf(
+						// translators: %s: name of the shadow
+						'Are you sure you want to delete "%s"?',
+						selectedShadow.name
+					) }
+				</ConfirmDialog>
+			) }
+			{ isRenameModalVisible && (
+				<Modal
+					title={ __( 'Rename' ) }
+					onRequestClose={ () => setIsRenameModalVisible( false ) }
+					size="small"
+				>
+					<form
+						onSubmit={ ( event ) => {
+							event.preventDefault();
+							handleShadowRename( shadowName );
+							setIsRenameModalVisible( false );
+						} }
+					>
+						<InputControl
+							__next40pxDefaultSize
+							autoComplete="off"
+							label={ __( 'Name' ) }
+							placeholder={ __( 'Shadow name' ) }
+							value={ shadowName }
+							onChange={ ( value ) => setShadowName( value ) }
+						/>
+						<Spacer marginBottom={ 6 } />
+						<Flex
+							className="block-editor-shadow-edit-modal__actions"
+							justify="flex-end"
+							expanded={ false }
+						>
+							<FlexItem>
+								<Button
+									__next40pxDefaultSize
+									variant="tertiary"
+									onClick={ () =>
+										setIsRenameModalVisible( false )
+									}
+								>
+									{ __( 'Cancel' ) }
+								</Button>
+							</FlexItem>
+							<FlexItem>
+								<Button
+									__next40pxDefaultSize
+									variant="primary"
+									type="submit"
+								>
+									{ __( 'Save' ) }
+								</Button>
+							</FlexItem>
+						</Flex>
+					</form>
+				</Modal>
+			) }
+		</>
+	);
+}
+
+function ShadowsPreview( { shadow } ) {
+	const shadowStyle = {
+		boxShadow: shadow,
+	};
+
+	return (
+		<Spacer marginBottom={ 4 } marginTop={ -2 }>
+			<HStack
+				align="center"
+				justify="center"
+				className="edit-site-global-styles__shadow-preview-panel"
+			>
+				<div
+					className="edit-site-global-styles__shadow-preview-block"
+					style={ shadowStyle }
+				/>
+			</HStack>
+		</Spacer>
+	);
+}
+
+function ShadowEditor( { shadow, onChange } ) {
+	const shadowParts = useMemo( () => getShadowParts( shadow ), [ shadow ] );
+
+	const onChangeShadowPart = ( index, part ) => {
+		const newShadowParts = [ ...shadowParts ];
+		newShadowParts[ index ] = part;
+		onChange( newShadowParts.join( ', ' ) );
+	};
+
+	const onAddShadowPart = () => {
+		onChange( [ ...shadowParts, defaultShadow ].join( ', ' ) );
+	};
+
+	const onRemoveShadowPart = ( index ) => {
+		onChange( shadowParts.filter( ( p, i ) => i !== index ).join( ', ' ) );
+	};
+
+	return (
+		<>
+			<VStack spacing={ 2 }>
+				<HStack justify="space-between">
+					<Flex
+						align="center"
+						className="edit-site-global-styles__shadows-panel__title"
+					>
+						<Subtitle level={ 3 }>{ __( 'Shadows' ) }</Subtitle>
+					</Flex>
+					<FlexItem className="edit-site-global-styles__shadows-panel__options-container">
+						<Button
+							size="small"
+							icon={ plus }
+							label={ __( 'Add shadow' ) }
+							onClick={ () => {
+								onAddShadowPart();
+							} }
+						/>
+					</FlexItem>
+				</HStack>
+			</VStack>
+			<Spacer />
+			<ItemGroup isBordered isSeparated>
+				{ shadowParts.map( ( part, index ) => (
+					<ShadowItem
+						key={ index }
+						shadow={ part }
+						onChange={ ( value ) =>
+							onChangeShadowPart( index, value )
+						}
+						canRemove={ shadowParts.length > 1 }
+						onRemove={ () => onRemoveShadowPart( index ) }
+					/>
+				) ) }
+			</ItemGroup>
+		</>
+	);
+}
+
+function ShadowItem( { shadow, onChange, canRemove, onRemove } ) {
+	const popoverProps = {
+		placement: 'left-start',
+		offset: 36,
+		shift: true,
+	};
+	const shadowObj = useMemo(
+		() => shadowStringToObject( shadow ),
+		[ shadow ]
+	);
+	const onShadowChange = ( newShadow ) => {
+		onChange( shadowObjectToString( newShadow ) );
+	};
+
+	return (
+		<Dropdown
+			popoverProps={ popoverProps }
+			className="edit-site-global-styles__shadow-editor__dropdown"
+			renderToggle={ ( { onToggle, isOpen } ) => {
+				const toggleProps = {
+					onClick: onToggle,
+					className: clsx(
+						'edit-site-global-styles__shadow-editor__dropdown-toggle',
+						{ 'is-open': isOpen }
+					),
+					'aria-expanded': isOpen,
+				};
+				const removeButtonProps = {
+					onClick: onRemove,
+					className: clsx(
+						'edit-site-global-styles__shadow-editor__remove-button',
+						{ 'is-open': isOpen }
+					),
+					label: __( 'Remove shadow' ),
+				};
+
+				return (
+					<HStack align="center" justify="flex-start" spacing={ 0 }>
+						<FlexItem style={ { flexGrow: 1 } }>
+							<Button
+								__next40pxDefaultSize
+								icon={ shadowIcon }
+								{ ...toggleProps }
+							>
+								{ shadowObj.inset
+									? __( 'Inner shadow' )
+									: __( 'Drop shadow' ) }
+							</Button>
+						</FlexItem>
+						{ canRemove && (
+							<FlexItem>
+								<Button
+									__next40pxDefaultSize
+									icon={ reset }
+									{ ...removeButtonProps }
+								/>
+							</FlexItem>
+						) }
+					</HStack>
+				);
+			} }
+			renderContent={ () => (
+				<DropdownContentWrapper
+					paddingSize="medium"
+					className="edit-site-global-styles__shadow-editor__dropdown-content"
+				>
+					<ShadowPopover
+						shadowObj={ shadowObj }
+						onChange={ onShadowChange }
+					/>
+				</DropdownContentWrapper>
+			) }
+		/>
+	);
+}
+
+function ShadowPopover( { shadowObj, onChange } ) {
+	const __experimentalIsRenderedInSidebar = true;
+	const enableAlpha = true;
+
+	const onShadowChange = ( key, value ) => {
+		const newShadow = {
+			...shadowObj,
+			[ key ]: value,
+		};
+		onChange( newShadow );
+	};
+
+	return (
+		<VStack
+			spacing={ 4 }
+			className="edit-site-global-styles__shadow-editor-panel"
+		>
+			<ColorPalette
+				clearable={ false }
+				enableAlpha={ enableAlpha }
+				__experimentalIsRenderedInSidebar={
+					__experimentalIsRenderedInSidebar
+				}
+				value={ shadowObj.color }
+				onChange={ ( value ) => onShadowChange( 'color', value ) }
+			/>
+			<ToggleGroupControl
+				__nextHasNoMarginBottom
+				value={ shadowObj.inset ? 'inset' : 'outset' }
+				isBlock
+				onChange={ ( value ) =>
+					onShadowChange( 'inset', value === 'inset' )
+				}
+				hideLabelFromVision
+				__next40pxDefaultSize
+			>
+				<ToggleGroupControlOption
+					value="outset"
+					label={ __( 'Outset' ) }
+				/>
+				<ToggleGroupControlOption
+					value="inset"
+					label={ __( 'Inset' ) }
+				/>
+			</ToggleGroupControl>
+			<Grid columns={ 2 } gap={ 4 }>
+				<ShadowInputControl
+					label={ __( 'X Position' ) }
+					value={ shadowObj.x }
+					onChange={ ( value ) => onShadowChange( 'x', value ) }
+				/>
+				<ShadowInputControl
+					label={ __( 'Y Position' ) }
+					value={ shadowObj.y }
+					onChange={ ( value ) => onShadowChange( 'y', value ) }
+				/>
+				<ShadowInputControl
+					label={ __( 'Blur' ) }
+					value={ shadowObj.blur }
+					onChange={ ( value ) => onShadowChange( 'blur', value ) }
+				/>
+				<ShadowInputControl
+					label={ __( 'Spread' ) }
+					value={ shadowObj.spread }
+					onChange={ ( value ) => onShadowChange( 'spread', value ) }
+				/>
+			</Grid>
+		</VStack>
+	);
+}
+
+function ShadowInputControl( { label, value, onChange } ) {
+	const onValueChange = ( next ) => {
+		const isNumeric = next !== undefined && ! isNaN( parseFloat( next ) );
+		const nextValue = isNumeric ? next : '0px';
+		onChange( nextValue );
+	};
+
+	return (
+		<UnitControl
+			label={ label }
+			__next40pxDefaultSize
+			value={ value }
+			onChange={ onValueChange }
+		/>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles/shadows-panel.js b/packages/edit-site/src/components/global-styles/shadows-panel.js
new file mode 100644
index 00000000000000..43e0c063f492b8
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/shadows-panel.js
@@ -0,0 +1,143 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	__experimentalItemGroup as ItemGroup,
+	Button,
+	Flex,
+	FlexItem,
+} from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { plus, shadow as shadowIcon } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import Subtitle from './subtitle';
+import { NavigationButtonAsItem } from './navigation-button';
+import ScreenHeader from './header';
+import { getNewIndexFromPresets } from './utils';
+
+const { useGlobalSetting } = unlock( blockEditorPrivateApis );
+
+export const defaultShadow = '6px 6px 9px rgba(0, 0, 0, 0.2)';
+
+export default function ShadowsPanel() {
+	const [ defaultShadows ] = useGlobalSetting( 'shadow.presets.default' );
+	const [ defaultShadowsEnabled ] = useGlobalSetting(
+		'shadow.defaultPresets'
+	);
+	const [ themeShadows ] = useGlobalSetting( 'shadow.presets.theme' );
+	const [ customShadows, setCustomShadows ] = useGlobalSetting(
+		'shadow.presets.custom'
+	);
+
+	const onCreateShadow = ( shadow ) => {
+		setCustomShadows( [ ...( customShadows || [] ), shadow ] );
+	};
+
+	return (
+		<>
+			<ScreenHeader
+				title={ __( 'Shadows' ) }
+				description={ __(
+					'Manage and create shadow styles for use across the site.'
+				) }
+			/>
+			<div className="edit-site-global-styles-screen">
+				<VStack
+					className="edit-site-global-styles__shadows-panel"
+					spacing={ 7 }
+				>
+					{ defaultShadowsEnabled && (
+						<ShadowList
+							label={ __( 'Default' ) }
+							shadows={ defaultShadows || [] }
+							category="default"
+						/>
+					) }
+					{ themeShadows && themeShadows.length > 0 && (
+						<ShadowList
+							label={ __( 'Theme' ) }
+							shadows={ themeShadows || [] }
+							category="theme"
+						/>
+					) }
+					<ShadowList
+						label={ __( 'Custom' ) }
+						shadows={ customShadows || [] }
+						category="custom"
+						canCreate
+						onCreate={ onCreateShadow }
+					/>
+				</VStack>
+			</div>
+		</>
+	);
+}
+
+function ShadowList( { label, shadows, category, canCreate, onCreate } ) {
+	const handleAddShadow = () => {
+		const newIndex = getNewIndexFromPresets( shadows, 'shadow-' );
+		onCreate( {
+			name: sprintf(
+				/* translators: %s: is an index for a preset */
+				__( 'Shadow %s' ),
+				newIndex
+			),
+			shadow: defaultShadow,
+			slug: `shadow-${ newIndex }`,
+		} );
+	};
+
+	return (
+		<VStack spacing={ 2 }>
+			<HStack justify="space-between">
+				<Flex
+					align="center"
+					className="edit-site-global-styles__shadows-panel__title"
+				>
+					<Subtitle level={ 3 }>{ label }</Subtitle>
+				</Flex>
+				{ canCreate && (
+					<FlexItem className="edit-site-global-styles__shadows-panel__options-container">
+						<Button
+							size="small"
+							icon={ plus }
+							label={ __( 'Add shadow' ) }
+							onClick={ () => {
+								handleAddShadow();
+							} }
+						/>
+					</FlexItem>
+				) }
+			</HStack>
+			{ shadows.length > 0 && (
+				<ItemGroup isBordered isSeparated>
+					{ shadows.map( ( shadow ) => (
+						<ShadowItem
+							key={ shadow.slug }
+							shadow={ shadow }
+							category={ category }
+						/>
+					) ) }
+				</ItemGroup>
+			) }
+		</VStack>
+	);
+}
+
+function ShadowItem( { shadow, category } ) {
+	return (
+		<NavigationButtonAsItem
+			path={ `/shadows/edit/${ category }/${ shadow.slug }` }
+			icon={ shadowIcon }
+		>
+			{ shadow.name }
+		</NavigationButtonAsItem>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles/size-control/index.js b/packages/edit-site/src/components/global-styles/size-control/index.js
new file mode 100644
index 00000000000000..06ea0bb5617e31
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/size-control/index.js
@@ -0,0 +1,89 @@
+/**
+ * WordPress dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+import {
+	BaseControl,
+	RangeControl,
+	Flex,
+	FlexItem,
+	useBaseControlProps,
+	__experimentalUseCustomUnits as useCustomUnits,
+	__experimentalParseQuantityAndUnitFromRawValue as parseQuantityAndUnitFromRawValue,
+	__experimentalUnitControl as UnitControl,
+	__experimentalSpacer as Spacer,
+} from '@wordpress/components';
+
+const DEFAULT_UNITS = [ 'px', 'em', 'rem', 'vw', 'vh' ];
+
+function SizeControl( {
+	// Do not allow manipulation of margin bottom
+	__nextHasNoMarginBottom,
+	...props
+} ) {
+	const { baseControlProps } = useBaseControlProps( props );
+	const { value, onChange, fallbackValue, disabled, label } = props;
+
+	const units = useCustomUnits( {
+		availableUnits: DEFAULT_UNITS,
+	} );
+
+	const [ valueQuantity, valueUnit = 'px' ] =
+		parseQuantityAndUnitFromRawValue( value, units );
+
+	const isValueUnitRelative =
+		!! valueUnit && [ 'em', 'rem', 'vw', 'vh' ].includes( valueUnit );
+
+	// Receives the new value from the UnitControl component as a string containing the value and unit.
+	const handleUnitControlChange = ( newValue ) => {
+		onChange( newValue );
+	};
+
+	// Receives the new value from the RangeControl component as a number.
+	const handleRangeControlChange = ( newValue ) => {
+		onChange?.( newValue + valueUnit );
+	};
+
+	return (
+		<BaseControl { ...baseControlProps } __nextHasNoMarginBottom>
+			<Flex>
+				<FlexItem isBlock>
+					<UnitControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
+						label={ label }
+						hideLabelFromVision
+						value={ value }
+						onChange={ handleUnitControlChange }
+						units={ units }
+						min={ 0 }
+						disabled={ disabled }
+					/>
+				</FlexItem>
+				<FlexItem isBlock>
+					<Spacer marginX={ 2 } marginBottom={ 0 }>
+						<RangeControl
+							__next40pxDefaultSize
+							__nextHasNoMarginBottom
+							label={ label }
+							hideLabelFromVision
+							value={ valueQuantity }
+							initialPosition={ fallbackValue }
+							withInputField={ false }
+							onChange={ handleRangeControlChange }
+							min={ 0 }
+							max={ isValueUnitRelative ? 10 : 100 }
+							step={ isValueUnitRelative ? 0.1 : 1 }
+							disabled={ disabled }
+						/>
+					</Spacer>
+				</FlexItem>
+			</Flex>
+		</BaseControl>
+	);
+}
+
+export default SizeControl;
diff --git a/packages/edit-site/src/components/global-styles/stories/index.story.js b/packages/edit-site/src/components/global-styles/stories/index.story.js
index f04387295c458a..66cf468d5e224c 100644
--- a/packages/edit-site/src/components/global-styles/stories/index.story.js
+++ b/packages/edit-site/src/components/global-styles/stories/index.story.js
@@ -2,15 +2,16 @@
  * WordPress dependencies
  */
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { useMemo, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import { mergeBaseAndUserConfigs } from '../global-styles-provider';
 import { default as GlobalStylesUIComponent } from '../ui';
 import { unlock } from '../../../lock-unlock';
 
+const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );
 const { GlobalStylesContext, ExperimentalBlockEditorProvider } = unlock(
 	blockEditorPrivateApis
 );
diff --git a/packages/edit-site/src/components/global-styles/style-variations-container.js b/packages/edit-site/src/components/global-styles/style-variations-container.js
index 6cc8b53b800d3a..759303bcf5fa7b 100644
--- a/packages/edit-site/src/components/global-styles/style-variations-container.js
+++ b/packages/edit-site/src/components/global-styles/style-variations-container.js
@@ -1,134 +1,131 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
-import { useMemo, useContext, useState } from '@wordpress/element';
-import { ENTER } from '@wordpress/keycodes';
+import { useContext, useMemo } from '@wordpress/element';
 import { __experimentalGrid as Grid } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
-import { mergeBaseAndUserConfigs } from './global-styles-provider';
-import StylesPreview from './preview';
+import PreviewStyles from './preview-styles';
+import Variation from './variations/variation';
+import { isVariationWithProperties } from '../../hooks/use-theme-style-variations/use-theme-style-variations-by-property';
 import { unlock } from '../../lock-unlock';
 
-const { GlobalStylesContext, areGlobalStyleConfigsEqual } = unlock(
-	blockEditorPrivateApis
-);
-
-function Variation( { variation } ) {
-	const [ isFocused, setIsFocused ] = useState( false );
-	const { base, user, setUserConfig } = useContext( GlobalStylesContext );
-	const context = useMemo( () => {
-		return {
-			user: {
-				settings: variation.settings ?? {},
-				styles: variation.styles ?? {},
-			},
-			base,
-			merged: mergeBaseAndUserConfigs( base, variation ),
-			setUserConfig: () => {},
-		};
-	}, [ variation, base ] );
-
-	const selectVariation = () => {
-		setUserConfig( () => {
-			return {
-				settings: variation.settings,
-				styles: variation.styles,
-			};
-		} );
-	};
+const { GlobalStylesContext } = unlock( blockEditorPrivateApis );
 
-	const selectOnEnter = ( event ) => {
-		if ( event.keyCode === ENTER ) {
-			event.preventDefault();
-			selectVariation();
-		}
-	};
-
-	const isActive = useMemo( () => {
-		return areGlobalStyleConfigsEqual( user, variation );
-	}, [ user, variation ] );
-
-	let label = variation?.title;
-	if ( variation?.description ) {
-		label = sprintf(
-			/* translators: %1$s: variation title. %2$s variation description. */
-			__( '%1$s (%2$s)' ),
-			variation?.title,
-			variation?.description
-		);
-	}
-
-	return (
-		<GlobalStylesContext.Provider value={ context }>
-			<div
-				className={ classnames(
-					'edit-site-global-styles-variations_item',
-					{
-						'is-active': isActive,
-					}
-				) }
-				role="button"
-				onClick={ selectVariation }
-				onKeyDown={ selectOnEnter }
-				tabIndex="0"
-				aria-label={ label }
-				aria-current={ isActive }
-				onFocus={ () => setIsFocused( true ) }
-				onBlur={ () => setIsFocused( false ) }
-			>
-				<div className="edit-site-global-styles-variations_item-preview">
-					<StylesPreview
-						label={ variation?.title }
-						isFocused={ isFocused }
-						withHoverView
-					/>
-				</div>
-			</div>
-		</GlobalStylesContext.Provider>
-	);
-}
+export default function StyleVariationsContainer( { gap = 2 } ) {
+	const { user } = useContext( GlobalStylesContext );
+	const userStyles = user?.styles;
 
-export default function StyleVariationsContainer() {
 	const variations = useSelect( ( select ) => {
 		return select(
 			coreStore
 		).__experimentalGetCurrentThemeGlobalStylesVariations();
 	}, [] );
 
-	const withEmptyVariation = useMemo( () => {
-		return [
+	// Filter out variations that are color or typography variations.
+	const fullStyleVariations = variations?.filter( ( variation ) => {
+		return (
+			! isVariationWithProperties( variation, [ 'color' ] ) &&
+			! isVariationWithProperties( variation, [
+				'typography',
+				'spacing',
+			] )
+		);
+	} );
+
+	const themeVariations = useMemo( () => {
+		const withEmptyVariation = [
 			{
 				title: __( 'Default' ),
 				settings: {},
 				styles: {},
 			},
-			...( variations ?? [] ).map( ( variation ) => ( {
-				...variation,
-				settings: variation.settings ?? {},
-				styles: variation.styles ?? {},
-			} ) ),
+			...( fullStyleVariations ?? [] ),
+		];
+		return [
+			...withEmptyVariation.map( ( variation ) => {
+				const blockStyles = { ...variation?.styles?.blocks } || {};
+
+				// We need to copy any user custom CSS to the variation to prevent it being lost
+				// when switching variations.
+				if ( userStyles?.blocks ) {
+					Object.keys( userStyles.blocks ).forEach( ( blockName ) => {
+						// First get any block specific custom CSS from the current user styles and merge with any custom CSS for
+						// that block in the variation.
+						if ( userStyles.blocks[ blockName ].css ) {
+							const variationBlockStyles =
+								blockStyles[ blockName ] || {};
+							const customCSS = {
+								css: `${
+									blockStyles[ blockName ]?.css || ''
+								} ${
+									userStyles.blocks[ blockName ].css.trim() ||
+									''
+								}`,
+							};
+							blockStyles[ blockName ] = {
+								...variationBlockStyles,
+								...customCSS,
+							};
+						}
+					} );
+				}
+				// Now merge any global custom CSS from current user styles with global custom CSS in the variation.
+				const css =
+					userStyles?.css || variation.styles?.css
+						? {
+								css: `${ variation.styles?.css || '' } ${
+									userStyles?.css || ''
+								}`,
+						  }
+						: {};
+
+				const blocks =
+					Object.keys( blockStyles ).length > 0
+						? { blocks: blockStyles }
+						: {};
+
+				const styles = {
+					...variation.styles,
+					...css,
+					...blocks,
+				};
+				return {
+					...variation,
+					settings: variation.settings ?? {},
+					styles,
+				};
+			} ),
 		];
-	}, [ variations ] );
+	}, [ fullStyleVariations, userStyles?.blocks, userStyles?.css ] );
+
+	if ( ! fullStyleVariations || fullStyleVariations?.length < 1 ) {
+		return null;
+	}
 
 	return (
 		<Grid
 			columns={ 2 }
 			className="edit-site-global-styles-style-variations-container"
+			gap={ gap }
 		>
-			{ withEmptyVariation.map( ( variation, index ) => (
-				<Variation key={ index } variation={ variation } />
+			{ themeVariations.map( ( variation, index ) => (
+				<Variation key={ index } variation={ variation }>
+					{ ( isFocused ) => (
+						<PreviewStyles
+							label={ variation?.title }
+							withHoverView
+							isFocused={ isFocused }
+							variation={ variation }
+						/>
+					) }
+				</Variation>
 			) ) }
 		</Grid>
 	);
diff --git a/packages/edit-site/src/components/global-styles/style.scss b/packages/edit-site/src/components/global-styles/style.scss
index a899495cc332b7..5574fe52d81f58 100644
--- a/packages/edit-site/src/components/global-styles/style.scss
+++ b/packages/edit-site/src/components/global-styles/style.scss
@@ -9,6 +9,7 @@
 .edit-site-global-styles-preview__iframe {
 	max-width: 100%;
 	display: block;
+	width: 100%;
 }
 
 .edit-site-typography-preview {
@@ -18,18 +19,23 @@
 	min-height: 100px;
 	margin-bottom: $grid-unit-20;
 	background: $gray-100;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	overflow: hidden;
 }
 
-.edit-site-typography-panel__full-width-control {
-	grid-column: 1 / -1;
-	max-width: 100%;
+.edit-site-font-size__item {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	line-break: anywhere;
 }
 
-.edit-site-global-styles-screen-typography,
-.edit-site-global-styles-screen-css {
-	margin: $grid-unit-20;
+.edit-site-font-size__item-value {
+	color: $gray-700;
+}
+
+.edit-site-global-styles-screen {
+	margin: $grid-unit-15 $grid-unit-20 $grid-unit-20;
 }
 
 .edit-site-global-styles-screen-typography__indicator {
@@ -39,17 +45,23 @@
 	display: flex !important;
 	align-items: center;
 	justify-content: center;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-x-small;
 }
 
-.edit-site-global-styles-screen-colors {
-	margin: $grid-unit-20;
+.edit-site-global-styles-screen-typography__font-variants-count {
+	color: $gray-700;
+}
 
-	.color-block-support-panel {
-		padding-left: 0;
-		padding-right: 0;
-		border-top: none;
-	}
+.edit-site-global-styles-font-families__manage-fonts {
+	justify-content: center;
+}
+
+.edit-site-global-styles-screen .color-block-support-panel {
+	padding-left: 0;
+	padding-right: 0;
+	padding-top: 0;
+	border-top: none;
+	row-gap: calc(#{$grid-unit-05} * 3);
 }
 
 .edit-site-global-styles-header__description {
@@ -78,45 +90,10 @@
 	color: $gray-800;
 	font-weight: 600;
 	line-height: 1.2;
-	padding: $grid-unit-20;
-	padding-bottom: 0;
+	padding: $grid-unit-20 $grid-unit-20 0;
 	margin: 0;
 }
 
-.edit-site-global-styles-variations_item {
-	box-sizing: border-box;
-	// To round the outline in Windows 10 high contrast mode.
-	border-radius: $radius-block-ui;
-
-	.edit-site-global-styles-variations_item-preview {
-		padding: $border-width * 2;
-		border-radius: $radius-block-ui;
-		box-shadow: 0 0 0 $border-width $gray-200;
-		// Shown in Windows 10 high contrast mode.
-		outline: 1px solid transparent;
-	}
-
-	&.is-active .edit-site-global-styles-variations_item-preview {
-		box-shadow: 0 0 0 $border-width $gray-900;
-		// Shown in Windows 10 high contrast mode.
-		outline-width: 3px;
-	}
-
-	&:hover .edit-site-global-styles-variations_item-preview {
-		box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color);
-	}
-
-	&:focus .edit-site-global-styles-variations_item-preview {
-		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-	}
-
-	&:focus-visible {
-		// Shown in Windows 10 high contrast mode.
-		outline: 3px solid transparent;
-		outline-offset: 0;
-	}
-}
-
 .edit-site-global-styles-icon-with-current-color {
 	fill: currentColor;
 }
@@ -127,18 +104,70 @@
 	flex-shrink: 0;
 }
 
+.edit-site-global-styles__shadows-panel__title,
+.edit-site-global-styles__shadows-panel__options-container {
+	height: $grid-unit * 3;
+}
+
 .edit-site-global-styles__block-preview-panel {
 	position: relative;
 	width: 100%;
-	overflow: auto;
 	border: $gray-200 $border-width solid;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-medium;
+	overflow: hidden;
+}
+
+.edit-site-global-styles__shadow-preview-panel {
+	height: $grid-unit-60 * 3;
+	border: $gray-200 $border-width solid;
+	border-radius: $radius-medium;
+	overflow: auto;
+	background-image: repeating-linear-gradient(45deg, #f5f5f5 25%, #0000 0, #0000 75%, #f5f5f5 0, #f5f5f5), repeating-linear-gradient(45deg, #f5f5f5 25%, #0000 0, #0000 75%, #f5f5f5 0, #f5f5f5);
+	background-position: 0 0, 8px 8px;
+	background-size: 16px 16px;
+
+	.edit-site-global-styles__shadow-preview-block {
+		border: $gray-200 $border-width solid;
+		border-radius: $radius-small;
+		background-color: $white;
+		width: 60%;
+		height: 60px;
+	}
+}
+
+.edit-site-global-styles__shadow-editor__dropdown-content {
+	width: 280px;
+}
+
+.edit-site-global-styles__shadow-editor-panel {
+	// because tooltip of the range control is too close to the edge and creates overflow
+	margin-bottom: $grid-unit-05;
+}
+
+.edit-site-global-styles__shadow-editor__dropdown {
+	width: 100%;
+
+	.edit-site-global-styles__shadow-editor__dropdown-toggle,
+	.edit-site-global-styles__shadow-editor__remove-button {
+		width: 100%;
+		height: auto;
+		padding-top: $grid-unit;
+		padding-bottom: $grid-unit;
+		text-align: left;
+		border-radius: inherit;
+
+		&.is-open {
+			background: $gray-100;
+			color: var(--wp-admin-theme-color);
+		}
+	}
 }
 
 .edit-site-global-styles-screen-css {
 	flex: 1 1 auto;
 	display: flex;
 	flex-direction: column;
+	margin: $grid-unit-20;
 
 	.components-v-stack {
 		flex: 1 1 auto;
@@ -165,7 +194,7 @@
 }
 
 .edit-site-global-styles-screen-css-help-link {
-	display: block;
+	display: inline-block;
 	margin-top: $grid-unit-10;
 }
 .edit-site-global-styles-screen-variations {
@@ -191,3 +220,12 @@
 .edit-site-global-styles-sidebar__panel .block-editor-block-icon svg {
 	fill: currentColor;
 }
+
+.edit-site-global-styles-screen-root__active-style-tile {
+	// Todo: revisit use of Card component and/or remove override
+	// The &#{&} is a workaround for the specificity of the Card component.
+	&#{&},
+	&#{&} .edit-site-global-styles-screen-root__active-style-tile-preview {
+		border-radius: $radius-small;
+	}
+}
diff --git a/packages/edit-site/src/components/global-styles/test/shadow-utils.spec.js b/packages/edit-site/src/components/global-styles/test/shadow-utils.spec.js
new file mode 100644
index 00000000000000..05521c78575421
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/test/shadow-utils.spec.js
@@ -0,0 +1,251 @@
+/**
+ * Internal dependencies
+ */
+import { getShadowParts, shadowStringToObject } from '../shadow-utils';
+
+const colorFormats = {
+	named: 'red',
+	hex: '#ff0000',
+	hexAlpha: '#ff000077',
+	rgb: 'rgb(255, 0, 0)',
+	rgbSpaced: 'rgb(255 0 0)',
+	rgbMultiSpaced: 'rgb(255  0   0)',
+	rgba: 'rgba(255, 0, 0, 0.5)',
+	rgbp: 'rgb(255 0 0 / 50%)',
+	hsl: 'hsl(0, 100%, 50%)',
+	hsla: 'hsla(0, 100%, 50%, 0.5)',
+	hslp: 'hsl(0 100% 50% / 50%)',
+	currentcolor: 'currentcolor',
+};
+const validShadowFormats = {
+	xy: '{x} {y}',
+	xyInset: '{x} {y} inset',
+	insetXY: 'inset {x} {y}',
+
+	xyColor: '{x} {y} {color}',
+	xyColorInset: '{x} {y} {color} inset',
+	xyInsetColor: '{x} {y} inset {color}',
+	insetXYColor: 'inset {x} {y} {color}',
+
+	colorXY: '{color} {x} {y}',
+	colorXYInset: '{color} {x} {y} inset',
+	colorInsetXY: '{color} inset {x} {y}',
+	insetColorXY: 'inset {color} {x} {y}',
+
+	xyBlur: '{x} {y} {blur}',
+	xyBlurInset: '{x} {y} {blur} inset',
+	insetXYBlur: 'inset {x} {y} {blur}',
+
+	xyBlurColor: '{x} {y} {blur} {color}',
+	xyBlurColorInset: '{x} {y} {blur} {color} inset',
+	xyBlurInsetColor: '{x} {y} {blur} inset {color}',
+	insetXYBlurColor: 'inset {x} {y} {blur} {color}',
+
+	colorXYBlur: '{color} {x} {y} {blur}',
+	colorXYBlurInset: '{color} {x} {y} {blur} inset',
+	colorInsetXYBlur: '{color} inset {x} {y} {blur}',
+	insetColorXYBlur: 'inset {color} {x} {y} {blur}',
+
+	xyBlurSpread: '{x} {y} {blur} {spread}',
+	xyBlurSpreadInset: '{x} {y} {blur} {spread} inset',
+	insetXYBlurSpread: 'inset {x} {y} {blur} {spread}',
+
+	xyBlurSpreadColor: '{x} {y} {blur} {spread} {color}',
+	xyBlurSpreadColorInset: '{x} {y} {blur} {spread} {color} inset',
+	xyBlurSpreadInsetColor: '{x} {y} {blur} {spread} inset {color}',
+	insetXYBlurSpreadColor: 'inset {x} {y} {blur} {spread} {color}',
+
+	colorXYBlurSpread: '{color} {x} {y} {blur} {spread}',
+	colorXYBlurSpreadInset: '{color} {x} {y} {blur} {spread} inset',
+	colorInsetXYBlurSpread: '{color} inset {x} {y} {blur} {spread}',
+	insetColorXYBlurSpread: 'inset {color} {x} {y} {blur} {spread}',
+
+	multipleSpaces: '{x}  {y}   {blur} {spread}',
+	upperInset: 'INSET {x} {y} {blur} {spread} {color}',
+};
+
+const invalidShadowFormats = {
+	oneLength: '{x}',
+	multipleLengthGroups1: '{x} {y} {color} {blur}',
+	multipleLengthGroups2: '{x} {y} {blur} {spread} {color} 5px',
+	multipleInsets: 'inset inset {x} {y} {blur} {spread} {color}',
+	multipleColors: '{x} {y} {blur} {spread} {color} {color}',
+};
+
+const combinedShadows = {
+	onePart: '{1}',
+	twoParts: '{1},{2}',
+	twoPartsSpaced: '{1}, {2}',
+	threeParts: '{1},{2},{3}',
+};
+
+const shadowUnits = {
+	px: '1px',
+	em: '1em',
+	rem: '1rem',
+	halfRem: '0.5rem',
+	percent: '1%',
+	halfPercent: '0.5%',
+	ex: '1ex',
+	inch: '1in',
+	cm: '1cm',
+	mm: '1mm',
+	pt: '1pt',
+	pc: '1pc',
+	vh: '1vh',
+	vw: '1vw',
+	vmin: '1vmin',
+	vmax: '1vmax',
+	ch: '1ch',
+	lh: '1lh',
+	zero: '0',
+};
+
+// Data helper functions
+function getShadowString( formatString, values ) {
+	return formatString.replace( /\{(\w+)\}/g, ( match, placeholder ) => {
+		if ( values.hasOwnProperty( placeholder ) ) {
+			return values[ placeholder ];
+		}
+		return match;
+	} );
+}
+function getCombinedShadowString( format, parts ) {
+	return format.replace( /{(\d+)}/g, ( _, index ) => parts[ index - 1 ] );
+}
+
+describe( 'getShadowParts', () => {
+	Object.entries( validShadowFormats ).forEach( ( [ shadowKey, shadow ] ) => {
+		describe( `test shadow format: ${ shadowKey }`, () => {
+			Object.entries( colorFormats ).forEach( ( [ colorKey, color ] ) => {
+				Object.entries( combinedShadows ).forEach(
+					( [ combinedShadowKey, combinedShadow ] ) => {
+						const shadowCount = combinedShadow.split( ',' ).length;
+						const shadowStrings = Array.from(
+							{ length: shadowCount },
+							() =>
+								getShadowString( shadow, {
+									x: '1px',
+									y: '2px',
+									blur: '3px',
+									spread: '4px',
+									color,
+								} )
+						);
+
+						const input = getCombinedShadowString(
+							combinedShadow,
+							shadowStrings
+						);
+						const output = shadowStrings;
+
+						it( `should return shadow parts for ${ colorKey } color and ${ combinedShadowKey } shadow`, () => {
+							const parts = getShadowParts( input );
+							expect( parts ).toEqual( output );
+						} );
+					}
+				);
+			} );
+		} );
+	} );
+} );
+
+describe( 'shadowStringToObject', () => {
+	const defaultShadow = {
+		x: '0',
+		y: '0',
+		blur: '0',
+		spread: '0',
+		color: '#000',
+		inset: false,
+	};
+
+	Object.entries( validShadowFormats ).forEach( ( [ shadowKey, shadow ] ) => {
+		describe( `test shadow format: ${ shadowKey }`, () => {
+			Object.entries( colorFormats ).forEach( ( [ colorKey, color ] ) => {
+				const hasX = shadow.includes( '{x}' );
+				const hasY = shadow.includes( '{y}' );
+				const hasBlur = shadow.includes( '{blur}' );
+				const hasSpread = shadow.includes( '{spread}' );
+				const hasColor = shadow.includes( '{color}' );
+				const hasInset = shadow.toLowerCase().includes( 'inset' );
+
+				const shadowString = getShadowString( shadow, {
+					x: '1px',
+					y: '2px',
+					blur: '3px',
+					spread: '4px',
+					color,
+				} );
+
+				const input = shadowString;
+				const output = {
+					x: hasX ? '1px' : defaultShadow.x,
+					y: hasY ? '2px' : defaultShadow.y,
+					blur: hasBlur ? '3px' : defaultShadow.blur,
+					spread: hasSpread ? '4px' : defaultShadow.spread,
+					color: hasColor ? color : defaultShadow.color,
+					inset: hasInset,
+				};
+
+				it( `should return shadow object for ${ colorKey } color`, () => {
+					const shadowObj = shadowStringToObject( input );
+					expect( shadowObj ).toEqual( output );
+				} );
+			} );
+		} );
+	} );
+
+	describe( `test invalid shadow formats`, () => {
+		const color = colorFormats.hex;
+		Object.entries( invalidShadowFormats ).forEach(
+			( [ shadowKey, shadow ] ) => {
+				const shadowString = getShadowString( shadow, {
+					x: '1px',
+					y: '2px',
+					blur: '3px',
+					spread: '4px',
+					color,
+				} );
+
+				const input = shadowString;
+				const output = defaultShadow;
+
+				it( `should return default shadow object for ${ shadowKey }`, () => {
+					const shadowObj = shadowStringToObject( input );
+					expect( shadowObj ).toEqual( output );
+				} );
+			}
+		);
+	} );
+
+	describe( `test shadow with all units`, () => {
+		const shadow = validShadowFormats.xyBlurSpreadColor;
+		const color = colorFormats.hex;
+
+		Object.entries( shadowUnits ).forEach( ( [ unitKey, unit ] ) => {
+			const shadowString = getShadowString( shadow, {
+				x: unit,
+				y: unit,
+				blur: unit,
+				spread: unit,
+				color,
+			} );
+
+			const input = shadowString;
+			const output = {
+				x: unit,
+				y: unit,
+				blur: unit,
+				spread: unit,
+				color,
+				inset: false,
+			};
+
+			it( `should return shadow object for the unit: ${ unitKey }`, () => {
+				const shadowObj = shadowStringToObject( input );
+				expect( shadowObj ).toEqual( output );
+			} );
+		} );
+	} );
+} );
diff --git a/packages/edit-site/src/components/global-styles/test/utils.spec.js b/packages/edit-site/src/components/global-styles/test/utils.spec.js
new file mode 100644
index 00000000000000..6b07fffbb955db
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/test/utils.spec.js
@@ -0,0 +1,59 @@
+/**
+ * Internal dependencies
+ */
+import { getNewIndexFromPresets } from '../utils';
+
+const validPresets = {
+	single: [ { slug: 'preset-1' } ],
+	multiple: [ { slug: 'preset-1' }, { slug: 'preset-2' } ],
+	withGaps: [ { slug: 'preset-1' }, { slug: 'preset-3' } ],
+	mixedPrefixes: [
+		{ slug: 'preset-1' },
+		{ slug: 'shadow-2' },
+		{ slug: 'preset-3' },
+	],
+	nonStringSlug: [ { slug: 'preset-1' }, { slug: 2 } ],
+	emptyArray: [],
+};
+
+const invalidPresets = {
+	noMatch: [ { slug: 'preset-alpha' }, { slug: 'preset-beta' } ],
+	emptySlug: [ { slug: '' } ],
+	nullSlug: [ { slug: null } ],
+	undefinedSlug: [ { slug: undefined } ],
+	nonObjectElements: [ 'preset-1' ],
+};
+
+const getExpectedIndex = ( presetKey, presets ) => {
+	if ( presetKey === 'withGaps' ) {
+		return 4;
+	}
+	if ( presetKey === 'mixedPrefixes' ) {
+		return 4;
+	}
+	if ( presetKey === 'nonStringSlug' ) {
+		return 2;
+	}
+	return presets.length + 1;
+};
+
+describe( 'getNewIndexFromPresets', () => {
+	Object.entries( validPresets ).forEach( ( [ presetKey, presets ] ) => {
+		describe( `test valid preset format: ${ presetKey }`, () => {
+			const newIndex = getNewIndexFromPresets( presets, 'preset-' );
+			it( `should return correct new index for ${ presetKey }`, () => {
+				const expectedIndex = getExpectedIndex( presetKey, presets );
+				expect( newIndex ).toBe( expectedIndex );
+			} );
+		} );
+	} );
+
+	Object.entries( invalidPresets ).forEach( ( [ presetKey, presets ] ) => {
+		describe( `test invalid preset format: ${ presetKey }`, () => {
+			const newIndex = getNewIndexFromPresets( presets, 'preset-' );
+			it( `should return 1 for ${ presetKey }`, () => {
+				expect( newIndex ).toBe( 1 );
+			} );
+		} );
+	} );
+} );
diff --git a/packages/edit-site/src/components/global-styles/typeset.js b/packages/edit-site/src/components/global-styles/typeset.js
new file mode 100644
index 00000000000000..e99e6a037500ad
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/typeset.js
@@ -0,0 +1,73 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import {
+	__experimentalItemGroup as ItemGroup,
+	__experimentalVStack as VStack,
+	__experimentalHStack as HStack,
+} from '@wordpress/components';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+import { useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import FontLibraryProvider, {
+	FontLibraryContext,
+} from './font-library-modal/context';
+import FontLibraryModal from './font-library-modal';
+import FontFamilyItem from './font-family-item';
+import Subtitle from './subtitle';
+import { getFontFamilies } from './utils';
+import { unlock } from '../../lock-unlock';
+
+const { GlobalStylesContext } = unlock( blockEditorPrivateApis );
+const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );
+
+function Typesets() {
+	const { modalTabOpen, setModalTabOpen } = useContext( FontLibraryContext );
+	const { base } = useContext( GlobalStylesContext );
+	const { user: userConfig } = useContext( GlobalStylesContext );
+	const config = mergeBaseAndUserConfigs( base, userConfig );
+	const allFontFamilies = getFontFamilies( config );
+	const hasFonts =
+		allFontFamilies.filter( ( font ) => font !== null ).length > 0;
+
+	return (
+		hasFonts && (
+			<>
+				{ !! modalTabOpen && (
+					<FontLibraryModal
+						onRequestClose={ () => setModalTabOpen( null ) }
+						defaultTabId={ modalTabOpen }
+					/>
+				) }
+
+				<VStack spacing={ 2 }>
+					<HStack justify="space-between">
+						<Subtitle level={ 3 }>{ __( 'Fonts' ) }</Subtitle>
+					</HStack>
+					<ItemGroup isBordered isSeparated>
+						{ allFontFamilies.map(
+							( font ) =>
+								font && (
+									<FontFamilyItem
+										key={ font.slug }
+										font={ font }
+									/>
+								)
+						) }
+					</ItemGroup>
+				</VStack>
+			</>
+		)
+	);
+}
+
+export default ( { ...props } ) => (
+	<FontLibraryProvider>
+		<Typesets { ...props } />
+	</FontLibraryProvider>
+);
diff --git a/packages/edit-site/src/components/global-styles/typography-elements.js b/packages/edit-site/src/components/global-styles/typography-elements.js
new file mode 100644
index 00000000000000..d087c8df041521
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/typography-elements.js
@@ -0,0 +1,102 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import {
+	__experimentalItemGroup as ItemGroup,
+	__experimentalVStack as VStack,
+	__experimentalHStack as HStack,
+	FlexItem,
+} from '@wordpress/components';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { NavigationButtonAsItem } from './navigation-button';
+import Subtitle from './subtitle';
+
+import { unlock } from '../../lock-unlock';
+const { useGlobalStyle } = unlock( blockEditorPrivateApis );
+
+function ElementItem( { parentMenu, element, label } ) {
+	const prefix =
+		element === 'text' || ! element ? '' : `elements.${ element }.`;
+	const extraStyles =
+		element === 'link'
+			? {
+					textDecoration: 'underline',
+			  }
+			: {};
+	const [ fontFamily ] = useGlobalStyle( prefix + 'typography.fontFamily' );
+	const [ fontStyle ] = useGlobalStyle( prefix + 'typography.fontStyle' );
+	const [ fontWeight ] = useGlobalStyle( prefix + 'typography.fontWeight' );
+	const [ backgroundColor ] = useGlobalStyle( prefix + 'color.background' );
+	const [ fallbackBackgroundColor ] = useGlobalStyle( 'color.background' );
+	const [ gradientValue ] = useGlobalStyle( prefix + 'color.gradient' );
+	const [ color ] = useGlobalStyle( prefix + 'color.text' );
+
+	return (
+		<NavigationButtonAsItem path={ parentMenu + '/typography/' + element }>
+			<HStack justify="flex-start">
+				<FlexItem
+					className="edit-site-global-styles-screen-typography__indicator"
+					style={ {
+						fontFamily: fontFamily ?? 'serif',
+						background:
+							gradientValue ??
+							backgroundColor ??
+							fallbackBackgroundColor,
+						color,
+						fontStyle,
+						fontWeight,
+						...extraStyles,
+					} }
+					aria-hidden="true"
+				>
+					{ __( 'Aa' ) }
+				</FlexItem>
+				<FlexItem>{ label }</FlexItem>
+			</HStack>
+		</NavigationButtonAsItem>
+	);
+}
+
+function TypographyElements() {
+	const parentMenu = '';
+
+	return (
+		<VStack spacing={ 3 }>
+			<Subtitle level={ 3 }>{ __( 'Elements' ) }</Subtitle>
+			<ItemGroup isBordered isSeparated>
+				<ElementItem
+					parentMenu={ parentMenu }
+					element="text"
+					label={ __( 'Text' ) }
+				/>
+				<ElementItem
+					parentMenu={ parentMenu }
+					element="link"
+					label={ __( 'Links' ) }
+				/>
+				<ElementItem
+					parentMenu={ parentMenu }
+					element="heading"
+					label={ __( 'Headings' ) }
+				/>
+				<ElementItem
+					parentMenu={ parentMenu }
+					element="caption"
+					label={ __( 'Captions' ) }
+				/>
+				<ElementItem
+					parentMenu={ parentMenu }
+					element="button"
+					label={ __( 'Buttons' ) }
+				/>
+			</ItemGroup>
+		</VStack>
+	);
+}
+
+export default TypographyElements;
diff --git a/packages/edit-site/src/components/global-styles/typography-example.js b/packages/edit-site/src/components/global-styles/typography-example.js
new file mode 100644
index 00000000000000..a491ca57bf5be4
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/typography-example.js
@@ -0,0 +1,65 @@
+/**
+ * WordPress dependencies
+ */
+import { useContext } from '@wordpress/element';
+import { __unstableMotion as motion } from '@wordpress/components';
+import { _x } from '@wordpress/i18n';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { getFamilyPreviewStyle } from './font-library-modal/utils/preview-styles';
+import { getFontFamilies } from './utils';
+
+const { GlobalStylesContext } = unlock( blockEditorPrivateApis );
+const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );
+
+export default function PreviewTypography( { fontSize, variation } ) {
+	const { base } = useContext( GlobalStylesContext );
+	let config = base;
+	if ( variation ) {
+		config = mergeBaseAndUserConfigs( base, variation );
+	}
+	const [ bodyFontFamilies, headingFontFamilies ] = getFontFamilies( config );
+	const bodyPreviewStyle = bodyFontFamilies
+		? getFamilyPreviewStyle( bodyFontFamilies )
+		: {};
+	const headingPreviewStyle = headingFontFamilies
+		? getFamilyPreviewStyle( headingFontFamilies )
+		: {};
+
+	if ( fontSize ) {
+		bodyPreviewStyle.fontSize = fontSize;
+		headingPreviewStyle.fontSize = fontSize;
+	}
+
+	return (
+		<motion.div
+			animate={ {
+				scale: 1,
+				opacity: 1,
+			} }
+			initial={ {
+				scale: 0.1,
+				opacity: 0,
+			} }
+			transition={ {
+				delay: 0.3,
+				type: 'tween',
+			} }
+			style={ {
+				textAlign: 'center',
+			} }
+		>
+			<span style={ headingPreviewStyle }>
+				{ _x( 'A', 'Uppercase letter A' ) }
+			</span>
+			<span style={ bodyPreviewStyle }>
+				{ _x( 'a', 'Lowercase letter A' ) }
+			</span>
+		</motion.div>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles/typography-preview.js b/packages/edit-site/src/components/global-styles/typography-preview.js
index 91891bb661ca8e..092f4e4e3b05e9 100644
--- a/packages/edit-site/src/components/global-styles/typography-preview.js
+++ b/packages/edit-site/src/components/global-styles/typography-preview.js
@@ -27,6 +27,7 @@ export default function TypographyPreview( { name, element, headingLevel } ) {
 		prefix + 'color.background',
 		name
 	);
+	const [ fallbackBackgroundColor ] = useGlobalStyle( 'color.background' );
 	const [ color ] = useGlobalStyle( prefix + 'color.text', name );
 	const [ fontSize ] = useGlobalStyle( prefix + 'typography.fontSize', name );
 	const [ fontStyle ] = useGlobalStyle(
@@ -53,7 +54,8 @@ export default function TypographyPreview( { name, element, headingLevel } ) {
 			className="edit-site-typography-preview"
 			style={ {
 				fontFamily: fontFamily ?? 'serif',
-				background: gradientValue ?? backgroundColor,
+				background:
+					gradientValue ?? backgroundColor ?? fallbackBackgroundColor,
 				color,
 				fontSize,
 				fontStyle,
diff --git a/packages/edit-site/src/components/global-styles/typogrphy-elements.js b/packages/edit-site/src/components/global-styles/typogrphy-elements.js
deleted file mode 100644
index 70a61ce3f1fdb2..00000000000000
--- a/packages/edit-site/src/components/global-styles/typogrphy-elements.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, sprintf } from '@wordpress/i18n';
-import {
-	__experimentalItemGroup as ItemGroup,
-	__experimentalVStack as VStack,
-	__experimentalHStack as HStack,
-	FlexItem,
-} from '@wordpress/components';
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
-import { NavigationButtonAsItem } from './navigation-button';
-import Subtitle from './subtitle';
-
-import { unlock } from '../../lock-unlock';
-const { useGlobalStyle } = unlock( blockEditorPrivateApis );
-
-function ElementItem( { parentMenu, element, label } ) {
-	const prefix =
-		element === 'text' || ! element ? '' : `elements.${ element }.`;
-	const extraStyles =
-		element === 'link'
-			? {
-					textDecoration: 'underline',
-			  }
-			: {};
-	const [ fontFamily ] = useGlobalStyle( prefix + 'typography.fontFamily' );
-	const [ fontStyle ] = useGlobalStyle( prefix + 'typography.fontStyle' );
-	const [ fontWeight ] = useGlobalStyle( prefix + 'typography.fontWeight' );
-	const [ letterSpacing ] = useGlobalStyle(
-		prefix + 'typography.letterSpacing'
-	);
-	const [ backgroundColor ] = useGlobalStyle( prefix + 'color.background' );
-	const [ gradientValue ] = useGlobalStyle( prefix + 'color.gradient' );
-	const [ color ] = useGlobalStyle( prefix + 'color.text' );
-
-	const navigationButtonLabel = sprintf(
-		// translators: %s: is a subset of Typography, e.g., 'text' or 'links'.
-		__( 'Typography %s styles' ),
-		label
-	);
-
-	return (
-		<NavigationButtonAsItem
-			path={ parentMenu + '/typography/' + element }
-			aria-label={ navigationButtonLabel }
-		>
-			<HStack justify="flex-start">
-				<FlexItem
-					className="edit-site-global-styles-screen-typography__indicator"
-					style={ {
-						fontFamily: fontFamily ?? 'serif',
-						background: gradientValue ?? backgroundColor,
-						color,
-						fontStyle,
-						fontWeight,
-						letterSpacing,
-						...extraStyles,
-					} }
-				>
-					{ __( 'Aa' ) }
-				</FlexItem>
-				<FlexItem>{ label }</FlexItem>
-			</HStack>
-		</NavigationButtonAsItem>
-	);
-}
-
-function TypographyElements() {
-	const parentMenu = '';
-
-	return (
-		<VStack spacing={ 3 }>
-			<Subtitle level={ 3 }>{ __( 'Elements' ) }</Subtitle>
-			<ItemGroup isBordered isSeparated>
-				<ElementItem
-					parentMenu={ parentMenu }
-					element="text"
-					label={ __( 'Text' ) }
-				/>
-				<ElementItem
-					parentMenu={ parentMenu }
-					element="link"
-					label={ __( 'Links' ) }
-				/>
-				<ElementItem
-					parentMenu={ parentMenu }
-					element="heading"
-					label={ __( 'Headings' ) }
-				/>
-				<ElementItem
-					parentMenu={ parentMenu }
-					element="caption"
-					label={ __( 'Captions' ) }
-				/>
-				<ElementItem
-					parentMenu={ parentMenu }
-					element="button"
-					label={ __( 'Buttons' ) }
-				/>
-			</ItemGroup>
-		</VStack>
-	);
-}
-
-export default TypographyElements;
diff --git a/packages/edit-site/src/components/global-styles/ui.js b/packages/edit-site/src/components/global-styles/ui.js
index c8d72205c3bed8..9ca88f40f1f001 100644
--- a/packages/edit-site/src/components/global-styles/ui.js
+++ b/packages/edit-site/src/components/global-styles/ui.js
@@ -2,11 +2,9 @@
  * WordPress dependencies
  */
 import {
-	__experimentalNavigatorProvider as NavigatorProvider,
-	__experimentalNavigatorScreen as NavigatorScreen,
-	__experimentalUseNavigator as useNavigator,
+	Navigator,
+	useNavigator,
 	createSlotFill,
-	Button,
 	DropdownMenu,
 	MenuGroup,
 	MenuItem,
@@ -19,7 +17,7 @@ import {
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { backup, moreVertical } from '@wordpress/icons';
+import { moreVertical } from '@wordpress/icons';
 import { store as coreStore } from '@wordpress/core-data';
 import { useEffect } from '@wordpress/element';
 
@@ -34,8 +32,12 @@ import {
 import ScreenBlock from './screen-block';
 import ScreenTypography from './screen-typography';
 import ScreenTypographyElement from './screen-typography-element';
+import FontSize from './font-sizes/font-size';
+import FontSizes from './font-sizes/font-sizes';
 import ScreenColors from './screen-colors';
 import ScreenColorPalette from './screen-color-palette';
+import ScreenBackground from './screen-background';
+import { ScreenShadows, ScreenShadowsEdit } from './screen-shadows';
 import ScreenLayout from './screen-layout';
 import ScreenStyleVariations from './screen-style-variations';
 import StyleBook from '../style-book';
@@ -43,6 +45,7 @@ import ScreenCSS from './screen-css';
 import ScreenRevisions from './screen-revisions';
 import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
+import { STYLE_BOOK_COLOR_GROUPS } from '../style-book/constants';
 
 const SLOT_FILL_NAME = 'GlobalStylesMenu';
 const { useGlobalStylesReset } = unlock( blockEditorPrivateApis );
@@ -68,15 +71,17 @@ function GlobalStylesActionMenu() {
 	const { setEditorCanvasContainerView } = unlock(
 		useDispatch( editSiteStore )
 	);
-	const { goTo } = useNavigator();
 	const loadCustomCSS = () => {
 		setEditorCanvasContainerView( 'global-styles-css' );
-		goTo( '/css' );
 	};
 
 	return (
 		<GlobalStylesMenuFill>
-			<DropdownMenu icon={ moreVertical } label={ __( 'More' ) }>
+			<DropdownMenu
+				icon={ moreVertical }
+				label={ __( 'More' ) }
+				toggleProps={ { size: 'compact' } }
+			>
 				{ ( { onClose } ) => (
 					<>
 						<MenuGroup>
@@ -115,61 +120,9 @@ function GlobalStylesActionMenu() {
 	);
 }
 
-function GlobalStylesRevisionsMenu() {
-	const { setIsListViewOpened } = useDispatch( editSiteStore );
-	const { revisionsCount } = useSelect( ( select ) => {
-		const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =
-			select( coreStore );
-
-		const globalStylesId = __experimentalGetCurrentGlobalStylesId();
-		const globalStyles = globalStylesId
-			? getEntityRecord( 'root', 'globalStyles', globalStylesId )
-			: undefined;
-
-		return {
-			revisionsCount:
-				globalStyles?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0,
-		};
-	}, [] );
-	const { goTo } = useNavigator();
-	const { setEditorCanvasContainerView } = unlock(
-		useDispatch( editSiteStore )
-	);
-	const isRevisionsOpened = useSelect(
-		( select ) =>
-			'global-styles-revisions' ===
-			unlock( select( editSiteStore ) ).getEditorCanvasContainerView(),
-		[]
-	);
-	const loadRevisions = () => {
-		setIsListViewOpened( false );
-
-		if ( ! isRevisionsOpened ) {
-			goTo( '/revisions' );
-			setEditorCanvasContainerView( 'global-styles-revisions' );
-		} else {
-			goTo( '/' );
-			setEditorCanvasContainerView( undefined );
-		}
-	};
-	const hasRevisions = revisionsCount > 0;
-
-	return (
-		<GlobalStylesMenuFill>
-			<Button
-				label={ __( 'Revisions' ) }
-				icon={ backup }
-				onClick={ loadRevisions }
-				disabled={ ! hasRevisions }
-				isPressed={ isRevisionsOpened }
-			/>
-		</GlobalStylesMenuFill>
-	);
-}
-
 function GlobalStylesNavigationScreen( { className, ...props } ) {
 	return (
-		<NavigatorScreen
+		<Navigator.Screen
 			className={ [
 				'edit-site-global-styles-sidebar__navigator-screen',
 				className,
@@ -239,6 +192,16 @@ function GlobalStylesStyleBook() {
 				)
 			}
 			onSelect={ ( blockName ) => {
+				if (
+					STYLE_BOOK_COLOR_GROUPS.find(
+						( group ) => group.slug === blockName
+					)
+				) {
+					// Go to color palettes Global Styles.
+					navigator.goTo( '/colors/palette' );
+					return;
+				}
+
 				// Now go to the selected block.
 				navigator.goTo( '/blocks/' + encodeURIComponent( blockName ) );
 			} }
@@ -289,31 +252,43 @@ function GlobalStylesEditorCanvasContainerLink() {
 			unlock( select( editSiteStore ) ).getEditorCanvasContainerView(),
 		[]
 	);
+	const path = location?.path;
+	const isRevisionsOpen = path === '/revisions';
 
 	// If the user switches the editor canvas container view, redirect
 	// to the appropriate screen. This effectively allows deep linking to the
 	// desired screens from outside the global styles navigation provider.
 	useEffect( () => {
-		if ( editorCanvasContainerView === 'global-styles-revisions' ) {
-			// Switching to the revisions container view should
-			// redirect to the revisions screen.
-			goTo( '/revisions' );
-		} else if (
-			!! editorCanvasContainerView &&
-			location?.path === '/revisions'
-		) {
-			// Switching to any container other than revisions should
-			// redirect from the revisions screen to the root global styles screen.
-			goTo( '/' );
-		} else if ( editorCanvasContainerView === 'global-styles-css' ) {
-			goTo( '/css' );
+		switch ( editorCanvasContainerView ) {
+			case 'global-styles-revisions':
+			case 'global-styles-revisions:style-book':
+				if ( ! isRevisionsOpen ) {
+					goTo( '/revisions' );
+				}
+				break;
+			case 'global-styles-css':
+				goTo( '/css' );
+				break;
+			// The stand-alone style book is open
+			// and the revisions panel is open,
+			// close the revisions panel.
+			// Otherwise keep the style book open while
+			// browsing global styles panel.
+			//
+			// Falling through as it matches the default scenario.
+			case 'style-book':
+			default:
+				// In general, if the revision screen is in view but the
+				// `editorCanvasContainerView` is not a revision view, close it.
+				// This also includes the scenario when the stand-alone style
+				// book is open, in which case we want the user to close the
+				// revisions screen and browse global styles.
+				if ( isRevisionsOpen ) {
+					goTo( '/', { isBack: true } );
+				}
+				break;
 		}
-
-		// location?.path is not a dependency because we don't want to track it.
-		// Doing so will cause an infinite loop. We could abstract logic to avoid
-		// having to disable the check later.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [ editorCanvasContainerView, goTo ] );
+	}, [ editorCanvasContainerView, isRevisionsOpen, goTo ] );
 }
 
 function GlobalStylesUI() {
@@ -324,7 +299,7 @@ function GlobalStylesUI() {
 		[]
 	);
 	return (
-		<NavigatorProvider
+		<Navigator
 			className="edit-site-global-styles-sidebar__navigator-provider"
 			initialPath="/"
 		>
@@ -344,6 +319,14 @@ function GlobalStylesUI() {
 				<ScreenTypography />
 			</GlobalStylesNavigationScreen>
 
+			<GlobalStylesNavigationScreen path="/typography/font-sizes">
+				<FontSizes />
+			</GlobalStylesNavigationScreen>
+
+			<GlobalStylesNavigationScreen path="/typography/font-sizes/:origin/:slug">
+				<FontSize />
+			</GlobalStylesNavigationScreen>
+
 			<GlobalStylesNavigationScreen path="/typography/text">
 				<ScreenTypographyElement element="text" />
 			</GlobalStylesNavigationScreen>
@@ -368,6 +351,14 @@ function GlobalStylesUI() {
 				<ScreenColors />
 			</GlobalStylesNavigationScreen>
 
+			<GlobalStylesNavigationScreen path="/shadows">
+				<ScreenShadows />
+			</GlobalStylesNavigationScreen>
+
+			<GlobalStylesNavigationScreen path="/shadows/edit/:category/:slug">
+				<ScreenShadowsEdit />
+			</GlobalStylesNavigationScreen>
+
 			<GlobalStylesNavigationScreen path="/layout">
 				<ScreenLayout />
 			</GlobalStylesNavigationScreen>
@@ -376,10 +367,14 @@ function GlobalStylesUI() {
 				<ScreenCSS />
 			</GlobalStylesNavigationScreen>
 
-			<GlobalStylesNavigationScreen path={ '/revisions' }>
+			<GlobalStylesNavigationScreen path="/revisions">
 				<ScreenRevisions />
 			</GlobalStylesNavigationScreen>
 
+			<GlobalStylesNavigationScreen path="/background">
+				<ScreenBackground />
+			</GlobalStylesNavigationScreen>
+
 			{ blocks.map( ( block ) => (
 				<GlobalStylesNavigationScreen
 					key={ 'menu-block-' + block.name }
@@ -403,11 +398,10 @@ function GlobalStylesUI() {
 				<GlobalStylesStyleBook />
 			) }
 
-			<GlobalStylesRevisionsMenu />
 			<GlobalStylesActionMenu />
 			<GlobalStylesBlockLink />
 			<GlobalStylesEditorCanvasContainerLink />
-		</NavigatorProvider>
+		</Navigator>
 	);
 }
 export { GlobalStylesMenuSlot };
diff --git a/packages/edit-site/src/components/global-styles/utils.js b/packages/edit-site/src/components/global-styles/utils.js
index 05a004b878e5f9..66a25854a06fe1 100644
--- a/packages/edit-site/src/components/global-styles/utils.js
+++ b/packages/edit-site/src/components/global-styles/utils.js
@@ -10,3 +10,79 @@ export function getVariationClassName( variation ) {
 	}
 	return `is-style-${ variation }`;
 }
+
+/**
+ * Iterates through the presets array and searches for slugs that start with the specified
+ * slugPrefix followed by a numerical suffix. It identifies the highest numerical suffix found
+ * and returns one greater than the highest found suffix, ensuring that the new index is unique.
+ *
+ * @param {Array}  presets    The array of preset objects, each potentially containing a slug property.
+ * @param {string} slugPrefix The prefix to look for in the preset slugs.
+ *
+ * @return {number} The next available index for a preset with the specified slug prefix, or 1 if no matching slugs are found.
+ */
+export function getNewIndexFromPresets( presets, slugPrefix ) {
+	const nameRegex = new RegExp( `^${ slugPrefix }([\\d]+)$` );
+	const highestPresetValue = presets.reduce( ( currentHighest, preset ) => {
+		if ( typeof preset?.slug === 'string' ) {
+			const matches = preset?.slug.match( nameRegex );
+			if ( matches ) {
+				const id = parseInt( matches[ 1 ], 10 );
+				if ( id > currentHighest ) {
+					return id;
+				}
+			}
+		}
+		return currentHighest;
+	}, 0 );
+	return highestPresetValue + 1;
+}
+
+function getFontFamilyFromSetting( fontFamilies, setting ) {
+	if ( ! Array.isArray( fontFamilies ) || ! setting ) {
+		return null;
+	}
+
+	const fontFamilyVariable = setting.replace( 'var(', '' ).replace( ')', '' );
+	const fontFamilySlug = fontFamilyVariable?.split( '--' ).slice( -1 )[ 0 ];
+
+	return fontFamilies.find(
+		( fontFamily ) => fontFamily.slug === fontFamilySlug
+	);
+}
+
+export function getFontFamilies( themeJson ) {
+	const themeFontFamilies =
+		themeJson?.settings?.typography?.fontFamilies?.theme;
+	const customFontFamilies =
+		themeJson?.settings?.typography?.fontFamilies?.custom;
+
+	let fontFamilies = [];
+	if ( themeFontFamilies && customFontFamilies ) {
+		fontFamilies = [ ...themeFontFamilies, ...customFontFamilies ];
+	} else if ( themeFontFamilies ) {
+		fontFamilies = themeFontFamilies;
+	} else if ( customFontFamilies ) {
+		fontFamilies = customFontFamilies;
+	}
+	const bodyFontFamilySetting = themeJson?.styles?.typography?.fontFamily;
+	const bodyFontFamily = getFontFamilyFromSetting(
+		fontFamilies,
+		bodyFontFamilySetting
+	);
+
+	const headingFontFamilySetting =
+		themeJson?.styles?.elements?.heading?.typography?.fontFamily;
+
+	let headingFontFamily;
+	if ( ! headingFontFamilySetting ) {
+		headingFontFamily = bodyFontFamily;
+	} else {
+		headingFontFamily = getFontFamilyFromSetting(
+			fontFamilies,
+			themeJson?.styles?.elements?.heading?.typography?.fontFamily
+		);
+	}
+
+	return [ bodyFontFamily, headingFontFamily ];
+}
diff --git a/packages/edit-site/src/components/global-styles/variations-panel.js b/packages/edit-site/src/components/global-styles/variations-panel.js
deleted file mode 100644
index 823e27038defb1..00000000000000
--- a/packages/edit-site/src/components/global-styles/variations-panel.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { store as blocksStore } from '@wordpress/blocks';
-import { useSelect } from '@wordpress/data';
-import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
-/**
- * Internal dependencies
- */
-
-import { NavigationButtonAsItem } from './navigation-button';
-
-function getCoreBlockStyles( blockStyles ) {
-	return blockStyles?.filter( ( style ) => style.source === 'block' );
-}
-
-export function useBlockVariations( name ) {
-	const blockStyles = useSelect(
-		( select ) => {
-			const { getBlockStyles } = select( blocksStore );
-			return getBlockStyles( name );
-		},
-		[ name ]
-	);
-	const coreBlockStyles = getCoreBlockStyles( blockStyles );
-	return coreBlockStyles;
-}
-
-export function VariationsPanel( { name } ) {
-	const coreBlockStyles = useBlockVariations( name );
-
-	return (
-		<ItemGroup isBordered isSeparated>
-			{ coreBlockStyles.map( ( style, index ) => {
-				if ( style?.isDefault ) {
-					return null;
-				}
-				return (
-					<NavigationButtonAsItem
-						key={ index }
-						path={
-							'/blocks/' +
-							encodeURIComponent( name ) +
-							'/variations/' +
-							encodeURIComponent( style.name )
-						}
-						aria-label={ style.label }
-					>
-						{ style.label }
-					</NavigationButtonAsItem>
-				);
-			} ) }
-		</ItemGroup>
-	);
-}
diff --git a/packages/edit-site/src/components/global-styles/variations/style.scss b/packages/edit-site/src/components/global-styles/variations/style.scss
new file mode 100644
index 00000000000000..5f57c72f180b12
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/variations/style.scss
@@ -0,0 +1,39 @@
+.edit-site-global-styles-variations_item {
+	box-sizing: border-box;
+	// To round the outline in Windows 10 high contrast mode.
+	cursor: pointer;
+
+	.edit-site-global-styles-variations_item-preview {
+		border-radius: $radius-small;
+		outline: $border-width solid rgba($black, 0.1);
+		outline-offset: -$border-width;
+		overflow: hidden;
+		position: relative;
+		// Add the same transition that block style variations and other buttons have.
+		transition: outline 0.1s linear;
+		@include reduce-motion("transition");
+
+		&.is-pill {
+			height: $button-size-compact;
+
+			.block-editor-iframe__scale-container {
+				overflow: hidden;
+			}
+		}
+	}
+
+	&:not(.is-active):hover .edit-site-global-styles-variations_item-preview {
+		outline-color: rgba($black, 0.3);
+	}
+
+	&.is-active .edit-site-global-styles-variations_item-preview,
+	&:focus-visible .edit-site-global-styles-variations_item-preview {
+		outline-color: $gray-900;
+		outline-offset: $border-width;
+		outline-width: var(--wp-admin-border-width-focus);
+	}
+
+	&:focus-visible .edit-site-global-styles-variations_item-preview {
+		outline-color: var(--wp-admin-theme-color);
+	}
+}
diff --git a/packages/edit-site/src/components/global-styles/variations/variation.js b/packages/edit-site/src/components/global-styles/variations/variation.js
new file mode 100644
index 00000000000000..48cbe0f19e7ab0
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/variations/variation.js
@@ -0,0 +1,108 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { Tooltip } from '@wordpress/components';
+import { useMemo, useContext, useState } from '@wordpress/element';
+import { ENTER } from '@wordpress/keycodes';
+import { __, sprintf } from '@wordpress/i18n';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+
+/**
+ * Internal dependencies
+ */
+import { filterObjectByProperties } from '../../../hooks/use-theme-style-variations/use-theme-style-variations-by-property';
+import { unlock } from '../../../lock-unlock';
+
+const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );
+const { GlobalStylesContext, areGlobalStyleConfigsEqual } = unlock(
+	blockEditorPrivateApis
+);
+
+export default function Variation( {
+	variation,
+	children,
+	isPill,
+	properties,
+	showTooltip,
+} ) {
+	const [ isFocused, setIsFocused ] = useState( false );
+	const { base, user, setUserConfig } = useContext( GlobalStylesContext );
+
+	const context = useMemo( () => {
+		let merged = mergeBaseAndUserConfigs( base, variation );
+		if ( properties ) {
+			merged = filterObjectByProperties( merged, properties );
+		}
+		return {
+			user: variation,
+			base,
+			merged,
+			setUserConfig: () => {},
+		};
+	}, [ variation, base, properties ] );
+
+	const selectVariation = () => setUserConfig( variation );
+
+	const selectOnEnter = ( event ) => {
+		if ( event.keyCode === ENTER ) {
+			event.preventDefault();
+			selectVariation();
+		}
+	};
+
+	const isActive = useMemo(
+		() => areGlobalStyleConfigsEqual( user, variation ),
+		[ user, variation ]
+	);
+
+	let label = variation?.title;
+	if ( variation?.description ) {
+		label = sprintf(
+			/* translators: %1$s: variation title. %2$s variation description. */
+			__( '%1$s (%2$s)' ),
+			variation?.title,
+			variation?.description
+		);
+	}
+
+	const content = (
+		<div
+			className={ clsx( 'edit-site-global-styles-variations_item', {
+				'is-active': isActive,
+			} ) }
+			role="button"
+			onClick={ selectVariation }
+			onKeyDown={ selectOnEnter }
+			tabIndex="0"
+			aria-label={ label }
+			aria-current={ isActive }
+			onFocus={ () => setIsFocused( true ) }
+			onBlur={ () => setIsFocused( false ) }
+		>
+			<div
+				className={ clsx(
+					'edit-site-global-styles-variations_item-preview',
+					{ 'is-pill': isPill }
+				) }
+			>
+				{ children( isFocused ) }
+			</div>
+		</div>
+	);
+
+	return (
+		<GlobalStylesContext.Provider value={ context }>
+			{ showTooltip ? (
+				<Tooltip text={ variation?.title }>{ content }</Tooltip>
+			) : (
+				content
+			) }
+		</GlobalStylesContext.Provider>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles/variations/variations-color.js b/packages/edit-site/src/components/global-styles/variations/variations-color.js
new file mode 100644
index 00000000000000..5d6852c990f3f2
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/variations/variations-color.js
@@ -0,0 +1,45 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalGrid as Grid,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import StylesPreviewColors from '../preview-colors';
+import { useCurrentMergeThemeStyleVariationsWithUserConfig } from '../../../hooks/use-theme-style-variations/use-theme-style-variations-by-property';
+import Subtitle from '../subtitle';
+import Variation from './variation';
+
+export default function ColorVariations( { title, gap = 2 } ) {
+	const propertiesToFilter = [ 'color' ];
+	const colorVariations =
+		useCurrentMergeThemeStyleVariationsWithUserConfig( propertiesToFilter );
+
+	// Return null if there is only one variation (the default).
+	if ( colorVariations?.length <= 1 ) {
+		return null;
+	}
+
+	return (
+		<VStack spacing={ 3 }>
+			{ title && <Subtitle level={ 3 }>{ title }</Subtitle> }
+			<Grid spacing={ gap }>
+				{ colorVariations.map( ( variation, index ) => (
+					<Variation
+						key={ index }
+						variation={ variation }
+						isPill
+						properties={ propertiesToFilter }
+						showTooltip
+					>
+						{ () => <StylesPreviewColors /> }
+					</Variation>
+				) ) }
+			</Grid>
+		</VStack>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles/variations/variations-panel.js b/packages/edit-site/src/components/global-styles/variations/variations-panel.js
new file mode 100644
index 00000000000000..22f2f50c58e24f
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/variations/variations-panel.js
@@ -0,0 +1,65 @@
+/**
+ * WordPress dependencies
+ */
+import { store as blocksStore } from '@wordpress/blocks';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { NavigationButtonAsItem } from '../navigation-button';
+import { unlock } from '../../../lock-unlock';
+
+const { useGlobalStyle } = unlock( blockEditorPrivateApis );
+
+// Only core block styles (source === block) or block styles with a matching
+// theme.json style variation will be configurable via Global Styles.
+function getFilteredBlockStyles( blockStyles, variations ) {
+	return blockStyles?.filter(
+		( style ) =>
+			style.source === 'block' || variations.includes( style.name )
+	);
+}
+
+export function useBlockVariations( name ) {
+	const blockStyles = useSelect(
+		( select ) => {
+			const { getBlockStyles } = select( blocksStore );
+			return getBlockStyles( name );
+		},
+		[ name ]
+	);
+	const [ variations ] = useGlobalStyle( 'variations', name );
+	const variationNames = Object.keys( variations ?? {} );
+
+	return getFilteredBlockStyles( blockStyles, variationNames );
+}
+
+export function VariationsPanel( { name } ) {
+	const coreBlockStyles = useBlockVariations( name );
+
+	return (
+		<ItemGroup isBordered isSeparated>
+			{ coreBlockStyles.map( ( style, index ) => {
+				if ( style?.isDefault ) {
+					return null;
+				}
+				return (
+					<NavigationButtonAsItem
+						key={ index }
+						path={
+							'/blocks/' +
+							encodeURIComponent( name ) +
+							'/variations/' +
+							encodeURIComponent( style.name )
+						}
+					>
+						{ style.label }
+					</NavigationButtonAsItem>
+				);
+			} ) }
+		</ItemGroup>
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles/variations/variations-typography.js b/packages/edit-site/src/components/global-styles/variations/variations-typography.js
new file mode 100644
index 00000000000000..65e84a9d965ffe
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/variations/variations-typography.js
@@ -0,0 +1,54 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalGrid as Grid,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import StylesPreviewTypography from '../preview-typography';
+import { useCurrentMergeThemeStyleVariationsWithUserConfig } from '../../../hooks/use-theme-style-variations/use-theme-style-variations-by-property';
+import Subtitle from '../subtitle';
+import Variation from './variation';
+
+export default function TypographyVariations( { title, gap = 2 } ) {
+	const propertiesToFilter = [ 'typography' ];
+	const typographyVariations =
+		useCurrentMergeThemeStyleVariationsWithUserConfig( propertiesToFilter );
+
+	// Return null if there is only one variation (the default).
+	if ( typographyVariations?.length <= 1 ) {
+		return null;
+	}
+
+	return (
+		<VStack spacing={ 3 }>
+			{ title && <Subtitle level={ 3 }>{ title }</Subtitle> }
+			<Grid
+				columns={ 3 }
+				gap={ gap }
+				className="edit-site-global-styles-style-variations-container"
+			>
+				{ typographyVariations.map( ( variation, index ) => {
+					return (
+						<Variation
+							key={ index }
+							variation={ variation }
+							properties={ propertiesToFilter }
+							showTooltip
+						>
+							{ () => (
+								<StylesPreviewTypography
+									variation={ variation }
+								/>
+							) }
+						</Variation>
+					);
+				} ) }
+			</Grid>
+		</VStack>
+	);
+}
diff --git a/packages/edit-site/src/components/header-edit-mode/document-tools/index.js b/packages/edit-site/src/components/header-edit-mode/document-tools/index.js
deleted file mode 100644
index f0231e1e621169..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/document-tools/index.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useCallback, useRef } from '@wordpress/element';
-import { useViewportMatch } from '@wordpress/compose';
-import {
-	ToolSelector,
-	NavigableToolbar,
-	store as blockEditorStore,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { _x, __ } from '@wordpress/i18n';
-import { listView, plus, chevronUpDown } from '@wordpress/icons';
-import { Button, ToolbarItem } from '@wordpress/components';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-
-/**
- * Internal dependencies
- */
-import UndoButton from '../undo-redo/undo';
-import RedoButton from '../undo-redo/redo';
-import { store as editSiteStore } from '../../../store';
-import { unlock } from '../../../lock-unlock';
-
-const { useShouldContextualToolbarShow } = unlock( blockEditorPrivateApis );
-
-const preventDefault = ( event ) => {
-	event.preventDefault();
-};
-
-export default function DocumentTools( {
-	blockEditorMode,
-	hasFixedToolbar,
-	isDistractionFree,
-	showIconLabels,
-	setListViewToggleElement,
-} ) {
-	const inserterButton = useRef();
-	const { isInserterOpen, isListViewOpen, listViewShortcut, isVisualMode } =
-		useSelect( ( select ) => {
-			const {
-				__experimentalGetPreviewDeviceType,
-				isInserterOpened,
-				isListViewOpened,
-				getEditorMode,
-			} = select( editSiteStore );
-			const { getShortcutRepresentation } = select(
-				keyboardShortcutsStore
-			);
-
-			return {
-				deviceType: __experimentalGetPreviewDeviceType(),
-				isInserterOpen: isInserterOpened(),
-				isListViewOpen: isListViewOpened(),
-				listViewShortcut: getShortcutRepresentation(
-					'core/edit-site/toggle-list-view'
-				),
-				isVisualMode: getEditorMode() === 'visual',
-			};
-		}, [] );
-
-	const {
-		__experimentalSetPreviewDeviceType: setPreviewDeviceType,
-		setIsInserterOpened,
-		setIsListViewOpened,
-	} = useDispatch( editSiteStore );
-	const { __unstableSetEditorMode } = useDispatch( blockEditorStore );
-
-	const isLargeViewport = useViewportMatch( 'medium' );
-
-	const toggleInserter = useCallback( () => {
-		if ( isInserterOpen ) {
-			// Focusing the inserter button should close the inserter popover.
-			// However, there are some cases it won't close when the focus is lost.
-			// See https://github.com/WordPress/gutenberg/issues/43090 for more details.
-			inserterButton.current.focus();
-			setIsInserterOpened( false );
-		} else {
-			setIsInserterOpened( true );
-		}
-	}, [ isInserterOpen, setIsInserterOpened ] );
-
-	const toggleListView = useCallback(
-		() => setIsListViewOpened( ! isListViewOpen ),
-		[ setIsListViewOpened, isListViewOpen ]
-	);
-
-	const {
-		shouldShowContextualToolbar,
-		canFocusHiddenToolbar,
-		fixedToolbarCanBeFocused,
-	} = useShouldContextualToolbarShow();
-	// If there's a block toolbar to be focused, disable the focus shortcut for the document toolbar.
-	// There's a fixed block toolbar when the fixed toolbar option is enabled or when the browser width is less than the large viewport.
-	const blockToolbarCanBeFocused =
-		shouldShowContextualToolbar ||
-		canFocusHiddenToolbar ||
-		fixedToolbarCanBeFocused;
-
-	/* translators: button label text should, if possible, be under 16 characters. */
-	const longLabel = _x(
-		'Toggle block inserter',
-		'Generic label for block inserter button'
-	);
-	const shortLabel = ! isInserterOpen ? __( 'Add' ) : __( 'Close' );
-
-	const isZoomedOutViewExperimentEnabled =
-		window?.__experimentalEnableZoomedOutView && isVisualMode;
-	const isZoomedOutView = blockEditorMode === 'zoom-out';
-
-	return (
-		<NavigableToolbar
-			className="edit-site-header-edit-mode__document-tools"
-			aria-label={ __( 'Document tools' ) }
-			shouldUseKeyboardFocusShortcut={ ! blockToolbarCanBeFocused }
-		>
-			<div className="edit-site-header-edit-mode__toolbar">
-				{ ! isDistractionFree && (
-					<ToolbarItem
-						ref={ inserterButton }
-						as={ Button }
-						className="edit-site-header-edit-mode__inserter-toggle"
-						variant="primary"
-						isPressed={ isInserterOpen }
-						onMouseDown={ preventDefault }
-						onClick={ toggleInserter }
-						disabled={ ! isVisualMode }
-						icon={ plus }
-						label={ showIconLabels ? shortLabel : longLabel }
-						showTooltip={ ! showIconLabels }
-						aria-expanded={ isInserterOpen }
-						size="compact"
-					/>
-				) }
-				{ isLargeViewport && (
-					<>
-						{ ! hasFixedToolbar && (
-							<ToolbarItem
-								as={ ToolSelector }
-								showTooltip={ ! showIconLabels }
-								variant={
-									showIconLabels ? 'tertiary' : undefined
-								}
-								disabled={ ! isVisualMode }
-								size="compact"
-							/>
-						) }
-						<ToolbarItem
-							as={ UndoButton }
-							showTooltip={ ! showIconLabels }
-							variant={ showIconLabels ? 'tertiary' : undefined }
-							size="compact"
-						/>
-						<ToolbarItem
-							as={ RedoButton }
-							showTooltip={ ! showIconLabels }
-							variant={ showIconLabels ? 'tertiary' : undefined }
-							size="compact"
-						/>
-						{ ! isDistractionFree && (
-							<ToolbarItem
-								as={ Button }
-								className="edit-site-header-edit-mode__list-view-toggle"
-								disabled={ ! isVisualMode || isZoomedOutView }
-								icon={ listView }
-								isPressed={ isListViewOpen }
-								/* translators: button label text should, if possible, be under 16 characters. */
-								label={ __( 'List View' ) }
-								onClick={ toggleListView }
-								ref={ setListViewToggleElement }
-								shortcut={ listViewShortcut }
-								showTooltip={ ! showIconLabels }
-								variant={
-									showIconLabels ? 'tertiary' : undefined
-								}
-								aria-expanded={ isListViewOpen }
-								size="compact"
-							/>
-						) }
-						{ isZoomedOutViewExperimentEnabled &&
-							! isDistractionFree &&
-							! hasFixedToolbar && (
-								<ToolbarItem
-									as={ Button }
-									className="edit-site-header-edit-mode__zoom-out-view-toggle"
-									icon={ chevronUpDown }
-									isPressed={ isZoomedOutView }
-									/* translators: button label text should, if possible, be under 16 characters. */
-									label={ __( 'Zoom-out View' ) }
-									onClick={ () => {
-										setPreviewDeviceType( 'Desktop' );
-										__unstableSetEditorMode(
-											isZoomedOutView
-												? 'edit'
-												: 'zoom-out'
-										);
-									} }
-									size="compact"
-								/>
-							) }
-					</>
-				) }
-			</div>
-		</NavigableToolbar>
-	);
-}
diff --git a/packages/edit-site/src/components/header-edit-mode/index.js b/packages/edit-site/src/components/header-edit-mode/index.js
deleted file mode 100644
index f8a9d9d4e892bd..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/index.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { useViewportMatch, useReducedMotion } from '@wordpress/compose';
-import { store as coreStore } from '@wordpress/core-data';
-import {
-	__experimentalPreviewOptions as PreviewOptions,
-	privateApis as blockEditorPrivateApis,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useEffect, useRef, useState } from '@wordpress/element';
-import { PinnedItems } from '@wordpress/interface';
-import { __ } from '@wordpress/i18n';
-import { external, next, previous } from '@wordpress/icons';
-import {
-	Button,
-	__unstableMotion as motion,
-	MenuGroup,
-	MenuItem,
-	Popover,
-	VisuallyHidden,
-} from '@wordpress/components';
-import { store as preferencesStore } from '@wordpress/preferences';
-import { DocumentBar } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import MoreMenu from './more-menu';
-import SaveButton from '../save-button';
-import DocumentTools from './document-tools';
-import { store as editSiteStore } from '../../store';
-import {
-	getEditorCanvasContainerTitle,
-	useHasEditorCanvasContainer,
-} from '../editor-canvas-container';
-import { unlock } from '../../lock-unlock';
-import { FOCUSABLE_ENTITIES } from '../../utils/constants';
-
-const { BlockContextualToolbar } = unlock( blockEditorPrivateApis );
-
-export default function HeaderEditMode( { setListViewToggleElement } ) {
-	const {
-		deviceType,
-		templateType,
-		isDistractionFree,
-		blockEditorMode,
-		blockSelectionStart,
-		homeUrl,
-		showIconLabels,
-		editorCanvasView,
-		hasFixedToolbar,
-		isZoomOutMode,
-	} = useSelect( ( select ) => {
-		const { __experimentalGetPreviewDeviceType, getEditedPostType } =
-			select( editSiteStore );
-		const { getBlockSelectionStart, __unstableGetEditorMode } =
-			select( blockEditorStore );
-
-		const postType = getEditedPostType();
-
-		const {
-			getUnstableBase, // Site index.
-		} = select( coreStore );
-
-		const { get: getPreference } = select( preferencesStore );
-
-		return {
-			deviceType: __experimentalGetPreviewDeviceType(),
-			templateType: postType,
-			blockEditorMode: __unstableGetEditorMode(),
-			blockSelectionStart: getBlockSelectionStart(),
-			homeUrl: getUnstableBase()?.home,
-			showIconLabels: getPreference(
-				editSiteStore.name,
-				'showIconLabels'
-			),
-			editorCanvasView: unlock(
-				select( editSiteStore )
-			).getEditorCanvasContainerView(),
-			hasFixedToolbar: getPreference(
-				editSiteStore.name,
-				'fixedToolbar'
-			),
-			isDistractionFree: getPreference(
-				editSiteStore.name,
-				'distractionFree'
-			),
-			isZoomOutMode: __unstableGetEditorMode() === 'zoom-out',
-		};
-	}, [] );
-
-	const isLargeViewport = useViewportMatch( 'medium' );
-	const isTopToolbar = ! isZoomOutMode && hasFixedToolbar && isLargeViewport;
-	const blockToolbarRef = useRef();
-
-	const { __experimentalSetPreviewDeviceType: setPreviewDeviceType } =
-		useDispatch( editSiteStore );
-	const disableMotion = useReducedMotion();
-
-	const hasDefaultEditorCanvasView = ! useHasEditorCanvasContainer();
-
-	const isFocusMode = FOCUSABLE_ENTITIES.includes( templateType );
-
-	const isZoomedOutView = blockEditorMode === 'zoom-out';
-
-	const [ isBlockToolsCollapsed, setIsBlockToolsCollapsed ] =
-		useState( true );
-
-	const hasBlockSelected = !! blockSelectionStart;
-
-	useEffect( () => {
-		// If we have a new block selection, show the block tools
-		if ( blockSelectionStart ) {
-			setIsBlockToolsCollapsed( false );
-		}
-	}, [ blockSelectionStart ] );
-
-	const toolbarVariants = {
-		isDistractionFree: { y: '-50px' },
-		isDistractionFreeHovering: { y: 0 },
-		view: { y: 0 },
-		edit: { y: 0 },
-	};
-
-	const toolbarTransition = {
-		type: 'tween',
-		duration: disableMotion ? 0 : 0.2,
-		ease: 'easeOut',
-	};
-
-	return (
-		<div
-			className={ classnames( 'edit-site-header-edit-mode', {
-				'show-icon-labels': showIconLabels,
-			} ) }
-		>
-			{ hasDefaultEditorCanvasView && (
-				<motion.div
-					className="edit-site-header-edit-mode__start"
-					variants={ toolbarVariants }
-					transition={ toolbarTransition }
-				>
-					<DocumentTools
-						blockEditorMode={ blockEditorMode }
-						isDistractionFree={ isDistractionFree }
-						showIconLabels={ showIconLabels }
-						setListViewToggleElement={ setListViewToggleElement }
-					/>
-					{ isTopToolbar && (
-						<>
-							<div
-								className={ classnames(
-									'selected-block-tools-wrapper',
-									{
-										'is-collapsed': isBlockToolsCollapsed,
-									}
-								) }
-							>
-								<BlockContextualToolbar isFixed />
-							</div>
-							<Popover.Slot
-								ref={ blockToolbarRef }
-								name="block-toolbar"
-							/>
-							{ hasBlockSelected && (
-								<Button
-									className="edit-site-header-edit-mode__block-tools-toggle"
-									icon={
-										isBlockToolsCollapsed ? next : previous
-									}
-									onClick={ () => {
-										setIsBlockToolsCollapsed(
-											( collapsed ) => ! collapsed
-										);
-									} }
-									label={
-										isBlockToolsCollapsed
-											? __( 'Show block tools' )
-											: __( 'Hide block tools' )
-									}
-								/>
-							) }
-						</>
-					) }
-				</motion.div>
-			) }
-
-			{ ! isDistractionFree && (
-				<div
-					className={ classnames(
-						'edit-site-header-edit-mode__center',
-						{
-							'is-collapsed':
-								! isBlockToolsCollapsed && isLargeViewport,
-						}
-					) }
-				>
-					{ ! hasDefaultEditorCanvasView ? (
-						getEditorCanvasContainerTitle( editorCanvasView )
-					) : (
-						<DocumentBar />
-					) }
-				</div>
-			) }
-
-			<div className="edit-site-header-edit-mode__end">
-				<motion.div
-					className="edit-site-header-edit-mode__actions"
-					variants={ toolbarVariants }
-					transition={ toolbarTransition }
-				>
-					{ isLargeViewport && (
-						<div
-							className={ classnames(
-								'edit-site-header-edit-mode__preview-options',
-								{ 'is-zoomed-out': isZoomedOutView }
-							) }
-						>
-							<PreviewOptions
-								deviceType={ deviceType }
-								setDeviceType={ setPreviewDeviceType }
-								label={ __( 'View' ) }
-								isEnabled={
-									! isFocusMode && hasDefaultEditorCanvasView
-								}
-								showIconLabels={ showIconLabels }
-							>
-								{ ( { onClose } ) => (
-									<MenuGroup>
-										<MenuItem
-											href={ homeUrl }
-											target="_blank"
-											icon={ external }
-											onClick={ onClose }
-										>
-											{ __( 'View site' ) }
-											<VisuallyHidden as="span">
-												{
-													/* translators: accessibility text */
-													__( '(opens in a new tab)' )
-												}
-											</VisuallyHidden>
-										</MenuItem>
-									</MenuGroup>
-								) }
-							</PreviewOptions>
-						</div>
-					) }
-					<SaveButton />
-					{ ! isDistractionFree && (
-						<PinnedItems.Slot scope="core/edit-site" />
-					) }
-					<MoreMenu showIconLabels={ showIconLabels } />
-				</motion.div>
-			</div>
-		</div>
-	);
-}
diff --git a/packages/edit-site/src/components/header-edit-mode/mode-switcher/index.js b/packages/edit-site/src/components/header-edit-mode/mode-switcher/index.js
deleted file mode 100644
index f4b63edfae6e80..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/mode-switcher/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { MenuItemsChoice, MenuGroup } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../../store';
-
-/**
- * Set of available mode options.
- *
- * @type {Array}
- */
-const MODES = [
-	{
-		value: 'visual',
-		label: __( 'Visual editor' ),
-	},
-	{
-		value: 'text',
-		label: __( 'Code editor' ),
-	},
-];
-
-function ModeSwitcher() {
-	const { shortcut, mode } = useSelect(
-		( select ) => ( {
-			shortcut: select(
-				keyboardShortcutsStore
-			).getShortcutRepresentation( 'core/edit-site/toggle-mode' ),
-			isRichEditingEnabled:
-				select( editSiteStore ).getSettings().richEditingEnabled,
-			isCodeEditingEnabled:
-				select( editSiteStore ).getSettings().codeEditingEnabled,
-			mode: select( editSiteStore ).getEditorMode(),
-		} ),
-		[]
-	);
-	const { switchEditorMode } = useDispatch( editSiteStore );
-
-	const choices = MODES.map( ( choice ) => {
-		if ( choice.value !== mode ) {
-			return { ...choice, shortcut };
-		}
-		return choice;
-	} );
-
-	return (
-		<MenuGroup label={ __( 'Editor' ) }>
-			<MenuItemsChoice
-				choices={ choices }
-				value={ mode }
-				onSelect={ switchEditorMode }
-			/>
-		</MenuGroup>
-	);
-}
-
-export default ModeSwitcher;
diff --git a/packages/edit-site/src/components/header-edit-mode/more-menu/index.js b/packages/edit-site/src/components/header-edit-mode/more-menu/index.js
deleted file mode 100644
index f6c47c1eb93bd9..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/more-menu/index.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, _x } from '@wordpress/i18n';
-import { useDispatch, useRegistry } from '@wordpress/data';
-import { displayShortcut } from '@wordpress/keycodes';
-import { external } from '@wordpress/icons';
-import { MenuGroup, MenuItem, VisuallyHidden } from '@wordpress/components';
-import {
-	ActionItem,
-	MoreMenuDropdown,
-	store as interfaceStore,
-} from '@wordpress/interface';
-import {
-	PreferenceToggleMenuItem,
-	store as preferencesStore,
-} from '@wordpress/preferences';
-
-/**
- * Internal dependencies
- */
-import {
-	KEYBOARD_SHORTCUT_HELP_MODAL_NAME,
-	default as KeyboardShortcutHelpModal,
-} from '../../keyboard-shortcut-help-modal';
-import {
-	PREFERENCES_MODAL_NAME,
-	default as EditSitePreferencesModal,
-} from '../../preferences-modal';
-import ToolsMoreMenuGroup from '../tools-more-menu-group';
-import SiteExport from './site-export';
-import WelcomeGuideMenuItem from './welcome-guide-menu-item';
-import CopyContentMenuItem from './copy-content-menu-item';
-import ModeSwitcher from '../mode-switcher';
-import { store as siteEditorStore } from '../../../store';
-
-export default function MoreMenu( { showIconLabels } ) {
-	const registry = useRegistry();
-
-	const { setIsInserterOpened, setIsListViewOpened, closeGeneralSidebar } =
-		useDispatch( siteEditorStore );
-	const { openModal } = useDispatch( interfaceStore );
-	const { set: setPreference } = useDispatch( preferencesStore );
-
-	const toggleDistractionFree = () => {
-		registry.batch( () => {
-			setPreference( 'core/edit-site', 'fixedToolbar', true );
-			setIsInserterOpened( false );
-			setIsListViewOpened( false );
-			closeGeneralSidebar();
-		} );
-	};
-
-	const turnOffDistractionFree = () => {
-		setPreference( 'core/edit-site', 'distractionFree', false );
-	};
-
-	return (
-		<>
-			<MoreMenuDropdown
-				toggleProps={ {
-					showTooltip: ! showIconLabels,
-					...( showIconLabels && { variant: 'tertiary' } ),
-				} }
-			>
-				{ ( { onClose } ) => (
-					<>
-						<MenuGroup label={ _x( 'View', 'noun' ) }>
-							<PreferenceToggleMenuItem
-								scope="core/edit-site"
-								name="fixedToolbar"
-								onToggle={ turnOffDistractionFree }
-								label={ __( 'Top toolbar' ) }
-								info={ __(
-									'Access all block and document tools in a single place'
-								) }
-								messageActivated={ __(
-									'Top toolbar activated'
-								) }
-								messageDeactivated={ __(
-									'Top toolbar deactivated'
-								) }
-							/>
-							<PreferenceToggleMenuItem
-								scope="core/edit-site"
-								name="distractionFree"
-								onToggle={ toggleDistractionFree }
-								label={ __( 'Distraction free' ) }
-								info={ __( 'Write with calmness' ) }
-								messageActivated={ __(
-									'Distraction free mode activated'
-								) }
-								messageDeactivated={ __(
-									'Distraction free mode deactivated'
-								) }
-								shortcut={ displayShortcut.primaryShift(
-									'\\'
-								) }
-							/>
-							<PreferenceToggleMenuItem
-								scope="core/edit-site"
-								name="focusMode"
-								label={ __( 'Spotlight mode' ) }
-								info={ __( 'Focus on one block at a time' ) }
-								messageActivated={ __(
-									'Spotlight mode activated'
-								) }
-								messageDeactivated={ __(
-									'Spotlight mode deactivated'
-								) }
-							/>
-						</MenuGroup>
-						<ModeSwitcher />
-						<ActionItem.Slot
-							name="core/edit-site/plugin-more-menu"
-							label={ __( 'Plugins' ) }
-							as={ MenuGroup }
-							fillProps={ { onClick: onClose } }
-						/>
-						<MenuGroup label={ __( 'Tools' ) }>
-							<SiteExport />
-							<MenuItem
-								onClick={ () =>
-									openModal(
-										KEYBOARD_SHORTCUT_HELP_MODAL_NAME
-									)
-								}
-								shortcut={ displayShortcut.access( 'h' ) }
-							>
-								{ __( 'Keyboard shortcuts' ) }
-							</MenuItem>
-							<WelcomeGuideMenuItem />
-							<CopyContentMenuItem />
-							<MenuItem
-								icon={ external }
-								role="menuitem"
-								href={ __(
-									'https://wordpress.org/documentation/article/site-editor/'
-								) }
-								target="_blank"
-								rel="noopener noreferrer"
-							>
-								{ __( 'Help' ) }
-								<VisuallyHidden as="span">
-									{
-										/* translators: accessibility text */
-										__( '(opens in a new tab)' )
-									}
-								</VisuallyHidden>
-							</MenuItem>
-							<ToolsMoreMenuGroup.Slot
-								fillProps={ { onClose } }
-							/>
-						</MenuGroup>
-						<MenuGroup>
-							<MenuItem
-								onClick={ () =>
-									openModal( PREFERENCES_MODAL_NAME )
-								}
-							>
-								{ __( 'Preferences' ) }
-							</MenuItem>
-						</MenuGroup>
-					</>
-				) }
-			</MoreMenuDropdown>
-			<KeyboardShortcutHelpModal />
-			<EditSitePreferencesModal />
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/header-edit-mode/plugin-more-menu-item/index.js b/packages/edit-site/src/components/header-edit-mode/plugin-more-menu-item/index.js
deleted file mode 100644
index edb093a487e772..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/plugin-more-menu-item/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { ActionItem } from '@wordpress/interface';
-import { compose } from '@wordpress/compose';
-import { MenuItem } from '@wordpress/components';
-import { withPluginContext } from '@wordpress/plugins';
-
-/**
- * Renders a menu item in `Plugins` group in `More Menu` drop down, and can be used to as a button or link depending on the props provided.
- * The text within the component appears as the menu item label.
- *
- * @param {Object}                props                                 Component properties.
- * @param {string}                [props.href]                          When `href` is provided then the menu item is represented as an anchor rather than button. It corresponds to the `href` attribute of the anchor.
- * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
- * @param {Function}              [props.onClick=noop]                  The callback function to be executed when the user clicks the menu item.
- * @param {...*}                  [props.other]                         Any additional props are passed through to the underlying [Button](/packages/components/src/button/README.md) component.
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginMoreMenuItem = wp.editSite.PluginMoreMenuItem;
- * var moreIcon = wp.element.createElement( 'svg' ); //... svg element.
- *
- * function onButtonClick() {
- * 	alert( 'Button clicked.' );
- * }
- *
- * function MyButtonMoreMenuItem() {
- * 	return wp.element.createElement(
- * 		PluginMoreMenuItem,
- * 		{
- * 			icon: moreIcon,
- * 			onClick: onButtonClick,
- * 		},
- * 		__( 'My button title' )
- * 	);
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginMoreMenuItem } from '@wordpress/edit-site';
- * import { more } from '@wordpress/icons';
- *
- * function onButtonClick() {
- * 	alert( 'Button clicked.' );
- * }
- *
- * const MyButtonMoreMenuItem = () => (
- * 	<PluginMoreMenuItem
- * 		icon={ more }
- * 		onClick={ onButtonClick }
- * 	>
- * 		{ __( 'My button title' ) }
- * 	</PluginMoreMenuItem>
- * );
- * ```
- *
- * @return {Component} The component to be rendered.
- */
-export default compose(
-	withPluginContext( ( context, ownProps ) => {
-		return {
-			as: ownProps.as ?? MenuItem,
-			icon: ownProps.icon || context.icon,
-			name: 'core/edit-site/plugin-more-menu',
-		};
-	} )
-)( ActionItem );
diff --git a/packages/edit-site/src/components/header-edit-mode/plugin-sidebar-more-menu-item/index.js b/packages/edit-site/src/components/header-edit-mode/plugin-sidebar-more-menu-item/index.js
deleted file mode 100644
index 4d6c8008497241..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/plugin-sidebar-more-menu-item/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { ComplementaryAreaMoreMenuItem } from '@wordpress/interface';
-
-/**
- * Renders a menu item in `Plugins` group in `More Menu` drop down,
- * and can be used to activate the corresponding `PluginSidebar` component.
- * The text within the component appears as the menu item label.
- *
- * @param {Object}                props                                 Component props.
- * @param {string}                props.target                          A string identifying the target sidebar you wish to be activated by this menu item. Must be the same as the `name` prop you have given to that sidebar.
- * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var PluginSidebarMoreMenuItem = wp.editSite.PluginSidebarMoreMenuItem;
- * var moreIcon = wp.element.createElement( 'svg' ); //... svg element.
- *
- * function MySidebarMoreMenuItem() {
- * 	return wp.element.createElement(
- * 		PluginSidebarMoreMenuItem,
- * 		{
- * 			target: 'my-sidebar',
- * 			icon: moreIcon,
- * 		},
- * 		__( 'My sidebar title' )
- * 	)
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PluginSidebarMoreMenuItem } from '@wordpress/edit-site';
- * import { more } from '@wordpress/icons';
- *
- * const MySidebarMoreMenuItem = () => (
- * 	<PluginSidebarMoreMenuItem
- * 		target="my-sidebar"
- * 		icon={ more }
- * 	>
- * 		{ __( 'My sidebar title' ) }
- * 	</PluginSidebarMoreMenuItem>
- * );
- * ```
- *
- * @return {Component} The component to be rendered.
- */
-
-export default function PluginSidebarMoreMenuItem( props ) {
-	return (
-		<ComplementaryAreaMoreMenuItem
-			// Menu item is marked with unstable prop for backward compatibility.
-			// @see https://github.com/WordPress/gutenberg/issues/14457
-			__unstableExplicitMenuItem
-			scope="core/edit-site"
-			{ ...props }
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/header-edit-mode/style.scss b/packages/edit-site/src/components/header-edit-mode/style.scss
deleted file mode 100644
index 0fe335c5292ba2..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/style.scss
+++ /dev/null
@@ -1,212 +0,0 @@
-$header-toolbar-min-width: 335px;
-
-.edit-site-header-edit-mode {
-	height: $header-height;
-	align-items: center;
-	background-color: $white;
-	color: $gray-900;
-	display: flex;
-	box-sizing: border-box;
-	width: 100%;
-	justify-content: space-between;
-	border-bottom: $border-width solid $gray-200;
-	padding-left: $header-height;
-
-	.edit-site-header-edit-mode__start {
-		display: flex;
-		border: none;
-		align-items: center;
-		flex-shrink: 2;
-		// We need this to be overflow hidden so the block toolbar can
-		// overflow scroll. If the overflow is visible, flexbox allows
-		// the toolbar to grow outside of the allowed container space.
-		overflow: hidden;
-		// Take up the full height of the header so the border focus
-		// is visible on toolbar buttons.
-		height: 100%;
-		// Allow focus ring to be fully visible on furthest right button.
-		@include break-medium() {
-			padding-right: 2px;
-		}
-	}
-
-	.edit-site-header-edit-mode__end {
-		display: flex;
-		justify-content: flex-end;
-	}
-
-	.edit-site-header-edit-mode__center {
-		display: flex;
-		align-items: center;
-		height: 100%;
-		flex-grow: 1;
-		margin: 0 $grid-unit-20;
-		justify-content: center;
-		// Flex items will, by default, refuse to shrink below a minimum
-		// intrinsic width. In order to shrink this flexbox item, and
-		// subsequently truncate child text, we set an explicit min-width.
-		// See https://dev.w3.org/csswg/css-flexbox/#min-size-auto
-		min-width: 0;
-	}
-
-	.block-editor-block-contextual-toolbar.is-fixed {
-		border: none;
-	}
-}
-
-.edit-site-header-edit-mode__toolbar {
-	display: flex;
-	align-items: center;
-	padding-left: $grid-unit-20;
-	gap: $grid-unit-10;
-
-	@include break-medium() {
-		padding-left: $grid-unit-50 * 0.5;
-	}
-
-	@include break-wide() {
-		padding-right: $grid-unit-10;
-	}
-
-	.edit-site-header-edit-mode__inserter-toggle {
-		svg {
-			transition: transform cubic-bezier(0.165, 0.84, 0.44, 1) 0.2s;
-			@include reduce-motion("transition");
-		}
-
-		&.is-pressed {
-			svg {
-				transform: rotate(45deg);
-			}
-		}
-	}
-}
-
-/**
- * Buttons on the right side
- */
-
-.edit-site-header-edit-mode__actions {
-	display: inline-flex;
-	align-items: center;
-	padding-right: $grid-unit-10;
-	gap: $grid-unit-10;
-}
-
-.edit-site-header-edit-mode__preview-options {
-	opacity: 1;
-	transition: opacity 0.3s;
-
-	&.is-zoomed-out {
-		opacity: 0;
-	}
-}
-
-.edit-site-header-edit-mode__document-tools {
-	display: flex;
-	border: none;
-
-	// The Toolbar component adds different styles to buttons, so we reset them
-	// here to the original button styles
-	.edit-site-header-edit-mode__toolbar > .components-button.has-icon,
-	.edit-site-header-edit-mode__toolbar > .components-dropdown > .components-button.has-icon {
-		// @todo: override toolbar group inherited paddings from components/block-tools/style.scss.
-		// This is best fixed by making the mover control area a proper single toolbar group.
-		// It needs specificity due to style inherited from .components-accessible-toolbar .components-button.has-icon.has-icon.
-		height: $button-size-compact;
-		min-width: $button-size-compact;
-		padding: 4px;
-
-		&.is-pressed {
-			background: $gray-900;
-		}
-
-		&:focus:not(:disabled) {
-			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 0 0 $border-width $white;
-			outline: $border-width solid transparent;
-		}
-
-		&::before {
-			display: none;
-		}
-	}
-
-	.edit-site-header-edit-mode__toolbar > .edit-site-header-edit-mode__inserter-toggle.has-icon {
-		// Special dimensions for this button.
-		min-width: $button-size-compact;
-		width: $button-size-compact;
-		height: $button-size-compact;
-		padding: 0;
-	}
-
-	.edit-site-header-edit-mode__toolbar > .edit-site-header-edit-mode__inserter-toggle.has-text.has-icon {
-		width: auto;
-		padding: 0 $grid-unit-10;
-	}
-}
-
-// Button text label styles
-
-.edit-site-header-edit-mode.show-icon-labels {
-	.components-button.has-icon {
-		width: auto;
-
-		// Hide the button icons when labels are set to display...
-		svg {
-			display: none;
-		}
-		// ... and display labels.
-		&::after {
-			content: attr(aria-label);
-		}
-		&[aria-disabled="true"] {
-			background-color: transparent;
-		}
-	}
-	.is-tertiary {
-		&:active {
-			box-shadow: 0 0 0 1.5px var(--wp-admin-theme-color);
-			background-color: transparent;
-		}
-	}
-	// Some margins and padding have to be adjusted so the buttons can still fit on smaller screens.
-	.edit-site-save-button__button {
-		padding-left: 6px;
-		padding-right: 6px;
-	}
-
-	// The template details toggle has a custom label, different from its aria-label, so we don't want to display both.
-	.edit-site-document-actions__get-info.edit-site-document-actions__get-info.edit-site-document-actions__get-info {
-		&::after {
-			content: none;
-		}
-	}
-
-	.edit-site-header-edit-mode__inserter-toggle.edit-site-header-edit-mode__inserter-toggle,
-	.edit-site-document-actions__get-info.edit-site-document-actions__get-info.edit-site-document-actions__get-info {
-		height: 36px;
-		padding: 0 $grid-unit-10;
-	}
-
-	.edit-site-header-edit-mode__document-tools .edit-site-header-edit-mode__toolbar > * + * {
-		margin-left: $grid-unit-10;
-	}
-}
-
-.has-fixed-toolbar {
-	.selected-block-tools-wrapper {
-		overflow-x: scroll;
-
-		&.is-collapsed {
-			display: none;
-		}
-	}
-
-	.edit-site-header-edit-mode__center.is-collapsed {
-		display: none;
-	}
-}
-
-.edit-site-header-edit-mode__block-tools-toggle {
-	margin-left: 2px; // Allow focus ring to be fully visible
-}
diff --git a/packages/edit-site/src/components/header-edit-mode/tools-more-menu-group/index.js b/packages/edit-site/src/components/header-edit-mode/tools-more-menu-group/index.js
deleted file mode 100644
index 8babbdd0c3dc71..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/tools-more-menu-group/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createSlotFill } from '@wordpress/components';
-
-const { Fill: ToolsMoreMenuGroup, Slot } = createSlotFill(
-	'EditSiteToolsMoreMenuGroup'
-);
-
-ToolsMoreMenuGroup.Slot = ( { fillProps } ) => (
-	<Slot fillProps={ fillProps }>
-		{ ( fills ) => fills && fills.length > 0 }
-	</Slot>
-);
-
-export default ToolsMoreMenuGroup;
diff --git a/packages/edit-site/src/components/header-edit-mode/undo-redo/redo.js b/packages/edit-site/src/components/header-edit-mode/undo-redo/redo.js
deleted file mode 100644
index 17d0ecb892d0a5..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/undo-redo/redo.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, isRTL } from '@wordpress/i18n';
-import { Button } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { redo as redoIcon, undo as undoIcon } from '@wordpress/icons';
-import { displayShortcut, isAppleOS } from '@wordpress/keycodes';
-import { store as coreStore } from '@wordpress/core-data';
-import { forwardRef } from '@wordpress/element';
-
-function RedoButton( props, ref ) {
-	const shortcut = isAppleOS()
-		? displayShortcut.primaryShift( 'z' )
-		: displayShortcut.primary( 'y' );
-
-	const hasRedo = useSelect(
-		( select ) => select( coreStore ).hasRedo(),
-		[]
-	);
-	const { redo } = useDispatch( coreStore );
-	return (
-		<Button
-			{ ...props }
-			ref={ ref }
-			icon={ ! isRTL() ? redoIcon : undoIcon }
-			label={ __( 'Redo' ) }
-			shortcut={ shortcut }
-			// If there are no undo levels we don't want to actually disable this
-			// button, because it will remove focus for keyboard users.
-			// See: https://github.com/WordPress/gutenberg/issues/3486
-			aria-disabled={ ! hasRedo }
-			onClick={ hasRedo ? redo : undefined }
-		/>
-	);
-}
-
-export default forwardRef( RedoButton );
diff --git a/packages/edit-site/src/components/header-edit-mode/undo-redo/undo.js b/packages/edit-site/src/components/header-edit-mode/undo-redo/undo.js
deleted file mode 100644
index 271c73a452d9ea..00000000000000
--- a/packages/edit-site/src/components/header-edit-mode/undo-redo/undo.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, isRTL } from '@wordpress/i18n';
-import { Button } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { undo as undoIcon, redo as redoIcon } from '@wordpress/icons';
-import { displayShortcut } from '@wordpress/keycodes';
-import { store as coreStore } from '@wordpress/core-data';
-import { forwardRef } from '@wordpress/element';
-
-function UndoButton( props, ref ) {
-	const hasUndo = useSelect(
-		( select ) => select( coreStore ).hasUndo(),
-		[]
-	);
-	const { undo } = useDispatch( coreStore );
-	return (
-		<Button
-			{ ...props }
-			ref={ ref }
-			icon={ ! isRTL() ? undoIcon : redoIcon }
-			label={ __( 'Undo' ) }
-			shortcut={ displayShortcut.primary( 'z' ) }
-			// If there are no undo levels we don't want to actually disable this
-			// button, because it will remove focus for keyboard users.
-			// See: https://github.com/WordPress/gutenberg/issues/3486
-			aria-disabled={ ! hasUndo }
-			onClick={ hasUndo ? undo : undefined }
-		/>
-	);
-}
-
-export default forwardRef( UndoButton );
diff --git a/packages/edit-site/src/components/keyboard-shortcut-help-modal/config.js b/packages/edit-site/src/components/keyboard-shortcut-help-modal/config.js
deleted file mode 100644
index bd8bb53f5453d3..00000000000000
--- a/packages/edit-site/src/components/keyboard-shortcut-help-modal/config.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
-export const textFormattingShortcuts = [
-	{
-		keyCombination: { modifier: 'primary', character: 'b' },
-		description: __( 'Make the selected text bold.' ),
-	},
-	{
-		keyCombination: { modifier: 'primary', character: 'i' },
-		description: __( 'Make the selected text italic.' ),
-	},
-	{
-		keyCombination: { modifier: 'primary', character: 'k' },
-		description: __( 'Convert the selected text into a link.' ),
-	},
-	{
-		keyCombination: { modifier: 'primaryShift', character: 'k' },
-		description: __( 'Remove a link.' ),
-	},
-	{
-		keyCombination: { character: '[[' },
-		description: __( 'Insert a link to a post or page.' ),
-	},
-	{
-		keyCombination: { modifier: 'primary', character: 'u' },
-		description: __( 'Underline the selected text.' ),
-	},
-	{
-		keyCombination: { modifier: 'access', character: 'd' },
-		description: __( 'Strikethrough the selected text.' ),
-	},
-	{
-		keyCombination: { modifier: 'access', character: 'x' },
-		description: __( 'Make the selected text inline code.' ),
-	},
-	{
-		keyCombination: { modifier: 'access', character: '0' },
-		description: __( 'Convert the current heading to a paragraph.' ),
-	},
-	{
-		keyCombination: { modifier: 'access', character: '1-6' },
-		description: __(
-			'Convert the current paragraph or heading to a heading of level 1 to 6.'
-		),
-	},
-];
diff --git a/packages/edit-site/src/components/keyboard-shortcut-help-modal/dynamic-shortcut.js b/packages/edit-site/src/components/keyboard-shortcut-help-modal/dynamic-shortcut.js
deleted file mode 100644
index 5ab83d532ffff7..00000000000000
--- a/packages/edit-site/src/components/keyboard-shortcut-help-modal/dynamic-shortcut.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-
-/**
- * Internal dependencies
- */
-import Shortcut from './shortcut';
-
-export default function DynamicShortcut( { name } ) {
-	const { keyCombination, description, aliases } = useSelect(
-		( select ) => {
-			const {
-				getShortcutKeyCombination,
-				getShortcutDescription,
-				getShortcutAliases,
-			} = select( keyboardShortcutsStore );
-
-			return {
-				keyCombination: getShortcutKeyCombination( name ),
-				aliases: getShortcutAliases( name ),
-				description: getShortcutDescription( name ),
-			};
-		},
-		[ name ]
-	);
-
-	if ( ! keyCombination ) {
-		return null;
-	}
-
-	return (
-		<Shortcut
-			keyCombination={ keyCombination }
-			description={ description }
-			aliases={ aliases }
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/keyboard-shortcut-help-modal/index.js b/packages/edit-site/src/components/keyboard-shortcut-help-modal/index.js
deleted file mode 100644
index 1da14a7cccbe77..00000000000000
--- a/packages/edit-site/src/components/keyboard-shortcut-help-modal/index.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { Modal } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import {
-	useShortcut,
-	store as keyboardShortcutsStore,
-} from '@wordpress/keyboard-shortcuts';
-import { store as interfaceStore } from '@wordpress/interface';
-import { useSelect, useDispatch } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { textFormattingShortcuts } from './config';
-import Shortcut from './shortcut';
-import DynamicShortcut from './dynamic-shortcut';
-
-export const KEYBOARD_SHORTCUT_HELP_MODAL_NAME =
-	'edit-site/keyboard-shortcut-help';
-
-const ShortcutList = ( { shortcuts } ) => (
-	/*
-	 * Disable reason: The `list` ARIA role is redundant but
-	 * Safari+VoiceOver won't announce the list otherwise.
-	 */
-	/* eslint-disable jsx-a11y/no-redundant-roles */
-	<ul
-		className="edit-site-keyboard-shortcut-help-modal__shortcut-list"
-		role="list"
-	>
-		{ shortcuts.map( ( shortcut, index ) => (
-			<li
-				className="edit-site-keyboard-shortcut-help-modal__shortcut"
-				key={ index }
-			>
-				{ typeof shortcut === 'string' ? (
-					<DynamicShortcut name={ shortcut } />
-				) : (
-					<Shortcut { ...shortcut } />
-				) }
-			</li>
-		) ) }
-	</ul>
-	/* eslint-enable jsx-a11y/no-redundant-roles */
-);
-
-const ShortcutSection = ( { title, shortcuts, className } ) => (
-	<section
-		className={ classnames(
-			'edit-site-keyboard-shortcut-help-modal__section',
-			className
-		) }
-	>
-		{ !! title && (
-			<h2 className="edit-site-keyboard-shortcut-help-modal__section-title">
-				{ title }
-			</h2>
-		) }
-		<ShortcutList shortcuts={ shortcuts } />
-	</section>
-);
-
-const ShortcutCategorySection = ( {
-	title,
-	categoryName,
-	additionalShortcuts = [],
-} ) => {
-	const categoryShortcuts = useSelect(
-		( select ) => {
-			return select( keyboardShortcutsStore ).getCategoryShortcuts(
-				categoryName
-			);
-		},
-		[ categoryName ]
-	);
-
-	return (
-		<ShortcutSection
-			title={ title }
-			shortcuts={ categoryShortcuts.concat( additionalShortcuts ) }
-		/>
-	);
-};
-
-export default function KeyboardShortcutHelpModal() {
-	const isModalActive = useSelect( ( select ) =>
-		select( interfaceStore ).isModalActive(
-			KEYBOARD_SHORTCUT_HELP_MODAL_NAME
-		)
-	);
-	const { closeModal, openModal } = useDispatch( interfaceStore );
-	const toggleModal = () =>
-		isModalActive
-			? closeModal()
-			: openModal( KEYBOARD_SHORTCUT_HELP_MODAL_NAME );
-	useShortcut( 'core/edit-site/keyboard-shortcuts', toggleModal );
-	if ( ! isModalActive ) {
-		return null;
-	}
-	return (
-		<Modal
-			className="edit-site-keyboard-shortcut-help-modal"
-			title={ __( 'Keyboard shortcuts' ) }
-			onRequestClose={ toggleModal }
-		>
-			<ShortcutSection
-				className="edit-site-keyboard-shortcut-help-modal__main-shortcuts"
-				shortcuts={ [ 'core/edit-site/keyboard-shortcuts' ] }
-			/>
-			<ShortcutCategorySection
-				title={ __( 'Global shortcuts' ) }
-				categoryName="global"
-			/>
-
-			<ShortcutCategorySection
-				title={ __( 'Selection shortcuts' ) }
-				categoryName="selection"
-			/>
-
-			<ShortcutCategorySection
-				title={ __( 'Block shortcuts' ) }
-				categoryName="block"
-				additionalShortcuts={ [
-					{
-						keyCombination: { character: '/' },
-						description: __(
-							'Change the block type after adding a new paragraph.'
-						),
-						/* translators: The forward-slash character. e.g. '/'. */
-						ariaLabel: __( 'Forward-slash' ),
-					},
-				] }
-			/>
-			<ShortcutSection
-				title={ __( 'Text formatting' ) }
-				shortcuts={ textFormattingShortcuts }
-			/>
-		</Modal>
-	);
-}
diff --git a/packages/edit-site/src/components/keyboard-shortcut-help-modal/shortcut.js b/packages/edit-site/src/components/keyboard-shortcut-help-modal/shortcut.js
deleted file mode 100644
index 5c8d18242a8e7c..00000000000000
--- a/packages/edit-site/src/components/keyboard-shortcut-help-modal/shortcut.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Fragment } from '@wordpress/element';
-import { displayShortcutList, shortcutAriaLabel } from '@wordpress/keycodes';
-
-function KeyCombination( { keyCombination, forceAriaLabel } ) {
-	const shortcut = keyCombination.modifier
-		? displayShortcutList[ keyCombination.modifier ](
-				keyCombination.character
-		  )
-		: keyCombination.character;
-	const ariaLabel = keyCombination.modifier
-		? shortcutAriaLabel[ keyCombination.modifier ](
-				keyCombination.character
-		  )
-		: keyCombination.character;
-
-	return (
-		<kbd
-			className="edit-site-keyboard-shortcut-help-modal__shortcut-key-combination"
-			aria-label={ forceAriaLabel || ariaLabel }
-		>
-			{ ( Array.isArray( shortcut ) ? shortcut : [ shortcut ] ).map(
-				( character, index ) => {
-					if ( character === '+' ) {
-						return <Fragment key={ index }>{ character }</Fragment>;
-					}
-
-					return (
-						<kbd
-							key={ index }
-							className="edit-site-keyboard-shortcut-help-modal__shortcut-key"
-						>
-							{ character }
-						</kbd>
-					);
-				}
-			) }
-		</kbd>
-	);
-}
-
-export default function Shortcut( {
-	description,
-	keyCombination,
-	aliases = [],
-	ariaLabel,
-} ) {
-	return (
-		<>
-			<div className="edit-site-keyboard-shortcut-help-modal__shortcut-description">
-				{ description }
-			</div>
-			<div className="edit-site-keyboard-shortcut-help-modal__shortcut-term">
-				<KeyCombination
-					keyCombination={ keyCombination }
-					forceAriaLabel={ ariaLabel }
-				/>
-				{ aliases.map( ( alias, index ) => (
-					<KeyCombination
-						keyCombination={ alias }
-						forceAriaLabel={ ariaLabel }
-						key={ index }
-					/>
-				) ) }
-			</div>
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/keyboard-shortcut-help-modal/style.scss b/packages/edit-site/src/components/keyboard-shortcut-help-modal/style.scss
deleted file mode 100644
index 6d9376f7cc4086..00000000000000
--- a/packages/edit-site/src/components/keyboard-shortcut-help-modal/style.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-.edit-site-keyboard-shortcut-help-modal {
-	&__section {
-		margin: 0 0 2rem 0;
-	}
-
-	&__section-title {
-		font-size: 0.9rem;
-		font-weight: 600;
-	}
-
-	&__shortcut {
-		display: flex;
-		align-items: baseline;
-		padding: 0.6rem 0;
-		border-top: 1px solid $gray-300;
-		margin-bottom: 0;
-
-		&:last-child {
-			border-bottom: 1px solid $gray-300;
-		}
-
-		&:empty {
-			display: none;
-		}
-	}
-
-	&__shortcut-term {
-		font-weight: 600;
-		margin: 0 0 0 1rem;
-		text-align: right;
-	}
-
-	&__shortcut-description {
-		flex: 1;
-		margin: 0;
-
-		// IE 11 flex item fix - ensure the item does not collapse.
-		flex-basis: auto;
-	}
-
-	&__shortcut-key-combination {
-		display: block;
-		background: none;
-		margin: 0;
-		padding: 0;
-
-		& + .edit-site-keyboard-shortcut-help-modal__shortcut-key-combination {
-			margin-top: 10px;
-		}
-	}
-
-	&__shortcut-key {
-		padding: 0.25rem 0.5rem;
-		border-radius: 8%;
-		margin: 0 0.2rem 0 0.2rem;
-
-		&:last-child {
-			margin: 0 0 0 0.2rem;
-		}
-	}
-}
diff --git a/packages/edit-site/src/components/keyboard-shortcuts/edit-mode.js b/packages/edit-site/src/components/keyboard-shortcuts/edit-mode.js
deleted file mode 100644
index 1346041b6a94c1..00000000000000
--- a/packages/edit-site/src/components/keyboard-shortcuts/edit-mode.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useShortcut } from '@wordpress/keyboard-shortcuts';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { store as interfaceStore } from '@wordpress/interface';
-import { createBlock } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-import { SIDEBAR_BLOCK } from '../sidebar-edit-mode/constants';
-import { STORE_NAME } from '../../store/constants';
-
-function KeyboardShortcutsEditMode() {
-	const { getEditorMode } = useSelect( editSiteStore );
-	const isListViewOpen = useSelect(
-		( select ) => select( editSiteStore ).isListViewOpened(),
-		[]
-	);
-	const isBlockInspectorOpen = useSelect(
-		( select ) =>
-			select( interfaceStore ).getActiveComplementaryArea(
-				editSiteStore.name
-			) === SIDEBAR_BLOCK,
-		[]
-	);
-	const { redo, undo } = useDispatch( coreStore );
-	const { setIsListViewOpened, switchEditorMode, toggleDistractionFree } =
-		useDispatch( editSiteStore );
-	const { enableComplementaryArea, disableComplementaryArea } =
-		useDispatch( interfaceStore );
-
-	const { replaceBlocks } = useDispatch( blockEditorStore );
-	const { getBlockName, getSelectedBlockClientId, getBlockAttributes } =
-		useSelect( blockEditorStore );
-
-	const handleTextLevelShortcut = ( event, level ) => {
-		event.preventDefault();
-		const destinationBlockName =
-			level === 0 ? 'core/paragraph' : 'core/heading';
-		const currentClientId = getSelectedBlockClientId();
-		if ( currentClientId === null ) {
-			return;
-		}
-		const blockName = getBlockName( currentClientId );
-		if ( blockName !== 'core/paragraph' && blockName !== 'core/heading' ) {
-			return;
-		}
-		const attributes = getBlockAttributes( currentClientId );
-		const textAlign =
-			blockName === 'core/paragraph' ? 'align' : 'textAlign';
-		const destinationTextAlign =
-			destinationBlockName === 'core/paragraph' ? 'align' : 'textAlign';
-
-		replaceBlocks(
-			currentClientId,
-			createBlock( destinationBlockName, {
-				level,
-				content: attributes.content,
-				...{ [ destinationTextAlign ]: attributes[ textAlign ] },
-			} )
-		);
-	};
-
-	useShortcut( 'core/edit-site/undo', ( event ) => {
-		undo();
-		event.preventDefault();
-	} );
-
-	useShortcut( 'core/edit-site/redo', ( event ) => {
-		redo();
-		event.preventDefault();
-	} );
-
-	// Only opens the list view. Other functionality for this shortcut happens in the rendered sidebar.
-	useShortcut( 'core/edit-site/toggle-list-view', () => {
-		if ( isListViewOpen ) {
-			return;
-		}
-		setIsListViewOpened( true );
-	} );
-
-	useShortcut( 'core/edit-site/toggle-block-settings-sidebar', ( event ) => {
-		// This shortcut has no known clashes, but use preventDefault to prevent any
-		// obscure shortcuts from triggering.
-		event.preventDefault();
-
-		if ( isBlockInspectorOpen ) {
-			disableComplementaryArea( STORE_NAME );
-		} else {
-			enableComplementaryArea( STORE_NAME, SIDEBAR_BLOCK );
-		}
-	} );
-
-	useShortcut( 'core/edit-site/toggle-mode', () => {
-		switchEditorMode( getEditorMode() === 'visual' ? 'text' : 'visual' );
-	} );
-
-	useShortcut( 'core/edit-site/transform-heading-to-paragraph', ( event ) =>
-		handleTextLevelShortcut( event, 0 )
-	);
-
-	[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
-		//the loop is based off on a constant therefore
-		//the hook will execute the same way every time
-		//eslint-disable-next-line react-hooks/rules-of-hooks
-		useShortcut(
-			`core/edit-site/transform-paragraph-to-heading-${ level }`,
-			( event ) => handleTextLevelShortcut( event, level )
-		);
-	} );
-
-	useShortcut( 'core/edit-site/toggle-distraction-free', () => {
-		toggleDistractionFree();
-	} );
-
-	return null;
-}
-
-export default KeyboardShortcutsEditMode;
diff --git a/packages/edit-site/src/components/keyboard-shortcuts/global.js b/packages/edit-site/src/components/keyboard-shortcuts/global.js
index cee406e4b2a405..8ab9723e42ea65 100644
--- a/packages/edit-site/src/components/keyboard-shortcuts/global.js
+++ b/packages/edit-site/src/components/keyboard-shortcuts/global.js
@@ -4,29 +4,45 @@
 import { useShortcut } from '@wordpress/keyboard-shortcuts';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
+import { store as editorStore } from '@wordpress/editor';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
 import { store as editSiteStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const { useHistory } = unlock( routerPrivateApis );
 
 function KeyboardShortcutsGlobal() {
 	const { __experimentalGetDirtyEntityRecords, isSavingEntityRecord } =
 		useSelect( coreStore );
+	const { hasNonPostEntityChanges } = useSelect( editorStore );
 	const { setIsSaveViewOpened } = useDispatch( editSiteStore );
+	const history = useHistory();
 
 	useShortcut( 'core/edit-site/save', ( event ) => {
 		event.preventDefault();
 
 		const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
-		const isDirty = !! dirtyEntityRecords.length;
+		const hasDirtyEntities = !! dirtyEntityRecords.length;
 		const isSaving = dirtyEntityRecords.some( ( record ) =>
 			isSavingEntityRecord( record.kind, record.name, record.key )
 		);
-
-		if ( ! isSaving && isDirty ) {
-			setIsSaveViewOpened( true );
+		const _hasNonPostEntityChanges = hasNonPostEntityChanges();
+		const isViewMode =
+			history.getLocationWithParams().params.canvas === 'view';
+		if (
+			( ! hasDirtyEntities || ! _hasNonPostEntityChanges || isSaving ) &&
+			! isViewMode
+		) {
+			return;
 		}
+		// At this point, we know that there are dirty entities, other than
+		// the edited post, and we're not in the process of saving, so open
+		// save view.
+		setIsSaveViewOpened( true );
 	} );
 
 	return null;
diff --git a/packages/edit-site/src/components/keyboard-shortcuts/register.js b/packages/edit-site/src/components/keyboard-shortcuts/register.js
index 8dfd1e3e2a45bf..8e491ab61c36f7 100644
--- a/packages/edit-site/src/components/keyboard-shortcuts/register.js
+++ b/packages/edit-site/src/components/keyboard-shortcuts/register.js
@@ -3,7 +3,6 @@
  */
 import { useEffect } from '@wordpress/element';
 import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-import { isAppleOS } from '@wordpress/keycodes';
 import { useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 
@@ -20,145 +19,6 @@ function KeyboardShortcutsRegister() {
 				character: 's',
 			},
 		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/undo',
-			category: 'global',
-			description: __( 'Undo your last changes.' ),
-			keyCombination: {
-				modifier: 'primary',
-				character: 'z',
-			},
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/redo',
-			category: 'global',
-			description: __( 'Redo your last undo.' ),
-			keyCombination: {
-				modifier: 'primaryShift',
-				character: 'z',
-			},
-			// Disable on Apple OS because it conflicts with the browser's
-			// history shortcut. It's a fine alias for both Windows and Linux.
-			// Since there's no conflict for Ctrl+Shift+Z on both Windows and
-			// Linux, we keep it as the default for consistency.
-			aliases: isAppleOS()
-				? []
-				: [
-						{
-							modifier: 'primary',
-							character: 'y',
-						},
-				  ],
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/toggle-list-view',
-			category: 'global',
-			description: __( 'Open the block list view.' ),
-			keyCombination: {
-				modifier: 'access',
-				character: 'o',
-			},
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/toggle-block-settings-sidebar',
-			category: 'global',
-			description: __( 'Show or hide the Settings sidebar.' ),
-			keyCombination: {
-				modifier: 'primaryShift',
-				character: ',',
-			},
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/keyboard-shortcuts',
-			category: 'main',
-			description: __( 'Display these keyboard shortcuts.' ),
-			keyCombination: {
-				modifier: 'access',
-				character: 'h',
-			},
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/next-region',
-			category: 'global',
-			description: __( 'Navigate to the next part of the editor.' ),
-			keyCombination: {
-				modifier: 'ctrl',
-				character: '`',
-			},
-			aliases: [
-				{
-					modifier: 'access',
-					character: 'n',
-				},
-			],
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/previous-region',
-			category: 'global',
-			description: __( 'Navigate to the previous part of the editor.' ),
-			keyCombination: {
-				modifier: 'ctrlShift',
-				character: '`',
-			},
-			aliases: [
-				{
-					modifier: 'access',
-					character: 'p',
-				},
-				{
-					modifier: 'ctrlShift',
-					character: '~',
-				},
-			],
-		} );
-		registerShortcut( {
-			name: 'core/edit-site/toggle-mode',
-			category: 'global',
-			description: __( 'Switch between visual editor and code editor.' ),
-			keyCombination: {
-				modifier: 'secondary',
-				character: 'm',
-			},
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/transform-heading-to-paragraph',
-			category: 'block-library',
-			description: __( 'Transform heading to paragraph.' ),
-			keyCombination: {
-				modifier: 'access',
-				character: `0`,
-			},
-		} );
-
-		[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
-			registerShortcut( {
-				name: `core/edit-site/transform-paragraph-to-heading-${ level }`,
-				category: 'block-library',
-				description: __( 'Transform paragraph to heading.' ),
-				keyCombination: {
-					modifier: 'access',
-					character: `${ level }`,
-				},
-			} );
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/toggle-distraction-free',
-			category: 'global',
-			description: __( 'Toggle distraction free mode.' ),
-			keyCombination: {
-				modifier: 'primaryShift',
-				character: '\\',
-			},
-		} );
 	}, [ registerShortcut ] );
 
 	return null;
diff --git a/packages/edit-site/src/components/layout/animation.js b/packages/edit-site/src/components/layout/animation.js
new file mode 100644
index 00000000000000..00f6eb01a6f1a0
--- /dev/null
+++ b/packages/edit-site/src/components/layout/animation.js
@@ -0,0 +1,124 @@
+/**
+ * External dependencies
+ */
+import { Controller, easings } from '@react-spring/web';
+
+/**
+ * WordPress dependencies
+ */
+import { useLayoutEffect, useMemo, useRef } from '@wordpress/element';
+
+function getAbsolutePosition( element ) {
+	return {
+		top: element.offsetTop,
+		left: element.offsetLeft,
+	};
+}
+
+const ANIMATION_DURATION = 400;
+
+/**
+ * Hook used to compute the styles required to move a div into a new position.
+ *
+ * The way this animation works is the following:
+ *  - It first renders the element as if there was no animation.
+ *  - It takes a snapshot of the position of the block to use it
+ *    as a destination point for the animation.
+ *  - It restores the element to the previous position using a CSS transform
+ *  - It uses the "resetAnimation" flag to reset the animation
+ *    from the beginning in order to animate to the new destination point.
+ *
+ * @param {Object} $1                          Options
+ * @param {*}      $1.triggerAnimationOnChange Variable used to trigger the animation if it changes.
+ */
+function useMovingAnimation( { triggerAnimationOnChange } ) {
+	const ref = useRef();
+
+	// Whenever the trigger changes, we need to take a snapshot of the current
+	// position of the block to use it as a destination point for the animation.
+	const { previous, prevRect } = useMemo(
+		() => ( {
+			previous: ref.current && getAbsolutePosition( ref.current ),
+			prevRect: ref.current && ref.current.getBoundingClientRect(),
+		} ),
+		[ triggerAnimationOnChange ]
+	);
+
+	useLayoutEffect( () => {
+		if ( ! previous || ! ref.current ) {
+			return;
+		}
+
+		// We disable the animation if the user has a preference for reduced
+		// motion.
+		const disableAnimation = window.matchMedia(
+			'(prefers-reduced-motion: reduce)'
+		).matches;
+
+		if ( disableAnimation ) {
+			return;
+		}
+
+		const controller = new Controller( {
+			x: 0,
+			y: 0,
+			width: prevRect.width,
+			height: prevRect.height,
+			config: {
+				duration: ANIMATION_DURATION,
+				easing: easings.easeInOutQuint,
+			},
+			onChange( { value } ) {
+				if ( ! ref.current ) {
+					return;
+				}
+				let { x, y, width, height } = value;
+				x = Math.round( x );
+				y = Math.round( y );
+				width = Math.round( width );
+				height = Math.round( height );
+				const finishedMoving = x === 0 && y === 0;
+				ref.current.style.transformOrigin = 'center center';
+				ref.current.style.transform = finishedMoving
+					? null // Set to `null` to explicitly remove the transform.
+					: `translate3d(${ x }px,${ y }px,0)`;
+				ref.current.style.width = finishedMoving
+					? null
+					: `${ width }px`;
+				ref.current.style.height = finishedMoving
+					? null
+					: `${ height }px`;
+			},
+		} );
+
+		ref.current.style.transform = undefined;
+		const destination = ref.current.getBoundingClientRect();
+
+		const x = Math.round( prevRect.left - destination.left );
+		const y = Math.round( prevRect.top - destination.top );
+		const width = destination.width;
+		const height = destination.height;
+
+		controller.start( {
+			x: 0,
+			y: 0,
+			width,
+			height,
+			from: { x, y, width: prevRect.width, height: prevRect.height },
+		} );
+
+		return () => {
+			controller.stop();
+			controller.set( {
+				x: 0,
+				y: 0,
+				width: prevRect.width,
+				height: prevRect.height,
+			} );
+		};
+	}, [ previous, prevRect ] );
+
+	return ref;
+}
+
+export default useMovingAnimation;
diff --git a/packages/edit-site/src/components/layout/hooks.js b/packages/edit-site/src/components/layout/hooks.js
index a9bf1b982903a9..184e1b44896c5b 100644
--- a/packages/edit-site/src/components/layout/hooks.js
+++ b/packages/edit-site/src/components/layout/hooks.js
@@ -46,16 +46,17 @@ export function useIsSiteEditorLoading() {
 	useEffect( () => {
 		if ( inLoadingPause ) {
 			/*
-			 * We're using an arbitrary 1s timeout here to catch brief moments
-			 * without any resolving selectors that would result in displaying
-			 * brief flickers of loading state and loaded state.
+			 * We're using an arbitrary 100ms timeout here to catch brief
+			 * moments without any resolving selectors that would result in
+			 * displaying brief flickers of loading state and loaded state.
 			 *
 			 * It's worth experimenting with different values, since this also
-			 * adds 1s of artificial delay after loading has finished.
+			 * adds 100ms of artificial delay after loading has finished.
 			 */
+			const ARTIFICIAL_DELAY = 100;
 			const timeout = setTimeout( () => {
 				setLoaded( true );
-			}, 1000 );
+			}, ARTIFICIAL_DELAY );
 
 			return () => {
 				clearTimeout( timeout );
diff --git a/packages/edit-site/src/components/layout/index.js b/packages/edit-site/src/components/layout/index.js
index 9e4153938d40ad..713b1f179b7adb 100644
--- a/packages/edit-site/src/components/layout/index.js
+++ b/packages/edit-site/src/components/layout/index.js
@@ -1,12 +1,11 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
 import {
 	__unstableMotion as motion,
 	__unstableAnimatePresence as AnimatePresence,
@@ -16,380 +15,213 @@ import {
 	useReducedMotion,
 	useViewportMatch,
 	useResizeObserver,
+	usePrevious,
 } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
-import { useState } from '@wordpress/element';
-import { NavigableRegion } from '@wordpress/interface';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
+import { useState, useRef, useEffect } from '@wordpress/element';
+import { CommandMenu } from '@wordpress/commands';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import {
-	CommandMenu,
-	privateApis as commandsPrivateApis,
-} from '@wordpress/commands';
-import { store as preferencesStore } from '@wordpress/preferences';
-import {
-	privateApis as blockEditorPrivateApis,
-	useBlockCommands,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
+	EditorSnackbars,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 import { privateApis as coreCommandsPrivateApis } from '@wordpress/core-commands';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
-import Sidebar from '../sidebar';
-import Editor from '../editor';
 import ErrorBoundary from '../error-boundary';
-import { store as editSiteStore } from '../../store';
-import getIsListPage from '../../utils/get-is-list-page';
-import Header from '../header-edit-mode';
-import useInitEditedEntityFromURL from '../sync-state-with-url/use-init-edited-entity-from-url';
-import SiteHub from '../site-hub';
+import { default as SiteHub, SiteHubMobile } from '../site-hub';
 import ResizableFrame from '../resizable-frame';
-import useSyncCanvasModeWithURL from '../sync-state-with-url/use-sync-canvas-mode-with-url';
 import { unlock } from '../../lock-unlock';
-import SavePanel from '../save-panel';
 import KeyboardShortcutsRegister from '../keyboard-shortcuts/register';
 import KeyboardShortcutsGlobal from '../keyboard-shortcuts/global';
-import { useCommonCommands } from '../../hooks/commands/use-common-commands';
-import { useEditModeCommands } from '../../hooks/commands/use-edit-mode-commands';
-import PageMain from '../page-main';
 import { useIsSiteEditorLoading } from './hooks';
+import useMovingAnimation from './animation';
+import SidebarContent from '../sidebar';
+import SaveHub from '../save-hub';
+import SavePanel from '../save-panel';
 
 const { useCommands } = unlock( coreCommandsPrivateApis );
-const { useCommandContext } = unlock( commandsPrivateApis );
-const { useLocation } = unlock( routerPrivateApis );
 const { useGlobalStyle } = unlock( blockEditorPrivateApis );
+const { NavigableRegion } = unlock( editorPrivateApis );
+const { useLocation } = unlock( routerPrivateApis );
 
-const ANIMATION_DURATION = 0.5;
-
-export default function Layout() {
-	// This ensures the edited entity id and type are initialized properly.
-	useInitEditedEntityFromURL();
-	useSyncCanvasModeWithURL();
-	useCommands();
-	useEditModeCommands();
-	useCommonCommands();
-	useBlockCommands();
+const ANIMATION_DURATION = 0.3;
 
+export default function Layout( { route } ) {
 	const { params } = useLocation();
+	const { canvas = 'view' } = params;
+	useCommands();
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const isListPage = getIsListPage( params, isMobileViewport );
-	const isEditorPage = ! isListPage;
-
-	const {
-		isDistractionFree,
-		hasFixedToolbar,
-		hasBlockSelected,
-		canvasMode,
-		previousShortcut,
-		nextShortcut,
-	} = useSelect( ( select ) => {
-		const { getAllShortcutKeyCombinations } = select(
-			keyboardShortcutsStore
-		);
-		const { getCanvasMode } = unlock( select( editSiteStore ) );
-		return {
-			canvasMode: getCanvasMode(),
-			previousShortcut: getAllShortcutKeyCombinations(
-				'core/edit-site/previous-region'
-			),
-			nextShortcut: getAllShortcutKeyCombinations(
-				'core/edit-site/next-region'
-			),
-			hasFixedToolbar: select( preferencesStore ).get(
-				'core/edit-site',
-				'fixedToolbar'
-			),
-			isDistractionFree: select( preferencesStore ).get(
-				'core/edit-site',
-				'distractionFree'
-			),
-			hasBlockSelected:
-				select( blockEditorStore ).getBlockSelectionStart(),
-		};
-	}, [] );
-	const isEditing = canvasMode === 'edit';
-	const navigateRegionsProps = useNavigateRegions( {
-		previous: previousShortcut,
-		next: nextShortcut,
-	} );
+	const toggleRef = useRef();
+	const navigateRegionsProps = useNavigateRegions();
 	const disableMotion = useReducedMotion();
-	const showSidebar =
-		( isMobileViewport && canvasMode === 'view' && ! isListPage ) ||
-		( ! isMobileViewport && ( canvasMode === 'view' || ! isEditorPage ) );
-	const showCanvas =
-		( isMobileViewport && isEditorPage && isEditing ) ||
-		! isMobileViewport ||
-		! isEditorPage;
-	const isFullCanvas =
-		( isMobileViewport && isListPage ) || ( isEditorPage && isEditing );
 	const [ canvasResizer, canvasSize ] = useResizeObserver();
-	const [ fullResizer ] = useResizeObserver();
-	const [ isResizing ] = useState( false );
 	const isEditorLoading = useIsSiteEditorLoading();
 	const [ isResizableFrameOversized, setIsResizableFrameOversized ] =
 		useState( false );
-	const [ listViewToggleElement, setListViewToggleElement ] =
-		useState( null );
-
-	// This determines which animation variant should apply to the header.
-	// There is also a `isDistractionFreeHovering` state that gets priority
-	// when hovering the `edit-site-layout__header-container` in distraction
-	// free mode. It's set via framer and trickles down to all the children
-	// so they can use this variant state too.
-	//
-	// TODO: The issue with this is we want to have the hover state stick when hovering
-	// a popover opened via the header. We'll probably need to lift this state to
-	// handle it ourselves. Also, focusWithin the header needs to be handled.
-	let headerAnimationState;
-
-	if ( canvasMode === 'view' ) {
-		// We need 'view' to always take priority so 'isDistractionFree'
-		// doesn't bleed over into the view (sidebar) state
-		headerAnimationState = 'view';
-	} else if ( isDistractionFree ) {
-		headerAnimationState = 'isDistractionFree';
-	} else {
-		headerAnimationState = canvasMode; // edit, view, init
-	}
-
-	// Sets the right context for the command palette
-	let commandContext = 'site-editor';
-
-	if ( canvasMode === 'edit' && isEditorPage ) {
-		commandContext = 'site-editor-edit';
-	}
-	if ( hasBlockSelected ) {
-		commandContext = 'block-selection-edit';
-	}
-	useCommandContext( commandContext );
+	const { name: routeKey, areas, widths } = route;
+	const animationRef = useMovingAnimation( {
+		triggerAnimationOnChange: routeKey + '-' + canvas,
+	} );
 
 	const [ backgroundColor ] = useGlobalStyle( 'color.background' );
 	const [ gradientValue ] = useGlobalStyle( 'color.gradient' );
-
-	// Synchronizing the URL with the store value of canvasMode happens in an effect
-	// This condition ensures the component is only rendered after the synchronization happens
-	// which prevents any animations due to potential canvasMode value change.
-	if ( canvasMode === 'init' ) {
-		return null;
-	}
+	const previousCanvaMode = usePrevious( canvas );
+	useEffect( () => {
+		if ( previousCanvaMode === 'edit' ) {
+			toggleRef.current?.focus();
+		}
+		// Should not depend on the previous canvas mode value but the next.
+	}, [ canvas ] );
 
 	return (
 		<>
 			<CommandMenu />
 			<KeyboardShortcutsRegister />
 			<KeyboardShortcutsGlobal />
-			{ fullResizer }
 			<div
 				{ ...navigateRegionsProps }
 				ref={ navigateRegionsProps.ref }
-				className={ classnames(
+				className={ clsx(
 					'edit-site-layout',
 					navigateRegionsProps.className,
 					{
-						'is-distraction-free': isDistractionFree && isEditing,
-						'is-full-canvas': isFullCanvas,
-						'is-edit-mode': isEditing,
-						'has-fixed-toolbar': hasFixedToolbar,
-						'is-block-toolbar-visible': hasBlockSelected,
+						'is-full-canvas': canvas === 'edit',
 					}
 				) }
 			>
-				<motion.div
-					className="edit-site-layout__header-container"
-					variants={ {
-						isDistractionFree: {
-							opacity: 0,
-							transition: {
-								type: 'tween',
-								delay: 0.8,
-								delayChildren: 0.8,
-							}, // How long to wait before the header exits
-						},
-						isDistractionFreeHovering: {
-							opacity: 1,
-							transition: {
-								type: 'tween',
-								delay: 0.2,
-								delayChildren: 0.2,
-							}, // How long to wait before the header shows
-						},
-						view: { opacity: 1 },
-						edit: { opacity: 1 },
-					} }
-					whileHover={
-						isDistractionFree
-							? 'isDistractionFreeHovering'
-							: undefined
-					}
-					animate={ headerAnimationState }
-				>
-					<SiteHub
-						isTransparent={ isResizableFrameOversized }
-						className="edit-site-layout__hub"
-					/>
-
-					<AnimatePresence initial={ false }>
-						{ isEditorPage && isEditing && (
-							<NavigableRegion
-								key="header"
-								className="edit-site-layout__header"
-								ariaLabel={ __( 'Editor top bar' ) }
-								as={ motion.div }
-								variants={ {
-									isDistractionFree: { opacity: 0, y: 0 },
-									isDistractionFreeHovering: {
-										opacity: 1,
-										y: 0,
-									},
-									view: { opacity: 1, y: '-100%' },
-									edit: { opacity: 1, y: 0 },
-								} }
-								exit={ {
-									y: '-100%',
-								} }
-								initial={ {
-									opacity: isDistractionFree ? 1 : 0,
-									y: isDistractionFree ? 0 : '-100%',
-								} }
-								transition={ {
-									type: 'tween',
-									duration: disableMotion ? 0 : 0.2,
-									ease: 'easeOut',
-								} }
-							>
-								<Header
-									setListViewToggleElement={
-										setListViewToggleElement
-									}
-								/>
-							</NavigableRegion>
-						) }
-					</AnimatePresence>
-				</motion.div>
-
 				<div className="edit-site-layout__content">
 					{ /*
 						The NavigableRegion must always be rendered and not use
 						`inert` otherwise `useNavigateRegions` will fail.
 					*/ }
-					<NavigableRegion
-						ariaLabel={ __( 'Navigation' ) }
-						className="edit-site-layout__sidebar-region"
-					>
-						<motion.div
-							// The sidebar is needed for routing on mobile
-							// (https://github.com/WordPress/gutenberg/pull/51558/files#r1231763003),
-							// so we can't remove the element entirely. Using `inert` will make
-							// it inaccessible to screen readers and keyboard navigation.
-							inert={ showSidebar ? undefined : 'true' }
-							animate={ { opacity: showSidebar ? 1 : 0 } }
-							transition={ {
-								type: 'tween',
-								duration:
-									// Disable transition in mobile to emulate a full page transition.
-									disableMotion || isMobileViewport
-										? 0
-										: ANIMATION_DURATION,
-								ease: 'easeOut',
-							} }
-							className="edit-site-layout__sidebar"
+					{ ( ! isMobileViewport || ! areas.mobile ) && (
+						<NavigableRegion
+							ariaLabel={ __( 'Navigation' ) }
+							className="edit-site-layout__sidebar-region"
 						>
-							<Sidebar />
-						</motion.div>
-					</NavigableRegion>
+							<AnimatePresence>
+								{ canvas === 'view' && (
+									<motion.div
+										initial={ { opacity: 0 } }
+										animate={ { opacity: 1 } }
+										exit={ { opacity: 0 } }
+										transition={ {
+											type: 'tween',
+											duration:
+												// Disable transition in mobile to emulate a full page transition.
+												disableMotion ||
+												isMobileViewport
+													? 0
+													: ANIMATION_DURATION,
+											ease: 'easeOut',
+										} }
+										className="edit-site-layout__sidebar"
+									>
+										<SiteHub
+											ref={ toggleRef }
+											isTransparent={
+												isResizableFrameOversized
+											}
+										/>
+										<SidebarContent routeKey={ routeKey }>
+											{ areas.sidebar }
+										</SidebarContent>
+										<SaveHub />
+										<SavePanel />
+									</motion.div>
+								) }
+							</AnimatePresence>
+						</NavigableRegion>
+					) }
+
+					<EditorSnackbars />
+
+					{ isMobileViewport && areas.mobile && (
+						<div className="edit-site-layout__mobile">
+							{ canvas !== 'edit' && (
+								<SidebarContent routeKey={ routeKey }>
+									<SiteHubMobile
+										ref={ toggleRef }
+										isTransparent={
+											isResizableFrameOversized
+										}
+									/>
+								</SidebarContent>
+							) }
+							{ areas.mobile }
+						</div>
+					) }
 
-					<SavePanel />
+					{ ! isMobileViewport &&
+						areas.content &&
+						canvas !== 'edit' && (
+							<div
+								className="edit-site-layout__area"
+								style={ {
+									maxWidth: widths?.content,
+								} }
+							>
+								{ areas.content }
+							</div>
+						) }
 
-					{ showCanvas && (
-						<>
-							{ isListPage && <PageMain /> }
-							{ isEditorPage && (
+					{ ! isMobileViewport && areas.edit && canvas !== 'edit' && (
+						<div
+							className="edit-site-layout__area"
+							style={ {
+								maxWidth: widths?.edit,
+							} }
+						>
+							{ areas.edit }
+						</div>
+					) }
+
+					{ ! isMobileViewport && areas.preview && (
+						<div className="edit-site-layout__canvas-container">
+							{ canvasResizer }
+							{ !! canvasSize.width && (
 								<div
-									className={ classnames(
-										'edit-site-layout__canvas-container',
+									className={ clsx(
+										'edit-site-layout__canvas',
 										{
-											'is-resizing': isResizing,
+											'is-right-aligned':
+												isResizableFrameOversized,
 										}
 									) }
+									ref={ animationRef }
 								>
-									{ canvasResizer }
-									{ !! canvasSize.width && (
-										<motion.div
-											whileHover={
-												isEditorPage &&
-												canvasMode === 'view'
-													? {
-															scale: 1.005,
-															transition: {
-																duration:
-																	disableMotion ||
-																	isResizing
-																		? 0
-																		: 0.5,
-																ease: 'easeOut',
-															},
-													  }
-													: {}
+									<ErrorBoundary>
+										<ResizableFrame
+											isReady={ ! isEditorLoading }
+											isFullWidth={ canvas === 'edit' }
+											defaultSize={ {
+												width:
+													canvasSize.width -
+													24 /* $canvas-padding */,
+												height: canvasSize.height,
+											} }
+											isOversized={
+												isResizableFrameOversized
 											}
-											initial={ false }
-											layout="position"
-											className={ classnames(
-												'edit-site-layout__canvas',
-												{
-													'is-right-aligned':
-														isResizableFrameOversized,
-												}
-											) }
-											transition={ {
-												type: 'tween',
-												duration:
-													disableMotion || isResizing
-														? 0
-														: ANIMATION_DURATION,
-												ease: 'easeOut',
+											setIsOversized={
+												setIsResizableFrameOversized
+											}
+											innerContentStyle={ {
+												background:
+													gradientValue ??
+													backgroundColor,
 											} }
 										>
-											<ErrorBoundary>
-												<ResizableFrame
-													isReady={
-														! isEditorLoading
-													}
-													isFullWidth={ isEditing }
-													defaultSize={ {
-														width:
-															canvasSize.width -
-															24 /* $canvas-padding */,
-														height: canvasSize.height,
-													} }
-													isOversized={
-														isResizableFrameOversized
-													}
-													setIsOversized={
-														setIsResizableFrameOversized
-													}
-													innerContentStyle={ {
-														background:
-															gradientValue ??
-															backgroundColor,
-													} }
-												>
-													<Editor
-														listViewToggleElement={
-															listViewToggleElement
-														}
-														isLoading={
-															isEditorLoading
-														}
-													/>
-												</ResizableFrame>
-											</ErrorBoundary>
-										</motion.div>
-									) }
+											{ areas.preview }
+										</ResizableFrame>
+									</ErrorBoundary>
 								</div>
 							) }
-						</>
+						</div>
 					) }
 				</div>
 			</div>
diff --git a/packages/edit-site/src/components/layout/router.js b/packages/edit-site/src/components/layout/router.js
new file mode 100644
index 00000000000000..912a837555e0d1
--- /dev/null
+++ b/packages/edit-site/src/components/layout/router.js
@@ -0,0 +1,86 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useEffect, useMemo } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import {
+	NAVIGATION_POST_TYPE,
+	PATTERN_TYPES,
+	TEMPLATE_PART_POST_TYPE,
+	TEMPLATE_POST_TYPE,
+} from '../../utils/constants';
+import { store as editSiteStore } from '../../store';
+
+const { useLocation, useHistory } = unlock( routerPrivateApis );
+
+function useRedirectOldPaths() {
+	const history = useHistory();
+	const { params } = useLocation();
+	useEffect( () => {
+		const { postType, path, categoryType, ...rest } = params;
+
+		if ( path === '/wp_template_part/all' ) {
+			history.replace( { postType: TEMPLATE_PART_POST_TYPE } );
+		}
+
+		if ( path === '/page' ) {
+			history.replace( {
+				postType: 'page',
+				...rest,
+			} );
+		}
+
+		if ( path === '/wp_template' ) {
+			history.replace( {
+				postType: TEMPLATE_POST_TYPE,
+				...rest,
+			} );
+		}
+
+		if ( path === '/patterns' ) {
+			history.replace( {
+				postType:
+					categoryType === TEMPLATE_PART_POST_TYPE
+						? TEMPLATE_PART_POST_TYPE
+						: PATTERN_TYPES.user,
+				...rest,
+			} );
+		}
+
+		if ( path === '/navigation' ) {
+			history.replace( {
+				postType: NAVIGATION_POST_TYPE,
+				...rest,
+			} );
+		}
+	}, [ history, params ] );
+}
+
+export default function useActiveRoute() {
+	const { params } = useLocation();
+	useRedirectOldPaths();
+	const routes = useSelect( ( select ) => {
+		return unlock( select( editSiteStore ) ).getRoutes();
+	}, [] );
+	return useMemo( () => {
+		const matchedRoute = routes.find( ( route ) => route.match( params ) );
+		if ( ! matchedRoute ) {
+			return {
+				key: 404,
+				areas: {},
+				widths: {},
+			};
+		}
+
+		return {
+			name: matchedRoute.name,
+			areas: matchedRoute.areas,
+			widths: matchedRoute.widths,
+		};
+	}, [ routes, params ] );
+}
diff --git a/packages/edit-site/src/components/layout/style.scss b/packages/edit-site/src/components/layout/style.scss
index 3bea97862b1c4c..2c7e6ce1b10c8b 100644
--- a/packages/edit-site/src/components/layout/style.scss
+++ b/packages/edit-site/src/components/layout/style.scss
@@ -4,51 +4,10 @@
 	color: $gray-400;
 	display: flex;
 	flex-direction: column;
-}
-
-.edit-site-layout__hub {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: calc(100vw - #{$canvas-padding * 2});
-	height: $header-height;
-	z-index: z-index(".edit-site-layout__hub");
-
-	.edit-site-layout.is-full-canvas.is-edit-mode & {
-		width: $header-height;
-		padding-right: 0;
-	}
-
-	@include break-medium {
-		width: calc(#{$nav-sidebar-width} - #{$canvas-padding});
-	}
-
-	.edit-site-layout.is-full-canvas & {
-		padding-right: $grid-unit-20;
-		border-radius: 0;
-		width: 100vw;
-		box-shadow: none;
-
-		@include break-medium {
-			width: auto;
-			padding-right: 0;
-		}
-	}
-}
-
-.edit-site-layout__header-container {
-	z-index: z-index(".edit-site-layout__header-container");
-}
 
-.edit-site-layout__header {
-	height: $header-height;
-	display: flex;
-	z-index: z-index(".edit-site-layout__header");
-
-	// This is only necessary for the exit animation
-	.edit-site-layout:not(.is-full-canvas) & {
-		position: fixed;
-		width: 100vw;
+	// Show a dark background in "frame" mode to avoid edge artifacts.
+	&:not(.is-full-canvas) .editor-visual-editor {
+		background: $gray-900;
 	}
 }
 
@@ -93,10 +52,30 @@
 	flex-direction: column;
 }
 
+.edit-site-layout__mobile {
+	position: relative;
+	width: 100%;
+	z-index: z-index(".edit-site-layout__canvas-container");
+
+	/*
+	 * The SiteHubMobile component is displayed
+	 * for pages that do not have a sidebar,
+	 * yet it needs the Sidebar component for the React context.
+	 *
+	 * This removes the padding in this scenario.
+	 * See https://github.com/WordPress/gutenberg/pull/63118
+	 */
+	.edit-site-sidebar__screen-wrapper {
+		padding: 0;
+	}
+}
+
 .edit-site-layout__canvas-container {
 	position: relative;
 	flex-grow: 1;
 	z-index: z-index(".edit-site-layout__canvas-container");
+	// When animating the frame size can exceed its container size.
+	overflow: visible;
 
 	&.is-resizing::after {
 		// This covers the whole content which ensures mouse up triggers
@@ -125,7 +104,7 @@
 		justify-content: flex-end;
 	}
 
-	& > div {
+	.edit-site-resizable-frame__inner {
 		color: $gray-900;
 	}
 
@@ -134,43 +113,65 @@
 		bottom: $canvas-padding;
 		width: calc(100% - #{$canvas-padding});
 
-		& > div {
-			border-radius: $radius-block-ui * 4;
-			// Not sure why this is necessary.
-			.edit-site-layout:not(.is-full-canvas) & .edit-site-visual-editor__editor-canvas,
-			.edit-site-layout:not(.is-full-canvas) & .interface-interface-skeleton__content {
-				border-radius: $radius-block-ui * 4;
+		.edit-site-resizable-frame__inner-content {
+			box-shadow: $elevation-x-small;
+			transition: border-radius, box-shadow 0.4s;
+			// This ensure the radius work properly.
+			overflow: hidden;
+
+			.edit-site-layout:not(.is-full-canvas) & {
+				border-radius: $radius-large;
 			}
-		}
 
+			&:hover {
+				box-shadow: $elevation-large;
+			}
+		}
 	}
 
 	.edit-site-layout.is-full-canvas & {
 		top: 0;
 		bottom: 0;
 		width: 100%;
-
-		& > div {
-			border-radius: 0;
-		}
 	}
 }
 
 // This shouldn't be necessary (we should have a way to say that a skeletton is relative
+.edit-site-layout__mobile .interface-interface-skeleton,
 .edit-site-layout__canvas .interface-interface-skeleton,
-.edit-site-page-pages-preview .interface-interface-skeleton {
+.edit-site-template-pages-preview .interface-interface-skeleton {
 	position: relative !important;
 	min-height: 100% !important;
 }
 
-.edit-site-page-pages-preview {
+.edit-site-template-pages-preview {
 	height: 100%;
 }
 
+/* stylelint-disable -- Disable reason: View Transitions not supported properly by stylelint. */
+html.canvas-mode-edit-transition::view-transition-group(toggle) {
+	animation-delay: 255ms;
+}
+
+@media (prefers-reduced-motion) {
+	::view-transition-group(*),
+	::view-transition-old(*),
+	::view-transition-new(*) {
+		animation: none !important;
+	}
+}
+/* stylelint-enable  */
+
+.edit-site-layout.is-full-canvas .edit-site-layout__sidebar-region .edit-site-layout__view-mode-toggle {
+	display: none;
+}
+
 .edit-site-layout__view-mode-toggle.components-button {
+	/* stylelint-disable -- Disable reason: View Transitions not supported properly by stylelint. */
+	view-transition-name: toggle;
+	/* stylelint-enable  */
 	position: relative;
 	color: $white;
-	border-radius: 0;
 	height: $header-height;
 	width: $header-height;
 	overflow: hidden;
@@ -178,20 +179,19 @@
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	border-bottom: 1px solid transparent;
-
-	.edit-site-layout.is-full-canvas.is-edit-mode & {
-		border-bottom-color: $gray-200;
-		transition: border-bottom-color 0.15s 0.4s ease-out;
-	}
+	background: $gray-900;
+	border-radius: 0;
 
 	&:hover,
 	&:active {
 		color: $white;
 	}
 
+	&:focus-visible,
 	&:focus {
-		box-shadow: none;
+		box-shadow: 0 0 0 3px #1e1e1e, 0 0 0 6px var(--wp-admin-theme-color);
+		outline: 4px solid #0000;
+		outline-offset: 4px;
 	}
 
 	&::before {
@@ -204,22 +204,14 @@
 		right: 9px;
 		bottom: 9px;
 		left: 9px;
-		border-radius: $radius-block-ui + $border-width + $border-width;
+		border-radius: $radius-medium;
 		box-shadow: none;
 	}
 
-	// Lightened spot color focus.
-	&:focus::before {
-		box-shadow:
-			inset 0 0 0 var(--wp-admin-border-width-focus) rgba($white, 0.1),
-			inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-	}
-
 	.edit-site-layout__view-mode-toggle-icon {
 		display: flex;
-		border-radius: $radius-block-ui;
-		height: $grid-unit-80;
-		width: $grid-unit-80;
+		height: $header-height;
+		width: $header-height;
 		justify-content: center;
 		align-items: center;
 	}
@@ -254,42 +246,21 @@
 	}
 }
 
-.is-edit-mode.is-distraction-free {
-
-	.edit-site-layout__header-container {
-		height: $header-height;
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		z-index: z-index(".edit-site-layout__header-container");
-		width: 100%;
-
-		// We need ! important because we override inline styles
-		// set by the motion component.
-		&:focus-within {
-			opacity: 1 !important;
-			div {
-				transform: translateX(0) translateY(0) translateZ(0) !important;
-			}
-
-			.edit-site-layout__header {
-				opacity: 1 !important;
-			}
-		}
-	}
-
-	.edit-site-site-hub,
-	.edit-site-layout__header {
-		position: absolute;
-		top: 0;
-		z-index: z-index(".edit-site-layout__header");
-	}
-	.edit-site-site-hub {
-		z-index: z-index(".edit-site-layout__hub");
-	}
-	.edit-site-layout__header {
-		width: 100%;
+.edit-site-layout__area {
+	flex-grow: 1;
+	margin: 0;
+	overflow: hidden;
+	box-shadow: $elevation-x-small;
+	@include break-medium() {
+		border-radius: 8px;
+		margin: $canvas-padding $canvas-padding $canvas-padding 0;
 	}
+}
 
+.edit-site .components-editor-notices__snackbar {
+	position: fixed;
+	right: 0;
+	bottom: 16px;
+	padding-left: 16px;
+	padding-right: 16px;
 }
diff --git a/packages/edit-site/src/components/list/added-by.js b/packages/edit-site/src/components/list/added-by.js
deleted file mode 100644
index a7ed2c4099547f..00000000000000
--- a/packages/edit-site/src/components/list/added-by.js
+++ /dev/null
@@ -1,165 +0,0 @@
-// @ts-check
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { Icon, __experimentalHStack as HStack } from '@wordpress/components';
-import { store as coreStore } from '@wordpress/core-data';
-import { useSelect } from '@wordpress/data';
-import { useState } from '@wordpress/element';
-import {
-	commentAuthorAvatar as authorIcon,
-	layout as themeIcon,
-	plugins as pluginIcon,
-	globe as globeIcon,
-} from '@wordpress/icons';
-import { _x } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import { TEMPLATE_POST_TYPE, TEMPLATE_ORIGINS } from '../../utils/constants';
-
-/** @typedef {'wp_template'|'wp_template_part'} TemplateType */
-
-/**
- * @typedef {'theme'|'plugin'|'site'|'user'} AddedByType
- *
- * @typedef AddedByData
- * @type {Object}
- * @property {AddedByType}  type         The type of the data.
- * @property {JSX.Element}  icon         The icon to display.
- * @property {string}       [imageUrl]   The optional image URL to display.
- * @property {string}       [text]       The text to display.
- * @property {boolean}      isCustomized Whether the template has been customized.
- *
- * @param    {TemplateType} postType     The template post type.
- * @param    {number}       postId       The template post id.
- * @return {AddedByData} The added by object or null.
- */
-export function useAddedBy( postType, postId ) {
-	return useSelect(
-		( select ) => {
-			const {
-				getEntityRecord,
-				getMedia,
-				getUser,
-				getEditedEntityRecord,
-			} = select( coreStore );
-			const template = getEditedEntityRecord(
-				'postType',
-				postType,
-				postId
-			);
-			const originalSource = template?.original_source;
-			const authorText = template?.author_text;
-
-			switch ( originalSource ) {
-				case 'theme': {
-					return {
-						type: originalSource,
-						icon: themeIcon,
-						text: authorText,
-						isCustomized:
-							template.source === TEMPLATE_ORIGINS.custom,
-					};
-				}
-				case 'plugin': {
-					return {
-						type: originalSource,
-						icon: pluginIcon,
-						text: authorText,
-						isCustomized:
-							template.source === TEMPLATE_ORIGINS.custom,
-					};
-				}
-				case 'site': {
-					const siteData = getEntityRecord(
-						'root',
-						'__unstableBase'
-					);
-					return {
-						type: originalSource,
-						icon: globeIcon,
-						imageUrl: siteData?.site_logo
-							? getMedia( siteData.site_logo )?.source_url
-							: undefined,
-						text: authorText,
-						isCustomized: false,
-					};
-				}
-				default: {
-					const user = getUser( template.author );
-					return {
-						type: 'user',
-						icon: authorIcon,
-						imageUrl: user?.avatar_urls?.[ 48 ],
-						text: authorText,
-						isCustomized: false,
-					};
-				}
-			}
-		},
-		[ postType, postId ]
-	);
-}
-
-/**
- * @param {Object} props
- * @param {string} props.imageUrl
- */
-export function AvatarImage( { imageUrl } ) {
-	const [ isImageLoaded, setIsImageLoaded ] = useState( false );
-
-	return (
-		<div
-			className={ classnames( 'edit-site-list-added-by__avatar', {
-				'is-loaded': isImageLoaded,
-			} ) }
-		>
-			<img
-				onLoad={ () => setIsImageLoaded( true ) }
-				alt=""
-				src={ imageUrl }
-			/>
-		</div>
-	);
-}
-
-/**
- * @param {Object}       props
- * @param {TemplateType} props.postType The template post type.
- * @param {number}       props.postId   The template post id.
- */
-export default function AddedBy( { postType, postId } ) {
-	const { text, icon, imageUrl, isCustomized } = useAddedBy(
-		postType,
-		postId
-	);
-
-	return (
-		<HStack alignment="left">
-			{ imageUrl ? (
-				<AvatarImage imageUrl={ imageUrl } />
-			) : (
-				<div className="edit-site-list-added-by__icon">
-					<Icon icon={ icon } />
-				</div>
-			) }
-			<span>
-				{ text }
-				{ isCustomized && (
-					<span className="edit-site-list-added-by__customized-info">
-						{ postType === TEMPLATE_POST_TYPE
-							? _x( 'Customized', 'template' )
-							: _x( 'Customized', 'template part' ) }
-					</span>
-				) }
-			</span>
-		</HStack>
-	);
-}
diff --git a/packages/edit-site/src/components/list/header.js b/packages/edit-site/src/components/list/header.js
deleted file mode 100644
index 5468c271fe628d..00000000000000
--- a/packages/edit-site/src/components/list/header.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import { __experimentalHeading as Heading } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import AddNewTemplate from '../add-new-template';
-import { store as editSiteStore } from '../../store';
-
-export default function Header( { templateType } ) {
-	const { canCreate, postType } = useSelect(
-		( select ) => {
-			const { supportsTemplatePartsMode } =
-				select( editSiteStore ).getSettings();
-			return {
-				postType: select( coreStore ).getPostType( templateType ),
-				canCreate: ! supportsTemplatePartsMode,
-			};
-		},
-		[ templateType ]
-	);
-
-	if ( ! postType ) {
-		return null;
-	}
-
-	return (
-		<header className="edit-site-list-header">
-			<Heading level={ 1 } className="edit-site-list-header__title">
-				{ postType.labels?.name }
-			</Heading>
-
-			{ canCreate && (
-				<div className="edit-site-list-header__right">
-					<AddNewTemplate
-						templateType={ templateType }
-						showIcon={ false }
-						toggleProps={ { variant: 'primary' } }
-					/>
-				</div>
-			) }
-		</header>
-	);
-}
diff --git a/packages/edit-site/src/components/list/index.js b/packages/edit-site/src/components/list/index.js
deleted file mode 100644
index 4fcf27239f05e2..00000000000000
--- a/packages/edit-site/src/components/list/index.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { store as coreStore } from '@wordpress/core-data';
-import { useSelect } from '@wordpress/data';
-import { InterfaceSkeleton } from '@wordpress/interface';
-import { __, sprintf } from '@wordpress/i18n';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-import { EditorSnackbars } from '@wordpress/editor';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import useRegisterShortcuts from './use-register-shortcuts';
-import Header from './header';
-import Table from './table';
-import useTitle from '../routes/use-title';
-import { unlock } from '../../lock-unlock';
-import {
-	TEMPLATE_POST_TYPE,
-	TEMPLATE_PART_POST_TYPE,
-} from '../../utils/constants';
-
-const { useLocation } = unlock( routerPrivateApis );
-
-export default function List() {
-	const {
-		params: { path },
-	} = useLocation();
-	const templateType =
-		path === '/wp_template/all'
-			? TEMPLATE_POST_TYPE
-			: TEMPLATE_PART_POST_TYPE;
-
-	useRegisterShortcuts();
-
-	const { previousShortcut, nextShortcut } = useSelect( ( select ) => {
-		return {
-			previousShortcut: select(
-				keyboardShortcutsStore
-			).getAllShortcutKeyCombinations( 'core/edit-site/previous-region' ),
-			nextShortcut: select(
-				keyboardShortcutsStore
-			).getAllShortcutKeyCombinations( 'core/edit-site/next-region' ),
-		};
-	}, [] );
-
-	const postType = useSelect(
-		( select ) => select( coreStore ).getPostType( templateType ),
-		[ templateType ]
-	);
-
-	useTitle( postType?.labels?.name );
-
-	// `postType` could load in asynchronously. Only provide the detailed region labels if
-	// the postType has loaded, otherwise `InterfaceSkeleton` will fallback to the defaults.
-	const itemsListLabel = postType?.labels?.items_list;
-	const detailedRegionLabels = postType
-		? {
-				header: sprintf(
-					// translators: %s - the name of the page, 'Header' as in the header area of that page.
-					__( '%s - Header' ),
-					itemsListLabel
-				),
-				body: sprintf(
-					// translators: %s - the name of the page, 'Content' as in the content area of that page.
-					__( '%s - Content' ),
-					itemsListLabel
-				),
-		  }
-		: undefined;
-
-	return (
-		<InterfaceSkeleton
-			className="edit-site-list"
-			labels={ detailedRegionLabels }
-			header={ <Header templateType={ templateType } /> }
-			notices={ <EditorSnackbars /> }
-			content={ <Table templateType={ templateType } /> }
-			shortcuts={ {
-				previous: previousShortcut,
-				next: nextShortcut,
-			} }
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/list/style.scss b/packages/edit-site/src/components/list/style.scss
deleted file mode 100644
index 4739243b7dc295..00000000000000
--- a/packages/edit-site/src/components/list/style.scss
+++ /dev/null
@@ -1,193 +0,0 @@
-.edit-site-list-header {
-	position: relative;
-	align-items: center;
-	display: flex;
-	height: $header-height;
-	box-sizing: border-box;
-	width: 100%;
-	justify-content: flex-end;
-	padding-right: $grid-unit-20;
-
-	body.is-fullscreen-mode & {
-		padding-left: 60px;
-		transition: padding-left 20ms linear;
-		transition-delay: 80ms;
-		@include reduce-motion("transition");
-	}
-
-	.edit-site-list-header__title {
-		position: absolute;
-		left: 0;
-		width: 100%;
-		text-align: center;
-		font-size: 20px;
-		padding: 0;
-		margin: 0;
-	}
-}
-
-.edit-site-list-header__right {
-	// Creating a stacking context so that it won't be covered by title.
-	position: relative;
-}
-
-.edit-site {
-	.edit-site-list {
-		flex-grow: 1;
-		background: $white;
-		border-radius: $radius-block-ui * 4;
-		box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.8), 0 8px 10px -6px rgba(0, 0, 0, 0.8);
-
-		.interface-interface-skeleton__editor {
-			min-width: 100%;
-
-			@include break-medium() {
-				min-width: 0;
-			}
-		}
-
-		.interface-interface-skeleton__content {
-			background: $white;
-			padding: $grid-unit-20;
-			align-items: center;
-
-			@include break-medium() {
-				padding: $grid-unit * 9;
-			}
-		}
-	}
-}
-
-.edit-site-list-table {
-	min-width: 100%;
-	border: $border-width solid $gray-300;
-	border-radius: 2px;
-	margin: 0 auto;
-	overflow: hidden;
-	border-spacing: 0;
-	max-width: 960px;
-
-	tr {
-		display: flex;
-		align-items: center;
-		padding: $grid-unit-20;
-		box-sizing: border-box;
-		border-top: $border-width solid $gray-100;
-		margin: 0;
-
-		&:first-child {
-			border-top: 0;
-		}
-
-		@include break-medium() {
-			padding: $grid-unit-30 $grid-unit-40;
-		}
-
-		// Template.
-		.edit-site-list-table-column:nth-child(1) {
-			width: calc(60% - 18px);
-			padding-right: $grid-unit-30;
-
-			a {
-				display: inline-block;
-				text-decoration: none;
-				font-weight: 500;
-				margin-bottom: $grid-unit-05;
-			}
-		}
-
-		// Added by.
-		.edit-site-list-table-column:nth-child(2) {
-			width: calc(40% - 18px);
-			word-break: break-word;
-		}
-
-		// Actions.
-		.edit-site-list-table-column:nth-child(3) {
-			min-width: $button-size;
-			flex-shrink: 0;
-		}
-	}
-
-	tr.edit-site-list-table-head {
-		font-size: 16px;
-		font-weight: 600;
-		text-align: left;
-		color: $gray-900;
-		border-top: none;
-		border-bottom: $border-width solid $gray-300;
-
-		th {
-			font-weight: inherit;
-		}
-	}
-}
-
-.edit-site-list.is-navigation-open .components-snackbar-list {
-	@include break-medium() {
-		margin-left: $nav-sidebar-width;
-	}
-}
-
-.edit-site-list__rename-modal {
-	// The rename dropdown popover is open at the same time as the rename modal. The latter has to be higher.
-	z-index: z-index(".edit-site-list__rename-modal");
-	.components-base-control {
-		@include break-medium() {
-			width: $grid-unit * 40;
-		}
-	}
-}
-
-.edit-site-template__actions {
-	button:not(:last-child) {
-		margin-right: $grid-unit-10;
-	}
-}
-
-.edit-site-list-added-by__icon {
-	display: flex;
-	flex-shrink: 0;
-	width: $grid-unit-30;
-	height: $grid-unit-30;
-
-	svg {
-		fill: currentColor;
-	}
-}
-
-.edit-site-list-added-by__avatar {
-	flex-shrink: 0;
-	overflow: hidden;
-	width: $grid-unit-30;
-	height: $grid-unit-30;
-	align-items: center;
-	justify-content: center;
-	display: flex;
-
-	img {
-		width: 20px;
-		height: 20px;
-		object-fit: cover;
-		opacity: 0;
-		transition: opacity 0.1s linear;
-		@include reduce-motion("transition");
-		border-radius: 100%;
-	}
-
-	&.is-loaded {
-		img {
-			opacity: 1;
-		}
-	}
-}
-
-.edit-site-list-added-by__customized-info {
-	display: block;
-	color: $gray-700;
-}
-
-.edit-site-list-title__customized-info {
-	font-size: 1.3em;
-	font-weight: 600;
-}
diff --git a/packages/edit-site/src/components/list/table.js b/packages/edit-site/src/components/list/table.js
deleted file mode 100644
index 18198cb600ddae..00000000000000
--- a/packages/edit-site/src/components/list/table.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { store as coreStore, useEntityRecords } from '@wordpress/core-data';
-import { __, sprintf } from '@wordpress/i18n';
-import {
-	VisuallyHidden,
-	__experimentalHeading as Heading,
-} from '@wordpress/components';
-import { decodeEntities } from '@wordpress/html-entities';
-
-/**
- * Internal dependencies
- */
-import TemplateActions from '../template-actions';
-import Link from '../routes/link';
-import AddedBy from './added-by';
-
-export default function Table( { templateType } ) {
-	const { records: allTemplates } = useEntityRecords(
-		'postType',
-		templateType,
-		{
-			per_page: -1,
-		}
-	);
-
-	const templates = useSelect(
-		( select ) =>
-			allTemplates?.filter(
-				( template ) =>
-					! select( coreStore ).isDeletingEntityRecord(
-						'postType',
-						templateType,
-						template.id
-					)
-			),
-		[ allTemplates ]
-	);
-
-	const postType = useSelect(
-		( select ) => select( coreStore ).getPostType( templateType ),
-		[ templateType ]
-	);
-
-	if ( ! templates ) {
-		return null;
-	}
-
-	if ( ! templates.length ) {
-		return (
-			<div>
-				{ sprintf(
-					// translators: The template type name, should be either "templates" or "template parts".
-					__( 'No %s found.' ),
-					postType?.labels?.name?.toLowerCase()
-				) }
-			</div>
-		);
-	}
-
-	const sortedTemplates = [ ...templates ];
-	sortedTemplates.sort( ( a, b ) =>
-		a.title.rendered.localeCompare( b.title.rendered )
-	);
-
-	return (
-		// These explicit aria roles are needed for Safari.
-		// See https://developer.mozilla.org/en-US/docs/Web/CSS/display#tables
-		<table className="edit-site-list-table" role="table">
-			<thead>
-				<tr className="edit-site-list-table-head" role="row">
-					<th
-						className="edit-site-list-table-column"
-						role="columnheader"
-					>
-						{ __( 'Template' ) }
-					</th>
-					<th
-						className="edit-site-list-table-column"
-						role="columnheader"
-					>
-						{ __( 'Added by' ) }
-					</th>
-					<th
-						className="edit-site-list-table-column"
-						role="columnheader"
-					>
-						<VisuallyHidden>{ __( 'Actions' ) }</VisuallyHidden>
-					</th>
-				</tr>
-			</thead>
-
-			<tbody>
-				{ sortedTemplates.map( ( template ) => (
-					<tr
-						key={ template.id }
-						className="edit-site-list-table-row"
-						role="row"
-					>
-						<td className="edit-site-list-table-column" role="cell">
-							<Heading level={ 4 }>
-								<Link
-									params={ {
-										postId: template.id,
-										postType: template.type,
-										canvas: 'edit',
-									} }
-								>
-									{ decodeEntities(
-										template.title?.rendered ||
-											template.slug
-									) }
-								</Link>
-							</Heading>
-							{ decodeEntities( template.description ) }
-						</td>
-
-						<td className="edit-site-list-table-column" role="cell">
-							{ template ? (
-								<AddedBy
-									postType={ template.type }
-									postId={ template.id }
-								/>
-							) : null }
-						</td>
-						<td className="edit-site-list-table-column" role="cell">
-							<TemplateActions
-								postType={ template.type }
-								postId={ template.id }
-								className="edit-site-list-table__actions"
-							/>
-						</td>
-					</tr>
-				) ) }
-			</tbody>
-		</table>
-	);
-}
diff --git a/packages/edit-site/src/components/list/use-register-shortcuts.js b/packages/edit-site/src/components/list/use-register-shortcuts.js
deleted file mode 100644
index f31b4a3808a22e..00000000000000
--- a/packages/edit-site/src/components/list/use-register-shortcuts.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * WordPress dependencies
- */
-
-import { useDispatch } from '@wordpress/data';
-import { useEffect } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
-
-export default function useRegisterShortcuts() {
-	const { registerShortcut } = useDispatch( keyboardShortcutsStore );
-	useEffect( () => {
-		registerShortcut( {
-			name: 'core/edit-site/next-region',
-			category: 'global',
-			description: __( 'Navigate to the next part of the editor.' ),
-			keyCombination: {
-				modifier: 'ctrl',
-				character: '`',
-			},
-			aliases: [
-				{
-					modifier: 'access',
-					character: 'n',
-				},
-			],
-		} );
-
-		registerShortcut( {
-			name: 'core/edit-site/previous-region',
-			category: 'global',
-			description: __( 'Navigate to the previous part of the editor.' ),
-			keyCombination: {
-				modifier: 'ctrlShift',
-				character: '`',
-			},
-			aliases: [
-				{
-					modifier: 'access',
-					character: 'p',
-				},
-				{
-					modifier: 'ctrlShift',
-					character: '~',
-				},
-			],
-		} );
-	}, [] );
-}
diff --git a/packages/edit-site/src/components/media/index.js b/packages/edit-site/src/components/media/index.js
index 7df6c4f882842e..e103e6bcddb5b2 100644
--- a/packages/edit-site/src/components/media/index.js
+++ b/packages/edit-site/src/components/media/index.js
@@ -8,18 +8,16 @@ function Media( { id, size = [ 'large', 'medium', 'thumbnail' ], ...props } ) {
 	const currentSize = size.find(
 		( s ) => !! media?.media_details?.sizes[ s ]
 	);
-	const mediaDetails = media?.media_details?.sizes[ currentSize ];
-	if ( ! mediaDetails ) {
+
+	const mediaUrl =
+		media?.media_details?.sizes[ currentSize ]?.source_url ||
+		media?.source_url;
+
+	if ( ! mediaUrl ) {
 		return null;
 	}
 
-	return (
-		<img
-			{ ...props }
-			src={ mediaDetails.source_url }
-			alt={ media.alt_text }
-		/>
-	);
+	return <img { ...props } src={ mediaUrl } alt={ media.alt_text } />;
 }
 
 export default Media;
diff --git a/packages/edit-site/src/components/more-menu/index.js b/packages/edit-site/src/components/more-menu/index.js
new file mode 100644
index 00000000000000..4c4e9bb45c093e
--- /dev/null
+++ b/packages/edit-site/src/components/more-menu/index.js
@@ -0,0 +1,31 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+
+/**
+ * Internal dependencies
+ */
+import SiteExport from './site-export';
+import WelcomeGuideMenuItem from './welcome-guide-menu-item';
+import { unlock } from '../../lock-unlock';
+
+const { ToolsMoreMenuGroup, PreferencesModal } = unlock( editorPrivateApis );
+
+export default function MoreMenu() {
+	const isBlockBasedTheme = useSelect( ( select ) => {
+		return select( coreStore ).getCurrentTheme().is_block_theme;
+	}, [] );
+
+	return (
+		<>
+			<ToolsMoreMenuGroup>
+				{ isBlockBasedTheme && <SiteExport /> }
+				<WelcomeGuideMenuItem />
+			</ToolsMoreMenuGroup>
+			<PreferencesModal />
+		</>
+	);
+}
diff --git a/packages/edit-site/src/components/header-edit-mode/more-menu/site-export.js b/packages/edit-site/src/components/more-menu/site-export.js
similarity index 100%
rename from packages/edit-site/src/components/header-edit-mode/more-menu/site-export.js
rename to packages/edit-site/src/components/more-menu/site-export.js
diff --git a/packages/edit-site/src/components/header-edit-mode/more-menu/welcome-guide-menu-item.js b/packages/edit-site/src/components/more-menu/welcome-guide-menu-item.js
similarity index 100%
rename from packages/edit-site/src/components/header-edit-mode/more-menu/welcome-guide-menu-item.js
rename to packages/edit-site/src/components/more-menu/welcome-guide-menu-item.js
diff --git a/packages/edit-site/src/components/page-actions/index.js b/packages/edit-site/src/components/page-actions/index.js
deleted file mode 100644
index d42a706c36796e..00000000000000
--- a/packages/edit-site/src/components/page-actions/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { DropdownMenu, MenuGroup } from '@wordpress/components';
-import { moreVertical } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import TrashPageMenuItem from './trash-page-menu-item';
-
-export default function PageActions( { postId, toggleProps, onRemove } ) {
-	return (
-		<DropdownMenu
-			icon={ moreVertical }
-			label={ __( 'Actions' ) }
-			toggleProps={ toggleProps }
-		>
-			{ () => (
-				<MenuGroup>
-					<TrashPageMenuItem
-						postId={ postId }
-						onRemove={ onRemove }
-					/>
-				</MenuGroup>
-			) }
-		</DropdownMenu>
-	);
-}
diff --git a/packages/edit-site/src/components/page-actions/trash-page-menu-item.js b/packages/edit-site/src/components/page-actions/trash-page-menu-item.js
deleted file mode 100644
index 6005465c8fa5f0..00000000000000
--- a/packages/edit-site/src/components/page-actions/trash-page-menu-item.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useDispatch, useSelect } from '@wordpress/data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { store as coreStore } from '@wordpress/core-data';
-import { __, sprintf } from '@wordpress/i18n';
-import { MenuItem } from '@wordpress/components';
-import { store as noticesStore } from '@wordpress/notices';
-
-export default function TrashPageMenuItem( { postId, onRemove } ) {
-	const { createSuccessNotice, createErrorNotice } =
-		useDispatch( noticesStore );
-	const { deleteEntityRecord } = useDispatch( coreStore );
-	const page = useSelect(
-		( select ) =>
-			select( coreStore ).getEntityRecord( 'postType', 'page', postId ),
-		[ postId ]
-	);
-	async function removePage() {
-		try {
-			await deleteEntityRecord(
-				'postType',
-				'page',
-				postId,
-				{},
-				{ throwOnError: true }
-			);
-			createSuccessNotice(
-				sprintf(
-					/* translators: The page's title. */
-					__( '"%s" moved to the Trash.' ),
-					decodeEntities( page.title.rendered )
-				),
-				{
-					type: 'snackbar',
-					id: 'edit-site-page-trashed',
-				}
-			);
-			onRemove?.();
-		} catch ( error ) {
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: __(
-							'An error occurred while moving the page to the trash.'
-					  );
-
-			createErrorNotice( errorMessage, { type: 'snackbar' } );
-		}
-	}
-	return (
-		<>
-			<MenuItem
-				onClick={ () => removePage() }
-				isDestructive
-				variant="secondary"
-			>
-				{ __( 'Move to Trash' ) }
-			</MenuItem>
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/page-content-focus-notifications/back-to-page-notification.js b/packages/edit-site/src/components/page-content-focus-notifications/back-to-page-notification.js
deleted file mode 100644
index 7cf963246bed81..00000000000000
--- a/packages/edit-site/src/components/page-content-focus-notifications/back-to-page-notification.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useEffect, useRef } from '@wordpress/element';
-import { store as noticesStore } from '@wordpress/notices';
-import { __ } from '@wordpress/i18n';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-
-/**
- * Component that displays a 'You are editing a template' notification when the
- * user switches from focusing on editing page content to editing a template.
- */
-export default function BackToPageNotification() {
-	useBackToPageNotification();
-	return null;
-}
-
-/**
- * Hook that displays a 'You are editing a template' notification when the user
- * switches from focusing on editing page content to editing a template.
- */
-export function useBackToPageNotification() {
-	const renderingMode = useSelect(
-		( select ) => select( editorStore ).getRenderingMode(),
-		[]
-	);
-	const { isPage } = useSelect( editSiteStore );
-	const { setRenderingMode } = useDispatch( editorStore );
-	const { createInfoNotice } = useDispatch( noticesStore );
-
-	const alreadySeen = useRef( false );
-
-	useEffect( () => {
-		if (
-			isPage() &&
-			! alreadySeen.current &&
-			renderingMode === 'template-only'
-		) {
-			createInfoNotice( __( 'You are editing a template.' ), {
-				isDismissible: true,
-				type: 'snackbar',
-				actions: [
-					{
-						label: __( 'Back to page' ),
-						onClick: () => setRenderingMode( 'template-locked' ),
-					},
-				],
-			} );
-			alreadySeen.current = true;
-		}
-	}, [ isPage, renderingMode, createInfoNotice, setRenderingMode ] );
-}
diff --git a/packages/edit-site/src/components/page-content-focus-notifications/edit-template-notification.js b/packages/edit-site/src/components/page-content-focus-notifications/edit-template-notification.js
deleted file mode 100644
index 8799eb4d661281..00000000000000
--- a/packages/edit-site/src/components/page-content-focus-notifications/edit-template-notification.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useEffect, useState, useRef } from '@wordpress/element';
-import { store as noticesStore } from '@wordpress/notices';
-import { __ } from '@wordpress/i18n';
-import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Component that:
- *
- * - Displays a 'Edit your template to edit this block' notification when the
- *   user is focusing on editing page content and clicks on a disabled template
- *   block.
- * - Displays a 'Edit your template to edit this block' dialog when the user
- *   is focusing on editing page conetnt and double clicks on a disabled
- *   template block.
- *
- * @param {Object}                                 props
- * @param {import('react').RefObject<HTMLElement>} props.contentRef Ref to the block
- *                                                                  editor iframe canvas.
- */
-export default function EditTemplateNotification( { contentRef } ) {
-	const renderingMode = useSelect(
-		( select ) => select( editorStore ).getRenderingMode(),
-		[]
-	);
-	const { getNotices } = useSelect( noticesStore );
-
-	const { createInfoNotice, removeNotice } = useDispatch( noticesStore );
-	const { setRenderingMode } = useDispatch( editorStore );
-
-	const [ isDialogOpen, setIsDialogOpen ] = useState( false );
-
-	const lastNoticeId = useRef( 0 );
-
-	useEffect( () => {
-		const handleClick = async ( event ) => {
-			if ( renderingMode === 'template-only' ) {
-				return;
-			}
-			if ( ! event.target.classList.contains( 'is-root-container' ) ) {
-				return;
-			}
-			const isNoticeAlreadyShowing = getNotices().some(
-				( notice ) => notice.id === lastNoticeId.current
-			);
-			if ( isNoticeAlreadyShowing ) {
-				return;
-			}
-			const { notice } = await createInfoNotice(
-				__( 'Edit your template to edit this block.' ),
-				{
-					isDismissible: true,
-					type: 'snackbar',
-					actions: [
-						{
-							label: __( 'Edit template' ),
-							onClick: () => setRenderingMode( 'template-only' ),
-						},
-					],
-				}
-			);
-			lastNoticeId.current = notice.id;
-		};
-
-		const handleDblClick = ( event ) => {
-			if ( renderingMode === 'template-only' ) {
-				return;
-			}
-			if ( ! event.target.classList.contains( 'is-root-container' ) ) {
-				return;
-			}
-			if ( lastNoticeId.current ) {
-				removeNotice( lastNoticeId.current );
-			}
-			setIsDialogOpen( true );
-		};
-
-		const canvas = contentRef.current;
-		canvas?.addEventListener( 'click', handleClick );
-		canvas?.addEventListener( 'dblclick', handleDblClick );
-		return () => {
-			canvas?.removeEventListener( 'click', handleClick );
-			canvas?.removeEventListener( 'dblclick', handleDblClick );
-		};
-	}, [ lastNoticeId, renderingMode, contentRef.current ] );
-
-	return (
-		<ConfirmDialog
-			isOpen={ isDialogOpen }
-			confirmButtonText={ __( 'Edit template' ) }
-			onConfirm={ () => {
-				setIsDialogOpen( false );
-				setRenderingMode( 'template-only' );
-			} }
-			onCancel={ () => setIsDialogOpen( false ) }
-		>
-			{ __( 'Edit your template to edit this block.' ) }
-		</ConfirmDialog>
-	);
-}
diff --git a/packages/edit-site/src/components/page-content-focus-notifications/index.js b/packages/edit-site/src/components/page-content-focus-notifications/index.js
deleted file mode 100644
index 3f76c91eeadeec..00000000000000
--- a/packages/edit-site/src/components/page-content-focus-notifications/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Internal dependencies
- */
-import EditTemplateNotification from './edit-template-notification';
-import BackToPageNotification from './back-to-page-notification';
-
-export default function PageContentFocusNotifications( { contentRef } ) {
-	return (
-		<>
-			<EditTemplateNotification contentRef={ contentRef } />
-			<BackToPageNotification />
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/page-main/index.js b/packages/edit-site/src/components/page-main/index.js
deleted file mode 100644
index e2b39e0ecd151d..00000000000000
--- a/packages/edit-site/src/components/page-main/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import PagePatterns from '../page-patterns';
-import PageTemplateParts from '../page-template-parts';
-import PageTemplates from '../page-templates';
-import DataviewsTemplates from '../page-templates/dataviews-templates';
-import PagePages from '../page-pages';
-import { unlock } from '../../lock-unlock';
-
-const { useLocation } = unlock( routerPrivateApis );
-
-export default function PageMain() {
-	const {
-		params: { path },
-	} = useLocation();
-
-	if ( path === '/wp_template/all' ) {
-		return window?.__experimentalAdminViews ? (
-			<DataviewsTemplates />
-		) : (
-			<PageTemplates />
-		);
-	} else if ( path === '/wp_template_part/all' ) {
-		return <PageTemplateParts />;
-	} else if ( path === '/patterns' ) {
-		return <PagePatterns />;
-	} else if ( window?.__experimentalAdminViews && path === '/pages' ) {
-		return <PagePages />;
-	}
-
-	return null;
-}
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
deleted file mode 100644
index bac881f2ceb218..00000000000000
--- a/packages/edit-site/src/components/page-pages/index.js
+++ /dev/null
@@ -1,357 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalHeading as Heading,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { useState, useMemo, useCallback, useEffect } from '@wordpress/element';
-import { dateI18n, getDate, getSettings } from '@wordpress/date';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { DataViews, VIEW_LAYOUTS } from '@wordpress/dataviews';
-
-/**
- * Internal dependencies
- */
-import Page from '../page';
-import Link from '../routes/link';
-import { default as DEFAULT_VIEWS } from '../sidebar-dataviews/default-views';
-import {
-	ENUMERATION_TYPE,
-	LAYOUT_GRID,
-	LAYOUT_TABLE,
-	OPERATOR_IN,
-	OPERATOR_NOT_IN,
-} from '../../utils/constants';
-
-import {
-	trashPostAction,
-	usePermanentlyDeletePostAction,
-	useRestorePostAction,
-	postRevisionsAction,
-	viewPostAction,
-	useEditPostAction,
-} from '../actions';
-import SideEditor from './side-editor';
-import Media from '../media';
-import { unlock } from '../../lock-unlock';
-const { useLocation } = unlock( routerPrivateApis );
-
-const EMPTY_ARRAY = [];
-const defaultConfigPerViewType = {
-	[ LAYOUT_TABLE ]: {},
-	[ LAYOUT_GRID ]: {
-		mediaField: 'featured-image',
-		primaryField: 'title',
-	},
-};
-
-function useView( type ) {
-	const {
-		params: { activeView = 'all', isCustom = 'false' },
-	} = useLocation();
-	const selectedDefaultView =
-		isCustom === 'false' &&
-		DEFAULT_VIEWS[ type ].find( ( { slug } ) => slug === activeView )?.view;
-	const [ view, setView ] = useState( selectedDefaultView );
-
-	useEffect( () => {
-		if ( selectedDefaultView ) {
-			setView( selectedDefaultView );
-		}
-	}, [ selectedDefaultView ] );
-	const editedViewRecord = useSelect(
-		( select ) => {
-			if ( isCustom !== 'true' ) {
-				return;
-			}
-			const { getEditedEntityRecord } = select( coreStore );
-			const dataviewRecord = getEditedEntityRecord(
-				'postType',
-				'wp_dataviews',
-				Number( activeView )
-			);
-			return dataviewRecord;
-		},
-		[ activeView, isCustom ]
-	);
-	const { editEntityRecord } = useDispatch( coreStore );
-
-	const customView = useMemo( () => {
-		return (
-			editedViewRecord?.content && JSON.parse( editedViewRecord?.content )
-		);
-	}, [ editedViewRecord?.content ] );
-	const setCustomView = useCallback(
-		( viewToSet ) => {
-			editEntityRecord(
-				'postType',
-				'wp_dataviews',
-				editedViewRecord?.id,
-				{
-					content: JSON.stringify( viewToSet ),
-				}
-			);
-		},
-		[ editEntityRecord, editedViewRecord?.id ]
-	);
-
-	if ( isCustom === 'false' ) {
-		return [ view, setView ];
-	} else if ( isCustom === 'true' && customView ) {
-		return [ customView, setCustomView ];
-	}
-	// Loading state where no the view was not found on custom views or default views.
-	return [ DEFAULT_VIEWS[ type ][ 0 ].view, setView ];
-}
-
-// See https://github.com/WordPress/gutenberg/issues/55886
-// We do not support custom statutes at the moment.
-const STATUSES = [
-	{ value: 'draft', label: __( 'Draft' ) },
-	{ value: 'future', label: __( 'Scheduled' ) },
-	{ value: 'pending', label: __( 'Pending Review' ) },
-	{ value: 'private', label: __( 'Private' ) },
-	{ value: 'publish', label: __( 'Published' ) },
-	{ value: 'trash', label: __( 'Trash' ) },
-];
-const DEFAULT_STATUSES = 'draft,future,pending,private,publish'; // All but 'trash'.
-
-export default function PagePages() {
-	const postType = 'page';
-	const [ view, setView ] = useView( postType );
-	const [ selection, setSelection ] = useState( [] );
-
-	const queryArgs = useMemo( () => {
-		const filters = {};
-		view.filters.forEach( ( filter ) => {
-			if (
-				filter.field === 'status' &&
-				filter.operator === OPERATOR_IN
-			) {
-				filters.status = filter.value;
-			}
-			if (
-				filter.field === 'author' &&
-				filter.operator === OPERATOR_IN
-			) {
-				filters.author = filter.value;
-			} else if (
-				filter.field === 'author' &&
-				filter.operator === OPERATOR_NOT_IN
-			) {
-				filters.author_exclude = filter.value;
-			}
-		} );
-		// We want to provide a different default item for the status filter
-		// than the REST API provides.
-		if ( ! filters.status || filters.status === '' ) {
-			filters.status = DEFAULT_STATUSES;
-		}
-
-		return {
-			per_page: view.perPage,
-			page: view.page,
-			_embed: 'author',
-			order: view.sort?.direction,
-			orderby: view.sort?.field,
-			search: view.search,
-			...filters,
-		};
-	}, [ view ] );
-	const {
-		records: pages,
-		isResolving: isLoadingPages,
-		totalItems,
-		totalPages,
-	} = useEntityRecords( 'postType', postType, queryArgs );
-
-	const { records: authors, isResolving: isLoadingAuthors } =
-		useEntityRecords( 'root', 'user' );
-
-	const paginationInfo = useMemo(
-		() => ( {
-			totalItems,
-			totalPages,
-		} ),
-		[ totalItems, totalPages ]
-	);
-
-	const fields = useMemo(
-		() => [
-			{
-				id: 'featured-image',
-				header: __( 'Featured Image' ),
-				getValue: ( { item } ) => item.featured_media,
-				render: ( { item, view: currentView } ) =>
-					!! item.featured_media ? (
-						<Media
-							className="edit-site-page-pages__featured-image"
-							id={ item.featured_media }
-							size={
-								currentView.type === 'list'
-									? [ 'thumbnail', 'medium', 'large', 'full' ]
-									: [ 'large', 'full', 'medium', 'thumbnail' ]
-							}
-						/>
-					) : null,
-				enableSorting: false,
-			},
-			{
-				header: __( 'Title' ),
-				id: 'title',
-				getValue: ( { item } ) => item.title?.rendered || item.slug,
-				render: ( { item, view: { type } } ) => {
-					return (
-						<VStack spacing={ 1 }>
-							<Heading as="h3" level={ 5 }>
-								<Link
-									params={ {
-										postId: item.id,
-										postType: item.type,
-										canvas: 'edit',
-									} }
-									onClick={ ( event ) => {
-										if (
-											VIEW_LAYOUTS.find(
-												( v ) => v.type === type
-											)?.supports?.preview
-										) {
-											event.preventDefault();
-											setSelection( [ item.id ] );
-										}
-									} }
-								>
-									{ decodeEntities(
-										item.title?.rendered || item.slug
-									) || __( '(no title)' ) }
-								</Link>
-							</Heading>
-						</VStack>
-					);
-				},
-				maxWidth: 400,
-				enableHiding: false,
-			},
-			{
-				header: __( 'Author' ),
-				id: 'author',
-				getValue: ( { item } ) => item._embedded?.author[ 0 ]?.name,
-				type: ENUMERATION_TYPE,
-				elements:
-					authors?.map( ( { id, name } ) => ( {
-						value: id,
-						label: name,
-					} ) ) || [],
-			},
-			{
-				header: __( 'Status' ),
-				id: 'status',
-				getValue: ( { item } ) =>
-					STATUSES.find( ( { value } ) => value === item.status )
-						?.label ?? item.status,
-				type: ENUMERATION_TYPE,
-				elements: STATUSES,
-				enableSorting: false,
-				filterBy: {
-					operators: [ OPERATOR_IN ],
-				},
-			},
-			{
-				header: __( 'Date' ),
-				id: 'date',
-				getValue: ( { item } ) => item.date,
-				render: ( { item } ) => {
-					const formattedDate = dateI18n(
-						getSettings().formats.datetimeAbbreviated,
-						getDate( item.date )
-					);
-					return <time>{ formattedDate }</time>;
-				},
-			},
-		],
-		[ authors ]
-	);
-
-	const permanentlyDeletePostAction = usePermanentlyDeletePostAction();
-	const restorePostAction = useRestorePostAction();
-	const editPostAction = useEditPostAction();
-	const actions = useMemo(
-		() => [
-			viewPostAction,
-			trashPostAction,
-			restorePostAction,
-			permanentlyDeletePostAction,
-			editPostAction,
-			postRevisionsAction,
-		],
-		[ permanentlyDeletePostAction, restorePostAction, editPostAction ]
-	);
-	const onChangeView = useCallback(
-		( viewUpdater ) => {
-			let updatedView =
-				typeof viewUpdater === 'function'
-					? viewUpdater( view )
-					: viewUpdater;
-			if ( updatedView.type !== view.type ) {
-				updatedView = {
-					...updatedView,
-					layout: {
-						...defaultConfigPerViewType[ updatedView.type ],
-					},
-				};
-			}
-
-			setView( updatedView );
-		},
-		[ view, setView ]
-	);
-
-	// TODO: we need to handle properly `data={ data || EMPTY_ARRAY }` for when `isLoading`.
-	return (
-		<>
-			<Page title={ __( 'Pages' ) }>
-				<DataViews
-					paginationInfo={ paginationInfo }
-					fields={ fields }
-					actions={ actions }
-					data={ pages || EMPTY_ARRAY }
-					getItemId={ ( item ) => item.id }
-					isLoading={ isLoadingPages || isLoadingAuthors }
-					view={ view }
-					onChangeView={ onChangeView }
-				/>
-			</Page>
-			{ VIEW_LAYOUTS.find( ( v ) => v.type === view.type )?.supports
-				?.preview && (
-				<Page>
-					<div className="edit-site-page-pages-preview">
-						{ selection.length === 1 && (
-							<SideEditor
-								postId={ selection[ 0 ] }
-								postType={ postType }
-							/>
-						) }
-						{ selection.length !== 1 && (
-							<div
-								style={ {
-									display: 'flex',
-									flexDirection: 'column',
-									justifyContent: 'center',
-									textAlign: 'center',
-									height: '100%',
-								} }
-							>
-								<p>{ __( 'Select a page to preview' ) }</p>
-							</div>
-						) }
-					</div>
-				</Page>
-			) }
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/page-pages/side-editor.js b/packages/edit-site/src/components/page-pages/side-editor.js
deleted file mode 100644
index fca561cf9f4d5d..00000000000000
--- a/packages/edit-site/src/components/page-pages/side-editor.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Internal dependencies
- */
-import Editor from '../editor';
-import { useInitEditedEntity } from '../sync-state-with-url/use-init-edited-entity-from-url';
-
-export default function SideEditor( { postType, postId } ) {
-	useInitEditedEntity( {
-		postId,
-		postType,
-	} );
-
-	return <Editor />;
-}
diff --git a/packages/edit-site/src/components/page-pages/style.scss b/packages/edit-site/src/components/page-pages/style.scss
deleted file mode 100644
index fde960ca1a72ca..00000000000000
--- a/packages/edit-site/src/components/page-pages/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.edit-site-page-pages__featured-image {
-	border-radius: $radius-block-ui;
-}
diff --git a/packages/edit-site/src/components/page-patterns/delete-category-menu-item.js b/packages/edit-site/src/components/page-patterns/delete-category-menu-item.js
index 0a9a36d93d0099..d366ed6fb3a0e5 100644
--- a/packages/edit-site/src/components/page-patterns/delete-category-menu-item.js
+++ b/packages/edit-site/src/components/page-patterns/delete-category-menu-item.js
@@ -60,8 +60,7 @@ export default function DeleteCategoryMenuItem( { category, onClose } ) {
 
 			onClose?.();
 			history.push( {
-				path: `/patterns`,
-				categoryType: PATTERN_TYPES.theme,
+				postType: PATTERN_TYPES.user,
 				categoryId: PATTERN_DEFAULT_CATEGORY,
 			} );
 		} catch ( error ) {
@@ -90,6 +89,13 @@ export default function DeleteCategoryMenuItem( { category, onClose } ) {
 				onCancel={ () => setIsModalOpen( false ) }
 				confirmButtonText={ __( 'Delete' ) }
 				className="edit-site-patterns__delete-modal"
+				title={ sprintf(
+					// translators: %s: The pattern category's name.
+					__( 'Delete "%s"?' ),
+					decodeEntities( category.label )
+				) }
+				size="medium"
+				__experimentalHideHeader={ false }
 			>
 				{ sprintf(
 					// translators: %s: The pattern category's name.
diff --git a/packages/edit-site/src/components/page-patterns/duplicate-menu-item.js b/packages/edit-site/src/components/page-patterns/duplicate-menu-item.js
deleted file mode 100644
index 118c954a851f3f..00000000000000
--- a/packages/edit-site/src/components/page-patterns/duplicate-menu-item.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { MenuItem } from '@wordpress/components';
-import { useDispatch } from '@wordpress/data';
-import { useState } from '@wordpress/element';
-import { __, sprintf } from '@wordpress/i18n';
-import { store as noticesStore } from '@wordpress/notices';
-import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import { TEMPLATE_PART_POST_TYPE, PATTERN_TYPES } from '../../utils/constants';
-import { unlock } from '../../lock-unlock';
-import CreateTemplatePartModal from '../create-template-part-modal';
-
-const { DuplicatePatternModal } = unlock( patternsPrivateApis );
-const { useHistory } = unlock( routerPrivateApis );
-
-export default function DuplicateMenuItem( {
-	categoryId,
-	item,
-	label = __( 'Duplicate' ),
-	onClose,
-} ) {
-	const { createSuccessNotice } = useDispatch( noticesStore );
-	const [ isModalOpen, setIsModalOpen ] = useState( false );
-	const history = useHistory();
-
-	const closeModal = () => setIsModalOpen( false );
-
-	const isTemplatePart = item.type === TEMPLATE_PART_POST_TYPE;
-	const isThemePattern = item.type === PATTERN_TYPES.theme;
-
-	async function onTemplatePartSuccess( templatePart ) {
-		createSuccessNotice(
-			sprintf(
-				// translators: %s: The new template part's title e.g. 'Call to action (copy)'.
-				__( '"%s" duplicated.' ),
-				item.title
-			),
-			{
-				type: 'snackbar',
-				id: 'edit-site-patterns-success',
-			}
-		);
-
-		history.push( {
-			postType: TEMPLATE_PART_POST_TYPE,
-			postId: templatePart?.id,
-			categoryType: TEMPLATE_PART_POST_TYPE,
-			categoryId,
-		} );
-
-		onClose();
-	}
-
-	function onPatternSuccess( { pattern } ) {
-		history.push( {
-			categoryType: PATTERN_TYPES.theme,
-			categoryId,
-			postType: PATTERN_TYPES.user,
-			postId: pattern.id,
-		} );
-
-		onClose();
-	}
-
-	return (
-		<>
-			<MenuItem
-				onClick={ () => setIsModalOpen( true ) }
-				aria-expanded={ isModalOpen }
-				aria-haspopup="dialog"
-			>
-				{ label }
-			</MenuItem>
-			{ isModalOpen && ! isTemplatePart && (
-				<DuplicatePatternModal
-					onClose={ closeModal }
-					onSuccess={ onPatternSuccess }
-					pattern={ isThemePattern ? item : item.patternBlock }
-				/>
-			) }
-			{ isModalOpen && isTemplatePart && (
-				<CreateTemplatePartModal
-					blocks={ item.blocks }
-					closeModal={ closeModal }
-					confirmLabel={ __( 'Duplicate' ) }
-					defaultArea={ item.templatePart.area }
-					defaultTitle={ sprintf(
-						/* translators: %s: Existing template part title */
-						__( '%s (Copy)' ),
-						item.title
-					) }
-					modalTitle={ __( 'Duplicate template part' ) }
-					onCreate={ onTemplatePartSuccess }
-					onError={ closeModal }
-				/>
-			) }
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/page-patterns/fields.js b/packages/edit-site/src/components/page-patterns/fields.js
new file mode 100644
index 00000000000000..88de0c1fa39b01
--- /dev/null
+++ b/packages/edit-site/src/components/page-patterns/fields.js
@@ -0,0 +1,252 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalHStack as HStack,
+	Button,
+	Tooltip,
+	Flex,
+} from '@wordpress/components';
+import { __, _x } from '@wordpress/i18n';
+import { useState, useMemo, useId } from '@wordpress/element';
+import {
+	BlockPreview,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+import { Icon, lockSmall } from '@wordpress/icons';
+import { parse } from '@wordpress/blocks';
+import { decodeEntities } from '@wordpress/html-entities';
+
+/**
+ * Internal dependencies
+ */
+import { Async } from '../async';
+import {
+	PATTERN_TYPES,
+	TEMPLATE_PART_POST_TYPE,
+	PATTERN_SYNC_TYPES,
+	OPERATOR_IS,
+} from '../../utils/constants';
+import { unlock } from '../../lock-unlock';
+import { useLink } from '../routes/link';
+import { useAddedBy } from '../page-templates/hooks';
+import { defaultGetTitle } from './search-items';
+
+const { useGlobalStyle } = unlock( blockEditorPrivateApis );
+
+function PreviewWrapper( { item, onClick, ariaDescribedBy, children } ) {
+	return (
+		<button
+			className="page-patterns-preview-field__button"
+			type="button"
+			onClick={ item.type !== PATTERN_TYPES.theme ? onClick : undefined }
+			aria-label={ item.title }
+			aria-describedby={ ariaDescribedBy }
+			aria-disabled={ item.type === PATTERN_TYPES.theme }
+		>
+			{ children }
+		</button>
+	);
+}
+
+function PreviewField( { item } ) {
+	const descriptionId = useId();
+	const description = item.description || item?.excerpt?.raw;
+	const isUserPattern = item.type === PATTERN_TYPES.user;
+	const isTemplatePart = item.type === TEMPLATE_PART_POST_TYPE;
+	const [ backgroundColor ] = useGlobalStyle( 'color.background' );
+	const { onClick } = useLink( {
+		postType: item.type,
+		postId: isUserPattern || isTemplatePart ? item.id : item.name,
+		canvas: 'edit',
+	} );
+	const blocks = useMemo( () => {
+		return (
+			item.blocks ??
+			parse( item.content.raw, {
+				__unstableSkipMigrationLogs: true,
+			} )
+		);
+	}, [ item?.content?.raw, item.blocks ] );
+	const isEmpty = ! blocks?.length;
+
+	return (
+		<div
+			className="page-patterns-preview-field"
+			style={ { backgroundColor } }
+		>
+			<PreviewWrapper
+				item={ item }
+				onClick={ onClick }
+				ariaDescribedBy={ !! description ? descriptionId : undefined }
+			>
+				{ isEmpty && isTemplatePart && __( 'Empty template part' ) }
+				{ isEmpty && ! isTemplatePart && __( 'Empty pattern' ) }
+				{ ! isEmpty && (
+					<Async>
+						<BlockPreview
+							blocks={ blocks }
+							viewportWidth={ item.viewportWidth }
+						/>
+					</Async>
+				) }
+			</PreviewWrapper>
+			{ !! description && (
+				<div hidden id={ descriptionId }>
+					{ description }
+				</div>
+			) }
+		</div>
+	);
+}
+
+export const previewField = {
+	label: __( 'Preview' ),
+	id: 'preview',
+	render: PreviewField,
+	enableSorting: false,
+};
+
+function TitleField( { item } ) {
+	const isUserPattern = item.type === PATTERN_TYPES.user;
+	const isTemplatePart = item.type === TEMPLATE_PART_POST_TYPE;
+	const { onClick } = useLink( {
+		postType: item.type,
+		postId: isUserPattern || isTemplatePart ? item.id : item.name,
+		canvas: 'edit',
+	} );
+	const title = decodeEntities( defaultGetTitle( item ) );
+	return (
+		<HStack alignment="center" justify="flex-start" spacing={ 2 }>
+			<Flex
+				as="div"
+				gap={ 0 }
+				justify="flex-start"
+				className="edit-site-patterns__pattern-title"
+			>
+				{ item.type === PATTERN_TYPES.theme ? (
+					title
+				) : (
+					<Button
+						__next40pxDefaultSize
+						variant="link"
+						onClick={ onClick }
+						// Required for the grid's roving tab index system.
+						// See https://github.com/WordPress/gutenberg/pull/51898#discussion_r1243399243.
+						tabIndex="-1"
+					>
+						{ title }
+					</Button>
+				) }
+			</Flex>
+			{ item.type === PATTERN_TYPES.theme && (
+				<Tooltip
+					placement="top"
+					text={ __( 'This pattern cannot be edited.' ) }
+				>
+					<Icon
+						className="edit-site-patterns__pattern-lock-icon"
+						icon={ lockSmall }
+						size={ 24 }
+					/>
+				</Tooltip>
+			) }
+		</HStack>
+	);
+}
+
+export const titleField = {
+	label: __( 'Title' ),
+	id: 'title',
+	getValue: ( { item } ) => item.title?.raw || item.title,
+	render: TitleField,
+	enableHiding: false,
+};
+
+const SYNC_FILTERS = [
+	{
+		value: PATTERN_SYNC_TYPES.full,
+		label: _x( 'Synced', 'pattern (singular)' ),
+		description: __( 'Patterns that are kept in sync across the site.' ),
+	},
+	{
+		value: PATTERN_SYNC_TYPES.unsynced,
+		label: _x( 'Not synced', 'pattern (singular)' ),
+		description: __(
+			'Patterns that can be changed freely without affecting the site.'
+		),
+	},
+];
+
+export const patternStatusField = {
+	label: __( 'Sync status' ),
+	id: 'sync-status',
+	render: ( { item } ) => {
+		const syncStatus =
+			'wp_pattern_sync_status' in item
+				? item.wp_pattern_sync_status || PATTERN_SYNC_TYPES.full
+				: PATTERN_SYNC_TYPES.unsynced;
+		// User patterns can have their sync statuses checked directly.
+		// Non-user patterns are all unsynced for the time being.
+		return (
+			<span
+				className={ `edit-site-patterns__field-sync-status-${ syncStatus }` }
+			>
+				{
+					SYNC_FILTERS.find( ( { value } ) => value === syncStatus )
+						.label
+				}
+			</span>
+		);
+	},
+	elements: SYNC_FILTERS,
+	filterBy: {
+		operators: [ OPERATOR_IS ],
+		isPrimary: true,
+	},
+	enableSorting: false,
+};
+
+function AuthorField( { item } ) {
+	const [ isImageLoaded, setIsImageLoaded ] = useState( false );
+	const { text, icon, imageUrl } = useAddedBy( item.type, item.id );
+
+	return (
+		<HStack alignment="left" spacing={ 0 }>
+			{ imageUrl && (
+				<div
+					className={ clsx( 'page-templates-author-field__avatar', {
+						'is-loaded': isImageLoaded,
+					} ) }
+				>
+					<img
+						onLoad={ () => setIsImageLoaded( true ) }
+						alt=""
+						src={ imageUrl }
+					/>
+				</div>
+			) }
+			{ ! imageUrl && (
+				<div className="page-templates-author-field__icon">
+					<Icon icon={ icon } />
+				</div>
+			) }
+			<span className="page-templates-author-field__name">{ text }</span>
+		</HStack>
+	);
+}
+
+export const templatePartAuthorField = {
+	label: __( 'Author' ),
+	id: 'author',
+	getValue: ( { item } ) => item.author_text,
+	render: AuthorField,
+	filterBy: {
+		isPrimary: true,
+	},
+};
diff --git a/packages/edit-site/src/components/page-patterns/grid-item.js b/packages/edit-site/src/components/page-patterns/grid-item.js
deleted file mode 100644
index b394ef8eb6e76c..00000000000000
--- a/packages/edit-site/src/components/page-patterns/grid-item.js
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-import { paramCase as kebabCase } from 'change-case';
-
-/**
- * WordPress dependencies
- */
-import {
-	BlockPreview,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import {
-	Button,
-	__experimentalConfirmDialog as ConfirmDialog,
-	DropdownMenu,
-	MenuGroup,
-	MenuItem,
-	__experimentalHeading as Heading,
-	__experimentalHStack as HStack,
-	Tooltip,
-	Flex,
-} from '@wordpress/components';
-import { useDispatch } from '@wordpress/data';
-import { useState, useId, memo } from '@wordpress/element';
-import { __, sprintf } from '@wordpress/i18n';
-import {
-	Icon,
-	header,
-	footer,
-	symbolFilled as uncategorized,
-	symbol,
-	moreVertical,
-	lockSmall,
-} from '@wordpress/icons';
-import { store as noticesStore } from '@wordpress/notices';
-import { store as reusableBlocksStore } from '@wordpress/reusable-blocks';
-import { downloadBlob } from '@wordpress/blob';
-
-/**
- * Internal dependencies
- */
-import RenameMenuItem from './rename-menu-item';
-import DuplicateMenuItem from './duplicate-menu-item';
-import {
-	PATTERN_TYPES,
-	TEMPLATE_PART_POST_TYPE,
-	PATTERN_SYNC_TYPES,
-} from '../../utils/constants';
-import { store as editSiteStore } from '../../store';
-import { useLink } from '../routes/link';
-import { unlock } from '../../lock-unlock';
-
-const { useGlobalStyle } = unlock( blockEditorPrivateApis );
-
-const templatePartIcons = { header, footer, uncategorized };
-
-function GridItem( { categoryId, item, ...props } ) {
-	const descriptionId = useId();
-	const [ isDeleteDialogOpen, setIsDeleteDialogOpen ] = useState( false );
-	const [ backgroundColor ] = useGlobalStyle( 'color.background' );
-
-	const { removeTemplate } = useDispatch( editSiteStore );
-	const { __experimentalDeleteReusableBlock } =
-		useDispatch( reusableBlocksStore );
-	const { createErrorNotice, createSuccessNotice } =
-		useDispatch( noticesStore );
-
-	const isUserPattern = item.type === PATTERN_TYPES.user;
-	const isNonUserPattern = item.type === PATTERN_TYPES.theme;
-	const isTemplatePart = item.type === TEMPLATE_PART_POST_TYPE;
-
-	const { onClick } = useLink( {
-		postType: item.type,
-		postId: isUserPattern ? item.id : item.name,
-		categoryId,
-		categoryType: isTemplatePart ? item.type : PATTERN_TYPES.theme,
-	} );
-
-	const isEmpty = ! item.blocks?.length;
-	const patternClassNames = classnames( 'edit-site-patterns__pattern', {
-		'is-placeholder': isEmpty,
-	} );
-	const previewClassNames = classnames( 'edit-site-patterns__preview', {
-		'is-inactive': isNonUserPattern,
-	} );
-
-	const deletePattern = async () => {
-		try {
-			await __experimentalDeleteReusableBlock( item.id );
-			createSuccessNotice(
-				sprintf(
-					// translators: %s: The pattern's title e.g. 'Call to action'.
-					__( '"%s" deleted.' ),
-					item.title
-				),
-				{ type: 'snackbar', id: 'edit-site-patterns-success' }
-			);
-		} catch ( error ) {
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: __( 'An error occurred while deleting the pattern.' );
-			createErrorNotice( errorMessage, {
-				type: 'snackbar',
-				id: 'edit-site-patterns-error',
-			} );
-		}
-	};
-	const deleteItem = () =>
-		isTemplatePart ? removeTemplate( item ) : deletePattern();
-	const exportAsJSON = () => {
-		const json = {
-			__file: item.type,
-			title: item.title || item.name,
-			content: item.patternBlock.content.raw,
-			syncStatus: item.patternBlock.wp_pattern_sync_status,
-		};
-
-		return downloadBlob(
-			`${ kebabCase( item.title || item.name ) }.json`,
-			JSON.stringify( json, null, 2 ),
-			'application/json'
-		);
-	};
-
-	// Only custom patterns or custom template parts can be renamed or deleted.
-	const isCustomPattern =
-		isUserPattern || ( isTemplatePart && item.isCustom );
-	const hasThemeFile = isTemplatePart && item.templatePart.has_theme_file;
-	const ariaDescriptions = [];
-
-	if ( isCustomPattern ) {
-		// User patterns don't have descriptions, but can be edited and deleted, so include some help text.
-		ariaDescriptions.push(
-			__( 'Press Enter to edit, or Delete to delete the pattern.' )
-		);
-	} else if ( item.description ) {
-		ariaDescriptions.push( item.description );
-	}
-
-	if ( isNonUserPattern ) {
-		ariaDescriptions.push(
-			__( 'Theme & plugin patterns cannot be edited.' )
-		);
-	}
-
-	let itemIcon;
-	if ( ! isUserPattern && templatePartIcons[ categoryId ] ) {
-		itemIcon = templatePartIcons[ categoryId ];
-	} else {
-		itemIcon =
-			item.syncStatus === PATTERN_SYNC_TYPES.full ? symbol : undefined;
-	}
-
-	const confirmButtonText = hasThemeFile ? __( 'Clear' ) : __( 'Delete' );
-	const confirmPrompt = hasThemeFile
-		? __( 'Are you sure you want to clear these customizations?' )
-		: sprintf(
-				// translators: %s: The pattern or template part's title e.g. 'Call to action'.
-				__( 'Are you sure you want to delete "%s"?' ),
-				item.title || item.name
-		  );
-
-	const additionalStyles = ! backgroundColor
-		? [ { css: 'body { background: #fff; }' } ]
-		: undefined;
-
-	return (
-		<li className={ patternClassNames }>
-			<button
-				className={ previewClassNames }
-				// Even though still incomplete, passing ids helps performance.
-				// @see https://reakit.io/docs/composite/#performance.
-				id={ `edit-site-patterns-${ item.name }` }
-				type="button"
-				{ ...props }
-				onClick={
-					item.type !== PATTERN_TYPES.theme ? onClick : undefined
-				}
-				aria-disabled={
-					item.type !== PATTERN_TYPES.theme ? 'false' : 'true'
-				}
-				aria-label={ item.title }
-				aria-describedby={
-					ariaDescriptions.length
-						? ariaDescriptions
-								.map(
-									( _, index ) =>
-										`${ descriptionId }-${ index }`
-								)
-								.join( ' ' )
-						: undefined
-				}
-			>
-				{ isEmpty && isTemplatePart && __( 'Empty template part' ) }
-				{ isEmpty && ! isTemplatePart && __( 'Empty pattern' ) }
-				{ ! isEmpty && (
-					<BlockPreview
-						blocks={ item.blocks }
-						additionalStyles={ additionalStyles }
-					/>
-				) }
-			</button>
-			{ ariaDescriptions.map( ( ariaDescription, index ) => (
-				<div
-					key={ index }
-					hidden
-					id={ `${ descriptionId }-${ index }` }
-				>
-					{ ariaDescription }
-				</div>
-			) ) }
-			<HStack
-				className="edit-site-patterns__footer"
-				justify="space-between"
-			>
-				<HStack
-					alignment="center"
-					justify="left"
-					spacing={ 3 }
-					className="edit-site-patterns__pattern-title"
-				>
-					{ itemIcon && ! isNonUserPattern && (
-						<Tooltip
-							placement="top"
-							text={ __(
-								'Editing this pattern will also update anywhere it is used'
-							) }
-						>
-							<Icon
-								className="edit-site-patterns__pattern-icon"
-								icon={ itemIcon }
-							/>
-						</Tooltip>
-					) }
-					<Flex as="span" gap={ 0 } justify="left">
-						{ item.type === PATTERN_TYPES.theme ? (
-							item.title
-						) : (
-							<Heading level={ 5 }>
-								<Button
-									variant="link"
-									onClick={ onClick }
-									// Required for the grid's roving tab index system.
-									// See https://github.com/WordPress/gutenberg/pull/51898#discussion_r1243399243.
-									tabIndex="-1"
-								>
-									{ item.title || item.name }
-								</Button>
-							</Heading>
-						) }
-						{ item.type === PATTERN_TYPES.theme && (
-							<Tooltip
-								placement="top"
-								text={ __( 'This pattern cannot be edited.' ) }
-							>
-								<Icon
-									className="edit-site-patterns__pattern-lock-icon"
-									icon={ lockSmall }
-									size={ 24 }
-								/>
-							</Tooltip>
-						) }
-					</Flex>
-				</HStack>
-				<DropdownMenu
-					icon={ moreVertical }
-					label={ __( 'Actions' ) }
-					className="edit-site-patterns__dropdown"
-					popoverProps={ { placement: 'bottom-end' } }
-					toggleProps={ {
-						className: 'edit-site-patterns__button',
-						describedBy: sprintf(
-							/* translators: %s: pattern name */
-							__( 'Action menu for %s pattern' ),
-							item.title
-						),
-					} }
-				>
-					{ ( { onClose } ) => (
-						<MenuGroup>
-							{ isCustomPattern && ! hasThemeFile && (
-								<RenameMenuItem
-									item={ item }
-									onClose={ onClose }
-								/>
-							) }
-							<DuplicateMenuItem
-								categoryId={ categoryId }
-								item={ item }
-								onClose={ onClose }
-								label={ __( 'Duplicate' ) }
-							/>
-							{ item.type === PATTERN_TYPES.user && (
-								<MenuItem onClick={ () => exportAsJSON() }>
-									{ __( 'Export as JSON' ) }
-								</MenuItem>
-							) }
-
-							{ isCustomPattern && (
-								<MenuItem
-									isDestructive={ ! hasThemeFile }
-									onClick={ () =>
-										setIsDeleteDialogOpen( true )
-									}
-								>
-									{ hasThemeFile
-										? __( 'Clear customizations' )
-										: __( 'Delete' ) }
-								</MenuItem>
-							) }
-						</MenuGroup>
-					) }
-				</DropdownMenu>
-			</HStack>
-
-			{ isDeleteDialogOpen && (
-				<ConfirmDialog
-					confirmButtonText={ confirmButtonText }
-					onConfirm={ deleteItem }
-					onCancel={ () => setIsDeleteDialogOpen( false ) }
-				>
-					{ confirmPrompt }
-				</ConfirmDialog>
-			) }
-		</li>
-	);
-}
-
-export default memo( GridItem );
diff --git a/packages/edit-site/src/components/page-patterns/grid.js b/packages/edit-site/src/components/page-patterns/grid.js
deleted file mode 100644
index 59a8cc431567f9..00000000000000
--- a/packages/edit-site/src/components/page-patterns/grid.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Internal dependencies
- */
-import GridItem from './grid-item';
-
-export default function Grid( { categoryId, items, ...props } ) {
-	if ( ! items?.length ) {
-		return null;
-	}
-
-	return (
-		<ul className="edit-site-patterns__grid" { ...props }>
-			{ items.map( ( item ) => (
-				<GridItem
-					key={ item.name }
-					item={ item }
-					categoryId={ categoryId }
-				/>
-			) ) }
-		</ul>
-	);
-}
diff --git a/packages/edit-site/src/components/page-patterns/header.js b/packages/edit-site/src/components/page-patterns/header.js
index a5b19e4e3a6b92..641dc577cb7fe0 100644
--- a/packages/edit-site/src/components/page-patterns/header.js
+++ b/packages/edit-site/src/components/page-patterns/header.js
@@ -17,6 +17,7 @@ import { moreVertical } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
+import AddNewPattern from '../add-new-pattern';
 import RenameCategoryMenuItem from './rename-category-menu-item';
 import DeleteCategoryMenuItem from './delete-category-menu-item';
 import usePatternCategories from '../sidebar-navigation-screen-patterns/use-pattern-categories';
@@ -40,9 +41,11 @@ export default function PatternsHeader( {
 		const templatePartArea = templatePartAreas.find(
 			( area ) => area.area === categoryId
 		);
-		title = templatePartArea?.label;
-		description = templatePartArea?.description;
-	} else if ( type === PATTERN_TYPES.theme ) {
+		title = templatePartArea?.label || __( 'All Template Parts' );
+		description =
+			templatePartArea?.description ||
+			__( 'Includes every template part defined for any area.' );
+	} else if ( type === PATTERN_TYPES.user && !! categoryId ) {
 		patternCategory = patternCategories.find(
 			( category ) => category.name === categoryId
 		);
@@ -50,44 +53,64 @@ export default function PatternsHeader( {
 		description = patternCategory?.description;
 	}
 
-	if ( ! title ) return null;
+	if ( ! title ) {
+		return null;
+	}
 
 	return (
-		<VStack className="edit-site-patterns__section-header">
-			<HStack justify="space-between">
-				<Heading as="h2" level={ 4 } id={ titleId }>
+		<VStack className="edit-site-patterns__section-header" spacing={ 1 }>
+			<HStack
+				justify="space-between"
+				className="edit-site-patterns__title"
+			>
+				<Heading
+					as="h2"
+					level={ 3 }
+					id={ titleId }
+					weight={ 500 }
+					truncate
+				>
 					{ title }
 				</Heading>
-				{ !! patternCategory?.id && (
-					<DropdownMenu
-						icon={ moreVertical }
-						label={ __( 'Actions' ) }
-						toggleProps={ {
-							className: 'edit-site-patterns__button',
-							describedBy: sprintf(
-								/* translators: %s: pattern category name */
-								__( 'Action menu for %s pattern category' ),
-								title
-							),
-						} }
-					>
-						{ ( { onClose } ) => (
-							<MenuGroup>
-								<RenameCategoryMenuItem
-									category={ patternCategory }
-									onClose={ onClose }
-								/>
-								<DeleteCategoryMenuItem
-									category={ patternCategory }
-									onClose={ onClose }
-								/>
-							</MenuGroup>
-						) }
-					</DropdownMenu>
-				) }
+				<HStack expanded={ false }>
+					<AddNewPattern />
+					{ !! patternCategory?.id && (
+						<DropdownMenu
+							icon={ moreVertical }
+							label={ __( 'Actions' ) }
+							toggleProps={ {
+								className: 'edit-site-patterns__button',
+								description: sprintf(
+									/* translators: %s: pattern category name */
+									__( 'Action menu for %s pattern category' ),
+									title
+								),
+								size: 'compact',
+							} }
+						>
+							{ ( { onClose } ) => (
+								<MenuGroup>
+									<RenameCategoryMenuItem
+										category={ patternCategory }
+										onClose={ onClose }
+									/>
+									<DeleteCategoryMenuItem
+										category={ patternCategory }
+										onClose={ onClose }
+									/>
+								</MenuGroup>
+							) }
+						</DropdownMenu>
+					) }
+				</HStack>
 			</HStack>
 			{ description ? (
-				<Text variant="muted" as="p" id={ descriptionId }>
+				<Text
+					variant="muted"
+					as="p"
+					id={ descriptionId }
+					className="edit-site-patterns__sub-title"
+				>
 					{ description }
 				</Text>
 			) : null }
diff --git a/packages/edit-site/src/components/page-patterns/index.js b/packages/edit-site/src/components/page-patterns/index.js
index 713fa21c8fe923..69ebf66093806a 100644
--- a/packages/edit-site/src/components/page-patterns/index.js
+++ b/packages/edit-site/src/components/page-patterns/index.js
@@ -2,41 +2,188 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { useState, useMemo, useId, useEffect } from '@wordpress/element';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
-import { getQueryArgs } from '@wordpress/url';
+import { DataViews, filterSortAndPaginate } from '@wordpress/dataviews';
+import { usePrevious } from '@wordpress/compose';
+import { useEntityRecords } from '@wordpress/core-data';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
-import { PATTERN_DEFAULT_CATEGORY, PATTERN_TYPES } from '../../utils/constants';
 import Page from '../page';
-import PatternsList from './patterns-list';
+import {
+	LAYOUT_GRID,
+	LAYOUT_TABLE,
+	PATTERN_TYPES,
+	TEMPLATE_PART_POST_TYPE,
+	PATTERN_DEFAULT_CATEGORY,
+} from '../../utils/constants';
 import usePatternSettings from './use-pattern-settings';
 import { unlock } from '../../lock-unlock';
+import usePatterns, { useAugmentPatternsWithPermissions } from './use-patterns';
+import PatternsHeader from './header';
+import { useEditPostAction } from '../dataviews-actions';
+import {
+	patternStatusField,
+	previewField,
+	titleField,
+	templatePartAuthorField,
+} from './fields';
 
 const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
+const { usePostActions } = unlock( editorPrivateApis );
+const { useLocation } = unlock( routerPrivateApis );
 
-export default function PagePatterns() {
-	const { categoryType, categoryId } = getQueryArgs( window.location.href );
-	const type = categoryType || PATTERN_TYPES.theme;
-	const category = categoryId || PATTERN_DEFAULT_CATEGORY;
-	const settings = usePatternSettings();
+const EMPTY_ARRAY = [];
+const defaultLayouts = {
+	[ LAYOUT_TABLE ]: {
+		layout: {
+			primaryField: 'title',
+			styles: {
+				preview: {
+					width: '1%',
+				},
+				author: {
+					width: '1%',
+				},
+			},
+		},
+	},
+	[ LAYOUT_GRID ]: {
+		layout: {
+			mediaField: 'preview',
+			primaryField: 'title',
+			badgeFields: [ 'sync-status' ],
+		},
+	},
+};
+const DEFAULT_VIEW = {
+	type: LAYOUT_GRID,
+	search: '',
+	page: 1,
+	perPage: 20,
+	layout: defaultLayouts[ LAYOUT_GRID ].layout,
+	fields: [ 'title', 'sync-status' ],
+	filters: [],
+};
+
+export default function DataviewsPatterns() {
+	const {
+		params: { postType, categoryId: categoryIdFromURL },
+	} = useLocation();
+	const type = postType || PATTERN_TYPES.user;
+	const categoryId = categoryIdFromURL || PATTERN_DEFAULT_CATEGORY;
+	const [ view, setView ] = useState( DEFAULT_VIEW );
+	const previousCategoryId = usePrevious( categoryId );
+	const previousPostType = usePrevious( type );
+	const viewSyncStatus = view.filters?.find(
+		( { field } ) => field === 'sync-status'
+	)?.value;
+	const { patterns, isResolving } = usePatterns( type, categoryId, {
+		search: view.search,
+		syncStatus: viewSyncStatus,
+	} );
+
+	const { records } = useEntityRecords( 'postType', TEMPLATE_PART_POST_TYPE, {
+		per_page: -1,
+	} );
+
+	const authors = useMemo( () => {
+		if ( ! records ) {
+			return EMPTY_ARRAY;
+		}
+		const authorsSet = new Set();
+		records.forEach( ( template ) => {
+			authorsSet.add( template.author_text );
+		} );
+		return Array.from( authorsSet ).map( ( author ) => ( {
+			value: author,
+			label: author,
+		} ) );
+	}, [ records ] );
+
+	const fields = useMemo( () => {
+		const _fields = [ previewField, titleField ];
+
+		if ( type === PATTERN_TYPES.user ) {
+			_fields.push( patternStatusField );
+		} else if ( type === TEMPLATE_PART_POST_TYPE ) {
+			_fields.push( {
+				...templatePartAuthorField,
+				elements: authors,
+			} );
+		}
 
+		return _fields;
+	}, [ type, authors ] );
+
+	// Reset the page number when the category changes.
+	useEffect( () => {
+		if ( previousCategoryId !== categoryId || previousPostType !== type ) {
+			setView( ( prevView ) => ( { ...prevView, page: 1 } ) );
+		}
+	}, [ categoryId, previousCategoryId, previousPostType, type ] );
+	const { data, paginationInfo } = useMemo( () => {
+		// Search is managed server-side as well as filters for patterns.
+		// However, the author filter in template parts is done client-side.
+		const viewWithoutFilters = { ...view };
+		delete viewWithoutFilters.search;
+		if ( type !== TEMPLATE_PART_POST_TYPE ) {
+			viewWithoutFilters.filters = [];
+		}
+		return filterSortAndPaginate( patterns, viewWithoutFilters, fields );
+	}, [ patterns, view, fields, type ] );
+
+	const dataWithPermissions = useAugmentPatternsWithPermissions( data );
+
+	const templatePartActions = usePostActions( {
+		postType: TEMPLATE_PART_POST_TYPE,
+		context: 'list',
+	} );
+	const patternActions = usePostActions( {
+		postType: PATTERN_TYPES.user,
+		context: 'list',
+	} );
+	const editAction = useEditPostAction();
+
+	const actions = useMemo( () => {
+		if ( type === TEMPLATE_PART_POST_TYPE ) {
+			return [ editAction, ...templatePartActions ].filter( Boolean );
+		}
+		return [ editAction, ...patternActions ].filter( Boolean );
+	}, [ editAction, type, templatePartActions, patternActions ] );
+	const id = useId();
+	const settings = usePatternSettings();
 	// Wrap everything in a block editor provider.
 	// This ensures 'styles' that are needed for the previews are synced
 	// from the site editor store to the block editor store.
 	return (
 		<ExperimentalBlockEditorProvider settings={ settings }>
 			<Page
-				className="edit-site-patterns"
 				title={ __( 'Patterns content' ) }
+				className="edit-site-page-patterns-dataviews"
 				hideTitleFromUI
 			>
-				<PatternsList
-					// Reset the states when switching between categories and types.
-					key={ `${ type }-${ category }` }
+				<PatternsHeader
+					categoryId={ categoryId }
 					type={ type }
-					categoryId={ category }
+					titleId={ `${ id }-title` }
+					descriptionId={ `${ id }-description` }
+				/>
+				<DataViews
+					key={ categoryId + postType }
+					paginationInfo={ paginationInfo }
+					fields={ fields }
+					actions={ actions }
+					data={ dataWithPermissions || EMPTY_ARRAY }
+					getItemId={ ( item ) => item.name ?? item.id }
+					isLoading={ isResolving }
+					view={ view }
+					onChangeView={ setView }
+					defaultLayouts={ defaultLayouts }
 				/>
 			</Page>
 		</ExperimentalBlockEditorProvider>
diff --git a/packages/edit-site/src/components/page-patterns/no-patterns.js b/packages/edit-site/src/components/page-patterns/no-patterns.js
deleted file mode 100644
index b4805f57018c7c..00000000000000
--- a/packages/edit-site/src/components/page-patterns/no-patterns.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
-export default function NoPatterns() {
-	return (
-		<div className="edit-site-patterns__no-results">
-			{ __( 'No patterns found.' ) }
-		</div>
-	);
-}
diff --git a/packages/edit-site/src/components/page-patterns/pagination.js b/packages/edit-site/src/components/page-patterns/pagination.js
deleted file mode 100644
index 702e24cd31b7f0..00000000000000
--- a/packages/edit-site/src/components/page-patterns/pagination.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalHStack as HStack,
-	__experimentalText as Text,
-	Button,
-} from '@wordpress/components';
-import { __, _x, _n, sprintf } from '@wordpress/i18n';
-
-export default function Pagination( {
-	currentPage,
-	numPages,
-	changePage,
-	totalItems,
-} ) {
-	return (
-		<HStack
-			expanded={ false }
-			spacing={ 3 }
-			justify="flex-start"
-			className="edit-site-patterns__grid-pagination"
-		>
-			<Text variant="muted">
-				{
-					// translators: %s: Total number of patterns.
-					sprintf(
-						// translators: %s: Total number of patterns.
-						_n( '%s item', '%s items', totalItems ),
-						totalItems
-					)
-				}
-			</Text>
-			<HStack expanded={ false } spacing={ 1 }>
-				<Button
-					variant="tertiary"
-					onClick={ () => changePage( 1 ) }
-					disabled={ currentPage === 1 }
-					aria-label={ __( 'First page' ) }
-				>
-					«
-				</Button>
-				<Button
-					variant="tertiary"
-					onClick={ () => changePage( currentPage - 1 ) }
-					disabled={ currentPage === 1 }
-					aria-label={ __( 'Previous page' ) }
-				>
-					‹
-				</Button>
-			</HStack>
-			<Text variant="muted">
-				{ sprintf(
-					// translators: %1$s: Current page number, %2$s: Total number of pages.
-					_x( '%1$s of %2$s', 'paging' ),
-					currentPage,
-					numPages
-				) }
-			</Text>
-			<HStack expanded={ false } spacing={ 1 }>
-				<Button
-					variant="tertiary"
-					onClick={ () => changePage( currentPage + 1 ) }
-					disabled={ currentPage === numPages }
-					aria-label={ __( 'Next page' ) }
-				>
-					›
-				</Button>
-				<Button
-					variant="tertiary"
-					onClick={ () => changePage( numPages ) }
-					disabled={ currentPage === numPages }
-					aria-label={ __( 'Last page' ) }
-				>
-					»
-				</Button>
-			</HStack>
-		</HStack>
-	);
-}
diff --git a/packages/edit-site/src/components/page-patterns/patterns-list.js b/packages/edit-site/src/components/page-patterns/patterns-list.js
deleted file mode 100644
index 6015fbbf4caf34..00000000000000
--- a/packages/edit-site/src/components/page-patterns/patterns-list.js
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useState, useDeferredValue, useId, useMemo } from '@wordpress/element';
-import {
-	SearchControl,
-	__experimentalVStack as VStack,
-	Flex,
-	FlexBlock,
-	__experimentalToggleGroupControl as ToggleGroupControl,
-	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
-	__experimentalHeading as Heading,
-	__experimentalText as Text,
-} from '@wordpress/components';
-import { __, _x, isRTL } from '@wordpress/i18n';
-import { chevronLeft, chevronRight } from '@wordpress/icons';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-import {
-	useAsyncList,
-	useViewportMatch,
-	useDebouncedInput,
-} from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import PatternsHeader from './header';
-import Grid from './grid';
-import NoPatterns from './no-patterns';
-import usePatterns from './use-patterns';
-import SidebarButton from '../sidebar-button';
-import { unlock } from '../../lock-unlock';
-import { PATTERN_SYNC_TYPES, PATTERN_TYPES } from '../../utils/constants';
-import Pagination from './pagination';
-
-const { useLocation, useHistory } = unlock( routerPrivateApis );
-
-const SYNC_FILTERS = {
-	all: _x( 'All', 'Option that shows all patterns' ),
-	[ PATTERN_SYNC_TYPES.full ]: _x(
-		'Synced',
-		'Option that shows all synchronized patterns'
-	),
-	[ PATTERN_SYNC_TYPES.unsynced ]: _x(
-		'Not synced',
-		'Option that shows all patterns that are not synchronized'
-	),
-};
-
-const SYNC_DESCRIPTIONS = {
-	all: '',
-	[ PATTERN_SYNC_TYPES.full ]: __(
-		'Patterns that are kept in sync across the site.'
-	),
-	[ PATTERN_SYNC_TYPES.unsynced ]: __(
-		'Patterns that can be changed freely without affecting the site.'
-	),
-};
-
-const PAGE_SIZE = 20;
-
-export default function PatternsList( { categoryId, type } ) {
-	const location = useLocation();
-	const history = useHistory();
-	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const [ filterValue, setFilterValue, delayedFilterValue ] =
-		useDebouncedInput( '' );
-	const deferredFilterValue = useDeferredValue( delayedFilterValue );
-
-	const [ syncFilter, setSyncFilter ] = useState( 'all' );
-	const [ currentPage, setCurrentPage ] = useState( 1 );
-
-	const deferredSyncedFilter = useDeferredValue( syncFilter );
-
-	const isUncategorizedThemePatterns =
-		type === PATTERN_TYPES.theme && categoryId === 'uncategorized';
-
-	const { patterns, isResolving } = usePatterns(
-		type,
-		isUncategorizedThemePatterns ? '' : categoryId,
-		{
-			search: deferredFilterValue,
-			syncStatus:
-				deferredSyncedFilter === 'all'
-					? undefined
-					: deferredSyncedFilter,
-		}
-	);
-
-	const updateSearchFilter = ( value ) => {
-		setCurrentPage( 1 );
-		setFilterValue( value );
-	};
-
-	const updateSyncFilter = ( value ) => {
-		setCurrentPage( 1 );
-		setSyncFilter( value );
-	};
-
-	const id = useId();
-	const titleId = `${ id }-title`;
-	const descriptionId = `${ id }-description`;
-
-	const hasPatterns = patterns.length;
-	const title = SYNC_FILTERS[ syncFilter ];
-	const description = SYNC_DESCRIPTIONS[ syncFilter ];
-
-	const totalItems = patterns.length;
-	const pageIndex = currentPage - 1;
-	const numPages = Math.ceil( patterns.length / PAGE_SIZE );
-
-	const list = useMemo( () => {
-		return patterns.slice(
-			pageIndex * PAGE_SIZE,
-			pageIndex * PAGE_SIZE + PAGE_SIZE
-		);
-	}, [ pageIndex, patterns ] );
-
-	const asyncList = useAsyncList( list, { step: 10 } );
-
-	const changePage = ( page ) => {
-		const scrollContainer = document.querySelector( '.edit-site-patterns' );
-		scrollContainer?.scrollTo( 0, 0 );
-
-		setCurrentPage( page );
-	};
-
-	return (
-		<>
-			<VStack className="edit-site-patterns__header" spacing={ 6 }>
-				<PatternsHeader
-					categoryId={ categoryId }
-					type={ type }
-					titleId={ titleId }
-					descriptionId={ descriptionId }
-				/>
-				<Flex alignment="stretch" wrap>
-					{ isMobileViewport && (
-						<SidebarButton
-							icon={ isRTL() ? chevronRight : chevronLeft }
-							label={ __( 'Back' ) }
-							onClick={ () => {
-								// Go back in history if we came from the Patterns page.
-								// Otherwise push a stack onto the history.
-								if (
-									location.state?.backPath === '/patterns'
-								) {
-									history.back();
-								} else {
-									history.push( { path: '/patterns' } );
-								}
-							} }
-						/>
-					) }
-					<FlexBlock className="edit-site-patterns__search-block">
-						<SearchControl
-							className="edit-site-patterns__search"
-							onChange={ ( value ) =>
-								updateSearchFilter( value )
-							}
-							placeholder={ __( 'Search patterns' ) }
-							label={ __( 'Search patterns' ) }
-							value={ filterValue }
-							__nextHasNoMarginBottom
-						/>
-					</FlexBlock>
-					{ type === PATTERN_TYPES.theme && (
-						<ToggleGroupControl
-							className="edit-site-patterns__sync-status-filter"
-							hideLabelFromVision
-							label={ __( 'Filter by sync status' ) }
-							value={ syncFilter }
-							isBlock
-							onChange={ ( value ) => updateSyncFilter( value ) }
-							__nextHasNoMarginBottom
-						>
-							{ Object.entries( SYNC_FILTERS ).map(
-								( [ key, label ] ) => (
-									<ToggleGroupControlOption
-										className="edit-site-patterns__sync-status-filter-option"
-										key={ key }
-										value={ key }
-										label={ label }
-									/>
-								)
-							) }
-						</ToggleGroupControl>
-					) }
-				</Flex>
-			</VStack>
-			<VStack
-				className="edit-site-patterns__section"
-				justify="flex-start"
-				spacing={ 6 }
-			>
-				{ syncFilter !== 'all' && (
-					<VStack className="edit-site-patterns__section-header">
-						<Heading as="h3" level={ 5 } id={ titleId }>
-							{ title }
-						</Heading>
-						{ description ? (
-							<Text variant="muted" as="p" id={ descriptionId }>
-								{ description }
-							</Text>
-						) : null }
-					</VStack>
-				) }
-				{ hasPatterns && (
-					<Grid
-						categoryId={ categoryId }
-						items={ asyncList }
-						aria-labelledby={ titleId }
-						aria-describedby={ descriptionId }
-					/>
-				) }
-				{ ! isResolving && ! hasPatterns && <NoPatterns /> }
-			</VStack>
-			{ numPages > 1 && (
-				<Pagination
-					currentPage={ currentPage }
-					numPages={ numPages }
-					changePage={ changePage }
-					totalItems={ totalItems }
-				/>
-			) }
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/page-patterns/rename-category-menu-item.js b/packages/edit-site/src/components/page-patterns/rename-category-menu-item.js
index 3dc3b4f7919dcd..997cc63b46fa5d 100644
--- a/packages/edit-site/src/components/page-patterns/rename-category-menu-item.js
+++ b/packages/edit-site/src/components/page-patterns/rename-category-menu-item.js
@@ -57,6 +57,8 @@ function RenameModal( { category, onClose } ) {
 			existingCategories={ existingCategories }
 			onClose={ onClose }
 			overlayClassName="edit-site-list__rename-modal"
+			focusOnMount="firstContentElement"
+			size="small"
 		/>
 	);
 }
diff --git a/packages/edit-site/src/components/page-patterns/rename-menu-item.js b/packages/edit-site/src/components/page-patterns/rename-menu-item.js
deleted file mode 100644
index 8b1d6771c2e90e..00000000000000
--- a/packages/edit-site/src/components/page-patterns/rename-menu-item.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	Button,
-	MenuItem,
-	Modal,
-	TextControl,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { store as coreStore } from '@wordpress/core-data';
-import { useDispatch } from '@wordpress/data';
-import { useState } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { store as noticesStore } from '@wordpress/notices';
-
-/**
- * Internal dependencies
- */
-import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
-
-export default function RenameMenuItem( { item, onClose } ) {
-	const [ title, setTitle ] = useState( () => item.title );
-	const [ isModalOpen, setIsModalOpen ] = useState( false );
-
-	const { editEntityRecord, saveEditedEntityRecord } =
-		useDispatch( coreStore );
-	const { createSuccessNotice, createErrorNotice } =
-		useDispatch( noticesStore );
-
-	if ( item.type === TEMPLATE_PART_POST_TYPE && ! item.isCustom ) {
-		return null;
-	}
-
-	async function onRename( event ) {
-		event.preventDefault();
-
-		try {
-			await editEntityRecord( 'postType', item.type, item.id, { title } );
-
-			// Update state before saving rerenders the list.
-			setTitle( '' );
-			setIsModalOpen( false );
-			onClose();
-
-			// Persist edited entity.
-			await saveEditedEntityRecord( 'postType', item.type, item.id, {
-				throwOnError: true,
-			} );
-
-			createSuccessNotice(
-				item.type === TEMPLATE_PART_POST_TYPE
-					? __( 'Template part renamed.' )
-					: __( 'Pattern renamed.' ),
-				{
-					type: 'snackbar',
-				}
-			);
-		} catch ( error ) {
-			const fallbackErrorMessage =
-				item.type === TEMPLATE_PART_POST_TYPE
-					? __(
-							'An error occurred while renaming the template part.'
-					  )
-					: __( 'An error occurred while renaming the pattern.' );
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: fallbackErrorMessage;
-
-			createErrorNotice( errorMessage, { type: 'snackbar' } );
-		}
-	}
-
-	return (
-		<>
-			<MenuItem
-				onClick={ () => {
-					setIsModalOpen( true );
-					setTitle( item.title );
-				} }
-			>
-				{ __( 'Rename' ) }
-			</MenuItem>
-			{ isModalOpen && (
-				<Modal
-					title={ __( 'Rename' ) }
-					onRequestClose={ () => {
-						setIsModalOpen( false );
-						onClose();
-					} }
-					overlayClassName="edit-site-list__rename-modal"
-				>
-					<form onSubmit={ onRename }>
-						<VStack spacing="5">
-							<TextControl
-								__nextHasNoMarginBottom
-								label={ __( 'Name' ) }
-								value={ title }
-								onChange={ setTitle }
-								required
-							/>
-
-							<HStack justify="right">
-								<Button
-									variant="tertiary"
-									onClick={ () => {
-										setIsModalOpen( false );
-										onClose();
-									} }
-								>
-									{ __( 'Cancel' ) }
-								</Button>
-
-								<Button variant="primary" type="submit">
-									{ __( 'Save' ) }
-								</Button>
-							</HStack>
-						</VStack>
-					</form>
-				</Modal>
-			) }
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/page-patterns/search-items.js b/packages/edit-site/src/components/page-patterns/search-items.js
index 183cf3bad140d6..1d03400c86c8cc 100644
--- a/packages/edit-site/src/components/page-patterns/search-items.js
+++ b/packages/edit-site/src/components/page-patterns/search-items.js
@@ -1,78 +1,68 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import removeAccents from 'remove-accents';
-import { noCase } from 'change-case';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { extractWords, getNormalizedSearchTerms, normalizeString } = unlock(
+	blockEditorPrivateApis
+);
 
 /**
  * Internal dependencies
  */
 import {
+	TEMPLATE_PART_ALL_AREAS_CATEGORY,
 	PATTERN_DEFAULT_CATEGORY,
 	PATTERN_USER_CATEGORY,
 	PATTERN_TYPES,
+	TEMPLATE_PART_POST_TYPE,
 } from '../../utils/constants';
 
 // Default search helpers.
-const defaultGetName = ( item ) => item.name || '';
-const defaultGetTitle = ( item ) => item.title;
-const defaultGetDescription = ( item ) => item.description || '';
-const defaultGetKeywords = ( item ) => item.keywords || [];
-const defaultHasCategory = () => false;
+const defaultGetName = ( item ) => {
+	if ( item.type === PATTERN_TYPES.user ) {
+		return item.slug;
+	}
 
-/**
- * Extracts words from an input string.
- *
- * @param {string} input The input string.
- *
- * @return {Array} Words, extracted from the input string.
- */
-function extractWords( input = '' ) {
-	return noCase( input, {
-		splitRegexp: [
-			/([\p{Ll}\p{Lo}\p{N}])([\p{Lu}\p{Lt}])/gu, // One lowercase or digit, followed by one uppercase.
-			/([\p{Lu}\p{Lt}])([\p{Lu}\p{Lt}][\p{Ll}\p{Lo}])/gu, // One uppercase followed by one uppercase and one lowercase.
-		],
-		stripRegexp: /(\p{C}|\p{P}|\p{S})+/giu, // Anything that's not a punctuation, symbol or control/format character.
-	} )
-		.split( ' ' )
-		.filter( Boolean );
-}
+	if ( item.type === TEMPLATE_PART_POST_TYPE ) {
+		return '';
+	}
 
-/**
- * Sanitizes the search input string.
- *
- * @param {string} input The search input to normalize.
- *
- * @return {string} The normalized search input.
- */
-function normalizeSearchInput( input = '' ) {
-	// Disregard diacritics.
-	//  Input: "média"
-	input = removeAccents( input );
+	return item.name || '';
+};
 
-	// Accommodate leading slash, matching autocomplete expectations.
-	//  Input: "/media"
-	input = input.replace( /^\//, '' );
+export const defaultGetTitle = ( item ) => {
+	if ( typeof item.title === 'string' ) {
+		return item.title;
+	}
 
-	// Lowercase.
-	//  Input: "MEDIA"
-	input = input.toLowerCase();
+	if ( item.title && item.title.rendered ) {
+		return item.title.rendered;
+	}
 
-	return input;
-}
+	if ( item.title && item.title.raw ) {
+		return item.title.raw;
+	}
 
-/**
- * Converts the search term into a list of normalized terms.
- *
- * @param {string} input The search term to normalize.
- *
- * @return {string[]} The normalized list of search terms.
- */
-export const getNormalizedSearchTerms = ( input = '' ) => {
-	return extractWords( normalizeSearchInput( input ) );
+	return '';
 };
 
+const defaultGetDescription = ( item ) => {
+	if ( item.type === PATTERN_TYPES.user ) {
+		return item.excerpt.raw;
+	}
+
+	return item.description || '';
+};
+
+const defaultGetKeywords = ( item ) => item.keywords || [];
+const defaultHasCategory = () => false;
+
 const removeMatchingTerms = ( unmatchedTerms, unprocessedTerms ) => {
 	return unmatchedTerms.filter(
 		( term ) =>
@@ -93,6 +83,7 @@ const removeMatchingTerms = ( unmatchedTerms, unprocessedTerms ) => {
  */
 export const searchItems = ( items = [], searchInput = '', config = {} ) => {
 	const normalizedSearchTerms = getNormalizedSearchTerms( searchInput );
+
 	// Filter patterns by category: the default category indicates that all patterns will be shown.
 	const onlyFilterByCategory =
 		config.categoryId !== PATTERN_DEFAULT_CATEGORY &&
@@ -145,6 +136,7 @@ function getItemSearchRank( item, searchTerm, config ) {
 
 	let rank =
 		categoryId === PATTERN_DEFAULT_CATEGORY ||
+		categoryId === TEMPLATE_PART_ALL_AREAS_CATEGORY ||
 		( categoryId === PATTERN_USER_CATEGORY &&
 			item.type === PATTERN_TYPES.user ) ||
 		hasCategory( item, categoryId )
@@ -162,8 +154,8 @@ function getItemSearchRank( item, searchTerm, config ) {
 	const description = getDescription( item );
 	const keywords = getKeywords( item );
 
-	const normalizedSearchInput = normalizeSearchInput( searchTerm );
-	const normalizedTitle = normalizeSearchInput( title );
+	const normalizedSearchInput = normalizeString( searchTerm );
+	const normalizedTitle = normalizeString( title );
 
 	// Prefers exact matches
 	// Then prefers if the beginning of the title matches the search term
diff --git a/packages/edit-site/src/components/page-patterns/style.scss b/packages/edit-site/src/components/page-patterns/style.scss
index d02b82ff2560d0..c62fe34daf7d67 100644
--- a/packages/edit-site/src/components/page-patterns/style.scss
+++ b/packages/edit-site/src/components/page-patterns/style.scss
@@ -1,202 +1,87 @@
-.edit-site-patterns {
-	border-left: 1px solid $gray-800;
-	background: none;
-	margin: $header-height 0 0;
-	border-radius: 0;
-	padding: 0;
-	overflow-x: auto;
-
-	.components-base-control {
-		width: 100%;
-		@include break-medium {
-			width: auto;
-		}
-	}
-
-	.components-text {
-		color: $gray-600;
-	}
-
-	.components-heading {
-		color: $gray-200;
-	}
-
-	@include break-medium {
-		margin: 0;
-	}
-
-	.edit-site-patterns__search-block {
-		min-width: fit-content;
-		flex-grow: 1;
-	}
+.edit-site-patterns__delete-modal {
+	width: $modal-width-small;
+}
 
-	// The increased specificity here is to overcome component styles
-	// without relying on internal component class names.
-	.edit-site-patterns__search {
-		input[type="search"] {
-			height: $button-size-next-default-40px;
-			background: $gray-800;
-			color: $gray-200;
-
-			&:focus {
-				background: $gray-800;
-			}
-		}
+.page-patterns-preview-field {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	border-radius: $radius-medium;
 
-		svg {
-			fill: $gray-600;
-		}
+	.dataviews-view-table & {
+		width: 96px;
+		flex-grow: 0;
 	}
 
-	.edit-site-patterns__sync-status-filter {
-		background: $gray-800;
+	.page-patterns-preview-field__button {
+		box-shadow: none;
 		border: none;
-		height: $button-size-next-default-40px;
-		min-width: max-content;
-		width: 100%;
-		max-width: 100%;
+		padding: 0;
+		background-color: unset;
+		box-sizing: border-box;
+		cursor: pointer;
+		overflow: hidden;
+		height: 100%;
+		border-radius: $grid-unit-05;
 
-		@include break-medium {
-			width: 300px;
+		&:focus-visible {
+			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+			// Windows High Contrast mode will show this outline, but not the box-shadow.
+			outline: 2px solid transparent;
 		}
-	}
-	.edit-site-patterns__sync-status-filter-option:not([aria-checked="true"]) {
-		color: $gray-600;
-	}
-	.edit-site-patterns__sync-status-filter-option:active {
-		background: $gray-700;
-		color: $gray-100;
-	}
 
-	.edit-site-patterns__grid-pagination {
-		border-top: 1px solid $gray-800;
-		background: $gray-900;
-		padding: $grid-unit-30 $grid-unit-40;
-		position: sticky;
-		bottom: 0;
-		z-index: z-index(".edit-site-patterns__grid-pagination");
-
-		.components-button.is-tertiary {
-			width: $button-size-compact;
-			height: $button-size-compact;
-			color: $gray-100;
-			background-color: $gray-800;
-			justify-content: center;
-
-			&:disabled {
-				color: $gray-600;
-				background: none;
-			}
-
-			&:hover:not(:disabled) {
-				background-color: $gray-700;
-			}
+		&[aria-disabled="true"] {
+			cursor: default;
 		}
 	}
 }
 
-.edit-site-patterns__header {
-	position: sticky;
-	top: 0;
-	background: $gray-900;
-	padding: $grid-unit-40 $grid-unit-40 $grid-unit-20;
-	z-index: z-index(".edit-site-patterns__header");
-
-	.edit-site-patterns__button {
-		color: $gray-600;
-	}
+.edit-site-patterns__pattern-icon {
+	fill: var(--wp-block-synced-color);
+	flex-shrink: 0;
 }
 
-.edit-site-patterns__section {
-	padding: $grid-unit-30 $grid-unit-40;
-	flex: 1;
+.edit-site-patterns__pattern-lock-icon {
+	min-width: min-content;
 }
 
 .edit-site-patterns__section-header {
-	.screen-reader-shortcut:focus {
-		top: 0;
-	}
-}
-
-.edit-site-patterns__grid {
-	display: grid;
-	grid-template-columns: 1fr;
-	gap: $grid-unit-40;
-	margin-top: 0;
-	margin-bottom: 0;
-	@include break-large {
-		grid-template-columns: 1fr 1fr;
-	}
-	@include break-huge {
-		grid-template-columns: 1fr 1fr 1fr;
-	}
-	@include break-xhuge {
-		grid-template-columns: 1fr 1fr 1fr 1fr;
-	}
-	.edit-site-patterns__pattern {
-		break-inside: avoid-column;
-		display: flex;
-		flex-direction: column;
-		.edit-site-patterns__preview {
-			box-shadow: none;
-			border: none;
-			padding: 0;
-			background-color: unset;
-			box-sizing: border-box;
-			border-radius: 4px;
-			cursor: pointer;
-			overflow: hidden;
-
-			&:focus {
-				box-shadow: inset 0 0 0 0 $white, 0 0 0 2px var(--wp-admin-theme-color);
-				// Windows High Contrast mode will show this outline, but not the box-shadow.
-				outline: 2px solid transparent;
-			}
-
-			&.is-inactive {
-				cursor: default;
-			}
-			&.is-inactive:focus {
-				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) $gray-800;
-				opacity: 0.8;
-			}
-		}
-
-		.edit-site-patterns__footer,
-		.edit-site-patterns__button {
-			color: $gray-600;
-		}
-
-		.edit-site-patterns__dropdown {
-			flex-shrink: 0;
-		}
-
-		&.is-placeholder .edit-site-patterns__preview {
-			min-height: $grid-unit-80;
-			color: $gray-600;
-			border: 1px dashed $gray-800;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			&:focus {
-				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-			}
+	border-bottom: 1px solid #f0f0f0;
+	padding: $grid-unit-20 $grid-unit-60;
+	position: sticky;
+	top: 0;
+	z-index: 2;
+	flex-shrink: 0;
+	transition: padding ease-out 0.1s;
+	@include reduce-motion("transition");
+	min-height: $grid-unit-50;
+
+	.edit-site-patterns__title {
+		min-height: $grid-unit-50;
+
+		.components-heading {
+			flex-grow: 1;
+			flex-basis: 0;
+			white-space: nowrap;
 		}
 	}
 
-	.edit-site-patterns__preview {
-		flex: 0 1 auto;
-		margin-bottom: $grid-unit-15;
+	.edit-site-patterns__sub-title {
+		margin-bottom: $grid-unit-10;
 	}
-}
 
-.edit-site-patterns__load-more {
-	align-self: center;
+	.screen-reader-shortcut:focus {
+		top: 0;
+	}
 }
 
 .edit-site-patterns__pattern-title {
-	color: $gray-200;
+	display: block;
+	width: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	color: inherit;
 
 	.is-link {
 		text-decoration: none;
@@ -219,10 +104,53 @@
 	}
 }
 
-.edit-site-patterns__no-results {
-	color: $gray-600;
+.edit-site-page-patterns-dataviews {
+	.dataviews-view-grid__badge-fields {
+		.dataviews-view-grid__field-value:has(.edit-site-patterns__field-sync-status-fully) {
+			background: rgba(var(--wp-block-synced-color--rgb), 0.04);
+			color: var(--wp-block-synced-color);
+		}
+	}
+}
+
+.dataviews-action-modal__duplicate-pattern {
+	// Fix the modal width to prevent added categories from stretching the modal.
+	[role="dialog"] > [role="document"] {
+		width: 350px;
+	}
+
+	.patterns-menu-items__convert-modal-categories {
+		position: relative;
+	}
+
+	.components-form-token-field__suggestions-list:not(:empty) {
+		position: absolute;
+		border: $border-width solid var(--wp-admin-theme-color);
+		border-bottom-left-radius: $radius-small;
+		border-bottom-right-radius: $radius-small;
+		box-shadow: 0 0 0.5px 0.5px var(--wp-admin-theme-color);
+		box-sizing: border-box;
+		z-index: 1;
+		background-color: $white;
+		width: calc(100% + 2px); // Account for the border width of the token field.
+		left: -1px;
+		min-width: initial;
+		max-height: $grid-unit-60 * 2; // Adjust to not cover the save button, showing three items.
+	}
 }
 
-.edit-site-patterns__delete-modal {
-	width: $modal-width-small;
+.dataviews-action-modal__duplicate-template-part {
+	.components-modal__frame {
+		@include break-small {
+			max-width: 500px;
+		}
+	}
+}
+
+/* stylelint-disable-next-line scss/at-rule-no-unknown -- '@container' not globally permitted */
+@container (max-width: 430px) {
+	.edit-site-page-patterns-dataviews .edit-site-patterns__section-header {
+		padding-left: $grid-unit-30;
+		padding-right: $grid-unit-30;
+	}
 }
diff --git a/packages/edit-site/src/components/page-patterns/use-pattern-settings.js b/packages/edit-site/src/components/page-patterns/use-pattern-settings.js
index 28a16b1d7ed7db..274604395baac5 100644
--- a/packages/edit-site/src/components/page-patterns/use-pattern-settings.js
+++ b/packages/edit-site/src/components/page-patterns/use-pattern-settings.js
@@ -43,7 +43,7 @@ export default function usePatternSettings() {
 		return {
 			...restStoredSettings,
 			__experimentalBlockPatterns: blockPatterns,
-			__unstableIsPreviewMode: true,
+			isPreviewMode: true,
 		};
 	}, [ storedSettings, blockPatterns ] );
 
diff --git a/packages/edit-site/src/components/page-patterns/use-patterns.js b/packages/edit-site/src/components/page-patterns/use-patterns.js
index be5992bd9b4efe..f32e278e6354f5 100644
--- a/packages/edit-site/src/components/page-patterns/use-patterns.js
+++ b/packages/edit-site/src/components/page-patterns/use-patterns.js
@@ -1,16 +1,11 @@
-/**
- * External dependencies
- */
-import createSelector from 'rememo';
-
 /**
  * WordPress dependencies
  */
 import { parse } from '@wordpress/blocks';
-import { useSelect } from '@wordpress/data';
+import { useSelect, createSelector } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as editorStore } from '@wordpress/editor';
-import { decodeEntities } from '@wordpress/html-entities';
+import { useMemo } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -21,7 +16,6 @@ import {
 	PATTERN_TYPES,
 	PATTERN_SYNC_TYPES,
 	TEMPLATE_PART_POST_TYPE,
-	TEMPLATE_ORIGINS,
 	TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
 } from '../../utils/constants';
 import { unlock } from '../../lock-unlock';
@@ -30,36 +24,16 @@ import { store as editSiteStore } from '../../store';
 
 const EMPTY_PATTERN_LIST = [];
 
-const createTemplatePartId = ( theme, slug ) =>
-	theme && slug ? theme + '//' + slug : null;
-
-const templatePartToPattern = ( templatePart ) => ( {
-	blocks: parse( templatePart.content.raw, {
-		__unstableSkipMigrationLogs: true,
-	} ),
-	categories: [ templatePart.area ],
-	description: templatePart.description || '',
-	isCustom: templatePart.source === TEMPLATE_ORIGINS.custom,
-	keywords: templatePart.keywords || [],
-	id: createTemplatePartId( templatePart.theme, templatePart.slug ),
-	name: createTemplatePartId( templatePart.theme, templatePart.slug ),
-	title: decodeEntities( templatePart.title.rendered ),
-	type: templatePart.type,
-	templatePart,
-} );
-
-const selectTemplatePartsAsPatterns = createSelector(
+const selectTemplateParts = createSelector(
 	( select, categoryId, search = '' ) => {
-		const { getEntityRecords, getIsResolving } = select( coreStore );
+		const { getEntityRecords, isResolving: isResolvingSelector } =
+			select( coreStore );
 		const { __experimentalGetDefaultTemplatePartAreas } =
 			select( editorStore );
 		const query = { per_page: -1 };
-		const rawTemplateParts =
+		const templateParts =
 			getEntityRecords( 'postType', TEMPLATE_PART_POST_TYPE, query ) ??
 			EMPTY_PATTERN_LIST;
-		const templateParts = rawTemplateParts.map( ( templatePart ) =>
-			templatePartToPattern( templatePart )
-		);
 
 		// In the case where a custom template part area has been removed we need
 		// the current list of areas to cross check against so orphaned template
@@ -69,16 +43,16 @@ const selectTemplatePartsAsPatterns = createSelector(
 
 		const templatePartHasCategory = ( item, category ) => {
 			if ( category !== TEMPLATE_PART_AREA_DEFAULT_CATEGORY ) {
-				return item.templatePart.area === category;
+				return item.area === category;
 			}
 
 			return (
-				item.templatePart.area === category ||
-				! templatePartAreas.includes( item.templatePart.area )
+				item.area === category ||
+				! templatePartAreas.includes( item.area )
 			);
 		};
 
-		const isResolving = getIsResolving( 'getEntityRecords', [
+		const isResolving = isResolvingSelector( 'getEntityRecords', [
 			'postType',
 			TEMPLATE_PART_POST_TYPE,
 			query,
@@ -99,7 +73,7 @@ const selectTemplatePartsAsPatterns = createSelector(
 				per_page: -1,
 			}
 		),
-		select( coreStore ).getIsResolving( 'getEntityRecords', [
+		select( coreStore ).isResolving( 'getEntityRecords', [
 			'postType',
 			TEMPLATE_PART_POST_TYPE,
 			{ per_page: -1 },
@@ -111,6 +85,7 @@ const selectTemplatePartsAsPatterns = createSelector(
 const selectThemePatterns = createSelector(
 	( select ) => {
 		const { getSettings } = unlock( select( editSiteStore ) );
+		const { isResolving: isResolvingSelector } = select( coreStore );
 		const settings = getSettings();
 		const blockPatterns =
 			settings.__experimentalAdditionalBlockPatterns ??
@@ -136,19 +111,29 @@ const selectThemePatterns = createSelector(
 					__unstableSkipMigrationLogs: true,
 				} ),
 			} ) );
-
-		return { patterns, isResolving: false };
+		return {
+			patterns,
+			isResolving: isResolvingSelector( 'getBlockPatterns' ),
+		};
 	},
 	( select ) => [
 		select( coreStore ).getBlockPatterns(),
+		select( coreStore ).isResolving( 'getBlockPatterns' ),
 		unlock( select( editSiteStore ) ).getSettings(),
 	]
 );
 
 const selectPatterns = createSelector(
 	( select, categoryId, syncStatus, search = '' ) => {
-		const { patterns: themePatterns } = selectThemePatterns( select );
-		const { patterns: userPatterns } = selectUserPatterns( select );
+		const {
+			patterns: themePatterns,
+			isResolving: isResolvingThemePatterns,
+		} = selectThemePatterns( select );
+		const {
+			patterns: userPatterns,
+			isResolving: isResolvingUserPatterns,
+			categories: userPatternCategories,
+		} = selectUserPatterns( select );
 
 		let patterns = [
 			...( themePatterns || [] ),
@@ -160,7 +145,8 @@ const selectPatterns = createSelector(
 			// Non-user patterns are all unsynced for the time being.
 			patterns = patterns.filter( ( pattern ) => {
 				return pattern.type === PATTERN_TYPES.user
-					? pattern.syncStatus === syncStatus
+					? ( pattern.wp_pattern_sync_status ||
+							PATTERN_SYNC_TYPES.full ) === syncStatus
 					: syncStatus === PATTERN_SYNC_TYPES.unsynced;
 			} );
 		}
@@ -168,15 +154,41 @@ const selectPatterns = createSelector(
 		if ( categoryId ) {
 			patterns = searchItems( patterns, search, {
 				categoryId,
-				hasCategory: ( item, currentCategory ) =>
-					item.categories?.includes( currentCategory ),
+				hasCategory: ( item, currentCategory ) => {
+					if ( item.type === PATTERN_TYPES.user ) {
+						return item.wp_pattern_category.some(
+							( catId ) =>
+								userPatternCategories.find(
+									( cat ) => cat.id === catId
+								)?.slug === currentCategory
+						);
+					}
+					return item.categories?.includes( currentCategory );
+				},
 			} );
 		} else {
 			patterns = searchItems( patterns, search, {
-				hasCategory: ( item ) => ! item.hasOwnProperty( 'categories' ),
+				hasCategory: ( item ) => {
+					if ( item.type === PATTERN_TYPES.user ) {
+						return (
+							userPatternCategories?.length &&
+							( ! item.wp_pattern_category?.length ||
+								! item.wp_pattern_category.some( ( catId ) =>
+									userPatternCategories.find(
+										( cat ) => cat.id === catId
+									)
+								) )
+						);
+					}
+
+					return ! item.hasOwnProperty( 'categories' );
+				},
 			} );
 		}
-		return { patterns, isResolving: false };
+		return {
+			patterns,
+			isResolving: isResolvingThemePatterns || isResolvingUserPatterns,
+		};
 	},
 	( select ) => [
 		selectThemePatterns( select ),
@@ -184,38 +196,16 @@ const selectPatterns = createSelector(
 	]
 );
 
-const patternBlockToPattern = ( patternBlock, categories ) => ( {
-	blocks: parse( patternBlock.content.raw, {
-		__unstableSkipMigrationLogs: true,
-	} ),
-	...( patternBlock.wp_pattern_category.length > 0 && {
-		categories: patternBlock.wp_pattern_category.map(
-			( patternCategoryId ) =>
-				categories && categories.get( patternCategoryId )
-					? categories.get( patternCategoryId ).slug
-					: patternCategoryId
-		),
-	} ),
-	termLabels: patternBlock.wp_pattern_category.map( ( patternCategoryId ) =>
-		categories?.get( patternCategoryId )
-			? categories.get( patternCategoryId ).label
-			: patternCategoryId
-	),
-	id: patternBlock.id,
-	name: patternBlock.slug,
-	syncStatus: patternBlock.wp_pattern_sync_status || PATTERN_SYNC_TYPES.full,
-	title: patternBlock.title.raw,
-	type: PATTERN_TYPES.user,
-	patternBlock,
-} );
-
 const selectUserPatterns = createSelector(
 	( select, syncStatus, search = '' ) => {
-		const { getEntityRecords, getIsResolving, getUserPatternCategories } =
-			select( coreStore );
+		const {
+			getEntityRecords,
+			isResolving: isResolvingSelector,
+			getUserPatternCategories,
+		} = select( coreStore );
 
 		const query = { per_page: -1 };
-		const records = getEntityRecords(
+		const patternPosts = getEntityRecords(
 			'postType',
 			PATTERN_TYPES.user,
 			query
@@ -225,13 +215,8 @@ const selectUserPatterns = createSelector(
 		userPatternCategories.forEach( ( userCategory ) =>
 			categories.set( userCategory.id, userCategory )
 		);
-		let patterns = records
-			? records.map( ( record ) =>
-					patternBlockToPattern( record, categories )
-			  )
-			: EMPTY_PATTERN_LIST;
-
-		const isResolving = getIsResolving( 'getEntityRecords', [
+		let patterns = patternPosts ?? EMPTY_PATTERN_LIST;
+		const isResolving = isResolvingSelector( 'getEntityRecords', [
 			'postType',
 			PATTERN_TYPES.user,
 			query,
@@ -239,7 +224,9 @@ const selectUserPatterns = createSelector(
 
 		if ( syncStatus ) {
 			patterns = patterns.filter(
-				( pattern ) => pattern.syncStatus === syncStatus
+				( pattern ) =>
+					pattern.wp_pattern_sync_status ||
+					PATTERN_SYNC_TYPES.full === syncStatus
 			);
 		}
 
@@ -260,7 +247,7 @@ const selectUserPatterns = createSelector(
 		select( coreStore ).getEntityRecords( 'postType', PATTERN_TYPES.user, {
 			per_page: -1,
 		} ),
-		select( coreStore ).getIsResolving( 'getEntityRecords', [
+		select( coreStore ).isResolving( 'getEntityRecords', [
 			'postType',
 			PATTERN_TYPES.user,
 			{ per_page: -1 },
@@ -269,22 +256,57 @@ const selectUserPatterns = createSelector(
 	]
 );
 
+export function useAugmentPatternsWithPermissions( patterns ) {
+	const idsAndTypes = useMemo(
+		() =>
+			patterns
+				?.filter( ( record ) => record.type !== PATTERN_TYPES.theme )
+				.map( ( record ) => [ record.type, record.id ] ) ?? [],
+		[ patterns ]
+	);
+
+	const permissions = useSelect(
+		( select ) => {
+			const { getEntityRecordPermissions } = unlock(
+				select( coreStore )
+			);
+			return idsAndTypes.reduce( ( acc, [ type, id ] ) => {
+				acc[ id ] = getEntityRecordPermissions( 'postType', type, id );
+				return acc;
+			}, {} );
+		},
+		[ idsAndTypes ]
+	);
+
+	return useMemo(
+		() =>
+			patterns?.map( ( record ) => ( {
+				...record,
+				permissions: permissions?.[ record.id ] ?? {},
+			} ) ) ?? [],
+		[ patterns, permissions ]
+	);
+}
+
 export const usePatterns = (
-	categoryType,
+	postType,
 	categoryId,
 	{ search = '', syncStatus } = {}
 ) => {
 	return useSelect(
 		( select ) => {
-			if ( categoryType === TEMPLATE_PART_POST_TYPE ) {
-				return selectTemplatePartsAsPatterns(
+			if ( postType === TEMPLATE_PART_POST_TYPE ) {
+				return selectTemplateParts( select, categoryId, search );
+			} else if ( postType === PATTERN_TYPES.user && !! categoryId ) {
+				const appliedCategory =
+					categoryId === 'uncategorized' ? '' : categoryId;
+				return selectPatterns(
 					select,
-					categoryId,
+					appliedCategory,
+					syncStatus,
 					search
 				);
-			} else if ( categoryType === PATTERN_TYPES.theme ) {
-				return selectPatterns( select, categoryId, syncStatus, search );
-			} else if ( categoryType === PATTERN_TYPES.user ) {
+			} else if ( postType === PATTERN_TYPES.user ) {
 				return selectUserPatterns( select, syncStatus, search );
 			}
 			return {
@@ -292,7 +314,7 @@ export const usePatterns = (
 				isResolving: false,
 			};
 		},
-		[ categoryId, categoryType, search, syncStatus ]
+		[ categoryId, postType, search, syncStatus ]
 	);
 };
 
diff --git a/packages/edit-site/src/components/page-template-parts/add-new-template-part.js b/packages/edit-site/src/components/page-template-parts/add-new-template-part.js
deleted file mode 100644
index 8d46010587242a..00000000000000
--- a/packages/edit-site/src/components/page-template-parts/add-new-template-part.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-import { useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import { useState } from '@wordpress/element';
-import { Button } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-import { store as editSiteStore } from '../../store';
-import CreateTemplatePartModal from '../create-template-part-modal';
-import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
-
-const { useHistory } = unlock( routerPrivateApis );
-
-export default function AddNewTemplatePart() {
-	const { canCreate, postType } = useSelect( ( select ) => {
-		const { supportsTemplatePartsMode } =
-			select( editSiteStore ).getSettings();
-		return {
-			canCreate: ! supportsTemplatePartsMode,
-			postType: select( coreStore ).getPostType(
-				TEMPLATE_PART_POST_TYPE
-			),
-		};
-	}, [] );
-	const [ isModalOpen, setIsModalOpen ] = useState( false );
-	const history = useHistory();
-
-	if ( ! canCreate || ! postType ) {
-		return null;
-	}
-
-	return (
-		<>
-			<Button variant="primary" onClick={ () => setIsModalOpen( true ) }>
-				{ postType.labels.add_new_item }
-			</Button>
-			{ isModalOpen && (
-				<CreateTemplatePartModal
-					closeModal={ () => setIsModalOpen( false ) }
-					blocks={ [] }
-					onCreate={ ( templatePart ) => {
-						setIsModalOpen( false );
-						history.push( {
-							postId: templatePart.id,
-							postType: TEMPLATE_PART_POST_TYPE,
-							canvas: 'edit',
-						} );
-					} }
-					onError={ () => setIsModalOpen( false ) }
-				/>
-			) }
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/page-template-parts/index.js b/packages/edit-site/src/components/page-template-parts/index.js
deleted file mode 100644
index 2a8c41e333ce27..00000000000000
--- a/packages/edit-site/src/components/page-template-parts/index.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	VisuallyHidden,
-	__experimentalHeading as Heading,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useEntityRecords } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import Page from '../page';
-import Table from '../table';
-import Link from '../routes/link';
-import AddedBy from '../list/added-by';
-import TemplateActions from '../template-actions';
-import AddNewTemplatePart from './add-new-template-part';
-import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
-import { unlock } from '../../lock-unlock';
-
-const { useLocation } = unlock( routerPrivateApis );
-
-export default function PageTemplateParts() {
-	const {
-		params: { didAccessPatternsPage },
-	} = useLocation();
-
-	const { records: templateParts } = useEntityRecords(
-		'postType',
-		TEMPLATE_PART_POST_TYPE,
-		{
-			per_page: -1,
-		}
-	);
-
-	const columns = [
-		{
-			header: __( 'Template Part' ),
-			cell: ( templatePart ) => (
-				<VStack>
-					<Heading as="h3" level={ 5 }>
-						<Link
-							params={ {
-								postId: templatePart.id,
-								postType: templatePart.type,
-								didAccessPatternsPage: !! didAccessPatternsPage
-									? 1
-									: undefined,
-							} }
-							state={ {
-								backPath: '/wp_template_part/all',
-							} }
-						>
-							{ decodeEntities(
-								templatePart.title?.rendered ||
-									templatePart.slug
-							) }
-						</Link>
-					</Heading>
-				</VStack>
-			),
-			maxWidth: 400,
-		},
-		{
-			header: __( 'Added by' ),
-			cell: ( templatePart ) => (
-				<AddedBy
-					postType={ templatePart.type }
-					postId={ templatePart.id }
-				/>
-			),
-		},
-		{
-			header: <VisuallyHidden>{ __( 'Actions' ) }</VisuallyHidden>,
-			cell: ( templatePart ) => (
-				<TemplateActions
-					postType={ templatePart.type }
-					postId={ templatePart.id }
-				/>
-			),
-		},
-	];
-
-	return (
-		<Page
-			title={ __( 'Template Parts' ) }
-			actions={ <AddNewTemplatePart /> }
-		>
-			{ templateParts && (
-				<Table data={ templateParts } columns={ columns } />
-			) }
-		</Page>
-	);
-}
diff --git a/packages/edit-site/src/components/page-templates/dataviews-templates.js b/packages/edit-site/src/components/page-templates/dataviews-templates.js
deleted file mode 100644
index 15750dd85b42c9..00000000000000
--- a/packages/edit-site/src/components/page-templates/dataviews-templates.js
+++ /dev/null
@@ -1,359 +0,0 @@
-/**
- * External dependencies
- */
-import removeAccents from 'remove-accents';
-
-/**
- * WordPress dependencies
- */
-import {
-	Icon,
-	__experimentalView as View,
-	__experimentalText as Text,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-	VisuallyHidden,
-} from '@wordpress/components';
-import { __, _x } from '@wordpress/i18n';
-import { useState, useMemo, useCallback } from '@wordpress/element';
-import { useEntityRecords } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { parse } from '@wordpress/blocks';
-import {
-	BlockPreview,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import { DataViews } from '@wordpress/dataviews';
-
-/**
- * Internal dependencies
- */
-import Page from '../page';
-import Link from '../routes/link';
-import { useAddedBy, AvatarImage } from '../list/added-by';
-import {
-	TEMPLATE_POST_TYPE,
-	ENUMERATION_TYPE,
-	OPERATOR_IN,
-	OPERATOR_NOT_IN,
-	LAYOUT_GRID,
-	LAYOUT_TABLE,
-} from '../../utils/constants';
-import {
-	useResetTemplateAction,
-	deleteTemplateAction,
-	renameTemplateAction,
-} from './template-actions';
-import usePatternSettings from '../page-patterns/use-pattern-settings';
-import { unlock } from '../../lock-unlock';
-
-const { ExperimentalBlockEditorProvider, useGlobalStyle } = unlock(
-	blockEditorPrivateApis
-);
-
-const EMPTY_ARRAY = [];
-
-const defaultConfigPerViewType = {
-	[ LAYOUT_TABLE ]: {},
-	[ LAYOUT_GRID ]: {
-		mediaField: 'preview',
-		primaryField: 'title',
-	},
-};
-
-const DEFAULT_VIEW = {
-	type: LAYOUT_TABLE,
-	search: '',
-	page: 1,
-	perPage: 20,
-	// All fields are visible by default, so it's
-	// better to keep track of the hidden ones.
-	hiddenFields: [ 'preview' ],
-	layout: {},
-	filters: [],
-};
-
-function normalizeSearchInput( input = '' ) {
-	return removeAccents( input.trim().toLowerCase() );
-}
-
-// TODO: these are going to be reused in the template part list.
-// That's the reason for leaving the template parts code for now.
-function TemplateTitle( { item } ) {
-	const { isCustomized } = useAddedBy( item.type, item.id );
-	return (
-		<VStack spacing={ 1 }>
-			<View as="h3">
-				<Link
-					params={ {
-						postId: item.id,
-						postType: item.type,
-						canvas: 'edit',
-					} }
-				>
-					{ decodeEntities( item.title?.rendered || item.slug ) ||
-						__( '(no title)' ) }
-				</Link>
-			</View>
-			{ isCustomized && (
-				<span className="edit-site-list-added-by__customized-info">
-					{ item.type === TEMPLATE_POST_TYPE
-						? _x( 'Customized', 'template' )
-						: _x( 'Customized', 'template part' ) }
-				</span>
-			) }
-		</VStack>
-	);
-}
-
-function AuthorField( { item } ) {
-	const { text, icon, imageUrl } = useAddedBy( item.type, item.id );
-	return (
-		<HStack alignment="left" spacing={ 1 }>
-			{ imageUrl ? (
-				<AvatarImage imageUrl={ imageUrl } />
-			) : (
-				<div className="edit-site-list-added-by__icon">
-					<Icon icon={ icon } />
-				</div>
-			) }
-			<span>{ text }</span>
-		</HStack>
-	);
-}
-
-function TemplatePreview( { content, viewType } ) {
-	const settings = usePatternSettings();
-	const [ backgroundColor = 'white' ] = useGlobalStyle( 'color.background' );
-	const blocks = useMemo( () => {
-		return parse( content );
-	}, [ content ] );
-	if ( ! blocks?.length ) {
-		return null;
-	}
-	// Wrap everything in a block editor provider to ensure 'styles' that are needed
-	// for the previews are synced between the site editor store and the block editor store.
-	// Additionally we need to have the `__experimentalBlockPatterns` setting in order to
-	// render patterns inside the previews.
-	// TODO: Same approach is used in the patterns list and it becomes obvious that some of
-	// the block editor settings are needed in context where we don't have the block editor.
-	// Explore how we can solve this in a better way.
-	return (
-		<ExperimentalBlockEditorProvider settings={ settings }>
-			<div
-				className={ `page-templates-preview-field is-viewtype-${ viewType }` }
-				style={ { backgroundColor } }
-			>
-				<BlockPreview blocks={ blocks } />
-			</div>
-		</ExperimentalBlockEditorProvider>
-	);
-}
-
-export default function DataviewsTemplates() {
-	const [ view, setView ] = useState( DEFAULT_VIEW );
-	const { records: allTemplates, isResolving: isLoadingData } =
-		useEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
-			per_page: -1,
-		} );
-
-	const authors = useMemo( () => {
-		if ( ! allTemplates ) {
-			return EMPTY_ARRAY;
-		}
-		const authorsSet = new Set();
-		allTemplates.forEach( ( template ) => {
-			authorsSet.add( template.author_text );
-		} );
-		return Array.from( authorsSet ).map( ( author ) => ( {
-			value: author,
-			label: author,
-		} ) );
-	}, [ allTemplates ] );
-
-	const fields = useMemo(
-		() => [
-			{
-				header: __( 'Preview' ),
-				id: 'preview',
-				render: ( { item, view: { type: viewType } } ) => {
-					return (
-						<TemplatePreview
-							content={ item.content.raw }
-							viewType={ viewType }
-						/>
-					);
-				},
-				minWidth: 120,
-				maxWidth: 120,
-				enableSorting: false,
-			},
-			{
-				header: __( 'Template' ),
-				id: 'title',
-				getValue: ( { item } ) => item.title?.rendered || item.slug,
-				render: ( { item } ) => <TemplateTitle item={ item } />,
-				maxWidth: 400,
-				enableHiding: false,
-			},
-			{
-				header: __( 'Description' ),
-				id: 'description',
-				getValue: ( { item } ) => item.description,
-				render: ( { item } ) => {
-					return item.description ? (
-						decodeEntities( item.description )
-					) : (
-						<>
-							<Text variant="muted" aria-hidden="true">
-								&#8212;
-							</Text>
-							<VisuallyHidden>
-								{ __( 'No description.' ) }
-							</VisuallyHidden>
-						</>
-					);
-				},
-				maxWidth: 200,
-				enableSorting: false,
-			},
-			{
-				header: __( 'Author' ),
-				id: 'author',
-				getValue: ( { item } ) => item.author_text,
-				render: ( { item } ) => {
-					return <AuthorField item={ item } />;
-				},
-				enableHiding: false,
-				type: ENUMERATION_TYPE,
-				elements: authors,
-			},
-		],
-		[ authors ]
-	);
-
-	const { shownTemplates, paginationInfo } = useMemo( () => {
-		if ( ! allTemplates ) {
-			return {
-				shownTemplates: EMPTY_ARRAY,
-				paginationInfo: { totalItems: 0, totalPages: 0 },
-			};
-		}
-		let filteredTemplates = [ ...allTemplates ];
-		// Handle global search.
-		if ( view.search ) {
-			const normalizedSearch = normalizeSearchInput( view.search );
-			filteredTemplates = filteredTemplates.filter( ( item ) => {
-				const title = item.title?.rendered || item.slug;
-				return (
-					normalizeSearchInput( title ).includes(
-						normalizedSearch
-					) ||
-					normalizeSearchInput( item.description ).includes(
-						normalizedSearch
-					)
-				);
-			} );
-		}
-
-		// Handle filters.
-		if ( view.filters.length > 0 ) {
-			view.filters.forEach( ( filter ) => {
-				if (
-					filter.field === 'author' &&
-					filter.operator === OPERATOR_IN &&
-					!! filter.value
-				) {
-					filteredTemplates = filteredTemplates.filter( ( item ) => {
-						return item.author_text === filter.value;
-					} );
-				} else if (
-					filter.field === 'author' &&
-					filter.operator === OPERATOR_NOT_IN &&
-					!! filter.value
-				) {
-					filteredTemplates = filteredTemplates.filter( ( item ) => {
-						return item.author_text !== filter.value;
-					} );
-				}
-			} );
-		}
-
-		// Handle sorting.
-		if ( view.sort ) {
-			const stringSortingFields = [ 'title', 'author' ];
-			const fieldId = view.sort.field;
-			if ( stringSortingFields.includes( fieldId ) ) {
-				const fieldToSort = fields.find( ( field ) => {
-					return field.id === fieldId;
-				} );
-				filteredTemplates.sort( ( a, b ) => {
-					const valueA = fieldToSort.getValue( { item: a } ) ?? '';
-					const valueB = fieldToSort.getValue( { item: b } ) ?? '';
-					return view.sort.direction === 'asc'
-						? valueA.localeCompare( valueB )
-						: valueB.localeCompare( valueA );
-				} );
-			}
-		}
-
-		// Handle pagination.
-		const start = ( view.page - 1 ) * view.perPage;
-		const totalItems = filteredTemplates?.length || 0;
-		filteredTemplates = filteredTemplates?.slice(
-			start,
-			start + view.perPage
-		);
-		return {
-			shownTemplates: filteredTemplates,
-			paginationInfo: {
-				totalItems,
-				totalPages: Math.ceil( totalItems / view.perPage ),
-			},
-		};
-	}, [ allTemplates, view, fields ] );
-
-	const resetTemplateAction = useResetTemplateAction();
-	const actions = useMemo(
-		() => [
-			resetTemplateAction,
-			deleteTemplateAction,
-			renameTemplateAction,
-		],
-		[ resetTemplateAction ]
-	);
-	const onChangeView = useCallback(
-		( viewUpdater ) => {
-			let updatedView =
-				typeof viewUpdater === 'function'
-					? viewUpdater( view )
-					: viewUpdater;
-			if ( updatedView.type !== view.type ) {
-				updatedView = {
-					...updatedView,
-					layout: {
-						...defaultConfigPerViewType[ updatedView.type ],
-					},
-				};
-			}
-
-			setView( updatedView );
-		},
-		[ view, setView ]
-	);
-	return (
-		<Page title={ __( 'Templates' ) }>
-			<DataViews
-				paginationInfo={ paginationInfo }
-				fields={ fields }
-				actions={ actions }
-				data={ shownTemplates }
-				getItemId={ ( item ) => item.id }
-				isLoading={ isLoadingData }
-				view={ view }
-				onChangeView={ onChangeView }
-				supportedLayouts={ [ LAYOUT_TABLE, LAYOUT_GRID ] }
-			/>
-		</Page>
-	);
-}
diff --git a/packages/edit-site/src/components/page-templates/fields.js b/packages/edit-site/src/components/page-templates/fields.js
new file mode 100644
index 00000000000000..d26f1906a10664
--- /dev/null
+++ b/packages/edit-site/src/components/page-templates/fields.js
@@ -0,0 +1,157 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { Icon, __experimentalHStack as HStack } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useState, useMemo } from '@wordpress/element';
+import { decodeEntities } from '@wordpress/html-entities';
+import { parse } from '@wordpress/blocks';
+import {
+	BlockPreview,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+import { EditorProvider } from '@wordpress/editor';
+
+/**
+ * Internal dependencies
+ */
+import { Async } from '../async';
+import { default as Link, useLink } from '../routes/link';
+import { useAddedBy } from './hooks';
+
+import usePatternSettings from '../page-patterns/use-pattern-settings';
+import { unlock } from '../../lock-unlock';
+
+const { useGlobalStyle } = unlock( blockEditorPrivateApis );
+
+function PreviewField( { item } ) {
+	const settings = usePatternSettings();
+	const [ backgroundColor = 'white' ] = useGlobalStyle( 'color.background' );
+	const blocks = useMemo( () => {
+		return parse( item.content.raw );
+	}, [ item.content.raw ] );
+	const { onClick } = useLink( {
+		postId: item.id,
+		postType: item.type,
+		canvas: 'edit',
+	} );
+
+	const isEmpty = ! blocks?.length;
+	// Wrap everything in a block editor provider to ensure 'styles' that are needed
+	// for the previews are synced between the site editor store and the block editor store.
+	// Additionally we need to have the `__experimentalBlockPatterns` setting in order to
+	// render patterns inside the previews.
+	// TODO: Same approach is used in the patterns list and it becomes obvious that some of
+	// the block editor settings are needed in context where we don't have the block editor.
+	// Explore how we can solve this in a better way.
+	return (
+		<EditorProvider post={ item } settings={ settings }>
+			<div
+				className="page-templates-preview-field"
+				style={ { backgroundColor } }
+			>
+				<button
+					className="page-templates-preview-field__button"
+					type="button"
+					onClick={ onClick }
+					aria-label={ item.title?.rendered || item.title }
+				>
+					{ isEmpty && __( 'Empty template' ) }
+					{ ! isEmpty && (
+						<Async>
+							<BlockPreview blocks={ blocks } />
+						</Async>
+					) }
+				</button>
+			</div>
+		</EditorProvider>
+	);
+}
+
+export const previewField = {
+	label: __( 'Preview' ),
+	id: 'preview',
+	render: PreviewField,
+	enableSorting: false,
+};
+
+function TitleField( { item } ) {
+	const linkProps = {
+		params: {
+			postId: item.id,
+			postType: item.type,
+			canvas: 'edit',
+		},
+	};
+	return (
+		<Link { ...linkProps }>
+			{ decodeEntities( item.title?.rendered ) || __( '(no title)' ) }
+		</Link>
+	);
+}
+
+export const titleField = {
+	label: __( 'Template' ),
+	id: 'title',
+	getValue: ( { item } ) => item.title?.rendered,
+	render: TitleField,
+	enableHiding: false,
+	enableGlobalSearch: true,
+};
+
+export const descriptionField = {
+	label: __( 'Description' ),
+	id: 'description',
+	render: ( { item } ) => {
+		return (
+			item.description && (
+				<span className="page-templates-description">
+					{ decodeEntities( item.description ) }
+				</span>
+			)
+		);
+	},
+	enableSorting: false,
+	enableGlobalSearch: true,
+};
+
+function AuthorField( { item } ) {
+	const [ isImageLoaded, setIsImageLoaded ] = useState( false );
+	const { text, icon, imageUrl } = useAddedBy( item.type, item.id );
+
+	return (
+		<HStack alignment="left" spacing={ 0 }>
+			{ imageUrl && (
+				<div
+					className={ clsx( 'page-templates-author-field__avatar', {
+						'is-loaded': isImageLoaded,
+					} ) }
+				>
+					<img
+						onLoad={ () => setIsImageLoaded( true ) }
+						alt=""
+						src={ imageUrl }
+					/>
+				</div>
+			) }
+			{ ! imageUrl && (
+				<div className="page-templates-author-field__icon">
+					<Icon icon={ icon } />
+				</div>
+			) }
+			<span className="page-templates-author-field__name">{ text }</span>
+		</HStack>
+	);
+}
+
+export const authorField = {
+	label: __( 'Author' ),
+	id: 'author',
+	getValue: ( { item } ) => item.author_text,
+	render: AuthorField,
+};
diff --git a/packages/edit-site/src/components/page-templates/hooks.js b/packages/edit-site/src/components/page-templates/hooks.js
new file mode 100644
index 00000000000000..3cf2d78a59ee99
--- /dev/null
+++ b/packages/edit-site/src/components/page-templates/hooks.js
@@ -0,0 +1,100 @@
+/**
+ * WordPress dependencies
+ */
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import {
+	commentAuthorAvatar as authorIcon,
+	layout as themeIcon,
+	plugins as pluginIcon,
+	globe as globeIcon,
+} from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_ORIGINS } from '../../utils/constants';
+
+/** @typedef {'wp_template'|'wp_template_part'} TemplateType */
+
+/**
+ * @typedef {'theme'|'plugin'|'site'|'user'} AddedByType
+ *
+ * @typedef AddedByData
+ * @type {Object}
+ * @property {AddedByType}  type         The type of the data.
+ * @property {JSX.Element}  icon         The icon to display.
+ * @property {string}       [imageUrl]   The optional image URL to display.
+ * @property {string}       [text]       The text to display.
+ * @property {boolean}      isCustomized Whether the template has been customized.
+ *
+ * @param    {TemplateType} postType     The template post type.
+ * @param    {number}       postId       The template post id.
+ * @return {AddedByData} The added by object or null.
+ */
+export function useAddedBy( postType, postId ) {
+	return useSelect(
+		( select ) => {
+			const {
+				getEntityRecord,
+				getMedia,
+				getUser,
+				getEditedEntityRecord,
+			} = select( coreStore );
+			const template = getEditedEntityRecord(
+				'postType',
+				postType,
+				postId
+			);
+			const originalSource = template?.original_source;
+			const authorText = template?.author_text;
+
+			switch ( originalSource ) {
+				case 'theme': {
+					return {
+						type: originalSource,
+						icon: themeIcon,
+						text: authorText,
+						isCustomized:
+							template.source === TEMPLATE_ORIGINS.custom,
+					};
+				}
+				case 'plugin': {
+					return {
+						type: originalSource,
+						icon: pluginIcon,
+						text: authorText,
+						isCustomized:
+							template.source === TEMPLATE_ORIGINS.custom,
+					};
+				}
+				case 'site': {
+					const siteData = getEntityRecord(
+						'root',
+						'__unstableBase'
+					);
+					return {
+						type: originalSource,
+						icon: globeIcon,
+						imageUrl: siteData?.site_logo
+							? getMedia( siteData.site_logo )?.source_url
+							: undefined,
+						text: authorText,
+						isCustomized: false,
+					};
+				}
+				default: {
+					const user = getUser( template.author );
+					return {
+						type: 'user',
+						icon: authorIcon,
+						imageUrl: user?.avatar_urls?.[ 48 ],
+						text: authorText,
+						isCustomized: false,
+					};
+				}
+			}
+		},
+		[ postType, postId ]
+	);
+}
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index 55c666970b5cc2..5ffc2477337935 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -1,92 +1,231 @@
 /**
  * WordPress dependencies
  */
-import {
-	VisuallyHidden,
-	__experimentalHeading as Heading,
-	__experimentalText as Text,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { useEntityRecords } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
+import { useState, useMemo, useCallback, useEffect } from '@wordpress/element';
+import { privateApis as corePrivateApis } from '@wordpress/core-data';
+import { DataViews, filterSortAndPaginate } from '@wordpress/dataviews';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
 import Page from '../page';
-import Table from '../table';
-import Link from '../routes/link';
-import AddedBy from '../list/added-by';
-import TemplateActions from '../template-actions';
 import AddNewTemplate from '../add-new-template';
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
+import {
+	TEMPLATE_POST_TYPE,
+	OPERATOR_IS_ANY,
+	LAYOUT_GRID,
+	LAYOUT_TABLE,
+	LAYOUT_LIST,
+} from '../../utils/constants';
+import { unlock } from '../../lock-unlock';
+import { useEditPostAction } from '../dataviews-actions';
+import {
+	authorField,
+	descriptionField,
+	previewField,
+	titleField,
+} from './fields';
+
+const { usePostActions } = unlock( editorPrivateApis );
+const { useHistory, useLocation } = unlock( routerPrivateApis );
+const { useEntityRecordsWithPermissions } = unlock( corePrivateApis );
+
+const EMPTY_ARRAY = [];
+
+const defaultLayouts = {
+	[ LAYOUT_TABLE ]: {
+		fields: [ 'template', 'author' ],
+		layout: {
+			primaryField: 'title',
+			combinedFields: [
+				{
+					id: 'template',
+					label: __( 'Template' ),
+					children: [ 'title', 'description' ],
+					direction: 'vertical',
+				},
+			],
+			styles: {
+				template: {
+					maxWidth: 400,
+					minWidth: 320,
+				},
+				preview: {
+					width: '1%',
+				},
+				author: {
+					width: '1%',
+				},
+			},
+		},
+	},
+	[ LAYOUT_GRID ]: {
+		fields: [ 'title', 'description', 'author' ],
+		layout: {
+			mediaField: 'preview',
+			primaryField: 'title',
+			columnFields: [ 'description' ],
+		},
+	},
+	[ LAYOUT_LIST ]: {
+		fields: [ 'title', 'description', 'author' ],
+		layout: {
+			primaryField: 'title',
+			mediaField: 'preview',
+		},
+	},
+};
+
+const DEFAULT_VIEW = {
+	type: LAYOUT_GRID,
+	search: '',
+	page: 1,
+	perPage: 20,
+	sort: {
+		field: 'title',
+		direction: 'asc',
+	},
+	fields: defaultLayouts[ LAYOUT_GRID ].fields,
+	layout: defaultLayouts[ LAYOUT_GRID ].layout,
+	filters: [],
+};
 
 export default function PageTemplates() {
-	const { records: templates } = useEntityRecords(
-		'postType',
-		TEMPLATE_POST_TYPE,
-		{
+	const { params } = useLocation();
+	const { activeView = 'all', layout, postId } = params;
+	const [ selection, setSelection ] = useState( [ postId ] );
+
+	const defaultView = useMemo( () => {
+		const usedType = layout ?? DEFAULT_VIEW.type;
+		return {
+			...DEFAULT_VIEW,
+			type: usedType,
+			layout: defaultLayouts[ usedType ].layout,
+			fields: defaultLayouts[ usedType ].fields,
+			filters:
+				activeView !== 'all'
+					? [
+							{
+								field: 'author',
+								operator: 'isAny',
+								value: [ activeView ],
+							},
+					  ]
+					: [],
+		};
+	}, [ layout, activeView ] );
+	const [ view, setView ] = useState( defaultView );
+	useEffect( () => {
+		setView( ( currentView ) => ( {
+			...currentView,
+			filters:
+				activeView !== 'all'
+					? [
+							{
+								field: 'author',
+								operator: OPERATOR_IS_ANY,
+								value: [ activeView ],
+							},
+					  ]
+					: [],
+		} ) );
+	}, [ activeView ] );
+
+	const { records, isResolving: isLoadingData } =
+		useEntityRecordsWithPermissions( 'postType', TEMPLATE_POST_TYPE, {
 			per_page: -1,
+		} );
+	const history = useHistory();
+	const onChangeSelection = useCallback(
+		( items ) => {
+			setSelection( items );
+			if ( view?.type === LAYOUT_LIST ) {
+				history.push( {
+					...params,
+					postId: items.length === 1 ? items[ 0 ] : undefined,
+				} );
+			}
+		},
+		[ history, params, view?.type ]
+	);
+
+	const authors = useMemo( () => {
+		if ( ! records ) {
+			return EMPTY_ARRAY;
 		}
+		const authorsSet = new Set();
+		records.forEach( ( template ) => {
+			authorsSet.add( template.author_text );
+		} );
+		return Array.from( authorsSet ).map( ( author ) => ( {
+			value: author,
+			label: author,
+		} ) );
+	}, [ records ] );
+
+	const fields = useMemo(
+		() => [
+			previewField,
+			titleField,
+			descriptionField,
+			{
+				...authorField,
+				elements: authors,
+			},
+		],
+		[ authors ]
 	);
 
-	const columns = [
-		{
-			header: __( 'Template' ),
-			cell: ( template ) => (
-				<VStack>
-					<Heading as="h3" level={ 5 }>
-						<Link
-							params={ {
-								postId: template.id,
-								postType: template.type,
-								canvas: 'edit',
-							} }
-						>
-							{ decodeEntities(
-								template.title?.rendered || template.slug
-							) }
-						</Link>
-					</Heading>
-					{ template.description && (
-						<Text variant="muted">
-							{ decodeEntities( template.description ) }
-						</Text>
-					) }
-				</VStack>
-			),
-			maxWidth: 400,
-		},
-		{
-			header: __( 'Added by' ),
-			cell: ( template ) => (
-				<AddedBy postType={ template.type } postId={ template.id } />
-			),
-		},
-		{
-			header: <VisuallyHidden>{ __( 'Actions' ) }</VisuallyHidden>,
-			cell: ( template ) => (
-				<TemplateActions
-					postType={ template.type }
-					postId={ template.id }
-				/>
-			),
+	const { data, paginationInfo } = useMemo( () => {
+		return filterSortAndPaginate( records, view, fields );
+	}, [ records, view, fields ] );
+
+	const postTypeActions = usePostActions( {
+		postType: TEMPLATE_POST_TYPE,
+		context: 'list',
+	} );
+	const editAction = useEditPostAction();
+	const actions = useMemo(
+		() => [ editAction, ...postTypeActions ],
+		[ postTypeActions, editAction ]
+	);
+
+	const onChangeView = useCallback(
+		( newView ) => {
+			if ( newView.type !== view.type ) {
+				history.push( {
+					...params,
+					layout: newView.type,
+				} );
+			}
+
+			setView( newView );
 		},
-	];
+		[ view.type, setView, history, params ]
+	);
 
 	return (
 		<Page
+			className="edit-site-page-templates"
 			title={ __( 'Templates' ) }
-			actions={
-				<AddNewTemplate
-					templateType={ TEMPLATE_POST_TYPE }
-					showIcon={ false }
-					toggleProps={ { variant: 'primary' } }
-				/>
-			}
+			actions={ <AddNewTemplate /> }
 		>
-			{ templates && <Table data={ templates } columns={ columns } /> }
+			<DataViews
+				key={ activeView }
+				paginationInfo={ paginationInfo }
+				fields={ fields }
+				actions={ actions }
+				data={ data }
+				isLoading={ isLoadingData }
+				view={ view }
+				onChangeView={ onChangeView }
+				onChangeSelection={ onChangeSelection }
+				selection={ selection }
+				defaultLayouts={ defaultLayouts }
+			/>
 		</Page>
 	);
 }
diff --git a/packages/edit-site/src/components/page-templates/style.scss b/packages/edit-site/src/components/page-templates/style.scss
index ed4484550b48d5..6a753921f6f40a 100644
--- a/packages/edit-site/src/components/page-templates/style.scss
+++ b/packages/edit-site/src/components/page-templates/style.scss
@@ -1,13 +1,124 @@
 .page-templates-preview-field {
-	&.is-viewtype-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	width: 100%;
+	border-radius: $radius-medium;
+
+	.page-templates-preview-field__button {
+		box-shadow: none;
+		border: none;
+		padding: 0;
+		background-color: unset;
+		box-sizing: border-box;
+		cursor: pointer;
+		overflow: hidden;
+		height: 100%;
+		border-radius: $radius-medium;
+
+		&:focus-visible {
+			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+			// Windows High Contrast mode will show this outline, but not the box-shadow.
+			outline: 2px solid transparent;
+		}
+	}
+
+	.dataviews-view-list & {
 		.block-editor-block-preview__container {
 			height: 120px;
 		}
 	}
 
-	&.is-viewtype-grid {
+	.dataviews-view-grid & {
 		.block-editor-block-preview__container {
-			height: auto;
+			height: 100%;
+		}
+	}
+
+	.dataviews-view-table & {
+		position: relative;
+		width: 120px;
+		max-height: 160px;
+
+		&::after {
+			content: "";
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+			border-radius: $radius-medium;
+		}
+	}
+}
+
+.page-templates-description {
+	max-width: 50em;
+	text-wrap: balance; // Fallback for Safari
+	text-wrap: pretty;
+
+	.dataviews-view-table & {
+		margin-bottom: $grid-unit-10;
+	}
+}
+
+.edit-site-page-templates {
+	.dataviews-pagination {
+		z-index: z-index(".edit-site-templates__dataviews-list-pagination");
+	}
+}
+
+
+.page-templates-author-field__avatar {
+	flex-shrink: 0;
+	overflow: hidden;
+	width: $grid-unit-30;
+	height: $grid-unit-30;
+	align-items: center;
+	justify-content: left;
+	display: flex;
+
+	img {
+		width: $grid-unit-20;
+		height: $grid-unit-20;
+		object-fit: cover;
+		opacity: 0;
+		transition: opacity 0.1s linear;
+		@include reduce-motion("transition");
+		border-radius: 100%;
+	}
+
+	&.is-loaded {
+		img {
+			opacity: 1;
+		}
+	}
+}
+
+.page-templates-author-field__icon {
+	display: flex;
+	flex-shrink: 0;
+	width: $grid-unit-30;
+	height: $grid-unit-30;
+
+	svg {
+		margin-left: -$grid-unit-05;
+		fill: currentColor;
+	}
+}
+
+.page-templates-author-field__name {
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.edit-site-list__rename-modal {
+	// The rename dropdown popover is open at the same time as the rename modal. The latter has to be higher.
+	z-index: z-index(".edit-site-list__rename-modal");
+	.components-base-control {
+		@include break-medium() {
+			width: $grid-unit * 40;
 		}
 	}
 }
diff --git a/packages/edit-site/src/components/page-templates/template-actions.js b/packages/edit-site/src/components/page-templates/template-actions.js
deleted file mode 100644
index 9f5897e31fb93e..00000000000000
--- a/packages/edit-site/src/components/page-templates/template-actions.js
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { backup, trash } from '@wordpress/icons';
-import { __, sprintf } from '@wordpress/i18n';
-import { useDispatch } from '@wordpress/data';
-import { useMemo, useState } from '@wordpress/element';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as noticesStore } from '@wordpress/notices';
-import { decodeEntities } from '@wordpress/html-entities';
-import {
-	Button,
-	TextControl,
-	__experimentalText as Text,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-import isTemplateRevertable from '../../utils/is-template-revertable';
-import isTemplateRemovable from '../../utils/is-template-removable';
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
-
-export function useResetTemplateAction() {
-	const { revertTemplate } = useDispatch( editSiteStore );
-	const { saveEditedEntityRecord } = useDispatch( coreStore );
-	const { createSuccessNotice, createErrorNotice } =
-		useDispatch( noticesStore );
-	return useMemo(
-		() => ( {
-			id: 'reset-template',
-			label: __( 'Reset template' ),
-			isPrimary: true,
-			icon: backup,
-			isEligible: isTemplateRevertable,
-			async callback( template ) {
-				try {
-					await revertTemplate( template, { allowUndo: false } );
-					await saveEditedEntityRecord(
-						'postType',
-						template.type,
-						template.id
-					);
-
-					createSuccessNotice(
-						sprintf(
-							/* translators: The template/part's name. */
-							__( '"%s" reverted.' ),
-							decodeEntities( template.title.rendered )
-						),
-						{
-							type: 'snackbar',
-							id: 'edit-site-template-reverted',
-						}
-					);
-				} catch ( error ) {
-					const fallbackErrorMessage =
-						template.type === TEMPLATE_POST_TYPE
-							? __(
-									'An error occurred while reverting the template.'
-							  )
-							: __(
-									'An error occurred while reverting the template part.'
-							  );
-					const errorMessage =
-						error.message && error.code !== 'unknown_error'
-							? error.message
-							: fallbackErrorMessage;
-
-					createErrorNotice( errorMessage, { type: 'snackbar' } );
-				}
-			},
-		} ),
-		[
-			createErrorNotice,
-			createSuccessNotice,
-			revertTemplate,
-			saveEditedEntityRecord,
-		]
-	);
-}
-
-export const deleteTemplateAction = {
-	id: 'delete-template',
-	label: __( 'Delete template' ),
-	isPrimary: true,
-	icon: trash,
-	isEligible: isTemplateRemovable,
-	hideModalHeader: true,
-	RenderModal: ( { item: template, closeModal } ) => {
-		const { removeTemplate } = useDispatch( editSiteStore );
-		return (
-			<VStack spacing="5">
-				<Text>
-					{ sprintf(
-						// translators: %s: The template or template part's title.
-						__( 'Are you sure you want to delete "%s"?' ),
-						decodeEntities( template.title.rendered )
-					) }
-				</Text>
-				<HStack justify="right">
-					<Button variant="tertiary" onClick={ closeModal }>
-						{ __( 'Cancel' ) }
-					</Button>
-					<Button
-						variant="primary"
-						onClick={ () =>
-							removeTemplate( template, {
-								allowUndo: false,
-							} )
-						}
-					>
-						{ __( 'Delete' ) }
-					</Button>
-				</HStack>
-			</VStack>
-		);
-	},
-};
-
-export const renameTemplateAction = {
-	id: 'rename-template',
-	label: __( 'Rename' ),
-	isEligible: ( template ) =>
-		isTemplateRemovable( template ) && template.is_custom,
-	RenderModal: ( { item: template, closeModal } ) => {
-		const title = decodeEntities( template.title.rendered );
-		const [ editedTitle, setEditedTitle ] = useState( title );
-		const {
-			editEntityRecord,
-			__experimentalSaveSpecifiedEntityEdits: saveSpecifiedEntityEdits,
-		} = useDispatch( coreStore );
-		const { createSuccessNotice, createErrorNotice } =
-			useDispatch( noticesStore );
-		async function onTemplateRename( event ) {
-			event.preventDefault();
-			try {
-				await editEntityRecord(
-					'postType',
-					template.type,
-					template.id,
-					{
-						title: editedTitle,
-					}
-				);
-				// Update state before saving rerenders the list.
-				setEditedTitle( '' );
-				closeModal();
-				// Persist edited entity.
-				await saveSpecifiedEntityEdits(
-					'postType',
-					template.type,
-					template.id,
-					[ 'title' ], // Only save title to avoid persisting other edits.
-					{
-						throwOnError: true,
-					}
-				);
-				// TODO: this action will be reused in template parts list, so
-				// let's keep this for a bit, even it's always a `template` now.
-				createSuccessNotice(
-					template.type === TEMPLATE_POST_TYPE
-						? __( 'Template renamed.' )
-						: __( 'Template part renamed.' ),
-					{
-						type: 'snackbar',
-					}
-				);
-			} catch ( error ) {
-				const fallbackErrorMessage =
-					template.type === TEMPLATE_POST_TYPE
-						? __( 'An error occurred while renaming the template.' )
-						: __(
-								'An error occurred while renaming the template part.'
-						  );
-				const errorMessage =
-					error.message && error.code !== 'unknown_error'
-						? error.message
-						: fallbackErrorMessage;
-
-				createErrorNotice( errorMessage, { type: 'snackbar' } );
-			}
-		}
-		return (
-			<form onSubmit={ onTemplateRename }>
-				<VStack spacing="5">
-					<TextControl
-						__nextHasNoMarginBottom
-						label={ __( 'Name' ) }
-						value={ editedTitle }
-						onChange={ setEditedTitle }
-						required
-					/>
-					<HStack justify="right">
-						<Button variant="tertiary" onClick={ closeModal }>
-							{ __( 'Cancel' ) }
-						</Button>
-						<Button variant="primary" type="submit">
-							{ __( 'Save' ) }
-						</Button>
-					</HStack>
-				</VStack>
-			</form>
-		);
-	},
-};
diff --git a/packages/edit-site/src/components/page/header.js b/packages/edit-site/src/components/page/header.js
index 06de80c25685bd..92bf18f96c4966 100644
--- a/packages/edit-site/src/components/page/header.js
+++ b/packages/edit-site/src/components/page/header.js
@@ -5,7 +5,7 @@ import {
 	__experimentalHeading as Heading,
 	__experimentalText as Text,
 	__experimentalHStack as HStack,
-	FlexBlock,
+	__experimentalVStack as VStack,
 	FlexItem,
 } from '@wordpress/components';
 
@@ -15,24 +15,30 @@ import {
 
 export default function Header( { title, subTitle, actions } ) {
 	return (
-		<HStack as="header" alignment="left" className="edit-site-page-header">
-			<FlexBlock className="edit-site-page-header__page-title">
+		<VStack className="edit-site-page-header" as="header" spacing={ 0 }>
+			<HStack className="edit-site-page-header__page-title">
 				<Heading
 					as="h2"
-					level={ 4 }
+					level={ 3 }
+					weight={ 500 }
 					className="edit-site-page-header__title"
+					truncate
 				>
 					{ title }
 				</Heading>
-				{ subTitle && (
-					<Text as="p" className="edit-site-page-header__sub-title">
-						{ subTitle }
-					</Text>
-				) }
-			</FlexBlock>
-			<FlexItem className="edit-site-page-header__actions">
-				{ actions }
-			</FlexItem>
-		</HStack>
+				<FlexItem className="edit-site-page-header__actions">
+					{ actions }
+				</FlexItem>
+			</HStack>
+			{ subTitle && (
+				<Text
+					variant="muted"
+					as="p"
+					className="edit-site-page-header__sub-title"
+				>
+					{ subTitle }
+				</Text>
+			) }
+		</VStack>
 	);
 }
diff --git a/packages/edit-site/src/components/page/index.js b/packages/edit-site/src/components/page/index.js
index 02d0bd2e746eec..6609abb8f52449 100644
--- a/packages/edit-site/src/components/page/index.js
+++ b/packages/edit-site/src/components/page/index.js
@@ -1,18 +1,20 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { NavigableRegion } from '@wordpress/interface';
-import { EditorSnackbars } from '@wordpress/editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
 import Header from './header';
+import { unlock } from '../../lock-unlock';
+
+const { NavigableRegion } = unlock( editorPrivateApis );
 
 export default function Page( {
 	title,
@@ -22,7 +24,7 @@ export default function Page( {
 	className,
 	hideTitleFromUI = false,
 } ) {
-	const classes = classnames( 'edit-site-page', className );
+	const classes = clsx( 'edit-site-page', className );
 
 	return (
 		<NavigableRegion className={ classes } ariaLabel={ title }>
@@ -36,7 +38,6 @@ export default function Page( {
 				) }
 				{ children }
 			</div>
-			<EditorSnackbars />
 		</NavigableRegion>
 	);
 }
diff --git a/packages/edit-site/src/components/page/style.scss b/packages/edit-site/src/components/page/style.scss
index 8da7df8e0385b8..03e062a576b6e6 100644
--- a/packages/edit-site/src/components/page/style.scss
+++ b/packages/edit-site/src/components/page/style.scss
@@ -1,40 +1,56 @@
 .edit-site-page {
 	color: $gray-800;
 	background: $white;
-	flex-grow: 1;
-	overflow: hidden;
-	margin: 0;
-	margin-top: $header-height;
+	height: calc(100% - #{$header-height});
+	/* stylelint-disable-next-line property-no-unknown -- '@container' not globally permitted */
+	container: edit-site-page / inline-size;
+	transition: width ease-out 0.2s;
+	@include reduce-motion("transition");
+
 	@include break-medium() {
-		border-radius: 8px;
-		margin: $grid-unit-30 $grid-unit-30 $grid-unit-30 0;
+		height: 100%;
 	}
 }
 
 .edit-site-page-header {
-	padding: 0 $grid-unit-40;
-	min-height: $header-height;
+	padding: $grid-unit-20 $grid-unit-60;
 	border-bottom: 1px solid $gray-100;
 	background: $white;
 	position: sticky;
 	top: 0;
 	z-index: z-index(".edit-site-page-header");
-	.components-text {
-		color: $gray-800;
-	}
+	transition: padding ease-out 0.1s;
+	@include reduce-motion("transition");
+
 	.components-heading {
 		color: $gray-900;
 	}
+
+	.edit-site-page-header__page-title {
+		min-height: $grid-unit-50;
+
+		.components-heading {
+			flex-grow: 1;
+			flex-basis: 0;
+			white-space: nowrap;
+		}
+	}
+
 	.edit-site-page-header__sub-title {
-		margin-top: $grid-unit-10;
-		color: $gray-700;
+		margin-bottom: $grid-unit-10;
+	}
+}
+
+/* stylelint-disable-next-line scss/at-rule-no-unknown -- '@container' not globally permitted */
+@container (max-width: 430px) {
+	.edit-site-page-header {
+		padding: $grid-unit-20 $grid-unit-30;
 	}
 }
 
 .edit-site-page-content {
 	height: 100%;
 	display: flex;
-	overflow: auto;
 	flex-flow: column;
 	position: relative;
 	z-index: z-index(".edit-site-page-content");
diff --git a/packages/edit-site/src/components/pagination/index.js b/packages/edit-site/src/components/pagination/index.js
new file mode 100644
index 00000000000000..8ef45883eb4524
--- /dev/null
+++ b/packages/edit-site/src/components/pagination/index.js
@@ -0,0 +1,96 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalHStack as HStack,
+	__experimentalText as Text,
+	Button,
+} from '@wordpress/components';
+import { __, _x, _n, sprintf, isRTL } from '@wordpress/i18n';
+import { previous, chevronLeft, chevronRight, next } from '@wordpress/icons';
+
+export default function Pagination( {
+	currentPage,
+	numPages,
+	changePage,
+	totalItems,
+	className,
+	disabled = false,
+	buttonVariant = 'tertiary',
+	label = __( 'Pagination Navigation' ),
+} ) {
+	return (
+		<HStack
+			expanded={ false }
+			as="nav"
+			aria-label={ label }
+			spacing={ 3 }
+			justify="flex-start"
+			className={ clsx( 'edit-site-pagination', className ) }
+		>
+			<Text variant="muted" className="edit-site-pagination__total">
+				{
+					// translators: %s: Total number of patterns.
+					sprintf(
+						// translators: %s: Total number of patterns.
+						_n( '%s item', '%s items', totalItems ),
+						totalItems
+					)
+				}
+			</Text>
+			<HStack expanded={ false } spacing={ 1 }>
+				<Button
+					variant={ buttonVariant }
+					onClick={ () => changePage( 1 ) }
+					accessibleWhenDisabled
+					disabled={ disabled || currentPage === 1 }
+					label={ __( 'First page' ) }
+					icon={ isRTL() ? next : previous }
+					size="compact"
+				/>
+				<Button
+					variant={ buttonVariant }
+					onClick={ () => changePage( currentPage - 1 ) }
+					accessibleWhenDisabled
+					disabled={ disabled || currentPage === 1 }
+					label={ __( 'Previous page' ) }
+					icon={ isRTL() ? chevronRight : chevronLeft }
+					size="compact"
+				/>
+			</HStack>
+			<Text variant="muted">
+				{ sprintf(
+					// translators: %1$s: Current page number, %2$s: Total number of pages.
+					_x( '%1$s of %2$s', 'paging' ),
+					currentPage,
+					numPages
+				) }
+			</Text>
+			<HStack expanded={ false } spacing={ 1 }>
+				<Button
+					variant={ buttonVariant }
+					onClick={ () => changePage( currentPage + 1 ) }
+					accessibleWhenDisabled
+					disabled={ disabled || currentPage === numPages }
+					label={ __( 'Next page' ) }
+					icon={ isRTL() ? chevronLeft : chevronRight }
+					size="compact"
+				/>
+				<Button
+					variant={ buttonVariant }
+					onClick={ () => changePage( numPages ) }
+					accessibleWhenDisabled
+					disabled={ disabled || currentPage === numPages }
+					label={ __( 'Last page' ) }
+					icon={ isRTL() ? previous : next }
+					size="compact"
+				/>
+			</HStack>
+		</HStack>
+	);
+}
diff --git a/packages/edit-site/src/components/pagination/style.scss b/packages/edit-site/src/components/pagination/style.scss
new file mode 100644
index 00000000000000..c74d54a70930f3
--- /dev/null
+++ b/packages/edit-site/src/components/pagination/style.scss
@@ -0,0 +1,5 @@
+.edit-site-pagination .components-button.is-tertiary {
+	width: $button-size-compact;
+	height: $button-size-compact;
+	justify-content: center;
+}
diff --git a/packages/edit-site/src/components/pattern-modal/duplicate.js b/packages/edit-site/src/components/pattern-modal/duplicate.js
deleted file mode 100644
index 8de13e9cf39479..00000000000000
--- a/packages/edit-site/src/components/pattern-modal/duplicate.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useDispatch, useSelect } from '@wordpress/data';
-import { store as interfaceStore } from '@wordpress/interface';
-import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-import { getQueryArgs } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
-import { PATTERN_MODALS } from './';
-import { PATTERN_TYPES } from '../../utils/constants';
-import { unlock } from '../../lock-unlock';
-import useEditedEntityRecord from '../use-edited-entity-record';
-
-const { DuplicatePatternModal } = unlock( patternsPrivateApis );
-const { useHistory } = unlock( routerPrivateApis );
-
-export default function PatternDuplicateModal() {
-	const { record } = useEditedEntityRecord();
-	const { categoryType, categoryId } = getQueryArgs( window.location.href );
-	const { closeModal } = useDispatch( interfaceStore );
-	const history = useHistory();
-
-	const isActive = useSelect( ( select ) =>
-		select( interfaceStore ).isModalActive( PATTERN_MODALS.duplicate )
-	);
-
-	if ( ! isActive ) {
-		return null;
-	}
-
-	function onSuccess( { pattern: newPattern } ) {
-		history.push( {
-			categoryType,
-			categoryId,
-			postType: PATTERN_TYPES.user,
-			postId: newPattern.id,
-		} );
-
-		closeModal();
-	}
-
-	return (
-		<DuplicatePatternModal
-			onClose={ closeModal }
-			onSuccess={ onSuccess }
-			pattern={ record }
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/pattern-modal/index.js b/packages/edit-site/src/components/pattern-modal/index.js
deleted file mode 100644
index 95d08a058b3f84..00000000000000
--- a/packages/edit-site/src/components/pattern-modal/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Internal dependencies
- */
-import PatternRenameModal from './rename';
-import PatternDuplicateModal from './duplicate';
-
-export const PATTERN_MODALS = {
-	rename: 'edit-site/pattern-rename',
-	duplicate: 'edit-site/pattern-duplicate',
-};
-
-export default function PatternModal() {
-	return (
-		<>
-			<PatternDuplicateModal />
-			<PatternRenameModal />
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/pattern-modal/rename.js b/packages/edit-site/src/components/pattern-modal/rename.js
deleted file mode 100644
index 3175451bd16460..00000000000000
--- a/packages/edit-site/src/components/pattern-modal/rename.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useDispatch, useSelect } from '@wordpress/data';
-import { store as interfaceStore } from '@wordpress/interface';
-import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
-
-/**
- * Internal dependencies
- */
-import { PATTERN_MODALS } from './';
-import { unlock } from '../../lock-unlock';
-import useEditedEntityRecord from '../use-edited-entity-record';
-
-const { RenamePatternModal } = unlock( patternsPrivateApis );
-
-export default function PatternRenameModal() {
-	const { record: pattern } = useEditedEntityRecord();
-	const { closeModal } = useDispatch( interfaceStore );
-	const isActive = useSelect( ( select ) =>
-		select( interfaceStore ).isModalActive( PATTERN_MODALS.rename )
-	);
-
-	if ( ! isActive ) {
-		return null;
-	}
-
-	return <RenamePatternModal onClose={ closeModal } pattern={ pattern } />;
-}
diff --git a/packages/edit-site/src/components/plugin-template-setting-panel/index.js b/packages/edit-site/src/components/plugin-template-setting-panel/index.js
index 0c279c91039a79..5183350c633863 100644
--- a/packages/edit-site/src/components/plugin-template-setting-panel/index.js
+++ b/packages/edit-site/src/components/plugin-template-setting-panel/index.js
@@ -5,17 +5,38 @@
 /**
  * WordPress dependencies
  */
+import { store as editorStore } from '@wordpress/editor';
+import { useSelect } from '@wordpress/data';
 import { createSlotFill } from '@wordpress/components';
+import deprecated from '@wordpress/deprecated';
 
 const { Fill, Slot } = createSlotFill( 'PluginTemplateSettingPanel' );
 
-const PluginTemplateSettingPanel = Fill;
+const PluginTemplateSettingPanel = ( { children } ) => {
+	deprecated( 'wp.editSite.PluginTemplateSettingPanel', {
+		since: '6.6',
+		version: '6.8',
+		alternative: 'wp.editor.PluginDocumentSettingPanel',
+	} );
+	const isCurrentEntityTemplate = useSelect(
+		( select ) =>
+			select( editorStore ).getCurrentPostType() === 'wp_template',
+		[]
+	);
+	if ( ! isCurrentEntityTemplate ) {
+		return null;
+	}
+	return <Fill>{ children }</Fill>;
+};
+
 PluginTemplateSettingPanel.Slot = Slot;
 
 /**
  * Renders items in the Template Sidebar below the main information
  * like the Template Card.
  *
+ * @deprecated since 6.6. Use `wp.editor.PluginDocumentSettingPanel` instead.
+ *
  * @example
  * ```jsx
  * // Using ESNext syntax
diff --git a/packages/edit-site/src/components/post-edit/index.js b/packages/edit-site/src/components/post-edit/index.js
new file mode 100644
index 00000000000000..b9d3f60ef5da2b
--- /dev/null
+++ b/packages/edit-site/src/components/post-edit/index.js
@@ -0,0 +1,149 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { DataForm } from '@wordpress/dataviews';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { store as coreDataStore } from '@wordpress/core-data';
+import { __experimentalVStack as VStack } from '@wordpress/components';
+import { useState, useMemo, useEffect } from '@wordpress/element';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+
+/**
+ * Internal dependencies
+ */
+import Page from '../page';
+import usePostFields from '../post-fields';
+import { unlock } from '../../lock-unlock';
+
+const { PostCardPanel } = unlock( editorPrivateApis );
+
+function PostEditForm( { postType, postId } ) {
+	const ids = useMemo( () => postId.split( ',' ), [ postId ] );
+	const { record } = useSelect(
+		( select ) => {
+			return {
+				record:
+					ids.length === 1
+						? select( coreDataStore ).getEditedEntityRecord(
+								'postType',
+								postType,
+								ids[ 0 ]
+						  )
+						: null,
+			};
+		},
+		[ postType, ids ]
+	);
+	const [ multiEdits, setMultiEdits ] = useState( {} );
+	const { editEntityRecord } = useDispatch( coreDataStore );
+	const { fields: _fields } = usePostFields();
+	const fields = useMemo(
+		() =>
+			_fields?.map( ( field ) => {
+				if ( field.id === 'status' ) {
+					return {
+						...field,
+						elements: field.elements.filter(
+							( element ) => element.value !== 'trash'
+						),
+					};
+				}
+				return field;
+			} ),
+		[ _fields ]
+	);
+	const form = {
+		type: 'panel',
+		fields: [
+			'featured_media',
+			'title',
+			'author',
+			'date',
+			'slug',
+			'comment_status',
+		],
+	};
+
+	const fieldsWithBulkEditSupport = [
+		'title',
+		'status',
+		'date',
+		'author',
+		'comment_status',
+	];
+
+	const onChange = ( edits ) => {
+		for ( const id of ids ) {
+			if (
+				edits.status &&
+				edits.status !== 'future' &&
+				record?.status === 'future' &&
+				new Date( record.date ) > new Date()
+			) {
+				edits.date = null;
+			}
+			if (
+				edits.status &&
+				edits.status === 'private' &&
+				record.password
+			) {
+				edits.password = '';
+			}
+			editEntityRecord( 'postType', postType, id, edits );
+			if ( ids.length > 1 ) {
+				setMultiEdits( ( prev ) => ( {
+					...prev,
+					...edits,
+				} ) );
+			}
+		}
+	};
+	useEffect( () => {
+		setMultiEdits( {} );
+	}, [ ids ] );
+
+	return (
+		<VStack spacing={ 4 }>
+			{ ids.length === 1 && (
+				<PostCardPanel postType={ postType } postId={ ids[ 0 ] } />
+			) }
+			<DataForm
+				data={ ids.length === 1 ? record : multiEdits }
+				fields={ fields }
+				form={
+					ids.length === 1
+						? form
+						: {
+								...form,
+								fields: form.fields.filter( ( field ) =>
+									fieldsWithBulkEditSupport.includes( field )
+								),
+						  }
+				}
+				onChange={ onChange }
+			/>
+		</VStack>
+	);
+}
+
+export function PostEdit( { postType, postId } ) {
+	return (
+		<Page
+			className={ clsx( 'edit-site-post-edit', {
+				'is-empty': ! postId,
+			} ) }
+			label={ __( 'Post Edit' ) }
+		>
+			{ postId && (
+				<PostEditForm postType={ postType } postId={ postId } />
+			) }
+			{ ! postId && <p>{ __( 'Select a page to edit' ) }</p> }
+		</Page>
+	);
+}
diff --git a/packages/edit-site/src/components/post-edit/style.scss b/packages/edit-site/src/components/post-edit/style.scss
new file mode 100644
index 00000000000000..4eaa41b2e8ed70
--- /dev/null
+++ b/packages/edit-site/src/components/post-edit/style.scss
@@ -0,0 +1,9 @@
+.edit-site-post-edit {
+	padding: $grid-unit-30;
+
+	&.is-empty .edit-site-page-content {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+}
diff --git a/packages/edit-site/src/components/post-fields/index.js b/packages/edit-site/src/components/post-fields/index.js
new file mode 100644
index 00000000000000..b5748684e8a19e
--- /dev/null
+++ b/packages/edit-site/src/components/post-fields/index.js
@@ -0,0 +1,360 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+import { decodeEntities } from '@wordpress/html-entities';
+import { featuredImageField, slugField } from '@wordpress/fields';
+import {
+	createInterpolateElement,
+	useMemo,
+	useState,
+} from '@wordpress/element';
+import { dateI18n, getDate, getSettings } from '@wordpress/date';
+import {
+	trash,
+	drafts,
+	published,
+	scheduled,
+	pending,
+	notAllowed,
+	commentAuthorAvatar as authorIcon,
+} from '@wordpress/icons';
+import { __experimentalHStack as HStack, Icon } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import {
+	LAYOUT_GRID,
+	LAYOUT_TABLE,
+	OPERATOR_IS_ANY,
+} from '../../utils/constants';
+import { default as Link } from '../routes/link';
+
+// See https://github.com/WordPress/gutenberg/issues/55886
+// We do not support custom statutes at the moment.
+const STATUSES = [
+	{
+		value: 'draft',
+		label: __( 'Draft' ),
+		icon: drafts,
+		description: __( 'Not ready to publish.' ),
+	},
+	{
+		value: 'future',
+		label: __( 'Scheduled' ),
+		icon: scheduled,
+		description: __( 'Publish automatically on a chosen date.' ),
+	},
+	{
+		value: 'pending',
+		label: __( 'Pending Review' ),
+		icon: pending,
+		description: __( 'Waiting for review before publishing.' ),
+	},
+	{
+		value: 'private',
+		label: __( 'Private' ),
+		icon: notAllowed,
+		description: __( 'Only visible to site admins and editors.' ),
+	},
+	{
+		value: 'publish',
+		label: __( 'Published' ),
+		icon: published,
+		description: __( 'Visible to everyone.' ),
+	},
+	{ value: 'trash', label: __( 'Trash' ), icon: trash },
+];
+
+const getFormattedDate = ( dateToDisplay ) =>
+	dateI18n(
+		getSettings().formats.datetimeAbbreviated,
+		getDate( dateToDisplay )
+	);
+
+function PostStatusField( { item } ) {
+	const status = STATUSES.find( ( { value } ) => value === item.status );
+	const label = status?.label || item.status;
+	const icon = status?.icon;
+	return (
+		<HStack alignment="left" spacing={ 0 }>
+			{ icon && (
+				<div className="edit-site-post-list__status-icon">
+					<Icon icon={ icon } />
+				</div>
+			) }
+			<span>{ label }</span>
+		</HStack>
+	);
+}
+
+function PostAuthorField( { item } ) {
+	const { text, imageUrl } = useSelect(
+		( select ) => {
+			const { getUser } = select( coreStore );
+			const user = getUser( item.author );
+			return {
+				imageUrl: user?.avatar_urls?.[ 48 ],
+				text: user?.name,
+			};
+		},
+		[ item ]
+	);
+	const [ isImageLoaded, setIsImageLoaded ] = useState( false );
+	return (
+		<HStack alignment="left" spacing={ 0 }>
+			{ !! imageUrl && (
+				<div
+					className={ clsx( 'page-templates-author-field__avatar', {
+						'is-loaded': isImageLoaded,
+					} ) }
+				>
+					<img
+						onLoad={ () => setIsImageLoaded( true ) }
+						alt={ __( 'Author avatar' ) }
+						src={ imageUrl }
+					/>
+				</div>
+			) }
+			{ ! imageUrl && (
+				<div className="page-templates-author-field__icon">
+					<Icon icon={ authorIcon } />
+				</div>
+			) }
+			<span className="page-templates-author-field__name">{ text }</span>
+		</HStack>
+	);
+}
+
+function usePostFields( viewType ) {
+	const { records: authors, isResolving: isLoadingAuthors } =
+		useEntityRecords( 'root', 'user', { per_page: -1 } );
+
+	const { frontPageId, postsPageId } = useSelect( ( select ) => {
+		const { getEntityRecord } = select( coreStore );
+		const siteSettings = getEntityRecord( 'root', 'site' );
+		return {
+			frontPageId: siteSettings?.page_on_front,
+			postsPageId: siteSettings?.page_for_posts,
+		};
+	}, [] );
+
+	const fields = useMemo(
+		() => [
+			featuredImageField,
+			{
+				label: __( 'Title' ),
+				id: 'title',
+				type: 'text',
+				getValue: ( { item } ) =>
+					typeof item.title === 'string'
+						? item.title
+						: item.title?.raw,
+				render: ( { item } ) => {
+					const addLink =
+						[ LAYOUT_TABLE, LAYOUT_GRID ].includes( viewType ) &&
+						item.status !== 'trash';
+					const renderedTitle =
+						typeof item.title === 'string'
+							? item.title
+							: item.title?.rendered;
+					const title = addLink ? (
+						<Link
+							params={ {
+								postId: item.id,
+								postType: item.type,
+								canvas: 'edit',
+							} }
+						>
+							{ decodeEntities( renderedTitle ) ||
+								__( '(no title)' ) }
+						</Link>
+					) : (
+						<span>
+							{ decodeEntities( renderedTitle ) ||
+								__( '(no title)' ) }
+						</span>
+					);
+
+					let suffix = '';
+					if ( item.id === frontPageId ) {
+						suffix = (
+							<span className="edit-site-post-list__title-badge">
+								{ __( 'Homepage' ) }
+							</span>
+						);
+					} else if ( item.id === postsPageId ) {
+						suffix = (
+							<span className="edit-site-post-list__title-badge">
+								{ __( 'Posts Page' ) }
+							</span>
+						);
+					}
+
+					return (
+						<HStack
+							className="edit-site-post-list__title"
+							alignment="center"
+							justify="flex-start"
+						>
+							{ title }
+							{ suffix }
+						</HStack>
+					);
+				},
+				enableHiding: false,
+			},
+			{
+				label: __( 'Author' ),
+				id: 'author',
+				type: 'integer',
+				elements:
+					authors?.map( ( { id, name } ) => ( {
+						value: id,
+						label: name,
+					} ) ) || [],
+				render: PostAuthorField,
+				sort: ( a, b, direction ) => {
+					const nameA = a._embedded?.author?.[ 0 ]?.name || '';
+					const nameB = b._embedded?.author?.[ 0 ]?.name || '';
+
+					return direction === 'asc'
+						? nameA.localeCompare( nameB )
+						: nameB.localeCompare( nameA );
+				},
+			},
+			{
+				label: __( 'Status' ),
+				id: 'status',
+				type: 'text',
+				elements: STATUSES,
+				render: PostStatusField,
+				Edit: 'radio',
+				enableSorting: false,
+				filterBy: {
+					operators: [ OPERATOR_IS_ANY ],
+				},
+			},
+			{
+				label: __( 'Date' ),
+				id: 'date',
+				type: 'datetime',
+				render: ( { item } ) => {
+					const isDraftOrPrivate = [ 'draft', 'private' ].includes(
+						item.status
+					);
+					if ( isDraftOrPrivate ) {
+						return createInterpolateElement(
+							sprintf(
+								/* translators: %s: page creation date */
+								__( '<span>Modified: <time>%s</time></span>' ),
+								getFormattedDate( item.date )
+							),
+							{
+								span: <span />,
+								time: <time />,
+							}
+						);
+					}
+
+					const isScheduled = item.status === 'future';
+					if ( isScheduled ) {
+						return createInterpolateElement(
+							sprintf(
+								/* translators: %s: page creation date */
+								__( '<span>Scheduled: <time>%s</time></span>' ),
+								getFormattedDate( item.date )
+							),
+							{
+								span: <span />,
+								time: <time />,
+							}
+						);
+					}
+
+					const isPublished = item.status === 'publish';
+					if ( isPublished ) {
+						return createInterpolateElement(
+							sprintf(
+								/* translators: %s: page creation time */
+								__( '<span>Published: <time>%s</time></span>' ),
+								getFormattedDate( item.date )
+							),
+							{
+								span: <span />,
+								time: <time />,
+							}
+						);
+					}
+
+					// Pending posts show the modified date if it's newer.
+					const dateToDisplay =
+						getDate( item.modified ) > getDate( item.date )
+							? item.modified
+							: item.date;
+
+					const isPending = item.status === 'pending';
+					if ( isPending ) {
+						return createInterpolateElement(
+							sprintf(
+								/* translators: %s: the newest of created or modified date for the page */
+								__( '<span>Modified: <time>%s</time></span>' ),
+								getFormattedDate( dateToDisplay )
+							),
+							{
+								span: <span />,
+								time: <time />,
+							}
+						);
+					}
+
+					// Unknow status.
+					return <time>{ getFormattedDate( item.date ) }</time>;
+				},
+			},
+			slugField,
+			{
+				id: 'comment_status',
+				label: __( 'Discussion' ),
+				type: 'text',
+				Edit: 'radio',
+				enableSorting: false,
+				filterBy: {
+					operators: [],
+				},
+				elements: [
+					{
+						value: 'open',
+						label: __( 'Open' ),
+						description: __(
+							'Visitors can add new comments and replies.'
+						),
+					},
+					{
+						value: 'closed',
+						label: __( 'Closed' ),
+						description: __(
+							'Visitors cannot add new comments or replies. Existing comments remain visible.'
+						),
+					},
+				],
+			},
+		],
+		[ authors, viewType, frontPageId, postsPageId ]
+	);
+
+	return {
+		isLoading: isLoadingAuthors,
+		fields,
+	};
+}
+
+export default usePostFields;
diff --git a/packages/edit-site/src/components/post-fields/style.scss b/packages/edit-site/src/components/post-fields/style.scss
new file mode 100644
index 00000000000000..adeaf9a2678253
--- /dev/null
+++ b/packages/edit-site/src/components/post-fields/style.scss
@@ -0,0 +1,3 @@
+.components-popover.components-dropdown__content.dataforms-layouts-panel__field-dropdown {
+	z-index: z-index(".components-popover.components-dropdown__content.dataforms-layouts-panel__field-dropdown");
+}
diff --git a/packages/edit-site/src/components/post-list/index.js b/packages/edit-site/src/components/post-list/index.js
new file mode 100644
index 00000000000000..3efe3361f3c51e
--- /dev/null
+++ b/packages/edit-site/src/components/post-list/index.js
@@ -0,0 +1,428 @@
+/**
+ * WordPress dependencies
+ */
+import { Button } from '@wordpress/components';
+import {
+	store as coreStore,
+	privateApis as coreDataPrivateApis,
+} from '@wordpress/core-data';
+import { useState, useMemo, useCallback, useEffect } from '@wordpress/element';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { DataViews, filterSortAndPaginate } from '@wordpress/dataviews';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+import { __ } from '@wordpress/i18n';
+import { drawerRight } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import Page from '../page';
+import {
+	useDefaultViews,
+	defaultLayouts,
+} from '../sidebar-dataviews/default-views';
+import {
+	OPERATOR_IS_ANY,
+	OPERATOR_IS_NONE,
+	LAYOUT_LIST,
+} from '../../utils/constants';
+
+import AddNewPostModal from '../add-new-post';
+import { unlock } from '../../lock-unlock';
+import { useEditPostAction } from '../dataviews-actions';
+import { usePrevious } from '@wordpress/compose';
+import usePostFields from '../post-fields';
+
+const { usePostActions } = unlock( editorPrivateApis );
+const { useLocation, useHistory } = unlock( routerPrivateApis );
+const { useEntityRecordsWithPermissions } = unlock( coreDataPrivateApis );
+const EMPTY_ARRAY = [];
+
+const getDefaultView = ( defaultViews, activeView ) => {
+	return defaultViews.find( ( { slug } ) => slug === activeView )?.view;
+};
+
+const getCustomView = ( editedEntityRecord ) => {
+	if ( ! editedEntityRecord?.content ) {
+		return undefined;
+	}
+
+	const content = JSON.parse( editedEntityRecord.content );
+	if ( ! content ) {
+		return undefined;
+	}
+
+	return {
+		...content,
+		layout: defaultLayouts[ content.type ]?.layout,
+	};
+};
+
+/**
+ * This function abstracts working with default & custom views by
+ * providing a [ state, setState ] tuple based on the URL parameters.
+ *
+ * Consumers use the provided tuple to work with state
+ * and don't have to deal with the specifics of default & custom views.
+ *
+ * @param {string} postType Post type to retrieve default views for.
+ * @return {Array} The [ state, setState ] tuple.
+ */
+function useView( postType ) {
+	const {
+		params: { activeView = 'all', isCustom = 'false', layout },
+	} = useLocation();
+	const history = useHistory();
+
+	const defaultViews = useDefaultViews( { postType } );
+	const { editEntityRecord } = useDispatch( coreStore );
+	const editedEntityRecord = useSelect(
+		( select ) => {
+			if ( isCustom !== 'true' ) {
+				return undefined;
+			}
+
+			const { getEditedEntityRecord } = select( coreStore );
+			return getEditedEntityRecord(
+				'postType',
+				'wp_dataviews',
+				Number( activeView )
+			);
+		},
+		[ activeView, isCustom ]
+	);
+	const [ view, setView ] = useState( () => {
+		let initialView;
+		if ( isCustom === 'true' ) {
+			initialView = getCustomView( editedEntityRecord ) ?? {
+				type: layout ?? LAYOUT_LIST,
+			};
+		} else {
+			initialView = getDefaultView( defaultViews, activeView ) ?? {
+				type: layout ?? LAYOUT_LIST,
+			};
+		}
+
+		const type = layout ?? initialView.type;
+		return {
+			...initialView,
+			type,
+		};
+	} );
+
+	const setViewWithUrlUpdate = useCallback(
+		( newView ) => {
+			const { params } = history.getLocationWithParams();
+
+			if ( newView.type === LAYOUT_LIST && ! params?.layout ) {
+				// Skip updating the layout URL param if
+				// it is not present and the newView.type is LAYOUT_LIST.
+			} else if ( newView.type !== params?.layout ) {
+				history.push( {
+					...params,
+					layout: newView.type,
+				} );
+			}
+
+			setView( newView );
+
+			if ( isCustom === 'true' && editedEntityRecord?.id ) {
+				editEntityRecord(
+					'postType',
+					'wp_dataviews',
+					editedEntityRecord?.id,
+					{
+						content: JSON.stringify( newView ),
+					}
+				);
+			}
+		},
+		[ history, isCustom, editEntityRecord, editedEntityRecord?.id ]
+	);
+
+	// When layout URL param changes, update the view type
+	// without affecting any other config.
+	useEffect( () => {
+		setView( ( prevView ) => ( {
+			...prevView,
+			type: layout ?? LAYOUT_LIST,
+		} ) );
+	}, [ layout ] );
+
+	// When activeView or isCustom URL parameters change, reset the view.
+	useEffect( () => {
+		let newView;
+		if ( isCustom === 'true' ) {
+			newView = getCustomView( editedEntityRecord );
+		} else {
+			newView = getDefaultView( defaultViews, activeView );
+		}
+
+		if ( newView ) {
+			const type = layout ?? newView.type;
+			setView( {
+				...newView,
+				type,
+			} );
+		}
+	}, [ activeView, isCustom, layout, defaultViews, editedEntityRecord ] );
+
+	return [ view, setViewWithUrlUpdate, setViewWithUrlUpdate ];
+}
+
+const DEFAULT_STATUSES = 'draft,future,pending,private,publish'; // All but 'trash'.
+
+function getItemId( item ) {
+	return item.id.toString();
+}
+
+export default function PostList( { postType } ) {
+	const [ view, setView ] = useView( postType );
+	const defaultViews = useDefaultViews( { postType } );
+	const history = useHistory();
+	const location = useLocation();
+	const {
+		postId,
+		quickEdit = false,
+		isCustom,
+		activeView = 'all',
+	} = location.params;
+	const [ selection, setSelection ] = useState( postId?.split( ',' ) ?? [] );
+	const onChangeSelection = useCallback(
+		( items ) => {
+			setSelection( items );
+			const { params } = history.getLocationWithParams();
+			if ( ( params.isCustom ?? 'false' ) === 'false' ) {
+				history.push( {
+					...params,
+					postId: items.join( ',' ),
+				} );
+			}
+		},
+		[ history ]
+	);
+
+	const getActiveViewFilters = ( views, match ) => {
+		const found = views.find( ( { slug } ) => slug === match );
+		return found?.filters ?? [];
+	};
+
+	const { isLoading: isLoadingFields, fields: _fields } = usePostFields(
+		view.type
+	);
+	const fields = useMemo( () => {
+		const activeViewFilters = getActiveViewFilters(
+			defaultViews,
+			activeView
+		).map( ( { field } ) => field );
+		return _fields.map( ( field ) => ( {
+			...field,
+			elements: activeViewFilters.includes( field.id )
+				? []
+				: field.elements,
+		} ) );
+	}, [ _fields, defaultViews, activeView ] );
+
+	const queryArgs = useMemo( () => {
+		const filters = {};
+		view.filters?.forEach( ( filter ) => {
+			if (
+				filter.field === 'status' &&
+				filter.operator === OPERATOR_IS_ANY
+			) {
+				filters.status = filter.value;
+			}
+			if (
+				filter.field === 'author' &&
+				filter.operator === OPERATOR_IS_ANY
+			) {
+				filters.author = filter.value;
+			} else if (
+				filter.field === 'author' &&
+				filter.operator === OPERATOR_IS_NONE
+			) {
+				filters.author_exclude = filter.value;
+			}
+		} );
+
+		// The bundled views want data filtered without displaying the filter.
+		const activeViewFilters = getActiveViewFilters(
+			defaultViews,
+			activeView
+		);
+		activeViewFilters.forEach( ( filter ) => {
+			if (
+				filter.field === 'status' &&
+				filter.operator === OPERATOR_IS_ANY
+			) {
+				filters.status = filter.value;
+			}
+			if (
+				filter.field === 'author' &&
+				filter.operator === OPERATOR_IS_ANY
+			) {
+				filters.author = filter.value;
+			} else if (
+				filter.field === 'author' &&
+				filter.operator === OPERATOR_IS_NONE
+			) {
+				filters.author_exclude = filter.value;
+			}
+		} );
+
+		// We want to provide a different default item for the status filter
+		// than the REST API provides.
+		if ( ! filters.status || filters.status === '' ) {
+			filters.status = DEFAULT_STATUSES;
+		}
+
+		return {
+			per_page: view.perPage,
+			page: view.page,
+			_embed: 'author',
+			order: view.sort?.direction,
+			orderby: view.sort?.field,
+			search: view.search,
+			...filters,
+		};
+	}, [ view, activeView, defaultViews ] );
+	const {
+		records,
+		isResolving: isLoadingData,
+		totalItems,
+		totalPages,
+	} = useEntityRecordsWithPermissions( 'postType', postType, queryArgs );
+
+	// The REST API sort the authors by ID, but we want to sort them by name.
+	const data = useMemo( () => {
+		if ( ! isLoadingFields && view?.sort?.field === 'author' ) {
+			return filterSortAndPaginate(
+				records,
+				{ sort: { ...view.sort } },
+				fields
+			).data;
+		}
+
+		return records;
+	}, [ records, fields, isLoadingFields, view?.sort ] );
+
+	const ids = data?.map( ( record ) => getItemId( record ) ) ?? [];
+	const prevIds = usePrevious( ids ) ?? [];
+	const deletedIds = prevIds.filter( ( id ) => ! ids.includes( id ) );
+	const postIdWasDeleted = deletedIds.includes( postId );
+
+	useEffect( () => {
+		if ( postIdWasDeleted ) {
+			history.push( {
+				...history.getLocationWithParams().params,
+				postId: undefined,
+			} );
+		}
+	}, [ postIdWasDeleted, history ] );
+
+	const paginationInfo = useMemo(
+		() => ( {
+			totalItems,
+			totalPages,
+		} ),
+		[ totalItems, totalPages ]
+	);
+
+	const { labels, canCreateRecord } = useSelect(
+		( select ) => {
+			const { getPostType, canUser } = select( coreStore );
+			return {
+				labels: getPostType( postType )?.labels,
+				canCreateRecord: canUser( 'create', {
+					kind: 'postType',
+					name: postType,
+				} ),
+			};
+		},
+		[ postType ]
+	);
+
+	const postTypeActions = usePostActions( {
+		postType,
+		context: 'list',
+	} );
+	const editAction = useEditPostAction();
+	const actions = useMemo(
+		() => [ editAction, ...postTypeActions ],
+		[ postTypeActions, editAction ]
+	);
+
+	const [ showAddPostModal, setShowAddPostModal ] = useState( false );
+
+	const openModal = () => setShowAddPostModal( true );
+	const closeModal = () => setShowAddPostModal( false );
+	const handleNewPage = ( { type, id } ) => {
+		history.push( {
+			postId: id,
+			postType: type,
+			canvas: 'edit',
+		} );
+		closeModal();
+	};
+
+	return (
+		<Page
+			title={ labels?.name }
+			actions={
+				labels?.add_new_item &&
+				canCreateRecord && (
+					<>
+						<Button
+							variant="primary"
+							onClick={ openModal }
+							__next40pxDefaultSize
+						>
+							{ labels.add_new_item }
+						</Button>
+						{ showAddPostModal && (
+							<AddNewPostModal
+								postType={ postType }
+								onSave={ handleNewPage }
+								onClose={ closeModal }
+							/>
+						) }
+					</>
+				)
+			}
+		>
+			<DataViews
+				key={ activeView + isCustom }
+				paginationInfo={ paginationInfo }
+				fields={ fields }
+				actions={ actions }
+				data={ data || EMPTY_ARRAY }
+				isLoading={ isLoadingData || isLoadingFields }
+				view={ view }
+				onChangeView={ setView }
+				selection={ selection }
+				onChangeSelection={ onChangeSelection }
+				getItemId={ getItemId }
+				defaultLayouts={ defaultLayouts }
+				header={
+					window.__experimentalQuickEditDataViews &&
+					view.type !== LAYOUT_LIST &&
+					postType === 'page' && (
+						<Button
+							size="compact"
+							isPressed={ quickEdit }
+							icon={ drawerRight }
+							label={ __( 'Details panel' ) }
+							onClick={ () => {
+								history.push( {
+									...location.params,
+									quickEdit: quickEdit ? undefined : true,
+								} );
+							} }
+						/>
+					)
+				}
+			/>
+		</Page>
+	);
+}
diff --git a/packages/edit-site/src/components/post-list/style.scss b/packages/edit-site/src/components/post-list/style.scss
new file mode 100644
index 00000000000000..db6a32408c7921
--- /dev/null
+++ b/packages/edit-site/src/components/post-list/style.scss
@@ -0,0 +1,85 @@
+.edit-site-post-list__featured-image {
+	height: 100%;
+	object-fit: cover;
+	width: 100%;
+}
+
+.edit-site-post-list__featured-image-wrapper {
+	height: 100%;
+	width: 100%;
+	border-radius: $grid-unit-05;
+
+	&.is-layout-table:not(:has(.edit-site-post-list__featured-image-button)),
+	&.is-layout-table .edit-site-post-list__featured-image-button {
+		width: $grid-unit-40;
+		height: $grid-unit-40;
+		display: block;
+		border-radius: $grid-unit-05;
+		position: relative;
+		overflow: hidden;
+		background-color: $gray-100;
+		flex-grow: 0 !important;
+
+		&::after {
+			border-radius: 4px;
+			box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+			content: "";
+			height: 100%;
+			left: 0;
+			position: absolute;
+			top: 0;
+			width: 100%;
+		}
+	}
+}
+
+.edit-site-post-list__featured-image-button {
+	box-shadow: none;
+	border: none;
+	padding: 0;
+	background-color: unset;
+	box-sizing: border-box;
+	cursor: pointer;
+	overflow: hidden;
+	height: 100%;
+	width: 100%;
+	border-radius: $grid-unit-05;
+
+	&:focus-visible {
+		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+		// Windows High Contrast mode will show this outline, but not the box-shadow.
+		outline: 2px solid transparent;
+	}
+}
+
+.dataviews-view-grid__card.is-selected {
+	.edit-site-post-list__featured-image-button::after {
+		box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+		background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
+	}
+}
+
+.edit-site-post-list__title span {
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.edit-site-post-list__title-badge {
+	background: $gray-100;
+	color: $gray-800;
+	padding: 0 $grid-unit-05;
+	border-radius: $radius-small;
+	font-size: 12px;
+	font-weight: 400;
+	flex-shrink: 0;
+	line-height: $grid-unit-05 * 5;
+}
+
+.edit-site-post-list__status-icon {
+	height: $grid-unit-30;
+	width: $grid-unit-30;
+	svg {
+		fill: currentColor;
+		margin-left: -$grid-unit-05;
+	}
+}
diff --git a/packages/edit-site/src/components/posts-app/index.js b/packages/edit-site/src/components/posts-app/index.js
new file mode 100644
index 00000000000000..8b5377bb2e65bd
--- /dev/null
+++ b/packages/edit-site/src/components/posts-app/index.js
@@ -0,0 +1,37 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	UnsavedChangesWarning,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
+/**
+ * Internal dependencies
+ */
+import useInitEditedEntityFromURL from '../sync-state-with-url/use-init-edited-entity-from-url';
+import Layout from '../layout';
+import useActiveRoute from './router';
+import { unlock } from '../../lock-unlock';
+
+const { RouterProvider } = unlock( routerPrivateApis );
+const { GlobalStylesProvider } = unlock( editorPrivateApis );
+
+function PostsLayout() {
+	// This ensures the edited entity id and type are initialized properly.
+	useInitEditedEntityFromURL();
+	const route = useActiveRoute();
+	return <Layout route={ route } />;
+}
+
+export default function PostsApp() {
+	return (
+		<GlobalStylesProvider>
+			<UnsavedChangesWarning />
+			<RouterProvider>
+				<PostsLayout />
+			</RouterProvider>
+		</GlobalStylesProvider>
+	);
+}
diff --git a/packages/edit-site/src/components/posts-app/router.js b/packages/edit-site/src/components/posts-app/router.js
new file mode 100644
index 00000000000000..de89567b262094
--- /dev/null
+++ b/packages/edit-site/src/components/posts-app/router.js
@@ -0,0 +1,69 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import Editor from '../editor';
+import SidebarNavigationScreen from '../sidebar-navigation-screen';
+import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
+import DataViewsSidebarContent from '../sidebar-dataviews';
+import PostList from '../post-list';
+
+const { useLocation } = unlock( routerPrivateApis );
+
+export default function useActiveRoute() {
+	const { params = {} } = useLocation();
+	const { postType, layout, canvas } = params;
+	const labels = useSelect(
+		( select ) => {
+			return select( coreStore ).getPostType( postType )?.labels;
+		},
+		[ postType ]
+	);
+
+	// Posts list.
+	if ( [ 'post' ].includes( postType ) ) {
+		const isListLayout = layout === 'list' || ! layout;
+		return {
+			name: 'posts-list',
+			areas: {
+				sidebar: (
+					<SidebarNavigationScreen
+						title={ labels?.name }
+						isRoot
+						content={ <DataViewsSidebarContent /> }
+					/>
+				),
+				content: <PostList postType={ postType } />,
+				preview: ( isListLayout || canvas === 'edit' ) && (
+					<Editor isPostsList />
+				),
+				mobile:
+					canvas === 'edit' ? (
+						<Editor isPostsList />
+					) : (
+						<PostList postType={ postType } />
+					),
+			},
+			widths: {
+				content: isListLayout ? 380 : undefined,
+			},
+		};
+	}
+
+	// Fallback shows the home page preview
+	return {
+		name: 'default',
+		areas: {
+			sidebar: <SidebarNavigationScreenMain />,
+			preview: <Editor isPostsList />,
+			mobile: canvas === 'edit' && <Editor isPostsList />,
+		},
+	};
+}
diff --git a/packages/edit-site/src/components/preferences-modal/enable-feature.js b/packages/edit-site/src/components/preferences-modal/enable-feature.js
deleted file mode 100644
index 9cd2105ba69fff..00000000000000
--- a/packages/edit-site/src/components/preferences-modal/enable-feature.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-export default function EnableFeature( props ) {
-	const { featureName, onToggle = () => {}, ...remainingProps } = props;
-	const isChecked = useSelect(
-		( select ) =>
-			!! select( preferencesStore ).get( 'core/edit-site', featureName ),
-		[ featureName ]
-	);
-	const { toggle } = useDispatch( preferencesStore );
-	const onChange = () => {
-		onToggle();
-		toggle( 'core/edit-site', featureName );
-	};
-	return (
-		<BaseOption
-			onChange={ onChange }
-			isChecked={ isChecked }
-			{ ...remainingProps }
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/preferences-modal/index.js b/packages/edit-site/src/components/preferences-modal/index.js
deleted file mode 100644
index b0d065c0cfa5f2..00000000000000
--- a/packages/edit-site/src/components/preferences-modal/index.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	PreferencesModal,
-	PreferencesModalTabs,
-	PreferencesModalSection,
-	store as interfaceStore,
-} from '@wordpress/interface';
-import { useMemo } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-/**
- * Internal dependencies
- */
-import EnableFeature from './enable-feature';
-import { store as editSiteStore } from '../../store';
-
-export const PREFERENCES_MODAL_NAME = 'edit-site/preferences';
-
-export default function EditSitePreferencesModal() {
-	const isModalActive = useSelect( ( select ) =>
-		select( interfaceStore ).isModalActive( PREFERENCES_MODAL_NAME )
-	);
-	const { closeModal, openModal } = useDispatch( interfaceStore );
-	const toggleModal = () =>
-		isModalActive ? closeModal() : openModal( PREFERENCES_MODAL_NAME );
-	const registry = useRegistry();
-	const { closeGeneralSidebar, setIsListViewOpened, setIsInserterOpened } =
-		useDispatch( editSiteStore );
-
-	const { set: setPreference } = useDispatch( preferencesStore );
-	const toggleDistractionFree = () => {
-		registry.batch( () => {
-			setPreference( 'core/edit-site', 'fixedToolbar', true );
-			setIsInserterOpened( false );
-			setIsListViewOpened( false );
-			closeGeneralSidebar();
-		} );
-	};
-
-	const turnOffDistractionFree = () => {
-		setPreference( 'core/edit-site', 'distractionFree', false );
-	};
-
-	const sections = useMemo( () => [
-		{
-			name: 'general',
-			tabLabel: __( 'General' ),
-			content: (
-				<PreferencesModalSection title={ __( 'Interface' ) }>
-					<EnableFeature
-						featureName="showListViewByDefault"
-						help={ __(
-							'Opens the block list view sidebar by default.'
-						) }
-						label={ __( 'Always open list view' ) }
-					/>
-					<EnableFeature
-						featureName="showBlockBreadcrumbs"
-						help={ __(
-							'Shows block breadcrumbs at the bottom of the editor.'
-						) }
-						label={ __( 'Display block breadcrumbs' ) }
-					/>
-				</PreferencesModalSection>
-			),
-		},
-		{
-			name: 'appearance',
-			tabLabel: __( 'Appearance' ),
-			content: (
-				<PreferencesModalSection
-					title={ __( 'Appearance' ) }
-					description={ __(
-						'Customize the editor interface to suit your needs.'
-					) }
-				>
-					<EnableFeature
-						featureName="fixedToolbar"
-						onToggle={ turnOffDistractionFree }
-						help={ __(
-							'Access all block and document tools in a single place.'
-						) }
-						label={ __( 'Top toolbar' ) }
-					/>
-					<EnableFeature
-						featureName="distractionFree"
-						onToggle={ toggleDistractionFree }
-						help={ __(
-							'Reduce visual distractions by hiding the toolbar and other elements to focus on writing.'
-						) }
-						label={ __( 'Distraction free' ) }
-					/>
-					<EnableFeature
-						featureName="focusMode"
-						help={ __(
-							'Highlights the current block and fades other content.'
-						) }
-						label={ __( 'Spotlight mode' ) }
-					/>
-				</PreferencesModalSection>
-			),
-		},
-		{
-			name: 'accessibility',
-			tabLabel: __( 'Accessibility' ),
-			content: (
-				<>
-					<PreferencesModalSection
-						title={ __( 'Navigation' ) }
-						description={ __(
-							'Optimize the editing experience for enhanced control.'
-						) }
-					>
-						<EnableFeature
-							featureName="keepCaretInsideBlock"
-							help={ __(
-								'Keeps the text cursor within the block boundaries, aiding users with screen readers by preventing unintentional cursor movement outside the block.'
-							) }
-							label={ __( 'Contain text cursor inside block' ) }
-						/>
-					</PreferencesModalSection>
-					<PreferencesModalSection title={ __( 'Interface' ) }>
-						<EnableFeature
-							featureName="showIconLabels"
-							label={ __( 'Show button text labels' ) }
-							help={ __(
-								'Show text instead of icons on buttons across the interface.'
-							) }
-						/>
-					</PreferencesModalSection>
-				</>
-			),
-		},
-	] );
-	if ( ! isModalActive ) {
-		return null;
-	}
-	return (
-		<PreferencesModal closeModal={ toggleModal }>
-			<PreferencesModalTabs sections={ sections } />
-		</PreferencesModal>
-	);
-}
diff --git a/packages/edit-site/src/components/resizable-frame/index.js b/packages/edit-site/src/components/resizable-frame/index.js
index ee5c98da09033f..95ccfe4fdd966f 100644
--- a/packages/edit-site/src/components/resizable-frame/index.js
+++ b/packages/edit-site/src/components/resizable-frame/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,15 +12,16 @@ import {
 	Tooltip,
 	__unstableMotion as motion,
 } from '@wordpress/components';
-import { useInstanceId } from '@wordpress/compose';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
+import { useInstanceId, useReducedMotion } from '@wordpress/compose';
+import { __, isRTL } from '@wordpress/i18n';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
 import { unlock } from '../../lock-unlock';
-import { store as editSiteStore } from '../../store';
+
+const { useLocation, useHistory } = unlock( routerPrivateApis );
 
 // Removes the inline styles in the drag handles.
 const HANDLE_STYLES_OVERRIDE = {
@@ -86,17 +87,17 @@ function ResizableFrame( {
 	defaultSize,
 	innerContentStyle,
 } ) {
+	const history = useHistory();
+	const { params } = useLocation();
+	const { canvas = 'view' } = params;
+	const disableMotion = useReducedMotion();
 	const [ frameSize, setFrameSize ] = useState( INITIAL_FRAME_SIZE );
 	// The width of the resizable frame when a new resize gesture starts.
 	const [ startingWidth, setStartingWidth ] = useState();
 	const [ isResizing, setIsResizing ] = useState( false );
 	const [ shouldShowHandle, setShouldShowHandle ] = useState( false );
 	const [ resizeRatio, setResizeRatio ] = useState( 1 );
-	const canvasMode = useSelect(
-		( select ) => unlock( select( editSiteStore ) ).getCanvasMode(),
-		[]
-	);
-	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
+
 	const FRAME_TRANSITION = { type: 'tween', duration: isResizing ? 0 : 0.5 };
 	const frameRef = useRef( null );
 	const resizableHandleHelpId = useInstanceId(
@@ -157,7 +158,16 @@ function ResizableFrame( {
 			setFrameSize( INITIAL_FRAME_SIZE );
 		} else {
 			// Trigger full screen if the frame is resized far enough to the left.
-			setCanvasMode( 'edit' );
+			history.push(
+				{
+					...params,
+					canvas: 'edit',
+				},
+				undefined,
+				{
+					transition: 'canvas-mode-edit-transition',
+				}
+			);
 		}
 	};
 
@@ -170,7 +180,10 @@ function ResizableFrame( {
 		event.preventDefault();
 
 		const step = 20 * ( event.shiftKey ? 5 : 1 );
-		const delta = step * ( event.key === 'ArrowLeft' ? 1 : -1 );
+		const delta =
+			step *
+			( event.key === 'ArrowLeft' ? 1 : -1 ) *
+			( isRTL() ? -1 : 1 );
 		const newWidth = Math.min(
 			Math.max(
 				FRAME_MIN_WIDTH,
@@ -199,15 +212,17 @@ function ResizableFrame( {
 	const resizeHandleVariants = {
 		hidden: {
 			opacity: 0,
-			left: 0,
+			...( isRTL() ? { right: 0 } : { left: 0 } ),
 		},
 		visible: {
 			opacity: 1,
-			left: -16,
+			// Account for the handle's width.
+			...( isRTL() ? { right: -14 } : { left: -14 } ),
 		},
 		active: {
 			opacity: 1,
-			left: -16,
+			// Account for the handle's width.
+			...( isRTL() ? { right: -14 } : { left: -14 } ),
 			scaleY: 1.3,
 		},
 	};
@@ -226,17 +241,30 @@ function ResizableFrame( {
 			variants={ frameAnimationVariants }
 			animate={ isFullWidth ? 'fullWidth' : 'default' }
 			onAnimationComplete={ ( definition ) => {
-				if ( definition === 'fullWidth' )
+				if ( definition === 'fullWidth' ) {
 					setFrameSize( { width: '100%', height: '100%' } );
+				}
 			} }
+			whileHover={
+				canvas === 'view'
+					? {
+							scale: 1.005,
+							transition: {
+								duration: disableMotion ? 0 : 0.5,
+								ease: 'easeOut',
+							},
+					  }
+					: {}
+			}
 			transition={ FRAME_TRANSITION }
 			size={ frameSize }
 			enable={ {
 				top: false,
-				right: false,
 				bottom: false,
 				// Resizing will be disabled until the editor content is loaded.
-				left: isReady,
+				...( isRTL()
+					? { right: isReady, left: false }
+					: { left: isReady, right: false } ),
 				topRight: false,
 				bottomRight: false,
 				bottomLeft: false,
@@ -250,13 +278,13 @@ function ResizableFrame( {
 			} }
 			minWidth={ FRAME_MIN_WIDTH }
 			maxWidth={ isFullWidth ? '100%' : '150%' }
-			maxHeight={ '100%' }
+			maxHeight="100%"
 			onFocus={ () => setShouldShowHandle( true ) }
 			onBlur={ () => setShouldShowHandle( false ) }
 			onMouseOver={ () => setShouldShowHandle( true ) }
 			onMouseOut={ () => setShouldShowHandle( false ) }
 			handleComponent={ {
-				left: canvasMode === 'view' && (
+				[ isRTL() ? 'right' : 'left' ]: canvas === 'view' && (
 					<>
 						<Tooltip text={ __( 'Drag to resize' ) }>
 							{ /* Disable reason: role="separator" does in fact support aria-valuenow */ }
@@ -265,7 +293,7 @@ function ResizableFrame( {
 								key="handle"
 								role="separator"
 								aria-orientation="vertical"
-								className={ classnames(
+								className={ clsx(
 									'edit-site-resizable-frame__handle',
 									{ 'is-resizing': isResizing }
 								) }
@@ -297,20 +325,17 @@ function ResizableFrame( {
 			onResizeStart={ handleResizeStart }
 			onResize={ handleResize }
 			onResizeStop={ handleResizeStop }
-			className={ classnames( 'edit-site-resizable-frame__inner', {
+			className={ clsx( 'edit-site-resizable-frame__inner', {
 				'is-resizing': isResizing,
 			} ) }
+			showHandle={ false } // Do not show the default handle, as we're using a custom one.
 		>
-			<motion.div
+			<div
 				className="edit-site-resizable-frame__inner-content"
-				animate={ {
-					borderRadius: isFullWidth ? 0 : 8,
-				} }
-				transition={ FRAME_TRANSITION }
 				style={ innerContentStyle }
 			>
 				{ children }
-			</motion.div>
+			</div>
 		</ResizableBox>
 	);
 }
diff --git a/packages/edit-site/src/components/revisions/index.js b/packages/edit-site/src/components/revisions/index.js
index 4757c9b27213ea..5ce95872e0c9ae 100644
--- a/packages/edit-site/src/components/revisions/index.js
+++ b/packages/edit-site/src/components/revisions/index.js
@@ -10,35 +10,31 @@ import {
 	__unstableEditorStyles as EditorStyles,
 	__unstableIframe as Iframe,
 } from '@wordpress/block-editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { useSelect } from '@wordpress/data';
-import { useMemo } from '@wordpress/element';
-import { store as coreStore } from '@wordpress/core-data';
+import { useContext, useMemo } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 
 import { unlock } from '../../lock-unlock';
-import { mergeBaseAndUserConfigs } from '../global-styles/global-styles-provider';
 import EditorCanvasContainer from '../editor-canvas-container';
 
-const { ExperimentalBlockEditorProvider, useGlobalStylesOutputWithConfig } =
-	unlock( blockEditorPrivateApis );
+const {
+	ExperimentalBlockEditorProvider,
+	GlobalStylesContext,
+	useGlobalStylesOutputWithConfig,
+	__unstableBlockStyleVariationOverridesWithConfig,
+} = unlock( blockEditorPrivateApis );
+const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );
 
 function isObjectEmpty( object ) {
 	return ! object || Object.keys( object ).length === 0;
 }
 
-function Revisions( { onClose, userConfig, blocks } ) {
-	const { baseConfig } = useSelect(
-		( select ) => ( {
-			baseConfig:
-				select(
-					coreStore
-				).__experimentalGetCurrentThemeBaseGlobalStyles(),
-		} ),
-		[]
-	);
+function Revisions( { userConfig, blocks } ) {
+	const { base: baseConfig } = useContext( GlobalStylesContext );
 
 	const mergedConfig = useMemo( () => {
 		if ( ! isObjectEmpty( userConfig ) && ! isObjectEmpty( baseConfig ) ) {
@@ -57,7 +53,10 @@ function Revisions( { onClose, userConfig, blocks } ) {
 		[]
 	);
 	const settings = useMemo(
-		() => ( { ...originalSettings, __unstableIsPreviewMode: true } ),
+		() => ( {
+			...originalSettings,
+			isPreviewMode: true,
+		} ),
 		[ originalSettings ]
 	);
 
@@ -71,21 +70,19 @@ function Revisions( { onClose, userConfig, blocks } ) {
 	return (
 		<EditorCanvasContainer
 			title={ __( 'Revisions' ) }
-			onClose={ onClose }
 			closeButtonLabel={ __( 'Close revisions' ) }
-			enableResizing={ true }
+			enableResizing
 		>
 			<Iframe
 				className="edit-site-revisions__iframe"
 				name="revisions"
 				tabIndex={ 0 }
 			>
-				<EditorStyles styles={ editorStyles } />
 				<style>
 					{
 						// Forming a "block formatting context" to prevent margin collapsing.
 						// @see https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
-						`.is-root-container { display: flow-root; } body { position: relative; padding: 32px; }`
+						`.is-root-container { display: flow-root; }`
 					}
 				</style>
 				<Disabled className="edit-site-revisions__example-preview__content">
@@ -94,6 +91,14 @@ function Revisions( { onClose, userConfig, blocks } ) {
 						settings={ settings }
 					>
 						<BlockList renderAppender={ false } />
+						{ /*
+						 * Styles are printed inside the block editor provider,
+						 * so they can access any registered style overrides.
+						 */ }
+						<EditorStyles styles={ editorStyles } />
+						<__unstableBlockStyleVariationOverridesWithConfig
+							config={ mergedConfig }
+						/>
 					</ExperimentalBlockEditorProvider>
 				</Disabled>
 			</Iframe>
diff --git a/packages/edit-site/src/components/routes/link.js b/packages/edit-site/src/components/routes/link.js
index 3191e6b9c6f3ac..a34b37943a0799 100644
--- a/packages/edit-site/src/components/routes/link.js
+++ b/packages/edit-site/src/components/routes/link.js
@@ -15,11 +15,10 @@ import {
 
 const { useHistory } = unlock( routerPrivateApis );
 
-export function useLink( params = {}, state, shouldReplace = false ) {
+export function useLink( params, state, shouldReplace = false ) {
 	const history = useHistory();
-
 	function onClick( event ) {
-		event.preventDefault();
+		event?.preventDefault();
 
 		if ( shouldReplace ) {
 			history.replace( params, state );
@@ -34,14 +33,17 @@ export function useLink( params = {}, state, shouldReplace = false ) {
 		...Object.keys( currentArgs )
 	);
 
+	let extraParams = {};
 	if ( isPreviewingTheme() ) {
-		params = {
-			...params,
+		extraParams = {
 			wp_theme_preview: currentlyPreviewingTheme(),
 		};
 	}
 
-	const newUrl = addQueryArgs( currentUrlWithoutArgs, params );
+	const newUrl = addQueryArgs( currentUrlWithoutArgs, {
+		...params,
+		...extraParams,
+	} );
 
 	return {
 		href: newUrl,
diff --git a/packages/edit-site/src/components/save-button/index.js b/packages/edit-site/src/components/save-button/index.js
index d4c2969920c52a..933617e0c06c3c 100644
--- a/packages/edit-site/src/components/save-button/index.js
+++ b/packages/edit-site/src/components/save-button/index.js
@@ -3,9 +3,14 @@
  */
 import { useSelect, useDispatch } from '@wordpress/data';
 import { Button } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
+import { __, _n, sprintf } from '@wordpress/i18n';
 import { store as coreStore } from '@wordpress/core-data';
 import { displayShortcut } from '@wordpress/keycodes';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import {
+	useEntitiesSavedStatesIsDirty,
+	store as editorStore,
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
@@ -15,31 +20,30 @@ import {
 	currentlyPreviewingTheme,
 	isPreviewingTheme,
 } from '../../utils/is-previewing-theme';
+import { unlock } from '../../lock-unlock';
+
+const { useLocation } = unlock( routerPrivateApis );
 
 export default function SaveButton( {
 	className = 'edit-site-save-button__button',
 	variant = 'primary',
 	showTooltip = true,
-	defaultLabel,
+	showReviewMessage,
 	icon,
+	size,
 	__next40pxDefaultSize = false,
 } ) {
-	const { isDirty, isSaving, isSaveViewOpen, previewingThemeName } =
-		useSelect( ( select ) => {
-			const {
-				__experimentalGetDirtyEntityRecords,
-				isSavingEntityRecord,
-				isResolving,
-			} = select( coreStore );
-			const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
+	const { params } = useLocation();
+	const { setIsSaveViewOpened } = useDispatch( editSiteStore );
+	const { saveDirtyEntities } = unlock( useDispatch( editorStore ) );
+	const { dirtyEntityRecords } = useEntitiesSavedStatesIsDirty();
+	const { isSaving, isSaveViewOpen, previewingThemeName } = useSelect(
+		( select ) => {
+			const { isSavingEntityRecord, isResolving } = select( coreStore );
 			const { isSaveViewOpened } = select( editSiteStore );
 			const isActivatingTheme = isResolving( 'activateTheme' );
-			const previewingTheme = select( coreStore ).getTheme(
-				currentlyPreviewingTheme()
-			);
-
+			const currentlyPreviewingThemeId = currentlyPreviewingTheme();
 			return {
-				isDirty: dirtyEntityRecords.length > 0,
 				isSaving:
 					dirtyEntityRecords.some( ( record ) =>
 						isSavingEntityRecord(
@@ -49,37 +53,79 @@ export default function SaveButton( {
 						)
 					) || isActivatingTheme,
 				isSaveViewOpen: isSaveViewOpened(),
-				previewingThemeName: previewingTheme?.name?.rendered,
+				// Do not call `getTheme` with null, it will cause a request to
+				// the server.
+				previewingThemeName: currentlyPreviewingThemeId
+					? select( coreStore ).getTheme( currentlyPreviewingThemeId )
+							?.name?.rendered
+					: undefined,
 			};
-		}, [] );
-	const { setIsSaveViewOpened } = useDispatch( editSiteStore );
-
-	const activateSaveEnabled = isPreviewingTheme() || isDirty;
-	const disabled = isSaving || ! activateSaveEnabled;
-
+		},
+		[ dirtyEntityRecords ]
+	);
+	const hasDirtyEntities = !! dirtyEntityRecords.length;
+	let isOnlyCurrentEntityDirty;
+	// Check if the current entity is the only entity with changes.
+	// We have some extra logic for `wp_global_styles` for now, that
+	// is used in navigation sidebar.
+	if ( dirtyEntityRecords.length === 1 ) {
+		if ( params.postId ) {
+			isOnlyCurrentEntityDirty =
+				`${ dirtyEntityRecords[ 0 ].key }` === params.postId &&
+				dirtyEntityRecords[ 0 ].name === params.postType;
+		} else if ( params.path?.includes( 'wp_global_styles' ) ) {
+			isOnlyCurrentEntityDirty =
+				dirtyEntityRecords[ 0 ].name === 'globalStyles';
+		}
+	}
+	const disabled =
+		isSaving || ( ! hasDirtyEntities && ! isPreviewingTheme() );
 	const getLabel = () => {
 		if ( isPreviewingTheme() ) {
 			if ( isSaving ) {
-				return sprintf( 'Activating %s', previewingThemeName );
+				return sprintf(
+					/* translators: %s: The name of theme to be activated. */
+					__( 'Activating %s' ),
+					previewingThemeName
+				);
 			} else if ( disabled ) {
 				return __( 'Saved' );
-			} else if ( isDirty ) {
-				return sprintf( 'Activate %s & Save', previewingThemeName );
+			} else if ( hasDirtyEntities ) {
+				return sprintf(
+					/* translators: %s: The name of theme to be activated. */
+					__( 'Activate %s & Save' ),
+					previewingThemeName
+				);
 			}
-			return sprintf( 'Activate %s', previewingThemeName );
+			return sprintf(
+				/* translators: %s: The name of theme to be activated. */
+				__( 'Activate %s' ),
+				previewingThemeName
+			);
 		}
-
 		if ( isSaving ) {
 			return __( 'Saving' );
-		} else if ( disabled ) {
+		}
+		if ( disabled ) {
 			return __( 'Saved' );
-		} else if ( defaultLabel ) {
-			return defaultLabel;
+		}
+		if ( ! isOnlyCurrentEntityDirty && showReviewMessage ) {
+			return sprintf(
+				// translators: %d: number of unsaved changes (number).
+				_n(
+					'Review %d change…',
+					'Review %d changes…',
+					dirtyEntityRecords.length
+				),
+				dirtyEntityRecords.length
+			);
 		}
 		return __( 'Save' );
 	};
 	const label = getLabel();
-
+	const onClick = isOnlyCurrentEntityDirty
+		? () => saveDirtyEntities( { dirtyEntityRecords } )
+		: () => setIsSaveViewOpened( true );
 	return (
 		<Button
 			variant={ variant }
@@ -87,7 +133,7 @@ export default function SaveButton( {
 			aria-disabled={ disabled }
 			aria-expanded={ isSaveViewOpen }
 			isBusy={ isSaving }
-			onClick={ disabled ? undefined : () => setIsSaveViewOpened( true ) }
+			onClick={ disabled ? undefined : onClick }
 			label={ label }
 			/*
 			 * We want the tooltip to show the keyboard shortcut only when the
@@ -103,7 +149,7 @@ export default function SaveButton( {
 			showTooltip={ showTooltip }
 			icon={ icon }
 			__next40pxDefaultSize={ __next40pxDefaultSize }
-			size="compact"
+			size={ size }
 		>
 			{ label }
 		</Button>
diff --git a/packages/edit-site/src/components/save-hub/index.js b/packages/edit-site/src/components/save-hub/index.js
index 6afd52c1f4c2aa..61f4df072a7db8 100644
--- a/packages/edit-site/src/components/save-hub/index.js
+++ b/packages/edit-site/src/components/save-hub/index.js
@@ -1,186 +1,42 @@
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { Button, __experimentalHStack as HStack } from '@wordpress/components';
-import { __, sprintf, _n } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { __experimentalHStack as HStack } from '@wordpress/components';
 import { store as coreStore } from '@wordpress/core-data';
-import { store as blockEditorStore } from '@wordpress/block-editor';
 import { check } from '@wordpress/icons';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-import { store as noticesStore } from '@wordpress/notices';
 
 /**
  * Internal dependencies
  */
 import SaveButton from '../save-button';
 import { isPreviewingTheme } from '../../utils/is-previewing-theme';
-import { unlock } from '../../lock-unlock';
-import { NAVIGATION_POST_TYPE } from '../../utils/constants';
-
-const { useLocation } = unlock( routerPrivateApis );
-
-const PUBLISH_ON_SAVE_ENTITIES = [
-	{
-		kind: 'postType',
-		name: NAVIGATION_POST_TYPE,
-	},
-];
 
 export default function SaveHub() {
-	const saveNoticeId = 'site-edit-save-notice';
-	const { params } = useLocation();
-
-	const { __unstableMarkLastChangeAsPersistent } =
-		useDispatch( blockEditorStore );
-
-	const { createSuccessNotice, createErrorNotice, removeNotice } =
-		useDispatch( noticesStore );
-
-	const { dirtyCurrentEntity, countUnsavedChanges, isDirty, isSaving } =
-		useSelect(
-			( select ) => {
-				const {
-					__experimentalGetDirtyEntityRecords,
-					isSavingEntityRecord,
-				} = select( coreStore );
-				const dirtyEntityRecords =
-					__experimentalGetDirtyEntityRecords();
-				let calcDirtyCurrentEntity = null;
-
-				if ( dirtyEntityRecords.length === 1 ) {
-					// if we are on global styles
-					if ( params.path?.includes( 'wp_global_styles' ) ) {
-						calcDirtyCurrentEntity = dirtyEntityRecords.find(
-							( record ) => record.name === 'globalStyles'
-						);
-					}
-					// if we are on pages
-					else if ( params.postId ) {
-						calcDirtyCurrentEntity = dirtyEntityRecords.find(
-							( record ) =>
-								record.name === params.postType &&
-								String( record.key ) === params.postId
-						);
-					}
-				}
-
-				return {
-					dirtyCurrentEntity: calcDirtyCurrentEntity,
-					isDirty: dirtyEntityRecords.length > 0,
-					isSaving: dirtyEntityRecords.some( ( record ) =>
-						isSavingEntityRecord(
-							record.kind,
-							record.name,
-							record.key
-						)
-					),
-					countUnsavedChanges: dirtyEntityRecords.length,
-				};
-			},
-			[ params.path, params.postType, params.postId ]
+	const { isDisabled, isSaving } = useSelect( ( select ) => {
+		const { __experimentalGetDirtyEntityRecords, isSavingEntityRecord } =
+			select( coreStore );
+		const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
+		const _isSaving = dirtyEntityRecords.some( ( record ) =>
+			isSavingEntityRecord( record.kind, record.name, record.key )
 		);
-
-	const {
-		editEntityRecord,
-		saveEditedEntityRecord,
-		__experimentalSaveSpecifiedEntityEdits: saveSpecifiedEntityEdits,
-	} = useDispatch( coreStore );
-
-	const disabled = isSaving || ( ! isDirty && ! isPreviewingTheme() );
-
-	// if we have only one unsaved change and it matches current context, we can show a more specific label
-	let label = dirtyCurrentEntity
-		? __( 'Save' )
-		: sprintf(
-				// translators: %d: number of unsaved changes (number).
-				_n(
-					'Review %d change…',
-					'Review %d changes…',
-					countUnsavedChanges
-				),
-				countUnsavedChanges
-		  );
-
-	if ( isSaving ) {
-		label = __( 'Saving' );
-	}
-
-	const { homeUrl } = useSelect( ( select ) => {
-		const {
-			getUnstableBase, // Site index.
-		} = select( coreStore );
 		return {
-			homeUrl: getUnstableBase()?.home,
+			isSaving: _isSaving,
+			isDisabled:
+				_isSaving ||
+				( ! dirtyEntityRecords.length && ! isPreviewingTheme() ),
 		};
 	}, [] );
-
-	const saveCurrentEntity = async () => {
-		if ( ! dirtyCurrentEntity ) return;
-
-		removeNotice( saveNoticeId );
-		const { kind, name, key, property } = dirtyCurrentEntity;
-
-		try {
-			if ( 'root' === dirtyCurrentEntity.kind && 'site' === name ) {
-				await saveSpecifiedEntityEdits( 'root', 'site', undefined, [
-					property,
-				] );
-			} else {
-				if (
-					PUBLISH_ON_SAVE_ENTITIES.some(
-						( typeToPublish ) =>
-							typeToPublish.kind === kind &&
-							typeToPublish.name === name
-					)
-				) {
-					editEntityRecord( kind, name, key, { status: 'publish' } );
-				}
-
-				await saveEditedEntityRecord( kind, name, key );
-			}
-
-			__unstableMarkLastChangeAsPersistent();
-
-			createSuccessNotice( __( 'Site updated.' ), {
-				type: 'snackbar',
-				actions: [
-					{
-						label: __( 'View site' ),
-						url: homeUrl,
-					},
-				],
-				id: saveNoticeId,
-			} );
-		} catch ( error ) {
-			createErrorNotice( `${ __( 'Saving failed.' ) } ${ error }` );
-		}
-	};
-
 	return (
 		<HStack className="edit-site-save-hub" alignment="right" spacing={ 4 }>
-			{ dirtyCurrentEntity ? (
-				<Button
-					variant="primary"
-					onClick={ saveCurrentEntity }
-					isBusy={ isSaving }
-					disabled={ isSaving }
-					aria-disabled={ isSaving }
-					className="edit-site-save-hub__button"
-					__next40pxDefaultSize
-				>
-					{ label }
-				</Button>
-			) : (
-				<SaveButton
-					className="edit-site-save-hub__button"
-					variant={ disabled ? null : 'primary' }
-					showTooltip={ false }
-					icon={ disabled && ! isSaving ? check : null }
-					defaultLabel={ label }
-					__next40pxDefaultSize
-				/>
-			) }
+			<SaveButton
+				className="edit-site-save-hub__button"
+				variant={ isDisabled ? null : 'primary' }
+				showTooltip={ false }
+				icon={ isDisabled && ! isSaving ? check : null }
+				showReviewMessage
+				__next40pxDefaultSize
+			/>
 		</HStack>
 	);
 }
diff --git a/packages/edit-site/src/components/save-hub/style.scss b/packages/edit-site/src/components/save-hub/style.scss
index 5cb7cca1f85018..03609209c432c5 100644
--- a/packages/edit-site/src/components/save-hub/style.scss
+++ b/packages/edit-site/src/components/save-hub/style.scss
@@ -3,7 +3,7 @@
 	border-top: 1px solid $gray-800;
 	flex-shrink: 0;
 	margin: 0;
-	padding: $grid-unit-20 + $grid-unit-05 $canvas-padding;
+	padding: $grid-unit-20 $canvas-padding;
 }
 
 .edit-site-save-hub__button {
diff --git a/packages/edit-site/src/components/save-panel/index.js b/packages/edit-site/src/components/save-panel/index.js
index 5c1bcc1df281e0..d7817d5b3c1bb2 100644
--- a/packages/edit-site/src/components/save-panel/index.js
+++ b/packages/edit-site/src/components/save-panel/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -14,8 +14,9 @@ import {
 } from '@wordpress/editor';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __, sprintf } from '@wordpress/i18n';
-import { NavigableRegion } from '@wordpress/interface';
 import { store as coreStore } from '@wordpress/core-data';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useEffect } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -23,12 +24,12 @@ import { store as coreStore } from '@wordpress/core-data';
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 import { useActivateTheme } from '../../utils/use-activate-theme';
-import {
-	currentlyPreviewingTheme,
-	isPreviewingTheme,
-} from '../../utils/is-previewing-theme';
+import { useActualCurrentTheme } from '../../utils/use-actual-current-theme';
+import { isPreviewingTheme } from '../../utils/is-previewing-theme';
 
-const { EntitiesSavedStatesExtensible } = unlock( privateApis );
+const { EntitiesSavedStatesExtensible, NavigableRegion } =
+	unlock( privateApis );
+const { useLocation } = unlock( routerPrivateApis );
 
 const EntitiesSavedStatesForPreview = ( { onClose } ) => {
 	const isDirtyProps = useEntitiesSavedStatesIsDirty();
@@ -39,19 +40,22 @@ const EntitiesSavedStatesForPreview = ( { onClose } ) => {
 		activateSaveLabel = __( 'Activate' );
 	}
 
-	const themeName = useSelect( ( select ) => {
-		const theme = select( coreStore ).getTheme(
-			currentlyPreviewingTheme()
-		);
+	const currentTheme = useActualCurrentTheme();
 
-		return theme?.name?.rendered;
-	}, [] );
+	const previewingTheme = useSelect(
+		( select ) => select( coreStore ).getCurrentTheme(),
+		[]
+	);
 
 	const additionalPrompt = (
 		<p>
 			{ sprintf(
-				'Saving your changes will change your active theme to %s.',
-				themeName
+				/* translators: %1$s: The name of active theme, %2$s: The name of theme to be activated. */
+				__(
+					'Saving your changes will change your active theme from %1$s to %2$s.'
+				),
+				currentTheme?.name?.rendered ?? '...',
+				previewingTheme?.name?.rendered ?? '...'
 			) }
 		</p>
 	);
@@ -76,30 +80,46 @@ const EntitiesSavedStatesForPreview = ( { onClose } ) => {
 	);
 };
 
-const _EntitiesSavedStates = ( { onClose } ) => {
+const _EntitiesSavedStates = ( { onClose, renderDialog = undefined } ) => {
 	if ( isPreviewingTheme() ) {
 		return <EntitiesSavedStatesForPreview onClose={ onClose } />;
 	}
-	return <EntitiesSavedStates close={ onClose } />;
+	return (
+		<EntitiesSavedStates close={ onClose } renderDialog={ renderDialog } />
+	);
 };
 
 export default function SavePanel() {
-	const { isSaveViewOpen, canvasMode } = useSelect( ( select ) => {
-		const { isSaveViewOpened, getCanvasMode } = unlock(
-			select( editSiteStore )
-		);
+	const { params } = useLocation();
+	const { canvas = 'view' } = params;
+	const { isSaveViewOpen, isDirty, isSaving } = useSelect( ( select ) => {
+		const {
+			__experimentalGetDirtyEntityRecords,
+			isSavingEntityRecord,
+			isResolving,
+		} = select( coreStore );
+		const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
+		const isActivatingTheme = isResolving( 'activateTheme' );
+		const { isSaveViewOpened } = unlock( select( editSiteStore ) );
 
 		// The currently selected entity to display.
 		// Typically template or template part in the site editor.
 		return {
 			isSaveViewOpen: isSaveViewOpened(),
-			canvasMode: getCanvasMode(),
+			isDirty: dirtyEntityRecords.length > 0,
+			isSaving:
+				dirtyEntityRecords.some( ( record ) =>
+					isSavingEntityRecord( record.kind, record.name, record.key )
+				) || isActivatingTheme,
 		};
 	}, [] );
 	const { setIsSaveViewOpened } = useDispatch( editSiteStore );
 	const onClose = () => setIsSaveViewOpened( false );
+	useEffect( () => {
+		setIsSaveViewOpened( false );
+	}, [ canvas, setIsSaveViewOpened ] );
 
-	if ( canvasMode === 'view' ) {
+	if ( canvas === 'view' ) {
 		return isSaveViewOpen ? (
 			<Modal
 				className="edit-site-save-panel__modal"
@@ -113,27 +133,34 @@ export default function SavePanel() {
 			</Modal>
 		) : null;
 	}
-
+	const activateSaveEnabled = isPreviewingTheme() || isDirty;
+	const disabled = isSaving || ! activateSaveEnabled;
 	return (
 		<NavigableRegion
-			className={ classnames( 'edit-site-layout__actions', {
+			className={ clsx( 'edit-site-layout__actions', {
 				'is-entity-save-view-open': isSaveViewOpen,
 			} ) }
 			ariaLabel={ __( 'Save panel' ) }
 		>
-			{ isSaveViewOpen ? (
-				<_EntitiesSavedStates onClose={ onClose } />
-			) : (
-				<div className="edit-site-editor__toggle-save-panel">
-					<Button
-						variant="secondary"
-						className="edit-site-editor__toggle-save-panel-button"
-						onClick={ () => setIsSaveViewOpened( true ) }
-						aria-expanded={ false }
-					>
-						{ __( 'Open save panel' ) }
-					</Button>
-				</div>
+			<div
+				className={ clsx( 'edit-site-editor__toggle-save-panel', {
+					'screen-reader-text': isSaveViewOpen,
+				} ) }
+			>
+				<Button
+					__next40pxDefaultSize
+					variant="secondary"
+					className="edit-site-editor__toggle-save-panel-button"
+					onClick={ () => setIsSaveViewOpened( true ) }
+					aria-haspopup="dialog"
+					disabled={ disabled }
+					accessibleWhenDisabled
+				>
+					{ __( 'Open save panel' ) }
+				</Button>
+			</div>
+			{ isSaveViewOpen && (
+				<_EntitiesSavedStates onClose={ onClose } renderDialog />
 			) }
 		</NavigableRegion>
 	);
diff --git a/packages/edit-site/src/components/secondary-sidebar/inserter-sidebar.js b/packages/edit-site/src/components/secondary-sidebar/inserter-sidebar.js
deleted file mode 100644
index 5567bcc3821195..00000000000000
--- a/packages/edit-site/src/components/secondary-sidebar/inserter-sidebar.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { Button, VisuallyHidden } from '@wordpress/components';
-import { __experimentalLibrary as Library } from '@wordpress/block-editor';
-import { close } from '@wordpress/icons';
-import {
-	useViewportMatch,
-	__experimentalUseDialog as useDialog,
-} from '@wordpress/compose';
-import { __ } from '@wordpress/i18n';
-import { useEffect, useRef } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-
-export default function InserterSidebar() {
-	const { setIsInserterOpened } = useDispatch( editSiteStore );
-	const insertionPoint = useSelect(
-		( select ) => select( editSiteStore ).__experimentalGetInsertionPoint(),
-		[]
-	);
-
-	const isMobile = useViewportMatch( 'medium', '<' );
-	const TagName = ! isMobile ? VisuallyHidden : 'div';
-	const [ inserterDialogRef, inserterDialogProps ] = useDialog( {
-		onClose: () => setIsInserterOpened( false ),
-		focusOnMount: null,
-	} );
-
-	const libraryRef = useRef();
-	useEffect( () => {
-		libraryRef.current.focusSearch();
-	}, [] );
-
-	return (
-		<div
-			ref={ inserterDialogRef }
-			{ ...inserterDialogProps }
-			className="edit-site-editor__inserter-panel"
-		>
-			<TagName className="edit-site-editor__inserter-panel-header">
-				<Button
-					icon={ close }
-					label={ __( 'Close block inserter' ) }
-					onClick={ () => setIsInserterOpened( false ) }
-				/>
-			</TagName>
-			<div className="edit-site-editor__inserter-panel-content">
-				<Library
-					showInserterHelpPanel
-					shouldFocusBlock={ isMobile }
-					rootClientId={ insertionPoint.rootClientId }
-					__experimentalInsertionIndex={
-						insertionPoint.insertionIndex
-					}
-					__experimentalFilterValue={ insertionPoint.filterValue }
-					ref={ libraryRef }
-				/>
-			</div>
-		</div>
-	);
-}
diff --git a/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js b/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js
deleted file mode 100644
index f86b7b8c9784d0..00000000000000
--- a/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
-import { Button } from '@wordpress/components';
-import { useFocusOnMount, useMergeRefs } from '@wordpress/compose';
-import { useDispatch } from '@wordpress/data';
-import { useCallback, useRef, useState } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { closeSmall } from '@wordpress/icons';
-import { ESCAPE } from '@wordpress/keycodes';
-import { focus } from '@wordpress/dom';
-import { useShortcut } from '@wordpress/keyboard-shortcuts';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-
-const { PrivateListView } = unlock( blockEditorPrivateApis );
-
-export default function ListViewSidebar( { listViewToggleElement } ) {
-	const { setIsListViewOpened } = useDispatch( editSiteStore );
-
-	// This hook handles focus when the sidebar first renders.
-	const focusOnMountRef = useFocusOnMount( 'firstElement' );
-
-	// When closing the list view, focus should return to the toggle button.
-	const closeListView = useCallback( () => {
-		setIsListViewOpened( false );
-		listViewToggleElement?.focus();
-	}, [ listViewToggleElement, setIsListViewOpened ] );
-
-	const closeOnEscape = useCallback(
-		( event ) => {
-			if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
-				event.preventDefault();
-				closeListView();
-			}
-		},
-		[ closeListView ]
-	);
-
-	// Use internal state instead of a ref to make sure that the component
-	// re-renders when the dropZoneElement updates.
-	const [ dropZoneElement, setDropZoneElement ] = useState( null );
-
-	// This ref refers to the sidebar as a whole.
-	const sidebarRef = useRef();
-	// This ref refers to the close button.
-	const sidebarCloseButtonRef = useRef();
-	// This ref refers to the list view application area.
-	const listViewRef = useRef();
-
-	/*
-	 * Callback function to handle list view or close button focus.
-	 *
-	 * @return void
-	 */
-	function handleSidebarFocus() {
-		// Either focus the list view or the sidebar close button. Must have a fallback because the list view does not render when there are no blocks.
-		const listViewApplicationFocus = focus.tabbable.find(
-			listViewRef.current
-		)[ 0 ];
-		const listViewFocusArea = sidebarRef.current.contains(
-			listViewApplicationFocus
-		)
-			? listViewApplicationFocus
-			: sidebarCloseButtonRef.current;
-		listViewFocusArea.focus();
-	}
-
-	const handleToggleListViewShortcut = useCallback( () => {
-		// If the sidebar has focus, it is safe to close.
-		if (
-			sidebarRef.current.contains(
-				sidebarRef.current.ownerDocument.activeElement
-			)
-		) {
-			closeListView();
-		} else {
-			// If the list view or close button does not have focus, focus should be moved to it.
-			handleSidebarFocus();
-		}
-	}, [ closeListView ] );
-
-	// This only fires when the sidebar is open because of the conditional rendering.
-	// It is the same shortcut to open but that is defined as a global shortcut and only fires when the sidebar is closed.
-	useShortcut(
-		'core/edit-site/toggle-list-view',
-		handleToggleListViewShortcut
-	);
-
-	return (
-		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
-		<div
-			className="edit-site-editor__list-view-panel"
-			onKeyDown={ closeOnEscape }
-			ref={ sidebarRef }
-		>
-			<div className="edit-site-editor__list-view-panel-header">
-				<strong>{ __( 'List View' ) }</strong>
-				<Button
-					icon={ closeSmall }
-					label={ __( 'Close' ) }
-					onClick={ closeListView }
-					ref={ sidebarCloseButtonRef }
-				/>
-			</div>
-			<div
-				className="edit-site-editor__list-view-panel-content"
-				ref={ useMergeRefs( [
-					focusOnMountRef,
-					setDropZoneElement,
-					listViewRef,
-				] ) }
-			>
-				<PrivateListView dropZoneElement={ dropZoneElement } />
-			</div>
-		</div>
-	);
-}
diff --git a/packages/edit-site/src/components/secondary-sidebar/style.scss b/packages/edit-site/src/components/secondary-sidebar/style.scss
deleted file mode 100644
index 0230c71b2e8009..00000000000000
--- a/packages/edit-site/src/components/secondary-sidebar/style.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Note that this CSS file should be in sync with its counterpart in the other editor:
- * packages/edit-post/src/components/secondary-sidebar/style.scss
- */
-
-.edit-site-editor__inserter-panel,
-.edit-site-editor__list-view-panel {
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-}
-
-.edit-site-editor__list-view-panel {
-	@include break-medium() {
-		// Same width as the Inserter.
-		// @see packages/block-editor/src/components/inserter/style.scss
-		width: 350px;
-	}
-}
-
-.edit-site-editor__inserter-panel-header {
-	padding-top: $grid-unit-10;
-	padding-right: $grid-unit-10;
-	display: flex;
-	justify-content: flex-end;
-}
-
-.edit-site-editor__inserter-panel-content,
-.edit-site-editor__list-view-panel-content {
-	// Leave space for the close button
-	height: calc(100% - #{$button-size} - #{$grid-unit-10});
-}
-
-
-.edit-site-editor__inserter-panel-content {
-	@include break-medium() {
-		height: 100%;
-	}
-}
-
-.edit-site-editor__list-view-panel-header {
-	align-items: center;
-	border-bottom: $border-width solid $gray-300;
-	display: flex;
-	justify-content: space-between;
-	height: $grid-unit-60;
-	padding-left: $grid-unit-20;
-	padding-right: $grid-unit-05;
-}
-
-.edit-site-editor__list-view-panel-content {
-	height: 100%;
-
-	// Include custom scrollbars, invisible until hovered.
-	@include custom-scrollbars-on-hover(transparent, $gray-600);
-	overflow: auto;
-
-	// Only reserve space for scrollbars when there is content to scroll.
-	// This allows items in the list view to have equidistant padding left and right
-	// right up until a scrollbar is present.
-	scrollbar-gutter: auto;
-
-	// The table cells use an extra pixels of space left and right. We compensate for that here.
-	padding: $grid-unit-10 ($grid-unit-10 - $border-width - $border-width);
-}
diff --git a/packages/edit-site/src/components/sidebar-button/index.js b/packages/edit-site/src/components/sidebar-button/index.js
index 9da8492c37c799..f4cea37f01078b 100644
--- a/packages/edit-site/src/components/sidebar-button/index.js
+++ b/packages/edit-site/src/components/sidebar-button/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,11 +11,9 @@ import { Button } from '@wordpress/components';
 export default function SidebarButton( props ) {
 	return (
 		<Button
+			size="compact"
 			{ ...props }
-			className={ classnames(
-				'edit-site-sidebar-button',
-				props.className
-			) }
+			className={ clsx( 'edit-site-sidebar-button', props.className ) }
 		/>
 	);
 }
diff --git a/packages/edit-site/src/components/sidebar-button/style.scss b/packages/edit-site/src/components/sidebar-button/style.scss
index 5135f97869bb8b..4507accbd12123 100644
--- a/packages/edit-site/src/components/sidebar-button/style.scss
+++ b/packages/edit-site/src/components/sidebar-button/style.scss
@@ -10,14 +10,14 @@
 	&:focus-visible:not(:disabled) {
 		box-shadow:
 			0 0 0 var(--wp-admin-border-width-focus)
-			var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
+			var(--wp-admin-theme-color);
 		outline: 3px solid transparent;
 	}
 
-	&:hover,
+	&:hover:not(:disabled,[aria-disabled="true"]),
 	&:focus-visible,
 	&:focus,
-	&:not([aria-disabled="true"]):active,
+	&:not(:disabled,[aria-disabled="true"]):active,
 	&[aria-expanded="true"] {
 		color: $gray-100;
 	}
diff --git a/packages/edit-site/src/components/sidebar-dataviews/add-new-view.js b/packages/edit-site/src/components/sidebar-dataviews/add-new-view.js
index d84d85faf4d60a..62956ccd18960d 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/add-new-view.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/add-new-view.js
@@ -19,19 +19,17 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
  * Internal dependencies
  */
 import SidebarNavigationItem from '../sidebar-navigation-item';
-import DEFAULT_VIEWS from './default-views';
+import { useDefaultViews } from './default-views';
 import { unlock } from '../../lock-unlock';
 
-const { useHistory, useLocation } = unlock( routerPrivateApis );
+const { useHistory } = unlock( routerPrivateApis );
 
 function AddNewItemModalContent( { type, setIsAdding } ) {
-	const {
-		params: { path },
-	} = useLocation();
 	const history = useHistory();
 	const { saveEntityRecord } = useDispatch( coreStore );
 	const [ title, setTitle ] = useState( '' );
 	const [ isSaving, setIsSaving ] = useState( false );
+	const defaultViews = useDefaultViews( { postType: type } );
 	return (
 		<form
 			onSubmit={ async ( event ) => {
@@ -63,13 +61,14 @@ function AddNewItemModalContent( { type, setIsAdding } ) {
 						title,
 						status: 'publish',
 						wp_dataviews_type: dataViewTaxonomyId,
-						content: JSON.stringify(
-							DEFAULT_VIEWS[ type ][ 0 ].view
-						),
+						content: JSON.stringify( defaultViews[ 0 ].view ),
 					}
 				);
+				const {
+					params: { postType },
+				} = history.getLocationWithParams();
 				history.push( {
-					path,
+					postType,
 					activeView: savedRecord.id,
 					isCustom: 'true',
 				} );
@@ -79,6 +78,7 @@ function AddNewItemModalContent( { type, setIsAdding } ) {
 		>
 			<VStack spacing="5">
 				<TextControl
+					__next40pxDefaultSize
 					__nextHasNoMarginBottom
 					label={ __( 'Name' ) }
 					value={ title }
@@ -88,6 +88,7 @@ function AddNewItemModalContent( { type, setIsAdding } ) {
 				/>
 				<HStack justify="right">
 					<Button
+						__next40pxDefaultSize
 						variant="tertiary"
 						onClick={ () => {
 							setIsAdding( false );
@@ -97,6 +98,7 @@ function AddNewItemModalContent( { type, setIsAdding } ) {
 					</Button>
 
 					<Button
+						__next40pxDefaultSize
 						variant="primary"
 						type="submit"
 						aria-disabled={ ! title || isSaving }
diff --git a/packages/edit-site/src/components/sidebar-dataviews/custom-dataviews-list.js b/packages/edit-site/src/components/sidebar-dataviews/custom-dataviews-list.js
index 0babb21ab2010e..847029e8d6dcfe 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/custom-dataviews-list.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/custom-dataviews-list.js
@@ -27,7 +27,7 @@ import DataViewItem from './dataview-item';
 import AddNewItem from './add-new-view';
 import { unlock } from '../../lock-unlock';
 
-const { useHistory, useLocation } = unlock( routerPrivateApis );
+const { useHistory } = unlock( routerPrivateApis );
 
 const EMPTY_ARRAY = [];
 
@@ -51,6 +51,7 @@ function RenameItemModalContent( { dataviewId, currentTitle, setIsRenaming } ) {
 		>
 			<VStack spacing="5">
 				<TextControl
+					__next40pxDefaultSize
 					__nextHasNoMarginBottom
 					label={ __( 'Name' ) }
 					value={ title }
@@ -61,6 +62,7 @@ function RenameItemModalContent( { dataviewId, currentTitle, setIsRenaming } ) {
 				<HStack justify="right">
 					<Button
 						variant="tertiary"
+						__next40pxDefaultSize
 						onClick={ () => {
 							setIsRenaming( false );
 						} }
@@ -71,8 +73,9 @@ function RenameItemModalContent( { dataviewId, currentTitle, setIsRenaming } ) {
 						variant="primary"
 						type="submit"
 						aria-disabled={ ! title }
+						__next40pxDefaultSize
 					>
-						{ __( 'Rename' ) }
+						{ __( 'Save' ) }
 					</Button>
 				</HStack>
 			</VStack>
@@ -81,9 +84,6 @@ function RenameItemModalContent( { dataviewId, currentTitle, setIsRenaming } ) {
 }
 
 function CustomDataViewItem( { dataviewId, isActive } ) {
-	const {
-		params: { path },
-	} = useLocation();
 	const history = useHistory();
 	const { dataview } = useSelect(
 		( select ) => {
@@ -110,7 +110,7 @@ function CustomDataViewItem( { dataviewId, isActive } ) {
 				title={ dataview.title }
 				type={ type }
 				isActive={ isActive }
-				isCustom="true"
+				isCustom
 				customViewId={ dataviewId }
 				suffix={
 					<DropdownMenu
@@ -145,9 +145,10 @@ function CustomDataViewItem( { dataviewId, isActive } ) {
 											}
 										);
 										if ( isActive ) {
-											history.replace( {
-												path,
-											} );
+											const {
+												params: { postType },
+											} = history.getLocationWithParams();
+											history.replace( { postType } );
 										}
 										onClose();
 									} }
@@ -162,10 +163,12 @@ function CustomDataViewItem( { dataviewId, isActive } ) {
 			/>
 			{ isRenaming && (
 				<Modal
-					title={ __( 'Rename view' ) }
+					title={ __( 'Rename' ) }
 					onRequestClose={ () => {
 						setIsRenaming( false );
 					} }
+					focusOnMount="firstContentElement"
+					size="small"
 				>
 					<RenameItemModalContent
 						dataviewId={ dataviewId }
@@ -216,7 +219,7 @@ export default function CustomDataViewsList( { type, activeView, isCustom } ) {
 							key={ customViewRecord.id }
 							dataviewId={ customViewRecord.id }
 							isActive={
-								isCustom === 'true' &&
+								isCustom &&
 								Number( activeView ) === customViewRecord.id
 							}
 						/>
diff --git a/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js b/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js
index cbcb4f2f8ed59c..1e12d6706d81b5 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -29,26 +29,28 @@ export default function DataViewItem( {
 	suffix,
 } ) {
 	const {
-		params: { path },
+		params: { postType },
 	} = useLocation();
 
 	const iconToUse =
 		icon || VIEW_LAYOUTS.find( ( v ) => v.type === type ).icon;
 
+	let activeView = isCustom ? customViewId : slug;
+	if ( activeView === 'all' ) {
+		activeView = undefined;
+	}
 	const linkInfo = useLink( {
-		path,
-		activeView: isCustom === 'true' ? customViewId : slug,
-		isCustom,
+		postType,
+		layout: type,
+		activeView,
+		isCustom: isCustom ? 'true' : undefined,
 	} );
 	return (
 		<HStack
 			justify="flex-start"
-			className={ classnames(
-				'edit-site-sidebar-dataviews-dataview-item',
-				{
-					'is-selected': isActive,
-				}
-			) }
+			className={ clsx( 'edit-site-sidebar-dataviews-dataview-item', {
+				'is-selected': isActive,
+			} ) }
 		>
 			<SidebarNavigationItem
 				icon={ iconToUse }
diff --git a/packages/edit-site/src/components/sidebar-dataviews/default-views.js b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
index 11652286e62d8d..72f4c94fe6bcdd 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/default-views.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
@@ -2,15 +2,57 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { trash } from '@wordpress/icons';
+
+import {
+	trash,
+	pages,
+	drafts,
+	published,
+	scheduled,
+	pending,
+	notAllowed,
+} from '@wordpress/icons';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { useMemo } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import { LAYOUT_TABLE, OPERATOR_IN } from '../../utils/constants';
+import {
+	LAYOUT_LIST,
+	LAYOUT_TABLE,
+	LAYOUT_GRID,
+	OPERATOR_IS_ANY,
+} from '../../utils/constants';
+
+export const defaultLayouts = {
+	[ LAYOUT_TABLE ]: {
+		layout: {
+			primaryField: 'title',
+			styles: {
+				title: {
+					maxWidth: 300,
+				},
+			},
+		},
+	},
+	[ LAYOUT_GRID ]: {
+		layout: {
+			mediaField: 'featured_media',
+			primaryField: 'title',
+		},
+	},
+	[ LAYOUT_LIST ]: {
+		layout: {
+			primaryField: 'title',
+			mediaField: 'featured_media',
+		},
+	},
+};
 
-const DEFAULT_PAGE_BASE = {
-	type: LAYOUT_TABLE,
+const DEFAULT_POST_BASE = {
+	type: LAYOUT_LIST,
 	search: '',
 	filters: [],
 	page: 1,
@@ -19,41 +61,108 @@ const DEFAULT_PAGE_BASE = {
 		field: 'date',
 		direction: 'desc',
 	},
-	// All fields are visible by default, so it's
-	// better to keep track of the hidden ones.
-	hiddenFields: [ 'date', 'featured-image' ],
-	layout: {},
+	fields: [ 'title', 'author', 'status' ],
+	layout: defaultLayouts[ LAYOUT_LIST ].layout,
 };
 
-const DEFAULT_VIEWS = {
-	page: [
-		{
-			title: __( 'All' ),
-			slug: 'all',
-			view: DEFAULT_PAGE_BASE,
+export function useDefaultViews( { postType } ) {
+	const labels = useSelect(
+		( select ) => {
+			const { getPostType } = select( coreStore );
+			return getPostType( postType )?.labels;
 		},
-		{
-			title: __( 'Drafts' ),
-			slug: 'drafts',
-			view: {
-				...DEFAULT_PAGE_BASE,
+		[ postType ]
+	);
+	return useMemo( () => {
+		return [
+			{
+				title: labels?.all_items || __( 'All items' ),
+				slug: 'all',
+				icon: pages,
+				view: DEFAULT_POST_BASE,
+			},
+			{
+				title: __( 'Published' ),
+				slug: 'published',
+				icon: published,
+				view: DEFAULT_POST_BASE,
 				filters: [
-					{ field: 'status', operator: OPERATOR_IN, value: 'draft' },
+					{
+						field: 'status',
+						operator: OPERATOR_IS_ANY,
+						value: 'publish',
+					},
 				],
 			},
-		},
-		{
-			title: __( 'Trash' ),
-			slug: 'trash',
-			icon: trash,
-			view: {
-				...DEFAULT_PAGE_BASE,
+			{
+				title: __( 'Scheduled' ),
+				slug: 'future',
+				icon: scheduled,
+				view: DEFAULT_POST_BASE,
 				filters: [
-					{ field: 'status', operator: OPERATOR_IN, value: 'trash' },
+					{
+						field: 'status',
+						operator: OPERATOR_IS_ANY,
+						value: 'future',
+					},
 				],
 			},
-		},
-	],
-};
-
-export default DEFAULT_VIEWS;
+			{
+				title: __( 'Drafts' ),
+				slug: 'drafts',
+				icon: drafts,
+				view: DEFAULT_POST_BASE,
+				filters: [
+					{
+						field: 'status',
+						operator: OPERATOR_IS_ANY,
+						value: 'draft',
+					},
+				],
+			},
+			{
+				title: __( 'Pending' ),
+				slug: 'pending',
+				icon: pending,
+				view: DEFAULT_POST_BASE,
+				filters: [
+					{
+						field: 'status',
+						operator: OPERATOR_IS_ANY,
+						value: 'pending',
+					},
+				],
+			},
+			{
+				title: __( 'Private' ),
+				slug: 'private',
+				icon: notAllowed,
+				view: DEFAULT_POST_BASE,
+				filters: [
+					{
+						field: 'status',
+						operator: OPERATOR_IS_ANY,
+						value: 'private',
+					},
+				],
+			},
+			{
+				title: __( 'Trash' ),
+				slug: 'trash',
+				icon: trash,
+				view: {
+					...DEFAULT_POST_BASE,
+					type: LAYOUT_TABLE,
+					layout: defaultLayouts[ LAYOUT_TABLE ].layout,
+				},
+				filters: [
+					{
+						field: 'status',
+						operator: OPERATOR_IS_ANY,
+						value: 'trash',
+					},
+				],
+			},
+		];
+	}, [ labels ] );
+}
diff --git a/packages/edit-site/src/components/sidebar-dataviews/index.js b/packages/edit-site/src/components/sidebar-dataviews/index.js
index 9e4534ab342745..86420c4eec1d1f 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/index.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/index.js
@@ -2,35 +2,32 @@
  * WordPress dependencies
  */
 import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
-
 import { privateApis as routerPrivateApis } from '@wordpress/router';
+
 /**
  * Internal dependencies
  */
-
-import { default as DEFAULT_VIEWS } from './default-views';
+import { useDefaultViews } from './default-views';
 import { unlock } from '../../lock-unlock';
-const { useLocation } = unlock( routerPrivateApis );
 import DataViewItem from './dataview-item';
 import CustomDataViewsList from './custom-dataviews-list';
 
-const PATH_TO_TYPE = {
-	'/pages': 'page',
-};
+const { useLocation } = unlock( routerPrivateApis );
 
 export default function DataViewsSidebarContent() {
 	const {
-		params: { path, activeView = 'all', isCustom = 'false' },
+		params: { postType, activeView = 'all', isCustom = 'false' },
 	} = useLocation();
-	if ( ! path || ! PATH_TO_TYPE[ path ] ) {
+	const defaultViews = useDefaultViews( { postType } );
+	if ( ! postType ) {
 		return null;
 	}
-	const type = PATH_TO_TYPE[ path ];
+	const isCustomBoolean = isCustom === 'true';
 
 	return (
 		<>
 			<ItemGroup>
-				{ DEFAULT_VIEWS[ type ].map( ( dataview ) => {
+				{ defaultViews.map( ( dataview ) => {
 					return (
 						<DataViewItem
 							key={ dataview.slug }
@@ -39,19 +36,21 @@ export default function DataViewsSidebarContent() {
 							icon={ dataview.icon }
 							type={ dataview.view.type }
 							isActive={
-								isCustom === 'false' &&
+								! isCustomBoolean &&
 								dataview.slug === activeView
 							}
-							isCustom="false"
+							isCustom={ false }
 						/>
 					);
 				} ) }
 			</ItemGroup>
-			<CustomDataViewsList
-				activeView={ activeView }
-				type={ type }
-				isCustom="true"
-			/>
+			{ window?.__experimentalCustomViews && (
+				<CustomDataViewsList
+					activeView={ activeView }
+					type={ postType }
+					isCustom
+				/>
+			) }
 		</>
 	);
 }
diff --git a/packages/edit-site/src/components/sidebar-dataviews/style.scss b/packages/edit-site/src/components/sidebar-dataviews/style.scss
index 9c5b8f48e944f2..14e6bf1d03fca8 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/style.scss
+++ b/packages/edit-site/src/components/sidebar-dataviews/style.scss
@@ -8,7 +8,7 @@
 }
 
 .edit-site-sidebar-dataviews-dataview-item {
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	padding-right: $grid-unit-10;
 
 	.edit-site-sidebar-dataviews-dataview-item__dropdown-menu {
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/constants.js b/packages/edit-site/src/components/sidebar-edit-mode/constants.js
deleted file mode 100644
index 6322eaeb1258a8..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/constants.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const SIDEBAR_TEMPLATE = 'edit-site/template';
-export const SIDEBAR_BLOCK = 'edit-site/block-inspector';
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/default-sidebar.js b/packages/edit-site/src/components/sidebar-edit-mode/default-sidebar.js
deleted file mode 100644
index 48a59935bf17c2..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/default-sidebar.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	ComplementaryArea,
-	ComplementaryAreaMoreMenuItem,
-} from '@wordpress/interface';
-import { useSelect } from '@wordpress/data';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-export default function DefaultSidebar( {
-	className,
-	identifier,
-	title,
-	icon,
-	children,
-	closeLabel,
-	header,
-	headerClassName,
-	panelClassName,
-} ) {
-	const showIconLabels = useSelect(
-		( select ) =>
-			!! select( preferencesStore ).get(
-				'core/edit-site',
-				'showIconLabels'
-			),
-		[]
-	);
-
-	return (
-		<>
-			<ComplementaryArea
-				className={ className }
-				scope="core/edit-site"
-				identifier={ identifier }
-				title={ title }
-				smallScreenTitle={ title }
-				icon={ icon }
-				closeLabel={ closeLabel }
-				header={ header }
-				headerClassName={ headerClassName }
-				panelClassName={ panelClassName }
-				showIconLabels={ showIconLabels }
-			>
-				{ children }
-			</ComplementaryArea>
-			<ComplementaryAreaMoreMenuItem
-				scope="core/edit-site"
-				identifier={ identifier }
-				icon={ icon }
-			>
-				{ title }
-			</ComplementaryAreaMoreMenuItem>
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/global-styles-sidebar.js b/packages/edit-site/src/components/sidebar-edit-mode/global-styles-sidebar.js
deleted file mode 100644
index a3be71723e8730..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/global-styles-sidebar.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { FlexItem, FlexBlock, Flex, Button } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { styles, seen } from '@wordpress/icons';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useEffect } from '@wordpress/element';
-import { store as interfaceStore } from '@wordpress/interface';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-/**
- * Internal dependencies
- */
-import DefaultSidebar from './default-sidebar';
-import { GlobalStylesUI } from '../global-styles';
-import { store as editSiteStore } from '../../store';
-import { GlobalStylesMenuSlot } from '../global-styles/ui';
-import { unlock } from '../../lock-unlock';
-
-export default function GlobalStylesSidebar() {
-	const {
-		shouldClearCanvasContainerView,
-		isStyleBookOpened,
-		showListViewByDefault,
-	} = useSelect( ( select ) => {
-		const { getActiveComplementaryArea } = select( interfaceStore );
-		const { getEditorCanvasContainerView, getCanvasMode } = unlock(
-			select( editSiteStore )
-		);
-		const _isVisualEditorMode =
-			'visual' === select( editSiteStore ).getEditorMode();
-		const _isEditCanvasMode = 'edit' === getCanvasMode();
-		const _showListViewByDefault = select( preferencesStore ).get(
-			'core/edit-site',
-			'showListViewByDefault'
-		);
-
-		return {
-			isStyleBookOpened: 'style-book' === getEditorCanvasContainerView(),
-			shouldClearCanvasContainerView:
-				'edit-site/global-styles' !==
-					getActiveComplementaryArea( 'core/edit-site' ) ||
-				! _isVisualEditorMode ||
-				! _isEditCanvasMode,
-			showListViewByDefault: _showListViewByDefault,
-		};
-	}, [] );
-	const { setEditorCanvasContainerView } = unlock(
-		useDispatch( editSiteStore )
-	);
-
-	useEffect( () => {
-		if ( shouldClearCanvasContainerView ) {
-			setEditorCanvasContainerView( undefined );
-		}
-	}, [ shouldClearCanvasContainerView ] );
-
-	const { setIsListViewOpened } = useDispatch( editSiteStore );
-
-	return (
-		<DefaultSidebar
-			className="edit-site-global-styles-sidebar"
-			identifier="edit-site/global-styles"
-			title={ __( 'Styles' ) }
-			icon={ styles }
-			closeLabel={ __( 'Close Styles' ) }
-			panelClassName="edit-site-global-styles-sidebar__panel"
-			header={
-				<Flex
-					className="edit-site-global-styles-sidebar__header"
-					role="menubar"
-					aria-label={ __( 'Styles actions' ) }
-				>
-					<FlexBlock style={ { minWidth: 'min-content' } }>
-						<strong>{ __( 'Styles' ) }</strong>
-					</FlexBlock>
-					<FlexItem>
-						<Button
-							icon={ seen }
-							label={ __( 'Style Book' ) }
-							isPressed={ isStyleBookOpened }
-							disabled={ shouldClearCanvasContainerView }
-							onClick={ () => {
-								setIsListViewOpened(
-									isStyleBookOpened && showListViewByDefault
-								);
-								setEditorCanvasContainerView(
-									isStyleBookOpened ? undefined : 'style-book'
-								);
-							} }
-						/>
-					</FlexItem>
-					<GlobalStylesMenuSlot />
-				</Flex>
-			}
-		>
-			<GlobalStylesUI />
-		</DefaultSidebar>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/index.js b/packages/edit-site/src/components/sidebar-edit-mode/index.js
deleted file mode 100644
index b7683f242a6198..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/index.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createSlotFill } from '@wordpress/components';
-import { isRTL, __ } from '@wordpress/i18n';
-import { drawerLeft, drawerRight } from '@wordpress/icons';
-import { useEffect } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as interfaceStore } from '@wordpress/interface';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import DefaultSidebar from './default-sidebar';
-import GlobalStylesSidebar from './global-styles-sidebar';
-import { STORE_NAME } from '../../store/constants';
-import SettingsHeader from './settings-header';
-import PagePanels from './page-panels';
-import TemplatePanel from './template-panel';
-import PluginTemplateSettingPanel from '../plugin-template-setting-panel';
-import { SIDEBAR_BLOCK, SIDEBAR_TEMPLATE } from './constants';
-import { store as editSiteStore } from '../../store';
-
-const { Slot: InspectorSlot, Fill: InspectorFill } = createSlotFill(
-	'EditSiteSidebarInspector'
-);
-export const SidebarInspectorFill = InspectorFill;
-
-export function SidebarComplementaryAreaFills() {
-	const {
-		sidebar,
-		isEditorSidebarOpened,
-		hasBlockSelection,
-		supportsGlobalStyles,
-		isEditingPage,
-	} = useSelect( ( select ) => {
-		const _sidebar =
-			select( interfaceStore ).getActiveComplementaryArea( STORE_NAME );
-		const _isEditorSidebarOpened = [
-			SIDEBAR_BLOCK,
-			SIDEBAR_TEMPLATE,
-		].includes( _sidebar );
-		const settings = select( editSiteStore ).getSettings();
-		return {
-			sidebar: _sidebar,
-			isEditorSidebarOpened: _isEditorSidebarOpened,
-			hasBlockSelection:
-				!! select( blockEditorStore ).getBlockSelectionStart(),
-			supportsGlobalStyles: ! settings?.supportsTemplatePartsMode,
-			isEditingPage:
-				select( editSiteStore ).isPage() &&
-				select( editorStore ).getRenderingMode() !== 'template-only',
-		};
-	}, [] );
-	const { enableComplementaryArea } = useDispatch( interfaceStore );
-
-	useEffect( () => {
-		// Don't automatically switch tab when the sidebar is closed or when we
-		// are focused on page content.
-		if ( ! isEditorSidebarOpened ) {
-			return;
-		}
-		if ( hasBlockSelection ) {
-			if ( ! isEditingPage ) {
-				enableComplementaryArea( STORE_NAME, SIDEBAR_BLOCK );
-			}
-		} else {
-			enableComplementaryArea( STORE_NAME, SIDEBAR_TEMPLATE );
-		}
-	}, [
-		hasBlockSelection,
-		isEditorSidebarOpened,
-		isEditingPage,
-		enableComplementaryArea,
-	] );
-
-	let sidebarName = sidebar;
-	if ( ! isEditorSidebarOpened ) {
-		sidebarName = hasBlockSelection ? SIDEBAR_BLOCK : SIDEBAR_TEMPLATE;
-	}
-
-	return (
-		<>
-			<DefaultSidebar
-				identifier={ sidebarName }
-				title={ __( 'Settings' ) }
-				icon={ isRTL() ? drawerLeft : drawerRight }
-				closeLabel={ __( 'Close Settings' ) }
-				header={ <SettingsHeader sidebarName={ sidebarName } /> }
-				headerClassName="edit-site-sidebar-edit-mode__panel-tabs"
-			>
-				{ sidebarName === SIDEBAR_TEMPLATE && (
-					<>
-						{ isEditingPage ? <PagePanels /> : <TemplatePanel /> }
-						<PluginTemplateSettingPanel.Slot />
-					</>
-				) }
-				{ sidebarName === SIDEBAR_BLOCK && (
-					<InspectorSlot bubblesVirtually />
-				) }
-			</DefaultSidebar>
-			{ supportsGlobalStyles && <GlobalStylesSidebar /> }
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/edit-template.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/edit-template.js
deleted file mode 100644
index a11d119e1cecb7..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/edit-template.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { DropdownMenu, MenuGroup, MenuItem } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { store as coreStore } from '@wordpress/core-data';
-import { check } from '@wordpress/icons';
-import {
-	privateApis as editorPrivateApis,
-	store as editorStore,
-} from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../../store';
-import SwapTemplateButton from './swap-template-button';
-import ResetDefaultTemplate from './reset-default-template';
-import { unlock } from '../../../lock-unlock';
-
-const { PostPanelRow } = unlock( editorPrivateApis );
-
-const POPOVER_PROPS = {
-	className: 'edit-site-page-panels-edit-template__dropdown',
-	placement: 'bottom-start',
-};
-
-export default function EditTemplate() {
-	const { hasResolved, template, isTemplateHidden } = useSelect(
-		( select ) => {
-			const { getEditedPostContext, getEditedPostType, getEditedPostId } =
-				select( editSiteStore );
-			const { getRenderingMode } = unlock( select( editorStore ) );
-			const { getEditedEntityRecord, hasFinishedResolution } =
-				select( coreStore );
-			const _context = getEditedPostContext();
-			const _postType = getEditedPostType();
-			const queryArgs = [ 'postType', _postType, getEditedPostId() ];
-			return {
-				context: _context,
-				hasResolved: hasFinishedResolution(
-					'getEditedEntityRecord',
-					queryArgs
-				),
-				template: getEditedEntityRecord( ...queryArgs ),
-				isTemplateHidden: getRenderingMode() === 'post-only',
-				postType: _postType,
-			};
-		},
-		[]
-	);
-
-	const { setRenderingMode } = useDispatch( editorStore );
-
-	if ( ! hasResolved ) {
-		return null;
-	}
-
-	return (
-		<PostPanelRow label={ __( 'Template' ) }>
-			<DropdownMenu
-				popoverProps={ POPOVER_PROPS }
-				focusOnMount
-				toggleProps={ {
-					variant: 'tertiary',
-					className: 'edit-site-summary-field__trigger',
-				} }
-				label={ __( 'Template options' ) }
-				text={ decodeEntities( template.title ) }
-				icon={ null }
-			>
-				{ ( { onClose } ) => (
-					<>
-						<MenuGroup>
-							<MenuItem
-								onClick={ () => {
-									setRenderingMode( 'template-only' );
-									onClose();
-								} }
-							>
-								{ __( 'Edit template' ) }
-							</MenuItem>
-							<SwapTemplateButton onClick={ onClose } />
-						</MenuGroup>
-						<ResetDefaultTemplate onClick={ onClose } />
-						<MenuGroup>
-							<MenuItem
-								icon={ ! isTemplateHidden ? check : undefined }
-								isPressed={ ! isTemplateHidden }
-								onClick={ () => {
-									setRenderingMode(
-										isTemplateHidden
-											? 'template-locked'
-											: 'post-only'
-									);
-								} }
-							>
-								{ __( 'Template preview' ) }
-							</MenuItem>
-						</MenuGroup>
-					</>
-				) }
-			</DropdownMenu>
-		</PostPanelRow>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/hooks.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/hooks.js
deleted file mode 100644
index 1071479b2f9f22..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/hooks.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { useMemo } from '@wordpress/element';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../../store';
-import { TEMPLATE_POST_TYPE } from '../../../utils/constants';
-
-export function useEditedPostContext() {
-	return useSelect(
-		( select ) => select( editSiteStore ).getEditedPostContext(),
-		[]
-	);
-}
-
-export function useAllowSwitchingTemplates() {
-	const { postId } = useEditedPostContext();
-	return useSelect(
-		( select ) => {
-			const { getEntityRecord, getEntityRecords } = select( coreStore );
-			const siteSettings = getEntityRecord( 'root', 'site' );
-			const templates = getEntityRecords(
-				'postType',
-				TEMPLATE_POST_TYPE,
-				{ per_page: -1 }
-			);
-			const isPostsPage = +postId === siteSettings?.page_for_posts;
-			// If current page is set front page or posts page, we also need
-			// to check if the current theme has a template for it. If not
-			const isFrontPage =
-				+postId === siteSettings?.page_on_front &&
-				templates?.some( ( { slug } ) => slug === 'front-page' );
-			return ! isPostsPage && ! isFrontPage;
-		},
-		[ postId ]
-	);
-}
-
-function useTemplates() {
-	return useSelect(
-		( select ) =>
-			select( coreStore ).getEntityRecords(
-				'postType',
-				TEMPLATE_POST_TYPE,
-				{
-					per_page: -1,
-					post_type: 'page',
-				}
-			),
-		[]
-	);
-}
-
-export function useAvailableTemplates() {
-	const currentTemplateSlug = useCurrentTemplateSlug();
-	const allowSwitchingTemplate = useAllowSwitchingTemplates();
-	const templates = useTemplates();
-	return useMemo(
-		() =>
-			allowSwitchingTemplate &&
-			templates?.filter(
-				( template ) =>
-					template.is_custom &&
-					template.slug !== currentTemplateSlug &&
-					!! template.content.raw // Skip empty templates.
-			),
-		[ templates, currentTemplateSlug, allowSwitchingTemplate ]
-	);
-}
-
-export function useCurrentTemplateSlug() {
-	const { postType, postId } = useEditedPostContext();
-	const templates = useTemplates();
-	const entityTemplate = useSelect(
-		( select ) => {
-			const post = select( coreStore ).getEditedEntityRecord(
-				'postType',
-				postType,
-				postId
-			);
-			return post?.template;
-		},
-		[ postType, postId ]
-	);
-
-	if ( ! entityTemplate ) {
-		return;
-	}
-	// If a page has a `template` set and is not included in the list
-	// of the theme's templates, do not return it, in order to resolve
-	// to the current theme's default template.
-	return templates?.find( ( template ) => template.slug === entityTemplate )
-		?.slug;
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/index.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/index.js
deleted file mode 100644
index bbf4b55c052874..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/index.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	PanelBody,
-	__experimentalText as Text,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { page as pageIcon } from '@wordpress/icons';
-import { __, sprintf } from '@wordpress/i18n';
-import { humanTimeDiff } from '@wordpress/date';
-import { useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../../store';
-import SidebarCard from '../sidebar-card';
-import PageContent from './page-content';
-import PageSummary from './page-summary';
-
-export default function PagePanels() {
-	const {
-		id,
-		type,
-		hasResolved,
-		status,
-		date,
-		password,
-		title,
-		modified,
-		renderingMode,
-	} = useSelect( ( select ) => {
-		const { getEditedPostContext } = select( editSiteStore );
-		const { getEditedEntityRecord, hasFinishedResolution } =
-			select( coreStore );
-		const { getRenderingMode } = select( editorStore );
-		const context = getEditedPostContext();
-		const queryArgs = [ 'postType', context.postType, context.postId ];
-		const page = getEditedEntityRecord( ...queryArgs );
-		return {
-			hasResolved: hasFinishedResolution(
-				'getEditedEntityRecord',
-				queryArgs
-			),
-			title: page?.title,
-			id: page?.id,
-			type: page?.type,
-			status: page?.status,
-			date: page?.date,
-			password: page?.password,
-			modified: page?.modified,
-			renderingMode: getRenderingMode(),
-		};
-	}, [] );
-
-	if ( ! hasResolved ) {
-		return null;
-	}
-
-	return (
-		<>
-			<PanelBody>
-				<SidebarCard
-					title={ decodeEntities( title ) }
-					icon={ pageIcon }
-					description={
-						<VStack>
-							<Text>
-								{ sprintf(
-									// translators: %s: Human-readable time difference, e.g. "2 days ago".
-									__( 'Last edited %s' ),
-									humanTimeDiff( modified )
-								) }
-							</Text>
-						</VStack>
-					}
-				/>
-			</PanelBody>
-			<PanelBody title={ __( 'Summary' ) }>
-				<PageSummary
-					status={ status }
-					date={ date }
-					password={ password }
-					postId={ id }
-					postType={ type }
-				/>
-			</PanelBody>
-			{ renderingMode !== 'post-only' && (
-				<PanelBody title={ __( 'Content' ) }>
-					<PageContent />
-				</PanelBody>
-			) }
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-content.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-content.js
deleted file mode 100644
index dd40bcaef9f707..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-content.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import {
-	store as blockEditorStore,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import { useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../../lock-unlock';
-
-const { BlockQuickNavigation } = unlock( blockEditorPrivateApis );
-
-export default function PageContent() {
-	const clientIdsTree = useSelect(
-		( select ) =>
-			unlock( select( blockEditorStore ) ).getEnabledClientIdsTree(),
-		[]
-	);
-	const clientIds = useMemo(
-		() => clientIdsTree.map( ( { clientId } ) => clientId ),
-		[ clientIdsTree ]
-	);
-	return <BlockQuickNavigation clientIds={ clientIds } />;
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-status.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-status.js
deleted file mode 100644
index 1d74b09db773e6..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-status.js
+++ /dev/null
@@ -1,249 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	Button,
-	ToggleControl,
-	Dropdown,
-	__experimentalText as Text,
-	__experimentalVStack as VStack,
-	TextControl,
-	RadioControl,
-	VisuallyHidden,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useDispatch } from '@wordpress/data';
-import { useState, useMemo } from '@wordpress/element';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as noticesStore } from '@wordpress/notices';
-import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
-import { useInstanceId } from '@wordpress/compose';
-import { privateApis as editorPrivateApis } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import StatusLabel from '../../sidebar-navigation-screen-page/status-label';
-import { unlock } from '../../../lock-unlock';
-
-const { PostPanelRow } = unlock( editorPrivateApis );
-
-const STATUS_OPTIONS = [
-	{
-		label: (
-			<>
-				{ __( 'Draft' ) }
-				<Text variant="muted">{ __( 'Not ready to publish.' ) }</Text>
-			</>
-		),
-		value: 'draft',
-	},
-	{
-		label: (
-			<>
-				{ __( 'Pending' ) }
-				<Text variant="muted">
-					{ __( 'Waiting for review before publishing.' ) }
-				</Text>
-			</>
-		),
-		value: 'pending',
-	},
-	{
-		label: (
-			<>
-				{ __( 'Private' ) }
-				<Text variant="muted">
-					{ __( 'Only visible to site admins and editors.' ) }
-				</Text>
-			</>
-		),
-		value: 'private',
-	},
-	{
-		label: (
-			<>
-				{ __( 'Scheduled' ) }
-				<Text variant="muted">
-					{ __( 'Publish automatically on a chosen date.' ) }
-				</Text>
-			</>
-		),
-		value: 'future',
-	},
-	{
-		label: (
-			<>
-				{ __( 'Published' ) }
-				<Text variant="muted">{ __( 'Visible to everyone.' ) }</Text>
-			</>
-		),
-		value: 'publish',
-	},
-];
-
-export default function PageStatus( {
-	postType,
-	postId,
-	status,
-	password,
-	date,
-} ) {
-	const [ showPassword, setShowPassword ] = useState( !! password );
-	const instanceId = useInstanceId( PageStatus );
-
-	const { editEntityRecord } = useDispatch( coreStore );
-	const { createErrorNotice } = useDispatch( noticesStore );
-
-	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
-	// Memoize popoverProps to avoid returning a new object every time.
-	const popoverProps = useMemo(
-		() => ( {
-			// Anchor the popover to the middle of the entire row so that it doesn't
-			// move around when the label changes.
-			anchor: popoverAnchor,
-			'aria-label': __( 'Change status' ),
-			placement: 'bottom-end',
-		} ),
-		[ popoverAnchor ]
-	);
-
-	const saveStatus = async ( {
-		status: newStatus = status,
-		password: newPassword = password,
-		date: newDate = date,
-	} ) => {
-		try {
-			await editEntityRecord( 'postType', postType, postId, {
-				status: newStatus,
-				date: newDate,
-				password: newPassword,
-			} );
-		} catch ( error ) {
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: __( 'An error occurred while updating the status' );
-
-			createErrorNotice( errorMessage, {
-				type: 'snackbar',
-			} );
-		}
-	};
-
-	const handleTogglePassword = ( value ) => {
-		setShowPassword( value );
-		if ( ! value ) {
-			saveStatus( { password: '' } );
-		}
-	};
-
-	const handleStatus = ( value ) => {
-		let newDate = date;
-		let newPassword = password;
-		if ( value === 'publish' ) {
-			if ( new Date( date ) > new Date() ) {
-				newDate = null;
-			}
-		} else if ( value === 'future' ) {
-			if ( ! date || new Date( date ) < new Date() ) {
-				newDate = new Date();
-				newDate.setDate( newDate.getDate() + 7 );
-			}
-		} else if ( value === 'private' && password ) {
-			setShowPassword( false );
-			newPassword = '';
-		}
-		saveStatus( {
-			status: value,
-			date: newDate,
-			password: newPassword,
-		} );
-	};
-
-	return (
-		<PostPanelRow label={ __( 'Status' ) }>
-			<Dropdown
-				contentClassName="edit-site-change-status__content"
-				popoverProps={ popoverProps }
-				focusOnMount
-				ref={ setPopoverAnchor }
-				renderToggle={ ( { onToggle } ) => (
-					<Button
-						className="edit-site-summary-field__trigger"
-						variant="tertiary"
-						onClick={ onToggle }
-					>
-						<StatusLabel
-							status={ password ? 'protected' : status }
-						/>
-					</Button>
-				) }
-				renderContent={ ( { onClose } ) => (
-					<>
-						<InspectorPopoverHeader
-							title={ __( 'Status' ) }
-							onClose={ onClose }
-						/>
-						<form>
-							<VStack spacing={ 5 }>
-								<RadioControl
-									className="edit-site-change-status__options"
-									hideLabelFromVision
-									label={ __( 'Status' ) }
-									options={ STATUS_OPTIONS }
-									onChange={ handleStatus }
-									selected={ status }
-								/>
-								{ status !== 'private' && (
-									<fieldset className="edit-site-change-status__password-fieldset">
-										<Text
-											as="legend"
-											className="edit-site-change-status__password-legend"
-											size="11"
-											lineHeight={ 1.4 }
-											weight={ 500 }
-											upperCase={ true }
-										>
-											{ __( 'Password' ) }
-										</Text>
-										<ToggleControl
-											label={ __(
-												'Hide this page behind a password'
-											) }
-											checked={ showPassword }
-											onChange={ handleTogglePassword }
-										/>
-										{ showPassword && (
-											<div className="edit-site-change-status__password-input">
-												<VisuallyHidden
-													as="label"
-													htmlFor={ `edit-site-change-status__password-input-${ instanceId }` }
-												>
-													{ __( 'Create password' ) }
-												</VisuallyHidden>
-												<TextControl
-													onChange={ ( value ) =>
-														saveStatus( {
-															password: value,
-														} )
-													}
-													value={ password }
-													placeholder={ __(
-														'Use a secure password'
-													) }
-													type="text"
-													id={ `edit-site-change-status__password-input-${ instanceId }` }
-												/>
-											</div>
-										) }
-									</fieldset>
-								) }
-							</VStack>
-						</form>
-					</>
-				) }
-			/>
-		</PostPanelRow>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-summary.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-summary.js
deleted file mode 100644
index 0219b568e57c50..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-summary.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __experimentalVStack as VStack } from '@wordpress/components';
-import {
-	PostAuthorPanel,
-	PostURLPanel,
-	PostSchedulePanel,
-} from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import PageStatus from './page-status';
-import EditTemplate from './edit-template';
-
-export default function PageSummary( {
-	status,
-	date,
-	password,
-	postId,
-	postType,
-} ) {
-	return (
-		<VStack spacing={ 0 }>
-			<PageStatus
-				status={ status }
-				date={ date }
-				password={ password }
-				postId={ postId }
-				postType={ postType }
-			/>
-			<PostSchedulePanel />
-			<EditTemplate />
-			<PostURLPanel />
-			<PostAuthorPanel />
-		</VStack>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/reset-default-template.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/reset-default-template.js
deleted file mode 100644
index 795477cc8fc7c6..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/reset-default-template.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { MenuGroup, MenuItem } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useDispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import {
-	useAllowSwitchingTemplates,
-	useCurrentTemplateSlug,
-	useEditedPostContext,
-} from './hooks';
-
-export default function ResetDefaultTemplate( { onClick } ) {
-	const currentTemplateSlug = useCurrentTemplateSlug();
-	const allowSwitchingTemplate = useAllowSwitchingTemplates();
-	const { postType, postId } = useEditedPostContext();
-	const { editEntityRecord } = useDispatch( coreStore );
-	// The default template in a post is indicated by an empty string.
-	if ( ! currentTemplateSlug || ! allowSwitchingTemplate ) {
-		return null;
-	}
-	return (
-		<MenuGroup>
-			<MenuItem
-				onClick={ async () => {
-					editEntityRecord(
-						'postType',
-						postType,
-						postId,
-						{ template: '' },
-						{ undoIgnore: true }
-					);
-					onClick();
-				} }
-			>
-				{ __( 'Use default template' ) }
-			</MenuItem>
-		</MenuGroup>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/style.scss b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/style.scss
deleted file mode 100644
index f3da54c244bd1b..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/style.scss
+++ /dev/null
@@ -1,82 +0,0 @@
-.edit-site-swap-template-modal {
-	z-index: z-index(".edit-site-swap-template-modal");
-}
-
-.edit-site-page-panels__swap-template__confirm-modal__actions {
-	margin-top: $grid-unit-30;
-}
-
-.edit-site-page-panels__swap-template__modal-content .block-editor-block-patterns-list {
-	column-count: 2;
-	column-gap: $grid-unit-30;
-
-	// Small top padding required to avoid cutting off the visible outline when hovering items
-	padding-top: $border-width-focus-fallback;
-
-	@include break-medium() {
-		column-count: 3;
-	}
-
-	@include break-wide() {
-		column-count: 4;
-	}
-
-	.block-editor-block-patterns-list__list-item {
-		break-inside: avoid-column;
-	}
-
-	.block-editor-block-patterns-list__item {
-		// Avoid to override the BlockPatternList component
-		// default hover and focus styles.
-		&:not(:focus):not(:hover) .block-editor-block-preview__container {
-			box-shadow: 0 0 0 1px $gray-300;
-		}
-	}
-}
-
-.edit-site-change-status__content {
-	.components-popover__content {
-		min-width: 320px;
-		padding: $grid-unit-20;
-	}
-
-	.edit-site-change-status__options {
-		.components-base-control__field > .components-v-stack {
-			gap: $grid-unit-10;
-		}
-
-		label {
-			.components-text {
-				display: block;
-				margin-left: $radio-input-size + 6;
-			}
-		}
-	}
-
-	.edit-site-change-status__password-legend {
-		padding: 0;
-		margin-bottom: $grid-unit-10;
-	}
-}
-
-.edit-site-summary-field__trigger {
-	max-width: 100%;
-
-	// Truncate
-	display: block;
-	text-align: left;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.edit-site-page-panels-edit-template__dropdown {
-	.components-popover__content {
-		min-width: 240px;
-	}
-	.components-button.is-pressed,
-	.components-button.is-pressed:hover {
-		background: inherit;
-		color: inherit;
-	}
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/plugin-sidebar/index.js b/packages/edit-site/src/components/sidebar-edit-mode/plugin-sidebar/index.js
deleted file mode 100644
index 45a3f6d48d0b98..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/plugin-sidebar/index.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { ComplementaryArea } from '@wordpress/interface';
-import { useSelect } from '@wordpress/data';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-/**
- * Renders a sidebar when activated. The contents within the `PluginSidebar` will appear as content within the sidebar.
- * It also automatically renders a corresponding `PluginSidebarMenuItem` component when `isPinnable` flag is set to `true`.
- * If you wish to display the sidebar, you can with use the `PluginSidebarMoreMenuItem` component or the `wp.data.dispatch` API:
- *
- * ```js
- * wp.data.dispatch( 'core/edit-site' ).openGeneralSidebar( 'plugin-name/sidebar-name' );
- * ```
- *
- * @see PluginSidebarMoreMenuItem
- *
- * @param {Object}                props                                 Element props.
- * @param {string}                props.name                            A string identifying the sidebar. Must be unique for every sidebar registered within the scope of your plugin.
- * @param {string}                [props.className]                     An optional class name added to the sidebar body.
- * @param {string}                props.title                           Title displayed at the top of the sidebar.
- * @param {boolean}               [props.isPinnable=true]               Whether to allow to pin sidebar to the toolbar. When set to `true` it also automatically renders a corresponding menu item.
- * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
- *
- * @example
- * ```js
- * // Using ES5 syntax
- * var __ = wp.i18n.__;
- * var el = wp.element.createElement;
- * var PanelBody = wp.components.PanelBody;
- * var PluginSidebar = wp.editSite.PluginSidebar;
- * var moreIcon = wp.element.createElement( 'svg' ); //... svg element.
- *
- * function MyPluginSidebar() {
- * 	return el(
- * 			PluginSidebar,
- * 			{
- * 				name: 'my-sidebar',
- * 				title: 'My sidebar title',
- * 				icon: moreIcon,
- * 			},
- * 			el(
- * 				PanelBody,
- * 				{},
- * 				__( 'My sidebar content' )
- * 			)
- * 	);
- * }
- * ```
- *
- * @example
- * ```jsx
- * // Using ESNext syntax
- * import { __ } from '@wordpress/i18n';
- * import { PanelBody } from '@wordpress/components';
- * import { PluginSidebar } from '@wordpress/edit-site';
- * import { more } from '@wordpress/icons';
- *
- * const MyPluginSidebar = () => (
- * 	<PluginSidebar
- * 		name="my-sidebar"
- * 		title="My sidebar title"
- * 		icon={ more }
- * 	>
- * 		<PanelBody>
- * 			{ __( 'My sidebar content' ) }
- * 		</PanelBody>
- * 	</PluginSidebar>
- * );
- * ```
- */
-export default function PluginSidebarEditSite( { className, ...props } ) {
-	const showIconLabels = useSelect(
-		( select ) =>
-			!! select( preferencesStore ).get(
-				'core/edit-site',
-				'showIconLabels'
-			),
-		[]
-	);
-
-	return (
-		<ComplementaryArea
-			panelClassName={ className }
-			className="edit-site-sidebar-edit-mode"
-			scope="core/edit-site"
-			showIconLabels={ showIconLabels }
-			{ ...props }
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/settings-header/index.js b/packages/edit-site/src/components/sidebar-edit-mode/settings-header/index.js
deleted file mode 100644
index c8ceb089cf0f5d..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/settings-header/index.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { Button } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as interfaceStore } from '@wordpress/interface';
-import { store as editorStore } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import { STORE_NAME } from '../../../store/constants';
-import { SIDEBAR_BLOCK, SIDEBAR_TEMPLATE } from '../constants';
-import { store as editSiteStore } from '../../../store';
-import { POST_TYPE_LABELS, TEMPLATE_POST_TYPE } from '../../../utils/constants';
-
-const SettingsHeader = ( { sidebarName } ) => {
-	const { isEditingPage, entityType } = useSelect( ( select ) => {
-		const { getEditedPostType, isPage } = select( editSiteStore );
-		const { getRenderingMode } = select( editorStore );
-
-		return {
-			isEditingPage: isPage() && getRenderingMode() !== 'template-only',
-			entityType: getEditedPostType(),
-		};
-	} );
-
-	const entityLabel =
-		POST_TYPE_LABELS[ entityType ] ||
-		POST_TYPE_LABELS[ TEMPLATE_POST_TYPE ];
-
-	const { enableComplementaryArea } = useDispatch( interfaceStore );
-	const openTemplateSettings = () =>
-		enableComplementaryArea( STORE_NAME, SIDEBAR_TEMPLATE );
-	const openBlockSettings = () =>
-		enableComplementaryArea( STORE_NAME, SIDEBAR_BLOCK );
-
-	let templateAriaLabel;
-	if ( isEditingPage ) {
-		templateAriaLabel =
-			sidebarName === SIDEBAR_TEMPLATE
-				? // translators: ARIA label for the Template sidebar tab, selected.
-				  __( 'Page (selected)' )
-				: // translators: ARIA label for the Template Settings Sidebar tab, not selected.
-				  __( 'Page' );
-	} else {
-		templateAriaLabel =
-			sidebarName === SIDEBAR_TEMPLATE
-				? // translators: ARIA label for the Template sidebar tab, selected.
-				  sprintf( __( '%s (selected)' ), entityLabel )
-				: // translators: ARIA label for the Template Settings Sidebar tab, not selected.
-				  entityLabel;
-	}
-
-	/* Use a list so screen readers will announce how many tabs there are. */
-	return (
-		<ul>
-			<li>
-				<Button
-					onClick={ openTemplateSettings }
-					className={ classnames(
-						'edit-site-sidebar-edit-mode__panel-tab',
-						{
-							'is-active': sidebarName === SIDEBAR_TEMPLATE,
-						}
-					) }
-					aria-label={ templateAriaLabel }
-					data-label={ isEditingPage ? __( 'Page' ) : entityLabel }
-				>
-					{ isEditingPage ? __( 'Page' ) : entityLabel }
-				</Button>
-			</li>
-			<li>
-				<Button
-					onClick={ openBlockSettings }
-					className={ classnames(
-						'edit-site-sidebar-edit-mode__panel-tab',
-						{
-							'is-active': sidebarName === SIDEBAR_BLOCK,
-						}
-					) }
-					aria-label={
-						sidebarName === SIDEBAR_BLOCK
-							? // translators: ARIA label for the Block Settings Sidebar tab, selected.
-							  __( 'Block (selected)' )
-							: // translators: ARIA label for the Block Settings Sidebar tab, not selected.
-							  __( 'Block' )
-					}
-					data-label={ __( 'Block' ) }
-				>
-					{ __( 'Block' ) }
-				</Button>
-			</li>
-		</ul>
-	);
-};
-
-export default SettingsHeader;
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/settings-header/style.scss b/packages/edit-site/src/components/sidebar-edit-mode/settings-header/style.scss
deleted file mode 100644
index 01f074c73fca7a..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/settings-header/style.scss
+++ /dev/null
@@ -1,101 +0,0 @@
-.components-panel__header.edit-site-sidebar-edit-mode__panel-tabs {
-	justify-content: flex-start;
-	padding-left: 0;
-	padding-right: $grid-unit-20;
-	border-top: 0;
-	margin-top: 0;
-
-	ul {
-		display: flex;
-	}
-	li {
-		margin: 0;
-	}
-
-	.components-button.has-icon {
-		display: none;
-		margin: 0 0 0 auto;
-		padding: 0;
-		min-width: $icon-size;
-		height: $icon-size;
-
-		@include break-medium() {
-			display: flex;
-		}
-	}
-}
-
-// This tab style CSS is duplicated verbatim in
-// /packages/components/src/tab-panel/style.scss
-.components-button.edit-site-sidebar-edit-mode__panel-tab {
-	position: relative;
-	border-radius: 0;
-	height: $grid-unit-60;
-	background: transparent;
-	border: none;
-	box-shadow: none;
-	cursor: pointer;
-	padding: 3px $grid-unit-20; // Use padding to offset the is-active border, this benefits Windows High Contrast mode
-	margin-left: 0;
-	font-weight: 500;
-
-	&:focus:not(:disabled) {
-		position: relative;
-		box-shadow: none;
-		outline: none;
-	}
-
-	// Tab indicator
-	&::after {
-		content: "";
-		position: absolute;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		pointer-events: none;
-
-		// Draw the indicator.
-		background: var(--wp-admin-theme-color);
-		height: calc(0 * var(--wp-admin-border-width-focus));
-		border-radius: 0;
-
-		// Animation
-		transition: all 0.1s linear;
-		@include reduce-motion("transition");
-	}
-
-	// Active.
-	&.is-active::after {
-		height: calc(1 * var(--wp-admin-border-width-focus));
-
-		// Windows high contrast mode.
-		outline: 2px solid transparent;
-		outline-offset: -1px;
-	}
-
-	// Focus.
-	&::before {
-		content: "";
-		position: absolute;
-		top: $grid-unit-15;
-		right: $grid-unit-15;
-		bottom: $grid-unit-15;
-		left: $grid-unit-15;
-		pointer-events: none;
-
-		// Draw the indicator.
-		box-shadow: 0 0 0 0 transparent;
-		border-radius: $radius-block-ui;
-
-		// Animation
-		transition: all 0.1s linear;
-		@include reduce-motion("transition");
-	}
-
-	&:focus-visible::before {
-		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-
-		// Windows high contrast mode.
-		outline: 2px solid transparent;
-	}
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/sidebar-card/index.js b/packages/edit-site/src/components/sidebar-edit-mode/sidebar-card/index.js
deleted file mode 100644
index 04e8d5667a2c20..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/sidebar-card/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { Icon } from '@wordpress/components';
-
-export default function SidebarCard( {
-	className,
-	title,
-	icon,
-	description,
-	actions,
-	children,
-} ) {
-	return (
-		<div className={ classnames( 'edit-site-sidebar-card', className ) }>
-			<Icon className="edit-site-sidebar-card__icon" icon={ icon } />
-			<div className="edit-site-sidebar-card__content">
-				<div className="edit-site-sidebar-card__header">
-					<h2 className="edit-site-sidebar-card__title">{ title }</h2>
-					{ actions }
-				</div>
-				<div className="edit-site-sidebar-card__description">
-					{ description }
-				</div>
-				{ children }
-			</div>
-		</div>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/sidebar-card/style.scss b/packages/edit-site/src/components/sidebar-edit-mode/sidebar-card/style.scss
deleted file mode 100644
index 718fe8fb5a0fbd..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/sidebar-card/style.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-.edit-site-sidebar-card {
-	display: flex;
-	align-items: flex-start;
-
-	&__content {
-		flex-grow: 1;
-		margin-bottom: $grid-unit-05;
-	}
-
-	&__title {
-		font-weight: 500;
-		line-height: $icon-size;
-		&.edit-site-sidebar-card__title {
-			margin: 0;
-		}
-	}
-
-	&__description {
-		font-size: $default-font-size;
-	}
-
-	&__icon {
-		flex: 0 0 $icon-size;
-		margin-right: $grid-unit-15;
-		width: $icon-size;
-		height: $icon-size;
-	}
-
-	&__header {
-		display: flex;
-		justify-content: space-between;
-		margin: 0 0 $grid-unit-05;
-	}
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/sidebar-fixed-bottom.js b/packages/edit-site/src/components/sidebar-edit-mode/sidebar-fixed-bottom.js
deleted file mode 100644
index 56e205bd330286..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/sidebar-fixed-bottom.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { privateApis as componentsPrivateApis } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-
-const { createPrivateSlotFill } = unlock( componentsPrivateApis );
-const SIDEBAR_FIXED_BOTTOM_SLOT_FILL_NAME = 'SidebarFixedBottom';
-const { Slot: SidebarFixedBottomSlot, Fill: SidebarFixedBottomFill } =
-	createPrivateSlotFill( SIDEBAR_FIXED_BOTTOM_SLOT_FILL_NAME );
-
-export default function SidebarFixedBottom( { children } ) {
-	return (
-		<SidebarFixedBottomFill>
-			<div className="edit-site-sidebar-fixed-bottom-slot">
-				{ children }
-			</div>
-		</SidebarFixedBottomFill>
-	);
-}
-
-export { SidebarFixedBottomSlot };
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/style.scss b/packages/edit-site/src/components/sidebar-edit-mode/style.scss
deleted file mode 100644
index 544c38e0ef07b1..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/style.scss
+++ /dev/null
@@ -1,111 +0,0 @@
-.edit-site-sidebar-edit-mode {
-	width: $sidebar-width;
-
-	> .components-panel {
-		border-left: 0;
-		border-right: 0;
-		margin-bottom: -1px;
-		margin-top: -1px;
-
-		> .components-panel__header {
-			background: $gray-100;
-		}
-	}
-
-	.block-editor-block-inspector__card {
-		margin: 0;
-	}
-}
-
-.edit-site-global-styles-sidebar {
-	display: flex;
-	flex-direction: column;
-	min-height: 100%;
-
-	&__panel,
-	&__navigator-provider {
-		display: flex;
-		flex-direction: column;
-		flex: 1;
-	}
-
-	&__navigator-screen {
-		flex: 1;
-	}
-}
-
-.edit-site-global-styles-sidebar .interface-complementary-area-header .components-button.has-icon {
-	margin-left: 0;
-}
-
-.edit-site-global-styles-sidebar__reset-button.components-button {
-	margin-left: auto;
-}
-
-.edit-site-global-styles-sidebar .components-navigation__menu-title-heading {
-	font-size: $default-font-size * 1.2;
-	font-weight: 500;
-}
-
-.edit-site-global-styles-sidebar .components-navigation__item > button span {
-	font-weight: 500;
-}
-
-.edit-site-typography-panel,
-.edit-site-global-styles-sidebar .block-editor-panel-color-gradient-settings {
-	border: 0;
-}
-
-.edit-site-global-styles-sidebar .single-column {
-	grid-column: span 1;
-}
-
-.edit-site-global-styles-sidebar .components-tools-panel .span-columns {
-	grid-column: 1 / -1;
-}
-
-.edit-site-global-styles-sidebar__blocks-group {
-	padding-top: $grid-unit-30;
-	border-top: $border-width solid $gray-200;
-}
-
-.edit-site-global-styles-sidebar__blocks-group-help {
-	padding: 0 $grid-unit-20;
-}
-
-.edit-site-global-styles-color-palette-panel,
-.edit-site-global-styles-gradient-palette-panel {
-	padding: $grid-unit-20;
-}
-
-// Override the `hr` styles defined in the `ComplementaryArea` component
-// from the `@wordpress/interface` package.
-.edit-site-global-styles-sidebar hr {
-	margin: 0;
-}
-
-.show-icon-labels {
-	.edit-site-global-styles-sidebar__header {
-		.components-button.has-icon {
-			// Hide the button icons when labels are set to display...
-			svg {
-				display: none;
-			}
-			// ... and display labels.
-			&::after {
-				content: attr(aria-label);
-				font-size: $helptext-font-size;
-			}
-		}
-	}
-}
-
-.edit-site-sidebar-fixed-bottom-slot {
-	position: sticky;
-	bottom: 0;
-	background: $white;
-	display: flex;
-	padding: $grid-unit-20;
-	border-top: $border-width solid $gray-300;
-	box-sizing: content-box;
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/hooks.js b/packages/edit-site/src/components/sidebar-edit-mode/template-panel/hooks.js
deleted file mode 100644
index 87f99e8991e45e..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/hooks.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { useMemo } from '@wordpress/element';
-import { store as coreStore } from '@wordpress/core-data';
-import { parse } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../../store';
-import {
-	EXCLUDED_PATTERN_SOURCES,
-	PATTERN_TYPES,
-} from '../../../utils/constants';
-import { unlock } from '../../../lock-unlock';
-
-function injectThemeAttributeInBlockTemplateContent(
-	block,
-	currentThemeStylesheet
-) {
-	block.innerBlocks = block.innerBlocks.map( ( innerBlock ) => {
-		return injectThemeAttributeInBlockTemplateContent(
-			innerBlock,
-			currentThemeStylesheet
-		);
-	} );
-
-	if (
-		block.name === 'core/template-part' &&
-		block.attributes.theme === undefined
-	) {
-		block.attributes.theme = currentThemeStylesheet;
-	}
-	return block;
-}
-
-function preparePatterns( patterns, template, currentThemeStylesheet ) {
-	// Filter out duplicates.
-	const filterOutDuplicatesByName = ( currentItem, index, items ) =>
-		index === items.findIndex( ( item ) => currentItem.name === item.name );
-
-	// Filter out core/directory patterns not included in theme.json.
-	const filterOutExcludedPatternSources = ( pattern ) =>
-		! EXCLUDED_PATTERN_SOURCES.includes( pattern.source );
-
-	// Filter only the patterns that are compatible with the current template.
-	const filterCompatiblePatterns = ( pattern ) =>
-		pattern.templateTypes?.includes( template.slug );
-
-	return patterns
-		.filter(
-			( pattern, index, items ) =>
-				filterOutExcludedPatternSources( pattern ) &&
-				filterOutDuplicatesByName( pattern, index, items ) &&
-				filterCompatiblePatterns( pattern )
-		)
-		.map( ( pattern ) => ( {
-			...pattern,
-			keywords: pattern.keywords || [],
-			type: PATTERN_TYPES.theme,
-			blocks: parse( pattern.content, {
-				__unstableSkipMigrationLogs: true,
-			} ).map( ( block ) =>
-				injectThemeAttributeInBlockTemplateContent(
-					block,
-					currentThemeStylesheet
-				)
-			),
-		} ) );
-}
-
-export function useAvailablePatterns( template ) {
-	const { blockPatterns, restBlockPatterns, currentThemeStylesheet } =
-		useSelect( ( select ) => {
-			const { getSettings } = unlock( select( editSiteStore ) );
-			const settings = getSettings();
-
-			return {
-				blockPatterns:
-					settings.__experimentalAdditionalBlockPatterns ??
-					settings.__experimentalBlockPatterns,
-				restBlockPatterns: select( coreStore ).getBlockPatterns(),
-				currentThemeStylesheet:
-					select( coreStore ).getCurrentTheme().stylesheet,
-			};
-		}, [] );
-
-	return useMemo( () => {
-		const mergedPatterns = [
-			...( blockPatterns || [] ),
-			...( restBlockPatterns || [] ),
-		];
-		return preparePatterns(
-			mergedPatterns,
-			template,
-			currentThemeStylesheet
-		);
-	}, [ blockPatterns, restBlockPatterns, template, currentThemeStylesheet ] );
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/index.js b/packages/edit-site/src/components/sidebar-edit-mode/template-panel/index.js
deleted file mode 100644
index 6956667852d690..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { PanelBody } from '@wordpress/components';
-import { store as editorStore } from '@wordpress/editor';
-import { store as coreStore } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { navigation, symbol } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../../store';
-import TemplateActions from './template-actions';
-import TemplateAreas from './template-areas';
-import LastRevision from './last-revision';
-import SidebarCard from '../sidebar-card';
-import PatternCategories from './pattern-categories';
-import { PATTERN_TYPES } from '../../../utils/constants';
-
-const CARD_ICONS = {
-	wp_block: symbol,
-	wp_navigation: navigation,
-};
-
-export default function TemplatePanel() {
-	const { title, description, icon, record, postType } = useSelect(
-		( select ) => {
-			const { getEditedPostType, getEditedPostId } =
-				select( editSiteStore );
-			const { getEditedEntityRecord } = select( coreStore );
-			const { __experimentalGetTemplateInfo: getTemplateInfo } =
-				select( editorStore );
-
-			const type = getEditedPostType();
-			const postId = getEditedPostId();
-			const _record = getEditedEntityRecord( 'postType', type, postId );
-			const info = getTemplateInfo( _record );
-
-			return {
-				title: info.title,
-				description: info.description,
-				icon: info.icon,
-				record: _record,
-				postType: type,
-			};
-		},
-		[]
-	);
-
-	if ( ! title && ! description ) {
-		return null;
-	}
-
-	return (
-		<PanelBody className="edit-site-template-panel">
-			<SidebarCard
-				className="edit-site-template-card"
-				title={ decodeEntities( title ) }
-				icon={ CARD_ICONS[ record?.type ] ?? icon }
-				description={ decodeEntities( description ) }
-				actions={ <TemplateActions template={ record } /> }
-			>
-				<TemplateAreas />
-			</SidebarCard>
-			<LastRevision />
-			{ postType === PATTERN_TYPES.user && (
-				<PatternCategories post={ record } />
-			) }
-		</PanelBody>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/last-revision.js b/packages/edit-site/src/components/sidebar-edit-mode/template-panel/last-revision.js
deleted file mode 100644
index b81c1b8b6ddbec..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/last-revision.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Button, PanelRow } from '@wordpress/components';
-import { sprintf, _n, __ } from '@wordpress/i18n';
-import { backup } from '@wordpress/icons';
-import { addQueryArgs } from '@wordpress/url';
-import { PostTypeSupportCheck } from '@wordpress/editor';
-
-/**
- * Internal dependencies
- */
-import useEditedEntityRecord from '../../use-edited-entity-record';
-
-const useRevisionData = () => {
-	const { record: currentTemplate } = useEditedEntityRecord();
-
-	const lastRevisionId =
-		currentTemplate?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id ?? null;
-
-	const revisionsCount =
-		currentTemplate?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0;
-
-	return {
-		currentTemplate,
-		lastRevisionId,
-		revisionsCount,
-	};
-};
-
-function PostLastRevisionCheck( { children } ) {
-	const { lastRevisionId, revisionsCount } = useRevisionData();
-
-	if ( ! process.env.IS_GUTENBERG_PLUGIN ) {
-		return null;
-	}
-
-	if ( ! lastRevisionId || revisionsCount < 2 ) {
-		return null;
-	}
-
-	return (
-		<PostTypeSupportCheck supportKeys="revisions">
-			{ children }
-		</PostTypeSupportCheck>
-	);
-}
-
-const PostLastRevision = () => {
-	const { lastRevisionId, revisionsCount } = useRevisionData();
-
-	return (
-		<PostLastRevisionCheck>
-			<PanelRow
-				header={ __( 'Editing history' ) }
-				className="edit-site-template-revisions"
-			>
-				<Button
-					href={ addQueryArgs( 'revision.php', {
-						revision: lastRevisionId,
-					} ) }
-					className="edit-site-template-last-revision__title"
-					icon={ backup }
-				>
-					{ sprintf(
-						/* translators: %d: number of revisions */
-						_n( '%d Revision', '%d Revisions', revisionsCount ),
-						revisionsCount
-					) }
-				</Button>
-			</PanelRow>
-		</PostLastRevisionCheck>
-	);
-};
-
-export default function LastRevision() {
-	return (
-		<PostLastRevisionCheck>
-			<PostLastRevision />
-		</PostLastRevisionCheck>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/pattern-categories.js b/packages/edit-site/src/components/sidebar-edit-mode/template-panel/pattern-categories.js
deleted file mode 100644
index 3740b622361ff5..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/pattern-categories.js
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, _x, sprintf } from '@wordpress/i18n';
-import { useEffect, useMemo, useState } from '@wordpress/element';
-import { FormTokenField, FlexBlock, PanelRow } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import { useDebounce } from '@wordpress/compose';
-import { store as noticesStore } from '@wordpress/notices';
-import { decodeEntities } from '@wordpress/html-entities';
-
-/**
- * Internal dependencies
- */
-import { PATTERN_TYPES } from '../../../utils/constants';
-
-export const unescapeString = ( arg ) => {
-	return decodeEntities( arg );
-};
-
-/**
- * Returns a term object with name unescaped.
- *
- * @param {Object} term The term object to unescape.
- *
- * @return {Object} Term object with name property unescaped.
- */
-export const unescapeTerm = ( term ) => {
-	return {
-		...term,
-		name: unescapeString( term.name ),
-	};
-};
-
-/**
- * Shared reference to an empty array for cases where it is important to avoid
- * returning a new array reference on every invocation.
- *
- * @type {Array<any>}
- */
-const EMPTY_ARRAY = [];
-
-/**
- * Module constants
- */
-const MAX_TERMS_SUGGESTIONS = 20;
-const DEFAULT_QUERY = {
-	per_page: MAX_TERMS_SUGGESTIONS,
-	_fields: 'id,name',
-	context: 'view',
-};
-
-const isSameTermName = ( termA, termB ) =>
-	unescapeString( termA ).toLowerCase() ===
-	unescapeString( termB ).toLowerCase();
-
-const termNamesToIds = ( names, terms ) => {
-	return names.map(
-		( termName ) =>
-			terms.find( ( term ) => isSameTermName( term.name, termName ) ).id
-	);
-};
-
-export default function PatternCategories( { post } ) {
-	const slug = 'wp_pattern_category';
-	const [ values, setValues ] = useState( [] );
-	const [ search, setSearch ] = useState( '' );
-	const debouncedSearch = useDebounce( setSearch, 500 );
-
-	const {
-		terms,
-		taxonomy,
-		hasAssignAction,
-		hasCreateAction,
-		hasResolvedTerms,
-	} = useSelect(
-		( select ) => {
-			const { getEntityRecords, getTaxonomy, hasFinishedResolution } =
-				select( coreStore );
-			const _taxonomy = getTaxonomy( slug );
-			const _termIds =
-				post?.wp_pattern_category?.length > 0
-					? post?.wp_pattern_category
-					: EMPTY_ARRAY;
-			const query = {
-				...DEFAULT_QUERY,
-				include: _termIds?.join( ',' ),
-				per_page: -1,
-			};
-
-			return {
-				hasCreateAction: _taxonomy
-					? post._links?.[
-							'wp:action-create-' + _taxonomy.rest_base
-					  ] ?? false
-					: false,
-				hasAssignAction: _taxonomy
-					? post._links?.[
-							'wp:action-assign-' + _taxonomy.rest_base
-					  ] ?? false
-					: false,
-				taxonomy: _taxonomy,
-				termIds: _termIds,
-				terms: _termIds?.length
-					? getEntityRecords( 'taxonomy', slug, query )
-					: EMPTY_ARRAY,
-				hasResolvedTerms: hasFinishedResolution( 'getEntityRecords', [
-					'taxonomy',
-					slug,
-					query,
-				] ),
-			};
-		},
-		[ slug, post ]
-	);
-
-	const { searchResults } = useSelect(
-		( select ) => {
-			const { getEntityRecords } = select( coreStore );
-
-			return {
-				searchResults: !! search
-					? getEntityRecords( 'taxonomy', slug, {
-							...DEFAULT_QUERY,
-							search,
-					  } )
-					: EMPTY_ARRAY,
-			};
-		},
-		[ search, slug ]
-	);
-
-	// Update terms state only after the selectors are resolved.
-	// We're using this to avoid terms temporarily disappearing on slow networks
-	// while core data makes REST API requests.
-	useEffect( () => {
-		if ( hasResolvedTerms ) {
-			const newValues = ( terms ?? [] ).map( ( term ) =>
-				unescapeString( term.name )
-			);
-
-			setValues( newValues );
-		}
-	}, [ terms, hasResolvedTerms ] );
-
-	const suggestions = useMemo( () => {
-		return ( searchResults ?? [] ).map( ( term ) =>
-			unescapeString( term.name )
-		);
-	}, [ searchResults ] );
-
-	const { saveEntityRecord, editEntityRecord, invalidateResolution } =
-		useDispatch( coreStore );
-	const { createErrorNotice } = useDispatch( noticesStore );
-
-	if ( ! hasAssignAction ) {
-		return null;
-	}
-
-	async function findOrCreateTerm( term ) {
-		try {
-			const newTerm = await saveEntityRecord( 'taxonomy', slug, term, {
-				throwOnError: true,
-			} );
-			invalidateResolution( 'getUserPatternCategories' );
-			return unescapeTerm( newTerm );
-		} catch ( error ) {
-			if ( error.code !== 'term_exists' ) {
-				throw error;
-			}
-
-			return {
-				id: error.data.term_id,
-				name: term.name,
-			};
-		}
-	}
-
-	function onUpdateTerms( newTermIds ) {
-		editEntityRecord( 'postType', PATTERN_TYPES.user, post.id, {
-			wp_pattern_category: newTermIds,
-		} );
-	}
-
-	function onChange( termNames ) {
-		const availableTerms = [
-			...( terms ?? [] ),
-			...( searchResults ?? [] ),
-		];
-		const uniqueTerms = termNames.reduce( ( acc, name ) => {
-			if (
-				! acc.some( ( n ) => n.toLowerCase() === name.toLowerCase() )
-			) {
-				acc.push( name );
-			}
-			return acc;
-		}, [] );
-
-		const newTermNames = uniqueTerms.filter(
-			( termName ) =>
-				! availableTerms.find( ( term ) =>
-					isSameTermName( term.name, termName )
-				)
-		);
-
-		// Optimistically update term values.
-		// The selector will always re-fetch terms later.
-		setValues( uniqueTerms );
-
-		if ( newTermNames.length === 0 ) {
-			return onUpdateTerms(
-				termNamesToIds( uniqueTerms, availableTerms )
-			);
-		}
-
-		if ( ! hasCreateAction ) {
-			return;
-		}
-
-		Promise.all(
-			newTermNames.map( ( termName ) =>
-				findOrCreateTerm( { name: termName } )
-			)
-		)
-			.then( ( newTerms ) => {
-				const newAvailableTerms = availableTerms.concat( newTerms );
-				return onUpdateTerms(
-					termNamesToIds( uniqueTerms, newAvailableTerms )
-				);
-			} )
-			.catch( ( error ) => {
-				createErrorNotice( error.message, {
-					type: 'snackbar',
-				} );
-			} );
-	}
-
-	const singularName =
-		taxonomy?.labels?.singular_name ??
-		( slug === 'post_tag' ? __( 'Tag' ) : __( 'Term' ) );
-	const termAddedLabel = sprintf(
-		/* translators: %s: term name. */
-		_x( '%s added', 'term' ),
-		singularName
-	);
-	const termRemovedLabel = sprintf(
-		/* translators: %s: term name. */
-		_x( '%s removed', 'term' ),
-		singularName
-	);
-	const removeTermLabel = sprintf(
-		/* translators: %s: term name. */
-		_x( 'Remove %s', 'term' ),
-		singularName
-	);
-
-	return (
-		<PanelRow initialOpen={ true } title={ __( 'Categories' ) }>
-			<FlexBlock>
-				<FormTokenField
-					__next40pxDefaultSize
-					value={ values }
-					suggestions={ suggestions }
-					onChange={ onChange }
-					onInputChange={ debouncedSearch }
-					maxSuggestions={ MAX_TERMS_SUGGESTIONS }
-					label={ __( 'Pattern categories' ) }
-					messages={ {
-						added: termAddedLabel,
-						removed: termRemovedLabel,
-						remove: removeTermLabel,
-					} }
-					tokenizeOnBlur
-				/>
-			</FlexBlock>
-		</PanelRow>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/replace-template-button.js b/packages/edit-site/src/components/sidebar-edit-mode/template-panel/replace-template-button.js
deleted file mode 100644
index 658aacd331debc..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/replace-template-button.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useState } from '@wordpress/element';
-import { __experimentalBlockPatternsList as BlockPatternsList } from '@wordpress/block-editor';
-import { MenuItem, Modal } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { store as coreStore } from '@wordpress/core-data';
-import { useAsyncList } from '@wordpress/compose';
-import { serialize } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../../store';
-
-export default function ReplaceTemplateButton( {
-	onClick,
-	availableTemplates,
-} ) {
-	const { editEntityRecord } = useDispatch( coreStore );
-	const [ showModal, setShowModal ] = useState( false );
-	const onClose = () => {
-		setShowModal( false );
-	};
-
-	const { postId, postType } = useSelect( ( select ) => {
-		return {
-			postId: select( editSiteStore ).getEditedPostId(),
-			postType: select( editSiteStore ).getEditedPostType(),
-		};
-	}, [] );
-
-	const onTemplateSelect = async ( selectedTemplate ) => {
-		onClose(); // Close the template suggestions modal first.
-		onClick();
-		await editEntityRecord( 'postType', postType, postId, {
-			blocks: selectedTemplate.blocks,
-			content: serialize( selectedTemplate.blocks ),
-		} );
-	};
-
-	if ( ! availableTemplates.length || availableTemplates.length < 1 ) {
-		return null;
-	}
-
-	return (
-		<>
-			<MenuItem
-				info={ __(
-					'Replace the contents of this template with another.'
-				) }
-				onClick={ () => setShowModal( true ) }
-			>
-				{ __( 'Replace template' ) }
-			</MenuItem>
-
-			{ showModal && (
-				<Modal
-					title={ __( 'Choose a template' ) }
-					onRequestClose={ onClose }
-					overlayClassName="edit-site-template-panel__replace-template-modal"
-					isFullScreen
-				>
-					<div className="edit-site-template-panel__replace-template-modal__content">
-						<TemplatesList
-							availableTemplates={ availableTemplates }
-							onSelect={ onTemplateSelect }
-						/>
-					</div>
-				</Modal>
-			) }
-		</>
-	);
-}
-
-function TemplatesList( { availableTemplates, onSelect } ) {
-	const shownTemplates = useAsyncList( availableTemplates );
-
-	return (
-		<BlockPatternsList
-			label={ __( 'Templates' ) }
-			blockPatterns={ availableTemplates }
-			shownPatterns={ shownTemplates }
-			onClickPattern={ onSelect }
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/style.scss b/packages/edit-site/src/components/sidebar-edit-mode/template-panel/style.scss
deleted file mode 100644
index 6eab753e8ad285..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/style.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-.edit-site-template-card {
-	&__template-areas {
-		margin-top: $grid-unit-20;
-	}
-
-	&__template-areas-list {
-		margin: 0;
-
-		> li {
-			margin: 0;
-		}
-	}
-
-	&__template-areas-item {
-		width: 100%;
-
-		// Override the default padding.
-		&.components-button.has-icon {
-			padding: 0;
-		}
-	}
-
-	&__actions {
-		line-height: 0;
-		> .components-button.is-small.has-icon {
-			padding: 0;
-			min-width: auto;
-		}
-	}
-}
-
-.edit-site-template-revisions {
-	margin-left: math.div(-$grid-unit-10, 2);
-}
-
-h3.edit-site-template-card__template-areas-title {
-	font-weight: 500;
-	margin: 0 0 $grid-unit-10;
-}
-
-
-.edit-site-template-panel__replace-template-modal {
-	z-index: z-index(".edit-site-template-panel__replace-template-modal");
-}
-
-.edit-site-template-panel__replace-template-modal__content {
-	column-count: 2;
-	column-gap: $grid-unit-30;
-
-	@include break-medium() {
-		column-count: 3;
-	}
-
-	@include break-wide() {
-		column-count: 4;
-	}
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/template-actions.js b/packages/edit-site/src/components/sidebar-edit-mode/template-panel/template-actions.js
deleted file mode 100644
index 81acb244a11863..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/template-actions.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useDispatch } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { DropdownMenu, MenuGroup, MenuItem } from '@wordpress/components';
-import { moreVertical } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../../store';
-import isTemplateRevertable from '../../../utils/is-template-revertable';
-import ReplaceTemplateButton from './replace-template-button';
-import { useAvailablePatterns } from './hooks';
-
-export default function Actions( { template } ) {
-	const availablePatterns = useAvailablePatterns( template );
-	const { revertTemplate } = useDispatch( editSiteStore );
-	const isRevertable = isTemplateRevertable( template );
-
-	if (
-		! isRevertable &&
-		( ! availablePatterns.length || availablePatterns.length < 1 )
-	) {
-		return null;
-	}
-
-	return (
-		<DropdownMenu
-			icon={ moreVertical }
-			label={ __( 'Actions' ) }
-			className="edit-site-template-card__actions"
-			toggleProps={ { isSmall: true } }
-		>
-			{ ( { onClose } ) => (
-				<MenuGroup>
-					{ isRevertable && (
-						<MenuItem
-							info={ __(
-								'Use the template as supplied by the theme.'
-							) }
-							onClick={ () => {
-								revertTemplate( template );
-								onClose();
-							} }
-						>
-							{ __( 'Clear customizations' ) }
-						</MenuItem>
-					) }
-					<ReplaceTemplateButton
-						availableTemplates={ availablePatterns }
-						template={ template }
-						onClick={ onClose }
-					/>
-				</MenuGroup>
-			) }
-		</DropdownMenu>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/template-areas.js b/packages/edit-site/src/components/sidebar-edit-mode/template-panel/template-areas.js
deleted file mode 100644
index 24dcd301bf2399..00000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/template-areas.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import {
-	Button,
-	__experimentalHeading as Heading,
-} from '@wordpress/components';
-import { store as editorStore } from '@wordpress/editor';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../../store';
-
-function TemplateAreaItem( { area, clientId } ) {
-	const { selectBlock, toggleBlockHighlight } =
-		useDispatch( blockEditorStore );
-	const templatePartArea = useSelect(
-		( select ) => {
-			const defaultAreas =
-				select(
-					editorStore
-				).__experimentalGetDefaultTemplatePartAreas();
-
-			return defaultAreas.find(
-				( defaultArea ) => defaultArea.area === area
-			);
-		},
-		[ area ]
-	);
-
-	const highlightBlock = () => toggleBlockHighlight( clientId, true );
-	const cancelHighlightBlock = () => toggleBlockHighlight( clientId, false );
-
-	return (
-		<Button
-			className="edit-site-template-card__template-areas-item"
-			icon={ templatePartArea?.icon }
-			onMouseOver={ highlightBlock }
-			onMouseLeave={ cancelHighlightBlock }
-			onFocus={ highlightBlock }
-			onBlur={ cancelHighlightBlock }
-			onClick={ () => {
-				selectBlock( clientId );
-			} }
-		>
-			{ templatePartArea?.label }
-		</Button>
-	);
-}
-
-export default function TemplateAreas() {
-	const templateParts = useSelect(
-		( select ) => select( editSiteStore ).getCurrentTemplateTemplateParts(),
-		[]
-	);
-
-	if ( ! templateParts.length ) {
-		return null;
-	}
-
-	return (
-		<section className="edit-site-template-card__template-areas">
-			<Heading
-				level={ 3 }
-				className="edit-site-template-card__template-areas-title"
-			>
-				{ __( 'Areas' ) }
-			</Heading>
-
-			<ul className="edit-site-template-card__template-areas-list">
-				{ templateParts.map( ( { templatePart, block } ) => (
-					<li key={ block.clientId }>
-						<TemplateAreaItem
-							area={ templatePart.area }
-							clientId={ block.clientId }
-						/>
-					</li>
-				) ) }
-			</ul>
-		</section>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-item/index.js b/packages/edit-site/src/components/sidebar-navigation-item/index.js
index fad9f634217146..80f06d7e93133b 100644
--- a/packages/edit-site/src/components/sidebar-navigation-item/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-item/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -13,22 +13,51 @@ import {
 } from '@wordpress/components';
 import { isRTL } from '@wordpress/i18n';
 import { chevronRightSmall, chevronLeftSmall, Icon } from '@wordpress/icons';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { SidebarNavigationContext } from '../sidebar';
+
+const { useHistory } = unlock( routerPrivateApis );
 
 export default function SidebarNavigationItem( {
 	className,
 	icon,
 	withChevron = false,
 	suffix,
+	uid,
+	params,
+	onClick,
 	children,
 	...props
 } ) {
+	const history = useHistory();
+	const { navigate } = useContext( SidebarNavigationContext );
+	// If there is no custom click handler, create one that navigates to `params`.
+	function handleClick( e ) {
+		if ( onClick ) {
+			onClick( e );
+			navigate( 'forward' );
+		} else if ( params ) {
+			e.preventDefault();
+			history.push( params );
+			navigate( 'forward', `[id="${ uid }"]` );
+		}
+	}
+
 	return (
 		<Item
-			className={ classnames(
+			className={ clsx(
 				'edit-site-sidebar-navigation-item',
 				{ 'with-suffix': ! withChevron && suffix },
 				className
 			) }
+			onClick={ handleClick }
+			id={ uid }
 			{ ...props }
 		>
 			<HStack justify="flex-start">
diff --git a/packages/edit-site/src/components/sidebar-navigation-item/style.scss b/packages/edit-site/src/components/sidebar-navigation-item/style.scss
index 88ff27a9c1d2f0..016027ef715a45 100644
--- a/packages/edit-site/src/components/sidebar-navigation-item/style.scss
+++ b/packages/edit-site/src/components/sidebar-navigation-item/style.scss
@@ -4,7 +4,6 @@
 	padding: $grid-unit-10 6px $grid-unit-10 $grid-unit-20;
 	border: none;
 	min-height: $grid-unit-50;
-	border-radius: $radius-block-ui;
 
 	&:hover,
 	&:focus,
@@ -33,5 +32,5 @@
 
 .edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button {
 	cursor: grab;
-	padding: $grid-unit-10;
+	padding: $grid-unit-10 $grid-unit-10 $grid-unit-10 0;
 }
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/index.js
index 77b19a50c8af44..3dec3f0a7b2eb5 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/index.js
@@ -32,17 +32,21 @@ export default function SidebarNavigationScreenDetailsFooter( {
 	 * the following logic.
 	 */
 	const hrefProps = {};
-	if ( record?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id ) {
+	const lastRevisionId =
+		record?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id ?? null;
+	const revisionsCount =
+		record?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0;
+	// Enable the revisions link if there is a last revision and there are more than one revisions.
+	if ( lastRevisionId && revisionsCount > 1 ) {
 		hrefProps.href = addQueryArgs( 'revision.php', {
 			revision: record?._links[ 'predecessor-version' ][ 0 ].id,
 		} );
 		hrefProps.as = 'a';
 	}
-
 	return (
 		<ItemGroup className="edit-site-sidebar-navigation-screen-details-footer">
 			<SidebarNavigationItem
-				label={ __( 'Revisions' ) }
+				aria-label={ __( 'Revisions' ) }
 				{ ...hrefProps }
 				{ ...otherProps }
 			>
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-row.js b/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-row.js
index 501829b511bc3e..1c7f9abafdf503 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-row.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-row.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -19,7 +19,7 @@ export default function SidebarNavigationScreenDetailsPanelRow( {
 			key={ label }
 			spacing={ 5 }
 			alignment="left"
-			className={ classnames(
+			className={ clsx(
 				'edit-site-sidebar-navigation-details-screen-panel__row',
 				className
 			) }
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/content.js b/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/content.js
new file mode 100644
index 00000000000000..986238697f7346
--- /dev/null
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/content.js
@@ -0,0 +1,55 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { __experimentalVStack as VStack } from '@wordpress/components';
+import { BlockEditorProvider } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import StyleVariationsContainer from '../global-styles/style-variations-container';
+import { unlock } from '../../lock-unlock';
+import { store as editSiteStore } from '../../store';
+import ColorVariations from '../global-styles/variations/variations-color';
+import TypographyVariations from '../global-styles/variations/variations-typography';
+
+const noop = () => {};
+
+export default function SidebarNavigationScreenGlobalStylesContent() {
+	const { storedSettings } = useSelect( ( select ) => {
+		const { getSettings } = unlock( select( editSiteStore ) );
+
+		return {
+			storedSettings: getSettings(),
+		};
+	}, [] );
+
+	const gap = 3;
+
+	// Wrap in a BlockEditorProvider to ensure that the Iframe's dependencies are
+	// loaded. This is necessary because the Iframe component waits until
+	// the block editor store's `__internalIsInitialized` is true before
+	// rendering the iframe. Without this, the iframe previews will not render
+	// in mobile viewport sizes, where the editor canvas is hidden.
+	return (
+		<BlockEditorProvider
+			settings={ storedSettings }
+			onChange={ noop }
+			onInput={ noop }
+		>
+			<VStack
+				spacing={ 10 }
+				className="edit-site-global-styles-variation-container"
+			>
+				<StyleVariationsContainer gap={ gap } />
+				<ColorVariations title={ __( 'Palettes' ) } gap={ gap } />
+				<TypographyVariations
+					title={ __( 'Typography' ) }
+					gap={ gap }
+				/>
+			</VStack>
+		</BlockEditorProvider>
+	);
+}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js
index 45fa8102456a54..6579107a60e55f 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js
@@ -5,16 +5,16 @@ import { __ } from '@wordpress/i18n';
 import { edit, seen } from '@wordpress/icons';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
-import { __experimentalNavigatorButton as NavigatorButton } from '@wordpress/components';
 import { useViewportMatch } from '@wordpress/compose';
-import { BlockEditorProvider } from '@wordpress/block-editor';
 import { useCallback } from '@wordpress/element';
+import { store as editorStore } from '@wordpress/editor';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import StyleVariationsContainer from '../global-styles/style-variations-container';
 import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
 import SidebarButton from '../sidebar-button';
@@ -22,13 +22,14 @@ import SidebarNavigationItem from '../sidebar-navigation-item';
 import StyleBook from '../style-book';
 import useGlobalStylesRevisions from '../global-styles/screen-revisions/use-global-styles-revisions';
 import SidebarNavigationScreenDetailsFooter from '../sidebar-navigation-screen-details-footer';
+import SidebarNavigationScreenGlobalStylesContent from './content';
 
-const noop = () => {};
+const { useLocation, useHistory } = unlock( routerPrivateApis );
 
 export function SidebarNavigationItemGlobalStyles( props ) {
 	const { openGeneralSidebar } = useDispatch( editSiteStore );
-	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
-
+	const history = useHistory();
+	const { params } = useLocation();
 	const hasGlobalStyleVariations = useSelect(
 		( select ) =>
 			!! select(
@@ -38,10 +39,10 @@ export function SidebarNavigationItemGlobalStyles( props ) {
 	);
 	if ( hasGlobalStyleVariations ) {
 		return (
-			<NavigatorButton
+			<SidebarNavigationItem
 				{ ...props }
-				as={ SidebarNavigationItem }
-				path="/wp_global_styles"
+				params={ { path: '/wp_global_styles' } }
+				uid="global-styles-navigation-item"
 			/>
 		);
 	}
@@ -50,7 +51,16 @@ export function SidebarNavigationItemGlobalStyles( props ) {
 			{ ...props }
 			onClick={ () => {
 				// Switch to edit mode.
-				setCanvasMode( 'edit' );
+				history.push(
+					{
+						...params,
+						canvas: 'edit',
+					},
+					undefined,
+					{
+						transition: 'canvas-mode-edit-transition',
+					}
+				);
 				// Open global styles sidebar.
 				openGeneralSidebar( 'edit-site/global-styles' );
 			} }
@@ -58,69 +68,52 @@ export function SidebarNavigationItemGlobalStyles( props ) {
 	);
 }
 
-function SidebarNavigationScreenGlobalStylesContent() {
-	const { storedSettings } = useSelect( ( select ) => {
-		const { getSettings } = unlock( select( editSiteStore ) );
-
-		return {
-			storedSettings: getSettings(),
-		};
-	}, [] );
-
-	// Wrap in a BlockEditorProvider to ensure that the Iframe's dependencies are
-	// loaded. This is necessary because the Iframe component waits until
-	// the block editor store's `__internalIsInitialized` is true before
-	// rendering the iframe. Without this, the iframe previews will not render
-	// in mobile viewport sizes, where the editor canvas is hidden.
-	return (
-		<BlockEditorProvider
-			settings={ storedSettings }
-			onChange={ noop }
-			onInput={ noop }
-		>
-			<StyleVariationsContainer />
-		</BlockEditorProvider>
-	);
-}
-
-export default function SidebarNavigationScreenGlobalStyles() {
+export default function SidebarNavigationScreenGlobalStyles( { backPath } ) {
+	const history = useHistory();
+	const { params } = useLocation();
+	const { canvas = 'view' } = params;
 	const { revisions, isLoading: isLoadingRevisions } =
 		useGlobalStylesRevisions();
-	const { openGeneralSidebar, setIsListViewOpened } =
-		useDispatch( editSiteStore );
+	const { openGeneralSidebar } = useDispatch( editSiteStore );
+	const { setIsListViewOpened } = useDispatch( editorStore );
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const { setCanvasMode, setEditorCanvasContainerView } = unlock(
+	const { setEditorCanvasContainerView } = unlock(
 		useDispatch( editSiteStore )
 	);
-	const { isViewMode, isStyleBookOpened, revisionsCount } = useSelect(
-		( select ) => {
-			const { getCanvasMode, getEditorCanvasContainerView } = unlock(
-				select( editSiteStore )
-			);
-			const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =
-				select( coreStore );
-			const globalStylesId = __experimentalGetCurrentGlobalStylesId();
-			const globalStyles = globalStylesId
-				? getEntityRecord( 'root', 'globalStyles', globalStylesId )
-				: undefined;
-			return {
-				isViewMode: 'view' === getCanvasMode(),
-				isStyleBookOpened:
-					'style-book' === getEditorCanvasContainerView(),
-				revisionsCount:
-					globalStyles?._links?.[ 'version-history' ]?.[ 0 ]?.count ??
-					0,
-			};
-		},
-		[]
-	);
+	const { isStyleBookOpened, revisionsCount } = useSelect( ( select ) => {
+		const { getEditorCanvasContainerView } = unlock(
+			select( editSiteStore )
+		);
+		const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =
+			select( coreStore );
+		const globalStylesId = __experimentalGetCurrentGlobalStylesId();
+		const globalStyles = globalStylesId
+			? getEntityRecord( 'root', 'globalStyles', globalStylesId )
+			: undefined;
+		return {
+			isStyleBookOpened: 'style-book' === getEditorCanvasContainerView(),
+			revisionsCount:
+				globalStyles?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0,
+		};
+	}, [] );
+	const { set: setPreference } = useDispatch( preferencesStore );
 
 	const openGlobalStyles = useCallback( async () => {
+		history.push(
+			{
+				...params,
+				canvas: 'edit',
+			},
+			undefined,
+			{
+				transition: 'canvas-mode-edit-transition',
+			}
+		);
 		return Promise.all( [
-			setCanvasMode( 'edit' ),
+			setPreference( 'core', 'distractionFree', false ),
 			openGeneralSidebar( 'edit-site/global-styles' ),
 		] );
-	}, [ setCanvasMode, openGeneralSidebar ] );
+	}, [ history, params, openGeneralSidebar, setPreference ] );
 
 	const openStyleBook = useCallback( async () => {
 		await openGlobalStyles();
@@ -157,6 +150,7 @@ export default function SidebarNavigationScreenGlobalStyles() {
 				description={ __(
 					'Choose a different style combination for the theme styles.'
 				) }
+				backPath={ backPath }
 				content={ <SidebarNavigationScreenGlobalStylesContent /> }
 				footer={
 					shouldShowGlobalStylesFooter && (
@@ -190,7 +184,7 @@ export default function SidebarNavigationScreenGlobalStyles() {
 					</>
 				}
 			/>
-			{ isStyleBookOpened && ! isMobileViewport && isViewMode && (
+			{ isStyleBookOpened && ! isMobileViewport && canvas === 'view' && (
 				<StyleBook
 					enableResizing={ false }
 					isSelected={ () => false }
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
index 152139870fa59f..bdfb6ac93b51c4 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
@@ -1,15 +1,10 @@
 /**
  * WordPress dependencies
  */
-import {
-	__experimentalItemGroup as ItemGroup,
-	__experimentalNavigatorButton as NavigatorButton,
-	__experimentalUseNavigator as useNavigator,
-} from '@wordpress/components';
+import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { layout, symbol, navigation, styles, page } from '@wordpress/icons';
 import { useDispatch } from '@wordpress/data';
-
 import { useEffect } from '@wordpress/element';
 
 /**
@@ -20,20 +15,21 @@ import SidebarNavigationItem from '../sidebar-navigation-item';
 import { SidebarNavigationItemGlobalStyles } from '../sidebar-navigation-screen-global-styles';
 import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
-import TemplatePartHint from './template-part-hint';
+import {
+	NAVIGATION_POST_TYPE,
+	TEMPLATE_POST_TYPE,
+	PATTERN_TYPES,
+} from '../../utils/constants';
 
 export default function SidebarNavigationScreenMain() {
-	const { location } = useNavigator();
 	const { setEditorCanvasContainerView } = unlock(
 		useDispatch( editSiteStore )
 	);
 
 	// Clear the editor canvas container view when accessing the main navigation screen.
 	useEffect( () => {
-		if ( location?.path === '/' ) {
-			setEditorCanvasContainerView( undefined );
-		}
-	}, [ setEditorCanvasContainerView, location?.path ] );
+		setEditorCanvasContainerView( undefined );
+	}, [ setEditorCanvasContainerView ] );
 
 	return (
 		<SidebarNavigationScreen
@@ -45,46 +41,46 @@ export default function SidebarNavigationScreenMain() {
 			content={
 				<>
 					<ItemGroup>
-						<NavigatorButton
-							as={ SidebarNavigationItem }
-							path="/navigation"
+						<SidebarNavigationItem
+							uid="navigation-navigation-item"
+							params={ { postType: NAVIGATION_POST_TYPE } }
 							withChevron
 							icon={ navigation }
 						>
 							{ __( 'Navigation' ) }
-						</NavigatorButton>
+						</SidebarNavigationItem>
 						<SidebarNavigationItemGlobalStyles
+							uid="styles-navigation-item"
 							withChevron
 							icon={ styles }
 						>
 							{ __( 'Styles' ) }
 						</SidebarNavigationItemGlobalStyles>
-						<NavigatorButton
-							as={ SidebarNavigationItem }
-							path="/page"
+						<SidebarNavigationItem
+							uid="page-navigation-item"
+							params={ { postType: 'page' } }
 							withChevron
 							icon={ page }
 						>
 							{ __( 'Pages' ) }
-						</NavigatorButton>
-						<NavigatorButton
-							as={ SidebarNavigationItem }
-							path="/wp_template"
+						</SidebarNavigationItem>
+						<SidebarNavigationItem
+							uid="template-navigation-item"
+							params={ { postType: TEMPLATE_POST_TYPE } }
 							withChevron
 							icon={ layout }
 						>
 							{ __( 'Templates' ) }
-						</NavigatorButton>
-						<NavigatorButton
-							as={ SidebarNavigationItem }
-							path="/patterns"
+						</SidebarNavigationItem>
+						<SidebarNavigationItem
+							uid="patterns-navigation-item"
+							params={ { postType: PATTERN_TYPES.user } }
 							withChevron
 							icon={ symbol }
 						>
 							{ __( 'Patterns' ) }
-						</NavigatorButton>
+						</SidebarNavigationItem>
 					</ItemGroup>
-					<TemplatePartHint />
 				</>
 			}
 		/>
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-main/template-part-hint.js b/packages/edit-site/src/components/sidebar-navigation-screen-main/template-part-hint.js
deleted file mode 100644
index c6f270465b86f3..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-main/template-part-hint.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Notice } from '@wordpress/components';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-const PREFERENCE_NAME = 'isTemplatePartMoveHintVisible';
-
-export default function TemplatePartHint() {
-	const showTemplatePartHint = useSelect(
-		( select ) =>
-			select( preferencesStore ).get( 'core', PREFERENCE_NAME ) ?? true,
-		[]
-	);
-
-	const { set: setPreference } = useDispatch( preferencesStore );
-	if ( ! showTemplatePartHint ) {
-		return null;
-	}
-
-	return (
-		<Notice
-			politeness="polite"
-			className="edit-site-sidebar__notice"
-			onRemove={ () => {
-				setPreference( 'core', PREFERENCE_NAME, false );
-			} }
-		>
-			{ __( 'Looking for template parts? Find them in "Patterns".' ) }
-		</Notice>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-item/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-item/index.js
deleted file mode 100644
index 385938597da1f7..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-item/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { useDispatch } from '@wordpress/data';
-import {
-	__experimentalUseNavigator as useNavigator,
-	ExternalLink,
-} from '@wordpress/components';
-import { useEntityRecord } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { pencil } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import { unlock } from '../../lock-unlock';
-import { store as editSiteStore } from '../../store';
-import SidebarButton from '../sidebar-button';
-
-export default function SidebarNavigationScreenNavigationItem() {
-	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
-	const {
-		params: { postType, postId },
-	} = useNavigator();
-	const { record } = useEntityRecord( 'postType', postType, postId );
-
-	return (
-		<SidebarNavigationScreen
-			title={ record ? decodeEntities( record?.title?.rendered ) : null }
-			actions={
-				<SidebarButton
-					onClick={ () => setCanvasMode( 'edit' ) }
-					label={ __( 'Edit' ) }
-					icon={ pencil }
-				/>
-			}
-			description={ __(
-				'Posts are entries listed in reverse chronological order on the site homepage or on the posts page.'
-			) }
-			content={
-				<>
-					{ record?.link ? (
-						<ExternalLink
-							className="edit-site-sidebar-navigation-screen__page-link"
-							href={ record.link }
-						>
-							{ record.link }
-						</ExternalLink>
-					) : null }
-					{ record
-						? decodeEntities( record?.description?.rendered )
-						: null }
-				</>
-			}
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/delete-confirm-dialog.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/delete-confirm-dialog.js
new file mode 100644
index 00000000000000..ef1fd11612ccaf
--- /dev/null
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/delete-confirm-dialog.js
@@ -0,0 +1,24 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+export default function DeleteConfirmDialog( { onClose, onConfirm } ) {
+	return (
+		<ConfirmDialog
+			isOpen
+			onConfirm={ () => {
+				onConfirm();
+
+				// Immediate close avoids ability to hit delete multiple times.
+				onClose();
+			} }
+			onCancel={ onClose }
+			confirmButtonText={ __( 'Delete' ) }
+			size="medium"
+		>
+			{ __( 'Are you sure you want to delete this Navigation Menu?' ) }
+		</ConfirmDialog>
+	);
+}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/delete-modal.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/delete-modal.js
deleted file mode 100644
index 16bf88af41eacc..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/delete-modal.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-export default function RenameModal( { onClose, onConfirm } ) {
-	return (
-		<ConfirmDialog
-			isOpen={ true }
-			onConfirm={ ( e ) => {
-				e.preventDefault();
-				onConfirm();
-
-				// Immediate close avoids ability to hit delete multiple times.
-				onClose();
-			} }
-			onCancel={ onClose }
-			confirmButtonText={ __( 'Delete' ) }
-		>
-			{ __( 'Are you sure you want to delete this Navigation menu?' ) }
-		</ConfirmDialog>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/edit-button.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/edit-button.js
deleted file mode 100644
index 962062a96da743..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/edit-button.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { pencil } from '@wordpress/icons';
-/**
- * Internal dependencies
- */
-import SidebarButton from '../sidebar-button';
-import { useLink } from '../routes/link';
-import { NAVIGATION_POST_TYPE } from '../../utils/constants';
-
-export default function EditButton( { postId } ) {
-	const linkInfo = useLink( {
-		postId,
-		postType: NAVIGATION_POST_TYPE,
-		canvas: 'edit',
-	} );
-	return (
-		<SidebarButton { ...linkInfo } label={ __( 'Edit' ) } icon={ pencil } />
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/index.js
index 5ae860d4bb8298..24fb9372b4fff0 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/index.js
@@ -2,13 +2,11 @@
  * WordPress dependencies
  */
 import { useEntityRecord, store as coreStore } from '@wordpress/core-data';
-import {
-	__experimentalUseNavigator as useNavigator,
-	Spinner,
-} from '@wordpress/components';
+import { Spinner } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { decodeEntities } from '@wordpress/html-entities';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
@@ -18,13 +16,16 @@ import ScreenNavigationMoreMenu from './more-menu';
 import SingleNavigationMenu from './single-navigation-menu';
 import useNavigationMenuHandlers from './use-navigation-menu-handlers';
 import buildNavigationLabel from '../sidebar-navigation-screen-navigation-menus/build-navigation-label';
+import { unlock } from '../../lock-unlock';
+
+const { useLocation } = unlock( routerPrivateApis );
 
 export const postType = `wp_navigation`;
 
-export default function SidebarNavigationScreenNavigationMenu() {
+export default function SidebarNavigationScreenNavigationMenu( { backPath } ) {
 	const {
 		params: { postId },
-	} = useNavigator();
+	} = useLocation();
 
 	const { record: navigationMenu, isResolving } = useEntityRecord(
 		'postType',
@@ -64,8 +65,9 @@ export default function SidebarNavigationScreenNavigationMenu() {
 		return (
 			<SidebarNavigationScreenWrapper
 				description={ __(
-					'Navigation menus are a curated collection of blocks that allow visitors to get around your site.'
+					'Navigation Menus are a curated collection of blocks that allow visitors to get around your site.'
 				) }
+				backPath={ backPath }
 			>
 				<Spinner className="edit-site-sidebar-navigation-screen-navigation-menus__loading" />
 			</SidebarNavigationScreenWrapper>
@@ -76,6 +78,7 @@ export default function SidebarNavigationScreenNavigationMenu() {
 		return (
 			<SidebarNavigationScreenWrapper
 				description={ __( 'Navigation Menu missing.' ) }
+				backPath={ backPath }
 			/>
 		);
 	}
@@ -85,12 +88,14 @@ export default function SidebarNavigationScreenNavigationMenu() {
 			<SidebarNavigationScreenWrapper
 				actions={
 					<ScreenNavigationMoreMenu
+						menuId={ navigationMenu?.id }
 						menuTitle={ decodeEntities( menuTitle ) }
 						onDelete={ _handleDelete }
 						onSave={ _handleSave }
 						onDuplicate={ _handleDuplicate }
 					/>
 				}
+				backPath={ backPath }
 				title={ buildNavigationLabel(
 					navigationMenu?.title,
 					navigationMenu?.id,
@@ -104,6 +109,7 @@ export default function SidebarNavigationScreenNavigationMenu() {
 	return (
 		<SingleNavigationMenu
 			navigationMenu={ navigationMenu }
+			backPath={ backPath }
 			handleDelete={ _handleDelete }
 			handleSave={ _handleSave }
 			handleDuplicate={ _handleDuplicate }
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/more-menu.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/more-menu.js
index 2d386d67bb7a75..6b85e088817edf 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/more-menu.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/more-menu.js
@@ -5,29 +5,36 @@ import { DropdownMenu, MenuItem, MenuGroup } from '@wordpress/components';
 import { moreVertical } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
 import RenameModal from './rename-modal';
-import DeleteModal from './delete-modal';
+import DeleteConfirmDialog from './delete-confirm-dialog';
+import { unlock } from '../../lock-unlock';
+
+const { useHistory } = unlock( routerPrivateApis );
 
 const POPOVER_PROPS = {
 	position: 'bottom right',
 };
 
 export default function ScreenNavigationMoreMenu( props ) {
-	const { onDelete, onSave, onDuplicate, menuTitle } = props;
+	const { onDelete, onSave, onDuplicate, menuTitle, menuId } = props;
 
 	const [ renameModalOpen, setRenameModalOpen ] = useState( false );
-	const [ deleteModalOpen, setDeleteModalOpen ] = useState( false );
+	const [ deleteConfirmDialogOpen, setDeleteConfirmDialogOpen ] =
+		useState( false );
+
+	const history = useHistory();
 
 	const closeModals = () => {
 		setRenameModalOpen( false );
-		setDeleteModalOpen( false );
+		setDeleteConfirmDialogOpen( false );
 	};
 	const openRenameModal = () => setRenameModalOpen( true );
-	const openDeleteModal = () => setDeleteModalOpen( true );
+	const openDeleteConfirmDialog = () => setDeleteConfirmDialogOpen( true );
 
 	return (
 		<>
@@ -49,6 +56,17 @@ export default function ScreenNavigationMoreMenu( props ) {
 							>
 								{ __( 'Rename' ) }
 							</MenuItem>
+							<MenuItem
+								onClick={ () => {
+									history.push( {
+										postId: menuId,
+										postType: 'wp_navigation',
+										canvas: 'edit',
+									} );
+								} }
+							>
+								{ __( 'Edit' ) }
+							</MenuItem>
 							<MenuItem
 								onClick={ () => {
 									onDuplicate();
@@ -60,7 +78,7 @@ export default function ScreenNavigationMoreMenu( props ) {
 							<MenuItem
 								isDestructive
 								onClick={ () => {
-									openDeleteModal();
+									openDeleteConfirmDialog();
 
 									// Close the dropdown after opening the modal.
 									onClose();
@@ -72,11 +90,12 @@ export default function ScreenNavigationMoreMenu( props ) {
 					</div>
 				) }
 			</DropdownMenu>
-
-			{ deleteModalOpen && (
-				<DeleteModal onClose={ closeModals } onConfirm={ onDelete } />
+			{ deleteConfirmDialogOpen && (
+				<DeleteConfirmDialog
+					onClose={ closeModals }
+					onConfirm={ onDelete }
+				/>
 			) }
-
 			{ renameModalOpen && (
 				<RenameModal
 					onClose={ closeModals }
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js
index 668179755ec35a..d1a2df9df6cdc3 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js
@@ -22,21 +22,34 @@ export default function RenameModal( { menuTitle, onClose, onSave } ) {
 		titleHasChanged && notEmptyString( editedMenuTitle );
 
 	return (
-		<Modal title={ __( 'Rename' ) } onRequestClose={ onClose }>
+		<Modal
+			title={ __( 'Rename' ) }
+			onRequestClose={ onClose }
+			focusOnMount="firstContentElement"
+			size="small"
+		>
 			<form className="sidebar-navigation__rename-modal-form">
 				<VStack spacing="3">
 					<TextControl
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 						value={ editedMenuTitle }
 						placeholder={ __( 'Navigation title' ) }
 						onChange={ setEditedMenuTitle }
+						label={ __( 'Name' ) }
 					/>
 					<HStack justify="right">
-						<Button variant="tertiary" onClick={ onClose }>
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ onClose }
+						>
 							{ __( 'Cancel' ) }
 						</Button>
 
 						<Button
+							__next40pxDefaultSize
+							accessibleWhenDisabled
 							disabled={ ! isEditedMenuTitleValid }
 							variant="primary"
 							type="submit"
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/single-navigation-menu.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/single-navigation-menu.js
index 960e0363f2e588..d503869c8d8748 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/single-navigation-menu.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/single-navigation-menu.js
@@ -10,10 +10,10 @@ import { SidebarNavigationScreenWrapper } from '../sidebar-navigation-screen-nav
 import ScreenNavigationMoreMenu from './more-menu';
 import NavigationMenuEditor from './navigation-menu-editor';
 import buildNavigationLabel from '../sidebar-navigation-screen-navigation-menus/build-navigation-label';
-import EditButton from './edit-button';
 
 export default function SingleNavigationMenu( {
 	navigationMenu,
+	backPath,
 	handleDelete,
 	handleDuplicate,
 	handleSave,
@@ -25,21 +25,22 @@ export default function SingleNavigationMenu( {
 			actions={
 				<>
 					<ScreenNavigationMoreMenu
+						menuId={ navigationMenu?.id }
 						menuTitle={ decodeEntities( menuTitle ) }
 						onDelete={ handleDelete }
 						onSave={ handleSave }
 						onDuplicate={ handleDuplicate }
 					/>
-					<EditButton postId={ navigationMenu?.id } />
 				</>
 			}
+			backPath={ backPath }
 			title={ buildNavigationLabel(
 				navigationMenu?.title,
 				navigationMenu?.id,
 				navigationMenu?.status
 			) }
 			description={ __(
-				'Navigation menus are a curated collection of blocks that allow visitors to get around your site.'
+				'Navigation Menus are a curated collection of blocks that allow visitors to get around your site.'
 			) }
 		>
 			<NavigationMenuEditor navigationMenuId={ navigationMenu?.id } />
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js
index 47a6cc53d6f246..7009ddc6fc9278 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/use-navigation-menu-handlers.js
@@ -2,24 +2,25 @@
  * WordPress dependencies
  */
 import { store as coreStore } from '@wordpress/core-data';
-import { __experimentalUseNavigator as useNavigator } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
 import { postType } from '.';
 import { NAVIGATION_POST_TYPE } from '../../utils/constants';
+import { unlock } from '../../lock-unlock';
 
-function useDeleteNavigationMenu() {
-	const { goTo } = useNavigator();
+const { useHistory } = unlock( routerPrivateApis );
 
+function useDeleteNavigationMenu() {
 	const { deleteEntityRecord } = useDispatch( coreStore );
-
 	const { createSuccessNotice, createErrorNotice } =
 		useDispatch( noticesStore );
+	const history = useHistory();
 
 	const handleDelete = async ( navigationMenu ) => {
 		const postId = navigationMenu?.id;
@@ -35,15 +36,18 @@ function useDeleteNavigationMenu() {
 					throwOnError: true,
 				}
 			);
-			createSuccessNotice( __( 'Deleted Navigation menu' ), {
-				type: 'snackbar',
-			} );
-			goTo( '/navigation' );
+			createSuccessNotice(
+				__( 'Navigation Menu successfully deleted.' ),
+				{
+					type: 'snackbar',
+				}
+			);
+			history.push( { postType: 'wp_navigation' } );
 		} catch ( error ) {
 			createErrorNotice(
 				sprintf(
 					/* translators: %s: error message describing why the navigation menu could not be deleted. */
-					__( `Unable to delete Navigation menu (%s).` ),
+					__( `Unable to delete Navigation Menu (%s).` ),
 					error?.message
 				),
 
@@ -104,7 +108,7 @@ function useSaveNavigationMenu() {
 					throwOnError: true,
 				}
 			);
-			createSuccessNotice( __( 'Renamed Navigation menu' ), {
+			createSuccessNotice( __( 'Renamed Navigation Menu' ), {
 				type: 'snackbar',
 			} );
 		} catch ( error ) {
@@ -114,7 +118,7 @@ function useSaveNavigationMenu() {
 			createErrorNotice(
 				sprintf(
 					/* translators: %s: error message describing why the navigation menu could not be renamed. */
-					__( `Unable to rename Navigation menu (%s).` ),
+					__( `Unable to rename Navigation Menu (%s).` ),
 					error?.message
 				),
 
@@ -129,8 +133,7 @@ function useSaveNavigationMenu() {
 }
 
 function useDuplicateNavigationMenu() {
-	const { goTo } = useNavigator();
-
+	const history = useHistory();
 	const { saveEntityRecord } = useDispatch( coreStore );
 
 	const { createSuccessNotice, createErrorNotice } =
@@ -159,16 +162,16 @@ function useDuplicateNavigationMenu() {
 			);
 
 			if ( savedRecord ) {
-				createSuccessNotice( __( 'Duplicated Navigation menu' ), {
+				createSuccessNotice( __( 'Duplicated Navigation Menu' ), {
 					type: 'snackbar',
 				} );
-				goTo( `/navigation/${ postType }/${ savedRecord.id }` );
+				history.push( { postType, postId: savedRecord.id } );
 			}
 		} catch ( error ) {
 			createErrorNotice(
 				sprintf(
 					/* translators: %s: error message describing why the navigation menu could not be deleted. */
-					__( `Unable to duplicate Navigation menu (%s).` ),
+					__( `Unable to duplicate Navigation Menu (%s).` ),
 					error?.message
 				),
 
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js
index 43a4e85fb3640d..bc32b0a9061c1e 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js
@@ -46,7 +46,7 @@ function buildMenuLabel( title, id, status ) {
 // Save a boolean to prevent us creating a fallback more than once per session.
 let hasCreatedFallback = false;
 
-export default function SidebarNavigationScreenNavigationMenus() {
+export default function SidebarNavigationScreenNavigationMenus( { backPath } ) {
 	const {
 		records: navigationMenus,
 		isResolving: isResolvingNavigationMenus,
@@ -87,7 +87,7 @@ export default function SidebarNavigationScreenNavigationMenus() {
 
 	if ( isLoading ) {
 		return (
-			<SidebarNavigationScreenWrapper>
+			<SidebarNavigationScreenWrapper backPath={ backPath }>
 				<Spinner className="edit-site-sidebar-navigation-screen-navigation-menus__loading" />
 			</SidebarNavigationScreenWrapper>
 		);
@@ -97,6 +97,7 @@ export default function SidebarNavigationScreenNavigationMenus() {
 		return (
 			<SidebarNavigationScreenWrapper
 				description={ __( 'No Navigation Menus found.' ) }
+				backPath={ backPath }
 			/>
 		);
 	}
@@ -106,6 +107,7 @@ export default function SidebarNavigationScreenNavigationMenus() {
 		return (
 			<SingleNavigationMenu
 				navigationMenu={ firstNavigationMenu }
+				backPath={ backPath }
 				handleDelete={ () => handleDelete( firstNavigationMenu ) }
 				handleDuplicate={ () => handleDuplicate( firstNavigationMenu ) }
 				handleSave={ ( edits ) =>
@@ -116,7 +118,7 @@ export default function SidebarNavigationScreenNavigationMenus() {
 	}
 
 	return (
-		<SidebarNavigationScreenWrapper>
+		<SidebarNavigationScreenWrapper backPath={ backPath }>
 			<ItemGroup>
 				{ navigationMenus?.map( ( { id, title, status }, index ) => (
 					<NavMenuItem
@@ -138,12 +140,14 @@ export function SidebarNavigationScreenWrapper( {
 	actions,
 	title,
 	description,
+	backPath,
 } ) {
 	return (
 		<SidebarNavigationScreen
 			title={ title || __( 'Navigation' ) }
 			actions={ actions }
-			description={ description || __( 'Manage your Navigation menus.' ) }
+			description={ description || __( 'Manage your Navigation Menus.' ) }
+			backPath={ backPath }
 			content={ children }
 		/>
 	);
@@ -152,7 +156,7 @@ export function SidebarNavigationScreenWrapper( {
 const NavMenuItem = ( { postId, ...props } ) => {
 	const linkInfo = useLink( {
 		postId,
-		postType: NAVIGATION_POST_TYPE,
+		postType: 'wp_navigation',
 	} );
 	return <SidebarNavigationItem { ...linkInfo } { ...props } />;
 };
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/leaf-more-menu.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/leaf-more-menu.js
index 6b093ad27e25b9..568ec291f9ed11 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/leaf-more-menu.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/leaf-more-menu.js
@@ -18,17 +18,11 @@ const POPOVER_PROPS = {
 /**
  * Internal dependencies
  */
-import {
-	isPreviewingTheme,
-	currentlyPreviewingTheme,
-} from '../../utils/is-previewing-theme';
 import { unlock } from '../../lock-unlock';
-import { getPathFromURL } from '../sync-state-with-url/use-sync-path-with-url';
 
-const { useLocation, useHistory } = unlock( routerPrivateApis );
+const { useHistory } = unlock( routerPrivateApis );
 
 export default function LeafMoreMenu( props ) {
-	const location = useLocation();
 	const history = useHistory();
 	const { block } = props;
 	const { clientId } = block;
@@ -65,30 +59,28 @@ export default function LeafMoreMenu( props ) {
 				attributes.type &&
 				history
 			) {
+				const { params } = history.getLocationWithParams();
 				history.push(
 					{
 						postType: attributes.type,
 						postId: attributes.id,
-						...( isPreviewingTheme() && {
-							wp_theme_preview: currentlyPreviewingTheme(),
-						} ),
+						canvas: 'edit',
 					},
 					{
-						backPath: getPathFromURL( location.params ),
+						backPath: params,
 					}
 				);
 			}
 			if ( name === 'core/page-list-item' && attributes.id && history ) {
+				const { params } = history.getLocationWithParams();
 				history.push(
 					{
 						postType: 'page',
 						postId: attributes.id,
-						...( isPreviewingTheme() && {
-							wp_theme_preview: currentlyPreviewingTheme(),
-						} ),
+						canvas: 'edit',
 					},
 					{
-						backPath: getPathFromURL( location.params ),
+						backPath: params,
 					}
 				);
 			}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/style.scss
index 525dd68d3b9f79..3667db2d9331d2 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/style.scss
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/style.scss
@@ -3,67 +3,6 @@
 }
 
 .edit-site-sidebar-navigation-screen-navigation-menus__content {
-	.offcanvas-editor-list-view-leaf {
-		max-width: calc(100% - #{ $grid-unit-05 });
-		border-radius: $radius-block-ui;
-		&:hover,
-		&:focus,
-		&[aria-current] {
-			background: $gray-800;
-		}
-		.block-editor-list-view-block__menu {
-			margin-left: -$grid-unit-10;
-		}
-		&.is-selected {
-			> td {
-				background: transparent;
-			}
-
-			.block-editor-list-view-block-contents {
-				color: inherit;
-			}
-
-			&:not(:hover) {
-				.block-editor-list-view-block__menu {
-					opacity: 0;
-				}
-			}
-
-			&:hover,
-			&:focus {
-				color: $white;
-
-				.block-editor-list-view-block__menu-cell {
-					opacity: 1;
-				}
-			}
-
-			.block-editor-list-view-block__menu {
-				opacity: 1;
-
-				&:focus {
-					box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-				}
-			}
-		}
-
-		.block-editor-list-view-block-contents {
-			&:focus {
-				&::after {
-					box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-				}
-			}
-		}
-
-		&.is-branch-selected:not(.is-selected):not(.is-synced-branch) {
-			background: transparent;
-
-			&:hover {
-				background: $gray-800;
-			}
-		}
-	}
-
 	.block-editor-list-view-leaf .block-editor-list-view-block__contents-cell {
 		width: 100%;
 	}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-page/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-page/index.js
deleted file mode 100644
index 110bc920fb0a9f..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-page/index.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { useDispatch, useSelect } from '@wordpress/data';
-import {
-	__experimentalUseNavigator as useNavigator,
-	__experimentalVStack as VStack,
-	ExternalLink,
-	__experimentalTruncate as Truncate,
-} from '@wordpress/components';
-import { store as coreStore, useEntityRecord } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { pencil } from '@wordpress/icons';
-import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
-import { escapeAttribute } from '@wordpress/escape-html';
-import { safeDecodeURIComponent, filterURLForDisplay } from '@wordpress/url';
-import { useEffect } from '@wordpress/element';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import { unlock } from '../../lock-unlock';
-import { store as editSiteStore } from '../../store';
-import SidebarButton from '../sidebar-button';
-import PageDetails from './page-details';
-import PageActions from '../page-actions';
-import SidebarNavigationScreenDetailsFooter from '../sidebar-navigation-screen-details-footer';
-
-const { useHistory } = unlock( routerPrivateApis );
-
-export default function SidebarNavigationScreenPage() {
-	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
-	const history = useHistory();
-	const {
-		params: { postId },
-		goTo,
-	} = useNavigator();
-	const { record, hasResolved } = useEntityRecord(
-		'postType',
-		'page',
-		postId
-	);
-
-	const { featuredMediaAltText, featuredMediaSourceUrl } = useSelect(
-		( select ) => {
-			const { getEntityRecord } = select( coreStore );
-			// Featured image.
-			const attachedMedia = record?.featured_media
-				? getEntityRecord(
-						'postType',
-						'attachment',
-						record?.featured_media
-				  )
-				: null;
-
-			return {
-				featuredMediaSourceUrl:
-					attachedMedia?.media_details.sizes?.medium?.source_url ||
-					attachedMedia?.source_url,
-				featuredMediaAltText: escapeAttribute(
-					attachedMedia?.alt_text ||
-						attachedMedia?.description?.raw ||
-						''
-				),
-			};
-		},
-		[ record ]
-	);
-
-	// Redirect to the main pages navigation screen if the page is not found or has been deleted.
-	useEffect( () => {
-		if ( hasResolved && ! record ) {
-			history.push( {
-				path: '/page',
-				postId: undefined,
-				postType: undefined,
-				canvas: 'view',
-			} );
-		}
-	}, [ hasResolved, history ] );
-
-	const featureImageAltText = featuredMediaAltText
-		? decodeEntities( featuredMediaAltText )
-		: decodeEntities( record?.title?.rendered || __( 'Featured image' ) );
-
-	return record ? (
-		<SidebarNavigationScreen
-			title={ decodeEntities(
-				record?.title?.rendered || __( '(no title)' )
-			) }
-			actions={
-				<>
-					<PageActions
-						postId={ postId }
-						toggleProps={ { as: SidebarButton } }
-						onRemove={ () => {
-							goTo( '/page' );
-						} }
-					/>
-					<SidebarButton
-						onClick={ () => setCanvasMode( 'edit' ) }
-						label={ __( 'Edit' ) }
-						icon={ pencil }
-					/>
-				</>
-			}
-			meta={
-				<ExternalLink
-					className="edit-site-sidebar-navigation-screen__page-link"
-					href={ record.link }
-				>
-					{ filterURLForDisplay(
-						safeDecodeURIComponent( record.link )
-					) }
-				</ExternalLink>
-			}
-			content={
-				<>
-					{ !! featuredMediaSourceUrl && (
-						<VStack
-							className="edit-site-sidebar-navigation-screen-page__featured-image-wrapper"
-							alignment="left"
-							spacing={ 2 }
-						>
-							<div className="edit-site-sidebar-navigation-screen-page__featured-image has-image">
-								<img
-									alt={ featureImageAltText }
-									src={ featuredMediaSourceUrl }
-								/>
-							</div>
-						</VStack>
-					) }
-					{ !! record?.excerpt?.rendered && (
-						<Truncate
-							className="edit-site-sidebar-navigation-screen-page__excerpt"
-							numberOfLines={ 3 }
-						>
-							{ stripHTML( record.excerpt.rendered ) }
-						</Truncate>
-					) }
-					<PageDetails id={ postId } />
-				</>
-			}
-			footer={
-				record?.modified ? (
-					<SidebarNavigationScreenDetailsFooter record={ record } />
-				) : null
-			}
-		/>
-	) : null;
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-page/page-details.js b/packages/edit-site/src/components/sidebar-navigation-screen-page/page-details.js
deleted file mode 100644
index 7fcedcf40ce134..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-page/page-details.js
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, _x, sprintf } from '@wordpress/i18n';
-import { __experimentalTruncate as Truncate } from '@wordpress/components';
-import { count as wordCount } from '@wordpress/wordcount';
-import { useSelect } from '@wordpress/data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { store as coreStore, useEntityRecord } from '@wordpress/core-data';
-import { safeDecodeURIComponent } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
-import StatusLabel from './status-label';
-import { unlock } from '../../lock-unlock';
-import { store as editSiteStore } from '../../store';
-import {
-	SidebarNavigationScreenDetailsPanel,
-	SidebarNavigationScreenDetailsPanelRow,
-	SidebarNavigationScreenDetailsPanelLabel,
-	SidebarNavigationScreenDetailsPanelValue,
-} from '../sidebar-navigation-screen-details-panel';
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
-
-// Taken from packages/editor/src/components/time-to-read/index.js.
-const AVERAGE_READING_RATE = 189;
-
-function getPageDetails( page ) {
-	if ( ! page ) {
-		return [];
-	}
-
-	const details = [
-		{
-			label: __( 'Status' ),
-			value: (
-				<StatusLabel
-					status={ page?.password ? 'protected' : page.status }
-					date={ page?.date }
-					short
-				/>
-			),
-		},
-		{
-			label: __( 'Slug' ),
-			value: (
-				<Truncate numberOfLines={ 1 }>
-					{ safeDecodeURIComponent(
-						page.slug || page.generated_slug
-					) }
-				</Truncate>
-			),
-		},
-	];
-
-	if ( page?.templateTitle ) {
-		details.push( {
-			label: __( 'Template' ),
-			value: decodeEntities( page.templateTitle ),
-		} );
-	}
-
-	if ( page?.parentTitle ) {
-		details.push( {
-			label: __( 'Parent' ),
-			value: decodeEntities( page.parentTitle || __( '(no title)' ) ),
-		} );
-	}
-
-	/*
-	 * translators: If your word count is based on single characters (e.g. East Asian characters),
-	 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
-	 * Do not translate into your own language.
-	 */
-	const wordCountType = _x( 'words', 'Word count type. Do not translate!' );
-	const wordsCounted = page?.content?.rendered
-		? wordCount( page.content.rendered, wordCountType )
-		: 0;
-	const readingTime = Math.round( wordsCounted / AVERAGE_READING_RATE );
-
-	if ( wordsCounted && ! page?.isPostsPage ) {
-		details.push(
-			{
-				label: __( 'Words' ),
-				value: wordsCounted.toLocaleString() || __( 'Unknown' ),
-			},
-			{
-				label: __( 'Time to read' ),
-				value:
-					readingTime > 1
-						? sprintf(
-								/* translators: %s: is the number of minutes. */
-								__( '%s mins' ),
-								readingTime.toLocaleString()
-						  )
-						: __( '< 1 min' ),
-			}
-		);
-	}
-	return details;
-}
-
-export default function PageDetails( { id } ) {
-	const { record } = useEntityRecord( 'postType', 'page', id );
-	const { parentTitle, templateTitle, isPostsPage } = useSelect(
-		( select ) => {
-			const { getEditedPostId } = unlock( select( editSiteStore ) );
-			const template = select( coreStore ).getEntityRecord(
-				'postType',
-				TEMPLATE_POST_TYPE,
-				getEditedPostId()
-			);
-			const _templateTitle = template?.title?.rendered;
-
-			// Parent page title.
-			const _parentTitle = record?.parent
-				? select( coreStore ).getEntityRecord(
-						'postType',
-						'page',
-						record.parent,
-						{
-							_fields: [ 'title' ],
-						}
-				  )?.title?.rendered
-				: null;
-
-			const { getEntityRecord } = select( coreStore );
-			const siteSettings = getEntityRecord( 'root', 'site' );
-
-			return {
-				parentTitle: _parentTitle,
-				templateTitle: _templateTitle,
-				isPostsPage: record?.id === siteSettings?.page_for_posts,
-			};
-		},
-		[ record?.parent, record?.id ]
-	);
-	return (
-		<SidebarNavigationScreenDetailsPanel
-			spacing={ 5 }
-			title={ __( 'Details' ) }
-		>
-			{ getPageDetails( {
-				parentTitle,
-				templateTitle,
-				isPostsPage,
-				...record,
-			} ).map( ( { label, value } ) => (
-				<SidebarNavigationScreenDetailsPanelRow key={ label }>
-					<SidebarNavigationScreenDetailsPanelLabel>
-						{ label }
-					</SidebarNavigationScreenDetailsPanelLabel>
-					<SidebarNavigationScreenDetailsPanelValue>
-						{ value }
-					</SidebarNavigationScreenDetailsPanelValue>
-				</SidebarNavigationScreenDetailsPanelRow>
-			) ) }
-		</SidebarNavigationScreenDetailsPanel>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-page/status-label.js b/packages/edit-site/src/components/sidebar-navigation-screen-page/status-label.js
deleted file mode 100644
index f864d48de33834..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-page/status-label.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { __, sprintf } from '@wordpress/i18n';
-import { dateI18n, getDate, humanTimeDiff } from '@wordpress/date';
-import { createInterpolateElement } from '@wordpress/element';
-
-export default function StatusLabel( { status, date, short } ) {
-	const relateToNow = humanTimeDiff( date );
-	let statusLabel = status;
-	switch ( status ) {
-		case 'publish':
-			statusLabel = date
-				? createInterpolateElement(
-						sprintf(
-							/* translators: %s: is the relative time when the post was published. */
-							__( 'Published <time>%s</time>' ),
-							relateToNow
-						),
-						{ time: <time dateTime={ date } /> }
-				  )
-				: __( 'Published' );
-			break;
-		case 'future':
-			const formattedDate = dateI18n(
-				short ? 'M j' : 'F j',
-				getDate( date )
-			);
-			statusLabel = date
-				? createInterpolateElement(
-						sprintf(
-							/* translators: %s: is the formatted date and time on which the post is scheduled to be published. */
-							__( 'Scheduled: <time>%s</time>' ),
-							formattedDate
-						),
-						{ time: <time dateTime={ date } /> }
-				  )
-				: __( 'Scheduled' );
-			break;
-		case 'draft':
-			statusLabel = __( 'Draft' );
-			break;
-		case 'pending':
-			statusLabel = __( 'Pending' );
-			break;
-		case 'private':
-			statusLabel = __( 'Private' );
-			break;
-		case 'protected':
-			statusLabel = __( 'Password protected' );
-			break;
-	}
-
-	return (
-		<div
-			className={ classnames(
-				'edit-site-sidebar-navigation-screen-page__status',
-				{
-					[ `has-status has-${ status }-status` ]: !! status,
-				}
-			) }
-		>
-			{ statusLabel }
-		</div>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-page/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-page/style.scss
deleted file mode 100644
index 66efe31726e8b7..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-page/style.scss
+++ /dev/null
@@ -1,63 +0,0 @@
-.edit-site-sidebar-navigation-screen-page__featured-image-wrapper {
-	background-color: $gray-800;
-	margin-bottom: $grid-unit-20;
-	min-height: 128px;
-	border-radius: $grid-unit-05;
-}
-
-.edit-site-sidebar-navigation-screen-page__featured-image {
-	border-radius: 2px;
-	height: 128px;
-	overflow: hidden;
-	width: 100%;
-	background-size: cover;
-	background-position: 50% 50%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	color: $gray-600;
-	img {
-		object-fit: cover;
-		height: 100%;
-		width: 100%;
-		object-position: 50% 50%;
-	}
-}
-
-.edit-site-sidebar-navigation-screen-page__featured-image-description {
-	font-size: $helptext-font-size;
-}
-
-.edit-site-sidebar-navigation-screen-page__excerpt {
-	font-size: $helptext-font-size;
-	margin-bottom: $grid-unit-30;
-}
-
-.edit-site-sidebar-navigation-screen-page__modified {
-	margin: 0 0 $grid-unit-20 0;
-	color: $gray-600;
-	margin-left: $grid-unit-20;
-	.components-text {
-		color: $gray-600;
-	}
-}
-
-.edit-site-sidebar-navigation-screen-page__status {
-	display: inline-flex;
-
-	time {
-		display: contents;
-	}
-
-	svg {
-		height: 16px;
-		width: 16px;
-		margin-right: $grid-unit-10;
-		fill: $alert-yellow;
-	}
-
-	&.has-publish-status svg,
-	&.has-future-status svg {
-		fill: $alert-green;
-	}
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
deleted file mode 100644
index e9a6163a0047e9..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalItemGroup as ItemGroup,
-	__experimentalItem as Item,
-	__experimentalTruncate as Truncate,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { useState } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-import { layout, page, home, verse, plus } from '@wordpress/icons';
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import { useLink } from '../routes/link';
-import SidebarNavigationItem from '../sidebar-navigation-item';
-import SidebarButton from '../sidebar-button';
-import AddNewPageModal from '../add-new-page';
-import { unlock } from '../../lock-unlock';
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
-
-const { useHistory } = unlock( routerPrivateApis );
-
-const PageItem = ( { postType = 'page', postId, ...props } ) => {
-	const linkInfo = useLink(
-		{
-			postType,
-			postId,
-		},
-		{
-			backPath: '/page',
-		}
-	);
-	return <SidebarNavigationItem { ...linkInfo } { ...props } />;
-};
-
-export default function SidebarNavigationScreenPages() {
-	const { records: pages, isResolving: isLoadingPages } = useEntityRecords(
-		'postType',
-		'page',
-		{
-			status: 'any',
-			per_page: -1,
-		}
-	);
-	const { records: templates, isResolving: isLoadingTemplates } =
-		useEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
-			per_page: -1,
-		} );
-
-	const dynamicPageTemplates = templates?.filter( ( { slug } ) =>
-		[ '404', 'search' ].includes( slug )
-	);
-
-	const homeTemplate =
-		templates?.find( ( template ) => template.slug === 'front-page' ) ||
-		templates?.find( ( template ) => template.slug === 'home' ) ||
-		templates?.find( ( template ) => template.slug === 'index' );
-
-	const getPostsPageTemplate = () =>
-		templates?.find( ( template ) => template.slug === 'home' ) ||
-		templates?.find( ( template ) => template.slug === 'index' );
-
-	const pagesAndTemplates = pages?.concat( dynamicPageTemplates, [
-		homeTemplate,
-	] );
-
-	const { frontPage, postsPage } = useSelect( ( select ) => {
-		const { getEntityRecord } = select( coreStore );
-		const siteSettings = getEntityRecord( 'root', 'site' );
-		return {
-			frontPage: siteSettings?.page_on_front,
-			postsPage: siteSettings?.page_for_posts,
-		};
-	}, [] );
-
-	const isHomePageBlog = frontPage === postsPage;
-
-	const reorderedPages = pages && [ ...pages ];
-
-	if ( ! isHomePageBlog && reorderedPages?.length ) {
-		const homePageIndex = reorderedPages.findIndex(
-			( item ) => item.id === frontPage
-		);
-		const homePage = reorderedPages.splice( homePageIndex, 1 );
-		reorderedPages?.splice( 0, 0, ...homePage );
-
-		const postsPageIndex = reorderedPages.findIndex(
-			( item ) => item.id === postsPage
-		);
-
-		const blogPage = reorderedPages.splice( postsPageIndex, 1 );
-
-		reorderedPages.splice( 1, 0, ...blogPage );
-	}
-
-	const [ showAddPage, setShowAddPage ] = useState( false );
-
-	const history = useHistory();
-
-	const handleNewPage = ( { type, id } ) => {
-		// Navigate to the created template editor.
-		history.push( {
-			postId: id,
-			postType: type,
-			canvas: 'edit',
-		} );
-		setShowAddPage( false );
-	};
-
-	const getPageProps = ( id ) => {
-		let itemIcon = page;
-		const postsPageTemplateId =
-			postsPage && postsPage === id ? getPostsPageTemplate()?.id : null;
-
-		switch ( id ) {
-			case frontPage:
-				itemIcon = home;
-				break;
-			case postsPage:
-				itemIcon = verse;
-				break;
-		}
-
-		return {
-			icon: itemIcon,
-			postType: postsPageTemplateId ? TEMPLATE_POST_TYPE : 'page',
-			postId: postsPageTemplateId || id,
-		};
-	};
-
-	const pagesLink = useLink( { path: '/pages' } );
-	const manageAllPagesProps = window?.__experimentalAdminViews
-		? { ...pagesLink }
-		: {
-				href: 'edit.php?post_type=page',
-				onClick: () => {
-					document.location = 'edit.php?post_type=page';
-				},
-		  };
-
-	return (
-		<>
-			{ showAddPage && (
-				<AddNewPageModal
-					onSave={ handleNewPage }
-					onClose={ () => setShowAddPage( false ) }
-				/>
-			) }
-			<SidebarNavigationScreen
-				title={ __( 'Pages' ) }
-				description={ __( 'Browse and edit pages on your site.' ) }
-				actions={
-					<SidebarButton
-						icon={ plus }
-						label={ __( 'Draft a new page' ) }
-						onClick={ () => setShowAddPage( true ) }
-					/>
-				}
-				content={
-					<>
-						{ ( isLoadingPages || isLoadingTemplates ) && (
-							<ItemGroup>
-								<Item>{ __( 'Loading pages…' ) }</Item>
-							</ItemGroup>
-						) }
-						{ ! ( isLoadingPages || isLoadingTemplates ) && (
-							<ItemGroup>
-								{ ! pagesAndTemplates?.length && (
-									<Item>{ __( 'No page found' ) }</Item>
-								) }
-								{ isHomePageBlog && homeTemplate && (
-									<PageItem
-										postType={ TEMPLATE_POST_TYPE }
-										postId={ homeTemplate.id }
-										key={ homeTemplate.id }
-										icon={ home }
-										withChevron
-									>
-										<Truncate numberOfLines={ 1 }>
-											{ decodeEntities(
-												homeTemplate.title?.rendered ||
-													__( '(no title)' )
-											) }
-										</Truncate>
-									</PageItem>
-								) }
-								{ reorderedPages?.map( ( { id, title } ) => (
-									<PageItem
-										{ ...getPageProps( id ) }
-										key={ id }
-										withChevron
-									>
-										<Truncate numberOfLines={ 1 }>
-											{ decodeEntities(
-												title?.rendered ||
-													__( '(no title)' )
-											) }
-										</Truncate>
-									</PageItem>
-								) ) }
-							</ItemGroup>
-						) }
-					</>
-				}
-				footer={
-					<VStack spacing={ 0 }>
-						{ dynamicPageTemplates?.map( ( item ) => (
-							<PageItem
-								postType={ TEMPLATE_POST_TYPE }
-								postId={ item.id }
-								key={ item.id }
-								icon={ layout }
-								withChevron
-							>
-								<Truncate numberOfLines={ 1 }>
-									{ decodeEntities(
-										item.title?.rendered ||
-											__( '(no title)' )
-									) }
-								</Truncate>
-							</PageItem>
-						) ) }
-						<SidebarNavigationItem
-							className="edit-site-sidebar-navigation-screen-pages__see-all"
-							{ ...manageAllPagesProps }
-						>
-							{ __( 'Manage all pages' ) }
-						</SidebarNavigationItem>
-					</VStack>
-				}
-			/>
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
deleted file mode 100644
index 693d16914869ad..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __experimentalUseNavigator as useNavigator } from '@wordpress/components';
-import { useDispatch } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { pencil } from '@wordpress/icons';
-import { getQueryArgs } from '@wordpress/url';
-
-/**
- * Internal dependencies
- */
-import SidebarButton from '../sidebar-button';
-import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import useInitEditedEntityFromURL from '../sync-state-with-url/use-init-edited-entity-from-url';
-import usePatternDetails from './use-pattern-details';
-import { store as editSiteStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-import TemplateActions from '../template-actions';
-import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
-
-export default function SidebarNavigationScreenPattern() {
-	const navigator = useNavigator();
-	const {
-		params: { postType, postId },
-	} = navigator;
-	const { categoryType } = getQueryArgs( window.location.href );
-	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
-
-	useInitEditedEntityFromURL();
-
-	const patternDetails = usePatternDetails( postType, postId );
-
-	// The absence of a category type in the query params for template parts
-	// indicates the user has arrived at the template part via the "manage all"
-	// page and the back button should return them to that list page.
-	const backPath =
-		! categoryType && postType === TEMPLATE_PART_POST_TYPE
-			? '/wp_template_part/all'
-			: '/patterns';
-
-	return (
-		<SidebarNavigationScreen
-			actions={
-				<>
-					<TemplateActions
-						postType={ postType }
-						postId={ postId }
-						toggleProps={ { as: SidebarButton } }
-						onRemove={ () => {
-							navigator.goTo( backPath );
-						} }
-					/>
-					<SidebarButton
-						onClick={ () => setCanvasMode( 'edit' ) }
-						label={ __( 'Edit' ) }
-						icon={ pencil }
-					/>
-				</>
-			}
-			backPath={ backPath }
-			{ ...patternDetails }
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/style.scss
deleted file mode 100644
index 95a27ba5aa5fa5..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/style.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.edit-site-sidebar-navigation-screen-pattern__added-by-description {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-top: $grid-unit-30;
-}
-
-.edit-site-sidebar-navigation-screen-pattern__added-by-description-author {
-	display: inline-flex;
-	align-items: center;
-
-	img {
-		border-radius: $grid-unit-15;
-	}
-
-	svg {
-		fill: $gray-600;
-	}
-}
-
-.edit-site-sidebar-navigation-screen-pattern__added-by-description-author-icon {
-	width: 24px;
-	height: 24px;
-	margin-right: $grid-unit-10;
-}
-
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list-item.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list-item.js
deleted file mode 100644
index 22d9d841dc6fd5..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list-item.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import SidebarNavigationItem from '../sidebar-navigation-item';
-import useNavigationMenuTitle from './use-navigation-menu-title';
-import { useLink } from '../routes/link';
-import { NAVIGATION_POST_TYPE } from '../../utils/constants';
-
-export default function TemplatePartNavigationMenuListItem( { id } ) {
-	const title = useNavigationMenuTitle( id );
-
-	const linkInfo = useLink( {
-		postId: id,
-		postType: NAVIGATION_POST_TYPE,
-	} );
-
-	if ( ! id || title === undefined ) {
-		return null;
-	}
-
-	return (
-		<SidebarNavigationItem withChevron { ...linkInfo }>
-			{ title || __( '(no title)' ) }
-		</SidebarNavigationItem>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list.js
deleted file mode 100644
index 4171b1e782575e..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
-/**
- * Internal dependencies
- */
-import TemplatePartNavigationMenuListItem from './template-part-navigation-menu-list-item';
-
-export default function TemplatePartNavigationMenuList( { menus } ) {
-	return (
-		<ItemGroup className="edit-site-sidebar-navigation-screen-template-part-navigation-menu-list">
-			{ menus.map( ( menuId ) => (
-				<TemplatePartNavigationMenuListItem
-					key={ menuId }
-					id={ menuId }
-				/>
-			) ) }
-		</ItemGroup>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu.js
deleted file mode 100644
index b7f9b5295fd0f5..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { __experimentalHeading as Heading } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import NavigationMenuEditor from '../sidebar-navigation-screen-navigation-menu/navigation-menu-editor';
-import useNavigationMenuTitle from './use-navigation-menu-title';
-
-export default function TemplatePartNavigationMenu( { id } ) {
-	const title = useNavigationMenuTitle( id );
-
-	if ( ! id || title === undefined ) {
-		return null;
-	}
-
-	return (
-		<>
-			<Heading
-				className="edit-site-sidebar-navigation-screen-template-part-navigation-menu__title"
-				size="11"
-				upperCase={ true }
-				weight={ 500 }
-			>
-				{ title || __( 'Navigation' ) }
-			</Heading>
-			<NavigationMenuEditor navigationMenuId={ id } />
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menus.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menus.js
deleted file mode 100644
index d04eba2e435b45..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menus.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { __experimentalHeading as Heading } from '@wordpress/components';
-/**
- * Internal dependencies
- */
-import TemplatePartNavigationMenu from './template-part-navigation-menu';
-import TemplatePartNavigationMenuList from './template-part-navigation-menu-list';
-
-export default function TemplatePartNavigationMenus( { menus } ) {
-	if ( ! menus.length ) return null;
-
-	// if there is a single menu then render TemplatePartNavigationMenu
-	if ( menus.length === 1 ) {
-		return <TemplatePartNavigationMenu id={ menus[ 0 ] } />;
-	}
-
-	// if there are multiple menus then render TemplatePartNavigationMenuList
-	return (
-		<>
-			<Heading
-				className="edit-site-sidebar-navigation-screen-template-part-navigation-menu__title"
-				size="11"
-				upperCase={ true }
-				weight={ 500 }
-			>
-				{ __( 'Navigation' ) }
-			</Heading>
-			<TemplatePartNavigationMenuList menus={ menus } />
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/use-navigation-menu-content.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/use-navigation-menu-content.js
deleted file mode 100644
index 249124b1054cec..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/use-navigation-menu-content.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { parse } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import TemplatePartNavigationMenus from './template-part-navigation-menus';
-import useEditedEntityRecord from '../use-edited-entity-record';
-import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
-
-function getBlocksFromRecord( record ) {
-	if ( record?.blocks ) {
-		return record?.blocks;
-	}
-
-	return record?.content && typeof record.content !== 'function'
-		? parse( record.content )
-		: [];
-}
-
-/**
- * Retrieves a list of specific blocks from a given tree of blocks.
- *
- * @param {string} targetBlockType The name of the block type to find.
- * @param {Array}  blocks          A list of blocks from a template part entity.
- *
- * @return {Array} A list of any navigation blocks found in the blocks.
- */
-function getBlocksOfTypeFromBlocks( targetBlockType, blocks ) {
-	if ( ! targetBlockType || ! blocks?.length ) {
-		return [];
-	}
-
-	const findInBlocks = ( _blocks ) => {
-		if ( ! _blocks ) {
-			return [];
-		}
-
-		const navigationBlocks = [];
-
-		for ( const block of _blocks ) {
-			if ( block.name === targetBlockType ) {
-				navigationBlocks.push( block );
-			}
-
-			if ( block?.innerBlocks ) {
-				const innerNavigationBlocks = findInBlocks( block.innerBlocks );
-
-				if ( innerNavigationBlocks.length ) {
-					navigationBlocks.push( ...innerNavigationBlocks );
-				}
-			}
-		}
-
-		return navigationBlocks;
-	};
-
-	return findInBlocks( blocks );
-}
-
-export default function useNavigationMenuContent( postType, postId ) {
-	const { record } = useEditedEntityRecord( postType, postId );
-
-	// Only managing navigation menus in template parts is supported
-	// to match previous behaviour. This could potentially be expanded
-	// to patterns as well.
-	if ( postType !== TEMPLATE_PART_POST_TYPE ) {
-		return;
-	}
-
-	const blocks = getBlocksFromRecord( record );
-	const navigationBlocks = getBlocksOfTypeFromBlocks(
-		'core/navigation',
-		blocks
-	);
-
-	if ( ! navigationBlocks.length ) {
-		return;
-	}
-
-	const navigationMenuIds = navigationBlocks?.map(
-		( block ) => block.attributes.ref
-	);
-
-	// Dedupe the Navigation blocks, as you can have multiple navigation blocks in the template.
-	// Also, filter out undefined values, as blocks don't have an id when initially added.
-	const uniqueNavigationMenuIds = [ ...new Set( navigationMenuIds ) ].filter(
-		( menuId ) => menuId
-	);
-
-	if ( ! uniqueNavigationMenuIds?.length ) {
-		return;
-	}
-
-	return <TemplatePartNavigationMenus menus={ uniqueNavigationMenuIds } />;
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/use-navigation-menu-title.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/use-navigation-menu-title.js
deleted file mode 100644
index 4585c98ce3e1f5..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/use-navigation-menu-title.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { NAVIGATION_POST_TYPE } from '../../utils/constants';
-
-export default function useNavigationMenuTitle( id ) {
-	return useSelect(
-		( select ) => {
-			if ( ! id ) {
-				return undefined;
-			}
-
-			const editedRecord = select( coreStore ).getEditedEntityRecord(
-				'postType',
-				NAVIGATION_POST_TYPE,
-				id
-			);
-
-			// Do not display a 'trashed' navigation menu.
-			return editedRecord.status === 'trash'
-				? undefined
-				: editedRecord.title;
-		},
-		[ id ]
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/use-pattern-details.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/use-pattern-details.js
deleted file mode 100644
index 4e1e9ec6a11aa8..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/use-pattern-details.js
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * External dependencies
- */
-import { sentenceCase } from 'change-case';
-
-/**
- * WordPress dependencies
- */
-import { __, sprintf } from '@wordpress/i18n';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as editorStore } from '@wordpress/editor';
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { useAddedBy } from '../list/added-by';
-import useEditedEntityRecord from '../use-edited-entity-record';
-import useNavigationMenuContent from './use-navigation-menu-content';
-import SidebarNavigationScreenDetailsFooter from '../sidebar-navigation-screen-details-footer';
-import {
-	SidebarNavigationScreenDetailsPanel,
-	SidebarNavigationScreenDetailsPanelRow,
-	SidebarNavigationScreenDetailsPanelLabel,
-	SidebarNavigationScreenDetailsPanelValue,
-} from '../sidebar-navigation-screen-details-panel';
-import {
-	PATTERN_TYPES,
-	TEMPLATE_PART_POST_TYPE,
-	PATTERN_SYNC_TYPES,
-	TEMPLATE_ORIGINS,
-} from '../../utils/constants';
-
-export default function usePatternDetails( postType, postId ) {
-	const { getDescription, getTitle, record } = useEditedEntityRecord(
-		postType,
-		postId
-	);
-	const templatePartAreas = useSelect(
-		( select ) =>
-			select( editorStore ).__experimentalGetDefaultTemplatePartAreas(),
-		[]
-	);
-	const { currentTheme, userPatternCategories } = useSelect( ( select ) => {
-		const { getCurrentTheme, getUserPatternCategories } =
-			select( coreStore );
-
-		return {
-			currentTheme: getCurrentTheme(),
-			userPatternCategories: getUserPatternCategories(),
-		};
-	}, [] );
-
-	const addedBy = useAddedBy( postType, postId );
-	const isAddedByActiveTheme =
-		addedBy.type === 'theme' && record.theme === currentTheme?.stylesheet;
-	const title = getTitle();
-	let description = getDescription();
-
-	if ( ! description && addedBy.text ) {
-		description =
-			postType === PATTERN_TYPES.user
-				? sprintf(
-						// translators: %s: pattern title e.g: "Header".
-						__( 'This is the %s pattern.' ),
-						getTitle()
-				  )
-				: sprintf(
-						// translators: %s: template part title e.g: "Header".
-						__( 'This is the %s template part.' ),
-						getTitle()
-				  );
-	}
-
-	if ( ! description && postType === PATTERN_TYPES.user && record?.title ) {
-		description = sprintf(
-			// translators: %s: user created pattern title e.g. "Footer".
-			__( 'This is the %s pattern.' ),
-			record.title
-		);
-	}
-
-	const footer = record?.modified ? (
-		<SidebarNavigationScreenDetailsFooter record={ record } />
-	) : null;
-
-	const details = [];
-
-	if (
-		postType === PATTERN_TYPES.user ||
-		postType === TEMPLATE_PART_POST_TYPE
-	) {
-		details.push( {
-			label: __( 'Syncing' ),
-			value:
-				record.wp_pattern_sync_status === PATTERN_SYNC_TYPES.unsynced
-					? __( 'Not synced' )
-					: __( 'Fully synced' ),
-		} );
-
-		if ( record.wp_pattern_category?.length === 0 ) {
-			details.push( {
-				label: __( 'Categories' ),
-				value: __( 'Uncategorized' ),
-			} );
-		}
-		if ( record.wp_pattern_category?.length > 0 ) {
-			const patternCategories = new Map();
-			userPatternCategories.forEach( ( userCategory ) =>
-				patternCategories.set( userCategory.id, userCategory )
-			);
-
-			const categories = record.wp_pattern_category
-				.filter( ( category ) => patternCategories.get( category ) )
-				.map( ( category ) => patternCategories.get( category ).label );
-
-			details.push( {
-				label: __( 'Categories' ),
-				value: categories.length > 0 ? categories.join( ', ' ) : '',
-			} );
-		}
-	}
-
-	if ( postType === TEMPLATE_PART_POST_TYPE ) {
-		const templatePartArea = templatePartAreas.find(
-			( area ) => area.area === record.area
-		);
-
-		let areaDetailValue = templatePartArea?.label;
-
-		if ( ! areaDetailValue ) {
-			areaDetailValue = record.area
-				? sprintf(
-						// translators: %s: Sentenced cased template part area e.g: "My custom area".
-						__( '%s (removed)' ),
-						sentenceCase( record.area )
-				  )
-				: __( 'None' );
-		}
-
-		details.push( { label: __( 'Area' ), value: areaDetailValue } );
-	}
-
-	if (
-		postType === TEMPLATE_PART_POST_TYPE &&
-		addedBy.text &&
-		! isAddedByActiveTheme
-	) {
-		details.push( {
-			label: __( 'Added by' ),
-			value: (
-				<span className="edit-site-sidebar-navigation-screen-pattern__added-by-description-author">
-					{ addedBy.text }
-				</span>
-			),
-		} );
-	}
-
-	if (
-		postType === TEMPLATE_PART_POST_TYPE &&
-		addedBy.text &&
-		( record.origin === TEMPLATE_ORIGINS.plugin ||
-			record.has_theme_file === true )
-	) {
-		details.push( {
-			label: __( 'Customized' ),
-			value: (
-				<span className="edit-site-sidebar-navigation-screen-pattern__added-by-description-customized">
-					{ addedBy.isCustomized ? __( 'Yes' ) : __( 'No' ) }
-				</span>
-			),
-		} );
-	}
-
-	const content = (
-		<>
-			{ useNavigationMenuContent( postType, postId ) }
-			{ !! details.length && (
-				<SidebarNavigationScreenDetailsPanel
-					spacing={ 5 }
-					title={ __( 'Details' ) }
-				>
-					{ details.map( ( { label, value } ) => (
-						<SidebarNavigationScreenDetailsPanelRow key={ label }>
-							<SidebarNavigationScreenDetailsPanelLabel>
-								{ label }
-							</SidebarNavigationScreenDetailsPanelLabel>
-							<SidebarNavigationScreenDetailsPanelValue>
-								{ value }
-							</SidebarNavigationScreenDetailsPanelValue>
-						</SidebarNavigationScreenDetailsPanelRow>
-					) ) }
-				</SidebarNavigationScreenDetailsPanel>
-			) }
-		</>
-	);
-
-	return { title, description, content, footer };
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/category-item.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/category-item.js
index 894cd5f8048183..9c193304b99fc8 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/category-item.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/category-item.js
@@ -3,6 +3,12 @@
  */
 import SidebarNavigationItem from '../sidebar-navigation-item';
 import { useLink } from '../routes/link';
+import {
+	TEMPLATE_PART_POST_TYPE,
+	TEMPLATE_PART_ALL_AREAS_CATEGORY,
+	PATTERN_DEFAULT_CATEGORY,
+	PATTERN_TYPES,
+} from '../../utils/constants';
 
 export default function CategoryItem( {
 	count,
@@ -13,9 +19,15 @@ export default function CategoryItem( {
 	type,
 } ) {
 	const linkInfo = useLink( {
-		path: '/patterns',
-		categoryType: type,
-		categoryId: id,
+		categoryId:
+			id !== TEMPLATE_PART_ALL_AREAS_CATEGORY &&
+			id !== PATTERN_DEFAULT_CATEGORY
+				? id
+				: undefined,
+		postType:
+			type === TEMPLATE_PART_POST_TYPE
+				? TEMPLATE_PART_POST_TYPE
+				: PATTERN_TYPES.user,
 	} );
 
 	if ( ! count ) {
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
index 70325f09bd21de..eeec513cb99afb 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
@@ -4,94 +4,114 @@
 import {
 	__experimentalItemGroup as ItemGroup,
 	__experimentalItem as Item,
-	__experimentalHeading as Heading,
 } from '@wordpress/components';
-import { useViewportMatch } from '@wordpress/compose';
 import { getTemplatePartIcon } from '@wordpress/editor';
 import { __ } from '@wordpress/i18n';
-import { getQueryArgs } from '@wordpress/url';
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { file } from '@wordpress/icons';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
-import AddNewPattern from '../add-new-pattern';
-import SidebarNavigationItem from '../sidebar-navigation-item';
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import CategoryItem from './category-item';
 import {
 	PATTERN_DEFAULT_CATEGORY,
 	PATTERN_TYPES,
 	TEMPLATE_PART_POST_TYPE,
+	TEMPLATE_PART_ALL_AREAS_CATEGORY,
 } from '../../utils/constants';
-import { useLink } from '../routes/link';
 import usePatternCategories from './use-pattern-categories';
 import useTemplatePartAreas from './use-template-part-areas';
-import { store as editSiteStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
-function TemplatePartGroup( { areas, currentArea, currentType } ) {
-	return (
-		<>
-			<div className="edit-site-sidebar-navigation-screen-patterns__group-header">
-				<Heading level={ 2 }>{ __( 'Template parts' ) }</Heading>
-			</div>
-			<ItemGroup className="edit-site-sidebar-navigation-screen-patterns__group">
-				{ Object.entries( areas ).map(
-					( [ area, { label, templateParts } ] ) => (
-						<CategoryItem
-							key={ area }
-							count={ templateParts?.length }
-							icon={ getTemplatePartIcon( area ) }
-							label={ label }
-							id={ area }
-							type={ TEMPLATE_PART_POST_TYPE }
-							isActive={
-								currentArea === area &&
-								currentType === TEMPLATE_PART_POST_TYPE
-							}
-						/>
-					)
-				) }
-			</ItemGroup>
-		</>
-	);
-}
+const { useLocation } = unlock( routerPrivateApis );
 
-function PatternCategoriesGroup( {
-	categories,
+function CategoriesGroup( {
+	templatePartAreas,
+	patternCategories,
 	currentCategory,
 	currentType,
 } ) {
+	const [ allPatterns, ...otherPatterns ] = patternCategories;
+
 	return (
-		<>
-			<ItemGroup className="edit-site-sidebar-navigation-screen-patterns__group">
-				{ categories.map( ( category ) => (
+		<ItemGroup className="edit-site-sidebar-navigation-screen-patterns__group">
+			<CategoryItem
+				key="all"
+				count={ Object.values( templatePartAreas )
+					.map( ( { templateParts } ) => templateParts?.length || 0 )
+					.reduce( ( acc, val ) => acc + val, 0 ) }
+				icon={ getTemplatePartIcon() } /* no name, so it provides the fallback icon */
+				label={ __( 'All template parts' ) }
+				id={ TEMPLATE_PART_ALL_AREAS_CATEGORY }
+				type={ TEMPLATE_PART_POST_TYPE }
+				isActive={
+					currentCategory === TEMPLATE_PART_ALL_AREAS_CATEGORY &&
+					currentType === TEMPLATE_PART_POST_TYPE
+				}
+			/>
+			{ Object.entries( templatePartAreas ).map(
+				( [ area, { label, templateParts } ] ) => (
 					<CategoryItem
-						key={ category.name }
-						count={ category.count }
-						label={ category.label }
-						icon={ file }
-						id={ category.name }
-						type="pattern"
+						key={ area }
+						count={ templateParts?.length }
+						icon={ getTemplatePartIcon( area ) }
+						label={ label }
+						id={ area }
+						type={ TEMPLATE_PART_POST_TYPE }
 						isActive={
-							currentCategory === `${ category.name }` &&
-							( currentType === PATTERN_TYPES.theme ||
-								currentType === PATTERN_TYPES.user )
+							currentCategory === area &&
+							currentType === TEMPLATE_PART_POST_TYPE
 						}
 					/>
-				) ) }
-			</ItemGroup>
-		</>
+				)
+			) }
+			<div className="edit-site-sidebar-navigation-screen-patterns__divider" />
+			{ allPatterns && (
+				<CategoryItem
+					key={ allPatterns.name }
+					count={ allPatterns.count }
+					label={ allPatterns.label }
+					icon={ file }
+					id={ allPatterns.name }
+					type={ PATTERN_TYPES.user }
+					isActive={
+						currentCategory === `${ allPatterns.name }` &&
+						currentType === PATTERN_TYPES.user
+					}
+				/>
+			) }
+			{ otherPatterns.map( ( category ) => (
+				<CategoryItem
+					key={ category.name }
+					count={ category.count }
+					label={ category.label }
+					icon={ file }
+					id={ category.name }
+					type={ PATTERN_TYPES.user }
+					isActive={
+						currentCategory === `${ category.name }` &&
+						currentType === PATTERN_TYPES.user
+					}
+				/>
+			) ) }
+		</ItemGroup>
 	);
 }
 
-export default function SidebarNavigationScreenPatterns() {
-	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const { categoryType, categoryId } = getQueryArgs( window.location.href );
-	const currentCategory = categoryId || PATTERN_DEFAULT_CATEGORY;
-	const currentType = categoryType || PATTERN_TYPES.theme;
+export default function SidebarNavigationScreenPatterns( { backPath } ) {
+	const {
+		params: { postType, categoryId },
+	} = useLocation();
+	const currentType = postType || PATTERN_TYPES.user;
+	const currentCategory =
+		categoryId ||
+		( currentType === PATTERN_TYPES.user
+			? PATTERN_DEFAULT_CATEGORY
+			: TEMPLATE_PART_ALL_AREAS_CATEGORY );
 
 	const { templatePartAreas, hasTemplateParts, isLoading } =
 		useTemplatePartAreas();
@@ -100,35 +120,6 @@ export default function SidebarNavigationScreenPatterns() {
 		( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,
 		[]
 	);
-	const isTemplatePartsMode = useSelect( ( select ) => {
-		const settings = select( editSiteStore ).getSettings();
-		return !! settings.supportsTemplatePartsMode;
-	}, [] );
-
-	const templatePartsLink = useLink( {
-		path: '/wp_template_part/all',
-		// If a classic theme that supports template parts accessed
-		// the Patterns page directly, preserve that state in the URL.
-		didAccessPatternsPage:
-			! isBlockBasedTheme && isTemplatePartsMode ? 1 : undefined,
-	} );
-
-	const footer = ! isMobileViewport ? (
-		<ItemGroup>
-			<SidebarNavigationItem
-				as="a"
-				href="edit.php?post_type=wp_block"
-				withChevron
-			>
-				{ __( 'Manage all of my patterns' ) }
-			</SidebarNavigationItem>
-			{ ( isBlockBasedTheme || isTemplatePartsMode ) && (
-				<SidebarNavigationItem withChevron { ...templatePartsLink }>
-					{ __( 'Manage all template parts' ) }
-				</SidebarNavigationItem>
-			) }
-		</ItemGroup>
-	) : undefined;
 
 	return (
 		<SidebarNavigationScreen
@@ -137,36 +128,23 @@ export default function SidebarNavigationScreenPatterns() {
 			description={ __(
 				'Manage what patterns are available when editing the site.'
 			) }
-			actions={ <AddNewPattern /> }
-			footer={ footer }
+			backPath={ backPath }
 			content={
 				<>
-					{ isLoading && __( 'Loading patterns…' ) }
+					{ isLoading && __( 'Loading items…' ) }
 					{ ! isLoading && (
 						<>
 							{ ! hasTemplateParts && ! hasPatterns && (
 								<ItemGroup className="edit-site-sidebar-navigation-screen-patterns__group">
-									<Item>
-										{ __(
-											'No template parts or patterns found'
-										) }
-									</Item>
+									<Item>{ __( 'No items found' ) }</Item>
 								</ItemGroup>
 							) }
-							{ hasPatterns && (
-								<PatternCategoriesGroup
-									categories={ patternCategories }
-									currentCategory={ currentCategory }
-									currentType={ currentType }
-								/>
-							) }
-							{ hasTemplateParts && (
-								<TemplatePartGroup
-									areas={ templatePartAreas }
-									currentArea={ currentCategory }
-									currentType={ currentType }
-								/>
-							) }
+							<CategoriesGroup
+								templatePartAreas={ templatePartAreas }
+								patternCategories={ patternCategories }
+								currentCategory={ currentCategory }
+								currentType={ currentType }
+							/>
 						</>
 					) }
 				</>
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/style.scss
index 7b448c375fb404..19885eb3baf2cb 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/style.scss
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/style.scss
@@ -21,3 +21,8 @@
 		text-transform: uppercase;
 	}
 }
+
+.edit-site-sidebar-navigation-screen-patterns__divider {
+	border-top: 1px solid $gray-800;
+	margin: $grid-unit-20 0;
+}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-pattern-categories.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-pattern-categories.js
index 4dee1bae3f314f..a41e0ea7660616 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-pattern-categories.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-pattern-categories.js
@@ -58,13 +58,21 @@ export default function usePatternCategories() {
 
 		// Update the category counts to reflect user registered patterns.
 		userPatterns.forEach( ( pattern ) => {
-			pattern.categories?.forEach( ( category ) => {
+			pattern.wp_pattern_category?.forEach( ( catId ) => {
+				const category = userPatternCategories.find(
+					( cat ) => cat.id === catId
+				)?.name;
 				if ( categoryMap[ category ] ) {
 					categoryMap[ category ].count += 1;
 				}
 			} );
 			// If the pattern has no categories, add it to uncategorized.
-			if ( ! pattern.categories?.length ) {
+			if (
+				! pattern.wp_pattern_category?.length ||
+				! pattern.wp_pattern_category.some( ( catId ) =>
+					userPatternCategories.find( ( cat ) => cat.id === catId )
+				)
+			) {
 				categoryMap.uncategorized.count += 1;
 			}
 		} );
@@ -95,7 +103,7 @@ export default function usePatternCategories() {
 		sortedCategories.unshift( {
 			name: PATTERN_DEFAULT_CATEGORY,
 			label: __( 'All patterns' ),
-			description: __( 'A list of all patterns from all sources' ),
+			description: __( 'A list of all patterns from all sources.' ),
 			count: themePatterns.length + userPatterns.length,
 		} );
 
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-template/home-template-details.js b/packages/edit-site/src/components/sidebar-navigation-screen-template/home-template-details.js
deleted file mode 100644
index c798067aca9c57..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-template/home-template-details.js
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { debounce } from '@wordpress/compose';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import {
-	CheckboxControl,
-	__experimentalInputControl as InputControl,
-	__experimentalNumberControl as NumberControl,
-	__experimentalTruncate as Truncate,
-	__experimentalItemGroup as ItemGroup,
-} from '@wordpress/components';
-import { header, footer, layout } from '@wordpress/icons';
-import { useMemo, useState, useEffect } from '@wordpress/element';
-import { decodeEntities } from '@wordpress/html-entities';
-
-/**
- * Internal dependencies
- */
-import {
-	SidebarNavigationScreenDetailsPanel,
-	SidebarNavigationScreenDetailsPanelRow,
-} from '../sidebar-navigation-screen-details-panel';
-import { unlock } from '../../lock-unlock';
-import { store as editSiteStore } from '../../store';
-import { useLink } from '../routes/link';
-import SidebarNavigationItem from '../sidebar-navigation-item';
-import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
-
-const EMPTY_OBJECT = {};
-
-function TemplateAreaButton( { postId, icon, title } ) {
-	const icons = {
-		header,
-		footer,
-	};
-	const linkInfo = useLink( {
-		postType: TEMPLATE_PART_POST_TYPE,
-		postId,
-	} );
-
-	return (
-		<SidebarNavigationItem
-			className="edit-site-sidebar-navigation-screen-template__template-area-button"
-			{ ...linkInfo }
-			icon={ icons[ icon ] ?? layout }
-			withChevron
-		>
-			<Truncate
-				limit={ 20 }
-				ellipsizeMode="tail"
-				numberOfLines={ 1 }
-				className="edit-site-sidebar-navigation-screen-template__template-area-label-text"
-			>
-				{ decodeEntities( title ) }
-			</Truncate>
-		</SidebarNavigationItem>
-	);
-}
-
-export default function HomeTemplateDetails() {
-	const { editEntityRecord } = useDispatch( coreStore );
-
-	const {
-		allowCommentsOnNewPosts,
-		templatePartAreas,
-		postsPerPage,
-		postsPageTitle,
-		postsPageId,
-		currentTemplateParts,
-	} = useSelect( ( select ) => {
-		const { getEntityRecord } = select( coreStore );
-		const { getSettings, getCurrentTemplateTemplateParts } = unlock(
-			select( editSiteStore )
-		);
-		const siteSettings = getEntityRecord( 'root', 'site' );
-		const _postsPageRecord = siteSettings?.page_for_posts
-			? getEntityRecord(
-					'postType',
-					'page',
-					siteSettings?.page_for_posts
-			  )
-			: EMPTY_OBJECT;
-
-		return {
-			allowCommentsOnNewPosts:
-				siteSettings?.default_comment_status === 'open',
-			postsPageTitle: _postsPageRecord?.title?.rendered,
-			postsPageId: _postsPageRecord?.id,
-			postsPerPage: siteSettings?.posts_per_page,
-			templatePartAreas: getSettings()?.defaultTemplatePartAreas,
-			currentTemplateParts: getCurrentTemplateTemplateParts(),
-		};
-	}, [] );
-
-	const [ commentsOnNewPostsValue, setCommentsOnNewPostsValue ] =
-		useState( '' );
-	const [ postsCountValue, setPostsCountValue ] = useState( 1 );
-	const [ postsPageTitleValue, setPostsPageTitleValue ] = useState( '' );
-
-	/*
-	 * This hook serves to set the server-retrieved values,
-	 * postsPageTitle, allowCommentsOnNewPosts, postsPerPage,
-	 * to local state.
-	 */
-	useEffect( () => {
-		setCommentsOnNewPostsValue( allowCommentsOnNewPosts );
-		setPostsPageTitleValue( postsPageTitle );
-		setPostsCountValue( postsPerPage );
-	}, [ postsPageTitle, allowCommentsOnNewPosts, postsPerPage ] );
-
-	/*
-	 * Merge data in currentTemplateParts with templatePartAreas,
-	 * which contains the template icon and fallback labels
-	 */
-	const templateAreas = useMemo( () => {
-		// Keep track of template part IDs that have already been added to the array.
-		const templatePartIds = new Set();
-		const filterOutDuplicateTemplateParts = ( currentTemplatePart ) => {
-			// If the template part has already been added to the array, skip it.
-			if ( templatePartIds.has( currentTemplatePart.templatePart.id ) ) {
-				return;
-			}
-			// Add to the array of template part IDs.
-			templatePartIds.add( currentTemplatePart.templatePart.id );
-			return currentTemplatePart;
-		};
-
-		return currentTemplateParts.length && templatePartAreas
-			? currentTemplateParts
-					.filter( filterOutDuplicateTemplateParts )
-					.map( ( { templatePart, block } ) => ( {
-						...templatePartAreas?.find(
-							( { area } ) => area === templatePart?.area
-						),
-						...templatePart,
-						clientId: block.clientId,
-					} ) )
-			: [];
-	}, [ currentTemplateParts, templatePartAreas ] );
-
-	const setAllowCommentsOnNewPosts = ( newValue ) => {
-		setCommentsOnNewPostsValue( newValue );
-		editEntityRecord( 'root', 'site', undefined, {
-			default_comment_status: newValue ? 'open' : null,
-		} );
-	};
-
-	const setPostsPageTitle = ( newValue ) => {
-		setPostsPageTitleValue( newValue );
-		editEntityRecord( 'postType', 'page', postsPageId, {
-			title: newValue,
-		} );
-	};
-
-	const setPostsPerPage = ( newValue ) => {
-		setPostsCountValue( newValue );
-		editEntityRecord( 'root', 'site', undefined, {
-			posts_per_page: newValue,
-		} );
-	};
-
-	return (
-		<>
-			<SidebarNavigationScreenDetailsPanel spacing={ 6 }>
-				{ postsPageId && (
-					<SidebarNavigationScreenDetailsPanelRow>
-						<InputControl
-							className="edit-site-sidebar-navigation-screen__input-control"
-							placeholder={ __( 'No Title' ) }
-							size={ '__unstable-large' }
-							value={ postsPageTitleValue }
-							onChange={ debounce( setPostsPageTitle, 300 ) }
-							label={ __( 'Blog title' ) }
-							help={ __(
-								'Set the Posts Page title. Appears in search results, and when the page is shared on social media.'
-							) }
-						/>
-					</SidebarNavigationScreenDetailsPanelRow>
-				) }
-				<SidebarNavigationScreenDetailsPanelRow>
-					<NumberControl
-						className="edit-site-sidebar-navigation-screen__input-control"
-						placeholder={ 0 }
-						value={ postsCountValue }
-						size={ '__unstable-large' }
-						spinControls="custom"
-						step="1"
-						min="1"
-						onChange={ setPostsPerPage }
-						label={ __( 'Posts per page' ) }
-						help={ __(
-							'Set the default number of posts to display on blog pages, including categories and tags. Some templates may override this setting.'
-						) }
-					/>
-				</SidebarNavigationScreenDetailsPanelRow>
-			</SidebarNavigationScreenDetailsPanel>
-
-			<SidebarNavigationScreenDetailsPanel
-				title={ __( 'Discussion' ) }
-				spacing={ 3 }
-			>
-				<SidebarNavigationScreenDetailsPanelRow>
-					<CheckboxControl
-						className="edit-site-sidebar-navigation-screen__input-control"
-						label={ __( 'Allow comments on new posts' ) }
-						help={ __(
-							'Changes will apply to new posts only. Individual posts may override these settings.'
-						) }
-						checked={ commentsOnNewPostsValue }
-						onChange={ setAllowCommentsOnNewPosts }
-					/>
-				</SidebarNavigationScreenDetailsPanelRow>
-			</SidebarNavigationScreenDetailsPanel>
-			<SidebarNavigationScreenDetailsPanel
-				title={ __( 'Areas' ) }
-				spacing={ 3 }
-			>
-				<ItemGroup>
-					{ templateAreas.map(
-						( { clientId, label, icon, theme, slug, title } ) => (
-							<SidebarNavigationScreenDetailsPanelRow
-								key={ clientId }
-							>
-								<TemplateAreaButton
-									postId={ `${ theme }//${ slug }` }
-									title={ title?.rendered || label }
-									icon={ icon }
-								/>
-							</SidebarNavigationScreenDetailsPanelRow>
-						)
-					) }
-				</ItemGroup>
-			</SidebarNavigationScreenDetailsPanel>
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-template/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-template/index.js
deleted file mode 100644
index fd60d0a509ace2..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-template/index.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __, _x } from '@wordpress/i18n';
-import { useDispatch, useSelect } from '@wordpress/data';
-import { pencil } from '@wordpress/icons';
-import {
-	__experimentalUseNavigator as useNavigator,
-	Icon,
-} from '@wordpress/components';
-import { store as coreStore } from '@wordpress/core-data';
-/**
- * Internal dependencies
- */
-import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import useEditedEntityRecord from '../use-edited-entity-record';
-import { unlock } from '../../lock-unlock';
-import { store as editSiteStore } from '../../store';
-import SidebarButton from '../sidebar-button';
-import { useAddedBy } from '../list/added-by';
-import TemplateActions from '../template-actions';
-import HomeTemplateDetails from './home-template-details';
-import SidebarNavigationScreenDetailsFooter from '../sidebar-navigation-screen-details-footer';
-
-function useTemplateDetails( postType, postId ) {
-	const { getDescription, getTitle, record } = useEditedEntityRecord(
-		postType,
-		postId
-	);
-	const currentTheme = useSelect(
-		( select ) => select( coreStore ).getCurrentTheme(),
-		[]
-	);
-	const addedBy = useAddedBy( postType, postId );
-	const isAddedByActiveTheme =
-		addedBy.type === 'theme' && record.theme === currentTheme?.stylesheet;
-	const title = getTitle();
-	let descriptionText = getDescription();
-
-	if ( ! descriptionText && addedBy.text ) {
-		descriptionText = __(
-			'This is a custom template that can be applied manually to any Post or Page.'
-		);
-	}
-
-	const content =
-		record?.slug === 'home' || record?.slug === 'index' ? (
-			<HomeTemplateDetails />
-		) : null;
-
-	const footer = record?.modified ? (
-		<SidebarNavigationScreenDetailsFooter record={ record } />
-	) : null;
-
-	const description = (
-		<>
-			{ descriptionText }
-
-			{ addedBy.text && ! isAddedByActiveTheme && (
-				<span className="edit-site-sidebar-navigation-screen-template__added-by-description">
-					<span className="edit-site-sidebar-navigation-screen-template__added-by-description-author">
-						<span className="edit-site-sidebar-navigation-screen-template__added-by-description-author-icon">
-							{ addedBy.imageUrl ? (
-								<img
-									src={ addedBy.imageUrl }
-									alt=""
-									width="24"
-									height="24"
-								/>
-							) : (
-								<Icon icon={ addedBy.icon } />
-							) }
-						</span>
-						{ addedBy.text }
-					</span>
-
-					{ addedBy.isCustomized && (
-						<span className="edit-site-sidebar-navigation-screen-template__added-by-description-customized">
-							{ _x( '(Customized)', 'template' ) }
-						</span>
-					) }
-				</span>
-			) }
-		</>
-	);
-
-	return { title, description, content, footer };
-}
-
-export default function SidebarNavigationScreenTemplate() {
-	const navigator = useNavigator();
-	const {
-		params: { postType, postId },
-	} = navigator;
-	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
-	const { title, content, description, footer } = useTemplateDetails(
-		postType,
-		postId
-	);
-
-	return (
-		<SidebarNavigationScreen
-			title={ title }
-			actions={
-				<>
-					<TemplateActions
-						postType={ postType }
-						postId={ postId }
-						toggleProps={ { as: SidebarButton } }
-						onRemove={ () => {
-							navigator.goTo( `/${ postType }/all` );
-						} }
-					/>
-					<SidebarButton
-						onClick={ () => setCanvasMode( 'edit' ) }
-						label={ __( 'Edit' ) }
-						icon={ pencil }
-					/>
-				</>
-			}
-			description={ description }
-			content={ content }
-			footer={ footer }
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-template/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-template/style.scss
deleted file mode 100644
index 4e6fcc3700fc4d..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-template/style.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-.edit-site-sidebar-navigation-screen-template__added-by-description {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-top: $grid-unit-30;
-}
-
-.edit-site-sidebar-navigation-screen-template__added-by-description-author {
-	display: inline-flex;
-	align-items: center;
-
-	img {
-		border-radius: $grid-unit-15;
-		width: 20px;
-		height: 20px;
-	}
-
-	svg {
-		fill: $gray-600;
-	}
-}
-
-.edit-site-sidebar-navigation-screen-template__added-by-description-author-icon {
-	width: 24px;
-	height: 24px;
-	margin-right: $grid-unit-05;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.edit-site-sidebar-navigation-screen-template__template-area-button {
-	color: $white;
-	display: flex;
-	align-items: center;
-	width: 100%;
-	flex-wrap: nowrap;
-	border-radius: 4px;
-	&:hover,
-	&:focus {
-		background: $gray-800;
-		color: $white;
-	}
-}
-
-.edit-site-sidebar-navigation-screen-template__template-area-label-text {
-	margin: 0 $grid-unit-20 0 $grid-unit-05;
-	flex-grow: 1;
-}
-
-.edit-site-sidebar-navigation-screen-template__template-icon {
-	display: flex;
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/content.js b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/content.js
new file mode 100644
index 00000000000000..5a07adf62d9b31
--- /dev/null
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/content.js
@@ -0,0 +1,73 @@
+/**
+ * WordPress dependencies
+ */
+import { useEntityRecords } from '@wordpress/core-data';
+import { useMemo } from '@wordpress/element';
+import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import DataViewItem from '../sidebar-dataviews/dataview-item';
+import { useAddedBy } from '../page-templates/hooks';
+import { layout } from '@wordpress/icons';
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
+
+const EMPTY_ARRAY = [];
+
+function TemplateDataviewItem( { template, isActive } ) {
+	const { text, icon } = useAddedBy( template.type, template.id );
+	return (
+		<DataViewItem
+			key={ text }
+			slug={ text }
+			title={ text }
+			icon={ icon }
+			isActive={ isActive }
+			isCustom={ false }
+		/>
+	);
+}
+
+export default function DataviewsTemplatesSidebarContent( {
+	activeView,
+	title,
+} ) {
+	const { records } = useEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
+		per_page: -1,
+	} );
+	const firstItemPerAuthorText = useMemo( () => {
+		const firstItemPerAuthor = records?.reduce( ( acc, template ) => {
+			const author = template.author_text;
+			if ( author && ! acc[ author ] ) {
+				acc[ author ] = template;
+			}
+			return acc;
+		}, {} );
+		return (
+			( firstItemPerAuthor && Object.values( firstItemPerAuthor ) ) ??
+			EMPTY_ARRAY
+		);
+	}, [ records ] );
+
+	return (
+		<ItemGroup>
+			<DataViewItem
+				slug="all"
+				title={ title }
+				icon={ layout }
+				isActive={ activeView === 'all' }
+				isCustom={ false }
+			/>
+			{ firstItemPerAuthorText.map( ( template ) => {
+				return (
+					<TemplateDataviewItem
+						key={ template.author_text }
+						template={ template }
+						isActive={ activeView === template.author_text }
+					/>
+				);
+			} ) }
+		</ItemGroup>
+	);
+}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js
index a07e08a44f8b41..8e7946390a3640 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js
@@ -2,60 +2,35 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useSelect } from '@wordpress/data';
-import { __experimentalUseNavigator as useNavigator } from '@wordpress/components';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
  */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import { store as editSiteStore } from '../../store';
-import {
-	TEMPLATE_POST_TYPE,
-	TEMPLATE_PART_POST_TYPE,
-} from '../../utils/constants';
 import { unlock } from '../../lock-unlock';
-
-const config = {
-	[ TEMPLATE_POST_TYPE ]: {
-		title: __( 'All templates' ),
-		description: __(
-			'Create new templates, or reset any customizations made to the templates supplied by your theme.'
-		),
-	},
-	[ TEMPLATE_PART_POST_TYPE ]: {
-		title: __( 'All template parts' ),
-		description: __(
-			'Create new template parts, or reset any customizations made to the template parts supplied by your theme.'
-		),
-		backPath: '/patterns',
-	},
-};
+import DataviewsTemplatesSidebarContent from './content';
 
 const { useLocation } = unlock( routerPrivateApis );
 
-export default function SidebarNavigationScreenTemplatesBrowse() {
-	const {
-		params: { postType },
-	} = useNavigator();
+export default function SidebarNavigationScreenTemplatesBrowse( { backPath } ) {
 	const {
-		params: { didAccessPatternsPage },
+		params: { activeView = 'all' },
 	} = useLocation();
 
-	const isTemplatePartsMode = useSelect( ( select ) => {
-		return !! select( editSiteStore ).getSettings()
-			.supportsTemplatePartsMode;
-	}, [] );
-
 	return (
 		<SidebarNavigationScreen
-			// If a classic theme that supports template parts has never
-			// accessed the Patterns page, return to the dashboard.
-			isRoot={ isTemplatePartsMode && ! didAccessPatternsPage }
-			title={ config[ postType ].title }
-			description={ config[ postType ].description }
-			backPath={ config[ postType ].backPath }
+			title={ __( 'Templates' ) }
+			description={ __(
+				'Create new templates, or reset any customizations made to the templates supplied by your theme.'
+			) }
+			backPath={ backPath }
+			content={
+				<DataviewsTemplatesSidebarContent
+					activeView={ activeView }
+					title={ __( 'All templates' ) }
+				/>
+			}
 		/>
 	);
 }
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js
deleted file mode 100644
index 527cb37ceddaf7..00000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalItemGroup as ItemGroup,
-	__experimentalItem as Item,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useEntityRecords } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { useViewportMatch } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import { useLink } from '../routes/link';
-import SidebarNavigationItem from '../sidebar-navigation-item';
-import AddNewTemplate from '../add-new-template';
-import SidebarButton from '../sidebar-button';
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
-
-const TemplateItem = ( { postType, postId, ...props } ) => {
-	const linkInfo = useLink( {
-		postType,
-		postId,
-	} );
-	return <SidebarNavigationItem { ...linkInfo } { ...props } />;
-};
-
-export default function SidebarNavigationScreenTemplates() {
-	const isMobileViewport = useViewportMatch( 'medium', '<' );
-
-	const { records: templates, isResolving: isLoading } = useEntityRecords(
-		'postType',
-		TEMPLATE_POST_TYPE,
-		{
-			per_page: -1,
-		}
-	);
-
-	const sortedTemplates = templates ? [ ...templates ] : [];
-	sortedTemplates.sort( ( a, b ) =>
-		a.title.rendered.localeCompare( b.title.rendered )
-	);
-
-	const browseAllLink = useLink( { path: '/wp_template/all' } );
-	const canCreate = ! isMobileViewport;
-	return (
-		<SidebarNavigationScreen
-			title={ __( 'Templates' ) }
-			description={ __(
-				'Express the layout of your site with templates.'
-			) }
-			actions={
-				canCreate && (
-					<AddNewTemplate
-						templateType={ TEMPLATE_POST_TYPE }
-						toggleProps={ {
-							as: SidebarButton,
-						} }
-					/>
-				)
-			}
-			content={
-				<>
-					{ isLoading && __( 'Loading templates…' ) }
-					{ ! isLoading && (
-						<ItemGroup>
-							{ ! templates?.length && (
-								<Item>{ __( 'No templates found' ) }</Item>
-							) }
-							{ sortedTemplates.map( ( template ) => (
-								<TemplateItem
-									postType={ TEMPLATE_POST_TYPE }
-									postId={ template.id }
-									key={ template.id }
-									withChevron
-								>
-									{ decodeEntities(
-										template.title?.rendered ||
-											template.slug
-									) }
-								</TemplateItem>
-							) ) }
-						</ItemGroup>
-					) }
-				</>
-			}
-			footer={
-				! isMobileViewport && (
-					<SidebarNavigationItem withChevron { ...browseAllLink }>
-						{ __( 'Manage all templates' ) }
-					</SidebarNavigationItem>
-				)
-			}
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen/index.js b/packages/edit-site/src/components/sidebar-navigation-screen/index.js
index 9ab6f58c81b212..417e643bb8b04d 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -9,7 +9,6 @@ import classnames from 'classnames';
 import {
 	__experimentalHStack as HStack,
 	__experimentalHeading as Heading,
-	__experimentalUseNavigator as useNavigator,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { isRTL, __, sprintf } from '@wordpress/i18n';
@@ -17,6 +16,7 @@ import { chevronRight, chevronLeft } from '@wordpress/icons';
 import { store as coreStore } from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useContext } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -28,8 +28,9 @@ import {
 	isPreviewingTheme,
 	currentlyPreviewingTheme,
 } from '../../utils/is-previewing-theme';
+import { SidebarNavigationContext } from '../sidebar';
 
-const { useLocation } = unlock( routerPrivateApis );
+const { useHistory, useLocation } = unlock( routerPrivateApis );
 
 export default function SidebarNavigationScreen( {
 	isRoot,
@@ -41,48 +42,49 @@ export default function SidebarNavigationScreen( {
 	description,
 	backPath: backPathProp,
 } ) {
-	const { dashboardLink, dashboardLinkText } = useSelect( ( select ) => {
-		const { getSettings } = unlock( select( editSiteStore ) );
-		return {
-			dashboardLink: getSettings().__experimentalDashboardLink,
-			dashboardLinkText: getSettings().__experimentalDashboardLinkText,
-		};
-	}, [] );
-	const { getTheme } = useSelect( coreStore );
+	const { dashboardLink, dashboardLinkText, previewingThemeName } = useSelect(
+		( select ) => {
+			const { getSettings } = unlock( select( editSiteStore ) );
+			const currentlyPreviewingThemeId = currentlyPreviewingTheme();
+			return {
+				dashboardLink: getSettings().__experimentalDashboardLink,
+				dashboardLinkText:
+					getSettings().__experimentalDashboardLinkText,
+				// Do not call `getTheme` with null, it will cause a request to
+				// the server.
+				previewingThemeName: currentlyPreviewingThemeId
+					? select( coreStore ).getTheme( currentlyPreviewingThemeId )
+							?.name?.rendered
+					: undefined,
+			};
+		},
+		[]
+	);
 	const location = useLocation();
-	const navigator = useNavigator();
-	const theme = getTheme( currentlyPreviewingTheme() );
+	const history = useHistory();
+	const { navigate } = useContext( SidebarNavigationContext );
+	const backPath = backPathProp ?? location.state?.backPath;
 	const icon = isRTL() ? chevronRight : chevronLeft;
 
 	return (
 		<>
 			<VStack
-				className={ classnames(
-					'edit-site-sidebar-navigation-screen__main',
-					{
-						'has-footer': !! footer,
-					}
-				) }
+				className={ clsx( 'edit-site-sidebar-navigation-screen__main', {
+					'has-footer': !! footer,
+				} ) }
 				spacing={ 0 }
 				justify="flex-start"
 			>
 				<HStack
-					spacing={ 4 }
+					spacing={ 3 }
 					alignment="flex-start"
 					className="edit-site-sidebar-navigation-screen__title-icon"
 				>
 					{ ! isRoot && (
 						<SidebarButton
 							onClick={ () => {
-								const backPath =
-									backPathProp ?? location.state?.backPath;
-								if ( backPath ) {
-									navigator.goTo( backPath, {
-										isBack: true,
-									} );
-								} else {
-									navigator.goToParent();
-								}
+								history.push( backPath );
+								navigate( 'back' );
 							} }
 							icon={ icon }
 							label={ __( 'Back' ) }
@@ -108,7 +110,7 @@ export default function SidebarNavigationScreen( {
 							? title
 							: sprintf(
 									'Previewing %1$s: %2$s',
-									theme?.name?.rendered,
+									previewingThemeName,
 									title
 							  ) }
 					</Heading>
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen/style.scss
index b856837b7c6b6a..1d57472f7e9f94 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen/style.scss
+++ b/packages/edit-site/src/components/sidebar-navigation-screen/style.scss
@@ -33,9 +33,8 @@
 }
 
 .edit-site-sidebar-navigation-screen__meta {
-	margin: 0 0 $grid-unit-20 0;
+	margin: 0 0 $grid-unit-20 $grid-unit-20;
 	color: $gray-400;
-	margin-left: $grid-unit-20;
 	.components-text {
 		color: $gray-400;
 	}
@@ -43,6 +42,8 @@
 
 .edit-site-sidebar-navigation-screen__page-link {
 	color: $gray-600;
+	display: inline-block;
+	word-break: break-word;
 
 	&:hover,
 	&:focus {
@@ -52,14 +53,13 @@
 	.components-external-link__icon {
 		margin-left: $grid-unit-05;
 	}
-	display: inline-block;
 }
 
 .edit-site-sidebar-navigation-screen__title-icon {
 	position: sticky;
 	top: 0;
 	background: $gray-900;
-	padding-top: $grid-unit-60 + $header-height;
+	padding-top: $grid-unit-60;
 	margin-bottom: $grid-unit-10;
 	padding-bottom: $grid-unit-10;
 	z-index: z-index(".edit-site-sidebar-navigation-screen__title-icon");
@@ -67,8 +67,12 @@
 
 .edit-site-sidebar-navigation-screen__title {
 	flex-grow: 1;
-	padding: $grid-unit-15 * 0.5 0 0 0;
 	overflow-wrap: break-word;
+
+	&#{&},
+	&#{&} .edit-site-sidebar-navigation-screen__title {
+		line-height: $font-line-height-x-large;
+	}
 }
 
 .edit-site-sidebar-navigation-screen__actions {
@@ -76,7 +80,7 @@
 	flex-shrink: 0;
 }
 
-.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-style-variations-container {
+.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variation-container {
 	@include break-medium() {
 		// Safari does not currently support `scrollbar-gutter: stable`, so at
 		// particular viewport sizes it's possible for previews to render prior to a
@@ -89,18 +93,32 @@
 		// See: https://github.com/WordPress/gutenberg/issues/55112
 		max-width: 292px;
 	}
+}
 
+.edit-site-global-styles-variation-title {
+	color: $gray-300;
+	font-size: 11px;
+	text-transform: uppercase;
+	font-weight: 500;
+}
+
+.edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item {
+
+	// Use a white outline to provide contrast with the dark background.
 	.edit-site-global-styles-variations_item-preview {
-		box-shadow: 0 0 0 $border-width $gray-900;
+		outline-color: rgba($white, 0.05);
 	}
-	.edit-site-global-styles-variations_item.is-active .edit-site-global-styles-variations_item-preview {
-		box-shadow: 0 0 0 $border-width $gray-100;
+
+	&:not(.is-active):hover .edit-site-global-styles-variations_item-preview {
+		outline-color: rgba($white, 0.15);
 	}
-	.edit-site-global-styles-variations_item:hover .edit-site-global-styles-variations_item-preview {
-		box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color);
+
+	&.is-active .edit-site-global-styles-variations_item-preview {
+		outline-color: $white;
 	}
-	.edit-site-global-styles-variations_item:focus .edit-site-global-styles-variations_item-preview {
-		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+
+	&:focus-visible .edit-site-global-styles-variations_item-preview {
+		outline-color: var(--wp-admin-theme-color);
 	}
 }
 
@@ -114,25 +132,6 @@
 	border-top: 1px solid $gray-800;
 }
 
-.edit-site-sidebar__notice {
-	background: $gray-800;
-	color: $gray-300;
-	margin: $grid-unit-30 0;
-	&.is-dismissible {
-		padding-right: $grid-unit-10;
-	}
-
-	.components-notice__dismiss:not(:disabled):not([aria-disabled="true"]) {
-		color: $gray-400;
-	}
-
-	.components-notice__dismiss:not(:disabled):not([aria-disabled="true"]):focus,
-	.components-notice__dismiss:not(:disabled):not([aria-disabled="true"]):not(.is-secondary):active,
-	.components-notice__dismiss:not(:disabled):not([aria-disabled="true"]):not(.is-secondary):hover {
-		color: $white;
-	}
-}
-
 /* In general style overrides are discouraged.
  * This is a temporary solution to override the InputControl component's styles.
  * The `Theme` component will potentially be the more appropriate approach
@@ -151,7 +150,6 @@
 	.components-input-control__input {
 		color: $gray-200 !important;
 		background: $gray-800 !important;
-		border-radius: $radius-block-ui;
 	}
 	.components-input-control__backdrop {
 		border: 4px !important;
diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
index b66bf4390a6bcf..84820952e1b621 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -1,104 +1,93 @@
 /**
- * WordPress dependencies
+ * External dependencies
  */
-import { memo, useRef } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-import {
-	__experimentalNavigatorProvider as NavigatorProvider,
-	__experimentalNavigatorScreen as NavigatorScreen,
-} from '@wordpress/components';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
+import clsx from 'clsx';
 
 /**
- * Internal dependencies
+ * WordPress dependencies
  */
-import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
-import SidebarNavigationScreenTemplates from '../sidebar-navigation-screen-templates';
-import SidebarNavigationScreenTemplate from '../sidebar-navigation-screen-template';
-import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';
-import SidebarNavigationScreenPattern from '../sidebar-navigation-screen-pattern';
-import useSyncPathWithURL, {
-	getPathFromURL,
-} from '../sync-state-with-url/use-sync-path-with-url';
-import SidebarNavigationScreenNavigationMenus from '../sidebar-navigation-screen-navigation-menus';
-import SidebarNavigationScreenNavigationMenu from '../sidebar-navigation-screen-navigation-menu';
-import SidebarNavigationScreenGlobalStyles from '../sidebar-navigation-screen-global-styles';
-import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';
-import SaveHub from '../save-hub';
-import { unlock } from '../../lock-unlock';
-import SidebarNavigationScreenPages from '../sidebar-navigation-screen-pages';
-import SidebarNavigationScreenPage from '../sidebar-navigation-screen-page';
-import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import DataViewsSidebarContent from '../sidebar-dataviews';
+import {
+	createContext,
+	useContext,
+	useState,
+	useRef,
+	useLayoutEffect,
+} from '@wordpress/element';
+import { focus } from '@wordpress/dom';
 
-const { useLocation } = unlock( routerPrivateApis );
+export const SidebarNavigationContext = createContext( () => {} );
+// Focus a sidebar element after a navigation. The element to focus is either
+// specified by `focusSelector` (when navigating back) or it is the first
+// tabbable element (usually the "Back" button).
+function focusSidebarElement( el, direction, focusSelector ) {
+	let elementToFocus;
+	if ( direction === 'back' && focusSelector ) {
+		elementToFocus = el.querySelector( focusSelector );
+	}
+	if ( direction !== null && ! elementToFocus ) {
+		const [ firstTabbable ] = focus.tabbable.find( el );
+		elementToFocus = firstTabbable ?? el;
+	}
+	elementToFocus?.focus();
+}
 
-function SidebarScreens() {
-	useSyncPathWithURL();
+// Navigation state that is updated when navigating back or forward. Helps us
+// manage the animations and also focus.
+function createNavState() {
+	let state = {
+		direction: null,
+		focusSelector: null,
+	};
+
+	return {
+		get() {
+			return state;
+		},
+		navigate( direction, focusSelector = null ) {
+			state = {
+				direction,
+				focusSelector:
+					direction === 'forward' && focusSelector
+						? focusSelector
+						: state.focusSelector,
+			};
+		},
+	};
+}
+
+function SidebarContentWrapper( { children } ) {
+	const navState = useContext( SidebarNavigationContext );
+	const wrapperRef = useRef();
+	const [ navAnimation, setNavAnimation ] = useState( null );
+
+	useLayoutEffect( () => {
+		const { direction, focusSelector } = navState.get();
+		focusSidebarElement( wrapperRef.current, direction, focusSelector );
+		setNavAnimation( direction );
+	}, [ navState ] );
+
+	const wrapperCls = clsx( 'edit-site-sidebar__screen-wrapper', {
+		'slide-from-left': navAnimation === 'back',
+		'slide-from-right': navAnimation === 'forward',
+	} );
 
 	return (
-		<>
-			<NavigatorScreen path="/">
-				<SidebarNavigationScreenMain />
-			</NavigatorScreen>
-			<NavigatorScreen path="/navigation">
-				<SidebarNavigationScreenNavigationMenus />
-			</NavigatorScreen>
-			<NavigatorScreen path="/navigation/:postType/:postId">
-				<SidebarNavigationScreenNavigationMenu />
-			</NavigatorScreen>
-			<NavigatorScreen path="/wp_global_styles">
-				<SidebarNavigationScreenGlobalStyles />
-			</NavigatorScreen>
-			<NavigatorScreen path="/page">
-				<SidebarNavigationScreenPages />
-			</NavigatorScreen>
-			<NavigatorScreen path="/page/:postId">
-				<SidebarNavigationScreenPage />
-			</NavigatorScreen>
-			{ window?.__experimentalAdminViews && (
-				<NavigatorScreen path="/pages">
-					<SidebarNavigationScreen
-						title={ __( 'Pages' ) }
-						backPath="/page"
-						content={ <DataViewsSidebarContent /> }
-					/>
-				</NavigatorScreen>
-			) }
-			<NavigatorScreen path="/:postType(wp_template)">
-				<SidebarNavigationScreenTemplates />
-			</NavigatorScreen>
-			<NavigatorScreen path="/patterns">
-				<SidebarNavigationScreenPatterns />
-			</NavigatorScreen>
-			<NavigatorScreen path="/:postType(wp_template|wp_template_part)/all">
-				<SidebarNavigationScreenTemplatesBrowse />
-			</NavigatorScreen>
-			<NavigatorScreen path="/:postType(wp_template_part|wp_block)/:postId">
-				<SidebarNavigationScreenPattern />
-			</NavigatorScreen>
-			<NavigatorScreen path="/:postType(wp_template)/:postId">
-				<SidebarNavigationScreenTemplate />
-			</NavigatorScreen>
-		</>
+		<div ref={ wrapperRef } className={ wrapperCls }>
+			{ children }
+		</div>
 	);
 }
 
-function Sidebar() {
-	const { params: urlParams } = useLocation();
-	const initialPath = useRef( getPathFromURL( urlParams ) );
+export default function SidebarContent( { routeKey, children } ) {
+	const [ navState ] = useState( createNavState );
 
 	return (
-		<>
-			<NavigatorProvider
-				className="edit-site-sidebar__content"
-				initialPath={ initialPath.current }
-			>
-				<SidebarScreens />
-			</NavigatorProvider>
-			<SaveHub />
-		</>
+		<SidebarNavigationContext.Provider value={ navState }>
+			<div className="edit-site-sidebar__content">
+				<SidebarContentWrapper key={ routeKey }>
+					{ children }
+				</SidebarContentWrapper>
+			</div>
+		</SidebarNavigationContext.Provider>
 	);
 }
-
-export default memo( Sidebar );
diff --git a/packages/edit-site/src/components/sidebar/style.scss b/packages/edit-site/src/components/sidebar/style.scss
index 9a3644cc830d56..d2f3e450cca133 100644
--- a/packages/edit-site/src/components/sidebar/style.scss
+++ b/packages/edit-site/src/components/sidebar/style.scss
@@ -1,24 +1,63 @@
 .edit-site-sidebar__content {
 	flex-grow: 1;
 	overflow-y: auto;
+	// Prevents horizontal overflow while animating screen transitions
+	overflow-x: hidden;
+	// Mark this section of the DOM as isolated, providing performance benefits
+	// by limiting calculations of layout, style and paint to a DOM subtree rather
+	// than the entire page.
+	contain: content;
+}
 
-	.components-navigator-screen {
-		@include custom-scrollbars-on-hover(transparent, $gray-700);
-		scrollbar-gutter: stable;
-		display: flex;
-		flex-direction: column;
-		height: 100%;
+@keyframes local--slide-from-right {
+	from {
+		transform: translateX(50px);
+		opacity: 0;
+	}
+	to {
+		transform: none;
+		opacity: 1;
 	}
 }
 
-.edit-site-sidebar__footer {
-	border-top: 1px solid $gray-800;
-	flex-shrink: 0;
-	margin: 0 $canvas-padding;
-	padding: $canvas-padding 0;
+@keyframes local--slide-from-left {
+	from {
+		transform: translateX(-50px);
+		opacity: 0;
+	}
+	to {
+		transform: none;
+		opacity: 1;
+	}
 }
 
-.edit-site-sidebar__content > div {
+.edit-site-sidebar__screen-wrapper {
+	overflow-x: auto;
+	@include custom-scrollbars-on-hover(transparent, $gray-700);
+	scrollbar-gutter: stable;
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	max-height: 100%;
+
 	// This matches the logo padding
 	padding: 0 $grid-unit-15;
+
+	// Animation
+	animation-duration: 0.14s;
+	animation-timing-function: ease-in-out;
+	will-change: transform, opacity;
+
+	@media ( prefers-reduced-motion: reduce ) {
+		animation-duration: 0s;
+	}
+
+	&.slide-from-left {
+		animation-name: local--slide-from-left;
+	}
+
+	&.slide-from-right {
+		animation-name: local--slide-from-right;
+	}
+
 }
diff --git a/packages/edit-site/src/components/site-editor-routes/README.md b/packages/edit-site/src/components/site-editor-routes/README.md
new file mode 100644
index 00000000000000..64121c8bd9a6b5
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/README.md
@@ -0,0 +1,20 @@
+# Site Editor Routes
+
+## Areas
+
+When `canvasMode` is not `edit`, the areas avaliable to use are:
+
+| Area | Non-mobile viewport | Mobile viewport |
+| --- | --- | --- |
+| `sidebar` | Always rendered. | Only if `mobile` is not provided. |
+| `content` | Rendered if provided. | Not rendered. |
+| `preview` | Rendered if provided. | Not rendered. |
+| `edit` | Rendered if provided. | Not rendered. |
+| `mobile` | Not rendered | Rendered as full-screen, if provided. |
+
+When `canvasMode` is `edit`, the areas avaliable to use are:
+
+| Area | Non-mobile viewport | Mobile viewport |
+| --- | --- | --- |
+| `preview` | Rendered as full-screen, if provided. Otherwise, it'll display an empty blank sidebar. | Not rendered. |
+| `mobile` | Not rendered | Rendered as full-screen, if provided. Otherwise, it'll display an empty blank sidebar. |
diff --git a/packages/edit-site/src/components/site-editor-routes/home-edit.js b/packages/edit-site/src/components/site-editor-routes/home-edit.js
new file mode 100644
index 00000000000000..f6e6499254082f
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/home-edit.js
@@ -0,0 +1,17 @@
+/**
+ * Internal dependencies
+ */
+import Editor from '../editor';
+import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
+
+export const homeEditRoute = {
+	name: 'home-edit',
+	match: ( params ) => {
+		return params.canvas === 'edit';
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenMain />,
+		preview: <Editor />,
+		mobile: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/home-view.js b/packages/edit-site/src/components/site-editor-routes/home-view.js
new file mode 100644
index 00000000000000..63d3d021e82083
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/home-view.js
@@ -0,0 +1,16 @@
+/**
+ * Internal dependencies
+ */
+import Editor from '../editor';
+import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';
+
+export const homeViewRoute = {
+	name: 'home-view',
+	match: ( params ) => {
+		return params.canvas !== 'edit';
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenMain />,
+		preview: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/index.js b/packages/edit-site/src/components/site-editor-routes/index.js
new file mode 100644
index 00000000000000..ddc37b353885c1
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/index.js
@@ -0,0 +1,60 @@
+/**
+ * WordPress dependencies
+ */
+import { useRegistry, useDispatch } from '@wordpress/data';
+import { useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as siteEditorStore } from '../../store';
+import { homeViewRoute } from './home-view';
+import { homeEditRoute } from './home-edit';
+import { navigationViewRoute } from './navigation-view';
+import { navigationEditRoute } from './navigation-edit';
+import { navigationItemEditRoute } from './navigation-item-edit';
+import { navigationItemViewRoute } from './navigation-item-view';
+import { stylesEditRoute } from './styles-edit';
+import { stylesViewRoute } from './styles-view';
+import { patternsEditRoute } from './patterns-edit';
+import { patternsViewRoute } from './patterns-view';
+import { templatesEditRoute } from './templates-edit';
+import { templatesListViewRoute } from './templates-list-view';
+import { templatesViewRoute } from './templates-view';
+import { pagesViewRoute } from './pages-view';
+import { pagesEditRoute } from './pages-edit';
+import { pagesListViewRoute } from './pages-list-view';
+import { pagesListViewQuickEditRoute } from './pages-list-view-quick-edit';
+import { pagesViewQuickEditRoute } from './pages-view-quick-edit';
+
+const routes = [
+	pagesListViewQuickEditRoute,
+	pagesListViewRoute,
+	pagesViewQuickEditRoute,
+	pagesViewRoute,
+	pagesEditRoute,
+	templatesEditRoute,
+	templatesListViewRoute,
+	templatesViewRoute,
+	patternsViewRoute,
+	patternsEditRoute,
+	stylesViewRoute,
+	stylesEditRoute,
+	navigationItemViewRoute,
+	navigationItemEditRoute,
+	navigationViewRoute,
+	navigationEditRoute,
+	homeViewRoute,
+	homeEditRoute,
+];
+
+export function useRegisterSiteEditorRoutes() {
+	const registry = useRegistry();
+	const { registerRoute } = unlock( useDispatch( siteEditorStore ) );
+	useEffect( () => {
+		registry.batch( () => {
+			routes.forEach( registerRoute );
+		} );
+	}, [ registry, registerRoute ] );
+}
diff --git a/packages/edit-site/src/components/site-editor-routes/navigation-edit.js b/packages/edit-site/src/components/site-editor-routes/navigation-edit.js
new file mode 100644
index 00000000000000..fdba963c41d0cb
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/navigation-edit.js
@@ -0,0 +1,22 @@
+/**
+ * Internal dependencies
+ */
+import { NAVIGATION_POST_TYPE } from '../../utils/constants';
+import Editor from '../editor';
+import SidebarNavigationScreenNavigationMenus from '../sidebar-navigation-screen-navigation-menus';
+
+export const navigationEditRoute = {
+	name: 'navigation-edit',
+	match: ( params ) => {
+		return (
+			params.postType === NAVIGATION_POST_TYPE &&
+			! params.postId &&
+			params.canvas === 'edit'
+		);
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenNavigationMenus backPath={ {} } />,
+		preview: <Editor />,
+		mobile: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/navigation-item-edit.js b/packages/edit-site/src/components/site-editor-routes/navigation-item-edit.js
new file mode 100644
index 00000000000000..b03cdbd995ac7c
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/navigation-item-edit.js
@@ -0,0 +1,26 @@
+/**
+ * Internal dependencies
+ */
+import { NAVIGATION_POST_TYPE } from '../../utils/constants';
+import Editor from '../editor';
+import SidebarNavigationScreenNavigationMenu from '../sidebar-navigation-screen-navigation-menu';
+
+export const navigationItemEditRoute = {
+	name: 'navigation-item-edit',
+	match: ( params ) => {
+		return (
+			params.postType === NAVIGATION_POST_TYPE &&
+			!! params.postId &&
+			params.canvas === 'edit'
+		);
+	},
+	areas: {
+		sidebar: (
+			<SidebarNavigationScreenNavigationMenu
+				backPath={ { postType: NAVIGATION_POST_TYPE } }
+			/>
+		),
+		preview: <Editor />,
+		mobile: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/navigation-item-view.js b/packages/edit-site/src/components/site-editor-routes/navigation-item-view.js
new file mode 100644
index 00000000000000..d04a03a8f9df38
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/navigation-item-view.js
@@ -0,0 +1,25 @@
+/**
+ * Internal dependencies
+ */
+import { NAVIGATION_POST_TYPE } from '../../utils/constants';
+import Editor from '../editor';
+import SidebarNavigationScreenNavigationMenu from '../sidebar-navigation-screen-navigation-menu';
+
+export const navigationItemViewRoute = {
+	name: 'navigation-item-view',
+	match: ( params ) => {
+		return (
+			params.postType === NAVIGATION_POST_TYPE &&
+			!! params.postId &&
+			params.canvas !== 'edit'
+		);
+	},
+	areas: {
+		sidebar: (
+			<SidebarNavigationScreenNavigationMenu
+				backPath={ { postType: NAVIGATION_POST_TYPE } }
+			/>
+		),
+		preview: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/navigation-view.js b/packages/edit-site/src/components/site-editor-routes/navigation-view.js
new file mode 100644
index 00000000000000..59c38a2f1d099a
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/navigation-view.js
@@ -0,0 +1,21 @@
+/**
+ * Internal dependencies
+ */
+import { NAVIGATION_POST_TYPE } from '../../utils/constants';
+import Editor from '../editor';
+import SidebarNavigationScreenNavigationMenus from '../sidebar-navigation-screen-navigation-menus';
+
+export const navigationViewRoute = {
+	name: 'navigation-view',
+	match: ( params ) => {
+		return (
+			params.postType === NAVIGATION_POST_TYPE &&
+			! params.postId &&
+			params.canvas !== 'edit'
+		);
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenNavigationMenus backPath={ {} } />,
+		preview: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/pages-edit.js b/packages/edit-site/src/components/site-editor-routes/pages-edit.js
new file mode 100644
index 00000000000000..ef4c7efbfb09c2
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/pages-edit.js
@@ -0,0 +1,35 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import PostList from '../post-list';
+import DataViewsSidebarContent from '../sidebar-dataviews';
+import SidebarNavigationScreen from '../sidebar-navigation-screen';
+import Editor from '../editor';
+
+function PageList() {
+	return <PostList postType="page" />;
+}
+
+export const pagesEditRoute = {
+	name: 'pages-edit',
+	match: ( params ) => {
+		return params.postType === 'page' && params.canvas === 'edit';
+	},
+	areas: {
+		sidebar: (
+			<SidebarNavigationScreen
+				title={ __( 'Pages' ) }
+				backPath={ {} }
+				content={ <DataViewsSidebarContent /> }
+			/>
+		),
+		content: <PageList />,
+		mobile: <Editor />,
+		preview: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/pages-list-view-quick-edit.js b/packages/edit-site/src/components/site-editor-routes/pages-list-view-quick-edit.js
new file mode 100644
index 00000000000000..9eb33e05a99bb0
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/pages-list-view-quick-edit.js
@@ -0,0 +1,56 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
+/**
+ * Internal dependencies
+ */
+import PostList from '../post-list';
+import DataViewsSidebarContent from '../sidebar-dataviews';
+import SidebarNavigationScreen from '../sidebar-navigation-screen';
+import { unlock } from '../../lock-unlock';
+import { PostEdit } from '../post-edit';
+import Editor from '../editor';
+
+const { useLocation } = unlock( routerPrivateApis );
+
+function PageList() {
+	return <PostList postType="page" />;
+}
+
+function PageQuickEdit() {
+	const { params } = useLocation();
+	return <PostEdit postType="page" postId={ params.postId } />;
+}
+
+export const pagesListViewQuickEditRoute = {
+	name: 'pages-list-view-quick-edit',
+	match: ( params ) => {
+		return (
+			params.isCustom !== 'true' &&
+			( params.layout ?? 'list' ) === 'list' &&
+			!! params.quickEdit &&
+			params.postType === 'page' &&
+			params.canvas !== 'edit'
+		);
+	},
+	areas: {
+		sidebar: (
+			<SidebarNavigationScreen
+				title={ __( 'Pages' ) }
+				backPath={ {} }
+				content={ <DataViewsSidebarContent /> }
+			/>
+		),
+		content: <PageList />,
+		mobile: <PageList />,
+		preview: <Editor />,
+		edit: <PageQuickEdit />,
+	},
+	widths: {
+		content: 380,
+		edit: 380,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/pages-list-view.js b/packages/edit-site/src/components/site-editor-routes/pages-list-view.js
new file mode 100644
index 00000000000000..74b39848e83f2b
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/pages-list-view.js
@@ -0,0 +1,44 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import PostList from '../post-list';
+import DataViewsSidebarContent from '../sidebar-dataviews';
+import SidebarNavigationScreen from '../sidebar-navigation-screen';
+import Editor from '../editor';
+
+function PageList() {
+	return <PostList postType="page" />;
+}
+
+export const pagesListViewRoute = {
+	name: 'pages-list-view',
+	match: ( params ) => {
+		return (
+			params.isCustom !== 'true' &&
+			( params.layout ?? 'list' ) === 'list' &&
+			! params.quickEdit &&
+			params.postType === 'page' &&
+			params.canvas !== 'edit'
+		);
+	},
+	areas: {
+		sidebar: (
+			<SidebarNavigationScreen
+				title={ __( 'Pages' ) }
+				backPath={ {} }
+				content={ <DataViewsSidebarContent /> }
+			/>
+		),
+		content: <PageList />,
+		preview: <Editor />,
+		mobile: <PageList />,
+	},
+	widths: {
+		content: 380,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/pages-view-quick-edit.js b/packages/edit-site/src/components/site-editor-routes/pages-view-quick-edit.js
new file mode 100644
index 00000000000000..907054364c8a93
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/pages-view-quick-edit.js
@@ -0,0 +1,53 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
+/**
+ * Internal dependencies
+ */
+import PostList from '../post-list';
+import DataViewsSidebarContent from '../sidebar-dataviews';
+import SidebarNavigationScreen from '../sidebar-navigation-screen';
+import { unlock } from '../../lock-unlock';
+import { PostEdit } from '../post-edit';
+
+const { useLocation } = unlock( routerPrivateApis );
+
+function PageList() {
+	return <PostList postType="page" />;
+}
+
+function PageQuickEdit() {
+	const { params } = useLocation();
+	return <PostEdit postType="page" postId={ params.postId } />;
+}
+
+export const pagesViewQuickEditRoute = {
+	name: 'pages-view-quick-edit',
+	match: ( params ) => {
+		return (
+			( params.isCustom === 'true' ||
+				( params.layout ?? 'list' ) !== 'list' ) &&
+			!! params.quickEdit &&
+			params.postType === 'page' &&
+			params.canvas !== 'edit'
+		);
+	},
+	areas: {
+		sidebar: (
+			<SidebarNavigationScreen
+				title={ __( 'Pages' ) }
+				backPath={ {} }
+				content={ <DataViewsSidebarContent /> }
+			/>
+		),
+		content: <PageList />,
+		mobile: <PageList />,
+		edit: <PageQuickEdit />,
+	},
+	widths: {
+		edit: 380,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/pages-view.js b/packages/edit-site/src/components/site-editor-routes/pages-view.js
new file mode 100644
index 00000000000000..df7e211022cacf
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/pages-view.js
@@ -0,0 +1,39 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import PostList from '../post-list';
+import DataViewsSidebarContent from '../sidebar-dataviews';
+import SidebarNavigationScreen from '../sidebar-navigation-screen';
+
+function PageList() {
+	return <PostList postType="page" />;
+}
+
+export const pagesViewRoute = {
+	name: 'pages-view',
+	match: ( params ) => {
+		return (
+			( params.isCustom === 'true' ||
+				( params.layout ?? 'list' ) !== 'list' ) &&
+			! params.quickEdit &&
+			params.postType === 'page' &&
+			params.canvas !== 'edit'
+		);
+	},
+	areas: {
+		sidebar: (
+			<SidebarNavigationScreen
+				title={ __( 'Pages' ) }
+				backPath={ {} }
+				content={ <DataViewsSidebarContent /> }
+			/>
+		),
+		content: <PageList />,
+		mobile: <PageList />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/patterns-edit.js b/packages/edit-site/src/components/site-editor-routes/patterns-edit.js
new file mode 100644
index 00000000000000..eaf1fd68020181
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/patterns-edit.js
@@ -0,0 +1,24 @@
+/**
+ * Internal dependencies
+ */
+import Editor from '../editor';
+import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';
+import PagePatterns from '../page-patterns';
+import { PATTERN_TYPES, TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
+
+export const patternsEditRoute = {
+	name: 'patterns-edit',
+	match: ( params ) => {
+		return (
+			[ TEMPLATE_PART_POST_TYPE, PATTERN_TYPES.user ].includes(
+				params.postType
+			) && params.canvas === 'edit'
+		);
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenPatterns backPath={ {} } />,
+		content: <PagePatterns />,
+		mobile: <Editor />,
+		preview: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/patterns-view.js b/packages/edit-site/src/components/site-editor-routes/patterns-view.js
new file mode 100644
index 00000000000000..468f7f14abc139
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/patterns-view.js
@@ -0,0 +1,22 @@
+/**
+ * Internal dependencies
+ */
+import SidebarNavigationScreenPatterns from '../sidebar-navigation-screen-patterns';
+import PagePatterns from '../page-patterns';
+import { PATTERN_TYPES, TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
+
+export const patternsViewRoute = {
+	name: 'patterns-view',
+	match: ( params ) => {
+		return (
+			[ TEMPLATE_PART_POST_TYPE, PATTERN_TYPES.user ].includes(
+				params.postType
+			) && params.canvas !== 'edit'
+		);
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenPatterns backPath={ {} } />,
+		content: <PagePatterns />,
+		mobile: <PagePatterns />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/styles-edit.js b/packages/edit-site/src/components/site-editor-routes/styles-edit.js
new file mode 100644
index 00000000000000..ff52b957bc3609
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/styles-edit.js
@@ -0,0 +1,17 @@
+/**
+ * Internal dependencies
+ */
+import Editor from '../editor';
+import SidebarNavigationScreenGlobalStyles from '../sidebar-navigation-screen-global-styles';
+
+export const stylesEditRoute = {
+	name: 'styles-edit',
+	match: ( params ) => {
+		return params.path === '/wp_global_styles' && params.canvas === 'edit';
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenGlobalStyles backPath={ {} } />,
+		preview: <Editor />,
+		mobile: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/styles-view.js b/packages/edit-site/src/components/site-editor-routes/styles-view.js
new file mode 100644
index 00000000000000..856a610eb23677
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/styles-view.js
@@ -0,0 +1,16 @@
+/**
+ * Internal dependencies
+ */
+import Editor from '../editor';
+import SidebarNavigationScreenGlobalStyles from '../sidebar-navigation-screen-global-styles';
+
+export const stylesViewRoute = {
+	name: 'styles-view',
+	match: ( params ) => {
+		return params.path === '/wp_global_styles' && params.canvas !== 'edit';
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenGlobalStyles backPath={ {} } />,
+		preview: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/templates-edit.js b/packages/edit-site/src/components/site-editor-routes/templates-edit.js
new file mode 100644
index 00000000000000..488e9decc1888c
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/templates-edit.js
@@ -0,0 +1,22 @@
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
+import PageTemplates from '../page-templates';
+import Editor from '../editor';
+import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';
+
+export const templatesEditRoute = {
+	name: 'templates-edit',
+	match: ( params ) => {
+		return (
+			params.postType === TEMPLATE_POST_TYPE && params.canvas === 'edit'
+		);
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenTemplatesBrowse backPath={ {} } />,
+		content: <PageTemplates />,
+		mobile: <Editor />,
+		preview: <Editor />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/templates-list-view.js b/packages/edit-site/src/components/site-editor-routes/templates-list-view.js
new file mode 100644
index 00000000000000..7cdda1b13c0b47
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/templates-list-view.js
@@ -0,0 +1,28 @@
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
+import PageTemplates from '../page-templates';
+import Editor from '../editor';
+import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';
+
+export const templatesListViewRoute = {
+	name: 'templates-list-view',
+	match: ( params ) => {
+		return (
+			params.isCustom !== 'true' &&
+			params.layout === 'list' &&
+			params.postType === TEMPLATE_POST_TYPE &&
+			params.canvas !== 'edit'
+		);
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenTemplatesBrowse backPath={ {} } />,
+		content: <PageTemplates />,
+		mobile: <PageTemplates />,
+		preview: <Editor />,
+	},
+	widths: {
+		content: 380,
+	},
+};
diff --git a/packages/edit-site/src/components/site-editor-routes/templates-view.js b/packages/edit-site/src/components/site-editor-routes/templates-view.js
new file mode 100644
index 00000000000000..40fd88c0e60a61
--- /dev/null
+++ b/packages/edit-site/src/components/site-editor-routes/templates-view.js
@@ -0,0 +1,22 @@
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
+import PageTemplates from '../page-templates';
+import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';
+
+export const templatesViewRoute = {
+	name: 'templates-view',
+	match: ( params ) => {
+		return (
+			( params.isCustom === 'true' || params.layout !== 'list' ) &&
+			params.postType === TEMPLATE_POST_TYPE &&
+			params.canvas !== 'edit'
+		);
+	},
+	areas: {
+		sidebar: <SidebarNavigationScreenTemplatesBrowse backPath={ {} } />,
+		content: <PageTemplates />,
+		mobile: <PageTemplates />,
+	},
+};
diff --git a/packages/edit-site/src/components/site-hub/index.js b/packages/edit-site/src/components/site-hub/index.js
index 9d63001c185c32..3f34b8bd1cccb6 100644
--- a/packages/edit-site/src/components/site-hub/index.js
+++ b/packages/edit-site/src/components/site-hub/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -9,19 +9,18 @@ import classnames from 'classnames';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
 	Button,
-	__unstableMotion as motion,
-	__unstableAnimatePresence as AnimatePresence,
 	__experimentalHStack as HStack,
+	VisuallyHidden,
 } from '@wordpress/components';
-import { useReducedMotion } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
-import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
-import { memo } from '@wordpress/element';
-import { search, external } from '@wordpress/icons';
+import { memo, forwardRef, useContext } from '@wordpress/element';
+import { search } from '@wordpress/icons';
 import { store as commandsStore } from '@wordpress/commands';
 import { displayShortcut } from '@wordpress/keycodes';
+import { filterURLForDisplay } from '@wordpress/url';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
  * Internal dependencies
@@ -29,177 +28,170 @@ import { displayShortcut } from '@wordpress/keycodes';
 import { store as editSiteStore } from '../../store';
 import SiteIcon from '../site-icon';
 import { unlock } from '../../lock-unlock';
+const { useHistory } = unlock( routerPrivateApis );
+import { SidebarNavigationContext } from '../sidebar';
 
-const HUB_ANIMATION_DURATION = 0.3;
-
-const SiteHub = memo( ( { isTransparent, className } ) => {
-	const { canvasMode, dashboardLink, homeUrl, siteTitle } = useSelect(
-		( select ) => {
-			const { getCanvasMode, getSettings } = unlock(
-				select( editSiteStore )
-			);
-
-			const {
-				getSite,
-				getUnstableBase, // Site index.
-			} = select( coreStore );
+const SiteHub = memo(
+	forwardRef( ( { isTransparent }, ref ) => {
+		const { dashboardLink, homeUrl, siteTitle } = useSelect( ( select ) => {
+			const { getSettings } = unlock( select( editSiteStore ) );
 
+			const { getEntityRecord } = select( coreStore );
+			const _site = getEntityRecord( 'root', 'site' );
 			return {
-				canvasMode: getCanvasMode(),
 				dashboardLink:
 					getSettings().__experimentalDashboardLink || 'index.php',
-				homeUrl: getUnstableBase()?.home,
-				siteTitle: getSite()?.title,
+				homeUrl: getEntityRecord( 'root', '__unstableBase' )?.home,
+				siteTitle:
+					! _site?.title && !! _site?.url
+						? filterURLForDisplay( _site?.url )
+						: _site?.title,
 			};
-		},
-		[]
-	);
-	const { open: openCommandCenter } = useDispatch( commandsStore );
+		}, [] );
+		const { open: openCommandCenter } = useDispatch( commandsStore );
 
-	const disableMotion = useReducedMotion();
-	const {
-		setCanvasMode,
-		__experimentalSetPreviewDeviceType: setPreviewDeviceType,
-	} = unlock( useDispatch( editSiteStore ) );
-	const { clearSelectedBlock } = useDispatch( blockEditorStore );
-	const isBackToDashboardButton = canvasMode === 'view';
-	const siteIconButtonProps = isBackToDashboardButton
-		? {
-				href: dashboardLink,
-				label: __( 'Go to the Dashboard' ),
-		  }
-		: {
-				href: dashboardLink, // We need to keep the `href` here so the component doesn't remount as a `<button>` and break the animation.
-				role: 'button',
-				label: __( 'Open Navigation' ),
-				onClick: ( event ) => {
-					event.preventDefault();
-					if ( canvasMode === 'edit' ) {
-						clearSelectedBlock();
-						setPreviewDeviceType( 'Desktop' );
-						setCanvasMode( 'view' );
-					}
-				},
-		  };
-
-	return (
-		<motion.div
-			className={ classnames( 'edit-site-site-hub', className ) }
-			variants={ {
-				isDistractionFree: { x: '-100%' },
-				isDistractionFreeHovering: { x: 0 },
-				view: { x: 0 },
-				edit: { x: 0 },
-			} }
-			initial={ false }
-			transition={ {
-				type: 'tween',
-				duration: disableMotion ? 0 : HUB_ANIMATION_DURATION,
-				ease: 'easeOut',
-			} }
-		>
-			<HStack
-				justify="space-between"
-				alignment="center"
-				className="edit-site-site-hub__container"
-			>
-				<HStack
-					justify="flex-start"
-					className="edit-site-site-hub__text-content"
-					spacing="0"
-				>
-					<motion.div
-						className={ classnames(
+		return (
+			<div className="edit-site-site-hub">
+				<HStack justify="flex-start" spacing="0">
+					<div
+						className={ clsx(
 							'edit-site-site-hub__view-mode-toggle-container',
 							{
 								'has-transparent-background': isTransparent,
 							}
 						) }
-						layout
-						transition={ {
-							type: 'tween',
-							duration: disableMotion
-								? 0
-								: HUB_ANIMATION_DURATION,
-							ease: 'easeOut',
-						} }
 					>
 						<Button
-							{ ...siteIconButtonProps }
+							__next40pxDefaultSize
+							ref={ ref }
+							href={ dashboardLink }
+							label={ __( 'Go to the Dashboard' ) }
 							className="edit-site-layout__view-mode-toggle"
+							style={ {
+								transform: 'scale(0.5333) translateX(-4px)', // Offset to position the icon 12px from viewport edge
+								borderRadius: 4,
+							} }
 						>
-							<motion.div
-								initial={ false }
-								animate={ {
-									scale: canvasMode === 'view' ? 0.5 : 1,
-								} }
-								whileHover={ {
-									scale: canvasMode === 'view' ? 0.5 : 0.96,
-								} }
-								transition={ {
-									type: 'tween',
-									duration: disableMotion
-										? 0
-										: HUB_ANIMATION_DURATION,
-									ease: 'easeOut',
-								} }
-							>
-								<SiteIcon className="edit-site-layout__view-mode-toggle-icon" />
-							</motion.div>
+							<SiteIcon className="edit-site-layout__view-mode-toggle-icon" />
 						</Button>
-					</motion.div>
+					</div>
 
-					<AnimatePresence>
-						<motion.div
-							layout={ canvasMode === 'edit' }
-							animate={ {
-								opacity: canvasMode === 'view' ? 1 : 0,
-							} }
-							exit={ {
-								opacity: 0,
-							} }
-							className={ classnames(
-								'edit-site-site-hub__site-title',
-								{ 'is-transparent': isTransparent }
-							) }
-							transition={ {
-								type: 'tween',
-								duration: disableMotion ? 0 : 0.2,
-								ease: 'easeOut',
-								delay: canvasMode === 'view' ? 0.1 : 0,
-							} }
+					<HStack>
+						<div className="edit-site-site-hub__title">
+							<Button
+								__next40pxDefaultSize
+								variant="link"
+								href={ homeUrl }
+								target="_blank"
+							>
+								{ decodeEntities( siteTitle ) }
+								<VisuallyHidden as="span">
+									{
+										/* translators: accessibility text */
+										__( '(opens in a new tab)' )
+									}
+								</VisuallyHidden>
+							</Button>
+						</div>
+						<HStack
+							spacing={ 0 }
+							expanded={ false }
+							className="edit-site-site-hub__actions"
 						>
-							{ decodeEntities( siteTitle ) }
-						</motion.div>
-					</AnimatePresence>
-					{ canvasMode === 'view' && (
-						<Button
-							href={ homeUrl }
-							target="_blank"
-							label={ __( 'View site (opens in a new tab)' ) }
-							aria-label={ __(
-								'View site (opens in a new tab)'
-							) }
-							icon={ external }
-							className="edit-site-site-hub__site-view-link"
-						/>
-					) }
+							<Button
+								size="compact"
+								className="edit-site-site-hub_toggle-command-center"
+								icon={ search }
+								onClick={ () => openCommandCenter() }
+								label={ __( 'Open command palette' ) }
+								shortcut={ displayShortcut.primary( 'k' ) }
+							/>
+						</HStack>
+					</HStack>
 				</HStack>
-				{ canvasMode === 'view' && (
-					<Button
-						className={ classnames(
-							'edit-site-site-hub_toggle-command-center',
-							{ 'is-transparent': isTransparent }
-						) }
-						icon={ search }
-						onClick={ () => openCommandCenter() }
-						label={ __( 'Open command palette' ) }
-						shortcut={ displayShortcut.primary( 'k' ) }
-					/>
-				) }
-			</HStack>
-		</motion.div>
-	);
-} );
+			</div>
+		);
+	} )
+);
 
 export default SiteHub;
+
+export const SiteHubMobile = memo(
+	forwardRef( ( { isTransparent }, ref ) => {
+		const history = useHistory();
+		const { navigate } = useContext( SidebarNavigationContext );
+
+		const { homeUrl, siteTitle } = useSelect( ( select ) => {
+			const { getEntityRecord } = select( coreStore );
+			const _site = getEntityRecord( 'root', 'site' );
+			return {
+				homeUrl: getEntityRecord( 'root', '__unstableBase' )?.home,
+				siteTitle:
+					! _site?.title && !! _site?.url
+						? filterURLForDisplay( _site?.url )
+						: _site?.title,
+			};
+		}, [] );
+		const { open: openCommandCenter } = useDispatch( commandsStore );
+
+		return (
+			<div className="edit-site-site-hub">
+				<HStack justify="flex-start" spacing="0">
+					<div
+						className={ clsx(
+							'edit-site-site-hub__view-mode-toggle-container',
+							{
+								'has-transparent-background': isTransparent,
+							}
+						) }
+					>
+						<Button
+							__next40pxDefaultSize
+							ref={ ref }
+							label={ __( 'Go to Site Editor' ) }
+							className="edit-site-layout__view-mode-toggle"
+							style={ {
+								transform: 'scale(0.5)',
+								borderRadius: 4,
+							} }
+							onClick={ () => {
+								history.push( {} );
+								navigate( 'back' );
+							} }
+						>
+							<SiteIcon className="edit-site-layout__view-mode-toggle-icon" />
+						</Button>
+					</div>
+
+					<HStack>
+						<div className="edit-site-site-hub__title">
+							<Button
+								__next40pxDefaultSize
+								variant="link"
+								href={ homeUrl }
+								target="_blank"
+								label={ __( 'View site (opens in a new tab)' ) }
+							>
+								{ decodeEntities( siteTitle ) }
+							</Button>
+						</div>
+						<HStack
+							spacing={ 0 }
+							expanded={ false }
+							className="edit-site-site-hub__actions"
+						>
+							<Button
+								__next40pxDefaultSize
+								className="edit-site-site-hub_toggle-command-center"
+								icon={ search }
+								onClick={ () => openCommandCenter() }
+								label={ __( 'Open command palette' ) }
+								shortcut={ displayShortcut.primary( 'k' ) }
+							/>
+						</HStack>
+					</HStack>
+				</HStack>
+			</div>
+		);
+	} )
+);
diff --git a/packages/edit-site/src/components/site-hub/style.scss b/packages/edit-site/src/components/site-hub/style.scss
index 49e5304d1688fc..b1c1a3a41cc532 100644
--- a/packages/edit-site/src/components/site-hub/style.scss
+++ b/packages/edit-site/src/components/site-hub/style.scss
@@ -3,77 +3,86 @@
 	align-items: center;
 	justify-content: space-between;
 	gap: $grid-unit-10;
-
-	.edit-site-site-hub__container {
-		gap: 0;
-	}
-
-	.edit-site-site-hub__site-title,
-	.edit-site-site-hub_toggle-command-center {
-		transition: opacity ease 0.1s;
-
-		&.is-transparent {
-			opacity: 0 !important;
-		}
-	}
-
-	.edit-site-site-hub__site-view-link {
-		flex-grow: 0;
-		margin-right: var(--wp-admin-border-width-focus);
-		@include break-mobile() {
-			opacity: 0;
-			transition: opacity 0.2s ease-in-out;
-		}
-		&:focus {
-			opacity: 1;
-		}
-		svg {
-			fill: $gray-200;
-		}
-	}
-	&:hover {
-		.edit-site-site-hub__site-view-link {
-			opacity: 1;
-		}
-	}
+	margin-right: $grid-unit-15;
+	height: $grid-unit-70;
 }
 
-.edit-site-site-hub__post-type {
-	opacity: 0.6;
+.edit-site-site-hub__actions {
+	flex-shrink: 0;
 }
 
 .edit-site-site-hub__view-mode-toggle-container {
 	height: $header-height;
 	width: $header-height;
 	flex-shrink: 0;
-	background: $gray-900;
 
-	&.has-transparent-background {
+	&.has-transparent-background .edit-site-layout__view-mode-toggle-icon {
 		background: transparent;
 	}
 }
 
-.edit-site-site-hub__text-content {
-	// Necessary for the ellipsis to work.
+.edit-site-site-hub__title .components-button {
+	color: $gray-200;
+	display: block;
+	flex-grow: 1;
+	font-size: 15px;
+	font-weight: 500;
 	overflow: hidden;
-}
+	// Add space for the ↗ to render.
+	padding-right: $grid-unit-20;
 
-.edit-site-site-hub__title {
+	// Create 12px gap between site icon and site title
+	margin-left: - $grid-unit-05;
+	position: relative;
+	text-decoration: none;
 	text-overflow: ellipsis;
 	white-space: nowrap;
-	overflow: hidden;
-}
 
-.edit-site-site-hub__site-title {
-	margin-left: $grid-unit-05;
-	flex-grow: 1;
-	color: $gray-200;
+	&:hover,
+	&:focus,
+	&:active {
+		color: $gray-200;
+	}
+
+	&:focus {
+		// Defer to :focus-visible below.
+		box-shadow: none;
+		outline: none;
+	}
+
+	&:focus-visible {
+		// Push the shadow away from the title.
+		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) $gray-900, 0 0 0 calc(2 * var(--wp-admin-border-width-focus)) var(--wp-admin-theme-color);
+
+		// Windows High Contrast mode will show this outline, but not the box-shadow.
+		outline: 2px solid transparent;
+		outline-offset: 2px;
+	}
+
+	&::after {
+		content: "\2197";
+		font-weight: 400;
+		opacity: 0;
+		position: absolute;
+		right: 0;
+		transition: opacity 0.1s linear;
+		@include reduce-motion("transition");
+	}
+
+	&:hover::after,
+	&:focus::after,
+	&:active::after {
+		opacity: 1;
+	}
 }
 
 .edit-site-site-hub_toggle-command-center {
 	color: $gray-200;
 
-	&:hover {
-		color: $gray-100;
+	&:hover,
+	&:active {
+		svg {
+			fill: $gray-100;
+		}
 	}
 }
diff --git a/packages/edit-site/src/components/site-icon/index.js b/packages/edit-site/src/components/site-icon/index.js
index 5855e083d31c3c..bd1fe63a50897c 100644
--- a/packages/edit-site/src/components/site-icon/index.js
+++ b/packages/edit-site/src/components/site-icon/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -36,13 +36,13 @@ function SiteIcon( { className } ) {
 	) : (
 		<Icon
 			className="edit-site-site-icon__icon"
-			size="48px"
 			icon={ wordpress }
+			size={ 48 }
 		/>
 	);
 
 	return (
-		<div className={ classnames( className, 'edit-site-site-icon' ) }>
+		<div className={ clsx( className, 'edit-site-site-icon' ) }>
 			{ icon }
 		</div>
 	);
diff --git a/packages/edit-site/src/components/site-icon/style.scss b/packages/edit-site/src/components/site-icon/style.scss
index ac16279c9fe184..a6cc7ad27fe5df 100644
--- a/packages/edit-site/src/components/site-icon/style.scss
+++ b/packages/edit-site/src/components/site-icon/style.scss
@@ -1,15 +1,22 @@
 .edit-site-site-icon__icon {
 	fill: currentColor;
+	width: 100%;
+	height: 100%;
+
+	.edit-site-layout.is-full-canvas & {
+		// Make the WordPress icon not so big in full canvas.
+		padding: $grid-unit-15;
+	}
 }
 
 .edit-site-site-icon__image {
 	width: 100%;
-	height: auto;
-	border-radius: $radius-block-ui * 2;
+	height: 100%;
 	object-fit: cover;
 	background: #333;
+	aspect-ratio: 1 / 1;
 
-	.edit-site-layout.is-full-canvas.is-edit-mode & {
+	.edit-site-layout.is-full-canvas & {
 		border-radius: 0;
 	}
 }
diff --git a/packages/edit-site/src/components/start-template-options/index.js b/packages/edit-site/src/components/start-template-options/index.js
deleted file mode 100644
index 771f380db05a3d..00000000000000
--- a/packages/edit-site/src/components/start-template-options/index.js
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Modal, Flex, FlexItem, Button } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useState, useMemo } from '@wordpress/element';
-import {
-	__experimentalBlockPatternsList as BlockPatternsList,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { useSelect } from '@wordpress/data';
-import { useAsyncList } from '@wordpress/compose';
-import { store as preferencesStore } from '@wordpress/preferences';
-import { parse } from '@wordpress/blocks';
-import { store as coreStore, useEntityBlockEditor } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
-
-function useFallbackTemplateContent( slug, isCustom = false ) {
-	return useSelect(
-		( select ) => {
-			const { getEntityRecord, getDefaultTemplateId } =
-				select( coreStore );
-			const templateId = getDefaultTemplateId( {
-				slug,
-				is_custom: isCustom,
-				ignore_empty: true,
-			} );
-			return templateId
-				? getEntityRecord( 'postType', TEMPLATE_POST_TYPE, templateId )
-						?.content?.raw
-				: undefined;
-		},
-		[ slug, isCustom ]
-	);
-}
-
-function useStartPatterns( fallbackContent ) {
-	const { slug, patterns } = useSelect( ( select ) => {
-		const { getEditedPostType, getEditedPostId } = select( editSiteStore );
-		const { getEntityRecord } = select( coreStore );
-		const postId = getEditedPostId();
-		const postType = getEditedPostType();
-		const record = getEntityRecord( 'postType', postType, postId );
-		const { getSettings } = select( blockEditorStore );
-		return {
-			slug: record.slug,
-			patterns: getSettings().__experimentalBlockPatterns,
-		};
-	}, [] );
-
-	const currentThemeStylesheet = useSelect(
-		( select ) => select( coreStore ).getCurrentTheme().stylesheet
-	);
-
-	// Duplicated from packages/block-library/src/pattern/edit.js.
-	function injectThemeAttributeInBlockTemplateContent( block ) {
-		if (
-			block.innerBlocks.find(
-				( innerBlock ) => innerBlock.name === 'core/template-part'
-			)
-		) {
-			block.innerBlocks = block.innerBlocks.map( ( innerBlock ) => {
-				if (
-					innerBlock.name === 'core/template-part' &&
-					innerBlock.attributes.theme === undefined
-				) {
-					innerBlock.attributes.theme = currentThemeStylesheet;
-				}
-				return innerBlock;
-			} );
-		}
-
-		if (
-			block.name === 'core/template-part' &&
-			block.attributes.theme === undefined
-		) {
-			block.attributes.theme = currentThemeStylesheet;
-		}
-		return block;
-	}
-
-	return useMemo( () => {
-		// filter patterns that are supposed to be used in the current template being edited.
-		return [
-			{
-				name: 'fallback',
-				blocks: parse( fallbackContent ),
-				title: __( 'Fallback content' ),
-			},
-			...patterns
-				.filter( ( pattern ) => {
-					return (
-						Array.isArray( pattern.templateTypes ) &&
-						pattern.templateTypes.some( ( templateType ) =>
-							slug.startsWith( templateType )
-						)
-					);
-				} )
-				.map( ( pattern ) => {
-					return {
-						...pattern,
-						blocks: parse( pattern.content ).map( ( block ) =>
-							injectThemeAttributeInBlockTemplateContent( block )
-						),
-					};
-				} ),
-		];
-	}, [ fallbackContent, slug, patterns ] );
-}
-
-function PatternSelection( { fallbackContent, onChoosePattern, postType } ) {
-	const [ , , onChange ] = useEntityBlockEditor( 'postType', postType );
-	const blockPatterns = useStartPatterns( fallbackContent );
-	const shownBlockPatterns = useAsyncList( blockPatterns );
-	return (
-		<BlockPatternsList
-			blockPatterns={ blockPatterns }
-			shownPatterns={ shownBlockPatterns }
-			onClickPattern={ ( pattern, blocks ) => {
-				onChange( blocks, { selection: undefined } );
-				onChoosePattern();
-			} }
-		/>
-	);
-}
-
-function StartModal( { slug, isCustom, onClose, postType } ) {
-	const fallbackContent = useFallbackTemplateContent( slug, isCustom );
-	if ( ! fallbackContent ) {
-		return null;
-	}
-	return (
-		<Modal
-			className="edit-site-start-template-options__modal"
-			title={ __( 'Choose a pattern' ) }
-			closeLabel={ __( 'Cancel' ) }
-			focusOnMount="firstElement"
-			onRequestClose={ onClose }
-			isFullScreen={ true }
-		>
-			<div className="edit-site-start-template-options__modal-content">
-				<PatternSelection
-					fallbackContent={ fallbackContent }
-					slug={ slug }
-					isCustom={ isCustom }
-					postType={ postType }
-					onChoosePattern={ () => {
-						onClose();
-					} }
-				/>
-			</div>
-			<Flex
-				className="edit-site-start-template-options__modal__actions"
-				justify="flex-end"
-				expanded={ false }
-			>
-				<FlexItem>
-					<Button variant="tertiary" onClick={ onClose }>
-						{ __( 'Skip' ) }
-					</Button>
-				</FlexItem>
-			</Flex>
-		</Modal>
-	);
-}
-
-const START_TEMPLATE_MODAL_STATES = {
-	INITIAL: 'INITIAL',
-	CLOSED: 'CLOSED',
-};
-
-export default function StartTemplateOptions() {
-	const [ modalState, setModalState ] = useState(
-		START_TEMPLATE_MODAL_STATES.INITIAL
-	);
-	const { shouldOpenModal, slug, isCustom, postType } = useSelect(
-		( select ) => {
-			const { getEditedPostType, getEditedPostId } =
-				select( editSiteStore );
-			const _postType = getEditedPostType();
-			const postId = getEditedPostId();
-			const { getEditedEntityRecord, hasEditsForEntityRecord } =
-				select( coreStore );
-			const templateRecord = getEditedEntityRecord(
-				'postType',
-				_postType,
-				postId
-			);
-			const hasEdits = hasEditsForEntityRecord(
-				'postType',
-				_postType,
-				postId
-			);
-
-			return {
-				shouldOpenModal:
-					! hasEdits &&
-					'' === templateRecord.content &&
-					TEMPLATE_POST_TYPE === _postType &&
-					! select( preferencesStore ).get(
-						'core/edit-site',
-						'welcomeGuide'
-					),
-				slug: templateRecord.slug,
-				isCustom: templateRecord.is_custom,
-				postType: _postType,
-			};
-		},
-		[]
-	);
-
-	if (
-		( modalState === START_TEMPLATE_MODAL_STATES.INITIAL &&
-			! shouldOpenModal ) ||
-		modalState === START_TEMPLATE_MODAL_STATES.CLOSED
-	) {
-		return null;
-	}
-
-	return (
-		<StartModal
-			slug={ slug }
-			isCustom={ isCustom }
-			postType={ postType }
-			onClose={ () =>
-				setModalState( START_TEMPLATE_MODAL_STATES.CLOSED )
-			}
-		/>
-	);
-}
diff --git a/packages/edit-site/src/components/start-template-options/style.scss b/packages/edit-site/src/components/start-template-options/style.scss
deleted file mode 100644
index 53cd38a8c9bfad..00000000000000
--- a/packages/edit-site/src/components/start-template-options/style.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-$actions-height: 92px;
-
-.edit-site-start-template-options__modal {
-	.edit-site-start-template-options__modal__actions {
-		position: absolute;
-		bottom: 0;
-		width: 100%;
-		height: $actions-height;
-		background-color: $white;
-		margin-left: - $grid-unit-40;
-		margin-right: - $grid-unit-40;
-		padding-left: $grid-unit-40;
-		padding-right: $grid-unit-40;
-		border-top: 1px solid $gray-300;
-		z-index: z-index(".edit-site-start-template-options__modal__actions");
-	}
-
-	.block-editor-block-patterns-list {
-		// Since the actions container is positioned absolutely,
-		// this padding bottom ensures that the content wrapper will properly
-		// detect overflowing content and start showing scrollbars at the right
-		// moment. Without this padding, the content would render under the actions
-		// bar without causing the wrapper to show a scrollbar.
-		padding-bottom: $actions-height;
-	}
-}
-
-.edit-site-start-template-options__modal-content .block-editor-block-patterns-list {
-	column-count: 2;
-	column-gap: $grid-unit-30;
-
-	@include break-medium() {
-		column-count: 3;
-	}
-
-	@include break-wide() {
-		column-count: 4;
-	}
-
-	.block-editor-block-patterns-list__list-item {
-		break-inside: avoid-column;
-
-		.block-editor-block-patterns-list__item-title {
-			display: none;
-		}
-	}
-
-	.block-editor-block-patterns-list__item {
-		// Avoid to override the BlockPatternList component
-		// default hover and focus styles.
-		&:not(:focus):not(:hover) .block-editor-block-preview__container {
-			box-shadow: 0 0 0 1px $gray-300;
-		}
-	}
-}
diff --git a/packages/edit-site/src/components/style-book/categories.ts b/packages/edit-site/src/components/style-book/categories.ts
new file mode 100644
index 00000000000000..2c1b627c6d0c60
--- /dev/null
+++ b/packages/edit-site/src/components/style-book/categories.ts
@@ -0,0 +1,91 @@
+/**
+ * WordPress dependencies
+ */
+import { getCategories } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import type {
+	BlockExample,
+	StyleBookCategory,
+	CategoryExamples,
+} from './types';
+import {
+	STYLE_BOOK_CATEGORIES,
+	STYLE_BOOK_THEME_SUBCATEGORIES,
+} from './constants';
+
+/**
+ * Returns category examples for a given category definition and list of examples.
+ * @param {StyleBookCategory} categoryDefinition The category definition.
+ * @param {BlockExample[]}    examples           An array of block examples.
+ * @return {CategoryExamples|undefined} An object containing the category examples.
+ */
+export function getExamplesByCategory(
+	categoryDefinition: StyleBookCategory,
+	examples: BlockExample[]
+): CategoryExamples | undefined {
+	if ( ! categoryDefinition?.slug || ! examples?.length ) {
+		return;
+	}
+
+	if ( categoryDefinition?.subcategories?.length ) {
+		return categoryDefinition.subcategories.reduce(
+			( acc, subcategoryDefinition ) => {
+				const subcategoryExamples = getExamplesByCategory(
+					subcategoryDefinition,
+					examples
+				);
+				if ( subcategoryExamples ) {
+					acc.subcategories = [
+						...acc.subcategories,
+						subcategoryExamples,
+					];
+				}
+				return acc;
+			},
+			{
+				title: categoryDefinition.title,
+				slug: categoryDefinition.slug,
+				subcategories: [],
+			}
+		);
+	}
+
+	const blocksToInclude = categoryDefinition?.blocks || [];
+	const blocksToExclude = categoryDefinition?.exclude || [];
+	const categoryExamples = examples.filter( ( example ) => {
+		return (
+			! blocksToExclude.includes( example.name ) &&
+			( example.category === categoryDefinition.slug ||
+				blocksToInclude.includes( example.name ) )
+		);
+	} );
+
+	if ( ! categoryExamples.length ) {
+		return;
+	}
+
+	return {
+		title: categoryDefinition.title,
+		slug: categoryDefinition.slug,
+		examples: categoryExamples,
+	};
+}
+
+/**
+ * Returns category examples for a given category definition and list of examples.
+ *
+ * @return {StyleBookCategory[]} An array of top-level category definitions.
+ */
+export function getTopLevelStyleBookCategories(): StyleBookCategory[] {
+	const reservedCategories = [
+		...STYLE_BOOK_THEME_SUBCATEGORIES,
+		...STYLE_BOOK_CATEGORIES,
+	].map( ( { slug } ) => slug );
+	const extraCategories = getCategories().filter(
+		( { slug } ) => ! reservedCategories.includes( slug )
+	);
+	return [ ...STYLE_BOOK_CATEGORIES, ...extraCategories ];
+}
diff --git a/packages/edit-site/src/components/style-book/color-examples.tsx b/packages/edit-site/src/components/style-book/color-examples.tsx
new file mode 100644
index 00000000000000..97bdeecee32d3d
--- /dev/null
+++ b/packages/edit-site/src/components/style-book/color-examples.tsx
@@ -0,0 +1,44 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __experimentalGrid as Grid } from '@wordpress/components';
+import { View } from '@wordpress/primitives';
+import {
+	getColorClassName,
+	__experimentalGetGradientClass,
+} from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import type { Color, Gradient } from './types';
+
+const ColorExamples = ( { colors, type } ): JSX.Element | null => {
+	if ( ! colors ) {
+		return null;
+	}
+
+	return (
+		<Grid columns={ 2 } rowGap={ 8 } columnGap={ 16 }>
+			{ colors.map( ( color: Color | Gradient ) => {
+				const className =
+					type === 'gradients'
+						? __experimentalGetGradientClass( color.slug )
+						: getColorClassName( 'background-color', color.slug );
+				const classes = clsx(
+					'edit-site-style-book__color-example',
+					className
+				);
+
+				return <View key={ color.slug } className={ classes } />;
+			} ) }
+		</Grid>
+	);
+};
+
+export default ColorExamples;
diff --git a/packages/edit-site/src/components/style-book/constants.ts b/packages/edit-site/src/components/style-book/constants.ts
new file mode 100644
index 00000000000000..6aa280c937d42d
--- /dev/null
+++ b/packages/edit-site/src/components/style-book/constants.ts
@@ -0,0 +1,264 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import type { StyleBookCategory, StyleBookColorGroup } from './types';
+
+export const STYLE_BOOK_COLOR_GROUPS: StyleBookColorGroup[] = [
+	{
+		slug: 'theme-colors',
+		title: __( 'Theme Colors' ),
+		origin: 'theme',
+		type: 'colors',
+	},
+	{
+		slug: 'theme-gradients',
+		title: __( 'Theme Gradients' ),
+		origin: 'theme',
+		type: 'gradients',
+	},
+	{
+		slug: 'custom-colors',
+		title: __( 'Custom Colors' ),
+		origin: 'custom',
+		type: 'colors',
+	},
+	{
+		slug: 'custom-gradients',
+		title: __( 'Custom Gradients' ),
+		origin: 'custom', // User.
+		type: 'gradients',
+	},
+	{
+		slug: 'duotones',
+		title: __( 'Duotones' ),
+		origin: 'theme',
+		type: 'duotones',
+	},
+	{
+		slug: 'default-colors',
+		title: __( 'Default Colors' ),
+		origin: 'default',
+		type: 'colors',
+	},
+	{
+		slug: 'default-gradients',
+		title: __( 'Default Gradients' ),
+		origin: 'default',
+		type: 'gradients',
+	},
+];
+
+export const STYLE_BOOK_THEME_SUBCATEGORIES: Omit<
+	StyleBookCategory,
+	'subcategories'
+>[] = [
+	{
+		slug: 'site-identity',
+		title: __( 'Site Identity' ),
+		blocks: [ 'core/site-logo', 'core/site-title', 'core/site-tagline' ],
+	},
+	{
+		slug: 'design',
+		title: __( 'Design' ),
+		blocks: [ 'core/navigation', 'core/avatar', 'core/post-time-to-read' ],
+		exclude: [ 'core/home-link', 'core/navigation-link' ],
+	},
+	{
+		slug: 'posts',
+		title: __( 'Posts' ),
+		blocks: [
+			'core/post-title',
+			'core/post-excerpt',
+			'core/post-author',
+			'core/post-author-name',
+			'core/post-author-biography',
+			'core/post-date',
+			'core/post-terms',
+			'core/term-description',
+			'core/query-title',
+			'core/query-no-results',
+			'core/query-pagination',
+			'core/query-numbers',
+		],
+	},
+	{
+		slug: 'comments',
+		title: __( 'Comments' ),
+		blocks: [
+			'core/comments-title',
+			'core/comments-pagination',
+			'core/comments-pagination-numbers',
+			'core/comments',
+			'core/comments-author-name',
+			'core/comment-content',
+			'core/comment-date',
+			'core/comment-edit-link',
+			'core/comment-reply-link',
+			'core/comment-template',
+			'core/post-comments-count',
+			'core/post-comments-link',
+		],
+	},
+];
+
+export const STYLE_BOOK_CATEGORIES: StyleBookCategory[] = [
+	{
+		slug: 'text',
+		title: __( 'Text' ),
+		blocks: [
+			'core/post-content',
+			'core/home-link',
+			'core/navigation-link',
+		],
+	},
+	{
+		slug: 'colors',
+		title: __( 'Colors' ),
+		blocks: [],
+	},
+	{
+		slug: 'theme',
+		title: __( 'Theme' ),
+		subcategories: STYLE_BOOK_THEME_SUBCATEGORIES,
+	},
+	{
+		slug: 'media',
+		title: __( 'Media' ),
+		blocks: [ 'core/post-featured-image' ],
+	},
+	{
+		slug: 'widgets',
+		title: __( 'Widgets' ),
+		blocks: [],
+	},
+	{
+		slug: 'embed',
+		title: __( 'Embeds' ),
+		include: [],
+	},
+];
+
+// Forming a "block formatting context" to prevent margin collapsing.
+// @see https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
+const ROOT_CONTAINER = `
+	.is-root-container {
+		display: flow-root;
+	}
+`;
+// The content area of the Style Book is rendered within an iframe so that global styles
+// are applied to elements within the entire content area. To support elements that are
+// not part of the block previews, such as headings and layout for the block previews,
+// additional CSS rules need to be passed into the iframe. These are hard-coded below.
+// Note that button styles are unset, and then focus rules from the `Button` component are
+// applied to the `button` element, targeted via `.edit-site-style-book__example`.
+// This is to ensure that browser default styles for buttons are not applied to the previews.
+export const STYLE_BOOK_IFRAME_STYLES = `
+	body {
+		position: relative;
+		padding: 32px !important;
+	}
+
+	${ ROOT_CONTAINER }
+
+	.edit-site-style-book__examples {
+		max-width: 1200px;
+		margin: 0 auto;
+	}
+
+	.edit-site-style-book__example {
+	    max-width: 900px;
+		border-radius: 2px;
+		cursor: pointer;
+		display: flex;
+		flex-direction: column;
+		gap: 40px;
+		padding: 16px;
+		width: 100%;
+		box-sizing: border-box;
+		scroll-margin-top: 32px;
+		scroll-margin-bottom: 32px;
+		margin: 0 auto 40px auto;
+	}
+
+	.edit-site-style-book__example.is-selected {
+		box-shadow: 0 0 0 1px var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
+	}
+
+	.edit-site-style-book__example.is-disabled-example {
+		pointer-events: none;
+	}
+
+	.edit-site-style-book__example:focus:not(:disabled) {
+		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
+		outline: 3px solid transparent;
+	}
+
+	.edit-site-style-book__duotone-example > div:first-child {
+		display: flex;
+		aspect-ratio: 16 / 9;
+		grid-row: span 1;
+		grid-column: span 2;
+	}
+	.edit-site-style-book__duotone-example img {
+		width: 100%;
+		height: 100%;
+		object-fit: cover;
+	}
+	.edit-site-style-book__duotone-example > div:not(:first-child) {
+		height: 20px;
+		border: 1px solid #ddd;
+	}
+
+	.edit-site-style-book__color-example {
+		height: 52px;
+		border: 1px solid #ddd;
+	}
+
+	.edit-site-style-book__examples.is-wide .edit-site-style-book__example {
+		flex-direction: row;
+	}
+
+	.edit-site-style-book__subcategory-title,
+	.edit-site-style-book__example-title {
+		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+		font-size: 11px;
+		font-weight: 500;
+		line-height: normal;
+		margin: 0;
+		text-align: left;
+		text-transform: uppercase;
+	}
+
+	.edit-site-style-book__subcategory-title {
+		font-size: 16px;
+		margin-bottom: 40px;
+    	border-bottom: 1px solid #ddd;
+    	padding-bottom: 8px;
+	}
+
+	.edit-site-style-book__examples.is-wide .edit-site-style-book__example-title {
+		text-align: right;
+		width: 120px;
+	}
+
+	.edit-site-style-book__example-preview {
+		width: 100%;
+	}
+
+	.edit-site-style-book__example-preview .block-editor-block-list__insertion-point,
+	.edit-site-style-book__example-preview .block-list-appender {
+		display: none;
+	}
+
+	.edit-site-style-book__example-preview .is-root-container > .wp-block:first-child {
+		margin-top: 0;
+	}
+	.edit-site-style-book__example-preview .is-root-container > .wp-block:last-child {
+		margin-bottom: 0;
+	}
+`;
diff --git a/packages/edit-site/src/components/style-book/duotone-examples.tsx b/packages/edit-site/src/components/style-book/duotone-examples.tsx
new file mode 100644
index 00000000000000..7ee90e61f1c6aa
--- /dev/null
+++ b/packages/edit-site/src/components/style-book/duotone-examples.tsx
@@ -0,0 +1,53 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalGrid as Grid } from '@wordpress/components';
+import { View } from '@wordpress/primitives';
+
+/**
+ * Internal dependencies
+ */
+import type { Duotone } from './types';
+
+const DuotoneExamples = ( { duotones } ): JSX.Element | null => {
+	if ( ! duotones ) {
+		return null;
+	}
+
+	return (
+		<Grid columns={ 2 } rowGap={ 16 } columnGap={ 16 }>
+			{ duotones.map( ( duotone: Duotone ) => {
+				return (
+					<Grid
+						key={ duotone.slug }
+						className="edit-site-style-book__duotone-example"
+						columns={ 2 }
+						rowGap={ 8 }
+						columnGap={ 8 }
+					>
+						<View>
+							<img
+								alt={ `Duotone example: ${ duotone.slug }` }
+								src="https://s.w.org/images/core/5.3/MtBlanc1.jpg"
+								style={ {
+									filter: `url(#wp-duotone-${ duotone.slug })`,
+								} }
+							/>
+						</View>
+						{ duotone.colors.map( ( color ) => {
+							return (
+								<View
+									key={ color }
+									className="edit-site-style-book__color-example"
+									style={ { backgroundColor: color } }
+								/>
+							);
+						} ) }
+					</Grid>
+				);
+			} ) }
+		</Grid>
+	);
+};
+
+export default DuotoneExamples;
diff --git a/packages/edit-site/src/components/style-book/examples.tsx b/packages/edit-site/src/components/style-book/examples.tsx
new file mode 100644
index 00000000000000..9f4badd99a6582
--- /dev/null
+++ b/packages/edit-site/src/components/style-book/examples.tsx
@@ -0,0 +1,113 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+import {
+	getBlockType,
+	getBlockTypes,
+	getBlockFromExample,
+	createBlock,
+} from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import type { BlockExample, ColorOrigin, MultiOriginPalettes } from './types';
+import ColorExamples from './color-examples';
+import DuotoneExamples from './duotone-examples';
+import { STYLE_BOOK_COLOR_GROUPS } from './constants';
+
+/**
+ * Returns examples color examples for each origin
+ * e.g. Core (Default), Theme, and User.
+ *
+ * @param {MultiOriginPalettes} colors Global Styles color palettes per origin.
+ * @return {BlockExample[]} An array of color block examples.
+ */
+function getColorExamples( colors: MultiOriginPalettes ): BlockExample[] {
+	if ( ! colors ) {
+		return [];
+	}
+
+	const examples: BlockExample[] = [];
+
+	STYLE_BOOK_COLOR_GROUPS.forEach( ( group ) => {
+		const palette = colors[ group.type ].find(
+			( origin: ColorOrigin ) => origin.slug === group.origin
+		);
+
+		if ( palette?.[ group.type ] ) {
+			const example: BlockExample = {
+				name: group.slug,
+				title: group.title,
+				category: 'colors',
+			};
+			if ( group.type === 'duotones' ) {
+				example.content = (
+					<DuotoneExamples duotones={ palette[ group.type ] } />
+				);
+				examples.push( example );
+			} else {
+				example.content = (
+					<ColorExamples
+						colors={ palette[ group.type ] }
+						type={ group.type }
+					/>
+				);
+				examples.push( example );
+			}
+		}
+	} );
+
+	return examples;
+}
+
+/**
+ * Returns a list of examples for registered block types.
+ *
+ * @param {MultiOriginPalettes} colors Global styles colors grouped by origin e.g. Core, Theme, and User.
+ * @return {BlockExample[]} An array of block examples.
+ */
+export function getExamples( colors: MultiOriginPalettes ): BlockExample[] {
+	const nonHeadingBlockExamples = getBlockTypes()
+		.filter( ( blockType ) => {
+			const { name, example, supports } = blockType;
+			return (
+				name !== 'core/heading' &&
+				!! example &&
+				supports?.inserter !== false
+			);
+		} )
+		.map( ( blockType ) => ( {
+			name: blockType.name,
+			title: blockType.title,
+			category: blockType.category,
+			blocks: getBlockFromExample( blockType.name, blockType.example ),
+		} ) );
+	const isHeadingBlockRegistered = !! getBlockType( 'core/heading' );
+
+	if ( ! isHeadingBlockRegistered ) {
+		return nonHeadingBlockExamples;
+	}
+
+	// Use our own example for the Heading block so that we can show multiple
+	// heading levels.
+	const headingsExample = {
+		name: 'core/heading',
+		title: __( 'Headings' ),
+		category: 'text',
+		blocks: [ 1, 2, 3, 4, 5, 6 ].map( ( level ) => {
+			return createBlock( 'core/heading', {
+				content: sprintf(
+					// translators: %d: heading level e.g: "1", "2", "3"
+					__( 'Heading %d' ),
+					level
+				),
+				level,
+			} );
+		} ),
+	};
+	const colorExamples = getColorExamples( colors );
+
+	return [ headingsExample, ...colorExamples, ...nonHeadingBlockExamples ];
+}
diff --git a/packages/edit-site/src/components/style-book/index.js b/packages/edit-site/src/components/style-book/index.js
index 19508f0a59f8ea..e9660323b83734 100644
--- a/packages/edit-site/src/components/style-book/index.js
+++ b/packages/edit-site/src/components/style-book/index.js
@@ -1,33 +1,30 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import {
 	Disabled,
-	TabPanel,
+	Composite,
 	privateApis as componentsPrivateApis,
 } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
-import {
-	getCategories,
-	getBlockTypes,
-	getBlockFromExample,
-	createBlock,
-} from '@wordpress/blocks';
+import { __, _x, sprintf } from '@wordpress/i18n';
 import {
 	BlockList,
 	privateApis as blockEditorPrivateApis,
 	store as blockEditorStore,
+	useSettings,
 	__unstableEditorStyles as EditorStyles,
 	__unstableIframe as Iframe,
+	__experimentalUseMultipleOriginColorsAndGradients as useMultipleOriginColorsAndGradients,
 } from '@wordpress/block-editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { useSelect } from '@wordpress/data';
 import { useResizeObserver } from '@wordpress/compose';
-import { useMemo, useState, memo } from '@wordpress/element';
+import { useMemo, useState, memo, useContext } from '@wordpress/element';
 import { ENTER, SPACE } from '@wordpress/keycodes';
 
 /**
@@ -35,137 +32,100 @@ import { ENTER, SPACE } from '@wordpress/keycodes';
  */
 import { unlock } from '../../lock-unlock';
 import EditorCanvasContainer from '../editor-canvas-container';
-
-const { ExperimentalBlockEditorProvider, useGlobalStyle } = unlock(
-	blockEditorPrivateApis
-);
+import { STYLE_BOOK_IFRAME_STYLES } from './constants';
+import {
+	getExamplesByCategory,
+	getTopLevelStyleBookCategories,
+} from './categories';
+import { getExamples } from './examples';
 
 const {
-	CompositeV2: Composite,
-	CompositeItemV2: CompositeItem,
-	useCompositeStoreV2: useCompositeStore,
-} = unlock( componentsPrivateApis );
+	ExperimentalBlockEditorProvider,
+	useGlobalStyle,
+	GlobalStylesContext,
+	useGlobalStylesOutputWithConfig,
+} = unlock( blockEditorPrivateApis );
+const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );
 
-// The content area of the Style Book is rendered within an iframe so that global styles
-// are applied to elements within the entire content area. To support elements that are
-// not part of the block previews, such as headings and layout for the block previews,
-// additional CSS rules need to be passed into the iframe. These are hard-coded below.
-// Note that button styles are unset, and then focus rules from the `Button` component are
-// applied to the `button` element, targeted via `.edit-site-style-book__example`.
-// This is to ensure that browser default styles for buttons are not applied to the previews.
-const STYLE_BOOK_IFRAME_STYLES = `
-	.edit-site-style-book__examples {
-		max-width: 900px;
-		margin: 0 auto;
-	}
-
-	.edit-site-style-book__example {
-		border-radius: 2px;
-		cursor: pointer;
-		display: flex;
-		flex-direction: column;
-		gap: 40px;
-		margin-bottom: 40px;
-		padding: 16px;
-		width: 100%;
-		box-sizing: border-box;
-		scroll-margin-top: 32px;
-		scroll-margin-bottom: 32px;
-	}
-
-	.edit-site-style-book__example.is-selected {
-		box-shadow: 0 0 0 1px var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
-	}
-
-	.edit-site-style-book__example:focus:not(:disabled) {
-		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
-		outline: 3px solid transparent;
-	}
-
-	.edit-site-style-book__examples.is-wide .edit-site-style-book__example {
-		flex-direction: row;
-	}
+const { Tabs } = unlock( componentsPrivateApis );
 
-	.edit-site-style-book__example-title {
-		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-		font-size: 11px;
-		font-weight: 500;
-		line-height: normal;
-		margin: 0;
-		text-align: left;
-		text-transform: uppercase;
-	}
+function isObjectEmpty( object ) {
+	return ! object || Object.keys( object ).length === 0;
+}
 
-	.edit-site-style-book__examples.is-wide .edit-site-style-book__example-title {
-		text-align: right;
-		width: 120px;
-	}
+/**
+ * Retrieves colors, gradients, and duotone filters from Global Styles.
+ * The inclusion of default (Core) palettes is controlled by the relevant
+ * theme.json property e.g. defaultPalette, defaultGradients, defaultDuotone.
+ *
+ * @return {Object} Object containing properties for each type of palette.
+ */
+function useMultiOriginPalettes() {
+	const { colors, gradients } = useMultipleOriginColorsAndGradients();
 
-	.edit-site-style-book__example-preview {
-		width: 100%;
-	}
+	// Add duotone filters to the palettes data.
+	const [
+		shouldDisplayDefaultDuotones,
+		customDuotones,
+		themeDuotones,
+		defaultDuotones,
+	] = useSettings(
+		'color.defaultDuotone',
+		'color.duotone.custom',
+		'color.duotone.theme',
+		'color.duotone.default'
+	);
 
-	.edit-site-style-book__example-preview .block-editor-block-list__insertion-point,
-	.edit-site-style-book__example-preview .block-list-appender {
-		display: none;
-	}
+	const palettes = useMemo( () => {
+		const result = { colors, gradients, duotones: [] };
 
-	.edit-site-style-book__example-preview .is-root-container > .wp-block:first-child {
-		margin-top: 0;
-	}
-	.edit-site-style-book__example-preview .is-root-container > .wp-block:last-child {
-		margin-bottom: 0;
-	}
-`;
+		if ( themeDuotones && themeDuotones.length ) {
+			result.duotones.push( {
+				name: _x(
+					'Theme',
+					'Indicates these duotone filters come from the theme.'
+				),
+				slug: 'theme',
+				duotones: themeDuotones,
+			} );
+		}
 
-function getExamples() {
-	// Use our own example for the Heading block so that we can show multiple
-	// heading levels.
-	const headingsExample = {
-		name: 'core/heading',
-		title: __( 'Headings' ),
-		category: 'text',
-		blocks: [
-			createBlock( 'core/heading', {
-				content: __( 'Code Is Poetry' ),
-				level: 1,
-			} ),
-			createBlock( 'core/heading', {
-				content: __( 'Code Is Poetry' ),
-				level: 2,
-			} ),
-			createBlock( 'core/heading', {
-				content: __( 'Code Is Poetry' ),
-				level: 3,
-			} ),
-			createBlock( 'core/heading', {
-				content: __( 'Code Is Poetry' ),
-				level: 4,
-			} ),
-			createBlock( 'core/heading', {
-				content: __( 'Code Is Poetry' ),
-				level: 5,
-			} ),
-		],
-	};
+		if (
+			shouldDisplayDefaultDuotones &&
+			defaultDuotones &&
+			defaultDuotones.length
+		) {
+			result.duotones.push( {
+				name: _x(
+					'Default',
+					'Indicates these duotone filters come from WordPress.'
+				),
+				slug: 'default',
+				duotones: defaultDuotones,
+			} );
+		}
+		if ( customDuotones && customDuotones.length ) {
+			result.duotones.push( {
+				name: _x(
+					'Custom',
+					'Indicates these doutone filters are created by the user.'
+				),
+				slug: 'custom',
+				duotones: customDuotones,
+			} );
+		}
 
-	const otherExamples = getBlockTypes()
-		.filter( ( blockType ) => {
-			const { name, example, supports } = blockType;
-			return (
-				name !== 'core/heading' &&
-				!! example &&
-				supports.inserter !== false
-			);
-		} )
-		.map( ( blockType ) => ( {
-			name: blockType.name,
-			title: blockType.title,
-			category: blockType.category,
-			blocks: getBlockFromExample( blockType.name, blockType.example ),
-		} ) );
+		return result;
+	}, [
+		colors,
+		gradients,
+		customDuotones,
+		themeDuotones,
+		defaultDuotones,
+		shouldDisplayDefaultDuotones,
+	] );
 
-	return [ headingsExample, ...otherExamples ];
+	return palettes;
 }
 
 function StyleBook( {
@@ -174,46 +134,62 @@ function StyleBook( {
 	onClick,
 	onSelect,
 	showCloseButton = true,
+	onClose,
 	showTabs = true,
+	userConfig = {},
 } ) {
 	const [ resizeObserver, sizes ] = useResizeObserver();
 	const [ textColor ] = useGlobalStyle( 'color.text' );
 	const [ backgroundColor ] = useGlobalStyle( 'color.background' );
-	const examples = useMemo( getExamples, [] );
+	const colors = useMultiOriginPalettes();
+	const examples = useMemo( () => getExamples( colors ), [ colors ] );
 	const tabs = useMemo(
 		() =>
-			getCategories()
-				.filter( ( category ) =>
-					examples.some(
-						( example ) => example.category === category.slug
-					)
+			getTopLevelStyleBookCategories().filter( ( category ) =>
+				examples.some(
+					( example ) => example.category === category.slug
 				)
-				.map( ( category ) => ( {
-					name: category.slug,
-					title: category.title,
-					icon: category.icon,
-				} ) ),
+			),
 		[ examples ]
 	);
 
+	const { base: baseConfig } = useContext( GlobalStylesContext );
+
+	const mergedConfig = useMemo( () => {
+		if ( ! isObjectEmpty( userConfig ) && ! isObjectEmpty( baseConfig ) ) {
+			return mergeBaseAndUserConfigs( baseConfig, userConfig );
+		}
+		return {};
+	}, [ baseConfig, userConfig ] );
+
+	// Copied from packages/edit-site/src/components/revisions/index.js
+	// could we create a shared hook?
 	const originalSettings = useSelect(
 		( select ) => select( blockEditorStore ).getSettings(),
 		[]
 	);
+	const [ globalStyles ] = useGlobalStylesOutputWithConfig( mergedConfig );
+
 	const settings = useMemo(
-		() => ( { ...originalSettings, __unstableIsPreviewMode: true } ),
-		[ originalSettings ]
+		() => ( {
+			...originalSettings,
+			styles:
+				! isObjectEmpty( globalStyles ) && ! isObjectEmpty( userConfig )
+					? globalStyles
+					: originalSettings.styles,
+			isPreviewMode: true,
+		} ),
+		[ globalStyles, originalSettings, userConfig ]
 	);
 
 	return (
 		<EditorCanvasContainer
+			onClose={ onClose }
 			enableResizing={ enableResizing }
-			closeButtonLabel={
-				showCloseButton ? __( 'Close Style Book' ) : null
-			}
+			closeButtonLabel={ showCloseButton ? __( 'Close' ) : null }
 		>
 			<div
-				className={ classnames( 'edit-site-style-book', {
+				className={ clsx( 'edit-site-style-book', {
 					'is-wide': sizes.width > 600,
 					'is-button': !! onClick,
 				} ) }
@@ -224,22 +200,38 @@ function StyleBook( {
 			>
 				{ resizeObserver }
 				{ showTabs ? (
-					<TabPanel
-						className="edit-site-style-book__tab-panel"
-						tabs={ tabs }
-					>
-						{ ( tab ) => (
-							<StyleBookBody
-								category={ tab.name }
-								examples={ examples }
-								isSelected={ isSelected }
-								onSelect={ onSelect }
-								settings={ settings }
-								sizes={ sizes }
-								title={ tab.title }
-							/>
-						) }
-					</TabPanel>
+					<Tabs>
+						<div className="edit-site-style-book__tablist-container">
+							<Tabs.TabList>
+								{ tabs.map( ( tab ) => (
+									<Tabs.Tab
+										tabId={ tab.slug }
+										key={ tab.slug }
+									>
+										{ tab.title }
+									</Tabs.Tab>
+								) ) }
+							</Tabs.TabList>
+						</div>
+						{ tabs.map( ( tab ) => (
+							<Tabs.TabPanel
+								key={ tab.slug }
+								tabId={ tab.slug }
+								focusable={ false }
+								className="edit-site-style-book__tabpanel"
+							>
+								<StyleBookBody
+									category={ tab.slug }
+									examples={ examples }
+									isSelected={ isSelected }
+									onSelect={ onSelect }
+									settings={ settings }
+									sizes={ sizes }
+									title={ tab.title }
+								/>
+							</Tabs.TabPanel>
+						) ) }
+					</Tabs>
 				) : (
 					<StyleBookBody
 						examples={ examples }
@@ -295,13 +287,9 @@ const StyleBookBody = ( {
 		readonly: true,
 	};
 
-	const buttonModeStyles = onClick
-		? 'body { cursor: pointer; } body * { pointer-events: none; }'
-		: '';
-
 	return (
 		<Iframe
-			className={ classnames( 'edit-site-style-book__iframe', {
+			className={ clsx( 'edit-site-style-book__iframe', {
 				'is-focused': isFocused && !! onClick,
 				'is-button': !! onClick,
 			} ) }
@@ -311,17 +299,12 @@ const StyleBookBody = ( {
 		>
 			<EditorStyles styles={ settings.styles } />
 			<style>
-				{
-					// Forming a "block formatting context" to prevent margin collapsing.
-					// @see https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
-					`.is-root-container { display: flow-root; }
-						body { position: relative; padding: 32px !important; }` +
-						STYLE_BOOK_IFRAME_STYLES +
-						buttonModeStyles
-				}
+				{ STYLE_BOOK_IFRAME_STYLES }
+				{ !! onClick &&
+					'body { cursor: pointer; } body * { pointer-events: none; }' }
 			</style>
 			<Examples
-				className={ classnames( 'edit-site-style-book__examples', {
+				className={ clsx( 'edit-site-style-book__examples', {
 					'is-wide': sizes.width > 600,
 				} ) }
 				examples={ examples }
@@ -345,24 +328,30 @@ const StyleBookBody = ( {
 
 const Examples = memo(
 	( { className, examples, category, label, isSelected, onSelect } ) => {
-		const compositeStore = useCompositeStore( { orientation: 'vertical' } );
+		const categoryDefinition = category
+			? getTopLevelStyleBookCategories().find(
+					( _category ) => _category.slug === category
+			  )
+			: null;
+
+		const filteredExamples = categoryDefinition
+			? getExamplesByCategory( categoryDefinition, examples )
+			: { examples };
 
 		return (
 			<Composite
-				store={ compositeStore }
+				orientation="vertical"
 				className={ className }
 				aria-label={ label }
 				role="grid"
 			>
-				{ examples
-					.filter( ( example ) =>
-						category ? example.category === category : true
-					)
-					.map( ( example ) => (
+				{ !! filteredExamples?.examples?.length &&
+					filteredExamples.examples.map( ( example ) => (
 						<Example
 							key={ example.name }
 							id={ `example-${ example.name }` }
 							title={ example.title }
+							content={ example.content }
 							blocks={ example.blocks }
 							isSelected={ isSelected( example.name ) }
 							onClick={ () => {
@@ -370,18 +359,61 @@ const Examples = memo(
 							} }
 						/>
 					) ) }
+				{ !! filteredExamples?.subcategories?.length &&
+					filteredExamples.subcategories.map( ( subcategory ) => (
+						<Composite.Group
+							className="edit-site-style-book__subcategory"
+							key={ `subcategory-${ subcategory.slug }` }
+						>
+							<Composite.GroupLabel>
+								<h2 className="edit-site-style-book__subcategory-title">
+									{ subcategory.title }
+								</h2>
+							</Composite.GroupLabel>
+							<Subcategory
+								examples={ subcategory.examples }
+								isSelected={ isSelected }
+								onSelect={ onSelect }
+							/>
+						</Composite.Group>
+					) ) }
 			</Composite>
 		);
 	}
 );
 
-const Example = ( { id, title, blocks, isSelected, onClick } ) => {
+const Subcategory = ( { examples, isSelected, onSelect } ) => {
+	return (
+		!! examples?.length &&
+		examples.map( ( example ) => (
+			<Example
+				key={ example.name }
+				id={ `example-${ example.name }` }
+				title={ example.title }
+				content={ example.content }
+				blocks={ example.blocks }
+				isSelected={ isSelected( example.name ) }
+				onClick={ () => {
+					onSelect?.( example.name );
+				} }
+			/>
+		) )
+	);
+};
+
+const disabledExamples = [ 'example-duotones' ];
+
+const Example = ( { id, title, blocks, isSelected, onClick, content } ) => {
 	const originalSettings = useSelect(
 		( select ) => select( blockEditorStore ).getSettings(),
 		[]
 	);
 	const settings = useMemo(
-		() => ( { ...originalSettings, __unstableIsPreviewMode: true } ),
+		() => ( {
+			...originalSettings,
+			focusMode: false, // Disable "Spotlight mode".
+			isPreviewMode: true,
+		} ),
 		[ originalSettings ]
 	);
 
@@ -391,12 +423,20 @@ const Example = ( { id, title, blocks, isSelected, onClick } ) => {
 		[ blocks ]
 	);
 
+	const disabledProps = disabledExamples.includes( id )
+		? {
+				disabled: true,
+				accessibleWhenDisabled: true,
+		  }
+		: {};
+
 	return (
 		<div role="row">
 			<div role="gridcell">
-				<CompositeItem
-					className={ classnames( 'edit-site-style-book__example', {
+				<Composite.Item
+					className={ clsx( 'edit-site-style-book__example', {
 						'is-selected': isSelected,
+						'is-disabled-example': !! disabledProps?.disabled,
 					} ) }
 					id={ id }
 					aria-label={ sprintf(
@@ -407,6 +447,7 @@ const Example = ( { id, title, blocks, isSelected, onClick } ) => {
 					render={ <div /> }
 					role="button"
 					onClick={ onClick }
+					{ ...disabledProps }
 				>
 					<span className="edit-site-style-book__example-title">
 						{ title }
@@ -416,15 +457,20 @@ const Example = ( { id, title, blocks, isSelected, onClick } ) => {
 						aria-hidden
 					>
 						<Disabled className="edit-site-style-book__example-preview__content">
-							<ExperimentalBlockEditorProvider
-								value={ renderedBlocks }
-								settings={ settings }
-							>
-								<BlockList renderAppender={ false } />
-							</ExperimentalBlockEditorProvider>
+							{ content ? (
+								content
+							) : (
+								<ExperimentalBlockEditorProvider
+									value={ renderedBlocks }
+									settings={ settings }
+								>
+									<EditorStyles />
+									<BlockList renderAppender={ false } />
+								</ExperimentalBlockEditorProvider>
+							) }
 						</Disabled>
 					</div>
-				</CompositeItem>
+				</Composite.Item>
 			</div>
 		</div>
 	);
diff --git a/packages/edit-site/src/components/style-book/style.scss b/packages/edit-site/src/components/style-book/style.scss
index 0ddefb055a8d8d..773b4f10f581bb 100644
--- a/packages/edit-site/src/components/style-book/style.scss
+++ b/packages/edit-site/src/components/style-book/style.scss
@@ -3,13 +3,17 @@
 	// This is useful when the style book is used to fill a frame.
 	height: 100%;
 	&.is-button {
-		border-radius: $radius-block-ui * 4;
+		border-radius: $radius-large;
 	}
+
+	display: flex;
+	flex-direction: column;
+	align-items: stretch;
 }
 
 .edit-site-style-book__iframe {
 	&.is-button {
-		border-radius: $radius-block-ui * 4;
+		border-radius: $radius-large;
 	}
 	&.is-focused {
 		outline: calc(2 * var(--wp-admin-border-width-focus)) solid var(--wp-admin-theme-color);
@@ -17,19 +21,17 @@
 	}
 }
 
-.edit-site-style-book__tab-panel {
-	.components-tab-panel__tabs {
-		background: $white;
-		color: $gray-900;
-	}
+.edit-site-style-book__tablist-container {
+	flex: none;
 
-	.components-tab-panel__tab-content {
-		bottom: 0;
-		left: 0;
-		overflow: auto;
-		padding: 0;
-		position: absolute;
-		right: 0;
-		top: $grid-unit-60; // Height of tabs.
-	}
+	display: flex;
+	width: 100%;
+	padding-right: 56px;
+	background: $white;
+}
+
+.edit-site-style-book__tabpanel {
+	flex: 1 0 auto;
+
+	overflow: auto;
 }
diff --git a/packages/edit-site/src/components/style-book/test/categories.js b/packages/edit-site/src/components/style-book/test/categories.js
new file mode 100644
index 00000000000000..128eaf282a9c5d
--- /dev/null
+++ b/packages/edit-site/src/components/style-book/test/categories.js
@@ -0,0 +1,166 @@
+/**
+ * Internal dependencies
+ */
+import {
+	getExamplesByCategory,
+	getTopLevelStyleBookCategories,
+} from '../categories';
+import { STYLE_BOOK_CATEGORIES } from '../constants';
+
+jest.mock( '@wordpress/blocks', () => {
+	return {
+		getCategories() {
+			return [
+				{
+					slug: 'text',
+					title: 'Text Registered',
+					icon: 'text',
+				},
+				{
+					slug: 'design',
+					title: 'Design Registered',
+					icon: 'design',
+				},
+				{
+					slug: 'funky',
+					title: 'Funky',
+					icon: 'funky',
+				},
+			];
+		},
+	};
+} );
+
+// Fixtures
+const exampleThemeBlocks = [
+	{
+		name: 'core/post-content',
+		title: 'Post Content',
+		category: 'theme',
+	},
+	{
+		name: 'core/post-terms',
+		title: 'Post Terms',
+		category: 'theme',
+	},
+	{
+		name: 'core/home-link',
+		title: 'Home Link',
+		category: 'design',
+	},
+	{
+		name: 'core/site-logo',
+		title: 'Site Logo',
+		category: 'theme',
+	},
+	{
+		name: 'core/site-title',
+		title: 'Site Title',
+		category: 'theme',
+	},
+	{
+		name: 'core/site-tagline',
+		title: 'Site Tagline',
+		category: 'theme',
+	},
+	{
+		name: 'core/group',
+		title: 'Group',
+		category: 'design',
+	},
+	{
+		name: 'core/comments-pagination-numbers',
+		title: 'Comments Page Numbers',
+		category: 'theme',
+	},
+	{
+		name: 'core/post-featured-image',
+		title: 'Featured Image',
+		category: 'theme',
+	},
+];
+
+describe( 'utils', () => {
+	describe( 'getTopLevelStyleBookCategories', () => {
+		it( 'returns theme subcategories examples', () => {
+			expect( getTopLevelStyleBookCategories() ).toEqual( [
+				...STYLE_BOOK_CATEGORIES,
+				{
+					slug: 'funky',
+					title: 'Funky',
+					icon: 'funky',
+				},
+			] );
+		} );
+	} );
+
+	describe( 'getExamplesByCategory', () => {
+		it( 'returns theme subcategories examples', () => {
+			const themeCategory = STYLE_BOOK_CATEGORIES.find(
+				( category ) => category.slug === 'theme'
+			);
+			const themeCategoryExamples = getExamplesByCategory(
+				themeCategory,
+				exampleThemeBlocks
+			);
+
+			expect( themeCategoryExamples.slug ).toEqual( 'theme' );
+
+			const siteIdentity = themeCategoryExamples.subcategories.find(
+				( subcategory ) => subcategory.slug === 'site-identity'
+			);
+			expect( siteIdentity ).toEqual( {
+				title: 'Site Identity',
+				slug: 'site-identity',
+				examples: [
+					{
+						name: 'core/site-logo',
+						title: 'Site Logo',
+						category: 'theme',
+					},
+					{
+						name: 'core/site-title',
+						title: 'Site Title',
+						category: 'theme',
+					},
+					{
+						name: 'core/site-tagline',
+						title: 'Site Tagline',
+						category: 'theme',
+					},
+				],
+			} );
+
+			const design = themeCategoryExamples.subcategories.find(
+				( subcategory ) => subcategory.slug === 'design'
+			);
+			expect( design ).toEqual( {
+				title: 'Design',
+				slug: 'design',
+				examples: [
+					{
+						name: 'core/group',
+						title: 'Group',
+						category: 'design',
+					},
+				],
+			} );
+
+			const posts = themeCategoryExamples.subcategories.find(
+				( subcategory ) => subcategory.slug === 'posts'
+			);
+
+			expect( posts ).toEqual( {
+				title: 'Posts',
+				slug: 'posts',
+				examples: [
+					{
+						name: 'core/post-terms',
+						title: 'Post Terms',
+						category: 'theme',
+					},
+				],
+			} );
+		} );
+	} );
+} );
diff --git a/packages/edit-site/src/components/style-book/types.ts b/packages/edit-site/src/components/style-book/types.ts
new file mode 100644
index 00000000000000..e7be17b17dd4df
--- /dev/null
+++ b/packages/edit-site/src/components/style-book/types.ts
@@ -0,0 +1,60 @@
+type Block = {
+	name: string;
+	attributes: Record< string, unknown >;
+	innerBlocks?: Block[];
+};
+
+export type StyleBookCategory = {
+	title: string;
+	slug: string;
+	blocks?: string[];
+	exclude?: string[];
+	include?: string[];
+	subcategories?: StyleBookCategory[];
+};
+
+export type BlockExample = {
+	name: string;
+	title: string;
+	category: string;
+	content?: JSX.Element;
+	blocks?: Block | Block[];
+};
+
+export type CategoryExamples = {
+	title: string;
+	slug: string;
+	examples?: BlockExample[];
+	subcategories?: CategoryExamples[];
+};
+
+export type StyleBookColorGroup = {
+	origin: string;
+	slug: string;
+	title: string;
+	type: string;
+};
+
+export type Color = { slug: string };
+export type Gradient = { slug: string };
+export type Duotone = {
+	colors: string[];
+	slug: string;
+};
+
+export type ColorOrigin = {
+	name: string;
+	slug: string;
+	colors?: Color[];
+	gradients?: Gradient[];
+	duotones?: Duotone[];
+};
+
+export type MultiOriginPalettes = {
+	disableCustomColors: boolean;
+	disableCustomGradients: boolean;
+	hasColorsOrGradients: boolean;
+	colors: Omit< ColorOrigin, 'gradients' | 'duotones' >;
+	duotones: Omit< ColorOrigin, 'colors' | 'gradients' >;
+	gradients: Omit< ColorOrigin, 'colors' | 'duotones' >;
+};
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
index 46079cbce8efd5..35eeb5963fb546 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
@@ -5,6 +5,7 @@ import { useEffect, useMemo } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as coreDataStore } from '@wordpress/core-data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -27,40 +28,50 @@ const postTypesWithoutParentTemplate = [
 	PATTERN_TYPES.user,
 ];
 
+const authorizedPostTypes = [ 'page', 'post' ];
+
 function useResolveEditedEntityAndContext( { postId, postType } ) {
-	const { hasLoadedAllDependencies, homepageId, url, frontPageTemplateId } =
-		useSelect( ( select ) => {
-			const { getSite, getUnstableBase, getEntityRecords } =
-				select( coreDataStore );
-			const siteData = getSite();
-			const base = getUnstableBase();
-			const templates = getEntityRecords(
-				'postType',
-				TEMPLATE_POST_TYPE,
-				{
-					per_page: -1,
-				}
+	const {
+		hasLoadedAllDependencies,
+		homepageId,
+		postsPageId,
+		url,
+		frontPageTemplateId,
+	} = useSelect( ( select ) => {
+		const { getEntityRecord, getEntityRecords } = select( coreDataStore );
+		const siteData = getEntityRecord( 'root', 'site' );
+		const base = getEntityRecord( 'root', '__unstableBase' );
+		const templates = getEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
+			per_page: -1,
+		} );
+		const _homepageId =
+			siteData?.show_on_front === 'page' &&
+			[ 'number', 'string' ].includes( typeof siteData.page_on_front ) &&
+			!! +siteData.page_on_front // We also need to check if it's not zero(`0`).
+				? siteData.page_on_front.toString()
+				: null;
+		const _postsPageId =
+			siteData?.show_on_front === 'page' &&
+			[ 'number', 'string' ].includes( typeof siteData.page_for_posts )
+				? siteData.page_for_posts.toString()
+				: null;
+		let _frontPageTemplateId;
+		if ( templates ) {
+			const frontPageTemplate = templates.find(
+				( t ) => t.slug === 'front-page'
 			);
-			let _frontPateTemplateId;
-			if ( templates ) {
-				const frontPageTemplate = templates.find(
-					( t ) => t.slug === 'front-page'
-				);
-				_frontPateTemplateId = frontPageTemplate
-					? frontPageTemplate.id
-					: false;
-			}
-
-			return {
-				hasLoadedAllDependencies: !! base && !! siteData,
-				homepageId:
-					siteData?.show_on_front === 'page'
-						? siteData.page_on_front.toString()
-						: null,
-				url: base?.home,
-				frontPageTemplateId: _frontPateTemplateId,
-			};
-		}, [] );
+			_frontPageTemplateId = frontPageTemplate
+				? frontPageTemplate.id
+				: false;
+		}
+		return {
+			hasLoadedAllDependencies: !! base && !! siteData,
+			homepageId: _homepageId,
+			postsPageId: _postsPageId,
+			url: base?.home,
+			frontPageTemplateId: _frontPageTemplateId,
+		};
+	}, [] );
 
 	/**
 	 * This is a hook that recreates the logic to resolve a template for a given WordPress postID postTypeId
@@ -72,7 +83,15 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 		( select ) => {
 			// If we're rendering a post type that doesn't have a template
 			// no need to resolve its template.
-			if ( postTypesWithoutParentTemplate.includes( postType ) ) {
+			if (
+				postTypesWithoutParentTemplate.includes( postType ) &&
+				postId
+			) {
+				return undefined;
+			}
+
+			// Don't trigger resolution for multi-selected posts.
+			if ( postId && postId.includes( ',' ) ) {
 				return undefined;
 			}
 
@@ -111,6 +130,14 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 				if ( ! editedEntity ) {
 					return undefined;
 				}
+				// Check if the current page is the posts page.
+				if (
+					postTypeToResolve === 'page' &&
+					postsPageId === postIdToResolve
+				) {
+					return __experimentalGetTemplateForLink( editedEntity.link )
+						?.id;
+				}
 				// First see if the post/page has an assigned template and fetch it.
 				const currentTemplateSlug = editedEntity.template;
 				if ( currentTemplateSlug ) {
@@ -125,10 +152,25 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 						return currentTemplate.id;
 					}
 				}
-
 				// If no template is assigned, use the default template.
+				let slugToCheck;
+				// In `draft` status we might not have a slug available, so we use the `single`
+				// post type templates slug(ex page, single-post, single-product etc..).
+				// Pages do not need the `single` prefix in the slug to be prioritized
+				// through template hierarchy.
+				if ( editedEntity.slug ) {
+					slugToCheck =
+						postTypeToResolve === 'page'
+							? `${ postTypeToResolve }-${ editedEntity.slug }`
+							: `single-${ postTypeToResolve }-${ editedEntity.slug }`;
+				} else {
+					slugToCheck =
+						postTypeToResolve === 'page'
+							? 'page'
+							: `single-${ postTypeToResolve }`;
+				}
 				return getDefaultTemplateId( {
-					slug: `${ postTypeToResolve }-${ editedEntity?.slug }`,
+					slug: slugToCheck,
 				} );
 			}
 
@@ -136,8 +178,13 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 				return undefined;
 			}
 
-			// If we're rendering a specific page, post... we need to resolve its template.
-			if ( postType && postId ) {
+			// If we're rendering a specific page, we need to resolve its template.
+			// The site editor only supports pages for now, not other CPTs.
+			if (
+				postType &&
+				postId &&
+				authorizedPostTypes.includes( postType )
+			) {
 				return resolveTemplateForPostTypeAndId( postType, postId );
 			}
 
@@ -154,6 +201,7 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 		},
 		[
 			homepageId,
+			postsPageId,
 			hasLoadedAllDependencies,
 			url,
 			postId,
@@ -163,14 +211,15 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 	);
 
 	const context = useMemo( () => {
-		if ( postTypesWithoutParentTemplate.includes( postType ) ) {
+		if ( postTypesWithoutParentTemplate.includes( postType ) && postId ) {
 			return {};
 		}
 
-		if ( postType && postId ) {
+		if ( postType && postId && authorizedPostTypes.includes( postType ) ) {
 			return { postType, postId };
 		}
-
+		// TODO: for post types lists we should probably not render the front page, but maybe a placeholder
+		// with a message like "Select a page" or something similar.
 		if ( homepageId ) {
 			return { postType: 'page', postId: homepageId };
 		}
@@ -178,7 +227,7 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 		return {};
 	}, [ homepageId, postType, postId ] );
 
-	if ( postTypesWithoutParentTemplate.includes( postType ) ) {
+	if ( postTypesWithoutParentTemplate.includes( postType ) && postId ) {
 		return { isReady: true, postType, postId, context };
 	}
 
@@ -194,20 +243,25 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 	return { isReady: false };
 }
 
-export function useInitEditedEntity( params ) {
+export default function useInitEditedEntityFromURL() {
+	const { params = {} } = useLocation();
 	const { postType, postId, context, isReady } =
 		useResolveEditedEntityAndContext( params );
 
 	const { setEditedEntity } = useDispatch( editSiteStore );
+	const { resetZoomLevel } = unlock( useDispatch( blockEditorStore ) );
 
 	useEffect( () => {
 		if ( isReady ) {
+			resetZoomLevel();
 			setEditedEntity( postType, postId, context );
 		}
-	}, [ isReady, postType, postId, context, setEditedEntity ] );
-}
-
-export default function useInitEditedEntityFromURL() {
-	const { params = {} } = useLocation();
-	return useInitEditedEntity( params );
+	}, [
+		isReady,
+		postType,
+		postId,
+		context,
+		setEditedEntity,
+		resetZoomLevel,
+	] );
 }
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js b/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js
deleted file mode 100644
index 9f0c8dd9a0e11f..00000000000000
--- a/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useEffect, useRef } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-
-const { useLocation, useHistory } = unlock( routerPrivateApis );
-
-export default function useSyncCanvasModeWithURL() {
-	const history = useHistory();
-	const { params } = useLocation();
-	const canvasMode = useSelect(
-		( select ) => unlock( select( editSiteStore ) ).getCanvasMode(),
-		[]
-	);
-	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
-	const currentCanvasMode = useRef( canvasMode );
-	const { canvas: canvasInUrl } = params;
-	const currentCanvasInUrl = useRef( canvasInUrl );
-	const currentUrlParams = useRef( params );
-	useEffect( () => {
-		currentUrlParams.current = params;
-	}, [ params ] );
-
-	useEffect( () => {
-		currentCanvasMode.current = canvasMode;
-		if ( canvasMode === 'init' ) {
-			return;
-		}
-
-		if (
-			canvasMode === 'edit' &&
-			currentCanvasInUrl.current !== canvasMode
-		) {
-			history.push( {
-				...currentUrlParams.current,
-				canvas: 'edit',
-			} );
-		}
-
-		if (
-			canvasMode === 'view' &&
-			currentCanvasInUrl.current !== undefined
-		) {
-			history.push( {
-				...currentUrlParams.current,
-				canvas: undefined,
-			} );
-		}
-	}, [ canvasMode, history ] );
-
-	useEffect( () => {
-		currentCanvasInUrl.current = canvasInUrl;
-		if ( canvasInUrl !== 'edit' && currentCanvasMode.current !== 'view' ) {
-			setCanvasMode( 'view' );
-		} else if (
-			canvasInUrl === 'edit' &&
-			currentCanvasMode.current !== 'edit'
-		) {
-			setCanvasMode( 'edit' );
-		}
-	}, [ canvasInUrl, setCanvasMode ] );
-}
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js b/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
deleted file mode 100644
index 5f176dff8198d3..00000000000000
--- a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __experimentalUseNavigator as useNavigator } from '@wordpress/components';
-import { useEffect, useRef } from '@wordpress/element';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-import {
-	TEMPLATE_POST_TYPE,
-	TEMPLATE_PART_POST_TYPE,
-	PATTERN_TYPES,
-} from '../../utils/constants';
-
-const { useLocation, useHistory } = unlock( routerPrivateApis );
-
-export function getPathFromURL( urlParams ) {
-	let path = urlParams?.path ?? '/';
-
-	// Compute the navigator path based on the URL params.
-	if ( urlParams?.postType && urlParams?.postId ) {
-		switch ( urlParams.postType ) {
-			case PATTERN_TYPES.user:
-			case TEMPLATE_POST_TYPE:
-			case TEMPLATE_PART_POST_TYPE:
-			case 'page':
-				path = `/${ encodeURIComponent(
-					urlParams.postType
-				) }/${ encodeURIComponent( urlParams.postId ) }`;
-				break;
-			default:
-				path = `/navigation/${ encodeURIComponent(
-					urlParams.postType
-				) }/${ encodeURIComponent( urlParams.postId ) }`;
-		}
-	}
-
-	return path;
-}
-
-function isSubset( subset, superset ) {
-	return Object.entries( subset ).every( ( [ key, value ] ) => {
-		return superset[ key ] === value;
-	} );
-}
-
-export default function useSyncPathWithURL() {
-	const history = useHistory();
-	const { params: urlParams } = useLocation();
-	const {
-		location: navigatorLocation,
-		params: navigatorParams,
-		goTo,
-	} = useNavigator();
-	const isMounting = useRef( true );
-
-	useEffect(
-		() => {
-			// The navigatorParams are only initially filled properly when the
-			// navigator screens mount. so we ignore the first synchronisation.
-			if ( isMounting.current ) {
-				isMounting.current = false;
-				return;
-			}
-
-			function updateUrlParams( newUrlParams ) {
-				if ( isSubset( newUrlParams, urlParams ) ) {
-					return;
-				}
-				const updatedParams = {
-					...urlParams,
-					...newUrlParams,
-				};
-				history.push( updatedParams );
-			}
-
-			if ( navigatorParams?.postType && navigatorParams?.postId ) {
-				updateUrlParams( {
-					postType: navigatorParams?.postType,
-					postId: navigatorParams?.postId,
-					path: undefined,
-				} );
-			} else if (
-				navigatorLocation.path.startsWith( '/page/' ) &&
-				navigatorParams?.postId
-			) {
-				updateUrlParams( {
-					postType: 'page',
-					postId: navigatorParams?.postId,
-					path: undefined,
-				} );
-			} else if ( navigatorLocation.path === '/patterns' ) {
-				updateUrlParams( {
-					postType: undefined,
-					postId: undefined,
-					canvas: undefined,
-					path: navigatorLocation.path,
-				} );
-			} else {
-				updateUrlParams( {
-					postType: undefined,
-					postId: undefined,
-					categoryType: undefined,
-					categoryId: undefined,
-					path:
-						navigatorLocation.path === '/'
-							? undefined
-							: navigatorLocation.path,
-				} );
-			}
-		},
-		// Trigger only when navigator changes to prevent infinite loops.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[ navigatorLocation?.path, navigatorParams ]
-	);
-
-	useEffect(
-		() => {
-			const path = getPathFromURL( urlParams );
-			if ( navigatorLocation.path !== path ) {
-				goTo( path );
-			}
-		},
-		// Trigger only when URL changes to prevent infinite loops.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[ urlParams ]
-	);
-}
diff --git a/packages/edit-site/src/components/table/index.js b/packages/edit-site/src/components/table/index.js
deleted file mode 100644
index 0afe655876faac..00000000000000
--- a/packages/edit-site/src/components/table/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-export default function Table( { data, columns } ) {
-	return (
-		<div className="edit-site-table-wrapper">
-			<table className="edit-site-table">
-				<thead>
-					<tr>
-						{ columns.map( ( column ) => (
-							<th key={ column.header }>{ column.header }</th>
-						) ) }
-					</tr>
-				</thead>
-				<tbody>
-					{ data.map( ( row, rowIndex ) => (
-						<tr key={ rowIndex }>
-							{ columns.map( ( column, columnIndex ) => (
-								<td
-									style={ {
-										maxWidth: column.maxWidth
-											? column.maxWidth
-											: undefined,
-									} }
-									key={ columnIndex }
-								>
-									{ column.cell( row ) }
-								</td>
-							) ) }
-						</tr>
-					) ) }
-				</tbody>
-			</table>
-		</div>
-	);
-}
diff --git a/packages/edit-site/src/components/table/style.scss b/packages/edit-site/src/components/table/style.scss
deleted file mode 100644
index 85c741575d5a44..00000000000000
--- a/packages/edit-site/src/components/table/style.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-.edit-site-table-wrapper {
-	width: 100%;
-	padding: $grid-unit-40;
-}
-
-.edit-site-table {
-	width: 100%;
-	text-indent: 0;
-	border-color: inherit;
-	border-collapse: collapse;
-	position: relative;
-	a {
-		text-decoration: none;
-	}
-	th {
-		text-align: left;
-		font-weight: normal;
-		padding: 0 $grid-unit-20 $grid-unit-20;
-		color: $gray-700;
-	}
-	td {
-		padding: $grid-unit-20;
-	}
-	td,
-	th {
-		vertical-align: center;
-		&:first-child {
-			padding-left: 0;
-		}
-		&:last-child {
-			padding-right: 0;
-			text-align: right;
-		}
-	}
-	tr {
-		border-bottom: 1px solid $gray-100;
-	}
-}
diff --git a/packages/edit-site/src/components/template-actions/index.js b/packages/edit-site/src/components/template-actions/index.js
deleted file mode 100644
index f48e69245da1fe..00000000000000
--- a/packages/edit-site/src/components/template-actions/index.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useDispatch, useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-import { useState } from '@wordpress/element';
-import { __, sprintf } from '@wordpress/i18n';
-import {
-	DropdownMenu,
-	MenuGroup,
-	MenuItem,
-	__experimentalConfirmDialog as ConfirmDialog,
-} from '@wordpress/components';
-import { moreVertical } from '@wordpress/icons';
-import { store as noticesStore } from '@wordpress/notices';
-import { decodeEntities } from '@wordpress/html-entities';
-
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-import isTemplateRemovable from '../../utils/is-template-removable';
-import isTemplateRevertable from '../../utils/is-template-revertable';
-import RenameMenuItem from './rename-menu-item';
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
-
-export default function TemplateActions( {
-	postType,
-	postId,
-	className,
-	toggleProps,
-	onRemove,
-} ) {
-	const template = useSelect(
-		( select ) =>
-			select( coreStore ).getEntityRecord( 'postType', postType, postId ),
-		[ postType, postId ]
-	);
-	const { removeTemplate, revertTemplate } = useDispatch( editSiteStore );
-	const { saveEditedEntityRecord } = useDispatch( coreStore );
-	const { createSuccessNotice, createErrorNotice } =
-		useDispatch( noticesStore );
-	const isRemovable = isTemplateRemovable( template );
-	const isRevertable = isTemplateRevertable( template );
-
-	if ( ! isRemovable && ! isRevertable ) {
-		return null;
-	}
-
-	async function revertAndSaveTemplate() {
-		try {
-			await revertTemplate( template, { allowUndo: false } );
-			await saveEditedEntityRecord(
-				'postType',
-				template.type,
-				template.id
-			);
-
-			createSuccessNotice(
-				sprintf(
-					/* translators: The template/part's name. */
-					__( '"%s" reverted.' ),
-					decodeEntities( template.title.rendered )
-				),
-				{
-					type: 'snackbar',
-					id: 'edit-site-template-reverted',
-				}
-			);
-		} catch ( error ) {
-			const fallbackErrorMessage =
-				template.type === TEMPLATE_POST_TYPE
-					? __( 'An error occurred while reverting the template.' )
-					: __(
-							'An error occurred while reverting the template part.'
-					  );
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: fallbackErrorMessage;
-
-			createErrorNotice( errorMessage, { type: 'snackbar' } );
-		}
-	}
-
-	return (
-		<DropdownMenu
-			icon={ moreVertical }
-			label={ __( 'Actions' ) }
-			className={ className }
-			toggleProps={ toggleProps }
-		>
-			{ ( { onClose } ) => (
-				<MenuGroup>
-					{ isRemovable && (
-						<>
-							<RenameMenuItem
-								template={ template }
-								onClose={ onClose }
-							/>
-							<DeleteMenuItem
-								onRemove={ () => {
-									removeTemplate( template );
-									onRemove?.();
-									onClose();
-								} }
-								title={ template.title.rendered }
-							/>
-						</>
-					) }
-					{ isRevertable && (
-						<MenuItem
-							info={ __(
-								'Use the template as supplied by the theme.'
-							) }
-							onClick={ () => {
-								revertAndSaveTemplate();
-								onClose();
-							} }
-						>
-							{ __( 'Clear customizations' ) }
-						</MenuItem>
-					) }
-				</MenuGroup>
-			) }
-		</DropdownMenu>
-	);
-}
-
-function DeleteMenuItem( { onRemove, title } ) {
-	const [ isModalOpen, setIsModalOpen ] = useState( false );
-	return (
-		<>
-			<MenuItem isDestructive onClick={ () => setIsModalOpen( true ) }>
-				{ __( 'Delete' ) }
-			</MenuItem>
-			<ConfirmDialog
-				isOpen={ isModalOpen }
-				onConfirm={ onRemove }
-				onCancel={ () => setIsModalOpen( false ) }
-				confirmButtonText={ __( 'Delete' ) }
-			>
-				{ sprintf(
-					// translators: %s: The template or template part's title.
-					__( 'Are you sure you want to delete "%s"?' ),
-					decodeEntities( title )
-				) }
-			</ConfirmDialog>
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/template-actions/rename-menu-item.js b/packages/edit-site/src/components/template-actions/rename-menu-item.js
deleted file mode 100644
index d098ea13fa58f8..00000000000000
--- a/packages/edit-site/src/components/template-actions/rename-menu-item.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { useState } from '@wordpress/element';
-import { useDispatch } from '@wordpress/data';
-import {
-	Button,
-	MenuItem,
-	Modal,
-	TextControl,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as noticesStore } from '@wordpress/notices';
-import { decodeEntities } from '@wordpress/html-entities';
-
-/**
- * Internal dependencies
- */
-import { TEMPLATE_POST_TYPE } from '../../utils/constants';
-
-export default function RenameMenuItem( { template, onClose } ) {
-	const title = decodeEntities( template.title.rendered );
-	const [ editedTitle, setEditedTitle ] = useState( title );
-	const [ isModalOpen, setIsModalOpen ] = useState( false );
-
-	const {
-		editEntityRecord,
-		__experimentalSaveSpecifiedEntityEdits: saveSpecifiedEntityEdits,
-	} = useDispatch( coreStore );
-	const { createSuccessNotice, createErrorNotice } =
-		useDispatch( noticesStore );
-
-	if ( template.type === TEMPLATE_POST_TYPE && ! template.is_custom ) {
-		return null;
-	}
-
-	async function onTemplateRename( event ) {
-		event.preventDefault();
-
-		try {
-			await editEntityRecord( 'postType', template.type, template.id, {
-				title: editedTitle,
-			} );
-
-			// Update state before saving rerenders the list.
-			setEditedTitle( '' );
-			setIsModalOpen( false );
-			onClose();
-
-			// Persist edited entity.
-			await saveSpecifiedEntityEdits(
-				'postType',
-				template.type,
-				template.id,
-				[ 'title' ], // Only save title to avoid persisting other edits.
-				{
-					throwOnError: true,
-				}
-			);
-
-			createSuccessNotice(
-				template.type === TEMPLATE_POST_TYPE
-					? __( 'Template renamed.' )
-					: __( 'Template part renamed.' ),
-				{
-					type: 'snackbar',
-				}
-			);
-		} catch ( error ) {
-			const fallbackErrorMessage =
-				template.type === TEMPLATE_POST_TYPE
-					? __( 'An error occurred while renaming the template.' )
-					: __(
-							'An error occurred while renaming the template part.'
-					  );
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: fallbackErrorMessage;
-
-			createErrorNotice( errorMessage, { type: 'snackbar' } );
-		}
-	}
-
-	return (
-		<>
-			<MenuItem
-				onClick={ () => {
-					setIsModalOpen( true );
-					setEditedTitle( title );
-				} }
-			>
-				{ __( 'Rename' ) }
-			</MenuItem>
-			{ isModalOpen && (
-				<Modal
-					title={ __( 'Rename' ) }
-					onRequestClose={ () => {
-						setIsModalOpen( false );
-					} }
-					overlayClassName="edit-site-list__rename-modal"
-				>
-					<form onSubmit={ onTemplateRename }>
-						<VStack spacing="5">
-							<TextControl
-								__nextHasNoMarginBottom
-								label={ __( 'Name' ) }
-								value={ editedTitle }
-								onChange={ setEditedTitle }
-								required
-							/>
-
-							<HStack justify="right">
-								<Button
-									variant="tertiary"
-									onClick={ () => {
-										setIsModalOpen( false );
-									} }
-								>
-									{ __( 'Cancel' ) }
-								</Button>
-
-								<Button variant="primary" type="submit">
-									{ __( 'Save' ) }
-								</Button>
-							</HStack>
-						</VStack>
-					</form>
-				</Modal>
-			) }
-		</>
-	);
-}
diff --git a/packages/edit-site/src/components/template-part-converter/index.js b/packages/edit-site/src/components/template-part-converter/index.js
deleted file mode 100644
index 7694735cbb3025..00000000000000
--- a/packages/edit-site/src/components/template-part-converter/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import {
-	BlockSettingsMenuControls,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
-import ConvertToRegularBlocks from './convert-to-regular';
-import ConvertToTemplatePart from './convert-to-template-part';
-
-export default function TemplatePartConverter() {
-	return (
-		<BlockSettingsMenuControls>
-			{ ( { selectedClientIds, onClose } ) => (
-				<TemplatePartConverterMenuItem
-					clientIds={ selectedClientIds }
-					onClose={ onClose }
-				/>
-			) }
-		</BlockSettingsMenuControls>
-	);
-}
-
-function TemplatePartConverterMenuItem( { clientIds, onClose } ) {
-	const blocks = useSelect(
-		( select ) =>
-			select( blockEditorStore ).getBlocksByClientId( clientIds ),
-		[ clientIds ]
-	);
-
-	// Allow converting a single template part to standard blocks.
-	if ( blocks.length === 1 && blocks[ 0 ]?.name === 'core/template-part' ) {
-		return (
-			<ConvertToRegularBlocks
-				clientId={ clientIds[ 0 ] }
-				onClose={ onClose }
-			/>
-		);
-	}
-	return <ConvertToTemplatePart clientIds={ clientIds } blocks={ blocks } />;
-}
diff --git a/packages/edit-site/src/components/test/error-boundary.js b/packages/edit-site/src/components/test/error-boundary.js
deleted file mode 100644
index 7b9977e10f1315..00000000000000
--- a/packages/edit-site/src/components/test/error-boundary.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * WordPress dependencies
- */
-import * as wpHooks from '@wordpress/hooks';
-/**
- * Internal dependencies
- */
-import ErrorBoundary from '../error-boundary';
-/**
- * External dependencies
- */
-import { render } from '@testing-library/react';
-
-const theError = new Error( 'Kaboom' );
-
-const ChildComponent = () => {
-	throw theError;
-};
-
-describe( 'Error Boundary', () => {
-	describe( 'when error is thrown from a Child component', () => {
-		it( 'calls the `editor.ErrorBoundary.errorLogged` hook action with the error object', () => {
-			const doAction = jest.spyOn( wpHooks, 'doAction' );
-
-			render(
-				<ErrorBoundary>
-					<ChildComponent />
-				</ErrorBoundary>
-			);
-
-			expect( doAction ).toHaveBeenCalledWith(
-				'editor.ErrorBoundary.errorLogged',
-				theError
-			);
-			expect( console ).toHaveErrored();
-		} );
-	} );
-} );
diff --git a/packages/edit-site/src/components/welcome-guide/editor.js b/packages/edit-site/src/components/welcome-guide/editor.js
index 6b07228911bf81..75c4fd6e10c368 100644
--- a/packages/edit-site/src/components/welcome-guide/editor.js
+++ b/packages/edit-site/src/components/welcome-guide/editor.js
@@ -6,6 +6,7 @@ import { Guide } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { createInterpolateElement } from '@wordpress/element';
 import { store as preferencesStore } from '@wordpress/preferences';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -15,16 +16,18 @@ import WelcomeGuideImage from './image';
 export default function WelcomeGuideEditor() {
 	const { toggle } = useDispatch( preferencesStore );
 
-	const isActive = useSelect(
-		( select ) =>
-			!! select( preferencesStore ).get(
+	const { isActive, isBlockBasedTheme } = useSelect( ( select ) => {
+		return {
+			isActive: !! select( preferencesStore ).get(
 				'core/edit-site',
 				'welcomeGuide'
 			),
-		[]
-	);
+			isBlockBasedTheme:
+				select( coreStore ).getCurrentTheme()?.is_block_theme,
+		};
+	}, [] );
 
-	if ( ! isActive ) {
+	if ( ! isActive || ! isBlockBasedTheme ) {
 		return null;
 	}
 
diff --git a/packages/edit-site/src/components/welcome-guide/style.scss b/packages/edit-site/src/components/welcome-guide/style.scss
index e9e8b46a8aff2d..4ac45ed1993860 100644
--- a/packages/edit-site/src/components/welcome-guide/style.scss
+++ b/packages/edit-site/src/components/welcome-guide/style.scss
@@ -1,7 +1,7 @@
 .edit-site-welcome-guide {
 	width: 312px;
 
-	&.guide-editor .edit-site-welcome-guide__image
+	&.guide-editor .edit-site-welcome-guide__image,
 	&.guide-styles .edit-site-welcome-guide__image {
 		background: #00a0d2;
 	}
diff --git a/packages/edit-site/src/components/welcome-guide/styles.js b/packages/edit-site/src/components/welcome-guide/styles.js
index 03a3014b1b9fa5..e1a5a0c451395a 100644
--- a/packages/edit-site/src/components/welcome-guide/styles.js
+++ b/packages/edit-site/src/components/welcome-guide/styles.js
@@ -4,22 +4,23 @@
 import { useDispatch, useSelect } from '@wordpress/data';
 import { ExternalLink, Guide } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { store as interfaceStore } from '@wordpress/interface';
 import { store as preferencesStore } from '@wordpress/preferences';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
 import WelcomeGuideImage from './image';
-import { store as editSiteStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const { interfaceStore } = unlock( editorPrivateApis );
 
 export default function WelcomeGuideStyles() {
 	const { toggle } = useDispatch( preferencesStore );
 
 	const { isActive, isStylesOpen } = useSelect( ( select ) => {
-		const sidebar = select( interfaceStore ).getActiveComplementaryArea(
-			editSiteStore.name
-		);
+		const sidebar =
+			select( interfaceStore ).getActiveComplementaryArea( 'core' );
 
 		return {
 			isActive: !! select( preferencesStore ).get(
@@ -118,7 +119,7 @@ export default function WelcomeGuideStyles() {
 							<p className="edit-site-welcome-guide__text">
 								{ __(
 									'New to block themes and styling your site?'
-								) }
+								) }{ ' ' }
 								<ExternalLink
 									href={ __(
 										'https://wordpress.org/documentation/article/styles-overview/'
diff --git a/packages/edit-site/src/components/welcome-guide/template.js b/packages/edit-site/src/components/welcome-guide/template.js
index 073a19c2d6efdc..e6568a23bb3a3c 100644
--- a/packages/edit-site/src/components/welcome-guide/template.js
+++ b/packages/edit-site/src/components/welcome-guide/template.js
@@ -10,29 +10,23 @@ import { store as editorStore } from '@wordpress/editor';
 /**
  * Internal dependencies
  */
-import { store as editSiteStore } from '../../store';
+import useEditedEntityRecord from '../use-edited-entity-record';
 
 export default function WelcomeGuideTemplate() {
 	const { toggle } = useDispatch( preferencesStore );
 
-	const isVisible = useSelect( ( select ) => {
-		const isTemplateActive = !! select( preferencesStore ).get(
-			'core/edit-site',
-			'welcomeGuideTemplate'
-		);
-		const isEditorActive = !! select( preferencesStore ).get(
-			'core/edit-site',
-			'welcomeGuide'
-		);
-		const { isPage } = select( editSiteStore );
-		const { getRenderingMode } = select( editorStore );
-		return (
-			isTemplateActive &&
-			! isEditorActive &&
-			isPage() &&
-			getRenderingMode() === 'template-only'
-		);
+	const { isLoaded, record } = useEditedEntityRecord();
+	const isPostTypeTemplate = isLoaded && record.type === 'wp_template';
+	const { isActive, hasPreviousEntity } = useSelect( ( select ) => {
+		const { getEditorSettings } = select( editorStore );
+		const { get } = select( preferencesStore );
+		return {
+			isActive: get( 'core/edit-site', 'welcomeGuideTemplate' ),
+			hasPreviousEntity:
+				!! getEditorSettings().onNavigateToPreviousEntityRecord,
+		};
 	}, [] );
+	const isVisible = isActive && isPostTypeTemplate && hasPreviousEntity;
 
 	if ( ! isVisible ) {
 		return null;
diff --git a/packages/edit-site/src/deprecated.js b/packages/edit-site/src/deprecated.js
new file mode 100644
index 00000000000000..40c8a257ee7d4c
--- /dev/null
+++ b/packages/edit-site/src/deprecated.js
@@ -0,0 +1,56 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	PluginMoreMenuItem as EditorPluginMoreMenuItem,
+	PluginSidebar as EditorPluginSidebar,
+	PluginSidebarMoreMenuItem as EditorPluginSidebarMoreMenuItem,
+} from '@wordpress/editor';
+import { getPath } from '@wordpress/url';
+import deprecated from '@wordpress/deprecated';
+
+const isSiteEditor = getPath( window.location.href )?.includes(
+	'site-editor.php'
+);
+
+const deprecateSlot = ( name ) => {
+	deprecated( `wp.editPost.${ name }`, {
+		since: '6.6',
+		alternative: `wp.editor.${ name }`,
+	} );
+};
+
+/* eslint-disable jsdoc/require-param */
+/**
+ * @see PluginMoreMenuItem in @wordpress/editor package.
+ */
+export function PluginMoreMenuItem( props ) {
+	if ( ! isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginMoreMenuItem' );
+	return <EditorPluginMoreMenuItem { ...props } />;
+}
+
+/**
+ * @see PluginSidebar in @wordpress/editor package.
+ */
+export function PluginSidebar( props ) {
+	if ( ! isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginSidebar' );
+	return <EditorPluginSidebar { ...props } />;
+}
+
+/**
+ * @see PluginSidebarMoreMenuItem in @wordpress/editor package.
+ */
+export function PluginSidebarMoreMenuItem( props ) {
+	if ( ! isSiteEditor ) {
+		return null;
+	}
+	deprecateSlot( 'PluginSidebarMoreMenuItem' );
+	return <EditorPluginSidebarMoreMenuItem { ...props } />;
+}
+/* eslint-enable jsdoc/require-param */
diff --git a/packages/edit-site/src/hooks/commands/use-common-commands.js b/packages/edit-site/src/hooks/commands/use-common-commands.js
index fdea50d8afbddb..536817e88d3a47 100644
--- a/packages/edit-site/src/hooks/commands/use-common-commands.js
+++ b/packages/edit-site/src/hooks/commands/use-common-commands.js
@@ -18,28 +18,21 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { store as coreStore } from '@wordpress/core-data';
-import { useViewportMatch } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
-import getIsListPage from '../../utils/get-is-list-page';
 
 const { useGlobalStylesReset } = unlock( blockEditorPrivateApis );
 const { useHistory, useLocation } = unlock( routerPrivateApis );
 
 function useGlobalStylesOpenStylesCommands() {
-	const { openGeneralSidebar, setCanvasMode } = unlock(
-		useDispatch( editSiteStore )
-	);
+	const { openGeneralSidebar } = unlock( useDispatch( editSiteStore ) );
 	const { params } = useLocation();
-	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const isEditorPage = ! getIsListPage( params, isMobileViewport );
-	const { getCanvasMode } = unlock( useSelect( editSiteStore ) );
+	const { canvas = 'view' } = params;
 	const history = useHistory();
-
 	const isBlockBasedTheme = useSelect( ( select ) => {
 		return select( coreStore ).getCurrentTheme().is_block_theme;
 	}, [] );
@@ -55,28 +48,27 @@ function useGlobalStylesOpenStylesCommands() {
 				label: __( 'Open styles' ),
 				callback: ( { close } ) => {
 					close();
-					if ( ! isEditorPage ) {
+					if ( ! params.postId ) {
 						history.push( {
 							path: '/wp_global_styles',
 							canvas: 'edit',
 						} );
 					}
-					if ( isEditorPage && getCanvasMode() !== 'edit' ) {
-						setCanvasMode( 'edit' );
+					if ( params.postId && canvas !== 'edit' ) {
+						history.push(
+							{ ...params, canvas: 'edit' },
+							undefined,
+							{
+								transition: 'canvas-mode-edit-transition',
+							}
+						);
 					}
 					openGeneralSidebar( 'edit-site/global-styles' );
 				},
 				icon: styles,
 			},
 		];
-	}, [
-		history,
-		openGeneralSidebar,
-		setCanvasMode,
-		isEditorPage,
-		getCanvasMode,
-		isBlockBasedTheme,
-	] );
+	}, [ history, openGeneralSidebar, params, canvas, isBlockBasedTheme ] );
 
 	return {
 		isLoading: false,
@@ -85,13 +77,9 @@ function useGlobalStylesOpenStylesCommands() {
 }
 
 function useGlobalStylesToggleWelcomeGuideCommands() {
-	const { openGeneralSidebar, setCanvasMode } = unlock(
-		useDispatch( editSiteStore )
-	);
+	const { openGeneralSidebar } = unlock( useDispatch( editSiteStore ) );
 	const { params } = useLocation();
-	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const isEditorPage = ! getIsListPage( params, isMobileViewport );
-	const { getCanvasMode } = unlock( useSelect( editSiteStore ) );
+	const { canvas = 'view' } = params;
 	const { set } = useDispatch( preferencesStore );
 
 	const history = useHistory();
@@ -110,14 +98,23 @@ function useGlobalStylesToggleWelcomeGuideCommands() {
 				label: __( 'Learn about styles' ),
 				callback: ( { close } ) => {
 					close();
-					if ( ! isEditorPage ) {
+					if ( ! params.postId ) {
 						history.push( {
 							path: '/wp_global_styles',
 							canvas: 'edit',
 						} );
 					}
-					if ( isEditorPage && getCanvasMode() !== 'edit' ) {
-						setCanvasMode( 'edit' );
+					if ( params.postId && canvas !== 'edit' ) {
+						history.push(
+							{
+								...params,
+								canvas: 'edit',
+							},
+							undefined,
+							{
+								transition: 'canvas-mode-edit-transition',
+							}
+						);
 					}
 					openGeneralSidebar( 'edit-site/global-styles' );
 					set( 'core/edit-site', 'welcomeGuideStyles', true );
@@ -133,11 +130,10 @@ function useGlobalStylesToggleWelcomeGuideCommands() {
 	}, [
 		history,
 		openGeneralSidebar,
-		setCanvasMode,
-		isEditorPage,
-		getCanvasMode,
+		canvas,
 		isBlockBasedTheme,
 		set,
+		params,
 	] );
 
 	return {
@@ -173,12 +169,11 @@ function useGlobalStylesResetCommands() {
 }
 
 function useGlobalStylesOpenCssCommands() {
-	const { openGeneralSidebar, setEditorCanvasContainerView, setCanvasMode } =
-		unlock( useDispatch( editSiteStore ) );
+	const { openGeneralSidebar, setEditorCanvasContainerView } = unlock(
+		useDispatch( editSiteStore )
+	);
 	const { params } = useLocation();
-	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const isListPage = getIsListPage( params, isMobileViewport );
-	const isEditorPage = ! isListPage;
+	const { canvas = 'view' } = params;
 	const history = useHistory();
 	const { canEditCSS } = useSelect( ( select ) => {
 		const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =
@@ -193,7 +188,6 @@ function useGlobalStylesOpenCssCommands() {
 			canEditCSS: !! globalStyles?._links?.[ 'wp:action-edit-css' ],
 		};
 	}, [] );
-	const { getCanvasMode } = unlock( useSelect( editSiteStore ) );
 
 	const commands = useMemo( () => {
 		if ( ! canEditCSS ) {
@@ -207,14 +201,23 @@ function useGlobalStylesOpenCssCommands() {
 				icon: brush,
 				callback: ( { close } ) => {
 					close();
-					if ( ! isEditorPage ) {
+					if ( ! params.postId ) {
 						history.push( {
 							path: '/wp_global_styles',
 							canvas: 'edit',
 						} );
 					}
-					if ( isEditorPage && getCanvasMode() !== 'edit' ) {
-						setCanvasMode( 'edit' );
+					if ( params.postId && canvas !== 'edit' ) {
+						history.push(
+							{
+								...params,
+								canvas: 'edit',
+							},
+							undefined,
+							{
+								transition: 'canvas-mode-edit-transition',
+							}
+						);
 					}
 					openGeneralSidebar( 'edit-site/global-styles' );
 					setEditorCanvasContainerView( 'global-styles-css' );
@@ -226,9 +229,8 @@ function useGlobalStylesOpenCssCommands() {
 		openGeneralSidebar,
 		setEditorCanvasContainerView,
 		canEditCSS,
-		isEditorPage,
-		getCanvasMode,
-		setCanvasMode,
+		canvas,
+		params,
 	] );
 	return {
 		isLoading: false,
@@ -237,12 +239,11 @@ function useGlobalStylesOpenCssCommands() {
 }
 
 function useGlobalStylesOpenRevisionsCommands() {
-	const { openGeneralSidebar, setEditorCanvasContainerView, setCanvasMode } =
-		unlock( useDispatch( editSiteStore ) );
-	const { getCanvasMode } = unlock( useSelect( editSiteStore ) );
+	const { openGeneralSidebar, setEditorCanvasContainerView } = unlock(
+		useDispatch( editSiteStore )
+	);
 	const { params } = useLocation();
-	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const isEditorPage = ! getIsListPage( params, isMobileViewport );
+	const { canvas = 'view' } = params;
 	const history = useHistory();
 	const hasRevisions = useSelect( ( select ) => {
 		const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =
@@ -266,14 +267,23 @@ function useGlobalStylesOpenRevisionsCommands() {
 				icon: backup,
 				callback: ( { close } ) => {
 					close();
-					if ( ! isEditorPage ) {
+					if ( ! params.postId ) {
 						history.push( {
 							path: '/wp_global_styles',
 							canvas: 'edit',
 						} );
 					}
-					if ( isEditorPage && getCanvasMode() !== 'edit' ) {
-						setCanvasMode( 'edit' );
+					if ( params.postId && canvas !== 'edit' ) {
+						history.push(
+							{
+								...params,
+								canvas: 'edit',
+							},
+							undefined,
+							{
+								transition: 'canvas-mode-edit-transition',
+							}
+						);
 					}
 					openGeneralSidebar( 'edit-site/global-styles' );
 					setEditorCanvasContainerView( 'global-styles-revisions' );
@@ -285,9 +295,8 @@ function useGlobalStylesOpenRevisionsCommands() {
 		history,
 		openGeneralSidebar,
 		setEditorCanvasContainerView,
-		isEditorPage,
-		getCanvasMode,
-		setCanvasMode,
+		canvas,
+		params,
 	] );
 
 	return {
@@ -298,11 +307,9 @@ function useGlobalStylesOpenRevisionsCommands() {
 
 export function useCommonCommands() {
 	const homeUrl = useSelect( ( select ) => {
-		const {
-			getUnstableBase, // Site index.
-		} = select( coreStore );
-
-		return getUnstableBase()?.home;
+		// Site index.
+		return select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+			?.home;
 	}, [] );
 
 	useCommand( {
diff --git a/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js b/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
index ece6d349db1e7f..97283044193892 100644
--- a/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
+++ b/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
@@ -3,27 +3,10 @@
  */
 import { useSelect, useDispatch } from '@wordpress/data';
 import { __, sprintf, isRTL } from '@wordpress/i18n';
-import {
-	edit,
-	trash,
-	rotateLeft,
-	rotateRight,
-	layout,
-	page,
-	drawerLeft,
-	drawerRight,
-	blockDefault,
-	code,
-	keyboard,
-	listView,
-	symbol,
-} from '@wordpress/icons';
+import { trash, rotateLeft, rotateRight, layout, page } from '@wordpress/icons';
 import { useCommandLoader } from '@wordpress/commands';
 import { decodeEntities } from '@wordpress/html-entities';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-import { store as preferencesStore } from '@wordpress/preferences';
-import { store as interfaceStore } from '@wordpress/interface';
-import { store as noticesStore } from '@wordpress/notices';
 import { store as editorStore } from '@wordpress/editor';
 
 /**
@@ -33,46 +16,51 @@ import { store as editSiteStore } from '../../store';
 import useEditedEntityRecord from '../../components/use-edited-entity-record';
 import isTemplateRemovable from '../../utils/is-template-removable';
 import isTemplateRevertable from '../../utils/is-template-revertable';
-import { KEYBOARD_SHORTCUT_HELP_MODAL_NAME } from '../../components/keyboard-shortcut-help-modal';
-import { PREFERENCES_MODAL_NAME } from '../../components/preferences-modal';
-import { PATTERN_MODALS } from '../../components/pattern-modal';
 import { unlock } from '../../lock-unlock';
 import { TEMPLATE_POST_TYPE } from '../../utils/constants';
+import { useLink } from '../../components/routes/link';
 
-const { useHistory } = unlock( routerPrivateApis );
+const { useHistory, useLocation } = unlock( routerPrivateApis );
 
 function usePageContentFocusCommands() {
 	const { record: template } = useEditedEntityRecord();
-	const { isPage, canvasMode, renderingMode } = useSelect( ( select ) => {
-		const { isPage: _isPage, getCanvasMode } = unlock(
-			select( editSiteStore )
-		);
-		const { getRenderingMode } = select( editorStore );
+	const { params } = useLocation();
+	const { canvas = 'view' } = params;
+	const { isPage, templateId, currentPostType } = useSelect( ( select ) => {
+		const { isPage: _isPage } = unlock( select( editSiteStore ) );
+		const { getCurrentPostType, getCurrentTemplateId } =
+			select( editorStore );
 		return {
 			isPage: _isPage(),
-			canvasMode: getCanvasMode(),
-			renderingMode: getRenderingMode(),
+			templateId: getCurrentTemplateId(),
+			currentPostType: getCurrentPostType(),
 		};
 	}, [] );
+
+	const { onClick: editTemplate } = useLink( {
+		postType: 'wp_template',
+		postId: templateId,
+	} );
+
 	const { setRenderingMode } = useDispatch( editorStore );
 
-	if ( ! isPage || canvasMode !== 'edit' ) {
+	if ( ! isPage || canvas !== 'edit' ) {
 		return { isLoading: false, commands: [] };
 	}
 
 	const commands = [];
 
-	if ( renderingMode !== 'template-only' ) {
+	if ( currentPostType !== 'wp_template' ) {
 		commands.push( {
 			name: 'core/switch-to-template-focus',
-			/* translators: %1$s: template title */
 			label: sprintf(
-				'Edit template: %s',
+				/* translators: %s: template title */
+				__( 'Edit template: %s' ),
 				decodeEntities( template.title )
 			),
 			icon: layout,
 			callback: ( { close } ) => {
-				setRenderingMode( 'template-only' );
+				editTemplate();
 				close();
 			},
 		} );
@@ -91,37 +79,6 @@ function usePageContentFocusCommands() {
 	return { isLoading: false, commands };
 }
 
-function useEditorModeCommands() {
-	const { switchEditorMode } = useDispatch( editSiteStore );
-	const { canvasMode, editorMode } = useSelect(
-		( select ) => ( {
-			canvasMode: unlock( select( editSiteStore ) ).getCanvasMode(),
-			editorMode: select( editSiteStore ).getEditorMode(),
-		} ),
-		[]
-	);
-
-	if ( canvasMode !== 'edit' || editorMode !== 'text' ) {
-		return { isLoading: false, commands: [] };
-	}
-
-	const commands = [];
-
-	if ( editorMode === 'text' ) {
-		commands.push( {
-			name: 'core/exit-code-editor',
-			label: __( 'Exit code editor' ),
-			icon: code,
-			callback: ( { close } ) => {
-				switchEditorMode( 'visual' );
-				close();
-			},
-		} );
-	}
-
-	return { isLoading: false, commands };
-}
-
 function useManipulateDocumentCommands() {
 	const { isLoaded, record: template } = useEditedEntityRecord();
 	const { removeTemplate, revertTemplate } = useDispatch( editSiteStore );
@@ -129,7 +86,7 @@ function useManipulateDocumentCommands() {
 	const isEditingPage = useSelect(
 		( select ) =>
 			select( editSiteStore ).isPage() &&
-			select( editorStore ).getRenderingMode() !== 'template-only',
+			select( editorStore ).getCurrentPostType() !== 'wp_template',
 		[]
 	);
 
@@ -142,14 +99,14 @@ function useManipulateDocumentCommands() {
 	if ( isTemplateRevertable( template ) && ! isEditingPage ) {
 		const label =
 			template.type === TEMPLATE_POST_TYPE
-				? /* translators: %1$s: template title */
-				  sprintf(
-						'Reset template: %s',
+				? sprintf(
+						/* translators: %s: template title */
+						__( 'Reset template: %s' ),
 						decodeEntities( template.title )
 				  )
-				: /* translators: %1$s: template part title */
-				  sprintf(
-						'Reset template part: %s',
+				: sprintf(
+						/* translators: %s: template part title */
+						__( 'Reset template part: %s' ),
 						decodeEntities( template.title )
 				  );
 		commands.push( {
@@ -166,20 +123,16 @@ function useManipulateDocumentCommands() {
 	if ( isTemplateRemovable( template ) && ! isEditingPage ) {
 		const label =
 			template.type === TEMPLATE_POST_TYPE
-				? /* translators: %1$s: template title */
-				  sprintf(
-						'Delete template: %s',
+				? sprintf(
+						/* translators: %s: template title */
+						__( 'Delete template: %s' ),
 						decodeEntities( template.title )
 				  )
-				: /* translators: %1$s: template part title */
-				  sprintf(
-						'Delete template part: %s',
+				: sprintf(
+						/* translators: %s: template part title */
+						__( 'Delete template part: %s' ),
 						decodeEntities( template.title )
 				  );
-		const path =
-			template.type === TEMPLATE_POST_TYPE
-				? '/wp_template'
-				: '/wp_template_part/all';
 		commands.push( {
 			name: 'core/remove-template',
 			label,
@@ -188,7 +141,7 @@ function useManipulateDocumentCommands() {
 				removeTemplate( template );
 				// Navigate to the template list
 				history.push( {
-					path,
+					postType: template.type,
 				} );
 				close();
 			},
@@ -201,233 +154,15 @@ function useManipulateDocumentCommands() {
 	};
 }
 
-function useEditUICommands() {
-	const {
-		openGeneralSidebar,
-		closeGeneralSidebar,
-		toggleDistractionFree,
-		setIsListViewOpened,
-		switchEditorMode,
-	} = useDispatch( editSiteStore );
-	const {
-		canvasMode,
-		editorMode,
-		activeSidebar,
-		showBlockBreadcrumbs,
-		isListViewOpen,
-		isDistractionFree,
-	} = useSelect( ( select ) => {
-		const { isListViewOpened, getEditorMode } = select( editSiteStore );
-		return {
-			canvasMode: unlock( select( editSiteStore ) ).getCanvasMode(),
-			editorMode: getEditorMode(),
-			activeSidebar: select( interfaceStore ).getActiveComplementaryArea(
-				editSiteStore.name
-			),
-			showBlockBreadcrumbs: select( preferencesStore ).get(
-				'core/edit-site',
-				'showBlockBreadcrumbs'
-			),
-			isListViewOpen: isListViewOpened(),
-			isDistractionFree: select( preferencesStore ).get(
-				editSiteStore.name,
-				'distractionFree'
-			),
-		};
-	}, [] );
-	const { openModal } = useDispatch( interfaceStore );
-	const { toggle } = useDispatch( preferencesStore );
-	const { createInfoNotice } = useDispatch( noticesStore );
-
-	if ( canvasMode !== 'edit' ) {
-		return { isLoading: false, commands: [] };
-	}
-
-	const commands = [];
-
-	commands.push( {
-		name: 'core/open-settings-sidebar',
-		label: __( 'Toggle settings sidebar' ),
-		icon: isRTL() ? drawerLeft : drawerRight,
-		callback: ( { close } ) => {
-			close();
-			if ( activeSidebar === 'edit-site/template' ) {
-				closeGeneralSidebar();
-			} else {
-				openGeneralSidebar( 'edit-site/template' );
-			}
-		},
-	} );
-
-	commands.push( {
-		name: 'core/open-block-inspector',
-		label: __( 'Toggle block inspector' ),
-		icon: blockDefault,
-		callback: ( { close } ) => {
-			close();
-			if ( activeSidebar === 'edit-site/block-inspector' ) {
-				closeGeneralSidebar();
-			} else {
-				openGeneralSidebar( 'edit-site/block-inspector' );
-			}
-		},
-	} );
-
-	commands.push( {
-		name: 'core/toggle-spotlight-mode',
-		label: __( 'Toggle spotlight mode' ),
-		callback: ( { close } ) => {
-			toggle( 'core/edit-site', 'focusMode' );
-			close();
-		},
-	} );
-
-	commands.push( {
-		name: 'core/toggle-distraction-free',
-		label: __( 'Toggle distraction free' ),
-		callback: ( { close } ) => {
-			toggleDistractionFree();
-			close();
-		},
-	} );
-
-	commands.push( {
-		name: 'core/toggle-top-toolbar',
-		label: __( 'Toggle top toolbar' ),
-		callback: ( { close } ) => {
-			toggle( 'core/edit-site', 'fixedToolbar' );
-			if ( isDistractionFree ) {
-				toggleDistractionFree();
-			}
-			close();
-		},
-	} );
-
-	if ( editorMode === 'visual' ) {
-		commands.push( {
-			name: 'core/toggle-code-editor',
-			label: __( 'Open code editor' ),
-			icon: code,
-			callback: ( { close } ) => {
-				switchEditorMode( 'text' );
-				close();
-			},
-		} );
-	}
-
-	commands.push( {
-		name: 'core/open-preferences',
-		label: __( 'Editor preferences' ),
-		callback: () => {
-			openModal( PREFERENCES_MODAL_NAME );
-		},
-	} );
-
-	commands.push( {
-		name: 'core/open-shortcut-help',
-		label: __( 'Keyboard shortcuts' ),
-		icon: keyboard,
-		callback: () => {
-			openModal( KEYBOARD_SHORTCUT_HELP_MODAL_NAME );
-		},
-	} );
-
-	commands.push( {
-		name: 'core/toggle-breadcrumbs',
-		label: showBlockBreadcrumbs
-			? __( 'Hide block breadcrumbs' )
-			: __( 'Show block breadcrumbs' ),
-		callback: ( { close } ) => {
-			toggle( 'core/edit-site', 'showBlockBreadcrumbs' );
-			close();
-			createInfoNotice(
-				showBlockBreadcrumbs
-					? __( 'Breadcrumbs hidden.' )
-					: __( 'Breadcrumbs visible.' ),
-				{
-					id: 'core/edit-site/toggle-breadcrumbs/notice',
-					type: 'snackbar',
-				}
-			);
-		},
-	} );
-
-	commands.push( {
-		name: 'core/toggle-list-view',
-		label: __( 'Toggle list view' ),
-		icon: listView,
-		callback: ( { close } ) => {
-			setIsListViewOpened( ! isListViewOpen );
-			close();
-		},
-	} );
-
-	return {
-		isLoading: false,
-		commands,
-	};
-}
-
-function usePatternCommands() {
-	const { isLoaded, record: pattern } = useEditedEntityRecord();
-	const { openModal } = useDispatch( interfaceStore );
-
-	if ( ! isLoaded ) {
-		return { isLoading: true, commands: [] };
-	}
-
-	const commands = [];
-
-	if ( pattern?.type === 'wp_block' ) {
-		commands.push( {
-			name: 'core/rename-pattern',
-			label: __( 'Rename pattern' ),
-			icon: edit,
-			callback: ( { close } ) => {
-				openModal( PATTERN_MODALS.rename );
-				close();
-			},
-		} );
-		commands.push( {
-			name: 'core/duplicate-pattern',
-			label: __( 'Duplicate pattern' ),
-			icon: symbol,
-			callback: ( { close } ) => {
-				openModal( PATTERN_MODALS.duplicate );
-				close();
-			},
-		} );
-	}
-
-	return { isLoading: false, commands };
-}
-
 export function useEditModeCommands() {
-	useCommandLoader( {
-		name: 'core/exit-code-editor',
-		hook: useEditorModeCommands,
-		context: 'site-editor-edit',
-	} );
-
 	useCommandLoader( {
 		name: 'core/edit-site/page-content-focus',
 		hook: usePageContentFocusCommands,
-		context: 'site-editor-edit',
+		context: 'entity-edit',
 	} );
 
 	useCommandLoader( {
 		name: 'core/edit-site/manipulate-document',
 		hook: useManipulateDocumentCommands,
 	} );
-
-	useCommandLoader( {
-		name: 'core/edit-site/patterns',
-		hook: usePatternCommands,
-		context: 'site-editor-edit',
-	} );
-
-	useCommandLoader( {
-		name: 'core/edit-site/edit-ui',
-		hook: useEditUICommands,
-	} );
 }
diff --git a/packages/edit-site/src/hooks/commands/use-set-command-context.js b/packages/edit-site/src/hooks/commands/use-set-command-context.js
new file mode 100644
index 00000000000000..e27c4ca91582fd
--- /dev/null
+++ b/packages/edit-site/src/hooks/commands/use-set-command-context.js
@@ -0,0 +1,47 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { privateApis as commandsPrivateApis } from '@wordpress/commands';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { useHasEditorCanvasContainer } from '../../components/editor-canvas-container';
+
+const { useCommandContext } = unlock( commandsPrivateApis );
+const { useLocation } = unlock( routerPrivateApis );
+
+/**
+ * React hook used to set the correct command context based on the current state.
+ */
+export default function useSetCommandContext() {
+	const { params } = useLocation();
+	const { canvas = 'view' } = params;
+	const hasBlockSelected = useSelect( ( select ) => {
+		return select( blockEditorStore ).getBlockSelectionStart();
+	}, [] );
+
+	const hasEditorCanvasContainer = useHasEditorCanvasContainer();
+
+	// Sets the right context for the command palette
+	let commandContext = 'site-editor';
+	if ( canvas === 'edit' ) {
+		commandContext = 'entity-edit';
+	}
+	if ( hasBlockSelected ) {
+		commandContext = 'block-selection-edit';
+	}
+	if ( hasEditorCanvasContainer ) {
+		/*
+		 * The editor canvas overlay will likely be deprecated in the future, so for now we clear the command context
+		 * to remove the suggested commands that may not make sense with Style Book or Style Revisions open.
+		 * See https://github.com/WordPress/gutenberg/issues/62216.
+		 */
+		commandContext = '';
+	}
+	useCommandContext( commandContext );
+}
diff --git a/packages/edit-site/src/hooks/components.js b/packages/edit-site/src/hooks/components.js
deleted file mode 100644
index 614dfe62db2f98..00000000000000
--- a/packages/edit-site/src/hooks/components.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { addFilter } from '@wordpress/hooks';
-import { MediaUpload } from '@wordpress/media-utils';
-
-addFilter(
-	'editor.MediaUpload',
-	'core/edit-site/components/media-upload',
-	() => MediaUpload
-);
diff --git a/packages/edit-site/src/hooks/index.js b/packages/edit-site/src/hooks/index.js
index 4e871f4e3824eb..66f1b6e17eb0c2 100644
--- a/packages/edit-site/src/hooks/index.js
+++ b/packages/edit-site/src/hooks/index.js
@@ -1,7 +1,4 @@
 /**
  * Internal dependencies
  */
-import './components';
 import './push-changes-to-global-styles';
-import './template-part-edit';
-import './navigation-menu-edit';
diff --git a/packages/edit-site/src/hooks/navigation-menu-edit.js b/packages/edit-site/src/hooks/navigation-menu-edit.js
deleted file mode 100644
index 8b502f075430b0..00000000000000
--- a/packages/edit-site/src/hooks/navigation-menu-edit.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { useSelect } from '@wordpress/data';
-import { BlockControls, useBlockEditingMode } from '@wordpress/block-editor';
-import { store as coreStore } from '@wordpress/core-data';
-import { ToolbarButton } from '@wordpress/components';
-import { addFilter } from '@wordpress/hooks';
-import { createHigherOrderComponent } from '@wordpress/compose';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import { useLink } from '../components/routes/link';
-import { unlock } from '../lock-unlock';
-import { NAVIGATION_POST_TYPE } from '../utils/constants';
-
-const { useLocation } = unlock( routerPrivateApis );
-
-function NavigationMenuEdit( { attributes } ) {
-	const { ref } = attributes;
-	const { params } = useLocation();
-	const blockEditingMode = useBlockEditingMode();
-	const navigationMenu = useSelect(
-		( select ) => {
-			return select( coreStore ).getEntityRecord(
-				'postType',
-				NAVIGATION_POST_TYPE,
-				// Ideally this should be an official public API.
-				ref
-			);
-		},
-		[ ref ]
-	);
-
-	const linkProps = useLink(
-		{
-			postId: navigationMenu?.id,
-			postType: navigationMenu?.type,
-			canvas: 'edit',
-		},
-		{
-			// this applies to Navigation Menus as well.
-			fromTemplateId: params.postId || navigationMenu?.id,
-		}
-	);
-
-	// A non-default setting for block editing mode indicates that the
-	// editor should restrict "editing" actions. Therefore the `Edit` button
-	// should not be displayed.
-	if ( ! navigationMenu || blockEditingMode !== 'default' ) {
-		return null;
-	}
-
-	return (
-		<BlockControls group="other">
-			<ToolbarButton
-				{ ...linkProps }
-				onClick={ ( event ) => {
-					linkProps.onClick( event );
-				} }
-			>
-				{ __( 'Edit' ) }
-			</ToolbarButton>
-		</BlockControls>
-	);
-}
-
-export const withEditBlockControls = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const { attributes, name } = props;
-		const isDisplayed = name === 'core/navigation' && attributes.ref;
-
-		return (
-			<>
-				<BlockEdit { ...props } />
-				{ isDisplayed && (
-					<NavigationMenuEdit attributes={ attributes } />
-				) }
-			</>
-		);
-	},
-	'withEditBlockControls'
-);
-
-addFilter(
-	'editor.BlockEdit',
-	'core/edit-site/navigation-edit-button',
-	withEditBlockControls
-);
diff --git a/packages/edit-site/src/hooks/push-changes-to-global-styles/index.js b/packages/edit-site/src/hooks/push-changes-to-global-styles/index.js
index 0407b85c4e8bcd..49613c8b4c2822 100644
--- a/packages/edit-site/src/hooks/push-changes-to-global-styles/index.js
+++ b/packages/edit-site/src/hooks/push-changes-to-global-styles/index.js
@@ -26,6 +26,7 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import { useSupportedStyles } from '../../components/global-styles/hooks';
 import { unlock } from '../../lock-unlock';
+import setNestedValue from '../../utils/set-nested-value';
 
 const { cleanEmptyObject, GlobalStylesContext } = unlock(
 	blockEditorPrivateApis
@@ -235,50 +236,6 @@ function useChangesToPush( name, attributes, userConfig ) {
 	}, [ supports, attributes, blockUserConfig ] );
 }
 
-/**
- * Sets the value at path of object.
- * If a portion of path doesn’t exist, it’s created.
- * Arrays are created for missing index properties while objects are created
- * for all other missing properties.
- *
- * This function intentionally mutates the input object.
- *
- * Inspired by _.set().
- *
- * @see https://lodash.com/docs/4.17.15#set
- *
- * @todo Needs to be deduplicated with its copy in `@wordpress/core-data`.
- *
- * @param {Object} object Object to modify
- * @param {Array}  path   Path of the property to set.
- * @param {*}      value  Value to set.
- */
-function setNestedValue( object, path, value ) {
-	if ( ! object || typeof object !== 'object' ) {
-		return object;
-	}
-
-	path.reduce( ( acc, key, idx ) => {
-		if ( acc[ key ] === undefined ) {
-			if ( Number.isInteger( path[ idx + 1 ] ) ) {
-				acc[ key ] = [];
-			} else {
-				acc[ key ] = {};
-			}
-		}
-		if ( idx === path.length - 1 ) {
-			acc[ key ] = value;
-		}
-		return acc[ key ];
-	}, object );
-
-	return object;
-}
-
-function cloneDeep( object ) {
-	return ! object ? {} : JSON.parse( JSON.stringify( object ) );
-}
-
 function PushChangesToGlobalStylesControl( {
 	name,
 	attributes,
@@ -301,8 +258,8 @@ function PushChangesToGlobalStylesControl( {
 		if ( changes.length > 0 ) {
 			const { style: blockStyles } = attributes;
 
-			const newBlockStyles = cloneDeep( blockStyles );
-			const newUserConfig = cloneDeep( userConfig );
+			const newBlockStyles = structuredClone( blockStyles );
+			const newUserConfig = structuredClone( userConfig );
 
 			for ( const { path, value } of changes ) {
 				setNestedValue( newBlockStyles, path, undefined );
@@ -329,7 +286,7 @@ function PushChangesToGlobalStylesControl( {
 			// notification.
 			__unstableMarkNextChangeAsNotPersistent();
 			setAttributes( newBlockAttributes );
-			setUserConfig( () => newUserConfig, { undoIgnore: true } );
+			setUserConfig( newUserConfig, { undoIgnore: true } );
 			createSuccessNotice(
 				sprintf(
 					// translators: %s: Title of the block e.g. 'Heading'.
@@ -344,7 +301,7 @@ function PushChangesToGlobalStylesControl( {
 							onClick() {
 								__unstableMarkNextChangeAsNotPersistent();
 								setAttributes( attributes );
-								setUserConfig( () => userConfig, {
+								setUserConfig( userConfig, {
 									undoIgnore: true,
 								} );
 							},
@@ -366,6 +323,7 @@ function PushChangesToGlobalStylesControl( {
 
 	return (
 		<BaseControl
+			__nextHasNoMarginBottom
 			className="edit-site-push-changes-to-global-styles-control"
 			help={ sprintf(
 				// translators: %s: Title of the block e.g. 'Heading'.
@@ -379,7 +337,9 @@ function PushChangesToGlobalStylesControl( {
 				{ __( 'Styles' ) }
 			</BaseControl.VisualLabel>
 			<Button
-				variant="primary"
+				__next40pxDefaultSize
+				variant="secondary"
+				accessibleWhenDisabled
 				disabled={ changes.length === 0 }
 				onClick={ pushChanges }
 			>
@@ -389,30 +349,36 @@ function PushChangesToGlobalStylesControl( {
 	);
 }
 
-const withPushChangesToGlobalStyles = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const blockEditingMode = useBlockEditingMode();
-		const isBlockBasedTheme = useSelect(
-			( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,
-			[]
-		);
-		const supportsStyles = SUPPORTED_STYLES.some( ( feature ) =>
-			hasBlockSupport( props.name, feature )
-		);
-
-		return (
-			<>
-				<BlockEdit { ...props } />
-				{ blockEditingMode === 'default' &&
-					supportsStyles &&
-					isBlockBasedTheme && (
-						<InspectorAdvancedControls>
-							<PushChangesToGlobalStylesControl { ...props } />
-						</InspectorAdvancedControls>
-					) }
-			</>
-		);
+function PushChangesToGlobalStyles( props ) {
+	const blockEditingMode = useBlockEditingMode();
+	const isBlockBasedTheme = useSelect(
+		( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,
+		[]
+	);
+	const supportsStyles = SUPPORTED_STYLES.some( ( feature ) =>
+		hasBlockSupport( props.name, feature )
+	);
+	const isDisplayed =
+		blockEditingMode === 'default' && supportsStyles && isBlockBasedTheme;
+
+	if ( ! isDisplayed ) {
+		return null;
 	}
+
+	return (
+		<InspectorAdvancedControls>
+			<PushChangesToGlobalStylesControl { ...props } />
+		</InspectorAdvancedControls>
+	);
+}
+
+const withPushChangesToGlobalStyles = createHigherOrderComponent(
+	( BlockEdit ) => ( props ) => (
+		<>
+			<BlockEdit key="edit" { ...props } />
+			{ props.isSelected && <PushChangesToGlobalStyles { ...props } /> }
+		</>
+	)
 );
 
 addFilter(
diff --git a/packages/edit-site/src/hooks/template-part-edit.js b/packages/edit-site/src/hooks/template-part-edit.js
deleted file mode 100644
index e60b7945448e7b..00000000000000
--- a/packages/edit-site/src/hooks/template-part-edit.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { useSelect } from '@wordpress/data';
-import { BlockControls } from '@wordpress/block-editor';
-import { store as coreStore } from '@wordpress/core-data';
-import { ToolbarButton } from '@wordpress/components';
-import { addFilter } from '@wordpress/hooks';
-import { createHigherOrderComponent } from '@wordpress/compose';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import { useLink } from '../components/routes/link';
-import { unlock } from '../lock-unlock';
-import { TEMPLATE_PART_POST_TYPE } from '../utils/constants';
-
-const { useLocation } = unlock( routerPrivateApis );
-
-function EditTemplatePartMenuItem( { attributes } ) {
-	const { theme, slug } = attributes;
-	const { params } = useLocation();
-	const templatePart = useSelect(
-		( select ) => {
-			const { getCurrentTheme, getEntityRecord } = select( coreStore );
-
-			return getEntityRecord(
-				'postType',
-				TEMPLATE_PART_POST_TYPE,
-				// Ideally this should be an official public API.
-				`${ theme || getCurrentTheme()?.stylesheet }//${ slug }`
-			);
-		},
-		[ theme, slug ]
-	);
-
-	const linkProps = useLink(
-		{
-			postId: templatePart?.id,
-			postType: templatePart?.type,
-			canvas: 'edit',
-		},
-		{
-			fromTemplateId: params.postId || templatePart?.id,
-		}
-	);
-
-	if ( ! templatePart ) {
-		return null;
-	}
-
-	return (
-		<BlockControls group="other">
-			<ToolbarButton
-				{ ...linkProps }
-				onClick={ ( event ) => {
-					linkProps.onClick( event );
-				} }
-			>
-				{ __( 'Edit' ) }
-			</ToolbarButton>
-		</BlockControls>
-	);
-}
-
-export const withEditBlockControls = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const { attributes, name } = props;
-		const isDisplayed = name === 'core/template-part' && attributes.slug;
-
-		return (
-			<>
-				<BlockEdit { ...props } />
-				{ isDisplayed && (
-					<EditTemplatePartMenuItem attributes={ attributes } />
-				) }
-			</>
-		);
-	},
-	'withEditBlockControls'
-);
-
-addFilter(
-	'editor.BlockEdit',
-	'core/edit-site/template-part-edit-button',
-	withEditBlockControls
-);
diff --git a/packages/edit-site/src/hooks/use-theme-style-variations/test/use-theme-style-variations-by-property.js b/packages/edit-site/src/hooks/use-theme-style-variations/test/use-theme-style-variations-by-property.js
new file mode 100644
index 00000000000000..9cae223935c8cb
--- /dev/null
+++ b/packages/edit-site/src/hooks/use-theme-style-variations/test/use-theme-style-variations-by-property.js
@@ -0,0 +1,271 @@
+/**
+ * Internal dependencies
+ */
+import {
+	filterObjectByProperties,
+	removePropertiesFromObject,
+} from '../use-theme-style-variations-by-property';
+
+describe( 'filterObjectByProperties', () => {
+	const noop = () => {};
+	test.each( [
+		{
+			object: {
+				foo: 'bar',
+				array: [ 1, 3, 4 ],
+			},
+			properties: [ 'array' ],
+			expected: { array: [ 1, 3, 4 ] },
+		},
+		{
+			object: {
+				foo: 'bar',
+			},
+			properties: [ 'does-not-exist' ],
+			expected: {},
+		},
+		{
+			object: {
+				foo: 'bar',
+			},
+			properties: false,
+			expected: {},
+		},
+		{
+			object: {
+				dig: {
+					deeper: {
+						null: null,
+					},
+				},
+			},
+			properties: [ 'null' ],
+			expected: {
+				dig: {
+					deeper: {
+						null: null,
+					},
+				},
+			},
+		},
+		{
+			object: {
+				function: noop,
+			},
+			properties: [ 'function' ],
+			expected: {
+				function: noop,
+			},
+		},
+		{
+			object: [],
+			properties: [ 'something' ],
+			expected: {},
+		},
+		{
+			object: {},
+			properties: undefined,
+			expected: {},
+		},
+		{
+			object: {
+				'nested-object': {
+					'nested-object-foo': 'bar',
+					array: [ 1, 3, 4 ],
+				},
+			},
+			properties: [ 'nested-object-foo' ],
+			expected: {
+				'nested-object': {
+					'nested-object-foo': 'bar',
+				},
+			},
+		},
+	] )(
+		'should filter object by $properties',
+		( { expected, object, properties } ) => {
+			const result = filterObjectByProperties( object, properties );
+			expect( result ).toEqual( expected );
+		}
+	);
+} );
+
+describe( 'removePropertiesFromObject', () => {
+	const mockBaseVariation = {
+		settings: {
+			typography: {
+				fontFamilies: {
+					custom: [
+						{
+							name: 'ADLaM Display',
+							fontFamily: 'ADLaM Display, system-ui',
+							slug: 'adlam-display',
+							fontFace: [
+								{
+									src: 'adlam.woff2',
+									fontWeight: '400',
+									fontStyle: 'normal',
+									fontFamily: 'ADLaM Display',
+								},
+							],
+						},
+					],
+				},
+				fontSizes: [
+					{
+						name: 'Base small',
+						slug: 'base-small',
+						size: '1px',
+					},
+					{
+						name: 'Base medium',
+						slug: 'base-medium',
+						size: '2px',
+					},
+					{
+						name: 'Base large',
+						slug: 'base-large',
+						size: '3px',
+					},
+				],
+			},
+			color: {
+				palette: {
+					custom: [
+						{
+							color: '#c42727',
+							name: 'Color 1',
+							slug: 'custom-color-1',
+						},
+						{
+							color: '#3b0f0f',
+							name: 'Color 2',
+							slug: 'custom-color-2',
+						},
+					],
+				},
+			},
+			layout: {
+				wideSize: '1137px',
+				contentSize: '400px',
+			},
+		},
+		styles: {
+			typography: {
+				fontSize: '12px',
+				lineHeight: '1.5',
+			},
+			color: {
+				backgroundColor: 'cheese',
+				color: 'lettuce',
+			},
+			elements: {
+				cite: {
+					color: {
+						text: 'white',
+					},
+					typography: {
+						letterSpacing: 'white',
+					},
+				},
+			},
+			blocks: {
+				'core/quote': {
+					color: {
+						text: 'hello',
+						background: 'dolly',
+					},
+					typography: {
+						fontSize: '111111px',
+					},
+				},
+				'core/group': {
+					typography: {
+						fontFamily: 'var:preset|font-family|system-sans-serif',
+					},
+				},
+			},
+		},
+	};
+
+	it( 'should return with no properties', () => {
+		const object = { test: 'me' };
+		expect( removePropertiesFromObject( object, undefined ) ).toEqual(
+			object
+		);
+	} );
+
+	it( 'should return with non-string properties', () => {
+		const object = { test: 'you' };
+		expect( removePropertiesFromObject( object, true ) ).toEqual( object );
+	} );
+
+	it( 'should return with empty object', () => {
+		const object = {};
+		expect( removePropertiesFromObject( object, [ 'color' ] ) ).toEqual(
+			object
+		);
+	} );
+
+	it( 'should return with null', () => {
+		expect( removePropertiesFromObject( null, [ 'color' ] ) ).toEqual(
+			null
+		);
+	} );
+
+	it( 'should remove the specified properties from the object', () => {
+		expect(
+			removePropertiesFromObject(
+				{
+					...mockBaseVariation,
+				},
+				[ 'typography' ]
+			)
+		).toEqual( {
+			settings: {
+				color: {
+					palette: {
+						custom: [
+							{
+								color: '#c42727',
+								name: 'Color 1',
+								slug: 'custom-color-1',
+							},
+							{
+								color: '#3b0f0f',
+								name: 'Color 2',
+								slug: 'custom-color-2',
+							},
+						],
+					},
+				},
+				layout: {
+					wideSize: '1137px',
+					contentSize: '400px',
+				},
+			},
+			styles: {
+				color: {
+					backgroundColor: 'cheese',
+					color: 'lettuce',
+				},
+				elements: {
+					cite: {
+						color: {
+							text: 'white',
+						},
+					},
+				},
+				blocks: {
+					'core/quote': {
+						color: {
+							text: 'hello',
+							background: 'dolly',
+						},
+					},
+					'core/group': {},
+				},
+			},
+		} );
+	} );
+} );
diff --git a/packages/edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js b/packages/edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js
new file mode 100644
index 00000000000000..adf98b0d89b019
--- /dev/null
+++ b/packages/edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js
@@ -0,0 +1,175 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { useContext, useMemo } from '@wordpress/element';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const EMPTY_ARRAY = [];
+const { GlobalStylesContext, areGlobalStyleConfigsEqual } = unlock(
+	blockEditorPrivateApis
+);
+const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );
+
+/**
+ * Removes all instances of properties from an object.
+ *
+ * @param {Object}   object     The object to remove the properties from.
+ * @param {string[]} properties The properties to remove.
+ * @return {Object} The modified object.
+ */
+export function removePropertiesFromObject( object, properties ) {
+	if ( ! properties?.length ) {
+		return object;
+	}
+
+	if (
+		typeof object !== 'object' ||
+		! object ||
+		! Object.keys( object ).length
+	) {
+		return object;
+	}
+
+	for ( const key in object ) {
+		if ( properties.includes( key ) ) {
+			delete object[ key ];
+		} else if ( typeof object[ key ] === 'object' ) {
+			removePropertiesFromObject( object[ key ], properties );
+		}
+	}
+	return object;
+}
+
+/**
+ * Checks whether a style variation is empty.
+ *
+ * @param {Object} variation          A style variation object.
+ * @param {string} variation.title    The title of the variation.
+ * @param {Object} variation.settings The settings of the variation.
+ * @param {Object} variation.styles   The styles of the variation.
+ * @return {boolean} Whether the variation is empty.
+ */
+function hasThemeVariation( { title, settings, styles } ) {
+	return (
+		title === __( 'Default' ) || // Always preserve the default variation.
+		Object.keys( settings ).length > 0 ||
+		Object.keys( styles ).length > 0
+	);
+}
+
+/**
+ * Fetches the current theme style variations that contain only the specified properties
+ * and merges them with the user config.
+ *
+ * @param {string[]} properties The properties to filter by.
+ * @return {Object[]|*} The merged object.
+ */
+export function useCurrentMergeThemeStyleVariationsWithUserConfig(
+	properties = []
+) {
+	const { variationsFromTheme } = useSelect( ( select ) => {
+		const _variationsFromTheme =
+			select(
+				coreStore
+			).__experimentalGetCurrentThemeGlobalStylesVariations();
+
+		return {
+			variationsFromTheme: _variationsFromTheme || EMPTY_ARRAY,
+		};
+	}, [] );
+	const { user: userVariation } = useContext( GlobalStylesContext );
+
+	const propertiesAsString = properties.toString();
+
+	return useMemo( () => {
+		const clonedUserVariation = structuredClone( userVariation );
+
+		// Get user variation and remove the settings for the given property.
+		const userVariationWithoutProperties = removePropertiesFromObject(
+			clonedUserVariation,
+			properties
+		);
+		userVariationWithoutProperties.title = __( 'Default' );
+
+		const variationsWithPropertiesAndBase = variationsFromTheme
+			.filter( ( variation ) => {
+				return isVariationWithProperties( variation, properties );
+			} )
+			.map( ( variation ) => {
+				return mergeBaseAndUserConfigs(
+					userVariationWithoutProperties,
+					variation
+				);
+			} );
+
+		const variationsByProperties = [
+			userVariationWithoutProperties,
+			...variationsWithPropertiesAndBase,
+		];
+
+		/*
+		 * Filter out variations with no settings or styles.
+		 */
+		return variationsByProperties?.length
+			? variationsByProperties.filter( hasThemeVariation )
+			: [];
+	}, [ propertiesAsString, userVariation, variationsFromTheme ] );
+}
+
+/**
+ * Returns a new object, with properties specified in `properties` array.,
+ * maintain the original object tree structure.
+ * The function is recursive, so it will perform a deep search for the given properties.
+ * E.g., the function will return `{ a: { b: { c: { test: 1 } } } }` if the properties are  `[ 'test' ]`.
+ *
+ * @param {Object}   object     The object to filter
+ * @param {string[]} properties The properties to filter by
+ * @return {Object} The merged object.
+ */
+export const filterObjectByProperties = ( object, properties ) => {
+	if ( ! object || ! properties?.length ) {
+		return {};
+	}
+
+	const newObject = {};
+	Object.keys( object ).forEach( ( key ) => {
+		if ( properties.includes( key ) ) {
+			newObject[ key ] = object[ key ];
+		} else if ( typeof object[ key ] === 'object' ) {
+			const newFilter = filterObjectByProperties(
+				object[ key ],
+				properties
+			);
+			if ( Object.keys( newFilter ).length ) {
+				newObject[ key ] = newFilter;
+			}
+		}
+	} );
+	return newObject;
+};
+
+/**
+ * Compares a style variation to the same variation filtered by the specified properties.
+ * Returns true if the variation contains only the properties specified.
+ *
+ * @param {Object}   variation  The variation to compare.
+ * @param {string[]} properties The properties to compare.
+ * @return {boolean} Whether the variation contains only the specified properties.
+ */
+export function isVariationWithProperties( variation, properties ) {
+	const variationWithProperties = filterObjectByProperties(
+		structuredClone( variation ),
+		properties
+	);
+
+	return areGlobalStyleConfigsEqual( variationWithProperties, variation );
+}
diff --git a/packages/edit-site/src/index.js b/packages/edit-site/src/index.js
index 82014ad06eb493..83d25bcd0c03ac 100644
--- a/packages/edit-site/src/index.js
+++ b/packages/edit-site/src/index.js
@@ -9,9 +9,11 @@ import {
 } from '@wordpress/block-library';
 import { dispatch } from '@wordpress/data';
 import deprecated from '@wordpress/deprecated';
-import { createRoot } from '@wordpress/element';
-import { store as editorStore } from '@wordpress/editor';
-import { store as interfaceStore } from '@wordpress/interface';
+import { createRoot, StrictMode } from '@wordpress/element';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 import { store as preferencesStore } from '@wordpress/preferences';
 import {
 	registerLegacyWidgetBlock,
@@ -23,8 +25,11 @@ import {
  */
 import './hooks';
 import { store as editSiteStore } from './store';
+import { unlock } from './lock-unlock';
 import App from './components/app';
 
+const { registerCoreBlockBindingsSources } = unlock( editorPrivateApis );
+
 /**
  * Initializes the site editor screen.
  *
@@ -40,10 +45,11 @@ export function initializeEditor( id, settings ) {
 		( { name } ) => name !== 'core/freeform'
 	);
 	registerCoreBlocks( coreBlocks );
+	registerCoreBlockBindingsSources();
 	dispatch( blocksStore ).setFreeformFallbackBlockName( 'core/html' );
 	registerLegacyWidgetBlock( { inserter: false } );
 	registerWidgetGroupBlock( { inserter: false } );
-	if ( process.env.IS_GUTENBERG_PLUGIN ) {
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 		__experimentalRegisterExperimentalCoreBlocks( {
 			enableFSEBlocks: true,
 		} );
@@ -52,23 +58,32 @@ export function initializeEditor( id, settings ) {
 	// We dispatch actions and update the store synchronously before rendering
 	// so that we won't trigger unnecessary re-renders with useEffect.
 	dispatch( preferencesStore ).setDefaults( 'core/edit-site', {
-		editorMode: 'visual',
-		fixedToolbar: false,
-		focusMode: false,
-		distractionFree: false,
-		keepCaretInsideBlock: false,
 		welcomeGuide: true,
 		welcomeGuideStyles: true,
 		welcomeGuidePage: true,
 		welcomeGuideTemplate: true,
-		showListViewByDefault: false,
+	} );
+
+	dispatch( preferencesStore ).setDefaults( 'core', {
+		allowRightClickOverrides: true,
+		distractionFree: false,
+		editorMode: 'visual',
+		fixedToolbar: false,
+		focusMode: false,
+		inactivePanels: [],
+		keepCaretInsideBlock: false,
+		openPanels: [ 'post-status' ],
 		showBlockBreadcrumbs: true,
+		showListViewByDefault: false,
+		enableChoosePatternModal: true,
 	} );
 
-	dispatch( interfaceStore ).setDefaultComplementaryArea(
-		'core/edit-site',
-		'edit-site/template'
-	);
+	if ( window.__experimentalMediaProcessing ) {
+		dispatch( preferencesStore ).setDefaults( 'core/media', {
+			requireApproval: true,
+			optimizeOnUpload: true,
+		} );
+	}
 
 	dispatch( editSiteStore ).updateSettings( settings );
 
@@ -85,7 +100,11 @@ export function initializeEditor( id, settings ) {
 	window.addEventListener( 'dragover', ( e ) => e.preventDefault(), false );
 	window.addEventListener( 'drop', ( e ) => e.preventDefault(), false );
 
-	root.render( <App /> );
+	root.render(
+		<StrictMode>
+			<App />
+		</StrictMode>
+	);
 
 	return root;
 }
@@ -97,8 +116,10 @@ export function reinitializeEditor() {
 	} );
 }
 
-export { default as PluginSidebar } from './components/sidebar-edit-mode/plugin-sidebar';
-export { default as PluginSidebarMoreMenuItem } from './components/header-edit-mode/plugin-sidebar-more-menu-item';
-export { default as PluginMoreMenuItem } from './components/header-edit-mode/plugin-more-menu-item';
 export { default as PluginTemplateSettingPanel } from './components/plugin-template-setting-panel';
 export { store } from './store';
+export * from './deprecated';
+
+// Temporary: While the posts dashboard is being iterated on
+// it's being built in the same package as the site editor.
+export { initializePostsDashboard } from './posts';
diff --git a/packages/edit-site/src/lock-unlock.js b/packages/edit-site/src/lock-unlock.js
index 5c335db46b9d48..5d1a87670c52fb 100644
--- a/packages/edit-site/src/lock-unlock.js
+++ b/packages/edit-site/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/edit-site'
 	);
diff --git a/packages/edit-site/src/posts.js b/packages/edit-site/src/posts.js
new file mode 100644
index 00000000000000..78d823b56c4c11
--- /dev/null
+++ b/packages/edit-site/src/posts.js
@@ -0,0 +1,91 @@
+/**
+ * WordPress dependencies
+ */
+import { store as blocksStore } from '@wordpress/blocks';
+import {
+	registerCoreBlocks,
+	__experimentalGetCoreBlocks,
+	__experimentalRegisterExperimentalCoreBlocks,
+} from '@wordpress/block-library';
+import { dispatch } from '@wordpress/data';
+import { createRoot, StrictMode } from '@wordpress/element';
+import { store as preferencesStore } from '@wordpress/preferences';
+import {
+	registerLegacyWidgetBlock,
+	registerWidgetGroupBlock,
+} from '@wordpress/widgets';
+
+/**
+ * Internal dependencies
+ */
+import './hooks';
+import { store as editSiteStore } from './store';
+
+/**
+ * Internal dependencies
+ */
+import PostsApp from './components/posts-app';
+
+/**
+ * Initializes the "Posts Dashboard"
+ * @param {string} id       ID of the root element to render the screen in.
+ * @param {Object} settings Editor settings.
+ */
+export function initializePostsDashboard( id, settings ) {
+	if ( ! globalThis.IS_GUTENBERG_PLUGIN ) {
+		return;
+	}
+	const target = document.getElementById( id );
+	const root = createRoot( target );
+
+	dispatch( blocksStore ).reapplyBlockTypeFilters();
+	const coreBlocks = __experimentalGetCoreBlocks().filter(
+		( { name } ) => name !== 'core/freeform'
+	);
+	registerCoreBlocks( coreBlocks );
+	dispatch( blocksStore ).setFreeformFallbackBlockName( 'core/html' );
+	registerLegacyWidgetBlock( { inserter: false } );
+	registerWidgetGroupBlock( { inserter: false } );
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+		__experimentalRegisterExperimentalCoreBlocks( {
+			enableFSEBlocks: true,
+		} );
+	}
+
+	// We dispatch actions and update the store synchronously before rendering
+	// so that we won't trigger unnecessary re-renders with useEffect.
+	dispatch( preferencesStore ).setDefaults( 'core/edit-site', {
+		welcomeGuide: true,
+		welcomeGuideStyles: true,
+		welcomeGuidePage: true,
+		welcomeGuideTemplate: true,
+	} );
+
+	dispatch( preferencesStore ).setDefaults( 'core', {
+		allowRightClickOverrides: true,
+		distractionFree: false,
+		editorMode: 'visual',
+		fixedToolbar: false,
+		focusMode: false,
+		inactivePanels: [],
+		keepCaretInsideBlock: false,
+		openPanels: [ 'post-status' ],
+		showBlockBreadcrumbs: true,
+		showListViewByDefault: false,
+		enableChoosePatternModal: true,
+	} );
+
+	dispatch( editSiteStore ).updateSettings( settings );
+
+	// Prevent the default browser action for files dropped outside of dropzones.
+	window.addEventListener( 'dragover', ( e ) => e.preventDefault(), false );
+	window.addEventListener( 'drop', ( e ) => e.preventDefault(), false );
+
+	root.render(
+		<StrictMode>
+			<PostsApp />
+		</StrictMode>
+	);
+
+	return root;
+}
diff --git a/packages/edit-site/src/posts.scss b/packages/edit-site/src/posts.scss
new file mode 100644
index 00000000000000..ec04c9cddf25b8
--- /dev/null
+++ b/packages/edit-site/src/posts.scss
@@ -0,0 +1,55 @@
+@import "../../dataviews/src/style.scss";
+@import "./components/layout/style.scss";
+@import "./components/page/style.scss";
+@import "./components/save-hub/style.scss";
+@import "./components/save-panel/style.scss";
+@import "./components/sidebar/style.scss";
+@import "./components/site-hub/style.scss";
+@import "./components/site-icon/style.scss";
+@import "./components/editor-canvas-container/style.scss";
+@import "./components/post-list/style.scss";
+@import "./components/resizable-frame/style.scss";
+
+@include wordpress-admin-schemes();
+
+#wpadminbar,
+#adminmenumain {
+	display: none;
+}
+#wpcontent {
+	margin-left: 0;
+}
+body.js #wpbody {
+	padding-top: 0;
+}
+body {
+	@include wp-admin-reset("#gutenberg-posts-dashboard");
+}
+#gutenberg-posts-dashboard {
+	@include reset;
+	height: 100vh;
+
+	// On mobile the main content area has to scroll, otherwise you can invoke
+	// the over-scroll bounce on the non-scrolling container, for a bad experience.
+	@include break-small {
+		bottom: 0;
+		left: 0;
+		min-height: 100vh;
+		position: fixed;
+		right: 0;
+		top: 0;
+	}
+
+	.no-js & {
+		min-height: 0;
+		position: static;
+	}
+
+	.components-editor-notices__snackbar {
+		position: fixed;
+		right: 0;
+		bottom: 16px;
+		padding-left: 16px;
+		padding-right: 16px;
+	}
+}
diff --git a/packages/edit-site/src/store/actions.js b/packages/edit-site/src/store/actions.js
index 2dd7aacd384014..127dd9993b68f0 100644
--- a/packages/edit-site/src/store/actions.js
+++ b/packages/edit-site/src/store/actions.js
@@ -1,29 +1,28 @@
 /**
  * WordPress dependencies
  */
-import apiFetch from '@wordpress/api-fetch';
-import { parse, __unstableSerializeAndClean } from '@wordpress/blocks';
+import { parse } from '@wordpress/blocks';
 import deprecated from '@wordpress/deprecated';
-import { addQueryArgs } from '@wordpress/url';
-import { __, sprintf } from '@wordpress/i18n';
-import { store as noticesStore } from '@wordpress/notices';
 import { store as coreStore } from '@wordpress/core-data';
-import { store as interfaceStore } from '@wordpress/interface';
 import { store as blockEditorStore } from '@wordpress/block-editor';
-import { speak } from '@wordpress/a11y';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Internal dependencies
  */
-import { STORE_NAME as editSiteStoreName } from './constants';
-import isTemplateRevertable from '../utils/is-template-revertable';
 import {
 	TEMPLATE_POST_TYPE,
 	TEMPLATE_PART_POST_TYPE,
 	NAVIGATION_POST_TYPE,
 } from '../utils/constants';
+import { unlock } from '../lock-unlock';
+
+const { interfaceStore } = unlock( editorPrivateApis );
+
 /**
  * Dispatches an action that toggles a feature flag.
  *
@@ -49,16 +48,25 @@ export function toggleFeature( featureName ) {
 /**
  * Action that changes the width of the editing canvas.
  *
+ * @deprecated
+ *
  * @param {string} deviceType
  *
  * @return {Object} Action object.
  */
-export function __experimentalSetPreviewDeviceType( deviceType ) {
-	return {
-		type: 'SET_PREVIEW_DEVICE_TYPE',
-		deviceType,
+export const __experimentalSetPreviewDeviceType =
+	( deviceType ) =>
+	( { registry } ) => {
+		deprecated(
+			"dispatch( 'core/edit-site' ).__experimentalSetPreviewDeviceType",
+			{
+				since: '6.5',
+				version: '6.7',
+				hint: 'registry.dispatch( editorStore ).setDeviceType',
+			}
+		);
+		registry.dispatch( editorStore ).setDeviceType( deviceType );
 	};
-}
 
 /**
  * Action that sets a template, optionally fetching it from REST API.
@@ -125,51 +133,10 @@ export const addTemplate =
  */
 export const removeTemplate =
 	( template ) =>
-	async ( { registry } ) => {
-		try {
-			await registry
-				.dispatch( coreStore )
-				.deleteEntityRecord( 'postType', template.type, template.id, {
-					force: true,
-				} );
-
-			const lastError = registry
-				.select( coreStore )
-				.getLastEntityDeleteError(
-					'postType',
-					template.type,
-					template.id
-				);
-
-			if ( lastError ) {
-				throw lastError;
-			}
-
-			// Depending on how the entity was retrieved it's title might be
-			// an object or simple string.
-			const templateTitle =
-				typeof template.title === 'string'
-					? template.title
-					: template.title?.rendered;
-
-			registry.dispatch( noticesStore ).createSuccessNotice(
-				sprintf(
-					/* translators: The template/part's name. */
-					__( '"%s" deleted.' ),
-					decodeEntities( templateTitle )
-				),
-				{ type: 'snackbar', id: 'site-editor-template-deleted-success' }
-			);
-		} catch ( error ) {
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: __( 'An error occurred while deleting the template.' );
-
-			registry
-				.dispatch( noticesStore )
-				.createErrorNotice( errorMessage, { type: 'snackbar' } );
-		}
+	( { registry } ) => {
+		return unlock( registry.dispatch( editorStore ) ).removeTemplates( [
+			template,
+		] );
 	};
 
 /**
@@ -254,7 +221,7 @@ export function setEditedPostContext( context ) {
  *
  * @deprecated
  *
- * @return {number} The resolved template ID for the page route.
+ * @return {Object} Action object.
  */
 export function setPage() {
 	deprecated( "dispatch( 'core/edit-site' ).setPage", {
@@ -311,23 +278,38 @@ export function setIsNavigationPanelOpened() {
 }
 
 /**
- * Opens or closes the inserter.
+ * Returns an action object used to open/close the inserter.
  *
- * @param {boolean|Object} value                Whether the inserter should be
- *                                              opened (true) or closed (false).
- *                                              To specify an insertion point,
- *                                              use an object.
- * @param {string}         value.rootClientId   The root client ID to insert at.
- * @param {number}         value.insertionIndex The index to insert at.
+ * @deprecated
  *
- * @return {Object} Action object.
+ * @param {boolean|Object} value Whether the inserter should be opened (true) or closed (false).
  */
-export function setIsInserterOpened( value ) {
-	return {
-		type: 'SET_IS_INSERTER_OPENED',
-		value,
+export const setIsInserterOpened =
+	( value ) =>
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-site' ).setIsInserterOpened", {
+			since: '6.5',
+			alternative: "dispatch( 'core/editor').setIsInserterOpened",
+		} );
+		registry.dispatch( editorStore ).setIsInserterOpened( value );
+	};
+
+/**
+ * Returns an action object used to open/close the list view.
+ *
+ * @deprecated
+ *
+ * @param {boolean} isOpen A boolean representing whether the list view should be opened or closed.
+ */
+export const setIsListViewOpened =
+	( isOpen ) =>
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-site' ).setIsListViewOpened", {
+			since: '6.5',
+			alternative: "dispatch( 'core/editor').setIsListViewOpened",
+		} );
+		registry.dispatch( editorStore ).setIsListViewOpened( isOpen );
 	};
-}
 
 /**
  * Returns an action object used to update the settings.
@@ -343,27 +325,6 @@ export function updateSettings( settings ) {
 	};
 }
 
-/**
- * Sets whether the list view panel should be open.
- *
- * @param {boolean} isOpen If true, opens the list view. If false, closes it.
- *                         It does not toggle the state, but sets it directly.
- */
-export const setIsListViewOpened =
-	( isOpen ) =>
-	( { dispatch, registry } ) => {
-		const isDistractionFree = registry
-			.select( preferencesStore )
-			.get( 'core/edit-site', 'distractionFree' );
-		if ( isDistractionFree && isOpen ) {
-			dispatch.toggleDistractionFree();
-		}
-		dispatch( {
-			type: 'SET_IS_LIST_VIEW_OPENED',
-			isOpen,
-		} );
-	};
-
 /**
  * Sets whether the save view panel should be open.
  *
@@ -386,130 +347,14 @@ export function setIsSaveViewOpened( isOpen ) {
  *                                      reverting the template. Default true.
  */
 export const revertTemplate =
-	( template, { allowUndo = true } = {} ) =>
-	async ( { registry } ) => {
-		const noticeId = 'edit-site-template-reverted';
-		registry.dispatch( noticesStore ).removeNotice( noticeId );
-		if ( ! isTemplateRevertable( template ) ) {
-			registry
-				.dispatch( noticesStore )
-				.createErrorNotice( __( 'This template is not revertable.' ), {
-					type: 'snackbar',
-				} );
-			return;
-		}
-
-		try {
-			const templateEntityConfig = registry
-				.select( coreStore )
-				.getEntityConfig( 'postType', template.type );
-
-			if ( ! templateEntityConfig ) {
-				registry
-					.dispatch( noticesStore )
-					.createErrorNotice(
-						__(
-							'The editor has encountered an unexpected error. Please reload.'
-						),
-						{ type: 'snackbar' }
-					);
-				return;
-			}
-
-			const fileTemplatePath = addQueryArgs(
-				`${ templateEntityConfig.baseURL }/${ template.id }`,
-				{ context: 'edit', source: 'theme' }
-			);
-
-			const fileTemplate = await apiFetch( { path: fileTemplatePath } );
-			if ( ! fileTemplate ) {
-				registry
-					.dispatch( noticesStore )
-					.createErrorNotice(
-						__(
-							'The editor has encountered an unexpected error. Please reload.'
-						),
-						{ type: 'snackbar' }
-					);
-				return;
-			}
-
-			const serializeBlocks = ( {
-				blocks: blocksForSerialization = [],
-			} ) => __unstableSerializeAndClean( blocksForSerialization );
-
-			const edited = registry
-				.select( coreStore )
-				.getEditedEntityRecord(
-					'postType',
-					template.type,
-					template.id
-				);
-
-			// We are fixing up the undo level here to make sure we can undo
-			// the revert in the header toolbar correctly.
-			registry.dispatch( coreStore ).editEntityRecord(
-				'postType',
-				template.type,
-				template.id,
-				{
-					content: serializeBlocks, // Required to make the `undo` behave correctly.
-					blocks: edited.blocks, // Required to revert the blocks in the editor.
-					source: 'custom', // required to avoid turning the editor into a dirty state
-				},
-				{
-					undoIgnore: true, // Required to merge this edit with the last undo level.
-				}
-			);
-
-			const blocks = parse( fileTemplate?.content?.raw );
-			registry
-				.dispatch( coreStore )
-				.editEntityRecord( 'postType', template.type, fileTemplate.id, {
-					content: serializeBlocks,
-					blocks,
-					source: 'theme',
-				} );
-
-			if ( allowUndo ) {
-				const undoRevert = () => {
-					registry
-						.dispatch( coreStore )
-						.editEntityRecord(
-							'postType',
-							template.type,
-							edited.id,
-							{
-								content: serializeBlocks,
-								blocks: edited.blocks,
-								source: 'custom',
-							}
-						);
-				};
-
-				registry
-					.dispatch( noticesStore )
-					.createSuccessNotice( __( 'Template reverted.' ), {
-						type: 'snackbar',
-						id: noticeId,
-						actions: [
-							{
-								label: __( 'Undo' ),
-								onClick: undoRevert,
-							},
-						],
-					} );
-			}
-		} catch ( error ) {
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: __( 'Template revert failed. Please reload.' );
-			registry
-				.dispatch( noticesStore )
-				.createErrorNotice( errorMessage, { type: 'snackbar' } );
-		}
+	( template, options ) =>
+	( { registry } ) => {
+		return unlock( registry.dispatch( editorStore ) ).revertTemplate(
+			template,
+			options
+		);
 	};
+
 /**
  * Action that opens an editor sidebar.
  *
@@ -517,16 +362,10 @@ export const revertTemplate =
  */
 export const openGeneralSidebar =
 	( name ) =>
-	( { dispatch, registry } ) => {
-		const isDistractionFree = registry
-			.select( preferencesStore )
-			.get( 'core/edit-site', 'distractionFree' );
-		if ( isDistractionFree ) {
-			dispatch.toggleDistractionFree();
-		}
+	( { registry } ) => {
 		registry
 			.dispatch( interfaceStore )
-			.enableComplementaryArea( editSiteStoreName, name );
+			.enableComplementaryArea( 'core', name );
 	};
 
 /**
@@ -535,34 +374,24 @@ export const openGeneralSidebar =
 export const closeGeneralSidebar =
 	() =>
 	( { registry } ) => {
-		registry
-			.dispatch( interfaceStore )
-			.disableComplementaryArea( editSiteStoreName );
+		registry.dispatch( interfaceStore ).disableComplementaryArea( 'core' );
 	};
 
+/**
+ * Triggers an action used to switch editor mode.
+ *
+ * @deprecated
+ *
+ * @param {string} mode The editor mode.
+ */
 export const switchEditorMode =
 	( mode ) =>
-	( { dispatch, registry } ) => {
-		registry
-			.dispatch( 'core/preferences' )
-			.set( 'core/edit-site', 'editorMode', mode );
-
-		// Unselect blocks when we switch to a non visual mode.
-		if ( mode !== 'visual' ) {
-			registry.dispatch( blockEditorStore ).clearSelectedBlock();
-		}
-
-		if ( mode === 'visual' ) {
-			speak( __( 'Visual editor selected' ), 'assertive' );
-		} else if ( mode === 'text' ) {
-			const isDistractionFree = registry
-				.select( preferencesStore )
-				.get( 'core/edit-site', 'distractionFree' );
-			if ( isDistractionFree ) {
-				dispatch.toggleDistractionFree();
-			}
-			speak( __( 'Code editor selected' ), 'assertive' );
-		}
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-site' ).switchEditorMode", {
+			since: '6.6',
+			alternative: "dispatch( 'core/editor').switchEditorMode",
+		} );
+		registry.dispatch( editorStore ).switchEditorMode( mode );
 	};
 
 /**
@@ -592,41 +421,15 @@ export const setHasPageContentFocus =
  * Action that toggles Distraction free mode.
  * Distraction free mode expects there are no sidebars, as due to the
  * z-index values set, you can't close sidebars.
+ *
+ * @deprecated
  */
 export const toggleDistractionFree =
 	() =>
-	( { dispatch, registry } ) => {
-		const isDistractionFree = registry
-			.select( preferencesStore )
-			.get( 'core/edit-site', 'distractionFree' );
-		if ( ! isDistractionFree ) {
-			registry.batch( () => {
-				registry
-					.dispatch( preferencesStore )
-					.set( 'core/edit-site', 'fixedToolbar', true );
-				dispatch.setIsInserterOpened( false );
-				dispatch.setIsListViewOpened( false );
-				dispatch.closeGeneralSidebar();
-			} );
-		}
-		registry.batch( () => {
-			registry
-				.dispatch( preferencesStore )
-				.set(
-					'core/edit-site',
-					'distractionFree',
-					! isDistractionFree
-				);
-			registry
-				.dispatch( noticesStore )
-				.createInfoNotice(
-					isDistractionFree
-						? __( 'Distraction free off.' )
-						: __( 'Distraction free on.' ),
-					{
-						id: 'core/edit-site/distraction-free-mode/notice',
-						type: 'snackbar',
-					}
-				);
+	( { registry } ) => {
+		deprecated( "dispatch( 'core/edit-site' ).toggleDistractionFree", {
+			since: '6.6',
+			alternative: "dispatch( 'core/editor').toggleDistractionFree",
 		} );
+		registry.dispatch( editorStore ).toggleDistractionFree();
 	};
diff --git a/packages/edit-site/src/store/private-actions.js b/packages/edit-site/src/store/private-actions.js
index 2d858c15208991..1db3873acedda2 100644
--- a/packages/edit-site/src/store/private-actions.js
+++ b/packages/edit-site/src/store/private-actions.js
@@ -1,37 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-/**
- * Action that switches the canvas mode.
- *
- * @param {?string} mode Canvas mode.
- */
-export const setCanvasMode =
-	( mode ) =>
-	( { registry, dispatch } ) => {
-		registry.dispatch( blockEditorStore ).__unstableSetEditorMode( 'edit' );
-		dispatch( {
-			type: 'SET_CANVAS_MODE',
-			mode,
-		} );
-		// Check if the block list view should be open by default.
-		// If `distractionFree` mode is enabled, the block list view should not be open.
-		if (
-			mode === 'edit' &&
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-site', 'showListViewByDefault' ) &&
-			! registry
-				.select( preferencesStore )
-				.get( 'core/edit-site', 'distractionFree' )
-		) {
-			dispatch.setIsListViewOpened( true );
-		}
-	};
-
 /**
  * Action that switches the editor canvas container view.
  *
@@ -45,3 +11,10 @@ export const setEditorCanvasContainerView =
 			view,
 		} );
 	};
+
+export function registerRoute( route ) {
+	return {
+		type: 'REGISTER_ROUTE',
+		route,
+	};
+}
diff --git a/packages/edit-site/src/store/private-selectors.js b/packages/edit-site/src/store/private-selectors.js
index 1f1f6e999fdb29..b7c14534419582 100644
--- a/packages/edit-site/src/store/private-selectors.js
+++ b/packages/edit-site/src/store/private-selectors.js
@@ -1,14 +1,3 @@
-/**
- * Returns the current canvas mode.
- *
- * @param {Object} state Global application state.
- *
- * @return {string} Canvas mode.
- */
-export function getCanvasMode( state ) {
-	return state.canvasMode;
-}
-
 /**
  * Returns the editor canvas container view.
  *
@@ -19,3 +8,7 @@ export function getCanvasMode( state ) {
 export function getEditorCanvasContainerView( state ) {
 	return state.editorCanvasContainerView;
 }
+
+export function getRoutes( state ) {
+	return state.routes;
+}
diff --git a/packages/edit-site/src/store/reducer.js b/packages/edit-site/src/store/reducer.js
index a46d215f905074..3ce067c25c1954 100644
--- a/packages/edit-site/src/store/reducer.js
+++ b/packages/edit-site/src/store/reducer.js
@@ -3,23 +3,6 @@
  */
 import { combineReducers } from '@wordpress/data';
 
-/**
- * Reducer returning the editing canvas device type.
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- *
- * @return {Object} Updated state.
- */
-export function deviceType( state = 'Desktop', action ) {
-	switch ( action.type ) {
-		case 'SET_PREVIEW_DEVICE_TYPE':
-			return action.deviceType;
-	}
-
-	return state;
-}
-
 /**
  * Reducer returning the settings.
  *
@@ -67,48 +50,6 @@ export function editedPost( state = {}, action ) {
 	return state;
 }
 
-/**
- * Reducer to set the block inserter panel open or closed.
- *
- * Note: this reducer interacts with the navigation and list view panels reducers
- * to make sure that only one of the three panels is open at the same time.
- *
- * @param {boolean|Object} state  Current state.
- * @param {Object}         action Dispatched action.
- */
-export function blockInserterPanel( state = false, action ) {
-	switch ( action.type ) {
-		case 'SET_IS_LIST_VIEW_OPENED':
-			return action.isOpen ? false : state;
-		case 'SET_IS_INSERTER_OPENED':
-			return action.value;
-		case 'SET_CANVAS_MODE':
-			return false;
-	}
-	return state;
-}
-
-/**
- * Reducer to set the list view panel open or closed.
- *
- * Note: this reducer interacts with the navigation and inserter panels reducers
- * to make sure that only one of the three panels is open at the same time.
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- */
-export function listViewPanel( state = false, action ) {
-	switch ( action.type ) {
-		case 'SET_IS_INSERTER_OPENED':
-			return action.value ? false : state;
-		case 'SET_IS_LIST_VIEW_OPENED':
-			return action.isOpen;
-		case 'SET_CANVAS_MODE':
-			return false;
-	}
-	return state;
-}
-
 /**
  * Reducer to set the save view panel open or closed.
  *
@@ -119,27 +60,10 @@ export function saveViewPanel( state = false, action ) {
 	switch ( action.type ) {
 		case 'SET_IS_SAVE_VIEW_OPENED':
 			return action.isOpen;
-		case 'SET_CANVAS_MODE':
-			return false;
 	}
 	return state;
 }
 
-/**
- * Reducer used to track the site editor canvas mode (edit or view).
- *
- * @param {Object} state  Current state.
- * @param {Object} action Dispatched action.
- */
-function canvasMode( state = 'init', action ) {
-	switch ( action.type ) {
-		case 'SET_CANVAS_MODE':
-			return action.mode;
-	}
-
-	return state;
-}
-
 /**
  * Reducer used to track the site editor canvas container view.
  * Default is `undefined`, denoting the default, visual block editor.
@@ -157,13 +81,19 @@ function editorCanvasContainerView( state = undefined, action ) {
 	return state;
 }
 
+function routes( state = [], action ) {
+	switch ( action.type ) {
+		case 'REGISTER_ROUTE':
+			return [ ...state, action.route ];
+	}
+
+	return state;
+}
+
 export default combineReducers( {
-	deviceType,
 	settings,
 	editedPost,
-	blockInserterPanel,
-	listViewPanel,
 	saveViewPanel,
-	canvasMode,
 	editorCanvasContainerView,
+	routes,
 } );
diff --git a/packages/edit-site/src/store/selectors.js b/packages/edit-site/src/store/selectors.js
index 9d00e141270c40..ddef4a71d0a915 100644
--- a/packages/edit-site/src/store/selectors.js
+++ b/packages/edit-site/src/store/selectors.js
@@ -2,18 +2,20 @@
  * WordPress dependencies
  */
 import { store as coreDataStore } from '@wordpress/core-data';
-import { createRegistrySelector } from '@wordpress/data';
+import { createRegistrySelector, createSelector } from '@wordpress/data';
 import deprecated from '@wordpress/deprecated';
 import { Platform } from '@wordpress/element';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as editorStore } from '@wordpress/editor';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
-import { getFilteredTemplatePartBlocks } from './utils';
+import { unlock } from '../lock-unlock';
 import { TEMPLATE_PART_POST_TYPE } from '../utils/constants';
+import getFilteredTemplatePartBlocks from '../utils/get-filtered-template-parts';
+
 /**
  * @typedef {'template'|'template_type'} TemplateType Template type.
  */
@@ -44,13 +46,25 @@ export const isFeatureActive = createRegistrySelector(
 /**
  * Returns the current editing canvas device type.
  *
+ * @deprecated
+ *
  * @param {Object} state Global application state.
  *
  * @return {string} Device type.
  */
-export function __experimentalGetPreviewDeviceType( state ) {
-	return state.deviceType;
-}
+export const __experimentalGetPreviewDeviceType = createRegistrySelector(
+	( select ) => () => {
+		deprecated(
+			`select( 'core/edit-site' ).__experimentalGetPreviewDeviceType`,
+			{
+				since: '6.5',
+				version: '6.7',
+				alternative: `select( 'core/editor' ).getDeviceType`,
+			}
+		);
+		return select( editorStore ).getDeviceType();
+	}
+);
 
 /**
  * Returns whether the current user can create media or not.
@@ -60,7 +74,17 @@ export function __experimentalGetPreviewDeviceType( state ) {
  * @return {Object} Whether the current user can create media or not.
  */
 export const getCanUserCreateMedia = createRegistrySelector(
-	( select ) => () => select( coreDataStore ).canUser( 'create', 'media' )
+	( select ) => () => {
+		deprecated(
+			`wp.data.select( 'core/edit-site' ).getCanUserCreateMedia()`,
+			{
+				since: '6.7',
+				alternative: `wp.data.select( 'core' ).canUser( 'create', { kind: 'root', type: 'media' } )`,
+			}
+		);
+
+		return select( coreDataStore ).canUser( 'create', 'media' );
+	}
 );
 
 /**
@@ -71,13 +95,11 @@ export const getCanUserCreateMedia = createRegistrySelector(
  * @return {Array} The available reusable blocks.
  */
 export const getReusableBlocks = createRegistrySelector( ( select ) => () => {
-	deprecated(
-		"select( 'core/core' ).getEntityRecords( 'postType', 'wp_block' )",
-		{
-			since: '6.5',
-			version: '6.8',
-		}
-	);
+	deprecated( `select( 'core/edit-site' ).getReusableBlocks()`, {
+		since: '6.5',
+		version: '6.8',
+		alternative: `select( 'core/core' ).getEntityRecords( 'postType', 'wp_block' )`,
+	} );
 	const isWeb = Platform.OS === 'web';
 	return isWeb
 		? select( coreDataStore ).getEntityRecords( 'postType', 'wp_block', {
@@ -115,7 +137,7 @@ export function getHomeTemplateId() {
  *
  * @param {Object} state Global application state.
  *
- * @return {TemplateType?} Template type.
+ * @return {?TemplateType} Template type.
  */
 export function getEditedPostType( state ) {
 	return state.editedPost.postType;
@@ -126,7 +148,7 @@ export function getEditedPostType( state ) {
  *
  * @param {Object} state Global application state.
  *
- * @return {string?} Post ID.
+ * @return {?string} Post ID.
  */
 export function getEditedPostId( state ) {
 	return state.editedPost.id;
@@ -157,66 +179,58 @@ export function getPage( state ) {
 }
 
 /**
- * Returns the current opened/closed state of the inserter panel.
+ * Returns true if the inserter is opened.
+ *
+ * @deprecated
  *
  * @param {Object} state Global application state.
  *
- * @return {boolean} True if the inserter panel should be open; false if closed.
+ * @return {boolean} Whether the inserter is opened.
  */
-export function isInserterOpened( state ) {
-	return !! state.blockInserterPanel;
-}
+export const isInserterOpened = createRegistrySelector( ( select ) => () => {
+	deprecated( `select( 'core/edit-site' ).isInserterOpened`, {
+		since: '6.5',
+		alternative: `select( 'core/editor' ).isInserterOpened`,
+	} );
+	return select( editorStore ).isInserterOpened();
+} );
 
 /**
  * Get the insertion point for the inserter.
  *
+ * @deprecated
+ *
  * @param {Object} state Global application state.
  *
  * @return {Object} The root client ID, index to insert at and starting filter value.
  */
 export const __experimentalGetInsertionPoint = createRegistrySelector(
-	( select ) => ( state ) => {
-		if ( typeof state.blockInserterPanel === 'object' ) {
-			const { rootClientId, insertionIndex, filterValue } =
-				state.blockInserterPanel;
-			return { rootClientId, insertionIndex, filterValue };
-		}
-
-		if (
-			isPage( state ) &&
-			select( editorStore ).getRenderingMode() !== 'template-only'
-		) {
-			const [ postContentClientId ] =
-				select( blockEditorStore ).__experimentalGetGlobalBlocksByName(
-					'core/post-content'
-				);
-			if ( postContentClientId ) {
-				return {
-					rootClientId: postContentClientId,
-					insertionIndex: undefined,
-					filterValue: undefined,
-				};
+	( select ) => () => {
+		deprecated(
+			`select( 'core/edit-site' ).__experimentalGetInsertionPoint`,
+			{
+				since: '6.5',
+				version: '6.7',
 			}
-		}
-
-		return {
-			rootClientId: undefined,
-			insertionIndex: undefined,
-			filterValue: undefined,
-		};
+		);
+		return unlock( select( editorStore ) ).getInserter();
 	}
 );
 
 /**
- * Returns the current opened/closed state of the list view panel.
+ * Returns true if the list view is opened.
  *
  * @param {Object} state Global application state.
  *
- * @return {boolean} True if the list view panel should be open; false if closed.
+ * @return {boolean} Whether the list view is opened.
  */
-export function isListViewOpened( state ) {
-	return state.listViewPanel;
-}
+export const isListViewOpened = createRegistrySelector( ( select ) => () => {
+	deprecated( `select( 'core/edit-site' ).isListViewOpened`, {
+		since: '6.5',
+		alternative: `select( 'core/editor' ).isListViewOpened`,
+	} );
+	return select( editorStore ).isListViewOpened();
+} );
 
 /**
  * Returns the current opened/closed state of the save panel.
@@ -229,29 +243,46 @@ export function isSaveViewOpened( state ) {
 	return state.saveViewPanel;
 }
 
+function getBlocksAndTemplateParts( select ) {
+	const templateParts = select( coreDataStore ).getEntityRecords(
+		'postType',
+		TEMPLATE_PART_POST_TYPE,
+		{ per_page: -1 }
+	);
+
+	const { getBlocksByName, getBlocksByClientId } = select( blockEditorStore );
+
+	const clientIds = getBlocksByName( 'core/template-part' );
+	const blocks = getBlocksByClientId( clientIds );
+	return [ blocks, templateParts ];
+}
+
 /**
  * Returns the template parts and their blocks for the current edited template.
  *
+ * @deprecated
  * @param {Object} state Global application state.
  * @return {Array} Template parts and their blocks in an array.
  */
 export const getCurrentTemplateTemplateParts = createRegistrySelector(
-	( select ) => () => {
-		const templateParts = select( coreDataStore ).getEntityRecords(
-			'postType',
-			TEMPLATE_PART_POST_TYPE,
-			{ per_page: -1 }
-		);
-
-		const clientIds =
-			select( blockEditorStore ).__experimentalGetGlobalBlocksByName(
-				'core/template-part'
-			);
-		const blocks =
-			select( blockEditorStore ).getBlocksByClientId( clientIds );
+	( select ) =>
+		createSelector(
+			() => {
+				deprecated(
+					`select( 'core/edit-site' ).getCurrentTemplateTemplateParts()`,
+					{
+						since: '6.7',
+						version: '6.9',
+						alternative: `select( 'core/block-editor' ).getBlocksByName( 'core/template-part' )`,
+					}
+				);
 
-		return getFilteredTemplatePartBlocks( blocks, templateParts );
-	}
+				return getFilteredTemplatePartBlocks(
+					...getBlocksAndTemplateParts( select )
+				);
+			},
+			() => getBlocksAndTemplateParts( select )
+		)
 );
 
 /**
@@ -262,7 +293,7 @@ export const getCurrentTemplateTemplateParts = createRegistrySelector(
  * @return {string} Editing mode.
  */
 export const getEditorMode = createRegistrySelector( ( select ) => () => {
-	return select( preferencesStore ).get( 'core/edit-site', 'editorMode' );
+	return select( preferencesStore ).get( 'core', 'editorMode' );
 } );
 
 /**
diff --git a/packages/edit-site/src/store/test/actions.js b/packages/edit-site/src/store/test/actions.js
index 6f0597fec12434..3fbe5d19aa94e3 100644
--- a/packages/edit-site/src/store/test/actions.js
+++ b/packages/edit-site/src/store/test/actions.js
@@ -4,15 +4,20 @@
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
 import { createRegistry } from '@wordpress/data';
-import { store as interfaceStore } from '@wordpress/interface';
 import { store as noticesStore } from '@wordpress/notices';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { store as editorStore } from '@wordpress/editor';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
 import { store as editSiteStore } from '..';
+import { unlock } from '../../lock-unlock';
+
+const { interfaceStore } = unlock( editorPrivateApis );
 
 function createRegistryWithStores() {
 	// create a registry
@@ -75,107 +80,4 @@ describe( 'actions', () => {
 			expect( select.getEditedPostType() ).toBe( 'wp_template_part' );
 		} );
 	} );
-
-	describe( 'setIsListViewOpened', () => {
-		it( 'should set the list view opened state', () => {
-			const registry = createRegistryWithStores();
-
-			registry.dispatch( editSiteStore ).setIsListViewOpened( true );
-			expect( registry.select( editSiteStore ).isListViewOpened() ).toBe(
-				true
-			);
-
-			registry.dispatch( editSiteStore ).setIsListViewOpened( false );
-			expect( registry.select( editSiteStore ).isListViewOpened() ).toBe(
-				false
-			);
-		} );
-		it( 'should turn off distraction free mode when opening the list view', () => {
-			const registry = createRegistryWithStores();
-			registry
-				.dispatch( preferencesStore )
-				.set( 'core/edit-site', 'distractionFree', true );
-			registry.dispatch( editSiteStore ).setIsListViewOpened( true );
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-site', 'distractionFree' )
-			).toBe( false );
-		} );
-	} );
-
-	describe( 'openGeneralSidebar', () => {
-		it( 'should turn off distraction free mode when opening a general sidebar', () => {
-			const registry = createRegistryWithStores();
-			registry
-				.dispatch( preferencesStore )
-				.set( 'core/edit-site', 'distractionFree', true );
-			registry
-				.dispatch( editSiteStore )
-				.openGeneralSidebar( 'edit-site/global-styles' );
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-site', 'distractionFree' )
-			).toBe( false );
-		} );
-	} );
-
-	describe( 'switchEditorMode', () => {
-		it( 'should turn off distraction free mode when switching to code editor', () => {
-			const registry = createRegistryWithStores();
-			registry
-				.dispatch( preferencesStore )
-				.set( 'core/edit-site', 'distractionFree', true );
-			registry.dispatch( editSiteStore ).switchEditorMode( 'visual' );
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-site', 'distractionFree' )
-			).toBe( true );
-			registry.dispatch( editSiteStore ).switchEditorMode( 'text' );
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-site', 'distractionFree' )
-			).toBe( false );
-		} );
-	} );
-
-	describe( 'toggleDistractionFree', () => {
-		it( 'should properly update settings to prevent layout corruption when enabling distraction free mode', () => {
-			const registry = createRegistryWithStores();
-			// Enable everything that shouldn't be enabled in distraction free mode.
-			registry
-				.dispatch( preferencesStore )
-				.set( 'core/edit-site', 'fixedToolbar', true );
-			registry.dispatch( editSiteStore ).setIsListViewOpened( true );
-			registry
-				.dispatch( editSiteStore )
-				.openGeneralSidebar( 'edit-site/global-styles' );
-			// Initial state is falsy.
-			registry.dispatch( editSiteStore ).toggleDistractionFree();
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-site', 'fixedToolbar' )
-			).toBe( true );
-			expect( registry.select( editSiteStore ).isListViewOpened() ).toBe(
-				false
-			);
-			expect( registry.select( editSiteStore ).isInserterOpened() ).toBe(
-				false
-			);
-			expect(
-				registry
-					.select( interfaceStore )
-					.getActiveComplementaryArea( editSiteStore.name )
-			).toBeNull();
-			expect(
-				registry
-					.select( preferencesStore )
-					.get( 'core/edit-site', 'distractionFree' )
-			).toBe( true );
-		} );
-	} );
 } );
diff --git a/packages/edit-site/src/store/test/reducer.js b/packages/edit-site/src/store/test/reducer.js
index f39261fea38802..9e7929e737fb39 100644
--- a/packages/edit-site/src/store/test/reducer.js
+++ b/packages/edit-site/src/store/test/reducer.js
@@ -6,14 +6,7 @@ import deepFreeze from 'deep-freeze';
 /**
  * Internal dependencies
  */
-import {
-	settings,
-	editedPost,
-	blockInserterPanel,
-	listViewPanel,
-} from '../reducer';
-
-import { setIsInserterOpened } from '../actions';
+import { settings, editedPost } from '../reducer';
 
 describe( 'state', () => {
 	describe( 'settings()', () => {
@@ -73,78 +66,4 @@ describe( 'state', () => {
 			} );
 		} );
 	} );
-
-	describe( 'blockInserterPanel()', () => {
-		it( 'should apply default state', () => {
-			expect( blockInserterPanel( undefined, {} ) ).toEqual( false );
-		} );
-
-		it( 'should default to returning the same state', () => {
-			expect( blockInserterPanel( true, {} ) ).toBe( true );
-		} );
-
-		it( 'should set the open state of the inserter panel', () => {
-			expect(
-				blockInserterPanel( false, setIsInserterOpened( true ) )
-			).toBe( true );
-			expect(
-				blockInserterPanel( true, setIsInserterOpened( false ) )
-			).toBe( false );
-		} );
-
-		it( 'should close the inserter when opening the list view panel', () => {
-			expect(
-				blockInserterPanel( true, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: true,
-				} )
-			).toBe( false );
-		} );
-
-		it( 'should not change the state when closing the list view panel', () => {
-			expect(
-				blockInserterPanel( true, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: false,
-				} )
-			).toBe( true );
-		} );
-	} );
-
-	describe( 'listViewPanel()', () => {
-		it( 'should apply default state', () => {
-			expect( listViewPanel( undefined, {} ) ).toEqual( false );
-		} );
-
-		it( 'should default to returning the same state', () => {
-			expect( listViewPanel( true, {} ) ).toBe( true );
-		} );
-
-		it( 'should set the open state of the list view panel', () => {
-			expect(
-				listViewPanel( false, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: true,
-				} )
-			).toBe( true );
-			expect(
-				listViewPanel( true, {
-					type: 'SET_IS_LIST_VIEW_OPENED',
-					isOpen: false,
-				} )
-			).toBe( false );
-		} );
-
-		it( 'should close the list view when opening the inserter panel', () => {
-			expect( listViewPanel( true, setIsInserterOpened( true ) ) ).toBe(
-				false
-			);
-		} );
-
-		it( 'should not change the state when closing the inserter panel', () => {
-			expect( listViewPanel( true, setIsInserterOpened( false ) ) ).toBe(
-				true
-			);
-		} );
-	} );
 } );
diff --git a/packages/edit-site/src/store/test/selectors.js b/packages/edit-site/src/store/test/selectors.js
index 07577e897b04ec..c0bb074f8f036b 100644
--- a/packages/edit-site/src/store/test/selectors.js
+++ b/packages/edit-site/src/store/test/selectors.js
@@ -1,36 +1,9 @@
-/**
- * WordPress dependencies
- */
-import { store as coreDataStore } from '@wordpress/core-data';
-
 /**
  * Internal dependencies
  */
-import {
-	getCanUserCreateMedia,
-	getEditedPostType,
-	getEditedPostId,
-	isInserterOpened,
-	isListViewOpened,
-	isPage,
-} from '../selectors';
+import { getEditedPostType, getEditedPostId, isPage } from '../selectors';
 
 describe( 'selectors', () => {
-	const canUser = jest.fn( () => true );
-	getCanUserCreateMedia.registry = {
-		select: jest.fn( () => ( { canUser } ) ),
-	};
-
-	describe( 'getCanUserCreateMedia', () => {
-		it( "selects `canUser( 'create', 'media' )` from the core store", () => {
-			expect( getCanUserCreateMedia() ).toBe( true );
-			expect(
-				getCanUserCreateMedia.registry.select
-			).toHaveBeenCalledWith( coreDataStore );
-			expect( canUser ).toHaveBeenCalledWith( 'create', 'media' );
-		} );
-	} );
-
 	describe( 'getEditedPostId', () => {
 		it( 'returns the template ID', () => {
 			const state = { editedPost: { id: 10 } };
@@ -45,28 +18,6 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( 'isInserterOpened', () => {
-		it( 'returns the block inserter panel isOpened state', () => {
-			const state = {
-				blockInserterPanel: true,
-			};
-			expect( isInserterOpened( state ) ).toBe( true );
-			state.blockInserterPanel = false;
-			expect( isInserterOpened( state ) ).toBe( false );
-		} );
-	} );
-
-	describe( 'isListViewOpened', () => {
-		it( 'returns the list view panel isOpened state', () => {
-			const state = {
-				listViewPanel: true,
-			};
-			expect( isListViewOpened( state ) ).toBe( true );
-			state.listViewPanel = false;
-			expect( isListViewOpened( state ) ).toBe( false );
-		} );
-	} );
-
 	describe( 'isPage', () => {
 		it( 'returns true if the edited post type is a page', () => {
 			const state = {
diff --git a/packages/edit-site/src/store/test/utils.js b/packages/edit-site/src/store/test/utils.js
deleted file mode 100644
index f5552f81cd179b..00000000000000
--- a/packages/edit-site/src/store/test/utils.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Internal dependencies
- */
-import { getFilteredTemplatePartBlocks } from '../utils';
-
-const NESTED_BLOCKS = [
-	{
-		clientId: '1',
-		name: 'core/group',
-		innerBlocks: [
-			{
-				clientId: '2',
-				name: 'core/template-part',
-				attributes: {
-					slug: 'header',
-					theme: 'my-theme',
-				},
-				innerBlocks: [
-					{
-						clientId: '3',
-						name: 'core/group',
-						innerBlocks: [],
-					},
-				],
-			},
-			{
-				clientId: '4',
-				name: 'core/template-part',
-				attributes: {
-					slug: 'aside',
-					theme: 'my-theme',
-				},
-				innerBlocks: [],
-			},
-		],
-	},
-	{
-		clientId: '5',
-		name: 'core/paragraph',
-		innerBlocks: [],
-	},
-	{
-		clientId: '6',
-		name: 'core/template-part',
-		attributes: {
-			slug: 'footer',
-			theme: 'my-theme',
-		},
-		innerBlocks: [],
-	},
-];
-
-const FLATTENED_BLOCKS = [
-	{
-		block: {
-			clientId: '2',
-			name: 'core/template-part',
-			attributes: {
-				slug: 'header',
-				theme: 'my-theme',
-			},
-		},
-		templatePart: {
-			id: 'my-theme//header',
-			slug: 'header',
-			theme: 'my-theme',
-		},
-	},
-	{
-		block: {
-			clientId: '4',
-			name: 'core/template-part',
-			attributes: {
-				slug: 'aside',
-				theme: 'my-theme',
-			},
-		},
-		templatePart: {
-			id: 'my-theme//aside',
-			slug: 'aside',
-			theme: 'my-theme',
-		},
-	},
-	{
-		block: {
-			clientId: '6',
-			name: 'core/template-part',
-			attributes: {
-				slug: 'footer',
-				theme: 'my-theme',
-			},
-		},
-		templatePart: {
-			id: 'my-theme//footer',
-			slug: 'footer',
-			theme: 'my-theme',
-		},
-	},
-];
-
-const SINGLE_TEMPLATE_PART_BLOCK = {
-	clientId: '1',
-	name: 'core/template-part',
-	innerBlocks: [],
-	attributes: {
-		slug: 'aside',
-		theme: 'my-theme',
-	},
-};
-
-const TEMPLATE_PARTS = [
-	{
-		id: 'my-theme//header',
-		slug: 'header',
-		theme: 'my-theme',
-	},
-	{
-		id: 'my-theme//aside',
-		slug: 'aside',
-		theme: 'my-theme',
-	},
-	{
-		id: 'my-theme//footer',
-		slug: 'footer',
-		theme: 'my-theme',
-	},
-];
-
-describe( 'utils', () => {
-	describe( 'getFilteredTemplatePartBlocks', () => {
-		it( 'returns a flattened list of filtered template parts preserving a depth-first order', () => {
-			const flattenedFilteredTemplateParts =
-				getFilteredTemplatePartBlocks( NESTED_BLOCKS, TEMPLATE_PARTS );
-			expect( flattenedFilteredTemplateParts ).toEqual(
-				FLATTENED_BLOCKS
-			);
-		} );
-
-		it( 'returns a cached result when passed the same params', () => {
-			// Clear the cache and call the function twice.
-			getFilteredTemplatePartBlocks.clear();
-			getFilteredTemplatePartBlocks( NESTED_BLOCKS, TEMPLATE_PARTS );
-			expect(
-				getFilteredTemplatePartBlocks( NESTED_BLOCKS, TEMPLATE_PARTS )
-			).toEqual( FLATTENED_BLOCKS );
-
-			// The function has been called twice with the same params, so the cache size should be 1.
-			/**
-			 * TODO what should be done about this?
-			 * Can it be tested another way?
-			 * Is it necessary?
-			 */
-			// const [ , , originalSize ] =
-			// 	getFilteredTemplatePartBlocks.getCache();
-			// expect( originalSize ).toBe( 1 );
-
-			// Call the function again, with different params.
-			expect(
-				getFilteredTemplatePartBlocks(
-					[ SINGLE_TEMPLATE_PART_BLOCK ],
-					TEMPLATE_PARTS
-				)
-			).toEqual( [
-				{
-					block: {
-						clientId: '1',
-						name: 'core/template-part',
-						attributes: {
-							slug: 'aside',
-							theme: 'my-theme',
-						},
-					},
-					templatePart: {
-						id: 'my-theme//aside',
-						slug: 'aside',
-						theme: 'my-theme',
-					},
-				},
-			] );
-
-			// The function has been called with different params, so the cache size should now be 2.
-			/**
-			 * TODO what should be done about this?
-			 * Can it be tested another way?
-			 * Is it necessary?
-			 */
-			// const [ , , finalSize ] = getFilteredTemplatePartBlocks.getCache();
-			// expect( finalSize ).toBe( 2 );
-		} );
-	} );
-} );
diff --git a/packages/edit-site/src/store/utils.js b/packages/edit-site/src/store/utils.js
deleted file mode 100644
index af24684ace615e..00000000000000
--- a/packages/edit-site/src/store/utils.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * External dependencies
- */
-import memoize from 'memize';
-
-/**
- * WordPress dependencies
- */
-import { isTemplatePart } from '@wordpress/blocks';
-
-const EMPTY_ARRAY = [];
-
-/**
- * Get a flattened and filtered list of template parts and the matching block for that template part.
- *
- * Takes a list of blocks defined within a template, and a list of template parts, and returns a
- * flattened list of template parts and the matching block for that template part.
- *
- * @param {Array}  blocks        Blocks to flatten.
- * @param {?Array} templateParts Available template parts.
- * @return {Array} An array of template parts and their blocks.
- */
-function getFilteredTemplatePartBlocks( blocks = EMPTY_ARRAY, templateParts ) {
-	const templatePartsById = templateParts
-		? // Key template parts by their ID.
-		  templateParts.reduce(
-				( newTemplateParts, part ) => ( {
-					...newTemplateParts,
-					[ part.id ]: part,
-				} ),
-				{}
-		  )
-		: {};
-
-	const result = [];
-
-	// Iterate over all blocks, recursing into inner blocks.
-	// Output will be based on a depth-first traversal.
-	const stack = [ ...blocks ];
-	while ( stack.length ) {
-		const { innerBlocks, ...block } = stack.shift();
-		// Place inner blocks at the beginning of the stack to preserve order.
-		stack.unshift( ...innerBlocks );
-
-		if ( isTemplatePart( block ) ) {
-			const {
-				attributes: { theme, slug },
-			} = block;
-			const templatePartId = `${ theme }//${ slug }`;
-			const templatePart = templatePartsById[ templatePartId ];
-
-			// Only add to output if the found template part block is in the list of available template parts.
-			if ( templatePart ) {
-				result.push( {
-					templatePart,
-					block,
-				} );
-			}
-		}
-	}
-
-	return result;
-}
-
-const memoizedGetFilteredTemplatePartBlocks = memoize(
-	getFilteredTemplatePartBlocks
-);
-
-export { memoizedGetFilteredTemplatePartBlocks as getFilteredTemplatePartBlocks };
diff --git a/packages/edit-site/src/style.scss b/packages/edit-site/src/style.scss
index 9e9cdbc6684b81..b2f5c826046b79 100644
--- a/packages/edit-site/src/style.scss
+++ b/packages/edit-site/src/style.scss
@@ -1,30 +1,18 @@
-@import "../../interface/src/style.scss";
 @import "../../dataviews/src/style.scss";
+@import "../../fields/src/styles.scss";
+@import "../../fields/src/fields/featured-image/style.scss";
 
 @import "./components/add-new-template/style.scss";
 @import "./components/block-editor/style.scss";
 @import "./components/canvas-loader/style.scss";
-@import "./components/code-editor/style.scss";
 @import "./components/global-styles/style.scss";
 @import "./components/global-styles/screen-revisions/style.scss";
-@import "./components/header-edit-mode/style.scss";
-@import "./components/list/style.scss";
+@import "./components/global-styles-sidebar/style.scss";
 @import "./components/page/style.scss";
-@import "./components/page-pages/style.scss";
 @import "./components/page-patterns/style.scss";
 @import "./components/page-templates/style.scss";
-@import "./components/table/style.scss";
-@import "./components/sidebar-edit-mode/style.scss";
-@import "./components/sidebar-edit-mode/page-panels/style.scss";
-@import "./components/sidebar-edit-mode/settings-header/style.scss";
-@import "./components/sidebar-edit-mode/sidebar-card/style.scss";
-@import "./components/sidebar-edit-mode/template-panel/style.scss";
 @import "./components/editor/style.scss";
-@import "./components/create-template-part-modal/style.scss";
-@import "./components/secondary-sidebar/style.scss";
 @import "./components/welcome-guide/style.scss";
-@import "./components/start-template-options/style.scss";
-@import "./components/keyboard-shortcut-help-modal/style.scss";
 @import "./components/layout/style.scss";
 @import "./components/save-hub/style.scss";
 @import "./components/save-panel/style.scss";
@@ -34,20 +22,35 @@
 @import "./components/sidebar-navigation-screen/style.scss";
 @import "./components/sidebar-navigation-screen-details-footer/style.scss";
 @import "./components/sidebar-navigation-screen-navigation-menu/style.scss";
-@import "./components/sidebar-navigation-screen-page/style.scss";
 @import "components/sidebar-navigation-screen-details-panel/style.scss";
-@import "./components/sidebar-navigation-screen-pattern/style.scss";
 @import "./components/sidebar-navigation-screen-patterns/style.scss";
-@import "./components/sidebar-navigation-screen-template/style.scss";
 @import "./components/sidebar-dataviews/style.scss";
 @import "./components/site-hub/style.scss";
 @import "./components/sidebar-navigation-screen-navigation-menus/style.scss";
 @import "./components/site-icon/style.scss";
 @import "./components/style-book/style.scss";
 @import "./components/editor-canvas-container/style.scss";
+@import "./components/post-edit/style.scss";
+@import "./components/post-list/style.scss";
+@import "./components/post-fields/style.scss";
 @import "./components/resizable-frame/style.scss";
 @import "./hooks/push-changes-to-global-styles/style.scss";
 @import "./components/global-styles/font-library-modal/style.scss";
+@import "./components/pagination/style.scss";
+@import "./components/global-styles/variations/style.scss";
+
+/* stylelint-disable -- Disable reason: View Transitions not supported properly by stylelint. */
+::view-transition-image-pair(root) {
+	isolation: auto;
+}
+
+::view-transition-old(root),
+::view-transition-new(root) {
+	animation: none;
+	mix-blend-mode: normal;
+	display: block;
+}
+/* stylelint-enable */
 
 body.js #wpadminbar {
 	display: none;
@@ -66,13 +69,8 @@ body.js.site-editor-php {
 	background: $gray-900;
 }
 
-.edit-site,
-// The modals are shown outside the .edit-site wrapper, they need these styles.
-.components-modal__frame {
-	@include reset;
-}
-
 .edit-site {
+	@include reset;
 	height: 100vh;
 
 	// On mobile the main content area has to scroll, otherwise you can invoke
@@ -94,32 +92,6 @@ body.js.site-editor-php {
 	.interface-interface-skeleton {
 		top: 0;
 	}
-
-	// Todo: Remove this rule when edit site gets support
-	// for opening unpinned sidebar items.
-	.interface-complementary-area__pin-unpin-item.components-button {
-		display: none;
-	}
-
-	.interface-interface-skeleton__content {
-		background-color: $gray-900;
-	}
-}
-
-/**
- * Animations
- */
-
-// These keyframes should not be part of the _animations.scss mixins file.
-// Because keyframe animations can't be defined as mixins properly, they are duplicated.
-// Since they are intended only for the editor, we add them here instead.
-@keyframes edit-post__fade-in-animation {
-	from {
-		opacity: 0;
-	}
-	to {
-		opacity: 1;
-	}
 }
 
 @include wordpress-admin-schemes();
diff --git a/packages/edit-site/src/utils/constants.js b/packages/edit-site/src/utils/constants.js
index f5ca89b9fb62cd..657fc8f34d2f48 100644
--- a/packages/edit-site/src/utils/constants.js
+++ b/packages/edit-site/src/utils/constants.js
@@ -21,6 +21,7 @@ export const TEMPLATE_ORIGINS = {
 	plugin: 'plugin',
 };
 export const TEMPLATE_PART_AREA_DEFAULT_CATEGORY = 'uncategorized';
+export const TEMPLATE_PART_ALL_AREAS_CATEGORY = 'all-parts';
 
 // Patterns.
 export const {
@@ -49,6 +50,8 @@ export const POST_TYPE_LABELS = {
 export const LAYOUT_GRID = 'grid';
 export const LAYOUT_TABLE = 'table';
 export const LAYOUT_LIST = 'list';
-export const ENUMERATION_TYPE = 'enumeration';
-export const OPERATOR_IN = 'in';
-export const OPERATOR_NOT_IN = 'notIn';
+
+export const OPERATOR_IS = 'is';
+export const OPERATOR_IS_NOT = 'isNot';
+export const OPERATOR_IS_ANY = 'isAny';
+export const OPERATOR_IS_NONE = 'isNone';
diff --git a/packages/edit-site/src/utils/get-filtered-template-parts.js b/packages/edit-site/src/utils/get-filtered-template-parts.js
new file mode 100644
index 00000000000000..bba982c0717a71
--- /dev/null
+++ b/packages/edit-site/src/utils/get-filtered-template-parts.js
@@ -0,0 +1,61 @@
+/**
+ * WordPress dependencies
+ */
+import { isTemplatePart } from '@wordpress/blocks';
+
+const EMPTY_ARRAY = [];
+
+/**
+ * Get a flattened and filtered list of template parts and the matching block for that template part.
+ *
+ * Takes a list of blocks defined within a template, and a list of template parts, and returns a
+ * flattened list of template parts and the matching block for that template part.
+ *
+ * @param {Array}  blocks        Blocks to flatten.
+ * @param {?Array} templateParts Available template parts.
+ * @return {Array} An array of template parts and their blocks.
+ */
+export default function getFilteredTemplatePartBlocks(
+	blocks = EMPTY_ARRAY,
+	templateParts
+) {
+	const templatePartsById = templateParts
+		? // Key template parts by their ID.
+		  templateParts.reduce(
+				( newTemplateParts, part ) => ( {
+					...newTemplateParts,
+					[ part.id ]: part,
+				} ),
+				{}
+		  )
+		: {};
+
+	const result = [];
+
+	// Iterate over all blocks, recursing into inner blocks.
+	// Output will be based on a depth-first traversal.
+	const stack = [ ...blocks ];
+	while ( stack.length ) {
+		const { innerBlocks, ...block } = stack.shift();
+		// Place inner blocks at the beginning of the stack to preserve order.
+		stack.unshift( ...innerBlocks );
+
+		if ( isTemplatePart( block ) ) {
+			const {
+				attributes: { theme, slug },
+			} = block;
+			const templatePartId = `${ theme }//${ slug }`;
+			const templatePart = templatePartsById[ templatePartId ];
+
+			// Only add to output if the found template part block is in the list of available template parts.
+			if ( templatePart ) {
+				result.push( {
+					templatePart,
+					block,
+				} );
+			}
+		}
+	}
+
+	return result;
+}
diff --git a/packages/edit-site/src/utils/get-is-list-page.js b/packages/edit-site/src/utils/get-is-list-page.js
deleted file mode 100644
index 2ee661253cf063..00000000000000
--- a/packages/edit-site/src/utils/get-is-list-page.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Returns if the params match the list page route.
- *
- * @param {Object}  params                The url params.
- * @param {string}  params.path           The current path.
- * @param {string}  [params.categoryType] The current category type.
- * @param {string}  [params.categoryId]   The current category id.
- * @param {boolean} isMobileViewport      Is mobile viewport.
- *
- * @return {boolean} Is list page or not.
- */
-export default function getIsListPage(
-	{ path, categoryType, categoryId },
-	isMobileViewport
-) {
-	return (
-		[ '/wp_template/all', '/wp_template_part/all', '/pages' ].includes(
-			path
-		) ||
-		( path === '/patterns' &&
-			// Don't treat "/patterns" without categoryType and categoryId as a
-			// list page in mobile because the sidebar covers the whole page.
-			( ! isMobileViewport || ( !! categoryType && !! categoryId ) ) )
-	);
-}
diff --git a/packages/edit-site/src/utils/is-template-removable.js b/packages/edit-site/src/utils/is-template-removable.js
index 9cb1de23daab75..f81cb74b022e73 100644
--- a/packages/edit-site/src/utils/is-template-removable.js
+++ b/packages/edit-site/src/utils/is-template-removable.js
@@ -7,7 +7,7 @@ import { TEMPLATE_ORIGINS } from './constants';
  * Check if a template is removable.
  *
  * @param {Object} template The template entity to check.
- * @return {boolean} Whether the template is revertable.
+ * @return {boolean} Whether the template is removable.
  */
 export default function isTemplateRemovable( template ) {
 	if ( ! template ) {
@@ -15,6 +15,8 @@ export default function isTemplateRemovable( template ) {
 	}
 
 	return (
-		template.source === TEMPLATE_ORIGINS.custom && ! template.has_theme_file
+		template.source === TEMPLATE_ORIGINS.custom &&
+		! Boolean( template.plugin ) &&
+		! template.has_theme_file
 	);
 }
diff --git a/packages/edit-site/src/utils/is-template-revertable.js b/packages/edit-site/src/utils/is-template-revertable.js
index a6274d07ebebb6..42413b06cd48ec 100644
--- a/packages/edit-site/src/utils/is-template-revertable.js
+++ b/packages/edit-site/src/utils/is-template-revertable.js
@@ -15,7 +15,8 @@ export default function isTemplateRevertable( template ) {
 	}
 	/* eslint-disable camelcase */
 	return (
-		template?.source === TEMPLATE_ORIGINS.custom && template?.has_theme_file
+		template?.source === TEMPLATE_ORIGINS.custom &&
+		( Boolean( template?.plugin ) || template?.has_theme_file )
 	);
 	/* eslint-enable camelcase */
 }
diff --git a/packages/edit-site/src/utils/set-nested-value.js b/packages/edit-site/src/utils/set-nested-value.js
new file mode 100644
index 00000000000000..ec684e751cd041
--- /dev/null
+++ b/packages/edit-site/src/utils/set-nested-value.js
@@ -0,0 +1,39 @@
+/**
+ * Sets the value at path of object.
+ * If a portion of path doesn’t exist, it’s created.
+ * Arrays are created for missing index properties while objects are created
+ * for all other missing properties.
+ *
+ * This function intentionally mutates the input object.
+ *
+ * Inspired by _.set().
+ *
+ * @see https://lodash.com/docs/4.17.15#set
+ *
+ * @todo Needs to be deduplicated with its copy in `@wordpress/core-data`.
+ *
+ * @param {Object} object Object to modify
+ * @param {Array}  path   Path of the property to set.
+ * @param {*}      value  Value to set.
+ */
+export default function setNestedValue( object, path, value ) {
+	if ( ! object || typeof object !== 'object' ) {
+		return object;
+	}
+
+	path.reduce( ( acc, key, idx ) => {
+		if ( acc[ key ] === undefined ) {
+			if ( Number.isInteger( path[ idx + 1 ] ) ) {
+				acc[ key ] = [];
+			} else {
+				acc[ key ] = {};
+			}
+		}
+		if ( idx === path.length - 1 ) {
+			acc[ key ] = value;
+		}
+		return acc[ key ];
+	}, object );
+
+	return object;
+}
diff --git a/packages/edit-site/src/utils/template-part-create.js b/packages/edit-site/src/utils/template-part-create.js
index 955519a91a2344..e69de29bb2d1d6 100644
--- a/packages/edit-site/src/utils/template-part-create.js
+++ b/packages/edit-site/src/utils/template-part-create.js
@@ -1,67 +0,0 @@
-/**
- * External dependencies
- */
-import { paramCase as kebabCase } from 'change-case';
-
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { TEMPLATE_PART_POST_TYPE } from './constants';
-
-export const useExistingTemplateParts = () => {
-	return useSelect(
-		( select ) =>
-			select( coreStore ).getEntityRecords(
-				'postType',
-				TEMPLATE_PART_POST_TYPE,
-				{
-					per_page: -1,
-				}
-			),
-		[]
-	);
-};
-
-/**
- * Return a unique template part title based on
- * the given title and existing template parts.
- *
- * @param {string} title         The original template part title.
- * @param {Object} templateParts The array of template part entities.
- * @return {string} A unique template part title.
- */
-export const getUniqueTemplatePartTitle = ( title, templateParts ) => {
-	const lowercaseTitle = title.toLowerCase();
-	const existingTitles = templateParts.map( ( templatePart ) =>
-		templatePart.title.rendered.toLowerCase()
-	);
-
-	if ( ! existingTitles.includes( lowercaseTitle ) ) {
-		return title;
-	}
-
-	let suffix = 2;
-	while ( existingTitles.includes( `${ lowercaseTitle } ${ suffix }` ) ) {
-		suffix++;
-	}
-
-	return `${ title } ${ suffix }`;
-};
-
-/**
- * Get a valid slug for a template part.
- * Currently template parts only allow latin chars.
- * The fallback slug will receive suffix by default.
- *
- * @param {string} title The template part title.
- * @return {string} A valid template part slug.
- */
-export const getCleanTemplatePartSlug = ( title ) => {
-	return kebabCase( title ).replace( /[^\w-]+/g, '' ) || 'wp-custom-part';
-};
diff --git a/packages/edit-site/src/utils/test/get-filtered-template-parts.js b/packages/edit-site/src/utils/test/get-filtered-template-parts.js
new file mode 100644
index 00000000000000..0d5c2836330213
--- /dev/null
+++ b/packages/edit-site/src/utils/test/get-filtered-template-parts.js
@@ -0,0 +1,127 @@
+/**
+ * Internal dependencies
+ */
+import getFilteredTemplatePartBlocks from '../get-filtered-template-parts';
+
+const NESTED_BLOCKS = [
+	{
+		clientId: '1',
+		name: 'core/group',
+		innerBlocks: [
+			{
+				clientId: '2',
+				name: 'core/template-part',
+				attributes: {
+					slug: 'header',
+					theme: 'my-theme',
+				},
+				innerBlocks: [
+					{
+						clientId: '3',
+						name: 'core/group',
+						innerBlocks: [],
+					},
+				],
+			},
+			{
+				clientId: '4',
+				name: 'core/template-part',
+				attributes: {
+					slug: 'aside',
+					theme: 'my-theme',
+				},
+				innerBlocks: [],
+			},
+		],
+	},
+	{
+		clientId: '5',
+		name: 'core/paragraph',
+		innerBlocks: [],
+	},
+	{
+		clientId: '6',
+		name: 'core/template-part',
+		attributes: {
+			slug: 'footer',
+			theme: 'my-theme',
+		},
+		innerBlocks: [],
+	},
+];
+
+const FLATTENED_BLOCKS = [
+	{
+		block: {
+			clientId: '2',
+			name: 'core/template-part',
+			attributes: {
+				slug: 'header',
+				theme: 'my-theme',
+			},
+		},
+		templatePart: {
+			id: 'my-theme//header',
+			slug: 'header',
+			theme: 'my-theme',
+		},
+	},
+	{
+		block: {
+			clientId: '4',
+			name: 'core/template-part',
+			attributes: {
+				slug: 'aside',
+				theme: 'my-theme',
+			},
+		},
+		templatePart: {
+			id: 'my-theme//aside',
+			slug: 'aside',
+			theme: 'my-theme',
+		},
+	},
+	{
+		block: {
+			clientId: '6',
+			name: 'core/template-part',
+			attributes: {
+				slug: 'footer',
+				theme: 'my-theme',
+			},
+		},
+		templatePart: {
+			id: 'my-theme//footer',
+			slug: 'footer',
+			theme: 'my-theme',
+		},
+	},
+];
+
+const TEMPLATE_PARTS = [
+	{
+		id: 'my-theme//header',
+		slug: 'header',
+		theme: 'my-theme',
+	},
+	{
+		id: 'my-theme//aside',
+		slug: 'aside',
+		theme: 'my-theme',
+	},
+	{
+		id: 'my-theme//footer',
+		slug: 'footer',
+		theme: 'my-theme',
+	},
+];
+
+describe( 'getFilteredTemplatePartBlocks', () => {
+	it( 'returns a flattened list of filtered template parts preserving a depth-first order', () => {
+		const flattenedFilteredTemplateParts = getFilteredTemplatePartBlocks(
+			NESTED_BLOCKS,
+			TEMPLATE_PARTS
+		);
+		expect( flattenedFilteredTemplateParts ).toEqual( FLATTENED_BLOCKS );
+	} );
+} );
diff --git a/packages/edit-site/src/utils/test/template-part-create.js b/packages/edit-site/src/utils/test/template-part-create.js
deleted file mode 100644
index e39513ccf7e4f4..00000000000000
--- a/packages/edit-site/src/utils/test/template-part-create.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Internal dependencies
- */
-import {
-	getUniqueTemplatePartTitle,
-	getCleanTemplatePartSlug,
-} from '../template-part-create';
-
-describe( 'getUniqueTemplatePartTitle', () => {
-	it( 'should return the title if it is unique', () => {
-		const title = 'My Template Part';
-		const templateParts = [
-			{
-				title: {
-					rendered: 'Template Part With Another Title',
-				},
-			},
-		];
-
-		expect( getUniqueTemplatePartTitle( title, templateParts ) ).toBe(
-			title
-		);
-	} );
-
-	it( 'should return the title with a suffix if it is not unique', () => {
-		const title = 'My Template Part';
-		const templateParts = [
-			{
-				title: {
-					rendered: 'My Template Part',
-				},
-			},
-			{
-				title: {
-					rendered: 'My Template Part 2',
-				},
-			},
-		];
-
-		expect( getUniqueTemplatePartTitle( title, templateParts ) ).toBe(
-			'My Template Part 3'
-		);
-	} );
-} );
-
-describe( 'getCleanTemplatePartSlug', () => {
-	it( 'should return a slug with only latin chars', () => {
-		const title = 'Myɶ Template Partɮ';
-		expect( getCleanTemplatePartSlug( title ) ).toBe( 'my-template-part' );
-	} );
-
-	it( 'should return a slug with only latin chars and numbers', () => {
-		const title = 'My Template Part 2';
-		expect( getCleanTemplatePartSlug( title ) ).toBe(
-			'my-template-part-2'
-		);
-	} );
-
-	it( 'should default the slug to wp-custom-part', () => {
-		const title = '';
-		expect( getCleanTemplatePartSlug( title ) ).toBe( 'wp-custom-part' );
-	} );
-} );
diff --git a/packages/edit-site/src/utils/use-activate-theme.js b/packages/edit-site/src/utils/use-activate-theme.js
index d201f630fd6dcb..0dafd88340ba75 100644
--- a/packages/edit-site/src/utils/use-activate-theme.js
+++ b/packages/edit-site/src/utils/use-activate-theme.js
@@ -14,7 +14,7 @@ import {
 	currentlyPreviewingTheme,
 } from './is-previewing-theme';
 
-const { useHistory, useLocation } = unlock( routerPrivateApis );
+const { useHistory } = unlock( routerPrivateApis );
 
 /**
  * This should be refactored to use the REST API, once the REST API can activate themes.
@@ -23,7 +23,6 @@ const { useHistory, useLocation } = unlock( routerPrivateApis );
  */
 export function useActivateTheme() {
 	const history = useHistory();
-	const location = useLocation();
 	const { startResolution, finishResolution } = useDispatch( coreStore );
 
 	return async () => {
@@ -36,9 +35,10 @@ export function useActivateTheme() {
 			startResolution( 'activateTheme' );
 			await window.fetch( activationURL );
 			finishResolution( 'activateTheme' );
-			const { wp_theme_preview: themePreview, ...params } =
-				location.params;
-			history.replace( params );
+			// Remove the wp_theme_preview query param: we've finished activating
+			// the queue and are switching to normal Site Editor.
+			const { params } = history.getLocationWithParams();
+			history.replace( { ...params, wp_theme_preview: undefined } );
 		}
 	};
 }
diff --git a/packages/edit-site/src/utils/use-actual-current-theme.js b/packages/edit-site/src/utils/use-actual-current-theme.js
new file mode 100644
index 00000000000000..6f8310c2f7de18
--- /dev/null
+++ b/packages/edit-site/src/utils/use-actual-current-theme.js
@@ -0,0 +1,27 @@
+/**
+ * WordPress dependencies
+ */
+import apiFetch from '@wordpress/api-fetch';
+import { useState, useEffect } from '@wordpress/element';
+import { addQueryArgs } from '@wordpress/url';
+
+const ACTIVE_THEMES_URL = '/wp/v2/themes?status=active';
+
+export function useActualCurrentTheme() {
+	const [ currentTheme, setCurrentTheme ] = useState();
+
+	useEffect( () => {
+		// Set the `wp_theme_preview` to empty string to bypass the createThemePreviewMiddleware.
+		const path = addQueryArgs( ACTIVE_THEMES_URL, {
+			context: 'edit',
+			wp_theme_preview: '',
+		} );
+
+		apiFetch( { path } )
+			.then( ( activeThemes ) => setCurrentTheme( activeThemes[ 0 ] ) )
+			// Do nothing
+			.catch( () => {} );
+	}, [] );
+
+	return currentTheme;
+}
diff --git a/packages/edit-widgets/.npmrc b/packages/edit-widgets/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/edit-widgets/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/edit-widgets/CHANGELOG.md b/packages/edit-widgets/CHANGELOG.md
index 885b7d5aa489b8..5b2fbd4d307416 100644
--- a/packages/edit-widgets/CHANGELOG.md
+++ b/packages/edit-widgets/CHANGELOG.md
@@ -2,6 +2,59 @@
 
 ## Unreleased
 
+## 6.10.0 (2024-10-16)
+
+## 6.9.0 (2024-10-03)
+
+## 6.8.0 (2024-09-19)
+
+## 6.7.0 (2024-09-05)
+
+## 6.6.0 (2024-08-21)
+
+## 6.5.0 (2024-08-07)
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 5.35.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 5.34.0 (2024-05-02)
+
+## 5.33.0 (2024-04-19)
+
+## 5.32.0 (2024-04-03)
+
+## 5.31.0 (2024-03-21)
+
+## 5.30.0 (2024-03-06)
+
+## 5.29.0 (2024-02-21)
+
+## 5.28.0 (2024-02-09)
+
+## 5.27.0 (2024-01-24)
+
+## 5.26.0 (2024-01-10)
+
+## 5.25.0 (2023-12-13)
+
 ## 5.24.0 (2023-11-29)
 
 ## 5.23.0 (2023-11-16)
@@ -96,11 +149,11 @@
 
 ## 4.0.0 (2022-02-10)
 
-### Breaking Change
+### Breaking Changes
 
 -   The `GUTENBERG_PHASE` environment variable has been renamed to `IS_GUTENBERG_PLUGIN` and is now a boolean ([#38202](https://github.com/WordPress/gutenberg/pull/38202)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/a11y`, `@wordpress/server-side-render`, `rememo` and `uuid` dependencies ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -108,13 +161,13 @@
 
 ## 3.1.0 (2021-11-07)
 
-### Enhancement
+### Enhancements
 
 -   Enable persistent List View in the widget editor [#35706](https://github.com/WordPress/gutenberg/pull/35706).
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -126,8 +179,8 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 
 ## 1.3.0 (2021-03-17)
 
diff --git a/packages/edit-widgets/package.json b/packages/edit-widgets/package.json
index eb318c962c1c3f..1b412c5adb78c3 100644
--- a/packages/edit-widgets/package.json
+++ b/packages/edit-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-widgets",
-	"version": "5.24.0",
+	"version": "6.10.0",
 	"description": "Widgets Page module for WordPress..",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,40 +20,42 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/block-library": "file:../block-library",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/element": "file:../element",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/interface": "file:../interface",
-		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/media-utils": "file:../media-utils",
-		"@wordpress/notices": "file:../notices",
-		"@wordpress/patterns": "file:../patterns",
-		"@wordpress/plugins": "file:../plugins",
-		"@wordpress/preferences": "file:../preferences",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/reusable-blocks": "file:../reusable-blocks",
-		"@wordpress/url": "file:../url",
-		"@wordpress/widgets": "file:../widgets",
-		"classnames": "^2.3.1"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/block-library": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/editor": "*",
+		"@wordpress/element": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/interface": "*",
+		"@wordpress/keyboard-shortcuts": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/media-utils": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/patterns": "*",
+		"@wordpress/plugins": "*",
+		"@wordpress/preferences": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/reusable-blocks": "*",
+		"@wordpress/url": "*",
+		"@wordpress/widgets": "*",
+		"clsx": "^2.1.1"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -61,5 +63,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/edit-widgets/src/blocks/widget-area/block.json b/packages/edit-widgets/src/blocks/widget-area/block.json
index 448bf1e8e7357c..fd5e4fc0d777a9 100644
--- a/packages/edit-widgets/src/blocks/widget-area/block.json
+++ b/packages/edit-widgets/src/blocks/widget-area/block.json
@@ -1,5 +1,7 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"name": "core/widget-area",
+	"title": "Widget Area",
 	"category": "widgets",
 	"attributes": {
 		"id": {
diff --git a/packages/edit-widgets/src/blocks/widget-area/edit/inner-blocks.js b/packages/edit-widgets/src/blocks/widget-area/edit/inner-blocks.js
index be76548fe6eabd..6de76d2bb068e2 100644
--- a/packages/edit-widgets/src/blocks/widget-area/edit/inner-blocks.js
+++ b/packages/edit-widgets/src/blocks/widget-area/edit/inner-blocks.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -38,7 +38,7 @@ export default function WidgetAreaInnerBlocks( { id } ) {
 	return (
 		<div
 			data-widget-area-id={ id }
-			className={ classnames(
+			className={ clsx(
 				'wp-block-widget-area__inner-blocks block-editor-inner-blocks editor-styles-wrapper',
 				{
 					'wp-block-widget-area__highlight-drop-zone':
diff --git a/packages/edit-widgets/src/components/error-boundary/index.js b/packages/edit-widgets/src/components/error-boundary/index.js
index 5bb7a44fea4135..ff12bfe5fdf478 100644
--- a/packages/edit-widgets/src/components/error-boundary/index.js
+++ b/packages/edit-widgets/src/components/error-boundary/index.js
@@ -11,7 +11,7 @@ import { doAction } from '@wordpress/hooks';
 function CopyButton( { text, children } ) {
 	const ref = useCopyToClipboard( text );
 	return (
-		<Button variant="secondary" ref={ ref }>
+		<Button __next40pxDefaultSize variant="secondary" ref={ ref }>
 			{ children }
 		</Button>
 	);
diff --git a/packages/edit-widgets/src/components/error-boundary/style.scss b/packages/edit-widgets/src/components/error-boundary/style.scss
index c1605b42a5ea86..b909b79dc1d304 100644
--- a/packages/edit-widgets/src/components/error-boundary/style.scss
+++ b/packages/edit-widgets/src/components/error-boundary/style.scss
@@ -3,5 +3,5 @@
 	max-width: 780px;
 	padding: 20px;
 	margin-top: 60px;
-	box-shadow: $shadow-modal;
+	box-shadow: $elevation-large;
 }
diff --git a/packages/edit-widgets/src/components/error-boundary/test/error-boundary.js b/packages/edit-widgets/src/components/error-boundary/test/error-boundary.js
new file mode 100644
index 00000000000000..27ec4c80419676
--- /dev/null
+++ b/packages/edit-widgets/src/components/error-boundary/test/error-boundary.js
@@ -0,0 +1,40 @@
+/**
+ * External dependencies
+ */
+import { render } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import * as wpHooks from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import ErrorBoundary from '../index';
+
+const theError = new Error( 'Kaboom' );
+
+const ChildComponent = () => {
+	throw theError;
+};
+
+describe( 'Error Boundary', () => {
+	describe( 'when error is thrown from a Child component', () => {
+		it( 'calls the `editor.ErrorBoundary.errorLogged` hook action with the error object', () => {
+			const doAction = jest.spyOn( wpHooks, 'doAction' );
+
+			render(
+				<ErrorBoundary>
+					<ChildComponent />
+				</ErrorBoundary>
+			);
+
+			expect( doAction ).toHaveBeenCalledWith(
+				'editor.ErrorBoundary.errorLogged',
+				theError
+			);
+			expect( console ).toHaveErrored();
+		} );
+	} );
+} );
diff --git a/packages/edit-widgets/src/components/header/document-tools/index.js b/packages/edit-widgets/src/components/header/document-tools/index.js
index 8cac7590be5e88..567a5e1240747e 100644
--- a/packages/edit-widgets/src/components/header/document-tools/index.js
+++ b/packages/edit-widgets/src/components/header/document-tools/index.js
@@ -4,13 +4,9 @@
 import { useSelect, useDispatch } from '@wordpress/data';
 import { __, _x } from '@wordpress/i18n';
 import { Button, ToolbarItem } from '@wordpress/components';
-import {
-	NavigableToolbar,
-	store as blockEditorStore,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
+import { NavigableToolbar } from '@wordpress/block-editor';
 import { listView, plus } from '@wordpress/icons';
-import { useCallback, useRef } from '@wordpress/element';
+import { useCallback } from '@wordpress/element';
 import { useViewportMatch } from '@wordpress/compose';
 
 /**
@@ -18,79 +14,52 @@ import { useViewportMatch } from '@wordpress/compose';
  */
 import UndoButton from '../undo-redo/undo';
 import RedoButton from '../undo-redo/redo';
-import useLastSelectedWidgetArea from '../../../hooks/use-last-selected-widget-area';
 import { store as editWidgetsStore } from '../../../store';
 import { unlock } from '../../../lock-unlock';
 
-const { useShouldContextualToolbarShow } = unlock( blockEditorPrivateApis );
-
-function DocumentTools( { setListViewToggleElement } ) {
+function DocumentTools() {
 	const isMediumViewport = useViewportMatch( 'medium' );
-	const inserterButton = useRef();
-	const widgetAreaClientId = useLastSelectedWidgetArea();
-	const isLastSelectedWidgetAreaOpen = useSelect(
-		( select ) =>
-			select( editWidgetsStore ).getIsWidgetAreaOpen(
-				widgetAreaClientId
-			),
-		[ widgetAreaClientId ]
-	);
-	const { isInserterOpen, isListViewOpen } = useSelect( ( select ) => {
-		const { isInserterOpened, isListViewOpened } =
-			select( editWidgetsStore );
+
+	const {
+		isInserterOpen,
+		isListViewOpen,
+		inserterSidebarToggleRef,
+		listViewToggleRef,
+	} = useSelect( ( select ) => {
+		const {
+			isInserterOpened,
+			getInserterSidebarToggleRef,
+			isListViewOpened,
+			getListViewToggleRef,
+		} = unlock( select( editWidgetsStore ) );
 		return {
 			isInserterOpen: isInserterOpened(),
 			isListViewOpen: isListViewOpened(),
+			inserterSidebarToggleRef: getInserterSidebarToggleRef(),
+			listViewToggleRef: getListViewToggleRef(),
 		};
 	}, [] );
-	const { setIsWidgetAreaOpen, setIsInserterOpened, setIsListViewOpened } =
+	const { setIsInserterOpened, setIsListViewOpened } =
 		useDispatch( editWidgetsStore );
-	const { selectBlock } = useDispatch( blockEditorStore );
-	const handleClick = () => {
-		if ( isInserterOpen ) {
-			// Focusing the inserter button closes the inserter popover.
-			setIsInserterOpened( false );
-		} else {
-			if ( ! isLastSelectedWidgetAreaOpen ) {
-				// Select the last selected block if hasn't already.
-				selectBlock( widgetAreaClientId );
-				// Open the last selected widget area when opening the inserter.
-				setIsWidgetAreaOpen( widgetAreaClientId, true );
-			}
-			// The DOM updates resulting from selectBlock() and setIsInserterOpened() calls are applied the
-			// same tick and pretty much in a random order. The inserter is closed if any other part of the
-			// app receives focus. If selectBlock() happens to take effect after setIsInserterOpened() then
-			// the inserter is visible for a brief moment and then gets auto-closed due to focus moving to
-			// the selected block.
-			window.requestAnimationFrame( () => setIsInserterOpened( true ) );
-		}
-	};
 
 	const toggleListView = useCallback(
 		() => setIsListViewOpened( ! isListViewOpen ),
 		[ setIsListViewOpened, isListViewOpen ]
 	);
 
-	const {
-		shouldShowContextualToolbar,
-		canFocusHiddenToolbar,
-		fixedToolbarCanBeFocused,
-	} = useShouldContextualToolbarShow();
-	// If there's a block toolbar to be focused, disable the focus shortcut for the document toolbar.
-	// There's a fixed block toolbar when the fixed toolbar option is enabled or when the browser width is less than the large viewport.
-	const blockToolbarCanBeFocused =
-		shouldShowContextualToolbar ||
-		canFocusHiddenToolbar ||
-		fixedToolbarCanBeFocused;
+	const toggleInserterSidebar = useCallback(
+		() => setIsInserterOpened( ! isInserterOpen ),
+		[ setIsInserterOpened, isInserterOpen ]
+	);
 
 	return (
 		<NavigableToolbar
 			className="edit-widgets-header-toolbar"
 			aria-label={ __( 'Document tools' ) }
-			shouldUseKeyboardFocusShortcut={ ! blockToolbarCanBeFocused }
+			variant="unstyled"
 		>
 			<ToolbarItem
-				ref={ inserterButton }
+				ref={ inserterSidebarToggleRef }
 				as={ Button }
 				className="edit-widgets-header-toolbar__inserter-toggle"
 				variant="primary"
@@ -98,19 +67,20 @@ function DocumentTools( { setListViewToggleElement } ) {
 				onMouseDown={ ( event ) => {
 					event.preventDefault();
 				} }
-				onClick={ handleClick }
+				onClick={ toggleInserterSidebar }
 				icon={ plus }
 				/* translators: button label text should, if possible, be under 16
 					characters. */
 				label={ _x(
-					'Toggle block inserter',
+					'Block Inserter',
 					'Generic label for block inserter button'
 				) }
+				size="compact"
 			/>
 			{ isMediumViewport && (
 				<>
-					<UndoButton />
-					<RedoButton />
+					<ToolbarItem as={ UndoButton } />
+					<ToolbarItem as={ RedoButton } />
 					<ToolbarItem
 						as={ Button }
 						className="edit-widgets-header-toolbar__list-view-toggle"
@@ -119,7 +89,8 @@ function DocumentTools( { setListViewToggleElement } ) {
 						/* translators: button label text should, if possible, be under 16 characters. */
 						label={ __( 'List View' ) }
 						onClick={ toggleListView }
-						ref={ setListViewToggleElement }
+						ref={ listViewToggleRef }
+						size="compact"
 					/>
 				</>
 			) }
diff --git a/packages/edit-widgets/src/components/header/index.js b/packages/edit-widgets/src/components/header/index.js
index 9251f528ca5ee4..80dda479d59ed6 100644
--- a/packages/edit-widgets/src/components/header/index.js
+++ b/packages/edit-widgets/src/components/header/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { BlockToolbar } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
 import { useRef } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
@@ -16,11 +16,8 @@ import { store as preferencesStore } from '@wordpress/preferences';
 import DocumentTools from './document-tools';
 import SaveButton from '../save-button';
 import MoreMenu from '../more-menu';
-import { unlock } from '../../lock-unlock';
 
-const { BlockContextualToolbar } = unlock( blockEditorPrivateApis );
-
-function Header( { setListViewToggleElement } ) {
+function Header() {
 	const isLargeViewport = useViewportMatch( 'medium' );
 	const blockToolbarRef = useRef();
 	const { hasFixedToolbar } = useSelect(
@@ -50,13 +47,11 @@ function Header( { setListViewToggleElement } ) {
 							{ __( 'Widgets' ) }
 						</VisuallyHidden>
 					) }
-					<DocumentTools
-						setListViewToggleElement={ setListViewToggleElement }
-					/>
+					<DocumentTools />
 					{ hasFixedToolbar && isLargeViewport && (
 						<>
 							<div className="selected-block-tools-wrapper">
-								<BlockContextualToolbar isFixed />
+								<BlockToolbar hideDragHandle />
 							</div>
 							<Popover.Slot
 								ref={ blockToolbarRef }
@@ -66,8 +61,8 @@ function Header( { setListViewToggleElement } ) {
 					) }
 				</div>
 				<div className="edit-widgets-header__actions">
-					<SaveButton />
 					<PinnedItems.Slot scope="core/edit-widgets" />
+					<SaveButton />
 					<MoreMenu />
 				</div>
 			</div>
diff --git a/packages/edit-widgets/src/components/header/style.scss b/packages/edit-widgets/src/components/header/style.scss
index e279b0f79b4585..7bd3c41a6a22ad 100644
--- a/packages/edit-widgets/src/components/header/style.scss
+++ b/packages/edit-widgets/src/components/header/style.scss
@@ -11,11 +11,66 @@
 	}
 
 	.selected-block-tools-wrapper {
-		overflow-x: hidden;
-	}
+		overflow: hidden;
+		display: flex;
+		align-items: center;
+		height: $header-height;
+
+		.block-editor-block-contextual-toolbar {
+			border-bottom: 0;
+			height: 100%;
+		}
+
+		// These rules ensure that icons are always positioned in a way that lines up with the rest of the icons in the toolbar.
+		.block-editor-block-toolbar {
+			height: 100%;
+			// Push down so that buttons are centered vertically.
+			// It should be 14px (60px header height - 32px compact button height = 28 / 2),
+			// but there is a -1px top-margin down the stack that affects this.
+			padding-top: math.div($header-height - $button-size-compact, 2) + 1;
+
+			// Match the height of other buttons in the header toolbar.
+			.components-button:not(.block-editor-block-mover-button) {
+				height: $button-size-compact;
+			}
+		}
 
-	.block-editor-block-contextual-toolbar.is-fixed {
-		border: none;
+		// Modified group borders.
+		.components-toolbar-group,
+		.components-toolbar {
+			border-right: none;
+
+			&::after {
+				content: "";
+				width: $border-width;
+				height: $grid-unit-30;
+				background-color: $gray-300;
+				margin-top: $grid-unit-05;
+				margin-left: $grid-unit;
+			}
+
+			& .components-toolbar-group.components-toolbar-group {
+				&::after {
+					display: none;
+				}
+			}
+		}
+
+		.block-editor-block-mover {
+			// Match the height of other buttons in the header toolbar.
+			&.is-horizontal .block-editor-block-mover-button {
+				height: $button-size-compact;
+				overflow: visible;
+			}
+
+			// Move up a little to prevent the toolbar shift when focus is on the vertical movers.
+			@include break-small() {
+				&:not(.is-horizontal) .block-editor-block-mover__move-button-container {
+					position: relative;
+					top: -10px;
+				}
+			}
+		}
 	}
 }
 
@@ -24,8 +79,10 @@
 	align-items: center;
 	justify-content: center;
 	flex-shrink: 2;
-	overflow-x: hidden;
+	padding-right: $grid-unit-10;
 	padding-left: $grid-unit-20;
+	overflow: hidden;
+	height: $header-height;
 }
 
 .edit-widgets-header__title {
@@ -46,16 +103,19 @@
 }
 
 .edit-widgets-header-toolbar {
-	border: none;
+	gap: $grid-unit-10;
+	// Some plugins add buttons here despite best practices.
+	// Push them a bit rightwards to fit the top toolbar.
+	margin-right: $grid-unit-10;
 
 	// The Toolbar component adds different styles to buttons, so we reset them
 	// here to the original button styles
 	// Specificity bump needed to offset https://github.com/WordPress/gutenberg/blob/8ea29cb04412c80c9adf7c1db0e816d6a0ac1232/packages/components/src/toolbar/style.scss#L76
 	> .components-button.has-icon.has-icon.has-icon,
 	> .components-dropdown > .components-button.has-icon.has-icon {
-		height: $button-size;
-		min-width: $button-size;
-		padding: 6px;
+		height: $button-size-compact;
+		min-width: $button-size-compact;
+		padding: 4px;
 
 		&.is-pressed {
 			background: $gray-900;
diff --git a/packages/edit-widgets/src/components/header/undo-redo/redo.js b/packages/edit-widgets/src/components/header/undo-redo/redo.js
index c4f4e6df37b915..44760ab8930d77 100644
--- a/packages/edit-widgets/src/components/header/undo-redo/redo.js
+++ b/packages/edit-widgets/src/components/header/undo-redo/redo.js
@@ -2,13 +2,14 @@
  * WordPress dependencies
  */
 import { __, isRTL } from '@wordpress/i18n';
-import { ToolbarButton } from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { redo as redoIcon, undo as undoIcon } from '@wordpress/icons';
 import { displayShortcut, isAppleOS } from '@wordpress/keycodes';
 import { store as coreStore } from '@wordpress/core-data';
+import { forwardRef } from '@wordpress/element';
 
-export default function RedoButton() {
+function RedoButton( props, ref ) {
 	const shortcut = isAppleOS()
 		? displayShortcut.primaryShift( 'z' )
 		: displayShortcut.primary( 'y' );
@@ -19,7 +20,9 @@ export default function RedoButton() {
 	);
 	const { redo } = useDispatch( coreStore );
 	return (
-		<ToolbarButton
+		<Button
+			{ ...props }
+			ref={ ref }
 			icon={ ! isRTL() ? redoIcon : undoIcon }
 			label={ __( 'Redo' ) }
 			shortcut={ shortcut }
@@ -28,6 +31,9 @@ export default function RedoButton() {
 			// See: https://github.com/WordPress/gutenberg/issues/3486
 			aria-disabled={ ! hasRedo }
 			onClick={ hasRedo ? redo : undefined }
+			size="compact"
 		/>
 	);
 }
+
+export default forwardRef( RedoButton );
diff --git a/packages/edit-widgets/src/components/header/undo-redo/undo.js b/packages/edit-widgets/src/components/header/undo-redo/undo.js
index 827ed1a415d74b..085f2842f1e098 100644
--- a/packages/edit-widgets/src/components/header/undo-redo/undo.js
+++ b/packages/edit-widgets/src/components/header/undo-redo/undo.js
@@ -2,20 +2,23 @@
  * WordPress dependencies
  */
 import { __, isRTL } from '@wordpress/i18n';
-import { ToolbarButton } from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { undo as undoIcon, redo as redoIcon } from '@wordpress/icons';
 import { displayShortcut } from '@wordpress/keycodes';
 import { store as coreStore } from '@wordpress/core-data';
+import { forwardRef } from '@wordpress/element';
 
-export default function UndoButton() {
+function UndoButton( props, ref ) {
 	const hasUndo = useSelect(
 		( select ) => select( coreStore ).hasUndo(),
 		[]
 	);
 	const { undo } = useDispatch( coreStore );
 	return (
-		<ToolbarButton
+		<Button
+			{ ...props }
+			ref={ ref }
 			icon={ ! isRTL() ? undoIcon : redoIcon }
 			label={ __( 'Undo' ) }
 			shortcut={ displayShortcut.primary( 'z' ) }
@@ -24,6 +27,9 @@ export default function UndoButton() {
 			// See: https://github.com/WordPress/gutenberg/issues/3486
 			aria-disabled={ ! hasUndo }
 			onClick={ hasUndo ? undo : undefined }
+			size="compact"
 		/>
 	);
 }
+
+export default forwardRef( UndoButton );
diff --git a/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/config.js b/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/config.js
index bd8bb53f5453d3..0380028aa100c0 100644
--- a/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/config.js
+++ b/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/config.js
@@ -37,7 +37,16 @@ export const textFormattingShortcuts = [
 		description: __( 'Make the selected text inline code.' ),
 	},
 	{
-		keyCombination: { modifier: 'access', character: '0' },
+		keyCombination: {
+			modifier: 'access',
+			character: '0',
+		},
+		aliases: [
+			{
+				modifier: 'access',
+				character: '7',
+			},
+		],
 		description: __( 'Convert the current heading to a paragraph.' ),
 	},
 	{
@@ -46,4 +55,8 @@ export const textFormattingShortcuts = [
 			'Convert the current paragraph or heading to a heading of level 1 to 6.'
 		),
 	},
+	{
+		keyCombination: { modifier: 'primaryShift', character: 'SPACE' },
+		description: __( 'Add non breaking space.' ),
+	},
 ];
diff --git a/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/index.js b/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/index.js
index 228aba170af8f6..bbddd7c97edc7f 100644
--- a/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/index.js
+++ b/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -49,7 +49,7 @@ const ShortcutList = ( { shortcuts } ) => (
 
 const ShortcutSection = ( { title, shortcuts, className } ) => (
 	<section
-		className={ classnames(
+		className={ clsx(
 			'edit-widgets-keyboard-shortcut-help-modal__section',
 			className
 		) }
@@ -135,6 +135,10 @@ export default function KeyboardShortcutHelpModal( {
 				title={ __( 'Text formatting' ) }
 				shortcuts={ textFormattingShortcuts }
 			/>
+			<ShortcutCategorySection
+				title={ __( 'List View shortcuts' ) }
+				categoryName="list-view"
+			/>
 		</Modal>
 	);
 }
diff --git a/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/style.scss b/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/style.scss
index e00df74d97d911..5984ca13d57eb2 100644
--- a/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/style.scss
+++ b/packages/edit-widgets/src/components/keyboard-shortcut-help-modal/style.scss
@@ -33,9 +33,6 @@
 	&__shortcut-description {
 		flex: 1;
 		margin: 0;
-
-		// IE 11 flex item fix - ensure the item does not collapse.
-		flex-basis: auto;
 	}
 
 	&__shortcut-key-combination {
diff --git a/packages/edit-widgets/src/components/keyboard-shortcuts/index.js b/packages/edit-widgets/src/components/keyboard-shortcuts/index.js
index dff0ac57f78c12..65ecceeb4aa8c1 100644
--- a/packages/edit-widgets/src/components/keyboard-shortcuts/index.js
+++ b/packages/edit-widgets/src/components/keyboard-shortcuts/index.js
@@ -7,11 +7,9 @@ import {
 	store as keyboardShortcutsStore,
 } from '@wordpress/keyboard-shortcuts';
 import { isAppleOS } from '@wordpress/keycodes';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { store as coreStore } from '@wordpress/core-data';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -22,38 +20,6 @@ function KeyboardShortcuts() {
 	const { redo, undo } = useDispatch( coreStore );
 	const { saveEditedWidgetAreas } = useDispatch( editWidgetsStore );
 
-	const { replaceBlocks } = useDispatch( blockEditorStore );
-	const { getBlockName, getSelectedBlockClientId, getBlockAttributes } =
-		useSelect( blockEditorStore );
-
-	const handleTextLevelShortcut = ( event, level ) => {
-		event.preventDefault();
-		const destinationBlockName =
-			level === 0 ? 'core/paragraph' : 'core/heading';
-		const currentClientId = getSelectedBlockClientId();
-		if ( currentClientId === null ) {
-			return;
-		}
-		const blockName = getBlockName( currentClientId );
-		if ( blockName !== 'core/paragraph' && blockName !== 'core/heading' ) {
-			return;
-		}
-		const attributes = getBlockAttributes( currentClientId );
-		const textAlign =
-			blockName === 'core/paragraph' ? 'align' : 'textAlign';
-		const destinationTextAlign =
-			destinationBlockName === 'core/paragraph' ? 'align' : 'textAlign';
-
-		replaceBlocks(
-			currentClientId,
-			createBlock( destinationBlockName, {
-				level,
-				content: attributes.content,
-				...{ [ destinationTextAlign ]: attributes[ textAlign ] },
-			} )
-		);
-	};
-
 	useShortcut( 'core/edit-widgets/undo', ( event ) => {
 		undo();
 		event.preventDefault();
@@ -69,21 +35,6 @@ function KeyboardShortcuts() {
 		saveEditedWidgetAreas();
 	} );
 
-	useShortcut(
-		'core/edit-widgets/transform-heading-to-paragraph',
-		( event ) => handleTextLevelShortcut( event, 0 )
-	);
-
-	[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
-		//the loop is based off on a constant therefore
-		//the hook will execute the same way every time
-		//eslint-disable-next-line react-hooks/rules-of-hooks
-		useShortcut(
-			`core/edit-widgets/transform-paragraph-to-heading-${ level }`,
-			( event ) => handleTextLevelShortcut( event, level )
-		);
-	} );
-
 	return null;
 }
 
@@ -178,28 +129,6 @@ function KeyboardShortcutsRegister() {
 				},
 			],
 		} );
-
-		registerShortcut( {
-			name: 'core/edit-widgets/transform-heading-to-paragraph',
-			category: 'block-library',
-			description: __( 'Transform heading to paragraph.' ),
-			keyCombination: {
-				modifier: 'access',
-				character: `0`,
-			},
-		} );
-
-		[ 1, 2, 3, 4, 5, 6 ].forEach( ( level ) => {
-			registerShortcut( {
-				name: `core/edit-widgets/transform-paragraph-to-heading-${ level }`,
-				category: 'block-library',
-				description: __( 'Transform paragraph to heading.' ),
-				keyCombination: {
-					modifier: 'access',
-					character: `${ level }`,
-				},
-			} );
-		} );
 	}, [ registerShortcut ] );
 
 	return null;
diff --git a/packages/edit-widgets/src/components/layout/index.js b/packages/edit-widgets/src/components/layout/index.js
index 54338d10fb8503..4fc70a6c0c74eb 100644
--- a/packages/edit-widgets/src/components/layout/index.js
+++ b/packages/edit-widgets/src/components/layout/index.js
@@ -5,6 +5,7 @@ import { __, sprintf } from '@wordpress/i18n';
 import { useDispatch } from '@wordpress/data';
 import { PluginArea } from '@wordpress/plugins';
 import { store as noticesStore } from '@wordpress/notices';
+import { __unstableUseNavigateRegions as useNavigateRegions } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -31,17 +32,25 @@ function Layout( { blockEditorSettings } ) {
 		);
 	}
 
+	const navigateRegionsProps = useNavigateRegions();
+
 	return (
 		<ErrorBoundary>
-			<WidgetAreasBlockEditorProvider
-				blockEditorSettings={ blockEditorSettings }
+			<div
+				className={ navigateRegionsProps.className }
+				{ ...navigateRegionsProps }
+				ref={ navigateRegionsProps.ref }
 			>
-				<Interface blockEditorSettings={ blockEditorSettings } />
-				<Sidebar />
-				<PluginArea onError={ onPluginAreaError } />
-				<UnsavedChangesWarning />
-				<WelcomeGuide />
-			</WidgetAreasBlockEditorProvider>
+				<WidgetAreasBlockEditorProvider
+					blockEditorSettings={ blockEditorSettings }
+				>
+					<Interface blockEditorSettings={ blockEditorSettings } />
+					<Sidebar />
+					<PluginArea onError={ onPluginAreaError } />
+					<UnsavedChangesWarning />
+					<WelcomeGuide />
+				</WidgetAreasBlockEditorProvider>
+			</div>
 		</ErrorBoundary>
 	);
 }
diff --git a/packages/edit-widgets/src/components/layout/interface.js b/packages/edit-widgets/src/components/layout/interface.js
index 2cb1eebcfab73b..bec40a6e830699 100644
--- a/packages/edit-widgets/src/components/layout/interface.js
+++ b/packages/edit-widgets/src/components/layout/interface.js
@@ -3,7 +3,7 @@
  */
 import { useViewportMatch } from '@wordpress/compose';
 import { BlockBreadcrumb } from '@wordpress/block-editor';
-import { useEffect, useState } from '@wordpress/element';
+import { useEffect } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import {
 	InterfaceSkeleton,
@@ -11,7 +11,6 @@ import {
 	store as interfaceStore,
 } from '@wordpress/interface';
 import { __ } from '@wordpress/i18n';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
 import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
@@ -43,8 +42,6 @@ function Interface( { blockEditorSettings } ) {
 		hasSidebarEnabled,
 		isInserterOpened,
 		isListViewOpened,
-		previousShortcut,
-		nextShortcut,
 	} = useSelect(
 		( select ) => ( {
 			hasSidebarEnabled: !! select(
@@ -56,21 +53,10 @@ function Interface( { blockEditorSettings } ) {
 				'core/edit-widgets',
 				'showBlockBreadcrumbs'
 			),
-			previousShortcut: select(
-				keyboardShortcutsStore
-			).getAllShortcutKeyCombinations(
-				'core/edit-widgets/previous-region'
-			),
-			nextShortcut: select(
-				keyboardShortcutsStore
-			).getAllShortcutKeyCombinations( 'core/edit-widgets/next-region' ),
 		} ),
 		[]
 	);
 
-	const [ listViewToggleElement, setListViewToggleElement ] =
-		useState( null );
-
 	// Inserter and Sidebars are mutually exclusive
 	useEffect( () => {
 		if ( hasSidebarEnabled && ! isHugeViewport ) {
@@ -97,21 +83,9 @@ function Interface( { blockEditorSettings } ) {
 				...interfaceLabels,
 				secondarySidebar: secondarySidebarLabel,
 			} }
-			header={
-				<Header setListViewToggleElement={ setListViewToggleElement } />
-			}
-			secondarySidebar={
-				hasSecondarySidebar && (
-					<SecondarySidebar
-						listViewToggleElement={ listViewToggleElement }
-					/>
-				)
-			}
-			sidebar={
-				hasSidebarEnabled && (
-					<ComplementaryArea.Slot scope="core/edit-widgets" />
-				)
-			}
+			header={ <Header /> }
+			secondarySidebar={ hasSecondarySidebar && <SecondarySidebar /> }
+			sidebar={ <ComplementaryArea.Slot scope="core/edit-widgets" /> }
 			content={
 				<>
 					<WidgetAreasBlockEditorContent
@@ -127,10 +101,6 @@ function Interface( { blockEditorSettings } ) {
 					</div>
 				)
 			}
-			shortcuts={ {
-				previous: previousShortcut,
-				next: nextShortcut,
-			} }
 		/>
 	);
 }
diff --git a/packages/edit-widgets/src/components/layout/style.scss b/packages/edit-widgets/src/components/layout/style.scss
index 1aed3d3eefc86f..14d74e4db9248c 100644
--- a/packages/edit-widgets/src/components/layout/style.scss
+++ b/packages/edit-widgets/src/components/layout/style.scss
@@ -18,6 +18,10 @@
 	// Leave space for the close button
 	height: calc(100% - #{$button-size} - #{$grid-unit-10});
 
+	.block-editor-inserter__tablist-and-close {
+		display: none;
+	}
+
 	@include break-medium() {
 		height: 100%;
 	}
diff --git a/packages/edit-widgets/src/components/more-menu/index.js b/packages/edit-widgets/src/components/more-menu/index.js
index bb3e01bd19e264..2613f3d605ff85 100644
--- a/packages/edit-widgets/src/components/more-menu/index.js
+++ b/packages/edit-widgets/src/components/more-menu/index.js
@@ -1,11 +1,15 @@
 /**
  * WordPress dependencies
  */
-import { MenuGroup, MenuItem, VisuallyHidden } from '@wordpress/components';
+import {
+	MenuGroup,
+	MenuItem,
+	VisuallyHidden,
+	DropdownMenu,
+} from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { __, _x } from '@wordpress/i18n';
-import { external } from '@wordpress/icons';
-import { MoreMenuDropdown } from '@wordpress/interface';
+import { external, moreVertical } from '@wordpress/icons';
 import { PreferenceToggleMenuItem } from '@wordpress/preferences';
 import { displayShortcut } from '@wordpress/keycodes';
 import { useShortcut } from '@wordpress/keyboard-shortcuts';
@@ -34,7 +38,18 @@ export default function MoreMenu() {
 
 	return (
 		<>
-			<MoreMenuDropdown>
+			<DropdownMenu
+				icon={ moreVertical }
+				label={ __( 'Options' ) }
+				popoverProps={ {
+					placement: 'bottom-end',
+					className: 'more-menu-dropdown__content',
+				} }
+				toggleProps={ {
+					tooltipPosition: 'bottom',
+					size: 'compact',
+				} }
+			>
 				{ ( onClose ) => (
 					<>
 						{ isLargeViewport && (
@@ -134,7 +149,7 @@ export default function MoreMenu() {
 						</MenuGroup>
 					</>
 				) }
-			</MoreMenuDropdown>
+			</DropdownMenu>
 			<KeyboardShortcutHelpModal
 				isModalActive={ isKeyboardShortcutsModalActive }
 				toggleModal={ toggleKeyboardShortcutsModal }
diff --git a/packages/edit-widgets/src/components/more-menu/style.scss b/packages/edit-widgets/src/components/more-menu/style.scss
new file mode 100644
index 00000000000000..e618ba729c1ab5
--- /dev/null
+++ b/packages/edit-widgets/src/components/more-menu/style.scss
@@ -0,0 +1,3 @@
+.components-popover.more-menu-dropdown__content {
+	z-index: z-index(".components-popover.more-menu__content");
+}
diff --git a/packages/edit-widgets/src/components/notices/index.js b/packages/edit-widgets/src/components/notices/index.js
index bb02274e92871d..ffbb1d349d2c09 100644
--- a/packages/edit-widgets/src/components/notices/index.js
+++ b/packages/edit-widgets/src/components/notices/index.js
@@ -5,6 +5,9 @@ import { NoticeList, SnackbarList } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
 
+// Last three notices. Slices from the tail end of the list.
+const MAX_VISIBLE_NOTICES = -3;
+
 function Notices() {
 	const { removeNotice } = useDispatch( noticesStore );
 	const { notices } = useSelect( ( select ) => {
@@ -19,9 +22,9 @@ function Notices() {
 	const nonDismissibleNotices = notices.filter(
 		( { isDismissible, type } ) => ! isDismissible && type === 'default'
 	);
-	const snackbarNotices = notices.filter(
-		( { type } ) => type === 'snackbar'
-	);
+	const snackbarNotices = notices
+		.filter( ( { type } ) => type === 'snackbar' )
+		.slice( MAX_VISIBLE_NOTICES );
 
 	return (
 		<>
diff --git a/packages/edit-widgets/src/components/notices/style.scss b/packages/edit-widgets/src/components/notices/style.scss
index c0b1f01836fd33..78aaecc883ba45 100644
--- a/packages/edit-widgets/src/components/notices/style.scss
+++ b/packages/edit-widgets/src/components/notices/style.scss
@@ -11,7 +11,6 @@
 .edit-widgets-notices__pinned {
 	.components-notice {
 		box-sizing: border-box;
-		margin: 0;
 		border-bottom: $border-width solid rgba(0, 0, 0, 0.2);
 		padding: 0 $grid-unit-15;
 
diff --git a/packages/edit-widgets/src/components/save-button/index.js b/packages/edit-widgets/src/components/save-button/index.js
index 200d8725e13695..d10f6a8d49f0db 100644
--- a/packages/edit-widgets/src/components/save-button/index.js
+++ b/packages/edit-widgets/src/components/save-button/index.js
@@ -22,13 +22,15 @@ function SaveButton() {
 	}, [] );
 	const { saveEditedWidgetAreas } = useDispatch( editWidgetsStore );
 
+	const isDisabled = isSaving || ! hasEditedWidgetAreaIds;
+
 	return (
 		<Button
 			variant="primary"
 			isBusy={ isSaving }
-			aria-disabled={ isSaving }
-			onClick={ isSaving ? undefined : saveEditedWidgetAreas }
-			disabled={ ! hasEditedWidgetAreaIds }
+			aria-disabled={ isDisabled }
+			onClick={ isDisabled ? undefined : saveEditedWidgetAreas }
+			size="compact"
 		>
 			{ isSaving ? __( 'Saving…' ) : __( 'Update' ) }
 		</Button>
diff --git a/packages/edit-widgets/src/components/secondary-sidebar/index.js b/packages/edit-widgets/src/components/secondary-sidebar/index.js
index 20488e4478b980..49e240bd147cb2 100644
--- a/packages/edit-widgets/src/components/secondary-sidebar/index.js
+++ b/packages/edit-widgets/src/components/secondary-sidebar/index.js
@@ -13,7 +13,7 @@ import { store as editWidgetsStore } from '../../store';
 import InserterSidebar from './inserter-sidebar';
 import ListViewSidebar from './list-view-sidebar';
 
-export default function SecondarySidebar( { listViewToggleElement } ) {
+export default function SecondarySidebar() {
 	const { isInserterOpen, isListViewOpen } = useSelect( ( select ) => {
 		const { isInserterOpened, isListViewOpened } =
 			select( editWidgetsStore );
@@ -27,9 +27,7 @@ export default function SecondarySidebar( { listViewToggleElement } ) {
 		return <InserterSidebar />;
 	}
 	if ( isListViewOpen ) {
-		return (
-			<ListViewSidebar listViewToggleElement={ listViewToggleElement } />
-		);
+		return <ListViewSidebar />;
 	}
 	return null;
 }
diff --git a/packages/edit-widgets/src/components/secondary-sidebar/inserter-sidebar.js b/packages/edit-widgets/src/components/secondary-sidebar/inserter-sidebar.js
index b01481748ee887..4b26dd306ea0a3 100644
--- a/packages/edit-widgets/src/components/secondary-sidebar/inserter-sidebar.js
+++ b/packages/edit-widgets/src/components/secondary-sidebar/inserter-sidebar.js
@@ -8,7 +8,7 @@ import {
 	useViewportMatch,
 	__experimentalUseDialog as useDialog,
 } from '@wordpress/compose';
-import { useCallback, useEffect, useRef } from '@wordpress/element';
+import { useCallback, useRef } from '@wordpress/element';
 import { useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 
@@ -31,13 +31,10 @@ export default function InserterSidebar() {
 	const TagName = ! isMobileViewport ? VisuallyHidden : 'div';
 	const [ inserterDialogRef, inserterDialogProps ] = useDialog( {
 		onClose: closeInserter,
-		focusOnMount: null,
+		focusOnMount: true,
 	} );
 
 	const libraryRef = useRef();
-	useEffect( () => {
-		libraryRef.current.focusSearch();
-	}, [] );
 
 	return (
 		<div
@@ -47,9 +44,10 @@ export default function InserterSidebar() {
 		>
 			<TagName className="edit-widgets-layout__inserter-panel-header">
 				<Button
+					__next40pxDefaultSize
 					icon={ close }
 					onClick={ closeInserter }
-					label={ __( 'Close block inserter' ) }
+					label={ __( 'Close Block Inserter' ) }
 				/>
 			</TagName>
 			<div className="edit-widgets-layout__inserter-panel-content">
diff --git a/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js b/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js
index 5104a587d9e2cf..1bb850393ad023 100644
--- a/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js
+++ b/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js
@@ -4,7 +4,7 @@
 import { __experimentalListView as ListView } from '@wordpress/block-editor';
 import { Button } from '@wordpress/components';
 import { useFocusOnMount, useMergeRefs } from '@wordpress/compose';
-import { useDispatch } from '@wordpress/data';
+import { useDispatch, useSelect } from '@wordpress/data';
 import { useCallback, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { closeSmall } from '@wordpress/icons';
@@ -14,9 +14,11 @@ import { ESCAPE } from '@wordpress/keycodes';
  * Internal dependencies
  */
 import { store as editWidgetsStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
-export default function ListViewSidebar( { listViewToggleElement } ) {
+export default function ListViewSidebar() {
 	const { setIsListViewOpened } = useDispatch( editWidgetsStore );
+	const { getListViewToggleRef } = unlock( useSelect( editWidgetsStore ) );
 
 	// Use internal state instead of a ref to make sure that the component
 	// re-renders when the dropZoneElement updates.
@@ -27,8 +29,8 @@ export default function ListViewSidebar( { listViewToggleElement } ) {
 	// When closing the list view, focus should return to the toggle button.
 	const closeListView = useCallback( () => {
 		setIsListViewOpened( false );
-		listViewToggleElement?.focus();
-	}, [ listViewToggleElement, setIsListViewOpened ] );
+		getListViewToggleRef().current?.focus();
+	}, [ getListViewToggleRef, setIsListViewOpened ] );
 
 	const closeOnEscape = useCallback(
 		( event ) => {
@@ -49,6 +51,7 @@ export default function ListViewSidebar( { listViewToggleElement } ) {
 			<div className="edit-widgets-editor__list-view-panel-header">
 				<strong>{ __( 'List View' ) }</strong>
 				<Button
+					__next40pxDefaultSize
 					icon={ closeSmall }
 					label={ __( 'Close' ) }
 					onClick={ closeListView }
diff --git a/packages/edit-widgets/src/components/sidebar/index.js b/packages/edit-widgets/src/components/sidebar/index.js
index 27af07831e1eed..a42a6d7c4be7a4 100644
--- a/packages/edit-widgets/src/components/sidebar/index.js
+++ b/packages/edit-widgets/src/components/sidebar/index.js
@@ -1,13 +1,13 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
-import { useEffect, Platform } from '@wordpress/element';
-import { isRTL, __, sprintf } from '@wordpress/i18n';
+import {
+	useEffect,
+	Platform,
+	useContext,
+	useCallback,
+} from '@wordpress/element';
+import { isRTL, __ } from '@wordpress/i18n';
 import {
 	ComplementaryArea,
 	store as interfaceStore,
@@ -18,7 +18,7 @@ import {
 } from '@wordpress/block-editor';
 
 import { drawerLeft, drawerRight } from '@wordpress/icons';
-import { Button } from '@wordpress/components';
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 
 const SIDEBAR_ACTIVE_BY_DEFAULT = Platform.select( {
@@ -28,7 +28,7 @@ const SIDEBAR_ACTIVE_BY_DEFAULT = Platform.select( {
 
 const BLOCK_INSPECTOR_IDENTIFIER = 'edit-widgets/block-inspector';
 
-// Widget areas were one called block areas, so use 'edit-widgets/block-areas'
+// Widget areas were once called block areas, so use 'edit-widgets/block-areas'
 // for backwards compatibility.
 const WIDGET_AREAS_IDENTIFIER = 'edit-widgets/block-areas';
 
@@ -37,32 +37,111 @@ const WIDGET_AREAS_IDENTIFIER = 'edit-widgets/block-areas';
  */
 import WidgetAreas from './widget-areas';
 import { store as editWidgetsStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const { Tabs } = unlock( componentsPrivateApis );
 
-function ComplementaryAreaTab( { identifier, label, isActive } ) {
+function SidebarHeader( { selectedWidgetAreaBlock } ) {
+	return (
+		<Tabs.TabList>
+			<Tabs.Tab tabId={ WIDGET_AREAS_IDENTIFIER }>
+				{ selectedWidgetAreaBlock
+					? selectedWidgetAreaBlock.attributes.name
+					: __( 'Widget Areas' ) }
+			</Tabs.Tab>
+			<Tabs.Tab tabId={ BLOCK_INSPECTOR_IDENTIFIER }>
+				{ __( 'Block' ) }
+			</Tabs.Tab>
+		</Tabs.TabList>
+	);
+}
+
+function SidebarContent( {
+	hasSelectedNonAreaBlock,
+	currentArea,
+	isGeneralSidebarOpen,
+	selectedWidgetAreaBlock,
+} ) {
 	const { enableComplementaryArea } = useDispatch( interfaceStore );
+
+	useEffect( () => {
+		if (
+			hasSelectedNonAreaBlock &&
+			currentArea === WIDGET_AREAS_IDENTIFIER &&
+			isGeneralSidebarOpen
+		) {
+			enableComplementaryArea(
+				'core/edit-widgets',
+				BLOCK_INSPECTOR_IDENTIFIER
+			);
+		}
+		if (
+			! hasSelectedNonAreaBlock &&
+			currentArea === BLOCK_INSPECTOR_IDENTIFIER &&
+			isGeneralSidebarOpen
+		) {
+			enableComplementaryArea(
+				'core/edit-widgets',
+				WIDGET_AREAS_IDENTIFIER
+			);
+		}
+		// We're intentionally leaving `currentArea` and `isGeneralSidebarOpen`
+		// out of the dep array because we want this effect to run based on
+		// block selection changes, not sidebar state changes.
+	}, [ hasSelectedNonAreaBlock, enableComplementaryArea ] );
+
+	const tabsContextValue = useContext( Tabs.Context );
+
 	return (
-		<Button
-			onClick={ () =>
-				enableComplementaryArea( editWidgetsStore.name, identifier )
-			}
-			className={ classnames( 'edit-widgets-sidebar__panel-tab', {
-				'is-active': isActive,
-			} ) }
-			aria-label={
-				isActive
-					? // translators: %s: sidebar label e.g: "Widget Areas".
-					  sprintf( __( '%s (selected)' ), label )
-					: label
+		<ComplementaryArea
+			className="edit-widgets-sidebar"
+			header={
+				<Tabs.Context.Provider value={ tabsContextValue }>
+					<SidebarHeader
+						selectedWidgetAreaBlock={ selectedWidgetAreaBlock }
+					/>
+				</Tabs.Context.Provider>
 			}
-			data-label={ label }
+			headerClassName="edit-widgets-sidebar__panel-tabs"
+			/* translators: button label text should, if possible, be under 16 characters. */
+			title={ __( 'Settings' ) }
+			closeLabel={ __( 'Close Settings' ) }
+			scope="core/edit-widgets"
+			identifier={ currentArea }
+			icon={ isRTL() ? drawerLeft : drawerRight }
+			isActiveByDefault={ SIDEBAR_ACTIVE_BY_DEFAULT }
 		>
-			{ label }
-		</Button>
+			<Tabs.Context.Provider value={ tabsContextValue }>
+				<Tabs.TabPanel
+					tabId={ WIDGET_AREAS_IDENTIFIER }
+					focusable={ false }
+				>
+					<WidgetAreas
+						selectedWidgetAreaId={
+							selectedWidgetAreaBlock?.attributes.id
+						}
+					/>
+				</Tabs.TabPanel>
+				<Tabs.TabPanel
+					tabId={ BLOCK_INSPECTOR_IDENTIFIER }
+					focusable={ false }
+				>
+					{ hasSelectedNonAreaBlock ? (
+						<BlockInspector />
+					) : (
+						// Pretend that Widget Areas are part of the UI by not
+						// showing the Block Inspector when one is selected.
+						<span className="block-editor-block-inspector__no-blocks">
+							{ __( 'No block selected.' ) }
+						</span>
+					) }
+				</Tabs.TabPanel>
+			</Tabs.Context.Provider>
+		</ComplementaryArea>
 	);
 }
 
 export default function Sidebar() {
-	const { enableComplementaryArea } = useDispatch( interfaceStore );
 	const {
 		currentArea,
 		hasSelectedNonAreaBlock,
@@ -110,84 +189,41 @@ export default function Sidebar() {
 		};
 	}, [] );
 
-	// currentArea, and isGeneralSidebarOpen are intentionally left out from the dependencies,
-	// because we want to run the effect when a block is selected/unselected and not when the sidebar state changes.
-	useEffect( () => {
-		if (
-			hasSelectedNonAreaBlock &&
-			currentArea === WIDGET_AREAS_IDENTIFIER &&
-			isGeneralSidebarOpen
-		) {
-			enableComplementaryArea(
-				'core/edit-widgets',
-				BLOCK_INSPECTOR_IDENTIFIER
-			);
-		}
-		if (
-			! hasSelectedNonAreaBlock &&
-			currentArea === BLOCK_INSPECTOR_IDENTIFIER &&
-			isGeneralSidebarOpen
-		) {
-			enableComplementaryArea(
-				'core/edit-widgets',
-				WIDGET_AREAS_IDENTIFIER
-			);
-		}
-	}, [ hasSelectedNonAreaBlock, enableComplementaryArea ] );
+	const { enableComplementaryArea } = useDispatch( interfaceStore );
 
-	return (
-		<ComplementaryArea
-			className="edit-widgets-sidebar"
-			header={
-				<ul>
-					<li>
-						<ComplementaryAreaTab
-							identifier={ WIDGET_AREAS_IDENTIFIER }
-							label={
-								selectedWidgetAreaBlock
-									? selectedWidgetAreaBlock.attributes.name
-									: __( 'Widget Areas' )
-							}
-							isActive={ currentArea === WIDGET_AREAS_IDENTIFIER }
-						/>
-					</li>
-					<li>
-						<ComplementaryAreaTab
-							identifier={ BLOCK_INSPECTOR_IDENTIFIER }
-							label={ __( 'Block' ) }
-							isActive={
-								currentArea === BLOCK_INSPECTOR_IDENTIFIER
-							}
-						/>
-					</li>
-				</ul>
+	// `newSelectedTabId` could technically be falsy if no tab is selected (i.e.
+	// the initial render) or when we don't want a tab displayed (i.e. the
+	// sidebar is closed). These cases should both be covered by the `!!` check
+	// below, so we shouldn't need any additional falsy handling.
+	const onTabSelect = useCallback(
+		( newSelectedTabId ) => {
+			if ( !! newSelectedTabId ) {
+				enableComplementaryArea(
+					editWidgetsStore.name,
+					newSelectedTabId
+				);
 			}
-			headerClassName="edit-widgets-sidebar__panel-tabs"
-			/* translators: button label text should, if possible, be under 16 characters. */
-			title={ __( 'Settings' ) }
-			closeLabel={ __( 'Close Settings' ) }
-			scope="core/edit-widgets"
-			identifier={ currentArea }
-			icon={ isRTL() ? drawerLeft : drawerRight }
-			isActiveByDefault={ SIDEBAR_ACTIVE_BY_DEFAULT }
+		},
+		[ enableComplementaryArea ]
+	);
+
+	return (
+		<Tabs
+			// Due to how this component is controlled (via a value from the
+			// `interfaceStore`), when the sidebar closes the currently selected
+			// tab can't be found. This causes the component to continuously reset
+			// the selection to `null` in an infinite loop. Proactively setting
+			// the selected tab to `null` avoids that.
+			selectedTabId={ isGeneralSidebarOpen ? currentArea : null }
+			onSelect={ onTabSelect }
+			selectOnMove={ false }
 		>
-			{ currentArea === WIDGET_AREAS_IDENTIFIER && (
-				<WidgetAreas
-					selectedWidgetAreaId={
-						selectedWidgetAreaBlock?.attributes.id
-					}
-				/>
-			) }
-			{ currentArea === BLOCK_INSPECTOR_IDENTIFIER &&
-				( hasSelectedNonAreaBlock ? (
-					<BlockInspector />
-				) : (
-					// Pretend that Widget Areas are part of the UI by not
-					// showing the Block Inspector when one is selected.
-					<span className="block-editor-block-inspector__no-blocks">
-						{ __( 'No block selected.' ) }
-					</span>
-				) ) }
-		</ComplementaryArea>
+			<SidebarContent
+				hasSelectedNonAreaBlock={ hasSelectedNonAreaBlock }
+				currentArea={ currentArea }
+				isGeneralSidebarOpen={ isGeneralSidebarOpen }
+				selectedWidgetAreaBlock={ selectedWidgetAreaBlock }
+			/>
+		</Tabs>
 	);
 }
diff --git a/packages/edit-widgets/src/components/sidebar/style.scss b/packages/edit-widgets/src/components/sidebar/style.scss
index a417ba83ebbd60..d54f25af07c386 100644
--- a/packages/edit-widgets/src/components/sidebar/style.scss
+++ b/packages/edit-widgets/src/components/sidebar/style.scss
@@ -1,99 +1,5 @@
 .components-panel__header.edit-widgets-sidebar__panel-tabs {
-	justify-content: flex-start;
 	padding-left: 0;
-	padding-right: $grid-unit-05;
-	border-top: 0;
-	margin-top: 0;
-
-	ul {
-		display: flex;
-	}
-	li {
-		margin: 0;
-	}
-	.components-button.has-icon {
-		display: none;
-		margin-left: auto;
-
-		@include break-medium() {
-			display: flex;
-		}
-	}
-}
-
-// This tab style CSS is duplicated verbatim in
-// /packages/components/src/tab-panel/style.scss
-.components-button.edit-widgets-sidebar__panel-tab {
-	position: relative;
-	border-radius: 0;
-	height: $grid-unit-60;
-	background: transparent;
-	border: none;
-	box-shadow: none;
-	cursor: pointer;
-	padding: 3px $grid-unit-20; // Use padding to offset the is-active border, this benefits Windows High Contrast mode
-	margin-left: 0;
-	font-weight: 500;
-
-	&:focus:not(:disabled) {
-		position: relative;
-		box-shadow: none;
-		outline: none;
-	}
-
-	// Tab indicator
-	&::after {
-		content: "";
-		position: absolute;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		pointer-events: none;
-
-		// Draw the indicator.
-		background: var(--wp-admin-theme-color);
-		height: calc(0 * var(--wp-admin-border-width-focus));
-		border-radius: 0;
-
-		// Animation
-		transition: all 0.1s linear;
-		@include reduce-motion("transition");
-	}
-
-	// Active.
-	&.is-active::after {
-		height: calc(1 * var(--wp-admin-border-width-focus));
-
-		// Windows high contrast mode.
-		outline: 2px solid transparent;
-		outline-offset: -1px;
-	}
-
-	// Focus.
-	&::before {
-		content: "";
-		position: absolute;
-		top: $grid-unit-15;
-		right: $grid-unit-15;
-		bottom: $grid-unit-15;
-		left: $grid-unit-15;
-		pointer-events: none;
-
-		// Draw the indicator.
-		box-shadow: 0 0 0 0 transparent;
-		border-radius: $radius-block-ui;
-
-		// Animation
-		transition: all 0.1s linear;
-		@include reduce-motion("transition");
-	}
-
-	&:focus-visible::before {
-		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-
-		// Windows high contrast mode.
-		outline: 2px solid transparent;
-	}
 }
 
 
diff --git a/packages/edit-widgets/src/components/sidebar/widget-areas.js b/packages/edit-widgets/src/components/sidebar/widget-areas.js
index 98ce523d6e4fe2..c7b49c10b97464 100644
--- a/packages/edit-widgets/src/components/sidebar/widget-areas.js
+++ b/packages/edit-widgets/src/components/sidebar/widget-areas.js
@@ -66,6 +66,7 @@ export default function WidgetAreas( { selectedWidgetAreaId } ) {
 					) }
 					{ ! selectedWidgetArea && (
 						<Button
+							__next40pxDefaultSize
 							href={ addQueryArgs( 'customize.php', {
 								'autofocus[panel]': 'widgets',
 								return: window.location.pathname,
diff --git a/packages/edit-widgets/src/components/test/error-boundary.js b/packages/edit-widgets/src/components/test/error-boundary.js
deleted file mode 100644
index 7b9977e10f1315..00000000000000
--- a/packages/edit-widgets/src/components/test/error-boundary.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * WordPress dependencies
- */
-import * as wpHooks from '@wordpress/hooks';
-/**
- * Internal dependencies
- */
-import ErrorBoundary from '../error-boundary';
-/**
- * External dependencies
- */
-import { render } from '@testing-library/react';
-
-const theError = new Error( 'Kaboom' );
-
-const ChildComponent = () => {
-	throw theError;
-};
-
-describe( 'Error Boundary', () => {
-	describe( 'when error is thrown from a Child component', () => {
-		it( 'calls the `editor.ErrorBoundary.errorLogged` hook action with the error object', () => {
-			const doAction = jest.spyOn( wpHooks, 'doAction' );
-
-			render(
-				<ErrorBoundary>
-					<ChildComponent />
-				</ErrorBoundary>
-			);
-
-			expect( doAction ).toHaveBeenCalledWith(
-				'editor.ErrorBoundary.errorLogged',
-				theError
-			);
-			expect( console ).toHaveErrored();
-		} );
-	} );
-} );
diff --git a/packages/edit-widgets/src/components/welcome-guide/index.js b/packages/edit-widgets/src/components/welcome-guide/index.js
index 51244956286d8d..bd06234e399b58 100644
--- a/packages/edit-widgets/src/components/welcome-guide/index.js
+++ b/packages/edit-widgets/src/components/welcome-guide/index.js
@@ -172,16 +172,20 @@ export default function WelcomeGuide() {
 								{ __( 'Learn how to use the block editor' ) }
 							</h1>
 							<p className="edit-widgets-welcome-guide__text">
-								{ __(
-									'New to the block editor? Want to learn more about using it? '
+								{ createInterpolateElement(
+									__(
+										"New to the block editor? Want to learn more about using it? <a>Here's a detailed guide.</a>"
+									),
+									{
+										a: (
+											<ExternalLink
+												href={ __(
+													'https://wordpress.org/documentation/article/wordpress-block-editor/'
+												) }
+											/>
+										),
+									}
 								) }
-								<ExternalLink
-									href={ __(
-										'https://wordpress.org/documentation/article/wordpress-block-editor/'
-									) }
-								>
-									{ __( "Here's a detailed guide." ) }
-								</ExternalLink>
 							</p>
 						</>
 					),
diff --git a/packages/edit-widgets/src/components/widget-areas-block-editor-content/index.js b/packages/edit-widgets/src/components/widget-areas-block-editor-content/index.js
index 12a70e2e4da279..e1bd7a6b12f1e6 100644
--- a/packages/edit-widgets/src/components/widget-areas-block-editor-content/index.js
+++ b/packages/edit-widgets/src/components/widget-areas-block-editor-content/index.js
@@ -3,11 +3,13 @@
  */
 import {
 	BlockList,
+	BlockToolbar,
 	BlockTools,
 	BlockSelectionClearer,
 	WritingFlow,
 	__unstableEditorStyles as EditorStyles,
 } from '@wordpress/block-editor';
+import { useViewportMatch } from '@wordpress/compose';
 import { useSelect } from '@wordpress/data';
 import { useMemo } from '@wordpress/element';
 import { store as preferencesStore } from '@wordpress/preferences';
@@ -29,6 +31,7 @@ export default function WidgetAreasBlockEditorContent( {
 			),
 		[]
 	);
+	const isLargeViewport = useViewportMatch( 'medium' );
 
 	const styles = useMemo( () => {
 		return hasThemeStyles ? blockEditorSettings.styles : [];
@@ -37,11 +40,12 @@ export default function WidgetAreasBlockEditorContent( {
 	return (
 		<div className="edit-widgets-block-editor">
 			<Notices />
+			{ ! isLargeViewport && <BlockToolbar hideDragHandle /> }
 			<BlockTools>
 				<KeyboardShortcuts />
 				<EditorStyles
 					styles={ styles }
-					scope=".editor-styles-wrapper"
+					scope=":where(.editor-styles-wrapper)"
 				/>
 				<BlockSelectionClearer>
 					<WritingFlow>
diff --git a/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js b/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js
index 1fbf51d05f7b7f..af844fe9da4fe9 100644
--- a/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js
+++ b/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js
@@ -2,17 +2,15 @@
  * WordPress dependencies
  */
 import { SlotFillProvider } from '@wordpress/components';
+import { useViewportMatch } from '@wordpress/compose';
 import { uploadMedia } from '@wordpress/media-utils';
 import { useDispatch, useSelect } from '@wordpress/data';
-import {
-	useEntityBlockEditor,
-	store as coreStore,
-	useResourcePermissions,
-} from '@wordpress/core-data';
+import { useEntityBlockEditor, store as coreStore } from '@wordpress/core-data';
 import { useMemo } from '@wordpress/element';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';
 import { store as preferencesStore } from '@wordpress/preferences';
+import { privateApis as blockLibraryPrivateApis } from '@wordpress/block-library';
 
 /**
  * Internal dependencies
@@ -26,13 +24,18 @@ import { unlock } from '../../lock-unlock';
 
 const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
 const { PatternsMenuItems } = unlock( editPatternsPrivateApis );
+const { BlockKeyboardShortcuts } = unlock( blockLibraryPrivateApis );
+
+const EMPTY_ARRAY = [];
+
 export default function WidgetAreasBlockEditorProvider( {
 	blockEditorSettings,
 	children,
 	...props
 } ) {
-	const mediaPermissions = useResourcePermissions( 'media' );
+	const isLargeViewport = useViewportMatch( 'medium' );
 	const {
+		hasUploadPermissions,
 		reusableBlocks,
 		isFixedToolbarActive,
 		keepCaretInsideBlock,
@@ -41,15 +44,21 @@ export default function WidgetAreasBlockEditorProvider( {
 	} = useSelect( ( select ) => {
 		const { canUser, getEntityRecord, getEntityRecords } =
 			select( coreStore );
-		const siteSettings = canUser( 'read', 'settings' )
+		const siteSettings = canUser( 'read', {
+			kind: 'root',
+			name: 'site',
+		} )
 			? getEntityRecord( 'root', 'site' )
 			: undefined;
 		return {
-			widgetAreas: select( editWidgetsStore ).getWidgetAreas(),
-			widgets: select( editWidgetsStore ).getWidgets(),
+			hasUploadPermissions:
+				canUser( 'create', {
+					kind: 'root',
+					name: 'media',
+				} ) ?? true,
 			reusableBlocks: ALLOW_REUSABLE_BLOCKS
 				? getEntityRecords( 'postType', 'wp_block' )
-				: [],
+				: EMPTY_ARRAY,
 			isFixedToolbarActive: !! select( preferencesStore ).get(
 				'core/edit-widgets',
 				'fixedToolbar'
@@ -66,7 +75,7 @@ export default function WidgetAreasBlockEditorProvider( {
 
 	const settings = useMemo( () => {
 		let mediaUploadBlockEditor;
-		if ( mediaPermissions.canCreate ) {
+		if ( hasUploadPermissions ) {
 			mediaUploadBlockEditor = ( { onError, ...argumentsObject } ) => {
 				uploadMedia( {
 					wpAllowedMimeTypes: blockEditorSettings.allowedMimeTypes,
@@ -78,7 +87,7 @@ export default function WidgetAreasBlockEditorProvider( {
 		return {
 			...blockEditorSettings,
 			__experimentalReusableBlocks: reusableBlocks,
-			hasFixedToolbar: isFixedToolbarActive,
+			hasFixedToolbar: isFixedToolbarActive || ! isLargeViewport,
 			keepCaretInsideBlock,
 			mediaUpload: mediaUploadBlockEditor,
 			templateLock: 'all',
@@ -87,10 +96,11 @@ export default function WidgetAreasBlockEditorProvider( {
 			pageForPosts,
 		};
 	}, [
+		hasUploadPermissions,
 		blockEditorSettings,
 		isFixedToolbarActive,
+		isLargeViewport,
 		keepCaretInsideBlock,
-		mediaPermissions.canCreate,
 		reusableBlocks,
 		setIsInserterOpened,
 		pageOnFront,
@@ -108,6 +118,7 @@ export default function WidgetAreasBlockEditorProvider( {
 	return (
 		<SlotFillProvider>
 			<KeyboardShortcuts.Register />
+			<BlockKeyboardShortcuts />
 			<ExperimentalBlockEditorProvider
 				value={ blocks }
 				onInput={ onInput }
diff --git a/packages/edit-widgets/src/filters/move-to-widget-area.js b/packages/edit-widgets/src/filters/move-to-widget-area.js
index c39315505232e7..61a8b4cd7187f2 100644
--- a/packages/edit-widgets/src/filters/move-to-widget-area.js
+++ b/packages/edit-widgets/src/filters/move-to-widget-area.js
@@ -48,7 +48,7 @@ const withMoveToWidgetAreaToolbarItem = createHigherOrderComponent(
 
 		return (
 			<>
-				<BlockEdit { ...props } />
+				<BlockEdit key="edit" { ...props } />
 				{ isMoveToWidgetAreaVisible && (
 					<BlockControls>
 						<MoveToWidgetArea
diff --git a/packages/edit-widgets/src/index.js b/packages/edit-widgets/src/index.js
index eb87d22fefef9e..8788ee2b99ea1d 100644
--- a/packages/edit-widgets/src/index.js
+++ b/packages/edit-widgets/src/index.js
@@ -9,7 +9,8 @@ import {
 } from '@wordpress/blocks';
 import { dispatch } from '@wordpress/data';
 import deprecated from '@wordpress/deprecated';
-import { createRoot } from '@wordpress/element';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
+import { StrictMode, createRoot } from '@wordpress/element';
 import {
 	registerCoreBlocks,
 	__experimentalGetCoreBlocks,
@@ -29,7 +30,7 @@ import { store as preferencesStore } from '@wordpress/preferences';
 import './store';
 import './filters';
 import * as widgetArea from './blocks/widget-area';
-
+import { unlock } from './lock-unlock';
 import Layout from './components/layout';
 import {
 	ALLOW_REUSABLE_BLOCKS,
@@ -43,6 +44,8 @@ const disabledBlocks = [
 	...( ALLOW_REUSABLE_BLOCKS ? [] : [ 'core/block' ] ),
 ];
 
+const { registerCoreBlockBindingsSources } = unlock( editorPrivateApis );
+
 /**
  * Initializes the block editor in the widgets screen.
  *
@@ -72,8 +75,9 @@ export function initializeEditor( id, settings ) {
 
 	dispatch( blocksStore ).reapplyBlockTypeFilters();
 	registerCoreBlocks( coreBlocks );
+	registerCoreBlockBindingsSources();
 	registerLegacyWidgetBlock();
-	if ( process.env.IS_GUTENBERG_PLUGIN ) {
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 		__experimentalRegisterExperimentalCoreBlocks( {
 			enableFSEBlocks: ENABLE_EXPERIMENTAL_FSE_BLOCKS,
 		} );
@@ -91,7 +95,11 @@ export function initializeEditor( id, settings ) {
 	// see: https://github.com/WordPress/gutenberg/issues/33097
 	setFreeformContentHandlerName( 'core/html' );
 
-	root.render( <Layout blockEditorSettings={ settings } /> );
+	root.render(
+		<StrictMode>
+			<Layout blockEditorSettings={ settings } />
+		</StrictMode>
+	);
 
 	return root;
 }
diff --git a/packages/edit-widgets/src/lock-unlock.js b/packages/edit-widgets/src/lock-unlock.js
index 003e53788068c0..1c401a0ccd4dab 100644
--- a/packages/edit-widgets/src/lock-unlock.js
+++ b/packages/edit-widgets/src/lock-unlock.js
@@ -5,6 +5,6 @@ import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/pri
 
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/edit-widgets'
 	);
diff --git a/packages/edit-widgets/src/store/index.js b/packages/edit-widgets/src/store/index.js
index b8542b2fa5cf19..8768b45954b930 100644
--- a/packages/edit-widgets/src/store/index.js
+++ b/packages/edit-widgets/src/store/index.js
@@ -11,7 +11,9 @@ import reducer from './reducer';
 import * as resolvers from './resolvers';
 import * as selectors from './selectors';
 import * as actions from './actions';
+import * as privateSelectors from './private-selectors';
 import { STORE_NAME } from './constants';
+import { unlock } from '../lock-unlock';
 
 /**
  * Block editor data store configuration.
@@ -47,3 +49,5 @@ apiFetch.use( function ( options, next ) {
 
 	return next( options );
 } );
+
+unlock( store ).registerPrivateSelectors( privateSelectors );
diff --git a/packages/edit-widgets/src/store/private-selectors.js b/packages/edit-widgets/src/store/private-selectors.js
new file mode 100644
index 00000000000000..ee2000ac128443
--- /dev/null
+++ b/packages/edit-widgets/src/store/private-selectors.js
@@ -0,0 +1,7 @@
+export function getListViewToggleRef( state ) {
+	return state.listViewToggleRef;
+}
+
+export function getInserterSidebarToggleRef( state ) {
+	return state.inserterSidebarToggleRef;
+}
diff --git a/packages/edit-widgets/src/store/reducer.js b/packages/edit-widgets/src/store/reducer.js
index ff942b955edcdc..3dbc95123a382a 100644
--- a/packages/edit-widgets/src/store/reducer.js
+++ b/packages/edit-widgets/src/store/reducer.js
@@ -68,8 +68,32 @@ export function listViewPanel( state = false, action ) {
 	return state;
 }
 
+/**
+ * This reducer does nothing aside initializing a ref to the list view toggle.
+ * We will have a unique ref per "editor" instance.
+ *
+ * @param {Object} state
+ * @return {Object} Reference to the list view toggle button.
+ */
+export function listViewToggleRef( state = { current: null } ) {
+	return state;
+}
+
+/**
+ * This reducer does nothing aside initializing a ref to the inserter sidebar toggle.
+ * We will have a unique ref per "editor" instance.
+ *
+ * @param {Object} state
+ * @return {Object} Reference to the inserter sidebar toggle button.
+ */
+export function inserterSidebarToggleRef( state = { current: null } ) {
+	return state;
+}
+
 export default combineReducers( {
 	blockInserterPanel,
+	inserterSidebarToggleRef,
 	listViewPanel,
+	listViewToggleRef,
 	widgetAreasOpenState,
 } );
diff --git a/packages/edit-widgets/src/store/selectors.js b/packages/edit-widgets/src/store/selectors.js
index b7a07000ec84b0..204c75e2daefbb 100644
--- a/packages/edit-widgets/src/store/selectors.js
+++ b/packages/edit-widgets/src/store/selectors.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createRegistrySelector } from '@wordpress/data';
+import { createSelector, createRegistrySelector } from '@wordpress/data';
 import { getWidgetIdFromBlock } from '@wordpress/widgets';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
@@ -29,24 +29,35 @@ const EMPTY_INSERTION_POINT = {
  *
  * @return {Object[]} API List of widgets.
  */
-export const getWidgets = createRegistrySelector( ( select ) => () => {
-	const widgets = select( coreStore ).getEntityRecords(
-		'root',
-		'widget',
-		buildWidgetsQuery()
-	);
+export const getWidgets = createRegistrySelector( ( select ) =>
+	createSelector(
+		() => {
+			const widgets = select( coreStore ).getEntityRecords(
+				'root',
+				'widget',
+				buildWidgetsQuery()
+			);
 
-	return (
-		// Key widgets by their ID.
-		widgets?.reduce(
-			( allWidgets, widget ) => ( {
-				...allWidgets,
-				[ widget.id ]: widget,
-			} ),
-			{}
-		) || {}
-	);
-} );
+			return (
+				// Key widgets by their ID.
+				widgets?.reduce(
+					( allWidgets, widget ) => ( {
+						...allWidgets,
+						[ widget.id ]: widget,
+					} ),
+					{}
+				) ?? {}
+			);
+		},
+		() => [
+			select( coreStore ).getEntityRecords(
+				'root',
+				'widget',
+				buildWidgetsQuery()
+			),
+		]
+	)
+);
 
 /**
  * Returns API widget data for a particular widget ID.
diff --git a/packages/edit-widgets/src/style.scss b/packages/edit-widgets/src/style.scss
index 72e68e06cfa7e8..62a6f63cd4850f 100644
--- a/packages/edit-widgets/src/style.scss
+++ b/packages/edit-widgets/src/style.scss
@@ -7,6 +7,7 @@
 @import "./components/sidebar/style.scss";
 @import "./components/notices/style.scss";
 @import "./components/layout/style.scss";
+@import "./components/more-menu/style.scss";
 @import "./components/welcome-guide/style.scss";
 @import "./components/widget-areas-block-editor-content/style.scss";
 @import "./components/secondary-sidebar/style.scss";
@@ -16,14 +17,8 @@ body.js.widgets-php {
 	@include wp-admin-reset( ".blocks-widgets-container" );
 }
 
-.blocks-widgets-container,
-// The modals are shown outside the .blocks-widgets-container wrapper, they need these styles
-.components-modal__frame {
-	@include reset;
-
-}
-
 .blocks-widgets-container {
+	@include reset;
 	// On mobile the main content area has to scroll, otherwise you can invoke
 	// the overscroll bounce on the non-scrolling container, for a bad experience.
 	@include break-small {
diff --git a/packages/editor/.npmrc b/packages/editor/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/editor/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/editor/CHANGELOG.md b/packages/editor/CHANGELOG.md
index 34019a6aad78d9..2716d965d14343 100644
--- a/packages/editor/CHANGELOG.md
+++ b/packages/editor/CHANGELOG.md
@@ -2,6 +2,71 @@
 
 ## Unreleased
 
+### Bug Fixes
+
+-   `Post Featured Image`: Fix `Set featured image` button's `box-shadow` transition to prevent border from flashing when focused.
+
+## 14.10.0 (2024-10-16)
+
+## 14.9.0 (2024-10-03)
+
+## 14.8.0 (2024-09-19)
+
+## 14.7.0 (2024-09-05)
+
+## 14.6.0 (2024-08-21)
+
+## 14.5.0 (2024-08-07)
+
+## 14.4.0 (2024-07-24)
+
+### Deprecations
+
+-   `PostTaxonomiesFlatTermSelector`: Deprecate bottom margin. Add a `__nextHasNoMarginBottom` prop to start opting into the margin-free styles that will become the default in a future version, currently scheduled to be WordPress 7.0 ([#63491](https://github.com/WordPress/gutenberg/pull/63491)).
+
+## 14.3.0 (2024-07-10)
+
+## 14.2.0 (2024-06-26)
+
+## 14.1.0 (2024-06-15)
+
+## 14.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 13.35.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 13.34.0 (2024-05-02)
+
+## 13.33.0 (2024-04-19)
+
+## 13.32.0 (2024-04-03)
+
+## 13.31.0 (2024-03-21)
+
+## 13.30.0 (2024-03-06)
+
+## 13.29.0 (2024-02-21)
+
+## 13.28.0 (2024-02-09)
+
+## 13.27.0 (2024-01-24)
+
+## 13.26.0 (2024-01-10)
+
+### New Features
+
+-   Add the editor panels visibility state to the editor store in addition to the following actions and selectors: `toggleEditorPanelEnabled`, `toggleEditorPanelOpened`, `removeEditorPanel`, `isEditorPanelRemoved`, `isEditorPanelOpened` and `isEditorPanelEnabled`.
+
+## 13.25.0 (2023-12-13)
+
 ## 13.24.0 (2023-11-29)
 
 ## 13.23.0 (2023-11-16)
@@ -100,34 +165,34 @@
 
 ### Deprecations
 
-- Deprecated `cleanForSlug` that is now part of `@wordpress/url`.
+-   Deprecated `cleanForSlug` that is now part of `@wordpress/url`.
 
 ## 12.2.0 (2022-02-10)
 
-### Enhancement
+### Enhancements
 
 -   Export `PostTaxonomiesFlatTermSelector` and `PostTaxonomiesHierarchicalTermSelector` components to allow using them to customize the default term selector for a taxonomy.
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/autop`, `@wordpress/blob` and `@wordpress/is-shallow-equal` dependencies ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
 ### Deprecations
 
-- the `createUndoLevel` and `refreshPost` actions were marked as deprecated. They were already defunct and acting as noops.
+-   the `createUndoLevel` and `refreshPost` actions were marked as deprecated. They were already defunct and acting as noops.
 
 ## 12.1.0 (2022-01-27)
 
 ## 12.0.0 (2021-10-12)
 
-### Breaking changes
+### Breaking Changes
 
 -   Removed the deprecated `resetAutosave` action ([#34537](https://github.com/WordPress/gutenberg/pull/34537)).
 -   Removed the deprecated `getAutosave`, `hasAutosave` and `getBlockForSerialization` selectors ([#34537](https://github.com/WordPress/gutenberg/pull/34537)).
 
 ## 11.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -139,20 +204,20 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 
 ## 9.26.0 (2021-03-17)
 
 ## 9.25.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the editor namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
 ## 9.21.0 (2020-09-03)
 
-### Enhancement
+### Enhancements
 
 -   The `UnsavedChangesWarning` component is now using `__experimentalGetDirtyEntityRecords` to determine if there were changes.
 
@@ -378,7 +443,7 @@
 
 ## 7.0.1 (2018-11-12)
 
-### Polish
+### Internal
 
 -   Remove unnecessary `locale` prop usage [#11649](https://github.com/WordPress/gutenberg/pull/11649)
 
@@ -388,11 +453,11 @@
 
 ## 7.0.0 (2018-11-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   The `PanelColor` component has been removed.
 
-### New Feature
+### New Features
 
 -   In `NavigableToolbar`, a property focusOnMount was added, if true, the toolbar will get focus as soon as it mounted. Defaults to false.
 
@@ -410,7 +475,7 @@
 
 -   `PostPublishPanelToggle` has been deprecated in favor of `PostPublishButton`.
 
-### Polish
+### Internal
 
 -   Reactive block styles.
 
@@ -422,7 +487,7 @@
 
 ## 6.1.1 (2018-11-03)
 
-### Polish
+### Internal
 
 -   Remove `findDOMNode` usage from the `Inserter` component.
 -   Remove `findDOMNode` usage from the `Block` component.
@@ -455,7 +520,7 @@
 -   New actions `lockPostSaving` and `unlockPostSaving` were introduced ([#10649](https://github.com/WordPress/gutenberg/pull/10649)).
 -   New selector `isPostSavingLocked` was introduced ([#10649](https://github.com/WordPress/gutenberg/pull/10649)).
 
-### Polish
+### Internal
 
 -   Add animated logo to preview interstitial screen.
 -   Tweak the editor styles support.
diff --git a/packages/editor/README.md b/packages/editor/README.md
index 12cb885db857e8..bcd1727e046d07 100644
--- a/packages/editor/README.md
+++ b/packages/editor/README.md
@@ -114,6 +114,1699 @@ Example:
 } )( window.wp.editor, window.React );
 ```
 
+## API
+
+<!-- START TOKEN(Autogenerated API docs) -->
+
+### AlignmentToolbar
+
+> **Deprecated** since 5.3, use `wp.blockEditor.AlignmentToolbar` instead.
+
+### Autocomplete
+
+> **Deprecated** since 5.3, use `wp.blockEditor.Autocomplete` instead.
+
+### AutosaveMonitor
+
+Monitors the changes made to the edited post and triggers autosave if necessary.
+
+The logic is straightforward: a check is performed every `props.interval` seconds. If any changes are detected, `props.autosave()` is called. The time between the change and the autosave varies but is no larger than `props.interval` seconds. Refer to the code below for more details, such as the specific way of detecting changes.
+
+There are two caveats:
+
+-   If `props.isAutosaveable` happens to be false at a time of checking for changes, the check is retried every second.
+-   The timer may be disabled by setting `props.disableIntervalChecks` to `true`. In that mode, any change will immediately trigger `props.autosave()`.
+
+_Usage_
+
+```jsx
+<AutosaveMonitor interval={ 30000 } />
+```
+
+_Parameters_
+
+-   _props_ `Object`: - The properties passed to the component.
+-   _props.autosave_ `Function`: - The function to call when changes need to be saved.
+-   _props.interval_ `number`: - The maximum time in seconds between an unsaved change and an autosave.
+-   _props.isAutosaveable_ `boolean`: - If false, the check for changes is retried every second.
+-   _props.disableIntervalChecks_ `boolean`: - If true, disables the timer and any change will immediately trigger `props.autosave()`.
+-   _props.isDirty_ `boolean`: - Indicates if there are unsaved changes.
+
+### BlockAlignmentToolbar
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockAlignmentToolbar` instead.
+
+### BlockControls
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockControls` instead.
+
+### BlockEdit
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockEdit` instead.
+
+### BlockEditorKeyboardShortcuts
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockEditorKeyboardShortcuts` instead.
+
+### BlockFormatControls
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockFormatControls` instead.
+
+### BlockIcon
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockIcon` instead.
+
+### BlockInspector
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockInspector` instead.
+
+### BlockList
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockList` instead.
+
+### BlockMover
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockMover` instead.
+
+### BlockNavigationDropdown
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockNavigationDropdown` instead.
+
+### BlockSelectionClearer
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockSelectionClearer` instead.
+
+### BlockSettingsMenu
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockSettingsMenu` instead.
+
+### BlockTitle
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockTitle` instead.
+
+### BlockToolbar
+
+> **Deprecated** since 5.3, use `wp.blockEditor.BlockToolbar` instead.
+
+### CharacterCount
+
+Renders the character count of the post content.
+
+_Returns_
+
+-   `number`: The character count.
+
+### cleanForSlug
+
+Performs some basic cleanup of a string for use as a post slug
+
+This replicates some of what sanitize_title() does in WordPress core, but is only designed to approximate what the slug will be.
+
+Converts Latin-1 Supplement and Latin Extended-A letters to basic Latin letters. Removes combining diacritical marks. Converts whitespace, periods, and forward slashes to hyphens. Removes any remaining non-word characters except hyphens and underscores. Converts remaining string to lowercase. It does not account for octets, HTML entities, or other encoded characters.
+
+_Parameters_
+
+-   _string_ `string`: Title or slug to be processed
+
+_Returns_
+
+-   `string`: Processed string
+
+### ColorPalette
+
+> **Deprecated** since 5.3, use `wp.blockEditor.ColorPalette` instead.
+
+### ContrastChecker
+
+> **Deprecated** since 5.3, use `wp.blockEditor.ContrastChecker` instead.
+
+### CopyHandler
+
+> **Deprecated** since 5.3, use `wp.blockEditor.CopyHandler` instead.
+
+### createCustomColorsHOC
+
+> **Deprecated** since 5.3, use `wp.blockEditor.createCustomColorsHOC` instead.
+
+### DefaultBlockAppender
+
+> **Deprecated** since 5.3, use `wp.blockEditor.DefaultBlockAppender` instead.
+
+### DocumentBar
+
+This component renders a navigation bar at the top of the editor. It displays the title of the current document, a back button (if applicable), and a command center button. It also handles different states of the document, such as "not found" or "unsynced".
+
+_Usage_
+
+```jsx
+<DocumentBar />
+```
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.title_ `string`: A title for the document, defaulting to the document or template title currently being edited.
+-   _props.icon_ `IconType`: An icon for the document, no default. (A default icon indicating the document post type is no longer used.)
+
+_Returns_
+
+-   `JSX.Element`: The rendered DocumentBar component.
+
+### DocumentOutline
+
+Renders a document outline component.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.onSelect_ `Function`: Function to be called when an outline item is selected.
+-   _props.isTitleSupported_ `boolean`: Indicates whether the title is supported.
+-   _props.hasOutlineItemsDisabled_ `boolean`: Indicates whether the outline items are disabled.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### DocumentOutlineCheck
+
+Component check if there are any headings (core/heading blocks) present in the document.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `Component|null`: The component to be rendered or null if there are headings.
+
+### EditorHistoryRedo
+
+Renders the redo button for the editor history.
+
+_Parameters_
+
+-   _props_ `Object`: - Props.
+-   _ref_ `Ref`: - Forwarded ref.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### EditorHistoryUndo
+
+Renders the undo button for the editor history.
+
+_Parameters_
+
+-   _props_ `Object`: - Props.
+-   _ref_ `Ref`: - Forwarded ref.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### EditorKeyboardShortcuts
+
+Handles the keyboard shortcuts for the editor.
+
+It provides functionality for various keyboard shortcuts such as toggling editor mode, toggling distraction-free mode, undo/redo, saving the post, toggling list view, and toggling the sidebar.
+
+### EditorKeyboardShortcutsRegister
+
+Component for registering editor keyboard shortcuts.
+
+_Returns_
+
+-   `Element`: The component to be rendered.
+
+### EditorNotices
+
+This component renders the notices displayed in the editor. It displays pinned notices first, followed by dismissible
+
+_Usage_
+
+```jsx
+<EditorNotices />
+```
+
+_Returns_
+
+-   `JSX.Element`: The rendered EditorNotices component.
+
+### EditorProvider
+
+This component establishes a new post editing context, and serves as the entry point for a new post editor (or post with template editor).
+
+It supports a large number of post types, including post, page, templates, custom post types, patterns, template parts.
+
+All modification and changes are performed to the `@wordpress/core-data` store.
+
+_Usage_
+
+```jsx
+<EditorProvider
+	post={ post }
+	settings={ settings }
+	__unstableTemplate={ template }
+>
+	{ children }
+</EditorProvider>
+```
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.post_ `[Object]`: The post object to edit. This is required.
+-   _props.\_\_unstableTemplate_ `[Object]`: The template object wrapper the edited post. This is optional and can only be used when the post type supports templates (like posts and pages).
+-   _props.settings_ `[Object]`: The settings object to use for the editor. This is optional and can be used to override the default settings.
+-   _props.children_ `[Element]`: Children elements for which the BlockEditorProvider context should apply. This is optional.
+
+_Returns_
+
+-   `JSX.Element`: The rendered EditorProvider component.
+
+### EditorSnackbars
+
+Renders the editor snackbars component.
+
+_Returns_
+
+-   `JSX.Element`: The rendered component.
+
+### EntitiesSavedStates
+
+Renders the component for managing saved states of entities.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.close_ `Function`: The function to close the dialog.
+-   _props.renderDialog_ `Function`: The function to render the dialog.
+
+_Returns_
+
+-   `JSX.Element`: The rendered component.
+
+### ErrorBoundary
+
+ErrorBoundary is used to catch JavaScript errors anywhere in a child component tree, log those errors, and display a fallback UI.
+
+It uses the lifecycle methods getDerivedStateFromError and componentDidCatch to catch errors in a child component tree.
+
+getDerivedStateFromError is used to render a fallback UI after an error has been thrown, and componentDidCatch is used to log error information.
+
+### FontSizePicker
+
+> **Deprecated** since 5.3, use `wp.blockEditor.FontSizePicker` instead.
+
+### getColorClassName
+
+> **Deprecated** since 5.3, use `wp.blockEditor.getColorClassName` instead.
+
+### getColorObjectByAttributeValues
+
+> **Deprecated** since 5.3, use `wp.blockEditor.getColorObjectByAttributeValues` instead.
+
+### getColorObjectByColorValue
+
+> **Deprecated** since 5.3, use `wp.blockEditor.getColorObjectByColorValue` instead.
+
+### getFontSize
+
+> **Deprecated** since 5.3, use `wp.blockEditor.getFontSize` instead.
+
+### getFontSizeClass
+
+> **Deprecated** since 5.3, use `wp.blockEditor.getFontSizeClass` instead.
+
+### getTemplatePartIcon
+
+Helper function to retrieve the corresponding icon by name.
+
+_Parameters_
+
+-   _iconName_ `string`: The name of the icon.
+
+_Returns_
+
+-   `Object`: The corresponding icon.
+
+### InnerBlocks
+
+> **Deprecated** since 5.3, use `wp.blockEditor.InnerBlocks` instead.
+
+### Inserter
+
+> **Deprecated** since 5.3, use `wp.blockEditor.Inserter` instead.
+
+### InspectorAdvancedControls
+
+> **Deprecated** since 5.3, use `wp.blockEditor.InspectorAdvancedControls` instead.
+
+### InspectorControls
+
+> **Deprecated** since 5.3, use `wp.blockEditor.InspectorControls` instead.
+
+### LocalAutosaveMonitor
+
+Monitors local autosaves of a post in the editor. It uses several hooks and functions to manage autosave behavior:
+
+-   `useAutosaveNotice` hook: Manages the creation of a notice prompting the user to restore a local autosave, if one exists.
+-   `useAutosavePurge` hook: Ejects a local autosave after a successful save occurs.
+-   `hasSessionStorageSupport` function: Checks if the current environment supports browser sessionStorage.
+-   `LocalAutosaveMonitor` component: Uses the `AutosaveMonitor` component to perform autosaves at a specified interval.
+
+The module also checks for sessionStorage support and conditionally exports the `LocalAutosaveMonitor` component based on that.
+
+### MediaPlaceholder
+
+> **Deprecated** since 5.3, use `wp.blockEditor.MediaPlaceholder` instead.
+
+### MediaUpload
+
+> **Deprecated** since 5.3, use `wp.blockEditor.MediaUpload` instead.
+
+### mediaUpload
+
+Upload a media file when the file upload button is activated. Wrapper around mediaUpload() that injects the current post ID.
+
+_Parameters_
+
+-   _$0_ `Object`: Parameters object passed to the function.
+-   _$0.additionalData_ `?Object`: Additional data to include in the request.
+-   _$0.allowedTypes_ `string`: Array with the types of media that can be uploaded, if unset all types are allowed.
+-   _$0.filesList_ `Array`: List of files.
+-   _$0.maxUploadFileSize_ `?number`: Maximum upload size in bytes allowed for the site.
+-   _$0.onError_ `Function`: Function called when an error happens.
+-   _$0.onFileChange_ `Function`: Function called each time a file or a temporary representation of the file is available.
+
+### MediaUploadCheck
+
+> **Deprecated** since 5.3, use `wp.blockEditor.MediaUploadCheck` instead.
+
+### MultiSelectScrollIntoView
+
+> **Deprecated** since 5.3, use `wp.blockEditor.MultiSelectScrollIntoView` instead.
+
+### NavigableToolbar
+
+> **Deprecated** since 5.3, use `wp.blockEditor.NavigableToolbar` instead.
+
+### ObserveTyping
+
+> **Deprecated** since 5.3, use `wp.blockEditor.ObserveTyping` instead.
+
+### PageAttributesCheck
+
+Wrapper component that renders its children only if the post type supports page attributes.
+
+_Parameters_
+
+-   _props_ `Object`: - The component props.
+-   _props.children_ `Element`: - The child components to render.
+
+_Returns_
+
+-   `Component|null`: The rendered child components or null if page attributes are not supported.
+
+### PageAttributesOrder
+
+Renders the Page Attributes Order component. A number input in an editor interface for setting the order of a given page. The component is now not used in core but was kept for backward compatibility.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PageAttributesPanel
+
+Renders the Page Attributes Panel component.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PageAttributesParent
+
+Renders the Page Attributes Parent component. A dropdown menu in an editor interface for selecting the parent page of a given page.
+
+_Returns_
+
+-   `Component|null`: The component to be rendered. Return null if post type is not hierarchical.
+
+### PageTemplate
+
+Provides a dropdown menu for selecting and managing post templates.
+
+The dropdown menu includes a button for toggling the menu, a list of available templates, and options for creating and editing templates.
+
+_Returns_
+
+-   `JSX.Element`: The rendered ClassicThemeControl component.
+
+### PanelColorSettings
+
+> **Deprecated** since 5.3, use `wp.blockEditor.PanelColorSettings` instead.
+
+### PlainText
+
+> **Deprecated** since 5.3, use `wp.blockEditor.PlainText` instead.
+
+### PluginBlockSettingsMenuItem
+
+Renders a new item in the block settings menu.
+
+_Usage_
+
+```js
+// Using ES5 syntax
+var __ = wp.i18n.__;
+var PluginBlockSettingsMenuItem = wp.editor.PluginBlockSettingsMenuItem;
+
+function doOnClick() {
+	// To be called when the user clicks the menu item.
+}
+
+function MyPluginBlockSettingsMenuItem() {
+	return React.createElement( PluginBlockSettingsMenuItem, {
+		allowedBlocks: [ 'core/paragraph' ],
+		icon: 'dashicon-name',
+		label: __( 'Menu item text' ),
+		onClick: doOnClick,
+	} );
+}
+```
+
+```jsx
+// Using ESNext syntax
+import { __ } from '@wordpress/i18n';
+import { PluginBlockSettingsMenuItem } from '@wordpress/editor';
+
+const doOnClick = () => {
+	// To be called when the user clicks the menu item.
+};
+
+const MyPluginBlockSettingsMenuItem = () => (
+	<PluginBlockSettingsMenuItem
+		allowedBlocks={ [ 'core/paragraph' ] }
+		icon="dashicon-name"
+		label={ __( 'Menu item text' ) }
+		onClick={ doOnClick }
+	/>
+);
+```
+
+_Parameters_
+
+-   _props_ `Object`: Component props.
+-   _props.allowedBlocks_ `[Array]`: An array containing a list of block names for which the item should be shown. If not present, it'll be rendered for any block. If multiple blocks are selected, it'll be shown if and only if all of them are in the allowed list.
+-   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element.
+-   _props.label_ `string`: The menu item text.
+-   _props.onClick_ `Function`: Callback function to be executed when the user click the menu item.
+-   _props.small_ `[boolean]`: Whether to render the label or not.
+-   _props.role_ `[string]`: The ARIA role for the menu item.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PluginDocumentSettingPanel
+
+Renders items below the Status & Availability panel in the Document Sidebar.
+
+_Usage_
+
+```js
+// Using ES5 syntax
+var el = React.createElement;
+var __ = wp.i18n.__;
+var registerPlugin = wp.plugins.registerPlugin;
+var PluginDocumentSettingPanel = wp.editor.PluginDocumentSettingPanel;
+
+function MyDocumentSettingPlugin() {
+	return el(
+		PluginDocumentSettingPanel,
+		{
+			className: 'my-document-setting-plugin',
+			title: 'My Panel',
+			name: 'my-panel',
+		},
+		__( 'My Document Setting Panel' )
+	);
+}
+
+registerPlugin( 'my-document-setting-plugin', {
+	render: MyDocumentSettingPlugin,
+} );
+```
+
+```jsx
+// Using ESNext syntax
+import { registerPlugin } from '@wordpress/plugins';
+import { PluginDocumentSettingPanel } from '@wordpress/editor';
+
+const MyDocumentSettingTest = () => (
+	<PluginDocumentSettingPanel
+		className="my-document-setting-plugin"
+		title="My Panel"
+		name="my-panel"
+	>
+		<p>My Document Setting Panel</p>
+	</PluginDocumentSettingPanel>
+);
+
+registerPlugin( 'document-setting-test', { render: MyDocumentSettingTest } );
+```
+
+_Parameters_
+
+-   _props_ `Object`: Component properties.
+-   _props.name_ `string`: Required. A machine-friendly name for the panel.
+-   _props.className_ `[string]`: An optional class name added to the row.
+-   _props.title_ `[string]`: The title of the panel
+-   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
+-   _props.children_ `Element`: Children to be rendered
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PluginMoreMenuItem
+
+Renders a menu item in `Plugins` group in `More Menu` drop down, and can be used to as a button or link depending on the props provided. The text within the component appears as the menu item label.
+
+_Usage_
+
+```js
+// Using ES5 syntax
+var __ = wp.i18n.__;
+var PluginMoreMenuItem = wp.editor.PluginMoreMenuItem;
+var moreIcon = wp.element.createElement( 'svg' ); //... svg element.
+
+function onButtonClick() {
+	alert( 'Button clicked.' );
+}
+
+function MyButtonMoreMenuItem() {
+	return wp.element.createElement(
+		PluginMoreMenuItem,
+		{
+			icon: moreIcon,
+			onClick: onButtonClick,
+		},
+		__( 'My button title' )
+	);
+}
+```
+
+```jsx
+// Using ESNext syntax
+import { __ } from '@wordpress/i18n';
+import { PluginMoreMenuItem } from '@wordpress/editor';
+import { more } from '@wordpress/icons';
+
+function onButtonClick() {
+	alert( 'Button clicked.' );
+}
+
+const MyButtonMoreMenuItem = () => (
+	<PluginMoreMenuItem icon={ more } onClick={ onButtonClick }>
+		{ __( 'My button title' ) }
+	</PluginMoreMenuItem>
+);
+```
+
+_Parameters_
+
+-   _props_ `Object`: Component properties.
+-   _props.href_ `[string]`: When `href` is provided then the menu item is represented as an anchor rather than button. It corresponds to the `href` attribute of the anchor.
+-   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
+-   _props.onClick_ `[Function]`: The callback function to be executed when the user clicks the menu item.
+-   _props.other_ `[...*]`: Any additional props are passed through to the underlying [Button](/packages/components/src/button/README.md) component.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PluginPostPublishPanel
+
+Renders provided content to the post-publish panel in the publish flow (side panel that opens after a user publishes the post).
+
+_Usage_
+
+```jsx
+// Using ESNext syntax
+import { __ } from '@wordpress/i18n';
+import { PluginPostPublishPanel } from '@wordpress/editor';
+
+const MyPluginPostPublishPanel = () => (
+	<PluginPostPublishPanel
+		className="my-plugin-post-publish-panel"
+		title={ __( 'My panel title' ) }
+		initialOpen={ true }
+	>
+		{ __( 'My panel content' ) }
+	</PluginPostPublishPanel>
+);
+```
+
+_Parameters_
+
+-   _props_ `Object`: Component properties.
+-   _props.className_ `[string]`: An optional class name added to the panel.
+-   _props.title_ `[string]`: Title displayed at the top of the panel.
+-   _props.initialOpen_ `[boolean]`: Whether to have the panel initially opened. When no title is provided it is always opened.
+-   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
+-   _props.children_ `Element`: Children to be rendered
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PluginPostStatusInfo
+
+Renders a row in the Summary panel of the Document sidebar. It should be noted that this is named and implemented around the function it serves and not its location, which may change in future iterations.
+
+_Usage_
+
+```js
+// Using ES5 syntax
+var __ = wp.i18n.__;
+var PluginPostStatusInfo = wp.editor.PluginPostStatusInfo;
+
+function MyPluginPostStatusInfo() {
+	return React.createElement(
+		PluginPostStatusInfo,
+		{
+			className: 'my-plugin-post-status-info',
+		},
+		__( 'My post status info' )
+	);
+}
+```
+
+```jsx
+// Using ESNext syntax
+import { __ } from '@wordpress/i18n';
+import { PluginPostStatusInfo } from '@wordpress/editor';
+
+const MyPluginPostStatusInfo = () => (
+	<PluginPostStatusInfo className="my-plugin-post-status-info">
+		{ __( 'My post status info' ) }
+	</PluginPostStatusInfo>
+);
+```
+
+_Parameters_
+
+-   _props_ `Object`: Component properties.
+-   _props.className_ `[string]`: An optional class name added to the row.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PluginPrePublishPanel
+
+Renders provided content to the pre-publish side panel in the publish flow (side panel that opens when a user first pushes "Publish" from the main editor).
+
+_Usage_
+
+```jsx
+// Using ESNext syntax
+import { __ } from '@wordpress/i18n';
+import { PluginPrePublishPanel } from '@wordpress/editor';
+
+const MyPluginPrePublishPanel = () => (
+	<PluginPrePublishPanel
+		className="my-plugin-pre-publish-panel"
+		title={ __( 'My panel title' ) }
+		initialOpen={ true }
+	>
+		{ __( 'My panel content' ) }
+	</PluginPrePublishPanel>
+);
+```
+
+_Parameters_
+
+-   _props_ `Object`: Component props.
+-   _props.className_ `[string]`: An optional class name added to the panel.
+-   _props.title_ `[string]`: Title displayed at the top of the panel.
+-   _props.initialOpen_ `[boolean]`: Whether to have the panel initially opened. When no title is provided it is always opened.
+-   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
+-   _props.children_ `Element`: Children to be rendered
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PluginPreviewMenuItem
+
+Renders a menu item in the Preview dropdown, which can be used as a button or link depending on the props provided. The text within the component appears as the menu item label.
+
+_Usage_
+
+```jsx
+import { __ } from '@wordpress/i18n';
+import { PluginPreviewMenuItem } from '@wordpress/editor';
+import { external } from '@wordpress/icons';
+
+function onPreviewClick() {
+	// Handle preview action
+}
+
+const ExternalPreviewMenuItem = () => (
+	<PluginPreviewMenuItem icon={ external } onClick={ onPreviewClick }>
+		{ __( 'Preview in new tab' ) }
+	</PluginPreviewMenuItem>
+);
+registerPlugin( 'external-preview-menu-item', {
+	render: ExternalPreviewMenuItem,
+} );
+```
+
+_Parameters_
+
+-   _props_ `Object`: Component properties.
+-   _props.href_ `[string]`: When `href` is provided, the menu item is rendered as an anchor instead of a button. It corresponds to the `href` attribute of the anchor.
+-   _props.icon_ `[WPBlockTypeIconRender]`: The icon to be rendered to the left of the menu item label. Can be a Dashicon slug or an SVG WP element.
+-   _props.onClick_ `[Function]`: The callback function to be executed when the user clicks the menu item.
+-   _props.other_ `[...*]`: Any additional props are passed through to the underlying MenuItem component.
+
+_Returns_
+
+-   `Component`: The rendered menu item component.
+
+### PluginSidebar
+
+Renders a sidebar when activated. The contents within the `PluginSidebar` will appear as content within the sidebar. It also automatically renders a corresponding `PluginSidebarMenuItem` component when `isPinnable` flag is set to `true`. If you wish to display the sidebar, you can with use the `PluginSidebarMoreMenuItem` component or the `wp.data.dispatch` API:
+
+```js
+wp.data
+	.dispatch( 'core/edit-post' )
+	.openGeneralSidebar( 'plugin-name/sidebar-name' );
+```
+
+_Related_
+
+-   PluginSidebarMoreMenuItem
+
+_Usage_
+
+```js
+// Using ES5 syntax
+var __ = wp.i18n.__;
+var el = React.createElement;
+var PanelBody = wp.components.PanelBody;
+var PluginSidebar = wp.editor.PluginSidebar;
+var moreIcon = React.createElement( 'svg' ); //... svg element.
+
+function MyPluginSidebar() {
+	return el(
+		PluginSidebar,
+		{
+			name: 'my-sidebar',
+			title: 'My sidebar title',
+			icon: moreIcon,
+		},
+		el( PanelBody, {}, __( 'My sidebar content' ) )
+	);
+}
+```
+
+```jsx
+// Using ESNext syntax
+import { __ } from '@wordpress/i18n';
+import { PanelBody } from '@wordpress/components';
+import { PluginSidebar } from '@wordpress/editor';
+import { more } from '@wordpress/icons';
+
+const MyPluginSidebar = () => (
+	<PluginSidebar name="my-sidebar" title="My sidebar title" icon={ more }>
+		<PanelBody>{ __( 'My sidebar content' ) }</PanelBody>
+	</PluginSidebar>
+);
+```
+
+_Parameters_
+
+-   _props_ `Object`: Element props.
+-   _props.name_ `string`: A string identifying the sidebar. Must be unique for every sidebar registered within the scope of your plugin.
+-   _props.className_ `[string]`: An optional class name added to the sidebar body.
+-   _props.title_ `string`: Title displayed at the top of the sidebar.
+-   _props.isPinnable_ `[boolean]`: Whether to allow to pin sidebar to the toolbar. When set to `true` it also automatically renders a corresponding menu item.
+-   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
+
+### PluginSidebarMoreMenuItem
+
+Renders a menu item in `Plugins` group in `More Menu` drop down, and can be used to activate the corresponding `PluginSidebar` component. The text within the component appears as the menu item label.
+
+_Usage_
+
+```js
+// Using ES5 syntax
+var __ = wp.i18n.__;
+var PluginSidebarMoreMenuItem = wp.editor.PluginSidebarMoreMenuItem;
+var moreIcon = React.createElement( 'svg' ); //... svg element.
+
+function MySidebarMoreMenuItem() {
+	return React.createElement(
+		PluginSidebarMoreMenuItem,
+		{
+			target: 'my-sidebar',
+			icon: moreIcon,
+		},
+		__( 'My sidebar title' )
+	);
+}
+```
+
+```jsx
+// Using ESNext syntax
+import { __ } from '@wordpress/i18n';
+import { PluginSidebarMoreMenuItem } from '@wordpress/editor';
+import { more } from '@wordpress/icons';
+
+const MySidebarMoreMenuItem = () => (
+	<PluginSidebarMoreMenuItem target="my-sidebar" icon={ more }>
+		{ __( 'My sidebar title' ) }
+	</PluginSidebarMoreMenuItem>
+);
+```
+
+_Parameters_
+
+-   _props_ `Object`: Component props.
+-   _props.target_ `string`: A string identifying the target sidebar you wish to be activated by this menu item. Must be the same as the `name` prop you have given to that sidebar.
+-   _props.icon_ `[WPBlockTypeIconRender]`: The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostAuthor
+
+Renders the component for selecting the post author.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostAuthorCheck
+
+Wrapper component that renders its children only if the post type supports the author.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `Component|null`: The component to be rendered. Return `null` if the post type doesn't supports the author or if there are no authors available.
+
+### PostAuthorPanel
+
+Renders the Post Author Panel component.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostComments
+
+A form for managing comment status.
+
+_Returns_
+
+-   `JSX.Element`: The rendered PostComments component.
+
+### PostDiscussionPanel
+
+This component allows to update comment and pingback settings for the current post. Internally there are checks whether the current post has support for the above and if the `discussion-panel` panel is enabled.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered PostDiscussionPanel component.
+
+### PostExcerpt
+
+Renders an editable textarea for the post excerpt. Templates, template parts and patterns use the `excerpt` field as a description semantically. Additionally templates and template parts override the `excerpt` field as `description` in REST API. So this component handles proper labeling and updating the edited entity.
+
+_Parameters_
+
+-   _props_ `Object`: - Component props.
+-   _props.hideLabelFromVision_ `[boolean]`: - Whether to visually hide the textarea's label.
+-   _props.updateOnBlur_ `[boolean]`: - Whether to update the post on change or use local state and update on blur.
+
+### PostExcerptCheck
+
+Component for checking if the post type supports the excerpt field.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostExcerptPanel
+
+Is rendered if the post type supports excerpts and allows editing the excerpt.
+
+_Returns_
+
+-   `JSX.Element`: The rendered PostExcerptPanel component.
+
+### PostFeaturedImage
+
+Renders the component for managing the featured image of a post.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.currentPostId_ `number`: ID of the current post.
+-   _props.featuredImageId_ `number`: ID of the featured image.
+-   _props.onUpdateImage_ `Function`: Function to call when the image is updated.
+-   _props.onRemoveImage_ `Function`: Function to call when the image is removed.
+-   _props.media_ `Object`: The media object representing the featured image.
+-   _props.postType_ `string`: Post type.
+-   _props.noticeUI_ `Element`: UI for displaying notices.
+-   _props.noticeOperations_ `Object`: Operations for managing notices.
+
+_Returns_
+
+-   `Element`: Component to be rendered .
+
+### PostFeaturedImageCheck
+
+Wrapper component that renders its children only if the post type supports a featured image and the theme supports post thumbnails.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostFeaturedImagePanel
+
+Renders the panel for the post featured image.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.withPanelBody_ `boolean`: Whether to include the panel body. Default true.
+
+_Returns_
+
+-   `Component|null`: The component to be rendered. Return Null if the editor panel is disabled for featured image.
+
+### PostFormat
+
+`PostFormat` a component that allows changing the post format while also providing a suggestion for the current post.
+
+_Usage_
+
+```jsx
+<PostFormat />
+```
+
+_Returns_
+
+-   `JSX.Element`: The rendered PostFormat component.
+
+### PostFormatCheck
+
+Component check if there are any post formats.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.children_ `Element`: The child elements to render.
+
+_Returns_
+
+-   `Component|null`: The rendered component or null if post formats are disabled.
+
+### PostLastRevision
+
+Renders the component for displaying the last revision of a post.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostLastRevisionCheck
+
+Wrapper component that renders its children if the post has more than one revision.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `Component|null`: Rendered child components if post has more than one revision, otherwise null.
+
+### PostLastRevisionPanel
+
+Renders the panel for displaying the last revision of a post.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostLockedModal
+
+A modal component that is displayed when a post is locked for editing by another user. The modal provides information about the lock status and options to take over or exit the editor.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered PostLockedModal component.
+
+### PostPendingStatus
+
+A component for displaying and toggling the pending status of a post.
+
+_Returns_
+
+-   `JSX.Element`: The rendered component.
+
+### PostPendingStatusCheck
+
+This component checks the publishing status of the current post. If the post is already published or the user doesn't have the capability to publish, it returns null.
+
+_Parameters_
+
+-   _props_ `Object`: Component properties.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered child elements or null if the post is already published or the user doesn't have the capability to publish.
+
+### PostPingbacks
+
+Renders a control for enabling or disabling pingbacks and trackbacks in a WordPress post.
+
+### PostPreviewButton
+
+Renders a button that opens a new window or tab for the preview, writes the interstitial message to this window, and then navigates to the actual preview link. The button is not rendered if the post is not viewable and disabled if the post is not saveable.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.className_ `string`: The class name for the button.
+-   _props.textContent_ `string`: The text content for the button.
+-   _props.forceIsAutosaveable_ `boolean`: Whether to force autosave.
+-   _props.role_ `string`: The role attribute for the button.
+-   _props.onPreview_ `Function`: The callback function for preview event.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered button component.
+
+### PostPublishButton
+
+Renders the publish button.
+
+### PostPublishButtonLabel
+
+Renders the label for the publish button.
+
+_Returns_
+
+-   `string`: The label for the publish button.
+
+### PostPublishPanel
+
+Renders a panel for publishing a post.
+
+### PostSavedState
+
+Component showing whether the post is saved or not and providing save buttons.
+
+_Parameters_
+
+-   _props_ `Object`: Component props.
+-   _props.forceIsDirty_ `?boolean`: Whether to force the post to be marked as dirty.
+
+_Returns_
+
+-   `import('react').ComponentType`: The component.
+
+### PostSchedule
+
+Renders the PostSchedule component. It allows the user to schedule a post.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.onClose_ `Function`: Function to close the component.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostScheduleCheck
+
+Wrapper component that renders its children only if post has a publish action.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `Component`: - The component to be rendered or null if there is no publish action.
+
+### PostScheduleLabel
+
+Renders the PostScheduleLabel component.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostSchedulePanel
+
+Renders the Post Schedule Panel component.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostSlug
+
+Renders the PostSlug component. It provide a control for editing the post slug.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostSlugCheck
+
+Wrapper component that renders its children only if the post type supports the slug.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostSticky
+
+Renders the PostSticky component. It provides a checkbox control for the sticky post feature.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostStickyCheck
+
+Wrapper component that renders its children only if post has a sticky action.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.children_ `Element`: Children to be rendered.
+
+_Returns_
+
+-   `Component`: The component to be rendered or null if post type is not 'post' or hasStickyAction is false.
+
+### PostSwitchToDraftButton
+
+Renders a button component that allows the user to switch a post to draft status.
+
+_Returns_
+
+-   `JSX.Element`: The rendered component.
+
+### PostSyncStatus
+
+Renders the sync status of a post.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered sync status component.
+
+### PostTaxonomies
+
+Renders the taxonomies associated with a post.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.taxonomyWrapper_ `Function`: The wrapper function for each taxonomy component.
+
+_Returns_
+
+-   `Array`: An array of JSX elements representing the visible taxonomies.
+
+### PostTaxonomiesCheck
+
+Renders the children components only if the current post type has taxonomies.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.children_ `Element`: The children components to render.
+
+_Returns_
+
+-   `Component|null`: The rendered children components or null if the current post type has no taxonomies.
+
+### PostTaxonomiesFlatTermSelector
+
+Renders a flat term selector component.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.slug_ `string`: The slug of the taxonomy.
+-   _props.\_\_nextHasNoMarginBottom_ `boolean`: Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 7.0. (The prop can be safely removed once this happens.)
+
+_Returns_
+
+-   `JSX.Element`: The rendered flat term selector component.
+
+### PostTaxonomiesHierarchicalTermSelector
+
+Hierarchical term selector.
+
+_Parameters_
+
+-   _props_ `Object`: Component props.
+-   _props.slug_ `string`: Taxonomy slug.
+
+_Returns_
+
+-   `Element`: Hierarchical term selector component.
+
+### PostTaxonomiesPanel
+
+Renders a panel for a specific taxonomy.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.taxonomy_ `Object`: The taxonomy object.
+-   _props.children_ `Element`: The child components.
+
+_Returns_
+
+-   `Component`: The rendered taxonomy panel.
+
+### PostTemplatePanel
+
+Displays the template controls based on the current editor settings and user permissions.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered PostTemplatePanel component.
+
+### PostTextEditor
+
+Displays the Post Text Editor along with content in Visual and Text mode.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered PostTextEditor component.
+
+### PostTitle
+
+Renders the `PostTitle` component.
+
+_Parameters_
+
+-   \_\_\_ `Object`: Unused parameter.
+-   _forwardedRef_ `Element`: Forwarded ref for the component.
+
+_Returns_
+
+-   `Component`: The rendered PostTitle component.
+
+### PostTitleRaw
+
+Undocumented declaration.
+
+### PostTrash
+
+Displays the Post Trash Button and Confirm Dialog in the Editor.
+
+_Parameters_
+
+-   _An_ `?{onActionPerformed: Object}`: object containing the onActionPerformed function.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered PostTrash component.
+
+### PostTrashCheck
+
+Wrapper component that renders its children only if the post can trashed.
+
+_Parameters_
+
+-   _props_ `Object`: - The component props.
+-   _props.children_ `Element`: - The child components to render.
+
+_Returns_
+
+-   `Component|null`: The rendered child components or null if the post can not trashed.
+
+### PostTypeSupportCheck
+
+A component which renders its own children only if the current editor post type supports one of the given `supportKeys` prop.
+
+_Parameters_
+
+-   _props_ `Object`: Props.
+-   _props.children_ `Element`: Children to be rendered if post type supports.
+-   _props.supportKeys_ `(string|string[])`: String or string array of keys to test.
+
+_Returns_
+
+-   `Component`: The component to be rendered.
+
+### PostURL
+
+Renders the `PostURL` component.
+
+_Usage_
+
+```jsx
+<PostURL />
+```
+
+_Parameters_
+
+-   _onClose_ `Function`: Callback function to be executed when the popover is closed.
+
+_Returns_
+
+-   `Component`: The rendered PostURL component.
+
+### PostURLCheck
+
+Check if the post URL is valid and visible.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.children_ `Element`: The child components.
+
+_Returns_
+
+-   `Component|null`: The child components if the post URL is valid and visible, otherwise null.
+
+### PostURLLabel
+
+Represents a label component for a post URL.
+
+_Returns_
+
+-   `Component`: The PostURLLabel component.
+
+### PostURLPanel
+
+Renders the `PostURLPanel` component.
+
+_Returns_
+
+-   `JSX.Element`: The rendered PostURLPanel component.
+
+### PostVisibility
+
+Allows users to set the visibility of a post.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.onClose_ `Function`: Function to call when the popover is closed.
+
+_Returns_
+
+-   `JSX.Element`: The rendered component.
+
+### PostVisibilityCheck
+
+Determines if the current post can be edited (published) and passes this information to the provided render function.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.render_ `Function`: Function to render the component. Receives an object with a `canEdit` property.
+
+_Returns_
+
+-   `JSX.Element`: The rendered component.
+
+### PostVisibilityLabel
+
+Returns the label for the current post visibility setting.
+
+_Returns_
+
+-   `string`: Post visibility label.
+
+### privateApis
+
+Undocumented declaration.
+
+### registerEntityAction
+
+Registers a new DataViews action.
+
+This is an experimental API and is subject to change. it's only available in the Gutenberg plugin for now.
+
+_Parameters_
+
+-   _kind_ `string`: Entity kind.
+-   _name_ `string`: Entity name.
+-   _config_ `Action`: Action configuration.
+
+### RichText
+
+> **Deprecated** since 5.3, use `wp.blockEditor.RichText` instead.
+
+### RichTextShortcut
+
+> **Deprecated** since 5.3, use `wp.blockEditor.RichTextShortcut` instead.
+
+### RichTextToolbarButton
+
+> **Deprecated** since 5.3, use `wp.blockEditor.RichTextToolbarButton` instead.
+
+### ServerSideRender
+
+Undocumented declaration.
+
+### SkipToSelectedBlock
+
+> **Deprecated** since 5.3, use `wp.blockEditor.SkipToSelectedBlock` instead.
+
+### store
+
+Store definition for the editor namespace.
+
+_Related_
+
+-   <https://github.com/WordPress/gutenberg/blob/HEAD/packages/data/README.md#createReduxStore>
+
+_Type_
+
+-   `Object`
+
+### storeConfig
+
+Post editor data store configuration.
+
+_Related_
+
+-   <https://github.com/WordPress/gutenberg/blob/HEAD/packages/data/README.md#registerStore>
+
+_Type_
+
+-   `Object`
+
+### TableOfContents
+
+Renders a table of contents component.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.hasOutlineItemsDisabled_ `boolean`: Whether outline items are disabled.
+-   _props.repositionDropdown_ `boolean`: Whether to reposition the dropdown.
+-   _ref_ `Element.ref`: The component's ref.
+
+_Returns_
+
+-   `JSX.Element`: The rendered table of contents component.
+
+### TextEditorGlobalKeyboardShortcuts
+
+Handles the keyboard shortcuts for the editor.
+
+It provides functionality for various keyboard shortcuts such as toggling editor mode, toggling distraction-free mode, undo/redo, saving the post, toggling list view, and toggling the sidebar.
+
+### ThemeSupportCheck
+
+Checks if the current theme supports specific features and renders the children if supported.
+
+_Parameters_
+
+-   _props_ `Object`: The component props.
+-   _props.children_ `Element`: The children to render if the theme supports the specified features.
+-   _props.supportKeys_ `string|string[]`: The key(s) of the theme support(s) to check.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered children if the theme supports the specified features, otherwise null.
+
+### TimeToRead
+
+Component for showing Time To Read in Content.
+
+_Returns_
+
+-   `JSX.Element`: The rendered TimeToRead component.
+
+### transformStyles
+
+Undocumented declaration.
+
+### unregisterEntityAction
+
+Unregisters a DataViews action.
+
+This is an experimental API and is subject to change. it's only available in the Gutenberg plugin for now.
+
+_Parameters_
+
+-   _kind_ `string`: Entity kind.
+-   _name_ `string`: Entity name.
+-   _actionId_ `string`: Action ID.
+
+### UnsavedChangesWarning
+
+Warns the user if there are unsaved changes before leaving the editor. Compatible with Post Editor and Site Editor.
+
+_Returns_
+
+-   `Component`: The component.
+
+### URLInput
+
+> **Deprecated** since 5.3, use `wp.blockEditor.URLInput` instead.
+
+### URLInputButton
+
+> **Deprecated** since 5.3, use `wp.blockEditor.URLInputButton` instead.
+
+### URLPopover
+
+> **Deprecated** since 5.3, use `wp.blockEditor.URLPopover` instead.
+
+### useEntitiesSavedStatesIsDirty
+
+Custom hook that determines if any entities are dirty (edited) and provides a way to manage selected/unselected entities.
+
+_Returns_
+
+-   `Object`: An object containing the following properties: - dirtyEntityRecords: An array of dirty entity records. - isDirty: A boolean indicating if there are any dirty entity records. - setUnselectedEntities: A function to set the unselected entities. - unselectedEntities: An array of unselected entities.
+
+### usePostScheduleLabel
+
+Custom hook to get the label for post schedule.
+
+_Parameters_
+
+-   _options_ `Object`: Options for the hook.
+-   _options.full_ `boolean`: Whether to get the full label or not. Default is false.
+
+_Returns_
+
+-   `string`: The label for post schedule.
+
+### usePostURLLabel
+
+Custom hook to get the label for the post URL.
+
+_Returns_
+
+-   `string`: The filtered and decoded post URL label.
+
+### usePostVisibilityLabel
+
+Get the label for the current post visibility setting.
+
+_Returns_
+
+-   `string`: Post visibility label.
+
+### userAutocompleter
+
+A user mentions completer.
+
+_Type_
+
+-   `WPCompleter`
+
+### VisualEditorGlobalKeyboardShortcuts
+
+Handles the keyboard shortcuts for the editor.
+
+It provides functionality for various keyboard shortcuts such as toggling editor mode, toggling distraction-free mode, undo/redo, saving the post, toggling list view, and toggling the sidebar.
+
+### Warning
+
+> **Deprecated** since 5.3, use `wp.blockEditor.Warning` instead.
+
+### withColorContext
+
+> **Deprecated** since 5.3, use `wp.blockEditor.createCustomColorsHOC` instead.
+
+### withColors
+
+> **Deprecated** since 5.3, use `wp.blockEditor.withColors` instead.
+
+### withFontSizes
+
+> **Deprecated** since 5.3, use `wp.blockEditor.withFontSizes` instead.
+
+### WordCount
+
+Renders the word count of the post content.
+
+_Returns_
+
+-   `JSX.Element|null`: The rendered WordCount component.
+
+### WritingFlow
+
+> **Deprecated** since 5.3, use `wp.blockEditor.WritingFlow` instead.
+
+<!-- END TOKEN(Autogenerated API docs) -->
+
 ## Contributing to this package
 
 This is an individual package that's part of the Gutenberg project. The project is organized as a monorepo. It's made up of multiple self-contained software packages, each with a specific purpose. The packages in this monorepo are published to [npm](https://www.npmjs.com/) and used by [WordPress](https://make.wordpress.org/core/) as well as other software projects.
diff --git a/packages/editor/package.json b/packages/editor/package.json
index 81d24961a775ec..8c799085875c20 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "13.24.0",
+	"version": "14.10.0",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,46 +28,56 @@
 	"sideEffects": [
 		"build-style/**",
 		"src/**/*.scss",
-		"{src,build,build-module}/{index.js,store/index.js,hooks/**}"
+		"{src,build,build-module}/{index.js,store/index.js,hooks/**,bindings/**}"
 	],
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/blob": "file:../blob",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/commands": "file:../commands",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/date": "file:../date",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/dom": "file:../dom",
-		"@wordpress/element": "file:../element",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
-		"@wordpress/keycodes": "file:../keycodes",
-		"@wordpress/media-utils": "file:../media-utils",
-		"@wordpress/notices": "file:../notices",
-		"@wordpress/patterns": "file:../patterns",
-		"@wordpress/preferences": "file:../preferences",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/reusable-blocks": "file:../reusable-blocks",
-		"@wordpress/rich-text": "file:../rich-text",
-		"@wordpress/server-side-render": "file:../server-side-render",
-		"@wordpress/url": "file:../url",
-		"@wordpress/wordcount": "file:../wordcount",
-		"classnames": "^2.3.1",
-		"date-fns": "^2.28.0",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/blob": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/commands": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/dataviews": "*",
+		"@wordpress/date": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/dom": "*",
+		"@wordpress/element": "*",
+		"@wordpress/fields": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/interface": "*",
+		"@wordpress/keyboard-shortcuts": "*",
+		"@wordpress/keycodes": "*",
+		"@wordpress/media-utils": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/patterns": "*",
+		"@wordpress/plugins": "*",
+		"@wordpress/preferences": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/reusable-blocks": "*",
+		"@wordpress/rich-text": "*",
+		"@wordpress/server-side-render": "*",
+		"@wordpress/url": "*",
+		"@wordpress/warning": "*",
+		"@wordpress/wordcount": "*",
+		"change-case": "^4.1.2",
+		"client-zip": "^2.4.5",
+		"clsx": "^2.1.1",
+		"date-fns": "^3.6.0",
+		"deepmerge": "^4.3.0",
+		"fast-deep-equal": "^3.1.3",
+		"is-plain-object": "^5.0.0",
 		"memize": "^2.1.0",
 		"react-autosize-textarea": "^7.1.0",
-		"rememo": "^4.0.2",
-		"remove-accents": "^0.5.0"
+		"remove-accents": "^0.5.0",
+		"uuid": "^9.0.1"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -74,5 +85,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/editor/src/bindings/api.js b/packages/editor/src/bindings/api.js
new file mode 100644
index 00000000000000..2d32d76abbc3bc
--- /dev/null
+++ b/packages/editor/src/bindings/api.js
@@ -0,0 +1,25 @@
+/**
+ * WordPress dependencies
+ */
+import { registerBlockBindingsSource } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import patternOverrides from './pattern-overrides';
+import postMeta from './post-meta';
+
+/**
+ * Function to register core block bindings sources provided by the editor.
+ *
+ * @example
+ * ```js
+ * import { registerCoreBlockBindingsSources } from '@wordpress/editor';
+ *
+ * registerCoreBlockBindingsSources();
+ * ```
+ */
+export function registerCoreBlockBindingsSources() {
+	registerBlockBindingsSource( patternOverrides );
+	registerBlockBindingsSource( postMeta );
+}
diff --git a/packages/editor/src/bindings/pattern-overrides.js b/packages/editor/src/bindings/pattern-overrides.js
new file mode 100644
index 00000000000000..baa1f72f47694b
--- /dev/null
+++ b/packages/editor/src/bindings/pattern-overrides.js
@@ -0,0 +1,100 @@
+/**
+ * WordPress dependencies
+ */
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+const CONTENT = 'content';
+
+export default {
+	name: 'core/pattern-overrides',
+	getValues( { select, clientId, context, bindings } ) {
+		const patternOverridesContent = context[ 'pattern/overrides' ];
+		const { getBlockAttributes } = select( blockEditorStore );
+		const currentBlockAttributes = getBlockAttributes( clientId );
+
+		const overridesValues = {};
+		for ( const attributeName of Object.keys( bindings ) ) {
+			const overridableValue =
+				patternOverridesContent?.[
+					currentBlockAttributes?.metadata?.name
+				]?.[ attributeName ];
+
+			// If it has not been overriden, return the original value.
+			// Check undefined because empty string is a valid value.
+			if ( overridableValue === undefined ) {
+				overridesValues[ attributeName ] =
+					currentBlockAttributes[ attributeName ];
+				continue;
+			} else {
+				overridesValues[ attributeName ] =
+					overridableValue === '' ? undefined : overridableValue;
+			}
+		}
+		return overridesValues;
+	},
+	setValues( { select, dispatch, clientId, bindings } ) {
+		const { getBlockAttributes, getBlockParentsByBlockName, getBlocks } =
+			select( blockEditorStore );
+		const currentBlockAttributes = getBlockAttributes( clientId );
+		const blockName = currentBlockAttributes?.metadata?.name;
+		if ( ! blockName ) {
+			return;
+		}
+
+		const [ patternClientId ] = getBlockParentsByBlockName(
+			clientId,
+			'core/block',
+			true
+		);
+
+		// Extract the updated attributes from the source bindings.
+		const attributes = Object.entries( bindings ).reduce(
+			( attrs, [ key, { newValue } ] ) => {
+				attrs[ key ] = newValue;
+				return attrs;
+			},
+			{}
+		);
+
+		// If there is no pattern client ID, sync blocks with the same name and same attributes.
+		if ( ! patternClientId ) {
+			const syncBlocksWithSameName = ( blocks ) => {
+				for ( const block of blocks ) {
+					if ( block.attributes?.metadata?.name === blockName ) {
+						dispatch( blockEditorStore ).updateBlockAttributes(
+							block.clientId,
+							attributes
+						);
+					}
+					syncBlocksWithSameName( block.innerBlocks );
+				}
+			};
+
+			syncBlocksWithSameName( getBlocks() );
+			return;
+		}
+		const currentBindingValue =
+			getBlockAttributes( patternClientId )?.[ CONTENT ];
+
+		dispatch( blockEditorStore ).updateBlockAttributes( patternClientId, {
+			[ CONTENT ]: {
+				...currentBindingValue,
+				[ blockName ]: {
+					...currentBindingValue?.[ blockName ],
+					...Object.entries( attributes ).reduce(
+						( acc, [ key, value ] ) => {
+							// TODO: We need a way to represent `undefined` in the serialized overrides.
+							// Also see: https://github.com/WordPress/gutenberg/pull/57249#discussion_r1452987871
+							// We use an empty string to represent undefined for now until
+							// we support a richer format for overrides and the block bindings API.
+							acc[ key ] = value === undefined ? '' : value;
+							return acc;
+						},
+						{}
+					),
+				},
+			},
+		} );
+	},
+	canUserEditValue: () => true,
+};
diff --git a/packages/editor/src/bindings/post-meta.js b/packages/editor/src/bindings/post-meta.js
new file mode 100644
index 00000000000000..a3602ce7d62076
--- /dev/null
+++ b/packages/editor/src/bindings/post-meta.js
@@ -0,0 +1,147 @@
+/**
+ * WordPress dependencies
+ */
+import { store as coreDataStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../store';
+import { unlock } from '../lock-unlock';
+
+/**
+ * Gets a list of post meta fields with their values and labels
+ * to be consumed in the needed callbacks.
+ * If the value is not available based on context, like in templates,
+ * it falls back to the default value, label, or key.
+ *
+ * @param {Object} select  The select function from the data store.
+ * @param {Object} context The context provided.
+ * @return {Object} List of post meta fields with their value and label.
+ *
+ * @example
+ * ```js
+ * {
+ *     field_1_key: {
+ *         label: 'Field 1 Label',
+ *         value: 'Field 1 Value',
+ *     },
+ *     field_2_key: {
+ *         label: 'Field 2 Label',
+ *         value: 'Field 2 Value',
+ *     },
+ *     ...
+ * }
+ * ```
+ */
+function getPostMetaFields( select, context ) {
+	const { getEditedEntityRecord } = select( coreDataStore );
+	const { getRegisteredPostMeta } = unlock( select( coreDataStore ) );
+
+	let entityMetaValues;
+	// Try to get the current entity meta values.
+	if ( context?.postType && context?.postId ) {
+		entityMetaValues = getEditedEntityRecord(
+			'postType',
+			context?.postType,
+			context?.postId
+		).meta;
+	}
+
+	const registeredFields = getRegisteredPostMeta( context?.postType );
+	const metaFields = {};
+	Object.entries( registeredFields || {} ).forEach( ( [ key, props ] ) => {
+		// Don't include footnotes or private fields.
+		if ( key !== 'footnotes' && key.charAt( 0 ) !== '_' ) {
+			metaFields[ key ] = {
+				label: props.title || key,
+				value:
+					// When using the entity value, an empty string IS a valid value.
+					entityMetaValues?.[ key ] ??
+					// When using the default, an empty string IS NOT a valid value.
+					( props.default || undefined ),
+				type: props.type,
+			};
+		}
+	} );
+
+	if ( ! Object.keys( metaFields || {} ).length ) {
+		return null;
+	}
+
+	return metaFields;
+}
+
+export default {
+	name: 'core/post-meta',
+	getValues( { select, context, bindings } ) {
+		const metaFields = getPostMetaFields( select, context );
+
+		const newValues = {};
+		for ( const [ attributeName, source ] of Object.entries( bindings ) ) {
+			// Use the value, the field label, or the field key.
+			const fieldKey = source.args.key;
+			const { value: fieldValue, label: fieldLabel } =
+				metaFields?.[ fieldKey ] || {};
+			newValues[ attributeName ] = fieldValue ?? fieldLabel ?? fieldKey;
+		}
+		return newValues;
+	},
+	setValues( { dispatch, context, bindings } ) {
+		const newMeta = {};
+		Object.values( bindings ).forEach( ( { args, newValue } ) => {
+			newMeta[ args.key ] = newValue;
+		} );
+
+		dispatch( coreDataStore ).editEntityRecord(
+			'postType',
+			context?.postType,
+			context?.postId,
+			{
+				meta: newMeta,
+			}
+		);
+	},
+	canUserEditValue( { select, context, args } ) {
+		// Lock editing in query loop.
+		if ( context?.query || context?.queryId ) {
+			return false;
+		}
+
+		const postType =
+			context?.postType || select( editorStore ).getCurrentPostType();
+
+		// Check that editing is happening in the post editor and not a template.
+		if ( postType === 'wp_template' ) {
+			return false;
+		}
+
+		const fieldValue = getPostMetaFields( select, context )?.[ args.key ]
+			?.value;
+		// Empty string or `false` could be a valid value, so we need to check if the field value is undefined.
+		if ( fieldValue === undefined ) {
+			return false;
+		}
+		// Check that custom fields metabox is not enabled.
+		const areCustomFieldsEnabled =
+			select( editorStore ).getEditorSettings().enableCustomFields;
+		if ( areCustomFieldsEnabled ) {
+			return false;
+		}
+
+		// Check that the user has the capability to edit post meta.
+		const canUserEdit = select( coreDataStore ).canUser( 'update', {
+			kind: 'postType',
+			name: context?.postType,
+			id: context?.postId,
+		} );
+		if ( ! canUserEdit ) {
+			return false;
+		}
+
+		return true;
+	},
+	getFieldsList( { select, context } ) {
+		return getPostMetaFields( select, context );
+	},
+};
diff --git a/packages/editor/src/components/autocompleters/style.scss b/packages/editor/src/components/autocompleters/style.scss
index 009079a9a31736..ca3159ee4ac825 100644
--- a/packages/editor/src/components/autocompleters/style.scss
+++ b/packages/editor/src/components/autocompleters/style.scss
@@ -1,8 +1,7 @@
 .editor-autocompleters__user {
 	.editor-autocompleters__no-avatar::before {
-		/* stylelint-disable */
+		/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword -- dashicons don't need a generic family keyword. */
 		font: normal 20px/1 dashicons;
-		/* stylelint-enable */
 		content: "\f110";
 		margin-right: 5px;
 		vertical-align: middle;
diff --git a/packages/editor/src/components/autosave-monitor/index.js b/packages/editor/src/components/autosave-monitor/index.js
index 33637310ab9483..2800b4bf0fc1f1 100644
--- a/packages/editor/src/components/autosave-monitor/index.js
+++ b/packages/editor/src/components/autosave-monitor/index.js
@@ -11,17 +11,6 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import { store as editorStore } from '../../store';
 
-/**
- * AutosaveMonitor invokes `props.autosave()` within at most `interval` seconds after an unsaved change is detected.
- *
- * The logic is straightforward: a check is performed every `props.interval` seconds. If any changes are detected, `props.autosave()` is called.
- * The time between the change and the autosave varies but is no larger than `props.interval` seconds. Refer to the code below for more details, such as
- * the specific way of detecting changes.
- *
- * There are two caveats:
- * * If `props.isAutosaveable` happens to be false at a time of checking for changes, the check is retried every second.
- * * The timer may be disabled by setting `props.disableIntervalChecks` to `true`. In that mode, any change will immediately trigger `props.autosave()`.
- */
 export class AutosaveMonitor extends Component {
 	constructor( props ) {
 		super( props );
@@ -91,6 +80,29 @@ export class AutosaveMonitor extends Component {
 	}
 }
 
+/**
+ * Monitors the changes made to the edited post and triggers autosave if necessary.
+ *
+ * The logic is straightforward: a check is performed every `props.interval` seconds. If any changes are detected, `props.autosave()` is called.
+ * The time between the change and the autosave varies but is no larger than `props.interval` seconds. Refer to the code below for more details, such as
+ * the specific way of detecting changes.
+ *
+ * There are two caveats:
+ * * If `props.isAutosaveable` happens to be false at a time of checking for changes, the check is retried every second.
+ * * The timer may be disabled by setting `props.disableIntervalChecks` to `true`. In that mode, any change will immediately trigger `props.autosave()`.
+ *
+ * @param {Object}   props                       - The properties passed to the component.
+ * @param {Function} props.autosave              - The function to call when changes need to be saved.
+ * @param {number}   props.interval              - The maximum time in seconds between an unsaved change and an autosave.
+ * @param {boolean}  props.isAutosaveable        - If false, the check for changes is retried every second.
+ * @param {boolean}  props.disableIntervalChecks - If true, disables the timer and any change will immediately trigger `props.autosave()`.
+ * @param {boolean}  props.isDirty               - Indicates if there are unsaved changes.
+ *
+ * @example
+ * ```jsx
+ * <AutosaveMonitor interval={30000} />
+ * ```
+ */
 export default compose( [
 	withSelect( ( select, ownProps ) => {
 		const { getReferenceByDistinctEdits } = select( coreStore );
diff --git a/packages/editor/src/components/block-manager/category.js b/packages/editor/src/components/block-manager/category.js
new file mode 100644
index 00000000000000..e7125fa151f72a
--- /dev/null
+++ b/packages/editor/src/components/block-manager/category.js
@@ -0,0 +1,96 @@
+/**
+ * WordPress dependencies
+ */
+import { useMemo, useCallback } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useInstanceId } from '@wordpress/compose';
+import { CheckboxControl } from '@wordpress/components';
+import { store as preferencesStore } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import BlockTypesChecklist from './checklist';
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+function BlockManagerCategory( { title, blockTypes } ) {
+	const instanceId = useInstanceId( BlockManagerCategory );
+	const { allowedBlockTypes, hiddenBlockTypes } = useSelect( ( select ) => {
+		const { getEditorSettings } = select( editorStore );
+		const { get } = select( preferencesStore );
+		return {
+			allowedBlockTypes: getEditorSettings().allowedBlockTypes,
+			hiddenBlockTypes: get( 'core', 'hiddenBlockTypes' ),
+		};
+	}, [] );
+	const filteredBlockTypes = useMemo( () => {
+		if ( allowedBlockTypes === true ) {
+			return blockTypes;
+		}
+		return blockTypes.filter( ( { name } ) => {
+			return allowedBlockTypes?.includes( name );
+		} );
+	}, [ allowedBlockTypes, blockTypes ] );
+	const { showBlockTypes, hideBlockTypes } = unlock(
+		useDispatch( editorStore )
+	);
+	const toggleVisible = useCallback(
+		( blockName, nextIsChecked ) => {
+			if ( nextIsChecked ) {
+				showBlockTypes( blockName );
+			} else {
+				hideBlockTypes( blockName );
+			}
+		},
+		[ showBlockTypes, hideBlockTypes ]
+	);
+	const toggleAllVisible = useCallback(
+		( nextIsChecked ) => {
+			const blockNames = blockTypes.map( ( { name } ) => name );
+			if ( nextIsChecked ) {
+				showBlockTypes( blockNames );
+			} else {
+				hideBlockTypes( blockNames );
+			}
+		},
+		[ blockTypes, showBlockTypes, hideBlockTypes ]
+	);
+
+	if ( ! filteredBlockTypes.length ) {
+		return null;
+	}
+
+	const checkedBlockNames = filteredBlockTypes
+		.map( ( { name } ) => name )
+		.filter( ( type ) => ! ( hiddenBlockTypes ?? [] ).includes( type ) );
+
+	const titleId = 'editor-block-manager__category-title-' + instanceId;
+
+	const isAllChecked = checkedBlockNames.length === filteredBlockTypes.length;
+	const isIndeterminate = ! isAllChecked && checkedBlockNames.length > 0;
+
+	return (
+		<div
+			role="group"
+			aria-labelledby={ titleId }
+			className="editor-block-manager__category"
+		>
+			<CheckboxControl
+				__nextHasNoMarginBottom
+				checked={ isAllChecked }
+				onChange={ toggleAllVisible }
+				className="editor-block-manager__category-title"
+				indeterminate={ isIndeterminate }
+				label={ <span id={ titleId }>{ title }</span> }
+			/>
+			<BlockTypesChecklist
+				blockTypes={ filteredBlockTypes }
+				value={ checkedBlockNames }
+				onItemChange={ toggleVisible }
+			/>
+		</div>
+	);
+}
+
+export default BlockManagerCategory;
diff --git a/packages/edit-post/src/components/block-manager/checklist.js b/packages/editor/src/components/block-manager/checklist.js
similarity index 85%
rename from packages/edit-post/src/components/block-manager/checklist.js
rename to packages/editor/src/components/block-manager/checklist.js
index aa21fefb1c8180..01bd06abdeba86 100644
--- a/packages/edit-post/src/components/block-manager/checklist.js
+++ b/packages/editor/src/components/block-manager/checklist.js
@@ -6,11 +6,11 @@ import { CheckboxControl } from '@wordpress/components';
 
 function BlockTypesChecklist( { blockTypes, value, onItemChange } ) {
 	return (
-		<ul className="edit-post-block-manager__checklist">
+		<ul className="editor-block-manager__checklist">
 			{ blockTypes.map( ( blockType ) => (
 				<li
 					key={ blockType.name }
-					className="edit-post-block-manager__checklist-item"
+					className="editor-block-manager__checklist-item"
 				>
 					<CheckboxControl
 						__nextHasNoMarginBottom
diff --git a/packages/editor/src/components/block-manager/index.js b/packages/editor/src/components/block-manager/index.js
new file mode 100644
index 00000000000000..4a1145839976f9
--- /dev/null
+++ b/packages/editor/src/components/block-manager/index.js
@@ -0,0 +1,145 @@
+/**
+ * WordPress dependencies
+ */
+import { store as blocksStore } from '@wordpress/blocks';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { SearchControl, Button } from '@wordpress/components';
+import { __, _n, sprintf } from '@wordpress/i18n';
+import { useEffect, useState } from '@wordpress/element';
+import { useDebounce } from '@wordpress/compose';
+import { speak } from '@wordpress/a11y';
+import { store as preferencesStore } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+import BlockManagerCategory from './category';
+
+export default function BlockManager() {
+	const debouncedSpeak = useDebounce( speak, 500 );
+	const [ search, setSearch ] = useState( '' );
+	const { showBlockTypes } = unlock( useDispatch( editorStore ) );
+
+	const {
+		blockTypes,
+		categories,
+		hasBlockSupport,
+		isMatchingSearchTerm,
+		numberOfHiddenBlocks,
+	} = useSelect( ( select ) => {
+		// Some hidden blocks become unregistered
+		// by removing for instance the plugin that registered them, yet
+		// they're still remain as hidden by the user's action.
+		// We consider "hidden", blocks which were hidden and
+		// are still registered.
+		const _blockTypes = select( blocksStore ).getBlockTypes();
+		const hiddenBlockTypes = (
+			select( preferencesStore ).get( 'core', 'hiddenBlockTypes' ) ?? []
+		).filter( ( hiddenBlock ) => {
+			return _blockTypes.some(
+				( registeredBlock ) => registeredBlock.name === hiddenBlock
+			);
+		} );
+
+		return {
+			blockTypes: _blockTypes,
+			categories: select( blocksStore ).getCategories(),
+			hasBlockSupport: select( blocksStore ).hasBlockSupport,
+			isMatchingSearchTerm: select( blocksStore ).isMatchingSearchTerm,
+			numberOfHiddenBlocks:
+				Array.isArray( hiddenBlockTypes ) && hiddenBlockTypes.length,
+		};
+	}, [] );
+
+	function enableAllBlockTypes( newBlockTypes ) {
+		const blockNames = newBlockTypes.map( ( { name } ) => name );
+		showBlockTypes( blockNames );
+	}
+
+	const filteredBlockTypes = blockTypes.filter(
+		( blockType ) =>
+			hasBlockSupport( blockType, 'inserter', true ) &&
+			( ! search || isMatchingSearchTerm( blockType, search ) ) &&
+			( ! blockType.parent ||
+				blockType.parent.includes( 'core/post-content' ) )
+	);
+
+	// Announce search results on change
+	useEffect( () => {
+		if ( ! search ) {
+			return;
+		}
+		const count = filteredBlockTypes.length;
+		const resultsFoundMessage = sprintf(
+			/* translators: %d: number of results. */
+			_n( '%d result found.', '%d results found.', count ),
+			count
+		);
+		debouncedSpeak( resultsFoundMessage );
+	}, [ filteredBlockTypes?.length, search, debouncedSpeak ] );
+
+	return (
+		<div className="editor-block-manager__content">
+			{ !! numberOfHiddenBlocks && (
+				<div className="editor-block-manager__disabled-blocks-count">
+					{ sprintf(
+						/* translators: %d: number of blocks. */
+						_n(
+							'%d block is hidden.',
+							'%d blocks are hidden.',
+							numberOfHiddenBlocks
+						),
+						numberOfHiddenBlocks
+					) }
+					<Button
+						__next40pxDefaultSize
+						variant="link"
+						onClick={ () =>
+							enableAllBlockTypes( filteredBlockTypes )
+						}
+					>
+						{ __( 'Reset' ) }
+					</Button>
+				</div>
+			) }
+			<SearchControl
+				__nextHasNoMarginBottom
+				label={ __( 'Search for a block' ) }
+				placeholder={ __( 'Search for a block' ) }
+				value={ search }
+				onChange={ ( nextSearch ) => setSearch( nextSearch ) }
+				className="editor-block-manager__search"
+			/>
+			<div
+				tabIndex="0"
+				role="region"
+				aria-label={ __( 'Available block types' ) }
+				className="editor-block-manager__results"
+			>
+				{ filteredBlockTypes.length === 0 && (
+					<p className="editor-block-manager__no-results">
+						{ __( 'No blocks found.' ) }
+					</p>
+				) }
+				{ categories.map( ( category ) => (
+					<BlockManagerCategory
+						key={ category.slug }
+						title={ category.title }
+						blockTypes={ filteredBlockTypes.filter(
+							( blockType ) =>
+								blockType.category === category.slug
+						) }
+					/>
+				) ) }
+				<BlockManagerCategory
+					title={ __( 'Uncategorized' ) }
+					blockTypes={ filteredBlockTypes.filter(
+						( { category } ) => ! category
+					) }
+				/>
+			</div>
+		</div>
+	);
+}
diff --git a/packages/editor/src/components/block-manager/style.scss b/packages/editor/src/components/block-manager/style.scss
new file mode 100644
index 00000000000000..411ee9faf34f75
--- /dev/null
+++ b/packages/editor/src/components/block-manager/style.scss
@@ -0,0 +1,82 @@
+.editor-block-manager__no-results {
+	font-style: italic;
+	padding: $grid-unit-30 0;
+	text-align: center;
+}
+
+.editor-block-manager__search {
+	margin: $grid-unit-20 0;
+}
+
+.editor-block-manager__disabled-blocks-count {
+	border: $border-width solid $gray-300;
+	border-width: $border-width 0;
+	// Cover up horizontal areas off the sides of the box rectangle
+	box-shadow: -$grid-unit-40 0 0 0 $white, $grid-unit-40 0 0 0 $white;
+	padding: $grid-unit-10;
+	background-color: $white;
+	text-align: center;
+	position: sticky;
+	// When sticking, tuck the top border beneath the modal header border
+	top: ($grid-unit-05 + 1) * -1;
+	z-index: z-index(".editor-block-manager__disabled-blocks-count");
+
+	// Stick the category titles to the bottom
+	~ .editor-block-manager__results .editor-block-manager__category-title {
+		top: $grid-unit-40 - 1;
+	}
+	.is-link {
+		margin-left: 12px;
+	}
+}
+
+.editor-block-manager__category {
+	margin: 0 0 $grid-unit-30 0;
+}
+
+.editor-block-manager__category-title {
+	position: sticky;
+	top: - $grid-unit-05; // Offsets the top padding on the modal content container
+	padding: $grid-unit-20 0;
+	background-color: $white;
+	z-index: z-index(".editor-block-manager__category-title");
+
+	.components-checkbox-control__label {
+		font-weight: 600;
+	}
+}
+
+.editor-block-manager__checklist {
+	margin-top: 0;
+}
+
+.editor-block-manager__category-title,
+.editor-block-manager__checklist-item {
+	border-bottom: 1px solid $gray-300;
+}
+
+.editor-block-manager__checklist-item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 0;
+	padding: $grid-unit-10 0 $grid-unit-10 $grid-unit-20;
+
+	.components-modal__content &.components-checkbox-control__input-container {
+		margin: 0 $grid-unit-10;
+	}
+
+	.block-editor-block-icon {
+		margin-right: 10px;
+		fill: $gray-900;
+	}
+}
+
+.editor-block-manager__results {
+	border-top: $border-width solid $gray-300;
+}
+
+// Remove the top border from results when adjacent to the disabled block count
+.editor-block-manager__disabled-blocks-count + .editor-block-manager__results {
+	border-top-width: 0;
+}
diff --git a/packages/editor/src/components/block-removal-warnings/index.js b/packages/editor/src/components/block-removal-warnings/index.js
new file mode 100644
index 00000000000000..aa6dad0bc44d33
--- /dev/null
+++ b/packages/editor/src/components/block-removal-warnings/index.js
@@ -0,0 +1,92 @@
+/**
+ * WordPress dependencies
+ */
+
+import { _n } from '@wordpress/i18n';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+
+const { BlockRemovalWarningModal } = unlock( blockEditorPrivateApis );
+
+// Prevent accidental removal of certain blocks, asking the user for confirmation first.
+const TEMPLATE_BLOCKS = [
+	'core/post-content',
+	'core/post-template',
+	'core/query',
+];
+const BLOCK_REMOVAL_RULES = [
+	{
+		// Template blocks.
+		// The warning is only shown when a user manipulates templates or template parts.
+		postTypes: [ 'wp_template', 'wp_template_part' ],
+		callback( removedBlocks ) {
+			const removedTemplateBlocks = removedBlocks.filter( ( { name } ) =>
+				TEMPLATE_BLOCKS.includes( name )
+			);
+			if ( removedTemplateBlocks.length ) {
+				return _n(
+					'Deleting this block will stop your post or page content from displaying on this template. It is not recommended.',
+					'Some of the deleted blocks will stop your post or page content from displaying on this template. It is not recommended.',
+					removedBlocks.length
+				);
+			}
+		},
+	},
+	{
+		// Pattern overrides.
+		// The warning is only shown when the user edits a pattern.
+		postTypes: [ 'wp_block' ],
+		callback( removedBlocks ) {
+			const removedBlocksWithOverrides = removedBlocks.filter(
+				( { attributes } ) =>
+					attributes?.metadata?.bindings &&
+					Object.values( attributes.metadata.bindings ).some(
+						( binding ) =>
+							binding.source === 'core/pattern-overrides'
+					)
+			);
+			if ( removedBlocksWithOverrides.length ) {
+				return _n(
+					'The deleted block allows instance overrides. Removing it may result in content not displaying where this pattern is used. Are you sure you want to proceed?',
+					'Some of the deleted blocks allow instance overrides. Removing them may result in content not displaying where this pattern is used. Are you sure you want to proceed?',
+					removedBlocks.length
+				);
+			}
+		},
+	},
+];
+
+export default function BlockRemovalWarnings() {
+	const currentPostType = useSelect(
+		( select ) => select( editorStore ).getCurrentPostType(),
+		[]
+	);
+
+	const removalRulesForPostType = useMemo(
+		() =>
+			BLOCK_REMOVAL_RULES.filter( ( rule ) =>
+				rule.postTypes.includes( currentPostType )
+			),
+		[ currentPostType ]
+	);
+
+	// `BlockRemovalWarnings` is rendered in the editor provider, a shared component
+	// across react native and web. However, `BlockRemovalWarningModal` is web only.
+	// Check it exists before trying to render it.
+	if ( ! BlockRemovalWarningModal ) {
+		return null;
+	}
+
+	if ( ! removalRulesForPostType ) {
+		return null;
+	}
+
+	return <BlockRemovalWarningModal rules={ removalRulesForPostType } />;
+}
diff --git a/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
new file mode 100644
index 00000000000000..af0e9b30ae83b4
--- /dev/null
+++ b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
@@ -0,0 +1,185 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	BlockSettingsMenuControls,
+	__unstableBlockSettingsMenuFirstItem as BlockSettingsMenuFirstItem,
+	store as blockEditorStore,
+	useBlockDisplayInformation,
+} from '@wordpress/block-editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { __experimentalText as Text, MenuItem } from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { __, _x } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+import usePostContentBlocks from '../provider/use-post-content-blocks';
+
+function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
+	const postContentBlocks = usePostContentBlocks();
+	const { entity, onNavigateToEntityRecord, canEditTemplates } = useSelect(
+		( select ) => {
+			const {
+				getBlockParentsByBlockName,
+				getSettings,
+				getBlockAttributes,
+				getBlockParents,
+			} = select( blockEditorStore );
+			const { getCurrentTemplateId, getRenderingMode } =
+				select( editorStore );
+			const patternParent = getBlockParentsByBlockName(
+				clientId,
+				'core/block',
+				true
+			)[ 0 ];
+
+			let record;
+			if ( patternParent ) {
+				record = select( coreStore ).getEntityRecord(
+					'postType',
+					'wp_block',
+					getBlockAttributes( patternParent ).ref
+				);
+			} else if (
+				getRenderingMode() === 'template-locked' &&
+				! getBlockParents( clientId ).some( ( parent ) =>
+					postContentBlocks.includes( parent )
+				)
+			) {
+				record = select( coreStore ).getEntityRecord(
+					'postType',
+					'wp_template',
+					getCurrentTemplateId()
+				);
+			}
+			if ( ! record ) {
+				return {};
+			}
+			const _canEditTemplates = select( coreStore ).canUser( 'create', {
+				kind: 'postType',
+				name: 'wp_template',
+			} );
+			return {
+				canEditTemplates: _canEditTemplates,
+				entity: record,
+				onNavigateToEntityRecord:
+					getSettings().onNavigateToEntityRecord,
+			};
+		},
+		[ clientId, postContentBlocks ]
+	);
+
+	if ( ! entity ) {
+		return (
+			<TemplateLockContentOnlyMenuItems
+				clientId={ clientId }
+				onClose={ onClose }
+			/>
+		);
+	}
+
+	const isPattern = entity.type === 'wp_block';
+	let helpText = isPattern
+		? __(
+				'Edit the pattern to move, delete, or make further changes to this block.'
+		  )
+		: __(
+				'Edit the template to move, delete, or make further changes to this block.'
+		  );
+
+	if ( ! canEditTemplates ) {
+		helpText = __(
+			'Only users with permissions to edit the template can move or delete this block'
+		);
+	}
+
+	return (
+		<>
+			<BlockSettingsMenuFirstItem>
+				<MenuItem
+					onClick={ () => {
+						onNavigateToEntityRecord( {
+							postId: entity.id,
+							postType: entity.type,
+						} );
+					} }
+					disabled={ ! canEditTemplates }
+				>
+					{ isPattern ? __( 'Edit pattern' ) : __( 'Edit template' ) }
+				</MenuItem>
+			</BlockSettingsMenuFirstItem>
+			<Text
+				variant="muted"
+				as="p"
+				className="editor-content-only-settings-menu__description"
+			>
+				{ helpText }
+			</Text>
+		</>
+	);
+}
+
+function TemplateLockContentOnlyMenuItems( { clientId, onClose } ) {
+	const { contentLockingParent } = useSelect(
+		( select ) => {
+			const { getContentLockingParent } = unlock(
+				select( blockEditorStore )
+			);
+			return {
+				contentLockingParent: getContentLockingParent( clientId ),
+			};
+		},
+		[ clientId ]
+	);
+	const blockDisplayInformation =
+		useBlockDisplayInformation( contentLockingParent );
+	const blockEditorActions = useDispatch( blockEditorStore );
+	if ( ! blockDisplayInformation?.title ) {
+		return null;
+	}
+
+	const { modifyContentLockBlock } = unlock( blockEditorActions );
+
+	return (
+		<>
+			<BlockSettingsMenuFirstItem>
+				<MenuItem
+					onClick={ () => {
+						modifyContentLockBlock( contentLockingParent );
+						onClose();
+					} }
+				>
+					{ _x( 'Unlock', 'Unlock content locked blocks' ) }
+				</MenuItem>
+			</BlockSettingsMenuFirstItem>
+			<Text
+				variant="muted"
+				as="p"
+				className="editor-content-only-settings-menu__description"
+			>
+				{ __(
+					'Temporarily unlock the parent block to edit, delete or make further changes to this block.'
+				) }
+			</Text>
+		</>
+	);
+}
+
+export default function ContentOnlySettingsMenu() {
+	return (
+		<BlockSettingsMenuControls>
+			{ ( { selectedClientIds, onClose } ) =>
+				selectedClientIds.length === 1 && (
+					<ContentOnlySettingsMenuItems
+						clientId={ selectedClientIds[ 0 ] }
+						onClose={ onClose }
+					/>
+				)
+			}
+		</BlockSettingsMenuControls>
+	);
+}
diff --git a/packages/editor/src/components/block-settings-menu/content-only-settings-menu.native.js b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.native.js
new file mode 100644
index 00000000000000..11cebce87bbba5
--- /dev/null
+++ b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.native.js
@@ -0,0 +1,4 @@
+// Render nothing in native for now.
+export default function ContentOnlySettingsMenu() {
+	return null;
+}
diff --git a/packages/edit-post/src/components/block-settings-menu/plugin-block-settings-menu-item.js b/packages/editor/src/components/block-settings-menu/plugin-block-settings-menu-item.js
similarity index 95%
rename from packages/edit-post/src/components/block-settings-menu/plugin-block-settings-menu-item.js
rename to packages/editor/src/components/block-settings-menu/plugin-block-settings-menu-item.js
index 322aa07db80f86..59c9e9c32d4a4b 100644
--- a/packages/edit-post/src/components/block-settings-menu/plugin-block-settings-menu-item.js
+++ b/packages/editor/src/components/block-settings-menu/plugin-block-settings-menu-item.js
@@ -38,7 +38,7 @@ const shouldRenderItem = ( selectedBlocks, allowedBlocks ) =>
  * ```js
  * // Using ES5 syntax
  * var __ = wp.i18n.__;
- * var PluginBlockSettingsMenuItem = wp.editPost.PluginBlockSettingsMenuItem;
+ * var PluginBlockSettingsMenuItem = wp.editor.PluginBlockSettingsMenuItem;
  *
  * function doOnClick(){
  * 	// To be called when the user clicks the menu item.
@@ -61,7 +61,7 @@ const shouldRenderItem = ( selectedBlocks, allowedBlocks ) =>
  * ```jsx
  * // Using ESNext syntax
  * import { __ } from '@wordpress/i18n';
- * import { PluginBlockSettingsMenuItem } from '@wordpress/edit-post';
+ * import { PluginBlockSettingsMenuItem } from '@wordpress/editor';
  *
  * const doOnClick = ( ) => {
  *     // To be called when the user clicks the menu item.
diff --git a/packages/editor/src/components/block-settings-menu/style.scss b/packages/editor/src/components/block-settings-menu/style.scss
new file mode 100644
index 00000000000000..53fa391d28ef04
--- /dev/null
+++ b/packages/editor/src/components/block-settings-menu/style.scss
@@ -0,0 +1,4 @@
+.editor-content-only-settings-menu__description {
+	padding: $grid-unit;
+	min-width: 235px;
+}
diff --git a/packages/editor/src/components/blog-title/index.js b/packages/editor/src/components/blog-title/index.js
new file mode 100644
index 00000000000000..aee2a7f049eb09
--- /dev/null
+++ b/packages/editor/src/components/blog-title/index.js
@@ -0,0 +1,129 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+import { debounce } from '@wordpress/compose';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { decodeEntities } from '@wordpress/html-entities';
+import {
+	Button,
+	Dropdown,
+	__experimentalInputControl as InputControl,
+} from '@wordpress/components';
+import { useState, useMemo } from '@wordpress/element';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_POST_TYPE } from '../../store/constants';
+import PostPanelRow from '../post-panel-row';
+import { store as editorStore } from '../../store';
+
+const EMPTY_OBJECT = {};
+
+export default function BlogTitle() {
+	const { editEntityRecord } = useDispatch( coreStore );
+	const { postsPageTitle, postsPageId, isTemplate, postSlug } = useSelect(
+		( select ) => {
+			const { getEntityRecord, getEditedEntityRecord, canUser } =
+				select( coreStore );
+			const siteSettings = canUser( 'read', {
+				kind: 'root',
+				name: 'site',
+			} )
+				? getEntityRecord( 'root', 'site' )
+				: undefined;
+			const _postsPageRecord = siteSettings?.page_for_posts
+				? getEditedEntityRecord(
+						'postType',
+						'page',
+						siteSettings?.page_for_posts
+				  )
+				: EMPTY_OBJECT;
+			const { getEditedPostAttribute, getCurrentPostType } =
+				select( editorStore );
+			return {
+				postsPageId: _postsPageRecord?.id,
+				postsPageTitle: _postsPageRecord?.title,
+				isTemplate: getCurrentPostType() === TEMPLATE_POST_TYPE,
+				postSlug: getEditedPostAttribute( 'slug' ),
+			};
+		},
+		[]
+	);
+	// Use internal state instead of a ref to make sure that the component
+	// re-renders when the popover's anchor updates.
+	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor ]
+	);
+
+	if (
+		! isTemplate ||
+		! [ 'home', 'index' ].includes( postSlug ) ||
+		! postsPageId
+	) {
+		return null;
+	}
+
+	const setPostsPageTitle = ( newValue ) => {
+		editEntityRecord( 'postType', 'page', postsPageId, {
+			title: newValue,
+		} );
+	};
+	const decodedTitle = decodeEntities( postsPageTitle );
+	return (
+		<PostPanelRow label={ __( 'Blog title' ) } ref={ setPopoverAnchor }>
+			<Dropdown
+				popoverProps={ popoverProps }
+				contentClassName="editor-blog-title-dropdown__content"
+				focusOnMount
+				renderToggle={ ( { isOpen, onToggle } ) => (
+					<Button
+						size="compact"
+						variant="tertiary"
+						aria-expanded={ isOpen }
+						aria-label={ sprintf(
+							// translators: %s: Current post link.
+							__( 'Change blog title: %s' ),
+							decodedTitle
+						) }
+						onClick={ onToggle }
+					>
+						{ decodedTitle }
+					</Button>
+				) }
+				renderContent={ ( { onClose } ) => (
+					<>
+						<InspectorPopoverHeader
+							title={ __( 'Blog title' ) }
+							onClose={ onClose }
+						/>
+						<InputControl
+							placeholder={ __( 'No title' ) }
+							size="__unstable-large"
+							value={ postsPageTitle }
+							onChange={ debounce( setPostsPageTitle, 300 ) }
+							label={ __( 'Blog title' ) }
+							help={ __(
+								'Set the Posts Page title. Appears in search results, and when the page is shared on social media.'
+							) }
+							hideLabelFromVision
+						/>
+					</>
+				) }
+			/>
+		</PostPanelRow>
+	);
+}
diff --git a/packages/editor/src/components/blog-title/style.scss b/packages/editor/src/components/blog-title/style.scss
new file mode 100644
index 00000000000000..164e82979e0b30
--- /dev/null
+++ b/packages/editor/src/components/blog-title/style.scss
@@ -0,0 +1,4 @@
+.editor-blog-title-dropdown__content .components-popover__content {
+	min-width: 320px;
+	padding: $grid-unit-20;
+}
diff --git a/packages/editor/src/components/character-count/index.js b/packages/editor/src/components/character-count/index.js
index e12ff1a3cbce7a..2fb165cdc9badb 100644
--- a/packages/editor/src/components/character-count/index.js
+++ b/packages/editor/src/components/character-count/index.js
@@ -9,6 +9,11 @@ import { count as characterCount } from '@wordpress/wordcount';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Renders the character count of the post content.
+ *
+ * @return {number} The character count.
+ */
 export default function CharacterCount() {
 	const content = useSelect(
 		( select ) => select( editorStore ).getEditedPostAttribute( 'content' ),
diff --git a/packages/editor/src/components/collab-sidebar/add-comment.js b/packages/editor/src/components/collab-sidebar/add-comment.js
new file mode 100644
index 00000000000000..191bb23477f7bd
--- /dev/null
+++ b/packages/editor/src/components/collab-sidebar/add-comment.js
@@ -0,0 +1,124 @@
+/**
+ * WordPress dependencies
+ */
+import { __, _x } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { useState, useEffect } from '@wordpress/element';
+import {
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	Button,
+	TextControl,
+} from '@wordpress/components';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { sanitizeCommentString } from './utils';
+
+/**
+ * Renders the UI for adding a comment in the Gutenberg editor's collaboration sidebar.
+ *
+ * @param {Object}   props                     - The component props.
+ * @param {Function} props.onSubmit            - A callback function to be called when the user submits a comment.
+ * @param {boolean}  props.showCommentBoard    - The function to edit the comment.
+ * @param {Function} props.setShowCommentBoard - The function to delete the comment.
+ * @return {JSX.Element} The rendered comment input UI.
+ */
+export function AddComment( {
+	onSubmit,
+	showCommentBoard,
+	setShowCommentBoard,
+} ) {
+	// State to manage the comment thread.
+	const [ inputComment, setInputComment ] = useState( '' );
+
+	const {
+		defaultAvatar,
+		clientId,
+		blockCommentId,
+		showAddCommentBoard,
+		currentUser,
+	} = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+		const { __experimentalDiscussionSettings } = getSettings();
+		const selectedBlock = select( blockEditorStore ).getSelectedBlock();
+		const userData = select( coreStore ).getCurrentUser();
+		return {
+			defaultAvatar: __experimentalDiscussionSettings?.avatarURL,
+			clientId: selectedBlock?.clientId,
+			blockCommentId: selectedBlock?.attributes?.blockCommentId,
+			showAddCommentBoard: showCommentBoard,
+			currentUser: userData,
+		};
+	} );
+
+	const userAvatar =
+		currentUser && currentUser.avatar_urls && currentUser.avatar_urls[ 48 ]
+			? currentUser.avatar_urls[ 48 ]
+			: defaultAvatar;
+
+	useEffect( () => {
+		setInputComment( '' );
+	}, [ clientId ] );
+
+	const handleCancel = () => {
+		setShowCommentBoard( false );
+		setInputComment( '' );
+	};
+
+	if ( ! showAddCommentBoard || ! clientId || undefined !== blockCommentId ) {
+		return null;
+	}
+
+	return (
+		<VStack
+			spacing="3"
+			className="editor-collab-sidebar-panel__thread editor-collab-sidebar-panel__active-thread"
+		>
+			<HStack alignment="left" spacing="3">
+				<img
+					src={ userAvatar }
+					// translators: alt text for user avatar image
+					alt={ __( 'User Avatar' ) }
+					className="editor-collab-sidebar-panel__user-avatar"
+					width={ 32 }
+					height={ 32 }
+				/>
+				<span className="editor-collab-sidebar-panel__user-name">
+					{ currentUser?.name ?? '' }
+				</span>
+			</HStack>
+			<TextControl
+				__next40pxDefaultSize
+				__nextHasNoMarginBottom
+				value={ inputComment }
+				onChange={ setInputComment }
+				placeholder={ _x( 'Comment', 'noun' ) }
+			/>
+			<HStack alignment="right" spacing="3">
+				<Button
+					__next40pxDefaultSize
+					variant="tertiary"
+					text={ _x( 'Cancel', 'Cancel comment button' ) }
+					onClick={ handleCancel }
+				/>
+				<Button
+					__next40pxDefaultSize
+					accessibleWhenDisabled
+					variant="primary"
+					text={ _x( 'Comment', 'Add comment button' ) }
+					disabled={
+						0 === sanitizeCommentString( inputComment ).length
+					}
+					onClick={ () => {
+						onSubmit( inputComment );
+						setInputComment( '' );
+					} }
+				/>
+			</HStack>
+		</VStack>
+	);
+}
diff --git a/packages/editor/src/components/collab-sidebar/comment-button-toolbar.js b/packages/editor/src/components/collab-sidebar/comment-button-toolbar.js
new file mode 100644
index 00000000000000..2e378a7eaabab0
--- /dev/null
+++ b/packages/editor/src/components/collab-sidebar/comment-button-toolbar.js
@@ -0,0 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { ToolbarButton } from '@wordpress/components';
+import { _x } from '@wordpress/i18n';
+import { comment as commentIcon } from '@wordpress/icons';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { __unstableCommentIconToolbarFill } = unlock( blockEditorPrivateApis );
+
+const AddCommentToolbarButton = ( { onClick } ) => {
+	return (
+		<__unstableCommentIconToolbarFill>
+			<ToolbarButton
+				accessibleWhenDisabled
+				icon={ commentIcon }
+				label={ _x( 'Comment', 'View comment' ) }
+				onClick={ onClick }
+			/>
+		</__unstableCommentIconToolbarFill>
+	);
+};
+
+export default AddCommentToolbarButton;
diff --git a/packages/editor/src/components/collab-sidebar/comment-button.js b/packages/editor/src/components/collab-sidebar/comment-button.js
new file mode 100644
index 00000000000000..3b020661816660
--- /dev/null
+++ b/packages/editor/src/components/collab-sidebar/comment-button.js
@@ -0,0 +1,31 @@
+/**
+ * WordPress dependencies
+ */
+import { MenuItem } from '@wordpress/components';
+import { _x } from '@wordpress/i18n';
+import { comment as commentIcon } from '@wordpress/icons';
+
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { __unstableCommentIconFill } = unlock( blockEditorPrivateApis );
+
+const AddCommentButton = ( { onClick } ) => {
+	return (
+		<__unstableCommentIconFill>
+			<MenuItem
+				icon={ commentIcon }
+				onClick={ onClick }
+				aria-haspopup="dialog"
+			>
+				{ _x( 'Comment', 'Add comment button' ) }
+			</MenuItem>
+		</__unstableCommentIconFill>
+	);
+};
+
+export default AddCommentButton;
diff --git a/packages/editor/src/components/collab-sidebar/comments.js b/packages/editor/src/components/collab-sidebar/comments.js
new file mode 100644
index 00000000000000..c0b4bd3d4dc38a
--- /dev/null
+++ b/packages/editor/src/components/collab-sidebar/comments.js
@@ -0,0 +1,404 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useState, RawHTML } from '@wordpress/element';
+import {
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	__experimentalConfirmDialog as ConfirmDialog,
+	Button,
+	DropdownMenu,
+	TextareaControl,
+	Tooltip,
+} from '@wordpress/components';
+import {
+	dateI18n,
+	format,
+	getSettings as getDateSettings,
+} from '@wordpress/date';
+import { Icon, check, published, moreVertical } from '@wordpress/icons';
+import { __, _x } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { useEntityProp } from '@wordpress/core-data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { sanitizeCommentString } from './utils';
+
+/**
+ * Renders the Comments component.
+ *
+ * @param {Object}   props                  - The component props.
+ * @param {Array}    props.threads          - The array of comment threads.
+ * @param {Function} props.onEditComment    - The function to handle comment editing.
+ * @param {Function} props.onAddReply       - The function to add a reply to a comment.
+ * @param {Function} props.onCommentDelete  - The function to delete a comment.
+ * @param {Function} props.onCommentResolve - The function to mark a comment as resolved.
+ * @return {JSX.Element} The rendered Comments component.
+ */
+export function Comments( {
+	threads,
+	onEditComment,
+	onAddReply,
+	onCommentDelete,
+	onCommentResolve,
+} ) {
+	const [ actionState, setActionState ] = useState( false );
+	const [ isConfirmDialogOpen, setIsConfirmDialogOpen ] = useState( false );
+
+	const handleConfirmDelete = () => {
+		onCommentDelete( actionState.id );
+		setActionState( false );
+		setIsConfirmDialogOpen( false );
+	};
+
+	const handleConfirmResolve = () => {
+		onCommentResolve( actionState.id );
+		setActionState( false );
+		setIsConfirmDialogOpen( false );
+	};
+
+	const handleCancelDelete = () => {
+		setActionState( false );
+		setIsConfirmDialogOpen( false );
+	};
+
+	const blockCommentId = useSelect( ( select ) => {
+		const clientID = select( blockEditorStore ).getSelectedBlockClientId();
+		return (
+			select( blockEditorStore ).getBlock( clientID )?.attributes
+				?.blockCommentId ?? false
+		);
+	}, [] );
+
+	const CommentBoard = ( { thread, parentThread } ) => {
+		return (
+			<>
+				<CommentHeader
+					thread={ thread }
+					onResolve={ () => {
+						setActionState( {
+							action: 'resolve',
+							id: parentThread?.id ?? thread.id,
+						} );
+						setIsConfirmDialogOpen( true );
+					} }
+					onEdit={ () =>
+						setActionState( { action: 'edit', id: thread.id } )
+					}
+					onDelete={ () => {
+						setActionState( { action: 'delete', id: thread.id } );
+						setIsConfirmDialogOpen( true );
+					} }
+					onReply={
+						! parentThread
+							? () =>
+									setActionState( {
+										action: 'reply',
+										id: thread.id,
+									} )
+							: undefined
+					}
+					status={ parentThread?.status ?? thread.status }
+				/>
+				<HStack
+					alignment="left"
+					spacing="3"
+					justify="flex-start"
+					className="editor-collab-sidebar-panel__user-comment"
+				>
+					<VStack
+						spacing="3"
+						className="editor-collab-sidebar-panel__comment-field"
+					>
+						{ 'edit' === actionState?.action &&
+							thread.id === actionState?.id && (
+								<CommentForm
+									onSubmit={ ( value ) => {
+										onEditComment( thread.id, value );
+										setActionState( false );
+									} }
+									onCancel={ () => setActionState( false ) }
+									thread={ thread }
+								/>
+							) }
+						{ ( ! actionState ||
+							'edit' !== actionState?.action ) && (
+							<RawHTML>{ thread?.content?.raw }</RawHTML>
+						) }
+					</VStack>
+				</HStack>
+				{ 'resolve' === actionState?.action &&
+					thread.id === actionState?.id && (
+						<ConfirmDialog
+							isOpen={ isConfirmDialogOpen }
+							onConfirm={ handleConfirmResolve }
+							onCancel={ handleCancelDelete }
+							confirmButtonText="Yes"
+							cancelButtonText="No"
+						>
+							{
+								// translators: message displayed when confirming an action
+								__(
+									'Are you sure you want to mark this comment as resolved?'
+								)
+							}
+						</ConfirmDialog>
+					) }
+				{ 'delete' === actionState?.action &&
+					thread.id === actionState?.id && (
+						<ConfirmDialog
+							isOpen={ isConfirmDialogOpen }
+							onConfirm={ handleConfirmDelete }
+							onCancel={ handleCancelDelete }
+							confirmButtonText="Yes"
+							cancelButtonText="No"
+						>
+							{
+								// translators: message displayed when confirming an action
+								__(
+									'Are you sure you want to delete this comment?'
+								)
+							}
+						</ConfirmDialog>
+					) }
+			</>
+		);
+	};
+
+	return (
+		<>
+			{
+				// If there are no comments, show a message indicating no comments are available.
+				( ! Array.isArray( threads ) || threads.length === 0 ) && (
+					<VStack
+						alignment="left"
+						className="editor-collab-sidebar-panel__thread"
+						justify="flex-start"
+						spacing="3"
+					>
+						{
+							// translators: message displayed when there are no comments available
+							__( 'No comments available' )
+						}
+					</VStack>
+				)
+			}
+
+			{ Array.isArray( threads ) &&
+				threads.length > 0 &&
+				threads.map( ( thread ) => (
+					<VStack
+						key={ thread.id }
+						className={ clsx(
+							'editor-collab-sidebar-panel__thread',
+							{
+								'editor-collab-sidebar-panel__active-thread':
+									blockCommentId &&
+									blockCommentId === thread.id,
+							}
+						) }
+						id={ thread.id }
+						spacing="3"
+					>
+						<CommentBoard thread={ thread } />
+						{ 'reply' === actionState?.action &&
+							thread.id === actionState?.id && (
+								<HStack
+									alignment="left"
+									spacing="3"
+									justify="flex-start"
+									className="editor-collab-sidebar-panel__user-comment"
+								>
+									<VStack
+										spacing="3"
+										className="editor-collab-sidebar-panel__comment-field"
+									>
+										<CommentForm
+											onSubmit={ ( inputComment ) => {
+												onAddReply(
+													inputComment,
+													thread.id
+												);
+												setActionState( false );
+											} }
+											onCancel={ () =>
+												setActionState( false )
+											}
+										/>
+									</VStack>
+								</HStack>
+							) }
+						{ 0 < thread?.reply?.length &&
+							thread.reply.map( ( reply ) => (
+								<VStack
+									key={ reply.id }
+									className="editor-collab-sidebar-panel__child-thread"
+									id={ reply.id }
+									spacing="2"
+								>
+									<CommentBoard
+										thread={ reply }
+										parentThread={ thread }
+									/>
+								</VStack>
+							) ) }
+					</VStack>
+				) ) }
+		</>
+	);
+}
+
+/**
+ * EditComment component.
+ *
+ * @param {Object}   props          - The component props.
+ * @param {Function} props.onSubmit - The function to call when updating the comment.
+ * @param {Function} props.onCancel - The function to call when canceling the comment update.
+ * @param {Object}   props.thread   - The comment thread object.
+ * @return {JSX.Element} The CommentForm component.
+ */
+function CommentForm( { onSubmit, onCancel, thread } ) {
+	const [ inputComment, setInputComment ] = useState(
+		thread?.content?.raw ?? ''
+	);
+
+	return (
+		<>
+			<TextareaControl
+				__nextHasNoMarginBottom
+				value={ inputComment ?? '' }
+				onChange={ setInputComment }
+			/>
+			<VStack alignment="left" spacing="3" justify="flex-start">
+				<HStack alignment="left" spacing="3" justify="flex-start">
+					<Button
+						__next40pxDefaultSize
+						accessibleWhenDisabled
+						variant="primary"
+						onClick={ () => onSubmit( inputComment ) }
+						disabled={
+							0 === sanitizeCommentString( inputComment ).length
+						}
+					>
+						{ thread
+							? _x( 'Update', 'verb' )
+							: _x( 'Reply', 'Add reply comment' ) }
+					</Button>
+					<Button __next40pxDefaultSize onClick={ onCancel }>
+						{ _x( 'Cancel', 'Cancel comment edit' ) }
+					</Button>
+				</HStack>
+			</VStack>
+		</>
+	);
+}
+
+/**
+ * Renders the header of a comment in the collaboration sidebar.
+ *
+ * @param {Object}   props           - The component props.
+ * @param {Object}   props.thread    - The comment thread object.
+ * @param {Function} props.onResolve - The function to resolve the comment.
+ * @param {Function} props.onEdit    - The function to edit the comment.
+ * @param {Function} props.onDelete  - The function to delete the comment.
+ * @param {Function} props.onReply   - The function to reply to the comment.
+ * @param {string}   props.status    - The status of the comment.
+ * @return {JSX.Element} The rendered comment header.
+ */
+function CommentHeader( {
+	thread,
+	onResolve,
+	onEdit,
+	onDelete,
+	onReply,
+	status,
+} ) {
+	const dateSettings = getDateSettings();
+	const [ dateTimeFormat = dateSettings.formats.time ] = useEntityProp(
+		'root',
+		'site',
+		'time_format'
+	);
+
+	const actions = [
+		{
+			title: _x( 'Edit', 'Edit comment' ),
+			onClick: onEdit,
+		},
+		{
+			title: _x( 'Delete', 'Delete comment' ),
+			onClick: onDelete,
+		},
+		{
+			title: _x( 'Reply', 'Reply on a comment' ),
+			onClick: onReply,
+		},
+	];
+
+	const moreActions = actions.filter( ( item ) => item.onClick );
+
+	return (
+		<HStack alignment="left" spacing="3" justify="flex-start">
+			<img
+				src={ thread?.author_avatar_urls?.[ 48 ] }
+				className="editor-collab-sidebar-panel__user-avatar"
+				// translators: alt text for user avatar image
+				alt={ __( 'User avatar' ) }
+				width={ 32 }
+				height={ 32 }
+			/>
+			<VStack spacing="0">
+				<span className="editor-collab-sidebar-panel__user-name">
+					{ thread.author_name }
+				</span>
+				<time
+					dateTime={ format( 'h:i A', thread.date ) }
+					className="editor-collab-sidebar-panel__user-time"
+				>
+					{ dateI18n( dateTimeFormat, thread.date ) }
+				</time>
+			</VStack>
+			<span className="editor-collab-sidebar-panel__comment-status">
+				{ status !== 'approved' && (
+					<HStack alignment="right" justify="flex-end" spacing="0">
+						{ 0 === thread.parent && onResolve && (
+							<Button
+								label={ _x(
+									'Resolve',
+									'Mark comment as resolved'
+								) }
+								__next40pxDefaultSize
+								icon={ published }
+								onClick={ onResolve }
+								showTooltip
+							/>
+						) }
+						<DropdownMenu
+							icon={ moreVertical }
+							label={ _x(
+								'Select an action',
+								'Select comment action'
+							) }
+							className="editor-collab-sidebar-panel__comment-dropdown-menu"
+							controls={ moreActions }
+						/>
+					</HStack>
+				) }
+				{ status === 'approved' && (
+					// translators: tooltip for resolved comment
+					<Tooltip text={ __( 'Resolved' ) }>
+						<Icon icon={ check } />
+					</Tooltip>
+				) }
+			</span>
+		</HStack>
+	);
+}
diff --git a/packages/editor/src/components/collab-sidebar/constants.js b/packages/editor/src/components/collab-sidebar/constants.js
new file mode 100644
index 00000000000000..748c2afc26374d
--- /dev/null
+++ b/packages/editor/src/components/collab-sidebar/constants.js
@@ -0,0 +1 @@
+export const collabSidebarName = 'edit-post/collab-sidebar';
diff --git a/packages/editor/src/components/collab-sidebar/index.js b/packages/editor/src/components/collab-sidebar/index.js
new file mode 100644
index 00000000000000..482bf3d4081ed1
--- /dev/null
+++ b/packages/editor/src/components/collab-sidebar/index.js
@@ -0,0 +1,299 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useSelect, useDispatch, resolveSelect } from '@wordpress/data';
+import { useState, useEffect, useMemo } from '@wordpress/element';
+import { comment as commentIcon } from '@wordpress/icons';
+import { addFilter } from '@wordpress/hooks';
+import { store as noticesStore } from '@wordpress/notices';
+import { store as coreStore } from '@wordpress/core-data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import PluginSidebar from '../plugin-sidebar';
+import { collabSidebarName } from './constants';
+import { Comments } from './comments';
+import { AddComment } from './add-comment';
+import { store as editorStore } from '../../store';
+import AddCommentButton from './comment-button';
+import AddCommentToolbarButton from './comment-button-toolbar';
+
+const threadsEmptyArray = [];
+
+const isBlockCommentExperimentEnabled =
+	window?.__experimentalEnableBlockComment;
+const modifyBlockCommentAttributes = ( settings ) => {
+	if ( ! settings.attributes.blockCommentId ) {
+		settings.attributes = {
+			...settings.attributes,
+			blockCommentId: {
+				type: 'number',
+			},
+		};
+	}
+
+	return settings;
+};
+
+// Apply the filter to all core blocks
+addFilter(
+	'blocks.registerBlockType',
+	'block-comment/modify-core-block-attributes',
+	modifyBlockCommentAttributes
+);
+
+/**
+ * Renders the Collab sidebar.
+ */
+export default function CollabSidebar() {
+	const { createNotice } = useDispatch( noticesStore );
+	const { saveEntityRecord, deleteEntityRecord } = useDispatch( coreStore );
+	const { getEntityRecord } = resolveSelect( coreStore );
+	const { enableComplementaryArea } = useDispatch( interfaceStore );
+	const [ blockCommentID, setBlockCommentID ] = useState( null );
+	const [ showCommentBoard, setShowCommentBoard ] = useState( false );
+	const { postId } = useSelect( ( select ) => {
+		return {
+			postId: select( editorStore ).getCurrentPostId(),
+		};
+	}, [] );
+
+	const threads = useSelect(
+		( select ) => {
+			if ( ! postId ) {
+				return threadsEmptyArray;
+			}
+			const { getEntityRecords } = select( coreStore );
+			const data = getEntityRecords( 'root', 'comment', {
+				post: postId,
+				type: 'block_comment',
+				status: 'any',
+				per_page: 100,
+			} );
+			return data || threadsEmptyArray;
+		},
+		[ postId ]
+	);
+
+	const clientId = useSelect( ( select ) => {
+		const { getSelectedBlockClientId } = select( blockEditorStore );
+		return getSelectedBlockClientId();
+	}, [] );
+
+	const blockDetails = useSelect(
+		( select ) => {
+			return clientId
+				? select( blockEditorStore ).getBlock( clientId )
+				: null;
+		},
+		[ clientId ]
+	);
+
+	// Get the dispatch functions to save the comment and update the block attributes.
+	const { updateBlockAttributes } = useDispatch( blockEditorStore );
+
+	// Process comments to build the tree structure
+	const resultComments = useMemo( () => {
+		// Create a compare to store the references to all objects by id
+		const compare = {};
+		const result = [];
+
+		const filteredComments = threads.filter(
+			( comment ) => comment.status !== 'trash'
+		);
+
+		// Initialize each object with an empty `reply` array
+		filteredComments.forEach( ( item ) => {
+			compare[ item.id ] = { ...item, reply: [] };
+		} );
+
+		// Iterate over the data to build the tree structure
+		filteredComments.forEach( ( item ) => {
+			if ( item.parent === 0 ) {
+				// If parent is 0, it's a root item, push it to the result array
+				result.push( compare[ item.id ] );
+			} else if ( compare[ item.parent ] ) {
+				// Otherwise, find its parent and push it to the parent's `reply` array
+				compare[ item.parent ].reply.push( compare[ item.id ] );
+			}
+		} );
+
+		return result;
+	}, [ threads ] );
+
+	const openCollabBoard = () => {
+		setShowCommentBoard( true );
+		enableComplementaryArea( 'core', 'edit-post/collab-sidebar' );
+	};
+
+	// Function to save the comment.
+	const addNewComment = async ( comment, parentCommentId ) => {
+		const args = {
+			post: postId,
+			content: comment,
+			comment_type: 'block_comment',
+			comment_approved: 0,
+		};
+
+		// Create a new object, conditionally including the parent property
+		const updatedArgs = {
+			...args,
+			...( parentCommentId ? { parent: parentCommentId } : {} ),
+		};
+
+		const savedRecord = await saveEntityRecord(
+			'root',
+			'comment',
+			updatedArgs
+		);
+
+		if ( savedRecord ) {
+			// If it's a main comment, update the block attributes with the comment id.
+			if ( ! parentCommentId ) {
+				updateBlockAttributes( clientId, {
+					blockCommentId: savedRecord?.id,
+				} );
+			}
+
+			createNotice(
+				'snackbar',
+				parentCommentId
+					? // translators: Reply added successfully
+					  __( 'Reply added successfully.' )
+					: // translators: Comment added successfully
+					  __( 'Comment added successfully.' ),
+				{
+					type: 'snackbar',
+					isDismissible: true,
+				}
+			);
+		} else {
+			onError();
+		}
+	};
+
+	const onCommentResolve = async ( commentId ) => {
+		const savedRecord = await saveEntityRecord( 'root', 'comment', {
+			id: commentId,
+			status: 'approved',
+		} );
+
+		if ( savedRecord ) {
+			// translators: Comment resolved successfully
+			createNotice( 'snackbar', __( 'Comment marked as resolved.' ), {
+				type: 'snackbar',
+				isDismissible: true,
+			} );
+		} else {
+			onError();
+		}
+	};
+
+	const onEditComment = async ( commentId, comment ) => {
+		const savedRecord = await saveEntityRecord( 'root', 'comment', {
+			id: commentId,
+			content: comment,
+		} );
+
+		if ( savedRecord ) {
+			createNotice(
+				'snackbar',
+				// translators: Comment edited successfully
+				__( 'Comment edited successfully.' ),
+				{
+					type: 'snackbar',
+					isDismissible: true,
+				}
+			);
+		} else {
+			onError();
+		}
+	};
+
+	const onError = () => {
+		createNotice(
+			'error',
+			// translators: Error message when comment submission fails
+			__(
+				'Something went wrong. Please try publishing the post, or you may have already submitted your comment earlier.'
+			),
+			{
+				isDismissible: true,
+			}
+		);
+	};
+
+	const onCommentDelete = async ( commentId ) => {
+		const childComment = await getEntityRecord(
+			'root',
+			'comment',
+			commentId
+		);
+		await deleteEntityRecord( 'root', 'comment', commentId );
+
+		if ( childComment && ! childComment.parent ) {
+			updateBlockAttributes( clientId, {
+				blockCommentId: undefined,
+			} );
+		}
+
+		createNotice(
+			'snackbar',
+			// translators: Comment deleted successfully
+			__( 'Comment deleted successfully.' ),
+			{
+				type: 'snackbar',
+				isDismissible: true,
+			}
+		);
+	};
+
+	useEffect( () => {
+		if ( blockDetails ) {
+			setBlockCommentID( blockDetails?.attributes.blockCommentId );
+		}
+	}, [ postId, clientId ] );
+
+	// Check if the experimental flag is enabled.
+	if ( ! isBlockCommentExperimentEnabled ) {
+		return null; // or maybe return some message indicating no threads are available.
+	}
+
+	return (
+		<>
+			{ ! blockCommentID && (
+				<AddCommentButton onClick={ openCollabBoard } />
+			) }
+
+			{ blockCommentID > 0 && (
+				<AddCommentToolbarButton onClick={ openCollabBoard } />
+			) }
+			<PluginSidebar
+				identifier={ collabSidebarName }
+				// translators: Comments sidebar title
+				title={ __( 'Comments' ) }
+				icon={ commentIcon }
+			>
+				<div className="editor-collab-sidebar-panel">
+					<AddComment
+						threads={ resultComments }
+						onSubmit={ addNewComment }
+						showCommentBoard={ showCommentBoard }
+						setShowCommentBoard={ setShowCommentBoard }
+					/>
+					<Comments
+						threads={ resultComments }
+						onEditComment={ onEditComment }
+						onAddReply={ addNewComment }
+						onCommentDelete={ onCommentDelete }
+						onCommentResolve={ onCommentResolve }
+					/>
+				</div>
+			</PluginSidebar>
+		</>
+	);
+}
diff --git a/packages/editor/src/components/collab-sidebar/style.scss b/packages/editor/src/components/collab-sidebar/style.scss
new file mode 100644
index 00000000000000..2f937e3df9a25b
--- /dev/null
+++ b/packages/editor/src/components/collab-sidebar/style.scss
@@ -0,0 +1,111 @@
+.editor-collab-sidebar-panel {
+	padding: $grid-unit-20;
+
+	&__thread {
+		position: relative;
+		padding: $grid-unit-20;
+		border-radius: $radius-large;
+		border: 1px solid $gray-300;
+		background-color: $gray-100;
+		margin-bottom: $grid-unit-20;
+	}
+
+	&__active-thread {
+		border: 1.5px solid #3858e9;
+		background-color: $white;
+		box-shadow: 0 5.5px 7.8px -0.3px rgba(0, 0, 0, 0.102);
+	}
+
+	&__comment-field {
+		flex: 1;
+	}
+
+	&__child-thread {
+		margin-top: 15px;
+	}
+
+	&__user-name {
+		font-size: 12px;
+		font-weight: 400;
+		line-height: 16px;
+		text-align: left;
+		color: $gray-700;
+		text-transform: capitalize;
+	}
+
+	&__user-time {
+		font-size: 12px;
+		font-weight: 400;
+		line-height: 16px;
+		text-align: left;
+		color: $gray-700;
+	}
+
+	&__user-comment {
+		font-size: 13px;
+		font-weight: 400;
+		line-height: 20px;
+		text-align: left;
+		color: $gray-900;
+
+		p {
+			margin-bottom: 0;
+		}
+	}
+
+	&__user-avatar {
+		border-radius: $radius-round;
+		flex-shrink: 0;
+	}
+
+	&__thread-overlay {
+		background-color: rgba(0, 0, 0, 0.7);
+		width: 100%;
+		height: 100%;
+		text-align: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 1;
+		padding: 15px;
+		border-radius: $radius-large;
+		color: $white;
+
+		p {
+			margin-bottom: 15px;
+		}
+
+		button {
+			padding: 4px 10px;
+			color: $white;
+		}
+	}
+
+	&__comment-status {
+		margin-left: auto;
+
+		button {
+			&.has-icon:not(.has-text) {
+				min-width: 24px;
+				padding: 0;
+				width: 24px;
+				height: 24px;
+				flex-shrink: 0;
+			}
+		}
+	}
+
+	&__comment-dropdown-menu {
+		flex-shrink: 0;
+
+		button {
+			&.has-icon {
+				min-width: 24px;
+				padding: 0;
+				width: 24px;
+				height: 24px;
+			}
+		}
+	}
+
+}
diff --git a/packages/editor/src/components/collab-sidebar/utils.js b/packages/editor/src/components/collab-sidebar/utils.js
new file mode 100644
index 00000000000000..7e73344c5dc0e1
--- /dev/null
+++ b/packages/editor/src/components/collab-sidebar/utils.js
@@ -0,0 +1,9 @@
+/**
+ * Sanitizes a comment string by removing non-printable ASCII characters.
+ *
+ * @param {string} str - The comment string to sanitize.
+ * @return {string} - The sanitized comment string.
+ */
+export function sanitizeCommentString( str ) {
+	return str.trim();
+}
diff --git a/packages/editor/src/components/collapsible-block-toolbar/index.js b/packages/editor/src/components/collapsible-block-toolbar/index.js
new file mode 100644
index 00000000000000..cafbfecb72516c
--- /dev/null
+++ b/packages/editor/src/components/collapsible-block-toolbar/index.js
@@ -0,0 +1,75 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	BlockToolbar,
+	store as blockEditorStore,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+import { useEffect } from '@wordpress/element';
+import { Button, Popover } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { next, previous } from '@wordpress/icons';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { useHasBlockToolbar } = unlock( blockEditorPrivateApis );
+
+export default function CollapsibleBlockToolbar( { isCollapsed, onToggle } ) {
+	const { blockSelectionStart } = useSelect( ( select ) => {
+		return {
+			blockSelectionStart:
+				select( blockEditorStore ).getBlockSelectionStart(),
+		};
+	}, [] );
+	const hasBlockToolbar = useHasBlockToolbar();
+
+	const hasBlockSelection = !! blockSelectionStart;
+
+	useEffect( () => {
+		// If we have a new block selection, show the block tools
+		if ( blockSelectionStart ) {
+			onToggle( false );
+		}
+	}, [ blockSelectionStart, onToggle ] );
+
+	if ( ! hasBlockToolbar ) {
+		return null;
+	}
+
+	return (
+		<>
+			<div
+				className={ clsx( 'editor-collapsible-block-toolbar', {
+					'is-collapsed': isCollapsed || ! hasBlockSelection,
+				} ) }
+			>
+				<BlockToolbar hideDragHandle />
+			</div>
+			<Popover.Slot name="block-toolbar" />
+
+			<Button
+				className="editor-collapsible-block-toolbar__toggle"
+				icon={ isCollapsed ? next : previous }
+				onClick={ () => {
+					onToggle( ! isCollapsed );
+				} }
+				label={
+					isCollapsed
+						? __( 'Show block tools' )
+						: __( 'Hide block tools' )
+				}
+				size="compact"
+			/>
+		</>
+	);
+}
diff --git a/packages/editor/src/components/collapsible-block-toolbar/style.scss b/packages/editor/src/components/collapsible-block-toolbar/style.scss
new file mode 100644
index 00000000000000..f559e1a055cdcd
--- /dev/null
+++ b/packages/editor/src/components/collapsible-block-toolbar/style.scss
@@ -0,0 +1,79 @@
+.editor-collapsible-block-toolbar {
+	overflow: hidden;
+	display: flex;
+	align-items: center;
+	height: $header-height;
+
+	.block-editor-block-contextual-toolbar {
+		border-bottom: 0;
+		height: 100%;
+		background: transparent;
+	}
+
+	// These rules ensure that icons are always positioned in a way that lines up with the rest of the icons in the toolbar.
+	.block-editor-block-toolbar {
+		height: 100%;
+		// Push down so that buttons are centered vertically.
+		// It should be 14px (60px header height - 32px compact button height = 28 / 2),
+		// but there is a -1px top-margin down the stack that affects this.
+		padding-top: math.div($header-height - $button-size-compact, 2) + 1;
+
+		// Match the height of other buttons in the header toolbar.
+		.components-button:not(.block-editor-block-mover-button) {
+			height: $button-size-compact;
+		}
+	}
+
+	&::after {
+		content: "";
+		width: $border-width;
+		height: $grid-unit-30;
+		background-color: $gray-300;
+		margin-right: $grid-unit - $border-width;
+	}
+
+	// Modified group borders.
+	.components-toolbar-group,
+	.components-toolbar {
+		border-right: none;
+		position: relative;
+
+		&::after {
+			content: "";
+			width: $border-width;
+			height: $grid-unit-30;
+			background-color: $gray-300;
+			top: $grid-unit-05;
+			position: absolute;
+			right: -$border-width;
+		}
+
+		& .components-toolbar-group.components-toolbar-group {
+			&::after {
+				display: none;
+			}
+		}
+	}
+
+	.block-editor-block-mover {
+		// Match the height of other buttons in the header toolbar.
+		&.is-horizontal .block-editor-block-mover-button {
+			height: $button-size-compact;
+			overflow: visible;
+		}
+
+		// Move up a little to prevent the toolbar shift when focus is on the vertical movers.
+		@include break-small() {
+			&:not(.is-horizontal) .block-editor-block-mover__move-button-container {
+				height: $grid-unit-50;
+				position: relative;
+				top: -5px; // Should be -4px, but that causes scrolling when focus lands on the movers, in a 60px header.
+			}
+		}
+	}
+
+	&.is-collapsed {
+		display: none;
+	}
+}
+
diff --git a/packages/editor/src/components/commands/index.js b/packages/editor/src/components/commands/index.js
new file mode 100644
index 00000000000000..a9c726f660b22e
--- /dev/null
+++ b/packages/editor/src/components/commands/index.js
@@ -0,0 +1,341 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { __, isRTL } from '@wordpress/i18n';
+import {
+	blockDefault,
+	code,
+	drawerLeft,
+	drawerRight,
+	edit,
+	formatListBullets,
+	listView,
+	external,
+	keyboard,
+	symbol,
+} from '@wordpress/icons';
+import { useCommandLoader } from '@wordpress/commands';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { store as noticesStore } from '@wordpress/notices';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { PATTERN_POST_TYPE } from '../../store/constants';
+import { modalName as patternRenameModalName } from '../pattern-rename-modal';
+import { modalName as patternDuplicateModalName } from '../pattern-duplicate-modal';
+
+function useEditorCommandLoader() {
+	const {
+		editorMode,
+		isListViewOpen,
+		showBlockBreadcrumbs,
+		isDistractionFree,
+		isTopToolbar,
+		isFocusMode,
+		isPreviewMode,
+		isViewable,
+		isCodeEditingEnabled,
+		isRichEditingEnabled,
+		isPublishSidebarEnabled,
+	} = useSelect( ( select ) => {
+		const { get } = select( preferencesStore );
+		const { isListViewOpened, getCurrentPostType, getEditorSettings } =
+			select( editorStore );
+		const { getSettings } = select( blockEditorStore );
+		const { getPostType } = select( coreStore );
+
+		return {
+			editorMode: get( 'core', 'editorMode' ) ?? 'visual',
+			isListViewOpen: isListViewOpened(),
+			showBlockBreadcrumbs: get( 'core', 'showBlockBreadcrumbs' ),
+			isDistractionFree: get( 'core', 'distractionFree' ),
+			isFocusMode: get( 'core', 'focusMode' ),
+			isTopToolbar: get( 'core', 'fixedToolbar' ),
+			isPreviewMode: getSettings().isPreviewMode,
+			isViewable: getPostType( getCurrentPostType() )?.viewable ?? false,
+			isCodeEditingEnabled: getEditorSettings().codeEditingEnabled,
+			isRichEditingEnabled: getEditorSettings().richEditingEnabled,
+			isPublishSidebarEnabled:
+				select( editorStore ).isPublishSidebarEnabled(),
+		};
+	}, [] );
+	const { getActiveComplementaryArea } = useSelect( interfaceStore );
+	const { toggle } = useDispatch( preferencesStore );
+	const { createInfoNotice } = useDispatch( noticesStore );
+	const {
+		__unstableSaveForPreview,
+		setIsListViewOpened,
+		switchEditorMode,
+		toggleDistractionFree,
+	} = useDispatch( editorStore );
+	const { openModal, enableComplementaryArea, disableComplementaryArea } =
+		useDispatch( interfaceStore );
+	const { getCurrentPostId } = useSelect( editorStore );
+	const allowSwitchEditorMode = isCodeEditingEnabled && isRichEditingEnabled;
+
+	if ( isPreviewMode ) {
+		return { commands: [], isLoading: false };
+	}
+
+	const commands = [];
+
+	commands.push( {
+		name: 'core/open-shortcut-help',
+		label: __( 'Keyboard shortcuts' ),
+		icon: keyboard,
+		callback: ( { close } ) => {
+			close();
+			openModal( 'editor/keyboard-shortcut-help' );
+		},
+	} );
+
+	commands.push( {
+		name: 'core/toggle-distraction-free',
+		label: isDistractionFree
+			? __( 'Exit Distraction Free' )
+			: __( 'Enter Distraction Free' ),
+		callback: ( { close } ) => {
+			toggleDistractionFree();
+			close();
+		},
+	} );
+
+	commands.push( {
+		name: 'core/open-preferences',
+		label: __( 'Editor preferences' ),
+		callback: ( { close } ) => {
+			close();
+			openModal( 'editor/preferences' );
+		},
+	} );
+
+	commands.push( {
+		name: 'core/toggle-spotlight-mode',
+		label: __( 'Toggle spotlight' ),
+		callback: ( { close } ) => {
+			toggle( 'core', 'focusMode' );
+			close();
+			createInfoNotice(
+				isFocusMode ? __( 'Spotlight off.' ) : __( 'Spotlight on.' ),
+				{
+					id: 'core/editor/toggle-spotlight-mode/notice',
+					type: 'snackbar',
+					actions: [
+						{
+							label: __( 'Undo' ),
+							onClick: () => {
+								toggle( 'core', 'focusMode' );
+							},
+						},
+					],
+				}
+			);
+		},
+	} );
+
+	commands.push( {
+		name: 'core/toggle-list-view',
+		label: isListViewOpen
+			? __( 'Close List View' )
+			: __( 'Open List View' ),
+		icon: listView,
+		callback: ( { close } ) => {
+			setIsListViewOpened( ! isListViewOpen );
+			close();
+			createInfoNotice(
+				isListViewOpen ? __( 'List View off.' ) : __( 'List View on.' ),
+				{
+					id: 'core/editor/toggle-list-view/notice',
+					type: 'snackbar',
+				}
+			);
+		},
+	} );
+
+	commands.push( {
+		name: 'core/toggle-top-toolbar',
+		label: __( 'Toggle top toolbar' ),
+		callback: ( { close } ) => {
+			toggle( 'core', 'fixedToolbar' );
+			if ( isDistractionFree ) {
+				toggleDistractionFree();
+			}
+			close();
+			createInfoNotice(
+				isTopToolbar
+					? __( 'Top toolbar off.' )
+					: __( 'Top toolbar on.' ),
+				{
+					id: 'core/editor/toggle-top-toolbar/notice',
+					type: 'snackbar',
+					actions: [
+						{
+							label: __( 'Undo' ),
+							onClick: () => {
+								toggle( 'core', 'fixedToolbar' );
+							},
+						},
+					],
+				}
+			);
+		},
+	} );
+
+	if ( allowSwitchEditorMode ) {
+		commands.push( {
+			name: 'core/toggle-code-editor',
+			label:
+				editorMode === 'visual'
+					? __( 'Open code editor' )
+					: __( 'Exit code editor' ),
+			icon: code,
+			callback: ( { close } ) => {
+				switchEditorMode( editorMode === 'visual' ? 'text' : 'visual' );
+				close();
+			},
+		} );
+	}
+
+	commands.push( {
+		name: 'core/toggle-breadcrumbs',
+		label: showBlockBreadcrumbs
+			? __( 'Hide block breadcrumbs' )
+			: __( 'Show block breadcrumbs' ),
+		callback: ( { close } ) => {
+			toggle( 'core', 'showBlockBreadcrumbs' );
+			close();
+			createInfoNotice(
+				showBlockBreadcrumbs
+					? __( 'Breadcrumbs hidden.' )
+					: __( 'Breadcrumbs visible.' ),
+				{
+					id: 'core/editor/toggle-breadcrumbs/notice',
+					type: 'snackbar',
+				}
+			);
+		},
+	} );
+
+	commands.push( {
+		name: 'core/open-settings-sidebar',
+		label: __( 'Toggle settings sidebar' ),
+		icon: isRTL() ? drawerLeft : drawerRight,
+		callback: ( { close } ) => {
+			const activeSidebar = getActiveComplementaryArea( 'core' );
+			close();
+			if ( activeSidebar === 'edit-post/document' ) {
+				disableComplementaryArea( 'core' );
+			} else {
+				enableComplementaryArea( 'core', 'edit-post/document' );
+			}
+		},
+	} );
+
+	commands.push( {
+		name: 'core/open-block-inspector',
+		label: __( 'Toggle block inspector' ),
+		icon: blockDefault,
+		callback: ( { close } ) => {
+			const activeSidebar = getActiveComplementaryArea( 'core' );
+			close();
+			if ( activeSidebar === 'edit-post/block' ) {
+				disableComplementaryArea( 'core' );
+			} else {
+				enableComplementaryArea( 'core', 'edit-post/block' );
+			}
+		},
+	} );
+
+	commands.push( {
+		name: 'core/toggle-publish-sidebar',
+		label: isPublishSidebarEnabled
+			? __( 'Disable pre-publish checks' )
+			: __( 'Enable pre-publish checks' ),
+		icon: formatListBullets,
+		callback: ( { close } ) => {
+			close();
+			toggle( 'core', 'isPublishSidebarEnabled' );
+			createInfoNotice(
+				isPublishSidebarEnabled
+					? __( 'Pre-publish checks disabled.' )
+					: __( 'Pre-publish checks enabled.' ),
+				{
+					id: 'core/editor/publish-sidebar/notice',
+					type: 'snackbar',
+				}
+			);
+		},
+	} );
+
+	if ( isViewable ) {
+		commands.push( {
+			name: 'core/preview-link',
+			label: __( 'Preview in a new tab' ),
+			icon: external,
+			callback: async ( { close } ) => {
+				close();
+				const postId = getCurrentPostId();
+				const link = await __unstableSaveForPreview();
+				window.open( link, `wp-preview-${ postId }` );
+			},
+		} );
+	}
+
+	return {
+		commands,
+		isLoading: false,
+	};
+}
+
+function useEditedEntityContextualCommands() {
+	const { postType } = useSelect( ( select ) => {
+		const { getCurrentPostType } = select( editorStore );
+		return {
+			postType: getCurrentPostType(),
+		};
+	}, [] );
+	const { openModal } = useDispatch( interfaceStore );
+	const commands = [];
+
+	if ( postType === PATTERN_POST_TYPE ) {
+		commands.push( {
+			name: 'core/rename-pattern',
+			label: __( 'Rename pattern' ),
+			icon: edit,
+			callback: ( { close } ) => {
+				openModal( patternRenameModalName );
+				close();
+			},
+		} );
+		commands.push( {
+			name: 'core/duplicate-pattern',
+			label: __( 'Duplicate pattern' ),
+			icon: symbol,
+			callback: ( { close } ) => {
+				openModal( patternDuplicateModalName );
+				close();
+			},
+		} );
+	}
+
+	return { isLoading: false, commands };
+}
+
+export default function useCommands() {
+	useCommandLoader( {
+		name: 'core/editor/edit-ui',
+		hook: useEditorCommandLoader,
+	} );
+
+	useCommandLoader( {
+		name: 'core/editor/contextual-commands',
+		hook: useEditedEntityContextualCommands,
+		context: 'entity-edit',
+	} );
+}
diff --git a/packages/editor/src/components/commands/index.native.js b/packages/editor/src/components/commands/index.native.js
new file mode 100644
index 00000000000000..23e48951a0329b
--- /dev/null
+++ b/packages/editor/src/components/commands/index.native.js
@@ -0,0 +1,2 @@
+// Commands are disabled in the mobile native version.
+export default function useCommands() {}
diff --git a/packages/editor/src/components/create-template-part-modal/index.js b/packages/editor/src/components/create-template-part-modal/index.js
new file mode 100644
index 00000000000000..63e3830295c379
--- /dev/null
+++ b/packages/editor/src/components/create-template-part-modal/index.js
@@ -0,0 +1,208 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import {
+	Icon,
+	BaseControl,
+	TextControl,
+	Flex,
+	FlexItem,
+	FlexBlock,
+	Button,
+	Modal,
+	__experimentalRadioGroup as RadioGroup,
+	__experimentalRadio as Radio,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useState } from '@wordpress/element';
+import { useInstanceId } from '@wordpress/compose';
+import { store as noticesStore } from '@wordpress/notices';
+import { store as coreStore } from '@wordpress/core-data';
+import { check } from '@wordpress/icons';
+import { serialize } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import {
+	TEMPLATE_PART_POST_TYPE,
+	TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
+} from '../../store/constants';
+import {
+	useExistingTemplateParts,
+	getUniqueTemplatePartTitle,
+	getCleanTemplatePartSlug,
+} from './utils';
+
+export default function CreateTemplatePartModal( {
+	modalTitle,
+	...restProps
+} ) {
+	const defaultModalTitle = useSelect(
+		( select ) =>
+			select( coreStore ).getPostType( TEMPLATE_PART_POST_TYPE )?.labels
+				?.add_new_item,
+		[]
+	);
+	return (
+		<Modal
+			title={ modalTitle || defaultModalTitle }
+			onRequestClose={ restProps.closeModal }
+			overlayClassName="editor-create-template-part-modal"
+			focusOnMount="firstContentElement"
+			size="medium"
+		>
+			<CreateTemplatePartModalContents { ...restProps } />
+		</Modal>
+	);
+}
+
+export function CreateTemplatePartModalContents( {
+	defaultArea = TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
+	blocks = [],
+	confirmLabel = __( 'Add' ),
+	closeModal,
+	onCreate,
+	onError,
+	defaultTitle = '',
+} ) {
+	const { createErrorNotice } = useDispatch( noticesStore );
+	const { saveEntityRecord } = useDispatch( coreStore );
+	const existingTemplateParts = useExistingTemplateParts();
+
+	const [ title, setTitle ] = useState( defaultTitle );
+	const [ area, setArea ] = useState( defaultArea );
+	const [ isSubmitting, setIsSubmitting ] = useState( false );
+	const instanceId = useInstanceId( CreateTemplatePartModal );
+
+	const templatePartAreas = useSelect(
+		( select ) =>
+			select( editorStore ).__experimentalGetDefaultTemplatePartAreas(),
+		[]
+	);
+	async function createTemplatePart() {
+		if ( ! title || isSubmitting ) {
+			return;
+		}
+
+		try {
+			setIsSubmitting( true );
+			const uniqueTitle = getUniqueTemplatePartTitle(
+				title,
+				existingTemplateParts
+			);
+			const cleanSlug = getCleanTemplatePartSlug( uniqueTitle );
+
+			const templatePart = await saveEntityRecord(
+				'postType',
+				TEMPLATE_PART_POST_TYPE,
+				{
+					slug: cleanSlug,
+					title: uniqueTitle,
+					content: serialize( blocks ),
+					area,
+				},
+				{ throwOnError: true }
+			);
+			await onCreate( templatePart );
+
+			// TODO: Add a success notice?
+		} catch ( error ) {
+			const errorMessage =
+				error.message && error.code !== 'unknown_error'
+					? error.message
+					: __(
+							'An error occurred while creating the template part.'
+					  );
+
+			createErrorNotice( errorMessage, { type: 'snackbar' } );
+
+			onError?.();
+		} finally {
+			setIsSubmitting( false );
+		}
+	}
+	return (
+		<form
+			onSubmit={ async ( event ) => {
+				event.preventDefault();
+				await createTemplatePart();
+			} }
+		>
+			<VStack spacing="4">
+				<TextControl
+					__next40pxDefaultSize
+					__nextHasNoMarginBottom
+					label={ __( 'Name' ) }
+					value={ title }
+					onChange={ setTitle }
+					required
+				/>
+				<BaseControl
+					__nextHasNoMarginBottom
+					label={ __( 'Area' ) }
+					id={ `editor-create-template-part-modal__area-selection-${ instanceId }` }
+					className="editor-create-template-part-modal__area-base-control"
+				>
+					<RadioGroup
+						label={ __( 'Area' ) }
+						className="editor-create-template-part-modal__area-radio-group"
+						id={ `editor-create-template-part-modal__area-selection-${ instanceId }` }
+						onChange={ setArea }
+						checked={ area }
+					>
+						{ templatePartAreas.map(
+							( { icon, label, area: value, description } ) => (
+								<Radio
+									key={ label }
+									value={ value }
+									className="editor-create-template-part-modal__area-radio"
+								>
+									<Flex align="start" justify="start">
+										<FlexItem>
+											<Icon icon={ icon } />
+										</FlexItem>
+										<FlexBlock className="editor-create-template-part-modal__option-label">
+											{ label }
+											<div>{ description }</div>
+										</FlexBlock>
+
+										<FlexItem className="editor-create-template-part-modal__checkbox">
+											{ area === value && (
+												<Icon icon={ check } />
+											) }
+										</FlexItem>
+									</Flex>
+								</Radio>
+							)
+						) }
+					</RadioGroup>
+				</BaseControl>
+				<HStack justify="right">
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ () => {
+							closeModal();
+						} }
+					>
+						{ __( 'Cancel' ) }
+					</Button>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						type="submit"
+						aria-disabled={ ! title || isSubmitting }
+						isBusy={ isSubmitting }
+					>
+						{ confirmLabel }
+					</Button>
+				</HStack>
+			</VStack>
+		</form>
+	);
+}
diff --git a/packages/editor/src/components/create-template-part-modal/style.scss b/packages/editor/src/components/create-template-part-modal/style.scss
new file mode 100644
index 00000000000000..be15e8d76d536e
--- /dev/null
+++ b/packages/editor/src/components/create-template-part-modal/style.scss
@@ -0,0 +1,63 @@
+.editor-create-template-part-modal {
+	z-index: z-index(".editor-create-template-part-modal");
+}
+
+.editor-create-template-part-modal__area-radio-group {
+	width: 100%;
+	border: $border-width solid $gray-700;
+	border-radius: $radius-small;
+
+	.components-button.editor-create-template-part-modal__area-radio {
+		display: block;
+		width: 100%;
+		height: 100%;
+		text-align: left;
+		padding: $grid-unit-15;
+
+		&,
+		&.is-secondary:hover,
+		&.is-primary:hover {
+			margin: 0;
+			background-color: inherit;
+			border-bottom: $border-width solid $gray-700;
+			border-radius: 0;
+
+			&:not(:focus) {
+				box-shadow: none;
+			}
+
+			&:focus {
+				border-bottom: $border-width solid $white;
+			}
+
+			&:last-of-type {
+				border-bottom: none;
+			}
+		}
+
+		&:not(:hover),
+		&[aria-checked="true"] {
+			color: $gray-900;
+			cursor: auto;
+
+			.editor-create-template-part-modal__option-label div {
+				color: $gray-600;
+			}
+		}
+
+		.editor-create-template-part-modal__option-label {
+			padding-top: $grid-unit-05;
+			white-space: normal;
+
+			div {
+				padding-top: $grid-unit-05;
+				font-size: $helptext-font-size;
+			}
+		}
+
+		.editor-create-template-part-modal__checkbox {
+			margin-left: auto;
+			min-width: $grid-unit-30;
+		}
+	}
+}
diff --git a/packages/editor/src/components/create-template-part-modal/test/utils.js b/packages/editor/src/components/create-template-part-modal/test/utils.js
new file mode 100644
index 00000000000000..7e33c16f46d8e8
--- /dev/null
+++ b/packages/editor/src/components/create-template-part-modal/test/utils.js
@@ -0,0 +1,60 @@
+/**
+ * Internal dependencies
+ */
+import { getUniqueTemplatePartTitle, getCleanTemplatePartSlug } from '../utils';
+
+describe( 'getUniqueTemplatePartTitle', () => {
+	it( 'should return the title if it is unique', () => {
+		const title = 'My Template Part';
+		const templateParts = [
+			{
+				title: {
+					rendered: 'Template Part With Another Title',
+				},
+			},
+		];
+
+		expect( getUniqueTemplatePartTitle( title, templateParts ) ).toBe(
+			title
+		);
+	} );
+
+	it( 'should return the title with a suffix if it is not unique', () => {
+		const title = 'My Template Part';
+		const templateParts = [
+			{
+				title: {
+					rendered: 'My Template Part',
+				},
+			},
+			{
+				title: {
+					rendered: 'My Template Part 2',
+				},
+			},
+		];
+
+		expect( getUniqueTemplatePartTitle( title, templateParts ) ).toBe(
+			'My Template Part 3'
+		);
+	} );
+} );
+
+describe( 'getCleanTemplatePartSlug', () => {
+	it( 'should return a slug with only latin chars', () => {
+		const title = 'Myɶ Template Partɮ';
+		expect( getCleanTemplatePartSlug( title ) ).toBe( 'my-template-part' );
+	} );
+
+	it( 'should return a slug with only latin chars and numbers', () => {
+		const title = 'My Template Part 2';
+		expect( getCleanTemplatePartSlug( title ) ).toBe(
+			'my-template-part-2'
+		);
+	} );
+
+	it( 'should default the slug to wp-custom-part', () => {
+		const title = '';
+		expect( getCleanTemplatePartSlug( title ) ).toBe( 'wp-custom-part' );
+	} );
+} );
diff --git a/packages/editor/src/components/create-template-part-modal/utils.js b/packages/editor/src/components/create-template-part-modal/utils.js
new file mode 100644
index 00000000000000..02f24cf17d2be9
--- /dev/null
+++ b/packages/editor/src/components/create-template-part-modal/utils.js
@@ -0,0 +1,67 @@
+/**
+ * External dependencies
+ */
+import { paramCase as kebabCase } from 'change-case';
+
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_PART_POST_TYPE } from '../../store/constants';
+
+export const useExistingTemplateParts = () => {
+	return useSelect(
+		( select ) =>
+			select( coreStore ).getEntityRecords(
+				'postType',
+				TEMPLATE_PART_POST_TYPE,
+				{
+					per_page: -1,
+				}
+			),
+		[]
+	);
+};
+
+/**
+ * Return a unique template part title based on
+ * the given title and existing template parts.
+ *
+ * @param {string} title         The original template part title.
+ * @param {Object} templateParts The array of template part entities.
+ * @return {string} A unique template part title.
+ */
+export const getUniqueTemplatePartTitle = ( title, templateParts ) => {
+	const lowercaseTitle = title.toLowerCase();
+	const existingTitles = templateParts.map( ( templatePart ) =>
+		templatePart.title.rendered.toLowerCase()
+	);
+
+	if ( ! existingTitles.includes( lowercaseTitle ) ) {
+		return title;
+	}
+
+	let suffix = 2;
+	while ( existingTitles.includes( `${ lowercaseTitle } ${ suffix }` ) ) {
+		suffix++;
+	}
+
+	return `${ title } ${ suffix }`;
+};
+
+/**
+ * Get a valid slug for a template part.
+ * Currently template parts only allow latin chars.
+ * The fallback slug will receive suffix by default.
+ *
+ * @param {string} title The template part title.
+ * @return {string} A valid template part slug.
+ */
+export const getCleanTemplatePartSlug = ( title ) => {
+	return kebabCase( title ).replace( /[^\w-]+/g, '' ) || 'wp-custom-part';
+};
diff --git a/packages/editor/src/components/deprecated.js b/packages/editor/src/components/deprecated.js
index 977f7b4c9a1a21..39432fd447cb63 100644
--- a/packages/editor/src/components/deprecated.js
+++ b/packages/editor/src/components/deprecated.js
@@ -94,6 +94,9 @@ function deprecateFunction( name, func ) {
 	};
 }
 
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.RichText` instead.
+ */
 const RichText = deprecateComponent( 'RichText', RootRichText, [ 'Content' ] );
 RichText.isEmpty = deprecateFunction(
 	'RichText.isEmpty',
@@ -101,167 +104,321 @@ RichText.isEmpty = deprecateFunction(
 );
 
 export { RichText };
+
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.Autocomplete` instead.
+ */
 export const Autocomplete = deprecateComponent(
 	'Autocomplete',
 	RootAutocomplete
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.AlignmentToolbar` instead.
+ */
 export const AlignmentToolbar = deprecateComponent(
 	'AlignmentToolbar',
 	RootAlignmentToolbar
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockAlignmentToolbar` instead.
+ */
 export const BlockAlignmentToolbar = deprecateComponent(
 	'BlockAlignmentToolbar',
 	RootBlockAlignmentToolbar
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockControls` instead.
+ */
 export const BlockControls = deprecateComponent(
 	'BlockControls',
 	RootBlockControls,
 	[ 'Slot' ]
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockEdit` instead.
+ */
 export const BlockEdit = deprecateComponent( 'BlockEdit', RootBlockEdit );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockEditorKeyboardShortcuts` instead.
+ */
 export const BlockEditorKeyboardShortcuts = deprecateComponent(
 	'BlockEditorKeyboardShortcuts',
 	RootBlockEditorKeyboardShortcuts
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockFormatControls` instead.
+ */
 export const BlockFormatControls = deprecateComponent(
 	'BlockFormatControls',
 	RootBlockFormatControls,
 	[ 'Slot' ]
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockIcon` instead.
+ */
 export const BlockIcon = deprecateComponent( 'BlockIcon', RootBlockIcon );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockInspector` instead.
+ */
 export const BlockInspector = deprecateComponent(
 	'BlockInspector',
 	RootBlockInspector
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockList` instead.
+ */
 export const BlockList = deprecateComponent( 'BlockList', RootBlockList );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockMover` instead.
+ */
 export const BlockMover = deprecateComponent( 'BlockMover', RootBlockMover );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockNavigationDropdown` instead.
+ */
 export const BlockNavigationDropdown = deprecateComponent(
 	'BlockNavigationDropdown',
 	RootBlockNavigationDropdown
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockSelectionClearer` instead.
+ */
 export const BlockSelectionClearer = deprecateComponent(
 	'BlockSelectionClearer',
 	RootBlockSelectionClearer
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockSettingsMenu` instead.
+ */
 export const BlockSettingsMenu = deprecateComponent(
 	'BlockSettingsMenu',
 	RootBlockSettingsMenu
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockTitle` instead.
+ */
 export const BlockTitle = deprecateComponent( 'BlockTitle', RootBlockTitle );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.BlockToolbar` instead.
+ */
 export const BlockToolbar = deprecateComponent(
 	'BlockToolbar',
 	RootBlockToolbar
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.ColorPalette` instead.
+ */
 export const ColorPalette = deprecateComponent(
 	'ColorPalette',
 	RootColorPalette
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.ContrastChecker` instead.
+ */
 export const ContrastChecker = deprecateComponent(
 	'ContrastChecker',
 	RootContrastChecker
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.CopyHandler` instead.
+ */
 export const CopyHandler = deprecateComponent( 'CopyHandler', RootCopyHandler );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.DefaultBlockAppender` instead.
+ */
 export const DefaultBlockAppender = deprecateComponent(
 	'DefaultBlockAppender',
 	RootDefaultBlockAppender
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.FontSizePicker` instead.
+ */
 export const FontSizePicker = deprecateComponent(
 	'FontSizePicker',
 	RootFontSizePicker
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.Inserter` instead.
+ */
 export const Inserter = deprecateComponent( 'Inserter', RootInserter );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.InnerBlocks` instead.
+ */
 export const InnerBlocks = deprecateComponent( 'InnerBlocks', RootInnerBlocks, [
 	'ButtonBlockAppender',
 	'DefaultBlockAppender',
 	'Content',
 ] );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.InspectorAdvancedControls` instead.
+ */
 export const InspectorAdvancedControls = deprecateComponent(
 	'InspectorAdvancedControls',
 	RootInspectorAdvancedControls,
 	[ 'Slot' ]
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.InspectorControls` instead.
+ */
 export const InspectorControls = deprecateComponent(
 	'InspectorControls',
 	RootInspectorControls,
 	[ 'Slot' ]
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.PanelColorSettings` instead.
+ */
 export const PanelColorSettings = deprecateComponent(
 	'PanelColorSettings',
 	RootPanelColorSettings
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.PlainText` instead.
+ */
 export const PlainText = deprecateComponent( 'PlainText', RootPlainText );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.RichTextShortcut` instead.
+ */
 export const RichTextShortcut = deprecateComponent(
 	'RichTextShortcut',
 	RootRichTextShortcut
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.RichTextToolbarButton` instead.
+ */
 export const RichTextToolbarButton = deprecateComponent(
 	'RichTextToolbarButton',
 	RootRichTextToolbarButton
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.__unstableRichTextInputEvent` instead.
+ */
 export const __unstableRichTextInputEvent = deprecateComponent(
 	'__unstableRichTextInputEvent',
 	__unstableRootRichTextInputEvent
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.MediaPlaceholder` instead.
+ */
 export const MediaPlaceholder = deprecateComponent(
 	'MediaPlaceholder',
 	RootMediaPlaceholder
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.MediaUpload` instead.
+ */
 export const MediaUpload = deprecateComponent( 'MediaUpload', RootMediaUpload );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.MediaUploadCheck` instead.
+ */
 export const MediaUploadCheck = deprecateComponent(
 	'MediaUploadCheck',
 	RootMediaUploadCheck
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.MultiSelectScrollIntoView` instead.
+ */
 export const MultiSelectScrollIntoView = deprecateComponent(
 	'MultiSelectScrollIntoView',
 	RootMultiSelectScrollIntoView
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.NavigableToolbar` instead.
+ */
 export const NavigableToolbar = deprecateComponent(
 	'NavigableToolbar',
 	RootNavigableToolbar
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.ObserveTyping` instead.
+ */
 export const ObserveTyping = deprecateComponent(
 	'ObserveTyping',
 	RootObserveTyping
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.SkipToSelectedBlock` instead.
+ */
 export const SkipToSelectedBlock = deprecateComponent(
 	'SkipToSelectedBlock',
 	RootSkipToSelectedBlock
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.URLInput` instead.
+ */
 export const URLInput = deprecateComponent( 'URLInput', RootURLInput );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.URLInputButton` instead.
+ */
 export const URLInputButton = deprecateComponent(
 	'URLInputButton',
 	RootURLInputButton
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.URLPopover` instead.
+ */
 export const URLPopover = deprecateComponent( 'URLPopover', RootURLPopover );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.Warning` instead.
+ */
 export const Warning = deprecateComponent( 'Warning', RootWarning );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.WritingFlow` instead.
+ */
 export const WritingFlow = deprecateComponent( 'WritingFlow', RootWritingFlow );
 
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.createCustomColorsHOC` instead.
+ */
 export const createCustomColorsHOC = deprecateFunction(
 	'createCustomColorsHOC',
 	rootCreateCustomColorsHOC
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.getColorClassName` instead.
+ */
 export const getColorClassName = deprecateFunction(
 	'getColorClassName',
 	rootGetColorClassName
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.getColorObjectByAttributeValues` instead.
+ */
 export const getColorObjectByAttributeValues = deprecateFunction(
 	'getColorObjectByAttributeValues',
 	rootGetColorObjectByAttributeValues
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.getColorObjectByColorValue` instead.
+ */
 export const getColorObjectByColorValue = deprecateFunction(
 	'getColorObjectByColorValue',
 	rootGetColorObjectByColorValue
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.getFontSize` instead.
+ */
 export const getFontSize = deprecateFunction( 'getFontSize', rootGetFontSize );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.getFontSizeClass` instead.
+ */
 export const getFontSizeClass = deprecateFunction(
 	'getFontSizeClass',
 	rootGetFontSizeClass
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.createCustomColorsHOC` instead.
+ */
 export const withColorContext = deprecateFunction(
 	'withColorContext',
 	rootWithColorContext
 );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.withColors` instead.
+ */
 export const withColors = deprecateFunction( 'withColors', rootWithColors );
+/**
+ * @deprecated since 5.3, use `wp.blockEditor.withFontSizes` instead.
+ */
 export const withFontSizes = deprecateFunction(
 	'withFontSizes',
 	rootWithFontSizes
diff --git a/packages/editor/src/components/document-bar/index.js b/packages/editor/src/components/document-bar/index.js
index ffb2be33074563..3c522189a2632f 100644
--- a/packages/editor/src/components/document-bar/index.js
+++ b/packages/editor/src/components/document-bar/index.js
@@ -1,177 +1,192 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { __, isRTL, sprintf } from '@wordpress/i18n';
+import { __, isRTL } from '@wordpress/i18n';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
 	Button,
 	__experimentalText as Text,
-	__experimentalHStack as HStack,
+	__unstableMotion as motion,
+	__unstableAnimatePresence as AnimatePresence,
 } from '@wordpress/components';
 import { BlockIcon } from '@wordpress/block-editor';
-import {
-	chevronLeftSmall,
-	chevronRightSmall,
-	page as pageIcon,
-	navigation as navigationIcon,
-	symbol,
-} from '@wordpress/icons';
+import { chevronLeftSmall, chevronRightSmall } from '@wordpress/icons';
 import { displayShortcut } from '@wordpress/keycodes';
-import { useEntityRecord } from '@wordpress/core-data';
+import { store as coreStore } from '@wordpress/core-data';
 import { store as commandsStore } from '@wordpress/commands';
-import { useState, useEffect, useRef } from '@wordpress/element';
+import { useRef, useEffect } from '@wordpress/element';
+import { useReducedMotion } from '@wordpress/compose';
+import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Internal dependencies
  */
+import { TEMPLATE_POST_TYPES } from '../../store/constants';
 import { store as editorStore } from '../../store';
 
-const typeLabels = {
-	// translators: 1: Pattern title.
-	wp_pattern: __( 'Editing pattern: %s' ),
-	// translators: 1: Navigation menu title.
-	wp_navigation: __( 'Editing navigation menu: %s' ),
-	// translators: 1: Template title.
-	wp_template: __( 'Editing template: %s' ),
-	// translators: 1: Template part title.
-	wp_template_part: __( 'Editing template part: %s' ),
-};
-
-const icons = {
-	wp_block: symbol,
-	wp_navigation: navigationIcon,
-};
-
-export default function DocumentBar() {
-	const { isEditingTemplate, templateId, postType, postId } = useSelect(
-		( select ) => {
-			const {
-				getRenderingMode,
-				getCurrentTemplateId,
-				getCurrentPostId,
-				getCurrentPostType,
-			} = select( editorStore );
-			const _templateId = getCurrentTemplateId();
-			return {
-				isEditingTemplate:
-					!! _templateId && getRenderingMode() === 'template-only',
-				templateId: _templateId,
-				postType: getCurrentPostType(),
-				postId: getCurrentPostId(),
-			};
-		},
-		[]
-	);
-	const { getEditorSettings } = useSelect( editorStore );
-	const { setRenderingMode } = useDispatch( editorStore );
+/** @typedef {import("@wordpress/components").IconType} IconType */
 
-	return (
-		<BaseDocumentActions
-			postType={ isEditingTemplate ? 'wp_template' : postType }
-			postId={ isEditingTemplate ? templateId : postId }
-			onBack={
-				isEditingTemplate
-					? () =>
-							setRenderingMode(
-								getEditorSettings().defaultRenderingMode
-							)
-					: undefined
-			}
-		/>
-	);
-}
+const MotionButton = motion( Button );
 
-function BaseDocumentActions( { postType, postId, onBack } ) {
-	const { open: openCommandCenter } = useDispatch( commandsStore );
-	const { editedRecord: document, isResolving } = useEntityRecord(
-		'postType',
+/**
+ * This component renders a navigation bar at the top of the editor. It displays the title of the current document,
+ * a back button (if applicable), and a command center button. It also handles different states of the document,
+ * such as "not found" or "unsynced".
+ *
+ * @example
+ * ```jsx
+ * <DocumentBar />
+ * ```
+ * @param {Object}   props       The component props.
+ * @param {string}   props.title A title for the document, defaulting to the document or
+ *                               template title currently being edited.
+ * @param {IconType} props.icon  An icon for the document, no default.
+ *                               (A default icon indicating the document post type is no longer used.)
+ *
+ * @return {JSX.Element} The rendered DocumentBar component.
+ */
+export default function DocumentBar( props ) {
+	const {
 		postType,
-		postId
-	);
-	const { templateIcon, templateTitle } = useSelect( ( select ) => {
-		const { __experimentalGetTemplateInfo: getTemplateInfo } =
-			select( editorStore );
-		const templateInfo = getTemplateInfo( document );
+		postTypeLabel,
+		documentTitle,
+		isNotFound,
+		templateTitle,
+		onNavigateToPreviousEntityRecord,
+	} = useSelect( ( select ) => {
+		const {
+			getCurrentPostType,
+			getCurrentPostId,
+			getEditorSettings,
+			__experimentalGetTemplateInfo: getTemplateInfo,
+		} = select( editorStore );
+		const {
+			getEditedEntityRecord,
+			getPostType,
+			isResolving: isResolvingSelector,
+		} = select( coreStore );
+		const _postType = getCurrentPostType();
+		const _postId = getCurrentPostId();
+		const _document = getEditedEntityRecord(
+			'postType',
+			_postType,
+			_postId
+		);
+		const _templateInfo = getTemplateInfo( _document );
+		const _postTypeLabel = getPostType( _postType )?.labels?.singular_name;
+
 		return {
-			templateIcon: templateInfo.icon,
-			templateTitle: templateInfo.title,
+			postType: _postType,
+			postTypeLabel: _postTypeLabel,
+			documentTitle: _document.title,
+			isNotFound:
+				! _document &&
+				! isResolvingSelector(
+					'getEditedEntityRecord',
+					'postType',
+					_postType,
+					_postId
+				),
+			templateTitle: _templateInfo.title,
+			onNavigateToPreviousEntityRecord:
+				getEditorSettings().onNavigateToPreviousEntityRecord,
 		};
-	} );
-	const isNotFound = ! document && ! isResolving;
-	const icon = icons[ postType ] ?? pageIcon;
-	const [ isAnimated, setIsAnimated ] = useState( false );
-	const isMounting = useRef( true );
-	const isTemplate = [ 'wp_template', 'wp_template_part' ].includes(
-		postType
-	);
-	const isGlobalEntity = [
-		'wp_template',
-		'wp_navigation',
-		'wp_template_part',
-		'wp_block',
-	].includes( postType );
+	}, [] );
 
-	useEffect( () => {
-		if ( ! isMounting.current ) {
-			setIsAnimated( true );
-		}
-		isMounting.current = false;
-	}, [ postType, postId ] );
+	const { open: openCommandCenter } = useDispatch( commandsStore );
+	const isReducedMotion = useReducedMotion();
 
-	const title = isTemplate ? templateTitle : document.title;
+	const isTemplate = TEMPLATE_POST_TYPES.includes( postType );
+	const hasBackButton = !! onNavigateToPreviousEntityRecord;
+	const entityTitle = isTemplate ? templateTitle : documentTitle;
+	const title = props.title || entityTitle;
+	const icon = props.icon;
+
+	const mountedRef = useRef( false );
+	useEffect( () => {
+		mountedRef.current = true;
+	}, [] );
 
 	return (
 		<div
-			className={ classnames( 'editor-document-bar', {
-				'has-back-button': !! onBack,
-				'is-animated': isAnimated,
-				'is-global': isGlobalEntity,
+			className={ clsx( 'editor-document-bar', {
+				'has-back-button': hasBackButton,
 			} ) }
 		>
-			{ onBack && (
-				<Button
-					className="editor-document-bar__back"
-					icon={ isRTL() ? chevronRightSmall : chevronLeftSmall }
-					onClick={ ( event ) => {
-						event.stopPropagation();
-						onBack();
-					} }
-					size="compact"
-				>
-					{ __( 'Back' ) }
-				</Button>
-			) }
-			{ isNotFound && <Text>{ __( 'Document not found' ) }</Text> }
-			{ ! isNotFound && (
+			<AnimatePresence>
+				{ hasBackButton && (
+					<MotionButton
+						className="editor-document-bar__back"
+						icon={ isRTL() ? chevronRightSmall : chevronLeftSmall }
+						onClick={ ( event ) => {
+							event.stopPropagation();
+							onNavigateToPreviousEntityRecord();
+						} }
+						size="compact"
+						initial={
+							mountedRef.current
+								? { opacity: 0, transform: 'translateX(15%)' }
+								: false // Don't show entry animation when DocumentBar mounts.
+						}
+						animate={ { opacity: 1, transform: 'translateX(0%)' } }
+						exit={ { opacity: 0, transform: 'translateX(15%)' } }
+						transition={
+							isReducedMotion ? { duration: 0 } : undefined
+						}
+					>
+						{ __( 'Back' ) }
+					</MotionButton>
+				) }
+			</AnimatePresence>
+			{ isNotFound ? (
+				<Text>{ __( 'Document not found' ) }</Text>
+			) : (
 				<Button
 					className="editor-document-bar__command"
 					onClick={ () => openCommandCenter() }
 					size="compact"
 				>
-					<HStack
+					<motion.div
 						className="editor-document-bar__title"
-						spacing={ 1 }
-						justify="center"
+						// Force entry animation when the back button is added or removed.
+						key={ hasBackButton }
+						initial={
+							mountedRef.current
+								? {
+										opacity: 0,
+										transform: hasBackButton
+											? 'translateX(15%)'
+											: 'translateX(-15%)',
+								  }
+								: false // Don't show entry animation when DocumentBar mounts.
+						}
+						animate={ {
+							opacity: 1,
+							transform: 'translateX(0%)',
+						} }
+						transition={
+							isReducedMotion ? { duration: 0 } : undefined
+						}
 					>
-						<BlockIcon icon={ isTemplate ? templateIcon : icon } />
-						<Text
-							size="body"
-							as="h1"
-							aria-label={
-								typeLabels[ postType ]
-									? // eslint-disable-next-line @wordpress/valid-sprintf
-									  sprintf( typeLabels[ postType ], title )
-									: undefined
-							}
-						>
-							{ title }
+						{ icon && <BlockIcon icon={ icon } /> }
+						<Text size="body" as="h1">
+							<span className="editor-document-bar__post-title">
+								{ title
+									? decodeEntities( title )
+									: __( 'No title' ) }
+							</span>
+							{ postTypeLabel && ! props.title && (
+								<span className="editor-document-bar__post-type-label">
+									{ '· ' + decodeEntities( postTypeLabel ) }
+								</span>
+							) }
 						</Text>
-					</HStack>
+					</motion.div>
 					<span className="editor-document-bar__shortcut">
 						{ displayShortcut.primary( 'k' ) }
 					</span>
diff --git a/packages/editor/src/components/document-bar/style.scss b/packages/editor/src/components/document-bar/style.scss
index 0cd7e0689c7d31..6a7e7930f5bfb7 100644
--- a/packages/editor/src/components/document-bar/style.scss
+++ b/packages/editor/src/components/document-bar/style.scss
@@ -18,15 +18,20 @@
 
 	.components-button {
 		border-radius: $grid-unit-05;
+		transition: all 0.1s ease-out;
+		@include reduce-motion("transition");
 
 		&:hover {
-			color: var(--wp-block-synced-color);
 			background: $gray-200;
 		}
 	}
 
-	@include break-large() {
-		width: min(100%, 450px);
+	&.has-back-button {
+		@media screen and (min-width: #{ ($break-medium) }) and (max-width: #{ ($break-large) }) {
+			.editor-document-bar__post-type-label {
+				display: none;
+			}
+		}
 	}
 }
 
@@ -37,50 +42,46 @@
 }
 
 .editor-document-bar__title {
-	flex-grow: 1;
 	overflow: hidden;
-	color: $gray-800;
+	color: $gray-900;
+	margin: 0 auto;
+	max-width: 70%;
 
 	// Offset the layout based on the width of the ⌘K label. This ensures the title is centrally aligned.
-	@include break-small() {
-		padding-left: $grid-unit-40;
-	}
-
-	&:hover {
-		color: var(--wp-block-synced-color);
-	}
-
-	.editor-document-bar.is-global & {
-		color: var(--wp-block-synced-color);
-	}
-
-	.block-editor-block-icon {
-		min-width: $grid-unit-30;
-		flex-shrink: 0;
+	@include break-medium() {
+		padding-left: $grid-unit-30;
 	}
 
 	h1 {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-weight: 400;
 		white-space: nowrap;
 		overflow: hidden;
-		text-overflow: ellipsis;
-		max-width: 50%;
-		color: currentColor;
 	}
+}
 
-	.editor-document-bar.is-animated.has-back-button & {
-		animation: editor-document-bar__slide-in-left 0.3s;
-		@include reduce-motion("animation");
-	}
+.editor-document-bar__post-title {
+	color: currentColor;
+	flex: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.editor-document-bar__post-type-label {
+	flex: 0;
+	color: $gray-800;
+	padding-left: $grid-unit-05;
 
-	.editor-document-bar.is-animated & {
-		animation: editor-document-bar__slide-in-right 0.3s;
-		@include reduce-motion("animation");
+	@media screen and (max-width: #{ ($break-small) }) {
+		display: none;
 	}
 }
 
 .editor-document-bar__shortcut {
 	color: $gray-800;
-	min-width: $grid-unit-40;
+	min-width: $grid-unit-30;
 	display: none;
 
 	@include break-medium() {
@@ -97,34 +98,7 @@
 	position: absolute;
 
 	&:hover {
-		color: var(--wp-block-synced-color);
+		color: $gray-900;
 		background-color: transparent;
 	}
-
-	.editor-document-bar.is-animated & {
-		animation: editor-document-bar__slide-in-left 0.3s;
-		@include reduce-motion("animation");
-	}
-}
-
-@keyframes editor-document-bar__slide-in-right {
-	from {
-		transform: translateX(-15%);
-		opacity: 0;
-	}
-	to {
-		transform: translateX(0);
-		opacity: 1;
-	}
-}
-
-@keyframes editor-document-bar__slide-in-left {
-	from {
-		transform: translateX(15%);
-		opacity: 0;
-	}
-	to {
-		transform: translateX(0);
-		opacity: 1;
-	}
 }
diff --git a/packages/editor/src/components/document-outline/check.js b/packages/editor/src/components/document-outline/check.js
index 0ae0b3435e1e46..7e396f45c82f1a 100644
--- a/packages/editor/src/components/document-outline/check.js
+++ b/packages/editor/src/components/document-outline/check.js
@@ -1,21 +1,27 @@
 /**
  * WordPress dependencies
  */
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
-function DocumentOutlineCheck( { blocks, children } ) {
-	const headings = blocks.filter(
-		( block ) => block.name === 'core/heading'
-	);
+/**
+ * Component check if there are any headings (core/heading blocks) present in the document.
+ *
+ * @param {Object}  props          Props.
+ * @param {Element} props.children Children to be rendered.
+ *
+ * @return {Component|null} The component to be rendered or null if there are headings.
+ */
+export default function DocumentOutlineCheck( { children } ) {
+	const hasHeadings = useSelect( ( select ) => {
+		const { getGlobalBlockCount } = select( blockEditorStore );
 
-	if ( headings.length < 1 ) {
+		return getGlobalBlockCount( 'core/heading' ) > 0;
+	} );
+
+	if ( hasHeadings ) {
 		return null;
 	}
 
 	return children;
 }
-
-export default withSelect( ( select ) => ( {
-	blocks: select( blockEditorStore ).getBlocks(),
-} ) )( DocumentOutlineCheck );
diff --git a/packages/editor/src/components/document-outline/index.js b/packages/editor/src/components/document-outline/index.js
index cd7c828cb7d3b3..2ed53f771b67b7 100644
--- a/packages/editor/src/components/document-outline/index.js
+++ b/packages/editor/src/components/document-outline/index.js
@@ -2,11 +2,11 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { compose } from '@wordpress/compose';
-import { withSelect, useDispatch } from '@wordpress/data';
+import { useDispatch, useSelect } from '@wordpress/data';
 import { create, getTextContent } from '@wordpress/rich-text';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
+import { Path, SVG, Line, Rect } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -34,6 +34,43 @@ const multipleH1Headings = [
 		{ __( '(Multiple H1 headings are not recommended)' ) }
 	</em>,
 ];
+function EmptyOutlineIllustration() {
+	return (
+		<SVG
+			width="138"
+			height="148"
+			viewBox="0 0 138 148"
+			fill="none"
+			xmlns="http://www.w3.org/2000/svg"
+		>
+			<Rect width="138" height="148" rx="4" fill="#F0F6FC" />
+			<Line x1="44" y1="28" x2="24" y2="28" stroke="#DDDDDD" />
+			<Rect x="48" y="16" width="27" height="23" rx="4" fill="#DDDDDD" />
+			<Path
+				d="M54.7585 32V23.2727H56.6037V26.8736H60.3494V23.2727H62.1903V32H60.3494V28.3949H56.6037V32H54.7585ZM67.4574 23.2727V32H65.6122V25.0241H65.5611L63.5625 26.277V24.6406L65.723 23.2727H67.4574Z"
+				fill="black"
+			/>
+			<Line x1="55" y1="59" x2="24" y2="59" stroke="#DDDDDD" />
+			<Rect x="59" y="47" width="29" height="23" rx="4" fill="#DDDDDD" />
+			<Path
+				d="M65.7585 63V54.2727H67.6037V57.8736H71.3494V54.2727H73.1903V63H71.3494V59.3949H67.6037V63H65.7585ZM74.6605 63V61.6705L77.767 58.794C78.0313 58.5384 78.2528 58.3082 78.4318 58.1037C78.6136 57.8991 78.7514 57.6989 78.8452 57.5028C78.9389 57.304 78.9858 57.0895 78.9858 56.8594C78.9858 56.6037 78.9276 56.3835 78.8111 56.1989C78.6946 56.0114 78.5355 55.8679 78.3338 55.7685C78.1321 55.6662 77.9034 55.6151 77.6477 55.6151C77.3807 55.6151 77.1477 55.669 76.9489 55.777C76.75 55.8849 76.5966 56.0398 76.4886 56.2415C76.3807 56.4432 76.3267 56.6832 76.3267 56.9616H74.5753C74.5753 56.3906 74.7045 55.8949 74.9631 55.4744C75.2216 55.054 75.5838 54.7287 76.0497 54.4986C76.5156 54.2685 77.0526 54.1534 77.6605 54.1534C78.2855 54.1534 78.8295 54.2642 79.2926 54.4858C79.7585 54.7045 80.1207 55.0085 80.3793 55.3977C80.6378 55.7869 80.767 56.233 80.767 56.7358C80.767 57.0653 80.7017 57.3906 80.571 57.7116C80.4432 58.0327 80.2145 58.3892 79.8849 58.7812C79.5554 59.1705 79.0909 59.6378 78.4915 60.1832L77.2173 61.4318V61.4915H80.8821V63H74.6605Z"
+				fill="black"
+			/>
+			<Line x1="80" y1="90" x2="24" y2="90" stroke="#DDDDDD" />
+			<Rect x="84" y="78" width="30" height="23" rx="4" fill="#F0B849" />
+			<Path
+				d="M90.7585 94V85.2727H92.6037V88.8736H96.3494V85.2727H98.1903V94H96.3494V90.3949H92.6037V94H90.7585ZM99.5284 92.4659V91.0128L103.172 85.2727H104.425V87.2841H103.683L101.386 90.919V90.9872H106.564V92.4659H99.5284ZM103.717 94V92.0227L103.751 91.3793V85.2727H105.482V94H103.717Z"
+				fill="black"
+			/>
+			<Line x1="66" y1="121" x2="24" y2="121" stroke="#DDDDDD" />
+			<Rect x="70" y="109" width="29" height="23" rx="4" fill="#DDDDDD" />
+			<Path
+				d="M76.7585 125V116.273H78.6037V119.874H82.3494V116.273H84.1903V125H82.3494V121.395H78.6037V125H76.7585ZM88.8864 125.119C88.25 125.119 87.6832 125.01 87.1861 124.791C86.6918 124.57 86.3011 124.266 86.0142 123.879C85.7301 123.49 85.5838 123.041 85.5753 122.533H87.4332C87.4446 122.746 87.5142 122.933 87.642 123.095C87.7727 123.254 87.946 123.378 88.1619 123.466C88.3778 123.554 88.6207 123.598 88.8906 123.598C89.1719 123.598 89.4205 123.548 89.6364 123.449C89.8523 123.349 90.0213 123.212 90.1435 123.036C90.2656 122.859 90.3267 122.656 90.3267 122.426C90.3267 122.193 90.2614 121.987 90.1307 121.808C90.0028 121.626 89.8182 121.484 89.5767 121.382C89.3381 121.28 89.054 121.229 88.7244 121.229H87.9105V119.874H88.7244C89.0028 119.874 89.2486 119.825 89.4616 119.729C89.6776 119.632 89.8452 119.499 89.9645 119.328C90.0838 119.155 90.1435 118.953 90.1435 118.723C90.1435 118.504 90.0909 118.312 89.9858 118.148C89.8835 117.98 89.7386 117.849 89.5511 117.756C89.3665 117.662 89.1506 117.615 88.9034 117.615C88.6534 117.615 88.4247 117.661 88.2173 117.751C88.0099 117.839 87.8438 117.966 87.7188 118.131C87.5938 118.295 87.527 118.489 87.5185 118.71H85.75C85.7585 118.207 85.902 117.764 86.1804 117.381C86.4588 116.997 86.8338 116.697 87.3054 116.482C87.7798 116.263 88.3153 116.153 88.9119 116.153C89.5142 116.153 90.0412 116.263 90.4929 116.482C90.9446 116.7 91.2955 116.996 91.5455 117.368C91.7983 117.737 91.9233 118.152 91.9205 118.612C91.9233 119.101 91.7713 119.509 91.4645 119.835C91.1605 120.162 90.7642 120.369 90.2756 120.457V120.526C90.9176 120.608 91.4063 120.831 91.7415 121.195C92.0795 121.555 92.2472 122.007 92.2443 122.55C92.2472 123.047 92.1037 123.489 91.8139 123.875C91.527 124.261 91.1307 124.565 90.625 124.787C90.1193 125.009 89.5398 125.119 88.8864 125.119Z"
+				fill="black"
+			/>
+		</SVG>
+	);
+}
 
 /**
  * Returns an array of heading blocks enhanced with the following properties:
@@ -58,19 +95,50 @@ const computeOutlineHeadings = ( blocks = [] ) => {
 };
 
 const isEmptyHeading = ( heading ) =>
-	! heading.attributes.content || heading.attributes.content.length === 0;
+	! heading.attributes.content ||
+	heading.attributes.content.trim().length === 0;
 
-export const DocumentOutline = ( {
-	blocks = [],
-	title,
+/**
+ * Renders a document outline component.
+ *
+ * @param {Object}   props                         Props.
+ * @param {Function} props.onSelect                Function to be called when an outline item is selected.
+ * @param {boolean}  props.isTitleSupported        Indicates whether the title is supported.
+ * @param {boolean}  props.hasOutlineItemsDisabled Indicates whether the outline items are disabled.
+ *
+ * @return {Component} The component to be rendered.
+ */
+export default function DocumentOutline( {
 	onSelect,
 	isTitleSupported,
 	hasOutlineItemsDisabled,
-} ) => {
-	const headings = computeOutlineHeadings( blocks );
+} ) {
 	const { selectBlock } = useDispatch( blockEditorStore );
+	const { blocks, title } = useSelect( ( select ) => {
+		const { getBlocks } = select( blockEditorStore );
+		const { getEditedPostAttribute } = select( editorStore );
+		const { getPostType } = select( coreStore );
+		const postType = getPostType( getEditedPostAttribute( 'type' ) );
+
+		return {
+			title: getEditedPostAttribute( 'title' ),
+			blocks: getBlocks(),
+			isTitleSupported: postType?.supports?.title ?? false,
+		};
+	} );
+
+	const headings = computeOutlineHeadings( blocks );
 	if ( headings.length < 1 ) {
-		return null;
+		return (
+			<div className="editor-document-outline has-no-headings">
+				<EmptyOutlineIllustration />
+				<p>
+					{ __(
+						'Navigate the structure of your document and address issues like empty or incorrect heading levels.'
+					) }
+				</p>
+			</div>
+		);
 	}
 
 	let prevHeadingLevel = 1;
@@ -147,19 +215,4 @@ export const DocumentOutline = ( {
 			</ul>
 		</div>
 	);
-};
-
-export default compose(
-	withSelect( ( select ) => {
-		const { getBlocks } = select( blockEditorStore );
-		const { getEditedPostAttribute } = select( editorStore );
-		const { getPostType } = select( coreStore );
-		const postType = getPostType( getEditedPostAttribute( 'type' ) );
-
-		return {
-			title: getEditedPostAttribute( 'title' ),
-			blocks: getBlocks(),
-			isTitleSupported: postType?.supports?.title ?? false,
-		};
-	} )
-)( DocumentOutline );
+}
diff --git a/packages/editor/src/components/document-outline/item.js b/packages/editor/src/components/document-outline/item.js
index 57ad25bfe74392..d202a2f6212a70 100644
--- a/packages/editor/src/components/document-outline/item.js
+++ b/packages/editor/src/components/document-outline/item.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 const TableOfContentsItem = ( {
 	children,
@@ -11,7 +11,7 @@ const TableOfContentsItem = ( {
 	onSelect,
 } ) => (
 	<li
-		className={ classnames(
+		className={ clsx(
 			'document-outline__item',
 			`is-${ level.toLowerCase() }`,
 			{
diff --git a/packages/editor/src/components/document-outline/style.scss b/packages/editor/src/components/document-outline/style.scss
index 852b40b58eb8f8..49ce0c9b2d1325 100644
--- a/packages/editor/src/components/document-outline/style.scss
+++ b/packages/editor/src/components/document-outline/style.scss
@@ -51,7 +51,7 @@
 	padding: 2px 5px 2px 1px;
 	color: $gray-900;
 	text-align: left;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 
 	&:disabled {
 		cursor: default;
@@ -81,3 +81,15 @@
 .document-outline__item-content {
 	padding: 1px 0;
 }
+
+.editor-document-outline.has-no-headings {
+	& > svg {
+		margin-top: $grid-unit-30 + $grid-unit-05;
+	}
+	& > p {
+		padding-left: $grid-unit-40;
+		padding-right: $grid-unit-40;
+	}
+	text-align: center;
+	color: $gray-700;
+}
diff --git a/packages/editor/src/components/document-outline/test/__snapshots__/index.js.snap b/packages/editor/src/components/document-outline/test/__snapshots__/index.js.snap
deleted file mode 100644
index 27804e33f508b6..00000000000000
--- a/packages/editor/src/components/document-outline/test/__snapshots__/index.js.snap
+++ /dev/null
@@ -1,111 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DocumentOutline header blocks present should match snapshot 1`] = `
-<ul>
-  <li
-    class="document-outline__item is-h2"
-  >
-    <a
-      class="document-outline__button"
-      href="#block-clientId_0"
-    >
-      <span
-        aria-hidden="true"
-        class="document-outline__emdash"
-      />
-      <strong
-        class="document-outline__level"
-      >
-        H2
-      </strong>
-      <span
-        class="document-outline__item-content"
-      >
-        Heading 2
-      </span>
-    </a>
-  </li>
-  <li
-    class="document-outline__item is-h3"
-  >
-    <a
-      class="document-outline__button"
-      href="#block-clientId_1"
-    >
-      <span
-        aria-hidden="true"
-        class="document-outline__emdash"
-      />
-      <strong
-        class="document-outline__level"
-      >
-        H3
-      </strong>
-      <span
-        class="document-outline__item-content"
-      >
-        Heading 3
-      </span>
-    </a>
-  </li>
-</ul>
-`;
-
-exports[`DocumentOutline header blocks present should render warnings for multiple h1 headings 1`] = `
-<ul>
-  <li
-    class="document-outline__item is-h1 is-invalid"
-  >
-    <a
-      class="document-outline__button"
-      href="#block-clientId_0"
-    >
-      <span
-        aria-hidden="true"
-        class="document-outline__emdash"
-      />
-      <strong
-        class="document-outline__level"
-      >
-        H1
-      </strong>
-      <span
-        class="document-outline__item-content"
-      >
-        Heading 1
-        <br />
-        <em>
-          (Multiple H1 headings are not recommended)
-        </em>
-      </span>
-    </a>
-  </li>
-  <li
-    class="document-outline__item is-h1 is-invalid"
-  >
-    <a
-      class="document-outline__button"
-      href="#block-clientId_2"
-    >
-      <span
-        aria-hidden="true"
-        class="document-outline__emdash"
-      />
-      <strong
-        class="document-outline__level"
-      >
-        H1
-      </strong>
-      <span
-        class="document-outline__item-content"
-      >
-        Heading 1
-        <br />
-        <em>
-          (Multiple H1 headings are not recommended)
-        </em>
-      </span>
-    </a>
-  </li>
-</ul>
-`;
diff --git a/packages/editor/src/components/document-outline/test/index.js b/packages/editor/src/components/document-outline/test/index.js
deleted file mode 100644
index 21c258c9a65df7..00000000000000
--- a/packages/editor/src/components/document-outline/test/index.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen, within } from '@testing-library/react';
-
-/**
- * WordPress dependencies
- */
-import {
-	createBlock,
-	registerBlockType,
-	unregisterBlockType,
-} from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { DocumentOutline } from '../';
-
-jest.mock( '@wordpress/block-editor', () => ( {
-	BlockTitle: () => 'Block Title',
-} ) );
-
-describe( 'DocumentOutline', () => {
-	let paragraph, headingH1, headingH2, headingH3, nestedHeading;
-	beforeAll( () => {
-		registerBlockType( 'core/heading', {
-			category: 'text',
-			title: 'Heading',
-			edit: () => {},
-			save: () => {},
-			attributes: {
-				level: {
-					type: 'number',
-					default: 2,
-				},
-				content: {
-					type: 'string',
-				},
-			},
-		} );
-
-		registerBlockType( 'core/paragraph', {
-			category: 'text',
-			title: 'Paragraph',
-			edit: () => {},
-			save: () => {},
-		} );
-
-		registerBlockType( 'core/columns', {
-			category: 'text',
-			title: 'Paragraph',
-			edit: () => {},
-			save: () => {},
-		} );
-
-		paragraph = createBlock( 'core/paragraph' );
-		headingH1 = createBlock( 'core/heading', {
-			content: 'Heading 1',
-			level: 1,
-		} );
-		headingH2 = createBlock( 'core/heading', {
-			content: 'Heading 2',
-			level: 2,
-		} );
-		headingH3 = createBlock( 'core/heading', {
-			content: 'Heading 3',
-			level: 3,
-		} );
-		nestedHeading = createBlock( 'core/columns', undefined, [ headingH3 ] );
-	} );
-
-	afterAll( () => {
-		unregisterBlockType( 'core/heading' );
-		unregisterBlockType( 'core/paragraph' );
-	} );
-
-	describe( 'no header blocks present', () => {
-		it( 'should not render when no blocks provided', () => {
-			render( <DocumentOutline /> );
-
-			expect( screen.queryByRole( 'list' ) ).not.toBeInTheDocument();
-		} );
-
-		it( 'should not render when no heading blocks provided', () => {
-			const blocks = [ paragraph ].map( ( block, index ) => {
-				// Set client IDs to a predictable value.
-				return { ...block, clientId: `clientId_${ index }` };
-			} );
-			render( <DocumentOutline blocks={ blocks } /> );
-
-			expect( screen.queryByRole( 'list' ) ).not.toBeInTheDocument();
-		} );
-	} );
-
-	describe( 'header blocks present', () => {
-		it( 'should match snapshot', () => {
-			const blocks = [ headingH2, headingH3 ].map( ( block, index ) => {
-				// Set client IDs to a predictable value.
-				return { ...block, clientId: `clientId_${ index }` };
-			} );
-			render( <DocumentOutline blocks={ blocks } /> );
-
-			expect( screen.getByRole( 'list' ) ).toMatchSnapshot();
-		} );
-
-		it( 'should render an item when only one heading provided', () => {
-			const blocks = [ headingH2 ];
-			render( <DocumentOutline blocks={ blocks } /> );
-
-			const tableOfContentItem = within(
-				screen.getByRole( 'list' )
-			).getByRole( 'listitem' );
-			expect( tableOfContentItem ).toBeInTheDocument();
-			expect( tableOfContentItem ).toHaveTextContent( 'Heading 2' );
-		} );
-
-		it( 'should render two items when two headings and some paragraphs provided', () => {
-			const blocks = [
-				paragraph,
-				headingH2,
-				paragraph,
-				headingH3,
-				paragraph,
-			];
-			render( <DocumentOutline blocks={ blocks } /> );
-
-			expect(
-				within( screen.getByRole( 'list' ) ).getAllByRole( 'listitem' )
-			).toHaveLength( 2 );
-		} );
-
-		it( 'should render warnings for multiple h1 headings', () => {
-			const blocks = [ headingH1, paragraph, headingH1, paragraph ].map(
-				( block, index ) => {
-					// Set client IDs to a predictable value.
-					return { ...block, clientId: `clientId_${ index }` };
-				}
-			);
-			render( <DocumentOutline blocks={ blocks } /> );
-
-			expect( screen.getByRole( 'list' ) ).toMatchSnapshot();
-		} );
-	} );
-
-	describe( 'nested headings', () => {
-		it( 'should render even if the heading is nested', () => {
-			const blocks = [ headingH2, nestedHeading ];
-			render( <DocumentOutline blocks={ blocks } /> );
-
-			// Unnested heading and nested heading should appear as items.
-			const tableOfContentItems = within(
-				screen.getByRole( 'list' )
-			).getAllByRole( 'listitem' );
-			expect( tableOfContentItems ).toHaveLength( 2 );
-
-			// Unnested heading test.
-			expect( tableOfContentItems[ 0 ] ).toHaveTextContent( 'H2' );
-			expect( tableOfContentItems[ 0 ] ).toHaveTextContent( 'Heading 2' );
-
-			// Nested heading test.
-			expect( tableOfContentItems[ 1 ] ).toHaveTextContent( 'H3' );
-			expect( tableOfContentItems[ 1 ] ).toHaveTextContent( 'Heading 3' );
-		} );
-	} );
-} );
diff --git a/packages/editor/src/components/document-tools/index.js b/packages/editor/src/components/document-tools/index.js
new file mode 100644
index 00000000000000..b2295b555ce080
--- /dev/null
+++ b/packages/editor/src/components/document-tools/index.js
@@ -0,0 +1,181 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useViewportMatch } from '@wordpress/compose';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { __, _x } from '@wordpress/i18n';
+import { NavigableToolbar, ToolSelector } from '@wordpress/block-editor';
+import { Button, ToolbarItem } from '@wordpress/components';
+import { listView, plus } from '@wordpress/icons';
+import { useCallback } from '@wordpress/element';
+import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
+import { store as preferencesStore } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+import EditorHistoryRedo from '../editor-history/redo';
+import EditorHistoryUndo from '../editor-history/undo';
+
+function DocumentTools( { className, disableBlockTools = false } ) {
+	const { setIsInserterOpened, setIsListViewOpened } =
+		useDispatch( editorStore );
+	const {
+		isDistractionFree,
+		isInserterOpened,
+		isListViewOpen,
+		listViewShortcut,
+		inserterSidebarToggleRef,
+		listViewToggleRef,
+		showIconLabels,
+	} = useSelect( ( select ) => {
+		const { get } = select( preferencesStore );
+		const {
+			isListViewOpened,
+			getEditorMode,
+			getInserterSidebarToggleRef,
+			getListViewToggleRef,
+		} = unlock( select( editorStore ) );
+		const { getShortcutRepresentation } = select( keyboardShortcutsStore );
+
+		return {
+			isInserterOpened: select( editorStore ).isInserterOpened(),
+			isListViewOpen: isListViewOpened(),
+			listViewShortcut: getShortcutRepresentation(
+				'core/editor/toggle-list-view'
+			),
+			inserterSidebarToggleRef: getInserterSidebarToggleRef(),
+			listViewToggleRef: getListViewToggleRef(),
+			showIconLabels: get( 'core', 'showIconLabels' ),
+			isDistractionFree: get( 'core', 'distractionFree' ),
+			isVisualMode: getEditorMode() === 'visual',
+		};
+	}, [] );
+
+	const preventDefault = ( event ) => {
+		// Because the inserter behaves like a dialog,
+		// if the inserter is opened already then when we click on the toggle button
+		// then the initial click event will close the inserter and then be propagated
+		// to the inserter toggle and it will open it again.
+		// To prevent this we need to stop the propagation of the event.
+		// This won't be necessary when the inserter no longer behaves like a dialog.
+
+		if ( isInserterOpened ) {
+			event.preventDefault();
+		}
+	};
+
+	const isLargeViewport = useViewportMatch( 'medium' );
+	const isWideViewport = useViewportMatch( 'wide' );
+
+	/* translators: accessibility text for the editor toolbar */
+	const toolbarAriaLabel = __( 'Document tools' );
+
+	const toggleListView = useCallback(
+		() => setIsListViewOpened( ! isListViewOpen ),
+		[ setIsListViewOpened, isListViewOpen ]
+	);
+
+	const toggleInserter = useCallback(
+		() => setIsInserterOpened( ! isInserterOpened ),
+		[ isInserterOpened, setIsInserterOpened ]
+	);
+
+	/* translators: button label text should, if possible, be under 16 characters. */
+	const longLabel = _x(
+		'Block Inserter',
+		'Generic label for block inserter button'
+	);
+	const shortLabel = ! isInserterOpened ? __( 'Add' ) : __( 'Close' );
+
+	return (
+		// Some plugins expect and use the `edit-post-header-toolbar` CSS class to
+		// find the toolbar and inject UI elements into it. This is not officially
+		// supported, but we're keeping it in the list of class names for backwards
+		// compatibility.
+		<NavigableToolbar
+			className={ clsx(
+				'editor-document-tools',
+				'edit-post-header-toolbar',
+				className
+			) }
+			aria-label={ toolbarAriaLabel }
+			variant="unstyled"
+		>
+			<div className="editor-document-tools__left">
+				{ ! isDistractionFree && (
+					<ToolbarItem
+						ref={ inserterSidebarToggleRef }
+						as={ Button }
+						className="editor-document-tools__inserter-toggle"
+						variant="primary"
+						isPressed={ isInserterOpened }
+						onMouseDown={ preventDefault }
+						onClick={ toggleInserter }
+						disabled={ disableBlockTools }
+						icon={ plus }
+						label={ showIconLabels ? shortLabel : longLabel }
+						showTooltip={ ! showIconLabels }
+						aria-expanded={ isInserterOpened }
+					/>
+				) }
+				{ ( isWideViewport || ! showIconLabels ) && (
+					<>
+						{ isLargeViewport && (
+							<ToolbarItem
+								as={ ToolSelector }
+								showTooltip={ ! showIconLabels }
+								variant={
+									showIconLabels ? 'tertiary' : undefined
+								}
+								disabled={ disableBlockTools }
+								size="compact"
+							/>
+						) }
+						<ToolbarItem
+							as={ EditorHistoryUndo }
+							showTooltip={ ! showIconLabels }
+							variant={ showIconLabels ? 'tertiary' : undefined }
+							size="compact"
+						/>
+						<ToolbarItem
+							as={ EditorHistoryRedo }
+							showTooltip={ ! showIconLabels }
+							variant={ showIconLabels ? 'tertiary' : undefined }
+							size="compact"
+						/>
+						{ ! isDistractionFree && (
+							<ToolbarItem
+								as={ Button }
+								className="editor-document-tools__document-overview-toggle"
+								icon={ listView }
+								disabled={ disableBlockTools }
+								isPressed={ isListViewOpen }
+								/* translators: button label text should, if possible, be under 16 characters. */
+								label={ __( 'Document Overview' ) }
+								onClick={ toggleListView }
+								shortcut={ listViewShortcut }
+								showTooltip={ ! showIconLabels }
+								variant={
+									showIconLabels ? 'tertiary' : undefined
+								}
+								aria-expanded={ isListViewOpen }
+								ref={ listViewToggleRef }
+								size="compact"
+							/>
+						) }
+					</>
+				) }
+			</div>
+		</NavigableToolbar>
+	);
+}
+
+export default DocumentTools;
diff --git a/packages/editor/src/components/document-tools/style.scss b/packages/editor/src/components/document-tools/style.scss
new file mode 100644
index 00000000000000..a1abfd5abd7aef
--- /dev/null
+++ b/packages/editor/src/components/document-tools/style.scss
@@ -0,0 +1,91 @@
+.editor-document-tools {
+	display: inline-flex;
+	align-items: center;
+
+	// Hide all action buttons except the inserter on mobile.
+	.editor-document-tools__left > .editor-history__redo,
+	.editor-document-tools__left > .editor-history__undo {
+		display: none;
+
+		@include break-medium() {
+			display: inline-flex;
+		}
+	}
+
+	.editor-document-tools__left > .editor-document-tools__inserter-toggle {
+		display: inline-flex;
+
+		svg {
+			transition: transform cubic-bezier(0.165, 0.84, 0.44, 1) 0.2s;
+			@include reduce-motion("transition");
+		}
+
+		&.is-pressed {
+			svg {
+				transform: rotate(45deg);
+			}
+		}
+	}
+
+	// Hide table of contents and list view on mobile.
+	.block-editor-list-view {
+		display: none;
+
+		@include break-small() {
+			display: flex;
+		}
+	}
+
+	// The Toolbar component adds different styles to buttons, so we reset them
+	// here to the original button styles
+	.editor-document-tools__left > .components-button.has-icon,
+	.editor-document-tools__left > .components-dropdown > .components-button.has-icon {
+		// @todo override toolbar group inherited paddings from components/block-tools/style.scss.
+		// This is best fixed by making the mover control area a proper single toolbar group.
+		// It needs specificity due to style inherited from .components-accessible-toolbar .components-button.has-icon.has-icon.
+		height: $button-size-compact;
+		min-width: $button-size-compact;
+		padding: 4px;
+
+		&.is-pressed {
+			background: $gray-900;
+		}
+
+		&:focus:not(:disabled) {
+			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 0 0 $border-width $white;
+			outline: $border-width solid transparent;
+		}
+
+		&::before {
+			display: none;
+		}
+	}
+}
+
+.editor-document-tools__left {
+	display: inline-flex;
+	align-items: center;
+	gap: $grid-unit-10;
+
+	// Some plugins add buttons here despite best practices — accommodate them with a gap.
+	&:not(:last-child) {
+		margin-inline-end: $grid-unit-10;
+	}
+}
+
+.editor-document-tools .editor-document-tools__left > .editor-document-tools__inserter-toggle.has-icon {
+	min-width: $button-size-compact;
+	width: $button-size-compact;
+	height: $button-size-compact;
+	padding: 0;
+
+	.show-icon-labels & {
+		width: auto;
+		height: $button-size-compact;
+		padding: 0 $grid-unit-10;
+	}
+}
+
+.show-icon-labels .editor-document-tools__left > * + * {
+	margin-left: $grid-unit-10;
+}
diff --git a/packages/editor/src/components/editor-canvas/index.js b/packages/editor/src/components/editor-canvas/index.js
deleted file mode 100644
index 906eb6b272fc78..00000000000000
--- a/packages/editor/src/components/editor-canvas/index.js
+++ /dev/null
@@ -1,334 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	BlockList,
-	store as blockEditorStore,
-	__unstableUseTypingObserver as useTypingObserver,
-	useSettings,
-	__experimentalRecursionProvider as RecursionProvider,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import { useEffect, useRef, useMemo } from '@wordpress/element';
-import { useSelect } from '@wordpress/data';
-import { parse } from '@wordpress/blocks';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import PostTitle from '../post-title';
-import { store as editorStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-
-const { LayoutStyle, useLayoutClasses, useLayoutStyles } = unlock(
-	blockEditorPrivateApis
-);
-
-/**
- * Given an array of nested blocks, find the first Post Content
- * block inside it, recursing through any nesting levels,
- * and return its attributes.
- *
- * @param {Array} blocks A list of blocks.
- *
- * @return {Object | undefined} The Post Content block.
- */
-function getPostContentAttributes( blocks ) {
-	for ( let i = 0; i < blocks.length; i++ ) {
-		if ( blocks[ i ].name === 'core/post-content' ) {
-			return blocks[ i ].attributes;
-		}
-		if ( blocks[ i ].innerBlocks.length ) {
-			const nestedPostContent = getPostContentAttributes(
-				blocks[ i ].innerBlocks
-			);
-
-			if ( nestedPostContent ) {
-				return nestedPostContent;
-			}
-		}
-	}
-}
-
-function checkForPostContentAtRootLevel( blocks ) {
-	for ( let i = 0; i < blocks.length; i++ ) {
-		if ( blocks[ i ].name === 'core/post-content' ) {
-			return true;
-		}
-	}
-	return false;
-}
-
-export default function EditorCanvas( {
-	// Ideally as we unify post and site editors, we won't need these props.
-	autoFocus,
-	dropZoneElement,
-	className,
-	renderAppender,
-} ) {
-	const {
-		renderingMode,
-		postContentAttributes,
-		editedPostTemplate = {},
-		wrapperBlockName,
-		wrapperUniqueId,
-	} = useSelect( ( select ) => {
-		const {
-			getCurrentPostId,
-			getCurrentPostType,
-			getCurrentTemplateId,
-			getEditorSettings,
-			getRenderingMode,
-		} = select( editorStore );
-		const postTypeSlug = getCurrentPostType();
-		const _renderingMode = getRenderingMode();
-		let _wrapperBlockName;
-
-		if ( postTypeSlug === 'wp_block' ) {
-			_wrapperBlockName = 'core/block';
-		} else if ( ! _renderingMode === 'post-only' ) {
-			_wrapperBlockName = 'core/post-content';
-		}
-
-		const editorSettings = getEditorSettings();
-		const supportsTemplateMode = editorSettings.supportsTemplateMode;
-		const postType = select( coreStore ).getPostType( postTypeSlug );
-		const canEditTemplate = select( coreStore ).canUser(
-			'create',
-			'templates'
-		);
-		const currentTemplateId = getCurrentTemplateId();
-		const template = currentTemplateId
-			? select( coreStore ).getEditedEntityRecord(
-					'postType',
-					'wp_template',
-					currentTemplateId
-			  )
-			: undefined;
-
-		return {
-			renderingMode: _renderingMode,
-			postContentAttributes: getEditorSettings().postContentAttributes,
-			// Post template fetch returns a 404 on classic themes, which
-			// messes with e2e tests, so check it's a block theme first.
-			editedPostTemplate:
-				postType?.viewable && supportsTemplateMode && canEditTemplate
-					? template
-					: undefined,
-			wrapperBlockName: _wrapperBlockName,
-			wrapperUniqueId: getCurrentPostId(),
-		};
-	}, [] );
-	const { isCleanNewPost } = useSelect( editorStore );
-	const {
-		hasRootPaddingAwareAlignments,
-		themeHasDisabledLayoutStyles,
-		themeSupportsLayout,
-	} = useSelect( ( select ) => {
-		const _settings = select( blockEditorStore ).getSettings();
-		return {
-			themeHasDisabledLayoutStyles: _settings.disableLayoutStyles,
-			themeSupportsLayout: _settings.supportsLayout,
-			hasRootPaddingAwareAlignments:
-				_settings.__experimentalFeatures?.useRootPaddingAwareAlignments,
-		};
-	}, [] );
-
-	const [ globalLayoutSettings ] = useSettings( 'layout' );
-
-	// fallbackLayout is used if there is no Post Content,
-	// and for Post Title.
-	const fallbackLayout = useMemo( () => {
-		if ( renderingMode !== 'post-only' ) {
-			return { type: 'default' };
-		}
-
-		if ( themeSupportsLayout ) {
-			// We need to ensure support for wide and full alignments,
-			// so we add the constrained type.
-			return { ...globalLayoutSettings, type: 'constrained' };
-		}
-		// Set default layout for classic themes so all alignments are supported.
-		return { type: 'default' };
-	}, [ renderingMode, themeSupportsLayout, globalLayoutSettings ] );
-
-	const newestPostContentAttributes = useMemo( () => {
-		if (
-			! editedPostTemplate?.content &&
-			! editedPostTemplate?.blocks &&
-			postContentAttributes
-		) {
-			return postContentAttributes;
-		}
-		// When in template editing mode, we can access the blocks directly.
-		if ( editedPostTemplate?.blocks ) {
-			return getPostContentAttributes( editedPostTemplate?.blocks );
-		}
-		// If there are no blocks, we have to parse the content string.
-		// Best double-check it's a string otherwise the parse function gets unhappy.
-		const parseableContent =
-			typeof editedPostTemplate?.content === 'string'
-				? editedPostTemplate?.content
-				: '';
-
-		return getPostContentAttributes( parse( parseableContent ) ) || {};
-	}, [
-		editedPostTemplate?.content,
-		editedPostTemplate?.blocks,
-		postContentAttributes,
-	] );
-
-	const hasPostContentAtRootLevel = useMemo( () => {
-		if ( ! editedPostTemplate?.content && ! editedPostTemplate?.blocks ) {
-			return false;
-		}
-		// When in template editing mode, we can access the blocks directly.
-		if ( editedPostTemplate?.blocks ) {
-			return checkForPostContentAtRootLevel( editedPostTemplate?.blocks );
-		}
-		// If there are no blocks, we have to parse the content string.
-		// Best double-check it's a string otherwise the parse function gets unhappy.
-		const parseableContent =
-			typeof editedPostTemplate?.content === 'string'
-				? editedPostTemplate?.content
-				: '';
-
-		return (
-			checkForPostContentAtRootLevel( parse( parseableContent ) ) || false
-		);
-	}, [ editedPostTemplate?.content, editedPostTemplate?.blocks ] );
-
-	const { layout = {}, align = '' } = newestPostContentAttributes || {};
-
-	const postContentLayoutClasses = useLayoutClasses(
-		newestPostContentAttributes,
-		'core/post-content'
-	);
-
-	const blockListLayoutClass = classnames(
-		{
-			'is-layout-flow': ! themeSupportsLayout,
-		},
-		themeSupportsLayout && postContentLayoutClasses,
-		align && `align${ align }`
-	);
-
-	const postContentLayoutStyles = useLayoutStyles(
-		newestPostContentAttributes,
-		'core/post-content',
-		'.block-editor-block-list__layout.is-root-container'
-	);
-
-	// Update type for blocks using legacy layouts.
-	const postContentLayout = useMemo( () => {
-		return layout &&
-			( layout?.type === 'constrained' ||
-				layout?.inherit ||
-				layout?.contentSize ||
-				layout?.wideSize )
-			? { ...globalLayoutSettings, ...layout, type: 'constrained' }
-			: { ...globalLayoutSettings, ...layout, type: 'default' };
-	}, [
-		layout?.type,
-		layout?.inherit,
-		layout?.contentSize,
-		layout?.wideSize,
-		globalLayoutSettings,
-	] );
-
-	// If there is a Post Content block we use its layout for the block list;
-	// if not, this must be a classic theme, in which case we use the fallback layout.
-	const blockListLayout = postContentAttributes
-		? postContentLayout
-		: fallbackLayout;
-
-	const postEditorLayout =
-		blockListLayout?.type === 'default' && ! hasPostContentAtRootLevel
-			? fallbackLayout
-			: blockListLayout;
-
-	const observeTypingRef = useTypingObserver();
-	const titleRef = useRef();
-	useEffect( () => {
-		if ( ! autoFocus || ! isCleanNewPost() ) {
-			return;
-		}
-		titleRef?.current?.focus();
-	}, [ autoFocus, isCleanNewPost ] );
-
-	// Add some styles for alignwide/alignfull Post Content and its children.
-	const alignCSS = `.is-root-container.alignwide { max-width: var(--wp--style--global--wide-size); margin-left: auto; margin-right: auto;}
-		.is-root-container.alignwide:where(.is-layout-flow) > :not(.alignleft):not(.alignright) { max-width: var(--wp--style--global--wide-size);}
-		.is-root-container.alignfull { max-width: none; margin-left: auto; margin-right: auto;}
-		.is-root-container.alignfull:where(.is-layout-flow) > :not(.alignleft):not(.alignright) { max-width: none;}`;
-
-	return (
-		<>
-			{ themeSupportsLayout &&
-				! themeHasDisabledLayoutStyles &&
-				renderingMode === 'post-only' && (
-					<>
-						<LayoutStyle
-							selector=".editor-editor-canvas__post-title-wrapper"
-							layout={ fallbackLayout }
-						/>
-						<LayoutStyle
-							selector=".block-editor-block-list__layout.is-root-container"
-							layout={ postEditorLayout }
-						/>
-						{ align && <LayoutStyle css={ alignCSS } /> }
-						{ postContentLayoutStyles && (
-							<LayoutStyle
-								layout={ postContentLayout }
-								css={ postContentLayoutStyles }
-							/>
-						) }
-					</>
-				) }
-			{ renderingMode === 'post-only' && (
-				<div
-					className={ classnames(
-						'editor-editor-canvas__post-title-wrapper',
-						// The following class is only here for backward comapatibility
-						// some themes might be using it to style the post title.
-						'edit-post-visual-editor__post-title-wrapper',
-						{
-							'has-global-padding': hasRootPaddingAwareAlignments,
-						}
-					) }
-					contentEditable={ false }
-					ref={ observeTypingRef }
-					style={ {
-						// This is using inline styles
-						// so it's applied for both iframed and non iframed editors.
-						marginTop: '4rem',
-					} }
-				>
-					<PostTitle ref={ titleRef } />
-				</div>
-			) }
-			<RecursionProvider
-				blockName={ wrapperBlockName }
-				uniqueId={ wrapperUniqueId }
-			>
-				<BlockList
-					className={ classnames(
-						className,
-						renderingMode !== 'post-only'
-							? 'wp-site-blocks'
-							: `${ blockListLayoutClass } wp-block-post-content` // Ensure root level blocks receive default/flow blockGap styling rules.
-					) }
-					layout={ blockListLayout }
-					dropZoneElement={ dropZoneElement }
-					renderAppender={ renderAppender }
-				/>
-			</RecursionProvider>
-		</>
-	);
-}
diff --git a/packages/editor/src/components/editor-help/help-get-support-button.native.js b/packages/editor/src/components/editor-help/help-get-support-button.native.js
index 35802379fe9e47..5d6ad0a9dc4d33 100644
--- a/packages/editor/src/components/editor-help/help-get-support-button.native.js
+++ b/packages/editor/src/components/editor-help/help-get-support-button.native.js
@@ -28,7 +28,7 @@ const HelpGetSupportButton = ( { onPress, title } ) => {
 		<Pressable
 			style={ buttonStyle }
 			onPress={ onPress }
-			accessibilityRole={ 'button' }
+			accessibilityRole="button"
 		>
 			<Text style={ textStyle }>{ title }</Text>
 		</Pressable>
diff --git a/packages/editor/src/components/editor-help/intro-to-blocks.native.js b/packages/editor/src/components/editor-help/intro-to-blocks.native.js
index 79e5711b72d05c..3dc23ec2619172 100644
--- a/packages/editor/src/components/editor-help/intro-to-blocks.native.js
+++ b/packages/editor/src/components/editor-help/intro-to-blocks.native.js
@@ -51,7 +51,7 @@ const IntroToBlocks = () => {
 					) }
 				/>
 				<HelpDetailImage
-					accessible={ true }
+					accessible
 					accessibilityLabel={ __(
 						'Text formatting controls are located within the toolbar positioned above the keyboard while editing a text block'
 					) }
diff --git a/packages/editor/src/components/editor-history/redo.js b/packages/editor/src/components/editor-history/redo.js
index 1383360a94bf1e..46a263bb89926b 100644
--- a/packages/editor/src/components/editor-history/redo.js
+++ b/packages/editor/src/components/editor-history/redo.js
@@ -25,6 +25,7 @@ function EditorHistoryRedo( props, ref ) {
 	const { redo } = useDispatch( editorStore );
 	return (
 		<Button
+			__next40pxDefaultSize
 			{ ...props }
 			ref={ ref }
 			icon={ ! isRTL() ? redoIcon : undoIcon }
@@ -41,4 +42,14 @@ function EditorHistoryRedo( props, ref ) {
 	);
 }
 
+/** @typedef {import('react').Ref<HTMLElement>} Ref */
+
+/**
+ * Renders the redo button for the editor history.
+ *
+ * @param {Object} props - Props.
+ * @param {Ref}    ref   - Forwarded ref.
+ *
+ * @return {Component} The component to be rendered.
+ */
 export default forwardRef( EditorHistoryRedo );
diff --git a/packages/editor/src/components/editor-history/undo.js b/packages/editor/src/components/editor-history/undo.js
index b13eb3162b9623..6ba6055706e993 100644
--- a/packages/editor/src/components/editor-history/undo.js
+++ b/packages/editor/src/components/editor-history/undo.js
@@ -21,6 +21,7 @@ function EditorHistoryUndo( props, ref ) {
 	const { undo } = useDispatch( editorStore );
 	return (
 		<Button
+			__next40pxDefaultSize
 			{ ...props }
 			ref={ ref }
 			icon={ ! isRTL() ? undoIcon : redoIcon }
@@ -37,4 +38,14 @@ function EditorHistoryUndo( props, ref ) {
 	);
 }
 
+/** @typedef {import('react').Ref<HTMLElement>} Ref */
+
+/**
+ * Renders the undo button for the editor history.
+ *
+ * @param {Object} props - Props.
+ * @param {Ref}    ref   - Forwarded ref.
+ *
+ * @return {Component} The component to be rendered.
+ */
 export default forwardRef( EditorHistoryUndo );
diff --git a/packages/editor/src/components/editor-interface/content-slot-fill.js b/packages/editor/src/components/editor-interface/content-slot-fill.js
new file mode 100644
index 00000000000000..1aab394e87230f
--- /dev/null
+++ b/packages/editor/src/components/editor-interface/content-slot-fill.js
@@ -0,0 +1,15 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { createPrivateSlotFill } = unlock( componentsPrivateApis );
+const SLOT_FILL_NAME = 'EditCanvasContainerSlot';
+const EditorContentSlotFill = createPrivateSlotFill( SLOT_FILL_NAME );
+
+export default EditorContentSlotFill;
diff --git a/packages/editor/src/components/editor-interface/index.js b/packages/editor/src/components/editor-interface/index.js
new file mode 100644
index 00000000000000..4c3fcc30e23d82
--- /dev/null
+++ b/packages/editor/src/components/editor-interface/index.js
@@ -0,0 +1,225 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { InterfaceSkeleton, ComplementaryArea } from '@wordpress/interface';
+import { useSelect } from '@wordpress/data';
+import { __, _x } from '@wordpress/i18n';
+import { store as preferencesStore } from '@wordpress/preferences';
+import {
+	store as blockEditorStore,
+	BlockBreadcrumb,
+	BlockToolbar,
+} from '@wordpress/block-editor';
+import { useViewportMatch } from '@wordpress/compose';
+import { useState, useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import EditorNotices from '../editor-notices';
+import Header from '../header';
+import InserterSidebar from '../inserter-sidebar';
+import ListViewSidebar from '../list-view-sidebar';
+import SavePublishPanels from '../save-publish-panels';
+import TextEditor from '../text-editor';
+import VisualEditor from '../visual-editor';
+import EditorContentSlotFill from './content-slot-fill';
+
+import { unlock } from '../../lock-unlock';
+
+const interfaceLabels = {
+	/* translators: accessibility text for the editor top bar landmark region. */
+	header: __( 'Editor top bar' ),
+	/* translators: accessibility text for the editor content landmark region. */
+	body: __( 'Editor content' ),
+	/* translators: accessibility text for the editor settings landmark region. */
+	sidebar: __( 'Editor settings' ),
+	/* translators: accessibility text for the editor publish landmark region. */
+	actions: __( 'Editor publish' ),
+	/* translators: accessibility text for the editor footer landmark region. */
+	footer: __( 'Editor footer' ),
+};
+
+export default function EditorInterface( {
+	className,
+	styles,
+	children,
+	forceIsDirty,
+	contentRef,
+	disableIframe,
+	autoFocus,
+	customSaveButton,
+	customSavePanel,
+	forceDisableBlockTools,
+	title,
+	iframeProps,
+} ) {
+	const {
+		mode,
+		isRichEditingEnabled,
+		isInserterOpened,
+		isListViewOpened,
+		isDistractionFree,
+		isPreviewMode,
+		showBlockBreadcrumbs,
+		documentLabel,
+		isZoomOut,
+	} = useSelect( ( select ) => {
+		const { get } = select( preferencesStore );
+		const { getEditorSettings, getPostTypeLabel } = select( editorStore );
+		const editorSettings = getEditorSettings();
+		const postTypeLabel = getPostTypeLabel();
+		const { isZoomOut: _isZoomOut } = unlock( select( blockEditorStore ) );
+
+		return {
+			mode: select( editorStore ).getEditorMode(),
+			isRichEditingEnabled: editorSettings.richEditingEnabled,
+			isInserterOpened: select( editorStore ).isInserterOpened(),
+			isListViewOpened: select( editorStore ).isListViewOpened(),
+			isDistractionFree: get( 'core', 'distractionFree' ),
+			isPreviewMode: editorSettings.isPreviewMode,
+			showBlockBreadcrumbs: get( 'core', 'showBlockBreadcrumbs' ),
+			// translators: Default label for the Document in the Block Breadcrumb.
+			documentLabel: postTypeLabel || _x( 'Document', 'noun' ),
+			isZoomOut: _isZoomOut(),
+		};
+	}, [] );
+	const isLargeViewport = useViewportMatch( 'medium' );
+	const secondarySidebarLabel = isListViewOpened
+		? __( 'Document Overview' )
+		: __( 'Block Library' );
+
+	// Local state for save panel.
+	// Note 'truthy' callback implies an open panel.
+	const [ entitiesSavedStatesCallback, setEntitiesSavedStatesCallback ] =
+		useState( false );
+	const closeEntitiesSavedStates = useCallback(
+		( arg ) => {
+			if ( typeof entitiesSavedStatesCallback === 'function' ) {
+				entitiesSavedStatesCallback( arg );
+			}
+			setEntitiesSavedStatesCallback( false );
+		},
+		[ entitiesSavedStatesCallback ]
+	);
+
+	return (
+		<InterfaceSkeleton
+			isDistractionFree={ isDistractionFree }
+			className={ clsx( 'editor-editor-interface', className, {
+				'is-entity-save-view-open': !! entitiesSavedStatesCallback,
+				'is-distraction-free': isDistractionFree && ! isPreviewMode,
+			} ) }
+			labels={ {
+				...interfaceLabels,
+				secondarySidebar: secondarySidebarLabel,
+			} }
+			header={
+				! isPreviewMode && (
+					<Header
+						forceIsDirty={ forceIsDirty }
+						setEntitiesSavedStatesCallback={
+							setEntitiesSavedStatesCallback
+						}
+						customSaveButton={ customSaveButton }
+						forceDisableBlockTools={ forceDisableBlockTools }
+						title={ title }
+						isEditorIframed={ ! disableIframe }
+					/>
+				)
+			}
+			editorNotices={ <EditorNotices /> }
+			secondarySidebar={
+				! isPreviewMode &&
+				mode === 'visual' &&
+				( ( isInserterOpened && <InserterSidebar /> ) ||
+					( isListViewOpened && <ListViewSidebar /> ) )
+			}
+			sidebar={
+				! isPreviewMode &&
+				! isDistractionFree && <ComplementaryArea.Slot scope="core" />
+			}
+			content={
+				<>
+					{ ! isDistractionFree && ! isPreviewMode && (
+						<EditorNotices />
+					) }
+
+					<EditorContentSlotFill.Slot>
+						{ ( [ editorCanvasView ] ) =>
+							editorCanvasView ? (
+								editorCanvasView
+							) : (
+								<>
+									{ ! isPreviewMode &&
+										( mode === 'text' ||
+											! isRichEditingEnabled ) && (
+											<TextEditor
+												// We should auto-focus the canvas (title) on load.
+												// eslint-disable-next-line jsx-a11y/no-autofocus
+												autoFocus={ autoFocus }
+											/>
+										) }
+									{ ! isPreviewMode &&
+										! isLargeViewport &&
+										mode === 'visual' && (
+											<BlockToolbar hideDragHandle />
+										) }
+									{ ( isPreviewMode ||
+										( isRichEditingEnabled &&
+											mode === 'visual' ) ) && (
+										<VisualEditor
+											styles={ styles }
+											contentRef={ contentRef }
+											disableIframe={ disableIframe }
+											// We should auto-focus the canvas (title) on load.
+											// eslint-disable-next-line jsx-a11y/no-autofocus
+											autoFocus={ autoFocus }
+											iframeProps={ iframeProps }
+										/>
+									) }
+									{ children }
+								</>
+							)
+						}
+					</EditorContentSlotFill.Slot>
+				</>
+			}
+			footer={
+				! isPreviewMode &&
+				! isDistractionFree &&
+				isLargeViewport &&
+				showBlockBreadcrumbs &&
+				isRichEditingEnabled &&
+				! isZoomOut &&
+				mode === 'visual' && (
+					<BlockBreadcrumb rootLabelText={ documentLabel } />
+				)
+			}
+			actions={
+				! isPreviewMode
+					? customSavePanel || (
+							<SavePublishPanels
+								closeEntitiesSavedStates={
+									closeEntitiesSavedStates
+								}
+								isEntitiesSavedStatesOpen={
+									entitiesSavedStatesCallback
+								}
+								setEntitiesSavedStatesCallback={
+									setEntitiesSavedStatesCallback
+								}
+								forceIsDirtyPublishPanel={ forceIsDirty }
+							/>
+					  )
+					: undefined
+			}
+		/>
+	);
+}
diff --git a/packages/editor/src/components/editor-interface/style.scss b/packages/editor/src/components/editor-interface/style.scss
new file mode 100644
index 00000000000000..05b23fe2304dd8
--- /dev/null
+++ b/packages/editor/src/components/editor-interface/style.scss
@@ -0,0 +1,12 @@
+.editor-editor-interface .entities-saved-states__panel-header {
+	height: $header-height + $border-width;
+}
+
+.editor-editor-interface .interface-interface-skeleton__content {
+	// Make this a stacking context to contain the z-index of children elements.
+	isolation: isolate;
+}
+
+.editor-visual-editor {
+	flex: 1 0 auto;
+}
diff --git a/packages/editor/src/components/editor-notices/index.js b/packages/editor/src/components/editor-notices/index.js
index ec4bd04d689200..28341bfda3f236 100644
--- a/packages/editor/src/components/editor-notices/index.js
+++ b/packages/editor/src/components/editor-notices/index.js
@@ -2,8 +2,7 @@
  * WordPress dependencies
  */
 import { NoticeList } from '@wordpress/components';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
+import { useDispatch, useSelect } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
 
 /**
@@ -11,7 +10,24 @@ import { store as noticesStore } from '@wordpress/notices';
  */
 import TemplateValidationNotice from '../template-validation-notice';
 
-export function EditorNotices( { notices, onRemove } ) {
+/**
+ * This component renders the notices displayed in the editor. It displays pinned notices first, followed by dismissible
+ *
+ * @example
+ * ```jsx
+ * <EditorNotices />
+ * ```
+ *
+ * @return {JSX.Element} The rendered EditorNotices component.
+ */
+export function EditorNotices() {
+	const { notices } = useSelect(
+		( select ) => ( {
+			notices: select( noticesStore ).getNotices(),
+		} ),
+		[]
+	);
+	const { removeNotice } = useDispatch( noticesStore );
 	const dismissibleNotices = notices.filter(
 		( { isDismissible, type } ) => isDismissible && type === 'default'
 	);
@@ -28,7 +44,7 @@ export function EditorNotices( { notices, onRemove } ) {
 			<NoticeList
 				notices={ dismissibleNotices }
 				className="components-editor-notices__dismissible"
-				onRemove={ onRemove }
+				onRemove={ removeNotice }
 			>
 				<TemplateValidationNotice />
 			</NoticeList>
@@ -36,11 +52,4 @@ export function EditorNotices( { notices, onRemove } ) {
 	);
 }
 
-export default compose( [
-	withSelect( ( select ) => ( {
-		notices: select( noticesStore ).getNotices(),
-	} ) ),
-	withDispatch( ( dispatch ) => ( {
-		onRemove: dispatch( noticesStore ).removeNotice,
-	} ) ),
-] )( EditorNotices );
+export default EditorNotices;
diff --git a/packages/editor/src/components/editor-notices/style.scss b/packages/editor/src/components/editor-notices/style.scss
index f3b1f76285874f..85cd148bfea763 100644
--- a/packages/editor/src/components/editor-notices/style.scss
+++ b/packages/editor/src/components/editor-notices/style.scss
@@ -9,7 +9,6 @@
 
 	.components-notice {
 		box-sizing: border-box;
-		margin: 0;
 		border-bottom: $border-width solid rgba(0, 0, 0, 0.2);
 		padding: 0 $grid-unit-15;
 
diff --git a/packages/editor/src/components/editor-snackbars/index.js b/packages/editor/src/components/editor-snackbars/index.js
index 57f0fe4bf88af5..6530e1ec7ea902 100644
--- a/packages/editor/src/components/editor-snackbars/index.js
+++ b/packages/editor/src/components/editor-snackbars/index.js
@@ -5,15 +5,23 @@ import { SnackbarList } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
 
+// Last three notices. Slices from the tail end of the list.
+const MAX_VISIBLE_NOTICES = -3;
+
+/**
+ * Renders the editor snackbars component.
+ *
+ * @return {JSX.Element} The rendered component.
+ */
 export default function EditorSnackbars() {
 	const notices = useSelect(
 		( select ) => select( noticesStore ).getNotices(),
 		[]
 	);
 	const { removeNotice } = useDispatch( noticesStore );
-	const snackbarNotices = notices.filter(
-		( { type } ) => type === 'snackbar'
-	);
+	const snackbarNotices = notices
+		.filter( ( { type } ) => type === 'snackbar' )
+		.slice( MAX_VISIBLE_NOTICES );
 
 	return (
 		<SnackbarList
diff --git a/packages/editor/src/components/editor/index.js b/packages/editor/src/components/editor/index.js
new file mode 100644
index 00000000000000..21becea43cd7ee
--- /dev/null
+++ b/packages/editor/src/components/editor/index.js
@@ -0,0 +1,88 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { Notice } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_POST_TYPE } from '../../store/constants';
+import EditorInterface from '../editor-interface';
+import { ExperimentalEditorProvider } from '../provider';
+import Sidebar from '../sidebar';
+
+function Editor( {
+	postType,
+	postId,
+	templateId,
+	settings,
+	children,
+	initialEdits,
+
+	// This could be part of the settings.
+	onActionPerformed,
+
+	// The following abstractions are not ideal but necessary
+	// to account for site editor and post editor differences for now.
+	extraContent,
+	extraSidebarPanels,
+	...props
+} ) {
+	const { post, template, hasLoadedPost } = useSelect(
+		( select ) => {
+			const { getEntityRecord, hasFinishedResolution } =
+				select( coreStore );
+			return {
+				post: getEntityRecord( 'postType', postType, postId ),
+				template: templateId
+					? getEntityRecord(
+							'postType',
+							TEMPLATE_POST_TYPE,
+							templateId
+					  )
+					: undefined,
+				hasLoadedPost: hasFinishedResolution( 'getEntityRecord', [
+					'postType',
+					postType,
+					postId,
+				] ),
+			};
+		},
+		[ postType, postId, templateId ]
+	);
+
+	return (
+		<>
+			{ hasLoadedPost && ! post && (
+				<Notice status="warning" isDismissible={ false }>
+					{ __(
+						"You attempted to edit an item that doesn't exist. Perhaps it was deleted?"
+					) }
+				</Notice>
+			) }
+			{ !! post && (
+				<ExperimentalEditorProvider
+					post={ post }
+					__unstableTemplate={ template }
+					settings={ settings }
+					initialEdits={ initialEdits }
+					useSubRegistry={ false }
+				>
+					<EditorInterface { ...props }>
+						{ extraContent }
+					</EditorInterface>
+					{ children }
+					<Sidebar
+						onActionPerformed={ onActionPerformed }
+						extraPanels={ extraSidebarPanels }
+					/>
+				</ExperimentalEditorProvider>
+			) }
+		</>
+	);
+}
+
+export default Editor;
diff --git a/packages/editor/src/components/entities-saved-states/entity-record-item.js b/packages/editor/src/components/entities-saved-states/entity-record-item.js
index 70ca2b83c4dfdf..ca9fb2e0b169c3 100644
--- a/packages/editor/src/components/entities-saved-states/entity-record-item.js
+++ b/packages/editor/src/components/entities-saved-states/entity-record-item.js
@@ -11,15 +11,21 @@ import { decodeEntities } from '@wordpress/html-entities';
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
 export default function EntityRecordItem( { record, checked, onChange } ) {
 	const { name, kind, title, key } = record;
 
 	// Handle templates that might use default descriptive titles.
-	const entityRecordTitle = useSelect(
+	const { entityRecordTitle, hasPostMetaChanges } = useSelect(
 		( select ) => {
 			if ( 'postType' !== kind || 'wp_template' !== name ) {
-				return title;
+				return {
+					entityRecordTitle: title,
+					hasPostMetaChanges: unlock(
+						select( editorStore )
+					).hasPostMetaChanges( name, key ),
+				};
 			}
 
 			const template = select( coreStore ).getEditedEntityRecord(
@@ -27,26 +33,36 @@ export default function EntityRecordItem( { record, checked, onChange } ) {
 				name,
 				key
 			);
-			return select( editorStore ).__experimentalGetTemplateInfo(
-				template
-			).title;
+			return {
+				entityRecordTitle:
+					select( editorStore ).__experimentalGetTemplateInfo(
+						template
+					).title,
+				hasPostMetaChanges: unlock(
+					select( editorStore )
+				).hasPostMetaChanges( name, key ),
+			};
 		},
 		[ name, kind, title, key ]
 	);
 
 	return (
-		<PanelRow>
-			<CheckboxControl
-				__nextHasNoMarginBottom
-				label={
-					<strong>
-						{ decodeEntities( entityRecordTitle ) ||
-							__( 'Untitled' ) }
-					</strong>
-				}
-				checked={ checked }
-				onChange={ onChange }
-			/>
-		</PanelRow>
+		<>
+			<PanelRow>
+				<CheckboxControl
+					__nextHasNoMarginBottom
+					label={
+						decodeEntities( entityRecordTitle ) || __( 'Untitled' )
+					}
+					checked={ checked }
+					onChange={ onChange }
+				/>
+			</PanelRow>
+			{ hasPostMetaChanges && (
+				<ul className="entities-saved-states__changes">
+					<li>{ __( 'Post Meta.' ) }</li>
+				</ul>
+			) }
+		</>
 	);
 }
diff --git a/packages/editor/src/components/entities-saved-states/entity-type-list.js b/packages/editor/src/components/entities-saved-states/entity-type-list.js
index dffac536a1d220..71041dd9aebabd 100644
--- a/packages/editor/src/components/entities-saved-states/entity-type-list.js
+++ b/packages/editor/src/components/entities-saved-states/entity-type-list.js
@@ -5,11 +5,18 @@ import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { PanelBody, PanelRow } from '@wordpress/components';
 import { store as coreStore } from '@wordpress/core-data';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { useContext } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import EntityRecordItem from './entity-record-item';
+import { unlock } from '../../lock-unlock';
+
+const { getGlobalStylesChanges, GlobalStylesContext } = unlock(
+	blockEditorPrivateApis
+);
 
 function getEntityDescription( entity, count ) {
 	switch ( entity ) {
@@ -23,8 +30,45 @@ function getEntityDescription( entity, count ) {
 			);
 		case 'page':
 		case 'post':
-			return __( 'The following content has been modified.' );
+			return __( 'The following has been modified.' );
+	}
+}
+
+function GlobalStylesDescription( { record } ) {
+	const { user: currentEditorGlobalStyles } =
+		useContext( GlobalStylesContext );
+	const savedRecord = useSelect(
+		( select ) =>
+			select( coreStore ).getEntityRecord(
+				record.kind,
+				record.name,
+				record.key
+			),
+		[ record.kind, record.name, record.key ]
+	);
+
+	const globalStylesChanges = getGlobalStylesChanges(
+		currentEditorGlobalStyles,
+		savedRecord,
+		{
+			maxResults: 10,
+		}
+	);
+	return globalStylesChanges.length ? (
+		<ul className="entities-saved-states__changes">
+			{ globalStylesChanges.map( ( change ) => (
+				<li key={ change }>{ change }</li>
+			) ) }
+		</ul>
+	) : null;
+}
+
+function EntityDescription( { record, count } ) {
+	if ( 'globalStyles' === record?.name ) {
+		return null;
 	}
+	const description = getEntityDescription( record?.name, count );
+	return description ? <PanelRow>{ description }</PanelRow> : null;
 }
 
 export default function EntityTypeList( {
@@ -42,19 +86,16 @@ export default function EntityTypeList( {
 			),
 		[ firstRecord.kind, firstRecord.name ]
 	);
-	const { name } = firstRecord;
 
 	let entityLabel = entityConfig.label;
-	if ( name === 'wp_template_part' ) {
+	if ( firstRecord?.name === 'wp_template_part' ) {
 		entityLabel =
 			1 === count ? __( 'Template Part' ) : __( 'Template Parts' );
 	}
-	// Set description based on type of entity.
-	const description = getEntityDescription( name, count );
 
 	return (
-		<PanelBody title={ entityLabel } initialOpen={ true }>
-			{ description && <PanelRow>{ description }</PanelRow> }
+		<PanelBody title={ entityLabel } initialOpen>
+			<EntityDescription record={ firstRecord } count={ count } />
 			{ list.map( ( record ) => {
 				return (
 					<EntityRecordItem
@@ -75,6 +116,9 @@ export default function EntityTypeList( {
 					/>
 				);
 			} ) }
+			{ 'globalStyles' === firstRecord?.name && (
+				<GlobalStylesDescription record={ firstRecord } />
+			) }
 		</PanelBody>
 	);
 }
diff --git a/packages/editor/src/components/entities-saved-states/hooks/use-is-dirty.js b/packages/editor/src/components/entities-saved-states/hooks/use-is-dirty.js
index e630c60b8c633d..2c3061e908c8d7 100644
--- a/packages/editor/src/components/entities-saved-states/hooks/use-is-dirty.js
+++ b/packages/editor/src/components/entities-saved-states/hooks/use-is-dirty.js
@@ -4,29 +4,33 @@
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { useMemo, useState } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-
-const TRANSLATED_SITE_PROPERTIES = {
-	title: __( 'Title' ),
-	description: __( 'Tagline' ),
-	site_logo: __( 'Logo' ),
-	site_icon: __( 'Icon' ),
-	show_on_front: __( 'Show on front' ),
-	page_on_front: __( 'Page on front' ),
-	posts_per_page: __( 'Maximum posts per page' ),
-	default_comment_status: __( 'Allow comments on new posts' ),
-};
 
+/**
+ * Custom hook that determines if any entities are dirty (edited) and provides a way to manage selected/unselected entities.
+ *
+ * @return {Object} An object containing the following properties:
+ *   - dirtyEntityRecords: An array of dirty entity records.
+ *   - isDirty: A boolean indicating if there are any dirty entity records.
+ *   - setUnselectedEntities: A function to set the unselected entities.
+ *   - unselectedEntities: An array of unselected entities.
+ */
 export const useIsDirty = () => {
-	const { editedEntities, siteEdits } = useSelect( ( select ) => {
-		const { __experimentalGetDirtyEntityRecords, getEntityRecordEdits } =
-			select( coreStore );
+	const { editedEntities, siteEdits, siteEntityConfig } = useSelect(
+		( select ) => {
+			const {
+				__experimentalGetDirtyEntityRecords,
+				getEntityRecordEdits,
+				getEntityConfig,
+			} = select( coreStore );
 
-		return {
-			editedEntities: __experimentalGetDirtyEntityRecords(),
-			siteEdits: getEntityRecordEdits( 'root', 'site' ),
-		};
-	}, [] );
+			return {
+				editedEntities: __experimentalGetDirtyEntityRecords(),
+				siteEdits: getEntityRecordEdits( 'root', 'site' ),
+				siteEntityConfig: getEntityConfig( 'root', 'site' ),
+			};
+		},
+		[]
+	);
 
 	const dirtyEntityRecords = useMemo( () => {
 		// Remove site object and decouple into its edited pieces.
@@ -34,18 +38,19 @@ export const useIsDirty = () => {
 			( record ) => ! ( record.kind === 'root' && record.name === 'site' )
 		);
 
+		const siteEntityLabels = siteEntityConfig?.meta?.labels ?? {};
 		const editedSiteEntities = [];
 		for ( const property in siteEdits ) {
 			editedSiteEntities.push( {
 				kind: 'root',
 				name: 'site',
-				title: TRANSLATED_SITE_PROPERTIES[ property ] || property,
+				title: siteEntityLabels[ property ] || property,
 				property,
 			} );
 		}
 
 		return [ ...editedEntitiesWithoutSite, ...editedSiteEntities ];
-	}, [ editedEntities, siteEdits ] );
+	}, [ editedEntities, siteEdits, siteEntityConfig ] );
 
 	// Unchecked entities to be ignored by save function.
 	const [ unselectedEntities, _setUnselectedEntities ] = useState( [] );
diff --git a/packages/editor/src/components/entities-saved-states/index.js b/packages/editor/src/components/entities-saved-states/index.js
index a47dd29fef036c..849bd2d0d71c8c 100644
--- a/packages/editor/src/components/entities-saved-states/index.js
+++ b/packages/editor/src/components/entities-saved-states/index.js
@@ -2,63 +2,84 @@
  * WordPress dependencies
  */
 import { Button, Flex, FlexItem } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { useCallback, useRef } from '@wordpress/element';
-import { store as coreStore } from '@wordpress/core-data';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { __experimentalUseDialog as useDialog } from '@wordpress/compose';
-import { store as noticesStore } from '@wordpress/notices';
+import { __, _n, sprintf } from '@wordpress/i18n';
+import {
+	useCallback,
+	useRef,
+	createInterpolateElement,
+} from '@wordpress/element';
+import {
+	__experimentalUseDialog as useDialog,
+	useInstanceId,
+} from '@wordpress/compose';
+import { useDispatch } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import EntityTypeList from './entity-type-list';
 import { useIsDirty } from './hooks/use-is-dirty';
-
-const PUBLISH_ON_SAVE_ENTITIES = [
-	{
-		kind: 'postType',
-		name: 'wp_navigation',
-	},
-];
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
 function identity( values ) {
 	return values;
 }
 
-export default function EntitiesSavedStates( { close } ) {
+/**
+ * Renders the component for managing saved states of entities.
+ *
+ * @param {Object}   props              The component props.
+ * @param {Function} props.close        The function to close the dialog.
+ * @param {Function} props.renderDialog The function to render the dialog.
+ *
+ * @return {JSX.Element} The rendered component.
+ */
+export default function EntitiesSavedStates( {
+	close,
+	renderDialog = undefined,
+} ) {
 	const isDirtyProps = useIsDirty();
 	return (
-		<EntitiesSavedStatesExtensible close={ close } { ...isDirtyProps } />
+		<EntitiesSavedStatesExtensible
+			close={ close }
+			renderDialog={ renderDialog }
+			{ ...isDirtyProps }
+		/>
 	);
 }
 
+/**
+ * Renders a panel for saving entities with dirty records.
+ *
+ * @param {Object}   props                       The component props.
+ * @param {string}   props.additionalPrompt      Additional prompt to display.
+ * @param {Function} props.close                 Function to close the panel.
+ * @param {Function} props.onSave                Function to call when saving entities.
+ * @param {boolean}  props.saveEnabled           Flag indicating if save is enabled.
+ * @param {string}   props.saveLabel             Label for the save button.
+ * @param {Function} props.renderDialog          Function to render a custom dialog.
+ * @param {Array}    props.dirtyEntityRecords    Array of dirty entity records.
+ * @param {boolean}  props.isDirty               Flag indicating if there are dirty entities.
+ * @param {Function} props.setUnselectedEntities Function to set unselected entities.
+ * @param {Array}    props.unselectedEntities    Array of unselected entities.
+ *
+ * @return {JSX.Element} The rendered component.
+ */
 export function EntitiesSavedStatesExtensible( {
 	additionalPrompt = undefined,
 	close,
 	onSave = identity,
 	saveEnabled: saveEnabledProp = undefined,
 	saveLabel = __( 'Save' ),
-
+	renderDialog = undefined,
 	dirtyEntityRecords,
 	isDirty,
 	setUnselectedEntities,
 	unselectedEntities,
 } ) {
 	const saveButtonRef = useRef();
-	const {
-		editEntityRecord,
-		saveEditedEntityRecord,
-		__experimentalSaveSpecifiedEntityEdits: saveSpecifiedEntityEdits,
-	} = useDispatch( coreStore );
-
-	const { __unstableMarkLastChangeAsPersistent } =
-		useDispatch( blockEditorStore );
-
-	const { createSuccessNotice, createErrorNotice, removeNotice } =
-		useDispatch( noticesStore );
-
+	const { saveDirtyEntities } = unlock( useDispatch( editorStore ) );
 	// To group entities by type.
 	const partitionedSavables = dirtyEntityRecords.reduce( ( acc, record ) => {
 		const { name } = record;
@@ -84,94 +105,6 @@ export function EntitiesSavedStatesExtensible( {
 	].filter( Array.isArray );
 
 	const saveEnabled = saveEnabledProp ?? isDirty;
-
-	const { homeUrl } = useSelect( ( select ) => {
-		const {
-			getUnstableBase, // Site index.
-		} = select( coreStore );
-		return {
-			homeUrl: getUnstableBase()?.home,
-		};
-	}, [] );
-
-	const saveCheckedEntities = () => {
-		const saveNoticeId = 'site-editor-save-success';
-		removeNotice( saveNoticeId );
-		const entitiesToSave = dirtyEntityRecords.filter(
-			( { kind, name, key, property } ) => {
-				return ! unselectedEntities.some(
-					( elt ) =>
-						elt.kind === kind &&
-						elt.name === name &&
-						elt.key === key &&
-						elt.property === property
-				);
-			}
-		);
-
-		close( entitiesToSave );
-
-		const siteItemsToSave = [];
-		const pendingSavedRecords = [];
-		entitiesToSave.forEach( ( { kind, name, key, property } ) => {
-			if ( 'root' === kind && 'site' === name ) {
-				siteItemsToSave.push( property );
-			} else {
-				if (
-					PUBLISH_ON_SAVE_ENTITIES.some(
-						( typeToPublish ) =>
-							typeToPublish.kind === kind &&
-							typeToPublish.name === name
-					)
-				) {
-					editEntityRecord( kind, name, key, { status: 'publish' } );
-				}
-
-				pendingSavedRecords.push(
-					saveEditedEntityRecord( kind, name, key )
-				);
-			}
-		} );
-		if ( siteItemsToSave.length ) {
-			pendingSavedRecords.push(
-				saveSpecifiedEntityEdits(
-					'root',
-					'site',
-					undefined,
-					siteItemsToSave
-				)
-			);
-		}
-
-		__unstableMarkLastChangeAsPersistent();
-
-		Promise.all( pendingSavedRecords )
-			.then( ( values ) => {
-				return onSave( values );
-			} )
-			.then( ( values ) => {
-				if (
-					values.some( ( value ) => typeof value === 'undefined' )
-				) {
-					createErrorNotice( __( 'Saving failed.' ) );
-				} else {
-					createSuccessNotice( __( 'Site updated.' ), {
-						type: 'snackbar',
-						id: saveNoticeId,
-						actions: [
-							{
-								label: __( 'View site' ),
-								url: homeUrl,
-							},
-						],
-					} );
-				}
-			} )
-			.catch( ( error ) =>
-				createErrorNotice( `${ __( 'Saving failed.' ) } ${ error }` )
-			);
-	};
-
 	// Explicitly define this with no argument passed.  Using `close` on
 	// its own will use the event object in place of the expected saved entities.
 	const dismissPanel = useCallback( () => close(), [ close ] );
@@ -179,45 +112,79 @@ export function EntitiesSavedStatesExtensible( {
 	const [ saveDialogRef, saveDialogProps ] = useDialog( {
 		onClose: () => dismissPanel(),
 	} );
+	const dialogLabel = useInstanceId( EntitiesSavedStatesExtensible, 'label' );
+	const dialogDescription = useInstanceId(
+		EntitiesSavedStatesExtensible,
+		'description'
+	);
 
 	return (
 		<div
 			ref={ saveDialogRef }
 			{ ...saveDialogProps }
 			className="entities-saved-states__panel"
+			role={ renderDialog ? 'dialog' : undefined }
+			aria-labelledby={ renderDialog ? dialogLabel : undefined }
+			aria-describedby={ renderDialog ? dialogDescription : undefined }
 		>
 			<Flex className="entities-saved-states__panel-header" gap={ 2 }>
 				<FlexItem
 					isBlock
 					as={ Button }
-					ref={ saveButtonRef }
-					variant="primary"
-					disabled={ ! saveEnabled }
-					onClick={ saveCheckedEntities }
-					className="editor-entities-saved-states__save-button"
+					variant="secondary"
+					size="compact"
+					onClick={ dismissPanel }
 				>
-					{ saveLabel }
+					{ __( 'Cancel' ) }
 				</FlexItem>
 				<FlexItem
 					isBlock
 					as={ Button }
-					variant="secondary"
-					onClick={ dismissPanel }
+					ref={ saveButtonRef }
+					variant="primary"
+					size="compact"
+					disabled={ ! saveEnabled }
+					accessibleWhenDisabled
+					onClick={ () =>
+						saveDirtyEntities( {
+							onSave,
+							dirtyEntityRecords,
+							entitiesToSkip: unselectedEntities,
+							close,
+						} )
+					}
+					className="editor-entities-saved-states__save-button"
 				>
-					{ __( 'Cancel' ) }
+					{ saveLabel }
 				</FlexItem>
 			</Flex>
 
 			<div className="entities-saved-states__text-prompt">
-				<strong>{ __( 'Are you ready to save?' ) }</strong>
-				{ additionalPrompt }
-				{ isDirty && (
-					<p>
-						{ __(
-							'The following changes have been made to your site, templates, and content.'
-						) }
-					</p>
-				) }
+				<div
+					className="entities-saved-states__text-prompt--header-wrapper"
+					id={ renderDialog ? dialogLabel : undefined }
+				>
+					<strong className="entities-saved-states__text-prompt--header">
+						{ __( 'Are you ready to save?' ) }
+					</strong>
+					{ additionalPrompt }
+				</div>
+				<p id={ renderDialog ? dialogDescription : undefined }>
+					{ isDirty
+						? createInterpolateElement(
+								sprintf(
+									/* translators: %d: number of site changes waiting to be saved. */
+									_n(
+										'There is <strong>%d site change</strong> waiting to be saved.',
+										'There are <strong>%d site changes</strong> waiting to be saved.',
+										dirtyEntityRecords.length
+									),
+									dirtyEntityRecords.length
+								),
+								{ strong: <strong /> }
+						  )
+						: __( 'Select the items you want to save.' ) }
+				</p>
 			</div>
 
 			{ sortedPartitionedSavables.map( ( list ) => {
diff --git a/packages/editor/src/components/entities-saved-states/style.scss b/packages/editor/src/components/entities-saved-states/style.scss
index 99bb7394b510e5..e2c320678c322a 100644
--- a/packages/editor/src/components/entities-saved-states/style.scss
+++ b/packages/editor/src/components/entities-saved-states/style.scss
@@ -1,8 +1,8 @@
 .entities-saved-states__panel-header {
 	box-sizing: border-box;
 	background: $white;
-	padding-left: $grid-unit-10;
-	padding-right: $grid-unit-10;
+	padding-left: $grid-unit-20;
+	padding-right: $grid-unit-20;
 	height: $header-height;
 	border-bottom: $border-width solid $gray-300;
 }
@@ -10,4 +10,23 @@
 .entities-saved-states__text-prompt {
 	padding: $grid-unit-20;
 	padding-bottom: $grid-unit-05;
+	.entities-saved-states__text-prompt--header {
+		display: block;
+		margin-bottom: $grid-unit-15;
+	}
+}
+
+.entities-saved-states__description-heading {
+	font-size: $default-font-size;
+}
+
+.entities-saved-states__changes {
+	color: $gray-700;
+	font-size: $helptext-font-size;
+	margin: $grid-unit-10 $grid-unit-20 0 $grid-unit-20;
+	list-style: disc;
+
+	li {
+		margin-bottom: $grid-unit-05;
+	}
 }
diff --git a/packages/editor/src/components/entities-saved-states/test/use-is-dirty.js b/packages/editor/src/components/entities-saved-states/test/use-is-dirty.js
index 04b6b4e566ef1f..287e990a14f92b 100644
--- a/packages/editor/src/components/entities-saved-states/test/use-is-dirty.js
+++ b/packages/editor/src/components/entities-saved-states/test/use-is-dirty.js
@@ -32,6 +32,9 @@ jest.mock( '@wordpress/data', () => {
 					getEntityRecordEdits: jest.fn().mockReturnValue( {
 						title: 'My Site',
 					} ),
+					getEntityConfig: jest.fn().mockReturnValue( {
+						meta: { labels: { title: 'Title' } },
+					} ),
 				};
 			};
 			return fn( select );
diff --git a/packages/editor/src/components/error-boundary/index.js b/packages/editor/src/components/error-boundary/index.js
index 0b5158ff7b9e55..d43af5a556b67b 100644
--- a/packages/editor/src/components/error-boundary/index.js
+++ b/packages/editor/src/components/error-boundary/index.js
@@ -29,7 +29,7 @@ function getContent() {
 function CopyButton( { text, children } ) {
 	const ref = useCopyToClipboard( text );
 	return (
-		<Button variant="secondary" ref={ ref }>
+		<Button __next40pxDefaultSize variant="secondary" ref={ ref }>
 			{ children }
 		</Button>
 	);
@@ -75,4 +75,14 @@ class ErrorBoundary extends Component {
 	}
 }
 
+/**
+ * ErrorBoundary is used to catch JavaScript errors anywhere in a child component tree, log those errors, and display a fallback UI.
+ *
+ * It uses the lifecycle methods getDerivedStateFromError and componentDidCatch to catch errors in a child component tree.
+ *
+ * getDerivedStateFromError is used to render a fallback UI after an error has been thrown, and componentDidCatch is used to log error information.
+ *
+ * @class ErrorBoundary
+ * @augments Component
+ */
 export default ErrorBoundary;
diff --git a/packages/editor/src/components/error-boundary/index.native.js b/packages/editor/src/components/error-boundary/index.native.js
new file mode 100644
index 00000000000000..0de048e8114451
--- /dev/null
+++ b/packages/editor/src/components/error-boundary/index.native.js
@@ -0,0 +1,192 @@
+/**
+ * External dependencies
+ */
+import { ScrollView, Text, TouchableOpacity, View } from 'react-native';
+import Clipboard from '@react-native-clipboard/clipboard';
+import { SafeAreaView } from 'react-native-safe-area-context';
+
+/**
+ * WordPress dependencies
+ */
+import { Component } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import { select } from '@wordpress/data';
+import { logException } from '@wordpress/react-native-bridge';
+import {
+	usePreferredColorSchemeStyle,
+	withPreferredColorScheme,
+} from '@wordpress/compose';
+import { warning } from '@wordpress/icons';
+import { Icon } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import styles from './style.scss';
+
+function getContent() {
+	try {
+		// While `select` in a component is generally discouraged, it is
+		// used here because it (a) reduces the chance of data loss in the
+		// case of additional errors by performing a direct retrieval and
+		// (b) avoids the performance cost associated with unnecessary
+		// content serialization throughout the lifetime of a non-erroring
+		// application.
+		return select( editorStore ).getEditedPostContent();
+	} catch ( error ) {}
+}
+
+function CopyButton( {
+	text,
+	label,
+	accessibilityLabel,
+	accessibilityHint,
+	secondary = false,
+} ) {
+	const containerStyle = usePreferredColorSchemeStyle(
+		styles[ 'copy-button__container' ],
+		styles[ 'copy-button__container--dark' ]
+	);
+
+	const containerSecondaryStyle = usePreferredColorSchemeStyle(
+		styles[ 'copy-button__container--secondary' ],
+		styles[ 'copy-button__container--secondary-dark' ]
+	);
+
+	const textStyle = usePreferredColorSchemeStyle(
+		styles[ 'copy-button__text' ],
+		styles[ 'copy-button__text--dark' ]
+	);
+
+	const textSecondaryStyle = usePreferredColorSchemeStyle(
+		styles[ 'copy-button__text--secondary' ],
+		styles[ 'copy-button__text--secondary-dark' ]
+	);
+
+	return (
+		<TouchableOpacity
+			activeOpacity={ 0.5 }
+			accessibilityLabel={ accessibilityLabel }
+			style={ [ containerStyle, secondary && containerSecondaryStyle ] }
+			accessibilityRole="button"
+			accessibilityHint={ accessibilityHint }
+			onPress={ () => {
+				Clipboard.setString(
+					typeof text === 'function' ? text() : text || ''
+				);
+			} }
+		>
+			<Text style={ [ textStyle, secondary && textSecondaryStyle ] }>
+				{ label }
+			</Text>
+		</TouchableOpacity>
+	);
+}
+
+class ErrorBoundary extends Component {
+	constructor() {
+		super( ...arguments );
+
+		this.state = {
+			error: null,
+		};
+	}
+
+	componentDidCatch( error ) {
+		logException( error, {
+			context: {
+				component_stack: error.componentStack,
+			},
+			isHandled: true,
+			handledBy: 'Editor-level Error Boundary',
+		} );
+	}
+
+	static getDerivedStateFromError( error ) {
+		return { error };
+	}
+
+	render() {
+		const { error } = this.state;
+		if ( ! error ) {
+			return this.props.children;
+		}
+
+		const { getStylesFromColorScheme } = this.props;
+
+		const iconContainerStyle = getStylesFromColorScheme(
+			styles[ 'error-boundary__icon-container' ],
+			styles[ 'error-boundary__icon-container--dark' ]
+		);
+
+		const titleStyle = getStylesFromColorScheme(
+			styles[ 'error-boundary__title' ],
+			styles[ 'error-boundary__title--dark' ]
+		);
+
+		const messageStyle = getStylesFromColorScheme(
+			styles[ 'error-boundary__message' ],
+			styles[ 'error-boundary__message--dark' ]
+		);
+
+		return (
+			<SafeAreaView>
+				<ScrollView
+					style={ styles[ 'error-boundary__scroll' ] }
+					contentContainerStyle={
+						styles[ 'error-boundary__scroll-container' ]
+					}
+				>
+					<View style={ styles[ 'error-boundary__container' ] }>
+						<View style={ iconContainerStyle }>
+							<Icon
+								icon={ warning }
+								{ ...styles[ 'error-boundary__icon' ] }
+							/>
+						</View>
+						<Text style={ titleStyle }>
+							{ __(
+								'The editor has encountered an unexpected error'
+							) }
+						</Text>
+						<Text style={ messageStyle }>
+							{ __(
+								'You can copy your post text in case your content is impacted. Copy error details to debug and share with support.'
+							) }
+						</Text>
+						<View
+							style={
+								styles[ 'error-boundary__actions-container' ]
+							}
+						>
+							<CopyButton
+								label={ __( 'Copy post text' ) }
+								accessibilityLabel={ __(
+									'Button to copy post text'
+								) }
+								accessibilityHint={ __(
+									'Tap here to copy post text'
+								) }
+								text={ getContent }
+							/>
+							<CopyButton
+								label={ __( 'Copy error details' ) }
+								accessibilityLabel={ __(
+									'Button to copy error details'
+								) }
+								accessibilityHint={ __(
+									'Tap here to copy error details'
+								) }
+								text={ error.stack }
+								secondary
+							/>
+						</View>
+					</View>
+				</ScrollView>
+			</SafeAreaView>
+		);
+	}
+}
+
+export default withPreferredColorScheme( ErrorBoundary );
diff --git a/packages/editor/src/components/error-boundary/style.native.scss b/packages/editor/src/components/error-boundary/style.native.scss
new file mode 100644
index 00000000000000..413242a1779947
--- /dev/null
+++ b/packages/editor/src/components/error-boundary/style.native.scss
@@ -0,0 +1,116 @@
+.error-boundary__scroll {
+	height: 100%;
+	width: 100%;
+}
+
+.error-boundary__scroll-container {
+	flex-grow: 1;
+	max-height: 580px;
+	align-items: center;
+	justify-content: center;
+}
+
+
+.error-boundary__container {
+	width: 100%;
+	max-width: 600px;
+	justify-content: center;
+	align-items: center;
+	padding: 0 24px;
+}
+
+.error-boundary__icon-container {
+	$size: 40px;
+
+	width: $size;
+	height: $size;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 8px;
+	background-color: rgba(60, 60, 67, 0.3);
+	border-radius: 20px;
+}
+
+.error-boundary__icon-container--dark {
+	background-color: rgba(235, 235, 245, 0.3);
+}
+
+.error-boundary__icon {
+	width: 24px;
+	height: 24px;
+	fill: $white;
+}
+
+.error-boundary__title {
+	font-size: 20px;
+	font-weight: 600;
+	line-height: 25px;
+	color: $black;
+	text-align: center;
+	margin-bottom: 8px;
+}
+
+.error-boundary__title--dark {
+	color: $white;
+}
+
+.error-boundary__message {
+	font-size: 16px;
+	font-weight: 400;
+	line-height: 21px;
+	color: rgba(60, 60, 67, 0.6);
+	text-align: center;
+	margin-bottom: 16px;
+}
+
+.error-boundary__message--dark {
+	color: rgba(235, 235, 245, 0.6);
+}
+
+.error-boundary__actions-container {
+	width: 100%;
+	max-width: 400px;
+	justify-content: center;
+	gap: 12px;
+	padding-top: 16px;
+}
+
+.copy-button__container {
+	border-radius: 5px;
+	padding: $grid-unit $grid-unit-20;
+	background-color: $light-primary;
+}
+
+.copy-button__container--dark {
+	background-color: $white;
+}
+
+.copy-button__container--secondary {
+	border: $border-width #c6c6c8;
+	background-color: $white;
+}
+
+.copy-button__container--secondary-dark {
+	border-color: rgba(255, 255, 255, 0.3);
+	background-color: $black;
+}
+
+.copy-button__text {
+	font-size: 17px;
+	font-weight: 400;
+	line-height: 22px;
+	text-align: center;
+	color: $white;
+}
+
+.copy-button__text--dark {
+	color: $background-dark-secondary;
+}
+
+.copy-button__text--secondary {
+	color: $black;
+}
+
+.copy-button__text--secondary-dark {
+	color: $white;
+}
diff --git a/packages/editor/src/components/error-boundary/style.scss b/packages/editor/src/components/error-boundary/style.scss
index d1b792d0ff3d32..2913a644b94576 100644
--- a/packages/editor/src/components/error-boundary/style.scss
+++ b/packages/editor/src/components/error-boundary/style.scss
@@ -3,5 +3,5 @@
 	max-width: 780px;
 	padding: 20px;
 	margin-top: 60px;
-	box-shadow: $shadow-modal;
+	box-shadow: $elevation-large;
 }
diff --git a/packages/editor/src/components/global-keyboard-shortcuts/index.js b/packages/editor/src/components/global-keyboard-shortcuts/index.js
index 4b45fe449123f4..a46d4b55a7bfd8 100644
--- a/packages/editor/src/components/global-keyboard-shortcuts/index.js
+++ b/packages/editor/src/components/global-keyboard-shortcuts/index.js
@@ -3,15 +3,61 @@
  */
 import { useShortcut } from '@wordpress/keyboard-shortcuts';
 import { useDispatch, useSelect } from '@wordpress/data';
+import { store as interfaceStore } from '@wordpress/interface';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Handles the keyboard shortcuts for the editor.
+ *
+ * It provides functionality for various keyboard shortcuts such as toggling editor mode,
+ * toggling distraction-free mode, undo/redo, saving the post, toggling list view,
+ * and toggling the sidebar.
+ */
 export default function EditorKeyboardShortcuts() {
-	const { redo, undo, savePost } = useDispatch( editorStore );
-	const { isEditedPostDirty, isPostSavingLocked } = useSelect( editorStore );
+	const isModeToggleDisabled = useSelect( ( select ) => {
+		const { richEditingEnabled, codeEditingEnabled } =
+			select( editorStore ).getEditorSettings();
+		return ! richEditingEnabled || ! codeEditingEnabled;
+	}, [] );
+	const { getBlockSelectionStart } = useSelect( blockEditorStore );
+	const { getActiveComplementaryArea } = useSelect( interfaceStore );
+	const { enableComplementaryArea, disableComplementaryArea } =
+		useDispatch( interfaceStore );
+	const {
+		redo,
+		undo,
+		savePost,
+		setIsListViewOpened,
+		switchEditorMode,
+		toggleDistractionFree,
+	} = useDispatch( editorStore );
+	const {
+		isEditedPostDirty,
+		isPostSavingLocked,
+		isListViewOpened,
+		getEditorMode,
+	} = useSelect( editorStore );
+
+	useShortcut(
+		'core/editor/toggle-mode',
+		() => {
+			switchEditorMode(
+				getEditorMode() === 'visual' ? 'text' : 'visual'
+			);
+		},
+		{
+			isDisabled: isModeToggleDisabled,
+		}
+	);
+
+	useShortcut( 'core/editor/toggle-distraction-free', () => {
+		toggleDistractionFree();
+	} );
 
 	useShortcut( 'core/editor/undo', ( event ) => {
 		undo();
@@ -45,5 +91,32 @@ export default function EditorKeyboardShortcuts() {
 		savePost();
 	} );
 
+	// Only opens the list view. Other functionality for this shortcut happens in the rendered sidebar.
+	useShortcut( 'core/editor/toggle-list-view', ( event ) => {
+		if ( ! isListViewOpened() ) {
+			event.preventDefault();
+			setIsListViewOpened( true );
+		}
+	} );
+
+	useShortcut( 'core/editor/toggle-sidebar', ( event ) => {
+		// This shortcut has no known clashes, but use preventDefault to prevent any
+		// obscure shortcuts from triggering.
+		event.preventDefault();
+		const isEditorSidebarOpened = [
+			'edit-post/document',
+			'edit-post/block',
+		].includes( getActiveComplementaryArea( 'core' ) );
+
+		if ( isEditorSidebarOpened ) {
+			disableComplementaryArea( 'core' );
+		} else {
+			const sidebarToOpen = getBlockSelectionStart()
+				? 'edit-post/block'
+				: 'edit-post/document';
+			enableComplementaryArea( 'core', sidebarToOpen );
+		}
+	} );
+
 	return null;
 }
diff --git a/packages/editor/src/components/global-keyboard-shortcuts/register-shortcuts.js b/packages/editor/src/components/global-keyboard-shortcuts/register-shortcuts.js
index 8e8f4c42ca6dd6..26a07166c106c4 100644
--- a/packages/editor/src/components/global-keyboard-shortcuts/register-shortcuts.js
+++ b/packages/editor/src/components/global-keyboard-shortcuts/register-shortcuts.js
@@ -8,10 +8,25 @@ import { BlockEditorKeyboardShortcuts } from '@wordpress/block-editor';
 import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
 import { isAppleOS } from '@wordpress/keycodes';
 
+/**
+ * Component for registering editor keyboard shortcuts.
+ *
+ * @return {Element} The component to be rendered.
+ */
 function EditorKeyboardShortcutsRegister() {
 	// Registering the shortcuts.
 	const { registerShortcut } = useDispatch( keyboardShortcutsStore );
 	useEffect( () => {
+		registerShortcut( {
+			name: 'core/editor/toggle-mode',
+			category: 'global',
+			description: __( 'Switch between visual editor and code editor.' ),
+			keyCombination: {
+				modifier: 'secondary',
+				character: 'm',
+			},
+		} );
+
 		registerShortcut( {
 			name: 'core/editor/save',
 			category: 'global',
@@ -53,6 +68,82 @@ function EditorKeyboardShortcutsRegister() {
 						},
 				  ],
 		} );
+
+		registerShortcut( {
+			name: 'core/editor/toggle-list-view',
+			category: 'global',
+			description: __( 'Open the List View.' ),
+			keyCombination: {
+				modifier: 'access',
+				character: 'o',
+			},
+		} );
+
+		registerShortcut( {
+			name: 'core/editor/toggle-distraction-free',
+			category: 'global',
+			description: __( 'Toggle distraction free mode.' ),
+			keyCombination: {
+				modifier: 'primaryShift',
+				character: '\\',
+			},
+		} );
+
+		registerShortcut( {
+			name: 'core/editor/toggle-sidebar',
+			category: 'global',
+			description: __( 'Show or hide the Settings sidebar.' ),
+			keyCombination: {
+				modifier: 'primaryShift',
+				character: ',',
+			},
+		} );
+
+		registerShortcut( {
+			name: 'core/editor/keyboard-shortcuts',
+			category: 'main',
+			description: __( 'Display these keyboard shortcuts.' ),
+			keyCombination: {
+				modifier: 'access',
+				character: 'h',
+			},
+		} );
+
+		registerShortcut( {
+			name: 'core/editor/next-region',
+			category: 'global',
+			description: __( 'Navigate to the next part of the editor.' ),
+			keyCombination: {
+				modifier: 'ctrl',
+				character: '`',
+			},
+			aliases: [
+				{
+					modifier: 'access',
+					character: 'n',
+				},
+			],
+		} );
+
+		registerShortcut( {
+			name: 'core/editor/previous-region',
+			category: 'global',
+			description: __( 'Navigate to the previous part of the editor.' ),
+			keyCombination: {
+				modifier: 'ctrlShift',
+				character: '`',
+			},
+			aliases: [
+				{
+					modifier: 'access',
+					character: 'p',
+				},
+				{
+					modifier: 'ctrlShift',
+					character: '~',
+				},
+			],
+		} );
 	}, [ registerShortcut ] );
 
 	return <BlockEditorKeyboardShortcuts.Register />;
diff --git a/packages/editor/src/components/global-styles-provider/index.js b/packages/editor/src/components/global-styles-provider/index.js
new file mode 100644
index 00000000000000..6f2d8177056cb1
--- /dev/null
+++ b/packages/editor/src/components/global-styles-provider/index.js
@@ -0,0 +1,223 @@
+/**
+ * External dependencies
+ */
+import deepmerge from 'deepmerge';
+import { isPlainObject } from 'is-plain-object';
+
+/**
+ * WordPress dependencies
+ */
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useMemo, useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { GlobalStylesContext, cleanEmptyObject } = unlock(
+	blockEditorPrivateApis
+);
+
+export function mergeBaseAndUserConfigs( base, user ) {
+	return deepmerge( base, user, {
+		/*
+		 * We only pass as arrays the presets,
+		 * in which case we want the new array of values
+		 * to override the old array (no merging).
+		 */
+		isMergeableObject: isPlainObject,
+		/*
+		 * Exceptions to the above rule.
+		 * Background images should be replaced, not merged,
+		 * as they themselves are specific object definitions for the style.
+		 */
+		customMerge: ( key ) => {
+			if ( key === 'backgroundImage' ) {
+				return ( baseConfig, userConfig ) => userConfig;
+			}
+			return undefined;
+		},
+	} );
+}
+
+function useGlobalStylesUserConfig() {
+	const { globalStylesId, isReady, settings, styles, _links } = useSelect(
+		( select ) => {
+			const {
+				getEntityRecord,
+				getEditedEntityRecord,
+				hasFinishedResolution,
+				canUser,
+			} = select( coreStore );
+			const _globalStylesId =
+				select( coreStore ).__experimentalGetCurrentGlobalStylesId();
+
+			let record;
+			const userCanEditGlobalStyles = canUser( 'update', {
+				kind: 'root',
+				name: 'globalStyles',
+				id: _globalStylesId,
+			} );
+
+			if ( _globalStylesId ) {
+				if ( userCanEditGlobalStyles ) {
+					record = getEditedEntityRecord(
+						'root',
+						'globalStyles',
+						_globalStylesId
+					);
+				} else {
+					record = getEntityRecord(
+						'root',
+						'globalStyles',
+						_globalStylesId,
+						{ context: 'view' }
+					);
+				}
+			}
+
+			let hasResolved = false;
+			if (
+				hasFinishedResolution(
+					'__experimentalGetCurrentGlobalStylesId'
+				)
+			) {
+				if ( _globalStylesId ) {
+					hasResolved = userCanEditGlobalStyles
+						? hasFinishedResolution( 'getEditedEntityRecord', [
+								'root',
+								'globalStyles',
+								_globalStylesId,
+						  ] )
+						: hasFinishedResolution( 'getEntityRecord', [
+								'root',
+								'globalStyles',
+								_globalStylesId,
+								{ context: 'view' },
+						  ] );
+				} else {
+					hasResolved = true;
+				}
+			}
+
+			return {
+				globalStylesId: _globalStylesId,
+				isReady: hasResolved,
+				settings: record?.settings,
+				styles: record?.styles,
+				_links: record?._links,
+			};
+		},
+		[]
+	);
+
+	const { getEditedEntityRecord } = useSelect( coreStore );
+	const { editEntityRecord } = useDispatch( coreStore );
+	const config = useMemo( () => {
+		return {
+			settings: settings ?? {},
+			styles: styles ?? {},
+			_links: _links ?? {},
+		};
+	}, [ settings, styles, _links ] );
+
+	const setConfig = useCallback(
+		/**
+		 * Set the global styles config.
+		 * @param {Function|Object} callbackOrObject If the callbackOrObject is a function, pass the current config to the callback so the consumer can merge values.
+		 *                                           Otherwise, overwrite the current config with the incoming object.
+		 * @param {Object}          options          Options for editEntityRecord Core selector.
+		 */
+		( callbackOrObject, options = {} ) => {
+			const record = getEditedEntityRecord(
+				'root',
+				'globalStyles',
+				globalStylesId
+			);
+
+			const currentConfig = {
+				styles: record?.styles ?? {},
+				settings: record?.settings ?? {},
+				_links: record?._links ?? {},
+			};
+
+			const updatedConfig =
+				typeof callbackOrObject === 'function'
+					? callbackOrObject( currentConfig )
+					: callbackOrObject;
+
+			editEntityRecord(
+				'root',
+				'globalStyles',
+				globalStylesId,
+				{
+					styles: cleanEmptyObject( updatedConfig.styles ) || {},
+					settings: cleanEmptyObject( updatedConfig.settings ) || {},
+					_links: cleanEmptyObject( updatedConfig._links ) || {},
+				},
+				options
+			);
+		},
+		[ globalStylesId, editEntityRecord, getEditedEntityRecord ]
+	);
+
+	return [ isReady, config, setConfig ];
+}
+
+function useGlobalStylesBaseConfig() {
+	const baseConfig = useSelect(
+		( select ) =>
+			select( coreStore ).__experimentalGetCurrentThemeBaseGlobalStyles(),
+		[]
+	);
+	return [ !! baseConfig, baseConfig ];
+}
+
+export function useGlobalStylesContext() {
+	const [ isUserConfigReady, userConfig, setUserConfig ] =
+		useGlobalStylesUserConfig();
+	const [ isBaseConfigReady, baseConfig ] = useGlobalStylesBaseConfig();
+
+	const mergedConfig = useMemo( () => {
+		if ( ! baseConfig || ! userConfig ) {
+			return {};
+		}
+
+		return mergeBaseAndUserConfigs( baseConfig, userConfig );
+	}, [ userConfig, baseConfig ] );
+
+	const context = useMemo( () => {
+		return {
+			isReady: isUserConfigReady && isBaseConfigReady,
+			user: userConfig,
+			base: baseConfig,
+			merged: mergedConfig,
+			setUserConfig,
+		};
+	}, [
+		mergedConfig,
+		userConfig,
+		baseConfig,
+		setUserConfig,
+		isUserConfigReady,
+		isBaseConfigReady,
+	] );
+
+	return context;
+}
+
+export function GlobalStylesProvider( { children } ) {
+	const context = useGlobalStylesContext();
+	if ( ! context.isReady ) {
+		return null;
+	}
+
+	return (
+		<GlobalStylesContext.Provider value={ context }>
+			{ children }
+		</GlobalStylesContext.Provider>
+	);
+}
diff --git a/packages/editor/src/components/header/back-button.js b/packages/editor/src/components/header/back-button.js
new file mode 100644
index 00000000000000..a3d682f92970ed
--- /dev/null
+++ b/packages/editor/src/components/header/back-button.js
@@ -0,0 +1,32 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalUseSlotFills as useSlotFills,
+	createSlotFill,
+} from '@wordpress/components';
+
+// Keeping an old name for backward compatibility.
+const slotName = '__experimentalMainDashboardButton';
+
+export const useHasBackButton = () => {
+	const fills = useSlotFills( slotName );
+	return Boolean( fills && fills.length );
+};
+
+const { Fill, Slot } = createSlotFill( slotName );
+
+const BackButton = Fill;
+const BackButtonSlot = () => {
+	const fills = useSlotFills( slotName );
+
+	return (
+		<Slot
+			bubblesVirtually
+			fillProps={ { length: ! fills ? 0 : fills.length } }
+		/>
+	);
+};
+BackButton.Slot = BackButtonSlot;
+
+export default BackButton;
diff --git a/packages/editor/src/components/header/index.js b/packages/editor/src/components/header/index.js
new file mode 100644
index 00000000000000..1bd1114852fd6c
--- /dev/null
+++ b/packages/editor/src/components/header/index.js
@@ -0,0 +1,187 @@
+/**
+ * WordPress dependencies
+ */
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+import { useMediaQuery, useViewportMatch } from '@wordpress/compose';
+import { __unstableMotion as motion } from '@wordpress/components';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { useState } from '@wordpress/element';
+import { PinnedItems } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import CollabSidebar from '../collab-sidebar';
+import BackButton, { useHasBackButton } from './back-button';
+import CollapsibleBlockToolbar from '../collapsible-block-toolbar';
+import DocumentBar from '../document-bar';
+import DocumentTools from '../document-tools';
+import MoreMenu from '../more-menu';
+import PostPreviewButton from '../post-preview-button';
+import PostPublishButtonOrToggle from '../post-publish-button/post-publish-button-or-toggle';
+import PostSavedState from '../post-saved-state';
+import PostViewLink from '../post-view-link';
+import PreviewDropdown from '../preview-dropdown';
+import ZoomOutToggle from '../zoom-out-toggle';
+import { store as editorStore } from '../../store';
+
+const toolbarVariations = {
+	distractionFreeDisabled: { y: '-50px' },
+	distractionFreeHover: { y: 0 },
+	distractionFreeHidden: { y: '-50px' },
+	visible: { y: 0 },
+	hidden: { y: 0 },
+};
+
+const backButtonVariations = {
+	distractionFreeDisabled: { x: '-100%' },
+	distractionFreeHover: { x: 0 },
+	distractionFreeHidden: { x: '-100%' },
+	visible: { x: 0 },
+	hidden: { x: 0 },
+};
+
+function Header( {
+	customSaveButton,
+	forceIsDirty,
+	forceDisableBlockTools,
+	setEntitiesSavedStatesCallback,
+	title,
+	isEditorIframed,
+} ) {
+	const isWideViewport = useViewportMatch( 'large' );
+	const isLargeViewport = useViewportMatch( 'medium' );
+	const isTooNarrowForDocumentBar = useMediaQuery( '(max-width: 403px)' );
+	const {
+		postType,
+		isTextEditor,
+		isPublishSidebarOpened,
+		showIconLabels,
+		hasFixedToolbar,
+		hasBlockSelection,
+		isNestedEntity,
+	} = useSelect( ( select ) => {
+		const { get: getPreference } = select( preferencesStore );
+		const {
+			getEditorMode,
+			getEditorSettings,
+			getCurrentPostType,
+			isPublishSidebarOpened: _isPublishSidebarOpened,
+		} = select( editorStore );
+
+		return {
+			postType: getCurrentPostType(),
+			isTextEditor: getEditorMode() === 'text',
+			isPublishSidebarOpened: _isPublishSidebarOpened(),
+			showIconLabels: getPreference( 'core', 'showIconLabels' ),
+			hasFixedToolbar: getPreference( 'core', 'fixedToolbar' ),
+			hasBlockSelection:
+				!! select( blockEditorStore ).getBlockSelectionStart(),
+			isNestedEntity:
+				!! getEditorSettings().onNavigateToPreviousEntityRecord,
+		};
+	}, [] );
+
+	const canBeZoomedOut = [ 'post', 'page', 'wp_template' ].includes(
+		postType
+	);
+
+	const [ isBlockToolsCollapsed, setIsBlockToolsCollapsed ] =
+		useState( true );
+
+	const hasCenter =
+		( ! hasBlockSelection || isBlockToolsCollapsed ) &&
+		! isTooNarrowForDocumentBar;
+	const hasBackButton = useHasBackButton();
+	/*
+	 * The edit-post-header classname is only kept for backward compatability
+	 * as some plugins might be relying on its presence.
+	 */
+	return (
+		<div className="editor-header edit-post-header">
+			{ hasBackButton && (
+				<motion.div
+					className="editor-header__back-button"
+					variants={ backButtonVariations }
+					transition={ { type: 'tween' } }
+				>
+					<BackButton.Slot />
+				</motion.div>
+			) }
+			<motion.div
+				variants={ toolbarVariations }
+				className="editor-header__toolbar"
+				transition={ { type: 'tween' } }
+			>
+				<DocumentTools
+					disableBlockTools={ forceDisableBlockTools || isTextEditor }
+				/>
+				{ hasFixedToolbar && isLargeViewport && (
+					<CollapsibleBlockToolbar
+						isCollapsed={ isBlockToolsCollapsed }
+						onToggle={ setIsBlockToolsCollapsed }
+					/>
+				) }
+			</motion.div>
+			{ hasCenter && (
+				<motion.div
+					className="editor-header__center"
+					variants={ toolbarVariations }
+					transition={ { type: 'tween' } }
+				>
+					<DocumentBar title={ title } />
+				</motion.div>
+			) }
+			<motion.div
+				variants={ toolbarVariations }
+				transition={ { type: 'tween' } }
+				className="editor-header__settings"
+			>
+				{ ! customSaveButton && ! isPublishSidebarOpened && (
+					/*
+					 * This button isn't completely hidden by the publish sidebar.
+					 * We can't hide the whole toolbar when the publish sidebar is open because
+					 * we want to prevent mounting/unmounting the PostPublishButtonOrToggle DOM node.
+					 * We track that DOM node to return focus to the PostPublishButtonOrToggle
+					 * when the publish sidebar has been closed.
+					 */
+					<PostSavedState forceIsDirty={ forceIsDirty } />
+				) }
+
+				{ canBeZoomedOut && isEditorIframed && isWideViewport && (
+					<ZoomOutToggle disabled={ forceDisableBlockTools } />
+				) }
+
+				<PreviewDropdown
+					forceIsAutosaveable={ forceIsDirty }
+					disabled={ isNestedEntity }
+				/>
+				<PostPreviewButton
+					className="editor-header__post-preview-button"
+					forceIsAutosaveable={ forceIsDirty }
+				/>
+				<PostViewLink />
+
+				{ ( isWideViewport || ! showIconLabels ) && (
+					<PinnedItems.Slot scope="core" />
+				) }
+
+				{ ! customSaveButton && (
+					<PostPublishButtonOrToggle
+						forceIsDirty={ forceIsDirty }
+						setEntitiesSavedStatesCallback={
+							setEntitiesSavedStatesCallback
+						}
+					/>
+				) }
+				<CollabSidebar />
+
+				{ customSaveButton }
+				<MoreMenu />
+			</motion.div>
+		</div>
+	);
+}
+
+export default Header;
diff --git a/packages/editor/src/components/header/style.scss b/packages/editor/src/components/header/style.scss
new file mode 100644
index 00000000000000..4259ef4b8a2084
--- /dev/null
+++ b/packages/editor/src/components/header/style.scss
@@ -0,0 +1,283 @@
+.editor-header {
+	height: $header-height;
+	background: $white;
+	display: grid;
+	grid-auto-flow: row;
+	grid-template: auto / $header-height minmax(0, max-content) minmax(min-content, 1fr) $header-height;
+	&:has(> .editor-header__center) {
+		grid-template: auto / $header-height min-content 1fr min-content $header-height;
+		@include break-medium {
+			grid-template: auto / $header-height minmax(min-content, 1fr) 2fr minmax(min-content, 1fr) $header-height;
+		}
+	}
+	@include break-mobile {
+		gap: $grid-unit-20;
+	}
+	align-items: center;
+	// The header should never be wider than the viewport, or buttons might be hidden. Especially relevant at high zoom levels. Related to https://core.trac.wordpress.org/ticket/47603#ticket.
+	max-width: 100vw;
+	justify-content: space-between;
+
+	// Make toolbar sticky on larger breakpoints
+	@include break-zoomed-in {
+		flex-wrap: nowrap;
+	}
+}
+
+.editor-header__toolbar {
+	grid-column: 1 / 3;
+	// When there is no back button or the viewport is <= mobile the margin keeps the content off
+	// the starting edge.
+	> :first-child {
+		margin-inline: $grid-unit-20 0;
+	}
+
+	// This is the typical case, the back button takes up the first column.
+	.editor-header__back-button + & {
+		grid-column: 2 / 3;
+
+		@include break-mobile {
+			// Clears the margin; at this breakpoint the parent’s `gap` takes its place.
+			> :first-child {
+				margin-inline: 0;
+			}
+		}
+	}
+	display: flex;
+	// Make narrowing to less than content width possible. Block toolbar will hide overflow and allow scrolling on fixed toolbar.
+	min-width: 0;
+	align-items: center;
+	// Clip the box while leaving room for focus rings.
+	clip-path: inset(-2px);
+	@include break-mobile {
+		clip-path: none;
+	}
+
+	.table-of-contents {
+		display: none;
+
+		@include break-small() {
+			display: block;
+		}
+	}
+
+	// Add a gap before the block toolbar or its toggle button when collapsed.
+	.editor-collapsible-block-toolbar {
+		margin-inline: $grid-unit 0;
+
+		&.is-collapsed ~ .editor-collapsible-block-toolbar__toggle {
+			margin-inline: $grid-unit 0;
+		}
+	}
+}
+
+.editor-header__center {
+	grid-column: 3 / 4;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	// To enable shrinking and truncating of child text, apply an explicit min-width.
+	min-width: 0;
+	// Clip the box while leaving room for focus rings.
+	clip-path: inset(-2px);
+	// At less than mobile the header’s `gap` is zero so margins are added to create a smaller
+	// gap around the center’s contents.
+	@media (max-width: #{$break-mobile - 1}) {
+		> :first-child {
+			margin-inline-start: $grid-unit;
+		}
+		> :last-child {
+			margin-inline-end: $grid-unit;
+		}
+	}
+}
+
+/**
+ * Buttons on the right side
+ */
+
+.editor-header__settings {
+	grid-column: 3 / -1;
+	.editor-header:has(> .editor-header__center) & {
+		grid-column: 4 / -1;
+	}
+	justify-self: end;
+	display: inline-flex;
+	align-items: center;
+	flex-wrap: nowrap;
+	padding-right: $grid-unit-05;
+
+	@include break-small () {
+		padding-right: $grid-unit-10;
+	}
+
+	gap: $grid-unit-10;
+}
+
+/**
+ * Show icon labels.
+ */
+
+.show-icon-labels.interface-pinned-items,
+.show-icon-labels .editor-header {
+	.components-button.has-icon {
+		width: auto;
+
+		// Hide the button icons when labels are set to display...
+		svg {
+			display: none;
+		}
+		// ... and display labels.
+		&::after {
+			content: attr(aria-label);
+			white-space: nowrap;
+		}
+		&[aria-disabled="true"] {
+			background-color: transparent;
+		}
+	}
+	.is-tertiary {
+		&:active {
+			box-shadow: 0 0 0 1.5px var(--wp-admin-theme-color);
+			background-color: transparent;
+		}
+	}
+	// Exception for drodpdown toggle buttons.
+	.components-button.has-icon.button-toggle {
+		svg {
+			display: block;
+		}
+		&::after {
+			content: none;
+		}
+	}
+
+	// Don't hide MenuItemsChoice check icons
+	.components-menu-items-choice .components-menu-items__item-icon.components-menu-items__item-icon {
+		display: block;
+	}
+	.editor-document-tools__inserter-toggle.editor-document-tools__inserter-toggle,
+	.interface-pinned-items .components-button {
+		padding-left: $grid-unit;
+		padding-right: $grid-unit;
+
+		@include break-small {
+			padding-left: $grid-unit-15;
+			padding-right: $grid-unit-15;
+		}
+	}
+
+	.editor-post-save-draft.editor-post-save-draft,
+	.editor-post-saved-state.editor-post-saved-state {
+		&::after {
+			content: none;
+		}
+	}
+}
+
+.show-icon-labels {
+	.editor-header__toolbar .block-editor-block-mover {
+		// Modified group borders.
+		border-left: none;
+
+		&::before {
+			content: "";
+			width: $border-width;
+			height: $grid-unit-30;
+			background-color: $gray-300;
+			margin-top: $grid-unit-05;
+			margin-left: $grid-unit;
+		}
+
+		// Modified block movers horizontal separator.
+		.block-editor-block-mover__move-button-container {
+			&::before {
+				width: calc(100% - #{$grid-unit-30});
+				background: $gray-300;
+				left: calc(50% + 1px);
+			}
+		}
+	}
+}
+
+.show-icon-labels.interface-pinned-items {
+	padding: 6px $grid-unit-15 $grid-unit-15;
+	margin-top: 0;
+	margin-bottom: 0;
+	margin-left: -$grid-unit-15;
+	margin-right: -$grid-unit-15;
+	border-bottom: 1px solid $gray-400;
+	display: block;
+
+	> .components-button.has-icon {
+		margin: 0;
+		padding: 6px 6px 6px $grid-unit;
+		width: 14.625rem;
+		justify-content: flex-start;
+
+		&[aria-expanded="true"] svg {
+			display: block;
+			max-width: $grid-unit-30;
+		}
+		&[aria-expanded="false"] {
+			padding-left: $grid-unit-50;
+		}
+		svg {
+			margin-right: 8px;
+		}
+	}
+}
+
+.editor-header__post-preview-button {
+	@include break-mobile {
+		display: none;
+	}
+}
+
+.editor-editor-interface.is-distraction-free {
+	.interface-interface-skeleton__header {
+		border-bottom: none;
+	}
+
+	.editor-header {
+		background-color: $white;
+		width: 100%;
+
+		@include break-medium {
+			box-shadow: 0 $border-width 0 0 rgba($color: #000, $alpha: 0.133); // 0.133 = $gray-200 but with alpha.
+			position: absolute;
+		}
+
+
+		// hide some parts
+		& > .edit-post-header__settings > .edit-post-header__post-preview-button {
+			visibility: hidden;
+		}
+
+		& > .editor-header__toolbar .editor-document-tools__document-overview-toggle,
+		& > .editor-header__settings > .editor-preview-dropdown,
+		& > .editor-header__settings > .interface-pinned-items {
+			display: none;
+		}
+
+	}
+
+	// We need ! important because we override inline styles
+	// set by the motion component.
+	.interface-interface-skeleton__header:focus-within {
+		opacity: 1 !important;
+		div {
+			transform: translateX(0) translateZ(0) !important;
+		}
+
+	}
+
+	.components-editor-notices__dismissible {
+		position: absolute;
+		z-index: 35;
+	}
+}
+
+.components-popover.more-menu-dropdown__content {
+	z-index: z-index(".components-popover.more-menu__content");
+}
diff --git a/packages/editor/src/components/index.js b/packages/editor/src/components/index.js
index 64cd17746520a4..b42566aac653be 100644
--- a/packages/editor/src/components/index.js
+++ b/packages/editor/src/components/index.js
@@ -23,20 +23,35 @@ export { default as ErrorBoundary } from './error-boundary';
 export { default as LocalAutosaveMonitor } from './local-autosave-monitor';
 export { default as PageAttributesCheck } from './page-attributes/check';
 export { default as PageAttributesOrder } from './page-attributes/order';
+export { default as PageAttributesPanel } from './page-attributes/panel';
 export { default as PageAttributesParent } from './page-attributes/parent';
-export { default as PageTemplate } from './post-template';
+export { default as PageTemplate } from './post-template/classic-theme';
+export { default as PluginDocumentSettingPanel } from './plugin-document-setting-panel';
+export { default as PluginBlockSettingsMenuItem } from './block-settings-menu/plugin-block-settings-menu-item';
+export { default as PluginMoreMenuItem } from './plugin-more-menu-item';
+export { default as PluginPostPublishPanel } from './plugin-post-publish-panel';
+export { default as PluginPostStatusInfo } from './plugin-post-status-info';
+export { default as PluginPrePublishPanel } from './plugin-pre-publish-panel';
+export { default as PluginPreviewMenuItem } from './plugin-preview-menu-item';
+export { default as PluginSidebar } from './plugin-sidebar';
+export { default as PluginSidebarMoreMenuItem } from './plugin-sidebar-more-menu-item';
+export { default as PostTemplatePanel } from './post-template/panel';
 export { default as PostAuthor } from './post-author';
 export { default as PostAuthorCheck } from './post-author/check';
 export { default as PostAuthorPanel } from './post-author/panel';
 export { default as PostComments } from './post-comments';
+export { default as PostDiscussionPanel } from './post-discussion/panel';
 export { default as PostExcerpt } from './post-excerpt';
 export { default as PostExcerptCheck } from './post-excerpt/check';
+export { default as PostExcerptPanel } from './post-excerpt/panel';
 export { default as PostFeaturedImage } from './post-featured-image';
 export { default as PostFeaturedImageCheck } from './post-featured-image/check';
+export { default as PostFeaturedImagePanel } from './post-featured-image/panel';
 export { default as PostFormat } from './post-format';
 export { default as PostFormatCheck } from './post-format/check';
 export { default as PostLastRevision } from './post-last-revision';
 export { default as PostLastRevisionCheck } from './post-last-revision/check';
+export { default as PostLastRevisionPanel } from './post-last-revision/panel';
 export { default as PostLockedModal } from './post-locked-modal';
 export { default as PostPendingStatus } from './post-pending-status';
 export { default as PostPendingStatusCheck } from './post-pending-status/check';
@@ -58,14 +73,12 @@ export { default as PostSlugCheck } from './post-slug/check';
 export { default as PostSticky } from './post-sticky';
 export { default as PostStickyCheck } from './post-sticky/check';
 export { default as PostSwitchToDraftButton } from './post-switch-to-draft-button';
-export {
-	default as PostSyncStatus,
-	PostSyncStatusModal,
-} from './post-sync-status';
+export { default as PostSyncStatus } from './post-sync-status';
 export { default as PostTaxonomies } from './post-taxonomies';
 export { FlatTermSelector as PostTaxonomiesFlatTermSelector } from './post-taxonomies/flat-term-selector';
 export { HierarchicalTermSelector as PostTaxonomiesHierarchicalTermSelector } from './post-taxonomies/hierarchical-term-selector';
 export { default as PostTaxonomiesCheck } from './post-taxonomies/check';
+export { default as PostTaxonomiesPanel } from './post-taxonomies/panel';
 export { default as PostTextEditor } from './post-text-editor';
 export { default as PostTitle } from './post-title';
 export { default as PostTitleRaw } from './post-title/post-title-raw';
@@ -93,5 +106,21 @@ export { default as CharacterCount } from './character-count';
 export { default as EditorProvider } from './provider';
 
 export * from './deprecated';
+
+/**
+ * Handles the keyboard shortcuts for the editor.
+ *
+ * It provides functionality for various keyboard shortcuts such as toggling editor mode,
+ * toggling distraction-free mode, undo/redo, saving the post, toggling list view,
+ * and toggling the sidebar.
+ */
 export const VisualEditorGlobalKeyboardShortcuts = EditorKeyboardShortcuts;
+
+/**
+ * Handles the keyboard shortcuts for the editor.
+ *
+ * It provides functionality for various keyboard shortcuts such as toggling editor mode,
+ * toggling distraction-free mode, undo/redo, saving the post, toggling list view,
+ * and toggling the sidebar.
+ */
 export const TextEditorGlobalKeyboardShortcuts = EditorKeyboardShortcuts;
diff --git a/packages/editor/src/components/index.native.js b/packages/editor/src/components/index.native.js
index 127f15fbfdaf53..effc2a2cac62a7 100644
--- a/packages/editor/src/components/index.native.js
+++ b/packages/editor/src/components/index.native.js
@@ -9,5 +9,7 @@ export { default as EditorProvider } from './provider';
 
 // Other Components.
 export { default as EditorHelpTopics } from './editor-help';
+export { default as OfflineStatus } from './offline-status';
+export { default as ErrorBoundary } from './error-boundary';
 
 export * from './deprecated';
diff --git a/packages/editor/src/components/inserter-sidebar/index.js b/packages/editor/src/components/inserter-sidebar/index.js
new file mode 100644
index 00000000000000..66730b43592b6e
--- /dev/null
+++ b/packages/editor/src/components/inserter-sidebar/index.js
@@ -0,0 +1,110 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect } from '@wordpress/data';
+import {
+	store as blockEditorStore,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+import { useViewportMatch } from '@wordpress/compose';
+import { useCallback, useRef } from '@wordpress/element';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { ESCAPE } from '@wordpress/keycodes';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+
+const { PrivateInserterLibrary } = unlock( blockEditorPrivateApis );
+
+export default function InserterSidebar() {
+	const {
+		blockSectionRootClientId,
+		inserterSidebarToggleRef,
+		inserter,
+		showMostUsedBlocks,
+		sidebarIsOpened,
+	} = useSelect( ( select ) => {
+		const {
+			getInserterSidebarToggleRef,
+			getInserter,
+			isPublishSidebarOpened,
+		} = unlock( select( editorStore ) );
+		const { getBlockRootClientId, isZoomOut, getSectionRootClientId } =
+			unlock( select( blockEditorStore ) );
+		const { get } = select( preferencesStore );
+		const { getActiveComplementaryArea } = select( interfaceStore );
+		const getBlockSectionRootClientId = () => {
+			if ( isZoomOut() ) {
+				const sectionRootClientId = getSectionRootClientId();
+
+				if ( sectionRootClientId ) {
+					return sectionRootClientId;
+				}
+			}
+			return getBlockRootClientId();
+		};
+		return {
+			inserterSidebarToggleRef: getInserterSidebarToggleRef(),
+			inserter: getInserter(),
+			showMostUsedBlocks: get( 'core', 'mostUsedBlocks' ),
+			blockSectionRootClientId: getBlockSectionRootClientId(),
+			sidebarIsOpened: !! (
+				getActiveComplementaryArea( 'core' ) || isPublishSidebarOpened()
+			),
+		};
+	}, [] );
+	const { setIsInserterOpened } = useDispatch( editorStore );
+	const { disableComplementaryArea } = useDispatch( interfaceStore );
+
+	const isMobileViewport = useViewportMatch( 'medium', '<' );
+	const libraryRef = useRef();
+
+	// When closing the inserter, focus should return to the toggle button.
+	const closeInserterSidebar = useCallback( () => {
+		setIsInserterOpened( false );
+		inserterSidebarToggleRef.current?.focus();
+	}, [ inserterSidebarToggleRef, setIsInserterOpened ] );
+
+	const closeOnEscape = useCallback(
+		( event ) => {
+			if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
+				event.preventDefault();
+				closeInserterSidebar();
+			}
+		},
+		[ closeInserterSidebar ]
+	);
+
+	const inserterContents = (
+		<div className="editor-inserter-sidebar__content">
+			<PrivateInserterLibrary
+				showMostUsedBlocks={ showMostUsedBlocks }
+				showInserterHelpPanel
+				shouldFocusBlock={ isMobileViewport }
+				rootClientId={ blockSectionRootClientId }
+				onSelect={ inserter.onSelect }
+				__experimentalInitialTab={ inserter.tab }
+				__experimentalInitialCategory={ inserter.category }
+				__experimentalFilterValue={ inserter.filterValue }
+				onPatternCategorySelection={
+					sidebarIsOpened
+						? () => disableComplementaryArea( 'core' )
+						: undefined
+				}
+				ref={ libraryRef }
+				onClose={ closeInserterSidebar }
+			/>
+		</div>
+	);
+
+	return (
+		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
+		<div onKeyDown={ closeOnEscape } className="editor-inserter-sidebar">
+			{ inserterContents }
+		</div>
+	);
+}
diff --git a/packages/editor/src/components/inserter-sidebar/style.scss b/packages/editor/src/components/inserter-sidebar/style.scss
new file mode 100644
index 00000000000000..1c6155dbbe7c96
--- /dev/null
+++ b/packages/editor/src/components/inserter-sidebar/style.scss
@@ -0,0 +1,11 @@
+.editor-inserter-sidebar {
+	@include reset;
+
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.editor-inserter-sidebar__content {
+	height: 100%;
+}
diff --git a/packages/editor/src/components/keyboard-shortcut-help-modal/config.js b/packages/editor/src/components/keyboard-shortcut-help-modal/config.js
new file mode 100644
index 00000000000000..0380028aa100c0
--- /dev/null
+++ b/packages/editor/src/components/keyboard-shortcut-help-modal/config.js
@@ -0,0 +1,62 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+export const textFormattingShortcuts = [
+	{
+		keyCombination: { modifier: 'primary', character: 'b' },
+		description: __( 'Make the selected text bold.' ),
+	},
+	{
+		keyCombination: { modifier: 'primary', character: 'i' },
+		description: __( 'Make the selected text italic.' ),
+	},
+	{
+		keyCombination: { modifier: 'primary', character: 'k' },
+		description: __( 'Convert the selected text into a link.' ),
+	},
+	{
+		keyCombination: { modifier: 'primaryShift', character: 'k' },
+		description: __( 'Remove a link.' ),
+	},
+	{
+		keyCombination: { character: '[[' },
+		description: __( 'Insert a link to a post or page.' ),
+	},
+	{
+		keyCombination: { modifier: 'primary', character: 'u' },
+		description: __( 'Underline the selected text.' ),
+	},
+	{
+		keyCombination: { modifier: 'access', character: 'd' },
+		description: __( 'Strikethrough the selected text.' ),
+	},
+	{
+		keyCombination: { modifier: 'access', character: 'x' },
+		description: __( 'Make the selected text inline code.' ),
+	},
+	{
+		keyCombination: {
+			modifier: 'access',
+			character: '0',
+		},
+		aliases: [
+			{
+				modifier: 'access',
+				character: '7',
+			},
+		],
+		description: __( 'Convert the current heading to a paragraph.' ),
+	},
+	{
+		keyCombination: { modifier: 'access', character: '1-6' },
+		description: __(
+			'Convert the current paragraph or heading to a heading of level 1 to 6.'
+		),
+	},
+	{
+		keyCombination: { modifier: 'primaryShift', character: 'SPACE' },
+		description: __( 'Add non breaking space.' ),
+	},
+];
diff --git a/packages/edit-post/src/components/keyboard-shortcut-help-modal/dynamic-shortcut.js b/packages/editor/src/components/keyboard-shortcut-help-modal/dynamic-shortcut.js
similarity index 100%
rename from packages/edit-post/src/components/keyboard-shortcut-help-modal/dynamic-shortcut.js
rename to packages/editor/src/components/keyboard-shortcut-help-modal/dynamic-shortcut.js
diff --git a/packages/editor/src/components/keyboard-shortcut-help-modal/index.js b/packages/editor/src/components/keyboard-shortcut-help-modal/index.js
new file mode 100644
index 00000000000000..81a821c7783838
--- /dev/null
+++ b/packages/editor/src/components/keyboard-shortcut-help-modal/index.js
@@ -0,0 +1,160 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { Modal } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import {
+	useShortcut,
+	store as keyboardShortcutsStore,
+} from '@wordpress/keyboard-shortcuts';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import { textFormattingShortcuts } from './config';
+import Shortcut from './shortcut';
+import DynamicShortcut from './dynamic-shortcut';
+
+const KEYBOARD_SHORTCUT_HELP_MODAL_NAME = 'editor/keyboard-shortcut-help';
+
+const ShortcutList = ( { shortcuts } ) => (
+	/*
+	 * Disable reason: The `list` ARIA role is redundant but
+	 * Safari+VoiceOver won't announce the list otherwise.
+	 */
+	/* eslint-disable jsx-a11y/no-redundant-roles */
+	<ul
+		className="editor-keyboard-shortcut-help-modal__shortcut-list"
+		role="list"
+	>
+		{ shortcuts.map( ( shortcut, index ) => (
+			<li
+				className="editor-keyboard-shortcut-help-modal__shortcut"
+				key={ index }
+			>
+				{ typeof shortcut === 'string' ? (
+					<DynamicShortcut name={ shortcut } />
+				) : (
+					<Shortcut { ...shortcut } />
+				) }
+			</li>
+		) ) }
+	</ul>
+	/* eslint-enable jsx-a11y/no-redundant-roles */
+);
+
+const ShortcutSection = ( { title, shortcuts, className } ) => (
+	<section
+		className={ clsx(
+			'editor-keyboard-shortcut-help-modal__section',
+			className
+		) }
+	>
+		{ !! title && (
+			<h2 className="editor-keyboard-shortcut-help-modal__section-title">
+				{ title }
+			</h2>
+		) }
+		<ShortcutList shortcuts={ shortcuts } />
+	</section>
+);
+
+const ShortcutCategorySection = ( {
+	title,
+	categoryName,
+	additionalShortcuts = [],
+} ) => {
+	const categoryShortcuts = useSelect(
+		( select ) => {
+			return select( keyboardShortcutsStore ).getCategoryShortcuts(
+				categoryName
+			);
+		},
+		[ categoryName ]
+	);
+
+	return (
+		<ShortcutSection
+			title={ title }
+			shortcuts={ categoryShortcuts.concat( additionalShortcuts ) }
+		/>
+	);
+};
+
+function KeyboardShortcutHelpModal() {
+	const isModalActive = useSelect(
+		( select ) =>
+			select( interfaceStore ).isModalActive(
+				KEYBOARD_SHORTCUT_HELP_MODAL_NAME
+			),
+		[]
+	);
+	const { openModal, closeModal } = useDispatch( interfaceStore );
+	const toggleModal = () => {
+		if ( isModalActive ) {
+			closeModal();
+		} else {
+			openModal( KEYBOARD_SHORTCUT_HELP_MODAL_NAME );
+		}
+	};
+	useShortcut( 'core/editor/keyboard-shortcuts', toggleModal );
+
+	if ( ! isModalActive ) {
+		return null;
+	}
+
+	return (
+		<Modal
+			className="editor-keyboard-shortcut-help-modal"
+			title={ __( 'Keyboard shortcuts' ) }
+			closeButtonLabel={ __( 'Close' ) }
+			onRequestClose={ toggleModal }
+		>
+			<ShortcutSection
+				className="editor-keyboard-shortcut-help-modal__main-shortcuts"
+				shortcuts={ [ 'core/editor/keyboard-shortcuts' ] }
+			/>
+			<ShortcutCategorySection
+				title={ __( 'Global shortcuts' ) }
+				categoryName="global"
+			/>
+
+			<ShortcutCategorySection
+				title={ __( 'Selection shortcuts' ) }
+				categoryName="selection"
+			/>
+
+			<ShortcutCategorySection
+				title={ __( 'Block shortcuts' ) }
+				categoryName="block"
+				additionalShortcuts={ [
+					{
+						keyCombination: { character: '/' },
+						description: __(
+							'Change the block type after adding a new paragraph.'
+						),
+						/* translators: The forward-slash character. e.g. '/'. */
+						ariaLabel: __( 'Forward-slash' ),
+					},
+				] }
+			/>
+			<ShortcutSection
+				title={ __( 'Text formatting' ) }
+				shortcuts={ textFormattingShortcuts }
+			/>
+			<ShortcutCategorySection
+				title={ __( 'List View shortcuts' ) }
+				categoryName="list-view"
+			/>
+		</Modal>
+	);
+}
+
+export default KeyboardShortcutHelpModal;
diff --git a/packages/editor/src/components/keyboard-shortcut-help-modal/shortcut.js b/packages/editor/src/components/keyboard-shortcut-help-modal/shortcut.js
new file mode 100644
index 00000000000000..cec697bc69cd98
--- /dev/null
+++ b/packages/editor/src/components/keyboard-shortcut-help-modal/shortcut.js
@@ -0,0 +1,67 @@
+/**
+ * WordPress dependencies
+ */
+import { Fragment } from '@wordpress/element';
+import { displayShortcutList, shortcutAriaLabel } from '@wordpress/keycodes';
+
+function KeyCombination( { keyCombination, forceAriaLabel } ) {
+	const shortcut = keyCombination.modifier
+		? displayShortcutList[ keyCombination.modifier ](
+				keyCombination.character
+		  )
+		: keyCombination.character;
+	const ariaLabel = keyCombination.modifier
+		? shortcutAriaLabel[ keyCombination.modifier ](
+				keyCombination.character
+		  )
+		: keyCombination.character;
+
+	return (
+		<kbd
+			className="editor-keyboard-shortcut-help-modal__shortcut-key-combination"
+			aria-label={ forceAriaLabel || ariaLabel }
+		>
+			{ ( Array.isArray( shortcut ) ? shortcut : [ shortcut ] ).map(
+				( character, index ) => {
+					if ( character === '+' ) {
+						return <Fragment key={ index }>{ character }</Fragment>;
+					}
+
+					return (
+						<kbd
+							key={ index }
+							className="editor-keyboard-shortcut-help-modal__shortcut-key"
+						>
+							{ character }
+						</kbd>
+					);
+				}
+			) }
+		</kbd>
+	);
+}
+
+function Shortcut( { description, keyCombination, aliases = [], ariaLabel } ) {
+	return (
+		<>
+			<div className="editor-keyboard-shortcut-help-modal__shortcut-description">
+				{ description }
+			</div>
+			<div className="editor-keyboard-shortcut-help-modal__shortcut-term">
+				<KeyCombination
+					keyCombination={ keyCombination }
+					forceAriaLabel={ ariaLabel }
+				/>
+				{ aliases.map( ( alias, index ) => (
+					<KeyCombination
+						keyCombination={ alias }
+						forceAriaLabel={ ariaLabel }
+						key={ index }
+					/>
+				) ) }
+			</div>
+		</>
+	);
+}
+
+export default Shortcut;
diff --git a/packages/editor/src/components/keyboard-shortcut-help-modal/style.scss b/packages/editor/src/components/keyboard-shortcut-help-modal/style.scss
new file mode 100644
index 00000000000000..4eafa638cdfd94
--- /dev/null
+++ b/packages/editor/src/components/keyboard-shortcut-help-modal/style.scss
@@ -0,0 +1,58 @@
+.editor-keyboard-shortcut-help-modal {
+	&__section {
+		margin: 0 0 2rem 0;
+	}
+
+	&__section-title {
+		font-size: 0.9rem;
+		font-weight: 600;
+	}
+
+	&__shortcut {
+		display: flex;
+		align-items: baseline;
+		padding: 0.6rem 0;
+		border-top: 1px solid $gray-300;
+		margin-bottom: 0;
+
+		&:last-child {
+			border-bottom: 1px solid $gray-300;
+		}
+
+		&:empty {
+			display: none;
+		}
+	}
+
+	&__shortcut-term {
+		font-weight: 600;
+		margin: 0 0 0 1rem;
+		text-align: right;
+	}
+
+	&__shortcut-description {
+		flex: 1;
+		margin: 0;
+	}
+
+	&__shortcut-key-combination {
+		display: block;
+		background: none;
+		margin: 0;
+		padding: 0;
+
+		& + .editor-keyboard-shortcut-help-modal__shortcut-key-combination {
+			margin-top: 10px;
+		}
+	}
+
+	&__shortcut-key {
+		padding: 0.25rem 0.5rem;
+		border-radius: 8%;
+		margin: 0 0.2rem 0 0.2rem;
+
+		&:last-child {
+			margin: 0 0 0 0.2rem;
+		}
+	}
+}
diff --git a/packages/editor/src/components/list-view-sidebar/index.js b/packages/editor/src/components/list-view-sidebar/index.js
new file mode 100644
index 00000000000000..c90479c23ec702
--- /dev/null
+++ b/packages/editor/src/components/list-view-sidebar/index.js
@@ -0,0 +1,155 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalListView as ListView,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+import { useFocusOnMount, useMergeRefs } from '@wordpress/compose';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { focus } from '@wordpress/dom';
+import { useCallback, useRef, useState } from '@wordpress/element';
+import { __, _x } from '@wordpress/i18n';
+import { useShortcut } from '@wordpress/keyboard-shortcuts';
+import { ESCAPE } from '@wordpress/keycodes';
+
+/**
+ * Internal dependencies
+ */
+import ListViewOutline from './list-view-outline';
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+
+const { TabbedSidebar } = unlock( blockEditorPrivateApis );
+
+export default function ListViewSidebar() {
+	const { setIsListViewOpened } = useDispatch( editorStore );
+	const { getListViewToggleRef } = unlock( useSelect( editorStore ) );
+
+	// This hook handles focus when the sidebar first renders.
+	const focusOnMountRef = useFocusOnMount( 'firstElement' );
+
+	// When closing the list view, focus should return to the toggle button.
+	const closeListView = useCallback( () => {
+		setIsListViewOpened( false );
+		getListViewToggleRef().current?.focus();
+	}, [ getListViewToggleRef, setIsListViewOpened ] );
+
+	const closeOnEscape = useCallback(
+		( event ) => {
+			if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
+				event.preventDefault();
+				closeListView();
+			}
+		},
+		[ closeListView ]
+	);
+
+	// Use internal state instead of a ref to make sure that the component
+	// re-renders when the dropZoneElement updates.
+	const [ dropZoneElement, setDropZoneElement ] = useState( null );
+	// Tracks our current tab.
+	const [ tab, setTab ] = useState( 'list-view' );
+
+	// This ref refers to the sidebar as a whole.
+	const sidebarRef = useRef();
+	// This ref refers to the tab panel.
+	const tabsRef = useRef();
+	// This ref refers to the list view application area.
+	const listViewRef = useRef();
+
+	// Must merge the refs together so focus can be handled properly in the next function.
+	const listViewContainerRef = useMergeRefs( [
+		focusOnMountRef,
+		listViewRef,
+		setDropZoneElement,
+	] );
+
+	/*
+	 * Callback function to handle list view or outline focus.
+	 *
+	 * @param {string} currentTab The current tab. Either list view or outline.
+	 *
+	 * @return void
+	 */
+	function handleSidebarFocus( currentTab ) {
+		// Tab panel focus.
+		const tabPanelFocus = focus.tabbable.find( tabsRef.current )[ 0 ];
+		// List view tab is selected.
+		if ( currentTab === 'list-view' ) {
+			// Either focus the list view or the tab panel. Must have a fallback because the list view does not render when there are no blocks.
+			const listViewApplicationFocus = focus.tabbable.find(
+				listViewRef.current
+			)[ 0 ];
+			const listViewFocusArea = sidebarRef.current.contains(
+				listViewApplicationFocus
+			)
+				? listViewApplicationFocus
+				: tabPanelFocus;
+			listViewFocusArea.focus();
+			// Outline tab is selected.
+		} else {
+			tabPanelFocus.focus();
+		}
+	}
+
+	const handleToggleListViewShortcut = useCallback( () => {
+		// If the sidebar has focus, it is safe to close.
+		if (
+			sidebarRef.current.contains(
+				sidebarRef.current.ownerDocument.activeElement
+			)
+		) {
+			closeListView();
+		} else {
+			// If the list view or outline does not have focus, focus should be moved to it.
+			handleSidebarFocus( tab );
+		}
+	}, [ closeListView, tab ] );
+
+	// This only fires when the sidebar is open because of the conditional rendering.
+	// It is the same shortcut to open but that is defined as a global shortcut and only fires when the sidebar is closed.
+	useShortcut( 'core/editor/toggle-list-view', handleToggleListViewShortcut );
+
+	return (
+		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
+		<div
+			className="editor-list-view-sidebar"
+			onKeyDown={ closeOnEscape }
+			ref={ sidebarRef }
+		>
+			<TabbedSidebar
+				tabs={ [
+					{
+						name: 'list-view',
+						title: _x( 'List View', 'Post overview' ),
+						panel: (
+							<div className="editor-list-view-sidebar__list-view-container">
+								<div className="editor-list-view-sidebar__list-view-panel-content">
+									<ListView
+										dropZoneElement={ dropZoneElement }
+									/>
+								</div>
+							</div>
+						),
+						panelRef: listViewContainerRef,
+					},
+					{
+						name: 'outline',
+						title: _x( 'Outline', 'Post overview' ),
+						panel: (
+							<div className="editor-list-view-sidebar__list-view-container">
+								<ListViewOutline />
+							</div>
+						),
+					},
+				] }
+				onClose={ closeListView }
+				onSelect={ ( tabName ) => setTab( tabName ) }
+				defaultTabId="list-view"
+				ref={ tabsRef }
+				closeButtonLabel={ __( 'Close' ) }
+			/>
+		</div>
+	);
+}
diff --git a/packages/editor/src/components/list-view-sidebar/list-view-outline.js b/packages/editor/src/components/list-view-sidebar/list-view-outline.js
new file mode 100644
index 00000000000000..c73779d64f5cff
--- /dev/null
+++ b/packages/editor/src/components/list-view-sidebar/list-view-outline.js
@@ -0,0 +1,37 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalText as Text } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import CharacterCount from '../character-count';
+import WordCount from '../word-count';
+import TimeToRead from '../time-to-read';
+import DocumentOutline from '../document-outline';
+
+export default function ListViewOutline() {
+	return (
+		<>
+			<div className="editor-list-view-sidebar__outline">
+				<div>
+					<Text>{ __( 'Characters:' ) }</Text>
+					<Text>
+						<CharacterCount />
+					</Text>
+				</div>
+				<div>
+					<Text>{ __( 'Words:' ) }</Text>
+					<WordCount />
+				</div>
+				<div>
+					<Text>{ __( 'Time to read:' ) }</Text>
+					<TimeToRead />
+				</div>
+			</div>
+			<DocumentOutline />
+		</>
+	);
+}
diff --git a/packages/editor/src/components/list-view-sidebar/style.scss b/packages/editor/src/components/list-view-sidebar/style.scss
new file mode 100644
index 00000000000000..54c7376d374853
--- /dev/null
+++ b/packages/editor/src/components/list-view-sidebar/style.scss
@@ -0,0 +1,55 @@
+.editor-list-view-sidebar {
+	height: 100%;
+
+	@include break-medium {
+		width: $secondary-sidebar-width;
+	}
+}
+
+.editor-list-view-sidebar__list-view-panel-content,
+.editor-list-view-sidebar__list-view-container > .document-outline {
+	height: 100%;
+
+	// Include custom scrollbars, invisible until hovered.
+	@include custom-scrollbars-on-hover(transparent, $gray-600);
+	overflow: auto;
+
+	// Only reserve space for scrollbars when there is content to scroll.
+	// This allows items in the list view to have equidistant padding left and right
+	// right up until a scrollbar is present.
+	scrollbar-gutter: auto;
+
+	// The table cells use an extra pixels of space left and right. We compensate for that here.
+	padding: $grid-unit-05;
+}
+
+.editor-list-view-sidebar__list-view-container {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.editor-list-view-sidebar__tab-panel {
+	height: 100%;
+}
+
+.editor-list-view-sidebar__outline {
+	display: flex;
+	flex-direction: column;
+	gap: $grid-unit-10;
+	border-bottom: $border-width solid $gray-300;
+	padding: $grid-unit-20;
+
+	& > div > span:first-child {
+		// Width of the text information fields.
+		width: 90px;
+		display: inline-block;
+	}
+
+	& > div > span {
+		font-size: $helptext-font-size;
+		line-height: $default-line-height;
+		color: $gray-700;
+	}
+}
+
diff --git a/packages/editor/src/components/local-autosave-monitor/index.js b/packages/editor/src/components/local-autosave-monitor/index.js
index 185497710f35f9..ad4e40d15d5c58 100644
--- a/packages/editor/src/components/local-autosave-monitor/index.js
+++ b/packages/editor/src/components/local-autosave-monitor/index.js
@@ -144,20 +144,20 @@ function useAutosavePurge() {
 			[]
 		);
 
-	const lastIsDirty = useRef( isDirty );
-	const lastIsAutosaving = useRef( isAutosaving );
+	const lastIsDirtyRef = useRef( isDirty );
+	const lastIsAutosavingRef = useRef( isAutosaving );
 
 	useEffect( () => {
 		if (
 			! didError &&
-			( ( lastIsAutosaving.current && ! isAutosaving ) ||
-				( lastIsDirty.current && ! isDirty ) )
+			( ( lastIsAutosavingRef.current && ! isAutosaving ) ||
+				( lastIsDirtyRef.current && ! isDirty ) )
 		) {
 			localAutosaveClear( postId, isEditedPostNew );
 		}
 
-		lastIsDirty.current = isDirty;
-		lastIsAutosaving.current = isAutosaving;
+		lastIsDirtyRef.current = isDirty;
+		lastIsAutosavingRef.current = isAutosaving;
 	}, [ isDirty, isAutosaving, didError ] );
 
 	// Once the isEditedPostNew changes from true to false, let's clear the auto-draft autosave.
@@ -192,4 +192,16 @@ function LocalAutosaveMonitor() {
 	);
 }
 
+/**
+ * Monitors local autosaves of a post in the editor.
+ * It uses several hooks and functions to manage autosave behavior:
+ * - `useAutosaveNotice` hook: Manages the creation of a notice prompting the user to restore a local autosave, if one exists.
+ * - `useAutosavePurge` hook: Ejects a local autosave after a successful save occurs.
+ * - `hasSessionStorageSupport` function: Checks if the current environment supports browser sessionStorage.
+ * - `LocalAutosaveMonitor` component: Uses the `AutosaveMonitor` component to perform autosaves at a specified interval.
+ *
+ * The module also checks for sessionStorage support and conditionally exports the `LocalAutosaveMonitor` component based on that.
+ *
+ * @module LocalAutosaveMonitor
+ */
 export default ifCondition( hasSessionStorageSupport )( LocalAutosaveMonitor );
diff --git a/packages/editor/src/components/media-categories/index.js b/packages/editor/src/components/media-categories/index.js
index 345f5c5c86e2c2..be1b2bdc2d6728 100644
--- a/packages/editor/src/components/media-categories/index.js
+++ b/packages/editor/src/components/media-categories/index.js
@@ -191,9 +191,7 @@ const inserterMediaCategories = [
 				per_page: 'page_size',
 				search: 'q',
 			};
-			const url = new URL(
-				'https://api.openverse.engineering/v1/images/'
-			);
+			const url = new URL( 'https://api.openverse.org/v1/images/' );
 			Object.entries( finalQuery ).forEach( ( [ key, value ] ) => {
 				const queryKey = mapFromInserterMediaRequest[ key ] || key;
 				url.searchParams.set( queryKey, value );
diff --git a/packages/editor/src/components/mode-switcher/index.js b/packages/editor/src/components/mode-switcher/index.js
new file mode 100644
index 00000000000000..439fbd7acc21fe
--- /dev/null
+++ b/packages/editor/src/components/mode-switcher/index.js
@@ -0,0 +1,90 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { MenuItemsChoice, MenuGroup } from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+
+/**
+ * Set of available mode options.
+ *
+ * @type {Array}
+ */
+const MODES = [
+	{
+		value: 'visual',
+		label: __( 'Visual editor' ),
+	},
+	{
+		value: 'text',
+		label: __( 'Code editor' ),
+	},
+];
+
+function ModeSwitcher() {
+	const { shortcut, isRichEditingEnabled, isCodeEditingEnabled, mode } =
+		useSelect(
+			( select ) => ( {
+				shortcut: select(
+					keyboardShortcutsStore
+				).getShortcutRepresentation( 'core/editor/toggle-mode' ),
+				isRichEditingEnabled:
+					select( editorStore ).getEditorSettings()
+						.richEditingEnabled,
+				isCodeEditingEnabled:
+					select( editorStore ).getEditorSettings()
+						.codeEditingEnabled,
+				mode: select( editorStore ).getEditorMode(),
+			} ),
+			[]
+		);
+	const { switchEditorMode } = useDispatch( editorStore );
+
+	let selectedMode = mode;
+	if ( ! isRichEditingEnabled && mode === 'visual' ) {
+		selectedMode = 'text';
+	}
+	if ( ! isCodeEditingEnabled && mode === 'text' ) {
+		selectedMode = 'visual';
+	}
+
+	const choices = MODES.map( ( choice ) => {
+		if ( ! isCodeEditingEnabled && choice.value === 'text' ) {
+			choice = {
+				...choice,
+				disabled: true,
+			};
+		}
+		if ( ! isRichEditingEnabled && choice.value === 'visual' ) {
+			choice = {
+				...choice,
+				disabled: true,
+				info: __(
+					'You can enable the visual editor in your profile settings.'
+				),
+			};
+		}
+		if ( choice.value !== selectedMode && ! choice.disabled ) {
+			return { ...choice, shortcut };
+		}
+		return choice;
+	} );
+
+	return (
+		<MenuGroup label={ __( 'Editor' ) }>
+			<MenuItemsChoice
+				choices={ choices }
+				value={ selectedMode }
+				onSelect={ switchEditorMode }
+			/>
+		</MenuGroup>
+	);
+}
+
+export default ModeSwitcher;
diff --git a/packages/edit-site/src/components/header-edit-mode/more-menu/copy-content-menu-item.js b/packages/editor/src/components/more-menu/copy-content-menu-item.js
similarity index 87%
rename from packages/edit-site/src/components/header-edit-mode/more-menu/copy-content-menu-item.js
rename to packages/editor/src/components/more-menu/copy-content-menu-item.js
index 887817692239c9..8b9de82f7ac96a 100644
--- a/packages/edit-site/src/components/header-edit-mode/more-menu/copy-content-menu-item.js
+++ b/packages/editor/src/components/more-menu/copy-content-menu-item.js
@@ -12,18 +12,18 @@ import { __unstableSerializeAndClean } from '@wordpress/blocks';
 /**
  * Internal dependencies
  */
-import { store as editSiteStore } from '../../../store';
+import { store as editorStore } from '../../store';
 
 export default function CopyContentMenuItem() {
 	const { createNotice } = useDispatch( noticesStore );
-	const { getEditedPostId, getEditedPostType } = useSelect( editSiteStore );
+	const { getCurrentPostId, getCurrentPostType } = useSelect( editorStore );
 	const { getEditedEntityRecord } = useSelect( coreStore );
 
 	function getText() {
 		const record = getEditedEntityRecord(
 			'postType',
-			getEditedPostType(),
-			getEditedPostId()
+			getCurrentPostType(),
+			getCurrentPostId()
 		);
 		if ( ! record ) {
 			return '';
diff --git a/packages/editor/src/components/more-menu/index.js b/packages/editor/src/components/more-menu/index.js
new file mode 100644
index 00000000000000..6ccc01c6ac049c
--- /dev/null
+++ b/packages/editor/src/components/more-menu/index.js
@@ -0,0 +1,158 @@
+/**
+ * WordPress dependencies
+ */
+import { __, _x } from '@wordpress/i18n';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { displayShortcut } from '@wordpress/keycodes';
+import { external, moreVertical } from '@wordpress/icons';
+import {
+	MenuGroup,
+	MenuItem,
+	VisuallyHidden,
+	DropdownMenu,
+} from '@wordpress/components';
+import {
+	PreferenceToggleMenuItem,
+	store as preferencesStore,
+} from '@wordpress/preferences';
+import { store as interfaceStore, ActionItem } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import CopyContentMenuItem from './copy-content-menu-item';
+import ModeSwitcher from '../mode-switcher';
+import ToolsMoreMenuGroup from './tools-more-menu-group';
+import ViewMoreMenuGroup from './view-more-menu-group';
+import { store as editorStore } from '../../store';
+
+export default function MoreMenu() {
+	const { openModal } = useDispatch( interfaceStore );
+	const { set: setPreference } = useDispatch( preferencesStore );
+	const { toggleDistractionFree } = useDispatch( editorStore );
+	const showIconLabels = useSelect(
+		( select ) =>
+			select( preferencesStore ).get( 'core', 'showIconLabels' ),
+		[]
+	);
+	const turnOffDistractionFree = () => {
+		setPreference( 'core', 'distractionFree', false );
+	};
+
+	return (
+		<>
+			<DropdownMenu
+				icon={ moreVertical }
+				label={ __( 'Options' ) }
+				popoverProps={ {
+					placement: 'bottom-end',
+					className: 'more-menu-dropdown__content',
+				} }
+				toggleProps={ {
+					showTooltip: ! showIconLabels,
+					...( showIconLabels && { variant: 'tertiary' } ),
+					tooltipPosition: 'bottom',
+					size: 'compact',
+				} }
+			>
+				{ ( { onClose } ) => (
+					<>
+						<MenuGroup label={ _x( 'View', 'noun' ) }>
+							<PreferenceToggleMenuItem
+								scope="core"
+								name="fixedToolbar"
+								onToggle={ turnOffDistractionFree }
+								label={ __( 'Top toolbar' ) }
+								info={ __(
+									'Access all block and document tools in a single place'
+								) }
+								messageActivated={ __(
+									'Top toolbar activated'
+								) }
+								messageDeactivated={ __(
+									'Top toolbar deactivated'
+								) }
+							/>
+							<PreferenceToggleMenuItem
+								scope="core"
+								name="distractionFree"
+								label={ __( 'Distraction free' ) }
+								info={ __( 'Write with calmness' ) }
+								handleToggling={ false }
+								onToggle={ toggleDistractionFree }
+								messageActivated={ __(
+									'Distraction free mode activated'
+								) }
+								messageDeactivated={ __(
+									'Distraction free mode deactivated'
+								) }
+								shortcut={ displayShortcut.primaryShift(
+									'\\'
+								) }
+							/>
+							<PreferenceToggleMenuItem
+								scope="core"
+								name="focusMode"
+								label={ __( 'Spotlight mode' ) }
+								info={ __( 'Focus on one block at a time' ) }
+								messageActivated={ __(
+									'Spotlight mode activated'
+								) }
+								messageDeactivated={ __(
+									'Spotlight mode deactivated'
+								) }
+							/>
+							<ViewMoreMenuGroup.Slot fillProps={ { onClose } } />
+						</MenuGroup>
+						<ModeSwitcher />
+						<ActionItem.Slot
+							name="core/plugin-more-menu"
+							label={ __( 'Plugins' ) }
+							as={ MenuGroup }
+							fillProps={ { onClick: onClose } }
+						/>
+						<MenuGroup label={ __( 'Tools' ) }>
+							<MenuItem
+								onClick={ () =>
+									openModal( 'editor/keyboard-shortcut-help' )
+								}
+								shortcut={ displayShortcut.access( 'h' ) }
+							>
+								{ __( 'Keyboard shortcuts' ) }
+							</MenuItem>
+							<CopyContentMenuItem />
+							<MenuItem
+								icon={ external }
+								href={ __(
+									'https://wordpress.org/documentation/article/wordpress-block-editor/'
+								) }
+								target="_blank"
+								rel="noopener noreferrer"
+							>
+								{ __( 'Help' ) }
+								<VisuallyHidden as="span">
+									{
+										/* translators: accessibility text */
+										__( '(opens in a new tab)' )
+									}
+								</VisuallyHidden>
+							</MenuItem>
+							<ToolsMoreMenuGroup.Slot
+								fillProps={ { onClose } }
+							/>
+						</MenuGroup>
+						<MenuGroup>
+							<MenuItem
+								onClick={ () =>
+									openModal( 'editor/preferences' )
+								}
+							>
+								{ __( 'Preferences' ) }
+							</MenuItem>
+						</MenuGroup>
+					</>
+				) }
+			</DropdownMenu>
+		</>
+	);
+}
diff --git a/packages/editor/src/components/more-menu/tools-more-menu-group.js b/packages/editor/src/components/more-menu/tools-more-menu-group.js
new file mode 100644
index 00000000000000..7dec9d9d490d86
--- /dev/null
+++ b/packages/editor/src/components/more-menu/tools-more-menu-group.js
@@ -0,0 +1,11 @@
+/**
+ * WordPress dependencies
+ */
+import { createSlotFill } from '@wordpress/components';
+
+const { Fill: ToolsMoreMenuGroup, Slot } =
+	createSlotFill( 'ToolsMoreMenuGroup' );
+
+ToolsMoreMenuGroup.Slot = ( { fillProps } ) => <Slot fillProps={ fillProps } />;
+
+export default ToolsMoreMenuGroup;
diff --git a/packages/editor/src/components/more-menu/view-more-menu-group.js b/packages/editor/src/components/more-menu/view-more-menu-group.js
new file mode 100644
index 00000000000000..23e2cf82d82c6d
--- /dev/null
+++ b/packages/editor/src/components/more-menu/view-more-menu-group.js
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { createSlotFill } from '@wordpress/components';
+import { Platform } from '@wordpress/element';
+
+const { Fill: ViewMoreMenuGroup, Slot } = createSlotFill(
+	Platform.OS === 'web' ? Symbol( 'ViewMoreMenuGroup' ) : 'ViewMoreMenuGroup'
+);
+
+ViewMoreMenuGroup.Slot = ( { fillProps } ) => <Slot fillProps={ fillProps } />;
+
+export default ViewMoreMenuGroup;
diff --git a/packages/editor/src/components/offline-status/index.native.js b/packages/editor/src/components/offline-status/index.native.js
new file mode 100644
index 00000000000000..2e514abb6e091c
--- /dev/null
+++ b/packages/editor/src/components/offline-status/index.native.js
@@ -0,0 +1,99 @@
+/**
+ * External dependencies
+ */
+import { AccessibilityInfo, Text, View } from 'react-native';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	usePreferredColorSchemeStyle,
+	useNetworkConnectivity,
+	usePrevious,
+} from '@wordpress/compose';
+import { Icon } from '@wordpress/components';
+import { offline as offlineIcon } from '@wordpress/icons';
+import { __ } from '@wordpress/i18n';
+import { useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import styles from './style.native.scss';
+
+/**
+ * Conditionally announces messages for screen reader users. This Hook provides
+ * two benefits over React Native's `accessibilityLiveRegion`:
+ *
+ * 1. It works on both iOS and Android.
+ * 2. It allows announcing a secondary message when the component is inactive.
+ *
+ * @param {string}  message                   The message to announce.
+ * @param {Object}  options                   Options for the Hook.
+ * @param {boolean} [options.isActive]        Whether the message should be announced.
+ * @param {string}  [options.inactiveMessage] The message to announce when inactive.
+ */
+function useAccessibilityLiveRegion( message, { isActive, inactiveMessage } ) {
+	const { announceForAccessibility } = AccessibilityInfo;
+	const prevIsActive = usePrevious( isActive );
+
+	useEffect( () => {
+		const unconditionalMessage = typeof isActive === 'undefined';
+		const initialRender = typeof prevIsActive === 'undefined';
+
+		if (
+			unconditionalMessage ||
+			( isActive && ! prevIsActive && ! initialRender )
+		) {
+			announceForAccessibility( message );
+		} else if ( ! isActive && prevIsActive && inactiveMessage ) {
+			announceForAccessibility( inactiveMessage );
+		}
+	}, [
+		message,
+		isActive,
+		prevIsActive,
+		inactiveMessage,
+		announceForAccessibility,
+	] );
+}
+
+const OfflineStatus = () => {
+	const { isConnected } = useNetworkConnectivity();
+
+	useAccessibilityLiveRegion( __( 'Network connection re-established' ), {
+		isActive: isConnected,
+		inactiveMessage: __( 'Network connection lost, working offline' ),
+	} );
+
+	const containerStyle = usePreferredColorSchemeStyle(
+		styles.offline,
+		styles.offline__dark
+	);
+
+	const textStyle = usePreferredColorSchemeStyle(
+		styles[ 'offline--text' ],
+		styles[ 'offline--text__dark' ]
+	);
+
+	const iconStyle = usePreferredColorSchemeStyle(
+		styles[ 'offline--icon' ],
+		styles[ 'offline--icon__dark' ]
+	);
+
+	return ! isConnected ? (
+		<View
+			accessible
+			accessibilityRole="alert"
+			accessibilityLabel={ __(
+				'Network connection lost, working offline'
+			) }
+			style={ containerStyle }
+		>
+			<Icon fill={ iconStyle.fill } icon={ offlineIcon } />
+			<Text style={ textStyle }>{ __( 'Working Offline' ) } </Text>
+		</View>
+	) : null;
+};
+
+export default OfflineStatus;
diff --git a/packages/editor/src/components/offline-status/style.native.scss b/packages/editor/src/components/offline-status/style.native.scss
new file mode 100644
index 00000000000000..529693516653f6
--- /dev/null
+++ b/packages/editor/src/components/offline-status/style.native.scss
@@ -0,0 +1,28 @@
+.offline {
+	background-color: $gray-lighten-30;
+	padding: $grid-unit;
+	justify-content: center;
+	align-items: center;
+	flex-direction: row;
+}
+
+.offline__dark {
+	background-color: $gray-70;
+}
+
+.offline--text {
+	color: $black;
+	padding-left: 3;
+}
+
+.offline--text__dark {
+	color: $white;
+}
+
+.offline--icon {
+	fill: $gray-70;
+}
+
+.offline--icon__dark {
+	fill: $gray-10;
+}
diff --git a/packages/editor/src/components/offline-status/test/index.native.js b/packages/editor/src/components/offline-status/test/index.native.js
new file mode 100644
index 00000000000000..7e8787c4033b01
--- /dev/null
+++ b/packages/editor/src/components/offline-status/test/index.native.js
@@ -0,0 +1,108 @@
+/**
+ * External dependencies
+ */
+import { act, render, screen } from 'test/helpers';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	requestConnectionStatus,
+	subscribeConnectionStatus,
+} from '@wordpress/react-native-bridge';
+
+/**
+ * Internal dependencies
+ */
+import OfflineStatus from '../index';
+import { AccessibilityInfo } from 'react-native';
+
+jest.mock( '../style.native.scss', () => ( {
+	'offline--icon': {
+		fill: '',
+	},
+} ) );
+
+describe( 'when network connectivity is unavailable', () => {
+	beforeAll( () => {
+		requestConnectionStatus.mockImplementation( ( callback ) => {
+			callback( false );
+			return { remove: jest.fn() };
+		} );
+	} );
+
+	it( 'should display a helpful message', () => {
+		render( <OfflineStatus /> );
+
+		expect( screen.getByText( 'Working Offline' ) ).toBeVisible();
+	} );
+
+	it( 'should display an accessible message', () => {
+		render( <OfflineStatus /> );
+
+		expect(
+			screen.getByLabelText( 'Network connection lost, working offline' )
+		).toBeVisible();
+	} );
+
+	it( 'should announce network status', () => {
+		render( <OfflineStatus /> );
+
+		expect(
+			AccessibilityInfo.announceForAccessibility
+		).toHaveBeenCalledWith( 'Network connection lost, working offline' );
+	} );
+
+	it( 'should announce changes to network status', () => {
+		let subscriptionCallback;
+		subscribeConnectionStatus.mockImplementation( ( callback ) => {
+			subscriptionCallback = callback;
+			return { remove: jest.fn() };
+		} );
+		render( <OfflineStatus /> );
+
+		act( () => subscriptionCallback( { isConnected: false } ) );
+
+		expect(
+			AccessibilityInfo.announceForAccessibility
+		).toHaveBeenCalledWith( 'Network connection lost, working offline' );
+	} );
+} );
+
+describe( 'when network connectivity is available', () => {
+	beforeAll( () => {
+		requestConnectionStatus.mockImplementation( ( callback ) => {
+			callback( true );
+			return { remove: jest.fn() };
+		} );
+	} );
+
+	it( 'should not display a helpful message', () => {
+		render( <OfflineStatus /> );
+
+		expect( screen.queryByText( 'Working Offline' ) ).toBeNull();
+	} );
+
+	it( 'should not announce network status', () => {
+		render( <OfflineStatus /> );
+
+		expect(
+			AccessibilityInfo.announceForAccessibility
+		).not.toHaveBeenCalled();
+	} );
+
+	it( 'should announce changes to network status', () => {
+		let subscriptionCallback;
+		subscribeConnectionStatus.mockImplementation( ( callback ) => {
+			subscriptionCallback = callback;
+			return { remove: jest.fn() };
+		} );
+		render( <OfflineStatus /> );
+
+		act( () => subscriptionCallback( { isConnected: false } ) );
+
+		expect(
+			AccessibilityInfo.announceForAccessibility
+		).toHaveBeenCalledWith( 'Network connection lost, working offline' );
+	} );
+} );
diff --git a/packages/editor/src/components/page-attributes/check.js b/packages/editor/src/components/page-attributes/check.js
index 828b91b13f595f..bed2b1a353842a 100644
--- a/packages/editor/src/components/page-attributes/check.js
+++ b/packages/editor/src/components/page-attributes/check.js
@@ -9,6 +9,14 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Wrapper component that renders its children only if the post type supports page attributes.
+ *
+ * @param {Object}  props          - The component props.
+ * @param {Element} props.children - The child components to render.
+ *
+ * @return {Component|null} The rendered child components or null if page attributes are not supported.
+ */
 export function PageAttributesCheck( { children } ) {
 	const supportsPageAttributes = useSelect( ( select ) => {
 		const { getEditedPostAttribute } = select( editorStore );
diff --git a/packages/editor/src/components/page-attributes/order.js b/packages/editor/src/components/page-attributes/order.js
index 4a751c0b151aba..c5f02c71b613d4 100644
--- a/packages/editor/src/components/page-attributes/order.js
+++ b/packages/editor/src/components/page-attributes/order.js
@@ -41,9 +41,10 @@ function PageAttributesOrder() {
 				<NumberControl
 					__next40pxDefaultSize
 					label={ __( 'Order' ) }
+					help={ __( 'Set the page order.' ) }
 					value={ value }
 					onChange={ setUpdatedOrder }
-					labelPosition="side"
+					hideLabelFromVision
 					onBlur={ () => {
 						setOrderInput( null );
 					} }
@@ -53,6 +54,13 @@ function PageAttributesOrder() {
 	);
 }
 
+/**
+ * Renders the Page Attributes Order component. A number input in an editor interface
+ * for setting the order of a given page.
+ * The component is now not used in core but was kept for backward compatibility.
+ *
+ * @return {Component} The component to be rendered.
+ */
 export default function PageAttributesOrderWithChecks() {
 	return (
 		<PostTypeSupportCheck supportKeys="page-attributes">
diff --git a/packages/editor/src/components/page-attributes/panel.js b/packages/editor/src/components/page-attributes/panel.js
new file mode 100644
index 00000000000000..7fcaf4b90d9ffe
--- /dev/null
+++ b/packages/editor/src/components/page-attributes/panel.js
@@ -0,0 +1,44 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import PageAttributesCheck from './check';
+import { ParentRow } from './parent';
+
+const PANEL_NAME = 'page-attributes';
+
+function AttributesPanel() {
+	const { isEnabled, postType } = useSelect( ( select ) => {
+		const { getEditedPostAttribute, isEditorPanelEnabled } =
+			select( editorStore );
+		const { getPostType } = select( coreStore );
+		return {
+			isEnabled: isEditorPanelEnabled( PANEL_NAME ),
+			postType: getPostType( getEditedPostAttribute( 'type' ) ),
+		};
+	}, [] );
+
+	if ( ! isEnabled || ! postType ) {
+		return null;
+	}
+
+	return <ParentRow />;
+}
+
+/**
+ * Renders the Page Attributes Panel component.
+ *
+ * @return {Component} The component to be rendered.
+ */
+export default function PageAttributesPanel() {
+	return (
+		<PageAttributesCheck>
+			<AttributesPanel />
+		</PageAttributesCheck>
+	);
+}
diff --git a/packages/editor/src/components/page-attributes/parent.js b/packages/editor/src/components/page-attributes/parent.js
index b1f9e15ff45e87..0f19ffcdd5daa4 100644
--- a/packages/editor/src/components/page-attributes/parent.js
+++ b/packages/editor/src/components/page-attributes/parent.js
@@ -6,17 +6,29 @@ import removeAccents from 'remove-accents';
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
-import { ComboboxControl } from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+import {
+	Button,
+	Dropdown,
+	ComboboxControl,
+	ExternalLink,
+} from '@wordpress/components';
 import { debounce } from '@wordpress/compose';
-import { useState, useMemo } from '@wordpress/element';
+import {
+	createInterpolateElement,
+	useState,
+	useMemo,
+} from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { decodeEntities } from '@wordpress/html-entities';
 import { store as coreStore } from '@wordpress/core-data';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+import { filterURLForDisplay } from '@wordpress/url';
 
 /**
  * Internal dependencies
  */
+import PostPanelRow from '../post-panel-row';
 import { buildTermsTree } from '../../utils/terms';
 import { store as editorStore } from '../../store';
 
@@ -40,6 +52,12 @@ export const getItemPriority = ( name, searchValue ) => {
 	return Infinity;
 };
 
+/**
+ * Renders the Page Attributes Parent component. A dropdown menu in an editor interface
+ * for selecting the parent page of a given page.
+ *
+ * @return {Component|null} The component to be rendered. Return null if post type is not hierarchical.
+ */
 export function PageAttributesParent() {
 	const { editPost } = useDispatch( editorStore );
 	const [ fieldValue, setFieldValue ] = useState( false );
@@ -163,12 +181,122 @@ export function PageAttributesParent() {
 			__next40pxDefaultSize
 			className="editor-page-attributes__parent"
 			label={ __( 'Parent' ) }
+			help={ __( 'Choose a parent page.' ) }
 			value={ parentPostId }
 			options={ parentOptions }
 			onFilterValueChange={ debounce( handleKeydown, 300 ) }
 			onChange={ handleChange }
+			hideLabelFromVision
 		/>
 	);
 }
 
+function PostParentToggle( { isOpen, onClick } ) {
+	const parentPost = useSelect( ( select ) => {
+		const { getEditedPostAttribute } = select( editorStore );
+		const parentPostId = getEditedPostAttribute( 'parent' );
+		if ( ! parentPostId ) {
+			return null;
+		}
+		const { getEntityRecord } = select( coreStore );
+		const postTypeSlug = getEditedPostAttribute( 'type' );
+		return getEntityRecord( 'postType', postTypeSlug, parentPostId );
+	}, [] );
+	const parentTitle = useMemo(
+		() => ( ! parentPost ? __( 'None' ) : getTitle( parentPost ) ),
+		[ parentPost ]
+	);
+	return (
+		<Button
+			size="compact"
+			className="editor-post-parent__panel-toggle"
+			variant="tertiary"
+			aria-expanded={ isOpen }
+			// translators: %s: Current post parent.
+			aria-label={ sprintf( __( 'Change parent: %s' ), parentTitle ) }
+			onClick={ onClick }
+		>
+			{ parentTitle }
+		</Button>
+	);
+}
+
+export function ParentRow() {
+	const homeUrl = useSelect( ( select ) => {
+		// Site index.
+		return select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+			?.home;
+	}, [] );
+	// Use internal state instead of a ref to make sure that the component
+	// re-renders when the popover's anchor updates.
+	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor ]
+	);
+	return (
+		<PostPanelRow label={ __( 'Parent' ) } ref={ setPopoverAnchor }>
+			<Dropdown
+				popoverProps={ popoverProps }
+				className="editor-post-parent__panel-dropdown"
+				contentClassName="editor-post-parent__panel-dialog"
+				focusOnMount
+				renderToggle={ ( { isOpen, onToggle } ) => (
+					<PostParentToggle isOpen={ isOpen } onClick={ onToggle } />
+				) }
+				renderContent={ ( { onClose } ) => (
+					<div className="editor-post-parent">
+						<InspectorPopoverHeader
+							title={ __( 'Parent' ) }
+							onClose={ onClose }
+						/>
+						<div>
+							{ createInterpolateElement(
+								sprintf(
+									/* translators: %1$s The home URL of the WordPress installation without the scheme. */
+									__(
+										'Child pages inherit characteristics from their parent, such as URL structure. For instance, if "Pricing" is a child of "Services", its URL would be %1$s<wbr />/services<wbr />/pricing.'
+									),
+									filterURLForDisplay( homeUrl ).replace(
+										/([/.])/g,
+										'<wbr />$1'
+									)
+								),
+								{
+									wbr: <wbr />,
+								}
+							) }
+							<p>
+								{ createInterpolateElement(
+									__(
+										'They also show up as sub-items in the default navigation menu. <a>Learn more.</a>'
+									),
+									{
+										a: (
+											<ExternalLink
+												href={ __(
+													'https://wordpress.org/documentation/article/page-post-settings-sidebar/#page-attributes'
+												) }
+											/>
+										),
+									}
+								) }
+							</p>
+						</div>
+						<PageAttributesParent />
+					</div>
+				) }
+			/>
+		</PostPanelRow>
+	);
+}
+
 export default PageAttributesParent;
diff --git a/packages/editor/src/components/page-attributes/style.scss b/packages/editor/src/components/page-attributes/style.scss
new file mode 100644
index 00000000000000..6563462a65bc23
--- /dev/null
+++ b/packages/editor/src/components/page-attributes/style.scss
@@ -0,0 +1,19 @@
+.editor-post-parent__panel,
+.editor-post-order__panel {
+	padding-top: $grid-unit-10;
+	.editor-post-panel__row-control > div {
+		width: 100%;
+	}
+}
+
+.editor-post-parent__panel-dialog,
+.editor-post-order__panel-dialog {
+	.editor-post-parent,
+	.editor-post-order {
+		margin: $grid-unit-10;
+	}
+
+	.components-popover__content {
+		min-width: 320px;
+	}
+}
diff --git a/packages/editor/src/components/page-attributes/test/order.js b/packages/editor/src/components/page-attributes/test/order.js
index 245cbbb8fc71db..fcb836bbfef0d3 100644
--- a/packages/editor/src/components/page-attributes/test/order.js
+++ b/packages/editor/src/components/page-attributes/test/order.js
@@ -22,7 +22,11 @@ jest.mock( '@wordpress/data/src/components/use-dispatch', () => ( {
 function setupDataMock( order = 0 ) {
 	useSelect.mockImplementation( ( mapSelect ) =>
 		mapSelect( () => ( {
-			getPostType: () => null,
+			getPostType: () => ( {
+				supports: {
+					'page-attributes': true,
+				},
+			} ),
 			getEditedPostAttribute: ( attr ) => {
 				switch ( attr ) {
 					case 'menu_order':
diff --git a/packages/editor/src/components/pattern-duplicate-modal/index.js b/packages/editor/src/components/pattern-duplicate-modal/index.js
new file mode 100644
index 00000000000000..2e5593536d1834
--- /dev/null
+++ b/packages/editor/src/components/pattern-duplicate-modal/index.js
@@ -0,0 +1,50 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect } from '@wordpress/data';
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
+import { store as coreStore } from '@wordpress/core-data';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+import { PATTERN_POST_TYPE } from '../../store/constants';
+
+const { DuplicatePatternModal } = unlock( patternsPrivateApis );
+export const modalName = 'editor/pattern-duplicate';
+
+export default function PatternDuplicateModal() {
+	const { record, postType } = useSelect( ( select ) => {
+		const { getCurrentPostType, getCurrentPostId } = select( editorStore );
+		const { getEditedEntityRecord } = select( coreStore );
+		const _postType = getCurrentPostType();
+		return {
+			record: getEditedEntityRecord(
+				'postType',
+				_postType,
+				getCurrentPostId()
+			),
+			postType: _postType,
+		};
+	}, [] );
+	const { closeModal } = useDispatch( interfaceStore );
+
+	const isActive = useSelect( ( select ) =>
+		select( interfaceStore ).isModalActive( modalName )
+	);
+
+	if ( ! isActive || postType !== PATTERN_POST_TYPE ) {
+		return null;
+	}
+
+	return (
+		<DuplicatePatternModal
+			onClose={ closeModal }
+			onSuccess={ () => closeModal() }
+			pattern={ record }
+		/>
+	);
+}
diff --git a/packages/editor/src/components/pattern-overrides-panel/index.js b/packages/editor/src/components/pattern-overrides-panel/index.js
new file mode 100644
index 00000000000000..47cd6282b3fedd
--- /dev/null
+++ b/packages/editor/src/components/pattern-overrides-panel/index.js
@@ -0,0 +1,26 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const { OverridesPanel } = unlock( patternsPrivateApis );
+
+export default function PatternOverridesPanel() {
+	const supportsPatternOverridesPanel = useSelect(
+		( select ) => select( editorStore ).getCurrentPostType() === 'wp_block',
+		[]
+	);
+
+	if ( ! supportsPatternOverridesPanel ) {
+		return null;
+	}
+
+	return <OverridesPanel />;
+}
diff --git a/packages/editor/src/components/pattern-rename-modal/index.js b/packages/editor/src/components/pattern-rename-modal/index.js
new file mode 100644
index 00000000000000..ea9a46e977b240
--- /dev/null
+++ b/packages/editor/src/components/pattern-rename-modal/index.js
@@ -0,0 +1,44 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect } from '@wordpress/data';
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
+import { store as coreStore } from '@wordpress/core-data';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+import { PATTERN_POST_TYPE } from '../../store/constants';
+
+const { RenamePatternModal } = unlock( patternsPrivateApis );
+export const modalName = 'editor/pattern-rename';
+
+export default function PatternRenameModal() {
+	const { record, postType } = useSelect( ( select ) => {
+		const { getCurrentPostType, getCurrentPostId } = select( editorStore );
+		const { getEditedEntityRecord } = select( coreStore );
+		const _postType = getCurrentPostType();
+		return {
+			record: getEditedEntityRecord(
+				'postType',
+				_postType,
+				getCurrentPostId()
+			),
+			postType: _postType,
+		};
+	}, [] );
+	const { closeModal } = useDispatch( interfaceStore );
+
+	const isActive = useSelect( ( select ) =>
+		select( interfaceStore ).isModalActive( modalName )
+	);
+
+	if ( ! isActive || postType !== PATTERN_POST_TYPE ) {
+		return null;
+	}
+
+	return <RenamePatternModal onClose={ closeModal } pattern={ record } />;
+}
diff --git a/packages/editor/src/components/plugin-document-setting-panel/index.js b/packages/editor/src/components/plugin-document-setting-panel/index.js
new file mode 100644
index 00000000000000..7466acffc0c4b1
--- /dev/null
+++ b/packages/editor/src/components/plugin-document-setting-panel/index.js
@@ -0,0 +1,121 @@
+/**
+ * WordPress dependencies
+ */
+import { createSlotFill, PanelBody } from '@wordpress/components';
+import { usePluginContext } from '@wordpress/plugins';
+import { useDispatch, useSelect } from '@wordpress/data';
+import warning from '@wordpress/warning';
+
+/**
+ * Internal dependencies
+ */
+import EnablePluginDocumentSettingPanelOption from '../preferences-modal/enable-plugin-document-setting-panel';
+import { store as editorStore } from '../../store';
+
+const { Fill, Slot } = createSlotFill( 'PluginDocumentSettingPanel' );
+
+/**
+ * Renders items below the Status & Availability panel in the Document Sidebar.
+ *
+ * @param {Object}                props                                 Component properties.
+ * @param {string}                props.name                            Required. A machine-friendly name for the panel.
+ * @param {string}                [props.className]                     An optional class name added to the row.
+ * @param {string}                [props.title]                         The title of the panel
+ * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
+ * @param {Element}               props.children                        Children to be rendered
+ *
+ * @example
+ * ```js
+ * // Using ES5 syntax
+ * var el = React.createElement;
+ * var __ = wp.i18n.__;
+ * var registerPlugin = wp.plugins.registerPlugin;
+ * var PluginDocumentSettingPanel = wp.editor.PluginDocumentSettingPanel;
+ *
+ * function MyDocumentSettingPlugin() {
+ * 	return el(
+ * 		PluginDocumentSettingPanel,
+ * 		{
+ * 			className: 'my-document-setting-plugin',
+ * 			title: 'My Panel',
+ * 			name: 'my-panel',
+ * 		},
+ * 		__( 'My Document Setting Panel' )
+ * 	);
+ * }
+ *
+ * registerPlugin( 'my-document-setting-plugin', {
+ * 		render: MyDocumentSettingPlugin
+ * } );
+ * ```
+ *
+ * @example
+ * ```jsx
+ * // Using ESNext syntax
+ * import { registerPlugin } from '@wordpress/plugins';
+ * import { PluginDocumentSettingPanel } from '@wordpress/editor';
+ *
+ * const MyDocumentSettingTest = () => (
+ * 		<PluginDocumentSettingPanel className="my-document-setting-plugin" title="My Panel" name="my-panel">
+ *			<p>My Document Setting Panel</p>
+ *		</PluginDocumentSettingPanel>
+ *	);
+ *
+ *  registerPlugin( 'document-setting-test', { render: MyDocumentSettingTest } );
+ * ```
+ *
+ * @return {Component} The component to be rendered.
+ */
+const PluginDocumentSettingPanel = ( {
+	name,
+	className,
+	title,
+	icon,
+	children,
+} ) => {
+	const { name: pluginName } = usePluginContext();
+	const panelName = `${ pluginName }/${ name }`;
+	const { opened, isEnabled } = useSelect(
+		( select ) => {
+			const { isEditorPanelOpened, isEditorPanelEnabled } =
+				select( editorStore );
+
+			return {
+				opened: isEditorPanelOpened( panelName ),
+				isEnabled: isEditorPanelEnabled( panelName ),
+			};
+		},
+		[ panelName ]
+	);
+	const { toggleEditorPanelOpened } = useDispatch( editorStore );
+
+	if ( undefined === name ) {
+		warning( 'PluginDocumentSettingPanel requires a name property.' );
+	}
+
+	return (
+		<>
+			<EnablePluginDocumentSettingPanelOption
+				label={ title }
+				panelName={ panelName }
+			/>
+			<Fill>
+				{ isEnabled && (
+					<PanelBody
+						className={ className }
+						title={ title }
+						icon={ icon }
+						opened={ opened }
+						onToggle={ () => toggleEditorPanelOpened( panelName ) }
+					>
+						{ children }
+					</PanelBody>
+				) }
+			</Fill>
+		</>
+	);
+};
+
+PluginDocumentSettingPanel.Slot = Slot;
+
+export default PluginDocumentSettingPanel;
diff --git a/packages/editor/src/components/plugin-more-menu-item/index.js b/packages/editor/src/components/plugin-more-menu-item/index.js
new file mode 100644
index 00000000000000..28173c24ebcefa
--- /dev/null
+++ b/packages/editor/src/components/plugin-more-menu-item/index.js
@@ -0,0 +1,74 @@
+/**
+ * WordPress dependencies
+ */
+import { MenuItem } from '@wordpress/components';
+import { usePluginContext } from '@wordpress/plugins';
+import { ActionItem } from '@wordpress/interface';
+
+/**
+ * Renders a menu item in `Plugins` group in `More Menu` drop down, and can be used to as a button or link depending on the props provided.
+ * The text within the component appears as the menu item label.
+ *
+ * @param {Object}                props                                 Component properties.
+ * @param {string}                [props.href]                          When `href` is provided then the menu item is represented as an anchor rather than button. It corresponds to the `href` attribute of the anchor.
+ * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
+ * @param {Function}              [props.onClick=noop]                  The callback function to be executed when the user clicks the menu item.
+ * @param {...*}                  [props.other]                         Any additional props are passed through to the underlying [Button](/packages/components/src/button/README.md) component.
+ *
+ * @example
+ * ```js
+ * // Using ES5 syntax
+ * var __ = wp.i18n.__;
+ * var PluginMoreMenuItem = wp.editor.PluginMoreMenuItem;
+ * var moreIcon = wp.element.createElement( 'svg' ); //... svg element.
+ *
+ * function onButtonClick() {
+ * 	alert( 'Button clicked.' );
+ * }
+ *
+ * function MyButtonMoreMenuItem() {
+ * 	return wp.element.createElement(
+ * 		PluginMoreMenuItem,
+ * 		{
+ * 			icon: moreIcon,
+ * 			onClick: onButtonClick,
+ * 		},
+ * 		__( 'My button title' )
+ * 	);
+ * }
+ * ```
+ *
+ * @example
+ * ```jsx
+ * // Using ESNext syntax
+ * import { __ } from '@wordpress/i18n';
+ * import { PluginMoreMenuItem } from '@wordpress/editor';
+ * import { more } from '@wordpress/icons';
+ *
+ * function onButtonClick() {
+ * 	alert( 'Button clicked.' );
+ * }
+ *
+ * const MyButtonMoreMenuItem = () => (
+ * 	<PluginMoreMenuItem
+ * 		icon={ more }
+ * 		onClick={ onButtonClick }
+ * 	>
+ * 		{ __( 'My button title' ) }
+ * 	</PluginMoreMenuItem>
+ * );
+ * ```
+ *
+ * @return {Component} The component to be rendered.
+ */
+export default function PluginMoreMenuItem( props ) {
+	const context = usePluginContext();
+	return (
+		<ActionItem
+			name="core/plugin-more-menu"
+			as={ props.as ?? MenuItem }
+			icon={ props.icon || context.icon }
+			{ ...props }
+		/>
+	);
+}
diff --git a/packages/editor/src/components/plugin-post-publish-panel/index.js b/packages/editor/src/components/plugin-post-publish-panel/index.js
new file mode 100644
index 00000000000000..086045b1c1fee1
--- /dev/null
+++ b/packages/editor/src/components/plugin-post-publish-panel/index.js
@@ -0,0 +1,64 @@
+/**
+ * WordPress dependencies
+ */
+import { usePluginContext } from '@wordpress/plugins';
+import { createSlotFill, PanelBody } from '@wordpress/components';
+
+const { Fill, Slot } = createSlotFill( 'PluginPostPublishPanel' );
+
+/**
+ * Renders provided content to the post-publish panel in the publish flow
+ * (side panel that opens after a user publishes the post).
+ *
+ * @param {Object}                props                                 Component properties.
+ * @param {string}                [props.className]                     An optional class name added to the panel.
+ * @param {string}                [props.title]                         Title displayed at the top of the panel.
+ * @param {boolean}               [props.initialOpen=false]             Whether to have the panel initially opened. When no title is provided it is always opened.
+ * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
+ * @param {Element}               props.children                        Children to be rendered
+ *
+ * @example
+ * ```jsx
+ * // Using ESNext syntax
+ * import { __ } from '@wordpress/i18n';
+ * import { PluginPostPublishPanel } from '@wordpress/editor';
+ *
+ * const MyPluginPostPublishPanel = () => (
+ * 	<PluginPostPublishPanel
+ * 		className="my-plugin-post-publish-panel"
+ * 		title={ __( 'My panel title' ) }
+ * 		initialOpen={ true }
+ * 	>
+ *         { __( 'My panel content' ) }
+ * 	</PluginPostPublishPanel>
+ * );
+ * ```
+ *
+ * @return {Component} The component to be rendered.
+ */
+const PluginPostPublishPanel = ( {
+	children,
+	className,
+	title,
+	initialOpen = false,
+	icon,
+} ) => {
+	const { icon: pluginIcon } = usePluginContext();
+
+	return (
+		<Fill>
+			<PanelBody
+				className={ className }
+				initialOpen={ initialOpen || ! title }
+				title={ title }
+				icon={ icon ?? pluginIcon }
+			>
+				{ children }
+			</PanelBody>
+		</Fill>
+	);
+};
+
+PluginPostPublishPanel.Slot = Slot;
+
+export default PluginPostPublishPanel;
diff --git a/packages/edit-post/src/components/sidebar/plugin-post-publish-panel/test/__snapshots__/index.js.snap b/packages/editor/src/components/plugin-post-publish-panel/test/__snapshots__/index.js.snap
similarity index 100%
rename from packages/edit-post/src/components/sidebar/plugin-post-publish-panel/test/__snapshots__/index.js.snap
rename to packages/editor/src/components/plugin-post-publish-panel/test/__snapshots__/index.js.snap
diff --git a/packages/editor/src/components/plugin-post-publish-panel/test/index.js b/packages/editor/src/components/plugin-post-publish-panel/test/index.js
new file mode 100644
index 00000000000000..ca3d6a17181dbc
--- /dev/null
+++ b/packages/editor/src/components/plugin-post-publish-panel/test/index.js
@@ -0,0 +1,33 @@
+/**
+ * External dependencies
+ */
+import { render } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import { SlotFillProvider } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import PluginPostPublishPanel from '../';
+
+describe( 'PluginPostPublishPanel', () => {
+	test( 'renders fill properly', () => {
+		const { container } = render(
+			<SlotFillProvider>
+				<PluginPostPublishPanel
+					className="my-plugin-post-publish-panel"
+					title="My panel title"
+					initialOpen
+				>
+					My panel content
+				</PluginPostPublishPanel>
+				<PluginPostPublishPanel.Slot />
+			</SlotFillProvider>
+		);
+
+		expect( container ).toMatchSnapshot();
+	} );
+} );
diff --git a/packages/editor/src/components/plugin-post-status-info/index.js b/packages/editor/src/components/plugin-post-status-info/index.js
new file mode 100644
index 00000000000000..a4a216b78ae78b
--- /dev/null
+++ b/packages/editor/src/components/plugin-post-status-info/index.js
@@ -0,0 +1,63 @@
+/**
+ * Defines as extensibility slot for the Summary panel.
+ */
+
+/**
+ * WordPress dependencies
+ */
+import { createSlotFill, PanelRow } from '@wordpress/components';
+
+const { Fill, Slot } = createSlotFill( 'PluginPostStatusInfo' );
+
+/**
+ * Renders a row in the Summary panel of the Document sidebar.
+ * It should be noted that this is named and implemented around the function it serves
+ * and not its location, which may change in future iterations.
+ *
+ * @param {Object}  props             Component properties.
+ * @param {string}  [props.className] An optional class name added to the row.
+ * @param {Element} props.children    Children to be rendered.
+ *
+ * @example
+ * ```js
+ * // Using ES5 syntax
+ * var __ = wp.i18n.__;
+ * var PluginPostStatusInfo = wp.editor.PluginPostStatusInfo;
+ *
+ * function MyPluginPostStatusInfo() {
+ * 	return React.createElement(
+ * 		PluginPostStatusInfo,
+ * 		{
+ * 			className: 'my-plugin-post-status-info',
+ * 		},
+ * 		__( 'My post status info' )
+ * 	)
+ * }
+ * ```
+ *
+ * @example
+ * ```jsx
+ * // Using ESNext syntax
+ * import { __ } from '@wordpress/i18n';
+ * import { PluginPostStatusInfo } from '@wordpress/editor';
+ *
+ * const MyPluginPostStatusInfo = () => (
+ * 	<PluginPostStatusInfo
+ * 		className="my-plugin-post-status-info"
+ * 	>
+ * 		{ __( 'My post status info' ) }
+ * 	</PluginPostStatusInfo>
+ * );
+ * ```
+ *
+ * @return {Component} The component to be rendered.
+ */
+const PluginPostStatusInfo = ( { children, className } ) => (
+	<Fill>
+		<PanelRow className={ className }>{ children }</PanelRow>
+	</Fill>
+);
+
+PluginPostStatusInfo.Slot = Slot;
+
+export default PluginPostStatusInfo;
diff --git a/packages/editor/src/components/plugin-pre-publish-panel/index.js b/packages/editor/src/components/plugin-pre-publish-panel/index.js
new file mode 100644
index 00000000000000..c9f556dc534a80
--- /dev/null
+++ b/packages/editor/src/components/plugin-pre-publish-panel/index.js
@@ -0,0 +1,67 @@
+/**
+ * WordPress dependencies
+ */
+import { createSlotFill, PanelBody } from '@wordpress/components';
+import { usePluginContext } from '@wordpress/plugins';
+
+const { Fill, Slot } = createSlotFill( 'PluginPrePublishPanel' );
+
+/**
+ * Renders provided content to the pre-publish side panel in the publish flow
+ * (side panel that opens when a user first pushes "Publish" from the main editor).
+ *
+ * @param {Object}                props                                 Component props.
+ * @param {string}                [props.className]                     An optional class name added to the panel.
+ * @param {string}                [props.title]                         Title displayed at the top of the panel.
+ * @param {boolean}               [props.initialOpen=false]             Whether to have the panel initially opened.
+ *                                                                      When no title is provided it is always opened.
+ * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/)
+ *                                                                      icon slug string, or an SVG WP element, to be rendered when
+ *                                                                      the sidebar is pinned to toolbar.
+ * @param {Element}               props.children                        Children to be rendered
+ *
+ * @example
+ * ```jsx
+ * // Using ESNext syntax
+ * import { __ } from '@wordpress/i18n';
+ * import { PluginPrePublishPanel } from '@wordpress/editor';
+ *
+ * const MyPluginPrePublishPanel = () => (
+ * 	<PluginPrePublishPanel
+ * 		className="my-plugin-pre-publish-panel"
+ * 		title={ __( 'My panel title' ) }
+ * 		initialOpen={ true }
+ * 	>
+ * 	    { __( 'My panel content' ) }
+ * 	</PluginPrePublishPanel>
+ * );
+ * ```
+ *
+ * @return {Component} The component to be rendered.
+ */
+const PluginPrePublishPanel = ( {
+	children,
+	className,
+	title,
+	initialOpen = false,
+	icon,
+} ) => {
+	const { icon: pluginIcon } = usePluginContext();
+
+	return (
+		<Fill>
+			<PanelBody
+				className={ className }
+				initialOpen={ initialOpen || ! title }
+				title={ title }
+				icon={ icon ?? pluginIcon }
+			>
+				{ children }
+			</PanelBody>
+		</Fill>
+	);
+};
+
+PluginPrePublishPanel.Slot = Slot;
+
+export default PluginPrePublishPanel;
diff --git a/packages/edit-post/src/components/sidebar/plugin-pre-publish-panel/test/index.js b/packages/editor/src/components/plugin-pre-publish-panel/test/index.js
similarity index 100%
rename from packages/edit-post/src/components/sidebar/plugin-pre-publish-panel/test/index.js
rename to packages/editor/src/components/plugin-pre-publish-panel/test/index.js
diff --git a/packages/editor/src/components/plugin-preview-menu-item/index.js b/packages/editor/src/components/plugin-preview-menu-item/index.js
new file mode 100644
index 00000000000000..8038da04595aae
--- /dev/null
+++ b/packages/editor/src/components/plugin-preview-menu-item/index.js
@@ -0,0 +1,53 @@
+/**
+ * WordPress dependencies
+ */
+import { MenuItem } from '@wordpress/components';
+import { usePluginContext } from '@wordpress/plugins';
+import { ActionItem } from '@wordpress/interface';
+
+/**
+ * Renders a menu item in the Preview dropdown, which can be used as a button or link depending on the props provided.
+ * The text within the component appears as the menu item label.
+ *
+ * @param {Object}                props                                 Component properties.
+ * @param {string}                [props.href]                          When `href` is provided, the menu item is rendered as an anchor instead of a button. It corresponds to the `href` attribute of the anchor.
+ * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The icon to be rendered to the left of the menu item label. Can be a Dashicon slug or an SVG WP element.
+ * @param {Function}              [props.onClick]                       The callback function to be executed when the user clicks the menu item.
+ * @param {...*}                  [props.other]                         Any additional props are passed through to the underlying MenuItem component.
+ *
+ * @example
+ * ```jsx
+ * import { __ } from '@wordpress/i18n';
+ * import { PluginPreviewMenuItem } from '@wordpress/editor';
+ * import { external } from '@wordpress/icons';
+ *
+ * function onPreviewClick() {
+ *   // Handle preview action
+ * }
+ *
+ * const ExternalPreviewMenuItem = () => (
+ *   <PluginPreviewMenuItem
+ *     icon={ external }
+ *     onClick={ onPreviewClick }
+ *   >
+ *     { __( 'Preview in new tab' ) }
+ *   </PluginPreviewMenuItem>
+ * );
+ * registerPlugin( 'external-preview-menu-item', {
+ *     render: ExternalPreviewMenuItem,
+ * } );
+ * ```
+ *
+ * @return {Component} The rendered menu item component.
+ */
+export default function PluginPreviewMenuItem( props ) {
+	const context = usePluginContext();
+	return (
+		<ActionItem
+			name="core/plugin-preview-menu"
+			as={ props.as ?? MenuItem }
+			icon={ props.icon || context.icon }
+			{ ...props }
+		/>
+	);
+}
diff --git a/packages/editor/src/components/plugin-sidebar-more-menu-item/index.js b/packages/editor/src/components/plugin-sidebar-more-menu-item/index.js
new file mode 100644
index 00000000000000..0d7695c9abfe12
--- /dev/null
+++ b/packages/editor/src/components/plugin-sidebar-more-menu-item/index.js
@@ -0,0 +1,64 @@
+/**
+ * WordPress dependencies
+ */
+import { ComplementaryAreaMoreMenuItem } from '@wordpress/interface';
+
+/**
+ * Renders a menu item in `Plugins` group in `More Menu` drop down,
+ * and can be used to activate the corresponding `PluginSidebar` component.
+ * The text within the component appears as the menu item label.
+ *
+ * @param {Object}                props                                 Component props.
+ * @param {string}                props.target                          A string identifying the target sidebar you wish to be activated by this menu item. Must be the same as the `name` prop you have given to that sidebar.
+ * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered to the left of the menu item label.
+ *
+ * @example
+ * ```js
+ * // Using ES5 syntax
+ * var __ = wp.i18n.__;
+ * var PluginSidebarMoreMenuItem = wp.editor.PluginSidebarMoreMenuItem;
+ * var moreIcon = React.createElement( 'svg' ); //... svg element.
+ *
+ * function MySidebarMoreMenuItem() {
+ * 	return React.createElement(
+ * 		PluginSidebarMoreMenuItem,
+ * 		{
+ * 			target: 'my-sidebar',
+ * 			icon: moreIcon,
+ * 		},
+ * 		__( 'My sidebar title' )
+ * 	)
+ * }
+ * ```
+ *
+ * @example
+ * ```jsx
+ * // Using ESNext syntax
+ * import { __ } from '@wordpress/i18n';
+ * import { PluginSidebarMoreMenuItem } from '@wordpress/editor';
+ * import { more } from '@wordpress/icons';
+ *
+ * const MySidebarMoreMenuItem = () => (
+ * 	<PluginSidebarMoreMenuItem
+ * 		target="my-sidebar"
+ * 		icon={ more }
+ * 	>
+ * 		{ __( 'My sidebar title' ) }
+ * 	</PluginSidebarMoreMenuItem>
+ * );
+ * ```
+ *
+ * @return {Component} The component to be rendered.
+ */
+
+export default function PluginSidebarMoreMenuItem( props ) {
+	return (
+		<ComplementaryAreaMoreMenuItem
+			// Menu item is marked with unstable prop for backward compatibility.
+			// @see https://github.com/WordPress/gutenberg/issues/14457
+			__unstableExplicitMenuItem
+			scope="core"
+			{ ...props }
+		/>
+	);
+}
diff --git a/packages/editor/src/components/plugin-sidebar/index.js b/packages/editor/src/components/plugin-sidebar/index.js
new file mode 100644
index 00000000000000..5cd61a3747e6c1
--- /dev/null
+++ b/packages/editor/src/components/plugin-sidebar/index.js
@@ -0,0 +1,80 @@
+/**
+ * WordPress dependencies
+ */
+import { ComplementaryArea } from '@wordpress/interface';
+
+/**
+ * Renders a sidebar when activated. The contents within the `PluginSidebar` will appear as content within the sidebar.
+ * It also automatically renders a corresponding `PluginSidebarMenuItem` component when `isPinnable` flag is set to `true`.
+ * If you wish to display the sidebar, you can with use the `PluginSidebarMoreMenuItem` component or the `wp.data.dispatch` API:
+ *
+ * ```js
+ * wp.data.dispatch( 'core/edit-post' ).openGeneralSidebar( 'plugin-name/sidebar-name' );
+ * ```
+ *
+ * @see PluginSidebarMoreMenuItem
+ *
+ * @param {Object}                props                                 Element props.
+ * @param {string}                props.name                            A string identifying the sidebar. Must be unique for every sidebar registered within the scope of your plugin.
+ * @param {string}                [props.className]                     An optional class name added to the sidebar body.
+ * @param {string}                props.title                           Title displayed at the top of the sidebar.
+ * @param {boolean}               [props.isPinnable=true]               Whether to allow to pin sidebar to the toolbar. When set to `true` it also automatically renders a corresponding menu item.
+ * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
+ *
+ * @example
+ * ```js
+ * // Using ES5 syntax
+ * var __ = wp.i18n.__;
+ * var el = React.createElement;
+ * var PanelBody = wp.components.PanelBody;
+ * var PluginSidebar = wp.editor.PluginSidebar;
+ * var moreIcon = React.createElement( 'svg' ); //... svg element.
+ *
+ * function MyPluginSidebar() {
+ * 	return el(
+ * 			PluginSidebar,
+ * 			{
+ * 				name: 'my-sidebar',
+ * 				title: 'My sidebar title',
+ * 				icon: moreIcon,
+ * 			},
+ * 			el(
+ * 				PanelBody,
+ * 				{},
+ * 				__( 'My sidebar content' )
+ * 			)
+ * 	);
+ * }
+ * ```
+ *
+ * @example
+ * ```jsx
+ * // Using ESNext syntax
+ * import { __ } from '@wordpress/i18n';
+ * import { PanelBody } from '@wordpress/components';
+ * import { PluginSidebar } from '@wordpress/editor';
+ * import { more } from '@wordpress/icons';
+ *
+ * const MyPluginSidebar = () => (
+ * 	<PluginSidebar
+ * 		name="my-sidebar"
+ * 		title="My sidebar title"
+ * 		icon={ more }
+ * 	>
+ * 		<PanelBody>
+ * 			{ __( 'My sidebar content' ) }
+ * 		</PanelBody>
+ * 	</PluginSidebar>
+ * );
+ * ```
+ */
+export default function PluginSidebar( { className, ...props } ) {
+	return (
+		<ComplementaryArea
+			panelClassName={ className }
+			className="editor-sidebar"
+			scope="core"
+			{ ...props }
+		/>
+	);
+}
diff --git a/packages/editor/src/components/post-actions/actions.js b/packages/editor/src/components/post-actions/actions.js
new file mode 100644
index 00000000000000..e1c0ed1558193d
--- /dev/null
+++ b/packages/editor/src/components/post-actions/actions.js
@@ -0,0 +1,92 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useMemo, useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+export function usePostActions( { postType, onActionPerformed, context } ) {
+	const { defaultActions } = useSelect(
+		( select ) => {
+			const { getEntityActions } = unlock( select( editorStore ) );
+			return {
+				defaultActions: getEntityActions( 'postType', postType ),
+			};
+		},
+		[ postType ]
+	);
+
+	const { registerPostTypeActions } = unlock( useDispatch( editorStore ) );
+	useEffect( () => {
+		registerPostTypeActions( postType );
+	}, [ registerPostTypeActions, postType ] );
+
+	return useMemo( () => {
+		// Filter actions based on provided context. If not provided
+		// all actions are returned. We'll have a single entry for getting the actions
+		// and the consumer should provide the context to filter the actions, if needed.
+		// Actions should also provide the `context` they support, if it's specific, to
+		// compare with the provided context to get all the actions.
+		// Right now the only supported context is `list`.
+		const actions = defaultActions.filter( ( action ) => {
+			if ( ! action.context ) {
+				return true;
+			}
+			return action.context === context;
+		} );
+
+		if ( onActionPerformed ) {
+			for ( let i = 0; i < actions.length; ++i ) {
+				if ( actions[ i ].callback ) {
+					const existingCallback = actions[ i ].callback;
+					actions[ i ] = {
+						...actions[ i ],
+						callback: ( items, argsObject ) => {
+							existingCallback( items, {
+								...argsObject,
+								onActionPerformed: ( _items ) => {
+									if ( argsObject?.onActionPerformed ) {
+										argsObject.onActionPerformed( _items );
+									}
+									onActionPerformed(
+										actions[ i ].id,
+										_items
+									);
+								},
+							} );
+						},
+					};
+				}
+				if ( actions[ i ].RenderModal ) {
+					const ExistingRenderModal = actions[ i ].RenderModal;
+					actions[ i ] = {
+						...actions[ i ],
+						RenderModal: ( props ) => {
+							return (
+								<ExistingRenderModal
+									{ ...props }
+									onActionPerformed={ ( _items ) => {
+										if ( props.onActionPerformed ) {
+											props.onActionPerformed( _items );
+										}
+										onActionPerformed(
+											actions[ i ].id,
+											_items
+										);
+									} }
+								/>
+							);
+						},
+					};
+				}
+			}
+		}
+
+		return actions;
+	}, [ defaultActions, onActionPerformed, context ] );
+}
diff --git a/packages/editor/src/components/post-actions/index.js b/packages/editor/src/components/post-actions/index.js
new file mode 100644
index 00000000000000..8a3850e8f547c1
--- /dev/null
+++ b/packages/editor/src/components/post-actions/index.js
@@ -0,0 +1,172 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { useState, useMemo } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import {
+	privateApis as componentsPrivateApis,
+	Button,
+	Modal,
+} from '@wordpress/components';
+import { moreVertical } from '@wordpress/icons';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { usePostActions } from './actions';
+
+const { DropdownMenuV2, kebabCase } = unlock( componentsPrivateApis );
+
+export default function PostActions( { postType, postId, onActionPerformed } ) {
+	const [ isActionsMenuOpen, setIsActionsMenuOpen ] = useState( false );
+	const { item, permissions } = useSelect(
+		( select ) => {
+			const { getEditedEntityRecord, getEntityRecordPermissions } =
+				unlock( select( coreStore ) );
+			return {
+				item: getEditedEntityRecord( 'postType', postType, postId ),
+				permissions: getEntityRecordPermissions(
+					'postType',
+					postType,
+					postId
+				),
+			};
+		},
+		[ postId, postType ]
+	);
+	const itemWithPermissions = useMemo( () => {
+		return {
+			...item,
+			permissions,
+		};
+	}, [ item, permissions ] );
+	const allActions = usePostActions( { postType, onActionPerformed } );
+
+	const actions = useMemo( () => {
+		return allActions.filter( ( action ) => {
+			return (
+				! action.isEligible || action.isEligible( itemWithPermissions )
+			);
+		} );
+	}, [ allActions, itemWithPermissions ] );
+
+	return (
+		<DropdownMenuV2
+			open={ isActionsMenuOpen }
+			trigger={
+				<Button
+					size="small"
+					icon={ moreVertical }
+					label={ __( 'Actions' ) }
+					disabled={ ! actions.length }
+					accessibleWhenDisabled
+					className="editor-all-actions-button"
+					onClick={ () =>
+						setIsActionsMenuOpen( ! isActionsMenuOpen )
+					}
+				/>
+			}
+			onOpenChange={ setIsActionsMenuOpen }
+			placement="bottom-end"
+		>
+			<ActionsDropdownMenuGroup
+				actions={ actions }
+				item={ itemWithPermissions }
+				onClose={ () => {
+					setIsActionsMenuOpen( false );
+				} }
+			/>
+		</DropdownMenuV2>
+	);
+}
+
+// From now on all the functions on this file are copied as from the dataviews packages,
+// The editor packages should not be using the dataviews packages directly,
+// and the dataviews package should not be using the editor packages directly,
+// so duplicating the code here seems like the least bad option.
+
+// Copied as is from packages/dataviews/src/item-actions.js
+function DropdownMenuItemTrigger( { action, onClick, items } ) {
+	const label =
+		typeof action.label === 'string' ? action.label : action.label( items );
+	return (
+		<DropdownMenuV2.Item
+			onClick={ onClick }
+			hideOnClick={ ! action.RenderModal }
+		>
+			<DropdownMenuV2.ItemLabel>{ label }</DropdownMenuV2.ItemLabel>
+		</DropdownMenuV2.Item>
+	);
+}
+
+// Copied as is from packages/dataviews/src/item-actions.js
+// With an added onClose prop.
+function ActionWithModal( { action, item, ActionTrigger, onClose } ) {
+	const [ isModalOpen, setIsModalOpen ] = useState( false );
+	const actionTriggerProps = {
+		action,
+		onClick: () => setIsModalOpen( true ),
+		items: [ item ],
+	};
+	const { RenderModal, hideModalHeader } = action;
+	return (
+		<>
+			<ActionTrigger { ...actionTriggerProps } />
+			{ isModalOpen && (
+				<Modal
+					title={ action.modalHeader || action.label }
+					__experimentalHideHeader={ !! hideModalHeader }
+					onRequestClose={ () => {
+						setIsModalOpen( false );
+					} }
+					overlayClassName={ `editor-action-modal editor-action-modal__${ kebabCase(
+						action.id
+					) }` }
+					focusOnMount="firstContentElement"
+					size="small"
+				>
+					<RenderModal
+						items={ [ item ] }
+						closeModal={ () => {
+							setIsModalOpen( false );
+							onClose();
+						} }
+					/>
+				</Modal>
+			) }
+		</>
+	);
+}
+
+// Copied as is from packages/dataviews/src/item-actions.js
+// With an added onClose prop.
+function ActionsDropdownMenuGroup( { actions, item, onClose } ) {
+	return (
+		<DropdownMenuV2.Group>
+			{ actions.map( ( action ) => {
+				if ( action.RenderModal ) {
+					return (
+						<ActionWithModal
+							key={ action.id }
+							action={ action }
+							item={ item }
+							ActionTrigger={ DropdownMenuItemTrigger }
+							onClose={ onClose }
+						/>
+					);
+				}
+				return (
+					<DropdownMenuItemTrigger
+						key={ action.id }
+						action={ action }
+						onClick={ () => action.callback( [ item ] ) }
+						items={ [ item ] }
+					/>
+				);
+			} ) }
+		</DropdownMenuV2.Group>
+	);
+}
diff --git a/packages/editor/src/components/post-actions/style.scss b/packages/editor/src/components/post-actions/style.scss
new file mode 100644
index 00000000000000..2e33975685a8bb
--- /dev/null
+++ b/packages/editor/src/components/post-actions/style.scss
@@ -0,0 +1,3 @@
+.editor-action-modal {
+	z-index: z-index(".editor-action-modal");
+}
diff --git a/packages/editor/src/components/post-author/check.js b/packages/editor/src/components/post-author/check.js
index ecda9e149b4ed8..d10a0a2ccf0bd0 100644
--- a/packages/editor/src/components/post-author/check.js
+++ b/packages/editor/src/components/post-author/check.js
@@ -11,6 +11,15 @@ import PostTypeSupportCheck from '../post-type-support-check';
 import { store as editorStore } from '../../store';
 import { AUTHORS_QUERY } from './constants';
 
+/**
+ * Wrapper component that renders its children only if the post type supports the author.
+ *
+ * @param {Object}  props          The component props.
+ * @param {Element} props.children Children to be rendered.
+ *
+ * @return {Component|null} The component to be rendered. Return `null` if the post type doesn't
+ * supports the author or if there are no authors available.
+ */
 export default function PostAuthorCheck( { children } ) {
 	const { hasAssignAuthorAction, hasAuthors } = useSelect( ( select ) => {
 		const post = select( editorStore ).getCurrentPost();
diff --git a/packages/editor/src/components/post-author/combobox.js b/packages/editor/src/components/post-author/combobox.js
index a2f4c312dfd8a1..867eca7947976a 100644
--- a/packages/editor/src/components/post-author/combobox.js
+++ b/packages/editor/src/components/post-author/combobox.js
@@ -2,71 +2,22 @@
  * WordPress dependencies
  */
 import { debounce } from '@wordpress/compose';
-import { useState, useMemo } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useState } from '@wordpress/element';
+import { useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { ComboboxControl } from '@wordpress/components';
-import { decodeEntities } from '@wordpress/html-entities';
-import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
-import { AUTHORS_QUERY } from './constants';
+import { useAuthorsQuery } from './hook';
 
-function PostAuthorCombobox() {
+export default function PostAuthorCombobox() {
 	const [ fieldValue, setFieldValue ] = useState();
 
-	const { authorId, isLoading, authors, postAuthor } = useSelect(
-		( select ) => {
-			const { getUser, getUsers, isResolving } = select( coreStore );
-			const { getEditedPostAttribute } = select( editorStore );
-			const author = getUser( getEditedPostAttribute( 'author' ), {
-				context: 'view',
-			} );
-			const query = { ...AUTHORS_QUERY };
-
-			if ( fieldValue ) {
-				query.search = fieldValue;
-			}
-
-			return {
-				authorId: getEditedPostAttribute( 'author' ),
-				postAuthor: author,
-				authors: getUsers( query ),
-				isLoading: isResolving( 'core', 'getUsers', [ query ] ),
-			};
-		},
-		[ fieldValue ]
-	);
 	const { editPost } = useDispatch( editorStore );
-
-	const authorOptions = useMemo( () => {
-		const fetchedAuthors = ( authors ?? [] ).map( ( author ) => {
-			return {
-				value: author.id,
-				label: decodeEntities( author.name ),
-			};
-		} );
-
-		// Ensure the current author is included in the dropdown list.
-		const foundAuthor = fetchedAuthors.findIndex(
-			( { value } ) => postAuthor?.id === value
-		);
-
-		if ( foundAuthor < 0 && postAuthor ) {
-			return [
-				{
-					value: postAuthor.id,
-					label: decodeEntities( postAuthor.name ),
-				},
-				...fetchedAuthors,
-			];
-		}
-
-		return fetchedAuthors;
-	}, [ authors, postAuthor ] );
+	const { authorId, authorOptions } = useAuthorsQuery( fieldValue );
 
 	/**
 	 * Handle author selection.
@@ -89,10 +40,6 @@ function PostAuthorCombobox() {
 		setFieldValue( inputValue );
 	};
 
-	if ( ! postAuthor ) {
-		return null;
-	}
-
 	return (
 		<ComboboxControl
 			__nextHasNoMarginBottom
@@ -102,10 +49,8 @@ function PostAuthorCombobox() {
 			value={ authorId }
 			onFilterValueChange={ debounce( handleKeydown, 300 ) }
 			onChange={ handleSelect }
-			isLoading={ isLoading }
 			allowReset={ false }
+			hideLabelFromVision
 		/>
 	);
 }
-
-export default PostAuthorCombobox;
diff --git a/packages/editor/src/components/post-author/constants.js b/packages/editor/src/components/post-author/constants.js
index d29995e27f4e5a..46bc2d46d1b086 100644
--- a/packages/editor/src/components/post-author/constants.js
+++ b/packages/editor/src/components/post-author/constants.js
@@ -1,6 +1,10 @@
+export const BASE_QUERY = {
+	_fields: 'id,name',
+	context: 'view', // Allows non-admins to perform requests.
+};
+
 export const AUTHORS_QUERY = {
 	who: 'authors',
 	per_page: 50,
-	_fields: 'id,name',
-	context: 'view', // Allows non-admins to perform requests.
+	...BASE_QUERY,
 };
diff --git a/packages/editor/src/components/post-author/hook.js b/packages/editor/src/components/post-author/hook.js
new file mode 100644
index 00000000000000..62830cf6ea60e6
--- /dev/null
+++ b/packages/editor/src/components/post-author/hook.js
@@ -0,0 +1,71 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useMemo } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
+import { decodeEntities } from '@wordpress/html-entities';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { AUTHORS_QUERY, BASE_QUERY } from './constants';
+
+export function useAuthorsQuery( search ) {
+	const { authorId, authors, postAuthor } = useSelect(
+		( select ) => {
+			const { getUser, getUsers } = select( coreStore );
+			const { getEditedPostAttribute } = select( editorStore );
+			const _authorId = getEditedPostAttribute( 'author' );
+			const query = { ...AUTHORS_QUERY };
+
+			if ( search ) {
+				query.search = search;
+			}
+
+			return {
+				authorId: _authorId,
+				authors: getUsers( query ),
+				postAuthor: getUser( _authorId, BASE_QUERY ),
+			};
+		},
+		[ search ]
+	);
+
+	const authorOptions = useMemo( () => {
+		const fetchedAuthors = ( authors ?? [] ).map( ( author ) => {
+			return {
+				value: author.id,
+				label: decodeEntities( author.name ),
+			};
+		} );
+
+		// Ensure the current author is included in the dropdown list.
+		const foundAuthor = fetchedAuthors.findIndex(
+			( { value } ) => postAuthor?.id === value
+		);
+
+		let currentAuthor = [];
+		if ( foundAuthor < 0 && postAuthor ) {
+			currentAuthor = [
+				{
+					value: postAuthor.id,
+					label: decodeEntities( postAuthor.name ),
+				},
+			];
+		} else if ( foundAuthor < 0 && ! postAuthor ) {
+			currentAuthor = [
+				{
+					value: 0,
+					label: __( '(No author)' ),
+				},
+			];
+		}
+
+		return [ ...currentAuthor, ...fetchedAuthors ];
+	}, [ authors, postAuthor ] );
+
+	return { authorId, authorOptions, postAuthor };
+}
diff --git a/packages/editor/src/components/post-author/index.js b/packages/editor/src/components/post-author/index.js
index 7e734379f64f64..9ff3aaaf09a29c 100644
--- a/packages/editor/src/components/post-author/index.js
+++ b/packages/editor/src/components/post-author/index.js
@@ -13,6 +13,11 @@ import { AUTHORS_QUERY } from './constants';
 
 const minimumUsersForCombobox = 25;
 
+/**
+ * Renders the component for selecting the post author.
+ *
+ * @return {Component} The component to be rendered.
+ */
 function PostAuthor() {
 	const showCombobox = useSelect( ( select ) => {
 		const authors = select( coreStore ).getUsers( AUTHORS_QUERY );
diff --git a/packages/editor/src/components/post-author/panel.js b/packages/editor/src/components/post-author/panel.js
index 78f0e0a5f2cc89..a3c53aa417163e 100644
--- a/packages/editor/src/components/post-author/panel.js
+++ b/packages/editor/src/components/post-author/panel.js
@@ -1,15 +1,83 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+import { Button, Dropdown } from '@wordpress/components';
+import { useState, useMemo } from '@wordpress/element';
+import { decodeEntities } from '@wordpress/html-entities';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+
 /**
  * Internal dependencies
  */
 import PostAuthorCheck from './check';
 import PostAuthorForm from './index';
 import PostPanelRow from '../post-panel-row';
+import { useAuthorsQuery } from './hook';
+
+function PostAuthorToggle( { isOpen, onClick } ) {
+	const { postAuthor } = useAuthorsQuery();
+	const authorName =
+		decodeEntities( postAuthor?.name ) || __( '(No author)' );
+	return (
+		<Button
+			size="compact"
+			className="editor-post-author__panel-toggle"
+			variant="tertiary"
+			aria-expanded={ isOpen }
+			// translators: %s: Current post link.
+			aria-label={ sprintf( __( 'Change author: %s' ), authorName ) }
+			onClick={ onClick }
+		>
+			{ authorName }
+		</Button>
+	);
+}
 
+/**
+ * Renders the Post Author Panel component.
+ *
+ * @return {Component} The component to be rendered.
+ */
 export function PostAuthor() {
+	// Use internal state instead of a ref to make sure that the component
+	// re-renders when the popover's anchor updates.
+	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor ]
+	);
 	return (
 		<PostAuthorCheck>
-			<PostPanelRow className="editor-post-author__panel">
-				<PostAuthorForm />
+			<PostPanelRow label={ __( 'Author' ) } ref={ setPopoverAnchor }>
+				<Dropdown
+					popoverProps={ popoverProps }
+					contentClassName="editor-post-author__panel-dialog"
+					focusOnMount
+					renderToggle={ ( { isOpen, onToggle } ) => (
+						<PostAuthorToggle
+							isOpen={ isOpen }
+							onClick={ onToggle }
+						/>
+					) }
+					renderContent={ ( { onClose } ) => (
+						<div className="editor-post-author">
+							<InspectorPopoverHeader
+								title={ __( 'Author' ) }
+								onClose={ onClose }
+							/>
+							<PostAuthorForm onClose={ onClose } />
+						</div>
+					) }
+				/>
 			</PostPanelRow>
 		</PostAuthorCheck>
 	);
diff --git a/packages/editor/src/components/post-author/select.js b/packages/editor/src/components/post-author/select.js
index c23e88125173f5..e51cc288cc4530 100644
--- a/packages/editor/src/components/post-author/select.js
+++ b/packages/editor/src/components/post-author/select.js
@@ -2,36 +2,18 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useMemo } from '@wordpress/element';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { decodeEntities } from '@wordpress/html-entities';
+import { useDispatch } from '@wordpress/data';
 import { SelectControl } from '@wordpress/components';
-import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
-import { AUTHORS_QUERY } from './constants';
+import { useAuthorsQuery } from './hook';
 
-function PostAuthorSelect() {
+export default function PostAuthorSelect() {
 	const { editPost } = useDispatch( editorStore );
-	const { postAuthor, authors } = useSelect( ( select ) => {
-		return {
-			postAuthor:
-				select( editorStore ).getEditedPostAttribute( 'author' ),
-			authors: select( coreStore ).getUsers( AUTHORS_QUERY ),
-		};
-	}, [] );
-
-	const authorOptions = useMemo( () => {
-		return ( authors ?? [] ).map( ( author ) => {
-			return {
-				value: author.id,
-				label: decodeEntities( author.name ),
-			};
-		} );
-	}, [ authors ] );
+	const { authorId, authorOptions } = useAuthorsQuery();
 
 	const setAuthorId = ( value ) => {
 		const author = Number( value );
@@ -46,9 +28,8 @@ function PostAuthorSelect() {
 			label={ __( 'Author' ) }
 			options={ authorOptions }
 			onChange={ setAuthorId }
-			value={ postAuthor }
+			value={ authorId }
+			hideLabelFromVision
 		/>
 	);
 }
-
-export default PostAuthorSelect;
diff --git a/packages/editor/src/components/post-author/style.scss b/packages/editor/src/components/post-author/style.scss
index 349ad712334c8d..548f781241b0a2 100644
--- a/packages/editor/src/components/post-author/style.scss
+++ b/packages/editor/src/components/post-author/style.scss
@@ -5,3 +5,9 @@
 .editor-post-author__panel .editor-post-panel__row-control > div {
 	width: 100%;
 }
+
+.editor-post-author__panel-dialog .editor-post-author {
+	// sidebar width - popover padding - form margin
+	min-width: $sidebar-width - $grid-unit-20 - $grid-unit-20;
+	margin: $grid-unit-10;
+}
diff --git a/packages/editor/src/components/post-card-panel/index.js b/packages/editor/src/components/post-card-panel/index.js
new file mode 100644
index 00000000000000..1365659f708147
--- /dev/null
+++ b/packages/editor/src/components/post-card-panel/index.js
@@ -0,0 +1,96 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	Icon,
+	__experimentalHStack as HStack,
+	__experimentalText as Text,
+} from '@wordpress/components';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+import { decodeEntities } from '@wordpress/html-entities';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import {
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+} from '../../store/constants';
+import { unlock } from '../../lock-unlock';
+import PostActions from '../post-actions';
+
+export default function PostCardPanel( {
+	postType,
+	postId,
+	onActionPerformed,
+} ) {
+	const { isFrontPage, isPostsPage, title, icon } = useSelect(
+		( select ) => {
+			const { __experimentalGetTemplateInfo } = select( editorStore );
+			const { canUser, getEditedEntityRecord } = select( coreStore );
+			const siteSettings = canUser( 'read', {
+				kind: 'root',
+				name: 'site',
+			} )
+				? getEditedEntityRecord( 'root', 'site' )
+				: undefined;
+			const _record = getEditedEntityRecord(
+				'postType',
+				postType,
+				postId
+			);
+			const _templateInfo =
+				[ TEMPLATE_POST_TYPE, TEMPLATE_PART_POST_TYPE ].includes(
+					postType
+				) && __experimentalGetTemplateInfo( _record );
+			return {
+				title: _templateInfo?.title || _record?.title,
+				icon: unlock( select( editorStore ) ).getPostIcon( postType, {
+					area: _record?.area,
+				} ),
+				isFrontPage: siteSettings?.page_on_front === postId,
+				isPostsPage: siteSettings?.page_for_posts === postId,
+			};
+		},
+		[ postId, postType ]
+	);
+	return (
+		<div className="editor-post-card-panel">
+			<HStack
+				spacing={ 2 }
+				className="editor-post-card-panel__header"
+				align="flex-start"
+			>
+				<Icon className="editor-post-card-panel__icon" icon={ icon } />
+				<Text
+					numberOfLines={ 2 }
+					truncate
+					className="editor-post-card-panel__title"
+					weight={ 500 }
+					as="h2"
+					lineHeight="20px"
+				>
+					{ title ? decodeEntities( title ) : __( 'No title' ) }
+					{ isFrontPage && (
+						<span className="editor-post-card-panel__title-badge">
+							{ __( 'Homepage' ) }
+						</span>
+					) }
+					{ isPostsPage && (
+						<span className="editor-post-card-panel__title-badge">
+							{ __( 'Posts Page' ) }
+						</span>
+					) }
+				</Text>
+				<PostActions
+					postType={ postType }
+					postId={ postId }
+					onActionPerformed={ onActionPerformed }
+				/>
+			</HStack>
+		</div>
+	);
+}
diff --git a/packages/editor/src/components/post-card-panel/style.scss b/packages/editor/src/components/post-card-panel/style.scss
new file mode 100644
index 00000000000000..d8a2a4628e6f9c
--- /dev/null
+++ b/packages/editor/src/components/post-card-panel/style.scss
@@ -0,0 +1,47 @@
+.editor-post-card-panel {
+	&__content {
+		flex-grow: 1;
+	}
+
+	&__title {
+		width: 100%;
+
+		&.editor-post-card-panel__title {
+			margin: 0;
+			padding: 2px 0;
+			display: flex;
+			align-items: center;
+			flex-wrap: wrap;
+			column-gap: $grid-unit-10;
+			row-gap: $grid-unit-05;
+			word-break: break-word;
+		}
+	}
+
+	&__icon {
+		flex: 0 0 $icon-size;
+		width: $icon-size;
+		height: $icon-size;
+	}
+
+	&__header {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	&.has-description &__header {
+		margin-bottom: $grid-unit-10;
+	}
+}
+
+.editor-post-card-panel__title-badge {
+	background: $gray-100;
+	color: $gray-800;
+	padding: 0 $grid-unit-05;
+	border-radius: $radius-small;
+	font-size: 12px;
+	font-weight: 400;
+	flex-shrink: 0;
+	line-height: $grid-unit-05 * 5;
+	display: inline-block;
+}
diff --git a/packages/editor/src/components/post-comments/index.js b/packages/editor/src/components/post-comments/index.js
index 85d9948575d057..1d331811b46b26 100644
--- a/packages/editor/src/components/post-comments/index.js
+++ b/packages/editor/src/components/post-comments/index.js
@@ -1,8 +1,11 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
-import { CheckboxControl } from '@wordpress/components';
+import { __, _x } from '@wordpress/i18n';
+import {
+	RadioControl,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 
 /**
@@ -10,6 +13,22 @@ import { useDispatch, useSelect } from '@wordpress/data';
  */
 import { store as editorStore } from '../../store';
 
+const COMMENT_OPTIONS = [
+	{
+		label: _x( 'Open', 'Adjective: e.g. "Comments are open"' ),
+		value: 'open',
+		description: __( 'Visitors can add new comments and replies.' ),
+	},
+	{
+		label: __( 'Closed' ),
+		value: 'closed',
+		description: [
+			__( 'Visitors cannot add new comments or replies.' ),
+			__( 'Existing comments remain visible.' ),
+		].join( ' ' ),
+	},
+];
+
 function PostComments() {
 	const commentStatus = useSelect(
 		( select ) =>
@@ -18,19 +37,30 @@ function PostComments() {
 		[]
 	);
 	const { editPost } = useDispatch( editorStore );
-	const onToggleComments = () =>
+	const handleStatus = ( newCommentStatus ) =>
 		editPost( {
-			comment_status: commentStatus === 'open' ? 'closed' : 'open',
+			comment_status: newCommentStatus,
 		} );
 
 	return (
-		<CheckboxControl
-			__nextHasNoMarginBottom
-			label={ __( 'Allow comments' ) }
-			checked={ commentStatus === 'open' }
-			onChange={ onToggleComments }
-		/>
+		<form>
+			<VStack spacing={ 4 }>
+				<RadioControl
+					className="editor-change-status__options"
+					hideLabelFromVision
+					label={ __( 'Comment status' ) }
+					options={ COMMENT_OPTIONS }
+					onChange={ handleStatus }
+					selected={ commentStatus }
+				/>
+			</VStack>
+		</form>
 	);
 }
 
+/**
+ * A form for managing comment status.
+ *
+ * @return {JSX.Element} The rendered PostComments component.
+ */
 export default PostComments;
diff --git a/packages/editor/src/components/post-content-information/index.js b/packages/editor/src/components/post-content-information/index.js
new file mode 100644
index 00000000000000..569339ef40c8b9
--- /dev/null
+++ b/packages/editor/src/components/post-content-information/index.js
@@ -0,0 +1,89 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalText as Text } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { __, _x, _n, sprintf } from '@wordpress/i18n';
+import { count as wordCount } from '@wordpress/wordcount';
+import { useMemo } from '@wordpress/element';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import {
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+} from '../../store/constants';
+
+// Taken from packages/editor/src/components/time-to-read/index.js.
+const AVERAGE_READING_RATE = 189;
+
+// This component renders the wordcount and reading time for the post.
+export default function PostContentInformation() {
+	const { postContent } = useSelect( ( select ) => {
+		const { getEditedPostAttribute, getCurrentPostType, getCurrentPostId } =
+			select( editorStore );
+		const { canUser } = select( coreStore );
+		const { getEntityRecord } = select( coreStore );
+		const siteSettings = canUser( 'read', {
+			kind: 'root',
+			name: 'site',
+		} )
+			? getEntityRecord( 'root', 'site' )
+			: undefined;
+		const postType = getCurrentPostType();
+		const _id = getCurrentPostId();
+		const isPostsPage = +_id === siteSettings?.page_for_posts;
+		const showPostContentInfo =
+			! isPostsPage &&
+			! [ TEMPLATE_POST_TYPE, TEMPLATE_PART_POST_TYPE ].includes(
+				postType
+			);
+		return {
+			postContent:
+				showPostContentInfo && getEditedPostAttribute( 'content' ),
+		};
+	}, [] );
+
+	/*
+	 * translators: If your word count is based on single characters (e.g. East Asian characters),
+	 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
+	 * Do not translate into your own language.
+	 */
+	const wordCountType = _x( 'words', 'Word count type. Do not translate!' );
+	const wordsCounted = useMemo(
+		() => ( postContent ? wordCount( postContent, wordCountType ) : 0 ),
+		[ postContent, wordCountType ]
+	);
+	if ( ! wordsCounted ) {
+		return null;
+	}
+	const readingTime = Math.round( wordsCounted / AVERAGE_READING_RATE );
+	const wordsCountText = sprintf(
+		// translators: %s: the number of words in the post.
+		_n( '%s word', '%s words', wordsCounted ),
+		wordsCounted.toLocaleString()
+	);
+	const minutesText =
+		readingTime <= 1
+			? __( '1 minute' )
+			: sprintf(
+					// translators: %s: the number of minutes to read the post.
+					_n( '%s minute', '%s minutes', readingTime ),
+					readingTime.toLocaleString()
+			  );
+	return (
+		<div className="editor-post-content-information">
+			<Text>
+				{ sprintf(
+					/* translators: 1: How many words a post has. 2: the number of minutes to read the post (e.g. 130 words, 2 minutes read time.) */
+					__( '%1$s, %2$s read time.' ),
+					wordsCountText,
+					minutesText
+				) }
+			</Text>
+		</div>
+	);
+}
diff --git a/packages/editor/src/components/post-content-information/style.scss b/packages/editor/src/components/post-content-information/style.scss
new file mode 100644
index 00000000000000..1b88392cc76eca
--- /dev/null
+++ b/packages/editor/src/components/post-content-information/style.scss
@@ -0,0 +1,6 @@
+.editor-post-content-information {
+	color: $gray-700;
+	& .components-text {
+		color: inherit;
+	}
+}
diff --git a/packages/editor/src/components/post-discussion/panel.js b/packages/editor/src/components/post-discussion/panel.js
new file mode 100644
index 00000000000000..c539791d404dec
--- /dev/null
+++ b/packages/editor/src/components/post-discussion/panel.js
@@ -0,0 +1,147 @@
+/**
+ * WordPress dependencies
+ */
+import { __, _x } from '@wordpress/i18n';
+import {
+	Dropdown,
+	Button,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { useState, useMemo } from '@wordpress/element';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import PostTypeSupportCheck from '../post-type-support-check';
+import PostComments from '../post-comments';
+import PostPingbacks from '../post-pingbacks';
+import PostPanelRow from '../post-panel-row';
+
+const PANEL_NAME = 'discussion-panel';
+
+function ModalContents( { onClose } ) {
+	return (
+		<div className="editor-post-discussion">
+			<InspectorPopoverHeader
+				title={ __( 'Discussion' ) }
+				onClose={ onClose }
+			/>
+			<VStack spacing={ 4 }>
+				<PostTypeSupportCheck supportKeys="comments">
+					<PostComments />
+				</PostTypeSupportCheck>
+				<PostTypeSupportCheck supportKeys="trackbacks">
+					<PostPingbacks />
+				</PostTypeSupportCheck>
+			</VStack>
+		</div>
+	);
+}
+
+function PostDiscussionToggle( { isOpen, onClick } ) {
+	const {
+		commentStatus,
+		pingStatus,
+		commentsSupported,
+		trackbacksSupported,
+	} = useSelect( ( select ) => {
+		const { getEditedPostAttribute } = select( editorStore );
+		const { getPostType } = select( coreStore );
+		const postType = getPostType( getEditedPostAttribute( 'type' ) );
+		return {
+			commentStatus: getEditedPostAttribute( 'comment_status' ) ?? 'open',
+			pingStatus: getEditedPostAttribute( 'ping_status' ) ?? 'open',
+			commentsSupported: !! postType.supports.comments,
+			trackbacksSupported: !! postType.supports.trackbacks,
+		};
+	}, [] );
+	let label;
+	if ( commentStatus === 'open' ) {
+		if ( pingStatus === 'open' ) {
+			label = _x( 'Open', 'Adjective: e.g. "Comments are open"' );
+		} else {
+			label = trackbacksSupported
+				? __( 'Comments only' )
+				: _x( 'Open', 'Adjective: e.g. "Comments are open"' );
+		}
+	} else if ( pingStatus === 'open' ) {
+		label = commentsSupported ? __( 'Pings only' ) : __( 'Pings enabled' );
+	} else {
+		label = __( 'Closed' );
+	}
+	return (
+		<Button
+			size="compact"
+			className="editor-post-discussion__panel-toggle"
+			variant="tertiary"
+			aria-label={ __( 'Change discussion options' ) }
+			aria-expanded={ isOpen }
+			onClick={ onClick }
+		>
+			{ label }
+		</Button>
+	);
+}
+
+/**
+ * This component allows to update comment and pingback
+ * settings for the current post. Internally there are
+ * checks whether the current post has support for the
+ * above and if the `discussion-panel` panel is enabled.
+ *
+ * @return {JSX.Element|null} The rendered PostDiscussionPanel component.
+ */
+export default function PostDiscussionPanel() {
+	const { isEnabled } = useSelect( ( select ) => {
+		const { isEditorPanelEnabled } = select( editorStore );
+		return {
+			isEnabled: isEditorPanelEnabled( PANEL_NAME ),
+		};
+	}, [] );
+
+	// Use internal state instead of a ref to make sure that the component
+	// re-renders when the popover's anchor updates.
+	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor ]
+	);
+
+	if ( ! isEnabled ) {
+		return null;
+	}
+
+	return (
+		<PostTypeSupportCheck supportKeys={ [ 'comments', 'trackbacks' ] }>
+			<PostPanelRow label={ __( 'Discussion' ) } ref={ setPopoverAnchor }>
+				<Dropdown
+					popoverProps={ popoverProps }
+					className="editor-post-discussion__panel-dropdown"
+					contentClassName="editor-post-discussion__panel-dialog"
+					focusOnMount
+					renderToggle={ ( { isOpen, onToggle } ) => (
+						<PostDiscussionToggle
+							isOpen={ isOpen }
+							onClick={ onToggle }
+						/>
+					) }
+					renderContent={ ( { onClose } ) => (
+						<ModalContents onClose={ onClose } />
+					) }
+				/>
+			</PostPanelRow>
+		</PostTypeSupportCheck>
+	);
+}
diff --git a/packages/editor/src/components/post-discussion/style.scss b/packages/editor/src/components/post-discussion/style.scss
new file mode 100644
index 00000000000000..d5320605579e41
--- /dev/null
+++ b/packages/editor/src/components/post-discussion/style.scss
@@ -0,0 +1,15 @@
+.editor-post-discussion__panel-dialog .editor-post-discussion {
+	// sidebar width - popover padding - form margin
+	min-width: $sidebar-width - $grid-unit-20 - $grid-unit-20;
+	margin: $grid-unit-10;
+}
+.editor-post-discussion__panel-toggle {
+
+	.components-text {
+		color: inherit;
+	}
+}
+
+.editor-post-discussion__panel-dialog .components-popover__content {
+	min-width: 320px;
+}
diff --git a/packages/editor/src/components/post-excerpt/check.js b/packages/editor/src/components/post-excerpt/check.js
index 7d77ba77cd029a..77436ecfed218a 100644
--- a/packages/editor/src/components/post-excerpt/check.js
+++ b/packages/editor/src/components/post-excerpt/check.js
@@ -3,6 +3,14 @@
  */
 import PostTypeSupportCheck from '../post-type-support-check';
 
+/**
+ * Component for checking if the post type supports the excerpt field.
+ *
+ * @param {Object}  props          Props.
+ * @param {Element} props.children Children to be rendered.
+ *
+ * @return {Component} The component to be rendered.
+ */
 function PostExcerptCheck( { children } ) {
 	return (
 		<PostTypeSupportCheck supportKeys="excerpt">
diff --git a/packages/editor/src/components/post-excerpt/index.js b/packages/editor/src/components/post-excerpt/index.js
index 47a1d3bf585850..2555922f4e45ae 100644
--- a/packages/editor/src/components/post-excerpt/index.js
+++ b/packages/editor/src/components/post-excerpt/index.js
@@ -4,37 +4,91 @@
 import { __ } from '@wordpress/i18n';
 import { ExternalLink, TextareaControl } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
+import { useState } from '@wordpress/element';
+import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
-function PostExcerpt() {
-	const excerpt = useSelect(
-		( select ) => select( editorStore ).getEditedPostAttribute( 'excerpt' ),
+/**
+ * Renders an editable textarea for the post excerpt.
+ * Templates, template parts and patterns use the `excerpt` field as a description semantically.
+ * Additionally templates and template parts override the `excerpt` field as `description` in
+ * REST API. So this component handles proper labeling and updating the edited entity.
+ *
+ * @param {Object}  props                             - Component props.
+ * @param {boolean} [props.hideLabelFromVision=false] - Whether to visually hide the textarea's label.
+ * @param {boolean} [props.updateOnBlur=false]        - Whether to update the post on change or use local state and update on blur.
+ */
+export default function PostExcerpt( {
+	hideLabelFromVision = false,
+	updateOnBlur = false,
+} ) {
+	const { excerpt, shouldUseDescriptionLabel, usedAttribute } = useSelect(
+		( select ) => {
+			const { getCurrentPostType, getEditedPostAttribute } =
+				select( editorStore );
+			const postType = getCurrentPostType();
+			// This special case is unfortunate, but the REST API of wp_template and wp_template_part
+			// support the excerpt field throught the "description" field rather than "excerpt".
+			const _usedAttribute = [
+				'wp_template',
+				'wp_template_part',
+			].includes( postType )
+				? 'description'
+				: 'excerpt';
+			return {
+				excerpt: getEditedPostAttribute( _usedAttribute ),
+				// There are special cases where we want to label the excerpt as a description.
+				shouldUseDescriptionLabel: [
+					'wp_template',
+					'wp_template_part',
+					'wp_block',
+				].includes( postType ),
+				usedAttribute: _usedAttribute,
+			};
+		},
 		[]
 	);
 	const { editPost } = useDispatch( editorStore );
+	const [ localExcerpt, setLocalExcerpt ] = useState(
+		decodeEntities( excerpt )
+	);
+	const updatePost = ( value ) => {
+		editPost( { [ usedAttribute ]: value } );
+	};
+	const label = shouldUseDescriptionLabel
+		? __( 'Write a description (optional)' )
+		: __( 'Write an excerpt (optional)' );
 
 	return (
 		<div className="editor-post-excerpt">
 			<TextareaControl
 				__nextHasNoMarginBottom
-				label={ __( 'Write an excerpt (optional)' ) }
+				label={ label }
+				hideLabelFromVision={ hideLabelFromVision }
 				className="editor-post-excerpt__textarea"
-				onChange={ ( value ) => editPost( { excerpt: value } ) }
-				value={ excerpt }
+				onChange={ updateOnBlur ? setLocalExcerpt : updatePost }
+				onBlur={
+					updateOnBlur ? () => updatePost( localExcerpt ) : undefined
+				}
+				value={ updateOnBlur ? localExcerpt : excerpt }
+				help={
+					! shouldUseDescriptionLabel ? (
+						<ExternalLink
+							href={ __(
+								'https://wordpress.org/documentation/article/page-post-settings-sidebar/#excerpt'
+							) }
+						>
+							{ __( 'Learn more about manual excerpts' ) }
+						</ExternalLink>
+					) : (
+						__( 'Write a description' )
+					)
+				}
 			/>
-			<ExternalLink
-				href={ __(
-					'https://wordpress.org/documentation/article/page-post-settings-sidebar/#excerpt'
-				) }
-			>
-				{ __( 'Learn more about manual excerpts' ) }
-			</ExternalLink>
 		</div>
 	);
 }
-
-export default PostExcerpt;
diff --git a/packages/editor/src/components/post-excerpt/panel.js b/packages/editor/src/components/post-excerpt/panel.js
new file mode 100644
index 00000000000000..9c09796f467040
--- /dev/null
+++ b/packages/editor/src/components/post-excerpt/panel.js
@@ -0,0 +1,233 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import {
+	PanelBody,
+	__experimentalText as Text,
+	Dropdown,
+	Button,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useMemo, useState } from '@wordpress/element';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { decodeEntities } from '@wordpress/html-entities';
+
+/**
+ * Internal dependencies
+ */
+import PostExcerptForm from './index';
+import PostExcerptCheck from './check';
+import PluginPostExcerpt from './plugin';
+import { TEMPLATE_ORIGINS } from '../../store/constants';
+import { store as editorStore } from '../../store';
+
+/**
+ * Module Constants
+ */
+const PANEL_NAME = 'post-excerpt';
+
+function ExcerptPanel() {
+	const { isOpened, isEnabled, postType } = useSelect( ( select ) => {
+		const {
+			isEditorPanelOpened,
+			isEditorPanelEnabled,
+			getCurrentPostType,
+		} = select( editorStore );
+
+		return {
+			isOpened: isEditorPanelOpened( PANEL_NAME ),
+			isEnabled: isEditorPanelEnabled( PANEL_NAME ),
+			postType: getCurrentPostType(),
+		};
+	}, [] );
+
+	const { toggleEditorPanelOpened } = useDispatch( editorStore );
+	const toggleExcerptPanel = () => toggleEditorPanelOpened( PANEL_NAME );
+
+	if ( ! isEnabled ) {
+		return null;
+	}
+
+	// There are special cases where we want to label the excerpt as a description.
+	const shouldUseDescriptionLabel = [
+		'wp_template',
+		'wp_template_part',
+		'wp_block',
+	].includes( postType );
+
+	return (
+		<PanelBody
+			title={
+				shouldUseDescriptionLabel
+					? __( 'Description' )
+					: __( 'Excerpt' )
+			}
+			opened={ isOpened }
+			onToggle={ toggleExcerptPanel }
+		>
+			<PluginPostExcerpt.Slot>
+				{ ( fills ) => (
+					<>
+						<PostExcerptForm />
+						{ fills }
+					</>
+				) }
+			</PluginPostExcerpt.Slot>
+		</PanelBody>
+	);
+}
+
+/**
+ * Is rendered if the post type supports excerpts and allows editing the excerpt.
+ *
+ * @return {JSX.Element} The rendered PostExcerptPanel component.
+ */
+export default function PostExcerptPanel() {
+	return (
+		<PostExcerptCheck>
+			<ExcerptPanel />
+		</PostExcerptCheck>
+	);
+}
+
+export function PrivatePostExcerptPanel() {
+	return (
+		<PostExcerptCheck>
+			<PrivateExcerpt />
+		</PostExcerptCheck>
+	);
+}
+
+function PrivateExcerpt() {
+	const { shouldRender, excerpt, shouldBeUsedAsDescription, allowEditing } =
+		useSelect( ( select ) => {
+			const {
+				getCurrentPostType,
+				getCurrentPostId,
+				getEditedPostAttribute,
+				isEditorPanelEnabled,
+			} = select( editorStore );
+			const postType = getCurrentPostType();
+			const isTemplateOrTemplatePart = [
+				'wp_template',
+				'wp_template_part',
+			].includes( postType );
+			const isPattern = postType === 'wp_block';
+			// These post types use the `excerpt` field as a description semantically, so we need to
+			// handle proper labeling and some flows where we should always render them as text.
+			const _shouldBeUsedAsDescription =
+				isTemplateOrTemplatePart || isPattern;
+			const _usedAttribute = isTemplateOrTemplatePart
+				? 'description'
+				: 'excerpt';
+			// We need to fetch the entity in this case to check if we'll allow editing.
+			const template =
+				isTemplateOrTemplatePart &&
+				select( coreStore ).getEntityRecord(
+					'postType',
+					postType,
+					getCurrentPostId()
+				);
+			// For post types that use excerpt as description, we do not abide
+			// by the `isEnabled` panel flag in order to render them as text.
+			const _shouldRender =
+				isEditorPanelEnabled( PANEL_NAME ) ||
+				_shouldBeUsedAsDescription;
+			return {
+				excerpt: getEditedPostAttribute( _usedAttribute ),
+				shouldRender: _shouldRender,
+				shouldBeUsedAsDescription: _shouldBeUsedAsDescription,
+				// If we should render, allow editing for all post types that are not used as description.
+				// For the rest allow editing only for user generated entities.
+				allowEditing:
+					_shouldRender &&
+					( ! _shouldBeUsedAsDescription ||
+						isPattern ||
+						( template &&
+							template.source === TEMPLATE_ORIGINS.custom &&
+							! template.has_theme_file &&
+							template.is_custom ) ),
+			};
+		}, [] );
+	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	const label = shouldBeUsedAsDescription
+		? __( 'Description' )
+		: __( 'Excerpt' );
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			'aria-label': label,
+			headerTitle: label,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor, label ]
+	);
+	if ( ! shouldRender ) {
+		return false;
+	}
+	const excerptText = !! excerpt && (
+		<Text align="left" numberOfLines={ 4 } truncate={ allowEditing }>
+			{ decodeEntities( excerpt ) }
+		</Text>
+	);
+	if ( ! allowEditing ) {
+		return excerptText;
+	}
+	const excerptPlaceholder = shouldBeUsedAsDescription
+		? __( 'Add a description…' )
+		: __( 'Add an excerpt…' );
+	const triggerEditLabel = shouldBeUsedAsDescription
+		? __( 'Edit description' )
+		: __( 'Edit excerpt' );
+	return (
+		<VStack>
+			{ excerptText }
+			<Dropdown
+				className="editor-post-excerpt__dropdown"
+				contentClassName="editor-post-excerpt__dropdown__content"
+				popoverProps={ popoverProps }
+				focusOnMount
+				ref={ setPopoverAnchor }
+				renderToggle={ ( { onToggle } ) => (
+					<Button
+						__next40pxDefaultSize
+						onClick={ onToggle }
+						variant="link"
+					>
+						{ excerptText ? triggerEditLabel : excerptPlaceholder }
+					</Button>
+				) }
+				renderContent={ ( { onClose } ) => (
+					<>
+						<InspectorPopoverHeader
+							title={ label }
+							onClose={ onClose }
+						/>
+
+						<VStack spacing={ 4 }>
+							<PluginPostExcerpt.Slot>
+								{ ( fills ) => (
+									<>
+										<PostExcerptForm
+											hideLabelFromVision
+											updateOnBlur
+										/>
+										{ fills }
+									</>
+								) }
+							</PluginPostExcerpt.Slot>
+						</VStack>
+					</>
+				) }
+			/>
+		</VStack>
+	);
+}
diff --git a/packages/editor/src/components/post-excerpt/plugin.js b/packages/editor/src/components/post-excerpt/plugin.js
new file mode 100644
index 00000000000000..64861162a0f637
--- /dev/null
+++ b/packages/editor/src/components/post-excerpt/plugin.js
@@ -0,0 +1,61 @@
+/**
+ * Defines as extensibility slot for the Excerpt panel.
+ */
+
+/**
+ * WordPress dependencies
+ */
+import { createSlotFill, PanelRow } from '@wordpress/components';
+
+const { Fill, Slot } = createSlotFill( 'PluginPostExcerpt' );
+
+/**
+ * Renders a post excerpt panel in the post sidebar.
+ *
+ * @param {Object}  props             Component properties.
+ * @param {string}  [props.className] An optional class name added to the row.
+ * @param {Element} props.children    Children to be rendered.
+ *
+ * @example
+ * ```js
+ * // Using ES5 syntax
+ * var __ = wp.i18n.__;
+ * var PluginPostExcerpt = wp.editPost.__experimentalPluginPostExcerpt;
+ *
+ * function MyPluginPostExcerpt() {
+ * 	return React.createElement(
+ * 		PluginPostExcerpt,
+ * 		{
+ * 			className: 'my-plugin-post-excerpt',
+ * 		},
+ * 		__( 'Post excerpt custom content' )
+ * 	)
+ * }
+ * ```
+ *
+ * @example
+ * ```jsx
+ * // Using ESNext syntax
+ * import { __ } from '@wordpress/i18n';
+ * import { __experimentalPluginPostExcerpt as PluginPostExcerpt } from '@wordpress/edit-post';
+ *
+ * const MyPluginPostExcerpt = () => (
+ * 	<PluginPostExcerpt className="my-plugin-post-excerpt">
+ * 		{ __( 'Post excerpt custom content' ) }
+ * 	</PluginPostExcerpt>
+ * );
+ * ```
+ *
+ * @return {Component} The component to be rendered.
+ */
+const PluginPostExcerpt = ( { children, className } ) => {
+	return (
+		<Fill>
+			<PanelRow className={ className }>{ children }</PanelRow>
+		</Fill>
+	);
+};
+
+PluginPostExcerpt.Slot = Slot;
+
+export default PluginPostExcerpt;
diff --git a/packages/editor/src/components/post-excerpt/style.scss b/packages/editor/src/components/post-excerpt/style.scss
index 056d81ad36c731..9a8f1553fed2cb 100644
--- a/packages/editor/src/components/post-excerpt/style.scss
+++ b/packages/editor/src/components/post-excerpt/style.scss
@@ -2,3 +2,10 @@
 	width: 100%;
 	margin-bottom: 10px;
 }
+
+.editor-post-excerpt__dropdown__content {
+	.components-popover__content {
+		min-width: 320px;
+		padding: $grid-unit-20;
+	}
+}
diff --git a/packages/editor/src/components/post-excerpt/test/plugin.js b/packages/editor/src/components/post-excerpt/test/plugin.js
new file mode 100644
index 00000000000000..d6f81d459deb33
--- /dev/null
+++ b/packages/editor/src/components/post-excerpt/test/plugin.js
@@ -0,0 +1,36 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import { SlotFillProvider } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import PluginPostExcerptPanel from '../plugin';
+
+describe( 'PluginPostExcerptPanel', () => {
+	test( 'renders fill properly', () => {
+		render(
+			<SlotFillProvider>
+				<PluginPostExcerptPanel className="my-plugin-post-excerpt-custom-content">
+					Post Excerpt - Custom content
+				</PluginPostExcerptPanel>
+				<div role="tabpanel">
+					<PluginPostExcerptPanel.Slot />
+				</div>
+			</SlotFillProvider>
+		);
+
+		expect( screen.getByRole( 'tabpanel' ) ).toHaveTextContent(
+			'Post Excerpt - Custom content'
+		);
+		expect(
+			screen.getByText( 'Post Excerpt - Custom content' )
+		).toHaveClass( 'my-plugin-post-excerpt-custom-content' );
+	} );
+} );
diff --git a/packages/editor/src/components/post-featured-image/check.js b/packages/editor/src/components/post-featured-image/check.js
index 24a9f80058ddcc..823559f766bc35 100644
--- a/packages/editor/src/components/post-featured-image/check.js
+++ b/packages/editor/src/components/post-featured-image/check.js
@@ -4,6 +4,15 @@
 import PostTypeSupportCheck from '../post-type-support-check';
 import ThemeSupportCheck from '../theme-support-check';
 
+/**
+ * Wrapper component that renders its children only if the post type supports a featured image
+ * and the theme supports post thumbnails.
+ *
+ * @param {Object}  props          Props.
+ * @param {Element} props.children Children to be rendered.
+ *
+ * @return {Component} The component to be rendered.
+ */
 function PostFeaturedImageCheck( { children } ) {
 	return (
 		<ThemeSupportCheck supportKeys="post-thumbnails">
diff --git a/packages/editor/src/components/post-featured-image/index.js b/packages/editor/src/components/post-featured-image/index.js
index 96eb164696228f..cabd791e938bf5 100644
--- a/packages/editor/src/components/post-featured-image/index.js
+++ b/packages/editor/src/components/post-featured-image/index.js
@@ -7,7 +7,6 @@ import {
 	DropZone,
 	Button,
 	Spinner,
-	ResponsiveWrapper,
 	withNotices,
 	withFilters,
 	__experimentalHStack as HStack,
@@ -33,7 +32,7 @@ const ALLOWED_MEDIA_TYPES = [ 'image' ];
 
 // Used when labels from post type were not yet loaded or when they are not present.
 const DEFAULT_FEATURE_IMAGE_LABEL = __( 'Featured image' );
-const DEFAULT_SET_FEATURE_IMAGE_LABEL = __( 'Set featured image' );
+const DEFAULT_SET_FEATURE_IMAGE_LABEL = __( 'Add a featured image' );
 
 const instructions = (
 	<p>
@@ -98,17 +97,12 @@ function PostFeaturedImage( {
 } ) {
 	const toggleRef = useRef();
 	const [ isLoading, setIsLoading ] = useState( false );
-	const mediaUpload = useSelect( ( select ) => {
-		return select( blockEditorStore ).getSettings().mediaUpload;
-	}, [] );
-	const { mediaWidth, mediaHeight, mediaSourceUrl } = getMediaDetails(
-		media,
-		currentPostId
-	);
+	const { getSettings } = useSelect( blockEditorStore );
+	const { mediaSourceUrl } = getMediaDetails( media, currentPostId );
 
 	function onDropFiles( filesList ) {
-		mediaUpload( {
-			allowedTypes: [ 'image' ],
+		getSettings().mediaUpload( {
+			allowedTypes: ALLOWED_MEDIA_TYPES,
 			filesList,
 			onFileChange( [ image ] ) {
 				if ( isBlobURL( image?.url ) ) {
@@ -127,6 +121,35 @@ function PostFeaturedImage( {
 		} );
 	}
 
+	/**
+	 * Generates the featured image alt text for this editing context.
+	 *
+	 * @param {Object} imageMedia                               The image media object.
+	 * @param {string} imageMedia.alt_text                      The alternative text of the image.
+	 * @param {Object} imageMedia.media_details                 The media details of the image.
+	 * @param {Object} imageMedia.media_details.sizes           The sizes of the image.
+	 * @param {Object} imageMedia.media_details.sizes.full      The full size details of the image.
+	 * @param {string} imageMedia.media_details.sizes.full.file The file name of the full size image.
+	 * @param {string} imageMedia.slug                          The slug of the image.
+	 * @return {string} The featured image alt text.
+	 */
+	function getImageDescription( imageMedia ) {
+		if ( imageMedia.alt_text ) {
+			return sprintf(
+				// Translators: %s: The selected image alt text.
+				__( 'Current image: %s' ),
+				imageMedia.alt_text
+			);
+		}
+		return sprintf(
+			// Translators: %s: The selected image filename.
+			__(
+				'The current image has no alternative text. The file name is: %s'
+			),
+			imageMedia.media_details.sizes?.full?.file || imageMedia.slug
+		);
+	}
+
 	return (
 		<PostFeaturedImageCheck>
 			{ noticeUI }
@@ -136,21 +159,7 @@ function PostFeaturedImage( {
 						id={ `editor-post-featured-image-${ featuredImageId }-describedby` }
 						className="hidden"
 					>
-						{ media.alt_text &&
-							sprintf(
-								// Translators: %s: The selected image alt text.
-								__( 'Current image: %s' ),
-								media.alt_text
-							) }
-						{ ! media.alt_text &&
-							sprintf(
-								// Translators: %s: The selected image filename.
-								__(
-									'The current image has no alternative text. The file name is: %s'
-								),
-								media.media_details.sizes?.full?.file ||
-									media.slug
-							) }
+						{ getImageDescription( media ) }
 					</div>
 				) }
 				<MediaUploadCheck fallback={ instructions }>
@@ -166,6 +175,7 @@ function PostFeaturedImage( {
 						render={ ( { open } ) => (
 							<div className="editor-post-featured-image__container">
 								<Button
+									__next40pxDefaultSize
 									ref={ toggleRef }
 									className={
 										! featuredImageId
@@ -176,25 +186,25 @@ function PostFeaturedImage( {
 									aria-label={
 										! featuredImageId
 											? null
-											: __( 'Edit or replace the image' )
+											: __(
+													'Edit or replace the featured image'
+											  )
 									}
 									aria-describedby={
 										! featuredImageId
 											? null
 											: `editor-post-featured-image-${ featuredImageId }-describedby`
 									}
+									aria-haspopup="dialog"
+									disabled={ isLoading }
+									accessibleWhenDisabled
 								>
 									{ !! featuredImageId && media && (
-										<ResponsiveWrapper
-											naturalWidth={ mediaWidth }
-											naturalHeight={ mediaHeight }
-											isInline
-										>
-											<img
-												src={ mediaSourceUrl }
-												alt=""
-											/>
-										</ResponsiveWrapper>
+										<img
+											className="editor-post-featured-image__preview-image"
+											src={ mediaSourceUrl }
+											alt={ getImageDescription( media ) }
+										/>
 									) }
 									{ isLoading && <Spinner /> }
 									{ ! featuredImageId &&
@@ -206,14 +216,15 @@ function PostFeaturedImage( {
 								{ !! featuredImageId && (
 									<HStack className="editor-post-featured-image__actions">
 										<Button
+											__next40pxDefaultSize
 											className="editor-post-featured-image__action"
 											onClick={ open }
-											// Prefer that screen readers use the .editor-post-featured-image__preview button.
-											aria-hidden="true"
+											aria-haspopup="dialog"
 										>
 											{ __( 'Replace' ) }
 										</Button>
 										<Button
+											__next40pxDefaultSize
 											className="editor-post-featured-image__action"
 											onClick={ () => {
 												onRemoveImage();
@@ -279,6 +290,21 @@ const applyWithDispatch = withDispatch(
 	}
 );
 
+/**
+ * Renders the component for managing the featured image of a post.
+ *
+ * @param {Object}   props                  Props.
+ * @param {number}   props.currentPostId    ID of the current post.
+ * @param {number}   props.featuredImageId  ID of the featured image.
+ * @param {Function} props.onUpdateImage    Function to call when the image is updated.
+ * @param {Function} props.onRemoveImage    Function to call when the image is removed.
+ * @param {Object}   props.media            The media object representing the featured image.
+ * @param {string}   props.postType         Post type.
+ * @param {Element}  props.noticeUI         UI for displaying notices.
+ * @param {Object}   props.noticeOperations Operations for managing notices.
+ *
+ * @return {Element} Component to be rendered .
+ */
 export default compose(
 	withNotices,
 	applyWithSelect,
diff --git a/packages/editor/src/components/post-featured-image/panel.js b/packages/editor/src/components/post-featured-image/panel.js
new file mode 100644
index 00000000000000..dd2a1527152ddf
--- /dev/null
+++ b/packages/editor/src/components/post-featured-image/panel.js
@@ -0,0 +1,70 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { PanelBody } from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import PostFeaturedImage from './index';
+import PostFeaturedImageCheck from './check';
+
+const PANEL_NAME = 'featured-image';
+
+/**
+ * Renders the panel for the post featured image.
+ *
+ * @param {Object}  props               Props.
+ * @param {boolean} props.withPanelBody Whether to include the panel body. Default true.
+ *
+ * @return {Component|null} The component to be rendered.
+ * Return Null if the editor panel is disabled for featured image.
+ */
+export default function PostFeaturedImagePanel( { withPanelBody = true } ) {
+	const { postType, isEnabled, isOpened } = useSelect( ( select ) => {
+		const {
+			getEditedPostAttribute,
+			isEditorPanelEnabled,
+			isEditorPanelOpened,
+		} = select( editorStore );
+		const { getPostType } = select( coreStore );
+
+		return {
+			postType: getPostType( getEditedPostAttribute( 'type' ) ),
+			isEnabled: isEditorPanelEnabled( PANEL_NAME ),
+			isOpened: isEditorPanelOpened( PANEL_NAME ),
+		};
+	}, [] );
+
+	const { toggleEditorPanelOpened } = useDispatch( editorStore );
+
+	if ( ! isEnabled ) {
+		return null;
+	}
+
+	if ( ! withPanelBody ) {
+		return (
+			<PostFeaturedImageCheck>
+				<PostFeaturedImage />
+			</PostFeaturedImageCheck>
+		);
+	}
+
+	return (
+		<PostFeaturedImageCheck>
+			<PanelBody
+				title={
+					postType?.labels?.featured_image ?? __( 'Featured image' )
+				}
+				opened={ isOpened }
+				onToggle={ () => toggleEditorPanelOpened( PANEL_NAME ) }
+			>
+				<PostFeaturedImage />
+			</PanelBody>
+		</PostFeaturedImageCheck>
+	);
+}
diff --git a/packages/editor/src/components/post-featured-image/style.scss b/packages/editor/src/components/post-featured-image/style.scss
index 3b14662bf1d427..30d5cb43403cdf 100644
--- a/packages/editor/src/components/post-featured-image/style.scss
+++ b/packages/editor/src/components/post-featured-image/style.scss
@@ -1,7 +1,6 @@
 .editor-post-featured-image {
 	padding: 0;
 
-
 	.components-spinner {
 		position: absolute;
 		top: 50%;
@@ -9,13 +8,6 @@
 		margin-top: -9px;
 		margin-left: -9px;
 	}
-
-	// This keeps images at their intrinsic size (eg. a 50px
-	// image will never be wider than 50px).
-	.components-responsive-wrapper__content {
-		max-width: 100%;
-		width: auto;
-	}
 }
 
 .editor-post-featured-image__container {
@@ -28,43 +20,54 @@
 			opacity: 1;
 		}
 	}
+
+	.components-drop-zone__content {
+		border-radius: $radius-small;
+	}
+
+	// Align text and icons horizontally to avoid clipping when the featured image is not set.
+	&:has(.editor-post-featured-image__toggle) .components-drop-zone .components-drop-zone__content-inner {
+		display: flex;
+		align-items: center;
+		gap: $grid-unit-10;
+
+		.components-drop-zone__content-icon {
+			margin: 0;
+		}
+	}
 }
 
 .editor-post-featured-image__toggle,
 .editor-post-featured-image__preview {
 	width: 100%;
 	padding: 0;
-	transition: all 0.1s ease-out;
-	@include reduce-motion("transition");
 	box-shadow: 0 0 0 0 var(--wp-admin-theme-color);
 	overflow: hidden; // Ensure the focus style properly encapsulates the image.
+	outline-offset: -#{$border-width};
+	min-height: $grid-unit-50;
 
-	// Apply a max-height.
 	display: flex;
 	justify-content: center;
-	max-height: 150px;
 }
 
 .editor-post-featured-image__preview {
-	height: auto;
+	height: auto !important;
+	outline: $border-width solid rgba($black, 0.1);
 
-	.components-responsive-wrapper {
+	.editor-post-featured-image__preview-image {
+		object-fit: cover;
 		width: 100%;
-		background: $gray-100;
+		object-position: 50% 50%;
+		aspect-ratio: 2/1;
 	}
 }
 
 .editor-post-featured-image__toggle {
-	border-radius: $radius-block-ui;
-	background-color: $gray-100;
-	min-height: 90px;
-	line-height: 20px;
-	padding: $grid-unit-10 0;
-	text-align: center;
+	box-shadow: inset 0 0 0 $border-width $gray-400;
 
-	&:hover {
-		background: $gray-300;
-		color: $gray-900;
+	&:focus:not(:disabled) {
+		// Allow smooth transition between focused and unfocused box-shadow states.
+		box-shadow: 0 0 0 currentColor inset, 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 	}
 }
 
diff --git a/packages/editor/src/components/post-format/check.js b/packages/editor/src/components/post-format/check.js
index 0810c9d613aae4..35729770b93c40 100644
--- a/packages/editor/src/components/post-format/check.js
+++ b/packages/editor/src/components/post-format/check.js
@@ -27,4 +27,12 @@ function PostFormatCheck( { children } ) {
 	);
 }
 
+/**
+ * Component check if there are any post formats.
+ *
+ * @param {Object}  props          The component props.
+ * @param {Element} props.children The child elements to render.
+ *
+ * @return {Component|null} The rendered component or null if post formats are disabled.
+ */
 export default PostFormatCheck;
diff --git a/packages/editor/src/components/post-format/index.js b/packages/editor/src/components/post-format/index.js
index 2b422ccebbaa84..8f7423239600f2 100644
--- a/packages/editor/src/components/post-format/index.js
+++ b/packages/editor/src/components/post-format/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __, sprintf } from '@wordpress/i18n';
-import { Button, SelectControl } from '@wordpress/components';
+import { Button, RadioControl } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useInstanceId } from '@wordpress/compose';
 import { store as coreStore } from '@wordpress/core-data';
@@ -38,6 +38,16 @@ export const POST_FORMATS = [
 	return 0;
 } );
 
+/**
+ * `PostFormat` a component that allows changing the post format while also providing a suggestion for the current post.
+ *
+ * @example
+ * ```jsx
+ * <PostFormat />
+ * ```
+ *
+ * @return {JSX.Element} The rendered PostFormat component.
+ */
 export default function PostFormat() {
 	const instanceId = useInstanceId( PostFormat );
 	const postFormatSelectorId = `post-format-selector-${ instanceId }`;
@@ -75,20 +85,22 @@ export default function PostFormat() {
 	return (
 		<PostFormatCheck>
 			<div className="editor-post-format">
-				<SelectControl
-					__nextHasNoMarginBottom
+				<RadioControl
+					className="editor-post-format__options"
 					label={ __( 'Post Format' ) }
-					value={ postFormat }
+					selected={ postFormat }
 					onChange={ ( format ) => onUpdatePostFormat( format ) }
 					id={ postFormatSelectorId }
 					options={ formats.map( ( format ) => ( {
 						label: format.caption,
 						value: format.id,
 					} ) ) }
+					hideLabelFromVision
 				/>
 				{ suggestion && suggestion.id !== postFormat && (
 					<p className="editor-post-format__suggestion">
 						<Button
+							__next40pxDefaultSize
 							variant="link"
 							onClick={ () =>
 								onUpdatePostFormat( suggestion.id )
diff --git a/packages/editor/src/components/post-format/panel.js b/packages/editor/src/components/post-format/panel.js
new file mode 100644
index 00000000000000..faaf88b785a4b2
--- /dev/null
+++ b/packages/editor/src/components/post-format/panel.js
@@ -0,0 +1,87 @@
+/**
+ * WordPress dependencies
+ */
+import { Button, Dropdown } from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { useState, useMemo } from '@wordpress/element';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { default as PostFormatForm, POST_FORMATS } from './';
+import PostFormatCheck from './check';
+import PostPanelRow from '../post-panel-row';
+import { store as editorStore } from '../../store';
+
+/**
+ * Renders the Post Author Panel component.
+ *
+ * @return {Component} The component to be rendered.
+ */
+function PostFormat() {
+	const { postFormat } = useSelect( ( select ) => {
+		const { getEditedPostAttribute } = select( editorStore );
+		const _postFormat = getEditedPostAttribute( 'format' );
+		return {
+			postFormat: _postFormat ?? 'standard',
+		};
+	}, [] );
+	const activeFormat = POST_FORMATS.find(
+		( format ) => format.id === postFormat
+	);
+
+	// Use internal state instead of a ref to make sure that the component
+	// re-renders when the popover's anchor updates.
+	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor ]
+	);
+	return (
+		<PostFormatCheck>
+			<PostPanelRow label={ __( 'Format' ) } ref={ setPopoverAnchor }>
+				<Dropdown
+					popoverProps={ popoverProps }
+					contentClassName="editor-post-format__dialog"
+					focusOnMount
+					renderToggle={ ( { isOpen, onToggle } ) => (
+						<Button
+							size="compact"
+							variant="tertiary"
+							aria-expanded={ isOpen }
+							aria-label={ sprintf(
+								// translators: %s: Current post format.
+								__( 'Change format: %s' ),
+								activeFormat?.caption
+							) }
+							onClick={ onToggle }
+						>
+							{ activeFormat?.caption }
+						</Button>
+					) }
+					renderContent={ ( { onClose } ) => (
+						<div className="editor-post-format__dialog-content">
+							<InspectorPopoverHeader
+								title={ __( 'Format' ) }
+								onClose={ onClose }
+							/>
+							<PostFormatForm />
+						</div>
+					) }
+				/>
+			</PostPanelRow>
+		</PostFormatCheck>
+	);
+}
+
+export default PostFormat;
diff --git a/packages/editor/src/components/post-format/style.scss b/packages/editor/src/components/post-format/style.scss
index 09fb0f11b9f949..9c893f36bcc16c 100644
--- a/packages/editor/src/components/post-format/style.scss
+++ b/packages/editor/src/components/post-format/style.scss
@@ -1,3 +1,9 @@
 [class].editor-post-format__suggestion {
 	margin: $grid-unit-05 0 0 0;
 }
+
+.editor-post-format__dialog .editor-post-format__dialog-content {
+	// sidebar width - popover padding - form margin
+	min-width: $sidebar-width - $grid-unit-20 - $grid-unit-20;
+	margin: $grid-unit-10;
+}
diff --git a/packages/editor/src/components/post-last-edited-panel/index.js b/packages/editor/src/components/post-last-edited-panel/index.js
new file mode 100644
index 00000000000000..a9797747876fb0
--- /dev/null
+++ b/packages/editor/src/components/post-last-edited-panel/index.js
@@ -0,0 +1,35 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalText as Text } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { __, sprintf } from '@wordpress/i18n';
+import { humanTimeDiff } from '@wordpress/date';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+
+export default function PostLastEditedPanel() {
+	const modified = useSelect(
+		( select ) =>
+			select( editorStore ).getEditedPostAttribute( 'modified' ),
+		[]
+	);
+	const lastEditedText =
+		modified &&
+		sprintf(
+			// translators: %s: Human-readable time difference, e.g. "2 days ago".
+			__( 'Last edited %s.' ),
+			humanTimeDiff( modified )
+		);
+	if ( ! lastEditedText ) {
+		return null;
+	}
+	return (
+		<div className="editor-post-last-edited-panel">
+			<Text>{ lastEditedText }</Text>
+		</div>
+	);
+}
diff --git a/packages/editor/src/components/post-last-edited-panel/style.scss b/packages/editor/src/components/post-last-edited-panel/style.scss
new file mode 100644
index 00000000000000..01392fe7c8fcd8
--- /dev/null
+++ b/packages/editor/src/components/post-last-edited-panel/style.scss
@@ -0,0 +1,6 @@
+.editor-post-last-edited-panel {
+	color: $gray-700;
+	& .components-text {
+		color: inherit;
+	}
+}
diff --git a/packages/editor/src/components/post-last-revision/check.js b/packages/editor/src/components/post-last-revision/check.js
index 44f96b9cf7acb0..c570f5e42cdc32 100644
--- a/packages/editor/src/components/post-last-revision/check.js
+++ b/packages/editor/src/components/post-last-revision/check.js
@@ -9,6 +9,14 @@ import { useSelect } from '@wordpress/data';
 import PostTypeSupportCheck from '../post-type-support-check';
 import { store as editorStore } from '../../store';
 
+/**
+ * Wrapper component that renders its children if the post has more than one revision.
+ *
+ * @param {Object}  props          Props.
+ * @param {Element} props.children Children to be rendered.
+ *
+ * @return {Component|null} Rendered child components if post has more than one revision, otherwise null.
+ */
 function PostLastRevisionCheck( { children } ) {
 	const { lastRevisionId, revisionsCount } = useSelect( ( select ) => {
 		const { getCurrentPostLastRevisionId, getCurrentPostRevisionsCount } =
diff --git a/packages/editor/src/components/post-last-revision/index.js b/packages/editor/src/components/post-last-revision/index.js
index f4d896555fbf6b..c0ce37198c951d 100644
--- a/packages/editor/src/components/post-last-revision/index.js
+++ b/packages/editor/src/components/post-last-revision/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { sprintf, _n } from '@wordpress/i18n';
+import { sprintf, __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { backup } from '@wordpress/icons';
@@ -11,10 +11,11 @@ import { addQueryArgs } from '@wordpress/url';
  * Internal dependencies
  */
 import PostLastRevisionCheck from './check';
+import PostPanelRow from '../post-panel-row';
 import { store as editorStore } from '../../store';
 
-function LastRevision() {
-	const { lastRevisionId, revisionsCount } = useSelect( ( select ) => {
+function usePostLastRevisionInfo() {
+	return useSelect( ( select ) => {
 		const { getCurrentPostLastRevisionId, getCurrentPostRevisionsCount } =
 			select( editorStore );
 		return {
@@ -22,24 +23,53 @@ function LastRevision() {
 			revisionsCount: getCurrentPostRevisionsCount(),
 		};
 	}, [] );
+}
+
+/**
+ * Renders the component for displaying the last revision of a post.
+ *
+ * @return {Component} The component to be rendered.
+ */
+function PostLastRevision() {
+	const { lastRevisionId, revisionsCount } = usePostLastRevisionInfo();
 
 	return (
 		<PostLastRevisionCheck>
 			<Button
+				__next40pxDefaultSize
 				href={ addQueryArgs( 'revision.php', {
 					revision: lastRevisionId,
 				} ) }
 				className="editor-post-last-revision__title"
 				icon={ backup }
-			>
-				{ sprintf(
-					/* translators: %d: number of revisions */
-					_n( '%d Revision', '%d Revisions', revisionsCount ),
+				iconPosition="right"
+				text={ sprintf(
+					/* translators: %s: number of revisions */
+					__( 'Revisions (%s)' ),
 					revisionsCount
 				) }
-			</Button>
+			/>
+		</PostLastRevisionCheck>
+	);
+}
+
+export function PrivatePostLastRevision() {
+	const { lastRevisionId, revisionsCount } = usePostLastRevisionInfo();
+	return (
+		<PostLastRevisionCheck>
+			<PostPanelRow label={ __( 'Revisions' ) }>
+				<Button
+					href={ addQueryArgs( 'revision.php', {
+						revision: lastRevisionId,
+					} ) }
+					className="editor-private-post-last-revision__button"
+					text={ revisionsCount }
+					variant="tertiary"
+					size="compact"
+				/>
+			</PostPanelRow>
 		</PostLastRevisionCheck>
 	);
 }
 
-export default LastRevision;
+export default PostLastRevision;
diff --git a/packages/editor/src/components/post-last-revision/panel.js b/packages/editor/src/components/post-last-revision/panel.js
new file mode 100644
index 00000000000000..e87475cc2b34e9
--- /dev/null
+++ b/packages/editor/src/components/post-last-revision/panel.js
@@ -0,0 +1,27 @@
+/**
+ * WordPress dependencies
+ */
+import { PanelBody } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import PostLastRevision from './';
+import PostLastRevisionCheck from './check';
+
+/**
+ * Renders the panel for displaying the last revision of a post.
+ *
+ * @return {Component} The component to be rendered.
+ */
+function PostLastRevisionPanel() {
+	return (
+		<PostLastRevisionCheck>
+			<PanelBody className="editor-post-last-revision__panel">
+				<PostLastRevision />
+			</PanelBody>
+		</PostLastRevisionCheck>
+	);
+}
+
+export default PostLastRevisionPanel;
diff --git a/packages/editor/src/components/post-last-revision/style.scss b/packages/editor/src/components/post-last-revision/style.scss
index 7e4514aa2baca6..055ebc71b34e83 100644
--- a/packages/editor/src/components/post-last-revision/style.scss
+++ b/packages/editor/src/components/post-last-revision/style.scss
@@ -1,14 +1,11 @@
 .editor-post-last-revision__title {
 	width: 100%;
-	font-weight: 600;
-
-	.dashicon {
-		margin-right: 5px;
-	}
+	font-weight: 500;
 }
 
-.components-button.editor-post-last-revision__title {
+.editor-post-last-revision__title.components-button.has-icon {
 	height: 100%;
+	justify-content: space-between;
 
 	&:hover,
 	&:active {
@@ -21,3 +18,17 @@
 		border-radius: 0;
 	}
 }
+
+// Needs specificity, because this panel is just a button
+.components-panel__body.is-opened.editor-post-last-revision__panel {
+	padding: 0;
+	height: $grid-unit-60;
+
+	.editor-post-last-revision__title.components-button.components-button {
+		padding: $grid-unit-20;
+	}
+}
+
+.editor-private-post-last-revision__button {
+	display: inline-block;
+}
diff --git a/packages/editor/src/components/post-last-revision/test/check.js b/packages/editor/src/components/post-last-revision/test/check.js
index 6e5210e8ed6bfb..0c3e680992a2e1 100644
--- a/packages/editor/src/components/post-last-revision/test/check.js
+++ b/packages/editor/src/components/post-last-revision/test/check.js
@@ -21,7 +21,11 @@ function setupDataMock( id, count ) {
 			getCurrentPostLastRevisionId: () => id,
 			getCurrentPostRevisionsCount: () => count,
 			getEditedPostAttribute: () => null,
-			getPostType: () => null,
+			getPostType: () => ( {
+				supports: {
+					revisions: true,
+				},
+			} ),
 		} ) )
 	);
 }
diff --git a/packages/editor/src/components/post-locked-modal/index.js b/packages/editor/src/components/post-locked-modal/index.js
index ea21c61de1e153..7bfa2d23fd9808 100644
--- a/packages/editor/src/components/post-locked-modal/index.js
+++ b/packages/editor/src/components/post-locked-modal/index.js
@@ -20,6 +20,12 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * A modal component that is displayed when a post is locked for editing by another user.
+ * The modal provides information about the lock status and options to take over or exit the editor.
+ *
+ * @return {JSX.Element|null} The rendered PostLockedModal component.
+ */
 export default function PostLockedModal() {
 	const instanceId = useInstanceId( PostLockedModal );
 	const hookName = 'core/editor/post-locked-modal-' + instanceId;
@@ -168,11 +174,13 @@ export default function PostLockedModal() {
 					? __( 'Someone else has taken over this post' )
 					: __( 'This post is already being edited' )
 			}
-			focusOnMount={ true }
+			focusOnMount
 			shouldCloseOnClickOutside={ false }
 			shouldCloseOnEsc={ false }
 			isDismissible={ false }
+			// Do not remove this class, as this class is used by third party plugins.
 			className="editor-post-locked-modal"
+			size="medium"
 		>
 			<HStack alignment="top" spacing={ 6 }>
 				{ !! userAvatar && (
@@ -248,11 +256,19 @@ export default function PostLockedModal() {
 						justify="flex-end"
 					>
 						{ ! isTakeover && (
-							<Button variant="tertiary" href={ unlockUrl }>
+							<Button
+								__next40pxDefaultSize
+								variant="tertiary"
+								href={ unlockUrl }
+							>
 								{ __( 'Take over' ) }
 							</Button>
 						) }
-						<Button variant="primary" href={ allPostsUrl }>
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							href={ allPostsUrl }
+						>
 							{ allPostsLabel }
 						</Button>
 					</HStack>
diff --git a/packages/editor/src/components/post-locked-modal/style.scss b/packages/editor/src/components/post-locked-modal/style.scss
index 9225032b6d2289..7f680022344664 100644
--- a/packages/editor/src/components/post-locked-modal/style.scss
+++ b/packages/editor/src/components/post-locked-modal/style.scss
@@ -1,15 +1,9 @@
-.editor-post-locked-modal {
-	@include break-small() {
-		max-width: $break-mobile;
-	}
-}
-
 .editor-post-locked-modal__buttons {
 	margin-top: $grid-unit-30;
 }
 
 .editor-post-locked-modal__avatar {
-	border-radius: $radius-block-ui;
+	border-radius: $radius-round;
 	margin-top: $grid-unit-20;
 	min-width: initial !important;
 }
diff --git a/packages/editor/src/components/post-panel-row/index.js b/packages/editor/src/components/post-panel-row/index.js
index f6f0c658cd7240..71dd63d3c0d956 100644
--- a/packages/editor/src/components/post-panel-row/index.js
+++ b/packages/editor/src/components/post-panel-row/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -12,7 +12,7 @@ import { forwardRef } from '@wordpress/element';
 const PostPanelRow = forwardRef( ( { className, label, children }, ref ) => {
 	return (
 		<HStack
-			className={ classnames( 'editor-post-panel__row', className ) }
+			className={ clsx( 'editor-post-panel__row', className ) }
 			ref={ ref }
 		>
 			{ label && (
diff --git a/packages/editor/src/components/post-panel-row/style.scss b/packages/editor/src/components/post-panel-row/style.scss
index bc1c7fbd000c63..53e0c645f6f069 100644
--- a/packages/editor/src/components/post-panel-row/style.scss
+++ b/packages/editor/src/components/post-panel-row/style.scss
@@ -1,21 +1,38 @@
 .editor-post-panel__row {
 	width: 100%;
-	min-height: $button-size;
+	min-height: $grid-unit-40;
 	justify-content: flex-start !important;
 	align-items: flex-start !important;
 }
 
 .editor-post-panel__row-label {
-	width: 30%;
+	width: 38%;
 	flex-shrink: 0;
-	min-height: $button-size;
+	min-height: $grid-unit-40;
 	display: flex;
 	align-items: center;
+	padding: 6px 0; // Matches button to ensure alignment
+	line-height: $grid-unit-05 * 5;
+	hyphens: auto;
 }
 
 .editor-post-panel__row-control {
 	flex-grow: 1;
-	min-height: $button-size;
+	min-height: $grid-unit-40;
 	display: flex;
 	align-items: center;
+
+	.components-button {
+		max-width: 100%;
+		text-align: left;
+		white-space: normal;
+		text-wrap: balance; // Fallback for Safari.
+		text-wrap: pretty;
+		height: auto;
+		min-height: $button-size-compact;
+	}
+
+	.components-dropdown {
+		max-width: 100%;
+	}
 }
diff --git a/packages/editor/src/components/post-panel-section/index.js b/packages/editor/src/components/post-panel-section/index.js
new file mode 100644
index 00000000000000..3b27da874844bc
--- /dev/null
+++ b/packages/editor/src/components/post-panel-section/index.js
@@ -0,0 +1,19 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { __experimentalVStack as VStack } from '@wordpress/components';
+
+function PostPanelSection( { className, children } ) {
+	return (
+		<VStack className={ clsx( 'editor-post-panel__section', className ) }>
+			{ children }
+		</VStack>
+	);
+}
+
+export default PostPanelSection;
diff --git a/packages/editor/src/components/post-panel-section/style.scss b/packages/editor/src/components/post-panel-section/style.scss
new file mode 100644
index 00000000000000..6343386b0cfc1b
--- /dev/null
+++ b/packages/editor/src/components/post-panel-section/style.scss
@@ -0,0 +1,3 @@
+.editor-post-panel__section {
+	padding: $grid-unit-20;
+}
diff --git a/packages/editor/src/components/post-pending-status/check.js b/packages/editor/src/components/post-pending-status/check.js
index 347cb6d7272276..7a4ff5195041c6 100644
--- a/packages/editor/src/components/post-pending-status/check.js
+++ b/packages/editor/src/components/post-pending-status/check.js
@@ -8,6 +8,16 @@ import { useSelect } from '@wordpress/data';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * This component checks the publishing status of the current post.
+ * If the post is already published or the user doesn't have the
+ * capability to publish, it returns null.
+ *
+ * @param {Object}  props          Component properties.
+ * @param {Element} props.children Children to be rendered.
+ *
+ * @return {JSX.Element|null} The rendered child elements or null if the post is already published or the user doesn't have the capability to publish.
+ */
 export function PostPendingStatusCheck( { children } ) {
 	const { hasPublishAction, isPublished } = useSelect( ( select ) => {
 		const { isCurrentPostPublished, getCurrentPost } =
diff --git a/packages/editor/src/components/post-pending-status/index.js b/packages/editor/src/components/post-pending-status/index.js
index 85557517da6a11..8363ebc715891b 100644
--- a/packages/editor/src/components/post-pending-status/index.js
+++ b/packages/editor/src/components/post-pending-status/index.js
@@ -11,6 +11,11 @@ import { useDispatch, useSelect } from '@wordpress/data';
 import PostPendingStatusCheck from './check';
 import { store as editorStore } from '../../store';
 
+/**
+ * A component for displaying and toggling the pending status of a post.
+ *
+ * @return {JSX.Element} The rendered component.
+ */
 export function PostPendingStatus() {
 	const status = useSelect(
 		( select ) => select( editorStore ).getEditedPostAttribute( 'status' ),
diff --git a/packages/editor/src/components/post-pingbacks/index.js b/packages/editor/src/components/post-pingbacks/index.js
index d6e1c419ee6f9d..2ec9a4a78c54d6 100644
--- a/packages/editor/src/components/post-pingbacks/index.js
+++ b/packages/editor/src/components/post-pingbacks/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { CheckboxControl } from '@wordpress/components';
+import { CheckboxControl, ExternalLink } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 
 /**
@@ -26,11 +26,26 @@ function PostPingbacks() {
 	return (
 		<CheckboxControl
 			__nextHasNoMarginBottom
-			label={ __( 'Allow pingbacks & trackbacks' ) }
+			label={ __( 'Enable pingbacks & trackbacks' ) }
 			checked={ pingStatus === 'open' }
 			onChange={ onTogglePingback }
+			help={
+				<ExternalLink
+					href={ __(
+						'https://wordpress.org/documentation/article/trackbacks-and-pingbacks/'
+					) }
+				>
+					{ __( 'Learn more about pingbacks & trackbacks' ) }
+				</ExternalLink>
+			}
 		/>
 	);
 }
 
+/**
+ * Renders a control for enabling or disabling pingbacks and trackbacks
+ * in a WordPress post.
+ *
+ * @module PostPingbacks
+ */
 export default PostPingbacks;
diff --git a/packages/editor/src/components/post-preview-button/index.js b/packages/editor/src/components/post-preview-button/index.js
index 9a9aa92d210c3d..d57143cd355d80 100644
--- a/packages/editor/src/components/post-preview-button/index.js
+++ b/packages/editor/src/components/post-preview-button/index.js
@@ -99,6 +99,21 @@ function writeInterstitialMessage( targetDocument ) {
 	targetDocument.close();
 }
 
+/**
+ * Renders a button that opens a new window or tab for the preview,
+ * writes the interstitial message to this window, and then navigates
+ * to the actual preview link. The button is not rendered if the post
+ * is not viewable and disabled if the post is not saveable.
+ *
+ * @param {Object}   props                     The component props.
+ * @param {string}   props.className           The class name for the button.
+ * @param {string}   props.textContent         The text content for the button.
+ * @param {boolean}  props.forceIsAutosaveable Whether to force autosave.
+ * @param {string}   props.role                The role attribute for the button.
+ * @param {Function} props.onPreview           The callback function for preview event.
+ *
+ * @return {JSX.Element|null} The rendered button component.
+ */
 export default function PostPreviewButton( {
 	className,
 	textContent,
@@ -168,9 +183,11 @@ export default function PostPreviewButton( {
 			className={ className || 'editor-post-preview' }
 			href={ href }
 			target={ targetId }
+			accessibleWhenDisabled
 			disabled={ ! isSaveable }
 			onClick={ openPreviewWindow }
 			role={ role }
+			size="compact"
 		>
 			{ textContent || (
 				<>
diff --git a/packages/editor/src/components/post-preview-button/test/index.js b/packages/editor/src/components/post-preview-button/test/index.js
index e34c05caa178bd..bb51f302edf50e 100644
--- a/packages/editor/src/components/post-preview-button/test/index.js
+++ b/packages/editor/src/components/post-preview-button/test/index.js
@@ -139,12 +139,16 @@ describe( 'PostPreviewButton', () => {
 		).toBeInTheDocument();
 	} );
 
-	it( 'should be disabled if post is not saveable.', () => {
+	it( 'should be accessibly disabled if post is not saveable.', () => {
 		mockUseSelect( { isEditedPostSaveable: () => false } );
 
 		render( <PostPreviewButton /> );
 
-		expect( screen.getByRole( 'button' ) ).toBeDisabled();
+		expect( screen.getByRole( 'button' ) ).toBeEnabled();
+		expect( screen.getByRole( 'button' ) ).toHaveAttribute(
+			'aria-disabled',
+			'true'
+		);
 	} );
 
 	it( 'should not be disabled if post is saveable.', () => {
@@ -153,6 +157,10 @@ describe( 'PostPreviewButton', () => {
 		render( <PostPreviewButton /> );
 
 		expect( screen.getByRole( 'button' ) ).toBeEnabled();
+		expect( screen.getByRole( 'button' ) ).not.toHaveAttribute(
+			'aria-disabled',
+			'true'
+		);
 	} );
 
 	it( 'should set `href` to edited post preview link if specified.', () => {
diff --git a/packages/editor/src/components/post-publish-button/index.js b/packages/editor/src/components/post-publish-button/index.js
index a81709607e1931..71e18a4d6a9c82 100644
--- a/packages/editor/src/components/post-publish-button/index.js
+++ b/packages/editor/src/components/post-publish-button/index.js
@@ -1,16 +1,10 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
 import { Button } from '@wordpress/components';
-import { Component, createRef } from '@wordpress/element';
+import { Component } from '@wordpress/element';
 import { withSelect, withDispatch } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
-import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -23,7 +17,6 @@ const noop = () => {};
 export class PostPublishButton extends Component {
 	constructor( props ) {
 		super( props );
-		this.buttonNode = createRef();
 
 		this.createOnClick = this.createOnClick.bind( this );
 		this.closeEntitiesSavedStates =
@@ -34,21 +27,6 @@ export class PostPublishButton extends Component {
 		};
 	}
 
-	componentDidMount() {
-		if ( this.props.focusOnMount ) {
-			// This timeout is necessary to make sure the `useEffect` hook of
-			// `useFocusReturn` gets the correct element (the button that opens the
-			// PostPublishPanel) otherwise it will get this button.
-			this.timeoutID = setTimeout( () => {
-				this.buttonNode.current.focus();
-			}, 0 );
-		}
-	}
-
-	componentWillUnmount() {
-		clearTimeout( this.timeoutID );
-	}
-
 	createOnClick( callback ) {
 		return ( ...args ) => {
 			const { hasNonPostEntityChanges, setEntitiesSavedStatesCallback } =
@@ -112,13 +90,14 @@ export class PostPublishButton extends Component {
 			isSaving,
 			isAutoSaving,
 			isToggle,
-			onSave,
-			onStatusChange,
+			savePostStatus,
 			onSubmit = noop,
 			onToggle,
 			visibility,
 			hasNonPostEntityChanges,
 			isSavingNonPostEntityChanges,
+			postStatus,
+			postStatusHasChanged,
 		} = this.props;
 
 		const isButtonDisabled =
@@ -135,15 +114,19 @@ export class PostPublishButton extends Component {
 				( ! isPublishable && ! forceIsDirty ) ) &&
 			( ! hasNonPostEntityChanges || isSavingNonPostEntityChanges );
 
-		let publishStatus;
-		if ( ! hasPublishAction ) {
+		// If the new status has not changed explicitely, we derive it from
+		// other factors, like having a publish action, etc.. We need to preserve
+		// this because it affects when to show the pre and post publish panels.
+		// If it has changed though explicitely, we need to respect that.
+		let publishStatus = 'publish';
+		if ( postStatusHasChanged ) {
+			publishStatus = postStatus;
+		} else if ( ! hasPublishAction ) {
 			publishStatus = 'pending';
 		} else if ( visibility === 'private' ) {
 			publishStatus = 'private';
 		} else if ( isBeingScheduled ) {
 			publishStatus = 'future';
-		} else {
-			publishStatus = 'publish';
 		}
 
 		const onClickButton = () => {
@@ -151,10 +134,10 @@ export class PostPublishButton extends Component {
 				return;
 			}
 			onSubmit();
-			onStatusChange( publishStatus );
-			onSave();
+			savePostStatus( publishStatus );
 		};
 
+		// Callback to open the publish panel.
 		const onClickToggle = () => {
 			if ( isToggleDisabled ) {
 				return;
@@ -179,38 +162,24 @@ export class PostPublishButton extends Component {
 			size: 'compact',
 			onClick: this.createOnClick( onClickToggle ),
 		};
-
-		const toggleChildren = isBeingScheduled
-			? __( 'Schedule…' )
-			: __( 'Publish' );
-		const buttonChildren = (
-			<PublishButtonLabel
-				hasNonPostEntityChanges={ hasNonPostEntityChanges }
-			/>
-		);
-
 		const componentProps = isToggle ? toggleProps : buttonProps;
-		const componentChildren = isToggle ? toggleChildren : buttonChildren;
 		return (
 			<>
 				<Button
-					ref={ this.buttonNode }
 					{ ...componentProps }
-					className={ classnames(
-						componentProps.className,
-						'editor-post-publish-button__button',
-						{
-							'has-changes-dot': hasNonPostEntityChanges,
-						}
-					) }
+					className={ `${ componentProps.className } editor-post-publish-button__button` }
+					size="compact"
 				>
-					{ componentChildren }
+					<PublishButtonLabel />
 				</Button>
 			</>
 		);
 	}
 }
 
+/**
+ * Renders the publish button.
+ */
 export default compose( [
 	withSelect( ( select ) => {
 		const {
@@ -227,6 +196,8 @@ export default compose( [
 			getCurrentPostId,
 			hasNonPostEntityChanges,
 			isSavingNonPostEntityChanges,
+			getEditedPostAttribute,
+			getPostEdits,
 		} = select( editorStore );
 		return {
 			isSaving: isSavingPost(),
@@ -241,6 +212,8 @@ export default compose( [
 				getCurrentPost()._links?.[ 'wp:action-publish' ] ?? false,
 			postType: getCurrentPostType(),
 			postId: getCurrentPostId(),
+			postStatus: getEditedPostAttribute( 'status' ),
+			postStatusHasChanged: getPostEdits()?.status,
 			hasNonPostEntityChanges: hasNonPostEntityChanges(),
 			isSavingNonPostEntityChanges: isSavingNonPostEntityChanges(),
 		};
@@ -248,9 +221,10 @@ export default compose( [
 	withDispatch( ( dispatch ) => {
 		const { editPost, savePost } = dispatch( editorStore );
 		return {
-			onStatusChange: ( status ) =>
-				editPost( { status }, { undoIgnore: true } ),
-			onSave: savePost,
+			savePostStatus: ( status ) => {
+				editPost( { status }, { undoIgnore: true } );
+				savePost();
+			},
 		};
 	} ),
 ] )( PostPublishButton );
diff --git a/packages/editor/src/components/post-publish-button/label.js b/packages/editor/src/components/post-publish-button/label.js
index 0a0fdd30d8500d..7eb479bc2c8d07 100644
--- a/packages/editor/src/components/post-publish-button/label.js
+++ b/packages/editor/src/components/post-publish-button/label.js
@@ -2,49 +2,32 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { compose } from '@wordpress/compose';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
+import { useViewportMatch } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
-export function PublishButtonLabel( {
-	isPublished,
-	isBeingScheduled,
-	isSaving,
-	isPublishing,
-	hasPublishAction,
-	isAutosaving,
-	hasNonPostEntityChanges,
-} ) {
-	if ( isPublishing ) {
-		/* translators: button label text should, if possible, be under 16 characters. */
-		return __( 'Publishing…' );
-	} else if ( isPublished && isSaving && ! isAutosaving ) {
-		/* translators: button label text should, if possible, be under 16 characters. */
-		return __( 'Updating…' );
-	} else if ( isBeingScheduled && isSaving && ! isAutosaving ) {
-		/* translators: button label text should, if possible, be under 16 characters. */
-		return __( 'Scheduling…' );
-	}
-
-	if ( ! hasPublishAction ) {
-		return hasNonPostEntityChanges
-			? __( 'Submit for Review…' )
-			: __( 'Submit for Review' );
-	} else if ( isPublished ) {
-		return hasNonPostEntityChanges ? __( 'Update…' ) : __( 'Update' );
-	} else if ( isBeingScheduled ) {
-		return hasNonPostEntityChanges ? __( 'Schedule…' ) : __( 'Schedule' );
-	}
-
-	return __( 'Publish' );
-}
-
-export default compose( [
-	withSelect( ( select ) => {
+/**
+ * Renders the label for the publish button.
+ *
+ * @return {string} The label for the publish button.
+ */
+export default function PublishButtonLabel() {
+	const isSmallerThanMediumViewport = useViewportMatch( 'medium', '<' );
+	const {
+		isPublished,
+		isBeingScheduled,
+		isSaving,
+		isPublishing,
+		hasPublishAction,
+		isAutosaving,
+		hasNonPostEntityChanges,
+		postStatusHasChanged,
+		postStatus,
+	} = useSelect( ( select ) => {
 		const {
 			isCurrentPostPublished,
 			isEditedPostBeingScheduled,
@@ -53,6 +36,8 @@ export default compose( [
 			getCurrentPost,
 			getCurrentPostType,
 			isAutosavingPost,
+			getPostEdits,
+			getEditedPostAttribute,
 		} = select( editorStore );
 		return {
 			isPublished: isCurrentPostPublished(),
@@ -63,6 +48,41 @@ export default compose( [
 				getCurrentPost()._links?.[ 'wp:action-publish' ] ?? false,
 			postType: getCurrentPostType(),
 			isAutosaving: isAutosavingPost(),
+			hasNonPostEntityChanges:
+				select( editorStore ).hasNonPostEntityChanges(),
+			postStatusHasChanged: !! getPostEdits()?.status,
+			postStatus: getEditedPostAttribute( 'status' ),
 		};
-	} ),
-] )( PublishButtonLabel );
+	}, [] );
+	if ( isPublishing ) {
+		/* translators: button label text should, if possible, be under 16 characters. */
+		return __( 'Publishing…' );
+	} else if (
+		( isPublished || isBeingScheduled ) &&
+		isSaving &&
+		! isAutosaving
+	) {
+		/* translators: button label text should, if possible, be under 16 characters. */
+		return __( 'Saving…' );
+	}
+	if ( ! hasPublishAction ) {
+		// TODO: this is because "Submit for review" string is too long in some languages.
+		// @see https://github.com/WordPress/gutenberg/issues/10475
+		return isSmallerThanMediumViewport
+			? __( 'Publish' )
+			: __( 'Submit for Review' );
+	}
+	if (
+		hasNonPostEntityChanges ||
+		isPublished ||
+		( postStatusHasChanged &&
+			! [ 'future', 'publish' ].includes( postStatus ) ) ||
+		( ! postStatusHasChanged && postStatus === 'future' )
+	) {
+		return __( 'Save' );
+	}
+	if ( isBeingScheduled ) {
+		return __( 'Schedule' );
+	}
+	return __( 'Publish' );
+}
diff --git a/packages/editor/src/components/post-publish-button/post-publish-button-or-toggle.js b/packages/editor/src/components/post-publish-button/post-publish-button-or-toggle.js
new file mode 100644
index 00000000000000..bf742bef1429bb
--- /dev/null
+++ b/packages/editor/src/components/post-publish-button/post-publish-button-or-toggle.js
@@ -0,0 +1,102 @@
+/**
+ * WordPress dependencies
+ */
+import { useViewportMatch, compose } from '@wordpress/compose';
+import { withDispatch, withSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import PostPublishButton from './index';
+import { store as editorStore } from '../../store';
+
+export function PostPublishButtonOrToggle( {
+	forceIsDirty,
+	hasPublishAction,
+	isBeingScheduled,
+	isPending,
+	isPublished,
+	isPublishSidebarEnabled,
+	isPublishSidebarOpened,
+	isScheduled,
+	togglePublishSidebar,
+	setEntitiesSavedStatesCallback,
+	postStatusHasChanged,
+	postStatus,
+} ) {
+	const IS_TOGGLE = 'toggle';
+	const IS_BUTTON = 'button';
+	const isSmallerThanMediumViewport = useViewportMatch( 'medium', '<' );
+	let component;
+
+	/**
+	 * Conditions to show a BUTTON (publish directly) or a TOGGLE (open publish sidebar):
+	 *
+	 * 1) We want to show a BUTTON when the post status is at the _final stage_
+	 * for a particular role (see https://wordpress.org/documentation/article/post-status/):
+	 *
+	 * - is published
+	 * - post status has changed explicitely to something different than 'future' or 'publish'
+	 * - is scheduled to be published
+	 * - is pending and can't be published (but only for viewports >= medium).
+	 * 	 Originally, we considered showing a button for pending posts that couldn't be published
+	 * 	 (for example, for an author with the contributor role). Some languages can have
+	 * 	 long translations for "Submit for review", so given the lack of UI real estate available
+	 * 	 we decided to take into account the viewport in that case.
+	 *  	 See: https://github.com/WordPress/gutenberg/issues/10475
+	 *
+	 * 2) Then, in small viewports, we'll show a TOGGLE.
+	 *
+	 * 3) Finally, we'll use the publish sidebar status to decide:
+	 *
+	 * - if it is enabled, we show a TOGGLE
+	 * - if it is disabled, we show a BUTTON
+	 */
+	if (
+		isPublished ||
+		( postStatusHasChanged &&
+			! [ 'future', 'publish' ].includes( postStatus ) ) ||
+		( isScheduled && isBeingScheduled ) ||
+		( isPending && ! hasPublishAction && ! isSmallerThanMediumViewport )
+	) {
+		component = IS_BUTTON;
+	} else if ( isSmallerThanMediumViewport || isPublishSidebarEnabled ) {
+		component = IS_TOGGLE;
+	} else {
+		component = IS_BUTTON;
+	}
+
+	return (
+		<PostPublishButton
+			forceIsDirty={ forceIsDirty }
+			isOpen={ isPublishSidebarOpened }
+			isToggle={ component === IS_TOGGLE }
+			onToggle={ togglePublishSidebar }
+			setEntitiesSavedStatesCallback={ setEntitiesSavedStatesCallback }
+		/>
+	);
+}
+
+export default compose(
+	withSelect( ( select ) => ( {
+		hasPublishAction:
+			select( editorStore ).getCurrentPost()?._links?.[
+				'wp:action-publish'
+			] ?? false,
+		isBeingScheduled: select( editorStore ).isEditedPostBeingScheduled(),
+		isPending: select( editorStore ).isCurrentPostPending(),
+		isPublished: select( editorStore ).isCurrentPostPublished(),
+		isPublishSidebarEnabled:
+			select( editorStore ).isPublishSidebarEnabled(),
+		isPublishSidebarOpened: select( editorStore ).isPublishSidebarOpened(),
+		isScheduled: select( editorStore ).isCurrentPostScheduled(),
+		postStatus: select( editorStore ).getEditedPostAttribute( 'status' ),
+		postStatusHasChanged: select( editorStore ).getPostEdits()?.status,
+	} ) ),
+	withDispatch( ( dispatch ) => {
+		const { togglePublishSidebar } = dispatch( editorStore );
+		return {
+			togglePublishSidebar,
+		};
+	} )
+)( PostPublishButtonOrToggle );
diff --git a/packages/editor/src/components/post-publish-button/style.scss b/packages/editor/src/components/post-publish-button/style.scss
deleted file mode 100644
index 11aed2ab58e3ed..00000000000000
--- a/packages/editor/src/components/post-publish-button/style.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.editor-post-publish-button__button.has-changes-dot::before {
-	background: currentcolor;
-	border-radius: 4px;
-	content: "";
-	height: 8px;
-	margin: auto 5px auto -3px;
-	width: 8px;
-}
diff --git a/packages/editor/src/components/post-publish-button/test/index.js b/packages/editor/src/components/post-publish-button/test/index.js
index b0a8c3c5129c98..e7a0465950cb85 100644
--- a/packages/editor/src/components/post-publish-button/test/index.js
+++ b/packages/editor/src/components/post-publish-button/test/index.js
@@ -81,13 +81,11 @@ describe( 'PostPublishButton', () => {
 	describe( 'publish status', () => {
 		it( 'should be pending for contributor', async () => {
 			const user = userEvent.setup();
-			const onStatusChange = jest.fn();
-			const onSave = jest.fn();
+			const savePostStatus = jest.fn();
 			render(
 				<PostPublishButton
 					hasPublishAction={ false }
-					onStatusChange={ onStatusChange }
-					onSave={ onSave }
+					savePostStatus={ savePostStatus }
 					isSaveable
 					isPublishable
 				/>
@@ -97,18 +95,16 @@ describe( 'PostPublishButton', () => {
 				screen.getByRole( 'button', { name: 'Submit for Review' } )
 			);
 
-			expect( onStatusChange ).toHaveBeenCalledWith( 'pending' );
+			expect( savePostStatus ).toHaveBeenCalledWith( 'pending' );
 		} );
 
 		it( 'should be future for scheduled post', async () => {
 			const user = userEvent.setup();
-			const onStatusChange = jest.fn();
-			const onSave = jest.fn();
+			const savePostStatus = jest.fn();
 			render(
 				<PostPublishButton
 					hasPublishAction
-					onStatusChange={ onStatusChange }
-					onSave={ onSave }
+					savePostStatus={ savePostStatus }
 					isBeingScheduled
 					isSaveable
 					isPublishable
@@ -119,18 +115,16 @@ describe( 'PostPublishButton', () => {
 				screen.getByRole( 'button', { name: 'Submit for Review' } )
 			);
 
-			expect( onStatusChange ).toHaveBeenCalledWith( 'future' );
+			expect( savePostStatus ).toHaveBeenCalledWith( 'future' );
 		} );
 
 		it( 'should be private for private visibility', async () => {
 			const user = userEvent.setup();
-			const onStatusChange = jest.fn();
-			const onSave = jest.fn();
+			const savePostStatus = jest.fn();
 			render(
 				<PostPublishButton
 					hasPublishAction
-					onStatusChange={ onStatusChange }
-					onSave={ onSave }
+					savePostStatus={ savePostStatus }
 					visibility="private"
 					isSaveable
 					isPublishable
@@ -141,18 +135,16 @@ describe( 'PostPublishButton', () => {
 				screen.getByRole( 'button', { name: 'Submit for Review' } )
 			);
 
-			expect( onStatusChange ).toHaveBeenCalledWith( 'private' );
+			expect( savePostStatus ).toHaveBeenCalledWith( 'private' );
 		} );
 
 		it( 'should be publish otherwise', async () => {
 			const user = userEvent.setup();
-			const onStatusChange = jest.fn();
-			const onSave = jest.fn();
+			const savePostStatus = jest.fn();
 			render(
 				<PostPublishButton
 					hasPublishAction
-					onStatusChange={ onStatusChange }
-					onSave={ onSave }
+					savePostStatus={ savePostStatus }
 					isSaveable
 					isPublishable
 				/>
@@ -162,20 +154,18 @@ describe( 'PostPublishButton', () => {
 				screen.getByRole( 'button', { name: 'Submit for Review' } )
 			);
 
-			expect( onStatusChange ).toHaveBeenCalledWith( 'publish' );
+			expect( savePostStatus ).toHaveBeenCalledWith( 'publish' );
 		} );
 	} );
 
 	describe( 'click', () => {
 		it( 'should save with status', async () => {
 			const user = userEvent.setup();
-			const onStatusChange = jest.fn();
-			const onSave = jest.fn();
+			const savePostStatus = jest.fn();
 			render(
 				<PostPublishButton
 					hasPublishAction
-					onStatusChange={ onStatusChange }
-					onSave={ onSave }
+					savePostStatus={ savePostStatus }
 					isSaveable
 					isPublishable
 				/>
@@ -185,8 +175,7 @@ describe( 'PostPublishButton', () => {
 				screen.getByRole( 'button', { name: 'Submit for Review' } )
 			);
 
-			expect( onStatusChange ).toHaveBeenCalledWith( 'publish' );
-			expect( onSave ).toHaveBeenCalled();
+			expect( savePostStatus ).toHaveBeenCalledWith( 'publish' );
 		} );
 	} );
 
diff --git a/packages/editor/src/components/post-publish-button/test/label.js b/packages/editor/src/components/post-publish-button/test/label.js
index 5990e94e36282d..0879479f6f2e3e 100644
--- a/packages/editor/src/components/post-publish-button/test/label.js
+++ b/packages/editor/src/components/post-publish-button/test/label.js
@@ -1,67 +1,90 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
-import { PublishButtonLabel } from '../label';
+import PublishButtonLabel from '../label';
+
+jest.mock( '@wordpress/data/src/components/use-select', () => {
+	// This allows us to tweak the returned value on each test.
+	const mock = jest.fn();
+	return mock;
+} );
 
 describe( 'PublishButtonLabel', () => {
 	it( 'should show publishing if publishing in progress', () => {
-		const label = PublishButtonLabel( {
+		useSelect.mockImplementation( () => ( {
 			hasPublishAction: true,
 			isPublishing: true,
-		} );
+		} ) );
+		const label = PublishButtonLabel();
 		expect( label ).toBe( 'Publishing…' );
 	} );
 
-	it( 'should show updating if published and saving in progress', () => {
-		const label = PublishButtonLabel( {
+	it( 'should show saving if published and saving in progress', () => {
+		useSelect.mockImplementation( () => ( {
 			hasPublishAction: true,
 			isPublished: true,
 			isSaving: true,
-		} );
-		expect( label ).toBe( 'Updating…' );
+		} ) );
+		const label = PublishButtonLabel();
+		expect( label ).toBe( 'Saving…' );
 	} );
 
-	it( 'should show scheduling if scheduled and saving in progress', () => {
-		const label = PublishButtonLabel( {
+	it( 'should show saving if scheduled and saving in progress', () => {
+		useSelect.mockImplementation( () => ( {
 			hasPublishAction: true,
 			isBeingScheduled: true,
 			isSaving: true,
-		} );
-		expect( label ).toBe( 'Scheduling…' );
+		} ) );
+		const label = PublishButtonLabel();
+		expect( label ).toBe( 'Saving…' );
 	} );
 
 	it( 'should show publish if not published and saving in progress', () => {
-		const label = PublishButtonLabel( {
+		useSelect.mockImplementation( () => ( {
 			hasPublishAction: true,
 			isPublished: false,
 			isSaving: true,
-		} );
+		} ) );
+		const label = PublishButtonLabel();
 		expect( label ).toBe( 'Publish' );
 	} );
 
 	it( 'should show submit for review for contributor', () => {
-		const label = PublishButtonLabel( { hasPublishAction: false } );
+		useSelect.mockImplementation( () => ( {
+			hasPublishAction: false,
+		} ) );
+		const label = PublishButtonLabel();
 		expect( label ).toBe( 'Submit for Review' );
 	} );
 
-	it( 'should show update for already published', () => {
-		const label = PublishButtonLabel( {
+	it( 'should show save for already published', () => {
+		useSelect.mockImplementation( () => ( {
 			hasPublishAction: true,
 			isPublished: true,
-		} );
-		expect( label ).toBe( 'Update' );
+		} ) );
+		const label = PublishButtonLabel();
+		expect( label ).toBe( 'Save' );
 	} );
 
 	it( 'should show schedule for scheduled', () => {
-		const label = PublishButtonLabel( {
+		useSelect.mockImplementation( () => ( {
 			hasPublishAction: true,
 			isBeingScheduled: true,
-		} );
+		} ) );
+		const label = PublishButtonLabel();
 		expect( label ).toBe( 'Schedule' );
 	} );
 
 	it( 'should show publish otherwise', () => {
-		const label = PublishButtonLabel( { hasPublishAction: true } );
+		useSelect.mockImplementation( () => ( {
+			hasPublishAction: true,
+		} ) );
+		const label = PublishButtonLabel();
 		expect( label ).toBe( 'Publish' );
 	} );
 } );
diff --git a/packages/editor/src/components/post-publish-button/test/post-publish-button-or-toggle.js b/packages/editor/src/components/post-publish-button/test/post-publish-button-or-toggle.js
new file mode 100644
index 00000000000000..0794c3c8995a1f
--- /dev/null
+++ b/packages/editor/src/components/post-publish-button/test/post-publish-button-or-toggle.js
@@ -0,0 +1,63 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import { useViewportMatch } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import { PostPublishButtonOrToggle } from '../post-publish-button-or-toggle';
+
+jest.mock( '@wordpress/compose/src/hooks/use-viewport-match' );
+
+describe( 'PostPublishButtonOrToggle should render a', () => {
+	afterEach( () => {
+		useViewportMatch.mockRestore();
+	} );
+
+	it( 'button when the post is published (1)', () => {
+		render( <PostPublishButtonOrToggle isPublished /> );
+		expect(
+			screen.getByRole( 'button', { name: 'Submit for Review' } )
+		).toBeVisible();
+	} );
+
+	it( 'button when the post is scheduled (2)', () => {
+		render( <PostPublishButtonOrToggle isScheduled isBeingScheduled /> );
+		expect(
+			screen.getByRole( 'button', { name: 'Submit for Review' } )
+		).toBeVisible();
+	} );
+
+	it( 'button when the post is pending and cannot be published but the viewport is >= medium (3)', () => {
+		render(
+			<PostPublishButtonOrToggle isPending hasPublishAction={ false } />
+		);
+
+		expect(
+			screen.getByRole( 'button', { name: 'Submit for Review' } )
+		).toBeVisible();
+	} );
+
+	it( 'toggle when post is not (1), (2), (3), the viewport is <= medium, and the publish sidebar is enabled', () => {
+		useViewportMatch.mockReturnValue( true );
+		render( <PostPublishButtonOrToggle isPublishSidebarEnabled /> );
+		expect(
+			screen.getByRole( 'button', { name: 'Publish' } )
+		).toBeVisible();
+	} );
+
+	it( 'button when post is not (1), (2), (3), the viewport is >= medium, and the publish sidebar is disabled', () => {
+		render(
+			<PostPublishButtonOrToggle isPublishSidebarEnabled={ false } />
+		);
+		expect(
+			screen.getByRole( 'button', { name: 'Submit for Review' } )
+		).toBeVisible();
+	} );
+} );
diff --git a/packages/editor/src/components/post-publish-panel/index.js b/packages/editor/src/components/post-publish-panel/index.js
index f07347c6c305f9..6a2d393e20c4ba 100644
--- a/packages/editor/src/components/post-publish-panel/index.js
+++ b/packages/editor/src/components/post-publish-panel/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Component } from '@wordpress/element';
+import { Component, createRef } from '@wordpress/element';
 import {
 	Button,
 	Spinner,
@@ -27,6 +27,20 @@ export class PostPublishPanel extends Component {
 	constructor() {
 		super( ...arguments );
 		this.onSubmit = this.onSubmit.bind( this );
+		this.cancelButtonNode = createRef();
+	}
+
+	componentDidMount() {
+		// This timeout is necessary to make sure the `useEffect` hook of
+		// `useFocusReturn` gets the correct element (the button that opens the
+		// PostPublishPanel) otherwise it will get this button.
+		this.timeoutID = setTimeout( () => {
+			this.cancelButtonNode.current.focus();
+		}, 0 );
+	}
+
+	componentWillUnmount() {
+		clearTimeout( this.timeoutID );
 	}
 
 	componentDidUpdate( prevProps ) {
@@ -78,28 +92,31 @@ export class PostPublishPanel extends Component {
 				<div className="editor-post-publish-panel__header">
 					{ isPostPublish ? (
 						<Button
+							size="compact"
 							onClick={ onClose }
 							icon={ closeSmall }
 							label={ __( 'Close panel' ) }
 						/>
 					) : (
 						<>
-							<div className="editor-post-publish-panel__header-publish-button">
-								<PostPublishButton
-									focusOnMount
-									onSubmit={ this.onSubmit }
-									forceIsDirty={ forceIsDirty }
-								/>
-							</div>
 							<div className="editor-post-publish-panel__header-cancel-button">
 								<Button
+									ref={ this.cancelButtonNode }
+									accessibleWhenDisabled
 									disabled={ isSavingNonPostEntityChanges }
 									onClick={ onClose }
 									variant="secondary"
+									size="compact"
 								>
 									{ __( 'Cancel' ) }
 								</Button>
 							</div>
+							<div className="editor-post-publish-panel__header-publish-button">
+								<PostPublishButton
+									onSubmit={ this.onSubmit }
+									forceIsDirty={ forceIsDirty }
+								/>
+							</div>
 						</>
 					) }
 				</div>
@@ -110,7 +127,7 @@ export class PostPublishPanel extends Component {
 						</PostPublishPanelPrepublish>
 					) }
 					{ isPostPublish && (
-						<PostPublishPanelPostpublish focusOnMount={ true }>
+						<PostPublishPanelPostpublish focusOnMount>
 							{ PostPublishExtension && <PostPublishExtension /> }
 						</PostPublishPanelPostpublish>
 					) }
@@ -129,6 +146,9 @@ export class PostPublishPanel extends Component {
 	}
 }
 
+/**
+ * Renders a panel for publishing a post.
+ */
 export default compose( [
 	withSelect( ( select ) => {
 		const { getPostType } = select( coreStore );
diff --git a/packages/editor/src/components/post-publish-panel/maybe-category-panel.js b/packages/editor/src/components/post-publish-panel/maybe-category-panel.js
index 72df6e883fd2ec..66fdf985cc0d55 100644
--- a/packages/editor/src/components/post-publish-panel/maybe-category-panel.js
+++ b/packages/editor/src/components/post-publish-panel/maybe-category-panel.js
@@ -18,7 +18,10 @@ function MaybeCategoryPanel() {
 		const postType = select( editorStore ).getCurrentPostType();
 		const { canUser, getEntityRecord, getTaxonomy } = select( coreStore );
 		const categoriesTaxonomy = getTaxonomy( 'category' );
-		const defaultCategoryId = canUser( 'read', 'settings' )
+		const defaultCategoryId = canUser( 'read', {
+			kind: 'root',
+			name: 'site',
+		} )
 			? getEntityRecord( 'root', 'site' )?.default_category
 			: undefined;
 		const defaultCategory = defaultCategoryId
diff --git a/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js b/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js
index 4555b33dbb9efb..a81168808f1af7 100644
--- a/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js
+++ b/packages/editor/src/components/post-publish-panel/maybe-post-format-panel.js
@@ -25,6 +25,7 @@ const PostFormatSuggestion = ( {
 	onUpdatePostFormat,
 } ) => (
 	<Button
+		__next40pxDefaultSize
 		variant="link"
 		onClick={ () => onUpdatePostFormat( suggestedPostFormat ) }
 	>
diff --git a/packages/editor/src/components/post-publish-panel/maybe-tags-panel.js b/packages/editor/src/components/post-publish-panel/maybe-tags-panel.js
index 45493770eedf76..537d62f382805e 100644
--- a/packages/editor/src/components/post-publish-panel/maybe-tags-panel.js
+++ b/packages/editor/src/components/post-publish-panel/maybe-tags-panel.js
@@ -2,9 +2,8 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Component } from '@wordpress/element';
-import { compose, ifCondition } from '@wordpress/compose';
-import { withSelect } from '@wordpress/data';
+import { useState } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
 import { PanelBody } from '@wordpress/components';
 import { store as coreStore } from '@wordpress/core-data';
 
@@ -29,17 +28,31 @@ const TagsPanel = () => {
 					'Tags help users and search engines navigate your site and find your content. Add a few keywords to describe your post.'
 				) }
 			</p>
-			<FlatTermSelector slug={ 'post_tag' } />
+			<FlatTermSelector slug="post_tag" __nextHasNoMarginBottom />
 		</PanelBody>
 	);
 };
 
-class MaybeTagsPanel extends Component {
-	constructor( props ) {
-		super( props );
-		this.state = {
-			hadTagsWhenOpeningThePanel: props.hasTags,
+const MaybeTagsPanel = () => {
+	const { hasTags, isPostTypeSupported } = useSelect( ( select ) => {
+		const postType = select( editorStore ).getCurrentPostType();
+		const tagsTaxonomy = select( coreStore ).getTaxonomy( 'post_tag' );
+		const _isPostTypeSupported = tagsTaxonomy?.types?.includes( postType );
+		const areTagsFetched = tagsTaxonomy !== undefined;
+		const tags =
+			tagsTaxonomy &&
+			select( editorStore ).getEditedPostAttribute(
+				tagsTaxonomy.rest_base
+			);
+		return {
+			hasTags: !! tags?.length,
+			isPostTypeSupported: areTagsFetched && _isPostTypeSupported,
 		};
+	}, [] );
+	const [ hadTagsWhenOpeningThePanel ] = useState( hasTags );
+
+	if ( ! isPostTypeSupported ) {
+		return null;
 	}
 
 	/*
@@ -52,34 +65,11 @@ class MaybeTagsPanel extends Component {
 	 * hiding this panel and keeping the user from adding
 	 * more than one tag.
 	 */
-	render() {
-		if ( ! this.state.hadTagsWhenOpeningThePanel ) {
-			return <TagsPanel />;
-		}
-
-		return null;
+	if ( ! hadTagsWhenOpeningThePanel ) {
+		return <TagsPanel />;
 	}
-}
 
-export default compose(
-	withSelect( ( select ) => {
-		const postType = select( editorStore ).getCurrentPostType();
-		const tagsTaxonomy = select( coreStore ).getTaxonomy( 'post_tag' );
-		const tags =
-			tagsTaxonomy &&
-			select( editorStore ).getEditedPostAttribute(
-				tagsTaxonomy.rest_base
-			);
-		return {
-			areTagsFetched: tagsTaxonomy !== undefined,
-			isPostTypeSupported:
-				tagsTaxonomy &&
-				tagsTaxonomy.types.some( ( type ) => type === postType ),
-			hasTags: tags && tags.length,
-		};
-	} ),
-	ifCondition(
-		( { areTagsFetched, isPostTypeSupported } ) =>
-			isPostTypeSupported && areTagsFetched
-	)
-)( MaybeTagsPanel );
+	return null;
+};
+
+export default MaybeTagsPanel;
diff --git a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
index f432b0da16c359..32ea69c425e0b5 100644
--- a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
+++ b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
@@ -17,7 +17,7 @@ import { isBlobURL } from '@wordpress/blob';
 /**
  * Internal dependencies
  */
-import { store as editorStore } from '../../store';
+import { fetchMedia } from './media-util';
 
 function flattenBlocks( blocks ) {
 	const result = [];
@@ -30,7 +30,53 @@ function flattenBlocks( blocks ) {
 	return result;
 }
 
-function Image( block ) {
+/**
+ * Determine whether a block has external media.
+ *
+ * Different blocks use different attribute names (and potentially
+ * different logic as well) in determining whether the media is
+ * present, and whether it's external.
+ *
+ * @param {{name: string, attributes: Object}} block The block.
+ * @return {boolean?} Whether the block has external media
+ */
+function hasExternalMedia( block ) {
+	if ( block.name === 'core/image' || block.name === 'core/cover' ) {
+		return block.attributes.url && ! block.attributes.id;
+	}
+
+	if ( block.name === 'core/media-text' ) {
+		return block.attributes.mediaUrl && ! block.attributes.mediaId;
+	}
+
+	return undefined;
+}
+
+/**
+ * Retrieve media info from a block.
+ *
+ * Different blocks use different attribute names, so we need this
+ * function to normalize things into a consistent naming scheme.
+ *
+ * @param {{name: string, attributes: Object}} block The block.
+ * @return {{url: ?string, alt: ?string, id: ?number}} The media info for the block.
+ */
+function getMediaInfo( block ) {
+	if ( block.name === 'core/image' || block.name === 'core/cover' ) {
+		const { url, alt, id } = block.attributes;
+		return { url, alt, id };
+	}
+
+	if ( block.name === 'core/media-text' ) {
+		const { mediaUrl: url, mediaAlt: alt, mediaId: id } = block.attributes;
+		return { url, alt, id };
+	}
+
+	return {};
+}
+
+// Image component to represent a single image in the upload dialog.
+function Image( { clientId, alt, url } ) {
 	const { selectBlock } = useDispatch( blockEditorStore );
 	return (
 		<motion.img
@@ -38,22 +84,22 @@ function Image( block ) {
 			role="button"
 			aria-label={ __( 'Select image block.' ) }
 			onClick={ () => {
-				selectBlock( block.clientId );
+				selectBlock( clientId );
 			} }
 			onKeyDown={ ( event ) => {
 				if ( event.key === 'Enter' || event.key === ' ' ) {
-					selectBlock( block.clientId );
+					selectBlock( clientId );
 					event.preventDefault();
 				}
 			} }
-			key={ block.clientId }
-			alt={ block.attributes.alt }
-			src={ block.attributes.url }
+			key={ clientId }
+			alt={ alt }
+			src={ url }
 			animate={ { opacity: 1 } }
 			exit={ { opacity: 0, scale: 0 } }
 			style={ {
-				width: '36px',
-				height: '36px',
+				width: '32px',
+				height: '32px',
 				objectFit: 'cover',
 				borderRadius: '2px',
 				cursor: 'pointer',
@@ -63,24 +109,25 @@ function Image( block ) {
 	);
 }
 
-export default function PostFormatPanel() {
+export default function MaybeUploadMediaPanel() {
 	const [ isUploading, setIsUploading ] = useState( false );
+	const [ isAnimating, setIsAnimating ] = useState( false );
+	const [ hadUploadError, setHadUploadError ] = useState( false );
 	const { editorBlocks, mediaUpload } = useSelect(
 		( select ) => ( {
-			editorBlocks: select( editorStore ).getEditorBlocks(),
+			editorBlocks: select( blockEditorStore ).getBlocks(),
 			mediaUpload: select( blockEditorStore ).getSettings().mediaUpload,
 		} ),
 		[]
 	);
-	const externalImages = flattenBlocks( editorBlocks ).filter(
-		( block ) =>
-			block.name === 'core/image' &&
-			block.attributes.url &&
-			! block.attributes.id
+
+	// Get a list of blocks with external media.
+	const blocksWithExternalMedia = flattenBlocks( editorBlocks ).filter(
+		( block ) => hasExternalMedia( block )
 	);
 	const { updateBlockAttributes } = useDispatch( blockEditorStore );
 
-	if ( ! mediaUpload || ! externalImages.length ) {
+	if ( ! mediaUpload || ! blocksWithExternalMedia.length ) {
 		return null;
 	}
 
@@ -91,18 +138,51 @@ export default function PostFormatPanel() {
 		</span>,
 	];
 
+	/**
+	 * Update an individual block to point to newly-added library media.
+	 *
+	 * Different blocks use different attribute names, so we need this
+	 * function to ensure we modify the correct attributes for each type.
+	 *
+	 * @param {{name: string, attributes: Object}} block The block.
+	 * @param {{id: number, url: string}}          media Media library file info.
+	 */
+	function updateBlockWithUploadedMedia( block, media ) {
+		if ( block.name === 'core/image' || block.name === 'core/cover' ) {
+			updateBlockAttributes( block.clientId, {
+				id: media.id,
+				url: media.url,
+			} );
+		}
+
+		if ( block.name === 'core/media-text' ) {
+			updateBlockAttributes( block.clientId, {
+				mediaId: media.id,
+				mediaUrl: media.url,
+			} );
+		}
+	}
+
+	// Handle fetching and uploading all external media in the post.
 	function uploadImages() {
 		setIsUploading( true );
-		Promise.all(
-			externalImages.map( ( image ) =>
-				window
-					.fetch(
-						image.attributes.url.includes( '?' )
-							? image.attributes.url
-							: image.attributes.url + '?'
-					)
-					.then( ( response ) => response.blob() )
-					.then(
+		setHadUploadError( false );
+
+		// Multiple blocks can be using the same URL, so we
+		// should ensure we only fetch and upload each of them once.
+		const mediaUrls = new Set(
+			blocksWithExternalMedia.map( ( block ) => {
+				const { url } = getMediaInfo( block );
+				return url;
+			} )
+		);
+
+		// Create an upload promise for each URL, that we can wait for in all
+		// blocks that make use of that media.
+		const uploadPromises = Object.fromEntries(
+			Object.entries( fetchMedia( [ ...mediaUrls ] ) ).map(
+				( [ url, filePromise ] ) => {
+					const uploadPromise = filePromise.then(
 						( blob ) =>
 							new Promise( ( resolve, reject ) => {
 								mediaUpload( {
@@ -112,26 +192,39 @@ export default function PostFormatPanel() {
 											return;
 										}
 
-										updateBlockAttributes( image.clientId, {
-											id: media.id,
-											url: media.url,
-										} );
-										resolve();
+										resolve( media );
 									},
 									onError() {
 										reject();
 									},
 								} );
 							} )
-					)
+					);
+
+					return [ url, uploadPromise ];
+				}
 			)
+		);
+
+		// Wait for all blocks to be updated with library media.
+		Promise.allSettled(
+			blocksWithExternalMedia.map( ( block ) => {
+				const { url } = getMediaInfo( block );
+
+				return uploadPromises[ url ]
+					.then( ( media ) =>
+						updateBlockWithUploadedMedia( block, media )
+					)
+					.then( () => setIsAnimating( true ) )
+					.catch( () => setHadUploadError( true ) );
+			} )
 		).finally( () => {
 			setIsUploading( false );
 		} );
 	}
 
 	return (
-		<PanelBody initialOpen={ true } title={ panelBodyTitle }>
+		<PanelBody initialOpen title={ panelBodyTitle }>
 			<p>
 				{ __(
 					'Upload external images to the Media Library. Images from different domains may load slowly, display incorrectly, or be removed unexpectedly.'
@@ -144,19 +237,34 @@ export default function PostFormatPanel() {
 					gap: '8px',
 				} }
 			>
-				<AnimatePresence>
-					{ externalImages.map( ( image ) => {
-						return <Image key={ image.clientId } { ...image } />;
+				<AnimatePresence
+					onExitComplete={ () => setIsAnimating( false ) }
+				>
+					{ blocksWithExternalMedia.map( ( block ) => {
+						const { url, alt } = getMediaInfo( block );
+						return (
+							<Image
+								key={ block.clientId }
+								clientId={ block.clientId }
+								url={ url }
+								alt={ alt }
+							/>
+						);
 					} ) }
 				</AnimatePresence>
-				{ isUploading ? (
+				{ isUploading || isAnimating ? (
 					<Spinner />
 				) : (
-					<Button variant="primary" onClick={ uploadImages }>
+					<Button
+						size="compact"
+						variant="primary"
+						onClick={ uploadImages }
+					>
 						{ __( 'Upload' ) }
 					</Button>
 				) }
 			</div>
+			{ hadUploadError && <p>{ __( 'Upload failed, try again.' ) }</p> }
 		</PanelBody>
 	);
 }
diff --git a/packages/editor/src/components/post-publish-panel/media-util.js b/packages/editor/src/components/post-publish-panel/media-util.js
new file mode 100644
index 00000000000000..995802b0eebb44
--- /dev/null
+++ b/packages/editor/src/components/post-publish-panel/media-util.js
@@ -0,0 +1,87 @@
+/**
+ * External dependencies
+ */
+import { v4 as uuid } from 'uuid';
+
+/**
+ * WordPress dependencies
+ */
+import { getFilename } from '@wordpress/url';
+
+/**
+ * Generate a list of unique basenames given a list of URLs.
+ *
+ * We want all basenames to be unique, since sometimes the extension
+ * doesn't reflect the mime type, and may end up getting changed by
+ * the server, on upload.
+ *
+ * @param {string[]} urls The list of URLs
+ * @return {Record< string, string >} A URL => basename record.
+ */
+export function generateUniqueBasenames( urls ) {
+	const basenames = new Set();
+
+	return Object.fromEntries(
+		urls.map( ( url ) => {
+			// We prefer to match the remote filename, if possible.
+			const filename = getFilename( url );
+			let basename = '';
+
+			if ( filename ) {
+				const parts = filename.split( '.' );
+				if ( parts.length > 1 ) {
+					// Assume the last part is the extension.
+					parts.pop();
+				}
+				basename = parts.join( '.' );
+			}
+
+			if ( ! basename ) {
+				// It looks like we don't have a basename, so let's use a UUID.
+				basename = uuid();
+			}
+
+			if ( basenames.has( basename ) ) {
+				// Append a UUID to deduplicate the basename.
+				// The server will try to deduplicate on its own if we don't do this,
+				// but it may run into a race condition
+				// (see https://github.com/WordPress/gutenberg/issues/64899).
+				// Deduplicating the filenames before uploading is safer.
+				basename = `${ basename }-${ uuid() }`;
+			}
+
+			basenames.add( basename );
+
+			return [ url, basename ];
+		} )
+	);
+}
+
+/**
+ * Fetch a list of URLs, turning those into promises for files with
+ * unique filenames.
+ *
+ * @param {string[]} urls The list of URLs
+ * @return {Record< string, Promise< File > >} A URL => File promise record.
+ */
+export function fetchMedia( urls ) {
+	return Object.fromEntries(
+		Object.entries( generateUniqueBasenames( urls ) ).map(
+			( [ url, basename ] ) => {
+				const filePromise = window
+					.fetch( url.includes( '?' ) ? url : url + '?' )
+					.then( ( response ) => response.blob() )
+					.then( ( blob ) => {
+						// The server will reject the upload if it doesn't have an extension,
+						// even though it'll rewrite the file name to match the mime type.
+						// Here we provide it with a safe extension to get it past that check.
+						return new File( [ blob ], `${ basename }.png`, {
+							type: blob.type,
+						} );
+					} );
+
+				return [ url, filePromise ];
+			}
+		)
+	);
+}
diff --git a/packages/editor/src/components/post-publish-panel/postpublish.js b/packages/editor/src/components/post-publish-panel/postpublish.js
index 39f48d3bc811c4..29ee1871057ea1 100644
--- a/packages/editor/src/components/post-publish-panel/postpublish.js
+++ b/packages/editor/src/components/post-publish-panel/postpublish.js
@@ -44,7 +44,7 @@ const getFuturePostUrl = ( post ) => {
 function CopyButton( { text, onCopy, children } ) {
 	const ref = useCopyToClipboard( text, onCopy );
 	return (
-		<Button variant="secondary" ref={ ref }>
+		<Button __next40pxDefaultSize variant="secondary" ref={ ref }>
 			{ children }
 		</Button>
 	);
@@ -122,6 +122,7 @@ class PostPublishPanelPostpublish extends Component {
 					</p>
 					<div className="post-publish-panel__postpublish-post-address-container">
 						<TextControl
+							__next40pxDefaultSize
 							__nextHasNoMarginBottom
 							className="post-publish-panel__postpublish-post-address"
 							readOnly
@@ -145,12 +146,17 @@ class PostPublishPanelPostpublish extends Component {
 
 					<div className="post-publish-panel__postpublish-buttons">
 						{ ! isScheduled && (
-							<Button variant="primary" href={ link }>
+							<Button
+								variant="primary"
+								href={ link }
+								__next40pxDefaultSize
+							>
 								{ viewPostLabel }
 							</Button>
 						) }
 						<Button
 							variant={ isScheduled ? 'primary' : 'secondary' }
+							__next40pxDefaultSize
 							href={ addLink }
 						>
 							{ addNewPostLabel }
diff --git a/packages/editor/src/components/post-publish-panel/style.scss b/packages/editor/src/components/post-publish-panel/style.scss
index cc8fb6f764c3f9..7b075717651781 100644
--- a/packages/editor/src/components/post-publish-panel/style.scss
+++ b/packages/editor/src/components/post-publish-panel/style.scss
@@ -1,7 +1,3 @@
-.editor-post-publish-panel {
-	background: $white;
-}
-
 .editor-post-publish-panel__content {
 	// Ensure the post-publish panel accounts for the header and footer height.
 	min-height: calc(100% - #{$header-height + 84px});
@@ -41,8 +37,9 @@
 
 .components-site-icon {
 	border: none;
-	border-radius: $radius-block-ui;
+	border-radius: $radius-small;
 	margin-right: $grid-unit-15;
+	flex-shrink: 0;
 
 	// Same size as in the Site menu.
 	height: 36px;
@@ -58,6 +55,7 @@
 	display: block;
 	color: $gray-700;
 	font-size: $helptext-font-size;
+	word-break: break-word;
 }
 
 .editor-post-publish-panel__header-publish-button,
@@ -70,11 +68,12 @@
 }
 
 .editor-post-publish-panel__header-publish-button {
-	padding-right: $grid-unit-05;
+	padding-left: $grid-unit-05;
+	justify-content: center;
 }
 
 .editor-post-publish-panel__header-cancel-button {
-	padding-left: $grid-unit-05;
+	padding-right: $grid-unit-05;
 }
 
 .editor-post-publish-panel__header-published {
@@ -119,6 +118,12 @@
 	.editor-post-visibility__dialog-legend {
 		display: none;
 	}
+
+	.components-panel__body-title .components-button {
+		align-items: flex-start;
+		text-wrap: balance; // Fallback for Safari.
+		text-wrap: pretty;
+	}
 }
 
 .post-publish-panel__postpublish .components-panel__body {
@@ -152,7 +157,9 @@
 	}
 
 	input[readonly] {
-		padding: $grid-unit-20;
+		// Do not increase top and bottom padding otherwise Firefox won't show the text overflow ellipsis.
+		// See https://github.com/WordPress/gutenberg/pull/57310
+		padding: $grid-unit-15;
 		background: $gray-100;
 		border-color: $gray-400;
 		overflow: hidden;
@@ -186,3 +193,40 @@
 		}
 	}
 }
+
+.editor-post-publish-panel {
+	position: fixed;
+	z-index: z-index(".editor-post-publish-panel");
+	background: $white;
+	top: $admin-bar-height-big;
+	bottom: 0;
+	right: 0;
+	left: 0;
+	overflow: auto;
+
+	@include break-medium() {
+		z-index: z-index(".editor-post-publish-panel {greater than small}");
+		top: $admin-bar-height;
+		left: auto;
+		width: $sidebar-width + $border-width;
+		border-left: $border-width solid $gray-300;
+		transform: translateX(+100%);
+		animation: editor-post-publish-panel__slide-in-animation 0.1s forwards;
+		@include reduce-motion("animation");
+
+		body.is-fullscreen-mode & {
+			top: 0;
+		}
+
+		// Keep it open on focus to avoid conflict with navigate-regions animation.
+		[role="region"]:focus & {
+			transform: translateX(0%);
+		}
+	}
+}
+
+@keyframes editor-post-publish-panel__slide-in-animation {
+	100% {
+		transform: translateX(0%);
+	}
+}
diff --git a/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap b/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap
index c5aad5aa3be9b9..b074159ac423d4 100644
--- a/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap
+++ b/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap
@@ -22,11 +22,35 @@ exports[`PostPublishPanel should render the post-publish panel if the post is pu
   font-weight: 500;
   line-height: 1.4;
   text-transform: uppercase;
-  display: inline-block;
+  display: block;
   margin-bottom: calc(4px * 2);
   padding: 0;
 }
 
+.emotion-10 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: flex-start;
+  -webkit-box-align: flex-start;
+  -ms-flex-align: flex-start;
+  align-items: flex-start;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  gap: 0;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
+  -webkit-justify-content: start;
+  justify-content: start;
+  width: 100%;
+}
+
+.emotion-10>* {
+  min-width: 0;
+}
+
 <div>
   <div
     class="editor-post-publish-panel"
@@ -36,7 +60,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is pu
     >
       <button
         aria-label="Close panel"
-        class="components-button has-icon"
+        class="components-button is-compact has-icon"
         type="button"
       >
         <svg
@@ -96,7 +120,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is pu
                   post address
                 </label>
                 <input
-                  class="components-text-control__input"
+                  class="components-text-control__input is-next-40px-default-size"
                   id="inspector-text-control-0"
                   readonly=""
                   type="text"
@@ -108,7 +132,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is pu
               class="post-publish-panel__postpublish-post-address__copy-button-wrap"
             >
               <button
-                class="components-button is-secondary"
+                class="components-button is-next-40px-default-size is-secondary"
                 type="button"
               >
                 Copy
@@ -119,11 +143,11 @@ exports[`PostPublishPanel should render the post-publish panel if the post is pu
             class="post-publish-panel__postpublish-buttons"
           >
             <a
-              class="components-button is-primary"
+              class="components-button is-next-40px-default-size is-primary"
               href="https://wordpress.local/sample-page/"
             />
             <a
-              class="components-button is-secondary"
+              class="components-button is-next-40px-default-size is-secondary"
               href="post-new.php?"
             />
           </div>
@@ -139,22 +163,28 @@ exports[`PostPublishPanel should render the post-publish panel if the post is pu
         <div
           class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-checkbox-control__input-container"
-          >
-            <input
-              class="components-checkbox-control__input"
-              id="inspector-checkbox-control-3"
-              type="checkbox"
-              value="1"
-            />
-          </span>
-          <label
-            class="components-checkbox-control__label"
-            for="inspector-checkbox-control-3"
+          <div
+            class="components-flex components-h-stack emotion-10 emotion-11"
+            data-wp-c16t="true"
+            data-wp-component="HStack"
           >
-            Always show pre-publish checks.
-          </label>
+            <span
+              class="components-checkbox-control__input-container"
+            >
+              <input
+                class="components-checkbox-control__input"
+                id="inspector-checkbox-control-3"
+                type="checkbox"
+                value="1"
+              />
+            </span>
+            <label
+              class="components-checkbox-control__label"
+              for="inspector-checkbox-control-3"
+            >
+              Always show pre-publish checks.
+            </label>
+          </div>
         </div>
       </div>
     </div>
@@ -184,11 +214,35 @@ exports[`PostPublishPanel should render the post-publish panel if the post is sc
   font-weight: 500;
   line-height: 1.4;
   text-transform: uppercase;
-  display: inline-block;
+  display: block;
   margin-bottom: calc(4px * 2);
   padding: 0;
 }
 
+.emotion-10 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: flex-start;
+  -webkit-box-align: flex-start;
+  -ms-flex-align: flex-start;
+  align-items: flex-start;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  gap: 0;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
+  -webkit-justify-content: start;
+  justify-content: start;
+  width: 100%;
+}
+
+.emotion-10>* {
+  min-width: 0;
+}
+
 <div>
   <div
     class="editor-post-publish-panel"
@@ -198,7 +252,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is sc
     >
       <button
         aria-label="Close panel"
-        class="components-button has-icon"
+        class="components-button is-compact has-icon"
         type="button"
       >
         <svg
@@ -258,7 +312,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is sc
                   post address
                 </label>
                 <input
-                  class="components-text-control__input"
+                  class="components-text-control__input is-next-40px-default-size"
                   id="inspector-text-control-1"
                   readonly=""
                   type="text"
@@ -270,7 +324,7 @@ exports[`PostPublishPanel should render the post-publish panel if the post is sc
               class="post-publish-panel__postpublish-post-address__copy-button-wrap"
             >
               <button
-                class="components-button is-secondary"
+                class="components-button is-next-40px-default-size is-secondary"
                 type="button"
               >
                 Copy
@@ -281,11 +335,11 @@ exports[`PostPublishPanel should render the post-publish panel if the post is sc
             class="post-publish-panel__postpublish-buttons"
           >
             <a
-              class="components-button is-primary"
+              class="components-button is-next-40px-default-size is-primary"
               href="https://wordpress.local/sample-page/"
             />
             <a
-              class="components-button is-secondary"
+              class="components-button is-next-40px-default-size is-secondary"
               href="post-new.php?"
             />
           </div>
@@ -301,22 +355,28 @@ exports[`PostPublishPanel should render the post-publish panel if the post is sc
         <div
           class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-checkbox-control__input-container"
-          >
-            <input
-              class="components-checkbox-control__input"
-              id="inspector-checkbox-control-4"
-              type="checkbox"
-              value="1"
-            />
-          </span>
-          <label
-            class="components-checkbox-control__label"
-            for="inspector-checkbox-control-4"
+          <div
+            class="components-flex components-h-stack emotion-10 emotion-11"
+            data-wp-c16t="true"
+            data-wp-component="HStack"
           >
-            Always show pre-publish checks.
-          </label>
+            <span
+              class="components-checkbox-control__input-container"
+            >
+              <input
+                class="components-checkbox-control__input"
+                id="inspector-checkbox-control-4"
+                type="checkbox"
+                value="1"
+              />
+            </span>
+            <label
+              class="components-checkbox-control__label"
+              for="inspector-checkbox-control-4"
+            >
+              Always show pre-publish checks.
+            </label>
+          </div>
         </div>
       </div>
     </div>
@@ -341,6 +401,30 @@ exports[`PostPublishPanel should render the pre-publish panel if post status is
   margin-bottom: inherit;
 }
 
+.emotion-4 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: flex-start;
+  -webkit-box-align: flex-start;
+  -ms-flex-align: flex-start;
+  align-items: flex-start;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  gap: 0;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
+  -webkit-justify-content: start;
+  justify-content: start;
+  width: 100%;
+}
+
+.emotion-4>* {
+  min-width: 0;
+}
+
 <div>
   <div
     class="editor-post-publish-panel"
@@ -349,24 +433,24 @@ exports[`PostPublishPanel should render the pre-publish panel if post status is
       class="editor-post-publish-panel__header"
     >
       <div
-        class="editor-post-publish-panel__header-publish-button"
+        class="editor-post-publish-panel__header-cancel-button"
       >
         <button
-          aria-disabled="true"
-          class="components-button editor-post-publish-button editor-post-publish-button__button is-primary"
+          class="components-button is-secondary is-compact"
           type="button"
         >
-          Submit for Review
+          Cancel
         </button>
       </div>
       <div
-        class="editor-post-publish-panel__header-cancel-button"
+        class="editor-post-publish-panel__header-publish-button"
       >
         <button
-          class="components-button is-secondary"
+          aria-disabled="true"
+          class="components-button editor-post-publish-button editor-post-publish-button__button is-primary is-compact"
           type="button"
         >
-          Cancel
+          Submit for Review
         </button>
       </div>
     </div>
@@ -424,22 +508,28 @@ exports[`PostPublishPanel should render the pre-publish panel if post status is
         <div
           class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-checkbox-control__input-container"
-          >
-            <input
-              class="components-checkbox-control__input"
-              id="inspector-checkbox-control-1"
-              type="checkbox"
-              value="1"
-            />
-          </span>
-          <label
-            class="components-checkbox-control__label"
-            for="inspector-checkbox-control-1"
+          <div
+            class="components-flex components-h-stack emotion-4 emotion-5"
+            data-wp-c16t="true"
+            data-wp-component="HStack"
           >
-            Always show pre-publish checks.
-          </label>
+            <span
+              class="components-checkbox-control__input-container"
+            >
+              <input
+                class="components-checkbox-control__input"
+                id="inspector-checkbox-control-1"
+                type="checkbox"
+                value="1"
+              />
+            </span>
+            <label
+              class="components-checkbox-control__label"
+              for="inspector-checkbox-control-1"
+            >
+              Always show pre-publish checks.
+            </label>
+          </div>
         </div>
       </div>
     </div>
@@ -464,6 +554,30 @@ exports[`PostPublishPanel should render the pre-publish panel if the post is not
   margin-bottom: inherit;
 }
 
+.emotion-4 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: flex-start;
+  -webkit-box-align: flex-start;
+  -ms-flex-align: flex-start;
+  align-items: flex-start;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  gap: 0;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
+  -webkit-justify-content: start;
+  justify-content: start;
+  width: 100%;
+}
+
+.emotion-4>* {
+  min-width: 0;
+}
+
 <div>
   <div
     class="editor-post-publish-panel"
@@ -472,24 +586,24 @@ exports[`PostPublishPanel should render the pre-publish panel if the post is not
       class="editor-post-publish-panel__header"
     >
       <div
-        class="editor-post-publish-panel__header-publish-button"
+        class="editor-post-publish-panel__header-cancel-button"
       >
         <button
-          aria-disabled="true"
-          class="components-button editor-post-publish-button editor-post-publish-button__button is-primary"
+          class="components-button is-secondary is-compact"
           type="button"
         >
-          Submit for Review
+          Cancel
         </button>
       </div>
       <div
-        class="editor-post-publish-panel__header-cancel-button"
+        class="editor-post-publish-panel__header-publish-button"
       >
         <button
-          class="components-button is-secondary"
+          aria-disabled="true"
+          class="components-button editor-post-publish-button editor-post-publish-button__button is-primary is-compact"
           type="button"
         >
-          Cancel
+          Submit for Review
         </button>
       </div>
     </div>
@@ -547,22 +661,28 @@ exports[`PostPublishPanel should render the pre-publish panel if the post is not
         <div
           class="components-base-control__field emotion-2 emotion-3"
         >
-          <span
-            class="components-checkbox-control__input-container"
-          >
-            <input
-              class="components-checkbox-control__input"
-              id="inspector-checkbox-control-0"
-              type="checkbox"
-              value="1"
-            />
-          </span>
-          <label
-            class="components-checkbox-control__label"
-            for="inspector-checkbox-control-0"
+          <div
+            class="components-flex components-h-stack emotion-4 emotion-5"
+            data-wp-c16t="true"
+            data-wp-component="HStack"
           >
-            Always show pre-publish checks.
-          </label>
+            <span
+              class="components-checkbox-control__input-container"
+            >
+              <input
+                class="components-checkbox-control__input"
+                id="inspector-checkbox-control-0"
+                type="checkbox"
+                value="1"
+              />
+            </span>
+            <label
+              class="components-checkbox-control__label"
+              for="inspector-checkbox-control-0"
+            >
+              Always show pre-publish checks.
+            </label>
+          </div>
         </div>
       </div>
     </div>
@@ -631,6 +751,30 @@ exports[`PostPublishPanel should render the spinner if the post is being saved 1
   margin-bottom: inherit;
 }
 
+.emotion-10 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: flex-start;
+  -webkit-box-align: flex-start;
+  -ms-flex-align: flex-start;
+  align-items: flex-start;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  gap: 0;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
+  -webkit-justify-content: start;
+  justify-content: start;
+  width: 100%;
+}
+
+.emotion-10>* {
+  min-width: 0;
+}
+
 <div>
   <div
     class="editor-post-publish-panel"
@@ -639,24 +783,24 @@ exports[`PostPublishPanel should render the spinner if the post is being saved 1
       class="editor-post-publish-panel__header"
     >
       <div
-        class="editor-post-publish-panel__header-publish-button"
+        class="editor-post-publish-panel__header-cancel-button"
       >
         <button
-          aria-disabled="true"
-          class="components-button editor-post-publish-button editor-post-publish-button__button is-primary"
+          class="components-button is-secondary is-compact"
           type="button"
         >
-          Submit for Review
+          Cancel
         </button>
       </div>
       <div
-        class="editor-post-publish-panel__header-cancel-button"
+        class="editor-post-publish-panel__header-publish-button"
       >
         <button
-          class="components-button is-secondary"
+          aria-disabled="true"
+          class="components-button editor-post-publish-button editor-post-publish-button__button is-primary is-compact"
           type="button"
         >
-          Cancel
+          Submit for Review
         </button>
       </div>
     </div>
@@ -695,22 +839,28 @@ exports[`PostPublishPanel should render the spinner if the post is being saved 1
         <div
           class="components-base-control__field emotion-8 emotion-9"
         >
-          <span
-            class="components-checkbox-control__input-container"
-          >
-            <input
-              class="components-checkbox-control__input"
-              id="inspector-checkbox-control-2"
-              type="checkbox"
-              value="1"
-            />
-          </span>
-          <label
-            class="components-checkbox-control__label"
-            for="inspector-checkbox-control-2"
+          <div
+            class="components-flex components-h-stack emotion-10 emotion-11"
+            data-wp-c16t="true"
+            data-wp-component="HStack"
           >
-            Always show pre-publish checks.
-          </label>
+            <span
+              class="components-checkbox-control__input-container"
+            >
+              <input
+                class="components-checkbox-control__input"
+                id="inspector-checkbox-control-2"
+                type="checkbox"
+                value="1"
+              />
+            </span>
+            <label
+              class="components-checkbox-control__label"
+              for="inspector-checkbox-control-2"
+            >
+              Always show pre-publish checks.
+            </label>
+          </div>
         </div>
       </div>
     </div>
diff --git a/packages/editor/src/components/post-publish-panel/test/media-util.js b/packages/editor/src/components/post-publish-panel/test/media-util.js
new file mode 100644
index 00000000000000..b91583cc3f17b3
--- /dev/null
+++ b/packages/editor/src/components/post-publish-panel/test/media-util.js
@@ -0,0 +1,118 @@
+/**
+ * Internal dependencies
+ */
+import { generateUniqueBasenames } from '../media-util';
+
+describe( 'generateUniqueBasenames', () => {
+	it( 'should prefer the original basenames', () => {
+		const urls = [
+			'https://example.com/images/image1.jpg',
+			'https://example.com/images/image2.jpg',
+			'https://example.com/images/image3.jpg',
+			'https://example.com/images/image4.jpg',
+		];
+
+		expect( generateUniqueBasenames( urls ) ).toEqual( {
+			'https://example.com/images/image1.jpg': 'image1',
+			'https://example.com/images/image2.jpg': 'image2',
+			'https://example.com/images/image3.jpg': 'image3',
+			'https://example.com/images/image4.jpg': 'image4',
+		} );
+	} );
+
+	it( 'should handle filenames with no extensions', () => {
+		const urls = [
+			'https://example.com/images/image1',
+			'https://example.com/images/image2',
+			'https://example.com/images/image3',
+			'https://example.com/images/image4',
+		];
+
+		expect( generateUniqueBasenames( urls ) ).toEqual( {
+			'https://example.com/images/image1': 'image1',
+			'https://example.com/images/image2': 'image2',
+			'https://example.com/images/image3': 'image3',
+			'https://example.com/images/image4': 'image4',
+		} );
+	} );
+
+	it( 'should handle query parameters correctly', () => {
+		const urls = [
+			'https://example.com/images/image1.jpg?a=notafile.npg',
+			'https://example.com/images/image2.jpg?a=notafile.npg',
+			'https://example.com/images/image3.jpg?a=notafile.npg',
+			'https://example.com/images/image4.jpg?a=notafile.npg',
+		];
+
+		expect( generateUniqueBasenames( urls ) ).toEqual( {
+			'https://example.com/images/image1.jpg?a=notafile.npg': 'image1',
+			'https://example.com/images/image2.jpg?a=notafile.npg': 'image2',
+			'https://example.com/images/image3.jpg?a=notafile.npg': 'image3',
+			'https://example.com/images/image4.jpg?a=notafile.npg': 'image4',
+		} );
+	} );
+
+	it( 'should deduplicate identical filenames', () => {
+		const urls = [
+			'https://example.com/image1/image.jpg',
+			'https://example.com/image2/image.jpg',
+			'https://example.com/image3/image.jpg',
+			'https://example.com/image4/image.jpg',
+		];
+
+		const results = generateUniqueBasenames( urls );
+		const resultLength = Object.entries( results ).length;
+		expect( resultLength ).toBe( urls.length );
+
+		const basenames = new Set( Object.values( results ) );
+		expect( basenames.size ).toBe( resultLength );
+	} );
+
+	it( 'should deduplicate identical basenames', () => {
+		const urls = [
+			'https://example.com/images/image.jpg',
+			'https://example.com/images/image.png',
+			'https://example.com/images/image.webp',
+			'https://example.com/images/image.avif',
+		];
+
+		const results = generateUniqueBasenames( urls );
+		const resultLength = Object.entries( results ).length;
+		expect( resultLength ).toBe( urls.length );
+
+		const basenames = new Set( Object.values( results ) );
+		expect( basenames.size ).toBe( resultLength );
+	} );
+
+	it( 'should deduplicate filenames without extensions', () => {
+		const urls = [
+			'https://example.com/image1/image',
+			'https://example.com/image2/image',
+			'https://example.com/image3/image',
+			'https://example.com/image4/image',
+		];
+
+		const results = generateUniqueBasenames( urls );
+		const resultLength = Object.entries( results ).length;
+		expect( resultLength ).toBe( urls.length );
+
+		const basenames = new Set( Object.values( results ) );
+		expect( basenames.size ).toBe( resultLength );
+	} );
+
+	it( 'should deduplicate paths with no filename', () => {
+		const urls = [
+			'https://example.com/image1/dir/',
+			'https://example.com/image2/dir/',
+			'https://example.com/image3/dir/',
+			'https://example.com/image4/dir/',
+		];
+
+		const results = generateUniqueBasenames( urls );
+		const resultLength = Object.entries( results ).length;
+		expect( resultLength ).toBe( urls.length );
+
+		const basenames = new Set( Object.values( results ) );
+		expect( basenames.size ).toBe( resultLength );
+	} );
+} );
diff --git a/packages/editor/src/components/post-saved-state/index.js b/packages/editor/src/components/post-saved-state/index.js
index 9cccb4fcb120ec..50800808ab3c96 100644
--- a/packages/editor/src/components/post-saved-state/index.js
+++ b/packages/editor/src/components/post-saved-state/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -9,7 +9,6 @@ import classnames from 'classnames';
 import {
 	__unstableGetAnimateClassName as getAnimateClassName,
 	Button,
-	Tooltip,
 } from '@wordpress/components';
 import { usePrevious, useViewportMatch } from '@wordpress/compose';
 import { useDispatch, useSelect } from '@wordpress/data';
@@ -17,26 +16,24 @@ import { useEffect, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { Icon, check, cloud, cloudUpload } from '@wordpress/icons';
 import { displayShortcut } from '@wordpress/keycodes';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
  */
+import { STATUS_OPTIONS } from '../../components/post-status';
 import { store as editorStore } from '../../store';
 
 /**
  * Component showing whether the post is saved or not and providing save
  * buttons.
  *
- * @param {Object}   props                Component props.
- * @param {?boolean} props.forceIsDirty   Whether to force the post to be marked
- *                                        as dirty.
- * @param {?boolean} props.showIconLabels Whether interface buttons show labels instead of icons
+ * @param {Object}   props              Component props.
+ * @param {?boolean} props.forceIsDirty Whether to force the post to be marked
+ *                                      as dirty.
  * @return {import('react').ComponentType} The component.
  */
-export default function PostSavedState( {
-	forceIsDirty,
-	showIconLabels = false,
-} ) {
+export default function PostSavedState( { forceIsDirty } ) {
 	const [ forceSavedMessage, setForceSavedMessage ] = useState( false );
 	const isLargeViewport = useViewportMatch( 'small' );
 
@@ -44,12 +41,14 @@ export default function PostSavedState( {
 		isAutosaving,
 		isDirty,
 		isNew,
-		isPending,
 		isPublished,
 		isSaveable,
 		isSaving,
 		isScheduled,
 		hasPublishAction,
+		showIconLabels,
+		postStatus,
+		postStatusHasChanged,
 	} = useSelect(
 		( select ) => {
 			const {
@@ -62,24 +61,27 @@ export default function PostSavedState( {
 				getCurrentPost,
 				isAutosavingPost,
 				getEditedPostAttribute,
+				getPostEdits,
 			} = select( editorStore );
-
+			const { get } = select( preferencesStore );
 			return {
 				isAutosaving: isAutosavingPost(),
 				isDirty: forceIsDirty || isEditedPostDirty(),
 				isNew: isEditedPostNew(),
-				isPending: 'pending' === getEditedPostAttribute( 'status' ),
 				isPublished: isCurrentPostPublished(),
 				isSaving: isSavingPost(),
 				isSaveable: isEditedPostSaveable(),
 				isScheduled: isCurrentPostScheduled(),
 				hasPublishAction:
 					getCurrentPost()?._links?.[ 'wp:action-publish' ] ?? false,
+				showIconLabels: get( 'core', 'showIconLabels' ),
+				postStatus: getEditedPostAttribute( 'status' ),
+				postStatusHasChanged: !! getPostEdits()?.status,
 			};
 		},
 		[ forceIsDirty ]
 	);
-
+	const isPending = postStatus === 'pending';
 	const { savePost } = useDispatch( editorStore );
 
 	const wasSaving = usePrevious( isSaving );
@@ -103,7 +105,22 @@ export default function PostSavedState( {
 		return null;
 	}
 
-	if ( isPublished || isScheduled ) {
+	// We shouldn't render the button if the post has not one of the following statuses: pending, draft, auto-draft.
+	// The reason for this is that this button handles the `save as pending` and `save draft` actions.
+	// An exception for this is when the post has a custom status and there should be a way to save changes without
+	// having to publish. This should be handled better in the future when custom statuses have better support.
+	// @see https://github.com/WordPress/gutenberg/issues/3144.
+	const isIneligibleStatus =
+		! [ 'pending', 'draft', 'auto-draft' ].includes( postStatus ) &&
+		STATUS_OPTIONS.map( ( { value } ) => value ).includes( postStatus );
+
+	if (
+		isPublished ||
+		isScheduled ||
+		isIneligibleStatus ||
+		( postStatusHasChanged &&
+			[ 'pending', 'draft' ].includes( postStatus ) )
+	) {
 		return null;
 	}
 
@@ -116,7 +133,6 @@ export default function PostSavedState( {
 	const isSaved = forceSavedMessage || ( ! isNew && ! isDirty );
 	const isSavedState = isSaving || isSaved;
 	const isDisabled = isSaving || isSaved || ! isSaveable;
-
 	let text;
 
 	if ( isSaving ) {
@@ -129,54 +145,38 @@ export default function PostSavedState( {
 		text = shortLabel;
 	}
 
-	const buttonAccessibleLabel = text || label;
-
-	/**
-	 * The tooltip needs to be enabled only if the button is not disabled. When
-	 * relying on the internal Button tooltip functionality, this causes the
-	 * resulting `button` element to be always removed and re-added to the DOM,
-	 * causing focus loss. An alternative approach to circumvent the issue
-	 * is not to use the `label` and `shortcut` props on `Button` (which would
-	 * trigger the tooltip), and instead manually wrap the `Button` in a separate
-	 * `Tooltip` component.
-	 */
-	const tooltipProps = isDisabled
-		? undefined
-		: {
-				text: buttonAccessibleLabel,
-				shortcut: displayShortcut.primary( 's' ),
-		  };
-
 	// Use common Button instance for all saved states so that focus is not
 	// lost.
 	return (
-		<Tooltip { ...tooltipProps }>
-			<Button
-				className={
-					isSaveable || isSaving
-						? classnames( {
-								'editor-post-save-draft': ! isSavedState,
-								'editor-post-saved-state': isSavedState,
-								'is-saving': isSaving,
-								'is-autosaving': isAutosaving,
-								'is-saved': isSaved,
-								[ getAnimateClassName( {
-									type: 'loading',
-								} ) ]: isSaving,
-						  } )
-						: undefined
-				}
-				onClick={ isDisabled ? undefined : () => savePost() }
-				variant="tertiary"
-				size="compact"
-				icon={ isLargeViewport ? undefined : cloudUpload }
-				// Make sure the aria-label has always a value, as the default `text` is undefined on small screens.
-				aria-label={ buttonAccessibleLabel }
-				aria-disabled={ isDisabled }
-			>
-				{ isSavedState && <Icon icon={ isSaved ? check : cloud } /> }
-				{ text }
-			</Button>
-		</Tooltip>
+		<Button
+			className={
+				isSaveable || isSaving
+					? clsx( {
+							'editor-post-save-draft': ! isSavedState,
+							'editor-post-saved-state': isSavedState,
+							'is-saving': isSaving,
+							'is-autosaving': isAutosaving,
+							'is-saved': isSaved,
+							[ getAnimateClassName( {
+								type: 'loading',
+							} ) ]: isSaving,
+					  } )
+					: undefined
+			}
+			onClick={ isDisabled ? undefined : () => savePost() }
+			/*
+			 * We want the tooltip to show the keyboard shortcut only when the
+			 * button does something, i.e. when it's not disabled.
+			 */
+			shortcut={ isDisabled ? undefined : displayShortcut.primary( 's' ) }
+			variant="tertiary"
+			size="compact"
+			icon={ isLargeViewport ? undefined : cloudUpload }
+			label={ text || label }
+			aria-disabled={ isDisabled }
+		>
+			{ isSavedState && <Icon icon={ isSaved ? check : cloud } /> }
+			{ text }
+		</Button>
 	);
 }
diff --git a/packages/editor/src/components/post-saved-state/test/__snapshots__/index.js.snap b/packages/editor/src/components/post-saved-state/test/__snapshots__/index.js.snap
index 95ea3db54b511e..ee8d46d393c487 100644
--- a/packages/editor/src/components/post-saved-state/test/__snapshots__/index.js.snap
+++ b/packages/editor/src/components/post-saved-state/test/__snapshots__/index.js.snap
@@ -16,7 +16,7 @@ exports[`PostSavedState returns a disabled button if the post is not saveable 1`
     xmlns="http://www.w3.org/2000/svg"
   >
     <path
-      d="M17.3 10.1c0-2.5-2.1-4.4-4.8-4.4-2.2 0-4.1 1.4-4.6 3.3h-.2C5.7 9 4 10.7 4 12.8c0 2.1 1.7 3.8 3.7 3.8h9c1.8 0 3.2-1.5 3.2-3.3.1-1.6-1.1-2.9-2.6-3.2zm-.5 5.1h-4v-2.4L14 14l1-1-3-3-3 3 1 1 1.2-1.2v2.4H7.7c-1.2 0-2.2-1.1-2.2-2.3s1-2.4 2.2-2.4H9l.3-1.1c.4-1.3 1.7-2.2 3.2-2.2 1.8 0 3.3 1.3 3.3 2.9v1.3l1.3.2c.8.1 1.4.9 1.4 1.8 0 1-.8 1.8-1.7 1.8z"
+      d="M17.3 10.1C17.3 7.60001 15.2 5.70001 12.5 5.70001C10.3 5.70001 8.4 7.10001 7.9 9.00001H7.7C5.7 9.00001 4 10.7 4 12.8C4 14.9 5.7 16.6 7.7 16.6H9.5V15.2H7.7C6.5 15.2 5.5 14.1 5.5 12.9C5.5 11.7 6.5 10.5 7.7 10.5H9L9.3 9.40001C9.7 8.10001 11 7.20001 12.5 7.20001C14.3 7.20001 15.8 8.50001 15.8 10.1V11.4L17.1 11.6C17.9 11.7 18.5 12.5 18.5 13.4C18.5 14.4 17.7 15.2 16.8 15.2H14.5V16.6H16.7C18.5 16.6 19.9 15.1 19.9 13.3C20 11.7 18.8 10.4 17.3 10.1Z M14.1245 14.2426L15.1852 13.182L12.0032 10L8.82007 13.1831L9.88072 14.2438L11.25 12.8745V18H12.75V12.8681L14.1245 14.2426Z"
     />
   </svg>
 </button>
diff --git a/packages/editor/src/components/post-saved-state/test/index.js b/packages/editor/src/components/post-saved-state/test/index.js
index 47fa92cf5a4a2a..86aa6c6c603007 100644
--- a/packages/editor/src/components/post-saved-state/test/index.js
+++ b/packages/editor/src/components/post-saved-state/test/index.js
@@ -47,6 +47,7 @@ describe( 'PostSavedState', () => {
 			isNew: true,
 			isSaveable: false,
 			isSaving: true,
+			postStatus: 'draft',
 		} ) );
 
 		render( <PostSavedState /> );
@@ -62,6 +63,7 @@ describe( 'PostSavedState', () => {
 			isNew: true,
 			isSaveable: false,
 			isSaving: false,
+			postStatus: 'draft',
 		} ) );
 
 		render( <PostSavedState /> );
@@ -75,6 +77,7 @@ describe( 'PostSavedState', () => {
 			isNew: false,
 			isSaveable: true,
 			isSaving: false,
+			postStatus: 'draft',
 		} ) );
 
 		render( <PostSavedState /> );
@@ -93,6 +96,7 @@ describe( 'PostSavedState', () => {
 			isNew: false,
 			isSaveable: true,
 			isSaving: false,
+			postStatus: 'draft',
 		} ) );
 
 		// Simulate the viewport being considered large.
diff --git a/packages/editor/src/components/post-schedule/check.js b/packages/editor/src/components/post-schedule/check.js
index 050e5a82e8c455..28456b90371cc3 100644
--- a/packages/editor/src/components/post-schedule/check.js
+++ b/packages/editor/src/components/post-schedule/check.js
@@ -1,29 +1,33 @@
 /**
  * WordPress dependencies
  */
-import { compose } from '@wordpress/compose';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
-export function PostScheduleCheck( { hasPublishAction, children } ) {
+/**
+ * Wrapper component that renders its children only if post has a publish action.
+ *
+ * @param {Object}  props          Props.
+ * @param {Element} props.children Children to be rendered.
+ *
+ * @return {Component} - The component to be rendered or null if there is no publish action.
+ */
+export default function PostScheduleCheck( { children } ) {
+	const hasPublishAction = useSelect( ( select ) => {
+		return (
+			select( editorStore ).getCurrentPost()._links?.[
+				'wp:action-publish'
+			] ?? false
+		);
+	}, [] );
+
 	if ( ! hasPublishAction ) {
 		return null;
 	}
 
 	return children;
 }
-
-export default compose( [
-	withSelect( ( select ) => {
-		const { getCurrentPost, getCurrentPostType } = select( editorStore );
-		return {
-			hasPublishAction:
-				getCurrentPost()._links?.[ 'wp:action-publish' ] ?? false,
-			postType: getCurrentPostType(),
-		};
-	} ),
-] )( PostScheduleCheck );
diff --git a/packages/editor/src/components/post-schedule/index.js b/packages/editor/src/components/post-schedule/index.js
index 98a22a992113d5..94387ed4267fa9 100644
--- a/packages/editor/src/components/post-schedule/index.js
+++ b/packages/editor/src/components/post-schedule/index.js
@@ -7,8 +7,9 @@ import { parseISO, endOfMonth, startOfMonth } from 'date-fns';
  * WordPress dependencies
  */
 import { getSettings } from '@wordpress/date';
+import { _x } from '@wordpress/i18n';
 import { useDispatch, useSelect } from '@wordpress/data';
-import { __experimentalPublishDateTimePicker as PublishDateTimePicker } from '@wordpress/block-editor';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { useState, useMemo } from '@wordpress/element';
 import { store as coreStore } from '@wordpress/core-data';
 
@@ -16,8 +17,33 @@ import { store as coreStore } from '@wordpress/core-data';
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
-export default function PostSchedule( { onClose } ) {
+const { PrivatePublishDateTimePicker } = unlock( blockEditorPrivateApis );
+
+/**
+ * Renders the PostSchedule component. It allows the user to schedule a post.
+ *
+ * @param {Object}   props         Props.
+ * @param {Function} props.onClose Function to close the component.
+ *
+ * @return {Component} The component to be rendered.
+ */
+export default function PostSchedule( props ) {
+	return (
+		<PrivatePostSchedule
+			{ ...props }
+			showPopoverHeaderActions
+			isCompact={ false }
+		/>
+	);
+}
+
+export function PrivatePostSchedule( {
+	onClose,
+	showPopoverHeaderActions,
+	isCompact,
+} ) {
 	const { postDate, postType } = useSelect(
 		( select ) => ( {
 			postDate: select( editorStore ).getEditedPostAttribute( 'date' ),
@@ -69,15 +95,21 @@ export default function PostSchedule( { onClose } ) {
 	);
 
 	return (
-		<PublishDateTimePicker
+		<PrivatePublishDateTimePicker
 			currentDate={ postDate }
 			onChange={ onUpdateDate }
 			is12Hour={ is12HourTime }
+			dateOrder={
+				/* translators: Order of day, month, and year. Available formats are 'dmy', 'mdy', and 'ymd'. */
+				_x( 'dmy', 'date order' )
+			}
 			events={ events }
 			onMonthPreviewed={ ( date ) =>
 				setPreviewedMonth( parseISO( date ) )
 			}
 			onClose={ onClose }
+			isCompact={ isCompact }
+			showPopoverHeaderActions={ showPopoverHeaderActions }
 		/>
 	);
 }
diff --git a/packages/editor/src/components/post-schedule/label.js b/packages/editor/src/components/post-schedule/label.js
index e2b511ead762b1..89e7d02d69ce7f 100644
--- a/packages/editor/src/components/post-schedule/label.js
+++ b/packages/editor/src/components/post-schedule/label.js
@@ -10,10 +10,25 @@ import { useSelect } from '@wordpress/data';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Renders the PostScheduleLabel component.
+ *
+ * @param {Object} props Props.
+ *
+ * @return {Component} The component to be rendered.
+ */
 export default function PostScheduleLabel( props ) {
 	return usePostScheduleLabel( props );
 }
 
+/**
+ * Custom hook to get the label for post schedule.
+ *
+ * @param {Object}  options      Options for the hook.
+ * @param {boolean} options.full Whether to get the full label or not. Default is false.
+ *
+ * @return {string} The label for post schedule.
+ */
 export function usePostScheduleLabel( { full = false } = {} ) {
 	const { date, isFloating } = useSelect(
 		( select ) => ( {
@@ -102,7 +117,7 @@ function getTimezoneAbbreviation() {
 	}
 
 	const symbol = timezone.offset < 0 ? '' : '+';
-	return `UTC${ symbol }${ timezone.offset }`;
+	return `UTC${ symbol }${ timezone.offsetFormatted }`;
 }
 
 function isTimezoneSameAsSiteTimezone( date ) {
diff --git a/packages/editor/src/components/post-schedule/panel.js b/packages/editor/src/components/post-schedule/panel.js
index 899ecd9efaee7a..5d63da5e30c910 100644
--- a/packages/editor/src/components/post-schedule/panel.js
+++ b/packages/editor/src/components/post-schedule/panel.js
@@ -4,6 +4,7 @@
 import { Button, Dropdown } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
 import { useState, useMemo } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -12,9 +13,32 @@ import PostScheduleCheck from './check';
 import PostScheduleForm from './index';
 import { usePostScheduleLabel } from './label';
 import PostPanelRow from '../post-panel-row';
+import { store as editorStore } from '../../store';
+import {
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+	PATTERN_POST_TYPE,
+	NAVIGATION_POST_TYPE,
+} from '../../store/constants';
 
+const DESIGN_POST_TYPES = [
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+	PATTERN_POST_TYPE,
+	NAVIGATION_POST_TYPE,
+];
+
+/**
+ * Renders the Post Schedule Panel component.
+ *
+ * @return {Component} The component to be rendered.
+ */
 export default function PostSchedulePanel() {
 	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	const postType = useSelect(
+		( select ) => select( editorStore ).getCurrentPostType(),
+		[]
+	);
 	// Memoize popoverProps to avoid returning a new object every time.
 	const popoverProps = useMemo(
 		() => ( {
@@ -22,13 +46,18 @@ export default function PostSchedulePanel() {
 			// move around when the label changes.
 			anchor: popoverAnchor,
 			'aria-label': __( 'Change publish date' ),
-			placement: 'bottom-end',
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
 		} ),
 		[ popoverAnchor ]
 	);
 
 	const label = usePostScheduleLabel();
 	const fullLabel = usePostScheduleLabel( { full: true } );
+	if ( DESIGN_POST_TYPES.includes( postType ) ) {
+		return null;
+	}
 
 	return (
 		<PostScheduleCheck>
@@ -40,8 +69,10 @@ export default function PostSchedulePanel() {
 					contentClassName="editor-post-schedule__dialog"
 					renderToggle={ ( { onToggle, isOpen } ) => (
 						<Button
+							size="compact"
 							className="editor-post-schedule__dialog-toggle"
 							variant="tertiary"
+							tooltipPosition="middle left"
 							onClick={ onToggle }
 							aria-label={ sprintf(
 								// translators: %s: Current post date.
diff --git a/packages/editor/src/components/post-schedule/style.scss b/packages/editor/src/components/post-schedule/style.scss
index 23cb185167db56..02ea48016f9696 100644
--- a/packages/editor/src/components/post-schedule/style.scss
+++ b/packages/editor/src/components/post-schedule/style.scss
@@ -8,16 +8,3 @@
 		padding: $grid-unit-20;
 	}
 }
-
-.editor-post-schedule__dialog-toggle.components-button {
-	display: block;
-	max-width: 100%;
-	overflow: hidden;
-	text-align: left;
-	white-space: unset;
-	height: auto;
-
-	// The line height + the padding should be the same as the button size.
-	padding: math.div($button-size - $grid-unit-20, 2) 12px;
-	line-height: $grid-unit-20;
-}
diff --git a/packages/editor/src/components/post-schedule/test/check.js b/packages/editor/src/components/post-schedule/test/check.js
index 26fc0193ece8d8..b892842e3ef8d7 100644
--- a/packages/editor/src/components/post-schedule/test/check.js
+++ b/packages/editor/src/components/post-schedule/test/check.js
@@ -3,25 +3,40 @@
  */
 import { render, screen } from '@testing-library/react';
 
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
-import { PostScheduleCheck } from '../check';
+import PostScheduleCheck from '../check';
+
+jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
+
+function setupMockSelect( hasPublishAction ) {
+	useSelect.mockImplementation( ( mapSelect ) => {
+		return mapSelect( () => ( {
+			getCurrentPost: () => ( {
+				_links: {
+					'wp:action-publish': hasPublishAction,
+				},
+			} ),
+		} ) );
+	} );
+}
 
 describe( 'PostScheduleCheck', () => {
 	it( "should not render anything if the user doesn't have the right capabilities", () => {
-		render(
-			<PostScheduleCheck hasPublishAction={ false }>
-				yes
-			</PostScheduleCheck>
-		);
+		setupMockSelect( false );
+		render( <PostScheduleCheck>yes</PostScheduleCheck> );
 		expect( screen.queryByText( 'yes' ) ).not.toBeInTheDocument();
 	} );
 
 	it( 'should render if the user has the correct capability', () => {
-		render(
-			<PostScheduleCheck hasPublishAction={ true }>yes</PostScheduleCheck>
-		);
+		setupMockSelect( true );
+		render( <PostScheduleCheck>yes</PostScheduleCheck> );
 		expect( screen.getByText( 'yes' ) ).toBeVisible();
 	} );
 } );
diff --git a/packages/editor/src/components/post-schedule/test/label.js b/packages/editor/src/components/post-schedule/test/label.js
index e4a4c0c4182101..adcda2a2365a26 100644
--- a/packages/editor/src/components/post-schedule/test/label.js
+++ b/packages/editor/src/components/post-schedule/test/label.js
@@ -23,9 +23,11 @@ describe( 'getFullPostScheduleLabel', () => {
 		} );
 
 		const label = getFullPostScheduleLabel( '2022-04-28T15:30:00' );
-		expect( label ).toBe( 'April 28, 2022 3:30\xa0pm AEST' );
 
+		// Reset date settings before potential failure of the expectation.
 		setSettings( settings );
+
+		expect( label ).toBe( 'April 28, 2022 3:30\xa0pm AEST' );
 	} );
 
 	it( "should show site's timezone offset", () => {
@@ -33,13 +35,15 @@ describe( 'getFullPostScheduleLabel', () => {
 
 		setSettings( {
 			...settings,
-			timezone: { offset: 10 },
+			timezone: { offsetFormatted: 10 },
 		} );
 
 		const label = getFullPostScheduleLabel( '2022-04-28T15:30:00' );
-		expect( label ).toBe( 'April 28, 2022 3:30\xa0pm UTC+10' );
 
+		// Reset date settings before potential failure of the expectation.
 		setSettings( settings );
+
+		expect( label ).toBe( 'April 28, 2022 3:30\xa0pm UTC+10' );
 	} );
 } );
 
@@ -80,9 +84,11 @@ describe( 'getPostScheduleLabel', () => {
 		);
 
 		const label = getPostScheduleLabel( '2022-04-28T15:30:00', { now } );
-		expect( label ).toBe( 'Today at 3:30\xa0pm' );
 
+		// Reset date settings before potential failure of the expectation.
 		setSettings( settings );
+
+		expect( label ).toBe( 'Today at 3:30\xa0pm' );
 	} );
 
 	it( "should show tomorrow if date is same day as now + 1 day and user timezone equals site's timezone", () => {
@@ -99,9 +105,11 @@ describe( 'getPostScheduleLabel', () => {
 		);
 
 		const label = getPostScheduleLabel( '2022-04-29T15:30:00', { now } );
-		expect( label ).toBe( 'Tomorrow at 3:30\xa0pm' );
 
+		// Reset date settings before potential failure of the expectation.
 		setSettings( settings );
+
+		expect( label ).toBe( 'Tomorrow at 3:30\xa0pm' );
 	} );
 
 	it( "should hide year if date is same year as now and user timezone equals site's timezone", () => {
@@ -118,9 +126,11 @@ describe( 'getPostScheduleLabel', () => {
 		);
 
 		const label = getPostScheduleLabel( '2022-12-25T15:30:00', { now } );
-		expect( label ).toBe( 'December 25 3:30\xa0pm' );
 
+		// Reset date settings before potential failure of the expectation.
 		setSettings( settings );
+
+		expect( label ).toBe( 'December 25 3:30\xa0pm' );
 	} );
 
 	it( "should show year if date is not same year as now and user timezone equals site's timezone", () => {
@@ -137,8 +147,10 @@ describe( 'getPostScheduleLabel', () => {
 		);
 
 		const label = getPostScheduleLabel( '2023-04-28T15:30:00', { now } );
-		expect( label ).toBe( 'April 28, 2023 3:30\xa0pm' );
 
+		// Reset date settings before potential failure of the expectation.
 		setSettings( settings );
+
+		expect( label ).toBe( 'April 28, 2023 3:30\xa0pm' );
 	} );
 } );
diff --git a/packages/editor/src/components/post-slug/check.js b/packages/editor/src/components/post-slug/check.js
index 80928e4cf1dece..86bf04814c934d 100644
--- a/packages/editor/src/components/post-slug/check.js
+++ b/packages/editor/src/components/post-slug/check.js
@@ -3,6 +3,14 @@
  */
 import PostTypeSupportCheck from '../post-type-support-check';
 
+/**
+ * Wrapper component that renders its children only if the post type supports the slug.
+ *
+ * @param {Object}  props          Props.
+ * @param {Element} props.children Children to be rendered.
+ *
+ * @return {Component} The component to be rendered.
+ */
 export default function PostSlugCheck( { children } ) {
 	return (
 		<PostTypeSupportCheck supportKeys="slug">
diff --git a/packages/editor/src/components/post-slug/index.js b/packages/editor/src/components/post-slug/index.js
index 85e7b86a423f4a..1a4f8e93d7565c 100644
--- a/packages/editor/src/components/post-slug/index.js
+++ b/packages/editor/src/components/post-slug/index.js
@@ -1,10 +1,9 @@
 /**
  * WordPress dependencies
  */
-import { withDispatch, withSelect } from '@wordpress/data';
-import { Component } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { compose } from '@wordpress/compose';
 import { safeDecodeURIComponent, cleanForSlug } from '@wordpress/url';
 import { TextControl } from '@wordpress/components';
 
@@ -14,72 +13,61 @@ import { TextControl } from '@wordpress/components';
 import PostSlugCheck from './check';
 import { store as editorStore } from '../../store';
 
-export class PostSlug extends Component {
-	constructor( { postSlug, postTitle, postID } ) {
-		super( ...arguments );
-
-		this.state = {
-			editedSlug:
-				safeDecodeURIComponent( postSlug ) ||
-				cleanForSlug( postTitle ) ||
-				postID,
-		};
-
-		this.setSlug = this.setSlug.bind( this );
-	}
-
-	setSlug( event ) {
-		const { postSlug, onUpdateSlug } = this.props;
-		const { value } = event.target;
-
-		const editedSlug = cleanForSlug( value );
-
-		if ( editedSlug === postSlug ) {
-			return;
-		}
-
-		onUpdateSlug( editedSlug );
-	}
+function PostSlugControl() {
+	const postSlug = useSelect( ( select ) => {
+		return safeDecodeURIComponent(
+			select( editorStore ).getEditedPostSlug()
+		);
+	}, [] );
+	const { editPost } = useDispatch( editorStore );
+	const [ forceEmptyField, setForceEmptyField ] = useState( false );
 
-	render() {
-		const { editedSlug } = this.state;
-		return (
-			<PostSlugCheck>
-				<TextControl
-					__nextHasNoMarginBottom
-					label={ __( 'Slug' ) }
-					autoComplete="off"
-					spellCheck="false"
-					value={ editedSlug }
-					onChange={ ( slug ) =>
-						this.setState( { editedSlug: slug } )
+	return (
+		<TextControl
+			__next40pxDefaultSize
+			__nextHasNoMarginBottom
+			label={ __( 'Slug' ) }
+			autoComplete="off"
+			spellCheck="false"
+			value={ forceEmptyField ? '' : postSlug }
+			onChange={ ( newValue ) => {
+				editPost( { slug: newValue } );
+				// When we delete the field the permalink gets
+				// reverted to the original value.
+				// The forceEmptyField logic allows the user to have
+				// the field temporarily empty while typing.
+				if ( ! newValue ) {
+					if ( ! forceEmptyField ) {
+						setForceEmptyField( true );
 					}
-					onBlur={ this.setSlug }
-					className="editor-post-slug"
-				/>
-			</PostSlugCheck>
-		);
-	}
+					return;
+				}
+				if ( forceEmptyField ) {
+					setForceEmptyField( false );
+				}
+			} }
+			onBlur={ ( event ) => {
+				editPost( {
+					slug: cleanForSlug( event.target.value ),
+				} );
+				if ( forceEmptyField ) {
+					setForceEmptyField( false );
+				}
+			} }
+			className="editor-post-slug"
+		/>
+	);
 }
 
-export default compose( [
-	withSelect( ( select ) => {
-		const { getCurrentPost, getEditedPostAttribute } =
-			select( editorStore );
-
-		const { id } = getCurrentPost();
-		return {
-			postSlug: getEditedPostAttribute( 'slug' ),
-			postTitle: getEditedPostAttribute( 'title' ),
-			postID: id,
-		};
-	} ),
-	withDispatch( ( dispatch ) => {
-		const { editPost } = dispatch( editorStore );
-		return {
-			onUpdateSlug( slug ) {
-				editPost( { slug } );
-			},
-		};
-	} ),
-] )( PostSlug );
+/**
+ * Renders the PostSlug component. It provide a control for editing the post slug.
+ *
+ * @return {Component} The component to be rendered.
+ */
+export default function PostSlug() {
+	return (
+		<PostSlugCheck>
+			<PostSlugControl />
+		</PostSlugCheck>
+	);
+}
diff --git a/packages/editor/src/components/post-slug/panel.js b/packages/editor/src/components/post-slug/panel.js
new file mode 100644
index 00000000000000..6ab97a28b251c3
--- /dev/null
+++ b/packages/editor/src/components/post-slug/panel.js
@@ -0,0 +1,22 @@
+/**
+ * WordPress dependencies
+ */
+import { PanelRow } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import PostSlugForm from './';
+import PostSlugCheck from './check';
+
+export function PostSlug() {
+	return (
+		<PostSlugCheck>
+			<PanelRow className="editor-post-slug">
+				<PostSlugForm />
+			</PanelRow>
+		</PostSlugCheck>
+	);
+}
+
+export default PostSlug;
diff --git a/packages/editor/src/components/post-slug/style.scss b/packages/editor/src/components/post-slug/style.scss
new file mode 100644
index 00000000000000..551450582128e0
--- /dev/null
+++ b/packages/editor/src/components/post-slug/style.scss
@@ -0,0 +1,5 @@
+.editor-post-slug {
+	display: flex;
+	flex-direction: column;
+	align-items: stretch;
+}
diff --git a/packages/editor/src/components/post-slug/test/check.js b/packages/editor/src/components/post-slug/test/check.js
deleted file mode 100644
index 5b5b4ce8a440f4..00000000000000
--- a/packages/editor/src/components/post-slug/test/check.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * External dependencies
- */
-import { render, screen } from '@testing-library/react';
-
-/**
- * Internal dependencies
- */
-import PostSlugCheck from '../check';
-
-describe( 'PostSlugCheck', () => {
-	it( 'should render control', () => {
-		render( <PostSlugCheck>slug</PostSlugCheck> );
-
-		expect( screen.getByText( 'slug' ) ).toBeVisible();
-	} );
-} );
diff --git a/packages/editor/src/components/post-slug/test/index.js b/packages/editor/src/components/post-slug/test/index.js
index 74011209dd151a..fb40055111b77a 100644
--- a/packages/editor/src/components/post-slug/test/index.js
+++ b/packages/editor/src/components/post-slug/test/index.js
@@ -4,23 +4,50 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
-import { PostSlug } from '../';
+import PostSlug from '../';
+
+jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
+jest.mock( '@wordpress/data/src/components/use-dispatch/use-dispatch', () =>
+	jest.fn()
+);
 
 describe( 'PostSlug', () => {
 	it( 'should update slug with sanitized input', async () => {
 		const user = userEvent.setup();
-		const onUpdateSlug = jest.fn();
+		const editPost = jest.fn();
+
+		useSelect.mockImplementation( ( mapSelect ) =>
+			mapSelect( () => ( {
+				getPostType: () => ( {
+					supports: {
+						slug: true,
+					},
+				} ),
+				getEditedPostAttribute: () => 'post',
+				getEditedPostSlug: () => '1',
+			} ) )
+		);
+		useDispatch.mockImplementation( () => ( {
+			editPost,
+		} ) );
 
-		render( <PostSlug postSlug="index" onUpdateSlug={ onUpdateSlug } /> );
+		render( <PostSlug /> );
 
 		const input = screen.getByRole( 'textbox', { name: 'Slug' } );
-		await user.clear( input );
-		await user.type( input, 'Foo Bar-Baz 9!' );
+		await user.type( input, '2', {
+			initialSelectionStart: 0,
+			initialSelectionEnd: 1,
+		} );
 		act( () => input.blur() );
 
-		expect( onUpdateSlug ).toHaveBeenCalledWith( 'foo-bar-baz-9' );
+		expect( editPost ).toHaveBeenCalledWith( { slug: '2' } );
 	} );
 } );
diff --git a/packages/editor/src/components/post-status/index.js b/packages/editor/src/components/post-status/index.js
new file mode 100644
index 00000000000000..c2bf038875354d
--- /dev/null
+++ b/packages/editor/src/components/post-status/index.js
@@ -0,0 +1,278 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	Button,
+	CheckboxControl,
+	Dropdown,
+	__experimentalVStack as VStack,
+	TextControl,
+	RadioControl,
+} from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useState, useMemo } from '@wordpress/element';
+import { store as coreStore } from '@wordpress/core-data';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+import { useInstanceId } from '@wordpress/compose';
+import {
+	drafts,
+	published,
+	scheduled,
+	pending,
+	notAllowed,
+} from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import {
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+	PATTERN_POST_TYPE,
+	NAVIGATION_POST_TYPE,
+} from '../../store/constants';
+import PostPanelRow from '../post-panel-row';
+import PostSticky from '../post-sticky';
+import { PrivatePostSchedule } from '../post-schedule';
+import { store as editorStore } from '../../store';
+
+const postStatusesInfo = {
+	'auto-draft': { label: __( 'Draft' ), icon: drafts },
+	draft: { label: __( 'Draft' ), icon: drafts },
+	pending: { label: __( 'Pending' ), icon: pending },
+	private: { label: __( 'Private' ), icon: notAllowed },
+	future: { label: __( 'Scheduled' ), icon: scheduled },
+	publish: { label: __( 'Published' ), icon: published },
+};
+
+export const STATUS_OPTIONS = [
+	{
+		label: __( 'Draft' ),
+		value: 'draft',
+		description: __( 'Not ready to publish.' ),
+	},
+	{
+		label: __( 'Pending' ),
+		value: 'pending',
+		description: __( 'Waiting for review before publishing.' ),
+	},
+	{
+		label: __( 'Private' ),
+		value: 'private',
+		description: __( 'Only visible to site admins and editors.' ),
+	},
+	{
+		label: __( 'Scheduled' ),
+		value: 'future',
+		description: __( 'Publish automatically on a chosen date.' ),
+	},
+	{
+		label: __( 'Published' ),
+		value: 'publish',
+		description: __( 'Visible to everyone.' ),
+	},
+];
+
+const DESIGN_POST_TYPES = [
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+	PATTERN_POST_TYPE,
+	NAVIGATION_POST_TYPE,
+];
+
+export default function PostStatus() {
+	const { status, date, password, postId, postType, canEdit } = useSelect(
+		( select ) => {
+			const {
+				getEditedPostAttribute,
+				getCurrentPostId,
+				getCurrentPostType,
+				getCurrentPost,
+			} = select( editorStore );
+			return {
+				status: getEditedPostAttribute( 'status' ),
+				date: getEditedPostAttribute( 'date' ),
+				password: getEditedPostAttribute( 'password' ),
+				postId: getCurrentPostId(),
+				postType: getCurrentPostType(),
+				canEdit:
+					getCurrentPost()._links?.[ 'wp:action-publish' ] ?? false,
+			};
+		},
+		[]
+	);
+	const [ showPassword, setShowPassword ] = useState( !! password );
+	const passwordInputId = useInstanceId(
+		PostStatus,
+		'editor-change-status__password-input'
+	);
+	const { editEntityRecord } = useDispatch( coreStore );
+	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			'aria-label': __( 'Status & visibility' ),
+			headerTitle: __( 'Status & visibility' ),
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor ]
+	);
+
+	if ( DESIGN_POST_TYPES.includes( postType ) ) {
+		return null;
+	}
+
+	const updatePost = ( {
+		status: newStatus = status,
+		password: newPassword = password,
+		date: newDate = date,
+	} ) => {
+		editEntityRecord( 'postType', postType, postId, {
+			status: newStatus,
+			date: newDate,
+			password: newPassword,
+		} );
+	};
+
+	const handleTogglePassword = ( value ) => {
+		setShowPassword( value );
+		if ( ! value ) {
+			updatePost( { password: '' } );
+		}
+	};
+
+	const handleStatus = ( value ) => {
+		let newDate = date;
+		let newPassword = password;
+		if ( status === 'future' && new Date( date ) > new Date() ) {
+			newDate = null;
+		}
+		if ( value === 'private' && password ) {
+			newPassword = '';
+		}
+		updatePost( {
+			status: value,
+			date: newDate,
+			password: newPassword,
+		} );
+	};
+
+	return (
+		<PostPanelRow label={ __( 'Status' ) } ref={ setPopoverAnchor }>
+			{ canEdit ? (
+				<Dropdown
+					className="editor-post-status"
+					contentClassName="editor-change-status__content"
+					popoverProps={ popoverProps }
+					focusOnMount
+					renderToggle={ ( { onToggle, isOpen } ) => (
+						<Button
+							className="editor-post-status__toggle"
+							variant="tertiary"
+							size="compact"
+							onClick={ onToggle }
+							icon={ postStatusesInfo[ status ]?.icon }
+							aria-label={ sprintf(
+								// translators: %s: Current post status.
+								__( 'Change status: %s' ),
+								postStatusesInfo[ status ]?.label
+							) }
+							aria-expanded={ isOpen }
+						>
+							{ postStatusesInfo[ status ]?.label }
+						</Button>
+					) }
+					renderContent={ ( { onClose } ) => (
+						<>
+							<InspectorPopoverHeader
+								title={ __( 'Status & visibility' ) }
+								onClose={ onClose }
+							/>
+							<form>
+								<VStack spacing={ 4 }>
+									<RadioControl
+										className="editor-change-status__options"
+										hideLabelFromVision
+										label={ __( 'Status' ) }
+										options={ STATUS_OPTIONS }
+										onChange={ handleStatus }
+										selected={
+											status === 'auto-draft'
+												? 'draft'
+												: status
+										}
+									/>
+									{ status === 'future' && (
+										<div className="editor-change-status__publish-date-wrapper">
+											<PrivatePostSchedule
+												showPopoverHeaderActions={
+													false
+												}
+												isCompact
+											/>
+										</div>
+									) }
+									{ status !== 'private' && (
+										<VStack
+											as="fieldset"
+											spacing={ 4 }
+											className="editor-change-status__password-fieldset"
+										>
+											<CheckboxControl
+												__nextHasNoMarginBottom
+												label={ __(
+													'Password protected'
+												) }
+												help={ __(
+													'Only visible to those who know the password'
+												) }
+												checked={ showPassword }
+												onChange={
+													handleTogglePassword
+												}
+											/>
+											{ showPassword && (
+												<div className="editor-change-status__password-input">
+													<TextControl
+														label={ __(
+															'Password'
+														) }
+														onChange={ ( value ) =>
+															updatePost( {
+																password: value,
+															} )
+														}
+														value={ password }
+														placeholder={ __(
+															'Use a secure password'
+														) }
+														type="text"
+														id={ passwordInputId }
+														__next40pxDefaultSize
+														__nextHasNoMarginBottom
+														maxLength={ 255 }
+													/>
+												</div>
+											) }
+										</VStack>
+									) }
+									<PostSticky />
+								</VStack>
+							</form>
+						</>
+					) }
+				/>
+			) : (
+				<div className="editor-post-status is-read-only">
+					{ postStatusesInfo[ status ]?.label }
+				</div>
+			) }
+		</PostPanelRow>
+	);
+}
diff --git a/packages/editor/src/components/post-status/style.scss b/packages/editor/src/components/post-status/style.scss
new file mode 100644
index 00000000000000..670dc5fc35999a
--- /dev/null
+++ b/packages/editor/src/components/post-status/style.scss
@@ -0,0 +1,35 @@
+.editor-post-status {
+	max-width: 100%;
+
+	&.is-read-only {
+		padding: 6px 12px;
+	}
+
+	.editor-post-status__toggle.editor-post-status__toggle {
+		padding-top: $grid-unit-05;
+		padding-bottom: $grid-unit-05;
+	}
+}
+
+.editor-change-status__password-fieldset,
+.editor-change-status__publish-date-wrapper {
+	border-top: $border-width solid $gray-200;
+	padding-top: $grid-unit-20;
+}
+
+.editor-change-status__content {
+	.components-popover__content {
+		min-width: 320px;
+		padding: $grid-unit-20;
+	}
+
+	.editor-change-status__password-legend {
+		padding: 0;
+		margin-bottom: $grid-unit-10;
+	}
+
+	p.components-base-control__help:has(.components-checkbox-control__help) {
+		margin-top: $grid-unit-05;
+	}
+
+}
diff --git a/packages/editor/src/components/post-sticky/check.js b/packages/editor/src/components/post-sticky/check.js
index e31c145b9bbf0f..f504effca82c6b 100644
--- a/packages/editor/src/components/post-sticky/check.js
+++ b/packages/editor/src/components/post-sticky/check.js
@@ -8,6 +8,14 @@ import { useSelect } from '@wordpress/data';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Wrapper component that renders its children only if post has a sticky action.
+ *
+ * @param {Object}  props          Props.
+ * @param {Element} props.children Children to be rendered.
+ *
+ * @return {Component} The component to be rendered or null if post type is not 'post' or hasStickyAction is false.
+ */
 export default function PostStickyCheck( { children } ) {
 	const { hasStickyAction, postType } = useSelect( ( select ) => {
 		const post = select( editorStore ).getCurrentPost();
diff --git a/packages/editor/src/components/post-sticky/index.js b/packages/editor/src/components/post-sticky/index.js
index fe8820243962b6..43a4bea98de26e 100644
--- a/packages/editor/src/components/post-sticky/index.js
+++ b/packages/editor/src/components/post-sticky/index.js
@@ -11,6 +11,11 @@ import { useDispatch, useSelect } from '@wordpress/data';
 import PostStickyCheck from './check';
 import { store as editorStore } from '../../store';
 
+/**
+ * Renders the PostSticky component. It provides a checkbox control for the sticky post feature.
+ *
+ * @return {Component} The component to be rendered.
+ */
 export default function PostSticky() {
 	const postSticky = useSelect( ( select ) => {
 		return (
@@ -22,10 +27,12 @@ export default function PostSticky() {
 	return (
 		<PostStickyCheck>
 			<CheckboxControl
-				__nextHasNoMarginBottom
-				label={ __( 'Stick to the top of the blog' ) }
+				className="editor-post-sticky__checkbox-control"
+				label={ __( 'Sticky' ) }
+				help={ __( 'Pin this post to the top of the blog' ) }
 				checked={ postSticky }
 				onChange={ () => editPost( { sticky: ! postSticky } ) }
+				__nextHasNoMarginBottom
 			/>
 		</PostStickyCheck>
 	);
diff --git a/packages/editor/src/components/post-sticky/panel.js b/packages/editor/src/components/post-sticky/panel.js
new file mode 100644
index 00000000000000..b5ede0c1ab8825
--- /dev/null
+++ b/packages/editor/src/components/post-sticky/panel.js
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import PostPanelRow from '../post-panel-row';
+import PostStickyForm from './';
+import PostStickyCheck from './check';
+
+export function PostStickyPanel() {
+	return (
+		<PostStickyCheck>
+			<PostPanelRow>
+				<PostStickyForm />
+			</PostPanelRow>
+		</PostStickyCheck>
+	);
+}
+
+export default PostStickyPanel;
diff --git a/packages/editor/src/components/post-sticky/style.scss b/packages/editor/src/components/post-sticky/style.scss
new file mode 100644
index 00000000000000..475332e6790005
--- /dev/null
+++ b/packages/editor/src/components/post-sticky/style.scss
@@ -0,0 +1,4 @@
+.editor-post-sticky__checkbox-control {
+	border-top: $border-width solid $gray-200;
+	padding-top: $grid-unit-20;
+}
diff --git a/packages/editor/src/components/post-switch-to-draft-button/index.js b/packages/editor/src/components/post-switch-to-draft-button/index.js
index 590d7722b82299..a743c7a2991ffb 100644
--- a/packages/editor/src/components/post-switch-to-draft-button/index.js
+++ b/packages/editor/src/components/post-switch-to-draft-button/index.js
@@ -8,13 +8,23 @@ import {
 import { __ } from '@wordpress/i18n';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useState } from '@wordpress/element';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Renders a button component that allows the user to switch a post to draft status.
+ *
+ * @return {JSX.Element} The rendered component.
+ */
 export default function PostSwitchToDraftButton() {
+	deprecated( 'wp.editor.PostSwitchToDraftButton', {
+		since: '6.7',
+		version: '6.9',
+	} );
 	const [ showConfirmDialog, setShowConfirmDialog ] = useState( false );
 
 	const { editPost, savePost } = useDispatch( editorStore );
@@ -31,10 +41,13 @@ export default function PostSwitchToDraftButton() {
 	const isDisabled = isSaving || ( ! isPublished && ! isScheduled );
 
 	let alertMessage;
+	let confirmButtonText;
 	if ( isPublished ) {
 		alertMessage = __( 'Are you sure you want to unpublish this post?' );
+		confirmButtonText = __( 'Unpublish' );
 	} else if ( isScheduled ) {
 		alertMessage = __( 'Are you sure you want to unschedule this post?' );
+		confirmButtonText = __( 'Unschedule' );
 	}
 
 	const handleConfirm = () => {
@@ -46,6 +59,7 @@ export default function PostSwitchToDraftButton() {
 	return (
 		<>
 			<Button
+				__next40pxDefaultSize
 				className="editor-post-switch-to-draft"
 				onClick={ () => {
 					if ( ! isDisabled ) {
@@ -62,6 +76,7 @@ export default function PostSwitchToDraftButton() {
 				isOpen={ showConfirmDialog }
 				onConfirm={ handleConfirm }
 				onCancel={ () => setShowConfirmDialog( false ) }
+				confirmButtonText={ confirmButtonText }
 			>
 				{ alertMessage }
 			</ConfirmDialog>
diff --git a/packages/editor/src/components/post-sync-status/index.js b/packages/editor/src/components/post-sync-status/index.js
index 9fa9f3181654e2..d3e2a1a5522e89 100644
--- a/packages/editor/src/components/post-sync-status/index.js
+++ b/packages/editor/src/components/post-sync-status/index.js
@@ -1,27 +1,20 @@
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { __, _x } from '@wordpress/i18n';
-import {
-	Modal,
-	Button,
-	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
-	ToggleControl,
-} from '@wordpress/components';
-import { useEffect, useState } from '@wordpress/element';
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
 import PostPanelRow from '../post-panel-row';
 import { store as editorStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-
-const { ReusableBlocksRenameHint } = unlock( blockEditorPrivateApis );
 
+/**
+ * Renders the sync status of a post.
+ *
+ * @return {JSX.Element|null} The rendered sync status component.
+ */
 export default function PostSyncStatus() {
 	const { syncStatus, postType } = useSelect( ( select ) => {
 		const { getEditedPostAttribute } = select( editorStore );
@@ -47,90 +40,9 @@ export default function PostSyncStatus() {
 		<PostPanelRow label={ __( 'Sync status' ) }>
 			<div className="editor-post-sync-status__value">
 				{ syncStatus === 'unsynced'
-					? __( 'Not synced' )
-					: __( 'Fully synced' ) }
+					? _x( 'Not synced', 'pattern (singular)' )
+					: _x( 'Synced', 'pattern (singular)' ) }
 			</div>
 		</PostPanelRow>
 	);
 }
-
-export function PostSyncStatusModal() {
-	const { editPost } = useDispatch( editorStore );
-	const [ isModalOpen, setIsModalOpen ] = useState( false );
-	const [ syncType, setSyncType ] = useState( undefined );
-
-	const { postType, isNewPost } = useSelect( ( select ) => {
-		const { getEditedPostAttribute, isCleanNewPost } =
-			select( editorStore );
-		return {
-			postType: getEditedPostAttribute( 'type' ),
-			isNewPost: isCleanNewPost(),
-		};
-	}, [] );
-
-	useEffect( () => {
-		if ( isNewPost && postType === 'wp_block' ) {
-			setIsModalOpen( true );
-		}
-		// We only want the modal to open when the page is first loaded.
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [] );
-
-	const setSyncStatus = () => {
-		editPost( {
-			meta: {
-				wp_pattern_sync_status: syncType,
-			},
-		} );
-	};
-
-	if ( postType !== 'wp_block' || ! isNewPost ) {
-		return null;
-	}
-
-	return (
-		<>
-			{ isModalOpen && (
-				<Modal
-					title={ __( 'Set pattern sync status' ) }
-					onRequestClose={ () => {
-						setIsModalOpen( false );
-					} }
-					overlayClassName="reusable-blocks-menu-items__convert-modal"
-				>
-					<form
-						onSubmit={ ( event ) => {
-							event.preventDefault();
-							setIsModalOpen( false );
-							setSyncStatus();
-						} }
-					>
-						<VStack spacing="5">
-							<ReusableBlocksRenameHint />
-							<ToggleControl
-								label={ _x(
-									'Synced',
-									'Option that makes an individual pattern synchronized'
-								) }
-								help={ __(
-									'Sync this pattern across multiple locations.'
-								) }
-								checked={ ! syncType }
-								onChange={ () => {
-									setSyncType(
-										! syncType ? 'unsynced' : undefined
-									);
-								} }
-							/>
-							<HStack justify="right">
-								<Button variant="primary" type="submit">
-									{ __( 'Create' ) }
-								</Button>
-							</HStack>
-						</VStack>
-					</form>
-				</Modal>
-			) }
-		</>
-	);
-}
diff --git a/packages/editor/src/components/post-taxonomies/README.md b/packages/editor/src/components/post-taxonomies/README.md
index 941c28d4639314..69658558b5d288 100644
--- a/packages/editor/src/components/post-taxonomies/README.md
+++ b/packages/editor/src/components/post-taxonomies/README.md
@@ -3,7 +3,7 @@
 `PostTaxonomies` is a component used to render the taxonomy picker
 UI. It uses the `FlatTermSelector` or `HierarchicalTermSelector` components
 based on the value of the `hierarchical` argument specified in
-[register_taxonomy](https://codex.wordpress.org/Function_Reference/register_taxonomy).
+[register_taxonomy](https://developer.wordpress.org/reference/functions/register_taxonomy).
 
 The output of the respective taxonomy components can be customized using
 the following filter:
diff --git a/packages/editor/src/components/post-taxonomies/check.js b/packages/editor/src/components/post-taxonomies/check.js
index a9d0c7e0cf97c3..401b1adad7cad4 100644
--- a/packages/editor/src/components/post-taxonomies/check.js
+++ b/packages/editor/src/components/post-taxonomies/check.js
@@ -1,8 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { compose } from '@wordpress/compose';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 
 /**
@@ -10,22 +9,27 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import { store as editorStore } from '../../store';
 
-export function PostTaxonomiesCheck( { postType, taxonomies, children } ) {
-	const hasTaxonomies = taxonomies?.some( ( taxonomy ) =>
-		taxonomy.types.includes( postType )
-	);
+/**
+ * Renders the children components only if the current post type has taxonomies.
+ *
+ * @param {Object}  props          The component props.
+ * @param {Element} props.children The children components to render.
+ *
+ * @return {Component|null} The rendered children components or null if the current post type has no taxonomies.
+ */
+export default function PostTaxonomiesCheck( { children } ) {
+	const hasTaxonomies = useSelect( ( select ) => {
+		const postType = select( editorStore ).getCurrentPostType();
+		const taxonomies = select( coreStore ).getTaxonomies( {
+			per_page: -1,
+		} );
+		return taxonomies?.some( ( taxonomy ) =>
+			taxonomy.types.includes( postType )
+		);
+	}, [] );
 	if ( ! hasTaxonomies ) {
 		return null;
 	}
 
 	return children;
 }
-
-export default compose( [
-	withSelect( ( select ) => {
-		return {
-			postType: select( editorStore ).getCurrentPostType(),
-			taxonomies: select( coreStore ).getTaxonomies( { per_page: -1 } ),
-		};
-	} ),
-] )( PostTaxonomiesCheck );
diff --git a/packages/editor/src/components/post-taxonomies/flat-term-selector.js b/packages/editor/src/components/post-taxonomies/flat-term-selector.js
index 15ab5bf59c0fd6..5f581e898c953e 100644
--- a/packages/editor/src/components/post-taxonomies/flat-term-selector.js
+++ b/packages/editor/src/components/post-taxonomies/flat-term-selector.js
@@ -5,6 +5,7 @@ import { __, _x, sprintf } from '@wordpress/i18n';
 import { useEffect, useMemo, useState } from '@wordpress/element';
 import { FormTokenField, withFilters } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
+import deprecated from '@wordpress/deprecated';
 import { store as coreStore } from '@wordpress/core-data';
 import { useDebounce } from '@wordpress/compose';
 import { speak } from '@wordpress/a11y';
@@ -26,9 +27,12 @@ import MostUsedTerms from './most-used-terms';
 const EMPTY_ARRAY = [];
 
 /**
- * Module constants
+ * How the max suggestions limit was chosen:
+ *  - Matches the `per_page` range set by the REST API.
+ *  - Can't use "unbound" query. The `FormTokenField` needs a fixed number.
+ *  - Matches default for `FormTokenField`.
  */
-const MAX_TERMS_SUGGESTIONS = 20;
+const MAX_TERMS_SUGGESTIONS = 100;
 const DEFAULT_QUERY = {
 	per_page: MAX_TERMS_SUGGESTIONS,
 	_fields: 'id,name',
@@ -40,17 +44,40 @@ const isSameTermName = ( termA, termB ) =>
 	unescapeString( termB ).toLowerCase();
 
 const termNamesToIds = ( names, terms ) => {
-	return names.map(
-		( termName ) =>
-			terms.find( ( term ) => isSameTermName( term.name, termName ) ).id
-	);
+	return names
+		.map(
+			( termName ) =>
+				terms.find( ( term ) => isSameTermName( term.name, termName ) )
+					?.id
+		)
+		.filter( ( id ) => id !== undefined );
 };
 
-export function FlatTermSelector( { slug } ) {
+/**
+ * Renders a flat term selector component.
+ *
+ * @param {Object}  props                         The component props.
+ * @param {string}  props.slug                    The slug of the taxonomy.
+ * @param {boolean} props.__nextHasNoMarginBottom Start opting into the new margin-free styles that will become the default in a future version, currently scheduled to be WordPress 7.0. (The prop can be safely removed once this happens.)
+ *
+ * @return {JSX.Element} The rendered flat term selector component.
+ */
+export function FlatTermSelector( { slug, __nextHasNoMarginBottom } ) {
 	const [ values, setValues ] = useState( [] );
 	const [ search, setSearch ] = useState( '' );
 	const debouncedSearch = useDebounce( setSearch, 500 );
 
+	if ( ! __nextHasNoMarginBottom ) {
+		deprecated(
+			'Bottom margin styles for wp.editor.PostTaxonomiesFlatTermSelector',
+			{
+				since: '6.7',
+				version: '7.0',
+				hint: 'Set the `__nextHasNoMarginBottom` prop to true to start opting into the new styles, which will become the default in a future version.',
+			}
+		);
+	}
+
 	const {
 		terms,
 		termIds,
@@ -72,7 +99,7 @@ export function FlatTermSelector( { slug } ) {
 
 			const query = {
 				...DEFAULT_QUERY,
-				include: _termIds.join( ',' ),
+				include: _termIds?.join( ',' ),
 				per_page: -1,
 			};
 
@@ -89,7 +116,7 @@ export function FlatTermSelector( { slug } ) {
 					: false,
 				taxonomy: _taxonomy,
 				termIds: _termIds,
-				terms: _termIds.length
+				terms: _termIds?.length
 					? getEntityRecords( 'taxonomy', slug, query )
 					: EMPTY_ARRAY,
 				hasResolvedTerms: hasFinishedResolution( 'getEntityRecords', [
@@ -193,9 +220,8 @@ export function FlatTermSelector( { slug } ) {
 		setValues( uniqueTerms );
 
 		if ( newTermNames.length === 0 ) {
-			return onUpdateTerms(
-				termNamesToIds( uniqueTerms, availableTerms )
-			);
+			onUpdateTerms( termNamesToIds( uniqueTerms, availableTerms ) );
+			return;
 		}
 
 		if ( ! hasCreateAction ) {
@@ -209,7 +235,7 @@ export function FlatTermSelector( { slug } ) {
 		)
 			.then( ( newTerms ) => {
 				const newAvailableTerms = availableTerms.concat( newTerms );
-				return onUpdateTerms(
+				onUpdateTerms(
 					termNamesToIds( uniqueTerms, newAvailableTerms )
 				);
 			} )
@@ -217,6 +243,9 @@ export function FlatTermSelector( { slug } ) {
 				createErrorNotice( error.message, {
 					type: 'snackbar',
 				} );
+				// In case of a failure, try assigning available terms.
+				// This will invalidate the optimistic update.
+				onUpdateTerms( termNamesToIds( uniqueTerms, availableTerms ) );
 			} );
 	}
 
@@ -274,6 +303,7 @@ export function FlatTermSelector( { slug } ) {
 					removed: termRemovedLabel,
 					remove: removeTermLabel,
 				} }
+				__nextHasNoMarginBottom={ __nextHasNoMarginBottom }
 			/>
 			<MostUsedTerms taxonomy={ taxonomy } onSelect={ appendTerm } />
 		</>
diff --git a/packages/editor/src/components/post-taxonomies/hierarchical-term-selector.js b/packages/editor/src/components/post-taxonomies/hierarchical-term-selector.js
index c93458ed3cfef2..e019185b8a97cd 100644
--- a/packages/editor/src/components/post-taxonomies/hierarchical-term-selector.js
+++ b/packages/editor/src/components/post-taxonomies/hierarchical-term-selector.js
@@ -12,6 +12,7 @@ import {
 	withFilters,
 	Flex,
 	FlexItem,
+	SearchControl,
 } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useDebounce } from '@wordpress/compose';
@@ -406,9 +407,11 @@ export function HierarchicalTermSelector( { slug } ) {
 	return (
 		<Flex direction="column" gap="4">
 			{ showFilter && (
-				<TextControl
+				<SearchControl
+					__next40pxDefaultSize
 					__nextHasNoMarginBottom
 					label={ filterLabel }
+					placeholder={ filterLabel }
 					value={ filterValue }
 					onChange={ setFilter }
 				/>
@@ -426,6 +429,7 @@ export function HierarchicalTermSelector( { slug } ) {
 			{ ! loading && hasCreateAction && (
 				<FlexItem>
 					<Button
+						__next40pxDefaultSize
 						onClick={ onToggleForm }
 						className="editor-post-taxonomies__hierarchical-terms-add"
 						aria-expanded={ showForm }
@@ -439,6 +443,7 @@ export function HierarchicalTermSelector( { slug } ) {
 				<form onSubmit={ onAddTerm }>
 					<Flex direction="column" gap="4">
 						<TextControl
+							__next40pxDefaultSize
 							__nextHasNoMarginBottom
 							className="editor-post-taxonomies__hierarchical-terms-input"
 							label={ newTermLabel }
@@ -448,6 +453,7 @@ export function HierarchicalTermSelector( { slug } ) {
 						/>
 						{ !! availableTerms.length && (
 							<TreeSelect
+								__next40pxDefaultSize
 								__nextHasNoMarginBottom
 								label={ parentSelectLabel }
 								noOptionLabel={ noParentOption }
@@ -458,6 +464,7 @@ export function HierarchicalTermSelector( { slug } ) {
 						) }
 						<FlexItem>
 							<Button
+								__next40pxDefaultSize
 								variant="secondary"
 								type="submit"
 								className="editor-post-taxonomies__hierarchical-terms-submit"
diff --git a/packages/editor/src/components/post-taxonomies/index.js b/packages/editor/src/components/post-taxonomies/index.js
index ee565bd4fe6eff..dc2345fd6197f7 100644
--- a/packages/editor/src/components/post-taxonomies/index.js
+++ b/packages/editor/src/components/post-taxonomies/index.js
@@ -2,8 +2,7 @@
  * WordPress dependencies
  */
 import { Fragment } from '@wordpress/element';
-import { withSelect } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
+import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 
 /**
@@ -15,27 +14,35 @@ import { store as editorStore } from '../../store';
 
 const identity = ( x ) => x;
 
-export function PostTaxonomies( {
-	postType,
-	taxonomies,
-	taxonomyWrapper = identity,
-} ) {
-	const availableTaxonomies = ( taxonomies ?? [] ).filter( ( taxonomy ) =>
-		taxonomy.types.includes( postType )
-	);
-	const visibleTaxonomies = availableTaxonomies.filter(
-		// In some circumstances .visibility can end up as undefined so optional chaining operator required.
-		// https://github.com/WordPress/gutenberg/issues/40326
-		( taxonomy ) => taxonomy.visibility?.show_ui
+export function PostTaxonomies( { taxonomyWrapper = identity } ) {
+	const { postType, taxonomies } = useSelect( ( select ) => {
+		return {
+			postType: select( editorStore ).getCurrentPostType(),
+			taxonomies: select( coreStore ).getTaxonomies( { per_page: -1 } ),
+		};
+	}, [] );
+	const visibleTaxonomies = ( taxonomies ?? [] ).filter(
+		( taxonomy ) =>
+			// In some circumstances .visibility can end up as undefined so optional chaining operator required.
+			// https://github.com/WordPress/gutenberg/issues/40326
+			taxonomy.types.includes( postType ) && taxonomy.visibility?.show_ui
 	);
+
 	return visibleTaxonomies.map( ( taxonomy ) => {
 		const TaxonomyComponent = taxonomy.hierarchical
 			? HierarchicalTermSelector
 			: FlatTermSelector;
+		const taxonomyComponentProps = {
+			slug: taxonomy.slug,
+			...( taxonomy.hierarchical
+				? {}
+				: { __nextHasNoMarginBottom: true } ),
+		};
+
 		return (
 			<Fragment key={ `taxonomy-${ taxonomy.slug }` }>
 				{ taxonomyWrapper(
-					<TaxonomyComponent slug={ taxonomy.slug } />,
+					<TaxonomyComponent { ...taxonomyComponentProps } />,
 					taxonomy
 				) }
 			</Fragment>
@@ -43,11 +50,12 @@ export function PostTaxonomies( {
 	} );
 }
 
-export default compose( [
-	withSelect( ( select ) => {
-		return {
-			postType: select( editorStore ).getCurrentPostType(),
-			taxonomies: select( coreStore ).getTaxonomies( { per_page: -1 } ),
-		};
-	} ),
-] )( PostTaxonomies );
+/**
+ * Renders the taxonomies associated with a post.
+ *
+ * @param {Object}   props                 The component props.
+ * @param {Function} props.taxonomyWrapper The wrapper function for each taxonomy component.
+ *
+ * @return {Array} An array of JSX elements representing the visible taxonomies.
+ */
+export default PostTaxonomies;
diff --git a/packages/editor/src/components/post-taxonomies/most-used-terms.js b/packages/editor/src/components/post-taxonomies/most-used-terms.js
index 36a44fb7f986c2..639e5752c80013 100644
--- a/packages/editor/src/components/post-taxonomies/most-used-terms.js
+++ b/packages/editor/src/components/post-taxonomies/most-used-terms.js
@@ -62,6 +62,7 @@ export default function MostUsedTerms( { onSelect, taxonomy } ) {
 				{ terms.map( ( term ) => (
 					<li key={ term.id }>
 						<Button
+							__next40pxDefaultSize
 							variant="link"
 							onClick={ () => onSelect( term ) }
 						>
diff --git a/packages/editor/src/components/post-taxonomies/panel.js b/packages/editor/src/components/post-taxonomies/panel.js
new file mode 100644
index 00000000000000..760626f984db36
--- /dev/null
+++ b/packages/editor/src/components/post-taxonomies/panel.js
@@ -0,0 +1,75 @@
+/**
+ * WordPress dependencies
+ */
+import { PanelBody } from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import PostTaxonomiesForm from './index';
+import PostTaxonomiesCheck from './check';
+
+function TaxonomyPanel( { taxonomy, children } ) {
+	const slug = taxonomy?.slug;
+	const panelName = slug ? `taxonomy-panel-${ slug }` : '';
+	const { isEnabled, isOpened } = useSelect(
+		( select ) => {
+			const { isEditorPanelEnabled, isEditorPanelOpened } =
+				select( editorStore );
+			return {
+				isEnabled: slug ? isEditorPanelEnabled( panelName ) : false,
+				isOpened: slug ? isEditorPanelOpened( panelName ) : false,
+			};
+		},
+		[ panelName, slug ]
+	);
+	const { toggleEditorPanelOpened } = useDispatch( editorStore );
+
+	if ( ! isEnabled ) {
+		return null;
+	}
+
+	const taxonomyMenuName = taxonomy?.labels?.menu_name;
+	if ( ! taxonomyMenuName ) {
+		return null;
+	}
+
+	return (
+		<PanelBody
+			title={ taxonomyMenuName }
+			opened={ isOpened }
+			onToggle={ () => toggleEditorPanelOpened( panelName ) }
+		>
+			{ children }
+		</PanelBody>
+	);
+}
+
+function PostTaxonomies() {
+	return (
+		<PostTaxonomiesCheck>
+			<PostTaxonomiesForm
+				taxonomyWrapper={ ( content, taxonomy ) => {
+					return (
+						<TaxonomyPanel taxonomy={ taxonomy }>
+							{ content }
+						</TaxonomyPanel>
+					);
+				} }
+			/>
+		</PostTaxonomiesCheck>
+	);
+}
+
+/**
+ * Renders a panel for a specific taxonomy.
+ *
+ * @param {Object}  props          The component props.
+ * @param {Object}  props.taxonomy The taxonomy object.
+ * @param {Element} props.children The child components.
+ *
+ * @return {Component} The rendered taxonomy panel.
+ */
+export default PostTaxonomies;
diff --git a/packages/editor/src/components/post-taxonomies/style.scss b/packages/editor/src/components/post-taxonomies/style.scss
index ce912573c79488..2d888baee04131 100644
--- a/packages/editor/src/components/post-taxonomies/style.scss
+++ b/packages/editor/src/components/post-taxonomies/style.scss
@@ -34,8 +34,4 @@
 		display: inline-block;
 		margin-right: $grid-unit-10;
 	}
-
-	.components-button {
-		font-size: 12px;
-	}
 }
diff --git a/packages/editor/src/components/post-taxonomies/test/index.js b/packages/editor/src/components/post-taxonomies/test/index.js
index 0a388143061750..1f386f4c2fab15 100644
--- a/packages/editor/src/components/post-taxonomies/test/index.js
+++ b/packages/editor/src/components/post-taxonomies/test/index.js
@@ -13,7 +13,7 @@ import { store as coreStore } from '@wordpress/core-data';
 /**
  * Internal dependencies
  */
-import { PostTaxonomies } from '../';
+import PostTaxonomies from '../';
 
 describe( 'PostTaxonomies', () => {
 	const genresTaxonomy = {
@@ -87,20 +87,30 @@ describe( 'PostTaxonomies', () => {
 	it( 'should render no children if taxonomy data not available', () => {
 		const taxonomies = null;
 
-		const { container } = render(
-			<PostTaxonomies postType="page" taxonomies={ taxonomies } />
+		jest.spyOn(
+			select( editorStore ),
+			'getCurrentPostType'
+		).mockReturnValue( 'page' );
+		jest.spyOn( select( coreStore ), 'getTaxonomies' ).mockReturnValue(
+			taxonomies
 		);
 
+		const { container } = render( <PostTaxonomies /> );
+
 		expect( container ).toBeEmptyDOMElement();
 	} );
 
 	it( 'should render taxonomy components for taxonomies assigned to post type', () => {
-		const { rerender } = render(
-			<PostTaxonomies
-				postType="book"
-				taxonomies={ [ genresTaxonomy, categoriesTaxonomy ] }
-			/>
-		);
+		jest.spyOn(
+			select( editorStore ),
+			'getCurrentPostType'
+		).mockReturnValue( 'book' );
+		jest.spyOn( select( coreStore ), 'getTaxonomies' ).mockReturnValue( [
+			genresTaxonomy,
+			categoriesTaxonomy,
+		] );
+
+		render( <PostTaxonomies /> );
 
 		expect( screen.getByRole( 'group', { name: 'Genres' } ) ).toBeVisible();
 		expect(
@@ -112,59 +122,35 @@ describe( 'PostTaxonomies', () => {
 		expect(
 			screen.queryByRole( 'button', { name: 'Add new category' } )
 		).not.toBeInTheDocument();
-
-		rerender(
-			<PostTaxonomies
-				postType="book"
-				taxonomies={ [
-					genresTaxonomy,
-					{
-						...categoriesTaxonomy,
-						types: [ 'post', 'page', 'book' ],
-					},
-				] }
-			/>
-		);
-
-		expect( screen.getByRole( 'group', { name: 'Genres' } ) ).toBeVisible();
-		expect(
-			screen.getByRole( 'group', { name: 'Categories' } )
-		).toBeVisible();
-		expect(
-			screen.getByRole( 'button', { name: 'Add new genre' } )
-		).toBeVisible();
-		expect(
-			screen.getByRole( 'button', { name: 'Add new category' } )
-		).toBeVisible();
 	} );
 
 	it( 'should not render taxonomy components that hide their ui', () => {
-		const { rerender } = render(
-			<PostTaxonomies postType="book" taxonomies={ [ genresTaxonomy ] } />
-		);
+		jest.spyOn(
+			select( editorStore ),
+			'getCurrentPostType'
+		).mockReturnValue( 'book' );
+		jest.spyOn( select( coreStore ), 'getTaxonomies' ).mockReturnValue( [
+			genresTaxonomy,
+			{
+				...categoriesTaxonomy,
+				types: [ 'post', 'page', 'book' ],
+				visibility: {
+					show_ui: false,
+				},
+			},
+		] );
+
+		render( <PostTaxonomies /> );
 
 		expect( screen.getByRole( 'group', { name: 'Genres' } ) ).toBeVisible();
 		expect(
 			screen.getByRole( 'button', { name: 'Add new genre' } )
 		).toBeVisible();
-
-		rerender(
-			<PostTaxonomies
-				postType="book"
-				taxonomies={ [
-					{
-						...genresTaxonomy,
-						visibility: { show_ui: false },
-					},
-				] }
-			/>
-		);
-
 		expect(
-			screen.queryByRole( 'group', { name: 'Genres' } )
+			screen.queryByRole( 'group', { name: 'Categories' } )
 		).not.toBeInTheDocument();
 		expect(
-			screen.queryByRole( 'button', { name: 'Add new genre' } )
+			screen.queryByRole( 'button', { name: 'Add new category' } )
 		).not.toBeInTheDocument();
 	} );
 } );
diff --git a/packages/editor/src/components/post-template/block-theme.js b/packages/editor/src/components/post-template/block-theme.js
new file mode 100644
index 00000000000000..62de10a2c715ff
--- /dev/null
+++ b/packages/editor/src/components/post-template/block-theme.js
@@ -0,0 +1,149 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { decodeEntities } from '@wordpress/html-entities';
+import { DropdownMenu, MenuGroup, MenuItem } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useEntityRecord, store as coreStore } from '@wordpress/core-data';
+import { check } from '@wordpress/icons';
+import { store as noticesStore } from '@wordpress/notices';
+import { store as preferencesStore } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import SwapTemplateButton from './swap-template-button';
+import ResetDefaultTemplate from './reset-default-template';
+import { unlock } from '../../lock-unlock';
+import CreateNewTemplate from './create-new-template';
+
+const POPOVER_PROPS = {
+	className: 'editor-post-template__dropdown',
+	placement: 'bottom-start',
+};
+
+export default function BlockThemeControl( { id } ) {
+	const {
+		isTemplateHidden,
+		onNavigateToEntityRecord,
+		getEditorSettings,
+		hasGoBack,
+	} = useSelect( ( select ) => {
+		const { getRenderingMode, getEditorSettings: _getEditorSettings } =
+			unlock( select( editorStore ) );
+		const editorSettings = _getEditorSettings();
+		return {
+			isTemplateHidden: getRenderingMode() === 'post-only',
+			onNavigateToEntityRecord: editorSettings.onNavigateToEntityRecord,
+			getEditorSettings: _getEditorSettings,
+			hasGoBack: editorSettings.hasOwnProperty(
+				'onNavigateToPreviousEntityRecord'
+			),
+		};
+	}, [] );
+
+	const { get: getPreference } = useSelect( preferencesStore );
+
+	const { editedRecord: template, hasResolved } = useEntityRecord(
+		'postType',
+		'wp_template',
+		id
+	);
+	const { createSuccessNotice } = useDispatch( noticesStore );
+	const { setRenderingMode } = useDispatch( editorStore );
+
+	const canCreateTemplate = useSelect(
+		( select ) =>
+			!! select( coreStore ).canUser( 'create', {
+				kind: 'postType',
+				name: 'wp_template',
+			} ),
+		[]
+	);
+
+	if ( ! hasResolved ) {
+		return null;
+	}
+
+	// The site editor does not have a `onNavigateToPreviousEntityRecord` setting as it uses its own routing
+	// and assigns its own backlink to focusMode pages.
+	const notificationAction = hasGoBack
+		? [
+				{
+					label: __( 'Go back' ),
+					onClick: () =>
+						getEditorSettings().onNavigateToPreviousEntityRecord(),
+				},
+		  ]
+		: undefined;
+
+	const mayShowTemplateEditNotice = () => {
+		if ( ! getPreference( 'core/edit-site', 'welcomeGuideTemplate' ) ) {
+			createSuccessNotice(
+				__(
+					'Editing template. Changes made here affect all posts and pages that use the template.'
+				),
+				{ type: 'snackbar', actions: notificationAction }
+			);
+		}
+	};
+	return (
+		<DropdownMenu
+			popoverProps={ POPOVER_PROPS }
+			focusOnMount
+			toggleProps={ {
+				size: 'compact',
+				variant: 'tertiary',
+				tooltipPosition: 'middle left',
+			} }
+			label={ __( 'Template options' ) }
+			text={ decodeEntities( template.title ) }
+			icon={ null }
+		>
+			{ ( { onClose } ) => (
+				<>
+					<MenuGroup>
+						{ canCreateTemplate && (
+							<MenuItem
+								onClick={ () => {
+									onNavigateToEntityRecord( {
+										postId: template.id,
+										postType: 'wp_template',
+									} );
+									onClose();
+									mayShowTemplateEditNotice();
+								} }
+							>
+								{ __( 'Edit template' ) }
+							</MenuItem>
+						) }
+
+						<SwapTemplateButton onClick={ onClose } />
+						<ResetDefaultTemplate onClick={ onClose } />
+						{ canCreateTemplate && (
+							<CreateNewTemplate onClick={ onClose } />
+						) }
+					</MenuGroup>
+					<MenuGroup>
+						<MenuItem
+							icon={ ! isTemplateHidden ? check : undefined }
+							isSelected={ ! isTemplateHidden }
+							role="menuitemcheckbox"
+							onClick={ () => {
+								setRenderingMode(
+									isTemplateHidden
+										? 'template-locked'
+										: 'post-only'
+								);
+							} }
+						>
+							{ __( 'Show template' ) }
+						</MenuItem>
+					</MenuGroup>
+				</>
+			) }
+		</DropdownMenu>
+	);
+}
diff --git a/packages/editor/src/components/post-template/classic-theme.js b/packages/editor/src/components/post-template/classic-theme.js
new file mode 100644
index 00000000000000..4a65a9b4c75636
--- /dev/null
+++ b/packages/editor/src/components/post-template/classic-theme.js
@@ -0,0 +1,240 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { SelectControl, Dropdown, Button, Notice } from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+import { useState, useMemo } from '@wordpress/element';
+import { addTemplate } from '@wordpress/icons';
+import { store as noticesStore } from '@wordpress/notices';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import CreateNewTemplateModal from './create-new-template-modal';
+import { useAllowSwitchingTemplates } from './hooks';
+
+const POPOVER_PROPS = {
+	className: 'editor-post-template__dropdown',
+	placement: 'bottom-start',
+};
+
+function PostTemplateToggle( { isOpen, onClick } ) {
+	const templateTitle = useSelect( ( select ) => {
+		const templateSlug =
+			select( editorStore ).getEditedPostAttribute( 'template' );
+
+		const { supportsTemplateMode, availableTemplates } =
+			select( editorStore ).getEditorSettings();
+		if ( ! supportsTemplateMode && availableTemplates[ templateSlug ] ) {
+			return availableTemplates[ templateSlug ];
+		}
+		const template =
+			select( coreStore ).canUser( 'create', {
+				kind: 'postType',
+				name: 'wp_template',
+			} ) && select( editorStore ).getCurrentTemplateId();
+		return (
+			template?.title ||
+			template?.slug ||
+			availableTemplates?.[ templateSlug ]
+		);
+	}, [] );
+
+	return (
+		<Button
+			__next40pxDefaultSize
+			variant="tertiary"
+			aria-expanded={ isOpen }
+			aria-label={ __( 'Template options' ) }
+			onClick={ onClick }
+		>
+			{ templateTitle ?? __( 'Default template' ) }
+		</Button>
+	);
+}
+
+/**
+ * Renders the dropdown content for selecting a post template.
+ *
+ * @param {Object}   props         The component props.
+ * @param {Function} props.onClose The function to close the dropdown.
+ *
+ * @return {JSX.Element} The rendered dropdown content.
+ */
+function PostTemplateDropdownContent( { onClose } ) {
+	const allowSwitchingTemplate = useAllowSwitchingTemplates();
+	const {
+		availableTemplates,
+		fetchedTemplates,
+		selectedTemplateSlug,
+		canCreate,
+		canEdit,
+		currentTemplateId,
+		onNavigateToEntityRecord,
+		getEditorSettings,
+	} = useSelect(
+		( select ) => {
+			const { canUser, getEntityRecords } = select( coreStore );
+			const editorSettings = select( editorStore ).getEditorSettings();
+			const canCreateTemplates = canUser( 'create', {
+				kind: 'postType',
+				name: 'wp_template',
+			} );
+			const _currentTemplateId =
+				select( editorStore ).getCurrentTemplateId();
+			return {
+				availableTemplates: editorSettings.availableTemplates,
+				fetchedTemplates: canCreateTemplates
+					? getEntityRecords( 'postType', 'wp_template', {
+							post_type:
+								select( editorStore ).getCurrentPostType(),
+							per_page: -1,
+					  } )
+					: undefined,
+				selectedTemplateSlug:
+					select( editorStore ).getEditedPostAttribute( 'template' ),
+				canCreate:
+					allowSwitchingTemplate &&
+					canCreateTemplates &&
+					editorSettings.supportsTemplateMode,
+				canEdit:
+					allowSwitchingTemplate &&
+					canCreateTemplates &&
+					editorSettings.supportsTemplateMode &&
+					!! _currentTemplateId,
+				currentTemplateId: _currentTemplateId,
+				onNavigateToEntityRecord:
+					editorSettings.onNavigateToEntityRecord,
+				getEditorSettings: select( editorStore ).getEditorSettings,
+			};
+		},
+		[ allowSwitchingTemplate ]
+	);
+
+	const options = useMemo(
+		() =>
+			Object.entries( {
+				...availableTemplates,
+				...Object.fromEntries(
+					( fetchedTemplates ?? [] ).map( ( { slug, title } ) => [
+						slug,
+						title.rendered,
+					] )
+				),
+			} ).map( ( [ slug, title ] ) => ( { value: slug, label: title } ) ),
+		[ availableTemplates, fetchedTemplates ]
+	);
+
+	const selectedOption =
+		options.find( ( option ) => option.value === selectedTemplateSlug ) ??
+		options.find( ( option ) => ! option.value ); // The default option has '' value.
+
+	const { editPost } = useDispatch( editorStore );
+	const { createSuccessNotice } = useDispatch( noticesStore );
+	const [ isCreateModalOpen, setIsCreateModalOpen ] = useState( false );
+
+	return (
+		<div className="editor-post-template__classic-theme-dropdown">
+			<InspectorPopoverHeader
+				title={ __( 'Template' ) }
+				help={ __(
+					'Templates define the way content is displayed when viewing your site.'
+				) }
+				actions={
+					canCreate
+						? [
+								{
+									icon: addTemplate,
+									label: __( 'Add template' ),
+									onClick: () => setIsCreateModalOpen( true ),
+								},
+						  ]
+						: []
+				}
+				onClose={ onClose }
+			/>
+			{ ! allowSwitchingTemplate ? (
+				<Notice status="warning" isDismissible={ false }>
+					{ __( 'The posts page template cannot be changed.' ) }
+				</Notice>
+			) : (
+				<SelectControl
+					__next40pxDefaultSize
+					__nextHasNoMarginBottom
+					hideLabelFromVision
+					label={ __( 'Template' ) }
+					value={ selectedOption?.value ?? '' }
+					options={ options }
+					onChange={ ( slug ) =>
+						editPost( { template: slug || '' } )
+					}
+				/>
+			) }
+			{ canEdit && onNavigateToEntityRecord && (
+				<p>
+					<Button
+						__next40pxDefaultSize
+						variant="link"
+						onClick={ () => {
+							onNavigateToEntityRecord( {
+								postId: currentTemplateId,
+								postType: 'wp_template',
+							} );
+							onClose();
+							createSuccessNotice(
+								__(
+									'Editing template. Changes made here affect all posts and pages that use the template.'
+								),
+								{
+									type: 'snackbar',
+									actions: [
+										{
+											label: __( 'Go back' ),
+											onClick: () =>
+												getEditorSettings().onNavigateToPreviousEntityRecord(),
+										},
+									],
+								}
+							);
+						} }
+					>
+						{ __( 'Edit template' ) }
+					</Button>
+				</p>
+			) }
+			{ isCreateModalOpen && (
+				<CreateNewTemplateModal
+					onClose={ () => setIsCreateModalOpen( false ) }
+				/>
+			) }
+		</div>
+	);
+}
+
+function ClassicThemeControl() {
+	return (
+		<Dropdown
+			popoverProps={ POPOVER_PROPS }
+			focusOnMount
+			renderToggle={ ( { isOpen, onToggle } ) => (
+				<PostTemplateToggle isOpen={ isOpen } onClick={ onToggle } />
+			) }
+			renderContent={ ( { onClose } ) => (
+				<PostTemplateDropdownContent onClose={ onClose } />
+			) }
+		/>
+	);
+}
+
+/**
+ * Provides a dropdown menu for selecting and managing post templates.
+ *
+ * The dropdown menu includes a button for toggling the menu, a list of available templates, and options for creating and editing templates.
+ *
+ * @return {JSX.Element} The rendered ClassicThemeControl component.
+ */
+export default ClassicThemeControl;
diff --git a/packages/editor/src/components/post-template/create-new-template-modal.js b/packages/editor/src/components/post-template/create-new-template-modal.js
new file mode 100644
index 00000000000000..69d31b7f8f714e
--- /dev/null
+++ b/packages/editor/src/components/post-template/create-new-template-modal.js
@@ -0,0 +1,155 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useState } from '@wordpress/element';
+import { serialize, createBlock } from '@wordpress/blocks';
+import {
+	Modal,
+	TextControl,
+	Button,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { cleanForSlug } from '@wordpress/url';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+
+const DEFAULT_TITLE = __( 'Custom Template' );
+
+export default function CreateNewTemplateModal( { onClose } ) {
+	const { defaultBlockTemplate, onNavigateToEntityRecord } = useSelect(
+		( select ) => {
+			const { getEditorSettings, getCurrentTemplateId } =
+				select( editorStore );
+			return {
+				defaultBlockTemplate: getEditorSettings().defaultBlockTemplate,
+				onNavigateToEntityRecord:
+					getEditorSettings().onNavigateToEntityRecord,
+				getTemplateId: getCurrentTemplateId,
+			};
+		}
+	);
+
+	const { createTemplate } = unlock( useDispatch( editorStore ) );
+
+	const [ title, setTitle ] = useState( '' );
+
+	const [ isBusy, setIsBusy ] = useState( false );
+
+	const cancel = () => {
+		setTitle( '' );
+		onClose();
+	};
+
+	const submit = async ( event ) => {
+		event.preventDefault();
+
+		if ( isBusy ) {
+			return;
+		}
+
+		setIsBusy( true );
+
+		const newTemplateContent =
+			defaultBlockTemplate ??
+			serialize( [
+				createBlock(
+					'core/group',
+					{
+						tagName: 'header',
+						layout: { inherit: true },
+					},
+					[
+						createBlock( 'core/site-title' ),
+						createBlock( 'core/site-tagline' ),
+					]
+				),
+				createBlock( 'core/separator' ),
+				createBlock(
+					'core/group',
+					{
+						tagName: 'main',
+					},
+					[
+						createBlock(
+							'core/group',
+							{
+								layout: { inherit: true },
+							},
+							[ createBlock( 'core/post-title' ) ]
+						),
+						createBlock( 'core/post-content', {
+							layout: { inherit: true },
+						} ),
+					]
+				),
+			] );
+
+		const newTemplate = await createTemplate( {
+			slug: cleanForSlug( title || DEFAULT_TITLE ),
+			content: newTemplateContent,
+			title: title || DEFAULT_TITLE,
+		} );
+
+		setIsBusy( false );
+		onNavigateToEntityRecord( {
+			postId: newTemplate.id,
+			postType: 'wp_template',
+		} );
+		cancel();
+	};
+
+	return (
+		<Modal
+			title={ __( 'Create custom template' ) }
+			onRequestClose={ cancel }
+			focusOnMount="firstContentElement"
+			size="small"
+		>
+			<form
+				className="editor-post-template__create-form"
+				onSubmit={ submit }
+			>
+				<VStack spacing="3">
+					<TextControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
+						label={ __( 'Name' ) }
+						value={ title }
+						onChange={ setTitle }
+						placeholder={ DEFAULT_TITLE }
+						disabled={ isBusy }
+						help={ __(
+							'Describe the template, e.g. "Post with sidebar". A custom template can be manually applied to any post or page.'
+						) }
+					/>
+					<HStack justify="right">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ cancel }
+						>
+							{ __( 'Cancel' ) }
+						</Button>
+
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							type="submit"
+							isBusy={ isBusy }
+							aria-disabled={ isBusy }
+						>
+							{ __( 'Create' ) }
+						</Button>
+					</HStack>
+				</VStack>
+			</form>
+		</Modal>
+	);
+}
diff --git a/packages/editor/src/components/post-template/create-new-template.js b/packages/editor/src/components/post-template/create-new-template.js
new file mode 100644
index 00000000000000..7cf071ae028e9a
--- /dev/null
+++ b/packages/editor/src/components/post-template/create-new-template.js
@@ -0,0 +1,53 @@
+/**
+ * WordPress dependencies
+ */
+import { MenuItem } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import CreateNewTemplateModal from './create-new-template-modal';
+import { useAllowSwitchingTemplates } from './hooks';
+
+export default function CreateNewTemplate( { onClick } ) {
+	const { canCreateTemplates } = useSelect( ( select ) => {
+		const { canUser } = select( coreStore );
+		return {
+			canCreateTemplates: canUser( 'create', {
+				kind: 'postType',
+				name: 'wp_template',
+			} ),
+		};
+	}, [] );
+	const [ isCreateModalOpen, setIsCreateModalOpen ] = useState( false );
+	const allowSwitchingTemplate = useAllowSwitchingTemplates();
+
+	// The default template in a post is indicated by an empty string.
+	if ( ! canCreateTemplates || ! allowSwitchingTemplate ) {
+		return null;
+	}
+	return (
+		<>
+			<MenuItem
+				onClick={ () => {
+					setIsCreateModalOpen( true );
+				} }
+			>
+				{ __( 'Create new template' ) }
+			</MenuItem>
+
+			{ isCreateModalOpen && (
+				<CreateNewTemplateModal
+					onClose={ () => {
+						setIsCreateModalOpen( false );
+						onClick();
+					} }
+				/>
+			) }
+		</>
+	);
+}
diff --git a/packages/editor/src/components/post-template/hooks.js b/packages/editor/src/components/post-template/hooks.js
new file mode 100644
index 00000000000000..c9668cd1443335
--- /dev/null
+++ b/packages/editor/src/components/post-template/hooks.js
@@ -0,0 +1,101 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+
+export function useEditedPostContext() {
+	return useSelect( ( select ) => {
+		const { getCurrentPostId, getCurrentPostType } = select( editorStore );
+		return {
+			postId: getCurrentPostId(),
+			postType: getCurrentPostType(),
+		};
+	}, [] );
+}
+export function useAllowSwitchingTemplates() {
+	const { postType, postId } = useEditedPostContext();
+	return useSelect(
+		( select ) => {
+			const { canUser, getEntityRecord, getEntityRecords } =
+				select( coreStore );
+			const siteSettings = canUser( 'read', {
+				kind: 'root',
+				name: 'site',
+			} )
+				? getEntityRecord( 'root', 'site' )
+				: undefined;
+			const templates = getEntityRecords( 'postType', 'wp_template', {
+				per_page: -1,
+			} );
+			const isPostsPage = +postId === siteSettings?.page_for_posts;
+			// If current page is set front page or posts page, we also need
+			// to check if the current theme has a template for it. If not
+			const isFrontPage =
+				postType === 'page' &&
+				+postId === siteSettings?.page_on_front &&
+				templates?.some( ( { slug } ) => slug === 'front-page' );
+			return ! isPostsPage && ! isFrontPage;
+		},
+		[ postId, postType ]
+	);
+}
+
+function useTemplates( postType ) {
+	return useSelect(
+		( select ) =>
+			select( coreStore ).getEntityRecords( 'postType', 'wp_template', {
+				per_page: -1,
+				post_type: postType,
+			} ),
+		[ postType ]
+	);
+}
+
+export function useAvailableTemplates( postType ) {
+	const currentTemplateSlug = useCurrentTemplateSlug();
+	const allowSwitchingTemplate = useAllowSwitchingTemplates();
+	const templates = useTemplates( postType );
+	return useMemo(
+		() =>
+			allowSwitchingTemplate &&
+			templates?.filter(
+				( template ) =>
+					template.is_custom &&
+					template.slug !== currentTemplateSlug &&
+					!! template.content.raw // Skip empty templates.
+			),
+		[ templates, currentTemplateSlug, allowSwitchingTemplate ]
+	);
+}
+
+export function useCurrentTemplateSlug() {
+	const { postType, postId } = useEditedPostContext();
+	const templates = useTemplates( postType );
+	const entityTemplate = useSelect(
+		( select ) => {
+			const post = select( coreStore ).getEditedEntityRecord(
+				'postType',
+				postType,
+				postId
+			);
+			return post?.template;
+		},
+		[ postType, postId ]
+	);
+
+	if ( ! entityTemplate ) {
+		return;
+	}
+	// If a page has a `template` set and is not included in the list
+	// of the theme's templates, do not return it, in order to resolve
+	// to the current theme's default template.
+	return templates?.find( ( template ) => template.slug === entityTemplate )
+		?.slug;
+}
diff --git a/packages/editor/src/components/post-template/index.js b/packages/editor/src/components/post-template/index.js
deleted file mode 100644
index 91efcd77e8742c..00000000000000
--- a/packages/editor/src/components/post-template/index.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { SelectControl } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-
-/**
- * Internal dependencies
- */
-import { store as editorStore } from '../../store';
-
-export function PostTemplate() {
-	const { availableTemplates, selectedTemplate, isViewable } = useSelect(
-		( select ) => {
-			const {
-				getEditedPostAttribute,
-				getEditorSettings,
-				getCurrentPostType,
-			} = select( editorStore );
-			const { getPostType } = select( coreStore );
-
-			return {
-				selectedTemplate: getEditedPostAttribute( 'template' ),
-				availableTemplates: getEditorSettings().availableTemplates,
-				isViewable:
-					getPostType( getCurrentPostType() )?.viewable ?? false,
-			};
-		},
-		[]
-	);
-
-	const { editPost } = useDispatch( editorStore );
-
-	if (
-		! isViewable ||
-		! availableTemplates ||
-		! Object.keys( availableTemplates ).length
-	) {
-		return null;
-	}
-
-	return (
-		<SelectControl
-			__nextHasNoMarginBottom
-			label={ __( 'Template:' ) }
-			value={ selectedTemplate }
-			onChange={ ( templateSlug ) => {
-				editPost( {
-					template: templateSlug || '',
-				} );
-			} }
-			options={ Object.entries( availableTemplates ?? {} ).map(
-				( [ templateSlug, templateName ] ) => ( {
-					value: templateSlug,
-					label: templateName,
-				} )
-			) }
-		/>
-	);
-}
-
-export default PostTemplate;
diff --git a/packages/editor/src/components/post-template/panel.js b/packages/editor/src/components/post-template/panel.js
new file mode 100644
index 00000000000000..b5f0d34197c686
--- /dev/null
+++ b/packages/editor/src/components/post-template/panel.js
@@ -0,0 +1,83 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import ClassicThemeControl from './classic-theme';
+import BlockThemeControl from './block-theme';
+import PostPanelRow from '../post-panel-row';
+
+/**
+ * Displays the template controls based on the current editor settings and user permissions.
+ *
+ * @return {JSX.Element|null} The rendered PostTemplatePanel component.
+ */
+export default function PostTemplatePanel() {
+	const { templateId, isBlockTheme } = useSelect( ( select ) => {
+		const { getCurrentTemplateId, getEditorSettings } =
+			select( editorStore );
+		return {
+			templateId: getCurrentTemplateId(),
+			isBlockTheme: getEditorSettings().__unstableIsBlockBasedTheme,
+		};
+	}, [] );
+
+	const isVisible = useSelect( ( select ) => {
+		const postTypeSlug = select( editorStore ).getCurrentPostType();
+		const postType = select( coreStore ).getPostType( postTypeSlug );
+		if ( ! postType?.viewable ) {
+			return false;
+		}
+
+		const settings = select( editorStore ).getEditorSettings();
+		const hasTemplates =
+			!! settings.availableTemplates &&
+			Object.keys( settings.availableTemplates ).length > 0;
+		if ( hasTemplates ) {
+			return true;
+		}
+
+		if ( ! settings.supportsTemplateMode ) {
+			return false;
+		}
+
+		const canCreateTemplates =
+			select( coreStore ).canUser( 'create', {
+				kind: 'postType',
+				name: 'wp_template',
+			} ) ?? false;
+		return canCreateTemplates;
+	}, [] );
+
+	const canViewTemplates = useSelect( ( select ) => {
+		return (
+			select( coreStore ).canUser( 'read', {
+				kind: 'postType',
+				name: 'wp_template',
+			} ) ?? false
+		);
+	}, [] );
+
+	if ( ( ! isBlockTheme || ! canViewTemplates ) && isVisible ) {
+		return (
+			<PostPanelRow label={ __( 'Template' ) }>
+				<ClassicThemeControl />
+			</PostPanelRow>
+		);
+	}
+
+	if ( isBlockTheme && !! templateId ) {
+		return (
+			<PostPanelRow label={ __( 'Template' ) }>
+				<BlockThemeControl id={ templateId } />
+			</PostPanelRow>
+		);
+	}
+	return null;
+}
diff --git a/packages/editor/src/components/post-template/reset-default-template.js b/packages/editor/src/components/post-template/reset-default-template.js
new file mode 100644
index 00000000000000..c730f6b06dee89
--- /dev/null
+++ b/packages/editor/src/components/post-template/reset-default-template.js
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { MenuItem } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import {
+	useAllowSwitchingTemplates,
+	useCurrentTemplateSlug,
+	useEditedPostContext,
+} from './hooks';
+
+export default function ResetDefaultTemplate( { onClick } ) {
+	const currentTemplateSlug = useCurrentTemplateSlug();
+	const allowSwitchingTemplate = useAllowSwitchingTemplates();
+	const { postType, postId } = useEditedPostContext();
+	const { editEntityRecord } = useDispatch( coreStore );
+	// The default template in a post is indicated by an empty string.
+	if ( ! currentTemplateSlug || ! allowSwitchingTemplate ) {
+		return null;
+	}
+	return (
+		<MenuItem
+			onClick={ () => {
+				editEntityRecord(
+					'postType',
+					postType,
+					postId,
+					{ template: '' },
+					{ undoIgnore: true }
+				);
+				onClick();
+			} }
+		>
+			{ __( 'Use default template' ) }
+		</MenuItem>
+	);
+}
diff --git a/packages/editor/src/components/post-template/style.scss b/packages/editor/src/components/post-template/style.scss
new file mode 100644
index 00000000000000..749dfcf4c3183b
--- /dev/null
+++ b/packages/editor/src/components/post-template/style.scss
@@ -0,0 +1,44 @@
+.editor-post-template__swap-template-modal {
+	z-index: z-index(".editor-post-template__swap-template-modal");
+}
+
+.editor-post-template__swap-template-modal-content .block-editor-block-patterns-list {
+	column-count: 2;
+	column-gap: $grid-unit-30;
+
+	// Small top padding required to avoid cutting off the visible outline when hovering items
+	padding-top: $border-width-focus-fallback;
+
+	@include break-medium() {
+		column-count: 3;
+	}
+
+	@include break-wide() {
+		column-count: 4;
+	}
+
+	.block-editor-block-patterns-list__list-item {
+		break-inside: avoid-column;
+	}
+}
+
+.editor-post-template__dropdown {
+	.components-popover__content {
+		min-width: 240px;
+	}
+	.components-button.is-pressed,
+	.components-button.is-pressed:hover {
+		background: inherit;
+		color: inherit;
+	}
+}
+
+.editor-post-template__create-form {
+	@include break-medium() {
+		width: $grid-unit * 40;
+	}
+}
+
+.editor-post-template__classic-theme-dropdown {
+	padding: $grid-unit-10;
+}
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/swap-template-button.js b/packages/editor/src/components/post-template/swap-template-button.js
similarity index 75%
rename from packages/edit-site/src/components/sidebar-edit-mode/page-panels/swap-template-button.js
rename to packages/editor/src/components/post-template/swap-template-button.js
index 40eb1c5c4bd627..5eed287f7f1709 100644
--- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/swap-template-button.js
+++ b/packages/editor/src/components/post-template/swap-template-button.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useMemo, useState, useCallback } from '@wordpress/element';
+import { useMemo, useState } from '@wordpress/element';
 import { decodeEntities } from '@wordpress/html-entities';
 import { __experimentalBlockPatternsList as BlockPatternsList } from '@wordpress/block-editor';
 import { MenuItem, Modal } from '@wordpress/components';
@@ -18,11 +18,8 @@ import { useAvailableTemplates, useEditedPostContext } from './hooks';
 
 export default function SwapTemplateButton( { onClick } ) {
 	const [ showModal, setShowModal ] = useState( false );
-	const availableTemplates = useAvailableTemplates();
-	const onClose = useCallback( () => {
-		setShowModal( false );
-	}, [] );
 	const { postType, postId } = useEditedPostContext();
+	const availableTemplates = useAvailableTemplates( postType );
 	const { editEntityRecord } = useDispatch( coreStore );
 	if ( ! availableTemplates?.length ) {
 		return null;
@@ -35,7 +32,7 @@ export default function SwapTemplateButton( { onClick } ) {
 			{ template: template.name },
 			{ undoIgnore: true }
 		);
-		onClose(); // Close the template suggestions modal first.
+		setShowModal( false ); // Close the template suggestions modal first.
 		onClick();
 	};
 	return (
@@ -46,12 +43,15 @@ export default function SwapTemplateButton( { onClick } ) {
 			{ showModal && (
 				<Modal
 					title={ __( 'Choose a template' ) }
-					onRequestClose={ onClose }
-					overlayClassName="edit-site-swap-template-modal"
+					onRequestClose={ () => setShowModal( false ) }
+					overlayClassName="editor-post-template__swap-template-modal"
 					isFullScreen
 				>
-					<div className="edit-site-page-panels__swap-template__modal-content">
-						<TemplatesList onSelect={ onTemplateSelect } />
+					<div className="editor-post-template__swap-template-modal-content">
+						<TemplatesList
+							postType={ postType }
+							onSelect={ onTemplateSelect }
+						/>
 					</div>
 				</Modal>
 			) }
@@ -59,8 +59,8 @@ export default function SwapTemplateButton( { onClick } ) {
 	);
 }
 
-function TemplatesList( { onSelect } ) {
-	const availableTemplates = useAvailableTemplates();
+function TemplatesList( { postType, onSelect } ) {
+	const availableTemplates = useAvailableTemplates( postType );
 	const templatesAsPatterns = useMemo(
 		() =>
 			availableTemplates.map( ( template ) => ( {
diff --git a/packages/editor/src/components/post-text-editor/index.js b/packages/editor/src/components/post-text-editor/index.js
index c07d72f15c4a9d..c3dc61a0b4a2ef 100644
--- a/packages/editor/src/components/post-text-editor/index.js
+++ b/packages/editor/src/components/post-text-editor/index.js
@@ -19,6 +19,11 @@ import { VisuallyHidden } from '@wordpress/components';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Displays the Post Text Editor along with content in Visual and Text mode.
+ *
+ * @return {JSX.Element|null} The rendered PostTextEditor component.
+ */
 export default function PostTextEditor() {
 	const instanceId = useInstanceId( PostTextEditor );
 	const { content, blocks, type, id } = useSelect( ( select ) => {
diff --git a/packages/editor/src/components/post-text-editor/style.scss b/packages/editor/src/components/post-text-editor/style.scss
index 6a8eac4a098b4d..f3b9b65007df75 100644
--- a/packages/editor/src/components/post-text-editor/style.scss
+++ b/packages/editor/src/components/post-text-editor/style.scss
@@ -1,4 +1,4 @@
-.edit-post-text-editor__body textarea.editor-post-text-editor {
+textarea.editor-post-text-editor {
 	border: $border-width solid $gray-600;
 	border-radius: 0;
 	display: block;
diff --git a/packages/editor/src/components/post-title/index.js b/packages/editor/src/components/post-title/index.js
index 0c3dbbf7349a17..50595d936b36d9 100644
--- a/packages/editor/src/components/post-title/index.js
+++ b/packages/editor/src/components/post-title/index.js
@@ -1,8 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
-
+import clsx from 'clsx';
 /**
  * WordPress dependencies
  */
@@ -16,7 +15,6 @@ import { pasteHandler } from '@wordpress/blocks';
 import {
 	__unstableUseRichText as useRichText,
 	create,
-	toHTMLString,
 	insert,
 } from '@wordpress/rich-text';
 import { useMergeRefs } from '@wordpress/compose';
@@ -25,23 +23,18 @@ import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
 /**
  * Internal dependencies
  */
-import { store as editorStore } from '../../store';
 import { DEFAULT_CLASSNAMES, REGEXP_NEWLINES } from './constants';
 import usePostTitleFocus from './use-post-title-focus';
 import usePostTitle from './use-post-title';
 import PostTypeSupportCheck from '../post-type-support-check';
 
 function PostTitle( _, forwardedRef ) {
-	const { placeholder, hasFixedToolbar } = useSelect( ( select ) => {
-		const { getEditedPostAttribute } = select( editorStore );
+	const { placeholder } = useSelect( ( select ) => {
 		const { getSettings } = select( blockEditorStore );
-		const { titlePlaceholder, hasFixedToolbar: _hasFixedToolbar } =
-			getSettings();
+		const { titlePlaceholder } = getSettings();
 
 		return {
-			title: getEditedPostAttribute( 'title' ),
 			placeholder: titlePlaceholder,
-			hasFixedToolbar: _hasFixedToolbar,
 		};
 	}, [] );
 
@@ -56,9 +49,35 @@ function PostTitle( _, forwardedRef ) {
 	const { clearSelectedBlock, insertBlocks, insertDefaultBlock } =
 		useDispatch( blockEditorStore );
 
-	function onChange( value ) {
-		onUpdate( value.replace( REGEXP_NEWLINES, ' ' ) );
-	}
+	const decodedPlaceholder =
+		decodeEntities( placeholder ) || __( 'Add title' );
+
+	const {
+		value,
+		onChange,
+		ref: richTextRef,
+	} = useRichText( {
+		value: title,
+		onChange( newValue ) {
+			onUpdate( newValue.replace( REGEXP_NEWLINES, ' ' ) );
+		},
+		placeholder: decodedPlaceholder,
+		selectionStart: selection.start,
+		selectionEnd: selection.end,
+		onSelectionChange( newStart, newEnd ) {
+			setSelection( ( sel ) => {
+				const { start, end } = sel;
+				if ( start === newStart && end === newEnd ) {
+					return sel;
+				}
+				return {
+					start: newStart,
+					end: newEnd,
+				};
+			} );
+		},
+		__unstableDisableFormats: false,
+	} );
 
 	function onInsertBlockAfter( blocks ) {
 		insertBlocks( blocks, 0 );
@@ -91,21 +110,14 @@ function PostTitle( _, forwardedRef ) {
 		let plainText = '';
 		let html = '';
 
-		// IE11 only supports `Text` as an argument for `getData` and will
-		// otherwise throw an invalid argument error, so we try the standard
-		// arguments first, then fallback to `Text` if they fail.
 		try {
 			plainText = clipboardData.getData( 'text/plain' );
 			html = clipboardData.getData( 'text/html' );
-		} catch ( error1 ) {
-			try {
-				html = clipboardData.getData( 'Text' );
-			} catch ( error2 ) {
-				// Some browsers like UC Browser paste plain text by default and
-				// don't support clipboardData at all, so allow default
-				// behaviour.
-				return;
-			}
+		} catch ( error ) {
+			// Some browsers like UC Browser paste plain text by default and
+			// don't support clipboardData at all, so allow default
+			// behaviour.
+			return;
 		}
 
 		// Allows us to ask for this information when we get a report.
@@ -143,54 +155,18 @@ function PostTitle( _, forwardedRef ) {
 				onInsertBlockAfter( content );
 			}
 		} else {
-			const value = {
-				...create( { html: title } ),
-				...selection,
-			};
-
 			// Strip HTML to avoid unwanted HTML being added to the title.
 			// In the majority of cases it is assumed that HTML in the title
 			// is undesirable.
 			const contentNoHTML = stripHTML( content );
-
-			const newValue = insert( value, create( { html: contentNoHTML } ) );
-			onUpdate( toHTMLString( { value: newValue } ) );
-			setSelection( {
-				start: newValue.start,
-				end: newValue.end,
-			} );
+			onChange( insert( value, create( { html: contentNoHTML } ) ) );
 		}
 	}
 
-	const decodedPlaceholder =
-		decodeEntities( placeholder ) || __( 'Add title' );
-
-	const { ref: richTextRef } = useRichText( {
-		value: title,
-		onChange,
-		placeholder: decodedPlaceholder,
-		selectionStart: selection.start,
-		selectionEnd: selection.end,
-		onSelectionChange( newStart, newEnd ) {
-			setSelection( ( sel ) => {
-				const { start, end } = sel;
-				if ( start === newStart && end === newEnd ) {
-					return sel;
-				}
-				return {
-					start: newStart,
-					end: newEnd,
-				};
-			} );
-		},
-		__unstableDisableFormats: false,
-	} );
-
 	// The wp-block className is important for editor styles.
 	// This same block is used in both the visual and the code editor.
-	const className = classnames( DEFAULT_CLASSNAMES, {
+	const className = clsx( DEFAULT_CLASSNAMES, {
 		'is-selected': isSelected,
-		'has-fixed-toolbar': hasFixedToolbar,
 	} );
 
 	return (
@@ -206,7 +182,6 @@ function PostTitle( _, forwardedRef ) {
 				onFocus={ onSelect }
 				onBlur={ onUnselect }
 				onKeyDown={ onKeyDown }
-				onKeyPress={ onUnselect }
 				onPaste={ onPaste }
 			/>
 		</PostTypeSupportCheck>
@@ -214,4 +189,12 @@ function PostTitle( _, forwardedRef ) {
 	);
 }
 
+/**
+ * Renders the `PostTitle` component.
+ *
+ * @param {Object}  _            Unused parameter.
+ * @param {Element} forwardedRef Forwarded ref for the component.
+ *
+ * @return {Component} The rendered PostTitle component.
+ */
 export default forwardRef( PostTitle );
diff --git a/packages/editor/src/components/post-title/index.native.js b/packages/editor/src/components/post-title/index.native.js
index 1ec0dd3ade3bfc..751f1009ff25e1 100644
--- a/packages/editor/src/components/post-title/index.native.js
+++ b/packages/editor/src/components/post-title/index.native.js
@@ -7,7 +7,7 @@ import { View } from 'react-native';
  * WordPress dependencies
  */
 import { Component } from '@wordpress/element';
-import { create, insert } from '@wordpress/rich-text';
+import { create, toHTMLString, insert } from '@wordpress/rich-text';
 import { decodeEntities } from '@wordpress/html-entities';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { withFocusOutside } from '@wordpress/components';
@@ -16,12 +16,69 @@ import { __, sprintf } from '@wordpress/i18n';
 import { pasteHandler } from '@wordpress/blocks';
 import { store as blockEditorStore, RichText } from '@wordpress/block-editor';
 import { store as editorStore } from '@wordpress/editor';
+import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
+
+/** @typedef {import('./types').RichTextValue} RichTextValue */
 
 /**
  * Internal dependencies
  */
 import styles from './style.scss';
 
+/**
+ * Inserts content with title
+ *
+ * This function processes the given content and title, updating the title
+ * and content based on certain conditions. If the content is an array of
+ * blocks, it will check the first block for a heading or paragraph to use
+ * as the title. If the content is a string, it will strip HTML and update
+ * the title and content accordingly.
+ *
+ * @param {string}         title           The post title.
+ * @param {Array | string} content         The content to be processed. It can be an array of blocks or a string.
+ * @param {Function}       onUpdateTitle   Callback function to update the title.
+ * @param {Function}       onUpdateContent Callback function to update the content.
+ * @param {RichTextValue}  value           The initial value object, default is an object with empty text.
+ */
+export function insertContentWithTitle(
+	title,
+	content,
+	onUpdateTitle,
+	onUpdateContent,
+	value = create( { text: '' } )
+) {
+	if ( ! content.length ) {
+		return;
+	}
+
+	if ( typeof content !== 'string' ) {
+		const [ firstBlock ] = content;
+
+		if (
+			! title &&
+			( firstBlock.name === 'core/heading' ||
+				firstBlock.name === 'core/paragraph' )
+		) {
+			// Strip HTML to avoid unwanted HTML being added to the title.
+			// In the majority of cases it is assumed that HTML in the title
+			// is undesirable.
+			const contentNoHTML = stripHTML( firstBlock.attributes.content );
+			onUpdateTitle( contentNoHTML );
+			onUpdateContent( content.slice( 1 ) );
+		} else {
+			onUpdateContent( content );
+		}
+	} else {
+		// Strip HTML to avoid unwanted HTML being added to the title.
+		// In the majority of cases it is assumed that HTML in the title
+		// is undesirable.
+		const contentNoHTML = stripHTML( content );
+
+		const newValue = insert( value, create( { html: contentNoHTML } ) );
+		onUpdateTitle( toHTMLString( { value: newValue } ) );
+	}
+}
+
 class PostTitle extends Component {
 	constructor( props ) {
 		super( props );
@@ -57,32 +114,25 @@ class PostTitle extends Component {
 		this.props.onSelect();
 	}
 
-	onPaste( { value, onChange, plainText, html } ) {
-		const { title, onInsertBlockAfter, onUpdate } = this.props;
+	onPaste( { value, plainText, html } ) {
+		const {
+			title,
+			onInsertBlockAfter: onInsertBlocks,
+			onUpdate,
+		} = this.props;
 
 		const content = pasteHandler( {
 			HTML: html,
 			plainText,
 		} );
 
-		if ( content.length ) {
-			if ( typeof content === 'string' ) {
-				const valueToInsert = create( { html: content } );
-				onChange( insert( value, valueToInsert ) );
-			} else {
-				const [ firstBlock ] = content;
-				if (
-					! title &&
-					( firstBlock.name === 'core/heading' ||
-						firstBlock.name === 'core/paragraph' )
-				) {
-					onUpdate( firstBlock.attributes.content );
-					onInsertBlockAfter( content.slice( 1 ) );
-				} else {
-					onInsertBlockAfter( content );
-				}
-			}
-		}
+		insertContentWithTitle(
+			title,
+			content,
+			onUpdate,
+			onInsertBlocks,
+			value
+		);
 	}
 
 	setRef( richText ) {
@@ -149,19 +199,18 @@ class PostTitle extends Component {
 				accessibilityHint={ __( 'Updates the title.' ) }
 			>
 				<RichText.Raw
-					setRef={ this.setRef }
+					ref={ this.setRef }
 					accessibilityLabel={ this.getTitle( title, postType ) }
-					tagName={ 'p' }
+					tagName="p"
 					tagsToEliminate={ [ 'strong' ] }
 					unstableOnFocus={ this.props.onSelect }
 					onBlur={ this.props.onBlur } // Always assign onBlur as a props.
-					multiline={ false }
 					style={ titleStyles }
 					styles={ styles }
 					fontSize={ 24 }
 					lineHeight={ 1 }
-					fontWeight={ 'bold' }
-					deleteEnter={ true }
+					fontWeight="bold"
+					deleteEnter
 					onChange={ ( value ) => {
 						this.props.onUpdate( value );
 					} }
@@ -170,7 +219,7 @@ class PostTitle extends Component {
 					value={ title }
 					onSelectionChange={ () => {} }
 					onEnter={ this.props.onEnterPress }
-					disableEditingMenu={ true }
+					disableEditingMenu
 					__unstableIsSelected={ this.props.isSelected }
 					__unstableOnCreateUndoLevel={ () => {} }
 				/>
diff --git a/packages/editor/src/components/post-title/post-title-raw.js b/packages/editor/src/components/post-title/post-title-raw.js
index f59ec40e872e45..66c944b45871ab 100644
--- a/packages/editor/src/components/post-title/post-title-raw.js
+++ b/packages/editor/src/components/post-title/post-title-raw.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -20,15 +20,21 @@ import { DEFAULT_CLASSNAMES, REGEXP_NEWLINES } from './constants';
 import usePostTitleFocus from './use-post-title-focus';
 import usePostTitle from './use-post-title';
 
+/**
+ * Renders a raw post title input field.
+ *
+ * @param {Object}  _            Unused parameter.
+ * @param {Element} forwardedRef Reference to the component's DOM node.
+ *
+ * @return {Component} The rendered component.
+ */
 function PostTitleRaw( _, forwardedRef ) {
-	const { placeholder, hasFixedToolbar } = useSelect( ( select ) => {
+	const { placeholder } = useSelect( ( select ) => {
 		const { getSettings } = select( blockEditorStore );
-		const { titlePlaceholder, hasFixedToolbar: _hasFixedToolbar } =
-			getSettings();
+		const { titlePlaceholder } = getSettings();
 
 		return {
 			placeholder: titlePlaceholder,
-			hasFixedToolbar: _hasFixedToolbar,
 		};
 	}, [] );
 
@@ -51,9 +57,8 @@ function PostTitleRaw( _, forwardedRef ) {
 
 	// The wp-block className is important for editor styles.
 	// This same block is used in both the visual and the code editor.
-	const className = classnames( DEFAULT_CLASSNAMES, {
+	const className = clsx( DEFAULT_CLASSNAMES, {
 		'is-selected': isSelected,
-		'has-fixed-toolbar': hasFixedToolbar,
 		'is-raw-text': true,
 	} );
 
@@ -70,7 +75,7 @@ function PostTitleRaw( _, forwardedRef ) {
 			label={ placeholder }
 			className={ className }
 			placeholder={ decodedPlaceholder }
-			hideLabelFromVision={ true }
+			hideLabelFromVision
 			autoComplete="off"
 			dir="auto"
 			rows={ 1 }
diff --git a/packages/editor/src/components/post-title/style.scss b/packages/editor/src/components/post-title/style.scss
index 98bdfb9a2ebf3a..3fbd505c08dca7 100644
--- a/packages/editor/src/components/post-title/style.scss
+++ b/packages/editor/src/components/post-title/style.scss
@@ -1,5 +1,6 @@
 // Raw Text Variant
-.edit-post-text-editor__body .editor-post-title.is-raw-text {
+.editor-post-title.is-raw-text {
 	margin-bottom: $grid-unit-30;
 	margin-top: 2px; // space for focus outline to appear.
+	max-width: none;
 }
diff --git a/packages/editor/src/components/post-title/test/__snapshots__/index.native.js.snap b/packages/editor/src/components/post-title/test/__snapshots__/index.native.js.snap
new file mode 100644
index 00000000000000..d595171b880785
--- /dev/null
+++ b/packages/editor/src/components/post-title/test/__snapshots__/index.native.js.snap
@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PostTitle does not update title with existing content when pasting HTML 1`] = `
+"<!-- wp:heading -->
+<h2 class="wp-block-heading">Howdy</h2>
+<!-- /wp:heading -->
+
+<!-- wp:heading -->
+<h2 class="wp-block-heading">This is a heading.</h2>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph -->
+<p>This is a paragraph.</p>
+<!-- /wp:paragraph -->"
+`;
+
+exports[`PostTitle populates empty title with first block content when pasting HTML 1`] = `
+"<!-- wp:heading -->
+<h2 class="wp-block-heading">This is a heading.</h2>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph -->
+<p>This is a paragraph.</p>
+<!-- /wp:paragraph -->"
+`;
diff --git a/packages/editor/src/components/post-title/test/index.native.js b/packages/editor/src/components/post-title/test/index.native.js
new file mode 100644
index 00000000000000..1d7cc492f44b8b
--- /dev/null
+++ b/packages/editor/src/components/post-title/test/index.native.js
@@ -0,0 +1,78 @@
+/**
+ * External dependencies
+ */
+import {
+	getEditorHtml,
+	getEditorTitle,
+	initializeEditor,
+	pasteIntoRichText,
+	selectRangeInRichText,
+	screen,
+	setupCoreBlocks,
+	within,
+} from 'test/helpers';
+
+setupCoreBlocks();
+
+const HTML_MULTIPLE_TAGS = `<h2>Howdy</h2>
+<h2>This is a heading.</h2>
+<p>This is a paragraph.</p>`;
+
+describe( 'PostTitle', () => {
+	it( 'populates empty title with first block content when pasting HTML', async () => {
+		await initializeEditor( { initialTitle: '' } );
+
+		const postTitle = within(
+			screen.getByTestId( 'post-title' )
+		).getByPlaceholderText( 'Add title' );
+		pasteIntoRichText( postTitle, { html: HTML_MULTIPLE_TAGS } );
+
+		expect( console ).toHaveLogged();
+		expect( getEditorTitle() ).toBe( 'Howdy' );
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'does not update title with existing content when pasting HTML', async () => {
+		const initialTitle = 'Hello';
+		await initializeEditor( { initialTitle } );
+
+		const postTitle = within(
+			screen.getByTestId( 'post-title' )
+		).getByPlaceholderText( 'Add title' );
+		selectRangeInRichText( postTitle, 0 );
+		pasteIntoRichText( postTitle, { html: HTML_MULTIPLE_TAGS } );
+
+		expect( console ).toHaveLogged();
+		expect( getEditorTitle() ).toBe( initialTitle );
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'updates title with existing content when pasting text', async () => {
+		await initializeEditor( { initialTitle: 'World' } );
+
+		const postTitle = within(
+			screen.getByTestId( 'post-title' )
+		).getByPlaceholderText( 'Add title' );
+		selectRangeInRichText( postTitle, 0 );
+		pasteIntoRichText( postTitle, { text: 'Hello' } );
+
+		expect( console ).toHaveLogged();
+		expect( getEditorTitle() ).toBe( 'HelloWorld' );
+		expect( getEditorHtml() ).toBe( '' );
+	} );
+
+	it( 'does not add HTML to title when pasting span tag', async () => {
+		const pasteHTML = `<span style="border: 1px solid black">l</span>`;
+		await initializeEditor( { initialTitle: 'Helo' } );
+
+		const postTitle = within(
+			screen.getByTestId( 'post-title' )
+		).getByPlaceholderText( 'Add title' );
+		selectRangeInRichText( postTitle, 2 );
+		pasteIntoRichText( postTitle, { html: pasteHTML } );
+
+		expect( console ).toHaveLogged();
+		expect( getEditorTitle() ).toBe( 'Hello' );
+		expect( getEditorHtml() ).toBe( '' );
+	} );
+} );
diff --git a/packages/editor/src/components/post-title/use-post-title-focus.js b/packages/editor/src/components/post-title/use-post-title-focus.js
index effac53f2670a2..127b7661462ba9 100644
--- a/packages/editor/src/components/post-title/use-post-title-focus.js
+++ b/packages/editor/src/components/post-title/use-post-title-focus.js
@@ -9,6 +9,13 @@ import { useSelect } from '@wordpress/data';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Custom hook that manages the focus behavior of the post title input field.
+ *
+ * @param {Element} forwardedRef - The forwarded ref for the input field.
+ *
+ * @return {Object} - The ref object.
+ */
 export default function usePostTitleFocus( forwardedRef ) {
 	const ref = useRef();
 
diff --git a/packages/editor/src/components/post-title/use-post-title.js b/packages/editor/src/components/post-title/use-post-title.js
index 65bd67af6fb4c8..d335064a523549 100644
--- a/packages/editor/src/components/post-title/use-post-title.js
+++ b/packages/editor/src/components/post-title/use-post-title.js
@@ -7,6 +7,11 @@ import { useSelect, useDispatch } from '@wordpress/data';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Custom hook for managing the post title in the editor.
+ *
+ * @return {Object} An object containing the current title and a function to update the title.
+ */
 export default function usePostTitle() {
 	const { editPost } = useDispatch( editorStore );
 	const { title } = useSelect( ( select ) => {
diff --git a/packages/editor/src/components/post-transform-panel/hooks.js b/packages/editor/src/components/post-transform-panel/hooks.js
new file mode 100644
index 00000000000000..0f1ef74f0efff0
--- /dev/null
+++ b/packages/editor/src/components/post-transform-panel/hooks.js
@@ -0,0 +1,114 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+import { store as coreStore } from '@wordpress/core-data';
+import { parse } from '@wordpress/blocks';
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+
+const { EXCLUDED_PATTERN_SOURCES, PATTERN_TYPES } =
+	unlock( patternsPrivateApis );
+
+function injectThemeAttributeInBlockTemplateContent(
+	block,
+	currentThemeStylesheet
+) {
+	block.innerBlocks = block.innerBlocks.map( ( innerBlock ) => {
+		return injectThemeAttributeInBlockTemplateContent(
+			innerBlock,
+			currentThemeStylesheet
+		);
+	} );
+
+	if (
+		block.name === 'core/template-part' &&
+		block.attributes.theme === undefined
+	) {
+		block.attributes.theme = currentThemeStylesheet;
+	}
+	return block;
+}
+
+/**
+ * Filter all patterns and return only the ones that are compatible with the current template.
+ *
+ * @param {Array}  patterns An array of patterns.
+ * @param {Object} template The current template.
+ * @return {Array} Array of patterns that are compatible with the current template.
+ */
+function filterPatterns( patterns, template ) {
+	// Filter out duplicates.
+	const filterOutDuplicatesByName = ( currentItem, index, items ) =>
+		index === items.findIndex( ( item ) => currentItem.name === item.name );
+
+	// Filter out core/directory patterns not included in theme.json.
+	const filterOutExcludedPatternSources = ( pattern ) =>
+		! EXCLUDED_PATTERN_SOURCES.includes( pattern.source );
+
+	// Looks for patterns that have the same template type as the current template,
+	// or have a block type that matches the current template area.
+	const filterCompatiblePatterns = ( pattern ) =>
+		pattern.templateTypes?.includes( template.slug ) ||
+		pattern.blockTypes?.includes( 'core/template-part/' + template.area );
+
+	return patterns.filter( ( pattern, index, items ) => {
+		return (
+			filterOutDuplicatesByName( pattern, index, items ) &&
+			filterOutExcludedPatternSources( pattern ) &&
+			filterCompatiblePatterns( pattern )
+		);
+	} );
+}
+
+function preparePatterns( patterns, currentThemeStylesheet ) {
+	return patterns.map( ( pattern ) => ( {
+		...pattern,
+		keywords: pattern.keywords || [],
+		type: PATTERN_TYPES.theme,
+		blocks: parse( pattern.content, {
+			__unstableSkipMigrationLogs: true,
+		} ).map( ( block ) =>
+			injectThemeAttributeInBlockTemplateContent(
+				block,
+				currentThemeStylesheet
+			)
+		),
+	} ) );
+}
+
+export function useAvailablePatterns( template ) {
+	const { blockPatterns, restBlockPatterns, currentThemeStylesheet } =
+		useSelect( ( select ) => {
+			const { getEditorSettings } = select( editorStore );
+			const settings = getEditorSettings();
+
+			return {
+				blockPatterns:
+					settings.__experimentalAdditionalBlockPatterns ??
+					settings.__experimentalBlockPatterns,
+				restBlockPatterns: select( coreStore ).getBlockPatterns(),
+				currentThemeStylesheet:
+					select( coreStore ).getCurrentTheme().stylesheet,
+			};
+		}, [] );
+
+	return useMemo( () => {
+		const mergedPatterns = [
+			...( blockPatterns || [] ),
+			...( restBlockPatterns || [] ),
+		];
+		const filteredPatterns = filterPatterns( mergedPatterns, template );
+		return preparePatterns(
+			filteredPatterns,
+			template,
+			currentThemeStylesheet
+		);
+	}, [ blockPatterns, restBlockPatterns, template, currentThemeStylesheet ] );
+}
diff --git a/packages/editor/src/components/post-transform-panel/index.js b/packages/editor/src/components/post-transform-panel/index.js
new file mode 100644
index 00000000000000..08139c2c3c6645
--- /dev/null
+++ b/packages/editor/src/components/post-transform-panel/index.js
@@ -0,0 +1,91 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { PanelBody } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useAsyncList } from '@wordpress/compose';
+import { __experimentalBlockPatternsList as BlockPatternsList } from '@wordpress/block-editor';
+import { serialize } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { useAvailablePatterns } from './hooks';
+import {
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+} from '../../store/constants';
+
+function TemplatesList( { availableTemplates, onSelect } ) {
+	const shownTemplates = useAsyncList( availableTemplates );
+	if ( ! availableTemplates || availableTemplates?.length === 0 ) {
+		return null;
+	}
+
+	return (
+		<BlockPatternsList
+			label={ __( 'Templates' ) }
+			blockPatterns={ availableTemplates }
+			shownPatterns={ shownTemplates }
+			onClickPattern={ onSelect }
+			showTitlesAsTooltip
+		/>
+	);
+}
+
+function PostTransform() {
+	const { record, postType, postId } = useSelect( ( select ) => {
+		const { getCurrentPostType, getCurrentPostId } = select( editorStore );
+		const { getEditedEntityRecord } = select( coreStore );
+		const type = getCurrentPostType();
+		const id = getCurrentPostId();
+		return {
+			postType: type,
+			postId: id,
+			record: getEditedEntityRecord( 'postType', type, id ),
+		};
+	}, [] );
+	const { editEntityRecord } = useDispatch( coreStore );
+	const availablePatterns = useAvailablePatterns( record );
+	const onTemplateSelect = async ( selectedTemplate ) => {
+		await editEntityRecord( 'postType', postType, postId, {
+			blocks: selectedTemplate.blocks,
+			content: serialize( selectedTemplate.blocks ),
+		} );
+	};
+	if ( ! availablePatterns?.length ) {
+		return null;
+	}
+
+	return (
+		<PanelBody
+			title={ __( 'Design' ) }
+			initialOpen={ record.type === TEMPLATE_PART_POST_TYPE }
+		>
+			<TemplatesList
+				availableTemplates={ availablePatterns }
+				onSelect={ onTemplateSelect }
+			/>
+		</PanelBody>
+	);
+}
+
+export default function PostTransformPanel() {
+	const { postType } = useSelect( ( select ) => {
+		const { getCurrentPostType } = select( editorStore );
+		return {
+			postType: getCurrentPostType(),
+		};
+	}, [] );
+
+	if (
+		! [ TEMPLATE_PART_POST_TYPE, TEMPLATE_POST_TYPE ].includes( postType )
+	) {
+		return null;
+	}
+
+	return <PostTransform />;
+}
diff --git a/packages/editor/src/components/post-trash/check.js b/packages/editor/src/components/post-trash/check.js
index ecc0d63c9436bd..7edc7c0f18c273 100644
--- a/packages/editor/src/components/post-trash/check.js
+++ b/packages/editor/src/components/post-trash/check.js
@@ -1,34 +1,49 @@
 /**
  * WordPress dependencies
  */
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
+import { GLOBAL_POST_TYPES } from '../../store/constants';
 
-function PostTrashCheck( { isNew, postId, canUserDelete, children } ) {
-	if ( isNew || ! postId || ! canUserDelete ) {
+/**
+ * Wrapper component that renders its children only if the post can trashed.
+ *
+ * @param {Object}  props          - The component props.
+ * @param {Element} props.children - The child components to render.
+ *
+ * @return {Component|null} The rendered child components or null if the post can not trashed.
+ */
+export default function PostTrashCheck( { children } ) {
+	const { canTrashPost } = useSelect( ( select ) => {
+		const { isEditedPostNew, getCurrentPostId, getCurrentPostType } =
+			select( editorStore );
+		const { canUser } = select( coreStore );
+		const postType = getCurrentPostType();
+		const postId = getCurrentPostId();
+		const isNew = isEditedPostNew();
+		const canUserDelete = !! postId
+			? canUser( 'delete', {
+					kind: 'postType',
+					name: postType,
+					id: postId,
+			  } )
+			: false;
+
+		return {
+			canTrashPost:
+				( ! isNew || postId ) &&
+				canUserDelete &&
+				! GLOBAL_POST_TYPES.includes( postType ),
+		};
+	}, [] );
+	if ( ! canTrashPost ) {
 		return null;
 	}
 
 	return children;
 }
-
-export default withSelect( ( select ) => {
-	const { isEditedPostNew, getCurrentPostId, getCurrentPostType } =
-		select( editorStore );
-	const { getPostType, canUser } = select( coreStore );
-	const postId = getCurrentPostId();
-	const postType = getPostType( getCurrentPostType() );
-	const resource = postType?.rest_base || ''; // eslint-disable-line camelcase
-
-	return {
-		isNew: isEditedPostNew(),
-		postId,
-		canUserDelete:
-			postId && resource ? canUser( 'delete', resource, postId ) : false,
-	};
-} )( PostTrashCheck );
diff --git a/packages/editor/src/components/post-trash/index.js b/packages/editor/src/components/post-trash/index.js
index e775944b5d69ed..743512e9efd7d4 100644
--- a/packages/editor/src/components/post-trash/index.js
+++ b/packages/editor/src/components/post-trash/index.js
@@ -1,26 +1,35 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 import {
 	Button,
 	__experimentalConfirmDialog as ConfirmDialog,
 } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
 import { useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
+import PostTrashCheck from './check';
 
-export default function PostTrash() {
-	const { isNew, isDeleting, postId } = useSelect( ( select ) => {
+/**
+ * Displays the Post Trash Button and Confirm Dialog in the Editor.
+ *
+ * @param {?{onActionPerformed: Object}} An object containing the onActionPerformed function.
+ * @return {JSX.Element|null} The rendered PostTrash component.
+ */
+export default function PostTrash( { onActionPerformed } ) {
+	const registry = useRegistry();
+	const { isNew, isDeleting, postId, title } = useSelect( ( select ) => {
 		const store = select( editorStore );
 		return {
 			isNew: store.isEditedPostNew(),
 			isDeleting: store.isDeletingPost(),
 			postId: store.getCurrentPostId(),
+			title: store.getCurrentPostAttribute( 'title' ),
 		};
 	}, [] );
 	const { trashPost } = useDispatch( editorStore );
@@ -30,14 +39,20 @@ export default function PostTrash() {
 		return null;
 	}
 
-	const handleConfirm = () => {
+	const handleConfirm = async () => {
 		setShowConfirmDialog( false );
-		trashPost();
+		await trashPost();
+		const item = await registry
+			.resolveSelect( editorStore )
+			.getCurrentPost();
+		// After the post is trashed, we want to trigger the onActionPerformed callback, so the user is redirect
+		// to the post view depending on if the user is on post editor or site editor.
+		onActionPerformed?.( 'move-to-trash', [ item ] );
 	};
-
 	return (
-		<>
+		<PostTrashCheck>
 			<Button
+				__next40pxDefaultSize
 				className="editor-post-trash"
 				isDestructive
 				variant="secondary"
@@ -53,11 +68,15 @@ export default function PostTrash() {
 				isOpen={ showConfirmDialog }
 				onConfirm={ handleConfirm }
 				onCancel={ () => setShowConfirmDialog( false ) }
+				confirmButtonText={ __( 'Move to trash' ) }
+				size="small"
 			>
-				{ __(
-					'Are you sure you want to move this post to the trash?'
+				{ sprintf(
+					// translators: %s: The item's title.
+					__( 'Are you sure you want to move "%s" to the trash?' ),
+					title
 				) }
 			</ConfirmDialog>
-		</>
+		</PostTrashCheck>
 	);
 }
diff --git a/packages/editor/src/components/post-type-support-check/index.js b/packages/editor/src/components/post-type-support-check/index.js
index c716593f458f17..613fda8eb82da3 100644
--- a/packages/editor/src/components/post-type-support-check/index.js
+++ b/packages/editor/src/components/post-type-support-check/index.js
@@ -27,7 +27,7 @@ function PostTypeSupportCheck( { children, supportKeys } ) {
 		const { getPostType } = select( coreStore );
 		return getPostType( getEditedPostAttribute( 'type' ) );
 	}, [] );
-	let isSupported = true;
+	let isSupported = !! postType;
 	if ( postType ) {
 		isSupported = (
 			Array.isArray( supportKeys ) ? supportKeys : [ supportKeys ]
diff --git a/packages/editor/src/components/post-type-support-check/test/index.js b/packages/editor/src/components/post-type-support-check/test/index.js
index 8acef8abacb6b2..71b9f083a74a23 100644
--- a/packages/editor/src/components/post-type-support-check/test/index.js
+++ b/packages/editor/src/components/post-type-support-check/test/index.js
@@ -29,7 +29,7 @@ function setupUseSelectMock( postType ) {
 }
 
 describe( 'PostTypeSupportCheck', () => {
-	it( 'renders its children when post type is not known', () => {
+	it( 'does not render its children when post type is not known', () => {
 		setupUseSelectMock( undefined );
 
 		const { container } = render(
@@ -38,7 +38,7 @@ describe( 'PostTypeSupportCheck', () => {
 			</PostTypeSupportCheck>
 		);
 
-		expect( container ).toHaveTextContent( 'Supported' );
+		expect( container ).not.toHaveTextContent( 'Supported' );
 	} );
 
 	it( 'does not render its children when post type is known and not supports', () => {
diff --git a/packages/editor/src/components/post-url/check.js b/packages/editor/src/components/post-url/check.js
index 65c54846a702b1..7eb390472bdd7d 100644
--- a/packages/editor/src/components/post-url/check.js
+++ b/packages/editor/src/components/post-url/check.js
@@ -9,6 +9,14 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Check if the post URL is valid and visible.
+ *
+ * @param {Object}  props          The component props.
+ * @param {Element} props.children The child components.
+ *
+ * @return {Component|null} The child components if the post URL is valid and visible, otherwise null.
+ */
 export default function PostURLCheck( { children } ) {
 	const isVisible = useSelect( ( select ) => {
 		const postTypeSlug = select( editorStore ).getCurrentPostType();
diff --git a/packages/editor/src/components/post-url/index.js b/packages/editor/src/components/post-url/index.js
index 6c58a707ca8749..f03bdd59752a83 100644
--- a/packages/editor/src/components/post-url/index.js
+++ b/packages/editor/src/components/post-url/index.js
@@ -3,25 +3,47 @@
  */
 import { useSelect, useDispatch } from '@wordpress/data';
 import { safeDecodeURIComponent, cleanForSlug } from '@wordpress/url';
-import { useState } from '@wordpress/element';
+import { useState, createInterpolateElement } from '@wordpress/element';
 import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
-import { TextControl, ExternalLink } from '@wordpress/components';
+import {
+	ExternalLink,
+	Button,
+	__experimentalInputControl as InputControl,
+	__experimentalInputControlPrefixWrapper as InputControlPrefixWrapper,
+	__experimentalInputControlSuffixWrapper as InputControlSuffixWrapper,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { store as noticesStore } from '@wordpress/notices';
+import { copySmall } from '@wordpress/icons';
 import { store as coreStore } from '@wordpress/core-data';
+import { useCopyToClipboard, useInstanceId } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Renders the `PostURL` component.
+ *
+ * @example
+ * ```jsx
+ * <PostURL />
+ * ```
+ *
+ * @param {Function} onClose Callback function to be executed when the popover is closed.
+ *
+ * @return {Component} The rendered PostURL component.
+ */
 export default function PostURL( { onClose } ) {
 	const {
 		isEditable,
 		postSlug,
-		viewPostLabel,
 		postLink,
 		permalinkPrefix,
 		permalinkSuffix,
+		permalink,
 	} = useSelect( ( select ) => {
 		const post = select( editorStore ).getCurrentPost();
 		const postTypeSlug = select( editorStore ).getCurrentPostType();
@@ -39,89 +61,137 @@ export default function PostURL( { onClose } ) {
 			postLink: post.link,
 			permalinkPrefix: permalinkParts?.prefix,
 			permalinkSuffix: permalinkParts?.suffix,
+			permalink: safeDecodeURIComponent(
+				select( editorStore ).getPermalink()
+			),
 		};
 	}, [] );
-
 	const { editPost } = useDispatch( editorStore );
-
+	const { createNotice } = useDispatch( noticesStore );
 	const [ forceEmptyField, setForceEmptyField ] = useState( false );
+	const copyButtonRef = useCopyToClipboard( permalink, () => {
+		createNotice( 'info', __( 'Copied Permalink to clipboard.' ), {
+			isDismissible: true,
+			type: 'snackbar',
+		} );
+	} );
+	const postUrlSlugDescriptionId =
+		'editor-post-url__slug-description-' + useInstanceId( PostURL );
 
 	return (
 		<div className="editor-post-url">
-			<InspectorPopoverHeader title={ __( 'URL' ) } onClose={ onClose } />
-			{ isEditable && (
-				<TextControl
-					__nextHasNoMarginBottom
-					label={ __( 'Permalink' ) }
-					value={ forceEmptyField ? '' : postSlug }
-					autoComplete="off"
-					spellCheck="false"
-					help={
-						<>
-							{ __( 'The last part of the URL.' ) }{ ' ' }
-							<ExternalLink
-								href={ __(
-									'https://wordpress.org/documentation/article/page-post-settings-sidebar/#permalink'
-								) }
-							>
-								{ __( 'Learn more.' ) }
-							</ExternalLink>
-						</>
-					}
-					onChange={ ( newValue ) => {
-						editPost( { slug: newValue } );
-						// When we delete the field the permalink gets
-						// reverted to the original value.
-						// The forceEmptyField logic allows the user to have
-						// the field temporarily empty while typing.
-						if ( ! newValue ) {
-							if ( ! forceEmptyField ) {
-								setForceEmptyField( true );
+			<InspectorPopoverHeader
+				title={ __( 'Slug' ) }
+				onClose={ onClose }
+			/>
+			<VStack spacing={ 3 }>
+				{ isEditable && (
+					<p className="editor-post-url__intro">
+						{ createInterpolateElement(
+							__(
+								'<span>Customize the last part of the Permalink.</span> <a>Learn more.</a>'
+							),
+							{
+								span: <span id={ postUrlSlugDescriptionId } />,
+								a: (
+									<ExternalLink
+										href={ __(
+											'https://wordpress.org/documentation/article/page-post-settings-sidebar/#permalink'
+										) }
+									/>
+								),
 							}
-							return;
-						}
-						if ( forceEmptyField ) {
-							setForceEmptyField( false );
-						}
-					} }
-					onBlur={ ( event ) => {
-						editPost( {
-							slug: cleanForSlug( event.target.value ),
-						} );
-						if ( forceEmptyField ) {
-							setForceEmptyField( false );
-						}
-					} }
-				/>
-			) }
-			{ isEditable && (
-				<h3 className="editor-post-url__link-label">
-					{ viewPostLabel ?? __( 'View post' ) }
-				</h3>
-			) }
-			<p>
-				<ExternalLink
-					className="editor-post-url__link"
-					href={ postLink }
-					target="_blank"
-				>
-					{ isEditable ? (
+						) }
+					</p>
+				) }
+				<div>
+					{ isEditable && (
 						<>
-							<span className="editor-post-url__link-prefix">
-								{ permalinkPrefix }
-							</span>
-							<span className="editor-post-url__link-slug">
-								{ postSlug }
-							</span>
-							<span className="editor-post-url__link-suffix">
-								{ permalinkSuffix }
-							</span>
+							<InputControl
+								__next40pxDefaultSize
+								prefix={
+									<InputControlPrefixWrapper>
+										/
+									</InputControlPrefixWrapper>
+								}
+								suffix={
+									<InputControlSuffixWrapper variant="control">
+										<Button
+											icon={ copySmall }
+											ref={ copyButtonRef }
+											size="small"
+											label="Copy"
+										/>
+									</InputControlSuffixWrapper>
+								}
+								label={ __( 'Slug' ) }
+								hideLabelFromVision
+								value={ forceEmptyField ? '' : postSlug }
+								autoComplete="off"
+								spellCheck="false"
+								type="text"
+								className="editor-post-url__input"
+								onChange={ ( newValue ) => {
+									editPost( { slug: newValue } );
+									// When we delete the field the permalink gets
+									// reverted to the original value.
+									// The forceEmptyField logic allows the user to have
+									// the field temporarily empty while typing.
+									if ( ! newValue ) {
+										if ( ! forceEmptyField ) {
+											setForceEmptyField( true );
+										}
+										return;
+									}
+									if ( forceEmptyField ) {
+										setForceEmptyField( false );
+									}
+								} }
+								onBlur={ ( event ) => {
+									editPost( {
+										slug: cleanForSlug(
+											event.target.value
+										),
+									} );
+									if ( forceEmptyField ) {
+										setForceEmptyField( false );
+									}
+								} }
+								aria-describedby={ postUrlSlugDescriptionId }
+							/>
+							<p className="editor-post-url__permalink">
+								<span className="editor-post-url__permalink-visual-label">
+									{ __( 'Permalink:' ) }
+								</span>
+								<ExternalLink
+									className="editor-post-url__link"
+									href={ postLink }
+									target="_blank"
+								>
+									<span className="editor-post-url__link-prefix">
+										{ permalinkPrefix }
+									</span>
+									<span className="editor-post-url__link-slug">
+										{ postSlug }
+									</span>
+									<span className="editor-post-url__link-suffix">
+										{ permalinkSuffix }
+									</span>
+								</ExternalLink>
+							</p>
 						</>
-					) : (
-						postLink
 					) }
-				</ExternalLink>
-			</p>
+					{ ! isEditable && (
+						<ExternalLink
+							className="editor-post-url__link"
+							href={ postLink }
+							target="_blank"
+						>
+							{ postLink }
+						</ExternalLink>
+					) }
+				</div>
+			</VStack>
 		</div>
 	);
 }
diff --git a/packages/editor/src/components/post-url/label.js b/packages/editor/src/components/post-url/label.js
index 5c233dfd549467..4f03e2bce0d05f 100644
--- a/packages/editor/src/components/post-url/label.js
+++ b/packages/editor/src/components/post-url/label.js
@@ -9,10 +9,20 @@ import { filterURLForDisplay, safeDecodeURIComponent } from '@wordpress/url';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Represents a label component for a post URL.
+ *
+ * @return {Component} The PostURLLabel component.
+ */
 export default function PostURLLabel() {
 	return usePostURLLabel();
 }
 
+/**
+ * Custom hook to get the label for the post URL.
+ *
+ * @return {string} The filtered and decoded post URL label.
+ */
 export function usePostURLLabel() {
 	const postLink = useSelect(
 		( select ) => select( editorStore ).getPermalink(),
diff --git a/packages/editor/src/components/post-url/panel.js b/packages/editor/src/components/post-url/panel.js
index 4c4fc38d3e2df3..a5d3ddeb77f846 100644
--- a/packages/editor/src/components/post-url/panel.js
+++ b/packages/editor/src/components/post-url/panel.js
@@ -2,59 +2,121 @@
  * WordPress dependencies
  */
 import { useMemo, useState } from '@wordpress/element';
-import { Dropdown, Button } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { Dropdown, Button, ExternalLink } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
+import { safeDecodeURIComponent } from '@wordpress/url';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
 import PostURLCheck from './check';
 import PostURL from './index';
-import { usePostURLLabel } from './label';
 import PostPanelRow from '../post-panel-row';
+import { store as editorStore } from '../../store';
 
+/**
+ * Renders the `PostURLPanel` component.
+ *
+ * @return {JSX.Element} The rendered PostURLPanel component.
+ */
 export default function PostURLPanel() {
+	const { isFrontPage } = useSelect( ( select ) => {
+		const { getCurrentPostId } = select( editorStore );
+		const { getEditedEntityRecord, canUser } = select( coreStore );
+		const siteSettings = canUser( 'read', {
+			kind: 'root',
+			name: 'site',
+		} )
+			? getEditedEntityRecord( 'root', 'site' )
+			: undefined;
+		const _id = getCurrentPostId();
+		return {
+			isFrontPage: siteSettings?.page_on_front === _id,
+		};
+	}, [] );
 	// Use internal state instead of a ref to make sure that the component
 	// re-renders when the popover's anchor updates.
 	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
 	// Memoize popoverProps to avoid returning a new object every time.
 	const popoverProps = useMemo(
-		() => ( { anchor: popoverAnchor, placement: 'bottom-end' } ),
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
 		[ popoverAnchor ]
 	);
 
+	const label = isFrontPage ? __( 'Link' ) : __( 'Slug' );
+
 	return (
 		<PostURLCheck>
-			<PostPanelRow label={ __( 'URL' ) } ref={ setPopoverAnchor }>
-				<Dropdown
-					popoverProps={ popoverProps }
-					className="editor-post-url__panel-dropdown"
-					contentClassName="editor-post-url__panel-dialog"
-					focusOnMount
-					renderToggle={ ( { isOpen, onToggle } ) => (
-						<PostURLToggle isOpen={ isOpen } onClick={ onToggle } />
-					) }
-					renderContent={ ( { onClose } ) => (
-						<PostURL onClose={ onClose } />
-					) }
-				/>
+			<PostPanelRow label={ label } ref={ setPopoverAnchor }>
+				{ ! isFrontPage && (
+					<Dropdown
+						popoverProps={ popoverProps }
+						className="editor-post-url__panel-dropdown"
+						contentClassName="editor-post-url__panel-dialog"
+						focusOnMount
+						renderToggle={ ( { isOpen, onToggle } ) => (
+							<PostURLToggle
+								isOpen={ isOpen }
+								onClick={ onToggle }
+							/>
+						) }
+						renderContent={ ( { onClose } ) => (
+							<PostURL onClose={ onClose } />
+						) }
+					/>
+				) }
+				{ isFrontPage && <FrontPageLink /> }
 			</PostPanelRow>
 		</PostURLCheck>
 	);
 }
 
 function PostURLToggle( { isOpen, onClick } ) {
-	const label = usePostURLLabel();
+	const { slug } = useSelect( ( select ) => {
+		return {
+			slug: select( editorStore ).getEditedPostSlug(),
+		};
+	}, [] );
+	const decodedSlug = safeDecodeURIComponent( slug );
 	return (
 		<Button
+			size="compact"
 			className="editor-post-url__panel-toggle"
 			variant="tertiary"
 			aria-expanded={ isOpen }
-			// translators: %s: Current post URL.
-			aria-label={ sprintf( __( 'Change URL: %s' ), label ) }
+			// translators: %s: Current post link.
+			aria-label={ sprintf( __( 'Change link: %s' ), decodedSlug ) }
 			onClick={ onClick }
 		>
-			{ label }
+			<>{ decodedSlug }</>
 		</Button>
 	);
 }
+
+function FrontPageLink() {
+	const { postLink } = useSelect( ( select ) => {
+		const { getCurrentPost } = select( editorStore );
+		return {
+			postLink: getCurrentPost()?.link,
+		};
+	}, [] );
+
+	return (
+		<ExternalLink
+			className="editor-post-url__front-page-link"
+			href={ postLink }
+			target="_blank"
+		>
+			{ postLink }
+		</ExternalLink>
+	);
+}
diff --git a/packages/editor/src/components/post-url/style.scss b/packages/editor/src/components/post-url/style.scss
index 4a3e8e1b39c9f7..f8a70f5fdf760b 100644
--- a/packages/editor/src/components/post-url/style.scss
+++ b/packages/editor/src/components/post-url/style.scss
@@ -2,34 +2,49 @@
 	width: 100%;
 }
 
-.components-button.editor-post-url__panel-toggle {
-	display: block;
-	max-width: 100%;
-	overflow: hidden;
-	text-align: left;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
 .editor-post-url__panel-dialog .editor-post-url {
 	// sidebar width - popover padding - form margin
 	min-width: $sidebar-width - $grid-unit-20 - $grid-unit-20;
 	margin: $grid-unit-10;
 }
 
-.editor-post-url__link-label {
-	font-size: $default-font-size;
-	font-weight: 400;
-	margin: 0;
-}
-
 /* rtl:begin:ignore */
-.editor-post-url__link {
+.editor-post-url__link,
+.editor-post-url__front-page-link {
 	direction: ltr;
 	word-break: break-word;
 }
 /* rtl:end:ignore */
 
+.editor-post-url__front-page-link {
+	// Match padding on tertiary buttons for alignment.
+	padding: $grid-unit-15 * 0.5 0 $grid-unit-15 * 0.5 $grid-unit-15;
+}
+
+
 .editor-post-url__link-slug {
 	font-weight: 600;
 }
+
+// TODO: This might indicate a need to update the InputControl itself, as
+// there is no way currently to control the padding when adding prefix/suffix.
+.editor-post-url__input input.components-input-control__input {
+	padding-inline-start: 0 !important;
+}
+
+.editor-post-url__panel-toggle {
+	word-break: break-word;
+}
+
+.editor-post-url__intro {
+	margin: 0;
+}
+
+.editor-post-url__permalink {
+	margin-top: $grid-unit-10;
+	margin-bottom: 0;
+
+	&-visual-label {
+		display: block;
+	}
+}
diff --git a/packages/editor/src/components/post-view-link/index.js b/packages/editor/src/components/post-view-link/index.js
new file mode 100644
index 00000000000000..a15b7546fa7c9f
--- /dev/null
+++ b/packages/editor/src/components/post-view-link/index.js
@@ -0,0 +1,48 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Button } from '@wordpress/components';
+import { external } from '@wordpress/icons';
+import { store as coreStore } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import { store as preferencesStore } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+
+export default function PostViewLink() {
+	const { hasLoaded, permalink, isPublished, label, showIconLabels } =
+		useSelect( ( select ) => {
+			// Grab post type to retrieve the view_item label.
+			const postTypeSlug = select( editorStore ).getCurrentPostType();
+			const postType = select( coreStore ).getPostType( postTypeSlug );
+			const { get } = select( preferencesStore );
+
+			return {
+				permalink: select( editorStore ).getPermalink(),
+				isPublished: select( editorStore ).isCurrentPostPublished(),
+				label: postType?.labels.view_item,
+				hasLoaded: !! postType,
+				showIconLabels: get( 'core', 'showIconLabels' ),
+			};
+		}, [] );
+
+	// Only render the view button if the post is published and has a permalink.
+	if ( ! isPublished || ! permalink || ! hasLoaded ) {
+		return null;
+	}
+
+	return (
+		<Button
+			icon={ external }
+			label={ label || __( 'View post' ) }
+			href={ permalink }
+			target="_blank"
+			showTooltip={ ! showIconLabels }
+			size="compact"
+		/>
+	);
+}
diff --git a/packages/editor/src/components/post-visibility/check.js b/packages/editor/src/components/post-visibility/check.js
index 4bf9bd03772da6..19a241ae1110ae 100644
--- a/packages/editor/src/components/post-visibility/check.js
+++ b/packages/editor/src/components/post-visibility/check.js
@@ -1,26 +1,30 @@
 /**
  * WordPress dependencies
  */
-import { compose } from '@wordpress/compose';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
-export function PostVisibilityCheck( { hasPublishAction, render } ) {
-	const canEdit = hasPublishAction;
+/**
+ * Determines if the current post can be edited (published)
+ * and passes this information to the provided render function.
+ *
+ * @param {Object}   props        The component props.
+ * @param {Function} props.render Function to render the component.
+ *                                Receives an object with a `canEdit` property.
+ * @return {JSX.Element} The rendered component.
+ */
+export default function PostVisibilityCheck( { render } ) {
+	const canEdit = useSelect( ( select ) => {
+		return (
+			select( editorStore ).getCurrentPost()._links?.[
+				'wp:action-publish'
+			] ?? false
+		);
+	} );
+
 	return render( { canEdit } );
 }
-
-export default compose( [
-	withSelect( ( select ) => {
-		const { getCurrentPost, getCurrentPostType } = select( editorStore );
-		return {
-			hasPublishAction:
-				getCurrentPost()._links?.[ 'wp:action-publish' ] ?? false,
-			postType: getCurrentPostType(),
-		};
-	} ),
-] )( PostVisibilityCheck );
diff --git a/packages/editor/src/components/post-visibility/index.js b/packages/editor/src/components/post-visibility/index.js
index a16682150350ed..e47f2acd664434 100644
--- a/packages/editor/src/components/post-visibility/index.js
+++ b/packages/editor/src/components/post-visibility/index.js
@@ -17,6 +17,13 @@ import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '
 import { visibilityOptions } from './utils';
 import { store as editorStore } from '../../store';
 
+/**
+ * Allows users to set the visibility of a post.
+ *
+ * @param {Object}   props         The component props.
+ * @param {Function} props.onClose Function to call when the popover is closed.
+ * @return {JSX.Element} The rendered component.
+ */
 export default function PostVisibility( { onClose } ) {
 	const instanceId = useInstanceId( PostVisibility );
 
@@ -125,6 +132,8 @@ export default function PostVisibility( { onClose } ) {
 				isOpen={ showPrivateConfirmDialog }
 				onConfirm={ confirmPrivate }
 				onCancel={ handleDialogCancel }
+				confirmButtonText={ __( 'Publish' ) }
+				size="medium"
 			>
 				{ __( 'Would you like to privately publish this post now?' ) }
 			</ConfirmDialog>
diff --git a/packages/editor/src/components/post-visibility/label.js b/packages/editor/src/components/post-visibility/label.js
index 580eed75620b4d..50a6e14aa1a14e 100644
--- a/packages/editor/src/components/post-visibility/label.js
+++ b/packages/editor/src/components/post-visibility/label.js
@@ -9,10 +9,20 @@ import { useSelect } from '@wordpress/data';
 import { visibilityOptions } from './utils';
 import { store as editorStore } from '../../store';
 
+/**
+ * Returns the label for the current post visibility setting.
+ *
+ * @return {string} Post visibility label.
+ */
 export default function PostVisibilityLabel() {
 	return usePostVisibilityLabel();
 }
 
+/**
+ * Get the label for the current post visibility setting.
+ *
+ * @return {string} Post visibility label.
+ */
 export function usePostVisibilityLabel() {
 	const visibility = useSelect( ( select ) =>
 		select( editorStore ).getEditedPostVisibility()
diff --git a/packages/editor/src/components/post-visibility/test/check.js b/packages/editor/src/components/post-visibility/test/check.js
index 8ec0c2df04ec90..828e876cceb102 100644
--- a/packages/editor/src/components/post-visibility/test/check.js
+++ b/packages/editor/src/components/post-visibility/test/check.js
@@ -3,32 +3,43 @@
  */
 import { render, screen } from '@testing-library/react';
 
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
+jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
+
 /**
  * Internal dependencies
  */
-import { PostVisibilityCheck } from '../check';
+import PostVisibilityCheck from '../check';
+
+function setupMockSelect( hasPublishAction ) {
+	useSelect.mockImplementation( ( mapSelect ) => {
+		return mapSelect( () => ( {
+			getCurrentPost: () => ( {
+				_links: {
+					'wp:action-publish': hasPublishAction,
+				},
+			} ),
+		} ) );
+	} );
+}
 
 describe( 'PostVisibilityCheck', () => {
 	const renderProp = ( { canEdit } ) => ( canEdit ? 'yes' : 'no' );
 
 	it( "should not render the edit link if the user doesn't have the right capability", () => {
-		render(
-			<PostVisibilityCheck
-				hasPublishAction={ false }
-				render={ renderProp }
-			/>
-		);
+		setupMockSelect( false );
+		render( <PostVisibilityCheck render={ renderProp } /> );
 		expect( screen.queryByText( 'yes' ) ).not.toBeInTheDocument();
 		expect( screen.getByText( 'no' ) ).toBeVisible();
 	} );
 
 	it( 'should render if the user has the correct capability', () => {
-		render(
-			<PostVisibilityCheck
-				hasPublishAction={ true }
-				render={ renderProp }
-			/>
-		);
+		setupMockSelect( true );
+		render( <PostVisibilityCheck render={ renderProp } /> );
 		expect( screen.queryByText( 'no' ) ).not.toBeInTheDocument();
 		expect( screen.getByText( 'yes' ) ).toBeVisible();
 	} );
diff --git a/packages/editor/src/components/posts-per-page/index.js b/packages/editor/src/components/posts-per-page/index.js
new file mode 100644
index 00000000000000..876644168a52c7
--- /dev/null
+++ b/packages/editor/src/components/posts-per-page/index.js
@@ -0,0 +1,106 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import {
+	Button,
+	Dropdown,
+	__experimentalNumberControl as NumberControl,
+} from '@wordpress/components';
+import { useState, useMemo } from '@wordpress/element';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_POST_TYPE } from '../../store/constants';
+import { store as editorStore } from '../../store';
+import PostPanelRow from '../post-panel-row';
+
+export default function PostsPerPage() {
+	const { editEntityRecord } = useDispatch( coreStore );
+	const { postsPerPage, isTemplate, postSlug } = useSelect( ( select ) => {
+		const { getEditedPostAttribute, getCurrentPostType } =
+			select( editorStore );
+		const { getEditedEntityRecord, canUser } = select( coreStore );
+		const siteSettings = canUser( 'read', {
+			kind: 'root',
+			name: 'site',
+		} )
+			? getEditedEntityRecord( 'root', 'site' )
+			: undefined;
+		return {
+			isTemplate: getCurrentPostType() === TEMPLATE_POST_TYPE,
+			postSlug: getEditedPostAttribute( 'slug' ),
+			postsPerPage: siteSettings?.posts_per_page || 1,
+		};
+	}, [] );
+	// Use internal state instead of a ref to make sure that the component
+	// re-renders when the popover's anchor updates.
+	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor ]
+	);
+
+	if ( ! isTemplate || ! [ 'home', 'index' ].includes( postSlug ) ) {
+		return null;
+	}
+	const setPostsPerPage = ( newValue ) => {
+		editEntityRecord( 'root', 'site', undefined, {
+			posts_per_page: newValue,
+		} );
+	};
+	return (
+		<PostPanelRow label={ __( 'Posts per page' ) } ref={ setPopoverAnchor }>
+			<Dropdown
+				popoverProps={ popoverProps }
+				contentClassName="editor-posts-per-page-dropdown__content"
+				focusOnMount
+				renderToggle={ ( { isOpen, onToggle } ) => (
+					<Button
+						size="compact"
+						variant="tertiary"
+						aria-expanded={ isOpen }
+						aria-label={ __( 'Change posts per page' ) }
+						onClick={ onToggle }
+					>
+						{ postsPerPage }
+					</Button>
+				) }
+				renderContent={ ( { onClose } ) => (
+					<>
+						<InspectorPopoverHeader
+							title={ __( 'Posts per page' ) }
+							onClose={ onClose }
+						/>
+						<NumberControl
+							placeholder={ 0 }
+							value={ postsPerPage }
+							size="__unstable-large"
+							spinControls="custom"
+							step="1"
+							min="1"
+							onChange={ setPostsPerPage }
+							label={ __( 'Posts per page' ) }
+							help={ __(
+								'Set the default number of posts to display on blog pages, including categories and tags. Some templates may override this setting.'
+							) }
+							hideLabelFromVision
+						/>
+					</>
+				) }
+			/>
+		</PostPanelRow>
+	);
+}
diff --git a/packages/editor/src/components/posts-per-page/style.scss b/packages/editor/src/components/posts-per-page/style.scss
new file mode 100644
index 00000000000000..e77e9b33206320
--- /dev/null
+++ b/packages/editor/src/components/posts-per-page/style.scss
@@ -0,0 +1,4 @@
+.editor-posts-per-page-dropdown__content .components-popover__content {
+	min-width: 320px;
+	padding: $grid-unit-20;
+}
diff --git a/packages/editor/src/components/preferences-modal/enable-panel.js b/packages/editor/src/components/preferences-modal/enable-panel.js
new file mode 100644
index 00000000000000..66c91409434415
--- /dev/null
+++ b/packages/editor/src/components/preferences-modal/enable-panel.js
@@ -0,0 +1,30 @@
+/**
+ * WordPress dependencies
+ */
+import { compose, ifCondition } from '@wordpress/compose';
+import { withSelect, withDispatch } from '@wordpress/data';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+
+const { PreferenceBaseOption } = unlock( preferencesPrivateApis );
+
+export default compose(
+	withSelect( ( select, { panelName } ) => {
+		const { isEditorPanelEnabled, isEditorPanelRemoved } =
+			select( editorStore );
+		return {
+			isRemoved: isEditorPanelRemoved( panelName ),
+			isChecked: isEditorPanelEnabled( panelName ),
+		};
+	} ),
+	ifCondition( ( { isRemoved } ) => ! isRemoved ),
+	withDispatch( ( dispatch, { panelName } ) => ( {
+		onChange: () =>
+			dispatch( editorStore ).toggleEditorPanelEnabled( panelName ),
+	} ) )
+)( PreferenceBaseOption );
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-plugin-document-setting-panel.js b/packages/editor/src/components/preferences-modal/enable-plugin-document-setting-panel.js
similarity index 90%
rename from packages/edit-post/src/components/preferences-modal/options/enable-plugin-document-setting-panel.js
rename to packages/editor/src/components/preferences-modal/enable-plugin-document-setting-panel.js
index b18b0436579bcb..4dd2e55eba007b 100644
--- a/packages/edit-post/src/components/preferences-modal/options/enable-plugin-document-setting-panel.js
+++ b/packages/editor/src/components/preferences-modal/enable-plugin-document-setting-panel.js
@@ -6,7 +6,7 @@ import { createSlotFill } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import { EnablePanelOption } from './index';
+import EnablePanelOption from './enable-panel';
 
 const { Fill, Slot } = createSlotFill(
 	'EnablePluginDocumentSettingPanelOption'
diff --git a/packages/editor/src/components/preferences-modal/enable-publish-sidebar.js b/packages/editor/src/components/preferences-modal/enable-publish-sidebar.js
new file mode 100644
index 00000000000000..bcdfb2540e8dac
--- /dev/null
+++ b/packages/editor/src/components/preferences-modal/enable-publish-sidebar.js
@@ -0,0 +1,28 @@
+/**
+ * WordPress dependencies
+ */
+import { compose } from '@wordpress/compose';
+import { withSelect, withDispatch } from '@wordpress/data';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+
+const { PreferenceBaseOption } = unlock( preferencesPrivateApis );
+
+export default compose(
+	withSelect( ( select ) => ( {
+		isChecked: select( editorStore ).isPublishSidebarEnabled(),
+	} ) ),
+	withDispatch( ( dispatch ) => {
+		const { enablePublishSidebar, disablePublishSidebar } =
+			dispatch( editorStore );
+		return {
+			onChange: ( isEnabled ) =>
+				isEnabled ? enablePublishSidebar() : disablePublishSidebar(),
+		};
+	} )
+)( PreferenceBaseOption );
diff --git a/packages/editor/src/components/preferences-modal/index.js b/packages/editor/src/components/preferences-modal/index.js
new file mode 100644
index 00000000000000..a8cfd8245522cd
--- /dev/null
+++ b/packages/editor/src/components/preferences-modal/index.js
@@ -0,0 +1,342 @@
+/**
+ * WordPress dependencies
+ */
+
+import { __ } from '@wordpress/i18n';
+import { useViewportMatch } from '@wordpress/compose';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+import {
+	store as preferencesStore,
+	privateApis as preferencesPrivateApis,
+} from '@wordpress/preferences';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import EnablePanelOption from './enable-panel';
+import EnablePluginDocumentSettingPanelOption from './enable-plugin-document-setting-panel';
+import EnablePublishSidebarOption from './enable-publish-sidebar';
+import BlockManager from '../block-manager';
+import PostTaxonomies from '../post-taxonomies';
+import PostFeaturedImageCheck from '../post-featured-image/check';
+import PostExcerptCheck from '../post-excerpt/check';
+import PageAttributesCheck from '../page-attributes/check';
+import PostTypeSupportCheck from '../post-type-support-check';
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+import { useStartPatterns } from '../start-page-options';
+
+const {
+	PreferencesModal,
+	PreferencesModalTabs,
+	PreferencesModalSection,
+	PreferenceToggleControl,
+} = unlock( preferencesPrivateApis );
+
+export default function EditorPreferencesModal( { extraSections = {} } ) {
+	const isLargeViewport = useViewportMatch( 'medium' );
+	const { isActive, showBlockBreadcrumbsOption } = useSelect(
+		( select ) => {
+			const { getEditorSettings } = select( editorStore );
+			const { get } = select( preferencesStore );
+			const { isModalActive } = select( interfaceStore );
+			const isRichEditingEnabled = getEditorSettings().richEditingEnabled;
+			const isDistractionFreeEnabled = get( 'core', 'distractionFree' );
+			return {
+				showBlockBreadcrumbsOption:
+					! isDistractionFreeEnabled &&
+					isLargeViewport &&
+					isRichEditingEnabled,
+				isActive: isModalActive( 'editor/preferences' ),
+			};
+		},
+		[ isLargeViewport ]
+	);
+	const { closeModal } = useDispatch( interfaceStore );
+	const { setIsListViewOpened, setIsInserterOpened } =
+		useDispatch( editorStore );
+	const { set: setPreference } = useDispatch( preferencesStore );
+	const hasStarterPatterns = !! useStartPatterns().length;
+
+	const sections = useMemo(
+		() =>
+			[
+				{
+					name: 'general',
+					tabLabel: __( 'General' ),
+					content: (
+						<>
+							<PreferencesModalSection
+								title={ __( 'Interface' ) }
+							>
+								<PreferenceToggleControl
+									scope="core"
+									featureName="showListViewByDefault"
+									help={ __(
+										'Opens the List View sidebar by default.'
+									) }
+									label={ __( 'Always open List View' ) }
+								/>
+								{ showBlockBreadcrumbsOption && (
+									<PreferenceToggleControl
+										scope="core"
+										featureName="showBlockBreadcrumbs"
+										help={ __(
+											'Display the block hierarchy trail at the bottom of the editor.'
+										) }
+										label={ __( 'Show block breadcrumbs' ) }
+									/>
+								) }
+								<PreferenceToggleControl
+									scope="core"
+									featureName="allowRightClickOverrides"
+									help={ __(
+										'Allows contextual List View menus via right-click, overriding browser defaults.'
+									) }
+									label={ __(
+										'Allow right-click contextual menus'
+									) }
+								/>
+								{ hasStarterPatterns && (
+									<PreferenceToggleControl
+										scope="core"
+										featureName="enableChoosePatternModal"
+										help={ __(
+											'Shows starter patterns when creating a new page.'
+										) }
+										label={ __( 'Show starter patterns' ) }
+									/>
+								) }
+							</PreferencesModalSection>
+							<PreferencesModalSection
+								title={ __( 'Document settings' ) }
+								description={ __(
+									'Select what settings are shown in the document panel.'
+								) }
+							>
+								<EnablePluginDocumentSettingPanelOption.Slot />
+								<PostTaxonomies
+									taxonomyWrapper={ ( content, taxonomy ) => (
+										<EnablePanelOption
+											label={ taxonomy.labels.menu_name }
+											panelName={ `taxonomy-panel-${ taxonomy.slug }` }
+										/>
+									) }
+								/>
+								<PostFeaturedImageCheck>
+									<EnablePanelOption
+										label={ __( 'Featured image' ) }
+										panelName="featured-image"
+									/>
+								</PostFeaturedImageCheck>
+								<PostExcerptCheck>
+									<EnablePanelOption
+										label={ __( 'Excerpt' ) }
+										panelName="post-excerpt"
+									/>
+								</PostExcerptCheck>
+								<PostTypeSupportCheck
+									supportKeys={ [ 'comments', 'trackbacks' ] }
+								>
+									<EnablePanelOption
+										label={ __( 'Discussion' ) }
+										panelName="discussion-panel"
+									/>
+								</PostTypeSupportCheck>
+								<PageAttributesCheck>
+									<EnablePanelOption
+										label={ __( 'Page attributes' ) }
+										panelName="page-attributes"
+									/>
+								</PageAttributesCheck>
+							</PreferencesModalSection>
+							{ isLargeViewport && (
+								<PreferencesModalSection
+									title={ __( 'Publishing' ) }
+								>
+									<EnablePublishSidebarOption
+										help={ __(
+											'Review settings, such as visibility and tags.'
+										) }
+										label={ __(
+											'Enable pre-publish checks'
+										) }
+									/>
+								</PreferencesModalSection>
+							) }
+							{ extraSections?.general }
+						</>
+					),
+				},
+				{
+					name: 'appearance',
+					tabLabel: __( 'Appearance' ),
+					content: (
+						<PreferencesModalSection
+							title={ __( 'Appearance' ) }
+							description={ __(
+								'Customize the editor interface to suit your needs.'
+							) }
+						>
+							<PreferenceToggleControl
+								scope="core"
+								featureName="fixedToolbar"
+								onToggle={ () =>
+									setPreference(
+										'core',
+										'distractionFree',
+										false
+									)
+								}
+								help={ __(
+									'Access all block and document tools in a single place.'
+								) }
+								label={ __( 'Top toolbar' ) }
+							/>
+							<PreferenceToggleControl
+								scope="core"
+								featureName="distractionFree"
+								onToggle={ () => {
+									setPreference(
+										'core',
+										'fixedToolbar',
+										true
+									);
+									setIsInserterOpened( false );
+									setIsListViewOpened( false );
+								} }
+								help={ __(
+									'Reduce visual distractions by hiding the toolbar and other elements to focus on writing.'
+								) }
+								label={ __( 'Distraction free' ) }
+							/>
+							<PreferenceToggleControl
+								scope="core"
+								featureName="focusMode"
+								help={ __(
+									'Highlights the current block and fades other content.'
+								) }
+								label={ __( 'Spotlight mode' ) }
+							/>
+							{ extraSections?.appearance }
+						</PreferencesModalSection>
+					),
+				},
+				{
+					name: 'accessibility',
+					tabLabel: __( 'Accessibility' ),
+					content: (
+						<>
+							<PreferencesModalSection
+								title={ __( 'Navigation' ) }
+								description={ __(
+									'Optimize the editing experience for enhanced control.'
+								) }
+							>
+								<PreferenceToggleControl
+									scope="core"
+									featureName="keepCaretInsideBlock"
+									help={ __(
+										'Keeps the text cursor within the block boundaries, aiding users with screen readers by preventing unintentional cursor movement outside the block.'
+									) }
+									label={ __(
+										'Contain text cursor inside block'
+									) }
+								/>
+							</PreferencesModalSection>
+							<PreferencesModalSection
+								title={ __( 'Interface' ) }
+							>
+								<PreferenceToggleControl
+									scope="core"
+									featureName="showIconLabels"
+									label={ __( 'Show button text labels' ) }
+									help={ __(
+										'Show text instead of icons on buttons across the interface.'
+									) }
+								/>
+							</PreferencesModalSection>
+						</>
+					),
+				},
+				{
+					name: 'blocks',
+					tabLabel: __( 'Blocks' ),
+					content: (
+						<>
+							<PreferencesModalSection title={ __( 'Inserter' ) }>
+								<PreferenceToggleControl
+									scope="core"
+									featureName="mostUsedBlocks"
+									help={ __(
+										'Adds a category with the most frequently used blocks in the inserter.'
+									) }
+									label={ __( 'Show most used blocks' ) }
+								/>
+							</PreferencesModalSection>
+							<PreferencesModalSection
+								title={ __( 'Manage block visibility' ) }
+								description={ __(
+									"Disable blocks that you don't want to appear in the inserter. They can always be toggled back on later."
+								) }
+							>
+								<BlockManager />
+							</PreferencesModalSection>
+						</>
+					),
+				},
+				window.__experimentalMediaProcessing && {
+					name: 'media',
+					tabLabel: __( 'Media' ),
+					content: (
+						<>
+							<PreferencesModalSection
+								title={ __( 'General' ) }
+								description={ __(
+									'Customize options related to the media upload flow.'
+								) }
+							>
+								<PreferenceToggleControl
+									scope="core/media"
+									featureName="optimizeOnUpload"
+									help={ __(
+										'Compress media items before uploading to the server.'
+									) }
+									label={ __( 'Pre-upload compression' ) }
+								/>
+								<PreferenceToggleControl
+									scope="core/media"
+									featureName="requireApproval"
+									help={ __(
+										'Require approval step when optimizing existing media.'
+									) }
+									label={ __( 'Approval step' ) }
+								/>
+							</PreferencesModalSection>
+						</>
+					),
+				},
+			].filter( Boolean ),
+		[
+			showBlockBreadcrumbsOption,
+			extraSections,
+			setIsInserterOpened,
+			setIsListViewOpened,
+			setPreference,
+			isLargeViewport,
+			hasStarterPatterns,
+		]
+	);
+
+	if ( ! isActive ) {
+		return null;
+	}
+
+	return (
+		<PreferencesModal closeModal={ closeModal }>
+			<PreferencesModalTabs sections={ sections } />
+		</PreferencesModal>
+	);
+}
diff --git a/packages/edit-post/src/components/preferences-modal/test/index.js b/packages/editor/src/components/preferences-modal/test/index.js
similarity index 100%
rename from packages/edit-post/src/components/preferences-modal/test/index.js
rename to packages/editor/src/components/preferences-modal/test/index.js
diff --git a/packages/editor/src/components/preview-dropdown/index.js b/packages/editor/src/components/preview-dropdown/index.js
new file mode 100644
index 00000000000000..e7a19f92548f5f
--- /dev/null
+++ b/packages/editor/src/components/preview-dropdown/index.js
@@ -0,0 +1,171 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useViewportMatch } from '@wordpress/compose';
+import {
+	DropdownMenu,
+	MenuGroup,
+	MenuItem,
+	MenuItemsChoice,
+	VisuallyHidden,
+	Icon,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { desktop, mobile, tablet, external } from '@wordpress/icons';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { ActionItem } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import PostPreviewButton from '../post-preview-button';
+import { unlock } from '../../lock-unlock';
+
+export default function PreviewDropdown( { forceIsAutosaveable, disabled } ) {
+	const { deviceType, homeUrl, isTemplate, isViewable, showIconLabels } =
+		useSelect( ( select ) => {
+			const { getDeviceType, getCurrentPostType } = select( editorStore );
+			const { getEntityRecord, getPostType } = select( coreStore );
+			const { get } = select( preferencesStore );
+			const _currentPostType = getCurrentPostType();
+			return {
+				deviceType: getDeviceType(),
+				homeUrl: getEntityRecord( 'root', '__unstableBase' )?.home,
+				isTemplate: _currentPostType === 'wp_template',
+				isViewable: getPostType( _currentPostType )?.viewable ?? false,
+				showIconLabels: get( 'core', 'showIconLabels' ),
+			};
+		}, [] );
+	const { setDeviceType } = useDispatch( editorStore );
+	const { resetZoomLevel } = unlock( useDispatch( blockEditorStore ) );
+
+	const handleDevicePreviewChange = ( newDeviceType ) => {
+		setDeviceType( newDeviceType );
+		resetZoomLevel();
+	};
+
+	const isMobile = useViewportMatch( 'medium', '<' );
+	if ( isMobile ) {
+		return null;
+	}
+
+	const popoverProps = {
+		placement: 'bottom-end',
+	};
+	const toggleProps = {
+		className: 'editor-preview-dropdown__toggle',
+		iconPosition: 'right',
+		size: 'compact',
+		showTooltip: ! showIconLabels,
+		disabled,
+		accessibleWhenDisabled: disabled,
+	};
+	const menuProps = {
+		'aria-label': __( 'View options' ),
+	};
+
+	const deviceIcons = {
+		desktop,
+		mobile,
+		tablet,
+	};
+
+	/**
+	 * The choices for the device type.
+	 *
+	 * @type {Array}
+	 */
+	const choices = [
+		{
+			value: 'Desktop',
+			label: __( 'Desktop' ),
+			icon: desktop,
+		},
+		{
+			value: 'Tablet',
+			label: __( 'Tablet' ),
+			icon: tablet,
+		},
+		{
+			value: 'Mobile',
+			label: __( 'Mobile' ),
+			icon: mobile,
+		},
+	];
+
+	return (
+		<DropdownMenu
+			className={ clsx(
+				'editor-preview-dropdown',
+				`editor-preview-dropdown--${ deviceType.toLowerCase() }`
+			) }
+			popoverProps={ popoverProps }
+			toggleProps={ toggleProps }
+			menuProps={ menuProps }
+			icon={ deviceIcons[ deviceType.toLowerCase() ] }
+			label={ __( 'View' ) }
+			disableOpenOnArrowDown={ disabled }
+		>
+			{ ( { onClose } ) => (
+				<>
+					<MenuGroup>
+						<MenuItemsChoice
+							choices={ choices }
+							value={ deviceType }
+							onSelect={ handleDevicePreviewChange }
+						/>
+					</MenuGroup>
+					{ isTemplate && (
+						<MenuGroup>
+							<MenuItem
+								href={ homeUrl }
+								target="_blank"
+								icon={ external }
+								onClick={ onClose }
+							>
+								{ __( 'View site' ) }
+								<VisuallyHidden as="span">
+									{
+										/* translators: accessibility text */
+										__( '(opens in a new tab)' )
+									}
+								</VisuallyHidden>
+							</MenuItem>
+						</MenuGroup>
+					) }
+					{ isViewable && (
+						<MenuGroup>
+							<PostPreviewButton
+								className="editor-preview-dropdown__button-external"
+								role="menuitem"
+								forceIsAutosaveable={ forceIsAutosaveable }
+								aria-label={ __( 'Preview in new tab' ) }
+								textContent={
+									<>
+										{ __( 'Preview in new tab' ) }
+										<Icon icon={ external } />
+									</>
+								}
+								onPreview={ onClose }
+							/>
+						</MenuGroup>
+					) }
+					<ActionItem.Slot
+						name="core/plugin-preview-menu"
+						as={ MenuGroup }
+						fillProps={ { onClick: onClose } }
+					/>
+				</>
+			) }
+		</DropdownMenu>
+	);
+}
diff --git a/packages/editor/src/components/preview-dropdown/style.scss b/packages/editor/src/components/preview-dropdown/style.scss
new file mode 100644
index 00000000000000..c117a4239e9dfb
--- /dev/null
+++ b/packages/editor/src/components/preview-dropdown/style.scss
@@ -0,0 +1,10 @@
+.editor-preview-dropdown .editor-preview-dropdown__toggle.has-icon.has-text {
+	padding-right: 4px;
+	padding-left: 6px;
+}
+
+.editor-preview-dropdown__button-external {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+}
diff --git a/packages/editor/src/components/provider/README.md b/packages/editor/src/components/provider/README.md
deleted file mode 100644
index deaa9375bba746..00000000000000
--- a/packages/editor/src/components/provider/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# EditorProvider
-
-EditorProvider is a component which establishes a new post editing context, and serves as the entry point for a new post editor (or post with template editor). 
-
-It supports a big number of post types, including post, page, templates, custom post types, patterns, template parts.
-
-All modification and changes are performed to the `@wordpress/core-data` store.
-
-## Props
-
-### `post`
-
--   **Type:** `Object`
--   **Required** `yes`
-
-The post object to edit
-
-### `__unstableTemplate`
-
--   **Type:** `Object`
--   **Required** `no`
-
-The template object wrapper the edited post. This is optional and can only be used when the post type supports templates (like posts and pages).
-
-### `settings`
-
--   **Type:** `Object`
--   **Required** `no`
-
-The settings object to use for the editor. This is optional and can be used to override the default settings.
-
-### `children`
-
--   **Type:** `Element`
--   **Required** `no`
-
-Children elements for which the BlockEditorProvider context should apply.
diff --git a/packages/editor/src/components/provider/constants.js b/packages/editor/src/components/provider/constants.js
deleted file mode 100644
index a81b2fd37563af..00000000000000
--- a/packages/editor/src/components/provider/constants.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const PAGE_CONTENT_BLOCK_TYPES = [
-	'core/post-title',
-	'core/post-featured-image',
-	'core/post-content',
-];
diff --git a/packages/editor/src/components/provider/disable-non-page-content-blocks.js b/packages/editor/src/components/provider/disable-non-page-content-blocks.js
index 048b01d026c24e..ae4fd1075fc261 100644
--- a/packages/editor/src/components/provider/disable-non-page-content-blocks.js
+++ b/packages/editor/src/components/provider/disable-non-page-content-blocks.js
@@ -1,55 +1,69 @@
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
-import {
-	useBlockEditingMode,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
+import { useSelect, useRegistry } from '@wordpress/data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 import { useEffect } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import { PAGE_CONTENT_BLOCK_TYPES } from './constants';
-
-function DisableBlock( { clientId } ) {
-	const isDescendentOfQueryLoop = useSelect(
-		( select ) => {
-			const { getBlockParentsByBlockName } = select( blockEditorStore );
-			return (
-				getBlockParentsByBlockName( clientId, 'core/query' ).length !==
-				0
-			);
-		},
-		[ clientId ]
-	);
-	const mode = isDescendentOfQueryLoop ? undefined : 'contentOnly';
-	const { setBlockEditingMode, unsetBlockEditingMode } =
-		useDispatch( blockEditorStore );
-	useEffect( () => {
-		if ( mode ) {
-			setBlockEditingMode( clientId, mode );
-			return () => {
-				unsetBlockEditingMode( clientId );
-			};
-		}
-	}, [ clientId, mode, setBlockEditingMode, unsetBlockEditingMode ] );
-}
+import usePostContentBlocks from './use-post-content-blocks';
 
 /**
  * Component that when rendered, makes it so that the site editor allows only
  * page content to be edited.
  */
 export default function DisableNonPageContentBlocks() {
-	useBlockEditingMode( 'disabled' );
-	const clientIds = useSelect( ( select ) => {
-		const { __experimentalGetGlobalBlocksByName } =
-			select( blockEditorStore );
-		return __experimentalGetGlobalBlocksByName( PAGE_CONTENT_BLOCK_TYPES );
+	const contentOnlyIds = usePostContentBlocks();
+	const templateParts = useSelect( ( select ) => {
+		const { getBlocksByName } = select( blockEditorStore );
+		return getBlocksByName( 'core/template-part' );
 	}, [] );
+	const disabledIds = useSelect(
+		( select ) => {
+			const { getBlockOrder } = select( blockEditorStore );
+			return templateParts.flatMap( ( clientId ) =>
+				getBlockOrder( clientId )
+			);
+		},
+		[ templateParts ]
+	);
+
+	const registry = useRegistry();
+
+	useEffect( () => {
+		const { setBlockEditingMode, unsetBlockEditingMode } =
+			registry.dispatch( blockEditorStore );
+
+		registry.batch( () => {
+			setBlockEditingMode( '', 'disabled' );
+			for ( const clientId of contentOnlyIds ) {
+				setBlockEditingMode( clientId, 'contentOnly' );
+			}
+			for ( const clientId of templateParts ) {
+				setBlockEditingMode( clientId, 'contentOnly' );
+			}
+			for ( const clientId of disabledIds ) {
+				setBlockEditingMode( clientId, 'disabled' );
+			}
+		} );
+
+		return () => {
+			registry.batch( () => {
+				unsetBlockEditingMode( '' );
+				for ( const clientId of contentOnlyIds ) {
+					unsetBlockEditingMode( clientId );
+				}
+				for ( const clientId of templateParts ) {
+					unsetBlockEditingMode( clientId );
+				}
+				for ( const clientId of disabledIds ) {
+					unsetBlockEditingMode( clientId );
+				}
+			} );
+		};
+	}, [ templateParts, contentOnlyIds, disabledIds, registry ] );
 
-	return clientIds.map( ( clientId ) => {
-		return <DisableBlock key={ clientId } clientId={ clientId } />;
-	} );
+	return null;
 }
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
index 3bd5860501d4e0..50d02610062c00 100644
--- a/packages/editor/src/components/provider/index.js
+++ b/packages/editor/src/components/provider/index.js
@@ -4,12 +4,15 @@
 import { useEffect, useLayoutEffect, useMemo } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
-import { EntityProvider, useEntityBlockEditor } from '@wordpress/core-data';
+import {
+	EntityProvider,
+	useEntityBlockEditor,
+	store as coreStore,
+} from '@wordpress/core-data';
 import {
 	BlockEditorProvider,
 	BlockContextProvider,
 	privateApis as blockEditorPrivateApis,
-	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { store as noticesStore } from '@wordpress/notices';
 import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';
@@ -23,6 +26,18 @@ import { store as editorStore } from '../../store';
 import useBlockEditorSettings from './use-block-editor-settings';
 import { unlock } from '../../lock-unlock';
 import DisableNonPageContentBlocks from './disable-non-page-content-blocks';
+import NavigationBlockEditingMode from './navigation-block-editing-mode';
+import { useHideBlocksFromInserter } from './use-hide-blocks-from-inserter';
+import useCommands from '../commands';
+import BlockRemovalWarnings from '../block-removal-warnings';
+import StartPageOptions from '../start-page-options';
+import KeyboardShortcutHelpModal from '../keyboard-shortcut-help-modal';
+import ContentOnlySettingsMenu from '../block-settings-menu/content-only-settings-menu';
+import StartTemplateOptions from '../start-template-options';
+import EditorKeyboardShortcuts from '../global-keyboard-shortcuts';
+import PatternRenameModal from '../pattern-rename-modal';
+import PatternDuplicateModal from '../pattern-duplicate-modal';
+import TemplatePartMenuItems from '../template-part-menu-items';
 
 const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
 const { PatternsMenuItems } = unlock( editPatternsPrivateApis );
@@ -30,34 +45,16 @@ const { PatternsMenuItems } = unlock( editPatternsPrivateApis );
 const noop = () => {};
 
 /**
- * For the Navigation block editor, we need to force the block editor to contentOnly for that block.
- *
- * Set block editing mode to contentOnly when entering Navigation focus mode.
- * this ensures that non-content controls on the block will be hidden and thus
- * the user can focus on editing the Navigation Menu content only.
- *
- * @param {string} navigationBlockClientId ClientId.
+ * These are global entities that are only there to split blocks into logical units
+ * They don't provide a "context" for the current post/page being rendered.
+ * So we should not use their ids as post context. This is important to allow post blocks
+ * (post content, post title) to be used within them without issues.
  */
-function useForceFocusModeForNavigation( navigationBlockClientId ) {
-	const { setBlockEditingMode, unsetBlockEditingMode } =
-		useDispatch( blockEditorStore );
-
-	useEffect( () => {
-		if ( ! navigationBlockClientId ) {
-			return;
-		}
-
-		setBlockEditingMode( navigationBlockClientId, 'contentOnly' );
-
-		return () => {
-			unsetBlockEditingMode( navigationBlockClientId );
-		};
-	}, [
-		navigationBlockClientId,
-		unsetBlockEditingMode,
-		setBlockEditingMode,
-	] );
-}
+const NON_CONTEXTUAL_POST_TYPES = [
+	'wp_block',
+	'wp_navigation',
+	'wp_template_part',
+];
 
 /**
  * Depending on the post, template and template mode,
@@ -66,6 +63,12 @@ function useForceFocusModeForNavigation( navigationBlockClientId ) {
  * @param {Array}   post     Block list.
  * @param {boolean} template Whether the page content has focus (and the surrounding template is inert). If `true` return page content blocks. Default `false`.
  * @param {string}  mode     Rendering mode.
+ *
+ * @example
+ * ```jsx
+ * const [ blocks, onInput, onChange ] = useBlockEditorProps( post, template, mode );
+ * ```
+ *
  * @return {Array} Block editor props.
  */
 function useBlockEditorProps( post, template, mode ) {
@@ -114,9 +117,6 @@ function useBlockEditorProps( post, template, mode ) {
 	const disableRootLevelChanges =
 		( !! template && mode === 'template-locked' ) ||
 		post.type === 'wp_navigation';
-	const navigationBlockClientId =
-		post.type === 'wp_navigation' && blocks && blocks[ 0 ]?.clientId;
-	useForceFocusModeForNavigation( navigationBlockClientId );
 	if ( disableRootLevelChanges ) {
 		return [ blocks, noop, noop ];
 	}
@@ -128,6 +128,32 @@ function useBlockEditorProps( post, template, mode ) {
 	];
 }
 
+/**
+ * This component provides the editor context and manages the state of the block editor.
+ *
+ * @param {Object}  props                                The component props.
+ * @param {Object}  props.post                           The post object.
+ * @param {Object}  props.settings                       The editor settings.
+ * @param {boolean} props.recovery                       Indicates if the editor is in recovery mode.
+ * @param {Array}   props.initialEdits                   The initial edits for the editor.
+ * @param {Object}  props.children                       The child components.
+ * @param {Object}  [props.BlockEditorProviderComponent] The block editor provider component to use. Defaults to ExperimentalBlockEditorProvider.
+ * @param {Object}  [props.__unstableTemplate]           The template object.
+ *
+ * @example
+ * ```jsx
+ * <ExperimentalEditorProvider
+ *   post={ post }
+ *   settings={ settings }
+ *   recovery={ recovery }
+ *   initialEdits={ initialEdits }
+ *   __unstableTemplate={ template }
+ * >
+ *   { children }
+ * </ExperimentalEditorProvider>
+ *
+ * @return {Object} The rendered ExperimentalEditorProvider component.
+ */
 export const ExperimentalEditorProvider = withRegistryProvider(
 	( {
 		post,
@@ -138,18 +164,59 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 		BlockEditorProviderComponent = ExperimentalBlockEditorProvider,
 		__unstableTemplate: template,
 	} ) => {
-		const mode = useSelect(
-			( select ) => select( editorStore ).getRenderingMode(),
-			[]
-		);
+		const { editorSettings, selection, isReady, mode, postTypeEntities } =
+			useSelect(
+				( select ) => {
+					const {
+						getEditorSettings,
+						getEditorSelection,
+						getRenderingMode,
+						__unstableIsEditorReady,
+					} = select( editorStore );
+					const { getEntitiesConfig } = select( coreStore );
+
+					return {
+						editorSettings: getEditorSettings(),
+						isReady: __unstableIsEditorReady(),
+						mode: getRenderingMode(),
+						selection: getEditorSelection(),
+						postTypeEntities:
+							post.type === 'wp_template'
+								? getEntitiesConfig( 'postType' )
+								: null,
+					};
+				},
+				[ post.type ]
+			);
 		const shouldRenderTemplate = !! template && mode !== 'post-only';
 		const rootLevelPost = shouldRenderTemplate ? template : post;
 		const defaultBlockContext = useMemo( () => {
-			const postContext =
-				rootLevelPost.type !== 'wp_template' ||
-				( shouldRenderTemplate && mode !== 'template-only' )
-					? { postId: post.id, postType: post.type }
-					: {};
+			const postContext = {};
+			// If it is a template, try to inherit the post type from the name.
+			if ( post.type === 'wp_template' ) {
+				if ( post.slug === 'page' ) {
+					postContext.postType = 'page';
+				} else if ( post.slug === 'single' ) {
+					postContext.postType = 'post';
+				} else if ( post.slug.split( '-' )[ 0 ] === 'single' ) {
+					// If the slug is single-{postType}, infer the post type from the name.
+					const postTypeNames =
+						postTypeEntities?.map( ( entity ) => entity.name ) ||
+						[];
+					const match = post.slug.match(
+						`^single-(${ postTypeNames.join( '|' ) })(?:-.+)?$`
+					);
+					if ( match ) {
+						postContext.postType = match[ 1 ];
+					}
+				}
+			} else if (
+				! NON_CONTEXTUAL_POST_TYPES.includes( rootLevelPost.type ) ||
+				shouldRenderTemplate
+			) {
+				postContext.postId = post.id;
+				postContext.postType = post.type;
+			}
 
 			return {
 				...postContext,
@@ -159,33 +226,20 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 						: undefined,
 			};
 		}, [
-			mode,
+			shouldRenderTemplate,
 			post.id,
 			post.type,
+			post.slug,
 			rootLevelPost.type,
-			rootLevelPost?.slug,
-			shouldRenderTemplate,
+			rootLevelPost.slug,
+			postTypeEntities,
 		] );
-		const { editorSettings, selection, isReady } = useSelect(
-			( select ) => {
-				const {
-					getEditorSettings,
-					getEditorSelection,
-					__unstableIsEditorReady,
-				} = select( editorStore );
-				return {
-					editorSettings: getEditorSettings(),
-					isReady: __unstableIsEditorReady(),
-					selection: getEditorSelection(),
-				};
-			},
-			[]
-		);
 		const { id, type } = rootLevelPost;
 		const blockEditorSettings = useBlockEditorSettings(
 			editorSettings,
 			type,
-			id
+			id,
+			mode
 		);
 		const [ blocks, onInput, onChange ] = useBlockEditorProps(
 			post,
@@ -197,12 +251,12 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 			updatePostLock,
 			setupEditor,
 			updateEditorSettings,
-			__experimentalTearDownEditor,
 			setCurrentTemplateId,
+			setEditedPost,
+			setRenderingMode,
 		} = unlock( useDispatch( editorStore ) );
 		const { createWarningNotice } = useDispatch( noticesStore );
 
-		// Initialize and tear down the editor.
 		// Ideally this should be synced on each change and not just something you do once.
 		useLayoutEffect( () => {
 			// Assume that we don't need to initialize in the case of an error recovery.
@@ -228,21 +282,33 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 					}
 				);
 			}
-
-			return () => {
-				__experimentalTearDownEditor();
-			};
 		}, [] );
 
+		// Synchronizes the active post with the state
+		useEffect( () => {
+			setEditedPost( post.type, post.id );
+		}, [ post.type, post.id, setEditedPost ] );
+
 		// Synchronize the editor settings as they change.
 		useEffect( () => {
 			updateEditorSettings( settings );
 		}, [ settings, updateEditorSettings ] );
 
+		// Synchronizes the active template with the state.
 		useEffect( () => {
 			setCurrentTemplateId( template?.id );
 		}, [ template?.id, setCurrentTemplateId ] );
 
+		// Sets the right rendering mode when loading the editor.
+		useEffect( () => {
+			setRenderingMode( settings.defaultRenderingMode ?? 'post-only' );
+		}, [ settings.defaultRenderingMode, setRenderingMode ] );
+
+		useHideBlocksFromInserter( post.type, mode );
+
+		// Register the editor commands.
+		useCommands();
+
 		if ( ! isReady ) {
 			return null;
 		}
@@ -264,9 +330,25 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 							useSubRegistry={ false }
 						>
 							{ children }
-							<PatternsMenuItems />
-							{ mode === 'template-locked' && (
-								<DisableNonPageContentBlocks />
+							{ ! settings.isPreviewMode && (
+								<>
+									<PatternsMenuItems />
+									<TemplatePartMenuItems />
+									<ContentOnlySettingsMenu />
+									{ mode === 'template-locked' && (
+										<DisableNonPageContentBlocks />
+									) }
+									{ type === 'wp_navigation' && (
+										<NavigationBlockEditingMode />
+									) }
+									<EditorKeyboardShortcuts />
+									<KeyboardShortcutHelpModal />
+									<BlockRemovalWarnings />
+									<StartPageOptions />
+									<StartTemplateOptions />
+									<PatternRenameModal />
+									<PatternDuplicateModal />
+								</>
 							) }
 						</BlockEditorProviderComponent>
 					</BlockContextProvider>
@@ -276,6 +358,36 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 	}
 );
 
+/**
+ * This component establishes a new post editing context, and serves as the entry point for a new post editor (or post with template editor).
+ *
+ * It supports a large number of post types, including post, page, templates,
+ * custom post types, patterns, template parts.
+ *
+ * All modification and changes are performed to the `@wordpress/core-data` store.
+ *
+ * @param {Object}  props                      The component props.
+ * @param {Object}  [props.post]               The post object to edit. This is required.
+ * @param {Object}  [props.__unstableTemplate] The template object wrapper the edited post.
+ *                                             This is optional and can only be used when the post type supports templates (like posts and pages).
+ * @param {Object}  [props.settings]           The settings object to use for the editor.
+ *                                             This is optional and can be used to override the default settings.
+ * @param {Element} [props.children]           Children elements for which the BlockEditorProvider context should apply.
+ *                                             This is optional.
+ *
+ * @example
+ * ```jsx
+ * <EditorProvider
+ *   post={ post }
+ *   settings={ settings }
+ *   __unstableTemplate={ template }
+ * >
+ *   { children }
+ * </EditorProvider>
+ * ```
+ *
+ * @return {JSX.Element} The rendered EditorProvider component.
+ */
 export function EditorProvider( props ) {
 	return (
 		<ExperimentalEditorProvider
diff --git a/packages/editor/src/components/provider/index.native.js b/packages/editor/src/components/provider/index.native.js
index 5fd6a4cdbb888b..bac824ab86ad24 100644
--- a/packages/editor/src/components/provider/index.native.js
+++ b/packages/editor/src/components/provider/index.native.js
@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import { BackHandler } from 'react-native';
 import memize from 'memize';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 
@@ -20,6 +21,7 @@ import RNReactNativeGutenbergBridge, {
 	subscribeUpdateCapabilities,
 	subscribeShowNotice,
 	subscribeShowEditorHelp,
+	subscribeToContentUpdate,
 } from '@wordpress/react-native-bridge';
 import { Component } from '@wordpress/element';
 import { count as wordCount } from '@wordpress/wordcount';
@@ -27,14 +29,20 @@ import {
 	parse,
 	serialize,
 	getUnregisteredTypeHandlerName,
+	getBlockType,
 	createBlock,
+	pasteHandler,
 } from '@wordpress/blocks';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
 import { applyFilters } from '@wordpress/hooks';
-import { store as blockEditorStore } from '@wordpress/block-editor';
-import { getGlobalStyles, getColorsAndGradients } from '@wordpress/components';
+import {
+	store as blockEditorStore,
+	getGlobalStyles,
+	getColorsAndGradients,
+} from '@wordpress/block-editor';
 import { NEW_BLOCK_TYPES } from '@wordpress/block-library';
+import { __ } from '@wordpress/i18n';
 
 const postTypeEntities = [
 	{ name: 'post', baseURL: '/wp/v2/posts' },
@@ -56,13 +64,12 @@ const postTypeEntities = [
 import { EditorHelpTopics, store as editorStore } from '@wordpress/editor';
 import { store as noticesStore } from '@wordpress/notices';
 import { store as coreStore } from '@wordpress/core-data';
-// eslint-disable-next-line no-restricted-imports
-import { store as editPostStore } from '@wordpress/edit-post';
 
 /**
  * Internal dependencies
  */
 import EditorProvider from './index.js';
+import { insertContentWithTitle } from '../post-title';
 
 class NativeEditorProvider extends Component {
 	constructor() {
@@ -77,6 +84,9 @@ class NativeEditorProvider extends Component {
 			this.post
 		);
 
+		this.onHardwareBackPress = this.onHardwareBackPress.bind( this );
+		this.onContentUpdate = this.onContentUpdate.bind( this );
+
 		this.getEditorSettings = memize(
 			( settings, capabilities ) => ( {
 				...settings,
@@ -94,6 +104,7 @@ class NativeEditorProvider extends Component {
 	componentDidMount() {
 		const {
 			capabilities,
+			createErrorNotice,
 			locale,
 			hostAppNamespace,
 			updateEditorSettings,
@@ -136,32 +147,33 @@ class NativeEditorProvider extends Component {
 		this.subscriptionParentMediaAppend = subscribeMediaAppend(
 			( payload ) => {
 				const blockName = 'core/' + payload.mediaType;
-				const newBlock = createBlock( blockName, {
-					id: payload.mediaId,
-					[ payload.mediaType === 'image' ? 'url' : 'src' ]:
-						payload.mediaUrl,
-				} );
-
-				const indexAfterSelected = this.props.selectedBlockIndex + 1;
-				const insertionIndex =
-					indexAfterSelected || this.props.blockCount;
-
-				this.props.insertBlock( newBlock, insertionIndex );
+				const blockType = getBlockType( blockName );
+
+				if ( blockType && blockType?.name ) {
+					const newBlock = createBlock( blockType.name, {
+						id: payload.mediaId,
+						[ payload.mediaType === 'image' ? 'url' : 'src' ]:
+							payload.mediaUrl,
+					} );
+
+					const indexAfterSelected =
+						this.props.selectedBlockIndex + 1;
+					const insertionIndex =
+						indexAfterSelected || this.props.blockCount;
+
+					this.props.insertBlock( newBlock, insertionIndex );
+				} else {
+					createErrorNotice(
+						__( 'File type not supported as a media file.' )
+					);
+				}
 			}
 		);
 
 		this.subscriptionParentUpdateEditorSettings =
-			subscribeUpdateEditorSettings(
-				( { galleryWithImageBlocks, ...editorSettings } ) => {
-					if ( typeof galleryWithImageBlocks === 'boolean' ) {
-						window.wp.galleryBlockV2Enabled =
-							galleryWithImageBlocks;
-					}
-					updateEditorSettings(
-						this.getThemeColors( editorSettings )
-					);
-				}
-			);
+			subscribeUpdateEditorSettings( ( { ...editorSettings } ) => {
+				updateEditorSettings( this.getThemeColors( editorSettings ) );
+			} );
 
 		this.subscriptionParentUpdateCapabilities = subscribeUpdateCapabilities(
 			( payload ) => {
@@ -179,6 +191,17 @@ class NativeEditorProvider extends Component {
 			this.setState( { isHelpVisible: true } );
 		} );
 
+		this.hardwareBackPressListener = BackHandler.addEventListener(
+			'hardwareBackPress',
+			this.onHardwareBackPress
+		);
+
+		this.subscriptionOnContentUpdate = subscribeToContentUpdate(
+			( data ) => {
+				this.onContentUpdate( data );
+			}
+		);
+
 		// Request current block impressions from native app.
 		requestBlockTypeImpressions( ( storedImpressions ) => {
 			const impressions = { ...NEW_BLOCK_TYPES, ...storedImpressions };
@@ -238,6 +261,14 @@ class NativeEditorProvider extends Component {
 		if ( this.subscriptionParentShowEditorHelp ) {
 			this.subscriptionParentShowEditorHelp.remove();
 		}
+
+		if ( this.hardwareBackPressListener ) {
+			this.hardwareBackPressListener.remove();
+		}
+
+		if ( this.subscriptionOnContentUpdate ) {
+			this.subscriptionOnContentUpdate.remove();
+		}
 	}
 
 	getThemeColors( { rawStyles, rawFeatures } ) {
@@ -268,6 +299,31 @@ class NativeEditorProvider extends Component {
 		}
 	}
 
+	onHardwareBackPress() {
+		const { clearSelectedBlock, selectedBlockIndex } = this.props;
+
+		if ( selectedBlockIndex !== -1 ) {
+			clearSelectedBlock();
+			return true;
+		}
+		return false;
+	}
+
+	onContentUpdate( { content: rawContent } ) {
+		const {
+			editTitle,
+			onClearPostTitleSelection,
+			onInsertBlockAfter: onInsertBlocks,
+			title,
+		} = this.props;
+		const content = pasteHandler( {
+			plainText: rawContent,
+		} );
+
+		insertContentWithTitle( title, content, editTitle, onInsertBlocks );
+		onClearPostTitleSelection();
+	}
+
 	serializeToNativeAction() {
 		const title = this.props.title;
 		let html;
@@ -358,8 +414,8 @@ const ComposedNativeProvider = compose( [
 			getEditedPostAttribute,
 			getEditedPostContent,
 			getEditorSettings,
+			getEditorMode,
 		} = select( editorStore );
-		const { getEditorMode } = select( editPostStore );
 
 		const { getBlockIndex, getSelectedBlockClientId, getGlobalBlockCount } =
 			select( blockEditorStore );
@@ -383,20 +439,33 @@ const ComposedNativeProvider = compose( [
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
-		const { editPost, resetEditorBlocks, updateEditorSettings } =
-			dispatch( editorStore );
-		const { updateSettings, insertBlock, replaceBlock } =
-			dispatch( blockEditorStore );
-		const { switchEditorMode } = dispatch( editPostStore );
+		const {
+			editPost,
+			resetEditorBlocks,
+			updateEditorSettings,
+			switchEditorMode,
+			togglePostTitleSelection,
+		} = dispatch( editorStore );
+		const {
+			clearSelectedBlock,
+			updateSettings,
+			insertBlock,
+			insertBlocks,
+			replaceBlock,
+		} = dispatch( blockEditorStore );
 		const { addEntities, receiveEntityRecords } = dispatch( coreStore );
-		const { createSuccessNotice } = dispatch( noticesStore );
+		const { createSuccessNotice, createErrorNotice } =
+			dispatch( noticesStore );
 
 		return {
 			updateBlockEditorSettings: updateSettings,
 			updateEditorSettings,
 			addEntities,
 			insertBlock,
+			insertBlocks,
 			createSuccessNotice,
+			createErrorNotice,
+			clearSelectedBlock,
 			editTitle( title ) {
 				editPost( { title } );
 			},
@@ -409,6 +478,12 @@ const ComposedNativeProvider = compose( [
 			switchMode( mode ) {
 				switchEditorMode( mode );
 			},
+			onInsertBlockAfter( blocks ) {
+				insertBlocks( blocks, undefined, undefined, false );
+			},
+			onClearPostTitleSelection() {
+				togglePostTitleSelection( false );
+			},
 			replaceBlock,
 		};
 	} ),
diff --git a/packages/editor/src/components/provider/navigation-block-editing-mode.js b/packages/editor/src/components/provider/navigation-block-editing-mode.js
new file mode 100644
index 00000000000000..f45de7c149d826
--- /dev/null
+++ b/packages/editor/src/components/provider/navigation-block-editing-mode.js
@@ -0,0 +1,37 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+/**
+ * For the Navigation block editor, we need to force the block editor to contentOnly for that block.
+ *
+ * Set block editing mode to contentOnly when entering Navigation focus mode.
+ * this ensures that non-content controls on the block will be hidden and thus
+ * the user can focus on editing the Navigation Menu content only.
+ */
+
+export default function NavigationBlockEditingMode() {
+	// In the navigation block editor,
+	// the navigation block is the only root block.
+	const blockClientId = useSelect(
+		( select ) => select( blockEditorStore ).getBlockOrder()?.[ 0 ],
+		[]
+	);
+	const { setBlockEditingMode, unsetBlockEditingMode } =
+		useDispatch( blockEditorStore );
+
+	useEffect( () => {
+		if ( ! blockClientId ) {
+			return;
+		}
+
+		setBlockEditingMode( blockClientId, 'contentOnly' );
+
+		return () => {
+			unsetBlockEditingMode( blockClientId );
+		};
+	}, [ blockClientId, unsetBlockEditingMode, setBlockEditingMode ] );
+}
diff --git a/packages/editor/src/components/provider/use-auto-switch-editor-sidebars.js b/packages/editor/src/components/provider/use-auto-switch-editor-sidebars.js
new file mode 100644
index 00000000000000..5c3d2717ede1cb
--- /dev/null
+++ b/packages/editor/src/components/provider/use-auto-switch-editor-sidebars.js
@@ -0,0 +1,49 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useEffect } from '@wordpress/element';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * This listener hook monitors for block selection and triggers the appropriate
+ * sidebar state.
+ */
+function useAutoSwitchEditorSidebars() {
+	const { hasBlockSelection } = useSelect( ( select ) => {
+		return {
+			hasBlockSelection:
+				!! select( blockEditorStore ).getBlockSelectionStart(),
+		};
+	}, [] );
+
+	const { getActiveComplementaryArea } = useSelect( interfaceStore );
+	const { enableComplementaryArea } = useDispatch( interfaceStore );
+	const { get: getPreference } = useSelect( preferencesStore );
+
+	useEffect( () => {
+		const activeGeneralSidebar = getActiveComplementaryArea( 'core' );
+		const isEditorSidebarOpened = [
+			'edit-post/document',
+			'edit-post/block',
+		].includes( activeGeneralSidebar );
+		const isDistractionFree = getPreference( 'core', 'distractionFree' );
+		if ( ! isEditorSidebarOpened || isDistractionFree ) {
+			return;
+		}
+		if ( hasBlockSelection ) {
+			enableComplementaryArea( 'core', 'edit-post/block' );
+		} else {
+			enableComplementaryArea( 'core', 'edit-post/document' );
+		}
+	}, [
+		hasBlockSelection,
+		getActiveComplementaryArea,
+		enableComplementaryArea,
+		getPreference,
+	] );
+}
+
+export default useAutoSwitchEditorSidebars;
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index e2cbba7e6a7571..170ec96c107288 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Platform, useMemo, useCallback } from '@wordpress/element';
+import { useMemo, useCallback } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import {
 	store as coreStore,
@@ -9,6 +9,13 @@ import {
 	__experimentalFetchUrlData as fetchUrlData,
 } from '@wordpress/core-data';
 import { __ } from '@wordpress/i18n';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { useViewportMatch } from '@wordpress/compose';
+import { store as blocksStore } from '@wordpress/blocks';
+import {
+	privateApis,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -16,23 +23,36 @@ import { __ } from '@wordpress/i18n';
 import inserterMediaCategories from '../media-categories';
 import { mediaUpload } from '../../utils';
 import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+import { useGlobalStylesContext } from '../global-styles-provider';
+
+const EMPTY_OBJECT = {};
 
-const EMPTY_BLOCKS_LIST = [];
+function __experimentalReusableBlocksSelect( select ) {
+	const { getEntityRecords, hasFinishedResolution } = select( coreStore );
+	const reusableBlocks = getEntityRecords( 'postType', 'wp_block', {
+		per_page: -1,
+	} );
+	return hasFinishedResolution( 'getEntityRecords', [
+		'postType',
+		'wp_block',
+		{ per_page: -1 },
+	] )
+		? reusableBlocks
+		: undefined;
+}
 
 const BLOCK_EDITOR_SETTINGS = [
 	'__experimentalBlockDirectory',
 	'__experimentalDiscussionSettings',
 	'__experimentalFeatures',
 	'__experimentalGlobalStylesBaseStyles',
-	'__experimentalPreferredStyleVariations',
-	'__experimentalSetIsInserterOpened',
-	'__unstableGalleryWithImageBlocks',
 	'alignWide',
-	'allowedBlockTypes',
 	'blockInspectorTabs',
 	'allowedMimeTypes',
 	'bodyPlaceholder',
 	'canLockBlocks',
+	'canUpdateBlockBindings',
 	'capabilities',
 	'clearBlockSelection',
 	'codeEditingEnabled',
@@ -46,23 +66,18 @@ const BLOCK_EDITOR_SETTINGS = [
 	'enableCustomSpacing',
 	'enableCustomUnits',
 	'enableOpenverseMediaCategory',
-	'focusMode',
-	'distractionFree',
 	'fontSizes',
 	'gradients',
 	'generateAnchors',
-	'hasFixedToolbar',
-	'hasInlineToolbar',
-	'isDistractionFree',
+	'onNavigateToEntityRecord',
 	'imageDefaultSize',
 	'imageDimensions',
 	'imageEditing',
 	'imageSizes',
+	'isPreviewMode',
 	'isRTL',
-	'keepCaretInsideBlock',
 	'locale',
 	'maxWidth',
-	'onUpdateDefaultBlockStyles',
 	'postContentAttributes',
 	'postsPerPage',
 	'readOnly',
@@ -71,67 +86,119 @@ const BLOCK_EDITOR_SETTINGS = [
 	'supportsLayout',
 	'widgetTypesToHideFromLegacyWidgetBlock',
 	'__unstableHasCustomAppender',
-	'__unstableIsPreviewMode',
 	'__unstableResolvedAssets',
 	'__unstableIsBlockBasedTheme',
-	'__experimentalArchiveTitleTypeLabel',
-	'__experimentalArchiveTitleNameLabel',
 ];
 
+const {
+	globalStylesDataKey,
+	globalStylesLinksDataKey,
+	selectBlockPatternsKey,
+	reusableBlocksSelectKey,
+	sectionRootClientIdKey,
+} = unlock( privateApis );
+
 /**
  * React hook used to compute the block editor settings to use for the post editor.
  *
- * @param {Object} settings EditorProvider settings prop.
- * @param {string} postType Editor root level post type.
- * @param {string} postId   Editor root level post ID.
+ * @param {Object} settings      EditorProvider settings prop.
+ * @param {string} postType      Editor root level post type.
+ * @param {string} postId        Editor root level post ID.
+ * @param {string} renderingMode Editor rendering mode.
  *
  * @return {Object} Block Editor Settings.
  */
-function useBlockEditorSettings( settings, postType, postId ) {
+function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
+	const isLargeViewport = useViewportMatch( 'medium' );
 	const {
-		reusableBlocks,
+		allowRightClickOverrides,
+		blockTypes,
+		focusMode,
+		hasFixedToolbar,
+		isDistractionFree,
+		keepCaretInsideBlock,
 		hasUploadPermissions,
+		hiddenBlockTypes,
 		canUseUnfilteredHTML,
 		userCanCreatePages,
 		pageOnFront,
 		pageForPosts,
 		userPatternCategories,
+		restBlockPatternCategories,
+		sectionRootClientId,
 	} = useSelect(
 		( select ) => {
-			const isWeb = Platform.OS === 'web';
 			const {
 				canUser,
 				getRawEntityRecord,
 				getEntityRecord,
 				getUserPatternCategories,
-				getEntityRecords,
+				getBlockPatternCategories,
 			} = select( coreStore );
-
-			const siteSettings = canUser( 'read', 'settings' )
+			const { get } = select( preferencesStore );
+			const { getBlockTypes } = select( blocksStore );
+			const { getBlocksByName, getBlockAttributes } =
+				select( blockEditorStore );
+			const siteSettings = canUser( 'read', {
+				kind: 'root',
+				name: 'site',
+			} )
 				? getEntityRecord( 'root', 'site' )
 				: undefined;
 
+			function getSectionRootBlock() {
+				if ( renderingMode === 'template-locked' ) {
+					return getBlocksByName( 'core/post-content' )?.[ 0 ] ?? '';
+				}
+
+				return (
+					getBlocksByName( 'core/group' ).find(
+						( clientId ) =>
+							getBlockAttributes( clientId )?.tagName === 'main'
+					) ?? ''
+				);
+			}
+
 			return {
+				allowRightClickOverrides: get(
+					'core',
+					'allowRightClickOverrides'
+				),
+				blockTypes: getBlockTypes(),
 				canUseUnfilteredHTML: getRawEntityRecord(
 					'postType',
 					postType,
 					postId
 				)?._links?.hasOwnProperty( 'wp:action-unfiltered-html' ),
-				reusableBlocks: isWeb
-					? getEntityRecords( 'postType', 'wp_block', {
-							per_page: -1,
-					  } )
-					: EMPTY_BLOCKS_LIST, // Reusable blocks are fetched in the native version of this hook.
-				hasUploadPermissions: canUser( 'create', 'media' ) ?? true,
-				userCanCreatePages: canUser( 'create', 'pages' ),
+				focusMode: get( 'core', 'focusMode' ),
+				hasFixedToolbar:
+					get( 'core', 'fixedToolbar' ) || ! isLargeViewport,
+				hiddenBlockTypes: get( 'core', 'hiddenBlockTypes' ),
+				isDistractionFree: get( 'core', 'distractionFree' ),
+				keepCaretInsideBlock: get( 'core', 'keepCaretInsideBlock' ),
+				hasUploadPermissions:
+					canUser( 'create', {
+						kind: 'root',
+						name: 'media',
+					} ) ?? true,
+				userCanCreatePages: canUser( 'create', {
+					kind: 'postType',
+					name: 'page',
+				} ),
 				pageOnFront: siteSettings?.page_on_front,
 				pageForPosts: siteSettings?.page_for_posts,
 				userPatternCategories: getUserPatternCategories(),
+				restBlockPatternCategories: getBlockPatternCategories(),
+				sectionRootClientId: getSectionRootBlock(),
 			};
 		},
-		[ postType, postId ]
+		[ postType, postId, isLargeViewport, renderingMode ]
 	);
 
+	const { merged: mergedGlobalStyles } = useGlobalStylesContext();
+	const globalStylesData = mergedGlobalStyles.styles ?? EMPTY_OBJECT;
+	const globalStylesLinksData = mergedGlobalStyles._links ?? EMPTY_OBJECT;
+
 	const settingsBlockPatterns =
 		settings.__experimentalAdditionalBlockPatterns ?? // WP 6.0
 		settings.__experimentalBlockPatterns; // WP 5.9
@@ -139,33 +206,18 @@ function useBlockEditorSettings( settings, postType, postId ) {
 		settings.__experimentalAdditionalBlockPatternCategories ?? // WP 6.0
 		settings.__experimentalBlockPatternCategories; // WP 5.9
 
-	const { restBlockPatterns, restBlockPatternCategories } = useSelect(
-		( select ) => ( {
-			restBlockPatterns: select( coreStore ).getBlockPatterns(),
-			restBlockPatternCategories:
-				select( coreStore ).getBlockPatternCategories(),
-		} ),
-		[]
-	);
-
 	const blockPatterns = useMemo(
 		() =>
-			[
-				...( settingsBlockPatterns || [] ),
-				...( restBlockPatterns || [] ),
-			]
-				.filter(
-					( x, index, arr ) =>
-						index === arr.findIndex( ( y ) => x.name === y.name )
-				)
-				.filter( ( { postTypes } ) => {
+			[ ...( settingsBlockPatterns || [] ) ].filter(
+				( { postTypes } ) => {
 					return (
 						! postTypes ||
 						( Array.isArray( postTypes ) &&
 							postTypes.includes( postType ) )
 					);
-				} ),
-		[ settingsBlockPatterns, restBlockPatterns, postType ]
+				}
+			),
+		[ settingsBlockPatterns, postType ]
 	);
 
 	const blockPatternCategories = useMemo(
@@ -180,7 +232,7 @@ function useBlockEditorSettings( settings, postType, postId ) {
 		[ settingsBlockPatternCategories, restBlockPatternCategories ]
 	);
 
-	const { undo } = useDispatch( editorStore );
+	const { undo, setIsInserterOpened } = useDispatch( editorStore );
 
 	const { saveEntityRecord } = useDispatch( coreStore );
 
@@ -205,16 +257,53 @@ function useBlockEditorSettings( settings, postType, postId ) {
 		[ saveEntityRecord, userCanCreatePages ]
 	);
 
-	return useMemo(
-		() => ( {
+	const allowedBlockTypes = useMemo( () => {
+		// Omit hidden block types if exists and non-empty.
+		if ( hiddenBlockTypes && hiddenBlockTypes.length > 0 ) {
+			// Defer to passed setting for `allowedBlockTypes` if provided as
+			// anything other than `true` (where `true` is equivalent to allow
+			// all block types).
+			const defaultAllowedBlockTypes =
+				true === settings.allowedBlockTypes
+					? blockTypes.map( ( { name } ) => name )
+					: settings.allowedBlockTypes || [];
+
+			return defaultAllowedBlockTypes.filter(
+				( type ) => ! hiddenBlockTypes.includes( type )
+			);
+		}
+
+		return settings.allowedBlockTypes;
+	}, [ settings.allowedBlockTypes, hiddenBlockTypes, blockTypes ] );
+
+	const forceDisableFocusMode = settings.focusMode === false;
+
+	return useMemo( () => {
+		const blockEditorSettings = {
 			...Object.fromEntries(
 				Object.entries( settings ).filter( ( [ key ] ) =>
 					BLOCK_EDITOR_SETTINGS.includes( key )
 				)
 			),
+			[ globalStylesDataKey ]: globalStylesData,
+			[ globalStylesLinksDataKey ]: globalStylesLinksData,
+			allowedBlockTypes,
+			allowRightClickOverrides,
+			focusMode: focusMode && ! forceDisableFocusMode,
+			hasFixedToolbar,
+			isDistractionFree,
+			keepCaretInsideBlock,
 			mediaUpload: hasUploadPermissions ? mediaUpload : undefined,
-			__experimentalReusableBlocks: reusableBlocks,
 			__experimentalBlockPatterns: blockPatterns,
+			[ selectBlockPatternsKey ]: ( select ) => {
+				const { hasFinishedResolution, getBlockPatternsForPostType } =
+					unlock( select( coreStore ) );
+				const patterns = getBlockPatternsForPostType( postType );
+				return hasFinishedResolution( 'getBlockPatterns' )
+					? patterns
+					: undefined;
+			},
+			[ reusableBlocksSelectKey ]: __experimentalReusableBlocksSelect,
 			__experimentalBlockPatternCategories: blockPatternCategories,
 			__experimentalUserPatternCategories: userPatternCategories,
 			__experimentalFetchLinkSuggestions: ( search, searchOptions ) =>
@@ -228,7 +317,7 @@ function useBlockEditorSettings( settings, postType, postId ) {
 			__experimentalUndo: undo,
 			// Check whether we want all site editor frames to have outlines
 			// including the navigation / pattern / parts editors.
-			outlineMode: postType === 'wp_template',
+			outlineMode: ! isDistractionFree && postType === 'wp_template',
 			// Check these two properties: they were not present in the site editor.
 			__experimentalCreatePageEntity: createPageEntity,
 			__experimentalUserCanCreatePages: userCanCreatePages,
@@ -241,23 +330,36 @@ function useBlockEditorSettings( settings, postType, postId ) {
 				postType === 'wp_navigation'
 					? [ [ 'core/navigation', {}, [] ] ]
 					: settings.template,
-		} ),
-		[
-			settings,
-			hasUploadPermissions,
-			reusableBlocks,
-			userPatternCategories,
-			blockPatterns,
-			blockPatternCategories,
-			canUseUnfilteredHTML,
-			undo,
-			createPageEntity,
-			userCanCreatePages,
-			pageOnFront,
-			pageForPosts,
-			postType,
-		]
-	);
+			__experimentalSetIsInserterOpened: setIsInserterOpened,
+			[ sectionRootClientIdKey ]: sectionRootClientId,
+		};
+
+		return blockEditorSettings;
+	}, [
+		allowedBlockTypes,
+		allowRightClickOverrides,
+		focusMode,
+		forceDisableFocusMode,
+		hasFixedToolbar,
+		isDistractionFree,
+		keepCaretInsideBlock,
+		settings,
+		hasUploadPermissions,
+		userPatternCategories,
+		blockPatterns,
+		blockPatternCategories,
+		canUseUnfilteredHTML,
+		undo,
+		createPageEntity,
+		userCanCreatePages,
+		pageOnFront,
+		pageForPosts,
+		postType,
+		setIsInserterOpened,
+		sectionRootClientId,
+		globalStylesData,
+		globalStylesLinksData,
+	] );
 }
 
 export default useBlockEditorSettings;
diff --git a/packages/editor/src/components/provider/use-hide-blocks-from-inserter.js b/packages/editor/src/components/provider/use-hide-blocks-from-inserter.js
new file mode 100644
index 00000000000000..4a1aaf18667462
--- /dev/null
+++ b/packages/editor/src/components/provider/use-hide-blocks-from-inserter.js
@@ -0,0 +1,83 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect } from '@wordpress/element';
+import { addFilter, removeFilter } from '@wordpress/hooks';
+
+// These post types are "structural" block lists.
+// We should be allowed to use
+// the post content and template parts blocks within them.
+const POST_TYPES_ALLOWING_POST_CONTENT_TEMPLATE_PART = [
+	'wp_block',
+	'wp_template',
+	'wp_template_part',
+];
+
+/**
+ * In some specific contexts,
+ * the template part and post content blocks need to be hidden.
+ *
+ * @param {string} postType Post Type
+ * @param {string} mode     Rendering mode
+ */
+export function useHideBlocksFromInserter( postType, mode ) {
+	useEffect( () => {
+		/*
+		 * Prevent adding template part in the editor.
+		 */
+		addFilter(
+			'blockEditor.__unstableCanInsertBlockType',
+			'removeTemplatePartsFromInserter',
+			( canInsert, blockType ) => {
+				if (
+					! POST_TYPES_ALLOWING_POST_CONTENT_TEMPLATE_PART.includes(
+						postType
+					) &&
+					blockType.name === 'core/template-part' &&
+					mode === 'post-only'
+				) {
+					return false;
+				}
+				return canInsert;
+			}
+		);
+
+		/*
+		 * Prevent adding post content block (except in query block) in the editor.
+		 */
+		addFilter(
+			'blockEditor.__unstableCanInsertBlockType',
+			'removePostContentFromInserter',
+			(
+				canInsert,
+				blockType,
+				rootClientId,
+				{ getBlockParentsByBlockName }
+			) => {
+				if (
+					! POST_TYPES_ALLOWING_POST_CONTENT_TEMPLATE_PART.includes(
+						postType
+					) &&
+					blockType.name === 'core/post-content'
+				) {
+					return (
+						getBlockParentsByBlockName( rootClientId, 'core/query' )
+							.length > 0
+					);
+				}
+				return canInsert;
+			}
+		);
+
+		return () => {
+			removeFilter(
+				'blockEditor.__unstableCanInsertBlockType',
+				'removeTemplatePartsFromInserter'
+			);
+			removeFilter(
+				'blockEditor.__unstableCanInsertBlockType',
+				'removePostContentFromInserter'
+			);
+		};
+	}, [ postType, mode ] );
+}
diff --git a/packages/editor/src/components/provider/use-post-content-blocks.js b/packages/editor/src/components/provider/use-post-content-blocks.js
new file mode 100644
index 00000000000000..bdd277157e47e0
--- /dev/null
+++ b/packages/editor/src/components/provider/use-post-content-blocks.js
@@ -0,0 +1,42 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+import { applyFilters } from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const POST_CONTENT_BLOCK_TYPES = [
+	'core/post-title',
+	'core/post-featured-image',
+	'core/post-content',
+];
+
+export default function usePostContentBlocks() {
+	const contentOnlyBlockTypes = useMemo(
+		() => [
+			...applyFilters(
+				'editor.postContentBlockTypes',
+				POST_CONTENT_BLOCK_TYPES
+			),
+		],
+		[]
+	);
+
+	// Note that there are two separate subscriptions because the result for each
+	// returns a new array.
+	const contentOnlyIds = useSelect(
+		( select ) => {
+			const { getPostBlocksByName } = unlock( select( editorStore ) );
+			return getPostBlocksByName( contentOnlyBlockTypes );
+		},
+		[ contentOnlyBlockTypes ]
+	);
+
+	return contentOnlyIds;
+}
diff --git a/packages/editor/src/components/provider/with-registry-provider.js b/packages/editor/src/components/provider/with-registry-provider.js
index d463c04f74d98e..cebbb766ff9429 100644
--- a/packages/editor/src/components/provider/with-registry-provider.js
+++ b/packages/editor/src/components/provider/with-registry-provider.js
@@ -1,12 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { useState, useEffect } from '@wordpress/element';
-import {
-	withRegistry,
-	createRegistry,
-	RegistryProvider,
-} from '@wordpress/data';
+import { useState } from '@wordpress/element';
+import { useRegistry, createRegistry, RegistryProvider } from '@wordpress/data';
 import { createHigherOrderComponent } from '@wordpress/compose';
 import { storeConfig as blockEditorStoreConfig } from '@wordpress/block-editor';
 
@@ -15,40 +11,46 @@ import { storeConfig as blockEditorStoreConfig } from '@wordpress/block-editor';
  */
 import { storeConfig } from '../../store';
 
+function getSubRegistry( subRegistries, registry, useSubRegistry ) {
+	if ( ! useSubRegistry ) {
+		return registry;
+	}
+	let subRegistry = subRegistries.get( registry );
+	if ( ! subRegistry ) {
+		subRegistry = createRegistry(
+			{
+				'core/block-editor': blockEditorStoreConfig,
+			},
+			registry
+		);
+		// Todo: The interface store should also be created per instance.
+		subRegistry.registerStore( 'core/editor', storeConfig );
+		subRegistries.set( registry, subRegistry );
+	}
+	return subRegistry;
+}
+
 const withRegistryProvider = createHigherOrderComponent(
 	( WrappedComponent ) =>
-		withRegistry( ( props ) => {
-			const {
-				useSubRegistry = true,
+		( { useSubRegistry = true, ...props } ) => {
+			const registry = useRegistry();
+			const [ subRegistries ] = useState( () => new WeakMap() );
+			const subRegistry = getSubRegistry(
+				subRegistries,
 				registry,
-				...additionalProps
-			} = props;
-			if ( ! useSubRegistry ) {
-				return <WrappedComponent { ...additionalProps } />;
-			}
-
-			const [ subRegistry, setSubRegistry ] = useState( null );
-			useEffect( () => {
-				const newRegistry = createRegistry(
-					{
-						'core/block-editor': blockEditorStoreConfig,
-					},
-					registry
-				);
-				newRegistry.registerStore( 'core/editor', storeConfig );
-				setSubRegistry( newRegistry );
-			}, [ registry ] );
+				useSubRegistry
+			);
 
-			if ( ! subRegistry ) {
-				return null;
+			if ( subRegistry === registry ) {
+				return <WrappedComponent registry={ registry } { ...props } />;
 			}
 
 			return (
 				<RegistryProvider value={ subRegistry }>
-					<WrappedComponent { ...additionalProps } />
+					<WrappedComponent registry={ subRegistry } { ...props } />
 				</RegistryProvider>
 			);
-		} ),
+		},
 	'withRegistryProvider'
 );
 
diff --git a/packages/editor/src/components/resizable-editor/index.js b/packages/editor/src/components/resizable-editor/index.js
new file mode 100644
index 00000000000000..7d8e26049389a7
--- /dev/null
+++ b/packages/editor/src/components/resizable-editor/index.js
@@ -0,0 +1,90 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import { useState, useRef, useCallback } from '@wordpress/element';
+import { ResizableBox } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import ResizeHandle from './resize-handle';
+
+// Removes the inline styles in the drag handles.
+const HANDLE_STYLES_OVERRIDE = {
+	position: undefined,
+	userSelect: undefined,
+	cursor: undefined,
+	width: undefined,
+	height: undefined,
+	top: undefined,
+	right: undefined,
+	bottom: undefined,
+	left: undefined,
+};
+
+function ResizableEditor( { className, enableResizing, height, children } ) {
+	const [ width, setWidth ] = useState( '100%' );
+	const resizableRef = useRef();
+	const resizeWidthBy = useCallback( ( deltaPixels ) => {
+		if ( resizableRef.current ) {
+			setWidth( resizableRef.current.offsetWidth + deltaPixels );
+		}
+	}, [] );
+	return (
+		<ResizableBox
+			className={ clsx( 'editor-resizable-editor', className, {
+				'is-resizable': enableResizing,
+			} ) }
+			ref={ ( api ) => {
+				resizableRef.current = api?.resizable;
+			} }
+			size={ {
+				width: enableResizing ? width : '100%',
+				height: enableResizing && height ? height : '100%',
+			} }
+			onResizeStop={ ( event, direction, element ) => {
+				setWidth( element.style.width );
+			} }
+			minWidth={ 300 }
+			maxWidth="100%"
+			maxHeight="100%"
+			enable={ {
+				left: enableResizing,
+				right: enableResizing,
+			} }
+			showHandle={ enableResizing }
+			// The editor is centered horizontally, resizing it only
+			// moves half the distance. Hence double the ratio to correctly
+			// align the cursor to the resizer handle.
+			resizeRatio={ 2 }
+			handleComponent={ {
+				left: (
+					<ResizeHandle
+						direction="left"
+						resizeWidthBy={ resizeWidthBy }
+					/>
+				),
+				right: (
+					<ResizeHandle
+						direction="right"
+						resizeWidthBy={ resizeWidthBy }
+					/>
+				),
+			} }
+			handleClasses={ undefined }
+			handleStyles={ {
+				left: HANDLE_STYLES_OVERRIDE,
+				right: HANDLE_STYLES_OVERRIDE,
+			} }
+		>
+			{ children }
+		</ResizableBox>
+	);
+}
+
+export default ResizableEditor;
diff --git a/packages/editor/src/components/resizable-editor/resize-handle.js b/packages/editor/src/components/resizable-editor/resize-handle.js
new file mode 100644
index 00000000000000..ccd903d0f3a172
--- /dev/null
+++ b/packages/editor/src/components/resizable-editor/resize-handle.js
@@ -0,0 +1,67 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { LEFT, RIGHT } from '@wordpress/keycodes';
+import {
+	VisuallyHidden,
+	Tooltip,
+	__unstableMotion as motion,
+} from '@wordpress/components';
+
+const DELTA_DISTANCE = 20; // The distance to resize per keydown in pixels.
+
+export default function ResizeHandle( { direction, resizeWidthBy } ) {
+	function handleKeyDown( event ) {
+		const { keyCode } = event;
+
+		if ( keyCode !== LEFT && keyCode !== RIGHT ) {
+			return;
+		}
+		event.preventDefault();
+
+		if (
+			( direction === 'left' && keyCode === LEFT ) ||
+			( direction === 'right' && keyCode === RIGHT )
+		) {
+			resizeWidthBy( DELTA_DISTANCE );
+		} else if (
+			( direction === 'left' && keyCode === RIGHT ) ||
+			( direction === 'right' && keyCode === LEFT )
+		) {
+			resizeWidthBy( -DELTA_DISTANCE );
+		}
+	}
+
+	const resizeHandleVariants = {
+		active: {
+			opacity: 1,
+			scaleY: 1.3,
+		},
+	};
+
+	const resizableHandleHelpId = `resizable-editor__resize-help-${ direction }`;
+
+	return (
+		<>
+			<Tooltip text={ __( 'Drag to resize' ) }>
+				<motion.button
+					className={ `editor-resizable-editor__resize-handle is-${ direction }` }
+					aria-label={ __( 'Drag to resize' ) }
+					aria-describedby={ resizableHandleHelpId }
+					onKeyDown={ handleKeyDown }
+					variants={ resizeHandleVariants }
+					whileFocus="active"
+					whileHover="active"
+					whileTap="active"
+					key="handle"
+					role="separator"
+					aria-orientation="vertical"
+				/>
+			</Tooltip>
+			<VisuallyHidden id={ resizableHandleHelpId }>
+				{ __( 'Use left and right arrow keys to resize the canvas.' ) }
+			</VisuallyHidden>
+		</>
+	);
+}
diff --git a/packages/editor/src/components/resizable-editor/style.scss b/packages/editor/src/components/resizable-editor/style.scss
new file mode 100644
index 00000000000000..364fdf39ad3155
--- /dev/null
+++ b/packages/editor/src/components/resizable-editor/style.scss
@@ -0,0 +1,53 @@
+// To hide the horizontal scrollbar and show the drag handle on the
+// left and right of the container.
+.editor-resizable-editor.is-resizable {
+	overflow: visible;
+	margin: 0 auto;
+}
+
+.editor-resizable-editor__resize-handle {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	padding: 0;
+	margin: auto 0;
+	width: $grid-unit-15;
+	appearance: none;
+	cursor: ew-resize;
+	outline: none;
+	background: none;
+	border-radius: $radius-full;
+	border: 0;
+	height: 100px;
+
+	&::after {
+		position: absolute;
+		top: $grid-unit-20;
+		left: $grid-unit-05;
+		right: 0;
+		bottom: $grid-unit-20;
+		content: "";
+		width: $grid-unit-05;
+		background-color: rgba($gray-700, 0.4);
+		border-radius: $radius-full;
+	}
+
+	&.is-left {
+		// Subtract half of the handle width to properly center.
+		left: -$grid-unit-20 - math.div($grid-unit-05, 2);
+	}
+
+	&.is-right {
+		// Subtract half of the handle width to properly center.
+		right: -$grid-unit-20 - math.div($grid-unit-05, 2);
+	}
+
+	&:hover,
+	&:focus,
+	&:active {
+		opacity: 1;
+		&::after {
+			background-color: var(--wp-admin-theme-color);
+		}
+	}
+}
diff --git a/packages/editor/src/components/save-publish-panels/index.js b/packages/editor/src/components/save-publish-panels/index.js
new file mode 100644
index 00000000000000..d95d9f35928906
--- /dev/null
+++ b/packages/editor/src/components/save-publish-panels/index.js
@@ -0,0 +1,111 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { Button, createSlotFill } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import EntitiesSavedStates from '../entities-saved-states';
+import PostPublishPanel from '../post-publish-panel';
+import PluginPrePublishPanel from '../plugin-pre-publish-panel';
+import PluginPostPublishPanel from '../plugin-post-publish-panel';
+import { store as editorStore } from '../../store';
+
+const { Fill, Slot } = createSlotFill( 'ActionsPanel' );
+
+export const ActionsPanelFill = Fill;
+
+export default function SavePublishPanels( {
+	setEntitiesSavedStatesCallback,
+	closeEntitiesSavedStates,
+	isEntitiesSavedStatesOpen,
+	forceIsDirtyPublishPanel,
+} ) {
+	const { closePublishSidebar, togglePublishSidebar } =
+		useDispatch( editorStore );
+	const {
+		publishSidebarOpened,
+		isPublishable,
+		isDirty,
+		hasOtherEntitiesChanges,
+	} = useSelect( ( select ) => {
+		const {
+			isPublishSidebarOpened,
+			isEditedPostPublishable,
+			isCurrentPostPublished,
+			isEditedPostDirty,
+			hasNonPostEntityChanges,
+		} = select( editorStore );
+		const _hasOtherEntitiesChanges = hasNonPostEntityChanges();
+		return {
+			publishSidebarOpened: isPublishSidebarOpened(),
+			isPublishable:
+				! isCurrentPostPublished() && isEditedPostPublishable(),
+			isDirty: _hasOtherEntitiesChanges || isEditedPostDirty(),
+			hasOtherEntitiesChanges: _hasOtherEntitiesChanges,
+		};
+	}, [] );
+
+	const openEntitiesSavedStates = useCallback(
+		() => setEntitiesSavedStatesCallback( true ),
+		[]
+	);
+
+	// It is ok for these components to be unmounted when not in visual use.
+	// We don't want more than one present at a time, decide which to render.
+	let unmountableContent;
+	if ( publishSidebarOpened ) {
+		unmountableContent = (
+			<PostPublishPanel
+				onClose={ closePublishSidebar }
+				forceIsDirty={ forceIsDirtyPublishPanel }
+				PrePublishExtension={ PluginPrePublishPanel.Slot }
+				PostPublishExtension={ PluginPostPublishPanel.Slot }
+			/>
+		);
+	} else if ( isPublishable && ! hasOtherEntitiesChanges ) {
+		unmountableContent = (
+			<div className="editor-layout__toggle-publish-panel">
+				<Button
+					__next40pxDefaultSize
+					variant="secondary"
+					onClick={ togglePublishSidebar }
+					aria-expanded={ false }
+				>
+					{ __( 'Open publish panel' ) }
+				</Button>
+			</div>
+		);
+	} else {
+		unmountableContent = (
+			<div className="editor-layout__toggle-entities-saved-states-panel">
+				<Button
+					__next40pxDefaultSize
+					variant="secondary"
+					onClick={ openEntitiesSavedStates }
+					aria-expanded={ false }
+					disabled={ ! isDirty }
+					accessibleWhenDisabled
+				>
+					{ __( 'Open save panel' ) }
+				</Button>
+			</div>
+		);
+	}
+
+	// Since EntitiesSavedStates controls its own panel, we can keep it
+	// always mounted to retain its own component state (such as checkboxes).
+	return (
+		<>
+			{ isEntitiesSavedStatesOpen && (
+				<EntitiesSavedStates close={ closeEntitiesSavedStates } />
+			) }
+			<Slot bubblesVirtually />
+			{ ! isEntitiesSavedStatesOpen && unmountableContent }
+		</>
+	);
+}
diff --git a/packages/editor/src/components/save-publish-panels/style.scss b/packages/editor/src/components/save-publish-panels/style.scss
new file mode 100644
index 00000000000000..1de6420a0a6837
--- /dev/null
+++ b/packages/editor/src/components/save-publish-panels/style.scss
@@ -0,0 +1,28 @@
+
+.editor-layout__toggle-publish-panel,
+.editor-layout__toggle-sidebar-panel,
+.editor-layout__toggle-entities-saved-states-panel {
+	z-index: z-index(".editor-layout__toggle-sidebar-panel");
+	position: fixed !important; // Necessary to override the default relative positioning.
+	top: -9999em;
+	bottom: auto;
+	left: auto;
+	right: 0;
+	box-sizing: border-box;
+	width: $sidebar-width;
+	background-color: $white;
+	border: $border-width dotted $gray-300;
+	height: auto !important; // Necessary to override the default sidebar positioning.
+	padding: $grid-unit-30;
+	display: flex;
+	justify-content: center;
+}
+
+.editor-layout__toggle-entities-saved-states-panel,
+.editor-layout__toggle-publish-panel {
+	.interface-interface-skeleton__actions:focus &,
+	.interface-interface-skeleton__actions:focus-within & {
+		top: auto;
+		bottom: 0;
+	}
+}
diff --git a/packages/editor/src/components/sidebar/constants.js b/packages/editor/src/components/sidebar/constants.js
new file mode 100644
index 00000000000000..be660c21692390
--- /dev/null
+++ b/packages/editor/src/components/sidebar/constants.js
@@ -0,0 +1,4 @@
+export const sidebars = {
+	document: 'edit-post/document',
+	block: 'edit-post/block',
+};
diff --git a/packages/editor/src/components/sidebar/header.js b/packages/editor/src/components/sidebar/header.js
new file mode 100644
index 00000000000000..fc4d44ba9e2958
--- /dev/null
+++ b/packages/editor/src/components/sidebar/header.js
@@ -0,0 +1,49 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
+import { __, _x } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+import { sidebars } from './constants';
+
+const { Tabs } = unlock( componentsPrivateApis );
+
+const SidebarHeader = ( _, ref ) => {
+	const { documentLabel } = useSelect( ( select ) => {
+		const { getPostTypeLabel } = select( editorStore );
+
+		return {
+			// translators: Default label for the Document sidebar tab, not selected.
+			documentLabel: getPostTypeLabel() || _x( 'Document', 'noun' ),
+		};
+	}, [] );
+
+	return (
+		<Tabs.TabList ref={ ref }>
+			<Tabs.Tab
+				tabId={ sidebars.document }
+				// Used for focus management in the SettingsSidebar component.
+				data-tab-id={ sidebars.document }
+			>
+				{ documentLabel }
+			</Tabs.Tab>
+			<Tabs.Tab
+				tabId={ sidebars.block }
+				// Used for focus management in the SettingsSidebar component.
+				data-tab-id={ sidebars.block }
+			>
+				{ /* translators: Text label for the Block Settings Sidebar tab. */ }
+				{ __( 'Block' ) }
+			</Tabs.Tab>
+		</Tabs.TabList>
+	);
+};
+
+export default forwardRef( SidebarHeader );
diff --git a/packages/editor/src/components/sidebar/index.js b/packages/editor/src/components/sidebar/index.js
new file mode 100644
index 00000000000000..efca709e0eec75
--- /dev/null
+++ b/packages/editor/src/components/sidebar/index.js
@@ -0,0 +1,193 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	BlockInspector,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import { useSelect, useDispatch } from '@wordpress/data';
+import {
+	Platform,
+	useCallback,
+	useContext,
+	useEffect,
+	useRef,
+} from '@wordpress/element';
+import { isRTL, __ } from '@wordpress/i18n';
+import { drawerLeft, drawerRight } from '@wordpress/icons';
+import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
+import { privateApis as componentsPrivateApis } from '@wordpress/components';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import PatternOverridesPanel from '../pattern-overrides-panel';
+import PluginDocumentSettingPanel from '../plugin-document-setting-panel';
+import PluginSidebar from '../plugin-sidebar';
+import PostSummary from './post-summary';
+import PostTaxonomiesPanel from '../post-taxonomies/panel';
+import PostTransformPanel from '../post-transform-panel';
+import SidebarHeader from './header';
+import TemplateContentPanel from '../template-content-panel';
+import TemplatePartContentPanel from '../template-part-content-panel';
+import useAutoSwitchEditorSidebars from '../provider/use-auto-switch-editor-sidebars';
+import { sidebars } from './constants';
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+import {
+	NAVIGATION_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+	TEMPLATE_POST_TYPE,
+} from '../../store/constants';
+
+const { Tabs } = unlock( componentsPrivateApis );
+
+const SIDEBAR_ACTIVE_BY_DEFAULT = Platform.select( {
+	web: true,
+	native: false,
+} );
+
+const SidebarContent = ( {
+	tabName,
+	keyboardShortcut,
+	onActionPerformed,
+	extraPanels,
+} ) => {
+	const tabListRef = useRef( null );
+	// Because `PluginSidebar` renders a `ComplementaryArea`, we
+	// need to forward the `Tabs` context so it can be passed through the
+	// underlying slot/fill.
+	const tabsContextValue = useContext( Tabs.Context );
+
+	// This effect addresses a race condition caused by tabbing from the last
+	// block in the editor into the settings sidebar. Without this effect, the
+	// selected tab and browser focus can become separated in an unexpected way
+	// (e.g the "block" tab is focused, but the "post" tab is selected).
+	useEffect( () => {
+		const tabsElements = Array.from(
+			tabListRef.current?.querySelectorAll( '[role="tab"]' ) || []
+		);
+		const selectedTabElement = tabsElements.find(
+			// We are purposefully using a custom `data-tab-id` attribute here
+			// because we don't want rely on any assumptions about `Tabs`
+			// component internals.
+			( element ) => element.getAttribute( 'data-tab-id' ) === tabName
+		);
+		const activeElement = selectedTabElement?.ownerDocument.activeElement;
+		const tabsHasFocus = tabsElements.some( ( element ) => {
+			return activeElement && activeElement.id === element.id;
+		} );
+		if (
+			tabsHasFocus &&
+			selectedTabElement &&
+			selectedTabElement.id !== activeElement?.id
+		) {
+			selectedTabElement?.focus();
+		}
+	}, [ tabName ] );
+
+	return (
+		<PluginSidebar
+			identifier={ tabName }
+			header={
+				<Tabs.Context.Provider value={ tabsContextValue }>
+					<SidebarHeader ref={ tabListRef } />
+				</Tabs.Context.Provider>
+			}
+			closeLabel={ __( 'Close Settings' ) }
+			// This classname is added so we can apply a corrective negative
+			// margin to the panel.
+			// see https://github.com/WordPress/gutenberg/pull/55360#pullrequestreview-1737671049
+			className="editor-sidebar__panel"
+			headerClassName="editor-sidebar__panel-tabs"
+			/* translators: button label text should, if possible, be under 16 characters. */
+			title={ __( 'Settings' ) }
+			toggleShortcut={ keyboardShortcut }
+			icon={ isRTL() ? drawerLeft : drawerRight }
+			isActiveByDefault={ SIDEBAR_ACTIVE_BY_DEFAULT }
+		>
+			<Tabs.Context.Provider value={ tabsContextValue }>
+				<Tabs.TabPanel tabId={ sidebars.document } focusable={ false }>
+					<PostSummary onActionPerformed={ onActionPerformed } />
+					<PluginDocumentSettingPanel.Slot />
+					<TemplateContentPanel />
+					<TemplatePartContentPanel />
+					<PostTransformPanel />
+					<PostTaxonomiesPanel />
+					<PatternOverridesPanel />
+					{ extraPanels }
+				</Tabs.TabPanel>
+				<Tabs.TabPanel tabId={ sidebars.block } focusable={ false }>
+					<BlockInspector />
+				</Tabs.TabPanel>
+			</Tabs.Context.Provider>
+		</PluginSidebar>
+	);
+};
+
+const Sidebar = ( { extraPanels, onActionPerformed } ) => {
+	useAutoSwitchEditorSidebars();
+	const { tabName, keyboardShortcut, showSummary } = useSelect(
+		( select ) => {
+			const shortcut = select(
+				keyboardShortcutsStore
+			).getShortcutRepresentation( 'core/editor/toggle-sidebar' );
+
+			const sidebar =
+				select( interfaceStore ).getActiveComplementaryArea( 'core' );
+			const _isEditorSidebarOpened = [
+				sidebars.block,
+				sidebars.document,
+			].includes( sidebar );
+			let _tabName = sidebar;
+			if ( ! _isEditorSidebarOpened ) {
+				_tabName = !! select(
+					blockEditorStore
+				).getBlockSelectionStart()
+					? sidebars.block
+					: sidebars.document;
+			}
+
+			return {
+				tabName: _tabName,
+				keyboardShortcut: shortcut,
+				showSummary: ! [
+					TEMPLATE_POST_TYPE,
+					TEMPLATE_PART_POST_TYPE,
+					NAVIGATION_POST_TYPE,
+				].includes( select( editorStore ).getCurrentPostType() ),
+			};
+		},
+		[]
+	);
+
+	const { enableComplementaryArea } = useDispatch( interfaceStore );
+
+	const onTabSelect = useCallback(
+		( newSelectedTabId ) => {
+			if ( !! newSelectedTabId ) {
+				enableComplementaryArea( 'core', newSelectedTabId );
+			}
+		},
+		[ enableComplementaryArea ]
+	);
+
+	return (
+		<Tabs
+			selectedTabId={ tabName }
+			onSelect={ onTabSelect }
+			selectOnMove={ false }
+		>
+			<SidebarContent
+				tabName={ tabName }
+				keyboardShortcut={ keyboardShortcut }
+				showSummary={ showSummary }
+				onActionPerformed={ onActionPerformed }
+				extraPanels={ extraPanels }
+			/>
+		</Tabs>
+	);
+};
+
+export default Sidebar;
diff --git a/packages/editor/src/components/sidebar/post-summary.js b/packages/editor/src/components/sidebar/post-summary.js
new file mode 100644
index 00000000000000..72f1080770fd9d
--- /dev/null
+++ b/packages/editor/src/components/sidebar/post-summary.js
@@ -0,0 +1,103 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalVStack as VStack } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import PluginPostStatusInfo from '../plugin-post-status-info';
+import PostAuthorPanel from '../post-author/panel';
+import PostCardPanel from '../post-card-panel';
+import PostContentInformation from '../post-content-information';
+import PageAttributesPanel from '../page-attributes/panel';
+import PostDiscussionPanel from '../post-discussion/panel';
+import { PrivatePostExcerptPanel as PostExcerptPanel } from '../post-excerpt/panel';
+import PostFeaturedImagePanel from '../post-featured-image/panel';
+import PostFormatPanel from '../post-format/panel';
+import PostLastEditedPanel from '../post-last-edited-panel';
+import PostPanelSection from '../post-panel-section';
+import PostSchedulePanel from '../post-schedule/panel';
+import PostStatusPanel from '../post-status';
+import PostSyncStatus from '../post-sync-status';
+import PostTemplatePanel from '../post-template/panel';
+import PostURLPanel from '../post-url/panel';
+import BlogTitle from '../blog-title';
+import PostsPerPage from '../posts-per-page';
+import SiteDiscussion from '../site-discussion';
+import { store as editorStore } from '../../store';
+import { PrivatePostLastRevision } from '../post-last-revision';
+import PostTrash from '../post-trash';
+
+/**
+ * Module Constants
+ */
+const PANEL_NAME = 'post-status';
+
+export default function PostSummary( { onActionPerformed } ) {
+	const { isRemovedPostStatusPanel, postType, postId } = useSelect(
+		( select ) => {
+			// We use isEditorPanelRemoved to hide the panel if it was programatically removed. We do
+			// not use isEditorPanelEnabled since this panel should not be disabled through the UI.
+			const {
+				isEditorPanelRemoved,
+				getCurrentPostType,
+				getCurrentPostId,
+			} = select( editorStore );
+			return {
+				isRemovedPostStatusPanel: isEditorPanelRemoved( PANEL_NAME ),
+				postType: getCurrentPostType(),
+				postId: getCurrentPostId(),
+			};
+		},
+		[]
+	);
+
+	return (
+		<PostPanelSection className="editor-post-summary">
+			<PluginPostStatusInfo.Slot>
+				{ ( fills ) => (
+					<>
+						<VStack spacing={ 4 }>
+							<PostCardPanel
+								postType={ postType }
+								postId={ postId }
+								onActionPerformed={ onActionPerformed }
+							/>
+							<PostFeaturedImagePanel withPanelBody={ false } />
+							<PostExcerptPanel />
+							<VStack spacing={ 1 }>
+								<PostContentInformation />
+								<PostLastEditedPanel />
+							</VStack>
+							{ ! isRemovedPostStatusPanel && (
+								<VStack spacing={ 4 }>
+									<VStack spacing={ 1 }>
+										<PostStatusPanel />
+										<PostSchedulePanel />
+										<PostURLPanel />
+										<PostAuthorPanel />
+										<PostTemplatePanel />
+										<PostDiscussionPanel />
+										<PrivatePostLastRevision />
+										<PageAttributesPanel />
+										<PostSyncStatus />
+										<BlogTitle />
+										<PostsPerPage />
+										<SiteDiscussion />
+										<PostFormatPanel />
+									</VStack>
+									<PostTrash
+										onActionPerformed={ onActionPerformed }
+									/>
+									{ fills }
+								</VStack>
+							) }
+						</VStack>
+					</>
+				) }
+			</PluginPostStatusInfo.Slot>
+		</PostPanelSection>
+	);
+}
diff --git a/packages/editor/src/components/sidebar/style.scss b/packages/editor/src/components/sidebar/style.scss
new file mode 100644
index 00000000000000..9853088dde1be7
--- /dev/null
+++ b/packages/editor/src/components/sidebar/style.scss
@@ -0,0 +1,18 @@
+.components-panel__header.editor-sidebar__panel-tabs {
+	padding-left: 0;
+	padding-right: $grid-unit-15;
+
+	.components-button.has-icon {
+		padding: 0;
+		min-width: $icon-size;
+		height: $icon-size;
+
+		@include break-medium() {
+			display: flex;
+		}
+	}
+}
+
+.editor-post-summary .components-v-stack:empty {
+	display: none;
+}
diff --git a/packages/editor/src/components/site-discussion/index.js b/packages/editor/src/components/site-discussion/index.js
new file mode 100644
index 00000000000000..5b4d213148341d
--- /dev/null
+++ b/packages/editor/src/components/site-discussion/index.js
@@ -0,0 +1,131 @@
+/**
+ * WordPress dependencies
+ */
+import { __, _x } from '@wordpress/i18n';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import {
+	Button,
+	Dropdown,
+	RadioControl,
+	__experimentalVStack as VStack,
+	__experimentalText as Text,
+} from '@wordpress/components';
+import { useState, useMemo } from '@wordpress/element';
+import { __experimentalInspectorPopoverHeader as InspectorPopoverHeader } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_POST_TYPE } from '../../store/constants';
+import PostPanelRow from '../post-panel-row';
+import { store as editorStore } from '../../store';
+
+const COMMENT_OPTIONS = [
+	{
+		label: _x( 'Open', 'Adjective: e.g. "Comments are open"' ),
+		value: 'open',
+		description: __( 'Visitors can add new comments and replies.' ),
+	},
+	{
+		label: __( 'Closed' ),
+		value: '',
+		description: [
+			__( 'Visitors cannot add new comments or replies.' ),
+			__( 'Existing comments remain visible.' ),
+		].join( ' ' ),
+	},
+];
+
+export default function SiteDiscussion() {
+	const { editEntityRecord } = useDispatch( coreStore );
+	const { allowCommentsOnNewPosts, isTemplate, postSlug } = useSelect(
+		( select ) => {
+			const { getEditedPostAttribute, getCurrentPostType } =
+				select( editorStore );
+			const { getEditedEntityRecord, canUser } = select( coreStore );
+			const siteSettings = canUser( 'read', {
+				kind: 'root',
+				name: 'site',
+			} )
+				? getEditedEntityRecord( 'root', 'site' )
+				: undefined;
+			return {
+				isTemplate: getCurrentPostType() === TEMPLATE_POST_TYPE,
+				postSlug: getEditedPostAttribute( 'slug' ),
+				allowCommentsOnNewPosts:
+					siteSettings?.default_comment_status || '',
+			};
+		},
+		[]
+	);
+	// Use internal state instead of a ref to make sure that the component
+	// re-renders when the popover's anchor updates.
+	const [ popoverAnchor, setPopoverAnchor ] = useState( null );
+	// Memoize popoverProps to avoid returning a new object every time.
+	const popoverProps = useMemo(
+		() => ( {
+			// Anchor the popover to the middle of the entire row so that it doesn't
+			// move around when the label changes.
+			anchor: popoverAnchor,
+			placement: 'left-start',
+			offset: 36,
+			shift: true,
+		} ),
+		[ popoverAnchor ]
+	);
+
+	if ( ! isTemplate || ! [ 'home', 'index' ].includes( postSlug ) ) {
+		return null;
+	}
+	const setAllowCommentsOnNewPosts = ( newValue ) => {
+		editEntityRecord( 'root', 'site', undefined, {
+			default_comment_status: newValue ? 'open' : null,
+		} );
+	};
+	return (
+		<PostPanelRow label={ __( 'Discussion' ) } ref={ setPopoverAnchor }>
+			<Dropdown
+				popoverProps={ popoverProps }
+				contentClassName="editor-site-discussion-dropdown__content"
+				focusOnMount
+				renderToggle={ ( { isOpen, onToggle } ) => (
+					<Button
+						size="compact"
+						variant="tertiary"
+						aria-expanded={ isOpen }
+						aria-label={ __( 'Change discussion settings' ) }
+						onClick={ onToggle }
+					>
+						{ allowCommentsOnNewPosts
+							? __( 'Comments open' )
+							: __( 'Comments closed' ) }
+					</Button>
+				) }
+				renderContent={ ( { onClose } ) => (
+					<>
+						<InspectorPopoverHeader
+							title={ __( 'Discussion' ) }
+							onClose={ onClose }
+						/>
+						<VStack spacing={ 3 }>
+							<Text>
+								{ __(
+									'Changes will apply to new posts only. Individual posts may override these settings.'
+								) }
+							</Text>
+							<RadioControl
+								className="editor-site-discussion__options"
+								hideLabelFromVision
+								label={ __( 'Comment status' ) }
+								options={ COMMENT_OPTIONS }
+								onChange={ setAllowCommentsOnNewPosts }
+								selected={ allowCommentsOnNewPosts }
+							/>
+						</VStack>
+					</>
+				) }
+			/>
+		</PostPanelRow>
+	);
+}
diff --git a/packages/editor/src/components/site-discussion/style.scss b/packages/editor/src/components/site-discussion/style.scss
new file mode 100644
index 00000000000000..dc0608f0cf3ab1
--- /dev/null
+++ b/packages/editor/src/components/site-discussion/style.scss
@@ -0,0 +1,5 @@
+.editor-site-discussion-dropdown__content .components-popover__content {
+	min-width: 320px;
+	padding: $grid-unit-20;
+}
+
diff --git a/packages/editor/src/components/start-page-options/index.js b/packages/editor/src/components/start-page-options/index.js
new file mode 100644
index 00000000000000..07fee67fbed19b
--- /dev/null
+++ b/packages/editor/src/components/start-page-options/index.js
@@ -0,0 +1,144 @@
+/**
+ * WordPress dependencies
+ */
+import { Modal } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useState, useMemo } from '@wordpress/element';
+import {
+	store as blockEditorStore,
+	__experimentalBlockPatternsList as BlockPatternsList,
+} from '@wordpress/block-editor';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useAsyncList } from '@wordpress/compose';
+import { store as coreStore } from '@wordpress/core-data';
+import { __unstableSerializeAndClean } from '@wordpress/blocks';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { store as interfaceStore } from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { TEMPLATE_POST_TYPE } from '../../store/constants';
+
+export function useStartPatterns() {
+	// A pattern is a start pattern if it includes 'core/post-content' in its blockTypes,
+	// and it has no postTypes declared and the current post type is page or if
+	// the current post type is part of the postTypes declared.
+	const { blockPatternsWithPostContentBlockType, postType } = useSelect(
+		( select ) => {
+			const { getPatternsByBlockTypes, getBlocksByName } =
+				select( blockEditorStore );
+			const { getCurrentPostType, getRenderingMode } =
+				select( editorStore );
+			const rootClientId =
+				getRenderingMode() === 'post-only'
+					? ''
+					: getBlocksByName( 'core/post-content' )?.[ 0 ];
+			return {
+				blockPatternsWithPostContentBlockType: getPatternsByBlockTypes(
+					'core/post-content',
+					rootClientId
+				),
+				postType: getCurrentPostType(),
+			};
+		},
+		[]
+	);
+
+	return useMemo( () => {
+		if ( ! blockPatternsWithPostContentBlockType?.length ) {
+			return [];
+		}
+
+		/*
+		 * Filter patterns without postTypes declared if the current postType is page
+		 * or patterns that declare the current postType in its post type array.
+		 */
+		return blockPatternsWithPostContentBlockType.filter( ( pattern ) => {
+			return (
+				( postType === 'page' && ! pattern.postTypes ) ||
+				( Array.isArray( pattern.postTypes ) &&
+					pattern.postTypes.includes( postType ) )
+			);
+		} );
+	}, [ postType, blockPatternsWithPostContentBlockType ] );
+}
+
+function PatternSelection( { blockPatterns, onChoosePattern } ) {
+	const shownBlockPatterns = useAsyncList( blockPatterns );
+	const { editEntityRecord } = useDispatch( coreStore );
+	const { postType, postId } = useSelect( ( select ) => {
+		const { getCurrentPostType, getCurrentPostId } = select( editorStore );
+
+		return {
+			postType: getCurrentPostType(),
+			postId: getCurrentPostId(),
+		};
+	}, [] );
+	return (
+		<BlockPatternsList
+			blockPatterns={ blockPatterns }
+			shownPatterns={ shownBlockPatterns }
+			onClickPattern={ ( _pattern, blocks ) => {
+				editEntityRecord( 'postType', postType, postId, {
+					blocks,
+					content: ( { blocks: blocksForSerialization = [] } ) =>
+						__unstableSerializeAndClean( blocksForSerialization ),
+				} );
+				onChoosePattern();
+			} }
+		/>
+	);
+}
+
+function StartPageOptionsModal( { onClose } ) {
+	const startPatterns = useStartPatterns();
+	const hasStartPattern = startPatterns.length > 0;
+
+	if ( ! hasStartPattern ) {
+		return null;
+	}
+
+	return (
+		<Modal
+			title={ __( 'Choose a pattern' ) }
+			isFullScreen
+			onRequestClose={ onClose }
+		>
+			<div className="editor-start-page-options__modal-content">
+				<PatternSelection
+					blockPatterns={ startPatterns }
+					onChoosePattern={ onClose }
+				/>
+			</div>
+		</Modal>
+	);
+}
+
+export default function StartPageOptions() {
+	const [ isClosed, setIsClosed ] = useState( false );
+	const shouldEnableModal = useSelect( ( select ) => {
+		const { isEditedPostDirty, isEditedPostEmpty, getCurrentPostType } =
+			select( editorStore );
+		const preferencesModalActive =
+			select( interfaceStore ).isModalActive( 'editor/preferences' );
+		const choosePatternModalEnabled = select( preferencesStore ).get(
+			'core',
+			'enableChoosePatternModal'
+		);
+		return (
+			choosePatternModalEnabled &&
+			! preferencesModalActive &&
+			! isEditedPostDirty() &&
+			isEditedPostEmpty() &&
+			TEMPLATE_POST_TYPE !== getCurrentPostType()
+		);
+	}, [] );
+
+	if ( ! shouldEnableModal || isClosed ) {
+		return null;
+	}
+
+	return <StartPageOptionsModal onClose={ () => setIsClosed( true ) } />;
+}
diff --git a/packages/editor/src/components/start-page-options/style.scss b/packages/editor/src/components/start-page-options/style.scss
new file mode 100644
index 00000000000000..129d670526c709
--- /dev/null
+++ b/packages/editor/src/components/start-page-options/style.scss
@@ -0,0 +1,26 @@
+// 2 column masonry layout.
+.editor-start-page-options__modal-content .block-editor-block-patterns-list {
+	column-count: 2;
+	column-gap: $grid-unit-30;
+
+	@include break-medium() {
+		column-count: 3;
+	}
+
+	@include break-wide() {
+		column-count: 4;
+	}
+
+	.block-editor-block-patterns-list__list-item {
+		break-inside: avoid-column;
+		margin-bottom: $grid-unit-30;
+
+		.block-editor-block-preview__container {
+			min-height: 100px;
+		}
+
+		.block-editor-block-preview__content {
+			width: 100%;
+		}
+	}
+}
diff --git a/packages/editor/src/components/start-template-options/index.js b/packages/editor/src/components/start-template-options/index.js
new file mode 100644
index 00000000000000..3651c5c029a2c7
--- /dev/null
+++ b/packages/editor/src/components/start-template-options/index.js
@@ -0,0 +1,223 @@
+/**
+ * WordPress dependencies
+ */
+import { Modal, Flex, FlexItem, Button } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useState, useMemo, useEffect } from '@wordpress/element';
+import { __experimentalBlockPatternsList as BlockPatternsList } from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+import { useAsyncList } from '@wordpress/compose';
+import { parse } from '@wordpress/blocks';
+import { store as coreStore, useEntityBlockEditor } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import { TEMPLATE_POST_TYPE } from '../../store/constants';
+
+function useFallbackTemplateContent( slug, isCustom = false ) {
+	return useSelect(
+		( select ) => {
+			const { getEntityRecord, getDefaultTemplateId } =
+				select( coreStore );
+			const templateId = getDefaultTemplateId( {
+				slug,
+				is_custom: isCustom,
+				ignore_empty: true,
+			} );
+			return templateId
+				? getEntityRecord( 'postType', TEMPLATE_POST_TYPE, templateId )
+						?.content?.raw
+				: undefined;
+		},
+		[ slug, isCustom ]
+	);
+}
+
+function useStartPatterns( fallbackContent ) {
+	const { slug, patterns } = useSelect( ( select ) => {
+		const { getCurrentPostType, getCurrentPostId } = select( editorStore );
+		const { getEntityRecord, getBlockPatterns } = select( coreStore );
+		const postId = getCurrentPostId();
+		const postType = getCurrentPostType();
+		const record = getEntityRecord( 'postType', postType, postId );
+		return {
+			slug: record.slug,
+			patterns: getBlockPatterns(),
+		};
+	}, [] );
+
+	const currentThemeStylesheet = useSelect(
+		( select ) => select( coreStore ).getCurrentTheme().stylesheet
+	);
+
+	// Duplicated from packages/block-library/src/pattern/edit.js.
+	function injectThemeAttributeInBlockTemplateContent( block ) {
+		if (
+			block.innerBlocks.find(
+				( innerBlock ) => innerBlock.name === 'core/template-part'
+			)
+		) {
+			block.innerBlocks = block.innerBlocks.map( ( innerBlock ) => {
+				if (
+					innerBlock.name === 'core/template-part' &&
+					innerBlock.attributes.theme === undefined
+				) {
+					innerBlock.attributes.theme = currentThemeStylesheet;
+				}
+				return innerBlock;
+			} );
+		}
+
+		if (
+			block.name === 'core/template-part' &&
+			block.attributes.theme === undefined
+		) {
+			block.attributes.theme = currentThemeStylesheet;
+		}
+		return block;
+	}
+
+	return useMemo( () => {
+		// filter patterns that are supposed to be used in the current template being edited.
+		return [
+			{
+				name: 'fallback',
+				blocks: parse( fallbackContent ),
+				title: __( 'Fallback content' ),
+			},
+			...patterns
+				.filter( ( pattern ) => {
+					return (
+						Array.isArray( pattern.templateTypes ) &&
+						pattern.templateTypes.some( ( templateType ) =>
+							slug.startsWith( templateType )
+						)
+					);
+				} )
+				.map( ( pattern ) => {
+					return {
+						...pattern,
+						blocks: parse( pattern.content ).map( ( block ) =>
+							injectThemeAttributeInBlockTemplateContent( block )
+						),
+					};
+				} ),
+		];
+	}, [ fallbackContent, slug, patterns ] );
+}
+
+function PatternSelection( { fallbackContent, onChoosePattern, postType } ) {
+	const [ , , onChange ] = useEntityBlockEditor( 'postType', postType );
+	const blockPatterns = useStartPatterns( fallbackContent );
+	const shownBlockPatterns = useAsyncList( blockPatterns );
+	return (
+		<BlockPatternsList
+			blockPatterns={ blockPatterns }
+			shownPatterns={ shownBlockPatterns }
+			onClickPattern={ ( pattern, blocks ) => {
+				onChange( blocks, { selection: undefined } );
+				onChoosePattern();
+			} }
+		/>
+	);
+}
+
+function StartModal( { slug, isCustom, onClose, postType } ) {
+	const fallbackContent = useFallbackTemplateContent( slug, isCustom );
+	if ( ! fallbackContent ) {
+		return null;
+	}
+	return (
+		<Modal
+			className="editor-start-template-options__modal"
+			title={ __( 'Choose a pattern' ) }
+			closeLabel={ __( 'Cancel' ) }
+			focusOnMount="firstElement"
+			onRequestClose={ onClose }
+			isFullScreen
+		>
+			<div className="editor-start-template-options__modal-content">
+				<PatternSelection
+					fallbackContent={ fallbackContent }
+					slug={ slug }
+					isCustom={ isCustom }
+					postType={ postType }
+					onChoosePattern={ () => {
+						onClose();
+					} }
+				/>
+			</div>
+			<Flex
+				className="editor-start-template-options__modal__actions"
+				justify="flex-end"
+				expanded={ false }
+			>
+				<FlexItem>
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ onClose }
+					>
+						{ __( 'Skip' ) }
+					</Button>
+				</FlexItem>
+			</Flex>
+		</Modal>
+	);
+}
+
+export default function StartTemplateOptions() {
+	const [ isClosed, setIsClosed ] = useState( false );
+	const { shouldOpenModal, slug, isCustom, postType, postId } = useSelect(
+		( select ) => {
+			const { getCurrentPostType, getCurrentPostId } =
+				select( editorStore );
+			const _postType = getCurrentPostType();
+			const _postId = getCurrentPostId();
+			const { getEditedEntityRecord, hasEditsForEntityRecord } =
+				select( coreStore );
+			const templateRecord = getEditedEntityRecord(
+				'postType',
+				_postType,
+				_postId
+			);
+			const hasEdits = hasEditsForEntityRecord(
+				'postType',
+				_postType,
+				_postId
+			);
+
+			return {
+				shouldOpenModal:
+					! hasEdits &&
+					'' === templateRecord.content &&
+					TEMPLATE_POST_TYPE === _postType,
+				slug: templateRecord.slug,
+				isCustom: templateRecord.is_custom,
+				postType: _postType,
+				postId: _postId,
+			};
+		},
+		[]
+	);
+
+	useEffect( () => {
+		// Should reset the modal state when navigating to a new page/post.
+		setIsClosed( false );
+	}, [ postType, postId ] );
+
+	if ( ! shouldOpenModal || isClosed ) {
+		return null;
+	}
+
+	return (
+		<StartModal
+			slug={ slug }
+			isCustom={ isCustom }
+			postType={ postType }
+			onClose={ () => setIsClosed( true ) }
+		/>
+	);
+}
diff --git a/packages/editor/src/components/start-template-options/style.scss b/packages/editor/src/components/start-template-options/style.scss
new file mode 100644
index 00000000000000..128eddb48c8c8c
--- /dev/null
+++ b/packages/editor/src/components/start-template-options/style.scss
@@ -0,0 +1,47 @@
+$actions-height: 92px;
+
+.editor-start-template-options__modal {
+	.editor-start-template-options__modal__actions {
+		position: absolute;
+		bottom: 0;
+		width: 100%;
+		height: $actions-height;
+		background-color: $white;
+		margin-left: - $grid-unit-40;
+		margin-right: - $grid-unit-40;
+		padding-left: $grid-unit-40;
+		padding-right: $grid-unit-40;
+		border-top: 1px solid $gray-300;
+		z-index: z-index(".editor-start-template-options__modal__actions");
+	}
+
+	.block-editor-block-patterns-list {
+		// Since the actions container is positioned absolutely,
+		// this padding bottom ensures that the content wrapper will properly
+		// detect overflowing content and start showing scrollbars at the right
+		// moment. Without this padding, the content would render under the actions
+		// bar without causing the wrapper to show a scrollbar.
+		padding-bottom: $actions-height;
+	}
+}
+
+.editor-start-template-options__modal-content .block-editor-block-patterns-list {
+	column-count: 2;
+	column-gap: $grid-unit-30;
+
+	@include break-medium() {
+		column-count: 3;
+	}
+
+	@include break-wide() {
+		column-count: 4;
+	}
+
+	.block-editor-block-patterns-list__list-item {
+		break-inside: avoid-column;
+
+		.block-editor-block-patterns-list__item-title {
+			display: none;
+		}
+	}
+}
diff --git a/packages/editor/src/components/table-of-contents/index.js b/packages/editor/src/components/table-of-contents/index.js
index c63fdbfd83e25c..6fd83557b13ab7 100644
--- a/packages/editor/src/components/table-of-contents/index.js
+++ b/packages/editor/src/components/table-of-contents/index.js
@@ -30,6 +30,7 @@ function TableOfContents(
 			contentClassName="table-of-contents__popover"
 			renderToggle={ ( { isOpen, onToggle } ) => (
 				<Button
+					__next40pxDefaultSize
 					{ ...props }
 					ref={ ref }
 					onClick={ hasBlocks ? onToggle : undefined }
@@ -52,4 +53,14 @@ function TableOfContents(
 	);
 }
 
+/**
+ * Renders a table of contents component.
+ *
+ * @param {Object}      props                         The component props.
+ * @param {boolean}     props.hasOutlineItemsDisabled Whether outline items are disabled.
+ * @param {boolean}     props.repositionDropdown      Whether to reposition the dropdown.
+ * @param {Element.ref} ref                           The component's ref.
+ *
+ * @return {JSX.Element} The rendered table of contents component.
+ */
 export default forwardRef( TableOfContents );
diff --git a/packages/editor/src/components/template-content-panel/index.js b/packages/editor/src/components/template-content-panel/index.js
new file mode 100644
index 00000000000000..41e170e76daef5
--- /dev/null
+++ b/packages/editor/src/components/template-content-panel/index.js
@@ -0,0 +1,79 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { PanelBody } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { store as interfaceStore } from '@wordpress/interface';
+import { applyFilters } from '@wordpress/hooks';
+import { useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { TEMPLATE_POST_TYPE } from '../../store/constants';
+import { store as editorStore } from '../../store';
+
+const { BlockQuickNavigation } = unlock( blockEditorPrivateApis );
+
+const POST_CONTENT_BLOCK_TYPES = [
+	'core/post-title',
+	'core/post-featured-image',
+	'core/post-content',
+];
+
+const TEMPLATE_PART_BLOCK = 'core/template-part';
+
+export default function TemplateContentPanel() {
+	const postContentBlockTypes = useMemo(
+		() =>
+			applyFilters(
+				'editor.postContentBlockTypes',
+				POST_CONTENT_BLOCK_TYPES
+			),
+		[]
+	);
+
+	const { clientIds, postType, renderingMode } = useSelect(
+		( select ) => {
+			const {
+				getCurrentPostType,
+				getPostBlocksByName,
+				getRenderingMode,
+			} = unlock( select( editorStore ) );
+			const _postType = getCurrentPostType();
+			return {
+				postType: _postType,
+				clientIds: getPostBlocksByName(
+					TEMPLATE_POST_TYPE === _postType
+						? TEMPLATE_PART_BLOCK
+						: postContentBlockTypes
+				),
+				renderingMode: getRenderingMode(),
+			};
+		},
+		[ postContentBlockTypes ]
+	);
+
+	const { enableComplementaryArea } = useDispatch( interfaceStore );
+
+	if (
+		( renderingMode === 'post-only' && postType !== TEMPLATE_POST_TYPE ) ||
+		clientIds.length === 0
+	) {
+		return null;
+	}
+
+	return (
+		<PanelBody title={ __( 'Content' ) }>
+			<BlockQuickNavigation
+				clientIds={ clientIds }
+				onSelect={ () => {
+					enableComplementaryArea( 'core', 'edit-post/document' );
+				} }
+			/>
+		</PanelBody>
+	);
+}
diff --git a/packages/editor/src/components/template-part-content-panel/index.js b/packages/editor/src/components/template-part-content-panel/index.js
new file mode 100644
index 00000000000000..6ca2b080f6ee72
--- /dev/null
+++ b/packages/editor/src/components/template-part-content-panel/index.js
@@ -0,0 +1,62 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+import { store as blocksStore } from '@wordpress/blocks';
+import {
+	store as blockEditorStore,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+import { PanelBody } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { TEMPLATE_PART_POST_TYPE } from '../../store/constants';
+import { store as editorStore } from '../../store';
+
+const { BlockQuickNavigation } = unlock( blockEditorPrivateApis );
+
+function TemplatePartContentPanelInner() {
+	const blockTypes = useSelect( ( select ) => {
+		const { getBlockTypes } = select( blocksStore );
+		return getBlockTypes();
+	}, [] );
+	const themeBlockNames = useMemo( () => {
+		return blockTypes
+			.filter( ( blockType ) => {
+				return blockType.category === 'theme';
+			} )
+			.map( ( { name } ) => name );
+	}, [ blockTypes ] );
+	const themeBlocks = useSelect(
+		( select ) => {
+			const { getBlocksByName } = select( blockEditorStore );
+			return getBlocksByName( themeBlockNames );
+		},
+		[ themeBlockNames ]
+	);
+	if ( themeBlocks.length === 0 ) {
+		return null;
+	}
+	return (
+		<PanelBody title={ __( 'Content' ) }>
+			<BlockQuickNavigation clientIds={ themeBlocks } />
+		</PanelBody>
+	);
+}
+
+export default function TemplatePartContentPanel() {
+	const postType = useSelect( ( select ) => {
+		const { getCurrentPostType } = select( editorStore );
+		return getCurrentPostType();
+	}, [] );
+	if ( postType !== TEMPLATE_PART_POST_TYPE ) {
+		return null;
+	}
+
+	return <TemplatePartContentPanelInner />;
+}
diff --git a/packages/edit-site/src/components/template-part-converter/convert-to-regular.js b/packages/editor/src/components/template-part-menu-items/convert-to-regular.js
similarity index 100%
rename from packages/edit-site/src/components/template-part-converter/convert-to-regular.js
rename to packages/editor/src/components/template-part-menu-items/convert-to-regular.js
diff --git a/packages/edit-site/src/components/template-part-converter/convert-to-template-part.js b/packages/editor/src/components/template-part-menu-items/convert-to-template-part.js
similarity index 90%
rename from packages/edit-site/src/components/template-part-converter/convert-to-template-part.js
rename to packages/editor/src/components/template-part-menu-items/convert-to-template-part.js
index e8a80ee4e299ae..4ae15d1dd178c0 100644
--- a/packages/edit-site/src/components/template-part-converter/convert-to-template-part.js
+++ b/packages/editor/src/components/template-part-menu-items/convert-to-template-part.js
@@ -14,7 +14,6 @@ import { symbolFilled } from '@wordpress/icons';
  * Internal dependencies
  */
 import CreateTemplatePartModal from '../create-template-part-modal';
-import { store as editSiteStore } from '../../store';
 
 export default function ConvertToTemplatePart( { clientIds, blocks } ) {
 	const [ isModalOpen, setIsModalOpen ] = useState( false );
@@ -22,10 +21,11 @@ export default function ConvertToTemplatePart( { clientIds, blocks } ) {
 	const { createSuccessNotice } = useDispatch( noticesStore );
 
 	const { canCreate } = useSelect( ( select ) => {
-		const { supportsTemplatePartsMode } =
-			select( editSiteStore ).getSettings();
 		return {
-			canCreate: ! supportsTemplatePartsMode,
+			canCreate:
+				select( blockEditorStore ).canInsertBlockType(
+					'core/template-part'
+				),
 		};
 	}, [] );
 
diff --git a/packages/editor/src/components/template-part-menu-items/index.js b/packages/editor/src/components/template-part-menu-items/index.js
new file mode 100644
index 00000000000000..0e126644d49938
--- /dev/null
+++ b/packages/editor/src/components/template-part-menu-items/index.js
@@ -0,0 +1,59 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import {
+	BlockSettingsMenuControls,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import ConvertToRegularBlocks from './convert-to-regular';
+import ConvertToTemplatePart from './convert-to-template-part';
+
+export default function TemplatePartMenuItems() {
+	return (
+		<BlockSettingsMenuControls>
+			{ ( { selectedClientIds, onClose } ) => (
+				<TemplatePartConverterMenuItem
+					clientIds={ selectedClientIds }
+					onClose={ onClose }
+				/>
+			) }
+		</BlockSettingsMenuControls>
+	);
+}
+
+function TemplatePartConverterMenuItem( { clientIds, onClose } ) {
+	const { isContentOnly, blocks } = useSelect(
+		( select ) => {
+			const { getBlocksByClientId, getBlockEditingMode } =
+				select( blockEditorStore );
+			return {
+				blocks: getBlocksByClientId( clientIds ),
+				isContentOnly:
+					clientIds.length === 1 &&
+					getBlockEditingMode( clientIds[ 0 ] ) === 'contentOnly',
+			};
+		},
+		[ clientIds ]
+	);
+
+	// Do not show the convert button if the block is in content-only mode.
+	if ( isContentOnly ) {
+		return null;
+	}
+
+	// Allow converting a single template part to standard blocks.
+	if ( blocks.length === 1 && blocks[ 0 ]?.name === 'core/template-part' ) {
+		return (
+			<ConvertToRegularBlocks
+				clientId={ clientIds[ 0 ] }
+				onClose={ onClose }
+			/>
+		);
+	}
+	return <ConvertToTemplatePart clientIds={ clientIds } blocks={ blocks } />;
+}
diff --git a/packages/editor/src/components/template-part-menu-items/index.native.js b/packages/editor/src/components/template-part-menu-items/index.native.js
new file mode 100644
index 00000000000000..af843714462387
--- /dev/null
+++ b/packages/editor/src/components/template-part-menu-items/index.native.js
@@ -0,0 +1,3 @@
+export default function TemplatePartMenuItems() {
+	return null;
+}
diff --git a/packages/editor/src/components/template-validation-notice/index.js b/packages/editor/src/components/template-validation-notice/index.js
index 64e2227e30febe..bfbc6319ffa8a8 100644
--- a/packages/editor/src/components/template-validation-notice/index.js
+++ b/packages/editor/src/components/template-validation-notice/index.js
@@ -1,63 +1,62 @@
 /**
  * WordPress dependencies
  */
-import { Notice } from '@wordpress/components';
+import {
+	Notice,
+	__experimentalConfirmDialog as ConfirmDialog,
+} from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useState } from '@wordpress/element';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
-function TemplateValidationNotice( { isValid, ...props } ) {
+export default function TemplateValidationNotice() {
+	const [ showConfirmDialog, setShowConfirmDialog ] = useState( false );
+	const isValid = useSelect( ( select ) => {
+		return select( blockEditorStore ).isValidTemplate();
+	}, [] );
+	const { setTemplateValidity, synchronizeTemplate } =
+		useDispatch( blockEditorStore );
+
 	if ( isValid ) {
 		return null;
 	}
 
-	const confirmSynchronization = () => {
-		if (
-			// eslint-disable-next-line no-alert
-			window.confirm(
-				__(
-					'Resetting the template may result in loss of content, do you want to continue?'
-				)
-			)
-		) {
-			props.synchronizeTemplate();
-		}
-	};
-
 	return (
-		<Notice
-			className="editor-template-validation-notice"
-			isDismissible={ false }
-			status="warning"
-			actions={ [
-				{
-					label: __( 'Keep it as is' ),
-					onClick: props.resetTemplateValidity,
-				},
-				{
-					label: __( 'Reset the template' ),
-					onClick: confirmSynchronization,
-				},
-			] }
-		>
-			{ __(
-				'The content of your post doesn’t match the template assigned to your post type.'
-			) }
-		</Notice>
+		<>
+			<Notice
+				className="editor-template-validation-notice"
+				isDismissible={ false }
+				status="warning"
+				actions={ [
+					{
+						label: __( 'Keep it as is' ),
+						onClick: () => setTemplateValidity( true ),
+					},
+					{
+						label: __( 'Reset the template' ),
+						onClick: () => setShowConfirmDialog( true ),
+					},
+				] }
+			>
+				{ __(
+					'The content of your post doesn’t match the template assigned to your post type.'
+				) }
+			</Notice>
+			<ConfirmDialog
+				isOpen={ showConfirmDialog }
+				confirmButtonText={ __( 'Reset' ) }
+				onConfirm={ () => {
+					setShowConfirmDialog( false );
+					synchronizeTemplate();
+				} }
+				onCancel={ () => setShowConfirmDialog( false ) }
+				size="medium"
+			>
+				{ __(
+					'Resetting the template may result in loss of content, do you want to continue?'
+				) }
+			</ConfirmDialog>
+		</>
 	);
 }
-
-export default compose( [
-	withSelect( ( select ) => ( {
-		isValid: select( blockEditorStore ).isValidTemplate(),
-	} ) ),
-	withDispatch( ( dispatch ) => {
-		const { setTemplateValidity, synchronizeTemplate } =
-			dispatch( blockEditorStore );
-		return {
-			resetTemplateValidity: () => setTemplateValidity( true ),
-			synchronizeTemplate,
-		};
-	} ),
-] )( TemplateValidationNotice );
diff --git a/packages/editor/src/components/template-validation-notice/style.scss b/packages/editor/src/components/template-validation-notice/style.scss
deleted file mode 100644
index dde63f7e36b14c..00000000000000
--- a/packages/editor/src/components/template-validation-notice/style.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.editor-template-validation-notice {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-
-	.components-button {
-		margin-left: 5px;
-	}
-}
diff --git a/packages/editor/src/components/text-editor/index.js b/packages/editor/src/components/text-editor/index.js
new file mode 100644
index 00000000000000..fa0688859b5a69
--- /dev/null
+++ b/packages/editor/src/components/text-editor/index.js
@@ -0,0 +1,58 @@
+/**
+ * WordPress dependencies
+ */
+import { Button } from '@wordpress/components';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
+import { useEffect, useRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+import PostTextEditor from '../post-text-editor';
+import PostTitleRaw from '../post-title/post-title-raw';
+
+export default function TextEditor( { autoFocus = false } ) {
+	const { switchEditorMode } = useDispatch( editorStore );
+	const { shortcut, isRichEditingEnabled } = useSelect( ( select ) => {
+		const { getEditorSettings } = select( editorStore );
+		const { getShortcutRepresentation } = select( keyboardShortcutsStore );
+
+		return {
+			shortcut: getShortcutRepresentation( 'core/editor/toggle-mode' ),
+			isRichEditingEnabled: getEditorSettings().richEditingEnabled,
+		};
+	}, [] );
+
+	const titleRef = useRef();
+	useEffect( () => {
+		if ( autoFocus ) {
+			return;
+		}
+		titleRef?.current?.focus();
+	}, [ autoFocus ] );
+
+	return (
+		<div className="editor-text-editor">
+			{ isRichEditingEnabled && (
+				<div className="editor-text-editor__toolbar">
+					<h2>{ __( 'Editing code' ) }</h2>
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ () => switchEditorMode( 'visual' ) }
+						shortcut={ shortcut }
+					>
+						{ __( 'Exit code editor' ) }
+					</Button>
+				</div>
+			) }
+			<div className="editor-text-editor__body">
+				<PostTitleRaw ref={ titleRef } />
+				<PostTextEditor />
+			</div>
+		</div>
+	);
+}
diff --git a/packages/editor/src/components/text-editor/style.scss b/packages/editor/src/components/text-editor/style.scss
new file mode 100644
index 00000000000000..9b2748e08fc5cf
--- /dev/null
+++ b/packages/editor/src/components/text-editor/style.scss
@@ -0,0 +1,71 @@
+.editor-text-editor {
+	position: relative;
+	width: 100%;
+	background-color: $white;
+	flex-grow: 1;
+
+	// Post title.
+	.editor-post-title:not(.is-raw-text),
+	.editor-post-title.is-raw-text textarea {
+		max-width: none;
+		line-height: $default-line-height;
+
+		font-family: $editor-html-font;
+		font-size: 2.5em;
+		font-weight: normal;
+
+		border: $border-width solid $gray-600;
+		border-radius: 0;
+
+		// Same padding as body.
+		padding: $grid-unit-20;
+
+		@include break-small() {
+			padding: $grid-unit-30;
+		}
+
+		&:focus {
+			border-color: var(--wp-admin-theme-color);
+			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+		}
+	}
+}
+
+.editor-text-editor__body {
+	width: 100%;
+	padding: 0 $grid-unit-15 $grid-unit-15 $grid-unit-15;
+	max-width: $break-xlarge;
+	margin-left: auto;
+	margin-right: auto;
+
+	@include break-large() {
+		padding: 0 $grid-unit-30 $grid-unit-30 $grid-unit-30;
+	}
+}
+
+// Exit code editor toolbar.
+.editor-text-editor__toolbar {
+	position: sticky;
+	z-index: z-index(".editor-text-editor__toolbar");
+	top: 0;
+	left: 0;
+	right: 0;
+	display: flex;
+	background: rgba($white, 0.8);
+	padding: $grid-unit-05 $grid-unit-15;
+
+	@include break-small() {
+		padding: $grid-unit-15;
+	}
+
+	@include break-large() {
+		padding: $grid-unit-15 $grid-unit-30;
+	}
+
+	h2 {
+		line-height: $button-size-next-default-40px;
+		margin: 0 auto 0 0;
+		font-size: $default-font-size;
+		color: $gray-900;
+	}
+}
diff --git a/packages/editor/src/components/theme-support-check/index.js b/packages/editor/src/components/theme-support-check/index.js
index fb84b55f5f3707..78fbde809a7088 100644
--- a/packages/editor/src/components/theme-support-check/index.js
+++ b/packages/editor/src/components/theme-support-check/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 
 /**
@@ -9,12 +9,23 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import { store as editorStore } from '../../store';
 
-export function ThemeSupportCheck( {
-	themeSupports,
-	children,
-	postType,
-	supportKeys,
-} ) {
+/**
+ * Checks if the current theme supports specific features and renders the children if supported.
+ *
+ * @param {Object}          props             The component props.
+ * @param {Element}         props.children    The children to render if the theme supports the specified features.
+ * @param {string|string[]} props.supportKeys The key(s) of the theme support(s) to check.
+ *
+ * @return {JSX.Element|null} The rendered children if the theme supports the specified features, otherwise null.
+ */
+export default function ThemeSupportCheck( { children, supportKeys } ) {
+	const { postType, themeSupports } = useSelect( ( select ) => {
+		return {
+			postType: select( editorStore ).getEditedPostAttribute( 'type' ),
+			themeSupports: select( coreStore ).getThemeSupports(),
+		};
+	}, [] );
+
 	const isSupported = (
 		Array.isArray( supportKeys ) ? supportKeys : [ supportKeys ]
 	).some( ( key ) => {
@@ -35,12 +46,3 @@ export function ThemeSupportCheck( {
 
 	return children;
 }
-
-export default withSelect( ( select ) => {
-	const { getThemeSupports } = select( coreStore );
-	const { getEditedPostAttribute } = select( editorStore );
-	return {
-		postType: getEditedPostAttribute( 'type' ),
-		themeSupports: getThemeSupports(),
-	};
-} )( ThemeSupportCheck );
diff --git a/packages/editor/src/components/theme-support-check/test/index.js b/packages/editor/src/components/theme-support-check/test/index.js
index acdbcfe2535526..b7f4dd45f2b236 100644
--- a/packages/editor/src/components/theme-support-check/test/index.js
+++ b/packages/editor/src/components/theme-support-check/test/index.js
@@ -3,27 +3,38 @@
  */
 import { render, screen } from '@testing-library/react';
 
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
-import { ThemeSupportCheck } from '../index';
+import ThemeSupportCheck from '../';
+
+jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
+
+function setupUseSelectMock( themeSupports = {}, postType = 'post' ) {
+	useSelect.mockImplementation( ( cb ) => {
+		return cb( () => ( {
+			getEditedPostAttribute: () => postType,
+			getThemeSupports: () => themeSupports,
+		} ) );
+	} );
+}
 
 describe( 'ThemeSupportCheck', () => {
 	it( "should not render if there's no support check provided", () => {
+		setupUseSelectMock( { 'post-thumbnails': true } );
 		render( <ThemeSupportCheck>foobar</ThemeSupportCheck> );
 		expect( screen.queryByText( 'foobar' ) ).not.toBeInTheDocument();
 	} );
 
 	it( 'should render if post-thumbnails are supported', () => {
-		const themeSupports = {
-			'post-thumbnails': true,
-		};
-		const supportKeys = 'post-thumbnails';
+		setupUseSelectMock( { 'post-thumbnails': true } );
 		render(
-			<ThemeSupportCheck
-				supportKeys={ supportKeys }
-				themeSupports={ themeSupports }
-			>
+			<ThemeSupportCheck supportKeys="post-thumbnails">
 				foobar
 			</ThemeSupportCheck>
 		);
@@ -31,16 +42,14 @@ describe( 'ThemeSupportCheck', () => {
 	} );
 
 	it( 'should render if post-thumbnails are supported for the post type', () => {
-		const themeSupports = {
-			'post-thumbnails': [ 'post' ],
-		};
-		const supportKeys = 'post-thumbnails';
+		setupUseSelectMock(
+			{
+				'post-thumbnails': [ 'post' ],
+			},
+			'post'
+		);
 		render(
-			<ThemeSupportCheck
-				supportKeys={ supportKeys }
-				postType={ 'post' }
-				themeSupports={ themeSupports }
-			>
+			<ThemeSupportCheck supportKeys="post-thumbnails">
 				foobar
 			</ThemeSupportCheck>
 		);
@@ -48,16 +57,14 @@ describe( 'ThemeSupportCheck', () => {
 	} );
 
 	it( "should not render if post-thumbnails aren't supported for the post type", () => {
-		const themeSupports = {
-			'post-thumbnails': [ 'post' ],
-		};
-		const supportKeys = 'post-thumbnails';
+		setupUseSelectMock(
+			{
+				'post-thumbnails': [ 'post' ],
+			},
+			'page'
+		);
 		render(
-			<ThemeSupportCheck
-				supportKeys={ supportKeys }
-				postType={ 'page' }
-				themeSupports={ themeSupports }
-			>
+			<ThemeSupportCheck supportKeys="post-thumbnails">
 				foobar
 			</ThemeSupportCheck>
 		);
@@ -65,16 +72,14 @@ describe( 'ThemeSupportCheck', () => {
 	} );
 
 	it( 'should not render if post-thumbnails is limited and false is passed for postType', () => {
-		const themeSupports = {
-			'post-thumbnails': [ 'post' ],
-		};
-		const supportKeys = 'post-thumbnails';
+		setupUseSelectMock(
+			{
+				'post-thumbnails': [ 'post' ],
+			},
+			false
+		);
 		render(
-			<ThemeSupportCheck
-				supportKeys={ supportKeys }
-				postType={ false }
-				themeSupports={ themeSupports }
-			>
+			<ThemeSupportCheck supportKeys="post-thumbnails">
 				foobar
 			</ThemeSupportCheck>
 		);
@@ -82,15 +87,11 @@ describe( 'ThemeSupportCheck', () => {
 	} );
 
 	it( "should not render if theme doesn't support post-thumbnails", () => {
-		const themeSupports = {
+		setupUseSelectMock( {
 			'post-thumbnails': false,
-		};
-		const supportKeys = 'post-thumbnails';
+		} );
 		render(
-			<ThemeSupportCheck
-				supportKeys={ supportKeys }
-				themeSupports={ themeSupports }
-			>
+			<ThemeSupportCheck supportKeys="post-thumbnails">
 				foobar
 			</ThemeSupportCheck>
 		);
diff --git a/packages/editor/src/components/time-to-read/index.js b/packages/editor/src/components/time-to-read/index.js
index 41b458124c6f3b..a71a4b1dac8388 100644
--- a/packages/editor/src/components/time-to-read/index.js
+++ b/packages/editor/src/components/time-to-read/index.js
@@ -20,6 +20,11 @@ import { store as editorStore } from '../../store';
  */
 const AVERAGE_READING_RATE = 189;
 
+/**
+ * Component for showing Time To Read in Content.
+ *
+ * @return {JSX.Element} The rendered TimeToRead component.
+ */
 export default function TimeToRead() {
 	const content = useSelect(
 		( select ) => select( editorStore ).getEditedPostAttribute( 'content' ),
diff --git a/packages/editor/src/components/visual-editor/edit-template-blocks-notification.js b/packages/editor/src/components/visual-editor/edit-template-blocks-notification.js
new file mode 100644
index 00000000000000..bacf1beb1abecd
--- /dev/null
+++ b/packages/editor/src/components/visual-editor/edit-template-blocks-notification.js
@@ -0,0 +1,101 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { useEffect, useState } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import { __experimentalConfirmDialog as ConfirmDialog } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../../store';
+
+/**
+ * Component that:
+ *
+ * - Displays a 'Edit your template to edit this block' notification when the
+ *   user is focusing on editing page content and clicks on a disabled template
+ *   block.
+ * - Displays a 'Edit your template to edit this block' dialog when the user
+ *   is focusing on editing page conetnt and double clicks on a disabled
+ *   template block.
+ *
+ * @param {Object}                                 props
+ * @param {import('react').RefObject<HTMLElement>} props.contentRef Ref to the block
+ *                                                                  editor iframe canvas.
+ */
+export default function EditTemplateBlocksNotification( { contentRef } ) {
+	const { onNavigateToEntityRecord, templateId } = useSelect( ( select ) => {
+		const { getEditorSettings, getCurrentTemplateId } =
+			select( editorStore );
+
+		return {
+			onNavigateToEntityRecord:
+				getEditorSettings().onNavigateToEntityRecord,
+			templateId: getCurrentTemplateId(),
+		};
+	}, [] );
+
+	const canEditTemplate = useSelect(
+		( select ) =>
+			!! select( coreStore ).canUser( 'create', {
+				kind: 'postType',
+				name: 'wp_template',
+			} ),
+		[]
+	);
+
+	const [ isDialogOpen, setIsDialogOpen ] = useState( false );
+
+	useEffect( () => {
+		const handleDblClick = ( event ) => {
+			if ( ! canEditTemplate ) {
+				return;
+			}
+
+			if (
+				! event.target.classList.contains( 'is-root-container' ) ||
+				event.target.dataset?.type === 'core/template-part'
+			) {
+				return;
+			}
+
+			if ( ! event.defaultPrevented ) {
+				event.preventDefault();
+				setIsDialogOpen( true );
+			}
+		};
+
+		const canvas = contentRef.current;
+		canvas?.addEventListener( 'dblclick', handleDblClick );
+		return () => {
+			canvas?.removeEventListener( 'dblclick', handleDblClick );
+		};
+	}, [ contentRef, canEditTemplate ] );
+
+	if ( ! canEditTemplate ) {
+		return null;
+	}
+
+	return (
+		<ConfirmDialog
+			isOpen={ isDialogOpen }
+			confirmButtonText={ __( 'Edit template' ) }
+			onConfirm={ () => {
+				setIsDialogOpen( false );
+				onNavigateToEntityRecord( {
+					postId: templateId,
+					postType: 'wp_template',
+				} );
+			} }
+			onCancel={ () => setIsDialogOpen( false ) }
+			size="medium"
+		>
+			{ __(
+				'You’ve tried to select a block that is part of a template, which may be used on other posts and pages. Would you like to edit the template?'
+			) }
+		</ConfirmDialog>
+	);
+}
diff --git a/packages/editor/src/components/visual-editor/index.js b/packages/editor/src/components/visual-editor/index.js
new file mode 100644
index 00000000000000..6a5466a265c3eb
--- /dev/null
+++ b/packages/editor/src/components/visual-editor/index.js
@@ -0,0 +1,494 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	BlockList,
+	store as blockEditorStore,
+	__unstableUseTypewriter as useTypewriter,
+	__unstableUseTypingObserver as useTypingObserver,
+	useSettings,
+	RecursionProvider,
+	privateApis as blockEditorPrivateApis,
+	__experimentalUseResizeCanvas as useResizeCanvas,
+} from '@wordpress/block-editor';
+import { useEffect, useRef, useMemo, useState } from '@wordpress/element';
+import { useSelect } from '@wordpress/data';
+import { parse } from '@wordpress/blocks';
+import { store as coreStore } from '@wordpress/core-data';
+import {
+	useMergeRefs,
+	useViewportMatch,
+	useResizeObserver,
+} from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import PostTitle from '../post-title';
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+import EditTemplateBlocksNotification from './edit-template-blocks-notification';
+import ResizableEditor from '../resizable-editor';
+import useSelectNearestEditableBlock from './use-select-nearest-editable-block';
+import {
+	NAVIGATION_POST_TYPE,
+	PATTERN_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+	TEMPLATE_POST_TYPE,
+} from '../../store/constants';
+import { useZoomOutModeExit } from './use-zoom-out-mode-exit';
+
+const {
+	LayoutStyle,
+	useLayoutClasses,
+	useLayoutStyles,
+	ExperimentalBlockCanvas: BlockCanvas,
+	useFlashEditableBlocks,
+} = unlock( blockEditorPrivateApis );
+
+/**
+ * These post types have a special editor where they don't allow you to fill the title
+ * and they don't apply the layout styles.
+ */
+const DESIGN_POST_TYPES = [
+	PATTERN_POST_TYPE,
+	TEMPLATE_POST_TYPE,
+	NAVIGATION_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+];
+
+/**
+ * Given an array of nested blocks, find the first Post Content
+ * block inside it, recursing through any nesting levels,
+ * and return its attributes.
+ *
+ * @param {Array} blocks A list of blocks.
+ *
+ * @return {Object | undefined} The Post Content block.
+ */
+function getPostContentAttributes( blocks ) {
+	for ( let i = 0; i < blocks.length; i++ ) {
+		if ( blocks[ i ].name === 'core/post-content' ) {
+			return blocks[ i ].attributes;
+		}
+		if ( blocks[ i ].innerBlocks.length ) {
+			const nestedPostContent = getPostContentAttributes(
+				blocks[ i ].innerBlocks
+			);
+
+			if ( nestedPostContent ) {
+				return nestedPostContent;
+			}
+		}
+	}
+}
+
+function checkForPostContentAtRootLevel( blocks ) {
+	for ( let i = 0; i < blocks.length; i++ ) {
+		if ( blocks[ i ].name === 'core/post-content' ) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function VisualEditor( {
+	// Ideally as we unify post and site editors, we won't need these props.
+	autoFocus,
+	styles,
+	disableIframe = false,
+	iframeProps,
+	contentRef,
+	className,
+} ) {
+	const [ contentHeight, setContentHeight ] = useState( '' );
+	const effectContentHeight = useResizeObserver( ( [ entry ] ) => {
+		setContentHeight( entry.borderBoxSize[ 0 ].blockSize );
+	} );
+	const isMobileViewport = useViewportMatch( 'small', '<' );
+	const {
+		renderingMode,
+		postContentAttributes,
+		editedPostTemplate = {},
+		wrapperBlockName,
+		wrapperUniqueId,
+		deviceType,
+		isFocusedEntity,
+		isDesignPostType,
+		postType,
+		isPreview,
+	} = useSelect( ( select ) => {
+		const {
+			getCurrentPostId,
+			getCurrentPostType,
+			getCurrentTemplateId,
+			getEditorSettings,
+			getRenderingMode,
+			getDeviceType,
+		} = select( editorStore );
+		const { getPostType, getEditedEntityRecord } = select( coreStore );
+		const postTypeSlug = getCurrentPostType();
+		const _renderingMode = getRenderingMode();
+		let _wrapperBlockName;
+
+		if ( postTypeSlug === PATTERN_POST_TYPE ) {
+			_wrapperBlockName = 'core/block';
+		} else if ( _renderingMode === 'post-only' ) {
+			_wrapperBlockName = 'core/post-content';
+		}
+
+		const editorSettings = getEditorSettings();
+		const supportsTemplateMode = editorSettings.supportsTemplateMode;
+		const postTypeObject = getPostType( postTypeSlug );
+		const currentTemplateId = getCurrentTemplateId();
+		const template = currentTemplateId
+			? getEditedEntityRecord(
+					'postType',
+					TEMPLATE_POST_TYPE,
+					currentTemplateId
+			  )
+			: undefined;
+
+		return {
+			renderingMode: _renderingMode,
+			postContentAttributes: editorSettings.postContentAttributes,
+			isDesignPostType: DESIGN_POST_TYPES.includes( postTypeSlug ),
+			// Post template fetch returns a 404 on classic themes, which
+			// messes with e2e tests, so check it's a block theme first.
+			editedPostTemplate:
+				postTypeObject?.viewable && supportsTemplateMode
+					? template
+					: undefined,
+			wrapperBlockName: _wrapperBlockName,
+			wrapperUniqueId: getCurrentPostId(),
+			deviceType: getDeviceType(),
+			isFocusedEntity: !! editorSettings.onNavigateToPreviousEntityRecord,
+			postType: postTypeSlug,
+			isPreview: editorSettings.isPreviewMode,
+		};
+	}, [] );
+	const { isCleanNewPost } = useSelect( editorStore );
+	const {
+		hasRootPaddingAwareAlignments,
+		themeHasDisabledLayoutStyles,
+		themeSupportsLayout,
+		isZoomedOut,
+	} = useSelect( ( select ) => {
+		const { getSettings, isZoomOut: _isZoomOut } = unlock(
+			select( blockEditorStore )
+		);
+
+		const _settings = getSettings();
+		return {
+			themeHasDisabledLayoutStyles: _settings.disableLayoutStyles,
+			themeSupportsLayout: _settings.supportsLayout,
+			hasRootPaddingAwareAlignments:
+				_settings.__experimentalFeatures?.useRootPaddingAwareAlignments,
+			isZoomedOut: _isZoomOut(),
+		};
+	}, [] );
+
+	const deviceStyles = useResizeCanvas( deviceType );
+	const [ globalLayoutSettings ] = useSettings( 'layout' );
+
+	// fallbackLayout is used if there is no Post Content,
+	// and for Post Title.
+	const fallbackLayout = useMemo( () => {
+		if ( renderingMode !== 'post-only' || isDesignPostType ) {
+			return { type: 'default' };
+		}
+
+		if ( themeSupportsLayout ) {
+			// We need to ensure support for wide and full alignments,
+			// so we add the constrained type.
+			return { ...globalLayoutSettings, type: 'constrained' };
+		}
+		// Set default layout for classic themes so all alignments are supported.
+		return { type: 'default' };
+	}, [
+		renderingMode,
+		themeSupportsLayout,
+		globalLayoutSettings,
+		isDesignPostType,
+	] );
+
+	const newestPostContentAttributes = useMemo( () => {
+		if (
+			! editedPostTemplate?.content &&
+			! editedPostTemplate?.blocks &&
+			postContentAttributes
+		) {
+			return postContentAttributes;
+		}
+		// When in template editing mode, we can access the blocks directly.
+		if ( editedPostTemplate?.blocks ) {
+			return getPostContentAttributes( editedPostTemplate?.blocks );
+		}
+		// If there are no blocks, we have to parse the content string.
+		// Best double-check it's a string otherwise the parse function gets unhappy.
+		const parseableContent =
+			typeof editedPostTemplate?.content === 'string'
+				? editedPostTemplate?.content
+				: '';
+
+		return getPostContentAttributes( parse( parseableContent ) ) || {};
+	}, [
+		editedPostTemplate?.content,
+		editedPostTemplate?.blocks,
+		postContentAttributes,
+	] );
+
+	const hasPostContentAtRootLevel = useMemo( () => {
+		if ( ! editedPostTemplate?.content && ! editedPostTemplate?.blocks ) {
+			return false;
+		}
+		// When in template editing mode, we can access the blocks directly.
+		if ( editedPostTemplate?.blocks ) {
+			return checkForPostContentAtRootLevel( editedPostTemplate?.blocks );
+		}
+		// If there are no blocks, we have to parse the content string.
+		// Best double-check it's a string otherwise the parse function gets unhappy.
+		const parseableContent =
+			typeof editedPostTemplate?.content === 'string'
+				? editedPostTemplate?.content
+				: '';
+
+		return (
+			checkForPostContentAtRootLevel( parse( parseableContent ) ) || false
+		);
+	}, [ editedPostTemplate?.content, editedPostTemplate?.blocks ] );
+
+	const { layout = {}, align = '' } = newestPostContentAttributes || {};
+
+	const postContentLayoutClasses = useLayoutClasses(
+		newestPostContentAttributes,
+		'core/post-content'
+	);
+
+	const blockListLayoutClass = clsx(
+		{
+			'is-layout-flow': ! themeSupportsLayout,
+		},
+		themeSupportsLayout && postContentLayoutClasses,
+		align && `align${ align }`
+	);
+
+	const postContentLayoutStyles = useLayoutStyles(
+		newestPostContentAttributes,
+		'core/post-content',
+		'.block-editor-block-list__layout.is-root-container'
+	);
+
+	// Update type for blocks using legacy layouts.
+	const postContentLayout = useMemo( () => {
+		return layout &&
+			( layout?.type === 'constrained' ||
+				layout?.inherit ||
+				layout?.contentSize ||
+				layout?.wideSize )
+			? { ...globalLayoutSettings, ...layout, type: 'constrained' }
+			: { ...globalLayoutSettings, ...layout, type: 'default' };
+	}, [
+		layout?.type,
+		layout?.inherit,
+		layout?.contentSize,
+		layout?.wideSize,
+		globalLayoutSettings,
+	] );
+
+	// If there is a Post Content block we use its layout for the block list;
+	// if not, this must be a classic theme, in which case we use the fallback layout.
+	const blockListLayout = postContentAttributes
+		? postContentLayout
+		: fallbackLayout;
+
+	const postEditorLayout =
+		blockListLayout?.type === 'default' && ! hasPostContentAtRootLevel
+			? fallbackLayout
+			: blockListLayout;
+	const observeTypingRef = useTypingObserver();
+	const titleRef = useRef();
+	useEffect( () => {
+		if ( ! autoFocus || ! isCleanNewPost() ) {
+			return;
+		}
+		titleRef?.current?.focus();
+	}, [ autoFocus, isCleanNewPost ] );
+
+	// Add some styles for alignwide/alignfull Post Content and its children.
+	const alignCSS = `.is-root-container.alignwide { max-width: var(--wp--style--global--wide-size); margin-left: auto; margin-right: auto;}
+		.is-root-container.alignwide:where(.is-layout-flow) > :not(.alignleft):not(.alignright) { max-width: var(--wp--style--global--wide-size);}
+		.is-root-container.alignfull { max-width: none; margin-left: auto; margin-right: auto;}
+		.is-root-container.alignfull:where(.is-layout-flow) > :not(.alignleft):not(.alignright) { max-width: none;}`;
+
+	const forceFullHeight = postType === NAVIGATION_POST_TYPE;
+	const enableResizing =
+		[
+			NAVIGATION_POST_TYPE,
+			TEMPLATE_PART_POST_TYPE,
+			PATTERN_POST_TYPE,
+		].includes( postType ) &&
+		// Disable in previews / view mode.
+		! isPreview &&
+		// Disable resizing in mobile viewport.
+		! isMobileViewport &&
+		// Dsiable resizing in zoomed-out mode.
+		! isZoomedOut;
+
+	const iframeStyles = useMemo( () => {
+		return [
+			...( styles ?? [] ),
+			{
+				// Ensures margins of children are contained so that the body background paints behind them.
+				// Otherwise, the background of html (when zoomed out) would show there and appear broken. It’s
+				// important mostly for post-only views yet conceivably an issue in templated views too.
+				css: `:where(.block-editor-iframe__body){display:flow-root;}.is-root-container{display:flow-root;${
+					// Some themes will have `min-height: 100vh` for the root container,
+					// which isn't a requirement in auto resize mode.
+					enableResizing ? 'min-height:0!important;' : ''
+				}}`,
+			},
+		];
+	}, [ styles, enableResizing ] );
+
+	const localRef = useRef();
+	const typewriterRef = useTypewriter();
+	contentRef = useMergeRefs( [
+		localRef,
+		contentRef,
+		renderingMode === 'post-only' ? typewriterRef : null,
+		useFlashEditableBlocks( {
+			isEnabled: renderingMode === 'template-locked',
+		} ),
+		useSelectNearestEditableBlock( {
+			isEnabled: renderingMode === 'template-locked',
+		} ),
+		useZoomOutModeExit(),
+		// Avoid resize listeners when not needed, these will trigger
+		// unnecessary re-renders when animating the iframe width.
+		enableResizing ? effectContentHeight : null,
+	] );
+
+	return (
+		<div
+			className={ clsx(
+				'editor-visual-editor',
+				// this class is here for backward compatibility reasons.
+				'edit-post-visual-editor',
+				className,
+				{
+					'has-padding': isFocusedEntity || enableResizing,
+					'is-resizable': enableResizing,
+					'is-iframed': ! disableIframe,
+				}
+			) }
+		>
+			<ResizableEditor
+				enableResizing={ enableResizing }
+				height={
+					contentHeight && ! forceFullHeight ? contentHeight : '100%'
+				}
+			>
+				<BlockCanvas
+					shouldIframe={ ! disableIframe }
+					contentRef={ contentRef }
+					styles={ iframeStyles }
+					height="100%"
+					iframeProps={ {
+						...iframeProps,
+						style: {
+							...iframeProps?.style,
+							...deviceStyles,
+						},
+					} }
+				>
+					{ themeSupportsLayout &&
+						! themeHasDisabledLayoutStyles &&
+						renderingMode === 'post-only' &&
+						! isDesignPostType && (
+							<>
+								<LayoutStyle
+									selector=".editor-visual-editor__post-title-wrapper"
+									layout={ fallbackLayout }
+								/>
+								<LayoutStyle
+									selector=".block-editor-block-list__layout.is-root-container"
+									layout={ postEditorLayout }
+								/>
+								{ align && <LayoutStyle css={ alignCSS } /> }
+								{ postContentLayoutStyles && (
+									<LayoutStyle
+										layout={ postContentLayout }
+										css={ postContentLayoutStyles }
+									/>
+								) }
+							</>
+						) }
+					{ renderingMode === 'post-only' && ! isDesignPostType && (
+						<div
+							className={ clsx(
+								'editor-visual-editor__post-title-wrapper',
+								// The following class is only here for backward comapatibility
+								// some themes might be using it to style the post title.
+								'edit-post-visual-editor__post-title-wrapper',
+								{
+									'has-global-padding':
+										hasRootPaddingAwareAlignments,
+								}
+							) }
+							contentEditable={ false }
+							ref={ observeTypingRef }
+							style={ {
+								// This is using inline styles
+								// so it's applied for both iframed and non iframed editors.
+								marginTop: '4rem',
+							} }
+						>
+							<PostTitle ref={ titleRef } />
+						</div>
+					) }
+					<RecursionProvider
+						blockName={ wrapperBlockName }
+						uniqueId={ wrapperUniqueId }
+					>
+						<BlockList
+							className={ clsx(
+								'is-' + deviceType.toLowerCase() + '-preview',
+								renderingMode !== 'post-only' ||
+									isDesignPostType
+									? 'wp-site-blocks'
+									: `${ blockListLayoutClass } wp-block-post-content` // Ensure root level blocks receive default/flow blockGap styling rules.
+							) }
+							layout={ blockListLayout }
+							dropZoneElement={
+								// When iframed, pass in the html element of the iframe to
+								// ensure the drop zone extends to the edges of the iframe.
+								disableIframe
+									? localRef.current
+									: localRef.current?.parentNode
+							}
+							__unstableDisableDropZone={
+								// In template preview mode, disable drop zones at the root of the template.
+								renderingMode === 'template-locked'
+									? true
+									: false
+							}
+						/>
+						{ renderingMode === 'template-locked' && (
+							<EditTemplateBlocksNotification
+								contentRef={ localRef }
+							/>
+						) }
+					</RecursionProvider>
+				</BlockCanvas>
+			</ResizableEditor>
+		</div>
+	);
+}
+
+export default VisualEditor;
diff --git a/packages/editor/src/components/visual-editor/style.scss b/packages/editor/src/components/visual-editor/style.scss
new file mode 100644
index 00000000000000..fae61eda6b8013
--- /dev/null
+++ b/packages/editor/src/components/visual-editor/style.scss
@@ -0,0 +1,36 @@
+.editor-visual-editor {
+	position: relative;
+	display: flex;
+	background-color: $gray-300;
+
+	// Centralize the editor horizontally (flex-direction is column).
+	align-items: center;
+
+	&.is-resizable {
+		max-height: 100%;
+	}
+
+	&.has-padding {
+		padding: $grid-unit-30 $grid-unit-30 0;
+	}
+
+	// In the iframed canvas this keeps extra scrollbars from appearing (when block toolbars overflow). In the
+	// legacy (non-iframed) canvas, overflow must not be hidden in order to maintain support for sticky positioning.
+	&.is-iframed {
+		overflow: hidden;
+	}
+
+	// The button element easily inherits styles that are meant for the editor style.
+	// These rules enhance the specificity to reduce that inheritance.
+	// This is duplicated in edit-site.
+	& .components-button {
+		font-family: $default-font;
+		font-size: $default-font-size;
+		padding: 6px 12px;
+
+		&.is-tertiary,
+		&.has-icon {
+			padding: 6px;
+		}
+	}
+}
diff --git a/packages/editor/src/components/visual-editor/use-select-nearest-editable-block.js b/packages/editor/src/components/visual-editor/use-select-nearest-editable-block.js
new file mode 100644
index 00000000000000..5cc84cb7fb5037
--- /dev/null
+++ b/packages/editor/src/components/visual-editor/use-select-nearest-editable-block.js
@@ -0,0 +1,95 @@
+/**
+ * WordPress dependencies
+ */
+import { useRefEffect } from '@wordpress/compose';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const DISTANCE_THRESHOLD = 500;
+
+function clamp( value, min, max ) {
+	return Math.min( Math.max( value, min ), max );
+}
+
+function distanceFromRect( x, y, rect ) {
+	const dx = x - clamp( x, rect.left, rect.right );
+	const dy = y - clamp( y, rect.top, rect.bottom );
+	return Math.sqrt( dx * dx + dy * dy );
+}
+
+export default function useSelectNearestEditableBlock( {
+	isEnabled = true,
+} = {} ) {
+	const { getEnabledClientIdsTree, getBlockName, getBlockOrder } = unlock(
+		useSelect( blockEditorStore )
+	);
+	const { selectBlock } = useDispatch( blockEditorStore );
+
+	return useRefEffect(
+		( element ) => {
+			if ( ! isEnabled ) {
+				return;
+			}
+
+			const selectNearestEditableBlock = ( x, y ) => {
+				const editableBlockClientIds =
+					getEnabledClientIdsTree().flatMap( ( { clientId } ) => {
+						const blockName = getBlockName( clientId );
+						if ( blockName === 'core/template-part' ) {
+							return [];
+						}
+						if ( blockName === 'core/post-content' ) {
+							const innerBlocks = getBlockOrder( clientId );
+							if ( innerBlocks.length ) {
+								return innerBlocks;
+							}
+						}
+						return [ clientId ];
+					} );
+
+				let nearestDistance = Infinity,
+					nearestClientId = null;
+
+				for ( const clientId of editableBlockClientIds ) {
+					const block = element.querySelector(
+						`[data-block="${ clientId }"]`
+					);
+					if ( ! block ) {
+						continue;
+					}
+					const rect = block.getBoundingClientRect();
+					const distance = distanceFromRect( x, y, rect );
+					if (
+						distance < nearestDistance &&
+						distance < DISTANCE_THRESHOLD
+					) {
+						nearestDistance = distance;
+						nearestClientId = clientId;
+					}
+				}
+
+				if ( nearestClientId ) {
+					selectBlock( nearestClientId );
+				}
+			};
+
+			const handleClick = ( event ) => {
+				const shouldSelect =
+					event.target === element ||
+					event.target.classList.contains( 'is-root-container' );
+				if ( shouldSelect ) {
+					selectNearestEditableBlock( event.clientX, event.clientY );
+				}
+			};
+
+			element.addEventListener( 'click', handleClick );
+			return () => element.removeEventListener( 'click', handleClick );
+		},
+		[ isEnabled ]
+	);
+}
diff --git a/packages/editor/src/components/visual-editor/use-zoom-out-mode-exit.js b/packages/editor/src/components/visual-editor/use-zoom-out-mode-exit.js
new file mode 100644
index 00000000000000..5a2bb49dbb832e
--- /dev/null
+++ b/packages/editor/src/components/visual-editor/use-zoom-out-mode-exit.js
@@ -0,0 +1,49 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useRefEffect } from '@wordpress/compose';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+/**
+ * Allows Zoom Out mode to be exited by double clicking in the selected block.
+ */
+export function useZoomOutModeExit() {
+	const { getSettings, isZoomOut } = unlock( useSelect( blockEditorStore ) );
+	const { resetZoomLevel } = unlock( useDispatch( blockEditorStore ) );
+
+	return useRefEffect(
+		( node ) => {
+			function onDoubleClick( event ) {
+				if ( ! isZoomOut() ) {
+					return;
+				}
+
+				if ( ! event.defaultPrevented ) {
+					event.preventDefault();
+
+					const { __experimentalSetIsInserterOpened } = getSettings();
+
+					if (
+						typeof __experimentalSetIsInserterOpened === 'function'
+					) {
+						__experimentalSetIsInserterOpened( false );
+					}
+					resetZoomLevel();
+				}
+			}
+
+			node.addEventListener( 'dblclick', onDoubleClick );
+
+			return () => {
+				node.removeEventListener( 'dblclick', onDoubleClick );
+			};
+		},
+		[ getSettings, isZoomOut, resetZoomLevel ]
+	);
+}
diff --git a/packages/editor/src/components/word-count/index.js b/packages/editor/src/components/word-count/index.js
index 1aad38d62132d0..aab562b46b89ff 100644
--- a/packages/editor/src/components/word-count/index.js
+++ b/packages/editor/src/components/word-count/index.js
@@ -10,6 +10,11 @@ import { count as wordCount } from '@wordpress/wordcount';
  */
 import { store as editorStore } from '../../store';
 
+/**
+ * Renders the word count of the post content.
+ *
+ * @return {JSX.Element|null} The rendered WordCount component.
+ */
 export default function WordCount() {
 	const content = useSelect(
 		( select ) => select( editorStore ).getEditedPostAttribute( 'content' ),
diff --git a/packages/editor/src/components/zoom-out-toggle/index.js b/packages/editor/src/components/zoom-out-toggle/index.js
new file mode 100644
index 00000000000000..81506add699c97
--- /dev/null
+++ b/packages/editor/src/components/zoom-out-toggle/index.js
@@ -0,0 +1,82 @@
+/**
+ * WordPress dependencies
+ */
+import { Button } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useEffect } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { square as zoomOutIcon } from '@wordpress/icons';
+import { store as preferencesStore } from '@wordpress/preferences';
+import {
+	useShortcut,
+	store as keyboardShortcutsStore,
+} from '@wordpress/keyboard-shortcuts';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const ZoomOutToggle = ( { disabled } ) => {
+	const { isZoomOut, showIconLabels } = useSelect( ( select ) => ( {
+		isZoomOut: unlock( select( blockEditorStore ) ).isZoomOut(),
+		showIconLabels: select( preferencesStore ).get(
+			'core',
+			'showIconLabels'
+		),
+	} ) );
+
+	const { resetZoomLevel, setZoomLevel } = unlock(
+		useDispatch( blockEditorStore )
+	);
+	const { registerShortcut, unregisterShortcut } = useDispatch(
+		keyboardShortcutsStore
+	);
+
+	useEffect( () => {
+		registerShortcut( {
+			name: 'core/editor/zoom',
+			category: 'global',
+			description: __( 'Enter or exit zoom out.' ),
+			keyCombination: {
+				modifier: 'primaryShift',
+				character: '0',
+			},
+		} );
+		return () => {
+			unregisterShortcut( 'core/editor/zoom' );
+		};
+	}, [ registerShortcut, unregisterShortcut ] );
+
+	useShortcut( 'core/editor/zoom', () => {
+		if ( isZoomOut ) {
+			resetZoomLevel();
+		} else {
+			setZoomLevel( 'auto-scaled' );
+		}
+	} );
+
+	const handleZoomOut = () => {
+		if ( isZoomOut ) {
+			resetZoomLevel();
+		} else {
+			setZoomLevel( 'auto-scaled' );
+		}
+	};
+
+	return (
+		<Button
+			accessibleWhenDisabled
+			disabled={ disabled }
+			onClick={ handleZoomOut }
+			icon={ zoomOutIcon }
+			label={ __( 'Zoom Out' ) }
+			isPressed={ isZoomOut }
+			size="compact"
+			showTooltip={ ! showIconLabels }
+		/>
+	);
+};
+
+export default ZoomOutToggle;
diff --git a/packages/editor/src/dataviews/actions/duplicate-template-part.tsx b/packages/editor/src/dataviews/actions/duplicate-template-part.tsx
new file mode 100644
index 00000000000000..fa3cf39ba76268
--- /dev/null
+++ b/packages/editor/src/dataviews/actions/duplicate-template-part.tsx
@@ -0,0 +1,70 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch } from '@wordpress/data';
+import { __, sprintf, _x } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import { useMemo } from '@wordpress/element';
+// @ts-ignore
+import { parse } from '@wordpress/blocks';
+import type { Action } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_PART_POST_TYPE } from '../../store/constants';
+import { CreateTemplatePartModalContents } from '../../components/create-template-part-modal';
+import { getItemTitle } from './utils';
+import type { TemplatePart } from '../types';
+
+const duplicateTemplatePart: Action< TemplatePart > = {
+	id: 'duplicate-template-part',
+	label: _x( 'Duplicate', 'action label' ),
+	isEligible: ( item ) => item.type === TEMPLATE_PART_POST_TYPE,
+	modalHeader: _x( 'Duplicate template part', 'action label' ),
+	RenderModal: ( { items, closeModal } ) => {
+		const [ item ] = items;
+		const blocks = useMemo( () => {
+			return (
+				item.blocks ??
+				parse(
+					typeof item.content === 'string'
+						? item.content
+						: item.content.raw,
+					{
+						__unstableSkipMigrationLogs: true,
+					}
+				)
+			);
+		}, [ item.content, item.blocks ] );
+		const { createSuccessNotice } = useDispatch( noticesStore );
+		function onTemplatePartSuccess() {
+			createSuccessNotice(
+				sprintf(
+					// translators: %s: The new template part's title e.g. 'Call to action (copy)'.
+					__( '"%s" duplicated.' ),
+					getItemTitle( item )
+				),
+				{ type: 'snackbar', id: 'edit-site-patterns-success' }
+			);
+			closeModal?.();
+		}
+		return (
+			<CreateTemplatePartModalContents
+				blocks={ blocks }
+				defaultArea={ item.area }
+				defaultTitle={ sprintf(
+					/* translators: %s: Existing template part title */
+					__( '%s (Copy)' ),
+					getItemTitle( item )
+				) }
+				onCreate={ onTemplatePartSuccess }
+				onError={ closeModal }
+				confirmLabel={ _x( 'Duplicate', 'action label' ) }
+				closeModal={ closeModal }
+			/>
+		);
+	},
+};
+
+export default duplicateTemplatePart;
diff --git a/packages/editor/src/dataviews/actions/utils.ts b/packages/editor/src/dataviews/actions/utils.ts
new file mode 100644
index 00000000000000..33a2be16397f3f
--- /dev/null
+++ b/packages/editor/src/dataviews/actions/utils.ts
@@ -0,0 +1,64 @@
+/**
+ * WordPress dependencies
+ */
+import { decodeEntities } from '@wordpress/html-entities';
+
+/**
+ * Internal dependencies
+ */
+import {
+	TEMPLATE_ORIGINS,
+	TEMPLATE_PART_POST_TYPE,
+	TEMPLATE_POST_TYPE,
+} from '../../store/constants';
+
+import type { Post, TemplatePart, Template } from '../types';
+
+export function isTemplate( post: Post ): post is Template {
+	return post.type === TEMPLATE_POST_TYPE;
+}
+
+export function isTemplatePart( post: Post ): post is TemplatePart {
+	return post.type === TEMPLATE_PART_POST_TYPE;
+}
+
+export function isTemplateOrTemplatePart(
+	p: Post
+): p is Template | TemplatePart {
+	return p.type === TEMPLATE_POST_TYPE || p.type === TEMPLATE_PART_POST_TYPE;
+}
+
+export function getItemTitle( item: Post ) {
+	if ( typeof item.title === 'string' ) {
+		return decodeEntities( item.title );
+	}
+	if ( 'rendered' in item.title ) {
+		return decodeEntities( item.title.rendered );
+	}
+	if ( 'raw' in item.title ) {
+		return decodeEntities( item.title.raw );
+	}
+	return '';
+}
+
+/**
+ * Check if a template is removable.
+ *
+ * @param template The template entity to check.
+ * @return Whether the template is removable.
+ */
+export function isTemplateRemovable( template: Template | TemplatePart ) {
+	if ( ! template ) {
+		return false;
+	}
+	// In patterns list page we map the templates parts to a different object
+	// than the one returned from the endpoint. This is why we need to check for
+	// two props whether is custom or has a theme file.
+	return (
+		[ template.source, template.source ].includes(
+			TEMPLATE_ORIGINS.custom
+		) &&
+		! Boolean( template.type === 'wp_template' && template?.plugin ) &&
+		! template.has_theme_file
+	);
+}
diff --git a/packages/editor/src/dataviews/api.js b/packages/editor/src/dataviews/api.js
new file mode 100644
index 00000000000000..130a69bba754c7
--- /dev/null
+++ b/packages/editor/src/dataviews/api.js
@@ -0,0 +1,55 @@
+/**
+ * WordPress dependencies
+ */
+import { dispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../lock-unlock';
+import { store as editorStore } from '../store';
+
+/**
+ * @typedef {import('@wordpress/dataviews').Action} Action
+ */
+
+/**
+ * Registers a new DataViews action.
+ *
+ * This is an experimental API and is subject to change.
+ * it's only available in the Gutenberg plugin for now.
+ *
+ * @param {string} kind   Entity kind.
+ * @param {string} name   Entity name.
+ * @param {Action} config Action configuration.
+ */
+
+export function registerEntityAction( kind, name, config ) {
+	const { registerEntityAction: _registerEntityAction } = unlock(
+		dispatch( editorStore )
+	);
+
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+		_registerEntityAction( kind, name, config );
+	}
+}
+
+/**
+ * Unregisters a DataViews action.
+ *
+ * This is an experimental API and is subject to change.
+ * it's only available in the Gutenberg plugin for now.
+ *
+ * @param {string} kind     Entity kind.
+ * @param {string} name     Entity name.
+ * @param {string} actionId Action ID.
+ */
+export function unregisterEntityAction( kind, name, actionId ) {
+	const { unregisterEntityAction: _unregisterEntityAction } = unlock(
+		dispatch( editorStore )
+	);
+
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+		_unregisterEntityAction( kind, name, actionId );
+	}
+}
diff --git a/packages/editor/src/dataviews/store/private-actions.ts b/packages/editor/src/dataviews/store/private-actions.ts
new file mode 100644
index 00000000000000..10f2b9ce872d5a
--- /dev/null
+++ b/packages/editor/src/dataviews/store/private-actions.ts
@@ -0,0 +1,141 @@
+/**
+ * WordPress dependencies
+ */
+import { store as coreStore } from '@wordpress/core-data';
+import type { Action } from '@wordpress/dataviews';
+import { doAction } from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import type { PostType } from '../types';
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+import {
+	viewPost,
+	viewPostRevisions,
+	duplicatePost,
+	duplicatePattern,
+	reorderPage,
+	exportPattern,
+	permanentlyDeletePost,
+	restorePost,
+	trashPost,
+	renamePost,
+	resetPost,
+	deletePost,
+} from '@wordpress/fields';
+import duplicateTemplatePart from '../actions/duplicate-template-part';
+
+export function registerEntityAction< Item >(
+	kind: string,
+	name: string,
+	config: Action< Item >
+) {
+	return {
+		type: 'REGISTER_ENTITY_ACTION' as const,
+		kind,
+		name,
+		config,
+	};
+}
+
+export function unregisterEntityAction(
+	kind: string,
+	name: string,
+	actionId: string
+) {
+	return {
+		type: 'UNREGISTER_ENTITY_ACTION' as const,
+		kind,
+		name,
+		actionId,
+	};
+}
+
+export function setIsReady( kind: string, name: string ) {
+	return {
+		type: 'SET_IS_READY' as const,
+		kind,
+		name,
+	};
+}
+
+export const registerPostTypeActions =
+	( postType: string ) =>
+	async ( { registry }: { registry: any } ) => {
+		const isReady = unlock( registry.select( editorStore ) ).isEntityReady(
+			'postType',
+			postType
+		);
+		if ( isReady ) {
+			return;
+		}
+
+		unlock( registry.dispatch( editorStore ) ).setIsReady(
+			'postType',
+			postType
+		);
+
+		const postTypeConfig = ( await registry
+			.resolveSelect( coreStore )
+			.getPostType( postType ) ) as PostType;
+
+		const canCreate = await registry
+			.resolveSelect( coreStore )
+			.canUser( 'create', {
+				kind: 'postType',
+				name: postType,
+			} );
+		const currentTheme = await registry
+			.resolveSelect( coreStore )
+			.getCurrentTheme();
+
+		const actions = [
+			postTypeConfig.viewable ? viewPost : undefined,
+			!! postTypeConfig?.supports?.revisions
+				? viewPostRevisions
+				: undefined,
+			// @ts-ignore
+			globalThis.IS_GUTENBERG_PLUGIN
+				? ! [ 'wp_template', 'wp_block', 'wp_template_part' ].includes(
+						postTypeConfig.slug
+				  ) &&
+				  canCreate &&
+				  duplicatePost
+				: undefined,
+			postTypeConfig.slug === 'wp_template_part' &&
+			canCreate &&
+			currentTheme?.is_block_theme
+				? duplicateTemplatePart
+				: undefined,
+			canCreate && postTypeConfig.slug === 'wp_block'
+				? duplicatePattern
+				: undefined,
+			postTypeConfig.supports?.title ? renamePost : undefined,
+			postTypeConfig?.supports?.[ 'page-attributes' ]
+				? reorderPage
+				: undefined,
+			postTypeConfig.slug === 'wp_block' ? exportPattern : undefined,
+			restorePost,
+			resetPost,
+			deletePost,
+			trashPost,
+			permanentlyDeletePost,
+		];
+
+		registry.batch( () => {
+			actions.forEach( ( action ) => {
+				if ( ! action ) {
+					return;
+				}
+				unlock( registry.dispatch( editorStore ) ).registerEntityAction(
+					'postType',
+					postType,
+					action
+				);
+			} );
+		} );
+
+		doAction( 'core.registerPostTypeActions', postType );
+	};
diff --git a/packages/editor/src/dataviews/store/private-selectors.ts b/packages/editor/src/dataviews/store/private-selectors.ts
new file mode 100644
index 00000000000000..117c5b30966a39
--- /dev/null
+++ b/packages/editor/src/dataviews/store/private-selectors.ts
@@ -0,0 +1,14 @@
+/**
+ * Internal dependencies
+ */
+import type { State } from './reducer';
+
+const EMPTY_ARRAY = [] as [];
+
+export function getEntityActions( state: State, kind: string, name: string ) {
+	return state.actions[ kind ]?.[ name ] ?? EMPTY_ARRAY;
+}
+
+export function isEntityReady( state: State, kind: string, name: string ) {
+	return state.isReady[ kind ]?.[ name ];
+}
diff --git a/packages/editor/src/dataviews/store/reducer.ts b/packages/editor/src/dataviews/store/reducer.ts
new file mode 100644
index 00000000000000..9124b74f02860a
--- /dev/null
+++ b/packages/editor/src/dataviews/store/reducer.ts
@@ -0,0 +1,70 @@
+/**
+ * WordPress dependencies
+ */
+import { combineReducers } from '@wordpress/data';
+import type { Action } from '@wordpress/dataviews';
+
+type ReduxAction =
+	| ReturnType< typeof import('./private-actions').registerEntityAction >
+	| ReturnType< typeof import('./private-actions').unregisterEntityAction >
+	| ReturnType< typeof import('./private-actions').setIsReady >;
+
+export type ActionState = Record< string, Record< string, Action< any >[] > >;
+export type ReadyState = Record< string, Record< string, boolean > >;
+export type State = {
+	actions: ActionState;
+	isReady: ReadyState;
+};
+
+function isReady( state: ReadyState = {}, action: ReduxAction ) {
+	switch ( action.type ) {
+		case 'SET_IS_READY':
+			return {
+				...state,
+				[ action.kind ]: {
+					...state[ action.kind ],
+					[ action.name ]: true,
+				},
+			};
+	}
+
+	return state;
+}
+
+function actions( state: ActionState = {}, action: ReduxAction ) {
+	switch ( action.type ) {
+		case 'REGISTER_ENTITY_ACTION':
+			return {
+				...state,
+				[ action.kind ]: {
+					...state[ action.kind ],
+					[ action.name ]: [
+						...(
+							state[ action.kind ]?.[ action.name ] ?? []
+						).filter(
+							( _action ) => _action.id !== action.config.id
+						),
+						action.config,
+					],
+				},
+			};
+		case 'UNREGISTER_ENTITY_ACTION': {
+			return {
+				...state,
+				[ action.kind ]: {
+					...state[ action.kind ],
+					[ action.name ]: (
+						state[ action.kind ]?.[ action.name ] ?? []
+					).filter( ( _action ) => _action.id !== action.actionId ),
+				},
+			};
+		}
+	}
+
+	return state;
+}
+
+export default combineReducers( {
+	actions,
+	isReady,
+} );
diff --git a/packages/editor/src/dataviews/types.ts b/packages/editor/src/dataviews/types.ts
new file mode 100644
index 00000000000000..664c2dd417201c
--- /dev/null
+++ b/packages/editor/src/dataviews/types.ts
@@ -0,0 +1,85 @@
+type PostStatus =
+	| 'published'
+	| 'draft'
+	| 'pending'
+	| 'private'
+	| 'future'
+	| 'auto-draft'
+	| 'trash';
+
+export interface CommonPost {
+	status?: PostStatus;
+	title: string | { rendered: string } | { raw: string };
+	content: string | { raw: string; rendered: string };
+	type: string;
+	id: string | number;
+	blocks?: Object[];
+	_links?: Links;
+}
+
+interface Links {
+	'predecessor-version'?: { href: string; id: number }[];
+	'version-history'?: { href: string; count: number }[];
+	[ key: string ]: { href: string }[] | undefined;
+}
+
+export interface BasePost extends CommonPost {
+	comment_status?: 'open' | 'closed';
+	excerpt?: string | { raw: string; rendered: string };
+	meta?: Record< string, any >;
+	parent?: number;
+	password?: string;
+	template?: string;
+	format?: string;
+	featured_media?: number;
+	menu_order?: number;
+	ping_status?: 'open' | 'closed';
+	link?: string;
+}
+
+export interface Template extends CommonPost {
+	type: 'wp_template';
+	is_custom: boolean;
+	source: string;
+	origin: string;
+	plugin?: string;
+	has_theme_file: boolean;
+	id: string;
+}
+
+export interface TemplatePart extends CommonPost {
+	type: 'wp_template_part';
+	source: string;
+	origin: string;
+	has_theme_file: boolean;
+	id: string;
+	area: string;
+}
+
+export interface Pattern extends CommonPost {
+	slug: string;
+	title: { raw: string };
+	wp_pattern_sync_status: string;
+}
+
+export type Post = Template | TemplatePart | Pattern | BasePost;
+
+export type PostWithPermissions = Post & {
+	permissions: {
+		delete: boolean;
+		update: boolean;
+	};
+};
+
+export interface PostType {
+	slug: string;
+	viewable: boolean;
+	supports?: {
+		'page-attributes'?: boolean;
+		title?: boolean;
+		revisions?: boolean;
+	};
+}
+
+// Will be unnecessary after typescript 5.0 upgrade.
+export type CoreDataError = { message?: string; code?: string };
diff --git a/packages/editor/src/hooks/index.js b/packages/editor/src/hooks/index.js
index 5a48ec1bf49566..6001d53f65c103 100644
--- a/packages/editor/src/hooks/index.js
+++ b/packages/editor/src/hooks/index.js
@@ -3,4 +3,5 @@
  */
 import './custom-sources-backwards-compatibility';
 import './default-autocompleters';
-import './pattern-partial-syncing';
+import './media-upload';
+import './pattern-overrides';
diff --git a/packages/editor/src/hooks/media-upload.js b/packages/editor/src/hooks/media-upload.js
new file mode 100644
index 00000000000000..311ec4ec5eec1c
--- /dev/null
+++ b/packages/editor/src/hooks/media-upload.js
@@ -0,0 +1,11 @@
+/**
+ * WordPress dependencies
+ */
+import { addFilter } from '@wordpress/hooks';
+import { MediaUpload } from '@wordpress/media-utils';
+
+addFilter(
+	'editor.MediaUpload',
+	'core/editor/components/media-upload',
+	() => MediaUpload
+);
diff --git a/packages/editor/src/hooks/pattern-overrides.js b/packages/editor/src/hooks/pattern-overrides.js
new file mode 100644
index 00000000000000..8882856a89e0d9
--- /dev/null
+++ b/packages/editor/src/hooks/pattern-overrides.js
@@ -0,0 +1,115 @@
+/**
+ * WordPress dependencies
+ */
+import { addFilter } from '@wordpress/hooks';
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { useBlockEditingMode } from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+import { getBlockBindingsSource } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../store';
+import { unlock } from '../lock-unlock';
+
+/** @typedef {import('@wordpress/blocks').WPBlockSettings} WPBlockSettings */
+
+const {
+	PatternOverridesControls,
+	ResetOverridesControl,
+	PatternOverridesBlockControls,
+	PATTERN_TYPES,
+	PARTIAL_SYNCING_SUPPORTED_BLOCKS,
+	PATTERN_SYNC_TYPES,
+} = unlock( patternsPrivateApis );
+
+/**
+ * Override the default edit UI to include a new block inspector control for
+ * assigning a partial syncing controls to supported blocks in the pattern editor.
+ * Currently, only the `core/paragraph` block is supported.
+ *
+ * @param {Component} BlockEdit Original component.
+ *
+ * @return {Component} Wrapped component.
+ */
+const withPatternOverrideControls = createHigherOrderComponent(
+	( BlockEdit ) => ( props ) => {
+		const isSupportedBlock =
+			!! PARTIAL_SYNCING_SUPPORTED_BLOCKS[ props.name ];
+
+		return (
+			<>
+				<BlockEdit key="edit" { ...props } />
+				{ props.isSelected && isSupportedBlock && (
+					<ControlsWithStoreSubscription { ...props } />
+				) }
+				{ isSupportedBlock && <PatternOverridesBlockControls /> }
+			</>
+		);
+	},
+	'withPatternOverrideControls'
+);
+
+// Split into a separate component to avoid a store subscription
+// on every block.
+function ControlsWithStoreSubscription( props ) {
+	const blockEditingMode = useBlockEditingMode();
+	const { hasPatternOverridesSource, isEditingSyncedPattern } = useSelect(
+		( select ) => {
+			const { getCurrentPostType, getEditedPostAttribute } =
+				select( editorStore );
+
+			return {
+				// For editing link to the site editor if the theme and user permissions support it.
+				hasPatternOverridesSource: !! getBlockBindingsSource(
+					'core/pattern-overrides'
+				),
+				isEditingSyncedPattern:
+					getCurrentPostType() === PATTERN_TYPES.user &&
+					getEditedPostAttribute( 'meta' )?.wp_pattern_sync_status !==
+						PATTERN_SYNC_TYPES.unsynced &&
+					getEditedPostAttribute( 'wp_pattern_sync_status' ) !==
+						PATTERN_SYNC_TYPES.unsynced,
+			};
+		},
+		[]
+	);
+
+	const bindings = props.attributes.metadata?.bindings;
+	const hasPatternBindings =
+		!! bindings &&
+		Object.values( bindings ).some(
+			( binding ) => binding.source === 'core/pattern-overrides'
+		);
+
+	const shouldShowPatternOverridesControls =
+		isEditingSyncedPattern && blockEditingMode === 'default';
+	const shouldShowResetOverridesControl =
+		! isEditingSyncedPattern &&
+		!! props.attributes.metadata?.name &&
+		blockEditingMode !== 'disabled' &&
+		hasPatternBindings;
+
+	if ( ! hasPatternOverridesSource ) {
+		return null;
+	}
+
+	return (
+		<>
+			{ shouldShowPatternOverridesControls && (
+				<PatternOverridesControls { ...props } />
+			) }
+			{ shouldShowResetOverridesControl && (
+				<ResetOverridesControl { ...props } />
+			) }
+		</>
+	);
+}
+
+addFilter(
+	'editor.BlockEdit',
+	'core/editor/with-pattern-override-controls',
+	withPatternOverrideControls
+);
diff --git a/packages/editor/src/hooks/pattern-partial-syncing.js b/packages/editor/src/hooks/pattern-partial-syncing.js
deleted file mode 100644
index 40bd1e16dfc00d..00000000000000
--- a/packages/editor/src/hooks/pattern-partial-syncing.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { addFilter } from '@wordpress/hooks';
-import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
-import { createHigherOrderComponent } from '@wordpress/compose';
-import { useBlockEditingMode } from '@wordpress/block-editor';
-import { hasBlockSupport } from '@wordpress/blocks';
-import { useSelect } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
-import { store as editorStore } from '../store';
-import { unlock } from '../lock-unlock';
-
-const {
-	PartialSyncingControls,
-	PATTERN_TYPES,
-	PARTIAL_SYNCING_SUPPORTED_BLOCKS,
-} = unlock( patternsPrivateApis );
-
-/**
- * Override the default edit UI to include a new block inspector control for
- * assigning a partial syncing controls to supported blocks in the pattern editor.
- * Currently, only the `core/paragraph` block is supported.
- *
- * @param {Component} BlockEdit Original component.
- *
- * @return {Component} Wrapped component.
- */
-const withPartialSyncingControls = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const blockEditingMode = useBlockEditingMode();
-		const hasCustomFieldsSupport = hasBlockSupport(
-			props.name,
-			'__experimentalConnections',
-			false
-		);
-		const isEditingPattern = useSelect(
-			( select ) =>
-				select( editorStore ).getCurrentPostType() ===
-				PATTERN_TYPES.user,
-			[]
-		);
-
-		const shouldShowPartialSyncingControls =
-			hasCustomFieldsSupport &&
-			props.isSelected &&
-			isEditingPattern &&
-			blockEditingMode === 'default' &&
-			Object.keys( PARTIAL_SYNCING_SUPPORTED_BLOCKS ).includes(
-				props.name
-			);
-
-		return (
-			<>
-				<BlockEdit { ...props } />
-				{ shouldShowPartialSyncingControls && (
-					<PartialSyncingControls { ...props } />
-				) }
-			</>
-		);
-	}
-);
-
-if ( window.__experimentalPatternPartialSyncing ) {
-	addFilter(
-		'editor.BlockEdit',
-		'core/editor/with-partial-syncing-controls',
-		withPartialSyncingControls
-	);
-}
diff --git a/packages/editor/src/index.js b/packages/editor/src/index.js
index 05c04b8232907c..8d31a0b4ed4c4c 100644
--- a/packages/editor/src/index.js
+++ b/packages/editor/src/index.js
@@ -7,6 +7,7 @@ export { storeConfig, store } from './store';
 export * from './components';
 export * from './utils';
 export * from './private-apis';
+export * from './dataviews/api';
 
 /*
  * Backward compatibility
diff --git a/packages/editor/src/lock-unlock.js b/packages/editor/src/lock-unlock.js
index 12df6f4711b23e..a507ffe95e11d4 100644
--- a/packages/editor/src/lock-unlock.js
+++ b/packages/editor/src/lock-unlock.js
@@ -4,6 +4,6 @@
 import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/editor'
 	);
diff --git a/packages/editor/src/private-apis.js b/packages/editor/src/private-apis.js
index 046feee5b9c3f6..f9a6d4d17904ee 100644
--- a/packages/editor/src/private-apis.js
+++ b/packages/editor/src/private-apis.js
@@ -1,20 +1,51 @@
+/**
+ * WordPress dependencies
+ */
+import * as interfaceApis from '@wordpress/interface';
+
 /**
  * Internal dependencies
  */
-import EditorCanvas from './components/editor-canvas';
-import { ExperimentalEditorProvider } from './components/provider';
 import { lock } from './lock-unlock';
 import { EntitiesSavedStatesExtensible } from './components/entities-saved-states';
-import useBlockEditorSettings from './components/provider/use-block-editor-settings';
-import PostPanelRow from './components/post-panel-row';
+import EditorContentSlotFill from './components/editor-interface/content-slot-fill';
+import BackButton from './components/header/back-button';
+import CreateTemplatePartModal from './components/create-template-part-modal';
+import Editor from './components/editor';
+import PluginPostExcerpt from './components/post-excerpt/plugin';
+import PostCardPanel from './components/post-card-panel';
+import PreferencesModal from './components/preferences-modal';
+import { usePostActions } from './components/post-actions/actions';
+import ToolsMoreMenuGroup from './components/more-menu/tools-more-menu-group';
+import ViewMoreMenuGroup from './components/more-menu/view-more-menu-group';
+import ResizableEditor from './components/resizable-editor';
+import {
+	mergeBaseAndUserConfigs,
+	GlobalStylesProvider,
+} from './components/global-styles-provider';
+import { registerCoreBlockBindingsSources } from './bindings/api';
+
+const { store: interfaceStore, ...remainingInterfaceApis } = interfaceApis;
 
 export const privateApis = {};
 lock( privateApis, {
-	EditorCanvas,
-	ExperimentalEditorProvider,
+	CreateTemplatePartModal,
+	BackButton,
 	EntitiesSavedStatesExtensible,
-	PostPanelRow,
+	Editor,
+	EditorContentSlotFill,
+	GlobalStylesProvider,
+	mergeBaseAndUserConfigs,
+	PluginPostExcerpt,
+	PostCardPanel,
+	PreferencesModal,
+	usePostActions,
+	ToolsMoreMenuGroup,
+	ViewMoreMenuGroup,
+	ResizableEditor,
+	registerCoreBlockBindingsSources,
 
 	// This is a temporary private API while we're updating the site editor to use EditorProvider.
-	useBlockEditorSettings,
+	interfaceStore,
+	...remainingInterfaceApis,
 } );
diff --git a/packages/editor/src/private-apis.native.js b/packages/editor/src/private-apis.native.js
new file mode 100644
index 00000000000000..f466f98cbbee5a
--- /dev/null
+++ b/packages/editor/src/private-apis.native.js
@@ -0,0 +1,33 @@
+/**
+ * WordPress dependencies
+ */
+import * as interfaceApis from '@wordpress/interface';
+
+/**
+ * Internal dependencies
+ */
+import VisualEditor from './components/visual-editor';
+import { lock } from './lock-unlock';
+import { EntitiesSavedStatesExtensible } from './components/entities-saved-states';
+import useBlockEditorSettings from './components/provider/use-block-editor-settings';
+import PluginPostExcerpt from './components/post-excerpt/plugin';
+import PreferencesModal from './components/preferences-modal';
+import ToolsMoreMenuGroup from './components/more-menu/tools-more-menu-group';
+import ViewMoreMenuGroup from './components/more-menu/view-more-menu-group';
+
+const { store: interfaceStore, ...remainingInterfaceApis } = interfaceApis;
+
+export const privateApis = {};
+lock( privateApis, {
+	VisualEditor,
+	EntitiesSavedStatesExtensible,
+	PluginPostExcerpt,
+	PreferencesModal,
+	ToolsMoreMenuGroup,
+	ViewMoreMenuGroup,
+
+	// This is a temporary private API while we're updating the site editor to use EditorProvider.
+	useBlockEditorSettings,
+	interfaceStore,
+	...remainingInterfaceApis,
+} );
diff --git a/packages/editor/src/store/actions.js b/packages/editor/src/store/actions.js
index 4c1170b064202f..f28f5feeead179 100644
--- a/packages/editor/src/store/actions.js
+++ b/packages/editor/src/store/actions.js
@@ -1,6 +1,7 @@
 /**
  * WordPress dependencies
  */
+import { speak } from '@wordpress/a11y';
 import apiFetch from '@wordpress/api-fetch';
 import deprecated from '@wordpress/deprecated';
 import {
@@ -11,8 +12,13 @@ import {
 import { store as noticesStore } from '@wordpress/notices';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
-import { applyFilters } from '@wordpress/hooks';
+import {
+	applyFilters,
+	applyFiltersAsync,
+	doActionAsync,
+} from '@wordpress/hooks';
 import { store as preferencesStore } from '@wordpress/preferences';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -24,7 +30,7 @@ import {
 	getNotificationArgumentsForSaveFail,
 	getNotificationArgumentsForTrashFail,
 } from './utils/notice-builder';
-
+import { unlock } from '../lock-unlock';
 /**
  * Returns an action generator used in signalling that editor has initialized with
  * the specified post object and editor settings.
@@ -36,7 +42,7 @@ import {
 export const setupEditor =
 	( post, edits, template ) =>
 	( { dispatch } ) => {
-		dispatch.setupEditorState( post );
+		dispatch.setEditedPost( post.type, post.id );
 		// Apply a template for new posts only, if exists.
 		const isNewPost = post.status === 'auto-draft';
 		if ( isNewPost && template ) {
@@ -70,10 +76,18 @@ export const setupEditor =
  * Returns an action object signalling that the editor is being destroyed and
  * that any necessary state or side-effect cleanup should occur.
  *
+ * @deprecated
+ *
  * @return {Object} Action object.
  */
 export function __experimentalTearDownEditor() {
-	return { type: 'TEAR_DOWN_EDITOR' };
+	deprecated(
+		"wp.data.dispatch( 'core/editor' ).__experimentalTearDownEditor",
+		{
+			since: '6.5',
+		}
+	);
+	return { type: 'DO_NOTHING' };
 }
 
 /**
@@ -109,17 +123,33 @@ export function updatePost() {
 }
 
 /**
- * Returns an action object used to setup the editor state when first opening
- * an editor.
+ * Setup the editor state.
+ *
+ * @deprecated
  *
  * @param {Object} post Post object.
+ */
+export function setupEditorState( post ) {
+	deprecated( "wp.data.dispatch( 'core/editor' ).setupEditorState", {
+		since: '6.5',
+		alternative: "wp.data.dispatch( 'core/editor' ).setEditedPost",
+	} );
+	return setEditedPost( post.type, post.id );
+}
+
+/**
+ * Returns an action that sets the current post Type and post ID.
+ *
+ * @param {string} postType Post Type.
+ * @param {string} postId   Post ID.
  *
  * @return {Object} Action object.
  */
-export function setupEditorState( post ) {
+export function setEditedPost( postType, postId ) {
 	return {
-		type: 'SETUP_EDITOR_STATE',
-		post,
+		type: 'SET_EDITED_POST',
+		postType,
+		postId,
 	};
 }
 
@@ -129,6 +159,29 @@ export function setupEditorState( post ) {
  *
  * @param {Object} edits   Post attributes to edit.
  * @param {Object} options Options for the edit.
+ *
+ * @example
+ * ```js
+ * // Update the post title
+ * wp.data.dispatch( 'core/editor' ).editPost( { title: `${ newTitle }` } );
+ * ```
+ *
+ * @example
+ *```js
+ * 	// Get specific media size based on the featured media ID
+ * 	// Note: change sizes?.large for any registered size
+ * 	const getFeaturedMediaUrl = useSelect( ( select ) => {
+ * 		const getFeaturedMediaId =
+ * 			select( 'core/editor' ).getEditedPostAttribute( 'featured_media' );
+ * 		const getMedia = select( 'core' ).getMedia( getFeaturedMediaId );
+ *
+ * 		return (
+ * 			getMedia?.media_details?.sizes?.large?.source_url || getMedia?.source_url || ''
+ * 		);
+ * }, [] );
+ * ```
+ *
+ * @return {Object} Action object
  */
 export const editPost =
 	( edits, options ) =>
@@ -158,7 +211,7 @@ export const savePost =
 		}
 
 		const previousRecord = select.getCurrentPost();
-		const edits = {
+		let edits = {
 			id: previousRecord.id,
 			...registry
 				.select( coreStore )
@@ -170,31 +223,69 @@ export const savePost =
 			content,
 		};
 		dispatch( { type: 'REQUEST_POST_UPDATE_START', options } );
-		await registry
-			.dispatch( coreStore )
-			.saveEntityRecord(
-				'postType',
-				previousRecord.type,
+
+		let error = false;
+		try {
+			edits = await applyFiltersAsync(
+				'editor.preSavePost',
 				edits,
 				options
 			);
+		} catch ( err ) {
+			error = err;
+		}
 
-		let error = registry
-			.select( coreStore )
-			.getLastEntitySaveError(
-				'postType',
-				previousRecord.type,
-				previousRecord.id
-			);
+		if ( ! error ) {
+			try {
+				await registry
+					.dispatch( coreStore )
+					.saveEntityRecord(
+						'postType',
+						previousRecord.type,
+						edits,
+						options
+					);
+			} catch ( err ) {
+				error =
+					err.message && err.code !== 'unknown_error'
+						? err.message
+						: __( 'An error occurred while updating.' );
+			}
+		}
 
 		if ( ! error ) {
-			await applyFilters(
-				'editor.__unstableSavePost',
-				Promise.resolve(),
-				options
-			).catch( ( err ) => {
+			error = registry
+				.select( coreStore )
+				.getLastEntitySaveError(
+					'postType',
+					previousRecord.type,
+					previousRecord.id
+				);
+		}
+
+		// Run the hook with legacy unstable name for backward compatibility
+		if ( ! error ) {
+			try {
+				await applyFilters(
+					'editor.__unstableSavePost',
+					Promise.resolve(),
+					options
+				);
+			} catch ( err ) {
 				error = err;
-			} );
+			}
+		}
+
+		if ( ! error ) {
+			try {
+				await doActionAsync(
+					'editor.savePost',
+					{ id: previousRecord.id },
+					options
+				);
+			} catch ( err ) {
+				error = err;
+			}
 		}
 		dispatch( { type: 'REQUEST_POST_UPDATE_FINISH', options } );
 
@@ -289,8 +380,14 @@ export const trashPost =
 export const autosave =
 	( { local = false, ...options } = {} ) =>
 	async ( { select, dispatch } ) => {
+		const post = select.getCurrentPost();
+
+		// Currently template autosaving is not supported.
+		if ( post.type === 'wp_template' ) {
+			return;
+		}
+
 		if ( local ) {
-			const post = select.getCurrentPost();
 			const isPostNew = select.isEditedPostNew();
 			const title = select.getEditedPostAttribute( 'title' );
 			const content = select.getEditedPostAttribute( 'content' );
@@ -374,7 +471,7 @@ export const enablePublishSidebar =
 	( { registry } ) => {
 		registry
 			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'isPublishSidebarEnabled', true );
+			.set( 'core', 'isPublishSidebarEnabled', true );
 	};
 
 /**
@@ -385,7 +482,7 @@ export const disablePublishSidebar =
 	( { registry } ) => {
 		registry
 			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'isPublishSidebarEnabled', false );
+			.set( 'core', 'isPublishSidebarEnabled', false );
 	};
 
 /**
@@ -551,12 +648,10 @@ export function updateEditorSettings( settings ) {
 /**
  * Returns an action used to set the rendering mode of the post editor. We support multiple rendering modes:
  *
- * -   `all`: This is the default mode. It renders the post editor with all the features available. If a template is provided, it's preferred over the post.
- * -   `template-only`: This mode renders the editor with only the template blocks visible.
  * -   `post-only`: This mode extracts the post blocks from the template and renders only those. The idea is to allow the user to edit the post/page in isolation without the wrapping template.
  * -   `template-locked`: This mode renders both the template and the post blocks but the template blocks are locked and can't be edited. The post blocks are editable.
  *
- * @param {string} mode Mode (one of 'template-only', 'post-only', 'template-locked' or 'all').
+ * @param {string} mode Mode (one of 'post-only' or 'template-locked').
  */
 export const setRenderingMode =
 	( mode ) =>
@@ -573,6 +668,276 @@ export const setRenderingMode =
 		} );
 	};
 
+/**
+ * Action that changes the width of the editing canvas.
+ *
+ * @param {string} deviceType
+ *
+ * @return {Object} Action object.
+ */
+export function setDeviceType( deviceType ) {
+	return {
+		type: 'SET_DEVICE_TYPE',
+		deviceType,
+	};
+}
+
+/**
+ * Returns an action object used to enable or disable a panel in the editor.
+ *
+ * @param {string} panelName A string that identifies the panel to enable or disable.
+ *
+ * @return {Object} Action object.
+ */
+export const toggleEditorPanelEnabled =
+	( panelName ) =>
+	( { registry } ) => {
+		const inactivePanels =
+			registry
+				.select( preferencesStore )
+				.get( 'core', 'inactivePanels' ) ?? [];
+
+		const isPanelInactive = !! inactivePanels?.includes( panelName );
+
+		// If the panel is inactive, remove it to enable it, else add it to
+		// make it inactive.
+		let updatedInactivePanels;
+		if ( isPanelInactive ) {
+			updatedInactivePanels = inactivePanels.filter(
+				( invactivePanelName ) => invactivePanelName !== panelName
+			);
+		} else {
+			updatedInactivePanels = [ ...inactivePanels, panelName ];
+		}
+
+		registry
+			.dispatch( preferencesStore )
+			.set( 'core', 'inactivePanels', updatedInactivePanels );
+	};
+
+/**
+ * Opens a closed panel and closes an open panel.
+ *
+ * @param {string} panelName A string that identifies the panel to open or close.
+ */
+export const toggleEditorPanelOpened =
+	( panelName ) =>
+	( { registry } ) => {
+		const openPanels =
+			registry.select( preferencesStore ).get( 'core', 'openPanels' ) ??
+			[];
+
+		const isPanelOpen = !! openPanels?.includes( panelName );
+
+		// If the panel is open, remove it to close it, else add it to
+		// make it open.
+		let updatedOpenPanels;
+		if ( isPanelOpen ) {
+			updatedOpenPanels = openPanels.filter(
+				( openPanelName ) => openPanelName !== panelName
+			);
+		} else {
+			updatedOpenPanels = [ ...openPanels, panelName ];
+		}
+
+		registry
+			.dispatch( preferencesStore )
+			.set( 'core', 'openPanels', updatedOpenPanels );
+	};
+
+/**
+ * Returns an action object used to remove a panel from the editor.
+ *
+ * @param {string} panelName A string that identifies the panel to remove.
+ *
+ * @return {Object} Action object.
+ */
+export function removeEditorPanel( panelName ) {
+	return {
+		type: 'REMOVE_PANEL',
+		panelName,
+	};
+}
+
+/**
+ * Returns an action object used to open/close the inserter.
+ *
+ * @param {boolean|Object} value                Whether the inserter should be
+ *                                              opened (true) or closed (false).
+ *                                              To specify an insertion point,
+ *                                              use an object.
+ * @param {string}         value.rootClientId   The root client ID to insert at.
+ * @param {number}         value.insertionIndex The index to insert at.
+ * @param {string}         value.filterValue    A query to filter the inserter results.
+ * @param {Function}       value.onSelect       A callback when an item is selected.
+ * @param {string}         value.tab            The tab to open in the inserter.
+ * @param {string}         value.category       The category to initialize in the inserter.
+ *
+ * @return {Object} Action object.
+ */
+export const setIsInserterOpened =
+	( value ) =>
+	( { dispatch, registry } ) => {
+		if (
+			typeof value === 'object' &&
+			value.hasOwnProperty( 'rootClientId' ) &&
+			value.hasOwnProperty( 'insertionIndex' )
+		) {
+			unlock( registry.dispatch( blockEditorStore ) ).setInsertionPoint( {
+				rootClientId: value.rootClientId,
+				index: value.insertionIndex,
+			} );
+		}
+
+		dispatch( {
+			type: 'SET_IS_INSERTER_OPENED',
+			value,
+		} );
+	};
+
+/**
+ * Returns an action object used to open/close the list view.
+ *
+ * @param {boolean} isOpen A boolean representing whether the list view should be opened or closed.
+ * @return {Object} Action object.
+ */
+export function setIsListViewOpened( isOpen ) {
+	return {
+		type: 'SET_IS_LIST_VIEW_OPENED',
+		isOpen,
+	};
+}
+
+/**
+ * Action that toggles Distraction free mode.
+ * Distraction free mode expects there are no sidebars, as due to the
+ * z-index values set, you can't close sidebars.
+ */
+export const toggleDistractionFree =
+	() =>
+	( { dispatch, registry } ) => {
+		const isDistractionFree = registry
+			.select( preferencesStore )
+			.get( 'core', 'distractionFree' );
+		if ( isDistractionFree ) {
+			registry
+				.dispatch( preferencesStore )
+				.set( 'core', 'fixedToolbar', false );
+		}
+		if ( ! isDistractionFree ) {
+			registry.batch( () => {
+				registry
+					.dispatch( preferencesStore )
+					.set( 'core', 'fixedToolbar', true );
+				dispatch.setIsInserterOpened( false );
+				dispatch.setIsListViewOpened( false );
+			} );
+		}
+		registry.batch( () => {
+			registry
+				.dispatch( preferencesStore )
+				.set( 'core', 'distractionFree', ! isDistractionFree );
+			registry
+				.dispatch( noticesStore )
+				.createInfoNotice(
+					isDistractionFree
+						? __( 'Distraction free off.' )
+						: __( 'Distraction free on.' ),
+					{
+						id: 'core/editor/distraction-free-mode/notice',
+						type: 'snackbar',
+						actions: [
+							{
+								label: __( 'Undo' ),
+								onClick: () => {
+									registry.batch( () => {
+										registry
+											.dispatch( preferencesStore )
+											.set(
+												'core',
+												'fixedToolbar',
+												isDistractionFree ? true : false
+											);
+										registry
+											.dispatch( preferencesStore )
+											.toggle(
+												'core',
+												'distractionFree'
+											);
+									} );
+								},
+							},
+						],
+					}
+				);
+		} );
+	};
+
+/**
+ * Triggers an action used to switch editor mode.
+ *
+ * @param {string} mode The editor mode.
+ */
+export const switchEditorMode =
+	( mode ) =>
+	( { dispatch, registry } ) => {
+		registry.dispatch( preferencesStore ).set( 'core', 'editorMode', mode );
+
+		if ( mode !== 'visual' ) {
+			// Unselect blocks when we switch to a non visual mode.
+			registry.dispatch( blockEditorStore ).clearSelectedBlock();
+			// Exit zoom out state when switching to a non visual mode.
+			unlock( registry.dispatch( blockEditorStore ) ).resetZoomLevel();
+		}
+
+		if ( mode === 'visual' ) {
+			speak( __( 'Visual editor selected' ), 'assertive' );
+		} else if ( mode === 'text' ) {
+			const isDistractionFree = registry
+				.select( preferencesStore )
+				.get( 'core', 'distractionFree' );
+			if ( isDistractionFree ) {
+				dispatch.toggleDistractionFree();
+			}
+			speak( __( 'Code editor selected' ), 'assertive' );
+		}
+	};
+
+/**
+ * Returns an action object used in signalling that the user opened the publish
+ * sidebar.
+ *
+ * @return {Object} Action object
+ */
+export function openPublishSidebar() {
+	return {
+		type: 'OPEN_PUBLISH_SIDEBAR',
+	};
+}
+
+/**
+ * Returns an action object used in signalling that the user closed the
+ * publish sidebar.
+ *
+ * @return {Object} Action object.
+ */
+export function closePublishSidebar() {
+	return {
+		type: 'CLOSE_PUBLISH_SIDEBAR',
+	};
+}
+
+/**
+ * Returns an action object used in signalling that the user toggles the publish sidebar.
+ *
+ * @return {Object} Action object
+ */
+export function togglePublishSidebar() {
+	return {
+		type: 'TOGGLE_PUBLISH_SIDEBAR',
+	};
+}
+
 /**
  * Backward compatibility
  */
diff --git a/packages/editor/src/store/constants.js b/packages/editor/src/store/constants.js
deleted file mode 100644
index 7882ba53e64db3..00000000000000
--- a/packages/editor/src/store/constants.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Set of post properties for which edits should assume a merging behavior,
- * assuming an object value.
- *
- * @type {Set}
- */
-export const EDIT_MERGE_PROPERTIES = new Set( [ 'meta' ] );
-
-/**
- * Constant for the store module (or reducer) key.
- *
- * @type {string}
- */
-export const STORE_NAME = 'core/editor';
-
-export const SAVE_POST_NOTICE_ID = 'SAVE_POST_NOTICE_ID';
-export const TRASH_POST_NOTICE_ID = 'TRASH_POST_NOTICE_ID';
-export const PERMALINK_POSTNAME_REGEX = /%(?:postname|pagename)%/;
-export const ONE_MINUTE_IN_MS = 60 * 1000;
-export const AUTOSAVE_PROPERTIES = [ 'title', 'excerpt', 'content' ];
diff --git a/packages/editor/src/store/constants.ts b/packages/editor/src/store/constants.ts
new file mode 100644
index 00000000000000..78708f00cc9eb7
--- /dev/null
+++ b/packages/editor/src/store/constants.ts
@@ -0,0 +1,36 @@
+/**
+ * Set of post properties for which edits should assume a merging behavior,
+ * assuming an object value.
+ *
+ * @type {Set}
+ */
+export const EDIT_MERGE_PROPERTIES = new Set( [ 'meta' ] );
+
+/**
+ * Constant for the store module (or reducer) key.
+ *
+ * @type {string}
+ */
+export const STORE_NAME = 'core/editor';
+
+export const SAVE_POST_NOTICE_ID = 'SAVE_POST_NOTICE_ID';
+export const TRASH_POST_NOTICE_ID = 'TRASH_POST_NOTICE_ID';
+export const PERMALINK_POSTNAME_REGEX = /%(?:postname|pagename)%/;
+export const ONE_MINUTE_IN_MS = 60 * 1000;
+export const AUTOSAVE_PROPERTIES = [ 'title', 'excerpt', 'content' ];
+export const TEMPLATE_PART_AREA_DEFAULT_CATEGORY = 'uncategorized';
+export const TEMPLATE_POST_TYPE = 'wp_template';
+export const TEMPLATE_PART_POST_TYPE = 'wp_template_part';
+export const PATTERN_POST_TYPE = 'wp_block';
+export const NAVIGATION_POST_TYPE = 'wp_navigation';
+export const TEMPLATE_ORIGINS = {
+	custom: 'custom',
+	theme: 'theme',
+	plugin: 'plugin',
+};
+export const TEMPLATE_POST_TYPES = [ 'wp_template', 'wp_template_part' ];
+export const GLOBAL_POST_TYPES = [
+	...TEMPLATE_POST_TYPES,
+	'wp_block',
+	'wp_navigation',
+];
diff --git a/packages/editor/src/store/defaults.js b/packages/editor/src/store/defaults.js
index 686888f91de3d5..e4f86b3a7dfb21 100644
--- a/packages/editor/src/store/defaults.js
+++ b/packages/editor/src/store/defaults.js
@@ -9,6 +9,7 @@ import { SETTINGS_DEFAULTS } from '@wordpress/block-editor';
  * @property {boolean|Array} allowedBlockTypes     Allowed block types
  * @property {boolean}       richEditingEnabled    Whether rich editing is enabled or not
  * @property {boolean}       codeEditingEnabled    Whether code editing is enabled or not
+ * @property {boolean}       fontLibraryEnabled    Whether the font library is enabled or not.
  * @property {boolean}       enableCustomFields    Whether the WordPress custom fields are enabled or not.
  *                                                 true  = the user has opted to show the Custom Fields panel at the bottom of the editor.
  *                                                 false = the user has opted to hide the Custom Fields panel at the bottom of the editor.
@@ -26,6 +27,7 @@ export const EDITOR_SETTINGS_DEFAULTS = {
 
 	richEditingEnabled: true,
 	codeEditingEnabled: true,
+	fontLibraryEnabled: true,
 	enableCustomFields: undefined,
 	defaultRenderingMode: 'post-only',
 };
diff --git a/packages/editor/src/store/index.js b/packages/editor/src/store/index.js
index ebd41354308e7a..392f5f42cbd55b 100644
--- a/packages/editor/src/store/index.js
+++ b/packages/editor/src/store/index.js
@@ -10,6 +10,7 @@ import reducer from './reducer';
 import * as selectors from './selectors';
 import * as actions from './actions';
 import * as privateActions from './private-actions';
+import * as privateSelectors from './private-selectors';
 import { STORE_NAME } from './constants';
 import { unlock } from '../lock-unlock';
 
@@ -39,3 +40,4 @@ export const store = createReduxStore( STORE_NAME, {
 
 register( store );
 unlock( store ).registerPrivateActions( privateActions );
+unlock( store ).registerPrivateSelectors( privateSelectors );
diff --git a/packages/editor/src/store/private-actions.js b/packages/editor/src/store/private-actions.js
index 1af9ff5f6adb92..358d00af396bbb 100644
--- a/packages/editor/src/store/private-actions.js
+++ b/packages/editor/src/store/private-actions.js
@@ -1,3 +1,22 @@
+/**
+ * WordPress dependencies
+ */
+import { store as coreStore } from '@wordpress/core-data';
+import { __, sprintf } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { addQueryArgs } from '@wordpress/url';
+import apiFetch from '@wordpress/api-fetch';
+import { parse, __unstableSerializeAndClean } from '@wordpress/blocks';
+import { decodeEntities } from '@wordpress/html-entities';
+
+/**
+ * Internal dependencies
+ */
+import isTemplateRevertable from './utils/is-template-revertable';
+export * from '../dataviews/store/private-actions';
+
 /**
  * Returns an action object used to set which template is currently being used/edited.
  *
@@ -11,3 +30,465 @@ export function setCurrentTemplateId( id ) {
 		id,
 	};
 }
+
+/**
+ * Create a block based template.
+ *
+ * @param {Object?} template Template to create and assign.
+ */
+export const createTemplate =
+	( template ) =>
+	async ( { select, dispatch, registry } ) => {
+		const savedTemplate = await registry
+			.dispatch( coreStore )
+			.saveEntityRecord( 'postType', 'wp_template', template );
+		registry
+			.dispatch( coreStore )
+			.editEntityRecord(
+				'postType',
+				select.getCurrentPostType(),
+				select.getCurrentPostId(),
+				{
+					template: savedTemplate.slug,
+				}
+			);
+		registry
+			.dispatch( noticesStore )
+			.createSuccessNotice(
+				__( "Custom template created. You're in template mode now." ),
+				{
+					type: 'snackbar',
+					actions: [
+						{
+							label: __( 'Go back' ),
+							onClick: () =>
+								dispatch.setRenderingMode(
+									select.getEditorSettings()
+										.defaultRenderingMode
+								),
+						},
+					],
+				}
+			);
+		return savedTemplate;
+	};
+
+/**
+ * Update the provided block types to be visible.
+ *
+ * @param {string[]} blockNames Names of block types to show.
+ */
+export const showBlockTypes =
+	( blockNames ) =>
+	( { registry } ) => {
+		const existingBlockNames =
+			registry
+				.select( preferencesStore )
+				.get( 'core', 'hiddenBlockTypes' ) ?? [];
+
+		const newBlockNames = existingBlockNames.filter(
+			( type ) =>
+				! (
+					Array.isArray( blockNames ) ? blockNames : [ blockNames ]
+				).includes( type )
+		);
+
+		registry
+			.dispatch( preferencesStore )
+			.set( 'core', 'hiddenBlockTypes', newBlockNames );
+	};
+
+/**
+ * Update the provided block types to be hidden.
+ *
+ * @param {string[]} blockNames Names of block types to hide.
+ */
+export const hideBlockTypes =
+	( blockNames ) =>
+	( { registry } ) => {
+		const existingBlockNames =
+			registry
+				.select( preferencesStore )
+				.get( 'core', 'hiddenBlockTypes' ) ?? [];
+
+		const mergedBlockNames = new Set( [
+			...existingBlockNames,
+			...( Array.isArray( blockNames ) ? blockNames : [ blockNames ] ),
+		] );
+
+		registry
+			.dispatch( preferencesStore )
+			.set( 'core', 'hiddenBlockTypes', [ ...mergedBlockNames ] );
+	};
+
+/**
+ * Save entity records marked as dirty.
+ *
+ * @param {Object}   options                      Options for the action.
+ * @param {Function} [options.onSave]             Callback when saving happens.
+ * @param {object[]} [options.dirtyEntityRecords] Array of dirty entities.
+ * @param {object[]} [options.entitiesToSkip]     Array of entities to skip saving.
+ * @param {Function} [options.close]              Callback when the actions is called. It should be consolidated with `onSave`.
+ */
+export const saveDirtyEntities =
+	( { onSave, dirtyEntityRecords = [], entitiesToSkip = [], close } = {} ) =>
+	( { registry } ) => {
+		const PUBLISH_ON_SAVE_ENTITIES = [
+			{ kind: 'postType', name: 'wp_navigation' },
+		];
+		const saveNoticeId = 'site-editor-save-success';
+		const homeUrl = registry
+			.select( coreStore )
+			.getEntityRecord( 'root', '__unstableBase' )?.home;
+		registry.dispatch( noticesStore ).removeNotice( saveNoticeId );
+		const entitiesToSave = dirtyEntityRecords.filter(
+			( { kind, name, key, property } ) => {
+				return ! entitiesToSkip.some(
+					( elt ) =>
+						elt.kind === kind &&
+						elt.name === name &&
+						elt.key === key &&
+						elt.property === property
+				);
+			}
+		);
+		close?.( entitiesToSave );
+		const siteItemsToSave = [];
+		const pendingSavedRecords = [];
+		entitiesToSave.forEach( ( { kind, name, key, property } ) => {
+			if ( 'root' === kind && 'site' === name ) {
+				siteItemsToSave.push( property );
+			} else {
+				if (
+					PUBLISH_ON_SAVE_ENTITIES.some(
+						( typeToPublish ) =>
+							typeToPublish.kind === kind &&
+							typeToPublish.name === name
+					)
+				) {
+					registry
+						.dispatch( coreStore )
+						.editEntityRecord( kind, name, key, {
+							status: 'publish',
+						} );
+				}
+
+				pendingSavedRecords.push(
+					registry
+						.dispatch( coreStore )
+						.saveEditedEntityRecord( kind, name, key )
+				);
+			}
+		} );
+		if ( siteItemsToSave.length ) {
+			pendingSavedRecords.push(
+				registry
+					.dispatch( coreStore )
+					.__experimentalSaveSpecifiedEntityEdits(
+						'root',
+						'site',
+						undefined,
+						siteItemsToSave
+					)
+			);
+		}
+		registry
+			.dispatch( blockEditorStore )
+			.__unstableMarkLastChangeAsPersistent();
+		Promise.all( pendingSavedRecords )
+			.then( ( values ) => {
+				return onSave ? onSave( values ) : values;
+			} )
+			.then( ( values ) => {
+				if (
+					values.some( ( value ) => typeof value === 'undefined' )
+				) {
+					registry
+						.dispatch( noticesStore )
+						.createErrorNotice( __( 'Saving failed.' ) );
+				} else {
+					registry
+						.dispatch( noticesStore )
+						.createSuccessNotice( __( 'Site updated.' ), {
+							type: 'snackbar',
+							id: saveNoticeId,
+							actions: [
+								{
+									label: __( 'View site' ),
+									url: homeUrl,
+								},
+							],
+						} );
+				}
+			} )
+			.catch( ( error ) =>
+				registry
+					.dispatch( noticesStore )
+					.createErrorNotice(
+						`${ __( 'Saving failed.' ) } ${ error }`
+					)
+			);
+	};
+
+/**
+ * Reverts a template to its original theme-provided file.
+ *
+ * @param {Object}  template            The template to revert.
+ * @param {Object}  [options]
+ * @param {boolean} [options.allowUndo] Whether to allow the user to undo
+ *                                      reverting the template. Default true.
+ */
+export const revertTemplate =
+	( template, { allowUndo = true } = {} ) =>
+	async ( { registry } ) => {
+		const noticeId = 'edit-site-template-reverted';
+		registry.dispatch( noticesStore ).removeNotice( noticeId );
+		if ( ! isTemplateRevertable( template ) ) {
+			registry
+				.dispatch( noticesStore )
+				.createErrorNotice( __( 'This template is not revertable.' ), {
+					type: 'snackbar',
+				} );
+			return;
+		}
+
+		try {
+			const templateEntityConfig = registry
+				.select( coreStore )
+				.getEntityConfig( 'postType', template.type );
+
+			if ( ! templateEntityConfig ) {
+				registry
+					.dispatch( noticesStore )
+					.createErrorNotice(
+						__(
+							'The editor has encountered an unexpected error. Please reload.'
+						),
+						{ type: 'snackbar' }
+					);
+				return;
+			}
+
+			const fileTemplatePath = addQueryArgs(
+				`${ templateEntityConfig.baseURL }/${ template.id }`,
+				{ context: 'edit', source: template.origin }
+			);
+
+			const fileTemplate = await apiFetch( { path: fileTemplatePath } );
+			if ( ! fileTemplate ) {
+				registry
+					.dispatch( noticesStore )
+					.createErrorNotice(
+						__(
+							'The editor has encountered an unexpected error. Please reload.'
+						),
+						{ type: 'snackbar' }
+					);
+				return;
+			}
+
+			const serializeBlocks = ( {
+				blocks: blocksForSerialization = [],
+			} ) => __unstableSerializeAndClean( blocksForSerialization );
+
+			const edited = registry
+				.select( coreStore )
+				.getEditedEntityRecord(
+					'postType',
+					template.type,
+					template.id
+				);
+
+			// We are fixing up the undo level here to make sure we can undo
+			// the revert in the header toolbar correctly.
+			registry.dispatch( coreStore ).editEntityRecord(
+				'postType',
+				template.type,
+				template.id,
+				{
+					content: serializeBlocks, // Required to make the `undo` behave correctly.
+					blocks: edited.blocks, // Required to revert the blocks in the editor.
+					source: 'custom', // required to avoid turning the editor into a dirty state
+				},
+				{
+					undoIgnore: true, // Required to merge this edit with the last undo level.
+				}
+			);
+
+			const blocks = parse( fileTemplate?.content?.raw );
+			registry
+				.dispatch( coreStore )
+				.editEntityRecord( 'postType', template.type, fileTemplate.id, {
+					content: serializeBlocks,
+					blocks,
+					source: 'theme',
+				} );
+
+			if ( allowUndo ) {
+				const undoRevert = () => {
+					registry
+						.dispatch( coreStore )
+						.editEntityRecord(
+							'postType',
+							template.type,
+							edited.id,
+							{
+								content: serializeBlocks,
+								blocks: edited.blocks,
+								source: 'custom',
+							}
+						);
+				};
+
+				registry
+					.dispatch( noticesStore )
+					.createSuccessNotice( __( 'Template reset.' ), {
+						type: 'snackbar',
+						id: noticeId,
+						actions: [
+							{
+								label: __( 'Undo' ),
+								onClick: undoRevert,
+							},
+						],
+					} );
+			}
+		} catch ( error ) {
+			const errorMessage =
+				error.message && error.code !== 'unknown_error'
+					? error.message
+					: __( 'Template revert failed. Please reload.' );
+			registry
+				.dispatch( noticesStore )
+				.createErrorNotice( errorMessage, { type: 'snackbar' } );
+		}
+	};
+
+/**
+ * Action that removes an array of templates, template parts or patterns.
+ *
+ * @param {Array} items An array of template,template part or pattern objects to remove.
+ */
+export const removeTemplates =
+	( items ) =>
+	async ( { registry } ) => {
+		const isResetting = items.every( ( item ) => item?.has_theme_file );
+
+		const promiseResult = await Promise.allSettled(
+			items.map( ( item ) => {
+				return registry
+					.dispatch( coreStore )
+					.deleteEntityRecord(
+						'postType',
+						item.type,
+						item.id,
+						{ force: true },
+						{ throwOnError: true }
+					);
+			} )
+		);
+
+		// If all the promises were fulfilled with sucess.
+		if ( promiseResult.every( ( { status } ) => status === 'fulfilled' ) ) {
+			let successMessage;
+
+			if ( items.length === 1 ) {
+				// Depending on how the entity was retrieved its title might be
+				// an object or simple string.
+				let title;
+				if ( typeof items[ 0 ].title === 'string' ) {
+					title = items[ 0 ].title;
+				} else if ( typeof items[ 0 ].title?.rendered === 'string' ) {
+					title = items[ 0 ].title?.rendered;
+				} else if ( typeof items[ 0 ].title?.raw === 'string' ) {
+					title = items[ 0 ].title?.raw;
+				}
+				successMessage = isResetting
+					? sprintf(
+							/* translators: The template/part's name. */
+							__( '"%s" reset.' ),
+							decodeEntities( title )
+					  )
+					: sprintf(
+							/* translators: The template/part's name. */
+							__( '"%s" deleted.' ),
+							decodeEntities( title )
+					  );
+			} else {
+				successMessage = isResetting
+					? __( 'Items reset.' )
+					: __( 'Items deleted.' );
+			}
+
+			registry
+				.dispatch( noticesStore )
+				.createSuccessNotice( successMessage, {
+					type: 'snackbar',
+					id: 'editor-template-deleted-success',
+				} );
+		} else {
+			// If there was at lease one failure.
+			let errorMessage;
+			// If we were trying to delete a single template.
+			if ( promiseResult.length === 1 ) {
+				if ( promiseResult[ 0 ].reason?.message ) {
+					errorMessage = promiseResult[ 0 ].reason.message;
+				} else {
+					errorMessage = isResetting
+						? __( 'An error occurred while reverting the item.' )
+						: __( 'An error occurred while deleting the item.' );
+				}
+				// If we were trying to delete a multiple templates
+			} else {
+				const errorMessages = new Set();
+				const failedPromises = promiseResult.filter(
+					( { status } ) => status === 'rejected'
+				);
+				for ( const failedPromise of failedPromises ) {
+					if ( failedPromise.reason?.message ) {
+						errorMessages.add( failedPromise.reason.message );
+					}
+				}
+				if ( errorMessages.size === 0 ) {
+					errorMessage = __(
+						'An error occurred while deleting the items.'
+					);
+				} else if ( errorMessages.size === 1 ) {
+					errorMessage = isResetting
+						? sprintf(
+								/* translators: %s: an error message */
+								__(
+									'An error occurred while reverting the items: %s'
+								),
+								[ ...errorMessages ][ 0 ]
+						  )
+						: sprintf(
+								/* translators: %s: an error message */
+								__(
+									'An error occurred while deleting the items: %s'
+								),
+								[ ...errorMessages ][ 0 ]
+						  );
+				} else {
+					errorMessage = isResetting
+						? sprintf(
+								/* translators: %s: a list of comma separated error messages */
+								__(
+									'Some errors occurred while reverting the items: %s'
+								),
+								[ ...errorMessages ].join( ',' )
+						  )
+						: sprintf(
+								/* translators: %s: a list of comma separated error messages */
+								__(
+									'Some errors occurred while deleting the items: %s'
+								),
+								[ ...errorMessages ].join( ',' )
+						  );
+				}
+			}
+			registry
+				.dispatch( noticesStore )
+				.createErrorNotice( errorMessage, { type: 'snackbar' } );
+		}
+	};
diff --git a/packages/editor/src/store/private-selectors.js b/packages/editor/src/store/private-selectors.js
new file mode 100644
index 00000000000000..9bc065436c10bb
--- /dev/null
+++ b/packages/editor/src/store/private-selectors.js
@@ -0,0 +1,205 @@
+/**
+ * External dependencies
+ */
+import fastDeepEqual from 'fast-deep-equal';
+
+/**
+ * WordPress dependencies
+ */
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { createSelector, createRegistrySelector } from '@wordpress/data';
+import {
+	layout,
+	symbol,
+	navigation,
+	page as pageIcon,
+	verse,
+} from '@wordpress/icons';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import {
+	getRenderingMode,
+	getCurrentPost,
+	__experimentalGetDefaultTemplatePartAreas,
+} from './selectors';
+import {
+	getEntityActions as _getEntityActions,
+	isEntityReady as _isEntityReady,
+} from '../dataviews/store/private-selectors';
+
+const EMPTY_INSERTION_POINT = {
+	rootClientId: undefined,
+	insertionIndex: undefined,
+	filterValue: undefined,
+};
+
+/**
+ * Get the inserter.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {Object} The root client ID, index to insert at and starting filter value.
+ */
+export const getInserter = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state ) => {
+			if ( typeof state.blockInserterPanel === 'object' ) {
+				return state.blockInserterPanel;
+			}
+
+			if ( getRenderingMode( state ) === 'template-locked' ) {
+				const [ postContentClientId ] =
+					select( blockEditorStore ).getBlocksByName(
+						'core/post-content'
+					);
+				if ( postContentClientId ) {
+					return {
+						rootClientId: postContentClientId,
+						insertionIndex: undefined,
+						filterValue: undefined,
+					};
+				}
+			}
+
+			return EMPTY_INSERTION_POINT;
+		},
+		( state ) => {
+			const [ postContentClientId ] =
+				select( blockEditorStore ).getBlocksByName(
+					'core/post-content'
+				);
+			return [
+				state.blockInserterPanel,
+				getRenderingMode( state ),
+				postContentClientId,
+			];
+		}
+	)
+);
+
+export function getListViewToggleRef( state ) {
+	return state.listViewToggleRef;
+}
+export function getInserterSidebarToggleRef( state ) {
+	return state.inserterSidebarToggleRef;
+}
+const CARD_ICONS = {
+	wp_block: symbol,
+	wp_navigation: navigation,
+	page: pageIcon,
+	post: verse,
+};
+
+export const getPostIcon = createRegistrySelector(
+	( select ) => ( state, postType, options ) => {
+		{
+			if (
+				postType === 'wp_template_part' ||
+				postType === 'wp_template'
+			) {
+				return (
+					__experimentalGetDefaultTemplatePartAreas( state ).find(
+						( item ) => options.area === item.area
+					)?.icon || layout
+				);
+			}
+			if ( CARD_ICONS[ postType ] ) {
+				return CARD_ICONS[ postType ];
+			}
+			const postTypeEntity = select( coreStore ).getPostType( postType );
+			// `icon` is the `menu_icon` property of a post type. We
+			// only handle `dashicons` for now, even if the `menu_icon`
+			// also supports urls and svg as values.
+			if (
+				typeof postTypeEntity?.icon === 'string' &&
+				postTypeEntity.icon.startsWith( 'dashicons-' )
+			) {
+				return postTypeEntity.icon.slice( 10 );
+			}
+			return pageIcon;
+		}
+	}
+);
+
+/**
+ * Returns true if there are unsaved changes to the
+ * post's meta fields, and false otherwise.
+ *
+ * @param {Object} state    Global application state.
+ * @param {string} postType The post type of the post.
+ * @param {number} postId   The ID of the post.
+ *
+ * @return {boolean} Whether there are edits or not in the meta fields of the relevant post.
+ */
+export const hasPostMetaChanges = createRegistrySelector(
+	( select ) => ( state, postType, postId ) => {
+		const { type: currentPostType, id: currentPostId } =
+			getCurrentPost( state );
+		// If no postType or postId is passed, use the current post.
+		const edits = select( coreStore ).getEntityRecordNonTransientEdits(
+			'postType',
+			postType || currentPostType,
+			postId || currentPostId
+		);
+
+		if ( ! edits?.meta ) {
+			return false;
+		}
+
+		// Compare if anything apart from `footnotes` has changed.
+		const originalPostMeta = select( coreStore ).getEntityRecord(
+			'postType',
+			postType || currentPostType,
+			postId || currentPostId
+		)?.meta;
+
+		return ! fastDeepEqual(
+			{ ...originalPostMeta, footnotes: undefined },
+			{ ...edits.meta, footnotes: undefined }
+		);
+	}
+);
+
+export function getEntityActions( state, ...args ) {
+	return _getEntityActions( state.dataviews, ...args );
+}
+
+export function isEntityReady( state, ...args ) {
+	return _isEntityReady( state.dataviews, ...args );
+}
+
+/**
+ * Similar to getBlocksByName in @wordpress/block-editor, but only returns the top-most
+ * blocks that aren't descendants of the query block.
+ *
+ * @param {Object}       state      Global application state.
+ * @param {Array|string} blockNames Block names of the blocks to retrieve.
+ *
+ * @return {Array} Block client IDs.
+ */
+export const getPostBlocksByName = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state, blockNames ) => {
+			blockNames = Array.isArray( blockNames )
+				? blockNames
+				: [ blockNames ];
+			const { getBlocksByName, getBlockParents, getBlockName } =
+				select( blockEditorStore );
+			return getBlocksByName( blockNames ).filter( ( clientId ) =>
+				getBlockParents( clientId ).every( ( parentClientId ) => {
+					const parentBlockName = getBlockName( parentClientId );
+					return (
+						// Ignore descendents of the query block.
+						parentBlockName !== 'core/query' &&
+						// Enable only the top-most block.
+						! blockNames.includes( parentBlockName )
+					);
+				} )
+			);
+		},
+		() => [ select( blockEditorStore ).getBlocks() ]
+	)
+);
diff --git a/packages/editor/src/store/reducer.js b/packages/editor/src/store/reducer.js
index 7821baf5cdc062..a165d90e296d6f 100644
--- a/packages/editor/src/store/reducer.js
+++ b/packages/editor/src/store/reducer.js
@@ -7,6 +7,7 @@ import { combineReducers } from '@wordpress/data';
  * Internal dependencies
  */
 import { EDITOR_SETTINGS_DEFAULTS } from './defaults';
+import dataviewsReducer from '../dataviews/store/reducer';
 
 /**
  * Returns a post attribute value, flattening nested rendered content using its
@@ -83,8 +84,8 @@ export function shouldOverwriteState( action, previousAction ) {
 
 export function postId( state = null, action ) {
 	switch ( action.type ) {
-		case 'SETUP_EDITOR_STATE':
-			return action.post.id;
+		case 'SET_EDITED_POST':
+			return action.postId;
 	}
 
 	return state;
@@ -101,8 +102,8 @@ export function templateId( state = null, action ) {
 
 export function postType( state = null, action ) {
 	switch ( action.type ) {
-		case 'SETUP_EDITOR_STATE':
-			return action.post.type;
+		case 'SET_EDITED_POST':
+			return action.postType;
 	}
 
 	return state;
@@ -247,53 +248,139 @@ export function postAutosavingLock( state = {}, action ) {
 }
 
 /**
- * Reducer returning whether the editor is ready to be rendered.
- * The editor is considered ready to be rendered once
- * the post object is loaded properly and the initial blocks parsed.
+ * Reducer returning the post editor setting.
  *
- * @param {boolean} state
- * @param {Object}  action
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
  *
- * @return {boolean} Updated state.
+ * @return {Object} Updated state.
  */
-export function isReady( state = false, action ) {
+export function editorSettings( state = EDITOR_SETTINGS_DEFAULTS, action ) {
 	switch ( action.type ) {
-		case 'SETUP_EDITOR_STATE':
-			return true;
+		case 'UPDATE_EDITOR_SETTINGS':
+			return {
+				...state,
+				...action.settings,
+			};
+	}
 
-		case 'TEAR_DOWN_EDITOR':
-			return false;
+	return state;
+}
+
+export function renderingMode( state = 'post-only', action ) {
+	switch ( action.type ) {
+		case 'SET_RENDERING_MODE':
+			return action.mode;
 	}
 
 	return state;
 }
 
 /**
- * Reducer returning the post editor setting.
+ * Reducer returning the editing canvas device type.
  *
  * @param {Object} state  Current state.
  * @param {Object} action Dispatched action.
  *
  * @return {Object} Updated state.
  */
-export function editorSettings( state = EDITOR_SETTINGS_DEFAULTS, action ) {
+export function deviceType( state = 'Desktop', action ) {
 	switch ( action.type ) {
-		case 'UPDATE_EDITOR_SETTINGS':
-			return {
-				...state,
-				...action.settings,
-			};
+		case 'SET_DEVICE_TYPE':
+			return action.deviceType;
 	}
 
 	return state;
 }
 
-export function renderingMode( state = 'all', action ) {
+/**
+ * Reducer storing the list of all programmatically removed panels.
+ *
+ * @param {Array}  state  Current state.
+ * @param {Object} action Action object.
+ *
+ * @return {Array} Updated state.
+ */
+export function removedPanels( state = [], action ) {
 	switch ( action.type ) {
-		case 'SET_RENDERING_MODE':
-			return action.mode;
+		case 'REMOVE_PANEL':
+			if ( ! state.includes( action.panelName ) ) {
+				return [ ...state, action.panelName ];
+			}
+	}
+
+	return state;
+}
+
+/**
+ * Reducer to set the block inserter panel open or closed.
+ *
+ * Note: this reducer interacts with the list view panel reducer
+ * to make sure that only one of the two panels is open at the same time.
+ *
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
+ */
+export function blockInserterPanel( state = false, action ) {
+	switch ( action.type ) {
+		case 'SET_IS_LIST_VIEW_OPENED':
+			return action.isOpen ? false : state;
+		case 'SET_IS_INSERTER_OPENED':
+			return action.value;
 	}
+	return state;
+}
 
+/**
+ * Reducer to set the list view panel open or closed.
+ *
+ * Note: this reducer interacts with the inserter panel reducer
+ * to make sure that only one of the two panels is open at the same time.
+ *
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
+ */
+export function listViewPanel( state = false, action ) {
+	switch ( action.type ) {
+		case 'SET_IS_INSERTER_OPENED':
+			return action.value ? false : state;
+		case 'SET_IS_LIST_VIEW_OPENED':
+			return action.isOpen;
+	}
+	return state;
+}
+
+/**
+ * This reducer does nothing aside initializing a ref to the list view toggle.
+ * We will have a unique ref per "editor" instance.
+ *
+ * @param {Object} state
+ * @return {Object} Reference to the list view toggle button.
+ */
+export function listViewToggleRef( state = { current: null } ) {
+	return state;
+}
+
+/**
+ * This reducer does nothing aside initializing a ref to the inserter sidebar toggle.
+ * We will have a unique ref per "editor" instance.
+ *
+ * @param {Object} state
+ * @return {Object} Reference to the inserter sidebar toggle button.
+ */
+export function inserterSidebarToggleRef( state = { current: null } ) {
+	return state;
+}
+
+export function publishSidebarActive( state = false, action ) {
+	switch ( action.type ) {
+		case 'OPEN_PUBLISH_SIDEBAR':
+			return true;
+		case 'CLOSE_PUBLISH_SIDEBAR':
+			return false;
+		case 'TOGGLE_PUBLISH_SIDEBAR':
+			return ! state;
+	}
 	return state;
 }
 
@@ -306,8 +393,15 @@ export default combineReducers( {
 	postLock,
 	template,
 	postSavingLock,
-	isReady,
 	editorSettings,
 	postAutosavingLock,
 	renderingMode,
+	deviceType,
+	removedPanels,
+	blockInserterPanel,
+	inserterSidebarToggleRef,
+	listViewPanel,
+	listViewToggleRef,
+	publishSidebarActive,
+	dataviews: dataviewsReducer,
 } );
diff --git a/packages/editor/src/store/reducer.native.js b/packages/editor/src/store/reducer.native.js
index 991addd88620b7..7566dfc5dfd038 100644
--- a/packages/editor/src/store/reducer.native.js
+++ b/packages/editor/src/store/reducer.native.js
@@ -13,7 +13,6 @@ import {
 	postLock,
 	postSavingLock,
 	template,
-	isReady,
 	editorSettings,
 } from './reducer.js';
 
@@ -87,7 +86,6 @@ export default combineReducers( {
 	postLock,
 	postSavingLock,
 	template,
-	isReady,
 	editorSettings,
 	clipboard,
 	notices,
diff --git a/packages/editor/src/store/selectors.js b/packages/editor/src/store/selectors.js
index c47a80e96735f5..2396cb67c73e69 100644
--- a/packages/editor/src/store/selectors.js
+++ b/packages/editor/src/store/selectors.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import createSelector from 'rememo';
-
 /**
  * WordPress dependencies
  */
@@ -14,7 +9,7 @@ import {
 } from '@wordpress/blocks';
 import { isInTheFuture, getDate } from '@wordpress/date';
 import { addQueryArgs, cleanForSlug } from '@wordpress/url';
-import { createRegistrySelector } from '@wordpress/data';
+import { createSelector, createRegistrySelector } from '@wordpress/data';
 import deprecated from '@wordpress/deprecated';
 import { Platform } from '@wordpress/element';
 import { layout } from '@wordpress/icons';
@@ -33,6 +28,7 @@ import {
 } from './constants';
 import { getPostRawValue } from './reducer';
 import { getTemplatePartIcon } from '../utils/get-template-part-icon';
+import { unlock } from '../lock-unlock';
 
 /**
  * Shared reference to an empty object for cases where it is important to avoid
@@ -105,16 +101,11 @@ export const isEditedPostDirty = createRegistrySelector(
 		// inferred to contain unsaved values.
 		const postType = getCurrentPostType( state );
 		const postId = getCurrentPostId( state );
-		if (
-			select( coreStore ).hasEditsForEntityRecord(
-				'postType',
-				postType,
-				postId
-			)
-		) {
-			return true;
-		}
-		return false;
+		return select( coreStore ).hasEditsForEntityRecord(
+			'postType',
+			postType,
+			postId
+		);
 	}
 );
 
@@ -187,6 +178,11 @@ export const getCurrentPost = createRegistrySelector(
  *
  * @param {Object} state Global application state.
  *
+ * @example
+ *
+ *```js
+ * const currentPostType = wp.data.select( 'core/editor' ).getCurrentPostType();
+ *```
  * @return {string} Post type.
  */
 export function getCurrentPostType( state ) {
@@ -326,6 +322,22 @@ const getNestedEditedPostProperty = createSelector(
  * @param {Object} state         Global application state.
  * @param {string} attributeName Post attribute name.
  *
+ * @example
+ *
+ *```js
+ * 	// Get specific media size based on the featured media ID
+ * 	// Note: change sizes?.large for any registered size
+ * 	const getFeaturedMediaUrl = useSelect( ( select ) => {
+ * 		const getFeaturedMediaId =
+ * 			select( 'core/editor' ).getEditedPostAttribute( 'featured_media' );
+ * 		const getMedia = select( 'core' ).getMedia( getFeaturedMediaId );
+ *
+ * 		return (
+ * 			getMedia?.media_details?.sizes?.large?.source_url || getMedia?.source_url || ''
+ * 		);
+ * }, [] );
+ *```
+ *
  * @return {*} Post attribute value.
  */
 export function getEditedPostAttribute( state, attributeName ) {
@@ -373,6 +385,12 @@ export const getAutosaveAttribute = createRegistrySelector(
 		}
 
 		const postType = getCurrentPostType( state );
+
+		// Currently template autosaving is not supported.
+		if ( postType === 'wp_template' ) {
+			return false;
+		}
+
 		const postId = getCurrentPostId( state );
 		const currentUserId = select( coreStore ).getCurrentUser()?.id;
 		const autosave = select( coreStore ).getAutosave(
@@ -592,6 +610,12 @@ export const isEditedPostAutosaveable = createRegistrySelector(
 		}
 
 		const postType = getCurrentPostType( state );
+
+		// Currently template autosaving is not supported.
+		if ( postType === 'wp_template' ) {
+			return false;
+		}
+
 		const postId = getCurrentPostId( state );
 		const hasFetchedAutosave = select( coreStore ).hasFetchedAutosaves(
 			postType,
@@ -836,7 +860,9 @@ export const getSuggestedPostFormat = createRegistrySelector(
 	( select ) => () => {
 		const blocks = select( blockEditorStore ).getBlocks();
 
-		if ( blocks.length > 2 ) return null;
+		if ( blocks.length > 2 ) {
+			return null;
+		}
 
 		let name;
 		// If there is only one block in the content of the post grab its name
@@ -979,7 +1005,7 @@ export function getEditedPostSlug( state ) {
 }
 
 /**
- * Returns the permalink for a post, split into it's three parts: the prefix,
+ * Returns the permalink for a post, split into its three parts: the prefix,
  * the postName, and the suffix.
  *
  * @param {Object} state Editor state.
@@ -1100,10 +1126,7 @@ export function canUserUseUnfilteredHTML( state ) {
  */
 export const isPublishSidebarEnabled = createRegistrySelector(
 	( select ) => () =>
-		!! select( preferencesStore ).get(
-			'core/edit-post',
-			'isPublishSidebarEnabled'
-		)
+		!! select( preferencesStore ).get( 'core', 'isPublishSidebarEnabled' )
 );
 
 /**
@@ -1125,6 +1148,64 @@ export const getEditorBlocks = createSelector(
 	]
 );
 
+/**
+ * Returns true if the given panel was programmatically removed, or false otherwise.
+ * All panels are not removed by default.
+ *
+ * @param {Object} state     Global application state.
+ * @param {string} panelName A string that identifies the panel.
+ *
+ * @return {boolean} Whether or not the panel is removed.
+ */
+export function isEditorPanelRemoved( state, panelName ) {
+	return state.removedPanels.includes( panelName );
+}
+
+/**
+ * Returns true if the given panel is enabled, or false otherwise. Panels are
+ * enabled by default.
+ *
+ * @param {Object} state     Global application state.
+ * @param {string} panelName A string that identifies the panel.
+ *
+ * @return {boolean} Whether or not the panel is enabled.
+ */
+export const isEditorPanelEnabled = createRegistrySelector(
+	( select ) => ( state, panelName ) => {
+		// For backward compatibility, we check edit-post
+		// even though now this is in "editor" package.
+		const inactivePanels = select( preferencesStore ).get(
+			'core',
+			'inactivePanels'
+		);
+		return (
+			! isEditorPanelRemoved( state, panelName ) &&
+			! inactivePanels?.includes( panelName )
+		);
+	}
+);
+
+/**
+ * Returns true if the given panel is open, or false otherwise. Panels are
+ * closed by default.
+ *
+ * @param {Object} state     Global application state.
+ * @param {string} panelName A string that identifies the panel.
+ *
+ * @return {boolean} Whether or not the panel is open.
+ */
+export const isEditorPanelOpened = createRegistrySelector(
+	( select ) => ( state, panelName ) => {
+		// For backward compatibility, we check edit-post
+		// even though now this is in "editor" package.
+		const openPanels = select( preferencesStore ).get(
+			'core',
+			'openPanels'
+		);
+		return !! openPanels?.includes( panelName );
+	}
+);
+
 /**
  * A block selection object.
  *
@@ -1185,7 +1266,7 @@ export function getEditorSelection( state ) {
  * @return {boolean} is Ready.
  */
 export function __unstableIsEditorReady( state ) {
-	return state.isReady;
+	return !! state.postId;
 }
 
 /**
@@ -1210,6 +1291,57 @@ export function getRenderingMode( state ) {
 	return state.renderingMode;
 }
 
+/**
+ * Returns the current editing canvas device type.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {string} Device type.
+ */
+export const getDeviceType = createRegistrySelector(
+	( select ) => ( state ) => {
+		const isZoomOut = unlock( select( blockEditorStore ) ).isZoomOut();
+		if ( isZoomOut ) {
+			return 'Desktop';
+		}
+		return state.deviceType;
+	}
+);
+
+/**
+ * Returns true if the list view is opened.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Whether the list view is opened.
+ */
+export function isListViewOpened( state ) {
+	return state.listViewPanel;
+}
+
+/**
+ * Returns true if the inserter is opened.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Whether the inserter is opened.
+ */
+export function isInserterOpened( state ) {
+	return !! state.blockInserterPanel;
+}
+
+/**
+ * Returns the current editing mode.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {string} Editing mode.
+ */
+export const getEditorMode = createRegistrySelector(
+	( select ) => () =>
+		select( preferencesStore ).get( 'core', 'editorMode' ) ?? 'visual'
+);
+
 /*
  * Backward compatibility
  */
@@ -1591,8 +1723,8 @@ export function __experimentalGetDefaultTemplateTypes( state ) {
 export const __experimentalGetDefaultTemplatePartAreas = createSelector(
 	( state ) => {
 		const areas =
-			getEditorSettings( state )?.defaultTemplatePartAreas || [];
-		return areas?.map( ( item ) => {
+			getEditorSettings( state )?.defaultTemplatePartAreas ?? [];
+		return areas.map( ( item ) => {
 			return { ...item, icon: getTemplatePartIcon( item.icon ) };
 		} );
 	},
@@ -1620,7 +1752,7 @@ export const __experimentalGetDefaultTemplateType = createSelector(
 			) ?? EMPTY_OBJECT
 		);
 	},
-	( state, slug ) => [ __experimentalGetDefaultTemplateTypes( state ), slug ]
+	( state ) => [ __experimentalGetDefaultTemplateTypes( state ) ]
 );
 
 /**
@@ -1631,32 +1763,39 @@ export const __experimentalGetDefaultTemplateType = createSelector(
  * @param {Object} template The template for which we need information.
  * @return {Object} Information about the template, including title, description, and icon.
  */
-export function __experimentalGetTemplateInfo( state, template ) {
-	if ( ! template ) {
-		return EMPTY_OBJECT;
-	}
+export const __experimentalGetTemplateInfo = createSelector(
+	( state, template ) => {
+		if ( ! template ) {
+			return EMPTY_OBJECT;
+		}
 
-	const { description, slug, title, area } = template;
-	const { title: defaultTitle, description: defaultDescription } =
-		__experimentalGetDefaultTemplateType( state, slug );
+		const { description, slug, title, area } = template;
+		const { title: defaultTitle, description: defaultDescription } =
+			__experimentalGetDefaultTemplateType( state, slug );
 
-	const templateTitle = typeof title === 'string' ? title : title?.rendered;
-	const templateDescription =
-		typeof description === 'string' ? description : description?.raw;
-	const templateIcon =
-		__experimentalGetDefaultTemplatePartAreas( state ).find(
-			( item ) => area === item.area
-		)?.icon || layout;
+		const templateTitle =
+			typeof title === 'string' ? title : title?.rendered;
+		const templateDescription =
+			typeof description === 'string' ? description : description?.raw;
+		const templateIcon =
+			__experimentalGetDefaultTemplatePartAreas( state ).find(
+				( item ) => area === item.area
+			)?.icon || layout;
 
-	return {
-		title:
-			templateTitle && templateTitle !== slug
-				? templateTitle
-				: defaultTitle || slug,
-		description: templateDescription || defaultDescription,
-		icon: templateIcon,
-	};
-}
+		return {
+			title:
+				templateTitle && templateTitle !== slug
+					? templateTitle
+					: defaultTitle || slug,
+			description: templateDescription || defaultDescription,
+			icon: templateIcon,
+		};
+	},
+	( state ) => [
+		__experimentalGetDefaultTemplateTypes( state ),
+		__experimentalGetDefaultTemplatePartAreas( state ),
+	]
+);
 
 /**
  * Returns a post type label depending on the current post.
@@ -1674,3 +1813,14 @@ export const getPostTypeLabel = createRegistrySelector(
 		return postType?.labels?.singular_name;
 	}
 );
+
+/**
+ * Returns true if the publish sidebar is opened.
+ *
+ * @param {Object} state Global application state
+ *
+ * @return {boolean} Whether the publish sidebar is open.
+ */
+export function isPublishSidebarOpened( state ) {
+	return state.publishSidebarActive;
+}
diff --git a/packages/editor/src/store/test/actions.js b/packages/editor/src/store/test/actions.js
index b842450b733b38..206c60a159d04f 100644
--- a/packages/editor/src/store/test/actions.js
+++ b/packages/editor/src/store/test/actions.js
@@ -90,7 +90,9 @@ describe( 'Post actions', () => {
 					method === 'GET' &&
 					path.startsWith( '/wp/v2/types/post' )
 				) {
-					return {};
+					return {
+						json: () => Promise.resolve( {} ),
+					};
 				}
 
 				throw {
@@ -178,7 +180,9 @@ describe( 'Post actions', () => {
 						path.startsWith( '/wp/v2/types/post' ) ||
 						path.startsWith( `/wp/v2/posts/${ postId }` )
 					) {
-						return {};
+						return {
+							json: () => Promise.resolve( {} ),
+						};
 					}
 				}
 
@@ -262,7 +266,9 @@ describe( 'Post actions', () => {
 					method === 'GET' &&
 					path.startsWith( '/wp/v2/types/post' )
 				) {
-					return {};
+					return {
+						json: () => Promise.resolve( {} ),
+					};
 				}
 
 				throw {
@@ -432,4 +438,218 @@ describe( 'Editor actions', () => {
 			).toBe( false );
 		} );
 	} );
+
+	describe( 'toggleEditorPanelEnabled', () => {
+		it( 'toggles panels to be enabled and not enabled', () => {
+			const registry = createRegistryWithStores();
+
+			// This will switch it off, since the default is on.
+			registry
+				.dispatch( editorStore )
+				.toggleEditorPanelEnabled( 'control-panel' );
+
+			expect(
+				registry
+					.select( editorStore )
+					.isEditorPanelEnabled( 'control-panel' )
+			).toBe( false );
+
+			// Switch it on again.
+			registry
+				.dispatch( editorStore )
+				.toggleEditorPanelEnabled( 'control-panel' );
+
+			expect(
+				registry
+					.select( editorStore )
+					.isEditorPanelEnabled( 'control-panel' )
+			).toBe( true );
+		} );
+	} );
+
+	describe( 'toggleEditorPanelOpened', () => {
+		it( 'toggles panels open and closed', () => {
+			const registry = createRegistryWithStores();
+
+			// This will open it, since the default is closed.
+			registry
+				.dispatch( editorStore )
+				.toggleEditorPanelOpened( 'control-panel' );
+
+			expect(
+				registry
+					.select( editorStore )
+					.isEditorPanelOpened( 'control-panel' )
+			).toBe( true );
+
+			// Close it.
+			registry
+				.dispatch( editorStore )
+				.toggleEditorPanelOpened( 'control-panel' );
+
+			expect(
+				registry
+					.select( editorStore )
+					.isEditorPanelOpened( 'control-panel' )
+			).toBe( false );
+		} );
+	} );
+
+	describe( 'switchEditorMode', () => {
+		let registry;
+
+		beforeEach( () => {
+			registry = createRegistryWithStores();
+		} );
+
+		it( 'to visual', () => {
+			// Switch to text first, since the default is visual.
+			registry.dispatch( editorStore ).switchEditorMode( 'text' );
+			expect( registry.select( editorStore ).getEditorMode() ).toEqual(
+				'text'
+			);
+			registry.dispatch( editorStore ).switchEditorMode( 'visual' );
+			expect( registry.select( editorStore ).getEditorMode() ).toEqual(
+				'visual'
+			);
+		} );
+
+		it( 'to text', () => {
+			// It defaults to visual.
+			expect( registry.select( editorStore ).getEditorMode() ).toEqual(
+				'visual'
+			);
+			// Add a selected client id and make sure it's there.
+			const clientId = 'clientId_1';
+			registry.dispatch( blockEditorStore ).selectionChange( clientId );
+			expect(
+				registry.select( blockEditorStore ).getSelectedBlockClientId()
+			).toEqual( clientId );
+
+			registry.dispatch( editorStore ).switchEditorMode( 'text' );
+			expect(
+				registry.select( blockEditorStore ).getSelectedBlockClientId()
+			).toBeNull();
+			expect( registry.select( editorStore ).getEditorMode() ).toEqual(
+				'text'
+			);
+		} );
+		it( 'should turn off distraction free mode when switching to code editor', () => {
+			registry
+				.dispatch( preferencesStore )
+				.set( 'core', 'distractionFree', true );
+			registry.dispatch( editorStore ).switchEditorMode( 'text' );
+			expect(
+				registry
+					.select( preferencesStore )
+					.get( 'core', 'distractionFree' )
+			).toBe( false );
+		} );
+	} );
+
+	describe( 'toggleDistractionFree', () => {
+		it( 'should properly update settings to prevent layout corruption when enabling distraction free mode', () => {
+			const registry = createRegistryWithStores();
+
+			// Enable everything that shouldn't be enabled in distraction free mode.
+			registry
+				.dispatch( preferencesStore )
+				.set( 'core', 'fixedToolbar', true );
+			registry.dispatch( editorStore ).setIsListViewOpened( true );
+			// Initial state is falsy.
+			registry.dispatch( editorStore ).toggleDistractionFree();
+			expect(
+				registry
+					.select( preferencesStore )
+					.get( 'core', 'fixedToolbar' )
+			).toBe( true );
+			expect( registry.select( editorStore ).isListViewOpened() ).toBe(
+				false
+			);
+			expect( registry.select( editorStore ).isInserterOpened() ).toBe(
+				false
+			);
+			expect(
+				registry
+					.select( preferencesStore )
+					.get( 'core', 'distractionFree' )
+			).toBe( true );
+		} );
+	} );
+
+	describe( 'setIsInserterOpened', () => {
+		it( 'should open and close the inserter', () => {
+			const registry = createRegistryWithStores();
+
+			registry.dispatch( editorStore ).setIsInserterOpened( true );
+
+			expect( registry.select( editorStore ).isInserterOpened() ).toBe(
+				true
+			);
+
+			registry.dispatch( editorStore ).setIsInserterOpened( false );
+
+			expect( registry.select( editorStore ).isInserterOpened() ).toBe(
+				false
+			);
+		} );
+
+		it( 'the list view should close when the inserter is opened', () => {
+			const registry = createRegistryWithStores();
+
+			registry.dispatch( editorStore ).setIsListViewOpened( true );
+			expect( registry.select( editorStore ).isListViewOpened() ).toBe(
+				true
+			);
+			expect( registry.select( editorStore ).isInserterOpened() ).toBe(
+				false
+			);
+
+			registry.dispatch( editorStore ).setIsInserterOpened( true );
+			expect( registry.select( editorStore ).isInserterOpened() ).toBe(
+				true
+			);
+			expect( registry.select( editorStore ).isListViewOpened() ).toBe(
+				false
+			);
+		} );
+	} );
+
+	describe( 'setIsListViewOpened', () => {
+		it( 'should open and close the list view', () => {
+			const registry = createRegistryWithStores();
+
+			registry.dispatch( editorStore ).setIsListViewOpened( true );
+
+			expect( registry.select( editorStore ).isListViewOpened() ).toBe(
+				true
+			);
+
+			registry.dispatch( editorStore ).setIsListViewOpened( false );
+
+			expect( registry.select( editorStore ).isListViewOpened() ).toBe(
+				false
+			);
+		} );
+
+		it( 'the inserter should close when the list view is opened', () => {
+			const registry = createRegistryWithStores();
+
+			registry.dispatch( editorStore ).setIsInserterOpened( true );
+			expect( registry.select( editorStore ).isInserterOpened() ).toBe(
+				true
+			);
+			expect( registry.select( editorStore ).isListViewOpened() ).toBe(
+				false
+			);
+
+			registry.dispatch( editorStore ).setIsListViewOpened( true );
+			expect( registry.select( editorStore ).isListViewOpened() ).toBe(
+				true
+			);
+			expect( registry.select( editorStore ).isInserterOpened() ).toBe(
+				false
+			);
+		} );
+	} );
 } );
diff --git a/packages/editor/src/store/test/private-selectors.js b/packages/editor/src/store/test/private-selectors.js
new file mode 100644
index 00000000000000..bf2bc1f74065cb
--- /dev/null
+++ b/packages/editor/src/store/test/private-selectors.js
@@ -0,0 +1,78 @@
+/**
+ * Internal dependencies
+ */
+import { getPostBlocksByName } from '../private-selectors';
+
+describe( 'getPostBlocksByName', () => {
+	const state = {
+		blocks: {
+			byClientId: new Map( [
+				[ 'block1', { name: 'core/paragraph' } ],
+				[ 'block2', { name: 'core/heading' } ],
+				[ 'block3', { name: 'core/paragraph' } ],
+				[ 'block4', { name: 'core/query' } ],
+				[ 'block5', { name: 'core/paragraph' } ],
+				[ 'block6', { name: 'core/heading' } ],
+			] ),
+			order: new Map( [
+				[ '', [ 'block1', 'block2', 'block3', 'block4' ] ],
+				[ 'block4', [ 'block5', 'block6' ] ],
+			] ),
+			parents: new Map( [
+				[ 'block1', '' ],
+				[ 'block2', '' ],
+				[ 'block3', '' ],
+				[ 'block4', '' ],
+				[ 'block5', 'block4' ],
+				[ 'block6', 'block4' ],
+			] ),
+		},
+	};
+
+	getPostBlocksByName.registry = {
+		select: () => ( {
+			getBlocksByName: ( blockNames ) =>
+				Array.from( state.blocks.byClientId.keys() ).filter(
+					( clientId ) =>
+						blockNames.includes(
+							state.blocks.byClientId.get( clientId ).name
+						)
+				),
+			getBlockParents: ( clientId ) => {
+				const parents = [];
+				let parent = state.blocks.parents.get( clientId );
+				while ( parent ) {
+					parents.push( parent );
+					parent = state.blocks.parents.get( parent );
+				}
+				return parents;
+			},
+			getBlockName: ( clientId ) =>
+				state.blocks.byClientId.get( clientId ).name,
+			getBlocks: () => [],
+		} ),
+	};
+
+	it( 'should return top-level blocks of the specified name', () => {
+		const result = getPostBlocksByName( state, 'core/paragraph' );
+		expect( result ).toEqual( [ 'block1', 'block3' ] );
+	} );
+
+	it( 'should return an empty array if no blocks match', () => {
+		const result = getPostBlocksByName( state, 'core/non-existent' );
+		expect( result ).toEqual( [] );
+	} );
+
+	it( 'should ignore blocks inside a query block', () => {
+		const result = getPostBlocksByName( state, 'core/paragraph' );
+		expect( result ).toEqual( [ 'block1', 'block3' ] );
+	} );
+
+	it( 'should handle multiple block names', () => {
+		const result = getPostBlocksByName( state, [
+			'core/paragraph',
+			'core/heading',
+		] );
+		expect( result ).toEqual( [ 'block1', 'block2', 'block3' ] );
+	} );
+} );
diff --git a/packages/editor/src/store/test/reducer.js b/packages/editor/src/store/test/reducer.js
index 3b0ea9d3340a1e..3971ad30c9de74 100644
--- a/packages/editor/src/store/test/reducer.js
+++ b/packages/editor/src/store/test/reducer.js
@@ -14,6 +14,9 @@ import {
 	saving,
 	postSavingLock,
 	postAutosavingLock,
+	removedPanels,
+	blockInserterPanel,
+	listViewPanel,
 } from '../reducer';
 
 describe( 'state', () => {
@@ -264,4 +267,77 @@ describe( 'state', () => {
 			expect( state ).toEqual( {} );
 		} );
 	} );
+
+	describe( 'removedPanels', () => {
+		it( 'should remove panel', () => {
+			const original = deepFreeze( [] );
+			const state = removedPanels( original, {
+				type: 'REMOVE_PANEL',
+				panelName: 'post-status',
+			} );
+			expect( state ).toEqual( [ 'post-status' ] );
+		} );
+
+		it( 'should not remove already removed panel', () => {
+			const original = deepFreeze( [ 'post-status' ] );
+			const state = removedPanels( original, {
+				type: 'REMOVE_PANEL',
+				panelName: 'post-status',
+			} );
+			expect( state ).toBe( original );
+		} );
+	} );
+
+	describe( 'blockInserterPanel()', () => {
+		it( 'should apply default state', () => {
+			expect( blockInserterPanel( undefined, {} ) ).toEqual( false );
+		} );
+
+		it( 'should default to returning the same state', () => {
+			expect( blockInserterPanel( true, {} ) ).toBe( true );
+		} );
+
+		it( 'should close the inserter when opening the list view panel', () => {
+			expect(
+				blockInserterPanel( true, {
+					type: 'SET_IS_LIST_VIEW_OPENED',
+					isOpen: true,
+				} )
+			).toBe( false );
+		} );
+
+		it( 'should not change the state when closing the list view panel', () => {
+			expect(
+				blockInserterPanel( true, {
+					type: 'SET_IS_LIST_VIEW_OPENED',
+					isOpen: false,
+				} )
+			).toBe( true );
+		} );
+	} );
+
+	describe( 'listViewPanel()', () => {
+		it( 'should apply default state', () => {
+			expect( listViewPanel( undefined, {} ) ).toEqual( false );
+		} );
+
+		it( 'should default to returning the same state', () => {
+			expect( listViewPanel( true, {} ) ).toBe( true );
+		} );
+
+		it( 'should set the open state of the list view panel', () => {
+			expect(
+				listViewPanel( false, {
+					type: 'SET_IS_LIST_VIEW_OPENED',
+					isOpen: true,
+				} )
+			).toBe( true );
+			expect(
+				listViewPanel( true, {
+					type: 'SET_IS_LIST_VIEW_OPENED',
+					isOpen: false,
+				} )
+			).toBe( false );
+		} );
+	} );
 } );
diff --git a/packages/editor/src/store/test/selectors.js b/packages/editor/src/store/test/selectors.js
index 211ff717c88bda..1de25604ebd7e3 100644
--- a/packages/editor/src/store/test/selectors.js
+++ b/packages/editor/src/store/test/selectors.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import deepFreeze from 'deep-freeze';
+
 /**
  * WordPress dependencies
  */
@@ -187,6 +192,9 @@ const {
 	__experimentalGetDefaultTemplateTypes,
 	__experimentalGetTemplateInfo,
 	__experimentalGetDefaultTemplatePartAreas,
+	isEditorPanelRemoved,
+	isInserterOpened,
+	isListViewOpened,
 } = selectors;
 
 const defaultTemplateTypes = [
@@ -3010,4 +3018,45 @@ describe( 'selectors', () => {
 			);
 		} );
 	} );
+	describe( 'isEditorPanelRemoved', () => {
+		it( 'should return false by default', () => {
+			const state = deepFreeze( {
+				removedPanels: [],
+			} );
+
+			expect( isEditorPanelRemoved( state, 'post-status' ) ).toBe(
+				false
+			);
+		} );
+
+		it( 'should return true when panel was removed', () => {
+			const state = deepFreeze( {
+				removedPanels: [ 'post-status' ],
+			} );
+
+			expect( isEditorPanelRemoved( state, 'post-status' ) ).toBe( true );
+		} );
+	} );
+
+	describe( 'isInserterOpened', () => {
+		it( 'returns the block inserter panel isOpened state', () => {
+			const state = {
+				blockInserterPanel: true,
+			};
+			expect( isInserterOpened( state ) ).toBe( true );
+			state.blockInserterPanel = false;
+			expect( isInserterOpened( state ) ).toBe( false );
+		} );
+	} );
+
+	describe( 'isListViewOpened', () => {
+		it( 'returns the list view panel isOpened state', () => {
+			const state = {
+				listViewPanel: true,
+			};
+			expect( isListViewOpened( state ) ).toBe( true );
+			state.listViewPanel = false;
+			expect( isListViewOpened( state ) ).toBe( false );
+		} );
+	} );
 } );
diff --git a/packages/editor/src/store/utils/is-template-revertable.js b/packages/editor/src/store/utils/is-template-revertable.js
new file mode 100644
index 00000000000000..2cb674920e3e4c
--- /dev/null
+++ b/packages/editor/src/store/utils/is-template-revertable.js
@@ -0,0 +1,24 @@
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_ORIGINS } from '../constants';
+
+// Copy of the function from packages/edit-site/src/utils/is-template-revertable.js
+
+/**
+ * Check if a template or template part is revertable to its original theme-provided file.
+ *
+ * @param {Object} templateOrTemplatePart The entity to check.
+ * @return {boolean} Whether the entity is revertable.
+ */
+export default function isTemplateRevertable( templateOrTemplatePart ) {
+	if ( ! templateOrTemplatePart ) {
+		return false;
+	}
+
+	return (
+		templateOrTemplatePart.source === TEMPLATE_ORIGINS.custom &&
+		( Boolean( templateOrTemplatePart?.plugin ) ||
+			templateOrTemplatePart?.has_theme_file )
+	);
+}
diff --git a/packages/editor/src/style.scss b/packages/editor/src/style.scss
index ba12f58697a4a3..b62ccd2c8ac71d 100644
--- a/packages/editor/src/style.scss
+++ b/packages/editor/src/style.scss
@@ -1,26 +1,59 @@
+@import "../../interface/src/style.scss";
+
 @import "./components/autocompleters/style.scss";
+@import "./components/block-manager/style.scss";
+@import "./components/collab-sidebar/style.scss";
+@import "./components/collapsible-block-toolbar/style.scss";
+@import "./components/create-template-part-modal/style.scss";
+@import "./components/block-settings-menu/style.scss";
+@import "./components/blog-title/style.scss";
 @import "./components/document-bar/style.scss";
 @import "./components/document-outline/style.scss";
+@import "./components/document-tools/style.scss";
+@import "./components/editor-interface/style.scss";
 @import "./components/editor-notices/style.scss";
 @import "./components/entities-saved-states/style.scss";
 @import "./components/error-boundary/style.scss";
+@import "./components/header/style.scss";
+@import "./components/inserter-sidebar/style.scss";
+@import "./components/keyboard-shortcut-help-modal/style.scss";
+@import "./components/list-view-sidebar/style.scss";
+@import "./components/page-attributes/style.scss";
 @import "./components/post-author/style.scss";
+@import "./components/post-actions/style.scss";
+@import "./components/post-card-panel/style.scss";
+@import "./components/post-content-information/style.scss";
+@import "./components/post-discussion/style.scss";
 @import "./components/post-excerpt/style.scss";
 @import "./components/post-featured-image/style.scss";
 @import "./components/post-format/style.scss";
+@import "./components/post-last-edited-panel/style.scss";
 @import "./components/post-last-revision/style.scss";
 @import "./components/post-locked-modal/style.scss";
 @import "./components/post-panel-row/style.scss";
-@import "./components/post-publish-button/style.scss";
+@import "./components/post-panel-section/style.scss";
 @import "./components/post-publish-panel/style.scss";
 @import "./components/post-saved-state/style.scss";
 @import "./components/post-schedule/style.scss";
+@import "./components/post-slug/style.scss";
+@import "./components/post-status/style.scss";
+@import "./components/post-sticky/style.scss";
 @import "./components/post-sync-status/style.scss";
 @import "./components/post-taxonomies/style.scss";
+@import "./components/post-template/style.scss";
 @import "./components/post-text-editor/style.scss";
 @import "./components/post-title/style.scss";
 @import "./components/post-url/style.scss";
 @import "./components/post-visibility/style.scss";
+@import "./components/posts-per-page/style.scss";
 @import "./components/post-trash/style.scss";
+@import "./components/preview-dropdown/style.scss";
+@import "./components/resizable-editor/style.scss";
+@import "./components/save-publish-panels/style.scss";
+@import "./components/start-page-options/style.scss";
+@import "./components/start-template-options/style.scss";
+@import "./components/sidebar/style.scss";
+@import "./components/site-discussion/style.scss";
 @import "./components/table-of-contents/style.scss";
-@import "./components/template-validation-notice/style.scss";
+@import "./components/text-editor/style.scss";
+@import "./components/visual-editor/style.scss";
diff --git a/packages/editor/src/utils/media-upload/index.js b/packages/editor/src/utils/media-upload/index.js
index 036d925034bb86..6b39db2443cc33 100644
--- a/packages/editor/src/utils/media-upload/index.js
+++ b/packages/editor/src/utils/media-upload/index.js
@@ -1,7 +1,12 @@
+/**
+ * External dependencies
+ */
+import { v4 as uuid } from 'uuid';
+
 /**
  * WordPress dependencies
  */
-import { select } from '@wordpress/data';
+import { select, dispatch } from '@wordpress/data';
 import { uploadMedia } from '@wordpress/media-utils';
 
 /**
@@ -31,21 +36,58 @@ export default function mediaUpload( {
 	onError = noop,
 	onFileChange,
 } ) {
-	const { getCurrentPostId, getEditorSettings } = select( editorStore );
+	const { getCurrentPost, getEditorSettings } = select( editorStore );
+	const {
+		lockPostAutosaving,
+		unlockPostAutosaving,
+		lockPostSaving,
+		unlockPostSaving,
+	} = dispatch( editorStore );
+
 	const wpAllowedMimeTypes = getEditorSettings().allowedMimeTypes;
+	const lockKey = `image-upload-${ uuid() }`;
+	let imageIsUploading = false;
 	maxUploadFileSize =
 		maxUploadFileSize || getEditorSettings().maxUploadFileSize;
+	const currentPost = getCurrentPost();
+	// Templates and template parts' numerical ID is stored in `wp_id`.
+	const currentPostId =
+		typeof currentPost?.id === 'number'
+			? currentPost.id
+			: currentPost?.wp_id;
+	const setSaveLock = () => {
+		lockPostSaving( lockKey );
+		lockPostAutosaving( lockKey );
+		imageIsUploading = true;
+	};
+
+	const postData = currentPostId ? { post: currentPostId } : {};
+	const clearSaveLock = () => {
+		unlockPostSaving( lockKey );
+		unlockPostAutosaving( lockKey );
+		imageIsUploading = false;
+	};
 
 	uploadMedia( {
 		allowedTypes,
 		filesList,
-		onFileChange,
+		onFileChange: ( file ) => {
+			if ( ! imageIsUploading ) {
+				setSaveLock();
+			} else {
+				clearSaveLock();
+			}
+			onFileChange( file );
+		},
 		additionalData: {
-			post: getCurrentPostId(),
+			...postData,
 			...additionalData,
 		},
 		maxUploadFileSize,
-		onError: ( { message } ) => onError( message ),
+		onError: ( { message } ) => {
+			clearSaveLock();
+			onError( message );
+		},
 		wpAllowedMimeTypes,
 	} );
 }
diff --git a/packages/editor/tsconfig.json b/packages/editor/tsconfig.json
new file mode 100644
index 00000000000000..3c45fbcb10db3d
--- /dev/null
+++ b/packages/editor/tsconfig.json
@@ -0,0 +1,39 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig.json",
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"declarationDir": "build-types",
+		"checkJs": false
+	},
+	"references": [
+		{ "path": "../a11y" },
+		{ "path": "../api-fetch" },
+		{ "path": "../blob" },
+		{ "path": "../block-editor" },
+		{ "path": "../components" },
+		{ "path": "../compose" },
+		{ "path": "../core-data" },
+		{ "path": "../data" },
+		{ "path": "../dataviews" },
+		{ "path": "../date" },
+		{ "path": "../deprecated" },
+		{ "path": "../dom" },
+		{ "path": "../element" },
+		{ "path": "../fields" },
+		{ "path": "../hooks" },
+		{ "path": "../html-entities" },
+		{ "path": "../i18n" },
+		{ "path": "../icons" },
+		{ "path": "../keycodes" },
+		{ "path": "../media-utils" },
+		{ "path": "../notices" },
+		{ "path": "../plugins" },
+		{ "path": "../private-apis" },
+		{ "path": "../rich-text" },
+		{ "path": "../url" },
+		{ "path": "../warning" },
+		{ "path": "../wordcount" }
+	],
+	"include": [ "src" ]
+}
diff --git a/packages/element/.npmrc b/packages/element/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/element/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/element/CHANGELOG.md b/packages/element/CHANGELOG.md
index 574f801a1d7b7e..1d6adbaef2c684 100644
--- a/packages/element/CHANGELOG.md
+++ b/packages/element/CHANGELOG.md
@@ -2,6 +2,56 @@
 
 ## Unreleased
 
+## 6.10.0 (2024-10-16)
+
+## 6.9.0 (2024-10-03)
+
+## 6.8.0 (2024-09-19)
+
+## 6.7.0 (2024-09-05)
+
+## 6.6.0 (2024-08-21)
+
+## 6.5.0 (2024-08-07)
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 5.35.0 (2024-05-16)
+
+## 5.34.0 (2024-05-02)
+
+## 5.33.0 (2024-04-19)
+
+## 5.32.0 (2024-04-03)
+
+## 5.31.0 (2024-03-21)
+
+## 5.30.0 (2024-03-06)
+
+## 5.29.0 (2024-02-21)
+
+## 5.28.0 (2024-02-09)
+
+## 5.27.0 (2024-01-24)
+
+-   Started exporting the `PureComponent` React API ([#58076](https://github.com/WordPress/gutenberg/pull/58076)).
+
+## 5.26.0 (2024-01-10)
+
+## 5.25.0 (2023-12-13)
+
 ## 5.24.0 (2023-11-29)
 
 ## 5.23.0 (2023-11-16)
@@ -12,7 +62,7 @@
 
 ## 5.20.0 (2023-10-05)
 
-## Breaking Changes
+### Breaking Changes
 
 -   Remove the WPElement, WPComponent, and WPSyntheticEvent types.
 
@@ -82,7 +132,7 @@
 
 ## 4.14.0 (2022-08-24)
 
-### Bug Fix
+### Bug Fixes
 
 -   Packages: Replace `is-plain-obj` with `is-plain-object` ([#43511](https://github.com/WordPress/gutenberg/pull/43511)).
 
@@ -110,25 +160,25 @@
 
 ## 4.2.0 (2022-03-11)
 
-### Bug Fix
+### Bug Fixes
 
-- Serialize will now keep correct casing for SVG attributes ([#38936](https://github.com/WordPress/gutenberg/pull/38936)).
+-   Serialize will now keep correct casing for SVG attributes ([#38936](https://github.com/WordPress/gutenberg/pull/38936)).
 
 ## 4.1.0 (2022-01-27)
 
-### Bug Fix
+### Bug Fixes
 
 -   Ensure that the package uses the latest version of React types ([#37365](https://github.com/WordPress/gutenberg/pull/37365)).
 
 ## 4.0.3 (2021-10-22)
 
-### Bug Fix
+### Bug Fixes
 
 -   Update `rawHtml` to correctly concatenate multiple strings passed as children (see [35532](https://github.com/WordPress/gutenberg/pull/35532))
 
 ## 4.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -147,20 +197,20 @@
 
 ## 2.17.1 (2020-09-17)
 
-### Bug fix
+### Bug Fixes
 
 -   Declare @types/react and @types/react-dom dependencies which could cause type errors when using
     this package with TypeScript ([#25086](https://github.com/WordPress/gutenberg/pull/25086))
 
 ## 2.14.0 (2020-05-14)
 
-### New Feature
+### New Features
 
 -   Include TypeScript type declarations ([#21781](https://github.com/WordPress/gutenberg/pull/21781))
 
 ## 2.13.1 (2020-04-15)
 
-### Bug Fix
+### Bug Fixes
 
 -   Hide TypeScript type declarations ([#21613](https://github.com/WordPress/gutenberg/pull/21613))
     after they were found to conflict with DefinitelyTyped provided declarations.
@@ -225,6 +275,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/element/README.md b/packages/element/README.md
index 96aeeea37a462e..86f3a6214df0e0 100755
--- a/packages/element/README.md
+++ b/packages/element/README.md
@@ -231,13 +231,13 @@ _Returns_
 
 _Related_
 
--   <https://reactjs.org/docs/react-api.html#reactlazy>
+-   <https://react.dev/reference/react/lazy>
 
 ### memo
 
 _Related_
 
--   <https://reactjs.org/docs/react-api.html#reactmemo>
+-   <https://react.dev/reference/react/memo>
 
 ### Platform
 
@@ -247,7 +247,7 @@ This is the same concept as the React Native implementation.
 
 _Related_
 
--   <https://facebook.github.io/react-native/docs/platform-specific-code#platform-module> Here is an example of how to use the select method:
+-   <https://reactnative.dev/docs/platform-specific-code#platform-module> Here is an example of how to use the select method:
 
 _Usage_
 
@@ -262,6 +262,12 @@ const placeholderLabel = Platform.select( {
 } );
 ```
 
+### PureComponent
+
+_Related_
+
+-   <https://react.dev/reference/react/PureComponent>
+
 ### RawHTML
 
 Component used as equivalent of Fragment with unescaped HTML, in cases where it is desirable to render dangerous HTML without needing a wrapper element. To preserve additional props, a `div` wrapper _will_ be created if any props aside from `children` are passed.
@@ -302,7 +308,7 @@ _Returns_
 
 _Related_
 
--   <https://reactjs.org/docs/react-api.html#starttransition>
+-   <https://react.dev/reference/react/startTransition>
 
 ### StrictMode
 
@@ -312,7 +318,7 @@ Component that activates additional checks and warnings for its descendants.
 
 _Related_
 
--   <https://reactjs.org/docs/react-api.html#reactsuspense>
+-   <https://react.dev/reference/react/Suspense>
 
 ### switchChildrenNodeName
 
@@ -341,91 +347,91 @@ _Related_
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#usecallback>
+-   <https://react.dev/reference/react/useCallback>
 
 ### useContext
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#usecontext>
+-   <https://react.dev/reference/react/useContext>
 
 ### useDebugValue
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#usedebugvalue>
+-   <https://react.dev/reference/react/useDebugValue>
 
 ### useDeferredValue
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#usedeferredvalue>
+-   <https://react.dev/reference/react/useDeferredValue>
 
 ### useEffect
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#useeffect>
+-   <https://react.dev/reference/react/useEffect>
 
 ### useId
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#useid>
+-   <https://react.dev/reference/react/useId>
 
 ### useImperativeHandle
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#useimperativehandle>
+-   <https://react.dev/reference/react/useImperativeHandle>
 
 ### useInsertionEffect
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#useinsertioneffect>
+-   <https://react.dev/reference/react/useInsertionEffect>
 
 ### useLayoutEffect
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#uselayouteffect>
+-   <https://react.dev/reference/react/useLayoutEffect>
 
 ### useMemo
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#usememo>
+-   <https://react.dev/reference/react/useMemo>
 
 ### useReducer
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#usereducer>
+-   <https://react.dev/reference/react/useReducer>
 
 ### useRef
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#useref>
+-   <https://react.dev/reference/react/useRef>
 
 ### useState
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#usestate>
+-   <https://react.dev/reference/react/useState>
 
 ### useSyncExternalStore
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#usesyncexternalstore>
+-   <https://react.dev/reference/react/useSyncExternalStore>
 
 ### useTransition
 
 _Related_
 
--   <https://reactjs.org/docs/hooks-reference.html#usetransition>
+-   <https://react.dev/reference/react/useTransition>
 
 <!-- END TOKEN(Autogenerated API docs) -->
 
diff --git a/packages/element/package.json b/packages/element/package.json
index c40b80802d4a0a..51e08e534b271e 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/element",
-	"version": "5.24.0",
+	"version": "6.10.0",
 	"description": "Element React module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,16 +29,17 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@types/react": "^18.0.21",
-		"@types/react-dom": "^18.0.6",
-		"@wordpress/escape-html": "file:../escape-html",
+		"@babel/runtime": "7.25.7",
+		"@types/react": "^18.2.79",
+		"@types/react-dom": "^18.2.25",
+		"@wordpress/escape-html": "*",
 		"change-case": "^4.1.2",
 		"is-plain-object": "^5.0.0",
-		"react": "^18.2.0",
-		"react-dom": "^18.2.0"
+		"react": "^18.3.0",
+		"react-dom": "^18.3.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/element/src/platform.js b/packages/element/src/platform.js
index c646b6c86d51a2..841cd06e4cabb5 100644
--- a/packages/element/src/platform.js
+++ b/packages/element/src/platform.js
@@ -17,7 +17,7 @@ const Platform = {
  *
  * This is the same concept as the React Native implementation.
  *
- * @see https://facebook.github.io/react-native/docs/platform-specific-code#platform-module
+ * @see https://reactnative.dev/docs/platform-specific-code#platform-module
  *
  * Here is an example of how to use the select method:
  * @example
diff --git a/packages/element/src/react.js b/packages/element/src/react.js
index 6882f9ad3344a5..cf2f9614bc3316 100644
--- a/packages/element/src/react.js
+++ b/packages/element/src/react.js
@@ -13,6 +13,7 @@ import {
 	Fragment,
 	isValidElement,
 	memo,
+	PureComponent,
 	StrictMode,
 	useCallback,
 	useContext,
@@ -53,12 +54,26 @@ import {
  */
 
 /**
- * Object containing a React synthetic event.
+ * Object containing a React ref object.
  *
  * @template T
  * @typedef {import('react').RefObject<T>} RefObject<T>
  */
 
+/**
+ * Object containing a React ref callback.
+ *
+ * @template T
+ * @typedef {import('react').RefCallback<T>} RefCallback<T>
+ */
+
+/**
+ * Object containing a React ref.
+ *
+ * @template T
+ * @typedef {import('react').Ref<T>} Ref<T>
+ */
+
 /**
  * Object that provides utilities for dealing with React children.
  */
@@ -139,7 +154,7 @@ export { Fragment };
 export { isValidElement };
 
 /**
- * @see https://reactjs.org/docs/react-api.html#reactmemo
+ * @see https://react.dev/reference/react/memo
  */
 export { memo };
 
@@ -149,95 +164,100 @@ export { memo };
 export { StrictMode };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#usecallback
+ * @see https://react.dev/reference/react/useCallback
  */
 export { useCallback };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#usecontext
+ * @see https://react.dev/reference/react/useContext
  */
 export { useContext };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#usedebugvalue
+ * @see https://react.dev/reference/react/useDebugValue
  */
 export { useDebugValue };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#usedeferredvalue
+ * @see https://react.dev/reference/react/useDeferredValue
  */
 export { useDeferredValue };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#useeffect
+ * @see https://react.dev/reference/react/useEffect
  */
 export { useEffect };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#useid
+ * @see https://react.dev/reference/react/useId
  */
 export { useId };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#useimperativehandle
+ * @see https://react.dev/reference/react/useImperativeHandle
  */
 export { useImperativeHandle };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#useinsertioneffect
+ * @see https://react.dev/reference/react/useInsertionEffect
  */
 export { useInsertionEffect };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#uselayouteffect
+ * @see https://react.dev/reference/react/useLayoutEffect
  */
 export { useLayoutEffect };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#usememo
+ * @see https://react.dev/reference/react/useMemo
  */
 export { useMemo };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#usereducer
+ * @see https://react.dev/reference/react/useReducer
  */
 export { useReducer };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#useref
+ * @see https://react.dev/reference/react/useRef
  */
 export { useRef };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#usestate
+ * @see https://react.dev/reference/react/useState
  */
 export { useState };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#usesyncexternalstore
+ * @see https://react.dev/reference/react/useSyncExternalStore
  */
 export { useSyncExternalStore };
 
 /**
- * @see https://reactjs.org/docs/hooks-reference.html#usetransition
+ * @see https://react.dev/reference/react/useTransition
  */
 export { useTransition };
 
 /**
- * @see https://reactjs.org/docs/react-api.html#starttransition
+ * @see https://react.dev/reference/react/startTransition
  */
 export { startTransition };
 
 /**
- * @see https://reactjs.org/docs/react-api.html#reactlazy
+ * @see https://react.dev/reference/react/lazy
  */
 export { lazy };
 
 /**
- * @see https://reactjs.org/docs/react-api.html#reactsuspense
+ * @see https://react.dev/reference/react/Suspense
  */
 export { Suspense };
 
+/**
+ * @see https://react.dev/reference/react/PureComponent
+ */
+export { PureComponent };
+
 /**
  * Concatenate two or more React children objects.
  *
diff --git a/packages/element/src/serialize.js b/packages/element/src/serialize.js
index e047ccad432dc8..9ca05cf2fa5e4e 100644
--- a/packages/element/src/serialize.js
+++ b/packages/element/src/serialize.js
@@ -755,7 +755,7 @@ export function renderAttributes( props ) {
 
 		let value = getNormalAttributeValue( key, props[ key ] );
 
-		// If value is not of serializeable type, skip.
+		// If value is not of serializable type, skip.
 		if ( ! ATTRIBUTES_TYPES.has( typeof value ) ) {
 			continue;
 		}
diff --git a/packages/element/src/test/create-interpolate-element.js b/packages/element/src/test/create-interpolate-element.js
index e78d3b1c558441..17b1cc9b3ab2c9 100644
--- a/packages/element/src/test/create-interpolate-element.js
+++ b/packages/element/src/test/create-interpolate-element.js
@@ -80,7 +80,7 @@ describe( 'createInterpolateElement', () => {
 		);
 		const component = createInterpolateElement( testString, {
 			// eslint-disable-next-line jsx-a11y/anchor-has-content
-			a: <a href={ 'https://github.com' } className={ 'some_class' } />,
+			a: <a href="https://github.com" className="some_class" />,
 		} );
 		expect( JSON.stringify( component ) ).toEqual(
 			JSON.stringify( expectedElement )
diff --git a/packages/element/src/test/serialize.js b/packages/element/src/test/serialize.js
index 7e38b80101bcdc..e2337f8556119e 100644
--- a/packages/element/src/test/serialize.js
+++ b/packages/element/src/test/serialize.js
@@ -322,12 +322,11 @@ describe( 'renderElement()', () => {
 				<Provider value={ { value: '1st provided' } }>
 					<Consumer>{ ( context ) => context.value }</Consumer>
 				</Provider>
-				{ '|' }
+				|
 				<Provider value={ { value: '2nd provided' } }>
 					<Consumer>{ ( context ) => context.value }</Consumer>
 				</Provider>
-				{ '|' }
-				<Consumer>{ ( context ) => context.value }</Consumer>
+				|<Consumer>{ ( context ) => context.value }</Consumer>
 			</Fragment>
 		);
 
@@ -344,8 +343,7 @@ describe( 'renderElement()', () => {
 				<Provider value={ { value: 'inner provided' } }>
 					<Consumer>{ ( context ) => context.value }</Consumer>
 				</Provider>
-				{ '|' }
-				<Consumer>{ ( context ) => context.value }</Consumer>
+				|<Consumer>{ ( context ) => context.value }</Consumer>
 			</Provider>
 		);
 
diff --git a/packages/element/tsconfig.json b/packages/element/tsconfig.json
index 1f90b9c762ae63..ad6a489d33e9a5 100644
--- a/packages/element/tsconfig.json
+++ b/packages/element/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/env/.npmrc b/packages/env/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/env/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/env/CHANGELOG.md b/packages/env/CHANGELOG.md
index 8b39bea46f785e..faffee0d5b4d30 100644
--- a/packages/env/CHANGELOG.md
+++ b/packages/env/CHANGELOG.md
@@ -2,9 +2,69 @@
 
 ## Unreleased
 
-### Breaking Change
+## 10.10.0 (2024-10-16)
 
-- Update Docker usage to `docker compose` V2 following [deprecation](https://docs.docker.com/compose/migrate/) of `docker-compose` V1.
+## 10.9.0 (2024-10-03)
+
+## 10.8.0 (2024-09-19)
+
+## 10.7.0 (2024-09-05)
+
+## 10.6.0 (2024-08-21)
+
+## 10.5.0 (2024-08-07)
+
+## 10.4.0 (2024-07-24)
+
+## 10.3.0 (2024-07-10)
+
+### Bug Fixes
+
+-   Remove `version` field from docker-compose config generated by env package [#63099](https://github.com/WordPress/gutenberg/pull/63099). Docker has starting throwing a warning that this property is obsolete and should be removed.
+
+## 10.2.0 (2024-06-26)
+
+### Enhancements
+
+-   Ignore `$schema` key in environment config parsing ([#62626](https://github.com/WordPress/gutenberg/pull/62626)).
+
+## 10.1.0 (2024-06-15)
+
+## 10.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 9.10.0 (2024-05-16)
+
+## 9.9.0 (2024-05-02)
+
+## 9.8.0 (2024-04-19)
+
+## 9.7.0 (2024-04-03)
+
+## 9.6.0 (2024-03-21)
+
+## 9.5.0 (2024-03-06)
+
+## 9.4.0 (2024-02-21)
+
+### Bug Fixes
+
+-   Fix `mariadb` version to LTS [#59237](https://github.com/WordPress/gutenberg/pull/59237)
+
+## 9.3.0 (2024-02-09)
+
+## 9.2.0 (2024-01-24)
+
+## 9.1.0 (2024-01-10)
+
+## 9.0.0 (2023-12-13)
+
+### Breaking Changes
+
+-   Update Docker usage to `docker compose` V2 following [deprecation](https://docs.docker.com/compose/migrate/) of `docker-compose` V1.
 
 ## 8.13.0 (2023-11-29)
 
@@ -12,13 +72,13 @@
 
 ## 8.11.0 (2023-11-02)
 
-### Enhancement
+### Enhancements
 
 -   `wp-env` now works offline after the environment has been created. Note that many `wp-env` configuration changes involve internet connectivity and may not work in offline mode. [#53547](https://github.com/WordPress/gutenberg/pull/53547)
 
 ## 8.10.0 (2023-10-18)
 
-### Bug Fix
+### Bug Fixes
 
 -   Corrected `PATH` to include the host user's Composer bin directory.
 -   Replaced `yoast/phpunit-polyfills` with `phpunit/phpunit` to install the required PHPUnit version, avoiding the need for project-specific polyfills.
@@ -41,49 +101,49 @@
 
 ## 8.1.1 (2023-06-17)
 
-### Bug fix
+### Bug Fixes
 
 -   Address issue where a missing file in the underlying Docker image caused `wp-env` to crash. [#51513](https://github.com/WordPress/gutenberg/pull/51513)
 
 ## 8.1.0 (2023-06-07)
 
-### New feature
+### New Features
 
 -   Execute the local package's `wp-env` instead of the globally installed version if one is available.
 
-### Bug fix
+### Bug Fixes
 
 -   Run `useradd` with `-l` option to prevent excessive Docker image sizes.
 
 ## 8.0.0 (2023-05-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Remove `afterSetup` option from `.wp-env.json` and the `WP_ENV_AFTER_SETUP` environment variable in favor of more granular lifecycle scripts.
 
-### New feature
+### New Features
 
 -   Add `afterStart`, `afterClean`, and `afterDestroy` lifecycle scripts to a new `lifecycleScripts` key in `.wp-env.json`.
 -   Add a series of `WP_ENV_LIFECYCLE_SCRIPT_` environment variables for the various lifecycle scripts.
 -   Rework `run` command to resolve bugs with non-quoted commands. As a consequence it is no longer possible to pass your entire command to `wp-env` wrapped in double-quotes. While `npx wp-env run cli wp help` will still work, `npx wp-env run cli "wp help"` will not. If you are currently escaping any quotes you will need to review those commands and ensure they are compatible with this update.
 
-### Enhancement
+### Enhancements
 
 -   Support using double dashes in `wp-env run ...` to pass arguments that would otherwise be consumed by `wp-env`. For example, while normally `--help` would provide the `wp-env` help text, if you use `npx wp-env run cli php -- --help` you will see the PHP help text.
 -   Validate whether or not config options exist to prevent accidentally including ones that don't.
 
-### Bug fix
+### Bug Fixes
 
 -   Support Windows without requiring the use of WSL.
 
 ## 7.0.0 (2023-05-10)
 
-### Breaking Change
+### Breaking Changes
 
 -   Docker containers now run as the host user. This should resolve problems with permissions arising from different owners between the host, web container, and cli container. If you still encounter permissions issues, try running `npx wp-env destroy` so that the environment can be recreated with the correct permissions.
 -   Remove the `composer` and `phpunit` Docker containers. If you are currently using the `run composer` or `run phpunit` command you can migrate to `run cli composer` or `run tests-cli phpunit` respectively. Note that with `composer`, you will need to use the `--env-cwd` option to navigate to your plugin's directory as it is no longer the default working directory.
 
-### New feature
+### New Features
 
 -   Create an `afterSetup` option in `.wp-env.json` files for setting arbitrary commands to run after setting up WordPress when using `npx wp-env start` and `npx wp-env clean`.
 -   Add a `WP_ENV_AFTER_SETUP` environment variable to override the `afterSetup` option.
@@ -91,19 +151,19 @@
 -   Execute the `afterSetup` command on `npx wp-env clean`.
 -   Globally install `composer` and the correct version of `phpunit` in all of the Docker containers.
 
-### Bug fix
+### Bug Fixes
 
 -   Ensure `wordpress`, `tests-wordpress`, `cli`, and `tests-cli` always build the correct Docker image.
 -   Fix Xdebug while using PHP 7.2x.
 
-### Enhancement
+### Enhancements
 
 -   `wp-env run ...` now uses docker-compose exec instead of docker-compose run. As a result, it is much faster, since commands are executed against existing services, rather than creating them from scratch each time.
 -   Increase the maximum upload size to 1GB.
 
 ## 6.0.0 (2023-04-26)
 
-### Breaking Change
+### Breaking Changes
 
 -   Use test environment's `WP_SITEURL` instead of `WP_TESTS_DOMAIN` as the WordPress URL.
 -   Automatically add the environment's port to `WP_TESTS_DOMAIN`.
@@ -121,11 +181,11 @@
 
 ## 5.11.0 (2023-02-01)
 
-### Bug fix
+### Bug Fixes
 
 -   PHP 7.3 and 7.4 must use PHPUnit 9.
 
-### Enhancement
+### Enhancements
 
 -   It's now possible to run PHPUnit tests on PHP 8.1 and 8.2.
 
@@ -147,23 +207,23 @@
 
 ## 5.2.0 (2022-08-16)
 
-### Enhancement
+### Enhancements
 
 -   Query parameters can now be used in .zip source URLs.
 
 ## 5.1.1 (2022-08-16)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix a crash when "core" was set to `null` in a `.wp-env.json` file. We now use the latest stable WordPress version in that case. This also restores the previous behavior of `"core": null` in `.wp-env.override.json`, which was to use the latest stable WordPress version.
 
 ## 5.1.0 (2022-08-10)
 
-### Enhancement
+### Enhancements
 
 -   Previously, wp-env used the WordPress version provided by Docker in the WordPress image for installations which don't specify a WordPress version. Now, wp-env will find the latest stable version on WordPress.org and check out the https://github.com/WordPress/WordPress repository at the tag matching that version. In most cases, this will match what Docker provides. The benefit is that wp-env (and WordPress.org) now controls the default WordPress version rather than Docker.
 
-### Bug Fix
+### Bug Fixes
 
 -   Downloading a default WordPress version also resolves a bug where the wrong WordPress test files were used if no core source was specified in wp-env.json. The current trunk test files were downloaded rather than the stable version. Now, the test files will match the default stable version.
 
@@ -174,48 +234,48 @@
 -   Removed the `WP_PHPUNIT__TESTS_CONFIG` environment variable from the `phpunit` container. **This removes automatic support for the `wp-phpunit/wp-phpunit` Composer package. To continue using the package, set the following two environment variables in your `phpunit.xml` file or similar: `WP_TESTS_DIR=""` and `WP_PHPUNIT__TESTS_CONFIG="/wordpress-phpunit/wp-tests-config.php"`.**
 -   Removed the generated `/var/www/html/phpunit-wp-config.php` file from the environment.
 
-### Enhancement
+### Enhancements
 
 -   Read WordPress' version and include the corresponding PHPUnit test files in the environment.
 -   Set the `WP_TESTS_DIR` environment variable in all containers to point at the PHPUnit test files.
 
-### Bug Fix
+### Bug Fixes
 
 -   Restrict `WP_TESTS_DOMAIN` constant to just hostname rather than an entire URL (e.g. it now excludes scheme, port, etc.) ([#41039](https://github.com/WordPress/gutenberg/pull/41039)).
 
 ## 4.8.0 (2022-06-01)
 
-### Enhancement
+### Enhancements
 
 -   Removed the need for quotation marks when passing options to `wp-env run`.
 -   Setting a `config` key to `null` will prevent adding the constant to `wp-config.php` even if a default value is defined by `wp-env`.
 
 ## 4.7.0 (2022-05-18)
 
-### Enhancement
+### Enhancements
 
 -   Added SSH protocol support for git sources
 
 ## 4.2.0 (2022-01-27)
 
-### Enhancement
+### Enhancements
 
 -   Added command `wp-env install-path` to list the directory used for the environment.
 -   The help entry is now shown when no subcommand is passed to `wp-env`.
 
-### Bug Fix
+### Bug Fixes
 
 -   Updated `yargs` to fix [CVE-2021-3807](https://nvd.nist.gov/vuln/detail/CVE-2021-3807).
 
 ## 4.1.3 (2021-11-07)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix Xdebug installation code to ensure it would fail gracefully
 
 ## 4.0.3 (2021-04-29)
 
-### Bug Fix
+### Bug Fixes
 
 -   `wp-env destroy` will now work in environments which don't include the `grep` or `awk` commands, such as Windows PowerShell.
 -   Fix several permissions issues related to wp-config.php and wp-content files.
@@ -224,7 +284,7 @@
 
 ## 4.0.0 (2021-03-17)
 
-### Breaking Change
+### Breaking Changes
 
 -   Migrate from `nodegit` to `simple-git`. This change now requires you to have a `git` binary installed locally to utilize the git sources feature of wp-env.json.
 
@@ -238,13 +298,13 @@
 
 -   `wp-env start` is now the only command which writes to the docker configuration files. Previously, running any command would also parse the config and then write it to the correct location. Now, other commands still parse the config, but they will not overwrite the confugiration which was set by wp-env start. This allows parameters to be passed to wp-env start which can affect the configuration.
 
-### Enhancement
+### Enhancements
 
 -   Update nodegit dependency to 0.27.0, the earlier version does not have pre-built binaries for Node 14.15.0 LTS. Upgrading provides support without requiring building nodegit locally.
 -   Allow WP_HOME wp-config value to be set to a custom port other than the default for the docker instance.
 -   Append the instance URL to output of `wp-env start`.
 
-### New feature
+### New Features
 
 -   Add support for setting the PHP version used for the WordPress instance. For example, test PHP 8 with `"phpVersion": 8.0` in wp-env.json.
 -   Add Xdebug 3 to the development environment. You can enable Xdebug with `wp-env start --xdebug` (for debug mode) or `wp-env start --xdebug=develop,coverage` for custom modes.
@@ -262,7 +322,7 @@
 -   `wp-env start` no longer stops the WordPress instance if it was already started unless it needs to configure WordPress.
 -   `wp-env start` no longer updates remote sources after first install if the configuration is the same. Use `wp-env start --update` to update sources.
 
-### New Feature
+### New Features
 
 -   You may now specify specific configuration for different environments using `env.tests` or `env.development` in `.wp-env.json`.
 -   `wp-env start` is significantly faster after first install.
@@ -275,7 +335,7 @@
 
 ## 1.4.0 (2020-05-28)
 
-### New Feature
+### New Features
 
 -   Add support for running interactive commands. Examples: `wp-env run cli wp shell` and `wp-env run cli bash`.
 -   View php and WordPress log output with the new `wp-env logs` command.
@@ -285,7 +345,7 @@
 
 ## 1.1.0 (2020-04-01)
 
-### New Feature
+### New Features
 
 -   URLs for ZIP files are now supported as core, plugin, and theme sources.
 -   The `.wp-env.json` coniguration file now accepts a `config` object for setting `wp-config.php` values.
@@ -300,7 +360,7 @@
 -   `wp-env start` no longer accepts a WordPress branch or tag reference as its argument. Instead, create a `.wp-env.json` file and specify a `"core"` field.
 -   `wp-env start` will now download WordPress into a hidden directory located in `~/.wp-env`. You may delete your `{projectName}-wordpress` and `{projectName}-tests-wordpress` directories.
 
-### New Feature
+### New Features
 
 -   A `.wp-env.json` configuration file can now be used to specify the WordPress installation, plugins, and themes to use in the local development environment.
 
diff --git a/packages/env/README.md b/packages/env/README.md
index fb9e9751d9c666..35b00fe83e8f4d 100644
--- a/packages/env/README.md
+++ b/packages/env/README.md
@@ -480,7 +480,7 @@ You can customize the WordPress installation, plugins and themes that the develo
 `.wp-env.json` supports fields for options applicable to both the tests and development instances.
 
 | Field          | Type           | Default                                | Description                                                                                                                      |
-| -------------- | -------------- | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+|----------------|----------------|----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------|
 | `"core"`       | `string\|null` | `null`                                 | The WordPress installation to use. If `null` is specified, `wp-env` will use the latest production release of WordPress.         |
 | `"phpVersion"` | `string\|null` | `null`                                 | The PHP version to use. If `null` is specified, `wp-env` will use the default version used with production release of WordPress. |
 | `"plugins"`    | `string[]`     | `[]`                                   | A list of plugins to install and activate in the environment.                                                                    |
@@ -489,6 +489,7 @@ You can customize the WordPress installation, plugins and themes that the develo
 | `"testsPort"`  | `integer`      | `8889`                                 | The port number for the test site. You'll access the instance through the port: 'http://localhost:8889'.                         |
 | `"config"`     | `Object`       | See below.                             | Mapping of wp-config.php constants to their desired values.                                                                      |
 | `"mappings"`   | `Object`       | `"{}"`                                 | Mapping of WordPress directories to local directories to be mounted in the WordPress instance.                                   |
+| `"mysqlPort"`  | `integer`      | `null` (randomly assigned)             | The MySQL port number to expose. The setting is only available in the `env.development` and `env.tests` objects.                 |
 
 _Note: the port number environment variables (`WP_ENV_PORT` and `WP_ENV_TESTS_PORT`) take precedent over the .wp-env.json values._
 
@@ -498,7 +499,7 @@ Several types of strings can be passed into the `core`, `plugins`, `themes`, and
 | ----------------- | -------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
 | Relative path     | `.<path>\|~<path>`                           | `"./a/directory"`, `"../a/directory"`, `"~/a/directory"`                                                                           |
 | Absolute path     | `/<path>\|<letter>:\<path>`                  | `"/a/directory"`, `"C:\\a\\directory"`                                                                                             |
-| GitHub repository | `<owner>/<repo>[#<ref>]`                     | `"WordPress/WordPress"`, `"WordPress/gutenberg#trunk"`, if no branch is provided wp-env will fall back to the repos default branch |
+| GitHub repository | `<owner>/<repo>[/<path>][#<ref>]`                     | `"WordPress/WordPress"`, `"WordPress/gutenberg#trunk"`, `WordPress/themes/my-theme#my-branch`; if no branch is provided wp-env will fall back to the repo's default branch |
 | SSH repository    | `ssh://user@host/<owner>/<repo>.git[#<ref>]` | `"ssh://git@github.com/WordPress/WordPress.git"`                                                                                   |
 | ZIP File          | `http[s]://<host>/<path>.zip`                | `"https://wordpress.org/wordpress-5.4-beta2.zip"`                                                                                  |
 
@@ -521,7 +522,8 @@ Additionally, the key `env` is available to override any of the above options on
 			"config": {
 				"KEY_1": false
 			},
-			"port": 3000
+			"port": 3000,
+			"mysqlPort": 13306
 		}
 	}
 }
@@ -686,6 +688,8 @@ You can tell `wp-env` to use a custom port number so that your instance does not
 }
 ```
 
+These can also be set via the environment variables `WP_ENV_PORT`, `WP_ENV_TESTS_PORT`, `WP_ENV_MYSQL_PORT` and `WP_ENV_TESTS_MYSQL_PORT`.
+
 ### Specific PHP Version
 
 You can tell `wp-env` to use a specific PHP version for compatibility and testing. This can also be set via the environment variable `WP_ENV_PHP_VERSION`.
diff --git a/packages/env/lib/build-docker-compose-config.js b/packages/env/lib/build-docker-compose-config.js
index 5336f8690cca85..a394537e360872 100644
--- a/packages/env/lib/build-docker-compose-config.js
+++ b/packages/env/lib/build-docker-compose-config.js
@@ -166,14 +166,19 @@ module.exports = function buildDockerComposeConfig( config ) {
 
 	// Set the default ports based on the config values.
 	const developmentPorts = `\${WP_ENV_PORT:-${ config.env.development.port }}:80`;
+	const developmentMysqlPorts = `\${WP_ENV_MYSQL_PORT:-${
+		config.env.development.mysqlPort ?? ''
+	}}:3306`;
 	const testsPorts = `\${WP_ENV_TESTS_PORT:-${ config.env.tests.port }}:80`;
+	const testsMysqlPorts = `\${WP_ENV_TESTS_MYSQL_PORT:-${
+		config.env.tests.mysqlPort ?? ''
+	}}:3306`;
 
 	return {
-		version: '3.7',
 		services: {
 			mysql: {
-				image: 'mariadb',
-				ports: [ '3306' ],
+				image: 'mariadb:lts',
+				ports: [ developmentMysqlPorts ],
 				environment: {
 					MYSQL_ROOT_HOST: '%',
 					MYSQL_ROOT_PASSWORD:
@@ -183,8 +188,8 @@ module.exports = function buildDockerComposeConfig( config ) {
 				volumes: [ 'mysql:/var/lib/mysql' ],
 			},
 			'tests-mysql': {
-				image: 'mariadb',
-				ports: [ '3306' ],
+				image: 'mariadb:lts',
+				ports: [ testsMysqlPorts ],
 				environment: {
 					MYSQL_ROOT_HOST: '%',
 					MYSQL_ROOT_PASSWORD:
diff --git a/packages/env/lib/config/get-config-from-environment-vars.js b/packages/env/lib/config/get-config-from-environment-vars.js
index 8a4608b859b7f7..beaf721ea1c0c1 100644
--- a/packages/env/lib/config/get-config-from-environment-vars.js
+++ b/packages/env/lib/config/get-config-from-environment-vars.js
@@ -17,7 +17,9 @@ const { checkPort, checkVersion, checkString } = require( './validate-config' );
  *
  * @typedef WPEnvironmentVariableConfig
  * @property {?number}                  port             An override for the development environment's port.
+ * @property {?number}                  mysqlPort        An override for the development environment's MySQL port.
  * @property {?number}                  testsPort        An override for the testing environment's port.
+ * @property {?number}                  testsMysqlPort   An override for the testing environment's MySQL port.
  * @property {?WPSource}                coreSource       An override for all environment's coreSource.
  * @property {?string}                  phpVersion       An override for all environment's PHP version.
  * @property {?Object.<string, string>} lifecycleScripts An override for various lifecycle scripts.
@@ -33,7 +35,11 @@ const { checkPort, checkVersion, checkString } = require( './validate-config' );
 module.exports = function getConfigFromEnvironmentVars( cacheDirectoryPath ) {
 	const environmentConfig = {
 		port: getPortFromEnvironmentVariable( 'WP_ENV_PORT' ),
+		mysqlPort: getPortFromEnvironmentVariable( 'WP_ENV_MYSQL_PORT' ),
 		testsPort: getPortFromEnvironmentVariable( 'WP_ENV_TESTS_PORT' ),
+		testsMysqlPort: getPortFromEnvironmentVariable(
+			'WP_ENV_TESTS_MYSQL_PORT'
+		),
 		lifecycleScripts: getLifecycleScriptOverrides(),
 	};
 
diff --git a/packages/env/lib/config/parse-config.js b/packages/env/lib/config/parse-config.js
index 3f69bb78b81f26..1fc7e949251490 100644
--- a/packages/env/lib/config/parse-config.js
+++ b/packages/env/lib/config/parse-config.js
@@ -50,6 +50,7 @@ const mergeConfigs = require( './merge-configs' );
  * @property {WPSource[]}                pluginSources Plugins to load in the environment.
  * @property {WPSource[]}                themeSources  Themes to load in the environment.
  * @property {number}                    port          The port to use.
+ * @property {number}                    mysqlPort     The port to use for MySQL. Random if empty.
  * @property {Object}                    config        Mapping of wp-config.php constants to their desired values.
  * @property {Object.<string, WPSource>} mappings      Mapping of WordPress directories to local directories which should be mounted.
  * @property {string|null}               phpVersion    Version of PHP to use in the environments, of the format 0.0.
@@ -85,6 +86,7 @@ const DEFAULT_ENVIRONMENT_CONFIG = {
 	themes: [],
 	port: 8888,
 	testsPort: 8889,
+	mysqlPort: null,
 	mappings: {},
 	config: {
 		FS_METHOD: 'direct',
@@ -108,7 +110,7 @@ const DEFAULT_ENVIRONMENT_CONFIG = {
  * @param {string} configDirectoryPath A path to the directory we are parsing the config for.
  * @param {string} cacheDirectoryPath  Path to the work directory located in ~/.wp-env.
  *
- * @return {WPRootConfig} Parsed config.
+ * @return {Promise<WPRootConfig>} Parsed config.
  */
 async function parseConfig( configDirectoryPath, cacheDirectoryPath ) {
 	// The local config will be used to override any defaults.
@@ -276,11 +278,19 @@ function getEnvironmentVarOverrides( cacheDirectoryPath ) {
 		overrideConfig.env.development.port = overrides.port;
 	}
 
+	if ( overrides.mysqlPort ) {
+		overrideConfig.env.development.mysqlPort = overrides.mysqlPort;
+	}
+
 	if ( overrides.testsPort ) {
 		overrideConfig.testsPort = overrides.testsPort;
 		overrideConfig.env.tests.port = overrides.testsPort;
 	}
 
+	if ( overrides.testsMysqlPort ) {
+		overrideConfig.env.tests.mysqlPort = overrides.testsMysqlPort;
+	}
+
 	if ( overrides.coreSource ) {
 		overrideConfig.coreSource = overrides.coreSource;
 		overrideConfig.env.development.coreSource = overrides.coreSource;
@@ -407,6 +417,11 @@ async function parseEnvironmentConfig(
 			continue;
 		}
 
+		// The $schema key is a special key that is used to validate the configuration.
+		if ( key === '$schema' ) {
+			continue;
+		}
+
 		// We should also check root-only options for the root config
 		// because these aren't part of the above defaults but are
 		// configuration options that we will parse.
@@ -436,6 +451,10 @@ async function parseEnvironmentConfig(
 		parsedConfig.port = config.port;
 	}
 
+	if ( config.mysqlPort !== undefined ) {
+		parsedConfig.mysqlPort = config.mysqlPort;
+	}
+
 	if ( config.phpVersion !== undefined ) {
 		// Support null as a valid input.
 		if ( config.phpVersion !== null ) {
diff --git a/packages/env/lib/config/test/__snapshots__/config-integration.js.snap b/packages/env/lib/config/test/__snapshots__/config-integration.js.snap
index 53a2d652c740fd..6c3618f4724cb0 100644
--- a/packages/env/lib/config/test/__snapshots__/config-integration.js.snap
+++ b/packages/env/lib/config/test/__snapshots__/config-integration.js.snap
@@ -29,6 +29,7 @@ exports[`Config Integration should load local and override configuration files 1
         "url": "https://github.com/WordPress/WordPress.git",
       },
       "mappings": {},
+      "mysqlPort": 23306,
       "phpVersion": null,
       "pluginSources": [],
       "port": 999,
@@ -57,6 +58,7 @@ exports[`Config Integration should load local and override configuration files 1
         "url": "https://github.com/WordPress/WordPress.git",
       },
       "mappings": {},
+      "mysqlPort": 23307,
       "phpVersion": null,
       "pluginSources": [],
       "port": 456,
@@ -102,6 +104,7 @@ exports[`Config Integration should load local configuration file 1`] = `
         "url": "https://github.com/WordPress/WordPress.git",
       },
       "mappings": {},
+      "mysqlPort": 13306,
       "phpVersion": null,
       "pluginSources": [],
       "port": 123,
@@ -130,6 +133,7 @@ exports[`Config Integration should load local configuration file 1`] = `
         "url": "https://github.com/WordPress/WordPress.git",
       },
       "mappings": {},
+      "mysqlPort": 23307,
       "phpVersion": null,
       "pluginSources": [],
       "port": 8889,
@@ -175,6 +179,7 @@ exports[`Config Integration should use default configuration 1`] = `
         "url": "https://github.com/WordPress/WordPress.git",
       },
       "mappings": {},
+      "mysqlPort": null,
       "phpVersion": null,
       "pluginSources": [],
       "port": 8888,
@@ -203,6 +208,7 @@ exports[`Config Integration should use default configuration 1`] = `
         "url": "https://github.com/WordPress/WordPress.git",
       },
       "mappings": {},
+      "mysqlPort": null,
       "phpVersion": null,
       "pluginSources": [],
       "port": 8889,
@@ -248,6 +254,7 @@ exports[`Config Integration should use environment variables over local and over
         "url": "https://github.com/WordPress/WordPress.git",
       },
       "mappings": {},
+      "mysqlPort": 23306,
       "phpVersion": null,
       "pluginSources": [],
       "port": 12345,
@@ -277,6 +284,7 @@ exports[`Config Integration should use environment variables over local and over
         "url": "https://github.com/WordPress/WordPress.git",
       },
       "mappings": {},
+      "mysqlPort": 23307,
       "phpVersion": null,
       "pluginSources": [],
       "port": 61234,
diff --git a/packages/env/lib/config/test/config-integration.js b/packages/env/lib/config/test/config-integration.js
index a6728f91200f11..8ab2897da7ff4f 100644
--- a/packages/env/lib/config/test/config-integration.js
+++ b/packages/env/lib/config/test/config-integration.js
@@ -48,7 +48,9 @@ describe( 'Config Integration', () => {
 	afterEach( () => {
 		delete process.env.WP_ENV_HOME;
 		delete process.env.WP_ENV_PORT;
+		delete process.env.WP_ENV_MYSQL_PORT;
 		delete process.env.WP_ENV_TESTS_PORT;
+		delete process.env.WP_ENV_TESTS_MYSQL_PORT;
 		delete process.env.WP_ENV_LIFECYCLE_SCRIPT_AFTER_START;
 	} );
 
@@ -61,6 +63,8 @@ describe( 'Config Integration', () => {
 
 		expect( config.env.development.port ).toEqual( 8888 );
 		expect( config.env.tests.port ).toEqual( 8889 );
+		expect( config.env.development.mysqlPort ).toEqual( null );
+		expect( config.env.tests.mysqlPort ).toEqual( null );
 		expect( config ).toMatchSnapshot();
 	} );
 
@@ -75,6 +79,14 @@ describe( 'Config Integration', () => {
 						afterClean: null,
 						afterDestroy: null,
 					},
+					env: {
+						development: {
+							mysqlPort: 13306,
+						},
+						tests: {
+							mysqlPort: 23307,
+						},
+					},
 				} );
 			}
 
@@ -85,6 +97,8 @@ describe( 'Config Integration', () => {
 
 		expect( config.env.development.port ).toEqual( 123 );
 		expect( config.env.tests.port ).toEqual( 8889 );
+		expect( config.env.development.mysqlPort ).toEqual( 13306 );
+		expect( config.env.tests.mysqlPort ).toEqual( 23307 );
 		expect( config ).toMatchSnapshot();
 	} );
 
@@ -100,6 +114,11 @@ describe( 'Config Integration', () => {
 						afterClean: null,
 						afterDestroy: null,
 					},
+					env: {
+						tests: {
+							mysqlPort: 13306,
+						},
+					},
 				} );
 			}
 
@@ -111,6 +130,14 @@ describe( 'Config Integration', () => {
 						afterClean: null,
 						afterDestroy: 'test',
 					},
+					env: {
+						development: {
+							mysqlPort: 23306,
+						},
+						tests: {
+							mysqlPort: 23307,
+						},
+					},
 				} );
 			}
 
@@ -121,12 +148,16 @@ describe( 'Config Integration', () => {
 
 		expect( config.env.development.port ).toEqual( 999 );
 		expect( config.env.tests.port ).toEqual( 456 );
+		expect( config.env.development.mysqlPort ).toEqual( 23306 );
+		expect( config.env.tests.mysqlPort ).toEqual( 23307 );
 		expect( config ).toMatchSnapshot();
 	} );
 
 	it( 'should use environment variables over local and override configuration files', async () => {
 		process.env.WP_ENV_PORT = 12345;
+		process.env.WP_ENV_MYSQL_PORT = 23306;
 		process.env.WP_ENV_TESTS_PORT = 61234;
+		process.env.WP_ENV_TESTS_MYSQL_PORT = 23307;
 		process.env.WP_ENV_LIFECYCLE_SCRIPT_AFTER_START = 'test';
 
 		readFile.mockImplementation( async ( fileName ) => {
@@ -140,6 +171,11 @@ describe( 'Config Integration', () => {
 						afterClean: null,
 						afterDestroy: null,
 					},
+					env: {
+						tests: {
+							mysqlPort: 13306,
+						},
+					},
 				} );
 			}
 
@@ -156,6 +192,8 @@ describe( 'Config Integration', () => {
 
 		expect( config.env.development.port ).toEqual( 12345 );
 		expect( config.env.tests.port ).toEqual( 61234 );
+		expect( config.env.development.mysqlPort ).toEqual( 23306 );
+		expect( config.env.tests.mysqlPort ).toEqual( 23307 );
 		expect( config.lifecycleScripts ).toHaveProperty(
 			'afterStart',
 			'test'
diff --git a/packages/env/lib/config/test/parse-config.js b/packages/env/lib/config/test/parse-config.js
index ee808b973b16a4..38e4db9860cb3c 100644
--- a/packages/env/lib/config/test/parse-config.js
+++ b/packages/env/lib/config/test/parse-config.js
@@ -1,5 +1,4 @@
 'use strict';
-/* eslint-disable jest/no-conditional-expect */
 /**
  * Internal dependencies
  */
@@ -22,6 +21,7 @@ jest.mock( '../../wordpress', () => ( {
 const DEFAULT_CONFIG = {
 	port: 8888,
 	testsPort: 8889,
+	mysqlPort: null,
 	phpVersion: null,
 	coreSource: {
 		type: 'git',
@@ -254,6 +254,26 @@ describe( 'parseConfig', () => {
 		} );
 	} );
 
+	it( 'should ignore `$schema` key', async () => {
+		readRawConfigFile.mockImplementation( async ( configFile ) => {
+			if ( configFile === '/test/gutenberg/.wp-env.json' ) {
+				return {
+					$schema: 'test',
+				};
+			}
+
+			if ( configFile === '/test/gutenberg/.wp-env.override.json' ) {
+				return {};
+			}
+
+			throw new Error( 'Invalid File: ' + configFile );
+		} );
+
+		const parsed = await parseConfig( '/test/gutenberg', '/cache' );
+
+		expect( parsed ).toEqual( DEFAULT_CONFIG );
+	} );
+
 	it( 'should override with environment variables', async () => {
 		process.env.WP_ENV_PORT = 123;
 		process.env.WP_ENV_TESTS_PORT = 456;
@@ -319,16 +339,13 @@ describe( 'parseConfig', () => {
 	it( 'throws when latest WordPress version needed but not found', async () => {
 		getLatestWordPressVersion.mockResolvedValue( null );
 
-		expect.assertions( 1 );
-		try {
-			await parseConfig( '/test/gutenberg', '/cache' );
-		} catch ( error ) {
-			expect( error ).toEqual(
-				new ValidationError(
-					'Could not find the latest WordPress version. There may be a network issue.'
-				)
-			);
-		}
+		await expect(
+			parseConfig( '/test/gutenberg', '/cache' )
+		).rejects.toEqual(
+			new ValidationError(
+				'Could not find the latest WordPress version. There may be a network issue.'
+			)
+		);
 	} );
 
 	it( 'throws for unknown config options', async () => {
@@ -346,16 +363,13 @@ describe( 'parseConfig', () => {
 			throw new Error( 'Invalid File: ' + configFile );
 		} );
 
-		expect.assertions( 1 );
-		try {
-			await parseConfig( '/test/gutenberg', '/cache' );
-		} catch ( error ) {
-			expect( error ).toEqual(
-				new ValidationError(
-					`Invalid /test/gutenberg/.wp-env.json: "test" is not a configuration option.`
-				)
-			);
-		}
+		await expect(
+			parseConfig( '/test/gutenberg', '/cache' )
+		).rejects.toEqual(
+			new ValidationError(
+				`Invalid /test/gutenberg/.wp-env.json: "test" is not a configuration option.`
+			)
+		);
 	} );
 
 	it( 'throws for root-only config options', async () => {
@@ -378,16 +392,12 @@ describe( 'parseConfig', () => {
 			throw new Error( 'Invalid File: ' + configFile );
 		} );
 
-		expect.assertions( 1 );
-		try {
-			await parseConfig( '/test/gutenberg', '/cache' );
-		} catch ( error ) {
-			expect( error ).toEqual(
-				new ValidationError(
-					`Invalid /test/gutenberg/.wp-env.json: "development.env" is not a configuration option.`
-				)
-			);
-		}
+		await expect(
+			parseConfig( '/test/gutenberg', '/cache' )
+		).rejects.toEqual(
+			new ValidationError(
+				`Invalid /test/gutenberg/.wp-env.json: "development.env" is not a configuration option.`
+			)
+		);
 	} );
 } );
-/* eslint-enable jest/no-conditional-expect */
diff --git a/packages/env/lib/wordpress.js b/packages/env/lib/wordpress.js
index 423547fad688b5..bd3c4a23f8ff5d 100644
--- a/packages/env/lib/wordpress.js
+++ b/packages/env/lib/wordpress.js
@@ -27,6 +27,30 @@ const { getCache, setCache } = require( './cache' );
  * @typedef {'development'|'tests'|'all'} WPEnvironmentSelection
  */
 
+/**
+ * Utility function to check if a WordPress version is lower than another version.
+ *
+ * This is a non-comprehensive check only intended for this usage, to avoid pulling in a full semver library.
+ * It only considers the major and minor portions of the version and ignores the rest. Additionally, it assumes that
+ * the minor version is always a single digit (i.e. 0-9).
+ *
+ * Do not use this function for general version comparison, as it will not work for all cases.
+ *
+ * @param {string} version        The version to check.
+ * @param {string} compareVersion The compare version to check whether the version is lower than.
+ * @return {boolean} True if the version is lower than the compare version, false otherwise.
+ */
+function isWPMajorMinorVersionLower( version, compareVersion ) {
+	const versionNumber = Number.parseFloat(
+		version.match( /^[0-9]+(\.[0-9]+)?/ )[ 0 ]
+	);
+	const compareVersionNumber = Number.parseFloat(
+		compareVersion.match( /^[0-9]+(\.[0-9]+)?/ )[ 0 ]
+	);
+
+	return versionNumber < compareVersionNumber;
+}
+
 /**
  * Checks a WordPress database connection. An error is thrown if the test is
  * unsuccessful.
@@ -51,11 +75,28 @@ async function checkDatabaseConnection( { dockerComposeConfigPath, debug } ) {
  * @param {Object}        spinner     A CLI spinner which indicates progress.
  */
 async function configureWordPress( environment, config, spinner ) {
+	let wpVersion = '';
+	try {
+		wpVersion = await readWordPressVersion(
+			config.env[ environment ].coreSource,
+			spinner,
+			config.debug
+		);
+	} catch ( err ) {
+		// Ignore error.
+	}
+
 	const installCommand = `wp core install --url="${ config.env[ environment ].config.WP_SITEURL }" --title="${ config.name }" --admin_user=admin --admin_password=password --admin_email=wordpress@example.com --skip-email`;
 
 	// -eo pipefail exits the command as soon as anything fails in bash.
 	const setupCommands = [ 'set -eo pipefail', installCommand ];
 
+	// WordPress versions below 5.1 didn't use proper spacing in wp-config.
+	const configAnchor =
+		wpVersion && isWPMajorMinorVersionLower( wpVersion, '5.1' )
+			? `"define('WP_DEBUG',"`
+			: `"define( 'WP_DEBUG',"`;
+
 	// Set wp-config.php values.
 	for ( let [ key, value ] of Object.entries(
 		config.env[ environment ].config
@@ -68,7 +109,7 @@ async function configureWordPress( environment, config, spinner ) {
 		// Add quotes around string values to work with multi-word strings better.
 		value = typeof value === 'string' ? `"${ value }"` : value;
 		setupCommands.push(
-			`wp config set ${ key } ${ value } --anchor="define( 'WP_DEBUG',"${
+			`wp config set ${ key } ${ value } --anchor=${ configAnchor }${
 				typeof value !== 'string' ? ' --raw' : ''
 			}`
 		);
@@ -98,6 +139,15 @@ async function configureWordPress( environment, config, spinner ) {
 		}
 	);
 
+	// WordPress versions below 5.1 didn't use proper spacing in wp-config.
+	// Additionally, WordPress versions below 5.4 used `dirname( __FILE__ )` instead of `__DIR__`.
+	let abspathDef = `define( 'ABSPATH', __DIR__ . '\\/' );`;
+	if ( wpVersion && isWPMajorMinorVersionLower( wpVersion, '5.1' ) ) {
+		abspathDef = `define('ABSPATH', dirname(__FILE__) . '\\/');`;
+	} else if ( wpVersion && isWPMajorMinorVersionLower( wpVersion, '5.4' ) ) {
+		abspathDef = `define( 'ABSPATH', dirname( __FILE__ ) . '\\/' );`;
+	}
+
 	// WordPress' PHPUnit suite expects a `wp-tests-config.php` in
 	// the directory that the test suite is contained within.
 	// Make sure ABSPATH points to the WordPress install.
@@ -106,7 +156,7 @@ async function configureWordPress( environment, config, spinner ) {
 		[
 			'sh',
 			'-c',
-			`sed -e "/^require.*wp-settings.php/d" -e "s/define( 'ABSPATH', __DIR__ . '\\/' );/define( 'ABSPATH', '\\/var\\/www\\/html\\/' );\\n\\tdefine( 'WP_DEFAULT_THEME', 'default' );/" /var/www/html/wp-config.php > /wordpress-phpunit/wp-tests-config.php`,
+			`sed -e "/^require.*wp-settings.php/d" -e "s/${ abspathDef }/define( 'ABSPATH', '\\/var\\/www\\/html\\/' );\\n\\tdefine( 'WP_DEFAULT_THEME', 'default' );/" /var/www/html/wp-config.php > /wordpress-phpunit/wp-tests-config.php`,
 		],
 		{
 			config: config.dockerComposeConfigPath,
diff --git a/packages/env/package.json b/packages/env/package.json
index cb362b6c9f3d1a..f35dfa784fcc32 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "8.13.0",
+	"version": "10.10.0",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,6 +19,10 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
 	"directories": {
 		"lib": "lib",
 		"test": "tests"
diff --git a/packages/escape-html/.npmrc b/packages/escape-html/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/escape-html/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/escape-html/CHANGELOG.md b/packages/escape-html/CHANGELOG.md
index 8be716a9504a8f..80a4194ec28051 100644
--- a/packages/escape-html/CHANGELOG.md
+++ b/packages/escape-html/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 3.10.0 (2024-10-16)
+
+## 3.9.0 (2024-10-03)
+
+## 3.8.0 (2024-09-19)
+
+## 3.7.0 (2024-09-05)
+
+## 3.6.0 (2024-08-21)
+
+## 3.5.0 (2024-08-07)
+
+## 3.4.0 (2024-07-24)
+
+## 3.3.0 (2024-07-10)
+
+## 3.2.0 (2024-06-26)
+
+## 3.1.0 (2024-06-15)
+
+### Internal
+
+-   Refactor to TypeScript ([#62586](https://github.com/WordPress/gutenberg/pull/62586)).
+
+## 3.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 2.58.0 (2024-05-16)
+
+## 2.57.0 (2024-05-02)
+
+## 2.56.0 (2024-04-19)
+
+## 2.55.0 (2024-04-03)
+
+## 2.54.0 (2024-03-21)
+
+## 2.53.0 (2024-03-06)
+
+## 2.52.0 (2024-02-21)
+
+## 2.51.0 (2024-02-09)
+
+## 2.50.0 (2024-01-24)
+
+## 2.49.0 (2024-01-10)
+
+## 2.48.0 (2023-12-13)
+
 ## 2.47.0 (2023-11-29)
 
 ## 2.46.0 (2023-11-16)
@@ -107,7 +159,7 @@
 
 ## 1.8.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#20669](https://github.com/WordPress/gutenberg/pull/20669))
 
diff --git a/packages/escape-html/package.json b/packages/escape-html/package.json
index 7eacfe4f0e0a22..cadf7e9eaa174c 100644
--- a/packages/escape-html/package.json
+++ b/packages/escape-html/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/escape-html",
-	"version": "2.47.0",
+	"version": "3.10.0",
 	"description": "Escape HTML utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,9 +28,10 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/escape-html/src/escape-greater.js b/packages/escape-html/src/escape-greater.js
deleted file mode 100644
index f761a81e16ae61..00000000000000
--- a/packages/escape-html/src/escape-greater.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Returns a string with greater-than sign replaced.
- *
- * Note that if a resolution for Trac#45387 comes to fruition, it is no longer
- * necessary for `__unstableEscapeGreaterThan` to exist.
- *
- * See: https://core.trac.wordpress.org/ticket/45387
- *
- * @param {string} value Original string.
- *
- * @return {string} Escaped string.
- */
-export default function __unstableEscapeGreaterThan( value ) {
-	return value.replace( />/g, '&gt;' );
-}
diff --git a/packages/escape-html/src/escape-greater.ts b/packages/escape-html/src/escape-greater.ts
new file mode 100644
index 00000000000000..6e5956dc47e8f3
--- /dev/null
+++ b/packages/escape-html/src/escape-greater.ts
@@ -0,0 +1,15 @@
+/**
+ * Returns a string with greater-than sign replaced.
+ *
+ * Note that if a resolution for Trac#45387 comes to fruition, it is no longer
+ * necessary for `__unstableEscapeGreaterThan` to exist.
+ *
+ * See: https://core.trac.wordpress.org/ticket/45387
+ *
+ * @param value Original string.
+ *
+ * @return Escaped string.
+ */
+export default function __unstableEscapeGreaterThan( value: string ): string {
+	return value.replace( />/g, '&gt;' );
+}
diff --git a/packages/escape-html/src/index.js b/packages/escape-html/src/index.js
deleted file mode 100644
index 8ddce62c443257..00000000000000
--- a/packages/escape-html/src/index.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * Internal dependencies
- */
-import __unstableEscapeGreaterThan from './escape-greater';
-
-/**
- * Regular expression matching invalid attribute names.
- *
- * "Attribute names must consist of one or more characters other than controls,
- * U+0020 SPACE, U+0022 ("), U+0027 ('), U+003E (>), U+002F (/), U+003D (=),
- * and noncharacters."
- *
- * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
- *
- * @type {RegExp}
- */
-const REGEXP_INVALID_ATTRIBUTE_NAME = /[\u007F-\u009F "'>/="\uFDD0-\uFDEF]/;
-
-/**
- * Returns a string with ampersands escaped. Note that this is an imperfect
- * implementation, where only ampersands which do not appear as a pattern of
- * named, decimal, or hexadecimal character references are escaped. Invalid
- * named references (i.e. ambiguous ampersand) are still permitted.
- *
- * @see https://w3c.github.io/html/syntax.html#character-references
- * @see https://w3c.github.io/html/syntax.html#ambiguous-ampersand
- * @see https://w3c.github.io/html/syntax.html#named-character-references
- *
- * @param {string} value Original string.
- *
- * @return {string} Escaped string.
- */
-export function escapeAmpersand( value ) {
-	return value.replace( /&(?!([a-z0-9]+|#[0-9]+|#x[a-f0-9]+);)/gi, '&amp;' );
-}
-
-/**
- * Returns a string with quotation marks replaced.
- *
- * @param {string} value Original string.
- *
- * @return {string} Escaped string.
- */
-export function escapeQuotationMark( value ) {
-	return value.replace( /"/g, '&quot;' );
-}
-
-/**
- * Returns a string with less-than sign replaced.
- *
- * @param {string} value Original string.
- *
- * @return {string} Escaped string.
- */
-export function escapeLessThan( value ) {
-	return value.replace( /</g, '&lt;' );
-}
-
-/**
- * Returns an escaped attribute value.
- *
- * @see https://w3c.github.io/html/syntax.html#elements-attributes
- *
- * "[...] the text cannot contain an ambiguous ampersand [...] must not contain
- * any literal U+0022 QUOTATION MARK characters (")"
- *
- * Note we also escape the greater than symbol, as this is used by wptexturize to
- * split HTML strings. This is a WordPress specific fix
- *
- * Note that if a resolution for Trac#45387 comes to fruition, it is no longer
- * necessary for `__unstableEscapeGreaterThan` to be used.
- *
- * See: https://core.trac.wordpress.org/ticket/45387
- *
- * @param {string} value Attribute value.
- *
- * @return {string} Escaped attribute value.
- */
-export function escapeAttribute( value ) {
-	return __unstableEscapeGreaterThan(
-		escapeQuotationMark( escapeAmpersand( value ) )
-	);
-}
-
-/**
- * Returns an escaped HTML element value.
- *
- * @see https://w3c.github.io/html/syntax.html#writing-html-documents-elements
- *
- * "the text must not contain the character U+003C LESS-THAN SIGN (<) or an
- * ambiguous ampersand."
- *
- * @param {string} value Element value.
- *
- * @return {string} Escaped HTML element value.
- */
-export function escapeHTML( value ) {
-	return escapeLessThan( escapeAmpersand( value ) );
-}
-
-/**
- * Returns an escaped Editable HTML element value. This is different from
- * `escapeHTML`, because for editable HTML, ALL ampersands must be escaped in
- * order to render the content correctly on the page.
- *
- * @param {string} value Element value.
- *
- * @return {string} Escaped HTML element value.
- */
-export function escapeEditableHTML( value ) {
-	return escapeLessThan( value.replace( /&/g, '&amp;' ) );
-}
-
-/**
- * Returns true if the given attribute name is valid, or false otherwise.
- *
- * @param {string} name Attribute name to test.
- *
- * @return {boolean} Whether attribute is valid.
- */
-export function isValidAttributeName( name ) {
-	return ! REGEXP_INVALID_ATTRIBUTE_NAME.test( name );
-}
diff --git a/packages/escape-html/src/index.ts b/packages/escape-html/src/index.ts
new file mode 100644
index 00000000000000..71206695bb7d3b
--- /dev/null
+++ b/packages/escape-html/src/index.ts
@@ -0,0 +1,122 @@
+/**
+ * Internal dependencies
+ */
+import __unstableEscapeGreaterThan from './escape-greater';
+
+/**
+ * Regular expression matching invalid attribute names.
+ *
+ * "Attribute names must consist of one or more characters other than controls,
+ * U+0020 SPACE, U+0022 ("), U+0027 ('), U+003E (>), U+002F (/), U+003D (=),
+ * and noncharacters."
+ *
+ * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+ */
+const REGEXP_INVALID_ATTRIBUTE_NAME: RegExp =
+	/[\u007F-\u009F "'>/="\uFDD0-\uFDEF]/;
+
+/**
+ * Returns a string with ampersands escaped. Note that this is an imperfect
+ * implementation, where only ampersands which do not appear as a pattern of
+ * named, decimal, or hexadecimal character references are escaped. Invalid
+ * named references (i.e. ambiguous ampersand) are still permitted.
+ *
+ * @see https://w3c.github.io/html/syntax.html#character-references
+ * @see https://w3c.github.io/html/syntax.html#ambiguous-ampersand
+ * @see https://w3c.github.io/html/syntax.html#named-character-references
+ *
+ * @param value Original string.
+ *
+ * @return Escaped string.
+ */
+export function escapeAmpersand( value: string ): string {
+	return value.replace( /&(?!([a-z0-9]+|#[0-9]+|#x[a-f0-9]+);)/gi, '&amp;' );
+}
+
+/**
+ * Returns a string with quotation marks replaced.
+ *
+ * @param value Original string.
+ *
+ * @return Escaped string.
+ */
+export function escapeQuotationMark( value: string ): string {
+	return value.replace( /"/g, '&quot;' );
+}
+
+/**
+ * Returns a string with less-than sign replaced.
+ *
+ * @param value Original string.
+ *
+ * @return Escaped string.
+ */
+export function escapeLessThan( value: string ): string {
+	return value.replace( /</g, '&lt;' );
+}
+
+/**
+ * Returns an escaped attribute value.
+ *
+ * @see https://w3c.github.io/html/syntax.html#elements-attributes
+ *
+ * "[...] the text cannot contain an ambiguous ampersand [...] must not contain
+ * any literal U+0022 QUOTATION MARK characters (")"
+ *
+ * Note we also escape the greater than symbol, as this is used by wptexturize to
+ * split HTML strings. This is a WordPress specific fix
+ *
+ * Note that if a resolution for Trac#45387 comes to fruition, it is no longer
+ * necessary for `__unstableEscapeGreaterThan` to be used.
+ *
+ * See: https://core.trac.wordpress.org/ticket/45387
+ *
+ * @param value Attribute value.
+ *
+ * @return Escaped attribute value.
+ */
+export function escapeAttribute( value: string ): string {
+	return __unstableEscapeGreaterThan(
+		escapeQuotationMark( escapeAmpersand( value ) )
+	);
+}
+
+/**
+ * Returns an escaped HTML element value.
+ *
+ * @see https://w3c.github.io/html/syntax.html#writing-html-documents-elements
+ *
+ * "the text must not contain the character U+003C LESS-THAN SIGN (<) or an
+ * ambiguous ampersand."
+ *
+ * @param value Element value.
+ *
+ * @return Escaped HTML element value.
+ */
+export function escapeHTML( value: string ): string {
+	return escapeLessThan( escapeAmpersand( value ) );
+}
+
+/**
+ * Returns an escaped Editable HTML element value. This is different from
+ * `escapeHTML`, because for editable HTML, ALL ampersands must be escaped in
+ * order to render the content correctly on the page.
+ *
+ * @param value Element value.
+ *
+ * @return Escaped HTML element value.
+ */
+export function escapeEditableHTML( value: string ): string {
+	return escapeLessThan( value.replace( /&/g, '&amp;' ) );
+}
+
+/**
+ * Returns true if the given attribute name is valid, or false otherwise.
+ *
+ * @param name Attribute name to test.
+ *
+ * @return Whether attribute is valid.
+ */
+export function isValidAttributeName( name: string ): boolean {
+	return ! REGEXP_INVALID_ATTRIBUTE_NAME.test( name );
+}
diff --git a/packages/escape-html/src/test/index.js b/packages/escape-html/src/test/index.js
deleted file mode 100644
index 8ba0fb41d2ea9f..00000000000000
--- a/packages/escape-html/src/test/index.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Internal dependencies
- */
-import {
-	escapeAmpersand,
-	escapeQuotationMark,
-	escapeLessThan,
-	escapeAttribute,
-	escapeHTML,
-	isValidAttributeName,
-	escapeEditableHTML,
-} from '../';
-import __unstableEscapeGreaterThan from '../escape-greater';
-
-function testUnstableEscapeGreaterThan( implementation ) {
-	it( 'should escape greater than', () => {
-		const result = implementation( 'Chicken > Ribs' );
-		expect( result ).toBe( 'Chicken &gt; Ribs' );
-	} );
-}
-
-function testEscapeAmpersand( implementation ) {
-	it( 'should escape ampersand', () => {
-		const result = implementation(
-			'foo & bar &amp; &AMP; baz &#931; &#bad; &#x3A3; &#X3a3; &#xevil;'
-		);
-
-		expect( result ).toBe(
-			'foo &amp; bar &amp; &AMP; baz &#931; &amp;#bad; &#x3A3; &#X3a3; &amp;#xevil;'
-		);
-	} );
-}
-
-function testEscapeQuotationMark( implementation ) {
-	it( 'should escape quotation mark', () => {
-		const result = implementation( '"Be gone!"' );
-
-		expect( result ).toBe( '&quot;Be gone!&quot;' );
-	} );
-}
-
-function testEscapeLessThan( implementation ) {
-	it( 'should escape less than', () => {
-		const result = implementation( 'Chicken < Ribs' );
-
-		expect( result ).toBe( 'Chicken &lt; Ribs' );
-	} );
-}
-
-describe( 'escapeAmpersand', () => {
-	testEscapeAmpersand( escapeAmpersand );
-} );
-
-describe( 'escapeQuotationMark', () => {
-	testEscapeQuotationMark( escapeQuotationMark );
-} );
-
-describe( 'escapeLessThan', () => {
-	testEscapeLessThan( escapeLessThan );
-} );
-
-describe( 'escapeGreaterThan', () => {
-	testUnstableEscapeGreaterThan( __unstableEscapeGreaterThan );
-} );
-
-describe( 'escapeAttribute', () => {
-	testEscapeAmpersand( escapeAttribute );
-	testEscapeQuotationMark( escapeAttribute );
-	testUnstableEscapeGreaterThan( escapeAttribute );
-} );
-
-describe( 'escapeHTML', () => {
-	testEscapeAmpersand( escapeHTML );
-	testEscapeLessThan( escapeHTML );
-} );
-
-describe( 'isValidAttributeName', () => {
-	it( 'should return false for attribute with controls', () => {
-		const result = isValidAttributeName( 'bad\u007F' );
-
-		expect( result ).toBe( false );
-	} );
-
-	it( 'should return false for attribute with non-permitted characters', () => {
-		const result = isValidAttributeName( 'bad"' );
-
-		expect( result ).toBe( false );
-	} );
-
-	it( 'should return false for attribute with noncharacters', () => {
-		const result = isValidAttributeName( 'bad\uFDD0' );
-
-		expect( result ).toBe( false );
-	} );
-
-	it( 'should return true for valid attribute name', () => {
-		const result = isValidAttributeName( 'good' );
-
-		expect( result ).toBe( true );
-	} );
-} );
-
-describe( 'escapeEditableHTML', () => {
-	it( 'should escape < and all ampersands', () => {
-		const result = escapeEditableHTML(
-			'<a href="https://w.org">WP</a> & &lt;strong&gt;'
-		);
-
-		expect( result ).toBe(
-			'&lt;a href="https://w.org">WP&lt;/a> &amp; &amp;lt;strong&amp;gt;'
-		);
-	} );
-} );
diff --git a/packages/escape-html/src/test/index.ts b/packages/escape-html/src/test/index.ts
new file mode 100644
index 00000000000000..6862fa3a1d18f2
--- /dev/null
+++ b/packages/escape-html/src/test/index.ts
@@ -0,0 +1,115 @@
+/**
+ * Internal dependencies
+ */
+import {
+	escapeAmpersand,
+	escapeQuotationMark,
+	escapeLessThan,
+	escapeAttribute,
+	escapeHTML,
+	isValidAttributeName,
+	escapeEditableHTML,
+} from '..';
+import __unstableEscapeGreaterThan from '../escape-greater';
+
+type Implementation = ( str: string ) => string;
+
+function testUnstableEscapeGreaterThan( implementation: Implementation ) {
+	it( 'should escape greater than', () => {
+		const result = implementation( 'Chicken > Ribs' );
+		expect( result ).toBe( 'Chicken &gt; Ribs' );
+	} );
+}
+
+function testEscapeAmpersand( implementation: Implementation ) {
+	it( 'should escape ampersand', () => {
+		const result = implementation(
+			'foo & bar &amp; &AMP; baz &#931; &#bad; &#x3A3; &#X3a3; &#xevil;'
+		);
+
+		expect( result ).toBe(
+			'foo &amp; bar &amp; &AMP; baz &#931; &amp;#bad; &#x3A3; &#X3a3; &amp;#xevil;'
+		);
+	} );
+}
+
+function testEscapeQuotationMark( implementation: Implementation ) {
+	it( 'should escape quotation mark', () => {
+		const result = implementation( '"Be gone!"' );
+
+		expect( result ).toBe( '&quot;Be gone!&quot;' );
+	} );
+}
+
+function testEscapeLessThan( implementation: Implementation ) {
+	it( 'should escape less than', () => {
+		const result = implementation( 'Chicken < Ribs' );
+
+		expect( result ).toBe( 'Chicken &lt; Ribs' );
+	} );
+}
+
+describe( 'escapeAmpersand', () => {
+	testEscapeAmpersand( escapeAmpersand );
+} );
+
+describe( 'escapeQuotationMark', () => {
+	testEscapeQuotationMark( escapeQuotationMark );
+} );
+
+describe( 'escapeLessThan', () => {
+	testEscapeLessThan( escapeLessThan );
+} );
+
+describe( 'escapeGreaterThan', () => {
+	testUnstableEscapeGreaterThan( __unstableEscapeGreaterThan );
+} );
+
+describe( 'escapeAttribute', () => {
+	testEscapeAmpersand( escapeAttribute );
+	testEscapeQuotationMark( escapeAttribute );
+	testUnstableEscapeGreaterThan( escapeAttribute );
+} );
+
+describe( 'escapeHTML', () => {
+	testEscapeAmpersand( escapeHTML );
+	testEscapeLessThan( escapeHTML );
+} );
+
+describe( 'isValidAttributeName', () => {
+	it( 'should return false for attribute with controls', () => {
+		const result = isValidAttributeName( 'bad\u007F' );
+
+		expect( result ).toBe( false );
+	} );
+
+	it( 'should return false for attribute with non-permitted characters', () => {
+		const result = isValidAttributeName( 'bad"' );
+
+		expect( result ).toBe( false );
+	} );
+
+	it( 'should return false for attribute with noncharacters', () => {
+		const result = isValidAttributeName( 'bad\uFDD0' );
+
+		expect( result ).toBe( false );
+	} );
+
+	it( 'should return true for valid attribute name', () => {
+		const result = isValidAttributeName( 'good' );
+
+		expect( result ).toBe( true );
+	} );
+} );
+
+describe( 'escapeEditableHTML', () => {
+	it( 'should escape < and all ampersands', () => {
+		const result = escapeEditableHTML(
+			'<a href="https://w.org">WP</a> & &lt;strong&gt;'
+		);
+
+		expect( result ).toBe(
+			'&lt;a href="https://w.org">WP&lt;/a> &amp; &amp;lt;strong&amp;gt;'
+		);
+	} );
+} );
diff --git a/packages/escape-html/tsconfig.json b/packages/escape-html/tsconfig.json
index 3c2c31f506f132..6e33d8ff82d47e 100644
--- a/packages/escape-html/tsconfig.json
+++ b/packages/escape-html/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/eslint-plugin/.npmrc b/packages/eslint-plugin/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/eslint-plugin/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
index 111dcbde574e63..705312f977e661 100644
--- a/packages/eslint-plugin/CHANGELOG.md
+++ b/packages/eslint-plugin/CHANGELOG.md
@@ -2,6 +2,74 @@
 
 ## Unreleased
 
+## 21.3.0 (2024-10-16)
+
+## 21.2.0 (2024-10-03)
+
+## 21.1.0 (2024-09-19)
+
+## 21.0.0 (2024-09-05)
+
+### Breaking Changes
+
+- Add [`@wordpress/i18n-no-flanking-whitespace`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/eslint-plugin/docs/rules/i18n-no-flanking-whitespace.md) to the recommended i18n ruleset ([#64710](https://github.com/WordPress/gutenberg/pull/64710).
+- Add [`@wordpress/i18n-hyphenated-range`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/eslint-plugin/docs/rules/i18n-hyphenated-range.md) to the recommended i18n ruleset ([#64710](https://github.com/WordPress/gutenberg/pull/64710).
+
+## 20.3.0 (2024-08-21)
+
+## 20.2.0 (2024-08-07)
+
+## 20.1.0 (2024-07-24)
+
+## 20.0.0 (2024-07-10)
+
+### Breaking Changes
+- Add [`@typescript-eslint/no-unused-vars` rule](https://typescript-eslint.io/rules/no-unused-vars) to the recommended TypeScript ruleset ([#62925](https://github.com/WordPress/gutenberg/pull/62925)).
+- Add [`@typescript-eslint/method-signature-style` rule](https://typescript-eslint.io/rules/method-signature-style) to the recommended TypeScript ruleset ([#62718](https://github.com/WordPress/gutenberg/pull/62718)).
+
+## 19.2.0 (2024-06-26)
+
+## 19.1.0 (2024-06-15)
+
+## 19.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   `@wordpress/is-gutenberg-plugin` rule has been replaced by `@wordpress/wp-global-usage` ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   `@wordpress/wp-process-env` rule has been added and included in the recommended configurations ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   `@wordpress/gutenberg-phase` rule has been removed (deprecated in v10.0.0) ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 18.1.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 18.0.0 (2024-05-02)
+
+### Breaking Changes
+
+-   Enable `curly` eslint rule when using prettier ([#61204](https://github.com/WordPress/gutenberg/pull/61204)).
+
+## 17.13.0 (2024-04-19)
+
+## 17.12.0 (2024-04-03)
+
+## 17.11.0 (2024-03-21)
+
+## 17.10.0 (2024-03-06)
+
+## 17.9.0 (2024-02-21)
+
+## 17.8.0 (2024-02-09)
+
+## 17.7.0 (2024-01-24)
+
+## 17.6.0 (2024-01-10)
+
+## 17.5.0 (2023-12-13)
+
 ## 17.4.0 (2023-11-29)
 
 ## 17.3.0 (2023-11-16)
@@ -40,7 +108,7 @@
     -   Drops `jsdoc/tag-lines` rule's `noEndLines: true` in favor of `applyToEndTag: false`.
     -   Disables the newly introduced `jsdoc/no-defaults` rule.
 
-### Enhancement
+### Enhancements
 
 -   Support Typescript 5 and 5.1 by updating both `@typescript-eslint/parser` and `@typescript-eslint/eslint-plugin` to version `^5.62.0`. ([#52621](https://github.com/WordPress/gutenberg/pull/52621)).
 
@@ -58,7 +126,7 @@
 
 ## 14.6.0 (2023-05-10)
 
-### Enhancement
+### Enhancements
 
 -   Validate dependencies in `useSelect` and `useSuspenseSelect` hooks. ([#49900](https://github.com/WordPress/gutenberg/pull/49900)).
 
@@ -82,7 +150,7 @@
 
 -   The bundled `eslint-plugin-jsdoc` dependency has been updated from requiring `^37.0.3` to requiring `^39.6.9`
 
-### Enhancement
+### Enhancements
 
 -   Bump `eslint-plugin-jest` version to 27.2.1.
 
@@ -104,14 +172,14 @@
 
 ## 13.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 and minimum npm version to 6.14.4 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 -   Remove all rules targeting test files from the `recommended` and `recommended-with-formatting` presets when Jest package is installed ([#43272](https://github.com/WordPress/gutenberg/pull/43272)).
 
 ## 12.8.0 (2022-07-27)
 
-### Code Quality
+### Internal
 
 -   Remove deprecated rules `no-negated-in-lhs` replaced with `no-unsafe-negation`, and `jsx-a11y/label-has-for` replaced with `jsx-a11/label-has-associated-control` ([#42654](https://github.com/WordPress/gutenberg/pull/42654)).
 
@@ -121,7 +189,7 @@
 
 ## 12.2.0 (2022-05-04)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix the `recommended` preset when Prettier is not installed ([#40634](https://github.com/WordPress/gutenberg/pull/40634)).
 
@@ -137,7 +205,7 @@
 
 -   The integration with [Prettier](https://prettier.io) is now optional and gets activated when the `prettier` package is installed in the project ([#39244](https://github.com/WordPress/gutenberg/pull/39244)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Replaced no-shadow eslint rule with @typescript-eslint/no-shadow ([#38665](https://github.com/WordPress/gutenberg/pull/38665)).
 
@@ -158,11 +226,11 @@
 -   The bundled `globals` dependency has been updated from requiring `^12.0.0` to requiring `^13.12.0` ([#36283](https://github.com/WordPress/gutenberg/pull/36283)).
 -   The `gutenberg-phase` rule has been deprecated and replaced by the `is-gutenberg-plugin` rule. ([#38202](https://github.com/WordPress/gutenberg/pull/38202))
 
-### Enhancement
+### Enhancements
 
 -   Omit verification for WordPress dependencies in the import statements since they get externalized when used with WordPress ([#37639](https://github.com/WordPress/gutenberg/pull/37639)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix Babel config resolution when a custom ESLint config present ([#37406](https://github.com/WordPress/gutenberg/pull/37406)). Warning: it won't recognize the `babel.config.json` file present in the project until the upstream bug in `cosmiconfig` is fixed.
 
@@ -175,35 +243,35 @@
 
 ## 9.2.0 (2021-10-12)
 
-### Enhancement
+### Enhancements
 
 -   The bundled `eslint-plugin-jsdoc` dependency has been updated from requiring `^34.1.0` to requiring `^36.0.8` ([#34338](https://github.com/WordPress/gutenberg/pull/34338)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Use Jest related rules only when the `jest` package is installed ([#33120](https://github.com/WordPress/gutenberg/pull/33120)).
 
 ## 9.1.2 (2021-09-09)
 
-### Bug Fix
+### Bug Fixes
 
 -   The recommended configuration will now respect `type` imports in TypeScript files ([#34055](https://github.com/WordPress/gutenberg/pull/34055)).
 
 ## 9.1.1 (2021-08-23)
 
-### Bug Fix
+### Bug Fixes
 
 -   Include `.jsx` extension when linting import statements in case TypeScript not present ([#33746](https://github.com/WordPress/gutenberg/pull/33746)).
 
 ## 9.1.0 (2021-07-21)
 
-### Enhancement
+### Enhancements
 
 -   Adds JSDoc alignment check ([#25300](https://github.com/WordPress/gutenberg/pull/25300)).
 
 ## 9.0.1 (2021-03-19)
 
-### Bug Fix
+### Bug Fixes
 
 -   Adds TypeScript as a peer dependency and makes it optional when not installed ([#29942](https://github.com/WordPress/gutenberg/pull/29942)).
 
@@ -220,7 +288,7 @@
 
 ## 8.0.1 (2021-01-28)
 
-### Bug Fix
+### Bug Fixes
 
 -   Add missing `eslint-plugin-import` npm dependency ([#28545](https://github.com/WordPress/gutenberg/pull/28545)).
 
@@ -249,7 +317,7 @@
 
 ## 7.4.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Add `no-unsafe-wp-apis` rule to discourage usage of unsafe APIs ([#27301](https://github.com/WordPress/gutenberg/pull/27301)).
 
@@ -307,7 +375,7 @@
 
 -   The severity of the rule, `jsdoc/no-undefined-types`, has been increased from `warn` to `error`. In addition, `JSX` has been added to the default list of defined types.
 
-### Improvements
+### Enhancements
 
 -   `'AsyncIterableIterator'` is now allowed as a valid TypeScript utility type.
 
@@ -365,7 +433,7 @@
 
 ## 3.4.1 (2020-02-04)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed `plugin:prettier/recommended` from `recommended` ruleset as it introduces breaking changes.
 
@@ -407,14 +475,14 @@
 
 -   [`@wordpress/no-unused-vars-before-return`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/eslint-plugin/docs/rules/no-unused-vars-before-return.md) now supports an `excludePattern` option to exempt function calls by name.
 
-### Improvements
+### Enhancements
 
 -   The recommended `react` configuration specifies an option to [`@wordpress/no-unused-vars-before-return`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/eslint-plugin/docs/rules/no-unused-vars-before-return.md) to exempt React hooks usage, by convention of hooks beginning with "use" prefix.
 -   The plugin now uses [`eslint-plugin-jsdoc`](https://github.com/gajus/eslint-plugin-jsdoc), rather than the `valid-jsdoc` rule, for more reliable linting of JSDoc blocks.
 
 ## 2.3.0 (2019-06-12)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fixed custom regular expression for the `no-restricted-syntax` rule enforcing translate function arguments. [#15839](https://github.com/WordPress/gutenberg/pull/15839).
 -   Fixed arguments checking of `_nx` for the `no-restricted-syntax` rule enforcing translate function arguments. [#15839](https://github.com/WordPress/gutenberg/pull/15839).
diff --git a/packages/eslint-plugin/README.md b/packages/eslint-plugin/README.md
index 1619778add661a..cde410fc9c9926 100644
--- a/packages/eslint-plugin/README.md
+++ b/packages/eslint-plugin/README.md
@@ -10,7 +10,7 @@ Install the module
 npm install @wordpress/eslint-plugin --save-dev
 ```
 
-**Note**: This package requires `node` 14.0.0 or later, and `npm` 6.14.4 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Usage
 
@@ -69,25 +69,26 @@ The granular rulesets will not define any environment globals. As such, if they
 
 ### Rules
 
-| Rule                                                                                                                                                                 | Description                                                                                    | Recommended |
-| -------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- | ----------- |
-| [data-no-store-string-literals](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/data-no-store-string-literals.md)                 | Discourage passing string literals to reference data stores                                    |             |
-| [dependency-group](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/dependency-group.md)                                           | Enforce dependencies docblocks formatting                                                      | ✓           |
-| [is-gutenberg-plugin](docs/rules/is-gutenberg-plugin.md)                                                                                                             | Governs the use of the `process.env.IS_GUTENBERG_PLUGIN` constant                              | ✓           |
-| [no-base-control-with-label-without-id](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/no-base-control-with-label-without-id.md) | Disallow the usage of BaseControl component with a label prop set but omitting the id property | ✓           |
-| [no-unguarded-get-range-at](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/no-unguarded-get-range-at.md)                         | Disallow the usage of unguarded `getRangeAt` calls                                             | ✓           |
-| [no-unsafe-wp-apis](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/no-unsafe-wp-apis.md)                                         | Disallow the usage of unsafe APIs from `@wordpress/*` packages                                 | ✓           |
-| [no-unused-vars-before-return](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/no-unused-vars-before-return.md)                   | Disallow assigning variable values if unused before a return                                   | ✓           |
-| [react-no-unsafe-timeout](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/react-no-unsafe-timeout.md)                             | Disallow unsafe `setTimeout` in component                                                      |             |
-| [valid-sprintf](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/valid-sprintf.md)                                                 | Enforce valid sprintf usage                                                                    | ✓           |
-| [i18n-ellipsis](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-ellipsis.md)                                                 | Disallow using three dots in translatable strings                                              | ✓           |
-| [i18n-no-collapsible-whitespace](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-no-collapsible-whitespace.md)               | Disallow collapsible whitespace in translatable strings                                        | ✓           |
-| [i18n-no-placeholders-only](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-no-placeholders-only.md)                         | Prevent using only placeholders in translatable strings                                        | ✓           |
-| [i18n-no-variables](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-no-variables.md)                                         | Enforce string literals as translation function arguments                                      | ✓           |
-| [i18n-text-domain](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-text-domain.md)                                           | Enforce passing valid text domains                                                             | ✓           |
-| [i18n-translator-comments](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-translator-comments.md)                           | Enforce adding translator comments                                                             | ✓           |
-| [i18n-no-flanking-whitespace](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-no-flanking-whitespace.md)                     | Disallow leading or trailing whitespace in translatable strings                                |             |
-| [i18n-hyphenated-range](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-hyphenated-range.md)                                 | Disallow hyphenated numerical ranges in translatable strings                                   |             |
+| Rule                                                                                                                                                                 | Description                                                                                     | Recommended |
+| -------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ----------- |
+| [data-no-store-string-literals](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/data-no-store-string-literals.md)                 | Discourage passing string literals to reference data stores.                                    |             |
+| [dependency-group](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/dependency-group.md)                                           | Enforce dependencies docblocks formatting.                                                      | ✓           |
+| [i18n-ellipsis](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-ellipsis.md)                                                 | Disallow using three dots in translatable strings.                                              | ✓           |
+| [i18n-hyphenated-range](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-hyphenated-range.md)                                 | Disallow hyphenated numerical ranges in translatable strings.                                   |             |
+| [i18n-no-collapsible-whitespace](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-no-collapsible-whitespace.md)               | Disallow collapsible whitespace in translatable strings.                                        | ✓           |
+| [i18n-no-flanking-whitespace](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-no-flanking-whitespace.md)                     | Disallow leading or trailing whitespace in translatable strings.                                |             |
+| [i18n-no-placeholders-only](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-no-placeholders-only.md)                         | Prevent using only placeholders in translatable strings.                                        | ✓           |
+| [i18n-no-variables](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-no-variables.md)                                         | Enforce string literals as translation function arguments.                                      | ✓           |
+| [i18n-text-domain](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-text-domain.md)                                           | Enforce passing valid text domains.                                                             | ✓           |
+| [i18n-translator-comments](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/i18n-translator-comments.md)                           | Enforce adding translator comments.                                                             | ✓           |
+| [no-base-control-with-label-without-id](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/no-base-control-with-label-without-id.md) | Disallow the usage of BaseControl component with a label prop set but omitting the id property. | ✓           |
+| [no-unguarded-get-range-at](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/no-unguarded-get-range-at.md)                         | Disallow the usage of unguarded `getRangeAt` calls.                                             | ✓           |
+| [no-unsafe-wp-apis](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/no-unsafe-wp-apis.md)                                         | Disallow the usage of unsafe APIs from `@wordpress/*` packagesl                                 | ✓           |
+| [no-unused-vars-before-return](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/no-unused-vars-before-return.md)                   | Disallow assigning variable values if unused before a return.                                   | ✓           |
+| [no-wp-process-env](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/no-wp-process-env.md)                                         | Disallow legacy usage of WordPress variables via `process.env` like `process.env.SCRIPT_DEBUG`. | ✓           |
+| [react-no-unsafe-timeout](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/react-no-unsafe-timeout.md)                             | Disallow unsafe `setTimeout` in component.                                                      |             |
+| [valid-sprintf](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/valid-sprintf.md)                                                 | Enforce valid sprintf usage.                                                                    | ✓           |
+| [wp-global-usage](https://github.com/WordPress/gutenberg/tree/HEAD/packages/eslint-plugin/docs/rules/wp-global-usage.md)                                             | Enforce correct usage of WordPress globals like `globalThis.SCRIPT_DEBUG`.                      |             |
 
 ### Legacy
 
diff --git a/packages/eslint-plugin/configs/custom.js b/packages/eslint-plugin/configs/custom.js
index dcee5de349bad7..e6c67c0c6e4350 100644
--- a/packages/eslint-plugin/configs/custom.js
+++ b/packages/eslint-plugin/configs/custom.js
@@ -7,6 +7,7 @@ module.exports = {
 		'@wordpress/no-global-active-element': 'error',
 		'@wordpress/no-global-get-selection': 'error',
 		'@wordpress/no-unsafe-wp-apis': 'error',
+		'@wordpress/no-wp-process-env': 'error',
 	},
 	overrides: [
 		{
diff --git a/packages/eslint-plugin/configs/es5.js b/packages/eslint-plugin/configs/es5.js
index 076cccf6f21009..4b6abaac47a79e 100644
--- a/packages/eslint-plugin/configs/es5.js
+++ b/packages/eslint-plugin/configs/es5.js
@@ -72,7 +72,13 @@ module.exports = {
 				asyncArrow: 'always',
 			},
 		],
-		'space-in-parens': [ 'error', 'always' ],
+		'space-in-parens': [
+			'error',
+			'always',
+			{
+				exceptions: [ 'empty' ],
+			},
+		],
 		'space-infix-ops': 'error',
 		'space-unary-ops': [
 			'error',
diff --git a/packages/eslint-plugin/configs/i18n.js b/packages/eslint-plugin/configs/i18n.js
index c3271214e3ef5c..fb8cad233232d4 100644
--- a/packages/eslint-plugin/configs/i18n.js
+++ b/packages/eslint-plugin/configs/i18n.js
@@ -8,5 +8,7 @@ module.exports = {
 		'@wordpress/i18n-no-placeholders-only': 'error',
 		'@wordpress/i18n-no-variables': 'error',
 		'@wordpress/i18n-ellipsis': 'error',
+		'@wordpress/i18n-no-flanking-whitespace': 'error',
+		'@wordpress/i18n-hyphenated-range': 'error',
 	},
 };
diff --git a/packages/eslint-plugin/configs/react.js b/packages/eslint-plugin/configs/react.js
index 3562b0e70074b7..04e4341c720be2 100644
--- a/packages/eslint-plugin/configs/react.js
+++ b/packages/eslint-plugin/configs/react.js
@@ -37,7 +37,7 @@ module.exports = {
 		'react-hooks/exhaustive-deps': [
 			'warn',
 			{
-				additionalHooks: '(useSelect|useSuspenseSelect)',
+				additionalHooks: '^(useSelect|useSuspenseSelect)$',
 			},
 		],
 		'react-hooks/rules-of-hooks': 'error',
diff --git a/packages/eslint-plugin/configs/recommended.js b/packages/eslint-plugin/configs/recommended.js
index 8f0399e8e1e9a4..df09d17beb6cbe 100644
--- a/packages/eslint-plugin/configs/recommended.js
+++ b/packages/eslint-plugin/configs/recommended.js
@@ -25,6 +25,12 @@ if ( isPackageInstalled( 'prettier' ) ) {
 	const prettierConfig = { ...defaultPrettierConfig, ...localPrettierConfig };
 	config.rules = {
 		'prettier/prettier': [ 'error', prettierConfig ],
+		// Prettier _disables_ this rule, but we want it!
+		// See https://github.com/prettier/eslint-config-prettier?tab=readme-ov-file#curly
+		// > This rule requires certain options.
+		// > …
+		// > If you like this rule, it can be used just fine with Prettier as long as you don’t use the "multi-line" or "multi-or-nest" option.
+		curly: [ 'error', 'all' ],
 	};
 }
 
@@ -49,11 +55,19 @@ if ( isPackageInstalled( 'typescript' ) ) {
 				// Don't require redundant JSDoc types in TypeScript files.
 				'jsdoc/require-param-type': 'off',
 				'jsdoc/require-returns-type': 'off',
-				// Handled by TS itself.
+				// Use eslint for unused variable and parameter detection.
+				// This overlaps with TypeScript noUnusedLocals and noUnusedParameters settings.
+				// TypeScript may only run on a subset of files. Prefer eslint which is more
+				// likely to run on the entire codebase.
 				'no-unused-vars': 'off',
+				'@typescript-eslint/no-unused-vars': [
+					'error',
+					{ ignoreRestSiblings: true },
+				],
 				// no-shadow doesn't work correctly in TS, so let's use a TS-dedicated version instead.
 				'no-shadow': 'off',
 				'@typescript-eslint/no-shadow': 'error',
+				'@typescript-eslint/method-signature-style': 'error',
 			},
 		},
 	];
diff --git a/packages/eslint-plugin/docs/rules/is-gutenberg-plugin.md b/packages/eslint-plugin/docs/rules/is-gutenberg-plugin.md
deleted file mode 100644
index 99b51cf5cbb93b..00000000000000
--- a/packages/eslint-plugin/docs/rules/is-gutenberg-plugin.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# The `IS_GUTENBERG_PLUGIN` global (is-gutenberg-plugin)
-
-To enable the use of feature flags in Gutenberg, the IS_GUTENBERG_PLUGIN global constant was introduced. This constant is replaced with a boolean value at build time using webpack's define plugin.
-
-There are a few rules around using this constant:
-
--   Only access `IS_GUTENBERG_PLUGIN` via `process.env`, e.g. `process.env.IS_GUTENBERG_PLUGIN`. This is required since webpack's define plugin only replaces exact matches of `process.env.IS_GUTENBERG_PLUGIN` in the codebase.
--   The `IS_GUTENBERG_PLUGIN` variable should only be used as a simple boolean expression.
--   `IS_GUTENBERG_PLUGIN` should only be used within the condition of an if statement, e.g. `if ( process.env.IS_GUTENBERG_PLUGIN ) { // implement feature here }` or ternary `process.env.IS_GUTENBERG_PLUGIN ? something : somethingElse`. This rule ensures code that is disabled through a feature flag is removed by dead code elimination.
-
-## Rule details
-
-Examples of **incorrect** code for this rule:
-
-```js
-if ( IS_GUTENBERG_PLUGIN ) {
-	// implement feature here.
-}
-```
-
-```js
-if ( window[ 'IS_GUTENBERG_PLUGIN' ] ) {
-	// implement feature here.
-}
-```
-
-```js
-if ( process.env.IS_GUTENBERG_PLUGIN == 1 ) {
-	// implement feature here.
-}
-```
-
-```js
-if ( process.env.IS_GUTENBERG_PLUGIN === true ) {
-	// implement feature here.
-}
-```
-
-```js
-if ( true || process.env.IS_GUTENBERG_PLUGIN ) {
-	// implement feature here.
-}
-```
-
-```js
-const isMyFeatureActive = process.env.IS_GUTENBERG_PLUGIN;
-```
-
-Examples of **correct** code for this rule:
-
-```js
-if ( process.env.IS_GUTENBERG_PLUGIN ) {
-	// implement feature here.
-}
-```
-
-```js
-if ( ! process.env.IS_GUTENBERG_PLUGIN ) {
-	return;
-}
-```
diff --git a/packages/eslint-plugin/docs/rules/no-wp-process-env.md b/packages/eslint-plugin/docs/rules/no-wp-process-env.md
new file mode 100644
index 00000000000000..46fa6ed431c200
--- /dev/null
+++ b/packages/eslint-plugin/docs/rules/no-wp-process-env.md
@@ -0,0 +1,23 @@
+# No WordPress process.env (no-wp-process-env)
+
+WordPress globals were accessed via `process.env` in the past. This practice created difficulty for
+package consumers and was removed.
+
+The correct way to access these globals is now via `globalThis`, e.g. `globalThis.SCRIPT_DEBUG`.
+This is safer for package consumers.
+
+This rule is fixable.
+
+## Rule details
+
+Examples of **incorrect** code for this rule:
+
+```js
+process.env.SCRIPT_DEBUG;
+```
+
+Examples of **correct** code for this rule:
+
+```js
+globalThis.SCRIPT_DEBUG;
+```
diff --git a/packages/eslint-plugin/docs/rules/wp-global-usage.md b/packages/eslint-plugin/docs/rules/wp-global-usage.md
new file mode 100644
index 00000000000000..d7b90b89258a90
--- /dev/null
+++ b/packages/eslint-plugin/docs/rules/wp-global-usage.md
@@ -0,0 +1,60 @@
+# WordPress global usage (wp-global-usage)
+
+To enable the use of feature flags in Gutenberg some globals are used, such as `IS_GUTENBERG_PLUGIN` and `SCRIPT_DEBUG`.
+
+There are a few rules around using this constant:
+
+-   Only access the globals via `globalThis`, e.g. `globalThis.IS_GUTENBERG_PLUGIN`. This allows the variables to be replaced compile time.
+-   The globals should only be used as a conditional test (negation is allowed).
+
+## Rule details
+
+Examples of **incorrect** code for this rule:
+
+```js
+if ( IS_GUTENBERG_PLUGIN ) {
+	// implement feature here.
+}
+```
+
+```js
+if ( window[ 'IS_GUTENBERG_PLUGIN' ] ) {
+	// implement feature here.
+}
+```
+
+```js
+if ( globalThis.IS_GUTENBERG_PLUGIN == 1 ) {
+	// implement feature here.
+}
+```
+
+```js
+if ( globalThis.IS_GUTENBERG_PLUGIN === true ) {
+	// implement feature here.
+}
+```
+
+```js
+if ( true || globalThis.IS_GUTENBERG_PLUGIN ) {
+	// implement feature here.
+}
+```
+
+```js
+const isMyFeatureActive = globalThis.IS_GUTENBERG_PLUGIN;
+```
+
+Examples of **correct** code for this rule:
+
+```js
+if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+	// implement feature here.
+}
+```
+
+```js
+if ( ! globalThis.IS_GUTENBERG_PLUGIN ) {
+	return;
+}
+```
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 4ea51fab8bab98..4a85de55f671a3 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/eslint-plugin",
-	"version": "17.4.0",
+	"version": "21.3.0",
 	"description": "ESLint plugin for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,8 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14",
-		"npm": ">=6.14.4"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"configs",
@@ -31,11 +31,11 @@
 	],
 	"main": "index.js",
 	"dependencies": {
-		"@babel/eslint-parser": "^7.16.0",
+		"@babel/eslint-parser": "7.25.7",
 		"@typescript-eslint/eslint-plugin": "^6.4.1",
 		"@typescript-eslint/parser": "^6.4.1",
-		"@wordpress/babel-preset-default": "file:../babel-preset-default",
-		"@wordpress/prettier-config": "file:../prettier-config",
+		"@wordpress/babel-preset-default": "*",
+		"@wordpress/prettier-config": "*",
 		"cosmiconfig": "^7.0.0",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-import": "^2.25.2",
diff --git a/packages/eslint-plugin/rules/__tests__/dependency-group.js b/packages/eslint-plugin/rules/__tests__/dependency-group.js
index 2db53e9ed666a1..1dac078aafb363 100644
--- a/packages/eslint-plugin/rules/__tests__/dependency-group.js
+++ b/packages/eslint-plugin/rules/__tests__/dependency-group.js
@@ -23,7 +23,7 @@ ruleTester.run( 'dependency-group', rule, {
  * External dependencies
  */
 import { camelCase } from 'change-case';
-import classnames from 'classnames';
+import clsx from 'clsx';;
 
 /**
  * WordPress dependencies
@@ -41,7 +41,7 @@ import edit from './edit';`,
  * External dependencies
  */
 const { camelCase } = require( 'change-case' );
-const classnames = require( 'classnames' );
+const clsx = require( 'clsx' );
 
 /**
  * WordPress dependencies
@@ -58,7 +58,7 @@ const edit = require( './edit' );`,
 		{
 			code: `
 import { camelCase } from 'change-case';
-import classnames from 'classnames';
+import clsx from 'clsx';;
 /*
  * wordpress dependencies.
  */
@@ -83,7 +83,7 @@ import edit from './edit';`,
  * External dependencies
  */
 import { camelCase } from 'change-case';
-import classnames from 'classnames';
+import clsx from 'clsx';;
 /**
  * WordPress dependencies
  */
@@ -96,7 +96,7 @@ import edit from './edit';`,
 		{
 			code: `
 const { camelCase } = require( 'change-case' );
-const classnames = require( 'classnames' );
+const clsx = require( 'clsx' );
 /*
  * wordpress dependencies.
  */
@@ -121,7 +121,7 @@ const edit = require( './edit' );`,
  * External dependencies
  */
 const { camelCase } = require( 'change-case' );
-const classnames = require( 'classnames' );
+const clsx = require( 'clsx' );
 /**
  * WordPress dependencies
  */
diff --git a/packages/eslint-plugin/rules/__tests__/i18n-translator-comments.js b/packages/eslint-plugin/rules/__tests__/i18n-translator-comments.js
index df59a9bbe07083..59098aa9eac056 100644
--- a/packages/eslint-plugin/rules/__tests__/i18n-translator-comments.js
+++ b/packages/eslint-plugin/rules/__tests__/i18n-translator-comments.js
@@ -34,6 +34,23 @@ sprintf(
 // translators: %s: Color
 i18n.sprintf( i18n.__( 'Color: %s' ), color );`,
 		},
+		{
+			code: `
+sprintf(
+	/*
+	 * translators: %s is the name of the city we couldn't locate.
+	 * Replace the examples with cities related to your locale. Test that
+	 * they match the expected location and have upcoming events before
+	 * including them. If no cities related to your locale have events,
+	 * then use cities related to your locale that would be recognizable
+	 * to most users. Use only the city name itself, without any region
+	 * or country. Use the endonym (native locale name) instead of the
+	 * English name if possible.
+	 */
+	__( 'We couldn’t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
+templateParams.unknownCity
+);`,
+		},
 	],
 	invalid: [
 		{
diff --git a/packages/eslint-plugin/rules/__tests__/is-gutenberg-plugin.js b/packages/eslint-plugin/rules/__tests__/is-gutenberg-plugin.js
deleted file mode 100644
index c2ffa8415269dd..00000000000000
--- a/packages/eslint-plugin/rules/__tests__/is-gutenberg-plugin.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * External dependencies
- */
-import { RuleTester } from 'eslint';
-
-/**
- * Internal dependencies
- */
-import rule from '../is-gutenberg-plugin';
-
-const ruleTester = new RuleTester( {
-	parserOptions: {
-		ecmaVersion: 6,
-	},
-} );
-
-const ERROR_MESSAGE =
-	'The `process.env.IS_GUTENBERG_PLUGIN` constant should only be used as the condition in an if statement or ternary expression.';
-
-ruleTester.run( 'is-gutenberg-plugin', rule, {
-	valid: [
-		{ code: `if ( process.env.IS_GUTENBERG_PLUGIN ) {}` },
-		{ code: `if ( ! process.env.IS_GUTENBERG_PLUGIN ) {}` },
-		{
-			// Ensure whitespace is ok.
-			code: `if (
-				process.env.
-				IS_GUTENBERG_PLUGIN
-			) {}`,
-		},
-		{ code: `const test = process.env.IS_GUTENBERG_PLUGIN ? foo : bar` },
-		{ code: `const test = ! process.env.IS_GUTENBERG_PLUGIN ? bar : foo` },
-		{
-			// Ensure whitespace is ok.
-			code: `const test = ! process.env.
-				IS_GUTENBERG_PLUGIN ? bar : foo`,
-		},
-	],
-	invalid: [
-		{
-			code: `if ( IS_GUTENBERG_PLUGIN ) {}`,
-			errors: [ { message: ERROR_MESSAGE } ],
-		},
-		{
-			code: `if ( window[ 'IS_GUTENBERG_PLUGIN' ] ) {}`,
-			errors: [ { message: ERROR_MESSAGE } ],
-		},
-		{
-			code: `if ( true ) { process.env.IS_GUTENBERG_PLUGIN === 2 }`,
-			errors: [ { message: ERROR_MESSAGE } ],
-		},
-		{
-			code: `if ( process.env.IS_GUTENBERG_PLUGIN === 2 ) {}`,
-			errors: [ { message: ERROR_MESSAGE } ],
-		},
-		{
-			code: `if ( true || process.env.IS_GUTENBERG_PLUGIN === 2 ) {}`,
-			errors: [ { message: ERROR_MESSAGE } ],
-		},
-		{
-			code: `const isFeatureActive = process.env.IS_GUTENBERG_PLUGIN;`,
-			errors: [ { message: ERROR_MESSAGE } ],
-		},
-	],
-} );
diff --git a/packages/eslint-plugin/rules/__tests__/no-wp-process-env.js b/packages/eslint-plugin/rules/__tests__/no-wp-process-env.js
new file mode 100644
index 00000000000000..330ed560aea992
--- /dev/null
+++ b/packages/eslint-plugin/rules/__tests__/no-wp-process-env.js
@@ -0,0 +1,62 @@
+/**
+ * External dependencies
+ */
+import { RuleTester } from 'eslint';
+
+/**
+ * Internal dependencies
+ */
+import rule from '../no-wp-process-env';
+
+const ruleTester = new RuleTester( {
+	parserOptions: {
+		ecmaVersion: 6,
+	},
+} );
+
+ruleTester.run( 'no-wp-process-env', rule, {
+	valid: [
+		{ code: 'process.env.NODE_ENV' },
+		{ code: 'process.env.WHATEVER' },
+		{ code: 'process.env[foo]' },
+		{ code: 'process.env["foo"]' },
+		{ code: `process['env']["foo"]` },
+		{ code: "process['env'][`foo`]" },
+		{ code: "process.env[`${ '' }IS_GUTENBERG_PLUGIN`]" },
+		{ code: `a.b.c` },
+		{ code: `x['y']['z']` },
+		{ code: `d[e][f]` },
+		{ code: `process[ (()=>'env')() ][ {_:'SCRIPT_DEBUG'}['_'] ]` },
+	],
+	invalid: [
+		{
+			code: 'process.env.IS_GUTENBERG_PLUGIN',
+			errors: [ { messageId: 'useGlobalThis' } ],
+			output: 'globalThis.IS_GUTENBERG_PLUGIN',
+		},
+		{
+			code: 'process.env.SCRIPT_DEBUG',
+			errors: [ { messageId: 'useGlobalThis' } ],
+			output: 'globalThis.SCRIPT_DEBUG',
+		},
+		{
+			code: 'process.env.IS_WORDPRESS_CORE',
+			errors: [ { messageId: 'useGlobalThis' } ],
+			output: 'globalThis.IS_WORDPRESS_CORE',
+		},
+		{
+			code: `process['env']["IS_GUTENBERG_PLUGIN"]`,
+			errors: [ { messageId: 'useGlobalThis' } ],
+			output: 'globalThis.IS_GUTENBERG_PLUGIN',
+		},
+		{
+			code: 'process[`env`][`IS_GUTENBERG_PLUGIN`]',
+			errors: [ { messageId: 'useGlobalThis' } ],
+			output: 'globalThis.IS_GUTENBERG_PLUGIN',
+		},
+		{
+			code: 'process.env.GUTENBERG_PHASE',
+			errors: [ { messageId: 'noGutenbergPhase' } ],
+		},
+	],
+} );
diff --git a/packages/eslint-plugin/rules/__tests__/wp-global-usage.js b/packages/eslint-plugin/rules/__tests__/wp-global-usage.js
new file mode 100644
index 00000000000000..9d3dc9b2a29d72
--- /dev/null
+++ b/packages/eslint-plugin/rules/__tests__/wp-global-usage.js
@@ -0,0 +1,129 @@
+/**
+ * External dependencies
+ */
+import { RuleTester } from 'eslint';
+
+/**
+ * Internal dependencies
+ */
+import rule from '../wp-global-usage';
+
+const ruleTester = new RuleTester( {
+	parserOptions: {
+		ecmaVersion: 6,
+	},
+} );
+
+ruleTester.run( 'wp-global-usage', rule, {
+	valid: [
+		{ code: "const text = 'SCRIPT_DEBUG'" },
+		{ code: 'const config = { SCRIPT_DEBUG: true }' },
+		{ code: 'if ( globalThis.IS_GUTENBERG_PLUGIN ) {}' },
+		{ code: 'if ( globalThis.IS_WORDPRESS_CORE ) {}' },
+		{ code: 'if ( globalThis.SCRIPT_DEBUG ) {}' },
+		{ code: 'if ( process.env.SCRIPT_DEBUG ) {}' },
+		{ code: 'if ( ! globalThis.IS_GUTENBERG_PLUGIN ) {}' },
+		{
+			// Ensure whitespace is ok.
+			code: `if (
+				globalThis.
+				IS_GUTENBERG_PLUGIN
+			) {}`,
+		},
+		{ code: 'const test = globalThis.IS_GUTENBERG_PLUGIN ? foo : bar' },
+		{ code: 'const test = ! globalThis.IS_GUTENBERG_PLUGIN ? bar : foo' },
+		{
+			// Ensure whitespace is ok.
+			code: `const test = ! globalThis.
+				IS_GUTENBERG_PLUGIN ? bar : foo`,
+		},
+	],
+	invalid: [
+		{
+			code: 'if ( IS_GUTENBERG_PLUGIN ) {}',
+			errors: [
+				{
+					messageId: 'usedWithoutGlobalThis',
+					data: { name: 'IS_GUTENBERG_PLUGIN' },
+				},
+			],
+			output: 'if ( globalThis.IS_GUTENBERG_PLUGIN ) {}',
+		},
+		{
+			code: 'if ( window.IS_GUTENBERG_PLUGIN ) {}',
+			errors: [
+				{
+					messageId: 'usedWithoutGlobalThis',
+					data: { name: 'IS_GUTENBERG_PLUGIN' },
+				},
+			],
+			output: 'if ( globalThis.IS_GUTENBERG_PLUGIN ) {}',
+		},
+		{
+			code: 'if ( SCRIPT_DEBUG ) {}',
+			errors: [
+				{
+					messageId: 'usedWithoutGlobalThis',
+					data: { name: 'SCRIPT_DEBUG' },
+				},
+			],
+			output: 'if ( globalThis.SCRIPT_DEBUG ) {}',
+		},
+		{
+			code: 'if ( IS_WORDPRESS_CORE ) {}',
+			errors: [
+				{
+					messageId: 'usedWithoutGlobalThis',
+					data: { name: 'IS_WORDPRESS_CORE' },
+				},
+			],
+			output: 'if ( globalThis.IS_WORDPRESS_CORE ) {}',
+		},
+		{
+			code: "if ( window[ 'IS_GUTENBERG_PLUGIN' ] ) {}",
+			errors: [
+				{
+					messageId: 'usedWithoutGlobalThis',
+					data: { name: 'IS_GUTENBERG_PLUGIN' },
+				},
+			],
+			output: 'if ( globalThis.IS_GUTENBERG_PLUGIN ) {}',
+		},
+		{
+			code: 'if ( true ) { globalThis.IS_GUTENBERG_PLUGIN === 2 }',
+			errors: [
+				{
+					messageId: 'usedOutsideConditional',
+					data: { name: 'IS_GUTENBERG_PLUGIN' },
+				},
+			],
+		},
+		{
+			code: 'if ( globalThis.IS_GUTENBERG_PLUGIN === 2 ) {}',
+			errors: [
+				{
+					messageId: 'usedOutsideConditional',
+					data: { name: 'IS_GUTENBERG_PLUGIN' },
+				},
+			],
+		},
+		{
+			code: 'if ( true || globalThis.IS_GUTENBERG_PLUGIN === 2 ) {}',
+			errors: [
+				{
+					messageId: 'usedOutsideConditional',
+					data: { name: 'IS_GUTENBERG_PLUGIN' },
+				},
+			],
+		},
+		{
+			code: 'const isFeatureActive = globalThis.IS_GUTENBERG_PLUGIN;',
+			errors: [
+				{
+					messageId: 'usedOutsideConditional',
+					data: { name: 'IS_GUTENBERG_PLUGIN' },
+				},
+			],
+		},
+	],
+} );
diff --git a/packages/eslint-plugin/rules/gutenberg-phase.js b/packages/eslint-plugin/rules/gutenberg-phase.js
deleted file mode 100644
index e3ec9ccf8180ef..00000000000000
--- a/packages/eslint-plugin/rules/gutenberg-phase.js
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Traverse up through the chain of parent AST nodes returning the first parent
- * the predicate returns a truthy value for.
- *
- * @param {Object}   sourceNode The AST node to search from.
- * @param {Function} predicate  A predicate invoked for each parent.
- *
- * @return {Object | undefined} The first encountered parent node where the predicate
- *                    returns a truthy value.
- */
-function findParent( sourceNode, predicate ) {
-	if ( ! sourceNode.parent ) {
-		return;
-	}
-
-	if ( predicate( sourceNode.parent ) ) {
-		return sourceNode.parent;
-	}
-
-	return findParent( sourceNode.parent, predicate );
-}
-
-/**
- * Tests whether the GUTENBERG_PHASE variable is accessed via
- * `process.env.GUTENBERG_PHASE`.
- *
- * @example
- * ```js
- * // good
- * if ( process.env.GUTENBERG_PHASE === 2 ) {
- *
- * // bad
- * if ( GUTENBERG_PHASE === 2 ) {
- * ```
- *
- * @param {Object} node    The GUTENBERG_PHASE identifier node.
- * @param {Object} context The eslint context object.
- */
-function testIsAccessedViaProcessEnv( node, context ) {
-	const parent = node.parent;
-
-	if (
-		parent &&
-		parent.type === 'MemberExpression' &&
-		context.getSource( parent ) === 'process.env.GUTENBERG_PHASE'
-	) {
-		return;
-	}
-
-	context.report(
-		node,
-		'The `GUTENBERG_PHASE` constant should be accessed using `process.env.GUTENBERG_PHASE`.'
-	);
-}
-
-/**
- * Tests whether the GUTENBERG_PHASE variable is used in a strict binary
- * equality expression in a comparison with a number, triggering a
- * violation if not.
- *
- * @example
- * ```js
- * // good
- * if ( process.env.GUTENBERG_PHASE === 2 ) {
- *
- * // bad
- * if ( process.env.GUTENBERG_PHASE >= '2' ) {
- * ```
- *
- * @param {Object} node    The GUTENBERG_PHASE identifier node.
- * @param {Object} context The eslint context object.
- */
-function testIsUsedInStrictBinaryExpression( node, context ) {
-	const parent = findParent(
-		node,
-		( candidate ) => candidate.type === 'BinaryExpression'
-	);
-
-	if ( parent ) {
-		const comparisonNode =
-			node.parent.type === 'MemberExpression' ? node.parent : node;
-
-		// Test for process.env.GUTENBERG_PHASE === <number> or <number> === process.env.GUTENBERG_PHASE.
-		const hasCorrectOperator = [ '===', '!==' ].includes( parent.operator );
-		const hasCorrectOperands =
-			( parent.left === comparisonNode &&
-				typeof parent.right.value === 'number' ) ||
-			( parent.right === comparisonNode &&
-				typeof parent.left.value === 'number' );
-
-		if ( hasCorrectOperator && hasCorrectOperands ) {
-			return;
-		}
-	}
-
-	context.report(
-		node,
-		'The `GUTENBERG_PHASE` constant should only be used in a strict equality comparison with a primitive number.'
-	);
-}
-
-/**
- * Tests whether the GUTENBERG_PHASE variable is used as the condition for an
- * if statement, triggering a violation if not.
- *
- * @example
- * ```js
- * // good
- * if ( process.env.GUTENBERG_PHASE === 2 ) {
- *
- * // bad
- * const isFeatureActive = process.env.GUTENBERG_PHASE === 2;
- * ```
- *
- * @param {Object} node    The GUTENBERG_PHASE identifier node.
- * @param {Object} context The eslint context object.
- */
-function testIsUsedInIfOrTernary( node, context ) {
-	const conditionalParent = findParent( node, ( candidate ) =>
-		[ 'IfStatement', 'ConditionalExpression' ].includes( candidate.type )
-	);
-	const binaryParent = findParent(
-		node,
-		( candidate ) => candidate.type === 'BinaryExpression'
-	);
-
-	if (
-		conditionalParent &&
-		binaryParent &&
-		conditionalParent.test &&
-		conditionalParent.test.range[ 0 ] === binaryParent.range[ 0 ] &&
-		conditionalParent.test.range[ 1 ] === binaryParent.range[ 1 ]
-	) {
-		return;
-	}
-
-	context.report(
-		node,
-		'The `GUTENBERG_PHASE` constant should only be used as part of the condition in an if statement or ternary expression.'
-	);
-}
-
-module.exports = {
-	meta: {
-		type: 'problem',
-		schema: [],
-		deprecated: true,
-		replacedBy: '@wordpress/is-gutenberg-plugin',
-	},
-	create( context ) {
-		return {
-			Identifier( node ) {
-				// Bypass any identifiers with a node name different to `GUTENBERG_PHASE`.
-				if ( node.name !== 'GUTENBERG_PHASE' ) {
-					return;
-				}
-
-				testIsAccessedViaProcessEnv( node, context );
-				testIsUsedInStrictBinaryExpression( node, context );
-				testIsUsedInIfOrTernary( node, context );
-			},
-			Literal( node ) {
-				// Bypass any identifiers with a node value different to `GUTENBERG_PHASE`.
-				if ( node.value !== 'GUTENBERG_PHASE' ) {
-					return;
-				}
-
-				if ( node.parent && node.parent.type === 'MemberExpression' ) {
-					testIsAccessedViaProcessEnv( node, context );
-				}
-			},
-		};
-	},
-};
diff --git a/packages/eslint-plugin/rules/i18n-translator-comments.js b/packages/eslint-plugin/rules/i18n-translator-comments.js
index 86d57449dc0547..56d563d3fdb72c 100644
--- a/packages/eslint-plugin/rules/i18n-translator-comments.js
+++ b/packages/eslint-plugin/rules/i18n-translator-comments.js
@@ -78,7 +78,7 @@ module.exports = {
 					const {
 						value: commentText,
 						loc: {
-							start: { line: commentLine },
+							end: { line: commentLine },
 						},
 					} = comment;
 
diff --git a/packages/eslint-plugin/rules/is-gutenberg-plugin.js b/packages/eslint-plugin/rules/is-gutenberg-plugin.js
deleted file mode 100644
index 00475545e6158c..00000000000000
--- a/packages/eslint-plugin/rules/is-gutenberg-plugin.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Traverse up through the chain of parent AST nodes returning the first parent
- * the predicate returns a truthy value for.
- *
- * @param {Object}   sourceNode The AST node to search from.
- * @param {Function} predicate  A predicate invoked for each parent.
- *
- * @return {Object | undefined} The first encountered parent node where the predicate
- *                    returns a truthy value.
- */
-function findParent( sourceNode, predicate ) {
-	if ( ! sourceNode.parent ) {
-		return;
-	}
-
-	if ( predicate( sourceNode.parent ) ) {
-		return sourceNode.parent;
-	}
-
-	return findParent( sourceNode.parent, predicate );
-}
-
-/**
- * Tests whether the IS_GUTENBERG_PLUGIN variable is used as the condition for an
- * if statement or ternary, triggering a violation if not.
- *
- * @example
- * ```js
- * // good
- * if ( process.env.IS_GUTENBERG_PLUGIN ) {
- *
- * // bad
- * const isFeatureActive = process.env.IS_GUTENBERG_PLUGIN;
- * ```
- *
- * @param {Object} node    The IS_GUTENBERG_PLUGIN identifier node.
- * @param {Object} context The eslint context object.
- */
-function isUsedInConditional( node, context ) {
-	const conditionalParent = findParent( node, ( candidate ) =>
-		[ 'IfStatement', 'ConditionalExpression' ].includes( candidate.type )
-	);
-
-	if ( ! conditionalParent ) {
-		return false;
-	}
-
-	// Allow for whitespace as prettier sometimes breaks this on separate lines.
-	const textRegex = /^\s*!?\s*process\s*\.\s*env\s*\.\s*IS_GUTENBERG_PLUGIN$/;
-	const testSource = context.getSource( conditionalParent.test );
-
-	if ( ! textRegex.test( testSource ) ) {
-		return false;
-	}
-
-	return true;
-}
-
-const ERROR_MESSAGE =
-	'The `process.env.IS_GUTENBERG_PLUGIN` constant should only be used as the condition in an if statement or ternary expression.';
-
-module.exports = {
-	meta: {
-		type: 'problem',
-		schema: [],
-	},
-	create( context ) {
-		return {
-			Identifier( node ) {
-				// Bypass any identifiers with a node name different to `IS_GUTENBERG_PLUGIN`.
-				if ( node.name !== 'IS_GUTENBERG_PLUGIN' ) {
-					return;
-				}
-
-				if ( ! isUsedInConditional( node, context ) ) {
-					context.report( node, ERROR_MESSAGE );
-				}
-			},
-			// Check for literals, e.g. when 'IS_GUTENBERG_PLUGIN' is used as a string via something like 'window[ 'IS_GUTENBERG_PLUGIN' ]'.
-			Literal( node ) {
-				// Bypass any identifiers with a node value different to `IS_GUTENBERG_PLUGIN`.
-				if ( node.value !== 'IS_GUTENBERG_PLUGIN' ) {
-					return;
-				}
-
-				if ( node.parent && node.parent.type === 'MemberExpression' ) {
-					if ( ! isUsedInConditional( node, context ) ) {
-						context.report( node, ERROR_MESSAGE );
-					}
-				}
-			},
-		};
-	},
-};
diff --git a/packages/eslint-plugin/rules/no-wp-process-env.js b/packages/eslint-plugin/rules/no-wp-process-env.js
new file mode 100644
index 00000000000000..55aca44b92ba74
--- /dev/null
+++ b/packages/eslint-plugin/rules/no-wp-process-env.js
@@ -0,0 +1,93 @@
+const NAMES = new Set(
+	/** @type {const} */ ( [
+		'GUTENBERG_PHASE',
+		'IS_GUTENBERG_PLUGIN',
+		'IS_WORDPRESS_CORE',
+		'SCRIPT_DEBUG',
+	] )
+);
+
+/** @type {import('eslint').Rule.RuleModule} */
+module.exports = {
+	meta: {
+		type: 'problem',
+		schema: [],
+		fixable: true,
+		messages: {
+			useGlobalThis:
+				'`{{ name }}` should not be accessed from process.env. Use `globalThis.{{name}}`.',
+			noGutenbergPhase:
+				'The GUTENBERG_PHASE environement variable is no longer available. Use IS_GUTENBERG_PLUGIN (boolean).',
+		},
+	},
+	create( context ) {
+		return {
+			MemberExpression( node ) {
+				const propertyNameOrValue = memberProperty( node );
+				if ( ! propertyNameOrValue ) {
+					return;
+				}
+				if ( ! NAMES.has( propertyNameOrValue ) ) {
+					return;
+				}
+
+				if ( node.object.type !== 'MemberExpression' ) {
+					return;
+				}
+
+				const obj = node.object;
+				const envCandidateProperty = memberProperty( obj );
+				if ( envCandidateProperty !== 'env' ) {
+					return;
+				}
+
+				if (
+					obj.object.type !== 'Identifier' ||
+					obj.object.name !== 'process'
+				) {
+					return;
+				}
+
+				if ( propertyNameOrValue === 'GUTENBERG_PHASE' ) {
+					context.report( {
+						node,
+						messageId: 'noGutenbergPhase',
+					} );
+					return;
+				}
+
+				context.report( {
+					node,
+					messageId: 'useGlobalThis',
+					data: { name: propertyNameOrValue },
+					fix( fixer ) {
+						return fixer.replaceText(
+							node,
+							`globalThis.${ propertyNameOrValue }`
+						);
+					},
+				} );
+			},
+		};
+	},
+};
+
+/**
+ * @param {import('estree').MemberExpression} node
+ */
+function memberProperty( node ) {
+	switch ( node.property.type ) {
+		case 'Identifier':
+			return node.property.name;
+		case 'Literal':
+			return node.property.value;
+		case 'TemplateLiteral':
+			if (
+				! node.property.expressions.length &&
+				node.property.quasis.length === 1
+			) {
+				return node.property.quasis[ 0 ].value.raw;
+			}
+	}
+	return null;
+}
diff --git a/packages/eslint-plugin/rules/wp-global-usage.js b/packages/eslint-plugin/rules/wp-global-usage.js
new file mode 100644
index 00000000000000..c6c75d99331238
--- /dev/null
+++ b/packages/eslint-plugin/rules/wp-global-usage.js
@@ -0,0 +1,170 @@
+const NAMES = new Set(
+	/** @type {const} */ ( [
+		'IS_GUTENBERG_PLUGIN',
+		'IS_WORDPRESS_CORE',
+		'SCRIPT_DEBUG',
+	] )
+);
+
+/**
+ * Tests whether the IS_GUTENBERG_PLUGIN variable is used as the condition for an
+ * if statement or ternary, triggering a violation if not.
+ *
+ * @example
+ * ```js
+ * // good
+ * if ( process.env.IS_GUTENBERG_PLUGIN ) {
+ *
+ * // bad
+ * const isFeatureActive = process.env.IS_GUTENBERG_PLUGIN;
+ * ```
+ *
+ * @param {import('estree').Node} node The IS_GUTENBERG_PLUGIN identifier node.
+ */
+function isUsedInConditional( node ) {
+	/** @type {import('estree').Node|undefined} */
+	let current = node;
+
+	// Simple negation is the only expresion allowed in the conditional:
+	// if ( ! globalThis.SCRIPT_DEBUG ) {}
+	// const D = ! globalThis.SCRIPT_DEBUG ? 'yes' : 'no';
+	if (
+		current.parent.type === 'UnaryExpression' &&
+		current.parent.operator === '!'
+	) {
+		current = current.parent;
+	}
+
+	// Check if the current node is the test of a conditional
+
+	/** @type {import('estree').Node|undefined} */
+	const parent = current.parent;
+
+	if ( parent.type === 'IfStatement' && parent.test === current ) {
+		return true;
+	}
+	if ( parent.type === 'ConditionalExpression' && parent.test === current ) {
+		return true;
+	}
+	return false;
+}
+
+/** @type {import('eslint').Rule.RuleModule} */
+module.exports = {
+	meta: {
+		type: 'problem',
+		schema: [],
+		fixable: true,
+		messages: {
+			usedOutsideConditional:
+				'`globalThis.{{ name }}` should only be used as the condition in an if statement or ternary expression.',
+			usedWithoutGlobalThis:
+				'`{{ name }}` should not be used directly. Use `globalThis.{{ name }}`.',
+		},
+	},
+	create( context ) {
+		return {
+			Identifier( node ) {
+				// Bypass any identifiers with a node name different to `IS_GUTENBERG_PLUGIN`.
+				if ( ! NAMES.has( node.name ) ) {
+					return;
+				}
+
+				if ( node.parent.type === 'Property' ) {
+					return;
+				}
+
+				if ( node.parent.type !== 'MemberExpression' ) {
+					context.report( {
+						node,
+						messageId: 'usedWithoutGlobalThis',
+						data: { name: node.name },
+						fix( fixer ) {
+							return fixer.replaceText(
+								node,
+								`globalThis.${ node.name }`
+							);
+						},
+					} );
+
+					if ( ! isUsedInConditional( node ) ) {
+						context.report( {
+							node,
+							messageId: 'usedOutsideConditional',
+							data: {
+								name: node.name,
+							},
+						} );
+					}
+					return;
+				}
+
+				if (
+					node.parent.object.type === 'Identifier' &&
+					node.parent.object.name !== 'globalThis'
+				) {
+					context.report( {
+						node,
+						messageId: 'usedWithoutGlobalThis',
+						data: { name: node.name },
+						fix( fixer ) {
+							if ( node.parent.object.name === 'window' ) {
+								return fixer.replaceText(
+									node.parent,
+									`globalThis.${ node.name }`
+								);
+							}
+						},
+					} );
+				} else if ( ! isUsedInConditional( node.parent ) ) {
+					context.report( {
+						node,
+						messageId: 'usedOutsideConditional',
+						data: {
+							name: node.name,
+						},
+					} );
+				}
+			},
+
+			// Check for literals, e.g. when 'IS_GUTENBERG_PLUGIN' is used as a string via something like 'window[ 'IS_GUTENBERG_PLUGIN' ]'.
+			Literal( node ) {
+				// Bypass any identifiers with a node value different to `IS_GUTENBERG_PLUGIN`.
+				if ( ! NAMES.has( node.value ) ) {
+					return;
+				}
+
+				if ( node.parent.type !== 'MemberExpression' ) {
+					return;
+				}
+
+				if (
+					node.parent.object.type === 'Identifier' &&
+					node.parent.object.name !== 'globalThis'
+				) {
+					context.report( {
+						node,
+						messageId: 'usedWithoutGlobalThis',
+						data: { name: node.value },
+						fix( fixer ) {
+							if ( node.parent.object.name === 'window' ) {
+								return fixer.replaceText(
+									node.parent,
+									`globalThis.${ node.value }`
+								);
+							}
+						},
+					} );
+				} else if ( ! isUsedInConditional( node.parent ) ) {
+					context.report( {
+						node,
+						messageId: 'usedOutsideConditional',
+						data: {
+							name: node.value,
+						},
+					} );
+				}
+			},
+		};
+	},
+};
diff --git a/packages/eslint-plugin/tsconfig.json b/packages/eslint-plugin/tsconfig.json
index 5a1bf6eda88a56..e17815f78a6a16 100644
--- a/packages/eslint-plugin/tsconfig.json
+++ b/packages/eslint-plugin/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"module": "CommonJS",
diff --git a/packages/fields/CHANGELOG.md b/packages/fields/CHANGELOG.md
new file mode 100644
index 00000000000000..26f61829fb8018
--- /dev/null
+++ b/packages/fields/CHANGELOG.md
@@ -0,0 +1,9 @@
+<!-- Learn how to maintain this file at https://github.com/WordPress/gutenberg/tree/HEAD/packages#maintaining-changelogs. -->
+
+## Unreleased
+
+## 0.2.0 (2024-10-16)
+
+## 0.1.0 (2024-10-03)
+
+Initial release.
diff --git a/packages/fields/README.md b/packages/fields/README.md
new file mode 100644
index 00000000000000..0a891f9b07420c
--- /dev/null
+++ b/packages/fields/README.md
@@ -0,0 +1,101 @@
+# Fields
+
+This package provides core elements for the DataView library, designed to simplify the creation and management of data display elements in WordPress.
+
+## Installation
+
+Install the module
+
+```bash
+npm install @wordpress/fields --save
+```
+
+## Usage
+
+<!-- START TOKEN(Autogenerated API docs) -->
+
+### deletePost
+
+Undocumented declaration.
+
+### duplicatePattern
+
+Undocumented declaration.
+
+### duplicatePost
+
+Undocumented declaration.
+
+### duplicatePostNative
+
+Undocumented declaration.
+
+### exportPattern
+
+Undocumented declaration.
+
+### exportPatternNative
+
+Undocumented declaration.
+
+### featuredImageField
+
+Undocumented declaration.
+
+### orderField
+
+Undocumented declaration.
+
+### permanentlyDeletePost
+
+Undocumented declaration.
+
+### renamePost
+
+Undocumented declaration.
+
+### reorderPage
+
+Undocumented declaration.
+
+### reorderPageNative
+
+Undocumented declaration.
+
+### resetPost
+
+Undocumented declaration.
+
+### restorePost
+
+Undocumented declaration.
+
+### slugField
+
+Undocumented declaration.
+
+### titleField
+
+Undocumented declaration.
+
+### trashPost
+
+Undocumented declaration.
+
+### viewPost
+
+Undocumented declaration.
+
+### viewPostRevisions
+
+Undocumented declaration.
+
+<!-- END TOKEN(Autogenerated API docs) -->
+
+## Contributing to this package
+
+This is an individual package that's part of the Gutenberg project. The project is organized as a monorepo. It's made up of multiple self-contained software packages, each with a specific purpose. The packages in this monorepo are published to [npm](https://www.npmjs.com/) and used by [WordPress](https://make.wordpress.org/core/) as well as other software projects.
+
+To find out more about contributing to this package or Gutenberg as a whole, please read the project's main [contributor guide](https://github.com/WordPress/gutenberg/tree/HEAD/CONTRIBUTING.md).
+
+<br /><br /><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>
diff --git a/packages/fields/package.json b/packages/fields/package.json
new file mode 100644
index 00000000000000..43772cb41981a5
--- /dev/null
+++ b/packages/fields/package.json
@@ -0,0 +1,66 @@
+{
+	"name": "@wordpress/fields",
+	"version": "0.2.0",
+	"description": "DataViews is a component that provides an API to render datasets using different types of layouts (table, grid, list, etc.).",
+	"author": "The WordPress Contributors",
+	"license": "GPL-2.0-or-later",
+	"keywords": [
+		"wordpress",
+		"gutenberg",
+		"dataviews"
+	],
+	"homepage": "https://github.com/WordPress/gutenberg/tree/HEAD/packages/fields/README.md",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/WordPress/gutenberg.git",
+		"directory": "packages/fields"
+	},
+	"bugs": {
+		"url": "https://github.com/WordPress/gutenberg/issues"
+	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
+	"main": "build/index.js",
+	"module": "build-module/index.js",
+	"react-native": "src/index",
+	"types": "build-types",
+	"sideEffects": [
+		"build-style/**",
+		"src/**/*.scss"
+	],
+	"dependencies": {
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/blob": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/dataviews": "*",
+		"@wordpress/element": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/media-utils": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/patterns": "*",
+		"@wordpress/primitives": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/router": "*",
+		"@wordpress/url": "*",
+		"@wordpress/warning": "*",
+		"change-case": "4.1.2",
+		"client-zip": "^2.4.5"
+	},
+	"peerDependencies": {
+		"react": "^18.0.0"
+	},
+	"publishConfig": {
+		"access": "public"
+	},
+	"wpScript": true
+}
diff --git a/packages/fields/src/actions/delete-post.tsx b/packages/fields/src/actions/delete-post.tsx
new file mode 100644
index 00000000000000..c5ab866e12479e
--- /dev/null
+++ b/packages/fields/src/actions/delete-post.tsx
@@ -0,0 +1,203 @@
+/**
+ * WordPress dependencies
+ */
+import { trash } from '@wordpress/icons';
+import { __, _n, sprintf } from '@wordpress/i18n';
+import { useState } from '@wordpress/element';
+import {
+	Button,
+	__experimentalText as Text,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+// @ts-ignore
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
+import type { Action } from '@wordpress/dataviews';
+import { decodeEntities } from '@wordpress/html-entities';
+
+/**
+ * Internal dependencies
+ */
+import {
+	getItemTitle,
+	isTemplateOrTemplatePart,
+	isTemplateRemovable,
+} from './utils';
+import type { Pattern, Template, TemplatePart } from '../types';
+import type { NoticeSettings } from '../mutation';
+import { deletePostWithNotices } from '../mutation';
+import { unlock } from '../lock-unlock';
+
+const { PATTERN_TYPES } = unlock( patternsPrivateApis );
+
+// This action is used for templates, patterns and template parts.
+// Every other post type uses the similar `trashPostAction` which
+// moves the post to trash.
+const deletePostAction: Action< Template | TemplatePart | Pattern > = {
+	id: 'delete-post',
+	label: __( 'Delete' ),
+	isPrimary: true,
+	icon: trash,
+	isEligible( post ) {
+		if ( isTemplateOrTemplatePart( post ) ) {
+			return isTemplateRemovable( post );
+		}
+		// We can only remove user patterns.
+		return post.type === PATTERN_TYPES.user;
+	},
+	supportsBulk: true,
+	hideModalHeader: true,
+	RenderModal: ( { items, closeModal, onActionPerformed } ) => {
+		const [ isBusy, setIsBusy ] = useState( false );
+		const isResetting = items.every(
+			( item ) => isTemplateOrTemplatePart( item ) && item?.has_theme_file
+		);
+		return (
+			<VStack spacing="5">
+				<Text>
+					{ items.length > 1
+						? sprintf(
+								// translators: %d: number of items to delete.
+								_n(
+									'Delete %d item?',
+									'Delete %d items?',
+									items.length
+								),
+								items.length
+						  )
+						: sprintf(
+								// translators: %s: The template or template part's titles
+								__( 'Delete "%s"?' ),
+								getItemTitle( items[ 0 ] )
+						  ) }
+				</Text>
+				<HStack justify="right">
+					<Button
+						variant="tertiary"
+						onClick={ closeModal }
+						disabled={ isBusy }
+						accessibleWhenDisabled
+						__next40pxDefaultSize
+					>
+						{ __( 'Cancel' ) }
+					</Button>
+					<Button
+						variant="primary"
+						onClick={ async () => {
+							setIsBusy( true );
+							const notice: NoticeSettings<
+								Template | TemplatePart | Pattern
+							> = {
+								success: {
+									messages: {
+										getMessage: ( item ) => {
+											return isResetting
+												? sprintf(
+														/* translators: The template/part's name. */
+														__( '"%s" reset.' ),
+														decodeEntities(
+															getItemTitle( item )
+														)
+												  )
+												: sprintf(
+														/* translators: The template/part's name. */
+														__( '"%s" deleted.' ),
+														decodeEntities(
+															getItemTitle( item )
+														)
+												  );
+										},
+										getBatchMessage: () => {
+											return isResetting
+												? __( 'Items reset.' )
+												: __( 'Items deleted.' );
+										},
+									},
+								},
+								error: {
+									messages: {
+										getMessage: ( error ) => {
+											if ( error.size === 1 ) {
+												return [ ...error ][ 0 ];
+											}
+											return isResetting
+												? __(
+														'An error occurred while reverting the item.'
+												  )
+												: __(
+														'An error occurred while deleting the item.'
+												  );
+										},
+										getBatchMessage: ( errors ) => {
+											if ( errors.size === 0 ) {
+												return isResetting
+													? __(
+															'An error occurred while reverting the items.'
+													  )
+													: __(
+															'An error occurred while deleting the items.'
+													  );
+											}
+
+											if ( errors.size === 1 ) {
+												return isResetting
+													? sprintf(
+															/* translators: %s: an error message */
+															__(
+																'An error occurred while reverting the items: %s'
+															),
+															[ ...errors ][ 0 ]
+													  )
+													: sprintf(
+															/* translators: %s: an error message */
+															__(
+																'An error occurred while deleting the items: %s'
+															),
+															[ ...errors ][ 0 ]
+													  );
+											}
+
+											return isResetting
+												? sprintf(
+														/* translators: %s: a list of comma separated error messages */
+														__(
+															'Some errors occurred while reverting the items: %s'
+														),
+														[ ...errors ].join(
+															','
+														)
+												  )
+												: sprintf(
+														/* translators: %s: a list of comma separated error messages */
+														__(
+															'Some errors occurred while deleting the items: %s'
+														),
+														[ ...errors ].join(
+															','
+														)
+												  );
+										},
+									},
+								},
+							};
+
+							await deletePostWithNotices( items, notice, {
+								onActionPerformed,
+							} );
+							setIsBusy( false );
+							closeModal?.();
+						} }
+						isBusy={ isBusy }
+						disabled={ isBusy }
+						accessibleWhenDisabled
+						__next40pxDefaultSize
+					>
+						{ __( 'Delete' ) }
+					</Button>
+				</HStack>
+			</VStack>
+		);
+	},
+};
+
+export default deletePostAction;
diff --git a/packages/fields/src/actions/duplicate-pattern.tsx b/packages/fields/src/actions/duplicate-pattern.tsx
new file mode 100644
index 00000000000000..bf2820f951dbad
--- /dev/null
+++ b/packages/fields/src/actions/duplicate-pattern.tsx
@@ -0,0 +1,40 @@
+/**
+ * WordPress dependencies
+ */
+import { _x } from '@wordpress/i18n';
+// @ts-ignore
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
+import type { Action } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../lock-unlock';
+import type { Pattern } from '../types';
+
+// Patterns.
+const { CreatePatternModalContents, useDuplicatePatternProps } =
+	unlock( patternsPrivateApis );
+
+const duplicatePattern: Action< Pattern > = {
+	id: 'duplicate-pattern',
+	label: _x( 'Duplicate', 'action label' ),
+	isEligible: ( item ) => item.type !== 'wp_template_part',
+	modalHeader: _x( 'Duplicate pattern', 'action label' ),
+	RenderModal: ( { items, closeModal } ) => {
+		const [ item ] = items;
+		const duplicatedProps = useDuplicatePatternProps( {
+			pattern: item,
+			onSuccess: () => closeModal?.(),
+		} );
+		return (
+			<CreatePatternModalContents
+				onClose={ closeModal }
+				confirmLabel={ _x( 'Duplicate', 'action label' ) }
+				{ ...duplicatedProps }
+			/>
+		);
+	},
+};
+
+export default duplicatePattern;
diff --git a/packages/fields/src/actions/duplicate-post.native.tsx b/packages/fields/src/actions/duplicate-post.native.tsx
new file mode 100644
index 00000000000000..5468aa649abbd4
--- /dev/null
+++ b/packages/fields/src/actions/duplicate-post.native.tsx
@@ -0,0 +1,3 @@
+const duplicatePost = undefined;
+
+export default duplicatePost;
diff --git a/packages/fields/src/actions/duplicate-post.tsx b/packages/fields/src/actions/duplicate-post.tsx
new file mode 100644
index 00000000000000..d153073f4b6c12
--- /dev/null
+++ b/packages/fields/src/actions/duplicate-post.tsx
@@ -0,0 +1,174 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch } from '@wordpress/data';
+import { decodeEntities } from '@wordpress/html-entities';
+import { store as coreStore } from '@wordpress/core-data';
+import { __, sprintf, _x } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import { useState } from '@wordpress/element';
+import { DataForm } from '@wordpress/dataviews';
+import {
+	Button,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import type { Action } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import { titleField } from '../fields';
+import type { BasePost, CoreDataError } from '../types';
+import { getItemTitle } from './utils';
+
+const fields = [ titleField ];
+const formDuplicateAction = {
+	fields: [ 'title' ],
+};
+
+const duplicatePost: Action< BasePost > = {
+	id: 'duplicate-post',
+	label: _x( 'Duplicate', 'action label' ),
+	isEligible( { status } ) {
+		return status !== 'trash';
+	},
+	RenderModal: ( { items, closeModal, onActionPerformed } ) => {
+		const [ item, setItem ] = useState< BasePost >( {
+			...items[ 0 ],
+			title: sprintf(
+				/* translators: %s: Existing template title */
+				__( '%s (Copy)' ),
+				getItemTitle( items[ 0 ] )
+			),
+		} );
+
+		const [ isCreatingPage, setIsCreatingPage ] = useState( false );
+		const { saveEntityRecord } = useDispatch( coreStore );
+		const { createSuccessNotice, createErrorNotice } =
+			useDispatch( noticesStore );
+
+		async function createPage( event: React.FormEvent ) {
+			event.preventDefault();
+
+			if ( isCreatingPage ) {
+				return;
+			}
+
+			const newItemOject = {
+				status: 'draft',
+				title: item.title,
+				slug: item.title || __( 'No title' ),
+				comment_status: item.comment_status,
+				content:
+					typeof item.content === 'string'
+						? item.content
+						: item.content.raw,
+				excerpt:
+					typeof item.excerpt === 'string'
+						? item.excerpt
+						: item.excerpt?.raw,
+				meta: item.meta,
+				parent: item.parent,
+				password: item.password,
+				template: item.template,
+				format: item.format,
+				featured_media: item.featured_media,
+				menu_order: item.menu_order,
+				ping_status: item.ping_status,
+			};
+			const assignablePropertiesPrefix = 'wp:action-assign-';
+			// Get all the properties that the current user is able to assign normally author, categories, tags,
+			// and custom taxonomies.
+			const assignableProperties = Object.keys( item?._links || {} )
+				.filter( ( property ) =>
+					property.startsWith( assignablePropertiesPrefix )
+				)
+				.map( ( property ) =>
+					property.slice( assignablePropertiesPrefix.length )
+				);
+			assignableProperties.forEach( ( property ) => {
+				if ( item.hasOwnProperty( property ) ) {
+					// @ts-ignore
+					newItemOject[ property ] = item[ property ];
+				}
+			} );
+			setIsCreatingPage( true );
+			try {
+				const newItem = await saveEntityRecord(
+					'postType',
+					item.type,
+					newItemOject,
+					{ throwOnError: true }
+				);
+
+				createSuccessNotice(
+					sprintf(
+						// translators: %s: Title of the created template e.g: "Category".
+						__( '"%s" successfully created.' ),
+						decodeEntities( newItem.title?.rendered || item.title )
+					),
+					{
+						id: 'duplicate-post-action',
+						type: 'snackbar',
+					}
+				);
+
+				if ( onActionPerformed ) {
+					onActionPerformed( [ newItem ] );
+				}
+			} catch ( error ) {
+				const typedError = error as CoreDataError;
+				const errorMessage =
+					typedError.message && typedError.code !== 'unknown_error'
+						? typedError.message
+						: __( 'An error occurred while duplicating the page.' );
+
+				createErrorNotice( errorMessage, {
+					type: 'snackbar',
+				} );
+			} finally {
+				setIsCreatingPage( false );
+				closeModal?.();
+			}
+		}
+
+		return (
+			<form onSubmit={ createPage }>
+				<VStack spacing={ 3 }>
+					<DataForm
+						data={ item }
+						fields={ fields }
+						form={ formDuplicateAction }
+						onChange={ ( changes ) =>
+							setItem( ( prev ) => ( {
+								...prev,
+								...changes,
+							} ) )
+						}
+					/>
+					<HStack spacing={ 2 } justify="end">
+						<Button
+							variant="tertiary"
+							onClick={ closeModal }
+							__next40pxDefaultSize
+						>
+							{ __( 'Cancel' ) }
+						</Button>
+						<Button
+							variant="primary"
+							type="submit"
+							isBusy={ isCreatingPage }
+							aria-disabled={ isCreatingPage }
+							__next40pxDefaultSize
+						>
+							{ _x( 'Duplicate', 'action label' ) }
+						</Button>
+					</HStack>
+				</VStack>
+			</form>
+		);
+	},
+};
+
+export default duplicatePost;
diff --git a/packages/fields/src/actions/export-pattern.native.tsx b/packages/fields/src/actions/export-pattern.native.tsx
new file mode 100644
index 00000000000000..c58cffcbd79e89
--- /dev/null
+++ b/packages/fields/src/actions/export-pattern.native.tsx
@@ -0,0 +1,3 @@
+const exportPattern = undefined;
+
+export default exportPattern;
diff --git a/packages/fields/src/actions/export-pattern.tsx b/packages/fields/src/actions/export-pattern.tsx
new file mode 100644
index 00000000000000..b6be83eeda84b4
--- /dev/null
+++ b/packages/fields/src/actions/export-pattern.tsx
@@ -0,0 +1,76 @@
+/**
+ * External dependencies
+ */
+import { paramCase as kebabCase } from 'change-case';
+import { downloadZip } from 'client-zip';
+
+/**
+ * WordPress dependencies
+ */
+import { downloadBlob } from '@wordpress/blob';
+import { __ } from '@wordpress/i18n';
+import { download } from '@wordpress/icons';
+import type { Action } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import type { Pattern } from '../types';
+import { getItemTitle } from './utils';
+
+function getJsonFromItem( item: Pattern ) {
+	return JSON.stringify(
+		{
+			__file: item.type,
+			title: getItemTitle( item ),
+			content:
+				typeof item.content === 'string'
+					? item.content
+					: item.content?.raw,
+			syncStatus: item.wp_pattern_sync_status,
+		},
+		null,
+		2
+	);
+}
+
+const exportPattern: Action< Pattern > = {
+	id: 'export-pattern',
+	label: __( 'Export as JSON' ),
+	icon: download,
+	supportsBulk: true,
+	isEligible: ( item ) => item.type === 'wp_block',
+	callback: async ( items ) => {
+		if ( items.length === 1 ) {
+			return downloadBlob(
+				`${ kebabCase(
+					getItemTitle( items[ 0 ] ) || items[ 0 ].slug
+				) }.json`,
+				getJsonFromItem( items[ 0 ] ),
+				'application/json'
+			);
+		}
+		const nameCount: Record< string, number > = {};
+		const filesToZip = items.map( ( item ) => {
+			const name = kebabCase( getItemTitle( item ) || item.slug );
+			nameCount[ name ] = ( nameCount[ name ] || 0 ) + 1;
+			return {
+				name: `${
+					name +
+					( nameCount[ name ] > 1
+						? '-' + ( nameCount[ name ] - 1 )
+						: '' )
+				}.json`,
+				lastModified: new Date(),
+				input: getJsonFromItem( item ),
+			};
+		} );
+		return downloadBlob(
+			__( 'patterns-export' ) + '.zip',
+			await downloadZip( filesToZip ).blob(),
+			'application/zip'
+		);
+	},
+};
+
+export default exportPattern;
diff --git a/packages/fields/src/actions/index.ts b/packages/fields/src/actions/index.ts
new file mode 100644
index 00000000000000..08e22836e68fd1
--- /dev/null
+++ b/packages/fields/src/actions/index.ts
@@ -0,0 +1,15 @@
+export { default as viewPost } from './view-post';
+export { default as reorderPage } from './reorder-page';
+export { default as reorderPageNative } from './reorder-page.native';
+export { default as duplicatePost } from './duplicate-post';
+export { default as duplicatePostNative } from './duplicate-post.native';
+export { default as renamePost } from './rename-post';
+export { default as resetPost } from './reset-post';
+export { default as duplicatePattern } from './duplicate-pattern';
+export { default as exportPattern } from './export-pattern';
+export { default as exportPatternNative } from './export-pattern.native';
+export { default as viewPostRevisions } from './view-post-revisions';
+export { default as permanentlyDeletePost } from './permanently-delete-post';
+export { default as restorePost } from './restore-post';
+export { default as trashPost } from './trash-post';
+export { default as deletePost } from './delete-post';
diff --git a/packages/fields/src/actions/permanently-delete-post.tsx b/packages/fields/src/actions/permanently-delete-post.tsx
new file mode 100644
index 00000000000000..afbb84ae12c74c
--- /dev/null
+++ b/packages/fields/src/actions/permanently-delete-post.tsx
@@ -0,0 +1,118 @@
+/**
+ * WordPress dependencies
+ */
+import { store as coreStore } from '@wordpress/core-data';
+import { __, sprintf } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import type { Action } from '@wordpress/dataviews';
+import { trash } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import { getItemTitle, isTemplateOrTemplatePart } from './utils';
+import type { CoreDataError, PostWithPermissions } from '../types';
+
+const permanentlyDeletePost: Action< PostWithPermissions > = {
+	id: 'permanently-delete',
+	label: __( 'Permanently delete' ),
+	supportsBulk: true,
+	icon: trash,
+	isEligible( item ) {
+		if ( isTemplateOrTemplatePart( item ) || item.type === 'wp_block' ) {
+			return false;
+		}
+		const { status, permissions } = item;
+		return status === 'trash' && permissions?.delete;
+	},
+	async callback( posts, { registry, onActionPerformed } ) {
+		const { createSuccessNotice, createErrorNotice } =
+			registry.dispatch( noticesStore );
+		const { deleteEntityRecord } = registry.dispatch( coreStore );
+		const promiseResult = await Promise.allSettled(
+			posts.map( ( post ) => {
+				return deleteEntityRecord(
+					'postType',
+					post.type,
+					post.id,
+					{ force: true },
+					{ throwOnError: true }
+				);
+			} )
+		);
+		// If all the promises were fulfilled with success.
+		if ( promiseResult.every( ( { status } ) => status === 'fulfilled' ) ) {
+			let successMessage;
+			if ( promiseResult.length === 1 ) {
+				successMessage = sprintf(
+					/* translators: The posts's title. */
+					__( '"%s" permanently deleted.' ),
+					getItemTitle( posts[ 0 ] )
+				);
+			} else {
+				successMessage = __( 'The items were permanently deleted.' );
+			}
+			createSuccessNotice( successMessage, {
+				type: 'snackbar',
+				id: 'permanently-delete-post-action',
+			} );
+			onActionPerformed?.( posts );
+		} else {
+			// If there was at lease one failure.
+			let errorMessage;
+			// If we were trying to permanently delete a single post.
+			if ( promiseResult.length === 1 ) {
+				const typedError = promiseResult[ 0 ] as {
+					reason?: CoreDataError;
+				};
+				if ( typedError.reason?.message ) {
+					errorMessage = typedError.reason.message;
+				} else {
+					errorMessage = __(
+						'An error occurred while permanently deleting the item.'
+					);
+				}
+				// If we were trying to permanently delete multiple posts
+			} else {
+				const errorMessages = new Set();
+				const failedPromises = promiseResult.filter(
+					( { status } ) => status === 'rejected'
+				);
+				for ( const failedPromise of failedPromises ) {
+					const typedError = failedPromise as {
+						reason?: CoreDataError;
+					};
+					if ( typedError.reason?.message ) {
+						errorMessages.add( typedError.reason.message );
+					}
+				}
+				if ( errorMessages.size === 0 ) {
+					errorMessage = __(
+						'An error occurred while permanently deleting the items.'
+					);
+				} else if ( errorMessages.size === 1 ) {
+					errorMessage = sprintf(
+						/* translators: %s: an error message */
+						__(
+							'An error occurred while permanently deleting the items: %s'
+						),
+						[ ...errorMessages ][ 0 ]
+					);
+				} else {
+					errorMessage = sprintf(
+						/* translators: %s: a list of comma separated error messages */
+						__(
+							'Some errors occurred while permanently deleting the items: %s'
+						),
+						[ ...errorMessages ].join( ',' )
+					);
+				}
+			}
+			createErrorNotice( errorMessage, {
+				type: 'snackbar',
+			} );
+		}
+	},
+};
+
+export default permanentlyDeletePost;
diff --git a/packages/fields/src/actions/rename-post.tsx b/packages/fields/src/actions/rename-post.tsx
new file mode 100644
index 00000000000000..da1fd46669f0df
--- /dev/null
+++ b/packages/fields/src/actions/rename-post.tsx
@@ -0,0 +1,145 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { __ } from '@wordpress/i18n';
+import { useState } from '@wordpress/element';
+// @ts-ignore
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
+import {
+	Button,
+	TextControl,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import type { Action } from '@wordpress/dataviews';
+import { store as noticesStore } from '@wordpress/notices';
+
+/**
+ * Internal dependencies
+ */
+
+import { unlock } from '../lock-unlock';
+import {
+	getItemTitle,
+	isTemplateRemovable,
+	isTemplate,
+	isTemplatePart,
+	TEMPLATE_ORIGINS,
+	TEMPLATE_PART_POST_TYPE,
+	TEMPLATE_POST_TYPE,
+} from './utils';
+import type { CoreDataError, PostWithPermissions } from '../types';
+
+// Patterns.
+const { PATTERN_TYPES } = unlock( patternsPrivateApis );
+
+const renamePost: Action< PostWithPermissions > = {
+	id: 'rename-post',
+	label: __( 'Rename' ),
+	isEligible( post ) {
+		if ( post.status === 'trash' ) {
+			return false;
+		}
+		// Templates, template parts and patterns have special checks for renaming.
+		if (
+			! [
+				TEMPLATE_POST_TYPE,
+				TEMPLATE_PART_POST_TYPE,
+				...Object.values( PATTERN_TYPES ),
+			].includes( post.type )
+		) {
+			return post.permissions?.update;
+		}
+
+		// In the case of templates, we can only rename custom templates.
+		if ( isTemplate( post ) ) {
+			return (
+				isTemplateRemovable( post ) &&
+				post.is_custom &&
+				post.permissions?.update
+			);
+		}
+
+		if ( isTemplatePart( post ) ) {
+			return (
+				post.source === TEMPLATE_ORIGINS.custom &&
+				! post?.has_theme_file &&
+				post.permissions?.update
+			);
+		}
+
+		return post.type === PATTERN_TYPES.user && post.permissions?.update;
+	},
+	RenderModal: ( { items, closeModal, onActionPerformed } ) => {
+		const [ item ] = items;
+		const [ title, setTitle ] = useState( () => getItemTitle( item ) );
+		const { editEntityRecord, saveEditedEntityRecord } =
+			useDispatch( coreStore );
+		const { createSuccessNotice, createErrorNotice } =
+			useDispatch( noticesStore );
+
+		async function onRename( event: React.FormEvent ) {
+			event.preventDefault();
+			try {
+				await editEntityRecord( 'postType', item.type, item.id, {
+					title,
+				} );
+				// Update state before saving rerenders the list.
+				setTitle( '' );
+				closeModal?.();
+				// Persist edited entity.
+				await saveEditedEntityRecord( 'postType', item.type, item.id, {
+					throwOnError: true,
+				} );
+				createSuccessNotice( __( 'Name updated' ), {
+					type: 'snackbar',
+				} );
+				onActionPerformed?.( items );
+			} catch ( error ) {
+				const typedError = error as CoreDataError;
+				const errorMessage =
+					typedError.message && typedError.code !== 'unknown_error'
+						? typedError.message
+						: __( 'An error occurred while updating the name' );
+				createErrorNotice( errorMessage, { type: 'snackbar' } );
+			}
+		}
+
+		return (
+			<form onSubmit={ onRename }>
+				<VStack spacing="5">
+					<TextControl
+						__nextHasNoMarginBottom
+						__next40pxDefaultSize
+						label={ __( 'Name' ) }
+						value={ title }
+						onChange={ setTitle }
+						required
+					/>
+					<HStack justify="right">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ () => {
+								closeModal?.();
+							} }
+						>
+							{ __( 'Cancel' ) }
+						</Button>
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							type="submit"
+						>
+							{ __( 'Save' ) }
+						</Button>
+					</HStack>
+				</VStack>
+			</form>
+		);
+	},
+};
+
+export default renamePost;
diff --git a/packages/fields/src/actions/reorder-page.native.tsx b/packages/fields/src/actions/reorder-page.native.tsx
new file mode 100644
index 00000000000000..61e4733b6c6bd9
--- /dev/null
+++ b/packages/fields/src/actions/reorder-page.native.tsx
@@ -0,0 +1,3 @@
+const reorderPage = undefined;
+
+export default reorderPage;
diff --git a/packages/fields/src/actions/reorder-page.tsx b/packages/fields/src/actions/reorder-page.tsx
new file mode 100644
index 00000000000000..1820884d8d8c73
--- /dev/null
+++ b/packages/fields/src/actions/reorder-page.tsx
@@ -0,0 +1,125 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { __ } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import { useState } from '@wordpress/element';
+import { DataForm, isItemValid } from '@wordpress/dataviews';
+import {
+	Button,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import type { Action, RenderModalProps } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import type { CoreDataError, BasePost } from '../types';
+import { orderField } from '../fields';
+
+const fields = [ orderField ];
+const formOrderAction = {
+	fields: [ 'menu_order' ],
+};
+
+function ReorderModal( {
+	items,
+	closeModal,
+	onActionPerformed,
+}: RenderModalProps< BasePost > ) {
+	const [ item, setItem ] = useState( items[ 0 ] );
+	const orderInput = item.menu_order;
+	const { editEntityRecord, saveEditedEntityRecord } =
+		useDispatch( coreStore );
+	const { createSuccessNotice, createErrorNotice } =
+		useDispatch( noticesStore );
+
+	async function onOrder( event: React.FormEvent ) {
+		event.preventDefault();
+
+		if ( ! isItemValid( item, fields, formOrderAction ) ) {
+			return;
+		}
+
+		try {
+			await editEntityRecord( 'postType', item.type, item.id, {
+				menu_order: orderInput,
+			} );
+			closeModal?.();
+			// Persist edited entity.
+			await saveEditedEntityRecord( 'postType', item.type, item.id, {
+				throwOnError: true,
+			} );
+			createSuccessNotice( __( 'Order updated.' ), {
+				type: 'snackbar',
+			} );
+			onActionPerformed?.( items );
+		} catch ( error ) {
+			const typedError = error as CoreDataError;
+			const errorMessage =
+				typedError.message && typedError.code !== 'unknown_error'
+					? typedError.message
+					: __( 'An error occurred while updating the order' );
+			createErrorNotice( errorMessage, {
+				type: 'snackbar',
+			} );
+		}
+	}
+	const isSaveDisabled = ! isItemValid( item, fields, formOrderAction );
+	return (
+		<form onSubmit={ onOrder }>
+			<VStack spacing="5">
+				<div>
+					{ __(
+						'Determines the order of pages. Pages with the same order value are sorted alphabetically. Negative order values are supported.'
+					) }
+				</div>
+				<DataForm
+					data={ item }
+					fields={ fields }
+					form={ formOrderAction }
+					onChange={ ( changes ) =>
+						setItem( {
+							...item,
+							...changes,
+						} )
+					}
+				/>
+				<HStack justify="right">
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ () => {
+							closeModal?.();
+						} }
+					>
+						{ __( 'Cancel' ) }
+					</Button>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						type="submit"
+						accessibleWhenDisabled
+						disabled={ isSaveDisabled }
+					>
+						{ __( 'Save' ) }
+					</Button>
+				</HStack>
+			</VStack>
+		</form>
+	);
+}
+
+const reorderPage: Action< BasePost > = {
+	id: 'order-pages',
+	label: __( 'Order' ),
+	isEligible( { status } ) {
+		return status !== 'trash';
+	},
+	RenderModal: ReorderModal,
+};
+
+export default reorderPage;
diff --git a/packages/fields/src/actions/reset-post.tsx b/packages/fields/src/actions/reset-post.tsx
new file mode 100644
index 00000000000000..105d7b283b8334
--- /dev/null
+++ b/packages/fields/src/actions/reset-post.tsx
@@ -0,0 +1,300 @@
+/**
+ * WordPress dependencies
+ */
+import { backup } from '@wordpress/icons';
+import { dispatch, select, useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { __, sprintf } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import { useState } from '@wordpress/element';
+// @ts-ignore
+import { parse, __unstableSerializeAndClean } from '@wordpress/blocks';
+import {
+	Button,
+	__experimentalText as Text,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import type { Action } from '@wordpress/dataviews';
+import { addQueryArgs } from '@wordpress/url';
+import apiFetch from '@wordpress/api-fetch';
+
+/**
+ * Internal dependencies
+ */
+import {
+	getItemTitle,
+	isTemplateOrTemplatePart,
+	TEMPLATE_ORIGINS,
+	TEMPLATE_POST_TYPE,
+} from './utils';
+import type { CoreDataError, Template, TemplatePart } from '../types';
+
+const isTemplateRevertable = (
+	templateOrTemplatePart: Template | TemplatePart
+) => {
+	if ( ! templateOrTemplatePart ) {
+		return false;
+	}
+
+	return (
+		templateOrTemplatePart.source === TEMPLATE_ORIGINS.custom &&
+		( Boolean( templateOrTemplatePart?.plugin ) ||
+			templateOrTemplatePart?.has_theme_file )
+	);
+};
+
+/**
+ *  Copied - pasted from https://github.com/WordPress/gutenberg/blob/bf1462ad37d4637ebbf63270b9c244b23c69e2a8/packages/editor/src/store/private-actions.js#L233-L365
+ *
+ * @param {Object}  template            The template to revert.
+ * @param {Object}  [options]
+ * @param {boolean} [options.allowUndo] Whether to allow the user to undo
+ *                                      reverting the template. Default true.
+ */
+const revertTemplate = async (
+	template: TemplatePart | Template,
+	{ allowUndo = true } = {}
+) => {
+	const noticeId = 'edit-site-template-reverted';
+	dispatch( noticesStore ).removeNotice( noticeId );
+	if ( ! isTemplateRevertable( template ) ) {
+		dispatch( noticesStore ).createErrorNotice(
+			__( 'This template is not revertable.' ),
+			{
+				type: 'snackbar',
+			}
+		);
+		return;
+	}
+
+	try {
+		const templateEntityConfig = select( coreStore ).getEntityConfig(
+			'postType',
+			template.type
+		);
+
+		if ( ! templateEntityConfig ) {
+			dispatch( noticesStore ).createErrorNotice(
+				__(
+					'The editor has encountered an unexpected error. Please reload.'
+				),
+				{ type: 'snackbar' }
+			);
+			return;
+		}
+
+		const fileTemplatePath = addQueryArgs(
+			`${ templateEntityConfig.baseURL }/${ template.id }`,
+			{ context: 'edit', source: template.origin }
+		);
+
+		const fileTemplate = ( await apiFetch( {
+			path: fileTemplatePath,
+		} ) ) as any;
+		if ( ! fileTemplate ) {
+			dispatch( noticesStore ).createErrorNotice(
+				__(
+					'The editor has encountered an unexpected error. Please reload.'
+				),
+				{ type: 'snackbar' }
+			);
+			return;
+		}
+
+		const serializeBlocks = ( { blocks: blocksForSerialization = [] } ) =>
+			__unstableSerializeAndClean( blocksForSerialization );
+
+		const edited = select( coreStore ).getEditedEntityRecord(
+			'postType',
+			template.type,
+			template.id
+		) as any;
+
+		// We are fixing up the undo level here to make sure we can undo
+		// the revert in the header toolbar correctly.
+		dispatch( coreStore ).editEntityRecord(
+			'postType',
+			template.type,
+			template.id,
+			{
+				content: serializeBlocks, // Required to make the `undo` behave correctly.
+				blocks: edited.blocks, // Required to revert the blocks in the editor.
+				source: 'custom', // required to avoid turning the editor into a dirty state
+			},
+			{
+				undoIgnore: true, // Required to merge this edit with the last undo level.
+			}
+		);
+
+		const blocks = parse( fileTemplate?.content?.raw );
+
+		dispatch( coreStore ).editEntityRecord(
+			'postType',
+			template.type,
+			fileTemplate.id,
+			{
+				content: serializeBlocks,
+				blocks,
+				source: 'theme',
+			}
+		);
+
+		if ( allowUndo ) {
+			const undoRevert = () => {
+				dispatch( coreStore ).editEntityRecord(
+					'postType',
+					template.type,
+					edited.id,
+					{
+						content: serializeBlocks,
+						blocks: edited.blocks,
+						source: 'custom',
+					}
+				);
+			};
+
+			dispatch( noticesStore ).createSuccessNotice(
+				__( 'Template reset.' ),
+				{
+					type: 'snackbar',
+					id: noticeId,
+					actions: [
+						{
+							label: __( 'Undo' ),
+							onClick: undoRevert,
+						},
+					],
+				}
+			);
+		}
+	} catch ( error: any ) {
+		const errorMessage =
+			error.message && error.code !== 'unknown_error'
+				? error.message
+				: __( 'Template revert failed. Please reload.' );
+
+		dispatch( noticesStore ).createErrorNotice( errorMessage, {
+			type: 'snackbar',
+		} );
+	}
+};
+
+const resetPostAction: Action< Template | TemplatePart > = {
+	id: 'reset-post',
+	label: __( 'Reset' ),
+	isEligible: ( item ) => {
+		return (
+			isTemplateOrTemplatePart( item ) &&
+			item?.source === TEMPLATE_ORIGINS.custom &&
+			( Boolean( item.type === 'wp_template' && item?.plugin ) ||
+				item?.has_theme_file )
+		);
+	},
+	icon: backup,
+	supportsBulk: true,
+	hideModalHeader: true,
+	RenderModal: ( { items, closeModal, onActionPerformed } ) => {
+		const [ isBusy, setIsBusy ] = useState( false );
+
+		const { saveEditedEntityRecord } = useDispatch( coreStore );
+		const { createSuccessNotice, createErrorNotice } =
+			useDispatch( noticesStore );
+		const onConfirm = async () => {
+			try {
+				for ( const template of items ) {
+					await revertTemplate( template, {
+						allowUndo: false,
+					} );
+					await saveEditedEntityRecord(
+						'postType',
+						template.type,
+						template.id
+					);
+				}
+				createSuccessNotice(
+					items.length > 1
+						? sprintf(
+								/* translators: The number of items. */
+								__( '%s items reset.' ),
+								items.length
+						  )
+						: sprintf(
+								/* translators: The template/part's name. */
+								__( '"%s" reset.' ),
+								getItemTitle( items[ 0 ] )
+						  ),
+					{
+						type: 'snackbar',
+						id: 'revert-template-action',
+					}
+				);
+			} catch ( error ) {
+				let fallbackErrorMessage;
+				if ( items[ 0 ].type === TEMPLATE_POST_TYPE ) {
+					fallbackErrorMessage =
+						items.length === 1
+							? __(
+									'An error occurred while reverting the template.'
+							  )
+							: __(
+									'An error occurred while reverting the templates.'
+							  );
+				} else {
+					fallbackErrorMessage =
+						items.length === 1
+							? __(
+									'An error occurred while reverting the template part.'
+							  )
+							: __(
+									'An error occurred while reverting the template parts.'
+							  );
+				}
+
+				const typedError = error as CoreDataError;
+				const errorMessage =
+					typedError.message && typedError.code !== 'unknown_error'
+						? typedError.message
+						: fallbackErrorMessage;
+
+				createErrorNotice( errorMessage, { type: 'snackbar' } );
+			}
+		};
+		return (
+			<VStack spacing="5">
+				<Text>
+					{ __( 'Reset to default and clear all customizations?' ) }
+				</Text>
+				<HStack justify="right">
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ closeModal }
+						disabled={ isBusy }
+						accessibleWhenDisabled
+					>
+						{ __( 'Cancel' ) }
+					</Button>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						onClick={ async () => {
+							setIsBusy( true );
+							await onConfirm();
+							onActionPerformed?.( items );
+							setIsBusy( false );
+							closeModal?.();
+						} }
+						isBusy={ isBusy }
+						disabled={ isBusy }
+						accessibleWhenDisabled
+					>
+						{ __( 'Reset' ) }
+					</Button>
+				</HStack>
+			</VStack>
+		);
+	},
+};
+
+export default resetPostAction;
diff --git a/packages/fields/src/actions/restore-post.tsx b/packages/fields/src/actions/restore-post.tsx
new file mode 100644
index 00000000000000..874eca91fee113
--- /dev/null
+++ b/packages/fields/src/actions/restore-post.tsx
@@ -0,0 +1,134 @@
+/**
+ * WordPress dependencies
+ */
+import { backup } from '@wordpress/icons';
+import { store as coreStore } from '@wordpress/core-data';
+import { __, sprintf } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import type { Action } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import { getItemTitle, isTemplateOrTemplatePart } from './utils';
+import type { CoreDataError, PostWithPermissions } from '../types';
+
+const restorePost: Action< PostWithPermissions > = {
+	id: 'restore',
+	label: __( 'Restore' ),
+	isPrimary: true,
+	icon: backup,
+	supportsBulk: true,
+	isEligible( item ) {
+		return (
+			! isTemplateOrTemplatePart( item ) &&
+			item.type !== 'wp_block' &&
+			item.status === 'trash' &&
+			item.permissions?.update
+		);
+	},
+	async callback( posts, { registry, onActionPerformed } ) {
+		const { createSuccessNotice, createErrorNotice } =
+			registry.dispatch( noticesStore );
+		const { editEntityRecord, saveEditedEntityRecord } =
+			registry.dispatch( coreStore );
+		await Promise.allSettled(
+			posts.map( ( post ) => {
+				return editEntityRecord( 'postType', post.type, post.id, {
+					status: 'draft',
+				} );
+			} )
+		);
+		const promiseResult = await Promise.allSettled(
+			posts.map( ( post ) => {
+				return saveEditedEntityRecord( 'postType', post.type, post.id, {
+					throwOnError: true,
+				} );
+			} )
+		);
+
+		if ( promiseResult.every( ( { status } ) => status === 'fulfilled' ) ) {
+			let successMessage;
+			if ( posts.length === 1 ) {
+				successMessage = sprintf(
+					/* translators: The number of posts. */
+					__( '"%s" has been restored.' ),
+					getItemTitle( posts[ 0 ] )
+				);
+			} else if ( posts[ 0 ].type === 'page' ) {
+				successMessage = sprintf(
+					/* translators: The number of posts. */
+					__( '%d pages have been restored.' ),
+					posts.length
+				);
+			} else {
+				successMessage = sprintf(
+					/* translators: The number of posts. */
+					__( '%d posts have been restored.' ),
+					posts.length
+				);
+			}
+			createSuccessNotice( successMessage, {
+				type: 'snackbar',
+				id: 'restore-post-action',
+			} );
+			if ( onActionPerformed ) {
+				onActionPerformed( posts );
+			}
+		} else {
+			// If there was at lease one failure.
+			let errorMessage;
+			// If we were trying to move a single post to the trash.
+			if ( promiseResult.length === 1 ) {
+				const typedError = promiseResult[ 0 ] as {
+					reason?: CoreDataError;
+				};
+				if ( typedError.reason?.message ) {
+					errorMessage = typedError.reason.message;
+				} else {
+					errorMessage = __(
+						'An error occurred while restoring the post.'
+					);
+				}
+				// If we were trying to move multiple posts to the trash
+			} else {
+				const errorMessages = new Set();
+				const failedPromises = promiseResult.filter(
+					( { status } ) => status === 'rejected'
+				);
+				for ( const failedPromise of failedPromises ) {
+					const typedError = failedPromise as {
+						reason?: CoreDataError;
+					};
+					if ( typedError.reason?.message ) {
+						errorMessages.add( typedError.reason.message );
+					}
+				}
+				if ( errorMessages.size === 0 ) {
+					errorMessage = __(
+						'An error occurred while restoring the posts.'
+					);
+				} else if ( errorMessages.size === 1 ) {
+					errorMessage = sprintf(
+						/* translators: %s: an error message */
+						__( 'An error occurred while restoring the posts: %s' ),
+						[ ...errorMessages ][ 0 ]
+					);
+				} else {
+					errorMessage = sprintf(
+						/* translators: %s: a list of comma separated error messages */
+						__(
+							'Some errors occurred while restoring the posts: %s'
+						),
+						[ ...errorMessages ].join( ',' )
+					);
+				}
+			}
+			createErrorNotice( errorMessage, {
+				type: 'snackbar',
+			} );
+		}
+	},
+};
+
+export default restorePost;
diff --git a/packages/fields/src/actions/trash-post.tsx b/packages/fields/src/actions/trash-post.tsx
new file mode 100644
index 00000000000000..befbfb0ee7ffba
--- /dev/null
+++ b/packages/fields/src/actions/trash-post.tsx
@@ -0,0 +1,198 @@
+/**
+ * WordPress dependencies
+ */
+import { trash } from '@wordpress/icons';
+import { useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { __, _n, sprintf, _x } from '@wordpress/i18n';
+import { store as noticesStore } from '@wordpress/notices';
+import { useState } from '@wordpress/element';
+import {
+	Button,
+	__experimentalText as Text,
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import type { Action } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import { getItemTitle, isTemplateOrTemplatePart } from './utils';
+import type { CoreDataError, PostWithPermissions } from '../types';
+
+const trashPost: Action< PostWithPermissions > = {
+	id: 'move-to-trash',
+	label: __( 'Move to trash' ),
+	isPrimary: true,
+	icon: trash,
+	isEligible( item ) {
+		if ( isTemplateOrTemplatePart( item ) || item.type === 'wp_block' ) {
+			return false;
+		}
+
+		return (
+			!! item.status &&
+			! [ 'auto-draft', 'trash' ].includes( item.status ) &&
+			item.permissions?.delete
+		);
+	},
+	supportsBulk: true,
+	hideModalHeader: true,
+	RenderModal: ( { items, closeModal, onActionPerformed } ) => {
+		const [ isBusy, setIsBusy ] = useState( false );
+		const { createSuccessNotice, createErrorNotice } =
+			useDispatch( noticesStore );
+		const { deleteEntityRecord } = useDispatch( coreStore );
+		return (
+			<VStack spacing="5">
+				<Text>
+					{ items.length === 1
+						? sprintf(
+								// translators: %s: The item's title.
+								__(
+									'Are you sure you want to move "%s" to the trash?'
+								),
+								getItemTitle( items[ 0 ] )
+						  )
+						: sprintf(
+								// translators: %d: The number of items (2 or more).
+								_n(
+									'Are you sure you want to move %d item to the trash ?',
+									'Are you sure you want to move %d items to the trash ?',
+									items.length
+								),
+								items.length
+						  ) }
+				</Text>
+				<HStack justify="right">
+					<Button
+						__next40pxDefaultSize
+						variant="tertiary"
+						onClick={ closeModal }
+						disabled={ isBusy }
+						accessibleWhenDisabled
+					>
+						{ __( 'Cancel' ) }
+					</Button>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						onClick={ async () => {
+							setIsBusy( true );
+							const promiseResult = await Promise.allSettled(
+								items.map( ( item ) =>
+									deleteEntityRecord(
+										'postType',
+										item.type,
+										item.id.toString(),
+										{},
+										{ throwOnError: true }
+									)
+								)
+							);
+							// If all the promises were fulfilled with success.
+							if (
+								promiseResult.every(
+									( { status } ) => status === 'fulfilled'
+								)
+							) {
+								let successMessage;
+								if ( promiseResult.length === 1 ) {
+									successMessage = sprintf(
+										/* translators: The item's title. */
+										__( '"%s" moved to the trash.' ),
+										getItemTitle( items[ 0 ] )
+									);
+								} else {
+									successMessage = sprintf(
+										/* translators: The number of items. */
+										_n(
+											'%s item moved to the trash.',
+											'%s items moved to the trash.',
+											items.length
+										),
+										items.length
+									);
+								}
+								createSuccessNotice( successMessage, {
+									type: 'snackbar',
+									id: 'move-to-trash-action',
+								} );
+							} else {
+								// If there was at least one failure.
+								let errorMessage;
+								// If we were trying to delete a single item.
+								if ( promiseResult.length === 1 ) {
+									const typedError = promiseResult[ 0 ] as {
+										reason?: CoreDataError;
+									};
+									if ( typedError.reason?.message ) {
+										errorMessage =
+											typedError.reason.message;
+									} else {
+										errorMessage = __(
+											'An error occurred while moving the item to the trash.'
+										);
+									}
+									// If we were trying to delete multiple items.
+								} else {
+									const errorMessages = new Set();
+									const failedPromises = promiseResult.filter(
+										( { status } ) => status === 'rejected'
+									);
+									for ( const failedPromise of failedPromises ) {
+										const typedError = failedPromise as {
+											reason?: CoreDataError;
+										};
+										if ( typedError.reason?.message ) {
+											errorMessages.add(
+												typedError.reason.message
+											);
+										}
+									}
+									if ( errorMessages.size === 0 ) {
+										errorMessage = __(
+											'An error occurred while moving the items to the trash.'
+										);
+									} else if ( errorMessages.size === 1 ) {
+										errorMessage = sprintf(
+											/* translators: %s: an error message */
+											__(
+												'An error occurred while moving the item to the trash: %s'
+											),
+											[ ...errorMessages ][ 0 ]
+										);
+									} else {
+										errorMessage = sprintf(
+											/* translators: %s: a list of comma separated error messages */
+											__(
+												'Some errors occurred while moving the items to the trash: %s'
+											),
+											[ ...errorMessages ].join( ',' )
+										);
+									}
+								}
+								createErrorNotice( errorMessage, {
+									type: 'snackbar',
+								} );
+							}
+							if ( onActionPerformed ) {
+								onActionPerformed( items );
+							}
+							setIsBusy( false );
+							closeModal?.();
+						} }
+						isBusy={ isBusy }
+						disabled={ isBusy }
+						accessibleWhenDisabled
+					>
+						{ _x( 'Trash', 'verb' ) }
+					</Button>
+				</HStack>
+			</VStack>
+		);
+	},
+};
+
+export default trashPost;
diff --git a/packages/fields/src/actions/utils.ts b/packages/fields/src/actions/utils.ts
new file mode 100644
index 00000000000000..14e8edae4be048
--- /dev/null
+++ b/packages/fields/src/actions/utils.ts
@@ -0,0 +1,66 @@
+/**
+ * WordPress dependencies
+ */
+import { decodeEntities } from '@wordpress/html-entities';
+
+/**
+ * Internal dependencies
+ */
+import type { Post, TemplatePart, Template } from '../types';
+
+export const TEMPLATE_POST_TYPE = 'wp_template';
+export const TEMPLATE_PART_POST_TYPE = 'wp_template_part';
+export const TEMPLATE_ORIGINS = {
+	custom: 'custom',
+	theme: 'theme',
+	plugin: 'plugin',
+};
+
+export function isTemplate( post: Post ): post is Template {
+	return post.type === TEMPLATE_POST_TYPE;
+}
+
+export function isTemplatePart( post: Post ): post is TemplatePart {
+	return post.type === TEMPLATE_PART_POST_TYPE;
+}
+
+export function isTemplateOrTemplatePart(
+	p: Post
+): p is Template | TemplatePart {
+	return p.type === TEMPLATE_POST_TYPE || p.type === TEMPLATE_PART_POST_TYPE;
+}
+
+export function getItemTitle( item: Post ) {
+	if ( typeof item.title === 'string' ) {
+		return decodeEntities( item.title );
+	}
+	if ( 'rendered' in item.title ) {
+		return decodeEntities( item.title.rendered );
+	}
+	if ( 'raw' in item.title ) {
+		return decodeEntities( item.title.raw );
+	}
+	return '';
+}
+
+/**
+ * Check if a template is removable.
+ *
+ * @param template The template entity to check.
+ * @return Whether the template is removable.
+ */
+export function isTemplateRemovable( template: Template | TemplatePart ) {
+	if ( ! template ) {
+		return false;
+	}
+	// In patterns list page we map the templates parts to a different object
+	// than the one returned from the endpoint. This is why we need to check for
+	// two props whether is custom or has a theme file.
+	return (
+		[ template.source, template.source ].includes(
+			TEMPLATE_ORIGINS.custom
+		) &&
+		! Boolean( template.type === 'wp_template' && template?.plugin ) &&
+		! template.has_theme_file
+	);
+}
diff --git a/packages/fields/src/actions/view-post-revisions.tsx b/packages/fields/src/actions/view-post-revisions.tsx
new file mode 100644
index 00000000000000..875b925b94f070
--- /dev/null
+++ b/packages/fields/src/actions/view-post-revisions.tsx
@@ -0,0 +1,47 @@
+/**
+ * WordPress dependencies
+ */
+import { addQueryArgs } from '@wordpress/url';
+import { __, sprintf } from '@wordpress/i18n';
+import type { Action } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import type { Post } from '../types';
+
+const viewPostRevisions: Action< Post > = {
+	id: 'view-post-revisions',
+	context: 'list',
+	label( items ) {
+		const revisionsCount =
+			items[ 0 ]._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0;
+		return sprintf(
+			/* translators: %s: number of revisions */
+			__( 'View revisions (%s)' ),
+			revisionsCount
+		);
+	},
+	isEligible( post ) {
+		if ( post.status === 'trash' ) {
+			return false;
+		}
+		const lastRevisionId =
+			post?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id ?? null;
+		const revisionsCount =
+			post?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0;
+		return !! lastRevisionId && revisionsCount > 1;
+	},
+	callback( posts, { onActionPerformed } ) {
+		const post = posts[ 0 ];
+		const href = addQueryArgs( 'revision.php', {
+			revision: post?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id,
+		} );
+		document.location.href = href;
+		if ( onActionPerformed ) {
+			onActionPerformed( posts );
+		}
+	},
+};
+
+export default viewPostRevisions;
diff --git a/packages/fields/src/actions/view-post.tsx b/packages/fields/src/actions/view-post.tsx
new file mode 100644
index 00000000000000..187faffafb5d3c
--- /dev/null
+++ b/packages/fields/src/actions/view-post.tsx
@@ -0,0 +1,30 @@
+/**
+ * WordPress dependencies
+ */
+import { external } from '@wordpress/icons';
+import { _x } from '@wordpress/i18n';
+import type { Action } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../types';
+
+const viewPost: Action< BasePost > = {
+	id: 'view-post',
+	label: _x( 'View', 'verb' ),
+	isPrimary: true,
+	icon: external,
+	isEligible( post ) {
+		return post.status !== 'trash';
+	},
+	callback( posts, { onActionPerformed } ) {
+		const post = posts[ 0 ];
+		window.open( post?.link, '_blank' );
+		if ( onActionPerformed ) {
+			onActionPerformed( posts );
+		}
+	},
+};
+
+export default viewPost;
diff --git a/packages/fields/src/fields/featured-image/featured-image-edit.tsx b/packages/fields/src/fields/featured-image/featured-image-edit.tsx
new file mode 100644
index 00000000000000..b0dc612cdcfa50
--- /dev/null
+++ b/packages/fields/src/fields/featured-image/featured-image-edit.tsx
@@ -0,0 +1,122 @@
+/**
+ * WordPress dependencies
+ */
+import { Button, __experimentalGrid as Grid } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { useCallback, useRef } from '@wordpress/element';
+// @ts-ignore
+import { MediaUpload } from '@wordpress/media-utils';
+import { lineSolid } from '@wordpress/icons';
+import { store as coreStore } from '@wordpress/core-data';
+import type { DataFormControlProps } from '@wordpress/dataviews';
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+import { __ } from '@wordpress/i18n';
+
+export const FeaturedImageEdit = ( {
+	data,
+	field,
+	onChange,
+}: DataFormControlProps< BasePost > ) => {
+	const { id } = field;
+
+	const value = field.getValue( { item: data } );
+
+	const media = useSelect(
+		( select ) => {
+			const { getEntityRecord } = select( coreStore );
+			return getEntityRecord( 'root', 'media', value );
+		},
+		[ value ]
+	);
+
+	const onChangeControl = useCallback(
+		( newValue: number ) =>
+			onChange( {
+				[ id ]: newValue,
+			} ),
+		[ id, onChange ]
+	);
+
+	const url = media?.source_url;
+	const title = media?.title?.rendered;
+	const ref = useRef( null );
+
+	return (
+		<fieldset className="fields-controls__featured-image">
+			<div className="fields-controls__featured-image-container">
+				<MediaUpload
+					onSelect={ ( selectedMedia: { id: number } ) => {
+						onChangeControl( selectedMedia.id );
+					} }
+					allowedTypes={ [ 'image' ] }
+					render={ ( { open }: { open: () => void } ) => {
+						return (
+							<div
+								ref={ ref }
+								role="button"
+								tabIndex={ -1 }
+								onClick={ () => {
+									open();
+								} }
+								onKeyDown={ open }
+							>
+								<Grid
+									rowGap={ 0 }
+									columnGap={ 8 }
+									templateColumns="24px 1fr 24px"
+								>
+									{ url && (
+										<>
+											<img
+												className="fields-controls__featured-image-image"
+												alt=""
+												width={ 24 }
+												height={ 24 }
+												src={ url }
+											/>
+											<span className="fields-controls__featured-image-title">
+												{ title }
+											</span>
+										</>
+									) }
+									{ ! url && (
+										<>
+											<span
+												className="fields-controls__featured-image-placeholder"
+												style={ {
+													width: '24px',
+													height: '24px',
+												} }
+											/>
+											<span className="fields-controls__featured-image-title">
+												{ __( 'Choose an image…' ) }
+											</span>
+										</>
+									) }
+									{ url && (
+										<>
+											<Button
+												size="small"
+												className="fields-controls__featured-image-remove-button"
+												icon={ lineSolid }
+												onClick={ (
+													event: React.MouseEvent< HTMLButtonElement >
+												) => {
+													event.stopPropagation();
+													onChangeControl( 0 );
+												} }
+											/>
+										</>
+									) }
+								</Grid>
+							</div>
+						);
+					} }
+				/>
+			</div>
+		</fieldset>
+	);
+};
diff --git a/packages/fields/src/fields/featured-image/featured-image-view.tsx b/packages/fields/src/fields/featured-image/featured-image-view.tsx
new file mode 100644
index 00000000000000..36793e6f2ff9ab
--- /dev/null
+++ b/packages/fields/src/fields/featured-image/featured-image-view.tsx
@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+import type { DataViewRenderFieldProps } from '@wordpress/dataviews';
+
+export const FeaturedImageView = ( {
+	item,
+}: DataViewRenderFieldProps< BasePost > ) => {
+	const mediaId = item.featured_media;
+
+	const media = useSelect(
+		( select ) => {
+			const { getEntityRecord } = select( coreStore );
+			return mediaId ? getEntityRecord( 'root', 'media', mediaId ) : null;
+		},
+		[ mediaId ]
+	);
+	const url = media?.source_url;
+
+	if ( url ) {
+		return (
+			<img
+				className="fields-controls__featured-image-image"
+				src={ url }
+				alt=""
+			/>
+		);
+	}
+
+	return <span className="fields-controls__featured-image-placeholder" />;
+};
diff --git a/packages/fields/src/fields/featured-image/index.ts b/packages/fields/src/fields/featured-image/index.ts
new file mode 100644
index 00000000000000..44f9a1b4064648
--- /dev/null
+++ b/packages/fields/src/fields/featured-image/index.ts
@@ -0,0 +1,24 @@
+/**
+ * WordPress dependencies
+ */
+import type { Field } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+import { __ } from '@wordpress/i18n';
+import { FeaturedImageEdit } from './featured-image-edit';
+import { FeaturedImageView } from './featured-image-view';
+
+const featuredImageField: Field< BasePost > = {
+	id: 'featured_media',
+	type: 'text',
+	label: __( 'Featured Image' ),
+	getValue: ( { item } ) => item.featured_media,
+	Edit: FeaturedImageEdit,
+	render: FeaturedImageView,
+	enableSorting: false,
+};
+
+export default featuredImageField;
diff --git a/packages/fields/src/fields/featured-image/style.scss b/packages/fields/src/fields/featured-image/style.scss
new file mode 100644
index 00000000000000..46d37960199ead
--- /dev/null
+++ b/packages/fields/src/fields/featured-image/style.scss
@@ -0,0 +1,95 @@
+.fields-controls__featured-image-placeholder {
+	border-radius: $radius-small;
+	box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
+	display: inline-block;
+	padding: 0;
+	background:
+		$white
+		linear-gradient(-45deg, transparent 48%, $gray-300 48%, $gray-300 52%, transparent 52%);
+}
+
+.fields-controls__featured-image-title {
+	width: 100%;
+	color: $gray-900;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.fields-controls__featured-image-image {
+	width: 100%;
+	height: 100%;
+	border-radius: $radius-small;
+	align-self: center;
+}
+
+.fields-controls__featured-image-container {
+	.fields-controls__featured-image-placeholder {
+		margin: 0;
+	}
+
+	span {
+		margin-right: auto;
+	}
+}
+
+fieldset.fields-controls__featured-image {
+	.fields-controls__featured-image-container {
+		border: $border-width solid $gray-300;
+		border-radius: $radius-small;
+		padding: 8px 12px;
+		cursor: pointer;
+		&:hover {
+			background-color: $gray-100;
+		}
+	}
+
+	.fields-controls__featured-image-placeholder {
+		width: 24px;
+		height: 24px;
+	}
+
+	span {
+		align-self: center;
+		text-align: start;
+		white-space: nowrap;
+	}
+
+	.fields-controls__featured-image-upload-button {
+		padding: 0;
+		height: fit-content;
+		&:hover,
+		&:focus {
+			border: 0;
+			color: unset;
+		}
+	}
+
+	.fields-controls__featured-image-remove-button {
+		place-self: end;
+	}
+}
+
+.dataforms-layouts-panel__field-control {
+	.fields-controls__featured-image-image {
+		width: 16px;
+		height: 16px;
+	}
+
+	.fields-controls__featured-image-placeholder {
+		width: 16px;
+		height: 16px;
+	}
+}
+
+.dataviews-view-table__cell-content-wrapper {
+	.fields-controls__featured-image-image {
+		width: 32px;
+		height: 32px;
+	}
+
+	.fields-controls__featured-image-placeholder {
+		width: 32px;
+		height: 32px;
+	}
+}
diff --git a/packages/fields/src/fields/index.ts b/packages/fields/src/fields/index.ts
new file mode 100644
index 00000000000000..24655a3d866cfd
--- /dev/null
+++ b/packages/fields/src/fields/index.ts
@@ -0,0 +1,4 @@
+export { default as slugField } from './slug';
+export { default as titleField } from './title';
+export { default as orderField } from './order';
+export { default as featuredImageField } from './featured-image';
diff --git a/packages/fields/src/fields/order/index.ts b/packages/fields/src/fields/order/index.ts
new file mode 100644
index 00000000000000..2fc0a216dcfa03
--- /dev/null
+++ b/packages/fields/src/fields/order/index.ts
@@ -0,0 +1,18 @@
+/**
+ * WordPress dependencies
+ */
+import type { Field } from '@wordpress/dataviews';
+import { __ } from '@wordpress/i18n';
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+
+const orderField: Field< BasePost > = {
+	type: 'integer',
+	id: 'menu_order',
+	label: __( 'Order' ),
+	description: __( 'Determines the order of pages.' ),
+};
+
+export default orderField;
diff --git a/packages/fields/src/fields/slug/index.ts b/packages/fields/src/fields/slug/index.ts
new file mode 100644
index 00000000000000..4e81996ceaa6e8
--- /dev/null
+++ b/packages/fields/src/fields/slug/index.ts
@@ -0,0 +1,23 @@
+/**
+ * WordPress dependencies
+ */
+import type { Field } from '@wordpress/dataviews';
+
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+import { __ } from '@wordpress/i18n';
+import SlugEdit from './slug-edit';
+import SlugView from './slug-view';
+
+const slugField: Field< BasePost > = {
+	id: 'slug',
+	type: 'text',
+	label: __( 'Slug' ),
+	getValue: ( { item } ) => item.slug,
+	Edit: SlugEdit,
+	render: SlugView,
+};
+
+export default slugField;
diff --git a/packages/fields/src/fields/slug/slug-edit.tsx b/packages/fields/src/fields/slug/slug-edit.tsx
new file mode 100644
index 00000000000000..aeb02ba42873b9
--- /dev/null
+++ b/packages/fields/src/fields/slug/slug-edit.tsx
@@ -0,0 +1,156 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	Button,
+	ExternalLink,
+	__experimentalInputControl as InputControl,
+	__experimentalInputControlPrefixWrapper as InputControlPrefixWrapper,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { copySmall } from '@wordpress/icons';
+import { useCopyToClipboard, useInstanceId } from '@wordpress/compose';
+import { useDispatch } from '@wordpress/data';
+import { useCallback, useEffect, useRef } from '@wordpress/element';
+import { store as noticesStore } from '@wordpress/notices';
+import { safeDecodeURIComponent } from '@wordpress/url';
+import type { DataFormControlProps } from '@wordpress/dataviews';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+
+const SlugEdit = ( {
+	field,
+	onChange,
+	data,
+}: DataFormControlProps< BasePost > ) => {
+	const { id } = field;
+
+	const slug = field.getValue( { item: data } ) ?? '';
+	const permalinkTemplate = data.permalink_template || '';
+	const PERMALINK_POSTNAME_REGEX = /%(?:postname|pagename)%/;
+	const [ prefix, suffix ] = permalinkTemplate.split(
+		PERMALINK_POSTNAME_REGEX
+	);
+	const permalinkPrefix = prefix;
+	const permalinkSuffix = suffix;
+	const isEditable = PERMALINK_POSTNAME_REGEX.test( permalinkTemplate );
+	const originalSlugRef = useRef( slug );
+	const slugToDisplay = slug || originalSlugRef.current;
+	const permalink = isEditable
+		? `${ permalinkPrefix }${ slugToDisplay }${ permalinkSuffix }`
+		: safeDecodeURIComponent( data.link || '' );
+
+	useEffect( () => {
+		if ( slug && originalSlugRef.current === undefined ) {
+			originalSlugRef.current = slug;
+		}
+	}, [ slug ] );
+
+	const onChangeControl = useCallback(
+		( newValue?: string ) =>
+			onChange( {
+				[ id ]: newValue,
+			} ),
+		[ id, onChange ]
+	);
+
+	const { createNotice } = useDispatch( noticesStore );
+
+	const copyButtonRef = useCopyToClipboard( permalink, () => {
+		createNotice( 'info', __( 'Copied Permalink to clipboard.' ), {
+			isDismissible: true,
+			type: 'snackbar',
+		} );
+	} );
+
+	const postUrlSlugDescriptionId =
+		'editor-post-url__slug-description-' + useInstanceId( SlugEdit );
+
+	return (
+		<fieldset className="fields-controls__slug">
+			{ isEditable && (
+				<VStack>
+					<VStack spacing="0px">
+						<span>
+							{ __(
+								'Customize the last part of the Permalink.'
+							) }
+						</span>
+						<ExternalLink href="https://wordpress.org/documentation/article/page-post-settings-sidebar/#permalink">
+							{ __( 'Learn more' ) }
+						</ExternalLink>
+					</VStack>
+					<InputControl
+						__next40pxDefaultSize
+						prefix={
+							<InputControlPrefixWrapper>
+								/
+							</InputControlPrefixWrapper>
+						}
+						suffix={
+							<Button
+								__next40pxDefaultSize
+								icon={ copySmall }
+								ref={ copyButtonRef }
+								label={ __( 'Copy' ) }
+							/>
+						}
+						label={ __( 'Link' ) }
+						hideLabelFromVision
+						value={ slug }
+						autoComplete="off"
+						spellCheck="false"
+						type="text"
+						className="fields-controls__slug-input"
+						onChange={ ( newValue?: string ) => {
+							onChangeControl( newValue );
+						} }
+						onBlur={ () => {
+							if ( slug === '' ) {
+								onChangeControl( originalSlugRef.current );
+							}
+						} }
+						aria-describedby={ postUrlSlugDescriptionId }
+						help={
+							<>
+								<p className="fields-controls__slug-help">
+									<span className="fields-controls__slug-help-visual-label">
+										{ __( 'Permalink:' ) }
+									</span>
+									<ExternalLink
+										className="fields-controls__slug-help-link"
+										href={ permalink }
+									>
+										<span className="fields-controls__slug-help-prefix">
+											{ permalinkPrefix }
+										</span>
+										<span className="fields-controls__slug-help-slug">
+											{ slugToDisplay }
+										</span>
+										<span className="fields-controls__slug-help-suffix">
+											{ permalinkSuffix }
+										</span>
+									</ExternalLink>
+								</p>
+							</>
+						}
+					/>
+				</VStack>
+			) }
+			{ ! isEditable && (
+				<ExternalLink
+					className="fields-controls__slug-help"
+					href={ permalink }
+				>
+					{ permalink }
+				</ExternalLink>
+			) }
+		</fieldset>
+	);
+};
+
+export default SlugEdit;
diff --git a/packages/fields/src/fields/slug/slug-view.tsx b/packages/fields/src/fields/slug/slug-view.tsx
new file mode 100644
index 00000000000000..dc17eae128d68a
--- /dev/null
+++ b/packages/fields/src/fields/slug/slug-view.tsx
@@ -0,0 +1,26 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect, useRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+
+const SlugView = ( { item }: { item: BasePost } ) => {
+	const slug = item.slug;
+	const originalSlugRef = useRef( slug );
+
+	useEffect( () => {
+		if ( slug && originalSlugRef.current === undefined ) {
+			originalSlugRef.current = slug;
+		}
+	}, [ slug ] );
+
+	const slugToDisplay = slug || originalSlugRef.current;
+
+	return `/${ slugToDisplay ?? '' }`;
+};
+
+export default SlugView;
diff --git a/packages/fields/src/fields/slug/style.scss b/packages/fields/src/fields/slug/style.scss
new file mode 100644
index 00000000000000..aad99b3731e9eb
--- /dev/null
+++ b/packages/fields/src/fields/slug/style.scss
@@ -0,0 +1,22 @@
+.fields-controls__slug {
+	.fields-controls__slug-external-icon {
+		margin-left: 5ch;
+	}
+
+	.fields-controls__slug-input input.components-input-control__input {
+		padding-inline-start: 0 !important;
+	}
+
+	.fields-controls__slug-help-link {
+		word-break: break-word;
+	}
+
+	.fields-controls__slug-help {
+		display: flex;
+		flex-direction: column;
+
+		.fields-controls__slug-help-slug {
+			font-weight: 600;
+		}
+	}
+}
diff --git a/packages/fields/src/fields/title/index.ts b/packages/fields/src/fields/title/index.ts
new file mode 100644
index 00000000000000..5332f476f8ff58
--- /dev/null
+++ b/packages/fields/src/fields/title/index.ts
@@ -0,0 +1,21 @@
+/**
+ * WordPress dependencies
+ */
+import type { Field } from '@wordpress/dataviews';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import type { BasePost } from '../../types';
+import { getItemTitle } from '../../actions/utils';
+
+const titleField: Field< BasePost > = {
+	type: 'text',
+	id: 'title',
+	label: __( 'Title' ),
+	placeholder: __( 'No title' ),
+	getValue: ( { item } ) => getItemTitle( item ),
+};
+
+export default titleField;
diff --git a/packages/fields/src/index.native.ts b/packages/fields/src/index.native.ts
new file mode 100644
index 00000000000000..33a26e3c2e6e27
--- /dev/null
+++ b/packages/fields/src/index.native.ts
@@ -0,0 +1,2 @@
+export * from './actions/duplicate-post.native';
+export * from './actions/reorder-page.native';
diff --git a/packages/fields/src/index.ts b/packages/fields/src/index.ts
new file mode 100644
index 00000000000000..4c721b85b61a40
--- /dev/null
+++ b/packages/fields/src/index.ts
@@ -0,0 +1,2 @@
+export * from './fields';
+export * from './actions';
diff --git a/packages/fields/src/lock-unlock.ts b/packages/fields/src/lock-unlock.ts
new file mode 100644
index 00000000000000..2b5dcc4a506311
--- /dev/null
+++ b/packages/fields/src/lock-unlock.ts
@@ -0,0 +1,9 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+		'@wordpress/fields'
+	);
diff --git a/packages/fields/src/mutation/index.ts b/packages/fields/src/mutation/index.ts
new file mode 100644
index 00000000000000..89df0f769f70ed
--- /dev/null
+++ b/packages/fields/src/mutation/index.ts
@@ -0,0 +1,184 @@
+/**
+ * WordPress dependencies
+ */
+import { store as noticesStore } from '@wordpress/notices';
+import { store as coreStore } from '@wordpress/core-data';
+import { dispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import type { CoreDataError, Post } from '../types';
+
+function getErrorMessagesFromPromises< T >(
+	allSettledResults: PromiseSettledResult< T >[]
+) {
+	const errorMessages = new Set< string >();
+	// If there was at lease one failure.
+	if ( allSettledResults.length === 1 ) {
+		const typedError = allSettledResults[ 0 ] as {
+			reason?: CoreDataError;
+		};
+		if ( typedError.reason?.message ) {
+			errorMessages.add( typedError.reason.message );
+		}
+	} else {
+		const failedPromises = allSettledResults.filter(
+			( { status } ) => status === 'rejected'
+		);
+		for ( const failedPromise of failedPromises ) {
+			const typedError = failedPromise as {
+				reason?: CoreDataError;
+			};
+			if ( typedError.reason?.message ) {
+				errorMessages.add( typedError.reason.message );
+			}
+		}
+	}
+	return errorMessages;
+}
+
+export type NoticeSettings< T extends Post > = {
+	success: {
+		id?: string;
+		type?: string;
+		messages: {
+			getMessage: ( posts: T ) => string;
+			getBatchMessage: ( posts: T[] ) => string;
+		};
+	};
+	error: {
+		id?: string;
+		type?: string;
+		messages: {
+			getMessage: ( errors: Set< string > ) => string;
+			getBatchMessage: ( errors: Set< string > ) => string;
+		};
+	};
+};
+
+export const deletePostWithNotices = async < T extends Post >(
+	posts: T[],
+	notice: NoticeSettings< T >,
+	callbacks: {
+		onActionPerformed?: ( posts: T[] ) => void;
+		onActionError?: () => void;
+	}
+) => {
+	const { createSuccessNotice, createErrorNotice } = dispatch( noticesStore );
+	const { deleteEntityRecord } = dispatch( coreStore );
+	const allSettledResults = await Promise.allSettled(
+		posts.map( ( post ) => {
+			return deleteEntityRecord(
+				'postType',
+				post.type,
+				post.id,
+				{ force: true },
+				{ throwOnError: true }
+			);
+		} )
+	);
+	// If all the promises were fulfilled with success.
+	if ( allSettledResults.every( ( { status } ) => status === 'fulfilled' ) ) {
+		let successMessage;
+		if ( allSettledResults.length === 1 ) {
+			successMessage = notice.success.messages.getMessage( posts[ 0 ] );
+		} else {
+			successMessage = notice.success.messages.getBatchMessage( posts );
+		}
+		createSuccessNotice( successMessage, {
+			type: notice.success.type ?? 'snackbar',
+			id: notice.success.id,
+		} );
+		callbacks.onActionPerformed?.( posts );
+	} else {
+		const errorMessages = getErrorMessagesFromPromises( allSettledResults );
+		let errorMessage = '';
+		if ( allSettledResults.length === 1 ) {
+			errorMessage = notice.error.messages.getMessage( errorMessages );
+		} else {
+			errorMessage =
+				notice.error.messages.getBatchMessage( errorMessages );
+		}
+
+		createErrorNotice( errorMessage, {
+			type: notice.error.type ?? 'snackbar',
+			id: notice.error.id,
+		} );
+		callbacks.onActionError?.();
+	}
+};
+
+export const editPostWithNotices = async < T extends Post >(
+	postsWithUpdates: {
+		originalPost: T;
+		changes: Partial< T >;
+	}[],
+	notice: NoticeSettings< T >,
+	callbacks: {
+		onActionPerformed?: ( posts: T[] ) => void;
+		onActionError?: () => void;
+	}
+) => {
+	const { createSuccessNotice, createErrorNotice } = dispatch( noticesStore );
+	const { editEntityRecord, saveEditedEntityRecord } = dispatch( coreStore );
+	await Promise.allSettled(
+		postsWithUpdates.map( ( post ) => {
+			return editEntityRecord(
+				'postType',
+				post.originalPost.type,
+				post.originalPost.id,
+				{
+					...post.changes,
+				}
+			);
+		} )
+	);
+	const allSettledResults = await Promise.allSettled(
+		postsWithUpdates.map( ( post ) => {
+			return saveEditedEntityRecord(
+				'postType',
+				post.originalPost.type,
+				post.originalPost.id,
+				{
+					throwOnError: true,
+				}
+			);
+		} )
+	);
+	// If all the promises were fulfilled with success.
+	if ( allSettledResults.every( ( { status } ) => status === 'fulfilled' ) ) {
+		let successMessage;
+		if ( allSettledResults.length === 1 ) {
+			successMessage = notice.success.messages.getMessage(
+				postsWithUpdates[ 0 ].originalPost
+			);
+		} else {
+			successMessage = notice.success.messages.getBatchMessage(
+				postsWithUpdates.map( ( post ) => post.originalPost )
+			);
+		}
+		createSuccessNotice( successMessage, {
+			type: notice.success.type ?? 'snackbar',
+			id: notice.success.id,
+		} );
+		callbacks.onActionPerformed?.(
+			postsWithUpdates.map( ( post ) => post.originalPost )
+		);
+	} else {
+		const errorMessages = getErrorMessagesFromPromises( allSettledResults );
+		let errorMessage = '';
+		if ( allSettledResults.length === 1 ) {
+			errorMessage = notice.error.messages.getMessage( errorMessages );
+		} else {
+			errorMessage =
+				notice.error.messages.getBatchMessage( errorMessages );
+		}
+
+		createErrorNotice( errorMessage, {
+			type: notice.error.type ?? 'snackbar',
+			id: notice.error.id,
+		} );
+		callbacks.onActionError?.();
+	}
+};
diff --git a/packages/fields/src/styles.scss b/packages/fields/src/styles.scss
new file mode 100644
index 00000000000000..cdb130337f1cd9
--- /dev/null
+++ b/packages/fields/src/styles.scss
@@ -0,0 +1 @@
+@import "./fields/slug/style.scss";
diff --git a/packages/fields/src/types.ts b/packages/fields/src/types.ts
new file mode 100644
index 00000000000000..d895195cb40af7
--- /dev/null
+++ b/packages/fields/src/types.ts
@@ -0,0 +1,88 @@
+type PostStatus =
+	| 'published'
+	| 'draft'
+	| 'pending'
+	| 'private'
+	| 'future'
+	| 'auto-draft'
+	| 'trash';
+
+export interface CommonPost {
+	status?: PostStatus;
+	title: string | { rendered: string } | { raw: string };
+	content: string | { raw: string; rendered: string };
+	type: string;
+	id: string | number;
+	blocks?: Object[];
+	_links?: Links;
+}
+
+interface Links {
+	'predecessor-version'?: { href: string; id: number }[];
+	'version-history'?: { href: string; count: number }[];
+	[ key: string ]: { href: string }[] | undefined;
+}
+
+export interface BasePost extends CommonPost {
+	comment_status?: 'open' | 'closed';
+	excerpt?: string | { raw: string; rendered: string };
+	meta?: Record< string, any >;
+	parent?: number;
+	password?: string;
+	template?: string;
+	format?: string;
+	featured_media?: number;
+	menu_order?: number;
+	ping_status?: 'open' | 'closed';
+	link?: string;
+	slug?: string;
+	permalink_template?: string;
+}
+
+export interface Template extends CommonPost {
+	type: 'wp_template';
+	is_custom: boolean;
+	source: string;
+	origin: string;
+	plugin?: string;
+	has_theme_file: boolean;
+	id: string;
+}
+
+export interface TemplatePart extends CommonPost {
+	type: 'wp_template_part';
+	source: string;
+	origin: string;
+	has_theme_file: boolean;
+	id: string;
+	area: string;
+	plugin?: string;
+}
+
+export interface Pattern extends CommonPost {
+	slug: string;
+	title: { raw: string };
+	wp_pattern_sync_status: string;
+}
+
+export type Post = Template | TemplatePart | Pattern | BasePost;
+
+export type PostWithPermissions = Post & {
+	permissions: {
+		delete: boolean;
+		update: boolean;
+	};
+};
+
+export interface PostType {
+	slug: string;
+	viewable: boolean;
+	supports?: {
+		'page-attributes'?: boolean;
+		title?: boolean;
+		revisions?: boolean;
+	};
+}
+
+// Will be unnecessary after typescript 5.0 upgrade.
+export type CoreDataError = { message?: string; code?: string };
diff --git a/packages/fields/tsconfig.json b/packages/fields/tsconfig.json
new file mode 100644
index 00000000000000..c553ee023993d0
--- /dev/null
+++ b/packages/fields/tsconfig.json
@@ -0,0 +1,31 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig.json",
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"declarationDir": "build-types",
+		"checkJs": false
+	},
+	"references": [
+		{ "path": "../api-fetch" },
+		{ "path": "../components" },
+		{ "path": "../compose" },
+		{ "path": "../data" },
+		{ "path": "../element" },
+		{ "path": "../i18n" },
+		{ "path": "../icons" },
+		{ "path": "../primitives" },
+		{ "path": "../private-apis" },
+		{ "path": "../warning" },
+		{ "path": "../url" },
+		{ "path": "../notices" },
+		{ "path": "../dataviews" },
+		{ "path": "../blob" },
+		{ "path": "../core-data" },
+		{ "path": "../hooks" },
+		{ "path": "../html-entities" },
+		{ "path": "../media-utils" },
+		{ "path": "../router" }
+	],
+	"include": [ "src" ]
+}
diff --git a/packages/format-library/.npmrc b/packages/format-library/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/format-library/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/format-library/CHANGELOG.md b/packages/format-library/CHANGELOG.md
index 19da743a909436..e2d931b4323745 100644
--- a/packages/format-library/CHANGELOG.md
+++ b/packages/format-library/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.35.0 (2024-05-16)
+
+## 4.34.0 (2024-05-02)
+
+## 4.33.0 (2024-04-19)
+
+## 4.32.0 (2024-04-03)
+
+## 4.31.0 (2024-03-21)
+
+## 4.30.0 (2024-03-06)
+
+## 4.29.0 (2024-02-21)
+
+## 4.28.0 (2024-02-09)
+
+## 4.27.0 (2024-01-24)
+
+## 4.26.0 (2024-01-10)
+
+## 4.25.0 (2023-12-13)
+
 ## 4.24.0 (2023-11-29)
 
 ## 4.23.0 (2023-11-16)
@@ -96,7 +144,7 @@
 
 ## 3.1.1 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/dom` and `@wordpress/keycodes` dependencies ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -104,7 +152,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -143,7 +191,7 @@
 
 ## 1.2.3 (2018-11-20)
 
-### Bug fixes
+### Bug Fixes
 
 -   Link URL validation now works correctly when a URL includes a fragment. Previously any URL containing a fragment failed validation.
 -   Link URL validation catches an incorrect number of forward slashes following a url using the http protocol.
@@ -154,7 +202,7 @@
 
 ## 1.2.0 (2018-11-12)
 
-## New Feature
+### New Features
 
 -   Add URL validation to links.
 
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
index 1f1ff7700a002e..e30ca517de794e 100644
--- a/packages/format-library/package.json
+++ b/packages/format-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/format-library",
-	"version": "4.24.0",
+	"version": "5.10.0",
 	"description": "Format library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,24 +19,26 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/data": "file:../data",
-		"@wordpress/element": "file:../element",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/rich-text": "file:../rich-text",
-		"@wordpress/url": "file:../url"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/element": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/rich-text": "*",
+		"@wordpress/url": "*"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -44,5 +46,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/format-library/src/default-formats.js b/packages/format-library/src/default-formats.js
index c94c347156ff0e..3ccfc92cb40c18 100644
--- a/packages/format-library/src/default-formats.js
+++ b/packages/format-library/src/default-formats.js
@@ -14,6 +14,7 @@ import { superscript } from './superscript';
 import { keyboard } from './keyboard';
 import { unknown } from './unknown';
 import { language } from './language';
+import { nonBreakingSpace } from './non-breaking-space';
 
 export default [
 	bold,
@@ -29,4 +30,5 @@ export default [
 	keyboard,
 	unknown,
 	language,
+	nonBreakingSpace,
 ];
diff --git a/packages/format-library/src/image/index.js b/packages/format-library/src/image/index.js
index 7bc7c954eea183..7f8e33550770d0 100644
--- a/packages/format-library/src/image/index.js
+++ b/packages/format-library/src/image/index.js
@@ -6,8 +6,11 @@ import {
 	SVG,
 	Popover,
 	Button,
-	__experimentalNumberControl as NumberControl,
+	ExternalLink,
 	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	__experimentalNumberControl as NumberControl,
+	TextareaControl,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
@@ -17,7 +20,6 @@ import {
 	RichTextToolbarButton,
 	MediaUploadCheck,
 } from '@wordpress/block-editor';
-import { keyboardReturn } from '@wordpress/icons';
 
 const ALLOWED_MEDIA_TYPES = [ 'image' ];
 
@@ -41,8 +43,11 @@ export const image = {
 };
 
 function InlineUI( { value, onChange, activeObjectAttributes, contentRef } ) {
-	const { style } = activeObjectAttributes;
-	const [ width, setWidth ] = useState( style?.replace( /\D/g, '' ) );
+	const { style, alt } = activeObjectAttributes;
+	const width = style?.replace( /\D/g, '' );
+	const [ editedWidth, setEditedWidth ] = useState( width );
+	const [ editedAlt, setEditedAlt ] = useState( alt );
+	const hasChanged = editedWidth !== width || editedAlt !== alt;
 	const popoverAnchor = useAnchor( {
 		editableContentElement: contentRef.current,
 		settings: image,
@@ -64,7 +69,8 @@ function InlineUI( { value, onChange, activeObjectAttributes, contentRef } ) {
 						type: name,
 						attributes: {
 							...activeObjectAttributes,
-							style: width ? `width: ${ width }px;` : '',
+							style: width ? `width: ${ editedWidth }px;` : '',
+							alt: editedAlt,
 						},
 					};
 
@@ -76,21 +82,54 @@ function InlineUI( { value, onChange, activeObjectAttributes, contentRef } ) {
 					event.preventDefault();
 				} }
 			>
-				<HStack alignment="bottom" spacing="0">
+				<VStack spacing={ 4 }>
 					<NumberControl
-						className="block-editor-format-toolbar__image-container-value"
+						__next40pxDefaultSize
 						label={ __( 'Width' ) }
-						value={ width }
+						value={ editedWidth }
 						min={ 1 }
-						onChange={ ( newWidth ) => setWidth( newWidth ) }
+						onChange={ ( newWidth ) => {
+							setEditedWidth( newWidth );
+						} }
 					/>
-					<Button
-						className="block-editor-format-toolbar__image-container-button"
-						icon={ keyboardReturn }
-						label={ __( 'Apply' ) }
-						type="submit"
+					<TextareaControl
+						label={ __( 'Alternative text' ) }
+						__nextHasNoMarginBottom
+						value={ editedAlt }
+						onChange={ ( newAlt ) => {
+							setEditedAlt( newAlt );
+						} }
+						help={
+							<>
+								<ExternalLink
+									href={
+										// translators: Localized tutorial, if one exists. W3C Web Accessibility Initiative link has list of existing translations.
+										__(
+											'https://www.w3.org/WAI/tutorials/images/decision-tree/'
+										)
+									}
+								>
+									{ __(
+										'Describe the purpose of the image.'
+									) }
+								</ExternalLink>
+								<br />
+								{ __( 'Leave empty if decorative.' ) }
+							</>
+						}
 					/>
-				</HStack>
+					<HStack justify="right">
+						<Button
+							disabled={ ! hasChanged }
+							accessibleWhenDisabled
+							variant="primary"
+							type="submit"
+							size="compact"
+						>
+							{ __( 'Apply' ) }
+						</Button>
+					</HStack>
+				</VStack>
 			</form>
 		</Popover>
 	);
@@ -104,56 +143,43 @@ function Edit( {
 	activeObjectAttributes,
 	contentRef,
 } ) {
-	const [ isModalOpen, setIsModalOpen ] = useState( false );
-
-	function openModal() {
-		setIsModalOpen( true );
-	}
-
-	function closeModal() {
-		setIsModalOpen( false );
-	}
-
 	return (
 		<MediaUploadCheck>
-			<RichTextToolbarButton
-				icon={
-					<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-						<Path d="M4 18.5h16V17H4v1.5zM16 13v1.5h4V13h-4zM5.1 15h7.8c.6 0 1.1-.5 1.1-1.1V6.1c0-.6-.5-1.1-1.1-1.1H5.1C4.5 5 4 5.5 4 6.1v7.8c0 .6.5 1.1 1.1 1.1zm.4-8.5h7V10l-1-1c-.3-.3-.8-.3-1 0l-1.6 1.5-1.2-.7c-.3-.2-.6-.2-.9 0l-1.3 1V6.5zm0 6.1l1.8-1.3 1.3.8c.3.2.7.2.9-.1l1.5-1.4 1.5 1.4v1.5h-7v-.9z" />
-					</SVG>
-				}
-				title={ title }
-				onClick={ openModal }
-				isActive={ isObjectActive }
+			<MediaUpload
+				allowedTypes={ ALLOWED_MEDIA_TYPES }
+				onSelect={ ( { id, url, alt, width: imgWidth } ) => {
+					onChange(
+						insertObject( value, {
+							type: name,
+							attributes: {
+								className: `wp-image-${ id }`,
+								style: `width: ${ Math.min(
+									imgWidth,
+									150
+								) }px;`,
+								url,
+								alt,
+							},
+						} )
+					);
+					onFocus();
+				} }
+				render={ ( { open } ) => (
+					<RichTextToolbarButton
+						icon={
+							<SVG
+								xmlns="http://www.w3.org/2000/svg"
+								viewBox="0 0 24 24"
+							>
+								<Path d="M4 18.5h16V17H4v1.5zM16 13v1.5h4V13h-4zM5.1 15h7.8c.6 0 1.1-.5 1.1-1.1V6.1c0-.6-.5-1.1-1.1-1.1H5.1C4.5 5 4 5.5 4 6.1v7.8c0 .6.5 1.1 1.1 1.1zm.4-8.5h7V10l-1-1c-.3-.3-.8-.3-1 0l-1.6 1.5-1.2-.7c-.3-.2-.6-.2-.9 0l-1.3 1V6.5zm0 6.1l1.8-1.3 1.3.8c.3.2.7.2.9-.1l1.5-1.4 1.5 1.4v1.5h-7v-.9z" />
+							</SVG>
+						}
+						title={ title }
+						onClick={ open }
+						isActive={ isObjectActive }
+					/>
+				) }
 			/>
-			{ isModalOpen && (
-				<MediaUpload
-					allowedTypes={ ALLOWED_MEDIA_TYPES }
-					onSelect={ ( { id, url, alt, width: imgWidth } ) => {
-						closeModal();
-						onChange(
-							insertObject( value, {
-								type: name,
-								attributes: {
-									className: `wp-image-${ id }`,
-									style: `width: ${ Math.min(
-										imgWidth,
-										150
-									) }px;`,
-									url,
-									alt,
-								},
-							} )
-						);
-						onFocus();
-					} }
-					onClose={ closeModal }
-					render={ ( { open } ) => {
-						open();
-						return null;
-					} }
-				/>
-			) }
 			{ isObjectActive && (
 				<InlineUI
 					value={ value }
diff --git a/packages/format-library/src/image/style.scss b/packages/format-library/src/image/style.scss
index 639d1ccc5961e2..1e0b922fdf4c8f 100644
--- a/packages/format-library/src/image/style.scss
+++ b/packages/format-library/src/image/style.scss
@@ -1,15 +1,8 @@
 .block-editor-format-toolbar__image-popover {
 	z-index: z-index(".block-editor-format-toolbar__image-popover");
 
-	.block-editor-format-toolbar__image-container-value {
-		margin: $grid-unit-10 - $border-width;
-		min-width: 150px;
-		max-width: 500px;
-	}
-
-	.block-editor-format-toolbar__image-container-button {
-		height: $grid-unit-10 * 4 - ($border-width * 2);
-		margin-bottom: $grid-unit-10;
-		margin-right: $grid-unit-10;
+	.block-editor-format-toolbar__image-container-content {
+		width: 260px;
+		padding: $grid-unit-20;
 	}
 }
diff --git a/packages/format-library/src/language/index.js b/packages/format-library/src/language/index.js
index d37d8d6dbd0cd8..6cfb8c4ad44927 100644
--- a/packages/format-library/src/language/index.js
+++ b/packages/format-library/src/language/index.js
@@ -13,6 +13,7 @@ import {
 	Button,
 	Popover,
 	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { applyFormat, removeFormat, useAnchor } from '@wordpress/rich-text';
@@ -78,7 +79,9 @@ function InlineLanguageUI( { value, contentRef, onChange, onClose } ) {
 			anchor={ popoverAnchor }
 			onClose={ onClose }
 		>
-			<form
+			<VStack
+				as="form"
+				spacing={ 4 }
 				className="block-editor-format-toolbar__language-container-content"
 				onSubmit={ ( event ) => {
 					event.preventDefault();
@@ -95,6 +98,8 @@ function InlineLanguageUI( { value, contentRef, onChange, onClose } ) {
 				} }
 			>
 				<TextControl
+					__next40pxDefaultSize
+					__nextHasNoMarginBottom
 					label={ title }
 					value={ lang }
 					onChange={ ( val ) => setLang( val ) }
@@ -103,6 +108,8 @@ function InlineLanguageUI( { value, contentRef, onChange, onClose } ) {
 					) }
 				/>
 				<SelectControl
+					__next40pxDefaultSize
+					__nextHasNoMarginBottom
 					label={ __( 'Text direction' ) }
 					value={ dir }
 					options={ [
@@ -119,12 +126,13 @@ function InlineLanguageUI( { value, contentRef, onChange, onClose } ) {
 				/>
 				<HStack alignment="right">
 					<Button
+						__next40pxDefaultSize
 						variant="primary"
 						type="submit"
 						text={ __( 'Apply' ) }
 					/>
 				</HStack>
-			</form>
+			</VStack>
 		</Popover>
 	);
 }
diff --git a/packages/format-library/src/link/index.js b/packages/format-library/src/link/index.js
index ab287daff19a73..508ed4655a6695 100644
--- a/packages/format-library/src/link/index.js
+++ b/packages/format-library/src/link/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useState } from '@wordpress/element';
+import { useState, useLayoutEffect, useEffect } from '@wordpress/element';
 import {
 	getTextContent,
 	applyFormat,
@@ -12,13 +12,13 @@ import {
 	insert,
 	create,
 } from '@wordpress/rich-text';
-import { isURL, isEmail } from '@wordpress/url';
+import { isURL, isEmail, isPhoneNumber } from '@wordpress/url';
 import {
 	RichTextToolbarButton,
 	RichTextShortcut,
 } from '@wordpress/block-editor';
 import { decodeEntities } from '@wordpress/html-entities';
-import { link as linkIcon, linkOff } from '@wordpress/icons';
+import { link as linkIcon } from '@wordpress/icons';
 import { speak } from '@wordpress/a11y';
 
 /**
@@ -40,33 +40,124 @@ function Edit( {
 } ) {
 	const [ addingLink, setAddingLink ] = useState( false );
 
-	function addLink() {
+	// We only need to store the button element that opened the popover. We can ignore the other states, as they will be handled by the onFocus prop to return to the rich text field.
+	const [ openedBy, setOpenedBy ] = useState( null );
+
+	useEffect( () => {
+		// When the link becomes inactive (i.e. isActive is false), reset the editingLink state
+		// and the creatingLink state. This means that if the Link UI is displayed and the link
+		// becomes inactive (e.g. used arrow keys to move cursor outside of link bounds), the UI will close.
+		if ( ! isActive ) {
+			setAddingLink( false );
+		}
+	}, [ isActive ] );
+
+	useLayoutEffect( () => {
+		const editableContentElement = contentRef.current;
+		if ( ! editableContentElement ) {
+			return;
+		}
+
+		function handleClick( event ) {
+			// There is a situation whereby there is an existing link in the rich text
+			// and the user clicks on the leftmost edge of that link and fails to activate
+			// the link format, but the click event still fires on the `<a>` element.
+			// This causes the `editingLink` state to be set to `true` and the link UI
+			// to be rendered in "creating" mode. We need to check isActive to see if
+			// we have an active link format.
+			const link = event.target.closest( '[contenteditable] a' );
+			if (
+				! link || // other formats (e.g. bold) may be nested within the link.
+				! isActive
+			) {
+				return;
+			}
+
+			setAddingLink( true );
+			setOpenedBy( {
+				el: link,
+				action: 'click',
+			} );
+		}
+
+		editableContentElement.addEventListener( 'click', handleClick );
+
+		return () => {
+			editableContentElement.removeEventListener( 'click', handleClick );
+		};
+	}, [ contentRef, isActive ] );
+
+	function addLink( target ) {
 		const text = getTextContent( slice( value ) );
 
-		if ( text && isURL( text ) && isValidHref( text ) ) {
+		if ( ! isActive && text && isURL( text ) && isValidHref( text ) ) {
 			onChange(
 				applyFormat( value, {
 					type: name,
 					attributes: { url: text },
 				} )
 			);
-		} else if ( text && isEmail( text ) ) {
+		} else if ( ! isActive && text && isEmail( text ) ) {
 			onChange(
 				applyFormat( value, {
 					type: name,
 					attributes: { url: `mailto:${ text }` },
 				} )
 			);
+		} else if ( ! isActive && text && isPhoneNumber( text ) ) {
+			onChange(
+				applyFormat( value, {
+					type: name,
+					attributes: { url: `tel:${ text.replace( /\D/g, '' ) }` },
+				} )
+			);
 		} else {
+			if ( target ) {
+				setOpenedBy( {
+					el: target,
+					action: null, // We don't need to distinguish between click or keyboard here
+				} );
+			}
 			setAddingLink( true );
 		}
 	}
 
-	function stopAddingLink( returnFocus = true ) {
+	/**
+	 * Runs when the popover is closed via escape keypress, unlinking the selected text,
+	 * but _not_ on a click outside the popover. onFocusOutside handles that.
+	 */
+	function stopAddingLink() {
+		// Don't let the click handler on the toolbar button trigger again.
+
+		// There are two places for us to return focus to on Escape keypress:
+		// 1. The rich text field.
+		// 2. The toolbar button.
+
+		// The toolbar button is the only one we need to handle returning focus to.
+		// Otherwise, we rely on the passed in onFocus to return focus to the rich text field.
+
+		// Close the popover
 		setAddingLink( false );
-		if ( returnFocus ) {
+
+		// Return focus to the toolbar button or the rich text field
+		if ( openedBy?.el?.tagName === 'BUTTON' ) {
+			openedBy.el.focus();
+		} else {
 			onFocus();
 		}
+		// Remove the openedBy state
+		setOpenedBy( null );
+	}
+
+	// Test for this:
+	// 1. Click on the link button
+	// 2. Click the Options button in the top right of header
+	// 3. Focus should be in the dropdown of the Options button
+	// 4. Press Escape
+	// 5. Focus should be on the Options button
+	function onFocusOutside() {
+		setAddingLink( false );
+		setOpenedBy( null );
 	}
 
 	function onRemoveFormat() {
@@ -74,49 +165,50 @@ function Edit( {
 		speak( __( 'Link removed.' ), 'assertive' );
 	}
 
+	// Only autofocus if we have clicked a link within the editor
+	const shouldAutoFocus = ! (
+		openedBy?.el?.tagName === 'A' && openedBy?.action === 'click'
+	);
+
+	const hasSelection = ! isCollapsed( value );
+
 	return (
 		<>
-			<RichTextShortcut type="primary" character="k" onUse={ addLink } />
+			{ hasSelection && (
+				<RichTextShortcut
+					type="primary"
+					character="k"
+					onUse={ addLink }
+				/>
+			) }
 			<RichTextShortcut
 				type="primaryShift"
 				character="k"
 				onUse={ onRemoveFormat }
 			/>
-			{ isActive && (
-				<RichTextToolbarButton
-					name="link"
-					icon={ linkOff }
-					title={ __( 'Unlink' ) }
-					onClick={ onRemoveFormat }
-					isActive={ isActive }
-					shortcutType="primaryShift"
-					shortcutCharacter="k"
-					aria-haspopup="true"
-					aria-expanded={ addingLink || isActive }
-				/>
-			) }
-			{ ! isActive && (
-				<RichTextToolbarButton
-					name="link"
-					icon={ linkIcon }
-					title={ title }
-					onClick={ addLink }
-					isActive={ isActive }
-					shortcutType="primary"
-					shortcutCharacter="k"
-					aria-haspopup="true"
-					aria-expanded={ addingLink || isActive }
-				/>
-			) }
-			{ ( addingLink || isActive ) && (
+			<RichTextToolbarButton
+				name="link"
+				icon={ linkIcon }
+				title={ isActive ? __( 'Link' ) : title }
+				onClick={ ( event ) => {
+					addLink( event.currentTarget );
+				} }
+				isActive={ isActive || addingLink }
+				shortcutType="primary"
+				shortcutCharacter="k"
+				aria-haspopup="true"
+				aria-expanded={ addingLink }
+			/>
+			{ addingLink && (
 				<InlineLinkUI
-					addingLink={ addingLink }
 					stopAddingLink={ stopAddingLink }
+					onFocusOutside={ onFocusOutside }
 					isActive={ isActive }
 					activeAttributes={ activeAttributes }
 					value={ value }
 					onChange={ onChange }
 					contentRef={ contentRef }
+					focusOnMount={ shouldAutoFocus ? 'firstElement' : false }
 				/>
 			) }
 		</>
diff --git a/packages/format-library/src/link/inline.js b/packages/format-library/src/link/inline.js
index 58da13eb51ab6b..3d2ee57567dc13 100644
--- a/packages/format-library/src/link/inline.js
+++ b/packages/format-library/src/link/inline.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useMemo, useRef, createInterpolateElement } from '@wordpress/element';
+import { useMemo, createInterpolateElement } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { speak } from '@wordpress/a11y';
 import { Popover } from '@wordpress/components';
@@ -11,25 +11,24 @@ import {
 	insert,
 	isCollapsed,
 	applyFormat,
-	useAnchor,
 	removeFormat,
 	slice,
 	replace,
 	split,
 	concat,
+	useAnchor,
 } from '@wordpress/rich-text';
 import {
 	__experimentalLinkControl as LinkControl,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { useSelect } from '@wordpress/data';
+import { useDispatch, useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import { createLinkFormat, isValidHref, getFormatBoundary } from './utils';
 import { link as settings } from './index';
-import useLinkInstanceKey from './use-link-instance-key';
 
 const LINK_SETTINGS = [
 	...LinkControl.DEFAULT_LINK_SETTINGS,
@@ -42,26 +41,34 @@ const LINK_SETTINGS = [
 function InlineLinkUI( {
 	isActive,
 	activeAttributes,
-	addingLink,
 	value,
 	onChange,
+	onFocusOutside,
 	stopAddingLink,
 	contentRef,
+	focusOnMount,
 } ) {
 	const richLinkTextValue = getRichTextValueFromSelection( value, isActive );
 
 	// Get the text content minus any HTML tags.
 	const richTextText = richLinkTextValue.text;
 
-	const { createPageEntity, userCanCreatePages } = useSelect( ( select ) => {
-		const { getSettings } = select( blockEditorStore );
-		const _settings = getSettings();
-
-		return {
-			createPageEntity: _settings.__experimentalCreatePageEntity,
-			userCanCreatePages: _settings.__experimentalUserCanCreatePages,
-		};
-	}, [] );
+	const { selectionChange } = useDispatch( blockEditorStore );
+
+	const { createPageEntity, userCanCreatePages, selectionStart } = useSelect(
+		( select ) => {
+			const { getSettings, getSelectionStart } =
+				select( blockEditorStore );
+			const _settings = getSettings();
+
+			return {
+				createPageEntity: _settings.__experimentalCreatePageEntity,
+				userCanCreatePages: _settings.__experimentalUserCanCreatePages,
+				selectionStart: getSelectionStart(),
+			};
+		},
+		[]
+	);
 
 	const linkValue = useMemo(
 		() => ( {
@@ -90,12 +97,9 @@ function InlineLinkUI( {
 	}
 
 	function onChangeLink( nextValue ) {
-		// LinkControl calls `onChange` immediately upon the toggling a setting.
-		// Before merging the next value with the current link value, check if
-		// the setting was toggled.
-		const didToggleSetting =
-			linkValue.opensInNewTab !== nextValue.opensInNewTab &&
-			nextValue.url === undefined;
+		const hasLink = linkValue?.url;
+		const isNewLink = ! hasLink;
+
 		// Merge the next value with the current link value.
 		nextValue = {
 			...linkValue,
@@ -116,78 +120,84 @@ function InlineLinkUI( {
 
 		const newText = nextValue.title || newUrl;
 
+		// Scenario: we have any active text selection or an active format.
+		let newValue;
 		if ( isCollapsed( value ) && ! isActive ) {
 			// Scenario: we don't have any actively selected text or formats.
-			const toInsert = applyFormat(
-				create( { text: newText } ),
+			const inserted = insert( value, newText );
+
+			newValue = applyFormat(
+				inserted,
 				linkFormat,
-				0,
-				newText.length
+				value.start,
+				value.start + newText.length
 			);
-			onChange( insert( value, toInsert ) );
-		} else {
-			// Scenario: we have any active text selection or an active format.
-			let newValue;
-
-			if ( newText === richTextText ) {
-				// If we're not updating the text then ignore.
-				newValue = applyFormat( value, linkFormat );
-			} else {
-				// Create new RichText value for the new text in order that we
-				// can apply formats to it.
-				newValue = create( { text: newText } );
-
-				// Apply the new Link format to this new text value.
-				newValue = applyFormat(
-					newValue,
-					linkFormat,
-					0,
-					newText.length
-				);
-
-				// Get the boundaries of the active link format.
-				const boundary = getFormatBoundary( value, {
-					type: 'core/link',
-				} );
-
-				// Split the value at the start of the active link format.
-				// Passing "start" as the 3rd parameter is required to ensure
-				// the second half of the split value is split at the format's
-				// start boundary and avoids relying on the value's "end" property
-				// which may not correspond correctly.
-				const [ valBefore, valAfter ] = split(
-					value,
-					boundary.start,
-					boundary.start
-				);
-
-				// Update the original (full) RichTextValue replacing the
-				// target text with the *new* RichTextValue containing:
-				// 1. The new text content.
-				// 2. The new link format.
-				// As "replace" will operate on the first match only, it is
-				// run only against the second half of the value which was
-				// split at the active format's boundary. This avoids a bug
-				// with incorrectly targetted replacements.
-				// See: https://github.com/WordPress/gutenberg/issues/41771.
-				// Note original formats will be lost when applying this change.
-				// That is expected behaviour.
-				// See: https://github.com/WordPress/gutenberg/pull/33849#issuecomment-936134179.
-				const newValAfter = replace( valAfter, richTextText, newValue );
-
-				newValue = concat( valBefore, newValAfter );
-			}
-
-			newValue.start = newValue.end;
-
-			// Hides the Link UI.
-			newValue.activeFormats = [];
+
 			onChange( newValue );
+
+			// Close the Link UI.
+			stopAddingLink();
+
+			// Move the selection to the end of the inserted link outside of the format boundary
+			// so the user can continue typing after the link.
+			selectionChange( {
+				clientId: selectionStart.clientId,
+				identifier: selectionStart.attributeKey,
+				start: value.start + newText.length + 1,
+			} );
+
+			return;
+		} else if ( newText === richTextText ) {
+			newValue = applyFormat( value, linkFormat );
+		} else {
+			// Scenario: Editing an existing link.
+
+			// Create new RichText value for the new text in order that we
+			// can apply formats to it.
+			newValue = create( { text: newText } );
+			// Apply the new Link format to this new text value.
+			newValue = applyFormat( newValue, linkFormat, 0, newText.length );
+
+			// Get the boundaries of the active link format.
+			const boundary = getFormatBoundary( value, {
+				type: 'core/link',
+			} );
+
+			// Split the value at the start of the active link format.
+			// Passing "start" as the 3rd parameter is required to ensure
+			// the second half of the split value is split at the format's
+			// start boundary and avoids relying on the value's "end" property
+			// which may not correspond correctly.
+			const [ valBefore, valAfter ] = split(
+				value,
+				boundary.start,
+				boundary.start
+			);
+
+			// Update the original (full) RichTextValue replacing the
+			// target text with the *new* RichTextValue containing:
+			// 1. The new text content.
+			// 2. The new link format.
+			// As "replace" will operate on the first match only, it is
+			// run only against the second half of the value which was
+			// split at the active format's boundary. This avoids a bug
+			// with incorrectly targetted replacements.
+			// See: https://github.com/WordPress/gutenberg/issues/41771.
+			// Note original formats will be lost when applying this change.
+			// That is expected behaviour.
+			// See: https://github.com/WordPress/gutenberg/pull/33849#issuecomment-936134179.
+			const newValAfter = replace( valAfter, richTextText, newValue );
+
+			newValue = concat( valBefore, newValAfter );
 		}
 
-		// Focus should only be shifted back to the formatted segment when the
-		// URL is submitted.
-		if ( ! didToggleSetting ) {
+		onChange( newValue );
+
+		// Focus should only be returned to the rich text on submit if this link is not
+		// being created for the first time. If it is then focus should remain within the
+		// Link UI because it should remain open for the user to modify the link they have
+		// just created.
+		if ( ! isNewLink ) {
 			stopAddingLink();
 		}
 
@@ -207,23 +217,12 @@ function InlineLinkUI( {
 
 	const popoverAnchor = useAnchor( {
 		editableContentElement: contentRef.current,
-		settings,
+		settings: {
+			...settings,
+			isActive,
+		},
 	} );
 
-	// Generate a string based key that is unique to this anchor reference.
-	// This is used to force re-mount the LinkControl component to avoid
-	// potential stale state bugs caused by the component not being remounted
-	// See https://github.com/WordPress/gutenberg/pull/34742.
-	const forceRemountKey = useLinkInstanceKey( popoverAnchor );
-
-	// Focus should only be moved into the Popover when the Link is being created or edited.
-	// When the Link is in "preview" mode focus should remain on the rich text because at
-	// this point the Link dialog is informational only and thus the user should be able to
-	// continue editing the rich text.
-	// Ref used because the focusOnMount prop shouldn't evolve during render of a Popover
-	// otherwise it causes a render of the content.
-	const focusOnMount = useRef( addingLink ? 'firstElement' : false );
-
 	async function handleCreate( pageTitle ) {
 		const page = await createPageEntity( {
 			title: pageTitle,
@@ -253,24 +252,34 @@ function InlineLinkUI( {
 	return (
 		<Popover
 			anchor={ popoverAnchor }
-			focusOnMount={ focusOnMount.current }
+			animate={ false }
 			onClose={ stopAddingLink }
-			onFocusOutside={ () => stopAddingLink( false ) }
+			onFocusOutside={ onFocusOutside }
 			placement="bottom"
+			offset={ 8 }
 			shift
+			focusOnMount={ focusOnMount }
+			constrainTabbing
 		>
 			<LinkControl
-				key={ forceRemountKey }
 				value={ linkValue }
 				onChange={ onChangeLink }
 				onRemove={ removeLink }
-				forceIsEditingLink={ addingLink }
 				hasRichPreviews
 				createSuggestion={ createPageEntity && handleCreate }
 				withCreateSuggestion={ userCanCreatePages }
 				createSuggestionButtonText={ createButtonText }
 				hasTextControl
 				settings={ LINK_SETTINGS }
+				showInitialSuggestions
+				suggestionsQuery={ {
+					// always show Pages as initial suggestions
+					initialSuggestionsSearchOptions: {
+						type: 'post',
+						subtype: 'page',
+						perPage: 20,
+					},
+				} }
 			/>
 		</Popover>
 	);
diff --git a/packages/format-library/src/link/modal-screens/link-settings-screen.native.js b/packages/format-library/src/link/modal-screens/link-settings-screen.native.js
index 3bb003643ac1e7..4e7f6ef30ace7b 100644
--- a/packages/format-library/src/link/modal-screens/link-settings-screen.native.js
+++ b/packages/format-library/src/link/modal-screens/link-settings-screen.native.js
@@ -211,12 +211,12 @@ const LinkSettingsScreen = ( {
 							label={ __( 'Open in new tab' ) }
 							value={ opensInNewWindow }
 							onValueChange={ setOpensInNewWindows }
-							separatorType={ 'fullWidth' }
+							separatorType="fullWidth"
 						/>
 						<BottomSheet.Cell
 							label={ __( 'Remove link' ) }
 							labelStyle={ styles.clearLinkButton }
-							separatorType={ 'none' }
+							separatorType="none"
 							onPress={ removeLink }
 						/>
 					</>
diff --git a/packages/format-library/src/link/style.scss b/packages/format-library/src/link/style.scss
index 05f8f5a40668e4..05eb576fe26e27 100644
--- a/packages/format-library/src/link/style.scss
+++ b/packages/format-library/src/link/style.scss
@@ -1,5 +1,6 @@
 .block-editor-format-toolbar__link-container-content {
 	display: flex;
+	align-items: center;
 }
 
 .block-editor-format-toolbar__link-container-value {
diff --git a/packages/format-library/src/link/test/__snapshots__/modal.native.js.snap b/packages/format-library/src/link/test/__snapshots__/modal.native.js.snap
index 12d7ac6d30136f..91c3b43d85f754 100644
--- a/packages/format-library/src/link/test/__snapshots__/modal.native.js.snap
+++ b/packages/format-library/src/link/test/__snapshots__/modal.native.js.snap
@@ -7,6 +7,7 @@ exports[`LinksUI LinksUI renders 1`] = `
   backdropOpacity={0.2}
   backdropTransitionInTiming={50}
   backdropTransitionOutTiming={50}
+  hardwareAccelerated={true}
   isVisible={true}
   onAccessibilityEscape={[Function]}
   onBackButtonPress={[Function]}
@@ -18,6 +19,7 @@ exports[`LinksUI LinksUI renders 1`] = `
   preferredColorScheme="light"
   swipeDirection="down"
   testID="link-settings-modal"
+  useNativeDriverForBackdrop={true}
 >
   <View
     behavior={false}
@@ -86,7 +88,6 @@ exports[`LinksUI LinksUI renders 1`] = `
             >
               <View
                 collapsable={false}
-                forwardedRef={[Function]}
                 pointerEvents="box-none"
                 style={
                   {
@@ -176,7 +177,6 @@ exports[`LinksUI LinksUI renders 1`] = `
                   >
                     <View
                       collapsable={false}
-                      forwardedRef={[Function]}
                       handlerTag={1}
                       handlerType="PanGestureHandler"
                       needsOffscreenAlphaCompositing={true}
diff --git a/packages/format-library/src/link/utils.js b/packages/format-library/src/link/utils.js
index 12fc56f2420313..314c8118713a43 100644
--- a/packages/format-library/src/link/utils.js
+++ b/packages/format-library/src/link/utils.js
@@ -102,8 +102,12 @@ export function createLinkFormat( {
 		},
 	};
 
-	if ( type ) format.attributes.type = type;
-	if ( id ) format.attributes.id = id;
+	if ( type ) {
+		format.attributes.type = type;
+	}
+	if ( id ) {
+		format.attributes.id = id;
+	}
 
 	if ( opensInNewWindow ) {
 		format.attributes.target = '_blank';
diff --git a/packages/format-library/src/lock-unlock.js b/packages/format-library/src/lock-unlock.js
new file mode 100644
index 00000000000000..e0effa2b829ee0
--- /dev/null
+++ b/packages/format-library/src/lock-unlock.js
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+		'@wordpress/format-library'
+	);
diff --git a/packages/format-library/src/non-breaking-space/index.js b/packages/format-library/src/non-breaking-space/index.js
new file mode 100644
index 00000000000000..829b0960f28a92
--- /dev/null
+++ b/packages/format-library/src/non-breaking-space/index.js
@@ -0,0 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { insert } from '@wordpress/rich-text';
+import { RichTextShortcut } from '@wordpress/block-editor';
+
+const name = 'core/non-breaking-space';
+const title = __( 'Non breaking space' );
+
+export const nonBreakingSpace = {
+	name,
+	title,
+	tagName: 'nbsp',
+	className: null,
+	edit( { value, onChange } ) {
+		function addNonBreakingSpace() {
+			onChange( insert( value, '\u00a0' ) );
+		}
+
+		return (
+			<RichTextShortcut
+				type="primaryShift"
+				character=" "
+				onUse={ addNonBreakingSpace }
+			/>
+		);
+	},
+};
diff --git a/packages/format-library/src/text-color/index.js b/packages/format-library/src/text-color/index.js
index 8a28cb69549cdc..9d8241544760bf 100644
--- a/packages/format-library/src/text-color/index.js
+++ b/packages/format-library/src/text-color/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useCallback, useMemo, useState } from '@wordpress/element';
+import { useMemo, useState } from '@wordpress/element';
 import { RichTextToolbarButton, useSettings } from '@wordpress/block-editor';
 import {
 	Icon,
@@ -66,21 +66,13 @@ function TextColorEdit( {
 		'color.palette'
 	);
 	const [ isAddingColor, setIsAddingColor ] = useState( false );
-	const enableIsAddingColor = useCallback(
-		() => setIsAddingColor( true ),
-		[ setIsAddingColor ]
-	);
-	const disableIsAddingColor = useCallback(
-		() => setIsAddingColor( false ),
-		[ setIsAddingColor ]
-	);
 	const colorIndicatorStyle = useMemo(
 		() =>
 			fillComputedColors(
 				contentRef.current,
 				getActiveColors( value, name, colors )
 			),
-		[ value, colors ]
+		[ contentRef, value, colors ]
 	);
 
 	const hasColorsToChoose = colors.length || ! allowCustomControl;
@@ -107,7 +99,7 @@ function TextColorEdit( {
 				// If has no colors to choose but a color is active remove the color onClick.
 				onClick={
 					hasColorsToChoose
-						? enableIsAddingColor
+						? () => setIsAddingColor( true )
 						: () => onChange( removeFormat( value, name ) )
 				}
 				role="menuitemcheckbox"
@@ -115,11 +107,12 @@ function TextColorEdit( {
 			{ isAddingColor && (
 				<InlineColorUI
 					name={ name }
-					onClose={ disableIsAddingColor }
+					onClose={ () => setIsAddingColor( false ) }
 					activeAttributes={ activeAttributes }
 					value={ value }
 					onChange={ onChange }
 					contentRef={ contentRef }
+					isActive={ isActive }
 				/>
 			) }
 		</>
diff --git a/packages/format-library/src/text-color/index.native.js b/packages/format-library/src/text-color/index.native.js
index c19f2a3700ea7f..a9b62df7853e25 100644
--- a/packages/format-library/src/text-color/index.native.js
+++ b/packages/format-library/src/text-color/index.native.js
@@ -7,13 +7,13 @@ import { StyleSheet, View } from 'react-native';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useCallback, useMemo, useState } from '@wordpress/element';
-import { BlockControls, useSettings } from '@wordpress/block-editor';
+import { useMemo, useState } from '@wordpress/element';
 import {
-	ToolbarGroup,
-	ToolbarButton,
+	BlockControls,
+	useSettings,
 	useMobileGlobalStylesColors,
-} from '@wordpress/components';
+} from '@wordpress/block-editor';
+import { ToolbarGroup, ToolbarButton } from '@wordpress/components';
 import {
 	Icon,
 	color as colorIcon,
@@ -25,7 +25,7 @@ import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
-import { getActiveColors } from './inline.js';
+import { getActiveColors } from './inline.native.js';
 import { default as InlineColorUI } from './inline';
 import styles from './style.scss';
 
@@ -72,33 +72,17 @@ function TextColorEdit( {
 	const [ allowCustomControl ] = useSettings( 'color.custom' );
 	const colors = useMobileGlobalStylesColors();
 	const [ isAddingColor, setIsAddingColor ] = useState( false );
-	const enableIsAddingColor = useCallback(
-		() => setIsAddingColor( true ),
-		[ setIsAddingColor ]
-	);
-	const disableIsAddingColor = useCallback(
-		() => setIsAddingColor( false ),
-		[ setIsAddingColor ]
-	);
 	const colorIndicatorStyle = useMemo(
 		() =>
 			fillComputedColors(
 				contentRef,
 				getActiveColors( value, name, colors )
 			),
-		[ value, colors ]
+		[ contentRef, value, colors ]
 	);
 
 	const hasColorsToChoose = colors.length || ! allowCustomControl;
 
-	const onPressButton = useCallback( () => {
-		if ( hasColorsToChoose ) {
-			enableIsAddingColor();
-		} else {
-			onChange( removeFormat( value, name ) );
-		}
-	}, [ hasColorsToChoose, value ] );
-
 	const outlineStyle = [
 		usePreferredColorSchemeStyle(
 			styles[ 'components-inline-color__outline' ],
@@ -153,14 +137,18 @@ function TextColorEdit( {
 							customContainerStyles,
 						} }
 						// If has no colors to choose but a color is active remove the color onClick
-						onClick={ onPressButton }
+						onClick={
+							hasColorsToChoose
+								? () => setIsAddingColor( true )
+								: () => onChange( removeFormat( value, name ) )
+						}
 					/>
 				</ToolbarGroup>
 			</BlockControls>
 			{ isAddingColor && (
 				<InlineColorUI
 					name={ name }
-					onClose={ disableIsAddingColor }
+					onClose={ () => setIsAddingColor( false ) }
 					activeAttributes={ activeAttributes }
 					value={ value }
 					onChange={ onChange }
diff --git a/packages/format-library/src/text-color/inline.js b/packages/format-library/src/text-color/inline.js
index f71c7766222582..bc1e0eef07b0c1 100644
--- a/packages/format-library/src/text-color/inline.js
+++ b/packages/format-library/src/text-color/inline.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useCallback, useMemo } from '@wordpress/element';
+import { useMemo } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import {
 	applyFormat,
@@ -15,23 +15,39 @@ import {
 	getColorObjectByColorValue,
 	getColorObjectByAttributeValues,
 	store as blockEditorStore,
-	useCachedTruthy,
 } from '@wordpress/block-editor';
-import { Popover, TabPanel } from '@wordpress/components';
+import {
+	Popover,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { textColor as settings, transparentValue } from './index';
+import { unlock } from '../lock-unlock';
+
+const { Tabs } = unlock( componentsPrivateApis );
+
+const TABS = [
+	{ name: 'color', title: __( 'Text' ) },
+	{ name: 'backgroundColor', title: __( 'Background' ) },
+];
 
 function parseCSS( css = '' ) {
 	return css.split( ';' ).reduce( ( accumulator, rule ) => {
 		if ( rule ) {
 			const [ property, value ] = rule.split( ':' );
-			if ( property === 'color' ) accumulator.color = value;
-			if ( property === 'background-color' && value !== transparentValue )
+			if ( property === 'color' ) {
+				accumulator.color = value;
+			}
+			if (
+				property === 'background-color' &&
+				value !== transparentValue
+			) {
 				accumulator.backgroundColor = value;
+			}
 		}
 		return accumulator;
 	}, {} );
@@ -98,8 +114,12 @@ function setColors( value, name, colorSettings, colors ) {
 		}
 	}
 
-	if ( styles.length ) attributes.style = styles.join( ';' );
-	if ( classNames.length ) attributes.class = classNames.join( ' ' );
+	if ( styles.length ) {
+		attributes.style = styles.join( ';' );
+	}
+	if ( classNames.length ) {
+		attributes.class = classNames.join( ' ' );
+	}
 
 	return applyFormat( value, { type: name, attributes } );
 }
@@ -109,14 +129,6 @@ function ColorPicker( { name, property, value, onChange } ) {
 		const { getSettings } = select( blockEditorStore );
 		return getSettings().colors ?? [];
 	}, [] );
-	const onColorChange = useCallback(
-		( color ) => {
-			onChange(
-				setColors( value, name, colors, { [ property ]: color } )
-			);
-		},
-		[ colors, onChange, property ]
-	);
 	const activeColors = useMemo(
 		() => getActiveColors( value, name, colors ),
 		[ name, value, colors ]
@@ -125,7 +137,11 @@ function ColorPicker( { name, property, value, onChange } ) {
 	return (
 		<ColorPalette
 			value={ activeColors[ property ] }
-			onChange={ onColorChange }
+			onChange={ ( color ) => {
+				onChange(
+					setColors( value, name, colors, { [ property ]: color } )
+				);
+			} }
 		/>
 	);
 }
@@ -136,49 +152,42 @@ export default function InlineColorUI( {
 	onChange,
 	onClose,
 	contentRef,
+	isActive,
 } ) {
 	const popoverAnchor = useAnchor( {
 		editableContentElement: contentRef.current,
-		settings,
+		settings: { ...settings, isActive },
 	} );
 
-	/*
-	 As you change the text color by typing a HEX value into a field,
-	 the return value of document.getSelection jumps to the field you're editing,
-	 not the highlighted text. Given that useAnchor uses document.getSelection,
-	 it will return null, since it can't find the <mark> element within the HEX input.
-	 This caches the last truthy value of the selection anchor reference.
-	 */
-	const cachedRect = useCachedTruthy( popoverAnchor.getBoundingClientRect() );
-	popoverAnchor.getBoundingClientRect = () => cachedRect;
-
 	return (
 		<Popover
 			onClose={ onClose }
-			className="components-inline-color-popover"
+			className="format-library__inline-color-popover"
 			anchor={ popoverAnchor }
 		>
-			<TabPanel
-				tabs={ [
-					{
-						name: 'color',
-						title: __( 'Text' ),
-					},
-					{
-						name: 'backgroundColor',
-						title: __( 'Background' ),
-					},
-				] }
-			>
-				{ ( tab ) => (
-					<ColorPicker
-						name={ name }
-						property={ tab.name }
-						value={ value }
-						onChange={ onChange }
-					/>
-				) }
-			</TabPanel>
+			<Tabs>
+				<Tabs.TabList>
+					{ TABS.map( ( tab ) => (
+						<Tabs.Tab tabId={ tab.name } key={ tab.name }>
+							{ tab.title }
+						</Tabs.Tab>
+					) ) }
+				</Tabs.TabList>
+				{ TABS.map( ( tab ) => (
+					<Tabs.TabPanel
+						tabId={ tab.name }
+						focusable={ false }
+						key={ tab.name }
+					>
+						<ColorPicker
+							name={ name }
+							property={ tab.name }
+							value={ value }
+							onChange={ onChange }
+						/>
+					</Tabs.TabPanel>
+				) ) }
+			</Tabs>
 		</Popover>
 	);
 }
diff --git a/packages/format-library/src/text-color/inline.native.js b/packages/format-library/src/text-color/inline.native.js
index f00146631e92df..8324e0c3453c37 100644
--- a/packages/format-library/src/text-color/inline.native.js
+++ b/packages/format-library/src/text-color/inline.native.js
@@ -11,12 +11,9 @@ import {
 	getColorClassName,
 	getColorObjectByColorValue,
 	useMultipleOriginColorsAndGradients,
-} from '@wordpress/block-editor';
-import {
-	BottomSheet,
-	ColorSettings,
 	useMobileGlobalStylesColors,
-} from '@wordpress/components';
+} from '@wordpress/block-editor';
+import { BottomSheet, ColorSettings } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -28,15 +25,21 @@ function parseCSS( css = '' ) {
 	return css.split( ';' ).reduce( ( accumulator, rule ) => {
 		if ( rule ) {
 			const [ property, value ] = rule.replace( / /g, '' ).split( ':' );
-			if ( property === 'color' ) accumulator.color = value;
-			if ( property === 'background-color' && value !== transparentValue )
+			if ( property === 'color' ) {
+				accumulator.color = value;
+			}
+			if (
+				property === 'background-color' &&
+				value !== transparentValue
+			) {
 				accumulator.backgroundColor = value;
+			}
 		}
 		return accumulator;
 	}, {} );
 }
 
-function getActiveColors( value, name, colorSettings ) {
+export function getActiveColors( value, name, colorSettings ) {
 	const activeColorFormat = getActiveFormat( value, name );
 
 	if ( ! activeColorFormat ) {
@@ -49,13 +52,14 @@ function getActiveColors( value, name, colorSettings ) {
 	};
 }
 
-function setColors( value, name, colorSettings, colors ) {
+function setColors( value, name, colorSettings, colors, contentRef ) {
 	const { color, backgroundColor } = {
 		...getActiveColors( value, name, colorSettings ),
 		...colors,
 	};
 
-	if ( ! color && ! backgroundColor ) {
+	if ( ! color ) {
+		contentRef?.onRemoveMarkFormatting();
 		return removeFormat( value, name );
 	}
 
@@ -81,67 +85,41 @@ function setColors( value, name, colorSettings, colors ) {
 		}
 	}
 
-	if ( styles.length ) attributes.style = styles.join( ';' );
-	if ( classNames.length ) attributes.class = classNames.join( ' ' );
+	if ( styles.length ) {
+		attributes.style = styles.join( ';' );
+	}
+	if ( classNames.length ) {
+		attributes.class = classNames.join( ' ' );
+	}
 
 	const format = { type: name, attributes };
 	const hasNoSelection = value.start === value.end;
-	const isAtTheEnd = value.end === value.text.length;
-	const previousCharacter = value.text.charAt( value.end - 1 );
-
-	// Force formatting due to limitations in the native implementation
-	if (
-		hasNoSelection &&
-		( value.text.length === 0 ||
-			( previousCharacter === ' ' && isAtTheEnd ) )
-	) {
-		// For cases where there's no text selected, there's a space before
-		// the current caret position and it's at the end of the text.
-		return applyFormat( value, format, value.start - 1, value.end + 1 );
-	} else if ( hasNoSelection && isAtTheEnd ) {
-		// If there's no selection and is at the end of the text
-		// manually add the format within the current caret position.
-		const newFormat = applyFormat( value, format );
-		const { activeFormats } = newFormat;
-		newFormat.formats[ value.start ] = [
-			...( activeFormats?.filter(
-				( { type } ) => type !== format.type
-			) || [] ),
-			format,
-		];
-		return newFormat;
-	} else if ( hasNoSelection ) {
-		return removeFormat( value, format );
-	}
 
+	if ( hasNoSelection ) {
+		contentRef?.onMarkFormatting( color );
+	}
 	return applyFormat( value, format );
 }
 
-function ColorPicker( { name, value, onChange } ) {
+function ColorPicker( { name, value, onChange, contentRef } ) {
 	const property = 'color';
 	const colors = useMobileGlobalStylesColors();
 	const colorSettings = useMultipleOriginColorsAndGradients();
+	colorSettings.allAvailableColors = colors;
 
 	const onColorChange = useCallback(
 		( color ) => {
-			if ( color !== '' ) {
-				onChange(
-					setColors( value, name, colors, { [ property ]: color } )
-				);
-				// Remove formatting if the color was reset, there's no
-				// current selection and the previous character is a space
-			} else if (
-				value?.start === value?.end &&
-				value.text?.charAt( value?.end - 1 ) === ' '
-			) {
-				onChange(
-					removeFormat( value, name, value.end - 1, value.end )
-				);
-			} else {
-				onChange( removeFormat( value, name ) );
-			}
+			onChange(
+				setColors(
+					value,
+					name,
+					colors,
+					{ [ property ]: color },
+					contentRef
+				)
+			);
 		},
-		[ colors, onChange, property ]
+		[ colors, contentRef, name, onChange, value ]
 	);
 	const activeColors = useMemo(
 		() => getActiveColors( value, name, colors ),
@@ -152,13 +130,20 @@ function ColorPicker( { name, value, onChange } ) {
 		<ColorSettings
 			colorValue={ activeColors[ property ] }
 			onColorChange={ onColorChange }
+			onColorCleared={ onColorChange }
 			defaultSettings={ colorSettings }
 			hideNavigation
 		/>
 	);
 }
 
-export default function InlineColorUI( { name, value, onChange, onClose } ) {
+export default function InlineColorUI( {
+	name,
+	value,
+	onChange,
+	onClose,
+	contentRef,
+} ) {
 	return (
 		<BottomSheet
 			isVisible
@@ -175,6 +160,7 @@ export default function InlineColorUI( { name, value, onChange, onClose } ) {
 						name={ name }
 						value={ value }
 						onChange={ onChange }
+						contentRef={ contentRef }
 					/>
 				</BottomSheet.NavigationScreen>
 			</BottomSheet.NavigationContainer>
diff --git a/packages/format-library/src/text-color/style.scss b/packages/format-library/src/text-color/style.scss
index 121ba8da756cf5..439af6db38d0cf 100644
--- a/packages/format-library/src/text-color/style.scss
+++ b/packages/format-library/src/text-color/style.scss
@@ -1,23 +1,6 @@
-.components-inline-color-popover {
+.format-library__inline-color-popover {
 
-	.components-popover__content {
-		.components-tab-panel__tab-content {
-			padding: 16px;
-		}
-
-		.components-color-palette {
-			margin-top: 0.6rem;
-		}
-
-		.components-base-control__title {
-			display: block;
-			margin-bottom: 16px;
-			font-weight: 600;
-			color: #191e23;
-		}
-
-		.component-color-indicator {
-			vertical-align: text-bottom;
-		}
+	[role="tabpanel"] {
+		padding: 16px;
 	}
 }
diff --git a/packages/format-library/src/text-color/test/__snapshots__/index.native.js.snap b/packages/format-library/src/text-color/test/__snapshots__/index.native.js.snap
index ed9d406449e312..8b64c8e7987915 100644
--- a/packages/format-library/src/text-color/test/__snapshots__/index.native.js.snap
+++ b/packages/format-library/src/text-color/test/__snapshots__/index.native.js.snap
@@ -6,12 +6,6 @@ exports[`Text color allows toggling the highlight color feature to selected text
 <!-- /wp:paragraph -->"
 `;
 
-exports[`Text color allows toggling the highlight color feature to type new text 1`] = `
-"<!-- wp:paragraph -->
-<p><mark style="background-color:rgba(0, 0, 0, 0);color:#f78da7" class="has-inline-color has-pale-pink-color"></mark></p>
-<!-- /wp:paragraph -->"
-`;
-
 exports[`Text color creates a paragraph block with the text color format 1`] = `
 "<!-- wp:paragraph -->
 <p>Hello <mark style="background-color:rgba(0,0,0,0);color:#cf2e2e" class="has-inline-color has-vivid-red-color">this is a test</mark></p>
diff --git a/packages/format-library/src/text-color/test/index.native.js b/packages/format-library/src/text-color/test/index.native.js
index 9a148dec4358be..c206f858070622 100644
--- a/packages/format-library/src/text-color/test/index.native.js
+++ b/packages/format-library/src/text-color/test/index.native.js
@@ -64,45 +64,6 @@ describe( 'Text color', () => {
 		expect( textColorButton ).toBeDefined();
 	} );
 
-	it( 'allows toggling the highlight color feature to type new text', async () => {
-		const screen = await initializeEditor();
-
-		// Wait for the editor placeholder
-		const paragraphPlaceholder = await screen.findByLabelText(
-			'Add paragraph block'
-		);
-		expect( paragraphPlaceholder ).toBeDefined();
-		fireEvent.press( paragraphPlaceholder );
-
-		// Wait for the block to be created
-		const [ paragraphBlock ] = await screen.findAllByLabelText(
-			/Paragraph Block\. Row 1/
-		);
-		expect( paragraphBlock ).toBeDefined();
-
-		// Look for the highlight text color button
-		const textColorButton = await screen.findByLabelText( 'Text color' );
-		expect( textColorButton ).toBeDefined();
-		fireEvent.press( textColorButton );
-
-		// Wait for Inline color modal to be visible
-		const inlineTextColorModal = screen.getByTestId(
-			'inline-text-color-modal'
-		);
-		await waitFor( () => inlineTextColorModal.props.isVisible );
-
-		// Look for the pink color button
-		const pinkColorButton = await screen.findByA11yHint( COLOR_PINK );
-		expect( pinkColorButton ).toBeDefined();
-		fireEvent.press( pinkColorButton );
-		// TODO(jest-console): Fix the warning and remove the expect below.
-		expect( console ).toHaveWarnedWith(
-			`Non-serializable values were found in the navigation state. Check:\n\ntext-color > Palette > params.onColorChange (Function)\n\nThis can break usage such as persisting and restoring state. This might happen if you passed non-serializable values such as function, class instances etc. in params. If you need to use components with callbacks in your options, you can use 'navigation.setOptions' instead. See https://reactnavigation.org/docs/troubleshooting#i-get-the-warning-non-serializable-values-were-found-in-the-navigation-state for more details.`
-		);
-
-		expect( getEditorHtml() ).toMatchSnapshot();
-	} );
-
 	it( 'allows toggling the highlight color feature to selected text', async () => {
 		const screen = await initializeEditor();
 		const text = 'Hello this is a test';
@@ -145,6 +106,10 @@ describe( 'Text color', () => {
 		const pinkColorButton = await screen.findByA11yHint( COLOR_PINK );
 		expect( pinkColorButton ).toBeDefined();
 		fireEvent.press( pinkColorButton );
+		// TODO(jest-console): Fix the warning and remove the expect below.
+		expect( console ).toHaveWarnedWith(
+			`Non-serializable values were found in the navigation state. Check:\n\ntext-color > Palette > params.onColorChange (Function)\n\nThis can break usage such as persisting and restoring state. This might happen if you passed non-serializable values such as function, class instances etc. in params. If you need to use components with callbacks in your options, you can use 'navigation.setOptions' instead. See https://reactnavigation.org/docs/troubleshooting#i-get-the-warning-non-serializable-values-were-found-in-the-navigation-state for more details.`
+		);
 
 		expect( getEditorHtml() ).toMatchSnapshot();
 	} );
@@ -205,9 +170,9 @@ describe( 'Text color', () => {
 
 		const { getByLabelText } = render(
 			<SlotFillProvider>
-				<BlockEdit name="core/test-block" isSelected>
+				<BlockEdit name="core/test-block" isSelected mayDisplayControls>
 					<TextColorEdit
-						isActive={ true }
+						isActive
 						activeAttributes={ {} }
 						value={ textValue }
 						onChange={ jest.fn() }
diff --git a/packages/format-library/src/unknown/index.js b/packages/format-library/src/unknown/index.js
index 68c6d099fcad1f..b2da23388c79b7 100644
--- a/packages/format-library/src/unknown/index.js
+++ b/packages/format-library/src/unknown/index.js
@@ -2,40 +2,46 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { removeFormat, slice } from '@wordpress/rich-text';
+import { removeFormat, slice, isCollapsed } from '@wordpress/rich-text';
 import { RichTextToolbarButton } from '@wordpress/block-editor';
 import { help } from '@wordpress/icons';
 
 const name = 'core/unknown';
 const title = __( 'Clear Unknown Formatting' );
 
+function selectionContainsUnknownFormats( value ) {
+	if ( isCollapsed( value ) ) {
+		return false;
+	}
+
+	const selectedValue = slice( value );
+	return selectedValue.formats.some( ( formats ) => {
+		return formats.some( ( format ) => format.type === name );
+	} );
+}
+
 export const unknown = {
 	name,
 	title,
 	tagName: '*',
 	className: null,
 	edit( { isActive, value, onChange, onFocus } ) {
+		if ( ! isActive && ! selectionContainsUnknownFormats( value ) ) {
+			return null;
+		}
+
 		function onClick() {
 			onChange( removeFormat( value, name ) );
 			onFocus();
 		}
 
-		const selectedValue = slice( value );
-		const hasUnknownFormats = selectedValue.formats.some( ( formats ) => {
-			return formats.some( ( format ) => format.type === name );
-		} );
-
-		if ( ! isActive && ! hasUnknownFormats ) {
-			return null;
-		}
-
 		return (
 			<RichTextToolbarButton
 				name="unknown"
 				icon={ help }
 				title={ title }
 				onClick={ onClick }
-				isActive={ true }
+				isActive
 			/>
 		);
 	},
diff --git a/packages/hooks/.npmrc b/packages/hooks/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/hooks/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md
index d8355c0fd472a3..a5caa23d755032 100644
--- a/packages/hooks/CHANGELOG.md
+++ b/packages/hooks/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+### New Features
+
+- added new `doActionAsync` and `applyFiltersAsync` functions to run hooks in async mode ([#64204](https://github.com/WordPress/gutenberg/pull/64204)).
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -105,29 +157,29 @@
 
 ## 2.12.0 (2021-03-17)
 
-### New Feature
+### New Features
 
 -   Export the default `createHooks` singleton instance as `defaultHooks`, in addition to exporting the individual methods.
 
 ## 2.11.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Include TypeScript type declarations ([#26430](https://github.com/WordPress/gutenberg/pull/26430))
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix: Use own instance's `doAction` method for built-in `hookAdded` and `hookRemoved` hooks ([#26498](https://github.com/WordPress/gutenberg/pull/26498))
 
 ## 2.6.0 (2019-08-29)
 
-### New Feature
+### New Features
 
 -   Enable an optional namespace parameter for `hasAction` & `hasFilter`. When checking if an action or filter exists, `hasAction` and `hasFilter` now accept an optional paramter to limit matches by namespace.
 
 ## 2.4.0 (2019-06-12)
 
-### New Feature
+### New Features
 
 -   Enable support for the 'all' hook in non production environments.
 
@@ -135,28 +187,28 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
 
 ## 1.2.0 (2018-07-12)
 
-### New Feature
+### New Features
 
 -   Updated build to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
-### Polish
+### Internal
 
 -   Moved `@WordPress/packages` repository to `@WordPress/gutenberg` ([#7805](https://github.com/WordPress/gutenberg/pull/7805))
 
 ## 1.1.8 (2018-05-08)
 
-### Polish
+### Internal
 
 -   Documentation: Improve usage examples ([#121](https://github.com/WordPress/packages/pull/121))
 
 ## 1.1.6 (2018-03-21)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix: Resolves issue where action argument would be undefined on all but the first action callback.
diff --git a/packages/hooks/README.md b/packages/hooks/README.md
index 3e9897c79952cd..f80d2e63af37ba 100644
--- a/packages/hooks/README.md
+++ b/packages/hooks/README.md
@@ -41,7 +41,9 @@ One notable difference between the JS and PHP hooks API is that in the JS versio
 -   `removeAllActions( 'hookName' )`
 -   `removeAllFilters( 'hookName' )`
 -   `doAction( 'hookName', arg1, arg2, moreArgs, finalArg )`
+-   `doActionAsync( 'hookName', arg1, arg2, moreArgs, finalArg )`
 -   `applyFilters( 'hookName', content, arg1, arg2, moreArgs, finalArg )`
+-   `applyFiltersAsync( 'hookName', content, arg1, arg2, moreArgs, finalArg )`
 -   `doingAction( 'hookName' )`
 -   `doingFilter( 'hookName' )`
 -   `didAction( 'hookName' )`
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index e33b95790c7692..04a0865f5c44ae 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/hooks",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "WordPress hooks library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,16 +19,18 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/hooks/src/createCurrentHook.js b/packages/hooks/src/createCurrentHook.js
index 634901fe55f63a..3ada0322496004 100644
--- a/packages/hooks/src/createCurrentHook.js
+++ b/packages/hooks/src/createCurrentHook.js
@@ -11,11 +11,8 @@
 function createCurrentHook( hooks, storeKey ) {
 	return function currentHook() {
 		const hooksStore = hooks[ storeKey ];
-
-		return (
-			hooksStore.__current[ hooksStore.__current.length - 1 ]?.name ??
-			null
-		);
+		const currentArray = Array.from( hooksStore.__current );
+		return currentArray.at( -1 )?.name ?? null;
 	};
 }
 
diff --git a/packages/hooks/src/createDoingHook.js b/packages/hooks/src/createDoingHook.js
index 652ab06b4ba728..9fccf38171f332 100644
--- a/packages/hooks/src/createDoingHook.js
+++ b/packages/hooks/src/createDoingHook.js
@@ -24,13 +24,13 @@ function createDoingHook( hooks, storeKey ) {
 
 		// If the hookName was not passed, check for any current hook.
 		if ( 'undefined' === typeof hookName ) {
-			return 'undefined' !== typeof hooksStore.__current[ 0 ];
+			return hooksStore.__current.size > 0;
 		}
 
-		// Return the __current hook.
-		return hooksStore.__current[ 0 ]
-			? hookName === hooksStore.__current[ 0 ].name
-			: false;
+		// Find if the `hookName` hook is in `__current`.
+		return Array.from( hooksStore.__current ).some(
+			( hook ) => hook.name === hookName
+		);
 	};
 }
 
diff --git a/packages/hooks/src/createHooks.js b/packages/hooks/src/createHooks.js
index 361383a3a97fc9..1f9b1a8206b020 100644
--- a/packages/hooks/src/createHooks.js
+++ b/packages/hooks/src/createHooks.js
@@ -20,11 +20,11 @@ export class _Hooks {
 	constructor() {
 		/** @type {import('.').Store} actions */
 		this.actions = Object.create( null );
-		this.actions.__current = [];
+		this.actions.__current = new Set();
 
 		/** @type {import('.').Store} filters */
 		this.filters = Object.create( null );
-		this.filters.__current = [];
+		this.filters.__current = new Set();
 
 		this.addAction = createAddHook( this, 'actions' );
 		this.addFilter = createAddHook( this, 'filters' );
@@ -34,8 +34,10 @@ export class _Hooks {
 		this.hasFilter = createHasHook( this, 'filters' );
 		this.removeAllActions = createRemoveHook( this, 'actions', true );
 		this.removeAllFilters = createRemoveHook( this, 'filters', true );
-		this.doAction = createRunHook( this, 'actions' );
-		this.applyFilters = createRunHook( this, 'filters', true );
+		this.doAction = createRunHook( this, 'actions', false, false );
+		this.doActionAsync = createRunHook( this, 'actions', false, true );
+		this.applyFilters = createRunHook( this, 'filters', true, false );
+		this.applyFiltersAsync = createRunHook( this, 'filters', true, true );
 		this.currentAction = createCurrentHook( this, 'actions' );
 		this.currentFilter = createCurrentHook( this, 'filters' );
 		this.doingAction = createDoingHook( this, 'actions' );
diff --git a/packages/hooks/src/createRunHook.js b/packages/hooks/src/createRunHook.js
index c2bf6fd187ce08..f2a56dbdc0d717 100644
--- a/packages/hooks/src/createRunHook.js
+++ b/packages/hooks/src/createRunHook.js
@@ -3,15 +3,15 @@
  * registered to a hook of the specified type, optionally returning the final
  * value of the call chain.
  *
- * @param {import('.').Hooks}    hooks                  Hooks instance.
+ * @param {import('.').Hooks}    hooks          Hooks instance.
  * @param {import('.').StoreKey} storeKey
- * @param {boolean}              [returnFirstArg=false] Whether each hook callback is expected to
- *                                                      return its first argument.
+ * @param {boolean}              returnFirstArg Whether each hook callback is expected to return its first argument.
+ * @param {boolean}              async          Whether the hook callback should be run asynchronously
  *
  * @return {(hookName:string, ...args: unknown[]) => undefined|unknown} Function that runs hook callbacks.
  */
-function createRunHook( hooks, storeKey, returnFirstArg = false ) {
-	return function runHooks( hookName, ...args ) {
+function createRunHook( hooks, storeKey, returnFirstArg, async ) {
+	return function runHook( hookName, ...args ) {
 		const hooksStore = hooks[ storeKey ];
 
 		if ( ! hooksStore[ hookName ] ) {
@@ -42,26 +42,43 @@ function createRunHook( hooks, storeKey, returnFirstArg = false ) {
 			currentIndex: 0,
 		};
 
-		hooksStore.__current.push( hookInfo );
-
-		while ( hookInfo.currentIndex < handlers.length ) {
-			const handler = handlers[ hookInfo.currentIndex ];
-
-			const result = handler.callback.apply( null, args );
-			if ( returnFirstArg ) {
-				args[ 0 ] = result;
+		async function asyncRunner() {
+			try {
+				hooksStore.__current.add( hookInfo );
+				let result = returnFirstArg ? args[ 0 ] : undefined;
+				while ( hookInfo.currentIndex < handlers.length ) {
+					const handler = handlers[ hookInfo.currentIndex ];
+					result = await handler.callback.apply( null, args );
+					if ( returnFirstArg ) {
+						args[ 0 ] = result;
+					}
+					hookInfo.currentIndex++;
+				}
+				return returnFirstArg ? result : undefined;
+			} finally {
+				hooksStore.__current.delete( hookInfo );
 			}
-
-			hookInfo.currentIndex++;
 		}
 
-		hooksStore.__current.pop();
-
-		if ( returnFirstArg ) {
-			return args[ 0 ];
+		function syncRunner() {
+			try {
+				hooksStore.__current.add( hookInfo );
+				let result = returnFirstArg ? args[ 0 ] : undefined;
+				while ( hookInfo.currentIndex < handlers.length ) {
+					const handler = handlers[ hookInfo.currentIndex ];
+					result = handler.callback.apply( null, args );
+					if ( returnFirstArg ) {
+						args[ 0 ] = result;
+					}
+					hookInfo.currentIndex++;
+				}
+				return returnFirstArg ? result : undefined;
+			} finally {
+				hooksStore.__current.delete( hookInfo );
+			}
 		}
 
-		return undefined;
+		return ( async ? asyncRunner : syncRunner )();
 	};
 }
 
diff --git a/packages/hooks/src/index.js b/packages/hooks/src/index.js
index 653a9537145d91..1d13397e406c6b 100644
--- a/packages/hooks/src/index.js
+++ b/packages/hooks/src/index.js
@@ -25,7 +25,7 @@ import createHooks from './createHooks';
  */
 
 /**
- * @typedef {Record<string, Hook> & {__current: Current[]}} Store
+ * @typedef {Record<string, Hook> & {__current: Set<Current>}} Store
  */
 
 /**
@@ -48,7 +48,9 @@ const {
 	removeAllActions,
 	removeAllFilters,
 	doAction,
+	doActionAsync,
 	applyFilters,
+	applyFiltersAsync,
 	currentAction,
 	currentFilter,
 	doingAction,
@@ -70,7 +72,9 @@ export {
 	removeAllActions,
 	removeAllFilters,
 	doAction,
+	doActionAsync,
 	applyFilters,
+	applyFiltersAsync,
 	currentAction,
 	currentFilter,
 	doingAction,
diff --git a/packages/hooks/src/test/index.test.js b/packages/hooks/src/test/index.test.js
index 9b7eb3b8e0e223..5fdaf5fc7207a1 100644
--- a/packages/hooks/src/test/index.test.js
+++ b/packages/hooks/src/test/index.test.js
@@ -12,7 +12,9 @@ import {
 	removeAllActions,
 	removeAllFilters,
 	doAction,
+	doActionAsync,
 	applyFilters,
+	applyFiltersAsync,
 	currentAction,
 	currentFilter,
 	doingAction,
@@ -943,3 +945,151 @@ test( 'checking hasFilter with named callbacks and removeAllActions', () => {
 	expect( hasFilter( 'test.filter', 'my_callback' ) ).toBe( false );
 	expect( hasFilter( 'test.filter', 'my_second_callback' ) ).toBe( false );
 } );
+
+describe( 'async filter', () => {
+	test( 'runs all registered handlers', async () => {
+		addFilter( 'test.async.filter', 'callback_plus1', ( value ) => {
+			return new Promise( ( r ) =>
+				setTimeout( () => r( value + 1 ), 10 )
+			);
+		} );
+		addFilter( 'test.async.filter', 'callback_times2', ( value ) => {
+			return new Promise( ( r ) =>
+				setTimeout( () => r( value * 2 ), 10 )
+			);
+		} );
+
+		expect( await applyFiltersAsync( 'test.async.filter', 2 ) ).toBe( 6 );
+	} );
+
+	test( 'aborts when handler throws an error', async () => {
+		const sqrt = jest.fn( async ( value ) => {
+			if ( value < 0 ) {
+				throw new Error( 'cannot pass negative value to sqrt' );
+			}
+			return Math.sqrt( value );
+		} );
+
+		const plus1 = jest.fn( async ( value ) => {
+			return value + 1;
+		} );
+
+		addFilter( 'test.async.filter', 'callback_sqrt', sqrt );
+		addFilter( 'test.async.filter', 'callback_plus1', plus1 );
+
+		await expect(
+			applyFiltersAsync( 'test.async.filter', -1 )
+		).rejects.toThrow( 'cannot pass negative value to sqrt' );
+		expect( sqrt ).toHaveBeenCalledTimes( 1 );
+		expect( plus1 ).not.toHaveBeenCalled();
+	} );
+
+	test( 'is correctly tracked by doingFilter and didFilter', async () => {
+		addFilter( 'test.async.filter', 'callback_doing', async ( value ) => {
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			expect( doingFilter( 'test.async.filter' ) ).toBe( true );
+			return value;
+		} );
+
+		expect( doingFilter( 'test.async.filter' ) ).toBe( false );
+		expect( didFilter( 'test.async.filter' ) ).toBe( 0 );
+		await applyFiltersAsync( 'test.async.filter', 0 );
+		expect( doingFilter( 'test.async.filter' ) ).toBe( false );
+		expect( didFilter( 'test.async.filter' ) ).toBe( 1 );
+	} );
+
+	test( 'is correctly tracked when multiple filters run at once', async () => {
+		addFilter( 'test.async.filter1', 'callback_doing', async ( value ) => {
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			expect( doingFilter( 'test.async.filter1' ) ).toBe( true );
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			return value;
+		} );
+		addFilter( 'test.async.filter2', 'callback_doing', async ( value ) => {
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			expect( doingFilter( 'test.async.filter2' ) ).toBe( true );
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			return value;
+		} );
+
+		await Promise.all( [
+			applyFiltersAsync( 'test.async.filter1', 0 ),
+			applyFiltersAsync( 'test.async.filter2', 0 ),
+		] );
+	} );
+} );
+
+describe( 'async action', () => {
+	test( 'runs all registered handlers sequentially', async () => {
+		const outputs = [];
+		const action1 = async () => {
+			outputs.push( 1 );
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			outputs.push( 2 );
+		};
+
+		const action2 = async () => {
+			outputs.push( 3 );
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			outputs.push( 4 );
+		};
+
+		addAction( 'test.async.action', 'action1', action1 );
+		addAction( 'test.async.action', 'action2', action2 );
+
+		await doActionAsync( 'test.async.action' );
+		expect( outputs ).toEqual( [ 1, 2, 3, 4 ] );
+	} );
+
+	test( 'aborts when handler throws an error', async () => {
+		const outputs = [];
+		const action1 = async () => {
+			throw new Error( 'aborting' );
+		};
+
+		const action2 = async () => {
+			outputs.push( 3 );
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			outputs.push( 4 );
+		};
+
+		addAction( 'test.async.action', 'action1', action1 );
+		addAction( 'test.async.action', 'action2', action2 );
+
+		await expect( doActionAsync( 'test.async.action' ) ).rejects.toThrow(
+			'aborting'
+		);
+		expect( outputs ).toEqual( [] );
+	} );
+
+	test( 'is correctly tracked by doingAction and didAction', async () => {
+		addAction( 'test.async.action', 'callback_doing', async () => {
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			expect( doingAction( 'test.async.action' ) ).toBe( true );
+		} );
+
+		expect( doingAction( 'test.async.action' ) ).toBe( false );
+		expect( didAction( 'test.async.action' ) ).toBe( 0 );
+		await doActionAsync( 'test.async.action', 0 );
+		expect( doingAction( 'test.async.action' ) ).toBe( false );
+		expect( didAction( 'test.async.action' ) ).toBe( 1 );
+	} );
+
+	test( 'is correctly tracked when multiple actions run at once', async () => {
+		addAction( 'test.async.action1', 'callback_doing', async () => {
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			expect( doingAction( 'test.async.action1' ) ).toBe( true );
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+		} );
+		addAction( 'test.async.action2', 'callback_doing', async () => {
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+			expect( doingAction( 'test.async.action2' ) ).toBe( true );
+			await new Promise( ( r ) => setTimeout( () => r(), 10 ) );
+		} );
+
+		await Promise.all( [
+			doActionAsync( 'test.async.action1', 0 ),
+			doActionAsync( 'test.async.action2', 0 ),
+		] );
+	} );
+} );
diff --git a/packages/hooks/tsconfig.json b/packages/hooks/tsconfig.json
index 671d4a5eba4403..9e3edfe0ae443c 100644
--- a/packages/hooks/tsconfig.json
+++ b/packages/hooks/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/html-entities/.npmrc b/packages/html-entities/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/html-entities/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/html-entities/CHANGELOG.md b/packages/html-entities/CHANGELOG.md
index a7cb330e988496..de6f098713c236 100644
--- a/packages/html-entities/CHANGELOG.md
+++ b/packages/html-entities/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -107,7 +155,7 @@
 
 ## 2.7.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#20669](https://github.com/WordPress/gutenberg/pull/20669))
 
@@ -117,6 +165,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/html-entities/README.md b/packages/html-entities/README.md
index 211215c50a451b..1133c7df156194 100644
--- a/packages/html-entities/README.md
+++ b/packages/html-entities/README.md
@@ -23,6 +23,8 @@ Decodes the HTML entities from a given string.
 _Usage_
 
 ```js
+import { decodeEntities } from '@wordpress/html-entities';
+
 const result = decodeEntities( '&aacute;' );
 console.log( result ); // result will be "á"
 ```
diff --git a/packages/html-entities/package.json b/packages/html-entities/package.json
index 1b5a775a08ec0f..7ccf5d52f55fb7 100644
--- a/packages/html-entities/package.json
+++ b/packages/html-entities/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/html-entities",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "HTML entity utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,16 +20,18 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/html-entities/src/index.js b/packages/html-entities/src/index.js
index 503d6f69daf82e..1df4ec41484bdd 100644
--- a/packages/html-entities/src/index.js
+++ b/packages/html-entities/src/index.js
@@ -8,6 +8,8 @@ let _decodeTextArea;
  *
  * @example
  * ```js
+ * import { decodeEntities } from '@wordpress/html-entities';
+ *
  * const result = decodeEntities( '&aacute;' );
  * console.log( result ); // result will be "á"
  * ```
diff --git a/packages/html-entities/tsconfig.json b/packages/html-entities/tsconfig.json
index 3c2c31f506f132..6e33d8ff82d47e 100644
--- a/packages/html-entities/tsconfig.json
+++ b/packages/html-entities/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/i18n/.npmrc b/packages/i18n/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/i18n/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index 56b7c0ba885c56..0fc465873a31ff 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.58.0 (2024-05-16)
+
+## 4.57.0 (2024-05-02)
+
+## 4.56.0 (2024-04-19)
+
+## 4.55.0 (2024-04-03)
+
+## 4.54.0 (2024-03-21)
+
+## 4.53.0 (2024-03-06)
+
+## 4.52.0 (2024-02-21)
+
+## 4.51.0 (2024-02-09)
+
+## 4.50.0 (2024-01-24)
+
+## 4.49.0 (2024-01-10)
+
+## 4.48.0 (2023-12-13)
+
 ## 4.47.0 (2023-11-29)
 
 ## 4.46.0 (2023-11-16)
@@ -92,7 +140,7 @@
 
 ## 4.3.0 (2022-01-27)
 
-- Add new `addLocaleData` method to merge locale data into the Tannin instance by domain.
+-   Add new `addLocaleData` method to merge locale data into the Tannin instance by domain.
 
 ## 4.2.0 (2021-07-21)
 
@@ -128,7 +176,7 @@
 
 ## 3.12.0 (2020-04-30)
 
-### Bug Fix
+### Bug Fixes
 
 -   Relax type of `sprintf` arguments type ([#21919](https://github.com/WordPress/gutenberg/pull/21919))
 
@@ -141,7 +189,7 @@
 
 ## 3.10.0 (2020-04-01)
 
-### New Feature
+### New Features
 
 -   Add `isRTL` function ([#20298](https://github.com/WordPress/gutenberg/pull/20298))
 
@@ -164,13 +212,13 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
 
 ## 1.2.0 (2018-07-12)
 
-### New Feature
+### New Features
 
 -   Updated build to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
@@ -180,6 +228,6 @@
 
 ## 1.1.1 (2018-05-18)
 
-### Polish
+### Internal
 
 -   Fix: Standardized `package.json` format ([#119](https://github.com/WordPress/packages/pull/119))
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 33a9e59fe2d51b..f2ccf4b0fa2934 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/i18n",
-	"version": "4.47.0",
+	"version": "5.10.0",
 	"description": "WordPress internationalization (i18n) library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -29,8 +30,8 @@
 		"pot-to-php": "./tools/pot-to-php.js"
 	},
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/hooks": "file:../hooks",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/hooks": "*",
 		"gettext-parser": "^1.3.1",
 		"memize": "^2.1.0",
 		"sprintf-js": "^1.1.1",
@@ -38,5 +39,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/i18n/tsconfig.json b/packages/i18n/tsconfig.json
index 9d3c2f54d7b7e6..f90e327f124d7e 100644
--- a/packages/i18n/tsconfig.json
+++ b/packages/i18n/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/icons/.npmrc b/packages/icons/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/icons/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md
index 827234758766d0..4082e510708164 100644
--- a/packages/icons/CHANGELOG.md
+++ b/packages/icons/CHANGELOG.md
@@ -2,13 +2,83 @@
 
 ## Unreleased
 
+## 10.10.0 (2024-10-16)
+
+### Enhancements
+
+-   Update `cloudUpload` icon to improve visibility of the up arrow.
+
+### New Features
+
+-   Add new `cloudDownload` icon.
+-   Update `unseen` icon to be a strike-through eye, rather than a closed eye, to match provide consistency. ([#65914](https://github.com/WordPress/gutenberg/pull/65914)).
+
+## 10.9.0 (2024-10-03)
+
+## 10.8.0 (2024-09-19)
+
+### New Features
+
+-   Add new `envelope` icon.
+
+-   Add new `bell` and `bell-unread` icons.
+-   Add new `arrowUpLeft` and `arrowDownRight` icons.
+
+## 10.7.0 (2024-09-05)
+
+## 10.6.0 (2024-08-21)
+
+## 10.5.0 (2024-08-07)
+
+### New Features
+
+-   Add new `send` icon.
+
+## 10.4.0 (2024-07-24)
+
+## 10.3.0 (2024-07-10)
+
+## 10.2.0 (2024-06-26)
+
+## 10.1.0 (2024-06-15)
+
+## 10.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 9.49.0 (2024-05-16)
+
+## 9.48.0 (2024-05-02)
+
+## 9.47.0 (2024-04-19)
+
+## 9.46.0 (2024-04-03)
+
+-   Add new `chevronDownSmall` icon.
+
+## 9.45.0 (2024-03-21)
+
+## 9.44.0 (2024-03-06)
+
+## 9.43.0 (2024-02-21)
+
+## 9.42.0 (2024-02-09)
+
+## 9.41.0 (2024-01-24)
+
+## 9.40.0 (2024-01-10)
+
+## 9.39.0 (2023-12-13)
+
 ## 9.38.0 (2023-11-29)
 
 ## 9.37.0 (2023-11-16)
 
-### New features
+### New Features
 
-- Add new `funnel` icon.
+-   Add new `funnel` icon.
 
 ## 9.36.0 (2023-11-02)
 
@@ -18,13 +88,13 @@
 
 ## 9.33.0 (2023-09-20)
 
-### Enhancement
+### Enhancements
 
 -   `<Icon>` now forwards ref to the underlying child component ([#54492](https://github.com/WordPress/gutenberg/pull/54492)).
 
 ## 9.32.0 (2023-08-31)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fixed invalid XML namespace on `alignJustify`, `customLink`, `mapMarker`, `postContent` and `title` ([#53955](https://github.com/WordPress/gutenberg/pull/53955)).
 
@@ -52,7 +122,7 @@
 
 ## 9.22.0 (2023-04-12)
 
-### New features
+### New Features
 
 ## 9.21.0 (2023-03-29)
 
@@ -99,14 +169,17 @@
 ## 9.0.0 (2022-05-18)
 
 ### Breaking Changes
+
 -   Removed icons no longer used by the UI: `commentTitle`, `postTitle`, `queryTitle`, `archiveTitle`.
 
-### Enhancement
+### Enhancements
+
 -   Update the `title` icon to match g2 design language. ([#40596](https://github.com/WordPress/gutenberg/pull/40596))
 
 ## 8.4.0 (2022-05-04)
 
 ## 8.3.0 (2022-04-21)
+
 ### New Features
 
 -   Add new `filter` icon. ([#40435](https://github.com/WordPress/gutenberg/pull/40435))
@@ -155,13 +228,13 @@
 
 ## 6.0.0 (2021-10-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   Removed the `minus` icon, which was only used once in the block editor, in favor of the new `reset` icon which offers a more refined vector.
 
 ## 5.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -184,17 +257,17 @@
 
 ## 2.0.0 (2020-05-14)
 
-### Breaking change
+### Breaking Changes
 
 -   `star` icon removed as it is duplicative of `star-filled`. ([#21825](https://github.com/WordPress/gutenberg/pull/21825))
 
-### New Feature
+### New Features
 
 -   Include TypeScript type declarations ([#21781](https://github.com/WordPress/gutenberg/pull/21781))
 
 ## 1.3.1 (2020-04-15)
 
-### Bug Fix
+### Bug Fixes
 
 -   Hide TypeScript type declarations ([#21613](https://github.com/WordPress/gutenberg/pull/21613))
     after they were found to conflict with DefinitelyTyped provided declarations.
diff --git a/packages/icons/package.json b/packages/icons/package.json
index a357de3a39f261..a2e3c97b67b55e 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/icons",
-	"version": "9.38.0",
+	"version": "10.10.0",
 	"description": "WordPress Icons package, based on dashicon.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,18 +21,20 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/element": "file:../element",
-		"@wordpress/primitives": "file:../primitives"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/element": "*",
+		"@wordpress/primitives": "*"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/icons/src/icon/stories/index.story.js b/packages/icons/src/icon/stories/index.story.js
index 8fda801f23884f..092434de43b4dc 100644
--- a/packages/icons/src/icon/stories/index.story.js
+++ b/packages/icons/src/icon/stories/index.story.js
@@ -47,7 +47,7 @@ const LibraryExample = () => {
 	const filteredIcons = filter.length
 		? Object.fromEntries(
 				Object.entries( availableIcons ).filter( ( [ name ] ) =>
-					name.includes( filter )
+					name.toLowerCase().includes( filter.toLowerCase() )
 				)
 		  )
 		: availableIcons;
diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js
index 36b29714234429..14eaec92b78c4d 100644
--- a/packages/icons/src/index.js
+++ b/packages/icons/src/index.js
@@ -10,13 +10,18 @@ export { default as alignNone } from './library/align-none';
 export { default as alignRight } from './library/align-right';
 export { default as archive } from './library/archive';
 export { default as arrowDown } from './library/arrow-down';
+export { default as arrowDownRight } from './library/arrow-down-right';
 export { default as arrowLeft } from './library/arrow-left';
 export { default as arrowRight } from './library/arrow-right';
 export { default as arrowUp } from './library/arrow-up';
+export { default as arrowUpLeft } from './library/arrow-up-left';
 export { default as atSymbol } from './library/at-symbol';
 export { default as aspectRatio } from './library/aspect-ratio';
 export { default as audio } from './library/audio';
+export { default as background } from './library/background';
 export { default as backup } from './library/backup';
+export { default as bell } from './library/bell';
+export { default as bellUnread } from './library/bell-unread';
 export { default as blockDefault } from './library/block-default';
 export { default as blockMeta } from './library/block-meta';
 export { default as blockTable } from './library/block-table';
@@ -35,6 +40,7 @@ export { default as category } from './library/category';
 export { default as chartBar } from './library/chart-bar';
 export { default as check } from './library/check';
 export { default as chevronDown } from './library/chevron-down';
+export { default as chevronDownSmall } from './library/chevron-down-small';
 export { default as chevronLeft } from './library/chevron-left';
 export { default as chevronLeftSmall } from './library/chevron-left-small';
 export { default as chevronRight } from './library/chevron-right';
@@ -44,6 +50,7 @@ export { default as chevronUpDown } from './library/chevron-up-down';
 export { default as classic } from './library/classic';
 export { default as close } from './library/close';
 export { default as closeSmall } from './library/close-small';
+export { default as cloudDownload } from './library/cloud-download';
 export { default as cloudUpload } from './library/cloud-upload';
 export { default as cloud } from './library/cloud';
 export { default as code } from './library/code';
@@ -52,12 +59,14 @@ export { default as color } from './library/color';
 export { default as column } from './library/column';
 export { default as columns } from './library/columns';
 export { default as copy } from './library/copy';
+export { default as copySmall } from './library/copy-small';
 export { default as comment } from './library/comment';
 export { default as commentAuthorAvatar } from './library/comment-author-avatar';
 export { default as commentAuthorName } from './library/comment-author-name';
 export { default as commentContent } from './library/comment-content';
 export { default as commentReplyLink } from './library/comment-reply-link';
 export { default as commentEditLink } from './library/comment-edit-link';
+export { default as connection } from './library/connection';
 export { default as cover } from './library/cover';
 export { default as create } from './library/create';
 export { default as crop } from './library/crop';
@@ -67,11 +76,13 @@ export { default as currencyPound } from './library/currency-pound';
 export { default as customPostType } from './library/custom-post-type';
 export { default as desktop } from './library/desktop';
 export { default as details } from './library/details';
+export { default as drafts } from './library/drafts';
 export { default as dragHandle } from './library/drag-handle';
 export { default as drawerLeft } from './library/drawer-left';
 export { default as drawerRight } from './library/drawer-right';
 export { default as download } from './library/download';
 export { default as edit } from './library/edit';
+export { default as envelope } from './library/envelope';
 export { default as external } from './library/external';
 export { default as file } from './library/file';
 export { default as filter } from './library/filter';
@@ -113,16 +124,22 @@ export { default as helpFilled } from './library/help-filled';
 export { default as inbox } from './library/inbox';
 export { default as institution } from './library/institution';
 export { default as home } from './library/home';
+export { default as homeButton } from './library/home-button';
 export { default as html } from './library/html';
 export { default as image } from './library/image';
 export { default as info } from './library/info';
 export { default as insertAfter } from './library/insert-after';
 export { default as insertBefore } from './library/insert-before';
+export { default as justifyBottom } from './library/justify-bottom';
 export { default as justifyLeft } from './library/justify-left';
 export { default as justifyCenter } from './library/justify-center';
+export { default as justifyCenterVertical } from './library/justify-center-vertical';
 export { default as justifyRight } from './library/justify-right';
 export { default as justifySpaceBetween } from './library/justify-space-between';
+export { default as justifySpaceBetweenVertical } from './library/justify-space-between-vertical';
 export { default as justifyStretch } from './library/justify-stretch';
+export { default as justifyStretchVertical } from './library/justify-stretch-vertical';
+export { default as justifyTop } from './library/justify-top';
 export { default as key } from './library/key';
 export { default as keyboard } from './library/keyboard';
 export { default as keyboardClose } from './library/keyboard-close';
@@ -156,6 +173,7 @@ export { default as moreHorizontalMobile } from './library/more-horizontal-mobil
 export { default as moreVertical } from './library/more-vertical';
 export { default as moveTo } from './library/move-to';
 export { default as navigation } from './library/navigation';
+export { default as notAllowed } from './library/not-allowed';
 export { default as notFound } from './library/not-found';
 export { default as overlayText } from './library/overlay-text';
 export { default as pageBreak } from './library/page-break';
@@ -164,6 +182,7 @@ export { default as page } from './library/page';
 export { default as pages } from './library/pages';
 export { default as paragraph } from './library/paragraph';
 export { default as payment } from './library/payment';
+export { default as pending } from './library/pending';
 export { default as percent } from './library/percent';
 export { default as positionCenter } from './library/position-center';
 export { default as positionLeft } from './library/position-left';
@@ -190,7 +209,9 @@ export { default as postList } from './library/post-list';
 export { default as postTerms } from './library/post-terms';
 export { default as previous } from './library/previous';
 export { default as next } from './library/next';
+export { default as offline } from './library/offline';
 export { default as preformatted } from './library/preformatted';
+export { default as published } from './library/published';
 export { default as pullLeft } from './library/pull-left';
 export { default as pullRight } from './library/pull-right';
 export { default as pullquote } from './library/pullquote';
@@ -215,6 +236,8 @@ export { default as rss } from './library/rss';
 export { default as search } from './library/search';
 export { default as seen } from './library/seen';
 export { default as unseen } from './library/unseen';
+export { default as scheduled } from './library/scheduled';
+export { default as send } from './library/send';
 export { default as separator } from './library/separator';
 export { default as settings } from './library/settings';
 export { default as shadow } from './library/shadow';
@@ -231,6 +254,7 @@ export { default as store } from './library/store';
 export { default as stretchFullWidth } from './library/stretch-full-width';
 export { default as styles } from './library/styles';
 export { default as shipping } from './library/shipping';
+export { default as square } from './library/square';
 export { default as stretchWide } from './library/stretch-wide';
 export { default as subscript } from './library/subscript';
 export { default as superscript } from './library/superscript';
@@ -244,6 +268,8 @@ export { default as tableRowBefore } from './library/table-row-before';
 export { default as tableRowDelete } from './library/table-row-delete';
 export { default as table } from './library/table';
 export { default as tag } from './library/tag';
+export { default as thumbsDown } from './library/thumbs-down';
+export { default as thumbsUp } from './library/thumbs-up';
 export { default as symbolFilled } from './library/symbol-filled';
 export { default as termDescription } from './library/term-description';
 export { default as footer } from './library/footer';
diff --git a/packages/icons/src/library/arrow-down-right.js b/packages/icons/src/library/arrow-down-right.js
new file mode 100644
index 00000000000000..3755b63873cefc
--- /dev/null
+++ b/packages/icons/src/library/arrow-down-right.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const arrowDownRight = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M10 18h8v-8h-1.5v5.5L7 6 6 7l9.5 9.5H10V18Z" />
+	</SVG>
+);
+
+export default arrowDownRight;
diff --git a/packages/icons/src/library/arrow-up-left.js b/packages/icons/src/library/arrow-up-left.js
new file mode 100644
index 00000000000000..1b3686f6ec1e62
--- /dev/null
+++ b/packages/icons/src/library/arrow-up-left.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const arrowUpLeft = (
+	<SVG width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg">
+		<Path d="M14 6H6v8h1.5V8.5L17 18l1-1-9.5-9.5H14V6Z" />
+	</SVG>
+);
+
+export default arrowUpLeft;
diff --git a/packages/icons/src/library/background.js b/packages/icons/src/library/background.js
new file mode 100644
index 00000000000000..173b609354380d
--- /dev/null
+++ b/packages/icons/src/library/background.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/primitives';
+
+const background = (
+	<SVG width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M11.53 4.47a.75.75 0 1 0-1.06 1.06l8 8a.75.75 0 1 0 1.06-1.06l-8-8Zm5 1a.75.75 0 1 0-1.06 1.06l2 2a.75.75 0 1 0 1.06-1.06l-2-2Zm-11.06 10a.75.75 0 0 1 1.06 0l2 2a.75.75 0 1 1-1.06 1.06l-2-2a.75.75 0 0 1 0-1.06Zm.06-5a.75.75 0 0 0-1.06 1.06l8 8a.75.75 0 1 0 1.06-1.06l-8-8Zm-.06-3a.75.75 0 0 1 1.06 0l10 10a.75.75 0 1 1-1.06 1.06l-10-10a.75.75 0 0 1 0-1.06Zm3.06-2a.75.75 0 0 0-1.06 1.06l10 10a.75.75 0 1 0 1.06-1.06l-10-10Z"
+		/>
+	</SVG>
+);
+
+export default background;
diff --git a/packages/icons/src/library/bell-unread.js b/packages/icons/src/library/bell-unread.js
new file mode 100644
index 00000000000000..96c209ddb09f6d
--- /dev/null
+++ b/packages/icons/src/library/bell-unread.js
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path, Circle } from '@wordpress/primitives';
+
+const bellUnread = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M13.969 4.39A5.088 5.088 0 0 0 12 4C9.2 4 7 6.2 7 9v2.5c0 1.353-.17 2.368-.976 3-.267.209-.602.376-1.024.5v1h14v-1c-.422-.124-.757-.291-1.024-.5-.806-.632-.976-1.647-.976-3V11c-.53 0-1.037-.103-1.5-.29v.79c0 .93.066 1.98.515 2.897l.053.103H7.932l.053-.103c.449-.917.515-1.967.515-2.897V9c0-1.972 1.528-3.5 3.5-3.5.43 0 .838.072 1.214.206.167-.488.425-.933.755-1.316Zm-3.961 13.618c0-.176.023-.346.065-.508h3.854A1.996 1.996 0 0 1 12 20a1.991 1.991 0 0 1-1.992-1.992Z" />
+		<Circle cx="17" cy="7" r="2.5" />
+	</SVG>
+);
+
+export default bellUnread;
diff --git a/packages/icons/src/library/bell.js b/packages/icons/src/library/bell.js
new file mode 100644
index 00000000000000..910488ee3035a5
--- /dev/null
+++ b/packages/icons/src/library/bell.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const bell = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M17 11.5c0 1.353.17 2.368.976 3 .266.209.602.376 1.024.5v1H5v-1c.422-.124.757-.291 1.024-.5.806-.632.976-1.647.976-3V9c0-2.8 2.2-5 5-5s5 2.2 5 5v2.5ZM15.5 9v2.5c0 .93.066 1.98.515 2.897l.053.103H7.932a4.018 4.018 0 0 0 .053-.103c.449-.917.515-1.967.515-2.897V9c0-1.972 1.528-3.5 3.5-3.5s3.5 1.528 3.5 3.5Zm-5.492 9.008c0-.176.023-.346.065-.508h3.854A1.996 1.996 0 0 1 12 20c-1.1 0-1.992-.892-1.992-1.992Z"
+		/>
+	</SVG>
+);
+
+export default bell;
diff --git a/packages/icons/src/library/chevron-down-small.js b/packages/icons/src/library/chevron-down-small.js
new file mode 100644
index 00000000000000..f74ebbb90a90e2
--- /dev/null
+++ b/packages/icons/src/library/chevron-down-small.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const chevronDownSmall = (
+	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+		<Path d="m15.99 10.889-3.988 3.418-3.988-3.418.976-1.14 3.012 2.582 3.012-2.581.976 1.139Z" />
+	</SVG>
+);
+
+export default chevronDownSmall;
diff --git a/packages/icons/src/library/close.js b/packages/icons/src/library/close.js
index 35f0f9bfc71e6e..080a8826f8f8bb 100644
--- a/packages/icons/src/library/close.js
+++ b/packages/icons/src/library/close.js
@@ -5,7 +5,7 @@ import { SVG, Path } from '@wordpress/primitives';
 
 const close = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z" />
+		<Path d="m13.06 12 6.47-6.47-1.06-1.06L12 10.94 5.53 4.47 4.47 5.53 10.94 12l-6.47 6.47 1.06 1.06L12 13.06l6.47 6.47 1.06-1.06L13.06 12Z" />
 	</SVG>
 );
 
diff --git a/packages/icons/src/library/cloud-download.js b/packages/icons/src/library/cloud-download.js
new file mode 100644
index 00000000000000..ad24c7cbcd1436
--- /dev/null
+++ b/packages/icons/src/library/cloud-download.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const cloudDownload = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M17.3 10.1002C17.3 7.6002 15.2 5.7002 12.5 5.7002C10.3 5.7002 8.4 7.1002 7.9 9.0002H7.7C5.7 9.0002 4 10.7002 4 12.8002C4 14.9002 5.7 16.6002 7.7 16.6002V15.2002C6.5 15.2002 5.5 14.1002 5.5 12.9002C5.5 11.7002 6.5 10.5002 7.7 10.5002H9L9.3 9.4002C9.7 8.1002 11 7.2002 12.5 7.2002C14.3 7.2002 15.8 8.5002 15.8 10.1002V11.4002L17.1 11.6002C17.9 11.7002 18.5 12.5002 18.5 13.4002C18.5 14.4002 17.7 15.2002 16.8 15.2002H16.5V16.6002H16.7C18.5 16.6002 19.9 15.1002 19.9 13.3002C20 11.7002 18.8 10.4002 17.3 10.1002Z M9.8806 13.7576L8.81995 14.8182L12.0019 18.0002L15.1851 14.8171L14.1244 13.7564L12.7551 15.1257L12.7551 10.0002L11.2551 10.0002V15.1321L9.8806 13.7576Z" />
+	</SVG>
+);
+
+export default cloudDownload;
diff --git a/packages/icons/src/library/cloud-upload.js b/packages/icons/src/library/cloud-upload.js
index 1df5a19d8742de..d7ab407cf615d2 100644
--- a/packages/icons/src/library/cloud-upload.js
+++ b/packages/icons/src/library/cloud-upload.js
@@ -5,7 +5,7 @@ import { SVG, Path } from '@wordpress/primitives';
 
 const cloudUpload = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path d="M17.3 10.1c0-2.5-2.1-4.4-4.8-4.4-2.2 0-4.1 1.4-4.6 3.3h-.2C5.7 9 4 10.7 4 12.8c0 2.1 1.7 3.8 3.7 3.8h9c1.8 0 3.2-1.5 3.2-3.3.1-1.6-1.1-2.9-2.6-3.2zm-.5 5.1h-4v-2.4L14 14l1-1-3-3-3 3 1 1 1.2-1.2v2.4H7.7c-1.2 0-2.2-1.1-2.2-2.3s1-2.4 2.2-2.4H9l.3-1.1c.4-1.3 1.7-2.2 3.2-2.2 1.8 0 3.3 1.3 3.3 2.9v1.3l1.3.2c.8.1 1.4.9 1.4 1.8 0 1-.8 1.8-1.7 1.8z" />
+		<Path d="M17.3 10.1C17.3 7.60001 15.2 5.70001 12.5 5.70001C10.3 5.70001 8.4 7.10001 7.9 9.00001H7.7C5.7 9.00001 4 10.7 4 12.8C4 14.9 5.7 16.6 7.7 16.6H9.5V15.2H7.7C6.5 15.2 5.5 14.1 5.5 12.9C5.5 11.7 6.5 10.5 7.7 10.5H9L9.3 9.40001C9.7 8.10001 11 7.20001 12.5 7.20001C14.3 7.20001 15.8 8.50001 15.8 10.1V11.4L17.1 11.6C17.9 11.7 18.5 12.5 18.5 13.4C18.5 14.4 17.7 15.2 16.8 15.2H14.5V16.6H16.7C18.5 16.6 19.9 15.1 19.9 13.3C20 11.7 18.8 10.4 17.3 10.1Z M14.1245 14.2426L15.1852 13.182L12.0032 10L8.82007 13.1831L9.88072 14.2438L11.25 12.8745V18H12.75V12.8681L14.1245 14.2426Z" />
 	</SVG>
 );
 
diff --git a/packages/icons/src/library/connection.js b/packages/icons/src/library/connection.js
new file mode 100644
index 00000000000000..482bb8a43dabb8
--- /dev/null
+++ b/packages/icons/src/library/connection.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const connection = (
+	<SVG
+		viewBox="0 0 24 24"
+		xmlns="http://www.w3.org/2000/svg"
+		fillRule="evenodd"
+	>
+		<Path d="M19.53 4.47a.75.75 0 0 1 0 1.06L17.06 8l.77.769a3.155 3.155 0 0 1 .685 3.439 3.15 3.15 0 0 1-.685 1.022v.001L13.23 17.83v.001a3.15 3.15 0 0 1-4.462 0L8 17.06l-2.47 2.47a.75.75 0 0 1-1.06-1.06L6.94 16l-.77-.769a3.154 3.154 0 0 1-.685-3.439 3.15 3.15 0 0 1 .685-1.023l4.599-4.598a3.152 3.152 0 0 1 4.462 0l.769.768 2.47-2.47a.75.75 0 0 1 1.06 0Zm-2.76 7.7L15 13.94 10.06 9l1.771-1.77a1.65 1.65 0 0 1 2.338 0L16.77 9.83a1.649 1.649 0 0 1 0 2.338h-.001ZM13.94 15 9 10.06l-1.77 1.771a1.65 1.65 0 0 0 0 2.338l2.601 2.602a1.649 1.649 0 0 0 2.338 0v-.001L13.94 15Z" />
+	</SVG>
+);
+
+export default connection;
diff --git a/packages/icons/src/library/copy-small.js b/packages/icons/src/library/copy-small.js
new file mode 100644
index 00000000000000..07f6bff15d59b3
--- /dev/null
+++ b/packages/icons/src/library/copy-small.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const copySmall = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M5.625 5.5h9.75c.069 0 .125.056.125.125v9.75a.125.125 0 0 1-.125.125h-9.75a.125.125 0 0 1-.125-.125v-9.75c0-.069.056-.125.125-.125ZM4 5.625C4 4.728 4.728 4 5.625 4h9.75C16.273 4 17 4.728 17 5.625v9.75c0 .898-.727 1.625-1.625 1.625h-9.75A1.625 1.625 0 0 1 4 15.375v-9.75Zm14.5 11.656v-9H20v9C20 18.8 18.77 20 17.251 20H6.25v-1.5h11.001c.69 0 1.249-.528 1.249-1.219Z"
+		/>
+	</SVG>
+);
+
+export default copySmall;
diff --git a/packages/icons/src/library/drafts.js b/packages/icons/src/library/drafts.js
new file mode 100644
index 00000000000000..14e2c3a9345f1b
--- /dev/null
+++ b/packages/icons/src/library/drafts.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const drafts = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M12 18.5a6.5 6.5 0 1 1 0-13 6.5 6.5 0 0 1 0 13ZM4 12a8 8 0 1 1 16 0 8 8 0 0 1-16 0Zm8 4a4 4 0 0 0 4-4H8a4 4 0 0 0 4 4Z"
+		/>
+	</SVG>
+);
+
+export default drafts;
diff --git a/packages/icons/src/library/envelope.js b/packages/icons/src/library/envelope.js
new file mode 100644
index 00000000000000..45064b35785ec1
--- /dev/null
+++ b/packages/icons/src/library/envelope.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const envelope = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M3 7c0-1.1.9-2 2-2h14a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Zm2-.5h14c.3 0 .5.2.5.5v1L12 13.5 4.5 7.9V7c0-.3.2-.5.5-.5Zm-.5 3.3V17c0 .3.2.5.5.5h14c.3 0 .5-.2.5-.5V9.8L12 15.4 4.5 9.8Z"
+		/>
+	</SVG>
+);
+
+export default envelope;
diff --git a/packages/icons/src/library/home-button.js b/packages/icons/src/library/home-button.js
new file mode 100644
index 00000000000000..b952f46d725ff4
--- /dev/null
+++ b/packages/icons/src/library/home-button.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const homeButton = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M4.25 7A2.75 2.75 0 0 1 7 4.25h10A2.75 2.75 0 0 1 19.75 7v10A2.75 2.75 0 0 1 17 19.75H7A2.75 2.75 0 0 1 4.25 17V7ZM7 5.75c-.69 0-1.25.56-1.25 1.25v10c0 .69.56 1.25 1.25 1.25h10c.69 0 1.25-.56 1.25-1.25V7c0-.69-.56-1.25-1.25-1.25H7Z"
+		/>
+	</SVG>
+);
+
+export default homeButton;
diff --git a/packages/icons/src/library/justify-bottom.js b/packages/icons/src/library/justify-bottom.js
new file mode 100644
index 00000000000000..25923e39dcc862
--- /dev/null
+++ b/packages/icons/src/library/justify-bottom.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const justifyBottom = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M15 4H9v11h6V4zM4 18.5V20h16v-1.5H4z" />
+	</SVG>
+);
+
+export default justifyBottom;
diff --git a/packages/icons/src/library/justify-center-vertical.js b/packages/icons/src/library/justify-center-vertical.js
new file mode 100644
index 00000000000000..e3ab16fdc5d619
--- /dev/null
+++ b/packages/icons/src/library/justify-center-vertical.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const justifyCenterVertical = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M20 11h-5V4H9v7H4v1.5h5V20h6v-7.5h5z" />
+	</SVG>
+);
+
+export default justifyCenterVertical;
diff --git a/packages/icons/src/library/justify-space-between-vertical.js b/packages/icons/src/library/justify-space-between-vertical.js
new file mode 100644
index 00000000000000..21a03134a4eb83
--- /dev/null
+++ b/packages/icons/src/library/justify-space-between-vertical.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const justifySpaceBetweenVertical = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M7 4H17V8L7 8V4ZM7 16L17 16V20L7 20V16ZM20 11.25H4V12.75H20V11.25Z" />
+	</SVG>
+);
+
+export default justifySpaceBetweenVertical;
diff --git a/packages/icons/src/library/justify-stretch-vertical.js b/packages/icons/src/library/justify-stretch-vertical.js
new file mode 100644
index 00000000000000..29f976f4e717d3
--- /dev/null
+++ b/packages/icons/src/library/justify-stretch-vertical.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const justifyStretchVertical = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M4 4L20 4L20 5.5L4 5.5L4 4ZM10 7L14 7L14 17L10 17L10 7ZM20 18.5L4 18.5L4 20L20 20L20 18.5Z" />
+	</SVG>
+);
+
+export default justifyStretchVertical;
diff --git a/packages/icons/src/library/justify-top.js b/packages/icons/src/library/justify-top.js
new file mode 100644
index 00000000000000..03c90a242546e3
--- /dev/null
+++ b/packages/icons/src/library/justify-top.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const justifyTop = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M9 20h6V9H9v11zM4 4v1.5h16V4H4z" />
+	</SVG>
+);
+
+export default justifyTop;
diff --git a/packages/icons/src/library/keyboard-return.js b/packages/icons/src/library/keyboard-return.js
index dbced364bac4e4..d4a85e1f1a4982 100644
--- a/packages/icons/src/library/keyboard-return.js
+++ b/packages/icons/src/library/keyboard-return.js
@@ -4,8 +4,8 @@
 import { SVG, Path } from '@wordpress/primitives';
 
 const keyboardReturn = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
-		<Path d="M6.734 16.106l2.176-2.38-1.093-1.028-3.846 4.158 3.846 4.157 1.093-1.027-2.176-2.38h2.811c1.125 0 2.25.03 3.374 0 1.428-.001 3.362-.25 4.963-1.277 1.66-1.065 2.868-2.906 2.868-5.859 0-2.479-1.327-4.896-3.65-5.93-1.82-.813-3.044-.8-4.806-.788l-.567.002v1.5c.184 0 .368 0 .553-.002 1.82-.007 2.704-.014 4.21.657 1.854.827 2.76 2.657 2.76 4.561 0 2.472-.973 3.824-2.178 4.596-1.258.807-2.864 1.04-4.163 1.04h-.02c-1.115.03-2.229 0-3.344 0H6.734z" />
+	<SVG xmlns="http://www.w3.org/2000/svg">
+		<Path d="m6.734 16.106 2.176-2.38-1.093-1.028-3.846 4.158 3.846 4.158 1.093-1.028-2.176-2.38h2.811c1.125 0 2.25.03 3.374 0 1.428-.001 3.362-.25 4.963-1.277 1.66-1.065 2.868-2.906 2.868-5.859 0-2.479-1.327-4.896-3.65-5.93-1.82-.813-3.044-.8-4.806-.788l-.567.002v1.5c.184 0 .368 0 .553-.002 1.82-.007 2.704-.014 4.21.657 1.854.827 2.76 2.657 2.76 4.561 0 2.472-.973 3.824-2.178 4.596-1.258.807-2.864 1.04-4.163 1.04h-.02c-1.115.03-2.229 0-3.344 0H6.734Z" />
 	</SVG>
 );
 
diff --git a/packages/icons/src/library/not-allowed.js b/packages/icons/src/library/not-allowed.js
new file mode 100644
index 00000000000000..cafebb60b7c628
--- /dev/null
+++ b/packages/icons/src/library/not-allowed.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const notAllowed = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M12 18.5A6.5 6.5 0 0 1 6.93 7.931l9.139 9.138A6.473 6.473 0 0 1 12 18.5Zm5.123-2.498a6.5 6.5 0 0 0-9.124-9.124l9.124 9.124ZM4 12a8 8 0 1 1 16 0 8 8 0 0 1-16 0Z"
+		/>
+	</SVG>
+);
+
+export default notAllowed;
diff --git a/packages/icons/src/library/offline.js b/packages/icons/src/library/offline.js
new file mode 100644
index 00000000000000..698a42aa4badb9
--- /dev/null
+++ b/packages/icons/src/library/offline.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const offline = (
+	<SVG viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+		<Path d="M1.36605 2.81332L2.30144 1.87332L13.5592 13.1867L12.6239 14.1267L7.92702 9.40666C6.74618 9.41999 5.57861 9.87999 4.68302 10.78L3.35623 9.44665C4.19874 8.60665 5.2071 8.03999 6.2818 7.75332L4.7958 6.25999C3.78744 6.67332 2.84542 7.29332 2.02944 8.11332L0.702656 6.77999C1.512 5.97332 2.42085 5.33332 3.3894 4.84665L1.36605 2.81332ZM15.2973 6.77999L13.9705 8.11332C12.3054 6.43999 10.1096 5.61332 7.92039 5.62666L6.20883 3.90665C9.41303 3.34665 12.8229 4.29332 15.2973 6.77999ZM10.1759 7.89332C11.0781 8.21332 11.9273 8.72665 12.6438 9.44665L12.1794 9.90665L10.1759 7.89332ZM6.00981 12.1133L8 14.1133L9.99018 12.1133C8.89558 11.0067 7.11105 11.0067 6.00981 12.1133Z" />
+	</SVG>
+);
+
+export default offline;
diff --git a/packages/icons/src/library/pending.js b/packages/icons/src/library/pending.js
new file mode 100644
index 00000000000000..c1c7e326ebe3ef
--- /dev/null
+++ b/packages/icons/src/library/pending.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const pending = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M12 18.5a6.5 6.5 0 1 1 0-13 6.5 6.5 0 0 1 0 13ZM4 12a8 8 0 1 1 16 0 8 8 0 0 1-16 0Zm8 4a4 4 0 0 1-4-4h4V8a4 4 0 0 1 0 8Z"
+		/>
+	</SVG>
+);
+
+export default pending;
diff --git a/packages/icons/src/library/published.js b/packages/icons/src/library/published.js
new file mode 100644
index 00000000000000..c23745caca7459
--- /dev/null
+++ b/packages/icons/src/library/published.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const published = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M12 18.5a6.5 6.5 0 1 1 0-13 6.5 6.5 0 0 1 0 13ZM4 12a8 8 0 1 1 16 0 8 8 0 0 1-16 0Zm11.53-1.47-1.06-1.06L11 12.94l-1.47-1.47-1.06 1.06L11 15.06l4.53-4.53Z"
+		/>
+	</SVG>
+);
+
+export default published;
diff --git a/packages/icons/src/library/scheduled.js b/packages/icons/src/library/scheduled.js
new file mode 100644
index 00000000000000..84c2f01546e6da
--- /dev/null
+++ b/packages/icons/src/library/scheduled.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const scheduled = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M12 18.5a6.5 6.5 0 1 1 0-13 6.5 6.5 0 0 1 0 13ZM4 12a8 8 0 1 1 16 0 8 8 0 0 1-16 0Zm9 1V8h-1.5v3.5h-2V13H13Z"
+		/>
+	</SVG>
+);
+
+export default scheduled;
diff --git a/packages/icons/src/library/send.js b/packages/icons/src/library/send.js
new file mode 100644
index 00000000000000..3770d9a94bc7b7
--- /dev/null
+++ b/packages/icons/src/library/send.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const send = (
+	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M6.332 5.748c-1.03-.426-2.06.607-1.632 1.636l1.702 3.93 7.481.575c.123.01.123.19 0 .2l-7.483.575-1.7 3.909c-.429 1.029.602 2.062 1.632 1.636l12.265-5.076c1.03-.426 1.03-1.884 0-2.31L6.332 5.748Z"
+		/>
+	</SVG>
+);
+
+export default send;
diff --git a/packages/icons/src/library/sides-axial.js b/packages/icons/src/library/sides-axial.js
index 660d3ac20853d1..df8bbd808aef51 100644
--- a/packages/icons/src/library/sides-axial.js
+++ b/packages/icons/src/library/sides-axial.js
@@ -6,12 +6,9 @@ import { SVG, Path } from '@wordpress/primitives';
 const sidesAxial = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
 			d="M8.2 5.3h8V3.8h-8v1.5zm0 14.5h8v-1.5h-8v1.5zm3.5-6.5h1v-1h-1v1zm1-6.5h-1v.5h1v-.5zm-1 4.5h1v-1h-1v1zm0-2h1v-1h-1v1zm0 7.5h1v-.5h-1v.5zm1-2.5h-1v1h1v-1zm-8.5 1.5h1.5v-8H4.2v8zm14.5-8v8h1.5v-8h-1.5zm-5 4.5v-1h-1v1h1zm-6.5 0h.5v-1h-.5v1zm3.5-1v1h1v-1h-1zm6 1h.5v-1h-.5v1zm-8-1v1h1v-1h-1zm6 0v1h1v-1h-1z"
-			style={ {
-				fill: '#1e1e1e',
-				fillRule: 'evenodd',
-				clipRule: 'evenodd',
-			} }
 		/>
 	</SVG>
 );
diff --git a/packages/icons/src/library/sides-bottom.js b/packages/icons/src/library/sides-bottom.js
index 48cd1516e7c16b..2029b28b6a83e8 100644
--- a/packages/icons/src/library/sides-bottom.js
+++ b/packages/icons/src/library/sides-bottom.js
@@ -9,7 +9,7 @@ const sidesBottom = (
 			d="m7.5 6h9v-1.5h-9zm0 13.5h9v-1.5h-9zm-3-3h1.5v-9h-1.5zm13.5-9v9h1.5v-9z"
 			style={ { opacity: 0.25 } }
 		/>
-		<Path d="m16.5 19.5h-9v-1.5h9z" style={ { fill: '#1e1e1e' } } />
+		<Path d="m16.5 19.5h-9v-1.5h9z" />
 	</SVG>
 );
 
diff --git a/packages/icons/src/library/square.js b/packages/icons/src/library/square.js
new file mode 100644
index 00000000000000..843a8d2d5261dd
--- /dev/null
+++ b/packages/icons/src/library/square.js
@@ -0,0 +1,18 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const square = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+		<Path
+			fill="none"
+			d="M5.75 12.75V18.25H11.25M12.75 5.75H18.25V11.25"
+			stroke="currentColor"
+			strokeWidth="1.5"
+			strokeLinecap="square"
+		/>
+	</SVG>
+);
+
+export default square;
diff --git a/packages/icons/src/library/styles.js b/packages/icons/src/library/styles.js
index c91683d55dce18..7d3568e43fd171 100644
--- a/packages/icons/src/library/styles.js
+++ b/packages/icons/src/library/styles.js
@@ -5,7 +5,11 @@ import { Path, SVG } from '@wordpress/primitives';
 
 export const styles = (
 	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-		<Path d="M12 4c-4.4 0-8 3.6-8 8v.1c0 4.1 3.2 7.5 7.2 7.9h.8c4.4 0 8-3.6 8-8s-3.6-8-8-8zm0 15V5c3.9 0 7 3.1 7 7s-3.1 7-7 7z" />
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M20 12a8 8 0 1 1-16 0 8 8 0 0 1 16 0Zm-1.5 0a6.5 6.5 0 0 1-6.5 6.5v-13a6.5 6.5 0 0 1 6.5 6.5Z"
+		/>
 	</SVG>
 );
 
diff --git a/packages/icons/src/library/thumbs-down.js b/packages/icons/src/library/thumbs-down.js
new file mode 100644
index 00000000000000..94e11ee8f06386
--- /dev/null
+++ b/packages/icons/src/library/thumbs-down.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const thumbsDown = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M19.8 4h-1.5l1 8h1.5l-1-8ZM17 5.8c-.1-1-1-1.8-2-1.8H6.8c-.9 0-1.7.6-1.9 1.4l-1.8 6C2.7 12.7 3.7 14 5 14h4.4l-.8 3.6c-.3 1.3.7 2.4 1.9 2.4h.2c.6 0 1.2-.3 1.6-.8l5-6.6c.3-.4.5-.9.4-1.5L17 5.7Zm-.9 5.9-5 6.6c0 .1-.2.2-.4.2h-.2c-.3 0-.6-.3-.5-.6l.8-3.6c.1-.4 0-.9-.3-1.3s-.7-.6-1.2-.6H4.9c-.3 0-.6-.3-.5-.6l1.8-6c0-.2.3-.4.5-.4h8.2c.3 0 .5.2.5.4l.7 5.4v.4Z" />
+	</SVG>
+);
+
+export default thumbsDown;
diff --git a/packages/icons/src/library/thumbs-up.js b/packages/icons/src/library/thumbs-up.js
new file mode 100644
index 00000000000000..f65b6445359e25
--- /dev/null
+++ b/packages/icons/src/library/thumbs-up.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+const thumbsUp = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="m3 12 1 8h1.5l-1-8H3Zm15.8-2h-4.4l.8-3.6c.3-1.3-.7-2.4-1.9-2.4h-.2c-.6 0-1.2.3-1.6.8l-5 6.6c-.3.4-.4.8-.4 1.2v.2l.7 5.4v.2c.2.9 1 1.5 1.9 1.5h8.2c.9 0 1.7-.6 1.9-1.4l1.8-6c.4-1.3-.6-2.6-1.9-2.6Zm.5 2.1-1.8 6c0 .2-.3.4-.5.4H8.8c-.3 0-.5-.2-.5-.4l-.7-5.4v-.4l5-6.6c0-.1.2-.2.4-.2h.2c.3 0 .6.3.5.6l-.8 3.6c-.1.4 0 .9.3 1.3s.7.6 1.2.6h4.4c.3 0 .6.3.5.6Z" />
+	</SVG>
+);
+
+export default thumbsUp;
diff --git a/packages/icons/src/library/unseen.js b/packages/icons/src/library/unseen.js
index 384c67d08ff55f..bb73a2199e1ee4 100644
--- a/packages/icons/src/library/unseen.js
+++ b/packages/icons/src/library/unseen.js
@@ -5,7 +5,7 @@ import { SVG, Path } from '@wordpress/primitives';
 
 const unseen = (
 	<SVG viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-		<Path d="M4.67 10.664s-2.09 1.11-2.917 1.582l.494.87 1.608-.914.002.002c.343.502.86 1.17 1.563 1.84.348.33.742.663 1.185.976L5.57 16.744l.858.515 1.02-1.701a9.1 9.1 0 0 0 4.051 1.18V19h1v-2.263a9.1 9.1 0 0 0 4.05-1.18l1.021 1.7.858-.514-1.034-1.723c.442-.313.837-.646 1.184-.977.703-.669 1.22-1.337 1.563-1.839l.002-.003 1.61.914.493-.87c-1.75-.994-2.918-1.58-2.918-1.58l-.003.005a8.29 8.29 0 0 1-.422.689 10.097 10.097 0 0 1-1.36 1.598c-1.218 1.16-3.042 2.293-5.544 2.293-2.503 0-4.327-1.132-5.546-2.293a10.099 10.099 0 0 1-1.359-1.599 8.267 8.267 0 0 1-.422-.689l-.003-.005Z" />
+		<Path d="M20.7 12.7s0-.1-.1-.2c0-.2-.2-.4-.4-.6-.3-.5-.9-1.2-1.6-1.8-.7-.6-1.5-1.3-2.6-1.8l-.6 1.4c.9.4 1.6 1 2.1 1.5.6.6 1.1 1.2 1.4 1.6.1.2.3.4.3.5v.1l.7-.3.7-.3Zm-5.2-9.3-1.8 4c-.5-.1-1.1-.2-1.7-.2-3 0-5.2 1.4-6.6 2.7-.7.7-1.2 1.3-1.6 1.8-.2.3-.3.5-.4.6 0 0 0 .1-.1.2s0 0 .7.3l.7.3V13c0-.1.2-.3.3-.5.3-.4.7-1 1.4-1.6 1.2-1.2 3-2.3 5.5-2.3H13v.3c-.4 0-.8-.1-1.1-.1-1.9 0-3.5 1.6-3.5 3.5s.6 2.3 1.6 2.9l-2 4.4.9.4 7.6-16.2-.9-.4Zm-3 12.6c1.7-.2 3-1.7 3-3.5s-.2-1.4-.6-1.9L12.4 16Z" />
 	</SVG>
 );
 
diff --git a/packages/icons/tsconfig.json b/packages/icons/tsconfig.json
index f6038b3b0c459e..2877b1d31633bd 100644
--- a/packages/icons/tsconfig.json
+++ b/packages/icons/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/interactivity-router/CHANGELOG.md b/packages/interactivity-router/CHANGELOG.md
new file mode 100644
index 00000000000000..8b7db29395a547
--- /dev/null
+++ b/packages/interactivity-router/CHANGELOG.md
@@ -0,0 +1,70 @@
+<!-- Learn how to maintain this file at https://github.com/WordPress/gutenberg/tree/HEAD/packages#maintaining-changelogs. -->
+
+## Unreleased
+
+## 2.10.0 (2024-10-16)
+
+### Enhancements
+
+-   Improvements to the experimental full-page navigation ([#64067](https://github.com/WordPress/gutenberg/pull/64067)):
+    -   Remove the `src` attributes from prefetched script tags.
+    -   Use `.textContent` instead of `.innerText` to set `<script>` contents.
+    -   Use [`populateServerData()`](https://github.com/WordPress/gutenberg/blob/9671329c386d2b743f14ef314823fbf915366ebd/packages/interactivity/src/store.ts#L269) with state from the server.
+    -   Wait for the `load` event of the script element before evaluating it.
+    -   Make `renderRegions()` an async function.
+    -   Only prefetch **module** scripts, never prefetch regular scripts. That's because regular scripts (without `async` or `defer` attributes) found in the head are blocking and must be executed in order. When prefetching there is no guarantee that the scripts will execute in the order they are prefetched. Module scripts can be executed in any order.
+
+## 2.9.0 (2024-10-03)
+
+## 2.8.0 (2024-09-19)
+
+## 2.7.0 (2024-09-05)
+
+## 2.6.0 (2024-08-21)
+
+## 2.5.0 (2024-08-07)
+
+## 2.4.0 (2024-07-24)
+
+## 2.3.0 (2024-07-10)
+
+## 2.2.0 (2024-06-26)
+
+## 2.1.0 (2024-06-15)
+
+## 2.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 1.8.0 (2024-05-16)
+
+## 1.7.0 (2024-05-02)
+
+## 1.6.0 (2024-04-19)
+
+## 1.5.0 (2024-04-03)
+
+## 1.4.0 (2024-03-21)
+
+## 1.3.0 (2024-03-06)
+
+### Bug Fixes
+
+-   Fix navigate() issues related to initial state merges. ([#57134](https://github.com/WordPress/gutenberg/pull/57134))
+
+## 1.2.0 (2024-02-21)
+
+## 1.1.0 (2024-02-09)
+
+### New Features
+
+-   Add the `clientNavigationDisabled` option to the `core/router` config. ([58749](https://github.com/WordPress/gutenberg/pull/58749))
+
+## 1.0.0 (2024-01-24)
+
+### Breaking Changes
+
+-   Initial version. ([57924](https://github.com/WordPress/gutenberg/pull/57924))
diff --git a/packages/interactivity-router/README.md b/packages/interactivity-router/README.md
new file mode 100644
index 00000000000000..efb52e59be2b5d
--- /dev/null
+++ b/packages/interactivity-router/README.md
@@ -0,0 +1,151 @@
+# `@wordpress/interactivity-router`
+
+The package `@wordpress/interactivity-router` enables loading content from other pages without a full page reload. Currently, the only supported mode is "region-based". Full "client-side navigation" is still in experimental phase.
+
+The package defines an Interactivity API store with the `core/router` namespace, exposing state and 2 actions: `navigate` and `prefetch` to handle client-side navigation.
+
+The `@wordpress/interactivity-router` package was [introduced in WordPress Core in v6.5](https://make.wordpress.org/core/2024/02/19/merge-announcement-interactivity-api/). This means this package is already bundled in Core in any version of WordPress higher than v6.5.
+
+<div class="callout callout-info">
+    Check the <a href="https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/">Interactivity API Reference docs in the Block Editor handbook</a> to learn more about the Interactivity API.
+</div>
+
+## Usage
+
+The package is intended to be imported dynamically in the `view.js` files of interactive blocks. This is done in in order to reduce the JS bundle size on the initial page load.
+
+```js
+/* view.js */
+
+import { store } from '@wordpress/interactivity';
+
+// This is how you would typically use the navigate() action in your block.
+store( 'my-namespace/myblock', {
+	actions: {
+		*goToPage( e ) {
+			e.preventDefault();
+
+			// We import the package dynamically to reduce the initial JS bundle size.
+			// Async actions are defined as generators so the import() must be called with `yield`.
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			yield actions.navigate( e.target.href );
+		},
+	},
+} );
+```
+
+Now, you can call `actions.navigate()` in your block's `view.js` file to navigate to a different page or e.g. pass it to a `data-wp-on--click` attribute.
+
+When loaded, this package [adds the following state and actions](https://github.com/WordPress/gutenberg/blob/ed7d78652526270b63976d7a970dba46a2bfcbb0/packages/interactivity-router/src/index.ts#L212) to the `core/router` store:
+
+```js
+const { state, actions } = store( 'core/router', {
+	state: {
+		url: window.location.href,
+		navigation: {
+			hasStarted: false,
+			hasFinished: false,
+			texts: {
+				loading: '',
+				loaded: '',
+			},
+			message: '',
+		},
+	},
+	actions: {
+		*navigate(href, options) {...},
+		prefetch(url, options) {...},
+	}
+})
+```
+
+<div class="callout callout-tip">
+    The core "Query Loop" block is <a href="https://github.com/WordPress/gutenberg/blob/cd701e94ceffea7ef2f423274a2f77025bcfa1a6/packages/block-library/src/query/view.js#L35">using this package</a> to provide the <a href="https://github.com/WordPress/gutenberg/blob/cd701e94ceffea7ef2f423274a2f77025bcfa1a6/packages/block-library/src/query/index.php#L33">region-based navigation</a>.
+</div>
+
+### Directives
+
+#### `data-wp-router-region`
+
+It defines a region that is updated on navigation. It requires a unique ID as the value and can only be used in root interactive elements, i.e., elements with `data-wp-interactive` that are not nested inside other elements with `data-wp-interactive`.
+
+Example:
+
+```html
+<div data-wp-interactive="myblock" data-wp-router-region="main-list">
+  <ul>
+     <li><a href="/post-1">Post 1</a></li>
+     <li><a href="/post-2">Post 2</a></li>
+     <li><a href="/post-3">Post 3</a></li>
+  </ul>
+  <a data-wp-on--click="actions.navigate" href="/page/2">
+</div>
+```
+
+### Actions
+
+#### `navigate`
+
+Navigates to the specified page.
+
+This function normalizes the passed `href`, fetches the page HTML if needed, and updates any interactive regions whose contents have changed in the new page. It also creates a new entry in the browser session history.
+
+**Params**
+
+```js
+navigate( href: string, options: NavigateOptions = {} )
+```
+
+-   `href`: The page `href`.
+-   `options`: Options object.
+    -   `force`: If `true`, it forces re-fetching the URL. `navigate()` always caches the page, so if the page has been navigated to before, it will be used. Default is `false`.
+    -   `html`: HTML string to be used instead of fetching the requested URL.
+    -   `replace`: If `true`, it replaces the current entry in the browser session history. Default is `false`.
+    -   `timeout`: Time until the navigation is aborted, in milliseconds. Default is `10000`.
+    -   `loadingAnimation`: Whether an animation should be shown while navigating. Default to `true`.
+    -   `screenReaderAnnouncement`: Whether a message for screen readers should be announced while navigating. Default to `true`.
+
+#### `prefetch`
+
+Prefetches the page for the passed URL. The page is cached and can be used for navigation.
+
+The function normalizes the URL and stores internally the fetch promise, to avoid triggering a second fetch for an ongoing request.
+
+**Params**
+
+```js
+prefetch( url: string, options: PrefetchOptions = {} )
+```
+
+-   `url`: The page `url`.
+-   `options`: Options object.
+
+    -   `force`: If `true`, forces fetching the URL again.
+    -   `html`: HTML string to be used instead of fetching the requested URL.
+
+### State
+
+`state.url` is a reactive property synchronized with the current URL.
+Properties under `state.navigation` are meant for loading bar animations.
+
+## Installation
+
+Install the module:
+
+```bash
+npm install @wordpress/interactivity-router --save
+```
+
+This step is only required if you use the Interactivity API outside WordPress.
+
+Within WordPress, the package is already bundled in Core. To ensure it's enqueued, add `@wordpress/interactivity-router` to the dependency array of the script module. This process is often done automatically with tools like [`wp-scripts`](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/).
+
+Furthermore, this package assumes your code will run in an **ES2015+** environment. If you're using an environment with limited or no support for such language features and APIs, you should include the polyfill shipped in [`@wordpress/babel-preset-default`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/babel-preset-default#polyfill) in your code.
+
+## License
+
+Interactivity API proposal, as part of Gutenberg and the WordPress project is free software, and is released under the terms of the GNU General Public License version 2 or (at your option) any later version. See [LICENSE.md](https://github.com/WordPress/gutenberg/blob/trunk/LICENSE.md) for complete license.
+
+<br/><br/><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>
diff --git a/packages/interactivity-router/package.json b/packages/interactivity-router/package.json
new file mode 100644
index 00000000000000..2d33456a5712b0
--- /dev/null
+++ b/packages/interactivity-router/package.json
@@ -0,0 +1,37 @@
+{
+	"name": "@wordpress/interactivity-router",
+	"version": "2.10.0",
+	"description": "Package that exposes state and actions from the `core/router` store, part of the Interactivity API.",
+	"author": "The WordPress Contributors",
+	"license": "GPL-2.0-or-later",
+	"keywords": [
+		"wordpress",
+		"gutenberg",
+		"interactivity"
+	],
+	"homepage": "https://github.com/WordPress/gutenberg/tree/HEAD/packages/interactivity-router/README.md",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/WordPress/gutenberg.git",
+		"directory": "packages/interactivity-router"
+	},
+	"bugs": {
+		"url": "https://github.com/WordPress/gutenberg/labels/%5BFeature%5D%20Interactivity%20API"
+	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
+	"main": "build/index.js",
+	"module": "build-module/index.js",
+	"react-native": "src/index",
+	"types": "build-types",
+	"wpScriptModuleExports": "./build-module/index.js",
+	"dependencies": {
+		"@wordpress/a11y": "*",
+		"@wordpress/interactivity": "*"
+	},
+	"publishConfig": {
+		"access": "public"
+	}
+}
diff --git a/packages/interactivity-router/src/head.ts b/packages/interactivity-router/src/head.ts
new file mode 100644
index 00000000000000..69139348b582ff
--- /dev/null
+++ b/packages/interactivity-router/src/head.ts
@@ -0,0 +1,126 @@
+/**
+ * The cache of prefetched stylesheets and scripts.
+ */
+export const headElements = new Map<
+	string,
+	{ tag: HTMLElement; text?: string }
+>();
+
+/**
+ * Helper to update only the necessary tags in the head.
+ *
+ * @async
+ * @param newHead The head elements of the new page.
+ */
+export const updateHead = async ( newHead: HTMLHeadElement[] ) => {
+	// Helper to get the tag id store in the cache.
+	const getTagId = ( tag: Element ) => tag.id || tag.outerHTML;
+
+	// Map incoming head tags by their content.
+	const newHeadMap = new Map< string, Element >();
+	for ( const child of newHead ) {
+		newHeadMap.set( getTagId( child ), child );
+	}
+
+	const toRemove: Element[] = [];
+
+	// Detect nodes that should be added or removed.
+	for ( const child of document.head.children ) {
+		const id = getTagId( child );
+		// Always remove styles and links as they might change.
+		if ( child.nodeName === 'LINK' || child.nodeName === 'STYLE' ) {
+			toRemove.push( child );
+		} else if ( newHeadMap.has( id ) ) {
+			newHeadMap.delete( id );
+		} else if ( child.nodeName !== 'SCRIPT' && child.nodeName !== 'META' ) {
+			toRemove.push( child );
+		}
+	}
+
+	await Promise.all(
+		[ ...headElements.entries() ]
+			.filter( ( [ , { tag } ] ) => tag.nodeName === 'SCRIPT' )
+			.map( async ( [ url ] ) => {
+				await import( /* webpackIgnore: true */ url );
+			} )
+	);
+
+	// Prepare new assets.
+	const toAppend = [ ...newHeadMap.values() ];
+
+	// Apply the changes.
+	toRemove.forEach( ( n ) => n.remove() );
+	document.head.append( ...toAppend );
+};
+
+/**
+ * Fetches and processes head assets (stylesheets and scripts) from a specified document.
+ *
+ * @async
+ * @param doc The document from which to fetch head assets. It should support standard DOM querying methods.
+ *
+ * @return Returns an array of HTML elements representing the head assets.
+ */
+export const fetchHeadAssets = async (
+	doc: Document
+): Promise< HTMLElement[] > => {
+	const headTags = [];
+
+	// We only want to fetch module scripts because regular scripts (without
+	// `async` or `defer` attributes) can depend on the execution of other scripts.
+	// Scripts found in the head are blocking and must be executed in order.
+	const scripts = doc.querySelectorAll< HTMLScriptElement >(
+		'script[type="module"][src]'
+	);
+
+	scripts.forEach( ( script ) => {
+		const src = script.getAttribute( 'src' );
+		if ( ! headElements.has( src ) ) {
+			// add the <link> elements to prefetch the module scripts
+			const link = doc.createElement( 'link' );
+			link.rel = 'modulepreload';
+			link.href = src;
+			document.head.append( link );
+			headElements.set( src, { tag: script } );
+		}
+	} );
+
+	const stylesheets = doc.querySelectorAll< HTMLLinkElement >(
+		'link[rel=stylesheet]'
+	);
+
+	await Promise.all(
+		Array.from( stylesheets ).map( async ( tag ) => {
+			const href = tag.getAttribute( 'href' );
+			if ( ! href ) {
+				return;
+			}
+
+			if ( ! headElements.has( href ) ) {
+				try {
+					const response = await fetch( href );
+					const text = await response.text();
+					headElements.set( href, {
+						tag,
+						text,
+					} );
+				} catch ( e ) {
+					// eslint-disable-next-line no-console
+					console.error( e );
+				}
+			}
+
+			const headElement = headElements.get( href );
+			const styleElement = doc.createElement( 'style' );
+			styleElement.textContent = headElement.text;
+
+			headTags.push( styleElement );
+		} )
+	);
+
+	return [
+		doc.querySelector( 'title' ),
+		...doc.querySelectorAll( 'style' ),
+		...headTags,
+	];
+};
diff --git a/packages/interactivity-router/src/index.ts b/packages/interactivity-router/src/index.ts
new file mode 100644
index 00000000000000..8a46d4ce350113
--- /dev/null
+++ b/packages/interactivity-router/src/index.ts
@@ -0,0 +1,457 @@
+/**
+ * WordPress dependencies
+ */
+import { store, privateApis, getConfig } from '@wordpress/interactivity';
+
+/**
+ * Internal dependencies
+ */
+import { fetchHeadAssets, updateHead, headElements } from './head';
+
+const {
+	directivePrefix,
+	getRegionRootFragment,
+	initialVdom,
+	toVdom,
+	render,
+	parseServerData,
+	populateServerData,
+	batch,
+} = privateApis(
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.'
+);
+
+interface NavigateOptions {
+	force?: boolean;
+	html?: string;
+	replace?: boolean;
+	timeout?: number;
+	loadingAnimation?: boolean;
+	screenReaderAnnouncement?: boolean;
+}
+
+interface PrefetchOptions {
+	force?: boolean;
+	html?: string;
+}
+
+interface VdomParams {
+	vdom?: typeof initialVdom;
+}
+
+interface Page {
+	regions: Record< string, any >;
+	head: HTMLHeadElement[];
+	title: string;
+	initialData: any;
+}
+
+type RegionsToVdom = ( dom: Document, params?: VdomParams ) => Promise< Page >;
+
+// Check if the navigation mode is full page or region based.
+const navigationMode: 'regionBased' | 'fullPage' =
+	getConfig( 'core/router' ).navigationMode ?? 'regionBased';
+
+// The cache of visited and prefetched pages, stylesheets and scripts.
+const pages = new Map< string, Promise< Page | false > >();
+
+// Helper to remove domain and hash from the URL. We are only interesting in
+// caching the path and the query.
+const getPagePath = ( url: string ) => {
+	const u = new URL( url, window.location.href );
+	return u.pathname + u.search;
+};
+
+// Fetch a new page and convert it to a static virtual DOM.
+const fetchPage = async ( url: string, { html }: { html: string } ) => {
+	try {
+		if ( ! html ) {
+			const res = await window.fetch( url );
+			if ( res.status !== 200 ) {
+				return false;
+			}
+			html = await res.text();
+		}
+		const dom = new window.DOMParser().parseFromString( html, 'text/html' );
+		return regionsToVdom( dom );
+	} catch ( e ) {
+		return false;
+	}
+};
+
+// Return an object with VDOM trees of those HTML regions marked with a
+// `router-region` directive.
+const regionsToVdom: RegionsToVdom = async ( dom, { vdom } = {} ) => {
+	const regions = { body: undefined };
+	let head: HTMLElement[];
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+		if ( navigationMode === 'fullPage' ) {
+			head = await fetchHeadAssets( dom );
+			regions.body = vdom
+				? vdom.get( document.body )
+				: toVdom( dom.body );
+		}
+	}
+	if ( navigationMode === 'regionBased' ) {
+		const attrName = `data-${ directivePrefix }-router-region`;
+		dom.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
+			const id = region.getAttribute( attrName );
+			regions[ id ] = vdom?.has( region )
+				? vdom.get( region )
+				: toVdom( region );
+		} );
+	}
+	const title = dom.querySelector( 'title' )?.innerText;
+	const initialData = parseServerData( dom );
+	return { regions, head, title, initialData };
+};
+
+// Render all interactive regions contained in the given page.
+const renderRegions = async ( page: Page ) => {
+	if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+		if ( navigationMode === 'fullPage' ) {
+			// Once this code is tested and more mature, the head should be updated for region based navigation as well.
+			await updateHead( page.head );
+			const fragment = getRegionRootFragment( document.body );
+			batch( () => {
+				populateServerData( page.initialData );
+				render( page.regions.body, fragment );
+			} );
+		}
+	}
+	if ( navigationMode === 'regionBased' ) {
+		const attrName = `data-${ directivePrefix }-router-region`;
+		batch( () => {
+			populateServerData( page.initialData );
+			document
+				.querySelectorAll( `[${ attrName }]` )
+				.forEach( ( region ) => {
+					const id = region.getAttribute( attrName );
+					const fragment = getRegionRootFragment( region );
+					render( page.regions[ id ], fragment );
+				} );
+		} );
+	}
+	if ( page.title ) {
+		document.title = page.title;
+	}
+};
+
+/**
+ * Load the given page forcing a full page reload.
+ *
+ * The function returns a promise that won't resolve, useful to prevent any
+ * potential feedback indicating that the navigation has finished while the new
+ * page is being loaded.
+ *
+ * @param href The page href.
+ * @return Promise that never resolves.
+ */
+const forcePageReload = ( href: string ) => {
+	window.location.assign( href );
+	return new Promise( () => {} );
+};
+
+// Listen to the back and forward buttons and restore the page if it's in the
+// cache.
+window.addEventListener( 'popstate', async () => {
+	const pagePath = getPagePath( window.location.href ); // Remove hash.
+	const page = pages.has( pagePath ) && ( await pages.get( pagePath ) );
+	if ( page ) {
+		await renderRegions( page );
+		// Update the URL in the state.
+		state.url = window.location.href;
+	} else {
+		window.location.reload();
+	}
+} );
+
+// Initialize the router and cache the initial page using the initial vDOM.
+// Once this code is tested and more mature, the head should be updated for
+// region based navigation as well.
+if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+	if ( navigationMode === 'fullPage' ) {
+		// Cache the scripts. Has to be called before fetching the assets.
+		[].map.call(
+			document.querySelectorAll( 'script[type="module"][src]' ),
+			( script ) => {
+				headElements.set( script.getAttribute( 'src' ), {
+					tag: script,
+				} );
+			}
+		);
+		await fetchHeadAssets( document );
+	}
+}
+pages.set(
+	getPagePath( window.location.href ),
+	Promise.resolve( regionsToVdom( document, { vdom: initialVdom } ) )
+);
+
+// Check if the link is valid for client-side navigation.
+const isValidLink = ( ref: HTMLAnchorElement ) =>
+	ref &&
+	ref instanceof window.HTMLAnchorElement &&
+	ref.href &&
+	( ! ref.target || ref.target === '_self' ) &&
+	ref.origin === window.location.origin &&
+	! ref.pathname.startsWith( '/wp-admin' ) &&
+	! ref.pathname.startsWith( '/wp-login.php' ) &&
+	! ref.getAttribute( 'href' ).startsWith( '#' ) &&
+	! new URL( ref.href ).searchParams.has( '_wpnonce' );
+
+// Check if the event is valid for client-side navigation.
+const isValidEvent = ( event: MouseEvent ) =>
+	event &&
+	event.button === 0 && // Left clicks only.
+	! event.metaKey && // Open in new tab (Mac).
+	! event.ctrlKey && // Open in new tab (Windows).
+	! event.altKey && // Download.
+	! event.shiftKey &&
+	! event.defaultPrevented;
+
+// Variable to store the current navigation.
+let navigatingTo = '';
+
+let hasLoadedNavigationTextsData = false;
+const navigationTexts = {
+	loading: 'Loading page, please wait.',
+	loaded: 'Page Loaded.',
+};
+
+interface Store {
+	state: {
+		url: string;
+		navigation: {
+			hasStarted: boolean;
+			hasFinished: boolean;
+		};
+	};
+	actions: {
+		navigate: ( href: string, options?: NavigateOptions ) => void;
+		prefetch: ( url: string, options?: PrefetchOptions ) => void;
+	};
+}
+
+export const { state, actions } = store< Store >( 'core/router', {
+	state: {
+		url: window.location.href,
+		navigation: {
+			hasStarted: false,
+			hasFinished: false,
+		},
+	},
+	actions: {
+		/**
+		 * Navigates to the specified page.
+		 *
+		 * This function normalizes the passed href, fetchs the page HTML if
+		 * needed, and updates any interactive regions whose contents have
+		 * changed. It also creates a new entry in the browser session history.
+		 *
+		 * @param href                               The page href.
+		 * @param [options]                          Options object.
+		 * @param [options.force]                    If true, it forces re-fetching the URL.
+		 * @param [options.html]                     HTML string to be used instead of fetching the requested URL.
+		 * @param [options.replace]                  If true, it replaces the current entry in the browser session history.
+		 * @param [options.timeout]                  Time until the navigation is aborted, in milliseconds. Default is 10000.
+		 * @param [options.loadingAnimation]         Whether an animation should be shown while navigating. Default to `true`.
+		 * @param [options.screenReaderAnnouncement] Whether a message for screen readers should be announced while navigating. Default to `true`.
+		 *
+		 * @return  Promise that resolves once the navigation is completed or aborted.
+		 */
+		*navigate( href: string, options: NavigateOptions = {} ) {
+			const { clientNavigationDisabled } = getConfig();
+			if ( clientNavigationDisabled ) {
+				yield forcePageReload( href );
+			}
+
+			const pagePath = getPagePath( href );
+			const { navigation } = state;
+			const {
+				loadingAnimation = true,
+				screenReaderAnnouncement = true,
+				timeout = 10000,
+			} = options;
+
+			navigatingTo = href;
+			actions.prefetch( pagePath, options );
+
+			// Create a promise that resolves when the specified timeout ends.
+			// The timeout value is 10 seconds by default.
+			const timeoutPromise = new Promise< void >( ( resolve ) =>
+				setTimeout( resolve, timeout )
+			);
+
+			// Don't update the navigation status immediately, wait 400 ms.
+			const loadingTimeout = setTimeout( () => {
+				if ( navigatingTo !== href ) {
+					return;
+				}
+
+				if ( loadingAnimation ) {
+					navigation.hasStarted = true;
+					navigation.hasFinished = false;
+				}
+				if ( screenReaderAnnouncement ) {
+					a11ySpeak( 'loading' );
+				}
+			}, 400 );
+
+			const page = yield Promise.race( [
+				pages.get( pagePath ),
+				timeoutPromise,
+			] );
+
+			// Dismiss loading message if it hasn't been added yet.
+			clearTimeout( loadingTimeout );
+
+			// Once the page is fetched, the destination URL could have changed
+			// (e.g., by clicking another link in the meantime). If so, bail
+			// out, and let the newer execution to update the HTML.
+			if ( navigatingTo !== href ) {
+				return;
+			}
+
+			if (
+				page &&
+				! page.initialData?.config?.[ 'core/router' ]
+					?.clientNavigationDisabled
+			) {
+				yield renderRegions( page );
+				window.history[
+					options.replace ? 'replaceState' : 'pushState'
+				]( {}, '', href );
+
+				// Update the URL in the state.
+				state.url = href;
+
+				// Update the navigation status once the the new page rendering
+				// has been completed.
+				if ( loadingAnimation ) {
+					navigation.hasStarted = false;
+					navigation.hasFinished = true;
+				}
+
+				if ( screenReaderAnnouncement ) {
+					a11ySpeak( 'loaded' );
+				}
+
+				// Scroll to the anchor if exits in the link.
+				const { hash } = new URL( href, window.location.href );
+				if ( hash ) {
+					document.querySelector( hash )?.scrollIntoView();
+				}
+			} else {
+				yield forcePageReload( href );
+			}
+		},
+
+		/**
+		 * Prefetchs the page with the passed URL.
+		 *
+		 * The function normalizes the URL and stores internally the fetch
+		 * promise, to avoid triggering a second fetch for an ongoing request.
+		 *
+		 * @param url             The page URL.
+		 * @param [options]       Options object.
+		 * @param [options.force] Force fetching the URL again.
+		 * @param [options.html]  HTML string to be used instead of fetching the requested URL.
+		 */
+		prefetch( url: string, options: PrefetchOptions = {} ) {
+			const { clientNavigationDisabled } = getConfig();
+			if ( clientNavigationDisabled ) {
+				return;
+			}
+
+			const pagePath = getPagePath( url );
+			if ( options.force || ! pages.has( pagePath ) ) {
+				pages.set(
+					pagePath,
+					fetchPage( pagePath, { html: options.html } )
+				);
+			}
+		},
+	},
+} );
+
+/**
+ * Announces a message to screen readers.
+ *
+ * This is a wrapper around the `@wordpress/a11y` package's `speak` function. It handles importing
+ * the package on demand and should be used instead of calling `ally.speak` direacly.
+ *
+ * @param messageKey The message to be announced by assistive technologies.
+ */
+function a11ySpeak( messageKey: keyof typeof navigationTexts ) {
+	if ( ! hasLoadedNavigationTextsData ) {
+		hasLoadedNavigationTextsData = true;
+		const content = document.getElementById(
+			'wp-script-module-data-@wordpress/interactivity-router'
+		)?.textContent;
+		if ( content ) {
+			try {
+				const parsed = JSON.parse( content );
+				if ( typeof parsed?.i18n?.loading === 'string' ) {
+					navigationTexts.loading = parsed.i18n.loading;
+				}
+				if ( typeof parsed?.i18n?.loaded === 'string' ) {
+					navigationTexts.loaded = parsed.i18n.loaded;
+				}
+			} catch {}
+		} else {
+			// Fallback to localized strings from Interactivity API state.
+			// @todo This block is for Core < 6.7.0. Remove when support is dropped.
+
+			// @ts-expect-error
+			if ( state.navigation.texts?.loading ) {
+				// @ts-expect-error
+				navigationTexts.loading = state.navigation.texts.loading;
+			}
+			// @ts-expect-error
+			if ( state.navigation.texts?.loaded ) {
+				// @ts-expect-error
+				navigationTexts.loaded = state.navigation.texts.loaded;
+			}
+		}
+	}
+
+	const message = navigationTexts[ messageKey ];
+
+	import( '@wordpress/a11y' ).then(
+		( { speak } ) => speak( message ),
+		// Ignore failures to load the a11y module.
+		() => {}
+	);
+}
+
+// Add click and prefetch to all links.
+if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+	if ( navigationMode === 'fullPage' ) {
+		// Navigate on click.
+		document.addEventListener(
+			'click',
+			function ( event ) {
+				const ref = ( event.target as Element ).closest( 'a' );
+				if ( isValidLink( ref ) && isValidEvent( event ) ) {
+					event.preventDefault();
+					actions.navigate( ref.href );
+				}
+			},
+			true
+		);
+		// Prefetch on hover.
+		document.addEventListener(
+			'mouseenter',
+			function ( event ) {
+				if ( ( event.target as Element )?.nodeName === 'A' ) {
+					const ref = ( event.target as Element ).closest( 'a' );
+					if ( isValidLink( ref ) && isValidEvent( event ) ) {
+						actions.prefetch( ref.href );
+					}
+				}
+			},
+			true
+		);
+	}
+}
diff --git a/packages/interactivity-router/tsconfig.json b/packages/interactivity-router/tsconfig.json
new file mode 100644
index 00000000000000..f601a26a86f5f4
--- /dev/null
+++ b/packages/interactivity-router/tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig.json",
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"declarationDir": "build-types",
+		"checkJs": false,
+		"strict": false
+	},
+	"references": [ { "path": "../a11y" }, { "path": "../interactivity" } ],
+	"include": [ "src/**/*" ]
+}
diff --git a/packages/interactivity/.npmrc b/packages/interactivity/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/interactivity/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 3f54c4c6046d9a..73212578ac109c 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -2,9 +2,203 @@
 
 ## Unreleased
 
+### Bug Fixes
+
+-   Fix reactivity of undefined objects and arrays added with `deepMerge()` ([#66183](https://github.com/WordPress/gutenberg/pull/66183)).
+
+## 6.10.0 (2024-10-16)
+
+### Internal
+
+-   Upgrade preact libraries [#66008](https://github.com/WordPress/gutenberg/pull/66008).
+
+### Bug Fixes
+
+-   Fix an issue where "default" could not be used as a directive suffix ([#65815](https://github.com/WordPress/gutenberg/pull/65815)).
+-   Correctly handle lazily added, deeply nested properties with `deepMerge()` ([#65465](https://github.com/WordPress/gutenberg/pull/65465)).
+
+## 6.9.0 (2024-10-03)
+
+## 6.8.0 (2024-09-19)
+
+### Enhancements
+
+-   Improve TypeScript support for generators ([#64577](https://github.com/WordPress/gutenberg/pull/64577)).
+-   Refactor internal context proxies implementation ([#64713](https://github.com/WordPress/gutenberg/pull/64713)).
+
+### Bug Fixes
+
+-   Prevent calling `proxifyContext` over an already-proxified context inside `wp-context` ([#65090](https://github.com/WordPress/gutenberg/pull/65090)).
+-   Update iterable signals when `deepMerge()` adds new properties ([#65135](https://github.com/WordPress/gutenberg/pull/65135)).
+
+## 6.7.0 (2024-09-05)
+
+### Enhancements
+
+-   Improve internal `deepMerge` function ([#64879](https://github.com/WordPress/gutenberg/pull/64879)).
+
+### Bug Fixes
+
+-   Fix computeds without scope in Firefox ([#64825](https://github.com/WordPress/gutenberg/pull/64825)).
+
+## 6.6.0 (2024-08-21)
+
+### Bug Fixes
+
+-   Fix context inheritance from namespaces different than the current one ([#64677](https://github.com/WordPress/gutenberg/pull/64677)).
+
+## 6.5.0 (2024-08-07)
+
+### Enhancements
+
+-   Refactor internal proxy and signals system ([#62734](https://github.com/WordPress/gutenberg/pull/62734)).
+
+### Bug Fixes
+
+-   Prevent overriding of existing properties on state and context after a client-side navigation ([#62734](https://github.com/WordPress/gutenberg/pull/62734)).
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+### Enhancements
+
+-   Export `splitTask` function from `@wordpress/interactivity` package to facilitate yielding to the main thread. See example in [async actions](https://github.com/WordPress/gutenberg/blob/trunk/docs/reference-guides/interactivity-api/api-reference.md#async-actions) documentation. ([#62665](https://github.com/WordPress/gutenberg/pull/62665))
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### New Features
+
+-   Introduce `wp-on-async` directive as performant alternative over synchronous `wp-on` directive. ([#61885](https://github.com/WordPress/gutenberg/pull/61885))
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+### Bug Fixes
+
+-   Fix null and number strings as namespaces runtime error. ([#61960](https://github.com/WordPress/gutenberg/pull/61960/))
+
+## 5.7.0 (2024-05-16)
+
+### Enhancements
+
+-   Strict type checking: fix some missing nulls in published types ([#59865](https://github.com/WordPress/gutenberg/pull/59865/)).
+
+### Bug Fixes
+
+-   Allow multiple event handlers for the same type with `data-wp-on-document` and `data-wp-on-window`. ([#61009](https://github.com/WordPress/gutenberg/pull/61009))
+-   Prevent wrong written directives from killing the runtime ([#61249](https://github.com/WordPress/gutenberg/pull/61249))
+-   Prevent empty namespace or different namespaces from killing the runtime ([#61409](https://github.com/WordPress/gutenberg/pull/61409))
+
+## 5.6.0 (2024-05-02)
+
+## 5.5.0 (2024-04-19)
+
+### Enhancements
+
+-   Improve data-wp-context debugging by validating it as a stringified JSON Object. ([#61045](https://github.com/WordPress/gutenberg/pull/61045))
+
+### Bug Fixes
+
+-   Hooks useMemo and useCallback should return a value. ([#60474](https://github.com/WordPress/gutenberg/pull/60474))
+
+## 5.4.0 (2024-04-03)
+
+## 5.3.0 (2024-03-21)
+
+### Bug Fixes
+
+-   Prevent non-objects from being set in store state. ([#59886](https://github.com/WordPress/gutenberg/pull/59886))
+-   Ensure that stores are available for subscription before hydration. ([#59842](https://github.com/WordPress/gutenberg/pull/59842))
+-   Ensure scope is restored when catching exceptions thrown in async generator actions. ([#59708](https://github.com/WordPress/gutenberg/pull/59708))
+
+## 5.2.0 (2024-03-06)
+
+### Bug Fixes
+
+-   Prevent passing state proxies as receivers to deepSignal proxy handlers. ([#57134](https://github.com/WordPress/gutenberg/pull/57134))
+-   Keep the same references to objects defined inside the context. ([#59553](https://github.com/WordPress/gutenberg/pull/59553))
+
+## 5.1.0 (2024-02-21)
+
+### Bug Fixes
+
+-   Only add proxies to plain objects inside the store. ([#59039](https://github.com/WordPress/gutenberg/pull/59039))
+-   Improve context merges using proxies. ([59187](https://github.com/WordPress/gutenberg/pull/59187))
+
+## 5.0.0 (2024-02-09)
+
+### New Features
+
+-   Export `getConfig()` to retrieve the server-defined configuration for the passed namespace. ([58749](https://github.com/WordPress/gutenberg/pull/58749))
+
+### Breaking Changes
+
+-   Remove the style prop (`key`) and class name arguments the `data-wp-style` and `data-wp-class` directives. ([#58835](https://github.com/WordPress/gutenberg/pull/58835)).
+-   Remove the `data-wp-body` directive. ([#58835](https://github.com/WordPress/gutenberg/pull/58835))
+
+### Enhancements
+
+-   Break up init with yielding to main to prevent long task from hydration. ([#58227](https://github.com/WordPress/gutenberg/pull/58227))
+-   Support setting the namespace using a string in `data-wp-interactive`, like `data-wp-interactive="myPlugin"`. ([#58743](https://github.com/WordPress/gutenberg/pull/58743))
+
+### Bug Fixes
+
+-   Avoid initializing private stores as public when they have initial state. ([#58754](https://github.com/WordPress/gutenberg/pull/58754))
+
+### Bug Fixes
+
+-   Interactivity API: Remove non default suffix data wp context processing. ([#58664](https://github.com/WordPress/gutenberg/pull/58664))
+
+## 4.0.1 (2024-01-31)
+
+### Bug Fixes
+
+-   Ensure Preact is used in published packages ([58258](https://github.com/WordPress/gutenberg/pull/58258).
+
+## 4.0.0 (2024-01-24)
+
+### Enhancements
+
+-   Prevent the usage of Preact components in `wp-text`. ([#57879](https://github.com/WordPress/gutenberg/pull/57879))
+-   Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([#57891](https://github.com/WordPress/gutenberg/pull/57891))
+-   Export `withScope()` and allow to use it with asynchronous operations. ([#58013](https://github.com/WordPress/gutenberg/pull/58013))
+-   Add `block supports` for `clientNavigation` and `interactive` properties on `block.json` schema.([#58132](https://github.com/WordPress/gutenberg/pull/58132))
+
+### New Features
+
+-   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([#57805](https://github.com/WordPress/gutenberg/pull/57805))
+-   Add `wp-data-on-window` and `wp-data-on-document` directives. ([#57931](https://github.com/WordPress/gutenberg/pull/57931))
+-   Add the `data-wp-each` directive to render lists of items using a template. ([57859](https://github.com/WordPress/gutenberg/pull/57859))
+
+### Breaking Changes
+
+-   Remove `data-wp-slot` and `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
+-   Remove `wp-data-navigation-link` directive. ([#57853](https://github.com/WordPress/gutenberg/pull/57853))
+-   Remove unused `state` and rename `props` to `attributes` in `getElement()`. ([#57974](https://github.com/WordPress/gutenberg/pull/57974))
+-   Convert `navigate` and `prefetch` function to actions of the new `core/router` store, available when importing the `@wordpress/interactivity-router` module. ([#57924](https://github.com/WordPress/gutenberg/pull/57924))
+
+### Bug Fixes
+
+-   Prevent `wp-data-on=""` from creating `onDefault` handlers. ([#57925](https://github.com/WordPress/gutenberg/pull/57925))
+
+## 3.2.0 (2024-01-10)
+
+### Bug Fixes
+
+-   Fix namespaces when there are nested interactive regions. ([#57029](https://github.com/WordPress/gutenberg/pull/57029))
+
+## 3.1.0 (2023-12-13)
+
 ## 3.0.0 (2023-11-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Implement the new `store()` API as specified in the [proposal](https://github.com/WordPress/gutenberg/discussions/53586). ([#55459](https://github.com/WordPress/gutenberg/pull/55459))
 
@@ -12,7 +206,7 @@
 
 ## 2.6.0 (2023-11-02)
 
-### Bug Fix
+### Bug Fixes
 
 -   Update the title when using enhanced pagination. ([#55446](https://github.com/WordPress/gutenberg/pull/55446))
 
@@ -26,7 +220,7 @@
 
 -   Improve `navigate()` to render only the result of the last call when multiple happen simultaneously. ([#54201](https://github.com/WordPress/gutenberg/pull/54201))
 
-### Bug Fix
+### Bug Fixes
 
 -   Remove `role` attribute when set to `null` in `data-wp-bind`. ([#54608](https://github.com/WordPress/gutenberg/pull/54608))
 -   Add `timeout` option to `navigate()`, with a default value of `10000` milliseconds. ([#54474](https://github.com/WordPress/gutenberg/pull/54474))
@@ -50,7 +244,7 @@
 
 -   Allow passing optional `afterLoad` callbacks to `store` calls. ([#53363](https://github.com/WordPress/gutenberg/pull/53363))
 
-### Bug Fix
+### Bug Fixes
 
 -   Add support for underscores and leading dashes in the suffix part of the directive. ([#53337](https://github.com/WordPress/gutenberg/pull/53337))
 -   Add an asynchronous short circuit to `useSignalEffect` to avoid infinite loops. ([#53358](https://github.com/WordPress/gutenberg/pull/53358))
@@ -61,7 +255,7 @@
 
 ## 2.0.0 (2023-08-10)
 
-### Breaking Change
+### Breaking Changes
 
 -   Remove the `wp-show` directive until we figure out its final implementation. ([#53240](https://github.com/WordPress/gutenberg/pull/53240))
 
diff --git a/packages/interactivity/README.md b/packages/interactivity/README.md
index 0ea49bdea0782f..062f51bd0e35a5 100644
--- a/packages/interactivity/README.md
+++ b/packages/interactivity/README.md
@@ -1,62 +1,29 @@
-# Interactivity API
+# `@wordpress/interactivity`
 
-> **Warning**
-> **This package is only available in Gutenberg** at the moment and not in WordPress Core as it is still very experimental, and very likely to change. 
+The package `@wordpress/interactivity` contains the logic that enables the Interactivity API which was [introduced in WordPress Core in v6.5](https://make.wordpress.org/core/2024/02/19/merge-announcement-interactivity-api/). This means this package is already bundled in Core in any version of WordPress higher than v6.5.
 
+<div class="callout callout-info">
+    Check the <a href="https://developer.wordpress.org/block-editor/reference-guides/interactivity-api/">Interactivity API Reference docs in the Block Editor handbook</a> to learn more about the Interactivity API.
+</div>
 
-> **Note**
-> This package enables the API shared at [Proposal: The Interactivity API – A better developer experience in building interactive blocks](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/). As part of an [Open Source project](https://developer.wordpress.org/block-editor/getting-started/faq/#the-gutenberg-project) we encourage participation in helping shape this API and the [discussions in GitHub](https://github.com/WordPress/gutenberg/discussions/categories/interactivity-api) is the best place to engage.
-
-This package can be tested, but it's still very experimental.
-The Interactivity API is [being used in some core blocks](https://github.com/search?q=repo%3AWordPress%2Fgutenberg%20%40wordpress%2Finteractivity&type=code) but its use is still very limited. 
-
-
-## Frequently Asked Questions 
-
-At this point, some of the questions you have about the Interactivity API may be:
-
-### What is this?
-
-This is the base of a new standard to create interactive blocks. Read [the proposal](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/) to learn more about this.
-
-### Can I use it?
-
-You can test it, but it's still very experimental.
-
-### How do I get started?
-
-The best place to start with the Interactivity API is this [**Getting started guide**](https://github.com/WordPress/gutenberg/blob/trunk/packages/interactivity/docs/1-getting-started.md). There you'll will find a very quick start guide and the current requirements of the Interactivity API.
-
-### Where can I ask questions?
-
-The [“Interactivity API” category](https://github.com/WordPress/gutenberg/discussions/categories/interactivity-api) in Gutenberg repo discussions is the best place to ask questions about the Interactivity API.
-
-### Where can I share my feedback about the API?
-
-The [“Interactivity API” category](https://github.com/WordPress/gutenberg/discussions/categories/interactivity-api) in Gutenberg repo discussions is also the best place to share your feedback about the Interactivity API.
 
 ## Installation
 
-Install the module:
+Install the Interactivity API using the command:
 
 ```bash
 npm install @wordpress/interactivity --save
 ```
 
-_This package assumes that your code will run in an **ES2015+** environment. If you're using an environment that has limited or no support for such language features and APIs, you should include [the polyfill shipped in `@wordpress/babel-preset-default`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/babel-preset-default#polyfill) in your code._
+This step is only required if you use the Interactivity API outside WordPress.
 
-## Docs & Examples
+Within WordPress, the package is already bundled in Core. To ensure it's loaded, add `@wordpress/interactivity` to the dependency array of the script module. This process is often done automatically with tools like [`wp-scripts`](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-scripts/).
 
-**[Interactivity API Documentation](https://github.com/WordPress/gutenberg/tree/trunk/packages/interactivity/docs)** is the best place to learn about this proposal. Although it's still in progress, some key pages are already available:
+Furthermore, this package assumes your code will run in an **ES2015+** environment. If you're using an environment with limited or no support for such language features and APIs, you should include the polyfill shipped in [`@wordpress/babel-preset-default`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/babel-preset-default#polyfill) in your code.
 
-- **[Getting Started Guide](https://github.com/WordPress/gutenberg/blob/trunk/packages/interactivity/docs/1-getting-started.md)**: Follow this Getting Started guide to learn how to scaffold a new project and create your first interactive blocks.
-- **[API Reference](https://github.com/WordPress/gutenberg/blob/trunk/packages/interactivity/docs/2-api-reference.md)**: Check this page for technical  detailed explanations and examples of the directives and the store.
 
-Here you have some more resources to learn/read more about the Interactivity API:
+## License
 
-- **[Interactivity API Discussions](https://github.com/WordPress/gutenberg/discussions/52882)**
-- [Proposal: The Interactivity API – A better developer experience in building interactive blocks](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/)
-- Developer Hours sessions ([Americas](https://www.youtube.com/watch?v=RXNoyP2ZiS8&t=664s) & [APAC/EMEA](https://www.youtube.com/watch?v=6ghbrhyAcvA))
-- [wpmovies.dev](http://wpmovies.dev/) demo and its [wp-movies-demo](https://github.com/WordPress/wp-movies-demo) repo
+Interactivity API proposal, as part of Gutenberg and the WordPress project is free software, and is released under the terms of the GNU General Public License version 2 or (at your option) any later version. See [LICENSE.md](https://github.com/WordPress/gutenberg/blob/trunk/LICENSE.md) for complete license.
 
-<br /><br /><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>
+<br/><br/><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>
diff --git a/packages/interactivity/docs/1-getting-started.md b/packages/interactivity/docs/1-getting-started.md
deleted file mode 100644
index 0b4708b78b3509..00000000000000
--- a/packages/interactivity/docs/1-getting-started.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# Getting started with the Interactivity API
-
-To get started with the Interactivity API, you can follow this [**Quick Start Guide**](#quick-start-guide) by taking into account the [current requirements of the Interactivity API](#requirements-of-the-interactivity-api) (especially the need for Gutenberg 16.2 or later).
-
-## Table of Contents
-
-- [Quick Start Guide](#quick-start-guide)
-    - [1. Scaffold an interactive block](#1-scaffold-an-interactive-block)
-    - [2. Generate the build](#2-generate-the-build) 
-    - [3. Use it in your WordPress installation ](#3-use-it-in-your-wordpress-installation)
-- [Requirements of the Interactivity API](#requirements-of-the-interactivity-aPI)
-    - [A local WordPress installation](#a-local-wordpress-installation)
-    - [Latest vesion of Gutenberg](#latest-vesion-of-gutenberg)
-    - [Node.js](#nodejs)
-    - [Code requirements](#code-requirements)  
-        - [Add `interactivity` support to `block.json`](#add-interactivity-support-to-blockjson)
-        - [Add `wp-interactive` directive to a DOM element](#add-wp-interactive-directive-to-a-dom-element)
-
-## Quick Start Guide
-
-#### 1. Scaffold an interactive block
-
-We can scaffold a WordPress plugin that registers an interactive block (using the Interactivity API) by using a [template](https://www.npmjs.com/package/@wordpress/create-block-interactive-template) with the `@wordpress/create-block` command.
-
-```
-npx @wordpress/create-block my-first-interactive-block --template @wordpress/create-block-interactive-template
-```
-
-#### 2. Generate the build 
-
-When the plugin folder is generated, we should launch the build process to get the final version of the interactive block that can be used from WordPress. 
-
-```
-cd my-first-interactive-block && npm start
-```
-
-#### 3. Use it in your WordPress installation 
-
-If you have a local WordPress installation already running, you can launch the commands above inside the `plugins` folder of that installation. If not, you can use [`wp-now`](https://github.com/WordPress/playground-tools/tree/trunk/packages/wp-now) to launch a WordPress site with the plugin installed by executing from the generated folder (and from a different terminal window or tab) the following command
-
-```
-npx @wp-now/wp-now start 
-```
-
-At this point you should be able to insert the "My First Interactive Block" block into any post, and see how it behaves in the frontend when published. 
-
-> **Note**
-> We recommend you to also check the [API Reference](./2-api-reference.md) docs for your first exploration of the Interactivity API
-
-## Requirements of the Interactivity API
-
-To start working with the Interactivity API you'll need to have a [proper WordPress development environment for blocks](https://developer.wordpress.org/block-editor/getting-started/devenv/)  and some specific code in your block, which should include:
-
-#### A local WordPress installation
-
-You can use [the tools to set your local WordPress environment](https://developer.wordpress.org/block-editor/getting-started/devenv/#wordpress-development-site) you feel more comfortable with. 
-
-To get quickly started, [`wp-now`](https://www.npmjs.com/package/@wp-now/wp-now) is the easiest way to get a WordPress site up and running locally. 
-
-#### Latest vesion of Gutenberg
-
-The Interactivity API is currently only available as an experimental feature from Gutenberg 16.2, so you'll need to have Gutenberg 16.2 or higher version installed and activated in your WordPress installation.
-
-#### Node.js
-
-Block development requires [Node](https://nodejs.org/en), so you'll need to have Node installed and running on your machine. Any version modern should work, but please check the minimum version requirements if you run into any issues with any of the Node.js tools used in WordPress development.
-
-#### Code requirements 
-
-##### Add `interactivity` support to `block.json`
-
-To indicate that our block [supports](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/) the Interactivity API features, we do so by adding `"interactivity": true` to the `supports` attribute of our block's `block.json`
-
-```
-"supports": {
-    "interactivity": true
-},
-```
-
-##### Add `wp-interactive` directive to a DOM element
-
-To "activate" the Interactivity API in a DOM element (and its children) we add the [`wp-interactive` directive](./2-api-reference.md#wp-interactive) to it from our `render.php` or `save.js`
-
-
-```html
-<div data-wp-interactive='{ "namespace": "myPlugin" }'>
-    <!-- Interactivity API zone -->
-</div>
-```
\ No newline at end of file
diff --git a/packages/interactivity/docs/2-api-reference.md b/packages/interactivity/docs/2-api-reference.md
deleted file mode 100644
index 3c8f179861f525..00000000000000
--- a/packages/interactivity/docs/2-api-reference.md
+++ /dev/null
@@ -1,773 +0,0 @@
-# API Reference
-
-To add interactivity to blocks using the Interactivity API, developers can use:
-
-- **Directives** - added to the markup to add specific behavior to the DOM elements of the block.
-- **Store** - that contains the logic and data (state, actions, or side effects, among others) needed for the behavior.
-
-DOM elements are connected to data stored in the state and context through directives. If data in the state or context change directives will react to those changes, updating the DOM accordingly (see [diagram](https://excalidraw.com/#json=T4meh6lltJh6TCX51NTIu,DmIhxYSGFTL_ywZFbsmuSw)).
-
-![State & Directives](assets/state-directives.png)
-
-## Table of Contents
-
-- [The directives](#the-directives)
-  - [List of Directives](#list-of-directives)
-    - [`wp-interactive`](#wp-interactive) ![](https://img.shields.io/badge/DECLARATIVE-afd2e3.svg)
-    - [`wp-context`](#wp-context) ![](https://img.shields.io/badge/STATE-afd2e3.svg)
-    - [`wp-bind`](#wp-bind) ![](https://img.shields.io/badge/ATTRIBUTES-afd2e3.svg)
-    - [`wp-class`](#wp-class) ![](https://img.shields.io/badge/ATTRIBUTES-afd2e3.svg)
-    - [`wp-style`](#wp-style) ![](https://img.shields.io/badge/ATTRIBUTES-afd2e3.svg)
-    - [`wp-text`](#wp-text) ![](https://img.shields.io/badge/CONTENT-afd2e3.svg)
-    - [`wp-on`](#wp-on) ![](https://img.shields.io/badge/EVENT_HANDLERS-afd2e3.svg)
-    - [`wp-watch`](#wp-watch) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
-    - [`wp-init`](#wp-init) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
-    - [`wp-key`](#wp-key) ![](https://img.shields.io/badge/TEMPLATING-afd2e3.svg)
-  - [Values of directives are references to store properties](#values-of-directives-are-references-to-store-properties)
-- [The store](#the-store)
-  - [Elements of the store](#elements-of-the-store)
-    - [State](#state)
-    - [Actions](#actions)
-    - [Side Effects](#side-effects)
-  - [Setting the store](#setting-the-store)
-    - [On the client side](#on-the-client-side)
-    - [On the server side](#on-the-server-side)
-
-## The directives
-
-Directives are custom attributes that are added to the markup of your block to add behavior to its DOM elements. This can be done in the `render.php` file (for dynamic blocks) or the `save.js` file (for static blocks).
-
-Interactivity API directives use the `data-` prefix.
-
-_Example of directives used in the HTML markup_
-
-```html
-<div
-  data-wp-interactive='{ "namespace": "myPlugin" }'
-  data-wp-context='{ "isOpen": false }'
-  data-wp-watch="callbacks.logIsOpen"
->
-  <button
-    data-wp-on--click="actions.toggle"
-    data-wp-bind--aria-expanded="context.isOpen"
-    aria-controls="p-1"
-  >
-    Toggle
-  </button>
- 
-  <p id="p-1" data-bind--hidden="!context.isOpen">
-    This element is now visible!
-  </p>
-</div>
-```
-
-Directives can also be injected dynamically using the [HTML Tag Processor](https://make.wordpress.org/core/2023/03/07/introducing-the-html-api-in-wordpress-6-2).
-
-### List of Directives
-
-With directives, we can directly manage behavior related to things such as side effects, state, event handlers, attributes or content.
-
-#### `wp-interactive` 
-
-The `wp-interactive` directive "activates" the interactivity for the DOM element and its children through the Interactivity API (directives and store). It includes a namespace to reference a specific store.
-
-```html
-<!-- Let's make this element and its children interactive and set the namespace -->
-<div 
-  data-wp-interactive='{ "namespace": "myPlugin" }'
-  data-wp-context='{ "myColor" : "red", "myBgColor": "yellow" }'
->
-  <p>I'm interactive now, <span data-wp-style--background-color="context.myBgColor">>and I can use directives!</span></p>
-  <div>
-    <p>I'm also interactive, <span data-wp-style--color="context.myColor">and I can also use directives!</span></p>
-  </div>
-</div>
-```
-
-> **Note**
-> The use of `data-wp-interactive` is a requirement for the Interactivity API "engine" to work. In the following examples the `data-wp-interactive` has not been added for the sake of simplicity. Also, the `data-wp-interactive` directive will be injected automatically in the future.
-
-#### `wp-context` 
-
-It provides a **local** state available to a specific HTML node and its children.
-
-The `wp-context` directive accepts a stringified JSON as a value.
-
-_Example of `wp-context` directive_ 
-
-```php
-//render.php
-<div data-wp-context='{ "post": { "id": <?php echo $post->ID; ?> } }' >
-  <button data-wp-on--click="actions.logId" >
-    Click Me!
-  </button>
-</div>
-```
-
-<details>
-  <summary><em>See store used with the directive above</em></summary>
-
-```js
-store( "myPlugin", {
-  actions: {
-    logId: () => {
-      const { post } = getContext();
-      console.log( post.id );
-    },
-  },
-} );
-```
-
-</details>
-<br/>
-
-Different contexts can be defined at different levels, and deeper levels will merge their own context with any parent one:
-
-```html
-<div data-wp-context="{ foo: 'bar' }">
-  <span data-wp-text="context.foo"><!-- Will output: "bar" --></span>
-
-  <div data-wp-context="{ bar: 'baz' }">
-    <span data-wp-text="context.foo"><!-- Will output: "bar" --></span>
-
-    <div data-wp-context="{ foo: 'bob' }">
-      <span data-wp-text="context.foo"><!-- Will output: "bob" --></span>
-    </div>
-
-  </div>
-</div>
-```
-
-#### `wp-bind` 
-
-It allows setting HTML attributes on elements based on a boolean or string value.
-
-> This directive follows the syntax `data-wp-bind--attribute`.
-
-_Example of `wp-bind` directive_ 
-
-```html
-<li data-wp-context='{ "isMenuOpen": false }'>
-  <button
-    data-wp-on--click="actions.toggleMenu"
-    data-wp-bind--aria-expanded="context.isMenuOpen"
-  >
-    Toggle
-  </button>
-  <div data-wp-bind--hidden="!context.isMenuOpen">
-    <span>Title</span>
-    <ul>
-      SUBMENU ITEMS
-    </ul>
-  </div>
-</li>
-```
-
-<details>
-  <summary><em>See store used with the directive above</em></summary>
-
-```js
-store( "myPlugin", {
-  actions: {
-    toggleMenu: () => {
-      const context = getContext();
-      context.isMenuOpen = !context.isMenuOpen;
-    },
-  },
-} );
-```
-
-</details>
-<br/>
-
-The `wp-bind` directive is executed:
-
-- When the element is created. 
-- Each time there's a change on any of the properties of the `state` or `context` involved in getting the final value of the directive (inside the callback or the expression passed as reference).
-
-When `wp-bind` directive references a callback to get its final value: 
-
-- The `wp-bind` directive will be executed each time there's a change on any of the properties of the `state` or `context` used inside this callback.
-- The returned value in the callback function is used to change the value of the associated attribute.
-
-The `wp-bind` will do different things over the DOM element is applied, depending on its value:
-
-  - If the value is `true`, the attribute is added: `<div attribute>`.
-  - If the value is `false`, the attribute is removed: `<div>`.
-  - If the value is a string, the attribute is added with its value assigned: `<div attribute="value"`.
-  - If the attribute name starts with `aria-` or `data-` and the value is boolean (either `true` or `false`), the attribute is added to the DOM with the boolean value assigned as a string: `<div aria-attribute="true">`.
-
-#### `wp-class` 
-
-It adds or removes a class to an HTML element, depending on a boolean value.
-
-> This directive follows the syntax `data-wp-class--classname`.
-
-_Example of `wp-class` directive_ 
-
-```html
-<div>
-  <li 
-    data-wp-context='{ "isSelected": false }'
-    data-wp-on--click="actions.toggleSelection"
-    data-wp-class--selected="context.isSelected"
-  >
-    Option 1
-  </li>
-  <li 
-    data-wp-context='{ "isSelected": false }'
-    data-wp-on--click="actions.toggleSelection"
-    data-wp-class--selected="context.isSelected"
-  >
-    Option 2
-  </li>
-</div>
-```
-
-<details>
-  <summary><em>See store used with the directive above</em></summary>
-
-```js
-store( "myPlugin", {
-  actions: {
-    toggleSelection: () => {
-      const context = getContext();
-      context.isSelected = !context.isSelected
-    }
-  }
-} );
-```
-
-</details>
-<br/>
-
-The `wp-class` directive is executed:
-
-- When the element is created.
-- Each time there's a change on any of the properties of the `state` or `context` involved in getting the final value of the directive (inside the callback or the expression passed as reference).
-
-When `wp-class` directive references a callback to get its final boolean value, the callback receives the class name: `className`.
-
-The boolean value received by the directive is used to toggle (add when `true` or remove when `false`) the associated class name from the `class` attribute.
-
-#### `wp-style` 
-
-It adds or removes inline style to an HTML element, depending on its value.
-
-> This directive follows the syntax `data-wp-style--css-property`.
-
-_Example of `wp-style` directive_ 
-
-```html
-<div data-wp-context='{ "color": "red" }' >
-  <button data-wp-on--click="actions.toggleContextColor">Toggle Color Text</button>
-  <p data-wp-style--color="context.color">Hello World!</p>
-</div>
->
-```
-
-<details>
-  <summary><em>See store used with the directive above</em></summary>
-
-```js
-store( "myPlugin", {
-  actions: {
-    toggleContextColor: () => {
-      const context = getContext();
-      context.color = context.color === 'red' ? 'blue' : 'red';
-    },
-  },
-} );
-```
-
-</details>
-<br/>
-
-The `wp-style` directive is executed:
-
-- When the element is created.
-- Each time there's a change on any of the properties of the `state` or `context` involved in getting the final value of the directive (inside the callback or the expression passed as reference).
-
-When `wp-style` directive references a callback to get its final value, the callback receives the class style property: `css-property`.
-
-The value received by the directive is used to add or remove the style attribute with the associated CSS property: :
-
-- If the value is `false`, the style attribute is removed: `<div>`.
-- If the value is a string, the attribute is added with its value assigned: `<div style="css-property: value;">`.
-
-#### `wp-text` 
-
-It sets the inner text of an HTML element.
-
-```html
-<div data-wp-context='{ "text": "Text 1" }'>
-  <span data-wp-text="context.text"></span>
-  <button data-wp-on--click="actions.toggleContextText">
-    Toggle Context Text
-  </button>
-</div>
-```
-
-<details>
-  <summary><em>See store used with the directive above</em></summary>
-
-```js
-store( "myPlugin", {
-  actions: {
-    toggleContextText: () => {
-      const context = getContext();
-      context.text = context.text === 'Text 1' ? 'Text 2' : 'Text 1';
-    },
-  },
-} );
-```
-
-</details>
-<br/>
-
-The `wp-text` directive is executed:
-
-- When the element is created.
-- Each time there's a change on any of the properties of the `state` or `context` involved in getting the final value of the directive (inside the callback or the expression passed as reference).
-
-The returned value is used to change the inner content of the element: `<div>value</div>`.
-
-#### `wp-on` 
-
-It runs code on dispatched DOM events like `click` or `keyup`. 
-
-> The syntax of this directive is `data-wp-on--[event]` (like `data-wp-on--click` or `data-wp-on--keyup`).
-
-_Example of `wp-on` directive_ 
-
-```php
-<button data-wp-on--click="actions.logTime" >
-  Click Me!
-</button>
-```
-
-<details>
-  <summary><em>See store used with the directive above</em></summary>
-
-```js
-store( "myPlugin", {
-  actions: {
-    logTime: ( event ) => {
-      console.log( new Date() )
-    },
-  },
-} );
-```
-
-</details>
-<br/>
-
-The `wp-on` directive is executed each time the associated event is triggered. 
-
-The callback passed as the reference receives [the event](https://developer.mozilla.org/en-US/docs/Web/API/Event) (`event`), and the returned value by this callback is ignored.
-
-#### `wp-watch` 
-
-It runs a callback **when the node is created and runs it again when the state or context changes**. 
-
-You can attach several side effects to the same DOM element by using the syntax `data-wp-watch--[unique-id]`. _The unique id doesn't need to be unique globally, it just needs to be different than the other unique ids of the `wp-watch` directives of that DOM element._
-
-_Example of `wp-watch` directive_
-
-```html
-<div 
-  data-wp-context='{ "counter": 0 }'
-  data-wp-watch="callbacks.logCounter"
->
-  <p>Counter: <span data-wp-text="context.counter"></span></p>
-  <button data-wp-on--click="actions.increaseCounter">+</button>
-  <button data-wp-on--click="actions.decreaseCounter">-</button>
-</div>
-```
-
-<details>
-  <summary><em>See store used with the directive above</em></summary>
-
-```js
-store( "myPlugin", {
-  actions: {
-    increaseCounter: () => {
-      const context = getContext();
-      context.counter++;
-    },
-    decreaseCounter: () => {	
-      const context = getContext();
-      context.counter--;
-    },
-  },
-  callbacks: {
-    logCounter: () => {
-      const { counter } = getContext(); 
-      console.log("Counter is " + counter + " at " + new Date() );
-    },
-  },
-} );
-```
-
-</details>
-<br/>
-
-The `wp-watch` directive is executed:
-
-- When the element is created.
-- Each time that any of the properties of the `state` or `context` used inside the callback changes.
-
-The `wp-watch` directive can return a function. If it does, the returned function is used as cleanup logic, i.e., it will run just before the callback runs again, and it will run again when the element is removed from the DOM.
-
-As a reference, some use cases for this directive may be:
-
-- Logging.
-- Changing the title of the page.
-- Setting the focus on an element with `.focus()`.
-- Changing the state or context when certain conditions are met.
-
-#### `wp-init` 
-
-It runs a callback **only when the node is created**.
-
-You can attach several `wp-init` to the same DOM element by using the syntax `data-wp-init--[unique-id]`. _The unique id doesn't need to be unique globally, it just needs to be different than the other unique ids of the `wp-init` directives of that DOM element._
-
-_Example of `data-wp-init` directive_ 
-
-```html
-<div data-wp-init="callbacks.logTimeInit">
-  <p>Hi!</>
-</div>
-```
-
-_Example of several `wp-init` directives on the same DOM element_
-
-```html
-<form 
-  data-wp-init--log="callbacks.logTimeInit" 
-  data-wp-init--focus="callbacks.focusFirstElement"
->
-  <input type="text">
-</form>
-```
-
-<details>
-  <summary><em>See store used with the directive above</em></summary>
-
-```js
-store( "myPlugin", {
-  callbacks: {
-    logTimeInit: () => console.log( `Init at ` + new Date() ),
-    focusFirstElement: () => {
-      const { ref } = getElement();
-      ref.querySelector( 'input:first-child' ).focus(),
-    },
-  },
-} );
-```
-
-</details>
-<br/>
-
-The `wp-init` can return a function. If it does, the returned function will run when the element is removed from the DOM.
-
-#### `wp-key` 
-
-The `wp-key` directive assigns a unique key to an element to help the Interactivity API identify it when iterating through arrays of elements. This becomes important if your array elements can move (e.g., due to sorting), get inserted, or get deleted. A well-chosen key value helps the Interactivity API infer what exactly has changed in the array, allowing it to make the correct updates to the DOM.
-
-The key should be a string that uniquely identifies the element among its siblings. Typically, it is used on repeated elements like list items. For example:
-
-```html
-<ul>
-  <li data-wp-key="unique-id-1">Item 1</li> 
-  <li data-wp-key="unique-id-2">Item 2</li>
-</ul>  
-```
-
-But it can also be used on other elements:
-
-```html
-<div>
-  <a data-wp-key="previous-page" ...>Previous page</a> 
-  <a data-wp-key="next-page" ...>Next page</a>
-</div>  
-```
-
-When the list is re-rendered, the Interactivity API will match elements by their keys to determine if an item was added/removed/reordered. Elements without keys might be recreated unnecessarily.
-
-### Values of directives are references to store properties
-
-The value assigned to a directive is a string pointing to a specific state, action, or side effect.
-
-In the following example, we use a getter to define the `state.isPlaying` derived value.
-
-```js
-const { state } = store( "myPlugin", {
-  state: {
-    currentVideo: '',
-    get isPlaying() {
-      return state.currentVideo !== '';
-    } 
-  },
-} );
-```
-
-And then, we use the string value `"state.isPlaying"` to assign the result of this selector to `data-bind--hidden`.
-
-```html
-<div data-bind--hidden="!state.isPlaying" ... >
-  <iframe ...></iframe>
-</div>
-```
-
-These values assigned to directives are **references** to a particular property in the store. They are wired to the directives automatically so that each directive “knows” what store element refers to, without any additional configuration.
-
-Note that, by default, references point to properties in the current namespace, which is the one specified by the closest ancestor with a `data-wp-interactive` attribute. If you need to access a property from a different namespace, you can explicitly set the namespace where the property we want to access is defined. The syntax is `namespace::reference`, replacing `namespace` with the appropriate value.
-
-In the example below, we get `state.isPlaying` from `otherPlugin` instead of `myPlugin`:
-
-```html
-<div data-wp-interactive='{ "namespace": "myPlugin" }'>
-	<div data-bind--hidden="otherPlugin::!state.isPlaying" ... >
-		<iframe ...></iframe>
-	</div>
-</div>
-```
-
-## The store
-
-The store is used to create the logic (actions, side effects…) linked to the directives and the data used inside that logic (state, derived state…).
-
-**The store is usually created in the `view.js` file of each block**, although the state can be initialized from the `render.php` of the block.
-
-### Elements of the store
-
-#### State 
-
-It defines data available to the HTML nodes of the page. It is important to differentiate between two ways to define the data:
-
-- **Global state**:  It is defined using the `store()` function with the `state` property, and the data is available to all the HTML nodes of the page.
-- **Context/Local State**: It is defined using the `data-wp-context` directive in an HTML node, and the data is available to that HTML node and its children. It can be accessed using the `getContext` function inside of an action, derived state or side effect.
-  
-```html
-<div data-wp-context='{ "someText": "Hello World!" }'>
-
-  <!-- Access global state -->
-  <span data-wp-text="state.someText"></span>
-
-  <!-- Access local state (context) -->
-  <span data-wp-text="context.someText"></span>
-
-</div>
-```
-
-```js
-const { state } = store( "myPlugin", {
-  state: {
-    someText: "Hello Universe!"
-  },
-  actions: {
-    someAction: () => {
-      state.someText // Access or modify global state - "Hello Universe!"
-
-      const context = getContext();
-      context.someText // Access or modify local state (context) - "Hello World!"
-    },
-  },
-} )
-```
-
-#### Actions 
-
-Usually triggered by the `data-wp-on` directive (using event listeners) or other actions.
-
-#### Side Effects 
-
-Automatically react to state changes. Usually triggered by `data-wp-watch` or `data-wp-init` directives.
-
-#### Derived state
-
-They return a computed version of the state. They can access both `state` and `context`.
-
-```js
-// view.js  
-const { state } = store( "myPlugin", {
-  state: {
-    amount: 34,
-    defaultCurrency: 'EUR',
-    currencyExchange: {
-      USD: 1.1,
-      GBP: 0.85,
-    },
-    get amountInUSD() {
-      return state.currencyExchange[ 'USD' ] * state.amount,
-    },
-    get amountInGBP() {
-      return state.currencyExchange[ 'GBP' ] * state.amount,
-    },
-  },
-} );
-```
-
-### Accessing data in callbacks
-
-
-The **`store`** contains all the store properties, like `state`, `actions` or `callbacks`. They are returned by the `store()` call, so you can access them by destructuring it:
-
-```js
-const { state, actions } = store( "myPlugin", {
-  // ...
-} );
-```
-
-The `store()` function can be called multiple times and all the store parts will be merged together:
-
-```js
-store( "myPlugin", {
-  state: {
-    someValue: 1,
-  }
-} );
-
-const { state } = store( "myPlugin", {
-  actions: {
-    someAction() {
-      state.someValue // = 1
-    }
-  }
-} );
-```
-
-> **Note**
-> All `store()` calls with the same namespace return the same references, i.e., the same `state`, `actions`, etc., containing the result of merging all the store parts passed.
-
-- To access the context inside an action, derived state, or side effect, you can use the `getContext` function. 
-- To access the reference, you can use the `getElement` function.
-
-```js
-const { state } = store( "myPlugin", {
-  state: {
-    get someDerivedValue() {
-      const context = getContext();
-      const { ref } = getElement();
-      // ...
-    }
-  },
-  actions: {
-    someAction() {
-      const context = getContext();
-      const { ref } = getElement();
-      // ...
-    }
-  },
-  callbacks: {
-    someEffect() {
-      const context = getContext();
-      const { ref } = getElement();
-      // ...
-    }
-  }
-} );
-```
-
-This approach enables some functionalities that make directives flexible and powerful:
-
-- Actions and side effects can read and modify the state and the context.
-- Actions and state in blocks can be accessed by other blocks.
-- Actions and side effects can do anything a regular JavaScript function can do, like access the DOM or make API requests.
-- Side effects automatically react to state changes.
-
-### Setting the store
-
-#### On the client side
-
-*In the `view.js` file of each block* we can define both the state and the elements of the store referencing functions like actions, side effects or derived state.
-
-The `store` method used to set the store in javascript can be imported from `@wordpress/interactivity`.  
-
-```js
-// store
-import { store, getContext } from '@wordpress/interactivity';
-
-store( "myPlugin", {
-  actions: {
-    toggle: () => {
-      const context = getContext();
-      context.isOpen = !context.isOpen;
-    },
-  },
-  callbacks: {
-    logIsOpen: () => {
-      const { isOpen } = getContext();
-      // Log the value of `isOpen` each time it changes.
-      console.log( `Is open: ${ isOpen }` );
-    }
-  },
-});
-```
-
-#### On the server side
-
-> **Note**
-> We will rename `wp_store` to `wp_initial_state` in a future version.
-
-The state can also be initialized on the server using the `wp_store()` function. You would typically do this in the `render.php` file of your block (the `render.php` templates were [introduced](https://make.wordpress.org/core/2022/10/12/block-api-changes-in-wordpress-6-1/) in WordPress 6.1). 
-
-The state defined on the server with `wp_store()` gets merged with the stores defined in the view.js files.
-
-The `wp_store` function receives an [associative array](https://www.php.net/manual/en/language.types.array.php) as a parameter. 
-
-_Example of store initialized from the server with a `state` = `{ someValue: 123 }`_
-
-```php
-// render.php
-wp_store( array(
-  'myPlugin' => array(
-    'someValue' = 123
-  )
-);
-```
-
-Initializing the state in the server also allows you to use any WordPress API. For example, you could use the Core Translation API to translate part of your state:
-
-```php
-// render.php
-wp_store(
-  array(
-    "favoriteMovies" => array(
-      "1" => array(
-        "id" => "123-abc",
-        "movieName" => __("someMovieName", "textdomain")
-      ),
-    ),
-  )
-);
-```
-
-### Private stores
-
-A given store namespace can be marked as private, thus preventing its content to be accessed from other namespaces. The mechanism to do so is by adding a `lock` option to the `store()` call, like shown in the example below. This way, further executions of `store()` with the same locked namespace will throw an error, meaning that the namespace can only be accessed where its reference was returned from the first `store()` call. This is specially useful for developers that want to hide part of their plugin stores so it doesn't become accessible for extenders.
-
-```js
-const { state } = store(
-	"myPlugin/private",
-	{ state: { messages: [ "private message" ] } },
-	{ lock: true }
-);
-
-// The following call throws an Error!
-store( "myPlugin/private", { /* store part */ } );
-```
-
-There is also a way to unlock private stores: instead of passing a boolean, you can use a string as the `lock` value. Such a string can then be used in subsequent `store()` calls to the same namespace to unlock its content. Only the code knowing the string lock will be able to unlock the protected store namespaced. This is useful for complex stores defined in multiple JS modules.
-
-```js
-const { state } = store(
-	"myPlugin/private",
-	{ state: { messages: [ "private message" ] } },
-	{ lock: PRIVATE_LOCK }
-);
-
-// The following call works as expected.
-store( "myPlugin/private", { /* store part */ }, { lock: PRIVATE_LOCK } );
-```
diff --git a/packages/interactivity/docs/README.md b/packages/interactivity/docs/README.md
deleted file mode 100644
index e63ed6b82e4201..00000000000000
--- a/packages/interactivity/docs/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Interactivity API Docs
-
-👋 Hi! Welcome to the Interactivity API documentation.
-
-
-> Interactivity API is a current [proposal](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/) that **is only available in Gutenberg** at the moment and not in WordPress Core as it is still very experimental, and very likely to change.
-
-> As part of an [Open Source project](https://developer.wordpress.org/block-editor/getting-started/faq/#the-gutenberg-project) we encourage participation in helping shape this API and its Docs. The [discussions](https://github.com/WordPress/gutenberg/discussions/categories/interactivity-api) and [issues](https://github.com/WordPress/gutenberg/labels/%5BFeature%5D%20Interactivity%20API) in GitHub are the best place to engage.
-
-
-## Quick start
-
-The best place to start with the Interactivity API is this [**Getting started guide**](1-getting-started.md). There you'll will find a very quick start guide and the current requirements of the Interactivity API.
-
-## Take a deep dive
-
-At the [**API Reference**](2-api-reference.md) page you'll find detailed technical descriptions for the *Directives* and *Store* which are the main elements of the Interactivity API.
-
-You can also check [Getting Started - and other learning resources](https://github.com/WordPress/gutenberg/discussions/52894) among other [discussions in GitHub](https://github.com/WordPress/gutenberg/discussions/categories/interactivity-api) to learn more on this proposal.
-
-## Get Involved
-
-Feel free to open pull requests to improve any part of these docs, or to add other sections or files to the docs.
-
-If you are willing to help with the documentation, please add a comment to [#51928](https://github.com/WordPress/gutenberg/discussions/51928), and we'll coordinate everyone's efforts.
-
-There's a Tracking Issue opened to ease the coordination of the work related to the Interactivity API Docs: **[Documentation for the Interactivity API - Tracking Issue #53296](https://github.com/WordPress/gutenberg/issues/53296)**
-
-## License
-
-Interactivity API proposal, as part of Gutenberg and the WordPress project is free software, and is released under the terms of the GNU General Public License version 2 or (at your option) any later version. See [LICENSE.md](https://github.com/WordPress/gutenberg/blob/trunk/LICENSE.md) for complete license.
-
-<br/><br/><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>
diff --git a/packages/interactivity/docs/assets/state-directives.png b/packages/interactivity/docs/assets/state-directives.png
deleted file mode 100644
index a2422d1a2a049e..00000000000000
Binary files a/packages/interactivity/docs/assets/state-directives.png and /dev/null differ
diff --git a/packages/interactivity/docs/assets/store-server-client.png b/packages/interactivity/docs/assets/store-server-client.png
deleted file mode 100644
index 37818e37faa3dc..00000000000000
Binary files a/packages/interactivity/docs/assets/store-server-client.png and /dev/null differ
diff --git a/packages/interactivity/package.json b/packages/interactivity/package.json
index da118762e3c02a..defabf4f76a6ad 100644
--- a/packages/interactivity/package.json
+++ b/packages/interactivity/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interactivity",
-	"version": "3.0.0",
+	"version": "6.10.0",
 	"description": "Package that provides a standard and simple way to handle the frontend interactivity of Gutenberg blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,16 +19,20 @@
 		"url": "https://github.com/WordPress/gutenberg/labels/%5BFeature%5D%20Interactivity%20API"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
+	"wpScriptModuleExports": {
+		".": "./build-module/index.js",
+		"./debug": "./build-module/debug.js"
+	},
 	"dependencies": {
-		"@preact/signals": "^1.1.3",
-		"deepsignal": "^1.3.6",
-		"preact": "^10.13.2"
+		"@preact/signals": "^1.3.0",
+		"preact": "^10.24.2"
 	},
 	"publishConfig": {
 		"access": "public"
diff --git a/packages/interactivity/src/constants.js b/packages/interactivity/src/constants.js
deleted file mode 100644
index 669e94263fb9ca..00000000000000
--- a/packages/interactivity/src/constants.js
+++ /dev/null
@@ -1 +0,0 @@
-export const directivePrefix = 'wp';
diff --git a/packages/interactivity/src/constants.ts b/packages/interactivity/src/constants.ts
new file mode 100644
index 00000000000000..f461b91baff894
--- /dev/null
+++ b/packages/interactivity/src/constants.ts
@@ -0,0 +1 @@
+export const directivePrefix: string = 'wp';
diff --git a/packages/interactivity/src/debug.ts b/packages/interactivity/src/debug.ts
new file mode 100644
index 00000000000000..36132142512927
--- /dev/null
+++ b/packages/interactivity/src/debug.ts
@@ -0,0 +1,6 @@
+/**
+ * External dependencies
+ */
+import 'preact/debug';
+
+export * from './index';
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
deleted file mode 100644
index 0793dc0cc5d5ba..00000000000000
--- a/packages/interactivity/src/directives.js
+++ /dev/null
@@ -1,393 +0,0 @@
-/**
- * External dependencies
- */
-import {
-	useContext,
-	useMemo,
-	useEffect,
-	useRef,
-	useLayoutEffect,
-} from 'preact/hooks';
-import { deepSignal, peek } from 'deepsignal';
-
-/**
- * Internal dependencies
- */
-import { createPortal } from './portals';
-import { useSignalEffect } from './utils';
-import { directive } from './hooks';
-import { SlotProvider, Slot, Fill } from './slots';
-import { navigate } from './router';
-
-const isObject = ( item ) =>
-	item && typeof item === 'object' && ! Array.isArray( item );
-
-const mergeDeepSignals = ( target, source, overwrite ) => {
-	for ( const k in source ) {
-		if ( isObject( peek( target, k ) ) && isObject( peek( source, k ) ) ) {
-			mergeDeepSignals(
-				target[ `$${ k }` ].peek(),
-				source[ `$${ k }` ].peek(),
-				overwrite
-			);
-		} else if ( overwrite || typeof peek( target, k ) === 'undefined' ) {
-			target[ `$${ k }` ] = source[ `$${ k }` ];
-		}
-	}
-};
-
-export default () => {
-	// data-wp-context
-	directive(
-		'context',
-		( {
-			directives: { context },
-			props: { children },
-			context: inheritedContext,
-		} ) => {
-			const { Provider } = inheritedContext;
-			const inheritedValue = useContext( inheritedContext );
-			const currentValue = useRef( deepSignal( {} ) );
-			const passedValues = context.map( ( { value } ) => value );
-
-			currentValue.current = useMemo( () => {
-				const newValue = context
-					.map( ( c ) => deepSignal( { [ c.namespace ]: c.value } ) )
-					.reduceRight( mergeDeepSignals );
-
-				mergeDeepSignals( newValue, inheritedValue );
-				mergeDeepSignals( currentValue.current, newValue, true );
-				return currentValue.current;
-			}, [ inheritedValue, ...passedValues ] );
-
-			return (
-				<Provider value={ currentValue.current }>{ children }</Provider>
-			);
-		},
-		{ priority: 5 }
-	);
-
-	// data-wp-body
-	directive( 'body', ( { props: { children } } ) => {
-		return createPortal( children, document.body );
-	} );
-
-	// data-wp-watch--[name]
-	directive( 'watch', ( { directives: { watch }, evaluate } ) => {
-		watch.forEach( ( entry ) => {
-			useSignalEffect( () => evaluate( entry ) );
-		} );
-	} );
-
-	// data-wp-init--[name]
-	directive( 'init', ( { directives: { init }, evaluate } ) => {
-		init.forEach( ( entry ) => {
-			useEffect( () => evaluate( entry ), [] );
-		} );
-	} );
-
-	// data-wp-on--[event]
-	directive( 'on', ( { directives: { on }, element, evaluate } ) => {
-		on.forEach( ( entry ) => {
-			element.props[ `on${ entry.suffix }` ] = ( event ) => {
-				evaluate( entry, event );
-			};
-		} );
-	} );
-
-	// data-wp-class--[classname]
-	directive(
-		'class',
-		( { directives: { class: className }, element, evaluate } ) => {
-			className
-				.filter( ( { suffix } ) => suffix !== 'default' )
-				.forEach( ( entry ) => {
-					const name = entry.suffix;
-					const result = evaluate( entry, { className: name } );
-					const currentClass = element.props.class || '';
-					const classFinder = new RegExp(
-						`(^|\\s)${ name }(\\s|$)`,
-						'g'
-					);
-					if ( ! result )
-						element.props.class = currentClass
-							.replace( classFinder, ' ' )
-							.trim();
-					else if ( ! classFinder.test( currentClass ) )
-						element.props.class = currentClass
-							? `${ currentClass } ${ name }`
-							: name;
-
-					useEffect( () => {
-						// This seems necessary because Preact doesn't change the class
-						// names on the hydration, so we have to do it manually. It doesn't
-						// need deps because it only needs to do it the first time.
-						if ( ! result ) {
-							element.ref.current.classList.remove( name );
-						} else {
-							element.ref.current.classList.add( name );
-						}
-					}, [] );
-				} );
-		}
-	);
-
-	const newRule =
-		/(?:([\u0080-\uFFFF\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(}\s*)/g;
-	const ruleClean = /\/\*[^]*?\*\/|  +/g;
-	const ruleNewline = /\n+/g;
-	const empty = ' ';
-
-	/**
-	 * Convert a css style string into a object.
-	 *
-	 * Made by Cristian Bote (@cristianbote) for Goober.
-	 * https://unpkg.com/browse/goober@2.1.13/src/core/astish.js
-	 *
-	 * @param {string} val CSS string.
-	 * @return {Object} CSS object.
-	 */
-	const cssStringToObject = ( val ) => {
-		const tree = [ {} ];
-		let block, left;
-
-		while ( ( block = newRule.exec( val.replace( ruleClean, '' ) ) ) ) {
-			if ( block[ 4 ] ) {
-				tree.shift();
-			} else if ( block[ 3 ] ) {
-				left = block[ 3 ].replace( ruleNewline, empty ).trim();
-				tree.unshift( ( tree[ 0 ][ left ] = tree[ 0 ][ left ] || {} ) );
-			} else {
-				tree[ 0 ][ block[ 1 ] ] = block[ 2 ]
-					.replace( ruleNewline, empty )
-					.trim();
-			}
-		}
-
-		return tree[ 0 ];
-	};
-
-	// data-wp-style--[style-key]
-	directive( 'style', ( { directives: { style }, element, evaluate } ) => {
-		style
-			.filter( ( { suffix } ) => suffix !== 'default' )
-			.forEach( ( entry ) => {
-				const key = entry.suffix;
-				const result = evaluate( entry, { key } );
-				element.props.style = element.props.style || {};
-				if ( typeof element.props.style === 'string' )
-					element.props.style = cssStringToObject(
-						element.props.style
-					);
-				if ( ! result ) delete element.props.style[ key ];
-				else element.props.style[ key ] = result;
-
-				useEffect( () => {
-					// This seems necessary because Preact doesn't change the styles on
-					// the hydration, so we have to do it manually. It doesn't need deps
-					// because it only needs to do it the first time.
-					if ( ! result ) {
-						element.ref.current.style.removeProperty( key );
-					} else {
-						element.ref.current.style[ key ] = result;
-					}
-				}, [] );
-			} );
-	} );
-
-	// data-wp-bind--[attribute]
-	directive( 'bind', ( { directives: { bind }, element, evaluate } ) => {
-		bind.filter( ( { suffix } ) => suffix !== 'default' ).forEach(
-			( entry ) => {
-				const attribute = entry.suffix;
-				const result = evaluate( entry );
-				element.props[ attribute ] = result;
-				// Preact doesn't handle the `role` attribute properly, as it doesn't remove it when `null`.
-				// We need this workaround until the following issue is solved:
-				// https://github.com/preactjs/preact/issues/4136
-				useLayoutEffect( () => {
-					if (
-						attribute === 'role' &&
-						( result === null || result === undefined )
-					) {
-						element.ref.current.removeAttribute( attribute );
-					}
-				}, [ attribute, result ] );
-
-				// This seems necessary because Preact doesn't change the attributes
-				// on the hydration, so we have to do it manually. It doesn't need
-				// deps because it only needs to do it the first time.
-				useEffect( () => {
-					const el = element.ref.current;
-
-					// We set the value directly to the corresponding
-					// HTMLElement instance property excluding the following
-					// special cases.
-					// We follow Preact's logic: https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L110-L129
-					if (
-						attribute !== 'width' &&
-						attribute !== 'height' &&
-						attribute !== 'href' &&
-						attribute !== 'list' &&
-						attribute !== 'form' &&
-						// Default value in browsers is `-1` and an empty string is
-						// cast to `0` instead
-						attribute !== 'tabIndex' &&
-						attribute !== 'download' &&
-						attribute !== 'rowSpan' &&
-						attribute !== 'colSpan' &&
-						attribute !== 'role' &&
-						attribute in el
-					) {
-						try {
-							el[ attribute ] =
-								result === null || result === undefined
-									? ''
-									: result;
-							return;
-						} catch ( err ) {}
-					}
-					// aria- and data- attributes have no boolean representation.
-					// A `false` value is different from the attribute not being
-					// present, so we can't remove it.
-					// We follow Preact's logic: https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L131C24-L136
-					if (
-						result !== null &&
-						result !== undefined &&
-						( result !== false || attribute[ 4 ] === '-' )
-					) {
-						el.setAttribute( attribute, result );
-					} else {
-						el.removeAttribute( attribute );
-					}
-				}, [] );
-			}
-		);
-	} );
-
-	// data-wp-navigation-link
-	directive(
-		'navigation-link',
-		( {
-			directives: { 'navigation-link': navigationLink },
-			props: { href },
-			element,
-		} ) => {
-			const { value: link } = navigationLink.find(
-				( { suffix } ) => suffix === 'default'
-			);
-
-			useEffect( () => {
-				// Prefetch the page if it is in the directive options.
-				if ( link?.prefetch ) {
-					// prefetch( href );
-				}
-			} );
-
-			// Don't do anything if it's falsy.
-			if ( link !== false ) {
-				element.props.onclick = async ( event ) => {
-					event.preventDefault();
-
-					// Fetch the page (or return it from cache).
-					await navigate( href );
-
-					// Update the scroll, depending on the option. True by default.
-					if ( link?.scroll === 'smooth' ) {
-						window.scrollTo( {
-							top: 0,
-							left: 0,
-							behavior: 'smooth',
-						} );
-					} else if ( link?.scroll !== false ) {
-						window.scrollTo( 0, 0 );
-					}
-				};
-			}
-		}
-	);
-
-	// data-wp-ignore
-	directive(
-		'ignore',
-		( {
-			element: {
-				type: Type,
-				props: { innerHTML, ...rest },
-			},
-		} ) => {
-			// Preserve the initial inner HTML.
-			const cached = useMemo( () => innerHTML, [] );
-			return (
-				<Type
-					dangerouslySetInnerHTML={ { __html: cached } }
-					{ ...rest }
-				/>
-			);
-		}
-	);
-
-	// data-wp-text
-	directive( 'text', ( { directives: { text }, element, evaluate } ) => {
-		const entry = text.find( ( { suffix } ) => suffix === 'default' );
-		element.props.children = evaluate( entry );
-	} );
-
-	// data-wp-slot
-	directive(
-		'slot',
-		( { directives: { slot }, props: { children }, element } ) => {
-			const { value } = slot.find(
-				( { suffix } ) => suffix === 'default'
-			);
-			const name = typeof value === 'string' ? value : value.name;
-			const position = value.position || 'children';
-
-			if ( position === 'before' ) {
-				return (
-					<>
-						<Slot name={ name } />
-						{ children }
-					</>
-				);
-			}
-			if ( position === 'after' ) {
-				return (
-					<>
-						{ children }
-						<Slot name={ name } />
-					</>
-				);
-			}
-			if ( position === 'replace' ) {
-				return <Slot name={ name }>{ children }</Slot>;
-			}
-			if ( position === 'children' ) {
-				element.props.children = (
-					<Slot name={ name }>{ element.props.children }</Slot>
-				);
-			}
-		},
-		{ priority: 4 }
-	);
-
-	// data-wp-fill
-	directive(
-		'fill',
-		( { directives: { fill }, props: { children }, evaluate } ) => {
-			const entry = fill.find( ( { suffix } ) => suffix === 'default' );
-			const slot = evaluate( entry );
-			return <Fill slot={ slot }>{ children }</Fill>;
-		},
-		{ priority: 4 }
-	);
-
-	// data-wp-slot-provider
-	directive(
-		'slot-provider',
-		( { props: { children } } ) => (
-			<SlotProvider>{ children }</SlotProvider>
-		),
-		{ priority: 4 }
-	);
-};
diff --git a/packages/interactivity/src/directives.tsx b/packages/interactivity/src/directives.tsx
new file mode 100644
index 00000000000000..31e07d095e0a4c
--- /dev/null
+++ b/packages/interactivity/src/directives.tsx
@@ -0,0 +1,610 @@
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+/* eslint-disable react-hooks/exhaustive-deps */
+
+/**
+ * External dependencies
+ */
+import { h as createElement, type RefObject } from 'preact';
+import { useContext, useMemo, useRef } from 'preact/hooks';
+
+/**
+ * Internal dependencies
+ */
+import {
+	useWatch,
+	useInit,
+	kebabToCamelCase,
+	warn,
+	splitTask,
+	isPlainObject,
+} from './utils';
+import {
+	directive,
+	getEvaluate,
+	isDefaultDirectiveSuffix,
+	isNonDefaultDirectiveSuffix,
+	type DirectiveCallback,
+	type DirectiveEntry,
+} from './hooks';
+import { getScope } from './scopes';
+import { proxifyState, proxifyContext, deepMerge } from './proxies';
+
+/**
+ * Recursively clone the passed object.
+ *
+ * @param source Source object.
+ * @return Cloned object.
+ */
+function deepClone< T >( source: T ): T {
+	if ( isPlainObject( source ) ) {
+		return Object.fromEntries(
+			Object.entries( source as object ).map( ( [ key, value ] ) => [
+				key,
+				deepClone( value ),
+			] )
+		) as T;
+	}
+	if ( Array.isArray( source ) ) {
+		return source.map( ( i ) => deepClone( i ) ) as T;
+	}
+	return source;
+}
+
+const newRule =
+	/(?:([\u0080-\uFFFF\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(}\s*)/g;
+const ruleClean = /\/\*[^]*?\*\/|  +/g;
+const ruleNewline = /\n+/g;
+const empty = ' ';
+
+/**
+ * Convert a css style string into a object.
+ *
+ * Made by Cristian Bote (@cristianbote) for Goober.
+ * https://unpkg.com/browse/goober@2.1.13/src/core/astish.js
+ *
+ * @param val CSS string.
+ * @return CSS object.
+ */
+const cssStringToObject = (
+	val: string
+): Record< string, string | number > => {
+	const tree = [ {} ];
+	let block, left;
+
+	while ( ( block = newRule.exec( val.replace( ruleClean, '' ) ) ) ) {
+		if ( block[ 4 ] ) {
+			tree.shift();
+		} else if ( block[ 3 ] ) {
+			left = block[ 3 ].replace( ruleNewline, empty ).trim();
+			tree.unshift( ( tree[ 0 ][ left ] = tree[ 0 ][ left ] || {} ) );
+		} else {
+			tree[ 0 ][ block[ 1 ] ] = block[ 2 ]
+				.replace( ruleNewline, empty )
+				.trim();
+		}
+	}
+
+	return tree[ 0 ];
+};
+
+/**
+ * Creates a directive that adds an event listener to the global window or
+ * document object.
+ *
+ * @param type 'window' or 'document'
+ */
+const getGlobalEventDirective = (
+	type: 'window' | 'document'
+): DirectiveCallback => {
+	return ( { directives, evaluate } ) => {
+		directives[ `on-${ type }` ]
+			.filter( isNonDefaultDirectiveSuffix )
+			.forEach( ( entry ) => {
+				const eventName = entry.suffix.split( '--', 1 )[ 0 ];
+				useInit( () => {
+					const cb = ( event: Event ) => evaluate( entry, event );
+					const globalVar = type === 'window' ? window : document;
+					globalVar.addEventListener( eventName, cb );
+					return () => globalVar.removeEventListener( eventName, cb );
+				} );
+			} );
+	};
+};
+
+/**
+ * Creates a directive that adds an async event listener to the global window or
+ * document object.
+ *
+ * @param type 'window' or 'document'
+ */
+const getGlobalAsyncEventDirective = (
+	type: 'window' | 'document'
+): DirectiveCallback => {
+	return ( { directives, evaluate } ) => {
+		directives[ `on-async-${ type }` ]
+			.filter( isNonDefaultDirectiveSuffix )
+			.forEach( ( entry ) => {
+				const eventName = entry.suffix.split( '--', 1 )[ 0 ];
+				useInit( () => {
+					const cb = async ( event: Event ) => {
+						await splitTask();
+						evaluate( entry, event );
+					};
+					const globalVar = type === 'window' ? window : document;
+					globalVar.addEventListener( eventName, cb, {
+						passive: true,
+					} );
+					return () => globalVar.removeEventListener( eventName, cb );
+				} );
+			} );
+	};
+};
+
+export default () => {
+	// data-wp-context
+	directive(
+		'context',
+		( {
+			directives: { context },
+			props: { children },
+			context: inheritedContext,
+		} ) => {
+			const { Provider } = inheritedContext;
+			const defaultEntry = context.find( isDefaultDirectiveSuffix );
+			const { client: inheritedClient, server: inheritedServer } =
+				useContext( inheritedContext );
+
+			const ns = defaultEntry!.namespace;
+			const client = useRef( proxifyState( ns, {} ) );
+			const server = useRef( proxifyState( ns, {}, { readOnly: true } ) );
+
+			// No change should be made if `defaultEntry` does not exist.
+			const contextStack = useMemo( () => {
+				const result = {
+					client: { ...inheritedClient },
+					server: { ...inheritedServer },
+				};
+				if ( defaultEntry ) {
+					const { namespace, value } = defaultEntry;
+					// Check that the value is a JSON object. Send a console warning if not.
+					if ( ! isPlainObject( value ) ) {
+						warn(
+							`The value of data-wp-context in "${ namespace }" store must be a valid stringified JSON object.`
+						);
+					}
+					deepMerge(
+						client.current,
+						deepClone( value ) as object,
+						false
+					);
+					deepMerge( server.current, deepClone( value ) as object );
+					result.client[ namespace ] = proxifyContext(
+						client.current,
+						inheritedClient[ namespace ]
+					);
+					result.server[ namespace ] = proxifyContext(
+						server.current,
+						inheritedServer[ namespace ]
+					);
+				}
+				return result;
+			}, [ defaultEntry, inheritedClient, inheritedServer ] );
+
+			return createElement( Provider, { value: contextStack }, children );
+		},
+		{ priority: 5 }
+	);
+
+	// data-wp-watch--[name]
+	directive( 'watch', ( { directives: { watch }, evaluate } ) => {
+		watch.forEach( ( entry ) => {
+			useWatch( () => {
+				let start;
+				if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+					if ( globalThis.SCRIPT_DEBUG ) {
+						// eslint-disable-next-line no-unused-vars
+						start = performance.now();
+					}
+				}
+				const result = evaluate( entry );
+				if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+					if ( globalThis.SCRIPT_DEBUG ) {
+						performance.measure(
+							`interactivity api watch ${ entry.namespace }`,
+							{
+								start,
+								end: performance.now(),
+								detail: {
+									devtools: {
+										track: `IA: watch ${ entry.namespace }`,
+									},
+								},
+							}
+						);
+					}
+				}
+				return result;
+			} );
+		} );
+	} );
+
+	// data-wp-init--[name]
+	directive( 'init', ( { directives: { init }, evaluate } ) => {
+		init.forEach( ( entry ) => {
+			// TODO: Replace with useEffect to prevent unneeded scopes.
+			useInit( () => {
+				let start;
+				if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+					if ( globalThis.SCRIPT_DEBUG ) {
+						start = performance.now();
+					}
+				}
+				const result = evaluate( entry );
+				if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+					if ( globalThis.SCRIPT_DEBUG ) {
+						performance.measure(
+							`interactivity api init ${ entry.namespace }`,
+							{
+								// eslint-disable-next-line no-undef
+								start,
+								end: performance.now(),
+								detail: {
+									devtools: {
+										track: `IA: init ${ entry.namespace }`,
+									},
+								},
+							}
+						);
+					}
+				}
+				return result;
+			} );
+		} );
+	} );
+
+	// data-wp-on--[event]
+	directive( 'on', ( { directives: { on }, element, evaluate } ) => {
+		const events = new Map< string, Set< DirectiveEntry > >();
+		on.filter( isNonDefaultDirectiveSuffix ).forEach( ( entry ) => {
+			const event = entry.suffix.split( '--' )[ 0 ];
+			if ( ! events.has( event ) ) {
+				events.set( event, new Set< DirectiveEntry >() );
+			}
+			events.get( event )!.add( entry );
+		} );
+
+		events.forEach( ( entries, eventType ) => {
+			const existingHandler = element.props[ `on${ eventType }` ];
+			element.props[ `on${ eventType }` ] = ( event: Event ) => {
+				entries.forEach( ( entry ) => {
+					if ( existingHandler ) {
+						existingHandler( event );
+					}
+					let start;
+					if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+						if ( globalThis.SCRIPT_DEBUG ) {
+							start = performance.now();
+						}
+					}
+					evaluate( entry, event );
+					if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+						if ( globalThis.SCRIPT_DEBUG ) {
+							performance.measure(
+								`interactivity api on ${ entry.namespace }`,
+								{
+									// eslint-disable-next-line no-undef
+									start,
+									end: performance.now(),
+									detail: {
+										devtools: {
+											track: `IA: on ${ entry.namespace }`,
+										},
+									},
+								}
+							);
+						}
+					}
+				} );
+			};
+		} );
+	} );
+
+	// data-wp-on-async--[event]
+	directive(
+		'on-async',
+		( { directives: { 'on-async': onAsync }, element, evaluate } ) => {
+			const events = new Map< string, Set< DirectiveEntry > >();
+			onAsync
+				.filter( isNonDefaultDirectiveSuffix )
+				.forEach( ( entry ) => {
+					const event = entry.suffix.split( '--' )[ 0 ];
+					if ( ! events.has( event ) ) {
+						events.set( event, new Set< DirectiveEntry >() );
+					}
+					events.get( event )!.add( entry );
+				} );
+
+			events.forEach( ( entries, eventType ) => {
+				const existingHandler = element.props[ `on${ eventType }` ];
+				element.props[ `on${ eventType }` ] = ( event: Event ) => {
+					if ( existingHandler ) {
+						existingHandler( event );
+					}
+					entries.forEach( async ( entry ) => {
+						await splitTask();
+						evaluate( entry, event );
+					} );
+				};
+			} );
+		}
+	);
+
+	// data-wp-on-window--[event]
+	directive( 'on-window', getGlobalEventDirective( 'window' ) );
+	// data-wp-on-document--[event]
+	directive( 'on-document', getGlobalEventDirective( 'document' ) );
+
+	// data-wp-on-async-window--[event]
+	directive( 'on-async-window', getGlobalAsyncEventDirective( 'window' ) );
+	// data-wp-on-async-document--[event]
+	directive(
+		'on-async-document',
+		getGlobalAsyncEventDirective( 'document' )
+	);
+
+	// data-wp-class--[classname]
+	directive(
+		'class',
+		( { directives: { class: classNames }, element, evaluate } ) => {
+			classNames
+				.filter( isNonDefaultDirectiveSuffix )
+				.forEach( ( entry ) => {
+					const className = entry.suffix;
+					const result = evaluate( entry );
+					const currentClass = element.props.class || '';
+					const classFinder = new RegExp(
+						`(^|\\s)${ className }(\\s|$)`,
+						'g'
+					);
+					if ( ! result ) {
+						element.props.class = currentClass
+							.replace( classFinder, ' ' )
+							.trim();
+					} else if ( ! classFinder.test( currentClass ) ) {
+						element.props.class = currentClass
+							? `${ currentClass } ${ className }`
+							: className;
+					}
+
+					useInit( () => {
+						/*
+						 * This seems necessary because Preact doesn't change the class
+						 * names on the hydration, so we have to do it manually. It doesn't
+						 * need deps because it only needs to do it the first time.
+						 */
+						if ( ! result ) {
+							(
+								element.ref as RefObject< HTMLElement >
+							 ).current!.classList.remove( className );
+						} else {
+							(
+								element.ref as RefObject< HTMLElement >
+							 ).current!.classList.add( className );
+						}
+					} );
+				} );
+		}
+	);
+
+	// data-wp-style--[style-prop]
+	directive( 'style', ( { directives: { style }, element, evaluate } ) => {
+		style.filter( isNonDefaultDirectiveSuffix ).forEach( ( entry ) => {
+			const styleProp = entry.suffix;
+			const result = evaluate( entry );
+			element.props.style = element.props.style || {};
+			if ( typeof element.props.style === 'string' ) {
+				element.props.style = cssStringToObject( element.props.style );
+			}
+			if ( ! result ) {
+				delete element.props.style[ styleProp ];
+			} else {
+				element.props.style[ styleProp ] = result;
+			}
+
+			useInit( () => {
+				/*
+				 * This seems necessary because Preact doesn't change the styles on
+				 * the hydration, so we have to do it manually. It doesn't need deps
+				 * because it only needs to do it the first time.
+				 */
+				if ( ! result ) {
+					(
+						element.ref as RefObject< HTMLElement >
+					 ).current!.style.removeProperty( styleProp );
+				} else {
+					( element.ref as RefObject< HTMLElement > ).current!.style[
+						styleProp
+					] = result;
+				}
+			} );
+		} );
+	} );
+
+	// data-wp-bind--[attribute]
+	directive( 'bind', ( { directives: { bind }, element, evaluate } ) => {
+		bind.filter( isNonDefaultDirectiveSuffix ).forEach( ( entry ) => {
+			const attribute = entry.suffix;
+			const result = evaluate( entry );
+			element.props[ attribute ] = result;
+
+			/*
+			 * This is necessary because Preact doesn't change the attributes on the
+			 * hydration, so we have to do it manually. It only needs to do it the
+			 * first time. After that, Preact will handle the changes.
+			 */
+			useInit( () => {
+				const el = ( element.ref as RefObject< HTMLElement > ).current!;
+
+				/*
+				 * We set the value directly to the corresponding HTMLElement instance
+				 * property excluding the following special cases. We follow Preact's
+				 * logic: https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L110-L129
+				 */
+				if ( attribute === 'style' ) {
+					if ( typeof result === 'string' ) {
+						el.style.cssText = result;
+					}
+					return;
+				} else if (
+					attribute !== 'width' &&
+					attribute !== 'height' &&
+					attribute !== 'href' &&
+					attribute !== 'list' &&
+					attribute !== 'form' &&
+					/*
+					 * The value for `tabindex` follows the parsing rules for an
+					 * integer. If that fails, or if the attribute isn't present, then
+					 * the browsers should "follow platform conventions to determine if
+					 * the element should be considered as a focusable area",
+					 * practically meaning that most elements get a default of `-1` (not
+					 * focusable), but several also get a default of `0` (focusable in
+					 * order after all elements with a positive `tabindex` value).
+					 *
+					 * @see https://html.spec.whatwg.org/#tabindex-value
+					 */
+					attribute !== 'tabIndex' &&
+					attribute !== 'download' &&
+					attribute !== 'rowSpan' &&
+					attribute !== 'colSpan' &&
+					attribute !== 'role' &&
+					attribute in el
+				) {
+					try {
+						el[ attribute ] =
+							result === null || result === undefined
+								? ''
+								: result;
+						return;
+					} catch ( err ) {}
+				}
+				/*
+				 * aria- and data- attributes have no boolean representation.
+				 * A `false` value is different from the attribute not being
+				 * present, so we can't remove it.
+				 * We follow Preact's logic: https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L131C24-L136
+				 */
+				if (
+					result !== null &&
+					result !== undefined &&
+					( result !== false || attribute[ 4 ] === '-' )
+				) {
+					el.setAttribute( attribute, result );
+				} else {
+					el.removeAttribute( attribute );
+				}
+			} );
+		} );
+	} );
+
+	// data-wp-ignore
+	directive(
+		'ignore',
+		( {
+			element: {
+				type: Type,
+				props: { innerHTML, ...rest },
+			},
+		}: {
+			element: any;
+		} ) => {
+			// Preserve the initial inner HTML.
+			const cached = useMemo( () => innerHTML, [] );
+			return createElement( Type, {
+				dangerouslySetInnerHTML: { __html: cached },
+				...rest,
+			} );
+		}
+	);
+
+	// data-wp-text
+	directive( 'text', ( { directives: { text }, element, evaluate } ) => {
+		const entry = text.find( isDefaultDirectiveSuffix );
+		if ( ! entry ) {
+			element.props.children = null;
+			return;
+		}
+
+		try {
+			const result = evaluate( entry );
+			element.props.children =
+				typeof result === 'object' ? null : result.toString();
+		} catch ( e ) {
+			element.props.children = null;
+		}
+	} );
+
+	// data-wp-run
+	directive( 'run', ( { directives: { run }, evaluate } ) => {
+		run.forEach( ( entry ) => evaluate( entry ) );
+	} );
+
+	// data-wp-each--[item]
+	directive(
+		'each',
+		( {
+			directives: { each, 'each-key': eachKey },
+			context: inheritedContext,
+			element,
+			evaluate,
+		} ) => {
+			if ( element.type !== 'template' ) {
+				return;
+			}
+
+			const { Provider } = inheritedContext;
+			const inheritedValue = useContext( inheritedContext );
+
+			const [ entry ] = each;
+			const { namespace } = entry;
+
+			const list = evaluate( entry );
+			const itemProp = isNonDefaultDirectiveSuffix( entry )
+				? kebabToCamelCase( entry.suffix )
+				: 'item';
+			return list.map( ( item ) => {
+				const itemContext = proxifyContext(
+					proxifyState( namespace, {} ),
+					inheritedValue.client[ namespace ]
+				);
+				const mergedContext = {
+					client: {
+						...inheritedValue.client,
+						[ namespace ]: itemContext,
+					},
+					server: { ...inheritedValue.server },
+				};
+
+				// Set the item after proxifying the context.
+				mergedContext.client[ namespace ][ itemProp ] = item;
+
+				const scope = {
+					...getScope(),
+					context: mergedContext.client,
+					serverContext: mergedContext.server,
+				};
+				const key = eachKey
+					? getEvaluate( { scope } )( eachKey[ 0 ] )
+					: item;
+
+				return createElement(
+					Provider,
+					{ value: mergedContext, key },
+					element.props.content
+				);
+			} );
+		},
+		{ priority: 20 }
+	);
+
+	directive( 'each-child', () => null, { priority: 1 } );
+};
diff --git a/packages/interactivity/src/hooks.tsx b/packages/interactivity/src/hooks.tsx
index 14f0dc6683b460..e9b9f48ba3518e 100644
--- a/packages/interactivity/src/hooks.tsx
+++ b/packages/interactivity/src/hooks.tsx
@@ -1,21 +1,51 @@
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+/* eslint-disable react-hooks/exhaustive-deps */
+
 /**
  * External dependencies
  */
-import { h, options, createContext, cloneElement } from 'preact';
+import {
+	h as createElement,
+	options,
+	createContext,
+	cloneElement,
+	type ComponentChildren,
+} from 'preact';
 import { useRef, useCallback, useContext } from 'preact/hooks';
-import { deepSignal } from 'deepsignal';
-import type { VNode, Context, RefObject } from 'preact';
+import type { VNode, Context } from 'preact';
 
 /**
  * Internal dependencies
  */
-import { stores } from './store';
-interface DirectiveEntry {
-	value: string | Object;
+import { store, stores, universalUnlock } from './store';
+import { warn } from './utils';
+import { getScope, setScope, resetScope, type Scope } from './scopes';
+export interface DirectiveEntry {
+	value: string | object;
 	namespace: string;
+	suffix: string | null;
+}
+
+export interface NonDefaultSuffixDirectiveEntry extends DirectiveEntry {
 	suffix: string;
 }
 
+export interface DefaultSuffixDirectiveEntry extends DirectiveEntry {
+	suffix: null;
+}
+
+export function isNonDefaultDirectiveSuffix(
+	entry: DirectiveEntry
+): entry is NonDefaultSuffixDirectiveEntry {
+	return entry.suffix !== null;
+}
+
+export function isDefaultDirectiveSuffix(
+	entry: DirectiveEntry
+): entry is DefaultSuffixDirectiveEntry {
+	return entry.suffix === null;
+}
+
 type DirectiveEntries = Record< string, DirectiveEntry[] >;
 
 interface DirectiveArgs {
@@ -26,11 +56,15 @@ interface DirectiveArgs {
 	/**
 	 * Props present in the current element.
 	 */
-	props: Object;
+	props: { children?: ComponentChildren };
 	/**
 	 * Virtual node representing the element.
 	 */
-	element: VNode;
+	element: VNode< {
+		class?: string;
+		style?: string | Record< string, string | number >;
+		content?: ComponentChildren;
+	} >;
 	/**
 	 * The inherited context.
 	 */
@@ -42,8 +76,8 @@ interface DirectiveArgs {
 	evaluate: Evaluate;
 }
 
-interface DirectiveCallback {
-	( args: DirectiveArgs ): VNode | void;
+export interface DirectiveCallback {
+	( args: DirectiveArgs ): VNode< any > | null | void;
 }
 
 interface DirectiveOptions {
@@ -56,15 +90,7 @@ interface DirectiveOptions {
 	priority?: number;
 }
 
-interface Scope {
-	evaluate: Evaluate;
-	context: Context< any >;
-	ref: RefObject< HTMLElement >;
-	state: any;
-	props: any;
-}
-
-interface Evaluate {
+export interface Evaluate {
 	( entry: DirectiveEntry, ...args: any[] ): any;
 }
 
@@ -87,84 +113,7 @@ interface DirectivesProps {
 }
 
 // Main context.
-const context = createContext< any >( {} );
-
-// Wrap the element props to prevent modifications.
-const immutableMap = new WeakMap();
-const immutableError = () => {
-	throw new Error(
-		'Please use `data-wp-bind` to modify the attributes of an element.'
-	);
-};
-const immutableHandlers = {
-	get( target, key, receiver ) {
-		const value = Reflect.get( target, key, receiver );
-		return !! value && typeof value === 'object'
-			? deepImmutable( value )
-			: value;
-	},
-	set: immutableError,
-	deleteProperty: immutableError,
-};
-const deepImmutable = < T extends Object = {} >( target: T ): T => {
-	if ( ! immutableMap.has( target ) )
-		immutableMap.set( target, new Proxy( target, immutableHandlers ) );
-	return immutableMap.get( target );
-};
-
-// Store stacks for the current scope and the default namespaces and export APIs
-// to interact with them.
-const scopeStack: Scope[] = [];
-const namespaceStack: string[] = [];
-
-/**
- * Retrieves the context inherited by the element evaluating a function from the
- * store. The returned value depends on the element and the namespace where the
- * function calling `getContext()` exists.
- *
- * @param namespace Store namespace. By default, the namespace where the calling
- *                  function exists is used.
- * @return The context content.
- */
-export const getContext = < T extends object >( namespace?: string ): T =>
-	getScope()?.context[ namespace || namespaceStack.slice( -1 )[ 0 ] ];
-
-/**
- * Retrieves a representation of the element where a function from the store
- * is being evalutated. Such representation is read-only, and contains a
- * reference to the DOM element, its props and a local reactive state.
- *
- * @return Element representation.
- */
-export const getElement = () => {
-	if ( ! getScope() ) {
-		throw Error(
-			'Cannot call `getElement()` outside getters and actions used by directives.'
-		);
-	}
-	const { ref, state, props } = getScope();
-	return Object.freeze( {
-		ref: ref.current,
-		state,
-		props: deepImmutable( props ),
-	} );
-};
-
-export const getScope = () => scopeStack.slice( -1 )[ 0 ];
-
-export const setScope = ( scope: Scope ) => {
-	scopeStack.push( scope );
-};
-export const resetScope = () => {
-	scopeStack.pop();
-};
-
-export const setNamespace = ( namespace: string ) => {
-	namespaceStack.push( namespace );
-};
-export const resetNamespace = () => {
-	namespaceStack.pop();
-};
+const context = createContext< any >( { client: {}, server: {} } );
 
 // WordPress Directives.
 const directiveCallbacks: Record< string, DirectiveCallback > = {};
@@ -178,7 +127,7 @@ const directivePriorities: Record< string, number > = {};
  * directive(
  *   'alert', // Name without the `data-wp-` prefix.
  *   ( { directives: { alert }, element, evaluate } ) => {
- *     const defaultEntry = alert.find( entry => entry.suffix === 'default' );
+ *     const defaultEntry = alert.find( isDefaultDirectiveSuffix );
  *     element.props.onclick = () => { alert( evaluate( defaultEntry ) ); }
  *   }
  * )
@@ -192,17 +141,17 @@ const directivePriorities: Record< string, number > = {};
  * the `data-wp-alert` directive will have the `onclick` event handler, e.g.,
  *
  * ```html
- * <div data-wp-interactive='{ "namespace": "messages" }'>
+ * <div data-wp-interactive="messages">
  *   <button data-wp-alert="state.alert">Click me!</button>
  * </div>
  * ```
  * Note that, in the previous example, the directive callback gets the path
- * value (`state.alert`) from the directive entry with suffix `default`. A
+ * value (`state.alert`) from the directive entry with suffix `null`. A
  * custom suffix can also be specified by appending `--` to the directive
  * attribute, followed by the suffix, like in the following HTML snippet:
  *
  * ```html
- * <div data-wp-interactive='{ "namespace": "myblock" }'>
+ * <div data-wp-interactive="myblock">
  *   <button
  *     data-wp-color--text="state.text"
  *     data-wp-color--background="state.background"
@@ -217,7 +166,7 @@ const directivePriorities: Record< string, number > = {};
  * ```js
  * directive(
  *   'color', // Name without prefix and suffix.
- *   ( { directives: { color }, ref, evaluate } ) =>
+ *   ( { directives: { color: colors }, ref, evaluate } ) =>
  *     colors.forEach( ( color ) => {
  *       if ( color.suffix = 'text' ) {
  *         ref.style.setProperty(
@@ -252,17 +201,35 @@ export const directive = (
 };
 
 // Resolve the path to some property of the store object.
-const resolve = ( path, namespace ) => {
-	let current = {
-		...stores.get( namespace ),
+const resolve = ( path: string, namespace: string ) => {
+	if ( ! namespace ) {
+		warn(
+			`Namespace missing for "${ path }". The value for that path won't be resolved.`
+		);
+		return;
+	}
+	let resolvedStore = stores.get( namespace );
+	if ( typeof resolvedStore === 'undefined' ) {
+		resolvedStore = store(
+			namespace,
+			{},
+			{
+				lock: universalUnlock,
+			}
+		);
+	}
+	const current = {
+		...resolvedStore,
 		context: getScope().context[ namespace ],
 	};
-	path.split( '.' ).forEach( ( p ) => ( current = current[ p ] ) );
-	return current;
+	try {
+		// TODO: Support lazy/dynamically initialized stores
+		return path.split( '.' ).reduce( ( acc, key ) => acc[ key ], current );
+	} catch ( e ) {}
 };
 
 // Generate the evaluate function.
-const getEvaluate: GetEvaluate =
+export const getEvaluate: GetEvaluate =
 	( { scope } ) =>
 	( entry, ...args ) => {
 		let { value: path, namespace } = entry;
@@ -310,29 +277,29 @@ const Directives = ( {
 	// element ref, state and props.
 	const scope = useRef< Scope >( {} as Scope ).current;
 	scope.evaluate = useCallback( getEvaluate( { scope } ), [] );
-	scope.context = useContext( context );
+	const { client, server } = useContext( context );
+	scope.context = client;
+	scope.serverContext = server;
 	/* eslint-disable react-hooks/rules-of-hooks */
 	scope.ref = previousScope?.ref || useRef( null );
-	scope.state = previousScope?.state || useRef( deepSignal( {} ) ).current;
 	/* eslint-enable react-hooks/rules-of-hooks */
 
-	// Create a fresh copy of the vnode element and add the props to the scope.
+	// Create a fresh copy of the vnode element and add the props to the scope,
+	// named as attributes (HTML Attributes).
 	element = cloneElement( element, { ref: scope.ref } );
-	scope.props = element.props;
+	scope.attributes = element.props;
 
 	// Recursively render the wrapper for the next priority level.
 	const children =
-		nextPriorityLevels.length > 0 ? (
-			<Directives
-				directives={ directives }
-				priorityLevels={ nextPriorityLevels }
-				element={ element }
-				originalProps={ originalProps }
-				previousScope={ scope }
-			/>
-		) : (
-			element
-		);
+		nextPriorityLevels.length > 0
+			? createElement( Directives, {
+					directives,
+					priorityLevels: nextPriorityLevels,
+					element,
+					originalProps,
+					previousScope: scope,
+			  } )
+			: element;
 
 	const props = { ...originalProps, children };
 	const directiveArgs = {
@@ -347,7 +314,9 @@ const Directives = ( {
 
 	for ( const directiveName of currentPriorityLevel ) {
 		const wrapper = directiveCallbacks[ directiveName ]?.( directiveArgs );
-		if ( wrapper !== undefined ) props.children = wrapper;
+		if ( wrapper !== undefined ) {
+			props.children = wrapper;
+		}
 	}
 
 	resetScope();
@@ -361,10 +330,9 @@ options.vnode = ( vnode: VNode< any > ) => {
 	if ( vnode.props.__directives ) {
 		const props = vnode.props;
 		const directives = props.__directives;
-		if ( directives.key )
-			vnode.key = directives.key.find(
-				( { suffix } ) => suffix === 'default'
-			).value;
+		if ( directives.key ) {
+			vnode.key = directives.key.find( isDefaultDirectiveSuffix ).value;
+		}
 		delete props.__directives;
 		const priorityLevels = getPriorityLevels( directives );
 		if ( priorityLevels.length > 0 ) {
@@ -373,12 +341,14 @@ options.vnode = ( vnode: VNode< any > ) => {
 				priorityLevels,
 				originalProps: props,
 				type: vnode.type,
-				element: h( vnode.type as any, props ),
+				element: createElement( vnode.type as any, props ),
 				top: true,
 			};
 			vnode.type = Directives;
 		}
 	}
 
-	if ( old ) old( vnode );
+	if ( old ) {
+		old( vnode );
+	}
 };
diff --git a/packages/interactivity/src/index.js b/packages/interactivity/src/index.js
deleted file mode 100644
index 6c7b98e8e7a79e..00000000000000
--- a/packages/interactivity/src/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Internal dependencies
- */
-import registerDirectives from './directives';
-import { init } from './router';
-
-export { store } from './store';
-export { directive, getContext, getElement } from './hooks';
-export { navigate, prefetch } from './router';
-export { h as createElement } from 'preact';
-export { useEffect, useContext, useMemo } from 'preact/hooks';
-export { deepSignal } from 'deepsignal';
-
-document.addEventListener( 'DOMContentLoaded', async () => {
-	registerDirectives();
-	await init();
-} );
diff --git a/packages/interactivity/src/index.ts b/packages/interactivity/src/index.ts
new file mode 100644
index 00000000000000..9d013e4e744ed5
--- /dev/null
+++ b/packages/interactivity/src/index.ts
@@ -0,0 +1,60 @@
+/**
+ * External dependencies
+ */
+import { h, cloneElement, render } from 'preact';
+import { batch } from '@preact/signals';
+
+/**
+ * Internal dependencies
+ */
+import registerDirectives from './directives';
+import { init, getRegionRootFragment, initialVdom } from './init';
+import { directivePrefix } from './constants';
+import { toVdom } from './vdom';
+import { directive } from './hooks';
+import { getNamespace } from './namespaces';
+import { parseServerData, populateServerData } from './store';
+import { proxifyState } from './proxies';
+
+export { store, getConfig, getServerState } from './store';
+export { getContext, getServerContext, getElement } from './scopes';
+export {
+	withScope,
+	useWatch,
+	useInit,
+	useEffect,
+	useLayoutEffect,
+	useCallback,
+	useMemo,
+	splitTask,
+} from './utils';
+
+export { useState, useRef } from 'preact/hooks';
+
+const requiredConsent =
+	'I acknowledge that using private APIs means my theme or plugin will inevitably break in the next version of WordPress.';
+
+export const privateApis = ( lock ): any => {
+	if ( lock === requiredConsent ) {
+		return {
+			directivePrefix,
+			getRegionRootFragment,
+			initialVdom,
+			toVdom,
+			directive,
+			getNamespace,
+			h,
+			cloneElement,
+			render,
+			proxifyState,
+			parseServerData,
+			populateServerData,
+			batch,
+		};
+	}
+
+	throw new Error( 'Forbidden access.' );
+};
+
+registerDirectives();
+init();
diff --git a/packages/interactivity/src/init.ts b/packages/interactivity/src/init.ts
new file mode 100644
index 00000000000000..ddf6785d4dfdf4
--- /dev/null
+++ b/packages/interactivity/src/init.ts
@@ -0,0 +1,46 @@
+/**
+ * External dependencies
+ */
+import { hydrate, type ContainerNode, type ComponentChild } from 'preact';
+/**
+ * Internal dependencies
+ */
+import { toVdom, hydratedIslands } from './vdom';
+import { createRootFragment, splitTask } from './utils';
+import { directivePrefix } from './constants';
+
+// Keep the same root fragment for each interactive region node.
+const regionRootFragments = new WeakMap();
+export const getRegionRootFragment = ( region: Element ): ContainerNode => {
+	if ( ! region.parentElement ) {
+		throw Error( 'The passed region should be an element with a parent.' );
+	}
+	if ( ! regionRootFragments.has( region ) ) {
+		regionRootFragments.set(
+			region,
+			createRootFragment( region.parentElement, region )
+		);
+	}
+	return regionRootFragments.get( region );
+};
+
+// Initial vDOM regions associated with its DOM element.
+export const initialVdom = new WeakMap< Element, ComponentChild[] >();
+
+// Initialize the router with the initial DOM.
+export const init = async () => {
+	const nodes = document.querySelectorAll(
+		`[data-${ directivePrefix }-interactive]`
+	);
+
+	for ( const node of nodes ) {
+		if ( ! hydratedIslands.has( node ) ) {
+			await splitTask();
+			const fragment = getRegionRootFragment( node );
+			const vdom = toVdom( node );
+			initialVdom.set( node, vdom );
+			await splitTask();
+			hydrate( vdom, fragment );
+		}
+	}
+};
diff --git a/packages/interactivity/src/namespaces.ts b/packages/interactivity/src/namespaces.ts
new file mode 100644
index 00000000000000..9103f3c76e67bb
--- /dev/null
+++ b/packages/interactivity/src/namespaces.ts
@@ -0,0 +1,10 @@
+const namespaceStack: string[] = [];
+
+export const getNamespace = () => namespaceStack.slice( -1 )[ 0 ];
+
+export const setNamespace = ( namespace: string ) => {
+	namespaceStack.push( namespace );
+};
+export const resetNamespace = () => {
+	namespaceStack.pop();
+};
diff --git a/packages/interactivity/src/portals.js b/packages/interactivity/src/portals.js
deleted file mode 100644
index ccb293d6c20e80..00000000000000
--- a/packages/interactivity/src/portals.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * External dependencies
- */
-import { createElement, render } from 'preact';
-
-/**
- * @param {import('../../src/index').RenderableProps<{ context: any }>} props
- */
-function ContextProvider( props ) {
-	this.getChildContext = () => props.context;
-	return props.children;
-}
-
-/**
- * Portal component
- *
- * @this {import('./internal').Component}
- * @param {object | null | undefined} props
- *
- *                                          TODO: use createRoot() instead of fake root
- */
-function Portal( props ) {
-	const _this = this;
-	const container = props._container;
-
-	_this.componentWillUnmount = function () {
-		render( null, _this._temp );
-		_this._temp = null;
-		_this._container = null;
-	};
-
-	// When we change container we should clear our old container and
-	// indicate a new mount.
-	if ( _this._container && _this._container !== container ) {
-		_this.componentWillUnmount();
-	}
-
-	// When props.vnode is undefined/false/null we are dealing with some kind of
-	// conditional vnode. This should not trigger a render.
-	if ( props._vnode ) {
-		if ( ! _this._temp ) {
-			_this._container = container;
-
-			// Create a fake DOM parent node that manages a subset of `container`'s children:
-			_this._temp = {
-				nodeType: 1,
-				parentNode: container,
-				childNodes: [],
-				appendChild( child ) {
-					this.childNodes.push( child );
-					_this._container.appendChild( child );
-				},
-				insertBefore( child ) {
-					this.childNodes.push( child );
-					_this._container.appendChild( child );
-				},
-				removeChild( child ) {
-					this.childNodes.splice(
-						// eslint-disable-next-line no-bitwise
-						this.childNodes.indexOf( child ) >>> 1,
-						1
-					);
-					_this._container.removeChild( child );
-				},
-			};
-		}
-
-		// Render our wrapping element into temp.
-		render(
-			createElement(
-				ContextProvider,
-				{ context: _this.context },
-				props._vnode
-			),
-			_this._temp
-		);
-	}
-	// When we come from a conditional render, on a mounted
-	// portal we should clear the DOM.
-	else if ( _this._temp ) {
-		_this.componentWillUnmount();
-	}
-}
-
-/**
- * Create a `Portal` to continue rendering the vnode tree at a different DOM node
- *
- * @param {import('./internal').VNode}         vnode     The vnode to render
- * @param {import('./internal').PreactElement} container The DOM node to continue rendering in to.
- */
-export function createPortal( vnode, container ) {
-	const el = createElement( Portal, {
-		_vnode: vnode,
-		_container: container,
-	} );
-	el.containerInfo = container;
-	return el;
-}
diff --git a/packages/interactivity/src/proxies/context.ts b/packages/interactivity/src/proxies/context.ts
new file mode 100644
index 00000000000000..64517c91a6940e
--- /dev/null
+++ b/packages/interactivity/src/proxies/context.ts
@@ -0,0 +1,69 @@
+const contextObjectToProxy = new WeakMap();
+const contextObjectToFallback = new WeakMap();
+const contextProxies = new WeakSet();
+
+const descriptor = Reflect.getOwnPropertyDescriptor;
+
+// TODO: Use the proxy registry to avoid multiple proxies on the same object.
+const contextHandlers: ProxyHandler< object > = {
+	get: ( target, key ) => {
+		const fallback = contextObjectToFallback.get( target );
+		// Always subscribe to prop changes in the current context.
+		const currentProp = target[ key ];
+
+		/*
+		 * Return the value from `target` if it exists, or from `fallback`
+		 * otherwise. This way, in the case the property doesn't exist either in
+		 * `target` or `fallback`, it also subscribes to changes in the parent
+		 * context.
+		 */
+		return key in target ? currentProp : fallback[ key ];
+	},
+	set: ( target, key, value ) => {
+		const fallback = contextObjectToFallback.get( target );
+
+		// If the property exists in the current context, modify it. Otherwise,
+		// add it to the current context.
+		const obj = key in target || ! ( key in fallback ) ? target : fallback;
+		obj[ key ] = value;
+
+		return true;
+	},
+	ownKeys: ( target ) => [
+		...new Set( [
+			...Object.keys( contextObjectToFallback.get( target ) ),
+			...Object.keys( target ),
+		] ),
+	],
+	getOwnPropertyDescriptor: ( target, key ) =>
+		descriptor( target, key ) ||
+		descriptor( contextObjectToFallback.get( target ), key ),
+};
+
+/**
+ * Wrap a context object with a proxy to reproduce the context stack. The proxy
+ * uses the passed `inherited` context as a fallback to look up for properties
+ * that don't exist in the given context. Also, updated properties are modified
+ * where they are defined, or added to the main context when they don't exist.
+ *
+ * @param current   Current context.
+ * @param inherited Inherited context, used as fallback.
+ *
+ * @return The wrapped context object.
+ */
+export const proxifyContext = (
+	current: object,
+	inherited: object = {}
+): object => {
+	if ( contextProxies.has( current ) ) {
+		throw Error( 'This object cannot be proxified.' );
+	}
+	// Update the fallback object reference when it changes.
+	contextObjectToFallback.set( current, inherited );
+	if ( ! contextObjectToProxy.has( current ) ) {
+		const proxy = new Proxy( current, contextHandlers );
+		contextObjectToProxy.set( current, proxy );
+		contextProxies.add( proxy );
+	}
+	return contextObjectToProxy.get( current );
+};
diff --git a/packages/interactivity/src/proxies/index.ts b/packages/interactivity/src/proxies/index.ts
new file mode 100644
index 00000000000000..168e6467fc7016
--- /dev/null
+++ b/packages/interactivity/src/proxies/index.ts
@@ -0,0 +1,6 @@
+/**
+ * Internal dependencies
+ */
+export { proxifyState, peek, deepMerge } from './state';
+export { proxifyStore } from './store';
+export { proxifyContext } from './context';
diff --git a/packages/interactivity/src/proxies/registry.ts b/packages/interactivity/src/proxies/registry.ts
new file mode 100644
index 00000000000000..3bfe3b9168b79e
--- /dev/null
+++ b/packages/interactivity/src/proxies/registry.ts
@@ -0,0 +1,96 @@
+/**
+ * Proxies for each object.
+ */
+const objToProxy = new WeakMap< object, object >();
+const proxyToObj = new WeakMap< object, object >();
+
+/**
+ * Namespaces for each created proxy.
+ */
+const proxyToNs = new WeakMap< object, string >();
+
+/**
+ * Object types that can be proxied.
+ */
+const supported = new Set( [ Object, Array ] );
+
+/**
+ * Returns a proxy to the passed object with the given handlers, assigning the
+ * specified namespace to it. If a proxy for the passed object was created
+ * before, that proxy is returned.
+ *
+ * @param namespace The namespace that will be associated to this proxy.
+ * @param obj       The object to proxify.
+ * @param handlers  Handlers that the proxy will use.
+ *
+ * @throws Error if the object cannot be proxified. Use {@link shouldProxy} to
+ *         check if a proxy can be created for a specific object.
+ *
+ * @return The created proxy.
+ */
+export const createProxy = < T extends object >(
+	namespace: string,
+	obj: T,
+	handlers: ProxyHandler< T >
+): T => {
+	if ( ! shouldProxy( obj ) ) {
+		throw Error( 'This object cannot be proxified.' );
+	}
+	if ( ! objToProxy.has( obj ) ) {
+		const proxy = new Proxy( obj, handlers );
+		objToProxy.set( obj, proxy );
+		proxyToObj.set( proxy, obj );
+		proxyToNs.set( proxy, namespace );
+	}
+	return objToProxy.get( obj ) as T;
+};
+
+/**
+ * Returns the proxy for the given object. If there is no associated proxy, the
+ * function returns `undefined`.
+ *
+ * @param obj Object from which to know the proxy.
+ * @return Associated proxy or `undefined`.
+ */
+export const getProxyFromObject = < T extends object >(
+	obj: T
+): T | undefined => objToProxy.get( obj ) as T;
+
+/**
+ * Gets the namespace associated with the given proxy.
+ *
+ * Proxies have a namespace assigned upon creation. See {@link createProxy}.
+ *
+ * @param proxy Proxy.
+ * @return Namespace.
+ */
+export const getNamespaceFromProxy = ( proxy: object ): string =>
+	proxyToNs.get( proxy )!;
+
+/**
+ * Checks if a given object can be proxied.
+ *
+ * @param candidate Object to know whether it can be proxied.
+ * @return True if the passed instance can be proxied.
+ */
+export const shouldProxy = (
+	candidate: any
+): candidate is Object | Array< unknown > => {
+	if ( typeof candidate !== 'object' || candidate === null ) {
+		return false;
+	}
+	return (
+		! proxyToNs.has( candidate ) && supported.has( candidate.constructor )
+	);
+};
+
+/**
+ * Returns the target object for the passed proxy. If the passed object is not a registered proxy, the
+ * function returns `undefined`.
+ *
+ * @param proxy Proxy from which to know the target.
+ * @return The target object or `undefined`.
+ */
+export const getObjectFromProxy = < T extends object >(
+	proxy: T
+): T | undefined => proxyToObj.get( proxy ) as T;
diff --git a/packages/interactivity/src/proxies/signals.ts b/packages/interactivity/src/proxies/signals.ts
new file mode 100644
index 00000000000000..29bd58aaa4fced
--- /dev/null
+++ b/packages/interactivity/src/proxies/signals.ts
@@ -0,0 +1,143 @@
+/**
+ * External dependencies
+ */
+import {
+	computed,
+	signal,
+	batch,
+	type Signal,
+	type ReadonlySignal,
+} from '@preact/signals';
+
+/**
+ * Internal dependencies
+ */
+import { getNamespaceFromProxy } from './registry';
+import { getScope } from '../scopes';
+import { setNamespace, resetNamespace } from '../namespaces';
+import { withScope } from '../utils';
+
+/**
+ * Identifier for property computeds not associated to any scope.
+ */
+const NO_SCOPE = {};
+
+/**
+ * Structure that manages reactivity for a property in a state object. It uses
+ * signals to keep track of property value or getter modifications.
+ */
+export class PropSignal {
+	/**
+	 * Proxy that holds the property this PropSignal is associated with.
+	 */
+	private owner: object;
+
+	/**
+	 * Relation of computeds by scope. These computeds are read-only signals
+	 * that depend on whether the property is a value or a getter and,
+	 * therefore, can return different values depending on the scope in which
+	 * the getter is accessed.
+	 */
+	private computedsByScope: WeakMap< WeakKey, ReadonlySignal >;
+
+	/**
+	 * Signal with the value assigned to the related property.
+	 */
+	private valueSignal?: Signal;
+
+	/**
+	 * Signal with the getter assigned to the related property.
+	 */
+	private getterSignal?: Signal< ( () => any ) | undefined >;
+
+	/**
+	 * Structure that manages reactivity for a property in a state object, using
+	 * signals to keep track of property value or getter modifications.
+	 *
+	 * @param owner Proxy that holds the property this instance is associated
+	 *              with.
+	 */
+	constructor( owner: object ) {
+		this.owner = owner;
+		this.computedsByScope = new WeakMap();
+	}
+
+	/**
+	 * Changes the internal value. If a getter was set before, it is set to
+	 * `undefined`.
+	 *
+	 * @param value New value.
+	 */
+	public setValue( value: unknown ) {
+		this.update( { value } );
+	}
+
+	/**
+	 * Changes the internal getter. If a value was set before, it is set to
+	 * `undefined`.
+	 *
+	 * @param getter New getter.
+	 */
+	public setGetter( getter: () => any ) {
+		this.update( { get: getter } );
+	}
+
+	/**
+	 * Returns the computed that holds the result of evaluating the prop in the
+	 * current scope.
+	 *
+	 * These computeds are read-only signals that depend on whether the property
+	 * is a value or a getter and, therefore, can return different values
+	 * depending on the scope in which the getter is accessed.
+	 *
+	 * @return Computed that depends on the scope.
+	 */
+	public getComputed(): ReadonlySignal {
+		const scope = getScope() || NO_SCOPE;
+
+		if ( ! this.valueSignal && ! this.getterSignal ) {
+			this.update( {} );
+		}
+
+		if ( ! this.computedsByScope.has( scope ) ) {
+			const callback = () => {
+				const getter = this.getterSignal?.value;
+				return getter
+					? getter.call( this.owner )
+					: this.valueSignal?.value;
+			};
+
+			setNamespace( getNamespaceFromProxy( this.owner ) );
+			this.computedsByScope.set(
+				scope,
+				computed( withScope( callback ) )
+			);
+			resetNamespace();
+		}
+
+		return this.computedsByScope.get( scope )!;
+	}
+
+	/**
+	 *  Update the internal signals for the value and the getter of the
+	 *  corresponding prop.
+	 *
+	 * @param param0
+	 * @param param0.get   New getter.
+	 * @param param0.value New value.
+	 */
+	private update( { get, value }: { get?: () => any; value?: unknown } ) {
+		if ( ! this.valueSignal ) {
+			this.valueSignal = signal( value );
+			this.getterSignal = signal( get );
+		} else if (
+			value !== this.valueSignal.peek() ||
+			get !== this.getterSignal!.peek()
+		) {
+			batch( () => {
+				this.valueSignal!.value = value;
+				this.getterSignal!.value = get;
+			} );
+		}
+	}
+}
diff --git a/packages/interactivity/src/proxies/state.ts b/packages/interactivity/src/proxies/state.ts
new file mode 100644
index 00000000000000..f9af257bada2ea
--- /dev/null
+++ b/packages/interactivity/src/proxies/state.ts
@@ -0,0 +1,403 @@
+/**
+ * External dependencies
+ */
+import { batch, signal, type Signal } from '@preact/signals';
+
+/**
+ * Internal dependencies
+ */
+import {
+	createProxy,
+	getProxyFromObject,
+	getNamespaceFromProxy,
+	shouldProxy,
+	getObjectFromProxy,
+} from './registry';
+import { PropSignal } from './signals';
+import { setNamespace, resetNamespace } from '../namespaces';
+import { isPlainObject } from '../utils';
+
+/**
+ * Set of built-in symbols.
+ */
+const wellKnownSymbols = new Set(
+	Object.getOwnPropertyNames( Symbol )
+		.map( ( key ) => Symbol[ key ] )
+		.filter( ( value ) => typeof value === 'symbol' )
+);
+
+/**
+ * Relates each proxy with a map of {@link PropSignal} instances, representing
+ * the proxy's accessed properties.
+ */
+const proxyToProps: WeakMap<
+	object,
+	Map< string | symbol, PropSignal >
+> = new WeakMap();
+
+/**
+ *  Checks wether a {@link PropSignal | `PropSignal`} instance exists for the
+ *  given property in the passed proxy.
+ *
+ * @param proxy Proxy of a state object or array.
+ * @param key   The property key.
+ * @return `true` when it exists; false otherwise.
+ */
+export const hasPropSignal = ( proxy: object, key: string ) =>
+	proxyToProps.has( proxy ) && proxyToProps.get( proxy )!.has( key );
+
+const readOnlyProxies = new WeakSet();
+
+/**
+ * Returns the {@link PropSignal | `PropSignal`} instance associated with the
+ * specified prop in the passed proxy.
+ *
+ * The `PropSignal` instance is generated if it doesn't exist yet, using the
+ * `initial` parameter to initialize the internal signals.
+ *
+ * @param proxy   Proxy of a state object or array.
+ * @param key     The property key.
+ * @param initial Initial data for the `PropSignal` instance.
+ * @return The `PropSignal` instance.
+ */
+const getPropSignal = (
+	proxy: object,
+	key: string | number | symbol,
+	initial?: PropertyDescriptor
+) => {
+	if ( ! proxyToProps.has( proxy ) ) {
+		proxyToProps.set( proxy, new Map() );
+	}
+	key = typeof key === 'number' ? `${ key }` : key;
+	const props = proxyToProps.get( proxy )!;
+	if ( ! props.has( key ) ) {
+		const ns = getNamespaceFromProxy( proxy );
+		const prop = new PropSignal( proxy );
+		props.set( key, prop );
+		if ( initial ) {
+			const { get, value } = initial;
+			if ( get ) {
+				prop.setGetter( get );
+			} else {
+				const readOnly = readOnlyProxies.has( proxy );
+				prop.setValue(
+					shouldProxy( value )
+						? proxifyState( ns, value, { readOnly } )
+						: value
+				);
+			}
+		}
+	}
+	return props.get( key )!;
+};
+
+/**
+ * Relates each proxied object (i.e., the original object) with a signal that
+ * tracks changes in the number of properties.
+ */
+const objToIterable = new WeakMap< object, Signal< number > >();
+
+/**
+ * When this flag is `true`, it avoids any signal subscription, overriding state
+ * props' "reactive" behavior.
+ */
+let peeking = false;
+
+/**
+ * Handlers for reactive objects and arrays in the state.
+ */
+const stateHandlers: ProxyHandler< object > = {
+	get( target: object, key: string | symbol, receiver: object ): any {
+		/*
+		 * The property should not be reactive for the following cases:
+		 * 1. While using the `peek` function to read the property.
+		 * 2. The property exists but comes from the Object or Array prototypes.
+		 * 3. The property key is a known symbol.
+		 */
+		if (
+			peeking ||
+			( ! target.hasOwnProperty( key ) && key in target ) ||
+			( typeof key === 'symbol' && wellKnownSymbols.has( key ) )
+		) {
+			return Reflect.get( target, key, receiver );
+		}
+
+		// At this point, the property should be reactive.
+		const desc = Object.getOwnPropertyDescriptor( target, key );
+		const prop = getPropSignal( receiver, key, desc );
+		const result = prop.getComputed().value;
+
+		/*
+		 * Check if the property is a synchronous function. If it is, set the
+		 * default namespace. Synchronous functions always run in the proper scope,
+		 * which is set by the Directives component.
+		 */
+		if ( typeof result === 'function' ) {
+			const ns = getNamespaceFromProxy( receiver );
+			return ( ...args: unknown[] ) => {
+				setNamespace( ns );
+				try {
+					return result.call( receiver, ...args );
+				} finally {
+					resetNamespace();
+				}
+			};
+		}
+
+		return result;
+	},
+
+	set(
+		target: object,
+		key: string,
+		value: unknown,
+		receiver: object
+	): boolean {
+		if ( readOnlyProxies.has( receiver ) ) {
+			return false;
+		}
+		setNamespace( getNamespaceFromProxy( receiver ) );
+		try {
+			return Reflect.set( target, key, value, receiver );
+		} finally {
+			resetNamespace();
+		}
+	},
+
+	defineProperty(
+		target: object,
+		key: string,
+		desc: PropertyDescriptor
+	): boolean {
+		if ( readOnlyProxies.has( getProxyFromObject( target )! ) ) {
+			return false;
+		}
+
+		const isNew = ! ( key in target );
+		const result = Reflect.defineProperty( target, key, desc );
+
+		if ( result ) {
+			const receiver = getProxyFromObject( target )!;
+			const prop = getPropSignal( receiver, key );
+			const { get, value } = desc;
+			if ( get ) {
+				prop.setGetter( get );
+			} else {
+				const ns = getNamespaceFromProxy( receiver );
+				prop.setValue(
+					shouldProxy( value ) ? proxifyState( ns, value ) : value
+				);
+			}
+
+			if ( isNew && objToIterable.has( target ) ) {
+				objToIterable.get( target )!.value++;
+			}
+
+			/*
+			 * Modify the `length` property value only if the related
+			 * `PropSignal` exists, which means that there are subscriptions to
+			 * this property.
+			 */
+			if (
+				Array.isArray( target ) &&
+				proxyToProps.get( receiver )?.has( 'length' )
+			) {
+				const length = getPropSignal( receiver, 'length' );
+				length.setValue( target.length );
+			}
+		}
+
+		return result;
+	},
+
+	deleteProperty( target: object, key: string ): boolean {
+		if ( readOnlyProxies.has( getProxyFromObject( target )! ) ) {
+			return false;
+		}
+
+		const result = Reflect.deleteProperty( target, key );
+
+		if ( result ) {
+			const prop = getPropSignal( getProxyFromObject( target )!, key );
+			prop.setValue( undefined );
+
+			if ( objToIterable.has( target ) ) {
+				objToIterable.get( target )!.value++;
+			}
+		}
+
+		return result;
+	},
+
+	ownKeys( target: object ): ( string | symbol )[] {
+		if ( ! objToIterable.has( target ) ) {
+			objToIterable.set( target, signal( 0 ) );
+		}
+		/*
+		 *This subscribes to the signal while preventing the minifier from
+		 * deleting this line in production.
+		 */
+		( objToIterable as any )._ = objToIterable.get( target )!.value;
+		return Reflect.ownKeys( target );
+	},
+};
+
+/**
+ * Returns the proxy associated with the given state object, creating it if it
+ * does not exist.
+ *
+ * @param namespace        The namespace that will be associated to this proxy.
+ * @param obj              The object to proxify.
+ * @param options          Options.
+ * @param options.readOnly Read-only.
+ *
+ * @throws Error if the object cannot be proxified. Use {@link shouldProxy} to
+ *         check if a proxy can be created for a specific object.
+ *
+ * @return The associated proxy.
+ */
+export const proxifyState = < T extends object >(
+	namespace: string,
+	obj: T,
+	options?: { readOnly?: boolean }
+): T => {
+	const proxy = createProxy( namespace, obj, stateHandlers ) as T;
+	if ( options?.readOnly ) {
+		readOnlyProxies.add( proxy );
+	}
+	return proxy;
+};
+
+/**
+ * Reads the value of the specified property without subscribing to it.
+ *
+ * @param obj The object to read the property from.
+ * @param key The property key.
+ * @return The property value.
+ */
+export const peek = < T extends object, K extends keyof T >(
+	obj: T,
+	key: K
+): T[ K ] => {
+	peeking = true;
+	try {
+		return obj[ key ];
+	} finally {
+		peeking = false;
+	}
+};
+
+/**
+ * Internal recursive implementation for {@link deepMerge | `deepMerge`}.
+ *
+ * @param target   The target object.
+ * @param source   The source object containing new values and props.
+ * @param override Whether existing props should be overwritten or not (`true`
+ *                 by default).
+ */
+const deepMergeRecursive = (
+	target: any,
+	source: any,
+	override: boolean = true
+) => {
+	// If target is not a plain object and the source is, we don't need to merge
+	// them because the source will be used as the new value of the target.
+	if ( ! ( isPlainObject( target ) && isPlainObject( source ) ) ) {
+		return;
+	}
+
+	let hasNewKeys = false;
+
+	for ( const key in source ) {
+		const isNew = ! ( key in target );
+		hasNewKeys = hasNewKeys || isNew;
+
+		const desc = Object.getOwnPropertyDescriptor( source, key )!;
+		const proxy = getProxyFromObject( target );
+		const propSignal =
+			!! proxy &&
+			hasPropSignal( proxy, key ) &&
+			getPropSignal( proxy, key );
+
+		// Handle getters and setters
+		if (
+			typeof desc.get === 'function' ||
+			typeof desc.set === 'function'
+		) {
+			if ( override || isNew ) {
+				// Because we are setting a getter or setter, we need to use
+				// Object.defineProperty to define the property on the target object.
+				Object.defineProperty( target, key, {
+					...desc,
+					configurable: true,
+					enumerable: true,
+				} );
+				// Update the getter in the property signal if it exists
+				if ( desc.get && propSignal ) {
+					propSignal.setGetter( desc.get );
+				}
+			}
+
+			// Handle nested objects
+		} else if ( isPlainObject( source[ key ] ) ) {
+			if ( isNew || ( override && ! isPlainObject( target[ key ] ) ) ) {
+				// Create a new object if the property is new or needs to be overridden
+				target[ key ] = {};
+				if ( propSignal ) {
+					// Create a new proxified state for the nested object
+					const ns = getNamespaceFromProxy( proxy );
+					propSignal.setValue(
+						proxifyState( ns, target[ key ] as Object )
+					);
+				}
+			}
+			// Both target and source are plain objects, merge them recursively
+			if ( isPlainObject( target[ key ] ) ) {
+				deepMergeRecursive( target[ key ], source[ key ], override );
+			}
+
+			// Handle primitive values and non-plain objects
+		} else if ( override || isNew ) {
+			Object.defineProperty( target, key, desc );
+			if ( propSignal ) {
+				const { value } = desc;
+				const ns = getNamespaceFromProxy( proxy );
+				// Proxify the value if necessary before setting it in the signal
+				propSignal.setValue(
+					shouldProxy( value ) ? proxifyState( ns, value ) : value
+				);
+			}
+		}
+	}
+
+	if ( hasNewKeys && objToIterable.has( target ) ) {
+		objToIterable.get( target )!.value++;
+	}
+};
+
+/**
+ * Recursively update prop values inside the passed `target` and nested plain
+ * objects, using the values present in `source`. References to plain objects
+ * are kept, only updating props containing primitives or arrays. Arrays are
+ * replaced instead of merged or concatenated.
+ *
+ * If the `override` parameter is set to `false`, then all values in `target`
+ * are preserved, and only new properties from `source` are added.
+ *
+ * @param target   The target object.
+ * @param source   The source object containing new values and props.
+ * @param override Whether existing props should be overwritten or not (`true`
+ *                 by default).
+ */
+export const deepMerge = (
+	target: any,
+	source: any,
+	override: boolean = true
+) =>
+	batch( () =>
+		deepMergeRecursive(
+			getObjectFromProxy( target ) || target,
+			source,
+			override
+		)
+	);
diff --git a/packages/interactivity/src/proxies/store.ts b/packages/interactivity/src/proxies/store.ts
new file mode 100644
index 00000000000000..506b8c3b097bae
--- /dev/null
+++ b/packages/interactivity/src/proxies/store.ts
@@ -0,0 +1,79 @@
+/**
+ * Internal dependencies
+ */
+import { createProxy, getNamespaceFromProxy, shouldProxy } from './registry';
+/**
+ * External dependencies
+ */
+import { setNamespace, resetNamespace } from '../namespaces';
+import { withScope, isPlainObject } from '../utils';
+
+/**
+ * Identifies the store proxies handling the root objects of each store.
+ */
+const storeRoots = new WeakSet();
+
+/**
+ * Handlers for store proxies.
+ */
+const storeHandlers: ProxyHandler< object > = {
+	get: ( target: any, key: string | symbol, receiver: any ) => {
+		const result = Reflect.get( target, key );
+		const ns = getNamespaceFromProxy( receiver );
+
+		/*
+		 * Check if the proxy is the store root and no key with that name exist. In
+		 * that case, return an empty object for the requested key.
+		 */
+		if ( typeof result === 'undefined' && storeRoots.has( receiver ) ) {
+			const obj = {};
+			Reflect.set( target, key, obj );
+			return proxifyStore( ns, obj, false );
+		}
+
+		/*
+		 * Check if the property is a function. If it is, add the store
+		 * namespace to the stack and wrap the function with the current scope.
+		 * The `withScope` util handles both synchronous functions and generator
+		 * functions.
+		 */
+		if ( typeof result === 'function' ) {
+			setNamespace( ns );
+			const scoped = withScope( result );
+			resetNamespace();
+			return scoped;
+		}
+
+		// Check if the property is an object. If it is, proxyify it.
+		if ( isPlainObject( result ) && shouldProxy( result ) ) {
+			return proxifyStore( ns, result, false );
+		}
+
+		return result;
+	},
+};
+
+/**
+ * Returns the proxy associated with the given store object, creating it if it
+ * does not exist.
+ *
+ * @param namespace The namespace that will be associated to this proxy.
+ * @param obj       The object to proxify.
+ *
+ * @param isRoot    Whether the passed object is the store root object.
+ * @throws Error if the object cannot be proxified. Use {@link shouldProxy} to
+ *         check if a proxy can be created for a specific object.
+ *
+ * @return The associated proxy.
+ */
+export const proxifyStore = < T extends object >(
+	namespace: string,
+	obj: T,
+	isRoot = true
+): T => {
+	const proxy = createProxy( namespace, obj, storeHandlers );
+	if ( proxy && isRoot ) {
+		storeRoots.add( proxy );
+	}
+	return proxy as T;
+};
diff --git a/packages/interactivity/src/proxies/test/context-proxy.ts b/packages/interactivity/src/proxies/test/context-proxy.ts
new file mode 100644
index 00000000000000..1e4a969d0f9dc6
--- /dev/null
+++ b/packages/interactivity/src/proxies/test/context-proxy.ts
@@ -0,0 +1,351 @@
+/**
+ * External dependencies
+ */
+import { effect } from '@preact/signals';
+
+/**
+ * Internal dependencies
+ */
+import { proxifyContext, proxifyState, deepMerge } from '../';
+
+describe( 'Interactivity API', () => {
+	describe( 'context proxy', () => {
+		describe( 'get', () => {
+			it( 'should inherit props from its fallback', () => {
+				const fallback: any = proxifyContext( { a: 1 }, {} );
+				const context: any = proxifyContext( { b: 2 }, fallback );
+
+				expect( context.a ).toBe( 1 );
+				expect( context.b ).toBe( 2 );
+			} );
+
+			it( "should inherit props from its fallback's fallback", () => {
+				const fallback2: any = proxifyContext( { a: 1 }, {} );
+				const fallback1: any = proxifyContext( { b: 2 }, fallback2 );
+				const context: any = proxifyContext( { c: 3 }, fallback1 );
+
+				expect( context.a ).toBe( 1 );
+				expect( context.b ).toBe( 2 );
+				expect( context.c ).toBe( 3 );
+			} );
+
+			it( 'should list all inherited props', () => {
+				const fallback2: any = proxifyContext( { a: 1 }, {} );
+				const fallback1: any = proxifyContext( { b: 2 }, fallback2 );
+				const context: any = proxifyContext( { c: 3 }, fallback1 );
+
+				expect( Object.entries( context ) ).toEqual( [
+					[ 'a', 1 ],
+					[ 'b', 2 ],
+					[ 'c', 3 ],
+				] );
+			} );
+
+			it( 'should shadow properties defined in its fallback', () => {
+				const fallback: any = proxifyContext(
+					{ prop: 'fallback' },
+					{}
+				);
+				const context: any = proxifyContext(
+					{ prop: 'context' },
+					fallback
+				);
+
+				expect( context.prop ).toBe( 'context' );
+			} );
+
+			it( 'should not inherit properties from nested objects', () => {
+				const fallback: any = proxifyContext( { obj: { a: 1 } }, {} );
+				const context: any = proxifyContext(
+					{ obj: { b: 2 } },
+					fallback
+				);
+
+				expect( 'a' in context.obj ).toBe( false );
+				expect( context.obj.b ).toBe( 2 );
+			} );
+
+			it( 'should work with the proxified state', () => {
+				const state = proxifyState( 'test', { a: 1 } );
+				const fallback: any = proxifyContext( state, {} );
+				const context: any = proxifyContext( state, fallback );
+
+				expect( context.a ).toBe( 1 );
+			} );
+		} );
+
+		describe( 'set', () => {
+			it( 'should modify props defined in it', () => {
+				const fallback: any = proxifyContext(
+					{ prop: 'fallback' },
+					{}
+				);
+				const context: any = proxifyContext(
+					{ prop: 'context' },
+					fallback
+				);
+
+				context.prop = 'modified';
+
+				expect( context.prop ).toBe( 'modified' );
+				expect( fallback.prop ).toBe( 'fallback' );
+			} );
+
+			it( 'should modify props inherited from its fallback', () => {
+				const fallback: any = proxifyContext(
+					{ prop: 'fallback' },
+					{}
+				);
+				const context: any = proxifyContext( {}, fallback );
+
+				context.prop = 'modified';
+
+				expect( context.prop ).toBe( 'modified' );
+				expect( fallback.prop ).toBe( 'modified' );
+			} );
+
+			it( 'should see changes in inherited props', () => {
+				const fallback: any = proxifyContext(
+					{ prop: 'fallback' },
+					{}
+				);
+				const context: any = proxifyContext( {}, fallback );
+
+				fallback.prop = 'modified';
+
+				expect( context.prop ).toBe( 'modified' );
+				expect( fallback.prop ).toBe( 'modified' );
+			} );
+
+			it( 'should create non-inherited props in itself', () => {
+				const fallback: any = proxifyContext( {}, {} );
+				const context: any = proxifyContext( {}, fallback );
+
+				context.prop = 'modified';
+
+				expect( context.prop ).toBe( 'modified' );
+				expect( fallback.prop ).toBeUndefined();
+			} );
+
+			it( 'should work with the proxified state', () => {
+				const state = proxifyState( 'test', { a: 1 } );
+				const fallback: any = proxifyContext( state, {} );
+				const context: any = proxifyContext( {}, fallback );
+
+				context.a = 2;
+
+				expect( context.a ).toBe( 2 );
+				expect( state.a ).toBe( 2 );
+			} );
+		} );
+
+		describe( 'computations', () => {
+			it( 'should subscribe to changes in the current context', () => {
+				const fallback: any = proxifyContext(
+					proxifyState( 'test', { fromFallback: 'fallback' } ),
+					{}
+				);
+				const context: any = proxifyContext(
+					proxifyState( 'test', { fromContext: 'context' } ),
+					fallback
+				);
+
+				const spy = jest.fn( () => context.fromContext );
+				effect( spy );
+
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( context.fromContext ).toBe( 'context' );
+
+				context.fromContext = 'modified';
+
+				expect( spy ).toHaveBeenCalledTimes( 2 );
+				expect( context.fromContext ).toBe( 'modified' );
+			} );
+
+			it( 'should subscribe to changes in inherited values', () => {
+				const fallback: any = proxifyContext(
+					proxifyState( 'test', { fromFallback: 'fallback' } ),
+					{}
+				);
+				const context: any = proxifyContext(
+					proxifyState( 'test', { fromContext: 'context' } ),
+					fallback
+				);
+
+				const spy = jest.fn( () => context.fromFallback );
+				effect( spy );
+
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( context.fromFallback ).toBe( 'fallback' );
+
+				fallback.fromFallback = 'modified';
+
+				expect( spy ).toHaveBeenCalledTimes( 2 );
+				expect( context.fromFallback ).toBe( 'modified' );
+			} );
+
+			it( 'should subscribe to undefined props added to the context', () => {
+				const fallback: any = proxifyContext(
+					proxifyState( 'test', {} ),
+					{}
+				);
+				const context: any = proxifyContext(
+					proxifyState( 'test', {} ),
+					fallback
+				);
+
+				const spy = jest.fn( () => context.fromContext );
+				effect( spy );
+
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( context.fromContext ).toBeUndefined();
+
+				context.fromContext = 'added';
+
+				expect( spy ).toHaveBeenCalledTimes( 2 );
+				expect( context.fromContext ).toBe( 'added' );
+			} );
+
+			it( 'should subscribe to undefined props added to the fallback', () => {
+				const fallback: any = proxifyContext(
+					proxifyState( 'test', {} ),
+					{}
+				);
+				const context: any = proxifyContext(
+					proxifyState( 'test', {} ),
+					fallback
+				);
+
+				const spy = jest.fn( () => context.fromFallback );
+				effect( spy );
+
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( context.fromFallback ).toBeUndefined();
+
+				fallback.fromFallback = 'added';
+
+				expect( spy ).toHaveBeenCalledTimes( 2 );
+				expect( context.fromFallback ).toBe( 'added' );
+			} );
+
+			it( 'should subscribe to shadowed props', () => {
+				const fallbackState: any = proxifyState( 'test', {} );
+				const fallback: any = proxifyContext( fallbackState, {} );
+
+				const contextState: any = proxifyState( 'test', {} );
+				const context: any = proxifyContext( contextState, fallback );
+
+				const spy = jest.fn( () => context.prop );
+				effect( spy );
+
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( context.prop ).toBeUndefined();
+
+				fallbackState.prop = 'fromFallback';
+
+				expect( spy ).toHaveBeenCalledTimes( 2 );
+				expect( context.prop ).toBe( 'fromFallback' );
+
+				contextState.prop = 'fromContext';
+
+				expect( spy ).toHaveBeenCalledTimes( 3 );
+				expect( context.prop ).toBe( 'fromContext' );
+			} );
+
+			it( 'should subscribe to any changes in listed props', () => {
+				const fallback: any = proxifyContext(
+					proxifyState( 'test', {} ),
+					{}
+				);
+				const context: any = proxifyContext(
+					proxifyState( 'test', {} ),
+					fallback
+				);
+
+				const spy = jest.fn( () => Object.keys( context ) );
+				effect( spy );
+
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( Object.keys( context ) ).toEqual( [] );
+
+				context.fromContext = 'added';
+				fallback.fromFallback = 'added';
+
+				expect( spy ).toHaveBeenCalledTimes( 3 );
+				expect( Object.keys( context ).sort() ).toEqual( [
+					'fromContext',
+					'fromFallback',
+				] );
+			} );
+
+			it( 'should handle deeply nested properties that are initially undefined', () => {
+				const fallback: any = proxifyContext(
+					proxifyState( 'test', {} ),
+					{}
+				);
+				const context: any = proxifyContext(
+					proxifyState( 'test', {} ),
+					fallback
+				);
+
+				let deepValue: any;
+				const spy = jest.fn( () => {
+					deepValue = context.a?.b?.c?.d;
+				} );
+				effect( spy );
+
+				// Initial call, the deep value is undefined
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( deepValue ).toBeUndefined();
+
+				// Add a deeply nested object to the context
+				context.a = { b: { c: { d: 'test value' } } };
+
+				// The effect should be called again
+				expect( spy ).toHaveBeenCalledTimes( 2 );
+				expect( deepValue ).toBe( 'test value' );
+
+				// Reading the value directly should also work
+				expect( context.a.b.c.d ).toBe( 'test value' );
+			} );
+
+			it( 'should handle deeply nested properties that are initially undefined and merged with deepMerge', () => {
+				const fallbackState = proxifyState( 'test', {} );
+				const fallback: any = proxifyContext( fallbackState, {} );
+				const contextState = proxifyState( 'test', {} );
+				const context: any = proxifyContext( contextState, fallback );
+
+				let deepValue: any;
+				const spy = jest.fn( () => {
+					deepValue = context.a?.b?.c?.d;
+				} );
+				effect( spy );
+
+				// Initial call, the deep value is undefined
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( deepValue ).toBeUndefined();
+
+				// Use deepMerge to add a deeply nested object to the context
+				deepMerge( contextState, {
+					a: { b: { c: { d: 'test value' } } },
+				} );
+
+				// The effect should be called again
+				expect( spy ).toHaveBeenCalledTimes( 2 );
+				expect( deepValue ).toBe( 'test value' );
+
+				// Reading the value directly should also work
+				expect( context.a.b.c.d ).toBe( 'test value' );
+			} );
+		} );
+
+		describe( 'proxifyContext', () => {
+			it( 'should throw when trying to re-proxify a proxy object', () => {
+				const context = proxifyContext( {}, {} );
+				expect( () => proxifyContext( context, {} ) ).toThrow(
+					'This object cannot be proxified.'
+				);
+			} );
+		} );
+	} );
+} );
diff --git a/packages/interactivity/src/proxies/test/deep-merge.ts b/packages/interactivity/src/proxies/test/deep-merge.ts
new file mode 100644
index 00000000000000..aaa762cb979f3c
--- /dev/null
+++ b/packages/interactivity/src/proxies/test/deep-merge.ts
@@ -0,0 +1,551 @@
+/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable @typescript-eslint/no-shadow */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
+/**
+ * External dependencies
+ */
+import { effect } from '@preact/signals';
+/**
+ * Internal dependencies
+ */
+import { proxifyState, peek, deepMerge } from '../';
+import { hasPropSignal } from '../state';
+import { getProxyFromObject } from '../registry';
+
+describe( 'Interactivity API', () => {
+	describe( 'deepMerge', () => {
+		it( 'should merge two plain objects', () => {
+			const target = { a: 1, b: 2 };
+			const source = { b: 3, c: 4 };
+			const result = {};
+			deepMerge( result, target );
+			deepMerge( result, source );
+			expect( result ).toEqual( { a: 1, b: 3, c: 4 } );
+		} );
+
+		it( 'should handle nested objects', () => {
+			const target = { a: { x: 1 }, b: 2 };
+			const source = { a: { y: 2 }, c: 3 };
+			const result = {};
+			deepMerge( result, target );
+			deepMerge( result, source );
+			expect( result ).toEqual( { a: { x: 1, y: 2 }, b: 2, c: 3 } );
+		} );
+
+		it( 'should not override existing properties when override is false', () => {
+			const target = { a: 1, b: { x: 10 } };
+			const source = { a: 2, b: { y: 20 }, c: 3 };
+			const result = {};
+			deepMerge( result, target );
+			deepMerge( result, source, false );
+			expect( result ).toEqual( { a: 1, b: { x: 10, y: 20 }, c: 3 } );
+		} );
+
+		it( 'should handle getters', () => {
+			const target = {
+				get a() {
+					return 1;
+				},
+				b: 1,
+			};
+			const source = {
+				a: 2,
+				get b() {
+					return 2;
+				},
+			};
+			const result: Record< string, any > = {};
+			deepMerge( result, target );
+			deepMerge( result, source );
+			expect( result.a ).toBe( 2 );
+			expect( result.b ).toBe( 2 );
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'a' )?.get
+			).toBeUndefined();
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'b' )?.get
+			).toBeDefined();
+		} );
+
+		it( 'should not execute getters when performing the deep merge', () => {
+			let targetExecuted = false;
+			let sourceExecuted = false;
+			const target = {
+				get a() {
+					targetExecuted = true;
+					return 1;
+				},
+			};
+			const source = {
+				get b() {
+					sourceExecuted = true;
+					return 2;
+				},
+			};
+			const result: Record< string, any > = {};
+			deepMerge( result, target );
+			deepMerge( result, source );
+			expect( targetExecuted ).toBe( false );
+			expect( sourceExecuted ).toBe( false );
+		} );
+
+		it( 'should handle setters', () => {
+			let targetValue = 1;
+			const target = {
+				get a() {
+					return targetValue;
+				},
+				set a( value ) {
+					targetValue = value;
+				},
+				b: 1,
+			};
+			let sourceValue = 2;
+			const source = {
+				a: 3,
+				get b() {
+					return 2;
+				},
+				set b( value ) {
+					sourceValue = value;
+				},
+			};
+
+			const result: Record< string, any > = {};
+			deepMerge( result, target );
+
+			result.a = 5;
+			expect( targetValue ).toBe( 5 );
+			expect( result.a ).toBe( 5 );
+
+			deepMerge( result, source );
+
+			result.a = 6;
+			expect( targetValue ).toBe( 5 );
+
+			result.b = 7;
+			expect( sourceValue ).toBe( 7 );
+
+			expect( result.a ).toBe( 6 );
+			expect( result.b ).toBe( 2 );
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'a' )?.set
+			).toBeUndefined();
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'b' )?.set
+			).toBeDefined();
+		} );
+
+		it( 'should handle setters when overwrite is false', () => {
+			let targetValue = 1;
+			const target = {
+				get a() {
+					return targetValue;
+				},
+				set a( value ) {
+					targetValue = value;
+				},
+				b: 1,
+			};
+			let sourceValue = 2;
+			const source = {
+				a: 3,
+				get b() {
+					return 2;
+				},
+				set b( value ) {
+					sourceValue = value;
+				},
+			};
+
+			const result: Record< string, any > = {};
+			deepMerge( result, target, false );
+			deepMerge( result, source, false );
+
+			result.a = 6;
+			expect( targetValue ).toBe( 6 );
+
+			result.b = 7;
+			expect( sourceValue ).toBe( 2 );
+
+			expect( result.a ).toBe( 6 );
+			expect( result.b ).toBe( 7 );
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'a' )?.set
+			).toBeDefined();
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'b' )?.set
+			).toBeUndefined();
+		} );
+
+		it( 'should handle getters and setters together', () => {
+			let targetValue = 1;
+			const target = {
+				get a() {
+					return targetValue;
+				},
+				set a( value ) {
+					targetValue = value;
+				},
+				b: 1,
+			};
+			let sourceValue = 2;
+			const source = {
+				get a() {
+					return 3;
+				},
+				set a( value ) {
+					sourceValue = value;
+				},
+			};
+			const result: Record< string, any > = {};
+			deepMerge( result, target );
+			deepMerge( result, source );
+
+			// Test if setters and getters are copied correctly
+			result.a = 5;
+			expect( targetValue ).toBe( 1 ); // Should not change
+			expect( sourceValue ).toBe( 5 ); // Should change
+			expect( result.a ).toBe( 3 ); // Should return the getter's value
+
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'a' )?.get
+			).toBeDefined();
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'a' )?.set
+			).toBeDefined();
+		} );
+
+		it( 'should handle getters when overwrite is false', () => {
+			const target = {
+				get a() {
+					return 1;
+				},
+				b: 1,
+			};
+			const source = {
+				a: 2,
+				get b() {
+					return 2;
+				},
+			};
+			const result: Record< string, any > = {};
+			deepMerge( result, target, false );
+			deepMerge( result, source, false );
+			expect( result.a ).toBe( 1 );
+			expect( result.b ).toBe( 1 );
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'a' )?.get
+			).toBeDefined();
+			expect(
+				Object.getOwnPropertyDescriptor( result, 'b' )?.get
+			).toBeUndefined();
+		} );
+
+		it( 'should ignore non-plain objects', () => {
+			const target = { a: 1 };
+			const source = new Date();
+			const result = { ...target };
+			deepMerge( result, source );
+			expect( result ).toEqual( { a: 1 } );
+		} );
+
+		it( 'should handle null values', () => {
+			const target = { a: 1, b: null };
+			const source = { b: 2, c: null };
+			const result = {};
+			deepMerge( result, target );
+			deepMerge( result, source );
+			expect( result ).toEqual( { a: 1, b: 2, c: null } );
+		} );
+
+		it( 'should handle undefined values', () => {
+			const target = { a: 1, b: undefined };
+			const source = { b: 2, c: undefined };
+			const result = {};
+			deepMerge( result, target );
+			deepMerge( result, source );
+			expect( result ).toEqual( { a: 1, b: 2, c: undefined } );
+		} );
+
+		it( 'should handle undefined values when overwrite is false', () => {
+			const target = { a: 1, b: undefined };
+			const source = { b: 2, c: undefined };
+			const result = {};
+			deepMerge( result, target, false );
+			deepMerge( result, source, false );
+			expect( result ).toEqual( { a: 1, b: undefined, c: undefined } );
+		} );
+
+		it( 'should handle deleted values when overwrite is false', () => {
+			const target = { a: 1 };
+			const source = { a: 2 };
+			const result: Record< string, any > = {};
+			deepMerge( result, target, false );
+			delete result.a;
+			deepMerge( result, source, false );
+			expect( result ).toEqual( { a: 2 } );
+		} );
+
+		it( 'should never create signals', () => {
+			const target = { a: 1, b: { x: 10 } };
+			const source = { a: 2, b: { y: 20 }, c: 3 };
+			const result = proxifyState(
+				'test',
+				{} as typeof target & typeof source
+			);
+			deepMerge( result, target );
+			deepMerge( result, source, false );
+
+			expect( hasPropSignal( result, 'a' ) ).toBe( false );
+			expect( hasPropSignal( result, 'b' ) ).toBe( false );
+			expect( hasPropSignal( result, 'c' ) ).toBe( false );
+
+			const proxyB = getProxyFromObject( peek( result, 'b' ) )!;
+			expect( hasPropSignal( proxyB, 'x' ) ).toBe( false );
+			expect( hasPropSignal( proxyB, 'y' ) ).toBe( false );
+		} );
+
+		it( 'should update signals when they exist', () => {
+			const target = { a: 1, b: { x: 10 } };
+			const source = { a: 2, b: { x: 20, y: 30 }, c: 3 };
+			const result = proxifyState< any >( 'test', {} );
+
+			const spyA = jest.fn( () => result.a );
+			effect( spyA );
+
+			expect( spyA ).toHaveBeenCalledTimes( 1 );
+
+			deepMerge( result, target );
+
+			const spyBx = jest.fn( () => result.b.x );
+			effect( spyBx );
+			expect( spyA ).toHaveBeenCalledTimes( 2 );
+			expect( spyBx ).toHaveBeenCalledTimes( 1 );
+
+			deepMerge( result, source );
+
+			expect( spyA ).toHaveBeenCalledTimes( 3 );
+			expect( spyBx ).toHaveBeenCalledTimes( 2 );
+
+			expect( hasPropSignal( result, 'a' ) ).toBe( true );
+			expect( hasPropSignal( result, 'b' ) ).toBe( true );
+			expect( hasPropSignal( result, 'c' ) ).toBe( false );
+
+			const proxyB = getProxyFromObject( peek( result, 'b' ) )!;
+			expect( hasPropSignal( proxyB, 'x' ) ).toBe( true );
+			expect( hasPropSignal( proxyB, 'y' ) ).toBe( false );
+		} );
+
+		it( 'should batch all signal updates together', () => {
+			const target = { a: 1, b: 2 };
+			const source = { a: 3, b: 4 };
+			const result = proxifyState< any >( 'test', {} );
+
+			const spy = jest.fn( () => ( result.a, result.b ) );
+			effect( spy );
+
+			expect( spy ).toHaveBeenCalledTimes( 1 );
+
+			deepMerge( result, target );
+
+			expect( spy ).toHaveBeenCalledTimes( 2 );
+
+			deepMerge( result, source );
+
+			expect( spy ).toHaveBeenCalledTimes( 3 );
+		} );
+
+		it( 'should update iterable signals when new keys are added', () => {
+			const target = proxifyState< any >( 'test', { a: 1, b: 2 } );
+			const source = { a: 1, b: 2, c: 3 };
+
+			let keys: any;
+			const spy = jest.fn( () => {
+				keys = Object.keys( target );
+			} );
+			effect( spy );
+
+			expect( spy ).toHaveBeenCalledTimes( 1 );
+
+			deepMerge( target, source, false );
+
+			expect( spy ).toHaveBeenCalledTimes( 2 );
+			expect( keys ).toEqual( [ 'a', 'b', 'c' ] );
+		} );
+
+		it( 'should handle deeply nested properties that are initially undefined', () => {
+			const target: any = proxifyState( 'test', {} );
+
+			let deepValue: any;
+			const spy = jest.fn( () => {
+				deepValue = target.a?.b?.c?.d;
+			} );
+			effect( spy );
+
+			// Initial call, the deep value is undefined
+			expect( spy ).toHaveBeenCalledTimes( 1 );
+			expect( deepValue ).toBeUndefined();
+
+			// Use deepMerge to add a deeply nested object to the target
+			deepMerge( target, { a: { b: { c: { d: 'test value' } } } } );
+
+			// The effect should be called again
+			expect( spy ).toHaveBeenCalledTimes( 2 );
+			expect( deepValue ).toBe( 'test value' );
+
+			// Reading the value directly should also work
+			expect( target.a.b.c.d ).toBe( 'test value' );
+
+			// Modify the nested value
+			target.a.b.c.d = 'new test value';
+
+			// The effect should be called again
+			expect( spy ).toHaveBeenCalledTimes( 3 );
+			expect( deepValue ).toBe( 'new test value' );
+		} );
+
+		it( 'should overwrite values that become objects', () => {
+			const target: any = proxifyState( 'test', { message: 'hello' } );
+
+			let message: any;
+			const spy = jest.fn( () => ( message = target.message ) );
+			effect( spy );
+
+			expect( spy ).toHaveBeenCalledTimes( 1 );
+			expect( message ).toBe( 'hello' );
+
+			deepMerge( target, {
+				message: { content: 'hello', fontStyle: 'italic' },
+			} );
+
+			expect( spy ).toHaveBeenCalledTimes( 2 );
+			expect( message ).toEqual( {
+				content: 'hello',
+				fontStyle: 'italic',
+			} );
+
+			expect( target.message ).toEqual( {
+				content: 'hello',
+				fontStyle: 'italic',
+			} );
+		} );
+
+		it( 'should not overwrite values that become objects if `override` is false', () => {
+			const target: any = proxifyState( 'test', { message: 'hello' } );
+
+			let message: any;
+			const spy = jest.fn( () => ( message = target.message ) );
+			effect( spy );
+
+			expect( spy ).toHaveBeenCalledTimes( 1 );
+			expect( message ).toBe( 'hello' );
+
+			deepMerge(
+				target,
+				{ message: { content: 'hello', fontStyle: 'italic' } },
+				false
+			);
+
+			expect( spy ).toHaveBeenCalledTimes( 1 );
+			expect( message ).toBe( 'hello' );
+			expect( target.message ).toBe( 'hello' );
+			expect( target.message.content ).toBeUndefined();
+			expect( target.message.fontStyle ).toBeUndefined();
+		} );
+
+		it( 'should keep reactivity of arrays that are initially undefined', () => {
+			const target: any = proxifyState( 'test', {} );
+
+			let deepValue: any;
+			const spy = jest.fn( () => {
+				deepValue = target.array?.[ 0 ];
+			} );
+			effect( spy );
+
+			// Initial call, the deep value is undefined
+			expect( spy ).toHaveBeenCalledTimes( 1 );
+			expect( deepValue ).toBeUndefined();
+
+			// Use deepMerge to add an array to the target
+			deepMerge( target, { array: [ 'value 1' ] } );
+
+			// The effect should be called again
+			expect( spy ).toHaveBeenCalledTimes( 2 );
+			expect( deepValue ).toBe( 'value 1' );
+
+			// Modify the array value
+			target.array[ 0 ] = 'value 2';
+
+			// The effect should be called again
+			expect( spy ).toHaveBeenCalledTimes( 3 );
+			expect( deepValue ).toBe( 'value 2' );
+		} );
+
+		describe( 'arrays', () => {
+			it( 'should handle arrays', () => {
+				const target = { a: [ 1, 2 ] };
+				const source = { a: [ 3, 4 ] };
+				const result = {};
+				deepMerge( result, target );
+				deepMerge( result, source );
+				expect( result ).toEqual( { a: [ 3, 4 ] } );
+			} );
+
+			it( 'should handle arrays when overwrite is false', () => {
+				const target = { a: [ 1, 2 ] };
+				const source = { a: [ 3, 4 ] };
+				const result = {};
+				deepMerge( result, target, false );
+				deepMerge( result, source, false );
+				expect( result ).toEqual( { a: [ 1, 2 ] } );
+			} );
+
+			it( 'should add new array from source if not present in target', () => {
+				const target = { a: 1 };
+				const source = { arr: [ 1, 2, 3 ] };
+				const result = {};
+				deepMerge( result, target );
+				deepMerge( result, source );
+				expect( result ).toEqual( { a: 1, arr: [ 1, 2, 3 ] } );
+			} );
+
+			it( 'should handle nested arrays', () => {
+				const target = { nested: { arr: [ 1, 2 ] } };
+				const source = { nested: { arr: [ 3, 4, 5 ] } };
+				const result = {};
+				deepMerge( result, target );
+				deepMerge( result, source );
+				expect( result ).toEqual( { nested: { arr: [ 3, 4, 5 ] } } );
+			} );
+
+			it( 'should handle object with array as target and object with object as source', () => {
+				const target = { arr: [ 1, 2, 3 ] };
+				const source = { arr: { 1: 'two', 3: 'four' } };
+				const result: any = {};
+				deepMerge( result, target );
+				deepMerge( result, source );
+				expect( result ).toEqual( { arr: { 1: 'two', 3: 'four' } } );
+			} );
+
+			it( 'should handle object with object as target and object with array as source', () => {
+				const target = { arr: { 0: 'zero', 2: 'two' } };
+				const source = { arr: [ 'a', 'b', 'c' ] };
+				const result = {};
+				deepMerge( result, target );
+				deepMerge( result, source );
+				expect( result ).toEqual( { arr: [ 'a', 'b', 'c' ] } );
+			} );
+
+			it( 'should handle objects with arrays containing object elements', () => {
+				const target = { arr: [ { a: 1 }, { b: 2 } ] };
+				const source = { arr: [ { a: 2 }, { c: 3 } ] };
+				const result: any = {};
+				deepMerge( result, target );
+				deepMerge( result, source );
+				expect( result ).toEqual( { arr: [ { a: 2 }, { c: 3 } ] } );
+			} );
+		} );
+	} );
+} );
diff --git a/packages/interactivity/src/proxies/test/state-proxy.ts b/packages/interactivity/src/proxies/test/state-proxy.ts
new file mode 100644
index 00000000000000..4b0d2b0a708c3a
--- /dev/null
+++ b/packages/interactivity/src/proxies/test/state-proxy.ts
@@ -0,0 +1,1466 @@
+/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable @typescript-eslint/no-shadow */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
+/**
+ * External dependencies
+ */
+import { effect } from '@preact/signals';
+/**
+ * Internal dependencies
+ */
+import { proxifyState, peek, deepMerge } from '../';
+import { setScope, resetScope, getContext, getElement } from '../../scopes';
+import { setNamespace, resetNamespace } from '../../namespaces';
+
+type State = {
+	a?: number;
+	nested: { b?: number };
+	array: ( number | State[ 'nested' ] )[];
+};
+
+const withScopeAndNs = ( scope, ns, callback ) => () => {
+	setScope( scope );
+	setNamespace( ns );
+	try {
+		return callback();
+	} finally {
+		resetNamespace();
+		resetScope();
+	}
+};
+
+describe( 'Interactivity API', () => {
+	describe( 'state proxy', () => {
+		let nested = { b: 2 };
+		let array = [ 3, nested ];
+		let raw: State = { a: 1, nested, array };
+		let state = proxifyState( 'test', raw );
+
+		const window = globalThis as any;
+
+		beforeEach( () => {
+			nested = { b: 2 };
+			array = [ 3, nested ];
+			raw = { a: 1, nested, array };
+			state = proxifyState( 'test', raw );
+		} );
+
+		describe( 'get', () => {
+			it( 'should return plain objects/arrays', () => {
+				expect( state.nested ).toEqual( { b: 2 } );
+				expect( state.array ).toEqual( [ 3, { b: 2 } ] );
+				expect( state.array[ 1 ] ).toEqual( { b: 2 } );
+			} );
+
+			it( 'should return plain primitives', () => {
+				expect( state.a ).toBe( 1 );
+				expect( state.nested.b ).toBe( 2 );
+				expect( state.array[ 0 ] ).toBe( 3 );
+				expect(
+					typeof state.array[ 1 ] === 'object' && state.array[ 1 ].b
+				).toBe( 2 );
+				expect( state.array.length ).toBe( 2 );
+			} );
+
+			it( 'should support reading from getters', () => {
+				const state = proxifyState( 'test', {
+					counter: 1,
+					get double() {
+						return state.counter * 2;
+					},
+				} );
+				expect( state.double ).toBe( 2 );
+				state.counter = 2;
+				expect( state.double ).toBe( 4 );
+			} );
+
+			it( 'should support getters returning other parts of the state', () => {
+				const state = proxifyState( 'test', {
+					switch: 'a',
+					a: { data: 'a' },
+					b: { data: 'b' },
+					get aOrB() {
+						return state.switch === 'a' ? state.a : state.b;
+					},
+				} );
+				expect( state.aOrB.data ).toBe( 'a' );
+				state.switch = 'b';
+				expect( state.aOrB.data ).toBe( 'b' );
+			} );
+
+			it( 'should support getters using ownKeys traps', () => {
+				const state = proxifyState( 'test', {
+					x: {
+						a: 1,
+						b: 2,
+					},
+					get y() {
+						return Object.values( state.x );
+					},
+				} );
+
+				expect( state.y ).toEqual( [ 1, 2 ] );
+			} );
+
+			it( 'should support getters accessing the scope', () => {
+				const state = proxifyState( 'test', {
+					get y() {
+						const ctx = getContext< { value: string } >();
+						return ctx.value;
+					},
+				} );
+
+				const scope = { context: { test: { value: 'from context' } } };
+				try {
+					setScope( scope as any );
+					expect( state.y ).toBe( 'from context' );
+				} finally {
+					resetScope();
+				}
+			} );
+
+			it( 'should use its namespace by default inside getters', () => {
+				const state = proxifyState( 'test/right', {
+					get value() {
+						const ctx = getContext< { value: string } >();
+						return ctx.value;
+					},
+				} );
+
+				const scope = {
+					context: {
+						'test/right': { value: 'OK' },
+						'test/other': { value: 'Wrong' },
+					},
+				};
+
+				try {
+					setScope( scope as any );
+					setNamespace( 'test/other' );
+					expect( state.value ).toBe( 'OK' );
+				} finally {
+					resetNamespace();
+					resetScope();
+				}
+			} );
+
+			it( 'should work with normal functions', () => {
+				const state = proxifyState( 'test', {
+					value: 1,
+					isBigger: ( newValue: number ): boolean =>
+						state.value < newValue,
+					sum( newValue: number ): number {
+						return state.value + newValue;
+					},
+					replace: ( newValue: number ): void => {
+						state.value = newValue;
+					},
+				} );
+				expect( state.isBigger( 2 ) ).toBe( true );
+				expect( state.sum( 2 ) ).toBe( 3 );
+				expect( state.value ).toBe( 1 );
+				state.replace( 2 );
+				expect( state.value ).toBe( 2 );
+			} );
+
+			it( 'should work with normal functions accessing the scope', () => {
+				const state = proxifyState( 'test', {
+					sumContextValue( newValue: number ): number {
+						const ctx = getContext< { value: number } >();
+						return ctx.value + newValue;
+					},
+				} );
+
+				const scope = { context: { test: { value: 1 } } };
+				try {
+					setScope( scope as any );
+					expect( state.sumContextValue( 2 ) ).toBe( 3 );
+				} finally {
+					resetScope();
+				}
+			} );
+
+			it( 'should allow using `this` inside functions', () => {
+				const state = proxifyState( 'test', {
+					value: 1,
+					sum( newValue: number ): number {
+						return this.value + newValue;
+					},
+				} );
+				expect( state.sum( 2 ) ).toBe( 3 );
+			} );
+		} );
+
+		describe( 'set', () => {
+			it( 'should update like plain objects/arrays', () => {
+				expect( state.a ).toBe( 1 );
+				expect( state.nested.b ).toBe( 2 );
+				state.a = 2;
+				state.nested.b = 3;
+				expect( state.a ).toBe( 2 );
+				expect( state.nested.b ).toBe( 3 );
+			} );
+
+			it( 'should support setting values with setters', () => {
+				const state = proxifyState( 'test', {
+					counter: 1,
+					get double() {
+						return state.counter * 2;
+					},
+					set double( val ) {
+						state.counter = val / 2;
+					},
+				} );
+				expect( state.counter ).toBe( 1 );
+				state.double = 4;
+				expect( state.counter ).toBe( 2 );
+			} );
+
+			it( 'should update array length', () => {
+				expect( state.array.length ).toBe( 2 );
+				state.array.push( 4 );
+				expect( state.array.length ).toBe( 3 );
+				state.array.splice( 1, 2 );
+				expect( state.array.length ).toBe( 1 );
+			} );
+
+			it( 'should support setting getters on the fly', () => {
+				const state = proxifyState< {
+					counter: number;
+					double?: number;
+				} >( 'test', {
+					counter: 1,
+				} );
+				Object.defineProperty( state, 'double', {
+					get() {
+						return state.counter * 2;
+					},
+				} );
+				expect( state.double ).toBe( 2 );
+				state.counter = 2;
+				expect( state.double ).toBe( 4 );
+			} );
+
+			it( 'should support getter modification', () => {
+				const state = proxifyState< {
+					counter: number;
+					double: number;
+				} >( 'test', {
+					counter: 1,
+					get double() {
+						return state.counter * 2;
+					},
+				} );
+
+				const scope = {
+					context: { test: { counter: 2 } },
+				};
+
+				expect( state.double ).toBe( 2 );
+
+				Object.defineProperty( state, 'double', {
+					get() {
+						const ctx = getContext< { counter: number } >();
+						return ctx.counter * 2;
+					},
+				} );
+
+				try {
+					setScope( scope as any );
+					expect( state.double ).toBe( 4 );
+				} finally {
+					resetScope();
+				}
+			} );
+
+			it( 'should copy object like plain JavaScript', () => {
+				const state = proxifyState< {
+					a?: { id: number; nested: { id: number } };
+					b: { id: number; nested: { id: number } };
+				} >( 'test', {
+					b: { id: 1, nested: { id: 1 } },
+				} );
+
+				state.a = state.b;
+
+				expect( state.a.id ).toBe( 1 );
+				expect( state.b.id ).toBe( 1 );
+				expect( state.a.nested.id ).toBe( 1 );
+				expect( state.b.nested.id ).toBe( 1 );
+
+				state.a.id = 2;
+				state.a.nested.id = 2;
+				expect( state.a.id ).toBe( 2 );
+				expect( state.b.id ).toBe( 2 );
+				expect( state.a.nested.id ).toBe( 2 );
+				expect( state.b.nested.id ).toBe( 2 );
+
+				state.b.id = 3;
+				state.b.nested.id = 3;
+				expect( state.b.id ).toBe( 3 );
+				expect( state.a.id ).toBe( 3 );
+				expect( state.a.nested.id ).toBe( 3 );
+				expect( state.b.nested.id ).toBe( 3 );
+
+				state.a.id = 4;
+				state.a.nested.id = 4;
+				expect( state.a.id ).toBe( 4 );
+				expect( state.b.id ).toBe( 4 );
+				expect( state.a.nested.id ).toBe( 4 );
+				expect( state.b.nested.id ).toBe( 4 );
+			} );
+
+			it( 'should be able to reset values with Object.assign', () => {
+				const initialNested = { ...nested };
+				const initialState = { ...raw, nested: initialNested };
+				state.a = 2;
+				state.nested.b = 3;
+				Object.assign( state, initialState );
+				expect( state.a ).toBe( 1 );
+				expect( state.nested.b ).toBe( 2 );
+			} );
+
+			it( 'should keep assigned object references internally', () => {
+				const obj = {};
+				state.nested = obj;
+				expect( raw.nested ).toBe( obj );
+			} );
+
+			it( 'should keep object references across namespaces', () => {
+				const raw1 = { obj: {} };
+				const raw2 = { obj: {} };
+				const state1 = proxifyState( 'test-1', raw1 );
+				const state2 = proxifyState( 'test-2', raw2 );
+				state2.obj = state1.obj;
+				expect( state2.obj ).toBe( state1.obj );
+				expect( raw2.obj ).toBe( state1.obj );
+			} );
+
+			it( 'should use its namespace by default inside setters', () => {
+				const state = proxifyState( 'test/right', {
+					set counter( val: number ) {
+						const ctx = getContext< { counter: number } >();
+						ctx.counter = val;
+					},
+				} );
+
+				const scope = {
+					context: {
+						'test/other': { counter: 0 },
+						'test/right': { counter: 0 },
+					},
+				};
+
+				try {
+					setScope( scope as any );
+					setNamespace( 'test/other' );
+					state.counter = 4;
+					expect( scope.context[ 'test/right' ].counter ).toBe( 4 );
+				} finally {
+					resetNamespace();
+					resetScope();
+				}
+			} );
+		} );
+
+		describe( 'computations', () => {
+			it( 'should subscribe to values mutated with setters', () => {
+				const state = proxifyState( 'test', {
+					counter: 1,
+					get double() {
+						return state.counter * 2;
+					},
+					set double( val ) {
+						state.counter = val / 2;
+					},
+				} );
+				let counter = 0;
+				let double = 0;
+
+				effect( () => {
+					counter = state.counter;
+					double = state.double;
+				} );
+
+				expect( counter ).toBe( 1 );
+				expect( double ).toBe( 2 );
+				state.double = 4;
+				expect( counter ).toBe( 2 );
+				expect( double ).toBe( 4 );
+			} );
+
+			it( 'should subscribe to changes when an item is removed from the array', () => {
+				const state = proxifyState( 'test', [ 0, 0, 0 ] );
+				let sum = 0;
+
+				effect( () => {
+					sum = 0;
+					sum = state.reduce( ( sum ) => sum + 1, 0 );
+				} );
+
+				expect( sum ).toBe( 3 );
+				state.splice( 2, 1 );
+				expect( sum ).toBe( 2 );
+			} );
+
+			it( 'should subscribe to changes to for..in loops', () => {
+				const raw: Record< string, number > = { a: 0, b: 0 };
+				const state = proxifyState( 'test', raw );
+				let sum = 0;
+
+				effect( () => {
+					sum = 0;
+					for ( const _ in state ) {
+						sum += 1;
+					}
+				} );
+
+				expect( sum ).toBe( 2 );
+
+				state.c = 0;
+				expect( sum ).toBe( 3 );
+
+				delete state.c;
+				expect( sum ).toBe( 2 );
+
+				state.c = 0;
+				expect( sum ).toBe( 3 );
+			} );
+
+			it( 'should subscribe to changes for Object.getOwnPropertyNames()', () => {
+				const raw: Record< string, number > = { a: 1, b: 2 };
+				const state = proxifyState( 'test', raw );
+				let sum = 0;
+
+				effect( () => {
+					sum = 0;
+					const keys = Object.getOwnPropertyNames( state );
+					for ( const _ of keys ) {
+						sum += 1;
+					}
+				} );
+
+				expect( sum ).toBe( 2 );
+
+				state.c = 0;
+				expect( sum ).toBe( 3 );
+
+				delete state.a;
+				expect( sum ).toBe( 2 );
+			} );
+
+			it( 'should subscribe to changes to Object.keys/values/entries()', () => {
+				const raw: Record< string, number > = { a: 1, b: 2 };
+				const state = proxifyState( 'test', raw );
+				let keys = 0;
+				let values = 0;
+				let entries = 0;
+
+				effect( () => {
+					keys = 0;
+					Object.keys( state ).forEach( () => ( keys += 1 ) );
+				} );
+
+				effect( () => {
+					values = 0;
+					Object.values( state ).forEach( () => ( values += 1 ) );
+				} );
+
+				effect( () => {
+					entries = 0;
+					Object.entries( state ).forEach( () => ( entries += 1 ) );
+				} );
+
+				expect( keys ).toBe( 2 );
+				expect( values ).toBe( 2 );
+				expect( entries ).toBe( 2 );
+
+				state.c = 0;
+				expect( keys ).toBe( 3 );
+				expect( values ).toBe( 3 );
+				expect( entries ).toBe( 3 );
+
+				delete state.a;
+				expect( keys ).toBe( 2 );
+				expect( values ).toBe( 2 );
+				expect( entries ).toBe( 2 );
+			} );
+
+			it( 'should subscribe to changes to for..of loops', () => {
+				const state = proxifyState( 'test', [ 0, 0 ] );
+				let sum = 0;
+
+				effect( () => {
+					sum = 0;
+					for ( const _ of state ) {
+						sum += 1;
+					}
+				} );
+
+				expect( sum ).toBe( 2 );
+
+				state.push( 0 );
+				expect( sum ).toBe( 3 );
+
+				state.splice( 0, 1 );
+				expect( sum ).toBe( 2 );
+			} );
+
+			it( 'should subscribe to implicit changes in length', () => {
+				const state = proxifyState( 'test', [ 'foo', 'bar' ] );
+				let x = '';
+
+				effect( () => {
+					x = state.join( ' ' );
+				} );
+
+				expect( x ).toBe( 'foo bar' );
+
+				state.push( 'baz' );
+				expect( x ).toBe( 'foo bar baz' );
+
+				state.splice( 0, 1 );
+				expect( x ).toBe( 'bar baz' );
+			} );
+
+			it( 'should subscribe to changes when deleting properties', () => {
+				let x, y;
+
+				effect( () => {
+					x = state.a;
+				} );
+
+				effect( () => {
+					y = state.nested.b;
+				} );
+
+				expect( x ).toBe( 1 );
+				delete state.a;
+				expect( x ).toBe( undefined );
+
+				expect( y ).toBe( 2 );
+				delete state.nested.b;
+				expect( y ).toBe( undefined );
+			} );
+
+			it( 'should subscribe to changes when mutating objects', () => {
+				let x, y;
+
+				const state = proxifyState< {
+					a?: { id: number; nested: { id: number } };
+					b: { id: number; nested: { id: number } }[];
+				} >( 'test', {
+					b: [
+						{ id: 1, nested: { id: 1 } },
+						{ id: 2, nested: { id: 2 } },
+					],
+				} );
+
+				effect( () => {
+					x = state.a?.id;
+				} );
+
+				effect( () => {
+					y = state.a?.nested.id;
+				} );
+
+				expect( x ).toBe( undefined );
+				expect( y ).toBe( undefined );
+
+				state.a = state.b[ 0 ];
+
+				expect( x ).toBe( 1 );
+				expect( y ).toBe( 1 );
+
+				state.a = state.b[ 1 ];
+				expect( x ).toBe( 2 );
+				expect( y ).toBe( 2 );
+
+				state.a = undefined;
+				expect( x ).toBe( undefined );
+				expect( y ).toBe( undefined );
+
+				state.a = state.b[ 1 ];
+				expect( x ).toBe( 2 );
+				expect( y ).toBe( 2 );
+			} );
+
+			it( 'should trigger effects after mutations happen', () => {
+				let x;
+				effect( () => {
+					x = state.a;
+				} );
+				expect( x ).toBe( 1 );
+				state.a = 11;
+				expect( x ).toBe( 11 );
+			} );
+
+			it( 'should subscribe corretcly from getters', () => {
+				let x;
+				const state = proxifyState( 'test', {
+					counter: 1,
+					get double() {
+						return state.counter * 2;
+					},
+				} );
+				effect( () => ( x = state.double ) );
+				expect( x ).toBe( 2 );
+				state.counter = 2;
+				expect( x ).toBe( 4 );
+			} );
+
+			it( 'should subscribe corretcly from getters returning other parts of the state', () => {
+				let data;
+				const state = proxifyState( 'test', {
+					switch: 'a',
+					a: { data: 'a' },
+					b: { data: 'b' },
+					get aOrB() {
+						return state.switch === 'a' ? state.a : state.b;
+					},
+				} );
+				effect( () => ( data = state.aOrB.data ) );
+				expect( data ).toBe( 'a' );
+				state.switch = 'b';
+				expect( data ).toBe( 'b' );
+			} );
+
+			it( 'should subscribe to changes', () => {
+				const spy1 = jest.fn( () => state.a );
+				const spy2 = jest.fn( () => state.nested );
+				const spy3 = jest.fn( () => state.nested.b );
+				const spy4 = jest.fn( () => state.array[ 0 ] );
+				const spy5 = jest.fn(
+					() =>
+						typeof state.array[ 1 ] === 'object' &&
+						state.array[ 1 ].b
+				);
+
+				effect( spy1 );
+				effect( spy2 );
+				effect( spy3 );
+				effect( spy4 );
+				effect( spy5 );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 1 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy3 ).toHaveBeenCalledTimes( 1 );
+				expect( spy4 ).toHaveBeenCalledTimes( 1 );
+				expect( spy5 ).toHaveBeenCalledTimes( 1 );
+
+				state.a = 11;
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy3 ).toHaveBeenCalledTimes( 1 );
+				expect( spy4 ).toHaveBeenCalledTimes( 1 );
+				expect( spy5 ).toHaveBeenCalledTimes( 1 );
+
+				state.nested.b = 22;
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy3 ).toHaveBeenCalledTimes( 2 );
+				expect( spy4 ).toHaveBeenCalledTimes( 1 );
+				expect( spy5 ).toHaveBeenCalledTimes( 2 ); // nested also exists array[1]
+
+				state.nested = { b: 222 };
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy3 ).toHaveBeenCalledTimes( 3 );
+				expect( spy4 ).toHaveBeenCalledTimes( 1 );
+				expect( spy5 ).toHaveBeenCalledTimes( 2 ); // now state.nested has a different reference
+
+				state.array[ 0 ] = 33;
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy3 ).toHaveBeenCalledTimes( 3 );
+				expect( spy4 ).toHaveBeenCalledTimes( 2 );
+				expect( spy5 ).toHaveBeenCalledTimes( 2 );
+
+				if ( typeof state.array[ 1 ] === 'object' ) {
+					state.array[ 1 ].b = 2222;
+				}
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy3 ).toHaveBeenCalledTimes( 3 );
+				expect( spy4 ).toHaveBeenCalledTimes( 2 );
+				expect( spy5 ).toHaveBeenCalledTimes( 3 );
+
+				state.array[ 1 ] = { b: 22222 };
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy3 ).toHaveBeenCalledTimes( 3 );
+				expect( spy4 ).toHaveBeenCalledTimes( 2 );
+				expect( spy5 ).toHaveBeenCalledTimes( 4 );
+
+				state.array.push( 4 );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy3 ).toHaveBeenCalledTimes( 3 );
+				expect( spy4 ).toHaveBeenCalledTimes( 2 );
+				expect( spy5 ).toHaveBeenCalledTimes( 4 );
+
+				state.array[ 3 ] = 5;
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy3 ).toHaveBeenCalledTimes( 3 );
+				expect( spy4 ).toHaveBeenCalledTimes( 2 );
+				expect( spy5 ).toHaveBeenCalledTimes( 4 );
+
+				state.array = [ 333, { b: 222222 } ];
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy3 ).toHaveBeenCalledTimes( 3 );
+				expect( spy4 ).toHaveBeenCalledTimes( 3 );
+				expect( spy5 ).toHaveBeenCalledTimes( 5 );
+			} );
+
+			it( 'should subscribe to array length', () => {
+				const array = [ 1 ];
+				const state = proxifyState( 'test', { array } );
+				const spy1 = jest.fn( () => state.array.length );
+				const spy2 = jest.fn( () =>
+					state.array.map( ( i: number ) => i )
+				);
+
+				effect( spy1 );
+				effect( spy2 );
+				expect( spy1 ).toHaveBeenCalledTimes( 1 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+
+				state.array.push( 2 );
+				expect( state.array.length ).toBe( 2 );
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+
+				state.array[ 2 ] = 3;
+				expect( state.array.length ).toBe( 3 );
+				expect( spy1 ).toHaveBeenCalledTimes( 3 );
+				expect( spy2 ).toHaveBeenCalledTimes( 3 );
+
+				state.array = state.array.filter( ( i: number ) => i <= 2 );
+				expect( state.array.length ).toBe( 2 );
+				expect( spy1 ).toHaveBeenCalledTimes( 4 );
+				expect( spy2 ).toHaveBeenCalledTimes( 4 );
+			} );
+
+			it( 'should be able to reset values with Object.assign and still react to changes', () => {
+				const initialNested = { ...nested };
+				const initialState = { ...raw, nested: initialNested };
+				let a, b;
+
+				effect( () => {
+					a = state.a;
+				} );
+				effect( () => {
+					b = state.nested.b;
+				} );
+
+				state.a = 2;
+				state.nested.b = 3;
+
+				expect( a ).toBe( 2 );
+				expect( b ).toBe( 3 );
+
+				Object.assign( state, initialState );
+
+				expect( a ).toBe( 1 );
+				expect( b ).toBe( 2 );
+			} );
+
+			it( 'should keep subscribed to properties that become getters', () => {
+				const state = proxifyState( 'test', {
+					number: 1,
+				} );
+
+				let number = 0;
+
+				effect( () => {
+					number = state.number;
+				} );
+
+				expect( number ).toBe( 1 );
+				state.number = 2;
+				expect( number ).toBe( 2 );
+				Object.defineProperty( state, 'number', {
+					get: () => 3,
+					configurable: true,
+				} );
+				expect( number ).toBe( 3 );
+			} );
+
+			it( 'should keep subscribed to modified getters', () => {
+				const state = proxifyState< {
+					counter: number;
+					double: number;
+				} >( 'test', {
+					counter: 1,
+					get double() {
+						return state.counter * 2;
+					},
+				} );
+
+				const scope = {
+					context: { test: { counter: 2 } },
+				};
+
+				let double = 0;
+
+				effect(
+					withScopeAndNs( scope, 'test', () => {
+						double = state.double;
+					} )
+				);
+
+				expect( double ).toBe( 2 );
+
+				Object.defineProperty( state, 'double', {
+					get() {
+						const ctx = getContext< { counter: number } >();
+						return ctx.counter * 2;
+					},
+				} );
+
+				expect( double ).toBe( 4 );
+			} );
+
+			it( 'should react to changes in props inside getters', () => {
+				const state = proxifyState( 'test', {
+					number: 1,
+					otherNumber: 3,
+				} );
+
+				let number = 0;
+
+				effect( () => {
+					number = state.number;
+				} );
+
+				expect( number ).toBe( 1 );
+				state.number = 2;
+				expect( number ).toBe( 2 );
+				Object.defineProperty( state, 'number', {
+					get: () => state.otherNumber,
+					configurable: true,
+				} );
+				expect( number ).toBe( 3 );
+				state.otherNumber = 4;
+				expect( number ).toBe( 4 );
+			} );
+
+			it( 'should react to changes in props inside getters if they become getters', () => {
+				const state = proxifyState( 'test', {
+					number: 1,
+					otherNumber: 3,
+				} );
+
+				let number = 0;
+
+				effect( () => {
+					number = state.number;
+				} );
+
+				expect( number ).toBe( 1 );
+				state.number = 2;
+				expect( number ).toBe( 2 );
+				Object.defineProperty( state, 'number', {
+					get: () => state.otherNumber,
+					configurable: true,
+				} );
+				expect( number ).toBe( 3 );
+				state.otherNumber = 4;
+				expect( number ).toBe( 4 );
+				Object.defineProperty( state, 'otherNumber', {
+					get: () => 5,
+					configurable: true,
+				} );
+				expect( number ).toBe( 5 );
+			} );
+
+			it( 'should allow getters to use `this`', () => {
+				const state = proxifyState( 'test', {
+					number: 1,
+					otherNumber: 3,
+				} );
+
+				let number = 0;
+
+				effect( () => {
+					number = state.number;
+				} );
+
+				expect( number ).toBe( 1 );
+				state.number = 2;
+				expect( number ).toBe( 2 );
+				Object.defineProperty( state, 'number', {
+					get() {
+						return this.otherNumber;
+					},
+					configurable: true,
+				} );
+				expect( number ).toBe( 3 );
+				state.otherNumber = 4;
+				expect( number ).toBe( 4 );
+			} );
+
+			it( 'should support different scopes for the same getter', () => {
+				const state = proxifyState( 'test', {
+					number: 1,
+					get numWithTag() {
+						let tag = 'No scope';
+						try {
+							tag = getContext< any >().tag;
+						} catch ( e ) {}
+						return `${ tag }: ${ this.number }`;
+					},
+				} );
+
+				const scopeA = {
+					context: { test: { tag: 'A' } },
+				};
+				const scopeB = {
+					context: { test: { tag: 'B' } },
+				};
+
+				let resultA = '';
+				let resultB = '';
+				let resultNoScope = '';
+
+				effect(
+					withScopeAndNs( scopeA, 'test', () => {
+						resultA = state.numWithTag;
+					} )
+				);
+				effect(
+					withScopeAndNs( scopeB, 'test', () => {
+						resultB = state.numWithTag;
+					} )
+				);
+				effect( () => {
+					resultNoScope = state.numWithTag;
+				} );
+
+				expect( resultA ).toBe( 'A: 1' );
+				expect( resultB ).toBe( 'B: 1' );
+				expect( resultNoScope ).toBe( 'No scope: 1' );
+				state.number = 2;
+				expect( resultA ).toBe( 'A: 2' );
+				expect( resultB ).toBe( 'B: 2' );
+				expect( resultNoScope ).toBe( 'No scope: 2' );
+			} );
+
+			it( 'should throw an error in getters that require a scope', () => {
+				const state = proxifyState( 'test', {
+					number: 1,
+					get sumValueFromContext() {
+						const ctx = getContext();
+						return ctx
+							? this.number + ( ctx as any ).value
+							: this.number;
+					},
+					get sumValueFromElement() {
+						const element = getElement();
+						return element
+							? this.number + element.attributes.value
+							: this.number;
+					},
+				} );
+
+				expect( () => state.sumValueFromContext ).toThrow();
+				expect( () => state.sumValueFromElement ).toThrow();
+			} );
+
+			it( 'should react to changes in props inside functions', () => {
+				const state = proxifyState( 'test', {
+					number: 1,
+					otherNumber: 3,
+					sum( value: number ) {
+						return state.number + state.otherNumber + value;
+					},
+				} );
+
+				let result = 0;
+
+				effect( () => {
+					result = state.sum( 2 );
+				} );
+
+				expect( result ).toBe( 6 );
+				state.number = 2;
+				expect( result ).toBe( 7 );
+				state.otherNumber = 4;
+				expect( result ).toBe( 8 );
+			} );
+		} );
+
+		describe( 'peek', () => {
+			it( 'should return correct values when using peek()', () => {
+				expect( peek( state, 'a' ) ).toBe( 1 );
+				expect( peek( state.nested, 'b' ) ).toBe( 2 );
+				expect( peek( state.array, 0 ) ).toBe( 3 );
+				const nested = peek( state, 'array' )[ 1 ];
+				expect( typeof nested === 'object' && nested.b ).toBe( 2 );
+				expect( peek( state.array, 'length' ) ).toBe( 2 );
+			} );
+
+			it( 'should not subscribe to changes when peeking', () => {
+				const spy1 = jest.fn( () => peek( state, 'a' ) );
+				const spy2 = jest.fn( () => peek( state, 'nested' ) );
+				const spy3 = jest.fn( () => peek( state, 'nested' ).b );
+				const spy4 = jest.fn( () => peek( state, 'array' )[ 0 ] );
+				const spy5 = jest.fn( () => {
+					const nested = peek( state, 'array' )[ 1 ];
+					return typeof nested === 'object' && nested.b;
+				} );
+				const spy6 = jest.fn( () => peek( state, 'array' ).length );
+
+				effect( spy1 );
+				effect( spy2 );
+				effect( spy3 );
+				effect( spy4 );
+				effect( spy5 );
+				effect( spy6 );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 1 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy3 ).toHaveBeenCalledTimes( 1 );
+				expect( spy4 ).toHaveBeenCalledTimes( 1 );
+				expect( spy5 ).toHaveBeenCalledTimes( 1 );
+				expect( spy6 ).toHaveBeenCalledTimes( 1 );
+
+				state.a = 11;
+				state.nested.b = 22;
+				state.nested = { b: 222 };
+				state.array[ 0 ] = 33;
+				if ( typeof state.array[ 1 ] === 'object' ) {
+					state.array[ 1 ].b = 2222;
+				}
+				state.array.push( 4 );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 1 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy3 ).toHaveBeenCalledTimes( 1 );
+				expect( spy4 ).toHaveBeenCalledTimes( 1 );
+				expect( spy5 ).toHaveBeenCalledTimes( 1 );
+				expect( spy6 ).toHaveBeenCalledTimes( 1 );
+			} );
+
+			it( 'should subscribe to some changes but not other when peeking inside an object', () => {
+				const spy1 = jest.fn( () => peek( state.nested, 'b' ) );
+				effect( spy1 );
+				expect( spy1 ).toHaveBeenCalledTimes( 1 );
+				state.nested.b = 22;
+				expect( spy1 ).toHaveBeenCalledTimes( 1 );
+				state.nested = { b: 222 };
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				state.nested.b = 2222;
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+			} );
+
+			it( 'should support returning peek from getters', () => {
+				const state = proxifyState( 'test', {
+					counter: 1,
+					get double() {
+						return state.counter * 2;
+					},
+				} );
+				expect( peek( state, 'double' ) ).toBe( 2 );
+				state.counter = 2;
+				expect( peek( state, 'double' ) ).toBe( 4 );
+			} );
+
+			it( 'should support peeking getters accessing the scope', () => {
+				const state = proxifyState( 'test', {
+					get double() {
+						const { counter } = getContext< { counter: number } >();
+						return counter * 2;
+					},
+				} );
+
+				const context = proxifyState( 'test', { counter: 1 } );
+				const scope = { context: { test: context } };
+				const peekStateDouble = withScopeAndNs( scope, 'test', () =>
+					peek( state, 'double' )
+				);
+
+				const spy = jest.fn( peekStateDouble );
+				effect( spy );
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( peekStateDouble() ).toBe( 2 );
+
+				context.counter = 2;
+
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( peekStateDouble() ).toBe( 4 );
+			} );
+
+			it( 'should support peeking getters accessing other namespaces', () => {
+				const state2 = proxifyState( 'test2', {
+					get counter() {
+						const { counter } = getContext< { counter: number } >();
+						return counter;
+					},
+				} );
+				const context2 = proxifyState( 'test-2', { counter: 1 } );
+
+				const state1 = proxifyState( 'test1', {
+					get double() {
+						return state2.counter * 2;
+					},
+				} );
+
+				const peekStateDouble = withScopeAndNs(
+					{ context: { test2: context2 } },
+					'test2',
+					() => peek( state1, 'double' )
+				);
+
+				const spy = jest.fn( peekStateDouble );
+				effect( spy );
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( peekStateDouble() ).toBe( 2 );
+
+				context2.counter = 2;
+
+				expect( spy ).toHaveBeenCalledTimes( 1 );
+				expect( peekStateDouble() ).toBe( 4 );
+			} );
+		} );
+
+		describe( 'refs', () => {
+			it( 'should preserve object references', () => {
+				expect( state.nested ).toBe( state.array[ 1 ] );
+
+				state.nested.b = 22;
+
+				expect( state.nested ).toBe( state.array[ 1 ] );
+				expect( state.nested.b ).toBe( 22 );
+				expect(
+					typeof state.array[ 1 ] === 'object' && state.array[ 1 ].b
+				).toBe( 22 );
+
+				state.nested = { b: 222 };
+
+				expect( state.nested ).not.toBe( state.array[ 1 ] );
+				expect( state.nested.b ).toBe( 222 );
+				expect(
+					typeof state.array[ 1 ] === 'object' && state.array[ 1 ].b
+				).toBe( 22 );
+			} );
+
+			it( 'should return the same proxy if initialized more than once', () => {
+				const raw = {};
+				const state1 = proxifyState( 'test', raw );
+				const state2 = proxifyState( 'test', raw );
+				expect( state1 ).toBe( state2 );
+			} );
+
+			it( 'should throw when trying to re-proxify a state object', () => {
+				const state = proxifyState( 'test', {} );
+				expect( () => proxifyState( 'test', state ) ).toThrow();
+			} );
+		} );
+
+		describe( 'unsupported data structures', () => {
+			it( 'should throw when trying to proxify a class instance', () => {
+				class MyClass {}
+				const obj = new MyClass();
+				expect( () => proxifyState( 'test', obj ) ).toThrow();
+			} );
+
+			it( 'should not wrap a class instance', () => {
+				class MyClass {}
+				const obj = new MyClass();
+				const state = proxifyState( 'test', { obj } );
+				expect( state.obj ).toBe( obj );
+			} );
+
+			it( 'should not wrap built-ins in proxies', () => {
+				window.MyClass = class MyClass {};
+				const obj = new window.MyClass();
+				const state = proxifyState( 'test', { obj } );
+				expect( state.obj ).toBe( obj );
+			} );
+
+			it( 'should not wrap elements in proxies', () => {
+				const el = window.document.createElement( 'div' );
+				const state = proxifyState( 'test', { el } );
+				expect( state.el ).toBe( el );
+			} );
+
+			it( 'should wrap global objects', () => {
+				window.obj = { b: 2 };
+				const state = proxifyState( 'test', window.obj );
+				expect( state ).not.toBe( window.obj );
+				expect( state ).toStrictEqual( { b: 2 } );
+			} );
+
+			it( 'should not wrap dates', () => {
+				const date = new Date();
+				const state = proxifyState( 'test', { date } );
+				expect( state.date ).toBe( date );
+			} );
+
+			it( 'should not wrap regular expressions', () => {
+				const regex = new RegExp( '' );
+				const state = proxifyState( 'test', { regex } );
+				expect( state.regex ).toBe( regex );
+			} );
+
+			it( 'should not wrap Map', () => {
+				const map = new Map();
+				const state = proxifyState( 'test', { map } );
+				expect( state.map ).toBe( map );
+			} );
+
+			it( 'should not wrap Set', () => {
+				const set = new Set();
+				const state = proxifyState( 'test', { set } );
+				expect( state.set ).toBe( set );
+			} );
+		} );
+
+		describe( 'symbols', () => {
+			it( 'should observe symbols', () => {
+				const key = Symbol( 'key' );
+				let x;
+				const store = proxifyState< { [ key: symbol ]: any } >(
+					'test',
+					{}
+				);
+				effect( () => ( x = store[ key ] ) );
+
+				expect( store[ key ] ).toBe( undefined );
+				expect( x ).toBe( undefined );
+
+				store[ key ] = true;
+
+				expect( store[ key ] ).toBe( true );
+				expect( x ).toBe( true );
+			} );
+
+			it( 'should not observe well-known symbols', () => {
+				const key = Symbol.isConcatSpreadable;
+				let x;
+				const state = proxifyState< { [ key: symbol ]: any } >(
+					'test',
+					{}
+				);
+				effect( () => ( x = state[ key ] ) );
+
+				expect( state[ key ] ).toBe( undefined );
+				expect( x ).toBe( undefined );
+
+				state[ key ] = true;
+				expect( state[ key ] ).toBe( true );
+				expect( x ).toBe( undefined );
+			} );
+		} );
+
+		describe( 'read-only', () => {
+			it( "should not allow modifying a prop's value", () => {
+				const readOnlyState = proxifyState(
+					'test',
+					{ prop: 'value', nested: { prop: 'value' } },
+					{ readOnly: true }
+				);
+
+				expect( () => {
+					readOnlyState.prop = 'new value';
+				} ).toThrow();
+				expect( () => {
+					readOnlyState.nested.prop = 'new value';
+				} ).toThrow();
+			} );
+
+			it( 'should not allow modifying a prop descriptor', () => {
+				const readOnlyState = proxifyState(
+					'test',
+					{ prop: 'value', nested: { prop: 'value' } },
+					{ readOnly: true }
+				);
+
+				expect( () => {
+					Object.defineProperty( readOnlyState, 'prop', {
+						get: () => 'value from getter',
+						writable: true,
+						enumerable: false,
+					} );
+				} ).toThrow();
+				expect( () => {
+					Object.defineProperty( readOnlyState.nested, 'prop', {
+						get: () => 'value from getter',
+						writable: true,
+						enumerable: false,
+					} );
+				} ).toThrow();
+			} );
+
+			it( 'should not allow adding new props', () => {
+				const readOnlyState = proxifyState< any >(
+					'test',
+					{ prop: 'value', nested: { prop: 'value' } },
+					{ readOnly: true }
+				);
+
+				expect( () => {
+					readOnlyState.newProp = 'value';
+				} ).toThrow();
+				expect( () => {
+					readOnlyState.nested.newProp = 'value';
+				} ).toThrow();
+			} );
+
+			it( 'should not allow removing props', () => {
+				const readOnlyState = proxifyState< any >(
+					'test',
+					{ prop: 'value', nested: { prop: 'value' } },
+					{ readOnly: true }
+				);
+
+				expect( () => {
+					delete readOnlyState.prop;
+				} ).toThrow();
+				expect( () => {
+					delete readOnlyState.nested.prop;
+				} ).toThrow();
+			} );
+
+			it( 'should not allow adding items to an array', () => {
+				const readOnlyState = proxifyState(
+					'test',
+					{ array: [ 1, 2, 3 ], nested: { array: [ 1, 2, 3 ] } },
+					{ readOnly: true }
+				);
+
+				expect( () => readOnlyState.array.push( 4 ) ).toThrow();
+				expect( () => readOnlyState.nested.array.push( 4 ) ).toThrow();
+			} );
+
+			it( 'should not allow removing items from an array', () => {
+				const readOnlyState = proxifyState(
+					'test',
+					{ array: [ 1, 2, 3 ], nested: { array: [ 1, 2, 3 ] } },
+					{ readOnly: true }
+				);
+
+				expect( () => readOnlyState.array.pop() ).toThrow();
+				expect( () => readOnlyState.nested.array.pop() ).toThrow();
+			} );
+
+			it( 'should allow subscribing to prop changes', () => {
+				const readOnlyState = proxifyState(
+					'test',
+					{
+						prop: 'value',
+						nested: { prop: 'value' },
+					},
+					{ readOnly: true }
+				);
+
+				const spy1 = jest.fn( () => readOnlyState.prop );
+				const spy2 = jest.fn( () => readOnlyState.nested.prop );
+
+				effect( spy1 );
+				effect( spy2 );
+				expect( spy1 ).toHaveBeenCalledTimes( 1 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy1 ).toHaveLastReturnedWith( 'value' );
+				expect( spy2 ).toHaveLastReturnedWith( 'value' );
+
+				deepMerge( readOnlyState, { prop: 'new value' } );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy1 ).toHaveLastReturnedWith( 'new value' );
+				expect( spy2 ).toHaveLastReturnedWith( 'value' );
+
+				deepMerge( readOnlyState, { nested: { prop: 'new value' } } );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy1 ).toHaveLastReturnedWith( 'new value' );
+				expect( spy2 ).toHaveLastReturnedWith( 'new value' );
+			} );
+
+			it( 'should allow subscribing to new props', () => {
+				const readOnlyState = proxifyState< any >(
+					'test',
+					{
+						prop: 'value',
+						nested: { prop: 'value' },
+					},
+					{ readOnly: true }
+				);
+
+				const spy1 = jest.fn( () => readOnlyState.newProp );
+				const spy2 = jest.fn( () => readOnlyState.nested.newProp );
+
+				effect( spy1 );
+				effect( spy2 );
+				expect( spy1 ).toHaveBeenCalledTimes( 1 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy1 ).toHaveLastReturnedWith( undefined );
+				expect( spy2 ).toHaveLastReturnedWith( undefined );
+
+				deepMerge( readOnlyState, { newProp: 'value' } );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy1 ).toHaveLastReturnedWith( 'value' );
+				expect( spy2 ).toHaveLastReturnedWith( undefined );
+
+				deepMerge( readOnlyState, { nested: { newProp: 'value' } } );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy1 ).toHaveLastReturnedWith( 'value' );
+				expect( spy2 ).toHaveLastReturnedWith( 'value' );
+			} );
+
+			it( 'should allow subscribing to array changes', () => {
+				const readOnlyState = proxifyState< any >(
+					'test',
+					{
+						array: [ 1, 2, 3 ],
+						nested: { array: [ 1, 2, 3 ] },
+					},
+					{ readOnly: true }
+				);
+
+				const spy1 = jest.fn( () => readOnlyState.array[ 0 ] );
+				const spy2 = jest.fn( () => readOnlyState.nested.array[ 0 ] );
+
+				effect( spy1 );
+				effect( spy2 );
+				expect( spy1 ).toHaveBeenCalledTimes( 1 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy1 ).toHaveLastReturnedWith( 1 );
+				expect( spy2 ).toHaveLastReturnedWith( 1 );
+
+				deepMerge( readOnlyState, { array: [ 4, 5, 6 ] } );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 1 );
+				expect( spy1 ).toHaveLastReturnedWith( 4 );
+				expect( spy2 ).toHaveLastReturnedWith( 1 );
+
+				deepMerge( readOnlyState, { nested: { array: [] } } );
+
+				expect( spy1 ).toHaveBeenCalledTimes( 2 );
+				expect( spy2 ).toHaveBeenCalledTimes( 2 );
+				expect( spy1 ).toHaveLastReturnedWith( 4 );
+				expect( spy2 ).toHaveLastReturnedWith( undefined );
+			} );
+		} );
+	} );
+} );
diff --git a/packages/interactivity/src/proxies/test/store-proxy.ts b/packages/interactivity/src/proxies/test/store-proxy.ts
new file mode 100644
index 00000000000000..225621072929d0
--- /dev/null
+++ b/packages/interactivity/src/proxies/test/store-proxy.ts
@@ -0,0 +1,123 @@
+/**
+ * Internal dependencies
+ */
+import { proxifyStore, proxifyState } from '../';
+import { setScope, resetScope, getContext } from '../../scopes';
+import { setNamespace, resetNamespace } from '../../namespaces';
+
+describe( 'Interactivity API', () => {
+	describe( 'store proxy', () => {
+		describe( 'get', () => {
+			it( 'should initialize properties at the top level if they do not exist', () => {
+				const store = proxifyStore< any >( 'test', {} );
+				expect( store.state.props ).toBeUndefined();
+				expect( store.state ).toEqual( {} );
+			} );
+
+			it( 'should wrap sync functions with the store namespace and current scope', () => {
+				let result = '';
+
+				const syncFunc = () => {
+					const ctx = getContext< { value: string } >();
+					result = ctx.value;
+				};
+
+				const storeTest = proxifyStore( 'test', {
+					callbacks: {
+						syncFunc,
+						nested: { syncFunc },
+					},
+				} );
+
+				const scope = {
+					context: {
+						test: { value: 'test' },
+					},
+				};
+
+				setNamespace( 'other-namespace' );
+				setScope( scope as any );
+
+				storeTest.callbacks.syncFunc();
+				expect( result ).toBe( 'test' );
+				storeTest.callbacks.nested.syncFunc();
+				expect( result ).toBe( 'test' );
+
+				resetScope();
+				resetNamespace();
+			} );
+
+			it( 'should wrap generators into async functions', async () => {
+				const asyncFunc = function* () {
+					const data = yield Promise.resolve( 'data' );
+					const ctx = getContext< { value: string } >();
+					return `${ data } from ${ ctx.value }`;
+				};
+
+				const storeTest = proxifyStore( 'test', {
+					callbacks: { asyncFunc, nested: { asyncFunc } },
+				} );
+
+				const scope = {
+					context: {
+						test: { value: 'test' },
+					},
+				};
+
+				setNamespace( 'other-namespace' );
+				setScope( scope as any );
+				const promise1 = storeTest.callbacks.asyncFunc();
+				const promise2 = storeTest.callbacks.nested.asyncFunc();
+				resetScope();
+				resetNamespace();
+
+				expect( await promise1 ).toBe( 'data from test' );
+				expect( await promise2 ).toBe( 'data from test' );
+			} );
+
+			it( 'should allow async functions to call functions from other stores', async () => {
+				const asyncFunc = function* () {
+					const data = yield Promise.resolve( 'data' );
+					const ctx = getContext< { value: string } >();
+					return `${ data } from ${ ctx.value }`;
+				};
+
+				const storeTest1 = proxifyStore( 'test1', {
+					callbacks: { asyncFunc },
+				} );
+
+				const storeTest2 = proxifyStore( 'test2', {
+					callbacks: {
+						*asyncFunc() {
+							const result =
+								yield storeTest1.callbacks.asyncFunc();
+							return result;
+						},
+					},
+				} );
+
+				const scope = {
+					context: {
+						test1: { value: 'test1' },
+						test2: { value: 'test2' },
+					},
+				};
+
+				setNamespace( 'other-namespace' );
+				setScope( scope as any );
+				const promise = storeTest2.callbacks.asyncFunc();
+				resetScope();
+				resetNamespace();
+
+				expect( await promise ).toBe( 'data from test1' );
+			} );
+
+			it( 'should not wrap other proxified objects with a store proxy', () => {
+				const state = proxifyState( 'test', {} );
+				const store = proxifyStore( 'test', { state } );
+
+				expect( store.state ).toBe( state );
+			} );
+		} );
+	} );
+} );
diff --git a/packages/interactivity/src/router.js b/packages/interactivity/src/router.js
deleted file mode 100644
index 1082d43ff3a6a6..00000000000000
--- a/packages/interactivity/src/router.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * External dependencies
- */
-import { hydrate, render } from 'preact';
-/**
- * Internal dependencies
- */
-import { toVdom, hydratedIslands } from './vdom';
-import { createRootFragment } from './utils';
-import { directivePrefix } from './constants';
-
-// The cache of visited and prefetched pages.
-const pages = new Map();
-
-// Keep the same root fragment for each interactive region node.
-const regionRootFragments = new WeakMap();
-const getRegionRootFragment = ( region ) => {
-	if ( ! regionRootFragments.has( region ) ) {
-		regionRootFragments.set(
-			region,
-			createRootFragment( region.parentElement, region )
-		);
-	}
-	return regionRootFragments.get( region );
-};
-
-// Helper to remove domain and hash from the URL. We are only interesting in
-// caching the path and the query.
-const cleanUrl = ( url ) => {
-	const u = new URL( url, window.location );
-	return u.pathname + u.search;
-};
-
-// Fetch a new page and convert it to a static virtual DOM.
-const fetchPage = async ( url, { html } ) => {
-	try {
-		if ( ! html ) {
-			const res = await window.fetch( url );
-			if ( res.status !== 200 ) return false;
-			html = await res.text();
-		}
-		const dom = new window.DOMParser().parseFromString( html, 'text/html' );
-		return regionsToVdom( dom );
-	} catch ( e ) {
-		return false;
-	}
-};
-
-// Return an object with VDOM trees of those HTML regions marked with a
-// `navigation-id` directive.
-const regionsToVdom = ( dom ) => {
-	const regions = {};
-	const attrName = `data-${ directivePrefix }-navigation-id`;
-	dom.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
-		const id = region.getAttribute( attrName );
-		regions[ id ] = toVdom( region );
-	} );
-	const title = dom.querySelector( 'title' )?.innerText;
-	return { regions, title };
-};
-
-/**
- * Prefetchs the page with the passed URL.
- *
- * The function normalizes the URL and stores internally the fetch promise, to
- * avoid triggering a second fetch for an ongoing request.
- *
- * @param {string}  url             The page URL.
- * @param {Object}  [options]       Options object.
- * @param {boolean} [options.force] Force fetching the URL again.
- * @param {string}  [options.html]  HTML string to be used instead of fetching
- *                                  the requested URL.
- */
-export const prefetch = ( url, options = {} ) => {
-	url = cleanUrl( url );
-	if ( options.force || ! pages.has( url ) ) {
-		pages.set( url, fetchPage( url, options ) );
-	}
-};
-
-// Render all interactive regions contained in the given page.
-const renderRegions = ( page ) => {
-	const attrName = `data-${ directivePrefix }-navigation-id`;
-	document.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
-		const id = region.getAttribute( attrName );
-		const fragment = getRegionRootFragment( region );
-		render( page.regions[ id ], fragment );
-	} );
-	if ( page.title ) {
-		document.title = page.title;
-	}
-};
-
-// Variable to store the current navigation.
-let navigatingTo = '';
-
-/**
- * Navigates to the specified page.
- *
- * This function normalizes the passed href, fetchs the page HTML if needed, and
- * updates any interactive regions whose contents have changed. It also creates
- * a new entry in the browser session history.
- *
- * @param {string}  href              The page href.
- * @param {Object}  [options]         Options object.
- * @param {boolean} [options.force]   If true, it forces re-fetching the URL.
- * @param {string}  [options.html]    HTML string to be used instead of fetching
- *                                    the requested URL.
- * @param {boolean} [options.replace] If true, it replaces the current entry in
- *                                    the browser session history.
- * @param {number}  [options.timeout] Time until the navigation is aborted, in
- *                                    milliseconds. Default is 10000.
- *
- * @return {Promise} Promise that resolves once the navigation is completed or
- *                   aborted.
- */
-export const navigate = async ( href, options = {} ) => {
-	const url = cleanUrl( href );
-	navigatingTo = href;
-	prefetch( url, options );
-
-	// Create a promise that resolves when the specified timeout ends. The
-	// timeout value is 10 seconds by default.
-	const timeoutPromise = new Promise( ( resolve ) =>
-		setTimeout( resolve, options.timeout ?? 10000 )
-	);
-
-	const page = await Promise.race( [ pages.get( url ), timeoutPromise ] );
-
-	// Once the page is fetched, the destination URL could have changed (e.g.,
-	// by clicking another link in the meantime). If so, bail out, and let the
-	// newer execution to update the HTML.
-	if ( navigatingTo !== href ) return;
-
-	if ( page ) {
-		renderRegions( page );
-		window.history[ options.replace ? 'replaceState' : 'pushState' ](
-			{},
-			'',
-			href
-		);
-	} else {
-		window.location.assign( href );
-		await new Promise( () => {} );
-	}
-};
-
-// Listen to the back and forward buttons and restore the page if it's in the
-// cache.
-window.addEventListener( 'popstate', async () => {
-	const url = cleanUrl( window.location ); // Remove hash.
-	const page = pages.has( url ) && ( await pages.get( url ) );
-	if ( page ) {
-		renderRegions( page );
-	} else {
-		window.location.reload();
-	}
-} );
-
-// Initialize the router with the initial DOM.
-export const init = async () => {
-	document
-		.querySelectorAll( `[data-${ directivePrefix }-interactive]` )
-		.forEach( ( node ) => {
-			if ( ! hydratedIslands.has( node ) ) {
-				const fragment = getRegionRootFragment( node );
-				const vdom = toVdom( node );
-				hydrate( vdom, fragment );
-			}
-		} );
-
-	// Cache the current regions.
-	pages.set(
-		cleanUrl( window.location ),
-		Promise.resolve( regionsToVdom( document ) )
-	);
-};
diff --git a/packages/interactivity/src/scopes.ts b/packages/interactivity/src/scopes.ts
new file mode 100644
index 00000000000000..722305f6bee112
--- /dev/null
+++ b/packages/interactivity/src/scopes.ts
@@ -0,0 +1,142 @@
+/**
+ * External dependencies
+ */
+import type { h as createElement, RefObject } from 'preact';
+
+/**
+ * Internal dependencies
+ */
+import { getNamespace } from './namespaces';
+import type { Evaluate } from './hooks';
+
+export interface Scope {
+	evaluate: Evaluate;
+	context: object;
+	serverContext: object;
+	ref: RefObject< HTMLElement >;
+	attributes: createElement.JSX.HTMLAttributes;
+}
+
+// Store stacks for the current scope and the default namespaces and export APIs
+// to interact with them.
+const scopeStack: Scope[] = [];
+
+export const getScope = () => scopeStack.slice( -1 )[ 0 ];
+
+export const setScope = ( scope: Scope ) => {
+	scopeStack.push( scope );
+};
+export const resetScope = () => {
+	scopeStack.pop();
+};
+
+// Wrap the element props to prevent modifications.
+const immutableMap = new WeakMap();
+const immutableError = () => {
+	throw new Error(
+		'Please use `data-wp-bind` to modify the attributes of an element.'
+	);
+};
+const immutableHandlers: ProxyHandler< object > = {
+	get( target, key, receiver ) {
+		const value = Reflect.get( target, key, receiver );
+		return !! value && typeof value === 'object'
+			? deepImmutable( value )
+			: value;
+	},
+	set: immutableError,
+	deleteProperty: immutableError,
+};
+const deepImmutable = < T extends object = {} >( target: T ): T => {
+	if ( ! immutableMap.has( target ) ) {
+		immutableMap.set( target, new Proxy( target, immutableHandlers ) );
+	}
+	return immutableMap.get( target );
+};
+
+/**
+ * Retrieves the context inherited by the element evaluating a function from the
+ * store. The returned value depends on the element and the namespace where the
+ * function calling `getContext()` exists.
+ *
+ * @param namespace Store namespace. By default, the namespace where the calling
+ *                  function exists is used.
+ * @return The context content.
+ */
+export const getContext = < T extends object >( namespace?: string ): T => {
+	const scope = getScope();
+	if ( globalThis.SCRIPT_DEBUG ) {
+		if ( ! scope ) {
+			throw Error(
+				'Cannot call `getContext()` when there is no scope. If you are using an async function, please consider using a generator instead. If you are using some sort of async callbacks, like `setTimeout`, please wrap the callback with `withScope(callback)`.'
+			);
+		}
+	}
+	return scope.context[ namespace || getNamespace() ];
+};
+
+/**
+ * Retrieves a representation of the element where a function from the store
+ * is being evalutated. Such representation is read-only, and contains a
+ * reference to the DOM element, its props and a local reactive state.
+ *
+ * @return Element representation.
+ */
+export const getElement = () => {
+	const scope = getScope();
+	if ( globalThis.SCRIPT_DEBUG ) {
+		if ( ! scope ) {
+			throw Error(
+				'Cannot call `getElement()` when there is no scope. If you are using an async function, please consider using a generator instead. If you are using some sort of async callbacks, like `setTimeout`, please wrap the callback with `withScope(callback)`.'
+			);
+		}
+	}
+	const { ref, attributes } = scope;
+	return Object.freeze( {
+		ref: ref.current,
+		attributes: deepImmutable( attributes ),
+	} );
+};
+
+/**
+ * Retrieves the part of the inherited context defined and updated from the
+ * server.
+ *
+ * The object returned is read-only, and includes the context defined in PHP
+ * with `wp_interactivity_data_wp_context()`, including the corresponding
+ * inherited properties. When `actions.navigate()` is called, this object is
+ * updated to reflect the changes in the new visited page, without affecting the
+ * context returned by `getContext()`. Directives can subscribe to those changes
+ * to update the context if needed.
+ *
+ * @example
+ * ```js
+ *  store('...', {
+ *    callbacks: {
+ *      updateServerContext() {
+ *        const context = getContext();
+ *        const serverContext = getServerContext();
+ *        // Override some property with the new value that came from the server.
+ *        context.overridableProp = serverContext.overridableProp;
+ *      },
+ *    },
+ *  });
+ * ```
+ *
+ * @param namespace Store namespace. By default, the namespace where the calling
+ *                  function exists is used.
+ * @return The server context content.
+ */
+export const getServerContext = < T extends object >(
+	namespace?: string
+): T => {
+	const scope = getScope();
+	if ( globalThis.SCRIPT_DEBUG ) {
+		if ( ! scope ) {
+			throw Error(
+				'Cannot call `getServerContext()` when there is no scope. If you are using an async function, please consider using a generator instead. If you are using some sort of async callbacks, like `setTimeout`, please wrap the callback with `withScope(callback)`.'
+			);
+		}
+	}
+	return scope.serverContext[ namespace || getNamespace() ];
+};
diff --git a/packages/interactivity/src/slots.js b/packages/interactivity/src/slots.js
deleted file mode 100644
index e8bc6ddfa368f5..00000000000000
--- a/packages/interactivity/src/slots.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * External dependencies
- */
-import { createContext } from 'preact';
-import { useContext, useEffect } from 'preact/hooks';
-import { signal } from '@preact/signals';
-
-const slotsContext = createContext();
-
-export const Fill = ( { slot, children } ) => {
-	const slots = useContext( slotsContext );
-
-	useEffect( () => {
-		if ( slot ) {
-			slots.value = { ...slots.value, [ slot ]: children };
-			return () => {
-				slots.value = { ...slots.value, [ slot ]: null };
-			};
-		}
-	}, [ slots, slot, children ] );
-
-	return !! slot ? null : children;
-};
-
-export const SlotProvider = ( { children } ) => {
-	return (
-		// TODO: We can change this to use deepsignal once this PR is merged.
-		// https://github.com/luisherranz/deepsignal/pull/38
-		<slotsContext.Provider value={ signal( {} ) }>
-			{ children }
-		</slotsContext.Provider>
-	);
-};
-
-export const Slot = ( { name, children } ) => {
-	const slots = useContext( slotsContext );
-	return slots.value[ name ] || children;
-};
diff --git a/packages/interactivity/src/store.ts b/packages/interactivity/src/store.ts
index 8463d1a0a51323..b147e0f61163bf 100644
--- a/packages/interactivity/src/store.ts
+++ b/packages/interactivity/src/store.ts
@@ -1,169 +1,61 @@
 /**
- * External dependencies
+ * Internal dependencies
  */
-import { deepSignal } from 'deepsignal';
-import { computed } from '@preact/signals';
-
+import { proxifyState, proxifyStore, deepMerge } from './proxies';
 /**
- * Internal dependencies
+ * External dependencies
  */
-import {
-	getScope,
-	setScope,
-	resetScope,
-	setNamespace,
-	resetNamespace,
-} from './hooks';
-
-const isObject = ( item: unknown ): boolean =>
-	!! item && typeof item === 'object' && ! Array.isArray( item );
-
-const deepMerge = ( target: any, source: any ) => {
-	if ( isObject( target ) && isObject( source ) ) {
-		for ( const key in source ) {
-			const getter = Object.getOwnPropertyDescriptor( source, key )?.get;
-			if ( typeof getter === 'function' ) {
-				Object.defineProperty( target, key, { get: getter } );
-			} else if ( isObject( source[ key ] ) ) {
-				if ( ! target[ key ] ) Object.assign( target, { [ key ]: {} } );
-				deepMerge( target[ key ], source[ key ] );
-			} else {
-				Object.assign( target, { [ key ]: source[ key ] } );
-			}
-		}
-	}
-};
-
-const parseInitialState = () => {
-	const storeTag = document.querySelector(
-		`script[type="application/json"]#wp-interactivity-initial-state`
-	);
-	if ( ! storeTag?.textContent ) return {};
-	try {
-		const initialState = JSON.parse( storeTag.textContent );
-		if ( isObject( initialState ) ) return initialState;
-		throw Error( 'Parsed state is not an object' );
-	} catch ( e ) {
-		// eslint-disable-next-line no-console
-		console.log( e );
-	}
-	return {};
-};
+import { getNamespace } from './namespaces';
+import { isPlainObject } from './utils';
 
 export const stores = new Map();
 const rawStores = new Map();
 const storeLocks = new Map();
+const storeConfigs = new Map();
+const serverStates = new Map();
 
-const objToProxy = new WeakMap();
-const proxyToNs = new WeakMap();
-const scopeToGetters = new WeakMap();
+/**
+ * Get the defined config for the store with the passed namespace.
+ *
+ * @param namespace Store's namespace from which to retrieve the config.
+ * @return Defined config for the given namespace.
+ */
+export const getConfig = ( namespace?: string ) =>
+	storeConfigs.get( namespace || getNamespace() ) || {};
 
-const proxify = ( obj: any, ns: string ) => {
-	if ( ! objToProxy.has( obj ) ) {
-		const proxy = new Proxy( obj, handlers );
-		objToProxy.set( obj, proxy );
-		proxyToNs.set( proxy, ns );
+/**
+ * Get the part of the state defined and updated from the server.
+ *
+ * The object returned is read-only, and includes the state defined in PHP with
+ * `wp_interactivity_state()`. When using `actions.navigate()`, this object is
+ * updated to reflect the changes in its properites, without affecting the state
+ * returned by `store()`. Directives can subscribe to those changes to update
+ * the state if needed.
+ *
+ * @example
+ * ```js
+ *  const { state } = store('myStore', {
+ *    callbacks: {
+ *      updateServerState() {
+ *        const serverState = getServerState();
+ *        // Override some property with the new value that came from the server.
+ *        state.overridableProp = serverState.overridableProp;
+ *      },
+ *    },
+ *  });
+ * ```
+ *
+ * @param namespace Store's namespace from which to retrieve the server state.
+ * @return The server state for the given namespace.
+ */
+export const getServerState = ( namespace?: string ) => {
+	const ns = namespace || getNamespace();
+	if ( ! serverStates.has( ns ) ) {
+		serverStates.set( ns, proxifyState( ns, {}, { readOnly: true } ) );
 	}
-	return objToProxy.get( obj );
+	return serverStates.get( ns );
 };
 
-const handlers = {
-	get: ( target: any, key: string | symbol, receiver: any ) => {
-		const ns = proxyToNs.get( receiver );
-
-		// Check if the property is a getter and we are inside an scope. If that is
-		// the case, we clone the getter to avoid overwriting the scoped
-		// dependencies of the computed each time that getter runs.
-		const getter = Object.getOwnPropertyDescriptor( target, key )?.get;
-		if ( getter ) {
-			const scope = getScope();
-			if ( scope ) {
-				const getters =
-					scopeToGetters.get( scope ) ||
-					scopeToGetters.set( scope, new Map() ).get( scope );
-				if ( ! getters.has( getter ) ) {
-					getters.set(
-						getter,
-						computed( () => {
-							setNamespace( ns );
-							setScope( scope );
-							try {
-								return getter.call( target );
-							} finally {
-								resetScope();
-								resetNamespace();
-							}
-						} )
-					);
-				}
-				return getters.get( getter ).value;
-			}
-		}
-
-		const result = Reflect.get( target, key, receiver );
-
-		// Check if the proxy is the store root and no key with that name exist. In
-		// that case, return an empty object for the requested key.
-		if ( typeof result === 'undefined' && receiver === stores.get( ns ) ) {
-			const obj = {};
-			Reflect.set( target, key, obj, receiver );
-			return proxify( obj, ns );
-		}
-
-		// Check if the property is a generator. If it is, we turn it into an
-		// asynchronous function where we restore the default namespace and scope
-		// each time it awaits/yields.
-		if ( result?.constructor?.name === 'GeneratorFunction' ) {
-			return async ( ...args: unknown[] ) => {
-				const scope = getScope();
-				const gen: Generator< any > = result( ...args );
-
-				let value: any;
-				let it: IteratorResult< any >;
-
-				while ( true ) {
-					setNamespace( ns );
-					setScope( scope );
-					try {
-						it = gen.next( value );
-					} finally {
-						resetScope();
-						resetNamespace();
-					}
-
-					try {
-						value = await it.value;
-					} catch ( e ) {
-						gen.throw( e );
-					}
-
-					if ( it.done ) break;
-				}
-
-				return value;
-			};
-		}
-
-		// Check if the property is a synchronous function. If it is, set the
-		// default namespace. Synchronous functions always run in the proper scope,
-		// which is set by the Directives component.
-		if ( typeof result === 'function' ) {
-			return ( ...args: unknown[] ) => {
-				setNamespace( ns );
-				try {
-					return result( ...args );
-				} finally {
-					resetNamespace();
-				}
-			};
-		}
-
-		// Check if the property is an object. If it is, proxyify it.
-		if ( isObject( result ) ) return proxify( result, ns );
-
-		return result;
-	},
-};
 interface StoreOptions {
 	/**
 	 * Property to block/unblock private store namespaces.
@@ -192,7 +84,43 @@ interface StoreOptions {
 	lock?: boolean | string;
 }
 
-const universalUnlock =
+type Prettify< T > = { [ K in keyof T ]: T[ K ] } & {};
+type DeepPartial< T > = T extends object
+	? { [ P in keyof T ]?: DeepPartial< T[ P ] > }
+	: T;
+type DeepPartialState< T extends { state: object } > = Omit< T, 'state' > & {
+	state?: DeepPartial< T[ 'state' ] >;
+};
+type ConvertGeneratorToPromise< T > = T extends (
+	...args: infer A
+) => Generator< any, infer R, any >
+	? ( ...args: A ) => Promise< R >
+	: never;
+type ConvertGeneratorsToPromises< T > = {
+	[ K in keyof T ]: T[ K ] extends ( ...args: any[] ) => any
+		? ConvertGeneratorToPromise< T[ K ] > extends never
+			? T[ K ]
+			: ConvertGeneratorToPromise< T[ K ] >
+		: T[ K ] extends object
+		? Prettify< ConvertGeneratorsToPromises< T[ K ] > >
+		: T[ K ];
+};
+type ConvertPromiseToGenerator< T > = T extends (
+	...args: infer A
+) => Promise< infer R >
+	? ( ...args: A ) => Generator< any, R, any >
+	: never;
+type ConvertPromisesToGenerators< T > = {
+	[ K in keyof T ]: T[ K ] extends ( ...args: any[] ) => any
+		? ConvertPromiseToGenerator< T[ K ] > extends never
+			? T[ K ]
+			: ConvertPromiseToGenerator< T[ K ] >
+		: T[ K ] extends object
+		? Prettify< ConvertPromisesToGenerators< T[ K ] > >
+		: T[ K ];
+};
+
+export const universalUnlock =
 	'I acknowledge that using a private store means my plugin will inevitably break on the next store release.';
 
 /**
@@ -225,7 +153,7 @@ const universalUnlock =
  * the store by using directives in the HTML, e.g.:
  *
  * ```html
- * <div data-wp-interactive='{ "namespace": "counter" }'>
+ * <div data-wp-interactive="counter">
  *   <button
  *     data-wp-text="state.double"
  *     data-wp-on--click="actions.increment"
@@ -240,17 +168,34 @@ const universalUnlock =
  *
  * @return A reference to the namespace content.
  */
-export function store< S extends object = {} >(
+
+// Overload for when the types are inferred.
+export function store< T extends object >(
+	namespace: string,
+	storePart: T,
+	options?: StoreOptions
+): Prettify< ConvertGeneratorsToPromises< T > >;
+
+// Overload for when types are passed via generics and they contain state.
+export function store< T extends { state: object } >(
+	namespace: string,
+	storePart: ConvertPromisesToGenerators< DeepPartialState< T > >,
+	options?: StoreOptions
+): Prettify< ConvertGeneratorsToPromises< T > >;
+
+// Overload for when types are passed via generics and they don't contain state.
+export function store< T extends object >(
 	namespace: string,
-	storePart?: S,
+	storePart: ConvertPromisesToGenerators< T >,
 	options?: StoreOptions
-): S;
+): Prettify< ConvertGeneratorsToPromises< T > >;
 
+// Overload for when types are divided into multiple parts.
 export function store< T extends object >(
 	namespace: string,
-	storePart?: T,
+	storePart: ConvertPromisesToGenerators< DeepPartial< T > >,
 	options?: StoreOptions
-): T;
+): Prettify< ConvertGeneratorsToPromises< T > >;
 
 export function store(
 	namespace: string,
@@ -264,11 +209,16 @@ export function store(
 		if ( lock !== universalUnlock ) {
 			storeLocks.set( namespace, lock );
 		}
-		const rawStore = { state: deepSignal( state ), ...block };
-		const proxiedStore = new Proxy( rawStore, handlers );
+		const rawStore = {
+			state: proxifyState(
+				namespace,
+				isPlainObject( state ) ? state : {}
+			),
+			...block,
+		};
+		const proxifiedStore = proxifyStore( namespace, rawStore );
 		rawStores.set( namespace, rawStore );
-		stores.set( namespace, proxiedStore );
-		proxyToNs.set( proxiedStore, namespace );
+		stores.set( namespace, proxifiedStore );
 	} else {
 		// Lock the store if it wasn't locked yet and the passed lock is
 		// different from the universal unlock. If no lock is given, the store
@@ -300,7 +250,40 @@ export function store(
 	return stores.get( namespace );
 }
 
-// Parse and populate the initial state.
-Object.entries( parseInitialState() ).forEach( ( [ namespace, state ] ) => {
-	store( namespace, { state } );
-} );
+export const parseServerData = ( dom = document ) => {
+	const jsonDataScriptTag =
+		// Preferred Script Module data passing form
+		dom.getElementById(
+			'wp-script-module-data-@wordpress/interactivity'
+		) ??
+		// Legacy form
+		dom.getElementById( 'wp-interactivity-data' );
+	if ( jsonDataScriptTag?.textContent ) {
+		try {
+			return JSON.parse( jsonDataScriptTag.textContent );
+		} catch {}
+	}
+	return {};
+};
+
+export const populateServerData = ( data?: {
+	state?: Record< string, unknown >;
+	config?: Record< string, unknown >;
+} ) => {
+	if ( isPlainObject( data?.state ) ) {
+		Object.entries( data!.state ).forEach( ( [ namespace, state ] ) => {
+			const st = store< any >( namespace, {}, { lock: universalUnlock } );
+			deepMerge( st.state, state, false );
+			deepMerge( getServerState( namespace ), state );
+		} );
+	}
+	if ( isPlainObject( data?.config ) ) {
+		Object.entries( data!.config ).forEach( ( [ namespace, config ] ) => {
+			storeConfigs.set( namespace, config );
+		} );
+	}
+};
+
+// Parse and populate the initial state and config.
+const data = parseServerData();
+populateServerData( data );
diff --git a/packages/interactivity/src/test/store.ts b/packages/interactivity/src/test/store.ts
new file mode 100644
index 00000000000000..1092001db03143
--- /dev/null
+++ b/packages/interactivity/src/test/store.ts
@@ -0,0 +1,286 @@
+/**
+ * Internal dependencies
+ */
+import { store } from '../store';
+
+describe( 'Interactivity API', () => {
+	describe( 'store', () => {
+		it( 'dummy test', () => {
+			expect( true ).toBe( true );
+		} );
+
+		describe( 'types', () => {
+			describe( 'the whole store can be inferred', () => {
+				// eslint-disable-next-line no-unused-expressions
+				async () => {
+					const myStore = store( 'test', {
+						state: {
+							clientValue: 1,
+							get derived(): number {
+								return myStore.state.clientValue;
+							},
+						},
+						actions: {
+							sync( n: number ) {
+								return n;
+							},
+							*async( n: number ) {
+								const n1: number =
+									yield myStore.actions.sync( n );
+								return myStore.state.derived + n1 + n;
+							},
+						},
+					} );
+
+					myStore.state.clientValue satisfies number;
+					myStore.state.derived satisfies number;
+
+					// @ts-expect-error
+					myStore.state.nonExistent satisfies number;
+					myStore.actions.sync( 1 ) satisfies number;
+					myStore.actions.async( 1 ) satisfies Promise< number >;
+					( await myStore.actions.async( 1 ) ) satisfies number;
+
+					// @ts-expect-error
+					myStore.actions.nonExistent() satisfies {};
+				};
+			} );
+
+			describe( 'the whole store can be manually typed', () => {
+				// eslint-disable-next-line no-unused-expressions
+				async () => {
+					interface Store {
+						state: {
+							clientValue: number;
+							serverValue: number;
+							readonly derived: number;
+						};
+						actions: {
+							sync: ( n: number ) => number;
+							async: ( n: number ) => Promise< number >;
+						};
+					}
+
+					const myStore = store< Store >( 'test', {
+						state: {
+							clientValue: 1,
+							// @ts-expect-error
+							nonExistent: 2,
+							get derived(): number {
+								return myStore.state.serverValue;
+							},
+						},
+						actions: {
+							sync( n ) {
+								return n;
+							},
+							*async( n ): Generator< unknown, number, unknown > {
+								const n1 = myStore.actions.sync( n );
+								return myStore.state.derived + n1 + n;
+							},
+						},
+					} );
+
+					myStore.state.clientValue satisfies number;
+					myStore.state.serverValue satisfies number;
+					myStore.state.derived satisfies number;
+					// @ts-expect-error
+					myStore.state.nonExistent satisfies number;
+					myStore.actions.sync( 1 ) satisfies number;
+					myStore.actions.async( 1 ) satisfies Promise< number >;
+					( await myStore.actions.async( 1 ) ) satisfies number;
+					// @ts-expect-error
+					myStore.actions.nonExistent();
+				};
+			} );
+
+			describe( 'the server state can be typed and the rest inferred', () => {
+				// eslint-disable-next-line no-unused-expressions
+				async () => {
+					type ServerStore = {
+						state: {
+							serverValue: number;
+						};
+					};
+
+					const clientStore = {
+						state: {
+							clientValue: 1,
+							get derived(): number {
+								return myStore.state.serverValue;
+							},
+						},
+						actions: {
+							sync( n: number ) {
+								return n;
+							},
+							*async(
+								n: number
+							): Generator< unknown, number, number > {
+								const n1: number =
+									yield myStore.actions.sync( n );
+								return myStore.state.derived + n1 + n;
+							},
+						},
+					};
+
+					type Store = ServerStore & typeof clientStore;
+
+					const myStore = store< Store >( 'test', clientStore );
+
+					myStore.state.clientValue satisfies number;
+					myStore.state.serverValue satisfies number;
+					myStore.state.derived satisfies number;
+					// @ts-expect-error
+					myStore.state.nonExistent satisfies number;
+					myStore.actions.sync( 1 ) satisfies number;
+					myStore.actions.async( 1 ) satisfies Promise< number >;
+					( await myStore.actions.async( 1 ) ) satisfies number;
+					// @ts-expect-error
+					myStore.actions.nonExistent();
+				};
+			} );
+
+			describe( 'the state can be casted and the rest inferred', () => {
+				// eslint-disable-next-line no-unused-expressions
+				async () => {
+					type State = {
+						clientValue: number;
+						serverValue: number;
+						derived: number;
+					};
+
+					const myStore = store( 'test', {
+						state: {
+							clientValue: 1,
+							get derived(): number {
+								return myStore.state.serverValue;
+							},
+						} as State,
+						actions: {
+							sync( n: number ) {
+								return n;
+							},
+							*async(
+								n: number
+							): Generator< unknown, number, number > {
+								const n1: number =
+									yield myStore.actions.sync( n );
+								return myStore.state.derived + n1 + n;
+							},
+						},
+					} );
+
+					myStore.state.clientValue satisfies number;
+					myStore.state.serverValue satisfies number;
+					myStore.state.derived satisfies number;
+					// @ts-expect-error
+					myStore.state.nonExistent satisfies number;
+					myStore.actions.sync( 1 ) satisfies number;
+					myStore.actions.async( 1 ) satisfies Promise< number >;
+					( await myStore.actions.async( 1 ) ) satisfies number;
+					// @ts-expect-error
+					myStore.actions.nonExistent() satisfies {};
+				};
+			} );
+
+			describe( 'the whole store can be manually typed even if doesnt contain state', () => {
+				// eslint-disable-next-line no-unused-expressions
+				async () => {
+					interface Store {
+						actions: {
+							sync: ( n: number ) => number;
+							async: ( n: number ) => Promise< number >;
+						};
+						callbacks: {
+							existent: number;
+						};
+					}
+
+					const myStore = store< Store >( 'test', {
+						actions: {
+							sync( n ) {
+								return n;
+							},
+							*async( n ): Generator< unknown, number, number > {
+								const n1: number =
+									yield myStore.actions.sync( n );
+								return n1 + n;
+							},
+						},
+						callbacks: {
+							existent: 1,
+							// @ts-expect-error
+							nonExistent: 1,
+						},
+					} );
+
+					// @ts-expect-error
+					myStore.state.nonExistent satisfies number;
+					myStore.actions.sync( 1 ) satisfies number;
+					myStore.actions.async( 1 ) satisfies Promise< number >;
+					( await myStore.actions.async( 1 ) ) satisfies number;
+					myStore.callbacks.existent satisfies number;
+					// @ts-expect-error
+					myStore.callbacks.nonExistent satisfies number;
+					// @ts-expect-error
+					myStore.actions.nonExistent() satisfies {};
+				};
+			} );
+
+			describe( 'the store can be divided into multiple parts', () => {
+				// eslint-disable-next-line no-unused-expressions
+				async () => {
+					type ServerState = {
+						state: {
+							serverValue: number;
+						};
+					};
+
+					const firstStorePart = {
+						state: {
+							clientValue1: 1,
+						},
+						actions: {
+							incrementValue1( n = 1 ) {
+								myStore.state.clientValue1 += n;
+							},
+						},
+					};
+
+					type FirstStorePart = typeof firstStorePart;
+
+					const secondStorePart = {
+						state: {
+							clientValue2: 'test',
+						},
+						actions: {
+							*asyncAction() {
+								return (
+									myStore.state.clientValue1 +
+									myStore.state.serverValue
+								);
+							},
+						},
+					};
+
+					type Store = ServerState &
+						FirstStorePart &
+						typeof secondStorePart;
+
+					const myStore = store< Store >( 'test', firstStorePart );
+					store( 'test', secondStorePart );
+
+					myStore.state.clientValue1 satisfies number;
+					myStore.state.clientValue2 satisfies string;
+					myStore.actions.incrementValue1( 1 );
+					myStore.actions.asyncAction() satisfies Promise< number >;
+					( await myStore.actions.asyncAction() ) satisfies number;
+
+					// @ts-expect-error
+					myStore.state.nonExistent satisfies {};
+				};
+			} );
+		} );
+	} );
+} );
diff --git a/packages/interactivity/src/test/utils.ts b/packages/interactivity/src/test/utils.ts
new file mode 100644
index 00000000000000..2de0ffe6d31e06
--- /dev/null
+++ b/packages/interactivity/src/test/utils.ts
@@ -0,0 +1,28 @@
+/**
+ * Internal dependencies
+ */
+import { kebabToCamelCase } from '../utils';
+
+describe( 'Interactivity API', () => {
+	describe( 'kebabToCamelCase', () => {
+		it( 'should work exactly as the PHP version', async () => {
+			expect( kebabToCamelCase( '' ) ).toBe( '' );
+			expect( kebabToCamelCase( 'item' ) ).toBe( 'item' );
+			expect( kebabToCamelCase( 'my-item' ) ).toBe( 'myItem' );
+			expect( kebabToCamelCase( 'my_item' ) ).toBe( 'my_item' );
+			expect( kebabToCamelCase( 'My-iTem' ) ).toBe( 'myItem' );
+			expect( kebabToCamelCase( 'my-item-with-multiple-hyphens' ) ).toBe(
+				'myItemWithMultipleHyphens'
+			);
+			expect( kebabToCamelCase( 'my-item-with--double-hyphens' ) ).toBe(
+				'myItemWith-DoubleHyphens'
+			);
+			expect( kebabToCamelCase( 'my-item-with_under-score' ) ).toBe(
+				'myItemWith_underScore'
+			);
+			expect( kebabToCamelCase( '-my-item' ) ).toBe( 'myItem' );
+			expect( kebabToCamelCase( 'my-item-' ) ).toBe( 'myItem' );
+			expect( kebabToCamelCase( '-my-item-' ) ).toBe( 'myItem' );
+		} );
+	} );
+} );
diff --git a/packages/interactivity/src/utils.js b/packages/interactivity/src/utils.js
deleted file mode 100644
index 10b53104fb9c89..00000000000000
--- a/packages/interactivity/src/utils.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * External dependencies
- */
-import { useEffect } from 'preact/hooks';
-import { effect } from '@preact/signals';
-
-const afterNextFrame = ( callback ) => {
-	return new Promise( ( resolve ) => {
-		const done = () => {
-			clearTimeout( timeout );
-			window.cancelAnimationFrame( raf );
-			setTimeout( () => {
-				callback();
-				resolve();
-			} );
-		};
-		const timeout = setTimeout( done, 100 );
-		const raf = window.requestAnimationFrame( done );
-	} );
-};
-
-// Using the mangled properties:
-// this.c: this._callback
-// this.x: this._compute
-// https://github.com/preactjs/signals/blob/main/mangle.json
-function createFlusher( compute, notify ) {
-	let flush;
-	const dispose = effect( function () {
-		flush = this.c.bind( this );
-		this.x = compute;
-		this.c = notify;
-		return compute();
-	} );
-	return { flush, dispose };
-}
-
-// Version of `useSignalEffect` with a `useEffect`-like execution. This hook
-// implementation comes from this PR, but we added short-cirtuiting to avoid
-// infinite loops: https://github.com/preactjs/signals/pull/290
-export function useSignalEffect( callback ) {
-	useEffect( () => {
-		let eff = null;
-		let isExecuting = false;
-		const notify = async () => {
-			if ( eff && ! isExecuting ) {
-				isExecuting = true;
-				await afterNextFrame( eff.flush );
-				isExecuting = false;
-			}
-		};
-		eff = createFlusher( callback, notify );
-		return eff.dispose;
-	}, [] );
-}
-
-// For wrapperless hydration.
-// See https://gist.github.com/developit/f4c67a2ede71dc2fab7f357f39cff28c
-export const createRootFragment = ( parent, replaceNode ) => {
-	replaceNode = [].concat( replaceNode );
-	const s = replaceNode[ replaceNode.length - 1 ].nextSibling;
-	function insert( c, r ) {
-		parent.insertBefore( c, r || s );
-	}
-	return ( parent.__k = {
-		nodeType: 1,
-		parentNode: parent,
-		firstChild: replaceNode[ 0 ],
-		childNodes: replaceNode,
-		insertBefore: insert,
-		appendChild: insert,
-		removeChild( c ) {
-			parent.removeChild( c );
-		},
-	} );
-};
diff --git a/packages/interactivity/src/utils.ts b/packages/interactivity/src/utils.ts
new file mode 100644
index 00000000000000..9cd6f8bebb0d1c
--- /dev/null
+++ b/packages/interactivity/src/utils.ts
@@ -0,0 +1,376 @@
+/**
+ * External dependencies
+ */
+import {
+	useMemo as _useMemo,
+	useCallback as _useCallback,
+	useEffect as _useEffect,
+	useLayoutEffect as _useLayoutEffect,
+	type EffectCallback,
+	type Inputs,
+} from 'preact/hooks';
+import { effect } from '@preact/signals';
+
+/**
+ * Internal dependencies
+ */
+import { getScope, setScope, resetScope } from './scopes';
+import { getNamespace, setNamespace, resetNamespace } from './namespaces';
+
+interface Flusher {
+	readonly flush: () => void;
+	readonly dispose: () => void;
+}
+
+declare global {
+	interface Window {
+		scheduler?: {
+			readonly yield?: () => Promise< void >;
+		};
+	}
+}
+
+/**
+ * Executes a callback function after the next frame is rendered.
+ *
+ * @param callback The callback function to be executed.
+ * @return A promise that resolves after the callback function is executed.
+ */
+const afterNextFrame = ( callback: () => void ) => {
+	return new Promise< void >( ( resolve ) => {
+		const done = () => {
+			clearTimeout( timeout );
+			window.cancelAnimationFrame( raf );
+			setTimeout( () => {
+				callback();
+				resolve();
+			} );
+		};
+		const timeout = setTimeout( done, 100 );
+		const raf = window.requestAnimationFrame( done );
+	} );
+};
+
+/**
+ * Returns a promise that resolves after yielding to main.
+ *
+ * @return Promise
+ */
+export const splitTask =
+	typeof window.scheduler?.yield === 'function'
+		? window.scheduler.yield.bind( window.scheduler )
+		: () => {
+				return new Promise( ( resolve ) => {
+					setTimeout( resolve, 0 );
+				} );
+		  };
+
+/**
+ * Creates a Flusher object that can be used to flush computed values and notify listeners.
+ *
+ * Using the mangled properties:
+ * this.c: this._callback
+ * this.x: this._compute
+ * https://github.com/preactjs/signals/blob/main/mangle.json
+ *
+ * @param compute The function that computes the value to be flushed.
+ * @param notify  The function that notifies listeners when the value is flushed.
+ * @return The Flusher object with `flush` and `dispose` properties.
+ */
+function createFlusher( compute: () => void, notify: () => void ): Flusher {
+	let flush: () => void = () => undefined;
+	const dispose = effect( function ( this: any ): void {
+		flush = this.c.bind( this );
+		this.x = compute;
+		this.c = notify;
+		return compute();
+	} );
+	return { flush, dispose } as const;
+}
+
+/**
+ * Custom hook that executes a callback function whenever a signal is triggered.
+ * Version of `useSignalEffect` with a `useEffect`-like execution. This hook
+ * implementation comes from this PR, but we added short-cirtuiting to avoid
+ * infinite loops: https://github.com/preactjs/signals/pull/290
+ *
+ * @param callback The callback function to be executed.
+ */
+export function useSignalEffect( callback: () => unknown ) {
+	_useEffect( () => {
+		let eff: Flusher | null = null;
+		let isExecuting = false;
+
+		const notify = async () => {
+			if ( eff && ! isExecuting ) {
+				isExecuting = true;
+				await afterNextFrame( eff.flush );
+				isExecuting = false;
+			}
+		};
+
+		eff = createFlusher( callback, notify );
+		return eff.dispose;
+	}, [] );
+}
+
+/**
+ * Returns the passed function wrapped with the current scope so it is
+ * accessible whenever the function runs. This is primarily to make the scope
+ * available inside hook callbacks.
+ *
+ * Asyncronous functions should use generators that yield promises instead of awaiting them.
+ * See the documentation for details: https://developer.wordpress.org/block-editor/reference-guides/packages/packages-interactivity/packages-interactivity-api-reference/#the-store
+ *
+ * @param func The passed function.
+ * @return The wrapped function.
+ */
+export function withScope<
+	Func extends ( ...args: any[] ) => Generator< any, any >,
+>(
+	func: Func
+): (
+	...args: Parameters< Func >
+) => ReturnType< Func > extends Generator< any, infer Return >
+	? Promise< Return >
+	: never;
+export function withScope< Func extends Function >( func: Func ): Func;
+export function withScope( func: ( ...args: unknown[] ) => unknown ) {
+	const scope = getScope();
+	const ns = getNamespace();
+	if ( func?.constructor?.name === 'GeneratorFunction' ) {
+		return async ( ...args: Parameters< typeof func > ) => {
+			const gen = func( ...args ) as Generator;
+			let value: any;
+			let it: any;
+			while ( true ) {
+				setNamespace( ns );
+				setScope( scope );
+				try {
+					it = gen.next( value );
+				} finally {
+					resetScope();
+					resetNamespace();
+				}
+
+				try {
+					value = await it.value;
+				} catch ( e ) {
+					setNamespace( ns );
+					setScope( scope );
+					gen.throw( e );
+				} finally {
+					resetScope();
+					resetNamespace();
+				}
+
+				if ( it.done ) {
+					break;
+				}
+			}
+
+			return value;
+		};
+	}
+	return ( ...args: Parameters< typeof func > ) => {
+		setNamespace( ns );
+		setScope( scope );
+		try {
+			return func( ...args );
+		} finally {
+			resetNamespace();
+			resetScope();
+		}
+	};
+}
+
+/**
+ * Accepts a function that contains imperative code which runs whenever any of
+ * the accessed _reactive_ properties (e.g., values from the global state or the
+ * context) is modified.
+ *
+ * This hook makes the element's scope available so functions like
+ * `getElement()` and `getContext()` can be used inside the passed callback.
+ *
+ * @param callback The hook callback.
+ */
+export function useWatch( callback: () => unknown ) {
+	useSignalEffect( withScope( callback ) );
+}
+
+/**
+ * Accepts a function that contains imperative code which runs only after the
+ * element's first render, mainly useful for intialization logic.
+ *
+ * This hook makes the element's scope available so functions like
+ * `getElement()` and `getContext()` can be used inside the passed callback.
+ *
+ * @param callback The hook callback.
+ */
+export function useInit( callback: EffectCallback ) {
+	_useEffect( withScope( callback ), [] );
+}
+
+/**
+ * Accepts a function that contains imperative, possibly effectful code. The
+ * effects run after browser paint, without blocking it.
+ *
+ * This hook is equivalent to Preact's `useEffect` and makes the element's scope
+ * available so functions like `getElement()` and `getContext()` can be used
+ * inside the passed callback.
+ *
+ * @param callback Imperative function that can return a cleanup
+ *                 function.
+ * @param inputs   If present, effect will only activate if the
+ *                 values in the list change (using `===`).
+ */
+export function useEffect( callback: EffectCallback, inputs: Inputs ) {
+	_useEffect( withScope( callback ), inputs );
+}
+
+/**
+ * Accepts a function that contains imperative, possibly effectful code. Use
+ * this to read layout from the DOM and synchronously re-render.
+ *
+ * This hook is equivalent to Preact's `useLayoutEffect` and makes the element's
+ * scope available so functions like `getElement()` and `getContext()` can be
+ * used inside the passed callback.
+ *
+ * @param callback Imperative function that can return a cleanup
+ *                 function.
+ * @param inputs   If present, effect will only activate if the
+ *                 values in the list change (using `===`).
+ */
+export function useLayoutEffect( callback: EffectCallback, inputs: Inputs ) {
+	_useLayoutEffect( withScope( callback ), inputs );
+}
+
+/**
+ * Returns a memoized version of the callback that only changes if one of the
+ * inputs has changed (using `===`).
+ *
+ * This hook is equivalent to Preact's `useCallback` and makes the element's
+ * scope available so functions like `getElement()` and `getContext()` can be
+ * used inside the passed callback.
+ *
+ * @param callback Callback function.
+ * @param inputs   If present, the callback will only be updated if the
+ *                 values in the list change (using `===`).
+ *
+ * @return The callback function.
+ */
+export function useCallback< T extends Function >(
+	callback: T,
+	inputs: Inputs
+): T {
+	return _useCallback< T >( withScope( callback ), inputs );
+}
+
+/**
+ * Pass a factory function and an array of inputs. `useMemo` will only recompute
+ * the memoized value when one of the inputs has changed.
+ *
+ * This hook is equivalent to Preact's `useMemo` and makes the element's scope
+ * available so functions like `getElement()` and `getContext()` can be used
+ * inside the passed factory function.
+ *
+ * @param factory Factory function that returns that value for memoization.
+ * @param inputs  If present, the factory will only be run to recompute if
+ *                the values in the list change (using `===`).
+ *
+ * @return The memoized value.
+ */
+export function useMemo< T >( factory: () => T, inputs: Inputs ): T {
+	return _useMemo( withScope( factory ), inputs );
+}
+
+/**
+ * Creates a root fragment by replacing a node or an array of nodes in a parent element.
+ * For wrapperless hydration.
+ * See https://gist.github.com/developit/f4c67a2ede71dc2fab7f357f39cff28c
+ *
+ * @param parent      The parent element where the nodes will be replaced.
+ * @param replaceNode The node or array of nodes to replace in the parent element.
+ * @return The created root fragment.
+ */
+export const createRootFragment = (
+	parent: Element,
+	replaceNode: Node | Node[]
+) => {
+	replaceNode = ( [] as Node[] ).concat( replaceNode );
+	const sibling = replaceNode[ replaceNode.length - 1 ].nextSibling;
+	function insert( child: any, root: any ) {
+		parent.insertBefore( child, root || sibling );
+	}
+	return ( ( parent as any ).__k = {
+		nodeType: 1,
+		parentNode: parent,
+		firstChild: replaceNode[ 0 ],
+		childNodes: replaceNode,
+		insertBefore: insert,
+		appendChild: insert,
+		removeChild( c: Node ) {
+			parent.removeChild( c );
+		},
+	} );
+};
+
+/**
+ * Transforms a kebab-case string to camelCase.
+ *
+ * @param str The kebab-case string to transform to camelCase.
+ * @return The transformed camelCase string.
+ */
+export function kebabToCamelCase( str: string ): string {
+	return str
+		.replace( /^-+|-+$/g, '' )
+		.toLowerCase()
+		.replace( /-([a-z])/g, function ( _match, group1: string ) {
+			return group1.toUpperCase();
+		} );
+}
+
+const logged: Set< string > = new Set();
+
+/**
+ * Shows a warning with `message` if environment is not `production`.
+ *
+ * Based on the `@wordpress/warning` package.
+ *
+ * @param message Message to show in the warning.
+ */
+export const warn = ( message: string ): void => {
+	if ( globalThis.SCRIPT_DEBUG ) {
+		if ( logged.has( message ) ) {
+			return;
+		}
+
+		// eslint-disable-next-line no-console
+		console.warn( message );
+
+		// Throwing an error and catching it immediately to improve debugging
+		// A consumer can use 'pause on caught exceptions'
+		try {
+			throw Error( message );
+		} catch ( e ) {
+			// Do nothing.
+		}
+		logged.add( message );
+	}
+};
+
+/**
+ * Checks if the passed `candidate` is a plain object with just the `Object`
+ * prototype.
+ *
+ * @param candidate The item to check.
+ * @return Whether `candidate` is a plain object.
+ */
+export const isPlainObject = (
+	candidate: unknown
+): candidate is Record< string, unknown > =>
+	Boolean(
+		candidate &&
+			typeof candidate === 'object' &&
+			candidate.constructor === Object
+	);
diff --git a/packages/interactivity/src/vdom.js b/packages/interactivity/src/vdom.js
deleted file mode 100644
index b1342ac271a8e2..00000000000000
--- a/packages/interactivity/src/vdom.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * External dependencies
- */
-import { h } from 'preact';
-/**
- * Internal dependencies
- */
-import { directivePrefix as p } from './constants';
-
-const ignoreAttr = `data-${ p }-ignore`;
-const islandAttr = `data-${ p }-interactive`;
-const fullPrefix = `data-${ p }-`;
-let namespace = null;
-
-// Regular expression for directive parsing.
-const directiveParser = new RegExp(
-	`^data-${ p }-` + // ${p} must be a prefix string, like 'wp'.
-		// Match alphanumeric characters including hyphen-separated
-		// segments. It excludes underscore intentionally to prevent confusion.
-		// E.g., "custom-directive".
-		'([a-z0-9]+(?:-[a-z0-9]+)*)' +
-		// (Optional) Match '--' followed by any alphanumeric charachters. It
-		// excludes underscore intentionally to prevent confusion, but it can
-		// contain multiple hyphens. E.g., "--custom-prefix--with-more-info".
-		'(?:--([a-z0-9_-]+))?$',
-	'i' // Case insensitive.
-);
-
-// Regular expression for reference parsing. It can contain a namespace before
-// the reference, separated by `::`, like `some-namespace::state.somePath`.
-// Namespaces can contain any alphanumeric characters, hyphens, underscores or
-// forward slashes. References don't have any restrictions.
-const nsPathRegExp = /^([\w-_\/]+)::(.+)$/;
-
-export const hydratedIslands = new WeakSet();
-
-// Recursive function that transforms a DOM tree into vDOM.
-export function toVdom( root ) {
-	const treeWalker = document.createTreeWalker(
-		root,
-		205 // ELEMENT + TEXT + COMMENT + CDATA_SECTION + PROCESSING_INSTRUCTION
-	);
-
-	function walk( node ) {
-		const { attributes, nodeType } = node;
-
-		if ( nodeType === 3 ) return [ node.data ];
-		if ( nodeType === 4 ) {
-			const next = treeWalker.nextSibling();
-			node.replaceWith( new window.Text( node.nodeValue ) );
-			return [ node.nodeValue, next ];
-		}
-		if ( nodeType === 8 || nodeType === 7 ) {
-			const next = treeWalker.nextSibling();
-			node.remove();
-			return [ null, next ];
-		}
-
-		const props = {};
-		const children = [];
-		const directives = [];
-		let ignore = false;
-		let island = false;
-
-		for ( let i = 0; i < attributes.length; i++ ) {
-			const n = attributes[ i ].name;
-			if (
-				n[ fullPrefix.length ] &&
-				n.slice( 0, fullPrefix.length ) === fullPrefix
-			) {
-				if ( n === ignoreAttr ) {
-					ignore = true;
-				} else {
-					let [ ns, value ] = nsPathRegExp
-						.exec( attributes[ i ].value )
-						?.slice( 1 ) ?? [ null, attributes[ i ].value ];
-					try {
-						value = JSON.parse( value );
-					} catch ( e ) {}
-					if ( n === islandAttr ) {
-						island = true;
-						namespace = value?.namespace ?? null;
-					} else {
-						directives.push( [ n, ns, value ] );
-					}
-				}
-			} else if ( n === 'ref' ) {
-				continue;
-			}
-			props[ n ] = attributes[ i ].value;
-		}
-
-		if ( ignore && ! island )
-			return [
-				h( node.localName, {
-					...props,
-					innerHTML: node.innerHTML,
-					__directives: { ignore: true },
-				} ),
-			];
-		if ( island ) hydratedIslands.add( node );
-
-		if ( directives.length ) {
-			props.__directives = directives.reduce(
-				( obj, [ name, ns, value ] ) => {
-					const [ , prefix, suffix = 'default' ] =
-						directiveParser.exec( name );
-					if ( ! obj[ prefix ] ) obj[ prefix ] = [];
-					obj[ prefix ].push( {
-						namespace: ns ?? namespace,
-						value,
-						suffix,
-					} );
-					return obj;
-				},
-				{}
-			);
-		}
-
-		let child = treeWalker.firstChild();
-		if ( child ) {
-			while ( child ) {
-				const [ vnode, nextChild ] = walk( child );
-				if ( vnode ) children.push( vnode );
-				child = nextChild || treeWalker.nextSibling();
-			}
-			treeWalker.parentNode();
-		}
-
-		return [ h( node.localName, props, children ) ];
-	}
-
-	return walk( treeWalker.currentNode );
-}
diff --git a/packages/interactivity/src/vdom.ts b/packages/interactivity/src/vdom.ts
new file mode 100644
index 00000000000000..9a1ec7ec5d76f0
--- /dev/null
+++ b/packages/interactivity/src/vdom.ts
@@ -0,0 +1,191 @@
+/**
+ * External dependencies
+ */
+import { h, type ComponentChild, type JSX } from 'preact';
+/**
+ * Internal dependencies
+ */
+import { directivePrefix as p } from './constants';
+import { warn } from './utils';
+import { type DirectiveEntry } from './hooks';
+
+const ignoreAttr = `data-${ p }-ignore`;
+const islandAttr = `data-${ p }-interactive`;
+const fullPrefix = `data-${ p }-`;
+const namespaces: Array< string | null > = [];
+const currentNamespace = () => namespaces[ namespaces.length - 1 ] ?? null;
+const isObject = ( item: unknown ): item is Record< string, unknown > =>
+	Boolean( item && typeof item === 'object' && item.constructor === Object );
+
+// Regular expression for directive parsing.
+const directiveParser = new RegExp(
+	`^data-${ p }-` + // ${p} must be a prefix string, like 'wp'.
+		// Match alphanumeric characters including hyphen-separated
+		// segments. It excludes underscore intentionally to prevent confusion.
+		// E.g., "custom-directive".
+		'([a-z0-9]+(?:-[a-z0-9]+)*)' +
+		// (Optional) Match '--' followed by any alphanumeric charachters. It
+		// excludes underscore intentionally to prevent confusion, but it can
+		// contain multiple hyphens. E.g., "--custom-prefix--with-more-info".
+		'(?:--([a-z0-9_-]+))?$',
+	'i' // Case insensitive.
+);
+
+// Regular expression for reference parsing. It can contain a namespace before
+// the reference, separated by `::`, like `some-namespace::state.somePath`.
+// Namespaces can contain any alphanumeric characters, hyphens, underscores or
+// forward slashes. References don't have any restrictions.
+const nsPathRegExp = /^([\w_\/-]+)::(.+)$/;
+
+export const hydratedIslands = new WeakSet();
+
+/**
+ * Recursive function that transforms a DOM tree into vDOM.
+ *
+ * @param root The root element or node to start traversing on.
+ * @return The resulting vDOM tree.
+ */
+export function toVdom( root: Node ): Array< ComponentChild > {
+	const treeWalker = document.createTreeWalker(
+		root,
+		205 // TEXT + CDATA_SECTION + COMMENT + PROCESSING_INSTRUCTION + ELEMENT
+	);
+
+	function walk(
+		node: Node
+	): [ ComponentChild ] | [ ComponentChild, Node | null ] {
+		const { nodeType } = node;
+
+		// TEXT_NODE (3)
+		if ( nodeType === 3 ) {
+			return [ ( node as Text ).data ];
+		}
+
+		// CDATA_SECTION_NODE (4)
+		if ( nodeType === 4 ) {
+			const next = treeWalker.nextSibling();
+			( node as CDATASection ).replaceWith(
+				new window.Text( ( node as CDATASection ).nodeValue ?? '' )
+			);
+			return [ node.nodeValue, next ];
+		}
+
+		// COMMENT_NODE (8) || PROCESSING_INSTRUCTION_NODE (7)
+		if ( nodeType === 8 || nodeType === 7 ) {
+			const next = treeWalker.nextSibling();
+			( node as Comment | ProcessingInstruction ).remove();
+			return [ null, next ];
+		}
+
+		const elementNode = node as HTMLElement;
+		const { attributes } = elementNode;
+		const localName = elementNode.localName as keyof JSX.IntrinsicElements;
+
+		const props: Record< string, any > = {};
+		const children: Array< ComponentChild > = [];
+		const directives: Array<
+			[ name: string, namespace: string | null, value: unknown ]
+		> = [];
+		let ignore = false;
+		let island = false;
+
+		for ( let i = 0; i < attributes.length; i++ ) {
+			const attributeName = attributes[ i ].name;
+			const attributeValue = attributes[ i ].value;
+			if (
+				attributeName[ fullPrefix.length ] &&
+				attributeName.slice( 0, fullPrefix.length ) === fullPrefix
+			) {
+				if ( attributeName === ignoreAttr ) {
+					ignore = true;
+				} else {
+					const regexResult = nsPathRegExp.exec( attributeValue );
+					const namespace = regexResult?.[ 1 ] ?? null;
+					let value: any = regexResult?.[ 2 ] ?? attributeValue;
+					try {
+						const parsedValue = JSON.parse( value );
+						value = isObject( parsedValue ) ? parsedValue : value;
+					} catch {}
+					if ( attributeName === islandAttr ) {
+						island = true;
+						const islandNamespace =
+							// eslint-disable-next-line no-nested-ternary
+							typeof value === 'string'
+								? value
+								: typeof value?.namespace === 'string'
+								? value.namespace
+								: null;
+						namespaces.push( islandNamespace );
+					} else {
+						directives.push( [ attributeName, namespace, value ] );
+					}
+				}
+			} else if ( attributeName === 'ref' ) {
+				continue;
+			}
+			props[ attributeName ] = attributeValue;
+		}
+
+		if ( ignore && ! island ) {
+			return [
+				h< any, any >( localName, {
+					...props,
+					innerHTML: elementNode.innerHTML,
+					__directives: { ignore: true },
+				} ),
+			];
+		}
+		if ( island ) {
+			hydratedIslands.add( elementNode );
+		}
+
+		if ( directives.length ) {
+			props.__directives = directives.reduce<
+				Record< string, Array< DirectiveEntry > >
+			>( ( obj, [ name, ns, value ] ) => {
+				const directiveMatch = directiveParser.exec( name );
+				if ( directiveMatch === null ) {
+					warn( `Found malformed directive name: ${ name }.` );
+					return obj;
+				}
+				const prefix = directiveMatch[ 1 ] || '';
+				const suffix = directiveMatch[ 2 ] || null;
+
+				obj[ prefix ] = obj[ prefix ] || [];
+				obj[ prefix ].push( {
+					namespace: ns ?? currentNamespace()!,
+					value: value as DirectiveEntry[ 'value' ],
+					suffix,
+				} );
+				return obj;
+			}, {} );
+		}
+
+		if ( localName === 'template' ) {
+			props.content = [
+				...( elementNode as HTMLTemplateElement ).content.childNodes,
+			].map( ( childNode ) => toVdom( childNode ) );
+		} else {
+			let child = treeWalker.firstChild();
+			if ( child ) {
+				while ( child ) {
+					const [ vnode, nextChild ] = walk( child );
+					if ( vnode ) {
+						children.push( vnode );
+					}
+					child = nextChild || treeWalker.nextSibling();
+				}
+				treeWalker.parentNode();
+			}
+		}
+
+		// Restore previous namespace.
+		if ( island ) {
+			namespaces.pop();
+		}
+
+		return [ h( localName, props, children ) ];
+	}
+
+	return walk( treeWalker.currentNode );
+}
diff --git a/packages/interactivity/tsconfig.json b/packages/interactivity/tsconfig.json
index bcb26904e1d09d..1d154e2089065d 100644
--- a/packages/interactivity/tsconfig.json
+++ b/packages/interactivity/tsconfig.json
@@ -1,10 +1,11 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
 		"declarationDir": "build-types",
-		"checkJs": false,
-		"strict": false
+
+		"noImplicitAny": false
 	},
 	"include": [ "src/**/*" ]
 }
diff --git a/packages/interactivity/tsconfig.test.json b/packages/interactivity/tsconfig.test.json
new file mode 100644
index 00000000000000..6a90abc2ba2210
--- /dev/null
+++ b/packages/interactivity/tsconfig.test.json
@@ -0,0 +1,13 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig.json",
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"noEmit": true,
+		"emitDeclarationOnly": false,
+		"types": [ "jest" ]
+	},
+	"references": [ { "path": "./tsconfig.json" } ],
+	"files": [ "src/test/store.ts" ],
+	"exclude": []
+}
diff --git a/packages/interface/.npmrc b/packages/interface/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/interface/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/interface/CHANGELOG.md b/packages/interface/CHANGELOG.md
index e160bb6cef4b99..ea748e80a9eb6a 100644
--- a/packages/interface/CHANGELOG.md
+++ b/packages/interface/CHANGELOG.md
@@ -2,6 +2,70 @@
 
 ## Unreleased
 
+### Breaking Changes
+
+-   Removed `smallScreenTitle` prop from the `ComplementaryArea` component ([#64474](https://github.com/WordPress/gutenberg/pull/64474)).
+
+## 7.0.0 (2024-10-16)
+
+### Breaking Changes
+
+-   `InterfaceSkeleton` no longer supports region navigation and its props `enableRegionNavigation` and `shortcuts` are removed. ([#63611](https://github.com/WordPress/gutenberg/pull/63611)). It’s recommended to add region navigation with the higher-order component `navigateRegions` or the hook `__unstableUseNavigateRegions` from `@wordpress/components`.
+
+## 6.9.0 (2024-10-03)
+
+## 6.8.0 (2024-09-19)
+
+## 6.7.0 (2024-09-05)
+
+## 6.6.0 (2024-08-21)
+
+## 6.5.0 (2024-08-07)
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 5.35.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 5.34.0 (2024-05-02)
+
+## 5.33.0 (2024-04-19)
+
+## 5.32.0 (2024-04-03)
+
+## 5.31.0 (2024-03-21)
+
+## 5.30.0 (2024-03-06)
+
+### Breaking Changes
+
+-   Removed `MoreMenuDropdown` component ([#59095](https://github.com/WordPress/gutenberg/pull/59095)).
+
+## 5.29.0 (2024-02-21)
+
+## 5.28.0 (2024-02-09)
+
+## 5.27.0 (2024-01-24)
+
+## 5.26.0 (2024-01-10)
+
+## 5.25.0 (2023-12-13)
+
 ## 5.24.0 (2023-11-29)
 
 ## 5.23.0 (2023-11-16)
@@ -96,7 +160,7 @@
 
 ## 4.2.1 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/deprecated` dependency ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -104,13 +168,13 @@
 
 ## 4.1.0 (2021-09-09)
 
-### New Feature
+### New Features
 
 -   Add support for editor 'feature' preferences. Adds an `isFeatureActive` selector, a `toggleFeature` action, a `MoreMenuDropdown` component, and a `MoreMenuFeatureToggle` component. ([#33774](https://github.com/WordPress/gutenberg/pull/33774)).
 
 ## 4.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -122,8 +186,8 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 
 ## 2.0.0 (2021-04-06)
 
@@ -145,7 +209,7 @@
 
 ## 0.11.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the interface namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
diff --git a/packages/interface/README.md b/packages/interface/README.md
index 915be856af178d..27226850badb58 100644
--- a/packages/interface/README.md
+++ b/packages/interface/README.md
@@ -27,25 +27,25 @@ Below are some examples of how to control the active complementary area using th
 ```js
 wp.data
 	.select( 'core/interface' )
-	.getActiveComplementaryArea( 'core/edit-post' );
+	.getActiveComplementaryArea( 'core' );
 // -> "edit-post/document"
 
 wp.data
 	.dispatch( 'core/interface' )
-	.enableComplementaryArea( 'core/edit-post', 'edit-post/block' );
+	.enableComplementaryArea( 'core', 'edit-post/block' );
 
 wp.data
 	.select( 'core/interface' )
-	.getActiveComplementaryArea( 'core/edit-post' );
+	.getActiveComplementaryArea( 'core' );
 // -> "edit-post/block"
 
 wp.data
 	.dispatch( 'core/interface' )
-	.disableComplementaryArea( 'core/edit-post' );
+	.disableComplementaryArea( 'core' );
 
 wp.data
 	.select( 'core/interface' )
-	.getActiveComplementaryArea( 'core/edit-post' );
+	.getActiveComplementaryArea( 'core' );
 // -> null
 ```
 
@@ -56,17 +56,17 @@ wp.data
 Example usage: `ComplementaryArea` component makes use of `PinnedItems` and automatically adds a pinned item for the complementary areas marked as a favorite.
 
 ```js
-wp.data.select( 'core/interface' ).isItemPinned( 'core/edit-post', 'edit-post-block-patterns/block-patterns-sidebar' );
+wp.data.select( 'core/interface' ).isItemPinned( 'core', 'edit-post-block-patterns/block-patterns-sidebar' );
 // -> false
 
-wp.data.dispatch( 'core/interface' ).pinItem( 'core/edit-post', 'edit-post-block-patterns/block-patterns-sidebar' );
+wp.data.dispatch( 'core/interface' ).pinItem( 'core', 'edit-post-block-patterns/block-patterns-sidebar' );
 
-wp.data.select( 'core/interface' ).isItemPinned( 'core/edit-post', 'edit-post-block-patterns/block-patterns-sidebar' );
+wp.data.select( 'core/interface' ).isItemPinned( 'core', 'edit-post-block-patterns/block-patterns-sidebar' );
 // -> true
 
-wp.data.dispatch( 'core/interface' ).unpinItem( 'core/edit-post', 'edit-post-block-patterns/block-patterns-sidebar' );
+wp.data.dispatch( 'core/interface' ).unpinItem( 'core', 'edit-post-block-patterns/block-patterns-sidebar' );
 
-wp.data.select( 'core/interface' ).isItemPinned( 'core/edit-post', 'edit-post-block-patterns/block-patterns-sidebar' ); -> false
+wp.data.select( 'core/interface' ).isItemPinned( 'core', 'edit-post-block-patterns/block-patterns-sidebar' ); -> false
 ```
 
 ### Preferences
@@ -111,29 +111,6 @@ wp.data
 	.isFeatureActive( 'namespace/editor-or-plugin-name', 'myFeatureName' ); // false
 ```
 
-The `MoreMenuDropdown` and `MoreMenuFeatureToggle` components help to implement an editor menu for changing preferences and feature values.
-
-```jsx
-function MyEditorMenu() {
-	return (
-		<MoreMenuDropdown>
-			{ () => (
-				<MenuGroup label={ __( 'Features' ) }>
-					<MoreMenuFeatureToggle
-						scope="namespace/editor-or-plugin-name"
-						feature="myFeatureName"
-						label={ __( 'My feature' ) }
-						info={ __( 'A really awesome feature' ) }
-						messageActivated={ __( 'My feature activated' ) }
-						messageDeactivated={ __( 'My feature deactivated' ) }
-					/>
-				</MenuGroup>
-			) }
-		</MoreMenuDropdown>
-	);
-}
-```
-
 ## Contributing to this package
 
 This is an individual package that's part of the Gutenberg project. The project is organized as a monorepo. It's made up of multiple self-contained software packages, each with a specific purpose. The packages in this monorepo are published to [npm](https://www.npmjs.com/) and used by [WordPress](https://make.wordpress.org/core/) as well as other software projects.
diff --git a/packages/interface/complementary-area-context/index.js b/packages/interface/complementary-area-context/index.js
deleted file mode 100644
index bdfc6869e1e51d..00000000000000
--- a/packages/interface/complementary-area-context/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { withPluginContext } from '@wordpress/plugins';
-
-export default withPluginContext( ( context, ownProps ) => {
-	return {
-		icon: ownProps.icon || context.icon,
-		identifier:
-			ownProps.identifier || `${ context.name }/${ ownProps.name }`,
-	};
-} );
diff --git a/packages/interface/lock-unlock.js b/packages/interface/lock-unlock.js
new file mode 100644
index 00000000000000..1e5bb39ed18c6d
--- /dev/null
+++ b/packages/interface/lock-unlock.js
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+		'@wordpress/interface'
+	);
diff --git a/packages/interface/package.json b/packages/interface/package.json
index f59c65af7366be..e5870e0dfadfb2 100644
--- a/packages/interface/package.json
+++ b/packages/interface/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interface",
-	"version": "5.24.0",
+	"version": "7.0.0",
 	"description": "Interface module for WordPress. The package contains shared functionality across the modern JavaScript-based WordPress screens.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -31,19 +32,20 @@
 		"{src,build,build-module}/{index.js,store/index.js}"
 	],
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/plugins": "file:../plugins",
-		"@wordpress/preferences": "file:../preferences",
-		"@wordpress/viewport": "file:../viewport",
-		"classnames": "^2.3.1"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/plugins": "*",
+		"@wordpress/preferences": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/viewport": "*",
+		"clsx": "^2.1.1"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -51,5 +53,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/interface/src/components/complementary-area-context/index.js b/packages/interface/src/components/complementary-area-context/index.js
deleted file mode 100644
index bdfc6869e1e51d..00000000000000
--- a/packages/interface/src/components/complementary-area-context/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { withPluginContext } from '@wordpress/plugins';
-
-export default withPluginContext( ( context, ownProps ) => {
-	return {
-		icon: ownProps.icon || context.icon,
-		identifier:
-			ownProps.identifier || `${ context.name }/${ ownProps.name }`,
-	};
-} );
diff --git a/packages/interface/src/components/complementary-area-header/index.js b/packages/interface/src/components/complementary-area-header/index.js
index ca4e4ca5f07c4c..85670155086003 100644
--- a/packages/interface/src/components/complementary-area-header/index.js
+++ b/packages/interface/src/components/complementary-area-header/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -14,7 +14,6 @@ import { closeSmall } from '@wordpress/icons';
 import ComplementaryAreaToggle from '../complementary-area-toggle';
 
 const ComplementaryAreaHeader = ( {
-	smallScreenTitle,
 	children,
 	className,
 	toggleButtonProps,
@@ -23,27 +22,17 @@ const ComplementaryAreaHeader = ( {
 		<ComplementaryAreaToggle icon={ closeSmall } { ...toggleButtonProps } />
 	);
 	return (
-		<>
-			<div className="components-panel__header interface-complementary-area-header__small">
-				{ smallScreenTitle && (
-					<span className="interface-complementary-area-header__small-title">
-						{ smallScreenTitle }
-					</span>
-				) }
-				{ toggleButton }
-			</div>
-			<div
-				className={ classnames(
-					'components-panel__header',
-					'interface-complementary-area-header',
-					className
-				) }
-				tabIndex={ -1 }
-			>
-				{ children }
-				{ toggleButton }
-			</div>
-		</>
+		<div
+			className={ clsx(
+				'components-panel__header',
+				'interface-complementary-area-header',
+				className
+			) }
+			tabIndex={ -1 }
+		>
+			{ children }
+			{ toggleButton }
+		</div>
 	);
 };
 
diff --git a/packages/interface/src/components/complementary-area-header/style.scss b/packages/interface/src/components/complementary-area-header/style.scss
index 3eb5c897d668dc..ce602f369d2aed 100644
--- a/packages/interface/src/components/complementary-area-header/style.scss
+++ b/packages/interface/src/components/complementary-area-header/style.scss
@@ -1,41 +1,9 @@
-.components-panel__header.interface-complementary-area-header__small {
-	background: $white;
-	padding-right: $grid-unit-05;
-
-	.interface-complementary-area-header__small-title {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		width: 100%;
-	}
-
-	@include break-medium() {
-		display: none;
-	}
-}
-
 .interface-complementary-area-header {
 	background: $white;
-	padding-right: $grid-unit-05;
-
-	.components-button.has-icon {
-		display: none;
-		margin-left: auto;
-
-		~ .components-button {
-			margin-left: 0;
-		}
-
-		@include break-medium() {
-			display: flex;
-		}
-	}
-}
+	padding-right: $grid-unit-15; // Reduced padding to account for close buttons.
+	gap: $grid-unit-10; // Always ensure space between contents and close buttons.
 
-// This overrides the negative margins between two consecutives panels.
-// since the first panel is hidden.
-.components-panel__header + .interface-complementary-area-header {
-	@include break-medium() {
-		margin-top: 0;
+	.interface-complementary-area-header__title {
+		margin: 0;
 	}
 }
diff --git a/packages/interface/src/components/complementary-area-more-menu-item/README.md b/packages/interface/src/components/complementary-area-more-menu-item/README.md
index c1a1fe103ee7cf..a369f7c3f600cc 100644
--- a/packages/interface/src/components/complementary-area-more-menu-item/README.md
+++ b/packages/interface/src/components/complementary-area-more-menu-item/README.md
@@ -5,7 +5,7 @@ Props not referenced here are passed to the component used to render the menu it
 
 ### scope
 
-The scope of the complementary area e.g: "core/edit-post", "core/edit-site", "myplugin/custom-screen-a",
+The scope of the complementary area e.g: "core", "myplugin/custom-screen-a",
 
 -   Type: `String`
 -   Required: Yes
diff --git a/packages/interface/src/components/complementary-area-toggle/README.md b/packages/interface/src/components/complementary-area-toggle/README.md
index 53bdf04239f503..3baa880e8499a9 100644
--- a/packages/interface/src/components/complementary-area-toggle/README.md
+++ b/packages/interface/src/components/complementary-area-toggle/README.md
@@ -6,7 +6,7 @@
 
 ### scope
 
-The scope of the complementary area e.g: "core/edit-post", "core/edit-site", "myplugin/custom-screen-a",
+The scope of the complementary area e.g: "core", "myplugin/custom-screen-a",
 
 -   Type: `String`
 -   Required: Yes
diff --git a/packages/interface/src/components/complementary-area-toggle/index.js b/packages/interface/src/components/complementary-area-toggle/index.js
index b6690b7df5fc5d..40b4dd99be7432 100644
--- a/packages/interface/src/components/complementary-area-toggle/index.js
+++ b/packages/interface/src/components/complementary-area-toggle/index.js
@@ -3,35 +3,64 @@
  */
 import { Button } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
+import { usePluginContext } from '@wordpress/plugins';
 
 /**
  * Internal dependencies
  */
 import { store as interfaceStore } from '../../store';
-import complementaryAreaContext from '../complementary-area-context';
 
-function ComplementaryAreaToggle( {
+/**
+ * Whether the role supports checked state.
+ *
+ * @param {import('react').AriaRole} role Role.
+ * @return {boolean} Whether the role supports checked state.
+ * @see https://www.w3.org/TR/wai-aria-1.1/#aria-checked
+ */
+function roleSupportsCheckedState( role ) {
+	return [
+		'checkbox',
+		'option',
+		'radio',
+		'switch',
+		'menuitemcheckbox',
+		'menuitemradio',
+		'treeitem',
+	].includes( role );
+}
+
+export default function ComplementaryAreaToggle( {
 	as = Button,
 	scope,
-	identifier,
-	icon,
+	identifier: identifierProp,
+	icon: iconProp,
 	selectedIcon,
 	name,
+	shortcut,
 	...props
 } ) {
 	const ComponentToUse = as;
+	const context = usePluginContext();
+	const icon = iconProp || context.icon;
+	const identifier = identifierProp || `${ context.name }/${ name }`;
 	const isSelected = useSelect(
 		( select ) =>
 			select( interfaceStore ).getActiveComplementaryArea( scope ) ===
 			identifier,
 		[ identifier, scope ]
 	);
+
 	const { enableComplementaryArea, disableComplementaryArea } =
 		useDispatch( interfaceStore );
+
 	return (
 		<ComponentToUse
 			icon={ selectedIcon && isSelected ? selectedIcon : icon }
 			aria-controls={ identifier.replace( '/', ':' ) }
+			// Make sure aria-checked matches spec https://www.w3.org/TR/wai-aria-1.1/#aria-checked
+			aria-checked={
+				roleSupportsCheckedState( props.role ) ? isSelected : undefined
+			}
 			onClick={ () => {
 				if ( isSelected ) {
 					disableComplementaryArea( scope );
@@ -39,9 +68,8 @@ function ComplementaryAreaToggle( {
 					enableComplementaryArea( scope, identifier );
 				}
 			} }
+			shortcut={ shortcut }
 			{ ...props }
 		/>
 	);
 }
-
-export default complementaryAreaContext( ComplementaryAreaToggle );
diff --git a/packages/interface/src/components/complementary-area/README.md b/packages/interface/src/components/complementary-area/README.md
index bca534b30af970..b270da23931a22 100644
--- a/packages/interface/src/components/complementary-area/README.md
+++ b/packages/interface/src/components/complementary-area/README.md
@@ -79,19 +79,11 @@ A className passed to the panel that contains the contents of the sidebar.
 
 ### scope
 
-The scope of the complementary area e.g: "core/edit-post", "core/edit-site", "myplugin/custom-screen-a",
+The scope of the complementary area e.g: "core", "myplugin/custom-screen-a",
 
 -   Type: `String`
 -   Required: Yes
 
-### smallScreenTitle
-
-In small screens, the complementary area may take up the entire screen.
-`smallScreenTitle` allows displaying a title above the complementary area, so the user is more aware of what the area refers to.
-
--   Type: `String`
--   Required: No
-
 ### title
 
 Human friendly title of the complementary area.
@@ -114,7 +106,7 @@ A slot that renders the currently active ComplementaryArea.
 
 ### scope
 
-The scope of the complementary area e.g: "core/edit-post", "core/edit-site", "myplugin/custom-screen-a",
+The scope of the complementary area e.g: "core", "myplugin/custom-screen-a",
 
 -   Type: `String`
 -   Required: Yes
diff --git a/packages/interface/src/components/complementary-area/index.js b/packages/interface/src/components/complementary-area/index.js
index af6456bec09663..ff4c3eb1469789 100644
--- a/packages/interface/src/components/complementary-area/index.js
+++ b/packages/interface/src/components/complementary-area/index.js
@@ -1,17 +1,31 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
-import { Button, Panel, Slot, Fill } from '@wordpress/components';
+import {
+	Button,
+	Panel,
+	Slot,
+	Fill,
+	__unstableMotion as motion,
+	__unstableAnimatePresence as AnimatePresence,
+} from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { check, starEmpty, starFilled } from '@wordpress/icons';
-import { useEffect, useRef } from '@wordpress/element';
+import { useEffect, useRef, useState } from '@wordpress/element';
 import { store as viewportStore } from '@wordpress/viewport';
+import { store as preferencesStore } from '@wordpress/preferences';
+import {
+	useReducedMotion,
+	useViewportMatch,
+	usePrevious,
+} from '@wordpress/compose';
+import { usePluginContext } from '@wordpress/plugins';
 
 /**
  * Internal dependencies
@@ -19,20 +33,81 @@ import { store as viewportStore } from '@wordpress/viewport';
 import ComplementaryAreaHeader from '../complementary-area-header';
 import ComplementaryAreaMoreMenuItem from '../complementary-area-more-menu-item';
 import ComplementaryAreaToggle from '../complementary-area-toggle';
-import withComplementaryAreaContext from '../complementary-area-context';
 import PinnedItems from '../pinned-items';
 import { store as interfaceStore } from '../../store';
 
+const ANIMATION_DURATION = 0.3;
+
 function ComplementaryAreaSlot( { scope, ...props } ) {
 	return <Slot name={ `ComplementaryArea/${ scope }` } { ...props } />;
 }
 
-function ComplementaryAreaFill( { scope, children, className, id } ) {
+const SIDEBAR_WIDTH = 280;
+const variants = {
+	open: { width: SIDEBAR_WIDTH },
+	closed: { width: 0 },
+	mobileOpen: { width: '100vw' },
+};
+
+function ComplementaryAreaFill( {
+	activeArea,
+	isActive,
+	scope,
+	children,
+	className,
+	id,
+} ) {
+	const disableMotion = useReducedMotion();
+	const isMobileViewport = useViewportMatch( 'medium', '<' );
+	// This is used to delay the exit animation to the next tick.
+	// The reason this is done is to allow us to apply the right transition properties
+	// When we switch from an open sidebar to another open sidebar.
+	// we don't want to animate in this case.
+	const previousActiveArea = usePrevious( activeArea );
+	const previousIsActive = usePrevious( isActive );
+	const [ , setState ] = useState( {} );
+	useEffect( () => {
+		setState( {} );
+	}, [ isActive ] );
+	const transition = {
+		type: 'tween',
+		duration:
+			disableMotion ||
+			isMobileViewport ||
+			( !! previousActiveArea &&
+				!! activeArea &&
+				activeArea !== previousActiveArea )
+				? 0
+				: ANIMATION_DURATION,
+		ease: [ 0.6, 0, 0.4, 1 ],
+	};
+
 	return (
 		<Fill name={ `ComplementaryArea/${ scope }` }>
-			<div id={ id } className={ className }>
-				{ children }
-			</div>
+			<AnimatePresence initial={ false }>
+				{ ( previousIsActive || isActive ) && (
+					<motion.div
+						variants={ variants }
+						initial="closed"
+						animate={ isMobileViewport ? 'mobileOpen' : 'open' }
+						exit="closed"
+						transition={ transition }
+						className="interface-complementary-area__fill"
+					>
+						<div
+							id={ id }
+							className={ className }
+							style={ {
+								width: isMobileViewport
+									? '100vw'
+									: SIDEBAR_WIDTH,
+							} }
+						>
+							{ children }
+						</div>
+					</motion.div>
+				) }
+			</AnimatePresence>
 		</Fill>
 	);
 }
@@ -44,42 +119,42 @@ function useAdjustComplementaryListener(
 	isActive,
 	isSmall
 ) {
-	const previousIsSmall = useRef( false );
-	const shouldOpenWhenNotSmall = useRef( false );
+	const previousIsSmallRef = useRef( false );
+	const shouldOpenWhenNotSmallRef = useRef( false );
 	const { enableComplementaryArea, disableComplementaryArea } =
 		useDispatch( interfaceStore );
 	useEffect( () => {
 		// If the complementary area is active and the editor is switching from
 		// a big to a small window size.
-		if ( isActive && isSmall && ! previousIsSmall.current ) {
+		if ( isActive && isSmall && ! previousIsSmallRef.current ) {
 			disableComplementaryArea( scope );
 			// Flag the complementary area to be reopened when the window size
 			// goes from small to big.
-			shouldOpenWhenNotSmall.current = true;
+			shouldOpenWhenNotSmallRef.current = true;
 		} else if (
 			// If there is a flag indicating the complementary area should be
 			// enabled when we go from small to big window size and we are going
 			// from a small to big window size.
-			shouldOpenWhenNotSmall.current &&
+			shouldOpenWhenNotSmallRef.current &&
 			! isSmall &&
-			previousIsSmall.current
+			previousIsSmallRef.current
 		) {
 			// Remove the flag indicating the complementary area should be
 			// enabled.
-			shouldOpenWhenNotSmall.current = false;
+			shouldOpenWhenNotSmallRef.current = false;
 			enableComplementaryArea( scope, identifier );
 		} else if (
 			// If the flag is indicating the current complementary should be
 			// reopened but another complementary area becomes active, remove
 			// the flag.
-			shouldOpenWhenNotSmall.current &&
+			shouldOpenWhenNotSmallRef.current &&
 			activeArea &&
 			activeArea !== identifier
 		) {
-			shouldOpenWhenNotSmall.current = false;
+			shouldOpenWhenNotSmallRef.current = false;
 		}
-		if ( isSmall !== previousIsSmall.current ) {
-			previousIsSmall.current = isSmall;
+		if ( isSmall !== previousIsSmallRef.current ) {
+			previousIsSmallRef.current = isSmall;
 		}
 	}, [
 		isActive,
@@ -96,43 +171,61 @@ function ComplementaryArea( {
 	children,
 	className,
 	closeLabel = __( 'Close plugin' ),
-	identifier,
+	identifier: identifierProp,
 	header,
 	headerClassName,
-	icon,
+	icon: iconProp,
 	isPinnable = true,
 	panelClassName,
 	scope,
 	name,
-	smallScreenTitle,
 	title,
 	toggleShortcut,
 	isActiveByDefault,
-	showIconLabels = false,
 } ) {
-	const { isLoading, isActive, isPinned, activeArea, isSmall, isLarge } =
-		useSelect(
-			( select ) => {
-				const {
-					getActiveComplementaryArea,
-					isComplementaryAreaLoading,
-					isItemPinned,
-				} = select( interfaceStore );
+	const context = usePluginContext();
+	const icon = iconProp || context.icon;
+	const identifier = identifierProp || `${ context.name }/${ name }`;
 
-				const _activeArea = getActiveComplementaryArea( scope );
+	// This state is used to delay the rendering of the Fill
+	// until the initial effect runs.
+	// This prevents the animation from running on mount if
+	// the complementary area is active by default.
+	const [ isReady, setIsReady ] = useState( false );
+	const {
+		isLoading,
+		isActive,
+		isPinned,
+		activeArea,
+		isSmall,
+		isLarge,
+		showIconLabels,
+	} = useSelect(
+		( select ) => {
+			const {
+				getActiveComplementaryArea,
+				isComplementaryAreaLoading,
+				isItemPinned,
+			} = select( interfaceStore );
+			const { get } = select( preferencesStore );
+
+			const _activeArea = getActiveComplementaryArea( scope );
+
+			return {
+				isLoading: isComplementaryAreaLoading( scope ),
+				isActive: _activeArea === identifier,
+				isPinned: isItemPinned( scope, identifier ),
+				activeArea: _activeArea,
+				isSmall: select( viewportStore ).isViewportMatch( '< medium' ),
+				isLarge: select( viewportStore ).isViewportMatch( 'large' ),
+				showIconLabels: get( 'core', 'showIconLabels' ),
+			};
+		},
+		[ identifier, scope ]
+	);
+
+	const isMobileViewport = useViewportMatch( 'medium', '<' );
 
-				return {
-					isLoading: isComplementaryAreaLoading( scope ),
-					isActive: _activeArea === identifier,
-					isPinned: isItemPinned( scope, identifier ),
-					activeArea: _activeArea,
-					isSmall:
-						select( viewportStore ).isViewportMatch( '< medium' ),
-					isLarge: select( viewportStore ).isViewportMatch( 'large' ),
-				};
-			},
-			[ identifier, scope ]
-		);
 	useAdjustComplementaryListener(
 		scope,
 		identifier,
@@ -155,6 +248,7 @@ function ComplementaryArea( {
 		} else if ( activeArea === undefined && isSmall ) {
 			disableComplementaryArea( scope, identifier );
 		}
+		setIsReady( true );
 	}, [
 		activeArea,
 		isActiveByDefault,
@@ -165,6 +259,10 @@ function ComplementaryArea( {
 		disableComplementaryArea,
 	] );
 
+	if ( ! isReady ) {
+		return;
+	}
+
 	return (
 		<>
 			{ isPinnable && (
@@ -183,6 +281,7 @@ function ComplementaryArea( {
 							showTooltip={ ! showIconLabels }
 							variant={ showIconLabels ? 'tertiary' : undefined }
 							size="compact"
+							shortcut={ toggleShortcut }
 						/>
 					) }
 				</PinnedItems>
@@ -196,64 +295,59 @@ function ComplementaryArea( {
 					{ title }
 				</ComplementaryAreaMoreMenuItem>
 			) }
-			{ isActive && (
-				<ComplementaryAreaFill
-					className={ classnames(
-						'interface-complementary-area',
-						className
-					) }
-					scope={ scope }
-					id={ identifier.replace( '/', ':' ) }
+			<ComplementaryAreaFill
+				activeArea={ activeArea }
+				isActive={ isActive }
+				className={ clsx( 'interface-complementary-area', className ) }
+				scope={ scope }
+				id={ identifier.replace( '/', ':' ) }
+			>
+				<ComplementaryAreaHeader
+					className={ headerClassName }
+					closeLabel={ closeLabel }
+					onClose={ () => disableComplementaryArea( scope ) }
+					toggleButtonProps={ {
+						label: closeLabel,
+						size: 'small',
+						shortcut: toggleShortcut,
+						scope,
+						identifier,
+					} }
 				>
-					<ComplementaryAreaHeader
-						className={ headerClassName }
-						closeLabel={ closeLabel }
-						onClose={ () => disableComplementaryArea( scope ) }
-						smallScreenTitle={ smallScreenTitle }
-						toggleButtonProps={ {
-							label: closeLabel,
-							shortcut: toggleShortcut,
-							scope,
-							identifier,
-						} }
-					>
-						{ header || (
-							<>
-								<strong>{ title }</strong>
-								{ isPinnable && (
-									<Button
-										className="interface-complementary-area__pin-unpin-item"
-										icon={
-											isPinned ? starFilled : starEmpty
-										}
-										label={
-											isPinned
-												? __( 'Unpin from toolbar' )
-												: __( 'Pin to toolbar' )
-										}
-										onClick={ () =>
-											( isPinned ? unpinItem : pinItem )(
-												scope,
-												identifier
-											)
-										}
-										isPressed={ isPinned }
-										aria-expanded={ isPinned }
-									/>
-								) }
-							</>
-						) }
-					</ComplementaryAreaHeader>
-					<Panel className={ panelClassName }>{ children }</Panel>
-				</ComplementaryAreaFill>
-			) }
+					{ header || (
+						<>
+							<h2 className="interface-complementary-area-header__title">
+								{ title }
+							</h2>
+							{ isPinnable && ! isMobileViewport && (
+								<Button
+									className="interface-complementary-area__pin-unpin-item"
+									icon={ isPinned ? starFilled : starEmpty }
+									label={
+										isPinned
+											? __( 'Unpin from toolbar' )
+											: __( 'Pin to toolbar' )
+									}
+									onClick={ () =>
+										( isPinned ? unpinItem : pinItem )(
+											scope,
+											identifier
+										)
+									}
+									isPressed={ isPinned }
+									aria-expanded={ isPinned }
+									size="compact"
+								/>
+							) }
+						</>
+					) }
+				</ComplementaryAreaHeader>
+				<Panel className={ panelClassName }>{ children }</Panel>
+			</ComplementaryAreaFill>
 		</>
 	);
 }
 
-const ComplementaryAreaWrapped =
-	withComplementaryAreaContext( ComplementaryArea );
-
-ComplementaryAreaWrapped.Slot = ComplementaryAreaSlot;
+ComplementaryArea.Slot = ComplementaryAreaSlot;
 
-export default ComplementaryAreaWrapped;
+export default ComplementaryArea;
diff --git a/packages/interface/src/components/complementary-area/style.scss b/packages/interface/src/components/complementary-area/style.scss
index 261080f29aacd1..1f769acb69f74d 100644
--- a/packages/interface/src/components/complementary-area/style.scss
+++ b/packages/interface/src/components/complementary-area/style.scss
@@ -1,6 +1,8 @@
 .interface-complementary-area {
 	background: $white;
 	color: $gray-900;
+	height: 100%;
+	overflow: auto;
 
 	@include break-small() {
 		-webkit-overflow-scrolling: touch;
@@ -22,21 +24,18 @@
 		top: 0;
 		z-index: z-index(".interface-complementary-area .components-panel__header");
 
-		&.edit-post-sidebar__panel-tabs {
-			top: $panel-header-height;
-
-			@include break-medium() {
-				top: 0;
-			}
+		&.editor-sidebar__panel-tabs {
+			top: 0;
 		}
 	}
 
-	p:not(.components-base-control__help) {
+	p:not(.components-base-control__help, .components-form-token-field__help) {
 		margin-top: 0;
 	}
 
 	h2 {
 		font-size: $default-font-size;
+		font-weight: 500;
 		color: $gray-900;
 		margin-bottom: 1.5em;
 	}
@@ -72,3 +71,7 @@
 		left: auto;
 	}
 }
+
+.interface-complementary-area__fill {
+	height: 100%;
+}
diff --git a/packages/interface/src/components/index.js b/packages/interface/src/components/index.js
index c9c2d09b3b3ab0..a96d3304db7c5a 100644
--- a/packages/interface/src/components/index.js
+++ b/packages/interface/src/components/index.js
@@ -3,11 +3,5 @@ export { default as ComplementaryAreaMoreMenuItem } from './complementary-area-m
 export { default as FullscreenMode } from './fullscreen-mode';
 export { default as InterfaceSkeleton } from './interface-skeleton';
 export { default as PinnedItems } from './pinned-items';
-export { default as MoreMenuDropdown } from './more-menu-dropdown';
-export { default as MoreMenuFeatureToggle } from './more-menu-feature-toggle';
 export { default as ActionItem } from './action-item';
-export { default as PreferencesModal } from './preferences-modal';
-export { default as PreferencesModalTabs } from './preferences-modal-tabs';
-export { default as PreferencesModalSection } from './preferences-modal-section';
-export { default as ___unstablePreferencesModalBaseOption } from './preferences-modal-base-option';
 export { default as NavigableRegion } from './navigable-region';
diff --git a/packages/interface/src/components/interface-skeleton/index.js b/packages/interface/src/components/interface-skeleton/index.js
index baf98d153ed870..0a49db4f159d88 100644
--- a/packages/interface/src/components/interface-skeleton/index.js
+++ b/packages/interface/src/components/interface-skeleton/index.js
@@ -1,24 +1,35 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
  */
 import { forwardRef, useEffect } from '@wordpress/element';
 import {
-	__unstableUseNavigateRegions as useNavigateRegions,
 	__unstableMotion as motion,
+	__unstableAnimatePresence as AnimatePresence,
 } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useMergeRefs } from '@wordpress/compose';
+import { __, _x } from '@wordpress/i18n';
+import {
+	useReducedMotion,
+	useViewportMatch,
+	useResizeObserver,
+} from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import NavigableRegion from '../navigable-region';
 
+const ANIMATION_DURATION = 0.25;
+const commonTransition = {
+	type: 'tween',
+	duration: ANIMATION_DURATION,
+	ease: [ 0.6, 0, 0.4, 1 ],
+};
+
 function useHTMLClass( className ) {
 	useEffect( () => {
 		const element =
@@ -34,12 +45,30 @@ function useHTMLClass( className ) {
 }
 
 const headerVariants = {
-	hidden: { opacity: 0 },
-	hover: {
+	hidden: { opacity: 1, marginTop: -60 },
+	visible: { opacity: 1, marginTop: 0 },
+	distractionFreeHover: {
 		opacity: 1,
-		transition: { type: 'tween', delay: 0.2, delayChildren: 0.2 },
+		marginTop: 0,
+		transition: {
+			...commonTransition,
+			delay: 0.2,
+			delayChildren: 0.2,
+		},
+	},
+	distractionFreeHidden: {
+		opacity: 0,
+		marginTop: -60,
+	},
+	distractionFreeDisabled: {
+		opacity: 0,
+		marginTop: 0,
+		transition: {
+			...commonTransition,
+			delay: 0.8,
+			delayChildren: 0.8,
+		},
 	},
-	distractionFreeInactive: { opacity: 1, transition: { delay: 0 } },
 };
 
 function InterfaceSkeleton(
@@ -50,25 +79,27 @@ function InterfaceSkeleton(
 		editorNotices,
 		sidebar,
 		secondarySidebar,
-		notices,
 		content,
 		actions,
 		labels,
 		className,
-		enableRegionNavigation = true,
-		// Todo: does this need to be a prop.
-		// Can we use a dependency to keyboard-shortcuts directly?
-		shortcuts,
 	},
 	ref
 ) {
-	const navigateRegionsProps = useNavigateRegions( shortcuts );
-
+	const [ secondarySidebarResizeListener, secondarySidebarSize ] =
+		useResizeObserver();
+	const isMobileViewport = useViewportMatch( 'medium', '<' );
+	const disableMotion = useReducedMotion();
+	const defaultTransition = {
+		type: 'tween',
+		duration: disableMotion ? 0 : ANIMATION_DURATION,
+		ease: [ 0.6, 0, 0.4, 1 ],
+	};
 	useHTMLClass( 'interface-interface-skeleton__html-container' );
 
 	const defaultLabels = {
 		/* translators: accessibility text for the top bar landmark region. */
-		header: __( 'Header' ),
+		header: _x( 'Header', 'header landmark area' ),
 		/* translators: accessibility text for the content landmark region. */
 		body: __( 'Content' ),
 		/* translators: accessibility text for the secondary sidebar landmark region. */
@@ -85,68 +116,89 @@ function InterfaceSkeleton(
 
 	return (
 		<div
-			{ ...( enableRegionNavigation ? navigateRegionsProps : {} ) }
-			ref={ useMergeRefs( [
-				ref,
-				enableRegionNavigation ? navigateRegionsProps.ref : undefined,
-			] ) }
-			className={ classnames(
+			ref={ ref }
+			className={ clsx(
 				className,
 				'interface-interface-skeleton',
-				navigateRegionsProps.className,
 				!! footer && 'has-footer'
 			) }
 		>
 			<div className="interface-interface-skeleton__editor">
-				{ !! header && (
-					<NavigableRegion
-						as={ motion.div }
-						className="interface-interface-skeleton__header"
-						aria-label={ mergedLabels.header }
-						initial={
-							isDistractionFree
-								? 'hidden'
-								: 'distractionFreeInactive'
-						}
-						whileHover={
-							isDistractionFree
-								? 'hover'
-								: 'distractionFreeInactive'
-						}
-						animate={
-							isDistractionFree
-								? 'hidden'
-								: 'distractionFreeInactive'
-						}
-						variants={ headerVariants }
-						transition={
-							isDistractionFree
-								? { type: 'tween', delay: 0.8 }
-								: undefined
-						}
-					>
-						{ header }
-					</NavigableRegion>
-				) }
+				<AnimatePresence initial={ false }>
+					{ !! header && (
+						<NavigableRegion
+							as={ motion.div }
+							className="interface-interface-skeleton__header"
+							aria-label={ mergedLabels.header }
+							initial={
+								isDistractionFree && ! isMobileViewport
+									? 'distractionFreeHidden'
+									: 'hidden'
+							}
+							whileHover={
+								isDistractionFree && ! isMobileViewport
+									? 'distractionFreeHover'
+									: 'visible'
+							}
+							animate={
+								isDistractionFree && ! isMobileViewport
+									? 'distractionFreeDisabled'
+									: 'visible'
+							}
+							exit={
+								isDistractionFree && ! isMobileViewport
+									? 'distractionFreeHidden'
+									: 'hidden'
+							}
+							variants={ headerVariants }
+							transition={ defaultTransition }
+						>
+							{ header }
+						</NavigableRegion>
+					) }
+				</AnimatePresence>
 				{ isDistractionFree && (
 					<div className="interface-interface-skeleton__header">
 						{ editorNotices }
 					</div>
 				) }
 				<div className="interface-interface-skeleton__body">
-					{ !! secondarySidebar && (
-						<NavigableRegion
-							className="interface-interface-skeleton__secondary-sidebar"
-							ariaLabel={ mergedLabels.secondarySidebar }
-						>
-							{ secondarySidebar }
-						</NavigableRegion>
-					) }
-					{ !! notices && (
-						<div className="interface-interface-skeleton__notices">
-							{ notices }
-						</div>
-					) }
+					<AnimatePresence initial={ false }>
+						{ !! secondarySidebar && (
+							<NavigableRegion
+								className="interface-interface-skeleton__secondary-sidebar"
+								ariaLabel={ mergedLabels.secondarySidebar }
+								as={ motion.div }
+								initial="closed"
+								animate="open"
+								exit="closed"
+								variants={ {
+									open: { width: secondarySidebarSize.width },
+									closed: { width: 0 },
+								} }
+								transition={ defaultTransition }
+							>
+								<motion.div
+									style={ {
+										position: 'absolute',
+										width: isMobileViewport
+											? '100vw'
+											: 'fit-content',
+										height: '100%',
+										left: 0,
+									} }
+									variants={ {
+										open: { x: 0 },
+										closed: { x: '-100%' },
+									} }
+									transition={ defaultTransition }
+								>
+									{ secondarySidebarResizeListener }
+									{ secondarySidebar }
+								</motion.div>
+							</NavigableRegion>
+						) }
+					</AnimatePresence>
 					<NavigableRegion
 						className="interface-interface-skeleton__content"
 						ariaLabel={ mergedLabels.body }
diff --git a/packages/interface/src/components/interface-skeleton/style.scss b/packages/interface/src/components/interface-skeleton/style.scss
index d7ce996226ba59..fb150daceadc9e 100644
--- a/packages/interface/src/components/interface-skeleton/style.scss
+++ b/packages/interface/src/components/interface-skeleton/style.scss
@@ -5,8 +5,10 @@ html.interface-interface-skeleton__html-container {
 	width: 100%;
 
 	@include break-medium() {
-		position: initial;
-		width: initial;
+		&:not(:has(.is-zoom-out)) {
+			position: initial;
+			width: initial;
+		}
 	}
 }
 
@@ -43,6 +45,7 @@ html.interface-interface-skeleton__html-container {
 @include editor-left(".interface-interface-skeleton");
 
 .interface-interface-skeleton__body {
+	position: relative;
 	flex-grow: 1;
 	display: flex;
 
@@ -102,46 +105,45 @@ html.interface-interface-skeleton__html-container {
 	position: absolute;
 	z-index: z-index(".interface-interface-skeleton__sidebar");
 	top: 0;
-	right: 0;
-	bottom: 0;
 	left: 0;
+	bottom: 0;
 	background: $white;
 	color: $gray-900;
+	width: auto; // Keep the sidebar width flexible.
 
 	// On Mobile the header is fixed to keep HTML as scrollable.
 	@include break-medium() {
 		position: relative !important;
-		width: auto; // Keep the sidebar width flexible.
-
-		// Set this z-index only when the sidebar is opened. When it's closed, the
-		// button to open the sidebar that is shown when navigating regions needs to
-		// be above the footer. See `edit-post-layout__toggle-sidebar-panel`.
-		.is-sidebar-opened & {
-			z-index: z-index(".interface-interface-skeleton__sidebar {greater than small}");
-		}
 	}
 }
 
 .interface-interface-skeleton__sidebar {
-	overflow: auto;
+	border-top: $border-width solid $gray-200;
+	overflow: hidden;
 
 	@include break-medium() {
-		border-left: $border-width solid $gray-200;
+		box-shadow: -$border-width 0 0 0 rgba($color: #000, $alpha: 0.133); // 0.133 = $gray-200 but with alpha.
+		outline: 1px solid transparent; // Shown for Windows 10 High Contrast mode.
 	}
 }
 
 .interface-interface-skeleton__secondary-sidebar {
+	border-top: $border-width solid $gray-200;
+	right: 0;
+
 	@include break-medium() {
-		border-right: $border-width solid $gray-200;
+		box-shadow: $border-width 0 0 0 rgba($color: #000, $alpha: 0.133); // 0.133 = $gray-200 but with alpha.
+		outline: 1px solid transparent; // Shown for Windows 10 High Contrast mode.
 	}
 }
 
 .interface-interface-skeleton__header {
 	flex-shrink: 0;
 	height: auto;  // Keep the height flexible.
-	border-bottom: $border-width solid $gray-200;
+	box-shadow: 0 $border-width 0 0 rgba($color: #000, $alpha: 0.133); // 0.133 = $gray-200 but with alpha.
 	z-index: z-index(".interface-interface-skeleton__header");
 	color: $gray-900;
+	outline: 1px solid transparent; // Shown for Windows 10 High Contrast mode.
 }
 
 .interface-interface-skeleton__footer {
diff --git a/packages/interface/src/components/more-menu-dropdown/README.md b/packages/interface/src/components/more-menu-dropdown/README.md
deleted file mode 100644
index 712b1cb2645bb0..00000000000000
--- a/packages/interface/src/components/more-menu-dropdown/README.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# MoreMenuDropdown
-
-`MoreMenuDropdown` is a convenient component for rendering an editor 'more' menu. This is typically a menu that provides:
-
-- menu items for quick toggling editor preferences.
-- a way to open dialogs for keyboard shortcuts and editor preferences.
-- links to help.
-
-This component implements a `DropdownMenu` component from the `@wordpress/components` package.
-
-See also the `MoreMenuFeatureToggle` component in the `@wordpress/interface` package, which provides an easy way to implement a feature toggle as a child of this component. Use with the `MenuGroup`, `MenuItem`, `MenuItemsChoice` components from the `@wordpress/components` package to implement more advanced behaviors.
-
-Note that just like the `DropdownMenu` component, this component accepts a render callback, which child elements should be returned from.
-
-## Example
-
-```jsx
-function MyEditorMenu() {
-	return (
-		<MoreMenuDropdown>
-			{ () => (
-				<MenuGroup label={ __( 'Features' ) }>
-					<MoreMenuFeatureToggle
-						scope="namespace/editor-or-plugin-name"
-						feature="myFeatureName"
-						label={ __( 'My feature' ) }
-						info={ __( 'A really awesome feature' ) }
-						messageActivated={ __( 'My feature activated' )}
-						messageDeactivated={ __( 'My feature deactivated' )}
-					/>
-				</MenuGroup>
-			) }
-		</MoreMenuDropdown>
-	);
-}
-```
-
-## Props
-
-### as
-
-Provide a component that the dropdown should render as. This may be useful if you need `MoreMenuDropdown` to render a `ToolbarDropdownMenu` instead of a `DropdownMenu`. Defaults to `DropdownMenu`.
-
--   Type: `Component`
--   Required: No.
-
-### className
-
-Provide an additional class name to the dropdown component.
-
--   Type: `String`
--   Required: No
-
-### label
-
-Change the label of the button that opens the dropdown.
-
--   Default: 'Options'
--   Type: `String`
--   Required: No
-
-### popoverProps
-
-Override or extend the dropdown's popover props.
-
-See the documentation for the `DropdownMenu` and `Popover` components in the `@wordpress/components` package for more information.
-
--   Type: `Object`
--   Required: No
-
-### toggleProps
-
-Override or extend the dropdown's toggle props.
-
-See the documentation for the `DropdownMenu` and `Button` components in the `@wordpress/components` package for more information.
-
--   Type: `Object`
--   Required: No
diff --git a/packages/interface/src/components/more-menu-dropdown/index.js b/packages/interface/src/components/more-menu-dropdown/index.js
deleted file mode 100644
index dafa4b2e4b3b41..00000000000000
--- a/packages/interface/src/components/more-menu-dropdown/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { DropdownMenu } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { moreVertical } from '@wordpress/icons';
-
-export default function MoreMenuDropdown( {
-	as: DropdownComponent = DropdownMenu,
-	className,
-	/* translators: button label text should, if possible, be under 16 characters. */
-	label = __( 'Options' ),
-	popoverProps,
-	toggleProps,
-	children,
-} ) {
-	return (
-		<DropdownComponent
-			className={ classnames(
-				'interface-more-menu-dropdown',
-				className
-			) }
-			icon={ moreVertical }
-			label={ label }
-			popoverProps={ {
-				placement: 'bottom-end',
-				...popoverProps,
-				className: classnames(
-					'interface-more-menu-dropdown__content',
-					popoverProps?.className
-				),
-			} }
-			toggleProps={ {
-				tooltipPosition: 'bottom',
-				...toggleProps,
-				size: 'compact',
-			} }
-		>
-			{ ( onClose ) => children( onClose ) }
-		</DropdownComponent>
-	);
-}
diff --git a/packages/interface/src/components/more-menu-dropdown/style.scss b/packages/interface/src/components/more-menu-dropdown/style.scss
deleted file mode 100644
index 56852977fa05f7..00000000000000
--- a/packages/interface/src/components/more-menu-dropdown/style.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-.interface-more-menu-dropdown {
-	margin-left: -4px;
-
-	// the padding and margin of the more menu is intentionally non-standard
-	.components-button {
-		width: auto;
-		padding: 0 2px;
-	}
-
-	@include break-small() {
-		margin-left: 0;
-
-		.components-button {
-			padding: 0 4px;
-		}
-	}
-}
-
-.interface-more-menu-dropdown__content .components-popover__content {
-	min-width: 280px;
-
-	// Let the menu scale to fit items.
-	@include break-mobile() {
-		max-width: $break-mobile;
-	}
-
-	.components-dropdown-menu__menu {
-		padding: 0;
-	}
-}
-
-.components-popover.interface-more-menu-dropdown__content {
-	z-index: z-index(".components-popover.interface-more-menu__content");
-}
diff --git a/packages/interface/src/components/more-menu-feature-toggle/README.md b/packages/interface/src/components/more-menu-feature-toggle/README.md
deleted file mode 100644
index 685ff49da2934e..00000000000000
--- a/packages/interface/src/components/more-menu-feature-toggle/README.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# MoreMenuFeatureToggle
-
-`MoreMenuFeatureToggle` renders a menu item that can be used as a child of the `MoreMenuDropdown` component. The component
-is connected to the interface package's store, and will toggle the value of a 'feature' between true and false.
-
-This component implements a `MenuItem` component from the `@wordpress/components` package.
-
-## Props
-
-### scope
-
-The 'scope' of the feature. This is usually a namespaced string that represents the name of the editor (e.g. 'core/edit-post'), and often matches the name of the store for the editor.
-
--   Type: `String`
--   Required: Yes
-
-### feature
-
-The name of the feature to toggle (e.g. 'fixedToolbar').
-
--   Type: `String`
--   Required: Yes
-
-### label
-
-A human readable label for the feature.
-
--   Type: `String`
--   Required: Yes
-
-### info
-
-A human readable description of what this toggle does.
-
--   Type: `Object`
--   Required: No
-
-### messageActivated
-
-A message read by a screen reader when the feature is activated. (e.g. 'Fixed toolbar activated')
-
--   Type: `String`
--   Required: No
-
-### messageDeactivated
-
-A message read by a screen reader when the feature is deactivated. (e.g. 'Fixed toolbar deactivated')
-
--   Type: `String`
--   Required: No
-
-### shortcut
-
-A keyboard shortcut for the feature. This is just used for display purposes and the implementation of the shortcut should be handled separately.
-
-Consider using the `displayShortcut` helper from the `@wordpress/keycodes` package for this prop.
-
--   Type: `Array`
--   Required: No
diff --git a/packages/interface/src/components/more-menu-feature-toggle/index.js b/packages/interface/src/components/more-menu-feature-toggle/index.js
deleted file mode 100644
index f71e06802f508d..00000000000000
--- a/packages/interface/src/components/more-menu-feature-toggle/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { MenuItem } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { check } from '@wordpress/icons';
-import { speak } from '@wordpress/a11y';
-
-/**
- * Internal dependencies
- */
-import { store as interfaceStore } from '../../store';
-
-export default function MoreMenuFeatureToggle( {
-	scope,
-	label,
-	info,
-	messageActivated,
-	messageDeactivated,
-	shortcut,
-	feature,
-} ) {
-	const isActive = useSelect(
-		( select ) =>
-			select( interfaceStore ).isFeatureActive( scope, feature ),
-		[ feature, scope ]
-	);
-	const { toggleFeature } = useDispatch( interfaceStore );
-	const speakMessage = () => {
-		if ( isActive ) {
-			speak( messageDeactivated || __( 'Feature deactivated' ) );
-		} else {
-			speak( messageActivated || __( 'Feature activated' ) );
-		}
-	};
-
-	return (
-		<MenuItem
-			icon={ isActive && check }
-			isSelected={ isActive }
-			onClick={ () => {
-				toggleFeature( scope, feature );
-				speakMessage();
-			} }
-			role="menuitemcheckbox"
-			info={ info }
-			shortcut={ shortcut }
-		>
-			{ label }
-		</MenuItem>
-	);
-}
diff --git a/packages/interface/src/components/navigable-region/index.js b/packages/interface/src/components/navigable-region/index.js
index 23ff532f22fd35..50b98d49070d43 100644
--- a/packages/interface/src/components/navigable-region/index.js
+++ b/packages/interface/src/components/navigable-region/index.js
@@ -1,24 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
+
+const NavigableRegion = forwardRef(
+	( { children, className, ariaLabel, as: Tag = 'div', ...props }, ref ) => {
+		return (
+			<Tag
+				ref={ ref }
+				className={ clsx( 'interface-navigable-region', className ) }
+				aria-label={ ariaLabel }
+				role="region"
+				tabIndex="-1"
+				{ ...props }
+			>
+				{ children }
+			</Tag>
+		);
+	}
+);
 
-export default function NavigableRegion( {
-	children,
-	className,
-	ariaLabel,
-	as: Tag = 'div',
-	...props
-} ) {
-	return (
-		<Tag
-			className={ classnames( 'interface-navigable-region', className ) }
-			aria-label={ ariaLabel }
-			role="region"
-			tabIndex="-1"
-			{ ...props }
-		>
-			{ children }
-		</Tag>
-	);
-}
+NavigableRegion.displayName = 'NavigableRegion';
+export default NavigableRegion;
diff --git a/packages/interface/src/components/pinned-items/README.md b/packages/interface/src/components/pinned-items/README.md
index 4d6d1cb5053189..05c27b11a2f7a5 100644
--- a/packages/interface/src/components/pinned-items/README.md
+++ b/packages/interface/src/components/pinned-items/README.md
@@ -15,7 +15,7 @@ The content to be displayed for the pinned items. Most of the time, a button wit
 
 ### scope
 
-The scope of the pinned items area e.g: "core/edit-post", "core/edit-site", "myplugin/custom-screen-a",
+The scope of the pinned items area e.g: "core", "myplugin/custom-screen-a",
 
 -   Type: `String`
 -   Required: Yes
@@ -28,7 +28,7 @@ A slot that renders the pinned items.
 
 ### scope
 
-The scope of the pinned items area e.g: "core/edit-post", "core/edit-site", "myplugin/custom-screen-a",
+The scope of the pinned items area e.g: "core", "myplugin/custom-screen-a",
 
 -   Type: `String`
 -   Required: Yes
diff --git a/packages/interface/src/components/pinned-items/index.js b/packages/interface/src/components/pinned-items/index.js
index 2e7778302d9494..fb5ed3e6458b7e 100644
--- a/packages/interface/src/components/pinned-items/index.js
+++ b/packages/interface/src/components/pinned-items/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -18,7 +18,7 @@ function PinnedItemsSlot( { scope, className, ...props } ) {
 			{ ( fills ) =>
 				fills?.length > 0 && (
 					<div
-						className={ classnames(
+						className={ clsx(
 							className,
 							'interface-pinned-items'
 						) }
diff --git a/packages/interface/src/components/pinned-items/style.scss b/packages/interface/src/components/pinned-items/style.scss
index 66062b7fa3dbbf..d678e0ada8e73f 100644
--- a/packages/interface/src/components/pinned-items/style.scss
+++ b/packages/interface/src/components/pinned-items/style.scss
@@ -10,8 +10,7 @@
 		&[aria-controls="edit-post:document"],
 		&[aria-controls="edit-post:block"],
 		&[aria-controls="edit-site:template"],
-		&[aria-controls="edit-site:block-inspector"],
-		&[aria-controls="edit-site:global-styles"] {
+		&[aria-controls="edit-site:block-inspector"] {
 			display: flex;
 		}
 
@@ -27,7 +26,4 @@
 
 	// Gap between pinned items.
 	gap: $grid-unit-10;
-
-	// Account for larger grid from parent container gap.
-	margin-right: -$grid-unit-05;
 }
diff --git a/packages/interface/src/components/preferences-modal-base-option/README.md b/packages/interface/src/components/preferences-modal-base-option/README.md
deleted file mode 100644
index 03c89960b6850c..00000000000000
--- a/packages/interface/src/components/preferences-modal-base-option/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-#__unstablePreferencesModalBaseOption
-
-`__unstablePreferencesModalBaseOption` renders a toggle meant to be used with `PreferencesModal`. 
-
-This component implements a `ToggleControl` component from the `@wordpress/components` package.
-
-**It is an unstable component so is subject to breaking changes at any moment. Use at own risk.**
-
-## Example
-
-```jsx
-function MyEditorPreferencesOption() {
-	return (
-		<__unstablePreferencesModalBaseOption
-			label={ label }
-			isChecked={ isChecked }
-			onChange={ setIsChecked }
-		>
-			{ isChecked !== areCustomFieldsEnabled && (
-				<CustomFieldsConfirmation willEnable={ isChecked } />
-			) }
-		</__unstablePreferencesModalBaseOption>
-	)				
-}
-```
-
-## Props
-
-### help 
-### label 
-### isChecked 
-### onChange
-
-These props are passed directly to ToggleControl, so see [ToggleControl readme](https://github.com/WordPress/gutenberg/blob/trunk/packages/components/src/toggle-control/README.md) for more info.
-
-### children
-
-Components to be rendered as content.
-
--   Type: `Element`
--   Required: No.
-
diff --git a/packages/interface/src/components/preferences-modal-base-option/index.js b/packages/interface/src/components/preferences-modal-base-option/index.js
deleted file mode 100644
index 92346630d98aa2..00000000000000
--- a/packages/interface/src/components/preferences-modal-base-option/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { ToggleControl } from '@wordpress/components';
-
-function BaseOption( { help, label, isChecked, onChange, children } ) {
-	return (
-		<div className="interface-preferences-modal__option">
-			<ToggleControl
-				__nextHasNoMarginBottom
-				help={ help }
-				label={ label }
-				checked={ isChecked }
-				onChange={ onChange }
-			/>
-			{ children }
-		</div>
-	);
-}
-
-export default BaseOption;
diff --git a/packages/interface/src/components/preferences-modal-base-option/style.scss b/packages/interface/src/components/preferences-modal-base-option/style.scss
deleted file mode 100644
index 99587847193d38..00000000000000
--- a/packages/interface/src/components/preferences-modal-base-option/style.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.interface-preferences-modal__option {
-	& + & {
-		margin-top: $grid-unit-20;
-	}
-
-	.components-base-control__help {
-		margin-top: 0;
-		margin-left: 48px;
-	}
-}
diff --git a/packages/interface/src/components/preferences-modal-section/README.md b/packages/interface/src/components/preferences-modal-section/README.md
deleted file mode 100644
index 6e78ca05c0aa81..00000000000000
--- a/packages/interface/src/components/preferences-modal-section/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-
-`PreferencesModalSection` renders a section (as a fieldset) meant to be used with `PreferencesModal`.
-
-## Example
-
-See the `PreferencesModal` readme for usage info.
-
-
-## Props
-
-### title
-
-The title of the section
-
--   Type: `String`
--   Required: Yes.
-
-### description
-
-The description for the section.
-
--   Type: `String`
--   Required: No.
-
-### children
-
-Components to be rendered as content.
-
--   Type: `Element`
--   Required: Yes.
diff --git a/packages/interface/src/components/preferences-modal-section/index.js b/packages/interface/src/components/preferences-modal-section/index.js
deleted file mode 100644
index ea164128ea54cb..00000000000000
--- a/packages/interface/src/components/preferences-modal-section/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const Section = ( { description, title, children } ) => (
-	<fieldset className="interface-preferences-modal__section">
-		<legend className="interface-preferences-modal__section-legend">
-			<h2 className="interface-preferences-modal__section-title">
-				{ title }
-			</h2>
-			{ description && (
-				<p className="interface-preferences-modal__section-description">
-					{ description }
-				</p>
-			) }
-		</legend>
-		{ children }
-	</fieldset>
-);
-
-export default Section;
diff --git a/packages/interface/src/components/preferences-modal-section/style.scss b/packages/interface/src/components/preferences-modal-section/style.scss
deleted file mode 100644
index 1a45642a8b7af9..00000000000000
--- a/packages/interface/src/components/preferences-modal-section/style.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-.interface-preferences-modal__section {
-	margin: 0 0 2.5rem 0;
-
-	&:last-child {
-		margin: 0;
-	}
-}
-
-.interface-preferences-modal__section-legend {
-	margin-bottom: $grid-unit-10;
-}
-
-.interface-preferences-modal__section-title {
-	font-size: 0.9rem;
-	font-weight: 600;
-	margin-top: 0;
-}
-
-.interface-preferences-modal__section-description {
-	margin: -$grid-unit-10 0 $grid-unit-10 0;
-	font-size: $helptext-font-size;
-	font-style: normal;
-	color: $gray-700;
-}
diff --git a/packages/interface/src/components/preferences-modal-tabs/index.js b/packages/interface/src/components/preferences-modal-tabs/index.js
deleted file mode 100644
index bc8f7358b834d4..00000000000000
--- a/packages/interface/src/components/preferences-modal-tabs/index.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useViewportMatch } from '@wordpress/compose';
-import {
-	__experimentalNavigatorProvider as NavigatorProvider,
-	__experimentalNavigatorScreen as NavigatorScreen,
-	__experimentalNavigatorButton as NavigatorButton,
-	__experimentalNavigatorBackButton as NavigatorBackButton,
-	__experimentalItemGroup as ItemGroup,
-	__experimentalItem as Item,
-	__experimentalHStack as HStack,
-	__experimentalText as Text,
-	__experimentalTruncate as Truncate,
-	FlexItem,
-	TabPanel,
-	Card,
-	CardHeader,
-	CardBody,
-} from '@wordpress/components';
-import { useMemo, useCallback, useState } from '@wordpress/element';
-import { chevronLeft, chevronRight, Icon } from '@wordpress/icons';
-import { isRTL, __ } from '@wordpress/i18n';
-
-const PREFERENCES_MENU = 'preferences-menu';
-
-export default function PreferencesModalTabs( { sections } ) {
-	const isLargeViewport = useViewportMatch( 'medium' );
-
-	// This is also used to sync the two different rendered components
-	// between small and large viewports.
-	const [ activeMenu, setActiveMenu ] = useState( PREFERENCES_MENU );
-	/**
-	 * Create helper objects from `sections` for easier data handling.
-	 * `tabs` is used for creating the `TabPanel` and `sectionsContentMap`
-	 * is used for easier access to active tab's content.
-	 */
-	const { tabs, sectionsContentMap } = useMemo( () => {
-		let mappedTabs = {
-			tabs: [],
-			sectionsContentMap: {},
-		};
-		if ( sections.length ) {
-			mappedTabs = sections.reduce(
-				( accumulator, { name, tabLabel: title, content } ) => {
-					accumulator.tabs.push( { name, title } );
-					accumulator.sectionsContentMap[ name ] = content;
-					return accumulator;
-				},
-				{ tabs: [], sectionsContentMap: {} }
-			);
-		}
-		return mappedTabs;
-	}, [ sections ] );
-
-	const getCurrentTab = useCallback(
-		( tab ) => sectionsContentMap[ tab.name ] || null,
-		[ sectionsContentMap ]
-	);
-
-	let modalContent;
-	// We render different components based on the viewport size.
-	if ( isLargeViewport ) {
-		modalContent = (
-			<TabPanel
-				className="interface-preferences__tabs"
-				tabs={ tabs }
-				initialTabName={
-					activeMenu !== PREFERENCES_MENU ? activeMenu : undefined
-				}
-				onSelect={ setActiveMenu }
-				orientation="vertical"
-			>
-				{ getCurrentTab }
-			</TabPanel>
-		);
-	} else {
-		modalContent = (
-			<NavigatorProvider
-				initialPath="/"
-				className="interface-preferences__provider"
-			>
-				<NavigatorScreen path="/">
-					<Card isBorderless size="small">
-						<CardBody>
-							<ItemGroup>
-								{ tabs.map( ( tab ) => {
-									return (
-										<NavigatorButton
-											key={ tab.name }
-											path={ tab.name }
-											as={ Item }
-											isAction
-										>
-											<HStack justify="space-between">
-												<FlexItem>
-													<Truncate>
-														{ tab.title }
-													</Truncate>
-												</FlexItem>
-												<FlexItem>
-													<Icon
-														icon={
-															isRTL()
-																? chevronLeft
-																: chevronRight
-														}
-													/>
-												</FlexItem>
-											</HStack>
-										</NavigatorButton>
-									);
-								} ) }
-							</ItemGroup>
-						</CardBody>
-					</Card>
-				</NavigatorScreen>
-				{ sections.length &&
-					sections.map( ( section ) => {
-						return (
-							<NavigatorScreen
-								key={ `${ section.name }-menu` }
-								path={ section.name }
-							>
-								<Card isBorderless size="large">
-									<CardHeader
-										isBorderless={ false }
-										justify="left"
-										size="small"
-										gap="6"
-									>
-										<NavigatorBackButton
-											icon={
-												isRTL()
-													? chevronRight
-													: chevronLeft
-											}
-											aria-label={ __(
-												'Navigate to the previous view'
-											) }
-										/>
-										<Text size="16">
-											{ section.tabLabel }
-										</Text>
-									</CardHeader>
-									<CardBody>{ section.content }</CardBody>
-								</Card>
-							</NavigatorScreen>
-						);
-					} ) }
-			</NavigatorProvider>
-		);
-	}
-
-	return modalContent;
-}
diff --git a/packages/interface/src/components/preferences-modal-tabs/style.scss b/packages/interface/src/components/preferences-modal-tabs/style.scss
deleted file mode 100644
index 04b71f0a773a20..00000000000000
--- a/packages/interface/src/components/preferences-modal-tabs/style.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-$vertical-tabs-width: 160px;
-
-.interface-preferences__tabs {
-	.components-tab-panel__tabs {
-		position: absolute;
-		top: $header-height + $grid-unit-30;
-		// Aligns button text instead of button box.
-		left: $grid-unit-20;
-		width: $vertical-tabs-width;
-
-		.components-tab-panel__tabs-item {
-			border-radius: $radius-block-ui;
-			font-weight: 400;
-
-			&.is-active {
-				background: $gray-100;
-				box-shadow: none;
-				font-weight: 500;
-			}
-
-			&.is-active::after {
-				content: none;
-			}
-
-			&:focus:not(:disabled) {
-				box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-				// Windows high contrast mode.
-				outline: 2px solid transparent;
-			}
-
-			&:focus-visible::before {
-				content: none;
-			}
-		}
-	}
-
-	.components-tab-panel__tab-content {
-		padding-left: $grid-unit-30;
-		margin-left: $vertical-tabs-width;
-	}
-}
-
-@media (max-width: #{ ($break-medium - 1) }) {
-	// Keep the navigator component from overflowing the modal content area
-	// to ensure that sticky position elements stick where intended.
-	.interface-preferences__provider {
-		height: 100%;
-	}
-}
diff --git a/packages/interface/src/components/preferences-modal/README.md b/packages/interface/src/components/preferences-modal/README.md
deleted file mode 100644
index f873ccf297ec12..00000000000000
--- a/packages/interface/src/components/preferences-modal/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# PreferencesModal
-
-`PreferencesModal` renders a modal with editor preferences. It can take a `PreferencesModalTabs` component, which accepts multiple tabs, and/or other child components. On small viewports, the modal is fullscreen.
-
-This component implements a `Modal` component from the `@wordpress/components` package.
-
-Sections passed to this component should use `PreferencesModalSection` component from the `@wordpress/interface` package.
-
-
-## Example
-
-```jsx
-function MyEditorPreferencesModal() {
-	const { closeModal } = useDispatch( editPostStore );
-	const sections = [
-		{
-			name: 'section 1',
-			tabLabel: __( 'Section 1' ),
-			content: (
-						<PreferencesModalSection
-							title={ __( 'Publishing' ) }
-							description={ __(
-								'Change options related to publishing.'
-							) }
-						>
-							<EnablePublishSidebarOption
-								help={ __(
-									'Review settings, such as visibility and tags.'
-								) }
-								label={ __(
-									'Enable pre-publish flow'
-								) }
-							/>
-						</PreferencesModalSection>
-					)
-
-		}
-		{
-			name: 'section 2',
-			tabLabel: __( 'Section 2' ),
-			content: (
-						<PreferencesModalSection
-							title={ __( 'Additional' ) }
-							description={ __(
-								'Add extra areas to the editor.'
-							) }
-						>
-							// Section content here
-						</PreferencesModalSection>
-					)
-
-		}
-	]
-	return (
-		<PreferencesModal closeModal={ closeModal }>
-			<PreferencesModalTabs sections={ sections } />
-		<PreferencesModal />
-	);
-}
-```
-
-## Props
-
-### closeModal
-
-A function to call when closing the modal.
-
--   Type: `Function`
--   Required: Yes.
diff --git a/packages/interface/src/components/preferences-modal/index.js b/packages/interface/src/components/preferences-modal/index.js
deleted file mode 100644
index 99bb9d3c25dcf4..00000000000000
--- a/packages/interface/src/components/preferences-modal/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Modal } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-export default function PreferencesModal( { closeModal, children } ) {
-	return (
-		<Modal
-			className="interface-preferences-modal"
-			title={ __( 'Preferences' ) }
-			onRequestClose={ closeModal }
-		>
-			{ children }
-		</Modal>
-	);
-}
diff --git a/packages/interface/src/components/preferences-modal/style.scss b/packages/interface/src/components/preferences-modal/style.scss
deleted file mode 100644
index 4e70f9f817e644..00000000000000
--- a/packages/interface/src/components/preferences-modal/style.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-.interface-preferences-modal {
-	// To keep modal dimensions consistent as subsections are navigated, width
-	// and height are used instead of max-(width/height).
-	@include break-small() {
-		width: calc(100% - #{ $grid-unit-20 * 2 });
-		height: calc(100% - #{ $header-height * 2 });
-	}
-	@include break-medium() {
-		width: $break-medium - $grid-unit-20 * 2;
-	}
-	@include break-large() {
-		height: 70%;
-	}
-
-	// Clears spacing to flush fit the navigator component to the modal edges.
-	@media (max-width: #{ ($break-medium - 1) }) {
-		.components-modal__content {
-			padding: 0;
-		}
-	}
-}
diff --git a/packages/interface/src/store/actions.js b/packages/interface/src/store/actions.js
index b7a9935e888b51..7bd4493165a8b4 100644
--- a/packages/interface/src/store/actions.js
+++ b/packages/interface/src/store/actions.js
@@ -4,6 +4,14 @@
 import deprecated from '@wordpress/deprecated';
 import { store as preferencesStore } from '@wordpress/preferences';
 
+/**
+ * Internal dependencies
+ */
+import {
+	normalizeComplementaryAreaScope,
+	normalizeComplementaryAreaName,
+} from './deprecated';
+
 /**
  * Set a default complementary area.
  *
@@ -12,11 +20,15 @@ import { store as preferencesStore } from '@wordpress/preferences';
  *
  * @return {Object} Action object.
  */
-export const setDefaultComplementaryArea = ( scope, area ) => ( {
-	type: 'SET_DEFAULT_COMPLEMENTARY_AREA',
-	scope,
-	area,
-} );
+export const setDefaultComplementaryArea = ( scope, area ) => {
+	scope = normalizeComplementaryAreaScope( scope );
+	area = normalizeComplementaryAreaName( scope, area );
+	return {
+		type: 'SET_DEFAULT_COMPLEMENTARY_AREA',
+		scope,
+		area,
+	};
+};
 
 /**
  * Enable the complementary area.
@@ -31,6 +43,8 @@ export const enableComplementaryArea =
 		if ( ! area ) {
 			return;
 		}
+		scope = normalizeComplementaryAreaScope( scope );
+		area = normalizeComplementaryAreaName( scope, area );
 
 		const isComplementaryAreaVisible = registry
 			.select( preferencesStore )
@@ -57,6 +71,7 @@ export const enableComplementaryArea =
 export const disableComplementaryArea =
 	( scope ) =>
 	( { registry } ) => {
+		scope = normalizeComplementaryAreaScope( scope );
 		const isComplementaryAreaVisible = registry
 			.select( preferencesStore )
 			.get( scope, 'isComplementaryAreaVisible' );
@@ -84,6 +99,8 @@ export const pinItem =
 			return;
 		}
 
+		scope = normalizeComplementaryAreaScope( scope );
+		item = normalizeComplementaryAreaName( scope, item );
 		const pinnedItems = registry
 			.select( preferencesStore )
 			.get( scope, 'pinnedItems' );
@@ -113,6 +130,8 @@ export const unpinItem =
 			return;
 		}
 
+		scope = normalizeComplementaryAreaScope( scope );
+		item = normalizeComplementaryAreaName( scope, item );
 		const pinnedItems = registry
 			.select( preferencesStore )
 			.get( scope, 'pinnedItems' );
diff --git a/packages/interface/src/store/deprecated.js b/packages/interface/src/store/deprecated.js
new file mode 100644
index 00000000000000..d86fd00c9d2bf3
--- /dev/null
+++ b/packages/interface/src/store/deprecated.js
@@ -0,0 +1,37 @@
+/**
+ * WordPress dependencies
+ */
+import deprecated from '@wordpress/deprecated';
+
+export function normalizeComplementaryAreaScope( scope ) {
+	if ( [ 'core/edit-post', 'core/edit-site' ].includes( scope ) ) {
+		deprecated( `${ scope } interface scope`, {
+			alternative: 'core interface scope',
+			hint: 'core/edit-post and core/edit-site are merging.',
+			version: '6.6',
+		} );
+		return 'core';
+	}
+
+	return scope;
+}
+
+export function normalizeComplementaryAreaName( scope, name ) {
+	if ( scope === 'core' && name === 'edit-site/template' ) {
+		deprecated( `edit-site/template sidebar`, {
+			alternative: 'edit-post/document',
+			version: '6.6',
+		} );
+		return 'edit-post/document';
+	}
+
+	if ( scope === 'core' && name === 'edit-site/block-inspector' ) {
+		deprecated( `edit-site/block-inspector sidebar`, {
+			alternative: 'edit-post/block',
+			version: '6.6',
+		} );
+		return 'edit-post/block';
+	}
+
+	return name;
+}
diff --git a/packages/interface/src/store/selectors.js b/packages/interface/src/store/selectors.js
index 548cb2f70346ac..516d330a8ba8fe 100644
--- a/packages/interface/src/store/selectors.js
+++ b/packages/interface/src/store/selectors.js
@@ -5,6 +5,14 @@ import { createRegistrySelector } from '@wordpress/data';
 import deprecated from '@wordpress/deprecated';
 import { store as preferencesStore } from '@wordpress/preferences';
 
+/**
+ * Internal dependencies
+ */
+import {
+	normalizeComplementaryAreaScope,
+	normalizeComplementaryAreaName,
+} from './deprecated';
+
 /**
  * Returns the complementary area that is active in a given scope.
  *
@@ -15,6 +23,7 @@ import { store as preferencesStore } from '@wordpress/preferences';
  */
 export const getActiveComplementaryArea = createRegistrySelector(
 	( select ) => ( state, scope ) => {
+		scope = normalizeComplementaryAreaScope( scope );
 		const isComplementaryAreaVisible = select( preferencesStore ).get(
 			scope,
 			'isComplementaryAreaVisible'
@@ -38,6 +47,7 @@ export const getActiveComplementaryArea = createRegistrySelector(
 
 export const isComplementaryAreaLoading = createRegistrySelector(
 	( select ) => ( state, scope ) => {
+		scope = normalizeComplementaryAreaScope( scope );
 		const isVisible = select( preferencesStore ).get(
 			scope,
 			'isComplementaryAreaVisible'
@@ -59,6 +69,8 @@ export const isComplementaryAreaLoading = createRegistrySelector(
  */
 export const isItemPinned = createRegistrySelector(
 	( select ) => ( state, scope, item ) => {
+		scope = normalizeComplementaryAreaScope( scope );
+		item = normalizeComplementaryAreaName( scope, item );
 		const pinnedItems = select( preferencesStore ).get(
 			scope,
 			'pinnedItems'
diff --git a/packages/interface/src/style.scss b/packages/interface/src/style.scss
index be111640a0a796..d7f1e35e6e6616 100644
--- a/packages/interface/src/style.scss
+++ b/packages/interface/src/style.scss
@@ -2,9 +2,4 @@
 @import "./components/complementary-area/style.scss";
 @import "./components/fullscreen-mode/style.scss";
 @import "./components/interface-skeleton/style.scss";
-@import "./components/more-menu-dropdown/style.scss";
 @import "./components/pinned-items/style.scss";
-@import "./components/preferences-modal/style.scss";
-@import "./components/preferences-modal-tabs/style.scss";
-@import "./components/preferences-modal-section/style.scss";
-@import "./components/preferences-modal-base-option/style.scss";
diff --git a/packages/is-shallow-equal/.npmrc b/packages/is-shallow-equal/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/is-shallow-equal/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/is-shallow-equal/CHANGELOG.md b/packages/is-shallow-equal/CHANGELOG.md
index 192a27bc9fabed..8dc6be12e1e874 100644
--- a/packages/is-shallow-equal/CHANGELOG.md
+++ b/packages/is-shallow-equal/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.58.0 (2024-05-16)
+
+## 4.57.0 (2024-05-02)
+
+## 4.56.0 (2024-04-19)
+
+## 4.55.0 (2024-04-03)
+
+## 4.54.0 (2024-03-21)
+
+## 4.53.0 (2024-03-06)
+
+## 4.52.0 (2024-02-21)
+
+## 4.51.0 (2024-02-09)
+
+## 4.50.0 (2024-01-24)
+
+## 4.49.0 (2024-01-10)
+
+## 4.48.0 (2023-12-13)
+
 ## 4.47.0 (2023-11-29)
 
 ## 4.46.0 (2023-11-16)
@@ -107,19 +155,19 @@
 
 ## 3.0.0 (2020-12-17)
 
-### Breaking Change
+### Breaking Changes
 
 -   Re-write using ES Modules causing CJS default import to change from `require('@wordpress/is-shallow-equal)` to `require('@wordpress/is-shallow-equal).default`. ([#26833](https://github.com/WordPress/gutenberg/pull/26833))
 
 ## 2.0.0 (2020-04-15)
 
-### Breaking Change
+### Breaking Changes
 
 -   Restructure package moving source files into `lib` directory. Direct imports of
     `@wordpress/is-shallow-equal/arrays` and `@wordpress/is-shallow-equal/objects` were never
     officially supported and have been removed. ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
@@ -131,7 +179,7 @@
 
 ## 1.2.0 (2019-03-06)
 
-### New Feature
+### New Features
 
 -   Type-specific variants are now exposed from the module root. In a WordPress context, this has the effect of making them available as `wp.isShallowEqual.isShallowEqualObjects` and `wp.isShallowEqual.isShallowEqualArrays`.
 
@@ -141,7 +189,7 @@
 
 ## 1.1.0 (2018-07-12)
 
-### New Feature
+### New Features
 
 -   Updated build to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
@@ -151,18 +199,18 @@
 
 ## 1.0.2 (2018-05-08)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix: Use implicit `index.js` for main entry ([#124](https://github.com/WordPress/packages/pull/124))
 
 ## 1.0.1 (2018-05-01)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix: Passing a null-ish value as one of the arguments now correctly falls back to a strict equality comparison. ([#116](https://github.com/WordPress/packages/pull/116))
 
 ## 1.0.0 (2018-04-25)
 
-### New Feature
+### New Features
 
 -   Initial release
diff --git a/packages/is-shallow-equal/package.json b/packages/is-shallow-equal/package.json
index 0603d2b1499312..1034ce1e76cda8 100644
--- a/packages/is-shallow-equal/package.json
+++ b/packages/is-shallow-equal/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/is-shallow-equal",
-	"version": "4.47.0",
+	"version": "5.10.0",
 	"description": "Test for shallow equality between two objects or arrays.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"build",
@@ -36,9 +37,10 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/is-shallow-equal/tsconfig.json b/packages/is-shallow-equal/tsconfig.json
index 3c2c31f506f132..6e33d8ff82d47e 100644
--- a/packages/is-shallow-equal/tsconfig.json
+++ b/packages/is-shallow-equal/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/jest-console/.npmrc b/packages/jest-console/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/jest-console/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/jest-console/CHANGELOG.md b/packages/jest-console/CHANGELOG.md
index 75fe088a70e767..693445ed35ef41 100644
--- a/packages/jest-console/CHANGELOG.md
+++ b/packages/jest-console/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 8.10.0 (2024-10-16)
+
+## 8.9.0 (2024-10-03)
+
+## 8.8.0 (2024-09-19)
+
+## 8.7.0 (2024-09-05)
+
+## 8.6.0 (2024-08-21)
+
+## 8.5.0 (2024-08-07)
+
+## 8.4.0 (2024-07-24)
+
+## 8.3.0 (2024-07-10)
+
+## 8.2.0 (2024-06-26)
+
+## 8.1.0 (2024-06-15)
+
+## 8.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 7.29.0 (2024-05-16)
+
+## 7.28.0 (2024-05-02)
+
+## 7.27.0 (2024-04-19)
+
+## 7.26.0 (2024-04-03)
+
+## 7.25.0 (2024-03-21)
+
+## 7.24.0 (2024-03-06)
+
+## 7.23.0 (2024-02-21)
+
+## 7.22.0 (2024-02-09)
+
+## 7.21.0 (2024-01-24)
+
+## 7.20.0 (2024-01-10)
+
+## 7.19.0 (2023-12-13)
+
 ## 7.18.0 (2023-11-29)
 
 ## 7.17.0 (2023-11-16)
@@ -14,7 +62,7 @@
 
 ## 7.13.0 (2023-09-20)
 
-### Enhancement
+### Enhancements
 
 -   Improved error messages and codes printed on the console ([#53743](https://github.com/WordPress/gutenberg/pull/53743)).
 
@@ -72,7 +120,7 @@
 
 ## 6.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -122,12 +170,12 @@
 
 ## 1.0.7 (2018-05-18)
 
-### Polish
+### Internal
 
 -   Fix: Standardized `package.json` format ([#119](https://github.com/WordPress/packages/pull/119))
 
 ## 1.0.6 (2018-02-28)
 
-### Polish
+### Internal
 
 -   Removed `package-lock.json` file, lockfiles for apps, not packages ([#88](https://github.com/WordPress/packages/pull/88))
diff --git a/packages/jest-console/README.md b/packages/jest-console/README.md
index 4e57acef7deb6c..f733ad2be352eb 100644
--- a/packages/jest-console/README.md
+++ b/packages/jest-console/README.md
@@ -18,7 +18,7 @@ Install the module:
 npm install @wordpress/jest-console --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ### Setup
 
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
index 2f2f062c4f0996..373fc612b598b7 100644
--- a/packages/jest-console/package.json
+++ b/packages/jest-console/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-console",
-	"version": "7.18.0",
+	"version": "8.10.0",
 	"description": "Custom Jest matchers for the Console object.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"build",
@@ -32,7 +33,7 @@
 	"module": "build-module/index.js",
 	"types": "types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"jest-matcher-utils": "^29.6.2"
 	},
 	"peerDependencies": {
diff --git a/packages/jest-preset-default/.npmrc b/packages/jest-preset-default/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/jest-preset-default/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/jest-preset-default/CHANGELOG.md b/packages/jest-preset-default/CHANGELOG.md
index de33e4d54e133a..44f121c25e3ee4 100644
--- a/packages/jest-preset-default/CHANGELOG.md
+++ b/packages/jest-preset-default/CHANGELOG.md
@@ -2,6 +2,55 @@
 
 ## Unreleased
 
+## 12.10.0 (2024-10-16)
+
+## 12.9.0 (2024-10-03)
+
+## 12.8.0 (2024-09-19)
+
+## 12.7.0 (2024-09-05)
+
+## 12.6.0 (2024-08-21)
+
+## 12.5.0 (2024-08-07)
+
+## 12.4.0 (2024-07-24)
+
+## 12.3.0 (2024-07-10)
+
+## 12.2.0 (2024-06-26)
+
+## 12.1.0 (2024-06-15)
+
+## 12.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 11.29.0 (2024-05-16)
+
+## 11.28.0 (2024-05-02)
+
+## 11.27.0 (2024-04-19)
+
+## 11.26.0 (2024-04-03)
+
+## 11.25.0 (2024-03-21)
+
+## 11.24.0 (2024-03-06)
+
+## 11.23.0 (2024-02-21)
+
+## 11.22.0 (2024-02-09)
+
+## 11.21.0 (2024-01-24)
+
+## 11.20.0 (2024-01-10)
+
+## 11.19.0 (2023-12-13)
+
 ## 11.18.0 (2023-11-29)
 
 ## 11.17.0 (2023-11-16)
@@ -42,7 +91,7 @@
 
 ### Breaking Changes
 
--  Started requiring Jest v29 instead of v27 as a peer dependency. See [breaking changes in Jest 28](https://jestjs.io/blog/2022/04/25/jest-28) and [in jest 29](https://jestjs.io/blog/2022/08/25/jest-29) ([#47388](https://github.com/WordPress/gutenberg/pull/47388))
+-   Started requiring Jest v29 instead of v27 as a peer dependency. See [breaking changes in Jest 28](https://jestjs.io/blog/2022/04/25/jest-28) and [in jest 29](https://jestjs.io/blog/2022/08/25/jest-29) ([#47388](https://github.com/WordPress/gutenberg/pull/47388))
 
 ## 10.9.0 (2023-03-01)
 
@@ -64,7 +113,7 @@
 
 ## 10.0.0 (2022-10-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Testing: Remove enzyme completely ([#44494](https://github.com/WordPress/gutenberg/pull/44494)). See the [example in the README](./README.md#using-enzyme) for instructions on how to continue using `enzyme` in your project.
 
@@ -72,23 +121,23 @@
 
 ## 9.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Packages: Replace `is-plain-obj` with `is-plain-object` ([#43511](https://github.com/WordPress/gutenberg/pull/43511)).
 
 ## 8.5.2 (2022-08-17)
 
-### Bug Fix
+### Bug Fixes
 
 -   Jest Preset: Improve `is-plain-obj` transformation ignore ([#43271](https://github.com/WordPress/gutenberg/pull/43271)).
 
 ## 8.5.1 (2022-08-12)
 
-### Bug Fix
+### Bug Fixes
 
 -   Jest Preset: Ignore `is-plain-obj` transformation ([#43179](https://github.com/WordPress/gutenberg/pull/43179)).
 
@@ -105,13 +154,13 @@
 
 ## 7.1.2 (2021-10-22)
 
-### Bug Fix
+### Bug Fixes
 
 -   Provide more complete mocks of browser timing functions. ([#35368](https://github.com/WordPress/gutenberg/pull/35368))
 
 ## 7.1.1 (2021-09-09)
 
-### Bug Fix
+### Bug Fixes
 
 -   Restore the default setting for the `verbose` option. In effect, each test won't get reported during the run ([#34327](https://github.com/WordPress/gutenberg/pull/34327)).
 
@@ -190,13 +239,13 @@
 
 ## 3.0.0 (2018-11-03)
 
-### Breaking Change
+### Breaking Changes
 
 -   Remove coverage support.
 
 ## 2.0.0 (2018-07-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   Updated code to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
@@ -206,13 +255,13 @@
 
 ## 1.0.6 (2018-05-18)
 
-### Polish
+### Internal
 
 -   Fix: Standardized `package.json` format ([#119](https://github.com/WordPress/packages/pull/119))
 
 ## 1.0.5 (2018-03-22)
 
-### Polish
+### Internal
 
 -   Docs: Wrap filename in backticks ([#89](https://github.com/WordPress/packages/pull/89))
 -   Add `jest-preset` keyword to `jest-preset-default` package ([#92](https://github.com/WordPress/packages/pull/92))
diff --git a/packages/jest-preset-default/README.md b/packages/jest-preset-default/README.md
index 9f1f70ee122284..8720474a187211 100644
--- a/packages/jest-preset-default/README.md
+++ b/packages/jest-preset-default/README.md
@@ -10,7 +10,7 @@ Install the module
 npm install @wordpress/jest-preset-default --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Setup
 
@@ -89,7 +89,7 @@ Finally, you should add `enzyme-to-json/serializer` to the array of [`snapshotSe
 
 ```javascript
 {
-	snapshotSerializers: [ 'enzyme-to-json/serializer' ]
+	snapshotSerializers: [ 'enzyme-to-json/serializer' ];
 }
 ```
 
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index 061feb00ab9e4f..2db25a45f5b8e7 100644
--- a/packages/jest-preset-default/package.json
+++ b/packages/jest-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-preset-default",
-	"version": "11.18.0",
+	"version": "12.10.0",
 	"description": "Default Jest preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"scripts",
@@ -30,8 +31,8 @@
 	],
 	"main": "index.js",
 	"dependencies": {
-		"@wordpress/jest-console": "file:../jest-console",
-		"babel-jest": "^29.6.2"
+		"@wordpress/jest-console": "*",
+		"babel-jest": "29.7.0"
 	},
 	"peerDependencies": {
 		"@babel/core": ">=7",
diff --git a/packages/jest-preset-default/scripts/setup-globals.js b/packages/jest-preset-default/scripts/setup-globals.js
index abd99f620dc893..37922a3302e70f 100644
--- a/packages/jest-preset-default/scripts/setup-globals.js
+++ b/packages/jest-preset-default/scripts/setup-globals.js
@@ -1,5 +1,6 @@
 // Run all tests with development tools enabled.
-global.SCRIPT_DEBUG = true;
+// eslint-disable-next-line @wordpress/wp-global-usage
+globalThis.SCRIPT_DEBUG = true;
 
 // These are necessary to load TinyMCE successfully.
 global.URL = window.URL;
diff --git a/packages/jest-puppeteer-axe/.npmrc b/packages/jest-puppeteer-axe/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/jest-puppeteer-axe/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/jest-puppeteer-axe/CHANGELOG.md b/packages/jest-puppeteer-axe/CHANGELOG.md
index 55961c5abf1196..e3b455827c1971 100644
--- a/packages/jest-puppeteer-axe/CHANGELOG.md
+++ b/packages/jest-puppeteer-axe/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 7.10.0 (2024-10-16)
+
+## 7.9.0 (2024-10-03)
+
+## 7.8.0 (2024-09-19)
+
+## 7.7.0 (2024-09-05)
+
+## 7.6.0 (2024-08-21)
+
+## 7.5.0 (2024-08-07)
+
+## 7.4.0 (2024-07-24)
+
+## 7.3.0 (2024-07-10)
+
+## 7.2.0 (2024-06-26)
+
+## 7.1.0 (2024-06-15)
+
+## 7.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 6.29.0 (2024-05-16)
+
+## 6.28.0 (2024-05-02)
+
+## 6.27.0 (2024-04-19)
+
+## 6.26.0 (2024-04-03)
+
+## 6.25.0 (2024-03-21)
+
+## 6.24.0 (2024-03-06)
+
+## 6.23.0 (2024-02-21)
+
+## 6.22.0 (2024-02-09)
+
+## 6.21.0 (2024-01-24)
+
+## 6.20.0 (2024-01-10)
+
+## 6.19.0 (2023-12-13)
+
 ## 6.18.0 (2023-11-29)
 
 ## 6.17.0 (2023-11-16)
@@ -42,7 +90,7 @@
 
 ### Breaking Changes
 
--  Started requiring Jest v29 instead of v27 as a peer dependency. See [breaking changes in Jest 28](https://jestjs.io/blog/2022/04/25/jest-28) and [in jest 29](https://jestjs.io/blog/2022/08/25/jest-29) ([#47388](https://github.com/WordPress/gutenberg/pull/47388))
+-   Started requiring Jest v29 instead of v27 as a peer dependency. See [breaking changes in Jest 28](https://jestjs.io/blog/2022/04/25/jest-28) and [in jest 29](https://jestjs.io/blog/2022/08/25/jest-29) ([#47388](https://github.com/WordPress/gutenberg/pull/47388))
 
 ## 5.11.0 (2023-03-01)
 
@@ -68,7 +116,7 @@
 
 ## 5.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -97,7 +145,7 @@
 
 ## 1.1.0 (2019-05-21)
 
-### New Feature
+### New Features
 
 -   Added optional `disabledRules` option to use with `toPassAxeTests` matcher.
 
diff --git a/packages/jest-puppeteer-axe/README.md b/packages/jest-puppeteer-axe/README.md
index fb5b6752c57025..452ffb4b6d1123 100644
--- a/packages/jest-puppeteer-axe/README.md
+++ b/packages/jest-puppeteer-axe/README.md
@@ -12,7 +12,7 @@ Install the module
 npm install @wordpress/jest-puppeteer-axe --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ### Setup
 
diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
index 9b6b6d66a91f08..0e9b214a175772 100644
--- a/packages/jest-puppeteer-axe/package.json
+++ b/packages/jest-puppeteer-axe/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-puppeteer-axe",
-	"version": "6.18.0",
+	"version": "7.10.0",
 	"description": "Axe API integration with Jest and Puppeteer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -22,7 +22,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"build",
@@ -32,7 +33,7 @@
 	"module": "build-module/index.js",
 	"dependencies": {
 		"@axe-core/puppeteer": "^4.0.0",
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"peerDependencies": {
 		"jest": ">=29",
diff --git a/packages/keyboard-shortcuts/.npmrc b/packages/keyboard-shortcuts/.npmrc
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/packages/keyboard-shortcuts/CHANGELOG.md b/packages/keyboard-shortcuts/CHANGELOG.md
index 1fb3ec9ea2b005..f549dfcd73b70a 100644
--- a/packages/keyboard-shortcuts/CHANGELOG.md
+++ b/packages/keyboard-shortcuts/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.35.0 (2024-05-16)
+
+## 4.34.0 (2024-05-02)
+
+## 4.33.0 (2024-04-19)
+
+## 4.32.0 (2024-04-03)
+
+## 4.31.0 (2024-03-21)
+
+## 4.30.0 (2024-03-06)
+
+## 4.29.0 (2024-02-21)
+
+## 4.28.0 (2024-02-09)
+
+## 4.27.0 (2024-01-24)
+
+## 4.26.0 (2024-01-10)
+
+## 4.25.0 (2023-12-13)
+
 ## 4.24.0 (2023-11-29)
 
 ## 4.23.0 (2023-11-16)
@@ -96,7 +144,7 @@
 
 ## 3.1.1 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/compose` dependency ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -104,7 +152,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -123,7 +171,7 @@
 
 ## 1.13.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the keyboard shortcuts namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
diff --git a/packages/keyboard-shortcuts/package.json b/packages/keyboard-shortcuts/package.json
index ec4b1f3e108998..4687df000bb3a7 100644
--- a/packages/keyboard-shortcuts/package.json
+++ b/packages/keyboard-shortcuts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keyboard-shortcuts",
-	"version": "4.24.0",
+	"version": "5.10.0",
 	"description": "Handling keyboard shortcuts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,22 +19,23 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/data": "file:../data",
-		"@wordpress/element": "file:../element",
-		"@wordpress/keycodes": "file:../keycodes",
-		"rememo": "^4.0.2"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/data": "*",
+		"@wordpress/element": "*",
+		"@wordpress/keycodes": "*"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/keyboard-shortcuts/src/components/shortcut-provider.js b/packages/keyboard-shortcuts/src/components/shortcut-provider.js
index 485350bb3c0e90..997c9725096e49 100644
--- a/packages/keyboard-shortcuts/src/components/shortcut-provider.js
+++ b/packages/keyboard-shortcuts/src/components/shortcut-provider.js
@@ -23,7 +23,9 @@ export function ShortcutProvider( props ) {
 	const [ keyboardShortcuts ] = useState( () => new Set() );
 
 	function onKeyDown( event ) {
-		if ( props.onKeyDown ) props.onKeyDown( event );
+		if ( props.onKeyDown ) {
+			props.onKeyDown( event );
+		}
 
 		for ( const keyboardShortcut of keyboardShortcuts ) {
 			keyboardShortcut( event );
diff --git a/packages/keyboard-shortcuts/src/store/actions.js b/packages/keyboard-shortcuts/src/store/actions.js
index 2b77b6c1e1fe45..4f40ba05ff85a9 100644
--- a/packages/keyboard-shortcuts/src/store/actions.js
+++ b/packages/keyboard-shortcuts/src/store/actions.js
@@ -100,13 +100,13 @@ export function registerShortcut( {
  *     const { unregisterShortcut } = useDispatch( keyboardShortcutsStore );
  *
  *     useEffect( () => {
- *         unregisterShortcut( 'core/edit-post/next-region' );
+ *         unregisterShortcut( 'core/editor/next-region' );
  *     }, [] );
  *
  *     const shortcut = useSelect(
  *         ( select ) =>
  *             select( keyboardShortcutsStore ).getShortcutKeyCombination(
- *                 'core/edit-post/next-region'
+ *                 'core/editor/next-region'
  *             ),
  *         []
  *     );
diff --git a/packages/keyboard-shortcuts/src/store/selectors.js b/packages/keyboard-shortcuts/src/store/selectors.js
index 2d4f5976247b05..99309d3e24085c 100644
--- a/packages/keyboard-shortcuts/src/store/selectors.js
+++ b/packages/keyboard-shortcuts/src/store/selectors.js
@@ -1,11 +1,7 @@
-/**
- * External dependencies
- */
-import createSelector from 'rememo';
-
 /**
  * WordPress dependencies
  */
+import { createSelector } from '@wordpress/data';
 import {
 	displayShortcut,
 	shortcutAriaLabel,
@@ -75,7 +71,7 @@ function getKeyCombinationRepresentation( shortcut, representation ) {
  *     const {character, modifier} = useSelect(
  *         ( select ) =>
  *             select( keyboardShortcutsStore ).getShortcutKeyCombination(
- *                 'core/edit-post/next-region'
+ *                 'core/editor/next-region'
  *             ),
  *         []
  *     );
@@ -121,9 +117,9 @@ export function getShortcutKeyCombination( state, name ) {
  *     const {display, raw, ariaLabel} = useSelect(
  *         ( select ) =>{
  *             return {
- *                 display: select( keyboardShortcutsStore ).getShortcutRepresentation('core/edit-post/next-region' ),
- *                 raw: select( keyboardShortcutsStore ).getShortcutRepresentation('core/edit-post/next-region','raw' ),
- *                 ariaLabel: select( keyboardShortcutsStore ).getShortcutRepresentation('core/edit-post/next-region', 'ariaLabel')
+ *                 display: select( keyboardShortcutsStore ).getShortcutRepresentation('core/editor/next-region' ),
+ *                 raw: select( keyboardShortcutsStore ).getShortcutRepresentation('core/editor/next-region','raw' ),
+ *                 ariaLabel: select( keyboardShortcutsStore ).getShortcutRepresentation('core/editor/next-region', 'ariaLabel')
  *             }
  *         },
  *         []
@@ -165,7 +161,7 @@ export function getShortcutRepresentation(
  * const ExampleComponent = () => {
  *     const shortcutDescription = useSelect(
  *         ( select ) =>
- *             select( keyboardShortcutsStore ).getShortcutDescription( 'core/edit-post/next-region' ),
+ *             select( keyboardShortcutsStore ).getShortcutDescription( 'core/editor/next-region' ),
  *         []
  *     );
  *
@@ -198,7 +194,7 @@ export function getShortcutDescription( state, name ) {
  *     const shortcutAliases = useSelect(
  *         ( select ) =>
  *             select( keyboardShortcutsStore ).getShortcutAliases(
- *                 'core/edit-post/next-region'
+ *                 'core/editor/next-region'
  *             ),
  *         []
  *     );
@@ -251,7 +247,7 @@ export function getShortcutAliases( state, name ) {
  *     const allShortcutKeyCombinations = useSelect(
  *         ( select ) =>
  *             select( keyboardShortcutsStore ).getAllShortcutKeyCombinations(
- *                 'core/edit-post/next-region'
+ *                 'core/editor/next-region'
  *             ),
  *         []
  *     );
@@ -311,7 +307,7 @@ export const getAllShortcutKeyCombinations = createSelector(
  *     const allShortcutRawKeyCombinations = useSelect(
  *         ( select ) =>
  *             select( keyboardShortcutsStore ).getAllShortcutRawKeyCombinations(
- *                 'core/edit-post/next-region'
+ *                 'core/editor/next-region'
  *             ),
  *         []
  *     );
diff --git a/packages/keycodes/.npmrc b/packages/keycodes/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/keycodes/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/keycodes/CHANGELOG.md b/packages/keycodes/CHANGELOG.md
index 3d24d2c0cb2e0c..5b300b79211f38 100644
--- a/packages/keycodes/CHANGELOG.md
+++ b/packages/keycodes/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -107,7 +155,7 @@
 
 ## 2.18.0 (2021-01-05)
 
-### Enhancement
+### Enhancements
 
 -   Include TypeScript type declarations ([#19520](https://github.com/WordPress/gutenberg/pull/19520))
 
@@ -125,6 +173,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/keycodes/package.json b/packages/keycodes/package.json
index c98ccc24cb5d84..cce62c927fa206 100644
--- a/packages/keycodes/package.json
+++ b/packages/keycodes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keycodes",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "Keycodes utilities for WordPress. Used to check for keyboard events across browsers/operating systems.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,11 +28,11 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/i18n": "file:../i18n",
-		"change-case": "^4.1.2"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/i18n": "*"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/keycodes/src/index.js b/packages/keycodes/src/index.js
index a9efb210496c3c..6b01109e2a40db 100644
--- a/packages/keycodes/src/index.js
+++ b/packages/keycodes/src/index.js
@@ -9,11 +9,6 @@
  * shortcut combos directly to keyboardShortcut().
  */
 
-/**
- * External dependencies
- */
-import { capitalCase } from 'change-case';
-
 /**
  * WordPress dependencies
  */
@@ -148,6 +143,17 @@ export const ZERO = 48;
 
 export { isAppleOS };
 
+/**
+ * Capitalise the first character of a string.
+ * @param {string} string String to capitalise.
+ * @return {string} Capitalised string.
+ */
+function capitaliseFirstCharacter( string ) {
+	return string.length < 2
+		? string.toUpperCase()
+		: string.charAt( 0 ).toUpperCase() + string.slice( 1 );
+}
+
 /**
  * Map the values of an object with a specified callback and return the result object.
  *
@@ -260,14 +266,7 @@ export const displayShortcutList = mapValues(
 				/** @type {string[]} */ ( [] )
 			);
 
-			// Symbols (~`,.) are removed by the default regular expression,
-			// so override the rule to allow symbols used for shortcuts.
-			// see: https://github.com/blakeembrey/change-case#options
-			const capitalizedCharacter = capitalCase( character, {
-				stripRegexp: /[^A-Z0-9~`,\.\\\-]/gi,
-			} );
-
-			return [ ...modifierKeys, capitalizedCharacter ];
+			return [ ...modifierKeys, capitaliseFirstCharacter( character ) ];
 		};
 	}
 );
@@ -335,7 +334,7 @@ export const shortcutAriaLabel = mapValues(
 
 			return [ ...modifier( _isApple ), character ]
 				.map( ( key ) =>
-					capitalCase( replacementKeyMap[ key ] ?? key )
+					capitaliseFirstCharacter( replacementKeyMap[ key ] ?? key )
 				)
 				.join( isApple ? ' ' : ' + ' );
 		};
diff --git a/packages/keycodes/tsconfig.json b/packages/keycodes/tsconfig.json
index 2a1bbd4d1a0d0a..be13213c265f05 100644
--- a/packages/keycodes/tsconfig.json
+++ b/packages/keycodes/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/lazy-import/.npmrc b/packages/lazy-import/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/lazy-import/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/lazy-import/CHANGELOG.md b/packages/lazy-import/CHANGELOG.md
index 352132ddaa0146..025c2ce1c066da 100644
--- a/packages/lazy-import/CHANGELOG.md
+++ b/packages/lazy-import/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 2.10.0 (2024-10-16)
+
+## 2.9.0 (2024-10-03)
+
+## 2.8.0 (2024-09-19)
+
+## 2.7.0 (2024-09-05)
+
+## 2.6.0 (2024-08-21)
+
+## 2.5.0 (2024-08-07)
+
+## 2.4.0 (2024-07-24)
+
+## 2.3.0 (2024-07-10)
+
+## 2.2.0 (2024-06-26)
+
+## 2.1.0 (2024-06-15)
+
+## 2.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 1.45.0 (2024-05-16)
+
+## 1.44.0 (2024-05-02)
+
+## 1.43.0 (2024-04-19)
+
+## 1.42.0 (2024-04-03)
+
+## 1.41.0 (2024-03-21)
+
+## 1.40.0 (2024-03-06)
+
+## 1.39.0 (2024-02-21)
+
+## 1.38.0 (2024-02-09)
+
+## 1.37.0 (2024-01-24)
+
+## 1.36.0 (2024-01-10)
+
+## 1.35.0 (2023-12-13)
+
 ## 1.34.0 (2023-11-29)
 
 ## 1.33.0 (2023-11-16)
@@ -71,7 +119,7 @@
 
 ## 1.2.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Allow local paths as an option when trying to import a specific file from the package ([#23751](https://github.com/WordPress/gutenberg/pull/23751)).
 
diff --git a/packages/lazy-import/package.json b/packages/lazy-import/package.json
index b490a38eccf86f..1e56c1703cf1c6 100644
--- a/packages/lazy-import/package.json
+++ b/packages/lazy-import/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/lazy-import",
-	"version": "1.34.0",
+	"version": "2.10.0",
 	"description": "Lazily import a module, installing it automatically if missing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"npm": ">=6.9.0"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "lib/index.js",
 	"types": "build-types",
diff --git a/packages/lazy-import/tsconfig.json b/packages/lazy-import/tsconfig.json
index fd6069e3843aed..3bf8bde807404d 100644
--- a/packages/lazy-import/tsconfig.json
+++ b/packages/lazy-import/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "lib",
diff --git a/packages/list-reusable-blocks/.npmrc b/packages/list-reusable-blocks/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/list-reusable-blocks/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/list-reusable-blocks/CHANGELOG.md b/packages/list-reusable-blocks/CHANGELOG.md
index 5946c665d11d62..8c2134934192d8 100644
--- a/packages/list-reusable-blocks/CHANGELOG.md
+++ b/packages/list-reusable-blocks/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.35.0 (2024-05-16)
+
+## 4.34.0 (2024-05-02)
+
+## 4.33.0 (2024-04-19)
+
+## 4.32.0 (2024-04-03)
+
+## 4.31.0 (2024-03-21)
+
+## 4.30.0 (2024-03-06)
+
+## 4.29.0 (2024-02-21)
+
+## 4.28.0 (2024-02-09)
+
+## 4.27.0 (2024-01-24)
+
+## 4.26.0 (2024-01-10)
+
+## 4.25.0 (2023-12-13)
+
 ## 4.24.0 (2023-11-29)
 
 ## 4.23.0 (2023-11-16)
@@ -98,7 +146,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
diff --git a/packages/list-reusable-blocks/package.json b/packages/list-reusable-blocks/package.json
index 29a0ab2479d926..d5a7dace810b48 100644
--- a/packages/list-reusable-blocks/package.json
+++ b/packages/list-reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/list-reusable-blocks",
-	"version": "4.24.0",
+	"version": "5.10.0",
 	"description": "Adding Export/Import support to the reusable blocks listing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,18 +20,19 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/blob": "file:../blob",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/blob": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
 		"change-case": "^4.1.2"
 	},
 	"peerDependencies": {
@@ -40,5 +41,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/list-reusable-blocks/src/components/import-dropdown/index.js b/packages/list-reusable-blocks/src/components/import-dropdown/index.js
index 94f70a1551199d..fdad08f80d213c 100644
--- a/packages/list-reusable-blocks/src/components/import-dropdown/index.js
+++ b/packages/list-reusable-blocks/src/components/import-dropdown/index.js
@@ -17,6 +17,8 @@ function ImportDropdown( { onUpload } ) {
 			contentClassName="list-reusable-blocks-import-dropdown__content"
 			renderToggle={ ( { isOpen, onToggle } ) => (
 				<Button
+					size="compact"
+					className="list-reusable-blocks-import-dropdown__button"
 					aria-expanded={ isOpen }
 					onClick={ onToggle }
 					variant="primary"
diff --git a/packages/list-reusable-blocks/src/components/import-dropdown/style.scss b/packages/list-reusable-blocks/src/components/import-dropdown/style.scss
index 8c2dc9c94bd71f..abef499a63b298 100644
--- a/packages/list-reusable-blocks/src/components/import-dropdown/style.scss
+++ b/packages/list-reusable-blocks/src/components/import-dropdown/style.scss
@@ -1,3 +1,8 @@
 .list-reusable-blocks-import-dropdown__content .components-popover__content {
 	padding: 10px;
 }
+
+[class].list-reusable-blocks-import-dropdown__button {
+	// Todo: Make core button height and gutenberg button height equal.
+	height: 30px;
+}
diff --git a/packages/list-reusable-blocks/src/components/import-form/index.js b/packages/list-reusable-blocks/src/components/import-form/index.js
index 1f5e62f9115b36..ba6cffb956f04e 100644
--- a/packages/list-reusable-blocks/src/components/import-form/index.js
+++ b/packages/list-reusable-blocks/src/components/import-form/index.js
@@ -84,8 +84,10 @@ function ImportForm( { instanceId, onUpload } ) {
 			</label>
 			<input id={ inputId } type="file" onChange={ onChangeFile } />
 			<Button
+				__next40pxDefaultSize
 				type="submit"
 				isBusy={ isLoading }
+				accessibleWhenDisabled
 				disabled={ ! file || isLoading }
 				variant="secondary"
 				className="list-reusable-blocks-import-form__button"
diff --git a/packages/list-reusable-blocks/src/components/import-form/style.scss b/packages/list-reusable-blocks/src/components/import-form/style.scss
index 844130b7c5914a..e72d63fd2a4903 100644
--- a/packages/list-reusable-blocks/src/components/import-form/style.scss
+++ b/packages/list-reusable-blocks/src/components/import-form/style.scss
@@ -5,7 +5,6 @@
 
 .list-reusable-blocks-import-form__button {
 	margin-top: 10px;
-	margin-bottom: 10px;
 	float: right;
 }
 
diff --git a/packages/list-reusable-blocks/src/index.js b/packages/list-reusable-blocks/src/index.js
index 4440ba1c49f05a..f5cb411726963c 100644
--- a/packages/list-reusable-blocks/src/index.js
+++ b/packages/list-reusable-blocks/src/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { createRoot } from '@wordpress/element';
+import { createRoot, StrictMode } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -44,6 +44,8 @@ document.addEventListener( 'DOMContentLoaded', () => {
 	container.className = 'list-reusable-blocks__container';
 	button.parentNode.insertBefore( container, button );
 	createRoot( container ).render(
-		<ImportDropdown onUpload={ showNotice } />
+		<StrictMode>
+			<ImportDropdown onUpload={ showNotice } />
+		</StrictMode>
 	);
 } );
diff --git a/packages/list-reusable-blocks/src/style.scss b/packages/list-reusable-blocks/src/style.scss
index ad85c700586099..6767bd0bd7e158 100644
--- a/packages/list-reusable-blocks/src/style.scss
+++ b/packages/list-reusable-blocks/src/style.scss
@@ -6,10 +6,6 @@
 	align-items: center;
 	position: relative;
 	top: -3px;
-	// Todo: Make core button height and gutenberg button height equal.
-	.components-button {
-		height: 26px;
-	}
 }
 
 @include wordpress-admin-schemes();
diff --git a/packages/media-utils/.npmrc b/packages/media-utils/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/media-utils/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/media-utils/CHANGELOG.md b/packages/media-utils/CHANGELOG.md
index 0329f2ea74c53c..f47ed34c718d16 100644
--- a/packages/media-utils/CHANGELOG.md
+++ b/packages/media-utils/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+### New Features
+
+-   Rewrite in TypeScript, exporting all the individual utility functions.
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.49.0 (2024-05-16)
+
+## 4.48.0 (2024-05-02)
+
+## 4.47.0 (2024-04-19)
+
+## 4.46.0 (2024-04-03)
+
+## 4.45.0 (2024-03-21)
+
+## 4.44.0 (2024-03-06)
+
+## 4.43.0 (2024-02-21)
+
+## 4.42.0 (2024-02-09)
+
+## 4.41.0 (2024-01-24)
+
+## 4.40.0 (2024-01-10)
+
+## 4.39.0 (2023-12-13)
+
 ## 4.38.0 (2023-11-29)
 
 ## 4.37.0 (2023-11-16)
@@ -80,7 +132,7 @@
 
 ## 4.0.0 (2022-05-18)
 
-### Breaking Change
+### Breaking Changes
 
 -   The `onError` now always receives the `message` as a string ([#39448](https://github.com/WordPress/gutenberg/pull/39448)).
 
@@ -98,7 +150,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
diff --git a/packages/media-utils/README.md b/packages/media-utils/README.md
index bbdf8c0a4a5d50..1adc15186078a5 100644
--- a/packages/media-utils/README.md
+++ b/packages/media-utils/README.md
@@ -13,6 +13,75 @@ npm install @wordpress/media-utils --save
 
 _This package assumes that your code will run in an **ES2015+** environment. If you're using an environment that has limited or no support for such language features and APIs, you should include [the polyfill shipped in `@wordpress/babel-preset-default`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/babel-preset-default#polyfill) in your code._
 
+## API
+
+<!-- START TOKEN(Autogenerated API docs) -->
+
+### Attachment
+
+Undocumented declaration.
+
+### MediaUpload
+
+Undocumented declaration.
+
+### RestAttachment
+
+Undocumented declaration.
+
+### transformAttachment
+
+Transforms an attachment object from the REST API shape into the shape expected by the block editor and other consumers.
+
+_Parameters_
+
+-   _attachment_ `RestAttachment`: REST API attachment object.
+
+### uploadMedia
+
+Upload a media file when the file upload button is activated or when adding a file to the editor via drag & drop.
+
+_Parameters_
+
+-   _$0_ `UploadMediaArgs`: Parameters object passed to the function.
+-   _$0.allowedTypes_ `UploadMediaArgs[ 'allowedTypes' ]`: Array with the types of media that can be uploaded, if unset all types are allowed.
+-   _$0.additionalData_ `UploadMediaArgs[ 'additionalData' ]`: Additional data to include in the request.
+-   _$0.filesList_ `UploadMediaArgs[ 'filesList' ]`: List of files.
+-   _$0.maxUploadFileSize_ `UploadMediaArgs[ 'maxUploadFileSize' ]`: Maximum upload size in bytes allowed for the site.
+-   _$0.onError_ `UploadMediaArgs[ 'onError' ]`: Function called when an error happens.
+-   _$0.onFileChange_ `UploadMediaArgs[ 'onFileChange' ]`: Function called each time a file or a temporary representation of the file is available.
+-   _$0.wpAllowedMimeTypes_ `UploadMediaArgs[ 'wpAllowedMimeTypes' ]`: List of allowed mime types and file extensions.
+-   _$0.signal_ `UploadMediaArgs[ 'signal' ]`: Abort signal.
+
+### validateFileSize
+
+Verifies whether the file is within the file upload size limits for the site.
+
+_Parameters_
+
+-   _file_ `File`: File object.
+-   _maxUploadFileSize_ `number`: Maximum upload size in bytes allowed for the site.
+
+### validateMimeType
+
+Verifies if the caller (e.g. a block) supports this mime type.
+
+_Parameters_
+
+-   _file_ `File`: File object.
+-   _allowedTypes_ `string[]`: List of allowed mime types.
+
+### validateMimeTypeForUser
+
+Verifies if the user is allowed to upload this mime type.
+
+_Parameters_
+
+-   _file_ `File`: File object.
+-   _wpAllowedMimeTypes_ `Record< string, string > | null`: List of allowed mime types and file extensions.
+
+<!-- END TOKEN(Autogenerated API docs) -->
+
 ## Usage
 
 ### uploadMedia
@@ -43,7 +112,7 @@ Beware that first onFileChange is called with temporary blob URLs and then with
 ### MediaUpload
 
 Media upload component provides a UI button that allows users to open the WordPress media library. It is normally used in conjunction with the filter `editor.MediaUpload`.
-The component follows the interface specified in https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/media-upload/README.md, and more details regarding its usage can be checked there.
+The component follows the interface specified in <https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/media-upload/README.md>, and more details regarding its usage can be checked there.
 
 ## Contributing to this package
 
diff --git a/packages/media-utils/package.json b/packages/media-utils/package.json
index 1abe16387376c0..0ba56f26706833 100644
--- a/packages/media-utils/package.json
+++ b/packages/media-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/media-utils",
-	"version": "4.38.0",
+	"version": "5.10.0",
 	"description": "WordPress Media Upload Utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -14,24 +14,27 @@
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/WordPress/gutenberg.git",
-		"directory": "packages/url"
+		"directory": "packages/media-utils"
 	},
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
+	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/blob": "file:../blob",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/blob": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/media-utils/src/components/media-upload/index.js b/packages/media-utils/src/components/media-upload/index.js
index bf2da5c470a5ef..91de011869ad38 100644
--- a/packages/media-utils/src/components/media-upload/index.js
+++ b/packages/media-utils/src/components/media-upload/index.js
@@ -224,45 +224,13 @@ const getAttachmentsCollection = ( ids ) => {
 };
 
 class MediaUpload extends Component {
-	constructor( {
-		allowedTypes,
-		gallery = false,
-		unstableFeaturedImageFlow = false,
-		modalClass,
-		multiple = false,
-		title = __( 'Select or Upload Media' ),
-	} ) {
+	constructor() {
 		super( ...arguments );
 		this.openModal = this.openModal.bind( this );
 		this.onOpen = this.onOpen.bind( this );
 		this.onSelect = this.onSelect.bind( this );
 		this.onUpdate = this.onUpdate.bind( this );
 		this.onClose = this.onClose.bind( this );
-
-		const { wp } = window;
-
-		if ( gallery ) {
-			this.buildAndSetGalleryFrame();
-		} else {
-			const frameConfig = {
-				title,
-				multiple,
-			};
-			if ( !! allowedTypes ) {
-				frameConfig.library = { type: allowedTypes };
-			}
-
-			this.frame = wp.media( frameConfig );
-		}
-
-		if ( modalClass ) {
-			this.frame.$el.addClass( modalClass );
-		}
-
-		if ( unstableFeaturedImageFlow ) {
-			this.buildAndSetFeatureImageFrame();
-		}
-		this.initializeListeners();
 	}
 
 	initializeListeners() {
@@ -332,23 +300,32 @@ class MediaUpload extends Component {
 	 */
 	buildAndSetFeatureImageFrame() {
 		const { wp } = window;
+		const { value: featuredImageId, multiple, allowedTypes } = this.props;
 		const featuredImageFrame = getFeaturedImageMediaFrame();
-		const attachments = getAttachmentsCollection( this.props.value );
+		const attachments = getAttachmentsCollection( featuredImageId );
 		const selection = new wp.media.model.Selection( attachments.models, {
 			props: attachments.props.toJSON(),
 		} );
 		this.frame = new featuredImageFrame( {
-			mimeType: this.props.allowedTypes,
+			mimeType: allowedTypes,
 			state: 'featured-image',
-			multiple: this.props.multiple,
+			multiple,
 			selection,
-			editing: this.props.value ? true : false,
+			editing: featuredImageId,
 		} );
 		wp.media.frame = this.frame;
+		// In order to select the current featured image when opening
+		// the media library we have to set the appropriate settings.
+		// Currently they are set in php for the post editor, but
+		// not for site editor.
+		wp.media.view.settings.post = {
+			...wp.media.view.settings.post,
+			featuredImageId: featuredImageId || -1,
+		};
 	}
 
 	componentWillUnmount() {
-		this.frame.remove();
+		this.frame?.remove();
 	}
 
 	onUpdate( selections ) {
@@ -423,6 +400,8 @@ class MediaUpload extends Component {
 		if ( onClose ) {
 			onClose();
 		}
+
+		this.frame.detach();
 	}
 
 	updateCollection() {
@@ -444,9 +423,38 @@ class MediaUpload extends Component {
 	}
 
 	openModal() {
-		if ( this.props.gallery ) {
+		const {
+			allowedTypes,
+			gallery = false,
+			unstableFeaturedImageFlow = false,
+			modalClass,
+			multiple = false,
+			title = __( 'Select or Upload Media' ),
+		} = this.props;
+		const { wp } = window;
+
+		if ( gallery ) {
 			this.buildAndSetGalleryFrame();
+		} else {
+			const frameConfig = {
+				title,
+				multiple,
+			};
+			if ( !! allowedTypes ) {
+				frameConfig.library = { type: allowedTypes };
+			}
+
+			this.frame = wp.media( frameConfig );
 		}
+
+		if ( modalClass ) {
+			this.frame.$el.addClass( modalClass );
+		}
+
+		if ( unstableFeaturedImageFlow ) {
+			this.buildAndSetFeatureImageFrame();
+		}
+		this.initializeListeners();
 		this.frame.open();
 	}
 
diff --git a/packages/media-utils/src/index.js b/packages/media-utils/src/index.js
deleted file mode 100644
index 590a7f4c9d188d..00000000000000
--- a/packages/media-utils/src/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './components';
-export * from './utils';
diff --git a/packages/media-utils/src/index.ts b/packages/media-utils/src/index.ts
new file mode 100644
index 00000000000000..c37814afe7c48f
--- /dev/null
+++ b/packages/media-utils/src/index.ts
@@ -0,0 +1,9 @@
+export * from './components';
+
+export { uploadMedia } from './utils/upload-media';
+export { transformAttachment } from './utils/transform-attachment';
+export { validateFileSize } from './utils/validate-file-size';
+export { validateMimeType } from './utils/validate-mime-type';
+export { validateMimeTypeForUser } from './utils/validate-mime-type-for-user';
+
+export type { Attachment, RestAttachment } from './utils/types';
diff --git a/packages/media-utils/src/utils/flatten-form-data.ts b/packages/media-utils/src/utils/flatten-form-data.ts
new file mode 100644
index 00000000000000..594f172ef7eb2c
--- /dev/null
+++ b/packages/media-utils/src/utils/flatten-form-data.ts
@@ -0,0 +1,33 @@
+/**
+ * Determines whether the passed argument appears to be a plain object.
+ *
+ * @param data The object to inspect.
+ */
+function isPlainObject( data: unknown ): data is Record< string, unknown > {
+	return (
+		data !== null &&
+		typeof data === 'object' &&
+		Object.getPrototypeOf( data ) === Object.prototype
+	);
+}
+
+/**
+ * Recursively flatten data passed to form data, to allow using multi-level objects.
+ *
+ * @param {FormData}      formData Form data object.
+ * @param {string}        key      Key to amend to form data object
+ * @param {string|Object} data     Data to be amended to form data.
+ */
+export function flattenFormData(
+	formData: FormData,
+	key: string,
+	data: string | undefined | Record< string, string >
+) {
+	if ( isPlainObject( data ) ) {
+		for ( const [ name, value ] of Object.entries( data ) ) {
+			flattenFormData( formData, `${ key }[${ name }]`, value );
+		}
+	} else if ( data !== undefined ) {
+		formData.append( key, String( data ) );
+	}
+}
diff --git a/packages/media-utils/src/utils/get-mime-types-array.ts b/packages/media-utils/src/utils/get-mime-types-array.ts
new file mode 100644
index 00000000000000..d4940d36cd6ae5
--- /dev/null
+++ b/packages/media-utils/src/utils/get-mime-types-array.ts
@@ -0,0 +1,29 @@
+/**
+ * Browsers may use unexpected mime types, and they differ from browser to browser.
+ * This function computes a flexible array of mime types from the mime type structured provided by the server.
+ * Converts { jpg|jpeg|jpe: "image/jpeg" } into [ "image/jpeg", "image/jpg", "image/jpeg", "image/jpe" ]
+ *
+ * @param {?Object} wpMimeTypesObject Mime type object received from the server.
+ *                                    Extensions are keys separated by '|' and values are mime types associated with an extension.
+ *
+ * @return An array of mime types or null
+ */
+export function getMimeTypesArray(
+	wpMimeTypesObject?: Record< string, string > | null
+) {
+	if ( ! wpMimeTypesObject ) {
+		return null;
+	}
+	return Object.entries( wpMimeTypesObject ).flatMap(
+		( [ extensionsString, mime ] ) => {
+			const [ type ] = mime.split( '/' );
+			const extensions = extensionsString.split( '|' );
+			return [
+				mime,
+				...extensions.map(
+					( extension ) => `${ type }/${ extension }`
+				),
+			];
+		}
+	);
+}
diff --git a/packages/media-utils/src/utils/index.js b/packages/media-utils/src/utils/index.js
deleted file mode 100644
index 509b62f1e88648..00000000000000
--- a/packages/media-utils/src/utils/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { uploadMedia } from './upload-media';
diff --git a/packages/media-utils/src/utils/test/flatten-form-data.ts b/packages/media-utils/src/utils/test/flatten-form-data.ts
new file mode 100644
index 00000000000000..458dfd26c8f6ed
--- /dev/null
+++ b/packages/media-utils/src/utils/test/flatten-form-data.ts
@@ -0,0 +1,49 @@
+/**
+ * Internal dependencies
+ */
+import { flattenFormData } from '../flatten-form-data';
+
+describe( 'flattenFormData', () => {
+	it( 'should flatten nested data structure', () => {
+		const data = new FormData();
+
+		class RichTextData {
+			toString() {
+				return 'i am rich text';
+			}
+		}
+
+		const additionalData = {
+			foo: null,
+			bar: 1234,
+			meta: {
+				nested: 'foo',
+				dothis: true,
+				dothat: false,
+				supermeta: {
+					nested: 'baz',
+				},
+			},
+			customClass: new RichTextData(),
+		};
+
+		for ( const [ key, value ] of Object.entries( additionalData ) ) {
+			flattenFormData(
+				data,
+				key,
+				value as Parameters< typeof flattenFormData >[ 2 ]
+			);
+		}
+
+		const actual = Object.fromEntries( data.entries() );
+		expect( actual ).toStrictEqual( {
+			bar: '1234',
+			foo: 'null',
+			'meta[dothat]': 'false',
+			'meta[dothis]': 'true',
+			'meta[nested]': 'foo',
+			'meta[supermeta][nested]': 'baz',
+			customClass: 'i am rich text',
+		} );
+	} );
+} );
diff --git a/packages/media-utils/src/utils/test/get-mime-types-array.ts b/packages/media-utils/src/utils/test/get-mime-types-array.ts
new file mode 100644
index 00000000000000..156955373bd0da
--- /dev/null
+++ b/packages/media-utils/src/utils/test/get-mime-types-array.ts
@@ -0,0 +1,47 @@
+/**
+ * Internal dependencies
+ */
+import { getMimeTypesArray } from '../get-mime-types-array';
+
+describe( 'getMimeTypesArray', () => {
+	it( 'should return null if it is "falsy" e.g: undefined or null', () => {
+		expect( getMimeTypesArray( null ) ).toEqual( null );
+		expect( getMimeTypesArray( undefined ) ).toEqual( null );
+	} );
+
+	it( 'should return an empty array if an empty object is passed', () => {
+		expect( getMimeTypesArray( {} ) ).toEqual( [] );
+	} );
+
+	it( 'should return the type plus a new mime type with type and subtype with the extension if a type is passed', () => {
+		expect( getMimeTypesArray( { ext: 'chicken' } ) ).toEqual( [
+			'chicken',
+			'chicken/ext',
+		] );
+	} );
+
+	it( 'should return the mime type passed and a new mime type with type and the extension as subtype', () => {
+		expect( getMimeTypesArray( { ext: 'chicken/ribs' } ) ).toEqual( [
+			'chicken/ribs',
+			'chicken/ext',
+		] );
+	} );
+
+	it( 'should return the mime type passed and an additional mime type per extension supported', () => {
+		expect( getMimeTypesArray( { 'jpg|jpeg|jpe': 'image/jpeg' } ) ).toEqual(
+			[ 'image/jpeg', 'image/jpg', 'image/jpeg', 'image/jpe' ]
+		);
+	} );
+
+	it( 'should handle multiple mime types', () => {
+		expect(
+			getMimeTypesArray( { 'ext|aaa': 'chicken/ribs', aaa: 'bbb' } )
+		).toEqual( [
+			'chicken/ribs',
+			'chicken/ext',
+			'chicken/aaa',
+			'bbb',
+			'bbb/aaa',
+		] );
+	} );
+} );
diff --git a/packages/media-utils/src/utils/test/upload-error.ts b/packages/media-utils/src/utils/test/upload-error.ts
new file mode 100644
index 00000000000000..4d5f025ed8cf39
--- /dev/null
+++ b/packages/media-utils/src/utils/test/upload-error.ts
@@ -0,0 +1,24 @@
+/**
+ * Internal dependencies
+ */
+import { UploadError } from '../upload-error';
+
+describe( 'UploadError', () => {
+	it( 'holds error code and file name', () => {
+		const file = new File( [], 'example.jpg', {
+			lastModified: 1234567891,
+			type: 'image/jpeg',
+		} );
+
+		const error = new UploadError( {
+			code: 'some_error',
+			message: 'An error occurred',
+			file,
+		} );
+
+		expect( error ).toStrictEqual( expect.any( Error ) );
+		expect( error.code ).toBe( 'some_error' );
+		expect( error.message ).toBe( 'An error occurred' );
+		expect( error.file ).toBe( file );
+	} );
+} );
diff --git a/packages/media-utils/src/utils/test/upload-media.test.js b/packages/media-utils/src/utils/test/upload-media.test.js
deleted file mode 100644
index fa9adc9f408815..00000000000000
--- a/packages/media-utils/src/utils/test/upload-media.test.js
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createBlobURL } from '@wordpress/blob';
-import apiFetch from '@wordpress/api-fetch';
-
-/**
- * Internal dependencies
- */
-import { uploadMedia, getMimeTypesArray } from '../upload-media';
-
-jest.mock( '@wordpress/blob', () => ( {
-	createBlobURL: jest.fn(),
-	revokeBlobURL: jest.fn(),
-} ) );
-jest.mock( '@wordpress/api-fetch', () => jest.fn() );
-
-const xmlFile = new window.File( [ 'fake_file' ], 'test.xml', {
-	type: 'text/xml',
-} );
-const imageFile = new window.File( [ 'fake_file' ], 'test.jpeg', {
-	type: 'image/jpeg',
-} );
-
-describe( 'uploadMedia', () => {
-	it( 'should do nothing on no files', async () => {
-		const onError = jest.fn();
-		const onFileChange = jest.fn();
-		await uploadMedia( {
-			filesList: [],
-			onError,
-			onFileChange,
-		} );
-
-		expect( onError ).not.toHaveBeenCalled();
-		expect( onFileChange ).not.toHaveBeenCalled();
-	} );
-
-	it( 'should error if allowedTypes contains a partial mime type and the validation fails', async () => {
-		const onError = jest.fn();
-		const onFileChange = jest.fn();
-		await uploadMedia( {
-			allowedTypes: [ 'image' ],
-			filesList: [ xmlFile ],
-			onError,
-			onFileChange,
-		} );
-
-		expect( onError ).toHaveBeenCalledWith(
-			expect.objectContaining( {
-				code: 'MIME_TYPE_NOT_SUPPORTED',
-			} )
-		);
-		expect( onFileChange ).not.toHaveBeenCalled();
-	} );
-
-	it( 'should error if allowedTypes contains a complete mime type and the validation fails', async () => {
-		const onError = jest.fn();
-		const onFileChange = jest.fn();
-		await uploadMedia( {
-			allowedTypes: [ 'image/gif' ],
-			filesList: [ imageFile ],
-			onError,
-			onFileChange,
-		} );
-
-		expect( onError ).toHaveBeenCalledWith(
-			expect.objectContaining( {
-				code: 'MIME_TYPE_NOT_SUPPORTED',
-			} )
-		);
-		expect( onFileChange ).not.toHaveBeenCalled();
-	} );
-
-	it( 'should work if allowedTypes contains a complete mime type and the validation succeeds', async () => {
-		createBlobURL.mockReturnValue( 'blob:fake_blob' );
-		apiFetch.mockResolvedValue( { title: { raw: 'Test' } } );
-
-		const onError = jest.fn();
-		const onFileChange = jest.fn();
-		await uploadMedia( {
-			allowedTypes: [ 'image/jpeg' ],
-			filesList: [ imageFile ],
-			onError,
-			onFileChange,
-		} );
-
-		expect( onError ).not.toHaveBeenCalled();
-		expect( onFileChange ).toHaveBeenCalledTimes( 2 );
-	} );
-
-	it( 'should error if allowedTypes contains multiple types and the validation fails', async () => {
-		const onError = jest.fn();
-		const onFileChange = jest.fn();
-		await uploadMedia( {
-			allowedTypes: [ 'video', 'image' ],
-			filesList: [ xmlFile ],
-			onError,
-			onFileChange,
-		} );
-
-		expect( onError ).toHaveBeenCalledWith(
-			expect.objectContaining( {
-				code: 'MIME_TYPE_NOT_SUPPORTED',
-			} )
-		);
-		expect( onFileChange ).not.toHaveBeenCalled();
-	} );
-
-	it( 'should work if allowedTypes contains multiple types and the validation succeeds', async () => {
-		createBlobURL.mockReturnValue( 'blob:fake_blob' );
-		apiFetch.mockResolvedValue( { title: { raw: 'Test' } } );
-
-		const onError = jest.fn();
-		const onFileChange = jest.fn();
-		await uploadMedia( {
-			allowedTypes: [ 'video', 'image' ],
-			filesList: [ imageFile ],
-			onError,
-			onFileChange,
-		} );
-
-		expect( onError ).not.toHaveBeenCalled();
-		expect( onFileChange ).toHaveBeenCalledTimes( 2 );
-	} );
-
-	it( 'should only fail the invalid file and still allow others to succeed when uploading multiple files', async () => {
-		createBlobURL.mockReturnValue( 'blob:fake_blob' );
-		apiFetch.mockResolvedValue( { title: { raw: 'Test' } } );
-
-		const onError = jest.fn();
-		const onFileChange = jest.fn();
-		await uploadMedia( {
-			allowedTypes: [ 'image' ],
-			filesList: [ imageFile, xmlFile ],
-			onError,
-			onFileChange,
-		} );
-
-		expect( onError ).toHaveBeenCalledWith(
-			expect.objectContaining( {
-				code: 'MIME_TYPE_NOT_SUPPORTED',
-				file: xmlFile,
-			} )
-		);
-		expect( onFileChange ).toHaveBeenCalledTimes( 2 );
-	} );
-
-	it( 'should error if the file size is greater than the maximum', async () => {
-		const onError = jest.fn();
-		const onFileChange = jest.fn();
-		await uploadMedia( {
-			allowedTypes: [ 'image' ],
-			filesList: [ imageFile ],
-			maxUploadFileSize: 1,
-			onError,
-			onFileChange,
-		} );
-
-		expect( onError ).toHaveBeenCalledWith(
-			expect.objectContaining( {
-				code: 'SIZE_ABOVE_LIMIT',
-			} )
-		);
-		expect( onFileChange ).not.toHaveBeenCalled();
-	} );
-
-	it( 'should call error handler with the correct error object if file type is not allowed for user', async () => {
-		const onError = jest.fn();
-		const onFileChange = jest.fn();
-		await uploadMedia( {
-			allowedTypes: [ 'image' ],
-			filesList: [ imageFile ],
-			onError,
-			wpAllowedMimeTypes: { aac: 'audio/aac' },
-		} );
-
-		expect( onError ).toHaveBeenCalledWith(
-			expect.objectContaining( {
-				code: 'MIME_TYPE_NOT_ALLOWED_FOR_USER',
-			} )
-		);
-		expect( onFileChange ).not.toHaveBeenCalled();
-	} );
-} );
-
-describe( 'getMimeTypesArray', () => {
-	it( 'should return the parameter passed if it is "falsy" e.g: undefined or null', () => {
-		expect( getMimeTypesArray( null ) ).toEqual( null );
-		expect( getMimeTypesArray( undefined ) ).toEqual( undefined );
-	} );
-
-	it( 'should return an empty array if an empty object is passed', () => {
-		expect( getMimeTypesArray( {} ) ).toEqual( [] );
-	} );
-
-	it( 'should return the type plus a new mime type with type and subtype with the extension if a type is passed', () => {
-		expect( getMimeTypesArray( { ext: 'chicken' } ) ).toEqual( [
-			'chicken',
-			'chicken/ext',
-		] );
-	} );
-
-	it( 'should return the mime type passed and a new mime type with type and the extension as subtype', () => {
-		expect( getMimeTypesArray( { ext: 'chicken/ribs' } ) ).toEqual( [
-			'chicken/ribs',
-			'chicken/ext',
-		] );
-	} );
-
-	it( 'should return the mime type passed and an additional mime type per extension supported', () => {
-		expect( getMimeTypesArray( { 'jpg|jpeg|jpe': 'image/jpeg' } ) ).toEqual(
-			[ 'image/jpeg', 'image/jpg', 'image/jpeg', 'image/jpe' ]
-		);
-	} );
-
-	it( 'should handle multiple mime types', () => {
-		expect(
-			getMimeTypesArray( { 'ext|aaa': 'chicken/ribs', aaa: 'bbb' } )
-		).toEqual( [
-			'chicken/ribs',
-			'chicken/ext',
-			'chicken/aaa',
-			'bbb',
-			'bbb/aaa',
-		] );
-	} );
-} );
diff --git a/packages/media-utils/src/utils/test/upload-media.ts b/packages/media-utils/src/utils/test/upload-media.ts
new file mode 100644
index 00000000000000..b5075255ad4c81
--- /dev/null
+++ b/packages/media-utils/src/utils/test/upload-media.ts
@@ -0,0 +1,199 @@
+/**
+ * Internal dependencies
+ */
+import { uploadMedia } from '../upload-media';
+import { UploadError } from '../upload-error';
+import { uploadToServer } from '../upload-to-server';
+
+jest.mock( '../upload-to-server', () => ( {
+	uploadToServer: jest.fn(),
+} ) );
+
+jest.mock( '@wordpress/blob', () => ( {
+	createBlobURL: jest.fn(),
+	revokeBlobURL: jest.fn(),
+} ) );
+
+const xmlFile = new window.File( [ 'fake_file' ], 'test.xml', {
+	type: 'text/xml',
+} );
+const imageFile = new window.File( [ 'fake_file' ], 'test.jpeg', {
+	type: 'image/jpeg',
+} );
+
+describe( 'uploadMedia', () => {
+	afterEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	it( 'should do nothing on no files', async () => {
+		const onError = jest.fn();
+		const onFileChange = jest.fn();
+		await uploadMedia( {
+			filesList: [],
+			onError,
+			onFileChange,
+		} );
+
+		expect( onError ).not.toHaveBeenCalled();
+		expect( uploadToServer ).not.toHaveBeenCalled();
+	} );
+
+	it( 'should error if allowedTypes contains a partial mime type and the validation fails', async () => {
+		const onError = jest.fn();
+		const onFileChange = jest.fn();
+		await uploadMedia( {
+			allowedTypes: [ 'image' ],
+			filesList: [ xmlFile ],
+			onError,
+			onFileChange,
+		} );
+
+		expect( onError ).toHaveBeenCalledWith(
+			new UploadError( {
+				code: 'MIME_TYPE_NOT_SUPPORTED',
+				message:
+					'test.xml: Sorry, this file type is not supported here.',
+				file: xmlFile,
+			} )
+		);
+		expect( uploadToServer ).not.toHaveBeenCalled();
+	} );
+
+	it( 'should error if allowedTypes contains a complete mime type and the validation fails', async () => {
+		const onError = jest.fn();
+		const onFileChange = jest.fn();
+		await uploadMedia( {
+			allowedTypes: [ 'image/gif' ],
+			filesList: [ imageFile ],
+			onError,
+			onFileChange,
+		} );
+
+		expect( onError ).toHaveBeenCalledWith(
+			new UploadError( {
+				code: 'MIME_TYPE_NOT_SUPPORTED',
+				message:
+					'test.jpeg: Sorry, this file type is not supported here.',
+				file: xmlFile,
+			} )
+		);
+		expect( uploadToServer ).not.toHaveBeenCalled();
+	} );
+
+	it( 'should work if allowedTypes contains a complete mime type and the validation succeeds', async () => {
+		const onError = jest.fn();
+		const onFileChange = jest.fn();
+		await uploadMedia( {
+			allowedTypes: [ 'image/jpeg' ],
+			filesList: [ imageFile ],
+			onError,
+			onFileChange,
+			wpAllowedMimeTypes: { jpeg: 'image/jpeg' },
+		} );
+
+		expect( onError ).not.toHaveBeenCalled();
+		expect( uploadToServer ).toHaveBeenCalled();
+	} );
+
+	it( 'should error if allowedTypes contains multiple types and the validation fails', async () => {
+		const onError = jest.fn();
+		const onFileChange = jest.fn();
+		await uploadMedia( {
+			allowedTypes: [ 'video', 'image' ],
+			filesList: [ xmlFile ],
+			onError,
+			onFileChange,
+		} );
+
+		expect( onError ).toHaveBeenCalledWith(
+			new UploadError( {
+				code: 'MIME_TYPE_NOT_SUPPORTED',
+				message:
+					'test.xml: Sorry, this file type is not supported here.',
+				file: xmlFile,
+			} )
+		);
+		expect( uploadToServer ).not.toHaveBeenCalled();
+	} );
+
+	it( 'should work if allowedTypes contains multiple types and the validation succeeds', async () => {
+		const onError = jest.fn();
+		const onFileChange = jest.fn();
+		await uploadMedia( {
+			allowedTypes: [ 'video', 'image' ],
+			filesList: [ imageFile ],
+			onError,
+			onFileChange,
+			wpAllowedMimeTypes: { jpeg: 'image/jpeg', mp4: 'video/mp4' },
+		} );
+
+		expect( onError ).not.toHaveBeenCalled();
+		expect( uploadToServer ).toHaveBeenCalled();
+	} );
+
+	it( 'should only fail the invalid file and still allow others to succeed when uploading multiple files', async () => {
+		const onError = jest.fn();
+		const onFileChange = jest.fn();
+		await uploadMedia( {
+			allowedTypes: [ 'image' ],
+			filesList: [ imageFile, xmlFile ],
+			onError,
+			onFileChange,
+			wpAllowedMimeTypes: { jpeg: 'image/jpeg' },
+		} );
+
+		expect( onError ).toHaveBeenCalledWith(
+			new UploadError( {
+				code: 'MIME_TYPE_NOT_SUPPORTED',
+				message:
+					'test.xml: Sorry, you are not allowed to upload this file type.',
+				file: xmlFile,
+			} )
+		);
+		expect( uploadToServer ).toHaveBeenCalledTimes( 1 );
+	} );
+
+	it( 'should error if the file size is greater than the maximum', async () => {
+		const onError = jest.fn();
+		const onFileChange = jest.fn();
+		await uploadMedia( {
+			allowedTypes: [ 'image' ],
+			filesList: [ imageFile ],
+			maxUploadFileSize: 1,
+			onError,
+			onFileChange,
+			wpAllowedMimeTypes: { jpeg: 'image/jpeg' },
+		} );
+
+		expect( onError ).toHaveBeenCalledWith(
+			new UploadError( {
+				code: 'SIZE_ABOVE_LIMIT',
+				message:
+					'test.jpeg: This file exceeds the maximum upload size for this site.',
+				file: imageFile,
+			} )
+		);
+		expect( uploadToServer ).not.toHaveBeenCalled();
+	} );
+
+	it( 'should call error handler with the correct error object if file type is not allowed for user', async () => {
+		const onError = jest.fn();
+		await uploadMedia( {
+			allowedTypes: [ 'image' ],
+			filesList: [ imageFile ],
+			onError,
+			wpAllowedMimeTypes: { aac: 'audio/aac' },
+		} );
+
+		expect( onError ).toHaveBeenCalledWith(
+			new UploadError( {
+				code: 'MIME_TYPE_NOT_ALLOWED_FOR_USER',
+				message:
+					'test.jpeg: Sorry, you are not allowed to upload this file type.',
+				file: imageFile,
+			} )
+		);
+		expect( uploadToServer ).not.toHaveBeenCalled();
+	} );
+} );
diff --git a/packages/media-utils/src/utils/test/validate-file-size.ts b/packages/media-utils/src/utils/test/validate-file-size.ts
new file mode 100644
index 00000000000000..31d6af0e7e4a55
--- /dev/null
+++ b/packages/media-utils/src/utils/test/validate-file-size.ts
@@ -0,0 +1,70 @@
+/**
+ * Internal dependencies
+ */
+import { validateFileSize } from '../validate-file-size';
+import { UploadError } from '../upload-error';
+
+const imageFile = new window.File( [ 'fake_file' ], 'test.jpeg', {
+	type: 'image/jpeg',
+} );
+
+const emptyFile = new window.File( [], 'test.jpeg', {
+	type: 'image/jpeg',
+} );
+
+describe( 'validateFileSize', () => {
+	afterEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	it( 'should error if the file is empty', () => {
+		expect( () => {
+			validateFileSize( emptyFile );
+		} ).toThrow(
+			new UploadError( {
+				code: 'EMPTY_FILE',
+				message: 'test.jpeg: This file is empty.',
+				file: imageFile,
+			} )
+		);
+	} );
+
+	it( 'should error if the file is is greater than the maximum', () => {
+		expect( () => {
+			validateFileSize( imageFile, 2 );
+		} ).toThrow(
+			new UploadError( {
+				code: 'SIZE_ABOVE_LIMIT',
+				message:
+					'test.jpeg: This file exceeds the maximum upload size for this site.',
+				file: imageFile,
+			} )
+		);
+	} );
+
+	it( 'should not error if the file is below the limit', () => {
+		expect( () => {
+			validateFileSize( imageFile, 100 );
+		} ).not.toThrow(
+			new UploadError( {
+				code: 'SIZE_ABOVE_LIMIT',
+				message:
+					'test.jpeg: This file exceeds the maximum upload size for this site.',
+				file: imageFile,
+			} )
+		);
+	} );
+
+	it( 'should not error if there is no limit', () => {
+		expect( () => {
+			validateFileSize( imageFile );
+		} ).not.toThrow(
+			new UploadError( {
+				code: 'SIZE_ABOVE_LIMIT',
+				message:
+					'test.jpeg: This file exceeds the maximum upload size for this site.',
+				file: imageFile,
+			} )
+		);
+	} );
+} );
diff --git a/packages/media-utils/src/utils/test/validate-mime-type-for-user.ts b/packages/media-utils/src/utils/test/validate-mime-type-for-user.ts
new file mode 100644
index 00000000000000..d2566566862142
--- /dev/null
+++ b/packages/media-utils/src/utils/test/validate-mime-type-for-user.ts
@@ -0,0 +1,37 @@
+/**
+ * Internal dependencies
+ */
+import { validateMimeTypeForUser } from '../validate-mime-type-for-user';
+import { UploadError } from '../upload-error';
+
+const imageFile = new window.File( [ 'fake_file' ], 'test.jpeg', {
+	type: 'image/jpeg',
+} );
+
+describe( 'validateMimeTypeForUser', () => {
+	afterEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	it( 'should not error if  wpAllowedMimeTypes is null or missing', async () => {
+		expect( () => {
+			validateMimeTypeForUser( imageFile );
+		} ).not.toThrow();
+		expect( () => {
+			validateMimeTypeForUser( imageFile, null );
+		} ).not.toThrow();
+	} );
+
+	it( 'should error if file type is not allowed for user', async () => {
+		expect( () => {
+			validateMimeTypeForUser( imageFile, { aac: 'audio/aac' } );
+		} ).toThrow(
+			new UploadError( {
+				code: 'MIME_TYPE_NOT_ALLOWED_FOR_USER',
+				message:
+					'test.jpeg: Sorry, you are not allowed to upload this file type.',
+				file: imageFile,
+			} )
+		);
+	} );
+} );
diff --git a/packages/media-utils/src/utils/test/validate-mime-type.ts b/packages/media-utils/src/utils/test/validate-mime-type.ts
new file mode 100644
index 00000000000000..a83cdcefe5f99a
--- /dev/null
+++ b/packages/media-utils/src/utils/test/validate-mime-type.ts
@@ -0,0 +1,57 @@
+/**
+ * Internal dependencies
+ */
+import { validateMimeType } from '../validate-mime-type';
+import { UploadError } from '../upload-error';
+
+const xmlFile = new window.File( [ 'fake_file' ], 'test.xml', {
+	type: 'text/xml',
+} );
+const imageFile = new window.File( [ 'fake_file' ], 'test.jpeg', {
+	type: 'image/jpeg',
+} );
+
+describe( 'validateMimeType', () => {
+	afterEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	it( 'should error if allowedTypes contains a partial mime type and the validation fails', async () => {
+		expect( () => {
+			validateMimeType( xmlFile, [ 'image' ] );
+		} ).toThrow(
+			new UploadError( {
+				code: 'MIME_TYPE_NOT_SUPPORTED',
+				message:
+					'test.xml: Sorry, this file type is not supported here.',
+				file: xmlFile,
+			} )
+		);
+	} );
+
+	it( 'should error if allowedTypes contains a complete mime type and the validation fails', async () => {
+		expect( () => {
+			validateMimeType( imageFile, [ 'image/gif' ] );
+		} ).toThrow(
+			new UploadError( {
+				code: 'MIME_TYPE_NOT_SUPPORTED',
+				message:
+					'test.jpeg: Sorry, this file type is not supported here.',
+				file: xmlFile,
+			} )
+		);
+	} );
+
+	it( 'should error if allowedTypes contains multiple types and the validation fails', async () => {
+		expect( () => {
+			validateMimeType( xmlFile, [ 'video', 'image' ] );
+		} ).toThrow(
+			new UploadError( {
+				code: 'MIME_TYPE_NOT_SUPPORTED',
+				message:
+					'test.xml: Sorry, this file type is not supported here.',
+				file: xmlFile,
+			} )
+		);
+	} );
+} );
diff --git a/packages/media-utils/src/utils/transform-attachment.ts b/packages/media-utils/src/utils/transform-attachment.ts
new file mode 100644
index 00000000000000..a97287872f24af
--- /dev/null
+++ b/packages/media-utils/src/utils/transform-attachment.ts
@@ -0,0 +1,24 @@
+/**
+ * Internal dependencies
+ */
+import type { Attachment, RestAttachment } from './types';
+
+/**
+ * Transforms an attachment object from the REST API shape into the shape expected by the block editor and other consumers.
+ *
+ * @param attachment REST API attachment object.
+ */
+export function transformAttachment( attachment: RestAttachment ): Attachment {
+	// eslint-disable-next-line camelcase
+	const { alt_text, source_url, ...savedMediaProps } = attachment;
+	return {
+		...savedMediaProps,
+		alt: attachment.alt_text,
+		caption: attachment.caption?.raw ?? '',
+		title: attachment.title.raw,
+		url: attachment.source_url,
+		poster:
+			attachment._embedded?.[ 'wp:featuredmedia' ]?.[ 0 ]?.source_url ||
+			undefined,
+	};
+}
diff --git a/packages/media-utils/src/utils/types.ts b/packages/media-utils/src/utils/types.ts
new file mode 100644
index 00000000000000..e05536400a7604
--- /dev/null
+++ b/packages/media-utils/src/utils/types.ts
@@ -0,0 +1,207 @@
+/**
+ * A media attachment object in a REST API context.
+ *
+ * Simplified version of what's defined in the wp-types package.
+ *
+ * @see https://www.npmjs.com/package/wp-types
+ */
+interface WP_REST_API_Attachment {
+	/**
+	 * Unique identifier for the attachment.
+	 */
+	id: number;
+	/**
+	 * The ID of the featured media for the post.
+	 */
+	featured_media: number;
+	/**
+	 * URL to the attachment.
+	 */
+	link: string;
+	/**
+	 * The date the attachment was published, in the site's timezone.
+	 */
+	date: string;
+	/**
+	 * The date the attachment was published, as GMT.
+	 */
+	date_gmt: string;
+	/**
+	 * The date the attachment was last modified, in the site's timezone.
+	 */
+	modified: string;
+	/**
+	 * The date the attachment was last modified, as GMT.
+	 */
+	modified_gmt: string;
+	/**
+	 * An alphanumeric identifier for the attachment unique to its type.
+	 */
+	slug: string;
+	/**
+	 * A named status for the attachment.
+	 */
+	status: string;
+	/**
+	 * Type of Post for the attachment.
+	 */
+	type: 'attachment';
+	/**
+	 * Alternative text to display when attachment is not displayed.
+	 */
+	alt_text: string;
+	/**
+	 * The attachment caption.
+	 */
+	caption: {
+		/**
+		 * Caption for the attachment, as it exists in the database. Only present when using the 'edit' context.
+		 */
+		raw?: string;
+		/**
+		 * HTML caption for the attachment, transformed for display.
+		 */
+		rendered: string;
+	};
+	/**
+	 * The attachment description.
+	 */
+	description: {
+		/**
+		 * Description for the attachment, as it exists in the database. Only present when using the 'edit' context.
+		 */
+		raw?: string;
+		/**
+		 * HTML description for the attachment, transformed for display.
+		 */
+		rendered: string;
+	};
+	/**
+	 * Attachment type.
+	 */
+	media_type: 'image' | 'file';
+	/**
+	 * The attachment MIME type.
+	 */
+	mime_type: string;
+	/**
+	 * Details about the media file, specific to its type.
+	 */
+	media_details: {
+		[ k: string ]: unknown;
+	};
+	/**
+	 * The ID for the associated post of the attachment.
+	 */
+	post: number | null;
+	/**
+	 * URL to the original attachment file.
+	 */
+	source_url: string;
+	/**
+	 * List of the missing image sizes of the attachment.  Only present when using the 'edit' context.
+	 */
+	missing_image_sizes?: string[];
+	/**
+	 * Permalink template for the attachment. Only present when using the 'edit' context and the post type is public.
+	 */
+	permalink_template?: string;
+	/**
+	 * Slug automatically generated from the attachment title. Only present when using the 'edit' context and the post type is public.
+	 */
+	generated_slug?: string;
+	/**
+	 * An array of the class names for the post container element.
+	 */
+	class_list: string[];
+	/**
+	 * The title for the attachment.
+	 */
+	title: {
+		/**
+		 * Title for the attachment, as it exists in the database. Only present when using the 'edit' context.
+		 */
+		raw?: string;
+		/**
+		 * HTML title for the attachment, transformed for display.
+		 */
+		rendered: string;
+	};
+	/**
+	 * The ID for the author of the attachment.
+	 */
+	author: number;
+	/**
+	 * Whether or not comments are open on the attachment.
+	 */
+	comment_status: string;
+	/**
+	 * Whether or not the attachment can be pinged.
+	 */
+	ping_status: string;
+	/**
+	 * Meta fields.
+	 */
+	meta:
+		| []
+		| {
+				[ k: string ]: unknown;
+		  };
+	/**
+	 * The theme file to use to display the attachment.
+	 */
+	template: string;
+	_links: {
+		[ k: string ]: {
+			href: string;
+			embeddable?: boolean;
+			[ k: string ]: unknown;
+		}[];
+	};
+	/**
+	 * The embedded representation of relations. Only present when the '_embed' query parameter is set.
+	 */
+	_embedded?: {
+		/**
+		 * The author of the post.
+		 */
+		author: unknown[];
+		/**
+		 * The featured image post.
+		 */
+		'wp:featuredmedia'?: WP_REST_API_Attachment[];
+		[ k: string ]: unknown;
+	};
+	[ k: string ]: unknown;
+}
+
+/**
+ * REST API attachment object with additional fields added by this project.
+ */
+export interface RestAttachment extends WP_REST_API_Attachment {}
+
+type BetterOmit< T, K extends PropertyKey > = {
+	[ P in keyof T as P extends K ? never : P ]: T[ P ];
+};
+
+/**
+ * Transformed attachment object.
+ */
+export type Attachment = BetterOmit<
+	RestAttachment,
+	'alt_text' | 'source_url' | 'caption' | 'title'
+> & {
+	alt: WP_REST_API_Attachment[ 'alt_text' ];
+	caption: WP_REST_API_Attachment[ 'caption' ][ 'raw' ] & string;
+	title: WP_REST_API_Attachment[ 'title' ][ 'raw' ];
+	url: WP_REST_API_Attachment[ 'source_url' ];
+	poster?: WP_REST_API_Attachment[ 'source_url' ];
+};
+
+export type OnChangeHandler = ( attachments: Partial< Attachment >[] ) => void;
+export type OnSuccessHandler = ( attachments: Partial< Attachment >[] ) => void;
+export type OnErrorHandler = ( error: Error ) => void;
+
+export type CreateRestAttachment = Partial< RestAttachment >;
+
+export type AdditionalData = BetterOmit< CreateRestAttachment, 'meta' >;
diff --git a/packages/media-utils/src/utils/upload-error.ts b/packages/media-utils/src/utils/upload-error.ts
new file mode 100644
index 00000000000000..d712e9dcdb6966
--- /dev/null
+++ b/packages/media-utils/src/utils/upload-error.ts
@@ -0,0 +1,26 @@
+interface UploadErrorArgs {
+	code: string;
+	message: string;
+	file: File;
+	cause?: Error;
+}
+
+/**
+ * MediaError class.
+ *
+ * Small wrapper around the `Error` class
+ * to hold an error code and a reference to a file object.
+ */
+export class UploadError extends Error {
+	code: string;
+	file: File;
+
+	constructor( { code, message, file, cause }: UploadErrorArgs ) {
+		super( message, { cause } );
+
+		Object.setPrototypeOf( this, new.target.prototype );
+
+		this.code = code;
+		this.file = file;
+	}
+}
diff --git a/packages/media-utils/src/utils/upload-media.js b/packages/media-utils/src/utils/upload-media.js
deleted file mode 100644
index e3c9b95d5c25cd..00000000000000
--- a/packages/media-utils/src/utils/upload-media.js
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * WordPress dependencies
- */
-import apiFetch from '@wordpress/api-fetch';
-import { createBlobURL, revokeBlobURL } from '@wordpress/blob';
-import { __, sprintf } from '@wordpress/i18n';
-
-const noop = () => {};
-
-/**
- * Browsers may use unexpected mime types, and they differ from browser to browser.
- * This function computes a flexible array of mime types from the mime type structured provided by the server.
- * Converts { jpg|jpeg|jpe: "image/jpeg" } into [ "image/jpeg", "image/jpg", "image/jpeg", "image/jpe" ]
- * The computation of this array instead of directly using the object,
- * solves the problem in chrome where mp3 files have audio/mp3 as mime type instead of audio/mpeg.
- * https://bugs.chromium.org/p/chromium/issues/detail?id=227004
- *
- * @param {?Object} wpMimeTypesObject Mime type object received from the server.
- *                                    Extensions are keys separated by '|' and values are mime types associated with an extension.
- *
- * @return {?Array} An array of mime types or the parameter passed if it was "falsy".
- */
-export function getMimeTypesArray( wpMimeTypesObject ) {
-	if ( ! wpMimeTypesObject ) {
-		return wpMimeTypesObject;
-	}
-	return Object.entries( wpMimeTypesObject )
-		.map( ( [ extensionsString, mime ] ) => {
-			const [ type ] = mime.split( '/' );
-			const extensions = extensionsString.split( '|' );
-			return [
-				mime,
-				...extensions.map(
-					( extension ) => `${ type }/${ extension }`
-				),
-			];
-		} )
-		.flat();
-}
-
-/**
- *	Media Upload is used by audio, image, gallery, video, and file blocks to
- *	handle uploading a media file when a file upload button is activated.
- *
- *	TODO: future enhancement to add an upload indicator.
- *
- * @param {Object}   $0                    Parameters object passed to the function.
- * @param {?Array}   $0.allowedTypes       Array with the types of media that can be uploaded, if unset all types are allowed.
- * @param {?Object}  $0.additionalData     Additional data to include in the request.
- * @param {Array}    $0.filesList          List of files.
- * @param {?number}  $0.maxUploadFileSize  Maximum upload size in bytes allowed for the site.
- * @param {Function} $0.onError            Function called when an error happens.
- * @param {Function} $0.onFileChange       Function called each time a file or a temporary representation of the file is available.
- * @param {?Object}  $0.wpAllowedMimeTypes List of allowed mime types and file extensions.
- */
-export async function uploadMedia( {
-	allowedTypes,
-	additionalData = {},
-	filesList,
-	maxUploadFileSize,
-	onError = noop,
-	onFileChange,
-	wpAllowedMimeTypes = null,
-} ) {
-	// Cast filesList to array.
-	const files = [ ...filesList ];
-
-	const filesSet = [];
-	const setAndUpdateFiles = ( idx, value ) => {
-		revokeBlobURL( filesSet[ idx ]?.url );
-		filesSet[ idx ] = value;
-		onFileChange( filesSet.filter( Boolean ) );
-	};
-
-	// Allowed type specified by consumer.
-	const isAllowedType = ( fileType ) => {
-		if ( ! allowedTypes ) {
-			return true;
-		}
-		return allowedTypes.some( ( allowedType ) => {
-			// If a complete mimetype is specified verify if it matches exactly the mime type of the file.
-			if ( allowedType.includes( '/' ) ) {
-				return allowedType === fileType;
-			}
-			// Otherwise a general mime type is used and we should verify if the file mimetype starts with it.
-			return fileType.startsWith( `${ allowedType }/` );
-		} );
-	};
-
-	// Allowed types for the current WP_User.
-	const allowedMimeTypesForUser = getMimeTypesArray( wpAllowedMimeTypes );
-	const isAllowedMimeTypeForUser = ( fileType ) => {
-		return allowedMimeTypesForUser.includes( fileType );
-	};
-
-	const validFiles = [];
-
-	for ( const mediaFile of files ) {
-		// Verify if user is allowed to upload this mime type.
-		// Defer to the server when type not detected.
-		if (
-			allowedMimeTypesForUser &&
-			mediaFile.type &&
-			! isAllowedMimeTypeForUser( mediaFile.type )
-		) {
-			onError( {
-				code: 'MIME_TYPE_NOT_ALLOWED_FOR_USER',
-				message: sprintf(
-					// translators: %s: file name.
-					__(
-						'%s: Sorry, you are not allowed to upload this file type.'
-					),
-					mediaFile.name
-				),
-				file: mediaFile,
-			} );
-			continue;
-		}
-
-		// Check if the block supports this mime type.
-		// Defer to the server when type not detected.
-		if ( mediaFile.type && ! isAllowedType( mediaFile.type ) ) {
-			onError( {
-				code: 'MIME_TYPE_NOT_SUPPORTED',
-				message: sprintf(
-					// translators: %s: file name.
-					__( '%s: Sorry, this file type is not supported here.' ),
-					mediaFile.name
-				),
-				file: mediaFile,
-			} );
-			continue;
-		}
-
-		// Verify if file is greater than the maximum file upload size allowed for the site.
-		if ( maxUploadFileSize && mediaFile.size > maxUploadFileSize ) {
-			onError( {
-				code: 'SIZE_ABOVE_LIMIT',
-				message: sprintf(
-					// translators: %s: file name.
-					__(
-						'%s: This file exceeds the maximum upload size for this site.'
-					),
-					mediaFile.name
-				),
-				file: mediaFile,
-			} );
-			continue;
-		}
-
-		// Don't allow empty files to be uploaded.
-		if ( mediaFile.size <= 0 ) {
-			onError( {
-				code: 'EMPTY_FILE',
-				message: sprintf(
-					// translators: %s: file name.
-					__( '%s: This file is empty.' ),
-					mediaFile.name
-				),
-				file: mediaFile,
-			} );
-			continue;
-		}
-
-		validFiles.push( mediaFile );
-
-		// Set temporary URL to create placeholder media file, this is replaced
-		// with final file from media gallery when upload is `done` below.
-		filesSet.push( { url: createBlobURL( mediaFile ) } );
-		onFileChange( filesSet );
-	}
-
-	for ( let idx = 0; idx < validFiles.length; ++idx ) {
-		const mediaFile = validFiles[ idx ];
-		try {
-			const savedMedia = await createMediaFromFile(
-				mediaFile,
-				additionalData
-			);
-			// eslint-disable-next-line camelcase
-			const { alt_text, source_url, ...savedMediaProps } = savedMedia;
-			const mediaObject = {
-				...savedMediaProps,
-				alt: savedMedia.alt_text,
-				caption: savedMedia.caption?.raw ?? '',
-				title: savedMedia.title.raw,
-				url: savedMedia.source_url,
-			};
-			setAndUpdateFiles( idx, mediaObject );
-		} catch ( error ) {
-			// Reset to empty on failure.
-			setAndUpdateFiles( idx, null );
-			let message;
-			if ( error.message ) {
-				message = error.message;
-			} else {
-				message = sprintf(
-					// translators: %s: file name
-					__( 'Error while uploading file %s to the media library.' ),
-					mediaFile.name
-				);
-			}
-			onError( {
-				code: 'GENERAL',
-				message,
-				file: mediaFile,
-			} );
-		}
-	}
-}
-
-/**
- * @param {File}    file           Media File to Save.
- * @param {?Object} additionalData Additional data to include in the request.
- *
- * @return {Promise} Media Object Promise.
- */
-function createMediaFromFile( file, additionalData ) {
-	// Create upload payload.
-	const data = new window.FormData();
-	data.append( 'file', file, file.name || file.type.replace( '/', '.' ) );
-	if ( additionalData ) {
-		Object.entries( additionalData ).forEach( ( [ key, value ] ) =>
-			data.append( key, value )
-		);
-	}
-	return apiFetch( {
-		path: '/wp/v2/media',
-		body: data,
-		method: 'POST',
-	} );
-}
diff --git a/packages/media-utils/src/utils/upload-media.ts b/packages/media-utils/src/utils/upload-media.ts
new file mode 100644
index 00000000000000..1bc861cfb3b607
--- /dev/null
+++ b/packages/media-utils/src/utils/upload-media.ts
@@ -0,0 +1,149 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+import { createBlobURL, revokeBlobURL } from '@wordpress/blob';
+
+/**
+ * Internal dependencies
+ */
+import type {
+	AdditionalData,
+	Attachment,
+	OnChangeHandler,
+	OnErrorHandler,
+	OnSuccessHandler,
+} from './types';
+import { uploadToServer } from './upload-to-server';
+import { validateMimeType } from './validate-mime-type';
+import { validateMimeTypeForUser } from './validate-mime-type-for-user';
+import { validateFileSize } from './validate-file-size';
+import { UploadError } from './upload-error';
+
+interface UploadMediaArgs {
+	// Additional data to include in the request.
+	additionalData?: AdditionalData;
+	// Array with the types of media that can be uploaded, if unset all types are allowed.
+	allowedTypes?: string[];
+	// List of files.
+	filesList: File[];
+	// Maximum upload size in bytes allowed for the site.
+	maxUploadFileSize?: number;
+	// Function called when an error happens.
+	onError?: OnErrorHandler;
+	// Function called each time a file or a temporary representation of the file is available.
+	onFileChange?: OnChangeHandler;
+	// Function called once a file has completely finished uploading, including thumbnails.
+	onSuccess?: OnSuccessHandler;
+	// List of allowed mime types and file extensions.
+	wpAllowedMimeTypes?: Record< string, string > | null;
+	// Abort signal.
+	signal?: AbortSignal;
+}
+
+/**
+ * Upload a media file when the file upload button is activated
+ * or when adding a file to the editor via drag & drop.
+ *
+ * @param $0                    Parameters object passed to the function.
+ * @param $0.allowedTypes       Array with the types of media that can be uploaded, if unset all types are allowed.
+ * @param $0.additionalData     Additional data to include in the request.
+ * @param $0.filesList          List of files.
+ * @param $0.maxUploadFileSize  Maximum upload size in bytes allowed for the site.
+ * @param $0.onError            Function called when an error happens.
+ * @param $0.onFileChange       Function called each time a file or a temporary representation of the file is available.
+ * @param $0.wpAllowedMimeTypes List of allowed mime types and file extensions.
+ * @param $0.signal             Abort signal.
+ */
+export function uploadMedia( {
+	wpAllowedMimeTypes,
+	allowedTypes,
+	additionalData = {},
+	filesList,
+	maxUploadFileSize,
+	onError,
+	onFileChange,
+	signal,
+}: UploadMediaArgs ) {
+	const validFiles = [];
+
+	const filesSet: Array< Partial< Attachment > | null > = [];
+	const setAndUpdateFiles = ( index: number, value: Attachment | null ) => {
+		if ( filesSet[ index ]?.url ) {
+			revokeBlobURL( filesSet[ index ].url );
+		}
+		filesSet[ index ] = value;
+		onFileChange?.(
+			filesSet.filter( ( attachment ) => attachment !== null )
+		);
+	};
+
+	for ( const mediaFile of filesList ) {
+		// Verify if user is allowed to upload this mime type.
+		// Defer to the server when type not detected.
+		try {
+			validateMimeTypeForUser( mediaFile, wpAllowedMimeTypes );
+		} catch ( error: unknown ) {
+			onError?.( error as Error );
+			continue;
+		}
+
+		// Check if the caller (e.g. a block) supports this mime type.
+		// Defer to the server when type not detected.
+		try {
+			validateMimeType( mediaFile, allowedTypes );
+		} catch ( error: unknown ) {
+			onError?.( error as Error );
+			continue;
+		}
+
+		// Verify if file is greater than the maximum file upload size allowed for the site.
+		try {
+			validateFileSize( mediaFile, maxUploadFileSize );
+		} catch ( error: unknown ) {
+			onError?.( error as Error );
+			continue;
+		}
+
+		validFiles.push( mediaFile );
+
+		// Set temporary URL to create placeholder media file, this is replaced
+		// with final file from media gallery when upload is `done` below.
+		filesSet.push( { url: createBlobURL( mediaFile ) } );
+		onFileChange?.( filesSet as Array< Partial< Attachment > > );
+	}
+
+	validFiles.map( async ( file, index ) => {
+		try {
+			const attachment = await uploadToServer(
+				file,
+				additionalData,
+				signal
+			);
+			setAndUpdateFiles( index, attachment );
+		} catch ( error ) {
+			// Reset to empty on failure.
+			setAndUpdateFiles( index, null );
+
+			let message;
+			if ( error instanceof Error ) {
+				message = error.message;
+			} else {
+				message = sprintf(
+					// translators: %s: file name
+					__( 'Error while uploading file %s to the media library.' ),
+					file.name
+				);
+			}
+
+			onError?.(
+				new UploadError( {
+					code: 'GENERAL',
+					message,
+					file,
+					cause: error instanceof Error ? error : undefined,
+				} )
+			);
+		}
+	} );
+}
diff --git a/packages/media-utils/src/utils/upload-to-server.ts b/packages/media-utils/src/utils/upload-to-server.ts
new file mode 100644
index 00000000000000..7aa4243d5ccfd4
--- /dev/null
+++ b/packages/media-utils/src/utils/upload-to-server.ts
@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import apiFetch from '@wordpress/api-fetch';
+
+/**
+ * Internal dependencies
+ */
+import { flattenFormData } from './flatten-form-data';
+import { transformAttachment } from './transform-attachment';
+import type { CreateRestAttachment, RestAttachment } from './types';
+
+export async function uploadToServer(
+	file: File,
+	additionalData: CreateRestAttachment = {},
+	signal?: AbortSignal
+) {
+	// Create upload payload.
+	const data = new FormData();
+	data.append( 'file', file, file.name || file.type.replace( '/', '.' ) );
+	for ( const [ key, value ] of Object.entries( additionalData ) ) {
+		flattenFormData(
+			data,
+			key,
+			value as string | Record< string, string > | undefined
+		);
+	}
+
+	return transformAttachment(
+		await apiFetch< RestAttachment >( {
+			// This allows the video block to directly get a video's poster image.
+			path: '/wp/v2/media?_embed=wp:featuredmedia',
+			body: data,
+			method: 'POST',
+			signal,
+		} )
+	);
+}
diff --git a/packages/media-utils/src/utils/validate-file-size.ts b/packages/media-utils/src/utils/validate-file-size.ts
new file mode 100644
index 00000000000000..cc34462b268dda
--- /dev/null
+++ b/packages/media-utils/src/utils/validate-file-size.ts
@@ -0,0 +1,44 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { UploadError } from './upload-error';
+
+/**
+ * Verifies whether the file is within the file upload size limits for the site.
+ *
+ * @param file              File object.
+ * @param maxUploadFileSize Maximum upload size in bytes allowed for the site.
+ */
+export function validateFileSize( file: File, maxUploadFileSize?: number ) {
+	// Don't allow empty files to be uploaded.
+	if ( file.size <= 0 ) {
+		throw new UploadError( {
+			code: 'EMPTY_FILE',
+			message: sprintf(
+				// translators: %s: file name.
+				__( '%s: This file is empty.' ),
+				file.name
+			),
+			file,
+		} );
+	}
+
+	if ( maxUploadFileSize && file.size > maxUploadFileSize ) {
+		throw new UploadError( {
+			code: 'SIZE_ABOVE_LIMIT',
+			message: sprintf(
+				// translators: %s: file name.
+				__(
+					'%s: This file exceeds the maximum upload size for this site.'
+				),
+				file.name
+			),
+			file,
+		} );
+	}
+}
diff --git a/packages/media-utils/src/utils/validate-mime-type-for-user.ts b/packages/media-utils/src/utils/validate-mime-type-for-user.ts
new file mode 100644
index 00000000000000..858c583561978e
--- /dev/null
+++ b/packages/media-utils/src/utils/validate-mime-type-for-user.ts
@@ -0,0 +1,46 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { UploadError } from './upload-error';
+import { getMimeTypesArray } from './get-mime-types-array';
+
+/**
+ * Verifies if the user is allowed to upload this mime type.
+ *
+ * @param file               File object.
+ * @param wpAllowedMimeTypes List of allowed mime types and file extensions.
+ */
+export function validateMimeTypeForUser(
+	file: File,
+	wpAllowedMimeTypes?: Record< string, string > | null
+) {
+	// Allowed types for the current WP_User.
+	const allowedMimeTypesForUser = getMimeTypesArray( wpAllowedMimeTypes );
+
+	if ( ! allowedMimeTypesForUser ) {
+		return;
+	}
+
+	const isAllowedMimeTypeForUser = allowedMimeTypesForUser.includes(
+		file.type
+	);
+
+	if ( file.type && ! isAllowedMimeTypeForUser ) {
+		throw new UploadError( {
+			code: 'MIME_TYPE_NOT_ALLOWED_FOR_USER',
+			message: sprintf(
+				// translators: %s: file name.
+				__(
+					'%s: Sorry, you are not allowed to upload this file type.'
+				),
+				file.name
+			),
+			file,
+		} );
+	}
+}
diff --git a/packages/media-utils/src/utils/validate-mime-type.ts b/packages/media-utils/src/utils/validate-mime-type.ts
new file mode 100644
index 00000000000000..2d99455d7b60f1
--- /dev/null
+++ b/packages/media-utils/src/utils/validate-mime-type.ts
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { UploadError } from './upload-error';
+
+/**
+ * Verifies if the caller (e.g. a block) supports this mime type.
+ *
+ * @param file         File object.
+ * @param allowedTypes List of allowed mime types.
+ */
+export function validateMimeType( file: File, allowedTypes?: string[] ) {
+	if ( ! allowedTypes ) {
+		return;
+	}
+
+	// Allowed type specified by consumer.
+	const isAllowedType = allowedTypes.some( ( allowedType ) => {
+		// If a complete mimetype is specified verify if it matches exactly the mime type of the file.
+		if ( allowedType.includes( '/' ) ) {
+			return allowedType === file.type;
+		}
+		// Otherwise a general mime type is used, and we should verify if the file mimetype starts with it.
+		return file.type.startsWith( `${ allowedType }/` );
+	} );
+
+	if ( file.type && ! isAllowedType ) {
+		throw new UploadError( {
+			code: 'MIME_TYPE_NOT_SUPPORTED',
+			message: sprintf(
+				// translators: %s: file name.
+				__( '%s: Sorry, this file type is not supported here.' ),
+				file.name
+			),
+			file,
+		} );
+	}
+}
diff --git a/packages/media-utils/tsconfig.json b/packages/media-utils/tsconfig.json
new file mode 100644
index 00000000000000..8559f1507b7235
--- /dev/null
+++ b/packages/media-utils/tsconfig.json
@@ -0,0 +1,17 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig.json",
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"declarationDir": "build-types",
+		"types": [ "gutenberg-env" ],
+		"checkJs": false
+	},
+	"include": [ "src/**/*" ],
+	"references": [
+		{ "path": "../api-fetch" },
+		{ "path": "../blob" },
+		{ "path": "../element" },
+		{ "path": "../i18n" }
+	]
+}
diff --git a/packages/notices/.npmrc b/packages/notices/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/notices/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/notices/CHANGELOG.md b/packages/notices/CHANGELOG.md
index 12abde127dc9ec..3c55e67bb1b021 100644
--- a/packages/notices/CHANGELOG.md
+++ b/packages/notices/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.26.0 (2024-05-16)
+
+## 4.25.0 (2024-05-02)
+
+## 4.24.0 (2024-04-19)
+
+## 4.23.0 (2024-04-03)
+
+## 4.22.0 (2024-03-21)
+
+## 4.21.0 (2024-03-06)
+
+## 4.20.0 (2024-02-21)
+
+## 4.19.0 (2024-02-09)
+
+## 4.18.0 (2024-01-24)
+
+## 4.17.0 (2024-01-10)
+
+## 4.16.0 (2023-12-13)
+
 ## 4.15.0 (2023-11-29)
 
 ## 4.14.0 (2023-11-16)
@@ -28,7 +76,7 @@
 
 ## 4.3.0 (2023-06-07)
 
-### New Feature
+### New Features
 
 -   Add a new action `removeNotices` which allows bulk removal of notices by their IDs. ([#39940](https://github.com/WordPress/gutenberg/pull/39940))
 -   Add a new action `removeAllNotices` which removes all notices from a given context. ([#44059](https://github.com/WordPress/gutenberg/pull/44059))
@@ -39,7 +87,7 @@
 
 ## 4.0.0 (2023-04-26)
 
-### Breaking Change
+### Breaking Changes
 
 -   Publish Typescript build types to npm. ([#49650](https://github.com/WordPress/gutenberg/pull/49650))
 
@@ -116,13 +164,13 @@
 
 ## 2.12.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the notices namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
 ## 2.0.0 (2020-02-10)
 
-### Breaking Change
+### Breaking Changes
 
 -   A notices message is no longer spoken as a result of notice creation, but rather by its display in the interface by its corresponding [`Notice` component](https://github.com/WordPress/gutenberg/tree/HEAD/packages/components/src/notice).
 
@@ -138,7 +186,7 @@
 
 ## 1.1.0 (2018-11-20)
 
-### New Feature
+### New Features
 
 -   New option `speak` enables control as to whether the notice content is announced to screen readers (defaults to `true`)
 
diff --git a/packages/notices/package.json b/packages/notices/package.json
index b5fdfe0377dabb..de04c49a26cd6e 100644
--- a/packages/notices/package.json
+++ b/packages/notices/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/notices",
-	"version": "4.15.0",
+	"version": "5.10.0",
 	"description": "State management for notices.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,21 +19,23 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/data": "file:../data"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/data": "*"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/notices/src/store/actions.js b/packages/notices/src/store/actions.js
index 445eed10650b61..fb1c4243073511 100644
--- a/packages/notices/src/store/actions.js
+++ b/packages/notices/src/store/actions.js
@@ -330,7 +330,7 @@ export function removeNotice( id, context = DEFAULT_CONTEXT ) {
  * 	const notices = useSelect( ( select ) =>
  * 		select( noticesStore ).getNotices()
  * 	);
- * 	const { removeNotices } = useDispatch( noticesStore );
+ * 	const { removeAllNotices } = useDispatch( noticesStore );
  * 	return (
  * 		<>
  * 			<ul>
diff --git a/packages/notices/tsconfig.json b/packages/notices/tsconfig.json
index 561bf355a1b555..e36a6fe9f4eb6b 100644
--- a/packages/notices/tsconfig.json
+++ b/packages/notices/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/npm-package-json-lint-config/.npmrc b/packages/npm-package-json-lint-config/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/npm-package-json-lint-config/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/npm-package-json-lint-config/CHANGELOG.md b/packages/npm-package-json-lint-config/CHANGELOG.md
index aa45ed933d69eb..e4c7943dc448a3 100644
--- a/packages/npm-package-json-lint-config/CHANGELOG.md
+++ b/packages/npm-package-json-lint-config/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.43.0 (2024-05-16)
+
+## 4.42.0 (2024-05-02)
+
+## 4.41.0 (2024-04-19)
+
+## 4.40.0 (2024-04-03)
+
+## 4.39.0 (2024-03-21)
+
+## 4.38.0 (2024-03-06)
+
+## 4.37.0 (2024-02-21)
+
+## 4.36.0 (2024-02-09)
+
+## 4.35.0 (2024-01-24)
+
+## 4.34.0 (2024-01-10)
+
+## 4.33.0 (2023-12-13)
+
 ## 4.32.0 (2023-11-29)
 
 ## 4.31.0 (2023-11-16)
@@ -18,7 +66,7 @@
 
 ## 4.25.0 (2023-08-16)
 
-### Enhancement
+### Enhancements
 
 -   Updated `npm-package-json-lint` peer dependency to require v6.0.0 [#53636](https://github.com/WordPress/gutenberg/pull/53636)
 
@@ -68,13 +116,13 @@
 
 ## 4.2.0 (2022-08-24)
 
-### Bug Fix
+### Bug Fixes
 
 -   Packages: Replace `is-plain-obj` with native functionality ([#43511](https://github.com/WordPress/gutenberg/pull/43511)).
 
 ## 4.0.0 (2021-01-21)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -84,13 +132,13 @@
 
 ## 3.0.0 (2020-04-15)
 
-### Breaking Change
+### Breaking Changes
 
 -   Add `types` to the order of preferred properties. ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
 ## 2.0.0 (2019-06-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   Added `type` and `react-native` to the order of preferred properties.
 
@@ -102,13 +150,13 @@
 
 ## 1.1.3 (2018-09-05)
 
-### Bug Fix
+### Bug Fixes
 
 -   Resolves an issue where npm package lint script did not work in Windows environments ([#9321](https://github.com/WordPress/gutenberg/pull/9321)
 
 ## 1.1.0 (2018-07-12)
 
-### New Feature
+### New Features
 
 -   Updated build to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
@@ -118,6 +166,6 @@
 
 ## 1.0.0 (2018-05-18)
 
-### New Feature
+### New Features
 
 -   Initial release `@wordpress/npm-package-json-lint-config` ([#119](https://github.com/WordPress/packages/pull/119))
diff --git a/packages/npm-package-json-lint-config/README.md b/packages/npm-package-json-lint-config/README.md
index dae33adeb5f8a2..f933cc188a8a04 100644
--- a/packages/npm-package-json-lint-config/README.md
+++ b/packages/npm-package-json-lint-config/README.md
@@ -10,7 +10,7 @@ Install the module
 $ npm install @wordpress/npm-package-json-lint-config
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Usage
 
diff --git a/packages/npm-package-json-lint-config/package.json b/packages/npm-package-json-lint-config/package.json
index 09df294498cdbb..04fbb5ccc0aea0 100644
--- a/packages/npm-package-json-lint-config/package.json
+++ b/packages/npm-package-json-lint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/npm-package-json-lint-config",
-	"version": "4.32.0",
+	"version": "5.10.0",
 	"description": "WordPress npm-package-json-lint shareable configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"index.js"
diff --git a/packages/nux/.npmrc b/packages/nux/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/nux/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/nux/CHANGELOG.md b/packages/nux/CHANGELOG.md
index 959e582b402946..c0af370a933b53 100644
--- a/packages/nux/CHANGELOG.md
+++ b/packages/nux/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 9.10.0 (2024-10-16)
+
+## 9.9.0 (2024-10-03)
+
+## 9.8.0 (2024-09-19)
+
+## 9.7.0 (2024-09-05)
+
+## 9.6.0 (2024-08-21)
+
+## 9.5.0 (2024-08-07)
+
+## 9.4.0 (2024-07-24)
+
+## 9.3.0 (2024-07-10)
+
+## 9.2.0 (2024-06-26)
+
+## 9.1.0 (2024-06-15)
+
+## 9.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 8.20.0 (2024-05-16)
+
+## 8.19.0 (2024-05-02)
+
+## 8.18.0 (2024-04-19)
+
+## 8.17.0 (2024-04-03)
+
+## 8.16.0 (2024-03-21)
+
+## 8.15.0 (2024-03-06)
+
+## 8.14.0 (2024-02-21)
+
+## 8.13.0 (2024-02-09)
+
+## 8.12.0 (2024-01-24)
+
+## 8.11.0 (2024-01-10)
+
+## 8.10.0 (2023-12-13)
+
 ## 8.9.0 (2023-11-29)
 
 ## 8.8.0 (2023-11-16)
@@ -68,7 +116,7 @@
 
 ## 5.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -87,7 +135,7 @@
 
 ## 3.24.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the core data namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
@@ -139,6 +187,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/nux/package.json b/packages/nux/package.json
index e61e63703c5d6d..122bb2758263d6 100644
--- a/packages/nux/package.json
+++ b/packages/nux/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/nux",
-	"version": "8.9.0",
+	"version": "9.10.0",
 	"description": "NUX (New User eXperience) module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -30,15 +31,14 @@
 		"{src,build,build-module}/{index.js,store/index.js}"
 	],
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"rememo": "^4.0.2"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -46,5 +46,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/nux/src/components/dot-tip/index.js b/packages/nux/src/components/dot-tip/index.js
index 50de7ddb3be9df..e2768789ad1fda 100644
--- a/packages/nux/src/components/dot-tip/index.js
+++ b/packages/nux/src/components/dot-tip/index.js
@@ -56,11 +56,16 @@ export function DotTip( {
 		>
 			<p>{ children }</p>
 			<p>
-				<Button variant="link" onClick={ onDismiss }>
+				<Button
+					__next40pxDefaultSize
+					variant="link"
+					onClick={ onDismiss }
+				>
 					{ hasNextTip ? __( 'See next tip' ) : __( 'Got it' ) }
 				</Button>
 			</p>
 			<Button
+				size="small"
 				className="nux-dot-tip__disable"
 				icon={ close }
 				label={ __( 'Disable tips' ) }
diff --git a/packages/nux/src/components/dot-tip/test/__snapshots__/index.js.snap b/packages/nux/src/components/dot-tip/test/__snapshots__/index.js.snap
index 287c550bb09c1b..a160b7f6555768 100644
--- a/packages/nux/src/components/dot-tip/test/__snapshots__/index.js.snap
+++ b/packages/nux/src/components/dot-tip/test/__snapshots__/index.js.snap
@@ -3,11 +3,11 @@
 exports[`DotTip should render correctly 1`] = `
 <div
   aria-label="Editor tips"
-  class="components-popover components-popover nux-dot-tip is-positioned"
+  class="components-popover nux-dot-tip is-positioned"
   data-wp-c16t="true"
   data-wp-component="Popover"
   role="dialog"
-  style="position: absolute; top: 0px; left: 0px; opacity: 1; transform: none; transform-origin: 0% 50% 0;"
+  style="position: absolute; top: 0px; left: 0px; transform: none;"
   tabindex="-1"
 >
   <div
@@ -19,7 +19,7 @@ exports[`DotTip should render correctly 1`] = `
     </p>
     <p>
       <button
-        class="components-button is-link"
+        class="components-button is-next-40px-default-size is-link"
         type="button"
       >
         Got it
@@ -27,7 +27,7 @@ exports[`DotTip should render correctly 1`] = `
     </p>
     <button
       aria-label="Disable tips"
-      class="components-button nux-dot-tip__disable has-icon"
+      class="components-button nux-dot-tip__disable is-small has-icon"
       type="button"
     >
       <svg
@@ -39,7 +39,7 @@ exports[`DotTip should render correctly 1`] = `
         xmlns="http://www.w3.org/2000/svg"
       >
         <path
-          d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"
+          d="m13.06 12 6.47-6.47-1.06-1.06L12 10.94 5.53 4.47 4.47 5.53 10.94 12l-6.47 6.47 1.06 1.06L12 13.06l6.47 6.47 1.06-1.06L13.06 12Z"
         />
       </svg>
     </button>
diff --git a/packages/nux/src/store/selectors.js b/packages/nux/src/store/selectors.js
index e87cf688a1ba32..44b2d7321f1f73 100644
--- a/packages/nux/src/store/selectors.js
+++ b/packages/nux/src/store/selectors.js
@@ -1,7 +1,7 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import createSelector from 'rememo';
+import { createSelector } from '@wordpress/data';
 
 /**
  * An object containing information about a guide.
diff --git a/packages/patterns/.npmrc b/packages/patterns/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/patterns/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/patterns/CHANGELOG.md b/packages/patterns/CHANGELOG.md
index 416d2bfd7c22c7..31fa83ee8b93bb 100644
--- a/packages/patterns/CHANGELOG.md
+++ b/packages/patterns/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 2.10.0 (2024-10-16)
+
+## 2.9.0 (2024-10-03)
+
+## 2.8.0 (2024-09-19)
+
+## 2.7.0 (2024-09-05)
+
+## 2.6.0 (2024-08-21)
+
+## 2.5.0 (2024-08-07)
+
+## 2.4.0 (2024-07-24)
+
+## 2.3.0 (2024-07-10)
+
+## 2.2.0 (2024-06-26)
+
+## 2.1.0 (2024-06-15)
+
+## 2.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 1.19.0 (2024-05-16)
+
+## 1.18.0 (2024-05-02)
+
+## 1.17.0 (2024-04-19)
+
+## 1.16.0 (2024-04-03)
+
+## 1.15.0 (2024-03-21)
+
+## 1.14.0 (2024-03-06)
+
+## 1.13.0 (2024-02-21)
+
+## 1.12.0 (2024-02-09)
+
+## 1.11.0 (2024-01-24)
+
+## 1.10.0 (2024-01-10)
+
+## 1.9.0 (2023-12-13)
+
 ## 1.8.0 (2023-11-29)
 
 ## 1.7.0 (2023-11-16)
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index 2fa13bc3fdddfd..3da30812d61edd 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/patterns",
-	"version": "1.8.0",
+	"version": "2.10.0",
 	"description": "Management of user pattern editing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=16.0.0"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -30,22 +31,21 @@
 		"{src,build,build-module}/{index.js,store/index.js,hooks/**}"
 	],
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/element": "file:../element",
-		"@wordpress/html-entities": "file:../html-entities",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/notices": "file:../notices",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/url": "file:../url",
-		"nanoid": "^3.3.4"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/element": "*",
+		"@wordpress/html-entities": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/url": "*"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -53,5 +53,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/patterns/src/api/index.js b/packages/patterns/src/api/index.js
new file mode 100644
index 00000000000000..4321dc4262145a
--- /dev/null
+++ b/packages/patterns/src/api/index.js
@@ -0,0 +1,40 @@
+/**
+ * Internal dependencies
+ */
+import { PARTIAL_SYNCING_SUPPORTED_BLOCKS } from '../constants';
+
+/**
+ * Determines whether a block is overridable.
+ *
+ * @param {WPBlock} block The block to test.
+ *
+ * @return {boolean} `true` if a block is overridable, `false` otherwise.
+ */
+export function isOverridableBlock( block ) {
+	return (
+		Object.keys( PARTIAL_SYNCING_SUPPORTED_BLOCKS ).includes(
+			block.name
+		) &&
+		!! block.attributes.metadata?.name &&
+		!! block.attributes.metadata?.bindings &&
+		Object.values( block.attributes.metadata.bindings ).some(
+			( binding ) => binding.source === 'core/pattern-overrides'
+		)
+	);
+}
+
+/**
+ * Determines whether the blocks list has overridable blocks.
+ *
+ * @param {WPBlock[]} blocks The blocks list.
+ *
+ * @return {boolean} `true` if the list has overridable blocks, `false` otherwise.
+ */
+export function hasOverridableBlocks( blocks ) {
+	return blocks.some( ( block ) => {
+		if ( isOverridableBlock( block ) ) {
+			return true;
+		}
+		return hasOverridableBlocks( block.innerBlocks );
+	} );
+}
diff --git a/packages/patterns/src/components/allow-overrides-modal.js b/packages/patterns/src/components/allow-overrides-modal.js
new file mode 100644
index 00000000000000..e2389575171a3a
--- /dev/null
+++ b/packages/patterns/src/components/allow-overrides-modal.js
@@ -0,0 +1,149 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	Button,
+	__experimentalText as Text,
+	TextControl,
+	Modal,
+} from '@wordpress/components';
+import { __, sprintf } from '@wordpress/i18n';
+import { useState, useId } from '@wordpress/element';
+import { speak } from '@wordpress/a11y';
+
+export function AllowOverridesModal( {
+	placeholder,
+	initialName = '',
+	onClose,
+	onSave,
+} ) {
+	const [ editedBlockName, setEditedBlockName ] = useState( initialName );
+	const descriptionId = useId();
+
+	const isNameValid = !! editedBlockName.trim();
+
+	const handleSubmit = () => {
+		if ( editedBlockName !== initialName ) {
+			const message = sprintf(
+				/* translators: %s: new name/label for the block */
+				__( 'Block name changed to: "%s".' ),
+				editedBlockName
+			);
+
+			// Must be assertive to immediately announce change.
+			speak( message, 'assertive' );
+		}
+		onSave( editedBlockName );
+
+		// Immediate close avoids ability to hit save multiple times.
+		onClose();
+	};
+
+	return (
+		<Modal
+			title={ __( 'Enable overrides' ) }
+			onRequestClose={ onClose }
+			focusOnMount="firstContentElement"
+			aria={ { describedby: descriptionId } }
+			size="small"
+		>
+			<form
+				onSubmit={ ( event ) => {
+					event.preventDefault();
+
+					if ( ! isNameValid ) {
+						return;
+					}
+
+					handleSubmit();
+				} }
+			>
+				<VStack spacing="6">
+					<Text id={ descriptionId }>
+						{ __(
+							'Overrides are changes you make to a block within a synced pattern instance. Use overrides to customize a synced pattern instance to suit its new context. Name this block to specify an override.'
+						) }
+					</Text>
+					<TextControl
+						__nextHasNoMarginBottom
+						__next40pxDefaultSize
+						value={ editedBlockName }
+						label={ __( 'Name' ) }
+						help={ __(
+							'For example, if you are creating a recipe pattern, you use "Recipe Title", "Recipe Description", etc.'
+						) }
+						placeholder={ placeholder }
+						onChange={ setEditedBlockName }
+					/>
+					<HStack justify="right">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ onClose }
+						>
+							{ __( 'Cancel' ) }
+						</Button>
+
+						<Button
+							__next40pxDefaultSize
+							aria-disabled={ ! isNameValid }
+							variant="primary"
+							type="submit"
+						>
+							{ __( 'Enable' ) }
+						</Button>
+					</HStack>
+				</VStack>
+			</form>
+		</Modal>
+	);
+}
+
+export function DisallowOverridesModal( { onClose, onSave } ) {
+	const descriptionId = useId();
+
+	return (
+		<Modal
+			title={ __( 'Disable overrides' ) }
+			onRequestClose={ onClose }
+			aria={ { describedby: descriptionId } }
+			size="small"
+		>
+			<form
+				onSubmit={ ( event ) => {
+					event.preventDefault();
+					onSave();
+					onClose();
+				} }
+			>
+				<VStack spacing="6">
+					<Text id={ descriptionId }>
+						{ __(
+							'Are you sure you want to disable overrides? Disabling overrides will revert all applied overrides for this block throughout instances of this pattern.'
+						) }
+					</Text>
+
+					<HStack justify="right">
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ onClose }
+						>
+							{ __( 'Cancel' ) }
+						</Button>
+
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							type="submit"
+						>
+							{ __( 'Disable' ) }
+						</Button>
+					</HStack>
+				</VStack>
+			</form>
+		</Modal>
+	);
+}
diff --git a/packages/patterns/src/components/create-pattern-modal.js b/packages/patterns/src/components/create-pattern-modal.js
index b12e4c9d21bedf..dd86709acbca30 100644
--- a/packages/patterns/src/components/create-pattern-modal.js
+++ b/packages/patterns/src/components/create-pattern-modal.js
@@ -10,7 +10,7 @@ import {
 	ToggleControl,
 } from '@wordpress/components';
 import { __, _x } from '@wordpress/i18n';
-import { useState, useMemo } from '@wordpress/element';
+import { useState } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
 import { store as coreStore } from '@wordpress/core-data';
@@ -18,21 +18,44 @@ import { store as coreStore } from '@wordpress/core-data';
 /**
  * Internal dependencies
  */
-import { PATTERN_DEFAULT_CATEGORY, PATTERN_SYNC_TYPES } from '../constants';
-
-/**
- * Internal dependencies
- */
+import {
+	PATTERN_DEFAULT_CATEGORY,
+	PATTERN_SYNC_TYPES,
+	PATTERN_TYPES,
+} from '../constants';
 import { store as patternsStore } from '../store';
-import CategorySelector, { CATEGORY_SLUG } from './category-selector';
+import CategorySelector from './category-selector';
+import { useAddPatternCategory } from '../private-hooks';
 import { unlock } from '../lock-unlock';
 
 export default function CreatePatternModal( {
-	confirmLabel = __( 'Create' ),
-	defaultCategories = [],
 	className = 'patterns-menu-items__convert-modal',
+	modalTitle,
+	...restProps
+} ) {
+	const defaultModalTitle = useSelect(
+		( select ) =>
+			select( coreStore ).getPostType( PATTERN_TYPES.user )?.labels
+				?.add_new_item,
+		[]
+	);
+	return (
+		<Modal
+			title={ modalTitle || defaultModalTitle }
+			onRequestClose={ restProps.onClose }
+			overlayClassName={ className }
+			focusOnMount="firstContentElement"
+			size="small"
+		>
+			<CreatePatternModalContents { ...restProps } />
+		</Modal>
+	);
+}
+
+export function CreatePatternModalContents( {
+	confirmLabel = __( 'Add' ),
+	defaultCategories = [],
 	content,
-	modalTitle = __( 'Create pattern' ),
 	onClose,
 	onError,
 	onSuccess,
@@ -45,44 +68,9 @@ export default function CreatePatternModal( {
 
 	const [ isSaving, setIsSaving ] = useState( false );
 	const { createPattern } = unlock( useDispatch( patternsStore ) );
-	const { saveEntityRecord, invalidateResolution } = useDispatch( coreStore );
 	const { createErrorNotice } = useDispatch( noticesStore );
 
-	const { corePatternCategories, userPatternCategories } = useSelect(
-		( select ) => {
-			const { getUserPatternCategories, getBlockPatternCategories } =
-				select( coreStore );
-
-			return {
-				corePatternCategories: getBlockPatternCategories(),
-				userPatternCategories: getUserPatternCategories(),
-			};
-		}
-	);
-
-	const categoryMap = useMemo( () => {
-		// Merge the user and core pattern categories and remove any duplicates.
-		const uniqueCategories = new Map();
-		[ ...userPatternCategories, ...corePatternCategories ].forEach(
-			( category ) => {
-				if (
-					! uniqueCategories.has( category.label ) &&
-					// There are two core categories with `Post` label so explicitly remove the one with
-					// the `query` slug to avoid any confusion.
-					category.name !== 'query'
-				) {
-					// We need to store the name separately as this is used as the slug in the
-					// taxonomy and may vary from the label.
-					uniqueCategories.set( category.label, {
-						label: category.label,
-						value: category.label,
-						name: category.name,
-					} );
-				}
-			}
-		);
-		return uniqueCategories;
-	}, [ userPatternCategories, corePatternCategories ] );
+	const { categoryMap, findOrCreateTerm } = useAddPatternCategory();
 
 	async function onCreate( patternTitle, sync ) {
 		if ( ! title || isSaving ) {
@@ -120,106 +108,66 @@ export default function CreatePatternModal( {
 		}
 	}
 
-	/**
-	 * @param {string} term
-	 * @return {Promise<number>} The pattern category id.
-	 */
-	async function findOrCreateTerm( term ) {
-		try {
-			// We need to match any existing term to the correct slug to prevent duplicates, eg.
-			// the core `Headers` category uses the singular `header` as the slug.
-			const existingTerm = categoryMap.get( term );
-			const termData = existingTerm
-				? { name: existingTerm.label, slug: existingTerm.name }
-				: { name: term };
-			const newTerm = await saveEntityRecord(
-				'taxonomy',
-				CATEGORY_SLUG,
-				termData,
-				{ throwOnError: true }
-			);
-			invalidateResolution( 'getUserPatternCategories' );
-			return newTerm.id;
-		} catch ( error ) {
-			if ( error.code !== 'term_exists' ) {
-				throw error;
-			}
-
-			return error.data.term_id;
-		}
-	}
-
 	return (
-		<Modal
-			title={ modalTitle }
-			onRequestClose={ () => {
-				onClose();
-				setTitle( '' );
+		<form
+			onSubmit={ ( event ) => {
+				event.preventDefault();
+				onCreate( title, syncType );
 			} }
-			overlayClassName={ className }
 		>
-			<form
-				onSubmit={ ( event ) => {
-					event.preventDefault();
-					onCreate( title, syncType );
-				} }
-			>
-				<VStack spacing="5">
-					<TextControl
-						label={ __( 'Name' ) }
-						value={ title }
-						onChange={ setTitle }
-						placeholder={ __( 'My pattern' ) }
-						className="patterns-create-modal__name-input"
-						__nextHasNoMarginBottom
+			<VStack spacing="5">
+				<TextControl
+					label={ __( 'Name' ) }
+					value={ title }
+					onChange={ setTitle }
+					placeholder={ __( 'My pattern' ) }
+					className="patterns-create-modal__name-input"
+					__nextHasNoMarginBottom
+					__next40pxDefaultSize
+				/>
+				<CategorySelector
+					categoryTerms={ categoryTerms }
+					onChange={ setCategoryTerms }
+					categoryMap={ categoryMap }
+				/>
+				<ToggleControl
+					__nextHasNoMarginBottom
+					label={ _x( 'Synced', 'pattern (singular)' ) }
+					help={ __(
+						'Sync this pattern across multiple locations.'
+					) }
+					checked={ syncType === PATTERN_SYNC_TYPES.full }
+					onChange={ () => {
+						setSyncType(
+							syncType === PATTERN_SYNC_TYPES.full
+								? PATTERN_SYNC_TYPES.unsynced
+								: PATTERN_SYNC_TYPES.full
+						);
+					} }
+				/>
+				<HStack justify="right">
+					<Button
 						__next40pxDefaultSize
-					/>
-					<CategorySelector
-						categoryTerms={ categoryTerms }
-						onChange={ setCategoryTerms }
-						categoryMap={ categoryMap }
-					/>
-					<ToggleControl
-						label={ _x(
-							'Synced',
-							'Option that makes an individual pattern synchronized'
-						) }
-						help={ __(
-							'Sync this pattern across multiple locations.'
-						) }
-						checked={ syncType === PATTERN_SYNC_TYPES.full }
-						onChange={ () => {
-							setSyncType(
-								syncType === PATTERN_SYNC_TYPES.full
-									? PATTERN_SYNC_TYPES.unsynced
-									: PATTERN_SYNC_TYPES.full
-							);
+						variant="tertiary"
+						onClick={ () => {
+							onClose();
+							setTitle( '' );
 						} }
-					/>
-					<HStack justify="right">
-						<Button
-							__next40pxDefaultSize
-							variant="tertiary"
-							onClick={ () => {
-								onClose();
-								setTitle( '' );
-							} }
-						>
-							{ __( 'Cancel' ) }
-						</Button>
+					>
+						{ __( 'Cancel' ) }
+					</Button>
 
-						<Button
-							__next40pxDefaultSize
-							variant="primary"
-							type="submit"
-							aria-disabled={ ! title || isSaving }
-							isBusy={ isSaving }
-						>
-							{ confirmLabel }
-						</Button>
-					</HStack>
-				</VStack>
-			</form>
-		</Modal>
+					<Button
+						__next40pxDefaultSize
+						variant="primary"
+						type="submit"
+						aria-disabled={ ! title || isSaving }
+						isBusy={ isSaving }
+					>
+						{ confirmLabel }
+					</Button>
+				</HStack>
+			</VStack>
+		</form>
 	);
 }
diff --git a/packages/patterns/src/components/duplicate-pattern-modal.js b/packages/patterns/src/components/duplicate-pattern-modal.js
index a62e7306dc90e1..6fa25a16f8594c 100644
--- a/packages/patterns/src/components/duplicate-pattern-modal.js
+++ b/packages/patterns/src/components/duplicate-pattern-modal.js
@@ -29,11 +29,7 @@ function getTermLabels( pattern, categories ) {
 		.map( ( category ) => category.label );
 }
 
-export default function DuplicatePatternModal( {
-	pattern,
-	onClose,
-	onSuccess,
-} ) {
+export function useDuplicatePatternProps( { pattern, onSuccess } ) {
 	const { createSuccessNotice } = useDispatch( noticesStore );
 	const categories = useSelect( ( select ) => {
 		const { getUserPatternCategories, getBlockPatternCategories } =
@@ -44,12 +40,10 @@ export default function DuplicatePatternModal( {
 			user: getUserPatternCategories(),
 		};
 	} );
-
 	if ( ! pattern ) {
 		return null;
 	}
-
-	const duplicatedProps = {
+	return {
 		content: pattern.content,
 		defaultCategories: getTermLabels( pattern, categories ),
 		defaultSyncType:
@@ -63,31 +57,39 @@ export default function DuplicatePatternModal( {
 				? pattern.title
 				: pattern.title.raw
 		),
-	};
+		onSuccess: ( { pattern: newPattern } ) => {
+			createSuccessNotice(
+				sprintf(
+					// translators: %s: The new pattern's title e.g. 'Call to action (copy)'.
+					__( '"%s" duplicated.' ),
+					newPattern.title.raw
+				),
+				{
+					type: 'snackbar',
+					id: 'patterns-create',
+				}
+			);
 
-	function handleOnSuccess( { pattern: newPattern } ) {
-		createSuccessNotice(
-			sprintf(
-				// translators: %s: The new pattern's title e.g. 'Call to action (copy)'.
-				__( '"%s" duplicated.' ),
-				newPattern.title.raw
-			),
-			{
-				type: 'snackbar',
-				id: 'patterns-create',
-			}
-		);
+			onSuccess?.( { pattern: newPattern } );
+		},
+	};
+}
 
-		onSuccess?.( { pattern: newPattern } );
+export default function DuplicatePatternModal( {
+	pattern,
+	onClose,
+	onSuccess,
+} ) {
+	const duplicatedProps = useDuplicatePatternProps( { pattern, onSuccess } );
+	if ( ! pattern ) {
+		return null;
 	}
-
 	return (
 		<CreatePatternModal
 			modalTitle={ __( 'Duplicate pattern' ) }
 			confirmLabel={ __( 'Duplicate' ) }
 			onClose={ onClose }
 			onError={ onClose }
-			onSuccess={ handleOnSuccess }
 			{ ...duplicatedProps }
 		/>
 	);
diff --git a/packages/patterns/src/components/overrides-panel.js b/packages/patterns/src/components/overrides-panel.js
new file mode 100644
index 00000000000000..b567b3c372daa2
--- /dev/null
+++ b/packages/patterns/src/components/overrides-panel.js
@@ -0,0 +1,45 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	privateApis as blockEditorPrivateApis,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import { PanelBody } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { isOverridableBlock } from '../api';
+import { unlock } from '../lock-unlock';
+
+const { BlockQuickNavigation } = unlock( blockEditorPrivateApis );
+
+export default function OverridesPanel() {
+	const allClientIds = useSelect(
+		( select ) => select( blockEditorStore ).getClientIdsWithDescendants(),
+		[]
+	);
+	const { getBlock } = useSelect( blockEditorStore );
+	const clientIdsWithOverrides = useMemo(
+		() =>
+			allClientIds.filter( ( clientId ) => {
+				const block = getBlock( clientId );
+				return isOverridableBlock( block );
+			} ),
+		[ allClientIds, getBlock ]
+	);
+
+	if ( ! clientIdsWithOverrides?.length ) {
+		return null;
+	}
+
+	return (
+		<PanelBody title={ __( 'Overrides' ) }>
+			<BlockQuickNavigation clientIds={ clientIdsWithOverrides } />
+		</PanelBody>
+	);
+}
diff --git a/packages/patterns/src/components/partial-syncing-controls.js b/packages/patterns/src/components/partial-syncing-controls.js
deleted file mode 100644
index 42c39ce69e87bf..00000000000000
--- a/packages/patterns/src/components/partial-syncing-controls.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * External dependencies
- */
-import { nanoid } from 'nanoid';
-
-/**
- * WordPress dependencies
- */
-import { InspectorControls } from '@wordpress/block-editor';
-import { BaseControl, CheckboxControl } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import { PARTIAL_SYNCING_SUPPORTED_BLOCKS } from '../constants';
-
-function PartialSyncingControls( { name, attributes, setAttributes } ) {
-	const syncedAttributes = PARTIAL_SYNCING_SUPPORTED_BLOCKS[ name ];
-
-	function updateConnections( attributeName, isChecked ) {
-		if ( ! isChecked ) {
-			let updatedConnections = {
-				...attributes.connections,
-				attributes: {
-					...attributes.connections?.attributes,
-					[ attributeName ]: undefined,
-				},
-			};
-			if ( Object.keys( updatedConnections.attributes ).length === 1 ) {
-				updatedConnections.attributes = undefined;
-			}
-			if (
-				Object.keys( updatedConnections ).length === 1 &&
-				updateConnections.attributes === undefined
-			) {
-				updatedConnections = undefined;
-			}
-			setAttributes( {
-				connections: updatedConnections,
-			} );
-			return;
-		}
-
-		const updatedConnections = {
-			...attributes.connections,
-			attributes: {
-				...attributes.connections?.attributes,
-				[ attributeName ]: {
-					source: 'pattern_attributes',
-				},
-			},
-		};
-
-		if ( typeof attributes.metadata?.id === 'string' ) {
-			setAttributes( { connections: updatedConnections } );
-			return;
-		}
-
-		const id = nanoid( 6 );
-		setAttributes( {
-			connections: updatedConnections,
-			metadata: {
-				...attributes.metadata,
-				id,
-			},
-		} );
-	}
-
-	return (
-		<InspectorControls group="advanced">
-			<BaseControl __nextHasNoMarginBottom>
-				<BaseControl.VisualLabel>
-					{ __( 'Synced attributes' ) }
-				</BaseControl.VisualLabel>
-				{ Object.entries( syncedAttributes ).map(
-					( [ attributeName, label ] ) => (
-						<CheckboxControl
-							key={ attributeName }
-							__nextHasNoMarginBottom
-							label={ label }
-							checked={
-								attributes.connections?.attributes?.[
-									attributeName
-								]?.source === 'pattern_attributes'
-							}
-							onChange={ ( isChecked ) => {
-								updateConnections( attributeName, isChecked );
-							} }
-						/>
-					)
-				) }
-			</BaseControl>
-		</InspectorControls>
-	);
-}
-
-export default PartialSyncingControls;
diff --git a/packages/patterns/src/components/pattern-convert-button.js b/packages/patterns/src/components/pattern-convert-button.js
index dd7d15b8d33bc5..d670cd85946aa9 100644
--- a/packages/patterns/src/components/pattern-convert-button.js
+++ b/packages/patterns/src/components/pattern-convert-button.js
@@ -85,7 +85,11 @@ export default function PatternConvertButton( {
 						hasBlockSupport( block.name, 'reusable', true )
 				) &&
 				// Hide when current doesn't have permission to do that.
-				!! canUser( 'create', 'blocks' );
+				// Blocks refers to the wp_block post type, this checks the ability to create a post of that type.
+				!! canUser( 'create', {
+					kind: 'postType',
+					name: 'wp_block',
+				} );
 
 			return _canConvert;
 		},
diff --git a/packages/patterns/src/components/pattern-overrides-block-controls.js b/packages/patterns/src/components/pattern-overrides-block-controls.js
new file mode 100644
index 00000000000000..5a62a5b1993f75
--- /dev/null
+++ b/packages/patterns/src/components/pattern-overrides-block-controls.js
@@ -0,0 +1,155 @@
+/**
+ * WordPress dependencies
+ */
+import { useId } from '@wordpress/element';
+import { __, sprintf } from '@wordpress/i18n';
+import {
+	DropdownMenu,
+	ToolbarItem,
+	__experimentalText as Text,
+} from '@wordpress/components';
+import { store as blocksStore } from '@wordpress/blocks';
+import { useSelect } from '@wordpress/data';
+import { copy } from '@wordpress/icons';
+import {
+	store as blockEditorStore,
+	BlockIcon,
+	privateApis as blockEditorPrivateApis,
+	BlockControls,
+} from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../lock-unlock';
+import { PATTERN_OVERRIDES_BINDING_SOURCE } from '../constants';
+
+const { useBlockDisplayTitle } = unlock( blockEditorPrivateApis );
+
+function PatternOverridesToolbarIndicator( { clientIds } ) {
+	const isSingleBlockSelected = clientIds.length === 1;
+	const { icon, firstBlockName } = useSelect(
+		( select ) => {
+			const { getBlockAttributes, getBlockNamesByClientId } =
+				select( blockEditorStore );
+			const { getBlockType, getActiveBlockVariation } =
+				select( blocksStore );
+			const blockTypeNames = getBlockNamesByClientId( clientIds );
+			const _firstBlockTypeName = blockTypeNames[ 0 ];
+			const firstBlockType = getBlockType( _firstBlockTypeName );
+			let _icon;
+			if ( isSingleBlockSelected ) {
+				const match = getActiveBlockVariation(
+					_firstBlockTypeName,
+					getBlockAttributes( clientIds[ 0 ] )
+				);
+				// Take into account active block variations.
+				_icon = match?.icon || firstBlockType.icon;
+			} else {
+				const isSelectionOfSameType =
+					new Set( blockTypeNames ).size === 1;
+				// When selection consists of blocks of multiple types, display an
+				// appropriate icon to communicate the non-uniformity.
+				_icon = isSelectionOfSameType ? firstBlockType.icon : copy;
+			}
+
+			return {
+				icon: _icon,
+				firstBlockName: getBlockAttributes( clientIds[ 0 ] ).metadata
+					.name,
+			};
+		},
+		[ clientIds, isSingleBlockSelected ]
+	);
+	const firstBlockTitle = useBlockDisplayTitle( {
+		clientId: clientIds[ 0 ],
+		maximumLength: 35,
+	} );
+
+	const blockDescription = isSingleBlockSelected
+		? sprintf(
+				/* translators: %1s: The block type's name; %2s: The block's user-provided name (the same as the override name). */
+				__( 'This %1$s is editable using the "%2$s" override.' ),
+				firstBlockTitle.toLowerCase(),
+				firstBlockName
+		  )
+		: __( 'These blocks are editable using overrides.' );
+
+	const descriptionId = useId();
+
+	return (
+		<ToolbarItem>
+			{ ( toggleProps ) => (
+				<DropdownMenu
+					className="patterns-pattern-overrides-toolbar-indicator"
+					label={ firstBlockTitle }
+					popoverProps={ {
+						placement: 'bottom-start',
+						className:
+							'patterns-pattern-overrides-toolbar-indicator__popover',
+					} }
+					icon={
+						<>
+							<BlockIcon
+								icon={ icon }
+								className="patterns-pattern-overrides-toolbar-indicator-icon"
+								showColors
+							/>
+						</>
+					}
+					toggleProps={ {
+						description: blockDescription,
+						...toggleProps,
+					} }
+					menuProps={ {
+						orientation: 'both',
+						'aria-describedby': descriptionId,
+					} }
+				>
+					{ () => (
+						<Text id={ descriptionId }>{ blockDescription }</Text>
+					) }
+				</DropdownMenu>
+			) }
+		</ToolbarItem>
+	);
+}
+
+export default function PatternOverridesBlockControls() {
+	const { clientIds, hasPatternOverrides, hasParentPattern } = useSelect(
+		( select ) => {
+			const {
+				getBlockAttributes,
+				getSelectedBlockClientIds,
+				getBlockParentsByBlockName,
+			} = select( blockEditorStore );
+			const selectedClientIds = getSelectedBlockClientIds();
+			const _hasPatternOverrides = selectedClientIds.every(
+				( clientId ) =>
+					Object.values(
+						getBlockAttributes( clientId )?.metadata?.bindings ?? {}
+					).some(
+						( binding ) =>
+							binding?.source === PATTERN_OVERRIDES_BINDING_SOURCE
+					)
+			);
+			const _hasParentPattern = selectedClientIds.every(
+				( clientId ) =>
+					getBlockParentsByBlockName( clientId, 'core/block', true )
+						.length > 0
+			);
+			return {
+				clientIds: selectedClientIds,
+				hasPatternOverrides: _hasPatternOverrides,
+				hasParentPattern: _hasParentPattern,
+			};
+		},
+		[]
+	);
+
+	return hasPatternOverrides && hasParentPattern ? (
+		<BlockControls group="parent">
+			<PatternOverridesToolbarIndicator clientIds={ clientIds } />
+		</BlockControls>
+	) : null;
+}
diff --git a/packages/patterns/src/components/pattern-overrides-controls.js b/packages/patterns/src/components/pattern-overrides-controls.js
new file mode 100644
index 00000000000000..5207348c7bd7c6
--- /dev/null
+++ b/packages/patterns/src/components/pattern-overrides-controls.js
@@ -0,0 +1,128 @@
+/**
+ * WordPress dependencies
+ */
+import { useState, useId } from '@wordpress/element';
+import {
+	InspectorControls,
+	useBlockBindingsUtils,
+} from '@wordpress/block-editor';
+import { BaseControl, Button } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { PATTERN_OVERRIDES_BINDING_SOURCE } from '../constants';
+import {
+	AllowOverridesModal,
+	DisallowOverridesModal,
+} from './allow-overrides-modal';
+
+function PatternOverridesControls( {
+	attributes,
+	setAttributes,
+	name: blockName,
+} ) {
+	const controlId = useId();
+	const [ showAllowOverridesModal, setShowAllowOverridesModal ] =
+		useState( false );
+	const [ showDisallowOverridesModal, setShowDisallowOverridesModal ] =
+		useState( false );
+
+	const hasName = !! attributes.metadata?.name;
+	const defaultBindings = attributes.metadata?.bindings?.__default;
+	const hasOverrides =
+		hasName && defaultBindings?.source === PATTERN_OVERRIDES_BINDING_SOURCE;
+	const isConnectedToOtherSources =
+		defaultBindings?.source &&
+		defaultBindings.source !== PATTERN_OVERRIDES_BINDING_SOURCE;
+	const { updateBlockBindings } = useBlockBindingsUtils();
+
+	function updateBindings( isChecked, customName ) {
+		if ( customName ) {
+			setAttributes( {
+				metadata: {
+					...attributes.metadata,
+					name: customName,
+				},
+			} );
+		}
+
+		updateBlockBindings( {
+			__default: isChecked
+				? { source: PATTERN_OVERRIDES_BINDING_SOURCE }
+				: undefined,
+		} );
+	}
+
+	// Avoid overwriting other (e.g. meta) bindings.
+	if ( isConnectedToOtherSources ) {
+		return null;
+	}
+
+	const hasUnsupportedImageAttributes =
+		blockName === 'core/image' &&
+		( !! attributes.caption?.length || !! attributes.href?.length );
+
+	const helpText =
+		! hasOverrides && hasUnsupportedImageAttributes
+			? __(
+					`Overrides currently don't support image captions or links. Remove the caption or link first before enabling overrides.`
+			  )
+			: __(
+					'Allow changes to this block throughout instances of this pattern.'
+			  );
+
+	return (
+		<>
+			<InspectorControls group="advanced">
+				<BaseControl
+					__nextHasNoMarginBottom
+					id={ controlId }
+					label={ __( 'Overrides' ) }
+					help={ helpText }
+				>
+					<Button
+						__next40pxDefaultSize
+						className="pattern-overrides-control__allow-overrides-button"
+						variant="secondary"
+						aria-haspopup="dialog"
+						onClick={ () => {
+							if ( hasOverrides ) {
+								setShowDisallowOverridesModal( true );
+							} else {
+								setShowAllowOverridesModal( true );
+							}
+						} }
+						disabled={
+							! hasOverrides && hasUnsupportedImageAttributes
+						}
+						accessibleWhenDisabled
+					>
+						{ hasOverrides
+							? __( 'Disable overrides' )
+							: __( 'Enable overrides' ) }
+					</Button>
+				</BaseControl>
+			</InspectorControls>
+
+			{ showAllowOverridesModal && (
+				<AllowOverridesModal
+					initialName={ attributes.metadata?.name }
+					onClose={ () => setShowAllowOverridesModal( false ) }
+					onSave={ ( newName ) => {
+						updateBindings( true, newName );
+					} }
+				/>
+			) }
+			{ showDisallowOverridesModal && (
+				<DisallowOverridesModal
+					onClose={ () => setShowDisallowOverridesModal( false ) }
+					onSave={ () => updateBindings( false ) }
+				/>
+			) }
+		</>
+	);
+}
+
+export default PatternOverridesControls;
diff --git a/packages/patterns/src/components/patterns-manage-button.js b/packages/patterns/src/components/patterns-manage-button.js
index 45ad96d8d8aae6..d350df62cbd003 100644
--- a/packages/patterns/src/components/patterns-manage-button.js
+++ b/packages/patterns/src/components/patterns-manage-button.js
@@ -18,34 +18,35 @@ import { unlock } from '../lock-unlock';
 function PatternsManageButton( { clientId } ) {
 	const { canRemove, isVisible, managePatternsUrl } = useSelect(
 		( select ) => {
-			const { getBlock, canRemoveBlock, getBlockCount, getSettings } =
+			const { getBlock, canRemoveBlock, getBlockCount } =
 				select( blockEditorStore );
 			const { canUser } = select( coreStore );
 			const reusableBlock = getBlock( clientId );
-			const isBlockTheme = getSettings().__unstableIsBlockBasedTheme;
 
 			return {
 				canRemove: canRemoveBlock( clientId ),
 				isVisible:
 					!! reusableBlock &&
 					isReusableBlock( reusableBlock ) &&
-					!! canUser(
-						'update',
-						'blocks',
-						reusableBlock.attributes.ref
-					),
+					!! canUser( 'update', {
+						kind: 'postType',
+						name: 'wp_block',
+						id: reusableBlock.attributes.ref,
+					} ),
 				innerBlockCount: getBlockCount( clientId ),
 				// The site editor and templates both check whether the user
 				// has edit_theme_options capabilities. We can leverage that here
 				// and omit the manage patterns link if the user can't access it.
-				managePatternsUrl:
-					isBlockTheme && canUser( 'read', 'templates' )
-						? addQueryArgs( 'site-editor.php', {
-								path: '/patterns',
-						  } )
-						: addQueryArgs( 'edit.php', {
-								post_type: 'wp_block',
-						  } ),
+				managePatternsUrl: canUser( 'create', {
+					kind: 'postType',
+					name: 'wp_template',
+				} )
+					? addQueryArgs( 'site-editor.php', {
+							path: '/patterns',
+					  } )
+					: addQueryArgs( 'edit.php', {
+							post_type: 'wp_block',
+					  } ),
 			};
 		},
 		[ clientId ]
diff --git a/packages/patterns/src/components/rename-pattern-category-modal.js b/packages/patterns/src/components/rename-pattern-category-modal.js
index 3e9e90da2f8212..3df57757315b81 100644
--- a/packages/patterns/src/components/rename-pattern-category-modal.js
+++ b/packages/patterns/src/components/rename-pattern-category-modal.js
@@ -138,6 +138,7 @@ export default function RenamePatternCategoryModal( {
 						<TextControl
 							ref={ textControlRef }
 							__nextHasNoMarginBottom
+							__next40pxDefaultSize
 							label={ __( 'Name' ) }
 							value={ name }
 							onChange={ onChange }
@@ -154,10 +155,15 @@ export default function RenamePatternCategoryModal( {
 						) }
 					</VStack>
 					<HStack justify="right">
-						<Button variant="tertiary" onClick={ onRequestClose }>
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ onRequestClose }
+						>
 							{ __( 'Cancel' ) }
 						</Button>
 						<Button
+							__next40pxDefaultSize
 							variant="primary"
 							type="submit"
 							aria-disabled={
diff --git a/packages/patterns/src/components/rename-pattern-modal.js b/packages/patterns/src/components/rename-pattern-modal.js
index 9b905c04b1e20e..db107841e78c21 100644
--- a/packages/patterns/src/components/rename-pattern-modal.js
+++ b/packages/patterns/src/components/rename-pattern-modal.js
@@ -88,11 +88,18 @@ export default function RenamePatternModal( {
 	};
 
 	return (
-		<Modal title={ __( 'Rename' ) } { ...props } onRequestClose={ onClose }>
+		<Modal
+			title={ __( 'Rename' ) }
+			{ ...props }
+			onRequestClose={ onClose }
+			focusOnMount="firstContentElement"
+			size="small"
+		>
 			<form onSubmit={ onRename }>
 				<VStack spacing="5">
 					<TextControl
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 						label={ __( 'Name' ) }
 						value={ name }
 						onChange={ setName }
@@ -100,11 +107,19 @@ export default function RenamePatternModal( {
 					/>
 
 					<HStack justify="right">
-						<Button variant="tertiary" onClick={ onRequestClose }>
+						<Button
+							__next40pxDefaultSize
+							variant="tertiary"
+							onClick={ onRequestClose }
+						>
 							{ __( 'Cancel' ) }
 						</Button>
 
-						<Button variant="primary" type="submit">
+						<Button
+							__next40pxDefaultSize
+							variant="primary"
+							type="submit"
+						>
 							{ __( 'Save' ) }
 						</Button>
 					</HStack>
diff --git a/packages/patterns/src/components/reset-overrides-control.js b/packages/patterns/src/components/reset-overrides-control.js
new file mode 100644
index 00000000000000..697a595dc42166
--- /dev/null
+++ b/packages/patterns/src/components/reset-overrides-control.js
@@ -0,0 +1,90 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	store as blockEditorStore,
+	__unstableBlockToolbarLastItem as BlockToolbarLastItem,
+} from '@wordpress/block-editor';
+import { ToolbarButton, ToolbarGroup } from '@wordpress/components';
+import { useRegistry, useSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+
+const CONTENT = 'content';
+
+export default function ResetOverridesControl( props ) {
+	const name = props.attributes.metadata?.name;
+	const registry = useRegistry();
+	const isOverriden = useSelect(
+		( select ) => {
+			if ( ! name ) {
+				return;
+			}
+
+			const { getBlockAttributes, getBlockParentsByBlockName } =
+				select( blockEditorStore );
+			const [ patternClientId ] = getBlockParentsByBlockName(
+				props.clientId,
+				'core/block',
+				true
+			);
+
+			if ( ! patternClientId ) {
+				return;
+			}
+
+			const overrides = getBlockAttributes( patternClientId )[ CONTENT ];
+
+			if ( ! overrides ) {
+				return;
+			}
+
+			return overrides.hasOwnProperty( name );
+		},
+		[ props.clientId, name ]
+	);
+
+	function onClick() {
+		const { getBlockAttributes, getBlockParentsByBlockName } =
+			registry.select( blockEditorStore );
+		const [ patternClientId ] = getBlockParentsByBlockName(
+			props.clientId,
+			'core/block',
+			true
+		);
+
+		if ( ! patternClientId ) {
+			return;
+		}
+
+		const overrides = getBlockAttributes( patternClientId )[ CONTENT ];
+
+		if ( ! overrides.hasOwnProperty( name ) ) {
+			return;
+		}
+
+		const { updateBlockAttributes, __unstableMarkLastChangeAsPersistent } =
+			registry.dispatch( blockEditorStore );
+		__unstableMarkLastChangeAsPersistent();
+
+		let newOverrides = { ...overrides };
+		delete newOverrides[ name ];
+
+		if ( ! Object.keys( newOverrides ).length ) {
+			newOverrides = undefined;
+		}
+
+		updateBlockAttributes( patternClientId, {
+			[ CONTENT ]: newOverrides,
+		} );
+	}
+
+	return (
+		<BlockToolbarLastItem>
+			<ToolbarGroup>
+				<ToolbarButton onClick={ onClick } disabled={ ! isOverriden }>
+					{ __( 'Reset' ) }
+				</ToolbarButton>
+			</ToolbarGroup>
+		</BlockToolbarLastItem>
+	);
+}
diff --git a/packages/patterns/src/components/style.scss b/packages/patterns/src/components/style.scss
index e913c924a2149c..1b053ab7ac2517 100644
--- a/packages/patterns/src/components/style.scss
+++ b/packages/patterns/src/components/style.scss
@@ -13,8 +13,8 @@
 	.components-form-token-field__suggestions-list:not(:empty) {
 		position: absolute;
 		border: $border-width solid var(--wp-admin-theme-color);
-		border-bottom-left-radius: $radius-block-ui;
-		border-bottom-right-radius: $radius-block-ui;
+		border-bottom-left-radius: $radius-small;
+		border-bottom-right-radius: $radius-small;
 		box-shadow: 0 0 0.5px 0.5px var(--wp-admin-theme-color);
 		box-sizing: border-box;
 		z-index: 1;
@@ -38,3 +38,22 @@
 		width: $grid-unit * 40;
 	}
 }
+
+.pattern-overrides-control__allow-overrides-button {
+	width: 100%;
+	justify-content: center;
+}
+
+
+.patterns-pattern-overrides-toolbar-indicator__popover .components-popover__content {
+	min-width: 260px;
+	padding: $grid-unit-20;
+}
+
+.patterns-pattern-overrides-toolbar-indicator .patterns-pattern-overrides-toolbar-indicator-icon.has-colors svg {
+	fill: var(--wp-block-synced-color);
+}
+
+.editor-collapsible-block-toolbar .patterns-pattern-overrides-toolbar-indicator {
+	height: 32px;
+}
diff --git a/packages/patterns/src/constants.js b/packages/patterns/src/constants.js
index 3e533d834fd75c..99563a1a16787f 100644
--- a/packages/patterns/src/constants.js
+++ b/packages/patterns/src/constants.js
@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
 export const PATTERN_TYPES = {
 	theme: 'pattern',
 	user: 'wp_block',
@@ -22,5 +17,10 @@ export const PATTERN_SYNC_TYPES = {
 
 // TODO: This should not be hardcoded. Maybe there should be a config and/or an UI.
 export const PARTIAL_SYNCING_SUPPORTED_BLOCKS = {
-	'core/paragraph': { content: __( 'Content' ) },
+	'core/paragraph': [ 'content' ],
+	'core/heading': [ 'content' ],
+	'core/button': [ 'text', 'url', 'linkTarget', 'rel' ],
+	'core/image': [ 'id', 'url', 'title', 'alt' ],
 };
+
+export const PATTERN_OVERRIDES_BINDING_SOURCE = 'core/pattern-overrides';
diff --git a/packages/patterns/src/lock-unlock.js b/packages/patterns/src/lock-unlock.js
index d727871d71439a..2e9ca804023edc 100644
--- a/packages/patterns/src/lock-unlock.js
+++ b/packages/patterns/src/lock-unlock.js
@@ -4,6 +4,6 @@
 import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/patterns'
 	);
diff --git a/packages/patterns/src/private-apis.js b/packages/patterns/src/private-apis.js
index b357efb1bc107a..8893b3c57d7360 100644
--- a/packages/patterns/src/private-apis.js
+++ b/packages/patterns/src/private-apis.js
@@ -2,12 +2,23 @@
  * Internal dependencies
  */
 import { lock } from './lock-unlock';
-import CreatePatternModal from './components/create-pattern-modal';
-import DuplicatePatternModal from './components/duplicate-pattern-modal';
+import OverridesPanel from './components/overrides-panel';
+import {
+	default as CreatePatternModal,
+	CreatePatternModalContents,
+} from './components/create-pattern-modal';
+import {
+	default as DuplicatePatternModal,
+	useDuplicatePatternProps,
+} from './components/duplicate-pattern-modal';
+import { isOverridableBlock, hasOverridableBlocks } from './api';
 import RenamePatternModal from './components/rename-pattern-modal';
 import PatternsMenuItems from './components';
 import RenamePatternCategoryModal from './components/rename-pattern-category-modal';
-import PartialSyncingControls from './components/partial-syncing-controls';
+import PatternOverridesControls from './components/pattern-overrides-controls';
+import ResetOverridesControl from './components/reset-overrides-control';
+import PatternOverridesBlockControls from './components/pattern-overrides-block-controls';
+import { useAddPatternCategory } from './private-hooks';
 import {
 	PATTERN_TYPES,
 	PATTERN_DEFAULT_CATEGORY,
@@ -19,12 +30,20 @@ import {
 
 export const privateApis = {};
 lock( privateApis, {
+	OverridesPanel,
 	CreatePatternModal,
+	CreatePatternModalContents,
 	DuplicatePatternModal,
+	isOverridableBlock,
+	hasOverridableBlocks,
+	useDuplicatePatternProps,
 	RenamePatternModal,
 	PatternsMenuItems,
 	RenamePatternCategoryModal,
-	PartialSyncingControls,
+	PatternOverridesControls,
+	ResetOverridesControl,
+	PatternOverridesBlockControls,
+	useAddPatternCategory,
 	PATTERN_TYPES,
 	PATTERN_DEFAULT_CATEGORY,
 	PATTERN_USER_CATEGORY,
diff --git a/packages/patterns/src/private-hooks.js b/packages/patterns/src/private-hooks.js
new file mode 100644
index 00000000000000..7dee37222fbbda
--- /dev/null
+++ b/packages/patterns/src/private-hooks.js
@@ -0,0 +1,91 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+import { useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { CATEGORY_SLUG } from './components/category-selector';
+
+/**
+ * Helper hook that creates a Map with the core and user patterns categories
+ * and removes any duplicates. It's used when we need to create new user
+ * categories when creating or importing patterns.
+ * This hook also provides a function to find or create a pattern category.
+ *
+ * @return {Object} The merged categories map and the callback function to find or create a category.
+ */
+export function useAddPatternCategory() {
+	const { saveEntityRecord, invalidateResolution } = useDispatch( coreStore );
+	const { corePatternCategories, userPatternCategories } = useSelect(
+		( select ) => {
+			const { getUserPatternCategories, getBlockPatternCategories } =
+				select( coreStore );
+
+			return {
+				corePatternCategories: getBlockPatternCategories(),
+				userPatternCategories: getUserPatternCategories(),
+			};
+		},
+		[]
+	);
+	const categoryMap = useMemo( () => {
+		// Merge the user and core pattern categories and remove any duplicates.
+		const uniqueCategories = new Map();
+		userPatternCategories.forEach( ( category ) => {
+			uniqueCategories.set( category.label.toLowerCase(), {
+				label: category.label,
+				name: category.name,
+				id: category.id,
+			} );
+		} );
+
+		corePatternCategories.forEach( ( category ) => {
+			if (
+				! uniqueCategories.has( category.label.toLowerCase() ) &&
+				// There are two core categories with `Post` label so explicitly remove the one with
+				// the `query` slug to avoid any confusion.
+				category.name !== 'query'
+			) {
+				uniqueCategories.set( category.label.toLowerCase(), {
+					label: category.label,
+					name: category.name,
+				} );
+			}
+		} );
+		return uniqueCategories;
+	}, [ userPatternCategories, corePatternCategories ] );
+
+	async function findOrCreateTerm( term ) {
+		try {
+			const existingTerm = categoryMap.get( term.toLowerCase() );
+			if ( existingTerm?.id ) {
+				return existingTerm.id;
+			}
+			// If we have an existing core category we need to match the new user category to the
+			// correct slug rather than autogenerating it to prevent duplicates, eg. the core `Headers`
+			// category uses the singular `header` as the slug.
+			const termData = existingTerm
+				? { name: existingTerm.label, slug: existingTerm.name }
+				: { name: term };
+			const newTerm = await saveEntityRecord(
+				'taxonomy',
+				CATEGORY_SLUG,
+				termData,
+				{ throwOnError: true }
+			);
+			invalidateResolution( 'getUserPatternCategories' );
+			return newTerm.id;
+		} catch ( error ) {
+			if ( error.code !== 'term_exists' ) {
+				throw error;
+			}
+			return error.data.term_id;
+		}
+	}
+
+	return { categoryMap, findOrCreateTerm };
+}
diff --git a/packages/patterns/src/store/actions.js b/packages/patterns/src/store/actions.js
index dfa0326a709416..5eef01b2bb8f89 100644
--- a/packages/patterns/src/store/actions.js
+++ b/packages/patterns/src/store/actions.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 
-import { parse } from '@wordpress/blocks';
+import { getBlockType, cloneBlock } from '@wordpress/blocks';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
@@ -90,25 +90,60 @@ export const createPatternFromFile =
 export const convertSyncedPatternToStatic =
 	( clientId ) =>
 	( { registry } ) => {
-		const oldBlock = registry
+		const patternBlock = registry
 			.select( blockEditorStore )
 			.getBlock( clientId );
-		const pattern = registry
-			.select( 'core' )
-			.getEditedEntityRecord(
-				'postType',
-				'wp_block',
-				oldBlock.attributes.ref
-			);
+		const existingOverrides = patternBlock.attributes?.content;
+
+		function cloneBlocksAndRemoveBindings( blocks ) {
+			return blocks.map( ( block ) => {
+				let metadata = block.attributes.metadata;
+				if ( metadata ) {
+					metadata = { ...metadata };
+					delete metadata.id;
+					delete metadata.bindings;
+					// Use overridden values of the pattern block if they exist.
+					if ( existingOverrides?.[ metadata.name ] ) {
+						// Iterate over each overriden attribute.
+						for ( const [ attributeName, value ] of Object.entries(
+							existingOverrides[ metadata.name ]
+						) ) {
+							// Skip if the attribute does not exist in the block type.
+							if (
+								! getBlockType( block.name )?.attributes[
+									attributeName
+								]
+							) {
+								continue;
+							}
+							// Update the block attribute with the override value.
+							block.attributes[ attributeName ] = value;
+						}
+					}
+				}
+				return cloneBlock(
+					block,
+					{
+						metadata:
+							metadata && Object.keys( metadata ).length > 0
+								? metadata
+								: undefined,
+					},
+					cloneBlocksAndRemoveBindings( block.innerBlocks )
+				);
+			} );
+		}
+
+		const patternInnerBlocks = registry
+			.select( blockEditorStore )
+			.getBlocks( patternBlock.clientId );
 
-		const newBlocks = parse(
-			typeof pattern.content === 'function'
-				? pattern.content( pattern )
-				: pattern.content
-		);
 		registry
 			.dispatch( blockEditorStore )
-			.replaceBlocks( oldBlock.clientId, newBlocks );
+			.replaceBlocks(
+				patternBlock.clientId,
+				cloneBlocksAndRemoveBindings( patternInnerBlocks )
+			);
 	};
 
 /**
diff --git a/packages/plugins/.npmrc b/packages/plugins/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/plugins/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md
index 27888ee6a6cfbd..aa54e27a3913da 100644
--- a/packages/plugins/CHANGELOG.md
+++ b/packages/plugins/CHANGELOG.md
@@ -2,6 +2,55 @@
 
 ## Unreleased
 
+## 7.10.0 (2024-10-16)
+
+## 7.9.0 (2024-10-03)
+
+## 7.8.0 (2024-09-19)
+
+## 7.7.0 (2024-09-05)
+
+## 7.6.0 (2024-08-21)
+
+## 7.5.0 (2024-08-07)
+
+## 7.4.0 (2024-07-24)
+
+## 7.3.0 (2024-07-10)
+
+## 7.2.0 (2024-06-26)
+
+## 7.1.0 (2024-06-15)
+
+## 7.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 6.26.0 (2024-05-16)
+
+## 6.25.0 (2024-05-02)
+
+## 6.24.0 (2024-04-19)
+
+## 6.23.0 (2024-04-03)
+
+## 6.22.0 (2024-03-21)
+
+## 6.21.0 (2024-03-06)
+
+## 6.20.0 (2024-02-21)
+
+## 6.19.0 (2024-02-09)
+
+## 6.18.0 (2024-01-24)
+
+## 6.17.0 (2024-01-10)
+
+## 6.16.0 (2023-12-13)
+
 ## 6.15.0 (2023-11-29)
 
 ## 6.14.0 (2023-11-16)
@@ -102,7 +151,7 @@
 
 ## 4.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -141,6 +190,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/plugins/README.md b/packages/plugins/README.md
index e9e5a704aeca71..ac2434e51442f4 100644
--- a/packages/plugins/README.md
+++ b/packages/plugins/README.md
@@ -88,8 +88,8 @@ _Usage_
 // Using ES5 syntax
 var el = React.createElement;
 var Fragment = wp.element.Fragment;
-var PluginSidebar = wp.editPost.PluginSidebar;
-var PluginSidebarMoreMenuItem = wp.editPost.PluginSidebarMoreMenuItem;
+var PluginSidebar = wp.editor.PluginSidebar;
+var PluginSidebarMoreMenuItem = wp.editor.PluginSidebarMoreMenuItem;
 var registerPlugin = wp.plugins.registerPlugin;
 var moreIcon = React.createElement( 'svg' ); //... svg element.
 
@@ -123,7 +123,7 @@ registerPlugin( 'plugin-name', {
 
 ```js
 // Using ESNext syntax
-import { PluginSidebar, PluginSidebarMoreMenuItem } from '@wordpress/edit-post';
+import { PluginSidebar, PluginSidebarMoreMenuItem } from '@wordpress/editor';
 import { registerPlugin } from '@wordpress/plugins';
 import { more } from '@wordpress/icons';
 
@@ -192,6 +192,8 @@ _Returns_
 
 #### withPluginContext
 
+> **Deprecated** 6.8.0 Use `usePluginContext` hook instead.
+
 A Higher Order Component used to inject Plugin context to the wrapped component.
 
 _Parameters_
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index f28b5e46de9077..75f0bc554b868c 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/plugins",
-	"version": "6.15.0",
+	"version": "7.10.0",
 	"description": "Plugins module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,20 +19,22 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/element": "file:../element",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/element": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/is-shallow-equal": "*",
 		"memize": "^2.0.1"
 	},
 	"peerDependencies": {
@@ -41,5 +43,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/plugins/src/api/index.ts b/packages/plugins/src/api/index.ts
index 45c8f931634198..932628ddd623db 100644
--- a/packages/plugins/src/api/index.ts
+++ b/packages/plugins/src/api/index.ts
@@ -58,8 +58,8 @@ const plugins = {} as Record< string, WPPlugin >;
  * // Using ES5 syntax
  * var el = React.createElement;
  * var Fragment = wp.element.Fragment;
- * var PluginSidebar = wp.editPost.PluginSidebar;
- * var PluginSidebarMoreMenuItem = wp.editPost.PluginSidebarMoreMenuItem;
+ * var PluginSidebar = wp.editor.PluginSidebar;
+ * var PluginSidebarMoreMenuItem = wp.editor.PluginSidebarMoreMenuItem;
  * var registerPlugin = wp.plugins.registerPlugin;
  * var moreIcon = React.createElement( 'svg' ); //... svg element.
  *
@@ -94,7 +94,7 @@ const plugins = {} as Record< string, WPPlugin >;
  * @example
  * ```js
  * // Using ESNext syntax
- * import { PluginSidebar, PluginSidebarMoreMenuItem } from '@wordpress/edit-post';
+ * import { PluginSidebar, PluginSidebarMoreMenuItem } from '@wordpress/editor';
  * import { registerPlugin } from '@wordpress/plugins';
  * import { more } from '@wordpress/icons';
  *
diff --git a/packages/plugins/src/components/plugin-area/index.tsx b/packages/plugins/src/components/plugin-area/index.tsx
index 231a519b030d01..406ba6724b6a13 100644
--- a/packages/plugins/src/components/plugin-area/index.tsx
+++ b/packages/plugins/src/components/plugin-area/index.tsx
@@ -113,7 +113,11 @@ function PluginArea( {
 		};
 	}, [ scope ] );
 
-	const plugins = useSyncExternalStore( store.subscribe, store.getValue );
+	const plugins = useSyncExternalStore(
+		store.subscribe,
+		store.getValue,
+		store.getValue
+	);
 
 	return (
 		<div style={ { display: 'none' } }>
diff --git a/packages/plugins/src/components/plugin-context/index.tsx b/packages/plugins/src/components/plugin-context/index.tsx
index c2e6f8eaa232d8..3e2d687229011c 100644
--- a/packages/plugins/src/components/plugin-context/index.tsx
+++ b/packages/plugins/src/components/plugin-context/index.tsx
@@ -3,6 +3,7 @@
  */
 import { createContext, useContext } from '@wordpress/element';
 import { createHigherOrderComponent } from '@wordpress/compose';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -34,6 +35,8 @@ export function usePluginContext() {
  * A Higher Order Component used to inject Plugin context to the
  * wrapped component.
  *
+ * @deprecated 6.8.0 Use `usePluginContext` hook instead.
+ *
  * @param  mapContextToProps Function called on every context change,
  *                           expected to return object of props to
  *                           merge with the component's own props.
@@ -47,6 +50,10 @@ export const withPluginContext = (
 	) => T & PluginContext
 ) =>
 	createHigherOrderComponent( ( OriginalComponent ) => {
+		deprecated( 'wp.plugins.withPluginContext', {
+			since: '6.8.0',
+			alternative: 'wp.plugins.usePluginContext',
+		} );
 		return ( props ) => (
 			<Context.Consumer>
 				{ ( context ) => (
diff --git a/packages/plugins/tsconfig.json b/packages/plugins/tsconfig.json
index ddf1a213f4ed2c..47c626f9ddedc8 100644
--- a/packages/plugins/tsconfig.json
+++ b/packages/plugins/tsconfig.json
@@ -1,14 +1,15 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
 		"declarationDir": "build-types",
-		"types": [ "gutenberg-env" ],
-		"skipLibCheck": true
+		"types": [ "gutenberg-env" ]
 	},
 	"references": [
 		{ "path": "../components" },
 		{ "path": "../compose" },
+		{ "path": "../deprecated" },
 		{ "path": "../element" },
 		{ "path": "../hooks" },
 		{ "path": "../icons" },
diff --git a/packages/postcss-plugins-preset/.npmrc b/packages/postcss-plugins-preset/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/postcss-plugins-preset/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/postcss-plugins-preset/CHANGELOG.md b/packages/postcss-plugins-preset/CHANGELOG.md
index 8c1512fb1d7e84..514307874acb12 100644
--- a/packages/postcss-plugins-preset/CHANGELOG.md
+++ b/packages/postcss-plugins-preset/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.42.0 (2024-05-16)
+
+## 4.41.0 (2024-05-02)
+
+## 4.40.0 (2024-04-19)
+
+## 4.39.0 (2024-04-03)
+
+## 4.38.0 (2024-03-21)
+
+## 4.37.0 (2024-03-06)
+
+## 4.36.0 (2024-02-21)
+
+## 4.35.0 (2024-02-09)
+
+## 4.34.0 (2024-01-24)
+
+## 4.33.0 (2024-01-10)
+
+## 4.32.0 (2023-12-13)
+
 ## 4.31.0 (2023-11-29)
 
 ## 4.30.0 (2023-11-16)
@@ -64,7 +112,7 @@
 
 ## 4.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
diff --git a/packages/postcss-plugins-preset/README.md b/packages/postcss-plugins-preset/README.md
index 8385a30e6be53f..ac844e279b6f16 100644
--- a/packages/postcss-plugins-preset/README.md
+++ b/packages/postcss-plugins-preset/README.md
@@ -10,7 +10,7 @@ Install the module
 npm install @wordpress/postcss-plugins-preset --save
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Contributing to this package
 
diff --git a/packages/postcss-plugins-preset/package.json b/packages/postcss-plugins-preset/package.json
index 8f697aee2d0826..82753b0ff56d38 100644
--- a/packages/postcss-plugins-preset/package.json
+++ b/packages/postcss-plugins-preset/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-plugins-preset",
-	"version": "4.31.0",
+	"version": "5.10.0",
 	"description": "PostCSS sharable plugins preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -22,14 +22,15 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"lib"
 	],
 	"main": "lib/index.js",
 	"dependencies": {
-		"@wordpress/base-styles": "file:../base-styles",
+		"@wordpress/base-styles": "*",
 		"autoprefixer": "^10.2.5"
 	},
 	"peerDependencies": {
diff --git a/packages/postcss-themes/.npmrc b/packages/postcss-themes/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/postcss-themes/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/postcss-themes/CHANGELOG.md b/packages/postcss-themes/CHANGELOG.md
index 4948f7afbfae42..55c0311cc6b95e 100644
--- a/packages/postcss-themes/CHANGELOG.md
+++ b/packages/postcss-themes/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 6.10.0 (2024-10-16)
+
+## 6.9.0 (2024-10-03)
+
+## 6.8.0 (2024-09-19)
+
+## 6.7.0 (2024-09-05)
+
+## 6.6.0 (2024-08-21)
+
+## 6.5.0 (2024-08-07)
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 5.41.0 (2024-05-16)
+
+## 5.40.0 (2024-05-02)
+
+## 5.39.0 (2024-04-19)
+
+## 5.38.0 (2024-04-03)
+
+## 5.37.0 (2024-03-21)
+
+## 5.36.0 (2024-03-06)
+
+## 5.35.0 (2024-02-21)
+
+## 5.34.0 (2024-02-09)
+
+## 5.33.0 (2024-01-24)
+
+## 5.32.0 (2024-01-10)
+
+## 5.31.0 (2023-12-13)
+
 ## 5.30.0 (2023-11-29)
 
 ## 5.29.0 (2023-11-16)
@@ -64,7 +112,7 @@
 
 ## 5.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
@@ -82,6 +130,6 @@
 
 ## 2.0.0 (2019-03-06)
 
-### Breaking change
+### Breaking Changes
 
 -   Stop using Babel transpilation internally and set node 8 as a minimal version required ([#13540](https://github.com/WordPress/gutenberg/pull/13540)).
diff --git a/packages/postcss-themes/README.md b/packages/postcss-themes/README.md
index 341ecfdbd8b7a6..b23c6c829d1d9e 100644
--- a/packages/postcss-themes/README.md
+++ b/packages/postcss-themes/README.md
@@ -10,7 +10,7 @@ Install the module
 npm install @wordpress/postcss-themes --save
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Contributing to this package
 
diff --git a/packages/postcss-themes/package.json b/packages/postcss-themes/package.json
index 7f0d39b7a5b171..436c606cf9d1dd 100644
--- a/packages/postcss-themes/package.json
+++ b/packages/postcss-themes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-themes",
-	"version": "5.30.0",
+	"version": "6.10.0",
 	"description": "PostCSS plugin to generate theme colors.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -24,7 +24,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"index.js"
diff --git a/packages/preferences-persistence/.npmrc b/packages/preferences-persistence/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/preferences-persistence/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/preferences-persistence/CHANGELOG.md b/packages/preferences-persistence/CHANGELOG.md
index 11066a94f0dcde..b9efaa9c69049f 100644
--- a/packages/preferences-persistence/CHANGELOG.md
+++ b/packages/preferences-persistence/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 2.10.0 (2024-10-16)
+
+## 2.9.0 (2024-10-03)
+
+## 2.8.0 (2024-09-19)
+
+## 2.7.0 (2024-09-05)
+
+## 2.6.0 (2024-08-21)
+
+## 2.5.0 (2024-08-07)
+
+## 2.4.0 (2024-07-24)
+
+## 2.3.0 (2024-07-10)
+
+## 2.2.0 (2024-06-26)
+
+## 2.1.0 (2024-06-15)
+
+## 2.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 1.50.0 (2024-05-16)
+
+## 1.49.0 (2024-05-02)
+
+## 1.48.0 (2024-04-19)
+
+## 1.47.0 (2024-04-03)
+
+## 1.46.0 (2024-03-21)
+
+## 1.45.0 (2024-03-06)
+
+## 1.44.0 (2024-02-21)
+
+## 1.43.0 (2024-02-09)
+
+## 1.42.0 (2024-01-24)
+
+## 1.41.0 (2024-01-10)
+
+## 1.40.0 (2023-12-13)
+
 ## 1.39.0 (2023-11-29)
 
 ## 1.38.0 (2023-11-16)
diff --git a/packages/preferences-persistence/package.json b/packages/preferences-persistence/package.json
index ce3375ad43d67e..e91c8f295d4653 100644
--- a/packages/preferences-persistence/package.json
+++ b/packages/preferences-persistence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences-persistence",
-	"version": "1.39.0",
+	"version": "2.10.0",
 	"description": "Persistence utilities for `wordpress/preferences`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,17 +20,19 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "file:../api-fetch"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/preferences-persistence/src/migrations/legacy-local-storage-data/index.js b/packages/preferences-persistence/src/migrations/legacy-local-storage-data/index.js
index 9ac1f354920306..6f0bebd13a8a93 100644
--- a/packages/preferences-persistence/src/migrations/legacy-local-storage-data/index.js
+++ b/packages/preferences-persistence/src/migrations/legacy-local-storage-data/index.js
@@ -63,17 +63,17 @@ export function convertLegacyData( data ) {
 	data = moveIndividualPreference(
 		data,
 		{ from: 'core/edit-post', to: 'core/edit-post' },
-		'preferredStyleVariations'
+		'panels',
+		convertEditPostPanels
 	);
 	data = moveIndividualPreference(
 		data,
-		{ from: 'core/edit-post', to: 'core/edit-post' },
-		'panels',
-		convertEditPostPanels
+		{ from: 'core/editor', to: 'core' },
+		'isPublishSidebarEnabled'
 	);
 	data = moveIndividualPreference(
 		data,
-		{ from: 'core/editor', to: 'core/edit-post' },
+		{ from: 'core/edit-post', to: 'core' },
 		'isPublishSidebarEnabled'
 	);
 	data = moveIndividualPreference(
diff --git a/packages/preferences-persistence/src/migrations/legacy-local-storage-data/test/index.js b/packages/preferences-persistence/src/migrations/legacy-local-storage-data/test/index.js
index d9507fbdaf22ae..d4df39165c73d4 100644
--- a/packages/preferences-persistence/src/migrations/legacy-local-storage-data/test/index.js
+++ b/packages/preferences-persistence/src/migrations/legacy-local-storage-data/test/index.js
@@ -49,7 +49,6 @@ const legacyData = {
 			},
 			editorMode: 'text',
 			hiddenBlockTypes: [ 'core/heading', 'core/list' ],
-			preferredStyleVariations: { 'core/quote': 'plain' },
 			localAutosaveInterval: 15,
 		},
 	},
@@ -114,9 +113,6 @@ const alreadyConvertedData = {
 				fullscreenMode: false,
 				hiddenBlockTypes: [ 'core/audio', 'core/cover' ],
 				editorMode: 'visual',
-				preferredStyleVariations: {
-					'core/quote': 'large',
-				},
 				inactivePanels: [],
 				openPanels: [ 'post-status' ],
 				complementaryArea: 'edit-post/block',
@@ -161,9 +157,6 @@ describe( 'convertLegacyData', () => {
 		    "pinnedItems": {
 		      "my-sidebar-plugin/title-sidebar": false,
 		    },
-		    "preferredStyleVariations": {
-		      "core/quote": "plain",
-		    },
 		    "welcomeGuide": false,
 		  },
 		  "core/edit-site": {
@@ -206,9 +199,6 @@ describe( 'convertLegacyData', () => {
 		    "pinnedItems": {
 		      "my-sidebar-plugin/title-sidebar": false,
 		    },
-		    "preferredStyleVariations": {
-		      "core/quote": "large",
-		    },
 		    "welcomeGuide": false,
 		  },
 		  "core/edit-site": {
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js b/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
new file mode 100644
index 00000000000000..2f5a404634f99a
--- /dev/null
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
@@ -0,0 +1,52 @@
+/**
+ * Internal dependencies
+ */
+
+export default function convertEditorSettings( data ) {
+	let newData = data;
+	const settingsToMoveToCore = [
+		'allowRightClickOverrides',
+		'distractionFree',
+		'editorMode',
+		'fixedToolbar',
+		'focusMode',
+		'hiddenBlockTypes',
+		'inactivePanels',
+		'keepCaretInsideBlock',
+		'mostUsedBlocks',
+		'openPanels',
+		'showBlockBreadcrumbs',
+		'showIconLabels',
+		'showListViewByDefault',
+		'isPublishSidebarEnabled',
+		'isComplementaryAreaVisible',
+		'pinnedItems',
+	];
+
+	settingsToMoveToCore.forEach( ( setting ) => {
+		if ( data?.[ 'core/edit-post' ]?.[ setting ] !== undefined ) {
+			newData = {
+				...newData,
+				core: {
+					...newData?.core,
+					[ setting ]: data[ 'core/edit-post' ][ setting ],
+				},
+			};
+			delete newData[ 'core/edit-post' ][ setting ];
+		}
+
+		if ( data?.[ 'core/edit-site' ]?.[ setting ] !== undefined ) {
+			delete newData[ 'core/edit-site' ][ setting ];
+		}
+	} );
+
+	if ( Object.keys( newData?.[ 'core/edit-post' ] ?? {} )?.length === 0 ) {
+		delete newData[ 'core/edit-post' ];
+	}
+
+	if ( Object.keys( newData?.[ 'core/edit-site' ] ?? {} )?.length === 0 ) {
+		delete newData[ 'core/edit-site' ];
+	}
+
+	return newData;
+}
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/index.js b/packages/preferences-persistence/src/migrations/preferences-package-data/index.js
index 91efe2dac88f76..d4966e00e73d27 100644
--- a/packages/preferences-persistence/src/migrations/preferences-package-data/index.js
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/index.js
@@ -2,7 +2,10 @@
  * Internal dependencies
  */
 import convertComplementaryAreas from './convert-complementary-areas';
+import convertEditorSettings from './convert-editor-settings';
 
 export default function convertPreferencesPackageData( data ) {
-	return convertComplementaryAreas( data );
+	let newData = convertComplementaryAreas( data );
+	newData = convertEditorSettings( newData );
+	return newData;
 }
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/test/convert-complementary-areas.js b/packages/preferences-persistence/src/migrations/preferences-package-data/test/convert-complementary-areas.js
index fcb31c3dc38dd2..44541c1cbc8866 100644
--- a/packages/preferences-persistence/src/migrations/preferences-package-data/test/convert-complementary-areas.js
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/test/convert-complementary-areas.js
@@ -10,7 +10,7 @@ describe( 'convertComplementaryAreas', () => {
 				complementaryArea: 'edit-post/block',
 			},
 			'core/edit-site': {
-				complementaryArea: 'edit-site/template',
+				complementaryArea: 'edit-post/document',
 			},
 			'core/edit-post': {
 				complementaryArea: 'edit-post/block',
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/test/convert-editor-settings.js b/packages/preferences-persistence/src/migrations/preferences-package-data/test/convert-editor-settings.js
new file mode 100644
index 00000000000000..97a36f9630ecac
--- /dev/null
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/test/convert-editor-settings.js
@@ -0,0 +1,22 @@
+/**
+ * Internal dependencies
+ */
+import convertEditorSettings from '../convert-editor-settings';
+
+describe( 'convertEditorSettings', () => {
+	it( 'converts the `allowRightClickOverrides` property', () => {
+		const input = {
+			'core/edit-post': {
+				allowRightClickOverrides: false,
+			},
+		};
+
+		const expectedOutput = {
+			core: {
+				allowRightClickOverrides: false,
+			},
+		};
+
+		expect( convertEditorSettings( input ) ).toEqual( expectedOutput );
+	} );
+} );
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js b/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js
index 77888461ea078f..83253e1bb38810 100644
--- a/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js
@@ -20,9 +20,6 @@ const input = {
 		fullscreenMode: false,
 		hiddenBlockTypes: [ 'core/audio', 'core/cover' ],
 		editorMode: 'visual',
-		preferredStyleVariations: {
-			'core/quote': 'large',
-		},
 		inactivePanels: [],
 		openPanels: [ 'post-status' ],
 		pinnedItems: {
@@ -42,14 +39,9 @@ describe( 'convertPreferencesPackageData', () => {
 		expect( convertPreferencesPackageData( input ) )
 			.toMatchInlineSnapshot( `
 		{
-		  "core/customize-widgets": {
-		    "fixedToolbar": true,
-		    "welcomeGuide": false,
-		  },
-		  "core/edit-post": {
+		  "core": {
 		    "editorMode": "visual",
 		    "fixedToolbar": true,
-		    "fullscreenMode": false,
 		    "hiddenBlockTypes": [
 		      "core/audio",
 		      "core/cover",
@@ -61,14 +53,16 @@ describe( 'convertPreferencesPackageData', () => {
 		    "pinnedItems": {
 		      "my-sidebar-plugin/title-sidebar": false,
 		    },
-		    "preferredStyleVariations": {
-		      "core/quote": "large",
-		    },
+		  },
+		  "core/customize-widgets": {
+		    "fixedToolbar": true,
+		    "welcomeGuide": false,
+		  },
+		  "core/edit-post": {
+		    "fullscreenMode": false,
 		    "welcomeGuide": false,
 		  },
 		  "core/edit-site": {
-		    "fixedToolbar": true,
-		    "isComplementaryAreaVisible": true,
 		    "welcomeGuide": false,
 		    "welcomeGuideStyles": false,
 		  },
diff --git a/packages/preferences/.npmrc b/packages/preferences/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/preferences/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/preferences/CHANGELOG.md b/packages/preferences/CHANGELOG.md
index dc6c84ad6cd5b4..3b1711b5d87b04 100644
--- a/packages/preferences/CHANGELOG.md
+++ b/packages/preferences/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.35.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 3.34.0 (2024-05-02)
+
+## 3.33.0 (2024-04-19)
+
+## 3.32.0 (2024-04-03)
+
+## 3.31.0 (2024-03-21)
+
+## 3.30.0 (2024-03-06)
+
+## 3.29.0 (2024-02-21)
+
+## 3.28.0 (2024-02-09)
+
+## 3.27.0 (2024-01-24)
+
+## 3.26.0 (2024-01-10)
+
+## 3.25.0 (2023-12-13)
+
 ## 3.24.0 (2023-11-29)
 
 ## 3.23.0 (2023-11-16)
@@ -86,11 +138,11 @@
 
 ## 2.0.0 (2022-05-04)
 
-### Breaking change
+### Breaking Changes
 
 -   The preferences package is no longer compatible with the `@wordpress/data` persistence plugin. Please use the new `setPersistenceLayer` API. ([#39795](https://github.com/WordPress/gutenberg/pull/39795))
 
-### Enhancement
+### Enhancements
 
 -   A new `setPersistenceLayer` action has been introduced. ([#39795](https://github.com/WordPress/gutenberg/pull/39795))
 
diff --git a/packages/preferences/README.md b/packages/preferences/README.md
index f35f4cdc4e9b9b..448eb69a9b3633 100644
--- a/packages/preferences/README.md
+++ b/packages/preferences/README.md
@@ -138,12 +138,10 @@ wp.data.dispatch( 'core/preferences' ).setPersistenceLayer( {
 
 The `PreferenceToggleMenuItem` components can be used with a `DropdownMenu` to implement a menu for changing preferences.
 
-Also see the `MoreMenuDropdown` component from the `@wordpress/interface` package for implementing a more menu.
-
 ```jsx
 function MyEditorMenu() {
 	return (
-		<MoreMenuDropdown>
+		<DropdownMenu>
 			{ () => (
 				<MenuGroup label={ __( 'Features' ) }>
 					<PreferenceToggleMenuItem
@@ -156,7 +154,7 @@ function MyEditorMenu() {
 					/>
 				</MenuGroup>
 			) }
-		</MoreMenuDropdown>
+		</DropdownMenu>
 	);
 }
 ```
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index c2c81c22f782af..ef9f0ef8803dfc 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences",
-	"version": "3.24.0",
+	"version": "4.10.0",
 	"description": "Utilities for managing WordPress preferences.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,21 +21,25 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/components": "file:../components",
-		"@wordpress/data": "file:../data",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"classnames": "^2.3.1"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/private-apis": "*",
+		"clsx": "^2.1.1"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -43,5 +47,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/preferences/src/components/preference-base-option/README.md b/packages/preferences/src/components/preference-base-option/README.md
new file mode 100644
index 00000000000000..8ff438ba322dc5
--- /dev/null
+++ b/packages/preferences/src/components/preference-base-option/README.md
@@ -0,0 +1,40 @@
+# PreferenceBaseOption
+
+`PreferenceBaseOption` renders a toggle meant to be used within `PreferencesModal`. 
+
+This component implements a `ToggleControl` component from the `@wordpress/components` package.
+
+## Example
+
+```jsx
+function MyEditorPreferencesOption() {
+	return (
+		<PreferenceBaseOption
+			label={ label }
+			isChecked={ isChecked }
+			onChange={ setIsChecked }
+		>
+			{ isChecked !== areCustomFieldsEnabled && (
+				<CustomFieldsConfirmation willEnable={ isChecked } />
+			) }
+		</PreferenceBaseOption>
+	)				
+}
+```
+
+## Props
+
+### help 
+### label 
+### isChecked 
+### onChange
+
+These props are passed directly to ToggleControl, so see [ToggleControl readme](https://github.com/WordPress/gutenberg/blob/trunk/packages/components/src/toggle-control/README.md) for more info.
+
+### children
+
+Components to be rendered as content.
+
+-   Type: `Element`
+-   Required: No.
+
diff --git a/packages/preferences/src/components/preference-base-option/index.js b/packages/preferences/src/components/preference-base-option/index.js
new file mode 100644
index 00000000000000..f2d1b4936c97f8
--- /dev/null
+++ b/packages/preferences/src/components/preference-base-option/index.js
@@ -0,0 +1,21 @@
+/**
+ * WordPress dependencies
+ */
+import { ToggleControl } from '@wordpress/components';
+
+function BaseOption( { help, label, isChecked, onChange, children } ) {
+	return (
+		<div className="preference-base-option">
+			<ToggleControl
+				__nextHasNoMarginBottom
+				help={ help }
+				label={ label }
+				checked={ isChecked }
+				onChange={ onChange }
+			/>
+			{ children }
+		</div>
+	);
+}
+
+export default BaseOption;
diff --git a/packages/preferences/src/components/preference-base-option/style.scss b/packages/preferences/src/components/preference-base-option/style.scss
new file mode 100644
index 00000000000000..32040d0c9093a6
--- /dev/null
+++ b/packages/preferences/src/components/preference-base-option/style.scss
@@ -0,0 +1,5 @@
+.preference-base-option {
+	& + & {
+		margin-top: $grid-unit-20;
+	}
+}
diff --git a/packages/preferences/src/components/preference-toggle-control/index.js b/packages/preferences/src/components/preference-toggle-control/index.js
new file mode 100644
index 00000000000000..70ff51a8a84740
--- /dev/null
+++ b/packages/preferences/src/components/preference-toggle-control/index.js
@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store as preferencesStore } from '../../store';
+import PreferenceBaseOption from '../preference-base-option';
+
+function PreferenceToggleControl( props ) {
+	const {
+		scope,
+		featureName,
+		onToggle = () => {},
+		...remainingProps
+	} = props;
+	const isChecked = useSelect(
+		( select ) => !! select( preferencesStore ).get( scope, featureName ),
+		[ scope, featureName ]
+	);
+	const { toggle } = useDispatch( preferencesStore );
+	const onChange = () => {
+		onToggle();
+		toggle( scope, featureName );
+	};
+
+	return (
+		<PreferenceBaseOption
+			onChange={ onChange }
+			isChecked={ isChecked }
+			{ ...remainingProps }
+		/>
+	);
+}
+
+export default PreferenceToggleControl;
diff --git a/packages/preferences/src/components/preference-toggle-menu-item/index.js b/packages/preferences/src/components/preference-toggle-menu-item/index.js
index 9d2b8d353e9448..c5110463c98003 100644
--- a/packages/preferences/src/components/preference-toggle-menu-item/index.js
+++ b/packages/preferences/src/components/preference-toggle-menu-item/index.js
@@ -20,6 +20,7 @@ export default function PreferenceToggleMenuItem( {
 	messageActivated,
 	messageDeactivated,
 	shortcut,
+	handleToggling = true,
 	onToggle = () => null,
 	disabled = false,
 } ) {
@@ -56,7 +57,9 @@ export default function PreferenceToggleMenuItem( {
 			isSelected={ isActive }
 			onClick={ () => {
 				onToggle();
-				toggle( scope, name );
+				if ( handleToggling ) {
+					toggle( scope, name );
+				}
 				speakMessage();
 			} }
 			role="menuitemcheckbox"
diff --git a/packages/preferences/src/components/preferences-modal-section/README.md b/packages/preferences/src/components/preferences-modal-section/README.md
new file mode 100644
index 00000000000000..4b032b5db04975
--- /dev/null
+++ b/packages/preferences/src/components/preferences-modal-section/README.md
@@ -0,0 +1,31 @@
+# PreferencesModalSection
+
+`PreferencesModalSection` renders a section (as a fieldset) meant to be used with `PreferencesModal`.
+
+## Example
+
+See the `PreferencesModal` readme for usage info.
+
+
+## Props
+
+### title
+
+The title of the section
+
+-   Type: `String`
+-   Required: Yes.
+
+### description
+
+The description for the section.
+
+-   Type: `String`
+-   Required: No.
+
+### children
+
+Components to be rendered as content.
+
+-   Type: `Element`
+-   Required: Yes.
diff --git a/packages/preferences/src/components/preferences-modal-section/index.js b/packages/preferences/src/components/preferences-modal-section/index.js
new file mode 100644
index 00000000000000..1a3f6f64ef4e75
--- /dev/null
+++ b/packages/preferences/src/components/preferences-modal-section/index.js
@@ -0,0 +1,15 @@
+const Section = ( { description, title, children } ) => (
+	<fieldset className="preferences-modal__section">
+		<legend className="preferences-modal__section-legend">
+			<h2 className="preferences-modal__section-title">{ title }</h2>
+			{ description && (
+				<p className="preferences-modal__section-description">
+					{ description }
+				</p>
+			) }
+		</legend>
+		<div className="preferences-modal__section-content">{ children }</div>
+	</fieldset>
+);
+
+export default Section;
diff --git a/packages/preferences/src/components/preferences-modal-section/style.scss b/packages/preferences/src/components/preferences-modal-section/style.scss
new file mode 100644
index 00000000000000..2f6480dd71dab7
--- /dev/null
+++ b/packages/preferences/src/components/preferences-modal-section/style.scss
@@ -0,0 +1,28 @@
+.preferences-modal__section {
+	margin: 0 0 2.5rem 0;
+
+	&:last-child {
+		margin: 0;
+	}
+}
+
+.preferences-modal__section-legend {
+	margin-bottom: $grid-unit-10;
+}
+
+.preferences-modal__section-title {
+	font-size: 0.9rem;
+	font-weight: 600;
+	margin-top: 0;
+}
+
+.preferences-modal__section-description {
+	margin: -$grid-unit-10 0 $grid-unit-10 0;
+	font-size: $helptext-font-size;
+	font-style: normal;
+	color: $gray-700;
+}
+
+.preferences-modal__section:has(.preferences-modal__section-content:empty) {
+	display: none;
+}
diff --git a/packages/interface/src/components/preferences-modal-tabs/README.md b/packages/preferences/src/components/preferences-modal-tabs/README.md
similarity index 100%
rename from packages/interface/src/components/preferences-modal-tabs/README.md
rename to packages/preferences/src/components/preferences-modal-tabs/README.md
diff --git a/packages/preferences/src/components/preferences-modal-tabs/index.js b/packages/preferences/src/components/preferences-modal-tabs/index.js
new file mode 100644
index 00000000000000..f73bdd7f029dc7
--- /dev/null
+++ b/packages/preferences/src/components/preferences-modal-tabs/index.js
@@ -0,0 +1,170 @@
+/**
+ * WordPress dependencies
+ */
+import { useViewportMatch } from '@wordpress/compose';
+import {
+	Navigator,
+	__experimentalItemGroup as ItemGroup,
+	__experimentalItem as Item,
+	__experimentalHStack as HStack,
+	__experimentalText as Text,
+	__experimentalTruncate as Truncate,
+	FlexItem,
+	Card,
+	CardHeader,
+	CardBody,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
+import { useMemo, useState } from '@wordpress/element';
+import { chevronLeft, chevronRight, Icon } from '@wordpress/icons';
+import { isRTL, __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { Tabs } = unlock( componentsPrivateApis );
+
+const PREFERENCES_MENU = 'preferences-menu';
+
+export default function PreferencesModalTabs( { sections } ) {
+	const isLargeViewport = useViewportMatch( 'medium' );
+
+	// This is also used to sync the two different rendered components
+	// between small and large viewports.
+	const [ activeMenu, setActiveMenu ] = useState( PREFERENCES_MENU );
+	/**
+	 * Create helper objects from `sections` for easier data handling.
+	 * `tabs` is used for creating the `Tabs` and `sectionsContentMap`
+	 * is used for easier access to active tab's content.
+	 */
+	const { tabs, sectionsContentMap } = useMemo( () => {
+		let mappedTabs = {
+			tabs: [],
+			sectionsContentMap: {},
+		};
+		if ( sections.length ) {
+			mappedTabs = sections.reduce(
+				( accumulator, { name, tabLabel: title, content } ) => {
+					accumulator.tabs.push( { name, title } );
+					accumulator.sectionsContentMap[ name ] = content;
+					return accumulator;
+				},
+				{ tabs: [], sectionsContentMap: {} }
+			);
+		}
+		return mappedTabs;
+	}, [ sections ] );
+
+	let modalContent;
+	// We render different components based on the viewport size.
+	if ( isLargeViewport ) {
+		modalContent = (
+			<div className="preferences__tabs">
+				<Tabs
+					defaultTabId={
+						activeMenu !== PREFERENCES_MENU ? activeMenu : undefined
+					}
+					onSelect={ setActiveMenu }
+					orientation="vertical"
+				>
+					<Tabs.TabList className="preferences__tabs-tablist">
+						{ tabs.map( ( tab ) => (
+							<Tabs.Tab
+								tabId={ tab.name }
+								key={ tab.name }
+								className="preferences__tabs-tab"
+							>
+								{ tab.title }
+							</Tabs.Tab>
+						) ) }
+					</Tabs.TabList>
+					{ tabs.map( ( tab ) => (
+						<Tabs.TabPanel
+							tabId={ tab.name }
+							key={ tab.name }
+							className="preferences__tabs-tabpanel"
+							focusable={ false }
+						>
+							{ sectionsContentMap[ tab.name ] || null }
+						</Tabs.TabPanel>
+					) ) }
+				</Tabs>
+			</div>
+		);
+	} else {
+		modalContent = (
+			<Navigator initialPath="/" className="preferences__provider">
+				<Navigator.Screen path="/">
+					<Card isBorderless size="small">
+						<CardBody>
+							<ItemGroup>
+								{ tabs.map( ( tab ) => {
+									return (
+										<Navigator.Button
+											key={ tab.name }
+											path={ `/${ tab.name }` }
+											as={ Item }
+											isAction
+										>
+											<HStack justify="space-between">
+												<FlexItem>
+													<Truncate>
+														{ tab.title }
+													</Truncate>
+												</FlexItem>
+												<FlexItem>
+													<Icon
+														icon={
+															isRTL()
+																? chevronLeft
+																: chevronRight
+														}
+													/>
+												</FlexItem>
+											</HStack>
+										</Navigator.Button>
+									);
+								} ) }
+							</ItemGroup>
+						</CardBody>
+					</Card>
+				</Navigator.Screen>
+				{ sections.length &&
+					sections.map( ( section ) => {
+						return (
+							<Navigator.Screen
+								key={ `${ section.name }-menu` }
+								path={ `/${ section.name }` }
+							>
+								<Card isBorderless size="large">
+									<CardHeader
+										isBorderless={ false }
+										justify="left"
+										size="small"
+										gap="6"
+									>
+										<Navigator.BackButton
+											icon={
+												isRTL()
+													? chevronRight
+													: chevronLeft
+											}
+											label={ __( 'Back' ) }
+										/>
+										<Text size="16">
+											{ section.tabLabel }
+										</Text>
+									</CardHeader>
+									<CardBody>{ section.content }</CardBody>
+								</Card>
+							</Navigator.Screen>
+						);
+					} ) }
+			</Navigator>
+		);
+	}
+
+	return modalContent;
+}
diff --git a/packages/preferences/src/components/preferences-modal-tabs/style.scss b/packages/preferences/src/components/preferences-modal-tabs/style.scss
new file mode 100644
index 00000000000000..247da29eb5d12c
--- /dev/null
+++ b/packages/preferences/src/components/preferences-modal-tabs/style.scss
@@ -0,0 +1,22 @@
+$vertical-tabs-width: 160px;
+
+.preferences__tabs-tablist {
+	position: absolute !important;
+	top: $header-height + $grid-unit-30;
+	// Aligns button text instead of button box.
+	left: $grid-unit-20;
+	width: $vertical-tabs-width;
+}
+
+.preferences__tabs-tabpanel {
+	padding-left: $grid-unit-30;
+	margin-left: $vertical-tabs-width;
+}
+
+@media (max-width: #{ ($break-medium - 1) }) {
+	// Keep the navigator component from overflowing the modal content area
+	// to ensure that sticky position elements stick where intended.
+	.preferences__provider {
+		height: 100%;
+	}
+}
diff --git a/packages/preferences/src/components/preferences-modal/README.md b/packages/preferences/src/components/preferences-modal/README.md
new file mode 100644
index 00000000000000..4814fc12e5898a
--- /dev/null
+++ b/packages/preferences/src/components/preferences-modal/README.md
@@ -0,0 +1,69 @@
+# PreferencesModal
+
+`PreferencesModal` renders a modal with editor preferences. It can take a `PreferencesModalTabs` component, which accepts multiple tabs, and/or other child components. On small viewports, the modal is fullscreen.
+
+This component implements a `Modal` component from the `@wordpress/components` package.
+
+Sections passed to this component should use `PreferencesModalSection` component from the `@wordpress/preferences` package.
+
+
+## Example
+
+```jsx
+function MyEditorPreferencesModal() {
+	const { closeModal } = useDispatch( editPostStore );
+	const sections = [
+		{
+			name: 'section 1',
+			tabLabel: __( 'Section 1' ),
+			content: (
+						<PreferencesModalSection
+							title={ __( 'Publishing' ) }
+							description={ __(
+								'Change options related to publishing.'
+							) }
+						>
+							<EnablePublishSidebarOption
+								help={ __(
+									'Review settings, such as visibility and tags.'
+								) }
+								label={ __(
+									'Enable pre-publish checks'
+								) }
+							/>
+						</PreferencesModalSection>
+					)
+
+		}
+		{
+			name: 'section 2',
+			tabLabel: __( 'Section 2' ),
+			content: (
+						<PreferencesModalSection
+							title={ __( 'Additional' ) }
+							description={ __(
+								'Add extra areas to the editor.'
+							) }
+						>
+							// Section content here
+						</PreferencesModalSection>
+					)
+
+		}
+	]
+	return (
+		<PreferencesModal closeModal={ closeModal }>
+			<PreferencesModalTabs sections={ sections } />
+		<PreferencesModal />
+	);
+}
+```
+
+## Props
+
+### closeModal
+
+A function to call when closing the modal.
+
+-   Type: `Function`
+-   Required: Yes.
diff --git a/packages/preferences/src/components/preferences-modal/index.js b/packages/preferences/src/components/preferences-modal/index.js
new file mode 100644
index 00000000000000..8dc4f1020c036f
--- /dev/null
+++ b/packages/preferences/src/components/preferences-modal/index.js
@@ -0,0 +1,17 @@
+/**
+ * WordPress dependencies
+ */
+import { Modal } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+export default function PreferencesModal( { closeModal, children } ) {
+	return (
+		<Modal
+			className="preferences-modal"
+			title={ __( 'Preferences' ) }
+			onRequestClose={ closeModal }
+		>
+			{ children }
+		</Modal>
+	);
+}
diff --git a/packages/preferences/src/components/preferences-modal/style.scss b/packages/preferences/src/components/preferences-modal/style.scss
new file mode 100644
index 00000000000000..ca185ac4258e0e
--- /dev/null
+++ b/packages/preferences/src/components/preferences-modal/style.scss
@@ -0,0 +1,21 @@
+.preferences-modal {
+	// To keep modal dimensions consistent as subsections are navigated, width
+	// and height are used instead of max-(width/height).
+	@include break-small() {
+		width: calc(100% - #{ $grid-unit-20 * 2 });
+		height: calc(100% - #{ $header-height * 2 });
+	}
+	@include break-medium() {
+		width: $break-medium - $grid-unit-20 * 2;
+	}
+	@include break-large() {
+		height: 70%;
+	}
+
+	// Clears spacing to flush fit the navigator component to the modal edges.
+	@media (max-width: #{ ($break-medium - 1) }) {
+		.components-modal__content {
+			padding: 0;
+		}
+	}
+}
diff --git a/packages/preferences/src/index.js b/packages/preferences/src/index.js
index 72531a0824c178..856b93b21105d8 100644
--- a/packages/preferences/src/index.js
+++ b/packages/preferences/src/index.js
@@ -1,2 +1,3 @@
 export * from './components';
 export { store } from './store';
+export * from './private-apis';
diff --git a/packages/preferences/src/lock-unlock.js b/packages/preferences/src/lock-unlock.js
new file mode 100644
index 00000000000000..9556c83135e581
--- /dev/null
+++ b/packages/preferences/src/lock-unlock.js
@@ -0,0 +1,9 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+		'@wordpress/preferences'
+	);
diff --git a/packages/preferences/src/private-apis.js b/packages/preferences/src/private-apis.js
new file mode 100644
index 00000000000000..110d134f86b822
--- /dev/null
+++ b/packages/preferences/src/private-apis.js
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import PreferenceBaseOption from './components/preference-base-option';
+import PreferenceToggleControl from './components/preference-toggle-control';
+import PreferencesModal from './components/preferences-modal';
+import PreferencesModalSection from './components/preferences-modal-section';
+import PreferencesModalTabs from './components/preferences-modal-tabs';
+import { lock } from './lock-unlock';
+
+export const privateApis = {};
+lock( privateApis, {
+	PreferenceBaseOption,
+	PreferenceToggleControl,
+	PreferencesModal,
+	PreferencesModalSection,
+	PreferencesModalTabs,
+} );
diff --git a/packages/preferences/src/store/index.js b/packages/preferences/src/store/index.js
index 0c2421966a0d79..7e57dac5e712ca 100644
--- a/packages/preferences/src/store/index.js
+++ b/packages/preferences/src/store/index.js
@@ -12,7 +12,7 @@ import * as selectors from './selectors';
 import { STORE_NAME } from './constants';
 
 /**
- * Store definition for the interface namespace.
+ * Store definition for the preferences namespace.
  *
  * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/data/README.md#createReduxStore
  *
diff --git a/packages/preferences/src/store/selectors.js b/packages/preferences/src/store/selectors.js
index 58b4d18bc362aa..a574251efe37b4 100644
--- a/packages/preferences/src/store/selectors.js
+++ b/packages/preferences/src/store/selectors.js
@@ -1,3 +1,46 @@
+/**
+ * WordPress dependencies
+ */
+import deprecated from '@wordpress/deprecated';
+
+const withDeprecatedKeys = ( originalGet ) => ( state, scope, name ) => {
+	const settingsToMoveToCore = [
+		'allowRightClickOverrides',
+		'distractionFree',
+		'editorMode',
+		'fixedToolbar',
+		'focusMode',
+		'hiddenBlockTypes',
+		'inactivePanels',
+		'keepCaretInsideBlock',
+		'mostUsedBlocks',
+		'openPanels',
+		'showBlockBreadcrumbs',
+		'showIconLabels',
+		'showListViewByDefault',
+		'isPublishSidebarEnabled',
+		'isComplementaryAreaVisible',
+		'pinnedItems',
+	];
+
+	if (
+		settingsToMoveToCore.includes( name ) &&
+		[ 'core/edit-post', 'core/edit-site' ].includes( scope )
+	) {
+		deprecated(
+			`wp.data.select( 'core/preferences' ).get( '${ scope }', '${ name }' )`,
+			{
+				since: '6.5',
+				alternative: `wp.data.select( 'core/preferences' ).get( 'core', '${ name }' )`,
+			}
+		);
+
+		return originalGet( state, 'core', name );
+	}
+
+	return originalGet( state, scope, name );
+};
+
 /**
  * Returns a boolean indicating whether a prefer is active for a particular
  * scope.
@@ -8,7 +51,7 @@
  *
  * @return {*} Is the feature enabled?
  */
-export function get( state, scope, name ) {
+export const get = withDeprecatedKeys( ( state, scope, name ) => {
 	const value = state.preferences[ scope ]?.[ name ];
 	return value !== undefined ? value : state.defaults[ scope ]?.[ name ];
-}
+} );
diff --git a/packages/preferences/src/style.scss b/packages/preferences/src/style.scss
new file mode 100644
index 00000000000000..c6769c44b00ba9
--- /dev/null
+++ b/packages/preferences/src/style.scss
@@ -0,0 +1,4 @@
+@import "./components/preference-base-option/style.scss";
+@import "./components/preferences-modal/style.scss";
+@import "./components/preferences-modal-tabs/style.scss";
+@import "./components/preferences-modal-section/style.scss";
diff --git a/packages/prettier-config/.npmrc b/packages/prettier-config/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/prettier-config/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/prettier-config/CHANGELOG.md b/packages/prettier-config/CHANGELOG.md
index 2ef95f2fb1d02f..33a0261603fb7c 100644
--- a/packages/prettier-config/CHANGELOG.md
+++ b/packages/prettier-config/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.15.0 (2024-05-16)
+
+## 3.14.0 (2024-05-02)
+
+## 3.13.0 (2024-04-19)
+
+## 3.12.0 (2024-04-03)
+
+## 3.11.0 (2024-03-21)
+
+## 3.10.0 (2024-03-06)
+
+## 3.9.0 (2024-02-21)
+
+## 3.8.0 (2024-02-09)
+
+## 3.7.0 (2024-01-24)
+
+## 3.6.0 (2024-01-10)
+
+## 3.5.0 (2023-12-13)
+
 ## 3.4.0 (2023-11-29)
 
 ## 3.3.0 (2023-11-16)
@@ -12,7 +60,7 @@
 
 ## 3.0.0 (2023-10-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change the required major version of Prettier from v2 to v3 ([#54775](https://github.com/WordPress/gutenberg/pull/54775)).
 
@@ -73,21 +121,21 @@
 
 ## 2.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Packages: Replace `is-plain-obj` with native functionality ([#43511](https://github.com/WordPress/gutenberg/pull/43511)).
 
 ## 1.2.0 (2022-04-21)
 
-### Enhancement
+### Enhancements
 
 -   Add additional configuration for CSS styles to better align with [CSS Coding Standards](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/css/) ([#40479](https://github.com/WordPress/gutenberg/pull/40479)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Ensure that the config can work with both `prettier` and `wp-prettier` without reporting warnings ([#40479](https://github.com/WordPress/gutenberg/pull/40479)).
 
diff --git a/packages/prettier-config/README.md b/packages/prettier-config/README.md
index b07fad62e14e63..efb75513694fc9 100644
--- a/packages/prettier-config/README.md
+++ b/packages/prettier-config/README.md
@@ -10,7 +10,7 @@ Install the module
 $ npm install @wordpress/prettier-config --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Usage
 
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index fc7a79934737f0..f46706b09082bd 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/prettier-config",
-	"version": "3.4.0",
+	"version": "4.10.0",
 	"description": "WordPress Prettier shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"lib/index.js"
diff --git a/packages/prettier-config/tsconfig.json b/packages/prettier-config/tsconfig.json
index 0fc48d2e9005e4..0636ff7d0081dd 100644
--- a/packages/prettier-config/tsconfig.json
+++ b/packages/prettier-config/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "lib",
diff --git a/packages/primitives/.npmrc b/packages/primitives/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/primitives/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/primitives/CHANGELOG.md b/packages/primitives/CHANGELOG.md
index b18081f02bf16f..02b3d9176b2ca8 100644
--- a/packages/primitives/CHANGELOG.md
+++ b/packages/primitives/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.56.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 3.55.0 (2024-05-02)
+
+## 3.54.0 (2024-04-19)
+
+## 3.53.0 (2024-04-03)
+
+## 3.52.0 (2024-03-21)
+
+## 3.51.0 (2024-03-06)
+
+## 3.50.0 (2024-02-21)
+
+## 3.49.0 (2024-02-09)
+
+## 3.48.0 (2024-01-24)
+
+## 3.47.0 (2024-01-10)
+
+## 3.46.0 (2023-12-13)
+
 ## 3.45.0 (2023-11-29)
 
 ## 3.44.0 (2023-11-16)
@@ -14,7 +66,7 @@
 
 ## 3.40.0 (2023-09-20)
 
-### Enhancement
+### Enhancements
 
 -   `<SVG>` now forwards ref to the underlying `<svg>` element ([#54492](https://github.com/WordPress/gutenberg/pull/54492)).
 
@@ -98,7 +150,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -110,20 +162,20 @@
 
 ### Breaking Changes
 
--   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/.
--   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at https://nodejs.org/en/about/releases/.
+-   Drop support for Internet Explorer 11 ([#31110](https://github.com/WordPress/gutenberg/pull/31110)). Learn more at <https://make.wordpress.org/core/2021/04/22/ie-11-support-phase-out-plan/>.
+-   Increase the minimum Node.js version to v12 matching Long Term Support releases ([#31270](https://github.com/WordPress/gutenberg/pull/31270)). Learn more at <https://nodejs.org/en/about/releases/>.
 
 ## 1.12.0 (2021-03-17)
 
 ## 1.5.0 (2020-05-14)
 
-### New Feature
+### New Features
 
 -   Include TypeScript type declarations ([#21781](https://github.com/WordPress/gutenberg/pull/21781))
 
 ## 1.3.1 (2020-04-15)
 
-### Bug Fix
+### Bug Fixes
 
 -   Hide TypeScript type declarations ([#21613](https://github.com/WordPress/gutenberg/pull/21613))
     after they were found to conflict with DefinitelyTyped provided declarations.
diff --git a/packages/primitives/package.json b/packages/primitives/package.json
index 226b6f7998c0a9..67117e037002c6 100644
--- a/packages/primitives/package.json
+++ b/packages/primitives/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/primitives",
-	"version": "3.45.0",
+	"version": "4.10.0",
 	"description": "WordPress cross-platform primitives.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -30,11 +31,15 @@
 	],
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/element": "file:../element",
-		"classnames": "^2.3.1"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/element": "*",
+		"clsx": "^2.1.1"
+	},
+	"peerDependencies": {
+		"react": "^18.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/primitives/src/block-quotation/index.native.js b/packages/primitives/src/block-quotation/index.native.js
index 3d0d29c2972454..36368a6d78e066 100644
--- a/packages/primitives/src/block-quotation/index.native.js
+++ b/packages/primitives/src/block-quotation/index.native.js
@@ -32,7 +32,10 @@ export const BlockQuotation = forwardRef( ( { ...props }, ref ) => {
 	const colorStyle = style?.color ? { color: style.color } : {};
 
 	const newChildren = Children.map( props.children, ( child ) => {
-		if ( child && child.props.identifier === 'citation' ) {
+		const { identifier, attributeKey } = child?.props || {};
+		const identifierKey = identifier ?? attributeKey;
+
+		if ( identifierKey === 'citation' ) {
 			return cloneElement( child, {
 				style: {
 					...styles.wpBlockQuoteCitation,
diff --git a/packages/primitives/src/block-quotation/style.native.scss b/packages/primitives/src/block-quotation/style.native.scss
index a755027cb98452..d89b556275f728 100644
--- a/packages/primitives/src/block-quotation/style.native.scss
+++ b/packages/primitives/src/block-quotation/style.native.scss
@@ -2,7 +2,6 @@
 	border-left-width: 4px;
 	border-left-style: solid;
 	padding-left: $block-edge-to-content;
-	padding-top: $dashed-border-space;
 	margin-left: 0;
 }
 
diff --git a/packages/primitives/src/svg/index.js b/packages/primitives/src/svg/index.js
index 420432d0543e13..4da6685d3d6f1e 100644
--- a/packages/primitives/src/svg/index.js
+++ b/packages/primitives/src/svg/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -94,8 +94,7 @@ export const SVG = forwardRef(
 		const appliedProps = {
 			...props,
 			className:
-				classnames( className, { 'is-pressed': isPressed } ) ||
-				undefined,
+				clsx( className, { 'is-pressed': isPressed } ) || undefined,
 			'aria-hidden': true,
 			focusable: false,
 		};
diff --git a/packages/primitives/tsconfig.json b/packages/primitives/tsconfig.json
index 085d6fa752ab04..59a95359b5ea65 100644
--- a/packages/primitives/tsconfig.json
+++ b/packages/primitives/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/priority-queue/.npmrc b/packages/priority-queue/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/priority-queue/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/priority-queue/CHANGELOG.md b/packages/priority-queue/CHANGELOG.md
index df26c90b131aa5..e080b71c08182a 100644
--- a/packages/priority-queue/CHANGELOG.md
+++ b/packages/priority-queue/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 3.10.0 (2024-10-16)
+
+## 3.9.0 (2024-10-03)
+
+## 3.8.0 (2024-09-19)
+
+## 3.7.0 (2024-09-05)
+
+## 3.6.0 (2024-08-21)
+
+## 3.5.0 (2024-08-07)
+
+## 3.4.0 (2024-07-24)
+
+## 3.3.0 (2024-07-10)
+
+## 3.2.0 (2024-06-26)
+
+## 3.1.0 (2024-06-15)
+
+## 3.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 2.58.0 (2024-05-16)
+
+## 2.57.0 (2024-05-02)
+
+## 2.56.0 (2024-04-19)
+
+## 2.55.0 (2024-04-03)
+
+## 2.54.0 (2024-03-21)
+
+## 2.53.0 (2024-03-06)
+
+## 2.52.0 (2024-02-21)
+
+## 2.51.0 (2024-02-09)
+
+## 2.50.0 (2024-01-24)
+
+## 2.49.0 (2024-01-10)
+
+## 2.48.0 (2023-12-13)
+
 ## 2.47.0 (2023-11-29)
 
 ## 2.46.0 (2023-11-16)
@@ -84,9 +132,9 @@
 
 ## 2.7.0 (2022-04-21)
 
-### New features
+### New Features
 
--  Add a new `cancel` method that removes scheduled callbacks without executing them.
+-   Add a new `cancel` method that removes scheduled callbacks without executing them.
 
 ## 2.6.0 (2022-04-08)
 
@@ -111,7 +159,7 @@
 
 ## 1.6.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json
index cad513efb2583c..0113bb9b1bc62c 100644
--- a/packages/priority-queue/package.json
+++ b/packages/priority-queue/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/priority-queue",
-	"version": "2.47.0",
+	"version": "3.10.0",
 	"description": "Generic browser priority queue.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,10 +29,11 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"requestidlecallback": "^0.3.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/priority-queue/tsconfig.json b/packages/priority-queue/tsconfig.json
index 44d5c8525bda33..96d649eb7a6233 100644
--- a/packages/priority-queue/tsconfig.json
+++ b/packages/priority-queue/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/private-apis/CHANGELOG.md b/packages/private-apis/CHANGELOG.md
index 16cfc9f3bd5a04..99887b6f4b6152 100644
--- a/packages/private-apis/CHANGELOG.md
+++ b/packages/private-apis/CHANGELOG.md
@@ -2,6 +2,55 @@
 
 ## Unreleased
 
+## 1.10.0 (2024-10-16)
+
+## 1.9.0 (2024-10-03)
+
+## 1.8.0 (2024-09-19)
+
+## 1.7.0 (2024-09-05)
+
+## 1.6.0 (2024-08-21)
+
+## 1.5.0 (2024-08-07)
+
+## 1.4.0 (2024-07-24)
+
+## 1.3.0 (2024-07-10)
+
+## 1.2.0 (2024-06-26)
+
+## 1.1.0 (2024-06-15)
+
+## 1.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 0.40.0 (2024-05-16)
+
+## 0.39.0 (2024-05-02)
+
+## 0.38.0 (2024-04-19)
+
+## 0.37.0 (2024-04-03)
+
+## 0.36.0 (2024-03-21)
+
+## 0.35.0 (2024-03-06)
+
+## 0.34.0 (2024-02-21)
+
+## 0.33.0 (2024-02-09)
+
+## 0.32.0 (2024-01-24)
+
+## 0.31.0 (2024-01-10)
+
+## 0.30.0 (2023-12-13)
+
 ## 0.29.0 (2023-11-29)
 
 ## 0.28.0 (2023-11-16)
diff --git a/packages/private-apis/README.md b/packages/private-apis/README.md
index 163ef630d0febc..b95fb0d7bd3eba 100644
--- a/packages/private-apis/README.md
+++ b/packages/private-apis/README.md
@@ -12,7 +12,7 @@ Every `@wordpress` package wanting to privately access or expose experimental AP
 import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
 export const { lock, unlock } =
 	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 		'@wordpress/block-editor' // Name of the package calling __dangerousOptInToUnstableAPIsOnlyForCoreModules,
 		// (not the name of the package whose APIs you want to access)
 	);
@@ -22,7 +22,7 @@ Each package may only opt in once. The function name communicates that plugins a
 
 The function will throw an error if the following conditions are not met:
 
-1. The first argument must exactly match the required consent string: `'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.'`.
+1. The first argument must exactly match the required consent string: `'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.'`.
 2. The second argument must be a known `@wordpress` package that hasn't yet opted into `@wordpress/private-apis`
 
 Once the opt-in is complete, the obtained `lock()` and `unlock()` utilities enable hiding `__experimental` APIs from the naked eye:
@@ -120,3 +120,4 @@ The final string in this list is the current version.
 
 1. I know using unstable features means my plugin or theme will inevitably break on the next WordPress release.
 2. I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.
+3. I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.
diff --git a/packages/private-apis/package.json b/packages/private-apis/package.json
index aa19e14d284ea9..eae83e1fc46d34 100644
--- a/packages/private-apis/package.json
+++ b/packages/private-apis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/private-apis",
-	"version": "0.29.0",
+	"version": "1.10.0",
 	"description": "Internal experimental APIs for WordPress core.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,9 +29,10 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/private-apis/src/implementation.js b/packages/private-apis/src/implementation.js
index a7da5bc9726554..ab0ebfae7ecb05 100644
--- a/packages/private-apis/src/implementation.js
+++ b/packages/private-apis/src/implementation.js
@@ -24,10 +24,14 @@ const CORE_MODULES_USING_PRIVATE_APIS = [
 	'@wordpress/edit-site',
 	'@wordpress/edit-widgets',
 	'@wordpress/editor',
+	'@wordpress/format-library',
+	'@wordpress/interface',
 	'@wordpress/patterns',
+	'@wordpress/preferences',
 	'@wordpress/reusable-blocks',
 	'@wordpress/router',
 	'@wordpress/dataviews',
+	'@wordpress/fields',
 ];
 
 /**
@@ -53,20 +57,10 @@ const registeredPrivateApis = [];
  * CHANGE MAY OCCUR IN EITHER A MAJOR OR MINOR RELEASE.
  */
 const requiredConsent =
-	'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.';
+	'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.';
 
-/** @type {boolean} */
-let allowReRegistration;
-// The safety measure is meant for WordPress core where IS_WORDPRESS_CORE
-// is set to true.
-// For the general use-case, the re-registration should be allowed by default
-// Let's default to true, then. Try/catch will fall back to "true" even if the
-// environment variable is not explicitly defined.
-try {
-	allowReRegistration = process.env.IS_WORDPRESS_CORE ? false : true;
-} catch ( error ) {
-	allowReRegistration = true;
-}
+// The safety measure is meant for WordPress core where IS_WORDPRESS_CORE is set to true.
+const allowReRegistration = globalThis.IS_WORDPRESS_CORE ? false : true;
 
 /**
  * Called by a @wordpress package wishing to opt-in to accessing or exposing
diff --git a/packages/private-apis/src/test/index.js b/packages/private-apis/src/test/index.js
index d91f7d3bcdafe1..51d1b6a3afba00 100644
--- a/packages/private-apis/src/test/index.js
+++ b/packages/private-apis/src/test/index.js
@@ -16,7 +16,7 @@ beforeEach( () => {
 } );
 
 const requiredConsent =
-	'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.';
+	'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.';
 
 describe( '__dangerousOptInToUnstableAPIsOnlyForCoreModules', () => {
 	it( 'Should require a consent string', () => {
diff --git a/packages/private-apis/tsconfig.json b/packages/private-apis/tsconfig.json
index 671d4a5eba4403..9e3edfe0ae443c 100644
--- a/packages/private-apis/tsconfig.json
+++ b/packages/private-apis/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/project-management-automation/.npmrc b/packages/project-management-automation/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/project-management-automation/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/project-management-automation/CHANGELOG.md b/packages/project-management-automation/CHANGELOG.md
index 5ae304b4c04780..c7b3021d4679c5 100644
--- a/packages/project-management-automation/CHANGELOG.md
+++ b/packages/project-management-automation/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 2.10.0 (2024-10-16)
+
+## 2.9.0 (2024-10-03)
+
+## 2.8.0 (2024-09-19)
+
+## 2.7.0 (2024-09-05)
+
+## 2.6.0 (2024-08-21)
+
+## 2.5.0 (2024-08-07)
+
+## 2.4.0 (2024-07-24)
+
+## 2.3.0 (2024-07-10)
+
+## 2.2.0 (2024-06-26)
+
+### Internal
+
+-   Upgrade `@octokit/webhooks` dependency ([#62666](https://github.com/WordPress/gutenberg/pull/62666)).
+
+## 2.1.0 (2024-06-15)
+
+## 2.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 1.57.0 (2024-05-16)
+
+## 1.56.0 (2024-05-02)
+
+## 1.55.0 (2024-04-19)
+
+## 1.54.0 (2024-04-03)
+
+## 1.53.0 (2024-03-21)
+
+## 1.52.0 (2024-03-06)
+
+## 1.51.0 (2024-02-21)
+
+## 1.50.0 (2024-02-09)
+
+## 1.49.0 (2024-01-24)
+
+## 1.48.0 (2024-01-10)
+
+## 1.47.0 (2023-12-13)
+
 ## 1.46.0 (2023-11-29)
 
 ## 1.45.0 (2023-11-16)
@@ -64,12 +116,12 @@
 
 ## 1.4.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 -   The "Add First Time Contributor Label" task now prompts the user to link their GitHub account to their WordPress.org profile if necessary for props credit. The task has been renamed "First Time Contributor".
 
-### Improvements
+### Enhancements
 
 -   The "Add First Time Contributor Label" task now runs retroactively on pushes to trunk, due to [permission constraints](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token) of GitHub Actions.
 
diff --git a/packages/project-management-automation/action.yml b/packages/project-management-automation/action.yml
index 34490f539875cc..cf7f23a2174f28 100644
--- a/packages/project-management-automation/action.yml
+++ b/packages/project-management-automation/action.yml
@@ -6,5 +6,5 @@ inputs:
         description: Secret GitHub API token to use for making API requests.
         required: true
 runs:
-    using: node12
+    using: node20
     main: lib/index.js
diff --git a/packages/project-management-automation/lib/tasks/add-milestone/index.js b/packages/project-management-automation/lib/tasks/add-milestone/index.js
index f70a6560bea996..a8ba4a8ca8c684 100644
--- a/packages/project-management-automation/lib/tasks/add-milestone/index.js
+++ b/packages/project-management-automation/lib/tasks/add-milestone/index.js
@@ -6,7 +6,7 @@ const getAssociatedPullRequest = require( '../../get-associated-pull-request' );
 
 /** @typedef {import('@octokit/request-error').RequestError} RequestError */
 /** @typedef {ReturnType<import('@actions/github').getOctokit>} GitHub */
-/** @typedef {import('@octokit/webhooks').WebhookPayloadPush} WebhookPayloadPush */
+/** @typedef {import('@octokit/webhooks-types').EventPayloadMap['push']} WebhookPayloadPush */
 
 /**
  * Number of expected days elapsed between releases.
diff --git a/packages/project-management-automation/lib/tasks/assign-fixed-issues/index.js b/packages/project-management-automation/lib/tasks/assign-fixed-issues/index.js
index af529f5db63b38..afdbe7d809ac36 100644
--- a/packages/project-management-automation/lib/tasks/assign-fixed-issues/index.js
+++ b/packages/project-management-automation/lib/tasks/assign-fixed-issues/index.js
@@ -4,7 +4,7 @@
 const debug = require( '../../debug' );
 
 /** @typedef {ReturnType<import('@actions/github').getOctokit>} GitHub */
-/** @typedef {import('@octokit/webhooks').WebhookPayloadPullRequest} WebhookPayloadPullRequest */
+/** @typedef {import('@octokit/webhooks-types').EventPayloadMap['pull_request']} WebhookPayloadPullRequest */
 
 /**
  * Assigns any issues 'fixed' by a newly opened PR to the author of that PR.
@@ -17,30 +17,33 @@ async function assignFixedIssues( payload, octokit ) {
 		/(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved):? +(?:\#?|https?:\/\/github\.com\/WordPress\/gutenberg\/issues\/)(\d+)/gi;
 
 	let match;
-	while ( ( match = regex.exec( payload.pull_request.body ) ) ) {
-		const [ , issue ] = match;
-
-		debug(
-			`assign-fixed-issues: Assigning issue #${ issue } to @${ payload.pull_request.user.login }`
-		);
-
-		await octokit.rest.issues.addAssignees( {
-			owner: payload.repository.owner.login,
-			repo: payload.repository.name,
-			issue_number: +issue,
-			assignees: [ payload.pull_request.user.login ],
-		} );
-
-		debug(
-			`assign-fixed-issues: Applying '[Status] In Progress' label to issue #${ issue }`
-		);
-
-		await octokit.rest.issues.addLabels( {
-			owner: payload.repository.owner.login,
-			repo: payload.repository.name,
-			issue_number: +issue,
-			labels: [ '[Status] In Progress' ],
-		} );
+
+	if ( payload.pull_request.body ) {
+		while ( ( match = regex.exec( payload.pull_request.body ) ) ) {
+			const [ , issue ] = match;
+
+			debug(
+				`assign-fixed-issues: Assigning issue #${ issue } to @${ payload.pull_request.user.login }`
+			);
+
+			await octokit.rest.issues.addAssignees( {
+				owner: payload.repository.owner.login,
+				repo: payload.repository.name,
+				issue_number: +issue,
+				assignees: [ payload.pull_request.user.login ],
+			} );
+
+			debug(
+				`assign-fixed-issues: Applying '[Status] In Progress' label to issue #${ issue }`
+			);
+
+			await octokit.rest.issues.addLabels( {
+				owner: payload.repository.owner.login,
+				repo: payload.repository.name,
+				issue_number: +issue,
+				labels: [ '[Status] In Progress' ],
+			} );
+		}
 	}
 }
 
diff --git a/packages/project-management-automation/lib/tasks/first-time-contributor-account-link/index.js b/packages/project-management-automation/lib/tasks/first-time-contributor-account-link/index.js
index 3a48cd9a3917d3..832878bca69f4a 100644
--- a/packages/project-management-automation/lib/tasks/first-time-contributor-account-link/index.js
+++ b/packages/project-management-automation/lib/tasks/first-time-contributor-account-link/index.js
@@ -6,7 +6,7 @@ const getAssociatedPullRequest = require( '../../get-associated-pull-request' );
 const hasWordPressProfile = require( '../../has-wordpress-profile' );
 
 /** @typedef {ReturnType<import('@actions/github').getOctokit>} GitHub */
-/** @typedef {import('@octokit/webhooks').WebhookPayloadPush} WebhookPayloadPush */
+/** @typedef {import('@octokit/webhooks-types').EventPayloadMap['push']} WebhookPayloadPush */
 /** @typedef {import('../../get-associated-pull-request').WebhookPayloadPushCommit} WebhookPayloadPushCommit */
 
 /**
diff --git a/packages/project-management-automation/lib/tasks/first-time-contributor-label/index.js b/packages/project-management-automation/lib/tasks/first-time-contributor-label/index.js
index 396a125dccee59..56a75ad3845f78 100644
--- a/packages/project-management-automation/lib/tasks/first-time-contributor-label/index.js
+++ b/packages/project-management-automation/lib/tasks/first-time-contributor-label/index.js
@@ -4,7 +4,7 @@
 const debug = require( '../../debug' );
 
 /** @typedef {ReturnType<import('@actions/github').getOctokit>} GitHub */
-/** @typedef {import('@octokit/webhooks').WebhookPayloadPullRequest} WebhookPayloadPullRequest */
+/** @typedef {import('@octokit/webhooks-types').EventPayloadMap['pull_request']} WebhookPayloadPullRequest */
 
 /**
  * Assigns the first-time contributor label to PRs.
@@ -65,8 +65,7 @@ async function firstTimeContributorLabel( payload, octokit ) {
 		body:
 			':wave: Thanks for your first Pull Request and for helping build the future of Gutenberg and WordPress, @' +
 			author +
-			"! In case you missed it, we'd love to have you join us in our [Slack community](https://make.wordpress.org/chat/), " +
-			'where we hold [regularly weekly meetings](https://make.wordpress.org/core/tag/core-editor-summary/) open to anyone to coordinate with each other.\n\n' +
+			"! In case you missed it, we'd love to have you join us in our [Slack community](https://make.wordpress.org/chat/).\n\n" +
 			'If you want to learn more about WordPress development in general, check out the [Core Handbook](https://make.wordpress.org/core/handbook/) full of helpful information.',
 	} );
 }
diff --git a/packages/project-management-automation/lib/tasks/first-time-contributor-label/test/index.js b/packages/project-management-automation/lib/tasks/first-time-contributor-label/test/index.js
index 0450cb1f59b9f5..0d0aa374a95a0d 100644
--- a/packages/project-management-automation/lib/tasks/first-time-contributor-label/test/index.js
+++ b/packages/project-management-automation/lib/tasks/first-time-contributor-label/test/index.js
@@ -95,8 +95,7 @@ describe( 'firstTimeContributorLabel', () => {
 
 		const expectedComment =
 			':wave: Thanks for your first Pull Request and for helping build the future of Gutenberg and WordPress, @ghost' +
-			"! In case you missed it, we'd love to have you join us in our [Slack community](https://make.wordpress.org/chat/)," +
-			' where we hold [regularly weekly meetings](https://make.wordpress.org/core/tag/core-editor-summary/) open to anyone to coordinate with each other.\n\n' +
+			"! In case you missed it, we'd love to have you join us in our [Slack community](https://make.wordpress.org/chat/).\n\n" +
 			'If you want to learn more about WordPress development in general, check out the [Core Handbook](https://make.wordpress.org/core/handbook/) full of helpful information.';
 
 		await firstTimeContributorLabel( payload, octokit );
diff --git a/packages/project-management-automation/package.json b/packages/project-management-automation/package.json
index 613f580fb0e5f2..6da7e21d76fb0f 100644
--- a/packages/project-management-automation/package.json
+++ b/packages/project-management-automation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/project-management-automation",
-	"version": "1.46.0",
+	"version": "2.10.0",
 	"description": "GitHub Action that implements various automation to assist with managing the Gutenberg GitHub repository.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,14 +19,18 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
 	"main": "lib/index.js",
 	"types": "build-types",
 	"dependencies": {
 		"@actions/core": "1.9.1",
 		"@actions/github": "^5.0.0",
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"@octokit/request-error": "^2.1.0",
-		"@octokit/webhooks": "7.1.0"
+		"@octokit/webhooks": "^9.26.3"
 	},
 	"publishConfig": {
 		"access": "public"
diff --git a/packages/project-management-automation/tsconfig.json b/packages/project-management-automation/tsconfig.json
index eb9183cbf3fd0e..0636ff7d0081dd 100644
--- a/packages/project-management-automation/tsconfig.json
+++ b/packages/project-management-automation/tsconfig.json
@@ -1,12 +1,10 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "lib",
 		"declarationDir": "build-types",
-		"types": [ "node" ],
-
-		// This is required due to a type error coming from missing types in @actions/github
-		"noImplicitAny": false
+		"types": [ "node" ]
 	},
 	"include": [ "lib/**/*" ]
 }
diff --git a/packages/react-i18n/CHANGELOG.md b/packages/react-i18n/CHANGELOG.md
index d6acc305c22f39..6efaf980c320bc 100644
--- a/packages/react-i18n/CHANGELOG.md
+++ b/packages/react-i18n/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.56.0 (2024-05-16)
+
+## 3.55.0 (2024-05-02)
+
+## 3.54.0 (2024-04-19)
+
+## 3.53.0 (2024-04-03)
+
+## 3.52.0 (2024-03-21)
+
+## 3.51.0 (2024-03-06)
+
+## 3.50.0 (2024-02-21)
+
+## 3.49.0 (2024-02-09)
+
+## 3.48.0 (2024-01-24)
+
+## 3.47.0 (2024-01-10)
+
+## 3.46.0 (2023-12-13)
+
 ## 3.45.0 (2023-11-29)
 
 ## 3.44.0 (2023-11-16)
@@ -94,7 +142,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
diff --git a/packages/react-i18n/package.json b/packages/react-i18n/package.json
index c6a953397ef99e..6a741d33f997c1 100644
--- a/packages/react-i18n/package.json
+++ b/packages/react-i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-i18n",
-	"version": "3.45.0",
+	"version": "4.10.0",
 	"description": "React bindings for @wordpress/i18n.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,12 +28,13 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
 		"utility-types": "^3.10.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/react-i18n/tsconfig.json b/packages/react-i18n/tsconfig.json
index 2a29fe33676230..e8e7f164f89a34 100644
--- a/packages/react-i18n/tsconfig.json
+++ b/packages/react-i18n/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/react-native-aztec/.npmrc b/packages/react-native-aztec/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/react-native-aztec/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/react-native-aztec/CHANGELOG.md b/packages/react-native-aztec/CHANGELOG.md
index 56461651514704..1e1f854656e282 100644
--- a/packages/react-native-aztec/CHANGELOG.md
+++ b/packages/react-native-aztec/CHANGELOG.md
@@ -10,9 +10,11 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+
 -   [*] Bump Aztec-Android version to v1.5.1 [#36861]
 -   [*] Add text input state to Aztec view [#40480]
 
 ## 1.50.0
+
 -   [*] Block split/merge fix for a (never shipped) regression (Android only) [#29683]
--   [***] Bump minimum deployment target to iOS 13.0 [#27577]
\ No newline at end of file
+-   [***] Bump minimum deployment target to iOS 13.0 [#27577]
diff --git a/packages/react-native-aztec/RNTAztecView.podspec b/packages/react-native-aztec/RNTAztecView.podspec
index bb94b08f581fd0..ac3ad06b0d865b 100644
--- a/packages/react-native-aztec/RNTAztecView.podspec
+++ b/packages/react-native-aztec/RNTAztecView.podspec
@@ -22,5 +22,5 @@ Pod::Spec.new do |s|
   s.dependency 'React-Core'
   # Intentionally locked because of how it's integrated.
   # See https://github.com/WordPress/gutenberg/pull/54453#discussion_r1325582749
-  s.dependency 'WordPress-Aztec-iOS', '1.19.9'
+  s.dependency 'WordPress-Aztec-iOS', '1.19.11'
 end
diff --git a/packages/react-native-aztec/android/build.gradle b/packages/react-native-aztec/android/build.gradle
index 18093ff1c2c136..45312e89f0b9d9 100644
--- a/packages/react-native-aztec/android/build.gradle
+++ b/packages/react-native-aztec/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         espressoVersion = '3.0.1'
 
         // libs
-        aztecVersion = 'v1.9.0'
+        aztecVersion = 'v2.1.2'
         wordpressUtilsVersion = '3.3.0'
 
         // main
@@ -36,7 +36,7 @@ plugins {
 // import the `readReactNativeVersion()` function
 apply from: 'https://gist.githubusercontent.com/hypest/742448b9588b3a0aa580a5e80ae95bdf/raw/8eb62d40ee7a5104d2fcaeff21ce6f29bd93b054/readReactNativeVersion.gradle'
 
-group = 'org.wordpress-mobile.gutenberg-mobile'
+group = 'org.wordpress.gutenberg-mobile'
 
 // The sample build uses multiple directories to
 // keep boilerplate and common code separate from
@@ -53,12 +53,12 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -119,7 +119,7 @@ project.afterEvaluate {
             ReactNativeAztecPublication(MavenPublication) {
                 artifact bundleReleaseAar
 
-                groupId 'org.wordpress-mobile.gutenberg-mobile'
+                groupId 'org.wordpress.gutenberg-mobile'
                 artifactId 'react-native-aztec'
                 // version is set by 'publish-to-s3' plugin
 
diff --git a/packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.jar b/packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.jar
index 033e24c4cdf41a..2c3521197d7c45 100644
Binary files a/packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.jar and b/packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.properties
index c747538fb38b53..efe2ff3449216a 100644
--- a/packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/react-native-aztec/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/react-native-aztec/android/gradlew b/packages/react-native-aztec/android/gradlew
index fcb6fca147c0cd..f5feea6d6b116b 100755
--- a/packages/react-native-aztec/android/gradlew
+++ b/packages/react-native-aztec/android/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/packages/react-native-aztec/android/gradlew.bat b/packages/react-native-aztec/android/gradlew.bat
index 6689b85beecde6..9b42019c7915b9 100644
--- a/packages/react-native-aztec/android/gradlew.bat
+++ b/packages/react-native-aztec/android/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/packages/react-native-aztec/android/settings.gradle b/packages/react-native-aztec/android/settings.gradle
index 11cf7c1990544b..5c91464a042457 100644
--- a/packages/react-native-aztec/android/settings.gradle
+++ b/packages/react-native-aztec/android/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
-    gradle.ext.kotlinVersion = '1.6.10'
-    gradle.ext.agpVersion = '8.1.0'
+    gradle.ext.kotlinVersion = '1.8.0'
+    gradle.ext.agpVersion = '8.5.1'
     gradle.ext.automatticPublishToS3Version = '0.8.0'
 
     plugins {
diff --git a/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java b/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
index 1e3e90c3a48442..ed2a0284c17822 100644
--- a/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
+++ b/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
@@ -51,6 +51,7 @@
 import org.wordpress.aztec.glideloader.GlideImageLoader;
 import org.wordpress.aztec.glideloader.GlideVideoThumbnailLoader;
 import org.wordpress.aztec.plugins.CssUnderlinePlugin;
+import org.wordpress.aztec.plugins.MarkPlugin;
 import org.wordpress.aztec.plugins.shortcodes.AudioShortcodePlugin;
 import org.wordpress.aztec.plugins.shortcodes.CaptionShortcodePlugin;
 import org.wordpress.aztec.plugins.shortcodes.VideoShortcodePlugin;
@@ -124,6 +125,7 @@ protected ReactAztecText createViewInstance(ThemedReactContext reactContext) {
                         Color.parseColor("#016087"), true)
         ));
         aztecText.addPlugin(new CssUnderlinePlugin());
+        aztecText.addPlugin(new MarkPlugin());
         return aztecText;
     }
 
@@ -651,6 +653,21 @@ public void run() {
         } else if (commandType.equals("blur")) {
             parent.clearFocusFromJS();
             return;
+        } else if (commandType.equals("onMarkFormatting")) {
+            String colorString;
+            Boolean resetColor;
+
+            if (args != null && args.getString(0) != null) {
+                colorString = args.getString(0);
+            } else {
+                colorString = "";
+            }
+
+            parent.onMarkFormatting(colorString);
+            return;
+        } else if (commandType.equals("onRemoveMarkFormatting")) {
+            // This is handled by setActiveFormats
+            return;
         }
         super.receiveCommand(parent, commandType, args);
     }
diff --git a/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java b/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java
index 71df8e0c2888a2..e55f27d63b529f 100644
--- a/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java
+++ b/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java
@@ -1,5 +1,7 @@
 package org.wordpress.mobile.ReactNativeAztec;
 
+import static android.content.ClipData.Item;
+
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -10,18 +12,19 @@
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.Looper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Spannable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
+import android.view.ViewTreeObserver;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -41,12 +44,10 @@
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
-import java.util.HashSet;
-import java.util.HashMap;
-
-import static android.content.ClipData.*;
 
 public class ReactAztecText extends AztecText {
 
@@ -64,6 +65,7 @@ public class ReactAztecText extends AztecText {
     private @Nullable TextWatcherDelegator mTextWatcherDelegator;
     private @Nullable ContentSizeWatcher mContentSizeWatcher;
     private @Nullable ScrollWatcher mScrollWatcher;
+    private @Nullable Runnable mKeyboardRunnable;
 
     // FIXME: Used in `incrementAndGetEventCounter` but never read. I guess we can get rid of it, but before this
     // check when it's used in EditText in RN. (maybe tests?)
@@ -236,6 +238,21 @@ void clearFocusFromJS() {
         clearFocus();
     }
 
+    public void onMarkFormatting(String colorString) {
+        inlineFormatter.setMarkStyleColor(colorString);
+
+        Set<ITextFormat> selectedStylesSet = new HashSet<>(getSelectedStyles());
+        Set<ITextFormat> newFormatsSet = new HashSet<>();
+        newFormatsSet.add(AztecTextFormat.FORMAT_MARK);
+
+        selectedStylesSet.removeAll(typingFormatsMap.keySet());
+        selectedStylesSet.addAll(newFormatsSet);
+
+        ArrayList<ITextFormat> newStylesList = new ArrayList<>(selectedStylesSet);
+        setSelectedStyles(newStylesList);
+        updateToolbarButtons(newStylesList);
+    }
+
     @Override
     public void clearFocus() {
         setFocusableInTouchMode(false);
@@ -264,18 +281,46 @@ public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
     }
 
     private void showSoftKeyboard() {
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
+        // If the text input is already focused we can show the keyboard.
+        if(hasWindowFocus()) {
+            showSoftKeyboardNow();
+        }
+        // Otherwise, we'll wait until it gets focused.
+        else {
+            getViewTreeObserver().addOnWindowFocusChangeListener(new ViewTreeObserver.OnWindowFocusChangeListener() {
+                @Override
+                public void onWindowFocusChanged(boolean hasFocus) {
+                    if (hasFocus) {
+                        showSoftKeyboardNow();
+                        getViewTreeObserver().removeOnWindowFocusChangeListener(this);
+                    }
+                }
+            });
+        }
+    }
+
+    private void showSoftKeyboardNow() {
+        // Cancel any previously scheduled Runnable
+        if (mKeyboardRunnable != null) {
+            removeCallbacks(mKeyboardRunnable);
+        }
+
+        mKeyboardRunnable = new Runnable() {
             @Override
             public void run() {
                 if (mInputMethodManager != null) {
-                    mInputMethodManager.showSoftInput(ReactAztecText.this, 0);
+                    mInputMethodManager.showSoftInput(ReactAztecText.this, InputMethodManager.SHOW_IMPLICIT);
                 }
             }
-        });
+        };
+
+        post(mKeyboardRunnable);
     }
 
     private void hideSoftKeyboard() {
-        mInputMethodManager.hideSoftInputFromWindow(getWindowToken(), 0);
+        if (mInputMethodManager != null) {
+            mInputMethodManager.hideSoftInputFromWindow(getWindowToken(), 0);
+        }
     }
 
     public void setScrollWatcher(ScrollWatcher scrollWatcher) {
@@ -550,6 +595,7 @@ public void setActiveFormats(Iterable<String> newFormats) {
                     break;
                 case "underline":
                     newFormatsSet.add(AztecTextFormat.FORMAT_UNDERLINE);
+                    break;
                 case "mark":
                     newFormatsSet.add(AztecTextFormat.FORMAT_MARK);
                     break;
diff --git a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
index c5c2baec5988d5..03362c3a371fb2 100644
--- a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
+++ b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@@ -245,12 +245,8 @@ class RCTAztecView: Aztec.TextView {
     }
 
     private func readHTML(from pasteboard: UIPasteboard) -> String? {
-
         if let data = pasteboard.data(forPasteboardType: kUTTypeHTML as String), let html = String(data: data, encoding: .utf8) {
-            // Make sure we are not getting a full HTML DOC. We only want inner content
-            if !html.hasPrefix("<!DOCTYPE html") {
-                return html
-            }
+            return html
         }
 
         if let flatRTFDString = read(from: pasteboard, uti: kUTTypeFlatRTFD, documentType: DocumentType.rtfd) {
@@ -346,24 +342,7 @@ class RCTAztecView: Aztec.TextView {
 
         super.deleteBackward()
         updatePlaceholderVisibility()
-    }
-
-    // MARK: - Dictation
-    
-    func removeUnicodeAndRestoreCursor(from textView: UITextView) {
-        // Capture current cursor position
-        let originalPosition = textView.offset(from: textView.beginningOfDocument, to: textView.selectedTextRange?.start ?? textView.beginningOfDocument)
-                
-        // Replace occurrences of the obj symbol ("\u{FFFC}")
-        textView.text = textView.text?.replacingOccurrences(of: "\u{FFFC}", with: "")
-        
-        // Detect if cursor is off-by-one and correct, if so
-        let newPositionOffset = originalPosition > 0 ? originalPosition - 1 : originalPosition
-        if let newPosition = textView.position(from: textView.beginningOfDocument, offset: newPositionOffset) {
-            // Move the cursor to the correct, new position following dictation
-            textView.selectedTextRange = textView.textRange(from: newPosition, to: newPosition)
-        }
-    }
+    }    
 
     // MARK: - Custom Edit Intercepts
 
@@ -650,13 +629,9 @@ class RCTAztecView: Aztec.TextView {
     ///
     private func applyFontConstraints(to baseFont: UIFont) -> UIFont {
         let oldDescriptor = baseFont.fontDescriptor
-        let newFontSize: CGFloat
+        let fontMetrics = UIFontMetrics(forTextStyle: .body)
 
-        if let fontSize = fontSize {
-            newFontSize = fontSize
-        } else {
-            newFontSize = baseFont.pointSize
-        }
+        let newFontSize = fontMetrics.scaledValue(for: fontSize ?? baseFont.pointSize)
 
         var newTraits = oldDescriptor.symbolicTraits
 
@@ -738,7 +713,13 @@ class RCTAztecView: Aztec.TextView {
         case "bold": toggleBold(range: emptyRange)
         case "italic": toggleItalic(range: emptyRange)
         case "strikethrough": toggleStrikethrough(range: emptyRange)
-        case "mark": toggleMark(range: emptyRange)
+        case "mark":
+            // When there's a selection the formatting is applied from the RichText library.
+            // If not, it will toggle the active mark format if needed.
+            if selectedRange.length > 0 {
+                return
+            }
+            toggleMark(range: emptyRange, color: nil, resetColor: true)
         default: print("Format not recognized")
         }
     }
@@ -788,13 +769,6 @@ extension RCTAztecView: UITextViewDelegate {
     }
 
     func textViewDidChange(_ textView: UITextView) {
-        // Workaround for RN dictation bug that adds obj symbol.
-        // Ref: https://github.com/facebook/react-native/issues/36521
-        // TODO: Remove workaround when RN issue is fixed
-        if textView.text?.contains("\u{FFFC}") == true {
-            removeUnicodeAndRestoreCursor(from: textView)
-        }
-
         propagateContentChanges()
         updatePlaceholderVisibility()
         //Necessary to send height information to JS after pasting text.
diff --git a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m
index e8038ab17a7044..b339357ce40740 100644
--- a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m
+++ b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m
@@ -37,6 +37,7 @@ @interface RCT_EXTERN_MODULE(RCTAztecViewManager, NSObject)
 
 RCT_EXTERN_METHOD(focus:(nonnull NSNumber *)viewTag)
 RCT_EXTERN_METHOD(blur:(nonnull NSNumber *)viewTag)
-
+RCT_EXTERN_METHOD(onMarkFormatting:(nonnull NSNumber *)viewTag : NSString)
+RCT_EXTERN_METHOD(onRemoveMarkFormatting:(nonnull NSNumber *)viewTag)
 
 @end
diff --git a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.swift b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.swift
index 184d465e5d25cd..5422d2feb864a0 100644
--- a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.swift
+++ b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.swift
@@ -34,6 +34,17 @@ public class RCTAztecViewManager: RCTViewManager {
         return view
     }
 
+    /// This method is similar to `executeBlock` but prepends the block to execute it before other pending blocks.
+    func executeBlockBeforeOthers(viewTag: NSNumber, block: @escaping (RCTAztecView) -> Void) {
+        self.bridge.uiManager.prependUIBlock { (uiManager, viewRegistry) in
+            let view = viewRegistry?[viewTag]
+            guard let aztecView = view as? RCTAztecView else {
+                return
+            }
+            block(aztecView)
+        }
+    }
+    
     func executeBlock(viewTag: NSNumber, block: @escaping (RCTAztecView) -> Void) {
         self.bridge.uiManager.addUIBlock { (uiManager, viewRegistry) in
             let view = viewRegistry?[viewTag]
@@ -69,7 +80,7 @@ public class RCTAztecViewManager: RCTViewManager {
     
     @objc
     func focus(_ viewTag: NSNumber) -> Void {
-        self.executeBlock(viewTag: viewTag) { (aztecView) in
+        self.executeBlockBeforeOthers(viewTag: viewTag) { (aztecView) in
             aztecView.reactFocus()
         }
     }
@@ -80,5 +91,21 @@ public class RCTAztecViewManager: RCTViewManager {
             aztecView.reactBlur()
         }
     }
+
+    @objc
+    func onMarkFormatting(_ viewTag: NSNumber, _ color: String) {
+        self.executeBlock(viewTag: viewTag) { (aztecView) in
+            let range = NSRange(location: aztecView.selectedRange.location, length: 0)
+            aztecView.toggleMark(range: range, color: color, resetColor: false)
+        }
+    }
+
+    @objc
+    func onRemoveMarkFormatting(_ viewTag: NSNumber) {
+        self.executeBlock(viewTag: viewTag) { (aztecView) in
+            let range = NSRange(location: aztecView.selectedRange.location, length: 0)
+            aztecView.toggleMark(range: range, color: nil, resetColor: true)
+        }
+    }
 }
 
diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json
index fbf34269306eea..b0327b531395e5 100644
--- a/packages/react-native-aztec/package.json
+++ b/packages/react-native-aztec/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-aztec",
-	"version": "1.109.2",
+	"version": "1.121.0",
 	"description": "Aztec view for react-native.",
 	"private": true,
 	"author": "The WordPress Contributors",
@@ -18,9 +18,13 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
 	"dependencies": {
-		"@wordpress/element": "file:../element",
-		"@wordpress/keycodes": "file:../keycodes"
+		"@wordpress/element": "*",
+		"@wordpress/keycodes": "*"
 	},
 	"peerDependencies": {
 		"react": "*",
diff --git a/packages/react-native-aztec/src/AztecInputState.js b/packages/react-native-aztec/src/AztecInputState.js
index 5f0a1dd7596284..f76f8ed4f24501 100644
--- a/packages/react-native-aztec/src/AztecInputState.js
+++ b/packages/react-native-aztec/src/AztecInputState.js
@@ -1,8 +1,15 @@
 /**
  * External dependencies
  */
+import { Platform } from 'react-native';
 import TextInputState from 'react-native/Libraries/Components/TextInput/TextInputState';
 
+/**
+ * WordPress dependencies
+ */
+import { debounce } from '@wordpress/compose';
+import { hideAndroidSoftKeyboard } from '@wordpress/react-native-bridge';
+
 /** @typedef {import('@wordpress/element').RefObject} RefObject */
 
 const focusChangeListeners = [];
@@ -131,21 +138,62 @@ export const focusInput = ( element ) => {
  * @param {RefObject} element Element to be focused.
  */
 export const focus = ( element ) => {
+	// If other blur events happen at the same time that focus is triggered, the focus event
+	// will take precedence and cancels pending blur events.
+	blur.cancel();
+	// Similar to blur events, we also need to cancel potential keyboard dismiss.
+	blurOnUnmountDebounce.cancel();
+
 	TextInputState.focusTextInput( element );
 	notifyInputChange();
 };
 
 /**
  * Unfocuses the specified element.
+ * This function uses debounce to avoid conflicts with the focus event when both are
+ * triggered at the same time. Focus events will take precedence.
  *
  * @param {RefObject} element Element to be unfocused.
  */
-export const blur = ( element ) => {
+export const blur = debounce( ( element ) => {
 	TextInputState.blurTextInput( element );
 	setCurrentCaretData( null );
 	notifyInputChange();
+}, 0 );
+
+/**
+ * Unfocuses the specified element in case it's about to be unmounted.
+ *
+ * Note that we can't trigger the blur event, as it's likely that the Aztec view is no
+ * longer available when the event is executed and will produce an exception.
+ *
+ * @param {RefObject} element Element to be unfocused.
+ */
+export const blurOnUnmount = ( element ) => {
+	if ( getCurrentFocusedElement() === element ) {
+		// If a blur event was triggered before unmount, we need to cancel them to avoid
+		// exceptions.
+		blur.cancel();
+		blurOnUnmountDebounce();
+	}
 };
 
+// For updating the input state and dismissing the keyboard, we use debounce to avoid
+// conflicts with the focus event when both are triggered at the same time.
+const blurOnUnmountDebounce = debounce( () => {
+	// At this point, the text input will be destroyed but it's still focused. Hence, we
+	// have to explicitly notify listeners and update internal input state.
+	notifyListeners( { isFocused: false } );
+	currentFocusedElement = null;
+
+	// On iOS text inputs are automatically unfocused and keyboard dismissed when they
+	// are removed. However, this is not the case on Android, where text inputs are
+	// unfocused but the keyboard remains open.
+	if ( Platform.OS === 'android' ) {
+		hideAndroidSoftKeyboard();
+	}
+}, 0 );
+
 /**
  * Unfocuses the current focused element.
  */
diff --git a/packages/react-native-aztec/src/AztecView.js b/packages/react-native-aztec/src/AztecView.js
index c9d0d633f1c14f..7c02f349a85119 100644
--- a/packages/react-native-aztec/src/AztecView.js
+++ b/packages/react-native-aztec/src/AztecView.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import {
+	findNodeHandle,
 	requireNativeComponent,
 	UIManager,
 	Pressable,
@@ -66,6 +67,10 @@ class AztecView extends Component {
 		this.focus = this.focus.bind( this );
 	}
 
+	componentWillUnmount() {
+		AztecInputState.blurOnUnmount( this.aztecViewRef.current );
+	}
+
 	dispatch( command, params ) {
 		params = params || [];
 		UIManager.dispatchViewManagerCommand(
@@ -230,6 +235,22 @@ class AztecView extends Component {
 		return focusedElement && focusedElement === this.aztecViewRef.current;
 	}
 
+	onRemoveMarkFormatting() {
+		UIManager.dispatchViewManagerCommand(
+			findNodeHandle( this.aztecViewRef.current ),
+			'onRemoveMarkFormatting',
+			[]
+		);
+	}
+
+	onMarkFormatting( color ) {
+		UIManager.dispatchViewManagerCommand(
+			findNodeHandle( this.aztecViewRef.current ),
+			'onMarkFormatting',
+			[ color ]
+		);
+	}
+
 	_onPress( event ) {
 		if ( ! this.isFocused() ) {
 			this.focus(); // Call to move the focus in RN way (TextInputState)
diff --git a/packages/react-native-aztec/src/test/AztecInputState.test.js b/packages/react-native-aztec/src/test/AztecInputState.test.js
index 4e5a59c6caf23d..2c272993fca7fd 100644
--- a/packages/react-native-aztec/src/test/AztecInputState.test.js
+++ b/packages/react-native-aztec/src/test/AztecInputState.test.js
@@ -12,42 +12,41 @@ import {
 	isFocused,
 	focus,
 	blur,
-	notifyInputChange,
+	blurOnUnmount,
 	removeFocusChangeListener,
 } from '../AztecInputState';
 
-jest.mock(
-	'react-native/Libraries/Components/TextInput/TextInputState',
-	() => ( {
-		focusTextInput: jest.fn(),
-		blurTextInput: jest.fn(),
-		currentlyFocusedInput: jest.fn(),
-	} )
-);
+// Recreate internal state of TextInput
+let currentInput = null;
+TextInputState.focusTextInput = jest.fn( ( value ) => {
+	currentInput = value;
+} );
+TextInputState.blurTextInput = jest.fn( ( value ) => {
+	if ( currentInput === value ) {
+		currentInput = null;
+	}
+} );
+TextInputState.currentlyFocusedInput = jest.fn( () => currentInput );
 
 const ref = { current: null };
+const anotherRef = { current: null };
 
-const updateCurrentFocusedInput = ( value ) => {
-	TextInputState.currentlyFocusedInput.mockReturnValue( value );
-	notifyInputChange();
-};
+jest.useFakeTimers();
 
 describe( 'Aztec Input State', () => {
 	it( 'listens to focus change event', () => {
 		const listener = jest.fn();
-		const anotherRef = { current: null };
 		addFocusChangeListener( listener );
 
-		updateCurrentFocusedInput( ref );
-
+		focus( ref );
 		expect( listener ).toHaveBeenCalledWith( { isFocused: true } );
 
-		updateCurrentFocusedInput( anotherRef );
-
-		expect( listener ).toHaveBeenCalledTimes( 1 );
-
-		updateCurrentFocusedInput( null );
+		listener.mockClear();
+		focus( anotherRef );
+		expect( listener ).not.toHaveBeenCalled();
 
+		blur( anotherRef );
+		jest.runAllTimers();
 		expect( listener ).toHaveBeenCalledWith( { isFocused: false } );
 	} );
 
@@ -56,36 +55,35 @@ describe( 'Aztec Input State', () => {
 		addFocusChangeListener( listener );
 		removeFocusChangeListener( listener );
 
-		updateCurrentFocusedInput( ref );
-
-		expect( listener ).not.toHaveBeenCalledWith( { isFocused: true } );
-
-		updateCurrentFocusedInput( null );
+		focus( ref );
+		expect( listener ).not.toHaveBeenCalled();
 
-		expect( listener ).not.toHaveBeenCalledWith( { isFocused: false } );
+		blur( ref );
+		jest.runAllTimers();
+		expect( listener ).not.toHaveBeenCalled();
 	} );
 
-	it( 'returns true if an element is focused', () => {
-		updateCurrentFocusedInput( ref );
+	it( 'returns the focus state', () => {
+		focus( ref );
 		expect( isFocused() ).toBeTruthy();
-	} );
 
-	it( 'returns false if an element is unfocused', () => {
-		updateCurrentFocusedInput( null );
+		blur( ref );
+		jest.runAllTimers();
 		expect( isFocused() ).toBeFalsy();
 	} );
 
 	it( 'returns current focused element', () => {
-		const anotherRef = { current: null };
-		updateCurrentFocusedInput( ref );
+		focus( ref );
 		expect( getCurrentFocusedElement() ).toBe( ref );
 
-		updateCurrentFocusedInput( anotherRef );
+		focus( anotherRef );
 		expect( getCurrentFocusedElement() ).toBe( anotherRef );
 	} );
 
 	it( 'returns null if focused element is unfocused', () => {
-		updateCurrentFocusedInput( null );
+		focus( ref );
+		blur( ref );
+		jest.runAllTimers();
 		expect( getCurrentFocusedElement() ).toBe( null );
 	} );
 
@@ -96,6 +94,52 @@ describe( 'Aztec Input State', () => {
 
 	it( 'unfocuses an element', () => {
 		blur( ref );
+		jest.runAllTimers();
 		expect( TextInputState.blurTextInput ).toHaveBeenCalledWith( ref );
 	} );
+
+	it( 'unfocuses an element when unmounted', () => {
+		const listener = jest.fn();
+
+		focus( ref );
+
+		addFocusChangeListener( listener );
+		blurOnUnmount( ref );
+		jest.runAllTimers();
+
+		// TextInputState will update its state internally when the text
+		// input is removed. For this reason and to avoid triggering an
+		// event on an removed element, we don't call blurTextInput.
+		expect( TextInputState.blurTextInput ).not.toHaveBeenCalled();
+		expect( listener ).toHaveBeenCalledWith( { isFocused: false } );
+		expect( listener ).toHaveBeenCalledTimes( 1 );
+	} );
+
+	it( 'cancels blur event when unfocusing an element that will be unmounted', () => {
+		const listener = jest.fn();
+
+		focus( ref );
+
+		addFocusChangeListener( listener );
+		blur( ref );
+		blurOnUnmount( ref );
+		jest.runAllTimers();
+
+		// TextInputState will update its state internally when the text
+		// input is removed. For this reason and to avoid triggering an
+		// event on an removed element, we don't call blurTextInput.
+		expect( TextInputState.blurTextInput ).not.toHaveBeenCalled();
+		expect( listener ).toHaveBeenCalledWith( { isFocused: false } );
+		expect( listener ).toHaveBeenCalledTimes( 1 );
+	} );
+
+	it( 'cancels blur event when focusing an element', () => {
+		focus( ref );
+		blur( ref );
+		focus( anotherRef );
+		jest.runAllTimers();
+
+		expect( TextInputState.focusTextInput ).toHaveBeenCalledTimes( 2 );
+		expect( TextInputState.blurTextInput ).not.toHaveBeenCalled();
+	} );
 } );
diff --git a/packages/react-native-bridge/.npmrc b/packages/react-native-bridge/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/react-native-bridge/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.jar b/packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.jar
index 033e24c4cdf41a..2c3521197d7c45 100644
Binary files a/packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.jar and b/packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.properties
index c747538fb38b53..efe2ff3449216a 100644
--- a/packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/react-native-bridge/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/react-native-bridge/android/gradlew b/packages/react-native-bridge/android/gradlew
index fcb6fca147c0cd..f5feea6d6b116b 100755
--- a/packages/react-native-bridge/android/gradlew
+++ b/packages/react-native-bridge/android/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/packages/react-native-bridge/android/gradlew.bat b/packages/react-native-bridge/android/gradlew.bat
index 6689b85beecde6..9b42019c7915b9 100644
--- a/packages/react-native-bridge/android/gradlew.bat
+++ b/packages/react-native-bridge/android/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/packages/react-native-bridge/android/react-native-bridge/build.gradle b/packages/react-native-bridge/android/react-native-bridge/build.gradle
index 7800be076c842a..d8249b9d1b640f 100644
--- a/packages/react-native-bridge/android/react-native-bridge/build.gradle
+++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle
@@ -25,7 +25,7 @@ plugins {
 apply from: 'https://gist.githubusercontent.com/hypest/742448b9588b3a0aa580a5e80ae95bdf/raw/8eb62d40ee7a5104d2fcaeff21ce6f29bd93b054/readReactNativeVersion.gradle'
 apply from: '../extractPackageVersion.gradle'
 
-group='org.wordpress-mobile.gutenberg-mobile'
+group='org.wordpress.gutenberg-mobile'
 
 def buildAssetsFolder = 'build/assets'
 
@@ -39,7 +39,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         buildConfigField "boolean", "SHOULD_ATTACH_JS_BUNDLE", willPublishReactNativeBridgeBinary.toString()
     }
 
@@ -48,8 +48,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -93,8 +93,8 @@ dependencies {
 
     // Published by `wordpress-mobile/react-native-libraries-publisher`
     // See the documentation for this value in `build.gradle.kts` of `wordpress-mobile/react-native-libraries-publisher`
-    def reactNativeLibrariesPublisherVersion = "v3"
-    def reactNativeLibrariesGroupId = "org.wordpress-mobile.react-native-libraries.$reactNativeLibrariesPublisherVersion"
+    def reactNativeLibrariesPublisherVersion = "v6"
+    def reactNativeLibrariesGroupId = "org.wordpress.react-native-libraries.$reactNativeLibrariesPublisherVersion"
     implementation "$reactNativeLibrariesGroupId:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}"
     implementation "$reactNativeLibrariesGroupId:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}"
     implementation "$reactNativeLibrariesGroupId:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}"
@@ -110,7 +110,7 @@ dependencies {
     runtimeOnly "com.facebook.react:hermes-android:$rnVersion"
 
     if (willPublishReactNativeBridgeBinary) {
-        implementation "org.wordpress-mobile.gutenberg-mobile:react-native-aztec:$reactNativeAztecVersion"
+        implementation "org.wordpress.gutenberg-mobile:react-native-aztec:$reactNativeAztecVersion"
    } else {
         api project(':@wordpress_react-native-aztec')
    }
@@ -122,7 +122,7 @@ project.afterEvaluate {
             ReactNativeBridgePublication(MavenPublication) {
                 artifact bundleReleaseAar
 
-                groupId 'org.wordpress-mobile.gutenberg-mobile'
+                groupId 'org.wordpress.gutenberg-mobile'
                 artifactId 'react-native-gutenberg-bridge'
                 // version is set by 'publish-to-s3' plugin
 
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
index c6e20b29db072e..4947c5124f0916 100644
--- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
@@ -4,9 +4,9 @@
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 
+import org.wordpress.mobile.WPAndroidGlue.GutenbergJsException;
 import org.wordpress.mobile.WPAndroidGlue.MediaOption;
 import org.wordpress.mobile.WPAndroidGlue.RequestExecutor;
 
@@ -14,7 +14,6 @@
 import java.util.List;
 
 public interface GutenbergBridgeJS2Parent extends RequestExecutor {
-
     void responseHtml(String title, String html, boolean changed, ReadableMap contentInfo);
 
     void editorDidMount(ReadableArray unsupportedBlockNames);
@@ -32,6 +31,7 @@ interface MediaUploadEventEmitter {
         void onMediaFileUploadProgress(int mediaId, float progress);
         void onMediaFileUploadSucceeded(int mediaId, String mediaUrl, int serverId, WritableNativeMap metadata);
         void onMediaFileUploadFailed(int mediaId);
+        void onMediaFileUploadPaused(int mediaId);
     }
 
     interface MediaSaveEventEmitter {
@@ -60,6 +60,14 @@ interface BlockTypeImpressionsCallback {
         void onRequestBlockTypeImpressions(ReadableMap impressions);
     }
 
+    interface ConnectionStatusCallback {
+        void onRequestConnectionStatus(boolean isConnected);
+    }
+
+    interface LogExceptionCallback {
+        void onLogException(boolean success);
+    }
+
     // Ref: https://github.com/facebook/react-native/blob/HEAD/Libraries/polyfills/console.js#L376
     enum LogLevel {
         TRACE(0),
@@ -118,8 +126,6 @@ public static MediaType getEnum(String value) {
 
     void mediaUploadSync(MediaSelectedCallback mediaSelectedCallback);
 
-    void mediaSaveSync(MediaSelectedCallback mediaSelectedCallback);
-
     void requestImageFailedRetryDialog(int mediaId);
 
     void requestImageUploadCancelDialog(int mediaId);
@@ -154,16 +160,6 @@ void gutenbergDidRequestUnsupportedBlockFallback(ReplaceUnsupportedBlockCallback
 
     void onShowXpostSuggestions(Consumer<String> onResult);
 
-    void requestMediaFilesEditorLoad(ReadableArray mediaFiles, String blockId);
-
-    void requestMediaFilesFailedRetryDialog(ReadableArray mediaFiles);
-
-    void requestMediaFilesUploadCancelDialog(ReadableArray mediaFiles);
-
-    void requestMediaFilesSaveCancelDialog(ReadableArray mediaFiles);
-
-    void mediaFilesBlockReplaceSync(ReadableArray mediaFiles, String blockId);
-
     void setFocalPointPickerTooltipShown(boolean tooltipShown);
 
     void requestFocalPointPickerTooltipShown(FocalPointPickerTooltipShownCallback focalPointPickerTooltipShownCallback);
@@ -183,4 +179,8 @@ void gutenbergDidRequestUnsupportedBlockFallback(ReplaceUnsupportedBlockCallback
     void toggleUndoButton(boolean isDisabled);
 
     void toggleRedoButton(boolean isDisabled);
+
+    void requestConnectionStatus(ConnectionStatusCallback connectionStatusCallback);
+
+    void logException(GutenbergJsException exception, LogExceptionCallback logExceptionCallback);
 }
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
index d922d863cb3011..62e6ed8fc94651 100644
--- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
@@ -1,11 +1,15 @@
 package org.wordpress.mobile.ReactNativeGutenbergBridge;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.provider.Settings;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.inputmethod.InputMethodManager;
 
 import androidx.annotation.Nullable;
 
@@ -23,11 +27,14 @@
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.ConnectionStatusCallback;
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.LogExceptionCallback;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.MediaType;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.OtherMediaOptionsReceivedCallback;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.FocalPointPickerTooltipShownCallback;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.BlockTypeImpressionsCallback;
 import org.wordpress.mobile.WPAndroidGlue.DeferredEventEmitter;
+import org.wordpress.mobile.WPAndroidGlue.GutenbergJsException;
 import org.wordpress.mobile.WPAndroidGlue.MediaOption;
 
 import java.io.Serializable;
@@ -40,6 +47,7 @@ public class RNReactNativeGutenbergBridgeModule extends ReactContextBaseJavaModu
         DeferredEventEmitter.JSEventEmitter {
     private final ReactApplicationContext mReactContext;
     private final GutenbergBridgeJS2Parent mGutenbergBridgeJS2Parent;
+    private Runnable mKeyboardRunnable;
 
     private static final String EVENT_NAME_REQUEST_GET_HTML = "requestGetHtml";
     private static final String EVENT_NAME_UPDATE_HTML = "updateHtml";
@@ -58,6 +66,7 @@ public class RNReactNativeGutenbergBridgeModule extends ReactContextBaseJavaModu
     private static final String EVENT_NAME_ON_UNDO_PRESSED = "onUndoPressed";
 
     private static final String EVENT_NAME_ON_REDO_PRESSED = "onRedoPressed";
+    private static final String EVENT_NAME_ON_CONTENT_UPDATE = "onContentUpdate";
 
     private static final String MAP_KEY_UPDATE_HTML = "html";
     private static final String MAP_KEY_UPDATE_TITLE = "title";
@@ -71,7 +80,6 @@ public class RNReactNativeGutenbergBridgeModule extends ReactContextBaseJavaModu
     private static final String MAP_KEY_THEME_UPDATE_GRADIENTS = "gradients";
     private static final String MAP_KEY_THEME_UPDATE_RAW_STYLES = "rawStyles";
     private static final String MAP_KEY_THEME_UPDATE_RAW_FEATURES = "rawFeatures";
-    private static final String MAP_KEY_GALLERY_WITH_IMAGE_BLOCKS = "galleryWithImageBlocks";
     public static final String MAP_KEY_MEDIA_FINAL_SAVE_RESULT_SUCCESS_VALUE = "success";
 
     private static final String MAP_KEY_IS_PREFERRED_COLOR_SCHEME_DARK = "isPreferredColorSchemeDark";
@@ -83,8 +91,11 @@ public class RNReactNativeGutenbergBridgeModule extends ReactContextBaseJavaModu
     private static final String MAP_KEY_REPLACE_BLOCK_HTML = "html";
     private static final String MAP_KEY_REPLACE_BLOCK_BLOCK_ID = "clientId";
 
+    private static final String MAP_KEY_UPDATE_CONTENT = "content";
     public static final String MAP_KEY_FEATURED_IMAGE_ID = "featuredImageId";
 
+    public static final String MAP_KEY_IS_CONNECTED = "isConnected";
+
     private boolean mIsDarkMode;
 
     public RNReactNativeGutenbergBridgeModule(ReactApplicationContext reactContext,
@@ -162,13 +173,6 @@ public void updateTheme(@Nullable Bundle editorTheme) {
         Serializable rawStyles = editorTheme.getSerializable(MAP_KEY_THEME_UPDATE_RAW_STYLES);
         Serializable rawFeatures = editorTheme.getSerializable(MAP_KEY_THEME_UPDATE_RAW_FEATURES);
 
-        // We must assign null here to distinguish between a missing value and false
-        Boolean galleryWithImageBlocks = null;
-        if (editorTheme.containsKey(MAP_KEY_GALLERY_WITH_IMAGE_BLOCKS)) {
-            galleryWithImageBlocks = editorTheme.getBoolean(MAP_KEY_GALLERY_WITH_IMAGE_BLOCKS);
-        }
-
-
         if (colors != null) {
             writableMap.putArray(MAP_KEY_THEME_UPDATE_COLORS, Arguments.fromList((ArrayList)colors));
         }
@@ -185,10 +189,6 @@ public void updateTheme(@Nullable Bundle editorTheme) {
             writableMap.putString(MAP_KEY_THEME_UPDATE_RAW_FEATURES, rawFeatures.toString());
         }
 
-        if (galleryWithImageBlocks != null) {
-            writableMap.putBoolean(MAP_KEY_GALLERY_WITH_IMAGE_BLOCKS, galleryWithImageBlocks);
-        }
-
         emitToJS(EVENT_NAME_UPDATE_EDITOR_SETTINGS, writableMap);
     }
 
@@ -204,6 +204,13 @@ public void onRedoPressed() {
         emitToJS(EVENT_NAME_ON_REDO_PRESSED, null);
     }
 
+    public void onContentUpdate(String content) {
+        WritableMap writableMap = new WritableNativeMap();
+
+        writableMap.putString(MAP_KEY_UPDATE_CONTENT, content);
+        emitToJS(EVENT_NAME_ON_CONTENT_UPDATE, writableMap);
+    }
+
     @ReactMethod
     public void addListener(String eventName) {
         // Keep: Required for RN built in Event Emitter Calls.
@@ -265,11 +272,6 @@ public void mediaUploadSync() {
         mGutenbergBridgeJS2Parent.mediaUploadSync(getNewMediaSelectedCallback(false,null));
     }
 
-    @ReactMethod
-    public void mediaSaveSync() {
-        mGutenbergBridgeJS2Parent.mediaSaveSync(getNewMediaSelectedCallback(true,null));
-    }
-
     @ReactMethod
     public void requestImageFailedRetryDialog(final int mediaId) {
         mGutenbergBridgeJS2Parent.requestImageFailedRetryDialog(mediaId);
@@ -300,31 +302,6 @@ public void requestMediaEditor(String mediaUrl, final Callback onUploadMediaSele
         mGutenbergBridgeJS2Parent.requestMediaEditor(getNewMediaSelectedCallback(false, onUploadMediaSelected), mediaUrl);
     }
 
-    @ReactMethod
-    public void requestMediaFilesEditorLoad(ReadableArray mediaFiles, String blockId) {
-        mGutenbergBridgeJS2Parent.requestMediaFilesEditorLoad(mediaFiles, blockId);
-    }
-
-    @ReactMethod
-    public void requestMediaFilesFailedRetryDialog(ReadableArray mediaFiles) {
-        mGutenbergBridgeJS2Parent.requestMediaFilesFailedRetryDialog(mediaFiles);
-    }
-
-    @ReactMethod
-    public void requestMediaFilesUploadCancelDialog(ReadableArray mediaFiles) {
-        mGutenbergBridgeJS2Parent.requestMediaFilesUploadCancelDialog(mediaFiles);
-    }
-
-    @ReactMethod
-    public void requestMediaFilesSaveCancelDialog(ReadableArray mediaFiles) {
-        mGutenbergBridgeJS2Parent.requestMediaFilesSaveCancelDialog(mediaFiles);
-    }
-
-    @ReactMethod
-    public void mediaFilesBlockReplaceSync(ReadableArray mediaFiles, String blockId) {
-        mGutenbergBridgeJS2Parent.mediaFilesBlockReplaceSync(mediaFiles, blockId);
-    }
-
     @ReactMethod
     public void editorDidEmitLog(String message, int logLevel) {
         mGutenbergBridgeJS2Parent.editorDidEmitLog(message, GutenbergBridgeJS2Parent.LogLevel.valueOf(logLevel));
@@ -533,4 +510,101 @@ public void generateHapticFeedback() {
             }
         }
     }
+
+    @ReactMethod
+    public void requestConnectionStatus(final Callback jsCallback) {
+        ConnectionStatusCallback connectionStatusCallback = requestConnectionStatusCallback(jsCallback);
+        mGutenbergBridgeJS2Parent.requestConnectionStatus(connectionStatusCallback);
+    }
+
+    private ConnectionStatusCallback requestConnectionStatusCallback(final Callback jsCallback) {
+        return new GutenbergBridgeJS2Parent.ConnectionStatusCallback() {
+            @Override public void onRequestConnectionStatus(boolean isConnected) {
+                jsCallback.invoke(isConnected);
+            }
+        };
+    }
+
+    @ReactMethod
+    public void showAndroidSoftKeyboard() {
+        Activity currentActivity = mReactContext.getCurrentActivity();
+        if (isAnyViewFocused()) {
+            // Cancel any previously scheduled Runnable
+            if (mKeyboardRunnable != null) {
+                currentActivity.getWindow().getDecorView().removeCallbacks(mKeyboardRunnable);
+            }
+
+            View currentFocusedView = getCurrentFocusedView();
+            currentFocusedView.getViewTreeObserver().addOnWindowFocusChangeListener(new ViewTreeObserver.OnWindowFocusChangeListener() {
+                @Override
+                public void onWindowFocusChanged(boolean hasFocus) {
+                    if (hasFocus) {
+                        mKeyboardRunnable = createShowKeyboardRunnable();
+                        currentActivity.getWindow().getDecorView().post(mKeyboardRunnable);
+                        currentFocusedView.getViewTreeObserver().removeOnWindowFocusChangeListener(this);
+                    }
+                }
+            });
+        }
+    }
+
+    private Runnable createShowKeyboardRunnable() {
+        return new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Activity activity = mReactContext.getCurrentActivity();
+                    View activeFocusedView = getCurrentFocusedView();
+                    if (activeFocusedView != null && activity.getWindow().getDecorView().isShown()) {
+                        InputMethodManager imm =
+                            (InputMethodManager) mReactContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+                        imm.showSoftInput(activeFocusedView, InputMethodManager.SHOW_IMPLICIT);
+                    }
+                } catch (Exception e) {
+                    // Noop
+                }
+            }
+        };
+    }
+
+    private View getCurrentFocusedView() {
+        Activity activity = mReactContext.getCurrentActivity();
+        if (activity == null) {
+            return null;
+        }
+        return activity.getCurrentFocus();
+    }
+
+    private boolean isAnyViewFocused() {
+        View getCurrentFocusedView = getCurrentFocusedView();
+        return getCurrentFocusedView != null;
+    }
+
+    @ReactMethod
+    public void hideAndroidSoftKeyboard() {
+        Activity currentActivity = mReactContext.getCurrentActivity();
+        if (currentActivity != null) {
+            View currentFocusedView = currentActivity.getCurrentFocus();
+            if (currentFocusedView != null) {
+                InputMethodManager imm =
+                    (InputMethodManager) mReactContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(currentFocusedView.getWindowToken(), 0);
+            }
+        }
+    }
+
+    @ReactMethod
+    public void logException(final ReadableMap rawException, final Callback jsCallback) {
+        GutenbergJsException exception = GutenbergJsException.fromReadableMap(rawException);
+        LogExceptionCallback logExceptionCallback = onLogExceptionCallback(jsCallback);
+        mGutenbergBridgeJS2Parent.logException(exception, logExceptionCallback);
+    }
+
+   private LogExceptionCallback onLogExceptionCallback(final Callback jsCallback) {
+       return new GutenbergBridgeJS2Parent.LogExceptionCallback() {
+           @Override public void onLogException(boolean success) {
+               jsCallback.invoke(success);
+           }
+       };
+   }
 }
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/DeferredEventEmitter.java b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/DeferredEventEmitter.java
index 7dd4dbf3811feb..3bbc8fe7429532 100644
--- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/DeferredEventEmitter.java
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/DeferredEventEmitter.java
@@ -15,6 +15,7 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import static org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgeModule.MAP_KEY_IS_CONNECTED;
 import static org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgeModule.MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_ID;
 import static org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgeModule.MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_NEW_ID;
 import static org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgeModule.MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_URL;
@@ -30,6 +31,7 @@ public interface JSEventEmitter {
     private static final int MEDIA_UPLOAD_STATE_SUCCEEDED = 2;
     private static final int MEDIA_UPLOAD_STATE_FAILED = 3;
     private static final int MEDIA_UPLOAD_STATE_RESET = 4;
+    private static final int MEDIA_UPLOAD_STATE_PAUSED = 11;
 
     private static final int MEDIA_SAVE_STATE_SAVING = 5;
     private static final int MEDIA_SAVE_STATE_SUCCEEDED = 6;
@@ -44,6 +46,8 @@ public interface JSEventEmitter {
 
     private static final String EVENT_FEATURED_IMAGE_ID_NATIVE_UPDATED = "featuredImageIdNativeUpdated";
 
+    private static final String EVENT_CONNECTION_STATUS_CHANGE = "connectionStatusChange";
+
     private static final String MAP_KEY_MEDIA_FILE_STATE = "state";
     private static final String MAP_KEY_MEDIA_FILE_MEDIA_ACTION_PROGRESS = "progress";
     private static final String MAP_KEY_MEDIA_FILE_MEDIA_SERVER_ID = "mediaServerId";
@@ -177,6 +181,11 @@ public void onMediaFileUploadFailed(int mediaId) {
         setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_FAILED, mediaId, null, 0);
     }
 
+    @Override
+    public void onMediaFileUploadPaused(int mediaId) {
+        setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_PAUSED, mediaId, null, 0);
+    }
+
     // Media file save events emitter
     @Override
     public void onSaveMediaFileClear(String mediaId) {
@@ -222,6 +231,12 @@ public void sendToJSFeaturedImageId(int mediaId) {
         queueActionToJS(EVENT_FEATURED_IMAGE_ID_NATIVE_UPDATED, writableMap);
     }
 
+    public void onConnectionStatusChange(boolean isConnected) {
+        WritableMap writableMap = new WritableNativeMap();
+        writableMap.putBoolean(MAP_KEY_IS_CONNECTED, isConnected);
+        queueActionToJS(EVENT_CONNECTION_STATUS_CHANGE, writableMap);
+    }
+
     @Override public void onReplaceMediaFilesEditedBlock(String mediaFiles, String blockId) {
         WritableMap writableMap = new WritableNativeMap();
         writableMap.putString(MAP_KEY_REPLACE_BLOCK_HTML, mediaFiles);
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergJsException.kt b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergJsException.kt
new file mode 100644
index 00000000000000..243c308b5c6700
--- /dev/null
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergJsException.kt
@@ -0,0 +1,61 @@
+package org.wordpress.mobile.WPAndroidGlue
+
+import com.facebook.react.bridge.ReadableMap
+
+data class JsExceptionStackTraceElement (
+    val fileName: String?,
+    val lineNumber: Int?,
+    val colNumber: Int?,
+    val function: String,
+)
+class GutenbergJsException (
+    val type: String,
+    val message: String,
+    var stackTrace: List<JsExceptionStackTraceElement>,
+    val context: Map<String, Any> = emptyMap(),
+    val tags: Map<String,String> = emptyMap(),
+    val isHandled: Boolean,
+    val handledBy: String
+) {
+
+    companion object {
+        @JvmStatic
+        fun fromReadableMap(rawException: ReadableMap): GutenbergJsException {
+            val type: String = rawException.getString("type") ?: ""
+            val message: String = rawException.getString("message") ?: ""
+
+            val stackTrace: List<JsExceptionStackTraceElement> = rawException.getArray("stacktrace")?.let {
+                (0 until it.size()).mapNotNull { index ->
+                    val stackTraceElement = it.getMap(index)
+                    stackTraceElement?.let {
+                        val stackTraceFunction = stackTraceElement.getString("function")
+                        stackTraceFunction?.let {
+                            JsExceptionStackTraceElement(
+                                stackTraceElement.getString("filename"),
+                                if (stackTraceElement.hasKey("lineno")) stackTraceElement.getInt("lineno") else null,
+                                if (stackTraceElement.hasKey("colno")) stackTraceElement.getInt("colno") else null,
+                                stackTraceFunction
+                            )
+                        }
+                    }
+                }
+            } ?: emptyList()
+
+            val context: Map<String, Any> = rawException.getMap("context")?.toHashMap() ?: emptyMap()
+            val tags: Map<String, String> = rawException.getMap("tags")?.toHashMap()?.mapValues { it.value.toString() } ?: emptyMap()
+            val isHandled: Boolean = rawException.getBoolean("isHandled")
+            val handledBy: String = rawException.getString("handledBy") ?: ""
+
+            return GutenbergJsException(
+                type,
+                message,
+                stackTrace,
+                context,
+                tags,
+                isHandled,
+                handledBy
+            )
+        }
+    }
+}
+
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergProps.kt b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergProps.kt
index ce427be2ad09b0..fd30b71e0ff951 100644
--- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergProps.kt
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergProps.kt
@@ -9,11 +9,11 @@ data class GutenbergProps @JvmOverloads constructor(
     val enableLayoutGridBlock: Boolean,
     val enableTiledGalleryBlock: Boolean,
     val enableVideoPressBlock: Boolean,
+    val enableVideoPressV5Support: Boolean,
     val enableFacebookEmbed: Boolean,
     val enableInstagramEmbed: Boolean,
     val enableLoomEmbed: Boolean,
     val enableSmartframeEmbed: Boolean,
-    val enableMediaFilesCollectionBlocks: Boolean,
     val enableMentions: Boolean,
     val enableXPosts: Boolean,
     val enableUnsupportedBlockEditor: Boolean,
@@ -54,12 +54,6 @@ data class GutenbergProps @JvmOverloads constructor(
                     ?.let { putSerializable(PROP_FEATURES, it) }
             theme.getSerializable(PROP_IS_FSE_THEME)
                     ?.let { putSerializable(PROP_IS_FSE_THEME, it) }
-            theme.getSerializable(PROP_GALLERY_WITH_IMAGE_BLOCKS)
-                    ?.let { putSerializable(PROP_GALLERY_WITH_IMAGE_BLOCKS, it) }
-            theme.getSerializable(PROP_QUOTE_BLOCK_V2)
-                    ?.let { putSerializable(PROP_QUOTE_BLOCK_V2, it) }
-            theme.getSerializable(PROP_LIST_BLOCK_V2)
-                    ?.let { putSerializable(PROP_LIST_BLOCK_V2, it) }
         }
     }
 
@@ -70,7 +64,7 @@ data class GutenbergProps @JvmOverloads constructor(
         putBoolean(PROP_CAPABILITIES_LAYOUT_GRID_BLOCK, enableLayoutGridBlock)
         putBoolean(PROP_CAPABILITIES_TILED_GALLERY_BLOCK, enableTiledGalleryBlock)
         putBoolean(PROP_CAPABILITIES_VIDEOPRESS_BLOCK, enableVideoPressBlock)
-        putBoolean(PROP_CAPABILITIES_MEDIAFILES_COLLECTION_BLOCK, enableMediaFilesCollectionBlocks)
+        putBoolean(PROP_CAPABILITIES_VIDEOPRESS_V5_SUPPORT, enableVideoPressV5Support)
         putBoolean(PROP_CAPABILITIES_UNSUPPORTED_BLOCK_EDITOR, enableUnsupportedBlockEditor)
         putBoolean(PROP_CAPABILITIES_CAN_ENABLE_UNSUPPORTED_BLOCK_EDITOR, canEnableUnsupportedBlockEditor)
         putBoolean(PROP_CAPABILITIES_IS_AUDIO_BLOCK_MEDIA_UPLOAD_ENABLED, isAudioBlockMediaUploadEnabled)
@@ -92,7 +86,6 @@ data class GutenbergProps @JvmOverloads constructor(
                     content?.let { putString(PROP_INITIAL_DATA, it) }
                 }
 
-        private const val PROP_INITIAL_TITLE = "initialTitle"
         private const val PROP_INITIAL_HTML_MODE_ENABLED = "initialHtmlModeEnabled"
         private const val PROP_POST_TYPE = "postType"
         private const val PROP_HOST_APP_NAMESPACE = "hostAppNamespace"
@@ -101,10 +94,8 @@ data class GutenbergProps @JvmOverloads constructor(
         private const val PROP_COLORS = "colors"
         private const val PROP_GRADIENTS = "gradients"
         private const val PROP_IS_FSE_THEME = "isFSETheme"
-        private const val PROP_GALLERY_WITH_IMAGE_BLOCKS = "galleryWithImageBlocks"
-        private const val PROP_QUOTE_BLOCK_V2 = "quoteBlockV2"
-        private const val PROP_LIST_BLOCK_V2 = "listBlockV2"
 
+        const val PROP_INITIAL_TITLE = "initialTitle"
         const val PROP_INITIAL_DATA = "initialData"
         const val PROP_STYLES = "rawStyles"
         const val PROP_FEATURES = "rawFeatures"
@@ -114,11 +105,11 @@ data class GutenbergProps @JvmOverloads constructor(
         const val PROP_CAPABILITIES_LAYOUT_GRID_BLOCK = "layoutGridBlock"
         const val PROP_CAPABILITIES_TILED_GALLERY_BLOCK = "tiledGalleryBlock"
         const val PROP_CAPABILITIES_VIDEOPRESS_BLOCK = "videoPressBlock"
+        const val PROP_CAPABILITIES_VIDEOPRESS_V5_SUPPORT = "videoPressV5Support"
         const val PROP_CAPABILITIES_FACEBOOK_EMBED_BLOCK = "facebookEmbed"
         const val PROP_CAPABILITIES_INSTAGRAM_EMBED_BLOCK = "instagramEmbed"
         const val PROP_CAPABILITIES_LOOM_EMBED_BLOCK = "loomEmbed"
         const val PROP_CAPABILITIES_SMARTFRAME_EMBED_BLOCK = "smartframeEmbed"
-        const val PROP_CAPABILITIES_MEDIAFILES_COLLECTION_BLOCK = "mediaFilesCollectionBlock"
         const val PROP_CAPABILITIES_MENTIONS = "mentions"
         const val PROP_CAPABILITIES_XPOSTS = "xposts"
         const val PROP_CAPABILITIES_UNSUPPORTED_BLOCK_EDITOR = "unsupportedBlockEditor"
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
index 69adb653211da2..4477dfc115b7c4 100644
--- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
@@ -18,7 +18,9 @@
 import androidx.core.util.Pair;
 import androidx.fragment.app.Fragment;
 
+import com.BV.LinearGradient.LinearGradientPackage;
 import com.brentvatne.react.ReactVideoPackage;
+import com.dylanvann.fastimage.FastImageViewPackage;
 import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
 import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
@@ -40,23 +42,22 @@
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 import com.horcrux.svg.SvgPackage;
-import com.BV.LinearGradient.LinearGradientPackage;
 import com.reactnativecommunity.clipboard.ClipboardPackage;
 import com.reactnativecommunity.slider.ReactSliderPackage;
-import org.linusu.RNGetRandomValuesPackage;
 import com.reactnativecommunity.webview.RNCWebViewPackage;
 import com.swmansion.gesturehandler.RNGestureHandlerPackage;
 import com.swmansion.reanimated.ReanimatedPackage;
 import com.swmansion.rnscreens.RNScreensPackage;
 import com.th3rdwave.safeareacontext.SafeAreaContextPackage;
-import org.reactnative.maskedview.RNCMaskedViewPackage;
-import com.dylanvann.fastimage.FastImageViewPackage;
 
+import org.linusu.RNGetRandomValuesPackage;
+import org.reactnative.maskedview.RNCMaskedViewPackage;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.mobile.ReactNativeAztec.ReactAztecPackage;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.BuildConfig;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent;
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.LogExceptionCallback;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.MediaSelectedCallback;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.ReplaceUnsupportedBlockCallback;
 import org.wordpress.mobile.ReactNativeGutenbergBridge.RNMedia;
@@ -92,7 +93,6 @@ public class WPAndroidGlueCode {
 
     private OnMediaLibraryButtonListener mOnMediaLibraryButtonListener;
     private OnReattachMediaUploadQueryListener mOnReattachMediaUploadQueryListener;
-    private OnReattachMediaSavingQueryListener mOnReattachMediaSavingQueryListener;
     private OnSetFeaturedImageListener mOnSetFeaturedImageListener;
     private OnEditorMountListener mOnEditorMountListener;
     private OnEditorAutosaveListener mOnEditorAutosaveListener;
@@ -102,7 +102,6 @@ public class WPAndroidGlueCode {
     private OnGutenbergDidRequestEmbedFullscreenPreviewListener mOnGutenbergDidRequestEmbedFullscreenPreviewListener;
     private OnGutenbergDidSendButtonPressedActionListener mOnGutenbergDidSendButtonPressedActionListener;
     private ReplaceUnsupportedBlockCallback mReplaceUnsupportedBlockCallback;
-    private OnMediaFilesCollectionBasedBlockEditorListener mOnMediaFilesCollectionBasedBlockEditorListener;
     private OnFocalPointPickerTooltipShownEventListener mOnFocalPointPickerTooltipShownListener;
     private OnGutenbergDidRequestPreviewListener mOnGutenbergDidRequestPreviewListener;
     private OnBlockTypeImpressionsEventListener mOnBlockTypeImpressionsEventListener;
@@ -112,6 +111,10 @@ public class WPAndroidGlueCode {
     private OnToggleUndoButtonListener mOnToggleUndoButtonListener;
 
     private OnToggleRedoButtonListener mOnToggleRedoButtonListener;
+    private OnConnectionStatusEventListener mOnConnectionStatusEventListener;
+    private OnBackHandlerEventListener mOnBackHandlerEventListener;
+
+    private OnLogExceptionListener mOnLogExceptionListener;
     private boolean mIsEditorMounted;
 
     private String mContentHtml = "";
@@ -133,6 +136,7 @@ public class WPAndroidGlueCode {
     private boolean mIsDarkMode;
     private Consumer<Exception> mExceptionLogger;
     private Consumer<String> mBreadcrumbLogger;
+    private boolean mShouldHandleBackPress = false;
 
     public void onCreate(Context context) {
         SoLoader.init(context, /* native exopackage */ false);
@@ -146,6 +150,10 @@ public boolean hasReactContext() {
         return mReactContext != null;
     }
 
+    public boolean shouldHandleBackPress() {
+        return mShouldHandleBackPress;
+    }
+
     public boolean isContentChanged() {
         return mContentChanged;
     }
@@ -170,14 +178,6 @@ public interface OnMediaLibraryButtonListener {
         void onOtherMediaButtonClicked(String mediaSource, boolean allowMultipleSelection);
     }
 
-    public interface OnMediaFilesCollectionBasedBlockEditorListener {
-        void onRequestMediaFilesEditorLoad(ArrayList<Object> mediaFiles, String blockId);
-        void onCancelUploadForMediaCollection(ArrayList<Object> mediaFiles);
-        void onRetryUploadForMediaCollection(ArrayList<Object> mediaFiles);
-        void onCancelSaveForMediaCollection(ArrayList<Object> mediaFiles);
-        void onMediaFilesBlockReplaceSync(ArrayList<Object> mediaFiles, String blockId);
-    }
-
     public interface OnImageFullscreenPreviewListener {
         void onImageFullscreenPreviewClicked(String mediaUrl);
     }
@@ -186,10 +186,6 @@ public interface OnReattachMediaUploadQueryListener {
         void onQueryCurrentProgressForUploadingMedia();
     }
 
-    public interface OnReattachMediaSavingQueryListener {
-        void onQueryCurrentProgressForSavingMedia();
-    }
-
     public interface OnSetFeaturedImageListener {
         void onSetFeaturedImageButtonClicked(int mediaId);
     }
@@ -259,6 +255,18 @@ public interface OnToggleRedoButtonListener {
         void onToggleRedoButton(boolean isDisabled);
     }
 
+    public interface OnConnectionStatusEventListener {
+        boolean onRequestConnectionStatus();
+    }
+
+    public interface OnBackHandlerEventListener {
+        void onBackHandler();
+    }
+
+    public interface OnLogExceptionListener {
+        void onLogException(GutenbergJsException exception, LogExceptionCallback logExceptionCallback);
+    }
+
     public void mediaSelectionCancelled() {
         mAppendsMultipleSelectedToSiblingBlocks = false;
     }
@@ -348,12 +356,6 @@ public void mediaUploadSync(MediaSelectedCallback mediaSelectedCallback) {
                 mOnReattachMediaUploadQueryListener.onQueryCurrentProgressForUploadingMedia();
             }
 
-            @Override
-            public void mediaSaveSync(MediaSelectedCallback mediaSelectedCallback) {
-                mMediaSelectedCallback = mediaSelectedCallback;
-                mOnReattachMediaSavingQueryListener.onQueryCurrentProgressForSavingMedia();
-            }
-
             @Override
             public void requestImageFailedRetryDialog(int mediaId) {
                 mOnMediaLibraryButtonListener.onRetryUploadForMediaClicked(mediaId);
@@ -497,40 +499,6 @@ public void onShowUserSuggestions(Consumer<String> onResult) {
                 mShowSuggestionsUtil.showXpostSuggestions(onResult);
             }
 
-            @Override
-            public void requestMediaFilesEditorLoad(ReadableArray mediaFiles, String blockId) {
-                mOnMediaFilesCollectionBasedBlockEditorListener
-                        .onRequestMediaFilesEditorLoad(mediaFiles.toArrayList(), blockId);
-            }
-
-            @Override
-            public void requestMediaFilesFailedRetryDialog(ReadableArray mediaFiles) {
-                mOnMediaFilesCollectionBasedBlockEditorListener.onRetryUploadForMediaCollection(
-                        mediaFiles.toArrayList()
-                );
-            }
-
-            @Override
-            public void requestMediaFilesUploadCancelDialog(ReadableArray mediaFiles) {
-                mOnMediaFilesCollectionBasedBlockEditorListener.onCancelUploadForMediaCollection(
-                        mediaFiles.toArrayList()
-                );
-            }
-
-            @Override
-            public void requestMediaFilesSaveCancelDialog(ReadableArray mediaFiles) {
-                mOnMediaFilesCollectionBasedBlockEditorListener.onCancelSaveForMediaCollection(
-                        mediaFiles.toArrayList()
-                );
-            }
-
-            @Override
-            public void mediaFilesBlockReplaceSync(ReadableArray mediaFiles, String blockId) {
-                mOnMediaFilesCollectionBasedBlockEditorListener.onMediaFilesBlockReplaceSync(
-                    mediaFiles.toArrayList(), blockId
-                );
-            }
-
             @Override
             public void setFocalPointPickerTooltipShown(boolean showTooltip) {
                 mOnFocalPointPickerTooltipShownListener.onSetFocalPointPickerTooltipShown(showTooltip);
@@ -594,6 +562,17 @@ public void toggleUndoButton(boolean isDisabled) {
             public void toggleRedoButton(boolean isDisabled) {
                 mOnToggleRedoButtonListener.onToggleRedoButton(isDisabled);
             }
+
+            @Override
+            public void requestConnectionStatus(ConnectionStatusCallback connectionStatusCallback) {
+                boolean isConnected = mOnConnectionStatusEventListener.onRequestConnectionStatus();
+                connectionStatusCallback.onRequestConnectionStatus(isConnected);
+            }
+
+            @Override
+            public void logException(GutenbergJsException exception, LogExceptionCallback logExceptionCallback) {
+                mOnLogExceptionListener.onLogException(exception, logExceptionCallback);
+            }
         }, mIsDarkMode);
 
         return Arrays.asList(
@@ -645,6 +624,10 @@ public void onCreateView(Context initContext,
         mReactRootView = new ReactRootView(new MutableContextWrapper(initContext));
         mReactRootView.setBackgroundColor(colorBackground);
 
+        // Workaround to prevent saving large RN view hierarchies that lead to a `TransactionTooLargeException`
+        // Ref: https://github.com/wordpress-mobile/WordPress-Android/issues/9685#issuecomment-1908452392
+        mReactRootView.setSaveFromParentEnabled(false);
+
         ReactInstanceManagerBuilder builder =
                 ReactInstanceManager.builder()
                                     .setApplication(application)
@@ -668,7 +651,6 @@ public void onCreateView(Context initContext,
     public void attachToContainer(ViewGroup viewGroup,
                                   OnMediaLibraryButtonListener onMediaLibraryButtonListener,
                                   OnReattachMediaUploadQueryListener onReattachMediaUploadQueryListener,
-                                  OnReattachMediaSavingQueryListener onReattachMediaSavingQueryListener,
                                   OnSetFeaturedImageListener onSetFeaturedImageListener,
                                   OnEditorMountListener onEditorMountListener,
                                   OnEditorAutosaveListener onEditorAutosaveListener,
@@ -680,7 +662,6 @@ public void attachToContainer(ViewGroup viewGroup,
                                   OnGutenbergDidRequestEmbedFullscreenPreviewListener onGutenbergDidRequestEmbedFullscreenPreviewListener,
                                   OnGutenbergDidSendButtonPressedActionListener onGutenbergDidSendButtonPressedActionListener,
                                   ShowSuggestionsUtil showSuggestionsUtil,
-                                  OnMediaFilesCollectionBasedBlockEditorListener onMediaFilesCollectionBasedBlockEditorListener,
                                   OnFocalPointPickerTooltipShownEventListener onFocalPointPickerTooltipListener,
                                   OnGutenbergDidRequestPreviewListener onGutenbergDidRequestPreviewListener,
                                   OnBlockTypeImpressionsEventListener onBlockTypeImpressionsEventListener,
@@ -688,13 +669,15 @@ public void attachToContainer(ViewGroup viewGroup,
                                   OnSendEventToHostListener onSendEventToHostListener,
                                   OnToggleUndoButtonListener onToggleUndoButtonListener,
                                   OnToggleRedoButtonListener onToggleRedoButtonListener,
+                                  OnConnectionStatusEventListener onConnectionStatusEventListener,
+                                  OnBackHandlerEventListener onBackHandlerEventListener,
+                                  OnLogExceptionListener onLogExceptionListener,
                                   boolean isDarkMode) {
         MutableContextWrapper contextWrapper = (MutableContextWrapper) mReactRootView.getContext();
         contextWrapper.setBaseContext(viewGroup.getContext());
 
         mOnMediaLibraryButtonListener = onMediaLibraryButtonListener;
         mOnReattachMediaUploadQueryListener = onReattachMediaUploadQueryListener;
-        mOnReattachMediaSavingQueryListener = onReattachMediaSavingQueryListener;
         mOnSetFeaturedImageListener = onSetFeaturedImageListener;
         mOnEditorMountListener = onEditorMountListener;
         mOnEditorAutosaveListener = onEditorAutosaveListener;
@@ -705,7 +688,6 @@ public void attachToContainer(ViewGroup viewGroup,
         mOnGutenbergDidRequestEmbedFullscreenPreviewListener = onGutenbergDidRequestEmbedFullscreenPreviewListener;
         mOnGutenbergDidSendButtonPressedActionListener = onGutenbergDidSendButtonPressedActionListener;
         mShowSuggestionsUtil = showSuggestionsUtil;
-        mOnMediaFilesCollectionBasedBlockEditorListener = onMediaFilesCollectionBasedBlockEditorListener;
         mOnFocalPointPickerTooltipShownListener = onFocalPointPickerTooltipListener;
         mOnGutenbergDidRequestPreviewListener = onGutenbergDidRequestPreviewListener;
         mOnBlockTypeImpressionsEventListener = onBlockTypeImpressionsEventListener;
@@ -713,6 +695,9 @@ public void attachToContainer(ViewGroup viewGroup,
         mOnSendEventToHostListener = onSendEventToHostListener;
         mOnToggleUndoButtonListener = onToggleUndoButtonListener;
         mOnToggleRedoButtonListener = onToggleRedoButtonListener;
+        mOnConnectionStatusEventListener = onConnectionStatusEventListener;
+        mOnBackHandlerEventListener = onBackHandlerEventListener;
+        mOnLogExceptionListener = onLogExceptionListener;
 
         sAddCookiesInterceptor.setOnAuthHeaderRequestedListener(onAuthHeaderRequestedListener);
 
@@ -748,6 +733,7 @@ private void refocus() {
     }
 
     public void onPause(Activity activity) {
+        mShouldHandleBackPress = false;
         if (mReactInstanceManager != null) {
             // get the focused view so we re-focus it later if needed. WeakReference so we don't leak it.
             mLastFocusedView = new WeakReference<>(mReactRootView.findFocus());
@@ -757,13 +743,14 @@ public void onPause(Activity activity) {
     }
 
     public void onResume(final Fragment fragment, final Activity activity) {
+        mShouldHandleBackPress = true;
         if (mReactInstanceManager != null) {
             mReactInstanceManager.onHostResume(activity,
                     new DefaultHardwareBackBtnHandler() {
                         @Override
                         public void invokeDefaultOnBackPressed() {
                             if (fragment.isAdded()) {
-                                activity.onBackPressed();
+                                mOnBackHandlerEventListener.onBackHandler();
                             }
                         }
                     });
@@ -771,11 +758,13 @@ public void invokeDefaultOnBackPressed() {
     }
 
     public void onDetach(Activity activity) {
+        mShouldHandleBackPress = false;
         mReactInstanceManager.onHostDestroy(activity);
         mRnReactNativeGutenbergBridgePackage.getRNReactNativeGutenbergBridgeModule().notifyModalClosed();
     }
 
     public void onDestroy(Activity activity) {
+        mShouldHandleBackPress = false;
         if (mReactRootView != null) {
             mReactRootView.unmountReactApplication();
             mReactRootView = null;
@@ -791,6 +780,12 @@ public void onDestroy(Activity activity) {
         }
     }
 
+    public void onBackPressed() {
+        if (mReactInstanceManager != null) {
+            mReactInstanceManager.onBackPressed();
+        }
+    }
+
     public void showDevOptionsDialog() {
         mReactInstanceManager.showDevOptionsDialog();
     }
@@ -851,6 +846,10 @@ public void onRedoPressed() {
         mRnReactNativeGutenbergBridgePackage.getRNReactNativeGutenbergBridgeModule().onRedoPressed();
     }
 
+    public void onContentUpdate(String content) {
+        mRnReactNativeGutenbergBridgePackage.getRNReactNativeGutenbergBridgeModule().onContentUpdate(content);
+    }
+
     public void setTitle(String title) {
         mTitleInitialized = true;
         mTitle = title;
@@ -1112,6 +1111,10 @@ public void mediaFileUploadFailed(final int mediaId) {
         mDeferredEventEmitter.onMediaFileUploadFailed(mediaId);
     }
 
+    public void mediaFileUploadPaused(final int mediaId) {
+        mDeferredEventEmitter.onMediaFileUploadPaused(mediaId);
+    }
+
     public void mediaFileUploadSucceeded(final int mediaId, final String mediaUrl, final int serverMediaId, final
                                          WritableNativeMap metadata) {
         mDeferredEventEmitter.onMediaFileUploadSucceeded(mediaId, mediaUrl, serverMediaId, metadata);
@@ -1149,6 +1152,10 @@ public void sendToJSFeaturedImageId(int mediaId) {
         mDeferredEventEmitter.sendToJSFeaturedImageId(mediaId);
     }
 
+    public void connectionStatusChange(boolean isConnected) {
+        mDeferredEventEmitter.onConnectionStatusChange(isConnected);
+    }
+
     public void replaceUnsupportedBlock(String content, String blockId) {
         if (mReplaceUnsupportedBlockCallback != null) {
             mReplaceUnsupportedBlockCallback.replaceUnsupportedBlock(content, blockId);
diff --git a/packages/react-native-bridge/android/settings.gradle b/packages/react-native-bridge/android/settings.gradle
index 32d592f7176160..2863d3bb065127 100644
--- a/packages/react-native-bridge/android/settings.gradle
+++ b/packages/react-native-bridge/android/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
-    gradle.ext.kotlinVersion = '1.6.10'
-    gradle.ext.agpVersion = '8.1.0'
+    gradle.ext.kotlinVersion = '1.8.0'
+    gradle.ext.agpVersion = '8.5.1'
     gradle.ext.automatticPublishToS3Version = '0.8.0'
 
     plugins {
diff --git a/packages/react-native-bridge/common/gutenberg-web-single-block/editor-style-overrides.css b/packages/react-native-bridge/common/gutenberg-web-single-block/editor-style-overrides.css
index b0ce8f3dc948d5..46782e944d0c34 100644
--- a/packages/react-native-bridge/common/gutenberg-web-single-block/editor-style-overrides.css
+++ b/packages/react-native-bridge/common/gutenberg-web-single-block/editor-style-overrides.css
@@ -3,11 +3,32 @@
     display: none;
 }
 
+/* Remove header toolbar */
+.editor-header__toolbar {
+    display: none;
+}
+
+/* Hide all children of editor-header__settings */
+.editor-header__settings > * {
+    display: none;
+}
+
+/* Show only the interface-pinned-items container */
+.editor-header__settings > .interface-pinned-items {
+    display: block;
+}
+
+.components-button.editor-post-publish-panel__toggle.is-primary{
+    display: none;
+}
+
 /* Remove default block appender at the end of the post */
-.block-list-appender {
+.block-list-appender, .block-list-appender__toggle,
+.block-editor-inserter, .components-autocomplete__popover {
     display: none;
 }
 
+.edit-post-visual-editor__post-title-wrapper,
 .editor-editor-canvas__post-title-wrapper {
     display: none;
 }
@@ -17,6 +38,11 @@
     display: none;
 }
 
+/* Remove block inserter popover */
+.block-editor-block-popover {
+    display: none;
+}
+
 /* Right align post header children as we will only display one child */
 .edit-post-header {
 	justify-content: flex-end;
@@ -63,17 +89,17 @@
 }
 
 /* Remove tabs from sidebar panel, leaving the \'x\' button */
-.edit-post-sidebar__panel-tabs {
+.editor-sidebar__panel-tabs {
     display: none;
 }
 
 /* Remove \'(no-title)\' string from sidebar header */
-.edit-post-sidebar-header__title {
+.editor-sidebar-header__title {
     display: none;
 }
 
 /* Move \'x\' close button to the end on sidebar header */
-.edit-post-sidebar-header__small {
+.editor-sidebar-header__small {
     justify-content: flex-end;
 }
 
diff --git a/packages/react-native-bridge/common/gutenberg-web-single-block/local-storage-overrides.json b/packages/react-native-bridge/common/gutenberg-web-single-block/local-storage-overrides.json
index f9cee4142d11ac..2c01a8d4e033fa 100644
--- a/packages/react-native-bridge/common/gutenberg-web-single-block/local-storage-overrides.json
+++ b/packages/react-native-bridge/common/gutenberg-web-single-block/local-storage-overrides.json
@@ -10,8 +10,7 @@
 			},
 			"editorMode": "visual",
 			"pinnedPluginItems": {},
-			"hiddenBlockTypes": [],
-			"preferredStyleVariations": {}
+			"hiddenBlockTypes": []
 		}
 	},
 	"core/nux": {
diff --git a/packages/react-native-bridge/index.js b/packages/react-native-bridge/index.js
index 89f9f029901f9a..da16f75e161dac 100644
--- a/packages/react-native-bridge/index.js
+++ b/packages/react-native-bridge/index.js
@@ -3,6 +3,16 @@
  */
 import { NativeModules, NativeEventEmitter, Platform } from 'react-native';
 
+/**
+ * WordPress dependencies
+ */
+import RCTAztecView from '@wordpress/react-native-aztec';
+
+/**
+ * Internal dependencies
+ */
+import parseException from './lib/parseException';
+
 const { RNReactNativeGutenbergBridge } = NativeModules;
 const isIOS = Platform.OS === 'ios';
 const isAndroid = Platform.OS === 'android';
@@ -185,6 +195,30 @@ export function subscribeOnRedoPressed( callback ) {
 	return gutenbergBridgeEvents.addListener( 'onRedoPressed', callback );
 }
 
+export function subscribeConnectionStatus( callback ) {
+	return gutenbergBridgeEvents.addListener(
+		'connectionStatusChange',
+		callback
+	);
+}
+
+/**
+ * Subscribes a callback function to the 'onContentUpdate' event.
+ * This event is triggered with content that will be passed to the block editor
+ * to be converted into blocks.
+ *
+ * @param {Function} callback The function to be called when the 'onContentUpdate' event is triggered.
+ *                            This function receives content plain text/markdown as an argument.
+ * @return {Object} The listener object that was added to the event.
+ */
+export function subscribeToContentUpdate( callback ) {
+	return gutenbergBridgeEvents.addListener( 'onContentUpdate', callback );
+}
+
+export function requestConnectionStatus( callback ) {
+	return RNReactNativeGutenbergBridge.requestConnectionStatus( callback );
+}
+
 /**
  * Request media picker for the given media source.
  *
@@ -246,16 +280,6 @@ export function mediaUploadSync() {
 	return RNReactNativeGutenbergBridge.mediaUploadSync();
 }
 
-/**
- * Request to start listening to save events when in-progress saves are in place
- *
- * For example, when media is being saved and the user re-enters the editor
- *
- */
-export function mediaSaveSync() {
-	return RNReactNativeGutenbergBridge.mediaSaveSync();
-}
-
 export function requestImageFailedRetryDialog( mediaId ) {
 	return RNReactNativeGutenbergBridge.requestImageFailedRetryDialog(
 		mediaId
@@ -336,79 +360,6 @@ export function showXpostSuggestions() {
 	return RNReactNativeGutenbergBridge.showXpostSuggestions();
 }
 
-/**
- * Request the host app to show the block for editing its mediaFiles collection
- *
- * For example, a mediaFiles collection editor can make special handling of visualization
- * in this regard.
- *
- * @param {Array<Map>} mediaFiles    the mediaFiles attribute of the block, containing data about each media item.
- * @param {string}     blockClientId the clientId of the block.
- */
-export function requestMediaFilesEditorLoad( mediaFiles, blockClientId ) {
-	RNReactNativeGutenbergBridge.requestMediaFilesEditorLoad(
-		mediaFiles,
-		blockClientId
-	);
-}
-
-/**
- * Request the host app to show a retry dialog for mediaFiles arrays which contained items that failed
- * to upload
- *
- * For example, tapping on a failed-media overlay would trigger this request and a "Retry?" dialog
- * would be presented to the user
- *
- * @param {Array<Map>} mediaFiles the mediaFiles attribute of the block, containing data about each media item
- */
-export function requestMediaFilesFailedRetryDialog( mediaFiles ) {
-	RNReactNativeGutenbergBridge.requestMediaFilesFailedRetryDialog(
-		mediaFiles
-	);
-}
-
-/**
- * Request the host app to show a cancel dialog for mediaFiles arrays currently being uploaded
- *
- * For example, tapping on a block containing mediaFiles that are currently being uplaoded would trigger this request
- * and a "Cancel upload?" dialog would be presented to the user.
- *
- * @param {Array<Map>} mediaFiles the mediaFiles attribute of the block, containing data about each media item
- */
-export function requestMediaFilesUploadCancelDialog( mediaFiles ) {
-	RNReactNativeGutenbergBridge.requestMediaFilesUploadCancelDialog(
-		mediaFiles
-	);
-}
-
-/**
- * Request the host app to show a cancel dialog for mediaFiles arrays currently undergoing a save operation
- *
- * Save operations on mediaFiles collection could  be lengthy so for example, tapping on a mediaFiles-type block
- * currently being saved would trigger this request and a "Cancel save?" dialog would be presented to the user
- *
- * @param {Array<Map>} mediaFiles the mediaFiles attribute of the block, containing data about each media item.
- */
-export function requestMediaFilesSaveCancelDialog( mediaFiles ) {
-	RNReactNativeGutenbergBridge.requestMediaFilesSaveCancelDialog(
-		mediaFiles
-	);
-}
-
-/**
- * Request the host app to listen to mediaFiles collection based block replacement signals
- * in case such an event was enqueued
- *
- * @param {Array<Map>} mediaFiles    the mediaFiles attribute of the block, containing data about each media item.
- * @param {string}     blockClientId the clientId of the block.
- */
-export function mediaFilesBlockReplaceSync( mediaFiles, blockClientId ) {
-	RNReactNativeGutenbergBridge.mediaFilesBlockReplaceSync(
-		mediaFiles,
-		blockClientId
-	);
-}
-
 export function requestFocalPointPickerTooltipShown( callback ) {
 	return RNReactNativeGutenbergBridge.requestFocalPointPickerTooltipShown(
 		callback
@@ -467,6 +418,37 @@ export function sendEventToHost( eventName, properties ) {
 	);
 }
 
+/**
+ * Shows Android's soft keyboard if there's a TextInput focused and
+ * the keyboard is hidden.
+ *
+ * @return {void}
+ */
+export function showAndroidSoftKeyboard() {
+	if ( isIOS ) {
+		return;
+	}
+
+	const hasFocusedTextInput = RCTAztecView.InputState.isFocused();
+
+	if ( hasFocusedTextInput ) {
+		RNReactNativeGutenbergBridge.showAndroidSoftKeyboard();
+	}
+}
+
+/**
+ * Hides Android's soft keyboard.
+ *
+ * @return {void}
+ */
+export function hideAndroidSoftKeyboard() {
+	if ( isIOS ) {
+		return;
+	}
+
+	RNReactNativeGutenbergBridge.hideAndroidSoftKeyboard();
+}
+
 /**
  * Generate haptic feedback.
  */
@@ -482,4 +464,60 @@ export function toggleRedoButton( isDisabled ) {
 	RNReactNativeGutenbergBridge.toggleRedoButton( isDisabled );
 }
 
+/**
+ * Log exception to host app's crash logging service.
+ * @param {Object}   exception         Exception object
+ * @param {Object}   [extra]           Extra parameters to include in the exception.
+ * @param {Object}   [extra.context]   Context of the exception.
+ * @param {Object}   [extra.tags]      Tags to associate with the exception.
+ * @param {Object}   [extra.isHandled] True if the exception is handled.
+ * @param {Object}   [extra.handledBy] The mechanism that detected the exception.
+ * @param {Function} [callback]        Callback triggered when the exception is sent.
+ */
+export function logException(
+	exception,
+	{ context, tags, isHandled, handledBy } = {
+		context: {},
+		tags: {},
+		isHandled: false,
+		handledBy: 'Unknown',
+	},
+	callback
+) {
+	const parsedException = {
+		...parseException( exception, { context, tags } ),
+		isHandled,
+		handledBy,
+	};
+
+	const onLogException = ( wasSent ) => {
+		if ( ! wasSent ) {
+			// eslint-disable-next-line no-console
+			console.error(
+				'An error ocurred when logging the exception',
+				parsedException
+			);
+		}
+		if ( callback ) {
+			callback();
+		}
+	};
+
+	// Only log exceptions in production
+	// eslint-disable-next-line no-undef
+	if ( __DEV__ ) {
+		// eslint-disable-next-line no-console
+		console.info( 'Exception that would be logged', parsedException );
+		if ( callback ) {
+			callback();
+		}
+		return;
+	}
+
+	RNReactNativeGutenbergBridge.logException(
+		parsedException,
+		onLogException
+	);
+}
+
 export default RNReactNativeGutenbergBridge;
diff --git a/packages/react-native-bridge/ios/Gutenberg.swift b/packages/react-native-bridge/ios/Gutenberg.swift
index 4175c1e2343c32..adb24baa778511 100644
--- a/packages/react-native-bridge/ios/Gutenberg.swift
+++ b/packages/react-native-bridge/ios/Gutenberg.swift
@@ -144,7 +144,7 @@ public class Gutenberg: UIResponder {
         bridgeModule.sendEvent(withName: event.rawValue, body: body)
     }
 
-    public func mediaUploadUpdate(id: Int32, state: MediaUploadState, progress: Float, url: URL?, serverID: Int32?, metadata: [String: Any] = [:]) {
+    public func mediaUploadUpdate(id: Int32, state: MediaUploadState? = nil, progress: Float? = nil, url: URL?, serverID: Int32? = nil, metadata: [String: Any] = [:]) {
         mediaUpdate(event: .mediaUpload, id: id, state: state, progress: progress, url: url, serverID: serverID, metadata: metadata)
     }
 
@@ -169,8 +169,15 @@ public class Gutenberg: UIResponder {
         ])
     }
 
-    private func mediaUpdate<State: MediaState>(event: RNReactNativeGutenbergBridge.EventName, id: Int32, state: State, progress: Float, url: URL?, serverID: Int32?, metadata: [String: Any] = [:])  {
-        var data: [String: Any] = ["mediaId": id, "state": state.rawValue, "progress": progress, "metadata": metadata ];
+    private func mediaUpdate<State: MediaState>(event: RNReactNativeGutenbergBridge.EventName, id: Int32, state: State?, progress: Float?, url: URL?, serverID: Int32?, metadata: [String: Any] = [:])  {
+        var data: [String: Any] = ["mediaId": id, "metadata": metadata ];
+        
+        if let state = state {
+            data["state"] = state.rawValue
+        }
+        if let progress = progress {
+            data["progress"] = progress
+        }
         if let url = url {
             data["mediaUrl"] = url.absoluteString
         }
@@ -210,21 +217,19 @@ public class Gutenberg: UIResponder {
         bridgeModule.sendEventIfNeeded(.onRedoPressed, body: nil)
     }
 
+    public func connectionStatusChange(isConnected: Bool) {
+        var data: [String: Any] = ["isConnected": isConnected]
+        bridgeModule.sendEventIfNeeded(.connectionStatusChange, body: data)
+    }
+    
+    public func onContentUpdate(content: String) {
+        var payload: [String: Any] = ["content": content]
+        bridgeModule.sendEventIfNeeded(.onContentUpdate, body: payload)
+    }
+
     private func properties(from editorSettings: GutenbergEditorSettings?) -> [String : Any] {
         var settingsUpdates = [String : Any]()
         settingsUpdates["isFSETheme"] = editorSettings?.isFSETheme ?? false
-        
-        if let galleryWithImageBlocks = editorSettings?.galleryWithImageBlocks {
-            settingsUpdates["galleryWithImageBlocks"] = galleryWithImageBlocks
-        }
-
-        if let quoteBlockV2 = editorSettings?.quoteBlockV2 {
-            settingsUpdates["quoteBlockV2"] = quoteBlockV2
-        }
-
-        if let listBlockV2 = editorSettings?.listBlockV2 {
-            settingsUpdates["listBlockV2"] = listBlockV2
-        }
 
         if let rawStyles = editorSettings?.rawStyles {
             settingsUpdates["rawStyles"] = rawStyles
@@ -291,6 +296,7 @@ extension Gutenberg {
         case succeeded = 2
         case failed = 3
         case reset = 4
+        case paused = 11
     }
 
     public enum MediaSaveState: Int, MediaState {
diff --git a/packages/react-native-bridge/ios/GutenbergBridgeDataSource.swift b/packages/react-native-bridge/ios/GutenbergBridgeDataSource.swift
index 9b02be94b6a717..4f1ac5f74d3354 100644
--- a/packages/react-native-bridge/ios/GutenbergBridgeDataSource.swift
+++ b/packages/react-native-bridge/ios/GutenbergBridgeDataSource.swift
@@ -82,9 +82,6 @@ public extension GutenbergBridgeDataSource {
 
 public protocol GutenbergEditorSettings {
     var isFSETheme: Bool { get }
-    var galleryWithImageBlocks: Bool { get }
-    var quoteBlockV2: Bool { get }
-    var listBlockV2: Bool { get }
     var rawStyles: String? { get }
     var rawFeatures: String? { get }
     var colors: [[String: String]]? { get }
diff --git a/packages/react-native-bridge/ios/GutenbergBridgeDelegate.swift b/packages/react-native-bridge/ios/GutenbergBridgeDelegate.swift
index 83d087bccab9d1..8ff78b8fa1415f 100644
--- a/packages/react-native-bridge/ios/GutenbergBridgeDelegate.swift
+++ b/packages/react-native-bridge/ios/GutenbergBridgeDelegate.swift
@@ -30,7 +30,7 @@ public enum Capabilities: String {
     case layoutGridBlock
     case tiledGalleryBlock
     case videoPressBlock
-    case mediaFilesCollectionBlock
+    case videoPressV5Support
     case mentions
     case xposts
     case unsupportedBlockEditor
@@ -142,6 +142,56 @@ extension RCTLogLevel {
     }
 }
 
+// Definition of JavaScript exception, which will be used to
+// log exception to the Crash Logging service.
+public struct GutenbergJSException {
+    public let type: String
+    public let message: String
+    public let stacktrace: [StacktraceLine]
+    public let context: [String: Any]
+    public let tags: [String: String]
+    public let isHandled: Bool
+    public let handledBy: String
+
+    public struct StacktraceLine {
+        public let filename: String?
+        public let function: String
+        public let lineno: NSNumber?
+        public let colno: NSNumber?
+        
+        init?(from dict: [AnyHashable: Any]) {
+            guard let function = dict["function"] as? String else {
+                return nil
+            }
+            self.filename = dict["filename"] as? String
+            self.function = function
+            self.lineno = dict["lineno"] as? NSNumber
+            self.colno = dict["colno"] as? NSNumber
+        }
+    }
+    
+    init?(from dict: [AnyHashable: Any]) {
+        guard let type = dict["type"] as? String,
+              let message = dict["message"] as? String,
+              let rawStacktrace = dict["stacktrace"] as? [[AnyHashable: Any]],
+              let context = dict["context"] as? [String: Any],
+              let tags = dict["tags"] as? [String: String],
+              let isHandled = dict["isHandled"] as? Bool,
+              let handledBy = dict["handledBy"] as? String
+        else {
+            return nil
+        }
+        
+        self.type = type
+        self.message = message
+        self.stacktrace = rawStacktrace.compactMap { StacktraceLine(from: $0) }
+        self.context = context
+        self.tags = tags
+        self.isHandled = isHandled
+        self.handledBy = handledBy
+    }
+}
+
 public protocol GutenbergBridgeDelegate: AnyObject {
     /// Tells the delegate that Gutenberg had returned the requested HTML content.
     /// You can request HTML content by calling `requestHTML()` on a Gutenberg bridge instance.
@@ -249,20 +299,6 @@ public protocol GutenbergBridgeDelegate: AnyObject {
 
     func gutenbergDidSendButtonPressedAction(_ buttonType: Gutenberg.ActionButtonType)
 
-    // Media Collection
-
-    /// Tells the delegate that a media collection block requested to reconnect with media save coordinator.
-    ///
-    func gutenbergDidRequestMediaSaveSync()
-
-    func gutenbergDidRequestMediaFilesEditorLoad(_ mediaFiles: [[String: Any]], blockId: String)
-
-    func gutenbergDidRequestMediaFilesFailedRetryDialog(_ mediaFiles: [[String: Any]])
-
-    func gutenbergDidRequestMediaFilesUploadCancelDialog(_ mediaFiles: [[String: Any]])
-
-    func gutenbergDidRequestMediaFilesSaveCancelDialog(_ mediaFiles: [[String: Any]])
-
     func gutenbergDidRequestPreview()
 
     /// Tells the delegate that the editor requested the block type impression counts
@@ -283,6 +319,10 @@ public protocol GutenbergBridgeDelegate: AnyObject {
     func gutenbergDidRequestToggleUndoButton(_ isDisabled: Bool)
     
     func gutenbergDidRequestToggleRedoButton(_ isDisabled: Bool)
+
+    func gutenbergDidRequestConnectionStatus() -> Bool
+    
+    func gutenbergDidRequestLogException(_ exception: GutenbergJSException, with callback: @escaping () -> Void)
 }
 
 // MARK: - Optional GutenbergBridgeDelegate methods
@@ -292,13 +332,4 @@ public extension GutenbergBridgeDelegate {
     func gutenbergDidLayout() { }
     func gutenbergDidRequestUnsupportedBlockFallback(for block: Block) { }
     func gutenbergDidSendButtonPressedAction(_ buttonType: Gutenberg.ActionButtonType) { }
-
-    // Media Collection
-
-    func gutenbergDidRequestMediaSaveSync() {}
-    func gutenbergDidRequestMediaFilesEditorLoad(_ mediaFiles: [[String: Any]], blockId: String) { }
-    func gutenbergDidRequestMediaFilesFailedRetryDialog(_ mediaFiles: [[String: Any]]) { }
-    func gutenbergDidRequestMediaFilesUploadCancelDialog(_ mediaFiles: [[String: Any]]) { }
-    func gutenbergDidRequestMediaFilesSaveCancelDialog(_ mediaFiles: [[String: Any]]) { }
-    func gutenbergDidRequestMediaFilesBlockReplaceSync(_ mediaFiles: [[String: Any]], clientId: String) {}
 }
diff --git a/packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.m b/packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.m
index d333f8c1722ad9..b85bb0ef8db292 100644
--- a/packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.m
+++ b/packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.m
@@ -23,16 +23,9 @@ @interface RCT_EXTERN_MODULE(RNReactNativeGutenbergBridge, NSObject)
 RCT_EXTERN_METHOD(requestUnsupportedBlockFallback:(NSString *)content blockId:(NSString *)blockId blockName:(NSString *)blockName blockTitle:(NSString *)blockTitle)
 RCT_EXTERN_METHOD(showUserSuggestions:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(showXpostSuggestions:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)rejecter)
-RCT_EXTERN_METHOD(requestMediaFilesEditorLoad:(NSArray<NSDictionary *> *)mediaFiles blockId:(NSString *)blockId)
-RCT_EXTERN_METHOD(requestMediaFilesFailedRetryDialog:(NSArray<NSDictionary *> *)mediaFiles)
-RCT_EXTERN_METHOD(requestMediaFilesUploadCancelDialog:(NSArray<NSDictionary *> *)mediaFiles)
-RCT_EXTERN_METHOD(requestMediaFilesSaveCancelDialog:(NSArray<NSDictionary *> *)mediaFiles)
-RCT_EXTERN_METHOD(onCancelUploadForMediaCollection:(NSArray<NSDictionary *> *)mediaFiles)
 RCT_EXTERN_METHOD(requestFocalPointPickerTooltipShown:(RCTResponseSenderBlock)callback)
 RCT_EXTERN_METHOD(setFocalPointPickerTooltipShown:(BOOL)tooltipShown)
 RCT_EXTERN_METHOD(actionButtonPressed:(NSString *)buttonType)
-RCT_EXTERN_METHOD(mediaSaveSync)
-RCT_EXTERN_METHOD(mediaFilesBlockReplaceSync:(NSArray<NSDictionary *> *)mediaFiles clientId:(NSString *)clientId)
 RCT_EXTERN_METHOD(requestPreview)
 RCT_EXTERN_METHOD(requestBlockTypeImpressions:(RCTResponseSenderBlock)callback)
 RCT_EXTERN_METHOD(setBlockTypeImpressions:(NSDictionary *)impressions)
@@ -42,5 +35,7 @@ @interface RCT_EXTERN_MODULE(RNReactNativeGutenbergBridge, NSObject)
 RCT_EXTERN_METHOD(generateHapticFeedback)
 RCT_EXTERN_METHOD(toggleUndoButton:(BOOL)isDisabled)
 RCT_EXTERN_METHOD(toggleRedoButton:(BOOL)isDisabled)
+RCT_EXTERN_METHOD(requestConnectionStatus:(RCTResponseSenderBlock)callback)
+RCT_EXTERN_METHOD(logException:(NSDictionary *)exception callback:(RCTResponseSenderBlock)callback)
 
 @end
diff --git a/packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.swift b/packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.swift
index 8cf4f685bd22c4..96c3a8f25e0cb8 100644
--- a/packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.swift
+++ b/packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.swift
@@ -305,43 +305,6 @@ public class RNReactNativeGutenbergBridge: RCTEventEmitter {
 		})
 	}
 
-    @objc
-    func requestMediaFilesEditorLoad(_ mediaFiles: [[String: Any]], blockId: String) {
-        DispatchQueue.main.async {
-            self.delegate?.gutenbergDidRequestMediaFilesEditorLoad(mediaFiles, blockId: blockId)
-        }
-    }
-
-    @objc
-    func requestMediaFilesFailedRetryDialog(_ mediaFiles: [[String: Any]]) {
-        DispatchQueue.main.async {
-            self.delegate?.gutenbergDidRequestMediaFilesFailedRetryDialog(mediaFiles)
-        }
-    }
-
-    @objc
-    func requestMediaFilesUploadCancelDialog(_ mediaFiles: [[String: Any]]) {
-        DispatchQueue.main.async {
-            self.delegate?.gutenbergDidRequestMediaFilesUploadCancelDialog(mediaFiles)
-        }
-    }
-
-    @objc
-    func requestMediaFilesSaveCancelDialog(_ mediaFiles: [[String: Any]]) {
-        DispatchQueue.main.async {
-            self.delegate?.gutenbergDidRequestMediaFilesSaveCancelDialog(mediaFiles)
-        }
-    }
-
-    @objc
-    func mediaSaveSync() {
-        DispatchQueue.main.async {
-            if self.hasObservers {
-                self.delegate?.gutenbergDidRequestMediaSaveSync()
-            }
-        }
-	}
-
     @objc
     func requestFocalPointPickerTooltipShown(_ callback: @escaping RCTResponseSenderBlock) {
         callback([self.delegate?.gutenbergDidRequestFocalPointPickerTooltipShown() ?? false])
@@ -352,15 +315,6 @@ public class RNReactNativeGutenbergBridge: RCTEventEmitter {
         self.delegate?.gutenbergDidRequestSetFocalPointPickerTooltipShown(tooltipShown)
     }
 
-    @objc
-    func mediaFilesBlockReplaceSync(_ mediaFiles: [[String: Any]], clientId: String) {
-        DispatchQueue.main.async {
-            if self.hasObservers {
-                self.delegate?.gutenbergDidRequestMediaFilesBlockReplaceSync(mediaFiles, clientId: clientId)
-            }
-        }
-    }
-
     @objc
     func actionButtonPressed(_ buttonType: String) {
         guard let button = Gutenberg.ActionButtonType(rawValue: buttonType) else {
@@ -421,6 +375,23 @@ public class RNReactNativeGutenbergBridge: RCTEventEmitter {
     func toggleRedoButton(_ isDisabled: Bool) {
         self.delegate?.gutenbergDidRequestToggleRedoButton(isDisabled)
     }
+    
+    @objc
+    func requestConnectionStatus(_ callback: @escaping RCTResponseSenderBlock) {
+        callback([self.delegate?.gutenbergDidRequestConnectionStatus() ?? true])
+    }
+
+    @objc
+    func logException(_ rawException: [AnyHashable: Any], callback: @escaping RCTResponseSenderBlock) {
+        guard let exception = GutenbergJSException(from: rawException) else {
+            callback([false])
+            return
+        }
+    
+        self.delegate?.gutenbergDidRequestLogException(exception) {
+            callback([true])
+        }
+    }
 }
 
 // MARK: - RCTBridgeModule delegate
@@ -450,6 +421,8 @@ extension RNReactNativeGutenbergBridge {
         case showEditorHelp
         case onUndoPressed
         case onRedoPressed
+        case connectionStatusChange
+        case onContentUpdate
     }
 
     public override func supportedEvents() -> [String]! {
diff --git a/packages/react-native-bridge/lib/parseException.js b/packages/react-native-bridge/lib/parseException.js
new file mode 100644
index 00000000000000..f8b97af7ed5c97
--- /dev/null
+++ b/packages/react-native-bridge/lib/parseException.js
@@ -0,0 +1,181 @@
+/**
+ * External dependencies
+ */
+import { version as RNV } from 'react-native/Libraries/Core/ReactNativeVersion';
+
+/**
+ * Internal dependencies
+ */
+import { version as reactNativeBridgeVersion } from '../package.json';
+
+// The stack trace is limited to prevent crash logging service fail processing the exception.
+const STACKTRACE_LIMIT = 50;
+
+const isHermesEnabled = () => {
+	return !! global.HermesInternal;
+};
+
+// Based on environment functions of Sentry React Native SDK:
+// https://github.com/getsentry/sentry-react-native/blob/e0f0885fa26f28909e28001fb7c25270655588cf/src/js/utils/environment.ts
+const getReactNativeContext = () => {
+	const isTurboModuleEnabled =
+		typeof global.__turboModuleProxy !== 'undefined';
+	const isFabricEnabled = typeof global.nativeFabricUIManager !== 'undefined';
+	const hermesVersion =
+		global.HermesInternal &&
+		global.HermesInternal.getRuntimeProperties &&
+		global.HermesInternal.getRuntimeProperties()[ 'OSS Release Version' ];
+	const reactNativeVersion = `${ RNV.major }.${ RNV.minor }.${ RNV.patch }${
+		RNV.prerelease !== null ? `-${ RNV.prerelease }` : ''
+	}`;
+	return {
+		is_hermes_enabled: isHermesEnabled(),
+		is_turbo_module_enabled: isTurboModuleEnabled,
+		is_fabric_enabled: isFabricEnabled,
+		hermes_version: isHermesEnabled() ? hermesVersion : null,
+		react_native_version: reactNativeVersion,
+	};
+};
+
+const stacktraceLineRegex =
+	/^\s*at (?:(.+?\)(?: \[.+\])?|.*?) ?\((?:address at )?)?(?:async )?((?:<anonymous>|[-a-z]+:|.*bundle|\/)?.*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i;
+const UNKNOWN_FUNCTION = '?';
+
+// Based on function `chrome` Stack line parser of Sentry React Native SDK:
+// https://github.com/getsentry/sentry-javascript/blob/de681dcf7d6dac69da9374bbdbe2e2f7e00f0fdc/packages/browser/src/stack-parsers.ts#L53-L83
+// And function `createReactNativeRewriteFrames`:
+// https://github.com/getsentry/sentry-react-native/blob/adfb66f16438dfd98f280307844778c7291b584b/src/js/integrations/rewriteframes.ts#L17-L69
+const parseStacktraceLine = ( line ) => {
+	const parts = stacktraceLineRegex.exec( line );
+
+	if ( ! parts ) {
+		return;
+	}
+
+	let filename = parts[ 2 ];
+	const func = parts[ 1 ] || UNKNOWN_FUNCTION;
+	const lineno = parts[ 3 ] ? +parts[ 3 ] : undefined;
+	let colno = parts[ 4 ] ? +parts[ 4 ] : undefined;
+
+	if ( filename ) {
+		// Filter out unneeded parts from filename
+		filename = filename
+			.replace( /^file:\/\//, '' )
+			.replace( /^address at /, '' )
+			.replace( /^.*\/[^.]+(\.app|CodePush|.*(?=\/))/, '' );
+
+		// Add prefix to filename
+		if ( filename !== '[native code]' && filename !== 'native' ) {
+			const appPrefix = 'app://';
+			filename =
+				filename.indexOf( '/' ) === 0
+					? `${ appPrefix }${ filename }`
+					: `${ appPrefix }/${ filename }`;
+		}
+	}
+
+	// Check Hermes Bytecode stack trace and convert to 1-based column
+	if ( isHermesEnabled() && lineno === 1 && colno !== undefined ) {
+		// hermes bytecode columns are 0-based, while v8 and jsc are 1-based.
+		// Hermes stack trace without debug info have always line with value 1
+		// and column points to a bytecode position.
+		// https://github.com/facebook/react/issues/21792#issuecomment-873171991
+		colno += 1;
+	}
+
+	return {
+		filename,
+		function: func,
+		...( lineno ? { lineno } : null ),
+		...( colno ? { colno } : null ),
+	};
+};
+
+// Based on function `createStackParser` and `parseStackFrames` of Sentry JavaScript SDK:
+// - https://github.com/getsentry/sentry-javascript/blob/de681dcf7d6dac69da9374bbdbe2e2f7e00f0fdc/packages/utils/src/stacktrace.ts#L16-L59
+// - https://github.com/getsentry/sentry-javascript/blob/de681dcf7d6dac69da9374bbdbe2e2f7e00f0fdc/packages/browser/src/eventbuilder.ts#L100-L118
+// And function `stripSentryFramesAndReverse` of Sentry React Native SDK:
+// https://github.com/getsentry/sentry-javascript/blob/de681dcf7d6dac69da9374bbdbe2e2f7e00f0fdc/packages/utils/src/stacktrace.ts#L80-L117
+const parseStacktrace = ( exception ) => {
+	const plainStacktrace = exception.stacktrace || exception.stack || '';
+	const entries = [];
+	const lines = plainStacktrace.split( '\n' );
+
+	for ( let i = 0; i < lines.length; i++ ) {
+		const line = lines[ i ];
+		// Ignore lines over 1kb as they are unlikely to be valid entries.
+		if ( line.length > 1024 ) {
+			continue;
+		}
+
+		// Skip error message lines.
+		if ( line.match( /\S*Error: / ) ) {
+			continue;
+		}
+
+		const entry = parseStacktraceLine( line );
+		if ( entry ) {
+			entries.push( entry );
+		}
+
+		if ( entries.length >= STACKTRACE_LIMIT ) {
+			break;
+		}
+	}
+
+	const reverseEntries = Array.from( entries ).reverse();
+
+	return reverseEntries.slice( 0, STACKTRACE_LIMIT ).map( ( entry ) => ( {
+		...entry,
+		filename:
+			entry.filename ||
+			reverseEntries[ reverseEntries.length - 1 ].filename,
+	} ) );
+};
+
+// Based on function `extractMessage` of Sentry JavaScript SDK:
+// https://github.com/getsentry/sentry-javascript/blob/de681dcf7d6dac69da9374bbdbe2e2f7e00f0fdc/packages/browser/src/eventbuilder.ts#L142-L151
+const extractMessage = ( exception ) => {
+	const message = exception?.message;
+	if ( ! message ) {
+		return 'No error message';
+	}
+	if ( typeof message.error?.message === 'string' ) {
+		return message.error.message;
+	}
+	return message;
+};
+
+// Based on function `exceptionFromError` of Sentry JavaScript SDK:
+// https://github.com/getsentry/sentry-javascript/blob/de681dcf7d6dac69da9374bbdbe2e2f7e00f0fdc/packages/browser/src/eventbuilder.ts#L31-L49
+const parseException = ( originalException ) => {
+	const exception = {
+		type: originalException?.name,
+		message: extractMessage( originalException ),
+	};
+
+	const stacktrace = parseStacktrace( originalException );
+	if ( stacktrace.length ) {
+		exception.stacktrace = stacktrace;
+	}
+
+	if ( exception.type === undefined && exception.message === '' ) {
+		exception.message = 'Unknown error';
+	}
+
+	return exception;
+};
+
+export default ( exception, { context, tags } = {} ) => {
+	return {
+		...parseException( exception ),
+		context: {
+			...context,
+			...getReactNativeContext(),
+		},
+		tags: {
+			...tags,
+			gutenberg_mobile_version: reactNativeBridgeVersion,
+		},
+	};
+};
diff --git a/packages/react-native-bridge/lib/test/__snapshots__/parseException.test.js.snap b/packages/react-native-bridge/lib/test/__snapshots__/parseException.test.js.snap
new file mode 100644
index 00000000000000..3c4798ae1133cd
--- /dev/null
+++ b/packages/react-native-bridge/lib/test/__snapshots__/parseException.test.js.snap
@@ -0,0 +1,70 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Parse exception parses stack trace 1`] = `
+{
+  "context": {
+    "hermes_version": null,
+    "is_fabric_enabled": false,
+    "is_hermes_enabled": false,
+    "is_turbo_module_enabled": false,
+    "react_native_version": "0.71.2-beta-1",
+  },
+  "message": "Test exception",
+  "stacktrace": [
+    {
+      "colno": 21,
+      "filename": "app:///reactNative.js",
+      "function": "reactNativeFunction",
+      "lineno": 5383,
+    },
+    {
+      "colno": 42,
+      "filename": "app:///otherFile.native.js",
+      "function": "anonymous",
+      "lineno": 64266,
+    },
+    {
+      "filename": "native",
+      "function": "forEach",
+    },
+    {
+      "colno": 43,
+      "filename": "app:///rootFile.native.js",
+      "function": "topLevelFunction",
+      "lineno": 64215,
+    },
+    {
+      "colno": 21,
+      "filename": "app:///bridge.native.js",
+      "function": "functionThatTriggersNative",
+      "lineno": 62932,
+    },
+    {
+      "filename": "native",
+      "function": "apply",
+    },
+    {
+      "colno": 22,
+      "filename": "app:///file3.native.js",
+      "function": "otherFunction",
+      "lineno": 62524,
+    },
+    {
+      "colno": 40,
+      "filename": "app:///file2.native.js",
+      "function": "parentFunction",
+      "lineno": 459785,
+    },
+    {
+      "colno": 24,
+      "filename": "app:///file1.native.js",
+      "function": "functionThatFailed",
+      "lineno": 546277,
+    },
+  ],
+  "tags": {
+    "gutenberg_mobile_version": "1.100.0",
+  },
+  "type": "Error",
+}
+`;
diff --git a/packages/react-native-bridge/lib/test/parseException.test.js b/packages/react-native-bridge/lib/test/parseException.test.js
new file mode 100644
index 00000000000000..64d16356adba27
--- /dev/null
+++ b/packages/react-native-bridge/lib/test/parseException.test.js
@@ -0,0 +1,75 @@
+/**
+ * Internal dependencies
+ */
+import parseException from '../parseException';
+
+// Mock React Native version to 0.71.2-beta-1
+jest.mock( 'react-native/Libraries/Core/ReactNativeVersion', () => ( {
+	version: {
+		major: 0,
+		minor: 71,
+		patch: 2,
+		prerelease: 'beta-1',
+	},
+} ) );
+
+// Mock Gutenberg Mobile version to 1.100.0
+jest.mock( '../../package.json', () => ( { version: '1.100.0' } ), {
+	virtual: true,
+} );
+
+describe( 'Parse exception', () => {
+	it( 'parses stack trace', () => {
+		const rawException = {
+			name: 'Error',
+			message: 'Test exception',
+			stack: 'TypeError: Test exception\n    at functionThatFailed (file1.native.js:546277:24)\n    at parentFunction (file2.native.js:459785:40)\n    at otherFunction (file3.native.js:62524:22)\n    at apply (native)\n    at functionThatTriggersNative (bridge.native.js:62932:21)\n    at topLevelFunction (rootFile.native.js:64215:43)\n    at forEach (native)\n    at anonymous (otherFile.native.js:64266:42)\n    at reactNativeFunction (reactNative.js:5383:21)',
+		};
+
+		expect( parseException( rawException ) ).toMatchSnapshot();
+	} );
+
+	it( 'parses Hermes stack trace', () => {
+		global.HermesInternal = true;
+
+		const rawException = {
+			name: 'Error',
+			message: 'Test exception',
+			stack: 'TypeError: Test exception\n    at functionThatFailed (file1.native.js:1:1000)\n    at apply (native)\n    at functionThatTriggersNative (bridge.native.js:1:2000)\n    at topLevelFunction (rootFile.native.js:1:3000)',
+		};
+
+		const exception = parseException( rawException );
+		// Columns are incremented by one for Hermes stack traces
+		expect( exception.stacktrace[ 0 ].colno ).toBe( 3001 );
+		expect( exception.stacktrace[ 1 ].colno ).toBe( 2001 );
+		expect( exception.stacktrace[ 2 ].colno ).toBeUndefined();
+		expect( exception.stacktrace[ 3 ].colno ).toBe( 1001 );
+
+		global.HermesInternal = undefined;
+	} );
+
+	it( 'limits stack trace entries', () => {
+		const rawException = {
+			stack: [ ...Array( 100 ) ]
+				.map(
+					( _, index ) =>
+						`\n    at function${ index } (file1.native.js:546277:${ index })`
+				)
+				.join( '' ),
+		};
+		const exception = parseException( rawException );
+		expect( exception.stacktrace.length ).toBe( 50 );
+	} );
+
+	it( 'sets default error message', () => {
+		const exception = parseException( {} );
+		expect( exception.message ).toBe( 'No error message' );
+	} );
+
+	it( 'sets unkown error type', () => {
+		const exception = parseException( {
+			message: { error: { message: '' } },
+		} );
+		expect( exception.message ).toBe( 'Unknown error' );
+	} );
+} );
diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json
index 6b9bdb782d66d1..b0c0a2485520df 100644
--- a/packages/react-native-bridge/package.json
+++ b/packages/react-native-bridge/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-bridge",
-	"version": "1.109.2",
+	"version": "1.121.0",
 	"description": "Native bridge library used to integrate the block editor into a native App.",
 	"private": true,
 	"author": "The WordPress Contributors",
@@ -17,10 +17,14 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
 	"main": "index.js",
 	"react-native": "index",
 	"dependencies": {
-		"@wordpress/react-native-aztec": "file:../react-native-aztec"
+		"@wordpress/react-native-aztec": "*"
 	},
 	"peerDependencies": {
 		"react-native": "*"
diff --git a/packages/react-native-editor/.npmrc b/packages/react-native-editor/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/react-native-editor/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index ea7b841879c4fb..6031e402100c98 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -10,9 +10,114 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+
+
+## 1.121.0
+-   [internal] Fix Inserter items list filtering [#62334]
+-   [*] Prevent hiding the keyboard when creating new list items [#62446]
+-   [*] Fix issue when pasting HTML content [#62588]
+-   [**] Add support prefix transforms [#62576]
+-   [*] Remove themes from supported endpoints [#63183]
+
+## 1.120.1
+
+-   [*] RichText - Fix undefined onDelete callback [#62486]
+
+## 1.120.0
+
+-   [*] Prevent deleting content when backspacing in the first Paragraph block [#62069]
+-   [internal] Adds new bridge functionality for updating content [#61796]
+
+## 1.119.1
+
+-   [*] Image corrector - Check the path extension is a valid one [#62190]
+-   [*] Unsupported block - UI improvements [#62240]
+
+## 1.119.0
+
+-   [internal] Remove circular dependencies within the components package [#61102]
+-   [internal] Upgrade target sdk version to Android API 34 [#61727]
+
+## 1.118.0
+
+-   [*] Fix a crash when pasting file images and special comment markup [#60476]
+-   [*] Update Aztec to v2.1.2 [#61007]
+-   [*] KeyboardAwareFlatList - Enable FlatList virtualization for iOS [#59833]
+
+## 1.117.0
+
+-   [*] Add empty fallback option for the BottomSheetSelectControl component [#60333]
+-   [*] Fix Quote Block styles [#60476]
+-   [*] Prevent passing potential false values to the onPress prop [#60595]
+-   [*] ColorPalette - Check for ScrollView reference [#60562]
+-   [*] Raw Handling - msListIgnore - Check attributes are valid [#60375]
+
+## 1.116.0
+
+-   [**] Highlight color formatting style improvements [#57650]
+
+## 1.115.0
+
+-   [*] Improve consistency of the block outline indicating the currently selected block [#59415]
+-   [*] Gallery block items with in-progress, paused, or failed media uploads correctly display an highlight outline when selected [#59423]
+-   [**] [internal] Upgrade React Native to version 0.73.3 [#58475]
+-   [**] Add error boundary components and exception logging [#59221]
+-   [**] Fix crash occurring when the URL associated with a Video block is changed too quickly [#59841]
+-   [**] Enable setting HTML anchor IDs for all supported block types [#59802]
+
+## 1.114.1
+
+-   [**] Fix a crash produced when the content of a synced pattern is updated [#59632]
+
+## 1.114.0
+
+-   [*] Prevent crash when autoscrolling to blocks [#59110]
+-   [*] Remove opacity change when images are being uploaded [#59264]
+-   [*] Media & Text blocks correctly show an error message when the attached video upload fails [#59288]
+
+## 1.112.0
+
+-   [*] [internal] Upgrade React Native to version 0.71.15 [#57667]
+-   [**] Prevent images from temporarily disappearing when uploading media [#57869]
+-   [**] Fix crash occurring on large post on Android [#58266]
+
+## 1.111.2
+
+-   [*] [internal] Remove `mediaFilesCollectionBlock` initial prop [#58140]
+
+## 1.111.1
+
+-   [**] Video block: Fix logic for displaying empty state based on source presence [#58015]
+-   [**] Fix crash when RichText values are not defined [#58088]
+
+## 1.111.0
+
+-   [**] Image block media uploads display a custom error message when there is no internet connection [#56937]
+-   [*] Fix missing custom color indicator for custom gradients [#57605]
+-   [**] Display a notice when a network connection unavailable [#56934]
+
+## 1.110.1
+
+-   [**] Fix crash when RichText values are not defined [#58088]
+
+## 1.110.0
+
 -   [*] [internal] Move InserterButton from components package to block-editor package [#56494]
+-   [*] [internal] Move ImageLinkDestinationsScreen from components package to block-editor package [#56775]
+-   [*] Fix crash when blockType wrapperProps are not defined [#56846]
+-   [*] Guard against an Image block styles crash due to null block values [#56903]
+-   [**] Fix crash when sharing unsupported media types on Android [#56791]
+-   [**] Fix regressions with wrapper props and font size customization [#56985]
+-   [***] Avoid keyboard dismiss when interacting with text blocks [#57070]
+-   [**] Auto-scroll upon block insertion [#57273]
+-   [*] Unselect blocks using the hardware back button (Android) [#57279]
+
+## 1.109.3
+
+-   [**] Fix duplicate/unresponsive options in font size settings. [#56985]
 
 ## 1.109.2
+
 -   [**] Fix issue related to text color format and receiving in rare cases an undefined ref from `RichText` component [#56686]
 -   [**] Fixes a crash on pasting MS Word list markup [#56653]
 -   [**] Address rare cases where a null value is passed to a heading block, causing a crash [#56757]
@@ -21,45 +126,56 @@ For each user feature we should also add a importance categorization label  to i
 -   [**] Fixes an issue with custom color variables not being parsed when using global styles [#56752]
 
 ## 1.109.1
+
 -   [***] Fix issue when backspacing in an empty Paragraph block [#56496]
 
 ## 1.109.0
+
 -   [*] Audio block: Improve legibility of audio file details on various background colors [#55627]
 -   [*] In the deeply nested block warning, only display the ungroup option for blocks that support it [#56445]
 
 ## 1.108.0
+
 -   [*] Fix error when pasting deeply nested structure content [#55613]
 -   [*] Fix crash related to accessing undefined value in `TextColorEdit` [#55664]
 
 ## 1.107.0
+
 -   [*] Social Icons: Fix visibility of inactive icons when used with block based themes in dark mode [#55398]
 -   [*] Synced Patterns: Fix visibility of heading section when used with block based themes in dark mode [#55399]
 -   [*] Classic block: Add option to convert to blocks [#55461]
 
 ## 1.106.0
+
 -   [*] Exit Preformatted and Verse blocks by triple pressing the Return key [#53354]
 -   [*] Fix quote block border visibility when used with block based themes in dark mode [#54964]
 
 ## 1.105.0
+
 -   [*] Limit inner blocks nesting depth to avoid call stack size exceeded crash [#54382]
 -   [*] Prevent crashes when setting an invalid media URL for Video or Audio blocks [#54834]
 -   [**] Fallback to Twitter provider when embedding X URLs [#54876]
 -   [*] [internal] Update Ruby version from 2.7.4 to 3.2.2 [#54897]
 
 ## 1.104.0
+
 -   [*] Fix the obscurred "Insert from URL" input for media blocks when using a device in landscape orientation. [#54096]
 -   [**] RichText - Update logic for the placeholder text color [#54259]
 
 ## 1.103.3
+
 -   [*] Bump `WordPress-Aztec-iOS` version to `1.19.9` [#54456]
 
 ## 1.103.2
+
 -   [*] Fix issue with missing characters in Add Media placeholder button [#54281]
 
 ## 1.103.1
+
 -   [**] Fix long-press gestures not working in RichText component [Android] [#54213]
 
 ## 1.103.0
+
 -   [**] Replace third-party dependency react-native-hsv-color-picker with first-party code [#53329]
 -   [*] Search Control - Prevent calling TextInput's methods when undefined [#53745]
 -   [*] Improve horizontal rule styles to avoid invisible lines [#53883]
@@ -69,20 +185,25 @@ For each user feature we should also add a importance categorization label  to i
 -   [*] Fix Social Icons block alignment [#54100]
 
 ## 1.102.1
-- [**] Fix Voice Over and assistive keyboards [#53895]
+
+-   [**] Fix Voice Over and assistive keyboards [#53895]
 
 ## 1.102.0
+
 -   [*] Display custom color value in mobile Cover Block color picker [#51414]
 -   [**] Display outline around selected Social Link block [#53377]
 -   [**] Fixes font customization not getting updated on iOS [#53391]
 
 ## 1.101.2
--  [**] Fix Voice Over and assistive keyboards [#53895]
+
+-   [**] Fix Voice Over and assistive keyboards [#53895]
 
 ## 1.101.1
+
 -   [**] Fix the dynamic height when opening/closing navigation screens within the bottom sheet. [https://github.com/WordPress/gutenberg/pull/53608]
 
 ## 1.101.0
+
 -   [*] Remove visual gap in mobile toolbar when a Gallery block is selected [#52966]
 -   [*] Remove Gallery caption button on mobile [#53010]
 -   [**] Upgrade React Native to 0.71.11 [#51303]
@@ -90,12 +211,15 @@ For each user feature we should also add a importance categorization label  to i
 -   [*] Fix Gallery block selection when adding media [#53127]
 
 ## 1.100.2
+
 -   [**] Fix iOS Focus loop for RichText components [#53217]
 
 ## 1.100.1
+
 -   [**] Add WP hook for registering non-core blocks [#52791]
 
 ## 1.100.0
+
 -   [**] Add media inserter buttons to editor toolbar [#51827]
 -   [**] Update native BlockOutline component styles to remove blue border from blocks [#51222]
 -   [**] Move the undo/redo buttons to the navigation bar [#51766]
@@ -104,125 +228,159 @@ For each user feature we should also add a importance categorization label  to i
 -   [*] Update Block Settings button border [#52715]
 
 ## 1.99.1
-- [**] Fix crash related to removing a block under certain conditions [#52595]
+
+-   [**] Fix crash related to removing a block under certain conditions [#52595]
 
 ## 1.99.0
+
 -   [*] Rename "Reusable blocks" to "Synced patterns", aligning with the web editor. [#51704]
 -   [**] Fix a crash related to Reanimated when closing the editor [#52320]
 
 ## 1.98.1
+
 -   [*] fix: Display heading level dropdown icons and labels [#52004]
 
 ## 1.98.0
+
 -   [*] Image block - Fix issue where in some cases the image doesn't display the right aspect ratio [#51463]
 -   [*] Fix cursor positioning when dictating text on iOS [#51227]
 
 ## 1.97.1
+
 -   [**] Fix crash when using the delete key to remove a single button [#51435]
 -   [*] Ensure text input field is not editable when Bottom sheet cell is disabled [#51567]
 
 ## 1.97.0
+
 -   [**] [iOS] Fix dictation regression, in which typing/dictating at the same time caused content loss. [#49452]
 -   [*] [internal] Upgrade compile and target sdk version to Android API 33 [#50731]
 -   [*] Display lock icon in disabled state of `Cell` component [#50907]
 
 ## 1.96.1
+
 -   [**] Fix Android-only issue related to block toolbar not being displayed on some blocks in UBE [#51131]
 
 ## 1.96.0
+
 -   [**] Tapping on all nested blocks gets focus directly instead of having to tap multiple times depending on the nesting levels. [#50672]
 -   [*] Add disabled style to `Cell` component [#50665]
 -   [**] Fix undo/redo history when inserting a link configured to open in a new tab [#50460]
 -   [*] [List block] Fix an issue when merging a list item into a Paragraph would remove its nested list items. [#50701]
 
 ## 1.95.0
+
 -   [*] Fix crash when trying to convert to regular blocks an undefined/deleted reusable block [#50475]
 -   [**] Tapping on nested text blocks gets focus directly instead of having to tap multiple times depeding on the nesting levels. [#50108]
 -   [*] Use host app namespace in reusable block message [#50478]
 -   [**] Configuring a link to open in a new tab no longer results in a partial loss of edit history (undo and redo) [#50460]
 
 ## 1.94.0
+
 -   [*] Split pasted content between title and body. [#37169]
 
 ## 1.93.1
+
 -   [**] Fix regression with the Color hook and ColorPanel. [#49917]
 
 ## 1.93.0
+
 -   [***] [iOS] Fixed iOS scroll jumping issue by refactoring KeyboardAwareFlatList improving writing flow and caret focus handling. [#48791]
 
 ## 1.92.1
+
 -   [*] Avoid empty Gallery block error [#49557]
 
 ## 1.92.0
-* No User facing changes *
+
+-   No user facing changes.
 
 ## 1.91.0
+
 -   [*] Allow new block transformations for most blocks. [#48792]
 
 ## 1.90.0
+
 -   [*] Fix parsing of css units for null matched values [#48484]
 -   [*] Spacer block - Add initial support for spacing presets [#47258]
 -   [*] Support Visual Regression testing [#47845]
--   [*] Add metadata parameter to media upload events [#48103]  
+-   [*] Add metadata parameter to media upload events [#48103]
+
+## 1.89.1
 
-## 1.89.1 
 -   [*] Fix inaccessible block settings within the unsupported block editor [#48435]
 
-## 1.89.0 
-* No User facing changes *
+## 1.89.0
+
+-   No user facing changes.
+
+## 1.88.0
 
-## 1.88.0 
 -   [*] Bump Android `minSdkVersion` to 24 [#47604]
 -   [*] Update React Native Reanimated to 2.9.1-wp-3 [#47574]
 -   [*] Bump Aztec version to `1.6.3` [#47610]
 
 ## 1.87.3
+
 -   [*] Fix insert blocks not handling raw string properly in unsupported block editor [#47472]
 
 ## 1.87.2
+
 -   [*] Add boolean contentStyle and clientId check to Column Edit InnerBlocks [#47234]
 -   [*] Line-height and font-size regression fixes [#47284]
 
 ## 1.87.1
+
 -   [**] Gallery block: Address styling regression, in which negative margin was added [#47086]
 -   [*] RichText - Parse CSS values and avoid setting undefined ones [#47080]
 
 ## 1.87.0
+
 -   [*] Add capabilities to force only Core blocks and control Support section [#46215]
 
 ## 1.86.1
+
 -   [*] Block Actions Menu - Fix block title regression and adds integration tests [#46699]
 
 ## 1.86.0
+
 -   [**] Upgrade React Native to 0.69.4 [#43485]
 -   [**] Prevent error message from unneccesarily firing when uploading to Gallery block [#46175]
 
 ## 1.85.1
+
 -   [**] Prevent error message from unneccesarily firing when uploading to Gallery block [#46175]
 
 ## 1.85.0
+
 -   [*] [iOS] Fixed iOS Voice Control support within Image block captions. [#44850]
 
 ## 1.84.1
+
 -   [**] Native inner blocks merge where appropriate [#45048]
 
 ## 1.84.0
+
 -   [*] Upgrade compile and target sdk version to Android API 31 [#44610]
 -   [*] [iOS] Fixed iOS Voice Control support within Image block captions. [#44850]
 
 ## 1.83.0
-* No User facing changes *
+
+-   No user facing changes.
 
 ## 1.82.1
+
 -   [**] List block v2: Fix issues splitting or merging paragraphs into the block [#43949]
 
 ## 1.82.0
+
 -   [*] [iOS] Explicitly set tint color for action sheets to always be blue [#43759]
 
 ## 1.81.2
+
 -   [**] List V2 - Prevent error when list is empty [#43861]
 
 ## 1.81.1
+
 -   [*] List block v2: Fix text color inconsistencies with list items [#43244]
 -   [*] Use default placeholder text color for native List Item [#43353]
 -   [**] Add BlockListCompact [#43431]
@@ -230,21 +388,26 @@ For each user feature we should also add a importance categorization label  to i
 -   [**] Disable FastImage on Android [#43322]
 
 ## 1.81.0
+
 -   [***] List block V2 [#42702]
 
 ## 1.80.1
+
 -   [*] Image - Workaround for Android and orientation changes [#42900]
 
 ## 1.80.0
+
 -   [*] Add React Native FastImage [#42009]
 -   [*] Block inserter displays block collections [#42405]
 -   [*] Fix incorrect spacing within Image alt text footnote [#42504]
 -   [***] Gallery and Image block - Performance improvements [#42178]
 
 ## 1.79.1
+
 -   [**] Fix a crash when scrolling posts containing Embed blocks (Android 12 only) [#42514]
 
 ## 1.79.0
+
 -   [*] Add 'Insert from URL' option to Video block [#41493]
 -   [*] Image block copies the alt text from the media library when selecting an item [#41839]
 -   [*] Introduce "block recovery" option for invalid blocks [#41988]
diff --git a/packages/react-native-editor/__device-tests__/README.md b/packages/react-native-editor/__device-tests__/README.md
index e917a297a491c7..719adbbcf94265 100644
--- a/packages/react-native-editor/__device-tests__/README.md
+++ b/packages/react-native-editor/__device-tests__/README.md
@@ -6,6 +6,7 @@ The Mobile Gutenberg (MG) project maintains a suite of automated end-to-end (E2E
 
 1. Complete the [React Native Getting Started](https://reactnative.dev/docs/environment-setup) guide for both iOS and Android, which covers setting up Xcode, Android Studio, the Android SDK.
 1. Open [Xcode settings](https://developer.apple.com/documentation/xcode/installing-additional-simulator-runtimes#Install-and-manage-Simulator-runtimes-in-settings) to install the iOS 16.2 simulator runtime.
+1. Install [`jq`](https://jqlang.github.io/jq/download/) via [Homebrew](https://brew.sh/) or your preferred package manager.
 1. `npm run native test:e2e:setup`
 
 ## Running Tests
diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-device-actions.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-device-actions.test.js
index e7ee4a20df03f2..230c844491d282 100644
--- a/packages/react-native-editor/__device-tests__/gutenberg-editor-device-actions.test.js
+++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-device-actions.test.js
@@ -27,6 +27,10 @@ describe( 'Gutenberg Editor Rotation tests', () => {
 		await editorPage.addNewBlock( blockNames.paragraph );
 
 		if ( isAndroid() ) {
+			// Waits until the keyboard is visible
+			await editorPage.driver.waitUntil(
+				editorPage.driver.isKeyboardShown
+			);
 			await editorPage.dismissKeyboard();
 		}
 
diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-heading-@canary.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-heading-@canary.test.js
deleted file mode 100644
index 50a2a3ee8fd640..00000000000000
--- a/packages/react-native-editor/__device-tests__/gutenberg-editor-heading-@canary.test.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Internal dependencies
- */
-import { blockNames } from './pages/editor-page';
-import testData from './helpers/test-data';
-
-describe( 'Gutenberg Editor tests', () => {
-	it( 'should be able to create a post with heading and paragraph blocks', async () => {
-		await editorPage.initializeEditor();
-		await editorPage.addNewBlock( blockNames.heading );
-		let headingBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.heading
-		);
-
-		await editorPage.typeTextToTextBlock(
-			headingBlockElement,
-			testData.heading
-		);
-
-		await editorPage.addNewBlock( blockNames.paragraph );
-		let paragraphBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.paragraph,
-			2
-		);
-		await editorPage.typeTextToTextBlock(
-			paragraphBlockElement,
-			testData.mediumText
-		);
-
-		await editorPage.addNewBlock( blockNames.paragraph );
-		paragraphBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.paragraph,
-			3
-		);
-		await editorPage.typeTextToTextBlock(
-			paragraphBlockElement,
-			testData.mediumText
-		);
-
-		await editorPage.addNewBlock( blockNames.heading );
-		headingBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.heading,
-			4
-		);
-		await editorPage.typeTextToTextBlock(
-			headingBlockElement,
-			testData.heading
-		);
-
-		await editorPage.addNewBlock( blockNames.paragraph );
-		paragraphBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.paragraph,
-			5
-		);
-		await editorPage.typeTextToTextBlock(
-			paragraphBlockElement,
-			testData.mediumText
-		);
-
-		// Assert that even though there are 5 blocks, there should only be 3 paragraph blocks
-		expect( await editorPage.getNumberOfParagraphBlocks() ).toEqual( 3 );
-	} );
-} );
diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-paragraph.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-paragraph.test.js
deleted file mode 100644
index 8f21ef04858fb6..00000000000000
--- a/packages/react-native-editor/__device-tests__/gutenberg-editor-paragraph.test.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * Internal dependencies
- */
-import { blockNames } from './pages/editor-page';
-import {
-	backspace,
-	clickMiddleOfElement,
-	clickBeginningOfElement,
-} from './helpers/utils';
-import testData from './helpers/test-data';
-
-describe( 'Gutenberg Editor tests for Paragraph Block', () => {
-	it( 'should be able to split one paragraph block into two', async () => {
-		await editorPage.initializeEditor();
-		await editorPage.addNewBlock( blockNames.paragraph );
-		const paragraphBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.paragraph
-		);
-		await editorPage.typeTextToTextBlock(
-			paragraphBlockElement,
-			testData.shortText
-		);
-		await clickMiddleOfElement( editorPage.driver, paragraphBlockElement );
-		await editorPage.typeTextToTextBlock(
-			paragraphBlockElement,
-			'\n',
-			false
-		);
-		const text0 = await editorPage.getTextForParagraphBlockAtPosition( 1 );
-		const text1 = await editorPage.getTextForParagraphBlockAtPosition( 2 );
-		expect( await editorPage.getNumberOfParagraphBlocks() ).toEqual( 2 );
-		expect( text0 ).not.toBe( '' );
-		expect( text1 ).not.toBe( '' );
-		expect( testData.shortText ).toMatch(
-			new RegExp( `${ text0 + text1 }|${ text0 } ${ text1 }` )
-		);
-	} );
-
-	it( 'should be able to merge 2 paragraph blocks into 1', async () => {
-		await editorPage.initializeEditor();
-		await editorPage.addNewBlock( blockNames.paragraph );
-		let paragraphBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.paragraph
-		);
-
-		await editorPage.typeTextToTextBlock(
-			paragraphBlockElement,
-			testData.shortText
-		);
-		await clickMiddleOfElement( editorPage.driver, paragraphBlockElement );
-		await editorPage.typeTextToTextBlock( paragraphBlockElement, '\n' );
-
-		const text0 = await editorPage.getTextForParagraphBlockAtPosition( 1 );
-		const text1 = await editorPage.getTextForParagraphBlockAtPosition( 2 );
-		expect( await editorPage.getNumberOfParagraphBlocks() ).toEqual( 2 );
-		paragraphBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.paragraph,
-			2
-		);
-
-		await clickBeginningOfElement(
-			editorPage.driver,
-			paragraphBlockElement
-		);
-
-		await editorPage.typeTextToTextBlock(
-			paragraphBlockElement,
-			backspace
-		);
-
-		const text = await editorPage.getTextForParagraphBlockAtPosition( 1 );
-		expect( text0 + text1 ).toMatch( text );
-		paragraphBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.paragraph,
-			1
-		);
-		await paragraphBlockElement.click();
-		expect( await editorPage.getNumberOfParagraphBlocks() ).toEqual( 1 );
-	} );
-
-	it( 'should be able to create a post with multiple paragraph blocks', async () => {
-		await editorPage.initializeEditor();
-		await editorPage.addNewBlock( blockNames.paragraph );
-		await editorPage.sendTextToParagraphBlock( 1, testData.longText );
-		expect( await editorPage.getNumberOfParagraphBlocks() ).toEqual( 3 );
-	} );
-
-	it( 'should be able to merge blocks with unknown html elements', async () => {
-		await editorPage.initializeEditor( {
-			initialData: [
-				testData.unknownElementParagraphBlock,
-				testData.lettersInParagraphBlock,
-			].join( '\n\n' ),
-		} );
-
-		// Merge paragraphs.
-		const paragraphBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.paragraph,
-			2
-		);
-
-		const text0 = await editorPage.getTextForParagraphBlockAtPosition( 1 );
-		const text1 = await editorPage.getTextForParagraphBlockAtPosition( 2 );
-
-		await clickBeginningOfElement(
-			editorPage.driver,
-			paragraphBlockElement
-		);
-		await editorPage.typeTextToTextBlock(
-			paragraphBlockElement,
-			backspace
-		);
-
-		// Verify the editor has not crashed.
-		const mergedBlockText =
-			await editorPage.getTextForParagraphBlockAtPosition( 1 );
-		expect( text0 + text1 ).toMatch( mergedBlockText );
-	} );
-
-	// Based on https://github.com/wordpress-mobile/gutenberg-mobile/pull/1507
-	it( 'should handle multiline paragraphs from web', async () => {
-		await editorPage.initializeEditor( {
-			initialData: [
-				testData.multiLinesParagraphBlock,
-				testData.paragraphBlockEmpty,
-			].join( '\n\n' ),
-		} );
-
-		// Merge paragraphs.
-		const paragraphBlockElement = await editorPage.getTextBlockAtPosition(
-			blockNames.paragraph,
-			2
-		);
-		await editorPage.typeTextToTextBlock(
-			paragraphBlockElement,
-			backspace
-		);
-
-		// Verify the editor has not crashed.
-		const text = await editorPage.getTextForParagraphBlockAtPosition( 1 );
-		expect( text.length ).not.toEqual( 0 );
-	} );
-} );
diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-writing-flow-@canary.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-writing-flow-@canary.test.js
new file mode 100644
index 00000000000000..3a12bf5d13345b
--- /dev/null
+++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-writing-flow-@canary.test.js
@@ -0,0 +1,333 @@
+/**
+ * Internal dependencies
+ */
+import { blockNames } from './pages/editor-page';
+import {
+	backspace,
+	clickBeginningOfElement,
+	waitForMediaLibrary,
+} from './helpers/utils';
+import testData from './helpers/test-data';
+
+describe( 'Gutenberg Editor Writing flow tests', () => {
+	it( 'should be able to write a post title', async () => {
+		await editorPage.initializeEditor( { initialTitle: '' } );
+
+		const titleInput = await editorPage.getEmptyTitleTextInputElement();
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+		await editorPage.typeTextToTextBlock( titleInput, testData.shortText );
+
+		// Trigger the return key to go to the first Paragraph
+		await editorPage.typeTextToTextBlock( titleInput, '\n' );
+
+		const paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph
+		);
+		expect( paragraphBlockElement ).toBeTruthy();
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+
+		// Trigger the return key to delete the Paragraph block
+		await editorPage.typeTextToTextBlock(
+			paragraphBlockElement,
+			backspace
+		);
+		// Expect to have an empty Paragraph block and the keyboard visible
+		expect(
+			await editorPage.getTextBlockAtPosition( blockNames.paragraph )
+		).toBeTruthy();
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+	} );
+
+	it( 'should be able to create a new Paragraph block when pressing the enter key', async () => {
+		await editorPage.initializeEditor( { initialTitle: '' } );
+
+		const defaultBlockAppenderElement =
+			await editorPage.getDefaultBlockAppenderElement();
+		await defaultBlockAppenderElement.click();
+
+		const paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph
+		);
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+
+		await editorPage.typeTextToTextBlock(
+			paragraphBlockElement,
+			testData.shortText
+		);
+		await editorPage.typeTextToTextBlock( paragraphBlockElement, '\n' );
+
+		// Expect to have a new Paragraph block and the keyboard visible
+		expect(
+			await editorPage.getTextBlockAtPosition( blockNames.paragraph, 2 )
+		).toBeTruthy();
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+	} );
+
+	it( 'should automatically dismiss the keyboard when selecting non-text-based-blocks', async () => {
+		await editorPage.initializeEditor( { initialTitle: '' } );
+
+		await editorPage.addNewBlock( blockNames.image );
+		// Wait for the Media picker to show up
+		await waitForMediaLibrary( editorPage.driver );
+
+		// Select the WordPress Media Library option
+		await editorPage.chooseMediaLibrary();
+
+		// Wait until the media is added
+		await editorPage.driver.pause( 500 );
+
+		const captionElement = await editorPage.getImageBlockCaptionButton();
+		await captionElement.click();
+		const captionInput =
+			await editorPage.getImageBlockCaptionInput( captionElement );
+
+		expect( captionInput ).toBeTruthy();
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+
+		// Sets a new caption
+		await editorPage.typeTextToTextBlock(
+			captionInput,
+			testData.listItem2,
+			true
+		);
+
+		// Trigger the return key to exit the caption and create a new Paragraph block
+		await editorPage.typeTextToTextBlock( captionInput, '\n' );
+
+		// Expect to have an empty Paragraph block and the keyboard visible
+		let paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph,
+			2
+		);
+		expect( paragraphBlockElement ).toBeTruthy();
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+		await editorPage.typeTextToTextBlock(
+			paragraphBlockElement,
+			backspace
+		);
+
+		// When deleting the Paragraph block, the keyboard should be hidden and
+		// the image block should be focused.
+		await editorPage.driver.waitUntil( async function () {
+			return ! ( await editorPage.driver.isKeyboardShown() );
+		} );
+		expect( await editorPage.isImageBlockSelected() ).toBe( true );
+
+		// Adding a new Paragraph block
+		await editorPage.addNewBlock( blockNames.paragraph );
+		paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph,
+			2
+		);
+
+		// It should be focused and the keyboard should be visible
+		expect( paragraphBlockElement ).toBeTruthy();
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+
+		await editorPage.typeTextToTextBlock(
+			paragraphBlockElement,
+			testData.shortText
+		);
+
+		const imageBlockElement = await editorPage.getBlockAtPosition(
+			blockNames.image
+		);
+		await imageBlockElement.click();
+
+		await editorPage.driver.waitUntil( async function () {
+			return ! ( await editorPage.driver.isKeyboardShown() );
+		} );
+		expect( await editorPage.isImageBlockSelected() ).toBe( true );
+	} );
+
+	it( 'should manually dismiss the keyboard', async () => {
+		await editorPage.initializeEditor( { initialTitle: '' } );
+
+		const defaultBlockAppenderElement =
+			await editorPage.getDefaultBlockAppenderElement();
+		await defaultBlockAppenderElement.click();
+
+		const paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph
+		);
+		expect( paragraphBlockElement ).toBeTruthy();
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+
+		await editorPage.dismissKeyboard();
+
+		// Checks that no block is selected by looking for the block menu actions button
+		expect( await editorPage.isBlockActionsMenuButtonDisplayed() ).toBe(
+			false
+		);
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( false );
+	} );
+
+	it( 'should dismiss the keyboard and show it back when opening modals', async () => {
+		await editorPage.initializeEditor( { initialTitle: '' } );
+
+		const defaultBlockAppenderElement =
+			await editorPage.getDefaultBlockAppenderElement();
+		await defaultBlockAppenderElement.click();
+
+		await editorPage.openBlockSettings();
+		await editorPage.driver.waitUntil( async function () {
+			return ! ( await editorPage.driver.isKeyboardShown() );
+		} );
+
+		await editorPage.dismissBottomSheet();
+
+		await editorPage.driver.waitUntil( editorPage.driver.isKeyboardShown );
+		const paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph
+		);
+		await editorPage.typeTextToTextBlock(
+			paragraphBlockElement,
+			testData.listItem1
+		);
+		const typedText = await paragraphBlockElement.getText();
+		expect( typedText ).toMatch( testData.listItem1 );
+	} );
+
+	it( 'should be able to split and merge paragraph blocks', async () => {
+		await editorPage.initializeEditor();
+
+		// Add the first Paragraph block using the default block appender
+		const defaultBlockAppenderElement =
+			await editorPage.getDefaultBlockAppenderElement();
+		await defaultBlockAppenderElement.click();
+
+		// Type text into the first Paragraph block
+		const firstParagraphBlockElement =
+			await editorPage.getTextBlockAtPosition( blockNames.paragraph );
+		await editorPage.typeTextToTextBlock(
+			firstParagraphBlockElement,
+			testData.shortText
+		);
+
+		// Add a second Paragraph block and type some text
+		await editorPage.addParagraphBlockByTappingEmptyAreaBelowLastBlock();
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+		const secondParagraphBlockElement =
+			await editorPage.getTextBlockAtPosition( blockNames.paragraph, 2 );
+		await editorPage.typeTextToTextBlock(
+			secondParagraphBlockElement,
+			testData.mediumText
+		);
+
+		// Merge Paragraph blocks
+		await clickBeginningOfElement(
+			editorPage.driver,
+			secondParagraphBlockElement
+		);
+		await editorPage.typeTextToTextBlock(
+			secondParagraphBlockElement,
+			backspace
+		);
+
+		// Wait for blocks to be merged
+		await editorPage.driver.waitUntil( async function () {
+			return ( await editorPage.getNumberOfParagraphBlocks() ) === 1;
+		} );
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+
+		// Split the current Paragraph block right where the caret is positioned
+		const paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph,
+			1,
+			true
+		);
+		await editorPage.typeTextToTextBlock( paragraphBlockElement, '\n' );
+
+		// Wait for blocks to be split
+		await editorPage.driver.waitUntil( async function () {
+			return ( await editorPage.getNumberOfParagraphBlocks() ) === 2;
+		} );
+		expect( await editorPage.driver.isKeyboardShown() ).toBe( true );
+
+		const firstParagraphText =
+			await editorPage.getTextForParagraphBlockAtPosition( 1 );
+		const secondParagraphText =
+			await editorPage.getTextForParagraphBlockAtPosition( 2 );
+
+		expect( firstParagraphText ).toEqual( testData.shortText );
+		expect( secondParagraphText ).toEqual( testData.mediumText );
+	} );
+
+	it( 'should be able to create a post with multiple paragraph blocks', async () => {
+		await editorPage.initializeEditor();
+		const defaultBlockAppenderElement =
+			await editorPage.getDefaultBlockAppenderElement();
+		await defaultBlockAppenderElement.click();
+
+		await editorPage.sendTextToParagraphBlock( 1, testData.longText );
+		expect( await editorPage.getNumberOfParagraphBlocks() ).toEqual( 3 );
+	} );
+
+	it( 'should be able to merge blocks with unknown html elements', async () => {
+		await editorPage.initializeEditor( {
+			initialData: [
+				testData.unknownElementParagraphBlock,
+				testData.lettersInParagraphBlock,
+			].join( '\n\n' ),
+		} );
+
+		// Merge paragraphs.
+		const paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph,
+			2
+		);
+
+		const text0 = await editorPage.getTextForParagraphBlockAtPosition( 1 );
+		const text1 = await editorPage.getTextForParagraphBlockAtPosition( 2 );
+
+		await clickBeginningOfElement(
+			editorPage.driver,
+			paragraphBlockElement
+		);
+		await editorPage.typeTextToTextBlock(
+			paragraphBlockElement,
+			backspace
+		);
+
+		// Verify the editor has not crashed.
+		const mergedBlockText =
+			await editorPage.getTextForParagraphBlockAtPosition( 1 );
+		expect( text0 + text1 ).toMatch( mergedBlockText );
+	} );
+
+	it( 'should be able to create a post with heading and paragraph blocks', async () => {
+		await editorPage.initializeEditor();
+		await editorPage.addNewBlock( blockNames.heading );
+		const headingBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.heading
+		);
+
+		await editorPage.typeTextToTextBlock(
+			headingBlockElement,
+			testData.heading
+		);
+
+		await editorPage.addParagraphBlockByTappingEmptyAreaBelowLastBlock();
+		let paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph,
+			2
+		);
+		await editorPage.typeTextToTextBlock(
+			paragraphBlockElement,
+			testData.mediumText
+		);
+
+		await editorPage.addParagraphBlockByTappingEmptyAreaBelowLastBlock();
+		paragraphBlockElement = await editorPage.getTextBlockAtPosition(
+			blockNames.paragraph,
+			3
+		);
+		await editorPage.typeTextToTextBlock(
+			paragraphBlockElement,
+			testData.mediumText
+		);
+
+		// Assert that even though there are 3 blocks, there should only be 2 paragraph blocks
+		expect( await editorPage.getNumberOfParagraphBlocks() ).toEqual( 2 );
+	} );
+} );
diff --git a/packages/react-native-editor/__device-tests__/helpers/test-data.js b/packages/react-native-editor/__device-tests__/helpers/test-data.js
index 9816e7dc5354d1..b2310cd51aa377 100644
--- a/packages/react-native-editor/__device-tests__/helpers/test-data.js
+++ b/packages/react-native-editor/__device-tests__/helpers/test-data.js
@@ -186,19 +186,29 @@ exports.spacerBlock = `<!-- wp:spacer -->
 
 exports.galleryBlock = `<!-- wp:gallery {"columns":8,"linkTo":"none","className":"alignfull"} -->
 <figure class="wp-block-gallery has-nested-images columns-8 is-cropped alignfull"><!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
-<figure class="wp-block-image size-large"><img src="https://wordpress.org/gutenberg/files/2018/07/Block-Icon.png" alt=""/><figcaption class="wp-element-caption">Paragraph</figcaption></figure>
+<figure class="wp-block-image size-large"><img src="https://cldup.com/njpygC0aF7.png"" alt=""/><figcaption class="wp-element-caption">Paragraph</figcaption></figure>
 <!-- /wp:image -->
 <!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
-<figure class="wp-block-image size-large"><img src="https://wordpress.org/gutenberg/files/2018/07/Block-Icon-Heading.png" alt=""/><figcaption class="wp-element-caption">Heading</figcaption></figure>
+<figure class="wp-block-image size-large"><img src="https://cldup.com/HOeupVqCwe.png" alt=""/><figcaption class="wp-element-caption">Heading</figcaption></figure>
 <!-- /wp:image -->
 <!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
-<figure class="wp-block-image size-large"><img src="https://wordpress.org/gutenberg/files/2018/07/Block-Icon-Subheading.png" alt=""/><figcaption class="wp-element-caption">Subheading</figcaption></figure>
+<figure class="wp-block-image size-large"><img src="https://cldup.com/s-OlAVlGJS.png" alt=""/><figcaption class="wp-element-caption">Image</figcaption></figure>
 <!-- /wp:image -->
 <!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
-<figure class="wp-block-image size-large"><img src="https://wordpress.org/gutenberg/files/2018/07/Block-Icon-Quote.png" alt=""/><figcaption class="wp-element-caption">Quote</figcaption></figure>
+<figure class="wp-block-image size-large"><img src="https://cldup.com/aBnr4SymR1.png" alt=""/><figcaption class="wp-element-caption">Cover</figcaption></figure>
 <!-- /wp:image -->
 <!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
-<figure class="wp-block-image size-large"><img src="https://wordpress.org/gutenberg/files/2018/07/Block-Icon-Image.png" alt=""/><figcaption class="wp-element-caption">Image</figcaption></figure>
+<figure class="wp-block-image size-large"><img src="https://cldup.com/aDIyKHI6Up.png" alt=""/><figcaption class="wp-element-caption">Video</figcaption></figure>
+<!-- /wp:image -->
+</figure>
+<!-- /wp:gallery -->`;
+
+exports.galleryBlockTwoImages = `<!-- wp:gallery {"columns":8,"linkTo":"none","className":"alignfull"} -->
+<figure class="wp-block-gallery has-nested-images columns-8 is-cropped alignfull"><!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+<figure class="wp-block-image size-large"><img src="https://cldup.com/njpygC0aF7.png" alt=""/><figcaption class="wp-element-caption">Paragraph</figcaption></figure>
+<!-- /wp:image -->
+<!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+<figure class="wp-block-image size-large"><img src="https://cldup.com/s-OlAVlGJS.png" alt=""/><figcaption class="wp-element-caption">Image</figcaption></figure>
 <!-- /wp:image -->
 </figure>
 <!-- /wp:gallery -->`;
diff --git a/packages/react-native-editor/__device-tests__/helpers/utils.js b/packages/react-native-editor/__device-tests__/helpers/utils.js
index 8af4a0b1a60d71..c44bc277155e2c 100644
--- a/packages/react-native-editor/__device-tests__/helpers/utils.js
+++ b/packages/react-native-editor/__device-tests__/helpers/utils.js
@@ -306,19 +306,11 @@ const clickBeginningOfElement = async ( driver, element ) => {
 		.perform();
 };
 
-// Long press to activate context menu.
-const longPressMiddleOfElement = async (
+async function longPressElement(
 	driver,
 	element,
-	waitTime = 1000,
-	customElementSize
-) => {
-	const location = await element.getLocation();
-	const size = customElementSize || ( await element.getSize() );
-
-	const x = location.x + size.width / 2;
-	const y = location.y + size.height / 2;
-
+	{ waitTime = 1000, offset = { x: 0, y: 0 } } = {}
+) {
 	// Focus on the element first, otherwise on iOS it fails to open the context menu.
 	// We can't do it all in one action because it detects it as a force press and it
 	// is not supported by the simulator.
@@ -331,16 +323,43 @@ const longPressMiddleOfElement = async (
 		.up()
 		.perform();
 
+	const location = await element.getLocation();
+	const size = await element.getSize();
+
+	let offsetX = offset.x;
+	if ( typeof offset.x === 'function' ) {
+		offsetX = offset.x( size.width );
+	}
+	let offsetY = offset.y;
+	if ( typeof offset.y === 'function' ) {
+		offsetY = offset.y( size.height );
+	}
+
 	// Long-press
 	await driver
 		.action( 'pointer', {
 			parameters: { pointerType: 'touch' },
 		} )
-		.move( { x, y } )
+		.move( { x: location.x + offsetX, y: location.y + offsetY } )
 		.down()
 		.pause( waitTime )
 		.up()
 		.perform();
+}
+
+// Long press to activate context menu.
+const longPressMiddleOfElement = async (
+	driver,
+	element,
+	{ waitTime = 1000 } = {}
+) => {
+	await longPressElement( driver, element, {
+		waitTime,
+		offset: {
+			x: ( width ) => width / 2,
+			y: ( height ) => height / 2,
+		},
+	} );
 };
 
 const tapStatusBariOS = async ( driver ) => {
@@ -399,13 +418,20 @@ const selectTextFromElement = async ( driver, element ) => {
 	}
 };
 
-// Starts from the middle of the screen or the element(if specified)
-// and swipes upwards.
+/**
+ * Starts from the middle of the screen or the element(if specified)
+ * and swipes upwards.
+ *
+ * @param {Object} driver                  WebdriverIO driver
+ * @param {Object} element                 Element to swipe from
+ * @param {Object} options                 Options
+ * @param {number} options.delay           Delay between the swipe and the next action
+ * @param {number} options.endYCoefficient Multiplier for the end Y coordinate
+ */
 const swipeUp = async (
 	driver,
 	element = undefined,
-	delay = 3000,
-	endYCoefficient = 0.5
+	{ delay = 3000, endYCoefficient = 0.5 } = {}
 ) => {
 	let size = await driver.getWindowSize();
 	let y = 0;
@@ -446,15 +472,25 @@ const swipeFromTo = async (
 		.pause( delay )
 		.perform();
 
-// Starts from the middle of the screen and swipes downwards
-const swipeDown = async ( driver, delay = 3000 ) => {
+/**
+ * Starts from the middle of the screen and swipes downwards
+ *
+ * @param {Object} driver                  WebdriverIO driver
+ * @param {Object} options                 Options
+ * @param {number} options.delay           Delay between the swipe and the next action
+ * @param {number} options.endYCoefficient Multiplier for the end Y coordinate
+ */
+const swipeDown = async (
+	driver,
+	{ delay = 3000, endYCoefficient = 0.5 } = {}
+) => {
 	const size = await driver.getWindowSize();
 	const y = 0;
 
 	const startX = size.width / 2;
 	const startY = y + size.height / 3;
 	const endX = startX;
-	const endY = startY - startY * -1 * 0.5;
+	const endY = startY - startY * -1 * endYCoefficient;
 
 	await swipeFromTo(
 		driver,
@@ -717,6 +753,7 @@ module.exports = {
 	isElementVisible,
 	isLocalEnvironment,
 	launchApp,
+	longPressElement,
 	longPressMiddleOfElement,
 	selectTextFromElement,
 	setupDriver,
diff --git a/packages/react-native-editor/__device-tests__/pages/editor-page.js b/packages/react-native-editor/__device-tests__/pages/editor-page.js
index a19aaf5445d79f..77f4a700b11370 100644
--- a/packages/react-native-editor/__device-tests__/pages/editor-page.js
+++ b/packages/react-native-editor/__device-tests__/pages/editor-page.js
@@ -15,6 +15,8 @@ const {
 	clickIfClickable,
 	launchApp,
 	tapStatusBariOS,
+	longPressElement,
+	longPressMiddleOfElement,
 } = require( '../helpers/utils' );
 
 const ADD_BLOCK_ID = isAndroid() ? 'Add block' : 'add-block-button';
@@ -45,8 +47,18 @@ class EditorPage {
 		}
 	}
 
-	async initializeEditor( { initialData, rawStyles, rawFeatures } = {} ) {
-		await launchApp( this.driver, { initialData, rawStyles, rawFeatures } );
+	async initializeEditor( {
+		initialTitle,
+		initialData,
+		rawStyles,
+		rawFeatures,
+	} = {} ) {
+		await launchApp( this.driver, {
+			initialTitle,
+			initialData,
+			rawStyles,
+			rawFeatures,
+		} );
 
 		// Stores initial values from the editor for different helpers.
 		const addButton = await this.driver.$$( `~${ ADD_BLOCK_ID }` );
@@ -72,9 +84,13 @@ class EditorPage {
 	// Text blocks functions
 	// E.g. Paragraph, Heading blocks
 	// ===============================
-	async getTextBlockAtPosition( blockName, position = 1 ) {
+	async getTextBlockAtPosition(
+		blockName,
+		position = 1,
+		skipWrapperClick = false
+	) {
 		// iOS needs a click to get the text element
-		if ( ! isAndroid() ) {
+		if ( ! isAndroid() && ! skipWrapperClick ) {
 			const textBlockLocator = `(//XCUIElementTypeButton[contains(@name, "${ blockName } Block. Row ${ position }")])`;
 
 			await clickIfClickable( this.driver, textBlockLocator );
@@ -91,6 +107,57 @@ class EditorPage {
 		await typeString( this.driver, block, text, clear );
 	}
 
+	async typeKeyString( inputString ) {
+		const actions = this.driver.action( 'key' );
+
+		for ( const char of inputString ) {
+			await actions.down( char ).up( char );
+		}
+
+		await actions.perform();
+	}
+
+	async pasteClipboardToTextBlock( element, { timeout = 1000 } = {} ) {
+		if ( this.driver.isAndroid ) {
+			await longPressMiddleOfElement( this.driver, element );
+		} else {
+			await longPressElement( this.driver, element );
+		}
+
+		if ( this.driver.isAndroid ) {
+			// Long pressing seemingly results in drag-and-drop blurring the input, so
+			// we tap again to re-focus the input.
+			await this.driver
+				.action( 'pointer', {
+					parameters: { pointerType: 'touch' },
+				} )
+				.move( { origin: element } )
+				.down()
+				.up()
+				.perform();
+
+			const location = await element.getLocation();
+			const approximatePasteMenuLocation = {
+				x: location.x + 30,
+				y: location.y - 120,
+			};
+			await this.driver
+				.action( 'pointer', {
+					parameters: { pointerType: 'touch' },
+				} )
+				.move( approximatePasteMenuLocation )
+				.down()
+				.up()
+				.perform();
+		} else {
+			const pasteMenuItem = await this.driver.$(
+				'//XCUIElementTypeMenuItem[@name="Paste"]'
+			);
+			await pasteMenuItem.waitForDisplayed( { timeout } );
+			await pasteMenuItem.click();
+		}
+	}
+
 	// Finds the wd element for new block that was added and sets the element attribute
 	// and accessibilityId attributes on this object and selects the block
 	// position uses one based numbering.
@@ -148,6 +215,36 @@ class EditorPage {
 		return lastElementFound;
 	}
 
+	/**
+	 * Selects a block.
+	 *
+	 * @param {import('webdriverio').ChainablePromiseElement} block                           The block to select.
+	 * @param {Object}                                        options                         Configuration options.
+	 * @param {Object}                                        [options.offset={ x: 0, y: 0 }] The offset for the click position.
+	 * @param {number|Function}                               [options.offset.x=0]            The x-coordinate offset or a function that calculates the offset based on the block's width.
+	 * @param {number|Function}                               [options.offset.y=0]            The y-coordinate offset or a function that calculates the offset based on the block's height.
+	 *
+	 * @return {import('webdriverio').ChainablePromiseElement} The selected block.
+	 */
+	async selectBlock( block, options = {} ) {
+		const { offset = { x: 0, y: 0 } } = options;
+		const size = await block.getSize();
+
+		let offsetX = offset.x;
+		if ( typeof offset.x === 'function' ) {
+			offsetX = offset.x( size.width );
+		}
+
+		let offsetY = offset.y;
+		if ( typeof offset.y === 'function' ) {
+			offsetY = offset.y( size.height );
+		}
+
+		await block.click( { x: offsetX, y: offsetY } );
+
+		return block;
+	}
+
 	async getFirstBlockVisible() {
 		const firstBlockLocator = `//*[contains(@${ this.accessibilityIdXPathAttrib }, " Block. Row ")]`;
 		return await waitForVisible( this.driver, firstBlockLocator );
@@ -171,19 +268,30 @@ class EditorPage {
 	}
 
 	async addParagraphBlockByTappingEmptyAreaBelowLastBlock() {
-		const emptyAreaBelowLastBlock =
-			await this.driver.elementByAccessibilityId( 'Add paragraph block' );
+		const element = isAndroid()
+			? '~Add paragraph block'
+			: '(//XCUIElementTypeOther[@name="Add paragraph block"])';
+		const emptyAreaBelowLastBlock = await this.driver.$( element );
 		await emptyAreaBelowLastBlock.click();
 	}
 
-	async getTitleElement( options = { autoscroll: false } ) {
+	async getDefaultBlockAppenderElement() {
+		const appenderElement = isAndroid()
+			? `//android.widget.EditText[@text='Start writing…']`
+			: '(//XCUIElementTypeOther[contains(@name, "Start writing…")])[2]';
+		return this.driver.$( appenderElement );
+	}
+
+	async getTitleElement( options = { autoscroll: false, isEmpty: false } ) {
 		const titleElement = isAndroid()
-			? 'Post title. Welcome to Gutenberg!'
+			? `Post title. ${
+					options.isEmpty ? 'Empty' : 'Welcome to Gutenberg!'
+			  }`
 			: 'post-title';
 
 		if ( options.autoscroll ) {
 			if ( isAndroid() ) {
-				await swipeDown( this.driver );
+				await swipeDown( this.driver, { endYCoefficient: 2 } );
 			} else {
 				await tapStatusBariOS( this.driver );
 			}
@@ -200,6 +308,18 @@ class EditorPage {
 		return elements[ 0 ];
 	}
 
+	async getEmptyTitleTextInputElement() {
+		const titleWrapperElement = await this.getTitleElement( {
+			isEmpty: true,
+		} );
+		await titleWrapperElement.click();
+
+		const titleElement = isAndroid()
+			? '//android.widget.EditText[@content-desc="Post title. Empty"]'
+			: '~Add title';
+		return this.driver.$( titleElement );
+	}
+
 	// iOS loads the block list more eagerly compared to Android.
 	// This makes this function return elements without scrolling on iOS.
 	// So we are keeping this Android only.
@@ -208,7 +328,10 @@ class EditorPage {
 			`//*[contains(@${ this.accessibilityIdXPathAttrib }, "${ accessibilityLabel }")]`
 		);
 		if ( elements.length === 0 ) {
-			await swipeUp( this.driver, undefined, 100, 1 );
+			await swipeUp( this.driver, undefined, {
+				delay: 100,
+				endYCoefficient: 1,
+			} );
 			return this.androidScrollAndReturnElement( accessibilityLabel );
 		}
 		return elements[ elements.length - 1 ];
@@ -221,7 +344,10 @@ class EditorPage {
 		const elements = await this.driver.$$( `~${ id }` );
 
 		if ( elements.length === 0 ) {
-			await swipeUp( this.driver, undefined, 100, 1 );
+			await swipeUp( this.driver, undefined, {
+				delay: 100,
+				endYCoefficient: 1,
+			} );
 			return this.scrollAndReturnElementByAccessibilityId( id );
 		}
 		return elements[ elements.length - 1 ];
@@ -370,10 +496,14 @@ class EditorPage {
 		await settingsButton.click();
 	}
 
-	async removeBlock() {
-		const blockActionsButtonElement = isAndroid()
+	getBlockActionsMenuElement() {
+		return isAndroid()
 			? '//android.widget.Button[contains(@content-desc, "Open Block Actions Menu")]'
 			: '//XCUIElementTypeButton[@name="Open Block Actions Menu"]';
+	}
+
+	async removeBlock() {
+		const blockActionsButtonElement = this.getBlockActionsMenuElement();
 		const blockActionsMenu = await this.swipeToolbarToElement(
 			blockActionsButtonElement
 		);
@@ -391,6 +521,12 @@ class EditorPage {
 		return await swipeDown( this.driver );
 	}
 
+	async isBlockActionsMenuButtonDisplayed() {
+		const menuButtonElement = this.getBlockActionsMenuElement();
+		const elementsFound = await this.driver.$$( menuButtonElement );
+		return elementsFound.length !== 0;
+	}
+
 	// =========================
 	// Block toolbar functions
 	// =========================
@@ -406,8 +542,6 @@ class EditorPage {
 				swipeRight: true,
 			} );
 			await addButton[ 0 ].click();
-			// Wait for Bottom sheet animation to finish
-			await this.driver.pause( 3000 );
 		}
 
 		// Click on block of choice.
@@ -425,10 +559,9 @@ class EditorPage {
 		const inserterElement = isAndroid()
 			? 'Blocks menu'
 			: 'InserterUI-Blocks';
-		return await this.waitForElementToBeDisplayedById(
-			inserterElement,
-			4000
-		);
+		await this.driver
+			.$( `~${ inserterElement }` )
+			.waitForDisplayed( { timeout: 4000 } );
 	}
 
 	static async isElementOutOfBounds( element, { width, height } = {} ) {
@@ -581,46 +714,6 @@ class EditorPage {
 		await moveDownButton.click();
 	}
 
-	// Position of the block to remove
-	// Block will no longer be present if this succeeds.
-	async removeBlockAtPosition( blockName = '', position = 1 ) {
-		if ( ! ( await this.hasBlockAtPosition( position, blockName ) ) ) {
-			throw Error( `No Block at position ${ position }` );
-		}
-
-		const buttonElementName = isAndroid()
-			? '//*'
-			: '//XCUIElementTypeButton';
-		const blockActionsMenuButtonIdentifier = `Open Block Actions Menu`;
-		const blockActionsMenuButtonLocator = `${ buttonElementName }[contains(@${ this.accessibilityIdXPathAttrib }, "${ blockActionsMenuButtonIdentifier }")]`;
-		if ( isAndroid() ) {
-			const block = await this.getBlockAtPosition( blockName, position );
-			let checkList = await this.driver.$$(
-				blockActionsMenuButtonLocator
-			);
-			while ( checkList.length === 0 ) {
-				await swipeUp( this.driver, block ); // Swipe up to show remove icon at the bottom.
-				checkList = await this.driver.$$(
-					blockActionsMenuButtonLocator
-				);
-			}
-		}
-
-		const blockActionsMenuButton = await waitForVisible(
-			this.driver,
-			blockActionsMenuButtonLocator
-		);
-		await blockActionsMenuButton.click();
-		const removeActionButtonIdentifier = 'Remove block';
-		const removeActionButtonLocator = `${ buttonElementName }[contains(@${ this.accessibilityIdXPathAttrib }, "${ removeActionButtonIdentifier }")]`;
-		const removeActionButton = await waitForVisible(
-			this.driver,
-			removeActionButtonLocator
-		);
-
-		await removeActionButton.click();
-	}
-
 	// =========================
 	// Formatting toolbar functions
 	// =========================
@@ -641,6 +734,22 @@ class EditorPage {
 		await element.click();
 	}
 
+	async toggleHighlightColor( color ) {
+		await this.toggleFormatting( 'Text color' );
+		let element = `~${ color }`;
+
+		if ( ! color ) {
+			element = isAndroid()
+				? '~Clear selected color'
+				: '(//XCUIElementTypeOther[@name="Clear selected color"])[2]';
+		}
+
+		await this.driver.waitUntil( this.driver.$( element ).isDisplayed );
+		const button = await this.driver.$( element );
+		await button.click();
+		await this.dismissBottomSheet();
+	}
+
 	// =========================
 	// Paragraph Block functions
 	// =========================
@@ -787,13 +896,25 @@ class EditorPage {
 		await clickIfClickable( this.driver, mediaLibraryLocator );
 	}
 
+	async getImageBlockCaptionButton() {
+		const captionElement = isAndroid()
+			? '//android.widget.Button[starts-with(@content-desc, "Image caption")]'
+			: '//XCUIElementTypeButton[starts-with(@name, "Image caption.")]';
+		return this.driver.$( captionElement );
+	}
+
+	async getImageBlockCaptionInput( imageBlockCaptionButton ) {
+		const captionInputElement = isAndroid()
+			? '//android.widget.EditText'
+			: '//XCUIElementTypeTextView';
+		return imageBlockCaptionButton.$( captionInputElement );
+	}
+
 	async enterCaptionToSelectedImageBlock( caption, clear = true ) {
-		const imageBlockCaptionButton = await this.driver.$(
-			'//XCUIElementTypeButton[starts-with(@name, "Image caption.")]'
-		);
+		const imageBlockCaptionButton = await this.getImageBlockCaptionButton();
 		await imageBlockCaptionButton.click();
-		const imageBlockCaptionField = await imageBlockCaptionButton.$(
-			'//XCUIElementTypeTextView'
+		const imageBlockCaptionField = await this.getImageBlockCaptionInput(
+			imageBlockCaptionButton
 		);
 		await typeString( this.driver, imageBlockCaptionField, caption, clear );
 	}
@@ -814,6 +935,16 @@ class EditorPage {
 			.perform();
 	}
 
+	async isImageBlockSelected() {
+		// Since there isn't an easy way to see if a block is selected,
+		// it will check if the edit image button is visible
+		const editImageElement = isAndroid()
+			? '(//android.widget.Button[@content-desc="Edit image"])'
+			: '(//XCUIElementTypeButton[@name="Edit image"])';
+
+		return await this.driver.$( editImageElement ).isDisplayed();
+	}
+
 	// =============================
 	// Search Block functions
 	// =============================
@@ -947,7 +1078,7 @@ class EditorPage {
 	async addButtonWithInlineAppender( position = 1 ) {
 		const appenderButton = isAndroid()
 			? await this.waitForElementToBeDisplayedByXPath(
-					`//android.widget.Button[@content-desc="Buttons Block. Row 1"]/android.view.ViewGroup/android.view.ViewGroup[1]/android.view.ViewGroup/android.view.ViewGroup/android.view.ViewGroup[${ position }]/android.view.ViewGroup/android.widget.Button`
+					`//android.widget.Button[@content-desc="Buttons Block. Row 1"]/android.view.ViewGroup/android.view.ViewGroup[1]/android.widget.Button[${ position }]`
 			  )
 			: await this.waitForElementToBeDisplayedById( 'appender-button' );
 		await appenderButton.click();
@@ -1001,6 +1132,8 @@ const blockNames = {
 	button: 'Button',
 	preformatted: 'Preformatted',
 	unsupported: 'Unsupported',
+	mediaText: 'Media & Text',
+	quote: 'Quote',
 };
 
 module.exports = { setupEditor, blockNames };
diff --git a/packages/react-native-editor/android/app/build.gradle b/packages/react-native-editor/android/app/build.gradle
index ecb63589bcf1c4..09da2a438eae1d 100644
--- a/packages/react-native-editor/android/app/build.gradle
+++ b/packages/react-native-editor/android/app/build.gradle
@@ -1,17 +1,16 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 apply from: "../../../react-native-bridge/android/extractPackageVersion.gradle"
 
-import com.android.build.OutputFile
-
 react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
     root = file("../../../../")
     //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
     // reactNativeDir = file("../../../../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
-    // codegenDir = file("../node_modules/react-native-codegen")
+    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
+    // codegenDir = file("../node_modules/@react-native/codegen")
     //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
     // cliFile = file("../node_modules/react-native/cli.js")
     /* Variants */
@@ -46,29 +45,11 @@ react {
     // hermesFlags = ["-O", "-output-source-map"]
 }
 
-/**
- * Set this to true to create four separate APKs instead of one,
- * one for each native architecture. This is useful if you don't
- * use App Bundles (https://developer.android.com/guide/app-bundle/)
- * and want to have separate APKs to upload to the Play Store.
- */
-def enableSeparateBuildPerCPUArchitecture = false
-
 /**
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
 def enableProguardInReleaseBuilds = false
 
-/**
- * Private function to get the list of Native Architectures you want to build.
- * This reads the value from reactNativeArchitectures in your gradle.properties
- * file and works together with the --active-arch-only flag of react-native run-android.
- */
-def reactNativeArchitectures() {
-    def value = project.getProperties().get("reactNativeArchitectures")
-    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
 android {
     // IMPORTANT: Any updates to the namespace should be reflected in
     // the `package` attribute of the main `AndroidManifest.xml` file.
@@ -76,11 +57,12 @@ android {
     namespace "com.gutenberg"
     ndkVersion rootProject.ext.ndkVersion
 
+    buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     buildFeatures {
@@ -95,34 +77,12 @@ android {
         versionName "1.0"
     }
 
-    splits {
-        abi {
-            reset()
-            enable enableSeparateBuildPerCPUArchitecture
-            universalApk false  // If true, also generate a universal APK
-            include (*reactNativeArchitectures())
-        }
-    }
     buildTypes {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
-    // applicationVariants are e.g. debug, release
-    applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            // For each separate APK per architecture, set a unique version code as described here:
-            // https://developer.android.com/studio/build/configure-apk-splits.html
-            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
-            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
-            def abi = output.getFilter(OutputFile.ABI)
-            if (abi != null) {  // null for the universal-debug, universal-release variants
-                output.versionCodeOverride =
-                        defaultConfig.versionCode * 1000 + versionCodes.get(abi)
-            }
-        }
-    }
 
     packagingOptions {
         pickFirst 'META-INF/-no-jdk.kotlin_module'
@@ -132,21 +92,21 @@ android {
 dependencies {
     def packageJson = '../../package.json'
 
-    implementation "org.wordpress-mobile.gutenberg-mobile:react-native-bridge"
+    implementation "org.wordpress.gutenberg-mobile:react-native-bridge"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "com.google.android.material:material:1.9.0"
+    implementation "androidx.core:core-ktx:1.10.0"
     // The version of react-native is set by the React Native Gradle Plugin
     implementation "com.facebook.react:react-android"
-
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation("com.facebook.react:flipper-integration")
 
     implementation "com.github.wordpress-mobile:react-native-video:${extractPackageVersion(packageJson, 'react-native-video', 'dependencies')}"
     implementation "com.github.wordpress-mobile:react-native-slider:${extractPackageVersion(packageJson, '@react-native-community/slider', 'dependencies')}"
 
     // Published by `wordpress-mobile/react-native-libraries-publisher`
     // See the documentation for this value in `build.gradle.kts` of `wordpress-mobile/react-native-libraries-publisher`
-    def reactNativeLibrariesPublisherVersion = "v3"
-    def reactNativeLibrariesGroupId = "org.wordpress-mobile.react-native-libraries.$reactNativeLibrariesPublisherVersion"
+    def reactNativeLibrariesPublisherVersion = "v6"
+    def reactNativeLibrariesGroupId = "org.wordpress.react-native-libraries.$reactNativeLibrariesPublisherVersion"
     implementation "$reactNativeLibrariesGroupId:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}"
     implementation "$reactNativeLibrariesGroupId:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}"
     implementation "$reactNativeLibrariesGroupId:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}"
@@ -161,13 +121,8 @@ dependencies {
 
     // The version of react-native is set by the React Native Gradle Plugin
     implementation "com.facebook.react:hermes-android"
-
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
 }
 
-
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
@@ -175,3 +130,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
     into 'libs'
 }
 
+apply from: file("../../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
\ No newline at end of file
diff --git a/packages/react-native-editor/android/app/src/debug/AndroidManifest.xml b/packages/react-native-editor/android/app/src/debug/AndroidManifest.xml
index 150f7cd0cc14db..62d7d130c6b317 100644
--- a/packages/react-native-editor/android/app/src/debug/AndroidManifest.xml
+++ b/packages/react-native-editor/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application android:networkSecurityConfig="@xml/react_native_config">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning"/>
+</manifest>
\ No newline at end of file
diff --git a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainActivity.java b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainActivity.java
deleted file mode 100644
index 69985317ddad33..00000000000000
--- a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainActivity.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package com.gutenberg;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
-
-import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactRootView;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.wordpress.mobile.WPAndroidGlue.GutenbergProps;
-
-import java.util.Locale;
-
-public class MainActivity extends ReactActivity {
-    private static MainActivity currentInstance;
-
-    private ReactRootView mReactRootView;
-    private Menu mMenu;
-
-    private static final String EXTRAS_INITIAL_PROPS = "initialProps";
-
-    private void openReactNativeDebugMenu() {
-        ReactInstanceManager devSettingsModule = getReactInstanceManager();
-        if (devSettingsModule != null) {
-            devSettingsModule.showDevOptionsDialog();
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        mMenu = menu;
-        getMenuInflater().inflate(R.menu.toolbar_menu, menu);
-
-        // Set opacity for menu items
-        MenuItem undoItem = menu.findItem(R.id.menuUndo);
-        undoItem.getIcon().setAlpha(76);
-        undoItem.setEnabled(false);
-
-        MenuItem redoItem = menu.findItem(R.id.menuRedo);
-        redoItem.getIcon().setAlpha(76);
-        redoItem.setEnabled(false);
-        return true;
-    }
-
-    public void updateUndoItem(boolean isDisabled) {
-        if (mMenu != null) {
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    MenuItem undoItem = mMenu.findItem(R.id.menuUndo);
-
-                    undoItem.setEnabled(!isDisabled);
-                    undoItem.getIcon().setAlpha(!isDisabled ? 255 : 76);
-                }
-            });
-        }
-    }
-
-    public void updateRedoItem(boolean isDisabled) {
-        if (mMenu != null) {
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    MenuItem redoItem = mMenu.findItem(R.id.menuRedo);
-
-                    redoItem.setEnabled(!isDisabled);
-                    redoItem.getIcon().setAlpha(!isDisabled ? 255 : 76);
-                }
-            });
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        MainApplication mainApplication = (MainApplication) getApplication();
-
-        int itemId = item.getItemId();
-        if (itemId == R.id.menuUndo) {
-            mainApplication.toggleUndo();
-            return true;
-        }
-        if (itemId == R.id.menuRedo) {
-            mainApplication.toggleRedo();
-            return true;
-        }
-        if (itemId == R.id.menuButton) {
-            openReactNativeDebugMenu();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    public static MainActivity getInstance() {
-        return currentInstance;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        currentInstance = this;
-
-        // Create a LinearLayout that will hold both the toolbar and React Native content
-        LinearLayout linearLayout = new LinearLayout(this);
-        linearLayout.setOrientation(LinearLayout.VERTICAL);
-        linearLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-
-        // Create a Toolbar instance
-        Toolbar toolbar = new Toolbar(this);
-
-        // Set toolbar properties (you can customize this as you want)
-        toolbar.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-        // Set the toolbar as the Activity's action bar
-        setSupportActionBar(toolbar);
-
-        // Add the toolbar to the linear layout
-        linearLayout.addView(toolbar);
-
-        // Create a View to be used as the border
-        View borderView = new View(this);
-        borderView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1));
-        borderView.setBackgroundColor(ContextCompat.getColor(this, R.color.toolbarBorder));
-
-        // Add the border view to the linear layout
-        linearLayout.addView(borderView);
-
-        // Create a ReactRootView and assign it to mReactRootView
-        mReactRootView = new ReactRootView(this);
-        LinearLayout.LayoutParams reactViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1);
-        mReactRootView.setLayoutParams(reactViewParams);
-
-        // Add ReactView to the linear layout
-        linearLayout.addView(mReactRootView);
-
-        // Set the linear layout as the content view
-        setContentView(linearLayout);
-
-        // Load the React application
-        mReactRootView.startReactApplication(
-                ((MainApplication) getApplication()).getReactNativeHost().getReactInstanceManager(),
-                getMainComponentName(),
-                getAppOptions()
-        );
-    }
-
-    /**
-     * Returns the name of the main component registered from JavaScript.
-     * This is used to schedule rendering of the component.
-     */
-    @Override
-    protected String getMainComponentName() {
-        return "gutenberg";
-    }
-
-    private Bundle getAppOptions() {
-        Bundle bundle = new Bundle();
-
-        // Parse initial props from launch arguments
-        String initialData = null;
-        String rawStyles = null;
-        String rawFeatures = null;
-        Bundle extrasBundle = getIntent().getExtras();
-
-        if(extrasBundle != null) {
-            String initialProps = extrasBundle.getString(EXTRAS_INITIAL_PROPS, "{}");
-            try {
-                JSONObject jsonObject = new JSONObject(initialProps);
-                if (jsonObject.has(GutenbergProps.PROP_INITIAL_DATA)) {
-                    initialData = jsonObject.getString(GutenbergProps.PROP_INITIAL_DATA);
-                }
-                if (jsonObject.has(GutenbergProps.PROP_STYLES)) {
-                    rawStyles = jsonObject.getString(GutenbergProps.PROP_STYLES);
-                }
-                if (jsonObject.has(GutenbergProps.PROP_FEATURES)) {
-                    rawFeatures = jsonObject.getString(GutenbergProps.PROP_FEATURES);
-                }
-            } catch (final JSONException e) {
-                Log.e("MainActivity", "Json parsing error: " + e.getMessage());
-            }
-        }
-
-        // Add locale
-        String languageString = Locale.getDefault().toString();
-        String localeSlug = languageString.replace("_", "-").toLowerCase(Locale.ENGLISH);
-        bundle.putString(GutenbergProps.PROP_LOCALE, localeSlug);
-
-        // Add capabilities
-        Bundle capabilities = new Bundle();
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_MENTIONS, true);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_XPOSTS, true);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_UNSUPPORTED_BLOCK_EDITOR, true);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_REUSABLE_BLOCK, false);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_IS_AUDIO_BLOCK_MEDIA_UPLOAD_ENABLED, true);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_TILED_GALLERY_BLOCK, true);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_VIDEOPRESS_BLOCK, true);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_FACEBOOK_EMBED_BLOCK, true);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_INSTAGRAM_EMBED_BLOCK, true);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_LOOM_EMBED_BLOCK, true);
-        capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_SMARTFRAME_EMBED_BLOCK, true);
-        bundle.putBundle(GutenbergProps.PROP_CAPABILITIES, capabilities);
-
-        if(initialData != null) {
-            bundle.putString(GutenbergProps.PROP_INITIAL_DATA, initialData);
-        }
-        if(rawStyles != null) {
-            bundle.putString(GutenbergProps.PROP_STYLES, rawStyles);
-        }
-        if(rawFeatures != null) {
-            bundle.putString(GutenbergProps.PROP_FEATURES, rawFeatures);
-        }
-
-        return bundle;
-    }
-}
diff --git a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainActivity.kt b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainActivity.kt
new file mode 100644
index 00000000000000..142122ed6a7e06
--- /dev/null
+++ b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainActivity.kt
@@ -0,0 +1,208 @@
+package com.gutenberg
+
+import android.os.Bundle
+import android.util.Log
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactRootView
+import org.json.JSONException
+import org.json.JSONObject
+import org.wordpress.mobile.WPAndroidGlue.GutenbergProps
+import java.util.Locale
+
+class MainActivity : ReactActivity() {
+    private var mReactRootView: ReactRootView? = null
+    private var mMenu: Menu? = null
+    private fun openReactNativeDebugMenu() {
+        val devSettingsModule = reactInstanceManager
+        devSettingsModule?.showDevOptionsDialog()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        mMenu = menu
+        menuInflater.inflate(R.menu.toolbar_menu, menu)
+
+        // Set opacity for menu items
+        val undoItem = menu.findItem(R.id.menuUndo)
+        undoItem.icon!!.alpha = 76
+        undoItem.setEnabled(false)
+        val redoItem = menu.findItem(R.id.menuRedo)
+        redoItem.icon!!.alpha = 76
+        redoItem.setEnabled(false)
+        return true
+    }
+
+    fun updateUndoItem(isDisabled: Boolean) {
+        if (mMenu != null) {
+            runOnUiThread {
+                val undoItem = mMenu!!.findItem(R.id.menuUndo)
+                undoItem.setEnabled(!isDisabled)
+                undoItem.icon!!.alpha = if (!isDisabled) 255 else 76
+            }
+        }
+    }
+
+    fun updateRedoItem(isDisabled: Boolean) {
+        if (mMenu != null) {
+            runOnUiThread {
+                val redoItem = mMenu!!.findItem(R.id.menuRedo)
+                redoItem.setEnabled(!isDisabled)
+                redoItem.icon!!.alpha = if (!isDisabled) 255 else 76
+            }
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val mainApplication = application as MainApplication
+        val itemId = item.itemId
+        if (itemId == R.id.menuUndo) {
+            mainApplication.toggleUndo()
+            return true
+        }
+        if (itemId == R.id.menuRedo) {
+            mainApplication.toggleRedo()
+            return true
+        }
+        if (itemId == R.id.menuButton) {
+            openReactNativeDebugMenu()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        instance = this
+
+        // Create a LinearLayout that will hold both the toolbar and React Native content
+        val linearLayout = LinearLayout(this)
+        linearLayout.orientation = LinearLayout.VERTICAL
+        linearLayout.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        linearLayout.isFocusable = false
+        linearLayout.isFocusableInTouchMode = true
+
+        // Create a Toolbar instance
+        val toolbar = Toolbar(this)
+
+        // Set toolbar properties (you can customize this as you want)
+        toolbar.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+
+        // Set the toolbar as the Activity's action bar
+        setSupportActionBar(toolbar)
+
+        // Add the toolbar to the linear layout
+        linearLayout.addView(toolbar)
+
+        // Create a View to be used as the border
+        val borderView = View(this)
+        borderView.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1)
+        borderView.setBackgroundColor(ContextCompat.getColor(this, R.color.toolbarBorder))
+
+        // Add the border view to the linear layout
+        linearLayout.addView(borderView)
+
+        // Create a ReactRootView and assign it to mReactRootView
+        mReactRootView = ReactRootView(this)
+        val reactViewParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f)
+        mReactRootView!!.layoutParams = reactViewParams
+
+        // Add ReactView to the linear layout
+        linearLayout.addView(mReactRootView)
+
+        // Set the linear layout as the content view
+        setContentView(linearLayout)
+
+        // Load the React application
+        mReactRootView!!.startReactApplication(
+                (application as MainApplication).reactNativeHost.reactInstanceManager,
+                mainComponentName,
+                appOptions
+        )
+    }
+
+    /**
+     * Returns the name of the main component registered from JavaScript.
+     * This is used to schedule rendering of the component.
+     */
+    override fun getMainComponentName(): String {
+        return "gutenberg"
+    }
+
+    private val appOptions: Bundle
+        get() {
+            val bundle = Bundle()
+
+            // Parse initial props from launch arguments
+            var initialTitle: String? = null
+            var initialData: String? = null
+            var rawStyles: String? = null
+            var rawFeatures: String? = null
+            val extrasBundle = intent.extras
+            if (extrasBundle != null) {
+                val initialProps = extrasBundle.getString(EXTRAS_INITIAL_PROPS, "{}")
+                try {
+                    val jsonObject = JSONObject(initialProps)
+                    if (jsonObject.has(GutenbergProps.PROP_INITIAL_TITLE)) {
+                        initialTitle = jsonObject.getString(GutenbergProps.PROP_INITIAL_TITLE)
+                    }
+                    if (jsonObject.has(GutenbergProps.PROP_INITIAL_DATA)) {
+                        initialData = jsonObject.getString(GutenbergProps.PROP_INITIAL_DATA)
+                    }
+                    if (jsonObject.has(GutenbergProps.PROP_STYLES)) {
+                        rawStyles = jsonObject.getString(GutenbergProps.PROP_STYLES)
+                    }
+                    if (jsonObject.has(GutenbergProps.PROP_FEATURES)) {
+                        rawFeatures = jsonObject.getString(GutenbergProps.PROP_FEATURES)
+                    }
+                } catch (e: JSONException) {
+                    Log.e("MainActivity", "Json parsing error: " + e.message)
+                }
+            }
+
+            // Add locale
+            val languageString = Locale.getDefault().toString()
+            val localeSlug = languageString.replace("_", "-").lowercase()
+            bundle.putString(GutenbergProps.PROP_LOCALE, localeSlug)
+
+            // Add capabilities
+            val capabilities = Bundle()
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_MENTIONS, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_XPOSTS, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_UNSUPPORTED_BLOCK_EDITOR, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_REUSABLE_BLOCK, false)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_IS_AUDIO_BLOCK_MEDIA_UPLOAD_ENABLED, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_TILED_GALLERY_BLOCK, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_VIDEOPRESS_BLOCK, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_VIDEOPRESS_V5_SUPPORT, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_FACEBOOK_EMBED_BLOCK, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_INSTAGRAM_EMBED_BLOCK, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_LOOM_EMBED_BLOCK, true)
+            capabilities.putBoolean(GutenbergProps.PROP_CAPABILITIES_SMARTFRAME_EMBED_BLOCK, true)
+            bundle.putBundle(GutenbergProps.PROP_CAPABILITIES, capabilities)
+            if (initialTitle != null) {
+                bundle.putString(GutenbergProps.PROP_INITIAL_TITLE, initialTitle)
+            }
+            if (initialData != null) {
+                bundle.putString(GutenbergProps.PROP_INITIAL_DATA, initialData)
+            }
+            if (rawStyles != null) {
+                bundle.putString(GutenbergProps.PROP_STYLES, rawStyles)
+            }
+            if (rawFeatures != null) {
+                bundle.putString(GutenbergProps.PROP_FEATURES, rawFeatures)
+            }
+            return bundle
+        }
+
+    companion object {
+        var instance: MainActivity? = null
+            private set
+        private const val EXTRAS_INITIAL_PROPS = "initialProps"
+    }
+}
diff --git a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java
deleted file mode 100644
index d718b34f25db3b..00000000000000
--- a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java
+++ /dev/null
@@ -1,428 +0,0 @@
-package com.gutenberg;
-
-import android.app.Application;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.Toast;
-
-import androidx.core.util.Consumer;
-
-import com.facebook.react.ReactApplication;
-import com.BV.LinearGradient.LinearGradientPackage;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.reactnativecommunity.clipboard.ClipboardPackage;
-import com.reactnativecommunity.slider.ReactSliderPackage;
-import com.brentvatne.react.ReactVideoPackage;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.devsupport.interfaces.DevOptionHandler;
-import com.facebook.react.devsupport.interfaces.DevSupportManager;
-import com.horcrux.svg.SvgPackage;
-import org.linusu.RNGetRandomValuesPackage;
-import com.dylanvann.fastimage.FastImageViewPackage;
-
-import org.wordpress.mobile.ReactNativeAztec.ReactAztecPackage;
-import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeInterface;
-import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent;
-import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergWebViewActivity;
-import org.wordpress.mobile.ReactNativeGutenbergBridge.RNMedia;
-import org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgePackage;
-
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactNativeHost;
-import com.facebook.react.shell.MainReactPackage;
-import com.facebook.soloader.SoLoader;
-import com.reactnativecommunity.webview.RNCWebViewPackage;
-import com.swmansion.gesturehandler.RNGestureHandlerPackage;
-import com.swmansion.reanimated.ReanimatedPackage;
-import com.swmansion.rnscreens.RNScreensPackage;
-import com.th3rdwave.safeareacontext.SafeAreaContextPackage;
-import org.reactnative.maskedview.RNCMaskedViewPackage;
-import org.wordpress.mobile.WPAndroidGlue.Media;
-import org.wordpress.mobile.WPAndroidGlue.MediaOption;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ArrayList;
-
-public class MainApplication extends Application implements ReactApplication, GutenbergBridgeInterface {
-
-    private static final String TAG = "MainApplication";
-
-    private ReactNativeHost mReactNativeHost;
-    private RNReactNativeGutenbergBridgePackage mRnReactNativeGutenbergBridgePackage;
-    private GutenbergBridgeJS2Parent.ReplaceUnsupportedBlockCallback mReplaceUnsupportedBlockCallback;
-
-    private ReactNativeHost createReactNativeHost() {
-        mRnReactNativeGutenbergBridgePackage = new RNReactNativeGutenbergBridgePackage(new GutenbergBridgeJS2Parent() {
-            @Override
-            public void responseHtml(String title, String html, boolean changed, ReadableMap contentInfo) {
-            }
-
-            @Override
-            public void requestMediaImport(String url, MediaSelectedCallback mediaSelectedCallback) {
-            }
-
-            @Override
-            public void requestMediaPickerFromDeviceCamera(MediaSelectedCallback mediaSelectedCallback, MediaType mediaType) {
-            }
-
-            @Override
-            public void requestMediaPickFromDeviceLibrary(MediaSelectedCallback mediaSelectedCallback, Boolean allowMultipleSelection, MediaType mediaType) {
-            }
-
-            @Override
-            public void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelectedCallback, Boolean allowMultipleSelection, MediaType mediaType) {
-                List<RNMedia> rnMediaList = new ArrayList<>();
-                WritableNativeMap emptyMetadata = new WritableNativeMap();
-
-                switch (mediaType) {
-                    case IMAGE:
-                        Media image = new Media(1, "https://cldup.com/cXyG__fTLN.jpg", "image", "Mountain", "", "A snow-capped mountain top in a cloudy sky with red-leafed trees in the foreground", emptyMetadata);
-                        rnMediaList.add(image);
-                        break;
-                    case VIDEO:
-                        WritableNativeMap metadata = new WritableNativeMap();
-                        metadata.putString("extraID", "AbCdE");
-                        Media video = new Media(2, "https://i.cloudup.com/YtZFJbuQCE.mov", "video", "Cloudup", "", "", metadata);
-                        rnMediaList.add(video);
-                        break;
-                    case ANY:
-                    case OTHER:
-                        Media other = new Media(3, "https://wordpress.org/latest.zip", "zip", "WordPress latest version", "WordPress.zip", "", emptyMetadata);
-                        rnMediaList.add(other);
-                        break;
-                    case AUDIO:
-                        Media audio = new Media(5, "https://cldup.com/59IrU0WJtq.mp3", "audio", "Summer presto", "", "", emptyMetadata);
-                        rnMediaList.add(audio);
-                        break;
-                }
-                mediaSelectedCallback.onMediaFileSelected(rnMediaList);
-            }
-
-
-            @Override
-            public void mediaUploadSync(MediaSelectedCallback mediaSelectedCallback) {
-            }
-
-            @Override
-            public void mediaSaveSync(MediaSelectedCallback mediaSelectedCallback) {
-            }
-
-            @Override
-            public void requestImageFailedRetryDialog(int mediaId) {
-            }
-
-            @Override
-            public void requestImageUploadCancelDialog(int mediaId) {
-            }
-
-            @Override
-            public void requestImageUploadCancel(int mediaId) {
-            }
-
-            @Override
-            public void setFeaturedImage(int mediaId) {
-            }
-
-            @Override
-            public void editorDidMount(ReadableArray unsupportedBlockNames) {
-            }
-
-            @Override
-            public void editorDidAutosave() {
-            }
-
-            @Override
-            public void getOtherMediaPickerOptions(OtherMediaOptionsReceivedCallback otherMediaOptionsReceivedCallback, MediaType mediaType) {
-                if (mediaType == MediaType.ANY) {
-                    ArrayList<MediaOption> mediaOptions = new ArrayList<>();
-                    mediaOptions.add(new MediaOption("1", "Choose from device"));
-                    otherMediaOptionsReceivedCallback.onOtherMediaOptionsReceived(mediaOptions);
-                }
-            }
-
-            @Override
-            public void requestMediaPickFrom(String mediaSource, MediaSelectedCallback mediaSelectedCallback, Boolean allowMultipleSelection) {
-                if (mediaSource.equals("1")) {
-                    List<RNMedia> rnMediaList = new ArrayList<>();
-                    Media pdf = new Media(1, "https://grad.illinois.edu/sites/default/files/pdfs/cvsamples.pdf", "other", "","cvsamples.pdf", "", new WritableNativeMap());
-                    rnMediaList.add(pdf);
-                    mediaSelectedCallback.onMediaFileSelected(rnMediaList);
-                }
-            }
-
-            @Override
-            public void requestImageFullscreenPreview(String mediaUrl) {
-
-            }
-
-            @Override
-            public void requestEmbedFullscreenPreview(String content, String title) {
-
-            }
-
-            @Override
-            public void requestMediaEditor(MediaSelectedCallback mediaSelectedCallback, String mediaUrl) {
-
-            }
-
-            @Override
-            public void setFocalPointPickerTooltipShown(boolean tooltipShown) {
-            }
-
-            @Override
-            public void requestFocalPointPickerTooltipShown(FocalPointPickerTooltipShownCallback focalPointPickerTooltipShownCallback) {
-                focalPointPickerTooltipShownCallback.onRequestFocalPointPickerTooltipShown(false);
-            }
-
-            @Override
-            public void editorDidEmitLog(String message, LogLevel logLevel) {
-                switch (logLevel) {
-                    case TRACE:
-                        Log.d(TAG, message);
-                        break;
-                    case INFO:
-                        Log.i(TAG, message);
-                        break;
-                    case WARN:
-                        Log.w(TAG, message);
-                        break;
-                    case ERROR:
-                        Log.e(TAG, message);
-                        break;
-                }
-            }
-
-            @Override
-            public void performGetRequest(String path, boolean enableCaching, Consumer<String> onSuccess, Consumer<Bundle> onError) {}
-
-            @Override
-            public void performPostRequest(String path, ReadableMap data, Consumer<String> onSuccess, Consumer<Bundle> onError) {}
-
-            @Override
-            public void gutenbergDidRequestUnsupportedBlockFallback(ReplaceUnsupportedBlockCallback replaceUnsupportedBlockCallback,
-                                                                    String content,
-                                                                    String blockId,
-                                                                    String blockName,
-                                                                    String blockTitle) {
-                mReplaceUnsupportedBlockCallback = replaceUnsupportedBlockCallback;
-                openGutenbergWebView(content, blockId, blockTitle);
-            }
-
-            @Override
-            public void onShowUserSuggestions(Consumer<String> onResult) {
-                onResult.accept("matt");
-            }
-
-            @Override
-            public void onShowXpostSuggestions(Consumer<String> onResult) {
-                onResult.accept("ma.tt");
-            }
-
-            @Override
-            public void requestMediaFilesEditorLoad(
-                    ReadableArray mediaFiles,
-                    String blockId
-            ) {
-                Toast.makeText(MainApplication.this, "requestMediaFilesEditorLoad called", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void requestMediaFilesFailedRetryDialog(ReadableArray mediaFiles) {
-                Toast.makeText(MainApplication.this, "requestMediaFilesFailedRetryDialog called", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void requestMediaFilesUploadCancelDialog(ReadableArray mediaFiles) {
-                Toast.makeText(MainApplication.this, "requestMediaFilesUploadCancelDialog called", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void requestMediaFilesSaveCancelDialog(ReadableArray mediaFiles) {
-                Toast.makeText(MainApplication.this, "requestMediaFilesSaveCancelDialog called", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void mediaFilesBlockReplaceSync(
-                    ReadableArray mediaFiles,
-                    String blockId
-            ) {
-                Toast.makeText(MainApplication.this, "mediaFilesBlockReplaceSync called", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void gutenbergDidSendButtonPressedAction(String buttonType) {
-
-            }
-
-            @Override
-            public void requestPreview() {
-                Toast.makeText(MainApplication.this, "requestPreview called", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void requestBlockTypeImpressions(BlockTypeImpressionsCallback blockTypeImpressionsCallback) {
-                ReadableMap impressions = Arguments.createMap();
-                blockTypeImpressionsCallback.onRequestBlockTypeImpressions(impressions);
-            }
-
-            @Override
-            public void setBlockTypeImpressions(ReadableMap impressions) {
-                Log.d("BlockTypeImpressions", String.format("Gutenberg requested setting block type impression to %s.", impressions));
-            }
-
-            @Override
-            public void requestContactCustomerSupport() {
-                Toast.makeText(MainApplication.this, "requestContactCustomerSupport called", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void requestGotoCustomerSupportOptions() {
-                Toast.makeText(MainApplication.this, "requestGotoCustomerSupportOptions called", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void sendEventToHost(final String eventName, final ReadableMap properties) {
-                Log.d("SendEventToHost", String.format("Gutenberg requested sending '%s' event to host with properties: %s", eventName, properties));
-            }
-
-            @Override
-            public void toggleUndoButton(boolean isDisabled) {
-                MainActivity mainActivity = MainActivity.getInstance();
-                if (mainActivity != null) {
-                    mainActivity.updateUndoItem(isDisabled);
-                }
-            }
-
-            @Override
-            public void toggleRedoButton(boolean isDisabled) {
-                MainActivity mainActivity = MainActivity.getInstance();
-                if (mainActivity != null) {
-                    mainActivity.updateRedoItem(isDisabled);
-                }
-            }
-        }, isDarkMode());
-
-        return new DefaultReactNativeHost(this) {
-            @Override
-            public boolean getUseDeveloperSupport() {
-                return BuildConfig.DEBUG;
-            }
-
-            @Override
-            protected List<ReactPackage> getPackages() {
-                return Arrays.asList(
-                        new MainReactPackage(),
-                        new ReactSliderPackage(),
-                        new ReactVideoPackage(),
-                        new SvgPackage(),
-                        // passing null because we do not need log handlers in the demo app
-                        new ReactAztecPackage(null, null),
-                        new LinearGradientPackage(),
-                        new RNGetRandomValuesPackage(),
-                        new RNCMaskedViewPackage(),
-                        new RNGestureHandlerPackage(),
-                        new ReanimatedPackage(),
-                        new SafeAreaContextPackage(),
-                        new RNScreensPackage(),
-                        new RNCWebViewPackage(),
-                        new ClipboardPackage(),
-                        new FastImageViewPackage(),
-                        mRnReactNativeGutenbergBridgePackage);
-            }
-
-            @Override
-            protected String getJSMainModuleName() {
-                return "index";
-            }
-
-            @Override
-            protected boolean isNewArchEnabled() {
-                return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-            }
-            @Override
-            protected Boolean isHermesEnabled() {
-                return BuildConfig.IS_HERMES_ENABLED;
-            }
-        };
-    }
-
-    private boolean isDarkMode() {
-        Configuration configuration = getResources().getConfiguration();
-        int currentNightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-
-        return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
-    }
-
-    public void toggleUndo() {
-        mRnReactNativeGutenbergBridgePackage.getRNReactNativeGutenbergBridgeModule().onUndoPressed();
-    }
-
-    public void toggleRedo() {
-        mRnReactNativeGutenbergBridgePackage.getRNReactNativeGutenbergBridgeModule().onRedoPressed();
-    }
-
-    private void openGutenbergWebView(String content,
-                                      String blockId,
-                                      String blockName) {
-        Intent intent = new Intent(this, GutenbergWebViewActivity.class);
-        intent.putExtra(GutenbergWebViewActivity.ARG_BLOCK_CONTENT, content);
-        intent.putExtra(GutenbergWebViewActivity.ARG_BLOCK_ID, blockId);
-        intent.putExtra(GutenbergWebViewActivity.ARG_BLOCK_NAME, blockName);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
-    }
-
-    @Override
-    public ReactNativeHost getReactNativeHost() {
-        if (mReactNativeHost == null) {
-            mReactNativeHost = createReactNativeHost();
-            createCustomDevOptions(mReactNativeHost);
-        }
-
-        return mReactNativeHost;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        SoLoader.init(this, /* native exopackage */ false);
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            // If you opted-in for the New Architecture, we load the native entry point for this app.
-            DefaultNewArchitectureEntryPoint.load();
-        }
-        ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-    }
-
-    private void createCustomDevOptions(ReactNativeHost reactNativeHost) {
-        DevSupportManager devSupportManager = reactNativeHost.getReactInstanceManager().getDevSupportManager();
-
-        devSupportManager.addCustomDevOption("Show html", new DevOptionHandler() {
-            @Override
-            public void onOptionSelected() {
-                mRnReactNativeGutenbergBridgePackage.getRNReactNativeGutenbergBridgeModule().toggleEditorMode();
-            }
-        });
-
-        devSupportManager.addCustomDevOption("Help", new DevOptionHandler() {
-            @Override
-            public void onOptionSelected() {
-                mRnReactNativeGutenbergBridgePackage.getRNReactNativeGutenbergBridgeModule().showEditorHelp();
-            }
-        });
-    }
-
-    @Override
-    public void saveContent(String content, String blockId) {
-        if (mReplaceUnsupportedBlockCallback != null) {
-            mReplaceUnsupportedBlockCallback.replaceUnsupportedBlock(content, blockId);
-        }
-    }
-}
diff --git a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.kt b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.kt
new file mode 100644
index 00000000000000..00f6d16b4ca2de
--- /dev/null
+++ b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.kt
@@ -0,0 +1,285 @@
+package com.gutenberg
+
+import android.app.Application
+import android.content.Intent
+import android.content.res.Configuration
+import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
+import androidx.core.util.Consumer
+import com.BV.LinearGradient.LinearGradientPackage
+import com.brentvatne.react.ReactVideoPackage
+import com.dylanvann.fastimage.FastImageViewPackage
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.PackageList
+import com.facebook.react.ReactHost
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.defaults.DefaultReactHost
+import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.flipper.ReactNativeFlipper
+import com.facebook.soloader.SoLoader
+import com.horcrux.svg.SvgPackage
+import com.reactnativecommunity.clipboard.ClipboardPackage
+import com.reactnativecommunity.slider.ReactSliderPackage
+import com.reactnativecommunity.webview.RNCWebViewPackage
+import com.swmansion.gesturehandler.RNGestureHandlerPackage
+import com.swmansion.reanimated.ReanimatedPackage
+import com.swmansion.rnscreens.RNScreensPackage
+import com.th3rdwave.safeareacontext.SafeAreaContextPackage
+import org.linusu.RNGetRandomValuesPackage
+import org.reactnative.maskedview.RNCMaskedViewPackage
+import org.wordpress.mobile.ReactNativeAztec.ReactAztecPackage
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeInterface
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.BlockTypeImpressionsCallback
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.ConnectionStatusCallback
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.FocalPointPickerTooltipShownCallback
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.MediaSelectedCallback
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.OtherMediaOptionsReceivedCallback
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.ReplaceUnsupportedBlockCallback
+import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergWebViewActivity
+import org.wordpress.mobile.ReactNativeGutenbergBridge.RNMedia
+import org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgePackage
+import org.wordpress.mobile.WPAndroidGlue.GutenbergJsException
+import org.wordpress.mobile.WPAndroidGlue.Media
+import org.wordpress.mobile.WPAndroidGlue.MediaOption
+
+class MainApplication : Application(), ReactApplication, GutenbergBridgeInterface {
+    private var mRnReactNativeGutenbergBridgePackage: RNReactNativeGutenbergBridgePackage? = null
+    private var mReplaceUnsupportedBlockCallback: ReplaceUnsupportedBlockCallback? = null
+
+    override val reactNativeHost: ReactNativeHost =
+        object : DefaultReactNativeHost(this) {
+            override fun getPackages(): List<ReactPackage> =
+                PackageList(this).packages.apply {
+                    add(ReactSliderPackage())
+                    add(ReactVideoPackage())
+                    add(SvgPackage()) // passing null because we do not need log handlers in the demo ap)p
+                    add(ReactAztecPackage(null, null))
+                    add(LinearGradientPackage())
+                    add(RNGetRandomValuesPackage())
+                    add(RNCMaskedViewPackage())
+                    add(RNGestureHandlerPackage())
+                    add(ReanimatedPackage())
+                    add(SafeAreaContextPackage())
+                    add(RNScreensPackage())
+                    add(RNCWebViewPackage())
+                    add(ClipboardPackage())
+                    add(FastImageViewPackage())
+                    add(mRnReactNativeGutenbergBridgePackage)
+                }
+
+            override fun getJSMainModuleName(): String {
+                return "index"
+            }
+
+            override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+            override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+            override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
+        }
+
+    private fun initializeGutenbergBridge() {
+        mRnReactNativeGutenbergBridgePackage = RNReactNativeGutenbergBridgePackage(object : GutenbergBridgeJS2Parent {
+            override fun responseHtml(title: String, html: String, changed: Boolean, contentInfo: ReadableMap) {}
+            override fun requestMediaImport(url: String, mediaSelectedCallback: MediaSelectedCallback) {}
+            override fun requestMediaPickerFromDeviceCamera(mediaSelectedCallback: MediaSelectedCallback, mediaType: GutenbergBridgeJS2Parent.MediaType) {}
+            override fun requestMediaPickFromDeviceLibrary(mediaSelectedCallback: MediaSelectedCallback, allowMultipleSelection: Boolean, mediaType: GutenbergBridgeJS2Parent.MediaType) {}
+            override fun requestMediaPickFromMediaLibrary(mediaSelectedCallback: MediaSelectedCallback, allowMultipleSelection: Boolean, mediaType: GutenbergBridgeJS2Parent.MediaType) {
+                val rnMediaList: MutableList<RNMedia> = ArrayList()
+                val emptyMetadata = WritableNativeMap()
+                when (mediaType) {
+                    GutenbergBridgeJS2Parent.MediaType.IMAGE -> {
+                        val image = Media(1, "https://cldup.com/cXyG__fTLN.jpg", "image", "Mountain", "", "A snow-capped mountain top in a cloudy sky with red-leafed trees in the foreground", emptyMetadata)
+                        rnMediaList.add(image)
+                    }
+
+                    GutenbergBridgeJS2Parent.MediaType.VIDEO -> {
+                        val metadata = WritableNativeMap()
+                        metadata.putString("extraID", "AbCdE")
+                        val video = Media(2, "https://i.cloudup.com/YtZFJbuQCE.mov", "video", "Cloudup", "", "", metadata)
+                        rnMediaList.add(video)
+                    }
+
+                    GutenbergBridgeJS2Parent.MediaType.ANY, GutenbergBridgeJS2Parent.MediaType.OTHER -> {
+                        val other = Media(3, "https://wordpress.org/latest.zip", "zip", "WordPress latest version", "WordPress.zip", "", emptyMetadata)
+                        rnMediaList.add(other)
+                    }
+
+                    GutenbergBridgeJS2Parent.MediaType.AUDIO -> {
+                        val audio = Media(5, "https://cldup.com/59IrU0WJtq.mp3", "audio", "Summer presto", "", "", emptyMetadata)
+                        rnMediaList.add(audio)
+                    }
+
+                    else -> {}
+                }
+                mediaSelectedCallback.onMediaFileSelected(rnMediaList)
+            }
+
+            override fun mediaUploadSync(mediaSelectedCallback: MediaSelectedCallback) {}
+            override fun requestImageFailedRetryDialog(mediaId: Int) {}
+            override fun requestImageUploadCancelDialog(mediaId: Int) {}
+            override fun requestImageUploadCancel(mediaId: Int) {}
+            override fun setFeaturedImage(mediaId: Int) {}
+            override fun editorDidMount(unsupportedBlockNames: ReadableArray) {}
+            override fun editorDidAutosave() {}
+            override fun getOtherMediaPickerOptions(otherMediaOptionsReceivedCallback: OtherMediaOptionsReceivedCallback, mediaType: GutenbergBridgeJS2Parent.MediaType) {
+                if (mediaType == GutenbergBridgeJS2Parent.MediaType.ANY) {
+                    val mediaOptions = ArrayList<MediaOption>()
+                    mediaOptions.add(MediaOption("1", "Choose from device"))
+                    otherMediaOptionsReceivedCallback.onOtherMediaOptionsReceived(mediaOptions)
+                }
+            }
+
+            override fun requestMediaPickFrom(mediaSource: String, mediaSelectedCallback: MediaSelectedCallback, allowMultipleSelection: Boolean) {
+                if (mediaSource == "1") {
+                    val rnMediaList: MutableList<RNMedia> = ArrayList()
+                    val pdf = Media(1, "https://grad.illinois.edu/sites/default/files/pdfs/cvsamples.pdf", "other", "", "cvsamples.pdf", "", WritableNativeMap())
+                    rnMediaList.add(pdf)
+                    mediaSelectedCallback.onMediaFileSelected(rnMediaList)
+                }
+            }
+
+            override fun requestImageFullscreenPreview(mediaUrl: String) {}
+            override fun requestEmbedFullscreenPreview(content: String, title: String) {}
+            override fun requestMediaEditor(mediaSelectedCallback: MediaSelectedCallback, mediaUrl: String) {}
+            override fun setFocalPointPickerTooltipShown(tooltipShown: Boolean) {}
+            override fun requestFocalPointPickerTooltipShown(focalPointPickerTooltipShownCallback: FocalPointPickerTooltipShownCallback) {
+                focalPointPickerTooltipShownCallback.onRequestFocalPointPickerTooltipShown(false)
+            }
+
+            override fun editorDidEmitLog(message: String, logLevel: GutenbergBridgeJS2Parent.LogLevel) {
+                when (logLevel) {
+                    GutenbergBridgeJS2Parent.LogLevel.TRACE -> Log.d(TAG, message)
+                    GutenbergBridgeJS2Parent.LogLevel.INFO -> Log.i(TAG, message)
+                    GutenbergBridgeJS2Parent.LogLevel.WARN -> Log.w(TAG, message)
+                    GutenbergBridgeJS2Parent.LogLevel.ERROR -> Log.e(TAG, message)
+                }
+            }
+
+            override fun performGetRequest(path: String, enableCaching: Boolean, onSuccess: Consumer<String>, onError: Consumer<Bundle>) {}
+            override fun performPostRequest(path: String, data: ReadableMap, onSuccess: Consumer<String>, onError: Consumer<Bundle>) {}
+            override fun gutenbergDidRequestUnsupportedBlockFallback(replaceUnsupportedBlockCallback: ReplaceUnsupportedBlockCallback,
+                                                                     content: String,
+                                                                     blockId: String,
+                                                                     blockName: String,
+                                                                     blockTitle: String) {
+                mReplaceUnsupportedBlockCallback = replaceUnsupportedBlockCallback
+                openGutenbergWebView(content, blockId, blockTitle)
+            }
+
+            override fun onShowUserSuggestions(onResult: Consumer<String>) {
+                onResult.accept("matt")
+            }
+
+            override fun onShowXpostSuggestions(onResult: Consumer<String>) {
+                onResult.accept("ma.tt")
+            }
+
+            override fun gutenbergDidSendButtonPressedAction(buttonType: String) {}
+            override fun requestPreview() {
+                Toast.makeText(this@MainApplication, "requestPreview called", Toast.LENGTH_SHORT).show()
+            }
+
+            override fun requestBlockTypeImpressions(blockTypeImpressionsCallback: BlockTypeImpressionsCallback) {
+                val impressions: ReadableMap = Arguments.createMap()
+                blockTypeImpressionsCallback.onRequestBlockTypeImpressions(impressions)
+            }
+
+            override fun setBlockTypeImpressions(impressions: ReadableMap) {
+                Log.d("BlockTypeImpressions", String.format("Gutenberg requested setting block type impression to %s.", impressions))
+            }
+
+            override fun requestContactCustomerSupport() {
+                Toast.makeText(this@MainApplication, "requestContactCustomerSupport called", Toast.LENGTH_SHORT).show()
+            }
+
+            override fun requestGotoCustomerSupportOptions() {
+                Toast.makeText(this@MainApplication, "requestGotoCustomerSupportOptions called", Toast.LENGTH_SHORT).show()
+            }
+
+            override fun sendEventToHost(eventName: String, properties: ReadableMap) {
+                Log.d("SendEventToHost", String.format("Gutenberg requested sending '%s' event to host with properties: %s", eventName, properties))
+            }
+
+            override fun toggleUndoButton(isDisabled: Boolean) {
+                MainActivity.instance?.updateUndoItem(isDisabled)
+            }
+
+            override fun toggleRedoButton(isDisabled: Boolean) {
+                MainActivity.instance?.updateRedoItem(isDisabled)
+            }
+
+            override fun requestConnectionStatus(connectionStatusCallback: ConnectionStatusCallback) {
+                connectionStatusCallback.onRequestConnectionStatus(true)
+            }
+
+            override fun logException(exception: GutenbergJsException, logExceptionCallback: GutenbergBridgeJS2Parent.LogExceptionCallback) {}
+        }, isDarkMode)
+    }
+
+    private val isDarkMode: Boolean
+        get() {
+            val configuration = resources.configuration
+            val currentNightMode = configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+            return currentNightMode == Configuration.UI_MODE_NIGHT_YES
+        }
+
+    fun toggleUndo() {
+        mRnReactNativeGutenbergBridgePackage!!.rnReactNativeGutenbergBridgeModule.onUndoPressed()
+    }
+
+    fun toggleRedo() {
+        mRnReactNativeGutenbergBridgePackage!!.rnReactNativeGutenbergBridgeModule.onRedoPressed()
+    }
+
+    private fun openGutenbergWebView(content: String,
+                                     blockId: String,
+                                     blockName: String) {
+        val intent = Intent(this, GutenbergWebViewActivity::class.java)
+        intent.putExtra(GutenbergWebViewActivity.ARG_BLOCK_CONTENT, content)
+        intent.putExtra(GutenbergWebViewActivity.ARG_BLOCK_ID, blockId)
+        intent.putExtra(GutenbergWebViewActivity.ARG_BLOCK_NAME, blockName)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
+    }
+
+    override val reactHost: ReactHost
+        get() = DefaultReactHost.getDefaultReactHost(this.applicationContext, reactNativeHost)
+
+    override fun onCreate() {
+        super.onCreate()
+        SoLoader.init(this,  /* native exopackage */false)
+
+        initializeGutenbergBridge()
+
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            // If you opted-in for the New Architecture, we load the native entry point for this app.
+            load()
+        }
+        ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
+        createCustomDevOptions(reactNativeHost)
+    }
+
+    private fun createCustomDevOptions(reactNativeHost: ReactNativeHost?) {
+        val devSupportManager = reactNativeHost!!.reactInstanceManager.devSupportManager
+        devSupportManager.addCustomDevOption("Show html") { mRnReactNativeGutenbergBridgePackage!!.rnReactNativeGutenbergBridgeModule.toggleEditorMode() }
+        devSupportManager.addCustomDevOption("Help") { mRnReactNativeGutenbergBridgePackage!!.rnReactNativeGutenbergBridgeModule.showEditorHelp() }
+    }
+
+    override fun saveContent(content: String, blockId: String) {
+        if (mReplaceUnsupportedBlockCallback != null) {
+            mReplaceUnsupportedBlockCallback!!.replaceUnsupportedBlock(content, blockId)
+        }
+    }
+
+    companion object {
+        private const val TAG = "MainApplication"
+    }
+}
diff --git a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/ReactNativeFlipper.java b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/ReactNativeFlipper.java
deleted file mode 100644
index c3992d41c615c1..00000000000000
--- a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/ReactNativeFlipper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- */
-package com.gutenberg;
-
-import android.content.Context;
-import com.facebook.flipper.android.AndroidFlipperClient;
-import com.facebook.flipper.android.utils.FlipperUtils;
-import com.facebook.flipper.core.FlipperClient;
-import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
-import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
-import com.facebook.flipper.plugins.inspector.DescriptorMapping;
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
-import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
-import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.network.NetworkingModule;
-import okhttp3.OkHttpClient;
-
-/**
- * Class responsible of loading Flipper inside your React Native application. This is the debug
- * flavor of it. Here you can add your own plugins and customize the Flipper setup.
- */
-public class ReactNativeFlipper {
-    public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
-        if (FlipperUtils.shouldEnableFlipper(context)) {
-            final FlipperClient client = AndroidFlipperClient.getInstance(context);
-
-            client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
-            client.addPlugin(new DatabasesFlipperPlugin(context));
-            client.addPlugin(new SharedPreferencesFlipperPlugin(context));
-            client.addPlugin(CrashReporterPlugin.getInstance());
-
-            NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
-            NetworkingModule.setCustomClientBuilder(
-                    new NetworkingModule.CustomClientBuilder() {
-                        @Override
-                        public void apply(OkHttpClient.Builder builder) {
-                            builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
-                        }
-                    });
-            client.addPlugin(networkFlipperPlugin);
-            client.start();
-
-            // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
-            // Hence we run if after all native modules have been initialized
-            ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-            if (reactContext == null) {
-                reactInstanceManager.addReactInstanceEventListener(
-                        new ReactInstanceManager.ReactInstanceEventListener() {
-                            @Override
-                            public void onReactContextInitialized(ReactContext reactContext) {
-                                reactInstanceManager.removeReactInstanceEventListener(this);
-                                reactContext.runOnNativeModulesQueueThread(
-                                        new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                client.addPlugin(new FrescoFlipperPlugin());
-                                            }
-                                        });
-                            }
-                        });
-            } else {
-                client.addPlugin(new FrescoFlipperPlugin());
-            }
-        }
-    }
-}
diff --git a/packages/react-native-editor/android/build.gradle b/packages/react-native-editor/android/build.gradle
index 7baee554d330c7..cadcfa8704b51a 100644
--- a/packages/react-native-editor/android/build.gradle
+++ b/packages/react-native-editor/android/build.gradle
@@ -1,15 +1,14 @@
 buildscript {
     ext {
-        gradlePluginVersion = '8.1.0'
-        kotlinVersion = '1.6.10'
-        buildToolsVersion = "33.0.0"
+        gradlePluginVersion = '8.5.1'
+        kotlinVersion = '1.8.0'
+        buildToolsVersion = "34.0.0"
         minSdkVersion = 24
         compileSdkVersion = 34
-        targetSdkVersion = 33
+        targetSdkVersion = 34
         supportLibVersion = '28.0.0'
-        
-        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-        ndkVersion = "23.1.7779620"
+
+        ndkVersion = "25.1.8937393"
     }
     repositories {
         google()
@@ -20,6 +19,14 @@ buildscript {
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
+    // Fix AGP version to 8.1.0 until the main Android app upgrades to 8.1.1
+    configurations.all {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            if (details.requested.group == 'com.android.tools.build' && details.requested.name == 'gradle') {
+                details.useVersion gradlePluginVersion
+            }
+        }
+    }
 }
 
 allprojects {
@@ -30,8 +37,7 @@ allprojects {
             content {
                 includeGroup "org.wordpress"
                 includeGroup "org.wordpress.aztec"
-                includeGroup "org.wordpress-mobile"
-                includeGroupByRegex "org.wordpress-mobile.react-native-libraries.*"
+                includeGroupByRegex "org.wordpress.react-native-libraries.*"
             }
         }
         maven { url 'https://www.jitpack.io' }
@@ -39,3 +45,5 @@ allprojects {
         mavenLocal()
     }
 }
+
+apply plugin: "com.facebook.react.rootproject"
diff --git a/packages/react-native-editor/android/gradle.properties b/packages/react-native-editor/android/gradle.properties
index 0705a21e44f055..b91742df522ade 100644
--- a/packages/react-native-editor/android/gradle.properties
+++ b/packages/react-native-editor/android/gradle.properties
@@ -24,7 +24,6 @@ org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=false
-FLIPPER_VERSION=0.177.0
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
@@ -35,4 +34,8 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
\ No newline at end of file
+newArchEnabled=false
+
+# Use this property to enable or disable the Hermes JS engine.
+# If set to false, you will be using JSC instead.
+hermesEnabled=true
diff --git a/packages/react-native-editor/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-editor/android/gradle/wrapper/gradle-wrapper.properties
index c747538fb38b53..515ab9d5f1822a 100644
--- a/packages/react-native-editor/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/react-native-editor/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/react-native-editor/babel.config.js b/packages/react-native-editor/babel.config.js
index 4f7138636e23ab..7f81d06082b58f 100644
--- a/packages/react-native-editor/babel.config.js
+++ b/packages/react-native-editor/babel.config.js
@@ -6,11 +6,11 @@ const path = require( 'path' );
 module.exports = function ( api ) {
 	api.cache( true );
 	return {
-		presets: [ 'module:metro-react-native-babel-preset' ],
+		presets: [ 'module:@react-native/babel-preset' ],
 		plugins: [
 			path.resolve(
 				__dirname,
-				'../../node_modules/@babel/plugin-proposal-async-generator-functions'
+				'../../node_modules/@babel/plugin-transform-async-generator-functions'
 			),
 			'@babel/plugin-transform-runtime',
 			'@babel/plugin-transform-named-capturing-groups-regex',
diff --git a/packages/react-native-editor/bin/test-e2e-setup.sh b/packages/react-native-editor/bin/test-e2e-setup.sh
index ed896a03eacb85..b4fd55c9bea122 100755
--- a/packages/react-native-editor/bin/test-e2e-setup.sh
+++ b/packages/react-native-editor/bin/test-e2e-setup.sh
@@ -1,5 +1,13 @@
 #!/bin/bash -e
 
+# =================================================================
+# Appium Drivers
+#
+# NOTE: Please update the following versions when upgrading Appium.
+# =================================================================
+UI_AUTOMATOR_2_VERSION="2.32.3"
+XCUITEST_VERSION="5.7.0"
+
 set -o pipefail
 
 if command -v appium >/dev/null 2>&1; then
@@ -23,18 +31,30 @@ function log_error() {
 
 output=$($APPIUM_CMD driver list --installed --json)
 
-if echo "$output" | grep -q 'uiautomator2'; then
-	log_info "UiAutomator2 available."
+# UiAutomator2 driver installation
+matched_version=$(echo "$output" | jq -r '.uiautomator2.version // empty')
+if [ -z "$matched_version" ]; then
+	log_info "UiAutomator2 not installed, installing version $UI_AUTOMATOR_2_VERSION..."
+	$APPIUM_CMD driver install "uiautomator2@$UI_AUTOMATOR_2_VERSION"
+elif [ "$matched_version" = "$UI_AUTOMATOR_2_VERSION" ]; then
+	log_info "UiAutomator2 version $UI_AUTOMATOR_2_VERSION is available."
 else
-	log_info "UiAutomator2 not found, installing..."
-	$APPIUM_CMD driver install uiautomator2
+	log_info "UiAutomator2 version $matched_version is installed, replacing it with version $UI_AUTOMATOR_2_VERSION..."
+	$APPIUM_CMD driver uninstall uiautomator2
+	$APPIUM_CMD driver install "uiautomator2@$UI_AUTOMATOR_2_VERSION"
 fi
 
-if echo "$output" | grep -q 'xcuitest'; then
-	log_info "XCUITest available."
+# XCUITest driver installation
+matched_version=$(echo "$output" | jq -r '.xcuitest.version // empty')
+if [ -z "$matched_version" ]; then
+	log_info "XCUITest not installed, installing version $XCUITEST_VERSION..."
+	$APPIUM_CMD driver install "xcuitest@$XCUITEST_VERSION"
+elif [ "$matched_version" = "$XCUITEST_VERSION" ]; then
+	log_info "XCUITest version $XCUITEST_VERSION is available."
 else
-	log_info "XCUITest not found, installing..."
-	$APPIUM_CMD driver install xcuitest
+	log_info "XCUITest version $matched_version is installed, replacing it with version $XCUITEST_VERSION..."
+	$APPIUM_CMD driver uninstall xcuitest
+	$APPIUM_CMD driver install "xcuitest@$XCUITEST_VERSION"
 fi
 
 CONFIG_FILE="$(pwd)/__device-tests__/helpers/device-config.json"
diff --git a/packages/react-native-editor/ios/Gemfile b/packages/react-native-editor/ios/Gemfile
index f62500f50e966f..2a0889e80abc78 100644
--- a/packages/react-native-editor/ios/Gemfile
+++ b/packages/react-native-editor/ios/Gemfile
@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '>= 1.11.3'
\ No newline at end of file
+ruby File.read(File.join(__dir__, '.ruby-version')).strip
+
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
diff --git a/packages/react-native-editor/ios/Gemfile.lock b/packages/react-native-editor/ios/Gemfile.lock
index 84d2077720281b..e8fbb72a6ca659 100644
--- a/packages/react-native-editor/ios/Gemfile.lock
+++ b/packages/react-native-editor/ios/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
       rexml
     activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -9,22 +9,22 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.1.0)
-    cocoapods (1.11.3)
+    cocoapods (1.14.3)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.3)
+      cocoapods-core (= 1.14.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -32,10 +32,10 @@ GEM
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.3)
-      activesupport (>= 5.0, < 7)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.14.3)
+      activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -45,7 +45,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -56,29 +56,31 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.2.2)
     escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.15.5)
+    ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.7.1)
     minitest (5.19.0)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     public_suffix (4.0.7)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     ruby-macho (2.5.1)
-    typhoeus (1.4.0)
+    strscan (3.1.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -93,7 +95,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (>= 1.11.3)
+  activesupport (>= 6.1.7.3, < 7.1.0)
+  cocoapods (>= 1.13, < 1.15)
+
+RUBY VERSION
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   2.3.18
+   2.4.10
diff --git a/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj b/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj
index 5cbe46243ff4e4..4b6938198c9423 100644
--- a/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj
+++ b/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj
@@ -362,7 +362,7 @@
 				"${PODS_ROOT}/../../../react-native-bridge/common/gutenberg-web-single-block/local-storage-overrides.json",
 				"${PODS_ROOT}/../../../react-native-bridge/common/gutenberg-web-single-block/prevent-autosaves.js",
 				"${PODS_ROOT}/../../../react-native-bridge/common/gutenberg-web-single-block/wp-bar-override.css",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
@@ -376,7 +376,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/local-storage-overrides.json",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/prevent-autosaves.js",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/wp-bar-override.css",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -462,7 +462,7 @@
 				"${PODS_ROOT}/../../../react-native-bridge/common/gutenberg-web-single-block/local-storage-overrides.json",
 				"${PODS_ROOT}/../../../react-native-bridge/common/gutenberg-web-single-block/prevent-autosaves.js",
 				"${PODS_ROOT}/../../../react-native-bridge/common/gutenberg-web-single-block/wp-bar-override.css",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
@@ -476,7 +476,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/local-storage-overrides.json",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/prevent-autosaves.js",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/wp-bar-override.css",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -617,7 +617,11 @@
 				INFOPLIST_FILE = GutenbergDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(PROJECT_DIR)";
+				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift$(PROJECT_DIR)",
+				);
 				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -651,7 +655,11 @@
 				INFOPLIST_FILE = GutenbergDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(PROJECT_DIR)";
+				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift$(PROJECT_DIR)",
+				);
 				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -672,7 +680,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -694,6 +702,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -702,12 +711,27 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = "$(inherited)";
+				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;
+				USE_HERMES = true;
 			};
 			name = Debug;
 		};
@@ -715,7 +739,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -733,17 +757,36 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_CFLAGS = "$(inherited)";
+				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;
+				USE_HERMES = true;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
diff --git a/packages/react-native-editor/ios/GutenbergDemo/GutenbergViewController.swift b/packages/react-native-editor/ios/GutenbergDemo/GutenbergViewController.swift
index b269d1feb8ddfe..c9c1bca191c22e 100644
--- a/packages/react-native-editor/ios/GutenbergDemo/GutenbergViewController.swift
+++ b/packages/react-native-editor/ios/GutenbergDemo/GutenbergViewController.swift
@@ -288,14 +288,6 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
         callback(.success("ma.tt"))
     }
 
-    func gutenbergDidRequestMediaSaveSync() {
-        print(#function)
-    }
-
-    func gutenbergDidRequestMediaFilesBlockReplaceSync(_ mediaFiles: [[String: Any]], clientId: String) {
-        print(#function)
-    }
-
     func gutenbergDidRequestFocalPointPickerTooltipShown() -> Bool {
         return false;
     }
@@ -345,6 +337,14 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
             }
         }
     }
+
+    func gutenbergDidRequestConnectionStatus() -> Bool {
+        return true
+    }
+
+    func gutenbergDidRequestLogException(_ exception: GutenbergJSException, with callback: @escaping () -> Void) {
+        print(#function)
+    }
 }
 
 extension GutenbergViewController: GutenbergWebDelegate {
@@ -370,9 +370,6 @@ extension GutenbergViewController: GutenbergWebDelegate {
 extension GutenbergViewController: GutenbergBridgeDataSource {
     class EditorSettings: GutenbergEditorSettings {
         var isFSETheme: Bool = true
-        var galleryWithImageBlocks: Bool = true
-        var quoteBlockV2: Bool = true
-        var listBlockV2: Bool = true
         var rawStyles: String? = nil
         var rawFeatures: String? = nil
         var colors: [[String: String]]? = nil
@@ -395,7 +392,10 @@ extension GutenbergViewController: GutenbergBridgeDataSource {
     }
 
     func gutenbergInitialTitle() -> String? {
-        return nil
+        guard isUITesting(), let initialProps = getInitialPropsFromArgs() else {
+            return nil
+        }
+        return initialProps["initialTitle"]
     }
 
     func gutenbergHostAppNamespace() -> String {
@@ -412,9 +412,9 @@ extension GutenbergViewController: GutenbergBridgeDataSource {
             .xposts: true,
             .unsupportedBlockEditor: unsupportedBlockEnabled,
             .canEnableUnsupportedBlockEditor: unsupportedBlockCanBeActivated,
-            .mediaFilesCollectionBlock: true,
             .tiledGalleryBlock: true,
             .videoPressBlock: true,
+            .videoPressV5Support: true,
             .isAudioBlockMediaUploadEnabled: true,
             .reusableBlock: false,
             .facebookEmbed: true,
diff --git a/packages/react-native-editor/ios/GutenbergDemo/Info.plist b/packages/react-native-editor/ios/GutenbergDemo/Info.plist
index 02b32d3ab22292..5d511120c2c503 100644
--- a/packages/react-native-editor/ios/GutenbergDemo/Info.plist
+++ b/packages/react-native-editor/ios/GutenbergDemo/Info.plist
@@ -26,14 +26,10 @@
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<false/>
+		<key>NSAllowsLocalNetworking</key>
+		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>To take photos or videos to use in your posts.</string>
diff --git a/packages/react-native-editor/ios/Podfile b/packages/react-native-editor/ios/Podfile
index cc7cda4894b0bf..98187435f5b457 100644
--- a/packages/react-native-editor/ios/Podfile
+++ b/packages/react-native-editor/ios/Podfile
@@ -1,10 +1,14 @@
 project 'GutenbergDemo.xcodeproj'
 
-require_relative '../../../node_modules/react-native/scripts/react_native_pods'
-require_relative '../../../node_modules/@react-native-community/cli-platform-ios/native_modules'
+# Resolve react_native_pods.rb with node to allow for hoisting
+require Pod::Executable.execute_command('node', ['-p',
+  'require.resolve(
+    "react-native/scripts/react_native_pods.rb",
+    {paths: [process.argv[1]]},
+  )', __dir__]).strip
 
 # Uncomment the next line to define a global platform for your project
-app_ios_deployment_target = Gem::Version.new('13.0')
+app_ios_deployment_target = Gem::Version.new('13.4')
 platform :ios, app_ios_deployment_target.version
 install! 'cocoapods', min_ios_version_supported
 prepare_react_native_project!
@@ -34,10 +38,6 @@ target 'GutenbergDemo' do
 
   use_react_native!(
     :path => config[:reactNativePath],
-    # Hermes is now enabled by default. Disable by setting this flag to false.
-    # Upcoming versions of React Native may rely on get_default_flags(), but
-    # we make it explicit here to aid in the React Native upgrade process.
-    :hermes_enabled => true,
     :fabric_enabled => false,
     # Enables Flipper.
     #
@@ -54,11 +54,10 @@ target 'GutenbergDemo' do
   end
 
   post_install do |installer|
+    # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
     react_native_post_install(
       installer,
       config[:reactNativePath],
-      # Set `mac_catalyst_enabled` to `true` in order to apply patches
-      # necessary for Mac Catalyst builds
       :mac_catalyst_enabled => false
     )
 
@@ -105,4 +104,4 @@ target 'GutenbergDemo' do
     end
     ### End workaround: https://github.com/CocoaPods/CocoaPods/issues/8891#issuecomment-1201465446
   end
-end
\ No newline at end of file
+end
diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock
index 51b5554191ea8d..67dd8345fe5ac7 100644
--- a/packages/react-native-editor/ios/Podfile.lock
+++ b/packages/react-native-editor/ios/Podfile.lock
@@ -1,26 +1,26 @@
 PODS:
-  - boost (1.76.0)
+  - boost (1.83.0)
   - BVLinearGradient (2.7.3):
     - React-Core
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.71.11)
-  - FBReactNativeSpec (0.71.11):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 0.71.11)
-    - RCTTypeSafety (= 0.71.11)
-    - React-Core (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - ReactCommon/turbomodule/core (= 0.71.11)
+  - FBLazyVector (0.73.3)
+  - FBReactNativeSpec (0.73.3):
+    - RCT-Folly (= 2022.05.16.00)
+    - RCTRequired (= 0.73.3)
+    - RCTTypeSafety (= 0.73.3)
+    - React-Core (= 0.73.3)
+    - React-jsi (= 0.73.3)
+    - ReactCommon/turbomodule/core (= 0.73.3)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - Gutenberg (1.109.2):
-    - React-Core (= 0.71.11)
-    - React-CoreModules (= 0.71.11)
-    - React-RCTImage (= 0.71.11)
+  - Gutenberg (1.121.0):
+    - React-Core (= 0.73.3)
+    - React-CoreModules (= 0.73.3)
+    - React-RCTImage (= 0.73.3)
     - RNTAztecView
-  - hermes-engine (0.71.11):
-    - hermes-engine/Pre-built (= 0.71.11)
-  - hermes-engine/Pre-built (0.71.11)
+  - hermes-engine (0.73.3):
+    - hermes-engine/Pre-built (= 0.73.3)
+  - hermes-engine/Pre-built (0.73.3)
   - libevent (2.1.12)
   - libwebp (1.2.3):
     - libwebp/demux (= 1.2.3)
@@ -31,44 +31,51 @@ PODS:
   - libwebp/mux (1.2.3):
     - libwebp/demux
   - libwebp/webp (1.2.3)
-  - RCT-Folly (2021.07.22.00):
+  - RCT-Folly (2022.05.16.00):
     - boost
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
-    - RCT-Folly/Default (= 2021.07.22.00)
-  - RCT-Folly/Default (2021.07.22.00):
+    - RCT-Folly/Default (= 2022.05.16.00)
+  - RCT-Folly/Default (2022.05.16.00):
     - boost
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
-  - RCT-Folly/Futures (2021.07.22.00):
+  - RCT-Folly/Fabric (2022.05.16.00):
+    - boost
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+  - RCT-Folly/Futures (2022.05.16.00):
     - boost
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
     - libevent
-  - RCTRequired (0.71.11)
-  - RCTTypeSafety (0.71.11):
-    - FBLazyVector (= 0.71.11)
-    - RCTRequired (= 0.71.11)
-    - React-Core (= 0.71.11)
-  - React (0.71.11):
-    - React-Core (= 0.71.11)
-    - React-Core/DevSupport (= 0.71.11)
-    - React-Core/RCTWebSocket (= 0.71.11)
-    - React-RCTActionSheet (= 0.71.11)
-    - React-RCTAnimation (= 0.71.11)
-    - React-RCTBlob (= 0.71.11)
-    - React-RCTImage (= 0.71.11)
-    - React-RCTLinking (= 0.71.11)
-    - React-RCTNetwork (= 0.71.11)
-    - React-RCTSettings (= 0.71.11)
-    - React-RCTText (= 0.71.11)
-    - React-RCTVibration (= 0.71.11)
-  - React-callinvoker (0.71.11)
-  - React-Codegen (0.71.11):
+  - RCTRequired (0.73.3)
+  - RCTTypeSafety (0.73.3):
+    - FBLazyVector (= 0.73.3)
+    - RCTRequired (= 0.73.3)
+    - React-Core (= 0.73.3)
+  - React (0.73.3):
+    - React-Core (= 0.73.3)
+    - React-Core/DevSupport (= 0.73.3)
+    - React-Core/RCTWebSocket (= 0.73.3)
+    - React-RCTActionSheet (= 0.73.3)
+    - React-RCTAnimation (= 0.73.3)
+    - React-RCTBlob (= 0.73.3)
+    - React-RCTImage (= 0.73.3)
+    - React-RCTLinking (= 0.73.3)
+    - React-RCTNetwork (= 0.73.3)
+    - React-RCTSettings (= 0.73.3)
+    - React-RCTText (= 0.73.3)
+    - React-RCTVibration (= 0.73.3)
+  - React-callinvoker (0.73.3)
+  - React-Codegen (0.73.3):
+    - DoubleConversion
     - FBReactNativeSpec
+    - glog
     - hermes-engine
     - RCT-Folly
     - RCTRequired
@@ -76,369 +83,1043 @@ PODS:
     - React-Core
     - React-jsi
     - React-jsiexecutor
+    - React-NativeModulesApple
+    - React-rncore
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - React-Core (0.71.11):
+  - React-Core (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.71.11)
-    - React-cxxreact (= 0.71.11)
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Core/Default (= 0.73.3)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.71.11):
+  - React-Core/CoreModulesHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/Default (0.71.11):
+  - React-Core/Default (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.71.11)
+    - RCT-Folly (= 2022.05.16.00)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/DevSupport (0.71.11):
+  - React-Core/DevSupport (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.71.11)
-    - React-Core/RCTWebSocket (= 0.71.11)
-    - React-cxxreact (= 0.71.11)
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Core/Default (= 0.73.3)
+    - React-Core/RCTWebSocket (= 0.73.3)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-jsinspector (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-jsinspector (= 0.73.3)
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.71.11):
+  - React-Core/RCTActionSheetHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.71.11):
+  - React-Core/RCTAnimationHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.71.11):
+  - React-Core/RCTBlobHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTImageHeaders (0.71.11):
+  - React-Core/RCTImageHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.71.11):
+  - React-Core/RCTLinkingHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.71.11):
+  - React-Core/RCTNetworkHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.71.11):
+  - React-Core/RCTSettingsHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTTextHeaders (0.71.11):
+  - React-Core/RCTTextHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.71.11):
+  - React-Core/RCTVibrationHeaders (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core/Default
-    - React-cxxreact (= 0.71.11)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTWebSocket (0.71.11):
+  - React-Core/RCTWebSocket (0.73.3):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.71.11)
-    - React-cxxreact (= 0.71.11)
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Core/Default (= 0.73.3)
+    - React-cxxreact
     - React-hermes
-    - React-jsi (= 0.71.11)
-    - React-jsiexecutor (= 0.71.11)
-    - React-perflogger (= 0.71.11)
+    - React-jsi
+    - React-jsiexecutor
+    - React-perflogger
+    - React-runtimescheduler
+    - React-utils
+    - SocketRocket (= 0.6.1)
     - Yoga
-  - React-CoreModules (0.71.11):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.11)
-    - React-Codegen (= 0.71.11)
-    - React-Core/CoreModulesHeaders (= 0.71.11)
-    - React-jsi (= 0.71.11)
+  - React-CoreModules (0.73.3):
+    - RCT-Folly (= 2022.05.16.00)
+    - RCTTypeSafety (= 0.73.3)
+    - React-Codegen
+    - React-Core/CoreModulesHeaders (= 0.73.3)
+    - React-jsi (= 0.73.3)
+    - React-NativeModulesApple
     - React-RCTBlob
-    - React-RCTImage (= 0.71.11)
-    - ReactCommon/turbomodule/core (= 0.71.11)
-  - React-cxxreact (0.71.11):
-    - boost (= 1.76.0)
+    - React-RCTImage (= 0.73.3)
+    - ReactCommon
+    - SocketRocket (= 0.6.1)
+  - React-cxxreact (0.73.3):
+    - boost (= 1.83.0)
     - DoubleConversion
+    - fmt (~> 6.2.1)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - React-jsinspector (= 0.71.11)
-    - React-logger (= 0.71.11)
-    - React-perflogger (= 0.71.11)
-    - React-runtimeexecutor (= 0.71.11)
-  - React-hermes (0.71.11):
+    - RCT-Folly (= 2022.05.16.00)
+    - React-callinvoker (= 0.73.3)
+    - React-debug (= 0.73.3)
+    - React-jsi (= 0.73.3)
+    - React-jsinspector (= 0.73.3)
+    - React-logger (= 0.73.3)
+    - React-perflogger (= 0.73.3)
+    - React-runtimeexecutor (= 0.73.3)
+  - React-debug (0.73.3)
+  - React-Fabric (0.73.3):
     - DoubleConversion
+    - fmt (~> 6.2.1)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - RCT-Folly/Futures (= 2021.07.22.00)
-    - React-cxxreact (= 0.71.11)
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-Fabric/animations (= 0.73.3)
+    - React-Fabric/attributedstring (= 0.73.3)
+    - React-Fabric/componentregistry (= 0.73.3)
+    - React-Fabric/componentregistrynative (= 0.73.3)
+    - React-Fabric/components (= 0.73.3)
+    - React-Fabric/core (= 0.73.3)
+    - React-Fabric/imagemanager (= 0.73.3)
+    - React-Fabric/leakchecker (= 0.73.3)
+    - React-Fabric/mounting (= 0.73.3)
+    - React-Fabric/scheduler (= 0.73.3)
+    - React-Fabric/telemetry (= 0.73.3)
+    - React-Fabric/templateprocessor (= 0.73.3)
+    - React-Fabric/textlayoutmanager (= 0.73.3)
+    - React-Fabric/uimanager (= 0.73.3)
+    - React-graphics
     - React-jsi
-    - React-jsiexecutor (= 0.71.11)
-    - React-jsinspector (= 0.71.11)
-    - React-perflogger (= 0.71.11)
-  - React-jsi (0.71.11):
-    - boost (= 1.76.0)
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/animations (0.73.3):
     - DoubleConversion
+    - fmt (~> 6.2.1)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-  - React-jsiexecutor (0.71.11):
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/attributedstring (0.73.3):
     - DoubleConversion
+    - fmt (~> 6.2.1)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - React-perflogger (= 0.71.11)
-  - React-jsinspector (0.71.11)
-  - React-logger (0.71.11):
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/componentregistry (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
     - glog
-  - react-native-blur (4.2.0):
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - react-native-get-random-values (1.4.0):
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/componentregistrynative (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - react-native-safe-area (0.5.1):
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - react-native-safe-area-context (4.6.3):
-    - RCT-Folly
+    - React-cxxreact
+    - React-debug
+    - React-Fabric/components/inputaccessory (= 0.73.3)
+    - React-Fabric/components/legacyviewmanagerinterop (= 0.73.3)
+    - React-Fabric/components/modal (= 0.73.3)
+    - React-Fabric/components/rncore (= 0.73.3)
+    - React-Fabric/components/root (= 0.73.3)
+    - React-Fabric/components/safeareaview (= 0.73.3)
+    - React-Fabric/components/scrollview (= 0.73.3)
+    - React-Fabric/components/text (= 0.73.3)
+    - React-Fabric/components/textinput (= 0.73.3)
+    - React-Fabric/components/unimplementedview (= 0.73.3)
+    - React-Fabric/components/view (= 0.73.3)
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components/inputaccessory (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
     - ReactCommon/turbomodule/core
-  - react-native-slider (3.0.2-wp-4):
+  - React-Fabric/components/legacyviewmanagerinterop (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - react-native-video (5.2.0-wp-6):
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components/modal (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-    - react-native-video/Video (= 5.2.0-wp-6)
-  - react-native-video/Video (5.2.0-wp-6):
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components/rncore (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - react-native-webview (11.26.1):
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components/root (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - React-perflogger (0.71.11)
-  - React-RCTActionSheet (0.71.11):
-    - React-Core/RCTActionSheetHeaders (= 0.71.11)
-  - React-RCTAnimation (0.71.11):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.11)
-    - React-Codegen (= 0.71.11)
-    - React-Core/RCTAnimationHeaders (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - ReactCommon/turbomodule/core (= 0.71.11)
-  - React-RCTAppDelegate (0.71.11):
-    - RCT-Folly
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components/safeareaview (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
     - ReactCommon/turbomodule/core
-  - React-RCTBlob (0.71.11):
-    - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.71.11)
-    - React-Core/RCTBlobHeaders (= 0.71.11)
-    - React-Core/RCTWebSocket (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - React-RCTNetwork (= 0.71.11)
-    - ReactCommon/turbomodule/core (= 0.71.11)
-  - React-RCTImage (0.71.11):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.11)
-    - React-Codegen (= 0.71.11)
-    - React-Core/RCTImageHeaders (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - React-RCTNetwork (= 0.71.11)
-    - ReactCommon/turbomodule/core (= 0.71.11)
-  - React-RCTLinking (0.71.11):
-    - React-Codegen (= 0.71.11)
-    - React-Core/RCTLinkingHeaders (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - ReactCommon/turbomodule/core (= 0.71.11)
-  - React-RCTNetwork (0.71.11):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.11)
-    - React-Codegen (= 0.71.11)
-    - React-Core/RCTNetworkHeaders (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - ReactCommon/turbomodule/core (= 0.71.11)
-  - React-RCTSettings (0.71.11):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.11)
-    - React-Codegen (= 0.71.11)
-    - React-Core/RCTSettingsHeaders (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - ReactCommon/turbomodule/core (= 0.71.11)
-  - React-RCTText (0.71.11):
-    - React-Core/RCTTextHeaders (= 0.71.11)
-  - React-RCTVibration (0.71.11):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.71.11)
-    - React-Core/RCTVibrationHeaders (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - ReactCommon/turbomodule/core (= 0.71.11)
-  - React-runtimeexecutor (0.71.11):
-    - React-jsi (= 0.71.11)
-  - ReactCommon/turbomodule/bridging (0.71.11):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.71.11)
-    - React-Core (= 0.71.11)
-    - React-cxxreact (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - React-logger (= 0.71.11)
-    - React-perflogger (= 0.71.11)
-  - ReactCommon/turbomodule/core (0.71.11):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.71.11)
-    - React-Core (= 0.71.11)
-    - React-cxxreact (= 0.71.11)
-    - React-jsi (= 0.71.11)
-    - React-logger (= 0.71.11)
-    - React-perflogger (= 0.71.11)
-  - RNCClipboard (1.11.2):
+  - React-Fabric/components/scrollview (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - RNCMaskedView (0.2.9):
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components/text (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - RNFastImage (8.5.11):
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components/textinput (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-    - SDWebImage (~> 5.11.1)
-    - SDWebImageWebPCoder (~> 0.8.4)
-  - RNGestureHandler (2.10.2):
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components/unimplementedview (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
-  - RNReanimated (2.17.0):
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/components/view (0.73.3):
     - DoubleConversion
-    - FBLazyVector
-    - FBReactNativeSpec
+    - fmt (~> 6.2.1)
     - glog
-    - RCT-Folly
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-callinvoker
     - React-Core
-    - React-Core/DevSupport
-    - React-Core/RCTWebSocket
-    - React-CoreModules
     - React-cxxreact
+    - React-debug
+    - React-graphics
     - React-jsi
     - React-jsiexecutor
-    - React-jsinspector
-    - React-RCTActionSheet
-    - React-RCTAnimation
-    - React-RCTBlob
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - React-Fabric/core (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/imagemanager (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/leakchecker (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/mounting (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/scheduler (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/telemetry (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/templateprocessor (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/textlayoutmanager (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-Fabric/uimanager
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/uimanager (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-FabricImage (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCTRequired (= 0.73.3)
+    - RCTTypeSafety (= 0.73.3)
+    - React-Fabric
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - React-jsiexecutor (= 0.73.3)
+    - React-logger
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon
+    - Yoga
+  - React-graphics (0.73.3):
+    - glog
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - React-Core/Default (= 0.73.3)
+    - React-utils
+  - React-hermes (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly/Futures (= 2022.05.16.00)
+    - React-cxxreact (= 0.73.3)
+    - React-jsi
+    - React-jsiexecutor (= 0.73.3)
+    - React-jsinspector (= 0.73.3)
+    - React-perflogger (= 0.73.3)
+  - React-ImageManager (0.73.3):
+    - glog
+    - RCT-Folly/Fabric
+    - React-Core/Default
+    - React-debug
+    - React-Fabric
+    - React-graphics
+    - React-rendererdebug
+    - React-utils
+  - React-jserrorhandler (0.73.3):
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - React-debug
+    - React-jsi
+    - React-Mapbuffer
+  - React-jsi (0.73.3):
+    - boost (= 1.83.0)
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+  - React-jsiexecutor (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+    - React-cxxreact (= 0.73.3)
+    - React-jsi (= 0.73.3)
+    - React-perflogger (= 0.73.3)
+  - React-jsinspector (0.73.3)
+  - React-logger (0.73.3):
+    - glog
+  - React-Mapbuffer (0.73.3):
+    - glog
+    - React-debug
+  - react-native-blur (4.2.0):
+    - React-Core
+  - react-native-get-random-values (1.4.0):
+    - React-Core
+  - react-native-safe-area (0.5.1):
+    - React-Core
+  - react-native-safe-area-context (4.8.2):
+    - React-Core
+  - react-native-slider (3.0.2-wp-4):
+    - React-Core
+  - react-native-video (5.2.0-wp-7):
+    - React-Core
+    - react-native-video/Video (= 5.2.0-wp-7)
+  - react-native-video/Video (5.2.0-wp-7):
+    - React-Core
+  - react-native-webview (13.6.1):
+    - React-Core
+  - React-nativeconfig (0.73.3)
+  - React-NativeModulesApple (0.73.3):
+    - glog
+    - hermes-engine
+    - React-callinvoker
+    - React-Core
+    - React-cxxreact
+    - React-jsi
+    - React-runtimeexecutor
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+  - React-perflogger (0.73.3)
+  - React-RCTActionSheet (0.73.3):
+    - React-Core/RCTActionSheetHeaders (= 0.73.3)
+  - React-RCTAnimation (0.73.3):
+    - RCT-Folly (= 2022.05.16.00)
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core/RCTAnimationHeaders
+    - React-jsi
+    - React-NativeModulesApple
+    - ReactCommon
+  - React-RCTAppDelegate (0.73.3):
+    - RCT-Folly
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-CoreModules
+    - React-hermes
+    - React-nativeconfig
+    - React-NativeModulesApple
+    - React-RCTFabric
     - React-RCTImage
-    - React-RCTLinking
     - React-RCTNetwork
-    - React-RCTSettings
+    - React-runtimescheduler
+    - ReactCommon
+  - React-RCTBlob (0.73.3):
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Codegen
+    - React-Core/RCTBlobHeaders
+    - React-Core/RCTWebSocket
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTNetwork
+    - ReactCommon
+  - React-RCTFabric (0.73.3):
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-FabricImage
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - React-nativeconfig
+    - React-RCTImage
     - React-RCTText
-    - ReactCommon/turbomodule/core
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - Yoga
+  - React-RCTImage (0.73.3):
+    - RCT-Folly (= 2022.05.16.00)
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core/RCTImageHeaders
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTNetwork
+    - ReactCommon
+  - React-RCTLinking (0.73.3):
+    - React-Codegen
+    - React-Core/RCTLinkingHeaders (= 0.73.3)
+    - React-jsi (= 0.73.3)
+    - React-NativeModulesApple
+    - ReactCommon
+    - ReactCommon/turbomodule/core (= 0.73.3)
+  - React-RCTNetwork (0.73.3):
+    - RCT-Folly (= 2022.05.16.00)
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core/RCTNetworkHeaders
+    - React-jsi
+    - React-NativeModulesApple
+    - ReactCommon
+  - React-RCTSettings (0.73.3):
+    - RCT-Folly (= 2022.05.16.00)
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core/RCTSettingsHeaders
+    - React-jsi
+    - React-NativeModulesApple
+    - ReactCommon
+  - React-RCTText (0.73.3):
+    - React-Core/RCTTextHeaders (= 0.73.3)
     - Yoga
-  - RNScreens (3.22.0):
+  - React-RCTVibration (0.73.3):
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Codegen
+    - React-Core/RCTVibrationHeaders
+    - React-jsi
+    - React-NativeModulesApple
+    - ReactCommon
+  - React-rendererdebug (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - RCT-Folly (= 2022.05.16.00)
+    - React-debug
+  - React-rncore (0.73.3)
+  - React-runtimeexecutor (0.73.3):
+    - React-jsi (= 0.73.3)
+  - React-runtimescheduler (0.73.3):
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+    - React-callinvoker
+    - React-cxxreact
+    - React-debug
+    - React-jsi
+    - React-rendererdebug
+    - React-runtimeexecutor
+    - React-utils
+  - React-utils (0.73.3):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
+    - React-debug
+  - ReactCommon (0.73.3):
+    - React-logger (= 0.73.3)
+    - ReactCommon/turbomodule (= 0.73.3)
+  - ReactCommon/turbomodule (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+    - React-callinvoker (= 0.73.3)
+    - React-cxxreact (= 0.73.3)
+    - React-jsi (= 0.73.3)
+    - React-logger (= 0.73.3)
+    - React-perflogger (= 0.73.3)
+    - ReactCommon/turbomodule/bridging (= 0.73.3)
+    - ReactCommon/turbomodule/core (= 0.73.3)
+  - ReactCommon/turbomodule/bridging (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+    - React-callinvoker (= 0.73.3)
+    - React-cxxreact (= 0.73.3)
+    - React-jsi (= 0.73.3)
+    - React-logger (= 0.73.3)
+    - React-perflogger (= 0.73.3)
+  - ReactCommon/turbomodule/core (0.73.3):
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2022.05.16.00)
+    - React-callinvoker (= 0.73.3)
+    - React-cxxreact (= 0.73.3)
+    - React-jsi (= 0.73.3)
+    - React-logger (= 0.73.3)
+    - React-perflogger (= 0.73.3)
+  - RNCClipboard (1.11.2):
     - React-Core
-    - React-RCTImage
-  - RNSVG (13.9.0):
+  - RNCMaskedView (0.3.0):
+    - React-Core
+  - RNFastImage (8.5.11):
+    - React-Core
+    - SDWebImage (~> 5.11.1)
+    - SDWebImageWebPCoder (~> 0.8.4)
+  - RNGestureHandler (2.14.1):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Core
+  - RNReanimated (3.6.2):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Core
+    - ReactCommon/turbomodule/core
+  - RNScreens (3.29.0):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core
-  - RNTAztecView (1.109.2):
+  - RNSVG (14.0.0):
     - React-Core
-    - WordPress-Aztec-iOS (= 1.19.9)
+  - RNTAztecView (1.121.0):
+    - React-Core
+    - WordPress-Aztec-iOS (= 1.19.11)
   - SDWebImage (5.11.1):
     - SDWebImage/Core (= 5.11.1)
   - SDWebImage/Core (5.11.1)
   - SDWebImageWebPCoder (0.8.5):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.10)
-  - WordPress-Aztec-iOS (1.19.9)
+  - SocketRocket (0.6.1)
+  - WordPress-Aztec-iOS (1.19.11)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -452,6 +1133,7 @@ DEPENDENCIES:
   - hermes-engine (from `../../../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
   - libevent (~> 2.1.12)
   - RCT-Folly (from `../../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
+  - RCT-Folly/Fabric (from `../../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../../../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../../../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../../../node_modules/react-native/`)
@@ -461,11 +1143,18 @@ DEPENDENCIES:
   - React-Core/RCTWebSocket (from `../../../node_modules/react-native/`)
   - React-CoreModules (from `../../../node_modules/react-native/React/CoreModules`)
   - React-cxxreact (from `../../../node_modules/react-native/ReactCommon/cxxreact`)
+  - React-debug (from `../../../node_modules/react-native/ReactCommon/react/debug`)
+  - React-Fabric (from `../../../node_modules/react-native/ReactCommon`)
+  - React-FabricImage (from `../../../node_modules/react-native/ReactCommon`)
+  - React-graphics (from `../../../node_modules/react-native/ReactCommon/react/renderer/graphics`)
   - React-hermes (from `../../../node_modules/react-native/ReactCommon/hermes`)
+  - React-ImageManager (from `../../../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios`)
+  - React-jserrorhandler (from `../../../node_modules/react-native/ReactCommon/jserrorhandler`)
   - React-jsi (from `../../../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../../../node_modules/react-native/ReactCommon/jsiexecutor`)
-  - React-jsinspector (from `../../../node_modules/react-native/ReactCommon/jsinspector`)
+  - React-jsinspector (from `../../../node_modules/react-native/ReactCommon/jsinspector-modern`)
   - React-logger (from `../../../node_modules/react-native/ReactCommon/logger`)
+  - React-Mapbuffer (from `../../../node_modules/react-native/ReactCommon`)
   - "react-native-blur (from `../../../node_modules/@react-native-community/blur`)"
   - react-native-get-random-values (from `../../../node_modules/react-native-get-random-values`)
   - react-native-safe-area (from `../../../node_modules/react-native-safe-area`)
@@ -473,18 +1162,25 @@ DEPENDENCIES:
   - "react-native-slider (from `../../../node_modules/@react-native-community/slider`)"
   - react-native-video (from `../../../node_modules/react-native-video`)
   - react-native-webview (from `../../../node_modules/react-native-webview`)
+  - React-nativeconfig (from `../../../node_modules/react-native/ReactCommon`)
+  - React-NativeModulesApple (from `../../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
   - React-perflogger (from `../../../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../../../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../../../node_modules/react-native/Libraries/NativeAnimation`)
   - React-RCTAppDelegate (from `../../../node_modules/react-native/Libraries/AppDelegate`)
   - React-RCTBlob (from `../../../node_modules/react-native/Libraries/Blob`)
+  - React-RCTFabric (from `../../../node_modules/react-native/React`)
   - React-RCTImage (from `../../../node_modules/react-native/Libraries/Image`)
   - React-RCTLinking (from `../../../node_modules/react-native/Libraries/LinkingIOS`)
   - React-RCTNetwork (from `../../../node_modules/react-native/Libraries/Network`)
   - React-RCTSettings (from `../../../node_modules/react-native/Libraries/Settings`)
   - React-RCTText (from `../../../node_modules/react-native/Libraries/Text`)
   - React-RCTVibration (from `../../../node_modules/react-native/Libraries/Vibration`)
+  - React-rendererdebug (from `../../../node_modules/react-native/ReactCommon/react/renderer/debug`)
+  - React-rncore (from `../../../node_modules/react-native/ReactCommon`)
   - React-runtimeexecutor (from `../../../node_modules/react-native/ReactCommon/runtimeexecutor`)
+  - React-runtimescheduler (from `../../../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
+  - React-utils (from `../../../node_modules/react-native/ReactCommon/react/utils`)
   - ReactCommon/turbomodule/core (from `../../../node_modules/react-native/ReactCommon`)
   - "RNCClipboard (from `../../../node_modules/@react-native-clipboard/clipboard`)"
   - "RNCMaskedView (from `../../../node_modules/@react-native-masked-view/masked-view`)"
@@ -503,6 +1199,7 @@ SPEC REPOS:
     - libwebp
     - SDWebImage
     - SDWebImageWebPCoder
+    - SocketRocket
     - WordPress-Aztec-iOS
 
 EXTERNAL SOURCES:
@@ -522,6 +1219,7 @@ EXTERNAL SOURCES:
     :path: "../../react-native-bridge"
   hermes-engine:
     :podspec: "../../../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
+    :tag: hermes-2023-11-17-RNv0.73.0-21043a3fc062be445e56a2c10ecd8be028dd9cc5
   RCT-Folly:
     :podspec: "../../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -540,16 +1238,30 @@ EXTERNAL SOURCES:
     :path: "../../../node_modules/react-native/React/CoreModules"
   React-cxxreact:
     :path: "../../../node_modules/react-native/ReactCommon/cxxreact"
+  React-debug:
+    :path: "../../../node_modules/react-native/ReactCommon/react/debug"
+  React-Fabric:
+    :path: "../../../node_modules/react-native/ReactCommon"
+  React-FabricImage:
+    :path: "../../../node_modules/react-native/ReactCommon"
+  React-graphics:
+    :path: "../../../node_modules/react-native/ReactCommon/react/renderer/graphics"
   React-hermes:
     :path: "../../../node_modules/react-native/ReactCommon/hermes"
+  React-ImageManager:
+    :path: "../../../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios"
+  React-jserrorhandler:
+    :path: "../../../node_modules/react-native/ReactCommon/jserrorhandler"
   React-jsi:
     :path: "../../../node_modules/react-native/ReactCommon/jsi"
   React-jsiexecutor:
     :path: "../../../node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
-    :path: "../../../node_modules/react-native/ReactCommon/jsinspector"
+    :path: "../../../node_modules/react-native/ReactCommon/jsinspector-modern"
   React-logger:
     :path: "../../../node_modules/react-native/ReactCommon/logger"
+  React-Mapbuffer:
+    :path: "../../../node_modules/react-native/ReactCommon"
   react-native-blur:
     :path: "../../../node_modules/@react-native-community/blur"
   react-native-get-random-values:
@@ -564,6 +1276,10 @@ EXTERNAL SOURCES:
     :path: "../../../node_modules/react-native-video"
   react-native-webview:
     :path: "../../../node_modules/react-native-webview"
+  React-nativeconfig:
+    :path: "../../../node_modules/react-native/ReactCommon"
+  React-NativeModulesApple:
+    :path: "../../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
   React-perflogger:
     :path: "../../../node_modules/react-native/ReactCommon/reactperflogger"
   React-RCTActionSheet:
@@ -574,6 +1290,8 @@ EXTERNAL SOURCES:
     :path: "../../../node_modules/react-native/Libraries/AppDelegate"
   React-RCTBlob:
     :path: "../../../node_modules/react-native/Libraries/Blob"
+  React-RCTFabric:
+    :path: "../../../node_modules/react-native/React"
   React-RCTImage:
     :path: "../../../node_modules/react-native/Libraries/Image"
   React-RCTLinking:
@@ -586,8 +1304,16 @@ EXTERNAL SOURCES:
     :path: "../../../node_modules/react-native/Libraries/Text"
   React-RCTVibration:
     :path: "../../../node_modules/react-native/Libraries/Vibration"
+  React-rendererdebug:
+    :path: "../../../node_modules/react-native/ReactCommon/react/renderer/debug"
+  React-rncore:
+    :path: "../../../node_modules/react-native/ReactCommon"
   React-runtimeexecutor:
     :path: "../../../node_modules/react-native/ReactCommon/runtimeexecutor"
+  React-runtimescheduler:
+    :path: "../../../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler"
+  React-utils:
+    :path: "../../../node_modules/react-native/ReactCommon/react/utils"
   ReactCommon:
     :path: "../../../node_modules/react-native/ReactCommon"
   RNCClipboard:
@@ -610,64 +1336,79 @@ EXTERNAL SOURCES:
     :path: "../../../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: d3f49c53809116a5d38da093a8aa78bf551aed09
   BVLinearGradient: fbe308a1d19a8133f69e033abc85d8008644f5e3
-  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  FBLazyVector: c511d4cd0210f416cb5c289bd5ae6b36d909b048
-  FBReactNativeSpec: f07662560742d82a5b73cee116c70b0b49bcc220
+  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
+  FBLazyVector: 70590b4f9e8ae9b0ce076efacea3abd7bc585ace
+  FBReactNativeSpec: 73b3972e2bd20b3235ff2014f06a3d3af675ed29
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  Gutenberg: 2da422f5cdffef9f66fc57f87ddba4dbda5ceb9d
-  hermes-engine: 34c863b446d0135b85a6536fa5fd89f48196f848
+  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
+  Gutenberg: 7ab890c59b6a4df2fc30d4cc0a468e46bc6e888e
+  hermes-engine: 5420539d016f368cd27e008f65f777abd6098c56
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
-  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
-  RCTRequired: f6187ec763637e6a57f5728dd9a3bdabc6d6b4e0
-  RCTTypeSafety: a01aca2dd3b27fa422d5239252ad38e54e958750
-  React: 741b4f5187e7a2137b69c88e65f940ba40600b4b
-  React-callinvoker: 72ba74b2d5d690c497631191ae6eeca0c043d9cf
-  React-Codegen: 8a7cda1633e4940de8a710f6bf5cae5dd673546e
-  React-Core: 72bb19702c465b6451a40501a2879532bec9acee
-  React-CoreModules: ffd19b082fc36b9b463fedf30955138b5426c053
-  React-cxxreact: 8b3dd87e3b8ea96dd4ad5c7bac8f31f1cc3da97f
-  React-hermes: be95942c3f47fc032da1387360413f00dae0ea68
-  React-jsi: 9978e2a64c2a4371b40e109f4ef30a33deaa9bcb
-  React-jsiexecutor: 18b5b33c5f2687a784a61bc8176611b73524ae77
-  React-jsinspector: b6ed4cb3ffa27a041cd440300503dc512b761450
-  React-logger: 186dd536128ae5924bc38ed70932c00aa740cd5b
+  RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
+  RCTRequired: 9b898847f76977a6dfed2a08f4c5ed37add75ec0
+  RCTTypeSafety: 0debdc4ba38c8138016d8d8ada4bdf9ec1b8aa82
+  React: f8afb04431634ac7e9b876dc96d30af9871f5946
+  React-callinvoker: 5ea86c3f93326867aa5114989d229db54d4759d0
+  React-Codegen: 0bf0f6934bc76ee750931467d2e3c5687e972560
+  React-Core: bbac074eba495788a01d1e5455b132872bf86843
+  React-CoreModules: 92fee6d8f4095e151b9678e44fcf0dc8eabeae37
+  React-cxxreact: e856e0370bf52aea71acce10007ad9ba6a63b66c
+  React-debug: c72219d497f675d547ce34cdc733e7e8fe2a5da3
+  React-Fabric: 59afb9db1a31cb7864196fa46bea99ab0033e0b1
+  React-FabricImage: 0ee33904487bbf1b96be2391195a059bbd416ead
+  React-graphics: 72181d50d637d5b982b6b8b8443390c84ca5147f
+  React-hermes: ac421eebea18bab58a57b70c590b7c11edaac00b
+  React-ImageManager: c9486ee6349a68aaa0d946ba65149590593bbd15
+  React-jserrorhandler: cbc83431c5f91521e4b75efb0b687168080781ee
+  React-jsi: 57498df51dfb8a37a996f470a457d8797e931eaa
+  React-jsiexecutor: d83a7d7aea2ffc60dbda0f3d523578a76820f0e1
+  React-jsinspector: 6fad0fe14882fb6b1c32e5cc8a4bd3d33a8b6790
+  React-logger: cb0dd15ac67b00e7b771ef15203edcb29d4a3f8e
+  React-Mapbuffer: ac7eff7bcdb1716d18eb7b305ee8c43a9a1ed7c8
   react-native-blur: 3e9c8e8e9f7d17fa1b94e1a0ae9fd816675f5382
   react-native-get-random-values: b6fb85e7169b9822976793e467458c151c3e8b69
   react-native-safe-area: c9cf765aa2dd96159476a99633e7d462ce5bb94f
-  react-native-safe-area-context: 36cc67648134e89465663b8172336a19eeda493d
+  react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89
   react-native-slider: dff0d8a46f368a8d1bacd8638570d75b9b0be400
-  react-native-video: 6dee623307ed9d04d1be2de87494f9a0fa2041d1
-  react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
-  React-perflogger: e706562ab7eb8eb590aa83a224d26fa13963d7f2
-  React-RCTActionSheet: 57d4bd98122f557479a3359ad5dad8e109e20c5a
-  React-RCTAnimation: ccf3ef00101ea74bda73a045d79a658b36728a60
-  React-RCTAppDelegate: d0c28a35c65e9a0aef287ac0dafe1b71b1ac180c
-  React-RCTBlob: 1700b92ece4357af0a49719c9638185ad2902e95
-  React-RCTImage: f2e4904566ccccaa4b704170fcc5ae144ca347bf
-  React-RCTLinking: 52a3740e3651e30aa11dff5a6debed7395dd8169
-  React-RCTNetwork: ea0976f2b3ffc7877cd7784e351dc460adf87b12
-  React-RCTSettings: ed5ac992b23e25c65c3cc31f11b5c940ae5e3e60
-  React-RCTText: c9dfc6722621d56332b4f3a19ac38105e7504145
-  React-RCTVibration: f09f08de63e4122deb32506e20ca4cae6e4e14c1
-  React-runtimeexecutor: 4817d63dbc9d658f8dc0ec56bd9b83ce531129f0
-  ReactCommon: 864169d79e7fb2e846ad1257a2afd7ed846d6375
+  react-native-video: 6768bf960f45c24bf75d2ba68d433d3ae3829a8e
+  react-native-webview: 02e4beee6b2b2b7391ee1c565788b8f8d6df9d05
+  React-nativeconfig: 4662ac75a0a77789c9ed896ed77baa1a25cdf006
+  React-NativeModulesApple: 92bc296f2ae166d10cb4d6a05498c80bf4ef9fa2
+  React-perflogger: 27ccacf853ba725524ef2b4e444f14e34d0837b0
+  React-RCTActionSheet: 77dd6a2a5cfab9e85b7f1add0f7e2e9cd697d936
+  React-RCTAnimation: 977a25a4e8007ecc90e556abcceb1b25602eea7c
+  React-RCTAppDelegate: 252a478047dbc9d0ac0dcda7440b4d3fbb6184a4
+  React-RCTBlob: 1e18ab09f57cf3bd2b9681cbeedfca866d971f50
+  React-RCTFabric: e52f9be153856408a06475bc90e97be0ba5a00b5
+  React-RCTImage: b1eac9526111cf7e37c304f94e81b76a5ae6a984
+  React-RCTLinking: d7f7dc665af6442ff38e18e34308da7865347bb1
+  React-RCTNetwork: c2c1df3a3c838e9547259e3638f6b290aebb3b72
+  React-RCTSettings: f3074b14047a57fa95499c28fb89028a894d3c18
+  React-RCTText: 9d48b2bbce5e1ed9c4d9514414dc6d99731d1b0a
+  React-RCTVibration: 394ea84082b08b5b3c211dc2bc9c0c4c163e7f23
+  React-rendererdebug: 5fb3c0f487cf77a9c87e6f8c3db21b996b669571
+  React-rncore: 333d0f6da78beb05dac8345669d987f0d65c9d7f
+  React-runtimeexecutor: 7e71a40def8262ef7d82a1145d873ea61b1a27b5
+  React-runtimescheduler: 06b3f2e3b3b6e9deb1fc63b543c7fd34177dbb07
+  React-utils: 2d25ca0a6e635c095bc5e67ac1202c7939ec4af3
+  ReactCommon: 8564d71cf76b1715740cb8bdc5b382d1ddd12dd1
   RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
-  RNCMaskedView: 949696f25ec596bfc697fc88e6f95cf0c79669b6
+  RNCMaskedView: f7c74478c83c4fdfc5cf4df51f80c0dd5cf125c6
   RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
-  RNGestureHandler: f75d81410b40aaa99e71ae8f8bb7a88620c95042
-  RNReanimated: d4f363f4987ae0ade3e36ff81c94e68261bf4b8d
-  RNScreens: 68fd1060f57dd1023880bf4c05d74784b5392789
-  RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
-  RNTAztecView: dc2635b4d33818f4c113717ff67071c1e367ed8c
+  RNGestureHandler: 28bdf9a766c081e603120f79e925b72817c751c6
+  RNReanimated: 6936b41d8afb97175e7c0ab40425b53103f71046
+  RNScreens: 2b73f5eb2ac5d94fbd61fa4be0bfebd345716825
+  RNSVG: 255767813dac22db1ec2062c8b7e7b856d4e5ae6
+  RNTAztecView: 8a6e9336ee33bfa61e05e2cdb0b128f9005ab6c6
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
-  WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
-  Yoga: f7decafdc5e8c125e6fa0da38a687e35238420fa
+  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
+  WordPress-Aztec-iOS: 47311b8a342f2b12babb5b8a705ab20b281a83ae
+  Yoga: ff0382b894475dba0b4d2a5fda860bfee5a9afad
 
-PODFILE CHECKSUM: 0965b30267e411f56545967f14da09df5daa07f4
+PODFILE CHECKSUM: 4684cf41ccdeb5f720da9f11c8904f21ad9fcc7f
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.3
diff --git a/packages/react-native-editor/metro.config.js b/packages/react-native-editor/metro.config.js
index 307853a612c8cf..c63fade2c33659 100644
--- a/packages/react-native-editor/metro.config.js
+++ b/packages/react-native-editor/metro.config.js
@@ -3,6 +3,11 @@
  */
 const path = require( 'path' );
 const fs = require( 'fs' );
+const {
+	getDefaultConfig,
+	mergeConfig,
+	// eslint-disable-next-line import/no-extraneous-dependencies
+} = require( '@react-native/metro-config' );
 
 const PACKAGES_DIR = path.resolve( __dirname, '..' );
 const packageNames = fs.readdirSync( PACKAGES_DIR ).filter( ( file ) => {
@@ -10,7 +15,13 @@ const packageNames = fs.readdirSync( PACKAGES_DIR ).filter( ( file ) => {
 	return stats.isDirectory();
 } );
 
-module.exports = {
+/**
+ * Metro configuration
+ * https://facebook.github.io/metro/docs/configuration
+ *
+ * @type {import('metro-config').MetroConfig}
+ */
+const config = {
 	watchFolders: [ path.resolve( __dirname, '../..' ) ],
 	resolver: {
 		sourceExts: [ 'js', 'cjs', 'json', 'scss', 'sass', 'ts', 'tsx' ],
@@ -52,3 +63,5 @@ module.exports = {
 		},
 	},
 };
+
+module.exports = mergeConfig( getDefaultConfig( __dirname ), config );
diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json
index bcc15b44b4ca1b..e6e53af1190ad7 100644
--- a/packages/react-native-editor/package.json
+++ b/packages/react-native-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-editor",
-	"version": "1.109.2",
+	"version": "1.121.0",
 	"description": "Mobile WordPress gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -23,55 +23,54 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12",
-		"npm": ">=6.9"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "src/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.20.0",
+		"@babel/runtime": "7.25.7",
 		"@react-native-clipboard/clipboard": "1.11.2",
 		"@react-native-community/blur": "4.2.0",
-		"@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz",
-		"@react-native-masked-view/masked-view": "0.2.9",
-		"@react-native/gradle-plugin": "0.72.11",
+		"@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-5/react-native-community-slider-3.0.2-wp-5.tgz",
+		"@react-native-masked-view/masked-view": "0.3.0",
 		"@react-navigation/core": "5.12.0",
 		"@react-navigation/native": "6.0.14",
 		"@react-navigation/routers": "5.4.9",
 		"@react-navigation/stack": "6.3.5",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/block-library": "file:../block-library",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/components": "file:../components",
-		"@wordpress/data": "file:../data",
-		"@wordpress/edit-post": "file:../edit-post",
-		"@wordpress/element": "file:../element",
-		"@wordpress/hooks": "file:../hooks",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/react-native-aztec": "file:../react-native-aztec",
-		"@wordpress/react-native-bridge": "file:../react-native-bridge",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/block-library": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/data": "*",
+		"@wordpress/edit-post": "*",
+		"@wordpress/element": "*",
+		"@wordpress/hooks": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/react-native-aztec": "*",
+		"@wordpress/react-native-bridge": "*",
 		"core-js": "^3.31.0",
 		"fast-average-color": "^9.1.1",
 		"gettext-parser": "^1.3.1",
 		"jed": "^1.1.1",
 		"jsdom-jscore-rn": "0.1.8",
-		"node-fetch": "^2.6.0",
-		"react-native": "0.71.11",
+		"node-fetch": "2.7.0",
+		"react-native": "0.73.3",
 		"react-native-fast-image": "8.5.11",
-		"react-native-gesture-handler": "2.10.2",
+		"react-native-gesture-handler": "2.14.1",
 		"react-native-get-random-values": "1.4.0",
 		"react-native-linear-gradient": "2.7.3",
 		"react-native-modal": "13.0.1",
-		"react-native-reanimated": "2.17.0",
+		"react-native-reanimated": "3.6.2",
 		"react-native-safe-area": "^0.5.0",
-		"react-native-safe-area-context": "4.6.3",
+		"react-native-safe-area-context": "4.8.2",
 		"react-native-sass-transformer": "^1.1.1",
-		"react-native-screens": "3.22.0",
-		"react-native-svg": "13.9.0",
+		"react-native-screens": "3.29.0",
+		"react-native-svg": "14.0.0",
 		"react-native-url-polyfill": "1.3.0",
-		"react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz",
-		"react-native-webview": "11.26.1"
+		"react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-7/react-native-video-5.2.0-wp-7.tgz",
+		"react-native-webview": "13.6.1"
 	},
 	"publishConfig": {
 		"access": "public"
@@ -80,7 +79,7 @@
 		"start": "echo \"\\x1b[33mThe start command is not available in this project. It is strongly recommended to use \\x1b[1:33mstart:reset\\x1b[0m\\x1b[33m to perform some cleanup when starting the metro bundler.\nOr you may use \\x1b[1:33mstart:quick\\x1b[0m\\x1b[33m for a quicker startup, but this may lead to unexpected javascript errors when running the app.\\x1b[0m\"",
 		"start:debug": "node --inspect-brk node_modules/.bin/react-native start",
 		"start:reset": "npm run clean:runtime && npm run start:quick -- --reset-cache",
-		"start:quick": "react-native start",
+		"start:quick": "react-native start --experimental-debugger",
 		"prern-bundle": "cd ../.. && patch-package --patch-dir packages/react-native-editor/metro-patch",
 		"rn-bundle": "react-native bundle",
 		"postrn-bundle": "cd ../.. && patch-package --reverse --patch-dir packages/react-native-editor/metro-patch",
@@ -101,7 +100,6 @@
 		"preios": "cd ios && (bundle check > /dev/null || bundle install) && bundle exec pod install --repo-update",
 		"preios:carthage": "cd ../react-native-aztec && npm run install-aztec-ios",
 		"preios:carthage:update": "cd ../react-native-aztec && npm run update-aztec-ios",
-		"preios:xcode10": "cd ../../node_modules/react-native && ./scripts/ios-install-third-party.sh && cd third-party/glog-0.3.5 && [ -f libglog.pc ] || ../../scripts/ios-configure-glog.sh",
 		"ios": "react-native run-ios",
 		"ios:fast": "react-native run-ios",
 		"device-tests": "cross-env NODE_ENV=test jest --forceExit --detectOpenHandles --no-cache --maxWorkers=3 --testPathIgnorePatterns='canary|gutenberg-editor-rendering' --config ./jest_ui.config.js",
diff --git a/packages/react-native-editor/react-native.config.js b/packages/react-native-editor/react-native.config.js
index eafa0b41ca9558..2496210957d66a 100644
--- a/packages/react-native-editor/react-native.config.js
+++ b/packages/react-native-editor/react-native.config.js
@@ -3,13 +3,90 @@
  */
 const path = require( 'path' );
 
+/**
+ * The `null` value for the Android `platform` below disables auto-linking, as
+ * we manually link these library binaries to avoid a Node.js dependency
+ * using binaries from the React Native Libraries Publisher repository
+ * in the host WordPress Android app.
+ */
 module.exports = {
 	dependencies: {
 		'@wordpress/react-native-bridge': {
 			root: path.resolve( __dirname, '../react-native-bridge' ),
+			platforms: {
+				android: null,
+			},
 		},
 		'@wordpress/react-native-aztec': {
 			root: path.resolve( __dirname, '../react-native-aztec' ),
+			platforms: {
+				android: null,
+			},
+		},
+		'@react-native-clipboard/clipboard': {
+			platforms: {
+				android: null,
+			},
+		},
+		'@react-native-community/blur': {
+			platforms: {
+				android: null,
+			},
+		},
+		'@react-native-masked-view/masked-view': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-fast-image': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-gesture-handler': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-reanimated': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-get-random-values': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-linear-gradient': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-safe-area-context': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-screens': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-svg': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-video': {
+			platforms: {
+				android: null,
+			},
+		},
+		'react-native-webview': {
+			platforms: {
+				android: null,
+			},
 		},
 	},
 	project: {
diff --git a/packages/react-native-editor/sass-transformer.js b/packages/react-native-editor/sass-transformer.js
index e399c7c4c05564..3b561eca6d88bd 100644
--- a/packages/react-native-editor/sass-transformer.js
+++ b/packages/react-native-editor/sass-transformer.js
@@ -40,7 +40,7 @@ const sass = require( 'sass' );
 // eslint-disable-next-line import/no-extraneous-dependencies
 const css2rn = require( 'css-to-react-native-transform' ).default;
 // eslint-disable-next-line import/no-extraneous-dependencies
-const upstreamTransformer = require( 'metro-react-native-babel-transformer' );
+const upstreamTransformer = require( '@react-native/metro-babel-transformer' );
 
 // TODO: need to find a way to pass the include paths and the default asset files via some config.
 const autoImportIncludePaths = [
@@ -60,9 +60,14 @@ const imports =
 	'@import "' + autoImportAssets.join( '";\n@import "' ) + '";\n\n';
 
 // Iterate through the include paths and extensions to find the file variant.
-function findVariant( name, extensions, includePaths ) {
+function findVariant( name, extensions, includePaths, projectRoot ) {
 	for ( let i = 0; i < includePaths.length; i++ ) {
-		const includePath = includePaths[ i ];
+		let includePath = includePaths[ i ];
+
+		// Workaround for not having the full path when loaded from Gutenberg Mobile
+		if ( includePath.startsWith( 'gutenberg' ) ) {
+			includePath = `${ projectRoot }/${ includePath }`;
+		}
 
 		// Try to find the file iterating through the extensions, in order.
 		const foundExtention = extensions.find( ( extension ) => {
@@ -117,7 +122,12 @@ function transform( src, filename, options ) {
 						path.resolve( path.dirname( filename ), urlPath.dir )
 					); // Add the file's dir to the search array.
 				}
-				const f = findVariant( urlPath.name, exts, incPaths );
+				const f = findVariant(
+					urlPath.name,
+					exts,
+					incPaths,
+					options.projectRoot
+				);
 
 				if ( f ) {
 					return { file: f };
diff --git a/packages/react-native-editor/src/api-fetch-setup.js b/packages/react-native-editor/src/api-fetch-setup.js
index 9885f2c55c90f2..874728678f60c0 100644
--- a/packages/react-native-editor/src/api-fetch-setup.js
+++ b/packages/react-native-editor/src/api-fetch-setup.js
@@ -8,8 +8,14 @@ import { applyFilters } from '@wordpress/hooks';
 const SUPPORTED_METHODS = [ 'GET', 'POST' ];
 // Please add only wp.org API paths here!
 const SUPPORTED_ENDPOINTS = {
+	// Temporarily disabling themes endpoint calls within the editor.
+	// Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/21034
+	// The editor's GET requests to the themes endpoint are not functioning as expected.
+	// This is likely due to the method used for performing GET requests within the host Android app.
+	// TODO: Investigate and resolve the issue with GET requests from the editor.
+	// Until then, themes endpoint calls are disabled to prevent unexpected behavior.
 	GET: [
-		/wp\/v2\/(media|categories|blocks|themes)\/?\d*?.*/i,
+		/wp\/v2\/(media|categories|blocks)\/?\d*?.*/i,
 		/wp\/v2\/search\?.*/i,
 		/oembed\/1\.0\/proxy\?.*/i,
 	],
@@ -26,7 +32,7 @@ const setTimeoutPromise = ( delay ) =>
 	new Promise( ( resolve ) => setTimeout( resolve, delay ) );
 
 const fetchHandler = (
-	{ path, method = 'GET', data },
+	{ path, method = 'GET', data, parse },
 	retries = 20,
 	retryCount = 1
 ) => {
@@ -51,7 +57,23 @@ const fetchHandler = (
 	}
 
 	const parseResponse = ( response ) => {
-		if ( typeof response === 'string' ) {
+		const isStringResponse = typeof response === 'string';
+
+		// If the 'parse' parameter is false, return the response as a new Response object
+		// with the JSON string. This is necessary because one of the middlewares in the API
+		// fetch library expects the response to be a JavaScript Response object with JSON
+		// functionality. By doing this, we ensure that the response is handled correctly
+		// by fetch-all-middleware.
+		if ( parse === false ) {
+			const body = isStringResponse
+				? response
+				: JSON.stringify( response );
+			return new Response( body, {
+				headers: { 'Content-Type': 'application/json' },
+			} );
+		}
+
+		if ( isStringResponse ) {
 			response = JSON.parse( response );
 		}
 		return response;
diff --git a/packages/react-native-editor/src/index.js b/packages/react-native-editor/src/index.js
index e4c73676651fa0..84828a19344174 100644
--- a/packages/react-native-editor/src/index.js
+++ b/packages/react-native-editor/src/index.js
@@ -51,11 +51,14 @@ const registerGutenberg = ( {
 			// Initialize editor
 			this.editorComponent = setup();
 
+			// TODO: Reinstate the optional setup configuration once we identify why
+			// it throws an error after the latest RN 0.73 upgrade.
+			// https://github.com/facebook/metro/blob/877933ddc03672a00214d26afe620b79479d6489/packages/metro-file-map/src/lib/TreeFS.js#L417
 			// Apply optional setup configuration, enabling modification via hooks.
-			if ( __DEV__ && typeof require.context === 'function' ) {
-				const req = require.context( './', false, /setup-local\.js$/ );
-				req.keys().forEach( ( key ) => req( key ).default() );
-			}
+			// if ( __DEV__ && typeof require.context === 'function' ) {
+			// 	const req = require.context( './', false, /setup-local\.js$/ );
+			// 	req.keys().forEach( ( key ) => req( key ).default() );
+			// }
 
 			// Dispatch pre-render hooks.
 			doAction( 'native.pre-render', parentProps );
diff --git a/packages/react-native-editor/src/initial-html.js b/packages/react-native-editor/src/initial-html.js
index 9cf963fa7bee88..684ca0dfbf8de4 100644
--- a/packages/react-native-editor/src/initial-html.js
+++ b/packages/react-native-editor/src/initial-html.js
@@ -11,7 +11,7 @@ export const textBlocks = `<!-- wp:heading -->
 <!-- /wp:heading -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First Item</li>
 <!-- /wp:list-item -->
 
diff --git a/packages/react-native-editor/src/jsdom-patches.js b/packages/react-native-editor/src/jsdom-patches.js
index c86e4c82f31270..680bdcf1eb12e8 100644
--- a/packages/react-native-editor/src/jsdom-patches.js
+++ b/packages/react-native-editor/src/jsdom-patches.js
@@ -257,6 +257,37 @@ Object.defineProperties( Node.prototype, {
 			return sibling;
 		},
 	},
+	dataset: {
+		get() {
+			const node = this;
+
+			// Helper function to convert property name to data-* attribute name
+			function toDataAttributeName( property ) {
+				return (
+					'data-' +
+					property.replace(
+						/[A-Z]/g,
+						( match ) => '-' + match.toLowerCase()
+					)
+				);
+			}
+			return new Proxy(
+				{},
+				{
+					set( _target, property, value ) {
+						const attributeName = toDataAttributeName( property );
+						node.setAttribute( attributeName, value );
+						return true;
+					},
+					get( _target, property ) {
+						const attributeName = toDataAttributeName( property );
+						return node.getAttribute( attributeName );
+					},
+				}
+			);
+		},
+		set() {},
+	},
 } );
 
 class DOMParser {
diff --git a/packages/react-native-editor/src/setup.js b/packages/react-native-editor/src/setup.js
index f5c80883b4b6d7..d6da4cb0542a3c 100644
--- a/packages/react-native-editor/src/setup.js
+++ b/packages/react-native-editor/src/setup.js
@@ -70,7 +70,6 @@ const setupInitHooks = () => {
 				featuredImageId,
 				rawStyles,
 				rawFeatures,
-				galleryWithImageBlocks,
 				locale,
 			} = props;
 
@@ -94,7 +93,6 @@ const setupInitHooks = () => {
 				capabilities,
 				rawStyles,
 				rawFeatures,
-				galleryWithImageBlocks,
 				locale,
 			};
 		}
diff --git a/packages/readable-js-assets-webpack-plugin/.npmrc b/packages/readable-js-assets-webpack-plugin/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/readable-js-assets-webpack-plugin/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
index f266e64d9d0f80..bd5ff8879c2a14 100644
--- a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
+++ b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 3.10.0 (2024-10-16)
+
+## 3.9.0 (2024-10-03)
+
+## 3.8.0 (2024-09-19)
+
+## 3.7.0 (2024-09-05)
+
+## 3.6.0 (2024-08-21)
+
+## 3.5.0 (2024-08-07)
+
+## 3.4.0 (2024-07-24)
+
+## 3.3.0 (2024-07-10)
+
+## 3.2.0 (2024-06-26)
+
+## 3.1.0 (2024-06-15)
+
+## 3.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 2.41.0 (2024-05-16)
+
+## 2.40.0 (2024-05-02)
+
+## 2.39.0 (2024-04-19)
+
+## 2.38.0 (2024-04-03)
+
+## 2.37.0 (2024-03-21)
+
+## 2.36.0 (2024-03-06)
+
+## 2.35.0 (2024-02-21)
+
+## 2.34.0 (2024-02-09)
+
+## 2.33.0 (2024-01-24)
+
+## 2.32.0 (2024-01-10)
+
+## 2.31.0 (2023-12-13)
+
 ## 2.30.0 (2023-11-29)
 
 ## 2.29.0 (2023-11-16)
@@ -64,6 +112,6 @@
 
 ## 2.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
diff --git a/packages/readable-js-assets-webpack-plugin/README.md b/packages/readable-js-assets-webpack-plugin/README.md
index 47d75a6f00edff..eb3eda12692d21 100644
--- a/packages/readable-js-assets-webpack-plugin/README.md
+++ b/packages/readable-js-assets-webpack-plugin/README.md
@@ -14,7 +14,7 @@ Install the module
 npm install @wordpress/readable-js-assets-webpack-plugin --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It also requires webpack 4.8.3 and newer. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Usage
 
diff --git a/packages/readable-js-assets-webpack-plugin/package.json b/packages/readable-js-assets-webpack-plugin/package.json
index d7cf02db881c37..4f7a42a8e59ea7 100644
--- a/packages/readable-js-assets-webpack-plugin/package.json
+++ b/packages/readable-js-assets-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/readable-js-assets-webpack-plugin",
-	"version": "2.30.0",
+	"version": "3.10.0",
 	"description": "Generate a readable JS file for each JS asset.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14.0"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"index.js"
diff --git a/packages/readable-js-assets-webpack-plugin/test/__snapshots__/build.js.snap b/packages/readable-js-assets-webpack-plugin/test/__snapshots__/build.js.snap
index e5a7d6f6accc84..92670d3d1cb376 100644
--- a/packages/readable-js-assets-webpack-plugin/test/__snapshots__/build.js.snap
+++ b/packages/readable-js-assets-webpack-plugin/test/__snapshots__/build.js.snap
@@ -1,8 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ReadableJsAssetsWebpackPlugin should produce the expected output: Asset file index.js should match snapshot 1`] = `
-"/******/ (function() { // webpackBootstrap
-var __webpack_exports__ = {};
+"/******/ (() => { // webpackBootstrap
 function notMinified() {
 	// eslint-disable-next-line no-console
 	console.log( 'hello' );
@@ -16,8 +15,7 @@ notMinified();
 exports[`ReadableJsAssetsWebpackPlugin should produce the expected output: Asset file index.min.js should match snapshot 1`] = `"console.log("hello");"`;
 
 exports[`ReadableJsAssetsWebpackPlugin should produce the expected output: Asset file view.js should match snapshot 1`] = `
-"/******/ (function() { // webpackBootstrap
-var __webpack_exports__ = {};
+"/******/ (() => { // webpackBootstrap
 function notMinified() {
 	// eslint-disable-next-line no-console
 	console.log( 'hello' );
diff --git a/packages/redux-routine/.npmrc b/packages/redux-routine/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/redux-routine/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/redux-routine/CHANGELOG.md b/packages/redux-routine/CHANGELOG.md
index d39cab61e6dd97..0aadde8ca5fa34 100644
--- a/packages/redux-routine/CHANGELOG.md
+++ b/packages/redux-routine/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.58.0 (2024-05-16)
+
+## 4.57.0 (2024-05-02)
+
+## 4.56.0 (2024-04-19)
+
+## 4.55.0 (2024-04-03)
+
+## 4.54.0 (2024-03-21)
+
+## 4.53.0 (2024-03-06)
+
+## 4.52.0 (2024-02-21)
+
+## 4.51.0 (2024-02-09)
+
+## 4.50.0 (2024-01-24)
+
+## 4.49.0 (2024-01-10)
+
+## 4.48.0 (2023-12-13)
+
 ## 4.47.0 (2023-11-29)
 
 ## 4.46.0 (2023-11-16)
@@ -70,7 +118,7 @@
 
 ## 4.16.0 (2022-08-24)
 
-### Bug Fix
+### Bug Fixes
 
 -   Packages: Replace `is-plain-obj` with `is-plain-object` ([#43511](https://github.com/WordPress/gutenberg/pull/43511)).
 
@@ -119,7 +167,7 @@
 
 ## 3.7.0 (2020-02-04)
 
-### Bug Fix
+### Bug Fixes
 
 -   Change the `isGenerator` check for better compatibility with generator helper libraries ([#19666](https://github.com/WordPress/gutenberg/pull/19666)).
 
@@ -136,23 +184,23 @@
 
 ## 3.0.2 (2018-10-18)
 
-### Bug Fix
+### Bug Fixes
 
 -   Account for null value in redux-routine createRuntime (introduces `isAction` and `isActionOfType` methods to assist with that).
 
 ## 3.0.0 (2018-09-30)
 
-### Breaking change
+### Breaking Changes
 
 -   The middleware returns a promise resolving once the runtime finishes iterating over the generator.
 -   It's not possible to kill the execution of the runtime anymore by returning `undefined`
 
-## Bug Fixes
+### Bug Fixes
 
 -   Fix running routines in Firefox.
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/redux-routine/package.json b/packages/redux-routine/package.json
index 3dbd8557a6a609..70d1cae1a8b5fd 100644
--- a/packages/redux-routine/package.json
+++ b/packages/redux-routine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/redux-routine",
-	"version": "4.47.0",
+	"version": "5.10.0",
 	"description": "Redux middleware for generator coroutines.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -29,7 +30,7 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"is-plain-object": "^5.0.0",
 		"is-promise": "^4.0.0",
 		"rungen": "^0.3.2"
@@ -39,5 +40,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/redux-routine/tsconfig.json b/packages/redux-routine/tsconfig.json
index f108b30216124f..6e33d8ff82d47e 100644
--- a/packages/redux-routine/tsconfig.json
+++ b/packages/redux-routine/tsconfig.json
@@ -1,9 +1,9 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
-		"declarationDir": "build-types",
-		"noUnusedParameters": false
+		"declarationDir": "build-types"
 	},
 	"include": [ "src/**/*" ]
 }
diff --git a/packages/report-flaky-tests/.npmrc b/packages/report-flaky-tests/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/report-flaky-tests/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/report-flaky-tests/action.yml b/packages/report-flaky-tests/action.yml
index 5dfcbeb0d9fc60..00b84b26687643 100644
--- a/packages/report-flaky-tests/action.yml
+++ b/packages/report-flaky-tests/action.yml
@@ -13,5 +13,5 @@ inputs:
         required: true
         default: 'flaky-tests'
 runs:
-    using: 'node16'
+    using: 'node20'
     main: 'build/index.js'
diff --git a/packages/report-flaky-tests/package.json b/packages/report-flaky-tests/package.json
index 8766762fcc1b70..77de2a4f3ddee0 100644
--- a/packages/report-flaky-tests/package.json
+++ b/packages/report-flaky-tests/package.json
@@ -20,8 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14",
-		"npm": ">=6.9"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"types": "build-types",
diff --git a/packages/report-flaky-tests/src/__tests__/run.test.ts b/packages/report-flaky-tests/src/__tests__/run.test.ts
index 529dcd41cdcf89..f194d59c04fee6 100644
--- a/packages/report-flaky-tests/src/__tests__/run.test.ts
+++ b/packages/report-flaky-tests/src/__tests__/run.test.ts
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import * as core from '@actions/core';
-import * as github from '@actions/github';
 
 /**
  * Internal dependencies
diff --git a/packages/report-flaky-tests/tsconfig.json b/packages/report-flaky-tests/tsconfig.json
index 3a3ae6ff9520af..09fc242db010db 100644
--- a/packages/report-flaky-tests/tsconfig.json
+++ b/packages/report-flaky-tests/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"module": "CommonJS",
diff --git a/packages/reusable-blocks/.npmrc b/packages/reusable-blocks/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/reusable-blocks/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/reusable-blocks/CHANGELOG.md b/packages/reusable-blocks/CHANGELOG.md
index 15a11093d280ca..62e09d8e61dfc6 100644
--- a/packages/reusable-blocks/CHANGELOG.md
+++ b/packages/reusable-blocks/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.35.0 (2024-05-16)
+
+## 4.34.0 (2024-05-02)
+
+## 4.33.0 (2024-04-19)
+
+## 4.32.0 (2024-04-03)
+
+## 4.31.0 (2024-03-21)
+
+## 4.30.0 (2024-03-06)
+
+## 4.29.0 (2024-02-21)
+
+## 4.28.0 (2024-02-09)
+
+## 4.27.0 (2024-01-24)
+
+## 4.26.0 (2024-01-10)
+
+## 4.25.0 (2023-12-13)
+
 ## 4.24.0 (2023-11-29)
 
 ## 4.23.0 (2023-11-16)
@@ -96,7 +144,7 @@
 
 ## 3.1.1 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/compose` dependency ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -104,7 +152,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -123,7 +171,7 @@
 
 ## 1.1.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the reusable blocks namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
diff --git a/packages/reusable-blocks/package.json b/packages/reusable-blocks/package.json
index 2ab00edaba81ad..461a17001b0c38 100644
--- a/packages/reusable-blocks/package.json
+++ b/packages/reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/reusable-blocks",
-	"version": "4.24.0",
+	"version": "5.10.0",
 	"description": "Reusable blocks utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,18 +29,18 @@
 		"{src,build,build-module}/{index.js,store/index.js}"
 	],
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/components": "file:../components",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/notices": "file:../notices",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/url": "file:../url"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/block-editor": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/notices": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/url": "*"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -47,5 +48,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js
index cf8b3d96c8d7e1..e0d8592df4d8c3 100644
--- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js
+++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js
@@ -2,10 +2,7 @@
  * WordPress dependencies
  */
 import { hasBlockSupport, isReusableBlock } from '@wordpress/blocks';
-import {
-	store as blockEditorStore,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 import { useCallback, useState } from '@wordpress/element';
 import {
 	MenuItem,
@@ -26,11 +23,6 @@ import { store as coreStore } from '@wordpress/core-data';
  * Internal dependencies
  */
 import { store } from '../../store';
-import { unlock } from '../../lock-unlock';
-
-const { useReusableBlocksRenameHint, ReusableBlocksRenameHint } = unlock(
-	blockEditorPrivateApis
-);
 
 /**
  * Menu control to convert block(s) to reusable block.
@@ -46,7 +38,6 @@ export default function ReusableBlockConvertButton( {
 	rootClientId,
 	onClose,
 } ) {
-	const showRenameHint = useReusableBlocksRenameHint();
 	const [ syncType, setSyncType ] = useState( undefined );
 	const [ isModalOpen, setIsModalOpen ] = useState( false );
 	const [ title, setTitle ] = useState( '' );
@@ -92,7 +83,11 @@ export default function ReusableBlockConvertButton( {
 						hasBlockSupport( block.name, 'reusable', true )
 				) &&
 				// Hide when current doesn't have permission to do that.
-				!! canUser( 'create', 'blocks' );
+				// Blocks refers to the wp_block post type, this checks the ability to create a post of that type.
+				!! canUser( 'create', {
+					kind: 'postType',
+					name: 'wp_block',
+				} );
 
 			return _canConvert;
 		},
@@ -152,9 +147,7 @@ export default function ReusableBlockConvertButton( {
 	return (
 		<>
 			<MenuItem icon={ symbol } onClick={ () => setIsModalOpen( true ) }>
-				{ showRenameHint
-					? __( 'Create pattern/reusable block' )
-					: __( 'Create pattern' ) }
+				{ __( 'Create pattern' ) }
 			</MenuItem>
 			{ isModalOpen && (
 				<Modal
@@ -175,8 +168,8 @@ export default function ReusableBlockConvertButton( {
 						} }
 					>
 						<VStack spacing="5">
-							<ReusableBlocksRenameHint />
 							<TextControl
+								__next40pxDefaultSize
 								__nextHasNoMarginBottom
 								label={ __( 'Name' ) }
 								value={ title }
@@ -184,10 +177,8 @@ export default function ReusableBlockConvertButton( {
 								placeholder={ __( 'My pattern' ) }
 							/>
 							<ToggleControl
-								label={ _x(
-									'Synced',
-									'Option that makes an individual pattern synchronized'
-								) }
+								__nextHasNoMarginBottom
+								label={ _x( 'Synced', 'pattern (singular)' ) }
 								help={ __(
 									'Sync this pattern across multiple locations.'
 								) }
@@ -200,6 +191,7 @@ export default function ReusableBlockConvertButton( {
 							/>
 							<HStack justify="right">
 								<Button
+									__next40pxDefaultSize
 									variant="tertiary"
 									onClick={ () => {
 										setIsModalOpen( false );
@@ -209,7 +201,11 @@ export default function ReusableBlockConvertButton( {
 									{ __( 'Cancel' ) }
 								</Button>
 
-								<Button variant="primary" type="submit">
+								<Button
+									__next40pxDefaultSize
+									variant="primary"
+									type="submit"
+								>
 									{ __( 'Create' ) }
 								</Button>
 							</HStack>
diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js
index cf03c2a07b7a0c..47047fcc561e4e 100644
--- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js
+++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js
@@ -17,34 +17,35 @@ import { store as reusableBlocksStore } from '../../store';
 function ReusableBlocksManageButton( { clientId } ) {
 	const { canRemove, isVisible, managePatternsUrl } = useSelect(
 		( select ) => {
-			const { getBlock, canRemoveBlock, getBlockCount, getSettings } =
+			const { getBlock, canRemoveBlock, getBlockCount } =
 				select( blockEditorStore );
 			const { canUser } = select( coreStore );
 			const reusableBlock = getBlock( clientId );
-			const isBlockTheme = getSettings().__unstableIsBlockBasedTheme;
 
 			return {
 				canRemove: canRemoveBlock( clientId ),
 				isVisible:
 					!! reusableBlock &&
 					isReusableBlock( reusableBlock ) &&
-					!! canUser(
-						'update',
-						'blocks',
-						reusableBlock.attributes.ref
-					),
+					!! canUser( 'update', {
+						kind: 'postType',
+						name: 'wp_block',
+						id: reusableBlock.attributes.ref,
+					} ),
 				innerBlockCount: getBlockCount( clientId ),
 				// The site editor and templates both check whether the user
 				// has edit_theme_options capabilities. We can leverage that here
 				// and omit the manage patterns link if the user can't access it.
-				managePatternsUrl:
-					isBlockTheme && canUser( 'read', 'templates' )
-						? addQueryArgs( 'site-editor.php', {
-								path: '/patterns',
-						  } )
-						: addQueryArgs( 'edit.php', {
-								post_type: 'wp_block',
-						  } ),
+				managePatternsUrl: canUser( 'create', {
+					kind: 'postType',
+					name: 'wp_template',
+				} )
+					? addQueryArgs( 'site-editor.php', {
+							path: '/patterns',
+					  } )
+					: addQueryArgs( 'edit.php', {
+							post_type: 'wp_block',
+					  } ),
 			};
 		},
 		[ clientId ]
diff --git a/packages/reusable-blocks/src/lock-unlock.js b/packages/reusable-blocks/src/lock-unlock.js
index c0bc2d1529f7d9..4f637985155805 100644
--- a/packages/reusable-blocks/src/lock-unlock.js
+++ b/packages/reusable-blocks/src/lock-unlock.js
@@ -4,6 +4,6 @@
 import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
 
 export const { unlock } = __dangerousOptInToUnstableAPIsOnlyForCoreModules(
-	'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+	'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
 	'@wordpress/reusable-blocks'
 );
diff --git a/packages/reusable-blocks/src/store/test/actions.js b/packages/reusable-blocks/src/store/test/actions.js
index b2feae1195ee1d..debd6568683891 100644
--- a/packages/reusable-blocks/src/store/test/actions.js
+++ b/packages/reusable-blocks/src/store/test/actions.js
@@ -12,6 +12,7 @@ import {
 
 import { store as coreStore } from '@wordpress/core-data';
 import apiFetch from '@wordpress/api-fetch';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
@@ -31,6 +32,7 @@ function createRegistryWithStores() {
 	registry.register( blockEditorStore );
 	registry.register( reusableBlocksStore );
 	registry.register( blocksStore );
+	registry.register( preferencesStore );
 
 	// Register entity here instead of mocking API handlers for loadPostTypeEntities()
 	registry.dispatch( coreStore ).addEntities( [
diff --git a/packages/rich-text/.npmrc b/packages/rich-text/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/rich-text/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/rich-text/CHANGELOG.md b/packages/rich-text/CHANGELOG.md
index 363ba40911fc65..5717f59a34d285 100644
--- a/packages/rich-text/CHANGELOG.md
+++ b/packages/rich-text/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 7.10.0 (2024-10-16)
+
+## 7.9.0 (2024-10-03)
+
+## 7.8.0 (2024-09-19)
+
+## 7.7.0 (2024-09-05)
+
+## 7.6.0 (2024-08-21)
+
+## 7.5.0 (2024-08-07)
+
+## 7.4.0 (2024-07-24)
+
+## 7.3.0 (2024-07-10)
+
+## 7.2.0 (2024-06-26)
+
+## 7.1.0 (2024-06-15)
+
+## 7.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 6.35.0 (2024-05-16)
+
+## 6.34.0 (2024-05-02)
+
+## 6.33.0 (2024-04-19)
+
+## 6.32.0 (2024-04-03)
+
+## 6.31.0 (2024-03-21)
+
+## 6.30.0 (2024-03-06)
+
+## 6.29.0 (2024-02-21)
+
+## 6.28.0 (2024-02-09)
+
+## 6.27.0 (2024-01-24)
+
+## 6.26.0 (2024-01-10)
+
+## 6.25.0 (2023-12-13)
+
 ## 6.24.0 (2023-11-29)
 
 ## 6.23.0 (2023-11-16)
@@ -104,7 +152,7 @@
 
 ## 5.1.1 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/dom`, `@wordpress/is-shallow-equal` and `classnames` dependencies ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -112,7 +160,7 @@
 
 ## 5.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -131,7 +179,7 @@
 
 ## 3.24.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the rich-text namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
@@ -155,7 +203,7 @@
 
 ## 3.1.0 (2019-03-06)
 
-### Enhancement
+### Enhancements
 
 -   Added format boundaries.
 -   Removed parameters from `create` to filter out content.
@@ -185,7 +233,7 @@
 
 ## 2.0.3 (2018-11-09)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix Format Type Assignment During Parsing.
 -   Fix applying formats on multiline values without wrapper tags.
diff --git a/packages/rich-text/README.md b/packages/rich-text/README.md
index 90726ff238c1bd..033a4f2c747abe 100644
--- a/packages/rich-text/README.md
+++ b/packages/rich-text/README.md
@@ -355,6 +355,19 @@ _Returns_
 
 -   `RichTextValue`: A new value with replacements applied.
 
+### RichTextData
+
+The RichTextData class is used to instantiate a wrapper around rich text values, with methods that can be used to transform or manipulate the data.
+
+-   Create an empty instance: `new RichTextData()`.
+-   Create one from an HTML string: `RichTextData.fromHTMLString(
+'<em>hello</em>' )`.
+-   Create one from a wrapper HTMLElement: `RichTextData.fromHTMLElement(
+document.querySelector( 'p' ) )`.
+-   Create one from plain text: `RichTextData.fromPlainText( '1\n2' )`.
+-   Create one from a rich text value: `new RichTextData( { text: '...',
+formats: [ ... ] } )`.
+
 ### RichTextValue
 
 An object which represents a formatted string. See main `@wordpress/rich-text` documentation for more information.
@@ -417,8 +430,9 @@ Create an HTML string from a Rich Text value.
 
 _Parameters_
 
--   _$1_ `Object`: Named argements.
+-   _$1_ `Object`: Named arguments.
 -   _$1.value_ `RichTextValue`: Rich text value.
+-   _$1.preserveWhiteSpace_ `[boolean]`: Preserves newlines if true.
 
 _Returns_
 
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
index d5cfb022b662c3..c2b99faaa72d7f 100644
--- a/packages/rich-text/package.json
+++ b/packages/rich-text/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/rich-text",
-	"version": "6.24.0",
+	"version": "7.10.0",
 	"description": "Rich text value and manipulation API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -30,22 +31,22 @@
 	],
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "file:../a11y",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/element": "file:../element",
-		"@wordpress/escape-html": "file:../escape-html",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/keycodes": "file:../keycodes",
-		"memize": "^2.1.0",
-		"rememo": "^4.0.2"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/a11y": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/element": "*",
+		"@wordpress/escape-html": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/keycodes": "*",
+		"memize": "^2.1.0"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/rich-text/src/component/event-listeners/copy-handler.js b/packages/rich-text/src/component/event-listeners/copy-handler.js
new file mode 100644
index 00000000000000..0cc1594c3ab914
--- /dev/null
+++ b/packages/rich-text/src/component/event-listeners/copy-handler.js
@@ -0,0 +1,41 @@
+/**
+ * Internal dependencies
+ */
+import { toHTMLString } from '../../to-html-string';
+import { isCollapsed } from '../../is-collapsed';
+import { slice } from '../../slice';
+import { getTextContent } from '../../get-text-content';
+
+export default ( props ) => ( element ) => {
+	function onCopy( event ) {
+		const { record } = props.current;
+		const { ownerDocument } = element;
+		if (
+			isCollapsed( record.current ) ||
+			! element.contains( ownerDocument.activeElement )
+		) {
+			return;
+		}
+
+		const selectedRecord = slice( record.current );
+		const plainText = getTextContent( selectedRecord );
+		const html = toHTMLString( { value: selectedRecord } );
+		event.clipboardData.setData( 'text/plain', plainText );
+		event.clipboardData.setData( 'text/html', html );
+		event.clipboardData.setData( 'rich-text', 'true' );
+		event.preventDefault();
+
+		if ( event.type === 'cut' ) {
+			ownerDocument.execCommand( 'delete' );
+		}
+	}
+
+	const { defaultView } = element.ownerDocument;
+
+	defaultView.addEventListener( 'copy', onCopy );
+	defaultView.addEventListener( 'cut', onCopy );
+	return () => {
+		defaultView.removeEventListener( 'copy', onCopy );
+		defaultView.removeEventListener( 'cut', onCopy );
+	};
+};
diff --git a/packages/rich-text/src/component/event-listeners/delete.js b/packages/rich-text/src/component/event-listeners/delete.js
new file mode 100644
index 00000000000000..62dd06a0f2cdb5
--- /dev/null
+++ b/packages/rich-text/src/component/event-listeners/delete.js
@@ -0,0 +1,38 @@
+/**
+ * WordPress dependencies
+ */
+import { BACKSPACE, DELETE } from '@wordpress/keycodes';
+
+/**
+ * Internal dependencies
+ */
+import { remove } from '../../remove';
+
+export default ( props ) => ( element ) => {
+	function onKeyDown( event ) {
+		const { keyCode } = event;
+		const { createRecord, handleChange } = props.current;
+
+		if ( event.defaultPrevented ) {
+			return;
+		}
+
+		if ( keyCode !== DELETE && keyCode !== BACKSPACE ) {
+			return;
+		}
+
+		const currentValue = createRecord();
+		const { start, end, text } = currentValue;
+
+		// Always handle full content deletion ourselves.
+		if ( start === 0 && end !== 0 && end === text.length ) {
+			handleChange( remove( currentValue ) );
+			event.preventDefault();
+		}
+	}
+
+	element.addEventListener( 'keydown', onKeyDown );
+	return () => {
+		element.removeEventListener( 'keydown', onKeyDown );
+	};
+};
diff --git a/packages/rich-text/src/component/event-listeners/format-boundaries.js b/packages/rich-text/src/component/event-listeners/format-boundaries.js
new file mode 100644
index 00000000000000..e9fdfd10ebfd5c
--- /dev/null
+++ b/packages/rich-text/src/component/event-listeners/format-boundaries.js
@@ -0,0 +1,103 @@
+/**
+ * WordPress dependencies
+ */
+import { LEFT, RIGHT } from '@wordpress/keycodes';
+
+/**
+ * Internal dependencies
+ */
+import { isCollapsed } from '../../is-collapsed';
+
+const EMPTY_ACTIVE_FORMATS = [];
+
+export default ( props ) => ( element ) => {
+	function onKeyDown( event ) {
+		const { keyCode, shiftKey, altKey, metaKey, ctrlKey } = event;
+
+		if (
+			// Only override left and right keys without modifiers pressed.
+			shiftKey ||
+			altKey ||
+			metaKey ||
+			ctrlKey ||
+			( keyCode !== LEFT && keyCode !== RIGHT )
+		) {
+			return;
+		}
+
+		const { record, applyRecord, forceRender } = props.current;
+		const {
+			text,
+			formats,
+			start,
+			end,
+			activeFormats: currentActiveFormats = [],
+		} = record.current;
+		const collapsed = isCollapsed( record.current );
+		const { ownerDocument } = element;
+		const { defaultView } = ownerDocument;
+		// To do: ideally, we should look at visual position instead.
+		const { direction } = defaultView.getComputedStyle( element );
+		const reverseKey = direction === 'rtl' ? RIGHT : LEFT;
+		const isReverse = event.keyCode === reverseKey;
+
+		// If the selection is collapsed and at the very start, do nothing if
+		// navigating backward.
+		// If the selection is collapsed and at the very end, do nothing if
+		// navigating forward.
+		if ( collapsed && currentActiveFormats.length === 0 ) {
+			if ( start === 0 && isReverse ) {
+				return;
+			}
+
+			if ( end === text.length && ! isReverse ) {
+				return;
+			}
+		}
+
+		// If the selection is not collapsed, let the browser handle collapsing
+		// the selection for now. Later we could expand this logic to set
+		// boundary positions if needed.
+		if ( ! collapsed ) {
+			return;
+		}
+
+		const formatsBefore = formats[ start - 1 ] || EMPTY_ACTIVE_FORMATS;
+		const formatsAfter = formats[ start ] || EMPTY_ACTIVE_FORMATS;
+		const destination = isReverse ? formatsBefore : formatsAfter;
+		const isIncreasing = currentActiveFormats.every(
+			( format, index ) => format === destination[ index ]
+		);
+
+		let newActiveFormatsLength = currentActiveFormats.length;
+
+		if ( ! isIncreasing ) {
+			newActiveFormatsLength--;
+		} else if ( newActiveFormatsLength < destination.length ) {
+			newActiveFormatsLength++;
+		}
+
+		if ( newActiveFormatsLength === currentActiveFormats.length ) {
+			record.current._newActiveFormats = destination;
+			return;
+		}
+
+		event.preventDefault();
+
+		const origin = isReverse ? formatsAfter : formatsBefore;
+		const source = isIncreasing ? destination : origin;
+		const newActiveFormats = source.slice( 0, newActiveFormatsLength );
+		const newValue = {
+			...record.current,
+			activeFormats: newActiveFormats,
+		};
+		record.current = newValue;
+		applyRecord( newValue );
+		forceRender();
+	}
+
+	element.addEventListener( 'keydown', onKeyDown );
+	return () => {
+		element.removeEventListener( 'keydown', onKeyDown );
+	};
+};
diff --git a/packages/rich-text/src/component/event-listeners/index.js b/packages/rich-text/src/component/event-listeners/index.js
new file mode 100644
index 00000000000000..4f69db36db06a0
--- /dev/null
+++ b/packages/rich-text/src/component/event-listeners/index.js
@@ -0,0 +1,45 @@
+/**
+ * WordPress dependencies
+ */
+import { useMemo, useRef, useInsertionEffect } from '@wordpress/element';
+import { useRefEffect } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import copyHandler from './copy-handler';
+import selectObject from './select-object';
+import formatBoundaries from './format-boundaries';
+import deleteHandler from './delete';
+import inputAndSelection from './input-and-selection';
+import selectionChangeCompat from './selection-change-compat';
+
+const allEventListeners = [
+	copyHandler,
+	selectObject,
+	formatBoundaries,
+	deleteHandler,
+	inputAndSelection,
+	selectionChangeCompat,
+];
+
+export function useEventListeners( props ) {
+	const propsRef = useRef( props );
+	useInsertionEffect( () => {
+		propsRef.current = props;
+	} );
+	const refEffects = useMemo(
+		() => allEventListeners.map( ( refEffect ) => refEffect( propsRef ) ),
+		[ propsRef ]
+	);
+
+	return useRefEffect(
+		( element ) => {
+			const cleanups = refEffects.map( ( effect ) => effect( element ) );
+			return () => {
+				cleanups.forEach( ( cleanup ) => cleanup() );
+			};
+		},
+		[ refEffects ]
+	);
+}
diff --git a/packages/rich-text/src/component/event-listeners/input-and-selection.js b/packages/rich-text/src/component/event-listeners/input-and-selection.js
new file mode 100644
index 00000000000000..621f1c59fab04e
--- /dev/null
+++ b/packages/rich-text/src/component/event-listeners/input-and-selection.js
@@ -0,0 +1,259 @@
+/**
+ * Internal dependencies
+ */
+import { getActiveFormats } from '../../get-active-formats';
+import { updateFormats } from '../../update-formats';
+
+/**
+ * All inserting input types that would insert HTML into the DOM.
+ *
+ * @see https://www.w3.org/TR/input-events-2/#interface-InputEvent-Attributes
+ *
+ * @type {Set}
+ */
+const INSERTION_INPUT_TYPES_TO_IGNORE = new Set( [
+	'insertParagraph',
+	'insertOrderedList',
+	'insertUnorderedList',
+	'insertHorizontalRule',
+	'insertLink',
+] );
+
+const EMPTY_ACTIVE_FORMATS = [];
+
+const PLACEHOLDER_ATTR_NAME = 'data-rich-text-placeholder';
+
+/**
+ * If the selection is set on the placeholder element, collapse the selection to
+ * the start (before the placeholder).
+ *
+ * @param {Window} defaultView
+ */
+function fixPlaceholderSelection( defaultView ) {
+	const selection = defaultView.getSelection();
+	const { anchorNode, anchorOffset } = selection;
+
+	if ( anchorNode.nodeType !== anchorNode.ELEMENT_NODE ) {
+		return;
+	}
+
+	const targetNode = anchorNode.childNodes[ anchorOffset ];
+
+	if (
+		! targetNode ||
+		targetNode.nodeType !== targetNode.ELEMENT_NODE ||
+		! targetNode.hasAttribute( PLACEHOLDER_ATTR_NAME )
+	) {
+		return;
+	}
+
+	selection.collapseToStart();
+}
+
+export default ( props ) => ( element ) => {
+	const { ownerDocument } = element;
+	const { defaultView } = ownerDocument;
+
+	let isComposing = false;
+
+	function onInput( event ) {
+		// Do not trigger a change if characters are being composed. Browsers
+		// will usually emit a final `input` event when the characters are
+		// composed. As of December 2019, Safari doesn't support
+		// nativeEvent.isComposing.
+		if ( isComposing ) {
+			return;
+		}
+
+		let inputType;
+
+		if ( event ) {
+			inputType = event.inputType;
+		}
+
+		const { record, applyRecord, createRecord, handleChange } =
+			props.current;
+
+		// The browser formatted something or tried to insert HTML. Overwrite
+		// it. It will be handled later by the format library if needed.
+		if (
+			inputType &&
+			( inputType.indexOf( 'format' ) === 0 ||
+				INSERTION_INPUT_TYPES_TO_IGNORE.has( inputType ) )
+		) {
+			applyRecord( record.current );
+			return;
+		}
+
+		const currentValue = createRecord();
+		const { start, activeFormats: oldActiveFormats = [] } = record.current;
+
+		// Update the formats between the last and new caret position.
+		const change = updateFormats( {
+			value: currentValue,
+			start,
+			end: currentValue.start,
+			formats: oldActiveFormats,
+		} );
+
+		handleChange( change );
+	}
+
+	/**
+	 * Syncs the selection to local state. A callback for the `selectionchange`
+	 * event.
+	 */
+	function handleSelectionChange() {
+		const { record, applyRecord, createRecord, onSelectionChange } =
+			props.current;
+
+		// Check if the implementor disabled editing. `contentEditable` does
+		// disable input, but not text selection, so we must ignore selection
+		// changes.
+		if ( element.contentEditable !== 'true' ) {
+			return;
+		}
+
+		// Ensure the active element is the rich text element.
+		if ( ownerDocument.activeElement !== element ) {
+			// If it is not, we can stop listening for selection changes. We
+			// resume listening when the element is focused.
+			ownerDocument.removeEventListener(
+				'selectionchange',
+				handleSelectionChange
+			);
+			return;
+		}
+
+		// In case of a keyboard event, ignore selection changes during
+		// composition.
+		if ( isComposing ) {
+			return;
+		}
+
+		const { start, end, text } = createRecord();
+		const oldRecord = record.current;
+
+		// Fallback mechanism for IE11, which doesn't support the input event.
+		// Any input results in a selection change.
+		if ( text !== oldRecord.text ) {
+			onInput();
+			return;
+		}
+
+		if ( start === oldRecord.start && end === oldRecord.end ) {
+			// Sometimes the browser may set the selection on the placeholder
+			// element, in which case the caret is not visible. We need to set
+			// the caret before the placeholder if that's the case.
+			if ( oldRecord.text.length === 0 && start === 0 ) {
+				fixPlaceholderSelection( defaultView );
+			}
+
+			return;
+		}
+
+		const newValue = {
+			...oldRecord,
+			start,
+			end,
+			// _newActiveFormats may be set on arrow key navigation to control
+			// the right boundary position. If undefined, getActiveFormats will
+			// give the active formats according to the browser.
+			activeFormats: oldRecord._newActiveFormats,
+			_newActiveFormats: undefined,
+		};
+
+		const newActiveFormats = getActiveFormats(
+			newValue,
+			EMPTY_ACTIVE_FORMATS
+		);
+
+		// Update the value with the new active formats.
+		newValue.activeFormats = newActiveFormats;
+
+		// It is important that the internal value is updated first,
+		// otherwise the value will be wrong on render!
+		record.current = newValue;
+		applyRecord( newValue, { domOnly: true } );
+		onSelectionChange( start, end );
+	}
+
+	function onCompositionStart() {
+		isComposing = true;
+		// Do not update the selection when characters are being composed as
+		// this rerenders the component and might destroy internal browser
+		// editing state.
+		ownerDocument.removeEventListener(
+			'selectionchange',
+			handleSelectionChange
+		);
+		// Remove the placeholder. Since the rich text value doesn't update
+		// during composition, the placeholder doesn't get removed. There's no
+		// need to re-add it, when the value is updated on compositionend it
+		// will be re-added when the value is empty.
+		element.querySelector( `[${ PLACEHOLDER_ATTR_NAME }]` )?.remove();
+	}
+
+	function onCompositionEnd() {
+		isComposing = false;
+		// Ensure the value is up-to-date for browsers that don't emit a final
+		// input event after composition.
+		onInput( { inputType: 'insertText' } );
+		// Tracking selection changes can be resumed.
+		ownerDocument.addEventListener(
+			'selectionchange',
+			handleSelectionChange
+		);
+	}
+
+	function onFocus() {
+		const { record, isSelected, onSelectionChange, applyRecord } =
+			props.current;
+
+		// When the whole editor is editable, let writing flow handle
+		// selection.
+		if ( element.parentElement.closest( '[contenteditable="true"]' ) ) {
+			return;
+		}
+
+		if ( ! isSelected ) {
+			// We know for certain that on focus, the old selection is invalid.
+			// It will be recalculated on the next mouseup, keyup, or touchend
+			// event.
+			const index = undefined;
+
+			record.current = {
+				...record.current,
+				start: index,
+				end: index,
+				activeFormats: EMPTY_ACTIVE_FORMATS,
+			};
+		} else {
+			applyRecord( record.current, { domOnly: true } );
+		}
+
+		onSelectionChange( record.current.start, record.current.end );
+
+		// There is no selection change event when the element is focused, so
+		// we need to manually trigger it. The selection is also not available
+		// yet in this call stack.
+		window.queueMicrotask( handleSelectionChange );
+
+		ownerDocument.addEventListener(
+			'selectionchange',
+			handleSelectionChange
+		);
+	}
+
+	element.addEventListener( 'input', onInput );
+	element.addEventListener( 'compositionstart', onCompositionStart );
+	element.addEventListener( 'compositionend', onCompositionEnd );
+	element.addEventListener( 'focus', onFocus );
+
+	return () => {
+		element.removeEventListener( 'input', onInput );
+		element.removeEventListener( 'compositionstart', onCompositionStart );
+		element.removeEventListener( 'compositionend', onCompositionEnd );
+		element.removeEventListener( 'focus', onFocus );
+	};
+};
diff --git a/packages/rich-text/src/component/event-listeners/select-object.js b/packages/rich-text/src/component/event-listeners/select-object.js
new file mode 100644
index 00000000000000..2598b149d2418f
--- /dev/null
+++ b/packages/rich-text/src/component/event-listeners/select-object.js
@@ -0,0 +1,54 @@
+export default () => ( element ) => {
+	function onClick( event ) {
+		const { target } = event;
+
+		// If the child element has no text content, it must be an object.
+		if (
+			target === element ||
+			( target.textContent && target.isContentEditable )
+		) {
+			return;
+		}
+
+		const { ownerDocument } = target;
+		const { defaultView } = ownerDocument;
+		const selection = defaultView.getSelection();
+
+		// If it's already selected, do nothing and let default behavior happen.
+		// This means it's "click-through".
+		if ( selection.containsNode( target ) ) {
+			return;
+		}
+
+		const range = ownerDocument.createRange();
+		// If the target is within a non editable element, select the non
+		// editable element.
+		const nodeToSelect = target.isContentEditable
+			? target
+			: target.closest( '[contenteditable]' );
+
+		range.selectNode( nodeToSelect );
+		selection.removeAllRanges();
+		selection.addRange( range );
+
+		event.preventDefault();
+	}
+
+	function onFocusIn( event ) {
+		// When there is incoming focus from a link, select the object.
+		if (
+			event.relatedTarget &&
+			! element.contains( event.relatedTarget ) &&
+			event.relatedTarget.tagName === 'A'
+		) {
+			onClick( event );
+		}
+	}
+
+	element.addEventListener( 'click', onClick );
+	element.addEventListener( 'focusin', onFocusIn );
+	return () => {
+		element.removeEventListener( 'click', onClick );
+		element.removeEventListener( 'focusin', onFocusIn );
+	};
+};
diff --git a/packages/rich-text/src/component/event-listeners/selection-change-compat.js b/packages/rich-text/src/component/event-listeners/selection-change-compat.js
new file mode 100644
index 00000000000000..f64f22658c329e
--- /dev/null
+++ b/packages/rich-text/src/component/event-listeners/selection-change-compat.js
@@ -0,0 +1,53 @@
+/**
+ * Internal dependencies
+ */
+import { isRangeEqual } from '../../is-range-equal';
+
+/**
+ * Sometimes some browsers are not firing a `selectionchange` event when
+ * changing the selection by mouse or keyboard. This hook makes sure that, if we
+ * detect no `selectionchange` or `input` event between the up and down events,
+ * we fire a `selectionchange` event.
+ */
+export default () => ( element ) => {
+	const { ownerDocument } = element;
+	const { defaultView } = ownerDocument;
+	const selection = defaultView?.getSelection();
+
+	let range;
+
+	function getRange() {
+		return selection.rangeCount ? selection.getRangeAt( 0 ) : null;
+	}
+
+	function onDown( event ) {
+		const type = event.type === 'keydown' ? 'keyup' : 'pointerup';
+
+		function onCancel() {
+			ownerDocument.removeEventListener( type, onUp );
+			ownerDocument.removeEventListener( 'selectionchange', onCancel );
+			ownerDocument.removeEventListener( 'input', onCancel );
+		}
+
+		function onUp() {
+			onCancel();
+			if ( isRangeEqual( range, getRange() ) ) {
+				return;
+			}
+			ownerDocument.dispatchEvent( new Event( 'selectionchange' ) );
+		}
+
+		ownerDocument.addEventListener( type, onUp );
+		ownerDocument.addEventListener( 'selectionchange', onCancel );
+		ownerDocument.addEventListener( 'input', onCancel );
+
+		range = getRange();
+	}
+
+	element.addEventListener( 'pointerdown', onDown );
+	element.addEventListener( 'keydown', onDown );
+	return () => {
+		element.removeEventListener( 'pointerdown', onDown );
+		element.removeEventListener( 'keydown', onDown );
+	};
+};
diff --git a/packages/rich-text/src/component/index.js b/packages/rich-text/src/component/index.js
index 0e9291b7a5e03d..600fc0faff5209 100644
--- a/packages/rich-text/src/component/index.js
+++ b/packages/rich-text/src/component/index.js
@@ -8,17 +8,12 @@ import { useRegistry } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import { collapseWhiteSpace, create } from '../create';
+import { create, RichTextData } from '../create';
 import { apply } from '../to-dom';
 import { toHTMLString } from '../to-html-string';
 import { useDefaultStyle } from './use-default-style';
 import { useBoundaryStyle } from './use-boundary-style';
-import { useCopyHandler } from './use-copy-handler';
-import { useFormatBoundaries } from './use-format-boundaries';
-import { useSelectObject } from './use-select-object';
-import { useInputAndSelection } from './use-input-and-selection';
-import { useSelectionChangeCompat } from './use-selection-change-compat';
-import { useDelete } from './use-delete';
+import { useEventListeners } from './event-listeners';
 
 export function useRichText( {
 	value = '',
@@ -65,39 +60,48 @@ export function useRichText( {
 	}
 
 	// Internal values are updated synchronously, unlike props and state.
-	const _value = useRef( value );
-	const record = useRef();
+	const _valueRef = useRef( value );
+	const recordRef = useRef();
 
 	function setRecordFromProps() {
-		_value.current = value;
-		record.current = create( {
-			html: preserveWhiteSpace
-				? value
-				: collapseWhiteSpace( typeof value === 'string' ? value : '' ),
-		} );
+		_valueRef.current = value;
+		recordRef.current = value;
+		if ( ! ( value instanceof RichTextData ) ) {
+			recordRef.current = value
+				? RichTextData.fromHTMLString( value, { preserveWhiteSpace } )
+				: RichTextData.empty();
+		}
+		// To do: make rich text internally work with RichTextData.
+		recordRef.current = {
+			text: recordRef.current.text,
+			formats: recordRef.current.formats,
+			replacements: recordRef.current.replacements,
+		};
 		if ( disableFormats ) {
-			record.current.formats = Array( value.length );
-			record.current.replacements = Array( value.length );
+			recordRef.current.formats = Array( value.length );
+			recordRef.current.replacements = Array( value.length );
 		}
 		if ( __unstableAfterParse ) {
-			record.current.formats = __unstableAfterParse( record.current );
+			recordRef.current.formats = __unstableAfterParse(
+				recordRef.current
+			);
 		}
-		record.current.start = selectionStart;
-		record.current.end = selectionEnd;
+		recordRef.current.start = selectionStart;
+		recordRef.current.end = selectionEnd;
 	}
 
-	const hadSelectionUpdate = useRef( false );
+	const hadSelectionUpdateRef = useRef( false );
 
-	if ( ! record.current ) {
-		hadSelectionUpdate.current = isSelected;
+	if ( ! recordRef.current ) {
+		hadSelectionUpdateRef.current = isSelected;
 		setRecordFromProps();
 	} else if (
-		selectionStart !== record.current.start ||
-		selectionEnd !== record.current.end
+		selectionStart !== recordRef.current.start ||
+		selectionEnd !== recordRef.current.end
 	) {
-		hadSelectionUpdate.current = isSelected;
-		record.current = {
-			...record.current,
+		hadSelectionUpdateRef.current = isSelected;
+		recordRef.current = {
+			...recordRef.current,
 			start: selectionStart,
 			end: selectionEnd,
 			activeFormats: undefined,
@@ -111,30 +115,34 @@ export function useRichText( {
 	 * @param {Object} newRecord The record to sync and apply.
 	 */
 	function handleChange( newRecord ) {
-		record.current = newRecord;
+		recordRef.current = newRecord;
 		applyRecord( newRecord );
 
 		if ( disableFormats ) {
-			_value.current = newRecord.text;
+			_valueRef.current = newRecord.text;
 		} else {
-			_value.current = toHTMLString( {
-				value: __unstableBeforeSerialize
-					? {
-							...newRecord,
-							formats: __unstableBeforeSerialize( newRecord ),
-					  }
-					: newRecord,
-			} );
+			const newFormats = __unstableBeforeSerialize
+				? __unstableBeforeSerialize( newRecord )
+				: newRecord.formats;
+			newRecord = { ...newRecord, formats: newFormats };
+			if ( typeof value === 'string' ) {
+				_valueRef.current = toHTMLString( {
+					value: newRecord,
+					preserveWhiteSpace,
+				} );
+			} else {
+				_valueRef.current = new RichTextData( newRecord );
+			}
 		}
 
-		const { start, end, formats, text } = newRecord;
+		const { start, end, formats, text } = recordRef.current;
 
 		// Selection must be updated first, so it is recorded in history when
 		// the content change happens.
 		// We batch both calls to only attempt to rerender once.
 		registry.batch( () => {
 			onSelectionChange( start, end );
-			onChange( _value.current, {
+			onChange( _valueRef.current, {
 				__unstableFormats: formats,
 				__unstableText: text,
 			} );
@@ -144,14 +152,14 @@ export function useRichText( {
 
 	function applyFromProps() {
 		setRecordFromProps();
-		applyRecord( record.current );
+		applyRecord( recordRef.current );
 	}
 
-	const didMount = useRef( false );
+	const didMountRef = useRef( false );
 
 	// Value updates must happen synchonously to avoid overwriting newer values.
 	useLayoutEffect( () => {
-		if ( didMount.current && value !== _value.current ) {
+		if ( didMountRef.current && value !== _valueRef.current ) {
 			applyFromProps();
 			forceRender();
 		}
@@ -159,7 +167,7 @@ export function useRichText( {
 
 	// Value updates must happen synchonously to avoid overwriting newer values.
 	useLayoutEffect( () => {
-		if ( ! hadSelectionUpdate.current ) {
+		if ( ! hadSelectionUpdateRef.current ) {
 			return;
 		}
 
@@ -167,44 +175,37 @@ export function useRichText( {
 			ref.current.focus();
 		}
 
-		applyRecord( record.current );
-		hadSelectionUpdate.current = false;
-	}, [ hadSelectionUpdate.current ] );
+		applyRecord( recordRef.current );
+		hadSelectionUpdateRef.current = false;
+	}, [ hadSelectionUpdateRef.current ] );
 
 	const mergedRefs = useMergeRefs( [
 		ref,
 		useDefaultStyle(),
-		useBoundaryStyle( { record } ),
-		useCopyHandler( { record } ),
-		useSelectObject(),
-		useFormatBoundaries( { record, applyRecord } ),
-		useDelete( {
-			createRecord,
+		useBoundaryStyle( { record: recordRef } ),
+		useEventListeners( {
+			record: recordRef,
 			handleChange,
-		} ),
-		useInputAndSelection( {
-			record,
 			applyRecord,
 			createRecord,
-			handleChange,
 			isSelected,
 			onSelectionChange,
+			forceRender,
 		} ),
-		useSelectionChangeCompat(),
 		useRefEffect( () => {
 			applyFromProps();
-			didMount.current = true;
+			didMountRef.current = true;
 		}, [ placeholder, ...__unstableDependencies ] ),
 	] );
 
 	return {
-		value: record.current,
+		value: recordRef.current,
 		// A function to get the most recent value so event handlers in
 		// useRichText implementations have access to it. For example when
 		// listening to input events, we internally update the state, but this
 		// state is not yet available to the input event handler because React
 		// may re-render asynchronously.
-		getValue: () => record.current,
+		getValue: () => recordRef.current,
 		onChange: handleChange,
 		ref: mergedRefs,
 	};
diff --git a/packages/rich-text/src/component/use-anchor-ref.js b/packages/rich-text/src/component/use-anchor-ref.js
index d1de79d04928c1..023b42641fa29b 100644
--- a/packages/rich-text/src/component/use-anchor-ref.js
+++ b/packages/rich-text/src/component/use-anchor-ref.js
@@ -40,7 +40,9 @@ export function useAnchorRef( { ref, value, settings = {} } ) {
 	const activeFormat = name ? getActiveFormat( value, name ) : undefined;
 
 	return useMemo( () => {
-		if ( ! ref.current ) return;
+		if ( ! ref.current ) {
+			return;
+		}
 		const {
 			ownerDocument: { defaultView },
 		} = ref.current;
diff --git a/packages/rich-text/src/component/use-anchor.js b/packages/rich-text/src/component/use-anchor.js
index 7ea3281cb60d3a..412c31bf5b7072 100644
--- a/packages/rich-text/src/component/use-anchor.js
+++ b/packages/rich-text/src/component/use-anchor.js
@@ -1,6 +1,7 @@
 /**
  * WordPress dependencies
  */
+import { usePrevious } from '@wordpress/compose';
 import { useState, useLayoutEffect } from '@wordpress/element';
 
 /** @typedef {import('../register-format-type').WPFormat} WPFormat */
@@ -40,9 +41,15 @@ function getFormatElement( range, editableContentElement, tagName, className ) {
 		element = element.parentElement;
 	}
 
-	if ( ! element ) return;
-	if ( element === editableContentElement ) return;
-	if ( ! editableContentElement.contains( element ) ) return;
+	if ( ! element ) {
+		return;
+	}
+	if ( element === editableContentElement ) {
+		return;
+	}
+	if ( ! editableContentElement.contains( element ) ) {
+		return;
+	}
 
 	const selector = tagName + ( className ? '.' + className : '' );
 
@@ -99,18 +106,26 @@ function createVirtualAnchorElement( range, editableContentElement ) {
  * @return {HTMLElement|VirtualAnchorElement|undefined} The anchor.
  */
 function getAnchor( editableContentElement, tagName, className ) {
-	if ( ! editableContentElement ) return;
+	if ( ! editableContentElement ) {
+		return;
+	}
 
 	const { ownerDocument } = editableContentElement;
 	const { defaultView } = ownerDocument;
 	const selection = defaultView.getSelection();
 
-	if ( ! selection ) return;
-	if ( ! selection.rangeCount ) return;
+	if ( ! selection ) {
+		return;
+	}
+	if ( ! selection.rangeCount ) {
+		return;
+	}
 
 	const range = selection.getRangeAt( 0 );
 
-	if ( ! range || ! range.startContainer ) return;
+	if ( ! range || ! range.startContainer ) {
+		return;
+	}
 
 	const formatElement = getFormatElement(
 		range,
@@ -119,7 +134,9 @@ function getAnchor( editableContentElement, tagName, className ) {
 		className
 	);
 
-	if ( formatElement ) return formatElement;
+	if ( formatElement ) {
+		return formatElement;
+	}
 
 	return createVirtualAnchorElement( range, editableContentElement );
 }
@@ -137,15 +154,16 @@ function getAnchor( editableContentElement, tagName, className ) {
  * @return {Element|VirtualAnchorElement|undefined|null} The active element or selection range.
  */
 export function useAnchor( { editableContentElement, settings = {} } ) {
-	const { tagName, className } = settings;
+	const { tagName, className, isActive } = settings;
 	const [ anchor, setAnchor ] = useState( () =>
 		getAnchor( editableContentElement, tagName, className )
 	);
+	const wasActive = usePrevious( isActive );
 
 	useLayoutEffect( () => {
-		if ( ! editableContentElement ) return;
-
-		const { ownerDocument } = editableContentElement;
+		if ( ! editableContentElement ) {
+			return;
+		}
 
 		function callback() {
 			setAnchor(
@@ -161,7 +179,20 @@ export function useAnchor( { editableContentElement, settings = {} } ) {
 			ownerDocument.removeEventListener( 'selectionchange', callback );
 		}
 
-		if ( editableContentElement === ownerDocument.activeElement ) {
+		const { ownerDocument } = editableContentElement;
+
+		if (
+			editableContentElement === ownerDocument.activeElement ||
+			// When a link is created, we need to attach the popover to the newly created anchor.
+			( ! wasActive && isActive ) ||
+			// Sometimes we're _removing_ an active anchor, such as the inline color popover.
+			// When we add the color, it switches from a virtual anchor to a `<mark>` element.
+			// When we _remove_ the color, it switches from a `<mark>` element to a virtual anchor.
+			( wasActive && ! isActive )
+		) {
+			setAnchor(
+				getAnchor( editableContentElement, tagName, className )
+			);
 			attach();
 		}
 
@@ -174,7 +205,7 @@ export function useAnchor( { editableContentElement, settings = {} } ) {
 			editableContentElement.removeEventListener( 'focusin', attach );
 			editableContentElement.removeEventListener( 'focusout', detach );
 		};
-	}, [ editableContentElement, tagName, className ] );
+	}, [ editableContentElement, tagName, className, isActive, wasActive ] );
 
 	return anchor;
 }
diff --git a/packages/rich-text/src/component/use-copy-handler.js b/packages/rich-text/src/component/use-copy-handler.js
deleted file mode 100644
index f0ba652528e87f..00000000000000
--- a/packages/rich-text/src/component/use-copy-handler.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { toHTMLString } from '../to-html-string';
-import { isCollapsed } from '../is-collapsed';
-import { slice } from '../slice';
-import { getTextContent } from '../get-text-content';
-
-export function useCopyHandler( props ) {
-	const propsRef = useRef( props );
-	propsRef.current = props;
-	return useRefEffect( ( element ) => {
-		function onCopy( event ) {
-			const { record } = propsRef.current;
-			const { ownerDocument } = element;
-			if (
-				isCollapsed( record.current ) ||
-				! element.contains( ownerDocument.activeElement )
-			) {
-				return;
-			}
-
-			const selectedRecord = slice( record.current );
-			const plainText = getTextContent( selectedRecord );
-			const html = toHTMLString( { value: selectedRecord } );
-			event.clipboardData.setData( 'text/plain', plainText );
-			event.clipboardData.setData( 'text/html', html );
-			event.clipboardData.setData( 'rich-text', 'true' );
-			event.preventDefault();
-
-			if ( event.type === 'cut' ) {
-				ownerDocument.execCommand( 'delete' );
-			}
-		}
-
-		element.addEventListener( 'copy', onCopy );
-		element.addEventListener( 'cut', onCopy );
-		return () => {
-			element.removeEventListener( 'copy', onCopy );
-			element.removeEventListener( 'cut', onCopy );
-		};
-	}, [] );
-}
diff --git a/packages/rich-text/src/component/use-default-style.js b/packages/rich-text/src/component/use-default-style.js
index 43908ae4f10a85..a4c8449076e886 100644
--- a/packages/rich-text/src/component/use-default-style.js
+++ b/packages/rich-text/src/component/use-default-style.js
@@ -33,7 +33,9 @@ const minWidth = '1px';
 
 export function useDefaultStyle() {
 	return useCallback( ( element ) => {
-		if ( ! element ) return;
+		if ( ! element ) {
+			return;
+		}
 		element.style.whiteSpace = whiteSpace;
 		element.style.minWidth = minWidth;
 	}, [] );
diff --git a/packages/rich-text/src/component/use-delete.js b/packages/rich-text/src/component/use-delete.js
deleted file mode 100644
index 69ccd0ee0dc0b6..00000000000000
--- a/packages/rich-text/src/component/use-delete.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
-import { BACKSPACE, DELETE } from '@wordpress/keycodes';
-
-/**
- * Internal dependencies
- */
-import { remove } from '../remove';
-
-export function useDelete( props ) {
-	const propsRef = useRef( props );
-	propsRef.current = props;
-	return useRefEffect( ( element ) => {
-		function onKeyDown( event ) {
-			const { keyCode } = event;
-			const { createRecord, handleChange } = propsRef.current;
-
-			if ( event.defaultPrevented ) {
-				return;
-			}
-
-			if ( keyCode !== DELETE && keyCode !== BACKSPACE ) {
-				return;
-			}
-
-			const currentValue = createRecord();
-			const { start, end, text } = currentValue;
-
-			// Always handle full content deletion ourselves.
-			if ( start === 0 && end !== 0 && end === text.length ) {
-				handleChange( remove( currentValue ) );
-				event.preventDefault();
-			}
-		}
-
-		element.addEventListener( 'keydown', onKeyDown );
-		return () => {
-			element.removeEventListener( 'keydown', onKeyDown );
-		};
-	}, [] );
-}
diff --git a/packages/rich-text/src/component/use-format-boundaries.js b/packages/rich-text/src/component/use-format-boundaries.js
deleted file mode 100644
index eec097672a1462..00000000000000
--- a/packages/rich-text/src/component/use-format-boundaries.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef, useReducer } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
-import { LEFT, RIGHT } from '@wordpress/keycodes';
-
-/**
- * Internal dependencies
- */
-import { isCollapsed } from '../is-collapsed';
-
-const EMPTY_ACTIVE_FORMATS = [];
-
-export function useFormatBoundaries( props ) {
-	const [ , forceRender ] = useReducer( () => ( {} ) );
-	const propsRef = useRef( props );
-	propsRef.current = props;
-	return useRefEffect( ( element ) => {
-		function onKeyDown( event ) {
-			const { keyCode, shiftKey, altKey, metaKey, ctrlKey } = event;
-
-			if (
-				// Only override left and right keys without modifiers pressed.
-				shiftKey ||
-				altKey ||
-				metaKey ||
-				ctrlKey ||
-				( keyCode !== LEFT && keyCode !== RIGHT )
-			) {
-				return;
-			}
-
-			const { record, applyRecord } = propsRef.current;
-			const {
-				text,
-				formats,
-				start,
-				end,
-				activeFormats: currentActiveFormats = [],
-			} = record.current;
-			const collapsed = isCollapsed( record.current );
-			const { ownerDocument } = element;
-			const { defaultView } = ownerDocument;
-			// To do: ideally, we should look at visual position instead.
-			const { direction } = defaultView.getComputedStyle( element );
-			const reverseKey = direction === 'rtl' ? RIGHT : LEFT;
-			const isReverse = event.keyCode === reverseKey;
-
-			// If the selection is collapsed and at the very start, do nothing if
-			// navigating backward.
-			// If the selection is collapsed and at the very end, do nothing if
-			// navigating forward.
-			if ( collapsed && currentActiveFormats.length === 0 ) {
-				if ( start === 0 && isReverse ) {
-					return;
-				}
-
-				if ( end === text.length && ! isReverse ) {
-					return;
-				}
-			}
-
-			// If the selection is not collapsed, let the browser handle collapsing
-			// the selection for now. Later we could expand this logic to set
-			// boundary positions if needed.
-			if ( ! collapsed ) {
-				return;
-			}
-
-			const formatsBefore = formats[ start - 1 ] || EMPTY_ACTIVE_FORMATS;
-			const formatsAfter = formats[ start ] || EMPTY_ACTIVE_FORMATS;
-			const destination = isReverse ? formatsBefore : formatsAfter;
-			const isIncreasing = currentActiveFormats.every(
-				( format, index ) => format === destination[ index ]
-			);
-
-			let newActiveFormatsLength = currentActiveFormats.length;
-
-			if ( ! isIncreasing ) {
-				newActiveFormatsLength--;
-			} else if ( newActiveFormatsLength < destination.length ) {
-				newActiveFormatsLength++;
-			}
-
-			if ( newActiveFormatsLength === currentActiveFormats.length ) {
-				record.current._newActiveFormats = destination;
-				return;
-			}
-
-			event.preventDefault();
-
-			const origin = isReverse ? formatsAfter : formatsBefore;
-			const source = isIncreasing ? destination : origin;
-			const newActiveFormats = source.slice( 0, newActiveFormatsLength );
-			const newValue = {
-				...record.current,
-				activeFormats: newActiveFormats,
-			};
-			record.current = newValue;
-			applyRecord( newValue );
-			forceRender();
-		}
-
-		element.addEventListener( 'keydown', onKeyDown );
-		return () => {
-			element.removeEventListener( 'keydown', onKeyDown );
-		};
-	}, [] );
-}
diff --git a/packages/rich-text/src/component/use-input-and-selection.js b/packages/rich-text/src/component/use-input-and-selection.js
deleted file mode 100644
index 870bfe170635c0..00000000000000
--- a/packages/rich-text/src/component/use-input-and-selection.js
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRef } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { getActiveFormats } from '../get-active-formats';
-import { updateFormats } from '../update-formats';
-
-/**
- * All inserting input types that would insert HTML into the DOM.
- *
- * @see https://www.w3.org/TR/input-events-2/#interface-InputEvent-Attributes
- *
- * @type {Set}
- */
-const INSERTION_INPUT_TYPES_TO_IGNORE = new Set( [
-	'insertParagraph',
-	'insertOrderedList',
-	'insertUnorderedList',
-	'insertHorizontalRule',
-	'insertLink',
-] );
-
-const EMPTY_ACTIVE_FORMATS = [];
-
-const PLACEHOLDER_ATTR_NAME = 'data-rich-text-placeholder';
-
-/**
- * If the selection is set on the placeholder element, collapse the selection to
- * the start (before the placeholder).
- *
- * @param {Window} defaultView
- */
-function fixPlaceholderSelection( defaultView ) {
-	const selection = defaultView.getSelection();
-	const { anchorNode, anchorOffset } = selection;
-
-	if ( anchorNode.nodeType !== anchorNode.ELEMENT_NODE ) {
-		return;
-	}
-
-	const targetNode = anchorNode.childNodes[ anchorOffset ];
-
-	if (
-		! targetNode ||
-		targetNode.nodeType !== targetNode.ELEMENT_NODE ||
-		! targetNode.hasAttribute( PLACEHOLDER_ATTR_NAME )
-	) {
-		return;
-	}
-
-	selection.collapseToStart();
-}
-
-export function useInputAndSelection( props ) {
-	const propsRef = useRef( props );
-	propsRef.current = props;
-	return useRefEffect( ( element ) => {
-		const { ownerDocument } = element;
-		const { defaultView } = ownerDocument;
-
-		let isComposing = false;
-
-		function onInput( event ) {
-			// Do not trigger a change if characters are being composed.
-			// Browsers  will usually emit a final `input` event when the
-			// characters are composed.
-			// As of December 2019, Safari doesn't support
-			// nativeEvent.isComposing.
-			if ( isComposing ) {
-				return;
-			}
-
-			let inputType;
-
-			if ( event ) {
-				inputType = event.inputType;
-			}
-
-			const { record, applyRecord, createRecord, handleChange } =
-				propsRef.current;
-
-			// The browser formatted something or tried to insert HTML.
-			// Overwrite it. It will be handled later by the format library if
-			// needed.
-			if (
-				inputType &&
-				( inputType.indexOf( 'format' ) === 0 ||
-					INSERTION_INPUT_TYPES_TO_IGNORE.has( inputType ) )
-			) {
-				applyRecord( record.current );
-				return;
-			}
-
-			const currentValue = createRecord();
-			const { start, activeFormats: oldActiveFormats = [] } =
-				record.current;
-
-			// Update the formats between the last and new caret position.
-			const change = updateFormats( {
-				value: currentValue,
-				start,
-				end: currentValue.start,
-				formats: oldActiveFormats,
-			} );
-
-			handleChange( change );
-		}
-
-		/**
-		 * Syncs the selection to local state. A callback for the
-		 * `selectionchange` event.
-		 */
-		function handleSelectionChange() {
-			const { record, applyRecord, createRecord, onSelectionChange } =
-				propsRef.current;
-
-			// Check if the implementor disabled editing. `contentEditable`
-			// does disable input, but not text selection, so we must ignore
-			// selection changes.
-			if ( element.contentEditable !== 'true' ) {
-				return;
-			}
-
-			// If the selection changes where the active element is a parent of
-			// the rich text instance (writing flow), call `onSelectionChange`
-			// for the rich text instance that contains the start or end of the
-			// selection.
-			if ( ownerDocument.activeElement !== element ) {
-				// Only process if the active elment is contentEditable, either
-				// this rich text instance or the writing flow parent. Fixes a
-				// bug in Firefox where it strangely selects the closest
-				// contentEditable element, even though the click was outside
-				// any contentEditable element.
-				if ( ownerDocument.activeElement.contentEditable !== 'true' ) {
-					return;
-				}
-
-				if ( ! ownerDocument.activeElement.contains( element ) ) {
-					return;
-				}
-
-				const selection = defaultView.getSelection();
-				const { anchorNode, focusNode } = selection;
-
-				if (
-					element.contains( anchorNode ) &&
-					element !== anchorNode &&
-					element.contains( focusNode ) &&
-					element !== focusNode
-				) {
-					const { start, end } = createRecord();
-					record.current.activeFormats = EMPTY_ACTIVE_FORMATS;
-					onSelectionChange( start, end );
-				} else if (
-					element.contains( anchorNode ) &&
-					element !== anchorNode
-				) {
-					const { start, end: offset = start } = createRecord();
-					record.current.activeFormats = EMPTY_ACTIVE_FORMATS;
-					onSelectionChange( offset );
-				} else if ( element.contains( focusNode ) ) {
-					const { start, end: offset = start } = createRecord();
-					record.current.activeFormats = EMPTY_ACTIVE_FORMATS;
-					onSelectionChange( undefined, offset );
-				}
-				return;
-			}
-
-			// In case of a keyboard event, ignore selection changes during
-			// composition.
-			if ( isComposing ) {
-				return;
-			}
-
-			const { start, end, text } = createRecord();
-			const oldRecord = record.current;
-
-			// Fallback mechanism for IE11, which doesn't support the input event.
-			// Any input results in a selection change.
-			if ( text !== oldRecord.text ) {
-				onInput();
-				return;
-			}
-
-			if ( start === oldRecord.start && end === oldRecord.end ) {
-				// Sometimes the browser may set the selection on the placeholder
-				// element, in which case the caret is not visible. We need to set
-				// the caret before the placeholder if that's the case.
-				if ( oldRecord.text.length === 0 && start === 0 ) {
-					fixPlaceholderSelection( defaultView );
-				}
-
-				return;
-			}
-
-			const newValue = {
-				...oldRecord,
-				start,
-				end,
-				// _newActiveFormats may be set on arrow key navigation to control
-				// the right boundary position. If undefined, getActiveFormats will
-				// give the active formats according to the browser.
-				activeFormats: oldRecord._newActiveFormats,
-				_newActiveFormats: undefined,
-			};
-
-			const newActiveFormats = getActiveFormats(
-				newValue,
-				EMPTY_ACTIVE_FORMATS
-			);
-
-			// Update the value with the new active formats.
-			newValue.activeFormats = newActiveFormats;
-
-			// It is important that the internal value is updated first,
-			// otherwise the value will be wrong on render!
-			record.current = newValue;
-			applyRecord( newValue, { domOnly: true } );
-			onSelectionChange( start, end );
-		}
-
-		function onCompositionStart() {
-			isComposing = true;
-			// Do not update the selection when characters are being composed as
-			// this rerenders the component and might destroy internal browser
-			// editing state.
-			ownerDocument.removeEventListener(
-				'selectionchange',
-				handleSelectionChange
-			);
-			// Remove the placeholder. Since the rich text value doesn't update
-			// during composition, the placeholder doesn't get removed. There's
-			// no need to re-add it, when the value is updated on compositionend
-			// it will be re-added when the value is empty.
-			element.querySelector( `[${ PLACEHOLDER_ATTR_NAME }]` )?.remove();
-		}
-
-		function onCompositionEnd() {
-			isComposing = false;
-			// Ensure the value is up-to-date for browsers that don't emit a final
-			// input event after composition.
-			onInput( { inputType: 'insertText' } );
-			// Tracking selection changes can be resumed.
-			ownerDocument.addEventListener(
-				'selectionchange',
-				handleSelectionChange
-			);
-		}
-
-		function onFocus() {
-			const { record, isSelected, onSelectionChange, applyRecord } =
-				propsRef.current;
-
-			// When the whole editor is editable, let writing flow handle
-			// selection.
-			if ( element.parentElement.closest( '[contenteditable="true"]' ) ) {
-				return;
-			}
-
-			if ( ! isSelected ) {
-				// We know for certain that on focus, the old selection is invalid.
-				// It will be recalculated on the next mouseup, keyup, or touchend
-				// event.
-				const index = undefined;
-
-				record.current = {
-					...record.current,
-					start: index,
-					end: index,
-					activeFormats: EMPTY_ACTIVE_FORMATS,
-				};
-			} else {
-				applyRecord( record.current );
-				onSelectionChange( record.current.start, record.current.end );
-			}
-		}
-
-		element.addEventListener( 'input', onInput );
-		element.addEventListener( 'compositionstart', onCompositionStart );
-		element.addEventListener( 'compositionend', onCompositionEnd );
-		element.addEventListener( 'focus', onFocus );
-		ownerDocument.addEventListener(
-			'selectionchange',
-			handleSelectionChange
-		);
-		return () => {
-			element.removeEventListener( 'input', onInput );
-			element.removeEventListener(
-				'compositionstart',
-				onCompositionStart
-			);
-			element.removeEventListener( 'compositionend', onCompositionEnd );
-			element.removeEventListener( 'focus', onFocus );
-			ownerDocument.removeEventListener(
-				'selectionchange',
-				handleSelectionChange
-			);
-		};
-	}, [] );
-}
diff --git a/packages/rich-text/src/component/use-select-object.js b/packages/rich-text/src/component/use-select-object.js
deleted file mode 100644
index e5db313494f488..00000000000000
--- a/packages/rich-text/src/component/use-select-object.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRefEffect } from '@wordpress/compose';
-
-export function useSelectObject() {
-	return useRefEffect( ( element ) => {
-		function onClick( event ) {
-			const { target } = event;
-
-			// If the child element has no text content, it must be an object.
-			if (
-				target === element ||
-				( target.textContent && target.isContentEditable )
-			) {
-				return;
-			}
-
-			const { ownerDocument } = target;
-			const { defaultView } = ownerDocument;
-			const selection = defaultView.getSelection();
-
-			// If it's already selected, do nothing and let default behavior
-			// happen. This means it's "click-through".
-			if ( selection.containsNode( target ) ) return;
-
-			const range = ownerDocument.createRange();
-			// If the target is within a non editable element, select the non
-			// editable element.
-			const nodeToSelect = target.isContentEditable
-				? target
-				: target.closest( '[contenteditable]' );
-
-			range.selectNode( nodeToSelect );
-			selection.removeAllRanges();
-			selection.addRange( range );
-
-			event.preventDefault();
-		}
-
-		function onFocusIn( event ) {
-			// When there is incoming focus from a link, select the object.
-			if (
-				event.relatedTarget &&
-				! element.contains( event.relatedTarget ) &&
-				event.relatedTarget.tagName === 'A'
-			) {
-				onClick( event );
-			}
-		}
-
-		element.addEventListener( 'click', onClick );
-		element.addEventListener( 'focusin', onFocusIn );
-		return () => {
-			element.removeEventListener( 'click', onClick );
-			element.removeEventListener( 'focusin', onFocusIn );
-		};
-	}, [] );
-}
diff --git a/packages/rich-text/src/component/use-selection-change-compat.js b/packages/rich-text/src/component/use-selection-change-compat.js
deleted file mode 100644
index d067d5ec70ff7f..00000000000000
--- a/packages/rich-text/src/component/use-selection-change-compat.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useRefEffect } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import { isRangeEqual } from '../is-range-equal';
-
-/**
- * Sometimes some browsers are not firing a `selectionchange` event when
- * changing the selection by mouse or keyboard. This hook makes sure that, if we
- * detect no `selectionchange` or `input` event between the up and down events,
- * we fire a `selectionchange` event.
- *
- * @return {import('@wordpress/compose').RefEffect} A ref effect attaching the
- *                                                  listeners.
- */
-export function useSelectionChangeCompat() {
-	return useRefEffect( ( element ) => {
-		const { ownerDocument } = element;
-		const { defaultView } = ownerDocument;
-		const selection = defaultView?.getSelection();
-
-		let range;
-
-		function getRange() {
-			return selection.rangeCount ? selection.getRangeAt( 0 ) : null;
-		}
-
-		function onDown( event ) {
-			const type = event.type === 'keydown' ? 'keyup' : 'pointerup';
-
-			function onCancel() {
-				ownerDocument.removeEventListener( type, onUp );
-				ownerDocument.removeEventListener(
-					'selectionchange',
-					onCancel
-				);
-				ownerDocument.removeEventListener( 'input', onCancel );
-			}
-
-			function onUp() {
-				onCancel();
-				if ( isRangeEqual( range, getRange() ) ) return;
-				ownerDocument.dispatchEvent( new Event( 'selectionchange' ) );
-			}
-
-			ownerDocument.addEventListener( type, onUp );
-			ownerDocument.addEventListener( 'selectionchange', onCancel );
-			ownerDocument.addEventListener( 'input', onCancel );
-
-			range = getRange();
-		}
-
-		element.addEventListener( 'pointerdown', onDown );
-		element.addEventListener( 'keydown', onDown );
-		return () => {
-			element.removeEventListener( 'pointerdown', onDown );
-			element.removeEventListener( 'keydown', onDown );
-		};
-	}, [] );
-}
diff --git a/packages/rich-text/src/create.js b/packages/rich-text/src/create.js
index a23baf70078bc9..898bdfa73b330e 100644
--- a/packages/rich-text/src/create.js
+++ b/packages/rich-text/src/create.js
@@ -10,6 +10,8 @@ import { store as richTextStore } from './store';
 import { createElement } from './create-element';
 import { mergePair } from './concat';
 import { OBJECT_REPLACEMENT_CHARACTER, ZWNBSP } from './special-characters';
+import { toHTMLString } from './to-html-string';
+import { getTextContent } from './get-text-content';
 
 /** @typedef {import('./types').RichTextValue} RichTextValue */
 
@@ -96,6 +98,94 @@ function toFormat( { tagName, attributes } ) {
 	};
 }
 
+/**
+ * The RichTextData class is used to instantiate a wrapper around rich text
+ * values, with methods that can be used to transform or manipulate the data.
+ *
+ * - Create an empty instance: `new RichTextData()`.
+ * - Create one from an HTML string: `RichTextData.fromHTMLString(
+ *   '<em>hello</em>' )`.
+ * - Create one from a wrapper HTMLElement: `RichTextData.fromHTMLElement(
+ *   document.querySelector( 'p' ) )`.
+ * - Create one from plain text: `RichTextData.fromPlainText( '1\n2' )`.
+ * - Create one from a rich text value: `new RichTextData( { text: '...',
+ *   formats: [ ... ] } )`.
+ *
+ * @todo Add methods to manipulate the data, such as applyFormat, slice etc.
+ */
+export class RichTextData {
+	#value;
+
+	static empty() {
+		return new RichTextData();
+	}
+	static fromPlainText( text ) {
+		return new RichTextData( create( { text } ) );
+	}
+	static fromHTMLString( html ) {
+		return new RichTextData( create( { html } ) );
+	}
+	static fromHTMLElement( htmlElement, options = {} ) {
+		const { preserveWhiteSpace = false } = options;
+		const element = preserveWhiteSpace
+			? htmlElement
+			: collapseWhiteSpace( htmlElement );
+		const richTextData = new RichTextData( create( { element } ) );
+		Object.defineProperty( richTextData, 'originalHTML', {
+			value: htmlElement.innerHTML,
+		} );
+		return richTextData;
+	}
+	constructor( init = createEmptyValue() ) {
+		this.#value = init;
+	}
+	toPlainText() {
+		return getTextContent( this.#value );
+	}
+	// We could expose `toHTMLElement` at some point as well, but we'd only use
+	// it internally.
+	toHTMLString( { preserveWhiteSpace } = {} ) {
+		return (
+			this.originalHTML ||
+			toHTMLString( { value: this.#value, preserveWhiteSpace } )
+		);
+	}
+	valueOf() {
+		return this.toHTMLString();
+	}
+	toString() {
+		return this.toHTMLString();
+	}
+	toJSON() {
+		return this.toHTMLString();
+	}
+	get length() {
+		return this.text.length;
+	}
+	get formats() {
+		return this.#value.formats;
+	}
+	get replacements() {
+		return this.#value.replacements;
+	}
+	get text() {
+		return this.#value.text;
+	}
+}
+
+for ( const name of Object.getOwnPropertyNames( String.prototype ) ) {
+	if ( RichTextData.prototype.hasOwnProperty( name ) ) {
+		continue;
+	}
+
+	Object.defineProperty( RichTextData.prototype, name, {
+		value( ...args ) {
+			// Should we convert back to RichTextData?
+			return this.toHTMLString()[ name ]( ...args );
+		},
+	} );
+}
+
 /**
  * Create a RichText value from an `Element` tree (DOM), an HTML string or a
  * plain text string, with optionally a `Range` object to set the selection. If
@@ -128,7 +218,6 @@ function toFormat( { tagName, attributes } ) {
  * @param {string}  [$1.html]                     HTML to create value from.
  * @param {Range}   [$1.range]                    Range to create value from.
  * @param {boolean} [$1.__unstableIsEditableTree]
- *
  * @return {RichTextValue} A rich text value.
  */
 export function create( {
@@ -138,6 +227,14 @@ export function create( {
 	range,
 	__unstableIsEditableTree: isEditableTree,
 } = {} ) {
+	if ( html instanceof RichTextData ) {
+		return {
+			text: html.text,
+			formats: html.formats,
+			replacements: html.replacements,
+		};
+	}
+
 	if ( typeof text === 'string' && text.length > 0 ) {
 		return {
 			formats: Array( text.length ),
@@ -268,21 +365,65 @@ function filterRange( node, range, filter ) {
  * @see
  * https://developer.mozilla.org/en-US/docs/Web/CSS/white-space-collapse#collapsing_of_white_space
  *
- * @param {string} string
+ * @param {HTMLElement} element
+ * @param {boolean}     isRoot
+ *
+ * @return {HTMLElement} New element with collapsed whitespace.
  */
-export function collapseWhiteSpace( string ) {
-	return string.replace( /[\n\r\t]+/g, ' ' );
+function collapseWhiteSpace( element, isRoot = true ) {
+	const clone = element.cloneNode( true );
+	clone.normalize();
+	Array.from( clone.childNodes ).forEach( ( node, i, nodes ) => {
+		if ( node.nodeType === node.TEXT_NODE ) {
+			let newNodeValue = node.nodeValue;
+
+			if ( /[\n\t\r\f]/.test( newNodeValue ) ) {
+				newNodeValue = newNodeValue.replace( /[\n\t\r\f]+/g, ' ' );
+			}
+
+			if ( newNodeValue.indexOf( '  ' ) !== -1 ) {
+				newNodeValue = newNodeValue.replace( / {2,}/g, ' ' );
+			}
+
+			if ( i === 0 && newNodeValue.startsWith( ' ' ) ) {
+				newNodeValue = newNodeValue.slice( 1 );
+			} else if (
+				isRoot &&
+				i === nodes.length - 1 &&
+				newNodeValue.endsWith( ' ' )
+			) {
+				newNodeValue = newNodeValue.slice( 0, -1 );
+			}
+
+			node.nodeValue = newNodeValue;
+		} else if ( node.nodeType === node.ELEMENT_NODE ) {
+			collapseWhiteSpace( node, false );
+		}
+	} );
+	return clone;
 }
 
 /**
- * Removes reserved characters used by rich-text (zero width non breaking spaces added by `toTree` and object replacement characters).
+ * We need to normalise line breaks to `\n` so they are consistent across
+ * platforms and serialised properly. Not removing \r would cause it to
+ * linger and result in double line breaks when whitespace is preserved.
+ */
+const CARRIAGE_RETURN = '\r';
+
+/**
+ * Removes reserved characters used by rich-text (zero width non breaking spaces
+ * added by `toTree` and object replacement characters).
  *
  * @param {string} string
  */
 export function removeReservedCharacters( string ) {
-	// with the global flag, note that we should create a new regex each time OR reset lastIndex state.
+	// with the global flag, note that we should create a new regex each time OR
+	// reset lastIndex state.
 	return string.replace(
-		new RegExp( `[${ ZWNBSP }${ OBJECT_REPLACEMENT_CHARACTER }]`, 'gu' ),
+		new RegExp(
+			`[${ ZWNBSP }${ OBJECT_REPLACEMENT_CHARACTER }${ CARRIAGE_RETURN }]`,
+			'gu'
+		),
 		''
 	);
 }
@@ -290,7 +431,7 @@ export function removeReservedCharacters( string ) {
 /**
  * Creates a Rich Text value from a DOM element and range.
  *
- * @param {Object}  $1                  Named argements.
+ * @param {Object}  $1                  Named arguments.
  * @param {Element} [$1.element]        Element to create value from.
  * @param {Range}   [$1.range]          Range to create value from.
  * @param {boolean} [$1.isEditableTree]
@@ -334,11 +475,9 @@ function createFromElement( { element, range, isEditableTree } ) {
 
 		if (
 			isEditableTree &&
-			// Ignore any placeholders.
-			( node.getAttribute( 'data-rich-text-placeholder' ) ||
-				// Ignore any line breaks that are not inserted by us.
-				( tagName === 'br' &&
-					! node.getAttribute( 'data-rich-text-line-break' ) ) )
+			// Ignore any line breaks that are not inserted by us.
+			tagName === 'br' &&
+			! node.getAttribute( 'data-rich-text-line-break' )
 		) {
 			accumulateSelection( accumulator, node, range, createEmptyValue() );
 			continue;
@@ -393,7 +532,9 @@ function createFromElement( { element, range, isEditableTree } ) {
 			continue;
 		}
 
-		if ( format ) delete format.formatType;
+		if ( format ) {
+			delete format.formatType;
+		}
 
 		const value = createFromElement( {
 			element: node,
@@ -403,7 +544,9 @@ function createFromElement( { element, range, isEditableTree } ) {
 
 		accumulateSelection( accumulator, node, range, value );
 
-		if ( ! format ) {
+		// Ignore any placeholders, but keep their content since the browser
+		// might insert text inside them when the editable element is flex.
+		if ( ! format || node.getAttribute( 'data-rich-text-placeholder' ) ) {
 			mergePair( accumulator, value );
 		} else if ( value.text.length === 0 ) {
 			if ( format.attributes ) {
@@ -448,7 +591,7 @@ function createFromElement( { element, range, isEditableTree } ) {
 /**
  * Gets the attributes of an element in object shape.
  *
- * @param {Object}  $1         Named argements.
+ * @param {Object}  $1         Named arguments.
  * @param {Element} $1.element Element to get attributes from.
  *
  * @return {Object|void} Attribute object or `undefined` if the element has no
diff --git a/packages/rich-text/src/index.ts b/packages/rich-text/src/index.ts
index 14d26cab8f7fb1..f82317d81573d0 100644
--- a/packages/rich-text/src/index.ts
+++ b/packages/rich-text/src/index.ts
@@ -1,7 +1,7 @@
 export { store } from './store';
 export { applyFormat } from './apply-format';
 export { concat } from './concat';
-export { create } from './create';
+export { RichTextData, create } from './create';
 export { getActiveFormat } from './get-active-format';
 export { getActiveFormats } from './get-active-formats';
 export { getActiveObject } from './get-active-object';
diff --git a/packages/rich-text/src/store/selectors.js b/packages/rich-text/src/store/selectors.js
index cdc597aee0d990..df87c6a99211a2 100644
--- a/packages/rich-text/src/store/selectors.js
+++ b/packages/rich-text/src/store/selectors.js
@@ -1,7 +1,7 @@
 /**
- * External dependencies
+ * WordPress dependencies
  */
-import createSelector from 'rememo';
+import { createSelector } from '@wordpress/data';
 
 /**
  * Returns all the available format types.
diff --git a/packages/rich-text/src/to-html-string.js b/packages/rich-text/src/to-html-string.js
index 3e25cbd5bcce1f..f770dfdefc128a 100644
--- a/packages/rich-text/src/to-html-string.js
+++ b/packages/rich-text/src/to-html-string.js
@@ -19,14 +19,16 @@ import { toTree } from './to-tree';
 /**
  * Create an HTML string from a Rich Text value.
  *
- * @param {Object}        $1       Named argements.
- * @param {RichTextValue} $1.value Rich text value.
+ * @param {Object}        $1                      Named arguments.
+ * @param {RichTextValue} $1.value                Rich text value.
+ * @param {boolean}       [$1.preserveWhiteSpace] Preserves newlines if true.
  *
  * @return {string} HTML string.
  */
-export function toHTMLString( { value } ) {
+export function toHTMLString( { value, preserveWhiteSpace } ) {
 	const tree = toTree( {
 		value,
+		preserveWhiteSpace,
 		createEmpty,
 		append,
 		getLastChild,
diff --git a/packages/rich-text/src/to-tree.js b/packages/rich-text/src/to-tree.js
index d2d347bc9ee040..46671c951bc09d 100644
--- a/packages/rich-text/src/to-tree.js
+++ b/packages/rich-text/src/to-tree.js
@@ -129,6 +129,7 @@ function isEqualUntil( a, b, index ) {
 
 export function toTree( {
 	value,
+	preserveWhiteSpace,
 	createEmpty,
 	append,
 	getLastChild,
@@ -222,7 +223,9 @@ export function toTree( {
 
 		if ( character === OBJECT_REPLACEMENT_CHARACTER ) {
 			const replacement = replacements[ i ];
-			if ( ! replacement ) continue;
+			if ( ! replacement ) {
+				continue;
+			}
 			const { type, attributes, innerHTML } = replacement;
 			const formatType = getFormatType( type );
 
@@ -267,7 +270,7 @@ export function toTree( {
 			}
 			// Ensure pointer is text node.
 			pointer = append( getParent( pointer ), '' );
-		} else if ( character === '\n' ) {
+		} else if ( ! preserveWhiteSpace && character === '\n' ) {
 			pointer = append( getParent( pointer ), {
 				type: 'br',
 				attributes: isEditableTree
@@ -296,6 +299,8 @@ export function toTree( {
 		if ( shouldInsertPadding && i === text.length ) {
 			append( getParent( pointer ), ZWNBSP );
 
+			// We CANNOT use CSS to add a placeholder with pseudo elements on
+			// the main block wrappers because that could clash with theme CSS.
 			if ( placeholder && text.length === 0 ) {
 				append( getParent( pointer ), {
 					type: 'span',
diff --git a/packages/rich-text/tsconfig.json b/packages/rich-text/tsconfig.json
index 53e2ee579d2cf8..57fe0ae604215f 100644
--- a/packages/rich-text/tsconfig.json
+++ b/packages/rich-text/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/router/.npmrc b/packages/router/.npmrc
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md
index 5ab30cce439239..23f553b847a404 100644
--- a/packages/router/CHANGELOG.md
+++ b/packages/router/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 1.10.0 (2024-10-16)
+
+### Enhancements
+
+-   Rewrite the package in typescript ([#65854](https://github.com/WordPress/gutenberg/pull/65854)).
+
+## 1.9.0 (2024-10-03)
+
+## 1.8.0 (2024-09-19)
+
+## 1.7.0 (2024-09-05)
+
+## 1.6.0 (2024-08-21)
+
+## 1.5.0 (2024-08-07)
+
+## 1.4.0 (2024-07-24)
+
+## 1.3.0 (2024-07-10)
+
+## 1.2.0 (2024-06-26)
+
+## 1.1.0 (2024-06-15)
+
+## 1.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 0.27.0 (2024-05-16)
+
+## 0.26.0 (2024-05-02)
+
+## 0.25.0 (2024-04-19)
+
+## 0.24.0 (2024-04-03)
+
+## 0.23.0 (2024-03-21)
+
+## 0.22.0 (2024-03-06)
+
+## 0.21.0 (2024-02-21)
+
+## 0.20.0 (2024-02-09)
+
+## 0.19.0 (2024-01-24)
+
+## 0.18.0 (2024-01-10)
+
+## 0.17.0 (2023-12-13)
+
 ## 0.16.0 (2023-11-29)
 
 ## 0.15.0 (2023-11-16)
diff --git a/packages/router/package.json b/packages/router/package.json
index d74bf2c233627d..d7a1219e0b95cf 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/router",
-	"version": "0.16.0",
+	"version": "1.10.0",
 	"description": "Router API for WordPress pages.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,22 +19,25 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
+	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/element": "file:../element",
-		"@wordpress/private-apis": "file:../private-apis",
-		"@wordpress/url": "file:../url",
-		"history": "^5.1.0"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/element": "*",
+		"@wordpress/private-apis": "*",
+		"@wordpress/url": "*",
+		"history": "^5.3.0"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/router/src/history.js b/packages/router/src/history.js
deleted file mode 100644
index 8827f51b2fd80d..00000000000000
--- a/packages/router/src/history.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * External dependencies
- */
-import { createBrowserHistory } from 'history';
-
-/**
- * WordPress dependencies
- */
-import { addQueryArgs, getQueryArgs, removeQueryArgs } from '@wordpress/url';
-
-const history = createBrowserHistory();
-
-const originalHistoryPush = history.push;
-const originalHistoryReplace = history.replace;
-
-function push( params, state ) {
-	const currentArgs = getQueryArgs( window.location.href );
-	const currentUrlWithoutArgs = removeQueryArgs(
-		window.location.href,
-		...Object.keys( currentArgs )
-	);
-	const newUrl = addQueryArgs( currentUrlWithoutArgs, params );
-	return originalHistoryPush.call( history, newUrl, state );
-}
-
-function replace( params, state ) {
-	const currentArgs = getQueryArgs( window.location.href );
-	const currentUrlWithoutArgs = removeQueryArgs(
-		window.location.href,
-		...Object.keys( currentArgs )
-	);
-	const newUrl = addQueryArgs( currentUrlWithoutArgs, params );
-	return originalHistoryReplace.call( history, newUrl, state );
-}
-
-history.push = push;
-history.replace = replace;
-
-export default history;
diff --git a/packages/router/src/history.ts b/packages/router/src/history.ts
new file mode 100644
index 00000000000000..6cbef108eec206
--- /dev/null
+++ b/packages/router/src/history.ts
@@ -0,0 +1,99 @@
+/**
+ * External dependencies
+ */
+import { createBrowserHistory, type BrowserHistory } from 'history';
+
+/**
+ * WordPress dependencies
+ */
+import { buildQueryString } from '@wordpress/url';
+
+export interface EnhancedHistory extends BrowserHistory {
+	getLocationWithParams: () => Location;
+}
+
+interface PushOptions {
+	transition?: string;
+}
+
+const history = createBrowserHistory();
+
+const originalHistoryPush = history.push;
+const originalHistoryReplace = history.replace;
+
+// Preserve the `wp_theme_preview` query parameter when navigating
+// around the Site Editor.
+// TODO: move this hack out of the router into Site Editor code.
+function preserveThemePreview( params: Record< string, any > ) {
+	if ( params.hasOwnProperty( 'wp_theme_preview' ) ) {
+		return params;
+	}
+	const currentSearch = new URLSearchParams( history.location.search );
+	const currentThemePreview = currentSearch.get( 'wp_theme_preview' );
+	if ( currentThemePreview === null ) {
+		return params;
+	}
+	return { ...params, wp_theme_preview: currentThemePreview };
+}
+
+function push(
+	params: Record< string, any >,
+	state: Record< string, any >,
+	options: PushOptions = {}
+) {
+	const performPush = () => {
+		const search = buildQueryString( preserveThemePreview( params ) );
+		return originalHistoryPush.call( history, { search }, state );
+	};
+
+	/*
+	 * Skip transition in mobile, otherwise it crashes the browser.
+	 * See: https://github.com/WordPress/gutenberg/pull/63002.
+	 */
+	const isMediumOrBigger = window.matchMedia( '(min-width: 782px)' ).matches;
+	if (
+		! isMediumOrBigger ||
+		// @ts-expect-error
+		! document.startViewTransition ||
+		! options.transition
+	) {
+		return performPush();
+	}
+	document.documentElement.classList.add( options.transition );
+	// @ts-expect-error
+	const transition = document.startViewTransition( () => performPush() );
+	transition.finished.finally( () => {
+		document.documentElement.classList.remove( options.transition ?? '' );
+	} );
+}
+
+function replace(
+	params: Record< string, any >,
+	state: Record< string, any >
+) {
+	const search = buildQueryString( preserveThemePreview( params ) );
+	return originalHistoryReplace.call( history, { search }, state );
+}
+
+const locationMemo = new WeakMap();
+function getLocationWithParams() {
+	const location = history.location;
+	let locationWithParams = locationMemo.get( location );
+	if ( ! locationWithParams ) {
+		locationWithParams = {
+			...location,
+			params: Object.fromEntries(
+				new URLSearchParams( location.search )
+			),
+		};
+		locationMemo.set( location, locationWithParams );
+	}
+	return locationWithParams;
+}
+
+export default {
+	...history,
+	push,
+	replace,
+	getLocationWithParams,
+};
diff --git a/packages/router/src/index.js b/packages/router/src/index.ts
similarity index 100%
rename from packages/router/src/index.js
rename to packages/router/src/index.ts
diff --git a/packages/router/src/lock-unlock.js b/packages/router/src/lock-unlock.js
deleted file mode 100644
index d7f4e92b4a542d..00000000000000
--- a/packages/router/src/lock-unlock.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
-
-export const { lock, unlock } =
-	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
-		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
-		'@wordpress/router'
-	);
diff --git a/packages/router/src/lock-unlock.ts b/packages/router/src/lock-unlock.ts
new file mode 100644
index 00000000000000..e7323bd0270ea2
--- /dev/null
+++ b/packages/router/src/lock-unlock.ts
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+		'@wordpress/router'
+	);
diff --git a/packages/router/src/private-apis.js b/packages/router/src/private-apis.ts
similarity index 100%
rename from packages/router/src/private-apis.js
rename to packages/router/src/private-apis.ts
diff --git a/packages/router/src/router.js b/packages/router/src/router.js
deleted file mode 100644
index e5449cef54c6a0..00000000000000
--- a/packages/router/src/router.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	createContext,
-	useState,
-	useEffect,
-	useContext,
-} from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import history from './history';
-
-const RoutesContext = createContext();
-const HistoryContext = createContext();
-
-export function useLocation() {
-	return useContext( RoutesContext );
-}
-
-export function useHistory() {
-	return useContext( HistoryContext );
-}
-
-function getLocationWithParams( location ) {
-	const searchParams = new URLSearchParams( location.search );
-	return {
-		...location,
-		params: Object.fromEntries( searchParams.entries() ),
-	};
-}
-
-export function RouterProvider( { children } ) {
-	const [ location, setLocation ] = useState( () =>
-		getLocationWithParams( history.location )
-	);
-
-	useEffect( () => {
-		return history.listen( ( { location: updatedLocation } ) => {
-			setLocation( getLocationWithParams( updatedLocation ) );
-		} );
-	}, [] );
-
-	return (
-		<HistoryContext.Provider value={ history }>
-			<RoutesContext.Provider value={ location }>
-				{ children }
-			</RoutesContext.Provider>
-		</HistoryContext.Provider>
-	);
-}
diff --git a/packages/router/src/router.tsx b/packages/router/src/router.tsx
new file mode 100644
index 00000000000000..9a1d01aa5f8d88
--- /dev/null
+++ b/packages/router/src/router.tsx
@@ -0,0 +1,41 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	createContext,
+	useContext,
+	useSyncExternalStore,
+} from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import history from './history';
+import type { EnhancedHistory } from './history';
+
+const RoutesContext = createContext< Location | null >( null );
+const HistoryContext = createContext< EnhancedHistory >( history );
+
+export function useLocation() {
+	return useContext( RoutesContext );
+}
+
+export function useHistory() {
+	return useContext( HistoryContext );
+}
+
+export function RouterProvider( { children }: { children: React.ReactNode } ) {
+	const location = useSyncExternalStore(
+		history.listen,
+		history.getLocationWithParams,
+		history.getLocationWithParams
+	);
+
+	return (
+		<HistoryContext.Provider value={ history }>
+			<RoutesContext.Provider value={ location }>
+				{ children }
+			</RoutesContext.Provider>
+		</HistoryContext.Provider>
+	);
+}
diff --git a/packages/router/tsconfig.json b/packages/router/tsconfig.json
new file mode 100644
index 00000000000000..e4945eef8bac0c
--- /dev/null
+++ b/packages/router/tsconfig.json
@@ -0,0 +1,17 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig.json",
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"declarationDir": "build-types",
+		"types": [ "gutenberg-env" ],
+		"allowJs": false,
+		"checkJs": false
+	},
+	"references": [
+		{ "path": "../element" },
+		{ "path": "../private-apis" },
+		{ "path": "../url" }
+	],
+	"include": [ "src/**/*" ]
+}
diff --git a/packages/scripts/.npmrc b/packages/scripts/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/scripts/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
index 7ad87c315df80b..8a1133a2e7ae22 100644
--- a/packages/scripts/CHANGELOG.md
+++ b/packages/scripts/CHANGELOG.md
@@ -2,7 +2,118 @@
 
 ## Unreleased
 
-### Bug Fix
+### Enhancements
+
+-   Add BlueOak-1.0.0 the GPLv2-comatible licenses recognized by check-licenses ([#66139](https://github.com/WordPress/gutenberg/pull/66139)).
+
+### Internal
+
+-   Refactor to extract license related logic to a reusable module ([#66179](https://github.com/WordPress/gutenberg/pull/66179)).
+
+## 30.3.0 (2024-10-17)
+
+### New Features
+
+-   Add new `build-blocks-manifest` command to generate a PHP file containing block metadata from all `block.json` files in a project ([#65866](https://github.com/WordPress/gutenberg/pull/65866)).
+
+## 30.2.0 (2024-10-16)
+
+## 30.1.0 (2024-10-03)
+
+## 30.0.0 (2024-09-19)
+
+### Breaking Changes
+
+-   Updated `stylelint` dependency to `^16.8.2` ([#64828](https://github.com/WordPress/gutenberg/pull/64828)).
+-   Switched default config from `@wordpress/stylelint-config/scss` to use `@wordpress/stylelint-config/scss-stylistic` to keep stylistic rules ([#64828](https://github.com/WordPress/gutenberg/pull/64828)).
+
+## 29.0.0 (2024-09-05)
+
+### Breaking Changes
+
+-   Fixed the issue with having 5 high severity vulnerabilities by upgrading the `puppeteer-core` package to the latest major version `^23.1.0` ([#64597](https://github.com/WordPress/gutenberg/pull/64597)).
+
+### Enhancements
+
+-   Inlines CSS files imported from other CSS files before optimization in the `build` command ([#61121](https://github.com/WordPress/gutenberg/pull/61121)).
+
+### Bug Fixes
+
+-   Added chunk filename in webpack config to avoid reading stale files ([#58176](https://github.com/WordPress/gutenberg/pull/58176)).
+
+## 28.6.0 (2024-08-21)
+
+## 28.5.0 (2024-08-07)
+
+## 28.4.0 (2024-07-24)
+
+### New Features
+
+-   Update webpack configuration for the `build` and `start` commands to automatically copy PHP files listed in the `variations` field of `block.json` files from the source to the build folder ([#63098](https://github.com/WordPress/gutenberg/pull/63098)).
+
+## 28.3.0 (2024-07-10)
+
+## 28.2.0 (2024-06-26)
+
+## 28.1.0 (2024-06-15)
+
+## 28.0.0 (2024-05-31)
+
+### Breaking Changes
+
+**Note** If you're using @wordpress/scripts for building JS scripts to target WordPress 6.5 or earlier, you should not upgrade to this version and continue using @wordpress/scripts@27.
+
+-   Use React's automatic runtime to transform JSX ([#61692](https://github.com/WordPress/gutenberg/pull/61692)).
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 27.9.0 (2024-05-16)
+
+### New Features
+
+-   Add RTL support when building CSS styles with `build` and `start` scripts ([#61540](https://github.com/WordPress/gutenberg/pull/61540)).
+
+## 27.8.0 (2024-05-02)
+
+## 27.7.0 (2024-04-19)
+
+## 27.6.0 (2024-04-03)
+
+## 27.5.0 (2024-03-21)
+
+## 27.4.0 (2024-03-06)
+
+## 27.3.0 (2024-02-21)
+
+## 27.2.0 (2024-02-09)
+
+### New Features
+
+-   Add experimental support for `viewScriptModule` field in block.json for `build` and `start` scripts ([#57437](https://github.com/WordPress/gutenberg/pull/57437)).
+
+### Enhancements
+
+-   Ensure that watched module builds detect block.json changes ([#57927](https://github.com/WordPress/gutenberg/pull/57927)).
+
+### Deprecations
+
+-   Experimental support for `viewModule` field in block.json is deprecated in favor of `viewScriptModule` ([#57437](https://github.com/WordPress/gutenberg/pull/57437)).
+
+## 27.1.0 (2024-01-24)
+
+## 27.0.0 (2024-01-10)
+
+### New Features
+
+-   Add experimental support for `viewModule` field in block.json for `build` and `start` scripts ([#57461](https://github.com/WordPress/gutenberg/pull/57461)).
+
+### Breaking Changes
+
+-   Drop support for Node.js versions < 18.
+
+## 26.19.0 (2023-12-13)
+
+### Bug Fixes
 
 -   Fix CSS imports not minified ([#56516](https://github.com/WordPress/gutenberg/pull/56516)).
 
@@ -37,7 +148,7 @@
 -   Added support for `test-playwright` script ([#53108](https://github.com/WordPress/gutenberg/pull/53108)).
 -   The bundled `wp-prettier` dependency has been upgraded from `2.8.5` to `3.0.3` ([#54539](https://github.com/WordPress/gutenberg/pull/54539)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Correctly resolve entry points when the directory is symlinked ([#54212](https://github.com/WordPress/gutenberg/pull/54212)).
 
@@ -45,13 +156,13 @@
 
 ## 26.11.0 (2023-08-16)
 
-### Enhancement
+### Enhancements
 
 -   Updated `npm-package-json-lint` peer dependency to require v6.0.0 [#53636](https://github.com/WordPress/gutenberg/pull/53636).
 -   The bundled `@svgr/webpack` dependency has been updated from requiring ^6.2.1 to requiring ^8.0.1 ([#53630](https://github.com/WordPress/gutenberg/pull/53630)).
 -   The bundled `cssnano` dependency has been updated from requiring ^5.07 to requiring ^6.0.1 ([#53630](https://github.com/WordPress/gutenberg/pull/53630)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix prevent watch mode from aborting when encountering a `block.json` file that contains invalid JSON. ([#51971](https://github.com/WordPress/gutenberg/pull/51971))
 
@@ -100,7 +211,7 @@
 
 ## 25.5.1 (2023-03-06)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix `render.php` isn't copied in Windows OS ([#48735](https://github.com/WordPress/gutenberg/pull/48735)).
 
@@ -145,30 +256,30 @@
 
 ## 24.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 and minimum npm version to 6.14.4 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 -   The bundled `@wordpress/eslint-plugin` package got updated to the new major version and the default linting for Jest unit tests is now handled in the default config in this package ([#43272](https://github.com/WordPress/gutenberg/pull/43272)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Packages: Replace `is-plain-obj` with `is-plain-object` ([#43511](https://github.com/WordPress/gutenberg/pull/43511)).
 
 ## 23.7.2 (2022-08-17)
 
-### Bug Fix
+### Bug Fixes
 
 -   Jest Preset: Improve `is-plain-obj` transformation ignore ([#43271](https://github.com/WordPress/gutenberg/pull/43271)).
 
 ## 23.7.1 (2022-08-12)
 
-### Bug Fix
+### Bug Fixes
 
 -   Jest Preset: Ignore `is-plain-obj` transformation ([#43179](https://github.com/WordPress/gutenberg/pull/43179)).
 
 ## 23.6.0 (2022-07-27)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix the incorrect exit error code when status missing in `webpack` call for `build` and `start` commands ([#42396](https://github.com/WordPress/gutenberg/pull/42396)).
 
@@ -180,13 +291,13 @@
 
 ## 23.2.0 (2022-06-01)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix incorrect handling in `plugin-zip` for root-level files and some specific platform conditions ([#41439](https://github.com/WordPress/gutenberg/pull/41439)).
 
 ## 23.1.0 (2022-05-18)
 
-### New Feature
+### New Features
 
 -   Enable by default code formatting for JSON files in the `format` command ([#40994](https://github.com/WordPress/gutenberg/pull/40994)). You can opt-out of this behavior by providing a custom file matcher, example: `wp-scripts format src/**/*.js`.
 -   Support tsx files in `viewScript`, `script`, `editorScript` ([#41068](https://github.com/WordPress/gutenberg/pull/41068)).
@@ -214,7 +325,7 @@
 
 ## 22.4.0 (2022-04-08)
 
-### New Feature
+### New Features
 
 -   Add `--webpack-src-dir` CLI flag to allow customizing the source code directory (`src` by default) ([#39618](https://github.com/WordPress/gutenberg/pull/39618)).
 
@@ -226,13 +337,13 @@
 
 ## 22.2.0 (2022-03-11)
 
-### Enhancement
+### Enhancements
 
 -   The bundled `@wordpress/eslint-plugin` package got updated to the new major version, but the breaking changes included don't affect this package ([#39244](https://github.com/WordPress/gutenberg/pull/39244)).
 
 ## 22.1.0 (2022-03-03)
 
-### New Feature
+### New Features
 
 -   Add `--webpack-copy-php` CLI flag to opt-in to copying php files from `src` and its subfolders to the output directory (`build` by default) ([#39171](https://github.com/WordPress/gutenberg/pull/39171)).
 
@@ -242,7 +353,7 @@
 
 -   The bundled `@svgr/webpack` dependency has been updated from requiring `^5.5.0` to requiring `^6.2.1` ([#38866](https://github.com/WordPress/gutenberg/pull/38866)). See [official migration guide to v6](https://react-svgr.com/docs/migrate/) for details.
 
-### New Feature
+### New Features
 
 -   Automatically copy PHP files located in the `src` folder and its subfolders to the output directory (`build` by default) ([#38715](https://github.com/WordPress/gutenberg/pull/38715)).
 
@@ -252,7 +363,7 @@
 
 ## 21.0.1 (2022-02-11)
 
-### Bug Fix
+### Bug Fixes
 
 -   Return a default entry object in the `build` command when no entry files discovered in the project ([#38737](https://github.com/WordPress/gutenberg/pull/38737)).
 
@@ -262,20 +373,20 @@
 
 -   The bundled `puppeteer-core` dependency has been updated from requiring `^11.0.0` to requiring `^13.2.0` ([#37078](https://github.com/WordPress/gutenberg/pull/37078)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix the handling for entry points when running `build` command ([#38584](https://github.com/WordPress/gutenberg/pull/38584)).
 
 ## 20.0.2 (2022-01-31)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix the `build` command that does not generate assets on Windows OS ([#38348](https://github.com/WordPress/gutenberg/pull/38348)).
 -   Adds fallback to `src/index.js` when no valid scripts discovered in metadata files when running the `build` command ([#38367](https://github.com/WordPress/gutenberg/pull/38367)).
 
 ## 20.0.1 (2022-01-28)
 
-### Bug Fix
+### Bug Fixes
 
 -   Ensure that React Fast Refresh is not wired when it isn't explicitly enabled with `--hot` CLI argument when running the `start` command.
 
@@ -294,7 +405,7 @@
 ### New Features
 
 -   Added a new `plugin-zip` command to create a zip file for a WordPress plugin ([#37687](https://github.com/WordPress/gutenberg/pull/37687)).
--   Added optional support for React Fast Refresh in the `start` command. It can be activated with `--hot` CLI argument ([#28273](https://github.com/WordPress/gutenberg/pull/28273)). For now, it requires that WordPress has the [`SCRIPT_DEBUG`](https://wordpress.org/documentation/article/debugging-in-wordpress/#script_debug) flag enabled and the [Gutenberg](https://wordpress.org/plugins/gutenberg/) plugin installed.
+-   Added optional support for React Fast Refresh in the `start` command. It can be activated with `--hot` CLI argument ([#28273](https://github.com/WordPress/gutenberg/pull/28273)). For now, it requires that WordPress has the [`SCRIPT_DEBUG`](https://developer.wordpress.org/advanced-administration/debug/debug-wordpress/#script_debug) flag enabled and the [Gutenberg](https://wordpress.org/plugins/gutenberg/) plugin installed.
 -   Automatically copy `block.json` files located in the `src` folder and its subfolders to the output folder (`build` by default) ([#37612](https://github.com/WordPress/gutenberg/pull/37612)).
 -   Scan the `src` directory for `block.json` files to detect defined scripts to use them as entry points with the `start` and `build` commands. ([#37661](https://github.com/WordPress/gutenberg/pull/37661)).
 
@@ -411,7 +522,7 @@
 
 ## 16.1.0 (2021-05-20)
 
-### Bug Fix
+### Bug Fixes
 
 -   The default Babel configuration has changed to respect a local Browserslist configuration.
 
@@ -429,13 +540,13 @@
 -   Have the `format` command ignore files listed in a `.prettierignore` file, add a fallback `.prettierignore` to the package ([30844](https://github.com/WordPress/gutenberg/pull/30844)).
 -   The e2e tests are now using [`jest-circus`](https://github.com/facebook/jest/tree/master/packages/jest-circus) as the test runner. This enable us to capture screenshots at the time the tests failed. The unit tests are also using the same test runner for consistency ([#28449](https://github.com/WordPress/gutenberg/pull/28449), [#31178](https://github.com/WordPress/gutenberg/pull/31178)).
 
-### Security Fix
+### Security
 
 -   Update `postcss` dependency to the latest patch version. Versions before 8.2.10 are vulnerable to Regular Expression Denial of Service (ReDoS) during source map parsing ([#31685](https://github.com/WordPress/gutenberg/pull/31685)).
 
 ## 15.0.1 (2021-04-30)
 
-### Bug Fix
+### Bug Fixes
 
 -   Add `postcss` as a dependency to ensure that the correct version gets installed.
 
@@ -500,7 +611,7 @@
 -   Make it possible to transpile `.jsx` files with `build` and `start` commands ([#28002](https://github.com/WordPress/gutenberg/pull/28002)).
 -   Add support for static assets (fonts and images) for `build` and `start` commands ([#28043](https://github.com/WordPress/gutenberg/pull/28043)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Ensure that `check-engines` uses the same default version of Node.js and npm as this package ([#28143](https://github.com/WordPress/gutenberg/pull/28143)).
 -   Prevent translation function names from being mangled to ensure stings are extracted ([#28231](https://github.com/WordPress/gutenberg/pull/28231)).
@@ -511,7 +622,7 @@
 
 ## 12.6.1 (2021-01-05)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix multiple build (`build` command) runtimes conflicting when using globals ([#27985](https://github.com/WordPress/gutenberg/pull/27985)).
 
@@ -570,7 +681,7 @@
 -   The bundled `wp-prettier` dependency has been upgraded from `1.19.1` to `2.0.5`. Refer to the [Prettier 2.0 "2020" blog post](https://prettier.io/blog/2020/03/21/2.0.0.html) for full details about the major changes included in Prettier 2.0.
 -   The bundled `eslint` dependency has been updated from requiring `^6.8.0` to requiring `^7.1.0`.
 
-### New Feature
+### New Features
 
 -   The PostCSS loader now gives preference to a `postcss.config.js` configuration file if present.
 
@@ -581,7 +692,7 @@
 
 ## 10.0.0 (2020-05-28)
 
-### New Feature
+### New Features
 
 -   New `--webpack-no-externals` flag added to `build` and `start` scripts. It disables scripts' assets generation, and omits the list of default externals ([#22310](https://github.com/WordPress/gutenberg/pull/22310)).
 -   New `--webpack-bundle-analyzer` flag added to `build` and `start` scripts. It enables visualization for the size of webpack output files with an interactive zoomable treemap ([#22310](https://github.com/WordPress/gutenberg/pull/22310)).
@@ -614,7 +725,7 @@
 -   Add debugging support for `test-unit-js` script ([#21631](https://github.com/WordPress/gutenberg/pull/21631)). Tests can be debugged by any [inspector client](https://nodejs.org/en/docs/guides/debugging-getting-started/#inspector-clients) that supports the [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/) using the `--inspect-brk` option.
 -   Add debugging support for `test-e2e` script ([#21861](https://github.com/WordPress/gutenberg/pull/21861)). Tests can be debugged by using the `--inspect-brk` option and a new `--puppeteer-devtools` option (or `PUPPETEER_DEVTOOLS="true"` environment variable).
 
-### Bug fix
+### Bug Fixes
 
 -   The bundled `npm-package-json-lint` dependency has been updated from requiring `^4.0.3` to requiring `^5.0.0` ([#21597](https://github.com/WordPress/gutenberg/pull/21597)). [Breaking changes](https://npmpackagejsonlint.org/docs/en/v4-to-v5) don't break anything in this package. It fixes the abrupt shutdown when `"description"` field in `package.json` is empty.
 -   Update `check-licenses` script to parse JSON dependency tree recursively so sub-dependencies of packages passed in `--ignore` flag are ignored as well.
@@ -729,7 +840,7 @@
 -   The bundled `eslint` dependency has been updated from requiring `^5.16.0` to requiring `^6.1.0`.
 -   The bundled `@wordpress/eslint-plugin` dependency has been updated to the next major version `^3.0.0` due to new ESLint rules enabled for all test files.
 
-### Bug Fix
+### Bug Fixes
 
 -   Use the SCSS shared `stylelint-config-wordpress` config so that both CSS and SCSS rules are used ([#17060](https://github.com/WordPress/gutenberg/pull/17060))
 
@@ -739,7 +850,7 @@
 
 -   The `build` and `start` commands supports simplified syntax for multiple entry points: `wp-scripts build entry-one.js entry-two.js` ([15982](https://github.com/WordPress/gutenberg/pull/15982)).
 
-### Bug Fix
+### Bug Fixes
 
 -   Added missing [babel-jest](https://www.npmjs.com/package/babel-jest) dependency ([#16259](https://github.com/WordPress/gutenberg/pull/16259)).
 
@@ -768,7 +879,7 @@
 
 ## 3.1.0 (2019-03-20)
 
-## New features
+### New Features
 
 -   The `build` and `start` commands will use a default webpack config if none is provided.
 
@@ -786,7 +897,7 @@
 -   Added support for `start` script ([#12837](https://github.com/WordPress/gutenberg/pull/12837))
 -   Updated `npm-package-json-lint` dependency [#14200](https://github.com/WordPress/gutenberg/pull/14200)
 
-### Bug Fix
+### Bug Fixes
 
 -   Avoid inheriting from ESLint configurations in ancestor directories when using the default configuration ([#13483](https://github.com/WordPress/gutenberg/pull/13483))
 
@@ -809,13 +920,13 @@
 
 ## 2.4.0 (2018-10-16)
 
-### New Feature
+### New Features
 
 -   Added support for `lint-js` script ([#10504](https://github.com/WordPress/gutenberg/pull/10504))
 
 ## 2.3.0 (2018-09-30)
 
-### Improvements
+### Enhancements
 
 -   New flag `--ignore` for `check-licenses` script
 -   Try deferring to LICENSE file for `license` fields which include filename
@@ -823,17 +934,17 @@
 
 ## 2.2.1 (2018-09-05)
 
-### Bug Fix
+### Bug Fixes
 
 -   Resolves an issue where npm package lint script did not work in Windows environments ([#9321](https://github.com/WordPress/gutenberg/pull/9321)
 
-### Polish
+### Internal
 
 -   Updated dependencies: `jest`, `npm-package-json-lint` and `read-pkg-up`
 
 ## 2.0.0 (2018-07-12)
 
-### Breaking Change
+### Breaking Changes
 
 -   Updated code to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
@@ -843,12 +954,12 @@
 
 ## 1.2.0 (2018-05-29)
 
-### New Feature
+### New Features
 
 -   Added support for `lint-pkg-json` script ([#128](https://github.com/WordPress/packages/pull/128))
 
 ## 1.1.5 (2018-05-18)
 
-### Polish
+### Internal
 
 -   Fix: Standardized `package.json` format ([#119](https://github.com/WordPress/packages/pull/119))
diff --git a/packages/scripts/README.md b/packages/scripts/README.md
index 42a9c563ea77f7..46e1a1265662cf 100644
--- a/packages/scripts/README.md
+++ b/packages/scripts/README.md
@@ -16,7 +16,7 @@ You only need to install one npm module:
 npm install @wordpress/scripts --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later, and `npm` 6.14.4 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Setup
 
@@ -97,7 +97,7 @@ This is how you execute the script with presented setup:
 
 -   `npm run build` - builds the code for production.
 -   `npm run build:custom` - builds the code for production with two entry points and a custom output directory. Paths for custom entry points are relative to the project root.
--   `npm run build:copy-php` - builds the code for production and opts into copying all PHP files from the `src` directory and its subfolders to the output directory. By default, only PHP files listed in the `render` field in the detected `block.json` files get copied.
+-   `npm run build:copy-php` - builds the code for production and opts into copying all PHP files from the `src` directory and its subfolders to the output directory. By default, only PHP files listed in the `render` and `variations` fields in the detected `block.json` files get copied.
 -   `npm run build:custom-directory` - builds the code for production using the `custom-directory` as the source code directory.
 
 This script automatically use the optimized config but sometimes you may want to specify some custom options:
@@ -108,10 +108,50 @@ This script automatically use the optimized config but sometimes you may want to
 -   `--webpack-src-dir` – Allows customization of the source code directory. Default is `src`.
 -   `--output-path` – Allows customization of the output directory. Default is `build`.
 
+Experimental support for the block.json `viewScriptModule` field is available via the
+`--experimental-modules` option. With this option enabled, script and module fields will all be
+compiled. The `viewScriptModule` field is analogous to the `viewScript` field, but will compile a module
+and should be registered in WordPress using the Modules API.
+
 #### Advanced information
 
 This script uses [webpack](https://webpack.js.org/) behind the scenes. It’ll look for a webpack config in the top-level directory of your package and will use it if it finds one. If none is found, it’ll use the default config provided by `@wordpress/scripts` packages. Learn more in the [Advanced Usage](#advanced-usage) section.
 
+
+### `build-blocks-manifest`
+
+This script generates a PHP file containing block metadata from all
+`block.json` files in the project. This is useful for enhancing performance
+when registering multiple block types, as it allows you to use
+`wp_register_block_metadata_collection()` in WordPress.
+
+Usage: `wp-scripts build-blocks-manifest [options]`
+
+Options:
+- `--input`: Specify the input directory (default: 'build')
+- `--output`: Specify the output file path (default: 'build/blocks-manifest.php')
+
+Example:
+```bash
+wp-scripts build-blocks-manifest --input=src --output=dist/blocks-manifest.php
+```
+
+This command will scan the specified input directory for `block.json` files,
+compile their metadata into a single PHP file, and output it to the specified
+location. You can then use this file with
+`wp_register_block_metadata_collection()` in your plugin:
+
+```php
+wp_register_block_metadata_collection(
+    plugin_dir_path( __FILE__ ) . 'dist',
+    plugin_dir_path( __FILE__ ) . 'dist/blocks-manifest.php'
+);
+```
+
+Using this approach can improve performance when registering multiple block
+types, especially for plugins with several custom blocks. Note that this
+feature is only available in WordPress 6.7 and later versions.
+
 ### `check-engines`
 
 Checks if the current `node`, `npm` (or `yarn`) versions match the given [semantic version](https://semver.org/) ranges. If the given version is not satisfied, information about installing the needed version is printed and the program exits with an error code.
@@ -377,12 +417,12 @@ This is how you execute the script with presented setup:
 -   `npm start` - starts the build for development.
 -   `npm run start:hot` - starts the build for development with "Fast Refresh". The page will automatically reload if you make changes to the files.
 -   `npm run start:custom` - starts the build for development which contains two entry points and a custom output directory. Paths for custom entry points are relative to the project root.
--   `npm run start:copy-php` - starts the build for development and opts into copying all PHP files from the `src` directory and its subfolders to the output directory. By default, only PHP files listed in the `render` field in the detected `block.json` files get copied.
+-   `npm run start:copy-php` - starts the build for development and opts into copying all PHP files from the `src` directory and its subfolders to the output directory. By default, only PHP files listed in the `render` and `variations` fields in the detected `block.json` files get copied.
 -   `npm run start:custom-directory` - builds the code for production using the `custom-directory` as the source code directory.
 
 This script automatically use the optimized config but sometimes you may want to specify some custom options:
 
--   `--hot` – enables "Fast Refresh". The page will automatically reload if you make changes to the code. _For now, it requires that WordPress has the [`SCRIPT_DEBUG`](https://wordpress.org/documentation/article/debugging-in-wordpress/#script_debug) flag enabled and the [Gutenberg](https://wordpress.org/plugins/gutenberg/) plugin installed._
+-   `--hot` – enables "Fast Refresh". The page will automatically reload if you make changes to the code. _For now, it requires that WordPress has the [`SCRIPT_DEBUG`](https://developer.wordpress.org/advanced-administration/debug/debug-wordpress/#script_debug) flag enabled and the [Gutenberg](https://wordpress.org/plugins/gutenberg/) plugin installed._
 -   `--no-watch` – Starts the build for development without starting the watcher.
 -   `--webpack-bundle-analyzer` – enables visualization for the size of webpack output files with an interactive zoomable treemap.
 -   `--webpack-copy-php` – enables copying all PHP files from the source directory ( default is `src` ) and its subfolders to the output directory.
@@ -391,6 +431,11 @@ This script automatically use the optimized config but sometimes you may want to
 -   `--webpack-src-dir` – Allows customization of the source code directory. Default is `src`.
 -   `--output-path` – Allows customization of the output directory. Default is `build`.
 
+Experimental support for the block.json `viewScriptModule` field is available via the
+`--experimental-modules` option. With this option enabled, script and module fields will all be
+compiled. The `viewScriptModule` field is analogous to the `viewScript` field, but will compile a module
+and should be registered in WordPress using the Modules API.
+
 #### Advanced information
 
 This script uses [webpack](https://webpack.js.org/) behind the scenes. It’ll look for a webpack config in the top-level directory of your package and will use it if it finds one. If none is found, it’ll use the default config provided by `@wordpress/scripts` packages. Learn more in the [Advanced Usage](#advanced-usage) section.
@@ -723,8 +768,8 @@ module.exports = {
 
 If you follow this approach, please, be aware that:
 
-- You should keep using the `wp-scripts` commands (`start` and `build`). Do not use `webpack` directly.
-- Future versions of this package may change what webpack and Babel plugins we bundle, default configs, etc. Should those changes be necessary, they will be registered in the [package’s CHANGELOG](https://github.com/WordPress/gutenberg/blob/HEAD/packages/scripts/CHANGELOG.md), so make sure to read it before upgrading.
+-   You should keep using the `wp-scripts` commands (`start` and `build`). Do not use `webpack` directly.
+-   Future versions of this package may change what webpack and Babel plugins we bundle, default configs, etc. Should those changes be necessary, they will be registered in the [package’s CHANGELOG](https://github.com/WordPress/gutenberg/blob/HEAD/packages/scripts/CHANGELOG.md), so make sure to read it before upgrading.
 
 ## Contributing to this package
 
diff --git a/packages/scripts/config/.stylelintrc.json b/packages/scripts/config/.stylelintrc.json
index 1cfc8fc10ea564..96c4ccca749050 100644
--- a/packages/scripts/config/.stylelintrc.json
+++ b/packages/scripts/config/.stylelintrc.json
@@ -1,5 +1,5 @@
 {
-	"extends": "@wordpress/stylelint-config/scss",
+	"extends": "@wordpress/stylelint-config/scss-stylistic",
 	"rules": {
 		"selector-class-pattern": null
 	}
diff --git a/packages/scripts/config/jest-environment-puppeteer/global.js b/packages/scripts/config/jest-environment-puppeteer/global.js
index 1be79ffd89c668..76cd7bb5126996 100644
--- a/packages/scripts/config/jest-environment-puppeteer/global.js
+++ b/packages/scripts/config/jest-environment-puppeteer/global.js
@@ -45,7 +45,9 @@ async function setup( jestConfig = {} ) {
 
 	// If we are in watch mode, - only setupServer() once.
 	if ( jestConfig.watch || jestConfig.watchAll ) {
-		if ( didAlreadyRunInWatchMode ) return;
+		if ( didAlreadyRunInWatchMode ) {
+			return;
+		}
 		didAlreadyRunInWatchMode = true;
 	}
 
diff --git a/packages/scripts/config/jest-github-actions-reporter/index.js b/packages/scripts/config/jest-github-actions-reporter/index.js
index 9a8f292beb80ce..8496373c38971f 100644
--- a/packages/scripts/config/jest-github-actions-reporter/index.js
+++ b/packages/scripts/config/jest-github-actions-reporter/index.js
@@ -35,7 +35,9 @@ class GithubActionsReporter {
 }
 
 function getMessages( results ) {
-	if ( ! results ) return [];
+	if ( ! results ) {
+		return [];
+	}
 
 	return results.reduce(
 		flatMap( ( { testFilePath, testResults } ) =>
diff --git a/packages/scripts/config/webpack.config.js b/packages/scripts/config/webpack.config.js
index 1e060d0e142c91..91ef19fc27ed6b 100644
--- a/packages/scripts/config/webpack.config.js
+++ b/packages/scripts/config/webpack.config.js
@@ -4,13 +4,15 @@
 const { BundleAnalyzerPlugin } = require( 'webpack-bundle-analyzer' );
 const { CleanWebpackPlugin } = require( 'clean-webpack-plugin' );
 const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
-const { DefinePlugin } = require( 'webpack' );
+const webpack = require( 'webpack' );
 const browserslist = require( 'browserslist' );
 const MiniCSSExtractPlugin = require( 'mini-css-extract-plugin' );
 const { basename, dirname, resolve } = require( 'path' );
 const ReactRefreshWebpackPlugin = require( '@pmmmwh/react-refresh-webpack-plugin' );
+const RtlCssPlugin = require( 'rtlcss-webpack-plugin' );
 const TerserPlugin = require( 'terser-webpack-plugin' );
 const { realpathSync } = require( 'fs' );
+const { sync: glob } = require( 'fast-glob' );
 
 /**
  * WordPress dependencies
@@ -29,7 +31,11 @@ const {
 	hasPostCSSConfig,
 	getWordPressSrcDirectory,
 	getWebpackEntryPoints,
-	getRenderPropPaths,
+	getAsBooleanFromENV,
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
+	fromProjectRoot,
+	PhpFilePathsPlugin,
 } = require( '../utils' );
 
 const isProduction = process.env.NODE_ENV === 'production';
@@ -39,28 +45,9 @@ if ( ! browserslist.findConfig( '.' ) ) {
 	target += ':' + fromConfigRoot( '.browserslistrc' );
 }
 const hasReactFastRefresh = hasArgInCLI( '--hot' ) && ! isProduction;
-
-/**
- * The plugin recomputes the render paths once on each compilation. It is necessary to avoid repeating processing
- * when filtering every discovered PHP file in the source folder. This is the most performant way to ensure that
- * changes in `block.json` files are picked up in watch mode.
- */
-class RenderPathsPlugin {
-	/**
-	 * Paths with the `render` props included in `block.json` files.
-	 *
-	 * @type {string[]}
-	 */
-	static renderPaths;
-
-	apply( compiler ) {
-		const pluginName = this.constructor.name;
-
-		compiler.hooks.thisCompilation.tap( pluginName, () => {
-			this.constructor.renderPaths = getRenderPropPaths();
-		} );
-	}
-}
+const hasExperimentalModulesFlag = getAsBooleanFromENV(
+	'WP_EXPERIMENTAL_MODULES'
+);
 
 const cssLoaders = [
 	{
@@ -88,6 +75,7 @@ const cssLoaders = [
 					plugins: isProduction
 						? [
 								...postcssPlugins,
+								require( 'postcss-import' ),
 								require( 'cssnano' )( {
 									// Provide a fallback configuration if there's not
 									// one explicitly available in the project.
@@ -110,12 +98,13 @@ const cssLoaders = [
 	},
 ];
 
-const config = {
+/** @type {webpack.Configuration} */
+const baseConfig = {
 	mode,
 	target,
-	entry: getWebpackEntryPoints,
 	output: {
 		filename: '[name].js',
+		chunkFilename: '[name].js?v=[chunkhash]',
 		path: resolve( process.cwd(), 'build' ),
 	},
 	resolve: {
@@ -165,7 +154,7 @@ const config = {
 	module: {
 		rules: [
 			{
-				test: /\.(j|t)sx?$/,
+				test: /\.m?(j|t)sx?$/,
 				exclude: /node_modules/,
 				use: [
 					{
@@ -245,22 +234,77 @@ const config = {
 			},
 		],
 	},
+	stats: {
+		children: false,
+	},
+};
+
+// WP_DEVTOOL global variable controls how source maps are generated.
+// See: https://webpack.js.org/configuration/devtool/#devtool.
+if ( process.env.WP_DEVTOOL ) {
+	baseConfig.devtool = process.env.WP_DEVTOOL;
+}
+
+if ( ! isProduction ) {
+	// Set default sourcemap mode if it wasn't set by WP_DEVTOOL.
+	baseConfig.devtool = baseConfig.devtool || 'source-map';
+}
+
+// Add source-map-loader if devtool is set, whether in dev mode or not.
+if ( baseConfig.devtool ) {
+	baseConfig.module.rules.unshift( {
+		test: /\.(j|t)sx?$/,
+		exclude: [ /node_modules/ ],
+		use: require.resolve( 'source-map-loader' ),
+		enforce: 'pre',
+	} );
+}
+
+/** @type {webpack.Configuration} */
+const scriptConfig = {
+	...baseConfig,
+
+	entry: getWebpackEntryPoints( 'script' ),
+
+	devServer: isProduction
+		? undefined
+		: {
+				devMiddleware: {
+					writeToDisk: true,
+				},
+				allowedHosts: 'auto',
+				host: 'localhost',
+				port: 8887,
+				proxy: {
+					'/build': {
+						pathRewrite: {
+							'^/build': '',
+						},
+					},
+				},
+		  },
+
 	plugins: [
-		new DefinePlugin( {
+		new webpack.DefinePlugin( {
 			// Inject the `SCRIPT_DEBUG` global, used for development features flagging.
-			SCRIPT_DEBUG: ! isProduction,
+			'globalThis.SCRIPT_DEBUG': JSON.stringify( ! isProduction ),
+			SCRIPT_DEBUG: JSON.stringify( ! isProduction ),
 		} ),
-		// During rebuilds, all webpack assets that are not used anymore will be
-		// removed automatically. There is an exception added in watch mode for
-		// fonts and images. It is a known limitations:
-		// https://github.com/johnagan/clean-webpack-plugin/issues/159
-		new CleanWebpackPlugin( {
-			cleanAfterEveryBuildPatterns: [ '!fonts/**', '!images/**' ],
-			// Prevent it from deleting webpack assets during builds that have
-			// multiple configurations returned in the webpack config.
-			cleanStaleWebpackAssets: false,
+
+		// If we run a modules build, the 2 compilations can "clean" each other's output
+		// Prevent the cleaning from happening
+		! hasExperimentalModulesFlag &&
+			new CleanWebpackPlugin( {
+				cleanAfterEveryBuildPatterns: [ '!fonts/**', '!images/**' ],
+				// Prevent it from deleting webpack assets during builds that have
+				// multiple configurations returned in the webpack config.
+				cleanStaleWebpackAssets: false,
+			} ),
+
+		new PhpFilePathsPlugin( {
+			context: getWordPressSrcDirectory(),
+			props: [ 'render', 'variations' ],
 		} ),
-		new RenderPathsPlugin(),
 		new CopyWebpackPlugin( {
 			patterns: [
 				{
@@ -269,27 +313,33 @@ const config = {
 					noErrorOnMissing: true,
 					transform( content, absoluteFrom ) {
 						const convertExtension = ( path ) => {
-							return path.replace( /\.(j|t)sx?$/, '.js' );
+							return path.replace( /\.m?(j|t)sx?$/, '.js' );
 						};
 
 						if ( basename( absoluteFrom ) === 'block.json' ) {
 							const blockJson = JSON.parse( content.toString() );
-							[ 'viewScript', 'script', 'editorScript' ].forEach(
-								( key ) => {
-									if ( Array.isArray( blockJson[ key ] ) ) {
-										blockJson[ key ] =
-											blockJson[ key ].map(
-												convertExtension
-											);
-									} else if (
-										typeof blockJson[ key ] === 'string'
-									) {
-										blockJson[ key ] = convertExtension(
-											blockJson[ key ]
-										);
+
+							[
+								getBlockJsonScriptFields( blockJson ),
+								getBlockJsonModuleFields( blockJson ),
+							].forEach( ( fields ) => {
+								if ( fields ) {
+									for ( const [
+										key,
+										value,
+									] of Object.entries( fields ) ) {
+										if ( Array.isArray( value ) ) {
+											blockJson[ key ] =
+												value.map( convertExtension );
+										} else if (
+											typeof value === 'string'
+										) {
+											blockJson[ key ] =
+												convertExtension( value );
+										}
 									}
 								}
-							);
+							} );
 
 							return JSON.stringify( blockJson, null, 2 );
 						}
@@ -304,7 +354,7 @@ const config = {
 					filter: ( filepath ) => {
 						return (
 							process.env.WP_COPY_PHP_FILES_TO_DIST ||
-							RenderPathsPlugin.renderPaths.includes(
+							PhpFilePathsPlugin.paths.includes(
 								realpathSync( filepath ).replace( /\\/g, '/' )
 							)
 						);
@@ -317,6 +367,10 @@ const config = {
 		process.env.WP_BUNDLE_ANALYZER && new BundleAnalyzerPlugin(),
 		// MiniCSSExtractPlugin to extract the CSS thats gets imported into JavaScript.
 		new MiniCSSExtractPlugin( { filename: '[name].css' } ),
+		// RtlCssPlugin to generate RTL CSS files.
+		new RtlCssPlugin( {
+			filename: `[name]-rtl.css`,
+		} ),
 		// React Fast Refresh.
 		hasReactFastRefresh && new ReactRefreshWebpackPlugin(),
 		// WP_NO_EXTERNALS global variable controls whether scripts' assets get
@@ -324,45 +378,85 @@ const config = {
 		! process.env.WP_NO_EXTERNALS &&
 			new DependencyExtractionWebpackPlugin(),
 	].filter( Boolean ),
-	stats: {
-		children: false,
-	},
 };
 
-// WP_DEVTOOL global variable controls how source maps are generated.
-// See: https://webpack.js.org/configuration/devtool/#devtool.
-if ( process.env.WP_DEVTOOL ) {
-	config.devtool = process.env.WP_DEVTOOL;
-}
+if ( hasExperimentalModulesFlag ) {
+	/**
+	 * Add block.json files to compilation to ensure changes trigger rebuilds when watching
+	 */
+	class BlockJsonDependenciesPlugin {
+		constructor() {
+			/** @type {ReadonlyArray<string>} */
+			this.blockJsonFiles = glob( '**/block.json', {
+				absolute: true,
+				cwd: fromProjectRoot( getWordPressSrcDirectory() ),
+			} );
+		}
 
-if ( ! isProduction ) {
-	// Set default sourcemap mode if it wasn't set by WP_DEVTOOL.
-	config.devtool = config.devtool || 'source-map';
-	config.devServer = {
-		devMiddleware: {
-			writeToDisk: true,
+		/**
+		 * Apply the plugin
+		 * @param {webpack.Compiler} compiler the compiler instance
+		 * @return {void}
+		 */
+		apply( compiler ) {
+			if ( this.blockJsonFiles.length ) {
+				compiler.hooks.compilation.tap(
+					'BlockJsonDependenciesPlugin',
+					( compilation ) => {
+						compilation.fileDependencies.addAll(
+							this.blockJsonFiles
+						);
+					}
+				);
+			}
+		}
+	}
+
+	/** @type {webpack.Configuration} */
+	const moduleConfig = {
+		...baseConfig,
+
+		entry: getWebpackEntryPoints( 'module' ),
+
+		experiments: {
+			...baseConfig.experiments,
+			outputModule: true,
 		},
-		allowedHosts: 'auto',
-		host: 'localhost',
-		port: 8887,
-		proxy: {
-			'/build': {
-				pathRewrite: {
-					'^/build': '',
-				},
+
+		output: {
+			...baseConfig.output,
+			module: true,
+			chunkFormat: 'module',
+			environment: {
+				...baseConfig.output.environment,
+				module: true,
+			},
+			library: {
+				...baseConfig.output.library,
+				type: 'module',
 			},
 		},
+
+		plugins: [
+			new webpack.DefinePlugin( {
+				// Inject the `SCRIPT_DEBUG` global, used for development features flagging.
+				'globalThis.SCRIPT_DEBUG': JSON.stringify( ! isProduction ),
+				SCRIPT_DEBUG: JSON.stringify( ! isProduction ),
+			} ),
+			// The WP_BUNDLE_ANALYZER global variable enables a utility that represents
+			// bundle content as a convenient interactive zoomable treemap.
+			process.env.WP_BUNDLE_ANALYZER && new BundleAnalyzerPlugin(),
+			// MiniCSSExtractPlugin to extract the CSS thats gets imported into JavaScript.
+			new MiniCSSExtractPlugin( { filename: '[name].css' } ),
+			// WP_NO_EXTERNALS global variable controls whether scripts' assets get
+			// generated, and the default externals set.
+			! process.env.WP_NO_EXTERNALS &&
+				new DependencyExtractionWebpackPlugin(),
+			new BlockJsonDependenciesPlugin(),
+		].filter( Boolean ),
 	};
-}
 
-// Add source-map-loader if devtool is set, whether in dev mode or not.
-if ( config.devtool ) {
-	config.module.rules.unshift( {
-		test: /\.(j|t)sx?$/,
-		exclude: [ /node_modules/ ],
-		use: require.resolve( 'source-map-loader' ),
-		enforce: 'pre',
-	} );
+	module.exports = [ scriptConfig, moduleConfig ];
+} else {
+	module.exports = scriptConfig;
 }
-
-module.exports = config;
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index 1002c1817b4025..ef1ff601152429 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/scripts",
-	"version": "26.18.0",
+	"version": "30.3.0",
 	"description": "Collection of reusable scripts for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,8 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14",
-		"npm": ">=6.14.4"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"bin",
@@ -32,22 +32,22 @@
 		"wp-scripts": "./bin/wp-scripts.js"
 	},
 	"dependencies": {
-		"@babel/core": "^7.16.0",
+		"@babel/core": "7.25.7",
 		"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
 		"@svgr/webpack": "^8.0.1",
-		"@wordpress/babel-preset-default": "file:../babel-preset-default",
-		"@wordpress/browserslist-config": "file:../browserslist-config",
-		"@wordpress/dependency-extraction-webpack-plugin": "file:../dependency-extraction-webpack-plugin",
-		"@wordpress/e2e-test-utils-playwright": "file:../e2e-test-utils-playwright",
-		"@wordpress/eslint-plugin": "file:../eslint-plugin",
-		"@wordpress/jest-preset-default": "file:../jest-preset-default",
-		"@wordpress/npm-package-json-lint-config": "file:../npm-package-json-lint-config",
-		"@wordpress/postcss-plugins-preset": "file:../postcss-plugins-preset",
-		"@wordpress/prettier-config": "file:../prettier-config",
-		"@wordpress/stylelint-config": "file:../stylelint-config",
+		"@wordpress/babel-preset-default": "*",
+		"@wordpress/browserslist-config": "*",
+		"@wordpress/dependency-extraction-webpack-plugin": "*",
+		"@wordpress/e2e-test-utils-playwright": "*",
+		"@wordpress/eslint-plugin": "*",
+		"@wordpress/jest-preset-default": "*",
+		"@wordpress/npm-package-json-lint-config": "*",
+		"@wordpress/postcss-plugins-preset": "*",
+		"@wordpress/prettier-config": "*",
+		"@wordpress/stylelint-config": "*",
 		"adm-zip": "^0.5.9",
-		"babel-jest": "^29.6.2",
-		"babel-loader": "^8.2.3",
+		"babel-jest": "29.7.0",
+		"babel-loader": "9.2.1",
 		"browserslist": "^4.21.10",
 		"chalk": "^4.0.0",
 		"check-node-version": "^4.1.0",
@@ -66,33 +66,36 @@
 		"jest-dev-server": "^9.0.1",
 		"jest-environment-jsdom": "^29.6.2",
 		"jest-environment-node": "^29.6.2",
+		"json2php": "^0.0.9",
 		"markdownlint-cli": "^0.31.1",
 		"merge-deep": "^3.0.3",
 		"mini-css-extract-plugin": "^2.5.1",
 		"minimist": "^1.2.0",
 		"npm-package-json-lint": "^6.4.0",
 		"npm-packlist": "^3.0.0",
-		"playwright-core": "1.39.0",
 		"postcss": "^8.4.5",
+		"postcss-import": "^16.1.0",
 		"postcss-loader": "^6.2.1",
 		"prettier": "npm:wp-prettier@3.0.3",
-		"puppeteer-core": "^13.2.0",
+		"puppeteer-core": "^23.1.0",
 		"react-refresh": "^0.14.0",
 		"read-pkg-up": "^7.0.1",
 		"resolve-bin": "^0.4.0",
+		"rtlcss-webpack-plugin": "^4.0.7",
 		"sass": "^1.35.2",
 		"sass-loader": "^12.1.0",
+		"schema-utils": "^4.2.0",
 		"source-map-loader": "^3.0.0",
-		"stylelint": "^14.2.0",
-		"terser-webpack-plugin": "^5.3.9",
+		"stylelint": "^16.8.2",
+		"terser-webpack-plugin": "^5.3.10",
 		"url-loader": "^4.1.1",
-		"webpack": "^5.88.2",
+		"webpack": "^5.95.0",
 		"webpack-bundle-analyzer": "^4.9.1",
 		"webpack-cli": "^5.1.4",
 		"webpack-dev-server": "^4.15.1"
 	},
 	"peerDependencies": {
-		"@playwright/test": "^1.39.0",
+		"@playwright/test": "^1.48.1",
 		"react": "^18.0.0",
 		"react-dom": "^18.0.0"
 	},
diff --git a/packages/scripts/scripts/build-blocks-manifest.js b/packages/scripts/scripts/build-blocks-manifest.js
new file mode 100644
index 00000000000000..7138505de59ed6
--- /dev/null
+++ b/packages/scripts/scripts/build-blocks-manifest.js
@@ -0,0 +1,72 @@
+/**
+ * External dependencies
+ */
+const fs = require( 'fs' );
+const path = require( 'path' );
+const { sync: glob } = require( 'fast-glob' );
+const json2php = require( 'json2php' );
+const chalk = require( 'chalk' );
+
+/**
+ * Internal dependencies
+ */
+const { getArgFromCLI } = require( '../utils' );
+
+// Set default paths
+const defaultInputDir = 'build';
+const defaultOutputFile = path.join( 'build', 'blocks-manifest.php' );
+
+// Parse command line arguments
+const inputDir = getArgFromCLI( '--input' ) || defaultInputDir;
+const outputFile = getArgFromCLI( '--output' ) || defaultOutputFile;
+
+const resolvedInputDir = path.resolve( process.cwd(), inputDir );
+if ( ! fs.existsSync( resolvedInputDir ) ) {
+	const ERROR = chalk.reset.inverse.bold.red( ' ERROR ' );
+	process.stdout.write(
+		`${ ERROR } Input directory "${ inputDir }" does not exist.\n`
+	);
+	process.exit( 1 );
+}
+
+// Find all block.json files
+const blockJsonFiles = glob( './**/block.json', {
+	cwd: resolvedInputDir,
+	absolute: true,
+} );
+
+const blocks = {};
+
+blockJsonFiles.forEach( ( file ) => {
+	const blockJson = JSON.parse( fs.readFileSync( file, 'utf8' ) );
+	const directoryName = path.basename( path.dirname( file ) );
+	blocks[ directoryName ] = blockJson;
+} );
+
+if ( Object.keys( blocks ).length === 0 ) {
+	const ERROR = chalk.reset.inverse.bold.red( ' ERROR ' );
+	process.stdout.write(
+		`${ ERROR } No block.json files were found in path: ${ inputDir }.\n`
+	);
+	process.exit( 1 );
+}
+
+// Generate PHP content
+const printer = json2php.make( { linebreak: '\n', indent: '\t' } );
+const phpContent = `<?php
+// This file is generated. Do not modify it manually.
+return ${ printer( blocks ) };
+`;
+
+// Ensure output directory exists
+const outputDir = path.dirname( outputFile );
+if ( ! fs.existsSync( outputDir ) ) {
+	fs.mkdirSync( outputDir, { recursive: true } );
+}
+
+// Write the file
+fs.writeFileSync( outputFile, phpContent );
+
+process.stdout.write(
+	`Block metadata PHP file generated at: ${ outputFile }\n`
+);
diff --git a/packages/scripts/scripts/build.js b/packages/scripts/scripts/build.js
index 714038fd80ee4e..0eef2afb451bfc 100644
--- a/packages/scripts/scripts/build.js
+++ b/packages/scripts/scripts/build.js
@@ -12,6 +12,10 @@ const EXIT_ERROR_CODE = 1;
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
+if ( hasArgInCLI( '--experimental-modules' ) ) {
+	process.env.WP_EXPERIMENTAL_MODULES = true;
+}
+
 if ( hasArgInCLI( '--webpack-no-externals' ) ) {
 	process.env.WP_NO_EXTERNALS = true;
 }
diff --git a/packages/scripts/scripts/check-licenses.js b/packages/scripts/scripts/check-licenses.js
index 5e0dd37239612e..40537cf4880fce 100644
--- a/packages/scripts/scripts/check-licenses.js
+++ b/packages/scripts/scripts/check-licenses.js
@@ -2,13 +2,12 @@
  * External dependencies
  */
 const spawn = require( 'cross-spawn' );
-const { existsSync, readFileSync } = require( 'fs' );
-const chalk = require( 'chalk' );
 
 /**
  * Internal dependencies
  */
 const { getArgFromCLI, hasArgInCLI } = require( '../utils' );
+const { checkDepsInTree } = require( '../utils/license' );
 
 /*
  * WARNING: Changes to this file may inadvertently cause us to distribute code that
@@ -19,9 +18,6 @@ const { getArgFromCLI, hasArgInCLI } = require( '../utils' );
  * reviewed and approved.
  */
 
-const ERROR = chalk.reset.inverse.bold.red( ' ERROR ' );
-const WARNING = chalk.reset.inverse.bold.yellow( ' WARNING ' );
-
 const prod = hasArgInCLI( '--prod' ) || hasArgInCLI( '--production' );
 const dev = hasArgInCLI( '--dev' ) || hasArgInCLI( '--development' );
 const gpl2 = hasArgInCLI( '--gpl2' );
@@ -33,144 +29,6 @@ const ignored = hasArgInCLI( '--ignore' )
 			.map( ( moduleName ) => moduleName.trim() )
 	: [];
 
-/*
- * A list of license strings that we've found to be GPL2 compatible.
- *
- * Note the strings with "AND" in them at the bottom: these should only be added when
- * all the licenses in that string are GPL2 compatible.
- */
-const gpl2CompatibleLicenses = [
-	'0BSD',
-	'Apache-2.0 WITH LLVM-exception',
-	'Artistic-2.0',
-	'BSD-2-Clause',
-	'BSD-3-Clause-W3C',
-	'BSD-3-Clause',
-	'BSD',
-	'CC-BY-4.0',
-	'CC0-1.0',
-	'GPL-2.0-or-later',
-	'GPL-2.0',
-	'GPL-2.0+',
-	'ISC',
-	'LGPL-2.1',
-	'MIT',
-	'MIT/X11',
-	'MPL-2.0',
-	'ODC-By-1.0',
-	'Public Domain',
-	'Unlicense',
-	'W3C-20150513',
-	'WTFPL',
-	'Zlib',
-];
-
-/*
- * A list of OSS license strings that aren't GPL2 compatible.
- *
- * We're cool with using packages that are licensed under any of these if we're not
- * distributing them (for example, build tools), but we can't included them in a release.
- */
-const otherOssLicenses = [
-	'Apache-2.0',
-	'Apache License, Version 2.0',
-	'CC-BY-3.0',
-	'CC-BY-SA-2.0',
-	'LGPL',
-	'Python-2.0',
-];
-
-const licenses = [
-	...gpl2CompatibleLicenses,
-	...( gpl2 ? [] : otherOssLicenses ),
-];
-
-/*
- * Some packages don't included a license string in their package.json file, but they
- * do have a license listed elsewhere. These files are checked for matching license strings.
- * Only the first matching license file with a matching license string is considered.
- *
- * See: licenseFileStrings.
- */
-const licenseFiles = [
-	'LICENCE',
-	'license',
-	'LICENSE',
-	'LICENSE.md',
-	'LICENSE.txt',
-	'LICENSE-MIT',
-	'MIT-LICENSE.txt',
-	'Readme.md',
-	'README.md',
-];
-
-/*
- * When searching through files for licensing information, these are the strings we look for,
- * and their matching license.
- */
-const licenseFileStrings = {
-	'Apache-2.0': [ 'Licensed under the Apache License, Version 2.0' ],
-	BSD: [
-		'Redistributions in binary form must reproduce the above copyright notice,',
-	],
-	'BSD-3-Clause-W3C': [ 'W3C 3-clause BSD License' ],
-	MIT: [
-		'Permission is hereby granted, free of charge,',
-		'## License\n\nMIT',
-		'## License\n\n  MIT',
-	],
-};
-
-/**
- * Check if a license string matches the given license.
- *
- * The license string can be a single license, or an SPDX-compatible "OR" license string.
- * eg, "(MIT OR Zlib)".
- *
- * @param {string} allowedLicense The license that's allowed.
- * @param {string} licenseType    The license string to check.
- *
- * @return {boolean} true if the licenseType matches the allowedLicense, false if it doesn't.
- */
-const checkLicense = ( allowedLicense, licenseType ) => {
-	if ( ! licenseType ) {
-		return false;
-	}
-
-	// Some licenses have unusual capitalisation in them.
-	const formattedAllowedLicense = allowedLicense.toLowerCase();
-	const formattedlicenseType = licenseType.toLowerCase();
-
-	if ( formattedAllowedLicense === formattedlicenseType ) {
-		return true;
-	}
-
-	// We can skip the parsing below if there isn't an 'OR' in the license.
-	if ( ! formattedlicenseType.includes( ' or ' ) ) {
-		return false;
-	}
-
-	/*
-	 * In order to do a basic parse of SPDX-compatible "OR" license strings, we:
-	 * - Remove surrounding brackets: "(mit or zlib)" -> "mit or zlib"
-	 * - Split it into an array: "mit or zlib" -> [ "mit", "zlib" ]
-	 * - Trim any remaining whitespace from each element
-	 */
-	const subLicenseTypes = formattedlicenseType
-		.replace( /^\(*/g, '' )
-		.replace( /\)*$/, '' )
-		.split( ' or ' )
-		.map( ( e ) => e.trim() );
-
-	// We can then check our array of licenses against the allowedLicense.
-	return (
-		undefined !==
-		subLicenseTypes.find( ( subLicenseType ) =>
-			checkLicense( allowedLicense, subLicenseType )
-		)
-	);
-};
-
 // Use `npm ls` to grab a list of all the packages.
 const child = spawn.sync(
 	'npm',
@@ -179,8 +37,8 @@ const child = spawn.sync(
 		'--json',
 		'--long',
 		'--all',
-		...( prod ? [ '--prod' ] : [] ),
-		...( dev ? [ '--dev' ] : [] ),
+		...( prod ? [ '--omit=dev' ] : [] ),
+		...( dev ? [ '--include=dev' ] : [] ),
 	],
 	/*
 	 * Set the max buffer to ~157MB, since the output size for
@@ -193,193 +51,4 @@ const result = JSON.parse( child.stdout.toString() );
 
 const topLevelDeps = result.dependencies;
 
-function traverseDepTree( deps ) {
-	for ( const key in deps ) {
-		const dep = deps[ key ];
-
-		if ( ignored.includes( dep.name ) ) {
-			return;
-		}
-
-		if ( ! dep.hasOwnProperty( 'path' ) ) {
-			if ( dep.hasOwnProperty( 'peerMissing' ) ) {
-				process.stdout.write(
-					`${ WARNING } Unable to locate path for missing peer dep ${ dep.name }@${ dep.version }. `
-				);
-			} else {
-				process.exitCode = 1;
-				process.stdout.write(
-					`${ ERROR } Unable to locate path for ${ dep.name }@${ dep.version }. `
-				);
-			}
-		} else if ( dep.missing ) {
-			process.stdout.write(
-				`${ WARNING } missing dep ${ dep.name }@${ dep.version }. `
-			);
-		} else {
-			checkDepLicense( dep.path );
-		}
-
-		if ( dep.hasOwnProperty( 'dependencies' ) ) {
-			traverseDepTree( dep.dependencies );
-		} else {
-			return;
-		}
-	}
-}
-
-function detectTypeFromLicenseFiles( path ) {
-	return licenseFiles.reduce( ( detectedType, licenseFile ) => {
-		// If another LICENSE file already had licenses in it, use those.
-		if ( detectedType ) {
-			return detectedType;
-		}
-
-		const licensePath = path + '/' + licenseFile;
-
-		if ( existsSync( licensePath ) ) {
-			const licenseText = readFileSync( licensePath ).toString();
-			return detectTypeFromLicenseText( licenseText );
-		}
-
-		return detectedType;
-	}, false );
-}
-
-function detectTypeFromLicenseText( licenseText ) {
-	// Check if the file contains any of the strings in licenseFileStrings.
-	return Object.keys( licenseFileStrings ).reduce(
-		( stringDetectedType, licenseStringType ) => {
-			const licenseFileString = licenseFileStrings[ licenseStringType ];
-
-			return licenseFileString.reduce(
-				( currentDetectedType, fileString ) => {
-					if ( licenseText.includes( fileString ) ) {
-						if ( currentDetectedType ) {
-							return currentDetectedType.concat(
-								' AND ',
-								licenseStringType
-							);
-						}
-						return licenseStringType;
-					}
-					return currentDetectedType;
-				},
-				stringDetectedType
-			);
-		},
-		false
-	);
-}
-
-function checkDepLicense( path ) {
-	if ( ! path ) {
-		return;
-	}
-
-	const filename = path + '/package.json';
-	if ( ! existsSync( filename ) ) {
-		process.stdout.write( `Unable to locate package.json in ${ path }.` );
-		process.exit( 1 );
-	}
-
-	/*
-	 * The package.json format can be kind of weird. We allow for the following formats:
-	 * - { license: 'MIT' }
-	 * - { license: { type: 'MIT' } }
-	 * - { licenses: [ 'MIT', 'Zlib' ] }
-	 * - { licenses: [ { type: 'MIT' }, { type: 'Zlib' } ] }
-	 */
-	const packageInfo = require( filename );
-	const license =
-		packageInfo.license ||
-		( packageInfo.licenses &&
-			packageInfo.licenses.map( ( l ) => l.type || l ).join( ' OR ' ) );
-	let licenseType = typeof license === 'object' ? license.type : license;
-
-	// Check if the license we've detected is telling us to look in the license file, instead.
-	if (
-		licenseType &&
-		licenseFiles.find( ( licenseFile ) =>
-			licenseType.includes( licenseFile )
-		)
-	) {
-		licenseType = undefined;
-	}
-
-	if ( licenseType !== undefined ) {
-		let licenseTypes = [ licenseType ];
-		if ( licenseType.includes( ' AND ' ) ) {
-			licenseTypes = licenseType
-				.replace( /^\(*/g, '' )
-				.replace( /\)*$/, '' )
-				.split( ' AND ' )
-				.map( ( e ) => e.trim() );
-		}
-
-		if ( checkAllCompatible( licenseTypes, licenses ) ) {
-			return;
-		}
-	}
-
-	/*
-	 * If we haven't been able to detect a license in the package.json file,
-	 * or the type was invalid, try reading it from the files defined in
-	 * license files, instead.
-	 */
-	const detectedLicenseType = detectTypeFromLicenseFiles( path );
-	if ( ! licenseType && ! detectedLicenseType ) {
-		return;
-	}
-
-	let detectedLicenseTypes = [ detectedLicenseType ];
-	if ( detectedLicenseType.includes( ' AND ' ) ) {
-		detectedLicenseTypes = detectedLicenseType
-			.replace( /^\(*/g, '' )
-			.replace( /\)*$/, '' )
-			.split( ' AND ' )
-			.map( ( e ) => e.trim() );
-	}
-
-	if ( checkAllCompatible( detectedLicenseTypes, licenses ) ) {
-		return;
-	}
-
-	process.exitCode = 1;
-	process.stdout.write(
-		`${ ERROR } Module ${ packageInfo.name } has an incompatible license '${ licenseType }'.\n`
-	);
-}
-
-/**
- * Check that all of the licenses for a package are compatible.
- *
- * This function is invoked when the licenses are a conjunctive ("AND") list of licenses.
- * In that case, the software is only compatible if all of the licenses in the list are
- * compatible.
- *
- * @param {Array} packageLicenses    The licenses that a package is licensed under.
- * @param {Array} compatibleLicenses The list of compatible licenses.
- *
- * @return {boolean} true if all of the packageLicenses appear in compatibleLicenses.
- */
-function checkAllCompatible( packageLicenses, compatibleLicenses ) {
-	return packageLicenses.reduce( ( compatible, packageLicense ) => {
-		return (
-			compatible &&
-			compatibleLicenses.reduce(
-				( found, allowedLicense ) =>
-					found || checkLicense( allowedLicense, packageLicense ),
-				false
-			)
-		);
-	}, true );
-}
-
-traverseDepTree( topLevelDeps );
-
-// Required for unit testing
-module.exports = {
-	detectTypeFromLicenseText,
-	checkAllCompatible,
-};
+checkDepsInTree( topLevelDeps, { ignored, gpl2 } );
diff --git a/packages/scripts/scripts/start.js b/packages/scripts/scripts/start.js
index cf29709f3eff15..6296192ef302b1 100644
--- a/packages/scripts/scripts/start.js
+++ b/packages/scripts/scripts/start.js
@@ -10,6 +10,10 @@ const { sync: resolveBin } = require( 'resolve-bin' );
 const { getArgFromCLI, getWebpackArgs, hasArgInCLI } = require( '../utils' );
 const EXIT_ERROR_CODE = 1;
 
+if ( hasArgInCLI( '--experimental-modules' ) ) {
+	process.env.WP_EXPERIMENTAL_MODULES = true;
+}
+
 if ( hasArgInCLI( '--webpack-no-externals' ) ) {
 	process.env.WP_NO_EXTERNALS = true;
 }
diff --git a/packages/scripts/scripts/test-playwright.js b/packages/scripts/scripts/test-playwright.js
index 4a8b0762336abd..9657ef23bdfe70 100644
--- a/packages/scripts/scripts/test-playwright.js
+++ b/packages/scripts/scripts/test-playwright.js
@@ -12,7 +12,6 @@ process.on( 'unhandledRejection', ( err ) => {
 /**
  * External dependencies
  */
-const path = require( 'path' );
 const { resolve } = require( 'node:path' );
 const { sync: spawn } = require( 'cross-spawn' );
 
@@ -28,20 +27,9 @@ const {
 } = require( '../utils' );
 
 if ( ! getAsBooleanFromENV( 'PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD' ) ) {
-	const result = spawn(
-		'node',
-		[
-			path.resolve(
-				require.resolve( 'playwright-core' ),
-				'..',
-				'cli.js'
-			),
-			'install',
-		],
-		{
-			stdio: 'inherit',
-		}
-	);
+	const result = spawn( 'npx', [ 'playwright', 'install' ], {
+		stdio: 'inherit',
+	} );
 
 	if ( result.status > 0 ) {
 		process.exit( result.status );
diff --git a/packages/scripts/scripts/test/__snapshots__/build-blocks-manifest.js.snap b/packages/scripts/scripts/test/__snapshots__/build-blocks-manifest.js.snap
new file mode 100644
index 00000000000000..aa7cd50e3470ce
--- /dev/null
+++ b/packages/scripts/scripts/test/__snapshots__/build-blocks-manifest.js.snap
@@ -0,0 +1,113 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`build-blocks-manifest script should generate expected blocks manifest 1`] = `
+"<?php
+// This file is generated. Do not modify it manually.
+return array(
+	'custom-header' => array(
+		'$schema' => 'https://schemas.wp.org/trunk/block.json',
+		'apiVersion' => 2,
+		'name' => 'my-plugin/custom-header',
+		'title' => 'Custom Header',
+		'category' => 'text',
+		'icon' => 'heading',
+		'description' => 'A custom header block with color options.',
+		'attributes' => array(
+			'content' => array(
+				'type' => 'string',
+				'source' => 'html',
+				'selector' => 'h2'
+			),
+			'textColor' => array(
+				'type' => 'string'
+			),
+			'backgroundColor' => array(
+				'type' => 'string'
+			)
+		),
+		'supports' => array(
+			'html' => false,
+			'color' => array(
+				'background' => true,
+				'text' => true
+			)
+		),
+		'textdomain' => 'my-plugin',
+		'editorScript' => 'file:./index.js',
+		'editorStyle' => 'file:./index.css',
+		'style' => 'file:./style-index.css'
+	),
+	'image-gallery' => array(
+		'$schema' => 'https://schemas.wp.org/trunk/block.json',
+		'apiVersion' => 2,
+		'name' => 'my-plugin/image-gallery',
+		'title' => 'Image Gallery',
+		'category' => 'media',
+		'icon' => 'format-gallery',
+		'description' => 'An image gallery block with customizable layout.',
+		'attributes' => array(
+			'images' => array(
+				'type' => 'array',
+				'default' => array(
+					
+				),
+				'source' => 'query',
+				'selector' => 'img',
+				'query' => array(
+					'url' => array(
+						'type' => 'string',
+						'source' => 'attribute',
+						'attribute' => 'src'
+					),
+					'alt' => array(
+						'type' => 'string',
+						'source' => 'attribute',
+						'attribute' => 'alt',
+						'default' => ''
+					),
+					'id' => array(
+						'type' => 'number',
+						'source' => 'attribute',
+						'attribute' => 'data-id'
+					)
+				)
+			),
+			'columns' => array(
+				'type' => 'number',
+				'default' => 3
+			),
+			'imageCrop' => array(
+				'type' => 'boolean',
+				'default' => true
+			)
+		),
+		'supports' => array(
+			'align' => array(
+				'wide',
+				'full'
+			)
+		),
+		'textdomain' => 'my-plugin',
+		'editorScript' => 'file:./index.js',
+		'editorStyle' => 'file:./index.css',
+		'style' => 'file:./style-index.css'
+	),
+	'simple-button' => array(
+		'$schema' => 'https://schemas.wp.org/trunk/block.json',
+		'apiVersion' => 2,
+		'name' => 'my-plugin/simple-button',
+		'title' => 'Simple Button',
+		'category' => 'design',
+		'icon' => 'button',
+		'description' => 'A simple button block.',
+		'supports' => array(
+			'html' => false
+		),
+		'textdomain' => 'my-plugin',
+		'editorScript' => 'file:./index.js',
+		'editorStyle' => 'file:./index.css',
+		'style' => 'file:./style-index.css'
+	)
+);
+"
+`;
diff --git a/packages/scripts/scripts/test/build-blocks-manifest.js b/packages/scripts/scripts/test/build-blocks-manifest.js
new file mode 100644
index 00000000000000..70009bd6087b56
--- /dev/null
+++ b/packages/scripts/scripts/test/build-blocks-manifest.js
@@ -0,0 +1,101 @@
+/**
+ * External dependencies
+ */
+const fs = require( 'fs' );
+const path = require( 'path' );
+const { execSync } = require( 'child_process' );
+const rimraf = require( 'rimraf' );
+
+const fixturesPath = path.join(
+	__dirname,
+	'fixtures',
+	'build-blocks-manifest'
+);
+const outputPath = path.join( __dirname, 'build', 'test-blocks-manifest' );
+
+describe( 'build-blocks-manifest script', () => {
+	beforeAll( () => {
+		if ( ! fs.existsSync( outputPath ) ) {
+			fs.mkdirSync( outputPath, { recursive: true } );
+		}
+		rimraf.sync( outputPath );
+	} );
+
+	afterAll( () => {
+		rimraf.sync( outputPath );
+	} );
+
+	it( 'should generate expected blocks manifest', () => {
+		const inputDir = path.join( fixturesPath, 'input' );
+		const outputFile = path.join( outputPath, 'blocks-manifest.php' );
+
+		// Run the build-blocks-manifest script
+		const scriptPath = path.resolve(
+			__dirname,
+			'..',
+			'build-blocks-manifest.js'
+		);
+		execSync(
+			`node ${ scriptPath } --input=${ inputDir } --output=${ outputFile }`
+		);
+
+		const generatedContent = fs.readFileSync( outputFile, 'utf8' );
+		expect( generatedContent ).toMatchSnapshot();
+	} );
+
+	it( 'should error on empty input directory', () => {
+		const emptyInputDir = path.join( fixturesPath, 'empty-input' );
+		const outputFile = path.join( outputPath, 'empty-blocks-manifest.php' );
+
+		const scriptPath = path.resolve(
+			__dirname,
+			'..',
+			'build-blocks-manifest.js'
+		);
+		let error;
+		try {
+			execSync(
+				`node ${ scriptPath } --input=${ emptyInputDir } --output=${ outputFile }`,
+				{ encoding: 'utf8' }
+			);
+		} catch ( e ) {
+			error = e;
+		}
+
+		// Check that an error was thrown.
+		expect( error ).toBeDefined();
+		expect( error.stdout ).toContain(
+			`No block.json files were found in path`
+		);
+
+		// Ensure that the output file was not created
+		expect( fs.existsSync( outputFile ) ).toBe( false );
+	} );
+
+	it( 'should error on missing input directory', () => {
+		const nonExistentInputDir = path.join( fixturesPath, 'missing-input' );
+		const outputFile = path.join( outputPath, 'empty-blocks-manifest.php' );
+
+		const scriptPath = path.resolve(
+			__dirname,
+			'..',
+			'build-blocks-manifest.js'
+		);
+		let error;
+		try {
+			execSync(
+				`node ${ scriptPath } --input=${ nonExistentInputDir } --output=${ outputFile }`,
+				{ encoding: 'utf8' }
+			);
+		} catch ( e ) {
+			error = e;
+		}
+
+		// Check that an error was thrown.
+		expect( error ).toBeDefined();
+		expect( error.stdout ).toContain( `does not exist` );
+
+		// Ensure that the output file was not created
+		expect( fs.existsSync( outputFile ) ).toBe( false );
+	} );
+} );
diff --git a/packages/scripts/scripts/test/check-licenses.js b/packages/scripts/scripts/test/check-licenses.js
deleted file mode 100644
index 13116bd9222a06..00000000000000
--- a/packages/scripts/scripts/test/check-licenses.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' );
-const path = require( 'path' );
-
-/**
- * Internal dependencies
- */
-import {
-	detectTypeFromLicenseText,
-	checkAllCompatible,
-} from '../check-licenses';
-
-describe( 'detectTypeFromLicenseText', () => {
-	let licenseText;
-
-	it( "should return 'Apache 2.0' when the license text is the Apache 2.0 license", () => {
-		licenseText = fs
-			.readFileSync( path.resolve( __dirname, 'licenses/apache2.txt' ) )
-			.toString();
-
-		expect( detectTypeFromLicenseText( licenseText ) ).toBe( 'Apache-2.0' );
-	} );
-
-	it( "should return 'BSD' when the license text is the BSD 3-clause license", () => {
-		licenseText = fs
-			.readFileSync(
-				path.resolve( __dirname, 'licenses/bsd3clause.txt' )
-			)
-			.toString();
-
-		expect( detectTypeFromLicenseText( licenseText ) ).toBe( 'BSD' );
-	} );
-
-	it( "should return 'BSD-3-Clause-W3C' when the license text is the W3C variation of the BSD 3-clause license", () => {
-		licenseText = fs
-			.readFileSync( path.resolve( __dirname, 'licenses/w3cbsd.txt' ) )
-			.toString();
-
-		expect( detectTypeFromLicenseText( licenseText ) ).toBe(
-			'BSD-3-Clause-W3C'
-		);
-	} );
-
-	it( "should return 'MIT' when the license text is the MIT license", () => {
-		licenseText = fs
-			.readFileSync( path.resolve( __dirname, 'licenses/mit.txt' ) )
-			.toString();
-
-		expect( detectTypeFromLicenseText( licenseText ) ).toBe( 'MIT' );
-	} );
-
-	it( "should return 'Apache2 AND MIT' when the license text is Apache2 followed by MIT license", () => {
-		licenseText = fs
-			.readFileSync(
-				path.resolve( __dirname, 'licenses/apache2-mit.txt' )
-			)
-			.toString();
-
-		expect( detectTypeFromLicenseText( licenseText ) ).toBe(
-			'Apache-2.0 AND MIT'
-		);
-	} );
-} );
-
-describe( 'checkAllCompatible', () => {
-	it( "should return 'true' when single license is in the allowed list", () => {
-		expect( checkAllCompatible( [ 'B' ], [ 'A', 'B', 'C' ] ) ).toBe( true );
-	} );
-
-	it( "should return 'false' when single license is not in the allowed list", () => {
-		expect( checkAllCompatible( [ 'D' ], [ 'A', 'B', 'C' ] ) ).toBe(
-			false
-		);
-	} );
-
-	it( "should return 'true' when all licenses are in the allowed list", () => {
-		expect( checkAllCompatible( [ 'A', 'C' ], [ 'A', 'B', 'C' ] ) ).toBe(
-			true
-		);
-	} );
-
-	it( "should return 'false' when any license is not in the allowed list", () => {
-		expect( checkAllCompatible( [ 'A', 'D' ], [ 'A', 'B', 'C' ] ) ).toBe(
-			false
-		);
-	} );
-} );
diff --git a/packages/commands/.npmrc b/packages/scripts/scripts/test/fixtures/build-blocks-manifest/empty-input/.keep
similarity index 100%
rename from packages/commands/.npmrc
rename to packages/scripts/scripts/test/fixtures/build-blocks-manifest/empty-input/.keep
diff --git a/packages/scripts/scripts/test/fixtures/build-blocks-manifest/input/custom-header/block.json b/packages/scripts/scripts/test/fixtures/build-blocks-manifest/input/custom-header/block.json
new file mode 100644
index 00000000000000..056bffbe28b184
--- /dev/null
+++ b/packages/scripts/scripts/test/fixtures/build-blocks-manifest/input/custom-header/block.json
@@ -0,0 +1,33 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "my-plugin/custom-header",
+	"title": "Custom Header",
+	"category": "text",
+	"icon": "heading",
+	"description": "A custom header block with color options.",
+	"attributes": {
+		"content": {
+			"type": "string",
+			"source": "html",
+			"selector": "h2"
+		},
+		"textColor": {
+			"type": "string"
+		},
+		"backgroundColor": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"html": false,
+		"color": {
+			"background": true,
+			"text": true
+		}
+	},
+	"textdomain": "my-plugin",
+	"editorScript": "file:./index.js",
+	"editorStyle": "file:./index.css",
+	"style": "file:./style-index.css"
+}
diff --git a/packages/scripts/scripts/test/fixtures/build-blocks-manifest/input/image-gallery/block.json b/packages/scripts/scripts/test/fixtures/build-blocks-manifest/input/image-gallery/block.json
new file mode 100644
index 00000000000000..9c84fff4338704
--- /dev/null
+++ b/packages/scripts/scripts/test/fixtures/build-blocks-manifest/input/image-gallery/block.json
@@ -0,0 +1,50 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "my-plugin/image-gallery",
+	"title": "Image Gallery",
+	"category": "media",
+	"icon": "format-gallery",
+	"description": "An image gallery block with customizable layout.",
+	"attributes": {
+		"images": {
+			"type": "array",
+			"default": [],
+			"source": "query",
+			"selector": "img",
+			"query": {
+				"url": {
+					"type": "string",
+					"source": "attribute",
+					"attribute": "src"
+				},
+				"alt": {
+					"type": "string",
+					"source": "attribute",
+					"attribute": "alt",
+					"default": ""
+				},
+				"id": {
+					"type": "number",
+					"source": "attribute",
+					"attribute": "data-id"
+				}
+			}
+		},
+		"columns": {
+			"type": "number",
+			"default": 3
+		},
+		"imageCrop": {
+			"type": "boolean",
+			"default": true
+		}
+	},
+	"supports": {
+		"align": [ "wide", "full" ]
+	},
+	"textdomain": "my-plugin",
+	"editorScript": "file:./index.js",
+	"editorStyle": "file:./index.css",
+	"style": "file:./style-index.css"
+}
diff --git a/packages/scripts/scripts/test/fixtures/build-blocks-manifest/input/simple-button/block.json b/packages/scripts/scripts/test/fixtures/build-blocks-manifest/input/simple-button/block.json
new file mode 100644
index 00000000000000..23e607c411fbdc
--- /dev/null
+++ b/packages/scripts/scripts/test/fixtures/build-blocks-manifest/input/simple-button/block.json
@@ -0,0 +1,16 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "my-plugin/simple-button",
+	"title": "Simple Button",
+	"category": "design",
+	"icon": "button",
+	"description": "A simple button block.",
+	"supports": {
+		"html": false
+	},
+	"textdomain": "my-plugin",
+	"editorScript": "file:./index.js",
+	"editorStyle": "file:./index.css",
+	"style": "file:./style-index.css"
+}
diff --git a/packages/scripts/utils/block-json.js b/packages/scripts/utils/block-json.js
new file mode 100644
index 00000000000000..e086405dd7455f
--- /dev/null
+++ b/packages/scripts/utils/block-json.js
@@ -0,0 +1,41 @@
+const moduleFields = new Set( [ 'viewScriptModule', 'viewModule' ] );
+const scriptFields = new Set( [ 'viewScript', 'script', 'editorScript' ] );
+
+/**
+ * @param {Object} blockJson
+ * @return {null|Record<string, unknown>} Fields
+ */
+function getBlockJsonModuleFields( blockJson ) {
+	let result = null;
+	for ( const field of moduleFields ) {
+		if ( Object.hasOwn( blockJson, field ) ) {
+			if ( ! result ) {
+				result = {};
+			}
+			result[ field ] = blockJson[ field ];
+		}
+	}
+	return result;
+}
+
+/**
+ * @param {Object} blockJson
+ * @return {null|Record<string, unknown>} Fields
+ */
+function getBlockJsonScriptFields( blockJson ) {
+	let result = null;
+	for ( const field of scriptFields ) {
+		if ( Object.hasOwn( blockJson, field ) ) {
+			if ( ! result ) {
+				result = {};
+			}
+			result[ field ] = blockJson[ field ];
+		}
+	}
+	return result;
+}
+
+module.exports = {
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
+};
diff --git a/packages/scripts/utils/config.js b/packages/scripts/utils/config.js
index e4e42255f95dd3..dfb44730438c4a 100644
--- a/packages/scripts/utils/config.js
+++ b/packages/scripts/utils/config.js
@@ -17,6 +17,10 @@ const {
 } = require( './cli' );
 const { fromConfigRoot, fromProjectRoot, hasProjectFile } = require( './file' );
 const { hasPackageProp } = require( './package' );
+const {
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
+} = require( './block-json' );
 const { log } = console;
 
 // See https://babeljs.io/docs/en/config-files#configuration-file-types.
@@ -108,7 +112,10 @@ const hasPostCSSConfig = () =>
  */
 const getWebpackArgs = () => {
 	// Gets all args from CLI without those prefixed with `--webpack`.
-	let webpackArgs = getArgsFromCLI( [ '--webpack' ] );
+	let webpackArgs = getArgsFromCLI( [
+		'--experimental-modules',
+		'--webpack',
+	] );
 
 	const hasWebpackOutputOption =
 		hasArgInCLI( '-o' ) || hasArgInCLI( '--output' );
@@ -186,104 +193,52 @@ function getWordPressSrcDirectory() {
  *
  * @see https://webpack.js.org/concepts/entry-points/
  *
- * @return {Object<string,string>} The list of entry points.
+ * @param {'script' | 'module'} buildType
  */
-function getWebpackEntryPoints() {
-	// 1. Handles the legacy format for entry points when explicitly provided with the `process.env.WP_ENTRY`.
-	if ( process.env.WP_ENTRY ) {
-		return JSON.parse( process.env.WP_ENTRY );
-	}
+function getWebpackEntryPoints( buildType ) {
+	/**
+	 * @return {Object<string,string>} The list of entry points.
+	 */
+	return () => {
+		// 1. Handles the legacy format for entry points when explicitly provided with the `process.env.WP_ENTRY`.
+		if ( process.env.WP_ENTRY ) {
+			return buildType === 'script'
+				? JSON.parse( process.env.WP_ENTRY )
+				: {};
+		}
 
-	// Continue only if the source directory exists.
-	if ( ! hasProjectFile( getWordPressSrcDirectory() ) ) {
-		log(
-			chalk.yellow(
-				`Source directory "${ getWordPressSrcDirectory() }" was not found. Please confirm there is a "src" directory in the root or the value passed to --webpack-src-dir is correct.`
-			)
-		);
-		return {};
-	}
+		// Continue only if the source directory exists.
+		if ( ! hasProjectFile( getWordPressSrcDirectory() ) ) {
+			log(
+				chalk.yellow(
+					`Source directory "${ getWordPressSrcDirectory() }" was not found. Please confirm there is a "src" directory in the root or the value passed to --webpack-src-dir is correct.`
+				)
+			);
+			return {};
+		}
 
-	// 2. Checks whether any block metadata files can be detected in the defined source directory.
-	//    It scans all discovered files looking for JavaScript assets and converts them to entry points.
-	const blockMetadataFiles = glob( '**/block.json', {
-		absolute: true,
-		cwd: fromProjectRoot( getWordPressSrcDirectory() ),
-	} );
+		// 2. Checks whether any block metadata files can be detected in the defined source directory.
+		//    It scans all discovered files looking for JavaScript assets and converts them to entry points.
+		const blockMetadataFiles = glob( '**/block.json', {
+			absolute: true,
+			cwd: fromProjectRoot( getWordPressSrcDirectory() ),
+		} );
 
-	if ( blockMetadataFiles.length > 0 ) {
-		const srcDirectory = fromProjectRoot(
-			getWordPressSrcDirectory() + sep
-		);
-		const entryPoints = blockMetadataFiles.reduce(
-			( accumulator, blockMetadataFile ) => {
+		if ( blockMetadataFiles.length > 0 ) {
+			const srcDirectory = fromProjectRoot(
+				getWordPressSrcDirectory() + sep
+			);
+
+			const entryPoints = {};
+
+			for ( const blockMetadataFile of blockMetadataFiles ) {
+				const fileContents = readFileSync( blockMetadataFile );
+				let parsedBlockJson;
 				// wrapping in try/catch in case the file is malformed
 				// this happens especially when new block.json files are added
 				// at which point they are completely empty and therefore not valid JSON
 				try {
-					const { editorScript, script, viewScript } = JSON.parse(
-						readFileSync( blockMetadataFile )
-					);
-					[ editorScript, script, viewScript ]
-						.flat()
-						.filter(
-							( value ) => value && value.startsWith( 'file:' )
-						)
-						.forEach( ( value ) => {
-							// Removes the `file:` prefix.
-							const filepath = join(
-								dirname( blockMetadataFile ),
-								value.replace( 'file:', '' )
-							);
-
-							// Takes the path without the file extension, and relative to the defined source directory.
-							if ( ! filepath.startsWith( srcDirectory ) ) {
-								log(
-									chalk.yellow(
-										`Skipping "${ value.replace(
-											'file:',
-											''
-										) }" listed in "${ blockMetadataFile.replace(
-											fromProjectRoot( sep ),
-											''
-										) }". File is located outside of the "${ getWordPressSrcDirectory() }" directory.`
-									)
-								);
-								return;
-							}
-							const entryName = filepath
-								.replace( extname( filepath ), '' )
-								.replace( srcDirectory, '' )
-								.replace( /\\/g, '/' );
-
-							// Detects the proper file extension used in the defined source directory.
-							const [ entryFilepath ] = glob(
-								`${ entryName }.[jt]s?(x)`,
-								{
-									absolute: true,
-									cwd: fromProjectRoot(
-										getWordPressSrcDirectory()
-									),
-								}
-							);
-
-							if ( ! entryFilepath ) {
-								log(
-									chalk.yellow(
-										`Skipping "${ value.replace(
-											'file:',
-											''
-										) }" listed in "${ blockMetadataFile.replace(
-											fromProjectRoot( sep ),
-											''
-										) }". File does not exist in the "${ getWordPressSrcDirectory() }" directory.`
-									)
-								);
-								return;
-							}
-							accumulator[ entryName ] = entryFilepath;
-						} );
-					return accumulator;
+					parsedBlockJson = JSON.parse( fileContents );
 				} catch ( error ) {
 					chalk.yellow(
 						`Skipping "${ blockMetadataFile.replace(
@@ -291,87 +246,166 @@ function getWebpackEntryPoints() {
 							''
 						) }" due to malformed JSON.`
 					);
-					return accumulator;
 				}
-			},
-			{}
-		);
 
-		if ( Object.keys( entryPoints ).length > 0 ) {
-			return entryPoints;
+				const fields =
+					buildType === 'script'
+						? getBlockJsonScriptFields( parsedBlockJson )
+						: getBlockJsonModuleFields( parsedBlockJson );
+
+				if ( ! fields ) {
+					continue;
+				}
+
+				for ( const value of Object.values( fields ).flat() ) {
+					if ( ! value.startsWith( 'file:' ) ) {
+						continue;
+					}
+
+					// Removes the `file:` prefix.
+					const filepath = join(
+						dirname( blockMetadataFile ),
+						value.replace( 'file:', '' )
+					);
+
+					// Takes the path without the file extension, and relative to the defined source directory.
+					if ( ! filepath.startsWith( srcDirectory ) ) {
+						log(
+							chalk.yellow(
+								`Skipping "${ value.replace(
+									'file:',
+									''
+								) }" listed in "${ blockMetadataFile.replace(
+									fromProjectRoot( sep ),
+									''
+								) }". File is located outside of the "${ getWordPressSrcDirectory() }" directory.`
+							)
+						);
+						return;
+					}
+					const entryName = filepath
+						.replace( extname( filepath ), '' )
+						.replace( srcDirectory, '' )
+						.replace( /\\/g, '/' );
+
+					// Detects the proper file extension used in the defined source directory.
+					const [ entryFilepath ] = glob(
+						`${ entryName }.?(m)[jt]s?(x)`,
+						{
+							absolute: true,
+							cwd: fromProjectRoot( getWordPressSrcDirectory() ),
+						}
+					);
+
+					if ( ! entryFilepath ) {
+						log(
+							chalk.yellow(
+								`Skipping "${ value.replace(
+									'file:',
+									''
+								) }" listed in "${ blockMetadataFile.replace(
+									fromProjectRoot( sep ),
+									''
+								) }". File does not exist in the "${ getWordPressSrcDirectory() }" directory.`
+							)
+						);
+						return;
+					}
+					entryPoints[ entryName ] = entryFilepath;
+				}
+			}
+
+			if ( Object.keys( entryPoints ).length > 0 ) {
+				return entryPoints;
+			}
 		}
-	}
 
-	// 3. Checks whether a standard file name can be detected in the defined source directory,
-	//  and converts the discovered file to entry point.
-	const [ entryFile ] = glob( 'index.[jt]s?(x)', {
-		absolute: true,
-		cwd: fromProjectRoot( getWordPressSrcDirectory() ),
-	} );
+		// Don't do any further processing if this is a module build.
+		// This only respects *module block.json fields.
+		if ( buildType === 'module' ) {
+			return {};
+		}
 
-	if ( ! entryFile ) {
-		log(
-			chalk.yellow(
-				`No entry file discovered in the "${ getWordPressSrcDirectory() }" directory.`
-			)
-		);
-		return {};
-	}
+		// 3. Checks whether a standard file name can be detected in the defined source directory,
+		//  and converts the discovered file to entry point.
+		const [ entryFile ] = glob( 'index.[jt]s?(x)', {
+			absolute: true,
+			cwd: fromProjectRoot( getWordPressSrcDirectory() ),
+		} );
+
+		if ( ! entryFile ) {
+			log(
+				chalk.yellow(
+					`No entry file discovered in the "${ getWordPressSrcDirectory() }" directory.`
+				)
+			);
+			return {};
+		}
 
-	return {
-		index: entryFile,
+		return {
+			index: entryFile,
+		};
 	};
 }
 
 /**
- * Returns the list of paths included in the `render` props by scanning the `block.json` files.
+ * Returns the list of PHP file paths found in `block.json` files for the given props.
  *
- * @return {Array}  The list of all the `render` prop paths included in `block.json` files.
+ * @param {string}   context The path to search for `block.json` files.
+ * @param {string[]} props   The props to search for in the `block.json` files.
+ * @return {string[]} The list of PHP file paths.
  */
-function getRenderPropPaths() {
+function getPhpFilePaths( context, props ) {
 	// Continue only if the source directory exists.
-	if ( ! hasProjectFile( getWordPressSrcDirectory() ) ) {
+	if ( ! hasProjectFile( context ) ) {
 		return [];
 	}
 
 	// Checks whether any block metadata files can be detected in the defined source directory.
 	const blockMetadataFiles = glob( '**/block.json', {
 		absolute: true,
-		cwd: fromProjectRoot( getWordPressSrcDirectory() ),
+		cwd: fromProjectRoot( context ),
 	} );
 
-	const srcDirectory = fromProjectRoot( getWordPressSrcDirectory() + sep );
+	const srcDirectory = fromProjectRoot( context + sep );
+
+	return blockMetadataFiles.flatMap( ( blockMetadataFile ) => {
+		const blockJson = JSON.parse( readFileSync( blockMetadataFile ) );
+
+		const paths = [];
+		for ( const prop of props ) {
+			if (
+				typeof blockJson?.[ prop ] !== 'string' ||
+				! blockJson[ prop ]?.startsWith( 'file:' )
+			) {
+				continue;
+			}
 
-	const renderPaths = blockMetadataFiles.map( ( blockMetadataFile ) => {
-		const { render } = JSON.parse( readFileSync( blockMetadataFile ) );
-		if ( render && render.startsWith( 'file:' ) ) {
 			// Removes the `file:` prefix.
 			const filepath = join(
 				dirname( blockMetadataFile ),
-				render.replace( 'file:', '' )
+				blockJson[ prop ].replace( 'file:', '' )
 			);
 
 			// Takes the path without the file extension, and relative to the defined source directory.
 			if ( ! filepath.startsWith( srcDirectory ) ) {
 				log(
 					chalk.yellow(
-						`Skipping "${ render.replace(
+						`Skipping "${ blockJson[ prop ].replace(
 							'file:',
 							''
 						) }" listed in "${ blockMetadataFile.replace(
 							fromProjectRoot( sep ),
 							''
-						) }". File is located outside of the "${ getWordPressSrcDirectory() }" directory.`
+						) }". File is located outside of the "${ context }" directory.`
 					)
 				);
-				return false;
+				continue;
 			}
-			return filepath.replace( /\\/g, '/' );
+			paths.push( filepath.replace( /\\/g, '/' ) );
 		}
-		return false;
+		return paths;
 	} );
-
-	return renderPaths.filter( ( renderPath ) => renderPath );
 }
 
 module.exports = {
@@ -379,7 +413,7 @@ module.exports = {
 	getWebpackArgs,
 	getWordPressSrcDirectory,
 	getWebpackEntryPoints,
-	getRenderPropPaths,
+	getPhpFilePaths,
 	hasBabelConfig,
 	hasCssnanoConfig,
 	hasJestConfig,
diff --git a/packages/scripts/utils/index.js b/packages/scripts/utils/index.js
index ae93160381df44..cb7e592f83d554 100644
--- a/packages/scripts/utils/index.js
+++ b/packages/scripts/utils/index.js
@@ -16,7 +16,7 @@ const {
 	getWebpackArgs,
 	getWordPressSrcDirectory,
 	getWebpackEntryPoints,
-	getRenderPropPaths,
+	getPhpFilePaths,
 	hasBabelConfig,
 	hasCssnanoConfig,
 	hasJestConfig,
@@ -25,6 +25,11 @@ const {
 } = require( './config' );
 const { fromProjectRoot, fromConfigRoot, hasProjectFile } = require( './file' );
 const { getPackageProp, hasPackageProp } = require( './package' );
+const {
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
+} = require( './block-json' );
+const { PhpFilePathsPlugin } = require( './php-file-paths-plugin' );
 
 module.exports = {
 	fromProjectRoot,
@@ -39,7 +44,9 @@ module.exports = {
 	getWebpackArgs,
 	getWordPressSrcDirectory,
 	getWebpackEntryPoints,
-	getRenderPropPaths,
+	getPhpFilePaths,
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
 	hasArgInCLI,
 	hasBabelConfig,
 	hasCssnanoConfig,
@@ -49,5 +56,6 @@ module.exports = {
 	hasPostCSSConfig,
 	hasPrettierConfig,
 	hasProjectFile,
+	PhpFilePathsPlugin,
 	spawnScript,
 };
diff --git a/packages/scripts/utils/license.js b/packages/scripts/utils/license.js
new file mode 100644
index 00000000000000..ae18bfb2535985
--- /dev/null
+++ b/packages/scripts/utils/license.js
@@ -0,0 +1,377 @@
+/**
+ * External dependencies
+ */
+const chalk = require( 'chalk' );
+const { existsSync, readFileSync } = require( 'node:fs' );
+
+const ERROR_TEXT = chalk.reset.inverse.bold.red( ' ERROR ' );
+const WARNING_TEXT = chalk.reset.inverse.bold.yellow( ' WARNING ' );
+
+/**
+ * @typedef {ReadonlyArray<string>} Licenses
+ */
+
+/**
+ * Some packages don't included a license string in their package.json file, but they
+ * do have a license listed elsewhere. These files are checked for matching license strings.
+ * Only the first matching license file with a matching license string is considered.
+ *
+ * See: licenseFileStrings.
+ * @type {ReadonlyArray<string>}
+ */
+const licenseFiles = [
+	'LICENCE',
+	'license',
+	'LICENSE',
+	'LICENSE.md',
+	'LICENSE.txt',
+	'LICENSE-MIT',
+	'MIT-LICENSE.txt',
+	'Readme.md',
+	'README.md',
+];
+
+/**
+ * When searching through files for licensing information, these are the strings we look for,
+ * and their matching license.
+ */
+const licenseFileStrings = {
+	'Apache-2.0': [ 'Licensed under the Apache License, Version 2.0' ],
+	BSD: [
+		'Redistributions in binary form must reproduce the above copyright notice,',
+	],
+	'BSD-3-Clause-W3C': [ 'W3C 3-clause BSD License' ],
+	MIT: [
+		'Permission is hereby granted, free of charge,',
+		'## License\n\nMIT',
+		'## License\n\n  MIT',
+	],
+};
+
+/*
+ * A list of license strings that we've found to be GPL2 compatible.
+ *
+ * Note the strings with "AND" in them at the bottom: these should only be added when
+ * all the licenses in that string are GPL2 compatible.
+ */
+const gpl2CompatibleLicenses = [
+	'0BSD',
+	'Apache-2.0 WITH LLVM-exception',
+	'Artistic-2.0',
+	'BlueOak-1.0.0',
+	'BSD-2-Clause',
+	'BSD-3-Clause-W3C',
+	'BSD-3-Clause',
+	'BSD',
+	'CC-BY-4.0',
+	'CC0-1.0',
+	'GPL-2.0-or-later',
+	'GPL-2.0',
+	'GPL-2.0+',
+	'ISC',
+	'LGPL-2.1',
+	'MIT',
+	'MIT/X11',
+	'MPL-2.0',
+	'ODC-By-1.0',
+	'Public Domain',
+	'Unlicense',
+	'W3C-20150513',
+	'WTFPL',
+	'Zlib',
+];
+
+/*
+ * A list of OSS license strings that aren't GPL2 compatible.
+ *
+ * We're cool with using packages that are licensed under any of these if we're not
+ * distributing them (for example, build tools), but we can't included them in a release.
+ */
+const otherOssLicenses = [
+	'Apache-2.0',
+	'Apache License, Version 2.0',
+	'CC-BY-3.0',
+	'CC-BY-SA-2.0',
+	'LGPL',
+	'Python-2.0',
+];
+
+/**
+ * @param {boolean} gpl2 Only allow GPL2 compatible licenses.
+ * @return {Licenses} Allowed licenses.
+ */
+const getLicenses = ( gpl2 ) => {
+	return [ ...gpl2CompatibleLicenses, ...( gpl2 ? [] : otherOssLicenses ) ];
+};
+
+/**
+ * Check if a license string matches the given license.
+ *
+ * The license string can be a single license, or an SPDX-compatible "OR" license string.
+ * eg, "(MIT OR Zlib)".
+ *
+ * @param {string} allowedLicense The license that's allowed.
+ * @param {string} licenseType    The license string to check.
+ *
+ * @return {boolean} true if the licenseType matches the allowedLicense, false if it doesn't.
+ */
+const checkLicense = ( allowedLicense, licenseType ) => {
+	if ( ! licenseType ) {
+		return false;
+	}
+
+	// Some licenses have unusual capitalisation in them.
+	const formattedAllowedLicense = allowedLicense.toLowerCase();
+	const formattedlicenseType = licenseType.toLowerCase();
+
+	if ( formattedAllowedLicense === formattedlicenseType ) {
+		return true;
+	}
+
+	// We can skip the parsing below if there isn't an 'OR' in the license.
+	if ( ! formattedlicenseType.includes( ' or ' ) ) {
+		return false;
+	}
+
+	/*
+	 * In order to do a basic parse of SPDX-compatible "OR" license strings, we:
+	 * - Remove surrounding brackets: "(mit or zlib)" -> "mit or zlib"
+	 * - Split it into an array: "mit or zlib" -> [ "mit", "zlib" ]
+	 * - Trim any remaining whitespace from each element
+	 */
+	const subLicenseTypes = formattedlicenseType
+		.replace( /^\(*/g, '' )
+		.replace( /\)*$/, '' )
+		.split( ' or ' )
+		.map( ( e ) => e.trim() );
+
+	// We can then check our array of licenses against the allowedLicense.
+	return (
+		undefined !==
+		subLicenseTypes.find( ( subLicenseType ) =>
+			checkLicense( allowedLicense, subLicenseType )
+		)
+	);
+};
+
+/**
+ * Check that all of the licenses for a package are compatible.
+ *
+ * This function is invoked when the licenses are a conjunctive ("AND") list of licenses.
+ * In that case, the software is only compatible if all of the licenses in the list are
+ * compatible.
+ *
+ * @param {Licenses} packageLicenses    The licenses that a package is licensed under.
+ * @param {Licenses} compatibleLicenses The list of compatible licenses.
+ *
+ * @return {boolean} true if all of the packageLicenses appear in compatibleLicenses.
+ */
+function checkAllCompatible( packageLicenses, compatibleLicenses ) {
+	return packageLicenses.reduce( ( compatible, packageLicense ) => {
+		return (
+			compatible &&
+			compatibleLicenses.reduce(
+				( found, allowedLicense ) =>
+					found || checkLicense( allowedLicense, packageLicense ),
+				false
+			)
+		);
+	}, true );
+}
+
+function detectTypeFromLicenseText( licenseText ) {
+	// Check if the file contains any of the strings in licenseFileStrings.
+	return Object.keys( licenseFileStrings ).reduce(
+		( stringDetectedType, licenseStringType ) => {
+			const licenseFileString = licenseFileStrings[ licenseStringType ];
+
+			return licenseFileString.reduce(
+				( currentDetectedType, fileString ) => {
+					if ( licenseText.includes( fileString ) ) {
+						if ( currentDetectedType ) {
+							return currentDetectedType.concat(
+								' AND ',
+								licenseStringType
+							);
+						}
+						return licenseStringType;
+					}
+					return currentDetectedType;
+				},
+				stringDetectedType
+			);
+		},
+		false
+	);
+}
+
+const reportedPackages = new Set();
+
+/**
+ * @param {string}   path
+ * @param {Licenses} licenses
+ * @return {void}
+ */
+function checkDepLicense( path, licenses ) {
+	if ( ! path ) {
+		return;
+	}
+
+	const filename = path + '/package.json';
+	if ( ! existsSync( filename ) ) {
+		process.stdout.write( `Unable to locate package.json in ${ path }.` );
+		process.exit( 1 );
+	}
+
+	/*
+	 * The package.json format can be kind of weird. We allow for the following formats:
+	 * - { license: 'MIT' }
+	 * - { license: { type: 'MIT' } }
+	 * - { licenses: [ 'MIT', 'Zlib' ] }
+	 * - { licenses: [ { type: 'MIT' }, { type: 'Zlib' } ] }
+	 */
+	const packageInfo = require( filename );
+	const license =
+		packageInfo.license ||
+		( packageInfo.licenses &&
+			packageInfo.licenses.map( ( l ) => l.type || l ).join( ' OR ' ) );
+	let licenseType = typeof license === 'object' ? license.type : license;
+
+	// Check if the license we've detected is telling us to look in the license file, instead.
+	if (
+		licenseType &&
+		licenseFiles.find( ( licenseFile ) =>
+			licenseType.includes( licenseFile )
+		)
+	) {
+		licenseType = undefined;
+	}
+
+	if ( licenseType !== undefined ) {
+		let licenseTypes = [ licenseType ];
+		if ( licenseType.includes( ' AND ' ) ) {
+			licenseTypes = licenseType
+				.replace( /^\(*/g, '' )
+				.replace( /\)*$/, '' )
+				.split( ' AND ' )
+				.map( ( e ) => e.trim() );
+		}
+
+		if ( checkAllCompatible( licenseTypes, licenses ) ) {
+			return;
+		}
+	}
+
+	/*
+	 * If we haven't been able to detect a license in the package.json file,
+	 * or the type was invalid, try reading it from the files defined in
+	 * license files, instead.
+	 */
+	const detectedLicenseType = detectTypeFromLicenseFiles( path );
+	if ( ! licenseType && ! detectedLicenseType ) {
+		return;
+	}
+
+	let detectedLicenseTypes = [ detectedLicenseType ];
+	if ( detectedLicenseType && detectedLicenseType.includes( ' AND ' ) ) {
+		detectedLicenseTypes = detectedLicenseType
+			.replace( /^\(*/g, '' )
+			.replace( /\)*$/, '' )
+			.split( ' AND ' )
+			.map( ( e ) => e.trim() );
+	}
+
+	if ( checkAllCompatible( detectedLicenseTypes, licenses ) ) {
+		return;
+	}
+
+	// Do not report same package twice.
+	if ( reportedPackages.has( packageInfo.name ) ) {
+		return;
+	}
+
+	reportedPackages.add( packageInfo.name );
+
+	process.exitCode = 1;
+	process.stdout.write(
+		`${ ERROR_TEXT } Module ${ packageInfo.name } has an incompatible license '${ licenseType }'.\n`
+	);
+}
+
+/**
+ *
+ * @typedef Options
+ * @property {boolean}       gpl2      Only allow GPL2 compatible licenses.
+ * @property {Array<string>} [ignored] The list of ignored packages.
+ */
+
+/**
+ * @param {Object}  deps    The dependencies tree.
+ * @param {Options} options
+ */
+function checkDepsInTree( deps, options ) {
+	const licenses = getLicenses( options.gpl2 );
+
+	for ( const key in deps ) {
+		const dep = deps[ key ];
+
+		if ( options.ignored?.includes( dep.name ) ) {
+			continue;
+		}
+
+		if ( Object.keys( dep ).length === 0 ) {
+			continue;
+		}
+
+		if ( ! dep.hasOwnProperty( 'path' ) && ! dep.missing ) {
+			if ( dep.hasOwnProperty( 'peerMissing' ) ) {
+				process.stdout.write(
+					`${ WARNING_TEXT } Unable to locate path for missing peer dep ${ dep.name }@${ dep.version }. `
+				);
+			} else {
+				process.exitCode = 1;
+				process.stdout.write(
+					`${ ERROR_TEXT } Unable to locate path for ${ dep.name }@${ dep.version }. `
+				);
+			}
+		} else if ( dep.missing ) {
+			for ( const problem of dep.problems ) {
+				process.stdout.write( `${ WARNING_TEXT } ${ problem }.\n` );
+			}
+		} else {
+			checkDepLicense( dep.path, licenses );
+		}
+
+		if ( dep.hasOwnProperty( 'dependencies' ) ) {
+			checkDepsInTree( dep.dependencies, options );
+		}
+	}
+}
+
+/**
+ * @param {string} path The path to the package.
+ * @return {boolean} true if the package has a license, false if it
+ */
+function detectTypeFromLicenseFiles( path ) {
+	return licenseFiles.reduce( ( detectedType, licenseFile ) => {
+		// If another LICENSE file already had licenses in it, use those.
+		if ( detectedType ) {
+			return detectedType;
+		}
+
+		const licensePath = path + '/' + licenseFile;
+
+		if ( existsSync( licensePath ) ) {
+			const licenseText = readFileSync( licensePath ).toString();
+			return detectTypeFromLicenseText( licenseText );
+		}
+
+		return detectedType;
+	}, false );
+}
+
+module.exports = {
+	detectTypeFromLicenseText,
+	checkAllCompatible,
+	checkDepsInTree,
+};
diff --git a/packages/scripts/utils/php-file-paths-plugin.js b/packages/scripts/utils/php-file-paths-plugin.js
new file mode 100644
index 00000000000000..6f95dae6505a80
--- /dev/null
+++ b/packages/scripts/utils/php-file-paths-plugin.js
@@ -0,0 +1,60 @@
+/**
+ * External dependencies
+ */
+const { validate } = require( 'schema-utils' );
+
+/**
+ * Internal dependencies
+ */
+const { getPhpFilePaths } = require( './config' );
+
+const phpFilePathsPluginSchema = {
+	type: 'object',
+	properties: {
+		context: {
+			type: 'string',
+		},
+		props: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
+		},
+	},
+};
+
+/**
+ * The plugin recomputes PHP file paths once on each compilation. It is necessary to avoid repeating processing
+ * when filtering every discovered PHP file in the source folder. This is the most performant way to ensure that
+ * changes in `block.json` files are picked up in watch mode.
+ */
+class PhpFilePathsPlugin {
+	/**
+	 * PHP file paths from `render` and `variations` props found in `block.json` files.
+	 *
+	 * @type {string[]}
+	 */
+	static paths;
+
+	constructor( options = {} ) {
+		validate( phpFilePathsPluginSchema, options, {
+			name: 'PHP File Paths Plugin',
+			baseDataPath: 'options',
+		} );
+
+		this.options = options;
+	}
+
+	apply( compiler ) {
+		const pluginName = this.constructor.name;
+
+		compiler.hooks.thisCompilation.tap( pluginName, () => {
+			this.constructor.paths = getPhpFilePaths(
+				this.options.context,
+				this.options.props
+			);
+		} );
+	}
+}
+
+module.exports = { PhpFilePathsPlugin };
diff --git a/packages/scripts/utils/test/license.js b/packages/scripts/utils/test/license.js
new file mode 100644
index 00000000000000..2c188ba9a347da
--- /dev/null
+++ b/packages/scripts/utils/test/license.js
@@ -0,0 +1,86 @@
+/**
+ * External dependencies
+ */
+const fs = require( 'fs' );
+const path = require( 'path' );
+
+/**
+ * Internal dependencies
+ */
+import { detectTypeFromLicenseText, checkAllCompatible } from '../license';
+
+describe( 'detectTypeFromLicenseText', () => {
+	let licenseText;
+
+	it( "should return 'Apache 2.0' when the license text is the Apache 2.0 license", () => {
+		licenseText = fs
+			.readFileSync( path.resolve( __dirname, 'licenses/apache2.txt' ) )
+			.toString();
+
+		expect( detectTypeFromLicenseText( licenseText ) ).toBe( 'Apache-2.0' );
+	} );
+
+	it( "should return 'BSD' when the license text is the BSD 3-clause license", () => {
+		licenseText = fs
+			.readFileSync(
+				path.resolve( __dirname, 'licenses/bsd3clause.txt' )
+			)
+			.toString();
+
+		expect( detectTypeFromLicenseText( licenseText ) ).toBe( 'BSD' );
+	} );
+
+	it( "should return 'BSD-3-Clause-W3C' when the license text is the W3C variation of the BSD 3-clause license", () => {
+		licenseText = fs
+			.readFileSync( path.resolve( __dirname, 'licenses/w3cbsd.txt' ) )
+			.toString();
+
+		expect( detectTypeFromLicenseText( licenseText ) ).toBe(
+			'BSD-3-Clause-W3C'
+		);
+	} );
+
+	it( "should return 'MIT' when the license text is the MIT license", () => {
+		licenseText = fs
+			.readFileSync( path.resolve( __dirname, 'licenses/mit.txt' ) )
+			.toString();
+
+		expect( detectTypeFromLicenseText( licenseText ) ).toBe( 'MIT' );
+	} );
+
+	it( "should return 'Apache2 AND MIT' when the license text is Apache2 followed by MIT license", () => {
+		licenseText = fs
+			.readFileSync(
+				path.resolve( __dirname, 'licenses/apache2-mit.txt' )
+			)
+			.toString();
+
+		expect( detectTypeFromLicenseText( licenseText ) ).toBe(
+			'Apache-2.0 AND MIT'
+		);
+	} );
+} );
+
+describe( 'checkAllCompatible', () => {
+	it( "should return 'true' when single license is in the allowed list", () => {
+		expect( checkAllCompatible( [ 'B' ], [ 'A', 'B', 'C' ] ) ).toBe( true );
+	} );
+
+	it( "should return 'false' when single license is not in the allowed list", () => {
+		expect( checkAllCompatible( [ 'D' ], [ 'A', 'B', 'C' ] ) ).toBe(
+			false
+		);
+	} );
+
+	it( "should return 'true' when all licenses are in the allowed list", () => {
+		expect( checkAllCompatible( [ 'A', 'C' ], [ 'A', 'B', 'C' ] ) ).toBe(
+			true
+		);
+	} );
+
+	it( "should return 'false' when any license is not in the allowed list", () => {
+		expect( checkAllCompatible( [ 'A', 'D' ], [ 'A', 'B', 'C' ] ) ).toBe(
+			false
+		);
+	} );
+} );
diff --git a/packages/scripts/scripts/test/licenses/apache2-mit.txt b/packages/scripts/utils/test/licenses/apache2-mit.txt
similarity index 100%
rename from packages/scripts/scripts/test/licenses/apache2-mit.txt
rename to packages/scripts/utils/test/licenses/apache2-mit.txt
diff --git a/packages/scripts/scripts/test/licenses/apache2.txt b/packages/scripts/utils/test/licenses/apache2.txt
similarity index 100%
rename from packages/scripts/scripts/test/licenses/apache2.txt
rename to packages/scripts/utils/test/licenses/apache2.txt
diff --git a/packages/scripts/scripts/test/licenses/bsd3clause.txt b/packages/scripts/utils/test/licenses/bsd3clause.txt
similarity index 100%
rename from packages/scripts/scripts/test/licenses/bsd3clause.txt
rename to packages/scripts/utils/test/licenses/bsd3clause.txt
diff --git a/packages/scripts/scripts/test/licenses/mit.txt b/packages/scripts/utils/test/licenses/mit.txt
similarity index 100%
rename from packages/scripts/scripts/test/licenses/mit.txt
rename to packages/scripts/utils/test/licenses/mit.txt
diff --git a/packages/scripts/scripts/test/licenses/w3cbsd.txt b/packages/scripts/utils/test/licenses/w3cbsd.txt
similarity index 100%
rename from packages/scripts/scripts/test/licenses/w3cbsd.txt
rename to packages/scripts/utils/test/licenses/w3cbsd.txt
diff --git a/packages/server-side-render/.npmrc b/packages/server-side-render/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/server-side-render/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/server-side-render/CHANGELOG.md b/packages/server-side-render/CHANGELOG.md
index 6f036a521989fc..3e7fefedfe287b 100644
--- a/packages/server-side-render/CHANGELOG.md
+++ b/packages/server-side-render/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 5.10.0 (2024-10-16)
+
+## 5.9.0 (2024-10-03)
+
+## 5.8.0 (2024-09-19)
+
+## 5.7.0 (2024-09-05)
+
+## 5.6.0 (2024-08-21)
+
+## 5.5.0 (2024-08-07)
+
+## 5.4.0 (2024-07-24)
+
+## 5.3.0 (2024-07-10)
+
+## 5.2.0 (2024-06-26)
+
+## 5.1.0 (2024-06-15)
+
+## 5.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 4.35.0 (2024-05-16)
+
+## 4.34.0 (2024-05-02)
+
+## 4.33.0 (2024-04-19)
+
+## 4.32.0 (2024-04-03)
+
+## 4.31.0 (2024-03-21)
+
+## 4.30.0 (2024-03-06)
+
+## 4.29.0 (2024-02-21)
+
+## 4.28.0 (2024-02-09)
+
+## 4.27.0 (2024-01-24)
+
+## 4.26.0 (2024-01-10)
+
+## 4.25.0 (2023-12-13)
+
 ## 4.24.0 (2023-11-29)
 
 ## 4.23.0 (2023-11-16)
@@ -62,7 +110,7 @@
 
 ## 3.18.0 (2022-10-19)
 
-### Feature
+### New Features
 
 -   Add `skipBlockSupportAttributes` props to prevent duplication of styles in the block wrapper and the `ServerSideRender` components. [#44491](https://github.com/WordPress/gutenberg/pull/44491)
 
@@ -102,7 +150,7 @@
 
 ## 3.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -121,19 +169,19 @@
 
 ## 1.17.0 (2020-09-03)
 
-### Feature
+### New Features
 
 -   Add an optional prop `httpMethod`, which can be 'POST' or the default 'GET'. Requires WP 5.5 or later. When 'POST', this sends the attributes in the request body, not in the URL. This can allow a bigger attributes object. [#21068](https://github.com/WordPress/gutenberg/pull/21068)
 
 ## 1.7.0 (2020-02-04)
 
-### Bug
+### Bug Fixes
 
 -   Fix errant `className` being output on default empty placeholder. [#19555](https://github.com/WordPress/gutenberg/pull/19555)
 
 ## 1.2.0 (2019-08-29)
 
-### Feature
+### New Features
 
 -   Add `EmptyResponsePlaceholder`, `ErrorResponsePlaceholder` and `LoadingResponsePlaceholder` render props for parent components to swap out alternate placeholders for the various states (see https://github.com/WordPress/gutenberg/pull/16512).
 
diff --git a/packages/server-side-render/package.json b/packages/server-side-render/package.json
index 26d999e4a10e4b..a40d4358c35308 100644
--- a/packages/server-side-render/package.json
+++ b/packages/server-side-render/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/server-side-render",
-	"version": "4.24.0",
+	"version": "5.10.0",
 	"description": "The component used with WordPress to server-side render a preview of dynamic blocks to display in the editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,22 +20,23 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/data": "file:../data",
-		"@wordpress/deprecated": "file:../deprecated",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/url": "file:../url",
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/deprecated": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/url": "*",
 		"fast-deep-equal": "^3.1.3"
 	},
 	"peerDependencies": {
@@ -44,5 +45,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/server-side-render/src/server-side-render.js b/packages/server-side-render/src/server-side-render.js
index 69a2183036dd14..45a651e8cced6c 100644
--- a/packages/server-side-render/src/server-side-render.js
+++ b/packages/server-side-render/src/server-side-render.js
@@ -98,7 +98,7 @@ export default function ServerSideRender( props ) {
 		LoadingResponsePlaceholder = DefaultLoadingResponsePlaceholder,
 	} = props;
 
-	const isMountedRef = useRef( true );
+	const isMountedRef = useRef( false );
 	const [ showLoader, setShowLoader ] = useState( false );
 	const fetchRequestRef = useRef();
 	const [ response, setResponse ] = useState( null );
@@ -112,6 +112,11 @@ export default function ServerSideRender( props ) {
 
 		setIsLoading( true );
 
+		// Schedule showing the Spinner after 1 second.
+		const timeout = setTimeout( () => {
+			setShowLoader( true );
+		}, 1000 );
+
 		let sanitizedAttributes =
 			attributes &&
 			__experimentalSanitizeBlockAttributes( block, attributes );
@@ -165,6 +170,9 @@ export default function ServerSideRender( props ) {
 					fetchRequest === fetchRequestRef.current
 				) {
 					setIsLoading( false );
+					// Cancel the timeout to show the Spinner.
+					setShowLoader( false );
+					clearTimeout( timeout );
 				}
 			} ) );
 
@@ -175,12 +183,12 @@ export default function ServerSideRender( props ) {
 
 	// When the component unmounts, set isMountedRef to false. This will
 	// let the async fetch callbacks know when to stop.
-	useEffect(
-		() => () => {
+	useEffect( () => {
+		isMountedRef.current = true;
+		return () => {
 			isMountedRef.current = false;
-		},
-		[]
-	);
+		};
+	}, [] );
 
 	useEffect( () => {
 		// Don't debounce the first fetch. This ensures that the first render
@@ -192,21 +200,6 @@ export default function ServerSideRender( props ) {
 		}
 	} );
 
-	/**
-	 * Effect to handle showing the loading placeholder.
-	 * Show it only if there is no previous response or
-	 * the request takes more than one second.
-	 */
-	useEffect( () => {
-		if ( ! isLoading ) {
-			return;
-		}
-		const timeout = setTimeout( () => {
-			setShowLoader( true );
-		}, 1000 );
-		return () => clearTimeout( timeout );
-	}, [ isLoading ] );
-
 	const hasResponse = !! response;
 	const hasEmptyResponse = response === '';
 	const hasError = response?.error;
diff --git a/packages/shortcode/.npmrc b/packages/shortcode/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/shortcode/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/shortcode/CHANGELOG.md b/packages/shortcode/CHANGELOG.md
index cc4bd058236a62..ea651b6af87f0d 100644
--- a/packages/shortcode/CHANGELOG.md
+++ b/packages/shortcode/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -113,6 +161,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/shortcode/package.json b/packages/shortcode/package.json
index fe383905127534..c10007806383d9 100644
--- a/packages/shortcode/package.json
+++ b/packages/shortcode/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/shortcode",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "Shortcode module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,16 +19,18 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"memize": "^2.0.1"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/style-engine/.npmrc b/packages/style-engine/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/style-engine/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/style-engine/CHANGELOG.md b/packages/style-engine/CHANGELOG.md
index 9f22a226e6037f..5ad39afec7952c 100644
--- a/packages/style-engine/CHANGELOG.md
+++ b/packages/style-engine/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 2.10.0 (2024-10-16)
+
+## 2.9.0 (2024-10-03)
+
+## 2.8.0 (2024-09-19)
+
+## 2.7.0 (2024-09-05)
+
+## 2.6.0 (2024-08-21)
+
+### New Features
+
+-   Style engine: export util to compile CSS custom var from preset string. ([#64490](https://github.com/WordPress/gutenberg/pull/64490))
+
+## 2.5.0 (2024-08-07)
+
+## 2.4.0 (2024-07-24)
+
+## 2.3.0 (2024-07-10)
+
+## 2.2.0 (2024-06-26)
+
+## 2.1.0 (2024-06-15)
+
+## 2.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 1.41.0 (2024-05-16)
+
+## 1.40.0 (2024-05-02)
+
+## 1.39.0 (2024-04-19)
+
+## 1.38.0 (2024-04-03)
+
+## 1.37.0 (2024-03-21)
+
+## 1.36.0 (2024-03-06)
+
+## 1.35.0 (2024-02-21)
+
+## 1.34.0 (2024-02-09)
+
+## 1.33.0 (2024-01-24)
+
+## 1.32.0 (2024-01-10)
+
+## 1.31.0 (2023-12-13)
+
 ## 1.30.0 (2023-11-29)
 
 ## 1.29.0 (2023-11-16)
@@ -21,6 +73,7 @@
 ## 1.22.0 (2023-08-10)
 
 ### Bug Fixes
+
 -   Style engine: switch off optimize by default [#53085](https://github.com/WordPress/gutenberg/pull/53085).
 
 ## 1.21.0 (2023-07-20)
@@ -62,24 +115,29 @@
 ## 1.3.0 (2022-10-19)
 
 ### Internal
+
 -   Style Engine: move PHP unit tests to Gutenberg [#44722](https://github.com/WordPress/gutenberg/pull/44722)
 
 ## 1.2.0 (2022-10-05)
 
 ### Internal
+
 -   Script loader: remove 6.1 wp actions ([#44519](https://github.com/WordPress/gutenberg/pull/44519))
 
 ## 1.1.0 (2022-09-21)
 
-### Enhancement
+### Enhancements
+
 -   Allow for prettified output ([#42909](https://github.com/WordPress/gutenberg/pull/42909)).
 -   Enqueue block supports styles in Gutenberg ([#42880](https://github.com/WordPress/gutenberg/pull/42880)).
 
 ### Internal
+
 -   Move backend scripts to package ([#39736](https://github.com/WordPress/gutenberg/pull/39736)).
 -   Updating docs, formatting, and separating global functions from the main class file ([#43840](https://github.com/WordPress/gutenberg/pull/43840)).
 
 ### New Features
+
 -   Add a WP_Style_Engine_Processor object ([#42463](https://github.com/WordPress/gutenberg/pull/42463)).
 -   Add a WP_Style_Engine_CSS_Declarations object ([#42043](https://github.com/WordPress/gutenberg/pull/42043)).
 -   Add Rules and Store objects ([#42222](https://github.com/WordPress/gutenberg/pull/42222)).
diff --git a/packages/style-engine/CONTRIBUTING.md b/packages/style-engine/CONTRIBUTING.md
index 70bfddb8eb5011..ab65920229b607 100644
--- a/packages/style-engine/CONTRIBUTING.md
+++ b/packages/style-engine/CONTRIBUTING.md
@@ -4,7 +4,7 @@ This document contains information you might need to know when extending or debu
 
 ## Workflow and build tooling
 
-The Style Engine PHP and Javascript (JS) files exist inside the `style-engine` package. 
+The Style Engine PHP and JavaScript (JS) files exist inside the `style-engine` package.
 
 In order to use the Style Engine in the Block Editor, these files must be compiled (in the case of JS) and copied to the build folder.
 
@@ -29,9 +29,9 @@ To start the JS unit tests, run:
 
 `npm run test:unit packages/style-engine/src/test/`
 
-[PHP unit tests](https://github.com/WordPress/gutenberg/tree/HEAD/phpunit/style-engine) are located in the root `phpunit` directory. 
+[PHP unit tests](https://github.com/WordPress/gutenberg/tree/HEAD/phpunit/style-engine) are located in the root `phpunit` directory.
 
-In order to test the latest version of the Style Engine and avoid conflicts with existing Core equivalents, all PHP unit tests call the `gutenberg_` functions and `_Gutenberg` classes. 
+In order to test the latest version of the Style Engine and avoid conflicts with existing Core equivalents, all PHP unit tests call the `gutenberg_` functions and `_Gutenberg` classes.
 
 Therefore, Style Engine PHP source files should be parsed and copied to the build folder before running tests. During development, this will happen as part of the `npm run dev` script. You can also trigger a build by executing `npm run build`.
 
diff --git a/packages/style-engine/README.md b/packages/style-engine/README.md
index 290e04ee60ae83..a3e302fab4bb9a 100644
--- a/packages/style-engine/README.md
+++ b/packages/style-engine/README.md
@@ -17,7 +17,7 @@ Upcoming tasks on the roadmap include, but are not limited to, the following:
 -   Propose a way to control hierarchy and specificity, and make the style hierarchy cascade accessible and predictable. This might include preparing for CSS cascade layers until they become more widely supported, and allowing for opt-in support in Gutenberg via theme.json.
 -   Refactor all blocks to consistently use the "style" attribute for all customizations, that is, deprecate preset-specific attributes such as `attributes.fontSize`.
 
-For more information about the roadmap, please refer to [Block editor styles: initiatives and goals](https://make.wordpress.org/core/2022/06/24/block-editor-styles-initiatives-and-goals/) and the [Github project board](https://github.com/orgs/WordPress/projects/19).
+For more information about the roadmap, please refer to [Block editor styles: initiatives and goals](https://make.wordpress.org/core/2022/06/24/block-editor-styles-initiatives-and-goals/) and the [GitHub project board](https://github.com/orgs/WordPress/projects/19).
 
 If you're making changes or additions to the Style Engine, please take a moment to read the [notes on contributing](https://github.com/WordPress/gutenberg/tree/HEAD/packages/style-engine/CONTRIBUTING.md).
 
@@ -126,10 +126,31 @@ $styles = array(
         'selector'     => '.wp-tomato',
         'declarations' => array( 'padding' => '100px' )
     ),
+);
+
+$stylesheet = wp_style_engine_get_stylesheet_from_css_rules(
+    $styles,
+    array(
+        'context' => 'block-supports', // Indicates that these styles should be stored with block supports CSS.
+    )
+);
+print_r( $stylesheet ); // .wp-pumpkin{color:orange}.wp-tomato{color:red;padding:100px}
+```
+
+It's also possible to build simple, nested CSS rules using the `rules_group` key.
+
+```php
+$styles = array(
     array(
-        'selector'     => '.wp-kumquat',
+        'rules_group'  => '@media (min-width: 80rem)',
+        'selector'     => '.wp-carrot',
         'declarations' => array( 'color' => 'orange' )
     ),
+    array(
+        'rules_group'  => '@media (min-width: 80rem)',
+        'selector'     => '.wp-tomato',
+        'declarations' => array( 'color' => 'red' )
+    ),
 );
 
 $stylesheet = wp_style_engine_get_stylesheet_from_css_rules(
@@ -138,7 +159,7 @@ $stylesheet = wp_style_engine_get_stylesheet_from_css_rules(
         'context' => 'block-supports', // Indicates that these styles should be stored with block supports CSS.
     )
 );
-print_r( $stylesheet ); // .wp-pumpkin,.wp-kumquat{color:orange}.wp-tomato{color:red;padding:100px}
+print_r( $stylesheet ); // @media (min-width: 80rem){.wp-carrot{color:orange}}@media (min-width: 80rem){.wp-tomato{color:red;}}
 ```
 
 ### wp_style_engine_get_stylesheet_from_context()
@@ -237,6 +258,24 @@ _Changelog_
 
 `6.1.0` Introduced in WordPress core.
 
+### getCSSValueFromRawStyle
+
+Returns a WordPress CSS custom var value from incoming style preset value, if one is detected.
+
+The preset value is a string and follows the pattern `var:description|context|slug`.
+
+Example:
+
+`getCSSValueFromRawStyle( 'var:preset|color|heavenlyBlue' )` // returns 'var(--wp--preset--color--heavenly-blue)'
+
+_Parameters_
+
+-   _styleValue_ `StyleValue`: A string representing a raw CSS value. Non-strings won't be processed.
+
+_Returns_
+
+-   `StyleValue`: A CSS custom var value if the incoming style value is a preset value.
+
 <!-- END TOKEN(Autogenerated API docs) -->
 
 ## Glossary
diff --git a/packages/style-engine/class-wp-style-engine-css-declarations.php b/packages/style-engine/class-wp-style-engine-css-declarations.php
index 9ed7529052325f..79d0c8a4afcb74 100644
--- a/packages/style-engine/class-wp-style-engine-css-declarations.php
+++ b/packages/style-engine/class-wp-style-engine-css-declarations.php
@@ -7,163 +7,162 @@
  * @package Gutenberg
  */
 
-if ( class_exists( 'WP_Style_Engine_CSS_Declarations' ) ) {
-	return;
-}
+if ( ! class_exists( 'WP_Style_Engine_CSS_Declarations' ) ) {
 
-/**
- * Holds, sanitizes, processes and prints CSS declarations for the Style Engine.
- *
- * @access private
- */
-class WP_Style_Engine_CSS_Declarations {
 	/**
-	 * An array of CSS declarations (property => value pairs).
+	 * Holds, sanitizes, processes and prints CSS declarations for the Style Engine.
 	 *
-	 * @var array
+	 * @access private
 	 */
-	protected $declarations = array();
+	class WP_Style_Engine_CSS_Declarations {
+		/**
+		 * An array of CSS declarations (property => value pairs).
+		 *
+		 * @var array
+		 */
+		protected $declarations = array();
+
+		/**
+		 * Constructor for this object.
+		 *
+		 * If a `$declarations` array is passed, it will be used to populate
+		 * the initial $declarations prop of the object by calling add_declarations().
+		 *
+		 * @param string[] $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+		 */
+		public function __construct( $declarations = array() ) {
+			$this->add_declarations( $declarations );
+		}
 
-	/**
-	 * Constructor for this object.
-	 *
-	 * If a `$declarations` array is passed, it will be used to populate
-	 * the initial $declarations prop of the object by calling add_declarations().
-	 *
-	 * @param string[] $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
-	 */
-	public function __construct( $declarations = array() ) {
-		$this->add_declarations( $declarations );
-	}
+		/**
+		 * Adds a single declaration.
+		 *
+		 * @param string $property The CSS property.
+		 * @param string $value    The CSS value.
+		 *
+		 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
+		 */
+		public function add_declaration( $property, $value ) {
+			// Sanitizes the property.
+			$property = $this->sanitize_property( $property );
+			// Bails early if the property is empty.
+			if ( empty( $property ) ) {
+				return $this;
+			}
+
+			// Trims the value. If empty, bail early.
+			$value = trim( $value );
+			if ( '' === $value ) {
+				return $this;
+			}
+
+			// Adds the declaration property/value pair.
+			$this->declarations[ $property ] = $value;
 
-	/**
-	 * Adds a single declaration.
-	 *
-	 * @param string $property The CSS property.
-	 * @param string $value    The CSS value.
-	 *
-	 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
-	 */
-	public function add_declaration( $property, $value ) {
-		// Sanitizes the property.
-		$property = $this->sanitize_property( $property );
-		// Bails early if the property is empty.
-		if ( empty( $property ) ) {
 			return $this;
 		}
 
-		// Trims the value. If empty, bail early.
-		$value = trim( $value );
-		if ( '' === $value ) {
+		/**
+		 * Removes a single declaration.
+		 *
+		 * @param string $property The CSS property.
+		 *
+		 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
+		 */
+		public function remove_declaration( $property ) {
+			unset( $this->declarations[ $property ] );
 			return $this;
 		}
 
-		// Adds the declaration property/value pair.
-		$this->declarations[ $property ] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Removes a single declaration.
-	 *
-	 * @param string $property The CSS property.
-	 *
-	 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
-	 */
-	public function remove_declaration( $property ) {
-		unset( $this->declarations[ $property ] );
-		return $this;
-	}
-
-	/**
-	 * Adds multiple declarations.
-	 *
-	 * @param array $declarations An array of declarations.
-	 *
-	 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
-	 */
-	public function add_declarations( $declarations ) {
-		foreach ( $declarations as $property => $value ) {
-			$this->add_declaration( $property, $value );
+		/**
+		 * Adds multiple declarations.
+		 *
+		 * @param array $declarations An array of declarations.
+		 *
+		 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
+		 */
+		public function add_declarations( $declarations ) {
+			foreach ( $declarations as $property => $value ) {
+				$this->add_declaration( $property, $value );
+			}
+			return $this;
 		}
-		return $this;
-	}
 
-	/**
-	 * Removes multiple declarations.
-	 *
-	 * @param array $properties An array of properties.
-	 *
-	 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
-	 */
-	public function remove_declarations( $properties = array() ) {
-		foreach ( $properties as $property ) {
-			$this->remove_declaration( $property );
+		/**
+		 * Removes multiple declarations.
+		 *
+		 * @param array $properties An array of properties.
+		 *
+		 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
+		 */
+		public function remove_declarations( $properties = array() ) {
+			foreach ( $properties as $property ) {
+				$this->remove_declaration( $property );
+			}
+			return $this;
 		}
-		return $this;
-	}
-
-	/**
-	 * Gets the declarations array.
-	 *
-	 * @return array
-	 */
-	public function get_declarations() {
-		return $this->declarations;
-	}
 
-	/**
-	 * Filters a CSS property + value pair.
-	 *
-	 * @param string $property The CSS property.
-	 * @param string $value    The value to be filtered.
-	 * @param string $spacer   The spacer between the colon and the value. Defaults to an empty string.
-	 *
-	 * @return string The filtered declaration or an empty string.
-	 */
-	protected static function filter_declaration( $property, $value, $spacer = '' ) {
-		$filtered_value = wp_strip_all_tags( $value, true );
+		/**
+		 * Gets the declarations array.
+		 *
+		 * @return array
+		 */
+		public function get_declarations() {
+			return $this->declarations;
+		}
 
-		if ( '' !== $filtered_value ) {
-			return safecss_filter_attr( "{$property}:{$spacer}{$filtered_value}" );
+		/**
+		 * Filters a CSS property + value pair.
+		 *
+		 * @param string $property The CSS property.
+		 * @param string $value    The value to be filtered.
+		 * @param string $spacer   The spacer between the colon and the value. Defaults to an empty string.
+		 *
+		 * @return string The filtered declaration or an empty string.
+		 */
+		protected static function filter_declaration( $property, $value, $spacer = '' ) {
+			$filtered_value = wp_strip_all_tags( $value, true );
+
+			if ( '' !== $filtered_value ) {
+				return safecss_filter_attr( "{$property}:{$spacer}{$filtered_value}" );
+			}
+			return '';
 		}
-		return '';
-	}
 
-	/**
-	 * Filters and compiles the CSS declarations.
-	 *
-	 * @param bool   $should_prettify Whether to add spacing, new lines and indents.
-	 * @param number $indent_count    The number of tab indents to apply to the rule. Applies if `prettify` is `true`.
-	 *
-	 * @return string The CSS declarations.
-	 */
-	public function get_declarations_string( $should_prettify = false, $indent_count = 0 ) {
-		$declarations_array  = $this->get_declarations();
-		$declarations_output = '';
-		$indent              = $should_prettify ? str_repeat( "\t", $indent_count ) : '';
-		$suffix              = $should_prettify ? ' ' : '';
-		$suffix              = $should_prettify && $indent_count > 0 ? "\n" : $suffix;
-		$spacer              = $should_prettify ? ' ' : '';
-
-		foreach ( $declarations_array as $property => $value ) {
-			$filtered_declaration = static::filter_declaration( $property, $value, $spacer );
-			if ( $filtered_declaration ) {
-				$declarations_output .= "{$indent}{$filtered_declaration};$suffix";
+		/**
+		 * Filters and compiles the CSS declarations.
+		 *
+		 * @param bool   $should_prettify Whether to add spacing, new lines and indents.
+		 * @param number $indent_count    The number of tab indents to apply to the rule. Applies if `prettify` is `true`.
+		 *
+		 * @return string The CSS declarations.
+		 */
+		public function get_declarations_string( $should_prettify = false, $indent_count = 0 ) {
+			$declarations_array  = $this->get_declarations();
+			$declarations_output = '';
+			$indent              = $should_prettify ? str_repeat( "\t", $indent_count ) : '';
+			$suffix              = $should_prettify ? ' ' : '';
+			$suffix              = $should_prettify && $indent_count > 0 ? "\n" : $suffix;
+			$spacer              = $should_prettify ? ' ' : '';
+
+			foreach ( $declarations_array as $property => $value ) {
+				$filtered_declaration = static::filter_declaration( $property, $value, $spacer );
+				if ( $filtered_declaration ) {
+					$declarations_output .= "{$indent}{$filtered_declaration};$suffix";
+				}
 			}
+			return rtrim( $declarations_output );
 		}
-		return rtrim( $declarations_output );
-	}
 
-	/**
-	 * Sanitizes property names.
-	 *
-	 * @param string $property The CSS property.
-	 *
-	 * @return string The sanitized property name.
-	 */
-	protected function sanitize_property( $property ) {
-		return sanitize_key( $property );
+		/**
+		 * Sanitizes property names.
+		 *
+		 * @param string $property The CSS property.
+		 *
+		 * @return string The sanitized property name.
+		 */
+		protected function sanitize_property( $property ) {
+			return sanitize_key( $property );
+		}
 	}
 }
diff --git a/packages/style-engine/class-wp-style-engine-css-rule.php b/packages/style-engine/class-wp-style-engine-css-rule.php
index 76ba12673aeda5..12fe5fab23f723 100644
--- a/packages/style-engine/class-wp-style-engine-css-rule.php
+++ b/packages/style-engine/class-wp-style-engine-css-rule.php
@@ -7,121 +7,160 @@
  * @package Gutenberg
  */
 
-if ( class_exists( 'WP_Style_Engine_CSS_Rule' ) ) {
-	return;
-}
-
-/**
- * Holds, sanitizes, processes and prints CSS declarations for the Style Engine.
- *
- * @access private
- */
-class WP_Style_Engine_CSS_Rule {
+if ( ! class_exists( 'WP_Style_Engine_CSS_Rule' ) ) {
 
 	/**
-	 * The selector.
+	 * Holds, sanitizes, processes and prints CSS declarations for the Style Engine.
 	 *
-	 * @var string
+	 * @access private
 	 */
-	protected $selector;
+	class WP_Style_Engine_CSS_Rule {
 
-	/**
-	 * The selector declarations.
-	 *
-	 * Contains a WP_Style_Engine_CSS_Declarations object.
-	 *
-	 * @var WP_Style_Engine_CSS_Declarations
-	 */
-	protected $declarations;
+		/**
+		 * The selector.
+		 *
+		 * @var string
+		 */
+		protected $selector;
 
-	/**
-	 * Constructor
-	 *
-	 * @param string                                    $selector     The CSS selector.
-	 * @param string[]|WP_Style_Engine_CSS_Declarations $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ),
-	 *                                                                or a WP_Style_Engine_CSS_Declarations object.
-	 */
-	public function __construct( $selector = '', $declarations = array() ) {
-		$this->set_selector( $selector );
-		$this->add_declarations( $declarations );
-	}
+		/**
+		 * The selector declarations.
+		 *
+		 * Contains a WP_Style_Engine_CSS_Declarations object.
+		 *
+		 * @var WP_Style_Engine_CSS_Declarations
+		 */
+		protected $declarations;
 
-	/**
-	 * Sets the selector.
-	 *
-	 * @param string $selector The CSS selector.
-	 *
-	 * @return WP_Style_Engine_CSS_Rule Returns the object to allow chaining of methods.
-	 */
-	public function set_selector( $selector ) {
-		$this->selector = $selector;
-		return $this;
-	}
+		/**
+		 * A parent CSS selector in the case of nested CSS, or a CSS nested @rule, such as `@media (min-width: 80rem)` or `@layer module`..
+		 *
+		 * @var string
+		 */
+		protected $rules_group;
 
-	/**
-	 * Sets the declarations.
-	 *
-	 * @param array|WP_Style_Engine_CSS_Declarations $declarations An array of declarations (property => value pairs),
-	 *                                                             or a WP_Style_Engine_CSS_Declarations object.
-	 *
-	 * @return WP_Style_Engine_CSS_Rule Returns the object to allow chaining of methods.
-	 */
-	public function add_declarations( $declarations ) {
-		$is_declarations_object = ! is_array( $declarations );
-		$declarations_array     = $is_declarations_object ? $declarations->get_declarations() : $declarations;
-
-		if ( null === $this->declarations ) {
-			if ( $is_declarations_object ) {
-				$this->declarations = $declarations;
-				return $this;
+		/**
+		 * Constructor
+		 *
+		 * @param string                                    $selector     The CSS selector.
+		 * @param string[]|WP_Style_Engine_CSS_Declarations $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ),
+		 *                                                                or a WP_Style_Engine_CSS_Declarations object.
+		 * @param string                                    $rules_group  A parent CSS selector in the case of nested CSS, or a CSS nested @rule, such as `@media (min-width: 80rem)` or `@layer module`.
+		 *
+		 */
+		public function __construct( $selector = '', $declarations = array(), $rules_group = '' ) {
+			$this->set_selector( $selector );
+			$this->add_declarations( $declarations );
+			$this->set_rules_group( $rules_group );
+		}
+
+		/**
+		 * Sets the selector.
+		 *
+		 * @param string $selector The CSS selector.
+		 *
+		 * @return WP_Style_Engine_CSS_Rule Returns the object to allow chaining of methods.
+		 */
+		public function set_selector( $selector ) {
+			$this->selector = $selector;
+			return $this;
+		}
+
+		/**
+		 * Sets the declarations.
+		 *
+		 * @param array|WP_Style_Engine_CSS_Declarations $declarations An array of declarations (property => value pairs),
+		 *                                                             or a WP_Style_Engine_CSS_Declarations object.
+		 *
+		 * @return WP_Style_Engine_CSS_Rule Returns the object to allow chaining of methods.
+		 */
+		public function add_declarations( $declarations ) {
+			$is_declarations_object = ! is_array( $declarations );
+			$declarations_array     = $is_declarations_object ? $declarations->get_declarations() : $declarations;
+
+			if ( null === $this->declarations ) {
+				if ( $is_declarations_object ) {
+					$this->declarations = $declarations;
+					return $this;
+				}
+				$this->declarations = new WP_Style_Engine_CSS_Declarations( $declarations_array );
 			}
-			$this->declarations = new WP_Style_Engine_CSS_Declarations( $declarations_array );
+			$this->declarations->add_declarations( $declarations_array );
+
+			return $this;
 		}
-		$this->declarations->add_declarations( $declarations_array );
 
-		return $this;
-	}
+		/**
+		 * Sets the rules group.
+		 *
+		 * @param string $rules_group A parent CSS selector in the case of nested CSS, or a CSS nested @rule, such as `@media (min-width: 80rem)` or `@layer module`.
+		 *
+		 * @return WP_Style_Engine_CSS_Rule Returns the object to allow chaining of methods.
+		 */
+		public function set_rules_group( $rules_group ) {
+			$this->rules_group = $rules_group;
+			return $this;
+		}
 
-	/**
-	 * Gets the declarations object.
-	 *
-	 * @return WP_Style_Engine_CSS_Declarations The declarations object.
-	 */
-	public function get_declarations() {
-		return $this->declarations;
-	}
+		/**
+		 * Gets the rules group.
+		 *
+		 * @return string
+		 */
+		public function get_rules_group() {
+			return $this->rules_group;
+		}
 
-	/**
-	 * Gets the full selector.
-	 *
-	 * @return string
-	 */
-	public function get_selector() {
-		return $this->selector;
-	}
+		/**
+		 * Gets the declarations object.
+		 *
+		 * @return WP_Style_Engine_CSS_Declarations The declarations object.
+		 */
+		public function get_declarations() {
+			return $this->declarations;
+		}
 
-	/**
-	 * Gets the CSS.
-	 *
-	 * @param bool   $should_prettify Whether to add spacing, new lines and indents.
-	 * @param number $indent_count    The number of tab indents to apply to the rule. Applies if `prettify` is `true`.
-	 *
-	 * @return string
-	 */
-	public function get_css( $should_prettify = false, $indent_count = 0 ) {
-		$rule_indent         = $should_prettify ? str_repeat( "\t", $indent_count ) : '';
-		$declarations_indent = $should_prettify ? $indent_count + 1 : 0;
-		$suffix              = $should_prettify ? "\n" : '';
-		$spacer              = $should_prettify ? ' ' : '';
-		// Trims any multiple selectors strings.
-		$selector         = $should_prettify ? implode( ',', array_map( 'trim', explode( ',', $this->get_selector() ) ) ) : $this->get_selector();
-		$selector         = $should_prettify ? str_replace( array( ',' ), ",\n", $selector ) : $selector;
-		$css_declarations = $this->declarations->get_declarations_string( $should_prettify, $declarations_indent );
-
-		if ( empty( $css_declarations ) ) {
-			return '';
+		/**
+		 * Gets the full selector.
+		 *
+		 * @return string
+		 */
+		public function get_selector() {
+			return $this->selector;
 		}
 
-		return "{$rule_indent}{$selector}{$spacer}{{$suffix}{$css_declarations}{$suffix}{$rule_indent}}";
+		/**
+		 * Gets the CSS.
+		 *
+		 * @param bool   $should_prettify Whether to add spacing, new lines and indents.
+		 * @param number $indent_count    The number of tab indents to apply to the rule. Applies if `prettify` is `true`.
+		 *
+		 * @return string
+		 */
+		public function get_css( $should_prettify = false, $indent_count = 0 ) {
+			$rule_indent                = $should_prettify ? str_repeat( "\t", $indent_count ) : '';
+			$nested_rule_indent         = $should_prettify ? str_repeat( "\t", $indent_count + 1 ) : '';
+			$declarations_indent        = $should_prettify ? $indent_count + 1 : 0;
+			$nested_declarations_indent = $should_prettify ? $indent_count + 2 : 0;
+			$suffix                     = $should_prettify ? "\n" : '';
+			$spacer                     = $should_prettify ? ' ' : '';
+			// Trims any multiple selectors strings.
+			$selector         = $should_prettify ? implode( ',', array_map( 'trim', explode( ',', $this->get_selector() ) ) ) : $this->get_selector();
+			$selector         = $should_prettify ? str_replace( array( ',' ), ",\n", $selector ) : $selector;
+			$rules_group      = $this->get_rules_group();
+			$has_rules_group  = ! empty( $rules_group );
+			$css_declarations = $this->declarations->get_declarations_string( $should_prettify, $has_rules_group ? $nested_declarations_indent : $declarations_indent );
+
+			if ( empty( $css_declarations ) ) {
+				return '';
+			}
+
+			if ( $has_rules_group ) {
+				$selector = "{$rule_indent}{$rules_group}{$spacer}{{$suffix}{$nested_rule_indent}{$selector}{$spacer}{{$suffix}{$css_declarations}{$suffix}{$nested_rule_indent}}{$suffix}{$rule_indent}}";
+				return $selector;
+			}
+
+			return "{$rule_indent}{$selector}{$spacer}{{$suffix}{$css_declarations}{$suffix}{$rule_indent}}";
+		}
 	}
 }
diff --git a/packages/style-engine/class-wp-style-engine-css-rules-store.php b/packages/style-engine/class-wp-style-engine-css-rules-store.php
index 5d083efbd1527a..50d1cff4142523 100644
--- a/packages/style-engine/class-wp-style-engine-css-rules-store.php
+++ b/packages/style-engine/class-wp-style-engine-css-rules-store.php
@@ -7,138 +7,146 @@
  * @package Gutenberg
  */
 
-if ( class_exists( 'WP_Style_Engine_CSS_Rules_Store' ) ) {
-	return;
-}
-
-/**
- * Holds, sanitizes, processes and prints CSS declarations for the Style Engine.
- *
- * @access private
- */
-class WP_Style_Engine_CSS_Rules_Store {
-
-	/**
-	 * An array of named WP_Style_Engine_CSS_Rules_Store objects.
-	 *
-	 * @static
-	 *
-	 * @var WP_Style_Engine_CSS_Rules_Store[]
-	 */
-	protected static $stores = array();
-
-	/**
-	 * The store name.
-	 *
-	 * @var string
-	 */
-	protected $name = '';
-
-	/**
-	 * An array of CSS Rules objects assigned to the store.
-	 *
-	 * @var WP_Style_Engine_CSS_Rule[]
-	 */
-	protected $rules = array();
+if ( ! class_exists( 'WP_Style_Engine_CSS_Rules_Store' ) ) {
 
 	/**
-	 * Gets an instance of the store.
-	 *
-	 * @param string $store_name The name of the store.
+	 * Holds, sanitizes, processes and prints CSS declarations for the Style Engine.
 	 *
-	 * @return WP_Style_Engine_CSS_Rules_Store|void
+	 * @access private
 	 */
-	public static function get_store( $store_name = 'default' ) {
-		if ( ! is_string( $store_name ) || empty( $store_name ) ) {
-			return;
+	class WP_Style_Engine_CSS_Rules_Store {
+
+		/**
+		 * An array of named WP_Style_Engine_CSS_Rules_Store objects.
+		 *
+		 * @static
+		 *
+		 * @var WP_Style_Engine_CSS_Rules_Store[]
+		 */
+		protected static $stores = array();
+
+		/**
+		 * The store name.
+		 *
+		 * @var string
+		 */
+		protected $name = '';
+
+		/**
+		 * An array of CSS Rules objects assigned to the store.
+		 *
+		 * @var WP_Style_Engine_CSS_Rule[]
+		 */
+		protected $rules = array();
+
+		/**
+		 * Gets an instance of the store.
+		 *
+		 * @param string $store_name The name of the store.
+		 *
+		 * @return WP_Style_Engine_CSS_Rules_Store|void
+		 */
+		public static function get_store( $store_name = 'default' ) {
+			if ( ! is_string( $store_name ) || empty( $store_name ) ) {
+				return;
+			}
+			if ( ! isset( static::$stores[ $store_name ] ) ) {
+				static::$stores[ $store_name ] = new static();
+				// Set the store name.
+				static::$stores[ $store_name ]->set_name( $store_name );
+			}
+			return static::$stores[ $store_name ];
 		}
-		if ( ! isset( static::$stores[ $store_name ] ) ) {
-			static::$stores[ $store_name ] = new static();
-			// Set the store name.
-			static::$stores[ $store_name ]->set_name( $store_name );
-		}
-		return static::$stores[ $store_name ];
-	}
 
-	/**
-	 * Gets an array of all available stores.
-	 *
-	 * @return WP_Style_Engine_CSS_Rules_Store[]
-	 */
-	public static function get_stores() {
-		return static::$stores;
-	}
-
-	/**
-	 * Clears all stores from static::$stores.
-	 *
-	 * @return void
-	 */
-	public static function remove_all_stores() {
-		static::$stores = array();
-	}
-
-	/**
-	 * Sets the store name.
-	 *
-	 * @param string $name The store name.
-	 *
-	 * @return void
-	 */
-	public function set_name( $name ) {
-		$this->name = $name;
-	}
-
-	/**
-	 * Gets the store name.
-	 *
-	 * @return string
-	 */
-	public function get_name() {
-		return $this->name;
-	}
+		/**
+		 * Gets an array of all available stores.
+		 *
+		 * @return WP_Style_Engine_CSS_Rules_Store[]
+		 */
+		public static function get_stores() {
+			return static::$stores;
+		}
 
-	/**
-	 * Gets an array of all rules.
-	 *
-	 * @return WP_Style_Engine_CSS_Rule[]
-	 */
-	public function get_all_rules() {
-		return $this->rules;
-	}
+		/**
+		 * Clears all stores from static::$stores.
+		 *
+		 * @return void
+		 */
+		public static function remove_all_stores() {
+			static::$stores = array();
+		}
 
-	/**
-	 * Gets a WP_Style_Engine_CSS_Rule object by its selector.
-	 * If the rule does not exist, it will be created.
-	 *
-	 * @param string $selector The CSS selector.
-	 *
-	 * @return WP_Style_Engine_CSS_Rule|void Returns a WP_Style_Engine_CSS_Rule object, or null if the selector is empty.
-	 */
-	public function add_rule( $selector ) {
-		$selector = trim( $selector );
+		/**
+		 * Sets the store name.
+		 *
+		 * @param string $name The store name.
+		 *
+		 * @return void
+		 */
+		public function set_name( $name ) {
+			$this->name = $name;
+		}
 
-		// Bail early if there is no selector.
-		if ( empty( $selector ) ) {
-			return;
+		/**
+		 * Gets the store name.
+		 *
+		 * @return string
+		 */
+		public function get_name() {
+			return $this->name;
 		}
 
-		// Create the rule if it doesn't exist.
-		if ( empty( $this->rules[ $selector ] ) ) {
-			$this->rules[ $selector ] = new WP_Style_Engine_CSS_Rule( $selector );
+		/**
+		 * Gets an array of all rules.
+		 *
+		 * @return WP_Style_Engine_CSS_Rule[]
+		 */
+		public function get_all_rules() {
+			return $this->rules;
 		}
 
-		return $this->rules[ $selector ];
-	}
+		/**
+		 * Gets a WP_Style_Engine_CSS_Rule object by its selector.
+		 * If the rule does not exist, it will be created.
+		 *
+		 * @param string $selector    The CSS selector.
+		 * @param string $rules_group A parent CSS selector in the case of nested CSS, or a CSS nested @rule, such as `@media (min-width: 80rem)` or `@layer module`..
+		 *
+		 * @return WP_Style_Engine_CSS_Rule|void Returns a WP_Style_Engine_CSS_Rule object, or null if the selector is empty.
+		 */
+		public function add_rule( $selector, $rules_group = '' ) {
+			$selector    = $selector ? trim( $selector ) : '';
+			$rules_group = $rules_group ? trim( $rules_group ) : '';
+
+			// Bail early if there is no selector.
+			if ( empty( $selector ) ) {
+				return;
+			}
+
+			if ( ! empty( $rules_group ) ) {
+				if ( empty( $this->rules[ "$rules_group $selector" ] ) ) {
+					$this->rules[ "$rules_group $selector" ] = new WP_Style_Engine_CSS_Rule( $selector, array(), $rules_group );
+				}
+				return $this->rules[ "$rules_group $selector" ];
+			}
+
+			// Create the rule if it doesn't exist.
+			if ( empty( $this->rules[ $selector ] ) ) {
+				$this->rules[ $selector ] = new WP_Style_Engine_CSS_Rule( $selector );
+			}
+
+			return $this->rules[ $selector ];
+		}
 
-	/**
-	 * Removes a selector from the store.
-	 *
-	 * @param string $selector The CSS selector.
-	 *
-	 * @return void
-	 */
-	public function remove_rule( $selector ) {
-		unset( $this->rules[ $selector ] );
+		/**
+		 * Removes a selector from the store.
+		 *
+		 * @param string $selector The CSS selector.
+		 *
+		 * @return void
+		 */
+		public function remove_rule( $selector ) {
+			unset( $this->rules[ $selector ] );
+		}
 	}
 }
diff --git a/packages/style-engine/class-wp-style-engine-processor.php b/packages/style-engine/class-wp-style-engine-processor.php
index 81d9f2316d7061..728b8029f26900 100644
--- a/packages/style-engine/class-wp-style-engine-processor.php
+++ b/packages/style-engine/class-wp-style-engine-processor.php
@@ -7,151 +7,167 @@
  * @package Gutenberg
  */
 
-if ( class_exists( 'WP_Style_Engine_Processor' ) ) {
-	return;
-}
-
-/**
- * Compiles styles from stores or collection of CSS rules.
- *
- * @access private
- */
-class WP_Style_Engine_Processor {
+if ( ! class_exists( 'WP_Style_Engine_Processor' ) ) {
 
 	/**
-	 * A collection of Style Engine Store objects.
+	 * Compiles styles from stores or collection of CSS rules.
 	 *
-	 * @var WP_Style_Engine_CSS_Rules_Store[]
+	 * @access private
 	 */
-	protected $stores = array();
+	class WP_Style_Engine_Processor {
+
+		/**
+		 * A collection of Style Engine Store objects.
+		 *
+		 * @var WP_Style_Engine_CSS_Rules_Store[]
+		 */
+		protected $stores = array();
+
+		/**
+		 * The set of CSS rules that this processor will work on.
+		 *
+		 * @var WP_Style_Engine_CSS_Rule[]
+		 */
+		protected $css_rules = array();
+
+		/**
+		 * Add a store to the processor.
+		 *
+		 * @param WP_Style_Engine_CSS_Rules_Store $store The store to add.
+		 *
+		 * @return WP_Style_Engine_Processor Returns the object to allow chaining methods.
+		 */
+		public function add_store( $store ) {
+			if ( ! $store instanceof WP_Style_Engine_CSS_Rules_Store ) {
+				_doing_it_wrong(
+					__METHOD__,
+					__( '$store must be an instance of WP_Style_Engine_CSS_Rules_Store', 'default' ),
+					'6.1.0'
+				);
+				return $this;
+			}
 
-	/**
-	 * The set of CSS rules that this processor will work on.
-	 *
-	 * @var WP_Style_Engine_CSS_Rule[]
-	 */
-	protected $css_rules = array();
+			$this->stores[ $store->get_name() ] = $store;
 
-	/**
-	 * Add a store to the processor.
-	 *
-	 * @param WP_Style_Engine_CSS_Rules_Store $store The store to add.
-	 *
-	 * @return WP_Style_Engine_Processor Returns the object to allow chaining methods.
-	 */
-	public function add_store( $store ) {
-		if ( ! $store instanceof WP_Style_Engine_CSS_Rules_Store ) {
-			_doing_it_wrong(
-				__METHOD__,
-				__( '$store must be an instance of WP_Style_Engine_CSS_Rules_Store', 'default' ),
-				'6.1.0'
-			);
 			return $this;
 		}
 
-		$this->stores[ $store->get_name() ] = $store;
-
-		return $this;
-	}
-
-	/**
-	 * Adds rules to be processed.
-	 *
-	 * @param WP_Style_Engine_CSS_Rule|WP_Style_Engine_CSS_Rule[] $css_rules A single, or an array of, WP_Style_Engine_CSS_Rule objects from a store or otherwise.
-	 *
-	 * @return WP_Style_Engine_Processor Returns the object to allow chaining methods.
-	 */
-	public function add_rules( $css_rules ) {
-		if ( ! is_array( $css_rules ) ) {
-			$css_rules = array( $css_rules );
-		}
+		/**
+		 * Adds rules to be processed.
+		 *
+		 * @param WP_Style_Engine_CSS_Rule|WP_Style_Engine_CSS_Rule[] $css_rules A single, or an array of, WP_Style_Engine_CSS_Rule objects from a store or otherwise.
+		 *
+		 * @return WP_Style_Engine_Processor Returns the object to allow chaining methods.
+		 */
+		public function add_rules( $css_rules ) {
+			if ( ! is_array( $css_rules ) ) {
+				$css_rules = array( $css_rules );
+			}
 
-		foreach ( $css_rules as $rule ) {
-			$selector = $rule->get_selector();
-			if ( isset( $this->css_rules[ $selector ] ) ) {
-				$this->css_rules[ $selector ]->add_declarations( $rule->get_declarations() );
-				continue;
+			foreach ( $css_rules as $rule ) {
+				$selector    = $rule->get_selector();
+				$rules_group = $rule->get_rules_group();
+
+				/**
+				 * If there is an at_rule and it already exists in the css_rules array,
+				 * add the rule to it.
+				 * Otherwise, create a new entry for the at_rule
+				 */
+				if ( ! empty( $rules_group ) ) {
+					if ( isset( $this->css_rules[ "$rules_group $selector" ] ) ) {
+						$this->css_rules[ "$rules_group $selector" ]->add_declarations( $rule->get_declarations() );
+						continue;
+					}
+					$this->css_rules[ "$rules_group $selector" ] = $rule;
+					continue;
+				}
+
+				// If the selector already exists, add the declarations to it.
+				if ( isset( $this->css_rules[ $selector ] ) ) {
+					$this->css_rules[ $selector ]->add_declarations( $rule->get_declarations() );
+					continue;
+				}
+				$this->css_rules[ $rule->get_selector() ] = $rule;
 			}
-			$this->css_rules[ $rule->get_selector() ] = $rule;
+			return $this;
 		}
 
-		return $this;
-	}
-
-	/**
-	 * Get the CSS rules as a string.
-	 *
-	 * Since 6.4.0 Optimization is no longer the default.
-	 *
-	 * @param array $options   {
-	 *     Optional. An array of options. Default empty array.
-	 *
-	 *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
-	 *     @type bool $prettify Whether to add new lines and indents to output. Default is to inherit the value of the global constant `SCRIPT_DEBUG`, if it is defined.
-	 * }
-	 *
-	 * @return string The computed CSS.
-	 */
-	public function get_css( $options = array() ) {
-		$defaults = array(
-			'optimize' => false,
-			'prettify' => SCRIPT_DEBUG,
-		);
-		$options  = wp_parse_args( $options, $defaults );
-
-		// If we have stores, get the rules from them.
-		foreach ( $this->stores as $store ) {
-			$this->add_rules( $store->get_all_rules() );
-		}
+		/**
+		 * Get the CSS rules as a string.
+		 *
+		 * Since 6.4.0 Optimization is no longer the default.
+		 *
+		 * @param array $options   {
+		 *     Optional. An array of options. Default empty array.
+		 *
+		 *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
+		 *     @type bool $prettify Whether to add new lines and indents to output. Default is to inherit the value of the global constant `SCRIPT_DEBUG`, if it is defined.
+		 * }
+		 *
+		 * @return string The computed CSS.
+		 */
+		public function get_css( $options = array() ) {
+			$defaults = array(
+				'optimize' => false,
+				'prettify' => SCRIPT_DEBUG,
+			);
+			$options  = wp_parse_args( $options, $defaults );
 
-		// Combine CSS selectors that have identical declarations.
-		if ( true === $options['optimize'] ) {
-			$this->combine_rules_selectors();
-		}
+			// If we have stores, get the rules from them.
+			foreach ( $this->stores as $store ) {
+				$this->add_rules( $store->get_all_rules() );
+			}
 
-		// Build the CSS.
-		$css = '';
-		foreach ( $this->css_rules as $rule ) {
-			$css .= $rule->get_css( $options['prettify'] );
-			$css .= $options['prettify'] ? "\n" : '';
-		}
-		return $css;
-	}
+			// Combine CSS selectors that have identical declarations.
+			if ( true === $options['optimize'] ) {
+				$this->combine_rules_selectors();
+			}
 
-	/**
-	 * Combines selectors from the rules store when they have the same styles.
-	 *
-	 * @return void
-	 */
-	private function combine_rules_selectors() {
-		// Build an array of selectors along with the JSON-ified styles to make comparisons easier.
-		$selectors_json = array();
-		foreach ( $this->css_rules as $rule ) {
-			$declarations = $rule->get_declarations()->get_declarations();
-			ksort( $declarations );
-			$selectors_json[ $rule->get_selector() ] = wp_json_encode( $declarations );
+			// Build the CSS.
+			$css = '';
+			foreach ( $this->css_rules as $rule ) {
+				// See class WP_Style_Engine_CSS_Rule for the get_css method.
+				$css .= $rule->get_css( $options['prettify'] );
+				$css .= $options['prettify'] ? "\n" : '';
+			}
+			return $css;
 		}
 
-		// Combine selectors that have the same styles.
-		foreach ( $selectors_json as $selector => $json ) {
-			// Get selectors that use the same styles.
-			$duplicates = array_keys( $selectors_json, $json, true );
-			// Skip if there are no duplicates.
-			if ( 1 >= count( $duplicates ) ) {
-				continue;
+		/**
+		 * Combines selectors from the rules store when they have the same styles.
+		 *
+		 * @return void
+		 */
+		private function combine_rules_selectors() {
+			// Build an array of selectors along with the JSON-ified styles to make comparisons easier.
+			$selectors_json = array();
+			foreach ( $this->css_rules as $rule ) {
+				$declarations = $rule->get_declarations()->get_declarations();
+				ksort( $declarations );
+				$selectors_json[ $rule->get_selector() ] = wp_json_encode( $declarations );
 			}
 
-			$declarations = $this->css_rules[ $selector ]->get_declarations();
-
-			foreach ( $duplicates as $key ) {
-				// Unset the duplicates from the $selectors_json array to avoid looping through them as well.
-				unset( $selectors_json[ $key ] );
-				// Remove the rules from the rules collection.
-				unset( $this->css_rules[ $key ] );
+			// Combine selectors that have the same styles.
+			foreach ( $selectors_json as $selector => $json ) {
+				// Get selectors that use the same styles.
+				$duplicates = array_keys( $selectors_json, $json, true );
+				// Skip if there are no duplicates.
+				if ( 1 >= count( $duplicates ) ) {
+					continue;
+				}
+
+				$declarations = $this->css_rules[ $selector ]->get_declarations();
+
+				foreach ( $duplicates as $key ) {
+					// Unset the duplicates from the $selectors_json array to avoid looping through them as well.
+					unset( $selectors_json[ $key ] );
+					// Remove the rules from the rules collection.
+					unset( $this->css_rules[ $key ] );
+				}
+				// Create a new rule with the combined selectors.
+				$duplicate_selectors                     = implode( ',', $duplicates );
+				$this->css_rules[ $duplicate_selectors ] = new WP_Style_Engine_CSS_Rule( $duplicate_selectors, $declarations );
 			}
-			// Create a new rule with the combined selectors.
-			$duplicate_selectors                     = implode( ',', $duplicates );
-			$this->css_rules[ $duplicate_selectors ] = new WP_Style_Engine_CSS_Rule( $duplicate_selectors, $declarations );
 		}
 	}
 }
diff --git a/packages/style-engine/class-wp-style-engine.php b/packages/style-engine/class-wp-style-engine.php
index fdb0083ad9eece..02186fecdcea26 100644
--- a/packages/style-engine/class-wp-style-engine.php
+++ b/packages/style-engine/class-wp-style-engine.php
@@ -7,637 +7,665 @@
  * @package Gutenberg
  */
 
-if ( class_exists( 'WP_Style_Engine' ) ) {
-	return;
-}
+if ( ! class_exists( 'WP_Style_Engine' ) ) {
 
-/**
- * Class WP_Style_Engine.
- *
- * The Style Engine aims to provide a consistent API for rendering styling for blocks across both client-side and server-side applications.
- *
- * This class is for internal Core usage and is not supposed to be used by extenders (plugins and/or themes).
- * This class is final and should not be extended.
- * This is a low-level API that may need to do breaking changes. Please, use wp_style_engine_get_styles instead.
- *
- * @access private
- */
-final class WP_Style_Engine {
 	/**
-	 * Style definitions that contain the instructions to parse/output valid Gutenberg styles from a block's attributes.
+	 * Class WP_Style_Engine.
 	 *
-	 * For every style definition, the following properties are valid:
+	 * The Style Engine aims to provide a consistent API for rendering styling for blocks across both client-side and server-side applications.
 	 *
-	 *  - classnames    => (array) an array of classnames to be returned for block styles. The key is a classname or pattern.
-	 *                    A value of `true` means the classname should be applied always. Otherwise, a valid CSS property (string)
-	 *                    to match the incoming value, e.g., "color" to match var:preset|color|somePresetSlug.
-	 *  - css_vars      => (array) an array of key value pairs used to generate CSS var values.
-	 *                     The key should be the CSS property name that matches the second element of the preset string value,
-	 *                     i.e., "color" in var:preset|color|somePresetSlug. The value is a CSS var pattern (e.g. `--wp--preset--color--$slug`),
-	 *                     whose `$slug` fragment will be replaced with the preset slug, which is the third element of the preset string value,
-	 *                     i.e., `somePresetSlug` in var:preset|color|somePresetSlug.
-	 *  - property_keys => (array) array of keys whose values represent a valid CSS property, e.g., "margin" or "border".
-	 *  - path          => (array) a path that accesses the corresponding style value in the block style object.
-	 *  - value_func    => (string) the name of a function to generate a CSS definition array for a particular style object. The output of this function should be `array( "$property" => "$value", ... )`.
+	 * This class is for internal Core usage and is not supposed to be used by extenders (plugins and/or themes).
+	 * This class is final and should not be extended.
+	 * This is a low-level API that may need to do breaking changes. Please, use wp_style_engine_get_styles instead.
 	 *
-	 * @var array
+	 * @access private
 	 */
-	const BLOCK_STYLE_DEFINITIONS_METADATA = array(
-		'background' => array(
-			'backgroundImage' => array(
-				'property_keys' => array(
-					'default' => 'background-image',
-				),
-				'value_func'    => array( self::class, 'get_url_or_value_css_declaration' ),
-				'path'          => array( 'background', 'backgroundImage' ),
-			),
-			'backgroundSize'  => array(
-				'property_keys' => array(
-					'default' => 'background-size',
-				),
-				'path'          => array( 'background', 'backgroundSize' ),
-			),
-		),
-		'color'      => array(
-			'text'       => array(
-				'property_keys' => array(
-					'default' => 'color',
-				),
-				'path'          => array( 'color', 'text' ),
-				'css_vars'      => array(
-					'color' => '--wp--preset--color--$slug',
-				),
-				'classnames'    => array(
-					'has-text-color'  => true,
-					'has-$slug-color' => 'color',
-				),
-			),
+	final class WP_Style_Engine {
+		/**
+		 * Style definitions that contain the instructions to parse/output valid Gutenberg styles from a block's attributes.
+		 *
+		 * For every style definition, the following properties are valid:
+		 *
+		 *  - classnames    => (array) an array of classnames to be returned for block styles. The key is a classname or pattern.
+		 *                    A value of `true` means the classname should be applied always. Otherwise, a valid CSS property (string)
+		 *                    to match the incoming value, e.g., "color" to match var:preset|color|somePresetSlug.
+		 *  - css_vars      => (array) an array of key value pairs used to generate CSS var values.
+		 *                     The key should be the CSS property name that matches the second element of the preset string value,
+		 *                     i.e., "color" in var:preset|color|somePresetSlug. The value is a CSS var pattern (e.g. `--wp--preset--color--$slug`),
+		 *                     whose `$slug` fragment will be replaced with the preset slug, which is the third element of the preset string value,
+		 *                     i.e., `somePresetSlug` in var:preset|color|somePresetSlug.
+		 *  - property_keys => (array) array of keys whose values represent a valid CSS property, e.g., "margin" or "border".
+		 *  - path          => (array) a path that accesses the corresponding style value in the block style object.
+		 *  - value_func    => (string) the name of a function to generate a CSS definition array for a particular style object. The output of this function should be `array( "$property" => "$value", ... )`.
+		 *
+		 * @var array
+		 */
+		const BLOCK_STYLE_DEFINITIONS_METADATA = array(
 			'background' => array(
-				'property_keys' => array(
-					'default' => 'background-color',
-				),
-				'path'          => array( 'color', 'background' ),
-				'css_vars'      => array(
-					'color' => '--wp--preset--color--$slug',
-				),
-				'classnames'    => array(
-					'has-background'             => true,
-					'has-$slug-background-color' => 'color',
-				),
-			),
-			'gradient'   => array(
-				'property_keys' => array(
-					'default' => 'background',
-				),
-				'css_vars'      => array(
-					'gradient' => '--wp--preset--gradient--$slug',
-				),
-				'path'          => array( 'color', 'gradient' ),
-				'classnames'    => array(
-					'has-background'                => true,
-					'has-$slug-gradient-background' => 'gradient',
-				),
-			),
-		),
-		'border'     => array(
-			'color'  => array(
-				'property_keys' => array(
-					'default'    => 'border-color',
-					'individual' => 'border-%s-color',
-				),
-				'path'          => array( 'border', 'color' ),
-				'classnames'    => array(
-					'has-border-color'       => true,
-					'has-$slug-border-color' => 'color',
-				),
-			),
-			'radius' => array(
-				'property_keys' => array(
-					'default'    => 'border-radius',
-					'individual' => 'border-%s-radius',
-				),
-				'path'          => array( 'border', 'radius' ),
-			),
-			'style'  => array(
-				'property_keys' => array(
-					'default'    => 'border-style',
-					'individual' => 'border-%s-style',
-				),
-				'path'          => array( 'border', 'style' ),
-			),
-			'width'  => array(
-				'property_keys' => array(
-					'default'    => 'border-width',
-					'individual' => 'border-%s-width',
-				),
-				'path'          => array( 'border', 'width' ),
-			),
-			'top'    => array(
-				'value_func' => array( self::class, 'get_individual_property_css_declarations' ),
-				'path'       => array( 'border', 'top' ),
-				'css_vars'   => array(
-					'color' => '--wp--preset--color--$slug',
-				),
-			),
-			'right'  => array(
-				'value_func' => array( self::class, 'get_individual_property_css_declarations' ),
-				'path'       => array( 'border', 'right' ),
-				'css_vars'   => array(
-					'color' => '--wp--preset--color--$slug',
-				),
-			),
-			'bottom' => array(
-				'value_func' => array( self::class, 'get_individual_property_css_declarations' ),
-				'path'       => array( 'border', 'bottom' ),
-				'css_vars'   => array(
-					'color' => '--wp--preset--color--$slug',
-				),
-			),
-			'left'   => array(
-				'value_func' => array( self::class, 'get_individual_property_css_declarations' ),
-				'path'       => array( 'border', 'left' ),
-				'css_vars'   => array(
-					'color' => '--wp--preset--color--$slug',
-				),
-			),
-		),
-		'shadow'     => array(
-			'shadow' => array(
-				'property_keys' => array(
-					'default' => 'box-shadow',
-				),
-				'path'          => array( 'shadow' ),
-				'css_vars'      => array(
-					'shadow' => '--wp--preset--shadow--$slug',
-				),
-			),
-		),
-		'dimensions' => array(
-			'minHeight' => array(
-				'property_keys' => array(
-					'default' => 'min-height',
-				),
-				'path'          => array( 'dimensions', 'minHeight' ),
-				'css_vars'      => array(
-					'spacing' => '--wp--preset--spacing--$slug',
-				),
-			),
-		),
-		'spacing'    => array(
-			'padding' => array(
-				'property_keys' => array(
-					'default'    => 'padding',
-					'individual' => 'padding-%s',
-				),
-				'path'          => array( 'spacing', 'padding' ),
-				'css_vars'      => array(
-					'spacing' => '--wp--preset--spacing--$slug',
+				'backgroundImage'      => array(
+					'property_keys' => array(
+						'default' => 'background-image',
+					),
+					'value_func'    => array( self::class, 'get_url_or_value_css_declaration' ),
+					'path'          => array( 'background', 'backgroundImage' ),
+				),
+				'backgroundPosition'   => array(
+					'property_keys' => array(
+						'default' => 'background-position',
+					),
+					'path'          => array( 'background', 'backgroundPosition' ),
+				),
+				'backgroundRepeat'     => array(
+					'property_keys' => array(
+						'default' => 'background-repeat',
+					),
+					'path'          => array( 'background', 'backgroundRepeat' ),
+				),
+				'backgroundSize'       => array(
+					'property_keys' => array(
+						'default' => 'background-size',
+					),
+					'path'          => array( 'background', 'backgroundSize' ),
+				),
+				'backgroundAttachment' => array(
+					'property_keys' => array(
+						'default' => 'background-attachment',
+					),
+					'path'          => array( 'background', 'backgroundAttachment' ),
 				),
 			),
-			'margin'  => array(
-				'property_keys' => array(
-					'default'    => 'margin',
-					'individual' => 'margin-%s',
+			'color'      => array(
+				'text'       => array(
+					'property_keys' => array(
+						'default' => 'color',
+					),
+					'path'          => array( 'color', 'text' ),
+					'css_vars'      => array(
+						'color' => '--wp--preset--color--$slug',
+					),
+					'classnames'    => array(
+						'has-text-color'  => true,
+						'has-$slug-color' => 'color',
+					),
+				),
+				'background' => array(
+					'property_keys' => array(
+						'default' => 'background-color',
+					),
+					'path'          => array( 'color', 'background' ),
+					'css_vars'      => array(
+						'color' => '--wp--preset--color--$slug',
+					),
+					'classnames'    => array(
+						'has-background'             => true,
+						'has-$slug-background-color' => 'color',
+					),
+				),
+				'gradient'   => array(
+					'property_keys' => array(
+						'default' => 'background',
+					),
+					'css_vars'      => array(
+						'gradient' => '--wp--preset--gradient--$slug',
+					),
+					'path'          => array( 'color', 'gradient' ),
+					'classnames'    => array(
+						'has-background'                => true,
+						'has-$slug-gradient-background' => 'gradient',
+					),
 				),
-				'path'          => array( 'spacing', 'margin' ),
-				'css_vars'      => array(
-					'spacing' => '--wp--preset--spacing--$slug',
-				),
-			),
-		),
-		'typography' => array(
-			'fontSize'       => array(
-				'property_keys' => array(
-					'default' => 'font-size',
-				),
-				'css_vars'      => array(
-					'font-size' => '--wp--preset--font-size--$slug',
-				),
-				'path'          => array( 'typography', 'fontSize' ),
-				'classnames'    => array(
-					'has-$slug-font-size' => 'font-size',
-				),
-			),
-			'fontFamily'     => array(
-				'property_keys' => array(
-					'default' => 'font-family',
-				),
-				'css_vars'      => array(
-					'font-family' => '--wp--preset--font-family--$slug',
-				),
-				'path'          => array( 'typography', 'fontFamily' ),
-				'classnames'    => array(
-					'has-$slug-font-family' => 'font-family',
-				),
-			),
-			'fontStyle'      => array(
-				'property_keys' => array(
-					'default' => 'font-style',
-				),
-				'path'          => array( 'typography', 'fontStyle' ),
-			),
-			'fontWeight'     => array(
-				'property_keys' => array(
-					'default' => 'font-weight',
-				),
-				'path'          => array( 'typography', 'fontWeight' ),
-			),
-			'lineHeight'     => array(
-				'property_keys' => array(
-					'default' => 'line-height',
-				),
-				'path'          => array( 'typography', 'lineHeight' ),
 			),
-			'textColumns'    => array(
-				'property_keys' => array(
-					'default' => 'column-count',
+			'border'     => array(
+				'color'  => array(
+					'property_keys' => array(
+						'default'    => 'border-color',
+						'individual' => 'border-%s-color',
+					),
+					'path'          => array( 'border', 'color' ),
+					'classnames'    => array(
+						'has-border-color'       => true,
+						'has-$slug-border-color' => 'color',
+					),
+				),
+				'radius' => array(
+					'property_keys' => array(
+						'default'    => 'border-radius',
+						'individual' => 'border-%s-radius',
+					),
+					'path'          => array( 'border', 'radius' ),
+				),
+				'style'  => array(
+					'property_keys' => array(
+						'default'    => 'border-style',
+						'individual' => 'border-%s-style',
+					),
+					'path'          => array( 'border', 'style' ),
+				),
+				'width'  => array(
+					'property_keys' => array(
+						'default'    => 'border-width',
+						'individual' => 'border-%s-width',
+					),
+					'path'          => array( 'border', 'width' ),
+				),
+				'top'    => array(
+					'value_func' => array( self::class, 'get_individual_property_css_declarations' ),
+					'path'       => array( 'border', 'top' ),
+					'css_vars'   => array(
+						'color' => '--wp--preset--color--$slug',
+					),
+				),
+				'right'  => array(
+					'value_func' => array( self::class, 'get_individual_property_css_declarations' ),
+					'path'       => array( 'border', 'right' ),
+					'css_vars'   => array(
+						'color' => '--wp--preset--color--$slug',
+					),
+				),
+				'bottom' => array(
+					'value_func' => array( self::class, 'get_individual_property_css_declarations' ),
+					'path'       => array( 'border', 'bottom' ),
+					'css_vars'   => array(
+						'color' => '--wp--preset--color--$slug',
+					),
+				),
+				'left'   => array(
+					'value_func' => array( self::class, 'get_individual_property_css_declarations' ),
+					'path'       => array( 'border', 'left' ),
+					'css_vars'   => array(
+						'color' => '--wp--preset--color--$slug',
+					),
 				),
-				'path'          => array( 'typography', 'textColumns' ),
 			),
-			'textDecoration' => array(
-				'property_keys' => array(
-					'default' => 'text-decoration',
+			'shadow'     => array(
+				'shadow' => array(
+					'property_keys' => array(
+						'default' => 'box-shadow',
+					),
+					'path'          => array( 'shadow' ),
+					'css_vars'      => array(
+						'shadow' => '--wp--preset--shadow--$slug',
+					),
 				),
-				'path'          => array( 'typography', 'textDecoration' ),
 			),
-			'textTransform'  => array(
-				'property_keys' => array(
-					'default' => 'text-transform',
+			'dimensions' => array(
+				'aspectRatio' => array(
+					'property_keys' => array(
+						'default' => 'aspect-ratio',
+					),
+					'path'          => array( 'dimensions', 'aspectRatio' ),
+					'classnames'    => array(
+						'has-aspect-ratio' => true,
+					),
+				),
+				'minHeight'   => array(
+					'property_keys' => array(
+						'default' => 'min-height',
+					),
+					'path'          => array( 'dimensions', 'minHeight' ),
+					'css_vars'      => array(
+						'spacing' => '--wp--preset--spacing--$slug',
+					),
 				),
-				'path'          => array( 'typography', 'textTransform' ),
 			),
-			'letterSpacing'  => array(
-				'property_keys' => array(
-					'default' => 'letter-spacing',
+			'spacing'    => array(
+				'padding' => array(
+					'property_keys' => array(
+						'default'    => 'padding',
+						'individual' => 'padding-%s',
+					),
+					'path'          => array( 'spacing', 'padding' ),
+					'css_vars'      => array(
+						'spacing' => '--wp--preset--spacing--$slug',
+					),
+				),
+				'margin'  => array(
+					'property_keys' => array(
+						'default'    => 'margin',
+						'individual' => 'margin-%s',
+					),
+					'path'          => array( 'spacing', 'margin' ),
+					'css_vars'      => array(
+						'spacing' => '--wp--preset--spacing--$slug',
+					),
 				),
-				'path'          => array( 'typography', 'letterSpacing' ),
 			),
-			'writingMode'    => array(
-				'property_keys' => array(
-					'default' => 'writing-mode',
+			'typography' => array(
+				'fontSize'       => array(
+					'property_keys' => array(
+						'default' => 'font-size',
+					),
+					'css_vars'      => array(
+						'font-size' => '--wp--preset--font-size--$slug',
+					),
+					'path'          => array( 'typography', 'fontSize' ),
+					'classnames'    => array(
+						'has-$slug-font-size' => 'font-size',
+					),
+				),
+				'fontFamily'     => array(
+					'property_keys' => array(
+						'default' => 'font-family',
+					),
+					'css_vars'      => array(
+						'font-family' => '--wp--preset--font-family--$slug',
+					),
+					'path'          => array( 'typography', 'fontFamily' ),
+					'classnames'    => array(
+						'has-$slug-font-family' => 'font-family',
+					),
+				),
+				'fontStyle'      => array(
+					'property_keys' => array(
+						'default' => 'font-style',
+					),
+					'path'          => array( 'typography', 'fontStyle' ),
+				),
+				'fontWeight'     => array(
+					'property_keys' => array(
+						'default' => 'font-weight',
+					),
+					'path'          => array( 'typography', 'fontWeight' ),
+				),
+				'lineHeight'     => array(
+					'property_keys' => array(
+						'default' => 'line-height',
+					),
+					'path'          => array( 'typography', 'lineHeight' ),
+				),
+				'textColumns'    => array(
+					'property_keys' => array(
+						'default' => 'column-count',
+					),
+					'path'          => array( 'typography', 'textColumns' ),
+				),
+				'textDecoration' => array(
+					'property_keys' => array(
+						'default' => 'text-decoration',
+					),
+					'path'          => array( 'typography', 'textDecoration' ),
+				),
+				'textTransform'  => array(
+					'property_keys' => array(
+						'default' => 'text-transform',
+					),
+					'path'          => array( 'typography', 'textTransform' ),
+				),
+				'letterSpacing'  => array(
+					'property_keys' => array(
+						'default' => 'letter-spacing',
+					),
+					'path'          => array( 'typography', 'letterSpacing' ),
+				),
+				'writingMode'    => array(
+					'property_keys' => array(
+						'default' => 'writing-mode',
+					),
+					'path'          => array( 'typography', 'writingMode' ),
 				),
-				'path'          => array( 'typography', 'writingMode' ),
 			),
-		),
-	);
+		);
 
-	/**
-	 * Util: Extracts the slug in kebab case from a preset string, e.g., "heavenly-blue" from 'var:preset|color|heavenlyBlue'.
-	 *
-	 * @param string $style_value  A single CSS preset value.
-	 * @param string $property_key The CSS property that is the second element of the preset string. Used for matching.
-	 *
-	 * @return string The slug, or empty string if not found.
-	 */
-	protected static function get_slug_from_preset_value( $style_value, $property_key ) {
-		if ( is_string( $style_value ) && is_string( $property_key ) && str_contains( $style_value, "var:preset|{$property_key}|" ) ) {
-			$index_to_splice = strrpos( $style_value, '|' ) + 1;
-			return _wp_to_kebab_case( substr( $style_value, $index_to_splice ) );
+		/**
+		 * Util: Extracts the slug in kebab case from a preset string, e.g., "heavenly-blue" from 'var:preset|color|heavenlyBlue'.
+		 *
+		 * @param string $style_value  A single CSS preset value.
+		 * @param string $property_key The CSS property that is the second element of the preset string. Used for matching.
+		 *
+		 * @return string The slug, or empty string if not found.
+		 */
+		protected static function get_slug_from_preset_value( $style_value, $property_key ) {
+			if ( is_string( $style_value ) && is_string( $property_key ) && str_contains( $style_value, "var:preset|{$property_key}|" ) ) {
+				$index_to_splice = strrpos( $style_value, '|' ) + 1;
+				return _wp_to_kebab_case( substr( $style_value, $index_to_splice ) );
+			}
+			return '';
 		}
-		return '';
-	}
 
-	/**
-	 * Util: Generates a CSS var string, e.g., var(--wp--preset--color--background) from a preset string such as `var:preset|space|50`.
-	 *
-	 * @param string   $style_value  A single CSS preset value.
-	 * @param string[] $css_vars     An associate array of CSS var patterns used to generate the var string.
-	 *
-	 * @return string The css var, or an empty string if no match for slug found.
-	 */
-	protected static function get_css_var_value( $style_value, $css_vars ) {
-		foreach ( $css_vars as  $property_key => $css_var_pattern ) {
-			$slug = static::get_slug_from_preset_value( $style_value, $property_key );
-			if ( static::is_valid_style_value( $slug ) ) {
-				$var = strtr(
-					$css_var_pattern,
-					array( '$slug' => $slug )
-				);
-				return "var($var)";
+		/**
+		 * Util: Generates a CSS var string, e.g., var(--wp--preset--color--background) from a preset string such as `var:preset|space|50`.
+		 *
+		 * @param string   $style_value  A single CSS preset value.
+		 * @param string[] $css_vars     An associate array of CSS var patterns used to generate the var string.
+		 *
+		 * @return string The css var, or an empty string if no match for slug found.
+		 */
+		protected static function get_css_var_value( $style_value, $css_vars ) {
+			foreach ( $css_vars as  $property_key => $css_var_pattern ) {
+				$slug = static::get_slug_from_preset_value( $style_value, $property_key );
+				if ( static::is_valid_style_value( $slug ) ) {
+					$var = strtr(
+						$css_var_pattern,
+						array( '$slug' => $slug )
+					);
+					return "var($var)";
+				}
 			}
+			return '';
 		}
-		return '';
-	}
 
-	/**
-	 * Util: Checks whether an incoming block style value is valid.
-	 *
-	 * @param string? $style_value  A single css preset value.
-	 *
-	 * @return bool
-	 */
-	protected static function is_valid_style_value( $style_value ) {
-		return '0' === $style_value || ! empty( $style_value );
-	}
-
-	/**
-	 * Stores a CSS rule using the provided CSS selector and CSS declarations.
-	 *
-	 * @param string   $store_name       A valid store key.
-	 * @param string   $css_selector     When a selector is passed, the function will return a full CSS rule `$selector { ...rules }`, otherwise a concatenated string of properties and values.
-	 * @param string[] $css_declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
-	 *
-	 * @return void.
-	 */
-	public static function store_css_rule( $store_name, $css_selector, $css_declarations ) {
-		if ( empty( $store_name ) || empty( $css_selector ) || empty( $css_declarations ) ) {
-			return;
+		/**
+		 * Util: Checks whether an incoming block style value is valid.
+		 *
+		 * @param string? $style_value  A single css preset value.
+		 *
+		 * @return bool
+		 */
+		protected static function is_valid_style_value( $style_value ) {
+			return '0' === $style_value || ! empty( $style_value );
 		}
-		static::get_store( $store_name )->add_rule( $css_selector )->add_declarations( $css_declarations );
-	}
 
-	/**
-	 * Returns a store by store key.
-	 *
-	 * @param string $store_name A store key.
-	 *
-	 * @return WP_Style_Engine_CSS_Rules_Store
-	 */
-	public static function get_store( $store_name ) {
-		return WP_Style_Engine_CSS_Rules_Store::get_store( $store_name );
-	}
+		/**
+		 * Stores a CSS rule using the provided CSS selector and CSS declarations.
+		 *
+		 * @param string   $store_name       A valid store key.
+		 * @param string   $css_selector     When a selector is passed, the function will return a full CSS rule `$selector { ...rules }`, otherwise a concatenated string of properties and values.
+		 * @param string[] $css_declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+		 * @param string $rules_group        Optional. A parent CSS selector in the case of nested CSS, or a CSS nested @rule, such as `@media (min-width: 80rem)` or `@layer module`.
+		 *
+		 * @return void.
+		 */
+		public static function store_css_rule( $store_name, $css_selector, $css_declarations, $rules_group = '' ) {
+			if ( empty( $store_name ) || empty( $css_selector ) || empty( $css_declarations ) ) {
+				return;
+			}
+			static::get_store( $store_name )->add_rule( $css_selector, $rules_group )->add_declarations( $css_declarations );
+		}
 
-	/**
-	 * Returns classnames and CSS based on the values in a styles object.
-	 * Return values are parsed based on the instructions in BLOCK_STYLE_DEFINITIONS_METADATA.
-	 *
-	 * @since 6.1.0
-	 *
-	 * @param array $block_styles The style object.
-	 * @param array $options      {
-	 *     Optional. An array of options. Default empty array.
-	 *
-	 *     @type bool        $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
-	 *     @type string      $selector                   Optional. When a selector is passed, the value of `$css` in the return value will comprise a full CSS rule `$selector { ...$css_declarations }`,
-	 *                                                   otherwise, the value will be a concatenated string of CSS declarations.
-	 * }
-	 *
-	 * @return array {
-	 *     @type string   $classnames   Classnames separated by a space.
-	 *     @type string[] $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
-	 * }
-	 */
-	public static function parse_block_styles( $block_styles, $options ) {
-		$parsed_styles = array(
-			'classnames'   => array(),
-			'declarations' => array(),
-		);
-		if ( empty( $block_styles ) || ! is_array( $block_styles ) ) {
-			return $parsed_styles;
+		/**
+		 * Returns a store by store key.
+		 *
+		 * @param string $store_name A store key.
+		 *
+		 * @return WP_Style_Engine_CSS_Rules_Store
+		 */
+		public static function get_store( $store_name ) {
+			return WP_Style_Engine_CSS_Rules_Store::get_store( $store_name );
 		}
 
-		// Collect CSS and classnames.
-		foreach ( static::BLOCK_STYLE_DEFINITIONS_METADATA as $definition_group_key => $definition_group_style ) {
-			if ( empty( $block_styles[ $definition_group_key ] ) ) {
-				continue;
+		/**
+		 * Returns classnames and CSS based on the values in a styles object.
+		 * Return values are parsed based on the instructions in BLOCK_STYLE_DEFINITIONS_METADATA.
+		 *
+		 * @since 6.1.0
+		 *
+		 * @param array $block_styles The style object.
+		 * @param array $options      {
+		 *     Optional. An array of options. Default empty array.
+		 *
+		 *     @type bool        $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
+		 *     @type string      $selector                   Optional. When a selector is passed, the value of `$css` in the return value will comprise a full CSS rule `$selector { ...$css_declarations }`,
+		 *                                                   otherwise, the value will be a concatenated string of CSS declarations.
+		 * }
+		 *
+		 * @return array {
+		 *     @type string   $classnames   Classnames separated by a space.
+		 *     @type string[] $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+		 * }
+		 */
+		public static function parse_block_styles( $block_styles, $options ) {
+			$parsed_styles = array(
+				'classnames'   => array(),
+				'declarations' => array(),
+			);
+			if ( empty( $block_styles ) || ! is_array( $block_styles ) ) {
+				return $parsed_styles;
 			}
-			foreach ( $definition_group_style as $style_definition ) {
-				$style_value = _wp_array_get( $block_styles, $style_definition['path'], null );
 
-				if ( ! static::is_valid_style_value( $style_value ) ) {
+			// Collect CSS and classnames.
+			foreach ( static::BLOCK_STYLE_DEFINITIONS_METADATA as $definition_group_key => $definition_group_style ) {
+				if ( empty( $block_styles[ $definition_group_key ] ) ) {
 					continue;
 				}
+				foreach ( $definition_group_style as $style_definition ) {
+					$style_value = _wp_array_get( $block_styles, $style_definition['path'], null );
 
-				$parsed_styles['classnames']   = array_merge( $parsed_styles['classnames'], static::get_classnames( $style_value, $style_definition ) );
-				$parsed_styles['declarations'] = array_merge( $parsed_styles['declarations'], static::get_css_declarations( $style_value, $style_definition, $options ) );
-			}
-		}
+					if ( ! static::is_valid_style_value( $style_value ) ) {
+						continue;
+					}
 
-		return $parsed_styles;
-	}
+					$parsed_styles['classnames']   = array_merge( $parsed_styles['classnames'], static::get_classnames( $style_value, $style_definition ) );
+					$parsed_styles['declarations'] = array_merge( $parsed_styles['declarations'], static::get_css_declarations( $style_value, $style_definition, $options ) );
+				}
+			}
 
-	/**
-	 * Returns classnames, and generates classname(s) from a CSS preset property pattern, e.g., '`var:preset|<PRESET_TYPE>|<PRESET_SLUG>`'.
-	 *
-	 * @param array $style_value      A single raw style value or css preset property from the $block_styles array.
-	 * @param array $style_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA.
-	 *
-	 * @return array|string[] An array of CSS classnames, or empty array.
-	 */
-	protected static function get_classnames( $style_value, $style_definition ) {
-		if ( empty( $style_value ) ) {
-			return array();
+			return $parsed_styles;
 		}
 
-		$classnames = array();
-		if ( ! empty( $style_definition['classnames'] ) ) {
-			foreach ( $style_definition['classnames'] as $classname => $property_key ) {
-				if ( true === $property_key ) {
-					$classnames[] = $classname;
-				}
-
-				$slug = static::get_slug_from_preset_value( $style_value, $property_key );
+		/**
+		 * Returns classnames, and generates classname(s) from a CSS preset property pattern, e.g., '`var:preset|<PRESET_TYPE>|<PRESET_SLUG>`'.
+		 *
+		 * @param array $style_value      A single raw style value or css preset property from the $block_styles array.
+		 * @param array $style_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA.
+		 *
+		 * @return array|string[] An array of CSS classnames, or empty array.
+		 */
+		protected static function get_classnames( $style_value, $style_definition ) {
+			if ( empty( $style_value ) ) {
+				return array();
+			}
 
-				if ( $slug ) {
-					/*
-					 * Right now we expect a classname pattern to be stored in BLOCK_STYLE_DEFINITIONS_METADATA.
-					 * One day, if there are no stored schemata, we could allow custom patterns or
-					 * generate classnames based on other properties
-					 * such as a path or a value or a prefix passed in options.
-					 */
-					$classnames[] = strtr( $classname, array( '$slug' => $slug ) );
+			$classnames = array();
+			if ( ! empty( $style_definition['classnames'] ) ) {
+				foreach ( $style_definition['classnames'] as $classname => $property_key ) {
+					if ( true === $property_key ) {
+						$classnames[] = $classname;
+						continue;
+					}
+
+					$slug = static::get_slug_from_preset_value( $style_value, $property_key );
+
+					if ( $slug ) {
+						/*
+						* Right now we expect a classname pattern to be stored in BLOCK_STYLE_DEFINITIONS_METADATA.
+						* One day, if there are no stored schemata, we could allow custom patterns or
+						* generate classnames based on other properties
+						* such as a path or a value or a prefix passed in options.
+						*/
+						$classnames[] = strtr( $classname, array( '$slug' => $slug ) );
+					}
 				}
 			}
-		}
-
-		return $classnames;
-	}
 
-	/**
-	 * Returns an array of CSS declarations based on valid block style values.
-	 *
-	 * @since 6.1.0
-	 *
-	 * @param array $style_value      A single raw style value from $block_styles array.
-	 * @param array $style_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA.
-	 * @param array $options          {
-	 *     Optional. An array of options. Default empty array.
-	 *
-	 *     @type bool $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
-	 * }
-	 *
-	 * @return string[] An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
-	 */
-	protected static function get_css_declarations( $style_value, $style_definition, $options = array() ) {
-		if ( isset( $style_definition['value_func'] ) && is_callable( $style_definition['value_func'] ) ) {
-			return call_user_func( $style_definition['value_func'], $style_value, $style_definition, $options );
+			return $classnames;
 		}
 
-		$css_declarations     = array();
-		$style_property_keys  = $style_definition['property_keys'];
-		$should_skip_css_vars = isset( $options['convert_vars_to_classnames'] ) && true === $options['convert_vars_to_classnames'];
-
-		/*
-		 * Build CSS var values from `var:preset|<PRESET_TYPE>|<PRESET_SLUG>` values, e.g, `var(--wp--css--rule-slug )`.
-		 * Check if the value is a CSS preset and there's a corresponding css_var pattern in the style definition.
+		/**
+		 * Returns an array of CSS declarations based on valid block style values.
+		 *
+		 * @since 6.1.0
+		 *
+		 * @param array $style_value      A single raw style value from $block_styles array.
+		 * @param array $style_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA.
+		 * @param array $options          {
+		 *     Optional. An array of options. Default empty array.
+		 *
+		 *     @type bool $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
+		 * }
+		 *
+		 * @return string[] An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
 		 */
-		if ( is_string( $style_value ) && str_contains( $style_value, 'var:' ) ) {
-			if ( ! $should_skip_css_vars && ! empty( $style_definition['css_vars'] ) ) {
-				$css_var = static::get_css_var_value( $style_value, $style_definition['css_vars'] );
-				if ( static::is_valid_style_value( $css_var ) ) {
-					$css_declarations[ $style_property_keys['default'] ] = $css_var;
-				}
+		protected static function get_css_declarations( $style_value, $style_definition, $options = array() ) {
+			if ( isset( $style_definition['value_func'] ) && is_callable( $style_definition['value_func'] ) ) {
+				return call_user_func( $style_definition['value_func'], $style_value, $style_definition, $options );
 			}
-			return $css_declarations;
-		}
 
-		/*
-		 * Default rule builder.
-		 * If the input contains an array, assume box model-like properties
-		 * for styles such as margins and padding.
-		 */
-		if ( is_array( $style_value ) ) {
-			// Bail out early if the `'individual'` property is not defined.
-			if ( ! isset( $style_property_keys['individual'] ) ) {
+			$css_declarations     = array();
+			$style_property_keys  = $style_definition['property_keys'];
+			$should_skip_css_vars = isset( $options['convert_vars_to_classnames'] ) && true === $options['convert_vars_to_classnames'];
+
+			/*
+			* Build CSS var values from `var:preset|<PRESET_TYPE>|<PRESET_SLUG>` values, e.g, `var(--wp--css--rule-slug )`.
+			* Check if the value is a CSS preset and there's a corresponding css_var pattern in the style definition.
+			*/
+			if ( is_string( $style_value ) && str_contains( $style_value, 'var:' ) ) {
+				if ( ! $should_skip_css_vars && ! empty( $style_definition['css_vars'] ) ) {
+					$css_var = static::get_css_var_value( $style_value, $style_definition['css_vars'] );
+					if ( static::is_valid_style_value( $css_var ) ) {
+						$css_declarations[ $style_property_keys['default'] ] = $css_var;
+					}
+				}
 				return $css_declarations;
 			}
 
-			foreach ( $style_value as $key => $value ) {
-				if ( is_string( $value ) && str_contains( $value, 'var:' ) && ! $should_skip_css_vars && ! empty( $style_definition['css_vars'] ) ) {
-					$value = static::get_css_var_value( $value, $style_definition['css_vars'] );
+			/*
+			* Default rule builder.
+			* If the input contains an array, assume box model-like properties
+			* for styles such as margins and padding.
+			*/
+			if ( is_array( $style_value ) ) {
+				// Bail out early if the `'individual'` property is not defined.
+				if ( ! isset( $style_property_keys['individual'] ) ) {
+					return $css_declarations;
 				}
 
-				$individual_property = sprintf( $style_property_keys['individual'], _wp_to_kebab_case( $key ) );
+				foreach ( $style_value as $key => $value ) {
+					if ( is_string( $value ) && str_contains( $value, 'var:' ) && ! $should_skip_css_vars && ! empty( $style_definition['css_vars'] ) ) {
+						$value = static::get_css_var_value( $value, $style_definition['css_vars'] );
+					}
+
+					$individual_property = sprintf( $style_property_keys['individual'], _wp_to_kebab_case( $key ) );
 
-				if ( $individual_property && static::is_valid_style_value( $value ) ) {
-					$css_declarations[ $individual_property ] = $value;
+					if ( $individual_property && static::is_valid_style_value( $value ) ) {
+						$css_declarations[ $individual_property ] = $value;
+					}
 				}
+
+				return $css_declarations;
 			}
 
+			$css_declarations[ $style_property_keys['default'] ] = $style_value;
 			return $css_declarations;
 		}
 
-		$css_declarations[ $style_property_keys['default'] ] = $style_value;
-		return $css_declarations;
-	}
-
-	/**
-	 * Style value parser that returns a CSS definition array comprising style properties
-	 * that have keys representing individual style properties, otherwise known as longhand CSS properties.
-	 * e.g., "$style_property-$individual_feature: $value;", which could represent the following:
-	 * "border-{top|right|bottom|left}-{color|width|style}: {value};" or,
-	 * "border-image-{outset|source|width|repeat|slice}: {value};"
-	 *
-	 * @param array $style_value                    A single raw style value from $block_styles array.
-	 * @param array $individual_property_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA representing an individual property of a CSS property, e.g., 'top' in 'border-top'.
-	 * @param array $options                        {
-	 *     Optional. An array of options. Default empty array.
-	 *
-	 *     @type bool $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
-	 * }
-	 *
-	 * @return string[] An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
-	 */
-	protected static function get_individual_property_css_declarations( $style_value, $individual_property_definition, $options = array() ) {
-		if ( ! is_array( $style_value ) || empty( $style_value ) || empty( $individual_property_definition['path'] ) ) {
-			return array();
-		}
-
-		/*
-		 * The first item in $individual_property_definition['path'] array tells us the style property, e.g., "border".
-		 * We use this to get a corresponding CSS style definition such as "color" or "width" from the same group.
-		 * The second item in $individual_property_definition['path'] array refers to the individual property marker, e.g., "top".
+		/**
+		 * Style value parser that returns a CSS definition array comprising style properties
+		 * that have keys representing individual style properties, otherwise known as longhand CSS properties.
+		 * e.g., "$style_property-$individual_feature: $value;", which could represent the following:
+		 * "border-{top|right|bottom|left}-{color|width|style}: {value};" or,
+		 * "border-image-{outset|source|width|repeat|slice}: {value};"
+		 *
+		 * @param array $style_value                    A single raw style value from $block_styles array.
+		 * @param array $individual_property_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA representing an individual property of a CSS property, e.g., 'top' in 'border-top'.
+		 * @param array $options                        {
+		 *     Optional. An array of options. Default empty array.
+		 *
+		 *     @type bool $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
+		 * }
+		 *
+		 * @return string[] An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
 		 */
-		$definition_group_key    = $individual_property_definition['path'][0];
-		$individual_property_key = $individual_property_definition['path'][1];
-		$should_skip_css_vars    = isset( $options['convert_vars_to_classnames'] ) && true === $options['convert_vars_to_classnames'];
-		$css_declarations        = array();
-
-		foreach ( $style_value as $css_property => $value ) {
-			if ( empty( $value ) ) {
-				continue;
+		protected static function get_individual_property_css_declarations( $style_value, $individual_property_definition, $options = array() ) {
+			if ( ! is_array( $style_value ) || empty( $style_value ) || empty( $individual_property_definition['path'] ) ) {
+				return array();
 			}
 
-			// Build a path to the individual rules in definitions.
-			$style_definition_path = array( $definition_group_key, $css_property );
-			$style_definition      = _wp_array_get( static::BLOCK_STYLE_DEFINITIONS_METADATA, $style_definition_path, null );
+			/*
+			* The first item in $individual_property_definition['path'] array tells us the style property, e.g., "border".
+			* We use this to get a corresponding CSS style definition such as "color" or "width" from the same group.
+			* The second item in $individual_property_definition['path'] array refers to the individual property marker, e.g., "top".
+			*/
+			$definition_group_key    = $individual_property_definition['path'][0];
+			$individual_property_key = $individual_property_definition['path'][1];
+			$should_skip_css_vars    = isset( $options['convert_vars_to_classnames'] ) && true === $options['convert_vars_to_classnames'];
+			$css_declarations        = array();
+
+			foreach ( $style_value as $css_property => $value ) {
+				if ( empty( $value ) ) {
+					continue;
+				}
 
-			if ( $style_definition && isset( $style_definition['property_keys']['individual'] ) ) {
-				// Set a CSS var if there is a valid preset value.
-				if ( is_string( $value ) && str_contains( $value, 'var:' ) && ! $should_skip_css_vars && ! empty( $individual_property_definition['css_vars'] ) ) {
-					$value = static::get_css_var_value( $value, $individual_property_definition['css_vars'] );
+				// Build a path to the individual rules in definitions.
+				$style_definition_path = array( $definition_group_key, $css_property );
+				$style_definition      = _wp_array_get( static::BLOCK_STYLE_DEFINITIONS_METADATA, $style_definition_path, null );
+
+				if ( $style_definition && isset( $style_definition['property_keys']['individual'] ) ) {
+					// Set a CSS var if there is a valid preset value.
+					if ( is_string( $value ) && str_contains( $value, 'var:' ) && ! $should_skip_css_vars && ! empty( $individual_property_definition['css_vars'] ) ) {
+						$value = static::get_css_var_value( $value, $individual_property_definition['css_vars'] );
+					}
+					$individual_css_property                      = sprintf( $style_definition['property_keys']['individual'], $individual_property_key );
+					$css_declarations[ $individual_css_property ] = $value;
 				}
-				$individual_css_property                      = sprintf( $style_definition['property_keys']['individual'], $individual_property_key );
-				$css_declarations[ $individual_css_property ] = $value;
 			}
+			return $css_declarations;
 		}
-		return $css_declarations;
-	}
 
-	/**
-	 * Style value parser that constructs a CSS definition array comprising a single CSS property and value.
-	 * If the provided value is an array containing a `url` property, the function will return a CSS definition array
-	 * with a single property and value, with `url` escaped and injected into a CSS `url()` function,
-	 * e.g., array( 'background-image' => "url( '...' )" ).
-	 *
-	 * @param array $style_value      A single raw style value from $block_styles array.
-	 * @param array $style_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA.
-	 *
-	 * @return string[] An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
-	 */
-	protected static function get_url_or_value_css_declaration( $style_value, $style_definition ) {
-		if ( empty( $style_value ) ) {
-			return array();
-		}
+		/**
+		 * Style value parser that constructs a CSS definition array comprising a single CSS property and value.
+		 * If the provided value is an array containing a `url` property, the function will return a CSS definition array
+		 * with a single property and value, with `url` escaped and injected into a CSS `url()` function,
+		 * e.g., array( 'background-image' => "url( '...' )" ).
+		 *
+		 * @param array $style_value      A single raw style value from $block_styles array.
+		 * @param array $style_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA.
+		 *
+		 * @return string[] An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+		 */
+		protected static function get_url_or_value_css_declaration( $style_value, $style_definition ) {
+			if ( empty( $style_value ) ) {
+				return array();
+			}
 
-		$css_declarations = array();
+			$css_declarations = array();
 
-		if ( isset( $style_definition['property_keys']['default'] ) ) {
-			$value = null;
+			if ( isset( $style_definition['property_keys']['default'] ) ) {
+				$value = null;
 
-			if ( ! empty( $style_value['url'] ) ) {
-				$value = "url('" . $style_value['url'] . "')";
-			} elseif ( is_string( $style_value ) ) {
-				$value = $style_value;
-			}
+				if ( ! empty( $style_value['url'] ) ) {
+					$value = "url('" . $style_value['url'] . "')";
+				} elseif ( is_string( $style_value ) ) {
+					$value = $style_value;
+				}
 
-			if ( null !== $value ) {
-				$css_declarations[ $style_definition['property_keys']['default'] ] = $value;
+				if ( null !== $value ) {
+					$css_declarations[ $style_definition['property_keys']['default'] ] = $value;
+				}
 			}
+
+			return $css_declarations;
 		}
 
-		return $css_declarations;
-	}
+		/**
+		 * Returns compiled CSS from css_declarations.
+		 *
+		 * @param string[] $css_declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+		 * @param string   $css_selector     When a selector is passed, the function will return a full CSS rule `$selector { ...rules }`, otherwise a concatenated string of properties and values.
+		 *
+		 * @return string A compiled CSS string.
+		 */
+		public static function compile_css( $css_declarations, $css_selector ) {
+			if ( empty( $css_declarations ) || ! is_array( $css_declarations ) ) {
+				return '';
+			}
 
-	/**
-	 * Returns compiled CSS from css_declarations.
-	 *
-	 * @param string[] $css_declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
-	 * @param string   $css_selector     When a selector is passed, the function will return a full CSS rule `$selector { ...rules }`, otherwise a concatenated string of properties and values.
-	 *
-	 * @return string A compiled CSS string.
-	 */
-	public static function compile_css( $css_declarations, $css_selector ) {
-		if ( empty( $css_declarations ) || ! is_array( $css_declarations ) ) {
-			return '';
-		}
+			// Return an entire rule if there is a selector.
+			if ( $css_selector ) {
+				$css_rule = new WP_Style_Engine_CSS_Rule( $css_selector, $css_declarations );
+				return $css_rule->get_css();
+			}
 
-		// Return an entire rule if there is a selector.
-		if ( $css_selector ) {
-			$css_rule = new WP_Style_Engine_CSS_Rule( $css_selector, $css_declarations );
-			return $css_rule->get_css();
+			$css_declarations = new WP_Style_Engine_CSS_Declarations( $css_declarations );
+			return $css_declarations->get_declarations_string();
 		}
 
-		$css_declarations = new WP_Style_Engine_CSS_Declarations( $css_declarations );
-		return $css_declarations->get_declarations_string();
-	}
-
-	/**
-	 * Returns a compiled stylesheet from stored CSS rules.
-	 *
-	 * @param WP_Style_Engine_CSS_Rule[] $css_rules An array of WP_Style_Engine_CSS_Rule objects from a store or otherwise.
-	 * @param array                      $options   {
-	 *     Optional. An array of options. Default empty array.
-	 *
-	 *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
-	 *     @type bool $prettify Whether to add new lines and indents to output. Default is the test of whether the global constant `SCRIPT_DEBUG` is defined.
-	 * }
-	 *
-	 * @return string A compiled stylesheet from stored CSS rules.
-	 */
-	public static function compile_stylesheet_from_css_rules( $css_rules, $options = array() ) {
-		$processor = new WP_Style_Engine_Processor();
-		$processor->add_rules( $css_rules );
-		return $processor->get_css( $options );
+		/**
+		 * Returns a compiled stylesheet from stored CSS rules.
+		 *
+		 * @param WP_Style_Engine_CSS_Rule[] $css_rules An array of WP_Style_Engine_CSS_Rule objects from a store or otherwise.
+		 * @param array                      $options   {
+		 *     Optional. An array of options. Default empty array.
+		 *
+		 *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
+		 *     @type bool $prettify Whether to add new lines and indents to output. Default is the test of whether the global constant `SCRIPT_DEBUG` is defined.
+		 * }
+		 *
+		 * @return string A compiled stylesheet from stored CSS rules.
+		 */
+		public static function compile_stylesheet_from_css_rules( $css_rules, $options = array() ) {
+			$processor = new WP_Style_Engine_Processor();
+			$processor->add_rules( $css_rules );
+			return $processor->get_css( $options );
+		}
 	}
 }
diff --git a/packages/style-engine/docs/using-the-style-engine-with-block-supports.md b/packages/style-engine/docs/using-the-style-engine-with-block-supports.md
index 42350a17ffcd6d..27d80df189cf3d 100644
--- a/packages/style-engine/docs/using-the-style-engine-with-block-supports.md
+++ b/packages/style-engine/docs/using-the-style-engine-with-block-supports.md
@@ -231,4 +231,4 @@ array(
 */
 ```
 
-Read more about [global styles](https://developer.wordpress.org/block-editor/explanations/architecture/styles/#global-styles) and [preset CSS custom properties](https://developer.wordpress.org/block-editor/how-to-guides/themes/theme-json/#css-custom-properties-presets-custom) and [theme supports](https://developer.wordpress.org/block-editor/how-to-guides/themes/theme-support/).
+Read more about [global styles](https://developer.wordpress.org/block-editor/explanations/architecture/styles/#global-styles) and [preset CSS custom properties](https://developer.wordpress.org/block-editor/how-to-guides/themes/global-settings-and-styles.md#css-custom-properties-presets-custom) and [theme supports](https://developer.wordpress.org/block-editor/how-to-guides/themes/theme-support/).
diff --git a/packages/style-engine/package.json b/packages/style-engine/package.json
index f6c1aa2c0c2bae..ed6eebf9483d17 100644
--- a/packages/style-engine/package.json
+++ b/packages/style-engine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/style-engine",
-	"version": "1.30.0",
+	"version": "2.10.0",
 	"description": "A suite of parsers and compilers for WordPress styles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -29,10 +30,11 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"change-case": "^4.1.2"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/style-engine/src/index.ts b/packages/style-engine/src/index.ts
index fe5b9929877be7..102d5842e7a0be 100644
--- a/packages/style-engine/src/index.ts
+++ b/packages/style-engine/src/index.ts
@@ -91,3 +91,6 @@ export function getCSSRules(
 
 	return rules;
 }
+
+// Export style utils.
+export { getCSSValueFromRawStyle } from './styles/utils';
diff --git a/packages/style-engine/src/styles/background/index.ts b/packages/style-engine/src/styles/background/index.ts
index 899a3b5b8f0f4c..b943032f9c4417 100644
--- a/packages/style-engine/src/styles/background/index.ts
+++ b/packages/style-engine/src/styles/background/index.ts
@@ -1,43 +1,93 @@
 /**
  * Internal dependencies
  */
-import type { GeneratedCSSRule, Style, StyleOptions } from '../../types';
-import { safeDecodeURI } from '../utils';
+import type { Style, StyleOptions } from '../../types';
+import { generateRule, safeDecodeURI } from '../utils';
 
 const backgroundImage = {
 	name: 'backgroundImage',
 	generate: ( style: Style, options: StyleOptions ) => {
 		const _backgroundImage = style?.background?.backgroundImage;
-		const _backgroundSize = style?.background?.backgroundSize;
 
-		const styleRules: GeneratedCSSRule[] = [];
-
-		if ( ! _backgroundImage ) {
-			return styleRules;
+		/*
+		 * The background image can be a string or an object.
+		 * If the background image is a string, it could already contain a url() function,
+		 * or have a linear-gradient value.
+		 */
+		if ( typeof _backgroundImage === 'object' && _backgroundImage?.url ) {
+			return [
+				{
+					selector: options.selector,
+					key: 'backgroundImage',
+					// Passed `url` may already be encoded. To prevent double encoding, decodeURI is executed to revert to the original string.
+					value: `url( '${ encodeURI(
+						safeDecodeURI( _backgroundImage.url )
+					) }' )`,
+				},
+			];
 		}
 
-		if ( _backgroundImage?.source === 'file' && _backgroundImage?.url ) {
-			styleRules.push( {
-				selector: options.selector,
-				key: 'backgroundImage',
-				// Passed `url` may already be encoded. To prevent double encoding, decodeURI is executed to revert to the original string.
-				value: `url( '${ encodeURI(
-					safeDecodeURI( _backgroundImage.url )
-				) }' )`,
-			} );
-		}
+		return generateRule(
+			style,
+			options,
+			[ 'background', 'backgroundImage' ],
+			'backgroundImage'
+		);
+	},
+};
 
-		// If no background size is set, but an image is, default to cover.
-		if ( ! _backgroundSize ) {
-			styleRules.push( {
-				selector: options.selector,
-				key: 'backgroundSize',
-				value: 'cover',
-			} );
-		}
+const backgroundPosition = {
+	name: 'backgroundPosition',
+	generate: ( style: Style, options: StyleOptions ) => {
+		return generateRule(
+			style,
+			options,
+			[ 'background', 'backgroundPosition' ],
+			'backgroundPosition'
+		);
+	},
+};
 
-		return styleRules;
+const backgroundRepeat = {
+	name: 'backgroundRepeat',
+	generate: ( style: Style, options: StyleOptions ) => {
+		return generateRule(
+			style,
+			options,
+			[ 'background', 'backgroundRepeat' ],
+			'backgroundRepeat'
+		);
+	},
+};
+
+const backgroundSize = {
+	name: 'backgroundSize',
+	generate: ( style: Style, options: StyleOptions ) => {
+		return generateRule(
+			style,
+			options,
+			[ 'background', 'backgroundSize' ],
+			'backgroundSize'
+		);
+	},
+};
+
+const backgroundAttachment = {
+	name: 'backgroundAttachment',
+	generate: ( style: Style, options: StyleOptions ) => {
+		return generateRule(
+			style,
+			options,
+			[ 'background', 'backgroundAttachment' ],
+			'backgroundAttachment'
+		);
 	},
 };
 
-export default [ backgroundImage ];
+export default [
+	backgroundImage,
+	backgroundPosition,
+	backgroundRepeat,
+	backgroundSize,
+	backgroundAttachment,
+];
diff --git a/packages/style-engine/src/styles/dimensions/index.ts b/packages/style-engine/src/styles/dimensions/index.ts
index df3568f7799133..4ffb33e65686d6 100644
--- a/packages/style-engine/src/styles/dimensions/index.ts
+++ b/packages/style-engine/src/styles/dimensions/index.ts
@@ -16,4 +16,16 @@ const minHeight = {
 	},
 };
 
-export default [ minHeight ];
+const aspectRatio = {
+	name: 'aspectRatio',
+	generate: ( style: Style, options: StyleOptions ) => {
+		return generateRule(
+			style,
+			options,
+			[ 'dimensions', 'aspectRatio' ],
+			'aspectRatio'
+		);
+	},
+};
+
+export default [ minHeight, aspectRatio ];
diff --git a/packages/style-engine/src/styles/test/utils.js b/packages/style-engine/src/styles/test/utils.js
new file mode 100644
index 00000000000000..02f0adf494e71f
--- /dev/null
+++ b/packages/style-engine/src/styles/test/utils.js
@@ -0,0 +1,54 @@
+/**
+ * Internal dependencies
+ */
+import { camelCaseJoin, getCSSValueFromRawStyle, upperFirst } from '../utils';
+
+describe( 'utils', () => {
+	describe( 'upperFirst()', () => {
+		it( 'should return an string with a capitalized first letter', () => {
+			expect( upperFirst( 'toontown' ) ).toEqual( 'Toontown' );
+		} );
+	} );
+
+	describe( 'camelCaseJoin()', () => {
+		it( 'should return a camelCase string', () => {
+			expect( camelCaseJoin( [ 'toon', 'town' ] ) ).toEqual( 'toonTown' );
+		} );
+	} );
+
+	describe( 'getCSSValueFromRawStyle()', () => {
+		it.each( [
+			[ 'min(40%, 400px)', 'min(40%, 400px)' ],
+			[
+				'var(--wp--preset--color--yellow-bun)',
+				'var:preset|color|yellow-bun',
+			],
+			[ 'var(--wp--preset--font-size--h-1)', 'var:preset|font-size|h1' ],
+			[
+				'var(--wp--preset--font-size--1-px)',
+				'var:preset|font-size|1px',
+			],
+			[
+				'var(--wp--preset--color--orange-11-orange)',
+				'var:preset|color|orange11orange',
+			],
+			[
+				'var(--wp--preset--color--heavenly-blue)',
+				'var:preset|color|heavenlyBlue',
+			],
+			[
+				'var(--wp--preset--background--dark-secrets-100)',
+				'var:preset|background|dark_Secrets_100',
+			],
+			[ null, null ],
+			[ false, false ],
+			[ 1000, 1000 ],
+			[ undefined, undefined ],
+		] )(
+			'should return %s using an incoming value of %s',
+			( expected, value ) => {
+				expect( getCSSValueFromRawStyle( value ) ).toEqual( expected );
+			}
+		);
+	} );
+} );
diff --git a/packages/style-engine/src/styles/utils.ts b/packages/style-engine/src/styles/utils.ts
index 00e9dab8b5892b..74a18d2c2a6e45 100644
--- a/packages/style-engine/src/styles/utils.ts
+++ b/packages/style-engine/src/styles/utils.ts
@@ -61,7 +61,7 @@ export function generateRule(
 				{
 					selector: options?.selector,
 					key: ruleKey,
-					value: getCSSVarFromStyleValue( styleValue ),
+					value: getCSSValueFromRawStyle( styleValue ),
 				},
 		  ]
 		: [];
@@ -103,7 +103,7 @@ export function generateBoxRules(
 	} else {
 		const sideRules = individualProperties.reduce(
 			( acc: GeneratedCSSRule[], side: string ) => {
-				const value: string | undefined = getCSSVarFromStyleValue(
+				const value = getCSSValueFromRawStyle(
 					getStyleValueByPath( boxStyle, [ side ] )
 				);
 				if ( value ) {
@@ -127,13 +127,23 @@ export function generateBoxRules(
 }
 
 /**
- * Returns a CSS var value from incoming style value following the pattern `var:description|context|slug`.
+ * Returns a WordPress CSS custom var value from incoming style preset value,
+ * if one is detected.
  *
- * @param styleValue A raw style value.
+ * The preset value is a string and follows the pattern `var:description|context|slug`.
  *
- * @return string A CSS var value.
+ * Example:
+ *
+ * `getCSSValueFromRawStyle( 'var:preset|color|heavenlyBlue' )` // returns 'var(--wp--preset--color--heavenly-blue)'
+ *
+ * @param styleValue A string representing a raw CSS value. Non-strings won't be processed.
+ *
+ * @return A CSS custom var value if the incoming style value is a preset value.
  */
-export function getCSSVarFromStyleValue( styleValue: string ): string {
+
+export function getCSSValueFromRawStyle< StyleValue = string >(
+	styleValue: StyleValue
+): StyleValue {
 	if (
 		typeof styleValue === 'string' &&
 		styleValue.startsWith( VARIABLE_REFERENCE_PREFIX )
@@ -152,7 +162,7 @@ export function getCSSVarFromStyleValue( styleValue: string ): string {
 				} )
 			)
 			.join( VARIABLE_PATH_SEPARATOR_TOKEN_STYLE );
-		return `var(--wp--${ variable })`;
+		return `var(--wp--${ variable })` as StyleValue;
 	}
 	return styleValue;
 }
diff --git a/packages/style-engine/src/test/index.js b/packages/style-engine/src/test/index.js
index fac55b4000e58f..f7960e19187a21 100644
--- a/packages/style-engine/src/test/index.js
+++ b/packages/style-engine/src/test/index.js
@@ -224,6 +224,15 @@ describe( 'getCSSRules', () => {
 		expect(
 			getCSSRules(
 				{
+					background: {
+						backgroundImage: {
+							url: 'https://example.com/image.jpg',
+						},
+						backgroundPosition: '50% 50%',
+						backgroundRepeat: 'no-repeat',
+						backgroundSize: '300px',
+						backgroundAttachment: 'fixed',
+					},
 					color: {
 						text: '#dddddd',
 						background: '#555555',
@@ -371,6 +380,31 @@ describe( 'getCSSRules', () => {
 				key: 'boxShadow',
 				value: '10px 10px red',
 			},
+			{
+				selector: '.some-selector',
+				key: 'backgroundImage',
+				value: "url( 'https://example.com/image.jpg' )",
+			},
+			{
+				selector: '.some-selector',
+				key: 'backgroundPosition',
+				value: '50% 50%',
+			},
+			{
+				selector: '.some-selector',
+				key: 'backgroundRepeat',
+				value: 'no-repeat',
+			},
+			{
+				selector: '.some-selector',
+				key: 'backgroundSize',
+				value: '300px',
+			},
+			{
+				selector: '.some-selector',
+				key: 'backgroundAttachment',
+				value: 'fixed',
+			},
 		] );
 	} );
 
@@ -400,4 +434,26 @@ describe( 'getCSSRules', () => {
 			},
 		] );
 	} );
+
+	it( 'should output background image value when that value is a string', () => {
+		expect(
+			getCSSRules(
+				{
+					background: {
+						backgroundImage:
+							"linear-gradient(to bottom,rgb(255 255 0 / 50%),rgb(0 0 255 / 50%), url('https://example.com/image.jpg')",
+					},
+				},
+				{
+					selector: '.some-selector',
+				}
+			)
+		).toEqual( [
+			{
+				selector: '.some-selector',
+				key: 'backgroundImage',
+				value: "linear-gradient(to bottom,rgb(255 255 0 / 50%),rgb(0 0 255 / 50%), url('https://example.com/image.jpg')",
+			},
+		] );
+	} );
 } );
diff --git a/packages/style-engine/src/test/utils.js b/packages/style-engine/src/test/utils.js
deleted file mode 100644
index 9f1f84d2b45310..00000000000000
--- a/packages/style-engine/src/test/utils.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Internal dependencies
- */
-import {
-	camelCaseJoin,
-	getCSSVarFromStyleValue,
-	upperFirst,
-} from '../styles/utils';
-
-describe( 'utils', () => {
-	describe( 'upperFirst()', () => {
-		it( 'should return an string with a capitalized first letter', () => {
-			expect( upperFirst( 'toontown' ) ).toEqual( 'Toontown' );
-		} );
-	} );
-
-	describe( 'camelCaseJoin()', () => {
-		it( 'should return a camelCase string', () => {
-			expect( camelCaseJoin( [ 'toon', 'town' ] ) ).toEqual( 'toonTown' );
-		} );
-	} );
-
-	describe( 'getCSSVarFromStyleValue()', () => {
-		it( 'should return a compiled CSS var', () => {
-			expect(
-				getCSSVarFromStyleValue( 'var:preset|color|yellow-bun' )
-			).toEqual( 'var(--wp--preset--color--yellow-bun)' );
-		} );
-
-		it( 'should kebab case numbers', () => {
-			expect(
-				getCSSVarFromStyleValue( 'var:preset|font-size|h1' )
-			).toEqual( 'var(--wp--preset--font-size--h-1)' );
-		} );
-
-		it( 'should kebab case numbers as prefix', () => {
-			expect(
-				getCSSVarFromStyleValue( 'var:preset|font-size|1px' )
-			).toEqual( 'var(--wp--preset--font-size--1-px)' );
-		} );
-
-		it( 'should kebab case both sides of numbers', () => {
-			expect(
-				getCSSVarFromStyleValue( 'var:preset|color|orange11orange' )
-			).toEqual( 'var(--wp--preset--color--orange-11-orange)' );
-		} );
-
-		it( 'should kebab case camel case', () => {
-			expect(
-				getCSSVarFromStyleValue( 'var:preset|color|heavenlyBlue' )
-			).toEqual( 'var(--wp--preset--color--heavenly-blue)' );
-		} );
-
-		it( 'should kebab case underscores', () => {
-			expect(
-				getCSSVarFromStyleValue(
-					'var:preset|background|dark_Secrets_100'
-				)
-			).toEqual( 'var(--wp--preset--background--dark-secrets-100)' );
-		} );
-	} );
-} );
diff --git a/packages/style-engine/src/types.ts b/packages/style-engine/src/types.ts
index f09f2c213eabb9..8de623fcfcb2bf 100644
--- a/packages/style-engine/src/types.ts
+++ b/packages/style-engine/src/types.ts
@@ -22,10 +22,11 @@ export interface BorderIndividualStyles< T extends BoxEdge > {
 
 export interface Style {
 	background?: {
-		backgroundImage: {
-			url?: CSSProperties[ 'backgroundImage' ];
-			source?: string;
-		};
+		backgroundImage?:
+			| { url?: CSSProperties[ 'backgroundImage' ]; source?: string }
+			| CSSProperties[ 'backgroundImage' ];
+		backgroundPosition?: CSSProperties[ 'backgroundPosition' ];
+		backgroundRepeat?: CSSProperties[ 'backgroundRepeat' ];
 		backgroundSize?: CSSProperties[ 'backgroundSize' ];
 	};
 	border?: {
@@ -46,6 +47,7 @@ export interface Style {
 		left?: BorderIndividualStyles< 'left' >;
 	};
 	dimensions?: {
+		aspectRatio?: CSSProperties[ 'aspectRatio' ];
 		minHeight?: CSSProperties[ 'minHeight' ];
 	};
 	spacing?: {
@@ -92,7 +94,7 @@ export interface StyleOptions {
 
 export interface GeneratedCSSRule {
 	selector?: string;
-	value: string;
+	value: string | unknown;
 	/**
 	 * The CSS key in JS style attribute format, compatible with React.
 	 * E.g. `paddingTop` instead of `padding-top`.
diff --git a/packages/style-engine/style-engine.php b/packages/style-engine/style-engine.php
index 4571a2fcce4ffe..74df1b1040f6c7 100644
--- a/packages/style-engine/style-engine.php
+++ b/packages/style-engine/style-engine.php
@@ -83,6 +83,7 @@ function wp_style_engine_get_styles( $block_styles, $options = array() ) {
  *     Required. A collection of CSS rules.
  *
  *     @type array ...$0 {
+ *         @type string   $rules_group  A parent CSS selector in the case of nested CSS, or a CSS nested @rule, such as `@media (min-width: 80rem)` or `@layer module`.
  *         @type string   $selector     A CSS selector.
  *         @type string[] $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
  *     }
@@ -116,11 +117,12 @@ function wp_style_engine_get_stylesheet_from_css_rules( $css_rules, $options = a
 			continue;
 		}
 
+		$rules_group = $css_rule['rules_group'] ?? null;
 		if ( ! empty( $options['context'] ) ) {
-			WP_Style_Engine::store_css_rule( $options['context'], $css_rule['selector'], $css_rule['declarations'] );
+			WP_Style_Engine::store_css_rule( $options['context'], $css_rule['selector'], $css_rule['declarations'], $rules_group );
 		}
 
-		$css_rule_objects[] = new WP_Style_Engine_CSS_Rule( $css_rule['selector'], $css_rule['declarations'] );
+		$css_rule_objects[] = new WP_Style_Engine_CSS_Rule( $css_rule['selector'], $css_rule['declarations'], $rules_group );
 	}
 
 	if ( empty( $css_rule_objects ) ) {
diff --git a/packages/style-engine/tsconfig.json b/packages/style-engine/tsconfig.json
index 3c2c31f506f132..6e33d8ff82d47e 100644
--- a/packages/style-engine/tsconfig.json
+++ b/packages/style-engine/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/stylelint-config/.npmrc b/packages/stylelint-config/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/stylelint-config/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/stylelint-config/CHANGELOG.md b/packages/stylelint-config/CHANGELOG.md
index 7bbe9a2da0592e..9d263fee2648f7 100644
--- a/packages/stylelint-config/CHANGELOG.md
+++ b/packages/stylelint-config/CHANGELOG.md
@@ -2,6 +2,68 @@
 
 ## Unreleased
 
+## 23.2.0 (2024-10-16)
+
+## 23.1.0 (2024-10-03)
+
+## 23.0.0 (2024-09-19)
+
+### Breaking Changes
+
+-   Updated `stylelint` peer dependency requirement to `^16.8.2` ([#64828](https://github.com/WordPress/gutenberg/pull/64828)).
+-   Updated `stylelint-config-recommended` to `^14.0.1` and disabled new rules ([#64828](https://github.com/WordPress/gutenberg/pull/64828)).
+-   Updated `stylelint-config-recommended-scss` to `^14.1.0` and disabled new rules ([#64828](https://github.com/WordPress/gutenberg/pull/64828)).
+-   Added `@stylistic/stylelint-plugin` dependency at `^3.0.1` ([#64828](https://github.com/WordPress/gutenberg/pull/64828)).
+-   Migrated stylelint's deprecated rules from v15 to use `@stylistic/stylelint-plugin` ([#64828](https://github.com/WordPress/gutenberg/pull/64828)). For more information, see the [stylelint migration guide](https://stylelint.io/migration-guide/to-15). To migrate your rule overrides, you just need to add `@stylistic/` in front of the rule names.
+-   Created new `stylistic` and `scss-stylistic` configs ([#64828](https://github.com/WordPress/gutenberg/pull/64828)). If you want to continue using the exact same rule set as before, you should use these, however if you currently use something like `stylelint-config-prettier` to disable formatting rules, you will want to use the non-stylistic configs (using the same names as before).
+-   `scss/at-import-partial-extension` has been renamed ([#64828](https://github.com/WordPress/gutenberg/pull/64828)). You must convert this rule to `scss/load-partial-extension` instead (name only change).
+
+### Bug Fixes
+
+-   Fixes `declaration-block-no-duplicate-properties` in the `scss` config to use the same value as the base config ([#64828](https://github.com/WordPress/gutenberg/pull/64828)).
+
+## 22.7.0 (2024-09-05)
+
+## 22.6.0 (2024-08-21)
+
+## 22.5.0 (2024-08-07)
+
+## 22.4.0 (2024-07-24)
+
+## 22.3.0 (2024-07-10)
+
+## 22.2.0 (2024-06-26)
+
+## 22.1.0 (2024-06-15)
+
+## 22.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 21.41.0 (2024-05-16)
+
+## 21.40.0 (2024-05-02)
+
+## 21.39.0 (2024-04-19)
+
+## 21.38.0 (2024-04-03)
+
+## 21.37.0 (2024-03-21)
+
+## 21.36.0 (2024-03-06)
+
+## 21.35.0 (2024-02-21)
+
+## 21.34.0 (2024-02-09)
+
+## 21.33.0 (2024-01-24)
+
+## 21.32.0 (2024-01-10)
+
+## 21.31.0 (2023-12-13)
+
 ## 21.30.0 (2023-11-29)
 
 ## 21.29.0 (2023-11-16)
@@ -64,19 +126,19 @@
 
 ## 21.0.0 (2022-08-24)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
 
 ## 20.0.0 (2022-01-27)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increased minimum peer dependency of `stylelint` to `14.2.0` ([#38091](https://github.com/WordPress/gutenberg/pull/38091)). See [official migration guide to v14](https://github.com/stylelint/stylelint/blob/14.0.0/docs/migration-guide/to-14.md) for details.
 
 ## 19.0.0 (2021-01-21)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 12 ([#27934](https://github.com/WordPress/gutenberg/pull/27934)).
 -   Increased minimum peer dependency of `stylelint` to `13.7.0`.
@@ -87,7 +149,7 @@
 
 ## 18.0.0 (2021-01-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Increase the minimum Node.js version to 12 ([#27934](https://github.com/WordPress/gutenberg/pull/27934)).
 
diff --git a/packages/stylelint-config/README.md b/packages/stylelint-config/README.md
index 0e52e5ef190a42..5d760dddc8f920 100644
--- a/packages/stylelint-config/README.md
+++ b/packages/stylelint-config/README.md
@@ -8,7 +8,7 @@
 $ npm install @wordpress/stylelint-config --save-dev
 ```
 
-**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js version with long-term support status (check [Active LTS or Maintenance LTS releases](https://nodejs.org/en/about/previous-releases)). It is not compatible with older versions.
 
 ## Usage
 
@@ -30,16 +30,38 @@ If you've globally installed `@wordpress/stylelint-config` using the `-g` flag,
 
 ## Presets
 
-In addition to the default preset, there is also a SCSS preset. This preset extends both `@wordpress/stylelint-config` and [`stylelint-config-recommended-scss`](https://github.com/kristerkari/stylelint-config-recommended-scss).
+In addition to the default preset, there is also a SCSS preset and 2 stylistic variant presets.
 
 ### SCSS
 
+This preset extends both `@wordpress/stylelint-config` and [`stylelint-config-recommended-scss`](https://github.com/kristerkari/stylelint-config-recommended-scss).
+
 ```json
 {
 	"extends": [ "@wordpress/stylelint-config/scss" ]
 }
 ```
 
+### Stylistic
+
+This preset extends `@wordpress/stylelint-config` and adds stylistic rules such as `indentation`.
+
+```json
+{
+	"extends": [ "@wordpress/stylelint-config/stylistic" ]
+}
+```
+
+### SCSS Stylistic
+
+This preset extends`@wordpress/stylelint-config`, `@wordpress/stylelint-config/stylistic` and `@wordpress/stylelint-config/scss`, and adapts some stylistic rules for SCSS.
+
+```json
+{
+	"extends": [ "@wordpress/stylelint-config/scss-stylistic" ]
+}
+```
+
 ## Extending the config
 
 Simply add a `"rules"` key to your config and add your overrides there.
@@ -48,10 +70,10 @@ For example, to change the `indentation` to four spaces and turn off the `number
 
 ```json
 {
-	"extends": "@wordpress/stylelint-config",
+	"extends": "@wordpress/stylelint-config/stylistic",
 	"rules": {
-		"indentation": 4,
-		"number-leading-zero": null
+		"@stylistic/indentation": 4,
+		"@stylistic/number-leading-zero": null
 	}
 }
 ```
diff --git a/packages/stylelint-config/index.js b/packages/stylelint-config/index.js
index 0ab4f954cb35bf..3e5e00b05a2a49 100644
--- a/packages/stylelint-config/index.js
+++ b/packages/stylelint-config/index.js
@@ -1,7 +1,8 @@
 'use strict';
 
+/** @type {import('stylelint').Config} */
 module.exports = {
-	extends: 'stylelint-config-recommended',
+	extends: [ 'stylelint-config-recommended' ].map( require.resolve ),
 	rules: {
 		'at-rule-empty-line-before': [
 			'always',
@@ -10,15 +11,7 @@ module.exports = {
 				ignore: [ 'after-comment' ],
 			},
 		],
-		'at-rule-name-case': 'lower',
-		'at-rule-name-space-after': 'always-single-line',
 		'at-rule-no-unknown': true,
-		'at-rule-semicolon-newline-after': 'always',
-		'block-closing-brace-newline-after': 'always',
-		'block-closing-brace-newline-before': 'always',
-		'block-opening-brace-newline-after': 'always',
-		'block-opening-brace-space-before': 'always',
-		'color-hex-case': 'lower',
 		'color-hex-length': 'short',
 		'color-named': 'never',
 		'comment-empty-line-before': [
@@ -27,20 +20,12 @@ module.exports = {
 				ignore: [ 'stylelint-commands' ],
 			},
 		],
-		'declaration-bang-space-after': 'never',
-		'declaration-bang-space-before': 'always',
 		'declaration-block-no-duplicate-properties': [
 			true,
 			{
 				ignore: [ 'consecutive-duplicates' ],
 			},
 		],
-		'declaration-block-semicolon-newline-after': 'always',
-		'declaration-block-semicolon-space-before': 'never',
-		'declaration-block-trailing-semicolon': 'always',
-		'declaration-colon-newline-after': 'always-multi-line',
-		'declaration-colon-space-after': 'always-single-line',
-		'declaration-colon-space-before': 'never',
 		'declaration-property-unit-allowed-list': {
 			'line-height': [ 'px' ],
 		},
@@ -51,51 +36,20 @@ module.exports = {
 				ignore: [ 'relative' ],
 			},
 		],
-		'function-comma-space-after': 'always',
-		'function-comma-space-before': 'never',
-		'function-max-empty-lines': 1,
 		'function-name-case': [
 			'lower',
 			{
 				ignoreFunctions: [ '/^DXImageTransform.Microsoft.*$/' ],
 			},
 		],
-		'function-parentheses-space-inside': 'never',
 		'function-url-quotes': 'never',
-		'function-whitespace-after': 'always',
-		indentation: 'tab',
 		'length-zero-no-unit': true,
-		'max-empty-lines': 2,
-		'max-line-length': [
-			80,
-			{
-				ignore: 'non-comments',
-				ignorePattern: [
-					'/(https?://[0-9,a-z]*.*)|(^description\\:.+)|(^tags\\:.+)/i',
-				],
-			},
-		],
-		'media-feature-colon-space-after': 'always',
-		'media-feature-colon-space-before': 'never',
-		'media-feature-range-operator-space-after': 'always',
-		'media-feature-range-operator-space-before': 'always',
-		'media-query-list-comma-newline-after': 'always-multi-line',
-		'media-query-list-comma-space-after': 'always-single-line',
-		'media-query-list-comma-space-before': 'never',
-		'no-eol-whitespace': true,
-		'no-missing-end-of-source-newline': true,
-		'number-leading-zero': 'always',
-		'number-no-trailing-zeros': true,
-		'property-case': 'lower',
 		'rule-empty-line-before': [
 			'always',
 			{
 				ignore: [ 'after-comment' ],
 			},
 		],
-		'selector-attribute-brackets-space-inside': 'never',
-		'selector-attribute-operator-space-after': 'never',
-		'selector-attribute-operator-space-before': 'never',
 		'selector-attribute-quotes': 'always',
 		'selector-class-pattern': [
 			'^([a-z][a-z0-9]*)(-[a-z0-9]+)*$',
@@ -111,21 +65,15 @@ module.exports = {
 					'Selector should use lowercase and separate words with hyphens (selector-id-pattern)',
 			},
 		],
-		'selector-combinator-space-after': 'always',
-		'selector-combinator-space-before': 'always',
-		'selector-list-comma-newline-after': 'always',
-		'selector-list-comma-space-before': 'never',
-		'selector-max-empty-lines': 0,
-		'selector-pseudo-class-case': 'lower',
-		'selector-pseudo-class-parentheses-space-inside': 'never',
-		'selector-pseudo-element-case': 'lower',
 		'selector-pseudo-element-colon-notation': 'double',
 		'selector-type-case': 'lower',
-		'string-quotes': 'double',
-		'unit-case': 'lower',
 		'value-keyword-case': 'lower',
-		'value-list-comma-newline-after': 'always-multi-line',
-		'value-list-comma-space-after': 'always-single-line',
-		'value-list-comma-space-before': 'never',
+
+		/* Disable new rules from stylelint-config-recommended 7 > 14 */
+		'function-no-unknown': null,
+		'keyframe-block-no-duplicate-selectors': null,
+		'annotation-no-unknown': null,
+		'selector-anb-no-unmatchable': null,
+		'media-query-no-invalid': null,
 	},
 };
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index ddf7f120fb5497..5c213a88519497 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/stylelint-config",
-	"version": "21.30.0",
+	"version": "23.2.0",
 	"description": "stylelint config for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "MIT",
@@ -20,22 +20,26 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=14"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"files": [
 		"CHANGELOG.md",
 		"LICENSE",
 		"README.md",
 		"index.js",
-		"scss.js"
+		"scss.js",
+		"scss-stylistic.js",
+		"stylistic.js"
 	],
 	"main": "index.js",
 	"dependencies": {
-		"stylelint-config-recommended": "^6.0.0",
-		"stylelint-config-recommended-scss": "^5.0.2"
+		"@stylistic/stylelint-plugin": "^3.0.1",
+		"stylelint-config-recommended": "^14.0.1",
+		"stylelint-config-recommended-scss": "^14.1.0"
 	},
 	"peerDependencies": {
-		"stylelint": "^14.2"
+		"stylelint": "^16.8.2"
 	},
 	"npmpackagejsonlint": {
 		"extends": "@wordpress/npm-package-json-lint-config",
diff --git a/packages/stylelint-config/scss-stylistic.js b/packages/stylelint-config/scss-stylistic.js
new file mode 100644
index 00000000000000..5d9bbb50c7b66a
--- /dev/null
+++ b/packages/stylelint-config/scss-stylistic.js
@@ -0,0 +1,16 @@
+'use strict';
+
+/** @type {import('stylelint').Config} */
+module.exports = {
+	extends: [ './stylistic', './scss' ].map( require.resolve ),
+	rules: {
+		'@stylistic/block-opening-brace-space-before': 'always',
+		'@stylistic/block-closing-brace-newline-after': [
+			'always',
+			{
+				ignoreAtRules: [ 'if', 'else' ],
+			},
+		],
+		'@stylistic/at-rule-name-space-after': 'always',
+	},
+};
diff --git a/packages/stylelint-config/scss.js b/packages/stylelint-config/scss.js
index 09940642b218b1..3f0aacce31d5a2 100644
--- a/packages/stylelint-config/scss.js
+++ b/packages/stylelint-config/scss.js
@@ -1,5 +1,6 @@
 'use strict';
 
+/** @type {import('stylelint').Config} */
 module.exports = {
 	extends: [ './', 'stylelint-config-recommended-scss' ].map(
 		require.resolve
@@ -18,19 +19,18 @@ module.exports = {
 			},
 		],
 
-		'block-opening-brace-space-before': 'always',
-		'block-closing-brace-newline-after': [
-			'always',
-			{
-				ignoreAtRules: [ 'if', 'else' ],
-			},
-		],
-		'at-rule-name-space-after': 'always',
 		'scss/at-else-closing-brace-newline-after': 'always-last-in-chain',
 		'scss/at-else-closing-brace-space-after': 'always-intermediate',
 		'scss/at-else-empty-line-before': 'never',
 		'scss/at-if-closing-brace-newline-after': 'always-last-in-chain',
 		'scss/at-if-closing-brace-space-after': 'always-intermediate',
 		'scss/selector-no-redundant-nesting-selector': true,
+		/* This value gets overwritten by stylelint-config-recommended-scss so we need to set it again. */
+		'declaration-block-no-duplicate-properties': [
+			true,
+			{
+				ignore: [ 'consecutive-duplicates' ],
+			},
+		],
 	},
 };
diff --git a/packages/stylelint-config/stylistic.js b/packages/stylelint-config/stylistic.js
new file mode 100644
index 00000000000000..54a1a2ca63dd7a
--- /dev/null
+++ b/packages/stylelint-config/stylistic.js
@@ -0,0 +1,72 @@
+'use strict';
+
+/** @type {import('stylelint').Config} */
+module.exports = {
+	extends: [ './' ].map( require.resolve ),
+	plugins: [ '@stylistic/stylelint-plugin' ],
+	rules: {
+		'@stylistic/at-rule-name-case': 'lower',
+		'@stylistic/at-rule-name-space-after': 'always-single-line',
+		'@stylistic/at-rule-semicolon-newline-after': 'always',
+		'@stylistic/block-closing-brace-newline-after': 'always',
+		'@stylistic/block-closing-brace-newline-before': 'always',
+		'@stylistic/block-opening-brace-newline-after': 'always',
+		'@stylistic/block-opening-brace-space-before': 'always',
+		'@stylistic/color-hex-case': 'lower',
+		'@stylistic/declaration-bang-space-after': 'never',
+		'@stylistic/declaration-bang-space-before': 'always',
+		'@stylistic/declaration-block-semicolon-newline-after': 'always',
+		'@stylistic/declaration-block-semicolon-space-before': 'never',
+		'@stylistic/declaration-block-trailing-semicolon': 'always',
+		'@stylistic/declaration-colon-newline-after': 'always-multi-line',
+		'@stylistic/declaration-colon-space-after': 'always-single-line',
+		'@stylistic/declaration-colon-space-before': 'never',
+		'@stylistic/function-comma-space-after': 'always',
+		'@stylistic/function-comma-space-before': 'never',
+		'@stylistic/function-max-empty-lines': 1,
+		'@stylistic/function-parentheses-space-inside': 'never',
+		'@stylistic/function-whitespace-after': 'always',
+		'@stylistic/indentation': 'tab',
+		'@stylistic/max-empty-lines': 2,
+		'@stylistic/max-line-length': [
+			80,
+			{
+				ignore: 'non-comments',
+				ignorePattern: [
+					'/(https?://[0-9,a-z]*.*)|(^description\\:.+)|(^tags\\:.+)/i',
+				],
+			},
+		],
+		'@stylistic/media-feature-colon-space-after': 'always',
+		'@stylistic/media-feature-colon-space-before': 'never',
+		'@stylistic/media-feature-range-operator-space-after': 'always',
+		'@stylistic/media-feature-range-operator-space-before': 'always',
+		'@stylistic/media-query-list-comma-newline-after': 'always-multi-line',
+		'@stylistic/media-query-list-comma-space-after': 'always-single-line',
+		'@stylistic/media-query-list-comma-space-before': 'never',
+		'@stylistic/no-eol-whitespace': true,
+		'@stylistic/no-missing-end-of-source-newline': true,
+		'@stylistic/number-leading-zero': 'always',
+		'@stylistic/number-no-trailing-zeros': true,
+		'@stylistic/property-case': 'lower',
+		'@stylistic/selector-attribute-brackets-space-inside': 'never',
+		'@stylistic/selector-attribute-operator-space-after': 'never',
+		'@stylistic/selector-attribute-operator-space-before': 'never',
+		'@stylistic/selector-combinator-space-after': 'always',
+		'@stylistic/selector-combinator-space-before': 'always',
+		'@stylistic/selector-list-comma-newline-after': 'always',
+		'@stylistic/selector-list-comma-space-before': 'never',
+		'@stylistic/selector-max-empty-lines': 0,
+		'@stylistic/selector-pseudo-class-case': 'lower',
+		'@stylistic/selector-pseudo-class-parentheses-space-inside': 'never',
+		'@stylistic/selector-pseudo-element-case': 'lower',
+		'@stylistic/string-quotes': 'double',
+		'@stylistic/unit-case': 'lower',
+		'@stylistic/value-list-comma-newline-after': 'always-multi-line',
+		'@stylistic/value-list-comma-space-after': 'always-single-line',
+		'@stylistic/value-list-comma-space-before': 'never',
+
+		/* Add back deprecated rule from stylelint-config-recommended */
+		'@stylistic/no-extra-semicolons': true,
+	},
+};
diff --git a/packages/stylelint-config/test/.stylelintignore b/packages/stylelint-config/test/.stylelintignore
new file mode 100644
index 00000000000000..f74c877ecba44c
--- /dev/null
+++ b/packages/stylelint-config/test/.stylelintignore
@@ -0,0 +1 @@
+# This file needs to exist so test files have a way to unignore the files in this folder.
diff --git a/packages/stylelint-config/test/.stylelintrc.json b/packages/stylelint-config/test/.stylelintrc.json
index 1ea6c83527d288..059284930a130c 100644
--- a/packages/stylelint-config/test/.stylelintrc.json
+++ b/packages/stylelint-config/test/.stylelintrc.json
@@ -1,4 +1,13 @@
 {
-	"extends": "@wordpress/stylelint-config/scss",
-	"ignoreFiles": [ "*-invalid.scss" ]
+	"extends": "./.stylelintrc.tests.json",
+	"overrides": [
+		{
+			"files": [ "*.scss", "**/*.scss" ],
+			"ignoreFiles": [ "*-invalid.scss" ]
+		},
+		{
+			"files": [ "*.css", "**/*.css" ],
+			"ignoreFiles": [ "*-invalid.css" ]
+		}
+	]
 }
diff --git a/packages/stylelint-config/test/.stylelintrc.tests.json b/packages/stylelint-config/test/.stylelintrc.tests.json
new file mode 100644
index 00000000000000..c80288c8dc8bb7
--- /dev/null
+++ b/packages/stylelint-config/test/.stylelintrc.tests.json
@@ -0,0 +1,13 @@
+{
+	"rules": {},
+	"overrides": [
+		{
+			"files": [ "*.scss", "**/*.scss" ],
+			"extends": "@wordpress/stylelint-config/scss-stylistic"
+		},
+		{
+			"files": [ "*.css", "**/*.css" ],
+			"extends": "@wordpress/stylelint-config/stylistic"
+		}
+	]
+}
diff --git a/packages/stylelint-config/test/__snapshots__/commenting.js.snap b/packages/stylelint-config/test/__snapshots__/commenting.js.snap
index 4eaddcac0148c5..ab191a80e1e73b 100644
--- a/packages/stylelint-config/test/__snapshots__/commenting.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/commenting.js.snap
@@ -2,8 +2,19 @@
 
 exports[`flags warnings with invalid commenting css snapshot matches warnings 1`] = `
 [
+  {
+    "column": 131,
+    "endColumn": 132,
+    "endLine": 24,
+    "line": 24,
+    "rule": "@stylistic/max-line-length",
+    "severity": "error",
+    "text": "Expected line length to be no more than 80 characters (@stylistic/max-line-length)",
+  },
   {
     "column": 1,
+    "endColumn": 3,
+    "endLine": 14,
     "line": 9,
     "rule": "comment-empty-line-before",
     "severity": "error",
@@ -11,17 +22,12 @@ exports[`flags warnings with invalid commenting css snapshot matches warnings 1`
   },
   {
     "column": 1,
+    "endColumn": 44,
+    "endLine": 18,
     "line": 18,
     "rule": "comment-empty-line-before",
     "severity": "error",
     "text": "Expected empty line before comment (comment-empty-line-before)",
   },
-  {
-    "column": 131,
-    "line": 24,
-    "rule": "max-line-length",
-    "severity": "error",
-    "text": "Expected line length to be no more than 80 characters (max-line-length)",
-  },
 ]
 `;
diff --git a/packages/stylelint-config/test/__snapshots__/functions.js.snap b/packages/stylelint-config/test/__snapshots__/functions.js.snap
index 2a559eaea33171..aa3ee40e69cc66 100644
--- a/packages/stylelint-config/test/__snapshots__/functions.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/functions.js.snap
@@ -4,6 +4,8 @@ exports[`flags warnings with invalid functions css snapshot matches warnings 1`]
 [
   {
     "column": 9,
+    "endColumn": 13,
+    "endLine": 4,
     "line": 4,
     "rule": "function-name-case",
     "severity": "error",
diff --git a/packages/stylelint-config/test/__snapshots__/index.js.snap b/packages/stylelint-config/test/__snapshots__/index.js.snap
index ec660349951647..10c35b02e0e937 100644
--- a/packages/stylelint-config/test/__snapshots__/index.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/index.js.snap
@@ -4,10 +4,12 @@ exports[`flags warnings with invalid css snapshot matches warnings 1`] = `
 [
   {
     "column": 7,
+    "endColumn": 8,
+    "endLine": 2,
     "line": 2,
-    "rule": "number-leading-zero",
+    "rule": "@stylistic/number-leading-zero",
     "severity": "error",
-    "text": "Expected a leading zero (number-leading-zero)",
+    "text": "Expected a leading zero (@stylistic/number-leading-zero)",
   },
 ]
 `;
diff --git a/packages/stylelint-config/test/__snapshots__/media-queries.js.snap b/packages/stylelint-config/test/__snapshots__/media-queries.js.snap
index 298e30bb24b9c8..93bcf3c13d399c 100644
--- a/packages/stylelint-config/test/__snapshots__/media-queries.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/media-queries.js.snap
@@ -2,82 +2,104 @@
 
 exports[`flags warnings with invalid media queries css snapshot matches warnings 1`] = `
 [
-  {
-    "column": 1,
-    "line": 31,
-    "rule": "at-rule-no-unknown",
-    "severity": "error",
-    "text": "Unexpected unknown at-rule "@mdia" (at-rule-no-unknown)",
-  },
   {
     "column": 26,
+    "endColumn": 27,
+    "endLine": 1,
     "line": 1,
-    "rule": "media-feature-colon-space-after",
+    "rule": "@stylistic/media-feature-colon-space-after",
     "severity": "error",
-    "text": "Expected single space after ":" (media-feature-colon-space-after)",
+    "text": "Expected single space after ":" (@stylistic/media-feature-colon-space-after)",
   },
   {
     "column": 27,
+    "endColumn": 28,
+    "endLine": 6,
     "line": 6,
-    "rule": "media-feature-colon-space-after",
+    "rule": "@stylistic/media-feature-colon-space-after",
     "severity": "error",
-    "text": "Expected single space after ":" (media-feature-colon-space-after)",
+    "text": "Expected single space after ":" (@stylistic/media-feature-colon-space-after)",
   },
   {
     "column": 27,
+    "endColumn": 28,
+    "endLine": 6,
     "line": 6,
-    "rule": "media-feature-colon-space-before",
-    "severity": "error",
-    "text": "Unexpected whitespace before ":" (media-feature-colon-space-before)",
-  },
-  {
-    "column": 17,
-    "line": 11,
-    "rule": "media-feature-name-no-unknown",
+    "rule": "@stylistic/media-feature-colon-space-before",
     "severity": "error",
-    "text": "Unexpected unknown media feature name "max-width 699px" (media-feature-name-no-unknown)",
+    "text": "Unexpected whitespace before ":" (@stylistic/media-feature-colon-space-before)",
   },
   {
     "column": 28,
+    "endColumn": 29,
+    "endLine": 16,
     "line": 16,
-    "rule": "media-feature-range-operator-space-after",
+    "rule": "@stylistic/media-feature-range-operator-space-after",
     "severity": "error",
-    "text": "Expected single space after range operator (media-feature-range-operator-space-after)",
+    "text": "Expected single space after range operator (@stylistic/media-feature-range-operator-space-after)",
   },
   {
     "column": 29,
+    "endColumn": 30,
+    "endLine": 21,
     "line": 21,
-    "rule": "media-feature-range-operator-space-after",
+    "rule": "@stylistic/media-feature-range-operator-space-after",
     "severity": "error",
-    "text": "Expected single space after range operator (media-feature-range-operator-space-after)",
+    "text": "Expected single space after range operator (@stylistic/media-feature-range-operator-space-after)",
   },
   {
     "column": 25,
+    "endColumn": 26,
+    "endLine": 16,
     "line": 16,
-    "rule": "media-feature-range-operator-space-before",
+    "rule": "@stylistic/media-feature-range-operator-space-before",
     "severity": "error",
-    "text": "Expected single space before range operator (media-feature-range-operator-space-before)",
+    "text": "Expected single space before range operator (@stylistic/media-feature-range-operator-space-before)",
   },
   {
     "column": 25,
+    "endColumn": 26,
+    "endLine": 26,
     "line": 26,
-    "rule": "media-feature-range-operator-space-before",
+    "rule": "@stylistic/media-feature-range-operator-space-before",
     "severity": "error",
-    "text": "Expected single space before range operator (media-feature-range-operator-space-before)",
+    "text": "Expected single space before range operator (@stylistic/media-feature-range-operator-space-before)",
   },
   {
     "column": 27,
+    "endColumn": 28,
+    "endLine": 36,
     "line": 36,
-    "rule": "media-query-list-comma-space-before",
+    "rule": "@stylistic/media-query-list-comma-space-before",
     "severity": "error",
-    "text": "Unexpected whitespace before "," (media-query-list-comma-space-before)",
+    "text": "Unexpected whitespace before "," (@stylistic/media-query-list-comma-space-before)",
   },
   {
     "column": 27,
+    "endColumn": 28,
+    "endLine": 40,
     "line": 40,
-    "rule": "media-query-list-comma-space-before",
+    "rule": "@stylistic/media-query-list-comma-space-before",
+    "severity": "error",
+    "text": "Unexpected whitespace before "," (@stylistic/media-query-list-comma-space-before)",
+  },
+  {
+    "column": 1,
+    "endColumn": 6,
+    "endLine": 31,
+    "line": 31,
+    "rule": "at-rule-no-unknown",
+    "severity": "error",
+    "text": "Unexpected unknown at-rule "@mdia" (at-rule-no-unknown)",
+  },
+  {
+    "column": 17,
+    "endColumn": 24,
+    "endLine": 11,
+    "line": 11,
+    "rule": "media-feature-name-no-unknown",
     "severity": "error",
-    "text": "Unexpected whitespace before "," (media-query-list-comma-space-before)",
+    "text": "Unexpected unknown media feature name "unknown" (media-feature-name-no-unknown)",
   },
 ]
 `;
diff --git a/packages/stylelint-config/test/__snapshots__/properties.js.snap b/packages/stylelint-config/test/__snapshots__/properties.js.snap
index 9bb0ab23954845..a0c36aa885e1f8 100644
--- a/packages/stylelint-config/test/__snapshots__/properties.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/properties.js.snap
@@ -4,13 +4,35 @@ exports[`flags warnings with invalid properties css snapshot matches warnings 1`
 [
   {
     "column": 13,
+    "endColumn": 14,
+    "endLine": 2,
     "line": 2,
-    "rule": "color-hex-case",
+    "rule": "@stylistic/color-hex-case",
     "severity": "error",
-    "text": "Expected "#FFFFFF" to be "#ffffff" (color-hex-case)",
+    "text": "Expected "#FFFFFF" to be "#ffffff" (@stylistic/color-hex-case)",
   },
   {
     "column": 13,
+    "endColumn": 14,
+    "endLine": 2,
+    "line": 2,
+    "rule": "@stylistic/declaration-colon-space-after",
+    "severity": "error",
+    "text": "Expected single space after ":" with a single-line declaration (@stylistic/declaration-colon-space-after)",
+  },
+  {
+    "column": 17,
+    "endColumn": 19,
+    "endLine": 4,
+    "line": 4,
+    "rule": "@stylistic/unit-case",
+    "severity": "error",
+    "text": "Expected "PX" to be "px" (@stylistic/unit-case)",
+  },
+  {
+    "column": 13,
+    "endColumn": 20,
+    "endLine": 2,
     "line": 2,
     "rule": "color-hex-length",
     "severity": "error",
@@ -18,34 +40,26 @@ exports[`flags warnings with invalid properties css snapshot matches warnings 1`
   },
   {
     "column": 2,
+    "endColumn": 8,
+    "endLine": 5,
     "line": 5,
     "rule": "declaration-block-no-shorthand-property-overrides",
     "severity": "error",
     "text": "Unexpected shorthand "margin" after "margin-left" (declaration-block-no-shorthand-property-overrides)",
   },
-  {
-    "column": 13,
-    "line": 2,
-    "rule": "declaration-colon-space-after",
-    "severity": "error",
-    "text": "Expected single space after ":" with a single-line declaration (declaration-colon-space-after)",
-  },
   {
     "column": 2,
+    "endColumn": 7,
+    "endLine": 6,
     "line": 6,
     "rule": "property-no-unknown",
     "severity": "error",
     "text": "Unexpected unknown property "argin" (property-no-unknown)",
   },
-  {
-    "column": 15,
-    "line": 4,
-    "rule": "unit-case",
-    "severity": "error",
-    "text": "Expected "PX" to be "px" (unit-case)",
-  },
   {
     "column": 11,
+    "endColumn": 16,
+    "endLine": 3,
     "line": 3,
     "rule": "value-keyword-case",
     "severity": "error",
diff --git a/packages/stylelint-config/test/__snapshots__/scss.js.snap b/packages/stylelint-config/test/__snapshots__/scss.js.snap
index dd199336323ffe..a1abeef86ac963 100644
--- a/packages/stylelint-config/test/__snapshots__/scss.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/scss.js.snap
@@ -2,8 +2,37 @@
 
 exports[`flags warnings with invalid scss snapshot matches warnings 1`] = `
 [
+  {
+    "column": 5,
+    "endColumn": 6,
+    "endLine": 14,
+    "line": 14,
+    "rule": "@stylistic/block-opening-brace-space-before",
+    "severity": "error",
+    "text": "Expected single space before "{" (@stylistic/block-opening-brace-space-before)",
+  },
+  {
+    "column": 7,
+    "endColumn": 8,
+    "endLine": 31,
+    "line": 31,
+    "rule": "@stylistic/number-leading-zero",
+    "severity": "error",
+    "text": "Expected a leading zero (@stylistic/number-leading-zero)",
+  },
+  {
+    "column": 15,
+    "endColumn": 16,
+    "endLine": 28,
+    "line": 28,
+    "rule": "@stylistic/no-extra-semicolons",
+    "severity": "error",
+    "text": "Unexpected extra semicolon (@stylistic/no-extra-semicolons)",
+  },
   {
     "column": 1,
+    "endColumn": 6,
+    "endLine": 14,
     "line": 14,
     "rule": "scss/at-else-empty-line-before",
     "severity": "error",
@@ -11,6 +40,8 @@ exports[`flags warnings with invalid scss snapshot matches warnings 1`] = `
   },
   {
     "column": 2,
+    "endColumn": 3,
+    "endLine": 12,
     "line": 12,
     "rule": "scss/at-if-closing-brace-newline-after",
     "severity": "error",
@@ -18,6 +49,8 @@ exports[`flags warnings with invalid scss snapshot matches warnings 1`] = `
   },
   {
     "column": 2,
+    "endColumn": 3,
+    "endLine": 12,
     "line": 12,
     "rule": "scss/at-if-closing-brace-space-after",
     "severity": "error",
@@ -25,6 +58,8 @@ exports[`flags warnings with invalid scss snapshot matches warnings 1`] = `
   },
   {
     "column": 1,
+    "endColumn": 9,
+    "endLine": 1,
     "line": 1,
     "rule": "scss/at-rule-no-unknown",
     "severity": "error",
@@ -32,31 +67,12 @@ exports[`flags warnings with invalid scss snapshot matches warnings 1`] = `
   },
   {
     "column": 2,
+    "endColumn": 15,
+    "endLine": 22,
     "line": 22,
     "rule": "at-rule-empty-line-before",
     "severity": "error",
     "text": "Unexpected empty line before at-rule (at-rule-empty-line-before)",
   },
-  {
-    "column": 5,
-    "line": 14,
-    "rule": "block-opening-brace-space-before",
-    "severity": "error",
-    "text": "Expected single space before "{" (block-opening-brace-space-before)",
-  },
-  {
-    "column": 15,
-    "line": 28,
-    "rule": "no-extra-semicolons",
-    "severity": "error",
-    "text": "Unexpected extra semicolon (no-extra-semicolons)",
-  },
-  {
-    "column": 7,
-    "line": 31,
-    "rule": "number-leading-zero",
-    "severity": "error",
-    "text": "Expected a leading zero (number-leading-zero)",
-  },
 ]
 `;
diff --git a/packages/stylelint-config/test/__snapshots__/selectors-scss.js.snap b/packages/stylelint-config/test/__snapshots__/selectors-scss.js.snap
index 31cbf77098ec63..ea1746c5383622 100644
--- a/packages/stylelint-config/test/__snapshots__/selectors-scss.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/selectors-scss.js.snap
@@ -4,6 +4,8 @@ exports[`flags warnings with invalid selectors scss snapshot matches warnings 1`
 [
   {
     "column": 2,
+    "endColumn": 3,
+    "endLine": 3,
     "line": 3,
     "rule": "scss/selector-no-redundant-nesting-selector",
     "severity": "error",
@@ -11,6 +13,8 @@ exports[`flags warnings with invalid selectors scss snapshot matches warnings 1`
   },
   {
     "column": 2,
+    "endColumn": 3,
+    "endLine": 10,
     "line": 10,
     "rule": "scss/selector-no-redundant-nesting-selector",
     "severity": "error",
@@ -18,6 +22,8 @@ exports[`flags warnings with invalid selectors scss snapshot matches warnings 1`
   },
   {
     "column": 2,
+    "endColumn": 3,
+    "endLine": 17,
     "line": 17,
     "rule": "scss/selector-no-redundant-nesting-selector",
     "severity": "error",
@@ -25,6 +31,8 @@ exports[`flags warnings with invalid selectors scss snapshot matches warnings 1`
   },
   {
     "column": 2,
+    "endColumn": 3,
+    "endLine": 24,
     "line": 24,
     "rule": "scss/selector-no-redundant-nesting-selector",
     "severity": "error",
@@ -32,6 +40,8 @@ exports[`flags warnings with invalid selectors scss snapshot matches warnings 1`
   },
   {
     "column": 2,
+    "endColumn": 3,
+    "endLine": 31,
     "line": 31,
     "rule": "scss/selector-no-redundant-nesting-selector",
     "severity": "error",
@@ -39,6 +49,8 @@ exports[`flags warnings with invalid selectors scss snapshot matches warnings 1`
   },
   {
     "column": 10,
+    "endColumn": 11,
+    "endLine": 31,
     "line": 31,
     "rule": "selector-pseudo-element-colon-notation",
     "severity": "error",
diff --git a/packages/stylelint-config/test/__snapshots__/selectors.js.snap b/packages/stylelint-config/test/__snapshots__/selectors.js.snap
index 42242da99d4519..f39edbfdb3fa51 100644
--- a/packages/stylelint-config/test/__snapshots__/selectors.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/selectors.js.snap
@@ -2,8 +2,19 @@
 
 exports[`flags warnings with invalid selectors css snapshot matches warnings 1`] = `
 [
+  {
+    "column": 12,
+    "endColumn": 13,
+    "endLine": 17,
+    "line": 17,
+    "rule": "@stylistic/string-quotes",
+    "severity": "error",
+    "text": "Expected double quotes (@stylistic/string-quotes)",
+  },
   {
     "column": 15,
+    "endColumn": 19,
+    "endLine": 18,
     "line": 18,
     "rule": "declaration-property-unit-allowed-list",
     "severity": "error",
@@ -11,6 +22,8 @@ exports[`flags warnings with invalid selectors css snapshot matches warnings 1`]
   },
   {
     "column": 1,
+    "endColumn": 11,
+    "endLine": 25,
     "line": 25,
     "rule": "selector-class-pattern",
     "severity": "error",
@@ -18,6 +31,8 @@ exports[`flags warnings with invalid selectors css snapshot matches warnings 1`]
   },
   {
     "column": 1,
+    "endColumn": 13,
+    "endLine": 1,
     "line": 1,
     "rule": "selector-id-pattern",
     "severity": "error",
@@ -25,6 +40,8 @@ exports[`flags warnings with invalid selectors css snapshot matches warnings 1`]
   },
   {
     "column": 1,
+    "endColumn": 14,
+    "endLine": 5,
     "line": 5,
     "rule": "selector-id-pattern",
     "severity": "error",
@@ -32,6 +49,8 @@ exports[`flags warnings with invalid selectors css snapshot matches warnings 1`]
   },
   {
     "column": 4,
+    "endColumn": 17,
+    "endLine": 9,
     "line": 9,
     "rule": "selector-id-pattern",
     "severity": "error",
@@ -39,6 +58,8 @@ exports[`flags warnings with invalid selectors css snapshot matches warnings 1`]
   },
   {
     "column": 1,
+    "endColumn": 10,
+    "endLine": 21,
     "line": 21,
     "rule": "selector-id-pattern",
     "severity": "error",
@@ -46,17 +67,12 @@ exports[`flags warnings with invalid selectors css snapshot matches warnings 1`]
   },
   {
     "column": 10,
+    "endColumn": 11,
+    "endLine": 29,
     "line": 29,
     "rule": "selector-pseudo-element-colon-notation",
     "severity": "error",
     "text": "Expected double colon pseudo-element notation (selector-pseudo-element-colon-notation)",
   },
-  {
-    "column": 12,
-    "line": 17,
-    "rule": "string-quotes",
-    "severity": "error",
-    "text": "Expected double quotes (string-quotes)",
-  },
 ]
 `;
diff --git a/packages/stylelint-config/test/__snapshots__/structure.js.snap b/packages/stylelint-config/test/__snapshots__/structure.js.snap
index b41ef9131547fc..c59cfb0fc29186 100644
--- a/packages/stylelint-config/test/__snapshots__/structure.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/structure.js.snap
@@ -4,59 +4,75 @@ exports[`flags warnings with invalid structure css snapshot matches warnings 1`]
 [
   {
     "column": 45,
+    "endColumn": 46,
+    "endLine": 7,
     "line": 7,
-    "rule": "block-closing-brace-newline-before",
+    "rule": "@stylistic/block-closing-brace-newline-before",
     "severity": "error",
-    "text": "Expected newline before "}" (block-closing-brace-newline-before)",
+    "text": "Expected newline before "}" (@stylistic/block-closing-brace-newline-before)",
   },
   {
     "column": 14,
+    "endColumn": 15,
+    "endLine": 7,
     "line": 7,
-    "rule": "block-opening-brace-newline-after",
+    "rule": "@stylistic/block-opening-brace-newline-after",
     "severity": "error",
-    "text": "Expected newline after "{" (block-opening-brace-newline-after)",
+    "text": "Expected newline after "{" (@stylistic/block-opening-brace-newline-after)",
   },
   {
     "column": 32,
+    "endColumn": 33,
+    "endLine": 7,
     "line": 7,
-    "rule": "declaration-block-semicolon-newline-after",
+    "rule": "@stylistic/declaration-block-semicolon-newline-after",
     "severity": "error",
-    "text": "Expected newline after ";" (declaration-block-semicolon-newline-after)",
+    "text": "Expected newline after ";" (@stylistic/declaration-block-semicolon-newline-after)",
   },
   {
-    "column": 12,
-    "line": 1,
-    "rule": "selector-list-comma-newline-after",
+    "column": 3,
+    "endColumn": 4,
+    "endLine": 4,
+    "line": 4,
+    "rule": "@stylistic/indentation",
     "severity": "error",
-    "text": "Expected newline after "," (selector-list-comma-newline-after)",
+    "text": "Expected indentation of 0 tabs (@stylistic/indentation)",
   },
   {
-    "column": 25,
-    "line": 1,
-    "rule": "selector-list-comma-newline-after",
+    "column": 3,
+    "endColumn": 20,
+    "endLine": 2,
+    "line": 2,
+    "rule": "@stylistic/indentation",
     "severity": "error",
-    "text": "Expected newline after "," (selector-list-comma-newline-after)",
+    "text": "Expected indentation of 1 tab (@stylistic/indentation)",
   },
   {
     "column": 3,
-    "line": 4,
-    "rule": "indentation",
+    "endColumn": 15,
+    "endLine": 3,
+    "line": 3,
+    "rule": "@stylistic/indentation",
     "severity": "error",
-    "text": "Expected indentation of 0 tabs (indentation)",
+    "text": "Expected indentation of 1 tab (@stylistic/indentation)",
   },
   {
-    "column": 3,
-    "line": 2,
-    "rule": "indentation",
+    "column": 12,
+    "endColumn": 13,
+    "endLine": 1,
+    "line": 1,
+    "rule": "@stylistic/selector-list-comma-newline-after",
     "severity": "error",
-    "text": "Expected indentation of 1 tab (indentation)",
+    "text": "Expected newline after "," (@stylistic/selector-list-comma-newline-after)",
   },
   {
-    "column": 3,
-    "line": 3,
-    "rule": "indentation",
+    "column": 25,
+    "endColumn": 26,
+    "endLine": 1,
+    "line": 1,
+    "rule": "@stylistic/selector-list-comma-newline-after",
     "severity": "error",
-    "text": "Expected indentation of 1 tab (indentation)",
+    "text": "Expected newline after "," (@stylistic/selector-list-comma-newline-after)",
   },
 ]
 `;
diff --git a/packages/stylelint-config/test/__snapshots__/values.js.snap b/packages/stylelint-config/test/__snapshots__/values.js.snap
index 2331e0364e5c73..95c34fcbfc8d44 100644
--- a/packages/stylelint-config/test/__snapshots__/values.js.snap
+++ b/packages/stylelint-config/test/__snapshots__/values.js.snap
@@ -4,20 +4,26 @@ exports[`flags warnings with invalid values css snapshot matches warnings 1`] =
 [
   {
     "column": 16,
+    "endColumn": 17,
+    "endLine": 2,
     "line": 2,
-    "rule": "declaration-block-trailing-semicolon",
+    "rule": "@stylistic/declaration-block-trailing-semicolon",
     "severity": "error",
-    "text": "Expected a trailing semicolon (declaration-block-trailing-semicolon)",
+    "text": "Expected a trailing semicolon (@stylistic/declaration-block-trailing-semicolon)",
   },
   {
     "column": 13,
+    "endColumn": 14,
+    "endLine": 2,
     "line": 2,
-    "rule": "declaration-colon-space-after",
+    "rule": "@stylistic/declaration-colon-space-after",
     "severity": "error",
-    "text": "Expected single space after ":" with a single-line declaration (declaration-colon-space-after)",
+    "text": "Expected single space after ":" with a single-line declaration (@stylistic/declaration-colon-space-after)",
   },
   {
     "column": 15,
+    "endColumn": 20,
+    "endLine": 12,
     "line": 12,
     "rule": "declaration-property-unit-allowed-list",
     "severity": "error",
@@ -25,6 +31,8 @@ exports[`flags warnings with invalid values css snapshot matches warnings 1`] =
   },
   {
     "column": 15,
+    "endColumn": 30,
+    "endLine": 10,
     "line": 10,
     "rule": "font-family-name-quotes",
     "severity": "error",
@@ -32,13 +40,17 @@ exports[`flags warnings with invalid values css snapshot matches warnings 1`] =
   },
   {
     "column": 15,
+    "endColumn": 19,
+    "endLine": 11,
     "line": 11,
     "rule": "font-weight-notation",
     "severity": "error",
-    "text": "Expected numeric font-weight notation (font-weight-notation)",
+    "text": "Expected "bold" to be "700" (font-weight-notation)",
   },
   {
     "column": 11,
+    "endColumn": 13,
+    "endLine": 6,
     "line": 6,
     "rule": "length-zero-no-unit",
     "severity": "error",
@@ -46,6 +58,8 @@ exports[`flags warnings with invalid values css snapshot matches warnings 1`] =
   },
   {
     "column": 15,
+    "endColumn": 17,
+    "endLine": 6,
     "line": 6,
     "rule": "length-zero-no-unit",
     "severity": "error",
@@ -53,6 +67,8 @@ exports[`flags warnings with invalid values css snapshot matches warnings 1`] =
   },
   {
     "column": 24,
+    "endColumn": 26,
+    "endLine": 6,
     "line": 6,
     "rule": "length-zero-no-unit",
     "severity": "error",
@@ -60,6 +76,8 @@ exports[`flags warnings with invalid values css snapshot matches warnings 1`] =
   },
   {
     "column": 1,
+    "endColumn": 10,
+    "endLine": 15,
     "line": 15,
     "rule": "no-duplicate-selectors",
     "severity": "error",
diff --git a/packages/stylelint-config/test/commenting.js b/packages/stylelint-config/test/commenting.js
index 1a23a47434fc10..dde02f605faf14 100644
--- a/packages/stylelint-config/test/commenting.js
+++ b/packages/stylelint-config/test/commenting.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/commenting-valid.css',
-		'utf-8'
-	),
-	invalidCss = fs.readFileSync(
-		'./packages/stylelint-config/test/commenting-invalid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid commenting css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './commenting-valid.css' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid commenting css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidCss,
-			config,
-		} );
+		result = getStylelintResult( './commenting-invalid.css' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/functions.js b/packages/stylelint-config/test/functions.js
index 38b0fbf37a3a87..d6fb2a7ddf84e0 100644
--- a/packages/stylelint-config/test/functions.js
+++ b/packages/stylelint-config/test/functions.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/functions-valid.css',
-		'utf-8'
-	),
-	invalidCss = fs.readFileSync(
-		'./packages/stylelint-config/test/functions-invalid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid functions css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './functions-valid.css' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid functions css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidCss,
-			config,
-		} );
+		result = getStylelintResult( './functions-invalid.css' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/index.js b/packages/stylelint-config/test/index.js
index dfc857e8a45041..d974a9ac110f73 100644
--- a/packages/stylelint-config/test/index.js
+++ b/packages/stylelint-config/test/index.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/css-valid.css',
-		'utf-8'
-	),
-	invalidCss = fs.readFileSync(
-		'./packages/stylelint-config/test/css-invalid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './css-valid.css' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidCss,
-			config,
-		} );
+		result = getStylelintResult( './css-invalid.css' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/media-queries-invalid.css b/packages/stylelint-config/test/media-queries-invalid.css
index c89a2776bb807b..8fff7111065e0f 100644
--- a/packages/stylelint-config/test/media-queries-invalid.css
+++ b/packages/stylelint-config/test/media-queries-invalid.css
@@ -8,7 +8,7 @@
 	/* Your selectors */
 }
 
-@media all and (max-width 699px) {
+@media all and (unknown) {
 
 	/* Your selectors */
 }
diff --git a/packages/stylelint-config/test/media-queries.js b/packages/stylelint-config/test/media-queries.js
index a3b59aa0fb5413..6b8390e7933b99 100644
--- a/packages/stylelint-config/test/media-queries.js
+++ b/packages/stylelint-config/test/media-queries.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/media-queries-valid.css',
-		'utf-8'
-	),
-	invalidCss = fs.readFileSync(
-		'./packages/stylelint-config/test/media-queries-invalid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid media queries css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './media-queries-valid.css' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid media queries css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidCss,
-			config,
-		} );
+		result = getStylelintResult( './media-queries-invalid.css' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/properties.js b/packages/stylelint-config/test/properties.js
index 35cedc7697515d..51dded0543d438 100644
--- a/packages/stylelint-config/test/properties.js
+++ b/packages/stylelint-config/test/properties.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/properties-valid.css',
-		'utf-8'
-	),
-	invalidCss = fs.readFileSync(
-		'./packages/stylelint-config/test/properties-invalid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid properties css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './properties-valid.css' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid properties css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidCss,
-			config,
-		} );
+		result = getStylelintResult( './properties-invalid.css' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/scss.js b/packages/stylelint-config/test/scss.js
index 9372d502b0d8a4..efe01c3d0f2cc0 100644
--- a/packages/stylelint-config/test/scss.js
+++ b/packages/stylelint-config/test/scss.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../scss' ),
-	validScss = fs.readFileSync(
-		'./packages/stylelint-config/test/scss-valid.scss',
-		'utf-8'
-	),
-	invalidScss = fs.readFileSync(
-		'./packages/stylelint-config/test/scss-invalid.scss',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid scss', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validScss,
-			config,
-		} );
+		result = getStylelintResult( './scss-valid.scss' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid scss', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidScss,
-			config,
-		} );
+		result = getStylelintResult( './scss-invalid.scss' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/selectors-scss.js b/packages/stylelint-config/test/selectors-scss.js
index 94a85ff86543e0..5ec1f2fbd1b427 100644
--- a/packages/stylelint-config/test/selectors-scss.js
+++ b/packages/stylelint-config/test/selectors-scss.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../scss' ),
-	validScss = fs.readFileSync(
-		'./packages/stylelint-config/test/selectors-valid.scss',
-		'utf-8'
-	),
-	invalidScss = fs.readFileSync(
-		'./packages/stylelint-config/test/selectors-invalid.scss',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid selectors scss', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validScss,
-			config,
-		} );
+		result = getStylelintResult( './selectors-valid.scss' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid selectors scss', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidScss,
-			config,
-		} );
+		result = getStylelintResult( './selectors-invalid.scss' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/selectors.js b/packages/stylelint-config/test/selectors.js
index 337d1d00eed311..276ac875489613 100644
--- a/packages/stylelint-config/test/selectors.js
+++ b/packages/stylelint-config/test/selectors.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/selectors-valid.css',
-		'utf-8'
-	),
-	invalidCss = fs.readFileSync(
-		'./packages/stylelint-config/test/selectors-invalid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid selectors css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './selectors-valid.css' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid selectors css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidCss,
-			config,
-		} );
+		result = getStylelintResult( './selectors-invalid.css' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/structure.js b/packages/stylelint-config/test/structure.js
index 7ec03a3b667bac..29dc22a35daf14 100644
--- a/packages/stylelint-config/test/structure.js
+++ b/packages/stylelint-config/test/structure.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/structure-valid.css',
-		'utf-8'
-	),
-	invalidCss = fs.readFileSync(
-		'./packages/stylelint-config/test/structure-invalid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid structure css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './structure-valid.css' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid structure css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidCss,
-			config,
-		} );
+		result = getStylelintResult( './structure-invalid.css' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/themes.js b/packages/stylelint-config/test/themes.js
index f0016832b24d7b..0a25c6e871df7e 100644
--- a/packages/stylelint-config/test/themes.js
+++ b/packages/stylelint-config/test/themes.js
@@ -1,26 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/themes-valid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './themes-valid.css' );
 	} );
 
 	it( 'did not error', () => {
diff --git a/packages/stylelint-config/test/utils/index.js b/packages/stylelint-config/test/utils/index.js
new file mode 100644
index 00000000000000..c24e04f0a67a45
--- /dev/null
+++ b/packages/stylelint-config/test/utils/index.js
@@ -0,0 +1,34 @@
+/**
+ * External dependencies
+ */
+const util = require( 'node:util' ),
+	path = require( 'node:path' ),
+	childProcess = require( 'node:child_process' );
+
+const execute = util.promisify( childProcess.exec );
+
+const generateStylelintCommand = ( filename ) =>
+	'npx stylelint ' +
+	path.resolve( __dirname, '../', filename ) +
+	' -c' +
+	path.resolve( __dirname, '../', './.stylelintrc.tests.json' ) +
+	' --formatter json' +
+	' --ignore-path ' +
+	path.resolve( __dirname, '../', './.stylelintignore' );
+
+module.exports = {
+	getStylelintResult: ( filename ) =>
+		execute( generateStylelintCommand( filename ) )
+			.then( ( { stderr } ) => {
+				return {
+					errored: false,
+					results: JSON.parse( stderr ),
+				};
+			} )
+			.catch( ( { stderr } ) => {
+				return {
+					errored: true,
+					results: JSON.parse( stderr ),
+				};
+			} ),
+};
diff --git a/packages/stylelint-config/test/values.js b/packages/stylelint-config/test/values.js
index 97cbc58e02f3b4..749a50a94c2044 100644
--- a/packages/stylelint-config/test/values.js
+++ b/packages/stylelint-config/test/values.js
@@ -1,30 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/values-valid.css',
-		'utf-8'
-	),
-	invalidCss = fs.readFileSync(
-		'./packages/stylelint-config/test/values-invalid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid values css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './values-valid.css' );
 	} );
 
 	it( 'did not error', () => {
@@ -42,10 +26,7 @@ describe( 'flags warnings with invalid values css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: invalidCss,
-			config,
-		} );
+		result = getStylelintResult( './values-invalid.css' );
 	} );
 
 	it( 'did error', () => {
diff --git a/packages/stylelint-config/test/vendor-prefixes.js b/packages/stylelint-config/test/vendor-prefixes.js
index e3ec4d2a7e5dfc..bc3e1f571aee57 100644
--- a/packages/stylelint-config/test/vendor-prefixes.js
+++ b/packages/stylelint-config/test/vendor-prefixes.js
@@ -1,26 +1,14 @@
-/**
- * External dependencies
- */
-const fs = require( 'fs' ),
-	stylelint = require( 'stylelint' );
-
 /**
  * Internal dependencies
  */
-const config = require( '../' ),
-	validCss = fs.readFileSync(
-		'./packages/stylelint-config/test/vendor-prefixes-valid.css',
-		'utf-8'
-	);
+const utils = require( './utils' );
+const getStylelintResult = utils.getStylelintResult;
 
 describe( 'flags no warnings with valid vendor prefixes css', () => {
 	let result;
 
 	beforeEach( () => {
-		result = stylelint.lint( {
-			code: validCss,
-			config,
-		} );
+		result = getStylelintResult( './vendor-prefixes-valid.css' );
 	} );
 
 	it( 'did not error', () => {
diff --git a/packages/sync/.npmrc b/packages/sync/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/sync/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index fa1810c68c5799..bbfb3cbb539fd5 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 1.10.0 (2024-10-16)
+
+## 1.9.0 (2024-10-03)
+
+## 1.8.0 (2024-09-19)
+
+## 1.7.0 (2024-09-05)
+
+## 1.6.0 (2024-08-21)
+
+## 1.5.0 (2024-08-07)
+
+## 1.4.0 (2024-07-24)
+
+## 1.3.0 (2024-07-10)
+
+## 1.2.0 (2024-06-26)
+
+## 1.1.0 (2024-06-15)
+
+## 1.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 0.20.0 (2024-05-16)
+
+## 0.19.0 (2024-05-02)
+
+## 0.18.0 (2024-04-19)
+
+## 0.17.0 (2024-04-03)
+
+## 0.16.0 (2024-03-21)
+
+## 0.15.0 (2024-03-06)
+
+## 0.14.0 (2024-02-21)
+
+## 0.13.0 (2024-02-09)
+
+## 0.12.0 (2024-01-24)
+
+## 0.11.0 (2024-01-10)
+
+## 0.10.0 (2023-12-13)
+
 ## 0.9.0 (2023-11-29)
 
 ## 0.8.0 (2023-11-16)
diff --git a/packages/sync/package.json b/packages/sync/package.json
index 8bef91b2689333..27ed67971b7ca9 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/sync",
-	"version": "0.9.0",
+	"version": "1.10.0",
 	"description": "Sync Data.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,9 +28,9 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"@types/simple-peer": "^9.11.5",
-		"@wordpress/url": "file:../url",
+		"@wordpress/url": "*",
 		"import-locals": "^2.0.0",
 		"lib0": "^0.2.42",
 		"simple-peer": "^9.11.0",
@@ -40,5 +41,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/sync/tsconfig.json b/packages/sync/tsconfig.json
index 83a2163230eae8..40b3ecb72f9aba 100644
--- a/packages/sync/tsconfig.json
+++ b/packages/sync/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/token-list/.npmrc b/packages/token-list/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/token-list/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/token-list/CHANGELOG.md b/packages/token-list/CHANGELOG.md
index 3c769bcec7fb77..3f46da49645186 100644
--- a/packages/token-list/CHANGELOG.md
+++ b/packages/token-list/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 3.10.0 (2024-10-16)
+
+## 3.9.0 (2024-10-03)
+
+## 3.8.0 (2024-09-19)
+
+## 3.7.0 (2024-09-05)
+
+## 3.6.0 (2024-08-21)
+
+## 3.5.0 (2024-08-07)
+
+## 3.4.0 (2024-07-24)
+
+## 3.3.0 (2024-07-10)
+
+## 3.2.0 (2024-06-26)
+
+## 3.1.0 (2024-06-15)
+
+### Internal
+
+-   Refactor to TypeScript ([#62584](https://github.com/WordPress/gutenberg/pull/62584)).
+
+## 3.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 2.58.0 (2024-05-16)
+
+## 2.57.0 (2024-05-02)
+
+## 2.56.0 (2024-04-19)
+
+## 2.55.0 (2024-04-03)
+
+## 2.54.0 (2024-03-21)
+
+## 2.53.0 (2024-03-06)
+
+## 2.52.0 (2024-02-21)
+
+## 2.51.0 (2024-02-09)
+
+## 2.50.0 (2024-01-24)
+
+## 2.49.0 (2024-01-10)
+
+## 2.48.0 (2023-12-13)
+
 ## 2.47.0 (2023-11-29)
 
 ## 2.46.0 (2023-11-16)
@@ -107,7 +159,7 @@
 
 ## 1.10.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
diff --git a/packages/token-list/package.json b/packages/token-list/package.json
index c818471e31aa46..e73fc1918ec55e 100644
--- a/packages/token-list/package.json
+++ b/packages/token-list/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/token-list",
-	"version": "2.47.0",
+	"version": "3.10.0",
 	"description": "Constructable, plain JavaScript DOMTokenList implementation, supporting non-browser runtimes.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,16 +19,18 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/token-list/src/index.js b/packages/token-list/src/index.js
deleted file mode 100644
index efd4ab68c478e5..00000000000000
--- a/packages/token-list/src/index.js
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- * A set of tokens.
- *
- * @see https://dom.spec.whatwg.org/#domtokenlist
- */
-export default class TokenList {
-	/**
-	 * Constructs a new instance of TokenList.
-	 *
-	 * @param {string} initialValue Initial value to assign.
-	 */
-	constructor( initialValue = '' ) {
-		this.value = initialValue;
-
-		// Disable reason: These are type hints on the class.
-		/* eslint-disable no-unused-expressions */
-		/** @type {string} */
-		this._currentValue;
-
-		/** @type {string[]} */
-		this._valueAsArray;
-		/* eslint-enable no-unused-expressions */
-	}
-
-	/**
-	 * @param {Parameters<Array<string>['entries']>} args
-	 */
-	entries( ...args ) {
-		return this._valueAsArray.entries( ...args );
-	}
-
-	/**
-	 * @param {Parameters<Array<string>['forEach']>} args
-	 */
-	forEach( ...args ) {
-		return this._valueAsArray.forEach( ...args );
-	}
-
-	/**
-	 * @param {Parameters<Array<string>['keys']>} args
-	 */
-	keys( ...args ) {
-		return this._valueAsArray.keys( ...args );
-	}
-
-	/**
-	 * @param {Parameters<Array<string>['values']>} args
-	 */
-	values( ...args ) {
-		return this._valueAsArray.values( ...args );
-	}
-
-	/**
-	 * Returns the associated set as string.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-value
-	 *
-	 * @return {string} Token set as string.
-	 */
-	get value() {
-		return this._currentValue;
-	}
-
-	/**
-	 * Replaces the associated set with a new string value.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-value
-	 *
-	 * @param {string} value New token set as string.
-	 */
-	set value( value ) {
-		value = String( value );
-		this._valueAsArray = [
-			...new Set( value.split( /\s+/g ).filter( Boolean ) ),
-		];
-		this._currentValue = this._valueAsArray.join( ' ' );
-	}
-
-	/**
-	 * Returns the number of tokens.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-length
-	 *
-	 * @return {number} Number of tokens.
-	 */
-	get length() {
-		return this._valueAsArray.length;
-	}
-
-	/**
-	 * Returns the stringified form of the TokenList.
-	 *
-	 * @see https://dom.spec.whatwg.org/#DOMTokenList-stringification-behavior
-	 * @see https://www.ecma-international.org/ecma-262/9.0/index.html#sec-tostring
-	 *
-	 * @return {string} Token set as string.
-	 */
-	toString() {
-		return this.value;
-	}
-
-	/**
-	 * Returns an iterator for the TokenList, iterating items of the set.
-	 *
-	 * @see https://dom.spec.whatwg.org/#domtokenlist
-	 *
-	 * @return {IterableIterator<string>} TokenList iterator.
-	 */
-	*[ Symbol.iterator ]() {
-		return yield* this._valueAsArray;
-	}
-
-	/**
-	 * Returns the token with index `index`.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-item
-	 *
-	 * @param {number} index Index at which to return token.
-	 *
-	 * @return {string|undefined} Token at index.
-	 */
-	item( index ) {
-		return this._valueAsArray[ index ];
-	}
-
-	/**
-	 * Returns true if `token` is present, and false otherwise.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-contains
-	 *
-	 * @param {string} item Token to test.
-	 *
-	 * @return {boolean} Whether token is present.
-	 */
-	contains( item ) {
-		return this._valueAsArray.indexOf( item ) !== -1;
-	}
-
-	/**
-	 * Adds all arguments passed, except those already present.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-add
-	 *
-	 * @param {...string} items Items to add.
-	 */
-	add( ...items ) {
-		this.value += ' ' + items.join( ' ' );
-	}
-
-	/**
-	 * Removes arguments passed, if they are present.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-remove
-	 *
-	 * @param {...string} items Items to remove.
-	 */
-	remove( ...items ) {
-		this.value = this._valueAsArray
-			.filter( ( val ) => ! items.includes( val ) )
-			.join( ' ' );
-	}
-
-	/**
-	 * If `force` is not given, "toggles" `token`, removing it if it’s present
-	 * and adding it if it’s not present. If `force` is true, adds token (same
-	 * as add()). If force is false, removes token (same as remove()). Returns
-	 * true if `token` is now present, and false otherwise.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-toggle
-	 *
-	 * @param {string}  token   Token to toggle.
-	 * @param {boolean} [force] Presence to force.
-	 *
-	 * @return {boolean} Whether token is present after toggle.
-	 */
-	toggle( token, force ) {
-		if ( undefined === force ) {
-			force = ! this.contains( token );
-		}
-
-		if ( force ) {
-			this.add( token );
-		} else {
-			this.remove( token );
-		}
-
-		return force;
-	}
-
-	/**
-	 * Replaces `token` with `newToken`. Returns true if `token` was replaced
-	 * with `newToken`, and false otherwise.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-replace
-	 *
-	 * @param {string} token    Token to replace with `newToken`.
-	 * @param {string} newToken Token to use in place of `token`.
-	 *
-	 * @return {boolean} Whether replacement occurred.
-	 */
-	replace( token, newToken ) {
-		if ( ! this.contains( token ) ) {
-			return false;
-		}
-
-		this.remove( token );
-		this.add( newToken );
-
-		return true;
-	}
-
-	/**
-	 * Returns true if `token` is in the associated attribute’s supported
-	 * tokens. Returns false otherwise.
-	 *
-	 * Always returns `true` in this implementation.
-	 *
-	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-supports
-	 *
-	 * @return {boolean} Whether token is supported.
-	 */
-	supports() {
-		return true;
-	}
-}
diff --git a/packages/token-list/src/index.ts b/packages/token-list/src/index.ts
new file mode 100644
index 00000000000000..744afe54eb4928
--- /dev/null
+++ b/packages/token-list/src/index.ts
@@ -0,0 +1,212 @@
+/**
+ * A set of tokens.
+ *
+ * @see https://dom.spec.whatwg.org/#domtokenlist
+ */
+export default class TokenList {
+	private _currentValue: string;
+	private _valueAsArray: string[];
+
+	/**
+	 * Constructs a new instance of TokenList.
+	 *
+	 * @param initialValue Initial value to assign.
+	 */
+	constructor( initialValue: string = '' ) {
+		this._currentValue = '';
+		this._valueAsArray = [];
+		this.value = initialValue;
+	}
+
+	entries( ...args: Parameters< Array< string >[ 'entries' ] > ) {
+		return this._valueAsArray.entries( ...args );
+	}
+
+	forEach( ...args: Parameters< Array< string >[ 'forEach' ] > ) {
+		return this._valueAsArray.forEach( ...args );
+	}
+
+	keys( ...args: Parameters< Array< string >[ 'keys' ] > ) {
+		return this._valueAsArray.keys( ...args );
+	}
+
+	values( ...args: Parameters< Array< string >[ 'values' ] > ) {
+		return this._valueAsArray.values( ...args );
+	}
+
+	/**
+	 * Returns the associated set as string.
+	 *
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-value
+	 *
+	 * @return Token set as string.
+	 */
+	get value(): string {
+		return this._currentValue;
+	}
+
+	/**
+	 * Replaces the associated set with a new string value.
+	 *
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-value
+	 *
+	 * @param value New token set as string.
+	 */
+	set value( value: string ) {
+		value = String( value );
+		this._valueAsArray = [
+			...new Set( value.split( /\s+/g ).filter( Boolean ) ),
+		];
+		this._currentValue = this._valueAsArray.join( ' ' );
+	}
+
+	/**
+	 * Returns the number of tokens.
+	 *
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-length
+	 *
+	 * @return Number of tokens.
+	 */
+	get length(): number {
+		return this._valueAsArray.length;
+	}
+
+	/**
+	 * Returns the stringified form of the TokenList.
+	 *
+	 * @see https://dom.spec.whatwg.org/#DOMTokenList-stringification-behavior
+	 * @see https://www.ecma-international.org/ecma-262/9.0/index.html#sec-tostring
+	 *
+	 * @return Token set as string.
+	 */
+	toString(): string {
+		return this.value;
+	}
+
+	/**
+	 * Returns an iterator for the TokenList, iterating items of the set.
+	 *
+	 * @see https://dom.spec.whatwg.org/#domtokenlist
+	 *
+	 * @return TokenList iterator.
+	 */
+	*[ Symbol.iterator ](): IterableIterator< string > {
+		return yield* this._valueAsArray;
+	}
+
+	/**
+	 * Returns the token with index `index`.
+	 *
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-item
+	 *
+	 * @param index Index at which to return token.
+	 *
+	 * @return Token at index.
+	 */
+	item( index: number ): string | undefined {
+		return this._valueAsArray[ index ];
+	}
+
+	/**
+	 * Returns true if `token` is present, and false otherwise.
+	 *
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-contains
+	 *
+	 * @param item Token to test.
+	 *
+	 * @return Whether token is present.
+	 */
+	contains( item: string ): boolean {
+		return this._valueAsArray.indexOf( item ) !== -1;
+	}
+
+	/**
+	 * Adds all arguments passed, except those already present.
+	 *
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-add
+	 *
+	 * @param items Items to add.
+	 */
+	add( ...items: string[] ): void {
+		this.value += ' ' + items.join( ' ' );
+	}
+
+	/**
+	 * Removes arguments passed, if they are present.
+	 *
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-remove
+	 *
+	 * @param items Items to remove.
+	 */
+	remove( ...items: string[] ): void {
+		this.value = this._valueAsArray
+			.filter( ( val ) => ! items.includes( val ) )
+			.join( ' ' );
+	}
+
+	/**
+	 * If `force` is not given, "toggles" `token`, removing it if it’s present
+	 * and adding it if it’s not present. If `force` is true, adds token (same
+	 * as add()). If force is false, removes token (same as remove()). Returns
+	 * true if `token` is now present, and false otherwise.
+	 *
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-toggle
+	 *
+	 * @param token   Token to toggle.
+	 * @param [force] Presence to force.
+	 *
+	 * @return Whether token is present after toggle.
+	 */
+	toggle( token: string, force?: boolean ): boolean {
+		if ( undefined === force ) {
+			force = ! this.contains( token );
+		}
+
+		if ( force ) {
+			this.add( token );
+		} else {
+			this.remove( token );
+		}
+
+		return force;
+	}
+
+	/**
+	 * Replaces `token` with `newToken`. Returns true if `token` was replaced
+	 * with `newToken`, and false otherwise.
+	 *
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-replace
+	 *
+	 * @param token    Token to replace with `newToken`.
+	 * @param newToken Token to use in place of `token`.
+	 *
+	 * @return Whether replacement occurred.
+	 */
+	replace( token: string, newToken: string ): boolean {
+		if ( ! this.contains( token ) ) {
+			return false;
+		}
+
+		this.remove( token );
+		this.add( newToken );
+
+		return true;
+	}
+
+	/* eslint-disable @typescript-eslint/no-unused-vars */
+	/**
+	 * Returns true if `token` is in the associated attribute’s supported
+	 * tokens. Returns false otherwise.
+	 *
+	 * Always returns `true` in this implementation.
+	 *
+	 * @param _token
+	 * @see https://dom.spec.whatwg.org/#dom-domtokenlist-supports
+	 *
+	 * @return Whether token is supported.
+	 */
+	supports( _token: string ): boolean {
+		return true;
+	}
+	/* eslint-enable @typescript-eslint/no-unused-vars */
+}
diff --git a/packages/token-list/src/test/index.js b/packages/token-list/src/test/index.js
deleted file mode 100644
index e208742d0fc6cc..00000000000000
--- a/packages/token-list/src/test/index.js
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- * Internal dependencies
- */
-import TokenList from '../';
-
-describe( 'token-list', () => {
-	describe( 'constructor', () => {
-		it( 'should instantiate instance with no initial value', () => {
-			const list = new TokenList();
-
-			expect( list.value ).toBe( '' );
-			expect( list ).toHaveLength( 0 );
-		} );
-
-		it( 'should instantiate instance with empty initial value', () => {
-			const list = new TokenList( '' );
-
-			expect( list.value ).toBe( '' );
-			expect( list ).toHaveLength( 0 );
-		} );
-
-		it( 'should instantiate instance with initial value', () => {
-			const list = new TokenList( 'abc   ' );
-
-			expect( list.value ).toBe( 'abc' );
-			expect( list ).toHaveLength( 1 );
-		} );
-
-		describe( 'array method inheritence', () => {
-			it( 'entries', () => {
-				const list = new TokenList( 'abc   ' );
-
-				expect( [ ...list.entries() ] ).toEqual( [ [ 0, 'abc' ] ] );
-			} );
-
-			it( 'forEach', () => {
-				expect.assertions( 1 );
-
-				const list = new TokenList( 'abc   ' );
-
-				list.forEach( ( item ) => expect( item ).toBe( 'abc' ) );
-			} );
-
-			it( 'values', () => {
-				const list = new TokenList( 'abc   ' );
-
-				expect( [ ...list.values() ] ).toEqual( [ 'abc' ] );
-			} );
-
-			it( 'keys', () => {
-				const list = new TokenList( 'abc   ' );
-
-				expect( [ ...list.keys() ] ).toEqual( [ 0 ] );
-			} );
-		} );
-	} );
-
-	describe( 'value', () => {
-		it( 'gets the stringified value', () => {
-			const list = new TokenList( 'abc   ' );
-
-			expect( list.value ).toBe( 'abc' );
-		} );
-
-		it( 'sets to stringified value', () => {
-			const list = new TokenList();
-			list.value = undefined;
-
-			expect( list.value ).toBe( 'undefined' );
-		} );
-
-		it( 'is the stringifier of the instance', () => {
-			const list = new TokenList( 'abc   ' );
-
-			expect( String( list ) ).toBe( 'abc' );
-		} );
-	} );
-
-	describe( 'Symbol.iterator', () => {
-		it( 'returns a generator', () => {
-			const list = new TokenList();
-
-			expect( list[ Symbol.iterator ]().next ).toEqual(
-				expect.any( Function )
-			);
-		} );
-
-		it( 'yields entries', () => {
-			expect.assertions( 2 );
-
-			const classes = [ 'abc', 'def' ];
-			const list = new TokenList( classes.join( ' ' ) );
-
-			let i = 0;
-			for ( const item of list ) {
-				expect( item ).toBe( classes[ i++ ] );
-			}
-		} );
-	} );
-
-	describe( 'item', () => {
-		it( 'should return undefined if item at index does not exist', () => {
-			const list = new TokenList();
-
-			expect( list.item( 0 ) ).toBeUndefined();
-		} );
-
-		it( 'should return item at index', () => {
-			const list = new TokenList( 'abc' );
-
-			expect( list.item( 0 ) ).toBe( 'abc' );
-		} );
-	} );
-
-	describe( 'contains', () => {
-		it( 'should return false if token does not exist', () => {
-			const list = new TokenList();
-
-			expect( list.contains( 'abc' ) ).toBe( false );
-		} );
-
-		it( 'should return true if token exists', () => {
-			const list = new TokenList( 'abc' );
-
-			expect( list.contains( 'abc' ) ).toBe( true );
-		} );
-	} );
-
-	describe( 'add', () => {
-		it( 'does nothing if token already exists', () => {
-			const list = new TokenList( 'abc' );
-			const returnValue = list.add( 'abc' );
-
-			expect( list.value ).toBe( 'abc' );
-			expect( list ).toHaveLength( 1 );
-			expect( returnValue ).toBeUndefined();
-		} );
-
-		it( 'does nothing if token already exists (whitespace variation)', () => {
-			const list = new TokenList( 'abc   ' );
-			const returnValue = list.add( '' );
-
-			expect( list.value ).toBe( 'abc' );
-			expect( list ).toHaveLength( 1 );
-			expect( returnValue ).toBeUndefined();
-		} );
-
-		it( 'does not add an empty token', () => {
-			const list = new TokenList( 'abc' );
-			const returnValue = list.add( '' );
-
-			expect( list.value ).toBe( 'abc' );
-			expect( list ).toHaveLength( 1 );
-			expect( returnValue ).toBeUndefined();
-		} );
-
-		it( 'adds token to empty initial value', () => {
-			const list = new TokenList();
-			const returnValue = list.add( 'abc' );
-
-			expect( list.value ).toBe( 'abc' );
-			expect( list ).toHaveLength( 1 );
-			expect( returnValue ).toBeUndefined();
-		} );
-
-		it( 'adds token to non-empty initial value', () => {
-			const list = new TokenList( 'abc' );
-			const returnValue = list.add( 'def' );
-
-			expect( list.value ).toBe( 'abc def' );
-			expect( list ).toHaveLength( 2 );
-			expect( returnValue ).toBeUndefined();
-		} );
-
-		it( 'adds multiple tokens, uniquely', () => {
-			const list = new TokenList( 'abc' );
-			const returnValue = list.add( 'abc', 'def', 'ghi' );
-
-			expect( list.value ).toBe( 'abc def ghi' );
-			expect( list ).toHaveLength( 3 );
-			expect( returnValue ).toBeUndefined();
-		} );
-	} );
-
-	describe( 'remove', () => {
-		it( 'does nothing if token does not exist', () => {
-			const list = new TokenList( 'abc' );
-			const returnValue = list.remove( 'def' );
-
-			expect( list.value ).toBe( 'abc' );
-			expect( list ).toHaveLength( 1 );
-			expect( returnValue ).toBeUndefined();
-		} );
-
-		it( 'removes token', () => {
-			const list = new TokenList( 'abc def' );
-			const returnValue = list.remove( 'def' );
-
-			expect( list.value ).toBe( 'abc' );
-			expect( list ).toHaveLength( 1 );
-			expect( returnValue ).toBeUndefined();
-		} );
-
-		it( 'removes multiple tokens', () => {
-			const list = new TokenList( 'abc def' );
-			const returnValue = list.remove( 'abc', 'def' );
-
-			expect( list.value ).toBe( '' );
-			expect( list ).toHaveLength( 0 );
-			expect( returnValue ).toBeUndefined();
-		} );
-	} );
-
-	describe( 'replace', () => {
-		it( 'does nothing if token does not exist', () => {
-			const list = new TokenList( 'abc' );
-			const returnValue = list.replace( 'def', 'ghi' );
-
-			expect( list.value ).toBe( 'abc' );
-			expect( list ).toHaveLength( 1 );
-			expect( returnValue ).toBe( false );
-		} );
-
-		it( 'removes token', () => {
-			const list = new TokenList( 'abc def' );
-			const returnValue = list.replace( 'def', 'ghi' );
-
-			expect( list.value ).toBe( 'abc ghi' );
-			expect( list ).toHaveLength( 2 );
-			expect( returnValue ).toBe( true );
-		} );
-	} );
-
-	describe( 'supports', () => {
-		it( 'returns true', () => {
-			const list = new TokenList( 'abc def' );
-
-			expect( list.supports( 'does-not-matter' ) ).toBe( true );
-		} );
-	} );
-
-	describe( 'toggle', () => {
-		describe( 'without force', () => {
-			it( 'toggles off', () => {
-				const list = new TokenList( 'abc' );
-				const returnValue = list.toggle( 'abc' );
-
-				expect( list.value ).toBe( '' );
-				expect( list ).toHaveLength( 0 );
-				expect( returnValue ).toBe( false );
-			} );
-
-			it( 'toggles on', () => {
-				const list = new TokenList();
-				const returnValue = list.toggle( 'abc' );
-
-				expect( list.value ).toBe( 'abc' );
-				expect( list ).toHaveLength( 1 );
-				expect( returnValue ).toBe( true );
-			} );
-		} );
-
-		describe( 'with force', () => {
-			it( 'toggles off', () => {
-				const list = new TokenList( 'abc' );
-				const returnValue = list.toggle( 'abc', false );
-
-				expect( list.value ).toBe( '' );
-				expect( list ).toHaveLength( 0 );
-				expect( returnValue ).toBe( false );
-			} );
-
-			it( 'toggles on', () => {
-				const list = new TokenList( 'abc' );
-				const returnValue = list.toggle( 'abc', true );
-
-				expect( list.value ).toBe( 'abc' );
-				expect( list ).toHaveLength( 1 );
-				expect( returnValue ).toBe( true );
-			} );
-		} );
-	} );
-} );
diff --git a/packages/token-list/src/test/index.ts b/packages/token-list/src/test/index.ts
new file mode 100644
index 00000000000000..fda0de0c53e489
--- /dev/null
+++ b/packages/token-list/src/test/index.ts
@@ -0,0 +1,284 @@
+/**
+ * Internal dependencies
+ */
+import TokenList from '../';
+
+describe( 'token-list', () => {
+	describe( 'constructor', () => {
+		it( 'should instantiate instance with no initial value', () => {
+			const list = new TokenList();
+
+			expect( list.value ).toBe( '' );
+			expect( list ).toHaveLength( 0 );
+		} );
+
+		it( 'should instantiate instance with empty initial value', () => {
+			const list = new TokenList( '' );
+
+			expect( list.value ).toBe( '' );
+			expect( list ).toHaveLength( 0 );
+		} );
+
+		it( 'should instantiate instance with initial value', () => {
+			const list = new TokenList( 'abc   ' );
+
+			expect( list.value ).toBe( 'abc' );
+			expect( list ).toHaveLength( 1 );
+		} );
+
+		describe( 'array method inheritence', () => {
+			it( 'entries', () => {
+				const list = new TokenList( 'abc   ' );
+
+				expect( [ ...list.entries() ] ).toEqual( [ [ 0, 'abc' ] ] );
+			} );
+
+			it( 'forEach', () => {
+				expect.assertions( 1 );
+
+				const list = new TokenList( 'abc   ' );
+
+				list.forEach( ( item ) => expect( item ).toBe( 'abc' ) );
+			} );
+
+			it( 'values', () => {
+				const list = new TokenList( 'abc   ' );
+
+				expect( [ ...list.values() ] ).toEqual( [ 'abc' ] );
+			} );
+
+			it( 'keys', () => {
+				const list = new TokenList( 'abc   ' );
+
+				expect( [ ...list.keys() ] ).toEqual( [ 0 ] );
+			} );
+		} );
+	} );
+
+	describe( 'value', () => {
+		it( 'gets the stringified value', () => {
+			const list = new TokenList( 'abc   ' );
+
+			expect( list.value ).toBe( 'abc' );
+		} );
+
+		it( 'sets to stringified value', () => {
+			const list = new TokenList();
+			// @ts-expect-error The value should be a string, for testing we pass a "bad" value.
+			list.value = undefined;
+
+			expect( list.value ).toBe( 'undefined' );
+		} );
+
+		it( 'is the stringifier of the instance', () => {
+			const list = new TokenList( 'abc   ' );
+
+			expect( String( list ) ).toBe( 'abc' );
+		} );
+	} );
+
+	describe( 'Symbol.iterator', () => {
+		it( 'returns a generator', () => {
+			const list = new TokenList();
+
+			expect( list[ Symbol.iterator ]().next ).toEqual(
+				expect.any( Function )
+			);
+		} );
+
+		it( 'yields entries', () => {
+			expect.assertions( 2 );
+
+			const classes = [ 'abc', 'def' ];
+			const list = new TokenList( classes.join( ' ' ) );
+
+			let i = 0;
+			for ( const item of list ) {
+				expect( item ).toBe( classes[ i++ ] );
+			}
+		} );
+	} );
+
+	describe( 'item', () => {
+		it( 'should return undefined if item at index does not exist', () => {
+			const list = new TokenList();
+
+			expect( list.item( 0 ) ).toBeUndefined();
+		} );
+
+		it( 'should return item at index', () => {
+			const list = new TokenList( 'abc' );
+
+			expect( list.item( 0 ) ).toBe( 'abc' );
+		} );
+	} );
+
+	describe( 'contains', () => {
+		it( 'should return false if token does not exist', () => {
+			const list = new TokenList();
+
+			expect( list.contains( 'abc' ) ).toBe( false );
+		} );
+
+		it( 'should return true if token exists', () => {
+			const list = new TokenList( 'abc' );
+
+			expect( list.contains( 'abc' ) ).toBe( true );
+		} );
+	} );
+
+	describe( 'add', () => {
+		it( 'does nothing if token already exists', () => {
+			const list = new TokenList( 'abc' );
+			const returnValue = list.add( 'abc' );
+
+			expect( list.value ).toBe( 'abc' );
+			expect( list ).toHaveLength( 1 );
+			expect( returnValue ).toBeUndefined();
+		} );
+
+		it( 'does nothing if token already exists (whitespace variation)', () => {
+			const list = new TokenList( 'abc   ' );
+			const returnValue = list.add( '' );
+
+			expect( list.value ).toBe( 'abc' );
+			expect( list ).toHaveLength( 1 );
+			expect( returnValue ).toBeUndefined();
+		} );
+
+		it( 'does not add an empty token', () => {
+			const list = new TokenList( 'abc' );
+			const returnValue = list.add( '' );
+
+			expect( list.value ).toBe( 'abc' );
+			expect( list ).toHaveLength( 1 );
+			expect( returnValue ).toBeUndefined();
+		} );
+
+		it( 'adds token to empty initial value', () => {
+			const list = new TokenList();
+			const returnValue = list.add( 'abc' );
+
+			expect( list.value ).toBe( 'abc' );
+			expect( list ).toHaveLength( 1 );
+			expect( returnValue ).toBeUndefined();
+		} );
+
+		it( 'adds token to non-empty initial value', () => {
+			const list = new TokenList( 'abc' );
+			const returnValue = list.add( 'def' );
+
+			expect( list.value ).toBe( 'abc def' );
+			expect( list ).toHaveLength( 2 );
+			expect( returnValue ).toBeUndefined();
+		} );
+
+		it( 'adds multiple tokens, uniquely', () => {
+			const list = new TokenList( 'abc' );
+			const returnValue = list.add( 'abc', 'def', 'ghi' );
+
+			expect( list.value ).toBe( 'abc def ghi' );
+			expect( list ).toHaveLength( 3 );
+			expect( returnValue ).toBeUndefined();
+		} );
+	} );
+
+	describe( 'remove', () => {
+		it( 'does nothing if token does not exist', () => {
+			const list = new TokenList( 'abc' );
+			const returnValue = list.remove( 'def' );
+
+			expect( list.value ).toBe( 'abc' );
+			expect( list ).toHaveLength( 1 );
+			expect( returnValue ).toBeUndefined();
+		} );
+
+		it( 'removes token', () => {
+			const list = new TokenList( 'abc def' );
+			const returnValue = list.remove( 'def' );
+
+			expect( list.value ).toBe( 'abc' );
+			expect( list ).toHaveLength( 1 );
+			expect( returnValue ).toBeUndefined();
+		} );
+
+		it( 'removes multiple tokens', () => {
+			const list = new TokenList( 'abc def' );
+			const returnValue = list.remove( 'abc', 'def' );
+
+			expect( list.value ).toBe( '' );
+			expect( list ).toHaveLength( 0 );
+			expect( returnValue ).toBeUndefined();
+		} );
+	} );
+
+	describe( 'replace', () => {
+		it( 'does nothing if token does not exist', () => {
+			const list = new TokenList( 'abc' );
+			const returnValue = list.replace( 'def', 'ghi' );
+
+			expect( list.value ).toBe( 'abc' );
+			expect( list ).toHaveLength( 1 );
+			expect( returnValue ).toBe( false );
+		} );
+
+		it( 'removes token', () => {
+			const list = new TokenList( 'abc def' );
+			const returnValue = list.replace( 'def', 'ghi' );
+
+			expect( list.value ).toBe( 'abc ghi' );
+			expect( list ).toHaveLength( 2 );
+			expect( returnValue ).toBe( true );
+		} );
+	} );
+
+	describe( 'supports', () => {
+		it( 'returns true', () => {
+			const list = new TokenList( 'abc def' );
+
+			expect( list.supports( 'does-not-matter' ) ).toBe( true );
+		} );
+	} );
+
+	describe( 'toggle', () => {
+		describe( 'without force', () => {
+			it( 'toggles off', () => {
+				const list = new TokenList( 'abc' );
+				const returnValue = list.toggle( 'abc' );
+
+				expect( list.value ).toBe( '' );
+				expect( list ).toHaveLength( 0 );
+				expect( returnValue ).toBe( false );
+			} );
+
+			it( 'toggles on', () => {
+				const list = new TokenList();
+				const returnValue = list.toggle( 'abc' );
+
+				expect( list.value ).toBe( 'abc' );
+				expect( list ).toHaveLength( 1 );
+				expect( returnValue ).toBe( true );
+			} );
+		} );
+
+		describe( 'with force', () => {
+			it( 'toggles off', () => {
+				const list = new TokenList( 'abc' );
+				const returnValue = list.toggle( 'abc', false );
+
+				expect( list.value ).toBe( '' );
+				expect( list ).toHaveLength( 0 );
+				expect( returnValue ).toBe( false );
+			} );
+
+			it( 'toggles on', () => {
+				const list = new TokenList( 'abc' );
+				const returnValue = list.toggle( 'abc', true );
+
+				expect( list.value ).toBe( 'abc' );
+				expect( list ).toHaveLength( 1 );
+				expect( returnValue ).toBe( true );
+			} );
+		} );
+	} );
+} );
diff --git a/packages/token-list/tsconfig.json b/packages/token-list/tsconfig.json
index e22ff86abb6f2d..d1947d4c52ffdf 100644
--- a/packages/token-list/tsconfig.json
+++ b/packages/token-list/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/undo-manager/.npmrc b/packages/undo-manager/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/undo-manager/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/undo-manager/CHANGELOG.md b/packages/undo-manager/CHANGELOG.md
index 412281eefcee7f..a3b1f6c6ecdab8 100644
--- a/packages/undo-manager/CHANGELOG.md
+++ b/packages/undo-manager/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 1.10.0 (2024-10-16)
+
+## 1.9.0 (2024-10-03)
+
+## 1.8.0 (2024-09-19)
+
+## 1.7.0 (2024-09-05)
+
+## 1.6.0 (2024-08-21)
+
+## 1.5.0 (2024-08-07)
+
+## 1.4.0 (2024-07-24)
+
+## 1.3.0 (2024-07-10)
+
+## 1.2.0 (2024-06-26)
+
+## 1.1.0 (2024-06-15)
+
+## 1.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 0.18.0 (2024-05-16)
+
+## 0.17.0 (2024-05-02)
+
+## 0.16.0 (2024-04-19)
+
+## 0.15.0 (2024-04-03)
+
+## 0.14.0 (2024-03-21)
+
+## 0.13.0 (2024-03-06)
+
+## 0.12.0 (2024-02-21)
+
+## 0.11.0 (2024-02-09)
+
+## 0.10.0 (2024-01-24)
+
+## 0.9.0 (2024-01-10)
+
+## 0.8.0 (2023-12-13)
+
 ## 0.7.0 (2023-11-29)
 
 ## 0.6.0 (2023-11-16)
@@ -13,4 +61,3 @@
 ## 0.3.0 (2023-10-05)
 
 ## 0.2.0 (2023-09-20)
-
diff --git a/packages/undo-manager/package.json b/packages/undo-manager/package.json
index 040e88dcffd059..9e31c9c0d6dd7f 100644
--- a/packages/undo-manager/package.json
+++ b/packages/undo-manager/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/undo-manager",
-	"version": "0.7.0",
+	"version": "1.10.0",
 	"description": "A small package to manage undo/redo.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -20,7 +20,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,10 +29,11 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/is-shallow-equal": "file:../is-shallow-equal"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/is-shallow-equal": "*"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/undo-manager/tsconfig.json b/packages/undo-manager/tsconfig.json
index e53ddb4792e576..055c19d5bf513d 100644
--- a/packages/undo-manager/tsconfig.json
+++ b/packages/undo-manager/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/url/.npmrc b/packages/url/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/url/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/url/CHANGELOG.md b/packages/url/CHANGELOG.md
index 5bed123ffbfe70..fb1175f11adeb7 100644
--- a/packages/url/CHANGELOG.md
+++ b/packages/url/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.59.0 (2024-05-16)
+
+## 3.58.0 (2024-05-02)
+
+## 3.57.0 (2024-04-19)
+
+## 3.56.0 (2024-04-03)
+
+## 3.55.0 (2024-03-21)
+
+## 3.54.0 (2024-03-06)
+
+## 3.53.0 (2024-02-21)
+
+## 3.52.0 (2024-02-09)
+
+## 3.51.0 (2024-01-24)
+
+## 3.50.0 (2024-01-10)
+
+## 3.49.0 (2023-12-13)
+
 ## 3.48.0 (2023-11-29)
 
 ## 3.47.0 (2023-11-16)
@@ -94,13 +142,13 @@
 
 ## 3.3.0 (2021-11-07)
 
-### New Feature
+### New Features
 
 -   Added new `normalizePath` function ([#35992](https://github.com/WordPress/gutenberg/pull/35992)).
 
 ## 3.2.3 (2021-10-12)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `react-native-url-polyfill` dependency ([#34687](https://github.com/WordPress/gutenberg/pull/34687)).
 
@@ -119,25 +167,25 @@
 
 ## 2.21.0 (2021-01-05)
 
-### New Feature
+### New Features
 
 -   Add optional argument `maxLength` for truncating URL in `filterURLForDisplay`
 
 ## 2.16.0 (2020-06-15)
 
-### New Feature
+### New Features
 
 -   Added `getPathAndQueryString`.
 
 ## 2.14.0 (2020-04-30)
 
-### Bug fix
+### Bug Fixes
 
 -   `addQueryArgs` arguments are optional ([#21926](https://github.com/WordPress/gutenberg/pull/21926))
 
 ## 2.13.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
@@ -164,7 +212,7 @@
 
 ## 2.3.1 (2018-11-20)
 
-### Bug fixes
+### Bug Fixes
 
 -   The `isValidProtocol` function now correctly considers the protocol of the URL as only incoporating characters up to and including the colon (':').
 -   `getFragment` is now greedier and matches fragments from the first occurrence of the '#' symbol instead of the last.
@@ -194,18 +242,18 @@
 
 ## 2.1.0 (2018-10-16)
 
-### New Feature
+### New Features
 
 -   Added `safeDecodeURI`.
 
 ## 2.0.1 (2018-09-30)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix typo in the `qs` dependency definition in the `package.json`
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/url/README.md b/packages/url/README.md
index 70e8579acc5182..0e4628669d11f2 100644
--- a/packages/url/README.md
+++ b/packages/url/README.md
@@ -322,6 +322,24 @@ _Returns_
 
 -   `boolean`: Whether or not it looks like an email.
 
+### isPhoneNumber
+
+Determines whether the given string looks like a phone number.
+
+_Usage_
+
+```js
+const isPhoneNumber = isPhoneNumber( '+1 (555) 123-4567' ); // true
+```
+
+_Parameters_
+
+-   _phoneNumber_ `string`: The string to scrutinize.
+
+_Returns_
+
+-   `boolean`: Whether or not it looks like a phone number.
+
 ### isURL
 
 Determines whether the given string looks like a URL.
diff --git a/packages/url/package.json b/packages/url/package.json
index d1327f4b6e8a22..e7228be292bf03 100644
--- a/packages/url/package.json
+++ b/packages/url/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/url",
-	"version": "3.48.0",
+	"version": "4.10.0",
 	"description": "WordPress URL utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -27,10 +28,11 @@
 	"types": "build-types",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
+		"@babel/runtime": "7.25.7",
 		"remove-accents": "^0.5.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/url/src/filter-url-for-display.js b/packages/url/src/filter-url-for-display.js
index eede264e8e801a..436070b667a3e6 100644
--- a/packages/url/src/filter-url-for-display.js
+++ b/packages/url/src/filter-url-for-display.js
@@ -13,8 +13,14 @@
  * @return {string} Displayed URL.
  */
 export function filterURLForDisplay( url, maxLength = null ) {
+	if ( ! url ) {
+		return '';
+	}
+
 	// Remove protocol and www prefixes.
-	let filteredURL = url.replace( /^(?:https?:)\/\/(?:www\.)?/, '' );
+	let filteredURL = url
+		.replace( /^[a-z\-.\+]+[0-9]*:(\/\/)?/i, '' )
+		.replace( /^www\./i, '' );
 
 	// Ends with / and only has that single slash, strip it.
 	if ( filteredURL.match( /^[^\/]+\/$/ ) ) {
diff --git a/packages/url/src/get-filename.js b/packages/url/src/get-filename.js
index 2941f18fe07b4d..d744a8da6bccfe 100644
--- a/packages/url/src/get-filename.js
+++ b/packages/url/src/get-filename.js
@@ -13,6 +13,11 @@
  */
 export function getFilename( url ) {
 	let filename;
+
+	if ( ! url ) {
+		return;
+	}
+
 	try {
 		filename = new URL( url, 'http://example.com' ).pathname
 			.split( '/' )
diff --git a/packages/url/src/get-path-and-query-string.js b/packages/url/src/get-path-and-query-string.js
index 0256a809da6599..f858846b07802c 100644
--- a/packages/url/src/get-path-and-query-string.js
+++ b/packages/url/src/get-path-and-query-string.js
@@ -20,7 +20,11 @@ export function getPathAndQueryString( url ) {
 	const path = getPath( url );
 	const queryString = getQueryString( url );
 	let value = '/';
-	if ( path ) value += path;
-	if ( queryString ) value += `?${ queryString }`;
+	if ( path ) {
+		value += path;
+	}
+	if ( queryString ) {
+		value += `?${ queryString }`;
+	}
 	return value;
 }
diff --git a/packages/url/src/index.js b/packages/url/src/index.js
index 141e19d3fa55fd..378334ba131a6a 100644
--- a/packages/url/src/index.js
+++ b/packages/url/src/index.js
@@ -1,5 +1,6 @@
 export { isURL } from './is-url';
 export { isEmail } from './is-email';
+export { isPhoneNumber } from './is-phone-number';
 export { getProtocol } from './get-protocol';
 export { isValidProtocol } from './is-valid-protocol';
 export { getAuthority } from './get-authority';
diff --git a/packages/url/src/is-phone-number.js b/packages/url/src/is-phone-number.js
new file mode 100644
index 00000000000000..857b468bc52398
--- /dev/null
+++ b/packages/url/src/is-phone-number.js
@@ -0,0 +1,19 @@
+const PHONE_REGEXP = /^(tel:)?(\+)?\d{6,15}$/;
+
+/**
+ * Determines whether the given string looks like a phone number.
+ *
+ * @param {string} phoneNumber The string to scrutinize.
+ *
+ * @example
+ * ```js
+ * const isPhoneNumber = isPhoneNumber('+1 (555) 123-4567'); // true
+ * ```
+ *
+ * @return {boolean} Whether or not it looks like a phone number.
+ */
+export function isPhoneNumber( phoneNumber ) {
+	// Remove any seperator from phone number.
+	phoneNumber = phoneNumber.replace( /[-.() ]/g, '' );
+	return PHONE_REGEXP.test( phoneNumber );
+}
diff --git a/packages/url/src/test/index.js b/packages/url/src/test/index.js
index e258e112b29875..4fc3d5e2970d67 100644
--- a/packages/url/src/test/index.js
+++ b/packages/url/src/test/index.js
@@ -17,6 +17,7 @@ import {
 	hasQueryArg,
 	isEmail,
 	isURL,
+	isPhoneNumber,
 	isValidAuthority,
 	isValidFragment,
 	isValidPath,
@@ -73,6 +74,52 @@ describe( 'isEmail', () => {
 	);
 } );
 
+describe( 'isPhoneNumber', () => {
+	it.each( [
+		'+1 (555) 123-4567',
+		'(555) 123-4567',
+		'555-123-4567',
+		'5551234567',
+		'+91 987 654 3210',
+		'123-456-7890',
+		'(123) 456-7890',
+		'123 456 7890',
+		'123.456.7890',
+		'+1 123 456 7890',
+		'1234567890',
+		'+44 791 112 3456',
+		'(123) 4567',
+		'+1 (123) 45678901',
+		'12-34-56',
+		'123456789012345',
+		'+12 3456789012345',
+		'tel:+1-123-456-7890',
+	] )(
+		'returns true when given things that look like a phone number: %s',
+		( phoneNumber ) => {
+			expect( isPhoneNumber( phoneNumber ) ).toBe( true );
+		}
+	);
+
+	it.each( [
+		'not a phone number',
+		'123',
+		'1234',
+		'12345',
+		'+91 123',
+		'abc-def-ghij',
+		'a123456789b',
+		'12-34-5',
+		'tel:911',
+		'tel:12345',
+	] )(
+		"returns false when given things that don't look like a phone number: %s",
+		( phoneNumber ) => {
+			expect( isPhoneNumber( phoneNumber ) ).toBe( false );
+		}
+	);
+} );
+
 describe( 'getProtocol', () => {
 	it( 'returns the protocol part of a URL', () => {
 		expect(
@@ -283,6 +330,8 @@ describe( 'getFilename', () => {
 		);
 		expect( getFilename( 'a/path/' ) ).toBe( undefined );
 		expect( getFilename( '/' ) ).toBe( undefined );
+		expect( getFilename( undefined ) ).toBe( undefined );
+		expect( getFilename( null ) ).toBe( undefined );
 	} );
 } );
 
@@ -990,11 +1039,23 @@ describe( 'safeDecodeURI', () => {
 } );
 
 describe( 'filterURLForDisplay', () => {
+	it( 'should return an empty string if the url is empty or falsy', () => {
+		let url = filterURLForDisplay( '' );
+		expect( url ).toBe( '' );
+		url = filterURLForDisplay( null );
+		expect( url ).toBe( '' );
+	} );
 	it( 'should remove protocol', () => {
 		let url = filterURLForDisplay( 'http://wordpress.org' );
 		expect( url ).toBe( 'wordpress.org' );
 		url = filterURLForDisplay( 'https://wordpress.org' );
 		expect( url ).toBe( 'wordpress.org' );
+		url = filterURLForDisplay( 'file:///folder/file.txt' );
+		expect( url ).toBe( '/folder/file.txt' );
+		url = filterURLForDisplay( 'tel:0123456789' );
+		expect( url ).toBe( '0123456789' );
+		url = filterURLForDisplay( 'blob:data' );
+		expect( url ).toBe( 'data' );
 	} );
 	it( 'should remove www subdomain', () => {
 		const url = filterURLForDisplay( 'http://www.wordpress.org' );
diff --git a/packages/url/tsconfig.json b/packages/url/tsconfig.json
index 3c2c31f506f132..6e33d8ff82d47e 100644
--- a/packages/url/tsconfig.json
+++ b/packages/url/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/viewport/.npmrc b/packages/viewport/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/viewport/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/viewport/CHANGELOG.md b/packages/viewport/CHANGELOG.md
index 7f32eaea5b2931..3447e75fd97c6e 100644
--- a/packages/viewport/CHANGELOG.md
+++ b/packages/viewport/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 6.10.0 (2024-10-16)
+
+## 6.9.0 (2024-10-03)
+
+## 6.8.0 (2024-09-19)
+
+## 6.7.0 (2024-09-05)
+
+## 6.6.0 (2024-08-21)
+
+## 6.5.0 (2024-08-07)
+
+## 6.4.0 (2024-07-24)
+
+## 6.3.0 (2024-07-10)
+
+## 6.2.0 (2024-06-26)
+
+## 6.1.0 (2024-06-15)
+
+## 6.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 5.35.0 (2024-05-16)
+
+## 5.34.0 (2024-05-02)
+
+## 5.33.0 (2024-04-19)
+
+## 5.32.0 (2024-04-03)
+
+## 5.31.0 (2024-03-21)
+
+## 5.30.0 (2024-03-06)
+
+## 5.29.0 (2024-02-21)
+
+## 5.28.0 (2024-02-09)
+
+## 5.27.0 (2024-01-24)
+
+## 5.26.0 (2024-01-10)
+
+## 5.25.0 (2023-12-13)
+
 ## 5.24.0 (2023-11-29)
 
 ## 5.23.0 (2023-11-16)
@@ -98,7 +146,7 @@
 
 ## 4.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
@@ -117,13 +165,13 @@
 
 ## 2.25.0 (2020-12-17)
 
-### New Feature
+### New Features
 
 -   Added a store definition `store` for the viewport namespace to use with `@wordpress/data` API ([#26655](https://github.com/WordPress/gutenberg/pull/26655)).
 
 ## 2.1.0 (2019-01-03)
 
-### Improvements
+### Enhancements
 
 -   The initial viewport state is assigned synchronously, rather than on the next process tick. This should have an impact of fewer callbacks made to data subscribers.
 
@@ -147,6 +195,6 @@
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
diff --git a/packages/viewport/package.json b/packages/viewport/package.json
index 2eca13e8f73066..916776cdbe98b3 100644
--- a/packages/viewport/package.json
+++ b/packages/viewport/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/viewport",
-	"version": "5.24.0",
+	"version": "6.10.0",
 	"description": "Viewport module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,21 +19,23 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/data": "file:../data",
-		"@wordpress/element": "file:../element"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/compose": "*",
+		"@wordpress/data": "*",
+		"@wordpress/element": "*"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/a11y/.npmrc b/packages/vips/.npmrc
similarity index 100%
rename from packages/a11y/.npmrc
rename to packages/vips/.npmrc
diff --git a/packages/vips/CHANGELOG.md b/packages/vips/CHANGELOG.md
new file mode 100644
index 00000000000000..691cb6760320f4
--- /dev/null
+++ b/packages/vips/CHANGELOG.md
@@ -0,0 +1,7 @@
+<!-- Learn how to maintain this file at https://github.com/WordPress/gutenberg/tree/HEAD/packages#maintaining-changelogs. -->
+
+## Unreleased
+
+### New Features
+
+-   Initial public release.
diff --git a/packages/vips/README.md b/packages/vips/README.md
new file mode 100644
index 00000000000000..d7bf6001b51027
--- /dev/null
+++ b/packages/vips/README.md
@@ -0,0 +1,98 @@
+# `@wordpress/vips`
+
+Helper package to interact with [`wasm-vips`](https://github.com/kleisauke/wasm-vips).
+
+## Installation
+
+Install the module
+
+```bash
+npm install @wordpress/vips --save
+```
+
+## API Reference
+
+<!-- START TOKEN(Autogenerated API docs) -->
+
+### cancelOperations
+
+Cancels all ongoing image operations for a given item ID.
+
+The onProgress callbacks check for an IDs existence in this list, killing the process if it's absent.
+
+_Parameters_
+
+-   _id_ `ItemId`: Item ID.
+
+_Returns_
+
+-   boolean Whether any operation was cancelled.
+
+### compressImage
+
+Compresses an existing image using vips.
+
+_Parameters_
+
+-   _id_ `ItemId`: Item ID.
+-   _buffer_ `ArrayBuffer`: Original file buffer.
+-   _type_ `string`: Mime type.
+-   _quality_ Desired quality.
+-   _interlaced_ Whether to use interlaced/progressive mode. Only used if the outputType supports it.
+
+_Returns_
+
+-   `Promise< ArrayBuffer >`: Compressed file data.
+
+### convertImageFormat
+
+Converts an image to a different format using vips.
+
+_Parameters_
+
+-   _id_ `ItemId`: Item ID.
+-   _buffer_ `ArrayBuffer`: Original file buffer.
+-   _inputType_ `string`: Input mime type.
+-   _outputType_ `string`: Output mime type.
+-   _quality_ Desired quality.
+-   _interlaced_ Whether to use interlaced/progressive mode. Only used if the outputType supports it.
+
+### hasTransparency
+
+Determines whether an image has an alpha channel.
+
+_Parameters_
+
+-   _buffer_ `ArrayBuffer`: Original file object.
+
+_Returns_
+
+-   `Promise< boolean >`: Whether the image has an alpha channel.
+
+### resizeImage
+
+Resizes an image using vips.
+
+_Parameters_
+
+-   _id_ `ItemId`: Item ID.
+-   _buffer_ `ArrayBuffer`: Original file buffer.
+-   _type_ `string`: Mime type.
+-   _resize_ `ImageSizeCrop`: Resize options.
+-   _smartCrop_ Whether to use smart cropping (i.e. saliency-aware).
+
+_Returns_
+
+-   `Promise< { buffer: ArrayBuffer; width: number; height: number; originalWidth: number; originalHeight: number; } >`: Processed file data plus the old and new dimensions.
+
+### setLocation
+
+Dynamically sets the location / public path to use for loading the WASM files.
+
+This is required when loading this module in an inline worker, where globals such as **webpack_public_path** are not available.
+
+_Parameters_
+
+-   _newLocation_ `string`: Location, typically a base URL such as "<https://example.com/path/to/js/...">.
+
+<!-- END TOKEN(Autogenerated API docs) -->
diff --git a/packages/vips/package.json b/packages/vips/package.json
new file mode 100644
index 00000000000000..810b8d2b5c9fc4
--- /dev/null
+++ b/packages/vips/package.json
@@ -0,0 +1,36 @@
+{
+	"name": "@wordpress/vips",
+	"version": "1.0.0-prerelease",
+	"private": true,
+	"description": "Utils for working with libvips.",
+	"author": "The WordPress Contributors",
+	"license": "GPL-2.0-or-later",
+	"keywords": [
+		"wordpress",
+		"media",
+		"libvips"
+	],
+	"homepage": "https://github.com/WordPress/gutenberg/tree/HEAD/packages/vips/README.md",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/WordPress/gutenberg.git",
+		"directory": "packages/vips"
+	},
+	"bugs": {
+		"url": "https://github.com/WordPress/gutenberg/issues"
+	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
+	"main": "build/index.js",
+	"module": "build-module/index.js",
+	"types": "build-types",
+	"dependencies": {
+		"wasm-vips": "^0.0.10"
+	},
+	"publishConfig": {
+		"access": "public"
+	},
+	"wpScript": true
+}
diff --git a/packages/vips/src/index.ts b/packages/vips/src/index.ts
new file mode 100644
index 00000000000000..5dffe1f0808f28
--- /dev/null
+++ b/packages/vips/src/index.ts
@@ -0,0 +1,366 @@
+/**
+ * External dependencies
+ */
+import Vips from 'wasm-vips';
+
+// @ts-expect-error
+// eslint-disable-next-line import/no-unresolved
+import VipsModule from 'wasm-vips/vips.wasm';
+
+// @ts-expect-error
+// eslint-disable-next-line import/no-unresolved
+import VipsHeifModule from 'wasm-vips/vips-heif.wasm';
+
+// @ts-expect-error
+// eslint-disable-next-line import/no-unresolved
+import VipsJxlModule from 'wasm-vips/vips-jxl.wasm';
+
+/**
+ * Internal dependencies
+ */
+import type {
+	ItemId,
+	ImageSizeCrop,
+	LoadOptions,
+	SaveOptions,
+	ThumbnailOptions,
+} from './types';
+import { supportsAnimation, supportsInterlace, supportsQuality } from './utils';
+
+interface EmscriptenModule {
+	setAutoDeleteLater: ( autoDelete: boolean ) => void;
+	setDelayFunction: ( fn: ( fn: () => void ) => void ) => void;
+}
+
+let location = '';
+
+/**
+ * Dynamically sets the location / public path to use for loading the WASM files.
+ *
+ * This is required when loading this module in an inline worker,
+ * where globals such as __webpack_public_path__ are not available.
+ *
+ * @param newLocation Location, typically a base URL such as "https://example.com/path/to/js/...".
+ */
+export function setLocation( newLocation: string ) {
+	location = newLocation;
+}
+
+let cleanup: () => void;
+
+let vipsInstance: typeof Vips;
+
+/**
+ * Instantiates and returns a new vips instance.
+ *
+ * Reuses any existing instance.
+ */
+async function getVips(): Promise< typeof Vips > {
+	if ( vipsInstance ) {
+		return vipsInstance;
+	}
+
+	vipsInstance = await Vips( {
+		locateFile: ( fileName: string ) => {
+			if ( fileName.endsWith( 'vips.wasm' ) ) {
+				fileName = VipsModule;
+			} else if ( fileName.endsWith( 'vips-heif.wasm' ) ) {
+				fileName = VipsHeifModule;
+			} else if ( fileName.endsWith( 'vips-jxl.wasm' ) ) {
+				fileName = VipsJxlModule;
+			}
+
+			return location + fileName;
+		},
+		preRun: ( module: EmscriptenModule ) => {
+			// https://github.com/kleisauke/wasm-vips/issues/13#issuecomment-1073246828
+			module.setAutoDeleteLater( true );
+			module.setDelayFunction( ( fn: () => void ) => {
+				cleanup = fn;
+			} );
+		},
+	} );
+
+	return vipsInstance;
+}
+
+/**
+ * Holds a list of ongoing operations for a given ID.
+ *
+ * This way, operations can be cancelled mid-progress.
+ */
+const inProgressOperations = new Set< ItemId >();
+
+/**
+ * Cancels all ongoing image operations for a given item ID.
+ *
+ * The onProgress callbacks check for an IDs existence in this list,
+ * killing the process if it's absent.
+ *
+ * @param id Item ID.
+ * @return boolean Whether any operation was cancelled.
+ */
+export async function cancelOperations( id: ItemId ) {
+	return inProgressOperations.delete( id );
+}
+
+/**
+ * Converts an image to a different format using vips.
+ *
+ * @param id         Item ID.
+ * @param buffer     Original file buffer.
+ * @param inputType  Input mime type.
+ * @param outputType Output mime type.
+ * @param quality    Desired quality.
+ * @param interlaced Whether to use interlaced/progressive mode.
+ *                   Only used if the outputType supports it.
+ */
+export async function convertImageFormat(
+	id: ItemId,
+	buffer: ArrayBuffer,
+	inputType: string,
+	outputType: string,
+	quality = 0.82,
+	interlaced = false
+): Promise< ArrayBuffer > {
+	const ext = outputType.split( '/' )[ 1 ];
+
+	inProgressOperations.add( id );
+
+	let strOptions = '';
+	const loadOptions: LoadOptions< typeof inputType > = {};
+
+	// To ensure all frames are loaded in case the image is animated.
+	if ( supportsAnimation( inputType ) ) {
+		strOptions = '[n=-1]';
+		( loadOptions as LoadOptions< typeof inputType > ).n = -1;
+	}
+
+	const vips = await getVips();
+	const image = vips.Image.newFromBuffer( buffer, strOptions, loadOptions );
+
+	// TODO: Report progress, see https://github.com/swissspidy/media-experiments/issues/327.
+	image.onProgress = () => {
+		if ( ! inProgressOperations.has( id ) ) {
+			image.kill = true;
+		}
+	};
+
+	const saveOptions: SaveOptions< typeof outputType > = {};
+
+	if ( supportsQuality( outputType ) ) {
+		saveOptions.Q = quality * 100;
+	}
+
+	if ( interlaced && supportsInterlace( outputType ) ) {
+		saveOptions.interlace = interlaced;
+	}
+
+	// See https://github.com/swissspidy/media-experiments/issues/324.
+	if ( 'image/avif' === outputType ) {
+		saveOptions.effort = 2;
+	}
+
+	const outBuffer = image.writeToBuffer( `.${ ext }`, saveOptions );
+	const result = outBuffer.buffer;
+
+	cleanup?.();
+
+	return result;
+}
+
+/**
+ * Compresses an existing image using vips.
+ *
+ * @param id         Item ID.
+ * @param buffer     Original file buffer.
+ * @param type       Mime type.
+ * @param quality    Desired quality.
+ * @param interlaced Whether to use interlaced/progressive mode.
+ *                   Only used if the outputType supports it.
+ * @return Compressed file data.
+ */
+export async function compressImage(
+	id: ItemId,
+	buffer: ArrayBuffer,
+	type: string,
+	quality = 0.82,
+	interlaced = false
+): Promise< ArrayBuffer > {
+	return convertImageFormat( id, buffer, type, type, quality, interlaced );
+}
+
+/**
+ * Resizes an image using vips.
+ *
+ * @param id        Item ID.
+ * @param buffer    Original file buffer.
+ * @param type      Mime type.
+ * @param resize    Resize options.
+ * @param smartCrop Whether to use smart cropping (i.e. saliency-aware).
+ * @return Processed file data plus the old and new dimensions.
+ */
+export async function resizeImage(
+	id: ItemId,
+	buffer: ArrayBuffer,
+	type: string,
+	resize: ImageSizeCrop,
+	smartCrop = false
+): Promise< {
+	buffer: ArrayBuffer;
+	width: number;
+	height: number;
+	originalWidth: number;
+	originalHeight: number;
+} > {
+	const ext = type.split( '/' )[ 1 ];
+
+	inProgressOperations.add( id );
+
+	const vips = await getVips();
+	const thumbnailOptions: ThumbnailOptions = {
+		size: 'down',
+	};
+
+	let strOptions = '';
+	const loadOptions: LoadOptions< typeof type > = {};
+
+	// To ensure all frames are loaded in case the image is animated.
+	// But only if we're not cropping.
+	if ( supportsAnimation( type ) && ! resize.crop ) {
+		strOptions = '[n=-1]';
+		thumbnailOptions.option_string = strOptions;
+		( loadOptions as LoadOptions< typeof type > ).n = -1;
+	}
+
+	// TODO: Report progress, see https://github.com/swissspidy/media-experiments/issues/327.
+	const onProgress = () => {
+		if ( ! inProgressOperations.has( id ) ) {
+			image.kill = true;
+		}
+	};
+
+	let image = vips.Image.newFromBuffer( buffer, strOptions, loadOptions );
+
+	image.onProgress = onProgress;
+
+	const { width, pageHeight } = image;
+
+	// If resize.height is zero.
+	resize.height = resize.height || ( pageHeight / width ) * resize.width;
+
+	let resizeWidth = resize.width;
+	thumbnailOptions.height = resize.height;
+
+	if ( ! resize.crop ) {
+		image = vips.Image.thumbnailBuffer(
+			buffer,
+			resizeWidth,
+			thumbnailOptions
+		);
+
+		image.onProgress = onProgress;
+	} else if ( true === resize.crop ) {
+		thumbnailOptions.crop = smartCrop ? 'attention' : 'centre';
+
+		image = vips.Image.thumbnailBuffer(
+			buffer,
+			resizeWidth,
+			thumbnailOptions
+		);
+
+		image.onProgress = onProgress;
+	} else {
+		// First resize, then do the cropping.
+		// This allows operating on the second bitmap with the correct dimensions.
+
+		if ( width < pageHeight ) {
+			resizeWidth =
+				resize.width >= resize.height
+					? resize.width
+					: ( width / pageHeight ) * resize.height;
+			thumbnailOptions.height =
+				resize.width >= resize.height
+					? ( pageHeight / width ) * resizeWidth
+					: resize.height;
+		} else {
+			resizeWidth =
+				resize.width >= resize.height
+					? ( width / pageHeight ) * resize.height
+					: resize.width;
+			thumbnailOptions.height =
+				resize.width >= resize.height
+					? resize.height
+					: ( pageHeight / width ) * resizeWidth;
+		}
+
+		image = vips.Image.thumbnailBuffer(
+			buffer,
+			resizeWidth,
+			thumbnailOptions
+		);
+
+		image.onProgress = onProgress;
+
+		let left = 0;
+		if ( 'center' === resize.crop[ 0 ] ) {
+			left = ( image.width - resize.width ) / 2;
+		} else if ( 'right' === resize.crop[ 0 ] ) {
+			left = image.width - resize.width;
+		}
+
+		let top = 0;
+		if ( 'center' === resize.crop[ 1 ] ) {
+			top = ( image.height - resize.height ) / 2;
+		} else if ( 'bottom' === resize.crop[ 1 ] ) {
+			top = image.height - resize.height;
+		}
+
+		// Address rounding errors where `left` or `top` become negative integers
+		// and `resize.width` / `resize.height` are bigger than the actual dimensions.
+		// Downside: one side could be 1px smaller than the requested size.
+		left = Math.max( 0, left );
+		top = Math.max( 0, top );
+		resize.width = Math.min( image.width, resize.width );
+		resize.height = Math.min( image.height, resize.height );
+
+		image = image.crop( left, top, resize.width, resize.height );
+
+		image.onProgress = onProgress;
+	}
+
+	// TODO: Allow passing quality?
+	const saveOptions: SaveOptions< typeof type > = {};
+	const outBuffer = image.writeToBuffer( `.${ ext }`, saveOptions );
+
+	const result = {
+		buffer: outBuffer.buffer,
+		width: image.width,
+		height: image.pageHeight,
+		originalWidth: width,
+		originalHeight: pageHeight,
+	};
+
+	// Only call after `image` is no longer being used.
+	cleanup?.();
+
+	return result;
+}
+
+/**
+ * Determines whether an image has an alpha channel.
+ *
+ * @param buffer Original file object.
+ * @return Whether the image has an alpha channel.
+ */
+export async function hasTransparency(
+	buffer: ArrayBuffer
+): Promise< boolean > {
+	const vips = await getVips();
+	const image = vips.Image.newFromBuffer( buffer );
+	const hasAlpha = image.hasAlpha();
+
+	cleanup?.();
+
+	return hasAlpha;
+}
diff --git a/packages/vips/src/test/resize-image.ts b/packages/vips/src/test/resize-image.ts
new file mode 100644
index 00000000000000..1f1155d388d42c
--- /dev/null
+++ b/packages/vips/src/test/resize-image.ts
@@ -0,0 +1,223 @@
+/**
+ * Internal dependencies
+ */
+import { resizeImage } from '../';
+import type { ImageSizeCrop } from '../types';
+
+const mockThumbnailBuffer = jest.fn( () => new MockImage() );
+const mockCrop = jest.fn( () => new MockImage() );
+const mockNewFromBuffer = jest.fn( () => new MockImage() );
+
+class MockImage {
+	width = 100;
+	height = 100;
+	pageHeight = 100;
+	crop = mockCrop;
+	writeToBuffer = jest.fn( () => ( {
+		buffer: '',
+	} ) );
+}
+
+class MockVipsImage {
+	static thumbnailBuffer = mockThumbnailBuffer;
+	static newFromBuffer = mockNewFromBuffer;
+}
+
+jest.mock( 'wasm-vips', () =>
+	jest.fn( () => ( {
+		Image: MockVipsImage,
+	} ) )
+);
+
+describe( 'resizeImage', () => {
+	afterEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	it( 'resizes without crop', async () => {
+		const jpegFile = new File( [ '<BLOB>' ], 'example.jpg', {
+			lastModified: 1234567891,
+			type: 'image/jpeg',
+		} );
+		const buffer = await jpegFile.arrayBuffer();
+
+		await resizeImage( 'itemId', buffer, 'image/jpeg', {
+			width: 100,
+			height: 100,
+		} );
+
+		expect( mockThumbnailBuffer ).toHaveBeenCalledWith( buffer, 100, {
+			height: 100,
+			size: 'down',
+		} );
+		expect( mockCrop ).not.toHaveBeenCalled();
+	} );
+
+	it( 'resizes without crop and zero height', async () => {
+		const jpegFile = new File( [], 'example.jpg', {
+			lastModified: 1234567891,
+			type: 'image/jpeg',
+		} );
+		const buffer = await jpegFile.arrayBuffer();
+
+		await resizeImage( 'itemId', buffer, 'image/jpeg', {
+			width: 100,
+			height: 0,
+		} );
+
+		expect( mockThumbnailBuffer ).toHaveBeenCalledWith( buffer, 100, {
+			size: 'down',
+			height: 100,
+		} );
+		expect( mockCrop ).not.toHaveBeenCalled();
+	} );
+
+	it( 'resizes with center crop', async () => {
+		const jpegFile = new File( [ '<BLOB>' ], 'example.jpg', {
+			lastModified: 1234567891,
+			type: 'image/jpeg',
+		} );
+		const buffer = await jpegFile.arrayBuffer();
+
+		await resizeImage( 'itemId', buffer, 'image/jpeg', {
+			width: 100,
+			height: 100,
+			crop: true,
+		} );
+
+		expect( mockThumbnailBuffer ).toHaveBeenCalledWith( buffer, 100, {
+			height: 100,
+			crop: 'centre',
+			size: 'down',
+		} );
+		expect( mockCrop ).not.toHaveBeenCalled();
+	} );
+
+	it( 'resizes with center crop and zero height', async () => {
+		const jpegFile = new File( [ '<BLOB>' ], 'example.jpg', {
+			lastModified: 1234567891,
+			type: 'image/jpeg',
+		} );
+		const buffer = await jpegFile.arrayBuffer();
+
+		await resizeImage( 'itemId', buffer, 'image/jpeg', {
+			width: 100,
+			height: 0,
+			crop: true,
+		} );
+
+		expect( mockThumbnailBuffer ).toHaveBeenCalledWith( buffer, 100, {
+			crop: 'centre',
+			height: 100,
+			size: 'down',
+		} );
+		expect( mockCrop ).not.toHaveBeenCalled();
+	} );
+
+	it( 'resizes without crop and attention strategy', async () => {
+		const jpegFile = new File( [ '<BLOB>' ], 'example.jpg', {
+			lastModified: 1234567891,
+			type: 'image/jpeg',
+		} );
+		const buffer = await jpegFile.arrayBuffer();
+
+		await resizeImage(
+			'itemId',
+			buffer,
+			'image/jpeg',
+			{
+				width: 100,
+				height: 100,
+			},
+			true
+		);
+
+		expect( mockThumbnailBuffer ).toHaveBeenCalledWith( buffer, 100, {
+			height: 100,
+			size: 'down',
+		} );
+		expect( mockCrop ).not.toHaveBeenCalled();
+	} );
+
+	it( 'resizes with center crop and attention strategy', async () => {
+		const jpegFile = new File( [ '<BLOB>' ], 'example.jpg', {
+			lastModified: 1234567891,
+			type: 'image/jpeg',
+		} );
+		const buffer = await jpegFile.arrayBuffer();
+
+		await resizeImage(
+			'itemId',
+			buffer,
+			'image/jpeg',
+			{
+				width: 100,
+				height: 100,
+				crop: true,
+			},
+			true
+		);
+
+		expect( mockThumbnailBuffer ).toHaveBeenCalledWith( buffer, 100, {
+			height: 100,
+			crop: 'attention',
+			size: 'down',
+		} );
+		expect( mockCrop ).not.toHaveBeenCalled();
+	} );
+
+	it.each< [ ImageSizeCrop[ 'crop' ], [ number, number, number, number ] ] >(
+		[
+			[
+				[ 'left', 'top' ],
+				[ 0, 0, 25, 25 ],
+			],
+			[
+				[ 'center', 'top' ],
+				[ 37.5, 0, 25, 25 ],
+			],
+			[
+				[ 'right', 'top' ],
+				[ 75, 0, 25, 25 ],
+			],
+			[
+				[ 'left', 'center' ],
+				[ 0, 37.5, 25, 25 ],
+			],
+			[
+				[ 'center', 'center' ],
+				[ 37.5, 37.5, 25, 25 ],
+			],
+			[
+				[ 'right', 'center' ],
+				[ 75, 37.5, 25, 25 ],
+			],
+			[
+				[ 'left', 'bottom' ],
+				[ 0, 75, 25, 25 ],
+			],
+			[
+				[ 'center', 'bottom' ],
+				[ 37.5, 75, 25, 25 ],
+			],
+			[
+				[ 'right', 'bottom' ],
+				[ 75, 75, 25, 25 ],
+			],
+		]
+	)( 'resizes with %s param and crops %s', async ( crop, expected ) => {
+		const jpegFile = new File( [ '<BLOB>' ], 'example.jpg', {
+			lastModified: 1234567891,
+			type: 'image/jpeg',
+		} );
+		const buffer = await jpegFile.arrayBuffer();
+
+		await resizeImage( 'itemId', buffer, 'image/jpeg', {
+			width: 25,
+			height: 25,
+			crop,
+		} );
+
+		expect( mockCrop ).toHaveBeenCalledWith( ...expected );
+	} );
+} );
diff --git a/packages/vips/src/types.ts b/packages/vips/src/types.ts
new file mode 100644
index 00000000000000..d0978ff7979634
--- /dev/null
+++ b/packages/vips/src/types.ts
@@ -0,0 +1,170 @@
+export type ItemId = string;
+
+export interface ImageSizeCrop {
+	width: number;
+	height: number;
+	crop?:
+		| boolean
+		| [ 'left' | 'center' | 'right', 'top' | 'center' | 'bottom' ];
+}
+
+/**
+ * none: Do nothing. Same as low.
+ * centre: Just take the centre.
+ * entropy: Use an entropy measure
+ * attention: Look for features likely to draw human attention.
+ * low: Position the crop towards the low coordinate. Same as none.
+ * high: Position the crop towards the high coordinate.
+ * all: Everything is interesting.
+ */
+type Interesting =
+	| 'none'
+	| 'centre'
+	| 'entropy'
+	| 'attention'
+	| 'low'
+	| 'high'
+	| 'all';
+
+/**
+ * none: Don't attach metadata.
+ * exif: Keep Exif metadata.
+ * xmp: Keep XMP metadata.
+ * iptc: Keep IPTC metadata.
+ * icc: Keep ICC metadata.
+ * other: Keep other metadata (e.g. PNG comments and some TIFF tags).
+ * all: Keep all metadata.
+ */
+type ForeignKeep = 'none' | 'exif' | 'xmp' | 'iptc' | 'icc' | 'other' | 'all';
+
+/**
+ * The rendering intent.'absolute' is best for
+ * scientific work, 'relative' is usually best for
+ * accurate communication with other imaging libraries.
+ *
+ * perceptual: Perceptual rendering intent.
+ * relative: Relative colorimetric rendering intent.
+ * saturation: Saturation rendering intent.
+ * absolute: Absolute colorimetric rendering intent.
+ */
+type Intent = 'perceptual' | 'relative' | 'saturation' | 'absolute';
+
+/**
+ * How sensitive loaders are to errors, from never stop (very insensitive), to
+ * stop on the smallest warning (very sensitive).
+ *
+ * Each one implies the ones before it, so 'error' implies
+ * 'truncated'.
+ *
+ * none: Never stop.
+ * truncated: Stop on image truncated, nothing else.
+ * error: Stop on serious error or truncation.
+ * warning: Stop on anything, even warnings.
+ */
+type FailOn = 'none' | 'truncated' | 'error' | 'warning';
+
+/**
+ * The type of access an operation has to supply. See vips_tilecache()
+ * and #VipsForeign.
+ *
+ * random: means requests can come in any order.
+ *
+ * sequential: means requests will be top-to-bottom, but with some
+ * amount of buffering behind the read point for small non-local accesses.
+ */
+type Access = 'random' | 'sequential' | 'sequential-unbuffered';
+
+export interface LoadOptions< T extends string > {
+	/**
+	 * Number of pages to load, -1 for all.
+	 */
+	n?: T extends 'image/gif'
+		? number
+		: T extends 'image/webp'
+		? number
+		: never;
+	/**
+	 * Required access pattern for this file.
+	 */
+	access?: Access;
+	/**
+	 * Error level to fail on.
+	 */
+	fail_on?: FailOn;
+	/**
+	 * Don't use a cached result for this operation.
+	 */
+	revalidate?: boolean;
+}
+
+export interface SaveOptions< T extends string > {
+	/**
+	 * Quality factor.
+	 */
+	Q?: T extends 'image/gif' ? never : number;
+	/**
+	 * Which metadata to retain.
+	 */
+	keep?: ForeignKeep;
+	/**
+	 * Generate an interlaced (progressive) JPEG/PNG/GIF.
+	 * Do not provide for any other type!
+	 */
+	interlace?: boolean;
+	/**
+	 * Enable lossless compression (for WebP).
+	 * Do not provide for any other type!
+	 */
+	lossless?: T extends 'image/gif' ? never : boolean;
+	/**
+	 * CPU effort / encoding speed.
+	 *
+	 * While supported by other encoders as well,
+	 * it is most relevant for AVIF, as it is slow by default.
+	 */
+	effort?: number;
+}
+
+export interface ThumbnailOptions {
+	/**
+	 * Options that are passed on to the underlying loader.
+	 */
+	option_string?: string;
+	/**
+	 * Size to this height.
+	 */
+	height?: number;
+	/**
+	 * Whether to upsize, downsize, both up and
+	 * downsize, or force a size (breaks aspect ratio).
+	 */
+	size?: 'both' | 'up' | 'down' | 'force';
+	/**
+	 * Don't use orientation tags to rotate image upright.
+	 */
+	no_rotate?: boolean;
+	/**
+	 * Reduce to fill target rectangle, then crop.
+	 */
+	crop?: Interesting;
+	/**
+	 * Reduce in linear light.
+	 */
+	linear?: boolean;
+	/**
+	 * Fallback import profile.
+	 */
+	import_profile?: string;
+	/**
+	 * Fallback export profile.
+	 */
+	export_profile?: string;
+	/**
+	 * Rendering intent.
+	 */
+	intent?: Intent;
+	/**
+	 * Error level to fail on.
+	 */
+	fail_on?: FailOn;
+}
diff --git a/packages/vips/src/utils.ts b/packages/vips/src/utils.ts
new file mode 100644
index 00000000000000..924d28110b597e
--- /dev/null
+++ b/packages/vips/src/utils.ts
@@ -0,0 +1,43 @@
+/**
+ * Determines whether a given file type supports a quality setting,
+ *
+ * @todo Make this smarter.
+ *
+ * @param type Mime type.
+ * @return Whether the file supports a quality setting.
+ */
+export function supportsQuality(
+	type: string
+): type is 'image/jpeg' | 'image/png' | 'image/webp' | 'image/avif' {
+	return [ 'image/jpeg', 'image/png', 'image/webp', 'image/avif' ].includes(
+		type
+	);
+}
+
+/**
+ * Determines whether a given file type supports animation,
+ *
+ * @todo Make this smarter.
+ *
+ * @param type Mime type.
+ * @return Whether the file supports animation.
+ */
+export function supportsAnimation(
+	type: string
+): type is 'image/webp' | 'image/gif' {
+	return [ 'image/webp', 'image/gif' ].includes( type );
+}
+
+/**
+ * Determines whether a given file type supports interlaced/progressive output.
+ *
+ * @todo Make this smarter.
+ *
+ * @param type Mime type.
+ * @return Whether the file supports interlaced/progressive output.
+ */
+export function supportsInterlace(
+	type: string
+): type is 'image/jpeg' | 'image/gif' | 'image/png' {
+	return [ 'image/jpeg', 'image/gif', 'image/png' ].includes( type );
+}
diff --git a/packages/vips/tsconfig.json b/packages/vips/tsconfig.json
new file mode 100644
index 00000000000000..6e33d8ff82d47e
--- /dev/null
+++ b/packages/vips/tsconfig.json
@@ -0,0 +1,9 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig.json",
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"declarationDir": "build-types"
+	},
+	"include": [ "src/**/*" ]
+}
diff --git a/packages/warning/.npmrc b/packages/warning/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/warning/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/warning/CHANGELOG.md b/packages/warning/CHANGELOG.md
index 16dec4f7ea711b..bce0ba957230b9 100644
--- a/packages/warning/CHANGELOG.md
+++ b/packages/warning/CHANGELOG.md
@@ -2,6 +2,59 @@
 
 ## Unreleased
 
+## 3.10.0 (2024-10-16)
+
+## 3.9.0 (2024-10-03)
+
+## 3.8.0 (2024-09-19)
+
+## 3.7.0 (2024-09-05)
+
+## 3.6.0 (2024-08-21)
+
+## 3.5.0 (2024-08-07)
+
+## 3.4.0 (2024-07-24)
+
+## 3.3.0 (2024-07-10)
+
+## 3.2.0 (2024-06-26)
+
+## 3.1.0 (2024-06-15)
+
+### Internal
+
+-   Refactor to TypeScript ([#62557](https://github.com/WordPress/gutenberg/pull/62557)).
+
+## 3.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Variables like `process.env.IS_GUTENBERG_PLUGIN` have been replaced by `globalThis.IS_GUTENBERG_PLUGIN`. Build systems using `process.env` should be updated ([#61486](https://github.com/WordPress/gutenberg/pull/61486)).
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 2.58.0 (2024-05-16)
+
+## 2.57.0 (2024-05-02)
+
+## 2.56.0 (2024-04-19)
+
+## 2.55.0 (2024-04-03)
+
+## 2.54.0 (2024-03-21)
+
+## 2.53.0 (2024-03-06)
+
+## 2.52.0 (2024-02-21)
+
+## 2.51.0 (2024-02-09)
+
+## 2.50.0 (2024-01-24)
+
+## 2.49.0 (2024-01-10)
+
+## 2.48.0 (2023-12-13)
+
 ## 2.47.0 (2023-11-29)
 
 ## 2.46.0 (2023-11-16)
@@ -94,7 +147,7 @@
 
 ## 2.2.0 (2021-07-21)
 
-### Enhancement
+### Enhancements
 
 -   Ensure that the warning for a given message is logged only once.
 
@@ -111,7 +164,7 @@
 
 ## 1.1.0 (2020-04-15)
 
-### New feature
+### New Features
 
 -   Include TypeScript type declarations ([#18942](https://github.com/WordPress/gutenberg/pull/18942))
 
diff --git a/packages/warning/babel-plugin.js b/packages/warning/babel-plugin.js
index 02c466b5de24ec..3cf32d311bd6cd 100644
--- a/packages/warning/babel-plugin.js
+++ b/packages/warning/babel-plugin.js
@@ -14,24 +14,15 @@ const pkg = require( './package.json' );
 function babelPlugin( { types: t } ) {
 	const seen = Symbol();
 
-	const typeofProcessExpression = t.binaryExpression(
-		'!==',
-		t.unaryExpression( 'typeof', t.identifier( 'SCRIPT_DEBUG' ), false ),
-		t.stringLiteral( 'undefined' )
-	);
-
 	const scriptDebugCheckExpression = t.binaryExpression(
 		'===',
-		t.identifier( 'SCRIPT_DEBUG' ),
+		t.memberExpression(
+			t.identifier( 'globalThis' ),
+			t.identifier( 'SCRIPT_DEBUG' )
+		),
 		t.booleanLiteral( true )
 	);
 
-	const logicalExpression = t.logicalExpression(
-		'&&',
-		typeofProcessExpression,
-		scriptDebugCheckExpression
-	);
-
 	return {
 		visitor: {
 			ImportDeclaration( path, state ) {
@@ -70,7 +61,7 @@ function babelPlugin( { types: t } ) {
 					node[ seen ] = true;
 					path.replaceWith(
 						t.ifStatement(
-							logicalExpression,
+							scriptDebugCheckExpression,
 							t.blockStatement( [
 								t.expressionStatement( node ),
 							] )
diff --git a/packages/warning/package.json b/packages/warning/package.json
index 42ad8f73a289d8..d9d4835a220f0a 100644
--- a/packages/warning/package.json
+++ b/packages/warning/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/warning",
-	"version": "2.47.0",
+	"version": "3.10.0",
 	"description": "Warning utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,7 +19,8 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
@@ -28,5 +29,6 @@
 	"sideEffects": false,
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/warning/src/index.js b/packages/warning/src/index.js
deleted file mode 100644
index 89ce71db112a21..00000000000000
--- a/packages/warning/src/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Internal dependencies
- */
-import { logged } from './utils';
-
-function isDev() {
-	return typeof SCRIPT_DEBUG !== 'undefined' && SCRIPT_DEBUG === true;
-}
-
-/**
- * Shows a warning with `message` if environment is not `production`.
- *
- * @param {string} message Message to show in the warning.
- *
- * @example
- * ```js
- * import warning from '@wordpress/warning';
- *
- * function MyComponent( props ) {
- *   if ( ! props.title ) {
- *     warning( '`props.title` was not passed' );
- *   }
- *   ...
- * }
- * ```
- */
-export default function warning( message ) {
-	if ( ! isDev() ) {
-		return;
-	}
-
-	// Skip if already logged.
-	if ( logged.has( message ) ) {
-		return;
-	}
-
-	// eslint-disable-next-line no-console
-	console.warn( message );
-
-	// Throwing an error and catching it immediately to improve debugging
-	// A consumer can use 'pause on caught exceptions'
-	// https://github.com/facebook/react/issues/4216
-	try {
-		throw Error( message );
-	} catch ( x ) {
-		// Do nothing.
-	}
-
-	logged.add( message );
-}
diff --git a/packages/warning/src/index.ts b/packages/warning/src/index.ts
new file mode 100644
index 00000000000000..a5a092abbd2121
--- /dev/null
+++ b/packages/warning/src/index.ts
@@ -0,0 +1,50 @@
+/**
+ * Internal dependencies
+ */
+import { logged } from './utils';
+
+function isDev(): boolean {
+	// eslint-disable-next-line @wordpress/wp-global-usage
+	return globalThis.SCRIPT_DEBUG === true;
+}
+
+/**
+ * Shows a warning with `message` if environment is not `production`.
+ *
+ * @param message Message to show in the warning.
+ *
+ * @example
+ * ```js
+ * import warning from '@wordpress/warning';
+ *
+ * function MyComponent( props ) {
+ *   if ( ! props.title ) {
+ *     warning( '`props.title` was not passed' );
+ *   }
+ *   ...
+ * }
+ * ```
+ */
+export default function warning( message: string ): void {
+	if ( ! isDev() ) {
+		return;
+	}
+
+	// Skip if already logged.
+	if ( logged.has( message ) ) {
+		return;
+	}
+
+	// eslint-disable-next-line no-console
+	console.warn( message );
+
+	// Throwing an error and catching it immediately to improve debugging
+	// A consumer can use 'pause on caught exceptions'
+	// https://github.com/facebook/react/issues/4216
+	try {
+		throw Error( message );
+	} catch ( x ) {
+		// Do nothing.
+	}
+	logged.add( message );
+}
diff --git a/packages/warning/src/test/index.js b/packages/warning/src/test/index.js
index a32e5f1e0fae4e..5fdf67b05360c6 100644
--- a/packages/warning/src/test/index.js
+++ b/packages/warning/src/test/index.js
@@ -4,28 +4,31 @@
 import warning from '..';
 import { logged } from '../utils';
 
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+/* eslint-disable @wordpress/wp-global-usage */
+
 describe( 'warning', () => {
-	const initialScriptDebug = global.SCRIPT_DEBUG;
+	const initialScriptDebug = globalThis.SCRIPT_DEBUG;
 
 	afterEach( () => {
-		global.SCRIPT_DEBUG = initialScriptDebug;
+		globalThis.SCRIPT_DEBUG = initialScriptDebug;
 		logged.clear();
 	} );
 
 	it( 'logs to console.warn when SCRIPT_DEBUG is set to `true`', () => {
-		global.SCRIPT_DEBUG = true;
+		globalThis.SCRIPT_DEBUG = true;
 		warning( 'warning' );
 		expect( console ).toHaveWarnedWith( 'warning' );
 	} );
 
 	it( 'does not log to console.warn if SCRIPT_DEBUG not set to `true`', () => {
-		global.SCRIPT_DEBUG = false;
+		globalThis.SCRIPT_DEBUG = false;
 		warning( 'warning' );
 		expect( console ).not.toHaveWarned();
 	} );
 
 	it( 'should show a message once', () => {
-		global.SCRIPT_DEBUG = true;
+		globalThis.SCRIPT_DEBUG = true;
 		warning( 'warning' );
 		warning( 'warning' );
 
diff --git a/packages/warning/src/utils.js b/packages/warning/src/utils.js
deleted file mode 100644
index fb087255f6bf6b..00000000000000
--- a/packages/warning/src/utils.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Object map tracking messages which have been logged, for use in ensuring a
- * message is only logged once.
- *
- * @type {Set<string>}
- */
-export const logged = new Set();
diff --git a/packages/warning/src/utils.ts b/packages/warning/src/utils.ts
new file mode 100644
index 00000000000000..4f4b5d3e1f7976
--- /dev/null
+++ b/packages/warning/src/utils.ts
@@ -0,0 +1,5 @@
+/**
+ * Object map tracking messages which have been logged, for use in ensuring a
+ * message is only logged once.
+ */
+export const logged: Set< string > = new Set();
diff --git a/packages/warning/test/babel-plugin.js b/packages/warning/test/babel-plugin.js
index a3c4bd55745efd..c845d79d700caa 100644
--- a/packages/warning/test/babel-plugin.js
+++ b/packages/warning/test/babel-plugin.js
@@ -28,7 +28,7 @@ describe( 'babel-plugin', () => {
 		);
 		const expected = join(
 			'import warning from "@wordpress/warning";',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warning("a") : void 0;'
+			'globalThis.SCRIPT_DEBUG === true ? warning("a") : void 0;'
 		);
 
 		expect( transformCode( input ) ).toEqual( expected );
@@ -45,7 +45,7 @@ describe( 'babel-plugin', () => {
 		const input = 'warning("a");';
 		const options = { callee: 'warning' };
 		const expected =
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warning("a") : void 0;';
+			'globalThis.SCRIPT_DEBUG === true ? warning("a") : void 0;';
 
 		expect( transformCode( input, options ) ).toEqual( expected );
 	} );
@@ -59,9 +59,9 @@ describe( 'babel-plugin', () => {
 		);
 		const expected = join(
 			'import warning from "@wordpress/warning";',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warning("a") : void 0;',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warning("b") : void 0;',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warning("c") : void 0;'
+			'globalThis.SCRIPT_DEBUG === true ? warning("a") : void 0;',
+			'globalThis.SCRIPT_DEBUG === true ? warning("b") : void 0;',
+			'globalThis.SCRIPT_DEBUG === true ? warning("c") : void 0;'
 		);
 
 		expect( transformCode( input ) ).toEqual( expected );
@@ -76,9 +76,9 @@ describe( 'babel-plugin', () => {
 		);
 		const expected = join(
 			'import warn from "@wordpress/warning";',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warn("a") : void 0;',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warn("b") : void 0;',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warn("c") : void 0;'
+			'globalThis.SCRIPT_DEBUG === true ? warn("a") : void 0;',
+			'globalThis.SCRIPT_DEBUG === true ? warn("b") : void 0;',
+			'globalThis.SCRIPT_DEBUG === true ? warn("c") : void 0;'
 		);
 
 		expect( transformCode( input ) ).toEqual( expected );
@@ -93,9 +93,9 @@ describe( 'babel-plugin', () => {
 		);
 		const expected = join(
 			'import warn from "@wordpress/warning";',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warn("a") : void 0;',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warn("b") : void 0;',
-			'typeof SCRIPT_DEBUG !== "undefined" && SCRIPT_DEBUG === true ? warn("c") : void 0;'
+			'globalThis.SCRIPT_DEBUG === true ? warn("a") : void 0;',
+			'globalThis.SCRIPT_DEBUG === true ? warn("b") : void 0;',
+			'globalThis.SCRIPT_DEBUG === true ? warn("c") : void 0;'
 		);
 
 		expect( transformCode( input ) ).toEqual( expected );
diff --git a/packages/warning/tsconfig.json b/packages/warning/tsconfig.json
index 671d4a5eba4403..9e3edfe0ae443c 100644
--- a/packages/warning/tsconfig.json
+++ b/packages/warning/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/packages/widgets/.npmrc b/packages/widgets/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/widgets/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/widgets/CHANGELOG.md b/packages/widgets/CHANGELOG.md
index b4e8a97665eaae..2436b6b03bed2e 100644
--- a/packages/widgets/CHANGELOG.md
+++ b/packages/widgets/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.35.0 (2024-05-16)
+
+### Internal
+
+-   Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
+
+## 3.34.0 (2024-05-02)
+
+## 3.33.0 (2024-04-19)
+
+## 3.32.0 (2024-04-03)
+
+## 3.31.0 (2024-03-21)
+
+## 3.30.0 (2024-03-06)
+
+## 3.29.0 (2024-02-21)
+
+## 3.28.0 (2024-02-09)
+
+## 3.27.0 (2024-01-24)
+
+## 3.26.0 (2024-01-10)
+
+## 3.25.0 (2023-12-13)
+
 ## 3.24.0 (2023-11-29)
 
 ## 3.23.0 (2023-11-16)
@@ -96,7 +148,7 @@
 
 ## 2.1.1 (2022-02-10)
 
-### Bug Fix
+### Bug Fixes
 
 -   Removed unused `@wordpress/url` dependency ([#38388](https://github.com/WordPress/gutenberg/pull/38388)).
 
@@ -104,7 +156,7 @@
 
 ## 2.0.0 (2021-07-29)
 
-### Breaking Change
+### Breaking Changes
 
 -   Upgraded React components to work with v17.0 ([#29118](https://github.com/WordPress/gutenberg/pull/29118)). There are no new features in React v17.0 as explained in the [blog post](https://reactjs.org/blog/2020/10/20/react-v17.html).
 
diff --git a/packages/widgets/package.json b/packages/widgets/package.json
index 9118333a4e356f..d85e06c399b2d9 100644
--- a/packages/widgets/package.json
+++ b/packages/widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/widgets",
-	"version": "3.24.0",
+	"version": "4.10.0",
 	"description": "Functionality used by the widgets block editor in the Widgets screen and the Customizer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -16,23 +16,27 @@
 	"bugs": {
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
+	"engines": {
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
+	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"dependencies": {
-		"@babel/runtime": "^7.16.0",
-		"@wordpress/api-fetch": "file:../api-fetch",
-		"@wordpress/block-editor": "file:../block-editor",
-		"@wordpress/blocks": "file:../blocks",
-		"@wordpress/components": "file:../components",
-		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
-		"@wordpress/data": "file:../data",
-		"@wordpress/element": "file:../element",
-		"@wordpress/i18n": "file:../i18n",
-		"@wordpress/icons": "file:../icons",
-		"@wordpress/notices": "file:../notices",
-		"classnames": "^2.3.1"
+		"@babel/runtime": "7.25.7",
+		"@wordpress/api-fetch": "*",
+		"@wordpress/block-editor": "*",
+		"@wordpress/blocks": "*",
+		"@wordpress/components": "*",
+		"@wordpress/compose": "*",
+		"@wordpress/core-data": "*",
+		"@wordpress/data": "*",
+		"@wordpress/element": "*",
+		"@wordpress/i18n": "*",
+		"@wordpress/icons": "*",
+		"@wordpress/notices": "*",
+		"clsx": "^2.1.1"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",
@@ -40,5 +44,6 @@
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/widgets/src/blocks/legacy-widget/block.json b/packages/widgets/src/blocks/legacy-widget/block.json
index 6b0c1e2a916fdd..a03eb090633fc7 100644
--- a/packages/widgets/src/blocks/legacy-widget/block.json
+++ b/packages/widgets/src/blocks/legacy-widget/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "core/legacy-widget",
 	"title": "Legacy Widget",
diff --git a/packages/widgets/src/blocks/legacy-widget/edit/form.js b/packages/widgets/src/blocks/legacy-widget/edit/form.js
index 3d0a1026db7067..1a6572e727c937 100644
--- a/packages/widgets/src/blocks/legacy-widget/edit/form.js
+++ b/packages/widgets/src/blocks/legacy-widget/edit/form.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 /**
  * WordPress dependencies
  */
@@ -92,7 +92,7 @@ export default function Form( {
 	if ( isWide && isMediumLargeViewport ) {
 		return (
 			<div
-				className={ classnames( {
+				className={ clsx( {
 					'wp-block-legacy-widget__container': isVisible,
 				} ) }
 			>
diff --git a/packages/widgets/src/blocks/legacy-widget/edit/index.js b/packages/widgets/src/blocks/legacy-widget/edit/index.js
index cb0b993376668f..c5ca43211e58e6 100644
--- a/packages/widgets/src/blocks/legacy-widget/edit/index.js
+++ b/packages/widgets/src/blocks/legacy-widget/edit/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -11,13 +11,11 @@ import {
 	BlockControls,
 	InspectorControls,
 	BlockIcon,
-	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { Flex, FlexBlock, Spinner, Placeholder } from '@wordpress/components';
 import { brush as brushIcon } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 import { useState, useCallback } from '@wordpress/element';
-import { useSelect } from '@wordpress/data';
 import { useEntityRecord } from '@wordpress/core-data';
 
 /**
@@ -35,7 +33,7 @@ export default function Edit( props ) {
 	const { isWide = false } = props;
 
 	const blockProps = useBlockProps( {
-		className: classnames( {
+		className: clsx( {
 			'is-wide-widget': isWide,
 		} ),
 	} );
@@ -102,11 +100,6 @@ function NotEmpty( {
 	const { record: widgetType, hasResolved: hasResolvedWidgetType } =
 		useEntityRecord( 'root', 'widgetType', widgetTypeId );
 
-	const isNavigationMode = useSelect(
-		( select ) => select( blockEditorStore ).isNavigationMode(),
-		[]
-	);
-
 	const setInstance = useCallback( ( nextInstance ) => {
 		setAttributes( { instance: nextInstance } );
 	}, [] );
@@ -130,8 +123,7 @@ function NotEmpty( {
 		);
 	}
 
-	const mode =
-		idBase && ( isNavigationMode || ! isSelected ) ? 'preview' : 'edit';
+	const mode = idBase && ! isSelected ? 'preview' : 'edit';
 
 	return (
 		<>
diff --git a/packages/widgets/src/blocks/legacy-widget/edit/preview.js b/packages/widgets/src/blocks/legacy-widget/edit/preview.js
index a23e046572ce3e..92388e5e54f3f6 100644
--- a/packages/widgets/src/blocks/legacy-widget/edit/preview.js
+++ b/packages/widgets/src/blocks/legacy-widget/edit/preview.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import clsx from 'clsx';
 
 /**
  * WordPress dependencies
@@ -113,12 +113,9 @@ export default function Preview( { idBase, instance, isVisible } ) {
 				</Placeholder>
 			) }
 			<div
-				className={ classnames(
-					'wp-block-legacy-widget__edit-preview',
-					{
-						'is-offscreen': ! isVisible || ! isLoaded,
-					}
-				) }
+				className={ clsx( 'wp-block-legacy-widget__edit-preview', {
+					'is-offscreen': ! isVisible || ! isLoaded,
+				} ) }
 			>
 				<Disabled>
 					{ /*
diff --git a/packages/widgets/src/blocks/legacy-widget/edit/widget-type-selector.js b/packages/widgets/src/blocks/legacy-widget/edit/widget-type-selector.js
index 215e2d2447c3c9..432588f6aea85f 100644
--- a/packages/widgets/src/blocks/legacy-widget/edit/widget-type-selector.js
+++ b/packages/widgets/src/blocks/legacy-widget/edit/widget-type-selector.js
@@ -27,8 +27,9 @@ export default function WidgetTypeSelector( { selectedId, onSelect } ) {
 
 	return (
 		<SelectControl
+			__next40pxDefaultSize
 			__nextHasNoMarginBottom
-			label={ __( 'Select a legacy widget to display:' ) }
+			label={ __( 'Legacy widget' ) }
 			value={ selectedId ?? '' }
 			options={ [
 				{ value: '', label: __( 'Select widget' ) },
diff --git a/packages/widgets/src/blocks/legacy-widget/editor.scss b/packages/widgets/src/blocks/legacy-widget/editor.scss
index 78bcf533ac5e9d..8c213eec86f9fa 100644
--- a/packages/widgets/src/blocks/legacy-widget/editor.scss
+++ b/packages/widgets/src/blocks/legacy-widget/editor.scss
@@ -3,10 +3,10 @@
 		display: flow-root;
 	}
 	background: $white;
-	border-radius: $radius-block-ui;
-	border: 1px solid $gray-900;
-	padding: $grid-unit-15 - 1px; // Subtract the border width.
-	max-height: calc(100vh - 2px); // Subtract the border width (both top and bottom).
+	border-radius: $radius-small;
+	border: $border-width solid $gray-900;
+	padding: $grid-unit-15 - $border-width;
+	max-height: calc(100vh - #{ $border-width } - #{ $border-width });
 	overflow-y: scroll;
 
 	.wp-block-legacy-widget__edit-form-title {
@@ -57,7 +57,7 @@
 			font-family: system-ui;
 			background-color: transparent;
 			box-sizing: border-box;
-			border: 1px solid $gray-700;
+			border: $border-width solid $gray-700;
 			border-radius: 3px;
 			box-shadow: none;
 			color: $black;
@@ -95,8 +95,8 @@
 	cursor: pointer;
 
 	&:hover::after {
-		border-radius: $radius-block-ui;
-		border: 1px solid $gray-600;
+		border-radius: $radius-small;
+		border: $border-width solid $gray-600;
 		bottom: 0;
 		content: "";
 		left: 0;
diff --git a/packages/widgets/src/blocks/legacy-widget/index.php b/packages/widgets/src/blocks/legacy-widget/index.php
index 94cfb9ba71ebfd..ee13ae9a1c612d 100644
--- a/packages/widgets/src/blocks/legacy-widget/index.php
+++ b/packages/widgets/src/blocks/legacy-widget/index.php
@@ -8,6 +8,10 @@
 /**
  * Renders the 'core/legacy-widget' block.
  *
+ * @since 5.8.0
+ *
+ * @global int $wp_widget_factory.
+ *
  * @param array $attributes The block attributes.
  *
  * @return string Rendered block.
@@ -54,6 +58,8 @@ function render_block_core_legacy_widget( $attributes ) {
 
 /**
  * Registers the 'core/legacy-widget' block.
+ *
+ * @since 5.8.0
  */
 function register_block_core_legacy_widget() {
 	register_block_type_from_metadata(
@@ -70,6 +76,8 @@ function register_block_core_legacy_widget() {
  * Intercepts any request with legacy-widget-preview in the query param and, if
  * set, renders a page containing a preview of the requested Legacy Widget
  * block.
+ *
+ * @since 5.8.0
  */
 function handle_legacy_widget_preview_iframe() {
 	if ( empty( $_GET['legacy-widget-preview'] ) ) {
diff --git a/packages/widgets/src/blocks/widget-group/block.json b/packages/widgets/src/blocks/widget-group/block.json
index c29e811554ac11..6e7ba57b38dbcc 100644
--- a/packages/widgets/src/blocks/widget-group/block.json
+++ b/packages/widgets/src/blocks/widget-group/block.json
@@ -1,6 +1,8 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "core/widget-group",
+	"title": "Widget Group",
 	"category": "widgets",
 	"attributes": {
 		"title": {
diff --git a/packages/widgets/src/blocks/widget-group/edit.js b/packages/widgets/src/blocks/widget-group/edit.js
index 43fe2df0032530..b21049ca3b63c0 100644
--- a/packages/widgets/src/blocks/widget-group/edit.js
+++ b/packages/widgets/src/blocks/widget-group/edit.js
@@ -52,6 +52,7 @@ function PreviewContent( { attributes, setAttributes } ) {
 		<>
 			<RichText
 				tagName="h2"
+				identifier="title"
 				className="widget-title"
 				allowedFormats={ [] }
 				placeholder={ __( 'Title' ) }
diff --git a/packages/widgets/src/blocks/widget-group/editor.scss b/packages/widgets/src/blocks/widget-group/editor.scss
index f854c792eeb240..1cd179539bc1a9 100644
--- a/packages/widgets/src/blocks/widget-group/editor.scss
+++ b/packages/widgets/src/blocks/widget-group/editor.scss
@@ -1,7 +1,7 @@
 .wp-block-widget-group {
 	&.has-child-selected::after {
-		border-radius: $radius-block-ui;
-		border: 1px solid var(--wp-admin-theme-color);
+		border-radius: $radius-small;
+		border: $border-width solid var(--wp-admin-theme-color);
 		bottom: 0;
 		content: "";
 		left: 0;
diff --git a/packages/widgets/src/blocks/widget-group/index.php b/packages/widgets/src/blocks/widget-group/index.php
index 8c8584b296d57e..e8769612a2f170 100644
--- a/packages/widgets/src/blocks/widget-group/index.php
+++ b/packages/widgets/src/blocks/widget-group/index.php
@@ -8,6 +8,11 @@
 /**
  * Renders the 'core/widget-group' block.
  *
+ * @since 5.9.0
+ *
+ * @global array      $wp_registered_sidebars
+ * @global int|string $_sidebar_being_rendered
+ *
  * @param array    $attributes The block attributes.
  * @param string   $content The block content.
  * @param WP_Block $block The block.
@@ -42,6 +47,8 @@ function render_block_core_widget_group( $attributes, $content, $block ) {
 
 /**
  * Registers the 'core/widget-group' block.
+ *
+ * @since 5.9.0
  */
 function register_block_core_widget_group() {
 	register_block_type_from_metadata(
@@ -59,6 +66,10 @@ function register_block_core_widget_group() {
  * it. This lets us get to the current sidebar in
  * render_block_core_widget_group().
  *
+ * @since 5.9.0
+ *
+ * @global int|string $_sidebar_being_rendered
+ *
  * @param int|string $index       Index, name, or ID of the dynamic sidebar.
  */
 function note_sidebar_being_rendered( $index ) {
@@ -70,6 +81,10 @@ function note_sidebar_being_rendered( $index ) {
 /**
  * Clear whatever we set in note_sidebar_being_rendered() after WordPress
  * finishes rendering a sidebar.
+ *
+ * @since 5.9.0
+ *
+ * @global int|string $_sidebar_being_rendered
  */
 function discard_sidebar_being_rendered() {
 	global $_sidebar_being_rendered;
diff --git a/packages/wordcount/.npmrc b/packages/wordcount/.npmrc
deleted file mode 100644
index 43c97e719a5a82..00000000000000
--- a/packages/wordcount/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/packages/wordcount/CHANGELOG.md b/packages/wordcount/CHANGELOG.md
index 75b25aaec0e97e..c622c99b324dd7 100644
--- a/packages/wordcount/CHANGELOG.md
+++ b/packages/wordcount/CHANGELOG.md
@@ -2,6 +2,54 @@
 
 ## Unreleased
 
+## 4.10.0 (2024-10-16)
+
+## 4.9.0 (2024-10-03)
+
+## 4.8.0 (2024-09-19)
+
+## 4.7.0 (2024-09-05)
+
+## 4.6.0 (2024-08-21)
+
+## 4.5.0 (2024-08-07)
+
+## 4.4.0 (2024-07-24)
+
+## 4.3.0 (2024-07-10)
+
+## 4.2.0 (2024-06-26)
+
+## 4.1.0 (2024-06-15)
+
+## 4.0.0 (2024-05-31)
+
+### Breaking Changes
+
+-   Increase the minimum required Node.js version to v18.12.0 matching long-term support releases ([#31270](https://github.com/WordPress/gutenberg/pull/61930)). Learn more about [Node.js releases](https://nodejs.org/en/about/previous-releases).
+
+## 3.58.0 (2024-05-16)
+
+## 3.57.0 (2024-05-02)
+
+## 3.56.0 (2024-04-19)
+
+## 3.55.0 (2024-04-03)
+
+## 3.54.0 (2024-03-21)
+
+## 3.53.0 (2024-03-06)
+
+## 3.52.0 (2024-02-21)
+
+## 3.51.0 (2024-02-09)
+
+## 3.50.0 (2024-01-24)
+
+## 3.49.0 (2024-01-10)
+
+## 3.48.0 (2023-12-13)
+
 ## 3.47.0 (2023-11-29)
 
 ## 3.46.0 (2023-11-16)
@@ -96,7 +144,7 @@
 
 ## 3.1.0 (2021-05-20)
 
-### Enhancement
+### Enhancements
 
 -   Adjusted count logic to recognize also numbers as words ([#27288](https://github.com/WordPress/gutenberg/pull/27288)).
 
@@ -111,46 +159,46 @@
 
 ## 2.0.3 (2018-10-29)
 
-### Polish
+### Internal
 
 -   Fix: `count` returns 0 for empty strings ([#10602](https://github.com/WordPress/gutenberg/pull/10602))
 
 ## 2.0.0 (2018-09-05)
 
-### Breaking Change
+### Breaking Changes
 
 -   Change how required built-ins are polyfilled with Babel 7 ([#9171](https://github.com/WordPress/gutenberg/pull/9171)). If you're using an environment that has limited or no support for ES2015+ such as lower versions of IE then using [core-js](https://github.com/zloirock/core-js) or [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill) will add support for these methods.
 
 ## 1.1.0 (2018-07-12)
 
-### New Feature
+### New Features
 
 -   Updated build to work with Babel 7 ([#7832](https://github.com/WordPress/gutenberg/pull/7832))
 
-### Polish
+### Internal
 
 -   Moved `@WordPress/packages` repository to `@WordPress/gutenberg` ([#7805](https://github.com/WordPress/gutenberg/pull/7805))
 
 ## 1.0.3 (2018-05-18)
 
-### Polish
+### Internal
 
 -   Fix: Standardized `package.json` format ([#119](https://github.com/WordPress/packages/pull/119))
 
 ## 1.0.2 (2018-05-08)
 
-### Bug Fix
+### Bug Fixes
 
 -   Fix: Resolve error when input strings contains only whitespace ([#123](https://github.com/WordPress/packages/pull/123))
 
 ## 1.0.1 (2018-05-01)
 
-### Polish
+### Internal
 
 -   Internal: Include `publishConfig` configuration in `package.json`. ([#114](https://github.com/WordPress/packages/pull/114))
 
 ## 1.0.0 (2018-04-24)
 
-### New Feature
+### New Features
 
 -   Initial release
diff --git a/packages/wordcount/package.json b/packages/wordcount/package.json
index f100df8c7b0a51..f2fa54e449da51 100644
--- a/packages/wordcount/package.json
+++ b/packages/wordcount/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/wordcount",
-	"version": "3.47.0",
+	"version": "4.10.0",
 	"description": "WordPress word count utility.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -19,16 +19,18 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=18.12.0",
+		"npm": ">=8.19.2"
 	},
 	"main": "build/index.js",
 	"module": "build-module/index.js",
 	"react-native": "src/index",
 	"sideEffects": false,
 	"dependencies": {
-		"@babel/runtime": "^7.16.0"
+		"@babel/runtime": "7.25.7"
 	},
 	"publishConfig": {
 		"access": "public"
-	}
+	},
+	"wpScript": true
 }
diff --git a/packages/wordcount/tsconfig.json b/packages/wordcount/tsconfig.json
index 3c2c31f506f132..6e33d8ff82d47e 100644
--- a/packages/wordcount/tsconfig.json
+++ b/packages/wordcount/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
diff --git a/patches/README.md b/patches/README.md
new file mode 100644
index 00000000000000..8149c96950057a
--- /dev/null
+++ b/patches/README.md
@@ -0,0 +1,31 @@
+# Dependency patches
+
+Sometimes there are problems with dependencies that can be solved by patching them. Gutenberg uses
+[`patch-package`](https://www.npmjs.com/package/patch-package) to patch npm dependencies when
+they're installed.
+
+Existing patches should be described and justified here.
+
+## Patches
+
+### `patches/lighthouse+10.4.0.patch`
+
+No notes.
+
+### `patches/react-autosize-textarea+7.1.0.patch`
+
+This package is unmaintained. It's incompatible with some recent versions of React types in ways
+that are mostly harmless.
+
+The `onPointerEnterCapture` and `onPointerLeaveCapture` events were removed. The package is patched
+to remove those events as well.
+
+See https://github.com/facebook/react/pull/17883.
+
+### `patches/react-devtools-core+4.28.5.patch`
+
+No notes.
+
+### `patches/react-native+0.73.3.patch`
+
+No notes.
diff --git a/patches/dom-scroll-into-view+1.2.1.patch b/patches/dom-scroll-into-view+1.2.1.patch
deleted file mode 100644
index abf9482fb11f06..00000000000000
--- a/patches/dom-scroll-into-view+1.2.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/node_modules/dom-scroll-into-view/lib/dom-scroll-into-view.js b/node_modules/dom-scroll-into-view/lib/dom-scroll-into-view.js
-index 557ed5c..23dfbad 100644
---- a/node_modules/dom-scroll-into-view/lib/dom-scroll-into-view.js
-+++ b/node_modules/dom-scroll-into-view/lib/dom-scroll-into-view.js
-@@ -21,6 +21,7 @@ function scrollIntoView(elem, container, config) {
-   allowHorizontalScroll = allowHorizontalScroll === undefined ? true : allowHorizontalScroll;
- 
-   var isWin = util.isWindow(container);
-+  var isFramed = !!(isWin && container.frameElement);
-   var elemOffset = util.offset(elem);
-   var eh = util.outerHeight(elem);
-   var ew = util.outerWidth(elem);
-@@ -35,7 +36,11 @@ function scrollIntoView(elem, container, config) {
-   var ww = undefined;
-   var wh = undefined;
- 
--  if (isWin) {
-+  if (isFramed) {
-+    container = container.document.scrollingElement || container.document.body;
-+  }
-+
-+  if (isWin || isFramed) {
-     win = container;
-     wh = util.height(win);
-     ww = util.width(win);
diff --git a/patches/react-autosize-textarea+7.1.0.patch b/patches/react-autosize-textarea+7.1.0.patch
new file mode 100644
index 00000000000000..7d67e58fd5fab6
--- /dev/null
+++ b/patches/react-autosize-textarea+7.1.0.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-autosize-textarea/lib/TextareaAutosize.d.ts b/node_modules/react-autosize-textarea/lib/TextareaAutosize.d.ts
+index ad6ff3f..e0a6d51 100644
+--- a/node_modules/react-autosize-textarea/lib/TextareaAutosize.d.ts
++++ b/node_modules/react-autosize-textarea/lib/TextareaAutosize.d.ts
+@@ -22,7 +22,7 @@ export declare namespace TextareaAutosize {
+         lineHeight: number | null;
+     };
+ }
+-export declare const TextareaAutosize: React.ForwardRefExoticComponent<Pick<React.HTMLProps<HTMLTextAreaElement>, "default" | "max" | "required" | "media" | "hidden" | "cite" | "data" | "dir" | "form" | "label" | "slot" | "span" | "style" | "title" | "pattern" | "async" | "start" | "low" | "high" | "defer" | "open" | "disabled" | "color" | "content" | "size" | "wrap" | "multiple" | "summary" | "className" | "height" | "id" | "lang" | "method" | "min" | "name" | "target" | "type" | "width" | "role" | "tabIndex" | "crossOrigin" | "href" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "key" | "classID" | "useMap" | "wmode" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "kind" | "src" | "srcLang" | "value" | "download" | "hrefLang" | "rel" | "alt" | "coords" | "shape" | "autoPlay" | "controls" | "loop" | "mediaGroup" | "muted" | "playsInline" | "preload" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "dateTime" | "acceptCharset" | "action" | "autoComplete" | "encType" | "noValidate" | "manifest" | "allowFullScreen" | "allowTransparency" | "frameBorder" | "marginHeight" | "marginWidth" | "sandbox" | "scrolling" | "seamless" | "srcDoc" | "sizes" | "srcSet" | "accept" | "capture" | "checked" | "list" | "maxLength" | "minLength" | "readOnly" | "step" | "challenge" | "keyType" | "keyParams" | "htmlFor" | "as" | "integrity" | "charSet" | "httpEquiv" | "optimum" | "reversed" | "selected" | "nonce" | "scoped" | "cellPadding" | "cellSpacing" | "colSpan" | "headers" | "rowSpan" | "scope" | "cols" | "rows" | "poster"> & {
++export declare const TextareaAutosize: React.ForwardRefExoticComponent<Pick<React.HTMLProps<HTMLTextAreaElement>, "default" | "max" | "required" | "media" | "hidden" | "cite" | "data" | "dir" | "form" | "label" | "slot" | "span" | "style" | "title" | "pattern" | "async" | "start" | "low" | "high" | "defer" | "open" | "disabled" | "color" | "content" | "size" | "wrap" | "multiple" | "summary" | "className" | "height" | "id" | "lang" | "method" | "min" | "name" | "target" | "type" | "width" | "role" | "tabIndex" | "crossOrigin" | "href" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerLeave" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "key" | "classID" | "useMap" | "wmode" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "kind" | "src" | "srcLang" | "value" | "download" | "hrefLang" | "rel" | "alt" | "coords" | "shape" | "autoPlay" | "controls" | "loop" | "mediaGroup" | "muted" | "playsInline" | "preload" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "dateTime" | "acceptCharset" | "action" | "autoComplete" | "encType" | "noValidate" | "manifest" | "allowFullScreen" | "allowTransparency" | "frameBorder" | "marginHeight" | "marginWidth" | "sandbox" | "scrolling" | "seamless" | "srcDoc" | "sizes" | "srcSet" | "accept" | "capture" | "checked" | "list" | "maxLength" | "minLength" | "readOnly" | "step" | "challenge" | "keyType" | "keyParams" | "htmlFor" | "as" | "integrity" | "charSet" | "httpEquiv" | "optimum" | "reversed" | "selected" | "nonce" | "scoped" | "cellPadding" | "cellSpacing" | "colSpan" | "headers" | "rowSpan" | "scope" | "cols" | "rows" | "poster"> & {
+     /** Called whenever the textarea resizes */
+     onResize?: ((e: Event) => void) | undefined;
+     /** Minimum number of visible rows */
diff --git a/patches/react-devtools-core+4.28.0.patch b/patches/react-devtools-core+4.28.0.patch
deleted file mode 100644
index 490d11b5e04ad3..00000000000000
--- a/patches/react-devtools-core+4.28.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/react-devtools-core/dist/backend.js b/node_modules/react-devtools-core/dist/backend.js
-index b17dd1c..acb41ad 100644
---- a/node_modules/react-devtools-core/dist/backend.js
-+++ b/node_modules/react-devtools-core/dist/backend.js
-@@ -4819,7 +4819,7 @@ function hideOverlay(agent) {
-   }
- }
- function showOverlay(elements, componentName, agent, hideAfterTimeout) {
--  if (window.document == null) {
-+  if (window.document == null || window.document.__isJsdom) {
-     if (elements != null && elements[0] != null) {
-       agent.emit('showNativeHighlight', elements[0]);
-     }
diff --git a/patches/react-devtools-core+4.28.5.patch b/patches/react-devtools-core+4.28.5.patch
new file mode 100644
index 00000000000000..8f395f09af519b
--- /dev/null
+++ b/patches/react-devtools-core+4.28.5.patch
@@ -0,0 +1,40 @@
+diff --git a/node_modules/react-devtools-core/dist/backend.js b/node_modules/react-devtools-core/dist/backend.js
+index d5837ee..1530af4 100644
+--- a/node_modules/react-devtools-core/dist/backend.js
++++ b/node_modules/react-devtools-core/dist/backend.js
+@@ -4671,7 +4671,7 @@ var SHOW_DURATION = 2000;
+ var timeoutID = null;
+ var overlay = null;
+ function hideOverlay(agent) {
+-  if (window.document == null) {
++  if (window.document == null || window.document.__isJsdom) {
+     agent.emit('hideNativeHighlight');
+     return;
+   }
+@@ -4684,7 +4684,7 @@ function hideOverlay(agent) {
+   }
+ }
+ function showOverlay(elements, componentName, agent, hideAfterTimeout) {
+-  if (window.document == null) {
++  if (window.document == null || window.document.__isJsdom) {
+     if (elements != null && elements[0] != null) {
+       agent.emit('showNativeHighlight', elements[0]);
+     }
+@@ -4918,7 +4918,7 @@ var OUTLINE_COLOR = '#f0f0f0'; // Note these colors are in sync with DevTools Pr
+ var COLORS = ['#37afa9', '#63b19e', '#80b393', '#97b488', '#abb67d', '#beb771', '#cfb965', '#dfba57', '#efbb49', '#febc38'];
+ var canvas = null;
+ function draw(nodeToData, agent) {
+-  if (window.document == null) {
++  if (window.document == null || window.document.__isJsdom) {
+     var nodesToDraw = [];
+     iterateNodes(nodeToData, function (_, color, node) {
+       nodesToDraw.push({
+@@ -4978,7 +4978,7 @@ function drawBorder(context, rect, color) {
+ }
+ 
+ function destroy(agent) {
+-  if (window.document == null) {
++  if (window.document == null || window.document.__isJsdom) {
+     agent.emit('disableTraceUpdates');
+     return;
+   }
diff --git a/patches/react-native+0.71.11.patch b/patches/react-native+0.71.11.patch
deleted file mode 100644
index d6248810094668..00000000000000
--- a/patches/react-native+0.71.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
-index 0758df6..18c5687 100644
---- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
-+++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
-@@ -1410,7 +1410,6 @@ function InternalTextInput(props: Props): React.Node {
-         {...props}
-         {...eventHandlers}
-         accessible={accessible}
--        accessibilityState={_accessibilityState}
-         submitBehavior={submitBehavior}
-         caretHidden={caretHidden}
-         dataDetectorTypes={props.dataDetectorTypes}
diff --git a/patches/react-native+0.73.3.patch b/patches/react-native+0.73.3.patch
new file mode 100644
index 00000000000000..8b69616c0b33d7
--- /dev/null
+++ b/patches/react-native+0.73.3.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
+index 481938f..9509857 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
+@@ -1452,7 +1452,6 @@ function InternalTextInput(props: Props): React.Node {
+         ref={ref}
+         {...otherProps}
+         {...eventHandlers}
+-        accessibilityState={_accessibilityState}
+         accessible={accessible}
+         submitBehavior={submitBehavior}
+         caretHidden={caretHidden}
diff --git a/patches/wasm-vips+0.0.10.patch b/patches/wasm-vips+0.0.10.patch
new file mode 100644
index 00000000000000..3310b706e5a46b
--- /dev/null
+++ b/patches/wasm-vips+0.0.10.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/wasm-vips/package.json b/node_modules/wasm-vips/package.json
+index c20f052..b26a38a 100644
+--- a/node_modules/wasm-vips/package.json
++++ b/node_modules/wasm-vips/package.json
+@@ -15,10 +15,6 @@
+   "type": "commonjs",
+   "exports": {
+     ".": {
+-      "browser": {
+-        "import": "./lib/vips-es6.js",
+-        "require": "./lib/vips.js"
+-      },
+       "node": {
+         "import": "./lib/vips-node.mjs",
+         "require": "./lib/vips-node.js"
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 56cd6734e4f3ee..5bc7a5676e712b 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -2,14 +2,13 @@
 <ruleset name="WordPress Coding Standards for Gutenberg Plugin">
 	<description>Sniffs for WordPress plugins, with minor modifications for Gutenberg</description>
 
-	<!-- Check for cross-version support for PHP 7.0 and higher. -->
-	<config name="testVersion" value="7.0-"/>
+	<!-- Check for cross-version support for PHP 7.2 and higher. -->
+	<config name="testVersion" value="7.2-"/>
 	<rule ref="PHPCompatibilityWP">
 		<include-pattern>*\.php$</include-pattern>
 	</rule>
 
 	<rule ref="WordPress-Core"/>
-	<rule ref="WordPress-Docs"/>
 	<rule ref="WordPress.WP.I18n">
 		<properties>
 			<property name="text_domain" type="array">
@@ -32,9 +31,9 @@
 	</rule>
 
 	<rule ref="WordPress.WP.I18n.MissingArgDomainDefault">
-		<exclude-pattern>lib/compat/*</exclude-pattern>
-		<exclude-pattern>packages/block-library/src/*</exclude-pattern>
-		<exclude-pattern>build/block-library/*</exclude-pattern>
+		<exclude-pattern>/lib/compat/*</exclude-pattern>
+		<exclude-pattern>/packages/block-library/src/*</exclude-pattern>
+		<exclude-pattern>/build/block-library/*</exclude-pattern>
 	</rule>
 
 	<arg value="ps"/>
@@ -43,6 +42,9 @@
 	<!-- Cache the scan results and re-use those for unchanged files on the next scan. -->
 	<arg name="cache" value=".cache/phpcs.json"/>
 
+	<!-- Check up to 20 files simultaneously. -->
+	<arg name="parallel" value="20"/>
+
 	<file>./bin</file>
 	<file>./gutenberg.php</file>
 	<file>./lib</file>
@@ -51,66 +53,34 @@
 	<file>./post-content.php</file>
 
 	<!-- Exclude generated files -->
-	<exclude-pattern>./packages/block-serialization-spec-parser/parser.php</exclude-pattern>
-	<exclude-pattern>node_modules/*</exclude-pattern>
-	<exclude-pattern>build/*</exclude-pattern>
+	<exclude-pattern>/packages/block-serialization-spec-parser/parser\.php$</exclude-pattern>
+	<exclude-pattern>/node_modules/*</exclude-pattern>
+	<exclude-pattern>/build/*</exclude-pattern>
 
 	<!-- Exclude third party libraries -->
-	<exclude-pattern>./vendor/*</exclude-pattern>
-	<exclude-pattern>./test/php/gutenberg-coding-standards/*</exclude-pattern>
-
-	<!-- Exclude files maintained in WordPress Core and backported to Gutenberg -->
-	<exclude-pattern>./lib/compat/wordpress-*/html-api/*.php</exclude-pattern>
+	<exclude-pattern>/vendor/*</exclude-pattern>
+	<exclude-pattern>/test/php/gutenberg-coding-standards/*</exclude-pattern>
 
-	<!-- These special comments are markers for the build process -->
-	<rule ref="Squiz.Commenting.InlineComment.WrongStyle">
-		<exclude-pattern>gutenberg.php</exclude-pattern>
-	</rule>
-
-	<!-- Do not require docblocks for unit tests -->
-	<rule ref="Squiz.Commenting.FunctionComment.Missing">
-		<exclude-pattern>phpunit/*</exclude-pattern>
-	</rule>
-	<rule ref="Squiz.Commenting.FileComment.Missing">
-		<exclude-pattern>phpunit/*</exclude-pattern>
-		<exclude-pattern>test/gutenberg-test-themes/*</exclude-pattern>
-		<exclude-pattern>**/*.min.asset.php</exclude-pattern>
-	</rule>
-	<rule ref="Squiz.Commenting.ClassComment.Missing">
-		<exclude-pattern>phpunit/*</exclude-pattern>
-	</rule>
-	<rule ref="Squiz.Commenting.ClassComment.SpacingAfter">
-		<exclude-pattern>phpunit/*</exclude-pattern>
-	</rule>
-	<rule ref="Squiz.Commenting.FunctionComment.MissingParamTag">
-		<exclude-pattern>phpunit/*</exclude-pattern>
-	</rule>
-	<rule ref="Generic.Commenting.DocComment.Empty">
-    	<exclude-pattern>phpunit/*</exclude-pattern>
-    </rule>
-	<rule ref="Generic.Commenting.DocComment.MissingShort">
-		<exclude-pattern>phpunit/*</exclude-pattern>
-	</rule>
-	<rule ref="Squiz.Commenting.VariableComment.Missing">
-		<exclude-pattern>phpunit/*</exclude-pattern>
-	</rule>
-	<rule ref="Squiz.Commenting.FunctionCommentThrowTag.Missing">
-		<exclude-pattern>phpunit/*</exclude-pattern>
-	</rule>
+	<!-- Exclude files maintained in WordPress Core and backported to Gutenberg
+	     DO NOT REMOVE these rules; these files are "built" artifacts from Core
+	     and when they are removed it prevents keeping the repos in sync. -->
+	<exclude-pattern>/lib/compat/wordpress-*/html-api/*\.php$</exclude-pattern>
 
 	<!-- Ignore filename error since it requires WP core build process change -->
 	<rule ref="WordPress.Files.FileName.InvalidClassFileName">
 		<exclude-pattern>/phpunit/*</exclude-pattern>
+		<exclude-pattern>/packages/block-library/src/navigation/index\.php$</exclude-pattern>
 	</rule>
 
 	<!-- Ignore empty files in tests/gutenberg-test-themes -->
 	<rule ref="Internal.NoCodeFound">
-		<exclude-pattern>./test/gutenberg-test-themes/*</exclude-pattern>
+		<exclude-pattern>/test/gutenberg-test-themes/*</exclude-pattern>
 	</rule>
 
 	<!-- Exclude PHPUnit tests from file and class name sniffs (for Core parity). -->
 	<rule ref="WordPress.Files.FileName.NotHyphenatedLowercase">
 		<exclude-pattern>/phpunit/*</exclude-pattern>
+		<exclude-pattern>*\.asset\.php$</exclude-pattern>
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidClassName.Invalid">
 		<exclude-pattern>/phpunit/*</exclude-pattern>
@@ -118,21 +88,22 @@
 
 	<!-- Enforce checks against redeclaration for functions and classes. -->
 	<rule ref="Gutenberg.CodeAnalysis.GuardedFunctionAndClassNames">
-		<exclude-pattern>./phpunit/*</exclude-pattern>
-		<exclude-pattern>./packages/*</exclude-pattern>
-		<exclude-pattern>./bin/generate-gutenberg-php</exclude-pattern>
+		<exclude-pattern>/phpunit/*</exclude-pattern>
+		<exclude-pattern>/packages/*</exclude-pattern>
+		<exclude-pattern>/bin/generate-gutenberg-php\.php$</exclude-pattern>
 		<properties>
 			<property name="functionsWhiteList" type="array">
 				<element value="/^_?gutenberg.+/"/>
 			</property>
 			<property name="classesWhiteList" type="array">
 				<element value="/^Gutenberg.+/"/>
+				<element value="/^.+_Gutenberg$/"/>
 			</property>
 		</properties>
 	</rule>
 
 	<rule ref="Gutenberg.NamingConventions.ValidBlockLibraryFunctionName">
-		<include-pattern>./packages/block-library/src/*/*.php</include-pattern>
+		<include-pattern>/packages/block-library/src/*/*\.php$</include-pattern>
 		<properties>
 			<property name="prefixes" type="array">
 				<element value="block_core_"/>
@@ -185,4 +156,30 @@
 			</property>
 		</properties>
 	</rule>
+	<rule ref="Gutenberg.CodeAnalysis.ForbiddenFunctionsAndClasses">
+		<include-pattern>/packages/block-library/src/.+/*\.php$</include-pattern>
+		<!--
+			Refactoring required: the functions and classes prefixed with 'Gutenberg_' in the files that are being excluded
+			through the 'exclude-pattern' statements below must be guarded, as they are available only in the Gutenberg context,
+			not in Core.
+		-->
+		<exclude-pattern>/packages/block-library/src/form-input/index\.php$</exclude-pattern>
+		<exclude-pattern>/packages/block-library/src/form-submission-notification/index\.php$</exclude-pattern>
+		<exclude-pattern>/packages/block-library/src/form/index\.php$</exclude-pattern>
+		<properties>
+			<property name="forbidden_functions" type="array">
+				<element value="[Gg]utenberg.*"/>
+			</property>
+			<property name="forbidden_classes" type="array">
+				<element value="[Gg]utenberg.*"/>
+			</property>
+		</properties>
+	</rule>
+	<rule ref="Gutenberg.Commenting.SinceTag">
+		<!-- The sniff ensures that functions have a valid @since tag but skips checking experimental blocks. -->
+		<include-pattern>/packages/block-library/src/.+/*\.php$</include-pattern>
+		<include-pattern>/packages/block-serialization-default-parser/.+/*\.php$</include-pattern>
+		<include-pattern>/packages/widgets/src/blocks/legacy-widget/index\.php$</include-pattern>
+		<include-pattern>/packages/widgets/src/blocks/widget-group/index\.php$</include-pattern>
+	</rule>
 </ruleset>
diff --git a/phpunit-watcher.yml.dist b/phpunit-watcher.yml.dist
index f2f9da5fbcdbfd..165a4d8e66e0b6 100644
--- a/phpunit-watcher.yml.dist
+++ b/phpunit-watcher.yml.dist
@@ -6,3 +6,6 @@ watch:
 notifications:
   passingTests: false
   failingTests: false
+
+phpunit:
+  arguments: '--filter Tests_Fonts_WpFontCollection_GetContent'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4f407266e5c0f5..c8dc2d34b0fed9 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,6 +14,7 @@
 		<testsuite name="default">
 			<directory suffix="-test.php">./phpunit/</directory>
 			<directory suffix=".php">./phpunit/tests/</directory>
+			<directory suffix=".php">./phpunit/blocks/</directory>
 		</testsuite>
 	</testsuites>
 	<groups>
diff --git a/phpunit/block-supports/background-test.php b/phpunit/block-supports/background-test.php
index bdcfc02f551a7f..c698f9e7c2f1c1 100644
--- a/phpunit/block-supports/background-test.php
+++ b/phpunit/block-supports/background-test.php
@@ -130,11 +130,39 @@ public function data_background_block_support() {
 				),
 				'background_style'    => array(
 					'backgroundImage' => array(
-						'url'    => 'https://example.com/image.jpg',
-						'source' => 'file',
+						'url' => 'https://example.com/image.jpg',
 					),
 				),
-				'expected_wrapper'    => '<div style="background-image:url(&#039;https://example.com/image.jpg&#039;);background-size:cover;">Content</div>',
+				'expected_wrapper'    => '<div class="has-background" style="background-image:url(&#039;https://example.com/image.jpg&#039;);background-size:cover;">Content</div>',
+				'wrapper'             => '<div>Content</div>',
+			),
+			'background image style is applied when backgroundImage is a string' => array(
+				'theme_name'          => 'block-theme-child-with-fluid-typography',
+				'block_name'          => 'test/background-rules-are-output',
+				'background_settings' => array(
+					'backgroundImage' => true,
+				),
+				'background_style'    => array(
+					'backgroundImage' => "url('https://example.com/image.jpg')",
+				),
+				'expected_wrapper'    => '<div class="has-background" style="background-image:url(&#039;https://example.com/image.jpg&#039;);background-size:cover;">Content</div>',
+				'wrapper'             => '<div>Content</div>',
+			),
+			'background image style with contain, position, attachment, and repeat is applied' => array(
+				'theme_name'          => 'block-theme-child-with-fluid-typography',
+				'block_name'          => 'test/background-rules-are-output',
+				'background_settings' => array(
+					'backgroundImage' => true,
+				),
+				'background_style'    => array(
+					'backgroundImage'      => array(
+						'url' => 'https://example.com/image.jpg',
+					),
+					'backgroundRepeat'     => 'no-repeat',
+					'backgroundSize'       => 'contain',
+					'backgroundAttachment' => 'fixed',
+				),
+				'expected_wrapper'    => '<div class="has-background" style="background-image:url(&#039;https://example.com/image.jpg&#039;);background-position:50% 50%;background-repeat:no-repeat;background-size:contain;background-attachment:fixed;">Content</div>',
 				'wrapper'             => '<div>Content</div>',
 			),
 			'background image style is appended if a style attribute already exists' => array(
@@ -145,12 +173,11 @@ public function data_background_block_support() {
 				),
 				'background_style'    => array(
 					'backgroundImage' => array(
-						'url'    => 'https://example.com/image.jpg',
-						'source' => 'file',
+						'url' => 'https://example.com/image.jpg',
 					),
 				),
-				'expected_wrapper'    => '<div classname="wp-block-test" style="color: red;background-image:url(&#039;https://example.com/image.jpg&#039;);background-size:cover;">Content</div>',
-				'wrapper'             => '<div classname="wp-block-test" style="color: red">Content</div>',
+				'expected_wrapper'    => '<div class="wp-block-test has-background" style="color: red;background-image:url(&#039;https://example.com/image.jpg&#039;);background-size:cover;">Content</div>',
+				'wrapper'             => '<div class="wp-block-test" style="color: red">Content</div>',
 			),
 			'background image style is appended if a style attribute containing multiple styles already exists' => array(
 				'theme_name'          => 'block-theme-child-with-fluid-typography',
@@ -160,12 +187,11 @@ public function data_background_block_support() {
 				),
 				'background_style'    => array(
 					'backgroundImage' => array(
-						'url'    => 'https://example.com/image.jpg',
-						'source' => 'file',
+						'url' => 'https://example.com/image.jpg',
 					),
 				),
-				'expected_wrapper'    => '<div classname="wp-block-test" style="color: red;font-size: 15px;background-image:url(&#039;https://example.com/image.jpg&#039;);background-size:cover;">Content</div>',
-				'wrapper'             => '<div classname="wp-block-test" style="color: red;font-size: 15px;">Content</div>',
+				'expected_wrapper'    => '<div class="wp-block-test has-background" style="color: red;font-size: 15px;background-image:url(&#039;https://example.com/image.jpg&#039;);background-size:cover;">Content</div>',
+				'wrapper'             => '<div class="wp-block-test" style="color: red;font-size: 15px;">Content</div>',
 			),
 			'background image style is not applied if the block does not support background image' => array(
 				'theme_name'          => 'block-theme-child-with-fluid-typography',
@@ -175,8 +201,7 @@ public function data_background_block_support() {
 				),
 				'background_style'    => array(
 					'backgroundImage' => array(
-						'url'    => 'https://example.com/image.jpg',
-						'source' => 'file',
+						'url' => 'https://example.com/image.jpg',
 					),
 				),
 				'expected_wrapper'    => '<div>Content</div>',
diff --git a/phpunit/block-supports/block-style-variations-test.php b/phpunit/block-supports/block-style-variations-test.php
new file mode 100644
index 00000000000000..350efb34730764
--- /dev/null
+++ b/phpunit/block-supports/block-style-variations-test.php
@@ -0,0 +1,264 @@
+<?php
+
+/**
+ * Test the block style variations block support.
+ *
+ * @since 6.6.0
+ *
+ * @package Gutenberg
+ */
+
+class WP_Block_Supports_Block_Style_Variations_Test extends WP_UnitTestCase {
+	/**
+	 * Administrator ID.
+	 *
+	 * @var int
+	 */
+	protected static $administrator_id;
+
+	/**
+	 * WP_Theme_JSON_Resolver_Gutenberg::$blocks_cache property.
+	 *
+	 * @var ReflectionProperty
+	 */
+	private static $property_blocks_cache;
+
+	/**
+	 * Original value of the WP_Theme_JSON_Resolver_Gutenberg::$blocks_cache property.
+	 *
+	 * @var array
+	 */
+	private static $property_blocks_cache_orig_value;
+
+	/**
+	 * WP_Theme_JSON_Resolver_Gutenberg::$core property.
+	 *
+	 * @var ReflectionProperty
+	 */
+	private static $property_core;
+
+	/**
+	 * Original value of the WP_Theme_JSON_Resolver_Gutenberg::$core property.
+	 *
+	 * @var WP_Theme_JSON_Gutenberg
+	 */
+	private static $property_core_orig_value;
+
+	/**
+	 * Theme root directory.
+	 *
+	 * @var string|null
+	 */
+	private $theme_root;
+
+	/**
+	 * Original theme directory.
+	 *
+	 * @var array|null
+	 */
+	private $orig_theme_dir;
+
+	public function set_up() {
+		parent::set_up();
+		$this->theme_root = realpath( dirname( __DIR__ ) . '/data/themedir1' );
+
+		$this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
+
+		// /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
+		$GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
+
+		add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
+		add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
+		add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
+
+		// Clear caches.
+		wp_clean_themes_cache();
+		unset( $GLOBALS['wp_themes'] );
+	}
+
+	public function tear_down() {
+		$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
+		wp_clean_themes_cache();
+		unset( $GLOBALS['wp_themes'] );
+
+		// Reset data between tests.
+		_gutenberg_clean_theme_json_caches();
+		parent::tear_down();
+	}
+
+	public function filter_set_theme_root() {
+		return $this->theme_root;
+	}
+
+	/**
+	 * Tests that block style variations registered via either
+	 * `gutenberg_register_block_style` with a style object, or a standalone
+	 * block style variation file within `/styles`, are added to the theme data.
+	 */
+	public function test_add_registered_block_styles_to_theme_data() {
+		switch_theme( 'block-theme' );
+
+		$variation_styles_data = array(
+			'color'    => array(
+				'background' => 'darkslateblue',
+				'text'       => 'lavender',
+			),
+			'blocks'   => array(
+				'core/heading' => array(
+					'color' => array(
+						'text' => 'violet',
+					),
+				),
+			),
+			'elements' => array(
+				'link' => array(
+					'color'  => array(
+						'text' => 'fuchsia',
+					),
+					':hover' => array(
+						'color' => array(
+							'text' => 'deeppink',
+						),
+					),
+				),
+			),
+		);
+
+		/*
+		 * This style is to be deliberately overwritten by the theme.json partial
+		 * See `phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json`.
+		 */
+		register_block_style(
+			'core/group',
+			array(
+				'name'       => 'WithSlug',
+				'style_data' => array(
+					'color' => array(
+						'background' => 'whitesmoke',
+						'text'       => 'black',
+					),
+				),
+			)
+		);
+		register_block_style(
+			'core/group',
+			array(
+				'name'       => 'my-variation',
+				'style_data' => $variation_styles_data,
+			)
+		);
+
+		$theme_json   = WP_Theme_JSON_Resolver_Gutenberg::get_theme_data()->get_raw_data();
+		$group_styles = $theme_json['styles']['blocks']['core/group'] ?? array();
+		$expected     = array(
+			'variations' => array(
+
+				/*
+				 * The following block style variations are registered
+				 * automatically from their respective JSON files within the
+				 * theme's `/styles` directory.
+				 */
+				'block-style-variation-a' => array(
+					'color' => array(
+						'background' => 'indigo',
+						'text'       => 'plum',
+					),
+				),
+				'block-style-variation-b' => array(
+					'color' => array(
+						'background' => 'midnightblue',
+						'text'       => 'lightblue',
+					),
+				),
+
+				/*
+				 * Manually registered variations.
+				 */
+				'WithSlug'                => array(
+					'color' => array(
+						'background' => 'aliceblue',
+						'text'       => 'midnightblue',
+					),
+				),
+				'my-variation'            => $variation_styles_data,
+			),
+		);
+
+		unregister_block_style( 'core/group', 'my-variation' );
+		unregister_block_style( 'core/group', 'WithSlug' );
+
+		$this->assertSameSetsWithIndex( $expected, $group_styles, 'Variation data does not match' );
+	}
+
+	/**
+	 * Tests that block style variations resolve any `ref` values when generating styles.
+	 */
+	public function test_block_style_variation_ref_values() {
+		switch_theme( 'block-theme' );
+
+		$variation_data = array(
+			'color'    => array(
+				'text'       => array(
+					'ref' => 'styles.does-not-exist',
+				),
+				'background' => array(
+					'ref' => 'styles.blocks.core/group.variations.block-style-variation-a.color.text',
+				),
+			),
+			'blocks'   => array(
+				'core/heading' => array(
+					'color' => array(
+						'text'       => array(
+							'ref' => 'styles.blocks.core/group.variations.block-style-variation-a.color.background',
+						),
+						'background' => array(
+							'ref' => '',
+						),
+					),
+				),
+			),
+			'elements' => array(
+				'link' => array(
+					'color'  => array(
+						'text'       => array(
+							'ref' => 'styles.blocks.core/group.variations.block-style-variation-b.color.text',
+						),
+						'background' => array(
+							'ref' => null,
+						),
+					),
+					':hover' => array(
+						'color' => array(
+							'text' => array(
+								'ref' => 'styles.blocks.core/group.variations.block-style-variation-b.color.background',
+							),
+						),
+					),
+				),
+			),
+		);
+
+		$theme_json = WP_Theme_JSON_Resolver_Gutenberg::get_theme_data()->get_raw_data();
+
+		gutenberg_resolve_block_style_variation_ref_values( $variation_data, $theme_json );
+
+		$expected = array(
+			'color'    => array( 'background' => 'plum' ),
+			'blocks'   => array(
+				'core/heading' => array(
+					'color' => array( 'text' => 'indigo' ),
+				),
+			),
+			'elements' => array(
+				'link' => array(
+					'color'  => array( 'text' => 'lightblue' ),
+					':hover' => array(
+						'color' => array( 'text' => 'midnightblue' ),
+					),
+				),
+			),
+		);
+
+		$this->assertSameSetsWithIndex( $expected, $variation_data, 'Variation data with resolved ref values does not match' );
+	}
+}
diff --git a/phpunit/block-supports/elements-test.php b/phpunit/block-supports/elements-test.php
index efea11887b620b..f7351c0eb26ab3 100644
--- a/phpunit/block-supports/elements-test.php
+++ b/phpunit/block-supports/elements-test.php
@@ -72,7 +72,14 @@ public function test_elements_block_support_class( $color_settings, $elements_st
 			),
 		);
 
-		$actual = gutenberg_render_elements_support( $block_markup, $block );
+		/*
+		 * To ensure a consistent elements class name it is generated within a
+		 * `render_block_data` filter and stored in the `className` attribute.
+		 * As a result the block data needs to be passed through the same
+		 * function for this test.
+		 */
+		$filtered_block = gutenberg_render_elements_support_styles( $block );
+		$actual         = gutenberg_render_elements_class_name( $block_markup, $filtered_block );
 
 		$this->assertMatchesRegularExpression(
 			$expected_markup,
@@ -192,7 +199,7 @@ public function test_elements_block_support_styles( $color_settings, $elements_s
 			),
 		);
 
-		gutenberg_render_elements_support_styles( null, $block );
+		gutenberg_render_elements_support_styles( $block );
 		$actual_stylesheet = gutenberg_style_engine_get_stylesheet_from_context( 'block-supports' );
 
 		$this->assertMatchesRegularExpression(
@@ -273,8 +280,8 @@ public function data_elements_block_support_styles() {
 						),
 					),
 				),
-				'expected_styles' => '/^.wp-elements-[a-f0-9]{32} a' . $color_css_rules .
-					'.wp-elements-[a-f0-9]{32} a:hover' . $color_css_rules . '$/',
+				'expected_styles' => '/^.wp-elements-[a-f0-9]{32} a:where\(:not\(.wp-element-button\)\)' . $color_css_rules .
+					'.wp-elements-[a-f0-9]{32} a:where\(:not\(.wp-element-button\)\):hover' . $color_css_rules . '$/',
 			),
 			'generic heading element styles are applied' => array(
 				'color_settings'  => array( 'heading' => true ),
diff --git a/phpunit/block-supports/layout-test.php b/phpunit/block-supports/layout-test.php
index 41735fdc0939e2..dd40283171e5cd 100644
--- a/phpunit/block-supports/layout-test.php
+++ b/phpunit/block-supports/layout-test.php
@@ -188,7 +188,7 @@ public function data_gutenberg_get_layout_style() {
 					'has_block_gap_support' => true,
 					'gap_value'             => '1em',
 				),
-				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:1em;margin-block-end:0;}',
+				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:1em;margin-block-end:0;}',
 			),
 			'skip serialization should return empty value' => array(
 				'args'            => array(
@@ -205,7 +205,7 @@ public function data_gutenberg_get_layout_style() {
 					'has_block_gap_support' => true,
 					'gap_value'             => array( 'top' => '1em' ),
 				),
-				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:1em;margin-block-end:0;}',
+				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:1em;margin-block-end:0;}',
 			),
 			'constrained layout with sizes'                => array(
 				'args'            => array(
@@ -244,7 +244,7 @@ public function data_gutenberg_get_layout_style() {
 					'has_block_gap_support' => true,
 					'gap_value'             => '2.5rem',
 				),
-				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:2.5rem;margin-block-end:0;}',
+				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:2.5rem;margin-block-end:0;}',
 			),
 			'constrained layout with axial block gap support' => array(
 				'args'            => array(
@@ -255,7 +255,7 @@ public function data_gutenberg_get_layout_style() {
 					'has_block_gap_support' => true,
 					'gap_value'             => array( 'top' => '2.5rem' ),
 				),
-				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:2.5rem;margin-block-end:0;}',
+				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:2.5rem;margin-block-end:0;}',
 			),
 			'constrained layout with block gap support and spacing preset' => array(
 				'args'            => array(
@@ -266,7 +266,7 @@ public function data_gutenberg_get_layout_style() {
 					'has_block_gap_support' => true,
 					'gap_value'             => 'var:preset|spacing|50',
 				),
-				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:var(--wp--preset--spacing--50);margin-block-end:0;}',
+				'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:var(--wp--preset--spacing--50);margin-block-end:0;}',
 			),
 			'flex layout with no args should return empty value' => array(
 				'args'            => array(
@@ -364,6 +364,25 @@ public function data_gutenberg_get_layout_style() {
 				),
 				'expected_output' => '.wp-layout{flex-wrap:nowrap;flex-direction:column;align-items:flex-start;justify-content:flex-end;}',
 			),
+			'default grid layout'                          => array(
+				'args'            => array(
+					'selector' => '.wp-layout',
+					'layout'   => array(
+						'type' => 'grid',
+					),
+				),
+				'expected_output' => '.wp-layout{grid-template-columns:repeat(auto-fill, minmax(min(12rem, 100%), 1fr));container-type:inline-size;}',
+			),
+			'grid layout with columnCount'                 => array(
+				'args'            => array(
+					'selector' => '.wp-layout',
+					'layout'   => array(
+						'type'        => 'grid',
+						'columnCount' => 3,
+					),
+				),
+				'expected_output' => '.wp-layout{grid-template-columns:repeat(3, minmax(0, 1fr));}',
+			),
 			'default layout with blockGap to verify converting gap value into valid CSS' => array(
 				'args'            => array(
 					'selector'              => '.wp-block-group.wp-container-6',
@@ -376,7 +395,7 @@ public function data_gutenberg_get_layout_style() {
 						'blockGap' => 'var(--wp--preset--spacing--70)',
 					),
 				),
-				'expected_output' => '.wp-block-group.wp-container-6 > *{margin-block-start:0;margin-block-end:0;}.wp-block-group.wp-container-6.wp-block-group.wp-container-6 > * + *{margin-block-start:var(--wp--preset--spacing--70);margin-block-end:0;}',
+				'expected_output' => '.wp-block-group.wp-container-6 > *{margin-block-start:0;margin-block-end:0;}.wp-block-group.wp-container-6 > * + *{margin-block-start:var(--wp--preset--spacing--70);margin-block-end:0;}',
 			),
 		);
 	}
@@ -392,6 +411,7 @@ public function data_gutenberg_get_layout_style() {
 	 * @param string $expected_output The expected output.
 	 */
 	public function test_layout_support_flag_renders_classnames_on_wrapper( $args, $expected_output ) {
+		switch_theme( 'default' );
 		$actual_output = gutenberg_render_layout_support_flag( $args['block_content'], $args['block'] );
 		$this->assertEquals( $expected_output, $actual_output );
 	}
@@ -462,6 +482,27 @@ public function data_layout_support_flag_renders_classnames_on_wrapper() {
 				),
 				'expected_output' => '<div class="wp-block-group"><div class="wp-block-group__inner-wrapper is-layout-flow wp-block-group-is-layout-flow"></div></div>',
 			),
+			'block with child layout'                      => array(
+				'args'            => array(
+					'block_content' => '<p>Some text.</p>',
+					'block'         => array(
+						'blockName'    => 'core/paragraph',
+						'attrs'        => array(
+							'style' => array(
+								'layout' => array(
+									'columnSpan' => '2',
+								),
+							),
+						),
+						'innerBlocks'  => array(),
+						'innerHTML'    => '<p>Some text.</p>',
+						'innerContent' => array(
+							'<p>Some text.</p>',
+						),
+					),
+				),
+				'expected_output' => '<p class="wp-container-content-1">Some text.</p>', // The generated classname number assumes `wp_unique_prefixed_id( 'wp-container-content-' )` will not have run previously in this test.
+			),
 		);
 	}
 
diff --git a/phpunit/block-supports/shadow-test.php b/phpunit/block-supports/shadow-test.php
new file mode 100644
index 00000000000000..c2fc0defe8199c
--- /dev/null
+++ b/phpunit/block-supports/shadow-test.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * Test the shadow block supports.
+ *
+ * @package Gutenberg
+ */
+
+class WP_Block_Supports_Shadow_Test extends WP_UnitTestCase {
+	/**
+	 * @var string|null
+	 */
+	private $test_block_name;
+
+	public function set_up() {
+		parent::set_up();
+		$this->test_block_name = null;
+	}
+
+	public function tear_down() {
+		unregister_block_type( $this->test_block_name );
+		$this->test_block_name = null;
+		parent::tear_down();
+	}
+
+	/**
+	 * Registers a new block for testing shadow support.
+	 *
+	 * @param string $block_name Name for the test block.
+	 * @param array  $supports   Array defining block support configuration.
+	 *
+	 * @return WP_Block_Type The block type for the newly registered test block.
+	 */
+	private function register_shadow_block_with_support( $block_name, $supports = array() ) {
+		$this->test_block_name = $block_name;
+		register_block_type(
+			$this->test_block_name,
+			array(
+				'api_version' => 3,
+				'attributes'  => array(
+					'style' => array(
+						'type' => 'object',
+					),
+				),
+				'supports'    => $supports,
+			)
+		);
+		$registry = WP_Block_Type_Registry::get_instance();
+
+		return $registry->get_registered( $this->test_block_name );
+	}
+
+	/**
+	 * Tests the generation of shadow block support styles.
+	 *
+	 * @dataProvider data_generate_shadow_fixtures
+	 *
+	 * @param boolean|array $support Shadow block support configuration.
+	 * @param string        $value   Shadow style value for style attribute object.
+	 * @param array         $expected       Expected shadow block support styles.
+	 */
+	public function test_gutenberg_apply_shadow_support( $support, $value, $expected ) {
+		$block_type  = self::register_shadow_block_with_support(
+			'test/shadow-block',
+			array( 'shadow' => $support )
+		);
+		$block_attrs = array( 'style' => array( 'shadow' => $value ) );
+		$actual      = gutenberg_apply_shadow_support( $block_type, $block_attrs );
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_generate_shadow_fixtures() {
+		return array(
+			'with no styles'               => array(
+				'support'  => true,
+				'value'    => '',
+				'expected' => array(),
+			),
+			'without support'              => array(
+				'support'  => false,
+				'value'    => '1px 1px 1px #000',
+				'expected' => array(),
+			),
+			'with single shadow'           => array(
+				'support'  => true,
+				'value'    => '1px 1px 1px #000',
+				'expected' => array( 'style' => 'box-shadow:1px 1px 1px #000;' ),
+			),
+			'with comma separated shadows' => array(
+				'support'  => true,
+				'value'    => '1px 1px 1px #000, 2px 2px 2px #fff',
+				'expected' => array( 'style' => 'box-shadow:1px 1px 1px #000, 2px 2px 2px #fff;' ),
+			),
+			'with preset shadow'           => array(
+				'support'  => true,
+				'value'    => 'var:preset|shadow|natural',
+				'expected' => array( 'style' => 'box-shadow:var(--wp--preset--shadow--natural);' ),
+			),
+			'with serialization skipped'   => array(
+				'support'  => array( '__experimentalSkipSerialization' => true ),
+				'value'    => '1px 1px 1px #000',
+				'expected' => array(),
+			),
+		);
+	}
+}
diff --git a/phpunit/block-supports/typography-test.php b/phpunit/block-supports/typography-test.php
index f6d5344222678c..eafd505db6ec65 100644
--- a/phpunit/block-supports/typography-test.php
+++ b/phpunit/block-supports/typography-test.php
@@ -299,11 +299,11 @@ public function test_should_generate_classname_for_font_family() {
 	 *     @type string $slug Kebab-case unique identifier for the font size preset.
 	 *     @type string $size CSS font-size value, including units where applicable.
 	 * }
-	 * @param bool   $should_use_fluid_typography An override to switch fluid typography "on". Can be used for unit testing.
+	 * @param bool   $settings        Theme JSON settings array that overrides any global theme settings.
 	 * @param string $expected_output Expected output of gutenberg_get_typography_font_size_value().
 	 */
-	public function test_gutenberg_get_typography_font_size_value( $font_size, $should_use_fluid_typography, $expected_output ) {
-		$actual = gutenberg_get_typography_font_size_value( $font_size, $should_use_fluid_typography );
+	public function test_gutenberg_get_typography_font_size_value( $font_size, $settings, $expected_output ) {
+		$actual = gutenberg_get_typography_font_size_value( $font_size, $settings );
 
 		$this->assertSame( $expected_output, $actual );
 	}
@@ -316,291 +316,632 @@ public function test_gutenberg_get_typography_font_size_value( $font_size, $shou
 	public function data_generate_font_size_preset_fixtures() {
 		return array(
 			'returns value when fluid typography is deactivated' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => '28px',
 				),
-				'should_use_fluid_typography' => false,
-				'expected_output'             => '28px',
+				'settings'        => null,
+				'expected_output' => '28px',
 			),
 
 			'returns value where font size is 0'         => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => 0,
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 0,
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 0,
 			),
 
 			"returns value where font size is '0'"       => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => '0',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => '0',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => '0',
 			),
 
 			'returns value where `size` is `null`'       => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => null,
 				),
-				'should_use_fluid_typography' => false,
-				'expected_output'             => null,
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => null,
 			),
 
 			'returns value when fluid is `false`'        => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '28px',
 					'fluid' => false,
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => '28px',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => false,
+					),
+				),
+				'expected_output' => '28px',
+			),
+
+			'returns value when fluid is empty array'    => array(
+				'font_size'       => array(
+					'size' => '28px',
+				),
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => array(),
+					),
+				),
+				'expected_output' => '28px',
+			),
+
+			'returns clamp value with minViewportWidth override' => array(
+				'font_size'       => array(
+					'size' => '28px',
+				),
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => array(
+							'minViewportWidth' => '500px',
+						),
+					),
+				),
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 5px) * 0.918), 28px)',
+			),
+
+			'returns clamp value with maxViewportWidth override' => array(
+				'font_size'       => array(
+					'size' => '28px',
+				),
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => array(
+							'maxViewportWidth' => '500px',
+						),
+					),
+				),
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 5.608), 28px)',
+			),
+
+			'returns clamp value with layout.wideSize override' => array(
+				'font_size'       => array(
+					'size' => '28px',
+				),
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+					'layout'     => array(
+						'wideSize' => '500px',
+					),
+				),
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 5.608), 28px)',
 			),
 
 			'returns already clamped value'              => array(
-				'font_size'                   => array(
-					'size'  => 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
-					'fluid' => false,
+				'font_size'       => array(
+					'size' => 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
 			),
 
 			'returns value with unsupported unit'        => array(
-				'font_size'                   => array(
-					'size'  => '1000%',
-					'fluid' => false,
+				'font_size'       => array(
+					'size' => '1000%',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => '1000%',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => '1000%',
 			),
 
 			'returns clamp value with rem min and max units' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => '1.75rem',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(1.119rem, 1.119rem + ((1vw - 0.2rem) * 0.789), 1.75rem)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(1.119rem, 1.119rem + ((1vw - 0.2rem) * 0.789), 1.75rem)',
 			),
 
 			'returns clamp value with em min and max units' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => '1.75em',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(1.119em, 1.119rem + ((1vw - 0.2em) * 0.789), 1.75em)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(1.119em, 1.119rem + ((1vw - 0.2em) * 0.789), 1.75em)',
 			),
 
 			'returns clamp value for floats'             => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => '70.175px',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
 			),
 
 			'coerces integer to `px` and returns clamp value' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => 33,
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(20.515px, 1.282rem + ((1vw - 3.2px) * 0.975), 33px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(20.515px, 1.282rem + ((1vw - 3.2px) * 0.975), 33px)',
 			),
 
 			'coerces float to `px` and returns clamp value' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => 70.175,
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
 			),
 
 			'returns clamp value when `fluid` is empty array' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '28px',
 					'fluid' => array(),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
 			),
 
 			'returns clamp value when `fluid` is `null`' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '28px',
 					'fluid' => null,
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
 			),
 
 			'returns clamp value where min and max fluid values defined' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '80px',
 					'fluid' => array(
 						'min' => '70px',
 						'max' => '125px',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(70px, 4.375rem + ((1vw - 3.2px) * 4.297), 125px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(70px, 4.375rem + ((1vw - 3.2px) * 4.297), 125px)',
 			),
 
 			'returns clamp value where max is equal to size' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '7.8125rem',
 					'fluid' => array(
 						'min' => '4.375rem',
 						'max' => '7.8125rem',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(4.375rem, 4.375rem + ((1vw - 0.2rem) * 4.298), 7.8125rem)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(4.375rem, 4.375rem + ((1vw - 0.2rem) * 4.298), 7.8125rem)',
 			),
 
 			'returns clamp value if min font size is greater than max' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '3rem',
 					'fluid' => array(
 						'min' => '5rem',
 						'max' => '32px',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(5rem, 5rem + ((1vw - 0.2rem) * -3.75), 32px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(5rem, 5rem + ((1vw - 0.2rem) * -3.75), 32px)',
 			),
 
 			'returns value with invalid min/max fluid units' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '10em',
 					'fluid' => array(
 						'min' => '20vw',
 						'max' => '50%',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => '10em',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => '10em',
 			),
 
 			'returns value when size is < lower bounds and no fluid min/max set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => '3px',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => '3px',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => '3px',
 			),
 
 			'returns value when size is equal to lower bounds and no fluid min/max set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => '14px',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => '14px',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => '14px',
 			),
 
 			'returns clamp value with different min max units' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '28px',
 					'fluid' => array(
 						'min' => '20px',
 						'max' => '50rem',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(20px, 1.25rem + ((1vw - 3.2px) * 60.938), 50rem)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(20px, 1.25rem + ((1vw - 3.2px) * 60.938), 50rem)',
 			),
 
 			'returns clamp value where no fluid max size is set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '50px',
 					'fluid' => array(
 						'min' => '2.6rem',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(2.6rem, 2.6rem + ((1vw - 0.2rem) * 0.656), 50px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(2.6rem, 2.6rem + ((1vw - 0.2rem) * 0.656), 50px)',
 			),
 
 			'returns clamp value where no fluid min size is set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '28px',
 					'fluid' => array(
 						'max' => '80px',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 4.851), 80px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 4.851), 80px)',
 			),
 
 			'should not apply lower bound test when fluid values are set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '1.5rem',
 					'fluid' => array(
 						'min' => '0.5rem',
 						'max' => '5rem',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(0.5rem, 0.5rem + ((1vw - 0.2rem) * 5.625), 5rem)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(0.5rem, 0.5rem + ((1vw - 0.2rem) * 5.625), 5rem)',
 			),
 
 			'should not apply lower bound test when only fluid min is set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '20px',
 					'fluid' => array(
 						'min' => '12px',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(12px, 0.75rem + ((1vw - 3.2px) * 0.625), 20px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(12px, 0.75rem + ((1vw - 3.2px) * 0.625), 20px)',
 			),
 
 			'should not apply lower bound test when only fluid max is set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '0.875rem',
 					'fluid' => array(
 						'max' => '20rem',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(0.875rem, 0.875rem + ((1vw - 0.2rem) * 23.906), 20rem)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(0.875rem, 0.875rem + ((1vw - 0.2rem) * 23.906), 20rem)',
 			),
 
 			'returns clamp value when min and max font sizes are equal' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '4rem',
 					'fluid' => array(
 						'min' => '30px',
 						'max' => '30px',
 					),
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(30px, 1.875rem + ((1vw - 3.2px) * 1), 30px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(30px, 1.875rem + ((1vw - 3.2px) * 1), 30px)',
 			),
 
 			'should apply scaled min font size for em values when custom min font size is not set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => '12rem',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(5.174rem, 5.174rem + ((1vw - 0.2rem) * 8.533), 12rem)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(5.174rem, 5.174rem + ((1vw - 0.2rem) * 8.533), 12rem)',
 			),
 
 			'should apply scaled min font size for px values when custom min font size is not set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size' => '200px',
 				),
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(85.342px, 5.334rem + ((1vw - 3.2px) * 8.958), 200px)',
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(85.342px, 5.334rem + ((1vw - 3.2px) * 8.958), 200px)',
 			),
 
 			'should not apply scaled min font size for minimum font size when custom min font size is set' => array(
-				'font_size'                   => array(
+				'font_size'       => array(
 					'size'  => '200px',
 					'fluid' => array(
 						'min' => '100px',
 					),
 				),
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => true,
+					),
+				),
+				'expected_output' => 'clamp(100px, 6.25rem + ((1vw - 3.2px) * 7.813), 200px)',
+			),
+
+			// Individual preset settings override global settings.
+			'should convert individual preset size to fluid if fluid is disabled in global settings' => array(
+				'font_size'       => array(
+					'size'  => '17px',
+					'fluid' => true,
+				),
+				'settings'        => array(
+					'typography' => array(),
+				),
+				'expected_output' => 'clamp(14px, 0.875rem + ((1vw - 3.2px) * 0.234), 17px)',
+			),
+			'should use individual preset settings if fluid is disabled in global settings' => array(
+				'font_size'       => array(
+					'size'  => '17px',
+					'fluid' => array(
+						'min' => '16px',
+						'max' => '26px',
+					),
+				),
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => false,
+					),
+				),
+				'expected_output' => 'clamp(16px, 1rem + ((1vw - 3.2px) * 0.781), 26px)',
+			),
+		);
+	}
+
+	/**
+	 * Tests backwards compatibility for deprecated second argument $should_use_fluid_typography.
+	 *
+	 * @covers ::wp_get_typography_font_size_value
+	 *
+	 * @expectedDeprecated gutenberg_get_typography_font_size_value
+	 *
+	 * @dataProvider data_generate_font_size_preset_should_use_fluid_typography_deprecated_fixtures
+	 *
+	 * @param array  $font_size                     {
+	 *     Required. A font size as represented in the fontSizes preset format as seen in theme.json.
+	 *
+	 *     @type string $name Name of the font size preset.
+	 *     @type string $slug Kebab-case unique identifier for the font size preset.
+	 *     @type string $size CSS font-size value, including units where applicable.
+	 * }
+	 * @param bool   $should_use_fluid_typography An override to switch fluid typography "on". Can be used for unit testing.
+	 * @param string $expected_output Expected output of gutenberg_get_typography_font_size_value().
+	 */
+	public function test_gutenberg_get_typography_font_size_value_should_use_fluid_typography_deprecated( $font_size, $should_use_fluid_typography, $expected_output ) {
+		$actual = gutenberg_get_typography_font_size_value( $font_size, $should_use_fluid_typography );
+
+		$this->assertSame( $expected_output, $actual );
+	}
+
+	/**
+	 * Data provider for test_wp_get_typography_font_size_value_should_use_fluid_typography_deprecated.
+	 *
+	 * @return array
+	 */
+	public function data_generate_font_size_preset_should_use_fluid_typography_deprecated_fixtures() {
+		return array(
+			'returns value when fluid typography is deactivated' => array(
+				'font_size'                   => array(
+					'size' => '28px',
+				),
+				'should_use_fluid_typography' => false,
+				'expected_output'             => '28px',
+			),
+			'returns clamp value when fluid typography is activated' => array(
+				'font_size'                   => array(
+					'size' => '28px',
+				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(100px, 6.25rem + ((1vw - 3.2px) * 7.813), 200px)',
+				'expected_output'             => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
+			),
+		);
+	}
+
+	/**
+	 * Tests that theme json settings passed to gutenberg_get_typography_font_size_value
+	 * override global theme settings.
+	 *
+	 * @covers ::gutenberg_get_typography_font_size_value
+	 *
+	 * @dataProvider data_generate_should_override_theme_settings_fixtures
+	 *
+	 * @param array  $font_size                     {
+	 *     Required. A font size as represented in the fontSizes preset format as seen in theme.json.
+	 *
+	 *     @type string $name Name of the font size preset.
+	 *     @type string $slug Kebab-case unique identifier for the font size preset.
+	 *     @type string $size CSS font-size value, including units where applicable.
+	 * }
+	 * @param bool   $settings        Theme JSON settings array that overrides any global theme settings.
+	 * @param string $expected_output Expected output of gutenberg_get_typography_font_size_value().
+	 */
+	public function test_should_override_theme_settings( $font_size, $settings, $expected_output ) {
+		switch_theme( 'block-theme-child-with-fluid-typography' );
+		$actual = gutenberg_get_typography_font_size_value( $font_size, $settings );
+
+		$this->assertSame( $expected_output, $actual );
+	}
+
+	/**
+	 * Data provider for test_wp_get_typography_font_size_value_should_use_fluid_typography_deprecated.
+	 *
+	 * @return array
+	 */
+	public function data_generate_should_override_theme_settings_fixtures() {
+		return array(
+			'returns clamp value when theme activates fluid typography' => array(
+				'font_size'       => array(
+					'size' => '28px',
+				),
+				'settings'        => null,
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
+			),
+			'returns value when settings argument deactivates fluid typography' => array(
+				'font_size'       => array(
+					'size' => '28px',
+				),
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => false,
+					),
+				),
+				'expected_output' => '28px',
+			),
+
+			'returns clamp value when settings argument sets a fluid.minViewportWidth value' => array(
+				'font_size'       => array(
+					'size' => '28px',
+				),
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => array(
+							'minViewportWidth' => '500px',
+						),
+					),
+				),
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 5px) * 0.918), 28px)',
+			),
+
+			'returns clamp value when settings argument sets a layout.wideSize value' => array(
+				'font_size'       => array(
+					'size' => '28px',
+				),
+				'settings'        => array(
+					'layout' => array(
+						'wideSize' => '500px',
+					),
+				),
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 5.608), 28px)',
+			),
+
+			'returns clamp value with maxViewportWidth preferred over fallback layout.wideSize value' => array(
+				'font_size'       => array(
+					'size' => '28px',
+				),
+				'settings'        => array(
+					'typography' => array(
+						'fluid' => array(
+							'maxViewportWidth' => '1000px',
+						),
+					),
+					'layout'     => array(
+						'wideSize' => '500px',
+					),
+				),
+				'expected_output' => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 1.485), 28px)',
 			),
 		);
 	}
@@ -933,6 +1274,16 @@ public function data_get_computed_fluid_typography_value() {
 				),
 				'expected_output' => 'clamp(50px, 3.125rem + ((1vw - 3.2px) * 7.353), 100px)',
 			),
+			'returns `null` when maximum and minimum viewport width are equal' => array(
+				'args'            => array(
+					'minimum_viewport_width' => '800px',
+					'maximum_viewport_width' => '800px',
+					'minimum_font_size'      => '50px',
+					'maximum_font_size'      => '100px',
+					'scale_factor'           => 1,
+				),
+				'expected_output' => null,
+			),
 			'returns `null` when `maximum_viewport_width` is an unsupported unit' => array(
 				'args'            => array(
 					'minimum_viewport_width' => '320px',
diff --git a/phpunit/block-template-test.php b/phpunit/block-template-test.php
new file mode 100644
index 00000000000000..d3cfb1fe12f4f5
--- /dev/null
+++ b/phpunit/block-template-test.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Tests block template registry via block-related functions.
+ */
+class Tests_Block_Template extends WP_UnitTestCase {
+	public function set_up() {
+		parent::set_up();
+		switch_theme( 'block-theme' );
+	}
+
+	public function test_get_block_templates_from_registry() {
+		$template_name = 'test-plugin//test-template';
+
+		register_block_template( $template_name );
+
+		$templates = get_block_templates();
+
+		$this->assertArrayHasKey( $template_name, $templates );
+
+		unregister_block_template( $template_name );
+	}
+
+	public function test_get_block_template_from_registry() {
+		$template_name = 'test-plugin//test-template';
+		$args          = array(
+			'title' => 'Test Template',
+		);
+
+		register_block_template( $template_name, $args );
+
+		$template = get_block_template( 'block-theme//test-template' );
+
+		$this->assertEquals( 'Test Template', $template->title );
+
+		unregister_block_template( $template_name );
+	}
+}
diff --git a/phpunit/block-template-utils-test.php b/phpunit/block-template-utils-test.php
deleted file mode 100644
index 4b10e33deee93f..00000000000000
--- a/phpunit/block-template-utils-test.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/**
- * Tests_Block_Template_Utils class
- *
- * @package WordPress
- */
-
-class Tests_Block_Template_Utils extends WP_UnitTestCase {
-	public function set_up() {
-		parent::set_up();
-		switch_theme( 'emptytheme' );
-		register_post_type(
-			'custom_book',
-			array(
-				'public'       => true,
-				'show_in_rest' => true,
-			)
-		);
-		register_taxonomy( 'book_type', 'custom_book' );
-	}
-
-	public function tear_down() {
-		unregister_post_type( 'custom_book' );
-		unregister_taxonomy( 'book_type' );
-		parent::tear_down();
-	}
-
-	public function test_get_template_hierarchy() {
-		$hierarchy = get_template_hierarchy( 'front-page' );
-		$this->assertEquals( array( 'front-page', 'home', 'index' ), $hierarchy );
-		// Custom templates.
-		$hierarchy = get_template_hierarchy( 'whatever-slug', true );
-		$this->assertEquals( array( 'page', 'singular', 'index' ), $hierarchy );
-		// Single slug templates(ex. page, tag, author, etc..
-		$hierarchy = get_template_hierarchy( 'page' );
-		$this->assertEquals( array( 'page', 'singular', 'index' ), $hierarchy );
-		$hierarchy = get_template_hierarchy( 'tag' );
-		$this->assertEquals( array( 'tag', 'archive', 'index' ), $hierarchy );
-		$hierarchy = get_template_hierarchy( 'author' );
-		$this->assertEquals( array( 'author', 'archive', 'index' ), $hierarchy );
-		$hierarchy = get_template_hierarchy( 'date' );
-		$this->assertEquals( array( 'date', 'archive', 'index' ), $hierarchy );
-		$hierarchy = get_template_hierarchy( 'taxonomy' );
-		$this->assertEquals( array( 'taxonomy', 'archive', 'index' ), $hierarchy );
-		$hierarchy = get_template_hierarchy( 'attachment' );
-		$this->assertEquals(
-			array(
-				'attachment',
-				'single',
-				'singular',
-				'index',
-			),
-			$hierarchy
-		);
-		$hierarchy = get_template_hierarchy( 'singular' );
-		$this->assertEquals( array( 'singular', 'index' ), $hierarchy );
-		$hierarchy = get_template_hierarchy( 'single' );
-		$this->assertEquals( array( 'single', 'singular', 'index' ), $hierarchy );
-		$hierarchy = get_template_hierarchy( 'archive' );
-		$this->assertEquals( array( 'archive', 'index' ), $hierarchy );
-		$hierarchy = get_template_hierarchy( 'index' );
-		$this->assertEquals( array( 'index' ), $hierarchy );
-
-		// Taxonomies.
-		$hierarchy = get_template_hierarchy( 'taxonomy-book_type', false );
-		$this->assertEquals( array( 'taxonomy-book_type', 'taxonomy', 'archive', 'index' ), $hierarchy );
-
-		$hierarchy = get_template_hierarchy( 'taxonomy-books', false, 'taxonomy-books' );
-		$this->assertEquals( array( 'taxonomy-books', 'taxonomy', 'archive', 'index' ), $hierarchy );
-		// Single word category.
-		$hierarchy = get_template_hierarchy( 'category-fruits', false );
-		$this->assertEquals(
-			array(
-				'category-fruits',
-				'category',
-				'archive',
-				'index',
-			),
-			$hierarchy
-		);
-
-		$hierarchy = get_template_hierarchy( 'category-fruits', false, 'category' );
-		$this->assertEquals(
-			array(
-				'category-fruits',
-				'category',
-				'archive',
-				'index',
-			),
-			$hierarchy
-		);
-		// Multi word category.
-		$hierarchy = get_template_hierarchy( 'category-fruits-yellow', false );
-		$this->assertEquals(
-			array(
-				'category-fruits-yellow',
-				'category',
-				'archive',
-				'index',
-			),
-			$hierarchy
-		);
-
-		$hierarchy = get_template_hierarchy( 'category-fruits-yellow', false, 'category' );
-		$this->assertEquals(
-			array(
-				'category-fruits-yellow',
-				'category',
-				'archive',
-				'index',
-			),
-			$hierarchy
-		);
-		// Single word taxonomy.
-		$hierarchy = get_template_hierarchy( 'taxonomy-books-action', false, 'taxonomy-books' );
-		$this->assertEquals(
-			array(
-				'taxonomy-books-action',
-				'taxonomy-books',
-				'taxonomy',
-				'archive',
-				'index',
-			),
-			$hierarchy
-		);
-
-		$hierarchy = get_template_hierarchy( 'taxonomy-book_type-adventure', false );
-		$this->assertEquals( array( 'taxonomy-book_type-adventure', 'taxonomy-book_type', 'taxonomy', 'archive', 'index' ), $hierarchy );
-
-		$hierarchy = get_template_hierarchy( 'taxonomy-books-action-adventure', false, 'taxonomy-books' );
-		$this->assertEquals(
-			array(
-				'taxonomy-books-action-adventure',
-				'taxonomy-books',
-				'taxonomy',
-				'archive',
-				'index',
-			),
-			$hierarchy
-		);
-		// Multi word taxonomy/terms.
-		$hierarchy = get_template_hierarchy( 'taxonomy-greek-books-action-adventure', false, 'taxonomy-greek-books' );
-		$this->assertEquals(
-			array(
-				'taxonomy-greek-books-action-adventure',
-				'taxonomy-greek-books',
-				'taxonomy',
-				'archive',
-				'index',
-			),
-			$hierarchy
-		);
-		// Post types.
-		$hierarchy = get_template_hierarchy( 'single-book', false, 'single-book' );
-		$this->assertEquals(
-			array(
-				'single-book',
-				'single',
-				'singular',
-				'index',
-			),
-			$hierarchy
-		);
-		$hierarchy = get_template_hierarchy( 'single-art-project', false, 'single-art-project' );
-		$this->assertEquals(
-			array(
-				'single-art-project',
-				'single',
-				'singular',
-				'index',
-			),
-			$hierarchy
-		);
-		$hierarchy = get_template_hierarchy( 'single-art-project-imagine', false, 'single-art-project' );
-		$this->assertEquals(
-			array(
-				'single-art-project-imagine',
-				'single-art-project',
-				'single',
-				'singular',
-				'index',
-			),
-			$hierarchy
-		);
-
-		$hierarchy = get_template_hierarchy( 'single-custom_book', false );
-		$this->assertEquals(
-			array(
-				'single-custom_book',
-				'single',
-				'singular',
-				'index',
-			),
-			$hierarchy
-		);
-
-		$hierarchy = get_template_hierarchy( 'single-custom_book-book-1', false );
-		$this->assertEquals(
-			array(
-				'single-custom_book-book-1',
-				'single-custom_book',
-				'single',
-				'singular',
-				'index',
-			),
-			$hierarchy
-		);
-
-		$hierarchy = get_template_hierarchy( 'page-hi', false, 'page' );
-		$this->assertEquals(
-			array(
-				'page-hi',
-				'page',
-				'singular',
-				'index',
-			),
-			$hierarchy
-		);
-		$hierarchy = get_template_hierarchy( 'page-hi', false );
-		$this->assertEquals(
-			array(
-				'page-hi',
-				'page',
-				'singular',
-				'index',
-			),
-			$hierarchy
-		);
-		// Authors.
-		$hierarchy = get_template_hierarchy( 'author-rigas', false, 'author' );
-		$this->assertEquals(
-			array(
-				'author-rigas',
-				'author',
-				'archive',
-				'index',
-			),
-			$hierarchy
-		);
-		// Archive post types.
-		$hierarchy = get_template_hierarchy( 'archive-book', false );
-		$this->assertEquals(
-			array(
-				'archive-book',
-				'archive',
-				'index',
-			),
-			$hierarchy
-		);
-	}
-}
diff --git a/phpunit/blocks/block-json-variations-filename-test.php b/phpunit/blocks/block-json-variations-filename-test.php
new file mode 100644
index 00000000000000..3cbbb05aa59b0d
--- /dev/null
+++ b/phpunit/blocks/block-json-variations-filename-test.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Test for the block.json's variations field being a PHP file.
+ *
+ * @package WordPress
+ * @subpackage Blocks
+ */
+
+/**
+ * Test that block variations can be registered from a PHP file.
+ *
+ * @group blocks
+ */
+class Block_Json_Variations_Filename_Test extends WP_UnitTestCase {
+	/**
+	 * Tear down each test method.
+	 */
+	public function tear_down() {
+		$registry = WP_Block_Type_Registry::get_instance();
+
+		if ( $registry->is_registered( 'my-plugin/notice' ) ) {
+			$registry->unregister( 'my-plugin/notice' );
+		}
+
+		parent::tear_down();
+	}
+
+	/**
+	 * Tests registering a block with variations from a PHP file.
+	 *
+	 * @covers ::register_block_type_from_metadata
+	 */
+	public function test_register_block_type_from_metadata_with_variations_php_file() {
+		$filter_metadata_registration = static function ( $metadata ) {
+			$metadata['variations'] = 'file:./variations.php';
+			return $metadata;
+		};
+
+		add_filter( 'block_type_metadata', $filter_metadata_registration, 10, 2 );
+		$result = register_block_type_from_metadata( GUTENBERG_DIR_TESTFIXTURES );
+		remove_filter( 'block_type_metadata', $filter_metadata_registration );
+
+		$this->assertInstanceOf( 'WP_Block_Type', $result, 'The block was not registered' );
+
+		$expected_variations = require GUTENBERG_DIR_TESTFIXTURES . '/variations.php';
+		$this->assertSame( $expected_variations, $result->variations, "Block variations haven't been set correctly." );
+	}
+}
diff --git a/phpunit/blocks/block-navigation-block-hooks-test.php b/phpunit/blocks/block-navigation-block-hooks-test.php
new file mode 100644
index 00000000000000..1d3c86bf4bca4b
--- /dev/null
+++ b/phpunit/blocks/block-navigation-block-hooks-test.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Navigation block block hooks tests.
+ *
+ * @package WordPress
+ * @subpackage Blocks
+ */
+
+/**
+ * Tests for the Navigation block.
+ *
+ * @group blocks
+ */
+class Block_Navigation_Block_Hooks_Test extends WP_UnitTestCase {
+	/**
+	 * Original markup.
+	 *
+	 * @var string
+	 */
+	protected static $original_markup;
+
+	/**
+	 * Post object.
+	 *
+	 * @var object
+	 */
+	protected static $navigation_post;
+
+	/**
+	 * Setup method.
+	 */
+	public static function wpSetUpBeforeClass() {
+		//self::$original_markup = '<!-- wp:navigation-link {"label":"News & About","type":"page","id":2,"url":"http://localhost:8888/?page_id=2","kind":"post-type"} /-->';
+
+		self::$navigation_post = self::factory()->post->create_and_get(
+			array(
+				'post_type'    => 'wp_navigation',
+				'post_title'   => 'Navigation Menu',
+				'post_content' => 'Original content',
+			)
+		);
+	}
+
+	/**
+	 * Tear down each test method.
+	 */
+	public function tear_down() {
+		$registry = WP_Block_Type_Registry::get_instance();
+
+		if ( $registry->is_registered( 'tests/my-block' ) ) {
+			$registry->unregister( 'tests/my-block' );
+		}
+
+		parent::tear_down();
+	}
+
+	/**
+	 * @covers ::gutenberg_block_core_navigation_update_ignore_hooked_blocks_meta
+	 */
+	public function test_block_core_navigation_update_ignore_hooked_blocks_meta_preserves_entities() {
+		register_block_type(
+			'tests/my-block',
+			array(
+				'block_hooks' => array(
+					'core/navigation' => 'last_child',
+				),
+			)
+		);
+
+		$original_markup    = '<!-- wp:navigation-link {"label":"News & About","type":"page","id":2,"url":"http://localhost:8888/?page_id=2","kind":"post-type"} /-->';
+		$post               = new stdClass();
+		$post->ID           = self::$navigation_post->ID;
+		$post->post_content = $original_markup;
+
+		$post = gutenberg_block_core_navigation_update_ignore_hooked_blocks_meta( $post );
+
+		// We expect the '&' character to be replaced with its unicode representation.
+		$expected_markup = str_replace( '&', '\u0026', $original_markup );
+
+		$this->assertSame(
+			$expected_markup,
+			$post->post_content,
+			'Post content did not match expected markup with entities escaped.'
+		);
+		$this->assertSame(
+			array( 'tests/my-block' ),
+			json_decode( get_post_meta( self::$navigation_post->ID, '_wp_ignored_hooked_blocks', true ), true ),
+			'Block was not added to ignored hooked blocks metadata.'
+		);
+	}
+
+	/**
+	 * @covers ::gutenberg_block_core_navigation_update_ignore_hooked_blocks_meta
+	 */
+	public function test_block_core_navigation_dont_modify_no_post_id() {
+		register_block_type(
+			'tests/my-block',
+			array(
+				'block_hooks' => array(
+					'core/navigation' => 'last_child',
+				),
+			)
+		);
+
+		$original_markup    = '<!-- wp:navigation-link {"label":"News","type":"page","id":2,"url":"http://localhost:8888/?page_id=2","kind":"post-type"} /-->';
+		$post               = new stdClass();
+		$post->post_content = $original_markup;
+
+		$post = gutenberg_block_core_navigation_update_ignore_hooked_blocks_meta( $post );
+
+		$this->assertSame(
+			$original_markup,
+			$post->post_content,
+			'Post content did not match the original markup.'
+		);
+	}
+
+	/**
+	 * @covers ::gutenberg_block_core_navigation_update_ignore_hooked_blocks_meta
+	 */
+	public function test_block_core_navigation_retains_content_if_not_set() {
+		register_block_type(
+			'tests/my-block',
+			array(
+				'block_hooks' => array(
+					'core/navigation' => 'last_child',
+				),
+			)
+		);
+
+		$post             = new stdClass();
+		$post->ID         = self::$navigation_post->ID;
+		$post->post_title = 'Navigation Menu with changes';
+
+		$post = gutenberg_block_core_navigation_update_ignore_hooked_blocks_meta( $post );
+
+		$this->assertSame(
+			'Navigation Menu with changes',
+			$post->post_title,
+			'Post title was changed.'
+		);
+
+		$this->assertFalse(
+			isset( $post->post_content ),
+			'Post content should not be set.'
+		);
+	}
+}
diff --git a/phpunit/blocks/block-navigation-link-variations-test.php b/phpunit/blocks/block-navigation-link-variations-test.php
index c5082e0f4c878f..27711e1c03efb5 100644
--- a/phpunit/blocks/block-navigation-link-variations-test.php
+++ b/phpunit/blocks/block-navigation-link-variations-test.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Navigation block rendering tests.
+ * Navigation block post type/taxonomies variations tests.
  *
  * @package WordPress
  * @subpackage Blocks
@@ -12,9 +12,19 @@
  * @group blocks
  */
 class Block_Navigation_Link_Variations_Test extends WP_UnitTestCase {
+
+	/**
+	 * Whether to use a shim/workaround for WordPress Core versions < 6.5.
+	 * See https://github.com/WordPress/gutenberg/pull/58389 for details.
+	 *
+	 * @var bool
+	 */
+	private $pre_65_compat = false;
+
 	public function set_up() {
 		parent::set_up();
-		register_post_type(
+
+		$post_type         = register_post_type(
 			'custom_book',
 			array(
 				'labels'            => array(
@@ -25,7 +35,18 @@ public function set_up() {
 				'show_in_nav_menus' => true,
 			)
 		);
-		register_taxonomy(
+		$private_post_type = register_post_type(
+			'private_custom_book',
+			array(
+				'labels'            => array(
+					'item_link' => 'Custom Book',
+				),
+				'public'            => false,
+				'show_in_rest'      => true,
+				'show_in_nav_menus' => false,
+			)
+		);
+		$taxonomy          = register_taxonomy(
 			'book_type',
 			'custom_book',
 			array(
@@ -35,40 +56,190 @@ public function set_up() {
 				'show_in_nav_menus' => true,
 			)
 		);
+		$private_taxonomoy = register_taxonomy(
+			'private_book_type',
+			'private_custom_book',
+			array(
+				'labels'            => array(
+					'item_link' => 'Book Type',
+				),
+				'show_in_nav_menus' => false,
+			)
+		);
+
+		$this->pre_65_compat = ! method_exists( 'WP_Block_Type', 'get_variations' );
+
+		/*
+		 * In Core versions < 6.5, variations for post types/taxonomies registered after init#10 (= after the block type was registered)
+		 * need to be manually registered.
+		 * set_up runs after init#10, therefore register the variations here with the old deprecated functions.
+		 *
+		 * TODO: After two WP versions (6.7), we can remove this.
+		 */
+		if ( $this->pre_65_compat ) {
+			$this->handle_pre_65_post_type_variation_registration( $post_type );
+			$this->handle_pre_65_post_type_variation_registration( $private_post_type );
+			$this->handle_pre_65_taxonomy_variation_registration( $taxonomy );
+			$this->handle_pre_65_taxonomy_variation_registration( $private_taxonomoy );
+		}
 	}
 
 	public function tear_down() {
 		unregister_post_type( 'custom_book' );
+		unregister_post_type( 'private_custom_book' );
 		unregister_taxonomy( 'book_type' );
+		unregister_taxonomy( 'private_book_type' );
+		unregister_post_type( 'temp_custom_book' );
+		unregister_taxonomy( 'temp_book_type' );
+
+		// See comment in set_up for explanation.
+		if ( $this->pre_65_compat ) {
+			$this->handle_pre_65_post_type_variation_unregistration( 'custom_book' );
+			$this->handle_pre_65_post_type_variation_unregistration( 'private_custom_book' );
+			$this->handle_pre_65_post_type_variation_unregistration( 'temp_custom_book' );
+			$this->handle_pre_65_taxonomy_variation_unregistration( 'book_type' );
+			$this->handle_pre_65_taxonomy_variation_unregistration( 'private_book_type' );
+			$this->handle_pre_65_taxonomy_variation_unregistration( 'temp_book_type' );
+		}
+
 		parent::tear_down();
 	}
 
 	/**
-	 * @covers ::register_block_core_navigation_link_post_type_variation
+	 * @covers ::block_core_navigation_link_register_post_type_variation
 	 */
 	public function test_navigation_link_variations_custom_post_type() {
 		$registry       = WP_Block_Type_Registry::get_instance();
 		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
-		$this->assertNotEmpty( $nav_link_block->variations, 'Block has no variations' );
-		$variation = $this->get_variation_by_name( 'custom_book', $nav_link_block->variations );
-		$this->assertIsArray( $variation, 'Block variation is not an array' );
+		// Use property and let __get handle it, so it works for core versions before adding get_variations as well
+		$variations = $nav_link_block->variations;
+		$this->assertNotEmpty( $variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'custom_book', $variations );
+		$this->assertIsArray( $variation, 'Block variation does not exist' );
 		$this->assertArrayHasKey( 'title', $variation, 'Block variation has no title' );
 		$this->assertEquals( 'Custom Book', $variation['title'], 'Variation title is different than the post type label' );
 	}
 
 	/**
-	 * @covers ::register_block_core_navigation_link_taxonomy_variation
+	 * @covers ::block_core_navigation_link_register_post_type_variation
+	 */
+	public function test_navigation_link_variations_private_custom_post_type() {
+		$registry       = WP_Block_Type_Registry::get_instance();
+		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
+		// Use property and let __get handle it, so it works for core versions before adding get_variations as well
+		$variations = $nav_link_block->variations;
+		$this->assertNotEmpty( $variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'private_custom_book', $variations );
+		$this->assertEmpty( $variation, 'Block variation for private post type exists.' );
+	}
+
+	/**
+	 * @covers ::block_core_navigation_link_register_taxonomy_variation
 	 */
 	public function test_navigation_link_variations_custom_taxonomy() {
 		$registry       = WP_Block_Type_Registry::get_instance();
 		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
-		$this->assertNotEmpty( $nav_link_block->variations, 'Block has no variations' );
-		$variation = $this->get_variation_by_name( 'book_type', $nav_link_block->variations );
-		$this->assertIsArray( $variation, 'Block variation is not an array' );
+		// Use property and let __get handle it, so it works for core versions before adding get_variations as well
+		$variations = $nav_link_block->variations;
+		$this->assertNotEmpty( $variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'book_type', $variations );
+		$this->assertIsArray( $variation, 'Block variation does not exist' );
 		$this->assertArrayHasKey( 'title', $variation, 'Block variation has no title' );
 		$this->assertEquals( 'Book Type', $variation['title'], 'Variation title is different than the post type label' );
 	}
 
+	/**
+	 * @covers ::block_core_navigation_link_register_taxonomy_variation
+	 */
+	public function test_navigation_link_variations_private_custom_taxonomy() {
+		$registry       = WP_Block_Type_Registry::get_instance();
+		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
+		// Use property and let __get handle it, so it works for core versions before adding get_variations as well
+		$variations = $nav_link_block->variations;
+		$this->assertNotEmpty( $variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'private_book_type', $variations );
+		$this->assertEmpty( $variation, 'Block variation for private taxonomy exists.' );
+	}
+
+	/**
+	 * @covers ::block_core_navigation_link_unregister_post_type_variation
+	 */
+	public function test_navigation_link_variations_unregister_post_type() {
+		$post_type = register_post_type(
+			'temp_custom_book',
+			array(
+				'labels'            => array(
+					'item_link' => 'Custom Book',
+				),
+				'public'            => true,
+				'show_in_rest'      => true,
+				'show_in_nav_menus' => true,
+			)
+		);
+
+		if ( $this->pre_65_compat ) {
+			$this->handle_pre_65_post_type_variation_registration( $post_type );
+		}
+
+		$registry       = WP_Block_Type_Registry::get_instance();
+		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
+		// Use property and let __get handle it, so it works for core versions before adding get_variations as well
+		$variations = $nav_link_block->variations;
+		$this->assertNotEmpty( $variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'temp_custom_book', $variations );
+		$this->assertIsArray( $variation, 'Block variation does not exist' );
+
+		unregister_post_type( $post_type->name );
+
+		if ( $this->pre_65_compat ) {
+			$this->handle_pre_65_post_type_variation_unregistration( $post_type->name );
+		}
+
+		// Update array, since it's an dynamic built array
+		$variations = $nav_link_block->variations;
+		$variation  = $this->get_variation_by_name( 'temp_custom_book', $variations );
+		$this->assertEmpty( $variation, 'Block variation still exists' );
+	}
+
+	/**
+	 * @covers ::block_core_navigation_link_unregister_taxonomy_variation
+	 */
+	public function test_navigation_link_variations_unregister_taxonomy() {
+		$taxonomy = register_taxonomy(
+			'temp_book_type',
+			'custom_book',
+			array(
+				'labels'            => array(
+					'item_link' => 'Book Type',
+				),
+				'show_in_nav_menus' => true,
+			)
+		);
+
+		if ( $this->pre_65_compat ) {
+			$this->handle_pre_65_taxonomy_variation_registration( $taxonomy );
+		}
+
+		$registry       = WP_Block_Type_Registry::get_instance();
+		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
+		// Use property and let __get handle it, so it works for core versions before adding get_variations as well
+		$variations = $nav_link_block->variations;
+		$this->assertNotEmpty( $variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'temp_book_type', $variations );
+		$this->assertIsArray( $variation, 'Block variation does not exist' );
+
+		unregister_taxonomy( $taxonomy->name );
+
+		if ( $this->pre_65_compat ) {
+			$this->handle_pre_65_taxonomy_variation_unregistration( $taxonomy->name );
+		}
+
+		// Update array, since it's an dynamic built array
+		$variations = $nav_link_block->variations;
+		$variation  = $this->get_variation_by_name( 'temp_book_type', $variations );
+		$this->assertEmpty( $variation, 'Block variation still exists' );
+	}
+
 	/**
 	 * Get a variation by its name from an array of variations.
 	 *
@@ -86,4 +257,52 @@ private function get_variation_by_name( $variation_name, $variations ) {
 
 		return $found_variation;
 	}
+
+	/**
+	 * Registers a block variation for a post type with the deprecated methods for Core versions < 6.5.
+	 * See comment in set_up for dexplanation.
+	 *
+	 * @param WP_Post_Type $post_type
+	 */
+	private function handle_pre_65_post_type_variation_registration( $post_type ) {
+		$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_register_post_type_variation' );
+		$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_register_variation' );
+		gutenberg_block_core_navigation_link_register_post_type_variation( $post_type->name, $post_type );
+	}
+
+	/**
+	 * Unregisters a block variation for a post type with the deprecated methods for Core versions < 6.5.
+	 * See comment in set_up for dexplanation.
+	 *
+	 * @param string $post_type
+	 */
+	private function handle_pre_65_post_type_variation_unregistration( $post_type ) {
+		$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_unregister_post_type_variation' );
+		$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_unregister_variation' );
+		gutenberg_block_core_navigation_link_unregister_post_type_variation( $post_type );
+	}
+
+	/**
+	 * Registers a block variation for a taxonomy with the deprecated methods for Core versions < 6.5.
+	 * See comment in set_up for dexplanation.
+	 *
+	 * @param WP_Taxonomy $post_type
+	 */
+	private function handle_pre_65_taxonomy_variation_registration( $taxonomy ) {
+		$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_register_taxonomy_variation' );
+		$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_register_variation' );
+		gutenberg_block_core_navigation_link_register_taxonomy_variation( $taxonomy->name, $taxonomy->object_type, (array) $taxonomy );
+	}
+
+	/**
+	 * Unregisters a block variation for a taxonomy with the deprecated methods for Core versions < 6.5.
+	 * See comment in set_up for dexplanation.
+	 *
+	 * @param string $post_type
+	 */
+	private function handle_pre_65_taxonomy_variation_unregistration( $taxonomy ) {
+		$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_unregister_taxonomy_variation' );
+		$this->setExpectedDeprecated( 'gutenberg_block_core_navigation_link_unregister_variation' );
+		gutenberg_block_core_navigation_link_unregister_taxonomy_variation( $taxonomy );
+	}
 }
diff --git a/phpunit/class-block-library-navigation-link-test.php b/phpunit/blocks/class-block-library-navigation-link-test.php
similarity index 97%
rename from phpunit/class-block-library-navigation-link-test.php
rename to phpunit/blocks/class-block-library-navigation-link-test.php
index 7223a7d45abda9..993f93fb8cad02 100644
--- a/phpunit/class-block-library-navigation-link-test.php
+++ b/phpunit/blocks/class-block-library-navigation-link-test.php
@@ -222,12 +222,14 @@ public function test_returns_link_for_decoded_link() {
 			'https://example.com/?id=10&data=lzB%252Fzd%252FZA%253D%253D',
 			'https://example.com/?id=10&data=lzB%2Fzd%FZA%3D%3D',
 			'https://example.com/?id=10&data=1234',
+			'https://example.com/?arrayParams[]=1&arrayParams[]=2&arrayParams[]=3',
 		);
 
 		$urls_after_render = array(
 			'https://example.com/?id=10&#038;data=lzB%2Fzd%2FZA%3D%3D',
 			'https://example.com/?id=10&#038;data=lzB%2Fzd%FZA%3D%3D',
 			'https://example.com/?id=10&#038;data=1234',
+			'https://example.com/?arrayParams%5B%5D=1&#038;arrayParams%5B%5D=2&#038;arrayParams%5B%5D=3',
 		);
 
 		foreach ( $urls_before_render as $idx => $link ) {
diff --git a/phpunit/blocks/class-wp-navigation-block-renderer-test.php b/phpunit/blocks/class-wp-navigation-block-renderer-test.php
new file mode 100644
index 00000000000000..63efc3bfe35de0
--- /dev/null
+++ b/phpunit/blocks/class-wp-navigation-block-renderer-test.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * Test the block WP_Navigation_Block_Renderer class.
+ *
+ * @package Gutenberg
+ */
+
+class WP_Navigation_Block_Renderer_Test extends WP_UnitTestCase {
+
+	/**
+	 * Test that navigation links are wrapped in list items to preserve accessible markup
+	 *
+	 * @group navigation-renderer
+	 *
+	 * @covers WP_Navigation_Block_Renderer::get_markup_for_inner_block
+	 */
+	public function test_gutenberg_default_block_is_enclosed_in_li_tags() {
+
+		$parsed_blocks         = parse_blocks(
+			'<!-- wp:navigation-link {"label":"Sample Page","type":"page","kind":"post-type","url":"/hello-world"} /-->'
+		);
+		$parsed_block          = $parsed_blocks[0];
+		$context               = array();
+		$navigation_link_block = new WP_Block( $parsed_block, $context );
+
+		// Setup an empty testing instance of `WP_Navigation_Block_Renderer` and save the original.
+		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer_Gutenberg' );
+		$method     = $reflection->getMethod( 'get_markup_for_inner_block' );
+		$method->setAccessible( true );
+		// Invoke the private method.
+		$result = $method->invoke( $reflection, $navigation_link_block );
+
+		$expected = '<li class=" wp-block-navigation-item wp-block-navigation-link"><a class="wp-block-navigation-item__content"  href="/hello-world"><span class="wp-block-navigation-item__label">Sample Page</span></a></li>';
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that the site-title block is wrapped in a list item to preserve accessible markup
+	 *
+	 * @group navigation-renderer
+	 *
+	 * @covers WP_Navigation_Block_Renderer::get_markup_for_inner_block
+	 */
+	public function test_gutenberg_get_markup_for_inner_block_site_title() {
+
+		// We are testing the site title block because we manually add list items around it.
+		$parsed_blocks    = parse_blocks(
+			'<!-- wp:site-title /-->'
+		);
+		$parsed_block     = $parsed_blocks[0];
+		$context          = array();
+		$site_title_block = new WP_Block( $parsed_block, $context );
+
+		// Setup an empty testing instance of `WP_Navigation_Block_Renderer` and save the original.
+		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer_Gutenberg' );
+		$method     = $reflection->getMethod( 'get_markup_for_inner_block' );
+		$method->setAccessible( true );
+		// Invoke the private method.
+		$result = $method->invoke( $reflection, $site_title_block );
+
+		$expected = '<li class="wp-block-navigation-item"><h1 class="wp-block-site-title"><a href="http://' . WP_TESTS_DOMAIN . '" target="_self" rel="home">Test Blog</a></h1></li>';
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that a given block will not be automatically wrapped in a list item by default.
+	 *
+	 * @group navigation-renderer
+	 *
+	 * @covers WP_Navigation_Block_Renderer::get_markup_for_inner_block
+	 */
+	public function test_gutenberg_block_not_automatically_wrapped_with_li_tag() {
+
+		register_block_type(
+			'testsuite/sample-block',
+			array(
+				'api_version'     => 2,
+				'render_callback' => function ( $attributes ) {
+					return '<div class="wp-block-testsuite-sample-block">' . $attributes['content'] . '</div>';
+				},
+			)
+		);
+
+		// We are testing the site title block because we manually add list items around it.
+		$parsed_blocks = parse_blocks(
+			'<!-- wp:testsuite/sample-block {"content":"Hello World"} /-->'
+		);
+		$parsed_block  = $parsed_blocks[0];
+		$context       = array();
+		$heading_block = new WP_Block( $parsed_block, $context );
+
+		// Setup an empty testing instance of `WP_Navigation_Block_Renderer` and save the original.
+		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer_Gutenberg' );
+		$method     = $reflection->getMethod( 'get_markup_for_inner_block' );
+		$method->setAccessible( true );
+		// Invoke the private method.
+		$result = $method->invoke( $reflection, $heading_block );
+
+		$expected = '<div class="wp-block-testsuite-sample-block">Hello World</div>';
+		$this->assertEquals( $expected, $result );
+
+		unregister_block_type( 'testsuite/sample-block' );
+	}
+
+	/**
+	 * Test that a block can be added to the list of blocks which require a wrapping list item.
+	 * This allows extenders to opt in to the rendering behavior of the Navigation block
+	 * which helps to preserve accessible markup.
+	 *
+	 * @group navigation-renderer
+	 *
+	 * @covers WP_Navigation_Block_Renderer::get_markup_for_inner_block
+	 */
+	public function test_gutenberg_block_is_automatically_wrapped_with_li_tag_when_filtered() {
+
+		register_block_type(
+			'testsuite/sample-block',
+			array(
+				'api_version'     => 2,
+				'render_callback' => function ( $attributes ) {
+					return '<div class="wp-block-testsuite-sample-block">' . $attributes['content'] . '</div>';
+				},
+			)
+		);
+
+		$filter_needs_list_item_wrapper_function = static function ( $needs_list_item_wrapper ) {
+			$needs_list_item_wrapper[] = 'testsuite/sample-block';
+			return $needs_list_item_wrapper;
+		};
+
+		add_filter(
+			'block_core_navigation_listable_blocks',
+			$filter_needs_list_item_wrapper_function,
+			10,
+			1
+		);
+
+		// We are testing the site title block because we manually add list items around it.
+		$parsed_blocks = parse_blocks(
+			'<!-- wp:testsuite/sample-block {"content":"Hello World"} /-->'
+		);
+		$parsed_block  = $parsed_blocks[0];
+		$context       = array();
+		$heading_block = new WP_Block( $parsed_block, $context );
+
+		// Setup an empty testing instance of `WP_Navigation_Block_Renderer` and save the original.
+		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer_Gutenberg' );
+		$method     = $reflection->getMethod( 'get_markup_for_inner_block' );
+		$method->setAccessible( true );
+		// Invoke the private method.
+		$result = $method->invoke( $reflection, $heading_block );
+
+		$expected = '<li class="wp-block-navigation-item"><div class="wp-block-testsuite-sample-block">Hello World</div></li>';
+		$this->assertEquals( $expected, $result );
+
+		remove_filter( 'block_core_navigation_listable_blocks', $filter_needs_list_item_wrapper_function, 10, 1 );
+
+		unregister_block_type( 'testsuite/sample-block' );
+	}
+
+	/**
+	 * Test that the `get_inner_blocks_from_navigation_post` method returns an empty block list for a non-existent post.
+	 *
+	 * @group navigation-renderer
+	 *
+	 * @covers WP_Navigation_Block_Renderer::get_inner_blocks_from_navigation_post
+	 */
+	public function test_gutenberg_get_inner_blocks_from_navigation_post_returns_empty_block_list() {
+		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer_Gutenberg' );
+		$method     = $reflection->getMethod( 'get_inner_blocks_from_navigation_post' );
+		$method->setAccessible( true );
+		$attributes = array( 'ref' => 0 );
+
+		$actual   = $method->invoke( $reflection, $attributes );
+		$expected = new WP_Block_List( array(), $attributes );
+		$this->assertEquals( $actual, $expected );
+		$this->assertCount( 0, $actual );
+	}
+}
diff --git a/phpunit/blocks/get-block-templates-test.php b/phpunit/blocks/get-block-templates-test.php
new file mode 100644
index 00000000000000..7c8045a1f25f74
--- /dev/null
+++ b/phpunit/blocks/get-block-templates-test.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @group blocks
+ * @group block-templates
+ *
+ * @covers ::get_block_templates
+ */
+class Tests_Blocks_GetBlockTemplates extends WP_UnitTestCase {
+
+	const TEST_THEME = 'block-theme';
+
+	/**
+	 * Theme root directory.
+	 *
+	 * @var string
+	 */
+	private $theme_root;
+
+	/**
+	 * Original theme directory.
+	 *
+	 * @var string
+	 */
+	private $orig_theme_dir;
+
+	public function set_up() {
+		parent::set_up();
+		$this->theme_root     = realpath( __DIR__ . '/../data/themedir1' );
+		$this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
+
+		// /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
+		$GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
+
+		add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
+		add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
+		add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
+		// Clear caches.
+		wp_clean_themes_cache();
+		unset( $GLOBALS['wp_themes'] );
+		switch_theme( self::TEST_THEME );
+	}
+
+	public function tear_down() {
+		$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
+		wp_clean_themes_cache();
+		unset( $GLOBALS['wp_themes'] );
+		parent::tear_down();
+	}
+
+	public function filter_set_theme_root() {
+		return $this->theme_root;
+	}
+
+	/**
+	 * Gets the template IDs from the given array.
+	 *
+	 * @param object[] $templates Array of template objects to parse.
+	 * @return string[] The template IDs.
+	 */
+	private function get_template_ids( $templates ) {
+		return array_map(
+			static function ( $template ) {
+				return $template->id;
+			},
+			$templates
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_block_templates_should_respect_posttypes_property
+	 * @ticket 55881
+	 *
+	 * @param string $post_type Post type for query.
+	 * @param array  $expected  Expected template IDs.
+	 */
+	public function test_get_block_templates_should_respect_posttypes_property( $post_type, $expected ) {
+		$templates = gutenberg_get_block_templates( array( 'post_type' => $post_type ) );
+
+		$this->assertSameSets(
+			$expected,
+			$this->get_template_ids( $templates )
+		);
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_block_templates_should_respect_posttypes_property() {
+		// @code-merge: This code will go into Core's tests/phpunit/tests/blocks/getBlockTemplates.php.
+		return array(
+			'post' => array(
+				'post_type' => 'post',
+				'expected'  => array(
+					'block-theme//custom-hero-template',
+					'block-theme//custom-single-post-template',
+				),
+			),
+			'page' => array(
+				'post_type' => 'page',
+				'expected'  => array(
+					'block-theme//custom-hero-template',
+					'block-theme//page-home',
+				),
+			),
+		);
+	}
+}
diff --git a/phpunit/blocks/register-block-style-test.php b/phpunit/blocks/register-block-style-test.php
new file mode 100644
index 00000000000000..1becaff347e5fa
--- /dev/null
+++ b/phpunit/blocks/register-block-style-test.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Tests for `gutenberg_register_block_style`.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Tests for Gutenberg's extended block style registration function.
+ *
+ * @group blocks
+ */
+class Tests_Blocks_Register_Block_Style extends WP_UnitTestCase {
+	/**
+	 * Tests `gutenberg_register_block_style` registers block style
+	 * across multiple block types.
+	 */
+	public function test_gutenberg_register_block_style() {
+		$block_types      = array( 'core/group', 'core/columns', 'core/cover' );
+		$style_properties = array(
+			'name'  => 'fancy',
+			'label' => 'Fancy',
+		);
+
+		gutenberg_register_block_style( $block_types, $style_properties );
+		$registry = WP_Block_Styles_Registry::get_instance();
+
+		$this->assertTrue( $registry->is_registered( 'core/group', 'fancy' ) );
+		$this->assertTrue( $registry->is_registered( 'core/columns', 'fancy' ) );
+		$this->assertTrue( $registry->is_registered( 'core/cover', 'fancy' ) );
+	}
+}
diff --git a/phpunit/blocks/render-block-image-test.php b/phpunit/blocks/render-block-image-test.php
new file mode 100644
index 00000000000000..fe39aee8c50b9d
--- /dev/null
+++ b/phpunit/blocks/render-block-image-test.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Image block rendering tests.
+ *
+ * @package WordPress
+ * @subpackage Blocks
+ */
+
+/**
+ * Tests for the Image block.
+ *
+ * @group blocks
+ */
+class Tests_Blocks_Render_Image extends WP_UnitTestCase {
+	/**
+	 * @covers ::render_block_core_image
+	 */
+	public function test_should_render_block_core_image_when_src_is_defined() {
+		$attributes    = array();
+		$content       = '<figure class="wp-block-image"><img src="http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2021/04/canola.jpg" aria-label="test render"/></figure>';
+		$parsed_blocks = parse_blocks(
+			'<!-- wp:image -->'
+		);
+		$parsed_block  = $parsed_blocks[0];
+		$block         = new WP_Block( $parsed_block );
+
+		$rendered_block = gutenberg_render_block_core_image( $attributes, $content, $block );
+		$this->assertStringContainsString( 'aria-label="test render"', $rendered_block );
+	}
+
+	/**
+	 * @covers ::render_block_core_image
+	 */
+	public function test_should_not_render_block_core_image_when_src_is_not_defined() {
+		$attributes    = array();
+		$content       = '<figure class="wp-block-image"><img /></figure>';
+		$parsed_blocks = parse_blocks(
+			'<!-- wp:image -->'
+		);
+		$parsed_block  = $parsed_blocks[0];
+		$block         = new WP_Block( $parsed_block );
+
+		$rendered_block = gutenberg_render_block_core_image( $attributes, $content, $block );
+		$this->assertEquals( '', $rendered_block );
+	}
+
+	/**
+	 * @covers ::render_block_core_image
+	 */
+	public function test_should_not_render_block_core_image_when_src_is_empty_string() {
+		$attributes    = array();
+		$content       = '<figure class="wp-block-image"><img src=""/></figure>';
+		$parsed_blocks = parse_blocks(
+			'<!-- wp:image -->'
+		);
+		$parsed_block  = $parsed_blocks[0];
+		$block         = new WP_Block( $parsed_block );
+
+		$rendered_block = gutenberg_render_block_core_image( $attributes, $content, $block );
+		$this->assertEquals( '', $rendered_block );
+	}
+}
diff --git a/phpunit/blocks/render-block-media-text-test.php b/phpunit/blocks/render-block-media-text-test.php
new file mode 100644
index 00000000000000..f5b67f0a8dc9b7
--- /dev/null
+++ b/phpunit/blocks/render-block-media-text-test.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Media & Text block rendering tests.
+ *
+ * @package WordPress
+ * @subpackage Blocks
+ */
+
+/**
+ * Tests for the Media & Text block.
+ *
+ * @group blocks
+ *
+ * @covers ::render_block_core_media_text
+ */
+class Render_Block_MediaText_Test extends WP_UnitTestCase {
+
+	/**
+	 * Post object.
+	 *
+	 * @var WP_Post
+	 */
+	protected static $post;
+
+	/**
+	 * Attachment id.
+	 *
+	 * @var int
+	 */
+	protected static $attachment_id;
+
+	/**
+	 * Setup method.
+	 */
+	public static function wpSetUpBeforeClass() {
+		self::$post = self::factory()->post->create_and_get();
+		$file       = DIR_TESTDATA . '/images/canola.jpg';
+
+		self::$attachment_id = self::factory()->attachment->create_upload_object(
+			$file,
+			self::$post->ID,
+			array(
+				'post_mime_type' => 'image/jpeg',
+			)
+		);
+
+		set_post_thumbnail( self::$post, self::$attachment_id );
+	}
+
+	/**
+	 * Tear down method.
+	 */
+	public static function wpTearDownAfterClass() {
+		wp_delete_post( self::$post->ID, true );
+		wp_delete_post( self::$attachment_id, true );
+	}
+
+	/**
+	 * Helper method for $wp_query.
+	 */
+	public static function setup_query() {
+		global $wp_query;
+		$wp_query->in_the_loop = true;
+		$wp_query->post        = self::$post;
+		$wp_query->posts       = array( self::$post );
+		$GLOBALS['post']       = self::$post;
+	}
+
+	/**
+	 * Test gutenberg_render_block_core_media_text with the featured image on the left.
+	 */
+	public function test_render_block_core_media_text_featured_image() {
+		$this->setup_query();
+
+		$content = '<div class="wp-block-media-text is-stacked-on-mobile"><figure class="wp-block-media-text__media"></figure><div class="wp-block-media-text__content"><p></p></div></div>';
+
+		// Assert that the rendered block contains the featured image.
+		$attributes = array(
+			'useFeaturedImage' => true,
+		);
+		$rendered   = gutenberg_render_block_core_media_text( $attributes, $content );
+		$this->assertStringContainsString( '<img alt="" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '"', $rendered );
+
+		// Assert that the rendered block contains the featured image as an image element,
+		// when image fill is true.
+		$attributes = array(
+			'useFeaturedImage' => true,
+			'imageFill'        => true,
+		);
+		$rendered   = gutenberg_render_block_core_media_text( $attributes, $content );
+		$this->assertStringContainsString( '<img alt="" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '"', $rendered );
+	}
+
+	/**
+	 * Test gutenberg_render_block_core_media_text with the featured image on the left,
+	 * and a second media & text block nested inside the content area.
+	 */
+	public function test_render_block_core_media_text_featured_image_nested() {
+		$this->setup_query();
+		$content = '<div class="wp-block-media-text is-stacked-on-mobile"><figure class="wp-block-media-text__media"></figure><div class="wp-block-media-text__content"><div class="wp-block-media-text is-stacked-on-mobile"><figure class="wp-block-media-text__media"></figure><div class="wp-block-media-text__content"><p></p></div></div></div></div>';
+
+		// Assert that the rendered block contains the featured image.
+		$attributes = array(
+			'useFeaturedImage' => true,
+		);
+		$rendered   = gutenberg_render_block_core_media_text( $attributes, $content );
+		$this->assertStringContainsString( '<img alt="" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '"', $rendered );
+
+		// Assert that the rendered block contains the featured image as an image element,
+		// when image fill is true.
+		$attributes = array(
+			'useFeaturedImage' => true,
+			'imageFill'        => true,
+		);
+		$rendered   = gutenberg_render_block_core_media_text( $attributes, $content );
+		$this->assertStringContainsString( '<img alt="" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '"', $rendered );
+	}
+
+	/**
+	 * Test gutenberg_render_block_core_media_text with the featured image on the right.
+	 */
+	public function test_render_block_core_media_text_featured_image_media_on_right() {
+		$this->setup_query();
+
+		$content = '<div class="wp-block-media-text has-media-on-the-right is-stacked-on-mobile"><div class="wp-block-media-text__content"><p></p></div><figure class="wp-block-media-text__media"></figure></div>';
+
+		// Assert that the rendered block contains the featured image when media is on the right.
+		$attributes = array(
+			'useFeaturedImage' => true,
+			'mediaPosition'    => 'right',
+		);
+		$rendered   = gutenberg_render_block_core_media_text( $attributes, $content );
+		$this->assertStringContainsString( '<img alt="" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '"', $rendered );
+
+		// Assert that the rendered block contains the featured image as an image element,
+		// when image fill is true and the media is on the right.
+		$attributes = array(
+			'useFeaturedImage' => true,
+			'mediaPosition'    => 'right',
+			'imageFill'        => true,
+		);
+		$rendered   = gutenberg_render_block_core_media_text( $attributes, $content );
+		$this->assertStringContainsString( '<img alt="" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '"', $rendered );
+	}
+
+	/**
+	 * Test gutenberg_render_block_core_media_text with the featured image on the right,
+	 * and a second media & text block nested inside the content area.
+	 */
+	public function test_render_block_core_media_text_featured_image_media_on_right_nested() {
+		$this->setup_query();
+
+		$content = '<div class="wp-block-media-text has-media-on-the-right is-stacked-on-mobile"><div class="wp-block-media-text__content"><div class="wp-block-media-text is-stacked-on-mobile"><div class="wp-block-media-text__content"><p></p></div><figure class="wp-block-media-text__media"></figure></div></div><figure class="wp-block-media-text__media"></figure></div>';
+
+		// Assert that the rendered block contains the featured image when media is on the right.
+		$attributes = array(
+			'useFeaturedImage' => true,
+			'mediaPosition'    => 'right',
+		);
+
+		$rendered = gutenberg_render_block_core_media_text( $attributes, $content );
+		$this->assertStringContainsString( '<img alt="" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '"', $rendered );
+
+		// Assert that the rendered block contains the featured image as an image element,
+		// when image fill is true and the media is on the right.
+		$attributes = array(
+			'useFeaturedImage' => true,
+			'mediaPosition'    => 'right',
+			'imageFill'        => true,
+		);
+
+		$rendered = gutenberg_render_block_core_media_text( $attributes, $content );
+		$this->assertStringContainsString( '<img alt="" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '"', $rendered );
+	}
+}
diff --git a/phpunit/blocks/render-block-navigation-test.php b/phpunit/blocks/render-block-navigation-test.php
index b8266d510ad6c6..c9b552d17f4e46 100644
--- a/phpunit/blocks/render-block-navigation-test.php
+++ b/phpunit/blocks/render-block-navigation-test.php
@@ -66,23 +66,23 @@ public function test_block_core_navigation_get_post_ids_from_block_with_submenu(
 	}
 
 	/**
-	 * @covers :: gutengberg_block_core_navigation_block_contains_core_navigation
+	 * @covers :: block_core_navigation_block_contains_core_navigation
 	 */
-	public function test_gutenberg_block_core_navigation_block_contains_core_navigation() {
+	public function test_block_core_navigation_block_contains_core_navigation() {
 		$parsed_blocks = parse_blocks( '<!-- wp:navigation /-->' );
 		$inner_blocks  = new WP_Block_List( $parsed_blocks );
-		$this->assertTrue( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
+		$this->assertTrue( block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
 	}
 
-	public function test_gutenberg_block_core_navigation_block_contains_core_navigation_deep() {
+	public function test_block_core_navigation_block_contains_core_navigation_deep() {
 		$parsed_blocks = parse_blocks( '<!-- wp:group --><!-- /wp:group --><!-- wp:group --><!-- wp:group --><!-- wp:navigation /--><!-- /wp:group --><!-- /wp:group -->' );
 		$inner_blocks  = new WP_Block_List( $parsed_blocks );
-		$this->assertTrue( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
+		$this->assertTrue( block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
 	}
 
-	public function test_gutenberg_block_core_navigation_block_contains_core_navigation_no_navigation() {
+	public function test_block_core_navigation_block_contains_core_navigation_no_navigation() {
 		$parsed_blocks = parse_blocks( '<!-- wp:group --><!-- wp:group --><!-- /wp:group --><!-- /wp:group -->' );
 		$inner_blocks  = new WP_Block_List( $parsed_blocks );
-		$this->assertFalse( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
+		$this->assertFalse( block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
 	}
 }
diff --git a/phpunit/blocks/render-post-template-test.php b/phpunit/blocks/render-post-template-test.php
index e375758044681a..e929e459654fe7 100644
--- a/phpunit/blocks/render-post-template-test.php
+++ b/phpunit/blocks/render-post-template-test.php
@@ -113,24 +113,33 @@ public function test_rendering_post_template_with_main_query_loop() {
 	}
 
 	/**
-	 * Tests that the `core/post-template` block does not tamper with the main query loop when rendering within a post
+	 * Tests that the `core/post-template` block does not tamper with the main query loop when rendering within a single post
 	 * as the main query loop has already been started. In this case, the main query object needs to be cloned to
 	 * prevent an infinite loop.
+	 * Also tests that the default query returns posts of the 'post' post type when in a single post of any post type.
 	 */
 	public function test_rendering_post_template_with_main_query_loop_already_started() {
 		global $wp_query, $wp_the_query;
 
 		// Query block with post template block.
-		$content  = '<!-- wp:query {"query":{"inherit":true}} -->';
+		$content  = '<!-- wp:query {"query":{"inherit":false}} -->';
 		$content .= '<!-- wp:post-template {"align":"wide"} -->';
 		$content .= '<!-- wp:post-title /-->';
 		$content .= '<!-- /wp:post-template -->';
 		$content .= '<!-- /wp:query -->';
 
-		$expected  = '<ul class="alignwide wp-block-post-template is-layout-flow wp-block-post-template-is-layout-flow wp-block-query-is-layout-flow">';
-		$expected .= '<li class="wp-block-post post-' . self::$post->ID . ' post type-post status-publish format-standard hentry category-uncategorized">';
-		$expected .= '<h2 class="wp-block-post-title">' . self::$post->post_title . '</h2>';
-		$expected .= '</li>';
+		$expected = '<ul class="alignwide wp-block-post-template is-layout-flow wp-block-post-template-is-layout-flow wp-block-query-is-layout-flow">';
+
+		// Find all the posts of the 'post' post type.
+		$wp_query_posts = new WP_Query( array( 'post_type' => 'post' ) );
+
+		while ( $wp_query_posts->have_posts() ) {
+			$wp_query_posts->the_post();
+			$expected .= '<li class="wp-block-post post-' . get_the_ID() . ' post type-post status-publish format-standard hentry category-uncategorized">';
+			$expected .= '<h2 class="wp-block-post-title">' . get_the_title() . '</h2>';
+			$expected .= '</li>';
+		}
+
 		$expected .= '</ul>';
 
 		// Update the post's content to have a query block for the same query as the main query.
@@ -156,4 +165,55 @@ public function test_rendering_post_template_with_main_query_loop_already_starte
 
 		$this->assertSame( $expected, $output, 'Unexpected parsed post content' );
 	}
+
+	/**
+	 * Tests that the `core/post-template` block rewinds the default query when not in a single post of any post type.
+	 */
+	public function test_rendering_post_template_with_main_query_loop_not_single_post() {
+		global $wp_query, $wp_the_query;
+
+		// Query block with post template block.
+		$content  = '<!-- wp:query {"query":{"inherit":true}} -->';
+		$content .= '<!-- wp:post-template {"align":"wide"} -->';
+		$content .= '<!-- wp:post-title /-->';
+		$content .= '<!-- /wp:post-template -->';
+		$content .= '<!-- /wp:query -->';
+
+		$expected = '<ul class="alignwide wp-block-post-template is-layout-flow wp-block-post-template-is-layout-flow wp-block-query-is-layout-flow">';
+
+		// Find all the posts of the 'post' post type.
+		$wp_query_posts = new WP_Query( array( 'post_type' => 'post' ) );
+
+		while ( $wp_query_posts->have_posts() ) {
+			$wp_query_posts->the_post();
+			$expected .= '<li class="wp-block-post post-' . get_the_ID() . ' post type-post status-publish format-standard hentry category-uncategorized">';
+			$expected .= '<h2 class="wp-block-post-title">' . get_the_title() . '</h2>';
+			$expected .= '</li>';
+		}
+
+		$expected .= '</ul>';
+
+		// Update the post's content to have a query block for the same query as the main query.
+		wp_update_post(
+			array(
+				'ID'                    => self::$post->ID,
+				'post_content'          => $content,
+				'post_content_filtered' => $content,
+			)
+		);
+
+		// Set main query to all posts.
+		$wp_query     = new WP_Query( array( 'post_type' => 'post' ) );
+		$wp_the_query = $wp_query;
+
+		// Get post content within main query loop.
+		$output = '';
+		while ( $wp_query->have_posts() ) {
+			$wp_query->the_post();
+
+			$output = get_echo( 'the_content' );
+		}
+
+		$this->assertSame( $expected, $output, 'Unexpected parsed post content' );
+	}
 }
diff --git a/phpunit/blocks/render-query-test.php b/phpunit/blocks/render-query-test.php
index 796c4ae098867c..7fe39f390b2e62 100644
--- a/phpunit/blocks/render-query-test.php
+++ b/phpunit/blocks/render-query-test.php
@@ -12,6 +12,8 @@ class Tests_Blocks_RenderQueryBlock extends WP_UnitTestCase {
 
 	private static $posts;
 
+	private $original_wp_interactivity;
+
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		self::$posts = $factory->post->create_many( 3 );
 
@@ -29,6 +31,20 @@ public static function wpTearDownAfterClass() {
 		unregister_block_type( 'test/plugin-block' );
 	}
 
+	public function set_up() {
+		parent::set_up();
+		global $wp_interactivity;
+		$this->original_wp_interactivity = $wp_interactivity;
+		$wp_interactivity                = new WP_Interactivity_API();
+	}
+
+	public function tear_down() {
+		global $wp_interactivity;
+		$wp_interactivity = $this->original_wp_interactivity;
+		parent::tear_down();
+	}
+
+
 	/**
 	 * Tests that the `core/query` block adds the corresponding directives when
 	 * the `enhancedPagination` attribute is set.
@@ -68,9 +84,9 @@ public function test_rendering_query_with_enhanced_pagination() {
 		$p = new WP_HTML_Tag_Processor( $output );
 
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( '{"loadingText":"Loading page, please wait.","loadedText":"Page Loaded."}', $p->get_attribute( 'data-wp-context' ) );
-		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-navigation-id' ) );
-		$this->assertSame( '{"namespace":"core/query"}', $p->get_attribute( 'data-wp-interactive' ) );
+		$this->assertSame( '{}', $p->get_attribute( 'data-wp-context' ) );
+		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-router-region' ) );
+		$this->assertSame( 'core/query', $p->get_attribute( 'data-wp-interactive' ) );
 
 		$p->next_tag( array( 'class_name' => 'wp-block-post' ) );
 		$this->assertSame( 'post-template-item-' . self::$posts[1], $p->get_attribute( 'data-wp-key' ) );
@@ -78,27 +94,23 @@ public function test_rendering_query_with_enhanced_pagination() {
 		$p->next_tag( array( 'class_name' => 'wp-block-query-pagination-previous' ) );
 		$this->assertSame( 'query-pagination-previous', $p->get_attribute( 'data-wp-key' ) );
 		$this->assertSame( 'core/query::actions.navigate', $p->get_attribute( 'data-wp-on--click' ) );
-		$this->assertSame( 'core/query::actions.prefetch', $p->get_attribute( 'data-wp-on--mouseenter' ) );
+		$this->assertSame( 'core/query::actions.prefetch', $p->get_attribute( 'data-wp-on-async--mouseenter' ) );
 		$this->assertSame( 'core/query::callbacks.prefetch', $p->get_attribute( 'data-wp-watch' ) );
 
 		$p->next_tag( array( 'class_name' => 'wp-block-query-pagination-next' ) );
 		$this->assertSame( 'query-pagination-next', $p->get_attribute( 'data-wp-key' ) );
 		$this->assertSame( 'core/query::actions.navigate', $p->get_attribute( 'data-wp-on--click' ) );
-		$this->assertSame( 'core/query::actions.prefetch', $p->get_attribute( 'data-wp-on--mouseenter' ) );
+		$this->assertSame( 'core/query::actions.prefetch', $p->get_attribute( 'data-wp-on-async--mouseenter' ) );
 		$this->assertSame( 'core/query::callbacks.prefetch', $p->get_attribute( 'data-wp-watch' ) );
 
-		$p->next_tag( array( 'class_name' => 'screen-reader-text' ) );
-		$this->assertSame( 'polite', $p->get_attribute( 'aria-live' ) );
-		$this->assertSame( 'context.message', $p->get_attribute( 'data-wp-text' ) );
-
-		$p->next_tag( array( 'class_name' => 'wp-block-query__enhanced-pagination-animation' ) );
-		$this->assertSame( 'state.startAnimation', $p->get_attribute( 'data-wp-class--start-animation' ) );
-		$this->assertSame( 'state.finishAnimation', $p->get_attribute( 'data-wp-class--finish-animation' ) );
+		$router_config = wp_interactivity_config( 'core/router' );
+		$this->assertEmpty( $router_config );
 	}
 
 	/**
-	 * Tests that the `core/query` block adds an extra attribute to disable the
-	 * enhanced pagination in the browser when a plugin block is found inside.
+	 * Tests that the `core/query` block sets the option
+	 * `clientNavigationDisabled` to `true` in the `core/router` store config
+	 * when a plugin block is found inside.
 	 */
 	public function test_rendering_query_with_enhanced_pagination_auto_disabled_when_plugins_blocks_are_found() {
 		global $wp_query, $wp_the_query;
@@ -127,56 +139,16 @@ public function test_rendering_query_with_enhanced_pagination_auto_disabled_when
 		$p = new WP_HTML_Tag_Processor( $output );
 
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-navigation-id' ) );
-		$this->assertSame( 'true', $p->get_attribute( 'data-wp-navigation-disabled' ) );
-	}
-
-
-	/**
-	 * Tests that the `core/query` last tag is rendered with the tagName attribute
-	 * if is defined, having a div as default.
-	 */
-	public function test_enhanced_query_markup_rendering_at_bottom_on_custom_html_element_tags() {
-		global $wp_query, $wp_the_query;
-
-		$content = <<<HTML
-		<!-- wp:query {"queryId":0,"query":{"inherit":true},"tagName":"aside","enhancedPagination":true} -->
-		<aside class="wp-block-query">
-			<!-- wp:post-template {"align":"wide"} -->
-				<!-- wp:test/plugin-block /-->
-			<!-- /wp:post-template -->
-			<span>Helper to get last HTML Tag</span>
-		</aside>
-		<!-- /wp:query -->
-
-HTML;
-
-		// Set main query to single post.
-		$wp_query = new WP_Query(
-			array(
-				'posts_per_page' => 1,
-			)
-		);
-
-		$wp_the_query = $wp_query;
-
-		$output = do_blocks( $content );
+		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-router-region' ) );
 
-		$p = new WP_HTML_Tag_Processor( $output );
-
-		$p->next_tag( 'span' );
-
-		// Test that there is a div added just after the last tag inside the aside.
-		$this->assertSame( $p->next_tag(), true );
-		// Test that that div is the accesibility one.
-		$this->assertSame( 'screen-reader-text', $p->get_attribute( 'class' ) );
-		$this->assertSame( 'context.message', $p->get_attribute( 'data-wp-text' ) );
-		$this->assertSame( 'polite', $p->get_attribute( 'aria-live' ) );
+		$router_config = wp_interactivity_config( 'core/router' );
+		$this->assertTrue( $router_config['clientNavigationDisabled'] );
 	}
 
 	/**
-	 * Tests that the `core/query` block adds an extra attribute to disable the
-	 * enhanced pagination in the browser when a post content block is found inside.
+	 * Tests that the `core/query` block sets the option
+	 * `clientNavigationDisabled` to `true` in the `core/router` store config
+	 * when a post content block is found inside.
 	 */
 	public function test_rendering_query_with_enhanced_pagination_auto_disabled_when_post_content_block_is_found() {
 		global $wp_query, $wp_the_query;
@@ -205,14 +177,15 @@ public function test_rendering_query_with_enhanced_pagination_auto_disabled_when
 		$p = new WP_HTML_Tag_Processor( $output );
 
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-navigation-id' ) );
-		$this->assertSame( 'true', $p->get_attribute( 'data-wp-navigation-disabled' ) );
+		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-router-region' ) );
+		$router_config = wp_interactivity_config( 'core/router' );
+		$this->assertTrue( $router_config['clientNavigationDisabled'] );
 	}
 
 	/**
-	 * Tests that the correct `core/query` blocks get the attribute that
-	 * disables enhanced pagination only if they contain a descendant that is
-	 * not supported (i.e., a plugin block).
+	 * Tests that, whenever a `core/query` contains a descendant that is not
+	 * supported (i.e., a plugin block), the option `clientNavigationDisabled`
+	 * is set to `true` in the `core/router` store config.
 	 */
 	public function test_rendering_nested_queries_with_enhanced_pagination_auto_disabled() {
 		global $wp_query, $wp_the_query;
@@ -254,17 +227,53 @@ public function test_rendering_nested_queries_with_enhanced_pagination_auto_disa
 
 		// Query 0 contains a plugin block inside query-2 -> disabled.
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-navigation-id' ) );
-		$this->assertSame( 'true', $p->get_attribute( 'data-wp-navigation-disabled' ) );
+		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-router-region' ) );
 
 		// Query 1 does not contain a plugin block -> enabled.
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-1', $p->get_attribute( 'data-wp-navigation-id' ) );
-		$this->assertSame( null, $p->get_attribute( 'data-wp-navigation-disabled' ) );
+		$this->assertSame( 'query-1', $p->get_attribute( 'data-wp-router-region' ) );
 
 		// Query 2 contains a plugin block -> disabled.
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-2', $p->get_attribute( 'data-wp-navigation-id' ) );
-		$this->assertSame( 'true', $p->get_attribute( 'data-wp-navigation-disabled' ) );
+		$this->assertSame( 'query-2', $p->get_attribute( 'data-wp-router-region' ) );
+
+		$router_config = wp_interactivity_config( 'core/router' );
+		$this->assertTrue( $router_config['clientNavigationDisabled'] );
+	}
+
+	/**
+	 * Tests that the `core/query` block sets the option
+	 * `clientNavigationDisabled` to `true` in the `core/router` store config
+	 * when a plugin that does not define clientNavigation is found inside.
+	 */
+	public function test_rendering_query_with_enhanced_pagination_auto_disabled_when_there_is_a_non_compatible_block() {
+		global $wp_query, $wp_the_query;
+
+		$content = <<<HTML
+		<!-- wp:query {"queryId":0,"query":{"inherit":true},"enhancedPagination":true} -->
+		<div class="wp-block-query">
+			<!-- wp:post-content {"align":"wide"} --><!-- /wp:post-content -->
+		</div>
+		<!-- /wp:query -->
+HTML;
+
+		// Set main query to single post.
+		$wp_query = new WP_Query(
+			array(
+				'posts_per_page' => 1,
+			)
+		);
+
+		$wp_the_query = $wp_query;
+
+		$output = do_blocks( $content );
+
+		$p = new WP_HTML_Tag_Processor( $output );
+
+		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
+		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-router-region' ) );
+
+		$router_config = wp_interactivity_config( 'core/router' );
+		$this->assertTrue( $router_config['clientNavigationDisabled'] );
 	}
 }
diff --git a/phpunit/blocks/renderBlockCorePostExcerpt.php b/phpunit/blocks/renderBlockCorePostExcerpt.php
new file mode 100644
index 00000000000000..38c27bfde9b30a
--- /dev/null
+++ b/phpunit/blocks/renderBlockCorePostExcerpt.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Tests for the gutenberg_render_block_core_post_excerpt() function.
+ *
+ * @package WordPress
+ * @subpackage Blocks
+ *
+ * @covers ::gutenberg_render_block_core_post_excerpt
+ * @group blocks
+ */
+class Tests_Blocks_RenderBlockCorePostExcerpt extends WP_UnitTestCase {
+
+	/**
+	 * Post object with data.
+	 *
+	 * @var array
+	 */
+	protected static $post;
+
+	/**
+	 * Array of Attributes.
+	 *
+	 * @var int
+	 */
+	protected static $attributes;
+
+	/**
+	 * Setup method.
+	 *
+	 * @param WP_UnitTest_Factory $factory Helper that lets us create fake data.
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+
+		self::$post = $factory->post->create_and_get(
+			array(
+				'post_title'   => 'Post Expert block Unit Test',
+				'post_excerpt' => 'Post Expert content',
+			)
+		);
+
+		self::$attributes = array(
+			'moreText'      => '',
+			'excerptLength' => 55,
+		);
+
+		$block = array(
+			'blockName'    => 'core/post-excerpt',
+			'attrs'        => array(
+				'moreText' => '',
+			),
+			'innerBlock'   => array(),
+			'innerContent' => array(),
+			'innerHTML'    => array(),
+		);
+
+		WP_Block_Supports::init();
+		WP_Block_Supports::$block_to_render = $block;
+	}
+
+	/**
+	 * Tear down method.
+	 */
+	public static function wpTearDownAfterClass() {
+		wp_delete_post( self::$post->ID, true );
+	}
+
+	/**
+	 * Test gutenberg_render_block_core_post_excerpt() method
+	 * with empty data.
+	 */
+	public function test_should_render_empty_string_when_excerpt_is_empty() {
+		$block = new stdClass();
+
+		// call render method with block context.
+		$rendered = gutenberg_render_block_core_post_excerpt( self::$attributes, '', $block );
+		$this->assertSame( '', $rendered, 'Failed to assert that $rendered is an empty string.' );
+	}
+
+	/**
+	 * Test gutenberg_render_block_core_post_excerpt() method.
+	 */
+	public function test_should_render_correct_exceprt() {
+
+		$block           = new stdClass();
+		$GLOBALS['post'] = self::$post;
+		$block->context  = array( 'postId' => self::$post->ID );
+
+		$rendered = gutenberg_render_block_core_post_excerpt( self::$attributes, '', $block );
+		$this->assertNotEmpty( $rendered, 'Failed to assert that $rendered is not empty.' );
+		$this->assertStringContainsString(
+			'Post Expert content',
+			$rendered,
+			'Failed to assert that $rendered contain the expected string.'
+		);
+		$this->assertStringContainsString(
+			'</p',
+			$rendered,
+			'Failed to assert that $rendered contains a closing html paragraph tag.'
+		);
+		$this->assertStringContainsString(
+			'wp-block-post-excerpt__excerpt',
+			$rendered,
+			'Failed to assert that $rendered contain the "wp-block-post-excerpt__excerpt" string.'
+		);
+		$this->assertStringNotContainsString(
+			'has-text-align',
+			$rendered,
+			'Failed to assert that $rendered  does not contain the has-text-align class.'
+		);
+
+		self::$attributes['textAlign'] = 'left';
+
+		$rendered = gutenberg_render_block_core_post_excerpt( self::$attributes, '', $block );
+		$this->assertStringContainsString(
+			'has-text-align-left',
+			$rendered,
+			'Failed to assert that $rendered contains the "has-text-align-left" class.'
+		);
+
+		self::$attributes = array(
+			'moreText'      => 'Read More',
+			'excerptLength' => 55,
+		);
+
+		$rendered = gutenberg_render_block_core_post_excerpt( self::$attributes, '', $block );
+		$this->assertStringContainsString(
+			'wp-block-post-excerpt__more-link',
+			$rendered,
+			'Failed to assert that $rendered contains the expected string.'
+		);
+
+		self::$attributes = array(
+			'moreText'          => 'Read More',
+			'showMoreOnNewLine' => true,
+		);
+		$this->assertStringContainsString(
+			'wp-block-post-excerpt__more-link',
+			$rendered,
+			'Failed to assert that $rendered contains the expected string.'
+		);
+		$this->assertStringContainsString(
+			get_permalink( self::$post->ID ),
+			$rendered,
+			'Failed to assert that $rendered contain expected post the expected post URL.'
+		);
+	}
+}
diff --git a/phpunit/blocks/renderBlockCorePostTitle.php b/phpunit/blocks/renderBlockCorePostTitle.php
new file mode 100644
index 00000000000000..4c080a1c905ff6
--- /dev/null
+++ b/phpunit/blocks/renderBlockCorePostTitle.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Tests for the gutenberg_render_block_core_post_title() function.
+ *
+ * @package WordPress
+ * @subpackage Blocks
+ *
+ * @covers ::gutenberg_render_block_core_post_title
+ * @group blocks
+ */
+class Tests_Blocks_RenderBlockCorePostTitle extends WP_UnitTestCase {
+	/**
+	 * Post object.
+	 *
+	 * @var WP_Post
+	 */
+	protected static $post;
+
+	/**
+	 * Array of attributes.
+	 *
+	 * @var array
+	 */
+	protected static $attributes;
+
+	/**
+	 * Block object.
+	 *
+	 * @var WP_Block
+	 */
+	protected static $block;
+
+	/**
+	 * Setup method.
+	 *
+	 * @param WP_UnitTest_Factory $factory Helper that lets us create fake data.
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$post = $factory->post->create_and_get( array( 'post_title' => 'Post title block Unit Test' ) );
+
+		self::$attributes = array(
+			'textAlign'  => '',
+			'level'      => 2,
+			'isLink'     => false,
+			'linkTarget' => '',
+			'rel'        => '',
+		);
+
+		self::$block = new stdClass();
+
+		$block_args = array(
+			'blockName'    => 'core/post-title',
+			'attrs'        => array(
+				'textColor' => 'red',
+			),
+			'innerBlock'   => array(),
+			'innerContent' => array(),
+			'innerHTML'    => array(),
+		);
+
+		WP_Block_Supports::init();
+		WP_Block_Supports::$block_to_render = $block_args;
+	}
+
+	/**
+	 * Tear down method.
+	 */
+	public static function wpTearDownAfterClass() {
+		wp_delete_post( self::$post->ID, true );
+	}
+
+	/**
+	 * Test if the function returns an empty string when the post title is empty.
+	 *
+	 * @param mixed  $context         Block context.
+	 * @param string $failure_message Failure message.
+	 *
+	 * @dataProvider data_should_render_empty_string_when_title_is_empty
+	 */
+	public function test_should_render_empty_string_when_title_is_empty( $context, $failure_message ) {
+		if ( $context ) {
+			self::$block->context = $context;
+		}
+		$rendered = gutenberg_render_block_core_post_title( self::$attributes, '', self::$block );
+		$this->assertSame( '', $rendered, $failure_message );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_should_render_empty_string_when_title_is_empty() {
+		return array(
+			'empty block context' => array( null, 'Failed asserting that rendering result is an empty string when block context is not set.' ),
+			'incorrect post ID'   => array( array( 'postId' => 0 ), 'Failed asserting that rendering result is an empty string when post ID is incorrect.' ),
+		);
+	}
+
+	/**
+	 * Test if the function returns correct titles.
+	 */
+	public function test_should_render_correct_title() {
+
+		$GLOBALS['post']      = self::$post;
+		self::$block->context = array( 'postId' => self::$post->ID );
+
+		$rendered = gutenberg_render_block_core_post_title( self::$attributes, '', self::$block );
+		$this->assertNotEmpty(
+			$rendered,
+			'Failed to assert that $rendered is an non-empty string.'
+		);
+		$this->assertStringContainsString(
+			'Post title block Unit Test',
+			$rendered,
+			'Failed to assert that $rendered contain the post title string.'
+		);
+		$this->assertStringContainsString(
+			'</h2>',
+			$rendered,
+			'Failed to assert that $rendered contain a closing html heading tag.'
+		);
+		$this->assertStringNotContainsString(
+			get_permalink( self::$post->ID ),
+			$rendered,
+			'Failed to assert that $rendered does not contain the post link.'
+		);
+		$this->assertStringNotContainsString(
+			'<a href=',
+			$rendered,
+			'Failed to assert that $rendered does not contain a html anchor tag.'
+		);
+		$this->assertStringNotContainsString(
+			'has-text-align-left',
+			$rendered,
+			'Failed to assert that $rendered does not contain the has-text-align-left class.'
+		);
+
+		self::$attributes['level'] = '1';
+		$rendered                  = gutenberg_render_block_core_post_title( self::$attributes, '', self::$block );
+		$this->assertStringContainsString(
+			'<h1',
+			$rendered,
+			'Failed to assert that $rendered contain the HTML heading tag.'
+		);
+		$this->assertStringContainsString(
+			'</h1>',
+			$rendered,
+			'Failed to assert that $rendered contain a closing HTML heading tag.'
+		);
+
+		self::$attributes['textAlign'] = 'left';
+		$rendered                      = gutenberg_render_block_core_post_title( self::$attributes, '', self::$block );
+		$this->assertStringContainsString(
+			'has-text-align-left',
+			$rendered,
+			'Failed to assert that $rendered contain the has-text-align-left class.'
+		);
+
+		self::$attributes['isLink']     = true;
+		self::$attributes['linkTarget'] = '_blank';
+		self::$attributes['rel']        = 'no-relative';
+		$rendered                       = gutenberg_render_block_core_post_title( self::$attributes, '', self::$block );
+		$this->assertStringContainsString(
+			get_permalink( self::$post->ID ),
+			$rendered,
+			'Failed to assert that $rendered contain the post link.'
+		);
+		$this->assertStringContainsString(
+			'<a href=',
+			$rendered,
+			'Failed to assert that $rendered contain html anchor tag.'
+		);
+		$this->assertStringContainsString(
+			'_blank',
+			$rendered,
+			'Failed to assert that $rendered contain the link target attribute.'
+		);
+		$this->assertStringContainsString(
+			'no-relative',
+			$rendered,
+			'Failed to assert that $rendered contain the link relation attribute.'
+		);
+	}
+}
diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
index acc7cfde89dbd4..36746d05669519 100644
--- a/phpunit/bootstrap.php
+++ b/phpunit/bootstrap.php
@@ -24,12 +24,6 @@
 define( 'GUTENBERG_DIR_TESTDATA', __DIR__ . '/data/' );
 define( 'GUTENBERG_DIR_TESTFIXTURES', __DIR__ . '/fixtures/' );
 
-// Pretend that these are Core unit tests. This is needed so that
-// wp_theme_has_theme_json() does not cache its return value between each test.
-if ( ! defined( 'WP_RUN_CORE_TESTS' ) ) {
-	define( 'WP_RUN_CORE_TESTS', true );
-}
-
 // Require composer dependencies.
 require_once dirname( __DIR__ ) . '/vendor/autoload.php';
 
@@ -95,97 +89,14 @@ function fail_if_died( $message ) {
 		'gutenberg-widget-experiments' => '1',
 		'gutenberg-full-site-editing'  => 1,
 		'gutenberg-form-blocks'        => 1,
+		'gutenberg-block-experiments'  => 1,
+		'gutenberg-media-processing'   => 1,
 	),
 );
 
 // Enable the widget block editor.
 tests_add_filter( 'gutenberg_use_widgets_block_editor', '__return_true' );
 
-/**
- * Register test block prior to theme.json generating metadata.
- *
- * This new block is used to test experimental selectors. It is registered
- * via `tests_add_filter()` here during bootstrapping so that it occurs prior
- * to theme.json generating block metadata. Once a core block, such as Image,
- * uses feature level selectors we could remove this in favour of testing via
- * the core block.
- */
-function gutenberg_register_test_block_for_feature_selectors() {
-	WP_Block_Type_Registry::get_instance()->register(
-		'test/test',
-		array(
-			'api_version' => 3,
-			'attributes'  => array(
-				'textColor' => array(
-					'type' => 'string',
-				),
-				'style'     => array(
-					'type' => 'object',
-				),
-			),
-			'supports'    => array(
-				'__experimentalBorder'   => array(
-					'radius'                 => true,
-					'__experimentalSelector' => '.inner',
-				),
-				'color'                  => array(
-					'text' => true,
-				),
-				'spacing'                => array(
-					'padding'                => true,
-					'__experimentalSelector' => '.inner',
-				),
-				'typography'             => array(
-					'fontSize'               => true,
-					'__experimentalSelector' => '.sub-heading',
-				),
-				'__experimentalSelector' => '.wp-block-test, .wp-block-test__wrapper',
-			),
-		)
-	);
-
-	WP_Block_Type_Registry::get_instance()->register(
-		'my/block-with-selectors',
-		array(
-			'api_version' => 2,
-			'attributes'  => array(
-				'textColor' => array(
-					'type' => 'string',
-				),
-				'style'     => array(
-					'type' => 'object',
-				),
-			),
-			'supports'    => array(
-				'__experimentalBorder' => array(
-					'radius' => true,
-				),
-				'color'                => array(
-					'background' => true,
-					'text'       => true,
-				),
-				'spacing'              => array(
-					'padding' => true,
-				),
-				'typography'           => array(
-					'fontSize' => true,
-				),
-			),
-			'selectors'   => array(
-				'root'       => '.custom-root-selector',
-				'border'     => array(
-					'root' => '.custom-root-selector img',
-				),
-				'color'      => array(
-					'text' => '.custom-root-selector > figcaption',
-				),
-				'typography' => '.custom-root-selector > figcaption',
-			),
-		)
-	);
-}
-tests_add_filter( 'init', 'gutenberg_register_test_block_for_feature_selectors' );
-
 // Start up the WP testing environment.
 require $_tests_dir . '/includes/bootstrap.php';
 
diff --git a/phpunit/class-block-context-test.php b/phpunit/class-block-context-test.php
deleted file mode 100644
index 49bbb560e8022d..00000000000000
--- a/phpunit/class-block-context-test.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Test block context.
- *
- * @package Gutenberg
- */
-
-class Block_Context_Test extends WP_UnitTestCase {
-
-	/**
-	 * Registered block names.
-	 *
-	 * @var string[]
-	 */
-	private $registered_block_names = array();
-
-	/**
-	 * Sets up each test method.
-	 */
-	public function set_up() {
-		global $post;
-
-		parent::set_up();
-
-		$args = array(
-			'post_content' => 'example',
-			'post_excerpt' => '',
-		);
-
-		$post = $this->factory()->post->create_and_get( $args );
-		setup_postdata( $post );
-	}
-
-	/**
-	 * Tear down each test method.
-	 */
-	public function tear_down() {
-		parent::tear_down();
-
-		while ( ! empty( $this->registered_block_names ) ) {
-			$block_name = array_pop( $this->registered_block_names );
-			unregister_block_type( $block_name );
-		}
-	}
-
-	/**
-	 * Registers a block type.
-	 *
-	 * @param string|WP_Block_Type $name Block type name including namespace, or alternatively a
-	 *                                   complete WP_Block_Type instance. In case a WP_Block_Type
-	 *                                   is provided, the $args parameter will be ignored.
-	 * @param array                $args {
-	 *     Optional. Array of block type arguments. Any arguments may be defined, however the
-	 *     ones described below are supported by default. Default empty array.
-	 *
-	 *     @type callable $render_callback Callback used to render blocks of this block type.
-	 * }
-	 */
-	protected function register_block_type( $name, $args ) {
-		register_block_type( $name, $args );
-
-		$this->registered_block_names[] = $name;
-	}
-
-	/**
-	 * Tests that a block which provides context makes that context available to
-	 * its inner blocks.
-	 */
-	public function test_provides_block_context() {
-		$provided_context = array();
-
-		$this->register_block_type(
-			'gutenberg/test-context-provider',
-			array(
-				'attributes'       => array(
-					'contextWithAssigned'   => array(
-						'type' => 'number',
-					),
-					'contextWithDefault'    => array(
-						'type'    => 'number',
-						'default' => 0,
-					),
-					'contextWithoutDefault' => array(
-						'type' => 'number',
-					),
-					'contextNotRequested'   => array(
-						'type' => 'number',
-					),
-				),
-				'provides_context' => array(
-					'gutenberg/contextWithAssigned'   => 'contextWithAssigned',
-					'gutenberg/contextWithDefault'    => 'contextWithDefault',
-					'gutenberg/contextWithoutDefault' => 'contextWithoutDefault',
-					'gutenberg/contextNotRequested'   => 'contextNotRequested',
-				),
-			)
-		);
-
-		$this->register_block_type(
-			'gutenberg/test-context-consumer',
-			array(
-				'uses_context'    => array(
-					'gutenberg/contextWithDefault',
-					'gutenberg/contextWithAssigned',
-					'gutenberg/contextWithoutDefault',
-				),
-				'render_callback' => static function ( $attributes, $content, $block ) use ( &$provided_context ) {
-					$provided_context[] = $block->context;
-
-					return '';
-				},
-			)
-		);
-
-		$parsed_blocks = parse_blocks(
-			'<!-- wp:gutenberg/test-context-provider {"contextWithAssigned":10} -->' .
-			'<!-- wp:gutenberg/test-context-consumer /-->' .
-			'<!-- /wp:gutenberg/test-context-provider -->'
-		);
-
-		render_block( $parsed_blocks[0] );
-
-		$this->assertEquals(
-			array(
-				'gutenberg/contextWithDefault'  => 0,
-				'gutenberg/contextWithAssigned' => 10,
-			),
-			$provided_context[0]
-		);
-	}
-
-	/**
-	 * Tests that a block can receive default-provided context through
-	 * render_block.
-	 */
-	public function test_provides_default_context() {
-		global $post;
-
-		$provided_context = array();
-
-		$this->register_block_type(
-			'gutenberg/test-context-consumer',
-			array(
-				'uses_context'    => array( 'postId', 'postType' ),
-				'render_callback' => static function ( $attributes, $content, $block ) use ( &$provided_context ) {
-					$provided_context[] = $block->context;
-
-					return '';
-				},
-			)
-		);
-
-		$parsed_blocks = parse_blocks( '<!-- wp:gutenberg/test-context-consumer /-->' );
-
-		render_block( $parsed_blocks[0] );
-
-		$this->assertEquals(
-			array(
-				'postId'   => $post->ID,
-				'postType' => $post->post_type,
-			),
-			$provided_context[0]
-		);
-	}
-
-	/**
-	 * Tests that default block context can be filtered.
-	 */
-	public function test_default_context_is_filterable() {
-		$provided_context = array();
-
-		$this->register_block_type(
-			'gutenberg/test-context-consumer',
-			array(
-				'uses_context'    => array( 'example' ),
-				'render_callback' => static function ( $attributes, $content, $block ) use ( &$provided_context ) {
-					$provided_context[] = $block->context;
-
-					return '';
-				},
-			)
-		);
-
-		$filter_block_context = static function ( $context ) {
-			$context['example'] = 'ok';
-			return $context;
-		};
-
-		$parsed_blocks = parse_blocks( '<!-- wp:gutenberg/test-context-consumer /-->' );
-
-		add_filter( 'render_block_context', $filter_block_context );
-
-		render_block( $parsed_blocks[0] );
-
-		remove_filter( 'render_block_context', $filter_block_context );
-
-		$this->assertEquals( array( 'example' => 'ok' ), $provided_context[0] );
-	}
-}
diff --git a/phpunit/class-gutenberg-rest-block-patterns-controller-test.php b/phpunit/class-gutenberg-rest-block-patterns-controller-test.php
deleted file mode 100644
index 3ca6d45627abb9..00000000000000
--- a/phpunit/class-gutenberg-rest-block-patterns-controller-test.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Unit tests covering Gutenberg_REST_Block_Patterns_Controller functionality.
- *
- * @package WordPress
- * @subpackage REST_API
- */
-
-/**
- * Unit tests for REST API for Block Patterns.
- *
- * @group restapi
- * @covers Gutenberg_REST_Block_Patterns_Controller_6_2
- */
-class Gutenberg_REST_Block_Patterns_Controller_6_2_Test extends WP_Test_REST_Controller_Testcase {
-	/**
-	 * Admin user ID.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @var int
-	 */
-	protected static $admin_id;
-
-	/**
-	 * Original instance of WP_Block_Patterns_Registry.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @var WP_Block_Patterns_Registry
-	 */
-	protected static $orig_registry;
-
-	/**
-	 * Instance of the reflected `instance` property.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @var ReflectionProperty
-	 */
-	private static $registry_instance_property;
-
-	/**
-	 * The REST API route.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @var string
-	 */
-	const REQUEST_ROUTE = '/wp/v2/block-patterns/patterns';
-
-	public static function wpSetUpBeforeClass( $factory ) {
-		self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
-
-		// Setup an empty testing instance of `WP_Block_Patterns_Registry` and save the original.
-		self::$orig_registry              = WP_Block_Patterns_Registry::get_instance();
-		self::$registry_instance_property = new ReflectionProperty( 'WP_Block_Patterns_Registry', 'instance' );
-		self::$registry_instance_property->setAccessible( true );
-		$test_registry = new WP_Block_Pattern_Categories_Registry();
-		self::$registry_instance_property->setValue( $test_registry );
-
-		// Register some patterns in the test registry.
-		$test_registry->register(
-			'test/one',
-			array(
-				'title'         => 'Pattern One',
-				'categories'    => array( 'test' ),
-				'viewportWidth' => 1440,
-				'content'       => '<!-- wp:heading {"level":1} --><h1>One</h1><!-- /wp:heading -->',
-				'templateTypes' => array( 'page' ),
-			)
-		);
-
-		$test_registry->register(
-			'test/two',
-			array(
-				'title'         => 'Pattern Two',
-				'categories'    => array( 'test' ),
-				'content'       => '<!-- wp:paragraph --><p>Two</p><!-- /wp:paragraph -->',
-				'templateTypes' => array( 'single' ),
-			)
-		);
-
-		$test_registry->register(
-			'test/three',
-			array(
-				'title'         => 'Pattern Three',
-				'categories'    => array( 'test', 'buttons', 'query' ),
-				'content'       => '<!-- wp:paragraph --><p>Three</p><!-- /wp:paragraph -->',
-				'templateTypes' => array( '404' ),
-			)
-		);
-	}
-
-	public static function wpTearDownAfterClass() {
-		self::delete_user( self::$admin_id );
-
-		// Restore the original registry instance.
-		self::$registry_instance_property->setValue( self::$orig_registry );
-		self::$registry_instance_property->setAccessible( false );
-		self::$registry_instance_property = null;
-		self::$orig_registry              = null;
-	}
-
-	public function set_up() {
-		parent::set_up();
-		switch_theme( 'emptytheme' );
-	}
-
-	public function test_get_items_migrate_pattern_categories() {
-		wp_set_current_user( self::$admin_id );
-
-		$request            = new WP_REST_Request( 'GET', static::REQUEST_ROUTE );
-		$request['_fields'] = 'name,categories';
-		$response           = rest_get_server()->dispatch( $request );
-		$data               = $response->get_data();
-
-		$this->assertIsArray( $data, 'WP_REST_Block_Patterns_Controller::get_items() should return an array' );
-		$this->assertGreaterThanOrEqual( 3, count( $data ), 'WP_REST_Block_Patterns_Controller::get_items() should return at least 3 items' );
-		$this->assertSame(
-			array(
-				'name'       => 'test/one',
-				'categories' => array( 'test' ),
-			),
-			$data[0],
-			'WP_REST_Block_Patterns_Controller::get_items() should return test/one'
-		);
-		$this->assertSame(
-			array(
-				'name'       => 'test/two',
-				'categories' => array( 'test' ),
-			),
-			$data[1],
-			'WP_REST_Block_Patterns_Controller::get_items() should return test/two'
-		);
-		$this->assertSame(
-			array(
-				'name'       => 'test/three',
-				'categories' => array( 'test', 'call-to-action', 'posts' ),
-			),
-			$data[2],
-			'WP_REST_Block_Patterns_Controller::get_items() should return test/three'
-		);
-	}
-
-	/**
-	 * Abstract methods that we must implement.
-	 *
-	 * @doesNotPerformAssertions
-	 */
-	public function test_register_routes() {
-		// Controller does not implement this method.
-	}
-
-	public function test_get_items() {
-		wp_set_current_user( self::$admin_id );
-
-		$expected_names  = array( 'test/one', 'test/two', 'test/three' );
-		$expected_fields = array( 'name', 'content', 'template_types' );
-
-		$request            = new WP_REST_Request( 'GET', '/wp/v2/block-patterns/patterns' );
-		$request['_fields'] = 'name,content,template_types';
-		$response           = rest_get_server()->dispatch( $request );
-		$data               = $response->get_data();
-
-		$this->assertCount( count( $expected_names ), $data );
-		foreach ( $data as $idx => $item ) {
-			$this->assertEquals( $expected_names[ $idx ], $item['name'] );
-			$this->assertEquals( $expected_fields, array_keys( $item ) );
-		}
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_context_param() {
-		// Controller does not implement this method.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_item() {
-		// Controller does not implement this method.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_create_item() {
-		// Controller does not implement this method.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_update_item() {
-		// Controller does not implement this method.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_delete_item() {
-		// Controller does not implement this method.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_prepare_item() {
-		// Controller does not implement this method.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_item_schema() {
-		// Controller does not implement this method.
-	}
-}
diff --git a/phpunit/class-gutenberg-rest-global-styles-revisions-controller-test.php b/phpunit/class-gutenberg-rest-global-styles-revisions-controller-test.php
deleted file mode 100644
index 2ae53f9338389e..00000000000000
--- a/phpunit/class-gutenberg-rest-global-styles-revisions-controller-test.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-/**
- * Unit tests covering Gutenberg_REST_Global_Styles_Revisions_Controller_6_4 functionality.
- *
- * Note: the bulk of the tests covering this class and its methods have been ported to Core as of 6.3.
- *
- * @package WordPress
- * @subpackage REST API
- */
-
-class Gutenberg_REST_Global_Styles_Revisions_Controller_Test extends WP_Test_REST_Controller_Testcase {
-	/**
-	 * @var int
-	 */
-	protected static $admin_id;
-
-	/**
-	 * @var int
-	 */
-	protected static $global_styles_id;
-
-	/**
-	 * @var array
-	 */
-	private $revision_1;
-
-	/**
-	 * @var int
-	 */
-	private $revision_1_id;
-
-	/**
-	 * Create fake data before our tests run.
-	 *
-	 * @param WP_UnitTest_Factory $factory Helper that lets us create fake data.
-	 */
-	public static function wpSetupBeforeClass( $factory ) {
-		self::$admin_id = $factory->user->create(
-			array(
-				'role' => 'administrator',
-			)
-		);
-
-		wp_set_current_user( self::$admin_id );
-		// This creates the global styles for the current theme.
-		self::$global_styles_id = $factory->post->create(
-			array(
-				'post_content' => '{"version": ' . WP_Theme_JSON::LATEST_SCHEMA . ', "isGlobalStylesUserThemeJSON": true }',
-				'post_status'  => 'publish',
-				'post_title'   => __( 'Custom Styles', 'default' ),
-				'post_type'    => 'wp_global_styles',
-				'post_name'    => 'wp-global-styles-tt1-blocks-revisions',
-				'tax_input'    => array(
-					'wp_theme' => 'tt1-blocks',
-				),
-			)
-		);
-
-		// Update post to create a new revisions.
-		$new_styles_post = array(
-			'ID'           => self::$global_styles_id,
-			'post_content' => wp_json_encode(
-				array(
-					'version'                     => WP_Theme_JSON::LATEST_SCHEMA,
-					'isGlobalStylesUserThemeJSON' => true,
-					'styles'                      => array(
-						'color' => array(
-							'background' => 'hotpink',
-						),
-					),
-					'settings'                    => array(
-						'color' => array(
-							'palette' => array(
-								'custom' => array(
-									array(
-										'name'  => 'Ghost',
-										'slug'  => 'ghost',
-										'color' => 'ghost',
-									),
-								),
-							),
-						),
-					),
-				)
-			),
-		);
-
-		wp_update_post( $new_styles_post, true, true );
-
-		$new_styles_post = array(
-			'ID'           => self::$global_styles_id,
-			'post_content' => wp_json_encode(
-				array(
-					'version'                     => WP_Theme_JSON::LATEST_SCHEMA,
-					'isGlobalStylesUserThemeJSON' => true,
-					'styles'                      => array(
-						'color' => array(
-							'background' => 'lemonchiffon',
-						),
-					),
-					'settings'                    => array(
-						'color' => array(
-							'palette' => array(
-								'custom' => array(
-									array(
-										'name'  => 'Gwanda',
-										'slug'  => 'gwanda',
-										'color' => 'gwanda',
-									),
-								),
-							),
-						),
-					),
-				)
-			),
-		);
-
-		wp_update_post( $new_styles_post, true, true );
-
-		$new_styles_post = array(
-			'ID'           => self::$global_styles_id,
-			'post_content' => wp_json_encode(
-				array(
-					'version'                     => WP_Theme_JSON::LATEST_SCHEMA,
-					'isGlobalStylesUserThemeJSON' => true,
-					'styles'                      => array(
-						'color' => array(
-							'background' => 'chocolate',
-						),
-					),
-					'settings'                    => array(
-						'color' => array(
-							'palette' => array(
-								'custom' => array(
-									array(
-										'name'  => 'Stacy',
-										'slug'  => 'stacy',
-										'color' => 'stacy',
-									),
-								),
-							),
-						),
-					),
-				)
-			),
-		);
-
-		wp_update_post( $new_styles_post, true, true );
-		wp_set_current_user( 0 );
-	}
-
-	/**
-	 * Removes users after our tests run.
-	 */
-	public static function wpTearDownAfterClass() {
-		self::delete_user( self::$admin_id );
-	}
-
-	/**
-	 * Sets up before tests.
-	 */
-	public function set_up() {
-		parent::set_up();
-		switch_theme( 'emptytheme' );
-		$revisions           = wp_get_post_revisions( self::$global_styles_id );
-		$this->revision_1    = array_pop( $revisions );
-		$this->revision_1_id = $this->revision_1->ID;
-
-		/*
-		 * For some reason the `rest_api_init` doesn't run early enough to ensure an overwritten `get_item_schema()`
-		 * is used. So we manually call it here.
-		 * See: https://github.com/WordPress/gutenberg/pull/52370#issuecomment-1643331655.
-		 */
-		$global_styles_revisions_controller = new Gutenberg_REST_Global_Styles_Revisions_Controller_6_5();
-		$global_styles_revisions_controller->register_routes();
-	}
-
-	/**
-	 * @ticket 58524
-	 *
-	 * @covers WP_REST_Global_Styles_Controller::register_routes
-	 */
-	public function test_register_routes() {
-		$routes = rest_get_server()->get_routes();
-		$this->assertArrayHasKey(
-			'/wp/v2/global-styles/(?P<parent>[\d]+)/revisions/(?P<id>[\d]+)',
-			$routes,
-			'Single global style revisions based on the given parentID and revision ID route does not exist.'
-		);
-	}
-
-	/**
-	 * Utility function to check the items in WP_REST_Global_Styles_Controller::get_items
-	 * against the expected values.
-	 *
-	 * @ticket 58524
-	 */
-	protected function check_get_revision_response( $response_revision_item, $revision_expected_item ) {
-		$this->assertSame( (int) $revision_expected_item->post_author, $response_revision_item['author'], 'Check that the revision item `author` exists.' );
-		$this->assertSame( mysql_to_rfc3339( $revision_expected_item->post_date ), $response_revision_item['date'], 'Check that the revision item `date` exists.' );
-		$this->assertSame( mysql_to_rfc3339( $revision_expected_item->post_date_gmt ), $response_revision_item['date_gmt'], 'Check that the revision item `date_gmt` exists.' );
-		$this->assertSame( mysql_to_rfc3339( $revision_expected_item->post_modified ), $response_revision_item['modified'], 'Check that the revision item `modified` exists.' );
-		$this->assertSame( mysql_to_rfc3339( $revision_expected_item->post_modified_gmt ), $response_revision_item['modified_gmt'], 'Check that the revision item `modified_gmt` exists.' );
-		$this->assertSame( $revision_expected_item->post_parent, $response_revision_item['parent'], 'Check that an id for the parent exists.' );
-
-		// Global styles.
-		$config = ( new WP_Theme_JSON_Gutenberg( json_decode( $revision_expected_item->post_content, true ), 'custom' ) )->get_raw_data();
-		$this->assertEquals(
-			$config['settings'],
-			$response_revision_item['settings'],
-			'Check that the revision settings exist in the response.'
-		);
-		$this->assertEquals(
-			$config['styles'],
-			$response_revision_item['styles'],
-			'Check that the revision styles match the updated styles.'
-		);
-	}
-
-	/**
-	 * @ticket 59810
-	 *
-	 * @covers Gutenberg_REST_Global_Styles_Revisions_Controller_6_4::get_item
-	 */
-	public function test_get_item() {
-		wp_set_current_user( self::$admin_id );
-
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions/' . $this->revision_1_id );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-
-		$this->assertSame( 200, $response->get_status(), 'Response status is 200.' );
-		$this->check_get_revision_response( $data, $this->revision_1 );
-	}
-
-	/**
-	 * @ticket 59810
-	 *
-	 * @covers Gutenberg_REST_Global_Styles_Revisions_Controller_6_4::get_revision
-	 */
-	public function test_get_item_invalid_revision_id_should_error() {
-		wp_set_current_user( self::$admin_id );
-
-		$expected_error  = 'rest_post_invalid_id';
-		$expected_status = 404;
-		$request         = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions/20000001' );
-		$response        = rest_get_server()->dispatch( $request );
-
-		$this->assertErrorResponse( $expected_error, $response, $expected_status );
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_items() {
-		// Unit tests have been more to WordPress Core for test_get_items().
-		// No unique compat unit tests exist.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_item_schema() {
-		// Unit tests have been more to WordPress Core for test_get_item_schema().
-		// No unique compat unit tests exist.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_context_param() {
-		// Controller does not implement test_context_param().
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_create_item() {
-		// Controller does not implement create_item().
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_delete_item() {
-		// Controller does not implement delete_item().
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_prepare_item() {
-		// Controller does not implement prepare_item().
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_update_item() {
-		// Controller does not implement update_item().
-	}
-}
diff --git a/phpunit/class-gutenberg-rest-navigation-fallback-controller-test.php b/phpunit/class-gutenberg-rest-navigation-fallback-controller-test.php
deleted file mode 100644
index 0132bc53015e66..00000000000000
--- a/phpunit/class-gutenberg-rest-navigation-fallback-controller-test.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * Unit tests covering Gutenberg_REST_Navigation_Fallback_Controller functionality.
- *
- * Note: that these tests are designed to provide high level coverage only. The majority of the tests
- * are made directly against the WP_Navigation_Fallback_Gutenberg class as this:
- *
- * - is where the bulk of the logic is.
- * - is also consumed by the Navigation block's server side rendering.
- *
- * @package WordPress
- * @subpackage REST API
- */
-
-/**
- * @group restapi
- * @group navigation
- */
-class Gutenberg_REST_Navigation_Fallback_Controller_Test extends WP_Test_REST_Controller_Testcase {
-
-	protected static $admin_user;
-	protected static $editor_user;
-
-	public static function wpSetUpBeforeClass( $factory ) {
-		self::$admin_user = $factory->user->create( array( 'role' => 'administrator' ) );
-
-		self::$editor_user = $factory->user->create( array( 'role' => 'editor' ) );
-	}
-
-	public function set_up() {
-		parent::set_up();
-
-		wp_set_current_user( self::$admin_user );
-	}
-
-	/**
-	 * @covers WP_REST_Navigation_Fallback_Controller::register_routes
-	 *
-	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
-	 */
-	public function test_register_routes() {
-		$routes = rest_get_server()->get_routes();
-
-		$this->assertArrayHasKey( '/wp-block-editor/v1/navigation-fallback', $routes, 'Fallback route should be registered.' );
-	}
-
-	/**
-	 * @covers WP_REST_Navigation_Fallback_Controller
-	 *
-	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
-	 */
-	public function test_should_not_return_menus_for_users_without_permissions() {
-
-		wp_set_current_user( self::$editor_user );
-
-		$request  = new WP_REST_Request( 'GET', '/wp-block-editor/v1/navigation-fallback' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-
-		$this->assertEquals( 403, $response->get_status(), 'Response should indicate user does not have permission.' );
-
-		$this->assertEquals( 'rest_cannot_create', $data['code'], 'Response should indicate user cannot create.' );
-
-		$this->assertEquals( 'Sorry, you are not allowed to create Navigation Menus as this user.', $data['message'], 'Response should indicate failed request status.' );
-	}
-
-	/**
-	 * @covers WP_REST_Navigation_Fallback_Controller
-	 *
-	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
-	 */
-	public function test_get_item() {
-
-		$request  = new WP_REST_Request( 'GET', '/wp-block-editor/v1/navigation-fallback' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-
-		$this->assertEquals( 200, $response->get_status(), 'Status should indicate successful request.' );
-
-		$this->assertIsArray( $data, 'Response should be of correct type.' );
-
-		$this->assertArrayHasKey( 'id', $data, 'Response should contain expected fields.' );
-
-		$this->assertEquals( 'wp_navigation', get_post_type( $data['id'] ), '"id" field should represent a post of type "wp_navigation"' );
-
-		// Check that only a single Navigation fallback was created.
-		$navs_in_db = $this->get_navigations_in_database();
-
-		$this->assertCount( 1, $navs_in_db, 'Only a single Navigation menu should be present in the database.' );
-	}
-
-	/**
-	 * @covers WP_REST_Navigation_Fallback_Controller
-	 *
-	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
-	 */
-	public function test_get_item_schema() {
-		$request  = new WP_REST_Request( 'OPTIONS', '/wp-block-editor/v1/navigation-fallback' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-
-		$this->assertEquals( 200, $response->get_status(), 'Status should indicate successful request.' );
-
-		$this->assertArrayHasKey( 'schema', $data, '"schema" key should exist in response.' );
-
-		$schema = $data['schema'];
-
-		$this->assertEquals( 'object', $schema['type'], 'The schema type should match the expected type.' );
-
-		$this->assertArrayHasKey( 'id', $schema['properties'], 'Schema should have an "id" property.' );
-		$this->assertEquals( 'integer', $schema['properties']['id']['type'], 'Schema "id" property should be an integer.' );
-		$this->assertTrue( $schema['properties']['id']['readonly'], 'Schema "id" property should be readonly.' );
-	}
-
-	/**
-	 * @covers WP_REST_Navigation_Fallback_Controller
-	 *
-	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
-	 */
-	public function test_adds_links() {
-		$request  = new WP_REST_Request( 'GET', '/wp-block-editor/v1/navigation-fallback' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-
-		$navigation_post_id = $data['id'];
-
-		$links = $response->get_links();
-
-		$this->assertNotEmpty( $links, 'Response should contain links.' );
-
-		$this->assertArrayHasKey( 'self', $links, 'Response should contain a "self" link.' );
-
-		$this->assertStringContainsString( 'wp/v2/navigation/' . $navigation_post_id, $links['self'][0]['href'], 'Self link should reference the correct Navigation Menu post resource url.' );
-
-		$this->assertTrue( $links['self'][0]['attributes']['embeddable'], 'Self link should be embeddable.' );
-	}
-
-	private function get_navigations_in_database() {
-		$navs_in_db = new WP_Query(
-			array(
-				'post_type'      => 'wp_navigation',
-				'post_status'    => 'publish',
-				'posts_per_page' => -1,
-				'orderby'        => 'date',
-				'order'          => 'DESC',
-			)
-		);
-
-		return $navs_in_db->posts ? $navs_in_db->posts : array();
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_prepare_item() {
-		// Covered by the core test.
-	}
-
-	/**
-	 * Tests that the correct filters are applied to the context parameter.
-	 *
-	 * By default, the REST response for the Posts Controller will not return all fields
-	 * when the context is set to 'embed'. Assert that correct additional fields are added
-	 * to the embedded Navigation Post, when the navigation fallback endpoint
-	 * is called with the `_embed` param.
-	 *
-	 * @covers wp_add_fields_to_navigation_fallback_embedded_links
-	 */
-	public function test_embedded_navigation_post_contains_required_fields() {
-		// First we'll use the navigation fallback to get a link to the navigation endpoint.
-		$request  = new WP_REST_Request( 'GET', '/wp-block-editor/v1/navigation-fallback' );
-		$response = rest_get_server()->dispatch( $request );
-		$links    = $response->get_links();
-
-		// Extract the navigation endpoint URL from the response.
-		$embedded_navigation_href = $links['self'][0]['href'];
-		preg_match( '/\?rest_route=(.*)/', $embedded_navigation_href, $matches );
-		$navigation_endpoint = $matches[1];
-
-		// Fetch the "linked" navigation post from the endpoint, with the context parameter set to 'embed' to simulate fetching embedded links.
-		$request = new WP_REST_Request( 'GET', $navigation_endpoint );
-		$request->set_param( 'context', 'embed' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-
-		// Verify that the additional status field is present.
-		$this->assertArrayHasKey( 'status', $data, 'Response title should contain a "status" field.' );
-
-		// Verify that the additional content fields are present.
-		$this->assertArrayHasKey( 'content', $data, 'Response should contain a "content" field.' );
-		$this->assertArrayHasKey( 'raw', $data['content'], 'Response content should contain a "raw" field.' );
-		$this->assertArrayHasKey( 'rendered', $data['content'], 'Response content should contain a "rendered" field.' );
-		$this->assertArrayHasKey( 'block_version', $data['content'], 'Response should contain a "block_version" field.' );
-
-		// Verify that the additional title.raw field is present.
-		$this->assertArrayHasKey( 'raw', $data['title'], 'Response title should contain a "raw" key.' );
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_context_param() {
-		// Covered by the core test.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_items() {
-		// Covered by the core test.
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_create_item() {
-		// Controller does not implement create_item().
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_update_item() {
-		// Controller does not implement update_item().
-	}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_delete_item() {
-		// Controller does not implement delete_item().
-	}
-}
diff --git a/phpunit/class-gutenberg-rest-server-test.php b/phpunit/class-gutenberg-rest-server-test.php
new file mode 100644
index 00000000000000..943d5b34b999ec
--- /dev/null
+++ b/phpunit/class-gutenberg-rest-server-test.php
@@ -0,0 +1,88 @@
+<?php
+
+class Gutenberg_REST_Server_Test extends WP_Test_REST_TestCase {
+
+	protected static $admin_id;
+	protected static $post_id;
+
+	public static function wpSetupBeforeClass( $factory ) {
+		self::$admin_id = $factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+
+		self::$post_id = $factory->post->create();
+	}
+
+	public static function wpTearDownAfterClass() {
+		self::delete_user( self::$admin_id );
+		wp_delete_post( self::$post_id );
+	}
+
+	public function set_up() {
+		parent::set_up();
+		add_filter(
+			'wp_rest_server_class',
+			function () {
+				return 'Gutenberg_REST_Server';
+			}
+		);
+	}
+
+	public function test_populates_target_hints_for_administrator() {
+		wp_set_current_user( self::$admin_id );
+		$response = rest_do_request( '/wp/v2/posts' );
+		$post     = $response->get_data()[0];
+
+		$link = $post['_links']['self'][0];
+		$this->assertArrayHasKey( 'targetHints', $link );
+		$this->assertArrayHasKey( 'allow', $link['targetHints'] );
+		$this->assertSame( array( 'GET', 'POST', 'PUT', 'PATCH', 'DELETE' ), $link['targetHints']['allow'] );
+	}
+
+	public function test_populates_target_hints_for_logged_out_user() {
+		$response = rest_do_request( '/wp/v2/posts' );
+		$post     = $response->get_data()[0];
+
+		$link = $post['_links']['self'][0];
+		$this->assertArrayHasKey( 'targetHints', $link );
+		$this->assertArrayHasKey( 'allow', $link['targetHints'] );
+		$this->assertSame( array( 'GET' ), $link['targetHints']['allow'] );
+	}
+
+	public function test_does_not_error_on_invalid_urls() {
+		$response = new WP_REST_Response();
+		$response->add_link( 'self', 'this is not a real URL' );
+
+		$links = rest_get_server()::get_response_links( $response );
+		$this->assertArrayNotHasKey( 'targetHints', $links['self'][0] );
+	}
+
+	public function test_does_not_error_on_bad_rest_api_routes() {
+		$response = new WP_REST_Response();
+		$response->add_link( 'self', rest_url( '/this/is/not/a/real/route' ) );
+
+		$links = rest_get_server()::get_response_links( $response );
+		$this->assertArrayNotHasKey( 'targetHints', $links['self'][0] );
+	}
+
+	public function test_prefers_developer_defined_target_hints() {
+		$response = new WP_REST_Response();
+		$response->add_link(
+			'self',
+			'/wp/v2/posts/' . self::$post_id,
+			array(
+				'targetHints' => array(
+					'allow' => array( 'GET', 'PUT' ),
+				),
+			)
+		);
+
+		$links = rest_get_server()::get_response_links( $response );
+		$link  = $links['self'][0];
+		$this->assertArrayHasKey( 'targetHints', $link );
+		$this->assertArrayHasKey( 'allow', $link['targetHints'] );
+		$this->assertSame( array( 'GET', 'PUT' ), $link['targetHints']['allow'] );
+	}
+}
diff --git a/phpunit/class-gutenberg-rest-templates-controller-test.php b/phpunit/class-gutenberg-rest-templates-controller-test.php
index bbb588fd583ea1..b69416c675305b 100644
--- a/phpunit/class-gutenberg-rest-templates-controller-test.php
+++ b/phpunit/class-gutenberg-rest-templates-controller-test.php
@@ -1,276 +1,119 @@
 <?php
+/**
+ * Unit tests covering Gutenberg_REST_Templates_Controller_6_7 functionality.
+ */
+class Gutenberg_REST_Templates_Controller_6_7_Test extends WP_Test_REST_Controller_Testcase {
 
-class Gutenberg_REST_Templates_Controller_Test extends WP_Test_REST_Controller_Testcase {
 	/**
 	 * @var int
 	 */
 	protected static $admin_id;
-	private static $post;
 
-	protected function find_and_normalize_template_by_id( $templates, $id ) {
-		foreach ( $templates as $template ) {
-			if ( $template['id'] === $id ) {
-				unset( $template['content'] );
-				unset( $template['_links'] );
-				return $template;
-			}
-		}
-
-		return null;
-	}
-
-	public function set_up() {
-		parent::set_up();
-	}
-
-	/**
-	 * Create fake data before our tests run.
-	 *
-	 * @param WP_UnitTest_Factory $factory Helper that lets us create fake data.
-	 */
 	public static function wpSetupBeforeClass( $factory ) {
-		switch_theme( 'emptytheme' );
 		self::$admin_id = $factory->user->create(
 			array(
 				'role' => 'administrator',
 			)
 		);
-
-		// Set up template post.
-		$args       = array(
-			'post_type'    => 'wp_template',
-			'post_name'    => 'my_template',
-			'post_title'   => 'My Template',
-			'post_content' => 'Content',
-			'post_excerpt' => 'Description of my template.',
-			'tax_input'    => array(
-				'wp_theme' => array(
-					get_stylesheet(),
-				),
-			),
-		);
-		self::$post = self::factory()->post->create_and_get( $args );
-		wp_set_post_terms( self::$post->ID, get_stylesheet(), 'wp_theme' );
 	}
 
-	public function test_register_routes() {
-		$routes = rest_get_server()->get_routes();
-		$this->assertArrayHasKey(
-			'/wp/v2/templates/lookup',
-			$routes,
-			'Get template fallback content route does not exist'
-		);
+	public static function wpTearDownAfterClass() {
+		self::delete_user( self::$admin_id );
 	}
 
-	public function test_get_template_fallback() {
+	public function test_get_item() {
 		wp_set_current_user( self::$admin_id );
-		$request = new WP_REST_Request( 'GET', '/wp/v2/templates/lookup' );
-		// Should fallback to `category.html`.
-		$request->set_param( 'slug', 'category-fruits' );
-		$request->set_param( 'is_custom', false );
-		$request->set_param( 'template_prefix', 'category' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 'category', $response->get_data()['slug'], 'Should fallback to `category.html`.' );
-		// Should fallback to `singular.html`.
-		$request->set_param( 'slug', 'page-hello' );
-		$request->set_param( 'is_custom', false );
-		$request->set_param( 'template_prefix', 'page' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 'singular', $response->get_data()['slug'], 'Should fallback to `singular.html`.' );
-		// Should fallback to `index.html`.
-		$request->set_param( 'slug', 'author' );
-		$request->set_param( 'ignore_empty', true );
-		$request->set_param( 'is_custom', false );
+
+		$template_name = 'test-plugin//test-template';
+		$args          = array(
+			'content'     => 'Template content',
+			'title'       => 'Test Template',
+			'description' => 'Description of test template',
+			'post_types'  => array( 'post', 'page' ),
+		);
+
+		register_block_template( $template_name, $args );
+
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/templates/test-plugin//test-template' );
 		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 'index', $response->get_data()['slug'], 'Should fallback to `index.html`.' );
-		// Should fallback to `index.html`.
-		$request->set_param( 'slug', 'tag-rigas' );
-		$request->set_param( 'is_custom', false );
-		$request->set_param( 'template_prefix', 'tag' );
+
+		$this->assertNotWPError( $response, "Fetching a registered template shouldn't cause an error." );
+
+		$data = $response->get_data();
+
+		$this->assertSame( 'default//test-template', $data['id'], 'Template ID mismatch.' );
+		$this->assertSame( 'default', $data['theme'], 'Template theme mismatch.' );
+		$this->assertSame( 'Template content', $data['content']['raw'], 'Template content mismatch.' );
+		$this->assertSame( 'test-template', $data['slug'], 'Template slug mismatch.' );
+		$this->assertSame( 'plugin', $data['source'], "Template source should be 'plugin'." );
+		$this->assertSame( 'plugin', $data['origin'], "Template origin should be 'plugin'." );
+		$this->assertSame( 'test-plugin', $data['author_text'], 'Template author text mismatch.' );
+		$this->assertSame( 'Description of test template', $data['description'], 'Template description mismatch.' );
+		$this->assertSame( 'Test Template', $data['title']['rendered'], 'Template title mismatch.' );
+		$this->assertSame( 'test-plugin', $data['plugin'], 'Plugin name mismatch.' );
+
+		unregister_block_template( $template_name );
+
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/templates/test-plugin//test-template' );
 		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 'index', $response->get_data()['slug'], 'Should fallback to `index.html`.' );
+
+		$this->assertNotWPError( $response, "Fetching an unregistered template shouldn't cause an error." );
+		$this->assertSame( 404, $response->get_status(), 'Fetching an unregistered template should return 404.' );
 	}
 
 	/**
-	 * @covers WP_REST_Templates_Controller::get_item_schema
+	 * @doesNotPerformAssertions
 	 */
-	public function test_get_item_schema() {
-		$request    = new WP_REST_Request( 'OPTIONS', '/wp/v2/templates' );
-		$response   = rest_get_server()->dispatch( $request );
-		$data       = $response->get_data();
-		$properties = $data['schema']['properties'];
-		$this->assertCount( 17, $properties );
-		$this->assertArrayHasKey( 'id', $properties );
-		$this->assertArrayHasKey( 'description', $properties );
-		$this->assertArrayHasKey( 'slug', $properties );
-		$this->assertArrayHasKey( 'theme', $properties );
-		$this->assertArrayHasKey( 'type', $properties );
-		$this->assertArrayHasKey( 'source', $properties );
-		$this->assertArrayHasKey( 'origin', $properties );
-		$this->assertArrayHasKey( 'content', $properties );
-		$this->assertArrayHasKey( 'title', $properties );
-		$this->assertArrayHasKey( 'description', $properties );
-		$this->assertArrayHasKey( 'status', $properties );
-		$this->assertArrayHasKey( 'wp_id', $properties );
-		$this->assertArrayHasKey( 'has_theme_file', $properties );
-		$this->assertArrayHasKey( 'is_custom', $properties );
-		$this->assertArrayHasKey( 'author', $properties );
-		$this->assertArrayHasKey( 'modified', $properties );
+	public function test_register_routes() {
+		// Already present in core test class: Tests_REST_WpRestTemplatesController.
 	}
 
 	/**
-	 * @covers WP_REST_Templates_Controller::get_item
+	 * @doesNotPerformAssertions
 	 */
-	public function test_get_item() {
-		wp_set_current_user( self::$admin_id );
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/templates/emptytheme//my_template' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		unset( $data['content'] );
-		unset( $data['_links'] );
-
-		$this->assertSame(
-			array(
-				'id'              => 'emptytheme//my_template',
-				'theme'           => 'emptytheme',
-				'slug'            => 'my_template',
-				'source'          => 'custom',
-				'origin'          => null,
-				'type'            => 'wp_template',
-				'description'     => 'Description of my template.',
-				'title'           => array(
-					'raw'      => 'My Template',
-					'rendered' => 'My Template',
-				),
-				'status'          => 'publish',
-				'wp_id'           => self::$post->ID,
-				'has_theme_file'  => false,
-				'is_custom'       => true,
-				'author'          => 0,
-				'modified'        => mysql_to_rfc3339( self::$post->post_modified ),
-				'author_text'     => 'Test Blog',
-				'original_source' => 'site',
-			),
-			$data
-		);
+	public function test_get_items() {
+		// Already present in core test class: Tests_REST_WpRestTemplatesController.
 	}
 
 	/**
-	 * @covers WP_REST_Templates_Controller::get_items
+	 * @doesNotPerformAssertions
 	 */
-	public function test_get_items() {
-		wp_set_current_user( self::$admin_id );
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/templates' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-
-		$this->assertSame(
-			array(
-				'id'              => 'emptytheme//my_template',
-				'theme'           => 'emptytheme',
-				'slug'            => 'my_template',
-				'source'          => 'custom',
-				'origin'          => null,
-				'type'            => 'wp_template',
-				'description'     => 'Description of my template.',
-				'title'           => array(
-					'raw'      => 'My Template',
-					'rendered' => 'My Template',
-				),
-				'status'          => 'publish',
-				'wp_id'           => self::$post->ID,
-				'has_theme_file'  => false,
-				'is_custom'       => true,
-				'author'          => 0,
-				'modified'        => mysql_to_rfc3339( self::$post->post_modified ),
-				'author_text'     => 'Test Blog',
-				'original_source' => 'site',
-			),
-			$this->find_and_normalize_template_by_id( $data, 'emptytheme//my_template' )
-		);
+	public function test_create_item() {
+		// Already present in core test class: Tests_REST_WpRestTemplatesController.
 	}
 
 	/**
-	 * @covers WP_REST_Templates_Controller::update_item
+	 * @doesNotPerformAssertions
 	 */
 	public function test_update_item() {
-		wp_set_current_user( self::$admin_id );
-		$request = new WP_REST_Request( 'PUT', '/wp/v2/templates/emptytheme//my_template' );
-		$request->set_body_params(
-			array(
-				'title' => 'My new Index Title',
-			)
-		);
-
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		$this->assertSame( 'My new Index Title', $data['title']['raw'] );
-		$this->assertSame( 'custom', $data['source'] );
-		$this->assertIsString( $data['modified'] );
+		// Already present in core test class: Tests_REST_WpRestTemplatesController.
 	}
 
 	/**
-	 * @covers WP_REST_Templates_Controller::create_item
+	 * @doesNotPerformAssertions
 	 */
-	public function test_create_item() {
-		wp_set_current_user( self::$admin_id );
-		$request = new WP_REST_Request( 'POST', '/wp/v2/templates' );
-		$request->set_body_params(
-			array(
-				'slug'        => 'my_custom_template',
-				'description' => 'Just a description',
-				'title'       => 'My Template',
-				'content'     => 'Content',
-				'author'      => self::$admin_id,
-			)
-		);
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		unset( $data['_links'] );
-		unset( $data['wp_id'] );
-
-		$author_name = get_user_by( 'id', self::$admin_id )->get( 'display_name' );
-
-		$this->assertSame(
-			array(
-				'id'              => 'emptytheme//my_custom_template',
-				'theme'           => 'emptytheme',
-				'content'         => array(
-					'raw' => 'Content',
-				),
-				'slug'            => 'my_custom_template',
-				'source'          => 'custom',
-				'origin'          => null,
-				'type'            => 'wp_template',
-				'description'     => 'Just a description',
-				'title'           => array(
-					'raw'      => 'My Template',
-					'rendered' => 'My Template',
-				),
-				'status'          => 'publish',
-				'has_theme_file'  => false,
-				'is_custom'       => true,
-				'author'          => self::$admin_id,
-				'modified'        => $data['modified'],
-				'author_text'     => $author_name,
-				'original_source' => 'user',
-			),
-			$data
-		);
+	public function test_delete_item() {
+		// Already present in core test class: Tests_REST_WpRestTemplatesController.
 	}
 
 	/**
 	 * @doesNotPerformAssertions
 	 */
-	public function test_context_param() {}
+	public function test_context_param() {
+		// Already present in core test class: Tests_REST_WpRestTemplatesController.
+	}
 
 	/**
 	 * @doesNotPerformAssertions
 	 */
-	public function test_delete_item() {}
+	public function test_prepare_item() {
+		// Already present in core test class: Tests_REST_WpRestTemplatesController.
+	}
 
 	/**
 	 * @doesNotPerformAssertions
 	 */
-	public function test_prepare_item() {}
+	public function test_get_item_schema() {
+		// Already present in core test class: Tests_REST_WpRestTemplatesController.
+	}
 }
diff --git a/phpunit/class-test-plugin-version-meta-test.php b/phpunit/class-test-plugin-version-meta-test.php
new file mode 100644
index 00000000000000..f0dadf873166fd
--- /dev/null
+++ b/phpunit/class-test-plugin-version-meta-test.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Unit tests covering the version checks in the plugin file.
+ *
+ * @package Gutenberg
+ */
+class Test_PluginMetaData_Test extends WP_UnitTestCase {
+	/**
+	 * Test the minimum WordPress version check.
+	 *
+	 * Ensures the constant defined as the minimum required version of WordPress
+	 * matches the minimum version defined in the plugin header.
+	 */
+	public function test_minimum_required_wordpress_version() {
+		$file_meta = get_file_data( __DIR__ . '/../gutenberg.php', array( 'RequiresWP' => 'Requires at least' ) );
+		/*
+		 * Gutenberg.php isn't loaded in the test environment.
+		 *
+		 * Read the file directly and use regex to extract the constant.
+		 */
+		preg_match( '/GUTENBERG_MINIMUM_WP_VERSION\', \'(.*?)\'/', file_get_contents( __DIR__ . '/../gutenberg.php' ), $matches );
+		$version_in_file = $matches[1];
+
+		$this->assertSame( $file_meta['RequiresWP'], $version_in_file, 'The minimum required WordPress version does not match the plugin header.' );
+	}
+}
diff --git a/phpunit/class-wp-block-templates-registry-test.php b/phpunit/class-wp-block-templates-registry-test.php
new file mode 100644
index 00000000000000..fb8436eb6153d4
--- /dev/null
+++ b/phpunit/class-wp-block-templates-registry-test.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Test WP_Block_Templates_Registry class.
+ *
+ * @covers WP_Block_Templates_Registry
+ */
+class WP_Block_Templates_Registry_Test extends WP_UnitTestCase {
+
+	/**
+	 * @var WP_Block_Templates_Registry
+	 */
+	protected static $registry;
+
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		self::$registry = WP_Block_Templates_Registry::get_instance();
+	}
+
+	public function test_register_template() {
+		// Register a valid template.
+		$template_name = 'test-plugin//test-template';
+		$template      = self::$registry->register( $template_name );
+
+		$this->assertSame( $template->slug, 'test-template' );
+
+		self::$registry->unregister( $template_name );
+	}
+
+	public function test_register_template_invalid_name() {
+		// Try to register a template with invalid name (non-string).
+		$template_name = array( 'invalid-template-name' );
+
+		$this->setExpectedIncorrectUsage( 'WP_Block_Templates_Registry::register' );
+		$result = self::$registry->register( $template_name );
+
+		$this->assertWPError( $result );
+		$this->assertSame( 'template_name_no_string', $result->get_error_code(), 'Error code mismatch.' );
+		$this->assertSame( 'Template names must be strings.', $result->get_error_message(), 'Error message mismatch.' );
+	}
+
+	public function test_register_template_invalid_name_uppercase() {
+		// Try to register a template with uppercase characters in the name.
+		$template_name = 'test-plugin//Invalid-Template-Name';
+
+		$this->setExpectedIncorrectUsage( 'WP_Block_Templates_Registry::register' );
+		$result = self::$registry->register( $template_name );
+
+		$this->assertWPError( $result );
+		$this->assertSame( 'template_name_no_uppercase', $result->get_error_code(), 'Error code mismatch.' );
+		$this->assertSame( 'Template names must not contain uppercase characters.', $result->get_error_message(), 'Error message mismatch.' );
+	}
+
+	public function test_register_template_no_prefix() {
+		// Try to register a template without a namespace.
+		$this->setExpectedIncorrectUsage( 'WP_Block_Templates_Registry::register' );
+		$result = self::$registry->register( 'template-no-plugin', array() );
+
+		$this->assertWPError( $result );
+		$this->assertSame( 'template_no_prefix', $result->get_error_code(), 'Error code mismatch.' );
+		$this->assertSame( 'Template names must contain a namespace prefix. Example: my-plugin//my-custom-template', $result->get_error_message(), 'Error message mismatch.' );
+	}
+
+	public function test_register_template_already_exists() {
+		// Register the template for the first time.
+		$template_name = 'test-plugin//duplicate-template';
+		self::$registry->register( $template_name );
+
+		// Try to register the same template again.
+		$this->setExpectedIncorrectUsage( 'WP_Block_Templates_Registry::register' );
+		$result = self::$registry->register( $template_name );
+
+		$this->assertWPError( $result );
+		$this->assertSame( 'template_already_registered', $result->get_error_code(), 'Error code mismatch.' );
+		$this->assertStringContainsString( 'Template "test-plugin//duplicate-template" is already registered.', $result->get_error_message(), 'Error message mismatch.' );
+
+		self::$registry->unregister( $template_name );
+	}
+
+	public function test_get_all_registered() {
+		$template_name_1 = 'test-plugin//template-1';
+		$template_name_2 = 'test-plugin//template-2';
+		self::$registry->register( $template_name_1 );
+		self::$registry->register( $template_name_2 );
+
+		$all_templates = self::$registry->get_all_registered();
+
+		$this->assertIsArray( $all_templates, 'Registered templates should be an array.' );
+		$this->assertCount( 2, $all_templates, 'Registered templates should contain 2 items.' );
+		$this->assertArrayHasKey( 'test-plugin//template-1', $all_templates, 'Registered templates should contain "test-plugin//template-1".' );
+		$this->assertArrayHasKey( 'test-plugin//template-2', $all_templates, 'Registered templates should contain "test-plugin//template-2".' );
+
+		self::$registry->unregister( $template_name_1 );
+		self::$registry->unregister( $template_name_2 );
+	}
+
+	public function test_get_registered() {
+		$template_name = 'test-plugin//registered-template';
+		$args          = array(
+			'content'     => 'Template content',
+			'title'       => 'Registered Template',
+			'description' => 'Description of registered template',
+			'post_types'  => array( 'post', 'page' ),
+		);
+		self::$registry->register( $template_name, $args );
+
+		$registered_template = self::$registry->get_registered( $template_name );
+
+		$this->assertSame( 'default', $registered_template->theme, 'Template theme mismatch.' );
+		$this->assertSame( 'registered-template', $registered_template->slug, 'Template slug mismatch.' );
+		$this->assertSame( 'default//registered-template', $registered_template->id, 'Template ID mismatch.' );
+		$this->assertSame( 'Registered Template', $registered_template->title, 'Template title mismatch.' );
+		$this->assertSame( 'Template content', $registered_template->content, 'Template content mismatch.' );
+		$this->assertSame( 'Description of registered template', $registered_template->description, 'Template description mismatch.' );
+		$this->assertSame( 'plugin', $registered_template->source, "Template source should be 'plugin'." );
+		$this->assertSame( 'plugin', $registered_template->origin, "Template origin should be 'plugin'." );
+		$this->assertEquals( array( 'post', 'page' ), $registered_template->post_types, 'Template post types mismatch.' );
+		$this->assertSame( 'test-plugin', $registered_template->plugin, 'Plugin name mismatch.' );
+
+		self::$registry->unregister( $template_name );
+	}
+
+	public function test_get_by_slug() {
+		$slug          = 'slug-template';
+		$template_name = 'test-plugin//' . $slug;
+		$args          = array(
+			'content' => 'Template content',
+			'title'   => 'Slug Template',
+		);
+		self::$registry->register( $template_name, $args );
+
+		$registered_template = self::$registry->get_by_slug( $slug );
+
+		$this->assertNotNull( $registered_template, 'Registered template should not be null.' );
+		$this->assertSame( $slug, $registered_template->slug, 'Template slug mismatch.' );
+
+		self::$registry->unregister( $template_name );
+	}
+
+	public function test_get_by_query() {
+		$template_name_1 = 'test-plugin//query-template-1';
+		$template_name_2 = 'test-plugin//query-template-2';
+		$args_1          = array(
+			'content' => 'Template content 1',
+			'title'   => 'Query Template 1',
+		);
+		$args_2          = array(
+			'content' => 'Template content 2',
+			'title'   => 'Query Template 2',
+		);
+		self::$registry->register( $template_name_1, $args_1 );
+		self::$registry->register( $template_name_2, $args_2 );
+
+		$query   = array(
+			'slug__in' => array( 'query-template-1' ),
+		);
+		$results = self::$registry->get_by_query( $query );
+
+		$this->assertCount( 1, $results, 'Query result should contain 1 item.' );
+		$this->assertArrayHasKey( $template_name_1, $results, 'Query result should contain "test-plugin//query-template-1".' );
+
+		self::$registry->unregister( $template_name_1 );
+		self::$registry->unregister( $template_name_2 );
+	}
+
+	public function test_is_registered() {
+		$template_name = 'test-plugin//is-registered-template';
+		$args          = array(
+			'content' => 'Template content',
+			'title'   => 'Is Registered Template',
+		);
+		self::$registry->register( $template_name, $args );
+
+		$this->assertTrue( self::$registry->is_registered( $template_name ) );
+
+		self::$registry->unregister( $template_name );
+	}
+
+	public function test_unregister() {
+		$template_name = 'test-plugin//unregister-template';
+		$args          = array(
+			'content' => 'Template content',
+			'title'   => 'Unregister Template',
+		);
+		$template      = self::$registry->register( $template_name, $args );
+
+		$unregistered_template = self::$registry->unregister( $template_name );
+
+		$this->assertEquals( $template, $unregistered_template, 'Unregistered template should be the same as the registered one.' );
+		$this->assertFalse( self::$registry->is_registered( $template_name ), 'Template should not be registered after unregistering.' );
+	}
+}
diff --git a/phpunit/class-wp-get-block-css-selectors-test.php b/phpunit/class-wp-get-block-css-selectors-test.php
deleted file mode 100644
index 8f43d9df6d95e3..00000000000000
--- a/phpunit/class-wp-get-block-css-selectors-test.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-/**
- * Tests_Get_Block_CSS_Selector class
- *
- * @package WordPress
- */
-
-class WP_Get_Block_CSS_Selector_Test extends WP_UnitTestCase {
-	private $test_block_name;
-
-	public function set_up() {
-		parent::set_up();
-		$this->test_block_name = null;
-	}
-
-	public function tear_down() {
-		unregister_block_type( $this->test_block_name );
-		$this->test_block_name = null;
-		parent::tear_down();
-	}
-
-	private function register_test_block( $name, $selectors = null, $supports = null ) {
-		$this->test_block_name = $name;
-
-		return register_block_type(
-			$this->test_block_name,
-			array(
-				'api_version' => 2,
-				'attributes'  => array(),
-				'selectors'   => $selectors,
-				'supports'    => $supports,
-			)
-		);
-	}
-
-	public function test_get_root_selector_via_selectors_api() {
-		$block_type = self::register_test_block(
-			'test/block-with-selectors',
-			array( 'root' => '.wp-custom-block-class' )
-		);
-
-		$selector = wp_get_block_css_selector( $block_type );
-		$this->assertEquals( '.wp-custom-block-class', $selector );
-	}
-
-	public function test_get_root_selector_via_experimental_property() {
-		$block_type = self::register_test_block(
-			'test/block-without-selectors',
-			null,
-			array( '__experimentalSelector' => '.experimental-selector' )
-		);
-
-		$selector = wp_get_block_css_selector( $block_type );
-		$this->assertEquals( '.experimental-selector', $selector );
-	}
-
-	public function test_default_root_selector_generation_for_core_block() {
-		$block_type = self::register_test_block(
-			'core/without-selectors-or-supports',
-			null,
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type );
-		$this->assertEquals( '.wp-block-without-selectors-or-supports', $selector );
-	}
-
-	public function test_default_root_selector_generation() {
-		$block_type = self::register_test_block(
-			'test/without-selectors-or-supports',
-			null,
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type );
-		$this->assertEquals( '.wp-block-test-without-selectors-or-supports', $selector );
-	}
-
-	public function test_get_feature_selector_via_selectors_api() {
-		$block_type = self::register_test_block(
-			'test/feature-selector',
-			array( 'typography' => array( 'root' => '.typography' ) ),
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography' );
-		$this->assertEquals( '.typography', $selector );
-	}
-
-	public function test_get_feature_selector_via_selectors_api_shorthand_property() {
-		$block_type = self::register_test_block(
-			'test/shorthand-feature-selector',
-			array( 'typography' => '.typography' ),
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography' );
-		$this->assertEquals( '.typography', $selector );
-	}
-
-	public function test_no_feature_level_selector_via_selectors_api() {
-		$block_type = self::register_test_block(
-			'test/null-feature-selector',
-			array( 'root' => '.fallback-root-selector' ),
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography' );
-		$this->assertEquals( null, $selector );
-	}
-
-	public function test_fallback_feature_level_selector_via_selectors_api_to_generated_class() {
-		$block_type = self::register_test_block(
-			'test/fallback-feature-selector',
-			array(),
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography', true );
-		$this->assertEquals( '.wp-block-test-fallback-feature-selector', $selector );
-	}
-
-
-	public function test_fallback_feature_level_selector_via_selectors_api() {
-		$block_type = self::register_test_block(
-			'test/fallback-feature-selector',
-			array( 'root' => '.fallback-root-selector' ),
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography', true );
-		$this->assertEquals( '.fallback-root-selector', $selector );
-	}
-
-	public function test_get_feature_selector_via_experimental_property() {
-		$block_type = self::register_test_block(
-			'test/experimental-feature-selector',
-			null,
-			array(
-				'typography' => array(
-					'__experimentalSelector' => '.experimental-typography',
-				),
-			)
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography' );
-		$this->assertEquals( '.wp-block-test-experimental-feature-selector .experimental-typography', $selector );
-	}
-
-	public function test_fallback_feature_selector_via_experimental_property() {
-		$block_type = self::register_test_block(
-			'test/fallback-feature-selector',
-			null,
-			array()
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography', true );
-		$this->assertEquals( '.wp-block-test-fallback-feature-selector', $selector );
-	}
-
-	public function test_no_feature_selector_via_experimental_property() {
-		$block_type = self::register_test_block(
-			'test/null-experimental-feature-selector',
-			null,
-			array()
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography' );
-		$this->assertEquals( null, $selector );
-	}
-
-	public function test_get_subfeature_selector_via_selectors_api() {
-		$block_type = self::register_test_block(
-			'test/subfeature-selector',
-			array(
-				'typography' => array(
-					'textDecoration' => '.root .typography .text-decoration',
-				),
-			),
-			null
-		);
-
-		$selector = wp_get_block_css_selector(
-			$block_type,
-			array( 'typography', 'textDecoration' )
-		);
-
-		$this->assertEquals( '.root .typography .text-decoration', $selector );
-	}
-
-	public function test_fallback_subfeature_selector_via_selectors_api() {
-		$block_type = self::register_test_block(
-			'test/subfeature-selector',
-			array(
-				'typography' => array( 'root' => '.root .typography' ),
-			),
-			null
-		);
-
-		$selector = wp_get_block_css_selector(
-			$block_type,
-			array( 'typography', 'textDecoration' ),
-			true
-		);
-
-		$this->assertEquals( '.root .typography', $selector );
-	}
-
-	public function test_no_subfeature_level_selector_via_selectors_api() {
-		$block_type = self::register_test_block(
-			'test/null-subfeature-selector',
-			array(),
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, array( 'typography', 'fontSize' ) );
-		$this->assertEquals( null, $selector );
-	}
-
-	public function test_fallback_subfeature_selector_via_experimental_property() {
-		$block_type = self::register_test_block(
-			'test/fallback-subfeature-selector',
-			null,
-			array()
-		);
-
-		$selector = wp_get_block_css_selector(
-			$block_type,
-			array( 'typography', 'fontSize' ),
-			true
-		);
-		$this->assertEquals( '.wp-block-test-fallback-subfeature-selector', $selector );
-	}
-
-	public function test_no_subfeature_selector_via_experimental_property() {
-		$block_type = self::register_test_block(
-			'test/null-experimental-subfeature-selector',
-			null,
-			array()
-		);
-
-		$selector = wp_get_block_css_selector(
-			$block_type,
-			array( 'typography', 'fontSize' )
-		);
-		$this->assertEquals( null, $selector );
-	}
-
-	public function test_empty_target_returns_null() {
-		$block_type = self::register_test_block(
-			'test/null-experimental-subfeature-selector',
-			null,
-			array()
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, array() );
-		$this->assertEquals( null, $selector );
-
-		$selector = wp_get_block_css_selector( $block_type, '' );
-		$this->assertEquals( null, $selector );
-	}
-
-	public function test_string_targets_for_features() {
-		$block_type = self::register_test_block(
-			'test/target-types-for-features',
-			array( 'typography' => '.found' ),
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography' );
-		$this->assertEquals( '.found', $selector );
-
-		$selector = wp_get_block_css_selector( $block_type, array( 'typography' ) );
-		$this->assertEquals( '.found', $selector );
-	}
-
-	public function test_string_targets_for_subfeatures() {
-		$block_type = self::register_test_block(
-			'test/target-types-for-features',
-			array(
-				'typography' => array( 'fontSize' => '.found' ),
-			),
-			null
-		);
-
-		$selector = wp_get_block_css_selector( $block_type, 'typography.fontSize' );
-		$this->assertEquals( '.found', $selector );
-
-		$selector = wp_get_block_css_selector( $block_type, array( 'typography', 'fontSize' ) );
-		$this->assertEquals( '.found', $selector );
-	}
-}
diff --git a/phpunit/class-wp-navigation-block-renderer-test.php b/phpunit/class-wp-navigation-block-renderer-test.php
deleted file mode 100644
index 73f3c89d798838..00000000000000
--- a/phpunit/class-wp-navigation-block-renderer-test.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Test the block WP_Navigation_Block_Renderer class.
- *
- * @package Gutenberg
- */
-
-class WP_Navigation_Block_Renderer_Test extends WP_UnitTestCase {
-
-	/**
-	 * Test that navigation links are wrapped in list items to preserve accessible markup
-	 *
-	 * @group navigation-renderer
-	 *
-	 * @covers WP_Navigation_Block_Renderer::get_markup_for_inner_block
-	 */
-	public function test_gutenberg_default_block_is_enclosed_in_li_tags() {
-
-		$parsed_blocks         = parse_blocks(
-			'<!-- wp:navigation-link {"label":"Sample Page","type":"page","kind":"post-type","url":"/hello-world"} /-->'
-		);
-		$parsed_block          = $parsed_blocks[0];
-		$context               = array();
-		$navigation_link_block = new WP_Block( $parsed_block, $context );
-
-		// Setup an empty testing instance of `WP_Navigation_Block_Renderer` and save the original.
-		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer' );
-		$method     = $reflection->getMethod( 'get_markup_for_inner_block' );
-		$method->setAccessible( true );
-		// Invoke the private method.
-		$result = $method->invoke( $reflection, $navigation_link_block );
-
-		$expected = '<li class=" wp-block-navigation-item wp-block-navigation-link"><a class="wp-block-navigation-item__content"  href="/hello-world"><span class="wp-block-navigation-item__label">Sample Page</span></a></li>';
-		$this->assertEquals( $expected, $result );
-	}
-
-	/**
-	 * Test that the site-title block is wrapped in a list item to preserve accessible markup
-	 *
-	 * @group navigation-renderer
-	 *
-	 * @covers WP_Navigation_Block_Renderer::get_markup_for_inner_block
-	 */
-	public function test_gutenberg_get_markup_for_inner_block_site_title() {
-
-		// We are testing the site title block because we manually add list items around it.
-		$parsed_blocks    = parse_blocks(
-			'<!-- wp:site-title /-->'
-		);
-		$parsed_block     = $parsed_blocks[0];
-		$context          = array();
-		$site_title_block = new WP_Block( $parsed_block, $context );
-
-		// Setup an empty testing instance of `WP_Navigation_Block_Renderer` and save the original.
-		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer' );
-		$method     = $reflection->getMethod( 'get_markup_for_inner_block' );
-		$method->setAccessible( true );
-		// Invoke the private method.
-		$result = $method->invoke( $reflection, $site_title_block );
-
-		$expected = '<li class="wp-block-navigation-item"><h1 class="wp-block-site-title"><a href="http://' . WP_TESTS_DOMAIN . '" target="_self" rel="home">Test Blog</a></h1></li>';
-		$this->assertEquals( $expected, $result );
-	}
-}
diff --git a/phpunit/class-wp-rest-block-pattern-categories-controller-test.php b/phpunit/class-wp-rest-block-pattern-categories-controller-test.php
deleted file mode 100644
index d4fb4e1b08842c..00000000000000
--- a/phpunit/class-wp-rest-block-pattern-categories-controller-test.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Unit tests covering WP_REST_Block_Pattern_Categories_Controller functionality.
- *
- * @package WordPress
- * @subpackage REST_API
- */
-
-/**
- * Unit tests for REST API for Block Pattern Categories.
- *
- * @group restapi
- * @covers WP_REST_Block_Pattern_Categories_Controller
- */
-class WP_REST_Block_Pattern_Categories_Controller_Test extends WP_Test_REST_Controller_Testcase {
-	protected static $admin_id;
-	protected static $original_instance_value;
-
-	public function set_up() {
-		parent::set_up();
-		switch_theme( 'emptytheme' );
-	}
-
-	public static function wpSetupBeforeClass( $factory ) {
-		// Create a test user.
-		self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
-
-		// Setup an empty testing instance of `WP_Block_Pattern_Categories_Registry` and save the original.
-		$reflection        = new ReflectionClass( 'WP_Block_Pattern_Categories_Registry' );
-		$instance_property = $reflection->getProperty( 'instance' );
-		$instance_property->setAccessible( true );
-		self::$original_instance_value = $instance_property->getValue( null );
-
-		$test_registry = new WP_Block_Pattern_Categories_Registry();
-		$instance_property->setValue( $test_registry );
-
-		// Register some categories in the test registry.
-		$test_registry->register( 'test', array( 'label' => 'Test' ) );
-		$test_registry->register( 'query', array( 'label' => 'Query' ) );
-	}
-
-	public static function wpTearDownAfterClass() {
-		// Delete the test user.
-		self::delete_user( self::$admin_id );
-
-		// Restore the original registry instance.
-		$reflection        = new ReflectionClass( 'WP_Block_Pattern_Categories_Registry' );
-		$instance_property = $reflection->getProperty( 'instance' );
-		$instance_property->setAccessible( true );
-		$instance_property->setValue( self::$original_instance_value );
-		$instance_property->setAccessible( false );
-	}
-
-	public function test_register_routes() {
-		$routes = rest_get_server()->get_routes();
-		$this->assertArrayHasKey(
-			'/wp/v2/block-patterns/categories',
-			$routes,
-			'The categories route does not exist'
-		);
-	}
-
-	public function test_get_items() {
-		wp_set_current_user( self::$admin_id );
-
-		$expected_names  = array( 'test', 'query' );
-		$expected_fields = array( 'name', 'label' );
-
-		$request            = new WP_REST_Request( 'GET', '/wp/v2/block-patterns/categories' );
-		$request['_fields'] = 'name,label';
-		$response           = rest_get_server()->dispatch( $request );
-		$data               = $response->get_data();
-
-		$this->assertCount( count( $expected_names ), $data );
-		foreach ( $data as $idx => $item ) {
-			$this->assertEquals( $expected_names[ $idx ], $item['name'] );
-			$this->assertEquals( $expected_fields, array_keys( $item ) );
-		}
-	}
-
-	/**
-	 * Abstract methods that we must implement.
-	 *
-	 * @doesNotPerformAssertions
-	 */
-	public function test_context_param() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_create_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_update_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_delete_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_prepare_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_item_schema() {}
-}
diff --git a/phpunit/class-wp-rest-global-styles-controller-gutenberg-test.php b/phpunit/class-wp-rest-global-styles-controller-gutenberg-test.php
index 032070cb0a9202..c9453f4bd8e5c3 100644
--- a/phpunit/class-wp-rest-global-styles-controller-gutenberg-test.php
+++ b/phpunit/class-wp-rest-global-styles-controller-gutenberg-test.php
@@ -1,16 +1,42 @@
 <?php
-
+/**
+ * Unit tests covering WP_REST_Global_Styles_Controller_Gutenberg functionality.
+ *
+ * @package Gutenberg
+ *
+ * @covers WP_REST_Global_Styles_Controller_Gutenberg
+ */
 class WP_REST_Global_Styles_Controller_Gutenberg_Test extends WP_Test_REST_Controller_Testcase {
 	/**
 	 * @var int
 	 */
 	protected static $admin_id;
 
+	/**
+	 * @var int
+	 */
+	protected static $editor_id;
+
+	/**
+	 * @var int
+	 */
+	protected static $subscriber_id;
+
+	/**
+	 * @var int
+	 */
+	protected static $theme_manager_id;
+
 	/**
 	 * @var int
 	 */
 	protected static $global_styles_id;
 
+	/**
+	 * @var int
+	 */
+	protected static $post_id;
+
 	public function set_up() {
 		parent::set_up();
 		switch_theme( 'emptytheme' );
@@ -27,36 +53,87 @@ public static function wpSetupBeforeClass( $factory ) {
 				'role' => 'administrator',
 			)
 		);
+
+		self::$editor_id = $factory->user->create(
+			array(
+				'role' => 'editor',
+			)
+		);
+
+		self::$subscriber_id = $factory->user->create(
+			array(
+				'role' => 'subscriber',
+			)
+		);
+
+		self::$theme_manager_id = $factory->user->create(
+			array(
+				'role' => 'subscriber',
+			)
+		);
+
+		// Add the 'edit_theme_options' capability to the theme manager (subscriber).
+		$theme_manager_id = get_user_by( 'id', self::$theme_manager_id );
+		if ( $theme_manager_id instanceof WP_User ) {
+			$theme_manager_id->add_cap( 'edit_theme_options' );
+		}
+
 		// This creates the global styles for the current theme.
-		self::$global_styles_id = wp_insert_post(
+		self::$global_styles_id = $factory->post->create(
 			array(
 				'post_content' => '{"version": ' . WP_Theme_JSON_Gutenberg::LATEST_SCHEMA . ', "isGlobalStylesUserThemeJSON": true }',
 				'post_status'  => 'publish',
-				'post_title'   => __( 'Custom Styles', 'default' ),
+				'post_title'   => 'Custom Styles',
 				'post_type'    => 'wp_global_styles',
 				'post_name'    => 'wp-global-styles-emptytheme',
 				'tax_input'    => array(
 					'wp_theme' => 'emptytheme',
 				),
-			),
-			true
+			)
 		);
+
+		self::$post_id = $factory->post->create();
 	}
 
+	/**
+	 *
+	 */
+	public static function wpTearDownAfterClass() {
+		self::delete_user( self::$admin_id );
+		self::delete_user( self::$editor_id );
+		self::delete_user( self::$subscriber_id );
+		self::delete_user( self::$theme_manager_id );
+	}
 
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::register_routes
+	 */
 	public function test_register_routes() {
+		// Register routes so that they overwrite identical Core routes.
+		$global_styles_controller = new WP_REST_Global_Styles_Controller_Gutenberg();
+		$global_styles_controller->register_routes();
+
 		$routes = rest_get_server()->get_routes();
 		$this->assertArrayHasKey(
-			// '/wp/v2/global-styles/(?P<id>[\/\s%\w\.\(\)\[\]\@_\-]+)',
 			'/wp/v2/global-styles/(?P<id>[\/\w-]+)',
 			$routes,
 			'Single global style based on the given ID route does not exist'
 		);
+		$this->assertCount(
+			2,
+			$routes['/wp/v2/global-styles/(?P<id>[\/\w-]+)'],
+			'Single global style based on the given ID route does not have exactly two elements'
+		);
 		$this->assertArrayHasKey(
 			'/wp/v2/global-styles/themes/(?P<stylesheet>[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)',
 			$routes,
 			'Theme global styles route does not exist'
 		);
+		$this->assertCount(
+			1,
+			$routes['/wp/v2/global-styles/themes/(?P<stylesheet>[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)'],
+			'Theme global styles route does not have exactly one element'
+		);
 		$this->assertArrayHasKey(
 			'/wp/v2/global-styles/themes/(?P<stylesheet>[\/\s%\w\.\(\)\[\]\@_\-]+)/variations',
 			$routes,
@@ -73,12 +150,30 @@ public function test_context_param() {
 
 	public function test_get_theme_items() {
 		wp_set_current_user( self::$admin_id );
+		switch_theme( 'emptytheme' );
 		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/emptytheme/variations' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$expected = array(
 			array(
-				'version'  => 2,
+				'_links'   => array(
+					'curies'        => array(
+						array(
+							'name'      => 'wp',
+							'href'      => 'https://api.w.org/{rel}',
+							'templated' => true,
+						),
+					),
+					'wp:theme-file' => array(
+						array(
+							'href'   => 'http://localhost:8889/wp-content/themes/emptytheme/img/1024x768_emptytheme_test_image.jpg',
+							'name'   => 'file:./img/1024x768_emptytheme_test_image.jpg',
+							'target' => 'styles.background.backgroundImage.url',
+							'type'   => 'image/jpeg',
+						),
+					),
+				),
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
 					'color' => array(
 						'palette' => array(
@@ -93,7 +188,12 @@ public function test_get_theme_items() {
 					),
 				),
 				'styles'   => array(
-					'blocks' => array(
+					'background' => array(
+						'backgroundImage' => array(
+							'url' => 'file:./img/1024x768_emptytheme_test_image.jpg',
+						),
+					),
+					'blocks'     => array(
 						'core/post-title' => array(
 							'typography' => array(
 								'fontWeight' => '700',
@@ -104,7 +204,11 @@ public function test_get_theme_items() {
 				'title'    => 'variation',
 			),
 		);
-		$this->assertSameSetsWithIndex( $data, $expected );
+
+		wp_recursive_ksort( $data );
+		wp_recursive_ksort( $expected );
+
+		$this->assertSameSets( $expected, $data, 'Theme item should match expected schema' );
 	}
 
 	/**
@@ -114,14 +218,262 @@ public function test_get_items() {
 		// Controller does not implement get_items().
 	}
 
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_theme_item
+	 */
+	public function test_get_theme_item_no_user() {
+		wp_set_current_user( 0 );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/emptytheme' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read_global_styles', $response, 401 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_theme_item
+	 */
+	public function test_get_theme_item_subscriber_permission_check() {
+		wp_set_current_user( self::$subscriber_id );
+		switch_theme( 'emptytheme' );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/emptytheme' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read_global_styles', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_theme_item
+	 */
+	public function test_get_theme_item_editor_permission_check() {
+		wp_set_current_user( self::$editor_id );
+		switch_theme( 'emptytheme' );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/emptytheme' );
+		$response = rest_get_server()->dispatch( $request );
+		// Checks that the response has the expected keys.
+		$data  = $response->get_data();
+		$links = $response->get_links();
+		$this->assertArrayHasKey( 'settings', $data, 'Data does not have "settings" key' );
+		$this->assertArrayHasKey( 'styles', $data, 'Data does not have "styles" key' );
+		$this->assertArrayHasKey( 'self', $links, 'Links do not have a "self" key' );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_theme_item
+	 */
+	public function test_get_theme_item_theme_options_manager_permission_check() {
+		wp_set_current_user( self::$theme_manager_id );
+		switch_theme( 'emptytheme' );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/emptytheme' );
+		$response = rest_get_server()->dispatch( $request );
+		// Checks that the response has the expected keys.
+		$data  = $response->get_data();
+		$links = $response->get_links();
+		$this->assertArrayHasKey( 'settings', $data, 'Data does not have "settings" key' );
+		$this->assertArrayHasKey( 'styles', $data, 'Data does not have "styles" key' );
+		$this->assertArrayHasKey( 'self', $links, 'Links do not have a "self" key' );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_theme_item
+	 */
+	public function test_get_theme_item_invalid() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/invalid' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_theme_not_found', $response, 404 );
+	}
+
+	/**
+	 * @dataProvider data_get_theme_item_invalid_theme_dirname
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_theme_item
+	 *
+	 * @param string $theme_dirname Theme directory to test.
+	 * @param string $expected      Expected error code.
+	 */
+	public function test_get_theme_item_invalid_theme_dirname( $theme_dirname, $expected ) {
+		wp_set_current_user( self::$admin_id );
+		switch_theme( $theme_dirname );
+
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/' . $theme_dirname );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( $expected, $response, 404 );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_theme_item_invalid_theme_dirname() {
+		return array(
+			'+'                      => array(
+				'theme_dirname' => 'my+theme+',
+				'expected'      => 'rest_theme_not_found',
+			),
+			':'                      => array(
+				'theme_dirname' => 'my:theme:',
+				'expected'      => 'rest_no_route',
+			),
+			'<>'                     => array(
+				'theme_dirname' => 'my<theme>',
+				'expected'      => 'rest_no_route',
+			),
+			'*'                      => array(
+				'theme_dirname' => 'my*theme*',
+				'expected'      => 'rest_no_route',
+			),
+			'?'                      => array(
+				'theme_dirname' => 'my?theme?',
+				'expected'      => 'rest_no_route',
+			),
+			'"'                      => array(
+				'theme_dirname' => 'my"theme?"',
+				'expected'      => 'rest_no_route',
+			),
+			'| (invalid on Windows)' => array(
+				'theme_dirname' => 'my|theme|',
+				'expected'      => 'rest_no_route',
+			),
+			// Themes deep in subdirectories.
+			'2 subdirectories deep'  => array(
+				'theme_dirname' => 'subdir/subsubdir/mytheme',
+				'expected'      => 'rest_global_styles_not_found',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_theme_item
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_theme_item
+	 *
+	 * @param string $theme Theme directory to test.
+	 */
+	public function test_get_theme_item( $theme ) {
+		wp_set_current_user( self::$admin_id );
+		switch_theme( $theme );
+
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/' . $theme );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$links    = $response->get_links();
+		$this->assertArrayHasKey( 'settings', $data, 'Data does not have "settings" key' );
+		$this->assertArrayHasKey( 'styles', $data, 'Data does not have "styles" key' );
+		$this->assertArrayHasKey( 'self', $links, 'Links do not have a "self" key' );
+		$this->assertStringContainsString( '/wp/v2/global-styles/themes/' . $theme, $links['self'][0]['href'] );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_theme_item() {
+		return array(
+			'alphabetic'                     => array( 'mytheme' ),
+			'alphanumeric'                   => array( 'mythemev1' ),
+			'àáâãäåæç'                       => array( 'àáâãäåæç' ),
+			'space'                          => array( 'my theme' ),
+			'-_.'                            => array( 'my_theme-0.1' ),
+			'[]'                             => array( 'my[theme]' ),
+			'()'                             => array( 'my(theme)' ),
+			'{}'                             => array( 'my{theme}' ),
+			'&=#@!$,^~%'                     => array( 'theme &=#@!$,^~%' ),
+			'all combined'                   => array( 'thémé {}&=@!$,^~%[0.1](-_-)' ),
+
+			// Themes in a subdirectory.
+			'subdir: alphabetic'             => array( 'subdir/mytheme' ),
+			'subdir: alphanumeric in theme'  => array( 'subdir/mythemev1' ),
+			'subdir: alphanumeric in subdir' => array( 'subdirv1/mytheme' ),
+			'subdir: alphanumeric in both'   => array( 'subdirv1/mythemev1' ),
+			'subdir: àáâãäåæç in theme'      => array( 'subdir/àáâãäåæç' ),
+			'subdir: àáâãäåæç in subdir'     => array( 'àáâãäåæç/mythemev1' ),
+			'subdir: àáâãäåæç in both'       => array( 'àáâãäåæç/àáâãäåæç' ),
+			'subdir: space in theme'         => array( 'subdir/my theme' ),
+			'subdir: space in subdir'        => array( 'sub dir/mytheme' ),
+			'subdir: space in both'          => array( 'sub dir/my theme' ),
+			'subdir: -_. in theme'           => array( 'subdir/my_theme-0.1' ),
+			'subdir: -_. in subdir'          => array( 'sub_dir-0.1/mytheme' ),
+			'subdir: -_. in both'            => array( 'sub_dir-0.1/my_theme-0.1' ),
+			'subdir: all combined in theme'  => array( 'subdir/thémé {}&=@!$,^~%[0.1](-_-)' ),
+			'subdir: all combined in subdir' => array( 'sűbdīr {}&=@!$,^~%[0.1](-_-)/mytheme' ),
+			'subdir: all combined in both'   => array( 'sűbdīr {}&=@!$,^~%[0.1](-_-)/thémé {}&=@!$,^~%[0.1](-_-)' ),
+		);
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_theme_item
+	 */
+	public function test_get_theme_item_fields() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/themes/emptytheme' );
+		$request->set_param( '_fields', 'settings' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertArrayHasKey( 'settings', $data );
+		$this->assertArrayNotHasKey( 'styles', $data );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_item
+	 */
+	public function test_get_item_no_user() {
+		wp_set_current_user( 0 );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_view', $response, 401 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_item
+	 */
+	public function test_get_item_invalid_post() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$post_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_global_styles_not_found', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_item
+	 */
+	public function test_get_item_permission_check() {
+		wp_set_current_user( self::$subscriber_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_view', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_item
+	 */
+	public function test_get_item_no_user_edit() {
+		wp_set_current_user( 0 );
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$request->set_param( 'context', 'edit' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_forbidden_context', $response, 401 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_item
+	 */
+	public function test_get_item_permission_check_edit() {
+		wp_set_current_user( self::$subscriber_id );
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$request->set_param( 'context', 'edit' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_forbidden_context', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_item
+	 */
 	public function test_get_item() {
 		wp_set_current_user( self::$admin_id );
 		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
-		unset( $data['_links'] );
+		$links    = $response->get_links();
 
-		$this->assertEquals(
+		$this->assertEqualSets(
 			array(
 				'id'       => self::$global_styles_id,
 				'title'    => array(
@@ -133,6 +485,9 @@ public function test_get_item() {
 			),
 			$data
 		);
+
+		$this->assertArrayHasKey( 'self', $links );
+		$this->assertStringContainsString( '/wp/v2/global-styles/' . self::$global_styles_id, $links['self'][0]['href'] );
 	}
 
 	/**
@@ -142,6 +497,9 @@ public function test_create_item() {
 		// Controller does not implement create_item().
 	}
 
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::update_item
+	 */
 	public function test_update_item() {
 		wp_set_current_user( self::$admin_id );
 		$request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
@@ -152,7 +510,136 @@ public function test_update_item() {
 		);
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
-		$this->assertEquals( 'My new global styles title', $data['title']['raw'] );
+		$this->assertSame( 'My new global styles title', $data['title']['raw'] );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::update_item
+	 */
+	public function test_update_item_no_user() {
+		wp_set_current_user( 0 );
+		$request  = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_edit', $response, 401 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::update_item
+	 */
+	public function test_update_item_invalid_post() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$post_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_global_styles_not_found', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::update_item
+	 */
+	public function test_update_item_permission_check() {
+		wp_set_current_user( self::$subscriber_id );
+		$request  = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_edit', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::update_item
+	 */
+	public function test_update_item_valid_styles_css() {
+		wp_set_current_user( self::$admin_id );
+		if ( is_multisite() ) {
+			grant_super_admin( self::$admin_id );
+		}
+		$request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$request->set_body_params(
+			array(
+				'styles' => array( 'css' => 'body { color: red; }' ),
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertSame( 'body { color: red; }', $data['styles']['css'] );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::update_item
+	 */
+	public function test_update_item_invalid_styles_css() {
+		wp_set_current_user( self::$admin_id );
+		if ( is_multisite() ) {
+			grant_super_admin( self::$admin_id );
+		}
+		$request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$request->set_body_params(
+			array(
+				'styles' => array( 'css' => '<p>test</p> body { color: red; }' ),
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_custom_css_illegal_markup', $response, 400 );
+	}
+
+	/**
+	 * Tests the submission of a custom block style variation that was defined
+	 * within a theme style variation and wouldn't be registered at the time
+	 * of saving via the API.
+	 *
+	 * @since 6.6.0
+	 *
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::update_item
+	 */
+	public function test_update_item_with_custom_block_style_variations() {
+		wp_set_current_user( self::$admin_id );
+		if ( is_multisite() ) {
+			grant_super_admin( self::$admin_id );
+		}
+
+		/*
+		 * For variations to be resolved they have to have been registered
+		 * via either a theme.json partial or through the WP_Block_Styles_Registry.
+		 */
+		register_block_style(
+			'core/group',
+			array(
+				'name'  => 'fromThemeStyleVariation',
+				'label' => 'From Theme Style Variation',
+			)
+		);
+
+		$group_variations = array(
+			'fromThemeStyleVariation' => array(
+				'color' => array(
+					'background' => '#ffffff',
+					'text'       => '#000000',
+				),
+			),
+		);
+
+		$request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$request->set_body_params(
+			array(
+				'styles' => array(
+					'variations' => array(
+						'fromThemeStyleVariation' => array(
+							'blockTypes' => array( 'core/group', 'core/columns' ),
+							'color'      => array(
+								'background' => '#000000',
+								'text'       => '#ffffff',
+							),
+						),
+					),
+					'blocks'     => array(
+						'core/group' => array(
+							'variations' => $group_variations,
+						),
+					),
+				),
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertSame( $group_variations, $data['styles']['blocks']['core/group']['variations'] );
 	}
 
 	/**
@@ -170,9 +657,36 @@ public function test_prepare_item() {
 	}
 
 	/**
-	 * @doesNotPerformAssertions
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_item_schema
 	 */
 	public function test_get_item_schema() {
-		// Covered by the core.
+		$request    = new WP_REST_Request( 'OPTIONS', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$response   = rest_get_server()->dispatch( $request );
+		$data       = $response->get_data();
+		$properties = $data['schema']['properties'];
+		$this->assertCount( 4, $properties, 'Schema properties array does not have exactly 4 elements' );
+		$this->assertArrayHasKey( 'id', $properties, 'Schema properties array does not have "id" key' );
+		$this->assertArrayHasKey( 'styles', $properties, 'Schema properties array does not have "styles" key' );
+		$this->assertArrayHasKey( 'settings', $properties, 'Schema properties array does not have "settings" key' );
+		$this->assertArrayHasKey( 'title', $properties, 'Schema properties array does not have "title" key' );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller_Gutenberg::get_available_actions
+	 */
+	public function test_assign_edit_css_action_admin() {
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$request->set_param( 'context', 'edit' );
+		$response = rest_do_request( $request );
+		$links    = $response->get_links();
+
+		// Admins can only edit css on single site.
+		if ( is_multisite() ) {
+			$this->assertArrayNotHasKey( 'https://api.w.org/action-edit-css', $links );
+		} else {
+			$this->assertArrayHasKey( 'https://api.w.org/action-edit-css', $links );
+		}
 	}
 }
diff --git a/phpunit/class-wp-test-rest-users-controller.php b/phpunit/class-wp-test-rest-users-controller.php
deleted file mode 100644
index 522c4d763c5637..00000000000000
--- a/phpunit/class-wp-test-rest-users-controller.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- * Unit tests covering WP_REST_Users_Controller functionality.
- *
- * @package WordPress
- * @subpackage REST API
- */
-
-/**
- * @group restapi
- */
-class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
-	protected static $superadmin;
-	protected static $user;
-	protected static $editor;
-	protected static $draft_editor;
-	protected static $subscriber;
-
-	protected static $authors     = array();
-	protected static $posts       = array();
-	protected static $user_ids    = array();
-	protected static $total_users = 30;
-	protected static $per_page    = 50;
-
-	protected static $site;
-
-	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
-		self::$superadmin   = $factory->user->create(
-			array(
-				'role'       => 'administrator',
-				'user_login' => 'superadmin',
-			)
-		);
-		self::$user         = $factory->user->create(
-			array(
-				'role' => 'administrator',
-			)
-		);
-		self::$editor       = $factory->user->create(
-			array(
-				'role'       => 'editor',
-				'user_email' => 'editor@example.com',
-			)
-		);
-		self::$draft_editor = $factory->user->create(
-			array(
-				'role'       => 'editor',
-				'user_email' => 'draft-editor@example.com',
-			)
-		);
-		self::$subscriber   = $factory->user->create(
-			array(
-				'role'         => 'subscriber',
-				'display_name' => 'subscriber',
-				'user_email'   => 'subscriber@example.com',
-			)
-		);
-
-		foreach ( array( true, false ) as $show_in_rest ) {
-			foreach ( array( true, false ) as $public ) {
-				$post_type_name = 'r_' . json_encode( $show_in_rest ) . '_p_' . json_encode( $public );
-				register_post_type(
-					$post_type_name,
-					array(
-						'public'                   => $public,
-						'show_in_rest'             => $show_in_rest,
-						'tests_no_auto_unregister' => true,
-					)
-				);
-				self::$authors[ $post_type_name ] = $factory->user->create(
-					array(
-						'role'       => 'editor',
-						'user_email' => 'author_' . $post_type_name . '@example.com',
-					)
-				);
-				self::$posts[ $post_type_name ]   = $factory->post->create(
-					array(
-						'post_type'   => $post_type_name,
-						'post_author' => self::$authors[ $post_type_name ],
-					)
-				);
-			}
-		}
-
-		self::$posts['post']                = $factory->post->create(
-			array(
-				'post_type'   => 'post',
-				'post_author' => self::$editor,
-			)
-		);
-		self::$posts['r_true_p_true_DRAFT'] = $factory->post->create(
-			array(
-				'post_type'   => 'r_true_p_true',
-				'post_author' => self::$draft_editor,
-				'post_status' => 'draft',
-			)
-		);
-
-		if ( is_multisite() ) {
-			self::$site = $factory->blog->create(
-				array(
-					'domain' => 'rest.wordpress.org',
-					'path'   => '/',
-				)
-			);
-			update_site_option( 'site_admins', array( 'superadmin' ) );
-		}
-
-		// Set up users for pagination tests.
-		for ( $i = 0; $i < self::$total_users - 10; $i++ ) {
-			self::$user_ids[] = $factory->user->create(
-				array(
-					'role'         => 'contributor',
-					'display_name' => "User {$i}",
-				)
-			);
-		}
-	}
-
-	public static function wpTearDownAfterClass() {
-		self::delete_user( self::$user );
-		self::delete_user( self::$editor );
-		self::delete_user( self::$draft_editor );
-
-		foreach ( self::$posts as $post ) {
-			wp_delete_post( $post, true );
-		}
-
-		foreach ( self::$authors as $author ) {
-			self::delete_user( $author );
-		}
-
-		_unregister_post_type( 'r_true_p_true' );
-		_unregister_post_type( 'r_true_p_false' );
-		_unregister_post_type( 'r_false_p_true' );
-		_unregister_post_type( 'r_false_p_false' );
-
-		if ( is_multisite() ) {
-			wp_delete_site( self::$site );
-		}
-
-		// Remove users for pagination tests.
-		foreach ( self::$user_ids as $user_id ) {
-			self::delete_user( $user_id );
-		}
-	}
-
-	/**
-	 * This function is run before each method
-	 */
-	public function set_up() {
-		parent::set_up();
-		$this->endpoint = new WP_REST_Users_Controller();
-	}
-
-	/**
-	 * The following methods are implemented in core and tested.
-	 * We need to define them here because they exist in the abstract parent.
-	 *
-	 * @doesNotPerformAssertions
-	 */
-	public function test_register_routes() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_context_param() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_prepare_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_create_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_update_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_delete_item() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_items() {}
-
-	/**
-	 * @doesNotPerformAssertions
-	 */
-	public function test_get_item_schema() {}
-
-	public function test_registered_query_params() {
-		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/users' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		$keys     = array_keys( $data['endpoints'][0]['args'] );
-		sort( $keys );
-		$this->assertSame(
-			array(
-				'context',
-				'exclude',
-				'has_published_posts',
-				'include',
-				'offset',
-				'order',
-				'orderby',
-				'page',
-				'per_page',
-				'roles',
-				'search',
-				'slug',
-				'who',
-			),
-			$keys
-		);
-	}
-
-	/**
-	 * Test the has_published_posts param.
-	 */
-	public function test_get_items_has_published_posts_query() {
-		wp_set_current_user( self::$superadmin );
-
-		// Test all users who have authored a post.
-		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
-		$request->set_param( 'has_published_posts', true );
-		$response = rest_get_server()->dispatch( $request );
-		// Make sure the response status is successful.
-		$this->assertSame( 200, $response->get_status() );
-		// Make sure we have 3 authors.
-		$this->assertCount( 3, $response->get_data() );
-		// Make sure we have the right author IDs.
-		$this->assertSame( 4, $response->get_data()[0]['id'] );
-		$this->assertSame( 7, $response->get_data()[1]['id'] );
-		$this->assertSame( 8, $response->get_data()[2]['id'] );
-
-		// Test users for a specific post-type.
-		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
-		$request->set_param( 'has_published_posts', array( 'r_true_p_true' ) );
-		$response = rest_get_server()->dispatch( $request );
-		// Make sure the response status is successful.
-		$this->assertSame( 200, $response->get_status() );
-		// Make sure we only have 1 author.
-		$this->assertCount( 1, $response->get_data() );
-		// Make sure we got the correct author.
-		$this->assertSame( 7, $response->get_data()[0]['id'] );
-
-		// Test invalid post-type.
-		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
-		$request->set_param( 'has_published_posts', array( 'dummy' ) );
-		$response = rest_get_server()->dispatch( $request );
-		// Make sure the response has a status of 400.
-		$this->assertSame( 400, $response->get_status() );
-	}
-}
diff --git a/phpunit/class-wp-theme-json-resolver-test.php b/phpunit/class-wp-theme-json-resolver-test.php
index eda8caede7bfec..d2339f2496290c 100644
--- a/phpunit/class-wp-theme-json-resolver-test.php
+++ b/phpunit/class-wp-theme-json-resolver-test.php
@@ -4,6 +4,8 @@
  * Test WP_Theme_JSON_Resolver_Gutenberg class.
  *
  * @package Gutenberg
+ *
+ * @since 5.8.0
  */
 
 class WP_Theme_JSON_Resolver_Gutenberg_Test extends WP_UnitTestCase {
@@ -16,39 +18,43 @@ class WP_Theme_JSON_Resolver_Gutenberg_Test extends WP_UnitTestCase {
 	protected static $administrator_id;
 
 	/**
-	 * WP_Theme_JSON_Resolver::$blocks_cache property.
+	 * WP_Theme_JSON_Resolver_Gutenberg::$blocks_cache property.
 	 *
 	 * @var ReflectionProperty
 	 */
 	private static $property_blocks_cache;
 
 	/**
-	 * Original value of the WP_Theme_JSON_Resolver::$blocks_cache property.
+	 * Original value of the WP_Theme_JSON_Resolver_Gutenberg::$blocks_cache property.
 	 *
 	 * @var array
 	 */
 	private static $property_blocks_cache_orig_value;
 
 	/**
-	 * WP_Theme_JSON_Resolver::$core property.
+	 * WP_Theme_JSON_Resolver_Gutenberg::$core property.
 	 *
 	 * @var ReflectionProperty
 	 */
 	private static $property_core;
 
 	/**
-	 * Original value of the WP_Theme_JSON_Resolver::$core property.
+	 * Original value of the WP_Theme_JSON_Resolver_Gutenberg::$core property.
 	 *
-	 * @var WP_Theme_JSON
+	 * @var WP_Theme_JSON_Gutenberg
 	 */
 	private static $property_core_orig_value;
 
 	/**
+	 * Theme root directory.
+	 *
 	 * @var string|null
 	 */
 	private $theme_root;
 
 	/**
+	 * Original theme directory.
+	 *
 	 * @var array|null
 	 */
 	private $orig_theme_dir;
@@ -77,6 +83,12 @@ public static function set_up_before_class() {
 		static::$property_core_orig_value = static::$property_core->getValue();
 	}
 
+	public static function tear_down_after_class() {
+		static::$property_blocks_cache->setValue( null, static::$property_blocks_cache_orig_value );
+		static::$property_core->setValue( null, static::$property_core_orig_value );
+		parent::tear_down_after_class();
+	}
+
 	public function set_up() {
 		parent::set_up();
 		$this->theme_root = realpath( __DIR__ . '/data/themedir1' );
@@ -99,6 +111,9 @@ public function tear_down() {
 		$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
 		wp_clean_themes_cache();
 		unset( $GLOBALS['wp_themes'] );
+
+		// Reset data between tests.
+		_gutenberg_clean_theme_json_caches();
 		parent::tear_down();
 	}
 
@@ -110,29 +125,24 @@ public function filter_set_locale_to_polish() {
 		return 'pl_PL';
 	}
 
-	public function filter_db_query( $query ) {
-		if ( preg_match( '#post_type = \'wp_global_styles\'#', $query ) ) {
-			$this->queries[] = $query;
-		}
-		return $query;
-	}
-
 	public function test_translations_are_applied() {
 		add_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
 		load_textdomain( 'block-theme', realpath( __DIR__ . '/data/languages/themes/block-theme-pl_PL.mo' ) );
 
 		switch_theme( 'block-theme' );
-		$actual = WP_Theme_JSON_Resolver_Gutenberg::get_theme_data();
+		$theme_data       = WP_Theme_JSON_Resolver_Gutenberg::get_theme_data();
+		$style_variations = WP_Theme_JSON_Resolver_Gutenberg::get_style_variations();
 
 		unload_textdomain( 'block-theme' );
 		remove_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
 
-		$this->assertSame( wp_get_theme()->get( 'TextDomain' ), 'block-theme' );
+		$this->assertSame( 'block-theme', wp_get_theme()->get( 'TextDomain' ) );
+		$this->assertSame( 'Motyw blokowy', $theme_data->get_data()['title'] );
 		$this->assertSame(
 			array(
 				'color'      => array(
 					'custom'         => false,
-					'customGradient' => true,
+					'customGradient' => false,
 					'palette'        => array(
 						'theme' => array(
 							array(
@@ -147,14 +157,58 @@ public function test_translations_are_applied() {
 							),
 						),
 					),
+					'gradients'      => array(
+						'theme' => array(
+							array(
+								'name'     => 'Custom gradient',
+								'gradient' => 'linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%)',
+								'slug'     => 'custom-gradient',
+							),
+						),
+					),
+					'duotone'        => array(
+						'theme' => array(
+							array(
+								'colors' => array( '#333333', '#aaaaaa' ),
+								'slug'   => 'custom-duotone',
+								'name'   => 'Custom Duotone',
+							),
+						),
+					),
 				),
 				'typography' => array(
-					'customFontSize' => true,
-					'lineHeight'     => false,
+					'customFontSize' => false,
+					'lineHeight'     => true,
+					'fontSizes'      => array(
+						'theme' => array(
+							array(
+								'name' => 'Custom',
+								'slug' => 'custom',
+								'size' => '100px',
+							),
+						),
+					),
 				),
 				'spacing'    => array(
-					'units'   => false,
-					'padding' => false,
+					'units'    => array( 'rem' ),
+					'padding'  => true,
+					'blockGap' => true,
+				),
+				'shadow'     => array(
+					'presets' => array(
+						'theme' => array(
+							array(
+								'name'   => 'Natural',
+								'slug'   => 'natural',
+								'shadow' => '2px 2px 3px #000',
+							),
+							array(
+								'name'   => 'Test',
+								'slug'   => 'test',
+								'shadow' => '2px 2px 3px #000',
+							),
+						),
+					),
 				),
 				'blocks'     => array(
 					'core/paragraph' => array(
@@ -172,28 +226,227 @@ public function test_translations_are_applied() {
 					),
 				),
 			),
-			$actual->get_settings()
+			$theme_data->get_settings()
 		);
+
+		$custom_templates = $theme_data->get_custom_templates();
+		$this->assertArrayHasKey( 'page-home', $custom_templates );
 		$this->assertSame(
-			$actual->get_custom_templates(),
 			array(
-				'page-home' => array(
-					'title'     => 'Szablon strony głównej',
-					'postTypes' => array( 'page' ),
-				),
-			)
+				'title'     => 'Szablon strony głównej',
+				'postTypes' => array( 'page' ),
+			),
+			$custom_templates['page-home']
 		);
-		$this->assertSame(
-			$actual->get_template_parts(),
+
+		$this->assertSameSets(
 			array(
 				'small-header' => array(
 					'title' => 'Mały nagłówek',
 					'area'  => 'header',
 				),
-			)
+			),
+			$theme_data->get_template_parts()
+		);
+
+		$this->assertSame(
+			'Wariant motywu blokowego',
+			$style_variations[2]['title']
+		);
+	}
+
+	private function get_registered_block_names( $hard_reset = false ) {
+		static $expected_block_names;
+
+		if ( ! $hard_reset && ! empty( $expected_block_names ) ) {
+			return $expected_block_names;
+		}
+
+		$expected_block_names = array();
+		$resolver             = WP_Block_Type_Registry::get_instance();
+		$blocks               = $resolver->get_all_registered();
+		foreach ( array_keys( $blocks ) as $block_name ) {
+			$expected_block_names[ $block_name ] = true;
+		}
+
+		return $expected_block_names;
+	}
+
+	/**
+	 * Tests when WP_Theme_JSON_Resolver_Gutenberg::$blocks_cache is empty or
+	 * does not match the all registered blocks.
+	 *
+	 * Though this is a non-public method, it is vital to other functionality.
+	 * Therefore, tests are provided to validate it functions as expected.
+	 *
+	 * @dataProvider data_has_same_registered_blocks_when_all_blocks_not_cached
+	 *
+	 * @param string $origin The origin to test.
+	 */
+	public function test_has_same_registered_blocks_when_all_blocks_not_cached( $origin, array $cache = array() ) {
+		$has_same_registered_blocks = new ReflectionMethod( WP_Theme_JSON_Resolver_Gutenberg::class, 'has_same_registered_blocks' );
+		$has_same_registered_blocks->setAccessible( true );
+		$expected_cache = $this->get_registered_block_names();
+
+		// Set up the blocks cache for the origin.
+		$blocks_cache            = static::$property_blocks_cache->getValue();
+		$blocks_cache[ $origin ] = $cache;
+		static::$property_blocks_cache->setValue( null, $blocks_cache );
+
+		$this->assertFalse( $has_same_registered_blocks->invoke( null, $origin ), 'WP_Theme_JSON_Resolver_Gutenberg::has_same_registered_blocks() should return false when same blocks are not cached' );
+		$blocks_cache = static::$property_blocks_cache->getValue();
+		$this->assertSameSets( $expected_cache, $blocks_cache[ $origin ], 'WP_Theme_JSON_Resolver_Gutenberg::$blocks_cache should contain all expected block names for the given origin' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_has_same_registered_blocks_when_all_blocks_not_cached() {
+		return array(
+			'origin: core; cache: empty'       => array(
+				'origin' => 'core',
+			),
+			'origin: blocks; cache: empty'     => array(
+				'origin' => 'blocks',
+			),
+			'origin: theme; cache: empty'      => array(
+				'origin' => 'theme',
+			),
+			'origin: user; cache: empty'       => array(
+				'origin' => 'user',
+			),
+			'origin: core; cache: not empty'   => array(
+				'origin' => 'core',
+				'cache'  => array(
+					'core/block' => true,
+				),
+			),
+			'origin: blocks; cache: not empty' => array(
+				'origin' => 'blocks',
+				'cache'  => array(
+					'core/block'    => true,
+					'core/comments' => true,
+				),
+			),
+			'origin: theme; cache: not empty'  => array(
+				'origin' => 'theme',
+				'cache'  => array(
+					'core/cover' => true,
+				),
+			),
+			'origin: user; cache: not empty'   => array(
+				'origin' => 'user',
+				'cache'  => array(
+					'core/gallery' => true,
+				),
+			),
+		);
+	}
+
+	/**
+	 * Tests when WP_Theme_JSON_Resolver_Gutenberg::$blocks_cache is empty or
+	 * does not match the all registered blocks.
+	 *
+	 * Though this is a non-public method, it is vital to other functionality.
+	 * Therefore, tests are provided to validate it functions as expected.
+	 *
+	 * @dataProvider data_has_same_registered_blocks_when_all_blocks_are_cached
+	 *
+	 * @param string $origin The origin to test.
+	 */
+	public function test_has_same_registered_blocks_when_all_blocks_are_cached( $origin ) {
+		$has_same_registered_blocks = new ReflectionMethod( WP_Theme_JSON_Resolver_Gutenberg::class, 'has_same_registered_blocks' );
+		$has_same_registered_blocks->setAccessible( true );
+		$expected_cache = $this->get_registered_block_names();
+
+		// Set up the cache with all registered blocks.
+		$blocks_cache            = static::$property_blocks_cache->getValue();
+		$blocks_cache[ $origin ] = $this->get_registered_block_names();
+		static::$property_blocks_cache->setValue( null, $blocks_cache );
+
+		$this->assertTrue( $has_same_registered_blocks->invoke( null, $origin ), 'WP_Theme_JSON_Resolver_Gutenberg::has_same_registered_blocks() should return true when using the cache' );
+		$this->assertSameSets( $expected_cache, $blocks_cache[ $origin ], 'WP_Theme_JSON_Resolver_Gutenberg::$blocks_cache should contain all expected block names for the given origin' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_has_same_registered_blocks_when_all_blocks_are_cached() {
+		return array(
+			'core'   => array( 'core' ),
+			'blocks' => array( 'blocks' ),
+			'theme'  => array( 'theme' ),
+			'user'   => array( 'user' ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_core_data
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_core_data
+	 */
+	public function test_get_core_data( $should_fire_filter, $core_is_cached, $blocks_are_cached ) {
+		_gutenberg_clean_theme_json_caches();
+
+		// If should cache core, then fire the method to cache it before running the tests.
+		if ( $core_is_cached ) {
+			WP_Theme_JSON_Resolver_Gutenberg::get_core_data();
+		}
+
+		// If should cache registered blocks, then set them up before running the tests.
+		if ( $blocks_are_cached ) {
+			$blocks_cache         = static::$property_blocks_cache->getValue();
+			$blocks_cache['core'] = $this->get_registered_block_names();
+			static::$property_blocks_cache->setValue( null, $blocks_cache );
+		}
+
+		$expected_filter_count = did_filter( 'wp_theme_json_data_default' );
+		$actual                = WP_Theme_JSON_Resolver_Gutenberg::get_core_data();
+		if ( $should_fire_filter ) {
+			++$expected_filter_count;
+		}
+
+		$this->assertSame( $expected_filter_count, did_filter( 'wp_theme_json_data_default' ), 'The filter "wp_theme_json_data_default" should fire the given number of times' );
+		$this->assertInstanceOf( WP_Theme_JSON_Gutenberg::class, $actual, 'WP_Theme_JSON_Resolver_Gutenberg::get_core_data() should return instance of WP_Theme_JSON_Gutenberg' );
+		$this->assertSame( static::$property_core->getValue(), $actual, 'WP_Theme_JSON_Resolver_Gutenberg::$core property should be the same object as returned from WP_Theme_JSON_Resolver_Gutenberg::get_core_data()' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_core_data() {
+		return array(
+			'When both caches are empty'     => array(
+				'should_fire_filter' => true,
+				'core_is_cached'     => false,
+				'blocks_are_cached'  => false,
+			),
+			'When the blocks_cache is not empty and matches' => array(
+				'should_fire_filter' => true,
+				'core_is_cached'     => false,
+				'blocks_are_cached'  => true,
+			),
+			'When blocks_cache is empty but core cache is not' => array(
+				'should_fire_filter' => true,
+				'core_is_cached'     => true,
+				'blocks_are_cached'  => false,
+			),
+			'When both caches are not empty' => array(
+				'should_fire_filter' => true,
+				'core_is_cached'     => true,
+				'blocks_are_cached'  => false,
+			),
 		);
 	}
 
+	/**
+	 * @covers ::add_theme_support
+	 */
 	public function test_add_theme_supports_are_loaded_for_themes_without_theme_json() {
 		switch_theme( 'default' );
 		$color_palette = array(
@@ -215,27 +468,32 @@ public function test_add_theme_supports_are_loaded_for_themes_without_theme_json
 		);
 		add_theme_support( 'editor-color-palette', $color_palette );
 		add_theme_support( 'custom-line-height' );
+		add_theme_support( 'appearance-tools' );
 
 		$settings = WP_Theme_JSON_Resolver_Gutenberg::get_theme_data()->get_settings();
 
 		remove_theme_support( 'custom-line-height' );
 		remove_theme_support( 'editor-color-palette' );
+		remove_theme_support( 'appearance-tools' );
 
 		$this->assertFalse( wp_theme_has_theme_json() );
 		$this->assertTrue( $settings['typography']['lineHeight'] );
 		$this->assertSame( $color_palette, $settings['color']['palette']['theme'] );
+		$this->assertTrue( $settings['border']['color'], 'Support for "appearance-tools" was not added.' );
 	}
 
 	/**
-	 * Recursively applies ksort to an array.
+	 * Tests that classic themes still get core default settings such as color palette and duotone.
 	 */
-	private static function recursive_ksort( &$input_array ) {
-		foreach ( $input_array as &$value ) {
-			if ( is_array( $value ) ) {
-				self::recursive_ksort( $value );
-			}
-		}
-		ksort( $input_array );
+	public function test_core_default_settings_are_loaded_for_themes_without_theme_json() {
+		switch_theme( 'default' );
+
+		$settings = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( 'theme' )->get_settings();
+
+		$this->assertFalse( wp_theme_has_theme_json() );
+		$this->assertTrue( $settings['color']['defaultPalette'] );
+		$this->assertTrue( $settings['color']['defaultDuotone'] );
+		$this->assertTrue( $settings['color']['defaultGradients'] );
 	}
 
 	public function test_merges_child_theme_json_into_parent_theme_json() {
@@ -245,7 +503,25 @@ public function test_merges_child_theme_json_into_parent_theme_json() {
 		$expected_settings = array(
 			'color'      => array(
 				'custom'         => false,
-				'customGradient' => true,
+				'customGradient' => false,
+				'duotone'        => array(
+					'theme' => array(
+						array(
+							'colors' => array( '#333333', '#aaaaaa' ),
+							'name'   => 'Custom Duotone',
+							'slug'   => 'custom-duotone',
+						),
+					),
+				),
+				'gradients'      => array(
+					'theme' => array(
+						array(
+							'name'     => 'Custom gradient',
+							'gradient' => 'linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%)',
+							'slug'     => 'custom-gradient',
+						),
+					),
+				),
 				'palette'        => array(
 					'theme' => array(
 						array(
@@ -268,12 +544,38 @@ public function test_merges_child_theme_json_into_parent_theme_json() {
 				'link'           => true,
 			),
 			'typography' => array(
-				'customFontSize' => true,
-				'lineHeight'     => false,
+				'customFontSize' => false,
+				'lineHeight'     => true,
+				'fontSizes'      => array(
+					'theme' => array(
+						array(
+							'name' => 'Custom',
+							'slug' => 'custom',
+							'size' => '100px',
+						),
+					),
+				),
+			),
+			'shadow'     => array(
+				'presets' => array(
+					'theme' => array(
+						array(
+							'name'   => 'Natural',
+							'slug'   => 'natural',
+							'shadow' => '2px 2px 3px #000',
+						),
+						array(
+							'name'   => 'Test',
+							'slug'   => 'test',
+							'shadow' => '2px 2px 3px #000',
+						),
+					),
+				),
 			),
 			'spacing'    => array(
-				'units'   => false,
-				'padding' => false,
+				'blockGap' => true,
+				'units'    => array( 'rem' ),
+				'padding'  => true,
 			),
 			'blocks'     => array(
 				'core/paragraph'  => array(
@@ -304,8 +606,8 @@ public function test_merges_child_theme_json_into_parent_theme_json() {
 				),
 			),
 		);
-		self::recursive_ksort( $actual_settings );
-		self::recursive_ksort( $expected_settings );
+		wp_recursive_ksort( $actual_settings );
+		wp_recursive_ksort( $expected_settings );
 
 		// Should merge settings.
 		$this->assertSame(
@@ -314,30 +616,44 @@ public function test_merges_child_theme_json_into_parent_theme_json() {
 		);
 
 		$this->assertSame(
-			WP_Theme_JSON_Resolver_Gutenberg::get_theme_data()->get_custom_templates(),
 			array(
-				'page-home' => array(
+				'page-home'                   => array(
 					'title'     => 'Homepage',
 					'postTypes' => array( 'page' ),
 				),
-			)
+				'custom-single-post-template' => array(
+					'title'     => 'Custom Single Post template',
+					'postTypes' => array( 'post' ),
+				),
+			),
+			WP_Theme_JSON_Resolver_Gutenberg::get_theme_data()->get_custom_templates()
 		);
 	}
 
+	/**
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles
+	 */
 	public function test_get_user_data_from_wp_global_styles_does_not_use_uncached_queries() {
 		// Switch to a theme that does have support.
 		switch_theme( 'block-theme' );
 		wp_set_current_user( self::$administrator_id );
 		$theme = wp_get_theme();
 		WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
-		add_filter( 'query', array( $this, 'filter_db_query' ) );
-		$query_count = count( $this->queries );
+		$global_styles_query_count = 0;
+		add_filter(
+			'query',
+			static function ( $query ) use ( &$global_styles_query_count ) {
+				if ( preg_match( '#post_type = \'wp_global_styles\'#', $query ) ) {
+					$global_styles_query_count++;
+				}
+				return $query;
+			}
+		);
 		for ( $i = 0; $i < 3; $i++ ) {
 			WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
-			WP_Theme_JSON_Resolver_Gutenberg::clean_cached_data();
+			_gutenberg_clean_theme_json_caches();
 		}
-		$query_count = count( $this->queries ) - $query_count;
-		$this->assertSame( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type prior to creation.' );
+		$this->assertSame( 0, $global_styles_query_count, 'Unexpected SQL queries detected for the wp_global_style post type prior to creation.' );
 
 		$user_cpt = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
 		$this->assertEmpty( $user_cpt, 'User CPT is expected to be empty.' );
@@ -345,29 +661,29 @@ public function test_get_user_data_from_wp_global_styles_does_not_use_uncached_q
 		$user_cpt = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme, true );
 		$this->assertNotEmpty( $user_cpt, 'User CPT is expected not to be empty.' );
 
-		$query_count = count( $this->queries );
+		$global_styles_query_count = 0;
 		for ( $i = 0; $i < 3; $i++ ) {
 			$new_user_cpt = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
-			WP_Theme_JSON_Resolver_Gutenberg::clean_cached_data();
+			_gutenberg_clean_theme_json_caches();
 			$this->assertSameSets( $user_cpt, $new_user_cpt, "User CPTs do not match on run {$i}." );
 		}
-		$query_count = count( $this->queries ) - $query_count;
-		$this->assertSame( 1, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type after creation.' );
+		$this->assertSame( 1, $global_styles_query_count, 'Unexpected SQL queries detected for the wp_global_style post type after creation.' );
 	}
 
 	/**
-	 * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles
 	 */
 	public function test_get_user_data_from_wp_global_styles_does_not_use_uncached_queries_for_logged_out_users() {
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
 		$theme = wp_get_theme();
 		WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
-		add_filter( 'query', array( $this, 'filter_db_query' ) );
-		$query_count = count( $this->queries );
+		$query_count = get_num_queries();
 		for ( $i = 0; $i < 3; $i++ ) {
 			WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
-			WP_Theme_JSON_Resolver_Gutenberg::clean_cached_data();
+			_gutenberg_clean_theme_json_caches();
 		}
-		$query_count = count( $this->queries ) - $query_count;
+		$query_count = get_num_queries() - $query_count;
 		$this->assertSame( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type prior to creation.' );
 
 		$user_cpt = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
@@ -375,21 +691,142 @@ public function test_get_user_data_from_wp_global_styles_does_not_use_uncached_q
 	}
 
 	/**
-	 * Test that get_merged_data returns the data merged up to the proper origin.
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles
+	 */
+	public function test_get_user_data_from_wp_global_styles_does_not_run_for_theme_without_support() {
+		// The 'default' theme does not support theme.json.
+		switch_theme( 'default' );
+		wp_set_current_user( self::$administrator_id );
+		$theme = wp_get_theme();
+
+		$start_queries = get_num_queries();
+
+		// When theme.json is not supported, the method should not run a query and always return an empty result.
+		$user_cpt = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
+		$this->assertEmpty( $user_cpt, 'User CPT is expected to be empty.' );
+		$this->assertSame( 0, get_num_queries() - $start_queries, 'Unexpected SQL query detected for theme without theme.json support.' );
+
+		$user_cpt = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme, true );
+		$this->assertEmpty( $user_cpt, 'User CPT is expected to be empty.' );
+		$this->assertSame( 0, get_num_queries() - $start_queries, 'Unexpected SQL query detected for theme without theme.json support.' );
+	}
+
+	/**
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles
+	 */
+	public function test_get_user_data_from_wp_global_styles_does_exist() {
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
+		$theme = wp_get_theme();
+		$post1 = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme, true );
+		$this->assertIsArray( $post1 );
+		$this->assertArrayHasKey( 'ID', $post1 );
+		wp_delete_post( $post1['ID'], true );
+		$post2 = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme, true );
+		$this->assertIsArray( $post2 );
+		$this->assertArrayHasKey( 'ID', $post2 );
+	}
+
+	/**
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles
+	 */
+	public function test_get_user_data_from_wp_global_styles_create_post() {
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
+		$theme = wp_get_theme( 'testing' );
+		$post1 = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
+		$this->assertIsArray( $post1 );
+		$this->assertSameSets( array(), $post1 );
+		$post2 = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme );
+		$this->assertIsArray( $post2 );
+		$this->assertSameSets( array(), $post2 );
+		$post3 = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme, true );
+		$this->assertIsArray( $post3 );
+		$this->assertArrayHasKey( 'ID', $post3 );
+	}
+
+	/**
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles
+	 */
+	public function test_get_user_data_from_wp_global_styles_filter_state() {
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
+		$theme = wp_get_theme( 'foo' );
+		$post1 = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme, true, array( 'publish' ) );
+		$this->assertIsArray( $post1 );
+		$this->assertArrayHasKey( 'ID', $post1 );
+		$post2 = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( $theme, false, array( 'draft' ) );
+		$this->assertIsArray( $post2 );
+		$this->assertSameSets( array(), $post2 );
+	}
+
+	/**
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_theme_data
+	 */
+	public function test_get_theme_data_theme_supports_overrides_theme_json() {
+		switch_theme( 'default' );
+
+		// Test that get_theme_data() returns a WP_Theme_JSON_Gutenberg object.
+		$theme_json_resolver = new WP_Theme_JSON_Resolver_Gutenberg();
+		$theme_json_resolver->get_merged_data();
+		$theme_data = $theme_json_resolver->get_theme_data();
+		$this->assertInstanceOf( 'WP_Theme_JSON_Gutenberg', $theme_data, 'Theme data should be an instance of WP_Theme_JSON_Gutenberg.' );
+
+		// Test that wp_theme_json_data_theme filter has been called.
+		$this->assertGreaterThan( 0, did_filter( 'wp_theme_json_data_default' ), 'The filter "wp_theme_json_data_default" should fire.' );
+
+		// Test that data from theme.json is backfilled from existing theme supports.
+		$previous_settings    = $theme_data->get_settings();
+		$previous_line_height = $previous_settings['typography']['lineHeight'];
+		$this->assertFalse( $previous_line_height, 'lineHeight setting from theme.json should be false.' );
+
+		add_theme_support( 'custom-line-height' );
+		$current_settings = $theme_json_resolver->get_theme_data()->get_settings();
+		$line_height      = $current_settings['typography']['lineHeight'];
+		$this->assertTrue( $line_height, 'lineHeight setting after add_theme_support() should be true.' );
+		remove_theme_support( 'custom-line-height' );
+	}
+
+	/**
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_theme_data
+	 */
+	public function test_get_theme_data_does_not_parse_theme_json_if_not_present() {
+		// The 'default' theme does not support theme.json.
+		switch_theme( 'default' );
+
+		$theme_json_resolver = new WP_Theme_JSON_Resolver_Gutenberg();
+
+		// Force-unset $i18n_schema property to "unload" translation schema.
+		$property = new ReflectionProperty( $theme_json_resolver, 'i18n_schema' );
+		$property->setAccessible( true );
+		$property->setValue( null, null );
+
+		// A completely empty theme.json data set still has the 'version' key when parsed.
+		$empty_theme_json = array( 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA );
+
+		// Call using 'with_supports' set to false, so that the method only considers theme.json.
+		$theme_data = $theme_json_resolver->get_theme_data( array(), array( 'with_supports' => false ) );
+		$this->assertInstanceOf( 'WP_Theme_JSON_Gutenberg', $theme_data, 'Theme data should be an instance of WP_Theme_JSON_Gutenberg.' );
+		$this->assertSame( $empty_theme_json, $theme_data->get_raw_data(), 'Theme data should be empty without theme support.' );
+		$this->assertNull( $property->getValue(), 'Theme i18n schema should not have been loaded without theme support.' );
+	}
+
+	/**
+	 * Tests that get_merged_data returns the data merged up to the proper origin.
 	 *
-	 * @covers WP_Theme_JSON_Resolver::get_merged_data
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_merged_data
 	 *
 	 * @dataProvider data_get_merged_data_returns_origin
 	 *
-	 * @param string $origin            What origin to get data from.
-	 * @param bool   $core_palette      Whether the core palette is present.
-	 * @param string $core_palette_text Message.
-	 * @param string $block_styles      Whether the block styles are present.
-	 * @param string $block_styles_text Message.
+	 * @param string $origin             What origin to get data from.
+	 * @param bool   $core_palette       Whether the core palette is present.
+	 * @param string $core_palette_text  Message.
+	 * @param string $block_styles       Whether the block styles are present.
+	 * @param string $block_styles_text  Message.
 	 * @param bool   $theme_palette      Whether the theme palette is present.
 	 * @param string $theme_palette_text Message.
-	 * @param bool   $user_palette      Whether the user palette is present.
-	 * @param string $user_palette_text Message.
+	 * @param bool   $user_palette       Whether the user palette is present.
+	 * @param string $user_palette_text  Message.
 	 */
 	public function test_get_merged_data_returns_origin( $origin, $core_palette, $core_palette_text, $block_styles, $block_styles_text, $theme_palette, $theme_palette_text, $user_palette, $user_palette_text ) {
 		// Make sure there is data from the blocks origin.
@@ -435,24 +872,64 @@ public function test_get_merged_data_returns_origin( $origin, $core_palette, $co
 		$theme_json = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( $origin );
 		$settings   = $theme_json->get_settings();
 		$styles     = $theme_json->get_styles_block_nodes();
-		$this->assertSame( $core_palette, isset( $settings['color']['palette']['default'] ), $core_palette_text );
-		$styles = array_filter(
+		$styles     = array_filter(
 			$styles,
 			static function ( $element ) {
 				return isset( $element['name'] ) && 'my/block-with-styles' === $element['name'];
 			}
 		);
+		unregister_block_type( 'my/block-with-styles' );
+
+		$this->assertSame( $core_palette, isset( $settings['color']['palette']['default'] ), $core_palette_text );
 		$this->assertSame( $block_styles, count( $styles ) === 1, $block_styles_text );
 		$this->assertSame( $theme_palette, isset( $settings['color']['palette']['theme'] ), $theme_palette_text );
 		$this->assertSame( $user_palette, isset( $settings['color']['palette']['custom'] ), $user_palette_text );
+	}
 
-		unregister_block_type( 'my/block-with-styles' );
+	/**
+	 * Tests that get_merged_data returns the data merged up to the proper origin
+	 * and that the core values have the proper data.
+	 *
+	 * @covers WP_Theme_JSON_Resolver_Gutenberg::get_merged_data
+	 */
+	public function test_get_merged_data_returns_origin_proper() {
+		// Make sure the theme has a theme.json
+		// though it doesn't have any data for styles.spacing.padding.
+		switch_theme( 'block-theme' );
+
+		// Make sure the user defined some data for styles.spacing.padding.
+		wp_set_current_user( self::$administrator_id );
+		$user_cpt                               = WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_wp_global_styles( wp_get_theme(), true );
+		$config                                 = json_decode( $user_cpt['post_content'], true );
+		$config['styles']['spacing']['padding'] = array(
+			'top'    => '23px',
+			'left'   => '23px',
+			'bottom' => '23px',
+			'right'  => '23px',
+		);
+		$user_cpt['post_content']               = wp_json_encode( $config );
+		wp_update_post( $user_cpt, true, false );
+
+		// Query data from the user origin and then for the theme origin.
+		$theme_json_user  = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( 'custom' );
+		$padding_user     = $theme_json_user->get_raw_data()['styles']['spacing']['padding'];
+		$theme_json_theme = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data( 'theme' );
+		$padding_theme    = $theme_json_theme->get_raw_data()['styles']['spacing']['padding'];
+
+		$this->assertSame( '23px', $padding_user['top'] );
+		$this->assertSame( '23px', $padding_user['right'] );
+		$this->assertSame( '23px', $padding_user['bottom'] );
+		$this->assertSame( '23px', $padding_user['left'] );
+		$this->assertSame( '0px', $padding_theme['top'] );
+		$this->assertSame( '0px', $padding_theme['right'] );
+		$this->assertSame( '0px', $padding_theme['bottom'] );
+		$this->assertSame( '0px', $padding_theme['left'] );
 	}
 
 	/**
-	 * Data provider for test_get_merged_data_returns_origin
+	 * Data provider for test_get_merged_data_returns_origin.
 	 *
-	 * @return array
+	 * @return array[]
 	 */
 	public function data_get_merged_data_returns_origin() {
 		return array(
@@ -503,69 +980,462 @@ public function data_get_merged_data_returns_origin() {
 		);
 	}
 
-
 	/**
-	 * Test that get_style_variations returns all variations, including parent theme variations if the theme is a child,
-	 * and that the child variation overwrites the parent variation of the same name.
+	 * Tests that `get_style_variations` returns all the appropriate variations,
+	 * including parent variations if the theme is a child, and that the child
+	 * variation overwrites the parent variation of the same name.
+	 *
+	 * Note: This covers both theme and block style variations.
 	 *
 	 * @covers WP_Theme_JSON_Resolver::get_style_variations
-	 **/
-	public function test_get_style_variations_returns_all_variations() {
-		// Switch to a child theme.
-		switch_theme( 'block-theme-child' );
+	 *
+	 * @dataProvider data_get_style_variations
+	 *
+	 * @since 6.6.0 Added tests for block style variations.
+	 *
+	 * @param string $theme               Name of the theme to use.
+	 * @param string $scope               Scope to filter variations by e.g. theme vs block.
+	 * @param array  $expected_variations Collection of expected variations.
+	 */
+	public function test_get_style_variations( $theme, $scope, $expected_variations ) {
+		switch_theme( $theme );
 		wp_set_current_user( self::$administrator_id );
 
-		$actual_settings   = WP_Theme_JSON_Resolver_Gutenberg::get_style_variations();
-		$expected_settings = array(
-			array(
-				'version'  => 2,
-				'title'    => 'variation-a',
-				'settings' => array(
-					'blocks' => array(
-						'core/paragraph' => array(
-							'color' => array(
-								'palette' => array(
-									'theme' => array(
-										array(
-											'slug'  => 'dark',
-											'name'  => 'Dark',
-											'color' => '#010101',
+		$actual_variations = WP_Theme_JSON_Resolver_Gutenberg::get_style_variations( $scope );
+
+		wp_recursive_ksort( $actual_variations );
+		wp_recursive_ksort( $expected_variations );
+
+		$this->assertSame( $expected_variations, $actual_variations );
+	}
+
+	/**
+	 * Data provider for test_get_style_variations
+	 *
+	 * @since 6.6.0 Added data provider for testing theme and block style variations.
+	 *
+	 * @return array
+	 */
+	public function data_get_style_variations() {
+		return array(
+			'theme_style_variations' => array(
+				'theme'               => 'block-theme-child',
+				'scope'               => 'theme',
+				'expected_variations' => array(
+					array(
+						'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+						'title'    => 'variation-a',
+						'settings' => array(
+							'blocks' => array(
+								'core/paragraph' => array(
+									'color' => array(
+										'palette' => array(
+											'theme' => array(
+												array(
+													'slug' => 'dark',
+													'name' => 'Dark',
+													'color' => '#010101',
+												),
+											),
 										),
 									),
 								),
 							),
 						),
 					),
-				),
-			),
-			array(
-				'version'  => 2,
-				'title'    => 'variation-b',
-				'settings' => array(
-					'blocks' => array(
-						'core/post-title' => array(
+					array(
+						'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+						'title'    => 'variation-b',
+						'settings' => array(
+							'blocks' => array(
+								'core/post-title' => array(
+									'color' => array(
+										'palette' => array(
+											'theme' => array(
+												array(
+													'slug' => 'dark',
+													'name' => 'Dark',
+													'color' => '#010101',
+												),
+											),
+										),
+									),
+								),
+							),
+						),
+					),
+					array(
+						'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+						'title'    => 'Block theme variation',
+						'settings' => array(
 							'color' => array(
 								'palette' => array(
 									'theme' => array(
 										array(
-											'slug'  => 'light',
-											'name'  => 'Light',
-											'color' => '#f1f1f1',
+											'slug'  => 'foreground',
+											'name'  => 'Foreground',
+											'color' => '#3F67C6',
 										),
 									),
 								),
 							),
 						),
+						'styles'   => array(
+							'blocks' => array(
+								'core/post-title' => array(
+									'typography' => array(
+										'fontWeight' => '700',
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+			'block_style_variations' => array(
+				'theme'               => 'block-theme-child-with-block-style-variations',
+				'scope'               => 'block',
+				'expected_variations' => array(
+					array(
+						'blockTypes' => array( 'core/group', 'core/columns', 'core/media-text' ),
+						'version'    => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+						'title'      => 'block-style-variation-a',
+						'styles'     => array(
+							'color' => array(
+								'background' => 'darkcyan',
+								'text'       => 'aliceblue',
+							),
+						),
+					),
+					array(
+						'blockTypes' => array( 'core/group', 'core/columns' ),
+						'version'    => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+						'title'      => 'block-style-variation-b',
+						'styles'     => array(
+							'color' => array(
+								'background' => 'midnightblue',
+								'text'       => 'lightblue',
+							),
+						),
+					),
+					array(
+						'blockTypes' => array( 'core/group', 'core/columns' ),
+						'version'    => 3,
+						'slug'       => 'WithSlug',
+						'title'      => 'With Slug',
+						'styles'     => array(
+							'color' => array(
+								'background' => 'aliceblue',
+								'text'       => 'midnightblue',
+							),
+						),
 					),
 				),
 			),
 		);
-		self::recursive_ksort( $actual_settings );
-		self::recursive_ksort( $expected_settings );
+	}
+
+	public function test_theme_shadow_presets_do_not_override_default_shadow_presets() {
+		switch_theme( 'block-theme' );
+
+		$theme_json_resolver = new WP_Theme_JSON_Resolver_Gutenberg();
+		$theme_json          = $theme_json_resolver->get_merged_data();
+		$actual_settings     = $theme_json->get_settings()['shadow']['presets'];
+
+		$expected_settings = array(
+			'default' => array(
+				array(
+					'name'   => 'Natural',
+					'shadow' => '6px 6px 9px rgba(0, 0, 0, 0.2)',
+					'slug'   => 'natural',
+				),
+				array(
+					'name'   => 'Deep',
+					'shadow' => '12px 12px 50px rgba(0, 0, 0, 0.4)',
+					'slug'   => 'deep',
+				),
+				array(
+					'name'   => 'Sharp',
+					'shadow' => '6px 6px 0px rgba(0, 0, 0, 0.2)',
+					'slug'   => 'sharp',
+				),
+				array(
+					'name'   => 'Outlined',
+					'shadow' => '6px 6px 0px -3px rgba(255, 255, 255, 1), 6px 6px rgba(0, 0, 0, 1)',
+					'slug'   => 'outlined',
+				),
+				array(
+					'name'   => 'Crisp',
+					'shadow' => '6px 6px 0px rgba(0, 0, 0, 1)',
+					'slug'   => 'crisp',
+				),
+			),
+			'theme'   => array(
+				array(
+					'name'   => 'Test',
+					'shadow' => '2px 2px 3px #000',
+					'slug'   => 'test',
+				),
+			),
+		);
+
+		wp_recursive_ksort( $actual_settings );
+		wp_recursive_ksort( $expected_settings );
 
 		$this->assertSame(
 			$expected_settings,
 			$actual_settings
 		);
 	}
+
+	public function test_shadow_default_presets_value_for_block_and_classic_themes() {
+		$theme_json_resolver = new WP_Theme_JSON_Resolver_Gutenberg();
+		$theme_json          = $theme_json_resolver->get_merged_data();
+
+		$default_presets_for_classic = $theme_json->get_settings()['shadow']['defaultPresets'];
+		$this->assertFalse( $default_presets_for_classic );
+
+		switch_theme( 'block-theme' );
+		$theme_json_resolver = new WP_Theme_JSON_Resolver_Gutenberg();
+		$theme_json          = $theme_json_resolver->get_merged_data();
+
+		$default_presets_for_block = $theme_json->get_settings()['shadow']['defaultPresets'];
+		$this->assertTrue( $default_presets_for_block );
+	}
+
+	/**
+	 * Tests that relative paths are resolved and merged into the theme.json data.
+	 */
+	public function test_resolve_theme_file_uris() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'background' => array(
+						'backgroundImage' => array(
+							'url' => 'file:./example/img/image.png',
+						),
+					),
+					'blocks'     => array(
+						'core/quote' => array(
+							'background' => array(
+								'backgroundImage' => array(
+									'url' => 'file:./example/img/quote.png',
+								),
+							),
+						),
+						'core/verse' => array(
+							'background' => array(
+								'backgroundImage' => array(
+									'url' => 'file:./example/img/verse.png',
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected_data = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'background' => array(
+					'backgroundImage' => array(
+						'url' => 'https://example.org/wp-content/themes/example-theme/example/img/image.png',
+					),
+				),
+				'blocks'     => array(
+					'core/quote' => array(
+						'background' => array(
+							'backgroundImage' => array(
+								'url' => 'https://example.org/wp-content/themes/example-theme/example/img/quote.png',
+							),
+						),
+					),
+					'core/verse' => array(
+						'background' => array(
+							'backgroundImage' => array(
+								'url' => 'https://example.org/wp-content/themes/example-theme/example/img/verse.png',
+							),
+						),
+					),
+				),
+			),
+		);
+
+		/*
+		 * This filter callback normalizes the return value from `get_theme_file_uri`
+		 * to guard against changes in test environments.
+		 * The test suite otherwise returns full system dir path, e.g.,
+		 * /wordpress-phpunit/includes/../data/themedir1/default/example/img/image.png
+		 */
+		$filter_theme_file_uri_callback = function ( $file ) {
+			return 'https://example.org/wp-content/themes/example-theme/example/' . explode( 'example/', $file )[1];
+		};
+		add_filter( 'theme_file_uri', $filter_theme_file_uri_callback );
+		$actual = WP_Theme_JSON_Resolver_Gutenberg::resolve_theme_file_uris( $theme_json );
+		remove_filter( 'theme_file_uri', $filter_theme_file_uri_callback );
+
+		$this->assertSame( $expected_data, $actual->get_raw_data() );
+	}
+
+	/**
+	 * Tests that them uris are resolved and bundled with other metadata
+	 * in an array.
+	 */
+	public function test_get_resolved_theme_uris() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'background' => array(
+						'backgroundImage' => array(
+							'url' => 'file:./example/img/image.png',
+						),
+					),
+					'blocks'     => array(
+						'core/quote' => array(
+							'background' => array(
+								'backgroundImage' => array(
+									'url' => 'file:./example/img/quote.jpg',
+								),
+							),
+						),
+						'core/verse' => array(
+							'background' => array(
+								'backgroundImage' => array(
+									'url' => 'file:./example/img/verse.gif',
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected_data = array(
+			array(
+				'name'   => 'file:./example/img/image.png',
+				'href'   => 'https://example.org/wp-content/themes/example-theme/example/img/image.png',
+				'target' => 'styles.background.backgroundImage.url',
+				'type'   => 'image/png',
+			),
+			array(
+				'name'   => 'file:./example/img/quote.jpg',
+				'href'   => 'https://example.org/wp-content/themes/example-theme/example/img/quote.jpg',
+				'target' => 'styles.blocks.core/quote.background.backgroundImage.url',
+				'type'   => 'image/jpeg',
+			),
+			array(
+				'name'   => 'file:./example/img/verse.gif',
+				'href'   => 'https://example.org/wp-content/themes/example-theme/example/img/verse.gif',
+				'target' => 'styles.blocks.core/verse.background.backgroundImage.url',
+				'type'   => 'image/gif',
+			),
+		);
+
+		/*
+		 * This filter callback normalizes the return value from `get_theme_file_uri`
+		 * to guard against changes in test environments.
+		 * The test suite otherwise returns full system dir path, e.g.,
+		 * /wordpress-phpunit/includes/../data/themedir1/default/example/img/image.png
+		 */
+		$filter_theme_file_uri_callback = function ( $file ) {
+			return 'https://example.org/wp-content/themes/example-theme/example/' . explode( 'example/', $file )[1];
+		};
+		add_filter( 'theme_file_uri', $filter_theme_file_uri_callback );
+		$actual = WP_Theme_JSON_Resolver_Gutenberg::get_resolved_theme_uris( $theme_json );
+		remove_filter( 'theme_file_uri', $filter_theme_file_uri_callback );
+
+		$this->assertSame( $expected_data, $actual );
+	}
+
+	/**
+	 * Tests that block style variations data gets merged in the following
+	 * priority order, from highest priority to lowest.
+	 *
+	 * - `styles.blocks.blockType.variations` from theme.json
+	 * - `styles.variations` from theme.json
+	 * - variations from block style variation files under `/styles`
+	 * - variations from `WP_Block_Styles_Registry`
+	 */
+	public function test_block_style_variation_merge_order() {
+		switch_theme( 'block-theme-child-with-block-style-variations' );
+
+		/*
+		 * Register style for a block that isn't included in the block style variation's partial
+		 * theme.json's blockTypes. The name must match though so we can ensure the partial's
+		 * styles do not get applied to this block.
+		 */
+		register_block_style(
+			'core/heading',
+			array(
+				'name'  => 'block-style-variation-b',
+				'label' => 'Heading only variation',
+			)
+		);
+
+		// Register variation for a block that will be partially overridden at all levels.
+		register_block_style(
+			'core/media-text',
+			array(
+				'name'       => 'block-style-variation-a',
+				'label'      => 'Block Style Variation A',
+				'style_data' => array(
+					'color' => array(
+						'background' => 'pink',
+						'gradient'   => 'var(--custom)',
+					),
+				),
+			)
+		);
+
+		$data         = WP_Theme_JSON_Resolver_Gutenberg::get_theme_data()->get_raw_data();
+		$block_styles = $data['styles']['blocks'] ?? array();
+		$actual       = array_intersect_key(
+			$block_styles,
+			array_flip( array( 'core/button', 'core/media-text', 'core/heading' ) )
+		);
+		$expected     = array(
+			'core/button'     => array(
+				'variations' => array(
+					'outline' => array(
+						'color' => array(
+							'background' => 'red',
+							'text'       => 'white',
+						),
+					),
+				),
+			),
+			'core/media-text' => array(
+				'variations' => array(
+					'block-style-variation-a' => array(
+						'color'      => array(
+							'background' => 'blue',
+							'gradient'   => 'var(--custom)',
+							'text'       => 'aliceblue',
+						),
+						'typography' => array(
+							'fontSize'   => '1.5em',
+							'lineHeight' => '1.4em',
+						),
+					),
+				),
+			),
+			'core/heading'    => array(
+				'variations' => array(
+					'block-style-variation-b' => array(
+						'typography' => array(
+							'fontSize' => '3em',
+						),
+					),
+				),
+			),
+		);
+
+		unregister_block_style( 'core/heading', 'block-style-variation-b' );
+		unregister_block_style( 'core/media-text', 'block-style-variation-a' );
+
+		$this->assertSameSetsWithIndex( $expected, $actual, 'Merged variation styles do not match.' );
+	}
 }
diff --git a/phpunit/class-wp-theme-json-schema-test.php b/phpunit/class-wp-theme-json-schema-test.php
new file mode 100644
index 00000000000000..24a7cf0e2e43d2
--- /dev/null
+++ b/phpunit/class-wp-theme-json-schema-test.php
@@ -0,0 +1,283 @@
+<?php
+
+/**
+ * Test WP_Theme_JSON_Schema_Gutenberg class.
+ *
+ * @package Gutenberg
+ *
+ * @since 5.9.0
+ */
+class WP_Theme_JSON_Schema_Gutenberg_Test extends WP_UnitTestCase {
+	public function test_migrate_v1_to_latest() {
+		$theme_json_v1 = array(
+			'version'  => 1,
+			'settings' => array(
+				'color'      => array(
+					'palette' => array(
+						array(
+							'name'  => 'Pale Pink',
+							'slug'  => 'pale-pink',
+							'color' => '#f78da7',
+						),
+						array(
+							'name'  => 'Vivid Red',
+							'slug'  => 'vivid-red',
+							'color' => '#cf2e2e',
+						),
+					),
+					'custom'  => false,
+					'link'    => true,
+				),
+				'border'     => array(
+					'color'        => false,
+					'customRadius' => false,
+					'style'        => false,
+					'width'        => false,
+				),
+				'typography' => array(
+					'fontSizes'      => array(
+						array(
+							'name' => 'Small',
+							'slug' => 'small',
+							'size' => 12,
+						),
+						array(
+							'name' => 'Normal',
+							'slug' => 'normal',
+							'size' => 16,
+						),
+					),
+					'fontStyle'      => false,
+					'fontWeight'     => false,
+					'letterSpacing'  => false,
+					'textDecoration' => false,
+					'textTransform'  => false,
+				),
+				'blocks'     => array(
+					'core/group' => array(
+						'border'     => array(
+							'color'        => true,
+							'customRadius' => true,
+							'style'        => true,
+							'width'        => true,
+						),
+						'typography' => array(
+							'fontStyle'      => true,
+							'fontWeight'     => true,
+							'letterSpacing'  => true,
+							'textDecoration' => true,
+							'textTransform'  => true,
+						),
+					),
+				),
+			),
+			'styles'   => array(
+				'color'    => array(
+					'background' => 'purple',
+				),
+				'blocks'   => array(
+					'core/group' => array(
+						'color'    => array(
+							'background' => 'red',
+						),
+						'spacing'  => array(
+							'padding' => array(
+								'top' => '10px',
+							),
+						),
+						'elements' => array(
+							'link' => array(
+								'color' => array(
+									'text' => 'yellow',
+								),
+							),
+						),
+					),
+				),
+				'elements' => array(
+					'link' => array(
+						'color' => array(
+							'text' => 'red',
+						),
+					),
+				),
+			),
+		);
+
+		$actual = WP_Theme_JSON_Schema_Gutenberg::migrate( $theme_json_v1 );
+
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'      => array(
+					'palette' => array(
+						array(
+							'name'  => 'Pale Pink',
+							'slug'  => 'pale-pink',
+							'color' => '#f78da7',
+						),
+						array(
+							'name'  => 'Vivid Red',
+							'slug'  => 'vivid-red',
+							'color' => '#cf2e2e',
+						),
+					),
+					'custom'  => false,
+					'link'    => true,
+				),
+				'border'     => array(
+					'color'  => false,
+					'radius' => false,
+					'style'  => false,
+					'width'  => false,
+				),
+				'typography' => array(
+					'defaultFontSizes' => false,
+					'fontSizes'        => array(
+						array(
+							'name' => 'Small',
+							'slug' => 'small',
+							'size' => 12,
+						),
+						array(
+							'name' => 'Normal',
+							'slug' => 'normal',
+							'size' => 16,
+						),
+					),
+					'fontStyle'        => false,
+					'fontWeight'       => false,
+					'letterSpacing'    => false,
+					'textDecoration'   => false,
+					'textTransform'    => false,
+				),
+				'blocks'     => array(
+					'core/group' => array(
+						'border'     => array(
+							'color'  => true,
+							'radius' => true,
+							'style'  => true,
+							'width'  => true,
+						),
+						'typography' => array(
+							'fontStyle'      => true,
+							'fontWeight'     => true,
+							'letterSpacing'  => true,
+							'textDecoration' => true,
+							'textTransform'  => true,
+						),
+					),
+				),
+			),
+			'styles'   => array(
+				'color'    => array(
+					'background' => 'purple',
+				),
+				'blocks'   => array(
+					'core/group' => array(
+						'color'    => array(
+							'background' => 'red',
+						),
+						'spacing'  => array(
+							'padding' => array(
+								'top' => '10px',
+							),
+						),
+						'elements' => array(
+							'link' => array(
+								'color' => array(
+									'text' => 'yellow',
+								),
+							),
+						),
+					),
+				),
+				'elements' => array(
+					'link' => array(
+						'color' => array(
+							'text' => 'red',
+						),
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_migrate_v2_to_latest() {
+		$theme_json_v2 = array(
+			'version'  => 2,
+			'settings' => array(
+				'typography' => array(
+					'fontSizes' => array(
+						array(
+							'name' => 'Small',
+							'slug' => 'small',
+							'size' => 12,
+						),
+						array(
+							'name' => 'Normal',
+							'slug' => 'normal',
+							'size' => 16,
+						),
+					),
+				),
+				'spacing'    => array(
+					'spacingSizes' => array(
+						array(
+							'name' => 'Small',
+							'slug' => 20,
+							'size' => '20px',
+						),
+						array(
+							'name' => 'Large',
+							'slug' => 80,
+							'size' => '80px',
+						),
+					),
+				),
+			),
+		);
+
+		$actual = WP_Theme_JSON_Schema_Gutenberg::migrate( $theme_json_v2 );
+
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'typography' => array(
+					'defaultFontSizes' => false,
+					'fontSizes'        => array(
+						array(
+							'name' => 'Small',
+							'slug' => 'small',
+							'size' => 12,
+						),
+						array(
+							'name' => 'Normal',
+							'slug' => 'normal',
+							'size' => 16,
+						),
+					),
+				),
+				'spacing'    => array(
+					'defaultSpacingSizes' => false,
+					'spacingSizes'        => array(
+						array(
+							'name' => 'Small',
+							'slug' => 20,
+							'size' => '20px',
+						),
+						array(
+							'name' => 'Large',
+							'slug' => 80,
+							'size' => '80px',
+						),
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+}
diff --git a/phpunit/class-wp-theme-json-test.php b/phpunit/class-wp-theme-json-test.php
index 89900d45893d91..29d454f6f4f0b0 100644
--- a/phpunit/class-wp-theme-json-test.php
+++ b/phpunit/class-wp-theme-json-test.php
@@ -4,6 +4,8 @@
  * Test WP_Theme_JSON_Gutenberg class.
  *
  * @package Gutenberg
+ *
+ * @covers WP_Theme_JSON_Gutenberg
  */
 
 class WP_Theme_JSON_Gutenberg_Test extends WP_UnitTestCase {
@@ -21,6 +23,13 @@ class WP_Theme_JSON_Gutenberg_Test extends WP_UnitTestCase {
 	 */
 	private static $user_id;
 
+	/**
+	 * Base Styles.
+	 *
+	 * @var string
+	 */
+	private static $base_styles = ':where(body) { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}.is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}';
+
 	public static function set_up_before_class() {
 		parent::set_up_before_class();
 
@@ -37,171 +46,387 @@ public static function set_up_before_class() {
 		static::$user_id = self::factory()->user->create();
 	}
 
-	public function test_get_stylesheet_generates_layout_styles() {
+	/**
+	 * Pretty print CSS in test assertions so that it provides a better diff when a test fails.
+	 * Without this: the failing test outputs the entire css string as being different.
+	 * With this: the failing test only highlights the specific CSS rule that is different.
+	 *
+	 * @param string $css A string of raw css with no line breaks.
+	 * @return string The css with line breaks.
+	 */
+	private static function pretty_print_css( $css ) {
+		$css = str_replace( '{', " {\n", $css );
+		$css = str_replace( '}', "}\n\n", $css );
+		$css = str_replace( ';', ";\n", $css );
+		return $css;
+	}
+
+	/**
+	 * Asserts that two CSS strings are equivalent, but outputs
+	 * pretty printed test failures along with the raw css.
+	 *
+	 * - The pretty printed assertions are useful for understanding what actually changed.
+	 * - The raw css is included as it's useful for updating the test case's expected CSS.
+	 *
+	 * Inspired by:
+	 * https://stackoverflow.com/questions/6832263/phpunit-assertion-failed-but-i-want-to-continue-testing
+	 *
+	 * @param string $expected The expected CSS.
+	 * @param string $actual   The actual CSS.
+	 */
+	private function assertSameCSS( $expected, $actual, $message = '' ) {
+		$pretty_expected = self::pretty_print_css( $expected );
+		$pretty_actual   = self::pretty_print_css( $actual );
+
+		try {
+			$this->assertSame( $pretty_expected, $pretty_actual, $message );
+		} catch ( PHPUnit_Framework_ExpectationFailedException $e ) {
+			// Test failures are thrown as exceptions by PHPUnit.
+			// Catch the exception and re-throw it, but with the
+			// raw css appended.
+			$raw_actual_output =
+				"\n\nIf the change is expected, update the test case to this CSS:\n$actual";
+			throw new PHPUnit_Framework_ExpectationFailedException(
+				"$e$raw_actual_output"
+			);
+		}
+	}
+
+	public function test_get_settings() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'spacing' => array(
-						'blockGap' => true,
+					'color'       => array(
+						'custom' => false,
+					),
+					'layout'      => array(
+						'contentSize' => 'value',
+						'invalid/key' => 'value',
+					),
+					'invalid/key' => 'value',
+					'blocks'      => array(
+						'core/group' => array(
+							'color'       => array(
+								'custom' => false,
+							),
+							'invalid/key' => 'value',
+						),
 					),
 				),
 				'styles'   => array(
-					'spacing' => array(
-						'blockGap' => '1em',
+					'elements' => array(
+						'link' => array(
+							'color' => array(
+								'text' => '#111',
+							),
+						),
 					),
 				),
-			),
-			'default'
+			)
 		);
 
-		// Results also include root site blocks styles.
-		$this->assertEquals(
-			'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1em; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: 1em; }:where(body .is-layout-flow)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-flow)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-flow)  > *{margin-block-start: 1em;margin-block-end: 0;}:where(body .is-layout-constrained)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-constrained)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-constrained)  > *{margin-block-start: 1em;margin-block-end: 0;}:where(body .is-layout-flex) {gap: 1em;}:where(body .is-layout-grid) {gap: 1em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}',
-			$theme_json->get_stylesheet( array( 'styles' ) )
+		$actual = $theme_json->get_settings();
+
+		$expected = array(
+			'color'  => array(
+				'custom' => false,
+			),
+			'layout' => array(
+				'contentSize' => 'value',
+			),
+			'blocks' => array(
+				'core/group' => array(
+					'color' => array(
+						'custom' => false,
+					),
+				),
+			),
 		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
-	public function test_get_stylesheet_generates_valid_block_gap_values_and_skips_null_or_false_values() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+	public function test_get_settings_presets_are_keyed_by_origin() {
+		$default_origin = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'spacing' => array(
-						'blockGap' => true,
+					'color'       => array(
+						'palette' => array(
+							array(
+								'slug'  => 'white',
+								'color' => 'white',
+							),
+						),
+					),
+					'invalid/key' => 'value',
+					'blocks'      => array(
+						'core/group' => array(
+							'color' => array(
+								'palette' => array(
+									array(
+										'slug'  => 'white',
+										'color' => 'white',
+									),
+								),
+							),
+						),
 					),
 				),
-				'styles'   => array(
-					'spacing' => array(
-						'blockGap' => '1rem',
+			),
+			'default'
+		);
+		$no_origin      = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color'       => array(
+						'palette' => array(
+							array(
+								'slug'  => 'black',
+								'color' => 'black',
+							),
+						),
 					),
-					'blocks'  => array(
-						'core/post-content' => array(
+					'invalid/key' => 'value',
+					'blocks'      => array(
+						'core/group' => array(
 							'color' => array(
-								'text' => 'gray', // This value should not render block layout styles.
+								'palette' => array(
+									array(
+										'slug'  => 'black',
+										'color' => 'black',
+									),
+								),
 							),
 						),
-						'core/social-links' => array(
-							'spacing' => array(
-								'blockGap' => '0', // This value should render block layout gap as zero.
+					),
+				),
+			)
+		);
+
+		$actual_default   = $default_origin->get_raw_data();
+		$actual_no_origin = $no_origin->get_raw_data();
+
+		$expected_default   = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'  => array(
+					'palette' => array(
+						'default' => array(
+							array(
+								'slug'  => 'white',
+								'color' => 'white',
 							),
 						),
-						'core/buttons'      => array(
-							'spacing' => array(
-								'blockGap' => 0, // This value should render block layout gap as zero.
+					),
+				),
+				'blocks' => array(
+					'core/group' => array(
+						'color' => array(
+							'palette' => array(
+								'default' => array(
+									array(
+										'slug'  => 'white',
+										'color' => 'white',
+									),
+								),
 							),
 						),
-						'core/columns'      => array(
-							'spacing' => array(
-								'blockGap' => false, // This value should be ignored. The block will use the global layout value.
+					),
+				),
+			),
+		);
+		$expected_no_origin = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'  => array(
+					'palette' => array(
+						'theme' => array(
+							array(
+								'slug'  => 'black',
+								'color' => 'black',
+							),
+						),
+					),
+				),
+				'blocks' => array(
+					'core/group' => array(
+						'color' => array(
+							'palette' => array(
+								'theme' => array(
+									array(
+										'slug'  => 'black',
+										'color' => 'black',
+									),
+								),
 							),
 						),
 					),
 				),
 			),
-			'default'
 		);
 
-		$this->assertEquals(
-			'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1rem; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: 1rem; }:where(body .is-layout-flow)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-flow)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-flow)  > *{margin-block-start: 1rem;margin-block-end: 0;}:where(body .is-layout-constrained)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-constrained)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-constrained)  > *{margin-block-start: 1rem;margin-block-end: 0;}:where(body .is-layout-flex) {gap: 1rem;}:where(body .is-layout-grid) {gap: 1rem;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}' .
-			'.wp-block-post-content{color: gray;}.wp-block-social-links-is-layout-flow > :first-child:first-child{margin-block-start: 0;}.wp-block-social-links-is-layout-flow > :last-child:last-child{margin-block-end: 0;}.wp-block-social-links-is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links-is-layout-constrained > :first-child:first-child{margin-block-start: 0;}.wp-block-social-links-is-layout-constrained > :last-child:last-child{margin-block-end: 0;}.wp-block-social-links-is-layout-constrained > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links-is-layout-flex{gap: 0;}.wp-block-social-links-is-layout-grid{gap: 0;}.wp-block-buttons-is-layout-flow > :first-child:first-child{margin-block-start: 0;}.wp-block-buttons-is-layout-flow > :last-child:last-child{margin-block-end: 0;}.wp-block-buttons-is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons-is-layout-constrained > :first-child:first-child{margin-block-start: 0;}.wp-block-buttons-is-layout-constrained > :last-child:last-child{margin-block-end: 0;}.wp-block-buttons-is-layout-constrained > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons-is-layout-flex{gap: 0;}.wp-block-buttons-is-layout-grid{gap: 0;}',
-			$theme_json->get_stylesheet()
-		);
+		$this->assertEqualSetsWithIndex( $expected_default, $actual_default );
+		$this->assertEqualSetsWithIndex( $expected_no_origin, $actual_no_origin );
 	}
 
-	public function test_get_stylesheet_generates_layout_styles_with_spacing_presets() {
+	public function test_get_settings_appearance_true_opts_in() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'spacing' => array(
-						'blockGap' => true,
+					'appearanceTools' => true,
+					'spacing'         => array(
+						'blockGap' => false, // This should override appearanceTools.
 					),
-				),
-				'styles'   => array(
-					'spacing' => array(
-						'blockGap' => 'var:preset|spacing|60',
+					'blocks'          => array(
+						'core/paragraph' => array(
+							'typography' => array(
+								'lineHeight' => false,
+							),
+						),
+						'core/group'     => array(
+							'appearanceTools' => true,
+							'typography'      => array(
+								'lineHeight' => false, // This should override appearanceTools.
+							),
+							'spacing'         => array(
+								'blockGap' => null,
+							),
+						),
 					),
 				),
-			),
-			'default'
-		);
-
-		// Results also include root site blocks styles.
-		$this->assertEquals(
-			'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: var(--wp--preset--spacing--60); margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: var(--wp--preset--spacing--60); }:where(body .is-layout-flow)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-flow)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-flow)  > *{margin-block-start: var(--wp--preset--spacing--60);margin-block-end: 0;}:where(body .is-layout-constrained)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-constrained)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-constrained)  > *{margin-block-start: var(--wp--preset--spacing--60);margin-block-end: 0;}:where(body .is-layout-flex) {gap: var(--wp--preset--spacing--60);}:where(body .is-layout-grid) {gap: var(--wp--preset--spacing--60);}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}',
-			$theme_json->get_stylesheet( array( 'styles' ) )
+			)
 		);
-	}
 
-	public function test_get_stylesheet_generates_fallback_gap_layout_styles() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
-			array(
-				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-				'settings' => array(
-					'spacing' => array(
-						'blockGap' => null,
+		$actual   = $theme_json->get_settings();
+		$expected = array(
+			'background' => array(
+				'backgroundImage' => true,
+				'backgroundSize'  => true,
+			),
+			'border'     => array(
+				'width'  => true,
+				'style'  => true,
+				'radius' => true,
+				'color'  => true,
+			),
+			'color'      => array(
+				'link'    => true,
+				'heading' => true,
+				'button'  => true,
+				'caption' => true,
+			),
+			'dimensions' => array(
+				'aspectRatio' => true,
+				'minHeight'   => true,
+			),
+			'position'   => array(
+				'sticky' => true,
+				'fixed'  => true,
+			),
+			'spacing'    => array(
+				'blockGap' => false,
+				'margin'   => true,
+				'padding'  => true,
+			),
+			'typography' => array(
+				'lineHeight' => true,
+			),
+			'blocks'     => array(
+				'core/paragraph' => array(
+					'typography' => array(
+						'lineHeight' => false,
 					),
 				),
-				'styles'   => array(
-					'spacing' => array(
-						'blockGap' => '1em',
+				'core/group'     => array(
+					'background' => array(
+						'backgroundImage' => true,
+						'backgroundSize'  => true,
+					),
+					'border'     => array(
+						'width'  => true,
+						'style'  => true,
+						'radius' => true,
+						'color'  => true,
+					),
+					'color'      => array(
+						'link'    => true,
+						'heading' => true,
+						'button'  => true,
+						'caption' => true,
+					),
+					'dimensions' => array(
+						'aspectRatio' => true,
+						'minHeight'   => true,
+					),
+					'position'   => array(
+						'sticky' => true,
+						'fixed'  => true,
+					),
+					'spacing'    => array(
+						'blockGap' => false,
+						'margin'   => true,
+						'padding'  => true,
+					),
+					'typography' => array(
+						'lineHeight' => false,
 					),
 				),
 			),
-			'default'
 		);
-		$stylesheet = $theme_json->get_stylesheet( array( 'styles' ) );
 
-		// Results also include root site blocks styles.
-		$this->assertEquals(
-			'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}',
-			$stylesheet
-		);
+		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
-	public function test_get_stylesheet_generates_base_fallback_gap_layout_styles() {
+	public function test_get_settings_appearance_false_does_not_opt_in() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'spacing' => array(
-						'blockGap' => null,
+					'appearanceTools' => false,
+					'border'          => array(
+						'width' => true,
+					),
+					'blocks'          => array(
+						'core/paragraph' => array(
+							'typography' => array(
+								'lineHeight' => false,
+							),
+						),
+						'core/group'     => array(
+							'typography' => array(
+								'lineHeight' => false,
+							),
+						),
 					),
 				),
-			),
-			'default'
-		);
-		$stylesheet = $theme_json->get_stylesheet( array( 'base-layout-styles' ) );
-
-		// Note the `base-layout-styles` includes a fallback gap for the Columns block for backwards compatibility.
-		$this->assertEquals(
-			':where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}:where(.wp-block-columns.is-layout-flex){gap: 2em;}:where(.wp-block-columns.is-layout-grid){gap: 2em;}:where(.wp-block-post-template.is-layout-flex){gap: 1.25em;}:where(.wp-block-post-template.is-layout-grid){gap: 1.25em;}',
-			$stylesheet
+			)
 		);
-	}
 
-	public function test_get_stylesheet_skips_layout_styles() {
-		add_theme_support( 'disable-layout-styles' );
-		$theme_json = new WP_Theme_JSON_Gutenberg(
-			array(
-				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-				'settings' => array(
-					'spacing' => array(
-						'blockGap' => null,
+		$actual   = $theme_json->get_settings();
+		$expected = array(
+			'appearanceTools' => false,
+			'border'          => array(
+				'width' => true,
+			),
+			'blocks'          => array(
+				'core/paragraph' => array(
+					'typography' => array(
+						'lineHeight' => false,
+					),
+				),
+				'core/group'     => array(
+					'typography' => array(
+						'lineHeight' => false,
 					),
 				),
 			),
-			'default'
 		);
-		$stylesheet = $theme_json->get_stylesheet( array( 'base-layout-styles' ) );
-		remove_theme_support( 'disable-layout-styles' );
 
-		// All Layout styles should be skipped.
-		$this->assertEquals(
-			'',
-			$stylesheet
-		);
+		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
 	public function test_get_stylesheet() {
@@ -210,13 +435,27 @@ public function test_get_stylesheet() {
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
 					'color'      => array(
-						'text'    => 'value',
-						'palette' => array(
+						'text'      => 'value',
+						'palette'   => array(
 							array(
 								'slug'  => 'grey',
 								'color' => 'grey',
 							),
 						),
+						'gradients' => array(
+							array(
+								'gradient' => 'linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%)',
+								'name'     => 'Custom gradient',
+								'slug'     => 'custom-gradient',
+							),
+						),
+						'duotone'   => array(
+							array(
+								'colors' => array( '#333333', '#aaaaaa' ),
+								'name'   => 'Custom Duotone',
+								'slug'   => 'custom-duotone',
+							),
+						),
 					),
 					'typography' => array(
 						'fontFamilies' => array(
@@ -257,15 +496,26 @@ public function test_get_stylesheet() {
 					),
 					'misc'     => 'value',
 					'elements' => array(
-						'link' => array(
+						'link'   => array(
 							'color' => array(
 								'text'       => '#111',
 								'background' => '#333',
 							),
 						),
+						'button' => array(
+							'shadow' => '10px 10px 5px 0px rgba(0,0,0,0.66)',
+						),
 					),
 					'blocks'   => array(
+						'core/cover'        => array(
+							'dimensions' => array(
+								'aspectRatio' => '16/9',
+							),
+						),
 						'core/group'        => array(
+							'color'      => array(
+								'gradient' => 'var:preset|gradient|custom-gradient',
+							),
 							'border'     => array(
 								'radius' => '10px',
 							),
@@ -299,6 +549,11 @@ public function test_get_stylesheet() {
 								),
 							),
 						),
+						'core/media-text'   => array(
+							'typography' => array(
+								'textAlign' => 'center',
+							),
+						),
 						'core/post-date'    => array(
 							'color'    => array(
 								'text' => '#123456',
@@ -329,44 +584,59 @@ public function test_get_stylesheet() {
 									'bottom' => '30px',
 								),
 							),
+							'filter'  => array(
+								'duotone' => 'var:preset|duotone|custom-duotone',
+							),
 						),
 					),
+					'spacing'  => array(
+						'blockGap' => '24px',
+					),
 				),
 				'misc'     => 'value',
 			)
 		);
 
-		$variables = 'body{--wp--preset--color--grey: grey;--wp--preset--font-size--small: 14px;--wp--preset--font-size--big: 41px;--wp--preset--font-family--arial: Arial, serif;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}';
-		$styles    = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}.wp-block-group{border-radius: 10px;min-height: 50vh;padding: 24px;}.wp-block-group a:where(:not(.wp-element-button)){color: #111;}.wp-block-heading{color: #123456;}.wp-block-heading a:where(:not(.wp-element-button)){background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a:where(:not(.wp-element-button)){background-color: #777;color: #555;}.wp-block-post-excerpt{column-count: 2;}.wp-block-image{margin-bottom: 30px;}.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
-		$presets   = '.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-small-font-size{font-size: var(--wp--preset--font-size--small) !important;}.has-big-font-size{font-size: var(--wp--preset--font-size--big) !important;}.has-arial-font-family{font-family: var(--wp--preset--font-family--arial) !important;}';
-
-		$all = $variables . $styles . $presets;
+		$variables = ':root{--wp--preset--color--grey: grey;--wp--preset--gradient--custom-gradient: linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%);--wp--preset--font-size--small: 14px;--wp--preset--font-size--big: 41px;--wp--preset--font-family--arial: Arial, serif;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}';
+		$styles    = static::$base_styles . 'body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}:root :where(.wp-element-button, .wp-block-button__link){box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.66);}:root :where(.wp-block-cover){min-height: unset;aspect-ratio: 16/9;}:root :where(.wp-block-group){background: var(--wp--preset--gradient--custom-gradient);border-radius: 10px;min-height: 50vh;padding: 24px;}:root :where(.wp-block-group a:where(:not(.wp-element-button))){color: #111;}:root :where(.wp-block-heading){color: #123456;}:root :where(.wp-block-heading a:where(:not(.wp-element-button))){background-color: #333;color: #111;font-size: 60px;}:root :where(.wp-block-media-text){text-align: center;}:root :where(.wp-block-post-date){color: #123456;}:root :where(.wp-block-post-date a:where(:not(.wp-element-button))){background-color: #777;color: #555;}:root :where(.wp-block-post-excerpt){column-count: 2;}:root :where(.wp-block-image){margin-bottom: 30px;}:root :where(.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder){border-top-left-radius: 10px;border-bottom-right-radius: 1em;}:root :where(.wp-block-image img, .wp-block-image .components-placeholder){filter: var(--wp--preset--duotone--custom-duotone);}';
+		$presets   = '.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-custom-gradient-gradient-background{background: var(--wp--preset--gradient--custom-gradient) !important;}.has-small-font-size{font-size: var(--wp--preset--font-size--small) !important;}.has-big-font-size{font-size: var(--wp--preset--font-size--big) !important;}.has-arial-font-family{font-family: var(--wp--preset--font-family--arial) !important;}';
+		$all       = $variables . $styles . $presets;
 
-		$this->assertEquals( $all, $theme_json->get_stylesheet() );
-		$this->assertEquals( $styles, $theme_json->get_stylesheet( array( 'styles' ) ) );
-		$this->assertEquals( $presets, $theme_json->get_stylesheet( array( 'presets' ) ) );
-		$this->assertEquals( $variables, $theme_json->get_stylesheet( array( 'variables' ) ) );
+		$this->assertSameCSS( $variables, $theme_json->get_stylesheet( array( 'variables' ) ) );
+		$this->assertSameCSS( $styles, $theme_json->get_stylesheet( array( 'styles' ) ) );
+		$this->assertSameCSS( $presets, $theme_json->get_stylesheet( array( 'presets' ) ) );
+		$this->assertSameCSS( $all, $theme_json->get_stylesheet() );
 	}
 
-	/**
-	 * Tests generating the spacing presets array based on the spacing scale provided.
-	 *
-	 * @dataProvider data_set_spacing_sizes_when_invalid
-	 */
-	public function test_shadow_preset_styles() {
+	public function test_get_styles_for_block_support_for_shorthand_and_longhand_values() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-				'settings' => array(
-					'shadow' => array(
-						'presets' => array(
-							array(
-								'slug'   => 'natural',
-								'shadow' => '5px 5px 5px 0 black',
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'blocks' => array(
+						'core/group' => array(
+							'border'  => array(
+								'radius' => '10px',
 							),
-							array(
-								'slug'   => 'sharp',
-								'shadow' => '5px 5px black',
+							'spacing' => array(
+								'padding' => '24px',
+								'margin'  => '1em',
+							),
+						),
+						'core/image' => array(
+							'border'  => array(
+								'radius' => array(
+									'topLeft'     => '10px',
+									'bottomRight' => '1em',
+								),
+							),
+							'spacing' => array(
+								'padding' => array(
+									'top' => '15px',
+								),
+								'margin'  => array(
+									'bottom' => '30px',
+								),
 							),
 						),
 					),
@@ -374,51 +644,193 @@ public function test_shadow_preset_styles() {
 			)
 		);
 
-		$styles = 'body{--wp--preset--shadow--natural: 5px 5px 5px 0 black;--wp--preset--shadow--sharp: 5px 5px black;}';
-		$this->assertEquals( $styles, $theme_json->get_stylesheet() );
-		$this->assertEquals( $styles, $theme_json->get_stylesheet( array( 'variables' ) ) );
+		$group_node = array(
+			'name'      => 'core/group',
+			'path'      => array( 'styles', 'blocks', 'core/group' ),
+			'selector'  => '.wp-block-group',
+			'selectors' => array(
+				'root' => '.wp-block-group',
+			),
+		);
+		$image_node = array(
+			'name'      => 'core/image',
+			'path'      => array( 'styles', 'blocks', 'core/image' ),
+			'selector'  => '.wp-block-image',
+			'selectors' => array(
+				'root'   => '.wp-block-image',
+				'border' => '.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder',
+			),
+		);
+
+		$group_styles = ':root :where(.wp-block-group){border-radius: 10px;margin: 1em;padding: 24px;}';
+		$image_styles = ':root :where(.wp-block-image){margin-bottom: 30px;padding-top: 15px;}:root :where(.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder){border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
+		$this->assertSameCSS( $group_styles, $theme_json->get_styles_for_block( $group_node ) );
+		$this->assertSameCSS( $image_styles, $theme_json->get_styles_for_block( $image_node ) );
 	}
 
-	public function test_get_shadow_styles_for_blocks() {
+	public function test_get_stylesheet_skips_disabled_protected_properties() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'shadow' => array(
-						'presets' => array(
-							array(
-								'slug'   => 'natural',
-								'shadow' => '5px 5px 0 0 black',
+					'spacing' => array(
+						'blockGap' => null,
+					),
+				),
+				'styles'   => array(
+					'spacing' => array(
+						'blockGap' => '1em',
+					),
+					'blocks'  => array(
+						'core/columns' => array(
+							'spacing' => array(
+								'blockGap' => '24px',
 							),
 						),
 					),
 				),
+			)
+		);
+
+		$expected = static::$base_styles . ':where(.wp-block-columns.is-layout-flex){gap: 2em;}:where(.wp-block-columns.is-layout-grid){gap: 2em;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet() );
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
+	}
+
+	public function test_get_stylesheet_renders_enabled_protected_properties() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'spacing' => array(
+						'blockGap' => true,
+					),
+				),
 				'styles'   => array(
-					'blocks'   => array(
-						'core/paragraph' => array(
-							'shadow' => 'var(--wp--preset--shadow--natural)',
+					'spacing' => array(
+						'blockGap' => '1em',
+					),
+				),
+			)
+		);
+
+		$expected = ':where(body) { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1em; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child { margin-block-end: 0; }:root { --wp--style--block-gap: 1em; }:root :where(.is-layout-flow) > :first-child{margin-block-start: 0;}:root :where(.is-layout-flow) > :last-child{margin-block-end: 0;}:root :where(.is-layout-flow) > *{margin-block-start: 1em;margin-block-end: 0;}:root :where(.is-layout-constrained) > :first-child{margin-block-start: 0;}:root :where(.is-layout-constrained) > :last-child{margin-block-end: 0;}:root :where(.is-layout-constrained) > *{margin-block-start: 1em;margin-block-end: 0;}:root :where(.is-layout-flex){gap: 1em;}:root :where(.is-layout-grid){gap: 1em;}.is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet() );
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
+	}
+
+	public function test_get_stylesheet_preset_classes_work_with_compounded_selectors() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'blocks' => array(
+						'core/heading' => array(
+							'color' => array(
+								'palette' => array(
+									array(
+										'slug'  => 'white',
+										'color' => '#fff',
+									),
+								),
+							),
 						),
 					),
-					'elements' => array(
-						'button' => array(
-							'shadow' => 'var:preset|shadow|natural',
+				),
+			)
+		);
+
+		$this->assertSameCSS(
+			'.wp-block-heading.has-white-color{color: var(--wp--preset--color--white) !important;}.wp-block-heading.has-white-background-color{background-color: var(--wp--preset--color--white) !important;}.wp-block-heading.has-white-border-color{border-color: var(--wp--preset--color--white) !important;}',
+			$theme_json->get_stylesheet( array( 'presets' ) )
+		);
+	}
+
+	public function test_get_stylesheet_preset_rules_come_after_block_rules() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'blocks' => array(
+						'core/group' => array(
+							'color' => array(
+								'palette' => array(
+									array(
+										'slug'  => 'grey',
+										'color' => 'grey',
+									),
+								),
+							),
 						),
-						'link'   => array(
-							'shadow' => array( 'ref' => 'styles.elements.button.shadow' ),
+					),
+				),
+				'styles'   => array(
+					'blocks' => array(
+						'core/group' => array(
+							'color' => array(
+								'text' => 'red',
+							),
 						),
 					),
 				),
 			)
 		);
 
-		$global_styles  = 'body{--wp--preset--shadow--natural: 5px 5px 0 0 black;}body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-		$element_styles = 'a:where(:not(.wp-element-button)){box-shadow: var(--wp--preset--shadow--natural);}.wp-element-button, .wp-block-button__link{box-shadow: var(--wp--preset--shadow--natural);}p{box-shadow: var(--wp--preset--shadow--natural);}';
-		$styles         = $global_styles . $element_styles;
+		$styles    = ':root :where(.wp-block-group){color: red;}';
+		$presets   = '.wp-block-group.has-grey-color{color: var(--wp--preset--color--grey) !important;}.wp-block-group.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.wp-block-group.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}';
+		$variables = '.wp-block-group{--wp--preset--color--grey: grey;}';
+
+		$all = $variables . $styles . $presets;
+
+		$this->assertSameCSS( $all, $theme_json->get_stylesheet( array( 'styles', 'presets', 'variables' ), null, array( 'skip_root_layout_styles' => true ) ) );
+		$this->assertSameCSS( $styles, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
+		$this->assertSameCSS( $presets, $theme_json->get_stylesheet( array( 'presets' ) ) );
+		$this->assertSameCSS( $variables, $theme_json->get_stylesheet( array( 'variables' ) ) );
+	}
+
+	public function test_get_stylesheet_generates_proper_classes_and_css_vars_from_slugs() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color'  => array(
+						'palette' => array(
+							array(
+								'slug'  => 'grey',
+								'color' => 'grey',
+							),
+							array(
+								'slug'  => 'dark grey',
+								'color' => 'grey',
+							),
+							array(
+								'slug'  => 'light-grey',
+								'color' => 'grey',
+							),
+							array(
+								'slug'  => 'white2black',
+								'color' => 'grey',
+							),
+						),
+					),
+					'custom' => array(
+						'white2black' => 'value',
+					),
+				),
+			)
+		);
 
-		$this->assertEquals( $styles, $theme_json->get_stylesheet() );
+		$this->assertSameCSS(
+			'.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-dark-grey-color{color: var(--wp--preset--color--dark-grey) !important;}.has-light-grey-color{color: var(--wp--preset--color--light-grey) !important;}.has-white-2-black-color{color: var(--wp--preset--color--white-2-black) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-dark-grey-background-color{background-color: var(--wp--preset--color--dark-grey) !important;}.has-light-grey-background-color{background-color: var(--wp--preset--color--light-grey) !important;}.has-white-2-black-background-color{background-color: var(--wp--preset--color--white-2-black) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-dark-grey-border-color{border-color: var(--wp--preset--color--dark-grey) !important;}.has-light-grey-border-color{border-color: var(--wp--preset--color--light-grey) !important;}.has-white-2-black-border-color{border-color: var(--wp--preset--color--white-2-black) !important;}',
+			$theme_json->get_stylesheet( array( 'presets' ) )
+		);
+		$this->assertSameCSS(
+			':root{--wp--preset--color--grey: grey;--wp--preset--color--dark-grey: grey;--wp--preset--color--light-grey: grey;--wp--preset--color--white-2-black: grey;--wp--custom--white-2-black: value;}',
+			$theme_json->get_stylesheet( array( 'variables' ) )
+		);
 	}
 
-	public function test_get_stylesheet_handles_whitelisted_element_pseudo_selectors() {
+	public function test_get_styles_for_block_handles_whitelisted_element_pseudo_selectors() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
@@ -451,16 +863,31 @@ public function test_get_stylesheet_handles_whitelisted_element_pseudo_selectors
 			)
 		);
 
-		$base_styles = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-
-		$element_styles = 'a:where(:not(.wp-element-button)){background-color: red;color: green;}a:where(:not(.wp-element-button)):hover{background-color: green;color: red;font-size: 10em;text-transform: uppercase;}a:where(:not(.wp-element-button)):focus{background-color: black;color: yellow;}';
+		$link_node  = array(
+			'path'     => array( 'styles', 'elements', 'link' ),
+			'selector' => 'a:where(:not(.wp-element-button))',
+		);
+		$hover_node = array(
+			'path'     => array( 'styles', 'elements', 'link' ),
+			'selector' => 'a:where(:not(.wp-element-button)):hover',
+		);
+		$focus_node = array(
+			'path'     => array( 'styles', 'elements', 'link' ),
+			'selector' => 'a:where(:not(.wp-element-button)):focus',
+		);
 
-		$expected = $base_styles . $element_styles;
+		$link_style  = 'a:where(:not(.wp-element-button)){background-color: red;color: green;}';
+		$hover_style = ':root :where(a:where(:not(.wp-element-button)):hover){background-color: green;color: red;font-size: 10em;text-transform: uppercase;}';
+		$focus_style = ':root :where(a:where(:not(.wp-element-button)):focus){background-color: black;color: yellow;}';
 
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
-		$this->assertEquals( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
+		$this->assertSameCSS( $link_style, $theme_json->get_styles_for_block( $link_node ) );
+		$this->assertSameCSS( $hover_style, $theme_json->get_styles_for_block( $hover_node ) );
+		$this->assertSameCSS( $focus_style, $theme_json->get_styles_for_block( $focus_node ) );
 	}
 
+	/**
+	 * Tests that if an element has nothing but pseudo selector styles, they are still output by get_stylesheet.
+	 */
 	public function test_get_stylesheet_handles_only_pseudo_selector_rules_for_given_property() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
@@ -490,14 +917,8 @@ public function test_get_stylesheet_handles_only_pseudo_selector_rules_for_given
 			)
 		);
 
-		$base_styles = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-
-		$element_styles = 'a:where(:not(.wp-element-button)):hover{background-color: green;color: red;font-size: 10em;text-transform: uppercase;}a:where(:not(.wp-element-button)):focus{background-color: black;color: yellow;}';
-
-		$expected = $base_styles . $element_styles;
-
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
-		$this->assertEquals( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
+		$expected = ':root :where(a:where(:not(.wp-element-button)):hover){background-color: green;color: red;font-size: 10em;text-transform: uppercase;}:root :where(a:where(:not(.wp-element-button)):focus){background-color: black;color: yellow;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
 	}
 
 	public function test_get_stylesheet_ignores_pseudo_selectors_on_non_whitelisted_elements() {
@@ -529,14 +950,8 @@ public function test_get_stylesheet_ignores_pseudo_selectors_on_non_whitelisted_
 			)
 		);
 
-		$base_styles = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-
-		$element_styles = 'h4{background-color: red;color: green;}';
-
-		$expected = $base_styles . $element_styles;
-
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
-		$this->assertEquals( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
+		$expected = 'h4{background-color: red;color: green;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
 	}
 
 	public function test_get_stylesheet_ignores_non_whitelisted_pseudo_selectors() {
@@ -568,17 +983,15 @@ public function test_get_stylesheet_ignores_non_whitelisted_pseudo_selectors() {
 			)
 		);
 
-		$base_styles = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-
-		$element_styles = 'a:where(:not(.wp-element-button)){background-color: red;color: green;}a:where(:not(.wp-element-button)):hover{background-color: green;color: red;}';
-
-		$expected = $base_styles . $element_styles;
-
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
-		$this->assertEquals( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
+		$expected = 'a:where(:not(.wp-element-button)){background-color: red;color: green;}:root :where(a:where(:not(.wp-element-button)):hover){background-color: green;color: red;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
 		$this->assertStringNotContainsString( 'a:levitate{', $theme_json->get_stylesheet( array( 'styles' ) ) );
 	}
 
+	/**
+	 * Tests that element pseudo selectors are output before block element pseudo selectors, and that whitelisted
+	 * block element pseudo selectors are output correctly.
+	 */
 	public function test_get_stylesheet_handles_priority_of_elements_vs_block_elements_pseudo_selectors() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
@@ -616,79 +1029,19 @@ public function test_get_stylesheet_handles_priority_of_elements_vs_block_elemen
 			)
 		);
 
-		$base_styles = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-
-		$element_styles = '.wp-block-group a:where(:not(.wp-element-button)){background-color: red;color: green;}.wp-block-group a:where(:not(.wp-element-button)):hover{background-color: green;color: red;font-size: 10em;text-transform: uppercase;}.wp-block-group a:where(:not(.wp-element-button)):focus{background-color: black;color: yellow;}';
-
-		$expected = $base_styles . $element_styles;
-
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
-		$this->assertEquals( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
-	}
-
-	public function test_get_stylesheet_handles_whitelisted_block_level_element_pseudo_selectors() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
-			array(
-				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-				'styles'  => array(
-					'elements' => array(
-						'link' => array(
-							'color'  => array(
-								'text'       => 'green',
-								'background' => 'red',
-							),
-							':hover' => array(
-								'color' => array(
-									'text'       => 'red',
-									'background' => 'green',
-								),
-							),
-						),
-					),
-					'blocks'   => array(
-						'core/group' => array(
-							'elements' => array(
-								'link' => array(
-									':hover' => array(
-										'color' => array(
-											'text'       => 'yellow',
-											'background' => 'black',
-										),
-									),
-								),
-							),
-						),
-					),
-				),
-			)
-		);
-
-		$base_styles = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-
-		$element_styles = 'a:where(:not(.wp-element-button)){background-color: red;color: green;}a:where(:not(.wp-element-button)):hover{background-color: green;color: red;}.wp-block-group a:where(:not(.wp-element-button)):hover{background-color: black;color: yellow;}';
-
-		$expected = $base_styles . $element_styles;
-
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
-		$this->assertEquals( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
+		$expected = ':root :where(.wp-block-group a:where(:not(.wp-element-button))){background-color: red;color: green;}:root :where(.wp-block-group a:where(:not(.wp-element-button)):hover){background-color: green;color: red;font-size: 10em;text-transform: uppercase;}:root :where(.wp-block-group a:where(:not(.wp-element-button)):focus){background-color: black;color: yellow;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
 	}
 
 	/**
-	 * This test relies on a block having already been registered prior to
-	 * theme.json generating block metadata. Until a core block, such as Image,
-	 * opts into feature level selectors, we need to register a test block.
-	 * This is achieved via `tests_add_filter()` in Gutenberg's phpunit
-	 * bootstrap. After a core block adopts feature level selectors we could
-	 * remove that filter and instead use the core block for the following test.
+	 * This test checks that feature selectors defined as `__experimentalSelector` inside
+	 * the `supports` property are correctly output in the stylesheet.
 	 */
 	public function test_get_stylesheet_with_deprecated_feature_level_selectors() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'border'     => array(
-						'radius' => true,
-					),
 					'color'      => array(
 						'custom'  => false,
 						'palette' => array(
@@ -698,25 +1051,16 @@ public function test_get_stylesheet_with_deprecated_feature_level_selectors() {
 							),
 						),
 					),
-					'spacing'    => array(
-						'padding' => true,
-					),
 					'typography' => array(
 						'fontSize' => true,
 					),
 				),
 				'styles'   => array(
 					'blocks' => array(
-						'test/test' => array(
-							'border'     => array(
-								'radius' => '9999px',
-							),
+						'core/calendar' => array(
 							'color'      => array(
 								'text' => 'green',
 							),
-							'spacing'    => array(
-								'padding' => '20px',
-							),
 							'typography' => array(
 								'fontSize' => '3em',
 							),
@@ -726,61 +1070,32 @@ public function test_get_stylesheet_with_deprecated_feature_level_selectors() {
 			)
 		);
 
-		$base_styles   = 'body{--wp--preset--color--green: green;}body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-		$block_styles  = '.wp-block-test, .wp-block-test__wrapper{color: green;}.wp-block-test .inner, .wp-block-test__wrapper .inner{border-radius: 9999px;padding: 20px;}.wp-block-test .sub-heading, .wp-block-test__wrapper .sub-heading{font-size: 3em;}';
+		$base_styles   = ':root{--wp--preset--color--green: green;}';
+		$block_styles  = ':root :where(.wp-block-calendar){font-size: 3em;}:root :where(.wp-block-calendar table, .wp-block-calendar th){color: green;}';
 		$preset_styles = '.has-green-color{color: var(--wp--preset--color--green) !important;}.has-green-background-color{background-color: var(--wp--preset--color--green) !important;}.has-green-border-color{border-color: var(--wp--preset--color--green) !important;}';
 		$expected      = $base_styles . $block_styles . $preset_styles;
-
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles', 'presets', 'variables' ), null, array( 'skip_root_layout_styles' => true ) ) );
 	}
 
+
 	/**
-	 * This test relies on a block having already been registered prior to
-	 * theme.json generating block metadata. Until a core block adopts the
-	 * new selectors API, we need to register a test block.
-	 * This is achieved via `tests_add_filter()` in Gutenberg's phpunit
-	 * bootstrap. After a core block adopts feature level selectors we could
-	 * remove that filter and instead use the core block for the following test.
+	 * This test checks that feature selectors defined in the stable `selectors`
+	 * property are correctly output in the stylesheet.
 	 */
 	public function test_get_stylesheet_with_block_json_selectors() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'border'     => array(
+					'border' => array(
 						'radius' => true,
 					),
-					'color'      => array(
-						'custom'  => false,
-						'palette' => array(
-							array(
-								'slug'  => 'green',
-								'color' => 'green',
-							),
-						),
-					),
-					'spacing'    => array(
-						'padding' => true,
-					),
-					'typography' => array(
-						'fontSize' => true,
-					),
 				),
 				'styles'   => array(
 					'blocks' => array(
-						'my/block-with-selectors' => array(
-							'border'     => array(
-								'radius' => '9999px',
-							),
-							'color'      => array(
-								'background' => 'grey',
-								'text'       => 'navy',
-							),
-							'spacing'    => array(
-								'padding' => '20px',
-							),
-							'typography' => array(
-								'fontSize' => '3em',
+						'core/image' => array(
+							'border' => array(
+								'radius' => '374px',
 							),
 						),
 					),
@@ -788,235 +1103,212 @@ public function test_get_stylesheet_with_block_json_selectors() {
 			)
 		);
 
-		$base_styles   = 'body{--wp--preset--color--green: green;}body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-		$block_styles  = '.custom-root-selector{background-color: grey;padding: 20px;}.custom-root-selector img{border-radius: 9999px;}.custom-root-selector > figcaption{color: navy;font-size: 3em;}';
-		$preset_styles = '.has-green-color{color: var(--wp--preset--color--green) !important;}.has-green-background-color{background-color: var(--wp--preset--color--green) !important;}.has-green-border-color{border-color: var(--wp--preset--color--green) !important;}';
-		$expected      = $base_styles . $block_styles . $preset_styles;
-
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
+		$expected = ':root :where(.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder){border-radius: 374px;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles', 'presets', 'variables' ), null, array( 'skip_root_layout_styles' => true ) ) );
 	}
 
-	public function test_allow_indirect_properties() {
-		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+	public function test_get_stylesheet_generates_layout_styles() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-				'styles'   => array(
-					'blocks'  => array(
-						'core/social-links' => array(
-							'spacing' => array(
-								'blockGap' => array(
-									'top'  => '1em',
-									'left' => '2em',
-								),
-							),
-						),
+				'settings' => array(
+					'layout'  => array(
+						'contentSize' => '640px',
+						'wideSize'    => '1200px',
 					),
 					'spacing' => array(
-						'blockGap' => '3em',
+						'blockGap' => true,
 					),
 				),
-				'settings' => array(
-					'layout' => array(
-						'contentSize' => '800px',
-						'wideSize'    => '1000px',
+				'styles'   => array(
+					'spacing' => array(
+						'blockGap' => '1em',
 					),
 				),
-			)
+			),
+			'default'
 		);
 
-		$expected = array(
-			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-			'styles'   => array(
-				'blocks'  => array(
-					'core/social-links' => array(
-						'spacing' => array(
-							'blockGap' => array(
-								'top'  => '1em',
-								'left' => '2em',
-							),
-						),
+		// Results also include root site blocks styles.
+		$this->assertSameCSS(
+			':root { --wp--style--global--content-size: 640px;--wp--style--global--wide-size: 1200px; }:where(body) { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1em; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child { margin-block-end: 0; }:root { --wp--style--block-gap: 1em; }:root :where(.is-layout-flow) > :first-child{margin-block-start: 0;}:root :where(.is-layout-flow) > :last-child{margin-block-end: 0;}:root :where(.is-layout-flow) > *{margin-block-start: 1em;margin-block-end: 0;}:root :where(.is-layout-constrained) > :first-child{margin-block-start: 0;}:root :where(.is-layout-constrained) > :last-child{margin-block-end: 0;}:root :where(.is-layout-constrained) > *{margin-block-start: 1em;margin-block-end: 0;}:root :where(.is-layout-flex){gap: 1em;}:root :where(.is-layout-grid){gap: 1em;}.is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}',
+			$theme_json->get_stylesheet( array( 'styles' ) )
+		);
+	}
+
+	public function test_get_stylesheet_generates_layout_styles_with_spacing_presets() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'layout'  => array(
+						'contentSize' => '640px',
+						'wideSize'    => '1200px',
+					),
+					'spacing' => array(
+						'blockGap' => true,
 					),
 				),
-				'spacing' => array(
-					'blockGap' => '3em',
-				),
-			),
-			'settings' => array(
-				'layout' => array(
-					'contentSize' => '800px',
-					'wideSize'    => '1000px',
+				'styles'   => array(
+					'spacing' => array(
+						'blockGap' => 'var:preset|spacing|60',
+					),
 				),
 			),
+			'default'
 		);
 
-		$this->assertEqualSetsWithIndex( $expected, $actual );
+		// Results also include root site blocks styles.
+		$this->assertSameCSS(
+			':root { --wp--style--global--content-size: 640px;--wp--style--global--wide-size: 1200px; }:where(body) { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: var(--wp--preset--spacing--60); margin-block-end: 0; }:where(.wp-site-blocks) > :first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child { margin-block-end: 0; }:root { --wp--style--block-gap: var(--wp--preset--spacing--60); }:root :where(.is-layout-flow) > :first-child{margin-block-start: 0;}:root :where(.is-layout-flow) > :last-child{margin-block-end: 0;}:root :where(.is-layout-flow) > *{margin-block-start: var(--wp--preset--spacing--60);margin-block-end: 0;}:root :where(.is-layout-constrained) > :first-child{margin-block-start: 0;}:root :where(.is-layout-constrained) > :last-child{margin-block-end: 0;}:root :where(.is-layout-constrained) > *{margin-block-start: var(--wp--preset--spacing--60);margin-block-end: 0;}:root :where(.is-layout-flex){gap: var(--wp--preset--spacing--60);}:root :where(.is-layout-grid){gap: var(--wp--preset--spacing--60);}.is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}',
+			$theme_json->get_stylesheet( array( 'styles' ) )
+		);
 	}
 
-	public function test_remove_invalid_element_pseudo_selectors() {
-		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+	public function test_get_stylesheet_generates_fallback_gap_layout_styles() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-				'styles'  => array(
-					'elements' => array(
-						'link' => array(
-							'color'  => array(
-								'text'       => 'hotpink',
-								'background' => 'yellow',
-							),
-							':hover' => array(
-								'color' => array(
-									'text'       => 'red',
-									'background' => 'blue',
-								),
-							),
-							':seen'  => array(
-								'color' => array(
-									'background' => 'ivory',
-								),
-							),
-						),
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'layout'  => array(
+						'contentSize' => '640px',
+						'wideSize'    => '1200px',
+					),
+					'spacing' => array(
+						'blockGap' => null,
 					),
 				),
-			),
-			true
-		);
-
-		$expected = array(
-			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-			'styles'  => array(
-				'elements' => array(
-					'link' => array(
-						'color'  => array(
-							'text'       => 'hotpink',
-							'background' => 'yellow',
-						),
-						':hover' => array(
-							'color' => array(
-								'text'       => 'red',
-								'background' => 'blue',
-							),
-						),
+				'styles'   => array(
+					'spacing' => array(
+						'blockGap' => '1em',
 					),
 				),
 			),
+			'default'
 		);
+		$stylesheet = $theme_json->get_stylesheet( array( 'styles' ) );
 
-		$this->assertEqualSetsWithIndex( $expected, $actual );
+		// Results also include root site blocks styles.
+		$this->assertSameCSS(
+			':root { --wp--style--global--content-size: 640px;--wp--style--global--wide-size: 1200px; }:where(body) { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}.is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}',
+			$stylesheet
+		);
 	}
 
-	public function test_remove_invalid_font_family_settings() {
-		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+	public function test_get_stylesheet_generates_base_fallback_gap_layout_styles() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'typography' => array(
-						'fontFamilies' => array(
-							'custom' => array(
-								array(
-									'name'       => 'Open Sans',
-									'slug'       => 'open-sans',
-									'fontFamily' => '"Open Sans", sans-serif</style><script>alert("xss")</script>',
-								),
-								array(
-									'name'       => 'Arial',
-									'slug'       => 'arial',
-									'fontFamily' => 'Arial, serif',
-								),
-							),
-						),
+					'spacing' => array(
+						'blockGap' => null,
 					),
 				),
 			),
-			true
+			'default'
 		);
+		$stylesheet = $theme_json->get_stylesheet( array( 'base-layout-styles' ) );
 
-		$expected = array(
-			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-			'settings' => array(
-				'typography' => array(
-					'fontFamilies' => array(
-						'custom' => array(
-							array(
-								'name'       => 'Arial',
-								'slug'       => 'arial',
-								'fontFamily' => 'Arial, serif',
-							),
-						),
+		// Note the `base-layout-styles` includes a fallback gap for the Columns block for backwards compatibility.
+		$this->assertSameCSS(
+			':where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}:where(.wp-block-columns.is-layout-flex){gap: 2em;}:where(.wp-block-columns.is-layout-grid){gap: 2em;}:where(.wp-block-post-template.is-layout-flex){gap: 1.25em;}:where(.wp-block-post-template.is-layout-grid){gap: 1.25em;}',
+			$stylesheet
+		);
+	}
+
+	public function test_get_stylesheet_skips_layout_styles() {
+		add_theme_support( 'disable-layout-styles' );
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'spacing' => array(
+						'blockGap' => null,
 					),
 				),
 			),
+			'default'
 		);
+		$stylesheet = $theme_json->get_stylesheet( array( 'base-layout-styles' ) );
+		remove_theme_support( 'disable-layout-styles' );
 
-		$this->assertEqualSetsWithIndex( $expected, $actual );
-	}
-
-	public function test_get_element_class_name_button() {
-		$expected = 'wp-element-button';
-		$actual   = WP_Theme_JSON_Gutenberg::get_element_class_name( 'button' );
-
-		$this->assertEquals( $expected, $actual );
-	}
-
-	public function test_get_element_class_name_invalid() {
-		$expected = '';
-		$actual   = WP_Theme_JSON_Gutenberg::get_element_class_name( 'unknown-element' );
-
-		$this->assertEquals( $expected, $actual );
+		// All Layout styles should be skipped.
+		$this->assertSameCSS(
+			'',
+			$stylesheet
+		);
 	}
 
-	/**
-	 * Testing that dynamic properties in theme.json return the value they reference, e.g.
-	 * array( 'ref' => 'styles.color.background' ) => "#ffffff".
-	 */
-	public function test_get_property_value_valid() {
+	public function test_get_stylesheet_generates_valid_block_gap_values_and_skips_null_or_false_values() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version' => 2,
-				'styles'  => array(
-					'color'    => array(
-						'background' => '#ffffff',
-						'text'       => '#000000',
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'layout'  => array(
+						'contentSize' => '640px',
+						'wideSize'    => '1200px',
 					),
-					'elements' => array(
-						'button' => array(
+					'spacing' => array(
+						'blockGap' => true,
+					),
+				),
+				'styles'   => array(
+					'spacing' => array(
+						'blockGap' => '1rem',
+					),
+					'blocks'  => array(
+						'core/post-content' => array(
 							'color' => array(
-								'background' => array( 'ref' => 'styles.color.text' ),
-								'text'       => array( 'ref' => 'styles.color.background' ),
+								'text' => 'gray', // This value should not render block layout styles.
+							),
+						),
+						'core/social-links' => array(
+							'spacing' => array(
+								'blockGap' => '0', // This value should render block layout gap as zero.
+							),
+						),
+						'core/buttons'      => array(
+							'spacing' => array(
+								'blockGap' => 0, // This value should render block layout gap as zero.
+							),
+						),
+						'core/columns'      => array(
+							'spacing' => array(
+								'blockGap' => false, // This value should be ignored. The block will use the global layout value.
 							),
 						),
 					),
 				),
-			)
+			),
+			'default'
 		);
 
-		$base_styles  = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-		$color_styles = 'body{background-color: #ffffff;color: #000000;}.wp-element-button, .wp-block-button__link{background-color: #000000;color: #ffffff;}';
-
-		$expected = $base_styles . $color_styles;
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
+		$this->assertSameCSS(
+			':root { --wp--style--global--content-size: 640px;--wp--style--global--wide-size: 1200px; }:where(body) { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1rem; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child { margin-block-end: 0; }:root { --wp--style--block-gap: 1rem; }:root :where(.is-layout-flow) > :first-child{margin-block-start: 0;}:root :where(.is-layout-flow) > :last-child{margin-block-end: 0;}:root :where(.is-layout-flow) > *{margin-block-start: 1rem;margin-block-end: 0;}:root :where(.is-layout-constrained) > :first-child{margin-block-start: 0;}:root :where(.is-layout-constrained) > :last-child{margin-block-end: 0;}:root :where(.is-layout-constrained) > *{margin-block-start: 1rem;margin-block-end: 0;}:root :where(.is-layout-flex){gap: 1rem;}:root :where(.is-layout-grid){gap: 1rem;}.is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}:root :where(.wp-block-post-content){color: gray;}:root :where(.wp-block-social-links-is-layout-flow) > :first-child{margin-block-start: 0;}:root :where(.wp-block-social-links-is-layout-flow) > :last-child{margin-block-end: 0;}:root :where(.wp-block-social-links-is-layout-flow) > *{margin-block-start: 0;margin-block-end: 0;}:root :where(.wp-block-social-links-is-layout-constrained) > :first-child{margin-block-start: 0;}:root :where(.wp-block-social-links-is-layout-constrained) > :last-child{margin-block-end: 0;}:root :where(.wp-block-social-links-is-layout-constrained) > *{margin-block-start: 0;margin-block-end: 0;}:root :where(.wp-block-social-links-is-layout-flex){gap: 0;}:root :where(.wp-block-social-links-is-layout-grid){gap: 0;}:root :where(.wp-block-buttons-is-layout-flow) > :first-child{margin-block-start: 0;}:root :where(.wp-block-buttons-is-layout-flow) > :last-child{margin-block-end: 0;}:root :where(.wp-block-buttons-is-layout-flow) > *{margin-block-start: 0;margin-block-end: 0;}:root :where(.wp-block-buttons-is-layout-constrained) > :first-child{margin-block-start: 0;}:root :where(.wp-block-buttons-is-layout-constrained) > :last-child{margin-block-end: 0;}:root :where(.wp-block-buttons-is-layout-constrained) > *{margin-block-start: 0;margin-block-end: 0;}:root :where(.wp-block-buttons-is-layout-flex){gap: 0;}:root :where(.wp-block-buttons-is-layout-grid){gap: 0;}',
+			$theme_json->get_stylesheet()
+		);
 	}
 
-	/**
-	 * Testing that dynamic properties in theme.json that
-	 * refer to other dynamic properties in a loop
-	 * then they should be left untouched.
-	 *
-	 * @expectedIncorrectUsage get_property_value
-	 */
-	public function test_get_property_value_loop() {
+	public function test_get_stylesheet_returns_outline_styles() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version' => 2,
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'styles'  => array(
-					'color'    => array(
-						'background' => '#ffffff',
-						'text'       => array( 'ref' => 'styles.elements.button.color.background' ),
-					),
 					'elements' => array(
 						'button' => array(
-							'color' => array(
-								'background' => array( 'ref' => 'styles.color.text' ),
-								'text'       => array( 'ref' => 'styles.color.background' ),
+							'outline' => array(
+								'offset' => '3px',
+								'width'  => '3px',
+								'style'  => 'dashed',
+								'color'  => 'red',
+							),
+							':hover'  => array(
+								'outline' => array(
+									'offset' => '3px',
+									'width'  => '3px',
+									'style'  => 'solid',
+									'color'  => 'blue',
+								),
 							),
 						),
 					),
@@ -1024,514 +1316,670 @@ public function test_get_property_value_loop() {
 			)
 		);
 
-		$base_styles  = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-		$color_styles = 'body{background-color: #ffffff;}.wp-element-button, .wp-block-button__link{color: #ffffff;}';
+		$expected = ':root :where(.wp-element-button, .wp-block-button__link){outline-color: red;outline-offset: 3px;outline-style: dashed;outline-width: 3px;}:root :where(.wp-element-button:hover, .wp-block-button__link:hover){outline-color: blue;outline-offset: 3px;outline-style: solid;outline-width: 3px;}';
 
-		$expected = $base_styles . $color_styles;
-		$this->assertSame( $expected, $theme_json->get_stylesheet() );
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
 	}
 
-	/**
-	 * Testing that dynamic properties in theme.json that
-	 * refer to other dynamic properties then they should be left unprocessed.
-	 *
-	 * @expectedIncorrectUsage get_property_value
-	 */
-	public function test_get_property_value_recursion() {
+	public function test_get_stylesheet_custom_root_selector() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version' => 2,
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'styles'  => array(
-					'color'    => array(
-						'background' => '#ffffff',
-						'text'       => array( 'ref' => 'styles.color.background' ),
+					'color' => array(
+						'text' => 'teal',
 					),
-					'elements' => array(
-						'button' => array(
-							'color' => array(
-								'background' => array( 'ref' => 'styles.color.text' ),
-								'text'       => array( 'ref' => 'styles.color.background' ),
+				),
+			),
+			'default'
+		);
+
+		// Custom root selector is unrelated to root layout styles so they don't need to be output for this test.
+		$options = array(
+			'root_selector'           => '.custom',
+			'skip_root_layout_styles' => true,
+		);
+		$actual  = $theme_json->get_stylesheet( array( 'styles' ), null, $options );
+
+		$this->assertSameCSS(
+			':root :where(.custom){color: teal;}',
+			$actual
+		);
+	}
+
+	public function test_get_stylesheet_generates_fluid_typography_values() {
+		register_block_type(
+			'test/clamp-me',
+			array(
+				'api_version' => 3,
+			)
+		);
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'typography' => array(
+						'fluid'     => true,
+						'fontSizes' => array(
+							array(
+								'size' => '16px',
+								'slug' => 'pickles',
+								'name' => 'Pickles',
+							),
+							array(
+								'size' => '22px',
+								'slug' => 'toast',
+								'name' => 'Toast',
 							),
 						),
 					),
 				),
-			)
+				'styles'   => array(
+					'typography' => array(
+						'fontSize' => '1em',
+					),
+					'elements'   => array(
+						'h1' => array(
+							'typography' => array(
+								'fontSize' => '100px',
+							),
+						),
+					),
+					'blocks'     => array(
+						'test/clamp-me' => array(
+							'typography' => array(
+								'fontSize' => '48px',
+							),
+						),
+					),
+				),
+			),
+			'default'
 		);
 
-		$base_styles  = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-		$color_styles = 'body{background-color: #ffffff;color: #ffffff;}.wp-element-button, .wp-block-button__link{color: #ffffff;}';
+		unregister_block_type( 'test/clamp-me' );
 
-		$expected = $base_styles . $color_styles;
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
+		$this->assertSameCSS(
+			':root{--wp--preset--font-size--pickles: clamp(14px, 0.875rem + ((1vw - 3.2px) * 0.156), 16px);--wp--preset--font-size--toast: clamp(14.642px, 0.915rem + ((1vw - 3.2px) * 0.575), 22px);}body{font-size: clamp(0.875em, 0.875rem + ((1vw - 0.2em) * 0.156), 1em);}h1{font-size: clamp(50.171px, 3.136rem + ((1vw - 3.2px) * 3.893), 100px);}:root :where(.wp-block-test-clamp-me){font-size: clamp(27.894px, 1.743rem + ((1vw - 3.2px) * 1.571), 48px);}.has-pickles-font-size{font-size: var(--wp--preset--font-size--pickles) !important;}.has-toast-font-size{font-size: var(--wp--preset--font-size--toast) !important;}',
+			$theme_json->get_stylesheet( array( 'styles', 'variables', 'presets' ), null, array( 'skip_root_layout_styles' => true ) )
+		);
 	}
 
-	/**
-	 * Testing that dynamic properties in theme.json that
-	 * refer to themselves then they should be left unprocessed.
-	 *
-	 * @expectedIncorrectUsage get_property_value
-	 */
-	public function test_get_property_value_self() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+	public function test_allow_indirect_properties() {
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
 			array(
-				'version' => 2,
-				'styles'  => array(
-					'color' => array(
-						'background' => '#ffffff',
-						'text'       => array( 'ref' => 'styles.color.text' ),
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'   => array(
+					'blocks'  => array(
+						'core/social-links' => array(
+							'spacing' => array(
+								'blockGap' => array(
+									'top'  => '1em',
+									'left' => '2em',
+								),
+							),
+						),
+					),
+					'spacing' => array(
+						'blockGap' => '3em',
+					),
+				),
+				'settings' => array(
+					'layout' => array(
+						'contentSize' => '800px',
+						'wideSize'    => '1000px',
 					),
 				),
 			)
 		);
 
-		$base_styles  = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-		$color_styles = 'body{background-color: #ffffff;}';
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'   => array(
+				'blocks'  => array(
+					'core/social-links' => array(
+						'spacing' => array(
+							'blockGap' => array(
+								'top'  => '1em',
+								'left' => '2em',
+							),
+						),
+					),
+				),
+				'spacing' => array(
+					'blockGap' => '3em',
+				),
+			),
+			'settings' => array(
+				'layout' => array(
+					'contentSize' => '800px',
+					'wideSize'    => '1000px',
+				),
+			),
+		);
 
-		$expected = $base_styles . $color_styles;
-		$this->assertEquals( $expected, $theme_json->get_stylesheet() );
+		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
-	/**
-	 * Tests generating the spacing presets array based on the spacing scale provided.
-	 *
-	 * @dataProvider data_generate_spacing_scale_fixtures
-	 */
-	public function test_set_spacing_sizes( $spacing_scale, $expected_output ) {
+	public function test_merge_incoming_data() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version'  => 2,
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'spacing' => array(
-						'spacingScale' => $spacing_scale,
+					'color'  => array(
+						'custom'  => false,
+						'palette' => array(
+							array(
+								'slug'  => 'red',
+								'color' => 'red',
+							),
+							array(
+								'slug'  => 'green',
+								'color' => 'green',
+							),
+						),
+					),
+					'blocks' => array(
+						'core/paragraph' => array(
+							'color' => array(
+								'custom' => false,
+							),
+						),
+					),
+				),
+				'styles'   => array(
+					'typography' => array(
+						'fontSize' => '12',
 					),
 				),
 			)
 		);
 
-		$theme_json->set_spacing_sizes();
-		$this->assertSame( $expected_output, _wp_array_get( $theme_json->get_raw_data(), array( 'settings', 'spacing', 'spacingSizes', 'default' ) ) );
-	}
-
-	/**
-	 * Data provider for spacing scale tests.
-	 *
-	 * @return array
-	 */
-	public function data_generate_spacing_scale_fixtures() {
-		return array(
-			'one_step_spacing_scale' => array(
-				'spacingScale'    => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 1,
-					'mediumStep' => 4,
-					'unit'       => 'rem',
+		$add_new_block = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'blocks' => array(
+					'core/list' => array(
+						'color' => array(
+							'custom' => false,
+						),
+					),
 				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '50',
-						'size' => '4rem',
+			),
+			'styles'   => array(
+				'blocks' => array(
+					'core/list' => array(
+						'typography' => array(
+							'fontSize' => '12',
+						),
+						'color'      => array(
+							'background' => 'brown',
+						),
 					),
 				),
 			),
+		);
 
-			'two_step_spacing_scale_should_add_step_above_medium' => array(
-				'spacingScale'    => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 2,
-					'mediumStep' => 4,
-					'unit'       => 'rem',
-				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '50',
-						'size' => '4rem',
-					),
-					array(
-						'name' => '2',
-						'slug' => '60',
-						'size' => '5.5rem',
-					),
+		$add_key_in_settings = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color' => array(
+					'customGradient' => true,
 				),
 			),
+		);
 
-			'three_step_spacing_scale_should_add_step_above_and_below_medium' => array(
-				'spacingScale'    => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 3,
-					'mediumStep' => 4,
-					'unit'       => 'rem',
+		$update_key_in_settings = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color' => array(
+					'custom' => true,
 				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '40',
-						'size' => '2.5rem',
-					),
-					array(
-						'name' => '2',
-						'slug' => '50',
-						'size' => '4rem',
-					),
-					array(
-						'name' => '3',
-						'slug' => '60',
-						'size' => '5.5rem',
+			),
+		);
+
+		$add_styles = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/group' => array(
+						'spacing' => array(
+							'padding' => array(
+								'top' => '12px',
+							),
+						),
 					),
 				),
 			),
+		);
 
-			'even_step_spacing_scale_steps_should_add_extra_step_above_medium' => array(
-				'spacingScale'    => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 4,
-					'mediumStep' => 4,
-					'unit'       => 'rem',
-				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '40',
-						'size' => '2.5rem',
-					),
-					array(
-						'name' => '2',
-						'slug' => '50',
-						'size' => '4rem',
-					),
-					array(
-						'name' => '3',
-						'slug' => '60',
-						'size' => '5.5rem',
-					),
-					array(
-						'name' => '4',
-						'slug' => '70',
-						'size' => '7rem',
+		$add_key_in_styles = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/group' => array(
+						'spacing' => array(
+							'padding' => array(
+								'bottom' => '12px',
+							),
+						),
 					),
 				),
 			),
+		);
 
-			'if_bottom_end_will_go_below_zero_should_add_extra_steps_above_medium_instead' => array(
-				'spacingScale'    => array(
-					'operator'   => '+',
-					'increment'  => 2.5,
-					'steps'      => 5,
-					'mediumStep' => 5,
-					'unit'       => 'rem',
+		$add_invalid_context = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/para' => array(
+						'typography' => array(
+							'lineHeight' => '12',
+						),
+					),
 				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '40',
-						'size' => '2.5rem',
-					),
-					array(
-						'name' => '2',
-						'slug' => '50',
-						'size' => '5rem',
+			),
+		);
+
+		$update_presets = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'      => array(
+					'palette'   => array(
+						array(
+							'slug'  => 'blue',
+							'color' => 'blue',
+						),
 					),
-					array(
-						'name' => '3',
-						'slug' => '60',
-						'size' => '7.5rem',
+					'gradients' => array(
+						array(
+							'slug'     => 'gradient',
+							'gradient' => 'gradient',
+						),
 					),
-					array(
-						'name' => '4',
-						'slug' => '70',
-						'size' => '10rem',
+				),
+				'typography' => array(
+					'fontSizes'    => array(
+						array(
+							'slug' => 'fontSize',
+							'size' => 'fontSize',
+						),
 					),
-					array(
-						'name' => '5',
-						'slug' => '80',
-						'size' => '12.5rem',
+					'fontFamilies' => array(
+						array(
+							'slug'       => 'fontFamily',
+							'fontFamily' => 'fontFamily',
+						),
 					),
 				),
 			),
+		);
 
-			'multiplier_should_correctly_calculate_above_and_below_medium' => array(
-				'spacingScale'    => array(
-					'operator'   => '*',
-					'increment'  => 1.5,
-					'steps'      => 5,
-					'mediumStep' => 1.5,
-					'unit'       => 'rem',
-				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '30',
-						'size' => '0.67rem',
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'      => array(
+					'custom'         => true,
+					'customGradient' => true,
+					'palette'        => array(
+						'theme' => array(
+							array(
+								'slug'  => 'blue',
+								'color' => 'blue',
+							),
+						),
 					),
-					array(
-						'name' => '2',
-						'slug' => '40',
-						'size' => '1rem',
+					'gradients'      => array(
+						'theme' => array(
+							array(
+								'slug'     => 'gradient',
+								'gradient' => 'gradient',
+							),
+						),
 					),
-					array(
-						'name' => '3',
-						'slug' => '50',
-						'size' => '1.5rem',
+				),
+				'typography' => array(
+					'fontSizes'    => array(
+						'theme' => array(
+							array(
+								'slug' => 'fontSize',
+								'size' => 'fontSize',
+							),
+						),
 					),
-					array(
-						'name' => '4',
-						'slug' => '60',
-						'size' => '2.25rem',
+					'fontFamilies' => array(
+						'theme' => array(
+							array(
+								'slug'       => 'fontFamily',
+								'fontFamily' => 'fontFamily',
+							),
+						),
 					),
-					array(
-						'name' => '5',
-						'slug' => '70',
-						'size' => '3.38rem',
+				),
+				'blocks'     => array(
+					'core/paragraph' => array(
+						'color' => array(
+							'custom' => false,
+						),
+					),
+					'core/list'      => array(
+						'color' => array(
+							'custom' => false,
+						),
 					),
 				),
 			),
-
-			'increment_<_1_combined_with_*_operator_should_act_as_divisor_to_calculate_above_and_below_medium' => array(
-				'spacingScale'    => array(
-					'operator'   => '*',
-					'increment'  => 0.25,
-					'steps'      => 5,
-					'mediumStep' => 1.5,
-					'unit'       => 'rem',
+			'styles'   => array(
+				'typography' => array(
+					'fontSize' => '12',
 				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '30',
-						'size' => '0.09rem',
-					),
-					array(
-						'name' => '2',
-						'slug' => '40',
-						'size' => '0.38rem',
-					),
-					array(
-						'name' => '3',
-						'slug' => '50',
-						'size' => '1.5rem',
-					),
-					array(
-						'name' => '4',
-						'slug' => '60',
-						'size' => '6rem',
+				'blocks'     => array(
+					'core/group' => array(
+						'spacing' => array(
+							'padding' => array(
+								'top'    => '12px',
+								'bottom' => '12px',
+							),
+						),
 					),
-					array(
-						'name' => '5',
-						'slug' => '70',
-						'size' => '24rem',
+					'core/list'  => array(
+						'typography' => array(
+							'fontSize' => '12',
+						),
+						'color'      => array(
+							'background' => 'brown',
+						),
 					),
 				),
 			),
 		);
-	}
 
-	/**
-	 * Tests generating the spacing presets array based on the spacing scale provided.
-	 *
-	 * @dataProvider data_set_spacing_sizes_when_invalid
-	 */
-	public function test_set_spacing_sizes_when_invalid( $spacing_scale, $expected_output ) {
-		$this->expectException( Exception::class );
-		$this->expectExceptionMessage( 'Some of the theme.json settings.spacing.spacingScale values are invalid' );
+		$theme_json->merge( new WP_Theme_JSON_Gutenberg( $add_new_block ) );
+		$theme_json->merge( new WP_Theme_JSON_Gutenberg( $add_key_in_settings ) );
+		$theme_json->merge( new WP_Theme_JSON_Gutenberg( $update_key_in_settings ) );
+		$theme_json->merge( new WP_Theme_JSON_Gutenberg( $add_styles ) );
+		$theme_json->merge( new WP_Theme_JSON_Gutenberg( $add_key_in_styles ) );
+		$theme_json->merge( new WP_Theme_JSON_Gutenberg( $add_invalid_context ) );
+		$theme_json->merge( new WP_Theme_JSON_Gutenberg( $update_presets ) );
+		$actual = $theme_json->get_raw_data();
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
 
+	public function test_merge_incoming_data_empty_presets() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version'  => 2,
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'spacing' => array(
-						'spacingScale' => $spacing_scale,
+					'color'      => array(
+						'duotone'   => array(
+							array(
+								'slug'   => 'value',
+								'colors' => array( 'red', 'green' ),
+							),
+						),
+						'gradients' => array(
+							array(
+								'slug'     => 'gradient',
+								'gradient' => 'gradient',
+							),
+						),
+						'palette'   => array(
+							array(
+								'slug'  => 'red',
+								'color' => 'red',
+							),
+						),
+					),
+					'spacing'    => array(
+						'units' => array( 'px', 'em' ),
+					),
+					'typography' => array(
+						'fontSizes' => array(
+							array(
+								'slug'  => 'size',
+								'value' => 'size',
+							),
+						),
 					),
 				),
 			)
 		);
 
-		// Ensure PHPUnit 10 compatibility.
-		set_error_handler(
-			static function ( $errno, $errstr ) {
-				restore_error_handler();
-				throw new Exception( $errstr, $errno );
-			},
-			E_ALL
+		$theme_json->merge(
+			new WP_Theme_JSON_Gutenberg(
+				array(
+					'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+					'settings' => array(
+						'color'      => array(
+							'duotone'   => array(),
+							'gradients' => array(),
+							'palette'   => array(),
+						),
+						'spacing'    => array(
+							'units' => array(),
+						),
+						'typography' => array(
+							'fontSizes' => array(),
+						),
+					),
+				)
+			)
 		);
 
-		$theme_json->set_spacing_sizes();
-		$this->assertSame( $expected_output, _wp_array_get( $theme_json->get_raw_data(), array( 'settings', 'spacing', 'spacingSizes', 'default' ) ) );
-	}
-
-	/**
-	 * Data provider for spacing scale tests.
-	 *
-	 * @return array
-	 */
-	public function data_set_spacing_sizes_when_invalid() {
-		return array(
-
-			'invalid_spacing_scale_values_missing_operator' => array(
-				'spacingScale'    => array(
-					'operator'   => '',
-					'increment'  => 1.5,
-					'steps'      => 1,
-					'mediumStep' => 4,
-					'unit'       => 'rem',
-				),
-				'expected_output' => null,
-			),
-
-			'invalid_spacing_scale_values_non_numeric_increment' => array(
-				'spacingScale'    => array(
-					'operator'   => '+',
-					'increment'  => 'add two to previous value',
-					'steps'      => 1,
-					'mediumStep' => 4,
-					'unit'       => 'rem',
-				),
-				'expected_output' => null,
-			),
-
-			'invalid_spacing_scale_values_non_numeric_steps' => array(
-				'spacingScale'    => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 'spiral staircase preferred',
-					'mediumStep' => 4,
-					'unit'       => 'rem',
+		$actual   = $theme_json->get_raw_data();
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'      => array(
+					'duotone'   => array(
+						'theme' => array(),
+					),
+					'gradients' => array(
+						'theme' => array(),
+					),
+					'palette'   => array(
+						'theme' => array(),
+					),
 				),
-				'expected_output' => null,
-			),
-
-			'invalid_spacing_scale_values_non_numeric_medium_step' => array(
-				'spacingScale'    => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 5,
-					'mediumStep' => 'That which is just right',
-					'unit'       => 'rem',
+				'spacing'    => array(
+					'units' => array(),
 				),
-				'expected_output' => null,
-			),
-
-			'invalid_spacing_scale_values_missing_unit' => array(
-				'spacingScale'    => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 5,
-					'mediumStep' => 4,
+				'typography' => array(
+					'fontSizes' => array(
+						'theme' => array(),
+					),
 				),
-				'expected_output' => null,
 			),
 		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
-	public function test_get_styles_for_block_with_padding_aware_alignments() {
+	public function test_merge_incoming_data_null_presets() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version'  => 2,
-				'styles'   => array(
-					'spacing' => array(
-						'padding' => array(
-							'top'    => '10px',
-							'right'  => '12px',
-							'bottom' => '10px',
-							'left'   => '12px',
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color'      => array(
+						'duotone'   => array(
+							array(
+								'slug'   => 'value',
+								'colors' => array( 'red', 'green' ),
+							),
+						),
+						'gradients' => array(
+							array(
+								'slug'     => 'gradient',
+								'gradient' => 'gradient',
+							),
+						),
+						'palette'   => array(
+							array(
+								'slug'  => 'red',
+								'color' => 'red',
+							),
+						),
+					),
+					'spacing'    => array(
+						'units' => array( 'px', 'em' ),
+					),
+					'typography' => array(
+						'fontSizes' => array(
+							array(
+								'slug'  => 'size',
+								'value' => 'size',
+							),
 						),
 					),
-				),
-				'settings' => array(
-					'useRootPaddingAwareAlignments' => true,
 				),
 			)
 		);
 
-		$metadata = array(
-			'path'     => array(
-				'0' => 'styles',
-			),
-			'selector' => 'body',
-		);
-
-		$expected    = 'body { margin: 0;}.wp-site-blocks { padding-top: var(--wp--style--root--padding-top); padding-bottom: var(--wp--style--root--padding-bottom); }.has-global-padding { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }.has-global-padding :where(.has-global-padding:not(.wp-block-block)) { padding-right: 0; padding-left: 0; }.has-global-padding > .alignfull { margin-right: calc(var(--wp--style--root--padding-right) * -1); margin-left: calc(var(--wp--style--root--padding-left) * -1); }.has-global-padding :where(.has-global-padding:not(.wp-block-block)) > .alignfull { margin-right: 0; margin-left: 0; }.has-global-padding > .alignfull:where(:not(.has-global-padding):not(.is-layout-flex):not(.is-layout-grid)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),.wp-block:not(.alignfull),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }.has-global-padding :where(.has-global-padding) > .alignfull:where(:not(.has-global-padding)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),.wp-block:not(.alignfull),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: 0; padding-left: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{--wp--style--root--padding-top: 10px;--wp--style--root--padding-right: 12px;--wp--style--root--padding-bottom: 10px;--wp--style--root--padding-left: 12px;}';
-		$root_rules  = $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata );
-		$style_rules = $theme_json->get_styles_for_block( $metadata );
-		$this->assertEquals( $expected, $root_rules . $style_rules );
-	}
-
-	public function test_get_styles_for_block_without_padding_aware_alignments() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
-			array(
-				'version' => 2,
-				'styles'  => array(
-					'spacing' => array(
-						'padding' => array(
-							'top'    => '10px',
-							'right'  => '12px',
-							'bottom' => '10px',
-							'left'   => '12px',
+		$theme_json->merge(
+			new WP_Theme_JSON_Gutenberg(
+				array(
+					'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+					'settings' => array(
+						'color'      => array(
+							'custom' => false,
+						),
+						'spacing'    => array(
+							'margin' => false,
+						),
+						'typography' => array(
+							'lineHeight' => false,
 						),
 					),
-				),
+				)
 			)
 		);
 
-		$metadata = array(
-			'path'     => array(
-				'0' => 'styles',
-			),
-			'selector' => 'body',
+		$actual   = $theme_json->get_raw_data();
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'      => array(
+					'custom'    => false,
+					'duotone'   => array(
+						'theme' => array(
+							array(
+								'slug'   => 'value',
+								'colors' => array( 'red', 'green' ),
+							),
+						),
+					),
+					'gradients' => array(
+						'theme' => array(
+							array(
+								'slug'     => 'gradient',
+								'gradient' => 'gradient',
+							),
+						),
+					),
+					'palette'   => array(
+						'theme' => array(
+							array(
+								'slug'  => 'red',
+								'color' => 'red',
+							),
+						),
+					),
+				),
+				'spacing'    => array(
+					'margin' => false,
+					'units'  => array( 'px', 'em' ),
+				),
+				'typography' => array(
+					'lineHeight' => false,
+					'fontSizes'  => array(
+						'theme' => array(
+							array(
+								'slug'  => 'size',
+								'value' => 'size',
+							),
+						),
+					),
+				),
+			),
 		);
 
-		$expected    = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{padding-top: 10px;padding-right: 12px;padding-bottom: 10px;padding-left: 12px;}';
-		$root_rules  = $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata );
-		$style_rules = $theme_json->get_styles_for_block( $metadata );
-		$this->assertEquals( $expected, $root_rules . $style_rules );
+		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
-	public function test_get_styles_for_block_with_content_width() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+	public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_removed() {
+		$defaults = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version'  => 2,
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'layout' => array(
-						'contentSize' => '800px',
-						'wideSize'    => '1000px',
+					'color'  => array(
+						'defaultPalette' => true,
+						'palette'        => array(
+							array(
+								'slug'  => 'red',
+								'color' => 'red',
+								'name'  => 'Red',
+							),
+							array(
+								'slug'  => 'green',
+								'color' => 'green',
+								'name'  => 'Green',
+							),
+						),
+					),
+					'blocks' => array(
+						'core/paragraph' => array(
+							'color' => array(
+								'palette' => array(
+									array(
+										'slug'  => 'blue',
+										'color' => 'blue',
+										'name'  => 'Blue',
+									),
+								),
+							),
+						),
 					),
 				),
-			)
-		);
-
-		$metadata = array(
-			'path'     => array(
-				'0' => 'settings',
 			),
-			'selector' => 'body',
+			'default'
 		);
-
-		$expected    = 'body { margin: 0;--wp--style--global--content-size: 800px;--wp--style--global--wide-size: 1000px;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-		$root_rules  = $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata );
-		$style_rules = $theme_json->get_styles_for_block( $metadata );
-		$this->assertEquals( $expected, $root_rules . $style_rules );
-	}
-
-	public function test_sanitize_for_unregistered_style_variations() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+		$theme    = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version' => 2,
-				'styles'  => array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color'  => array(
+						'palette' => array(
+							array(
+								'slug'  => 'pink',
+								'color' => 'pink',
+								'name'  => 'Pink',
+							),
+							array(
+								'slug'  => 'green',
+								'color' => 'green',
+								'name'  => 'Greenish',
+							),
+						),
+					),
 					'blocks' => array(
-						'core/quote' => array(
-							'variations' => array(
-								'unregisteredVariation' => array(
-									'color' => array(
-										'background' => 'hotpink',
+						'core/paragraph' => array(
+							'color' => array(
+								'palette' => array(
+									array(
+										'slug'  => 'blue',
+										'color' => 'blue',
+										'name'  => 'Bluish',
 									),
-								),
-								'plain'                 => array(
-									'color' => array(
-										'background' => 'hotpink',
+									array(
+										'slug'  => 'yellow',
+										'color' => 'yellow',
+										'name'  => 'Yellow',
+									),
+									array(
+										'slug'  => 'green',
+										'color' => 'green',
+										'name'  => 'Block Green',
 									),
 								),
 							),
@@ -1541,16 +1989,50 @@ public function test_sanitize_for_unregistered_style_variations() {
 			)
 		);
 
-		$sanitized_theme_json = $theme_json->get_raw_data();
-		$expected             = array(
-			'version' => 2,
-			'styles'  => array(
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'  => array(
+					'palette'        => array(
+						'default' => array(
+							array(
+								'slug'  => 'red',
+								'color' => 'red',
+								'name'  => 'Red',
+							),
+							array(
+								'slug'  => 'green',
+								'color' => 'green',
+								'name'  => 'Green',
+							),
+						),
+						'theme'   => array(
+							array(
+								'slug'  => 'pink',
+								'color' => 'pink',
+								'name'  => 'Pink',
+							),
+						),
+					),
+					'defaultPalette' => true,
+				),
 				'blocks' => array(
-					'core/quote' => array(
-						'variations' => array(
-							'plain' => array(
-								'color' => array(
-									'background' => 'hotpink',
+					'core/paragraph' => array(
+						'color' => array(
+							'palette' => array(
+								'default' => array(
+									array(
+										'slug'  => 'blue',
+										'color' => 'blue',
+										'name'  => 'Blue',
+									),
+								),
+								'theme'   => array(
+									array(
+										'slug'  => 'yellow',
+										'color' => 'yellow',
+										'name'  => 'Yellow',
+									),
 								),
 							),
 						),
@@ -1558,84 +2040,154 @@ public function test_sanitize_for_unregistered_style_variations() {
 				),
 			),
 		);
-		$this->assertSameSetsWithIndex( $expected, $sanitized_theme_json, 'Sanitized theme.json styles does not match' );
+
+		$defaults->merge( $theme );
+		$actual = $defaults->get_raw_data();
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
-	/**
-	 * @dataProvider data_sanitize_for_block_with_style_variations
-	 *
-	 * @param array $theme_json_variations Theme.json variations to test.
-	 * @param array $expected_sanitized    Expected results after sanitizing.
-	 */
-	public function test_sanitize_for_block_with_style_variations( $theme_json_variations, $expected_sanitized ) {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+	public function test_merge_incoming_data_color_presets_with_same_slugs_as_default_are_not_removed_if_defaults_are_disabled() {
+		$defaults = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version' => 2,
-				'styles'  => array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color'  => array(
+						'defaultPalette' => true, // Emulate the defaults from core theme.json.
+						'palette'        => array(
+							array(
+								'slug'  => 'red',
+								'color' => 'red',
+								'name'  => 'Red',
+							),
+							array(
+								'slug'  => 'green',
+								'color' => 'green',
+								'name'  => 'Green',
+							),
+						),
+					),
 					'blocks' => array(
-						'core/quote' => $theme_json_variations,
+						'core/paragraph' => array(
+							'color' => array(
+								'palette' => array(
+									array(
+										'slug'  => 'blue',
+										'color' => 'blue',
+										'name'  => 'Blue',
+									),
+								),
+							),
+						),
 					),
 				),
-			)
+			),
+			'default'
 		);
-
-		// Validate structure is sanitized.
-		$sanitized_theme_json = $theme_json->get_raw_data();
-		$this->assertIsArray( $sanitized_theme_json, 'Sanitized theme.json is not an array data type' );
-		$this->assertArrayHasKey( 'styles', $sanitized_theme_json, 'Sanitized theme.json does not have an "styles" key' );
-		$this->assertSameSetsWithIndex( $expected_sanitized, $sanitized_theme_json['styles'], 'Sanitized theme.json styles does not match' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_sanitize_for_block_with_style_variations() {
-		return array(
-			'1 variation with 1 valid property'     => array(
-				'theme_json_variations' => array(
-					'variations' => array(
-						'plain' => array(
-							'color' => array(
-								'background' => 'hotpink',
+		$theme    = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color'  => array(
+						'defaultPalette' => false,
+						'palette'        => array(
+							array(
+								'slug'  => 'pink',
+								'color' => 'pink',
+								'name'  => 'Pink',
+							),
+							array(
+								'slug'  => 'green',
+								'color' => 'green',
+								'name'  => 'Greenish',
 							),
 						),
 					),
-				),
-				'expected_sanitized'    => array(
 					'blocks' => array(
-						'core/quote' => array(
-							'variations' => array(
-								'plain' => array(
-									'color' => array(
-										'background' => 'hotpink',
+						'core/paragraph' => array(
+							'color' => array(
+								'palette' => array(
+									array(
+										'slug'  => 'blue',
+										'color' => 'blue',
+										'name'  => 'Bluish',
+									),
+									array(
+										'slug'  => 'yellow',
+										'color' => 'yellow',
+										'name'  => 'Yellow',
+									),
+									array(
+										'slug'  => 'green',
+										'color' => 'green',
+										'name'  => 'Block Green',
 									),
 								),
 							),
 						),
 					),
 				),
-			),
-			'1 variation with 2 invalid properties' => array(
-				'theme_json_variations' => array(
-					'variations' => array(
-						'plain' => array(
-							'color'            => array(
-								'background' => 'hotpink',
+			)
+		);
+
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'  => array(
+					'defaultPalette' => false,
+					'palette'        => array(
+						'default' => array(
+							array(
+								'slug'  => 'red',
+								'color' => 'red',
+								'name'  => 'Red',
+							),
+							array(
+								'slug'  => 'green',
+								'color' => 'green',
+								'name'  => 'Green',
+							),
+						),
+						'theme'   => array(
+							array(
+								'slug'  => 'pink',
+								'color' => 'pink',
+								'name'  => 'Pink',
+							),
+							array(
+								'slug'  => 'green',
+								'color' => 'green',
+								'name'  => 'Greenish',
 							),
-							'invalidProperty1' => 'value1',
-							'invalidProperty2' => 'value2',
 						),
 					),
 				),
-				'expected_sanitized'    => array(
-					'blocks' => array(
-						'core/quote' => array(
-							'variations' => array(
-								'plain' => array(
-									'color' => array(
-										'background' => 'hotpink',
+				'blocks' => array(
+					'core/paragraph' => array(
+						'color' => array(
+							'palette' => array(
+								'default' => array(
+									array(
+										'slug'  => 'blue',
+										'color' => 'blue',
+										'name'  => 'Blue',
+									),
+								),
+								'theme'   => array(
+									array(
+										'slug'  => 'blue',
+										'color' => 'blue',
+										'name'  => 'Bluish',
+									),
+									array(
+										'slug'  => 'yellow',
+										'color' => 'yellow',
+										'name'  => 'Yellow',
+									),
+									array(
+										'slug'  => 'green',
+										'color' => 'green',
+										'name'  => 'Block Green',
 									),
 								),
 							),
@@ -1644,126 +2196,359 @@ public function data_sanitize_for_block_with_style_variations() {
 				),
 			),
 		);
+
+		$defaults->merge( $theme );
+		$actual = $defaults->get_raw_data();
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
-	public function test_sanitize_indexed_arrays() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
+	public function test_merge_incoming_data_presets_use_default_names() {
+		$defaults   = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version'  => '2',
-				'badKey2'  => 'I am Evil!!!!',
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'settings' => array(
-					'badKey3'    => 'I am Evil!!!!',
 					'typography' => array(
-						'badKey4'      => 'I am Evil!!!!',
-						'fontFamilies' => array(
-							'custom' => array(
-								array(
-									'badKey4'    => 'I am Evil!!!!',
-									'name'       => 'Arial',
-									'slug'       => 'arial',
-									'fontFamily' => 'Arial, sans-serif',
-								),
+						'fontSizes' => array(
+							array(
+								'name' => 'Small',
+								'slug' => 'small',
+								'size' => '12px',
 							),
-							'theme'  => array(
-								array(
-									'badKey5'    => 'I am Evil!!!!',
-									'name'       => 'Piazzolla',
-									'slug'       => 'piazzolla',
-									'fontFamily' => 'Piazzolla',
-									'fontFace'   => array(
-										array(
-											'badKey6'    => 'I am Evil!!!!',
-											'fontFamily' => 'Piazzolla',
-											'fontStyle'  => 'italic',
-											'fontWeight' => '400',
-											'src'        => 'https://example.com/font.ttf',
-										),
-										array(
-											'badKey7'    => 'I am Evil!!!!',
-											'fontFamily' => 'Piazzolla',
-											'fontStyle'  => 'italic',
-											'fontWeight' => '400',
-											'src'        => 'https://example.com/font.ttf',
-										),
-									),
-								),
-								array(
-									'badKey8'    => 'I am Evil!!!!',
-									'name'       => 'Inter',
-									'slug'       => 'Inter',
-									'fontFamily' => 'Inter',
-									'fontFace'   => array(
-										array(
-											'badKey9'    => 'I am Evil!!!!',
-											'fontFamily' => 'Inter',
-											'fontStyle'  => 'italic',
-											'fontWeight' => '400',
-											'src'        => 'https://example.com/font.ttf',
-										),
-										array(
-											'badKey10'   => 'I am Evil!!!!',
-											'fontFamily' => 'Inter',
-											'fontStyle'  => 'italic',
-											'fontWeight' => '400',
-											'src'        => 'https://example.com/font.ttf',
-										),
-									),
-								),
+							array(
+								'name' => 'Large',
+								'slug' => 'large',
+								'size' => '20px',
 							),
 						),
 					),
 				),
-			)
+			),
+			'default'
 		);
-
-		$expected_sanitized   = array(
-			'version'  => '2',
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'typography' => array(
+						'fontSizes' => array(
+							array(
+								'slug' => 'small',
+								'size' => '1.1rem',
+							),
+							array(
+								'slug' => 'large',
+								'size' => '1.75rem',
+							),
+							array(
+								'name' => 'Huge',
+								'slug' => 'huge',
+								'size' => '3rem',
+							),
+						),
+					),
+				),
+			),
+			'theme'
+		);
+		$expected   = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 			'settings' => array(
 				'typography' => array(
-					'fontFamilies' => array(
-						'custom' => array(
+					'fontSizes' => array(
+						'default' => array(
 							array(
-								'name'       => 'Arial',
-								'slug'       => 'arial',
-								'fontFamily' => 'Arial, sans-serif',
+								'name' => 'Small',
+								'slug' => 'small',
+								'size' => '12px',
+							),
+							array(
+								'name' => 'Large',
+								'slug' => 'large',
+								'size' => '20px',
 							),
 						),
-						'theme'  => array(
+						'theme'   => array(
 							array(
-								'name'       => 'Piazzolla',
-								'slug'       => 'piazzolla',
-								'fontFamily' => 'Piazzolla',
-								'fontFace'   => array(
-									array(
-										'fontFamily' => 'Piazzolla',
-										'fontStyle'  => 'italic',
-										'fontWeight' => '400',
-										'src'        => 'https://example.com/font.ttf',
-									),
-									array(
-										'fontFamily' => 'Piazzolla',
-										'fontStyle'  => 'italic',
-										'fontWeight' => '400',
-										'src'        => 'https://example.com/font.ttf',
-									),
-								),
+								'slug' => 'small',
+								'size' => '1.1rem',
+								'name' => 'Small',
 							),
 							array(
-								'name'       => 'Inter',
-								'slug'       => 'Inter',
-								'fontFamily' => 'Inter',
-								'fontFace'   => array(
-									array(
-										'fontFamily' => 'Inter',
-										'fontStyle'  => 'italic',
-										'fontWeight' => '400',
-										'src'        => 'https://example.com/font.ttf',
+								'slug' => 'large',
+								'size' => '1.75rem',
+								'name' => 'Large',
+							),
+							array(
+								'name' => 'Huge',
+								'slug' => 'huge',
+								'size' => '3rem',
+							),
+						),
+					),
+				),
+			),
+		);
+		$defaults->merge( $theme_json );
+		$actual = $defaults->get_raw_data();
+		$this->assertSameSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_merge_incoming_background_styles() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'background' => array(
+						'backgroundImage' => array(
+							'url' => 'http://example.org/quote.png',
+						),
+						'backgroundSize'  => 'cover',
+					),
+					'blocks'     => array(
+						'core/group' => array(
+							'background' => array(
+								'backgroundImage'      => array(
+									'ref' => 'styles.blocks.core/verse.background.backgroundImage',
+								),
+								'backgroundAttachment' => 'fixed',
+							),
+						),
+						'core/quote' => array(
+							'background' => array(
+								'backgroundImage'      => array(
+									'url' => 'http://example.org/quote.png',
+								),
+								'backgroundAttachment' => array(
+									'ref' => 'styles.blocks.core/group.background.backgroundAttachment',
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$update_background_image_styles = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'background' => array(
+					'backgroundSize' => 'contain',
+				),
+				'blocks'     => array(
+					'core/group' => array(
+						'background' => array(
+							'backgroundImage' => array(
+								'url' => 'http://example.org/group.png',
+							),
+						),
+					),
+					'core/quote' => array(
+						'background' => array(
+							'backgroundAttachment' => 'fixed',
+						),
+					),
+					'core/verse' => array(
+						'background' => array(
+							'backgroundImage' => array(
+								'ref' => 'styles.blocks.core/group.background.backgroundImage',
+							),
+						),
+					),
+				),
+			),
+		);
+		$expected                       = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'background' => array(
+					'backgroundImage' => array(
+						'url' => 'http://example.org/quote.png',
+					),
+					'backgroundSize'  => 'contain',
+				),
+				'blocks'     => array(
+					'core/group' => array(
+						'background' => array(
+							'backgroundImage'      => array(
+								'url' => 'http://example.org/group.png',
+							),
+							'backgroundAttachment' => 'fixed',
+						),
+					),
+					'core/quote' => array(
+						'background' => array(
+							'backgroundImage'      => array(
+								'url' => 'http://example.org/quote.png',
+							),
+							'backgroundAttachment' => 'fixed',
+						),
+					),
+					'core/verse' => array(
+						'background' => array(
+							'backgroundImage' => array(
+								'ref' => 'styles.blocks.core/group.background.backgroundImage',
+							),
+						),
+					),
+				),
+			),
+		);
+		$theme_json->merge( new WP_Theme_JSON_Gutenberg( $update_background_image_styles ) );
+		$actual = $theme_json->get_raw_data();
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_remove_insecure_properties_removes_unsafe_styles() {
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'color'    => array(
+						'gradient' => 'url(\'data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMCcgaGVpZ2h0PScxMCc+PHNjcmlwdD5hbGVydCgnb2snKTwvc2NyaXB0PjxsaW5lYXJHcmFkaWVudCBpZD0nZ3JhZGllbnQnPjxzdG9wIG9mZnNldD0nMTAlJyBzdG9wLWNvbG9yPScjRjAwJy8+PHN0b3Agb2Zmc2V0PSc5MCUnIHN0b3AtY29sb3I9JyNmY2MnLz4gPC9saW5lYXJHcmFkaWVudD48cmVjdCBmaWxsPSd1cmwoI2dyYWRpZW50KScgeD0nMCcgeT0nMCcgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScvPjwvc3ZnPg==\')',
+						'text'     => 'var:preset|color|dark-red',
+					),
+					'elements' => array(
+						'link' => array(
+							'color' => array(
+								'gradient'   => 'url(\'data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMCcgaGVpZ2h0PScxMCc+PHNjcmlwdD5hbGVydCgnb2snKTwvc2NyaXB0PjxsaW5lYXJHcmFkaWVudCBpZD0nZ3JhZGllbnQnPjxzdG9wIG9mZnNldD0nMTAlJyBzdG9wLWNvbG9yPScjRjAwJy8+PHN0b3Agb2Zmc2V0PSc5MCUnIHN0b3AtY29sb3I9JyNmY2MnLz4gPC9saW5lYXJHcmFkaWVudD48cmVjdCBmaWxsPSd1cmwoI2dyYWRpZW50KScgeD0nMCcgeT0nMCcgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScvPjwvc3ZnPg==\')',
+								'text'       => 'var:preset|color|dark-pink',
+								'background' => 'var:preset|color|dark-red',
+							),
+						),
+					),
+					'blocks'   => array(
+						'core/image'  => array(
+							'filter' => array(
+								'duotone' => 'var:preset|duotone|blue-red',
+							),
+						),
+						'core/cover'  => array(
+							'filter' => array(
+								'duotone' => 'var(--invalid',
+							),
+						),
+						'core/group'  => array(
+							'color'    => array(
+								'gradient' => 'url(\'data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMCcgaGVpZ2h0PScxMCc+PHNjcmlwdD5hbGVydCgnb2snKTwvc2NyaXB0PjxsaW5lYXJHcmFkaWVudCBpZD0nZ3JhZGllbnQnPjxzdG9wIG9mZnNldD0nMTAlJyBzdG9wLWNvbG9yPScjRjAwJy8+PHN0b3Agb2Zmc2V0PSc5MCUnIHN0b3AtY29sb3I9JyNmY2MnLz4gPC9saW5lYXJHcmFkaWVudD48cmVjdCBmaWxsPSd1cmwoI2dyYWRpZW50KScgeD0nMCcgeT0nMCcgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScvPjwvc3ZnPg==\')',
+								'text'     => 'var:preset|color|dark-gray',
+							),
+							'elements' => array(
+								'link' => array(
+									'color' => array(
+										'gradient' => 'url(\'data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScxMCcgaGVpZ2h0PScxMCc+PHNjcmlwdD5hbGVydCgnb2snKTwvc2NyaXB0PjxsaW5lYXJHcmFkaWVudCBpZD0nZ3JhZGllbnQnPjxzdG9wIG9mZnNldD0nMTAlJyBzdG9wLWNvbG9yPScjRjAwJy8+PHN0b3Agb2Zmc2V0PSc5MCUnIHN0b3AtY29sb3I9JyNmY2MnLz4gPC9saW5lYXJHcmFkaWVudD48cmVjdCBmaWxsPSd1cmwoI2dyYWRpZW50KScgeD0nMCcgeT0nMCcgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScvPjwvc3ZnPg==\')',
+										'text'     => 'var:preset|color|dark-pink',
 									),
-									array(
-										'fontFamily' => 'Inter',
-										'fontStyle'  => 'italic',
-										'fontWeight' => '400',
-										'src'        => 'https://example.com/font.ttf',
+								),
+							),
+						),
+						'invalid/key' => array(
+							'background' => 'green',
+						),
+					),
+				),
+			)
+		);
+
+		$expected = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'color'    => array(
+					'text' => 'var(--wp--preset--color--dark-red)',
+				),
+				'elements' => array(
+					'link' => array(
+						'color' => array(
+							'text'       => 'var(--wp--preset--color--dark-pink)',
+							'background' => 'var(--wp--preset--color--dark-red)',
+						),
+					),
+				),
+				'blocks'   => array(
+					'core/image' => array(
+						'filter' => array(
+							'duotone' => 'var(--wp--preset--duotone--blue-red)',
+						),
+					),
+					'core/group' => array(
+						'color'    => array(
+							'text' => 'var(--wp--preset--color--dark-gray)',
+						),
+						'elements' => array(
+							'link' => array(
+								'color' => array(
+									'text' => 'var(--wp--preset--color--dark-pink)',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_remove_insecure_properties_removes_unsafe_styles_sub_properties() {
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'border'   => array(
+						'radius' => array(
+							'topLeft'     => '6px',
+							'topRight'    => 'var(--invalid',
+							'bottomRight' => '6px',
+							'bottomLeft'  => '6px',
+						),
+					),
+					'spacing'  => array(
+						'padding' => array(
+							'top'    => '1px',
+							'right'  => '1px',
+							'bottom' => 'var(--invalid',
+							'left'   => '1px',
+						),
+					),
+					'elements' => array(
+						'link' => array(
+							'spacing' => array(
+								'padding' => array(
+									'top'    => '2px',
+									'right'  => '2px',
+									'bottom' => 'var(--invalid',
+									'left'   => '2px',
+								),
+							),
+						),
+					),
+					'blocks'   => array(
+						'core/group' => array(
+							'border'   => array(
+								'radius' => array(
+									'topLeft'     => '5px',
+									'topRight'    => 'var(--invalid',
+									'bottomRight' => '5px',
+									'bottomLeft'  => '5px',
+								),
+							),
+							'spacing'  => array(
+								'padding' => array(
+									'top'    => '3px',
+									'right'  => '3px',
+									'bottom' => 'var(--invalid',
+									'left'   => '3px',
+								),
+							),
+							'elements' => array(
+								'link' => array(
+									'spacing' => array(
+										'padding' => array(
+											'top'    => '4px',
+											'right'  => '4px',
+											'bottom' => 'var(--invalid',
+											'left'   => '4px',
+										),
 									),
 								),
 							),
@@ -1771,327 +2556,2550 @@ public function test_sanitize_indexed_arrays() {
 					),
 				),
 			),
+			true
+		);
+
+		$expected = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'border'   => array(
+					'radius' => array(
+						'topLeft'     => '6px',
+						'bottomRight' => '6px',
+						'bottomLeft'  => '6px',
+					),
+				),
+				'spacing'  => array(
+					'padding' => array(
+						'top'   => '1px',
+						'right' => '1px',
+						'left'  => '1px',
+					),
+				),
+				'elements' => array(
+					'link' => array(
+						'spacing' => array(
+							'padding' => array(
+								'top'   => '2px',
+								'right' => '2px',
+								'left'  => '2px',
+							),
+						),
+					),
+				),
+				'blocks'   => array(
+					'core/group' => array(
+						'border'   => array(
+							'radius' => array(
+								'topLeft'     => '5px',
+								'bottomRight' => '5px',
+								'bottomLeft'  => '5px',
+							),
+						),
+						'spacing'  => array(
+							'padding' => array(
+								'top'   => '3px',
+								'right' => '3px',
+								'left'  => '3px',
+							),
+						),
+						'elements' => array(
+							'link' => array(
+								'spacing' => array(
+									'padding' => array(
+										'top'   => '4px',
+										'right' => '4px',
+										'left'  => '4px',
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_remove_insecure_properties_removes_non_preset_settings() {
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color'   => array(
+						'custom'  => true,
+						'palette' => array(
+							'custom' => array(
+								array(
+									'name'  => 'Red',
+									'slug'  => 'red',
+									'color' => '#ff0000',
+								),
+								array(
+									'name'  => 'Green',
+									'slug'  => 'green',
+									'color' => '#00ff00',
+								),
+								array(
+									'name'  => 'Blue',
+									'slug'  => 'blue',
+									'color' => '#0000ff',
+								),
+							),
+						),
+					),
+					'spacing' => array(
+						'padding' => false,
+					),
+					'blocks'  => array(
+						'core/group' => array(
+							'color'   => array(
+								'custom'  => true,
+								'palette' => array(
+									'custom' => array(
+										array(
+											'name'  => 'Yellow',
+											'slug'  => 'yellow',
+											'color' => '#ff0000',
+										),
+										array(
+											'name'  => 'Pink',
+											'slug'  => 'pink',
+											'color' => '#00ff00',
+										),
+										array(
+											'name'  => 'Orange',
+											'slug'  => 'orange',
+											'color' => '#0000ff',
+										),
+									),
+								),
+							),
+							'spacing' => array(
+								'padding' => false,
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'  => array(
+					'palette' => array(
+						'custom' => array(
+							array(
+								'name'  => 'Red',
+								'slug'  => 'red',
+								'color' => '#ff0000',
+							),
+							array(
+								'name'  => 'Green',
+								'slug'  => 'green',
+								'color' => '#00ff00',
+							),
+							array(
+								'name'  => 'Blue',
+								'slug'  => 'blue',
+								'color' => '#0000ff',
+							),
+						),
+					),
+				),
+				'blocks' => array(
+					'core/group' => array(
+						'color' => array(
+							'palette' => array(
+								'custom' => array(
+									array(
+										'name'  => 'Yellow',
+										'slug'  => 'yellow',
+										'color' => '#ff0000',
+									),
+									array(
+										'name'  => 'Pink',
+										'slug'  => 'pink',
+										'color' => '#00ff00',
+									),
+									array(
+										'name'  => 'Orange',
+										'slug'  => 'orange',
+										'color' => '#0000ff',
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_remove_insecure_properties_removes_unsafe_preset_settings() {
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color'      => array(
+						'palette' => array(
+							'custom' => array(
+								array(
+									'name'  => 'Red/><b>ok</ok>',
+									'slug'  => 'red',
+									'color' => '#ff0000',
+								),
+								array(
+									'name'  => 'Green',
+									'slug'  => 'a" attr',
+									'color' => '#00ff00',
+								),
+								array(
+									'name'  => 'Blue',
+									'slug'  => 'blue',
+									'color' => 'var(--invalid',
+								),
+								array(
+									'name'  => 'Pink',
+									'slug'  => 'pink',
+									'color' => '#FFC0CB',
+								),
+							),
+						),
+					),
+					'typography' => array(
+						'fontFamilies' => array(
+							'custom' => array(
+								array(
+									'name'       => 'Helvetica Arial/><b>test</b>',
+									'slug'       => 'helvetica-arial',
+									'fontFamily' => 'Helvetica Neue, Helvetica, Arial, sans-serif',
+								),
+								array(
+									'name'       => 'Geneva',
+									'slug'       => 'geneva#asa',
+									'fontFamily' => 'Geneva, Tahoma, Verdana, sans-serif',
+								),
+								array(
+									'name'       => 'Cambria',
+									'slug'       => 'cambria',
+									'fontFamily' => 'Cambria, Georgia, serif',
+								),
+								array(
+									'name'       => 'Helvetica Arial',
+									'slug'       => 'helvetica-arial',
+									'fontFamily' => 'var(--invalid',
+								),
+							),
+						),
+					),
+					'blocks'     => array(
+						'core/group' => array(
+							'color' => array(
+								'palette' => array(
+									'custom' => array(
+										array(
+											'name'  => 'Red/><b>ok</ok>',
+											'slug'  => 'red',
+											'color' => '#ff0000',
+										),
+										array(
+											'name'  => 'Green',
+											'slug'  => 'a" attr',
+											'color' => '#00ff00',
+										),
+										array(
+											'name'  => 'Blue',
+											'slug'  => 'blue',
+											'color' => 'var(--invalid',
+										),
+										array(
+											'name'  => 'Pink',
+											'slug'  => 'pink',
+											'color' => '#FFC0CB',
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'      => array(
+					'palette' => array(
+						'custom' => array(
+							array(
+								'name'  => 'Pink',
+								'slug'  => 'pink',
+								'color' => '#FFC0CB',
+							),
+						),
+					),
+				),
+				'typography' => array(
+					'fontFamilies' => array(
+						'custom' => array(
+							array(
+								'name'       => 'Cambria',
+								'slug'       => 'cambria',
+								'fontFamily' => 'Cambria, Georgia, serif',
+							),
+						),
+					),
+				),
+				'blocks'     => array(
+					'core/group' => array(
+						'color' => array(
+							'palette' => array(
+								'custom' => array(
+									array(
+										'name'  => 'Pink',
+										'slug'  => 'pink',
+										'color' => '#FFC0CB',
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_remove_insecure_properties_applies_safe_styles() {
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'color' => array(
+						'text' => '#abcabc ', // Trailing space.
+					),
+				),
+			),
+			true
+		);
+
+		$expected = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'color' => array(
+					'text' => '#abcabc ',
+				),
+			),
+		);
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	/**
+	 * @covers WP_Theme_JSON_Gutenberg::remove_insecure_properties
+	 */
+	public function test_remove_insecure_properties_should_allow_indirect_properties() {
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'   => array(
+					'spacing' => array(
+						'blockGap' => '3em',
+					),
+					'blocks'  => array(
+						'core/social-links' => array(
+							'spacing' => array(
+								'blockGap' => array(
+									'left' => '2em',
+									'top'  => '1em',
+								),
+							),
+						),
+					),
+				),
+				'settings' => array(
+					'layout' => array(
+						'contentSize' => '800px',
+						'wideSize'    => '1000px',
+					),
+				),
+			)
+		);
+
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'   => array(
+				'spacing' => array(
+					'blockGap' => '3em',
+				),
+				'blocks'  => array(
+					'core/social-links' => array(
+						'spacing' => array(
+							'blockGap' => array(
+								'left' => '2em',
+								'top'  => '1em',
+							),
+						),
+					),
+				),
+			),
+			'settings' => array(
+				'layout' => array(
+					'contentSize' => '800px',
+					'wideSize'    => '1000px',
+				),
+			),
+		);
+
+		$this->assertSameSetsWithIndex( $expected, $actual );
+	}
+
+
+	public function test_remove_invalid_element_pseudo_selectors() {
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'elements' => array(
+						'link' => array(
+							'color'  => array(
+								'text'       => 'hotpink',
+								'background' => 'yellow',
+							),
+							':hover' => array(
+								'color' => array(
+									'text'       => 'red',
+									'background' => 'blue',
+								),
+							),
+							':seen'  => array(
+								'color' => array(
+									'background' => 'ivory',
+								),
+							),
+						),
+					),
+				),
+			),
+			true
+		);
+
+		$expected = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'elements' => array(
+					'link' => array(
+						'color'  => array(
+							'text'       => 'hotpink',
+							'background' => 'yellow',
+						),
+						':hover' => array(
+							'color' => array(
+								'text'       => 'red',
+								'background' => 'blue',
+							),
+						),
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_get_custom_templates() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'         => 1,
+				'customTemplates' => array(
+					array(
+						'name'  => 'page-home',
+						'title' => 'Homepage template',
+					),
+				),
+			)
+		);
+
+		$page_templates = $theme_json->get_custom_templates();
+
+		$this->assertEqualSetsWithIndex(
+			$page_templates,
+			array(
+				'page-home' => array(
+					'title'     => 'Homepage template',
+					'postTypes' => array( 'page' ),
+				),
+			)
+		);
+	}
+
+	public function test_get_template_parts() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'       => 1,
+				'templateParts' => array(
+					array(
+						'name'  => 'small-header',
+						'title' => 'Small Header',
+						'area'  => 'header',
+					),
+				),
+			)
+		);
+
+		$template_parts = $theme_json->get_template_parts();
+
+		$this->assertEqualSetsWithIndex(
+			$template_parts,
+			array(
+				'small-header' => array(
+					'title' => 'Small Header',
+					'area'  => 'header',
+				),
+			)
+		);
+	}
+
+	public function test_get_from_editor_settings() {
+		$input = array(
+			'disableCustomColors'    => true,
+			'disableCustomGradients' => true,
+			'disableCustomFontSizes' => true,
+			'enableCustomLineHeight' => true,
+			'enableCustomUnits'      => true,
+			'colors'                 => array(
+				array(
+					'slug'  => 'color-slug',
+					'name'  => 'Color Name',
+					'color' => 'colorvalue',
+				),
+			),
+			'gradients'              => array(
+				array(
+					'slug'     => 'gradient-slug',
+					'name'     => 'Gradient Name',
+					'gradient' => 'gradientvalue',
+				),
+			),
+			'fontSizes'              => array(
+				array(
+					'slug' => 'size-slug',
+					'name' => 'Size Name',
+					'size' => 'sizevalue',
+				),
+			),
+		);
+
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'      => array(
+					'custom'         => false,
+					'customGradient' => false,
+					'gradients'      => array(
+						array(
+							'slug'     => 'gradient-slug',
+							'name'     => 'Gradient Name',
+							'gradient' => 'gradientvalue',
+						),
+					),
+					'palette'        => array(
+						array(
+							'slug'  => 'color-slug',
+							'name'  => 'Color Name',
+							'color' => 'colorvalue',
+						),
+					),
+				),
+				'spacing'    => array(
+					'units' => array( 'px', 'em', 'rem', 'vh', 'vw', '%' ),
+				),
+				'typography' => array(
+					'customFontSize' => false,
+					'lineHeight'     => true,
+					'fontSizes'      => array(
+						array(
+							'slug' => 'size-slug',
+							'name' => 'Size Name',
+							'size' => 'sizevalue',
+						),
+					),
+				),
+			),
+		);
+
+		$actual = WP_Theme_JSON_Gutenberg::get_from_editor_settings( $input );
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_get_editor_settings_no_theme_support() {
+		$input = array(
+			'__unstableEnableFullSiteEditingBlocks' => false,
+			'disableCustomColors'                   => false,
+			'disableCustomFontSizes'                => false,
+			'disableCustomGradients'                => false,
+			'enableCustomLineHeight'                => false,
+			'enableCustomUnits'                     => false,
+			'imageSizes'                            => array(
+				array(
+					'slug' => 'thumbnail',
+					'name' => 'Thumbnail',
+				),
+				array(
+					'slug' => 'medium',
+					'name' => 'Medium',
+				),
+				array(
+					'slug' => 'large',
+					'name' => 'Large',
+				),
+				array(
+					'slug' => 'full',
+					'name' => 'Full Size',
+				),
+			),
+			'isRTL'                                 => false,
+			'maxUploadFileSize'                     => 123,
+		);
+
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color'      => array(
+					'custom'         => true,
+					'customGradient' => true,
+				),
+				'spacing'    => array(
+					'units' => false,
+				),
+				'typography' => array(
+					'customFontSize' => true,
+					'lineHeight'     => false,
+				),
+			),
+		);
+
+		$actual = WP_Theme_JSON_Gutenberg::get_from_editor_settings( $input );
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_get_editor_settings_blank() {
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(),
+		);
+		$actual   = WP_Theme_JSON_Gutenberg::get_from_editor_settings( array() );
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_get_editor_settings_custom_units_can_be_disabled() {
+		add_theme_support( 'custom-units', array() );
+		$actual = WP_Theme_JSON_Gutenberg::get_from_editor_settings( gutenberg_get_classic_theme_supports_block_editor_settings() );
+		remove_theme_support( 'custom-units' );
+
+		$expected = array(
+			'units'   => array( array() ),
+			'padding' => false,
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] );
+	}
+
+	public function test_get_editor_settings_custom_units_can_be_enabled() {
+		add_theme_support( 'custom-units' );
+		$actual = WP_Theme_JSON_Gutenberg::get_from_editor_settings( gutenberg_get_classic_theme_supports_block_editor_settings() );
+		remove_theme_support( 'custom-units' );
+
+		$expected = array(
+			'units'   => array( 'px', 'em', 'rem', 'vh', 'vw', '%' ),
+			'padding' => false,
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] );
+	}
+
+	public function test_get_editor_settings_custom_units_can_be_filtered() {
+		add_theme_support( 'custom-units', 'rem', 'em' );
+		$actual = WP_Theme_JSON_Gutenberg::get_from_editor_settings( gutenberg_get_classic_theme_supports_block_editor_settings() );
+		remove_theme_support( 'custom-units' );
+
+		$expected = array(
+			'units'   => array( 'rem', 'em' ),
+			'padding' => false,
+		);
+		$this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] );
+	}
+
+	public function test_export_data() {
+		$theme = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color' => array(
+						'palette' => array(
+							array(
+								'slug'  => 'white',
+								'color' => 'white',
+								'label' => 'White',
+							),
+							array(
+								'slug'  => 'black',
+								'color' => 'black',
+								'label' => 'Black',
+							),
+						),
+					),
+				),
+			)
+		);
+		$user  = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color' => array(
+						'palette' => array(
+							array(
+								'slug'  => 'white',
+								'color' => '#fff',
+								'label' => 'User White',
+							),
+							array(
+								'slug'  => 'hotpink',
+								'color' => 'hotpink',
+								'label' => 'hotpink',
+							),
+						),
+					),
+				),
+			),
+			'custom'
+		);
+
+		$theme->merge( $user );
+		$actual   = $theme->get_data();
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color' => array(
+					'palette' => array(
+						array(
+							'slug'  => 'white',
+							'color' => '#fff',
+							'label' => 'User White',
+						),
+						array(
+							'slug'  => 'black',
+							'color' => 'black',
+							'label' => 'Black',
+						),
+						array(
+							'slug'  => 'hotpink',
+							'color' => 'hotpink',
+							'label' => 'hotpink',
+						),
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_export_data_deals_with_empty_user_data() {
+		$theme = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color' => array(
+						'palette' => array(
+							array(
+								'slug'  => 'white',
+								'color' => 'white',
+								'label' => 'White',
+							),
+							array(
+								'slug'  => 'black',
+								'color' => 'black',
+								'label' => 'Black',
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$actual   = $theme->get_data();
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color' => array(
+					'palette' => array(
+						array(
+							'slug'  => 'white',
+							'color' => 'white',
+							'label' => 'White',
+						),
+						array(
+							'slug'  => 'black',
+							'color' => 'black',
+							'label' => 'Black',
+						),
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_export_data_deals_with_empty_theme_data() {
+		$user = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'color' => array(
+						'palette' => array(
+							array(
+								'slug'  => 'white',
+								'color' => '#fff',
+								'label' => 'User White',
+							),
+							array(
+								'slug'  => 'hotpink',
+								'color' => 'hotpink',
+								'label' => 'hotpink',
+							),
+						),
+					),
+				),
+			),
+			'custom'
+		);
+
+		$actual   = $user->get_data();
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'color' => array(
+					'palette' => array(
+						array(
+							'slug'  => 'white',
+							'color' => '#fff',
+							'label' => 'User White',
+						),
+						array(
+							'slug'  => 'hotpink',
+							'color' => 'hotpink',
+							'label' => 'hotpink',
+						),
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_export_data_deals_with_empty_data() {
+		$theme    = new WP_Theme_JSON_Gutenberg(
+			array( 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA ),
+			'theme'
+		);
+		$actual   = $theme->get_data();
+		$expected = array( 'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA );
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_export_data_sets_appearance_tools() {
+		$theme = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'appearanceTools' => true,
+					'blocks'          => array(
+						'core/paragraph' => array(
+							'appearanceTools' => true,
+						),
+					),
+				),
+			)
+		);
+
+		$actual   = $theme->get_data();
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'appearanceTools' => true,
+				'blocks'          => array(
+					'core/paragraph' => array(
+						'appearanceTools' => true,
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_export_data_sets_use_root_padding_aware_alignments() {
+		$theme = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'useRootPaddingAwareAlignments' => true,
+					'blocks'                        => array(
+						'core/paragraph' => array(
+							'useRootPaddingAwareAlignments' => true,
+						),
+					),
+				),
+			)
+		);
+
+		$actual   = $theme->get_data();
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'useRootPaddingAwareAlignments' => true,
+				'blocks'                        => array(
+					'core/paragraph' => array(
+						'useRootPaddingAwareAlignments' => true,
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_remove_invalid_font_family_settings() {
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'typography' => array(
+						'fontFamilies' => array(
+							'custom' => array(
+								array(
+									'name'       => 'Open Sans',
+									'slug'       => 'open-sans',
+									'fontFamily' => '"Open Sans", sans-serif</style><script>alert("xss")</script>',
+								),
+								array(
+									'name'       => 'Arial',
+									'slug'       => 'arial',
+									'fontFamily' => 'Arial, serif',
+								),
+							),
+						),
+					),
+				),
+			),
+			true
+		);
+
+		$expected = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'typography' => array(
+					'fontFamilies' => array(
+						'custom' => array(
+							array(
+								'name'       => 'Arial',
+								'slug'       => 'arial',
+								'fontFamily' => 'Arial, serif',
+							),
+						),
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_get_element_class_name_button() {
+		$expected = 'wp-element-button';
+		$actual   = WP_Theme_JSON_Gutenberg::get_element_class_name( 'button' );
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	public function test_get_element_class_name_invalid() {
+		$expected = '';
+		$actual   = WP_Theme_JSON_Gutenberg::get_element_class_name( 'unknown-element' );
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Testing that dynamic properties in theme.json return the value they reference,
+	 * e.g. array( 'ref' => 'styles.color.background' ) => "#ffffff".
+	 */
+	public function test_get_property_value_valid() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'color'    => array(
+						'background' => '#ffffff',
+						'text'       => '#000000',
+					),
+					'elements' => array(
+						'button' => array(
+							'color' => array(
+								'background' => array( 'ref' => 'styles.color.text' ),
+								'text'       => array( 'ref' => 'styles.color.background' ),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected = 'body{background-color: #ffffff;color: #000000;}:root :where(.wp-element-button, .wp-block-button__link){background-color: #000000;color: #ffffff;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
+	}
+
+	/**
+	 * Tests that get_property_value() static method returns an empty string
+	 * if the path is invalid or the value is null.
+	 *
+	 * Also, tests that PHP 8.1 "passing null to non-nullable" deprecation notice
+	 * is not thrown when passing the value to strncmp() in the method.
+	 *
+	 * The notice that we should not see:
+	 * `Deprecated: strncmp(): Passing null to parameter #1 ($string1) of type string is deprecated`.
+	 *
+	 * @dataProvider data_get_property_value_should_return_string_for_invalid_paths_or_null_values
+	 *
+	 * @covers WP_Theme_JSON_Gutenberg::get_property_value
+	 *
+	 * @param array $styles An array with style definitions.
+	 * @param array $path   Path to the desired properties.
+	 */
+	public function test_get_property_value_should_return_string_for_invalid_paths_or_null_values( $styles, $path ) {
+		$reflection_class = new ReflectionClass( WP_Theme_JSON_Gutenberg::class );
+
+		$get_property_value_method = $reflection_class->getMethod( 'get_property_value' );
+		$get_property_value_method->setAccessible( true );
+		$result = $get_property_value_method->invoke( null, $styles, $path );
+
+		$this->assertSame( '', $result );
+	}
+
+	/**
+	 * Data provider for test_get_property_value_should_return_string_for_invalid_paths_or_null_values().
+	 *
+	 * @return array
+	 */
+	public function data_get_property_value_should_return_string_for_invalid_paths_or_null_values() {
+		return array(
+			'empty string' => array(
+				'styles' => array(),
+				'path'   => array( 'non_existent_path' ),
+			),
+			'null'         => array(
+				'styles' => array( 'some_null_value' => null ),
+				'path'   => array( 'some_null_value' ),
+			),
+		);
+	}
+
+	/**
+	 * Testing that dynamic properties in theme.json that
+	 * refer to other dynamic properties in a loop
+	 * should be left untouched.
+	 *
+	 * @expectedIncorrectUsage get_property_value
+	 */
+	public function test_get_property_value_loop() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'color'    => array(
+						'background' => '#ffffff',
+						'text'       => array( 'ref' => 'styles.elements.button.color.background' ),
+					),
+					'elements' => array(
+						'button' => array(
+							'color' => array(
+								'background' => array( 'ref' => 'styles.color.text' ),
+								'text'       => array( 'ref' => 'styles.color.background' ),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected = 'body{background-color: #ffffff;}:root :where(.wp-element-button, .wp-block-button__link){color: #ffffff;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
+	}
+
+	/**
+	 * Testing that dynamic properties in theme.json that
+	 * refer to other dynamic properties
+	 * should be left unprocessed.
+	 *
+	 * @expectedIncorrectUsage get_property_value
+	 */
+	public function test_get_property_value_recursion() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'color'    => array(
+						'background' => '#ffffff',
+						'text'       => array( 'ref' => 'styles.color.background' ),
+					),
+					'elements' => array(
+						'button' => array(
+							'color' => array(
+								'background' => array( 'ref' => 'styles.color.text' ),
+								'text'       => array( 'ref' => 'styles.color.background' ),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected = 'body{background-color: #ffffff;color: #ffffff;}:root :where(.wp-element-button, .wp-block-button__link){color: #ffffff;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
+	}
+
+	/**
+	 * Testing that dynamic properties in theme.json that
+	 * refer to themselves should be left unprocessed.
+	 *
+	 * @expectedIncorrectUsage get_property_value
+	 */
+	public function test_get_property_value_self() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'color' => array(
+						'background' => '#ffffff',
+						'text'       => array( 'ref' => 'styles.color.text' ),
+					),
+				),
+			)
+		);
+
+		$expected = 'body{background-color: #ffffff;}';
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
+	}
+
+	public function test_get_styles_for_block_with_padding_aware_alignments() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'   => array(
+					'spacing' => array(
+						'padding' => array(
+							'top'    => '10px',
+							'right'  => '12px',
+							'bottom' => '10px',
+							'left'   => '12px',
+						),
+					),
+				),
+				'settings' => array(
+					'useRootPaddingAwareAlignments' => true,
+				),
+			)
+		);
+
+		$metadata = array(
+			'path'     => array( 'styles' ),
+			'selector' => 'body',
+		);
+
+		$expected    = ':where(body) { margin: 0; }.wp-site-blocks { padding-top: var(--wp--style--root--padding-top); padding-bottom: var(--wp--style--root--padding-bottom); }.has-global-padding { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }.has-global-padding > .alignfull { margin-right: calc(var(--wp--style--root--padding-right) * -1); margin-left: calc(var(--wp--style--root--padding-left) * -1); }.has-global-padding :where(:not(.alignfull.is-layout-flow) > .has-global-padding:not(.wp-block-block, .alignfull)) { padding-right: 0; padding-left: 0; }.has-global-padding :where(:not(.alignfull.is-layout-flow) > .has-global-padding:not(.wp-block-block, .alignfull)) > .alignfull { margin-left: 0; margin-right: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}.is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}body{--wp--style--root--padding-top: 10px;--wp--style--root--padding-right: 12px;--wp--style--root--padding-bottom: 10px;--wp--style--root--padding-left: 12px;}';
+		$root_rules  = $theme_json->get_root_layout_rules( WP_Theme_JSON_Gutenberg::ROOT_BLOCK_SELECTOR, $metadata );
+		$style_rules = $theme_json->get_styles_for_block( $metadata );
+		$this->assertSameCSS( $expected, $root_rules . $style_rules );
+	}
+
+	public function test_get_styles_for_block_without_padding_aware_alignments() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'spacing' => array(
+						'padding' => array(
+							'top'    => '10px',
+							'right'  => '12px',
+							'bottom' => '10px',
+							'left'   => '12px',
+						),
+					),
+				),
+			)
+		);
+
+		$metadata = array(
+			'path'     => array( 'styles' ),
+			'selector' => 'body',
+		);
+
+		$expected    = static::$base_styles . 'body{padding-top: 10px;padding-right: 12px;padding-bottom: 10px;padding-left: 12px;}';
+		$root_rules  = $theme_json->get_root_layout_rules( WP_Theme_JSON_Gutenberg::ROOT_BLOCK_SELECTOR, $metadata );
+		$style_rules = $theme_json->get_styles_for_block( $metadata );
+		$this->assertSameCSS( $expected, $root_rules . $style_rules );
+	}
+
+	public function test_get_styles_with_content_width() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'layout' => array(
+						'contentSize' => '800px',
+						'wideSize'    => '1000px',
+					),
+				),
+			)
+		);
+
+		$metadata = array(
+			'path'     => array( 'settings' ),
+			'selector' => 'body',
+		);
+
+		$expected = ':root { --wp--style--global--content-size: 800px;--wp--style--global--wide-size: 1000px; }:where(body) { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}.is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}';
+		$this->assertSameCSS( $expected, $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata ) );
+	}
+
+	public function test_get_styles_with_appearance_tools() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'appearanceTools' => true,
+				),
+			)
+		);
+
+		$metadata = array(
+			'path'     => array( 'settings' ),
+			'selector' => 'body',
+		);
+
+		$expected = ':where(body) { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: ; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child { margin-block-end: 0; }:root { --wp--style--block-gap: ; }:root :where(.is-layout-flow) > :first-child{margin-block-start: 0;}:root :where(.is-layout-flow) > :last-child{margin-block-end: 0;}:root :where(.is-layout-flow) > *{margin-block-start: 1;margin-block-end: 0;}:root :where(.is-layout-constrained) > :first-child{margin-block-start: 0;}:root :where(.is-layout-constrained) > :last-child{margin-block-end: 0;}:root :where(.is-layout-constrained) > *{margin-block-start: 1;margin-block-end: 0;}:root :where(.is-layout-flex){gap: 1;}:root :where(.is-layout-grid){gap: 1;}.is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}.is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}.is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}.is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}.is-layout-flex{flex-wrap: wrap;align-items: center;}.is-layout-flex > :is(*, div){margin: 0;}body .is-layout-grid{display: grid;}.is-layout-grid > :is(*, div){margin: 0;}';
+		$this->assertSameCSS( $expected, $theme_json->get_root_layout_rules( WP_Theme_JSON_Gutenberg::ROOT_BLOCK_SELECTOR, $metadata ) );
+	}
+
+	public function test_sanitization() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'spacing' => array(
+						'blockGap' => 'valid value',
+					),
+					'blocks'  => array(
+						'core/group' => array(
+							'spacing' => array(
+								'margin'  => 'valid value',
+								'display' => 'none',
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$actual   = $theme_json->get_raw_data();
+		$expected = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'spacing' => array(
+					'blockGap' => 'valid value',
+				),
+				'blocks'  => array(
+					'core/group' => array(
+						'spacing' => array(
+							'margin' => 'valid value',
+						),
+					),
+				),
+			),
+		);
+
+		$this->assertEqualSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_sanitize_for_unregistered_style_variations() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'blocks' => array(
+						'core/quote' => array(
+							'variations' => array(
+								'unregisteredVariation' => array(
+									'color' => array(
+										'background' => 'hotpink',
+									),
+								),
+								'plain'                 => array(
+									'color' => array(
+										'background' => 'hotpink',
+									),
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$sanitized_theme_json = $theme_json->get_raw_data();
+		$expected             = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/quote' => array(
+						'variations' => array(
+							'plain' => array(
+								'color' => array(
+									'background' => 'hotpink',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+		$this->assertSameSetsWithIndex( $expected, $sanitized_theme_json, 'Sanitized theme.json styles does not match' );
+	}
+
+	public function test_unwraps_block_style_variations() {
+		gutenberg_register_block_style(
+			array( 'core/paragraph', 'core/group' ),
+			array(
+				'name'  => 'myVariation',
+				'label' => 'My variation',
+			)
+		);
+
+		$input = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'variations' => array(
+						'myVariation' => array(
+							'color'      => array(
+								'background' => 'topLevel',
+								'gradient'   => 'topLevel',
+							),
+							'typography' => array(
+								'fontFamily' => 'topLevel',
+							),
+						),
+					),
+					'blocks'     => array(
+						'core/paragraph' => array(
+							'variations' => array(
+								'myVariation' => array(
+									'color'   => array(
+										'background' => 'blockLevel',
+										'text'       => 'blockLevel',
+									),
+									'outline' => array(
+										'offset' => 'blockLevel',
+									),
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/paragraph' => array(
+						'variations' => array(
+							'myVariation' => array(
+								'color'      => array(
+									'background' => 'blockLevel',
+									'gradient'   => 'topLevel',
+									'text'       => 'blockLevel',
+								),
+								'typography' => array(
+									'fontFamily' => 'topLevel',
+								),
+								'outline'    => array(
+									'offset' => 'blockLevel',
+								),
+							),
+						),
+					),
+					'core/group'     => array(
+						'variations' => array(
+							'myVariation' => array(
+								'color'      => array(
+									'background' => 'topLevel',
+									'gradient'   => 'topLevel',
+								),
+								'typography' => array(
+									'fontFamily' => 'topLevel',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+		$this->assertSameSetsWithIndex( $expected, $input->get_raw_data(), 'Unwrapped block style variations do not match' );
+	}
+
+	/**
+	 * @dataProvider data_sanitize_for_block_with_style_variations
+	 *
+	 * @param array $theme_json_variations Theme.json variations to test.
+	 * @param array $expected_sanitized    Expected results after sanitizing.
+	 */
+	public function test_sanitize_for_block_with_style_variations( $theme_json_variations, $expected_sanitized ) {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'blocks' => array(
+						'core/quote' => $theme_json_variations,
+					),
+				),
+			)
+		);
+
+		// Validate structure is sanitized.
+		$sanitized_theme_json = $theme_json->get_raw_data();
+		$this->assertIsArray( $sanitized_theme_json, 'Sanitized theme.json is not an array data type' );
+		$this->assertArrayHasKey( 'styles', $sanitized_theme_json, 'Sanitized theme.json does not have an "styles" key' );
+		$this->assertSameSetsWithIndex( $expected_sanitized, $sanitized_theme_json['styles'], 'Sanitized theme.json styles does not match' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_sanitize_for_block_with_style_variations() {
+		return array(
+			'1 variation with 1 valid property'     => array(
+				'theme_json_variations' => array(
+					'variations' => array(
+						'plain' => array(
+							'color' => array(
+								'background' => 'hotpink',
+							),
+						),
+					),
+				),
+				'expected_sanitized'    => array(
+					'blocks' => array(
+						'core/quote' => array(
+							'variations' => array(
+								'plain' => array(
+									'color' => array(
+										'background' => 'hotpink',
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+			'1 variation with 2 invalid properties' => array(
+				'theme_json_variations' => array(
+					'variations' => array(
+						'plain' => array(
+							'color'            => array(
+								'background' => 'hotpink',
+							),
+							'invalidProperty1' => 'value1',
+							'invalidProperty2' => 'value2',
+						),
+					),
+				),
+				'expected_sanitized'    => array(
+					'blocks' => array(
+						'core/quote' => array(
+							'variations' => array(
+								'plain' => array(
+									'color' => array(
+										'background' => 'hotpink',
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * Tests that invalid properties are removed from the theme.json inside indexed arrays as settings.typography.fontFamilies.
+	 */
+	public function test_sanitize_indexed_arrays() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'badKey2'  => 'I am Evil!',
+				'settings' => array(
+					'badKey3'    => 'I am Evil!',
+					'typography' => array(
+						'badKey4'      => 'I am Evil!',
+						'fontFamilies' => array(
+							'custom' => array(
+								array(
+									'badKey4'    => 'I am Evil!',
+									'name'       => 'Arial',
+									'slug'       => 'arial',
+									'fontFamily' => 'Arial, sans-serif',
+								),
+							),
+							'theme'  => array(
+								array(
+									'badKey5'    => 'I am Evil!',
+									'name'       => 'Piazzolla',
+									'slug'       => 'piazzolla',
+									'fontFamily' => 'Piazzolla',
+									'fontFace'   => array(
+										array(
+											'badKey6'    => 'I am Evil!',
+											'fontFamily' => 'Piazzolla',
+											'fontStyle'  => 'italic',
+											'fontWeight' => '400',
+											'src'        => 'https://example.com/font.ttf',
+										),
+										array(
+											'badKey7'    => 'I am Evil!',
+											'fontFamily' => 'Piazzolla',
+											'fontStyle'  => 'italic',
+											'fontWeight' => '400',
+											'src'        => 'https://example.com/font.ttf',
+										),
+									),
+								),
+								array(
+									'badKey8'    => 'I am Evil!',
+									'name'       => 'Inter',
+									'slug'       => 'Inter',
+									'fontFamily' => 'Inter',
+									'fontFace'   => array(
+										array(
+											'badKey9'    => 'I am Evil!',
+											'fontFamily' => 'Inter',
+											'fontStyle'  => 'italic',
+											'fontWeight' => '400',
+											'src'        => 'https://example.com/font.ttf',
+										),
+										array(
+											'badKey10'   => 'I am Evil!',
+											'fontFamily' => 'Inter',
+											'fontStyle'  => 'italic',
+											'fontWeight' => '400',
+											'src'        => 'https://example.com/font.ttf',
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected_sanitized   = array(
+			'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'settings' => array(
+				'typography' => array(
+					'fontFamilies' => array(
+						'custom' => array(
+							array(
+								'name'       => 'Arial',
+								'slug'       => 'arial',
+								'fontFamily' => 'Arial, sans-serif',
+							),
+						),
+						'theme'  => array(
+							array(
+								'name'       => 'Piazzolla',
+								'slug'       => 'piazzolla',
+								'fontFamily' => 'Piazzolla',
+								'fontFace'   => array(
+									array(
+										'fontFamily' => 'Piazzolla',
+										'fontStyle'  => 'italic',
+										'fontWeight' => '400',
+										'src'        => 'https://example.com/font.ttf',
+									),
+									array(
+										'fontFamily' => 'Piazzolla',
+										'fontStyle'  => 'italic',
+										'fontWeight' => '400',
+										'src'        => 'https://example.com/font.ttf',
+									),
+								),
+							),
+							array(
+								'name'       => 'Inter',
+								'slug'       => 'Inter',
+								'fontFamily' => 'Inter',
+								'fontFace'   => array(
+									array(
+										'fontFamily' => 'Inter',
+										'fontStyle'  => 'italic',
+										'fontWeight' => '400',
+										'src'        => 'https://example.com/font.ttf',
+									),
+									array(
+										'fontFamily' => 'Inter',
+										'fontStyle'  => 'italic',
+										'fontWeight' => '400',
+										'src'        => 'https://example.com/font.ttf',
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+		$sanitized_theme_json = $theme_json->get_raw_data();
+		$this->assertSameSetsWithIndex( $expected_sanitized, $sanitized_theme_json, 'Sanitized theme.json does not match' );
+	}
+
+	/**
+	 * @dataProvider data_sanitize_with_invalid_style_variation
+	 *
+	 * @param array $theme_json_variations The theme.json variations to test.
+	 */
+	public function test_sanitize_with_invalid_style_variation( $theme_json_variations ) {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'blocks' => array(
+						'core/quote' => $theme_json_variations,
+					),
+				),
+			)
+		);
+
+		// Validate structure is sanitized.
+		$sanitized_theme_json = $theme_json->get_raw_data();
+		$this->assertIsArray( $sanitized_theme_json, 'Sanitized theme.json is not an array data type' );
+		$this->assertArrayNotHasKey( 'styles', $sanitized_theme_json, 'Sanitized theme.json should not have a "styles" key' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_sanitize_with_invalid_style_variation() {
+		return array(
+			'empty string variation' => array(
+				array(
+					'variations' => '',
+				),
+			),
+			'boolean variation'      => array(
+				array(
+					'variations' => false,
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_styles_for_block_with_style_variations
+	 *
+	 * @param array  $theme_json_variations Theme.json variations to test.
+	 * @param string $metadata_variations   Style variations to test.
+	 * @param string $expected              Expected results for styling.
+	 */
+	public function test_get_styles_for_block_with_style_variations( $theme_json_variations, $metadata_variations, $expected ) {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'blocks' => array(
+						'core/quote' => $theme_json_variations,
+					),
+				),
+			)
+		);
+
+		// Validate styles are generated properly.
+		$metadata      = array(
+			'path'       => array( 'styles', 'blocks', 'core/quote' ),
+			'selector'   => '.wp-block-quote',
+			'variations' => $metadata_variations,
+		);
+		$actual_styles = $theme_json->get_styles_for_block( $metadata );
+		$this->assertSame( $expected, $actual_styles );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_styles_for_block_with_style_variations() {
+		$plain = array(
+			'metadata' => array(
+				'path'     => array( 'styles', 'blocks', 'core/quote', 'variations', 'plain' ),
+				'selector' => '.is-style-plain.wp-block-quote',
+			),
+			'styles'   => ':root :where(.is-style-plain.wp-block-quote){background-color: hotpink;}',
+		);
+
+		return array(
+			'1 variation with 1 invalid property'   => array(
+				'theme_json_variations' => array(
+					'variations' => array(
+						'plain' => array(
+							'color' => array(
+								'background' => 'hotpink',
+							),
+						),
+					),
+				),
+				'metadata_variation'    => array( $plain['metadata'] ),
+				'expected'              => $plain['styles'],
+			),
+			'1 variation with 2 invalid properties' => array(
+				'theme_json_variations' => array(
+					'variations' => array(
+						'plain' => array(
+							'color'            => array(
+								'background' => 'hotpink',
+							),
+							'invalidProperty1' => 'value1',
+							'invalidProperty2' => 'value2',
+						),
+					),
+				),
+				'metadata_variation'    => array( $plain['metadata'] ),
+				'expected'              => $plain['styles'],
+			),
+		);
+	}
+
+	public function test_block_style_variations() {
+		wp_set_current_user( static::$administrator_id );
+
+		$expected = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/button' => array(
+						'color'      => array(
+							'background' => 'blue',
+						),
+						'variations' => array(
+							'outline' => array(
+								'color' => array(
+									'background' => 'purple',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $expected );
+
+		$this->assertSameSetsWithIndex( $expected, $actual );
+	}
+
+	public function test_block_style_variations_with_invalid_properties() {
+		wp_set_current_user( static::$administrator_id );
+
+		$partially_invalid_variation = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/button' => array(
+						'color'      => array(
+							'background' => 'blue',
+						),
+						'variations' => array(
+							'outline' => array(
+								'color'   => array(
+									'background' => 'purple',
+								),
+								'invalid' => array(
+									'value' => 'should be stripped',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+
+		$expected = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/button' => array(
+						'color'      => array(
+							'background' => 'blue',
+						),
+						'variations' => array(
+							'outline' => array(
+								'color' => array(
+									'background' => 'purple',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+
+		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $partially_invalid_variation );
+
+		$this->assertSameSetsWithIndex( $expected, $actual );
+	}
+
+	/**
+	 * Tests generating the spacing presets array based on the spacing scale provided.
+	 *
+	 * @dataProvider data_set_spacing_sizes
+	 */
+	public function test_set_spacing_sizes( $spacing_scale, $expected_output ) {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'spacing' => array(
+						'spacingScale' => $spacing_scale,
+					),
+				),
+			),
+			'default'
+		);
+
+		$this->assertSame( $expected_output, _wp_array_get( $theme_json->get_raw_data(), array( 'settings', 'spacing', 'spacingSizes', 'default' ) ) );
+	}
+
+	/**
+	 * Data provider for spacing scale tests.
+	 *
+	 * @return array
+	 */
+	public function data_set_spacing_sizes() {
+		return array(
+			'only one value when single step in spacing scale' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 1,
+					'mediumStep' => 4,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => 'Medium',
+						'slug' => '50',
+						'size' => '4rem',
+					),
+				),
+			),
+			'one step above medium when two steps in spacing scale' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 2,
+					'mediumStep' => 4,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => 'Medium',
+						'slug' => '50',
+						'size' => '4rem',
+					),
+					array(
+						'name' => 'Large',
+						'slug' => '60',
+						'size' => '5.5rem',
+					),
+				),
+			),
+			'one step above medium and one below when three steps in spacing scale' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 3,
+					'mediumStep' => 4,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => 'Small',
+						'slug' => '40',
+						'size' => '2.5rem',
+					),
+					array(
+						'name' => 'Medium',
+						'slug' => '50',
+						'size' => '4rem',
+					),
+					array(
+						'name' => 'Large',
+						'slug' => '60',
+						'size' => '5.5rem',
+					),
+				),
+			),
+			'extra step added above medium when an even number of steps > 2 specified' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 4,
+					'mediumStep' => 4,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => 'Small',
+						'slug' => '40',
+						'size' => '2.5rem',
+					),
+					array(
+						'name' => 'Medium',
+						'slug' => '50',
+						'size' => '4rem',
+					),
+					array(
+						'name' => 'Large',
+						'slug' => '60',
+						'size' => '5.5rem',
+					),
+					array(
+						'name' => 'X-Large',
+						'slug' => '70',
+						'size' => '7rem',
+					),
+				),
+			),
+			'extra steps above medium if bottom end will go below zero' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 2.5,
+					'steps'      => 5,
+					'mediumStep' => 5,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => 'Small',
+						'slug' => '40',
+						'size' => '2.5rem',
+					),
+					array(
+						'name' => 'Medium',
+						'slug' => '50',
+						'size' => '5rem',
+					),
+					array(
+						'name' => 'Large',
+						'slug' => '60',
+						'size' => '7.5rem',
+					),
+					array(
+						'name' => 'X-Large',
+						'slug' => '70',
+						'size' => '10rem',
+					),
+					array(
+						'name' => '2X-Large',
+						'slug' => '80',
+						'size' => '12.5rem',
+					),
+				),
+			),
+			'multiplier correctly calculated above and below medium' => array(
+				'spacing_scale'   => array(
+					'operator'   => '*',
+					'increment'  => 1.5,
+					'steps'      => 5,
+					'mediumStep' => 1.5,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => 'X-Small',
+						'slug' => '30',
+						'size' => '0.67rem',
+					),
+					array(
+						'name' => 'Small',
+						'slug' => '40',
+						'size' => '1rem',
+					),
+					array(
+						'name' => 'Medium',
+						'slug' => '50',
+						'size' => '1.5rem',
+					),
+					array(
+						'name' => 'Large',
+						'slug' => '60',
+						'size' => '2.25rem',
+					),
+					array(
+						'name' => 'X-Large',
+						'slug' => '70',
+						'size' => '3.38rem',
+					),
+				),
+			),
+			'increment < 1 combined showing * operator acting as divisor above and below medium' => array(
+				'spacing_scale'   => array(
+					'operator'   => '*',
+					'increment'  => 0.25,
+					'steps'      => 5,
+					'mediumStep' => 1.5,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => 'X-Small',
+						'slug' => '30',
+						'size' => '0.09rem',
+					),
+					array(
+						'name' => 'Small',
+						'slug' => '40',
+						'size' => '0.38rem',
+					),
+					array(
+						'name' => 'Medium',
+						'slug' => '50',
+						'size' => '1.5rem',
+					),
+					array(
+						'name' => 'Large',
+						'slug' => '60',
+						'size' => '6rem',
+					),
+					array(
+						'name' => 'X-Large',
+						'slug' => '70',
+						'size' => '24rem',
+					),
+				),
+			),
+			't-shirt sizing used if more than 7 steps in scale' => array(
+				'spacing_scale'   => array(
+					'operator'   => '*',
+					'increment'  => 1.5,
+					'steps'      => 8,
+					'mediumStep' => 1.5,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => '2X-Small',
+						'slug' => '20',
+						'size' => '0.44rem',
+					),
+					array(
+						'name' => 'X-Small',
+						'slug' => '30',
+						'size' => '0.67rem',
+					),
+					array(
+						'name' => 'Small',
+						'slug' => '40',
+						'size' => '1rem',
+					),
+					array(
+						'name' => 'Medium',
+						'slug' => '50',
+						'size' => '1.5rem',
+					),
+					array(
+						'name' => 'Large',
+						'slug' => '60',
+						'size' => '2.25rem',
+					),
+					array(
+						'name' => 'X-Large',
+						'slug' => '70',
+						'size' => '3.38rem',
+					),
+					array(
+						'name' => '2X-Large',
+						'slug' => '80',
+						'size' => '5.06rem',
+					),
+					array(
+						'name' => '3X-Large',
+						'slug' => '90',
+						'size' => '7.59rem',
+					),
+				),
+			),
 		);
-		$sanitized_theme_json = $theme_json->get_raw_data();
-		$this->assertSameSetsWithIndex( $expected_sanitized, $sanitized_theme_json, 'Sanitized theme.json does not match' );
 	}
 
 	/**
-	 * @dataProvider data_sanitize_with_invalid_style_variation
+	 * Tests generating the spacing presets array based on the spacing scale provided.
 	 *
-	 * @param array $theme_json_variations The theme.json variations to test.
+	 * @dataProvider data_set_spacing_sizes_when_invalid
+	 *
+	 * @param array $spacing_scale   Example spacing scale definitions from the data provider.
+	 * @param array $expected_output Expected output from data provider.
 	 */
-	public function test_sanitize_with_invalid_style_variation( $theme_json_variations ) {
+	public function test_set_spacing_sizes_when_invalid( $spacing_scale, $expected_output ) {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version' => 2,
-				'styles'  => array(
-					'blocks' => array(
-						'core/quote' => $theme_json_variations,
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'spacing' => array(
+						'spacingScale' => $spacing_scale,
 					),
 				),
-			)
+			),
+			'default'
 		);
 
-		// Validate structure is sanitized.
-		$sanitized_theme_json = $theme_json->get_raw_data();
-		$this->assertIsArray( $sanitized_theme_json, 'Sanitized theme.json is not an array data type' );
-		$this->assertArrayNotHasKey( 'styles', $sanitized_theme_json, 'Sanitized theme.json should not have a "styles" key' );
+		$this->assertSame( $expected_output, _wp_array_get( $theme_json->get_raw_data(), array( 'settings', 'spacing', 'spacingSizes', 'default' ) ) );
 	}
 
 	/**
-	 * Data provider.
+	 * Data provider for spacing scale tests.
 	 *
 	 * @return array
 	 */
-	public function data_sanitize_with_invalid_style_variation() {
+	public function data_set_spacing_sizes_when_invalid() {
 		return array(
-			'empty string variation' => array(
-				array(
-					'variations' => '',
+			'missing operator value'  => array(
+				'spacing_scale'   => array(
+					'operator'   => '',
+					'increment'  => 1.5,
+					'steps'      => 1,
+					'mediumStep' => 4,
+					'unit'       => 'rem',
 				),
+				'expected_output' => array(),
 			),
-			'boolean variation'      => array(
-				array(
-					'variations' => false,
+			'non numeric increment'   => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 'add two to previous value',
+					'steps'      => 1,
+					'mediumStep' => 4,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(),
+			),
+			'non numeric steps'       => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 'spiral staircase preferred',
+					'mediumStep' => 4,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(),
+			),
+			'non numeric medium step' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 5,
+					'mediumStep' => 'That which is just right',
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(),
+			),
+			'missing unit value'      => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 5,
+					'mediumStep' => 4,
 				),
+				'expected_output' => array(),
 			),
 		);
 	}
 
 	/**
-	 * @dataProvider data_get_styles_for_block_with_style_variations
+	 * Tests the core separator block outbut based on various provided settings.
 	 *
-	 * @param array  $theme_json_variations Theme.json variations to test.
-	 * @param string $metadata_variations   Style variations to test.
-	 * @param string $expected              Expected results for styling.
+	 * @dataProvider data_update_separator_declarations
+	 *
+	 * @param array $separator_block_settings Example separator block settings from the data provider.
+	 * @param array $expected_output          Expected output from data provider.
 	 */
-	public function test_get_styles_for_block_with_style_variations( $theme_json_variations, $metadata_variations, $expected ) {
+	public function test_update_separator_declarations( $separator_block_settings, $expected_output ) {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
-				'version' => 2,
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'styles'  => array(
 					'blocks' => array(
-						'core/quote' => $theme_json_variations,
+						'core/separator' => $separator_block_settings,
 					),
 				),
-			)
+			),
+			'default'
 		);
 
-		// Validate styles are generated properly.
-		$metadata      = array(
-			'path'       => array( 'styles', 'blocks', 'core/quote' ),
-			'selector'   => '.wp-block-quote',
-			'variations' => $metadata_variations,
+		$separator_node = array(
+			'path'     => array( 'styles', 'blocks', 'core/separator' ),
+			'selector' => '.wp-block-separator',
 		);
-		$actual_styles = $theme_json->get_styles_for_block( $metadata );
-		$this->assertSame( $expected, $actual_styles );
+		$this->assertSame( $expected_output, $theme_json->get_styles_for_block( $separator_node ) );
 	}
 
 	/**
-	 * Data provider.
+	 * Data provider for separator declaration tests.
 	 *
 	 * @return array
 	 */
-	public function data_get_styles_for_block_with_style_variations() {
-		$plain = array(
-			'metadata' => array(
-				'path'     => array( 'styles', 'blocks', 'core/quote', 'variations', 'plain' ),
-				'selector' => '.is-style-plain.is-style-plain.wp-block-quote',
-			),
-			'styles'   => '.is-style-plain.is-style-plain.wp-block-quote{background-color: hotpink;}',
-		);
-
+	public function data_update_separator_declarations() {
 		return array(
-			'1 variation with 1 invalid property'   => array(
-				'theme_json_variations' => array(
-					'variations' => array(
-						'plain' => array(
-							'color' => array(
-								'background' => 'hotpink',
-							),
-						),
+			// If only background is defined, test that includes border-color to the style so it is applied on the front end.
+			'only background'                      => array(
+				array(
+					'color' => array(
+						'background' => 'blue',
 					),
 				),
-				'metadata_variation'    => array( $plain['metadata'] ),
-				'expected'              => $plain['styles'],
+				'expected_output' => ':root :where(.wp-block-separator){background-color: blue;color: blue;}',
 			),
-			'1 variation with 2 invalid properties' => array(
-				'theme_json_variations' => array(
-					'variations' => array(
-						'plain' => array(
-							'color'            => array(
-								'background' => 'hotpink',
-							),
-							'invalidProperty1' => 'value1',
-							'invalidProperty2' => 'value2',
-						),
+			// If background and text are defined, do not include border-color, as text color is enough.
+			'background and text, no border-color' => array(
+				array(
+					'color' => array(
+						'background' => 'blue',
+						'text'       => 'red',
 					),
 				),
-				'metadata_variation'    => array( $plain['metadata'] ),
-				'expected'              => $plain['styles'],
+				'expected_output' => ':root :where(.wp-block-separator){background-color: blue;color: red;}',
+			),
+			// If only text is defined, do not include border-color, as by itself is enough.
+			'only text'                            => array(
+				array(
+					'color' => array(
+						'text' => 'red',
+					),
+				),
+				'expected_output' => ':root :where(.wp-block-separator){color: red;}',
+			),
+			// If background, text, and border-color are defined, include everything, CSS specificity will decide which to apply.
+			'background, text, and border-color'   => array(
+				array(
+					'color'  => array(
+						'background' => 'blue',
+						'text'       => 'red',
+					),
+					'border' => array(
+						'color' => 'pink',
+					),
+				),
+				'expected_output' => ':root :where(.wp-block-separator){background-color: blue;border-color: pink;color: red;}',
+			),
+			// If background and border color are defined, include everything, CSS specificity will decide which to apply.
+			'background, and border-color'         => array(
+				array(
+					'color'  => array(
+						'background' => 'blue',
+					),
+					'border' => array(
+						'color' => 'pink',
+					),
+				),
+				'expected_output' => ':root :where(.wp-block-separator){background-color: blue;border-color: pink;}',
 			),
 		);
 	}
 
-	public function test_block_style_variations() {
-		wp_set_current_user( static::$administrator_id );
-
-		$expected = array(
-			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-			'styles'  => array(
-				'blocks' => array(
-					'core/button' => array(
-						'color'      => array(
-							'background' => 'blue',
-						),
-						'variations' => array(
-							'outline' => array(
-								'color' => array(
-									'background' => 'purple',
-								),
+	public function test_shadow_preset_styles() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'shadow' => array(
+						'presets' => array(
+							array(
+								'slug'   => 'natural',
+								'shadow' => '5px 5px 5px 0 black',
+							),
+							array(
+								'slug'   => 'sharp',
+								'shadow' => '5px 5px black',
 							),
 						),
 					),
 				),
-			),
+			)
 		);
 
-		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $expected );
-
-		$this->assertSameSetsWithIndex( $expected, $actual );
+		$expected_styles = ':root{--wp--preset--shadow--natural: 5px 5px 5px 0 black;--wp--preset--shadow--sharp: 5px 5px black;}';
+		$this->assertSameCSS( $expected_styles, $theme_json->get_stylesheet(), 'Styles returned from "::get_stylesheet()" does not match expectations' );
+		$this->assertSameCSS( $expected_styles, $theme_json->get_stylesheet( array( 'variables' ) ), 'Styles returned from "::get_stylesheet()" when requiring "variables" type does not match expectations' );
 	}
 
-	public function test_block_style_variations_with_invalid_properties() {
-		wp_set_current_user( static::$administrator_id );
-
-		$partially_invalid_variation = array(
-			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-			'styles'  => array(
-				'blocks' => array(
-					'core/button' => array(
-						'color'      => array(
-							'background' => 'blue',
-						),
-						'variations' => array(
-							'outline' => array(
-								'color'   => array(
-									'background' => 'purple',
-								),
-								'invalid' => array(
-									'value' => 'should be stripped',
-								),
+	public function test_get_shadow_styles_for_blocks() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'settings' => array(
+					'shadow' => array(
+						'presets' => array(
+							array(
+								'slug'   => 'natural',
+								'shadow' => '5px 5px 0 0 black',
 							),
 						),
 					),
 				),
-			),
-		);
-
-		$expected = array(
-			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-			'styles'  => array(
-				'blocks' => array(
-					'core/button' => array(
-						'color'      => array(
-							'background' => 'blue',
+				'styles'   => array(
+					'blocks'   => array(
+						'core/paragraph' => array(
+							'shadow' => 'var(--wp--preset--shadow--natural)',
 						),
-						'variations' => array(
-							'outline' => array(
-								'color' => array(
-									'background' => 'purple',
-								),
-							),
+					),
+					'elements' => array(
+						'button' => array(
+							'shadow' => 'var:preset|shadow|natural',
+						),
+						'link'   => array(
+							'shadow' => array( 'ref' => 'styles.elements.button.shadow' ),
 						),
 					),
 				),
-			),
+			)
 		);
 
-		$actual = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $partially_invalid_variation );
-
-		$this->assertSameSetsWithIndex( $expected, $actual );
+		$variable_styles = ':root{--wp--preset--shadow--natural: 5px 5px 0 0 black;}';
+		$element_styles  = 'a:where(:not(.wp-element-button)){box-shadow: var(--wp--preset--shadow--natural);}:root :where(.wp-element-button, .wp-block-button__link){box-shadow: var(--wp--preset--shadow--natural);}:root :where(p){box-shadow: var(--wp--preset--shadow--natural);}';
+		$expected_styles = $variable_styles . $element_styles;
+		$this->assertSameCSS( $expected_styles, $theme_json->get_stylesheet( array( 'styles', 'presets', 'variables' ), null, array( 'skip_root_layout_styles' => true ) ) );
 	}
 
-	public function test_update_separator_declarations() {
-		// If only background is defined, test that includes border-color to the style so it is applied on the front end.
+	public function test_get_top_level_background_image_styles() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'styles'  => array(
-					'blocks' => array(
-						'core/separator' => array(
-							'color' => array(
-								'background' => 'blue',
-							),
+					'background' => array(
+						'backgroundImage'      => array(
+							'url' => 'http://example.org/image.png',
 						),
+						'backgroundRepeat'     => 'no-repeat',
+						'backgroundPosition'   => 'center center',
+						'backgroundAttachment' => 'fixed',
 					),
 				),
-			),
-			'default'
+			)
+		);
+
+		$body_node = array(
+			'path'     => array( 'styles' ),
+			'selector' => 'body',
 		);
 
-		$base_styles = 'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
-		$expected    = $base_styles . '.wp-block-separator{background-color: blue;color: blue;}';
-		$stylesheet  = $theme_json->get_stylesheet( array( 'styles' ) );
-		$this->assertEquals( $expected, $stylesheet );
+		$expected_styles = "html{min-height: calc(100% - var(--wp-admin--admin-bar--height, 0px));}body{background-image: url('http://example.org/image.png');background-position: center center;background-repeat: no-repeat;background-attachment: fixed;}";
+		$this->assertSameCSS( $expected_styles, $theme_json->get_styles_for_block( $body_node ), 'Styles returned from "::get_styles_for_block()" with top-level background styles do not match expectations' );
 
-		// If background and text are defined, do not include border-color, as text color is enough.
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'styles'  => array(
-					'blocks' => array(
-						'core/separator' => array(
-							'color' => array(
-								'background' => 'blue',
-								'text'       => 'red',
-							),
-						),
+					'background' => array(
+						'backgroundImage'      => "url('http://example.org/image.png')",
+						'backgroundSize'       => 'contain',
+						'backgroundRepeat'     => 'no-repeat',
+						'backgroundPosition'   => 'center center',
+						'backgroundAttachment' => 'fixed',
 					),
 				),
-			),
-			'default'
+			)
 		);
 
-		$expected   = $base_styles . '.wp-block-separator{background-color: blue;color: red;}';
-		$stylesheet = $theme_json->get_stylesheet( array( 'styles' ) );
-		$this->assertEquals( $expected, $stylesheet );
+		$expected_styles = "html{min-height: calc(100% - var(--wp-admin--admin-bar--height, 0px));}body{background-image: url('http://example.org/image.png');background-position: center center;background-repeat: no-repeat;background-size: contain;background-attachment: fixed;}";
+		$this->assertSameCSS( $expected_styles, $theme_json->get_styles_for_block( $body_node ), 'Styles returned from "::get_styles_for_block()" with top-level background image as string type do not match expectations' );
+	}
 
-		// If only text is defined, do not include border-color, as by itself is enough.
+	public function test_get_block_background_image_styles() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'styles'  => array(
 					'blocks' => array(
-						'core/separator' => array(
-							'color' => array(
-								'text' => 'red',
+						'core/group' => array(
+							'background' => array(
+								'backgroundImage'      => "url('http://example.org/group.png')",
+								'backgroundRepeat'     => 'no-repeat',
+								'backgroundPosition'   => 'center center',
+								'backgroundAttachment' => 'fixed',
+							),
+						),
+						'core/quote' => array(
+							'background' => array(
+								'backgroundImage' => array(
+									'url' => 'http://example.org/quote.png',
+									'id'  => 321,
+								),
+								'backgroundSize'  => 'contain',
+							),
+						),
+						'core/verse' => array(
+							'background' => array(
+								'backgroundImage' => array(
+									'url' => 'http://example.org/verse.png',
+									'id'  => 123,
+								),
 							),
 						),
 					),
 				),
+			)
+		);
+
+		$group_node = array(
+			'name'      => 'core/group',
+			'path'      => array( 'styles', 'blocks', 'core/group' ),
+			'selector'  => '.wp-block-group',
+			'selectors' => array(
+				'root' => '.wp-block-group',
 			),
-			'default'
 		);
-		$expected   = $base_styles . '.wp-block-separator{color: red;}';
-		$stylesheet = $theme_json->get_stylesheet( array( 'styles' ) );
-		$this->assertEquals( $expected, $stylesheet );
 
-		// If background, text, and border-color are defined, include everything, CSS specificity will decide which to apply.
+		$group_styles = ":root :where(.wp-block-group){background-image: url('http://example.org/group.png');background-position: center center;background-repeat: no-repeat;background-attachment: fixed;}";
+		$this->assertSameCSS( $group_styles, $theme_json->get_styles_for_block( $group_node ), 'Styles returned from "::get_styles_for_block()" with core/group background styles as string type do not match expectations' );
+
+		$quote_node = array(
+			'name'      => 'core/quote',
+			'path'      => array( 'styles', 'blocks', 'core/quote' ),
+			'selector'  => '.wp-block-quote',
+			'selectors' => array(
+				'root' => '.wp-block-quote',
+			),
+		);
+
+		$quote_styles = ":root :where(.wp-block-quote){background-image: url('http://example.org/quote.png');background-position: 50% 50%;background-size: contain;}";
+		$this->assertSameCSS( $quote_styles, $theme_json->get_styles_for_block( $quote_node ), 'Styles returned from "::get_styles_for_block()" with core/quote default background styles do not match expectations' );
+
+		$verse_node = array(
+			'name'      => 'core/verse',
+			'path'      => array( 'styles', 'blocks', 'core/verse' ),
+			'selector'  => '.wp-block-verse',
+			'selectors' => array(
+				'root' => '.wp-block-verse',
+			),
+		);
+
+		$verse_styles = ":root :where(.wp-block-verse){background-image: url('http://example.org/verse.png');background-size: cover;}";
+		$this->assertSameCSS( $verse_styles, $theme_json->get_styles_for_block( $verse_node ), 'Styles returned from "::get_styles_for_block()" with default core/verse background styles as string type do not match expectations' );
+	}
+
+	/**
+	 * Testing background dynamic properties in theme.json.
+	 */
+	public function test_get_resolved_background_image_styles() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'styles'  => array(
-					'blocks' => array(
-						'core/separator' => array(
-							'color'  => array(
-								'background' => 'blue',
-								'text'       => 'red',
+					'background' => array(
+						'backgroundImage'      => array(
+							'url' => 'http://example.org/top.png',
+						),
+						'backgroundSize'       => 'contain',
+						'backgroundRepeat'     => 'repeat',
+						'backgroundPosition'   => '10% 20%',
+						'backgroundAttachment' => 'scroll',
+					),
+					'blocks'     => array(
+						'core/group'        => array(
+							'background' => array(
+								'backgroundImage' => array(
+									'id'  => 123,
+									'url' => 'http://example.org/group.png',
+								),
 							),
-							'border' => array(
-								'color' => 'pink',
+						),
+						'core/post-content' => array(
+							'background' => array(
+								'backgroundImage'      => array(
+									'ref' => 'styles.background.backgroundImage',
+								),
+								'backgroundSize'       => array(
+									'ref' => 'styles.background.backgroundSize',
+								),
+								'backgroundRepeat'     => array(
+									'ref' => 'styles.background.backgroundRepeat',
+								),
+								'backgroundPosition'   => array(
+									'ref' => 'styles.background.backgroundPosition',
+								),
+								'backgroundAttachment' => array(
+									'ref' => 'styles.background.backgroundAttachment',
+								),
 							),
 						),
 					),
 				),
-			),
-			'default'
+			)
 		);
-		$expected   = $base_styles . '.wp-block-separator{background-color: blue;border-color: pink;color: red;}';
-		$stylesheet = $theme_json->get_stylesheet( array( 'styles' ) );
-		$this->assertEquals( $expected, $stylesheet );
 
-		// If background and border color are defined, include everything, CSS specificity will decide which to apply.
+		$expected = "html{min-height: calc(100% - var(--wp-admin--admin-bar--height, 0px));}body{background-image: url('http://example.org/top.png');background-position: 10% 20%;background-repeat: repeat;background-size: contain;background-attachment: scroll;}:root :where(.wp-block-group){background-image: url('http://example.org/group.png');background-size: cover;}:root :where(.wp-block-post-content){background-image: url('http://example.org/top.png');background-position: 10% 20%;background-repeat: repeat;background-size: contain;background-attachment: scroll;}";
+		$this->assertSameCSS( $expected, $theme_json->get_stylesheet( array( 'styles' ), null, array( 'skip_root_layout_styles' => true ) ) );
+	}
+
+	/**
+	 * Tests that base custom CSS is generated correctly.
+	 */
+	public function test_get_stylesheet_handles_base_custom_css() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'styles'  => array(
-					'blocks' => array(
-						'core/separator' => array(
-							'color'  => array(
-								'background' => 'blue',
-							),
-							'border' => array(
-								'color' => 'pink',
-							),
-						),
-					),
+					'css' => 'body {color:purple;}',
 				),
-			),
-			'default'
+			)
 		);
-		$expected   = $base_styles . '.wp-block-separator{background-color: blue;border-color: pink;}';
-		$stylesheet = $theme_json->get_stylesheet( array( 'styles' ) );
-		$this->assertEquals( $expected, $stylesheet );
+
+		$custom_css = 'body {color:purple;}';
+		$this->assertSame( $custom_css, $theme_json->get_stylesheet( array( 'custom-css' ) ) );
 	}
 
-	public function test_get_custom_css_handles_global_custom_css() {
+	/**
+	 * Tests that block custom CSS is generated correctly.
+	 */
+	public function test_get_styles_for_block_handles_block_custom_css() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
 				'styles'  => array(
-					'css'    => 'body {color:purple;}',
 					'blocks' => array(
 						'core/paragraph' => array(
 							'css' => 'color:red;',
@@ -2101,11 +5109,22 @@ public function test_get_custom_css_handles_global_custom_css() {
 			)
 		);
 
-		$custom_css = 'body {color:purple;}p{color:red;}';
-		$this->assertEquals( $custom_css, $theme_json->get_custom_css() );
+		$paragraph_node = array(
+			'name'      => 'core/paragraph',
+			'path'      => array( 'styles', 'blocks', 'core/paragraph' ),
+			'selector'  => 'p',
+			'selectors' => array(
+				'root' => 'p',
+			),
+		);
+
+		$custom_css = ':root :where(p){color:red;}';
+		$this->assertSame( $custom_css, $theme_json->get_styles_for_block( $paragraph_node ) );
 	}
 
 	/**
+	 * Tests that custom CSS is kept for users with correct capabilities and removed for others.
+	 *
 	 * @dataProvider data_custom_css_for_user_caps
 	 *
 	 * @param string $user_property The property name for current user.
@@ -2190,7 +5209,7 @@ public function test_process_blocks_custom_css( $input, $expected ) {
 		$reflection = new ReflectionMethod( $theme_json, 'process_blocks_custom_css' );
 		$reflection->setAccessible( true );
 
-		$this->assertEquals( $expected, $reflection->invoke( $theme_json, $input['css'], $input['selector'] ) );
+		$this->assertSame( $expected, $reflection->invoke( $theme_json, $input['css'], $input['selector'] ) );
 	}
 
 	/**
@@ -2201,12 +5220,26 @@ public function test_process_blocks_custom_css( $input, $expected ) {
 	public function data_process_blocks_custom_css() {
 		return array(
 			// Simple CSS without any nested selectors.
+			'empty css'                    => array(
+				'input'    => array(
+					'selector' => '.foo',
+					'css'      => '',
+				),
+				'expected' => '',
+			),
 			'no nested selectors'          => array(
 				'input'    => array(
 					'selector' => '.foo',
 					'css'      => 'color: red; margin: auto;',
 				),
-				'expected' => '.foo{color: red; margin: auto;}',
+				'expected' => ':root :where(.foo){color: red; margin: auto;}',
+			),
+			'no root styles'               => array(
+				'input'    => array(
+					'selector' => '.foo',
+					'css'      => '&::before{color: red;}',
+				),
+				'expected' => ':root :where(.foo)::before{color: red;}',
 			),
 			// CSS with nested selectors.
 			'with nested selector'         => array(
@@ -2214,7 +5247,7 @@ public function data_process_blocks_custom_css() {
 					'selector' => '.foo',
 					'css'      => 'color: red; margin: auto; &.one{color: blue;} & .two{color: green;}',
 				),
-				'expected' => '.foo{color: red; margin: auto;}.foo.one{color: blue;}.foo .two{color: green;}',
+				'expected' => ':root :where(.foo){color: red; margin: auto;}:root :where(.foo.one){color: blue;}:root :where(.foo .two){color: green;}',
 			),
 			// CSS with pseudo elements.
 			'with pseudo elements'         => array(
@@ -2222,7 +5255,7 @@ public function data_process_blocks_custom_css() {
 					'selector' => '.foo',
 					'css'      => 'color: red; margin: auto; &::before{color: blue;} & ::before{color: green;}  &.one::before{color: yellow;} & .two::before{color: purple;}',
 				),
-				'expected' => '.foo{color: red; margin: auto;}.foo::before{color: blue;}.foo ::before{color: green;}.foo.one::before{color: yellow;}.foo .two::before{color: purple;}',
+				'expected' => ':root :where(.foo){color: red; margin: auto;}:root :where(.foo)::before{color: blue;}:root :where(.foo) ::before{color: green;}:root :where(.foo.one)::before{color: yellow;}:root :where(.foo .two)::before{color: purple;}',
 			),
 			// CSS with multiple root selectors.
 			'with multiple root selectors' => array(
@@ -2230,7 +5263,7 @@ public function data_process_blocks_custom_css() {
 					'selector' => '.foo, .bar',
 					'css'      => 'color: red; margin: auto; &.one{color: blue;} & .two{color: green;} &::before{color: yellow;} & ::before{color: purple;}  &.three::before{color: orange;} & .four::before{color: skyblue;}',
 				),
-				'expected' => '.foo, .bar{color: red; margin: auto;}.foo.one, .bar.one{color: blue;}.foo .two, .bar .two{color: green;}.foo::before, .bar::before{color: yellow;}.foo ::before, .bar ::before{color: purple;}.foo.three::before, .bar.three::before{color: orange;}.foo .four::before, .bar .four::before{color: skyblue;}',
+				'expected' => ':root :where(.foo, .bar){color: red; margin: auto;}:root :where(.foo.one, .bar.one){color: blue;}:root :where(.foo .two, .bar .two){color: green;}:root :where(.foo, .bar)::before{color: yellow;}:root :where(.foo, .bar) ::before{color: purple;}:root :where(.foo.three, .bar.three)::before{color: orange;}:root :where(.foo .four, .bar .four)::before{color: skyblue;}',
 			),
 		);
 	}
@@ -2299,6 +5332,14 @@ public function test_internal_syntax_is_converted_to_css_variables() {
 		$this->assertEquals( 'var(--wp--preset--color--s)', $styles['blocks']['core/quote']['variations']['plain']['color']['background'], 'Style variations: Assert the internal variables are convert to CSS custom variables.' );
 	}
 
+	/*
+	 * Tests that the theme.json file is correctly parsed and the variables are resolved.
+	 *
+	 * @ticket 58588
+	 *
+	 * @covers WP_Theme_JSON_Gutenberg::resolve_variables
+	 * @covers WP_Theme_JSON_Gutenberg::convert_variables_to_value
+	 */
 	public function test_resolve_variables() {
 		$primary_color   = '#9DFF20';
 		$secondary_color = '#9DFF21';
@@ -2306,6 +5347,7 @@ public function test_resolve_variables() {
 		$raw_color_value = '#efefef';
 		$large_font      = '18px';
 		$small_font      = '12px';
+		$spacing         = 'clamp(1.5rem, 5vw, 2rem)';
 		$theme_json      = new WP_Theme_JSON_Gutenberg(
 			array(
 				'version'  => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
@@ -2345,6 +5387,15 @@ public function test_resolve_variables() {
 							),
 						),
 					),
+					'spacing'    => array(
+						'spacingSizes' => array(
+							array(
+								'size' => $spacing,
+								'name' => '100',
+								'slug' => '100',
+							),
+						),
+					),
 				),
 				'styles'   => array(
 					'color'    => array(
@@ -2407,6 +5458,16 @@ public function test_resolve_variables() {
 								),
 							),
 						),
+						'core/post-template'   => array(
+							'spacing' => array(
+								'blockGap' => null,
+							),
+						),
+						'core/columns'         => array(
+							'spacing' => array(
+								'blockGap' => 'var(--wp--preset--spacing--100)',
+							),
+						),
 					),
 				),
 			)
@@ -2450,5 +5511,271 @@ public function test_resolve_variables() {
 
 		$this->assertEquals( $small_font, $styles['blocks']['core/quote']['variations']['plain']['typography']['fontSize'], 'Block variations: font-size' );
 		$this->assertEquals( $secondary_color, $styles['blocks']['core/quote']['variations']['plain']['color']['background'], 'Block variations: color' );
+		/*
+		 * WP_Theme_JSON_Gutenberg::resolve_variables may be called with merged data from WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()
+		 * WP_Theme_JSON_Resolver_Gutenberg::get_block_data() sets blockGap for supported blocks to `null` if the value is not defined.
+		 */
+		$this->assertNull( $styles['blocks']['core/post-template']['spacing']['blockGap'], 'core/post-template block: blockGap' );
+		$this->assertEquals( $spacing, $styles['blocks']['core/columns']['spacing']['blockGap'], 'core/columns block: blockGap' );
+	}
+
+	/**
+	 * Tests the correct application of a block style variation's selector to
+	 * a block's selector.
+	 *
+	 * @dataProvider data_get_block_style_variation_selector
+	 *
+	 * @param string $selector  CSS selector.
+	 * @param string $expected  Expected block style variation CSS selector.
+	 */
+	public function test_get_block_style_variation_selector( $selector, $expected ) {
+		$theme_json = new ReflectionClass( 'WP_Theme_JSON_Gutenberg' );
+
+		$func = $theme_json->getMethod( 'get_block_style_variation_selector' );
+		$func->setAccessible( true );
+
+		$actual = $func->invoke( null, 'custom', $selector );
+
+		$this->assertEquals( $expected, $actual );
+	}
+
+	/**
+	 * Data provider for generating block style variation selectors.
+	 *
+	 * @return array[]
+	 */
+	public function data_get_block_style_variation_selector() {
+		return array(
+			'empty block selector'     => array(
+				'selector' => '',
+				'expected' => '.is-style-custom',
+			),
+			'class selector'           => array(
+				'selector' => '.wp-block',
+				'expected' => '.wp-block.is-style-custom',
+			),
+			'id selector'              => array(
+				'selector' => '#wp-block',
+				'expected' => '#wp-block.is-style-custom',
+			),
+			'element tag selector'     => array(
+				'selector' => 'p',
+				'expected' => 'p.is-style-custom',
+			),
+			'attribute selector'       => array(
+				'selector' => '[style*="color"]',
+				'expected' => '[style*="color"].is-style-custom',
+			),
+			'descendant selector'      => array(
+				'selector' => '.wp-block .inner',
+				'expected' => '.wp-block.is-style-custom .inner',
+			),
+			'comma separated selector' => array(
+				'selector' => '.wp-block .inner, .wp-block .alternative',
+				'expected' => '.wp-block.is-style-custom .inner, .wp-block.is-style-custom .alternative',
+			),
+			'pseudo selector'          => array(
+				'selector' => 'div:first-child',
+				'expected' => 'div.is-style-custom:first-child',
+			),
+			':is selector'             => array(
+				'selector' => '.wp-block:is(.outer .inner:first-child)',
+				'expected' => '.wp-block.is-style-custom:is(.outer .inner:first-child)',
+			),
+			':not selector'            => array(
+				'selector' => '.wp-block:not(.outer .inner:first-child)',
+				'expected' => '.wp-block.is-style-custom:not(.outer .inner:first-child)',
+			),
+			':has selector'            => array(
+				'selector' => '.wp-block:has(.outer .inner:first-child)',
+				'expected' => '.wp-block.is-style-custom:has(.outer .inner:first-child)',
+			),
+			':where selector'          => array(
+				'selector' => '.wp-block:where(.outer .inner:first-child)',
+				'expected' => '.wp-block.is-style-custom:where(.outer .inner:first-child)',
+			),
+			'wrapping :where selector' => array(
+				'selector' => ':where(.outer .inner:first-child)',
+				'expected' => ':where(.outer.is-style-custom .inner:first-child)',
+			),
+			'complex'                  => array(
+				'selector' => '.wp:where(.something):is(.test:not(.nothing p)):has(div[style]) .content, .wp:where(.nothing):not(.test:is(.something div)):has(span[style]) .inner',
+				'expected' => '.wp.is-style-custom:where(.something):is(.test:not(.nothing p)):has(div[style]) .content, .wp.is-style-custom:where(.nothing):not(.test:is(.something div)):has(span[style]) .inner',
+			),
+		);
+	}
+
+	/**
+	 * Tests the correct scoping of selectors for a style node.
+	 */
+	public function test_scope_style_node_selectors() {
+		$theme_json = new ReflectionClass( 'WP_Theme_JSON_Gutenberg' );
+
+		$func = $theme_json->getMethod( 'scope_style_node_selectors' );
+		$func->setAccessible( true );
+
+		$node = array(
+			'name'      => 'core/image',
+			'path'      => array( 'styles', 'blocks', 'core/image' ),
+			'selector'  => '.wp-block-image',
+			'selectors' => array(
+				'root'       => '.wp-block-image',
+				'border'     => '.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder',
+				'typography' => array(
+					'textDecoration' => '.wp-block-image caption',
+				),
+				'filter'     => array(
+					'duotone' => '.wp-block-image img, .wp-block-image .components-placeholder',
+				),
+			),
+		);
+
+		$actual   = $func->invoke( null, '.custom-scope', $node );
+		$expected = array(
+			'name'      => 'core/image',
+			'path'      => array( 'styles', 'blocks', 'core/image' ),
+			'selector'  => '.custom-scope .wp-block-image',
+			'selectors' => array(
+				'root'       => '.custom-scope .wp-block-image',
+				'border'     => '.custom-scope .wp-block-image img, .custom-scope .wp-block-image .wp-block-image__crop-area, .custom-scope .wp-block-image .components-placeholder',
+				'typography' => array(
+					'textDecoration' => '.custom-scope .wp-block-image caption',
+				),
+				'filter'     => array(
+					'duotone' => '.custom-scope .wp-block-image img, .custom-scope .wp-block-image .components-placeholder',
+				),
+			),
+		);
+
+		$this->assertEquals( $expected, $actual );
+	}
+
+	/**
+	 * Block style variations styles aren't generated by default. This test covers
+	 * the `get_block_nodes` does not include variations by default, preventing
+	 * the inclusion of their styles.
+	 */
+	public function test_opt_out_of_block_style_variations_by_default() {
+		$theme_json = new ReflectionClass( 'WP_Theme_JSON_Gutenberg' );
+
+		$func = $theme_json->getMethod( 'get_block_nodes' );
+		$func->setAccessible( true );
+
+		$theme_json = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/button' => array(
+						'variations' => array(
+							'outline' => array(
+								'color' => array(
+									'background' => 'red',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+		$selectors  = array();
+
+		$block_nodes       = $func->invoke( null, $theme_json, $selectors );
+		$button_variations = $block_nodes[0]['variations'] ?? array();
+
+		$this->assertEquals( array(), $button_variations );
+	}
+
+	/**
+	 * Block style variations styles aren't generated by default. This test ensures
+	 * variations are included by `get_block_nodes` when requested.
+	 */
+	public function test_opt_in_to_block_style_variations() {
+		$theme_json = new ReflectionClass( 'WP_Theme_JSON_Gutenberg' );
+
+		$func = $theme_json->getMethod( 'get_block_nodes' );
+		$func->setAccessible( true );
+
+		$theme_json = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'blocks' => array(
+					'core/button' => array(
+						'variations' => array(
+							'outline' => array(
+								'color' => array(
+									'background' => 'red',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+		$selectors  = array();
+		$options    = array( 'include_block_style_variations' => true );
+
+		$block_nodes       = $func->invoke( null, $theme_json, $selectors, $options );
+		$button_variations = $block_nodes[0]['variations'] ?? array();
+
+		$expected = array(
+			array(
+				'path'     => array( 'styles', 'blocks', 'core/button', 'variations', 'outline' ),
+				'selector' => '.wp-block-button.is-style-outline .wp-block-button__link',
+			),
+		);
+
+		$this->assertEquals( $expected, $button_variations );
+	}
+
+	/**
+	 * This test covers `get_block_nodes` with the `$include_node_paths_only` option.
+	 * When `true`, `$include_node_paths_only` should return only the paths of the block nodes.
+	 */
+	public function test_return_block_node_paths() {
+		$theme_json = new ReflectionClass( 'WP_Theme_JSON_Gutenberg' );
+
+		$func = $theme_json->getMethod( 'get_block_nodes' );
+		$func->setAccessible( true );
+
+		$theme_json = array(
+			'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+			'styles'  => array(
+				'typography' => array(
+					'fontSize' => '16px',
+				),
+				'blocks'     => array(
+					'core/button' => array(
+						'color' => array(
+							'background' => 'red',
+						),
+					),
+					'core/group'  => array(
+						'elements' => array(
+							'link' => array(
+								'color' => array(
+									'background' => 'blue',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+
+		$block_nodes = $func->invoke( null, $theme_json, array(), array( 'include_node_paths_only' => true ) );
+
+		$expected = array(
+			array(
+				'path' => array( 'styles', 'blocks', 'core/button' ),
+			),
+			array(
+				'path' => array( 'styles', 'blocks', 'core/group' ),
+			),
+			array(
+				'path' => array( 'styles', 'blocks', 'core/group', 'elements', 'link' ),
+			),
+		);
+
+		$this->assertEquals( $expected, $block_nodes );
 	}
 }
diff --git a/phpunit/data/fonts/OpenSans-Regular.otf b/phpunit/data/fonts/OpenSans-Regular.otf
new file mode 100644
index 00000000000000..8db0f64c67ddd5
Binary files /dev/null and b/phpunit/data/fonts/OpenSans-Regular.otf differ
diff --git a/phpunit/data/fonts/OpenSans-Regular.ttf b/phpunit/data/fonts/OpenSans-Regular.ttf
new file mode 100644
index 00000000000000..ae716936e9e4c1
Binary files /dev/null and b/phpunit/data/fonts/OpenSans-Regular.ttf differ
diff --git a/phpunit/data/fonts/OpenSans-Regular.woff b/phpunit/data/fonts/OpenSans-Regular.woff
new file mode 100644
index 00000000000000..bd0f824b207d60
Binary files /dev/null and b/phpunit/data/fonts/OpenSans-Regular.woff differ
diff --git a/phpunit/data/fonts/OpenSans-Regular.woff2 b/phpunit/data/fonts/OpenSans-Regular.woff2
new file mode 100644
index 00000000000000..f778f9c8455f26
Binary files /dev/null and b/phpunit/data/fonts/OpenSans-Regular.woff2 differ
diff --git a/phpunit/data/languages/themes/block-theme-pl_PL.mo b/phpunit/data/languages/themes/block-theme-pl_PL.mo
index ff89f87f127f15..d819be9b57e3cd 100644
Binary files a/phpunit/data/languages/themes/block-theme-pl_PL.mo and b/phpunit/data/languages/themes/block-theme-pl_PL.mo differ
diff --git a/phpunit/data/languages/themes/block-theme-pl_PL.po b/phpunit/data/languages/themes/block-theme-pl_PL.po
index 0aa4bbd52d34fc..6ac5a6967e73c4 100644
--- a/phpunit/data/languages/themes/block-theme-pl_PL.po
+++ b/phpunit/data/languages/themes/block-theme-pl_PL.po
@@ -2,22 +2,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2015-12-31 16:31+0100\n"
-"PO-Revision-Date: 2021-03-15 13:10+0100\n"
+"PO-Revision-Date: 2022-08-31 11:08+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.4.2\n"
-"X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.1.1\n"
+"X-Poedit-Basepath: .\n"
 "X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;"
 "_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;"
 "esc_html_x:1,2c\n"
 "X-Textdomain-Support: yes\n"
-"Last-Translator: \n"
-"Language-Team: \n"
 "X-Poedit-SearchPath-0: .\n"
 
+msgctxt "Style variation name"
+msgid "Block theme"
+msgstr "Motyw blokowy"
+
+msgctxt "Style variation name"
+msgid "Block theme variation"
+msgstr "Wariant motywu blokowego"
+
 msgctxt "Custom template name"
 msgid "Homepage template"
 msgstr "Szablon strony głównej"
diff --git a/phpunit/data/themedir1/block-theme-child-with-block-style-variations/style.css b/phpunit/data/themedir1/block-theme-child-with-block-style-variations/style.css
new file mode 100644
index 00000000000000..c1cc20aaf1f101
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme-child-with-block-style-variations/style.css
@@ -0,0 +1,8 @@
+/*
+Theme Name: Block Theme Child With Block Style Variations Theme
+Theme URI: https://wordpress.org/
+Description: For testing purposes only.
+Template: block-theme
+Version: 1.0.0
+Text Domain: block-theme-child-with-block-style-variations
+*/
diff --git a/phpunit/data/themedir1/block-theme-child-with-block-style-variations/styles/block-style-variation-a.json b/phpunit/data/themedir1/block-theme-child-with-block-style-variations/styles/block-style-variation-a.json
new file mode 100644
index 00000000000000..195321a33b3366
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme-child-with-block-style-variations/styles/block-style-variation-a.json
@@ -0,0 +1,10 @@
+{
+	"version": 3,
+	"blockTypes": [ "core/group", "core/columns", "core/media-text" ],
+	"styles": {
+		"color": {
+			"background": "darkcyan",
+			"text": "aliceblue"
+		}
+	}
+}
diff --git a/phpunit/data/themedir1/block-theme-child-with-block-style-variations/theme.json b/phpunit/data/themedir1/block-theme-child-with-block-style-variations/theme.json
new file mode 100644
index 00000000000000..fee9382dce1472
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme-child-with-block-style-variations/theme.json
@@ -0,0 +1,55 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/theme.json",
+	"version": 3,
+	"styles": {
+		"variations": {
+			"outline": {
+				"color": {
+					"background": "green",
+					"text": "white"
+				}
+			},
+			"block-style-variation-a": {
+				"color": {
+					"background": "darkseagreen"
+				},
+				"typography": {
+					"fontSize": "2em",
+					"lineHeight": "1.4em"
+				}
+			}
+		},
+		"blocks": {
+			"core/button": {
+				"variations": {
+					"outline": {
+						"color": {
+							"background": "red"
+						}
+					}
+				}
+			},
+			"core/media-text": {
+				"variations": {
+					"block-style-variation-a": {
+						"color": {
+							"background": "blue"
+						},
+						"typography": {
+							"fontSize": "1.5em"
+						}
+					}
+				}
+			},
+			"core/heading": {
+				"variations": {
+					"block-style-variation-b": {
+						"typography": {
+							"fontSize": "3em"
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/phpunit/data/themedir1/block-theme-child-with-fluid-layout/theme.json b/phpunit/data/themedir1/block-theme-child-with-fluid-layout/theme.json
index 6985da16c60636..10d3384195ede6 100644
--- a/phpunit/data/themedir1/block-theme-child-with-fluid-layout/theme.json
+++ b/phpunit/data/themedir1/block-theme-child-with-fluid-layout/theme.json
@@ -1,5 +1,6 @@
 {
-	"version": 2,
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
 	"settings": {
 		"appearanceTools": true,
 		"layout": {
diff --git a/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json b/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json
index 65ed480f20e166..fcb5167ee71d01 100644
--- a/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json
+++ b/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json
@@ -1,5 +1,6 @@
 {
-	"version": 2,
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
 	"settings": {
 		"appearanceTools": true,
 		"layout": {
diff --git a/phpunit/data/themedir1/block-theme-child-with-fluid-typography/theme.json b/phpunit/data/themedir1/block-theme-child-with-fluid-typography/theme.json
index 93234766eddd2a..11f1eba417ea7d 100644
--- a/phpunit/data/themedir1/block-theme-child-with-fluid-typography/theme.json
+++ b/phpunit/data/themedir1/block-theme-child-with-fluid-typography/theme.json
@@ -1,5 +1,6 @@
 {
-	"version": 2,
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
 	"settings": {
 		"appearanceTools": true,
 		"typography": {
diff --git a/phpunit/data/themedir1/block-theme-child/styles/variation-a.json b/phpunit/data/themedir1/block-theme-child/styles/variation-a.json
index a9d5ade8946928..53c3ef60619b5b 100644
--- a/phpunit/data/themedir1/block-theme-child/styles/variation-a.json
+++ b/phpunit/data/themedir1/block-theme-child/styles/variation-a.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"settings": {
 		"blocks": {
 			"core/paragraph": {
diff --git a/phpunit/data/themedir1/block-theme-child/styles/variation-b.json b/phpunit/data/themedir1/block-theme-child/styles/variation-b.json
new file mode 100644
index 00000000000000..4e949f24c7f401
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme-child/styles/variation-b.json
@@ -0,0 +1,18 @@
+{
+	"version": 3,
+	"settings": {
+		"blocks": {
+			"core/post-title": {
+				"color": {
+					"palette": [
+						{
+							"slug": "dark",
+							"name": "Dark",
+							"color": "#010101"
+						}
+					]
+				}
+			}
+		}
+	}
+}
diff --git a/phpunit/data/themedir1/block-theme-child/theme.json b/phpunit/data/themedir1/block-theme-child/theme.json
index ebfa68d9f74811..4c394ed4910720 100644
--- a/phpunit/data/themedir1/block-theme-child/theme.json
+++ b/phpunit/data/themedir1/block-theme-child/theme.json
@@ -1,5 +1,6 @@
 {
-	"version": 2,
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
 	"settings": {
 		"color": {
 			"palette": [
diff --git a/phpunit/data/themedir1/block-theme/styles/block-style-variation-a.json b/phpunit/data/themedir1/block-theme/styles/block-style-variation-a.json
new file mode 100644
index 00000000000000..356bc4fc3de7d3
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme/styles/block-style-variation-a.json
@@ -0,0 +1,10 @@
+{
+	"version": 3,
+	"blockTypes": [ "core/group", "core/columns" ],
+	"styles": {
+		"color": {
+			"background": "indigo",
+			"text": "plum"
+		}
+	}
+}
diff --git a/phpunit/data/themedir1/block-theme/styles/block-style-variation-b.json b/phpunit/data/themedir1/block-theme/styles/block-style-variation-b.json
new file mode 100644
index 00000000000000..8b79948517255f
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme/styles/block-style-variation-b.json
@@ -0,0 +1,10 @@
+{
+	"version": 3,
+	"blockTypes": [ "core/group", "core/columns" ],
+	"styles": {
+		"color": {
+			"background": "midnightblue",
+			"text": "lightblue"
+		}
+	}
+}
diff --git a/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json b/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json
new file mode 100644
index 00000000000000..d938a8a0db833c
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme/styles/block-style-variation-with-slug.json
@@ -0,0 +1,12 @@
+{
+	"version": 3,
+	"blockTypes": [ "core/group", "core/columns" ],
+	"slug": "WithSlug",
+	"title": "With Slug",
+	"styles": {
+		"color": {
+			"background": "aliceblue",
+			"text": "midnightblue"
+		}
+	}
+}
diff --git a/phpunit/data/themedir1/block-theme/styles/variation-a.json b/phpunit/data/themedir1/block-theme/styles/variation-a.json
index 42c20fc63b5925..eb08d0090c177c 100644
--- a/phpunit/data/themedir1/block-theme/styles/variation-a.json
+++ b/phpunit/data/themedir1/block-theme/styles/variation-a.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"settings": {
 		"blocks": {
 			"core/paragraph": {
diff --git a/phpunit/data/themedir1/block-theme/styles/variation-b.json b/phpunit/data/themedir1/block-theme/styles/variation-b.json
index 340198ffe0b65f..efdbe8aa86650b 100644
--- a/phpunit/data/themedir1/block-theme/styles/variation-b.json
+++ b/phpunit/data/themedir1/block-theme/styles/variation-b.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"settings": {
 		"blocks": {
 			"core/post-title": {
diff --git a/phpunit/data/themedir1/block-theme/styles/variation.json b/phpunit/data/themedir1/block-theme/styles/variation.json
new file mode 100644
index 00000000000000..debb3666a767bd
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme/styles/variation.json
@@ -0,0 +1,24 @@
+{
+	"version": 3,
+	"title": "Block theme variation",
+	"settings": {
+		"color": {
+			"palette": [
+				{
+					"slug": "foreground",
+					"color": "#3F67C6",
+					"name": "Foreground"
+				}
+			]
+		}
+	},
+	"styles": {
+		"blocks": {
+			"core/post-title": {
+				"typography": {
+					"fontWeight": "700"
+				}
+			}
+		}
+	}
+}
diff --git a/phpunit/data/themedir1/block-theme/templates/custom-hero-template.html b/phpunit/data/themedir1/block-theme/templates/custom-hero-template.html
new file mode 100644
index 00000000000000..0a62cda60641a1
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme/templates/custom-hero-template.html
@@ -0,0 +1,3 @@
+<!-- wp:paragraph -->
+<p>Custom Hero template</p>
+<!-- /wp:paragraph -->
diff --git a/phpunit/data/themedir1/block-theme/templates/custom-single-post-template.html b/phpunit/data/themedir1/block-theme/templates/custom-single-post-template.html
new file mode 100644
index 00000000000000..fc0a5f8a4b154d
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme/templates/custom-single-post-template.html
@@ -0,0 +1,3 @@
+<!-- wp:paragraph -->
+<p>Custom Single Post template</p>
+<!-- /wp:paragraph -->
diff --git a/phpunit/data/themedir1/block-theme/templates/index.html b/phpunit/data/themedir1/block-theme/templates/index.html
new file mode 100644
index 00000000000000..451c2c1a5c159b
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme/templates/index.html
@@ -0,0 +1,3 @@
+<!-- wp:paragraph -->
+<p>Index Template</p>
+<!-- /wp:paragraph -->
diff --git a/phpunit/data/themedir1/block-theme/templates/page-home.html b/phpunit/data/themedir1/block-theme/templates/page-home.html
new file mode 100644
index 00000000000000..fd46fc0018fff4
--- /dev/null
+++ b/phpunit/data/themedir1/block-theme/templates/page-home.html
@@ -0,0 +1,3 @@
+<!-- wp:paragraph -->
+<p>Page (Home) Template</p>
+<!-- /wp:paragraph -->
diff --git a/phpunit/data/themedir1/block-theme/theme.json b/phpunit/data/themedir1/block-theme/theme.json
index aa9f93a3c0aa1a..c455d87e504a2d 100644
--- a/phpunit/data/themedir1/block-theme/theme.json
+++ b/phpunit/data/themedir1/block-theme/theme.json
@@ -1,5 +1,7 @@
 {
-	"version": 2,
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"title": "Block theme",
 	"settings": {
 		"color": {
 			"palette": [
@@ -14,7 +16,52 @@
 					"color": "#000"
 				}
 			],
-			"custom": false
+			"gradients": [
+				{
+					"name": "Custom gradient",
+					"gradient": "linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%)",
+					"slug": "custom-gradient"
+				}
+			],
+			"duotone": [
+				{
+					"colors": [ "#333333", "#aaaaaa" ],
+					"slug": "custom-duotone",
+					"name": "Custom Duotone"
+				}
+			],
+			"custom": false,
+			"customGradient": false
+		},
+		"typography": {
+			"fontSizes": [
+				{
+					"name": "Custom",
+					"slug": "custom",
+					"size": "100px"
+				}
+			],
+			"customFontSize": false,
+			"lineHeight": true
+		},
+		"spacing": {
+			"units": [ "rem" ],
+			"padding": true,
+			"blockGap": true
+		},
+		"shadow": {
+			"presets": [
+				{
+					"name": "Natural",
+					"slug": "natural",
+					"shadow": "2px 2px 3px #000"
+				},
+				{
+					"name": "Test",
+					"slug": "test",
+					"shadow": "2px 2px 3px #000"
+				}
+			]
 		},
 		"blocks": {
 			"core/paragraph": {
@@ -30,10 +77,66 @@
 			}
 		}
 	},
+	"styles": {
+		"blocks": {
+			"core/post-featured-image": {
+				"shadow": "10px 10px 5px 0px rgba(0,0,0,0.66)",
+				"filter": {
+					"duotone": "var(--wp--preset--duotone--custom-duotone)"
+				}
+			},
+			"my/third-party-block": {
+				"color": {
+					"background": "hotpink"
+				},
+				"elements": {
+					"cite": {
+						"color": {
+							"text": "white"
+						}
+					}
+				}
+			}
+		},
+		"elements": {
+			"button": {
+				"shadow": "10px 10px 5px 0px rgba(0,0,0,0.66)"
+			},
+			"link": {
+				"typography": {
+					"textDecoration": "none"
+				},
+				"border": {
+					"bottom": {
+						"width": "2px",
+						"color": "currentColor",
+						"style": "solid"
+					}
+				},
+				":hover": {
+					"typography": {
+						"textDecoration": "none"
+					},
+					"border": {
+						"bottom": {
+							"width": "2px",
+							"color": "#000",
+							"style": "dotted"
+						}
+					}
+				}
+			}
+		}
+	},
 	"customTemplates": [
 		{
 			"name": "page-home",
 			"title": "Homepage template"
+		},
+		{
+			"name": "custom-single-post-template",
+			"title": "Custom Single Post template",
+			"postTypes": [ "post" ]
 		}
 	],
 	"templateParts": [
diff --git a/phpunit/data/themedir1/fonts-block-theme/styles/variation-duplicate-fonts.json b/phpunit/data/themedir1/fonts-block-theme/styles/variation-duplicate-fonts.json
index 040689043379d6..c24a4a85a4f673 100644
--- a/phpunit/data/themedir1/fonts-block-theme/styles/variation-duplicate-fonts.json
+++ b/phpunit/data/themedir1/fonts-block-theme/styles/variation-duplicate-fonts.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"title": "Variation: duplicate fonts",
 	"settings": {
 		"typography": {
diff --git a/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-family.json b/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-family.json
index 01c6027835f976..dfc83f3726d798 100644
--- a/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-family.json
+++ b/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-family.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"title": "Variation: new font family",
 	"settings": {
 		"typography": {
@@ -15,7 +15,7 @@
 							"fontStyle": "normal",
 							"fontWeight": "400",
 							"src": [
-								"file:./assets/fonts/open-sans/OpenSans-VariableFont_wdth,wght.tff"
+								"file:./assets/fonts/open-sans/OpenSans-VariableFont_wdth,wght.ttf"
 							]
 						},
 						{
@@ -24,7 +24,7 @@
 							"fontStyle": "italic",
 							"fontWeight": "400",
 							"src": [
-								"file:./assets/fonts/open-sans/OpenSans-Italic-VariableFont_wdth,wght.tff"
+								"file:./assets/fonts/open-sans/OpenSans-Italic-VariableFont_wdth,wght.ttf"
 							]
 						}
 					]
diff --git a/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-variations.json b/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-variations.json
index 81268817ade703..95cb7b88d0fb78 100644
--- a/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-variations.json
+++ b/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-variations.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"title": "Variation: new font variations",
 	"settings": {
 		"typography": {
diff --git a/phpunit/data/themedir1/fonts-block-theme/styles/variation-no-fonts.json b/phpunit/data/themedir1/fonts-block-theme/styles/variation-no-fonts.json
index 9c98c6893fa062..fcdd368ec691b8 100644
--- a/phpunit/data/themedir1/fonts-block-theme/styles/variation-no-fonts.json
+++ b/phpunit/data/themedir1/fonts-block-theme/styles/variation-no-fonts.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"title": "Variation - no fonts",
 	"styles": {
 		"typography": {
diff --git a/phpunit/data/themedir1/fonts-block-theme/theme.json b/phpunit/data/themedir1/fonts-block-theme/theme.json
index a8212b79e139dd..e69d83e924c1bc 100644
--- a/phpunit/data/themedir1/fonts-block-theme/theme.json
+++ b/phpunit/data/themedir1/fonts-block-theme/theme.json
@@ -1,5 +1,6 @@
 {
-	"version": 2,
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
 	"settings": {
 		"appearanceTools": true,
 		"color": {
diff --git a/phpunit/experimental/block-editor-settings-mobile-test.php b/phpunit/experimental/block-editor-settings-mobile-test.php
index 907b750d8c8638..967efebc346fc8 100644
--- a/phpunit/experimental/block-editor-settings-mobile-test.php
+++ b/phpunit/experimental/block-editor-settings-mobile-test.php
@@ -10,11 +10,6 @@
  *
  * @covers WP_REST_Block_Editor_Settings_Controller
  */
-
-if ( ! defined( 'REST_REQUEST' ) ) {
-	define( 'REST_REQUEST', true );
-}
-
 class Gutenberg_REST_Block_Editor_Settings_Controller_Test extends WP_Test_REST_Controller_Testcase {
 	/**
 	 * @var int
@@ -56,10 +51,9 @@ public function test_register_routes() {
 	public function test_get_items() {
 		wp_set_current_user( self::$admin_id );
 		$request = new WP_REST_Request( 'GET', '/wp-block-editor/v1/settings' );
-		// Set context for mobile settings.
-		$_GET['context'] = 'mobile';
-		$response        = rest_get_server()->dispatch( $request );
-		$data            = $response->get_data();
+		$request->set_param( 'context', 'mobile' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
 
 		$this->assertArrayHasKey( '__experimentalStyles', $data, '__experimentalStyles should be in the returned data' );
 		$this->assertArrayHasKey( '__experimentalFeatures', $data, '__experimentalFeatures should be in the returned data' );
diff --git a/phpunit/experimental/interactivity-api/class-wp-directive-processor-test.php b/phpunit/experimental/interactivity-api/class-wp-directive-processor-test.php
deleted file mode 100644
index 2b01cb6251c210..00000000000000
--- a/phpunit/experimental/interactivity-api/class-wp-directive-processor-test.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * `WP_Directive_Processor` class test.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * @group interactivity-api
- * @covers WP_Directive_Processor
- */
-class WP_Directive_Processor_Test extends WP_UnitTestCase {
-	const HTML = '<div>outside</div><section><div><img>inside</div></section>';
-
-	public function test_next_balanced_closer_stays_on_void_tag() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'img' );
-		$result = $tags->next_balanced_closer();
-		$this->assertSame( 'IMG', $tags->get_tag() );
-		$this->assertFalse( $result );
-	}
-
-	public function test_next_balanced_closer_proceeds_to_correct_tag() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->next_balanced_closer();
-		$this->assertSame( 'SECTION', $tags->get_tag() );
-		$this->assertTrue( $tags->is_tag_closer() );
-	}
-
-	public function test_next_balanced_closer_proceeds_to_correct_tag_for_nested_tag() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'div' );
-		$tags->next_tag( 'div' );
-		$tags->next_balanced_closer();
-		$this->assertSame( 'DIV', $tags->get_tag() );
-		$this->assertTrue( $tags->is_tag_closer() );
-	}
-
-	public function test_get_inner_html_returns_correct_result() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$this->assertSame( '<div><img>inside</div>', $tags->get_inner_html() );
-	}
-
-	public function test_set_inner_html_on_void_element_has_no_effect() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'img' );
-		$content = $tags->set_inner_html( 'This is the new img content' );
-		$this->assertFalse( $content );
-		$this->assertSame( self::HTML, $tags->get_updated_html() );
-	}
-
-	public function test_set_inner_html_sets_content_correctly() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_inner_html( 'This is the new section content.' );
-		$this->assertSame( '<div>outside</div><section>This is the new section content.</section>', $tags->get_updated_html() );
-	}
-
-	public function test_set_inner_html_updates_bookmarks_correctly() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'div' );
-		$tags->set_bookmark( 'start' );
-		$tags->next_tag( 'img' );
-		$this->assertSame( 'IMG', $tags->get_tag() );
-		$tags->set_bookmark( 'after' );
-		$tags->seek( 'start' );
-
-		$tags->set_inner_html( 'This is the new div content.' );
-		$this->assertSame( '<div>This is the new div content.</div><section><div><img>inside</div></section>', $tags->get_updated_html() );
-		$tags->seek( 'after' );
-		$this->assertSame( 'IMG', $tags->get_tag() );
-	}
-
-	public function test_set_inner_html_subsequent_updates_on_the_same_tag_work() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_inner_html( 'This is the new section content.' );
-		$tags->set_inner_html( 'This is the even newer section content.' );
-		$this->assertSame( '<div>outside</div><section>This is the even newer section content.</section>', $tags->get_updated_html() );
-	}
-
-	public function test_set_inner_html_followed_by_set_attribute_works() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_inner_html( 'This is the new section content.' );
-		$tags->set_attribute( 'id', 'thesection' );
-		$this->assertSame( '<div>outside</div><section id="thesection">This is the new section content.</section>', $tags->get_updated_html() );
-	}
-
-	public function test_set_inner_html_preceded_by_set_attribute_works() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_attribute( 'id', 'thesection' );
-		$tags->set_inner_html( 'This is the new section content.' );
-		$this->assertSame( '<div>outside</div><section id="thesection">This is the new section content.</section>', $tags->get_updated_html() );
-	}
-
-	/**
-	 * TODO: Review this, how that the code is in Gutenberg.
-	 */
-	public function test_set_inner_html_invalidates_bookmarks_that_point_to_replaced_content() {
-		$this->markTestSkipped( "This requires on bookmark invalidation, which is only in GB's WP 6.3 compat layer." );
-
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_bookmark( 'start' );
-		$tags->next_tag( 'img' );
-		$tags->set_bookmark( 'replaced' );
-		$tags->seek( 'start' );
-
-		$tags->set_inner_html( 'This is the new section content.' );
-		$this->assertSame( '<div>outside</div><section>This is the new section content.</section>', $tags->get_updated_html() );
-
-		$this->expectExceptionMessage( 'Invalid bookmark name' );
-		$successful_seek = $tags->seek( 'replaced' );
-		$this->assertFalse( $successful_seek );
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php b/phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php
deleted file mode 100644
index 837d6fd50f193a..00000000000000
--- a/phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * `WP_Interactivity_Store` class test.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the `WP_Interactivity_Store` class.
- *
- * @group  interactivity-api
- * @covers WP_Interactivity_Store
- */
-class WP_Interactivity_Store_Test extends WP_UnitTestCase {
-	public function set_up() {
-		// Clear the state before each test.
-		WP_Interactivity_Store::reset();
-	}
-
-	public function test_store_should_be_empty() {
-		$this->assertEmpty( WP_Interactivity_Store::get_data() );
-	}
-
-	public function test_store_can_be_merged() {
-		$data = array(
-			'state' => array(
-				'core' => array(
-					'a'      => 1,
-					'b'      => 2,
-					'nested' => array(
-						'c' => 3,
-					),
-				),
-			),
-		);
-		WP_Interactivity_Store::merge_data( $data );
-		$this->assertSame( $data, WP_Interactivity_Store::get_data() );
-	}
-
-	public function test_store_can_be_extended() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 1,
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core'   => array(
-						'b' => 2,
-					),
-					'custom' => array(
-						'c' => 3,
-					),
-				),
-			)
-		);
-		$this->assertSame(
-			array(
-				'state' => array(
-					'core'   => array(
-						'a' => 1,
-						'b' => 2,
-					),
-					'custom' => array(
-						'c' => 3,
-					),
-				),
-			),
-			WP_Interactivity_Store::get_data()
-		);
-	}
-
-	public function test_store_existing_props_should_be_overwritten() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 1,
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 'overwritten',
-					),
-				),
-			)
-		);
-		$this->assertSame(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 'overwritten',
-					),
-				),
-			),
-			WP_Interactivity_Store::get_data()
-		);
-	}
-
-	public function test_store_existing_indexed_arrays_should_be_replaced() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => array( 1, 2 ),
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => array( 3, 4 ),
-					),
-				),
-			)
-		);
-		$this->assertSame(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => array( 3, 4 ),
-					),
-				),
-			),
-			WP_Interactivity_Store::get_data()
-		);
-	}
-
-	public function test_store_should_be_correctly_rendered() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 1,
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'b' => 2,
-					),
-				),
-			)
-		);
-		ob_start();
-		WP_Interactivity_Store::render();
-		$rendered = ob_get_clean();
-		$this->assertSame(
-			'<script id="wp-interactivity-initial-state" type="application/json">{"state":{"core":{"a":1,"b":2}}}</script>',
-			$rendered
-		);
-	}
-
-	public function test_store_should_also_escape_tags_and_amps() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'amps' => 'http://site.test/?foo=1&baz=2&bar=3',
-					'tags' => 'Do not do this: <!-- <script>',
-				),
-			)
-		);
-		ob_start();
-		WP_Interactivity_Store::render();
-		$rendered = ob_get_clean();
-		$this->assertSame(
-			'<script id="wp-interactivity-initial-state" type="application/json">{"state":{"amps":"http:\/\/site.test\/?foo=1\u0026baz=2\u0026bar=3","tags":"Do not do this: \u003C!-- \u003Cscript\u003E"}}</script>',
-			$rendered
-		);
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directive-processing-test.php b/phpunit/experimental/interactivity-api/directive-processing-test.php
deleted file mode 100644
index 46ef0284df15d9..00000000000000
--- a/phpunit/experimental/interactivity-api/directive-processing-test.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * Directive processing test.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- *
- * @phpcs:disable Generic.Files.OneObjectStructurePerFile.MultipleFound
- */
-
-
-class Helper_Class {
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function process_foo_test( $tags, $context ) {
-	}
-
-	public function increment( $store ) {
-		return $store['state']['count'] + $store['context']['count'];
-	}
-
-	public static function static_increment( $store ) {
-		return $store['state']['count'] + $store['context']['count'];
-	}
-}
-
-function gutenberg_test_process_directives_helper_increment( $store ) {
-	return $store['state']['count'] + $store['context']['count'];
-}
-
-/**
- * Tests for the gutenberg_interactivity_process_rendered_html function.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_rendered_html
- */
-class Tests_Process_Directives extends WP_UnitTestCase {
-	public function test_correctly_call_attribute_directive_processor_on_closing_tag() {
-
-		// PHPUnit cannot stub functions, only classes.
-		$test_helper = $this->createMock( Helper_Class::class );
-
-		$test_helper->expects( $this->exactly( 2 ) )
-				->method( 'process_foo_test' )
-				->with(
-					$this->callback(
-						function ( $p ) {
-							return 'DIV' === $p->get_tag() && (
-								// Either this is a closing tag...
-								$p->is_tag_closer() ||
-								// ...or it is an open tag, and has the directive attribute set.
-								( ! $p->is_tag_closer() && 'abc' === $p->get_attribute( 'foo-test' ) )
-							);
-						}
-					)
-				);
-
-		$directives = array(
-			'foo-test' => array( $test_helper, 'process_foo_test' ),
-		);
-
-		$markup = '<div>Example: <div foo-test="abc"><img><span>This is a test></span><div>Here is a nested div</div></div></div>';
-		$tags   = new WP_Directive_Processor( $markup );
-		$tags->process_rendered_html( $tags, 'foo-', $directives );
-	}
-
-	public function test_directives_with_double_hyphen_processed_correctly() {
-		$test_helper = $this->createMock( Helper_Class::class );
-		$test_helper->expects( $this->atLeastOnce() )
-				->method( 'process_foo_test' );
-
-		$directives = array(
-			'foo-test' => array( $test_helper, 'process_foo_test' ),
-		);
-
-		$markup = '<div foo-test--value="abc"></div>';
-		$tags   = new WP_Directive_Processor( $markup );
-		$tags->process_rendered_html( $tags, 'foo-', $directives );
-	}
-
-	public function test_interactivity_process_directives_in_root_blocks() {
-
-		$block_content =
-		'<!-- wp:paragraph -->' .
-			'<p>Welcome to WordPress. This is your first post. Edit or delete it, then start writing!</p>' .
-		'<!-- /wp:paragraph -->' .
-		'<!-- wp:paragraph -->' .
-			'<p>Welcome to WordPress.</p>' .
-		'<!-- /wp:paragraph -->';
-
-		$parsed_block = parse_blocks( $block_content )[0];
-
-		$source_block = $parsed_block;
-
-		$rendered_content = render_block( $parsed_block );
-
-		$parsed_block_second = parse_blocks( $block_content )[1];
-
-		$fake_parent_block = array();
-
-		// Test that root block is intially emtpy.
-		$this->assertEmpty( WP_Directive_Processor::$root_block );
-
-		// Test that root block is not added if there is a parent block.
-		gutenberg_interactivity_mark_root_blocks( $parsed_block, $source_block, $fake_parent_block );
-		$this->assertEmpty( WP_Directive_Processor::$root_block );
-
-		// Test that root block is added if there is no parent block.
-		gutenberg_interactivity_mark_root_blocks( $parsed_block, $source_block, null );
-		$current_root_block = WP_Directive_Processor::$root_block;
-		$this->assertNotEmpty( $current_root_block );
-
-		// Test that a root block is not added if there is already a root block defined.
-		gutenberg_interactivity_mark_root_blocks( $parsed_block_second, $source_block, null );
-		$this->assertSame( $current_root_block, WP_Directive_Processor::$root_block );
-
-		// Test that root block is removed after processing.
-		gutenberg_process_directives_in_root_blocks( $rendered_content, $parsed_block );
-		$this->assertEmpty( WP_Directive_Processor::$root_block );
-	}
-}
-
-
-/**
- * Tests for the gutenberg_interactivity_evaluate_reference function.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_evaluate_reference
- */
-class Tests_Utils_Evaluate extends WP_UnitTestCase {
-	public function test_evaluate_function_should_access_state() {
-		// Init a simple store.
-		wp_store(
-			array(
-				'state' => array(
-					'core' => array(
-						'number' => 1,
-						'bool'   => true,
-						'nested' => array(
-							'string' => 'hi',
-						),
-					),
-				),
-			)
-		);
-		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.core.number' ) );
-		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.core.bool' ) );
-		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.core.nested.string' ) );
-		$this->assertFalse( gutenberg_interactivity_evaluate_reference( '!state.core.bool' ) );
-	}
-
-	public function test_evaluate_function_should_access_passed_context() {
-		$context = array(
-			'local' => array(
-				'number' => 2,
-				'bool'   => false,
-				'nested' => array(
-					'string' => 'bye',
-				),
-			),
-		);
-		$this->assertSame( 2, gutenberg_interactivity_evaluate_reference( 'context.local.number', $context ) );
-		$this->assertFalse( gutenberg_interactivity_evaluate_reference( 'context.local.bool', $context ) );
-		$this->assertTrue( gutenberg_interactivity_evaluate_reference( '!context.local.bool', $context ) );
-		$this->assertSame( 'bye', gutenberg_interactivity_evaluate_reference( 'context.local.nested.string', $context ) );
-		// Previously defined state is also accessible.
-		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.core.number' ) );
-		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.core.bool' ) );
-		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.core.nested.string' ) );
-	}
-
-	public function test_evaluate_function_should_return_null_for_unresolved_paths() {
-		$this->assertNull( gutenberg_interactivity_evaluate_reference( 'this.property.doesnt.exist' ) );
-	}
-
-	public function test_evaluate_function_should_execute_anonymous_functions() {
-		$context = new WP_Directive_Context( array( 'count' => 2 ) );
-		$helper  = new Helper_Class();
-
-		wp_store(
-			array(
-				'state'     => array(
-					'count' => 3,
-				),
-				'selectors' => array(
-					'anonymous_function'           => function ( $store ) {
-						return $store['state']['count'] + $store['context']['count'];
-					},
-					// Other types of callables should not be executed.
-					'function_name'                => 'gutenberg_test_process_directives_helper_increment',
-					'class_method'                 => array( $helper, 'increment' ),
-					'class_static_method'          => 'Helper_Class::static_increment',
-					'class_static_method_as_array' => array( 'Helper_Class', 'static_increment' ),
-				),
-			)
-		);
-
-		$this->assertSame( 5, gutenberg_interactivity_evaluate_reference( 'selectors.anonymous_function', $context->get_context() ) );
-		$this->assertSame(
-			'gutenberg_test_process_directives_helper_increment',
-			gutenberg_interactivity_evaluate_reference( 'selectors.function_name', $context->get_context() )
-		);
-		$this->assertSame(
-			array( $helper, 'increment' ),
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_method', $context->get_context() )
-		);
-		$this->assertSame(
-			'Helper_Class::static_increment',
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_static_method', $context->get_context() )
-		);
-		$this->assertSame(
-			array( 'Helper_Class', 'static_increment' ),
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_static_method_as_array', $context->get_context() )
-		);
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php b/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
deleted file mode 100644
index bfb4c428cd9466..00000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Tests for the wp-bind directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-bind directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_bind
- */
-class Tests_Directives_WpBind extends WP_UnitTestCase {
-	public function test_directive_sets_attribute() {
-		$markup = '<img data-wp-bind--src="context.myblock.imageSource" />';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_bind( $tags, $context );
-
-		$this->assertSame(
-			'<img src="./wordpress.png" data-wp-bind--src="context.myblock.imageSource" />',
-			$tags->get_updated_html()
-		);
-		$this->assertSame( './wordpress.png', $tags->get_attribute( 'src' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-bind directive changed context' );
-	}
-
-	public function test_directive_ignores_empty_bound_attribute() {
-		$markup = '<img data-wp-bind.="context.myblock.imageSource" />';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_bind( $tags, $context );
-
-		$this->assertSame( $markup, $tags->get_updated_html() );
-		$this->assertNull( $tags->get_attribute( 'src' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-bind directive changed context' );
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-class-test.php b/phpunit/experimental/interactivity-api/directives/wp-class-test.php
deleted file mode 100644
index 419546c6d9ef8b..00000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-class-test.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Tests for the wp-class directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-class directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_class
- */
-class Tests_Directives_WpClass extends WP_UnitTestCase {
-	public function test_directive_adds_class() {
-		$markup = '<div data-wp-class--red="context.myblock.isRed" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
-
-		$this->assertSame(
-			'<div data-wp-class--red="context.myblock.isRed" class="blue red">Test</div>',
-			$tags->get_updated_html()
-		);
-		$this->assertStringContainsString( 'red', $tags->get_attribute( 'class' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-
-	public function test_directive_removes_class() {
-		$markup = '<div data-wp-class--blue="context.myblock.isBlue" class="red blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
-
-		$this->assertSame(
-			'<div data-wp-class--blue="context.myblock.isBlue" class="red">Test</div>',
-			$tags->get_updated_html()
-		);
-		$this->assertStringNotContainsString( 'blue', $tags->get_attribute( 'class' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-
-	public function test_directive_removes_empty_class_attribute() {
-		$markup = '<div data-wp-class--blue="context.myblock.isBlue" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
-
-		$this->assertSame(
-			// WP_HTML_Tag_Processor has a TODO note to prune whitespace after classname removal.
-			'<div data-wp-class--blue="context.myblock.isBlue" >Test</div>',
-			$tags->get_updated_html()
-		);
-		$this->assertNull( $tags->get_attribute( 'class' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-
-	public function test_directive_does_not_remove_non_existant_class() {
-		$markup = '<div data-wp-class--blue="context.myblock.isBlue" class="green red">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
-
-		$this->assertSame(
-			'<div data-wp-class--blue="context.myblock.isBlue" class="green red">Test</div>',
-			$tags->get_updated_html()
-		);
-		$this->assertSame( 'green red', $tags->get_attribute( 'class' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-
-	public function test_directive_ignores_empty_class_name() {
-		$markup = '<div data-wp-class.="context.myblock.isRed" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
-
-		$this->assertSame( $markup, $tags->get_updated_html() );
-		$this->assertStringNotContainsString( 'red', $tags->get_attribute( 'class' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-context-test.php b/phpunit/experimental/interactivity-api/directives/wp-context-test.php
deleted file mode 100644
index 1277b016848cce..00000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-context-test.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * Tests for the wp-context directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-context directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_context
- */
-class Tests_Directives_Attributes_WpContext extends WP_UnitTestCase {
-	public function test_directive_merges_context_correctly_upon_wp_context_attribute_on_opening_tag() {
-		$context = new WP_Directive_Context(
-			array(
-				'myblock'    => array( 'open' => false ),
-				'otherblock' => array( 'somekey' => 'somevalue' ),
-			)
-		);
-
-		$markup = '<div data-wp-context=\'{ "myblock": { "open": true } }\'>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		$this->assertSame(
-			array(
-				'myblock'    => array( 'open' => true ),
-				'otherblock' => array( 'somekey' => 'somevalue' ),
-			),
-			$context->get_context()
-		);
-	}
-
-	public function test_directive_resets_context_correctly_upon_closing_tag() {
-		$context = new WP_Directive_Context(
-			array( 'my-key' => 'original-value' )
-		);
-
-		$context->set_context(
-			array( 'my-key' => 'new-value' )
-		);
-
-		$markup = '</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		$this->assertSame(
-			array( 'my-key' => 'original-value' ),
-			$context->get_context()
-		);
-	}
-
-	public function test_directive_doesnt_throw_on_malformed_context_objects() {
-		$context = new WP_Directive_Context(
-			array( 'my-key' => 'some-value' )
-		);
-
-		$markup = '<div data-wp-context=\'{ "wrong_json_object: }\'>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-	}
-
-	public function test_directive_keeps_working_after_malformed_context_objects() {
-		$context = new WP_Directive_Context();
-
-		$markup = '
-			<div data-wp-context=\'{ "my-key": "some-value" }\'>
-				<div data-wp-context=\'{ "wrong_json_object: }\'>
-				</div>
-			</div>
-		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-
-		// Parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-
-		// Children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-
-		// Closing children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-
-		// Closing parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		// Now the context is empty.
-		$this->assertSame(
-			array(),
-			$context->get_context()
-		);
-	}
-
-	public function test_directive_keeps_working_with_a_directive_without_value() {
-		$context = new WP_Directive_Context();
-
-		$markup = '
-			<div data-wp-context=\'{ "my-key": "some-value" }\'>
-				<div data-wp-context>
-				</div>
-			</div>
-		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-
-		// Parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-
-		// Children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-
-		// Closing children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-
-		// Closing parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		// Now the context is empty.
-		$this->assertSame(
-			array(),
-			$context->get_context()
-		);
-	}
-
-	public function test_directive_keeps_working_with_an_empty_directive() {
-		$context = new WP_Directive_Context();
-
-		$markup = '
-			<div data-wp-context=\'{ "my-key": "some-value" }\'>
-				<div data-wp-context="">
-				</div>
-			</div>
-		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-
-		// Parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-
-		// Children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-
-		// Closing children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()
-		);
-
-		// Closing parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
-
-		// Now the context is empty.
-		$this->assertSame(
-			array(),
-			$context->get_context()
-		);
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-style-test.php b/phpunit/experimental/interactivity-api/directives/wp-style-test.php
deleted file mode 100644
index 8942559b2fe89f..00000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-style-test.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Tests for the wp-style directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-style directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_style
- */
-class Tests_Directives_WpStyle extends WP_UnitTestCase {
-	public function test_directive_adds_style() {
-		$markup = '<div data-wp-style--color="context.myblock.color" style="background: blue;">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_style( $tags, $context );
-
-		$this->assertSame(
-			'<div data-wp-style--color="context.myblock.color" style="background: blue;color: green;">Test</div>',
-			$tags->get_updated_html()
-		);
-		$this->assertStringContainsString( 'color: green;', $tags->get_attribute( 'style' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-style directive changed context' );
-	}
-
-	public function test_directive_ignores_empty_style() {
-		$markup = '<div data-wp-style.="context.myblock.color" style="background: blue;">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_style( $tags, $context );
-
-		$this->assertSame( $markup, $tags->get_updated_html() );
-		$this->assertStringNotContainsString( 'color: green;', $tags->get_attribute( 'style' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-style directive changed context' );
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-text-test.php b/phpunit/experimental/interactivity-api/directives/wp-text-test.php
deleted file mode 100644
index 81d2d0f370a64b..00000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-text-test.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Tests for the wp-text directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-text directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_text
- */
-class Tests_Directives_WpText extends WP_UnitTestCase {
-	public function test_directive_sets_inner_html_based_on_attribute_value_and_escapes_html() {
-		$markup = '<div data-wp-text="context.myblock.someText"></div>';
-
-		$tags = new WP_Directive_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'someText' => 'The HTML tag <br> produces a line break.' ) ) );
-		$context        = clone $context_before;
-		gutenberg_interactivity_process_wp_text( $tags, $context );
-
-		$expected_markup = '<div data-wp-text="context.myblock.someText">The HTML tag &lt;br&gt; produces a line break.</div>';
-		$this->assertSame( $expected_markup, $tags->get_updated_html() );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-text directive changed context' );
-	}
-
-	public function test_directive_overwrites_inner_html_based_on_attribute_value() {
-		$markup = '<div data-wp-text="context.myblock.someText">Lorem ipsum dolor sit.</div>';
-
-		$tags = new WP_Directive_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'someText' => 'Honi soit qui mal y pense.' ) ) );
-		$context        = clone $context_before;
-		gutenberg_interactivity_process_wp_text( $tags, $context );
-
-		$expected_markup = '<div data-wp-text="context.myblock.someText">Honi soit qui mal y pense.</div>';
-		$this->assertSame( $expected_markup, $tags->get_updated_html() );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-text directive changed context' );
-	}
-}
diff --git a/phpunit/experimental/media/class-gutenberg-rest-attachments-controller-test.php b/phpunit/experimental/media/class-gutenberg-rest-attachments-controller-test.php
new file mode 100644
index 00000000000000..56286f76ace836
--- /dev/null
+++ b/phpunit/experimental/media/class-gutenberg-rest-attachments-controller-test.php
@@ -0,0 +1,314 @@
+<?php
+
+/**
+ * @coversDefaultClass \Gutenberg_REST_Attachments_Controller
+ */
+class Gutenberg_REST_Attachments_Controller_Test extends WP_Test_REST_Post_Type_Controller_Testcase {
+	/**
+	 * @var int Administrator ID.
+	 */
+	protected static $admin_id;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$admin_id = $factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->remove_added_uploads();
+	}
+
+	public function tear_down() {
+		$this->remove_added_uploads();
+
+		parent::tear_down();
+	}
+
+	/**
+	 * @covers ::register_routes
+	 */
+	public function test_register_routes() {
+		$routes = rest_get_server()->get_routes();
+		$this->assertArrayHasKey( '/wp/v2/media', $routes );
+		$this->assertCount( 2, $routes['/wp/v2/media'] );
+		$this->assertArrayHasKey( '/wp/v2/media/(?P<id>[\d]+)', $routes );
+		$this->assertCount( 3, $routes['/wp/v2/media/(?P<id>[\d]+)'] );
+		$this->assertArrayHasKey( '/wp/v2/media/(?P<id>[\d]+)/sideload', $routes );
+		$this->assertCount( 1, $routes['/wp/v2/media/(?P<id>[\d]+)/sideload'] );
+	}
+
+	public function test_get_items() {
+		$this->markTestSkipped( 'No need to implement' );
+	}
+
+	public function test_get_item() {
+		$this->markTestSkipped( 'No need to implement' );
+	}
+
+	public function test_update_item() {
+		$this->markTestSkipped( 'No need to implement' );
+	}
+
+	public function test_delete_item() {
+		$this->markTestSkipped( 'No need to implement' );
+	}
+
+	public function test_get_item_schema() {
+		$this->markTestSkipped( 'No need to implement' );
+	}
+
+	public function test_context_param() {
+		$this->markTestSkipped( 'No need to implement' );
+	}
+
+	/**
+	 * Verifies that skipping sub-size generation works.
+	 *
+	 * @covers ::create_item
+	 * @covers ::create_item_permissions_check
+	 */
+	public function test_create_item() {
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+		$request->set_header( 'Content-Type', 'image/jpeg' );
+		$request->set_header( 'Content-Disposition', 'attachment; filename=canola.jpg' );
+		$request->set_param( 'title', 'My title is very cool' );
+		$request->set_param( 'caption', 'This is a better caption.' );
+		$request->set_param( 'description', 'Without a description, my attachment is descriptionless.' );
+		$request->set_param( 'alt_text', 'Alt text is stored outside post schema.' );
+		$request->set_param( 'generate_sub_sizes', false );
+
+		$request->set_body( file_get_contents( DIR_TESTDATA . '/images/canola.jpg' ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$this->assertSame( 'image', $data['media_type'] );
+		$this->assertArrayHasKey( 'missing_image_sizes', $data );
+		$this->assertNotEmpty( $data['missing_image_sizes'] );
+	}
+
+	/**
+	 * Verifies that skipping sub-size generation works.
+	 *
+	 * @covers ::create_item
+	 * @covers ::create_item_permissions_check
+	 */
+	public function test_create_item_insert_additional_metadata() {
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+		$request->set_header( 'Content-Type', 'image/jpeg' );
+		$request->set_header( 'Content-Disposition', 'attachment; filename=canola.jpg' );
+		$request->set_param( 'title', 'My title is very cool' );
+		$request->set_param( 'caption', 'This is a better caption.' );
+		$request->set_param( 'description', 'Without a description, my attachment is descriptionless.' );
+		$request->set_param( 'alt_text', 'Alt text is stored outside post schema.' );
+		$request->set_param( 'generate_sub_sizes', false );
+
+		$request->set_body( file_get_contents( DIR_TESTDATA . '/images/canola.jpg' ) );
+		$response = rest_get_server()->dispatch( $request );
+
+		remove_filter( 'wp_generate_attachment_metadata', '__return_empty_array', 1 );
+
+		$this->assertSame( 201, $response->get_status() );
+
+		$data = $response->get_data();
+
+		$this->assertArrayHasKey( 'media_details', $data );
+		$this->assertArrayHasKey( 'image_meta', $data['media_details'] );
+	}
+
+	public function test_prepare_item() {
+		$this->markTestSkipped( 'No need to implement' );
+	}
+
+	/**
+	 * @covers ::prepare_item_for_response
+	 */
+	public function test_prepare_item_lists_missing_image_sizes_for_pdfs() {
+		wp_set_current_user( self::$admin_id );
+
+		$attachment_id = self::factory()->attachment->create_object(
+			DIR_TESTDATA . '/images/test-alpha.pdf',
+			0,
+			array(
+				'post_mime_type' => 'application/pdf',
+				'post_excerpt'   => 'A sample caption',
+			)
+		);
+
+		$request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/media/%d', $attachment_id ) );
+		$request->set_param( 'context', 'edit' );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertArrayHasKey( 'missing_image_sizes', $data );
+		$this->assertNotEmpty( $data['missing_image_sizes'] );
+		$this->assertArrayHasKey( 'filename', $data );
+		$this->assertArrayHasKey( 'filesize', $data );
+	}
+
+	/**
+	 * @covers ::sideload_item
+	 * @covers ::sideload_item_permissions_check
+	 */
+	public function test_sideload_item() {
+		wp_set_current_user( self::$admin_id );
+
+		$attachment_id = self::factory()->attachment->create_object(
+			DIR_TESTDATA . '/images/canola.jpg',
+			0,
+			array(
+				'post_mime_type' => 'image/jpeg',
+				'post_excerpt'   => 'A sample caption',
+			)
+		);
+
+		wp_update_attachment_metadata(
+			$attachment_id,
+			wp_generate_attachment_metadata( $attachment_id, DIR_TESTDATA . '/images/canola.jpg' )
+		);
+
+		$request = new WP_REST_Request( 'POST', "/wp/v2/media/$attachment_id/sideload" );
+		$request->set_header( 'Content-Type', 'image/jpeg' );
+		$request->set_header( 'Content-Disposition', 'attachment; filename=canola-777x777.jpg' );
+		$request->set_param( 'image_size', 'medium' );
+
+		$request->set_body( file_get_contents( DIR_TESTDATA . '/images/canola.jpg' ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertSame( 'image', $data['media_type'] );
+		$this->assertArrayHasKey( 'missing_image_sizes', $data );
+		$this->assertEmpty( $data['missing_image_sizes'] );
+		$this->assertArrayHasKey( 'media_details', $data );
+		$this->assertArrayHasKey( 'sizes', $data['media_details'] );
+		$this->assertArrayHasKey( 'medium', $data['media_details']['sizes'] );
+		$this->assertArrayHasKey( 'file', $data['media_details']['sizes']['medium'] );
+		$this->assertSame( 'canola-777x777.jpg', $data['media_details']['sizes']['medium']['file'] );
+	}
+
+	/**
+	 * @covers ::sideload_item
+	 * @covers ::sideload_item_permissions_check
+	 */
+	public function test_sideload_item_year_month_based_folders() {
+		if ( version_compare( get_bloginfo( 'version' ), '6.6-beta1', '<' ) ) {
+			$this->markTestSkipped( 'This test requires WordPress 6.6+' );
+		}
+
+		update_option( 'uploads_use_yearmonth_folders', 1 );
+
+		wp_set_current_user( self::$admin_id );
+
+		$published_post = self::factory()->post->create(
+			array(
+				'post_status'   => 'publish',
+				'post_date'     => '2017-02-14 00:00:00',
+				'post_date_gmt' => '2017-02-14 00:00:00',
+			)
+		);
+
+		$request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+		$request->set_header( 'Content-Type', 'image/jpeg' );
+		$request->set_header( 'Content-Disposition', 'attachment; filename=canola-year-month.jpg' );
+		$request->set_param( 'post', $published_post );
+		$request->set_param( 'generate_sub_sizes', false );
+
+		$request->set_body( file_get_contents( DIR_TESTDATA . '/images/canola.jpg' ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$attachment_id = $data['id'];
+
+		$request = new WP_REST_Request( 'POST', "/wp/v2/media/$attachment_id/sideload" );
+		$request->set_header( 'Content-Type', 'image/jpeg' );
+		$request->set_header( 'Content-Disposition', 'attachment; filename=canola-year-month-777x777.jpg' );
+		$request->set_param( 'image_size', 'medium' );
+
+		$request->set_body( file_get_contents( DIR_TESTDATA . '/images/canola.jpg' ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		update_option( 'uploads_use_yearmonth_folders', 0 );
+
+		$this->assertSame( 200, $response->get_status() );
+
+		$attachment = get_post( $data['id'] );
+
+		$this->assertSame( $attachment->post_parent, $data['post'] );
+		$this->assertSame( $attachment->post_parent, $published_post );
+		$this->assertSame( wp_get_attachment_url( $attachment->ID ), $data['source_url'] );
+		$this->assertStringContainsString( '2017/02', $data['source_url'] );
+	}
+
+	/**
+	 * @covers ::sideload_item
+	 * @covers ::sideload_item_permissions_check
+	 */
+	public function test_sideload_item_year_month_based_folders_page_post_type() {
+		if ( version_compare( get_bloginfo( 'version' ), '6.6-beta1', '<' ) ) {
+			$this->markTestSkipped( 'This test requires WordPress 6.6+' );
+		}
+
+		update_option( 'uploads_use_yearmonth_folders', 1 );
+
+		wp_set_current_user( self::$admin_id );
+
+		$published_post = self::factory()->post->create(
+			array(
+				'post_type'     => 'page',
+				'post_status'   => 'publish',
+				'post_date'     => '2017-02-14 00:00:00',
+				'post_date_gmt' => '2017-02-14 00:00:00',
+			)
+		);
+
+		$request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+		$request->set_header( 'Content-Type', 'image/jpeg' );
+		$request->set_header( 'Content-Disposition', 'attachment; filename=canola-year-month-page.jpg' );
+		$request->set_param( 'post', $published_post );
+		$request->set_param( 'generate_sub_sizes', false );
+
+		$request->set_body( file_get_contents( DIR_TESTDATA . '/images/canola.jpg' ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$attachment_id = $data['id'];
+
+		$request = new WP_REST_Request( 'POST', "/wp/v2/media/$attachment_id/sideload" );
+		$request->set_header( 'Content-Type', 'image/jpeg' );
+		$request->set_header( 'Content-Disposition', 'attachment; filename=canola-year-month-page-777x777.jpg' );
+		$request->set_param( 'image_size', 'medium' );
+
+		$request->set_body( file_get_contents( DIR_TESTDATA . '/images/canola.jpg' ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		update_option( 'uploads_use_yearmonth_folders', 0 );
+
+		$time   = current_time( 'mysql' );
+		$y      = substr( $time, 0, 4 );
+		$m      = substr( $time, 5, 2 );
+		$subdir = "/$y/$m";
+
+		$this->assertSame( 200, $response->get_status() );
+
+		$attachment = get_post( $data['id'] );
+
+		$this->assertSame( $attachment->post_parent, $data['post'] );
+		$this->assertSame( $attachment->post_parent, $published_post );
+		$this->assertSame( wp_get_attachment_url( $attachment->ID ), $data['source_url'] );
+		$this->assertStringNotContainsString( '2017/02', $data['source_url'] );
+		$this->assertStringContainsString( $subdir, $data['source_url'] );
+	}
+}
diff --git a/phpunit/experimental/media/media-processing-test.php b/phpunit/experimental/media/media-processing-test.php
new file mode 100644
index 00000000000000..2717d2582879ff
--- /dev/null
+++ b/phpunit/experimental/media/media-processing-test.php
@@ -0,0 +1,197 @@
+<?php
+
+/**
+ * Tests for experimental client-side media processing.
+ */
+class Media_Processing_Test extends WP_UnitTestCase {
+	/**
+	 * @var int Administrator ID.
+	 */
+	protected static $admin_id;
+
+	/**
+	 * @var string Image file path.
+	 */
+	private static $image_file;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$admin_id = $factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		self::$image_file = get_temp_dir() . 'canola.jpg';
+		if ( ! file_exists( self::$image_file ) ) {
+			copy( DIR_TESTDATA . '/images/canola.jpg', self::$image_file );
+		}
+	}
+
+	public function tear_down() {
+		$this->remove_added_uploads();
+
+		parent::tear_down();
+	}
+
+	/**
+	 * @covers gutenberg_get_all_image_sizes
+	 */
+	public function test_get_all_image_sizes() {
+		$sizes = gutenberg_get_all_image_sizes();
+		$this->assertNotEmpty( $sizes );
+		foreach ( $sizes as $size ) {
+			$this->assertIsInt( $size['width'] );
+			$this->assertIsInt( $size['height'] );
+			$this->assertIsString( $size['name'] );
+		}
+	}
+
+	/**
+	 * @covers gutenberg_filter_attachment_post_type_args
+	 */
+	public function test_filter_attachment_post_type_args() {
+		$post_type_object = get_post_type_object( 'attachment' );
+		$this->assertInstanceOf( Gutenberg_REST_Attachments_Controller::class, $post_type_object->get_rest_controller() );
+
+		$this->assertSame(
+			array( 'rest_controller_class' => Gutenberg_REST_Attachments_Controller::class ),
+			gutenberg_filter_attachment_post_type_args( array(), 'attachment' )
+		);
+		$this->assertSame(
+			array(),
+			gutenberg_filter_attachment_post_type_args( array(), 'post' )
+		);
+	}
+
+	/**
+	 * @covers ::gutenberg_rest_get_attachment_filesize
+	 */
+	public function test_rest_get_attachment_filesize() {
+		$attachment_id = self::factory()->attachment->create_object(
+			self::$image_file,
+			0,
+			array(
+				'post_mime_type' => 'image/jpeg',
+				'post_excerpt'   => 'A sample caption',
+			)
+		);
+
+		$this->assertSame( wp_filesize( self::$image_file ), gutenberg_rest_get_attachment_filesize( array( 'id' => $attachment_id ) ) );
+	}
+
+	/**
+	 * @covers ::gutenberg_rest_get_attachment_filename
+	 */
+	public function test_rest_get_attachment_filename() {
+		$attachment_id = self::factory()->attachment->create_object(
+			self::$image_file,
+			0,
+			array(
+				'post_mime_type' => 'image/jpeg',
+				'post_excerpt'   => 'A sample caption',
+			)
+		);
+
+		$this->assertSame( 'canola.jpg', gutenberg_rest_get_attachment_filename( array( 'id' => $attachment_id ) ) );
+	}
+
+	/**
+	 * @covers ::gutenberg_media_processing_filter_rest_index
+	 */
+	public function test_get_rest_index_should_return_additional_settings() {
+		$server = new WP_REST_Server();
+
+		$request = new WP_REST_Request( 'GET', '/' );
+		$index   = $server->dispatch( $request );
+		$data    = $index->get_data();
+
+		$this->assertArrayNotHasKey( 'image_size_threshold', $data );
+		$this->assertArrayNotHasKey( 'image_output_formats', $data );
+		$this->assertArrayNotHasKey( 'jpeg_interlaced', $data );
+		$this->assertArrayNotHasKey( 'png_interlaced', $data );
+		$this->assertArrayNotHasKey( 'gif_interlaced', $data );
+		$this->assertArrayNotHasKey( 'image_sizes', $data );
+	}
+
+	/**
+	 * @covers ::gutenberg_media_processing_filter_rest_index
+	 */
+	public function test_get_rest_index_should_return_additional_settings_can_upload_files() {
+		wp_set_current_user( self::$admin_id );
+
+		$server = new WP_REST_Server();
+
+		$request = new WP_REST_Request( 'GET', '/' );
+		$index   = $server->dispatch( $request );
+		$data    = $index->get_data();
+
+		$this->assertArrayHasKey( 'image_size_threshold', $data );
+		$this->assertArrayHasKey( 'image_output_formats', $data );
+		$this->assertArrayHasKey( 'jpeg_interlaced', $data );
+		$this->assertArrayHasKey( 'png_interlaced', $data );
+		$this->assertArrayHasKey( 'gif_interlaced', $data );
+		$this->assertArrayHasKey( 'image_sizes', $data );
+	}
+
+	/**
+	 * @covers ::gutenberg_add_crossorigin_attributes
+	 */
+	public function test_add_crossorigin_attributes() {
+		$html = <<<HTML
+<img src="https://www.someothersite.com/test1.jpg" />
+<img src="test2.jpg" />
+<audio><source src="https://www.someothersite.com/test1.mp3"></audio>
+<audio src="https://www.someothersite.com/test1.mp3"></audio>
+<audio src="/test2.mp3"></audio>
+<video><source src="https://www.someothersite.com/test1.mp4"></video>
+<video src="https://www.someothersite.com/test1.mp4"></video>
+<video src="/test2.mp4"></video>
+<script src="https://www.someothersite.com/test1.js"></script>
+<script src="/test2.js"></script>
+<link href="https://www.someothersite.com/test1.css"></link>
+<link href="/test2.css"></link>
+HTML;
+
+		$expected = <<<HTML
+<img crossorigin="anonymous" src="https://www.someothersite.com/test1.jpg" />
+<img crossorigin="anonymous" src="test2.jpg" />
+<audio crossorigin="anonymous"><source src="https://www.someothersite.com/test1.mp3"></audio>
+<audio crossorigin="anonymous" src="https://www.someothersite.com/test1.mp3"></audio>
+<audio src="/test2.mp3"></audio>
+<video crossorigin="anonymous"><source src="https://www.someothersite.com/test1.mp4"></video>
+<video crossorigin="anonymous" src="https://www.someothersite.com/test1.mp4"></video>
+<video src="/test2.mp4"></video>
+<script crossorigin="anonymous" src="https://www.someothersite.com/test1.js"></script>
+<script src="/test2.js"></script>
+<link crossorigin="anonymous" href="https://www.someothersite.com/test1.css"></link>
+<link href="/test2.css"></link>
+HTML;
+
+		$actual = gutenberg_add_crossorigin_attributes( $html );
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * @covers ::gutenberg_override_media_templates
+	 */
+	public function test_gutenberg_override_media_templates(): void {
+		if ( ! function_exists( '\wp_print_media_templates' ) ) {
+			require_once ABSPATH . WPINC . '/media-template.php';
+		}
+
+		gutenberg_override_media_templates();
+
+		ob_start();
+		do_action( 'admin_footer' ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
+		$output = ob_get_clean();
+
+		$this->assertStringContainsString( '<audio crossorigin="anonymous"', $output );
+		$this->assertStringContainsString( '<img crossorigin="anonymous"', $output );
+		$this->assertStringContainsString( '<video crossorigin="anonymous"', $output );
+	}
+}
diff --git a/phpunit/experimental/modules/class-gutenberg-modules-test.php b/phpunit/experimental/modules/class-gutenberg-modules-test.php
deleted file mode 100644
index 87ff6e6647d7bf..00000000000000
--- a/phpunit/experimental/modules/class-gutenberg-modules-test.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Tests Gutenberg_Modules_Test
- *
- * @package WordPress
- */
-
-/**
- * Tests for the Gutenberg_Modules_Test class.
- */
-class Gutenberg_Modules_Test extends WP_UnitTestCase {
-
-	protected $old_wp_scripts;
-	protected $old_modules_markup;
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
-		remove_action( 'wp_default_scripts', 'wp_default_scripts' );
-		remove_action( 'wp_default_scripts', 'wp_default_packages' );
-		$GLOBALS['wp_scripts']    = new WP_Scripts();
-		$this->old_modules_markup = get_echo( array( 'Gutenberg_Modules', 'print_enqueued_modules' ) );
-	}
-
-	public function tear_down() {
-		$GLOBALS['wp_scripts'] = $this->old_wp_scripts;
-		add_action( 'wp_default_scripts', 'wp_default_scripts' );
-		parent::tear_down();
-	}
-
-	public function test_wp_enqueue_module() {
-		global $wp_version;
-		gutenberg_register_module( 'no-deps-no-version', 'interactivity-api-1.js' );
-		gutenberg_enqueue_module( 'no-deps-no-version' );
-		gutenberg_register_module( 'deps-no-version', 'interactivity-api-2.js', array( 'no-deps-no-version' ) );
-		gutenberg_enqueue_module( 'deps-no-version' );
-
-		$modules_markup    = get_echo( array( 'Gutenberg_Modules', 'print_enqueued_modules' ) );
-		$import_map_markup = get_echo( array( 'Gutenberg_Modules', 'print_import_map' ) );
-		$preload_markup    = get_echo( array( 'Gutenberg_Modules', 'print_module_preloads' ) );
-
-		$previous_tags      = new WP_HTML_Tag_Processor( $this->old_modules_markup );
-		$previous_src_stack = array();
-		while ( $previous_tags->next_tag( array( 'type' => 'module' ) ) ) {
-			$previous_src_stack[] = $previous_tags->get_attribute( 'src' );
-		}
-		// Test that there are 2 new <script type="module"> added to the markup.
-		$tags      = new WP_HTML_Tag_Processor( $modules_markup );
-		$src_stack = array();
-		while ( $tags->next_tag( array( 'type' => 'module' ) ) ) {
-			$src_stack[] = $tags->get_attribute( 'src' );
-		}
-		$new_src_stack = array_values( array_diff( $src_stack, $previous_src_stack ) );
-		$this->assertEquals( 2, count( $new_src_stack ) );
-		$this->assertEquals( 'interactivity-api-1.js?ver=' . $wp_version, $new_src_stack[0] );
-		$this->assertEquals( 'interactivity-api-2.js?ver=' . $wp_version, $new_src_stack[1] );
-		// Test that there is 1 <script type="importmap"> added to the markup.
-		$tags = new WP_HTML_Tag_Processor( $import_map_markup );
-		$this->assertEquals( true, $tags->next_tag( array( 'rel' => 'importmap' ) ) );
-
-		// Test that there is 1 <link type="modulepreload"> added to the markup.
-		$tags = new WP_HTML_Tag_Processor( $preload_markup );
-		$this->assertEquals( true, $tags->next_tag( array( 'rel' => 'modulepreload' ) ) );
-	}
-}
diff --git a/phpunit/fixtures/block.json b/phpunit/fixtures/block.json
index 2ab91788dc0d43..f4ef1b313c4e5f 100644
--- a/phpunit/fixtures/block.json
+++ b/phpunit/fixtures/block.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "my-plugin/notice",
 	"title": "Notice",
@@ -11,7 +12,7 @@
 	"icon": "star",
 	"description": "Shows warning, error or success notices…",
 	"keywords": [ "alert", "message" ],
-	"textDomain": "my-plugin",
+	"textdomain": "my-plugin",
 	"attributes": {
 		"message": {
 			"type": "string",
diff --git a/phpunit/fixtures/hooked-block/block.json b/phpunit/fixtures/hooked-block/block.json
index 0d97cf8b8bac61..791bc7b0a7dba5 100644
--- a/phpunit/fixtures/hooked-block/block.json
+++ b/phpunit/fixtures/hooked-block/block.json
@@ -1,4 +1,6 @@
 {
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"title": "Hooked Block",
 	"name": "tests/hooked-block",
 	"blockHooks": {
 		"tests/group-first-child": "firstChild",
diff --git a/phpunit/fixtures/variations.php b/phpunit/fixtures/variations.php
new file mode 100644
index 00000000000000..bed66d9544176b
--- /dev/null
+++ b/phpunit/fixtures/variations.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	array(
+		'name'        => 'warning',
+		'title'       => 'warning',
+		'description' => 'Shows warning.',
+		'keywords'    => array( 'warning' ),
+	),
+);
diff --git a/phpunit/style-engine/class-wp-style-engine-css-rule-test.php b/phpunit/style-engine/class-wp-style-engine-css-rule-test.php
index 444c83f150f911..3a513ebb8b3bdd 100644
--- a/phpunit/style-engine/class-wp-style-engine-css-rule-test.php
+++ b/phpunit/style-engine/class-wp-style-engine-css-rule-test.php
@@ -34,6 +34,22 @@ public function test_should_instantiate_with_selector_and_rules() {
 		$this->assertSame( $expected, $css_rule->get_css(), 'Value returned by get_css() does not match expected declarations string.' );
 	}
 
+	/**
+	 * Tests setting and getting a rules group.
+	 *
+	 * @covers ::set_rules_group
+	 * @covers ::get_rules_group
+	 */
+	public function test_should_set_rules_group() {
+		$rule = new WP_Style_Engine_CSS_Rule_Gutenberg( '.heres-johnny', array(), '@layer state' );
+
+		$this->assertSame( '@layer state', $rule->get_rules_group(), 'Return value of get_rules_group() does not match value passed to constructor.' );
+
+		$rule->set_rules_group( '@layer pony' );
+
+		$this->assertSame( '@layer pony', $rule->get_rules_group(), 'Return value of get_rules_group() does not match value passed to set_rules_group().' );
+	}
+
 	/**
 	 * Tests that declaration properties are deduplicated.
 	 *
diff --git a/phpunit/style-engine/class-wp-style-engine-css-rules-store-test.php b/phpunit/style-engine/class-wp-style-engine-css-rules-store-test.php
index 8529bff78e22c8..297e05b5580d58 100644
--- a/phpunit/style-engine/class-wp-style-engine-css-rules-store-test.php
+++ b/phpunit/style-engine/class-wp-style-engine-css-rules-store-test.php
@@ -170,4 +170,20 @@ public function test_should_get_all_rule_objects_for_a_store() {
 
 		$this->assertSame( $expected, $new_pizza_store->get_all_rules(), 'Return value for get_all_rules() does not match expectations after adding new rules to store.' );
 	}
+
+	/**
+	 * Tests adding rules group keys to store.
+	 *
+	 * @covers ::add_rule
+	 */
+	public function test_should_store_as_concatenated_rules_groups_and_selector() {
+		$store_one      = WP_Style_Engine_CSS_Rules_Store_Gutenberg::get_store( 'one' );
+		$store_one_rule = $store_one->add_rule( '.tony', '.one' );
+
+		$this->assertSame(
+			'.one .tony',
+			"{$store_one_rule->get_rules_group()} {$store_one_rule->get_selector()}",
+			'add_rule() does not concatenate rules group and selector.'
+		);
+	}
 }
diff --git a/phpunit/style-engine/class-wp-style-engine-processor-test.php b/phpunit/style-engine/class-wp-style-engine-processor-test.php
index 4177ab276f1c8c..6d3a5a812e4fd3 100644
--- a/phpunit/style-engine/class-wp-style-engine-processor-test.php
+++ b/phpunit/style-engine/class-wp-style-engine-processor-test.php
@@ -44,6 +44,41 @@ public function test_should_return_rules_as_compiled_css() {
 		);
 	}
 
+	/**
+	 * Tests adding nested rules with at-rules and returning compiled CSS rules.
+	 *
+	 * @covers ::add_rules
+	 * @covers ::get_css
+	 */
+	public function test_should_return_nested_rules_as_compiled_css() {
+		$a_nice_css_rule = new WP_Style_Engine_CSS_Rule_Gutenberg( '.a-nice-rule' );
+		$a_nice_css_rule->add_declarations(
+			array(
+				'color'            => 'var(--nice-color)',
+				'background-color' => 'purple',
+			)
+		);
+		$a_nice_css_rule->set_rules_group( '@media (min-width: 80rem)' );
+
+		$a_nicer_css_rule = new WP_Style_Engine_CSS_Rule_Gutenberg( '.a-nicer-rule' );
+		$a_nicer_css_rule->add_declarations(
+			array(
+				'font-family'      => 'Nice sans',
+				'font-size'        => '1em',
+				'background-color' => 'purple',
+			)
+		);
+		$a_nicer_css_rule->set_rules_group( '@layer nicety' );
+
+		$a_nice_processor = new WP_Style_Engine_Processor_Gutenberg();
+		$a_nice_processor->add_rules( array( $a_nice_css_rule, $a_nicer_css_rule ) );
+
+		$this->assertSame(
+			'@media (min-width: 80rem){.a-nice-rule{color:var(--nice-color);background-color:purple;}}@layer nicety{.a-nicer-rule{font-family:Nice sans;font-size:1em;background-color:purple;}}',
+			$a_nice_processor->get_css( array( 'prettify' => false ) )
+		);
+	}
+
 	/**
 	 * Tests compiling CSS rules and formatting them with new lines and indents.
 	 *
@@ -95,6 +130,52 @@ public function test_should_return_prettified_css_rules() {
 		);
 	}
 
+	/**
+	 * Tests compiling nested CSS rules and formatting them with new lines and indents.
+	 *
+	 * @covers ::get_css
+	 */
+	public function test_should_return_prettified_nested_css_rules() {
+		$a_wonderful_css_rule = new WP_Style_Engine_CSS_Rule_Gutenberg( '.a-wonderful-rule' );
+		$a_wonderful_css_rule->add_declarations(
+			array(
+				'color'            => 'var(--wonderful-color)',
+				'background-color' => 'orange',
+			)
+		);
+		$a_wonderful_css_rule->set_rules_group( '@media (min-width: 80rem)' );
+
+		$a_very_wonderful_css_rule = new WP_Style_Engine_CSS_Rule_Gutenberg( '.a-very_wonderful-rule' );
+		$a_very_wonderful_css_rule->add_declarations(
+			array(
+				'color'            => 'var(--wonderful-color)',
+				'background-color' => 'orange',
+			)
+		);
+		$a_very_wonderful_css_rule->set_rules_group( '@layer wonderfulness' );
+
+		$a_wonderful_processor = new WP_Style_Engine_Processor_Gutenberg();
+		$a_wonderful_processor->add_rules( array( $a_wonderful_css_rule, $a_very_wonderful_css_rule ) );
+
+		$expected = '@media (min-width: 80rem) {
+	.a-wonderful-rule {
+		color: var(--wonderful-color);
+		background-color: orange;
+	}
+}
+@layer wonderfulness {
+	.a-very_wonderful-rule {
+		color: var(--wonderful-color);
+		background-color: orange;
+	}
+}
+';
+		$this->assertSame(
+			$expected,
+			$a_wonderful_processor->get_css( array( 'prettify' => true ) )
+		);
+	}
+
 	/**
 	 * Tests adding a store and compiling CSS rules from that store.
 	 *
diff --git a/phpunit/style-engine/style-engine-test.php b/phpunit/style-engine/style-engine-test.php
index d8ded749c640b2..fdf5ccebabef99 100644
--- a/phpunit/style-engine/style-engine-test.php
+++ b/phpunit/style-engine/style-engine-test.php
@@ -23,7 +23,7 @@ public function tear_down() {
 	/**
 	 * Tests generating block styles and classnames based on various manifestations of the $block_styles argument.
 	 *
-	 * @covers ::gutenberg_style_engine_get_styles
+	 * @covers ::wp_style_engine_get_styles
 	 * @covers WP_Style_Engine_Gutenberg::parse_block_styles
 	 * @covers WP_Style_Engine_Gutenberg::compile_css
 	 *
@@ -506,18 +506,24 @@ public function data_wp_style_engine_get_styles() {
 			'inline_background_image_url_with_background_size' => array(
 				'block_styles'    => array(
 					'background' => array(
-						'backgroundImage' => array(
+						'backgroundImage'      => array(
 							'url' => 'https://example.com/image.jpg',
 						),
-						'backgroundSize'  => 'cover',
+						'backgroundPosition'   => 'center',
+						'backgroundRepeat'     => 'no-repeat',
+						'backgroundSize'       => 'cover',
+						'backgroundAttachment' => 'fixed',
 					),
 				),
 				'options'         => array(),
 				'expected_output' => array(
-					'css'          => "background-image:url('https://example.com/image.jpg');background-size:cover;",
+					'css'          => "background-image:url('https://example.com/image.jpg');background-position:center;background-repeat:no-repeat;background-size:cover;background-attachment:fixed;",
 					'declarations' => array(
-						'background-image' => "url('https://example.com/image.jpg')",
-						'background-size'  => 'cover',
+						'background-image'      => "url('https://example.com/image.jpg')",
+						'background-position'   => 'center',
+						'background-repeat'     => 'no-repeat',
+						'background-size'       => 'cover',
+						'background-attachment' => 'fixed',
 					),
 				),
 			),
@@ -527,7 +533,7 @@ public function data_wp_style_engine_get_styles() {
 	/**
 	 * Tests adding rules to a store and retrieving a generated stylesheet.
 	 *
-	 * @covers ::gutenberg_style_engine_get_styles
+	 * @covers ::wp_style_engine_get_styles
 	 * @covers WP_Style_Engine_Gutenberg::store_css_rule
 	 */
 	public function test_should_store_block_styles_using_context() {
@@ -662,7 +668,7 @@ public function test_should_return_stylesheet_from_css_rules() {
 	 *
 	 * @ticket 58811
 	 *
-	 * @covers ::gutenberg_style_engine_get_stylesheet_from_css_rules
+	 * @covers ::wp_style_engine_get_stylesheet_from_css_rules
 	 * @covers WP_Style_Engine_Gutenberg::compile_stylesheet_from_css_rules
 	 */
 	public function test_should_dedupe_and_merge_css_rules() {
@@ -712,7 +718,7 @@ public function test_should_dedupe_and_merge_css_rules() {
 	 *
 	 * This is testing this fix: https://github.com/WordPress/gutenberg/pull/49004
 	 *
-	 * @covers ::gutenberg_style_engine_get_stylesheet_from_css_rules
+	 * @covers ::wp_style_engine_get_stylesheet_from_css_rules
 	 * @covers WP_Style_Engine_Gutenberg::compile_stylesheet_from_css_rules
 	 */
 	public function test_should_return_stylesheet_from_duotone_css_rules() {
@@ -732,4 +738,60 @@ public function test_should_return_stylesheet_from_duotone_css_rules() {
 		$compiled_stylesheet = gutenberg_style_engine_get_stylesheet_from_css_rules( $css_rules, array( 'prettify' => false ) );
 		$this->assertSame( ".wp-duotone-ffffff-000000-1{filter:url('#wp-duotone-ffffff-000000-1') !important;}", $compiled_stylesheet );
 	}
+
+	/**
+	 * Tests returning a generated stylesheet from a set of nested rules and merging their declarations.
+	 */
+	public function test_should_merge_declarations_for_rules_groups() {
+		$css_rules = array(
+			array(
+				'selector'     => '.saruman',
+				'rules_group'  => '@container (min-width: 700px)',
+				'declarations' => array(
+					'color'        => 'white',
+					'height'       => '100px',
+					'border-style' => 'solid',
+					'align-self'   => 'stretch',
+				),
+			),
+			array(
+				'selector'     => '.saruman',
+				'rules_group'  => '@container (min-width: 700px)',
+				'declarations' => array(
+					'color'       => 'black',
+					'font-family' => 'The-Great-Eye',
+				),
+			),
+		);
+
+		$compiled_stylesheet = gutenberg_style_engine_get_stylesheet_from_css_rules( $css_rules, array( 'prettify' => false ) );
+
+		$this->assertSame( '@container (min-width: 700px){.saruman{color:black;height:100px;border-style:solid;align-self:stretch;font-family:The-Great-Eye;}}', $compiled_stylesheet );
+	}
+
+	/**
+	 * Tests returning a generated stylesheet from a set of nested rules.
+	 */
+	public function test_should_return_stylesheet_with_nested_rules() {
+		$css_rules = array(
+			array(
+				'rules_group'  => '.foo',
+				'selector'     => '@media (orientation: landscape)',
+				'declarations' => array(
+					'background-color' => 'blue',
+				),
+			),
+			array(
+				'rules_group'  => '.foo',
+				'selector'     => '@media (min-width > 1024px)',
+				'declarations' => array(
+					'background-color' => 'cotton-blue',
+				),
+			),
+		);
+
+		$compiled_stylesheet = gutenberg_style_engine_get_stylesheet_from_css_rules( $css_rules, array( 'prettify' => false ) );
+
+		$this->assertSame( '.foo{@media (orientation: landscape){background-color:blue;}}.foo{@media (min-width > 1024px){background-color:cotton-blue;}}', $compiled_stylesheet );
+	}
 }
diff --git a/phpunit/tests/blocks/renderHookedBlocks.php b/phpunit/tests/blocks/renderHookedBlocks.php
deleted file mode 100644
index 5e9abd4d8ba050..00000000000000
--- a/phpunit/tests/blocks/renderHookedBlocks.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-/**
- * Tests for hooked blocks rendering.
- *
- * @package WordPress
- * @subpackage Blocks
- * @since 6.4.0
- *
- * @group blocks
- */
-class Tests_Blocks_RenderHookedBlocks extends WP_UnitTestCase {
-	public function set_up() {
-		parent::set_up();
-		add_filter( 'block_type_metadata_settings', 'gutenberg_add_hooked_blocks', 10, 2 );
-	}
-
-	public function tear_down() {
-		remove_filter( 'block_type_metadata_settings', 'gutenberg_add_hooked_blocks' );
-		parent::tear_down();
-	}
-
-	/**
-	 * @ticket 59313
-	 */
-	public function test_inject_hooked_block_at_first_child_position() {
-		$content = <<<HTML
-<!-- wp:tests/group-first-child {"layout":{"type":"constrained"}} -->
-	<div class="wp-block-group">
-		<!-- wp:paragraph -->
-			<p>Foo</p>
-		<!-- /wp:paragraph -->
-	</div>
-<!-- /wp:tests/group-first-child -->
-HTML;
-
-		$block_type = register_block_type( GUTENBERG_DIR_TESTFIXTURES . '/hooked-block/' );
-		$blocks     = parse_blocks( $content );
-		$result     = gutenberg_serialize_blocks( $blocks );
-
-		unregister_block_type( $block_type->name );
-
-		$expected_result = <<<HTML
-<!-- wp:tests/group-first-child {"layout":{"type":"constrained"}} -->
-	<div class="wp-block-group">
-		<!-- wp:tests/hooked-block /--><!-- wp:paragraph -->
-			<p>Foo</p>
-		<!-- /wp:paragraph -->
-	</div>
-<!-- /wp:tests/group-first-child -->
-HTML;
-		$this->assertSame( $expected_result, $result );
-	}
-
-	/**
-	 * @ticket 59313
-	 */
-	public function test_inject_hooked_block_at_first_child_position_no_inner_content() {
-		$content = '<!-- wp:tests/group-first-child /-->';
-
-		$block_type = register_block_type( GUTENBERG_DIR_TESTFIXTURES . '/hooked-block/' );
-		$blocks     = parse_blocks( $content );
-		$result     = gutenberg_serialize_blocks( $blocks );
-
-		unregister_block_type( $block_type->name );
-
-		$expected_result = '<!-- wp:tests/group-first-child --><!-- wp:tests/hooked-block /--><!-- /wp:tests/group-first-child -->';
-		$this->assertSame( $expected_result, $result );
-	}
-
-	/**
-	 * @ticket 59313
-	 */
-	public function test_inject_hooked_block_at_first_child_position_no_child_blocks() {
-		$content = <<<HTML
-<!-- wp:tests/group-first-child -->
-	<div class="wp-block-group"></div>
-<!-- /wp:tests/group-first-child -->
-HTML;
-
-		$block_type = register_block_type( GUTENBERG_DIR_TESTFIXTURES . '/hooked-block/' );
-		$blocks     = parse_blocks( $content );
-		$result     = gutenberg_serialize_blocks( $blocks );
-
-		unregister_block_type( $block_type->name );
-
-		// @todo In the perfect world, the hooked block would be injected inside the `div` tag.
-		$expected_result = <<<HTML
-<!-- wp:tests/group-first-child --><!-- wp:tests/hooked-block /-->
-	<div class="wp-block-group"></div>
-<!-- /wp:tests/group-first-child -->
-HTML;
-		$this->assertSame( $expected_result, $result );
-	}
-
-	/**
-	 * @ticket 59313
-	 */
-	public function test_inject_hooked_block_at_last_child_position() {
-		$content = <<<HTML
-<!-- wp:tests/group-last-child {"layout":{"type":"constrained"}} -->
-	<div class="wp-block-group">
-		<!-- wp:paragraph -->
-			<p>Foo</p>
-		<!-- /wp:paragraph -->
-	</div>
-<!-- /wp:tests/group-last-child -->
-HTML;
-
-		$block_type = register_block_type( GUTENBERG_DIR_TESTFIXTURES . '/hooked-block/' );
-		$blocks     = parse_blocks( $content );
-		$result     = gutenberg_serialize_blocks( $blocks );
-
-		unregister_block_type( $block_type->name );
-
-		$expected_result = <<<HTML
-<!-- wp:tests/group-last-child {"layout":{"type":"constrained"}} -->
-	<div class="wp-block-group">
-		<!-- wp:paragraph -->
-			<p>Foo</p>
-		<!-- /wp:paragraph --><!-- wp:tests/hooked-block /-->
-	</div>
-<!-- /wp:tests/group-last-child -->
-HTML;
-		$this->assertSame( $expected_result, $result );
-	}
-
-	/**
-	 * @ticket 59313
-	 */
-	public function test_inject_hooked_block_at_last_child_position_no_inner_content() {
-		$content = '<!-- wp:tests/group-last-child /-->';
-
-		$block_type = register_block_type( GUTENBERG_DIR_TESTFIXTURES . '/hooked-block/' );
-		$blocks     = parse_blocks( $content );
-		$result     = gutenberg_serialize_blocks( $blocks );
-
-		unregister_block_type( $block_type->name );
-
-		$expected_result = '<!-- wp:tests/group-last-child --><!-- wp:tests/hooked-block /--><!-- /wp:tests/group-last-child -->';
-		$this->assertSame( $expected_result, $result );
-	}
-
-	/**
-	 * @ticket 59313
-	 */
-	public function test_inject_hooked_block_at_last_child_position_no_child_blocks() {
-		$content = <<<HTML
-<!-- wp:tests/group-last-child -->
-	<div class="wp-block-group"></div>
-<!-- /wp:tests/group-last-child -->
-HTML;
-
-		$block_type = register_block_type( GUTENBERG_DIR_TESTFIXTURES . '/hooked-block/' );
-		$blocks     = parse_blocks( $content );
-		$result     = gutenberg_serialize_blocks( $blocks );
-
-		unregister_block_type( $block_type->name );
-
-		// @todo In the perfect world, the hooked block would be injected inside the `div` tag.
-		$expected_result = <<<HTML
-<!-- wp:tests/group-last-child -->
-	<div class="wp-block-group"></div>
-<!-- wp:tests/hooked-block /--><!-- /wp:tests/group-last-child -->
-HTML;
-		$this->assertSame( $expected_result, $result );
-	}
-}
diff --git a/phpunit/tests/fonts-api/base.php b/phpunit/tests/fonts-api/base.php
deleted file mode 100644
index 5d03e2733964af..00000000000000
--- a/phpunit/tests/fonts-api/base.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-/**
- * Test case for the Fonts API tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/wp-fonts-tests-dataset.php';
-
-/**
- * Abstracts the common tasks for the API's tests.
- */
-abstract class WP_Fonts_TestCase extends WP_UnitTestCase {
-	use WP_Fonts_Tests_Datasets;
-
-	/**
-	 * Original WP_Fonts instance, before the tests.
-	 *
-	 * @var WP_Fonts
-	 */
-	private $old_wp_fonts;
-
-	/**
-	 * Current error reporting level (before a test changes it).
-	 *
-	 * @var null|int
-	 */
-	protected $error_reporting_level = null;
-
-	/**
-	 * Reflection data store for non-public property access.
-	 *
-	 * @var ReflectionProperty[]
-	 */
-	protected $property = array();
-
-	/**
-	 * Indicates the test class uses `switch_theme()` and requires
-	 * set_up and tear_down fixtures to set and reset hooks and memory.
-	 *
-	 * If a test class switches themes, set this property to `true`.
-	 *
-	 * @var bool
-	 */
-	protected static $requires_switch_theme_fixtures = false;
-
-	/**
-	 * Theme root directory.
-	 *
-	 * @var string
-	 */
-	protected static $theme_root;
-
-	/**
-	 * Original theme directory.
-	 *
-	 * @var string
-	 */
-	protected $orig_theme_dir;
-
-	/**
-	 * Administrator ID.
-	 *
-	 * @var int
-	 */
-	protected static $administrator_id = 0;
-
-	public static function set_up_before_class() {
-		parent::set_up_before_class();
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			self::$theme_root = realpath( GUTENBERG_DIR_TESTDATA . '/themedir1' );
-		}
-	}
-
-	public static function tear_down_after_class() {
-		// Reset static flags.
-		self::$requires_switch_theme_fixtures = false;
-
-		parent::tear_down_after_class();
-	}
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->old_wp_fonts  = $GLOBALS['wp_fonts'];
-		$GLOBALS['wp_fonts'] = null;
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			$this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
-
-			// /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
-			$GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', self::$theme_root );
-
-			// Set up the new root.
-			add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
-			add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
-			add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
-
-			// Clear caches.
-			wp_clean_themes_cache();
-			unset( $GLOBALS['wp_themes'] );
-		}
-	}
-
-	public function tear_down() {
-		$this->property      = array();
-		$GLOBALS['wp_fonts'] = $this->old_wp_fonts;
-
-		// Reset the error reporting when modified within a test.
-		if ( is_int( $this->error_reporting_level ) ) {
-			error_reporting( $this->error_reporting_level );
-			$this->error_reporting_level = null;
-		}
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			// Clean up the filters to modify the theme root.
-			remove_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
-			remove_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
-			remove_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
-
-			WP_Theme_JSON_Resolver::clean_cached_data();
-			if ( class_exists( 'WP_Theme_JSON_Resolver_Gutenberg' ) ) {
-				WP_Theme_JSON_Resolver_Gutenberg::clean_cached_data();
-			}
-		}
-
-		parent::tear_down();
-	}
-
-	public function clean_up_global_scope() {
-		parent::clean_up_global_scope();
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
-			wp_clean_themes_cache();
-
-			if ( function_exists( 'wp_clean_theme_json_cache' ) ) {
-				wp_clean_theme_json_cache();
-			}
-
-			if ( function_exists( '_gutenberg_clean_theme_json_caches' ) ) {
-				_gutenberg_clean_theme_json_caches();
-			}
-
-			unset( $GLOBALS['wp_themes'] );
-		}
-	}
-
-	public function filter_set_theme_root() {
-		return self::$theme_root;
-	}
-
-	protected function set_up_mock( $method ) {
-		$mock = $this->setup_object_mock( $method, WP_Fonts::class );
-
-		// Set the global.
-		$GLOBALS['wp_fonts'] = $mock;
-
-		return $mock;
-	}
-
-	protected function setup_object_mock( $method, $class_name ) {
-		if ( is_string( $method ) ) {
-			$method = array( $method );
-		}
-
-		return $this->getMockBuilder( $class_name )->setMethods( $method )->getMock();
-	}
-
-	protected function get_registered_handles() {
-		return array_keys( $this->get_registered() );
-	}
-
-	protected function get_registered() {
-		return wp_fonts()->registered;
-	}
-
-	protected function get_variations( $font_family, $wp_fonts = null ) {
-		if ( ! ( $wp_fonts instanceof WP_Fonts ) ) {
-			$wp_fonts = wp_fonts();
-		}
-
-		return $wp_fonts->registered[ $font_family ]->deps;
-	}
-
-	protected function get_enqueued_handles() {
-		return wp_fonts()->queue;
-	}
-
-	protected function get_queued_before_register( $wp_fonts = null ) {
-		return $this->get_property_value( 'queued_before_register', WP_Dependencies::class, $wp_fonts );
-	}
-
-	protected function get_reflection_property( $property_name, $class_name = 'WP_Fonts' ) {
-		$property = new ReflectionProperty( $class_name, $property_name );
-		$property->setAccessible( true );
-
-		return $property;
-	}
-
-	protected function get_property_value( $property_name, $class_name, $wp_fonts = null ) {
-		$property = $this->get_reflection_property( $property_name, $class_name );
-
-		if ( ! $wp_fonts ) {
-			$wp_fonts = wp_fonts();
-		}
-
-		return $property->getValue( $wp_fonts );
-	}
-
-	protected function setup_property( $class_name, $property_name ) {
-		$key = $this->get_property_key( $class_name, $property_name );
-
-		if ( ! isset( $this->property[ $key ] ) ) {
-			$this->property[ $key ] = new ReflectionProperty( $class_name, 'providers' );
-			$this->property[ $key ]->setAccessible( true );
-		}
-
-		return $this->property[ $key ];
-	}
-
-	protected function get_property_key( $class_name, $property_name ) {
-		return $class_name . '::$' . $property_name;
-	}
-
-	/**
-	 * Opens the accessibility to access the given private or protected method.
-	 *
-	 * @param string $method_name Name of the method to open.
-	 * @return ReflectionMethod Instance of the method, ie to invoke it in the test.
-	 */
-	protected function get_reflection_method( $method_name ) {
-		$method = new ReflectionMethod( WP_Fonts::class, $method_name );
-		$method->setAccessible( true );
-
-		return $method;
-	}
-
-	/**
-	 * Sets up multiple font family and variation mocks.
-	 *
-	 * @param array    $inputs   Array of array( font-family => variations ) to setup.
-	 * @param WP_Fonts $wp_fonts Instance of WP_Fonts.
-	 * @return stdClass[] Array of registered mocks.
-	 */
-	protected function setup_registration_mocks( array $inputs, WP_Fonts $wp_fonts ) {
-		$mocks = array();
-
-		$build_mock = static function ( $font_family, $is_font_family = false ) use ( &$mocks, $wp_fonts ) {
-			$mock        = new stdClass();
-			$mock->deps  = array();
-			$mock->extra = array( 'is_font_family' => $is_font_family );
-			if ( $is_font_family ) {
-				$mock->extra['font-family'] = $font_family;
-			}
-
-			$handle = $is_font_family ? WP_Fonts_Utils::convert_font_family_into_handle( $font_family ) : $font_family;
-
-			// Add to each queue.
-			$mocks[ $handle ]                = $mock;
-			$wp_fonts->registered[ $handle ] = $mock;
-
-			return $mock;
-		};
-
-		foreach ( $inputs as $font_family => $variations ) {
-			$font_mock = $build_mock( $font_family, true );
-
-			foreach ( $variations as $variation_handle => $variation ) {
-				if ( ! is_string( $variation_handle ) ) {
-					$variation_handle = $variation;
-				}
-				$variation_mock                           = $build_mock( $variation_handle );
-				$variation_mock->extra['font-properties'] = $variation;
-				$font_mock->deps[]                        = $variation_handle;
-			}
-		}
-
-		return $mocks;
-	}
-
-	/**
-	 * Register one or more font-family and its variations to set up a test.
-	 *
-	 * @param string        $font_family Font family to test.
-	 * @param array         $variations  Variations.
-	 * @param WP_Fonts|null $wp_fonts    Optional. Instance of the WP_Fonts.
-	 */
-	protected function setup_register( $font_family, $variations, $wp_fonts = null ) {
-		if ( ! ( $wp_fonts instanceof WP_Fonts ) ) {
-			$wp_fonts = wp_fonts();
-		}
-
-		$font_family_handle = $wp_fonts->add_font_family( $font_family );
-
-		foreach ( $variations as $variation_handle => $variation ) {
-			if ( ! is_string( $variation_handle ) ) {
-				$variation_handle = '';
-			}
-			$wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-		}
-	}
-
-	/**
-	 * Sets up the WP_Fonts::$provider property.
-	 *
-	 * @param WP_Fonts     $wp_fonts     Instance of WP_Fonts.
-	 * @param string|array $provider     Provider ID when string. Else provider definition with 'id' and 'class' keys.
-	 * @param array        $font_handles Optional. Font handles for this provider.
-	 */
-	protected function setup_provider_property_mock( WP_Fonts $wp_fonts, $provider, array $font_handles = array() ) {
-		if ( is_string( $provider ) ) {
-			$provider = $this->get_provider_definitions( $provider );
-		}
-
-		$property  = $this->setup_property( WP_Fonts::class, 'providers' );
-		$providers = $property->getValue( $wp_fonts );
-
-		if ( ! isset( $providers[ $provider['id'] ] ) ) {
-			$providers[ $provider['id'] ] = array(
-				'class' => $provider['class'],
-				'fonts' => $font_handles,
-			);
-		} else {
-			$providers[ $provider['id'] ] = array_merge( $font_handles, $providers[ $provider['id'] ]['fonts'] );
-		}
-
-		$property->setValue( $wp_fonts, $providers );
-	}
-
-	/**
-	 * Gets the variation handles for the provider from the given fonts.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array  $fonts       Fonts definitions keyed by font family.
-	 * @param string $provider_id Provider ID.
-	 * @return array|string[] Array of handles on success. Else empty array.
-	 */
-	protected function get_handles_for_provider( array $fonts, $provider_id ) {
-		$handles = array();
-
-		foreach ( $fonts as $variations ) {
-			foreach ( $variations as $variation_handle => $variation ) {
-				if ( $provider_id !== $variation['provider'] ) {
-					continue;
-				}
-				$handles[] = $variation_handle;
-			}
-		}
-
-		return $handles;
-	}
-
-	protected static function set_up_admin_user() {
-		self::$administrator_id = self::factory()->user->create(
-			array(
-				'role'       => 'administrator',
-				'user_email' => 'administrator@example.com',
-			)
-		);
-	}
-
-	/**
-	 * Sets up the global styles.
-	 *
-	 * @param array $styles User-selected styles structure.
-	 * @param array $theme  Optional. Theme to switch to for the test. Default 'fonts-block-theme'.
-	 */
-	protected function set_up_global_styles( array $styles, $theme = 'fonts-block-theme' ) {
-		switch_theme( $theme );
-
-		if ( empty( $styles ) ) {
-			return;
-		}
-
-		// Make sure there is data from the user origin.
-		wp_set_current_user( self::$administrator_id );
-		$user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme(), true );
-		$config   = json_decode( $user_cpt['post_content'], true );
-
-		// Add the test styles.
-		$config['styles'] = $styles;
-
-		// Update the global styles and settings post.
-		$user_cpt['post_content'] = wp_json_encode( $config );
-		wp_update_post( $user_cpt, true, false );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/base.php b/phpunit/tests/fonts-api/bc-layer/base.php
deleted file mode 100644
index 27a4d43f7188a2..00000000000000
--- a/phpunit/tests/fonts-api/bc-layer/base.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Test case for the Fonts API's BC Layer tests.
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-require_once __DIR__ . '/bc-layer-tests-dataset.php';
-
-/**
- * Abstracts the common tasks for the Font API's BC Layer tests.
- */
-abstract class Fonts_BcLayer_TestCase extends WP_Fonts_TestCase {
-	use BC_Layer_Tests_Datasets;
-
-	/**
-	 * Original WP_Webfonts instance, before the tests.
-	 *
-	 * @var WP_Fonts
-	 */
-	private $old_wp_webfonts;
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->old_wp_webfonts  = isset( $GLOBALS['wp_webfonts'] ) ? $GLOBALS['wp_webfonts'] : null;
-		$GLOBALS['wp_webfonts'] = null;
-	}
-
-	public function tear_down() {
-		$GLOBALS['wp_webfonts'] = $this->old_wp_webfonts;
-
-		parent::tear_down();
-	}
-
-	protected function set_up_webfonts_mock( $method ) {
-		$mock = $this->setup_object_mock( $method, WP_Webfonts::class );
-
-		// Set the global.
-		$GLOBALS['wp_webfonts'] = $mock;
-
-		return $mock;
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/bc-layer-tests-dataset.php b/phpunit/tests/fonts-api/bc-layer/bc-layer-tests-dataset.php
deleted file mode 100644
index 6366aaec7df732..00000000000000
--- a/phpunit/tests/fonts-api/bc-layer/bc-layer-tests-dataset.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?php
-/**
- * Fonts API BC Layer datasets for unit and integration tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-/**
- * Trait for reusing datasets within the Fonts API's BC Layer tests.
- */
-trait BC_Layer_Tests_Datasets {
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_deprecated_structure() {
-		return array(
-			'1 font'                           => array(
-				'fonts'    => array(
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Merriweather',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-				),
-				'expected' => array(
-					'migration'            => array(
-						'Merriweather' => array(
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Merriweather',
-								'font-style'   => 'normal',
-								'font-weight'  => '200 900',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-							),
-						),
-					),
-					'wp_register_webfonts' => array( 'merriweather' ),
-					'get_registered'       => array( 'merriweather', 'merriweather-200-900-normal' ),
-				),
-			),
-			'2 font in same font family'       => array(
-				'fonts'    => array(
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '300',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'italic',
-						'font-weight'  => '900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-				),
-				'expected' => array(
-					'migration'            => array(
-						'Source Serif Pro' => array(
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Source Serif Pro',
-								'font-style'   => 'normal',
-								'font-weight'  => '300',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-								'font-display' => 'fallback',
-							),
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Source Serif Pro',
-								'font-style'   => 'italic',
-								'font-weight'  => '900',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-								'font-display' => 'fallback',
-							),
-						),
-					),
-					'wp_register_webfonts' => array( 'source-serif-pro' ),
-					'get_registered'       => array(
-						'source-serif-pro',
-						'source-serif-pro-300-normal',
-						'source-serif-pro-900-italic',
-					),
-				),
-			),
-			'Fonts in different font families' => array(
-				'fonts'    => array(
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '300',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Merriweather',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'italic',
-						'font-weight'  => '900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-				),
-				'expected' => array(
-					'migration'            => array(
-						'Source Serif Pro' => array(
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Source Serif Pro',
-								'font-style'   => 'normal',
-								'font-weight'  => '300',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-								'font-display' => 'fallback',
-							),
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Source Serif Pro',
-								'font-style'   => 'italic',
-								'font-weight'  => '900',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-								'font-display' => 'fallback',
-							),
-						),
-						'Merriweather'     => array(
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Merriweather',
-								'font-style'   => 'normal',
-								'font-weight'  => '200 900',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-							),
-						),
-					),
-					'wp_register_webfonts' => array( 'source-serif-pro', 'merriweather' ),
-					'get_registered'       => array(
-						'source-serif-pro',
-						'source-serif-pro-300-normal',
-						'source-serif-pro-900-italic',
-						'merriweather',
-						'merriweather-200-900-normal',
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_not_deprecated_structure() {
-		return array(
-			'1 font'                           => array(
-				array(
-					'Merriweather' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Merriweather',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-			),
-			'2 font in same font family'       => array(
-				array(
-					'Source Serif Pro' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '300',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-			),
-			'Fonts in different font families' => array(
-				array(
-					'source-serif-pro' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '300',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-					'merriweather'     => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Merriweather',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_deprecated_structure_with_invalid_font_family() {
-		return array(
-			'non-string'                                  => array(
-				'fonts'            => array(
-					array(
-						'provider'     => 'local',
-						'font-family'  => null,
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-				),
-				'expected_message' => 'Font family not defined in the variation.',
-			),
-			'empty string in deprecated structure'        => array(
-				'fonts'            => array(
-					'0' => array(
-						'provider'     => 'local',
-						'font-style'   => 'normal',
-						'font-weight'  => '300',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-				),
-				'expected_message' => 'Font family not found.',
-			),
-			'incorrect parameter in deprecated structure' => array(
-				'fonts'            => array(
-					array(
-						'provider'     => 'local',
-						'FontFamily'   => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '300',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-					array(
-						'provider'     => 'local',
-						'font_family'  => 'Merriweather',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-					array(
-						'provider'     => 'local',
-						'font family'  => 'Source Serif Pro',
-						'font-style'   => 'italic',
-						'font-weight'  => '900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-				),
-				'expected_message' => 'Font family not found.',
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_return_registered_webfonts() {
-		return array(
-			'Single variation'       => array(
-				'fonts'    => array(
-					'Merriweather' => array(
-						array(
-							'font-family' => 'Merriweather',
-							'font-style'  => 'normal',
-							'font-weight' => '400',
-							'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-				'expected' => array(
-					'merriweather' => array(
-						'merriweather-400-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Merriweather',
-							'font-style'   => 'normal',
-							'font-weight'  => '400',
-							'font-display' => 'fallback',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-			),
-			'2 variations'           => array(
-				'fonts'    => array(
-					'Source Serif Pro' => array(
-						'source-serif-pro-200-900-normal' => array(
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						),
-						'source-serif-pro-200-900-italic' => array(
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						),
-					),
-				),
-				'expected' => array(
-					'source-serif-pro' => array(
-						'source-serif-pro-200-900-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						),
-						'source-serif-pro-200-900-italic' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						),
-					),
-				),
-			),
-			'Multiple font families' => array(
-				'fonts'    => array(
-					'Merriweather'     => array(
-						array(
-							'font-family' => 'Merriweather',
-							'font-style'  => 'normal',
-							'font-weight' => '400',
-							'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-					'Source Serif Pro' => array(
-						'source-serif-pro-200-900-normal' => array(
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						),
-						'source-serif-pro-200-900-italic' => array(
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						),
-					),
-				),
-				'expected' => array(
-					'merriweather'     => array(
-						'merriweather-400-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Merriweather',
-							'font-style'   => 'normal',
-							'font-weight'  => '400',
-							'font-display' => 'fallback',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-					'source-serif-pro' => array(
-						'source-serif-pro-200-900-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						),
-						'source-serif-pro-200-900-italic' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/isDeprecatedStructure.php b/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/isDeprecatedStructure.php
deleted file mode 100644
index d76de3f205005d..00000000000000
--- a/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/isDeprecatedStructure.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Integration tests for Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers Gutenberg_Fonts_API_BC_Layer::is_deprecated_structure
- */
-class Tests_Fonts_GutenbergFontsApiBcLayer_IsDeprecatedStructure extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider data_deprecated_structure
-	 *
-	 * @param array $fonts Fonts to test.
-	 */
-	public function test_should_detect_deprecated_structure( array $fonts ) {
-		$this->assertTrue( Gutenberg_Fonts_API_BC_Layer::is_deprecated_structure( $fonts ) );
-	}
-
-	/**
-	 * @dataProvider data_not_deprecated_structure
-	 *
-	 * @param array $fonts Fonts to test.
-	 */
-	public function test_should_not_detect_deprecated_structure( array $fonts ) {
-		$this->assertFalse( Gutenberg_Fonts_API_BC_Layer::is_deprecated_structure( $fonts ) );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/migrateDeprecatedStructure.php b/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/migrateDeprecatedStructure.php
deleted file mode 100644
index b98481dfbf942f..00000000000000
--- a/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/migrateDeprecatedStructure.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Integration tests for Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
- */
-class Tests_Fonts_GutenbergFontsApiBcLayer_MigrateDeprecatedStructure extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider data_deprecated_structure
-	 *
-	 * @expectedDeprecated Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
-	 *
-	 * @param array $fonts    Fonts to test.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_migrate_dprecated_structure_and_throw_deprecation( array $fonts, array $expected ) {
-		$this->assertSameSets( $expected['migration'], Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure( $fonts ) );
-	}
-
-	/**
-	 * @dataProvider data_not_deprecated_structure
-	 *
-	 * @param array $fonts Fonts to test.
-	 */
-	public function test_should_return_fonts_and_not_throw_deprecation( array $fonts ) {
-		$this->assertSameSets( $fonts, Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure( $fonts ) );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpRegisterWebfonts.php b/phpunit/tests/fonts-api/bc-layer/wpRegisterWebfonts.php
deleted file mode 100644
index 59e0a9d314a135..00000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpRegisterWebfonts.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Integration tests for wp_register_webfonts().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers ::wp_register_webfonts
- */
-class Tests_Fonts_WpRegisterWebfonts extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider data_deprecated_structure
-	 *
-	 * @expectedDeprecated Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
-	 * @expectedDeprecated wp_register_webfonts
-	 *
-	 * @param array $fonts Fonts to test.
-	 */
-	public function test_should_throw_deprecations( array $fonts ) {
-		wp_register_webfonts( $fonts );
-	}
-
-	/**
-	 * @dataProvider data_deprecated_structure
-	 *
-	 * @expectedDeprecated Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
-	 * @expectedDeprecated wp_register_webfonts
-	 *
-	 * @param array $fonts    Fonts to test.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_register_with_deprecated_structure( array $fonts, array $expected ) {
-		$actual = wp_register_webfonts( $fonts );
-		$this->assertSame( $expected['wp_register_webfonts'], $actual, 'Font family handle(s) should be returned' );
-		$this->assertSame( $expected['get_registered'], $this->get_registered_handles(), 'Fonts should match registered queue' );
-	}
-
-	/**
-	 * @dataProvider data_deprecated_structure_with_invalid_font_family
-	 *
-	 * @expectedDeprecated Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
-	 * @expectedDeprecated wp_register_webfonts
-	 *
-	 * @param array  $fonts            Fonts to test.
-	 * @param string $expected_message Expected notice message.
-	 */
-	public function test_should_not_register_with_undefined_font_family( array $fonts, $expected_message ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( $expected_message );
-
-		$actual = wp_register_webfonts( $fonts );
-		$this->assertSame( array(), $actual, 'Return value should be an empty array' );
-		$this->assertEmpty( $this->get_registered_handles(), 'No fonts should have registered' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getAllWebfonts.php b/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getAllWebfonts.php
deleted file mode 100644
index 7a217a343c5359..00000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getAllWebfonts.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Integration tests for WP_Webfonts::get_all_webfonts().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers WP_Webfonts::get_all_webfonts
- */
-class Tests_Fonts_WpWebfonts_GetAllWebfonts extends Fonts_BcLayer_TestCase {
-	use BC_Layer_Tests_Datasets;
-
-	/**
-	 * @dataProvider data_should_return_registered_webfonts
-	 *
-	 * @expectedDeprecated wp_webfonts
-	 * @expectedDeprecated WP_Webfonts::get_all_webfonts
-	 *
-	 * @param array $fonts    Fonts to register.
-	 * @param array $expected Expected result.
-	 */
-	public function test_should_return_registered_webfonts( array $fonts, array $expected ) {
-		wp_register_fonts( $fonts );
-
-		$this->assertSame( $expected, wp_webfonts()->get_all_webfonts() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getFontSlug.php b/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getFontSlug.php
deleted file mode 100644
index 7c05f24b037520..00000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getFontSlug.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Integration tests for WP_Webfonts::get_font_slug().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers WP_Webfonts::get_font_slug
- */
-class Tests_Fonts_WpWebfonts_GetFontSlug extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider data_should_get_font_slug
-	 *
-	 * @expectedDeprecated WP_Webfonts::get_font_slug
-	 *
-	 * @param array|string $to_convert Value to test.
-	 * @param string       $expected   Expected result.
-	 */
-	public function test_should_get_font_slug( $to_convert, $expected ) {
-		$this->assertSame( $expected, WP_Webfonts::get_font_slug( $to_convert ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_get_font_slug() {
-		return array(
-			'font family: single word'                    => array(
-				'to_convert' => 'Merriweather',
-				'expected'   => 'merriweather',
-			),
-			'variation: single word font-family'          => array(
-				'to_convert' => array(
-					'font-family' => 'Merriweather',
-					'font-style'  => 'normal',
-					'font-weight' => '400',
-				),
-				'expected'   => 'merriweather',
-			),
-			'font family: multiword'                      => array(
-				'to_convert' => 'Source Sans Pro',
-				'expected'   => 'source-sans-pro',
-			),
-			'variation: multiword font-family'            => array(
-				'to_convert' => array(
-					'font-family' => 'Source Serif Pro',
-					'font-style'  => 'normal',
-					'font-weight' => '200 900',
-				),
-				'expected'   => 'source-serif-pro',
-			),
-			'font family: delimited by hyphens'           => array(
-				'to_convert' => 'source-serif-pro',
-				'expected'   => 'source-serif-pro',
-			),
-			'variation: font-family delimited by hyphens' => array(
-				'to_convert' => array(
-					'font-family' => 'source-serif-pro',
-					'font-style'  => 'normal',
-					'font-weight' => '200 900',
-				),
-				'expected'   => 'source-serif-pro',
-			),
-			'font family: delimited by underscore'        => array(
-				'to_convert' => 'source_serif_pro',
-				'expected'   => 'source_serif_pro',
-			),
-			'variation: font family delimited by underscore' => array(
-				'to_convert' => array(
-					'font-style'  => 'normal',
-					'font-weight' => '200 900',
-					'font-family' => 'Source_Serif_Pro',
-				),
-				'expected'   => 'source_serif_pro',
-			),
-			'font family: delimited by hyphens and underscore' => array(
-				'to_convert' => 'my-custom_font_family',
-				'expected'   => 'my-custom_font_family',
-			),
-			'variation: font family delimited by hyphens and underscore' => array(
-				'to_convert' => array(
-					'font-weight' => '700',
-					'font-family' => 'my-custom_font_family',
-					'font-style'  => 'italic',
-				),
-				'expected'   => 'my-custom_font_family',
-			),
-			'font family: delimited mixture'              => array(
-				'to_convert' => 'My custom_font-family',
-				'expected'   => 'my-custom_font-family',
-			),
-			'variation: font family delimited mixture'    => array(
-				'to_convert' => array(
-					'font-style'  => 'italic',
-					'font-family' => 'My custom_font-family',
-					'font-weight' => '700',
-				),
-				'expected'   => 'my-custom_font-family',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_not_get_font_slug
-	 *
-	 * @expectedDeprecated WP_Webfonts::get_font_slug
-	 *
-	 * @param array|string $to_convert Value to test.
-	 */
-	public function test_should_not_get_font_slug( $to_convert ) {
-		$this->assertFalse( WP_Webfonts::get_font_slug( $to_convert ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_not_get_font_slug() {
-		return array(
-			'Empty string' => array( '' ),
-			'Empty array'  => array( array() ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getRegisteredWebfonts.php b/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getRegisteredWebfonts.php
deleted file mode 100644
index 7a8c97a4d86471..00000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getRegisteredWebfonts.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Integration tests for WP_Webfonts::get_registered_webfonts().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers WP_Webfonts::get_registered_webfonts
- */
-class Tests_Fonts_WpWebfonts_GetRegisteredWebfonts extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider       data_should_return_registered_webfonts
-	 *
-	 * @expectedDeprecated wp_webfonts
-	 * @expectedDeprecated WP_Webfonts::get_registered_webfonts
-	 *
-	 * @param array $fonts    Fonts to register.
-	 * @param array $expected Expected result.
-	 */
-	public function test_should_return_registered_webfonts( array $fonts, array $expected ) {
-		wp_register_fonts( $fonts );
-
-		$this->assertSame( $expected, wp_webfonts()->get_registered_webfonts() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/registerWebfont.php b/phpunit/tests/fonts-api/bc-layer/wpWebfonts/registerWebfont.php
deleted file mode 100644
index ccc4249ad4fcc6..00000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/registerWebfont.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Integration tests for WP_Webfonts::register_webfont().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers WP_Webfonts::register_webfont
- */
-class Tests_Fonts_WpWebfonts_RegisterWebfont extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @expectedDeprecated wp_webfonts
-	 * @expectedDeprecated WP_Webfonts::register_webfont
-	 */
-	public function test_should_bail_out() {
-		$webfont = array();
-		$this->assertFalse( wp_webfonts()->register_webfont( $webfont ) );
-	}
-
-	/**
-	 * @dataProvider data_should_register_webfont
-	 *
-	 * @expectedDeprecated wp_webfonts
-	 * @expectedDeprecated WP_Webfonts::register_webfont
-	 *
-	 * @param array        $input    Font to register.
-	 * @param string|false $expected Expected result.
-	 */
-	public function test_should_register_webfont( array $input, $expected ) {
-		$this->assertSame( $expected['register_webfont'], wp_webfonts()->register_webfont( ...$input ), 'Font-family handle should be returned' );
-		$this->assertSame( $expected['get_registered'], $this->get_registered_handles(), 'Font should be registered' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_register_webfont() {
-		return array(
-			'No font family or variation handles'   => array(
-				'input'    => array(
-					array(
-						'font-family' => 'Merriweather',
-						'font-style'  => 'italic',
-						'font-weight' => '400',
-						'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-				),
-				'expected' => array(
-					'register_webfont' => 'merriweather',
-					'get_registered'   => array( 'merriweather', 'merriweather-400-italic' ),
-				),
-			),
-			'Has font family handle but no variation handles' => array(
-				'input'    => array(
-					array(
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					),
-					'source-serif-pro',
-				),
-				'expected' => array(
-					'register_webfont' => 'source-serif-pro',
-					'get_registered'   => array( 'source-serif-pro', 'source-serif-pro-200-900-normal' ),
-				),
-			),
-			'No font family handle but has variation handle' => array(
-				'input'    => array(
-					array(
-						'font-family' => 'Merriweather',
-						'font-style'  => 'italic',
-						'font-weight' => '400',
-						'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-					'',
-					'merriweather-italic-400',
-				),
-				'expected' => array(
-					'register_webfont' => 'merriweather',
-					'get_registered'   => array( 'merriweather', 'merriweather-italic-400' ),
-				),
-			),
-			'Has font family and variation handles' => array(
-				'input'    => array(
-					array(
-						'font-family' => 'Source Serif Pro',
-						'font-style'  => 'italic',
-						'font-weight' => '200 900',
-						'src'         => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-					),
-					'source-serif-pro',
-					'source-serif-pro-variable-italic',
-				),
-				'expected' => array(
-					'register_webfont' => 'source-serif-pro',
-					'get_registered'   => array( 'source-serif-pro', 'source-serif-pro-variable-italic' ),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wp-fonts-tests-dataset.php b/phpunit/tests/fonts-api/wp-fonts-tests-dataset.php
deleted file mode 100644
index b882965598d360..00000000000000
--- a/phpunit/tests/fonts-api/wp-fonts-tests-dataset.php
+++ /dev/null
@@ -1,1396 +0,0 @@
-<?php
-/**
- * Fonts API datasets for unit and integration tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-/**
- * Trait for reusing datasets within the Fonts API's tests.
- */
-trait WP_Fonts_Tests_Datasets {
-	/**
-	 * Data provider for testing variation registration that has valid structure.
-	 *
-	 * @return array
-	 */
-	public function data_valid_variation() {
-		return array(
-			'font-weight and font-style not defined; without variation handle' => array(
-				'expected'           => 'lato-400-normal',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => 'Lato',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-			),
-
-			'font-weight and font-style not defined; with variation handle' => array(
-				'expected'           => 'my-custom-handle',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => 'Lato',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'variation_handle'   => 'my-custom-handle',
-			),
-
-			'font-weight defined; without variation handle' => array(
-				'expected'           => 'source-serif-pro-200-900-normal',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'font-family'  => 'Source Serif Pro',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-				),
-			),
-
-			'font-weight defined; with variation handle' => array(
-				'expected'           => 'my_custom_handle',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'font-family'  => 'Source Serif Pro',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-				),
-				'variation_handle'   => 'my_custom_handle',
-			),
-
-			'font-weight defined; without variation handle' => array(
-				'expected'           => 'source-serif-pro-200-900-normal',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'font-family'  => 'Source Serif Pro',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-				),
-			),
-
-			'font-weight defined; with variation handle' => array(
-				'expected'           => 'my_custom_handle',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'font-family'  => 'Source Serif Pro',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-				),
-				'variation_handle'   => 'my_custom_handle',
-			),
-
-			'font-weight defined; without variation handle' => array(
-				'expected'           => 'source-serif-pro-200-900-normal',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-			),
-
-			'more variation properties; with variation handle' => array(
-				'expected'           => 'my-custom-handle',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'variation_handle'   => 'my-custom-handle',
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing registration of variations where the font family handle
-	 * is not defined.
-	 *
-	 * @return array
-	 */
-	public function data_font_family_handle_undefined() {
-		return array(
-			'empty string font family handle' => array(
-				'font_family_handle' => '',
-				'variation'          => array(
-					'src' => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => 'Font family handle must be a non-empty string',
-			),
-			'empty string font family handle with font-family defined in variant' => array(
-				'font_family_handle' => '',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => 'Font family handle must be a non-empty string',
-			),
-			'non string font family handle'   => array(
-				'font_family_handle' => 10,
-				'variation'          => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected_message'   => 'Font family handle must be a non-empty string',
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing registration of variations where the font family is not defined
-	 * in the variation.
-	 *
-	 * @return array
-	 */
-	public function data_font_family_undefined_in_variation() {
-		$message = 'Webfont font-family must be a non-empty string.';
-		return array(
-			'font-family: undefined'    => array(
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'src' => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => $message,
-			),
-			'font-family: null'         => array(
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => null,
-					'font-weight' => '200',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => $message,
-			),
-			'font-family: non string'   => array(
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'provider'     => 'local',
-					'font-family'  => 10,
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected_message'   => $message,
-			),
-			'font-family: empty string' => array(
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => '',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => $message,
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing when the variation's handle can't be determine from the given input.
-	 *
-	 * @return array
-	 */
-	public function data_unable_determine_variation_handle() {
-		return array(
-			'integer values'                               => array(
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => 'Lato',
-					'font-weight' => 400,
-					'font-style'  => 0,
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-				'expected_message'   => 'Variant handle could not be determined as font-weight and/or font-style are require',
-			),
-			'with empty string font-weight and font-style' => array(
-				'font_family_handle' => 'merriweather',
-				'variation'          => array(
-					'font-family' => 'Merriweather',
-					'font-weight' => '',
-					'font-style'  => '',
-					'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-				),
-				'expected_message'   => 'Variant handle could not be determined as font-weight and/or font-style are require',
-			),
-			'integer font-weight, empty string font-style' => array(
-				'font_family'      => 'merriweather',
-				'variation'        => array(
-					'font-family' => 'Merriweather',
-					'font-weight' => 400,
-					'font-style'  => '',
-					'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-				),
-				'expected_message' => 'Variant handle could not be determined as font-weight and/or font-style are require',
-			),
-			'empty string font-weight, integer font-style' => array(
-				'font_family'      => 'lato',
-				'variation'        => array(
-					'font-family' => 'Merriweather',
-					'font-weight' => '',
-					'font-style'  => 400,
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-				'expected_message' => 'Variant handle could not be determined as font-weight and/or font-style are require',
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing an invalid variation.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_variation() {
-		return array(
-			'font-family: undefined'          => array(
-				'expected'           => 'Webfont font-family must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'src' => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-			),
-			'font-family: null'               => array(
-				'expected'           => 'Webfont font-family must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => null,
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-			),
-			'font-family: empty string'       => array(
-				'expected'           => 'Webfont font-family must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => '',
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-			),
-			'src: undefined'                  => array(
-				'expected'           => 'Webfont src must be a non-empty string or an array of strings.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Some font',
-					'font-weight' => '200',
-				),
-			),
-			'src: null'                       => array(
-				'expected'           => 'Webfont src must be a non-empty string or an array of strings.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Some font',
-					'font-weight' => '200',
-					'src'         => null,
-				),
-			),
-			'src: empty string'               => array(
-				'expected'           => 'Webfont src must be a non-empty string or an array of strings.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Some font',
-					'font-weight' => '200',
-					'src'         => '',
-				),
-			),
-			'src: empty array'                => array(
-				'expected'           => 'Webfont src must be a non-empty string or an array of strings.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array(),
-				),
-			),
-			'src: array of an empty string'   => array(
-				'expected'           => 'Each font src must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array( '' ),
-				),
-			),
-			'src: array of a non-string'      => array(
-				'expected'           => 'Each font src must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array( null ),
-				),
-			),
-			'src: array with an empty string' => array(
-				'expected'           => 'Each font src must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array(
-						'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						'',
-						'https://example.com/assets/fonts/lato.ttf.woff2',
-					),
-				),
-			),
-			'src: array with a non-string'    => array(
-				'expected'           => 'Each font src must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array(
-						'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						null,
-						'https://example.com/assets/fonts/lato.ttf.woff2',
-					),
-				),
-			),
-			'provider does not exist'         => array(
-				'expected'           => 'The provider "doesnotexit" is not registered',
-				'font_family_handle' => 'merriweather',
-				'variation'          => array(
-					'provider'    => 'doesnotexit',
-					'font-family' => 'Merriweather',
-					'font-weight' => '200 900',
-				),
-			),
-			'font-weight: null'               => array(
-				'expected'           => 'Webfont font-weight must be a properly formatted string or integer.',
-				'font_family_handle' => 'merriweather',
-				'variation'          => array(
-					'font-family' => 'Merriweather',
-					'font-weight' => null,
-					'font-style'  => 'normal',
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing one or more font families with varying number of variations.
-	 *
-	 * @return array
-	 */
-	public function data_one_to_many_font_families_and_zero_to_many_variations() {
-		return array(
-			'one family family no variations'           => array(
-				'font_family' => 'lato',
-				'inputs'      => array(
-					'lato' => array(),
-				),
-				'handles'     => array( 'lato' ),
-				'expected'    => array(),
-			),
-			'one family family with 1 variation'        => array(
-				'font_family' => 'merriweather',
-				'inputs'      => array(
-					'merriweather' => array(
-						'merriweather-200-900-normal' => array(
-							'font-family'  => 'Merriweather',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-				'handles'     => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected'    => array(),
-			),
-			'font family with multiple variations'      => array(
-				'font_family' => 'source-serif-pro',
-				'inputs'      => array(
-					'Source Serif Pro' => array(
-						'Source Serif Pro-300-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '300',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						'Source Serif Pro-900-italic' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-				'handles'     => array( 'source-serif-pro', 'Source Serif Pro-300-normal', 'Source Serif Pro-900-italic' ),
-				'expected'    => array(),
-			),
-			'multiple font families without variations' => array(
-				'font_family' => 'source-serif-pro',
-				'inputs'      => array(
-					'lato'             => array(),
-					'my-font'          => array(),
-					'Source Serif Pro' => array(),
-					'some other font'  => array(),
-				),
-				'handles'     => array( 'lato', 'my-font', 'source-serif-pro', 'some-other-font' ),
-				'expected'    => array( 'lato', 'my-font', 'some-other-font' ),
-			),
-			'multiple font families with variations'    => array(
-				'font_family' => 'my-font',
-				'inputs'      => array(
-					'merriweather'     => array(
-						'merriweather-200-900-normal' => array(
-							'font-family'  => 'Merriweather',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-					'Source Serif Pro' => array(
-						'Source Serif Pro-300-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '300',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						'Source Serif Pro-900-italic' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-					'my-font'          => array(
-						'my-font-300-italic' => array(
-							'font-family' => 'My Font',
-							'font-weight' => '300',
-							'src'         => 'https://example.com/assets/fonts/my-font.ttf.woff2',
-						),
-					),
-				),
-				'handles'     => array(
-					'merriweather',
-					'merriweather-200-900-normal',
-					'source-serif-pro',
-					'Source Serif Pro-300-normal',
-					'Source Serif Pro-900-italic',
-					'my-font',
-					'my-font-300-italic',
-				),
-				'expected'    => array(
-					'merriweather',
-					'merriweather-200-900-normal',
-					'source-serif-pro',
-					'Source Serif Pro-300-normal',
-					'Source Serif Pro-900-italic',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_font_family_handles() {
-		return array(
-			'single word handle'   => array( 'lato' ),
-			'multiple word handle' => array( 'source-sans-pro' ),
-			'single word name'     => array( 'Merriweather' ),
-			'multiple word name'   => array( 'My Cool Font' ),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_providers() {
-		$local = array(
-			'local' => array(
-				'class' => WP_Fonts_Provider_Local::class,
-				'fonts' => array(),
-			),
-		);
-		$mock  = array(
-			'mock' => array(
-				'class' => Mock_Provider::class,
-				'fonts' => array(),
-			),
-		);
-
-		return array(
-			'local provider'           => array(
-				'providers' => array(
-					'local' => WP_Fonts_Provider_Local::class,
-				),
-				'expected'  => $local,
-			),
-			'mock provider'            => array(
-				'providers' => array(
-					'mock' => Mock_Provider::class,
-				),
-				'expected'  => $mock,
-			),
-			'local and mock providers' => array(
-				'providers' => array(
-					'local' => WP_Fonts_Provider_Local::class,
-					'mock'  => Mock_Provider::class,
-				),
-				'expected'  => array_merge( $local, $mock ),
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing removal of variations.
-	 *
-	 * @return array
-	 */
-	public function data_remove_variations() {
-		return array(
-			'Font with 1 variation'         => array(
-				'font_family'      => 'merriweather',
-				'variation_handle' => 'merriweather-200-900-normal',
-				'expected'         => array(
-					'registered'       => array(
-						'merriweather',
-						'source-serif-pro',
-						'Source Serif Pro-300-normal',
-						'Source Serif Pro-900-italic',
-					),
-					'font_family_deps' => array(),
-				),
-			),
-			'Font with multiple variations' => array(
-				'font_family'      => 'source-serif-pro',
-				'variation_handle' => 'Source Serif Pro-300-normal',
-				'expected'         => array(
-					'registered'       => array(
-						'merriweather',
-						'merriweather-200-900-normal',
-						'source-serif-pro',
-						'Source Serif Pro-900-italic',
-					),
-					'font_family_deps' => array( 'Source Serif Pro-900-italic' ),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_enqueue() {
-		return array(
-			'1 font-family'   => array(
-				'handles'                         => 'lato',
-				'expected_queue'                  => array( 'lato' ),
-				'expected_queued_before_register' => array(
-					'lato' => null,
-				),
-			),
-			'2 font families' => array(
-				'handles'                         => array( 'merriweather', 'my-font' ),
-				'expected_queue'                  => array( 'merriweather', 'my-font' ),
-				'expected_queued_before_register' => array(
-					'merriweather' => null,
-					'my-font'      => null,
-				),
-			),
-			'3 font families' => array(
-				'handles'                         => array( 'merriweather', 'my-font', 'source-serif-pro' ),
-				'expected_queue'                  => array( 'merriweather', 'my-font', 'source-serif-pro' ),
-				'expected_queued_before_register' => array(
-					'merriweather'     => null,
-					'my-font'          => null,
-					'source-serif-pro' => null,
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_enqueue_variations() {
-		return array(
-			'1 variation'                               => array(
-				'handles'                         => array( 'my-font-300-normal' ),
-				'expected_queue'                  => array( 'my-font-300-normal' ),
-				'expected_queued_before_register' => array(
-					'my-font-300-normal' => null,
-				),
-			),
-			'1 variation from different font families'  => array(
-				'handles'                         => array( 'merriweather-200-900-normal', 'my-font-300-normal' ),
-				'expected_queue'                  => array( 'merriweather-200-900-normal', 'my-font-300-normal' ),
-				'expected_queued_before_register' => array(
-					'merriweather-200-900-normal' => null,
-					'my-font-300-normal'          => null,
-				),
-			),
-			'enqueue one variation and its font family' => array(
-				'handles'                         => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected_queue'                  => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected_queued_before_register' => array(
-					'merriweather'                => null,
-					'merriweather-200-900-normal' => null,
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_print_enqueued() {
-		$providers          = $this->get_provider_definitions();
-		$mock_fonts         = $this->get_registered_mock_fonts();
-		$mock_font_handles  = $this->get_handles_for_provider( $mock_fonts, 'mock' );
-		$local_fonts        = $this->get_registered_local_fonts();
-		$local_font_handles = $this->get_handles_for_provider( $local_fonts, 'local' );
-		$font_faces         = $this->get_registered_fonts_css();
-
-		$all_variation_handles = array_merge( $mock_font_handles, $local_font_handles );
-		$setup_all             = array(
-			'provider'         => array(
-				'local' => $providers['local'],
-				'mock'  => $providers['mock'],
-			),
-			'provider_handles' => array(
-				'local' => $local_font_handles,
-				'mock'  => $mock_font_handles,
-			),
-			'registered'       => array_merge( $mock_fonts, $local_fonts ),
-		);
-
-		return array(
-
-			// One provider registered with multiple fonts.
-
-			'print font2 for mock provider'             => array(
-				'setup'           => array(
-					'provider'         => array( 'mock' => $providers['mock'] ),
-					'provider_handles' => array( 'mock' => $mock_font_handles ),
-					'registered'       => $mock_fonts,
-					'enqueued'         => array( 'font2' ),
-				),
-				'expected_done'   => array( 'font2', 'font2-200-900-normal', 'font2-200-900-italic' ),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s</mock>\n',
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic']
-				),
-			),
-			'print all fonts for mock provider'         => array(
-				'setup'           => array(
-					'provider'         => array( 'mock' => $providers['mock'] ),
-					'provider_handles' => array( 'mock' => $mock_font_handles ),
-					'registered'       => $mock_fonts,
-					'enqueued'         => array( 'font1', 'font2', 'font3' ),
-				),
-				'expected_done'   => array(
-					'font1',
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font2',
-					'font2-200-900-normal',
-					'font2-200-900-italic',
-					'font3',
-					'font3-bold-normal',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal'],
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic'],
-					$font_faces['font3-bold-normal']
-				),
-			),
-			'print merriweather for local provider'     => array(
-				'setup'           => array(
-					'provider'         => array( 'local' => $providers['local'] ),
-					'provider_handles' => array( 'local' => $local_font_handles ),
-					'registered'       => $local_fonts,
-					'enqueued'         => array( 'merriweather' ),
-				),
-				'expected_done'   => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal']
-				),
-			),
-			'print Source Serif Pro for local provider' => array(
-				'setup'           => array(
-					'provider'         => array( 'local' => $providers['local'] ),
-					'provider_handles' => array( 'local' => $local_font_handles ),
-					'registered'       => $local_fonts,
-					'enqueued'         => array( 'source-serif-pro' ),
-				),
-				'expected_done'   => array( 'source-serif-pro', 'Source Serif Pro-300-normal', 'Source Serif Pro-900-italic' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s%s\n</style>\n",
-					$font_faces['Source Serif Pro-300-normal'],
-					$font_faces['Source Serif Pro-900-italic']
-				),
-			),
-			'print all fonts for local provider'        => array(
-				'setup'           => array(
-					'provider'         => array( 'local' => $providers['local'] ),
-					'provider_handles' => array( 'local' => $local_font_handles ),
-					'registered'       => $local_fonts,
-					'enqueued'         => array( 'merriweather', 'source-serif-pro' ),
-				),
-				'expected_done'   => array(
-					'merriweather',
-					'merriweather-200-900-normal',
-					'source-serif-pro',
-					'Source Serif Pro-300-normal',
-					'Source Serif Pro-900-italic',
-				),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal'],
-					$font_faces['Source Serif Pro-300-normal'],
-					$font_faces['Source Serif Pro-900-italic']
-				),
-			),
-
-			// All providers registered with multiple fonts.
-
-			'print font1 when all providers registered' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'font1' ) ) ),
-				'expected_done'   => array( 'font1', 'font1-300-normal', 'font1-300-italic', 'font1-900-normal' ),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal']
-				),
-			),
-			'print all mock fonts when all providers registered' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'font1', 'font2', 'font3' ) ) ),
-				'expected_done'   => array(
-					'font1',
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font2',
-					'font2-200-900-normal',
-					'font2-200-900-italic',
-					'font3',
-					'font3-bold-normal',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal'],
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic'],
-					$font_faces['font3-bold-normal']
-				),
-			),
-			'print merriweather when all providers registered' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather' ) ) ),
-				'expected_done'   => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal']
-				),
-			),
-			'print all local fonts when all providers registered' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather', 'source-serif-pro' ) ) ),
-				'expected_done'   => array(
-					'merriweather',
-					'merriweather-200-900-normal',
-					'source-serif-pro',
-					'Source Serif Pro-300-normal',
-					'Source Serif Pro-900-italic',
-				),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal'],
-					$font_faces['Source Serif Pro-300-normal'],
-					$font_faces['Source Serif Pro-900-italic']
-				),
-			),
-
-			'print all fonts for all providers'         => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => $all_variation_handles ) ),
-				'expected_done'   => $all_variation_handles,
-				'expected_output' =>
-					sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-						$font_faces['merriweather-200-900-normal'],
-						$font_faces['Source Serif Pro-300-normal'],
-						$font_faces['Source Serif Pro-900-italic']
-					) .
-					sprintf(
-						'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-						$font_faces['font1-300-normal'],
-						$font_faces['font1-300-italic'],
-						$font_faces['font1-900-normal'],
-						$font_faces['font2-200-900-normal'],
-						$font_faces['font2-200-900-italic'],
-						$font_faces['font3-bold-normal']
-					),
-			),
-
-			// Specific variations enqueued.
-			// Validates that only these specific variations print once.
-
-			'specific variation: 1 local'               => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather-200-900-normal' ) ) ),
-				'expected_done'   => array( 'merriweather-200-900-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal']
-				),
-			),
-			'specific variation: 1 local from different font families' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather-200-900-normal', 'Source Serif Pro-900-italic' ) ) ),
-				'expected_done'   => array( 'merriweather-200-900-normal', 'Source Serif Pro-900-italic' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal'],
-					$font_faces['Source Serif Pro-900-italic']
-				),
-			),
-			'specific variation: 1 local and 1 mock'    => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather-200-900-normal', 'font2-200-900-normal' ) ) ),
-				'expected_done'   => array( 'merriweather-200-900-normal', 'font2-200-900-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n" .
-					'<mock id="wp-fonts-mock" attr="some-attr">%s</mock>\n',
-					$font_faces['merriweather-200-900-normal'],
-					$font_faces['font2-200-900-normal']
-				),
-			),
-			'specific variation: 1 mock and 1 local'    => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'font2-200-900-normal', 'Source Serif Pro-300-normal' ) ) ),
-				'expected_done'   => array( 'font2-200-900-normal', 'Source Serif Pro-300-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n" .
-					'<mock id="wp-fonts-mock" attr="some-attr">%s</mock>\n',
-					$font_faces['Source Serif Pro-300-normal'],
-					$font_faces['font2-200-900-normal']
-				),
-			),
-		);
-	}
-
-	protected function get_data_registry() {
-		return array(
-			'lato'             => array(),
-			'merriweather'     => array(
-				'merriweather-200-900-normal' => array(
-					'font-family'  => 'Merriweather',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-				),
-			),
-			'Source Serif Pro' => array(
-				'Source Serif Pro-300-normal' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '300',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'Source Serif Pro-900-italic' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'italic',
-					'font-weight'  => '900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-			),
-			'my-font'          => array(
-				'my-font-300-normal' => array(
-					'font-family' => 'My Font',
-					'font-weight' => '300',
-					'src'         => 'https://example.com/assets/fonts/my-font.ttf.woff2',
-				),
-				'my-font-300-italic' => array(
-					'font-family' => 'My Font',
-					'font-weight' => '300',
-					'font-style'  => 'italic',
-					'src'         => 'https://example.com/assets/fonts/my-font.ttf.woff2',
-				),
-				'my-font-900-normal' => array(
-					'font-family' => 'My Font',
-					'font-weight' => '900',
-					'src'         => 'https://example.com/assets/fonts/my-font.ttf.woff2',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Gets the provider definitions.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id Optional. Provider ID to get. Default empty string.
-	 * @return array
-	 */
-	protected function get_provider_definitions( $provider_id = '' ) {
-		$providers = array(
-			'mock'  => array(
-				'id'    => 'mock',
-				'class' => Mock_Provider::class,
-			),
-			'local' => array(
-				'id'    => 'local',
-				'class' => WP_Fonts_Provider_Local::class,
-			),
-		);
-
-		if ( '' === $provider_id ) {
-			return $providers;
-		}
-
-		if ( isset( $providers[ $provider_id ] ) ) {
-			return $providers[ $provider_id ];
-		}
-
-		return array(
-			'id'    => $provider_id,
-			'class' => '',
-		);
-	}
-
-	/**
-	 * Gets font definitions for both local and mock providers.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array|string[][][]
-	 */
-	protected function get_registered_fonts() {
-		return array_merge(
-			$this->get_registered_local_fonts(),
-			$this->get_registered_mock_fonts()
-		);
-	}
-
-	/**
-	 * Returns an array of font-face styles that matches the font definitions
-	 * in get_registered_local_fonts() and get_registered_mock_fonts().
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	protected function get_registered_fonts_css() {
-		return array(
-			'merriweather-200-900-normal' => <<<CSS
-@font-face{font-family:Merriweather;font-style:normal;font-weight:200 900;font-display:fallback;font-stretch:normal;src:url('https://example.com/assets/fonts/merriweather.ttf.woff2') format('woff2');}
-CSS
-		,
-			'Source Serif Pro-300-normal' => <<<CSS
-@font-face{font-family:"Source Serif Pro";font-style:normal;font-weight:300;font-display:fallback;font-stretch:normal;src:url('https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');}
-CSS
-		,
-			'Source Serif Pro-900-italic' => <<<CSS
-@font-face{font-family:"Source Serif Pro";font-style:italic;font-weight:900;font-display:fallback;font-stretch:normal;src:url('https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');}
-CSS
-		,
-			'font1-300-normal'            => 'font1-300-normal',
-			'font1-300-italic'            => 'font1-300-italic',
-			'font1-900-normal'            => 'font1-900-normal',
-			'font2-200-900-normal'        => 'font2-200-900-normal',
-			'font2-200-900-italic'        => 'font2-200-900-italic',
-			'font3-bold-normal'           => 'font3-bold-normal',
-		);
-	}
-
-	/**
-	 * Gets font definitions for local provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[][][]
-	 */
-	protected function get_registered_local_fonts() {
-		return array(
-			'lato'             => array(),
-			'merriweather'     => array(
-				'merriweather-200-900-normal' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Merriweather',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-display' => 'fallback',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-				),
-			),
-			'Source Serif Pro' => array(
-				'Source Serif Pro-300-normal' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '300',
-					'font-display' => 'fallback',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'Source Serif Pro-900-italic' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'italic',
-					'font-weight'  => '900',
-					'font-display' => 'fallback',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Gets font definitions for mock provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[][][]
-	 */
-	protected function get_registered_mock_fonts() {
-		return array(
-			'font1' => array(
-				'font1-300-normal' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 1',
-					'font-weight'  => '300',
-					'font-style'   => 'normal',
-					'font-display' => 'fallback',
-				),
-				'font1-300-italic' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 1',
-					'font-weight'  => '300',
-					'font-style'   => 'italic',
-					'font-display' => 'fallback',
-				),
-				'font1-900-normal' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 1',
-					'font-weight'  => '900',
-					'font-style'   => 'normal',
-					'font-display' => 'fallback',
-				),
-			),
-			'font2' => array(
-				'font2-200-900-normal' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 2',
-					'font-weight'  => '200 900',
-					'font-style'   => 'normal',
-					'font-display' => 'fallback',
-				),
-				'font2-200-900-italic' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 2',
-					'font-weight'  => '200 900',
-					'font-style'   => 'italic',
-					'font-display' => 'fallback',
-				),
-			),
-			'font3' => array(
-				'font3-bold-normal' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 3',
-					'font-weight'  => 'bold',
-					'font-style'   => 'normal',
-					'font-display' => 'fallback',
-					'font-stretch' => 'normal',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_print_user_selected_fonts() {
-		$global_styles = $this->get_mock_user_selected_fonts_global_styles();
-		$font_faces    = $this->get_registered_fonts_css();
-
-		return array(
-			'print font1'           => array(
-				'global_styles'   => $global_styles['font1'],
-				'expected_done'   => array(
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font1',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal']
-				),
-			),
-			'print font2'           => array(
-				'global_styles'   => $global_styles['font2'],
-				'expected_done'   => array( 'font2-200-900-normal', 'font2-200-900-italic', 'font2' ),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s</mock>\n',
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic']
-				),
-			),
-			'print font3'           => array(
-				'global_styles'   => $global_styles['font3'],
-				'expected_done'   => array( 'font3', 'font3-bold-normal' ),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s</mock>\n',
-					$font_faces['font3-bold-normal']
-				),
-			),
-			'print all fonts'       => array(
-				'global_styles'   => $global_styles['all'],
-				'expected_done'   => array(
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font1',
-					'font2-200-900-normal',
-					'font2-200-900-italic',
-					'font2',
-					'font3-bold-normal',
-					'font3',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal'],
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic'],
-					$font_faces['font3-bold-normal']
-				),
-			),
-			'print all valid fonts' => array(
-				'global_styles'   => $global_styles['all with invalid element'],
-				'expected_done'   => array(
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font1',
-					'font2-200-900-normal',
-					'font2-200-900-italic',
-					'font2',
-					'font3-bold-normal',
-					'font3',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal'],
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic'],
-					$font_faces['font3-bold-normal']
-				),
-			),
-		);
-	}
-
-	/**
-	 * Gets user-selected fonts for global styles for the mock provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array
-	 */
-	protected function get_mock_user_selected_fonts_global_styles() {
-		return array(
-			'font1'                    => array(
-				'elements'   => array(
-					'heading' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '300',
-						),
-					),
-					'caption' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-				),
-				'typography' => array(
-					'fontFamily' => 'var:preset|font-family|font1',
-					'fontStyle'  => 'normal',
-					'fontWeight' => '900',
-				),
-			),
-			'font2'                    => array(
-				'elements' => array(
-					'heading' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '200-900',
-						),
-					),
-					'button'  => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '200-900',
-						),
-					),
-				),
-			),
-			'font3'                    => array(
-				'typography' => array(
-					'fontFamily' => 'var:preset|font-family|font3',
-					'fontStyle'  => 'normal',
-					'fontWeight' => 'bold',
-				),
-			),
-			'all'                      => array(
-				'elements'   => array(
-					'link'    => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-					'heading' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '900',
-						),
-					),
-					'caption' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-					'button'  => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '200-900',
-						),
-					),
-				),
-				'typography' => array(
-					'fontFamily' => 'var:preset|font-family|font3',
-					'fontStyle'  => 'normal',
-					'fontWeight' => 'bold',
-				),
-			),
-			'all with invalid element' => array(
-				'elements'   => array(
-					'link'    => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-					'heading' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '900',
-						),
-					),
-					'caption' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-					'button'  => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '200-900',
-						),
-					),
-					'invalid' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '200-900',
-						),
-					),
-				),
-				'typography' => array(
-					'fontFamily' => 'var:preset|font-family|font3',
-					'fontStyle'  => 'normal',
-					'fontWeight' => 'bold',
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpDeregisterFontFamily.php b/phpunit/tests/fonts-api/wpDeregisterFontFamily.php
deleted file mode 100644
index 59db2e2abc8264..00000000000000
--- a/phpunit/tests/fonts-api/wpDeregisterFontFamily.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_deregister_font_family().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fontsapi
- * @group remove_fonts
- * @covers ::wp_deregister_font_family
- * @covers WP_Fonts::remove_font_family
- */
-class Tests_Webfonts_WpDeregisterFontFamily extends WP_Fonts_TestCase {
-
-	/**
-	 * Unit test for registering a font-family that mocks WP_Fonts.
-	 *
-	 * @dataProvider data_font_family_handles
-	 *
-	 * @param string $font_family_handle Font family handle to test.
-	 */
-	public function test_unit_should_deregister( $font_family_handle ) {
-		$mock = $this->set_up_mock( 'remove_font_family' );
-		$mock->expects( $this->once() )
-			->method( 'remove_font_family' )
-			->with(
-				$this->identicalTo( $font_family_handle )
-			);
-
-		wp_deregister_font_family( $font_family_handle );
-	}
-
-	/**
-	 * Integration test for enqueuing before registering a font family and all of its variations.
-	 *
-	 * @dataProvider data_font_family_handles
-	 *
-	 * @param string $font_family Font family to test.
-	 */
-	public function test_should_deregister_before_registration( $font_family ) {
-		wp_deregister_font_family( $font_family );
-
-		$this->assertIsArray( $this->get_registered(), 'Registration queue should be an array' );
-		$this->assertEmpty( $this->get_registered(), 'Registration queue should be empty after deregistering' );
-	}
-
-	/**
-	 * Integration test for deregistering a font family and all of its variations.
-	 *
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family        Font family to test.
-	 * @param array  $inputs             Font family(ies) and variations to pre-register.
-	 * @param array  $registered_handles Expected handles after registering.
-	 * @param array  $expected           Array of expected handles.
-	 */
-	public function test_deregister_after_registration( $font_family, array $inputs, array $registered_handles, array $expected ) {
-		foreach ( $inputs as $handle => $variations ) {
-			$this->setup_register( $handle, $variations );
-		}
-		// Test the before state, just to make sure.
-		$this->assertSame( $registered_handles, $this->get_registered_handles(), 'Font family and variations should be registered before deregistering' );
-
-		wp_deregister_font_family( $font_family );
-
-		// Test after deregistering.
-		$this->assertIsArray( $this->get_registered_handles(), 'Registration queue should be an array' );
-		$this->assertSame( $expected, $this->get_registered_handles(), 'Registration queue should match after deregistering' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpDeregisterFontVariation.php b/phpunit/tests/fonts-api/wpDeregisterFontVariation.php
deleted file mode 100644
index 78b4bf51f758af..00000000000000
--- a/phpunit/tests/fonts-api/wpDeregisterFontVariation.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_deregister_font_variation().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  remove_fonts
- * @covers ::wp_deregister_font_variation
- * @covers WP_Webfonts::remove_variation
- */
-class Tests_Fonts_WpDeregisterFontVariation extends WP_Fonts_TestCase {
-	private $wp_fonts;
-	private $fonts_to_register = array();
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts          = wp_fonts();
-		$this->fonts_to_register = $this->get_registered_local_fonts();
-	}
-
-	/**
-	 * Sets up the unit test by mocking the WP_Dependencies object using stdClass and
-	 * registering each font family directly to the WP_Webfonts::$registered property
-	 * and its variations to the mocked $deps property.
-	 */
-	private function setup_unit_test() {
-		$this->setup_registration_mocks( $this->fonts_to_register, $this->wp_fonts );
-	}
-
-	/**
-	 * Sets up the integration test by properly registering each font family and its variations
-	 * by using the WP_Webfonts::add() and WP_Webfonts::add_variation() methods.
-	 */
-	private function setup_integration_test() {
-		foreach ( $this->fonts_to_register as $font_family_handle => $variations ) {
-			$this->setup_register( $font_family_handle, $variations, $this->wp_fonts );
-		}
-	}
-
-	/**
-	 * Testing the test setup to ensure it works.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_mocked_setup( $font_family_handle, $variation_handle ) {
-		$this->setup_unit_test();
-
-		$this->assertArrayHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be in the registered queue before removal' );
-		$this->assertContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should be in its font family deps before removal' );
-	}
-
-	/**
-	 * Unit test for deregistering a font-family's variation using mock of WP_Webfonts.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family to test.
-	 * @param string $variation_handle   Variation's handle to test.
-	 */
-	public function test_should_deregister_when_mocked( $font_family_handle, $variation_handle ) {
-		$mock = $this->set_up_mock( 'remove_variation' );
-		$mock->expects( $this->once() )
-			->method( 'remove_variation' )
-			->with(
-				$this->identicalTo( $font_family_handle, $variation_handle )
-			);
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_should_do_nothing
-	 *
-	 * @param string $font_family        Font family name.
-	 * @param string $font_family_handle Font family handle.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_unit_should_do_nothing_when_variation_and_font_family_not_registered( $font_family, $font_family_handle, $variation_handle ) {
-		// Set up the test.
-		unset( $this->fonts_to_register[ $font_family ] );
-		$this->setup_unit_test();
-		$registered_queue = $this->wp_fonts->registered;
-
-		// Run the tests.
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $font_family_handle, $this->wp_fonts->registered, 'Font family should not be registered' );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertSame( $registered_queue, $this->wp_fonts->registered, 'Registered queue should not have changed' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_should_do_nothing
-	 *
-	 * @param string $font_family        Font family name.
-	 * @param string $font_family_handle Font family handle.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_should_do_nothing_when_variation_and_font_family_not_registered( $font_family, $font_family_handle, $variation_handle ) {
-		// Set up the test.
-		unset( $this->fonts_to_register[ $font_family ] );
-		$this->setup_integration_test();
-		$registered_queue = $this->wp_fonts->get_registered();
-
-		// Run the tests.
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $font_family_handle, $this->wp_fonts->registered, 'Font family should not be registered' );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertSameSets( $registered_queue, $this->wp_fonts->get_registered(), 'Registered queue should not have changed' );
-	}
-
-	/**
-	 * Data provider for testing removal of variations.
-	 *
-	 * @return array
-	 */
-	public function data_should_do_nothing() {
-		return array(
-			'Font with 1 variation'         => array(
-				'font_family'        => 'merriweather',
-				'font_family_handle' => 'merriweather',
-				'variation_handle'   => 'merriweather-200-900-normal',
-			),
-			'Font with multiple variations' => array(
-				'font_family'        => 'Source Serif Pro',
-				'font_family_handle' => 'source-serif-pro',
-				'variation_handle'   => 'Source Serif Pro-300-normal',
-			),
-		);
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_only_remove_from_font_family_deps_when_variation_not_in_queue( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-		$this->setup_remove_variation_from_registered( $variation_handle );
-
-		// Run the tests.
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_only_remove_from_font_family_deps_when_variation_not_in_queue( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-		$this->setup_remove_variation_from_registered( $variation_handle );
-
-		// Run the tests.
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_remove_variation_from_registered_queue_though_font_family_not_registered( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-		$this->setup_remove_from_font_family_deps( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should not be in its font family deps before removal' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_remove_variation_from_registered_queue_though_font_family_not_registered( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-		$this->setup_remove_from_font_family_deps( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should not be in its font family deps before removal' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_remove_variation_from_queue_and_font_family_deps( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-
-		$this->assertArrayHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should be in its font family deps before removal' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be not be in registered queue' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_remove_variation_from_queue_and_font_family_deps( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-
-		$this->assertArrayHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should be in its font family deps before removal' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be not be in registered queue' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Remove the variation handle from the font family's deps.
-	 *
-	 * @param string $font_family_handle Font family.
-	 * @param string $variation_handle   The variation handle to remove.
-	 */
-	private function setup_remove_from_font_family_deps( $font_family_handle, $variation_handle ) {
-		foreach ( $this->wp_fonts->registered[ $font_family_handle ]->deps as $index => $vhandle ) {
-			if ( $variation_handle !== $vhandle ) {
-				continue;
-			}
-			unset( $this->wp_fonts->registered[ $font_family_handle ]->deps[ $index ] );
-			break;
-		}
-	}
-
-	/**
-	 * Removes the variation from the WP_Webfonts::$registered queue.
-	 *
-	 * @param string $variation_handle The variation handle to remove.
-	 */
-	private function setup_remove_variation_from_registered( $variation_handle ) {
-		unset( $this->wp_fonts->registered[ $variation_handle ] );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpEnqueueFontVariations.php b/phpunit/tests/fonts-api/wpEnqueueFontVariations.php
deleted file mode 100644
index 6e026d99f58897..00000000000000
--- a/phpunit/tests/fonts-api/wpEnqueueFontVariations.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_enqueue_font_variations().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_enqueue_font_variations
- * @covers WP_Webfonts::enqueue
- */
-class Tests_Fonts_WpEnqueueFontVariations extends WP_Fonts_TestCase {
-
-	/**
-	 * Unit test for registering one or more specific variations that mocks WP_Webfonts.
-	 *
-	 * @dataProvider data_variation_handles
-	 *
-	 * @param string|string[] $handles Variation handles to test.
-	 */
-	public function test_unit_should_enqueue( $handles ) {
-		$mock = $this->set_up_mock( 'enqueue' );
-		$mock->expects( $this->once() )
-			->method( 'enqueue' )
-			->with(
-				$this->identicalTo( $handles )
-			);
-
-		wp_enqueue_font_variations( $handles );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_variation_handles() {
-		return array(
-			'1 variation handle'                   => array( 'merriweather-200-900-normal' ),
-			'multiple same font family handles'    => array( array( 'Source Serif Pro-300-normal', 'Source Serif Pro-900-italic' ) ),
-			'handles from different font families' => array( array( 'merriweather-200-900-normal', 'Source Serif Pro-900-italic' ) ),
-		);
-	}
-
-	/**
-	 * Integration test for enqueuing one or more specific variations.
-	 *
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles  Variation handles to test.
-	 * @param array           $expected Expected queue.
-	 */
-	public function test_should_enqueue_after_registration( $handles, array $expected ) {
-		foreach ( $this->get_data_registry() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations );
-		}
-
-		wp_enqueue_font_variations( $handles );
-		$this->assertEmpty( $this->get_queued_before_register(), '"queued_before_register" queue should be empty' );
-		$this->assertSame( $expected, $this->get_enqueued_handles(), 'Queue should contain the given handles' );
-	}
-
-	/**
-	 * Integration test for enqueuing before registering one or more specific variations.
-	 *
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles  Variation handles to test.
-	 * @param array           $not_used Not used.
-	 * @param array           $expected Expected "queued_before_register" queue.
-	 */
-	public function test_should_enqueue_before_registration( $handles, array $not_used, array $expected ) {
-		wp_enqueue_font_variations( $handles );
-
-		$this->assertSame( $expected, $this->get_queued_before_register(), '"queued_before_register" queue should contain the given handles' );
-		$this->assertEmpty( $this->get_enqueued_handles(), 'Queue should be empty' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpEnqueueFonts.php b/phpunit/tests/fonts-api/wpEnqueueFonts.php
deleted file mode 100644
index c00fb0f2dfdae5..00000000000000
--- a/phpunit/tests/fonts-api/wpEnqueueFonts.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_enqueue_fonts().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_enqueue_fonts
- * @covers WP_Fonts::enqueue
- */
-class Tests_Fonts_WpEnqueueFonts extends WP_Fonts_TestCase {
-
-	/**
-	 * Unit test for registering a font-family that mocks WP_Fonts.
-	 *
-	 * @dataProvider data_should_enqueue
-	 *
-	 * @param string[] $font_families    Font families to test.
-	 * @param string[] $expected_handles Expected handles passed to WP_Fonts::enqueue().
-	 */
-	public function test_unit_should_enqueue( $font_families, $expected_handles ) {
-		$mock = $this->set_up_mock( 'enqueue' );
-		$mock->expects( $this->once() )
-			->method( 'enqueue' )
-			->with(
-				$this->identicalTo( $expected_handles )
-			);
-
-		wp_enqueue_fonts( $font_families );
-	}
-
-	/**
-	 * Integration test for enqueuing a font family and all of its variations.
-	 *
-	 * @dataProvider data_should_enqueue
-	 *
-	 * @param string[] $font_families    Font families to test.
-	 * @param string[] $expected_handles Expected handles passed to WP_Fonts::enqueue().
-	 */
-	public function test_should_enqueue_after_registration( $font_families, $expected_handles ) {
-		// Register the font-families.
-		foreach ( $this->get_data_registry() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations );
-		}
-
-		wp_enqueue_fonts( $font_families );
-
-		$this->assertEmpty( $this->get_queued_before_register(), '"queued_before_register" queue should be empty' );
-		$this->assertSame( $expected_handles, $this->get_enqueued_handles(), 'Queue should contain the given font family(ies)' );
-	}
-
-	/**
-	 * Integration test for enqueuing before registering a font family and all of its variations.
-	 *
-	 * @dataProvider data_should_enqueue
-	 *
-	 * @param string[] $font_families    Font families to test.
-	 * @param string[] $expected_handles Expected handles passed to WP_Fonts::enqueue().
-	 */
-	public function test_should_enqueue_before_registration( $font_families, $expected_handles ) {
-		wp_enqueue_fonts( $font_families );
-
-		// Set up what "queued_before_register" queue should be.
-		$expected = array();
-		foreach ( $expected_handles as $handle ) {
-			$expected[ $handle ] = null;
-		}
-		$this->assertSame( $expected, $this->get_queued_before_register(), '"queued_before_register" queue should contain the given font family(ies)' );
-		$this->assertEmpty( $this->get_enqueued_handles(), 'Queue should be empty' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_enqueue() {
-		return array(
-			'1: single word handle'                 => array(
-				'font_families'    => array( 'lato' ),
-				'expected_handles' => array( 'lato' ),
-			),
-			'1: multiple word handle'               => array(
-				'font_families'    => array( 'source-serif-pro' ),
-				'expected_handles' => array( 'source-serif-pro' ),
-			),
-			'1: single word name'                   => array(
-				'font_families'    => array( 'Merriweather' ),
-				'expected_handles' => array( 'merriweather' ),
-			),
-			'1: multiple word name'                 => array(
-				'font_families'    => array( 'My Font' ),
-				'expected_handles' => array( 'my-font' ),
-			),
-			'>1: single word handle'                => array(
-				'font_families'    => array( 'lato', 'merriweather' ),
-				'expected_handles' => array( 'lato', 'merriweather' ),
-			),
-			'>1: multiple word handle'              => array(
-				'font_families'    => array( 'source-serif-pro', 'my-font' ),
-				'expected_handles' => array( 'source-serif-pro', 'my-font' ),
-			),
-			'>1: single word name'                  => array(
-				'font_families'    => array( 'Lato', 'Merriweather' ),
-				'expected_handles' => array( 'lato', 'merriweather' ),
-			),
-			'>1: multiple word name'                => array(
-				'font_families'    => array( 'My Font', 'Source Serif Pro' ),
-				'expected_handles' => array( 'my-font', 'source-serif-pro' ),
-			),
-			'>1: mixture of word handles and names' => array(
-				'font_families'    => array( 'Source Serif Pro', 'Merriweather', 'my-font', 'Lato' ),
-				'expected_handles' => array( 'source-serif-pro', 'merriweather', 'my-font', 'lato' ),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts.php b/phpunit/tests/fonts-api/wpFonts.php
deleted file mode 100644
index 3b33e58edf2995..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_fonts().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_fonts
- */
-class Tests_Fonts_WpFonts extends WP_Fonts_TestCase {
-
-	public function test_returns_instance() {
-		$this->assertInstanceOf( WP_Fonts::class, wp_fonts() );
-	}
-
-	public function test_global_set() {
-		global $wp_fonts;
-		$this->assertNull( $wp_fonts );
-		$instance = wp_fonts();
-		$this->assertInstanceOf( WP_Fonts::class, $wp_fonts );
-		$this->assertSame( $instance, $wp_fonts );
-	}
-
-	public function test_local_provider_is_automatically_registered() {
-		$expected = array(
-			'local' => array(
-				'class' => 'WP_Fonts_Provider_Local',
-				'fonts' => array(),
-			),
-		);
-		$this->assertSame( $expected, wp_fonts()->get_providers() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/add.php b/phpunit/tests/fonts-api/wpFonts/add.php
deleted file mode 100644
index 85d3d98c0f3556..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/add.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * WP_Fonts::add() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::add
- */
-class Tests_Fonts_WpFonts_Add extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_handles
-	 *
-	 * @param string $handle Handle to register.
-	 */
-	public function test_add( $handle ) {
-		$wp_fonts = new WP_Fonts();
-
-		$this->assertTrue( $wp_fonts->add( $handle, false ), 'Registering a handle should return true' );
-		$this->assertCount( 1, $wp_fonts->registered );
-		$this->assertArrayHasKey( $handle, $wp_fonts->registered, 'Font family handle should be in the registry after registration' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_handles() {
-		return array(
-			'name: multiple'    => array( 'Source Serif Pro' ),
-			'handle: multiple'  => array( 'source-serif-pro' ),
-			'name: single'      => array( 'Merriweather' ),
-			'handle: single'    => array( 'merriweather' ),
-			'handle: variation' => array( 'my-custom-font-200-900-normal' ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/addFontFamily.php b/phpunit/tests/fonts-api/wpFonts/addFontFamily.php
deleted file mode 100644
index 69b6bccf5ae352..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/addFontFamily.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * WP_Fonts::add_font_family() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::add_font_family
- */
-class Tests_Fonts_WpFonts_AddFontFamily extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_handles
-	 *
-	 * @param string $font_family Font family to register.
-	 * @param string $expected    Expected handle.
-	 */
-	public function test_should_register( $font_family, $expected ) {
-		$wp_fonts           = new WP_Fonts();
-		$font_family_handle = $wp_fonts->add_font_family( $font_family );
-
-		$this->assertSame( $expected, $font_family_handle, 'Registering a font-family should return its handle' );
-		$this->assertCount( 1, $wp_fonts->registered );
-		$this->assertArrayHasKey( $font_family_handle, $wp_fonts->registered, 'Font family handle should be in the registry after registration' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_handles() {
-		return array(
-			'name: multiple'               => array(
-				'font_family' => 'Source Serif Pro',
-				'expected'    => 'source-serif-pro',
-			),
-			'handle: multiple'             => array(
-				'font_family' => 'source-serif-pro',
-				'expected'    => 'source-serif-pro',
-			),
-			'name: single'                 => array(
-				'font_family' => 'Merriweather',
-				'expected'    => 'merriweather',
-			),
-			'handle: single'               => array(
-				'font_family' => 'merriweather',
-				'expected'    => 'merriweather',
-			),
-			'handle: variation'            => array(
-				'font_family' => 'my-custom-font-200-900-normal',
-				'expected'    => 'my-custom-font-200-900-normal',
-			),
-			'name: multiple font-families' => array(
-				'font_family' => 'Source Serif Pro, Merriweather',
-				'expected'    => 'source-serif-pro',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/addVariation.php b/phpunit/tests/fonts-api/wpFonts/addVariation.php
deleted file mode 100644
index 5b6d93bcc99fe0..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/addVariation.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * WP_Fonts::add_variation() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::add_variation
- */
-class Tests_Fonts_WpFonts_AddVariation extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_valid_variation
-	 *
-	 * @param string|bool $expected           Expected results.
-	 * @param string      $font_family_handle The font family's handle for this variation.
-	 * @param array       $variation          An array of variation properties to add.
-	 * @param string      $variation_handle   Optional. The variation's handle.
-	 */
-	public function test_should_register_variation_when_font_family_is_registered( $expected, $font_family_handle, array $variation, $variation_handle = '' ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add( $font_family_handle, false );
-
-		$variation_handle = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-		$this->assertSame( $expected, $variation_handle, 'Registering a variation should return its handle' );
-		$this->assertArrayHasKey( $variation_handle, $wp_fonts->registered, 'Variation handle should be in the registry after registration' );
-		$this->assertSame( array( $expected ), $this->get_variations( $font_family_handle, $wp_fonts ), 'Variation should be registered to font family' );
-	}
-
-	/**
-	 * @dataProvider data_valid_variation
-	 *
-	 * @param string|bool $expected           Expected results.
-	 * @param string      $font_family_handle The font family's handle for this variation.
-	 * @param array       $variation          An array of variation properties to add.
-	 * @param string      $variation_handle   Optional. The variation's handle.
-	 */
-	public function test_should_not_reregister_font_family( $expected, $font_family_handle, array $variation, $variation_handle = '' ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add( $font_family_handle, false );
-
-		$variation_handle = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-
-		// Font family should appear only once in the registered queue.
-		$expected = array( $font_family_handle, $variation_handle );
-		$this->assertSame( $expected, array_keys( $wp_fonts->registered ), 'Font family should not be re-registered after registering a variation' );
-	}
-
-	/**
-	 * @dataProvider data_valid_variation
-	 *
-	 * @param string|bool $expected           Expected results.
-	 * @param string      $font_family_handle The font family's handle for this variation.
-	 * @param array       $variation          An array of variation properties to add.
-	 * @param string      $variation_handle   Optional. The variation's handle.
-	 */
-	public function test_should_not_reregister_variation( $expected, $font_family_handle, array $variation, $variation_handle = '' ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add( $font_family_handle, false );
-
-		// Set up the test.
-		$variation_handle = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-
-		// Run the test.
-		$variant_handle_on_reregister = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-		$this->assertSame( $expected, $variant_handle_on_reregister, 'Variation should be registered to font family' );
-		$this->assertSame( $variation_handle, $variant_handle_on_reregister, 'Variation should return the previously registered variant handle' );
-		$this->assertSame( array( $variation_handle ), $this->get_variations( $font_family_handle, $wp_fonts ), 'Variation should only be registered once' );
-
-		$this->assertCount( 2, $wp_fonts->registered );
-		$this->assertArrayHasKey( $variation_handle, $wp_fonts->registered, 'Variation handle should be in the registry after registration' );
-	}
-
-	/**
-	 * @dataProvider data_valid_variation
-	 *
-	 * @param string|bool $expected           Expected results.
-	 * @param string      $font_family_handle The font family's handle for this variation.
-	 * @param array       $variation          An array of variation properties to add.
-	 * @param string      $variation_handle   Optional. The variation's handle.
-	 */
-	public function test_should_register_font_family_and_variation( $expected, $font_family_handle, array $variation, $variation_handle = '' ) {
-		$wp_fonts = new WP_Fonts();
-
-		$variation_handle = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-		$this->assertSame( $expected, $variation_handle, 'Variation should return its registered handle' );
-
-		// Extra checks to ensure both are registered.
-		$this->assertCount( 2, $wp_fonts->registered );
-		$this->assertArrayHasKey( $font_family_handle, $wp_fonts->registered, 'Font family handle should be in the registry after registration' );
-		$this->assertArrayHasKey( $variation_handle, $wp_fonts->registered, 'Variation handle should be in the registry after registration' );
-		$this->assertSame( array( $variation_handle ), $this->get_variations( $font_family_handle, $wp_fonts ), 'Variation should be registered to the font family' );
-	}
-
-	/**
-	 * @dataProvider data_font_family_handle_undefined
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 */
-	public function test_should_not_register_font_family_or_variant( $font_family_handle, array $variation ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Font family handle must be a non-empty string.' );
-
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add_variation( $font_family_handle, $variation );
-
-		$this->assertEmpty( $wp_fonts->registered, 'Registered queue should be empty' );
-		$this->assertEmpty( $this->get_variations( $font_family_handle, $wp_fonts ), 'Variation should not be registered to the font family' );
-	}
-
-	/**
-	 * @dataProvider data_font_family_undefined_in_variation
-	 * @dataProviders data_unable_determine_variation_handle
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 * @param string $expected_message   Expected notice message.
-	 */
-	public function test_should_not_register_variation_when_font_family_not_defined( $font_family_handle, array $variation, $expected_message ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( $expected_message );
-
-		$wp_fonts = new WP_Fonts();
-		$this->assertNull( $wp_fonts->add_variation( $font_family_handle, $variation ) );
-	}
-
-	/**
-	 * @dataProvider data_unable_determine_variation_handle
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 */
-	public function test_should_register_font_family_when_variant_fails_to_register( $font_family_handle, array $variation ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Variant handle could not be determined as font-weight and/or font-style are require' );
-
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add_variation( $font_family_handle, $variation );
-
-		$this->assertCount( 1, $wp_fonts->registered );
-		$this->assertArrayHasKey( $font_family_handle, $wp_fonts->registered );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/dequeue.php b/phpunit/tests/fonts-api/wpFonts/dequeue.php
deleted file mode 100644
index 6cd11dc55b9376..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/dequeue.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * WP_Fonts::dequeue() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::dequeue
- */
-class Tests_Fonts_WpFonts_Dequeue extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_enqueue
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles Handles to test.
-	 */
-	public function test_should_do_nothing_when_handles_not_queued( $handles ) {
-		$wp_fonts = new WP_Fonts();
-
-		$wp_fonts->dequeue( $handles );
-		$this->assertEmpty( $this->get_queued_before_register( $wp_fonts ), 'Prequeue should be empty' );
-		$this->assertEmpty( $wp_fonts->queue, 'Queue should be empty' );
-	}
-
-	/**
-	 * Integration test for dequeuing from queue. It first registers and then enqueues before dequeuing.
-	 *
-	 * @dataProvider data_enqueue
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles Handles to test.
-	 */
-	public function test_should_dequeue_from_queue( $handles ) {
-		$wp_fonts = new WP_Fonts();
-
-		// Register and enqueue.
-		foreach ( $this->get_data_registry() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $wp_fonts );
-		}
-		$wp_fonts->enqueue( $handles );
-
-		// To make sure the handles are in the queue before dequeuing.
-		$this->assertNotEmpty( $wp_fonts->queue, 'Queue not be empty before dequeueing' );
-
-		// Run the test.
-		$wp_fonts->dequeue( $handles );
-		$this->assertEmpty( $wp_fonts->queue, 'Queue should be empty after dequeueing' );
-	}
-
-	/**
-	 * Integration test for dequeuing from prequeue. It enqueues first.
-	 *
-	 * @dataProvider data_enqueue
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles Handles to test.
-	 */
-	public function test_should_dequeue_from_prequeue( $handles ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->enqueue( $handles );
-		$this->assertNotEmpty( $this->get_queued_before_register( $wp_fonts ), 'Prequeue not be empty before dequeueing' );
-
-		$wp_fonts->dequeue( $handles );
-		$this->assertEmpty( $this->get_queued_before_register( $wp_fonts ), 'Prequeue should be empty after dequeueing' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/doItem.php b/phpunit/tests/fonts-api/wpFonts/doItem.php
deleted file mode 100644
index a92bd244d1f2ae..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/doItem.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
- * WP_Fonts::do_item() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  printfonts
- * @covers WP_Fonts::do_item
- */
-class Tests_Fonts_WpFonts_DoItem extends WP_Fonts_TestCase {
-	private $wp_fonts;
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts = new WP_Fonts();
-	}
-
-	public function test_should_return_false_when_provider_not_registered() {
-		$this->assertFalse( $this->wp_fonts->do_item( 'provider_not_registered' ) );
-	}
-
-	/**
-	 * @dataProvider data_provider_definitions
-	 *
-	 * @param array $provider Provider to mock.
-	 */
-	public function test_should_return_false_when_no_fonts_enqueued_for_provider( array $provider ) {
-		$this->setup_provider_property_mock( $this->wp_fonts, $provider );
-		$this->assertFalse( $this->wp_fonts->do_item( $provider['id'] ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_provider_definitions() {
-		$providers = $this->get_provider_definitions();
-
-		return array(
-			'mock'  => array( $providers['mock'] ),
-			'local' => array( $providers['local'] ),
-		);
-	}
-
-	/**
-	 * Test the test set up to ensure the `Tests_Fonts_WpFonts_DoItem_::setup_provider_property_mock()`
-	 * method works as expected.
-	 */
-	public function test_mocking_providers_property() {
-		$font_handles = array( 'font1', 'font2', 'font3' );
-		$expected     = array(
-			'mock' => array(
-				'class' => Mock_Provider::class,
-				'fonts' => $font_handles,
-			),
-		);
-
-		$this->setup_provider_property_mock( $this->wp_fonts, $this->get_provider_definitions( 'mock' ), $font_handles );
-		$actual = $this->property['WP_Fonts::$providers']->getValue( $this->wp_fonts );
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Test the private method WP_Fonts::get_enqueued_fonts_for_provider().
-	 *
-	 * Why? This test validates the right fonts are returned for use within
-	 * WP_Fonts::do_item().
-	 *
-	 * @dataProvider data_get_enqueued_fonts_for_provider
-	 *
-	 * @param array $font_handles Array of handles for the provider.
-	 * @param array $to_do        Handles to set for the WP_Fonts::$to_do property.
-	 * @param array $expected     Expected result.
-	 */
-	public function test_get_enqueued_fonts_for_provider( $font_handles, $to_do, $expected ) {
-		// Set up the `to_do` property.
-		$this->wp_fonts->to_do = $to_do;
-
-		// Open the method's visibility for testing.
-		$get_enqueued_fonts_for_provider = $this->get_reflection_method( 'get_enqueued_fonts_for_provider' );
-
-		// Mock the WP_Fonts::$property to set up the test.
-		$this->setup_provider_property_mock( $this->wp_fonts, $this->get_provider_definitions( 'mock' ), $font_handles );
-
-		$actual = $get_enqueued_fonts_for_provider->invoke( $this->wp_fonts, 'mock' );
-		$this->assertSameSets( $expected, $actual );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_enqueued_fonts_for_provider() {
-		return array(
-			'to_do queue is empty'                   => array(
-				'font_handles ' => array( 'font1', 'font2', 'font3' ),
-				'to_do'         => array(),
-				'expected'      => array(),
-			),
-			'fonts not in to_do queue'               => array(
-				'font_handles ' => array( 'font1', 'font2', 'font3' ),
-				'to_do'         => array( 'font12', 'font13' ),
-				'expected'      => array(),
-			),
-			'2 of the provider fonts in to_do queue' => array(
-				'font_handles ' => array( 'font11', 'font12', 'font13' ),
-				'to_do'         => array( 'font11', 'font13' ),
-				'expected'      => array( 'font11', 'font13' ),
-			),
-			'do all of the provider fonts'           => array(
-				'font_handles ' => array( 'font21', 'font22', 'font23' ),
-				'to_do'         => array( 'font21', 'font22', 'font23' ),
-				'expected'      => array( 'font21', 'font22', 'font23' ),
-			),
-		);
-	}
-
-	/**
-	 * Test the private method WP_Fonts::get_font_properties_for_provider().
-	 *
-	 * Why? This test validates the right font properties are returned for use within
-	 * WP_Fonts::do_item().
-	 *
-	 * @dataProvider data_get_font_properties_for_provider
-	 *
-	 * @param array $font_handles Web fonts for testing.
-	 * @param array $expected     Expected result.
-	 */
-	public function test_get_font_properties_for_provider( $font_handles, $expected ) {
-		// Set up the fonts for WP_Dependencies:get_data().
-		$fonts = $this->get_registered_fonts();
-		// Set all variations to 'mock' provider.
-
-		// Mock the WP_Fonts::$property to set up the test.
-		$this->setup_provider_property_mock( $this->wp_fonts, $this->get_provider_definitions( 'mock' ), $font_handles );
-		$this->setup_registration_mocks( $fonts, $this->wp_fonts );
-
-		// Open the method's visibility for testing.
-		$method = $this->get_reflection_method( 'get_font_properties_for_provider' );
-
-		$actual = $method->invoke( $this->wp_fonts, $font_handles );
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_font_properties_for_provider() {
-		$fonts = $this->get_registered_fonts();
-
-		return array(
-			'handles not registered'                => array(
-				'font_handles' => array( 'font-not-registered1', 'font-not-registered2', 'font-not-registered3' ),
-				'expected'     => array(),
-			),
-			'registered and non-registered handles' => array(
-				'font_handles' => array( 'Source Serif Pro-300-normal', 'not-registered-handle', 'Source Serif Pro-900-italic' ),
-				'expected'     => array(
-					'Source Serif Pro-300-normal' => $fonts['Source Serif Pro']['Source Serif Pro-300-normal'],
-					'Source Serif Pro-900-italic' => $fonts['Source Serif Pro']['Source Serif Pro-900-italic'],
-				),
-			),
-			'font-family handles, ie no "font-properties" extra data' => array(
-				'font_handles' => array( 'font1', 'font2', 'merriweather' ),
-				'expected'     => array(),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_print_enqueued_fonts
-	 *
-	 * @param array $provider Define provider.
-	 * @param array $fonts    Fonts to register and enqueue.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_trigger_provider_when_mocked( array $provider, array $fonts, array $expected ) {
-		$this->setup_print_deps( $provider, $fonts );
-
-		$provider_mock = $this->setup_object_mock( array( 'set_fonts', 'print_styles' ), $provider['class'] );
-
-		// Test the provider's methods are invoked.
-		$provider_mock->expects( $this->once() )->method( 'set_fonts' )->with( $this->identicalTo( $expected['set_fonts'] ) );
-		$provider_mock->expects( $this->once() )->method( 'print_styles' );
-
-		// Set up the WP_Fonts::$provider_instances property.
-		$provider_instances = $this->get_reflection_property( 'provider_instances' );
-		$provider_instances->setValue( $this->wp_fonts, array( $provider['id'] => $provider_mock ) );
-
-		// Test the method successfully processes the provider.
-		$this->expectOutputString( '' );
-		$this->assertTrue( $this->wp_fonts->do_item( $provider['id'] ), 'WP_Fonts::do_item() should return true' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_print_enqueued_fonts
-	 *
-	 * @param array $provider Define provider.
-	 * @param array $fonts    Fonts to register and enqueue.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_print( array $provider, array $fonts, array $expected ) {
-		$this->setup_print_deps( $provider, $fonts );
-
-		// Test the method successfully processes the provider.
-		$this->expectOutputString( $expected['printed_output'] );
-		$this->assertTrue( $this->wp_fonts->do_item( $provider['id'] ), 'WP_Fonts::do_item() should return true' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_print_enqueued_fonts() {
-		$mock       = $this->get_registered_mock_fonts();
-		$local      = $this->get_registered_local_fonts();
-		$font_faces = $this->get_registered_fonts_css();
-
-		return array(
-			'mock'  => array(
-				'provider' => $this->get_provider_definitions( 'mock' ),
-				'fonts'    => $mock,
-				'expected' => array(
-					'set_fonts'      => array_merge( $mock['font1'], $mock['font2'], $mock['font3'] ),
-					'printed_output' => sprintf(
-						'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-						$font_faces['font1-300-normal'],
-						$font_faces['font1-300-italic'],
-						$font_faces['font1-900-normal'],
-						$font_faces['font2-200-900-normal'],
-						$font_faces['font2-200-900-italic'],
-						$font_faces['font3-bold-normal']
-					),
-				),
-			),
-			'local' => array(
-				'provider' => $this->get_provider_definitions( 'local' ),
-				'fonts'    => $local,
-				'expected' => array(
-					'set_fonts'      => array_merge( $local['merriweather'], $local['Source Serif Pro'] ),
-					'printed_output' => sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-						$font_faces['merriweather-200-900-normal'],
-						$font_faces['Source Serif Pro-300-normal'],
-						$font_faces['Source Serif Pro-900-italic']
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_not_print_enqueued_fonts
-	 *
-	 * @param array $provider    Define provider.
-	 * @param array $fonts       Fonts to register and enqueue.
-	 * @param array $expected    Not used.
-	 * @param array $to_do_queue Value to set in the WP_Fonts::$to_do queue.
-	 */
-	public function test_should_not_print_when_to_do_queue_empty( array $provider, array $fonts, $expected, $to_do_queue ) {
-		$this->setup_print_deps( $provider, $fonts, $to_do_queue );
-
-		// Test the method successfully processes the provider.
-		$this->expectOutputString( '' );
-		$this->assertFalse( $this->wp_fonts->do_item( $provider['id'] ), 'WP_Fonts::do_item() should return false' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_not_print_enqueued_fonts() {
-		$mock  = $this->get_registered_mock_fonts();
-		$local = $this->get_registered_local_fonts();
-
-		return array(
-			'mock provider when to_do queue is empty'  => array(
-				'provider'    => $this->get_provider_definitions( 'mock' ),
-				'fonts'       => $mock,
-				'expected'    => array(),
-				'to_do_queue' => array(),
-			),
-			'local provider when to_do queue is empty' => array(
-				'provider'    => $this->get_provider_definitions( 'local' ),
-				'fonts'       => $local,
-				'expected'    => array(),
-				'to_do_queue' => array(),
-			),
-			'fonts not in to_do queue'                 => array(
-				'provider'    => $this->get_provider_definitions( 'mock' ),
-				'fonts'       => $mock,
-				'expected'    => array(),
-				'to_do_queue' => array(),
-			),
-		);
-	}
-
-	/**
-	 * Sets up the print dependencies.
-	 *
-	 * @param array      $provider    Provider id and class.
-	 * @param array      $fonts       Fonts to register and enqueue.
-	 * @param array|null $to_do_queue Set the WP_Fonts:$to_do queue.
-	 */
-	private function setup_print_deps( $provider, $fonts, $to_do_queue = null ) {
-		// Set up the fonts for WP_Dependencies:get_data().
-		$mocks   = $this->setup_registration_mocks( $fonts, $this->wp_fonts );
-		$handles = array_keys( $mocks );
-		$this->setup_provider_property_mock( $this->wp_fonts, $provider, $handles );
-
-		// Set up the `WP_Fonts::$to_do` and `WP_Fonts::$to_do_keyed_handles` properties.
-		if ( null === $to_do_queue ) {
-			$to_do_queue = $handles;
-		}
-
-		$this->wp_fonts->to_do = $to_do_queue;
-		$to_do_keyed_handles   = $this->get_reflection_property( 'to_do_keyed_handles' );
-		$to_do_keyed_handles->setValue( $this->wp_fonts, array_flip( $to_do_queue ) );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/doItems.php b/phpunit/tests/fonts-api/wpFonts/doItems.php
deleted file mode 100644
index 8a29e7463406a8..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/doItems.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
- * WP_Fonts::do_items() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @group  printfonts
- * @covers WP_Fonts::do_items
- */
-class Tests_Fonts_WpFonts_DoItems extends WP_Fonts_TestCase {
-	private $wp_fonts;
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts = new WP_Fonts();
-	}
-
-	public function test_should_not_process_when_no_providers_registered() {
-		$this->setup_deps( array( 'enqueued' => 'font1' ) );
-
-		$done = $this->wp_fonts->do_items();
-
-		$this->assertSame( array(), $done, 'WP_Fonts::do_items() should return an empty array' );
-		$this->assertSame( array(), $this->wp_fonts->to_do, 'WP_Fonts::$to_do should be an empty array' );
-	}
-
-	/**
-	 * @dataProvider data_invalid_handles
-	 *
-	 * @param mixed $handles Handles to test.
-	 */
-	public function test_should_throw_notice_when_invalid_handles( $handles ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Handles must be a non-empty string or array of non-empty strings' );
-
-		$this->wp_fonts->do_items( $handles );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_handles() {
-		return array(
-			'null'                         => array( null ),
-			'empty array'                  => array( array() ),
-			'empty string'                 => array( '' ),
-			'array of empty strings'       => array( array( '', '' ) ),
-			'array of mixed falsey values' => array( array( '', false, null, array() ) ),
-		);
-	}
-
-	public function test_should_throw_notice_when_provider_class_not_found() {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Class "Provider_Does_Not_Exist" not found for "doesnotexist" font provider' );
-
-		$setup = array(
-			'provider'         => array(
-				'doesnotexist' => array(
-					'id'    => 'doesnotexist',
-					'class' => 'Provider_Does_Not_Exist',
-				),
-			),
-			'provider_handles' => array( 'doesnotexist' => array( 'font1' ) ),
-			'registered'       => array(
-				'doesnotexist' => array(
-					'font1' => array(
-						'font1-300-normal' => array(
-							'provider'     => 'doesnotexist',
-							'font-weight'  => '300',
-							'font-style'   => 'normal',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-			),
-			'enqueued'         => array( 'font1', 'font1-300-normal' ),
-		);
-		$this->setup_deps( $setup );
-
-		$this->wp_fonts->do_items();
-	}
-
-	/**
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_mocked_enqueued( $setup, $expected_done, $expected_output ) {
-		$this->setup_deps( $setup );
-
-		$this->expectOutputString( $expected_output );
-		$actual_done = $this->wp_fonts->do_items();
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * Integration test that registers providers and fonts and then enqueues before
-	 * testing the printing functionality.
-	 *
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_enqueued( $setup, $expected_done, $expected_output ) {
-		$this->setup_integrated_deps( $setup );
-
-		$this->expectOutputString( $expected_output, 'Printed @font-face styles should match' );
-		$actual_done = $this->wp_fonts->do_items();
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * Integration test to validate printing given handles. Rather than mocking internal functionality,
-	 * it registers providers and fonts but does not enqueue.
-	 *
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_handles_when_not_enqueued( $setup, $expected_done, $expected_output ) {
-		$this->setup_integrated_deps( $setup, false );
-		// Do not enqueue. Instead, pass the handles to WP_Fonts::do_items().
-		$handles = $setup['enqueued'];
-		$this->assertEmpty( $this->wp_fonts->queue, 'No fonts should be enqueued' );
-
-		$this->expectOutputString( $expected_output );
-		$actual_done = $this->wp_fonts->do_items( $handles );
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * Sets up the dependencies for the mocked test.
-	 *
-	 * @param array $setup Dependencies to set up.
-	 */
-	private function setup_deps( array $setup ) {
-		$setup = array_merge(
-			array(
-				'provider'         => array(),
-				'provider_handles' => array(),
-				'registered'       => array(),
-				'enqueued'         => array(),
-			),
-			$setup
-		);
-
-		if ( ! empty( $setup['provider'] ) ) {
-			foreach ( $setup['provider'] as $provider_id => $provider ) {
-				$this->setup_provider_property_mock( $this->wp_fonts, $provider, $setup['provider_handles'][ $provider_id ] );
-			}
-		}
-
-		if ( ! empty( $setup['registered'] ) ) {
-			$this->setup_registration_mocks( $setup['registered'], $this->wp_fonts );
-		}
-
-		if ( ! empty( $setup['enqueued'] ) ) {
-			$queue = $this->get_reflection_property( 'queue' );
-			$queue->setValue( $this->wp_fonts, $setup['enqueued'] );
-		}
-	}
-
-	/**
-	 * Sets up the dependencies for integration test.
-	 *
-	 * @param array $setup   Dependencies to set up.
-	 * @param bool  $enqueue Whether to enqueue. Default true.
-	 */
-	private function setup_integrated_deps( array $setup, $enqueue = true ) {
-		foreach ( $setup['provider'] as $provider ) {
-			$this->wp_fonts->register_provider( $provider['id'], $provider['class'] );
-		}
-		foreach ( $setup['registered'] as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $this->wp_fonts );
-		}
-
-		if ( $enqueue ) {
-			$this->wp_fonts->enqueue( $setup['enqueued'] );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/enqueue.php b/phpunit/tests/fonts-api/wpFonts/enqueue.php
deleted file mode 100644
index 09c14676c7ae09..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/enqueue.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * WP_Fonts::enqueue() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::enqueue
- */
-class Tests_Fonts_WpFonts_Enqueue extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_enqueue
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles  Handles to test.
-	 * @param array           $not_used Not used.
-	 * @param array           $expected Expected "queued_before_register" queue.
-	 */
-	public function test_should_prequeue_when_not_registered( $handles, $not_used, $expected ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->enqueue( $handles );
-
-		$this->assertSame( $expected, $this->get_queued_before_register( $wp_fonts ), 'Handles should be added to before registered queue' );
-		$this->assertEmpty( $wp_fonts->queue, 'Handles should not be added to the enqueue queue when not registered' );
-	}
-
-	/**
-	 * Integration test for enqueuing (a) a font family and all of its variations or (b) specific variations.
-	 *
-	 * @dataProvider data_enqueue
-	 * @dataProviders data_enqueue_variations
-	 *
-	 * @param string|string[] $handles  Handles to test.
-	 * @param array           $expected Expected queue.
-	 */
-	public function test_should_enqueue_when_registered( $handles, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-		foreach ( $this->get_data_registry() as $font_family => $variations ) {
-			$this->setup_register( $font_family, $variations, $wp_fonts );
-		}
-
-		$wp_fonts->enqueue( $handles );
-
-		$this->assertEmpty( $this->get_queued_before_register( $wp_fonts ), '"queued_before_register" queue should be empty' );
-		$this->assertSame( $expected, $wp_fonts->queue, 'Queue should contain the given handles' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/getEnqueued.php b/phpunit/tests/fonts-api/wpFonts/getEnqueued.php
deleted file mode 100644
index bacb8a31aa6500..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/getEnqueued.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * WP_Fonts::get_enqueued() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::get_enqueued
- */
-class Tests_Fonts_WpFonts_GetEnqueued extends WP_Fonts_TestCase {
-
-	public function test_should_return_empty_when_non_enqueued() {
-		$wp_fonts = new WP_Fonts();
-		$this->assertEmpty( $wp_fonts->get_enqueued() );
-	}
-
-	/**
-	 * Unit test for when font families are enqueued.
-	 *
-	 * @dataProvider data_enqueue
-	 *
-	 * @param string|string[] $not_used Not used.
-	 * @param array           $expected    Expected queue.
-	 */
-	public function test_should_return_queue_when_property_has_font_families( $not_used, array $expected ) {
-		$wp_fonts        = new WP_Fonts();
-		$wp_fonts->queue = $expected;
-
-		$this->assertSame( $expected, $wp_fonts->get_enqueued() );
-	}
-
-	/**
-	 * Full integration test that registers and enqueues the queue
-	 * is properly wired for "get_enqueued()".
-	 *
-	 * @dataProvider data_enqueue
-	 *
-	 * @param string|string[] $font_family Font family to test.
-	 * @param array           $expected    Expected queue.
-	 */
-	public function test_should_return_queue_when_font_families_registered_and_enqueued( $font_family, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-
-		// Register and enqueue.
-		foreach ( $this->get_data_registry() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $wp_fonts );
-		}
-		$wp_fonts->enqueue( $font_family );
-
-		$this->assertSame( $expected, $wp_fonts->get_enqueued() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/getProviders.php b/phpunit/tests/fonts-api/wpFonts/getProviders.php
deleted file mode 100644
index 410adaace286aa..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/getProviders.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * WP_Fonts::get_providers() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::get_providers
- */
-class Tests_Fonts_WpFonts_GetProviders extends WP_Fonts_TestCase {
-	private $wp_fonts;
-	private $providers_property;
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts = new WP_Fonts();
-
-		$this->providers_property = new ReflectionProperty( WP_Fonts::class, 'providers' );
-		$this->providers_property->setAccessible( true );
-	}
-
-	public function test_should_be_empty() {
-		$actual = $this->wp_fonts->get_providers();
-		$this->assertIsArray( $actual, 'Should return an empty array' );
-		$this->assertEmpty( $actual, 'Should return an empty array when no providers are registered' );
-	}
-
-	/**
-	 * @dataProvider data_get_providers
-	 *
-	 * @param array $providers Array of providers to test.
-	 * @param array $expected  Expected results.
-	 */
-	public function test_get_providers( array $providers, array $expected ) {
-		$this->setup_providers( $providers );
-		$this->assertSame( $expected, $this->wp_fonts->get_providers() );
-	}
-
-	/**
-	 * Sets up the given providers and stores them in the `WP_Fonts::providers` property.
-	 *
-	 * @param array $providers Array of providers to set up.
-	 */
-	private function setup_providers( array $providers ) {
-		$data = array();
-
-		foreach ( $providers as $provider_id => $class ) {
-			$data[ $provider_id ] = array(
-				'class' => $class,
-				'fonts' => array(),
-			);
-		}
-
-		$this->providers_property->setValue( $this->wp_fonts, $data );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/getRegistered.php b/phpunit/tests/fonts-api/wpFonts/getRegistered.php
deleted file mode 100644
index 7dc116f5875390..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/getRegistered.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * WP_Fonts::get_registered() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::get_registered
- */
-class Tests_Fonts_WpFonts_GetRegistered extends WP_Fonts_TestCase {
-
-	public function test_should_return_empty_when_none_registered() {
-		$wp_fonts = new WP_Fonts();
-		$this->assertEmpty( $wp_fonts->get_registered() );
-	}
-
-	/**
-	 * Unit test for when font families are enqueued.
-	 *
-	 * @dataProvider data_get_registered
-	 *
-	 * @param array $inputs Font family(ies) and variations to register.
-	 */
-	public function test_should_return_queue_when_mocking_registered_property( array $inputs ) {
-		$wp_fonts = new WP_Fonts();
-		$mocks    = $this->setup_registration_mocks( $inputs, $wp_fonts );
-		$expected = array_keys( $mocks );
-
-		$this->assertSame( $expected, $wp_fonts->get_registered() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_registered() {
-		return array(
-			'no variations'                          => array(
-				'inputs' => array(
-					'lato' => array(),
-				),
-			),
-			'with 1 variation'                       => array(
-				'inputs' => array(
-					'Source Serif Pro' => array( 'variation-1' ),
-				),
-			),
-			'with 2 variations'                      => array(
-				'inputs' => array(
-					'my-cool-font' => array( 'cool-1', 'cool-2' ),
-				),
-			),
-			'when multiple font families registered' => array(
-				'inputs' => array(
-					'font-family-1' => array( 'variation-11', 'variation-12' ),
-					'font-family-2' => array( 'variation-21', 'variation-22' ),
-					'font-family-3' => array( 'variation-31', 'variation-32' ),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Full integration test that registers varying number of font families and variations
-	 * to validate if "get_registered()" internals is property wired to the registered queue.
-	 *
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family Not used.
-	 * @param array  $inputs      Font family(ies) and variations to register.
-	 * @param array  $expected    Expected results.
-	 */
-	public function test_should_return_queue_when_items_are_registered( $font_family, array $inputs, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-
-		// Register before testing.
-		foreach ( $inputs as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $wp_fonts );
-		}
-
-		$this->assertSame( $expected, $wp_fonts->get_registered() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/query.php b/phpunit/tests/fonts-api/wpFonts/query.php
deleted file mode 100644
index 0e56b515e7ebf4..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/query.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * WP_Fonts::query() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::query
- */
-class Tests_Fonts_WpFonts_Query extends WP_Fonts_TestCase {
-	private $wp_fonts;
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->wp_fonts = new WP_Fonts();
-	}
-
-	/**
-	 * @dataProvider data_invalid_query
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_should_fail_when_handles_not_registered( $query_handle ) {
-		$this->assertFalse( $this->wp_fonts->query( $query_handle, 'registered' ) );
-	}
-
-	/**
-	 * @dataProvider data_invalid_query
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_should_fail_when_handles_not_registered_or_enqueued( $query_handle ) {
-		$this->assertFalse( $this->wp_fonts->query( $query_handle, 'queue' ) );
-	}
-
-	/**
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_registered_query_should_succeed_when_registered( $query_handle ) {
-		$this->setup_registry();
-
-		$actual = $this->wp_fonts->query( $query_handle, 'registered' );
-		$this->assertInstanceOf( '_WP_Dependency', $actual, 'Query should return an instance of _WP_Dependency' );
-		$this->assertSame( $query_handle, $actual->handle, 'Query object handle should match the given handle to query' );
-	}
-
-	/**
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_enqueued_query_should_succeed_when_registered_and_enqueued( $query_handle ) {
-		$this->setup_registry();
-		$this->wp_fonts->enqueue( $query_handle );
-
-		$this->assertTrue( $this->wp_fonts->query( $query_handle, 'enqueued' ) );
-	}
-
-	/**
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_enqueued_query_should_fail_when_not_registered_but_enqueued( $query_handle ) {
-		$this->wp_fonts->enqueue( $query_handle );
-
-		$this->assertFalse( $this->wp_fonts->query( $query_handle, 'enqueued' ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_query() {
-		return array(
-			'DM Sans' => array( 'DM Sans' ),
-			'roboto'  => array( 'roboto' ),
-			'my-font' => array( 'my-font' ),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_valid_query() {
-		return array(
-			'lato'             => array( 'lato' ),
-			'merriweather'     => array( 'merriweather' ),
-			'Source Serif Pro' => array( 'source-serif-pro' ),
-		);
-	}
-
-	public function test_done_query_should_fail_when_no_variations() {
-		$this->wp_fonts->register_provider( 'local', WP_Fonts_Provider_Local::class );
-		$this->setup_registry();
-		$this->wp_fonts->enqueue( 'lato' );
-
-		$this->wp_fonts->do_items( 'lato' );
-
-		$this->assertFalse( $this->wp_fonts->query( 'lato', 'done' ) );
-	}
-
-	/**
-	 * @dataProvider data_done_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_done_query_should_succeed_when_registered_and_enqueued( $query_handle ) {
-		$this->wp_fonts->register_provider( 'local', WP_Fonts_Provider_Local::class );
-		$this->setup_registry();
-		$this->wp_fonts->enqueue( $query_handle );
-
-		// Process the fonts while ignoring all the printed output.
-		$this->expectOutputRegex( '`.`' );
-		$this->wp_fonts->do_items( $query_handle );
-		$this->getActualOutput();
-
-		$this->assertTrue( $this->wp_fonts->query( $query_handle, 'done' ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_done_query() {
-		return array(
-			'merriweather'     => array( 'merriweather' ),
-			'Source Serif Pro' => array( 'source-serif-pro' ),
-		);
-	}
-
-	private function setup_registry() {
-		foreach ( $this->get_registered_local_fonts() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $this->wp_fonts );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/registerProvider.php b/phpunit/tests/fonts-api/wpFonts/registerProvider.php
deleted file mode 100644
index c67976e0a68655..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/registerProvider.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * WP_Fonts::register_provider() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::register_provider
- */
-class Tests_Fonts_WpFonts_RegisterProvider extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_register_providers
-	 *
-	 * @param string $provider_id Provider ID.
-	 * @param string $class_name  Provider class name.
-	 * @param array  $expected    Expected providers queue.
-	 */
-	public function test_should_register_provider( $provider_id, $class_name, $expected ) {
-		$wp_fonts = new WP_Fonts();
-		$this->assertTrue( $wp_fonts->register_provider( $provider_id, $class_name ), 'WP_Fonts::register_provider() should return true' );
-		$this->assertSame( $expected, $wp_fonts->get_providers(), 'Provider "' . $provider_id . '" should be registered in providers queue' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_register_providers() {
-		return array(
-			'mock'  => array(
-				'provider_id' => 'mock',
-				'class'       => Mock_Provider::class,
-				'expected'    => array(
-					'mock' => array(
-						'class' => Mock_Provider::class,
-						'fonts' => array(),
-					),
-				),
-			),
-			'local' => array(
-				'provider_id' => 'local',
-				'class'       => WP_Fonts_Provider_Local::class,
-				'expected'    => array(
-					'local' => array(
-						'class' => WP_Fonts_Provider_Local::class,
-						'fonts' => array(),
-					),
-				),
-			),
-		);
-	}
-
-	public function test_should_register_multiple_providers() {
-		$wp_fonts  = new WP_Fonts();
-		$providers = $this->get_provider_definitions();
-		foreach ( $providers as $provider ) {
-			$this->assertTrue( $wp_fonts->register_provider( $provider['id'], $provider['class'] ), 'WP_Fonts::register_provider() should return true for provider ' . $provider['id'] );
-		}
-
-		$expected = array(
-			'mock'  => array(
-				'class' => $providers['mock']['class'],
-				'fonts' => array(),
-			),
-			'local' => array(
-				'class' => $providers['local']['class'],
-				'fonts' => array(),
-			),
-		);
-
-		$this->assertSame( $expected, $wp_fonts->get_providers(), 'Both local and mock providers should be registered' );
-	}
-
-	/**
-	 * @dataProvider data_invalid_providers
-	 *
-	 * @param string $provider_id Provider ID.
-	 * @param string $class_name  Provider class name.
-	 */
-	public function test_should_not_register( $provider_id, $class_name ) {
-		$wp_fonts = new WP_Fonts();
-
-		$this->assertFalse( $wp_fonts->register_provider( $provider_id, $class_name ), 'WP_Fonts::register_provider() should return false' );
-		$this->assertArrayNotHasKey( $provider_id, $wp_fonts->get_providers(), 'Both local and mock providers should be registered' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_providers() {
-		return array(
-			'provider_id is empty' => array(
-				'provider_id' => '',
-				'class'       => Mock_Provider::class,
-			),
-			'class is empty'       => array(
-				'provider_id' => 'local',
-				'class'       => '',
-			),
-			'class does not exist' => array(
-				'provider_id' => 'doesnotexist',
-				'class'       => 'Provider_Does_Not_Exist',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/remove.php b/phpunit/tests/fonts-api/wpFonts/remove.php
deleted file mode 100644
index 208bd58c3d2c30..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/remove.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * WP_Fonts::remove() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  remove_fonts
- * @covers WP_Fonts::remove
- */
-class Tests_Fonts_WpFonts_Remove extends WP_Fonts_TestCase {
-
-	public function test_should_not_remove_when_none_registered() {
-		$wp_fonts = new WP_Fonts();
-
-		$wp_fonts->remove( array( 'handle-1', 'handle2' ) );
-
-		$this->assertEmpty( $wp_fonts->registered );
-	}
-
-	/**
-	 * @dataProvider data_remove_when_registered
-	 *
-	 * @param array $handles  Handles to remove.
-	 * @param array $expected Expected handles are running test.
-	 */
-	public function test_should_remove_when_registered( array $handles, array $expected ) {
-		$wp_fonts             = new WP_Fonts();
-		$wp_fonts->registered = $this->generate_registered_queue();
-
-		$wp_fonts->remove( $handles );
-
-		$this->assertSameSets( $expected, array_keys( $wp_fonts->registered ), 'Registered queue should match after removing handles' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_remove_when_registered() {
-		$all = array(
-			'handle-1',
-			'handle-2',
-			'handle-3',
-			'handle-4',
-			'handle-5',
-			'handle-6',
-			'handle-7',
-			'handle-8',
-			'handle-9',
-			'handle-10',
-		);
-
-		return array(
-			'remove none'                 => array(
-				'handles'  => array(),
-				'expected' => $all,
-			),
-			'remove handle-5'             => array(
-				'handles'  => array( 'handle-5' ),
-				'expected' => array(
-					'handle-1',
-					'handle-2',
-					'handle-3',
-					'handle-4',
-					'handle-6',
-					'handle-7',
-					'handle-8',
-					'handle-9',
-					'handle-10',
-				),
-			),
-			'remove 2 from start and end' => array(
-				'handles'  => array( 'handle-1', 'handle-2', 'handle-9', 'handle-10' ),
-				'expected' => array(
-					'handle-3',
-					'handle-4',
-					'handle-5',
-					'handle-6',
-					'handle-7',
-					'handle-8',
-				),
-			),
-			'remove all'                  => array(
-				'handles'  => $all,
-				'expected' => array(),
-			),
-			'remove only registered'      => array(
-				'handles'  => array( 'handle-1', 'handle-10', 'handle-abc', 'handle-5' ),
-				'expected' => array(
-					'handle-2',
-					'handle-3',
-					'handle-4',
-					'handle-6',
-					'handle-7',
-					'handle-8',
-					'handle-9',
-				),
-			),
-		);
-	}
-
-	private function generate_registered_queue() {
-		$queue = array();
-		for ( $num = 1; $num <= 10; $num++ ) {
-			$handle           = "handle-{$num}";
-			$queue[ $handle ] = $num;
-		}
-
-		return $queue;
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/removeFontFamily.php b/phpunit/tests/fonts-api/wpFonts/removeFontFamily.php
deleted file mode 100644
index 6e762307d05207..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/removeFontFamily.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * WP_Fonts::remove_font_family() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @group remove_fonts
- * @covers WP_Fonts::remove_font_family
- */
-class Tests_Fonts_WpFonts_RemoveFontFamily extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family        Font family to test.
-	 * @param array  $inputs             Font family(ies) and variations to pre-register.
-	 * @param array  $registered_handles Expected handles after registering.
-	 * @param array  $expected           Array of expected handles.
-	 */
-	public function test_should_dequeue_when_mocks_registered( $font_family, array $inputs, array $registered_handles, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-		$this->setup_registration_mocks( $inputs, $wp_fonts );
-		// Test the before state, just to make sure.
-		$this->assertArrayHasKey( $font_family, $wp_fonts->registered, 'Registered queue should contain the font family before remove' );
-		$this->assertSame( $registered_handles, array_keys( $wp_fonts->registered ), 'Font family and variations should be registered before remove' );
-
-		$wp_fonts->remove_font_family( $font_family );
-
-		$this->assertArrayNotHasKey( $font_family, $wp_fonts->registered, 'Registered queue should not contain the font family' );
-		$this->assertSame( $expected, array_keys( $wp_fonts->registered ), 'Registered queue should match after removing font family' );
-	}
-
-	/**
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family        Font family to test.
-	 * @param array  $inputs             Font family(ies) and variations to pre-register.
-	 * @param array  $registered_handles Not used.
-	 * @param array  $expected           Array of expected handles.
-	 */
-	public function test_should_bail_out_when_not_registered( $font_family, array $inputs, array $registered_handles, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-		unset( $inputs[ $font_family ] );
-		$this->setup_registration_mocks( $inputs, $wp_fonts );
-
-		$wp_fonts->remove_font_family( $font_family );
-
-		$this->assertArrayNotHasKey( $font_family, $wp_fonts->registered, 'Registered queue should not contain the font family' );
-		$this->assertSame( $expected, array_keys( $wp_fonts->registered ), 'Registered queue should match after removing font family' );
-	}
-
-	/**
-	 * Integration test for removing a font family and all of its variation when font family is registered.
-	 *
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family        Font family to test.
-	 * @param array  $inputs             Font family(ies) and variations to pre-register.
-	 * @param array  $registered_handles Expected handles after registering.
-	 * @param array  $expected           Array of expected handles.
-	 */
-	public function test_should_deregister_when_registered( $font_family, array $inputs, array $registered_handles, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-		// Register all font families and their variations.
-		foreach ( $inputs as $input_font_family => $variations ) {
-			$handle = $wp_fonts->add_font_family( $input_font_family );
-			foreach ( $variations as $variation_handle => $variation ) {
-				if ( ! is_string( $variation_handle ) ) {
-					$variation_handle = '';
-				}
-				$wp_fonts->add_variation( $handle, $variation, $variation_handle );
-			}
-		}
-		// Test the before state, just to make sure.
-		$this->assertArrayHasKey( $font_family, $wp_fonts->registered, 'Registered queue should contain the font family before remove' );
-		$this->assertSame( $registered_handles, array_keys( $wp_fonts->registered ), 'Font family and variations should be registered before remove' );
-
-		$wp_fonts->remove_font_family( $font_family );
-
-		$this->assertArrayNotHasKey( $font_family, $wp_fonts->registered, 'Registered queue should not contain the font family' );
-		$this->assertSame( $expected, array_keys( $wp_fonts->registered ), 'Registered queue should match after removing font family' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/removeVariation.php b/phpunit/tests/fonts-api/wpFonts/removeVariation.php
deleted file mode 100644
index 508c8ce264d8fb..00000000000000
--- a/phpunit/tests/fonts-api/wpFonts/removeVariation.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/**
- * WP_Fonts::remove_variation() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  remove_fonts
- * @covers WP_Fonts::remove_variation
- */
-class Tests_Fonts_WpFonts_RemoveVariation extends WP_Fonts_TestCase {
-	private $wp_fonts;
-	private $fonts_to_register = array();
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts          = new WP_Fonts();
-		$this->fonts_to_register = $this->get_registered_local_fonts();
-	}
-
-	/**
-	 * Sets up the unit test by mocking the WP_Dependencies object using stdClass and
-	 * registering each font family directly to the WP_Fonts::$registered property
-	 * and its variations to the mocked $deps property.
-	 */
-	private function setup_unit_test() {
-		$this->setup_registration_mocks( $this->fonts_to_register, $this->wp_fonts );
-	}
-
-	/**
-	 * Sets up the integration test by properly registering each font family and its variations
-	 * by using the WP_Fonts::add() and WP_Fonts::add_variation() methods.
-	 */
-	private function setup_integration_test() {
-		foreach ( $this->fonts_to_register as $font_family_handle => $variations ) {
-			$this->setup_register( $font_family_handle, $variations, $this->wp_fonts );
-		}
-	}
-
-	/**
-	 * Testing the test setup to ensure it works.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_mocked_setup( $font_family_handle, $variation_handle ) {
-		$this->setup_unit_test();
-
-		$this->assertArrayHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be in the registered queue before removal' );
-		$this->assertContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should be in its font family deps before removal' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_should_do_nothing_when_variation_and_font_family_not_registered
-	 *
-	 * @param string $font_family        Font family name.
-	 * @param string $font_family_handle Font family handle.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_unit_should_do_nothing_when_variation_and_font_family_not_registered( $font_family, $font_family_handle, $variation_handle ) {
-		// Set up the test.
-		unset( $this->fonts_to_register[ $font_family ] );
-		$this->setup_unit_test();
-		$registered_queue = $this->wp_fonts->registered;
-
-		// Run the tests.
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $font_family_handle, $this->wp_fonts->registered, 'Font family should not be registered' );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertSame( $registered_queue, $this->wp_fonts->registered, 'Registered queue should not have changed' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_should_do_nothing_when_variation_and_font_family_not_registered
-	 *
-	 * @param string $font_family        Font family name.
-	 * @param string $font_family_handle Font family handle.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_should_do_nothing_when_variation_and_font_family_not_registered( $font_family, $font_family_handle, $variation_handle ) {
-		// Set up the test.
-		unset( $this->fonts_to_register[ $font_family ] );
-		$this->setup_integration_test();
-		$registered_queue = $this->wp_fonts->get_registered();
-
-		// Run the tests.
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $font_family_handle, $this->wp_fonts->registered, 'Font family should not be registered' );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertSameSets( $registered_queue, $this->wp_fonts->get_registered(), 'Registered queue should not have changed' );
-	}
-
-	/**
-	 * Data provider for testing removal of variations.
-	 *
-	 * @return array
-	 */
-	public function data_should_do_nothing_when_variation_and_font_family_not_registered() {
-		return array(
-			'Font with 1 variation'         => array(
-				'font_family'        => 'merriweather',
-				'font_family_handle' => 'merriweather',
-				'variation_handle'   => 'merriweather-200-900-normal',
-			),
-			'Font with multiple variations' => array(
-				'font_family'        => 'Source Serif Pro',
-				'font_family_handle' => 'source-serif-pro',
-				'variation_handle'   => 'Source Serif Pro-300-normal',
-			),
-		);
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_only_remove_from_font_family_deps_when_variation_not_in_queue( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-		$this->setup_remove_variation_from_registered( $variation_handle );
-
-		// Run the tests.
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_only_remove_from_font_family_deps_when_variation_not_in_queue( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-		$this->setup_remove_variation_from_registered( $variation_handle );
-
-		// Run the tests.
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_remove_variation_from_registered_queue_though_font_family_not_registered( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-		$this->setup_remove_from_font_family_deps( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should not be in its font family deps before removal' );
-
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_remove_variation_from_registered_queue_though_font_family_not_registered( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-		$this->setup_remove_from_font_family_deps( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should not be in its font family deps before removal' );
-
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_remove_variation_from_queue_and_font_family_deps( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-
-		$this->assertArrayHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should be in its font family deps before removal' );
-
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be not be in registered queue' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_remove_variation_from_queue_and_font_family_deps( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-
-		$this->assertArrayHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should be in its font family deps before removal' );
-
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be not be in registered queue' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Remove the variation handle from the font family's deps.
-	 *
-	 * @param string $font_family_handle Font family.
-	 * @param string $variation_handle   The variation handle to remove.
-	 */
-	private function setup_remove_from_font_family_deps( $font_family_handle, $variation_handle ) {
-		foreach ( $this->wp_fonts->registered[ $font_family_handle ]->deps as $index => $vhandle ) {
-			if ( $variation_handle !== $vhandle ) {
-				continue;
-			}
-			unset( $this->wp_fonts->registered[ $font_family_handle ]->deps[ $index ] );
-			break;
-		}
-	}
-
-	/**
-	 * Removes the variation from the WP_Fonts::$registered queue.
-	 *
-	 * @param string $variation_handle The variation handle to remove.
-	 */
-	private function setup_remove_variation_from_registered( $variation_handle ) {
-		unset( $this->wp_fonts->registered[ $variation_handle ] );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsProviderLocal.php b/phpunit/tests/fonts-api/wpFontsProviderLocal.php
deleted file mode 100644
index f9319390c3b6b5..00000000000000
--- a/phpunit/tests/fonts-api/wpFontsProviderLocal.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
- * WP_Fonts_Local_Provider tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fontsapi
- */
-class Tests_Fonts_WpFontsProviderLocal extends WP_UnitTestCase {
-	private $provider;
-	private $theme_root;
-	private $orig_theme_dir;
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->provider = new WP_Fonts_Provider_Local();
-
-		$this->set_up_theme();
-	}
-
-	public function tear_down() {
-		// Restore the original theme directory setup.
-		$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
-		wp_clean_themes_cache();
-		unset( $GLOBALS['wp_themes'] );
-
-		parent::tear_down();
-	}
-
-	/**
-	 * @covers WP_Fonts_Provider_Local::set_fonts
-	 */
-	public function test_set_fonts() {
-		$fonts = array(
-			'source-serif-pro-200-900-normal-local' => array(
-				'provider'     => 'local',
-				'font-family'  => 'Source Serif Pro',
-				'font-style'   => 'normal',
-				'font-weight'  => '200 900',
-				'font-stretch' => 'normal',
-				'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-			),
-			'source-serif-pro-200-900-italic-local' => array(
-				'provider'     => 'local',
-				'font-family'  => 'Source Serif Pro',
-				'font-style'   => 'italic',
-				'font-weight'  => '200 900',
-				'font-stretch' => 'normal',
-				'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-			),
-		);
-
-		$this->provider->set_fonts( $fonts );
-
-		$property = $this->get_fonts_property();
-		$this->assertSame( $fonts, $property->getValue( $this->provider ) );
-	}
-
-	/**
-	 * @covers WP_Fonts_Provider_Local::get_css
-	 *
-	 * @dataProvider data_get_css_print_styles
-	 *
-	 * @param array  $fonts Prepared fonts (to store in WP_Fonts_Provider_Local::$fonts property).
-	 * @param string $expected Expected CSS.
-	 */
-	public function test_get_css( array $fonts, $expected ) {
-		$property = $this->get_fonts_property();
-		$property->setValue( $this->provider, $fonts );
-
-		$this->assertSame( $expected['font-face-css'], $this->provider->get_css() );
-	}
-
-	/**
-	 * @covers WP_Fonts_Provider_Local::print_styles
-	 *
-	 * @dataProvider data_get_css_print_styles
-	 *
-	 * @param array  $fonts Prepared fonts (to store in WP_Fonts_Provider_Local::$fonts property).
-	 * @param string $expected Expected CSS.
-	 */
-	public function test_print_styles( array $fonts, $expected ) {
-		$property = $this->get_fonts_property();
-		$property->setValue( $this->provider, $fonts );
-
-		$expected_output = sprintf( $expected['style-element'], $expected['font-face-css'] );
-		$this->expectOutputString( $expected_output );
-		$this->provider->print_styles();
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_css_print_styles() {
-		return array(
-			'truetype format' => array(
-				'fonts'    => array(
-					'open-sans-bold-italic-local' => array(
-						'provider'    => 'local',
-						'font-family' => 'Open Sans',
-						'font-style'  => 'italic',
-						'font-weight' => 'bold',
-						'src'         => 'http://example.org/assets/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf',
-					),
-				),
-				'expected' => array(
-					'style-element' => "<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					'font-face-css' => <<<CSS
-@font-face{font-family:"Open Sans";font-style:italic;font-weight:bold;src:url('http://example.org/assets/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf') format('truetype');}
-CSS
-					,
-				),
-			),
-			'woff2 format'    => array(
-				'fonts'    => array(
-					'source-serif-pro-200-900-normal-local' => array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-stretch' => 'normal',
-						'src'          => 'http://example.org/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					),
-					'source-serif-pro-400-900-italic-local' => array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'italic',
-						'font-weight'  => '200 900',
-						'font-stretch' => 'normal',
-						'src'          => 'http://example.org/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-					),
-				),
-				'expected' => array(
-					'style-element' => "<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					'font-face-css' => <<<CSS
-@font-face{font-family:"Source Serif Pro";font-style:normal;font-weight:200 900;font-stretch:normal;src:url('http://example.org/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');}@font-face{font-family:"Source Serif Pro";font-style:italic;font-weight:200 900;font-stretch:normal;src:url('http://example.org/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');}
-CSS
-
-					,
-				),
-			),
-		);
-	}
-
-	/**
-	 * Local `src` paths to need to be relative to the theme. This method sets up the
-	 * `wp-content/themes/` directory to ensure consistency when running tests.
-	 */
-	private function set_up_theme() {
-		$this->theme_root                = realpath( GUTENBERG_DIR_TESTDATA . '/themedir1' );
-		$this->orig_theme_dir            = $GLOBALS['wp_theme_directories'];
-		$GLOBALS['wp_theme_directories'] = array( $this->theme_root );
-
-		$theme_root_callback = function () {
-			return $this->theme_root;
-		};
-		add_filter( 'theme_root', $theme_root_callback );
-		add_filter( 'stylesheet_root', $theme_root_callback );
-		add_filter( 'template_root', $theme_root_callback );
-
-		// Clear caches.
-		wp_clean_themes_cache();
-		unset( $GLOBALS['wp_themes'] );
-	}
-
-	private function get_fonts_property() {
-		$property = new ReflectionProperty( $this->provider, 'fonts' );
-		$property->setAccessible( true );
-
-		return $property;
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsResolver/addMissingFontsToThemeJson.php b/phpunit/tests/fonts-api/wpFontsResolver/addMissingFontsToThemeJson.php
deleted file mode 100644
index d6e45561e5e335..00000000000000
--- a/phpunit/tests/fonts-api/wpFontsResolver/addMissingFontsToThemeJson.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * Test WP_Fonts_Resolver::add_missing_fonts_to_theme_json().
- *
- * @package WordPress
- * @subpackage Fonts API
- *
- * @since X.X.X
- * @group fontsapi
- * @covers WP_Fonts_Resolver::add_missing_fonts_to_theme_json
- */
-class Tests_Fonts_WPFontsResolver_AddMissingFontsToThemeJson extends WP_Fonts_TestCase {
-	const FONTS_THEME = 'fonts-block-theme';
-
-	/**
-	 * Cache of test themes' `theme.json` contents.
-	 *
-	 * @var array
-	 */
-	private static $theme_json_data = array();
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-
-		$themes = array(
-			'block-theme',
-			'fonts-block-theme',
-		);
-		foreach ( $themes as $theme ) {
-			$file                            = self::$theme_root . "/{$theme}/theme.json";
-			self::$theme_json_data[ $theme ] = json_decode( file_get_contents( $file ), true );
-		}
-	}
-
-	/**
-	 * @dataProvider data_themes
-	 *
-	 * @param string $theme Theme to use.
-	 */
-	public function test_should_return_instance( $theme ) {
-		switch_theme( $theme );
-
-		$data   = new WP_Theme_JSON_Gutenberg( self::$theme_json_data[ $theme ] );
-		$actual = WP_Fonts_Resolver::add_missing_fonts_to_theme_json( $data );
-
-		$this->assertInstanceOf( WP_Theme_JSON_Gutenberg::class, $actual, 'Instance of WP_Theme_JSON_Gutenberg should be returned' );
-	}
-
-	/**
-	 * @dataProvider data_themes
-	 *
-	 * @param string $theme Theme to use.
-	 */
-	public function test_should_bail_out_when_no_registered_fonts( $theme ) {
-		switch_theme( $theme );
-
-		$data   = new WP_Theme_JSON_Gutenberg( self::$theme_json_data[ $theme ] );
-		$actual = WP_Fonts_Resolver::add_missing_fonts_to_theme_json( $data );
-
-		$this->assertEmpty( wp_fonts()->get_registered_font_families(), 'No fonts should be registered in Fonts API' );
-		$this->assertSame( $data, $actual, 'Same instance of WP_Theme_JSON_Gutenberg should be returned' );
-	}
-
-	/**
-	 * Data Provider.
-	 *
-	 * @return array
-	 */
-	public function data_themes() {
-		return array(
-			'no fonts defined'    => array( 'block-theme' ),
-			'no fonts registered' => array( static::FONTS_THEME ),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_add_non_theme_json_fonts
-	 *
-	 * @param string $theme    Theme to use.
-	 * @param array  $fonts    Fonts to register.
-	 * @param array  $expected Expected fonts to be added.
-	 */
-	public function test_should_add_non_theme_json_fonts( $theme, $fonts, $expected ) {
-		switch_theme( static::FONTS_THEME );
-
-		// Register the fonts.
-		wp_register_fonts( $fonts );
-
-		$data   = new WP_Theme_JSON_Gutenberg( self::$theme_json_data[ $theme ] );
-		$actual = WP_Fonts_Resolver::add_missing_fonts_to_theme_json( $data );
-
-		$this->assertNotSame( $data, $actual, 'New instance of WP_Theme_JSON_Gutenberg should be returned' );
-		$actual_raw_data = $actual->get_raw_data();
-
-		$this->assertArrayHasKey( 'typography', $actual_raw_data['settings'] );
-		$this->assertArrayHasKey( 'fontFamilies', $actual_raw_data['settings']['typography'] );
-		$this->assertArrayHasKey( 'theme', $actual_raw_data['settings']['typography']['fontFamilies'] );
-
-		$this->assertContains(
-			$expected,
-			$actual_raw_data['settings']['typography']['fontFamilies']['theme'],
-			'Fonts should be added after running WP_Fonts_Resolver::add_missing_fonts_to_theme_json()'
-		);
-	}
-
-	/**
-	 * Data Provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_add_non_theme_json_fonts() {
-		$lato = array(
-			'Lato' => array(
-				array(
-					'font-family' => 'Lato',
-					'font-style'  => 'normal',
-					'font-weight' => '400',
-					'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular.woff2',
-				),
-				array(
-					'font-family' => 'Lato',
-					'font-style'  => 'italic',
-					'font-weight' => '400',
-					'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular-Italic.woff2',
-				),
-			),
-		);
-
-		$expected_lato = array(
-			'fontFamily' => 'Lato',
-			'name'       => 'Lato',
-			'slug'       => 'lato',
-			'fontFace'   => array(
-				'lato-400-normal' => array(
-					'origin'      => 'gutenberg_wp_fonts_api',
-					'provider'    => 'local',
-					'fontFamily'  => 'Lato',
-					'fontStyle'   => 'normal',
-					'fontWeight'  => '400',
-					'fontDisplay' => 'fallback',
-					'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular.woff2',
-				),
-				'lato-400-italic' => array(
-					'origin'      => 'gutenberg_wp_fonts_api',
-					'provider'    => 'local',
-					'fontFamily'  => 'Lato',
-					'fontStyle'   => 'italic',
-					'fontWeight'  => '400',
-					'fontDisplay' => 'fallback',
-					'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular-Italic.woff2',
-				),
-			),
-		);
-
-		return array(
-			'theme with no fonts defined'              => array(
-				'theme'    => 'block-theme',
-				'fonts'    => $lato,
-				'expected' => $expected_lato,
-			),
-			'theme with fonts: new fonts not in theme' => array(
-				'theme'    => static::FONTS_THEME,
-				'fonts'    => $lato,
-				'expected' => $expected_lato,
-			),
-
-			/*
-			 * @TODO Add these tests fixing https://github.com/WordPress/gutenberg/issues/50047.
-			 *
-			'theme with fonts: new variations registered' => array(
-				'theme'    => static::FONTS_THEME,
-				'fonts'    => array(
-					'DM Sans' => array(
-						'dm-sans-500-normal' => array(
-							'font-family' => 'DM Sans',
-							'font-style'  => 'normal',
-							'font-weight' => '500',
-							'src'         => 'https://example.com/tests/assets/fonts/dm-sans/DMSans-Medium.woff2',
-						),
-						'dm-sans-500-italic' => array(
-							'font-family' => 'DM Sans',
-							'font-style'  => 'italic',
-							'font-weight' => '500',
-							'src'         => 'https://example.com/tests/assets/fonts/dm-sans/DMSans-Medium.woff2',
-						),
-					),
-				),
-				'expected' => array(
-					'fontFace'   => array(
-						array(
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'normal',
-							'fontWeight'  => '400',
-							'src'         => array( 'file:./assets/fonts/dm-sans/DMSans-Regular.woff2' ),
-						),
-						array(
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'italic',
-							'fontWeight'  => '400',
-							'src'         => array( 'file:./assets/fonts/dm-sans/DMSans-Regular-Italic.woff2' ),
-						),
-						'dm-sans-500-normal' => array(
-							'origin'      => 'gutenberg_wp_fonts_api',
-							'provider'    => 'local',
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'normal',
-							'fontWeight'  => '500',
-							'fontDisplay' => 'fallback',
-							'src'         => array( get_stylesheet_directory_uri() . 'assets/fonts/dm-sans/DMSans-Medium.woff2' ),
-						),
-						'dm-sans-500-italic' => array(
-							'origin'      => 'gutenberg_wp_fonts_api',
-							'provider'    => 'local',
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'italic',
-							'fontWeight'  => '500',
-							'fontDisplay' => 'fallback',
-							'src'         => array( get_stylesheet_directory_uri() . 'assets/fonts/dm-sans/DMSans-Medium-Italic.woff2' ),
-						),
-						array(
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'normal',
-							'fontWeight'  => '700',
-							'src'         => array( 'file:./assets/fonts/dm-sans/DMSans-Bold.woff2' ),
-						),
-						array(
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'italic',
-							'fontWeight'  => '700',
-							'src'         => array( 'file:./assets/fonts/dm-sans/DMSans-Bold-Italic.woff2' ),
-						),
-					),
-					'fontFamily' => '"DM Sans", sans-serif',
-					'name'       => 'DM Sans',
-					'slug'       => 'dm-sans',
-				),
-			),
-			*/
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsResolver/enqueueUserSelectedFonts.php b/phpunit/tests/fonts-api/wpFontsResolver/enqueueUserSelectedFonts.php
deleted file mode 100644
index 9ff01f1c3166cd..00000000000000
--- a/phpunit/tests/fonts-api/wpFontsResolver/enqueueUserSelectedFonts.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * WP_Fonts_Resolver::enqueue_user_selected_fonts() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts_Resolver::enqueue_user_selected_fonts
- */
-class Tests_Fonts_WpFontsResolver_EnqueueUserSelectedFonts extends WP_Fonts_TestCase {
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-
-		self::$administrator_id = self::factory()->user->create(
-			array(
-				'role'       => 'administrator',
-				'user_email' => 'administrator@example.com',
-			)
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_not_enqueue_when_no_user_selected_fonts
-	 *
-	 * @param array $styles Optional. Test styles. Default empty array.
-	 */
-	public function test_should_not_enqueue_when_no_user_selected_fonts( $styles = array() ) {
-		$this->set_up_global_styles( $styles );
-
-		$mock = $this->set_up_mock( 'enqueue' );
-		$mock->expects( $this->never() )
-			->method( 'enqueue' );
-
-		$expected = array();
-		$this->assertSame( $expected, WP_Fonts_Resolver::enqueue_user_selected_fonts() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_not_enqueue_when_no_user_selected_fonts() {
-		return array(
-			'no user-selected styles' => array(),
-			'invalid element'         => array(
-				array(
-					'elements' => array(
-						'invalid' => array(
-							'typography' => array(
-								'fontFamily' => 'var:preset|font-family|font1',
-								'fontStyle'  => 'normal',
-								'fontWeight' => '400',
-							),
-						),
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_enqueue_when_user_selected_fonts
-	 *
-	 * @param array $styles   Test styles.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_enqueue_when_user_selected_fonts( $styles, $expected ) {
-		$mock = $this->set_up_mock( 'enqueue' );
-		$mock->expects( $this->once() )
-			->method( 'enqueue' )
-			->with(
-				$this->identicalTo( $expected )
-			);
-
-		$this->set_up_global_styles( $styles );
-
-		$this->assertSameSets( $expected, WP_Fonts_Resolver::enqueue_user_selected_fonts() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_enqueue_when_user_selected_fonts() {
-		$global_styles = $this->get_mock_user_selected_fonts_global_styles();
-
-		return array(
-			'heading, caption, text'   => array(
-				'styles'   => $global_styles['font1'],
-				'expected' => array( 'font1' ),
-			),
-			'heading, button'          => array(
-				'styles'   => $global_styles['font2'],
-				'expected' => array( 'font2' ),
-			),
-			'text'                     => array(
-				'styles'   => $global_styles['font3'],
-				'expected' => array( 'font3' ),
-			),
-			'all'                      => array(
-				'styles'   => $global_styles['all'],
-				'expected' => array(
-					0 => 'font1',
-					// font1 occurs 2 more times and gets removed as duplicates.
-					3 => 'font2',
-					4 => 'font3',
-				),
-			),
-			'all with invalid element' => array(
-				'styles'   => $global_styles['all with invalid element'],
-				'expected' => array(
-					0 => 'font1',
-					// font1 occurs 2 more times and gets removed as duplicates.
-					3 => 'font2',
-					// Skips font2 for the "invalid" element.
-					4 => 'font3',
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsResolver/registerFontsFromThemeJson.php b/phpunit/tests/fonts-api/wpFontsResolver/registerFontsFromThemeJson.php
deleted file mode 100644
index 0186dbf34f3fdc..00000000000000
--- a/phpunit/tests/fonts-api/wpFontsResolver/registerFontsFromThemeJson.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * Test WP_Fonts_Resolver::register_fonts_from_theme_json().
- *
- * @package WordPress
- * @subpackage Fonts API
- *
- * @since X.X.X
- * @group fontsapi
- * @covers WP_Fonts_Resolver::register_fonts_from_theme_json
- */
-class Tests_Fonts_WPFontsResolver_RegisterFontsFromThemeJson extends WP_Fonts_TestCase {
-	const FONTS_THEME   = 'fonts-block-theme';
-	const FONT_FAMILIES = array(
-		'fonts-block-theme' => array(
-			// From theme.json.
-			'dm-sans',
-			'source-serif-pro',
-			// From style variation.
-			'open-sans',
-		),
-	);
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-	}
-
-	public function test_should_bails_out_when_no_fonts_defined() {
-		switch_theme( 'block-theme' );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-		$wp_fonts = wp_fonts();
-
-		$this->assertEmpty( $wp_fonts->get_registered() );
-		$this->assertEmpty( $wp_fonts->get_enqueued() );
-	}
-
-	public function test_should_register_and_enqueue_style_variation_fonts() {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-		$wp_fonts = wp_fonts();
-
-		$this->assertContains( 'open-sans', $wp_fonts->get_registered_font_families(), 'Font families should be registered' );
-		$this->assertContains( 'open-sans', $wp_fonts->get_enqueued(), 'Font families should be enqueued' );
-	}
-
-	/**
-	 * Tests all font families are registered and enqueued. "All" means all font families from
-	 * the theme's theme.json and within the style variations.
-	 */
-	public function test_should_register_and_enqueue_all_defined_font_families() {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-		$wp_fonts = wp_fonts();
-
-		$expected = static::FONT_FAMILIES[ static::FONTS_THEME ];
-		$this->assertSameSetsWithIndex( $expected, $wp_fonts->get_registered_font_families(), 'Font families should be registered' );
-		$this->assertSameSetsWithIndex( $expected, $wp_fonts->get_enqueued(), 'Font families should be enqueued' );
-	}
-
-	/**
-	 * Test ensures duplicate fonts and variations in the style variations
-	 * are not re-registered.
-	 *
-	 * The Dm Sans fonts are duplicated in the theme's /styles/variations-duplicate-fonts.json.
-	 */
-	public function test_should_not_reregister_duplicate_fonts_from_style_variations() {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-		$wp_fonts = wp_fonts();
-
-		// Font families are not duplicated.
-		$this->assertSameSetsWithIndex(
-			static::FONT_FAMILIES[ static::FONTS_THEME ],
-			$wp_fonts->get_registered_font_families(),
-			'Font families should not be duplicated'
-		);
-
-		// Font variations are not duplicated.
-		$this->assertSameSets(
-			array(
-				// From theme.json.
-				'dm-sans',
-				'dm-sans-400-normal',
-				'dm-sans-400-italic',
-				'dm-sans-700-normal',
-				'dm-sans-700-italic',
-				'source-serif-pro',
-				'source-serif-pro-200-900-normal',
-				'source-serif-pro-200-900-italic',
-				// From style variation.
-				'open-sans',
-				'open-sans-400-normal',
-				'open-sans-400-italic',
-				'dm-sans-500-normal',
-				'dm-sans-500-italic',
-			),
-			$wp_fonts->get_registered(),
-			'Font families and their variations should not be duplicated'
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_replace_src_file_placeholder
-	 *
-	 * @param string $handle   Variation's handle.
-	 * @param string $expected Expected src.
-	 */
-	public function test_should_replace_src_file_placeholder( $handle, $expected ) {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-
-		$variation = wp_fonts()->registered[ $handle ];
-		$actual    = array_pop( $variation->src );
-		$expected  = get_stylesheet_directory_uri() . $expected;
-
-		$this->assertStringNotContainsString( 'file:./', $actual, 'Font src should not contain the "file:./" placeholder' );
-		$this->assertSame( $expected, $actual, 'Font src should be an URL to its file' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_replace_src_file_placeholder() {
-		return array(
-			// Theme's theme.json.
-			'DM Sans: 400 normal'                          => array(
-				'handle'   => 'dm-sans-400-normal',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Regular.woff2',
-			),
-			'DM Sans: 400 italic'                          => array(
-				'handle'   => 'dm-sans-400-italic',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2',
-			),
-			'DM Sans: 700 normal'                          => array(
-				'handle'   => 'dm-sans-700-normal',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Bold.woff2',
-			),
-			'DM Sans: 700 italic'                          => array(
-				'handle'   => 'dm-sans-700-italic',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2',
-			),
-			'Source Serif Pro: 200-900 normal'             => array(
-				'handle'   => 'source-serif-pro-200-900-normal',
-				'expected' => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-			),
-			'Source Serif Pro: 200-900 italic'             => array(
-				'handle'   => 'source-serif-pro-200-900-italic',
-				'expected' => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-			),
-
-			// Style Variation: variation-with-new-font-family.json.
-			'Style Variation: new font-family'             => array(
-				'handle'   => 'open-sans-400-normal',
-				'expected' => '/assets/fonts/open-sans/OpenSans-VariableFont_wdth,wght.tff',
-			),
-			'Style Variation: new font-family italic variation' => array(
-				'handle'   => 'open-sans-400-italic',
-				'expected' => '/assets/fonts/open-sans/OpenSans-Italic-VariableFont_wdth,wght.tff',
-			),
-
-			// Style Variation: variation-with-new-variation.json.
-			'Style Variation: new medium variation'        => array(
-				'handle'   => 'dm-sans-500-normal',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Medium.woff2',
-			),
-			'Style Variation: new medium italic variation' => array(
-				'handle'   => 'dm-sans-500-italic',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Medium-Italic.woff2',
-			),
-		);
-	}
-
-	public function test_should_convert_font_face_properties_into_kebab_case() {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-
-		// Testing only one variation since this theme's fonts use the same properties.
-		$variation         = wp_fonts()->registered['dm-sans-400-normal'];
-		$actual_properties = $variation->extra['font-properties'];
-
-		$this->assertArrayHasKey( 'font-family', $actual_properties, 'fontFamily should have been converted into font-family' );
-		$this->assertArrayNotHasKey( 'fontFamily', $actual_properties, 'fontFamily should not exist.' );
-		$this->assertArrayHasKey( 'font-stretch', $actual_properties, 'fontStretch should have been converted into font-stretch' );
-		$this->assertArrayNotHasKey( 'fontStretch', $actual_properties, 'fontStretch should not exist' );
-		$this->assertArrayHasKey( 'font-style', $actual_properties, 'fontStyle should have been converted into font-style' );
-		$this->assertArrayNotHasKey( 'fontStyle', $actual_properties, 'fontStyle should not exist.' );
-		$this->assertArrayHasKey( 'font-weight', $actual_properties, 'fontWeight should have been converted into font-weight' );
-		$this->assertArrayNotHasKey( 'fontWeight', $actual_properties, 'fontWeight should not exist' );
-	}
-
-	/**
-	 * Tests that WP_Fonts_Resolver::register_fonts_from_theme_json() skips fonts that are already registered
-	 * in the Fonts API. How does it do that? Using the 'origin' property when checking each variation.
-	 * This property is added when WP_Theme_JSON_Resolver_Gutenberg::get_merged_data() runs.
-	 *
-	 * To simulate this scenario, a font is registered first, but not enqueued. Then after running,
-	 * it checks if the WP_Fonts_Resolver::register_fonts_from_theme_json() enqueued the font. If no, then
-	 * it was skipped as expected.
-	 */
-	public function test_should_skip_registered_fonts() {
-		switch_theme( static::FONTS_THEME );
-
-		// Register Lato font.
-		wp_register_fonts(
-			array(
-				'Lato' => array(
-					array(
-						'font-family' => 'Lato',
-						'font-style'  => 'normal',
-						'font-weight' => '400',
-						'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular.woff2',
-					),
-					array(
-						'font-family' => 'Lato',
-						'font-style'  => 'italic',
-						'font-weight' => '400',
-						'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular-Italic.woff2',
-					),
-				),
-			)
-		);
-
-		// Pre-check to ensure no fonts are enqueued.
-		$this->assertEmpty( wp_fonts()->get_enqueued(), 'No fonts should be enqueued before running WP_Fonts_Resolver::register_fonts_from_theme_json()' );
-
-		/*
-		 * When this function runs, it invokes WP_Theme_JSON_Resolver_Gutenberg::get_merged_data(),
-		 * which will include the Lato fonts with a 'origin' property set in each variation.
-		 */
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-
-		$actual_enqueued_fonts = wp_fonts()->get_enqueued();
-
-		$this->assertNotContains( 'lato', $actual_enqueued_fonts, 'Lato font-family should not be enqueued' );
-		$this->assertSameSets( static::FONT_FAMILIES[ static::FONTS_THEME ], $actual_enqueued_fonts, 'Only the theme font families should be enqueued' );
-	}
-
-	public function test_should_skip_when_font_face_not_defined() {
-		switch_theme( static::FONTS_THEME );
-		$expected_font_family = 'source-serif-pro';
-
-		/**
-		 * Callback that removes the 'fontFace' of the expected font family from the theme's theme.json data.
-		 * This callback is invoked at the start of WP_Fonts_Resolver::register_fonts_from_theme_json() before processing
-		 * within that function. How? It's in the call stack of WP_Theme_JSON_Resolver_Gutenberg::get_merged_data().
-		 *
-		 * @param WP_Theme_JSON_Data_Gutenberg| WP_Theme_JSON_Data $theme_json_data Instance of the Data object.
-		 * @return WP_Theme_JSON_Data_Gutenberg| WP_Theme_JSON_Data Modified instance.
-		 * @throws ReflectionException
-		 */
-		$remove_expected_font_family = static function ( $theme_json_data ) use ( $expected_font_family ) {
-			// Need to get the underlying data array which is in WP_Theme_JSON_Gutenberg | WP_Theme_JSON object.
-			$property = new ReflectionProperty( $theme_json_data, 'theme_json' );
-			$property->setAccessible( true );
-			$theme_json_object = $property->getValue( $theme_json_data );
-
-			$property = new ReflectionProperty( $theme_json_object, 'theme_json' );
-			$property->setAccessible( true );
-			$data = $property->getValue( $theme_json_object );
-
-			// Loop through the fonts to find the expected font-family to modify.
-			foreach ( $data['settings']['typography']['fontFamilies']['theme'] as $index => $definitions ) {
-				if ( $expected_font_family !== $definitions['slug'] ) {
-					continue;
-				}
-
-				// Remove the 'fontFace' element, which removes the font's variations.
-				unset( $data['settings']['typography']['fontFamilies']['theme'][ $index ]['fontFace'] );
-				break;
-			}
-
-			$theme_json_data->update_with( $data );
-
-			return $theme_json_data;
-		};
-		add_filter( 'wp_theme_json_data_theme', $remove_expected_font_family );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-
-		remove_filter( 'wp_theme_json_data_theme', $remove_expected_font_family );
-
-		$this->assertNotContains( $expected_font_family, wp_fonts()->get_registered_font_families() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsUtils/convertFontFamilyIntoHandle.php b/phpunit/tests/fonts-api/wpFontsUtils/convertFontFamilyIntoHandle.php
deleted file mode 100644
index 19b2f15c826ed1..00000000000000
--- a/phpunit/tests/fonts-api/wpFontsUtils/convertFontFamilyIntoHandle.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * WP_Fonts_Utils::convert_font_family_into_handle() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @covers WP_Fonts_Utils::convert_font_family_into_handle
- */
-class Tests_Fonts_WpFontsUtils_ConvertFontFamilyIntoHandle extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_with_valid_input
-	 *
-	 * @param mixed  $font_family Font family to test.
-	 * @param string $expected    Expected results.
-	 */
-	public function test_should_convert_with_valid_input( $font_family, $expected ) {
-		$this->assertSame( $expected, WP_Fonts_Utils::convert_font_family_into_handle( $font_family ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_valid_input() {
-		return array(
-			'font family single word name'               => array(
-				'font_family' => 'Merriweather',
-				'expected'    => 'merriweather',
-			),
-			'font family multiword name'                 => array(
-				'font_family' => 'Source Sans Pro',
-				'expected'    => 'source-sans-pro',
-			),
-			'font family handle delimited by hyphens'    => array(
-				'font_family' => 'source-serif-pro',
-				'expected'    => 'source-serif-pro',
-			),
-			'font family handle delimited by underscore' => array(
-				'font_family' => 'source_serif_pro',
-				'expected'    => 'source_serif_pro',
-			),
-			'font family handle delimited by hyphens and underscore' => array(
-				'font_family' => 'my-custom_font_family',
-				'expected'    => 'my-custom_font_family',
-			),
-			'font family handle delimited mixture'       => array(
-				'font_family' => 'My custom_font-family',
-				'expected'    => 'my-custom_font-family',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_with_invalid_input
-	 *
-	 * @covers WP_Fonts_Utils::convert_font_family_into_handle
-	 *
-	 * @param mixed $invalid_input Invalid input.
-	 */
-	public function test_should_not_convert_with_invalid_input( $invalid_input ) {
-		$this->assertNull( WP_Fonts_Utils::convert_font_family_into_handle( $invalid_input ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_invalid_input() {
-		return array(
-			'empty string'                    => array( '' ),
-			'integer'                         => array( 10 ),
-			'font family wrapped in an array' => array( array( 'source-serif-pro' ) ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsUtils/convertVariationIntoHandle.php b/phpunit/tests/fonts-api/wpFontsUtils/convertVariationIntoHandle.php
deleted file mode 100644
index 9268aac8ce372b..00000000000000
--- a/phpunit/tests/fonts-api/wpFontsUtils/convertVariationIntoHandle.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * WP_Fonts_Utils::convert_variation_into_handle() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @covers WP_Fonts_Utils::convert_variation_into_handle
- */
-class Tests_Fonts_WpFontsUtils_ConvertVariationIntoHandle extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_with_valid_input
-	 *
-	 * @param string $font_family Font family to test.
-	 * @param array  $variation   Variation to test.
-	 * @param string $expected    Expected results.
-	 */
-	public function test_should_convert_with_valid_inputs( $font_family, array $variation, $expected ) {
-		$this->assertSame( $expected, WP_Fonts_Utils::convert_variation_into_handle( $font_family, $variation ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_valid_input() {
-		return array(
-			'with only font-weight'                  => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-weight' => '400',
-				),
-				'expected'    => 'merriweather-400',
-			),
-			'with no font-style'                     => array(
-				'font_family' => 'source-sans-pro',
-				'variation'   => array(
-					'font-weight' => '200 900',
-					'src'         => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'provider'    => 'local',
-				),
-				'expected'    => 'source-sans-pro-200-900',
-			),
-			'with font family name and full variant' => array(
-				'font_family' => 'source-sans-pro',
-				'variation'   => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected'    => 'source-sans-pro-200-900-normal',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_with_invalid_input
-	 *
-	 * @param string $font_family   Font family to test.
-	 * @param array  $invalid_input Variation to test.
-	 */
-	public function tests_should_convert_with_invalid_input( $font_family, $invalid_input ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Variant handle could not be determined as font-weight and/or font-style are require' );
-
-		$this->assertNull( WP_Fonts_Utils::convert_variation_into_handle( $font_family, $invalid_input ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_invalid_input() {
-		return array(
-			'with no font-weight or font-style' => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'provider'     => 'local',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-			),
-			'with non-string font-weight'       => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-weight' => 400,
-				),
-			),
-			'with non-string font-style'        => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-style' => 0,
-				),
-			),
-			'with empty string font-weight'     => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-weight' => '',
-				),
-			),
-			'with empty string font-style'      => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-style' => '',
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsUtils/getFontFamilyFromVariation.php b/phpunit/tests/fonts-api/wpFontsUtils/getFontFamilyFromVariation.php
deleted file mode 100644
index 2b3e3689c4317f..00000000000000
--- a/phpunit/tests/fonts-api/wpFontsUtils/getFontFamilyFromVariation.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * WP_Fonts_Utils::get_font_family_from_variation() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @covers WP_Fonts_Utils::get_font_family_from_variation
- */
-class Tests_Fonts_WpFontsUtils_GetFontFamilyFromVariation extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_with_valid_variation
-	 *
-	 * @param array  $variation Variation to test.
-	 * @param string $expected  Expected results.
-	 */
-	public function test_with_valid_variation( array $variation, $expected ) {
-		$this->assertSame( $expected, WP_Fonts_Utils::get_font_family_from_variation( $variation ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_valid_variation() {
-		return array(
-			'keyed by font-family'                   => array(
-				'variation' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected'  => 'Source Serif Pro',
-			),
-			'keyed by fontFamily and as a handle'    => array(
-				'variation' => array(
-					'fontFamily'  => 'source-sans-pro',
-					'font-weight' => '200 900',
-					'src'         => 'https://example.com/assets/fonts/source-sans-pro/source-sans-pro.ttf.woff2',
-					'provider'    => 'local',
-				),
-				'expected'  => 'source-sans-pro',
-			),
-			'with font family name and full variant' => array(
-				'variation' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Merriweather',
-					'font-style'   => 'normal',
-					'font-weight'  => '400 600',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected'  => 'Merriweather',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_with_invalid_input
-	 *
-	 * @param array  $invalid_variation Variation to test.
-	 * @param string $expected_message  Expected notice message.
-	 */
-	public function test_with_invalid_input( array $invalid_variation, $expected_message ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( $expected_message );
-
-		$this->assertNull( WP_Fonts_Utils::get_font_family_from_variation( $invalid_variation ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_invalid_input() {
-		return array(
-			'keyed with underscore'       => array(
-				'variation'        => array(
-					'provider'     => 'local',
-					'font_family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected_message' => 'Font family not found.',
-			),
-			'keyed with space'            => array(
-				'variation'        => array(
-					'font family' => 'Source Sans Pro',
-					'font-weight' => '200 900',
-					'src'         => 'https://example.com/assets/fonts/source-sans-pro/source-sans-pro.ttf.woff2',
-					'provider'    => 'local',
-				),
-				'expected_message' => 'Font family not found.',
-			),
-			'fontFamily => empty string'  => array(
-				'variation'        => array(
-					'fontFamily'  => '',
-					'font-weight' => '200 900',
-					'src'         => 'https://example.com/assets/fonts/source-sans-pro/source-sans-pro.ttf.woff2',
-					'provider'    => 'local',
-				),
-				'expected_message' => 'Font family not defined in the variation.',
-			),
-			'font-family => empty string' => array(
-				'variation'        => array(
-					'provider'     => 'local',
-					'font-family'  => '',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected_message' => 'Font family not defined in the variation.',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsUtils/isDefined.php b/phpunit/tests/fonts-api/wpFontsUtils/isDefined.php
deleted file mode 100644
index 3ae48ad52671a2..00000000000000
--- a/phpunit/tests/fonts-api/wpFontsUtils/isDefined.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * WP_Fonts_Utils::is_defined() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @covers WP_Fonts_Utils::is_defined
- */
-class Tests_Fonts_WpFontsUtils_IsDefined extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_when_defined
-	 *
-	 * @param mixed $input Input to test.
-	 */
-	public function test_should_return_true_when_defined( $input ) {
-		$this->assertTrue( WP_Fonts_Utils::is_defined( $input ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_when_defined() {
-		return array(
-			'name: non empty string'   => array( 'Some Font Family' ),
-			'handle: non empty string' => array( 'some-font-family' ),
-		);
-	}
-
-	/**
-	 * @dataProvider data_when_not_defined
-	 *
-	 * @param mixed $invalid_input Input to test.
-	 */
-	public function test_should_return_false_when_not_defined( $invalid_input ) {
-		$this->assertFalse( WP_Fonts_Utils::is_defined( $invalid_input ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_when_not_defined() {
-		return array(
-			'empty string'               => array( '' ),
-			'string 0'                   => array( '0' ),
-			'integer'                    => array( 10 ),
-			'name wrapped in an array'   => array( array( 'Some Font Family' ) ),
-			'handle wrapped in an array' => array( array( 'some-font-family' ) ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpPrintFonts.php b/phpunit/tests/fonts-api/wpPrintFonts.php
deleted file mode 100644
index 40b416aa56421f..00000000000000
--- a/phpunit/tests/fonts-api/wpPrintFonts.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_print_fonts().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_print_fonts
- */
-class Tests_Fonts_WpPrintFonts extends WP_Fonts_TestCase {
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-
-		static::set_up_admin_user();
-	}
-
-	public function test_should_return_empty_array_when_no_fonts_registered() {
-		$this->assertSame( array(), wp_print_fonts() );
-	}
-
-	/**
-	 * Unit test which mocks WP_Fonts methods.
-	 *
-	 * @dataProvider data_mocked_handles
-	 *
-	 * @param string|string[] $handles Handles to test.
-	 */
-	public function test_should_return_mocked_handles( $handles ) {
-		$mock = $this->set_up_mock( array( 'get_registered_font_families', 'do_items' ) );
-		$mock->expects( $this->once() )
-			->method( 'get_registered_font_families' )
-			->will( $this->returnValue( $handles ) );
-
-		$mock->expects( $this->once() )
-			->method( 'do_items' )
-			->with(
-				$this->identicalTo( $handles )
-			)
-			->will( $this->returnValue( $handles ) );
-
-		wp_print_fonts( $handles );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_mocked_handles() {
-		return array(
-			'font family'            => array(
-				array( 'my-custom-font' ),
-			),
-			'multiple font families' => array(
-				array(
-					'font1',
-					'font2',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Integration test that registers providers and fonts and then enqueues before
-	 * testing the printing functionality.
-	 *
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_enqueued( $setup, $expected_done, $expected_output ) {
-		$wp_fonts = wp_fonts();
-
-		$this->setup_integrated_deps( $setup, $wp_fonts );
-
-		$this->expectOutputString( $expected_output );
-		$actual_done = wp_print_fonts();
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * Integration test to validate printing given handles. Rather than mocking internal functionality,
-	 * it registers providers and fonts but does not enqueue.
-	 *
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_handles_when_not_enqueued( $setup, $expected_done, $expected_output ) {
-		$wp_fonts = wp_fonts();
-
-		$this->setup_integrated_deps( $setup, $wp_fonts, false );
-		// Do not enqueue. Instead, pass the handles to wp_print_fonts().
-		$handles = $setup['enqueued'];
-		$this->assertEmpty( $wp_fonts->queue, 'No fonts should be enqueued' );
-
-		$this->expectOutputString( $expected_output );
-		$actual_done = wp_print_fonts( $handles );
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * @dataProvider data_should_print_all_registered_fonts_for_iframed_editor
-	 *
-	 * @param string $fonts    Fonts to register.
-	 * @param array  $expected Expected results.
-	 */
-	public function test_should_print_all_registered_fonts_for_iframed_editor( $fonts, $expected ) {
-		wp_register_fonts( $fonts );
-
-		$this->expectOutputString( $expected['output'] );
-		$actual_done = wp_print_fonts( true );
-		$this->assertSameSets( $expected['done'], $actual_done, 'All registered font-family handles should be returned' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_print_all_registered_fonts_for_iframed_editor() {
-		$local_fonts = $this->get_registered_local_fonts();
-		$font_faces  = $this->get_registered_fonts_css();
-
-		return array(
-			'Merriweather with 1 variation'      => array(
-				'fonts'    => array( 'merriweather' => $local_fonts['merriweather'] ),
-				'expected' => array(
-					'done'   => array( 'merriweather', 'merriweather-200-900-normal' ),
-					'output' => sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-						$font_faces['merriweather-200-900-normal']
-					),
-				),
-			),
-			'Source Serif Pro with 2 variations' => array(
-				'fonts'    => array( 'Source Serif Pro' => $local_fonts['Source Serif Pro'] ),
-				'expected' => array(
-					'done'   => array( 'source-serif-pro', 'Source Serif Pro-300-normal', 'Source Serif Pro-900-italic' ),
-					'output' => sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s%s\n</style>\n",
-						$font_faces['Source Serif Pro-300-normal'],
-						$font_faces['Source Serif Pro-900-italic']
-					),
-				),
-			),
-			'all fonts'                          => array(
-				'fonts'    => $local_fonts,
-				'expected' => array(
-					'done'   => array(
-						'merriweather',
-						'merriweather-200-900-normal',
-						'source-serif-pro',
-						'Source Serif Pro-300-normal',
-						'Source Serif Pro-900-italic',
-					),
-					'output' => sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-						$font_faces['merriweather-200-900-normal'],
-						$font_faces['Source Serif Pro-300-normal'],
-						$font_faces['Source Serif Pro-900-italic']
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Integration test for printing user-selected global fonts.
-	 * This test registers providers and fonts and then enqueues before testing the printing functionality.
-	 *
-	 * @dataProvider data_print_user_selected_fonts
-	 *
-	 * @param array  $global_styles   Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_user_selected_fonts( $global_styles, $expected_done, $expected_output ) {
-		$wp_fonts = wp_fonts();
-
-		$setup = array(
-			'provider'      => array( 'mock' => $this->get_provider_definitions( 'mock' ) ),
-			'registered'    => $this->get_registered_mock_fonts(),
-			'global_styles' => $global_styles,
-		);
-		$this->setup_integrated_deps( $setup, $wp_fonts, false );
-
-		$this->expectOutputString( $expected_output );
-		$actual_printed_fonts = wp_print_fonts();
-		$this->assertSameSets( $expected_done, $actual_printed_fonts, 'Should print font-faces for given user-selected fonts' );
-	}
-
-
-	/**
-	 * Sets up the dependencies for integration test.
-	 *
-	 * @param array    $setup    Dependencies to set up.
-	 * @param WP_Fonts $wp_fonts Instance of WP_Fonts.
-	 * @param bool     $enqueue  Whether to enqueue. Default true.
-	 */
-	private function setup_integrated_deps( array $setup, $wp_fonts, $enqueue = true ) {
-		foreach ( $setup['provider'] as $provider ) {
-			$wp_fonts->register_provider( $provider['id'], $provider['class'] );
-		}
-		foreach ( $setup['registered'] as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $wp_fonts );
-		}
-
-		if ( $enqueue ) {
-			$wp_fonts->enqueue( $setup['enqueued'] );
-		}
-
-		if ( ! empty( $setup['global_styles'] ) ) {
-			$this->set_up_global_styles( $setup['global_styles'] );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpRegisterFontProvider.php b/phpunit/tests/fonts-api/wpRegisterFontProvider.php
deleted file mode 100644
index 907355bdc91c82..00000000000000
--- a/phpunit/tests/fonts-api/wpRegisterFontProvider.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Unit tests for wp_register_font_provider().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_register_font_provider
- */
-class Tests_Fonts_WpRegisterFontProvider extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_register_providers
-	 *
-	 * @param string $provider_id Provider ID.
-	 * @param string $class_name  Provider class name.
-	 */
-	public function test_should_register_provider( $provider_id, $class_name ) {
-		$mock = $this->set_up_mock( 'register_provider' );
-		$mock->expects( $this->once() )
-			->method( 'register_provider' )
-			->with(
-				$this->identicalTo( $provider_id ),
-				$this->identicalTo( $class_name )
-			)
-			->will( $this->returnValue( true ) );
-
-		$this->assertTrue( wp_register_font_provider( $provider_id, $class_name ), 'wp_register_font_provider() should return true' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_register_providers() {
-		return array(
-			'mock'  => array(
-				'provider_id' => 'mock',
-				'class'       => Mock_Provider::class,
-			),
-			'local' => array(
-				'provider_id' => 'local',
-				'class'       => WP_Fonts_Provider_Local::class,
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_invalid_providers
-	 *
-	 * @param string $provider_id Provider ID.
-	 * @param string $class_name  Provider class name.
-	 */
-	public function test_should_not_register( $provider_id, $class_name ) {
-		$mock = $this->set_up_mock( 'register_provider' );
-		$mock->expects( $this->once() )
-			->method( 'register_provider' )
-			->with(
-				$this->identicalTo( $provider_id ),
-				$this->identicalTo( $class_name )
-			)
-			->will( $this->returnValue( false ) );
-
-		$this->assertFalse( wp_register_font_provider( $provider_id, $class_name ), 'wp_register_font_provider() should return false' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_providers() {
-		return array(
-			'provider_id is empty' => array(
-				'provider_id' => '',
-				'class'       => Mock_Provider::class,
-			),
-			'class is empty'       => array(
-				'provider_id' => 'local',
-				'class'       => '',
-			),
-			'class does not exist' => array(
-				'provider_id' => 'doesnotexist',
-				'class'       => 'Provider_Does_Not_Exist',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpRegisterFonts.php b/phpunit/tests/fonts-api/wpRegisterFonts.php
deleted file mode 100644
index c57c1406a6cacc..00000000000000
--- a/phpunit/tests/fonts-api/wpRegisterFonts.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Integration tests for wp_register_fonts().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_register_fonts
- * @covers WP_Fonts::add
- * @covers WP_Fonts::add_variation
- */
-class Tests_Fonts_WpRegisterFonts extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_fonts
-	 *
-	 * @param array $fonts Array of fonts to test.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_register( array $fonts, array $expected ) {
-		$actual = wp_register_fonts( $fonts );
-		$this->assertSame( $expected['wp_register_fonts'], $actual, 'Font family handle(s) should be returned' );
-		$this->assertSame( $expected['get_registered'], $this->get_registered_handles(), 'Web fonts should match registered queue' );
-	}
-
-	/**
-	 * @dataProvider data_fonts
-	 *
-	 * @param array $fonts Array of fonts to test.
-	 */
-	public function test_should_not_enqueue_on_registration( array $fonts ) {
-		wp_register_fonts( $fonts );
-		$this->assertEmpty( $this->get_enqueued_handles() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_fonts() {
-		return array(
-			'font family keyed with slug' => array(
-				'fonts'    => array(
-					'source-serif-pro' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-				'expected' => array(
-					'wp_register_fonts' => array( 'source-serif-pro' ),
-					'get_registered'    => array(
-						'source-serif-pro',
-						'source-serif-pro-200-900-normal',
-					),
-				),
-			),
-			'font family keyed with name' => array(
-				'fonts'    => array(
-					'Source Serif Pro' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-				'expected' => array(
-					'wp_register_fonts' => array( 'source-serif-pro' ),
-					'get_registered'    => array(
-						'source-serif-pro',
-						'source-serif-pro-200-900-normal',
-						'source-serif-pro-200-900-italic',
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-face/base.php b/phpunit/tests/fonts/font-face/base.php
deleted file mode 100644
index 65d7cdd02d7276..00000000000000
--- a/phpunit/tests/fonts/font-face/base.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Test case for the Fonts tests.
- *
- * @package    WordPress
- * @subpackage Fonts
- */
-
-require_once __DIR__ . '/wp-font-face-tests-dataset.php';
-/**
- * Abstracts the common tasks for the Font Face tests.
- */
-abstract class WP_Font_Face_UnitTestCase extends WP_UnitTestCase {
-	use WP_Font_Face_Tests_Datasets;
-
-	/**
-	 * Current error reporting level (before a test changes it).
-	 *
-	 * @var null|int
-	 */
-	protected $error_reporting_level = null;
-
-	/**
-	 * Reflection data store for non-public property access.
-	 *
-	 * @var ReflectionProperty[]
-	 */
-	protected $property = array();
-
-	/**
-	 * Indicates the test class uses `switch_theme()` and requires
-	 * set_up and tear_down fixtures to set and reset hooks and memory.
-	 *
-	 * If a test class switches themes, set this property to `true`.
-	 *
-	 * @var bool
-	 */
-	protected static $requires_switch_theme_fixtures = false;
-
-	/**
-	 * Theme root directory.
-	 *
-	 * @var string
-	 */
-	protected static $theme_root;
-
-	/**
-	 * Original theme directory.
-	 *
-	 * @var string
-	 */
-	protected $orig_theme_dir;
-
-	/**
-	 * Administrator ID.
-	 *
-	 * @var int
-	 */
-	protected static $administrator_id = 0;
-
-	public static function set_up_before_class() {
-		parent::set_up_before_class();
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			// @core-merge Use `DIR_TESTDATA` instead of `GUTENBERG_DIR_TESTDATA`.
-			self::$theme_root = realpath( GUTENBERG_DIR_TESTDATA . '/themedir1' );
-		}
-	}
-
-	public static function tear_down_after_class() {
-		// Reset static flags.
-		self::$requires_switch_theme_fixtures = false;
-
-		parent::tear_down_after_class();
-	}
-
-	public function set_up() {
-		parent::set_up();
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			$this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
-
-			// /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
-			$GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', self::$theme_root );
-
-			// Set up the new root.
-			add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
-			add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
-			add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
-
-			// Clear caches.
-			wp_clean_themes_cache();
-			unset( $GLOBALS['wp_themes'] );
-		}
-	}
-
-	public function tear_down() {
-		$this->property = array();
-
-		// Reset the error reporting when modified within a test.
-		if ( is_int( $this->error_reporting_level ) ) {
-			error_reporting( $this->error_reporting_level );
-			$this->error_reporting_level = null;
-		}
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
-			remove_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
-			remove_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
-			remove_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
-
-			wp_clean_themes_cache();
-			// @core-merge: the function_exists() is not needed in Core.
-			if ( function_exists( 'wp_clean_theme_json_cache' ) ) {
-				wp_clean_theme_json_cache();
-			}
-
-			// @core-merge: start of the plugin only code block. Do not merge into Core.
-			if ( class_exists( 'WP_Theme_JSON_Resolver_Gutenberg' ) ) {
-				WP_Theme_JSON_Resolver_Gutenberg::clean_cached_data();
-			}
-			if ( function_exists( '_gutenberg_clean_theme_json_caches' ) ) {
-				_gutenberg_clean_theme_json_caches();
-			}
-			// @core-merge: end of the plugin only code block.
-
-			unset( $GLOBALS['wp_themes'] );
-		}
-
-		parent::tear_down();
-	}
-
-	public function filter_set_theme_root() {
-		return self::$theme_root;
-	}
-}
diff --git a/phpunit/tests/fonts/font-face/wp-font-face-tests-dataset.php b/phpunit/tests/fonts/font-face/wp-font-face-tests-dataset.php
deleted file mode 100644
index 00ae66e865a89c..00000000000000
--- a/phpunit/tests/fonts/font-face/wp-font-face-tests-dataset.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-/**
- * Datasets for unit and integration tests.
- *
- * @package    WordPress
- * @subpackage Fonts
- */
-
-/**
- * Trait for reusing datasets within the Fonts tests.
- */
-trait WP_Font_Face_Tests_Datasets {
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_print_given_fonts() {
-		return array(
-			'single truetype format font'    => array(
-				'fonts'    => array(
-					'Inter' =>
-						array(
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/inter/Inter-VariableFont_slnt,wght.ttf',
-									),
-								'font-family'  => 'Inter',
-								'font-stretch' => 'normal',
-								'font-style'   => 'normal',
-								'font-weight'  => '200',
-							),
-						),
-				),
-				'expected' => <<<CSS
-@font-face{font-family:Inter;font-style:normal;font-weight:200;font-display:fallback;src:url('https://example.org/assets/fonts/inter/Inter-VariableFont_slnt,wght.ttf') format('truetype');font-stretch:normal;}
-CSS
-			,
-			),
-			'multiple truetype format fonts' => array(
-				'fonts'    => array(
-					'Inter' =>
-						array(
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/inter/Inter-VariableFont_slnt,wght.ttf',
-									),
-								'font-family'  => 'Inter',
-								'font-stretch' => 'normal',
-								'font-style'   => 'normal',
-								'font-weight'  => '200',
-							),
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/inter/Inter-VariableFont_slnt-Italic,wght.ttf',
-									),
-								'font-family'  => 'Inter',
-								'font-stretch' => 'normal',
-								'font-style'   => 'italic',
-								'font-weight'  => '900',
-							),
-						),
-				),
-				'expected' => <<<CSS
-@font-face{font-family:Inter;font-style:normal;font-weight:200;font-display:fallback;src:url('https://example.org/assets/fonts/inter/Inter-VariableFont_slnt,wght.ttf') format('truetype');font-stretch:normal;}
-@font-face{font-family:Inter;font-style:italic;font-weight:900;font-display:fallback;src:url('https://example.org/assets/fonts/inter/Inter-VariableFont_slnt-Italic,wght.ttf') format('truetype');font-stretch:normal;}
-CSS
-			,
-			),
-			'single woff2 format font'       => array(
-				'fonts'    => array(
-					'DM Sans' =>
-						array(
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/dm-sans/DMSans-Regular.woff2',
-									),
-								'font-family'  => 'DM Sans',
-								'font-stretch' => 'normal',
-								'font-style'   => 'normal',
-								'font-weight'  => '400',
-							),
-						),
-				),
-				'expected' => <<<CSS
-@font-face{font-family:"DM Sans";font-style:normal;font-weight:400;font-display:fallback;src:url('https://example.org/assets/fonts/dm-sans/DMSans-Regular.woff2') format('woff2');font-stretch:normal;}
-CSS
-			,
-			),
-			'multiple woff2 format fonts'    => array(
-				'fonts'    => array(
-					'DM Sans'       =>
-						array(
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/dm-sans/DMSans-Regular.woff2',
-									),
-								'font-family'  => 'DM Sans',
-								'font-stretch' => 'normal',
-								'font-style'   => 'normal',
-								'font-weight'  => '400',
-							),
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2',
-									),
-								'font-family'  => 'DM Sans',
-								'font-stretch' => 'normal',
-								'font-style'   => 'italic',
-								'font-weight'  => '400',
-							),
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/dm-sans/DMSans-Bold.woff2',
-									),
-								'font-family'  => 'DM Sans',
-								'font-stretch' => 'normal',
-								'font-style'   => 'normal',
-								'font-weight'  => '700',
-							),
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2',
-									),
-								'font-family'  => 'DM Sans',
-								'font-stretch' => 'normal',
-								'font-style'   => 'italic',
-								'font-weight'  => '700',
-							),
-						),
-					'IBM Plex Mono' =>
-						array(
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/ibm-plex-mono/IBMPlexMono-Light.woff2',
-									),
-								'font-family'  => 'IBM Plex Mono',
-								'font-display' => 'block',
-								'font-stretch' => 'normal',
-								'font-style'   => 'normal',
-								'font-weight'  => '300',
-							),
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2',
-									),
-								'font-family'  => 'IBM Plex Mono',
-								'font-display' => 'block',
-								'font-stretch' => 'normal',
-								'font-style'   => 'normal',
-								'font-weight'  => '400',
-							),
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/ibm-plex-mono/IBMPlexMono-Italic.woff2',
-									),
-								'font-family'  => 'IBM Plex Mono',
-								'font-display' => 'block',
-								'font-stretch' => 'normal',
-								'font-style'   => 'italic',
-								'font-weight'  => '400',
-							),
-							array(
-								'src'          =>
-									array(
-										'https://example.org/assets/fonts/ibm-plex-mono/IBMPlexMono-Bold.woff2',
-									),
-								'font-family'  => 'IBM Plex Mono',
-								'font-display' => 'block',
-								'font-stretch' => 'normal',
-								'font-style'   => 'normal',
-								'font-weight'  => '700',
-							),
-						),
-				),
-				'expected' => <<<CSS
-@font-face{font-family:"DM Sans";font-style:normal;font-weight:400;font-display:fallback;src:url('https://example.org/assets/fonts/dm-sans/DMSans-Regular.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"DM Sans";font-style:italic;font-weight:400;font-display:fallback;src:url('https://example.org/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"DM Sans";font-style:normal;font-weight:700;font-display:fallback;src:url('https://example.org/assets/fonts/dm-sans/DMSans-Bold.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"DM Sans";font-style:italic;font-weight:700;font-display:fallback;src:url('https://example.org/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"IBM Plex Mono";font-style:normal;font-weight:300;font-display:block;src:url('https://example.org/assets/fonts/ibm-plex-mono/IBMPlexMono-Light.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"IBM Plex Mono";font-style:normal;font-weight:400;font-display:block;src:url('https://example.org/assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"IBM Plex Mono";font-style:italic;font-weight:400;font-display:block;src:url('https://example.org/assets/fonts/ibm-plex-mono/IBMPlexMono-Italic.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"IBM Plex Mono";font-style:normal;font-weight:700;font-display:block;src:url('https://example.org/assets/fonts/ibm-plex-mono/IBMPlexMono-Bold.woff2') format('woff2');font-stretch:normal;}
-CSS
-			,
-			),
-		);
-	}
-
-	public function get_expected_fonts_for_fonts_block_theme( $key = '' ) {
-		static $data = null;
-
-		if ( null === $data ) {
-			$uri  = get_stylesheet_directory_uri() . '/assets/fonts/';
-			$data = array(
-				'fonts'            => array(
-					'DM Sans'          => array(
-						array(
-							'src'          => array( $uri . 'dm-sans/DMSans-Regular.woff2' ),
-							'font-family'  => 'DM Sans',
-							'font-stretch' => 'normal',
-							'font-style'   => 'normal',
-							'font-weight'  => '400',
-						),
-						array(
-							'src'          => array( $uri . 'dm-sans/DMSans-Regular-Italic.woff2' ),
-							'font-family'  => 'DM Sans',
-							'font-stretch' => 'normal',
-							'font-style'   => 'italic',
-							'font-weight'  => '400',
-						),
-						array(
-							'src'          => array( $uri . 'dm-sans/DMSans-Bold.woff2' ),
-							'font-family'  => 'DM Sans',
-							'font-stretch' => 'normal',
-							'font-style'   => 'normal',
-							'font-weight'  => '700',
-						),
-						array(
-							'src'          => array( $uri . 'dm-sans/DMSans-Bold-Italic.woff2' ),
-							'font-family'  => 'DM Sans',
-							'font-stretch' => 'normal',
-							'font-style'   => 'italic',
-							'font-weight'  => '700',
-						),
-					),
-					'Source Serif Pro' => array(
-						array(
-							'src'          => array( $uri . 'source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2' ),
-							'font-family'  => 'Source Serif Pro',
-							'font-stretch' => 'normal',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-						),
-						array(
-							'src'          => array( $uri . 'source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2' ),
-							'font-family'  => 'Source Serif Pro',
-							'font-stretch' => 'normal',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-						),
-					),
-				),
-				'font_face_styles' => <<<CSS
-@font-face{font-family:"DM Sans";font-style:normal;font-weight:400;font-display:fallback;src:url('{$uri}dm-sans/DMSans-Regular.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"DM Sans";font-style:italic;font-weight:400;font-display:fallback;src:url('{$uri}dm-sans/DMSans-Regular-Italic.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"DM Sans";font-style:normal;font-weight:700;font-display:fallback;src:url('{$uri}dm-sans/DMSans-Bold.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"DM Sans";font-style:italic;font-weight:700;font-display:fallback;src:url('{$uri}dm-sans/DMSans-Bold-Italic.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"Source Serif Pro";font-style:normal;font-weight:200 900;font-display:fallback;src:url('{$uri}source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');font-stretch:normal;}
-@font-face{font-family:"Source Serif Pro";font-style:italic;font-weight:200 900;font-display:fallback;src:url('{$uri}source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');font-stretch:normal;}
-CSS
-				,
-			);
-		}
-
-		if ( isset( $data[ $key ] ) ) {
-			return $data[ $key ];
-		}
-
-		return $data;
-	}
-}
diff --git a/phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php b/phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php
deleted file mode 100644
index 01c00e98a8d38e..00000000000000
--- a/phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Test case for WP_Font_Face::generate_and_print().
- *
- * @package    WordPress
- * @subpackage Fonts
- *
- * @since 6.4.0
- */
-
-// @core-merge this line of code is not needed when merging into Core.
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fonts
- * @group fontface
- *
- * @covers WP_Font_Face::generate_and_print
- */
-class Tests_Fonts_WPFontFace_GenerateAndPrint extends WP_UnitTestCase {
-	use WP_Font_Face_Tests_Datasets;
-
-	public function test_should_not_generate_and_print_when_no_fonts() {
-		$font_face = new WP_Font_Face();
-		$fonts     = array();
-
-		$this->expectOutputString( '' );
-		$font_face->generate_and_print( $fonts );
-	}
-
-	/**
-	 * @dataProvider data_should_print_given_fonts
-	 *
-	 * @param array  $fonts Prepared fonts.
-	 * @param string $expected Expected CSS.
-	 */
-	public function test_should_generate_and_print_given_fonts( array $fonts, $expected ) {
-		$font_face       = new WP_Font_Face();
-		$style_element   = "<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n";
-		$expected_output = sprintf( $style_element, $expected );
-
-		$this->expectOutputString( $expected_output );
-		$font_face->generate_and_print( $fonts );
-	}
-}
diff --git a/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php b/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php
deleted file mode 100644
index 481c451bbafa09..00000000000000
--- a/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Test case for WP_Font_Face_Resolver::get_fonts_from_theme_json().
- *
- * @package    WordPress
- * @subpackage Fonts
- *
- * @since 6.4.0
- */
-
-// @core-merge this line of code is not needed when merging into Core.
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fonts
- * @group fontface
- *
- * @covers WP_Font_Face_Resolver::get_fonts_from_theme_json
- */
-class Tests_Fonts_WPFontFaceResolver_GetFontsFromThemeJson extends WP_Font_Face_UnitTestCase {
-	const FONTS_THEME = 'fonts-block-theme';
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-	}
-
-	public function test_should_return_empty_array_when_no_fonts_defined_in_theme() {
-		switch_theme( 'block-theme' );
-
-		$fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json();
-		$this->assertIsArray( $fonts, 'Should return an array data type' );
-		$this->assertEmpty( $fonts, 'Should return an empty array' );
-	}
-
-	public function test_should_return_all_fonts_from_theme() {
-		switch_theme( static::FONTS_THEME );
-
-		$actual   = WP_Font_Face_Resolver::get_fonts_from_theme_json();
-		$expected = $this->get_expected_fonts_for_fonts_block_theme( 'fonts' );
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * @dataProvider data_should_replace_src_file_placeholder
-	 *
-	 * @param string $font_name  Font's name.
-	 * @param string $font_index Font's index in the $fonts array.
-	 * @param string $expected   Expected src.
-	 */
-	public function test_should_replace_src_file_placeholder( $font_name, $font_index, $expected ) {
-		switch_theme( static::FONTS_THEME );
-
-		$fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json();
-
-		$actual   = $fonts[ $font_name ][ $font_index ]['src'][0];
-		$expected = get_stylesheet_directory_uri() . $expected;
-
-		$this->assertStringNotContainsString( 'file:./', $actual, 'Font src should not contain the "file:./" placeholder' );
-		$this->assertSame( $expected, $actual, 'Font src should be an URL to its file' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_replace_src_file_placeholder() {
-		return array(
-			// Theme's theme.json.
-			'DM Sans: 400 normal'              => array(
-				'font_name'  => 'DM Sans',
-				'font_index' => 0,
-				'expected'   => '/assets/fonts/dm-sans/DMSans-Regular.woff2',
-			),
-			'DM Sans: 400 italic'              => array(
-				'font_name'  => 'DM Sans',
-				'font_index' => 1,
-				'expected'   => '/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2',
-			),
-			'DM Sans: 700 normal'              => array(
-				'font_name'  => 'DM Sans',
-				'font_index' => 2,
-				'expected'   => '/assets/fonts/dm-sans/DMSans-Bold.woff2',
-			),
-			'DM Sans: 700 italic'              => array(
-				'font_name'  => 'DM Sans',
-				'font_index' => 3,
-				'expected'   => '/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2',
-			),
-			'Source Serif Pro: 200-900 normal' => array(
-				'font_name'  => 'Source Serif Pro',
-				'font_index' => 0,
-				'expected'   => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-			),
-			'Source Serif Pro: 200-900 italic' => array(
-				'font_name'  => 'Source Serif Pro',
-				'font_index' => 1,
-				'expected'   => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-face/wpPrintFontFaces.php b/phpunit/tests/fonts/font-face/wpPrintFontFaces.php
deleted file mode 100644
index 25b02d026e73ea..00000000000000
--- a/phpunit/tests/fonts/font-face/wpPrintFontFaces.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Test case for wp_print_font_faces().
- *
- * @package    WordPress
- * @subpackage Fonts
- *
- * @since 6.4.0
- */
-
-// @core-merge this line of code is not needed when merging into Core.
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fonts
- * @group fontface
- *
- * @covers wp_print_font_faces
- */
-class Tests_Fonts_WpPrintFontFaces extends WP_Font_Face_UnitTestCase {
-	const FONTS_THEME = 'fonts-block-theme';
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-	}
-
-	public function test_should_not_print_when_no_fonts() {
-		switch_theme( 'block-theme' );
-
-		$this->expectOutputString( '' );
-		wp_print_font_faces();
-	}
-
-	/**
-	 * @dataProvider data_should_print_given_fonts
-	 *
-	 * @param array  $fonts    Fonts to process.
-	 * @param string $expected Expected CSS.
-	 */
-	public function test_should_print_given_fonts( array $fonts, $expected ) {
-		$expected_output = $this->get_expected_styles_output( $expected );
-
-		$this->expectOutputString( $expected_output );
-		wp_print_font_faces( $fonts );
-	}
-
-	public function test_should_escape_tags() {
-		$fonts = array(
-			'Source Serif Pro' => array(
-				array(
-					'src'          => array( 'http://example.com/assets/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2' ),
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => '</style><script>console.log("Hello")</script><style>',
-				),
-			),
-		);
-
-		$expected_output = <<<CSS
-<style id='wp-fonts-local' type='text/css'>
-@font-face{font-family:"Source Serif Pro";font-style:normal;font-weight:200 900;font-display:fallback;src:url('http://example.com/assets/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');font-stretch:;}
-</style>
-
-CSS;
-		$this->expectOutputString( $expected_output );
-
-		wp_print_font_faces( $fonts );
-	}
-
-	public function test_should_print_fonts_in_merged_data() {
-		switch_theme( static::FONTS_THEME );
-
-		$expected        = $this->get_expected_fonts_for_fonts_block_theme( 'font_face_styles' );
-		$expected_output = $this->get_expected_styles_output( $expected );
-
-		$this->expectOutputString( $expected_output );
-		wp_print_font_faces();
-	}
-
-	private function get_expected_styles_output( $styles ) {
-		$style_element = "<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n";
-		return sprintf( $style_element, $styles );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/fontDeleteFilesFromWpContentFolder.php b/phpunit/tests/fonts/font-library/fontDeleteFilesFromWpContentFolder.php
new file mode 100644
index 00000000000000..dfba431306a0d0
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/fontDeleteFilesFromWpContentFolder.php
@@ -0,0 +1,194 @@
+<?php
+// @core-merge: Do not include these tests, they are for Gutenberg only.
+
+/**
+ * Tests deleting font files from the previous fonts folder default (wp-content/fonts).
+ *
+ * This covers cases where fonts were installed with older versions of Gutenberg, but are then deleted with
+ * newer versions of Gutenberg and/or WordPress.
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ *
+ * @group fonts
+ * @group font-library
+ */
+class Tests_Font_Delete_Files_From_Wp_Content_Folder extends WP_UnitTestCase {
+	/**
+	 * ID of a super admin user.
+	 *
+	 * @var int
+	 */
+	protected static $super_admin_id;
+
+	/**
+	 * Sets up test class.
+	 *
+	 * @param WP_UnitTest_Factory $factory Unit test factory instance.
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$super_admin_id = $factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+		grant_super_admin( self::$super_admin_id );
+	}
+
+	/**
+	 * Tears down test class.
+	 */
+	public static function wpTearDownAfterClass() {
+		self::delete_user( self::$super_admin_id );
+	}
+
+	/**
+	 * Tests that font files uploaded to wp-content/fonts are deleted when the associated font face post is deleted.
+	 *
+	 * @covers ::gutenberg_before_delete_font_face
+	 */
+	public function test_uploaded_font_files_are_deleted_from_wp_content_fonts_folder() {
+		wp_set_current_user( self::$super_admin_id );
+		$font_family_id = $this->create_font_family();
+
+		// Upload the font file to wp-content/fonts, the previous directory used for fonts.
+		add_filter( 'font_dir', array( $this, 'filter_font_dir' ) );
+		$response = $this->create_font_face( $font_family_id );
+		remove_filter( 'font_dir', array( $this, 'filter_font_dir' ) );
+
+		$this->assertSame( 201, $response->get_status(), 'The font face should be created successfully.' );
+
+		$data      = $response->get_data();
+		$font_path = str_replace( content_url(), WP_CONTENT_DIR, $data['font_face_settings']['src'] );
+
+		// Ensure the file was uploaded to the correct location.
+		$this->assertFalse( str_contains( $font_path, 'uploads' ), 'The font file should not be in the uploads folder.' );
+		$this->assertTrue( file_exists( $font_path ), 'The font file should exist in the wp-content/fonts folder.' );
+
+		// Ensure the file is deleted when the font face post is deleted, even when the directory is not filtered.
+		wp_delete_post( $font_family_id, true );
+		$this->assertTrue( str_contains( wp_get_font_dir()['path'], 'uploads' ), 'The font directory should be in uploads.' );
+		$this->assertFalse( file_exists( $font_path ), 'The font file should be deleted from the wp-content/fonts folder.' );
+	}
+
+	/**
+	 * Tests that font files uploaded to wp-content/fonts are deleted when the associated font face post is deleted on multisite.
+	 *
+	 * @group multisite
+	 * @group ms-required
+	 *
+	 * @covers ::gutenberg_before_delete_font_face
+	 */
+	public function test_uploaded_font_files_are_deleted_from_wp_content_fonts_folder_multisite() {
+		wp_set_current_user( self::$super_admin_id );
+		$blog_id = self::factory()->blog->create();
+
+		switch_to_blog( $blog_id );
+		$font_family_id = $this->create_font_family();
+
+		// Upload the font file to wp-content/fonts, the previous directory used for fonts.
+		add_filter( 'font_dir', array( $this, 'filter_font_dir' ) );
+		$response = $this->create_font_face( $font_family_id );
+		remove_filter( 'font_dir', array( $this, 'filter_font_dir' ) );
+		restore_current_blog();
+
+		$this->assertSame( 201, $response->get_status(), 'The font face should be created successfully.' );
+
+		$data      = $response->get_data();
+		$font_path = str_replace( content_url(), WP_CONTENT_DIR, $data['font_face_settings']['src'] );
+
+		// Ensure the file was uploaded to the correct location.
+		$this->assertFalse( str_contains( $font_path, 'uploads' ), 'The font file should not be in the uploads folder.' );
+		$this->assertTrue( file_exists( $font_path ), 'The font file should exist in the wp-content/fonts folder.' );
+
+		// Ensure the file is deleted when the font face post is deleted, even when the directory is not filtered.
+		switch_to_blog( $blog_id );
+		wp_delete_post( $font_family_id, true );
+		restore_current_blog();
+
+		$this->assertTrue( str_contains( wp_get_font_dir()['path'], 'uploads' ), 'The font directory should be in uploads.' );
+		$this->assertFalse( file_exists( $font_path ), 'The font file should be deleted from the wp-content/fonts folder.' );
+	}
+
+	/**
+	 * Sets the font upload directory to wp-content/fonts, the default previously used in Gutenberg.
+	 *
+	 * @param array $font_dir Font directory settings.
+	 * @return array Filtered font directory settings.
+	 */
+	public function filter_font_dir( $font_dir ) {
+		$site_path = '';
+		if ( is_multisite() && ! ( is_main_network() && is_main_site() ) ) {
+			$site_path = '/sites/' . get_current_blog_id();
+		}
+
+		$font_dir['path']    = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
+		$font_dir['url']     = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
+		$font_dir['basedir'] = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
+		$font_dir['baseurl'] = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
+
+		return $font_dir;
+	}
+
+	/**
+	 * Creates a font family post for testing.
+	 *
+	 * @return int Font family post ID.
+	 */
+	protected function create_font_family() {
+		return self::factory()->post->create(
+			wp_slash(
+				array(
+					'post_type'    => 'wp_font_family',
+					'post_status'  => 'publish',
+					'post_title'   => 'Open Sans',
+					'post_name'    => 'open-sans',
+					'post_content' => wp_json_encode(
+						array(
+							'fontFamily' => '"Open Sans"',
+						)
+					),
+				)
+			)
+		);
+	}
+
+	/**
+	 * Creates a font face post under the specified font family for testing.
+	 *
+	 * @param int $font_family_id Font family post ID.
+	 * @return WP_REST_Response REST response object for font face creation.
+	 */
+	protected function create_font_face( $font_family_id ) {
+		// Create a new font face with a font file upload.
+		$font_file = GUTENBERG_DIR_TESTDATA . '/fonts/OpenSans-Regular.woff2';
+		$font_path = wp_tempnam( 'OpenSans-Regular.woff2' );
+		copy( $font_file, $font_path );
+
+		$files = array(
+			'file-0' => array(
+				'name'      => 'OpenSans-Regular.woff2',
+				'full_path' => 'OpenSans-Regular.woff2',
+				'type'      => 'font/woff2',
+				'tmp_name'  => $font_path,
+				'error'     => 0,
+				'size'      => filesize( $font_path ),
+			),
+		);
+
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . $font_family_id . '/font-faces' );
+		$request->set_param(
+			'font_face_settings',
+			wp_json_encode(
+				array(
+					'fontFamily' => '"Open Sans"',
+					'fontWeight' => '200',
+					'fontStyle'  => 'normal',
+					'src'        => 'file-0',
+				)
+			)
+		);
+		$request->set_file_params( $files );
+		return rest_get_server()->dispatch( $request );
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php b/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
deleted file mode 100644
index 5c2b7b5c02793a..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Test WP_Font_Collection::__construct().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Collection::__construct
- */
-class Tests_Fonts_WpFontCollection_Construct extends WP_UnitTestCase {
-
-	public function test_should_initialize_data() {
-		$property = new ReflectionProperty( WP_Font_Collection::class, 'config' );
-		$property->setAccessible( true );
-
-		$config          = array(
-			'id'          => 'my-collection',
-			'name'        => 'My Collection',
-			'description' => 'My collection description',
-			'src'         => 'my-collection-data.json',
-		);
-		$font_collection = new WP_Font_Collection( $config );
-
-		$actual = $property->getValue( $font_collection );
-		$property->setAccessible( false );
-
-		$this->assertSame( $config, $actual );
-	}
-
-	/**
-	 * @dataProvider data_should_throw_exception
-	 *
-	 * @param mixed  $config Config of the font collection.
-	 * @param string $expected_exception_message Expected exception message.
-	 */
-	public function test_should_throw_exception( $config, $expected_exception_message ) {
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( $expected_exception_message );
-		new WP_Font_Collection( $config );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_throw_exception() {
-		return array(
-			'no id'                           => array(
-				array(
-					'name'        => 'My Collection',
-					'description' => 'My collection description',
-					'src'         => 'my-collection-data.json',
-				),
-				'Font Collection config ID is required as a non-empty string.',
-			),
-
-			'no config'                       => array(
-				'',
-				'Font Collection config options is required as a non-empty array.',
-			),
-
-			'empty array'                     => array(
-				array(),
-				'Font Collection config options is required as a non-empty array.',
-			),
-
-			'boolean instead of config array' => array(
-				false,
-				'Font Collection config options is required as a non-empty array.',
-			),
-
-			'null instead of config array'    => array(
-				null,
-				'Font Collection config options is required as a non-empty array.',
-			),
-
-			'missing src'                     => array(
-				array(
-					'id'          => 'my-collection',
-					'name'        => 'My Collection',
-					'description' => 'My collection description',
-				),
-				'Font Collection config "src" option is required as a non-empty string.',
-			),
-
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/getData.php b/phpunit/tests/fonts/font-library/wpFontCollection/getData.php
deleted file mode 100644
index 4d0b2eb92b595e..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontCollection/getData.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Test WP_Font_Collection::get_data().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Collection::get_data
- */
-class Tests_Fonts_WpFontCollection_GetData extends WP_UnitTestCase {
-
-	public function set_up() {
-		parent::set_up();
-
-		// Mock the wp_remote_request() function.
-		add_filter( 'pre_http_request', array( $this, 'mock_request' ), 10, 3 );
-	}
-
-	public function tear_down() {
-		// Remove the mock to not affect other tests.
-		remove_filter( 'pre_http_request', array( $this, 'mock_request' ) );
-
-		parent::tear_down();
-	}
-
-	public function mock_request( $preempt, $args, $url ) {
-		// if the URL is not the URL you want to mock, return false.
-		if ( 'https://localhost/fonts/mock-font-collection.json' !== $url ) {
-			return false;
-		}
-
-		// Mock the response body.
-		$mock_collection_data = array(
-			'fontFamilies' => 'mock',
-			'categories'   => 'mock',
-		);
-
-		return array(
-			'body'     => json_encode( $mock_collection_data ),
-			'response' => array(
-				'code' => 200,
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_get_data
-	 *
-	 * @param array $config Font collection config options.
-	 * @param array $expected_data Expected data.
-	 */
-	public function test_should_get_data( $config, $expected_data ) {
-		$collection = new WP_Font_Collection( $config );
-		$this->assertSame( $expected_data, $collection->get_data() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_get_data() {
-		$mock_file = wp_tempnam( 'my-collection-data-' );
-		file_put_contents( $mock_file, '{"this is mock data":true}' );
-
-		return array(
-			'with a file' => array(
-				'config'        => array(
-					'id'          => 'my-collection',
-					'name'        => 'My Collection',
-					'description' => 'My collection description',
-					'src'         => $mock_file,
-				),
-				'expected_data' => array(
-					'id'          => 'my-collection',
-					'name'        => 'My Collection',
-					'description' => 'My collection description',
-					'data'        => array( 'this is mock data' => true ),
-				),
-			),
-			'with a url'  => array(
-				'config'        => array(
-					'id'          => 'my-collection-with-url',
-					'name'        => 'My Collection with URL',
-					'description' => 'My collection description',
-					'src'         => 'https://localhost/fonts/mock-font-collection.json',
-				),
-				'expected_data' => array(
-					'id'          => 'my-collection-with-url',
-					'name'        => 'My Collection with URL',
-					'description' => 'My collection description',
-					'data'        => array(
-						'fontFamilies' => 'mock',
-						'categories'   => 'mock',
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php b/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php
deleted file mode 100644
index 3a1e387c3651b2..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::__construct().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::__construct
- */
-class Tests_Fonts_WpFontFamily_Construct extends WP_UnitTestCase {
-
-	public function test_should_initialize_data() {
-		$property = new ReflectionProperty( WP_Font_Family::class, 'data' );
-		$property->setAccessible( true );
-
-		$font_data   = array(
-			'fontFamily' => 'Piazzolla',
-			'name'       => 'Piazzolla',
-			'slug'       => 'piazzolla',
-		);
-		$font_family = new WP_Font_Family( $font_data );
-
-		$actual = $property->getValue( $font_family );
-		$property->setAccessible( false );
-
-		$this->assertSame( $font_data, $actual );
-	}
-
-	/**
-	 * @dataProvider data_should_throw_exception
-	 *
-	 * @param mixed $font_data Data to test.
-	 */
-	public function test_should_throw_exception( $font_data ) {
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( 'Font family data is missing the slug.' );
-
-		new WP_Font_Family( $font_data );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_throw_exception() {
-		return array(
-			'no slug'                  => array(
-				array(
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-				),
-			),
-			'empty array'              => array( array() ),
-			'boolean instead of array' => array( false ),
-			'null instead of array'    => array( null ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/base.php b/phpunit/tests/fonts/font-library/wpFontFamily/base.php
deleted file mode 100644
index 3650ac7dab9972..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/base.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Test Case for WP_Font_Family tests.
- *
- * @package WordPress
- * @subpackage Font Library
- */
-abstract class WP_Font_Family_UnitTestCase extends WP_UnitTestCase {
-
-	/**
-	 * Fonts directory (in uploads).
-	 *
-	 * @var string
-	 */
-	protected static $fonts_dir;
-
-	/**
-	 * Merriweather test data shared by tests.
-	 *
-	 * @var array
-	 */
-	protected $merriweather = array(
-		'font_data'     => array(),
-		'files_data'    => array(),
-		'font_filename' => '',
-	);
-
-	public static function set_up_before_class() {
-		parent::set_up_before_class();
-
-		static::$fonts_dir = WP_Font_Library::get_fonts_dir();
-		wp_mkdir_p( static::$fonts_dir );
-	}
-
-	public function set_up() {
-		parent::set_up();
-
-		$merriweather_tmp_name = wp_tempnam( 'Merriweather-' );
-		copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $merriweather_tmp_name );
-		$this->merriweather = array(
-			'font_data'     => array(
-				'name'       => 'Merriweather',
-				'slug'       => 'merriweather',
-				'fontFamily' => 'Merriweather',
-				'fontFace'   => array(
-					array(
-						'fontFamily'   => 'Merriweather',
-						'fontStyle'    => 'normal',
-						'fontWeight'   => '400',
-						'uploadedFile' => 'files0',
-					),
-				),
-			),
-			'files_data'    => array(
-				'files0' => array(
-					'name'     => 'merriweather.ttf',
-					'type'     => 'font/ttf',
-					'tmp_name' => $merriweather_tmp_name,
-					'error'    => 0,
-					'size'     => 123,
-				),
-			),
-			'font_filename' => path_join( static::$fonts_dir, 'merriweather_normal_400.ttf' ),
-		);
-	}
-
-	public function tear_down() {
-		// Clean up the /fonts directory.
-		foreach ( $this->files_in_dir( static::$fonts_dir ) as $file ) {
-			@unlink( $file );
-		}
-
-		parent::tear_down();
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/getData.php b/phpunit/tests/fonts/font-library/wpFontFamily/getData.php
deleted file mode 100644
index 2de88ad3aae375..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/getData.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::get_data().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::get_data
- */
-class Tests_Fonts_WpFontLibrary_GetData extends WP_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_get_data
-	 *
-	 * @param array $font_data Font family data in theme.json format.
-	 */
-	public function test_should_get_data( $font_data ) {
-		$font = new WP_Font_Family( $font_data );
-		$this->assertSame( $font_data, $font->get_data() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_get_data() {
-		return array(
-			'with one google font face to be downloaded' => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily'      => 'Piazzolla',
-							'fontStyle'       => 'italic',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						),
-					),
-				),
-			),
-			'with one google font face to not be downloaded' => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						),
-					),
-				),
-			),
-			'without font faces'                         => array(
-				array(
-					'name'       => 'Arial',
-					'slug'       => 'arial',
-					'fontFamily' => 'Arial',
-					'fontFace'   => array(),
-				),
-			),
-			'with local files'                           => array(
-				array(
-					'name'       => 'Inter',
-					'slug'       => 'inter',
-					'fontFamily' => 'Inter',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files0',
-						),
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files1',
-						),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/getDataAsJson.php b/phpunit/tests/fonts/font-library/wpFontFamily/getDataAsJson.php
deleted file mode 100644
index b18b2d0b4f4b38..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/getDataAsJson.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::get_data_as_json().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::get_data_as_json
- */
-class Tests_Fonts_WpFontFamily_GetDataAsJson extends WP_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_get_data_as_json
-	 *
-	 * @param array  $font_data Font family data in theme.json format.
-	 * @param string $expected  Expected result.
-	 */
-	public function test_should_get_data_as_json( $font_data, $expected ) {
-		$font = new WP_Font_Family( $font_data );
-		$this->assertSame( $expected, $font->get_data_as_json() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_get_data_as_json() {
-		return array(
-			'piazzolla'  => array(
-				'font_data' => array(
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'src'        => 'https://example.com/fonts/piazzolla_italic_400.ttf',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-						),
-					),
-				),
-				'expected'  => '{"slug":"piazzolla","fontFamily":"Piazzolla","name":"Piazzolla","fontFace":[{"fontFamily":"Piazzolla","src":"https:\/\/example.com\/fonts\/piazzolla_italic_400.ttf","fontStyle":"italic","fontWeight":"400"}]}',
-			),
-			'piazzolla2' => array(
-				'font_data' => array(
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'src'        => 'https://example.com/fonts/piazzolla_italic_400.ttf',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-						),
-					),
-				),
-				'expected'  => '{"slug":"piazzolla","fontFamily":"Piazzolla","name":"Piazzolla","fontFace":[{"fontFamily":"Piazzolla","src":"https:\/\/example.com\/fonts\/piazzolla_italic_400.ttf","fontStyle":"italic","fontWeight":"400"}]}',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/getFontPost.php b/phpunit/tests/fonts/font-library/wpFontFamily/getFontPost.php
deleted file mode 100644
index eb42cc3ee08986..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/getFontPost.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::get_font_post().
- *
- * @package WordPress
- * @subpackage Font Library
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::get_font_post
- */
-class Tests_Fonts_WpFontFamily_GetFontPost extends WP_Font_Family_UnitTestCase {
-
-	public function test_should_return_post() {
-		// Set up the post.
-		$post    = array(
-			'post_title'   => $this->merriweather['font_data']['name'],
-			'post_name'    => $this->merriweather['font_data']['slug'],
-			'post_type'    => 'wp_font_family',
-			'post_content' => '',
-			'post_status'  => 'publish',
-		);
-		$post_id = wp_insert_post( $post );
-		$font    = new WP_Font_Family( $this->merriweather['font_data'] );
-
-		// Test.
-		$actual = $font->get_font_post();
-		$this->assertInstanceOf( WP_Post::class, $actual, 'Font post should exist' );
-		$this->assertSame( $post_id, $actual->ID, 'Font post ID should match' );
-	}
-
-	public function test_should_return_null_when_post_does_not_exist() {
-		$font = new WP_Font_Family( $this->merriweather['font_data'] );
-
-		$this->assertNull( $font->get_font_post() );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/hasFontFaces.php b/phpunit/tests/fonts/font-library/wpFontFamily/hasFontFaces.php
deleted file mode 100644
index 0c153d62aa79dc..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/hasFontFaces.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::has_font_faces().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::has_font_faces
- */
-class Tests_Fonts_WpFontFamily_HasFontFaces extends WP_UnitTestCase {
-
-	public function test_should_return_true_when_check_succeeds() {
-		$font_data = array(
-			'slug'     => 'piazzolla',
-			'fontFace' => array(
-				array(
-					'fontFamily' => 'Piazzolla',
-					'fontStyle'  => 'italic',
-					'fontWeight' => '400',
-				),
-			),
-		);
-		$font      = new WP_Font_Family( $font_data );
-		$this->assertTrue( $font->has_font_faces() );
-	}
-
-	/**
-	 * @dataProvider data_should_return_false_when_check_fails
-	 *
-	 * @param array $font_data Font family data in theme.json format.
-	 */
-	public function test_should_return_false_when_check_fails( $font_data ) {
-		$font = new WP_Font_Family( $font_data );
-		$this->assertFalse( $font->has_font_faces() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_return_false_when_check_fails() {
-		return array(
-			'wrong fontFace key' => array(
-				array(
-					'slug'      => 'piazzolla',
-					'fontFaces' => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-						),
-					),
-				),
-			),
-			'without font faces' => array(
-				array(
-					'slug' => 'piazzolla',
-				),
-			),
-			'empty array'        => array(
-				array(
-					'slug'     => 'piazzolla',
-					'fontFace' => array(),
-				),
-			),
-			'null'               => array(
-				array(
-					'slug'     => 'piazzolla',
-					'fontFace' => null,
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/install.php b/phpunit/tests/fonts/font-library/wpFontFamily/install.php
deleted file mode 100644
index 79cb6ac3ba2ba4..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/install.php
+++ /dev/null
@@ -1,562 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::install().
- *
- * @package WordPress
- * @subpackage Font Library
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::install
- */
-class Tests_Fonts_WpFontFamily_Install extends WP_Font_Family_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_not_download_when_no_fontface
-	 *
-	 * @param array $font_data Font family data in theme.json format.
-	 */
-	public function test_should_not_download_when_no_fontface( $font_data ) {
-		$font = new WP_Font_Family( $font_data );
-
-		// Test.
-		$font->install();
-		$this->assertEmpty( $this->files_in_dir( static::$fonts_dir ), 'Font directory should be empty' );
-		$this->assertInstanceOf( WP_Post::class, $font->get_font_post(), 'Font post should exist after install' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_not_download_when_no_fontface() {
-		return array(
-			'wrong fontFace key' => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFaces'  => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-						),
-					),
-				),
-			),
-			'without font faces' => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-				),
-			),
-			'empty array'        => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(),
-				),
-			),
-			'null'               => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => null,
-				),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_download_fontfaces
-	 *
-	 * @param array $font_data Font family data in theme.json format.
-	 * @param array $expected  Expected font filename(s).
-	 */
-	public function test_should_download_fontfaces_and_create_post( $font_data, array $expected ) {
-		// Pre-checks to ensure starting conditions.
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileDoesNotExist( $font_file, "Font file [{$font_file}] should not exist in the fonts/ directory after installing" );
-		}
-		$font = new WP_Font_Family( $font_data );
-
-		// Test.
-		$font->install();
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileExists( $font_file, "Font file [{$font_file}] should exists in the fonts/ directory after installing" );
-		}
-		$this->assertInstanceOf( WP_Post::class, $font->get_font_post(), 'Font post should exist after install' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_download_fontfaces() {
-		return array(
-			'1 font face to download'  => array(
-				'font_data' => array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily'      => 'Piazzolla',
-							'fontStyle'       => 'italic',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						),
-					),
-				),
-				'expected'  => array( 'piazzolla_italic_400.ttf' ),
-			),
-			'2 font faces to download' => array(
-				'font_data' => array(
-					'name'       => 'Lato',
-					'slug'       => 'lato',
-					'fontFamily' => 'Lato',
-					'fontFace'   => array(
-						array(
-							'fontFamily'      => 'Lato',
-							'fontStyle'       => 'normal',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/lato/v24/S6uyw4BMUTPHvxk6XweuBCY.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/lato/v24/S6uyw4BMUTPHvxk6XweuBCY.ttf',
-						),
-						array(
-							'fontFamily'      => 'Lato',
-							'fontStyle'       => 'italic',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/lato/v24/S6u8w4BMUTPHjxswWyWrFCbw7A.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/lato/v24/S6u8w4BMUTPHjxswWyWrFCbw7A.ttf',
-						),
-					),
-				),
-				'expected'  => array( 'lato_normal_400.ttf', 'lato_italic_400.ttf' ),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_move_local_fontfaces
-	 *
-	 * @param array $font_data  Font family data in theme.json format.
-	 * @param array $files_data Files data in $_FILES format.
-	 * @param array $expected   Expected font filename(s).
-	 */
-	public function test_should_move_local_fontfaces( $font_data, array $files_data, array $expected ) {
-		// Set up the temporary files.
-		foreach ( $files_data as $file ) {
-			if ( 'font/ttf' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-			} elseif ( 'font/woff' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/cooper-hewitt.woff', $file['tmp_name'] );
-			} elseif ( 'font/woff2' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/DMSans.woff2', $file['tmp_name'] );
-			} elseif ( 'application/vnd.ms-opentype' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/gilbert-color.otf', $file['tmp_name'] );
-			}
-		}
-
-		$font = new WP_Font_Family( $font_data );
-		$font->install( $files_data );
-
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileExists( $font_file, "Font file [{$font_file}] should exists in the fonts/ directory after installing" );
-		}
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_move_local_fontfaces() {
-		return array(
-			// ttf font type.
-			'1 local font'     => array(
-				'font_data'  => array(
-					'name'       => 'Inter',
-					'slug'       => 'inter',
-					'fontFamily' => 'Inter',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'inter1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Inter-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'inter_italic_900.ttf' ),
-			),
-			'2 local fonts'    => array(
-				'font_data'  => array(
-					'name'       => 'Lato',
-					'slug'       => 'lato',
-					'fontFamily' => 'Lato',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files1',
-						),
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files2',
-						),
-					),
-				),
-				'files_data' => array(
-					'files1' => array(
-						'name'     => 'lato1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files2' => array(
-						'name'     => 'lato2.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'lato_normal_400.ttf', 'lato_normal_500.ttf' ),
-			),
-			// woff font type.
-			'woff local font'  => array(
-				'font_data'  => array(
-					'name'       => 'Cooper Hewitt',
-					'slug'       => 'cooper-hewitt',
-					'fontFamily' => 'Cooper Hewitt',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Cooper Hewitt',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'cooper-hewitt.woff',
-						'type'     => 'font/woff',
-						'tmp_name' => wp_tempnam( 'Cooper-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'cooper-hewitt_italic_900.woff' ),
-			),
-			// woff2 font type.
-			'woff2 local font' => array(
-				'font_data'  => array(
-					'name'       => 'DM Sans',
-					'slug'       => 'dm-sans',
-					'fontFamily' => 'DM Sans',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'DM Sans',
-							'fontStyle'    => 'regular',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'DMSans.woff2',
-						'type'     => 'font/woff2',
-						'tmp_name' => wp_tempnam( 'DMSans-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'dm-sans_regular_500.woff2' ),
-			),
-			// otf font type.
-			'otf local font'   => array(
-				'font_data'  => array(
-					'name'       => 'Gilbert Color',
-					'slug'       => 'gilbert-color',
-					'fontFamily' => 'Gilbert Color',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Gilbert Color',
-							'fontStyle'    => 'regular',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'gilbert-color.otf',
-						'type'     => 'application/vnd.ms-opentype',
-						'tmp_name' => wp_tempnam( 'Gilbert-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'gilbert-color_regular_500.otf' ),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_not_install_duplicate_fontfaces
-	 *
-	 * @param array $font_data  Font family data in theme.json format.
-	 * @param array $files_data Files data in $_FILES format.
-	 * @param array $expected   Expected font filename(s).
-	 */
-	public function test_should_not_install_duplicate_fontfaces( $font_data, array $files_data, array $expected ) {
-		// Set up the temporary files.
-		foreach ( $files_data as $file ) {
-			copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-		}
-
-		$font = new WP_Font_Family( $font_data );
-		$font->install( $files_data );
-
-		$this->assertCount( count( $expected ), $this->files_in_dir( static::$fonts_dir ), 'Font directory should contain the same number of files as expected' );
-
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileExists( $font_file, "Font file [{$font_file}] should exists in the fonts/ directory after installing" );
-		}
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_not_install_duplicate_fontfaces() {
-		return array(
-			'single unique font face'    => array(
-				'font_data'  => array(
-					'name'       => 'Inter',
-					'slug'       => 'inter',
-					'fontFamily' => 'Inter',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files0',
-						),
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files1',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'inter1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Inter-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files1' => array(
-						'name'     => 'inter1.woff',
-						'type'     => 'font/woff',
-						'tmp_name' => wp_tempnam( 'Inter-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'inter_italic_900.ttf' ),
-			),
-			'multiple unique font faces' => array(
-				'font_data'  => array(
-					'name'       => 'Lato',
-					'slug'       => 'lato',
-					'fontFamily' => 'Lato',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files0',
-						),
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files1',
-						),
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files2',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'lato1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files1' => array(
-						'name'     => 'lato2.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files2' => array(
-						'name'     => 'lato2.woff',
-						'type'     => 'font/woff',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'lato_normal_400.ttf', 'lato_normal_500.ttf' ),
-			),
-		);
-	}
-
-	public function test_should_overwrite_fontface_with_different_extension() {
-		$font_data_initial    = array(
-			'name'       => 'Inter',
-			'slug'       => 'inter',
-			'fontFamily' => 'Inter',
-			'fontFace'   => array(
-				array(
-					'fontFamily'   => 'Inter',
-					'fontStyle'    => 'italic',
-					'fontWeight'   => '500',
-					'uploadedFile' => 'files0',
-				),
-				array(
-					'fontFamily'   => 'Inter',
-					'fontStyle'    => 'italic',
-					'fontWeight'   => '900',
-					'uploadedFile' => 'files1',
-				),
-			),
-		);
-		$files_data_initial   = array(
-			'files0' => array(
-				'name'     => 'inter1.ttf',
-				'type'     => 'font/woff',
-				'tmp_name' => wp_tempnam( 'Inter-' ),
-				'error'    => 0,
-				'size'     => 123,
-			),
-			'files1' => array(
-				'name'     => 'inter1.woff',
-				'type'     => 'font/woff',
-				'tmp_name' => wp_tempnam( 'Inter-' ),
-				'error'    => 0,
-				'size'     => 123,
-			),
-		);
-		$font_data_overwrite  = array(
-			'name'       => 'Inter',
-			'slug'       => 'inter',
-			'fontFamily' => 'Inter',
-			'fontFace'   => array(
-				array(
-					'fontFamily'   => 'Inter',
-					'fontStyle'    => 'italic',
-					'fontWeight'   => '500',
-					'uploadedFile' => 'files0',
-				),
-				array(
-					'fontFamily'   => 'Inter',
-					'fontStyle'    => 'italic',
-					'fontWeight'   => '900',
-					'uploadedFile' => 'files1',
-				),
-			),
-		);
-		$files_data_overwrite = array(
-			'files0' => array(
-				'name'     => 'inter1.woff',
-				'type'     => 'font/woff',
-				'tmp_name' => wp_tempnam( 'Inter-' ),
-				'error'    => 0,
-				'size'     => 123,
-			),
-			'files1' => array(
-				'name'     => 'inter1.ttf',
-				'type'     => 'font/ttf',
-				'tmp_name' => wp_tempnam( 'Inter-' ),
-				'error'    => 0,
-				'size'     => 123,
-			),
-		);
-
-		$expected = array( 'inter_italic_500.woff', 'inter_italic_900.ttf' );
-
-		// Set up the temporary files.
-		foreach ( $files_data_initial as $file ) {
-			if ( 'font/ttf' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-			} elseif ( 'font/woff' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/cooper-hewitt.woff', $file['tmp_name'] );
-			}
-		}
-		foreach ( $files_data_overwrite as $file ) {
-			if ( 'font/ttf' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-			} elseif ( 'font/woff' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/cooper-hewitt.woff', $file['tmp_name'] );
-			}
-		}
-
-		$font = new WP_Font_Family( $font_data_initial );
-		$font->install( $files_data_initial );
-
-		$font = new WP_Font_Family( $font_data_overwrite );
-		$font->install( $files_data_overwrite );
-
-		$this->assertCount( count( $expected ), $this->files_in_dir( static::$fonts_dir ), 'Font directory should contain the same number of files as expected' );
-
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileExists( $font_file, "Font file [{$font_file}] should exists in the fonts/ directory after installing" );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/uninstall.php b/phpunit/tests/fonts/font-library/wpFontFamily/uninstall.php
deleted file mode 100644
index c878dd00fdb5ca..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/uninstall.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::uninstall().
- *
- * @package WordPress
- * @subpackage Font Library
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::uninstall
- */
-class Tests_Fonts_WpFontFamily_Uninstall extends WP_Font_Family_UnitTestCase {
-
-	public function test_should_return_error_when_font_not_found() {
-		// Set up.
-		$font = new WP_Font_Family( $this->merriweather['font_data'] );
-
-		// Test.
-		$actual = $font->uninstall();
-		$this->assertWPError( $actual, 'WP_Error should have been returned' );
-		$this->assertSame(
-			array( 'font_family_not_found' => array( 'The font family could not be found.' ) ),
-			$actual->errors,
-			'WP_Error should have "fonts_must_have_same_slug" error'
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_return_error_when_not_able_to_uninstall
-	 *
-	 * @param string $failure_to_mock The filter name to mock the failure.
-	 */
-	public function test_should_return_error_when_not_able_to_uninstall( $failure_to_mock ) {
-		// Set up the font.
-		add_filter( $failure_to_mock, '__return_empty_string' );
-		$font = new WP_Font_Family( $this->merriweather['font_data'] );
-		$font->install( $this->merriweather['files_data'] );
-
-		// Test.
-		$actual = $font->uninstall();
-		$this->assertWPError( $actual, 'WP_Error should be returned' );
-		$this->assertSame(
-			array( 'font_family_not_deleted' => array( 'The font family could not be deleted.' ) ),
-			$actual->errors,
-			'WP_Error should have "font_family_not_deleted" error'
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return string[][]
-	 */
-	public function data_should_return_error_when_not_able_to_uninstall() {
-		return array(
-			'When delete file fails' => array( 'wp_delete_file' ),
-			'when delete post fails' => array( 'pre_delete_post' ),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_uninstall
-	 *
-	 * @param array $font_data  Font family data in theme.json format.
-	 * @param array $files_data Files data in $_FILES format.
-	 */
-	public function test_should_uninstall( $font_data, array $files_data ) {
-		// Set up.
-		foreach ( $files_data as $file ) {
-			copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-		}
-		$font = new WP_Font_Family( $font_data );
-		$font->install( $files_data );
-
-		// Pre-checks to ensure the starting point is as expected.
-		$this->assertInstanceOf( WP_Post::class, $font->get_font_post(), 'Font post should exist' );
-		$this->assertNotEmpty( $this->files_in_dir( static::$fonts_dir ), 'Fonts should be installed' );
-
-		// Uninstall.
-		$this->assertTrue( $font->uninstall() );
-
-		// Test the post and font file(s) were uninstalled.
-		$this->assertNull( $font->get_font_post(), 'Font post should be deleted after uninstall' );
-		$this->assertEmpty( $this->files_in_dir( static::$fonts_dir ), 'Fonts should be uninstalled' );
-	}
-
-	/**
-	 * @dataProvider data_should_uninstall
-	 *
-	 * @param array $font_data          Font family data in theme.json format.
-	 * @param array $files_data         Files data in $_FILES format.
-	 * @param array $files_to_uninstall Files to uninstall.
-	 */
-	public function test_should_uninstall_only_its_font_family( $font_data, array $files_data, array $files_to_uninstall ) {
-		// Set up a different font family instance. This font family should not be uninstalled.
-		$merriweather = new WP_Font_Family( $this->merriweather['font_data'] );
-		$merriweather->install( $this->merriweather['files_data'] );
-
-		// Set up the font family to be uninstalled.
-		foreach ( $files_data as $file ) {
-			copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-		}
-		$font = new WP_Font_Family( $font_data );
-		$font->install( $files_data );
-
-		$this->assertTrue( $font->uninstall() );
-
-		// Check that the files were uninstalled.
-		foreach ( $files_to_uninstall as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileDoesNotExist( $font_file, "Font file [{$font_file}] should not exists in the uploads/fonts/ directory after uninstalling" );
-		}
-		// Check that the Merriweather file was not uninstalled.
-		$this->assertFileExists( $this->merriweather['font_filename'], 'The other font family [Merriweather] should not have been uninstalled.' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_uninstall() {
-		return array(
-			'1 local font'  => array(
-				'font_data'          => array(
-					'name'       => 'Inter',
-					'slug'       => 'inter',
-					'fontFamily' => 'Inter',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data'         => array(
-					'files0' => array(
-						'name'     => 'inter1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Inter-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'files_to_uninstall' => array( 'inter_italic_900.ttf' ),
-			),
-			'2 local fonts' => array(
-				'font_data'          => array(
-					'name'       => 'Lato',
-					'slug'       => 'lato',
-					'fontFamily' => 'Lato',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files1',
-						),
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files2',
-						),
-					),
-				),
-				'files_data'         => array(
-					'files1' => array(
-						'name'     => 'lato1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files2' => array(
-						'name'     => 'lato2.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'files_to_uninstall' => array( 'lato_normal_400.ttf', 'lato_normal_500.ttf' ),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/formatFontFamily.php b/phpunit/tests/fonts/font-library/wpFontFamilyUtils/formatFontFamily.php
deleted file mode 100644
index 4f247c5219febb..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/formatFontFamily.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family_Utils::format_font_family().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family_Utils::format_font_family
- */
-class Tests_Fonts_WpFontsFamilyUtils_FormatFontFamily extends WP_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_format_font_family
-	 *
-	 * @param string $font_family   Font family.
-	 * @param string $expected      Expected family.
-	 */
-	public function test_should_format_font_family( $font_family, $expected ) {
-		$this->assertSame(
-			$expected,
-			WP_Font_Family_Utils::format_font_family(
-				$font_family
-			)
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_format_font_family() {
-		return array(
-			'data_families_with_spaces_and_numbers' => array(
-				'font_family' => 'Rock 3D , Open Sans,serif',
-				'expected'    => "'Rock 3D', 'Open Sans', serif",
-			),
-			'data_single_font_family'               => array(
-				'font_family' => 'Rock 3D',
-				'expected'    => "'Rock 3D'",
-			),
-			'data_no_spaces'                        => array(
-				'font_family' => 'Rock3D',
-				'expected'    => 'Rock3D',
-			),
-			'data_many_spaces_and_existing_quotes'  => array(
-				'font_family' => 'Rock 3D serif, serif,sans-serif, "Open Sans"',
-				'expected'    => "'Rock 3D serif', serif, sans-serif, \"Open Sans\"",
-			),
-			'data_empty_family'                     => array(
-				'font_family' => ' ',
-				'expected'    => '',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/getFilenameFromFontFace.php b/phpunit/tests/fonts/font-library/wpFontFamilyUtils/getFilenameFromFontFace.php
deleted file mode 100644
index 0bd5b47ea23785..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/getFilenameFromFontFace.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family_Utils::get_filename_from_font_face().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family_Utils::get_filename_from_font_face
- */
-class Tests_Fonts_WpFontsFamilyUtils_GetFilenameFromFontFace extends WP_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_get_filename
-	 *
-	 * @param string $slug      Font slug.
-	 * @param array  $font_face Font face data in theme.json format.
-	 * @param string $suffix    Suffix added to the resulting filename.
-	 * @param string $expected  Expected filename.
-	 */
-	public function test_should_get_filename( $slug, $font_face, $suffix, $expected ) {
-		$this->assertSame(
-			$expected,
-			WP_Font_Family_Utils::get_filename_from_font_face(
-				$slug,
-				$font_face,
-				$font_face['src'],
-				$suffix
-			)
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_get_filename() {
-		return array(
-			'piazzolla' => array(
-				'slug'               => 'piazzolla',
-				'font_face'          => array(
-					'fontStyle'  => 'italic',
-					'fontWeight' => '400',
-					'src'        => 'http://example.com/fonts/font_file.ttf',
-				),
-				'suffix'             => '',
-				'expected_file_name' => 'piazzolla_italic_400.ttf',
-			),
-			'inter'     => array(
-				'slug'               => 'inter',
-				'font_face'          => array(
-					'fontStyle'  => 'normal',
-					'fontWeight' => '600',
-					'src'        => 'http://example.com/fonts/font_file.otf',
-				),
-				'suffix'             => '',
-				'expected_file_name' => 'inter_normal_600.otf',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/hasFontMimeType.php b/phpunit/tests/fonts/font-library/wpFontFamilyUtils/hasFontMimeType.php
deleted file mode 100644
index e30c199612b8a9..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/hasFontMimeType.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family_Utils::has_font_mime_type().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family_Utils::has_font_mime_type
- */
-class Tests_Fonts_WpFontsFamilyUtils_HasFontMimeType extends WP_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_succeed_when_has_mime_type
-	 *
-	 * @param string $font_file Font file path.
-	 */
-	public function test_should_succeed_when_has_mime_type( $font_file ) {
-		$this->assertTrue( WP_Font_Family_Utils::has_font_mime_type( $font_file ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_succeed_when_has_mime_type() {
-		return array(
-			'ttf'   => array( '/temp/piazzolla_400_italic.ttf' ),
-			'otf'   => array( '/temp/piazzolla_400_italic.otf' ),
-			'woff'  => array( '/temp/piazzolla_400_italic.woff' ),
-			'woff2' => array( '/temp/piazzolla_400_italic.woff2' ),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_fail_when_mime_not_supported
-	 *
-	 * @param string $font_file Font file path.
-	 */
-	public function test_should_fail_when_mime_not_supported( $font_file ) {
-		$this->assertFalse( WP_Font_Family_Utils::has_font_mime_type( $font_file ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_fail_when_mime_not_supported() {
-		return array(
-			'exe' => array( '/temp/test.exe' ),
-			'md'  => array( '/temp/license.md' ),
-			'php' => array( '/temp/test.php' ),
-			'txt' => array( '/temp/test.txt' ),
-			'zip' => array( '/temp/lato.zip' ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/mergeFontsData.php b/phpunit/tests/fonts/font-library/wpFontFamilyUtils/mergeFontsData.php
deleted file mode 100644
index 21517a0970f932..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/mergeFontsData.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family_Utils::merge_fonts_data().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family_Utils::merge_fonts_data
- */
-class Tests_Fonts_WpFontsFamilyUtils_MergeFontsData extends WP_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_fail_merge
-	 *
-	 * @param array $font1 First font data in theme.json format.
-	 * @param array $font2 Second font data in theme.json format.
-	 */
-	public function test_should_fail_merge( $font1, $font2 ) {
-		$actual = WP_Font_Family_Utils::merge_fonts_data( $font1, $font2 );
-
-		$this->assertWPError( $actual, 'WP_Error should have been returned' );
-		$this->assertSame(
-			array( 'fonts_must_have_same_slug' => array( 'Fonts must have the same slug to be merged.' ) ),
-			$actual->errors,
-			'WP_Error should have "fonts_must_have_same_slug" error'
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_fail_merge() {
-		return array(
-			'different slugs' => array(
-				'font1'           => array(
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://example.com/fonts/piazzolla_400_italic.ttf',
-						),
-					),
-				),
-				'font2'           => array(
-					'slug'       => 'inter',
-					'fontFamily' => 'Inter',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Inter',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '700',
-							'src'        => 'http://example.com/fonts/inter_700_normal.ttf',
-						),
-					),
-				),
-				'expected_result' => 'WP_Error',
-			),
-		);
-	}
-
-
-	/**
-	 * @dataProvider data_should_merge
-	 *
-	 * @param array $font1           First font data in theme.json format.
-	 * @param array $font2           Second font data in theme.json format.
-	 * @param array $expected_result Expected result.
-	 */
-	public function test_should_merge( array $font1, array $font2, array $expected_result ) {
-		$result = WP_Font_Family_Utils::merge_fonts_data( $font1, $font2 );
-		$this->assertSame( $expected_result, $result, 'Merged font data should match expected result.' );
-		$json_result = wp_json_encode( $result );
-		$this->assertStringContainsString( '"fontFace":[', $json_result, 'fontFace data should be enconded as an array and not an object.' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_merge() {
-		return array(
-			'with different font faces' => array(
-				'font1'           => array(
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://example.com/fonts/piazzolla_400_italic.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '500',
-							'src'        => 'http://example.com/fonts/piazzolla_500_italic.ttf',
-						),
-					),
-				),
-				'font2'           => array(
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '600',
-							'src'        => 'http://example.com/fonts/piazzolla_600_normal.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '700',
-							'src'        => 'http://example.com/fonts/piazzolla_700_normal.ttf',
-						),
-					),
-				),
-				'expected_result' => array(
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://example.com/fonts/piazzolla_400_italic.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '500',
-							'src'        => 'http://example.com/fonts/piazzolla_500_italic.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '600',
-							'src'        => 'http://example.com/fonts/piazzolla_600_normal.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '700',
-							'src'        => 'http://example.com/fonts/piazzolla_700_normal.ttf',
-						),
-					),
-				),
-			),
-
-			'repeated font faces'       => array(
-				'font1'           => array(
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://example.com/fonts/piazzolla_400_italic.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '500',
-							'src'        => 'http://example.com/fonts/piazzolla_500_italic.ttf',
-						),
-					),
-				),
-				'font2'           => array(
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '600',
-							'src'        => 'http://example.com/fonts/piazzolla_600_normal.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://example.com/fonts/piazzolla_400_italic.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '500',
-							'src'        => 'http://example.com/fonts/piazzolla_500_italic.ttf',
-						),
-					),
-				),
-				'expected_result' => array(
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://example.com/fonts/piazzolla_400_italic.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '500',
-							'src'        => 'http://example.com/fonts/piazzolla_500_italic.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '600',
-							'src'        => 'http://example.com/fonts/piazzolla_600_normal.ttf',
-						),
-					),
-				),
-			),
-			'repeated font faces with non consecutive index positions' => array(
-				'font1'           => array(
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://example.com/fonts/piazzolla_400_italic.ttf',
-						),
-
-					),
-				),
-				'font2'           => array(
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '600',
-							'src'        => 'http://example.com/fonts/piazzolla_600_normal.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://example.com/fonts/piazzolla_400_italic.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '500',
-							'src'        => 'http://example.com/fonts/piazzolla_500_italic.ttf',
-						),
-					),
-				),
-				'expected_result' => array(
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://example.com/fonts/piazzolla_400_italic.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '600',
-							'src'        => 'http://example.com/fonts/piazzolla_600_normal.ttf',
-						),
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '500',
-							'src'        => 'http://example.com/fonts/piazzolla_500_italic.ttf',
-						),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
deleted file mode 100644
index bfdb7258fa11aa..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Test WP_Font_Library::get_font_collections().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Library::get_font_collection
- */
-class Tests_Fonts_WpFontLibrary_GetFontCollection extends WP_UnitTestCase {
-
-	public static function set_up_before_class() {
-		$my_font_collection_config = array(
-			'id'          => 'my-font-collection',
-			'name'        => 'My Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => path_join( __DIR__, 'my-font-collection-data.json' ),
-		);
-
-		wp_register_font_collection( $my_font_collection_config );
-	}
-
-	public function test_should_get_font_collection() {
-		$font_collection = WP_Font_Library::get_font_collection( 'my-font-collection' );
-		$this->assertInstanceOf( 'WP_Font_Collection', $font_collection );
-	}
-
-	public function test_should_get_no_font_collection_if_the_id_is_not_registered() {
-		$font_collection = WP_Font_Library::get_font_collection( 'not-registered-font-collection' );
-		$this->assertWPError( $font_collection );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
deleted file mode 100644
index 97e66e64e87161..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Test WP_Font_Library::get_font_collections().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Library::get_font_collections
- */
-class Tests_Fonts_WpFontLibrary_GetFontCollections extends WP_UnitTestCase {
-
-	public static function set_up_before_class() {
-		$font_library = new WP_Font_Library();
-
-		$my_font_collection_config = array(
-			'id'          => 'my-font-collection',
-			'name'        => 'My Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => path_join( __DIR__, 'my-font-collection-data.json' ),
-		);
-
-		$font_library::register_font_collection( $my_font_collection_config );
-	}
-
-	public function test_should_get_the_default_font_collection() {
-		$font_collections = WP_Font_Library::get_font_collections();
-		$this->assertArrayHasKey( 'default-font-collection', $font_collections, 'Default Google Fonts collection should be registered' );
-		$this->assertInstanceOf( 'WP_Font_Collection', $font_collections['default-font-collection'], 'The value of the array $font_collections[id] should be an instance of WP_Font_Collection class.' );
-	}
-
-	public function test_should_get_the_right_number_of_collections() {
-		$font_collections = WP_Font_Library::get_font_collections();
-		$this->assertNotEmpty( $font_collections, 'Sould return an array of font collections.' );
-		$this->assertCount( 2, $font_collections, 'Should return an array with one font collection.' );
-	}
-
-	public function test_should_get_mock_font_collection() {
-		$font_collections = WP_Font_Library::get_font_collections();
-		$this->assertArrayHasKey( 'my-font-collection', $font_collections, 'The array should have the key of the registered font collection id.' );
-		$this->assertInstanceOf( 'WP_Font_Collection', $font_collections['my-font-collection'], 'The value of the array $font_collections[id] should be an instance of WP_Font_Collection class.' );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php
deleted file mode 100644
index 4bbafc55a2147c..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Test WP_Font_Library::get_fonts_dir().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Library::get_fonts_dir
- */
-class Tests_Fonts_WpFontLibrary_GetFontsDir extends WP_UnitTestCase {
-
-	public function test_get_fonts_dir() {
-		$this->assertStringEndsWith( '/wp-content/fonts', WP_Font_Library::get_fonts_dir() );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getMimeTypes.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getMimeTypes.php
deleted file mode 100644
index 708134af69e92a..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getMimeTypes.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family_Utils::get_expected_font_mime_types_per_php_version().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family_Utils::get_expected_font_mime_types_per_php_version
- */
-class Tests_Fonts_WpFontsFamilyUtils_GetMimeTypes extends WP_UnitTestCase {
-
-	/**
-	 *
-	 * @dataProvider data_should_supply_correct_mime_type_for_php_version
-	 *
-	 * @param array $php_version_id PHP_VERSION_ID value.
-	 * @param array $expected Expected mime types.
-	 */
-	public function test_should_supply_correct_mime_type_for_php_version( $php_version_id, $expected ) {
-		$mimes = WP_Font_Library::get_expected_font_mime_types_per_php_version( $php_version_id );
-		$this->assertEquals( $mimes, $expected );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_supply_correct_mime_type_for_php_version() {
-		return array(
-			'version 7.2' => array(
-				'php_version_id' => 70200,
-				'expected'       => array(
-					'otf'   => 'application/vnd.ms-opentype',
-					'ttf'   => 'application/x-font-ttf',
-					'woff'  => 'application/font-woff',
-					'woff2' => 'application/font-woff2',
-				),
-			),
-			'version 7.3' => array(
-				'php_version_id' => 70300,
-				'expected'       => array(
-					'otf'   => 'application/vnd.ms-opentype',
-					'ttf'   => 'application/font-sfnt',
-					'woff'  => 'application/font-woff',
-					'woff2' => 'application/font-woff2',
-				),
-			),
-			'version 7.4' => array(
-				'php_version_id' => 70400,
-				'expected'       => array(
-					'otf'   => 'application/vnd.ms-opentype',
-					'ttf'   => 'font/sfnt',
-					'woff'  => 'application/font-woff',
-					'woff2' => 'application/font-woff2',
-				),
-			),
-			'version 8.0' => array(
-				'php_version_id' => 80000,
-				'expected'       => array(
-					'otf'   => 'application/vnd.ms-opentype',
-					'ttf'   => 'font/sfnt',
-					'woff'  => 'application/font-woff',
-					'woff2' => 'application/font-woff2',
-				),
-			),
-			'version 8.1' => array(
-				'php_version_id' => 80100,
-				'expected'       => array(
-					'otf'   => 'application/vnd.ms-opentype',
-					'ttf'   => 'font/sfnt',
-					'woff'  => 'font/woff',
-					'woff2' => 'font/woff2',
-				),
-			),
-			'version 8.2' => array(
-				'php_version_id' => 80200,
-				'expected'       => array(
-					'otf'   => 'application/vnd.ms-opentype',
-					'ttf'   => 'font/sfnt',
-					'woff'  => 'font/woff',
-					'woff2' => 'font/woff2',
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php b/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
deleted file mode 100644
index 6bc5fbb8161cee..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Test WP_Font_Library::register_font_collection().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Library::register_font_collection
- */
-class Tests_Fonts_WpFontLibrary_RegisterFontCollection extends WP_UnitTestCase {
-
-	public function test_should_register_font_collection() {
-		$config     = array(
-			'id'          => 'my-collection',
-			'name'        => 'My Collection',
-			'description' => 'My Collection Description',
-			'src'         => 'my-collection-data.json',
-		);
-		$collection = WP_Font_Library::register_font_collection( $config );
-		$this->assertInstanceOf( 'WP_Font_Collection', $collection );
-	}
-
-	public function test_should_return_error_if_id_is_missing() {
-		$config = array(
-			'name'        => 'My Collection',
-			'description' => 'My Collection Description',
-			'src'         => 'my-collection-data.json',
-		);
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( 'Font Collection config ID is required as a non-empty string.' );
-		WP_Font_Library::register_font_collection( $config );
-	}
-
-	public function test_should_return_error_if_name_is_missing() {
-		$config = array(
-			'id'          => 'my-collection',
-			'description' => 'My Collection Description',
-			'src'         => 'my-collection-data.json',
-		);
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( 'Font Collection config name is required as a non-empty string.' );
-		WP_Font_Library::register_font_collection( $config );
-	}
-
-	public function test_should_return_error_if_config_is_empty() {
-		$config = array();
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( 'Font Collection config options is required as a non-empty array.' );
-		WP_Font_Library::register_font_collection( $config );
-	}
-
-	public function test_should_return_error_if_id_is_repeated() {
-		$config1 = array(
-			'id'          => 'my-collection-1',
-			'name'        => 'My Collection 1',
-			'description' => 'My Collection 1 Description',
-			'src'         => 'my-collection-1-data.json',
-		);
-		$config2 = array(
-			'id'          => 'my-collection-1',
-			'name'        => 'My Collection 2',
-			'description' => 'My Collection 2 Description',
-			'src'         => 'my-collection-2-data.json',
-		);
-
-		// Register first collection.
-		$collection1 = WP_Font_Library::register_font_collection( $config1 );
-		$this->assertInstanceOf( 'WP_Font_Collection', $collection1, 'A collection should be registered.' );
-
-		// Try to register a second collection with same id.
-		$collection2 = WP_Font_Library::register_font_collection( $config2 );
-		$this->assertWPError( $collection2, 'Second collection with the same id should fail.' );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php b/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
deleted file mode 100644
index daa4c84aad9004..00000000000000
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Test WP_Font_Library::set_upload_dir().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Library::set_upload_dir
- */
-class Tests_Fonts_WpFontLibrary_SetUploadDir extends WP_UnitTestCase {
-
-	public function test_should_set_fonts_upload_dir() {
-		$defaults = array(
-			'subdir'  => '/abc',
-			'basedir' => '/any/path',
-			'baseurl' => 'http://example.com/an/arbitrary/url',
-			'path'    => '/any/path/abc',
-			'url'     => 'http://example.com/an/arbitrary/url/abc',
-		);
-		$expected = array(
-			'subdir'  => '/fonts',
-			'basedir' => WP_CONTENT_DIR,
-			'baseurl' => content_url(),
-			'path'    => path_join( WP_CONTENT_DIR, 'fonts' ),
-			'url'     => content_url() . '/fonts',
-		);
-		$this->assertSame( $expected, WP_Font_Library::set_upload_dir( $defaults ) );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/base.php b/phpunit/tests/fonts/font-library/wpRestFontLibraryController/base.php
deleted file mode 100644
index a6b02f38a5e817..00000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/base.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Test Case for WP_REST_Font_Library_Controller tests.
- *
- * @package WordPress
- * @subpackage Font Library
- */
-abstract class WP_REST_Font_Library_Controller_UnitTestCase extends WP_UnitTestCase {
-
-	/**
-	 * Fonts directory.
-	 *
-	 * @var string
-	 */
-	protected static $fonts_dir;
-
-
-	public function set_up() {
-		parent::set_up();
-
-		static::$fonts_dir = WP_Font_Library::get_fonts_dir();
-
-		// Create a user with administrator role.
-		$admin_id = $this->factory->user->create(
-			array(
-				'role' => 'administrator',
-			)
-		);
-		wp_set_current_user( $admin_id );
-	}
-
-	/**
-	 * Tear down each test method.
-	 */
-	public function tear_down() {
-		parent::tear_down();
-
-		// Reset $collections static property of WP_Font_Library class.
-		$reflection = new ReflectionClass( 'WP_Font_Library' );
-		$property   = $reflection->getProperty( 'collections' );
-		$property->setAccessible( true );
-		$property->setValue( null, array() );
-
-		// Clean up the /fonts directory.
-		foreach ( $this->files_in_dir( static::$fonts_dir ) as $file ) {
-			@unlink( $file );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/getFontCollection.php b/phpunit/tests/fonts/font-library/wpRestFontLibraryController/getFontCollection.php
deleted file mode 100644
index f1a0a6a0cd510c..00000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/getFontCollection.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Library_Controller::get_font_collection().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Library_Controller::get_font_collection
- */
-
-class Tests_Fonts_WPRESTFontLibraryController_GetFontCollection extends WP_REST_Font_Library_Controller_UnitTestCase {
-
-	/**
-	 * Register mock collections.
-	 */
-	public function set_up() {
-		parent::set_up();
-		// Mock font collection data file.
-		$mock_file = wp_tempnam( 'one-collection-' );
-		file_put_contents( $mock_file, '{"this is mock data":true}' );
-		// Mock the wp_remote_request() function.
-		add_filter( 'pre_http_request', array( $this, 'mock_request' ), 10, 3 );
-
-		$config_with_file = array(
-			'id'          => 'one-collection',
-			'name'        => 'One Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => $mock_file,
-		);
-		wp_register_font_collection( $config_with_file );
-
-		$config_with_url = array(
-			'id'          => 'collection-with-url',
-			'name'        => 'Another Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => 'https://wordpress.org/fonts/mock-font-collection.json',
-		);
-
-		wp_register_font_collection( $config_with_url );
-
-		$config_with_non_existing_file = array(
-			'id'          => 'collection-with-non-existing-file',
-			'name'        => 'Another Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => '/home/non-existing-file.json',
-		);
-
-		wp_register_font_collection( $config_with_non_existing_file );
-
-		$config_with_non_existing_url = array(
-			'id'          => 'collection-with-non-existing-url',
-			'name'        => 'Another Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => 'https://non-existing-url-1234x.com.ar/fake-path/missing-file.json',
-		);
-
-		wp_register_font_collection( $config_with_non_existing_url );
-	}
-
-	public function mock_request( $preempt, $args, $url ) {
-		// Check if it's the URL you want to mock.
-		if ( 'https://wordpress.org/fonts/mock-font-collection.json' === $url ) {
-
-			// Mock the response body.
-			$mock_collection_data = array(
-				'fontFamilies' => 'mock',
-				'categories'   => 'mock',
-			);
-
-			return array(
-				'body'     => json_encode( $mock_collection_data ),
-				'response' => array(
-					'code' => 200,
-				),
-			);
-		}
-
-		// For any other URL, return false which ensures the request is made as usual (or you can return other mock data).
-		return false;
-	}
-
-	public function tear_down() {
-		// Remove the mock to not affect other tests.
-		remove_filter( 'pre_http_request', array( $this, 'mock_request' ) );
-
-		parent::tear_down();
-	}
-
-	public function test_get_font_collection_from_file() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/fonts/collections/one-collection' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-		$this->assertArrayHasKey( 'data', $data, 'The response data does not have the key with the file data.' );
-		$this->assertSame( array( 'this is mock data' => true ), $data['data'], 'The response data does not have the expected file data.' );
-	}
-
-	public function test_get_font_collection_from_url() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/fonts/collections/collection-with-url' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-		$this->assertArrayHasKey( 'data', $data, 'The response data does not have the key with the file data.' );
-	}
-
-	public function test_get_non_existing_collection_should_return_404() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/fonts/collections/non-existing-collection-id' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 404, $response->get_status() );
-	}
-
-	public function test_get_non_existing_file_should_return_500() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/fonts/collections/collection-with-non-existing-file' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 500, $response->get_status() );
-	}
-
-	public function test_get_non_existing_url_should_return_500() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/fonts/collections/collection-with-non-existing-url' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 500, $response->get_status() );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/getFontCollections.php b/phpunit/tests/fonts/font-library/wpRestFontLibraryController/getFontCollections.php
deleted file mode 100644
index ad120ee36fce4d..00000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/getFontCollections.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Library_Controller::get_font_collections().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Library_Controller::get_font_collections
- */
-
-class Tests_Fonts_WPRESTFontLibraryController_GetFontCollections extends WP_REST_Font_Library_Controller_UnitTestCase {
-
-	public function test_get_font_collections_with_no_collection_registered() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/fonts/collections' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 200, $response->get_status() );
-		$this->assertSame( array(), $response->get_data() );
-	}
-
-	public function test_get_font_collections() {
-		// Mock font collection data file.
-		$mock_file = wp_tempnam( 'my-collection-data-' );
-		file_put_contents( $mock_file, '{"this is mock data":true}' );
-
-		// Add a font collection.
-		$config = array(
-			'id'          => 'my-font-collection',
-			'name'        => 'My Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => $mock_file,
-		);
-		wp_register_font_collection( $config );
-
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/fonts/collections' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-		$this->assertCount( 1, $data, 'The response data is not an array with one element.' );
-		$this->assertArrayHasKey( 'id', $data[0], 'The response data does not have the key with the collection ID.' );
-		$this->assertArrayHasKey( 'name', $data[0], 'The response data does not have the key with the collection name.' );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/installFonts.php b/phpunit/tests/fonts/font-library/wpRestFontLibraryController/installFonts.php
deleted file mode 100644
index 01ac1ff8436ed7..00000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/installFonts.php
+++ /dev/null
@@ -1,433 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Library_Controller::install_fonts().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Library_Controller::install_fonts
- */
-
-class Tests_Fonts_WPRESTFontLibraryController_InstallFonts extends WP_REST_Font_Library_Controller_UnitTestCase {
-
-	/**
-	 *
-	 * @dataProvider data_install_fonts
-	 *
-	 * @param array $font_families     Font families to install in theme.json format.
-	 * @param array $files             Font files to install.
-	 * @param array $expected_response Expected response data.
-	 */
-	public function test_install_fonts( $font_families, $files, $expected_response ) {
-		$install_request    = new WP_REST_Request( 'POST', '/wp/v2/fonts' );
-		$font_families_json = json_encode( $font_families );
-		$install_request->set_param( 'font_families', $font_families_json );
-		$install_request->set_file_params( $files );
-		$response = rest_get_server()->dispatch( $install_request );
-		$data     = $response->get_data();
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-		$this->assertCount( count( $expected_response['successes'] ), $data['successes'], 'Not all the font families were installed correctly.' );
-
-		// Checks that the font families were installed correctly.
-		for ( $family_index = 0; $family_index < count( $data['successes'] ); $family_index++ ) {
-			$installed_font = $data['successes'][ $family_index ];
-			$expected_font  = $expected_response['successes'][ $family_index ];
-
-			if ( isset( $installed_font['fontFace'] ) || isset( $expected_font['fontFace'] ) ) {
-				for ( $face_index = 0; $face_index < count( $installed_font['fontFace'] ); $face_index++ ) {
-					// Checks that the font asset were created correctly.
-					if ( isset( $installed_font['fontFace'][ $face_index ]['src'] ) ) {
-						$this->assertStringEndsWith( $expected_font['fontFace'][ $face_index ]['src'], $installed_font['fontFace'][ $face_index ]['src'], 'The src of the fonts were not updated as expected.' );
-					}
-					// Removes the src from the response to compare the rest of the data.
-					unset( $installed_font['fontFace'][ $face_index ]['src'] );
-					unset( $expected_font['fontFace'][ $face_index ]['src'] );
-					unset( $installed_font['fontFace'][ $face_index ]['uploadedFile'] );
-				}
-			}
-
-			// Compares if the rest of the data is the same.
-			$this->assertEquals( $expected_font, $installed_font, 'The endpoint answer is not as expected.' );
-		}
-	}
-
-	/**
-	 * Data provider for test_install_fonts
-	 */
-	public function data_install_fonts() {
-
-		$temp_file_path1 = wp_tempnam( 'Piazzola1-' );
-		copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $temp_file_path1 );
-
-		$temp_file_path2 = wp_tempnam( 'Monteserrat-' );
-		copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $temp_file_path2 );
-
-		return array(
-
-			'google_fonts_to_download'      => array(
-				'font_families'     => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'name'       => 'Piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'      => 'Piazzolla',
-								'fontStyle'       => 'normal',
-								'fontWeight'      => '400',
-								'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-								'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							),
-						),
-					),
-					array(
-						'fontFamily' => 'Montserrat',
-						'slug'       => 'montserrat',
-						'name'       => 'Montserrat',
-						'fontFace'   => array(
-							array(
-								'fontFamily'      => 'Montserrat',
-								'fontStyle'       => 'normal',
-								'fontWeight'      => '100',
-								'src'             => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-								'downloadFromUrl' => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-							),
-						),
-					),
-				),
-				'files'             => array(),
-				'expected_response' => array(
-					'successes' => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'slug'       => 'piazzolla',
-							'name'       => 'Piazzolla',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Piazzolla',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '400',
-									'src'        => '/wp-content/fonts/piazzolla_normal_400.ttf',
-								),
-							),
-						),
-						array(
-							'fontFamily' => 'Montserrat',
-							'slug'       => 'montserrat',
-							'name'       => 'Montserrat',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Montserrat',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '100',
-									'src'        => '/wp-content/fonts/montserrat_normal_100.ttf',
-								),
-							),
-						),
-					),
-					'errors'    => array(),
-				),
-			),
-
-			'google_fonts_to_use_as_is'     => array(
-				'font_families'     => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'name'       => 'Piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily' => 'Piazzolla',
-								'fontStyle'  => 'normal',
-								'fontWeight' => '400',
-								'src'        => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							),
-						),
-					),
-					array(
-						'fontFamily' => 'Montserrat',
-						'slug'       => 'montserrat',
-						'name'       => 'Montserrat',
-						'fontFace'   => array(
-							array(
-								'fontFamily' => 'Montserrat',
-								'fontStyle'  => 'normal',
-								'fontWeight' => '100',
-								'src'        => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-							),
-						),
-					),
-				),
-				'files'             => array(),
-				'expected_response' => array(
-					'successes' => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'slug'       => 'piazzolla',
-							'name'       => 'Piazzolla',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Piazzolla',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '400',
-									'src'        => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-								),
-							),
-						),
-						array(
-							'fontFamily' => 'Montserrat',
-							'slug'       => 'montserrat',
-							'name'       => 'Montserrat',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Montserrat',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '100',
-									'src'        => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-
-								),
-							),
-						),
-					),
-					'errors'    => array(),
-				),
-			),
-
-			'fonts_without_font_faces'      => array(
-				'font_families'     => array(
-					array(
-						'fontFamily' => 'Arial',
-						'slug'       => 'arial',
-						'name'       => 'Arial',
-					),
-				),
-				'files'             => array(),
-				'expected_response' => array(
-					'successes' => array(
-						array(
-							'fontFamily' => 'Arial',
-							'slug'       => 'arial',
-							'name'       => 'Arial',
-						),
-					),
-					'errors'    => array(),
-				),
-			),
-
-			'fonts_with_local_fonts_assets' => array(
-				'font_families'     => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'name'       => 'Piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'   => 'Piazzolla',
-								'fontStyle'    => 'normal',
-								'fontWeight'   => '400',
-								'uploadedFile' => 'files0',
-							),
-						),
-					),
-					array(
-						'fontFamily' => 'Montserrat',
-						'slug'       => 'montserrat',
-						'name'       => 'Montserrat',
-						'fontFace'   => array(
-							array(
-								'fontFamily'   => 'Montserrat',
-								'fontStyle'    => 'normal',
-								'fontWeight'   => '100',
-								'uploadedFile' => 'files1',
-							),
-						),
-					),
-				),
-				'files'             => array(
-					'files0' => array(
-						'name'     => 'piazzola1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => $temp_file_path1,
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files1' => array(
-						'name'     => 'montserrat1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => $temp_file_path2,
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected_response' => array(
-					'successes' => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'slug'       => 'piazzolla',
-							'name'       => 'Piazzolla',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Piazzolla',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '400',
-									'src'        => '/wp-content/fonts/piazzolla_normal_400.ttf',
-								),
-							),
-						),
-						array(
-							'fontFamily' => 'Montserrat',
-							'slug'       => 'montserrat',
-							'name'       => 'Montserrat',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Montserrat',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '100',
-									'src'        => '/wp-content/fonts/montserrat_normal_100.ttf',
-								),
-							),
-						),
-
-					),
-					'errors'    => array(),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Tests failure when fonfaces has improper inputs
-	 *
-	 * @dataProvider data_install_with_improper_inputs
-	 *
-	 * @param array $font_families Font families to install in theme.json format.
-	 * @param array $files         Font files to install.
-	 */
-	public function test_install_with_improper_inputs( $font_families, $files = array() ) {
-		$install_request    = new WP_REST_Request( 'POST', '/wp/v2/fonts' );
-		$font_families_json = json_encode( $font_families );
-		$install_request->set_param( 'font_families', $font_families_json );
-		$install_request->set_file_params( $files );
-
-		$response = rest_get_server()->dispatch( $install_request );
-		$this->assertSame( 400, $response->get_status() );
-	}
-
-	/**
-	 * Data provider for test_install_with_improper_inputs
-	 */
-	public function data_install_with_improper_inputs() {
-		$temp_file_path1 = wp_tempnam( 'Piazzola1-' );
-		file_put_contents( $temp_file_path1, 'Mocking file content' );
-
-		return array(
-			'not a font families array'        => array(
-				'font_families' => 'This is not an array',
-			),
-
-			'empty array'                      => array(
-				'font_families' => array(),
-			),
-
-			'without slug'                     => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-					),
-				),
-			),
-
-			'with improper font face property' => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'fontFace'   => 'This is not an array',
-					),
-				),
-			),
-
-			'with empty font face property'    => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'fontFace'   => array(),
-					),
-				),
-			),
-
-			'fontface referencing uploaded file without uploaded files' => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'   => 'Piazzolla',
-								'fontStyle'    => 'normal',
-								'fontWeight'   => '400',
-								'uploadedFile' => 'files0',
-							),
-						),
-					),
-				),
-				'files'         => array(),
-			),
-
-			'fontface referencing uploaded file without uploaded files' => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'   => 'Piazzolla',
-								'fontStyle'    => 'normal',
-								'fontWeight'   => '400',
-								'uploadedFile' => 'files666',
-							),
-						),
-					),
-				),
-				'files'         => array(
-					'files0' => array(
-						'name'     => 'piazzola1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => $temp_file_path1,
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-			),
-
-			'fontface with incompatible properties (downloadFromUrl and uploadedFile together)' => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'name'       => 'Piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'      => 'Piazzolla',
-								'fontStyle'       => 'normal',
-								'fontWeight'      => '400',
-								'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-								'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-								'uploadedFile'    => 'files0',
-							),
-						),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/registerRoutes.php b/phpunit/tests/fonts/font-library/wpRestFontLibraryController/registerRoutes.php
deleted file mode 100644
index 2ac7b93c3a4141..00000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/registerRoutes.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Library_Controller::register_routes().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Library_Controller::register_routes
- */
-
-class Tests_Fonts_WPRESTFontLibraryController_RegisterRoutes extends WP_UnitTestCase {
-
-	public function test_register_routes() {
-		$routes = rest_get_server()->get_routes();
-		$this->assertArrayHasKey( '/wp/v2/fonts', $routes, 'Rest server has not the fonts path intialized.' );
-		$this->assertCount( 2, $routes['/wp/v2/fonts'], 'Rest server has not the 2 fonts paths initialized.' );
-		$this->assertCount( 1, $routes['/wp/v2/fonts/collections'], 'Rest server has not the collections path initialized.' );
-		$this->assertCount( 1, $routes['/wp/v2/fonts/collections/(?P<id>[\/\w-]+)'], 'Rest server has not the collection path initialized.' );
-
-		$this->assertArrayHasKey( 'POST', $routes['/wp/v2/fonts'][0]['methods'], 'Rest server has not the POST method for fonts intialized.' );
-		$this->assertArrayHasKey( 'DELETE', $routes['/wp/v2/fonts'][1]['methods'], 'Rest server has not the DELETE method for fonts intialized.' );
-		$this->assertArrayHasKey( 'GET', $routes['/wp/v2/fonts/collections'][0]['methods'], 'Rest server has not the GET method for collections intialized.' );
-		$this->assertArrayHasKey( 'GET', $routes['/wp/v2/fonts/collections/(?P<id>[\/\w-]+)'][0]['methods'], 'Rest server has not the GET method for collection intialized.' );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/uninstallFonts.php b/phpunit/tests/fonts/font-library/wpRestFontLibraryController/uninstallFonts.php
deleted file mode 100644
index a3b613e6f983e0..00000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontLibraryController/uninstallFonts.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Library_Controller::install_fonts().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Library_Controller::install_fonts
- */
-
-class Tests_Fonts_WPRESTFontLibraryController_UninstallFonts extends WP_REST_Font_Library_Controller_UnitTestCase {
-
-	/**
-	 * Install fonts to test uninstall.
-	 */
-	public function set_up() {
-		parent::set_up();
-
-		// Installs mock fonts to test uninstall.
-		$mock_families = array(
-			array(
-				'fontFamily' => 'Piazzolla',
-				'slug'       => 'piazzolla',
-				'name'       => 'Piazzolla',
-				'fontFace'   => array(
-					array(
-						'fontFamily'      => 'Piazzolla',
-						'fontStyle'       => 'normal',
-						'fontWeight'      => '400',
-						'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-					),
-				),
-			),
-			array(
-				'fontFamily' => 'Montserrat',
-				'slug'       => 'montserrat',
-				'name'       => 'Montserrat',
-				'fontFace'   => array(
-					array(
-						'fontFamily'      => 'Montserrat',
-						'fontStyle'       => 'normal',
-						'fontWeight'      => '100',
-						'src'             => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-						'downloadFromUrl' => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-					),
-				),
-			),
-		);
-
-		$install_request    = new WP_REST_Request( 'POST', '/wp/v2/fonts' );
-		$font_families_json = json_encode( $mock_families );
-		$install_request->set_param( 'font_families', $font_families_json );
-		rest_get_server()->dispatch( $install_request );
-	}
-
-	public function test_uninstall() {
-		$font_families_to_uninstall = array(
-			array(
-				'slug' => 'piazzolla',
-			),
-			array(
-				'slug' => 'montserrat',
-			),
-		);
-
-		$uninstall_request = new WP_REST_Request( 'DELETE', '/wp/v2/fonts' );
-		$uninstall_request->set_param( 'font_families', $font_families_to_uninstall );
-		$response = rest_get_server()->dispatch( $uninstall_request );
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-	}
-
-
-	public function test_uninstall_non_existing_fonts() {
-		$uninstall_request = new WP_REST_Request( 'DELETE', '/wp/v2/fonts' );
-
-		$non_existing_font_data = array(
-			array(
-				'slug' => 'non-existing-font',
-				'name' => 'Non existing font',
-			),
-			array(
-				'slug' => 'another-not-installed-font',
-				'name' => 'Another not installed font',
-			),
-		);
-
-		$uninstall_request->set_param( 'font_families', $non_existing_font_data );
-		$response = rest_get_server()->dispatch( $uninstall_request );
-		$data     = $response->get_data();
-		$this->assertCount( 2, $data['errors'], 'The response should have 2 errors, one for each font family uninstall failure.' );
-	}
-}
diff --git a/platform-docs/docs/advanced/_category_.json b/platform-docs/docs/advanced/_category_.json
deleted file mode 100644
index a5787a8693001a..00000000000000
--- a/platform-docs/docs/advanced/_category_.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"position": 4,
-	"label": "Advanced",
-	"collapsible": true,
-	"collapsed": true,
-	"link": {
-		"type": "generated-index",
-		"title": "Advanced"
-	}
-}
diff --git a/platform-docs/docs/advanced/create-format.md b/platform-docs/docs/advanced/create-format.md
deleted file mode 100644
index 3779c5a85e5bef..00000000000000
--- a/platform-docs/docs/advanced/create-format.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-sidebar_position: 1
----
-
-# Create a RichText format
\ No newline at end of file
diff --git a/platform-docs/docs/advanced/dynamic.md b/platform-docs/docs/advanced/dynamic.md
deleted file mode 100644
index 369670cb1af490..00000000000000
--- a/platform-docs/docs/advanced/dynamic.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-sidebar_position: 3
----
-
-# Augmenting blocks
\ No newline at end of file
diff --git a/platform-docs/docs/advanced/interactivity.md b/platform-docs/docs/advanced/interactivity.md
deleted file mode 100644
index ba35f82cb21446..00000000000000
--- a/platform-docs/docs/advanced/interactivity.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-sidebar_position: 2
----
-
-# Interactivity API
\ No newline at end of file
diff --git a/platform-docs/docs/advanced/wordpress.md b/platform-docs/docs/advanced/wordpress.md
deleted file mode 100644
index ce2e40f7c702eb..00000000000000
--- a/platform-docs/docs/advanced/wordpress.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-sidebar_position: 4
----
-
-# Gutenberg and WordPress
\ No newline at end of file
diff --git a/platform-docs/docs/basic-concepts/block-library.md b/platform-docs/docs/basic-concepts/block-library.md
index dba569f34fac13..563b7ca6c9e4c5 100644
--- a/platform-docs/docs/basic-concepts/block-library.md
+++ b/platform-docs/docs/basic-concepts/block-library.md
@@ -6,7 +6,7 @@ sidebar_position: 4
 
 The block editor relies on a registry of block types to render and edit blocks. The `@wordpress/block-library` package provides a set of core blocks that you can register in your application.
 
-## Registring all block types
+## Registering all block types
 
 Registering blocks requires both loading the JavaScript code that makes the block type available for use and including the corresponding stylesheets.
 
diff --git a/platform-docs/docs/basic-concepts/data.md b/platform-docs/docs/basic-concepts/data.md
index bc298073a3a5c0..3bcb06841a95d2 100644
--- a/platform-docs/docs/basic-concepts/data.md
+++ b/platform-docs/docs/basic-concepts/data.md
@@ -100,7 +100,7 @@ After running this through the parser, we're left with a simple object we can ma
 
 This has dramatic implications for how simple and performant we can make our parser. These explicit boundaries also protect damage to a single block from bleeding into other blocks or tarnishing the entire document. It also allows the system to identify unrecognized blocks before rendering them.
 
-_N.B.:_ The defining aspects of blocks are their semantics and the isolation mechanism they provide: in other words, their identity. On the other hand, where their data is stored is a more liberal aspect. Blocks support more than just static local data (via JSON literals inside the HTML comment or within the block's HTML), and more mechanisms (_e.g._, global blocks or otherwise resorting to storage in complementary `WP_Post` objects) are expected. See [attributes](/docs/reference-guides/block-api/block-attributes.md) for details.
+_N.B.:_ The defining aspects of blocks are their semantics and the isolation mechanism they provide: in other words, their identity. On the other hand, where their data is stored is a more liberal aspect. Blocks support more than just static local data (via JSON literals inside the HTML comment or within the block's HTML), and more mechanisms (_e.g._, global blocks or otherwise resorting to storage in complementary `WP_Post` objects) are expected.
 
 ### The Anatomy of a Serialized Block
 
diff --git a/platform-docs/docs/basic-concepts/ui.md b/platform-docs/docs/basic-concepts/ui.md
index 8b6e706683d085..0dccef3c239b03 100644
--- a/platform-docs/docs/basic-concepts/ui.md
+++ b/platform-docs/docs/basic-concepts/ui.md
@@ -17,7 +17,7 @@ The Gutenberg platform allows you to render these pieces separately and lay them
 
 ## The Block Toolbar
 
-Wrapping your `BlockCanvas` component within the `BlockTools` wrapper allows the editor to render a block toolbar adjacent to the selected block.
+The block toolbar is rendered automatically next to the selected block by default. But if you set the flag `hasFixedToolbar` to true in your `BlockEditorProvider` settings, you will be able to use the `BlockToolbar` component to render the block toolbar in your place of choice.
 
 ## The Block Inspector
 
diff --git a/platform-docs/docs/create-block/writing-flow.md b/platform-docs/docs/create-block/writing-flow.md
deleted file mode 100644
index 452e060f01b1a8..00000000000000
--- a/platform-docs/docs/create-block/writing-flow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-sidebar_position: 6
----
-
-# Writing Flow and Pasting
\ No newline at end of file
diff --git a/platform-docs/docs/intro.md b/platform-docs/docs/intro.md
index 79a142731891e5..05cfa103492f33 100644
--- a/platform-docs/docs/intro.md
+++ b/platform-docs/docs/intro.md
@@ -9,7 +9,7 @@ Let's discover how to use the **Gutenberg Block Editor** to build your own block
 
 ## What you'll need
 
-- [Node.js](https://nodejs.org/en/download/) version 16.14 or above.
+- [Node.js](https://nodejs.org/en/download/) version 20.10 or above.
 - We're going to be using "vite" to setup our single page application (SPA) that contains a block editor. You can use your own setup, and your own application for this.
 
 ## Preparing the SPA powered by Vite.
@@ -59,10 +59,10 @@ registerCoreBlocks();
 function Editor() {
   const [blocks, setBlocks] = useState([]);
   return (
-    {/* 
-        The BlockEditorProvider is the wrapper of the block editor's state.
-        All the UI elements of the block editor need to be rendered within this provider.
-      */}
+    /*
+      The BlockEditorProvider is the wrapper of the block editor's state.
+      All the UI elements of the block editor need to be rendered within this provider.
+    */
     <BlockEditorProvider
       value={blocks}
       onChange={setBlocks}
@@ -82,4 +82,4 @@ const root = createRoot(document.getElementById("app"));
 root.render(<Editor />);
 ```
 
-That's it! You now have a very basic block editor with several block types included by default: paragraphs, headings, lists, quotes, images...
\ No newline at end of file
+That's it! You now have a very basic block editor with several block types included by default: paragraphs, headings, lists, quotes, images...
diff --git a/platform-docs/docusaurus.config.js b/platform-docs/docusaurus.config.js
index 7fc66d488ef555..ff86ee3eea4492 100644
--- a/platform-docs/docusaurus.config.js
+++ b/platform-docs/docusaurus.config.js
@@ -4,9 +4,6 @@
 /**
  * External dependencies
  */
-const lightCodeTheme = require( 'prism-react-renderer/themes/github' );
-const darkCodeTheme = require( 'prism-react-renderer/themes/dracula' );
-
 /** @type {import('@docusaurus/types').Config} */
 const config = {
 	title: 'Gutenberg Block Editor',
@@ -37,7 +34,7 @@ const config = {
 				docs: {
 					sidebarPath: require.resolve( './sidebars.js' ),
 					editUrl:
-						'https://github.com/WordPress/gutenberg/tree/main/platform-docs/',
+						'https://github.com/WordPress/gutenberg/tree/trunk/platform-docs/',
 				},
 				theme: {
 					customCss: require.resolve( './src/css/custom.css' ),
@@ -73,10 +70,6 @@ const config = {
 					},
 				],
 			},
-			prism: {
-				theme: lightCodeTheme,
-				darkTheme: darkCodeTheme,
-			},
 		} ),
 };
 
diff --git a/platform-docs/package-lock.json b/platform-docs/package-lock.json
index 7f24ee5d447f8f..ce0969c3928a48 100644
--- a/platform-docs/package-lock.json
+++ b/platform-docs/package-lock.json
@@ -1,27 +1,29 @@
 {
 	"name": "platform-docs",
 	"version": "0.0.1",
-	"lockfileVersion": 2,
+	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "platform-docs",
 			"version": "0.0.1",
+			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/preset-classic": "2.4.1",
-				"@mdx-js/react": "^1.6.22",
+				"@docusaurus/core": "^3.1.1",
+				"@docusaurus/preset-classic": "^3.1.1",
+				"@mdx-js/react": "^3.0.0",
 				"clsx": "^1.2.1",
-				"docusaurus-lunr-search": "^2.4.1",
-				"prism-react-renderer": "^1.3.5",
-				"react": "^17.0.2",
-				"react-dom": "^17.0.2"
+				"docusaurus-lunr-search": "^3.3.2",
+				"react": "^18.3.0",
+				"react-dom": "^18.3.0"
 			},
 			"devDependencies": {
-				"@docusaurus/module-type-aliases": "2.4.1"
+				"@docusaurus/module-type-aliases": "^3.1.1",
+				"@docusaurus/types": "^3.1.1"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=20.10.0",
+				"npm": ">=10.2.3"
 			}
 		},
 		"node_modules/@algolia/autocomplete-core": {
@@ -66,74 +68,74 @@
 			}
 		},
 		"node_modules/@algolia/cache-browser-local-storage": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.19.1.tgz",
-			"integrity": "sha512-FYAZWcGsFTTaSAwj9Std8UML3Bu8dyWDncM7Ls8g+58UOe4XYdlgzXWbrIgjaguP63pCCbMoExKr61B+ztK3tw==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz",
+			"integrity": "sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g==",
 			"dependencies": {
-				"@algolia/cache-common": "4.19.1"
+				"@algolia/cache-common": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/cache-common": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.19.1.tgz",
-			"integrity": "sha512-XGghi3l0qA38HiqdoUY+wvGyBsGvKZ6U3vTiMBT4hArhP3fOGLXpIINgMiiGjTe4FVlTa5a/7Zf2bwlIHfRqqg=="
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.22.1.tgz",
+			"integrity": "sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA=="
 		},
 		"node_modules/@algolia/cache-in-memory": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.19.1.tgz",
-			"integrity": "sha512-+PDWL+XALGvIginigzu8oU6eWw+o76Z8zHbBovWYcrtWOEtinbl7a7UTt3x3lthv+wNuFr/YD1Gf+B+A9V8n5w==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz",
+			"integrity": "sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw==",
 			"dependencies": {
-				"@algolia/cache-common": "4.19.1"
+				"@algolia/cache-common": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/client-account": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.19.1.tgz",
-			"integrity": "sha512-Oy0ritA2k7AMxQ2JwNpfaEcgXEDgeyKu0V7E7xt/ZJRdXfEpZcwp9TOg4TJHC7Ia62gIeT2Y/ynzsxccPw92GA==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.22.1.tgz",
+			"integrity": "sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw==",
 			"dependencies": {
-				"@algolia/client-common": "4.19.1",
-				"@algolia/client-search": "4.19.1",
-				"@algolia/transporter": "4.19.1"
+				"@algolia/client-common": "4.22.1",
+				"@algolia/client-search": "4.22.1",
+				"@algolia/transporter": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/client-analytics": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.19.1.tgz",
-			"integrity": "sha512-5QCq2zmgdZLIQhHqwl55ZvKVpLM3DNWjFI4T+bHr3rGu23ew2bLO4YtyxaZeChmDb85jUdPDouDlCumGfk6wOg==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.22.1.tgz",
+			"integrity": "sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg==",
 			"dependencies": {
-				"@algolia/client-common": "4.19.1",
-				"@algolia/client-search": "4.19.1",
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/transporter": "4.19.1"
+				"@algolia/client-common": "4.22.1",
+				"@algolia/client-search": "4.22.1",
+				"@algolia/requester-common": "4.22.1",
+				"@algolia/transporter": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/client-common": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.19.1.tgz",
-			"integrity": "sha512-3kAIVqTcPrjfS389KQvKzliC559x+BDRxtWamVJt8IVp7LGnjq+aVAXg4Xogkur1MUrScTZ59/AaUd5EdpyXgA==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.22.1.tgz",
+			"integrity": "sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ==",
 			"dependencies": {
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/transporter": "4.19.1"
+				"@algolia/requester-common": "4.22.1",
+				"@algolia/transporter": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/client-personalization": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.19.1.tgz",
-			"integrity": "sha512-8CWz4/H5FA+krm9HMw2HUQenizC/DxUtsI5oYC0Jxxyce1vsr8cb1aEiSJArQT6IzMynrERif1RVWLac1m36xw==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.22.1.tgz",
+			"integrity": "sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ==",
 			"dependencies": {
-				"@algolia/client-common": "4.19.1",
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/transporter": "4.19.1"
+				"@algolia/client-common": "4.22.1",
+				"@algolia/requester-common": "4.22.1",
+				"@algolia/transporter": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/client-search": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.19.1.tgz",
-			"integrity": "sha512-mBecfMFS4N+yK/p0ZbK53vrZbL6OtWMk8YmnOv1i0LXx4pelY8TFhqKoTit3NPVPwoSNN0vdSN9dTu1xr1XOVw==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.22.1.tgz",
+			"integrity": "sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA==",
 			"dependencies": {
-				"@algolia/client-common": "4.19.1",
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/transporter": "4.19.1"
+				"@algolia/client-common": "4.22.1",
+				"@algolia/requester-common": "4.22.1",
+				"@algolia/transporter": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/events": {
@@ -142,67 +144,67 @@
 			"integrity": "sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ=="
 		},
 		"node_modules/@algolia/logger-common": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.19.1.tgz",
-			"integrity": "sha512-i6pLPZW/+/YXKis8gpmSiNk1lOmYCmRI6+x6d2Qk1OdfvX051nRVdalRbEcVTpSQX6FQAoyeaui0cUfLYW5Elw=="
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.22.1.tgz",
+			"integrity": "sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg=="
 		},
 		"node_modules/@algolia/logger-console": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.19.1.tgz",
-			"integrity": "sha512-jj72k9GKb9W0c7TyC3cuZtTr0CngLBLmc8trzZlXdfvQiigpUdvTi1KoWIb2ZMcRBG7Tl8hSb81zEY3zI2RlXg==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.22.1.tgz",
+			"integrity": "sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA==",
 			"dependencies": {
-				"@algolia/logger-common": "4.19.1"
+				"@algolia/logger-common": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/requester-browser-xhr": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.19.1.tgz",
-			"integrity": "sha512-09K/+t7lptsweRTueHnSnmPqIxbHMowejAkn9XIcJMLdseS3zl8ObnS5GWea86mu3vy4+8H+ZBKkUN82Zsq/zg==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz",
+			"integrity": "sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw==",
 			"dependencies": {
-				"@algolia/requester-common": "4.19.1"
+				"@algolia/requester-common": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/requester-common": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.19.1.tgz",
-			"integrity": "sha512-BisRkcWVxrDzF1YPhAckmi2CFYK+jdMT60q10d7z3PX+w6fPPukxHRnZwooiTUrzFe50UBmLItGizWHP5bDzVQ=="
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.22.1.tgz",
+			"integrity": "sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg=="
 		},
 		"node_modules/@algolia/requester-node-http": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.19.1.tgz",
-			"integrity": "sha512-6DK52DHviBHTG2BK/Vv2GIlEw7i+vxm7ypZW0Z7vybGCNDeWzADx+/TmxjkES2h15+FZOqVf/Ja677gePsVItA==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz",
+			"integrity": "sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA==",
 			"dependencies": {
-				"@algolia/requester-common": "4.19.1"
+				"@algolia/requester-common": "4.22.1"
 			}
 		},
 		"node_modules/@algolia/transporter": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.19.1.tgz",
-			"integrity": "sha512-nkpvPWbpuzxo1flEYqNIbGz7xhfhGOKGAZS7tzC+TELgEmi7z99qRyTfNSUlW7LZmB3ACdnqAo+9A9KFBENviQ==",
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.22.1.tgz",
+			"integrity": "sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ==",
 			"dependencies": {
-				"@algolia/cache-common": "4.19.1",
-				"@algolia/logger-common": "4.19.1",
-				"@algolia/requester-common": "4.19.1"
+				"@algolia/cache-common": "4.22.1",
+				"@algolia/logger-common": "4.22.1",
+				"@algolia/requester-common": "4.22.1"
 			}
 		},
 		"node_modules/@ampproject/remapping": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-			"integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
 			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.24"
 			},
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@babel/code-frame": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
-			"integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
+			"version": "7.23.5",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+			"integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
 			"dependencies": {
-				"@babel/highlight": "^7.22.10",
+				"@babel/highlight": "^7.23.4",
 				"chalk": "^2.4.2"
 			},
 			"engines": {
@@ -274,32 +276,32 @@
 			}
 		},
 		"node_modules/@babel/compat-data": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-			"integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+			"version": "7.23.5",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
+			"integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz",
+			"integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==",
 			"dependencies": {
 				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
+				"@babel/code-frame": "^7.23.5",
+				"@babel/generator": "^7.23.6",
+				"@babel/helper-compilation-targets": "^7.23.6",
+				"@babel/helper-module-transforms": "^7.23.3",
+				"@babel/helpers": "^7.24.0",
+				"@babel/parser": "^7.24.0",
+				"@babel/template": "^7.24.0",
+				"@babel/traverse": "^7.24.0",
+				"@babel/types": "^7.24.0",
+				"convert-source-map": "^2.0.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
+				"json5": "^2.2.3",
 				"semver": "^6.3.1"
 			},
 			"engines": {
@@ -319,11 +321,11 @@
 			}
 		},
 		"node_modules/@babel/generator": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-			"integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
+			"version": "7.23.6",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+			"integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
 			"dependencies": {
-				"@babel/types": "^7.22.10",
+				"@babel/types": "^7.23.6",
 				"@jridgewell/gen-mapping": "^0.3.2",
 				"@jridgewell/trace-mapping": "^0.3.17",
 				"jsesc": "^2.5.1"
@@ -344,24 +346,24 @@
 			}
 		},
 		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
-			"integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
+			"version": "7.22.15",
+			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+			"integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
 			"dependencies": {
-				"@babel/types": "^7.22.10"
+				"@babel/types": "^7.22.15"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-			"integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
+			"version": "7.23.6",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+			"integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
 			"dependencies": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-validator-option": "^7.22.5",
-				"browserslist": "^4.21.9",
+				"@babel/compat-data": "^7.23.5",
+				"@babel/helper-validator-option": "^7.23.5",
+				"browserslist": "^4.22.2",
 				"lru-cache": "^5.1.1",
 				"semver": "^6.3.1"
 			},
@@ -378,16 +380,16 @@
 			}
 		},
 		"node_modules/@babel/helper-create-class-features-plugin": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz",
-			"integrity": "sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.0.tgz",
+			"integrity": "sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==",
 			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-member-expression-to-functions": "^7.22.5",
+				"@babel/helper-environment-visitor": "^7.22.20",
+				"@babel/helper-function-name": "^7.23.0",
+				"@babel/helper-member-expression-to-functions": "^7.23.0",
 				"@babel/helper-optimise-call-expression": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.9",
+				"@babel/helper-replace-supers": "^7.22.20",
 				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
 				"@babel/helper-split-export-declaration": "^7.22.6",
 				"semver": "^6.3.1"
@@ -408,9 +410,9 @@
 			}
 		},
 		"node_modules/@babel/helper-create-regexp-features-plugin": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
-			"integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
+			"version": "7.22.15",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+			"integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
 			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.22.5",
 				"regexpu-core": "^5.3.1",
@@ -432,9 +434,10 @@
 			}
 		},
 		"node_modules/@babel/helper-define-polyfill-provider": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
-			"integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+			"integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/helper-compilation-targets": "^7.22.6",
 				"@babel/helper-plugin-utils": "^7.22.5",
@@ -447,20 +450,20 @@
 			}
 		},
 		"node_modules/@babel/helper-environment-visitor": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-			"integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+			"version": "7.22.20",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+			"integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-function-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-			"integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+			"version": "7.23.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+			"integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
 			"dependencies": {
-				"@babel/template": "^7.22.5",
-				"@babel/types": "^7.22.5"
+				"@babel/template": "^7.22.15",
+				"@babel/types": "^7.23.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -478,37 +481,37 @@
 			}
 		},
 		"node_modules/@babel/helper-member-expression-to-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-			"integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+			"version": "7.23.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
+			"integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/types": "^7.23.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-module-imports": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-			"integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+			"version": "7.22.15",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+			"integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/types": "^7.22.15"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-			"integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+			"integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-module-imports": "^7.22.5",
+				"@babel/helper-environment-visitor": "^7.22.20",
+				"@babel/helper-module-imports": "^7.22.15",
 				"@babel/helper-simple-access": "^7.22.5",
 				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/helper-validator-identifier": "^7.22.5"
+				"@babel/helper-validator-identifier": "^7.22.20"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -529,21 +532,21 @@
 			}
 		},
 		"node_modules/@babel/helper-plugin-utils": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-			"integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
+			"integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-remap-async-to-generator": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
-			"integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
+			"version": "7.22.20",
+			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+			"integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
 			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-wrap-function": "^7.22.9"
+				"@babel/helper-environment-visitor": "^7.22.20",
+				"@babel/helper-wrap-function": "^7.22.20"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -553,12 +556,12 @@
 			}
 		},
 		"node_modules/@babel/helper-replace-supers": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
-			"integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
+			"version": "7.22.20",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
+			"integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-member-expression-to-functions": "^7.22.5",
+				"@babel/helper-environment-visitor": "^7.22.20",
+				"@babel/helper-member-expression-to-functions": "^7.22.15",
 				"@babel/helper-optimise-call-expression": "^7.22.5"
 			},
 			"engines": {
@@ -602,61 +605,61 @@
 			}
 		},
 		"node_modules/@babel/helper-string-parser": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-			"integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+			"integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-			"integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+			"version": "7.22.20",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+			"integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-option": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-			"integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+			"version": "7.23.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+			"integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-wrap-function": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
-			"integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
+			"version": "7.22.20",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
+			"integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
 			"dependencies": {
 				"@babel/helper-function-name": "^7.22.5",
-				"@babel/template": "^7.22.5",
-				"@babel/types": "^7.22.10"
+				"@babel/template": "^7.22.15",
+				"@babel/types": "^7.22.19"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helpers": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
-			"integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.0.tgz",
+			"integrity": "sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==",
 			"dependencies": {
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10"
+				"@babel/template": "^7.24.0",
+				"@babel/traverse": "^7.24.0",
+				"@babel/types": "^7.24.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/highlight": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-			"integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+			"integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
 			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.22.5",
+				"@babel/helper-validator-identifier": "^7.22.20",
 				"chalk": "^2.4.2",
 				"js-tokens": "^4.0.0"
 			},
@@ -729,9 +732,9 @@
 			}
 		},
 		"node_modules/@babel/parser": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
-			"integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
+			"integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
 			"bin": {
 				"parser": "bin/babel-parser.js"
 			},
@@ -740,9 +743,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-			"integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
+			"integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -754,13 +757,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-			"integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
+			"integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/plugin-transform-optional-chaining": "^7.22.5"
+				"@babel/plugin-transform-optional-chaining": "^7.23.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -769,17 +772,19 @@
 				"@babel/core": "^7.13.0"
 			}
 		},
-		"node_modules/@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.12.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
-			"integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
+		"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+			"version": "7.23.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz",
+			"integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-				"@babel/plugin-transform-parameters": "^7.12.1"
+				"@babel/helper-environment-visitor": "^7.22.20",
+				"@babel/helper-plugin-utils": "^7.22.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
+				"@babel/core": "^7.0.0"
 			}
 		},
 		"node_modules/@babel/plugin-proposal-private-property-in-object": {
@@ -852,9 +857,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-import-assertions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-			"integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
+			"integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -866,9 +871,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-import-attributes": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-			"integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
+			"integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -902,9 +907,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
-			"integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
+			"integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1010,9 +1015,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-typescript": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
-			"integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
+			"integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1039,9 +1044,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-arrow-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-			"integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
+			"integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1053,13 +1058,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-async-generator-functions": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
-			"integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
+			"version": "7.23.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz",
+			"integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==",
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.5",
+				"@babel/helper-environment-visitor": "^7.22.20",
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.9",
+				"@babel/helper-remap-async-to-generator": "^7.22.20",
 				"@babel/plugin-syntax-async-generators": "^7.8.4"
 			},
 			"engines": {
@@ -1070,13 +1075,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-async-to-generator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-			"integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
+			"integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
 			"dependencies": {
-				"@babel/helper-module-imports": "^7.22.5",
+				"@babel/helper-module-imports": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.5"
+				"@babel/helper-remap-async-to-generator": "^7.22.20"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1086,9 +1091,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-			"integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
+			"integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1100,9 +1105,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-block-scoping": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
-			"integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
+			"integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1114,11 +1119,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-class-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-			"integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
+			"integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
+				"@babel/helper-create-class-features-plugin": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1129,11 +1134,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-class-static-block": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-			"integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
+			"integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
+				"@babel/helper-create-class-features-plugin": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/plugin-syntax-class-static-block": "^7.14.5"
 			},
@@ -1145,17 +1150,16 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-classes": {
-			"version": "7.22.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
-			"integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
+			"version": "7.23.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz",
+			"integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==",
 			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-compilation-targets": "^7.22.6",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5",
+				"@babel/helper-compilation-targets": "^7.23.6",
+				"@babel/helper-environment-visitor": "^7.22.20",
+				"@babel/helper-function-name": "^7.23.0",
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.5",
+				"@babel/helper-replace-supers": "^7.22.20",
 				"@babel/helper-split-export-declaration": "^7.22.6",
 				"globals": "^11.1.0"
 			},
@@ -1167,12 +1171,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-computed-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-			"integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
+			"integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/template": "^7.22.5"
+				"@babel/template": "^7.22.15"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1182,9 +1186,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-destructuring": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
-			"integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
+			"integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1196,11 +1200,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-dotall-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-			"integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
+			"integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
+				"@babel/helper-create-regexp-features-plugin": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1211,9 +1215,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-duplicate-keys": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-			"integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
+			"integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1225,9 +1229,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-dynamic-import": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-			"integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
+			"integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
@@ -1240,11 +1244,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-			"integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
+			"integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
 			"dependencies": {
-				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1255,9 +1259,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-export-namespace-from": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-			"integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
+			"integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
@@ -1270,11 +1274,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-for-of": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-			"integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+			"version": "7.23.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
+			"integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.22.5",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1284,12 +1289,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-function-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-			"integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
+			"integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
 			"dependencies": {
-				"@babel/helper-compilation-targets": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
+				"@babel/helper-compilation-targets": "^7.22.15",
+				"@babel/helper-function-name": "^7.23.0",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1300,9 +1305,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-json-strings": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-			"integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
+			"integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/plugin-syntax-json-strings": "^7.8.3"
@@ -1315,9 +1320,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-			"integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
+			"integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1329,9 +1334,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-logical-assignment-operators": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-			"integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
+			"integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
@@ -1344,9 +1349,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-member-expression-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-			"integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
+			"integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1358,11 +1363,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-amd": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-			"integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
+			"integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.22.5",
+				"@babel/helper-module-transforms": "^7.23.3",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1373,11 +1378,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-commonjs": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-			"integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
+			"integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.22.5",
+				"@babel/helper-module-transforms": "^7.23.3",
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/helper-simple-access": "^7.22.5"
 			},
@@ -1389,14 +1394,14 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-systemjs": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-			"integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
+			"version": "7.23.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz",
+			"integrity": "sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==",
 			"dependencies": {
 				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-module-transforms": "^7.22.5",
+				"@babel/helper-module-transforms": "^7.23.3",
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.5"
+				"@babel/helper-validator-identifier": "^7.22.20"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1406,11 +1411,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-umd": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-			"integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
+			"integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.22.5",
+				"@babel/helper-module-transforms": "^7.23.3",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1436,9 +1441,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-new-target": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-			"integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
+			"integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1450,9 +1455,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-			"integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
+			"integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
@@ -1465,9 +1470,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-numeric-separator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-			"integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
+			"integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
@@ -1480,15 +1485,15 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-object-rest-spread": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-			"integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.0.tgz",
+			"integrity": "sha512-y/yKMm7buHpFFXfxVFS4Vk1ToRJDilIa6fKRioB9Vjichv58TDGXTvqV0dN7plobAmTW5eSEGXDngE+Mm+uO+w==",
 			"dependencies": {
-				"@babel/compat-data": "^7.22.5",
-				"@babel/helper-compilation-targets": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
+				"@babel/compat-data": "^7.23.5",
+				"@babel/helper-compilation-targets": "^7.23.6",
+				"@babel/helper-plugin-utils": "^7.24.0",
 				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.22.5"
+				"@babel/plugin-transform-parameters": "^7.23.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1498,12 +1503,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-object-super": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-			"integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
+			"integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.5"
+				"@babel/helper-replace-supers": "^7.22.20"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1513,9 +1518,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-optional-catch-binding": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-			"integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
+			"integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
@@ -1528,9 +1533,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-optional-chaining": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
-			"integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
+			"integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
@@ -1544,9 +1549,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-parameters": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-			"integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
+			"integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1558,11 +1563,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-private-methods": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-			"integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
+			"integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
+				"@babel/helper-create-class-features-plugin": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1573,12 +1578,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-private-property-in-object": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-			"integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
+			"integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
 			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
+				"@babel/helper-create-class-features-plugin": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
 			},
@@ -1590,9 +1595,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-property-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-			"integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
+			"integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1604,9 +1609,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-constant-elements": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz",
-			"integrity": "sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.23.3.tgz",
+			"integrity": "sha512-zP0QKq/p6O42OL94udMgSfKXyse4RyJ0JqbQ34zDAONWjyrEsghYEyTSK5FIpmXmCpB55SHokL1cRRKHv8L2Qw==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1618,9 +1623,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-display-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz",
-			"integrity": "sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz",
+			"integrity": "sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1632,15 +1637,15 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-jsx": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
-			"integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz",
+			"integrity": "sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==",
 			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-module-imports": "^7.22.5",
+				"@babel/helper-module-imports": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-jsx": "^7.22.5",
-				"@babel/types": "^7.22.5"
+				"@babel/plugin-syntax-jsx": "^7.23.3",
+				"@babel/types": "^7.23.4"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1664,9 +1669,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-react-pure-annotations": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz",
-			"integrity": "sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz",
+			"integrity": "sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==",
 			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.22.5",
 				"@babel/helper-plugin-utils": "^7.22.5"
@@ -1679,9 +1684,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-regenerator": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-			"integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
+			"integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"regenerator-transform": "^0.15.2"
@@ -1694,9 +1699,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-reserved-words": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-			"integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
+			"integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1708,15 +1713,15 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-runtime": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.10.tgz",
-			"integrity": "sha512-RchI7HePu1eu0CYNKHHHQdfenZcM4nz8rew5B1VWqeRKdcwW5aQ5HeG9eTUbWiAS1UrmHVLmoxTWHt3iLD/NhA==",
-			"dependencies": {
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"babel-plugin-polyfill-corejs2": "^0.4.5",
-				"babel-plugin-polyfill-corejs3": "^0.8.3",
-				"babel-plugin-polyfill-regenerator": "^0.5.2",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz",
+			"integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.22.15",
+				"@babel/helper-plugin-utils": "^7.24.0",
+				"babel-plugin-polyfill-corejs2": "^0.4.8",
+				"babel-plugin-polyfill-corejs3": "^0.9.0",
+				"babel-plugin-polyfill-regenerator": "^0.5.5",
 				"semver": "^6.3.1"
 			},
 			"engines": {
@@ -1735,9 +1740,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-shorthand-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-			"integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
+			"integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1749,9 +1754,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-spread": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-			"integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
+			"integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
 				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
@@ -1764,9 +1769,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-sticky-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-			"integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
+			"integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1778,9 +1783,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-template-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-			"integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
+			"integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1792,9 +1797,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-typeof-symbol": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-			"integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
+			"integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1806,14 +1811,14 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-typescript": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.10.tgz",
-			"integrity": "sha512-7++c8I/ymsDo4QQBAgbraXLzIM6jmfao11KgIBEYZRReWzNWH9NtNgJcyrZiXsOPh523FQm6LfpLyy/U5fn46A==",
+			"version": "7.23.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz",
+			"integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==",
 			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-create-class-features-plugin": "^7.22.10",
+				"@babel/helper-create-class-features-plugin": "^7.23.6",
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-typescript": "^7.22.5"
+				"@babel/plugin-syntax-typescript": "^7.23.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1823,9 +1828,9 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-escapes": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-			"integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
+			"integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
@@ -1837,11 +1842,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-property-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-			"integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
+			"integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
+				"@babel/helper-create-regexp-features-plugin": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1852,11 +1857,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-			"integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
+			"integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
+				"@babel/helper-create-regexp-features-plugin": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1867,11 +1872,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-sets-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-			"integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
+			"integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
+				"@babel/helper-create-regexp-features-plugin": "^7.22.15",
 				"@babel/helper-plugin-utils": "^7.22.5"
 			},
 			"engines": {
@@ -1882,24 +1887,25 @@
 			}
 		},
 		"node_modules/@babel/preset-env": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
-			"integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
-			"dependencies": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz",
+			"integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==",
+			"dependencies": {
+				"@babel/compat-data": "^7.23.5",
+				"@babel/helper-compilation-targets": "^7.23.6",
+				"@babel/helper-plugin-utils": "^7.24.0",
+				"@babel/helper-validator-option": "^7.23.5",
+				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
+				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
+				"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
 				"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
 				"@babel/plugin-syntax-async-generators": "^7.8.4",
 				"@babel/plugin-syntax-class-properties": "^7.12.13",
 				"@babel/plugin-syntax-class-static-block": "^7.14.5",
 				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
 				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-import-assertions": "^7.22.5",
-				"@babel/plugin-syntax-import-attributes": "^7.22.5",
+				"@babel/plugin-syntax-import-assertions": "^7.23.3",
+				"@babel/plugin-syntax-import-attributes": "^7.23.3",
 				"@babel/plugin-syntax-import-meta": "^7.10.4",
 				"@babel/plugin-syntax-json-strings": "^7.8.3",
 				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -1911,59 +1917,58 @@
 				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
 				"@babel/plugin-syntax-top-level-await": "^7.14.5",
 				"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-				"@babel/plugin-transform-arrow-functions": "^7.22.5",
-				"@babel/plugin-transform-async-generator-functions": "^7.22.10",
-				"@babel/plugin-transform-async-to-generator": "^7.22.5",
-				"@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-				"@babel/plugin-transform-block-scoping": "^7.22.10",
-				"@babel/plugin-transform-class-properties": "^7.22.5",
-				"@babel/plugin-transform-class-static-block": "^7.22.5",
-				"@babel/plugin-transform-classes": "^7.22.6",
-				"@babel/plugin-transform-computed-properties": "^7.22.5",
-				"@babel/plugin-transform-destructuring": "^7.22.10",
-				"@babel/plugin-transform-dotall-regex": "^7.22.5",
-				"@babel/plugin-transform-duplicate-keys": "^7.22.5",
-				"@babel/plugin-transform-dynamic-import": "^7.22.5",
-				"@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-				"@babel/plugin-transform-export-namespace-from": "^7.22.5",
-				"@babel/plugin-transform-for-of": "^7.22.5",
-				"@babel/plugin-transform-function-name": "^7.22.5",
-				"@babel/plugin-transform-json-strings": "^7.22.5",
-				"@babel/plugin-transform-literals": "^7.22.5",
-				"@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
-				"@babel/plugin-transform-member-expression-literals": "^7.22.5",
-				"@babel/plugin-transform-modules-amd": "^7.22.5",
-				"@babel/plugin-transform-modules-commonjs": "^7.22.5",
-				"@babel/plugin-transform-modules-systemjs": "^7.22.5",
-				"@babel/plugin-transform-modules-umd": "^7.22.5",
+				"@babel/plugin-transform-arrow-functions": "^7.23.3",
+				"@babel/plugin-transform-async-generator-functions": "^7.23.9",
+				"@babel/plugin-transform-async-to-generator": "^7.23.3",
+				"@babel/plugin-transform-block-scoped-functions": "^7.23.3",
+				"@babel/plugin-transform-block-scoping": "^7.23.4",
+				"@babel/plugin-transform-class-properties": "^7.23.3",
+				"@babel/plugin-transform-class-static-block": "^7.23.4",
+				"@babel/plugin-transform-classes": "^7.23.8",
+				"@babel/plugin-transform-computed-properties": "^7.23.3",
+				"@babel/plugin-transform-destructuring": "^7.23.3",
+				"@babel/plugin-transform-dotall-regex": "^7.23.3",
+				"@babel/plugin-transform-duplicate-keys": "^7.23.3",
+				"@babel/plugin-transform-dynamic-import": "^7.23.4",
+				"@babel/plugin-transform-exponentiation-operator": "^7.23.3",
+				"@babel/plugin-transform-export-namespace-from": "^7.23.4",
+				"@babel/plugin-transform-for-of": "^7.23.6",
+				"@babel/plugin-transform-function-name": "^7.23.3",
+				"@babel/plugin-transform-json-strings": "^7.23.4",
+				"@babel/plugin-transform-literals": "^7.23.3",
+				"@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
+				"@babel/plugin-transform-member-expression-literals": "^7.23.3",
+				"@babel/plugin-transform-modules-amd": "^7.23.3",
+				"@babel/plugin-transform-modules-commonjs": "^7.23.3",
+				"@babel/plugin-transform-modules-systemjs": "^7.23.9",
+				"@babel/plugin-transform-modules-umd": "^7.23.3",
 				"@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-				"@babel/plugin-transform-new-target": "^7.22.5",
-				"@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-				"@babel/plugin-transform-numeric-separator": "^7.22.5",
-				"@babel/plugin-transform-object-rest-spread": "^7.22.5",
-				"@babel/plugin-transform-object-super": "^7.22.5",
-				"@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-				"@babel/plugin-transform-optional-chaining": "^7.22.10",
-				"@babel/plugin-transform-parameters": "^7.22.5",
-				"@babel/plugin-transform-private-methods": "^7.22.5",
-				"@babel/plugin-transform-private-property-in-object": "^7.22.5",
-				"@babel/plugin-transform-property-literals": "^7.22.5",
-				"@babel/plugin-transform-regenerator": "^7.22.10",
-				"@babel/plugin-transform-reserved-words": "^7.22.5",
-				"@babel/plugin-transform-shorthand-properties": "^7.22.5",
-				"@babel/plugin-transform-spread": "^7.22.5",
-				"@babel/plugin-transform-sticky-regex": "^7.22.5",
-				"@babel/plugin-transform-template-literals": "^7.22.5",
-				"@babel/plugin-transform-typeof-symbol": "^7.22.5",
-				"@babel/plugin-transform-unicode-escapes": "^7.22.10",
-				"@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
+				"@babel/plugin-transform-new-target": "^7.23.3",
+				"@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+				"@babel/plugin-transform-numeric-separator": "^7.23.4",
+				"@babel/plugin-transform-object-rest-spread": "^7.24.0",
+				"@babel/plugin-transform-object-super": "^7.23.3",
+				"@babel/plugin-transform-optional-catch-binding": "^7.23.4",
+				"@babel/plugin-transform-optional-chaining": "^7.23.4",
+				"@babel/plugin-transform-parameters": "^7.23.3",
+				"@babel/plugin-transform-private-methods": "^7.23.3",
+				"@babel/plugin-transform-private-property-in-object": "^7.23.4",
+				"@babel/plugin-transform-property-literals": "^7.23.3",
+				"@babel/plugin-transform-regenerator": "^7.23.3",
+				"@babel/plugin-transform-reserved-words": "^7.23.3",
+				"@babel/plugin-transform-shorthand-properties": "^7.23.3",
+				"@babel/plugin-transform-spread": "^7.23.3",
+				"@babel/plugin-transform-sticky-regex": "^7.23.3",
+				"@babel/plugin-transform-template-literals": "^7.23.3",
+				"@babel/plugin-transform-typeof-symbol": "^7.23.3",
+				"@babel/plugin-transform-unicode-escapes": "^7.23.3",
+				"@babel/plugin-transform-unicode-property-regex": "^7.23.3",
+				"@babel/plugin-transform-unicode-regex": "^7.23.3",
+				"@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
 				"@babel/preset-modules": "0.1.6-no-external-plugins",
-				"@babel/types": "^7.22.10",
-				"babel-plugin-polyfill-corejs2": "^0.4.5",
-				"babel-plugin-polyfill-corejs3": "^0.8.3",
-				"babel-plugin-polyfill-regenerator": "^0.5.2",
+				"babel-plugin-polyfill-corejs2": "^0.4.8",
+				"babel-plugin-polyfill-corejs3": "^0.9.0",
+				"babel-plugin-polyfill-regenerator": "^0.5.5",
 				"core-js-compat": "^3.31.0",
 				"semver": "^6.3.1"
 			},
@@ -1996,16 +2001,16 @@
 			}
 		},
 		"node_modules/@babel/preset-react": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.5.tgz",
-			"integrity": "sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.23.3.tgz",
+			"integrity": "sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-transform-react-display-name": "^7.22.5",
-				"@babel/plugin-transform-react-jsx": "^7.22.5",
+				"@babel/helper-validator-option": "^7.22.15",
+				"@babel/plugin-transform-react-display-name": "^7.23.3",
+				"@babel/plugin-transform-react-jsx": "^7.22.15",
 				"@babel/plugin-transform-react-jsx-development": "^7.22.5",
-				"@babel/plugin-transform-react-pure-annotations": "^7.22.5"
+				"@babel/plugin-transform-react-pure-annotations": "^7.23.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2015,15 +2020,15 @@
 			}
 		},
 		"node_modules/@babel/preset-typescript": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz",
-			"integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==",
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz",
+			"integrity": "sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==",
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-syntax-jsx": "^7.22.5",
-				"@babel/plugin-transform-modules-commonjs": "^7.22.5",
-				"@babel/plugin-transform-typescript": "^7.22.5"
+				"@babel/helper-validator-option": "^7.22.15",
+				"@babel/plugin-syntax-jsx": "^7.23.3",
+				"@babel/plugin-transform-modules-commonjs": "^7.23.3",
+				"@babel/plugin-transform-typescript": "^7.23.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -2038,9 +2043,9 @@
 			"integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
 		},
 		"node_modules/@babel/runtime": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz",
-			"integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz",
+			"integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==",
 			"dependencies": {
 				"regenerator-runtime": "^0.14.0"
 			},
@@ -2049,9 +2054,9 @@
 			}
 		},
 		"node_modules/@babel/runtime-corejs3": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.10.tgz",
-			"integrity": "sha512-IcixfV2Jl3UrqZX4c81+7lVg5++2ufYJyAFW3Aux/ZTvY6LVYYhJ9rMgnbX0zGVq6eqfVpnoatTjZdVki/GmWA==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.24.0.tgz",
+			"integrity": "sha512-HxiRMOncx3ly6f3fcZ1GVKf+/EROcI9qwPgmij8Czqy6Okm/0T37T4y2ZIlLUuEUFjtM7NRsfdCO8Y3tAiJZew==",
 			"dependencies": {
 				"core-js-pure": "^3.30.2",
 				"regenerator-runtime": "^0.14.0"
@@ -2061,32 +2066,32 @@
 			}
 		},
 		"node_modules/@babel/template": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-			"integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+			"integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
 			"dependencies": {
-				"@babel/code-frame": "^7.22.5",
-				"@babel/parser": "^7.22.5",
-				"@babel/types": "^7.22.5"
+				"@babel/code-frame": "^7.23.5",
+				"@babel/parser": "^7.24.0",
+				"@babel/types": "^7.24.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"dependencies": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz",
+			"integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==",
+			"dependencies": {
+				"@babel/code-frame": "^7.23.5",
+				"@babel/generator": "^7.23.6",
+				"@babel/helper-environment-visitor": "^7.22.20",
+				"@babel/helper-function-name": "^7.23.0",
 				"@babel/helper-hoist-variables": "^7.22.5",
 				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
+				"@babel/parser": "^7.24.0",
+				"@babel/types": "^7.24.0",
+				"debug": "^4.3.1",
 				"globals": "^11.1.0"
 			},
 			"engines": {
@@ -2094,12 +2099,12 @@
 			}
 		},
 		"node_modules/@babel/types": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-			"integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+			"integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
 			"dependencies": {
-				"@babel/helper-string-parser": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.5",
+				"@babel/helper-string-parser": "^7.23.4",
+				"@babel/helper-validator-identifier": "^7.22.20",
 				"to-fast-properties": "^2.0.0"
 			},
 			"engines": {
@@ -2124,18 +2129,18 @@
 			}
 		},
 		"node_modules/@docsearch/css": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.5.2.tgz",
-			"integrity": "sha512-SPiDHaWKQZpwR2siD0KQUwlStvIAnEyK6tAE2h2Wuoq8ue9skzhlyVQ1ddzOxX6khULnAALDiR/isSF3bnuciA=="
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.6.0.tgz",
+			"integrity": "sha512-+sbxb71sWre+PwDK7X2T8+bhS6clcVMLwBPznX45Qu6opJcgRjAp7gYSDzVFp187J+feSj5dNBN1mJoi6ckkUQ=="
 		},
 		"node_modules/@docsearch/react": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.5.2.tgz",
-			"integrity": "sha512-9Ahcrs5z2jq/DcAvYtvlqEBHImbm4YJI8M9y0x6Tqg598P40HTEkX7hsMcIuThI+hTFxRGZ9hll0Wygm2yEjng==",
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.6.0.tgz",
+			"integrity": "sha512-HUFut4ztcVNmqy9gp/wxNbC7pTOHhgVVkHVGCACTuLhUKUhKAF9KYHJtMiLUJxEqiFLQiuri1fWF8zqwM/cu1w==",
 			"dependencies": {
 				"@algolia/autocomplete-core": "1.9.3",
 				"@algolia/autocomplete-preset-algolia": "1.9.3",
-				"@docsearch/css": "3.5.2",
+				"@docsearch/css": "3.6.0",
 				"algoliasearch": "^4.19.1"
 			},
 			"peerDependencies": {
@@ -2160,157 +2165,164 @@
 			}
 		},
 		"node_modules/@docusaurus/core": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-2.4.1.tgz",
-			"integrity": "sha512-SNsY7PshK3Ri7vtsLXVeAJGS50nJN3RgF836zkyUfAD01Fq+sAk5EwWgLw+nnm5KVNGDu7PRR2kRGDsWvqpo0g==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-3.1.1.tgz",
+			"integrity": "sha512-2nQfKFcf+MLEM7JXsXwQxPOmQAR6ytKMZVSx7tVi9HEm9WtfwBH1fp6bn8Gj4zLUhjWKCLoysQ9/Wm+EZCQ4yQ==",
 			"dependencies": {
-				"@babel/core": "^7.18.6",
-				"@babel/generator": "^7.18.7",
+				"@babel/core": "^7.23.3",
+				"@babel/generator": "^7.23.3",
 				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-				"@babel/plugin-transform-runtime": "^7.18.6",
-				"@babel/preset-env": "^7.18.6",
-				"@babel/preset-react": "^7.18.6",
-				"@babel/preset-typescript": "^7.18.6",
-				"@babel/runtime": "^7.18.6",
-				"@babel/runtime-corejs3": "^7.18.6",
-				"@babel/traverse": "^7.18.8",
-				"@docusaurus/cssnano-preset": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
+				"@babel/plugin-transform-runtime": "^7.22.9",
+				"@babel/preset-env": "^7.22.9",
+				"@babel/preset-react": "^7.22.5",
+				"@babel/preset-typescript": "^7.22.5",
+				"@babel/runtime": "^7.22.6",
+				"@babel/runtime-corejs3": "^7.22.6",
+				"@babel/traverse": "^7.22.8",
+				"@docusaurus/cssnano-preset": "3.1.1",
+				"@docusaurus/logger": "3.1.1",
+				"@docusaurus/mdx-loader": "3.1.1",
 				"@docusaurus/react-loadable": "5.5.2",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
+				"@docusaurus/utils": "3.1.1",
+				"@docusaurus/utils-common": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
 				"@slorber/static-site-generator-webpack-plugin": "^4.0.7",
-				"@svgr/webpack": "^6.2.1",
-				"autoprefixer": "^10.4.7",
-				"babel-loader": "^8.2.5",
+				"@svgr/webpack": "^6.5.1",
+				"autoprefixer": "^10.4.14",
+				"babel-loader": "9.2.1",
 				"babel-plugin-dynamic-import-node": "^2.3.3",
 				"boxen": "^6.2.1",
 				"chalk": "^4.1.2",
 				"chokidar": "^3.5.3",
-				"clean-css": "^5.3.0",
-				"cli-table3": "^0.6.2",
+				"clean-css": "^5.3.2",
+				"cli-table3": "^0.6.3",
 				"combine-promises": "^1.1.0",
 				"commander": "^5.1.0",
 				"copy-webpack-plugin": "^11.0.0",
-				"core-js": "^3.23.3",
-				"css-loader": "^6.7.1",
-				"css-minimizer-webpack-plugin": "^4.0.0",
-				"cssnano": "^5.1.12",
+				"core-js": "^3.31.1",
+				"css-loader": "^6.8.1",
+				"css-minimizer-webpack-plugin": "^4.2.2",
+				"cssnano": "^5.1.15",
 				"del": "^6.1.1",
-				"detect-port": "^1.3.0",
+				"detect-port": "^1.5.1",
 				"escape-html": "^1.0.3",
-				"eta": "^2.0.0",
+				"eta": "^2.2.0",
 				"file-loader": "^6.2.0",
-				"fs-extra": "^10.1.0",
-				"html-minifier-terser": "^6.1.0",
-				"html-tags": "^3.2.0",
-				"html-webpack-plugin": "^5.5.0",
-				"import-fresh": "^3.3.0",
+				"fs-extra": "^11.1.1",
+				"html-minifier-terser": "^7.2.0",
+				"html-tags": "^3.3.1",
+				"html-webpack-plugin": "^5.5.3",
 				"leven": "^3.1.0",
 				"lodash": "^4.17.21",
-				"mini-css-extract-plugin": "^2.6.1",
-				"postcss": "^8.4.14",
-				"postcss-loader": "^7.0.0",
+				"mini-css-extract-plugin": "^2.7.6",
+				"postcss": "^8.4.26",
+				"postcss-loader": "^7.3.3",
 				"prompts": "^2.4.2",
 				"react-dev-utils": "^12.0.1",
 				"react-helmet-async": "^1.3.0",
 				"react-loadable": "npm:@docusaurus/react-loadable@5.5.2",
 				"react-loadable-ssr-addon-v5-slorber": "^1.0.1",
-				"react-router": "^5.3.3",
+				"react-router": "^5.3.4",
 				"react-router-config": "^5.1.1",
-				"react-router-dom": "^5.3.3",
+				"react-router-dom": "^5.3.4",
 				"rtl-detect": "^1.0.4",
-				"semver": "^7.3.7",
-				"serve-handler": "^6.1.3",
+				"semver": "^7.5.4",
+				"serve-handler": "^6.1.5",
 				"shelljs": "^0.8.5",
-				"terser-webpack-plugin": "^5.3.3",
-				"tslib": "^2.4.0",
-				"update-notifier": "^5.1.0",
+				"terser-webpack-plugin": "^5.3.9",
+				"tslib": "^2.6.0",
+				"update-notifier": "^6.0.2",
 				"url-loader": "^4.1.1",
-				"wait-on": "^6.0.1",
-				"webpack": "^5.73.0",
-				"webpack-bundle-analyzer": "^4.5.0",
-				"webpack-dev-server": "^4.9.3",
-				"webpack-merge": "^5.8.0",
+				"webpack": "^5.88.1",
+				"webpack-bundle-analyzer": "^4.9.0",
+				"webpack-dev-server": "^4.15.1",
+				"webpack-merge": "^5.9.0",
 				"webpackbar": "^5.0.2"
 			},
 			"bin": {
 				"docusaurus": "bin/docusaurus.mjs"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/cssnano-preset": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-2.4.1.tgz",
-			"integrity": "sha512-ka+vqXwtcW1NbXxWsh6yA1Ckii1klY9E53cJ4O9J09nkMBgrNX3iEFED1fWdv8wf4mJjvGi5RLZ2p9hJNjsLyQ==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-3.1.1.tgz",
+			"integrity": "sha512-LnoIDjJWbirdbVZDMq+4hwmrTl2yHDnBf9MLG9qyExeAE3ac35s4yUhJI8yyTCdixzNfKit4cbXblzzqMu4+8g==",
 			"dependencies": {
-				"cssnano-preset-advanced": "^5.3.8",
-				"postcss": "^8.4.14",
-				"postcss-sort-media-queries": "^4.2.1",
-				"tslib": "^2.4.0"
+				"cssnano-preset-advanced": "^5.3.10",
+				"postcss": "^8.4.26",
+				"postcss-sort-media-queries": "^4.4.1",
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			}
 		},
 		"node_modules/@docusaurus/logger": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-2.4.1.tgz",
-			"integrity": "sha512-5h5ysIIWYIDHyTVd8BjheZmQZmEgWDR54aQ1BX9pjFfpyzFo5puKXKYrYJXbjEHGyVhEzmB9UXwbxGfaZhOjcg==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.1.1.tgz",
+			"integrity": "sha512-BjkNDpQzewcTnST8trx4idSoAla6zZ3w22NqM/UMcFtvYJgmoE4layuTzlfql3VFPNuivvj7BOExa/+21y4X2Q==",
 			"dependencies": {
 				"chalk": "^4.1.2",
-				"tslib": "^2.4.0"
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			}
 		},
 		"node_modules/@docusaurus/mdx-loader": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-2.4.1.tgz",
-			"integrity": "sha512-4KhUhEavteIAmbBj7LVFnrVYDiU51H5YWW1zY6SmBSte/YLhDutztLTBE0PQl1Grux1jzUJeaSvAzHpTn6JJDQ==",
-			"dependencies": {
-				"@babel/parser": "^7.18.8",
-				"@babel/traverse": "^7.18.8",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@mdx-js/mdx": "^1.6.22",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-3.1.1.tgz",
+			"integrity": "sha512-xN2IccH9+sv7TmxwsDJNS97BHdmlqWwho+kIVY4tcCXkp+k4QuzvWBeunIMzeayY4Fu13A6sAjHGv5qm72KyGA==",
+			"dependencies": {
+				"@babel/parser": "^7.22.7",
+				"@babel/traverse": "^7.22.8",
+				"@docusaurus/logger": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
+				"@mdx-js/mdx": "^3.0.0",
+				"@slorber/remark-comment": "^1.0.0",
 				"escape-html": "^1.0.3",
+				"estree-util-value-to-estree": "^3.0.1",
 				"file-loader": "^6.2.0",
-				"fs-extra": "^10.1.0",
-				"image-size": "^1.0.1",
-				"mdast-util-to-string": "^2.0.0",
-				"remark-emoji": "^2.2.0",
+				"fs-extra": "^11.1.1",
+				"image-size": "^1.0.2",
+				"mdast-util-mdx": "^3.0.0",
+				"mdast-util-to-string": "^4.0.0",
+				"rehype-raw": "^7.0.0",
+				"remark-directive": "^3.0.0",
+				"remark-emoji": "^4.0.0",
+				"remark-frontmatter": "^5.0.0",
+				"remark-gfm": "^4.0.0",
 				"stringify-object": "^3.3.0",
-				"tslib": "^2.4.0",
-				"unified": "^9.2.2",
-				"unist-util-visit": "^2.0.3",
+				"tslib": "^2.6.0",
+				"unified": "^11.0.3",
+				"unist-util-visit": "^5.0.0",
 				"url-loader": "^4.1.1",
-				"webpack": "^5.73.0"
+				"vfile": "^6.0.1",
+				"webpack": "^5.88.1"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/module-type-aliases": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-2.4.1.tgz",
-			"integrity": "sha512-gLBuIFM8Dp2XOCWffUDSjtxY7jQgKvYujt7Mx5s4FCTfoL5dN1EVbnrn+O2Wvh8b0a77D57qoIDY7ghgmatR1A==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.1.1.tgz",
+			"integrity": "sha512-xBJyx0TMfAfVZ9ZeIOb1awdXgR4YJMocIEzTps91rq+hJDFJgJaylDtmoRhUxkwuYmNK1GJpW95b7DLztSBJ3A==",
 			"dependencies": {
 				"@docusaurus/react-loadable": "5.5.2",
-				"@docusaurus/types": "2.4.1",
+				"@docusaurus/types": "3.1.1",
 				"@types/history": "^4.7.11",
 				"@types/react": "*",
 				"@types/react-router-config": "*",
@@ -2324,209 +2336,210 @@
 			}
 		},
 		"node_modules/@docusaurus/plugin-content-blog": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.4.1.tgz",
-			"integrity": "sha512-E2i7Knz5YIbE1XELI6RlTnZnGgS52cUO4BlCiCUCvQHbR+s1xeIWz4C6BtaVnlug0Ccz7nFSksfwDpVlkujg5Q==",
-			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.1.1.tgz",
+			"integrity": "sha512-ew/3VtVoG3emoAKmoZl7oKe1zdFOsI0NbcHS26kIxt2Z8vcXKCUgK9jJJrz0TbOipyETPhqwq4nbitrY3baibg==",
+			"dependencies": {
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/logger": "3.1.1",
+				"@docusaurus/mdx-loader": "3.1.1",
+				"@docusaurus/types": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"@docusaurus/utils-common": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
 				"cheerio": "^1.0.0-rc.12",
 				"feed": "^4.2.2",
-				"fs-extra": "^10.1.0",
+				"fs-extra": "^11.1.1",
 				"lodash": "^4.17.21",
 				"reading-time": "^1.5.0",
-				"tslib": "^2.4.0",
-				"unist-util-visit": "^2.0.3",
+				"srcset": "^4.0.0",
+				"tslib": "^2.6.0",
+				"unist-util-visit": "^5.0.0",
 				"utility-types": "^3.10.0",
-				"webpack": "^5.73.0"
+				"webpack": "^5.88.1"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/plugin-content-docs": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.4.1.tgz",
-			"integrity": "sha512-Lo7lSIcpswa2Kv4HEeUcGYqaasMUQNpjTXpV0N8G6jXgZaQurqp7E8NGYeGbDXnb48czmHWbzDL4S3+BbK0VzA==",
-			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/module-type-aliases": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"@types/react-router-config": "^5.0.6",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.1.1.tgz",
+			"integrity": "sha512-lhFq4E874zw0UOH7ujzxnCayOyAt0f9YPVYSb9ohxrdCM8B4szxitUw9rIX4V9JLLHVoqIJb6k+lJJ1jrcGJ0A==",
+			"dependencies": {
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/logger": "3.1.1",
+				"@docusaurus/mdx-loader": "3.1.1",
+				"@docusaurus/module-type-aliases": "3.1.1",
+				"@docusaurus/types": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
+				"@types/react-router-config": "^5.0.7",
 				"combine-promises": "^1.1.0",
-				"fs-extra": "^10.1.0",
-				"import-fresh": "^3.3.0",
+				"fs-extra": "^11.1.1",
 				"js-yaml": "^4.1.0",
 				"lodash": "^4.17.21",
-				"tslib": "^2.4.0",
+				"tslib": "^2.6.0",
 				"utility-types": "^3.10.0",
-				"webpack": "^5.73.0"
+				"webpack": "^5.88.1"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/plugin-content-pages": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.4.1.tgz",
-			"integrity": "sha512-/UjuH/76KLaUlL+o1OvyORynv6FURzjurSjvn2lbWTFc4tpYY2qLYTlKpTCBVPhlLUQsfyFnshEJDLmPneq2oA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.1.1.tgz",
+			"integrity": "sha512-NQHncNRAJbyLtgTim9GlEnNYsFhuCxaCNkMwikuxLTiGIPH7r/jpb7O3f3jUMYMebZZZrDq5S7om9a6rvB/YCA==",
 			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"fs-extra": "^10.1.0",
-				"tslib": "^2.4.0",
-				"webpack": "^5.73.0"
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/mdx-loader": "3.1.1",
+				"@docusaurus/types": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
+				"fs-extra": "^11.1.1",
+				"tslib": "^2.6.0",
+				"webpack": "^5.88.1"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/plugin-debug": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-2.4.1.tgz",
-			"integrity": "sha512-7Yu9UPzRShlrH/G8btOpR0e6INFZr0EegWplMjOqelIwAcx3PKyR8mgPTxGTxcqiYj6hxSCRN0D8R7YrzImwNA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-3.1.1.tgz",
+			"integrity": "sha512-xWeMkueM9wE/8LVvl4+Qf1WqwXmreMjI5Kgr7GYCDoJ8zu4kD+KaMhrh7py7MNM38IFvU1RfrGKacCEe2DRRfQ==",
 			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"fs-extra": "^10.1.0",
-				"react-json-view": "^1.21.3",
-				"tslib": "^2.4.0"
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/types": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"fs-extra": "^11.1.1",
+				"react-json-view-lite": "^1.2.0",
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/plugin-google-analytics": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.4.1.tgz",
-			"integrity": "sha512-dyZJdJiCoL+rcfnm0RPkLt/o732HvLiEwmtoNzOoz9MSZz117UH2J6U2vUDtzUzwtFLIf32KkeyzisbwUCgcaQ==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.1.1.tgz",
+			"integrity": "sha512-+q2UpWTqVi8GdlLoSlD5bS/YpxW+QMoBwrPrUH/NpvpuOi0Of7MTotsQf9JWd3hymZxl2uu1o3PIrbpxfeDFDQ==",
 			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"tslib": "^2.4.0"
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/types": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/plugin-google-gtag": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.4.1.tgz",
-			"integrity": "sha512-mKIefK+2kGTQBYvloNEKtDmnRD7bxHLsBcxgnbt4oZwzi2nxCGjPX6+9SQO2KCN5HZbNrYmGo5GJfMgoRvy6uA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.1.1.tgz",
+			"integrity": "sha512-0mMPiBBlQ5LFHTtjxuvt/6yzh8v7OxLi3CbeEsxXZpUzcKO/GC7UA1VOWUoBeQzQL508J12HTAlR3IBU9OofSw==",
 			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"tslib": "^2.4.0"
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/types": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
+				"@types/gtag.js": "^0.0.12",
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/plugin-google-tag-manager": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-2.4.1.tgz",
-			"integrity": "sha512-Zg4Ii9CMOLfpeV2nG74lVTWNtisFaH9QNtEw48R5QE1KIwDBdTVaiSA18G1EujZjrzJJzXN79VhINSbOJO/r3g==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.1.1.tgz",
+			"integrity": "sha512-d07bsrMLdDIryDtY17DgqYUbjkswZQr8cLWl4tzXrt5OR/T/zxC1SYKajzB3fd87zTu5W5klV5GmUwcNSMXQXA==",
 			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"tslib": "^2.4.0"
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/types": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/plugin-sitemap": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.4.1.tgz",
-			"integrity": "sha512-lZx+ijt/+atQ3FVE8FOHV/+X3kuok688OydDXrqKRJyXBJZKgGjA2Qa8RjQ4f27V2woaXhtnyrdPop/+OjVMRg==",
-			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"fs-extra": "^10.1.0",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.1.1.tgz",
+			"integrity": "sha512-iJ4hCaMmDaUqRv131XJdt/C/jJQx8UreDWTRqZKtNydvZVh/o4yXGRRFOplea1D9b/zpwL1Y+ZDwX7xMhIOTmg==",
+			"dependencies": {
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/logger": "3.1.1",
+				"@docusaurus/types": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"@docusaurus/utils-common": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
+				"fs-extra": "^11.1.1",
 				"sitemap": "^7.1.1",
-				"tslib": "^2.4.0"
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/preset-classic": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-2.4.1.tgz",
-			"integrity": "sha512-P4//+I4zDqQJ+UDgoFrjIFaQ1MeS9UD1cvxVQaI6O7iBmiHQm0MGROP1TbE7HlxlDPXFJjZUK3x3cAoK63smGQ==",
-			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/plugin-content-blog": "2.4.1",
-				"@docusaurus/plugin-content-docs": "2.4.1",
-				"@docusaurus/plugin-content-pages": "2.4.1",
-				"@docusaurus/plugin-debug": "2.4.1",
-				"@docusaurus/plugin-google-analytics": "2.4.1",
-				"@docusaurus/plugin-google-gtag": "2.4.1",
-				"@docusaurus/plugin-google-tag-manager": "2.4.1",
-				"@docusaurus/plugin-sitemap": "2.4.1",
-				"@docusaurus/theme-classic": "2.4.1",
-				"@docusaurus/theme-common": "2.4.1",
-				"@docusaurus/theme-search-algolia": "2.4.1",
-				"@docusaurus/types": "2.4.1"
-			},
-			"engines": {
-				"node": ">=16.14"
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-3.1.1.tgz",
+			"integrity": "sha512-jG4ys/hWYf69iaN/xOmF+3kjs4Nnz1Ay3CjFLDtYa8KdxbmUhArA9HmP26ru5N0wbVWhY+6kmpYhTJpez5wTyg==",
+			"dependencies": {
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/plugin-content-blog": "3.1.1",
+				"@docusaurus/plugin-content-docs": "3.1.1",
+				"@docusaurus/plugin-content-pages": "3.1.1",
+				"@docusaurus/plugin-debug": "3.1.1",
+				"@docusaurus/plugin-google-analytics": "3.1.1",
+				"@docusaurus/plugin-google-gtag": "3.1.1",
+				"@docusaurus/plugin-google-tag-manager": "3.1.1",
+				"@docusaurus/plugin-sitemap": "3.1.1",
+				"@docusaurus/theme-classic": "3.1.1",
+				"@docusaurus/theme-common": "3.1.1",
+				"@docusaurus/theme-search-algolia": "3.1.1",
+				"@docusaurus/types": "3.1.1"
+			},
+			"engines": {
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/react-loadable": {
@@ -2542,159 +2555,187 @@
 			}
 		},
 		"node_modules/@docusaurus/theme-classic": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-2.4.1.tgz",
-			"integrity": "sha512-Rz0wKUa+LTW1PLXmwnf8mn85EBzaGSt6qamqtmnh9Hflkc+EqiYMhtUJeLdV+wsgYq4aG0ANc+bpUDpsUhdnwg==",
-			"dependencies": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/module-type-aliases": "2.4.1",
-				"@docusaurus/plugin-content-blog": "2.4.1",
-				"@docusaurus/plugin-content-docs": "2.4.1",
-				"@docusaurus/plugin-content-pages": "2.4.1",
-				"@docusaurus/theme-common": "2.4.1",
-				"@docusaurus/theme-translations": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"@mdx-js/react": "^1.6.22",
-				"clsx": "^1.2.1",
-				"copy-text-to-clipboard": "^3.0.1",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.1.1.tgz",
+			"integrity": "sha512-GiPE/jbWM8Qv1A14lk6s9fhc0LhPEQ00eIczRO4QL2nAQJZXkjPG6zaVx+1cZxPFWbAsqSjKe2lqkwF3fGkQ7Q==",
+			"dependencies": {
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/mdx-loader": "3.1.1",
+				"@docusaurus/module-type-aliases": "3.1.1",
+				"@docusaurus/plugin-content-blog": "3.1.1",
+				"@docusaurus/plugin-content-docs": "3.1.1",
+				"@docusaurus/plugin-content-pages": "3.1.1",
+				"@docusaurus/theme-common": "3.1.1",
+				"@docusaurus/theme-translations": "3.1.1",
+				"@docusaurus/types": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"@docusaurus/utils-common": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
+				"@mdx-js/react": "^3.0.0",
+				"clsx": "^2.0.0",
+				"copy-text-to-clipboard": "^3.2.0",
 				"infima": "0.2.0-alpha.43",
 				"lodash": "^4.17.21",
 				"nprogress": "^0.2.0",
-				"postcss": "^8.4.14",
-				"prism-react-renderer": "^1.3.5",
-				"prismjs": "^1.28.0",
-				"react-router-dom": "^5.3.3",
-				"rtlcss": "^3.5.0",
-				"tslib": "^2.4.0",
+				"postcss": "^8.4.26",
+				"prism-react-renderer": "^2.3.0",
+				"prismjs": "^1.29.0",
+				"react-router-dom": "^5.3.4",
+				"rtlcss": "^4.1.0",
+				"tslib": "^2.6.0",
 				"utility-types": "^3.10.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@docusaurus/theme-classic/node_modules/clsx": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
 		"node_modules/@docusaurus/theme-common": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-2.4.1.tgz",
-			"integrity": "sha512-G7Zau1W5rQTaFFB3x3soQoZpkgMbl/SYNG8PfMFIjKa3M3q8n0m/GRf5/H/e5BqOvt8c+ZWIXGCiz+kUCSHovA==",
-			"dependencies": {
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/module-type-aliases": "2.4.1",
-				"@docusaurus/plugin-content-blog": "2.4.1",
-				"@docusaurus/plugin-content-docs": "2.4.1",
-				"@docusaurus/plugin-content-pages": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.1.1.tgz",
+			"integrity": "sha512-38urZfeMhN70YaXkwIGXmcUcv2CEYK/2l4b05GkJPrbEbgpsIZM3Xc+Js2ehBGGZmfZq8GjjQ5RNQYG+MYzCYg==",
+			"dependencies": {
+				"@docusaurus/mdx-loader": "3.1.1",
+				"@docusaurus/module-type-aliases": "3.1.1",
+				"@docusaurus/plugin-content-blog": "3.1.1",
+				"@docusaurus/plugin-content-docs": "3.1.1",
+				"@docusaurus/plugin-content-pages": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"@docusaurus/utils-common": "3.1.1",
 				"@types/history": "^4.7.11",
 				"@types/react": "*",
 				"@types/react-router-config": "*",
-				"clsx": "^1.2.1",
+				"clsx": "^2.0.0",
 				"parse-numeric-range": "^1.3.0",
-				"prism-react-renderer": "^1.3.5",
-				"tslib": "^2.4.0",
-				"use-sync-external-store": "^1.2.0",
+				"prism-react-renderer": "^2.3.0",
+				"tslib": "^2.6.0",
 				"utility-types": "^3.10.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@docusaurus/theme-common/node_modules/clsx": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
 		"node_modules/@docusaurus/theme-search-algolia": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.4.1.tgz",
-			"integrity": "sha512-6BcqW2lnLhZCXuMAvPRezFs1DpmEKzXFKlYjruuas+Xy3AQeFzDJKTJFIm49N77WFCTyxff8d3E4Q9pi/+5McQ==",
-			"dependencies": {
-				"@docsearch/react": "^3.1.1",
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/plugin-content-docs": "2.4.1",
-				"@docusaurus/theme-common": "2.4.1",
-				"@docusaurus/theme-translations": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"algoliasearch": "^4.13.1",
-				"algoliasearch-helper": "^3.10.0",
-				"clsx": "^1.2.1",
-				"eta": "^2.0.0",
-				"fs-extra": "^10.1.0",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.1.1.tgz",
+			"integrity": "sha512-tBH9VY5EpRctVdaAhT+b1BY8y5dyHVZGFXyCHgTrvcXQy5CV4q7serEX7U3SveNT9zksmchPyct6i1sFDC4Z5g==",
+			"dependencies": {
+				"@docsearch/react": "^3.5.2",
+				"@docusaurus/core": "3.1.1",
+				"@docusaurus/logger": "3.1.1",
+				"@docusaurus/plugin-content-docs": "3.1.1",
+				"@docusaurus/theme-common": "3.1.1",
+				"@docusaurus/theme-translations": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"@docusaurus/utils-validation": "3.1.1",
+				"algoliasearch": "^4.18.0",
+				"algoliasearch-helper": "^3.13.3",
+				"clsx": "^2.0.0",
+				"eta": "^2.2.0",
+				"fs-extra": "^11.1.1",
 				"lodash": "^4.17.21",
-				"tslib": "^2.4.0",
+				"tslib": "^2.6.0",
 				"utility-types": "^3.10.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@docusaurus/theme-search-algolia/node_modules/clsx": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
 			}
 		},
 		"node_modules/@docusaurus/theme-translations": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-2.4.1.tgz",
-			"integrity": "sha512-T1RAGP+f86CA1kfE8ejZ3T3pUU3XcyvrGMfC/zxCtc2BsnoexuNI9Vk2CmuKCb+Tacvhxjv5unhxXce0+NKyvA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-3.1.1.tgz",
+			"integrity": "sha512-xvWQFwjxHphpJq5fgk37FXCDdAa2o+r7FX8IpMg+bGZBNXyWBu3MjZ+G4+eUVNpDhVinTc+j6ucL0Ain5KCGrg==",
 			"dependencies": {
-				"fs-extra": "^10.1.0",
-				"tslib": "^2.4.0"
+				"fs-extra": "^11.1.1",
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			}
 		},
 		"node_modules/@docusaurus/types": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-2.4.1.tgz",
-			"integrity": "sha512-0R+cbhpMkhbRXX138UOc/2XZFF8hiZa6ooZAEEJFp5scytzCw4tC1gChMFXrpa3d2tYE6AX8IrOEpSonLmfQuQ==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+			"integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
 			"dependencies": {
+				"@mdx-js/mdx": "^3.0.0",
 				"@types/history": "^4.7.11",
 				"@types/react": "*",
 				"commander": "^5.1.0",
-				"joi": "^17.6.0",
+				"joi": "^17.9.2",
 				"react-helmet-async": "^1.3.0",
 				"utility-types": "^3.10.0",
-				"webpack": "^5.73.0",
-				"webpack-merge": "^5.8.0"
+				"webpack": "^5.88.1",
+				"webpack-merge": "^5.9.0"
 			},
 			"peerDependencies": {
-				"react": "^16.8.4 || ^17.0.0",
-				"react-dom": "^16.8.4 || ^17.0.0"
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
 			}
 		},
 		"node_modules/@docusaurus/utils": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-2.4.1.tgz",
-			"integrity": "sha512-1lvEZdAQhKNht9aPXPoh69eeKnV0/62ROhQeFKKxmzd0zkcuE/Oc5Gpnt00y/f5bIsmOsYMY7Pqfm/5rteT5GA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.1.1.tgz",
+			"integrity": "sha512-ZJfJa5cJQtRYtqijsPEnAZoduW6sjAQ7ZCWSZavLcV10Fw0Z3gSaPKA/B4micvj2afRZ4gZxT7KfYqe5H8Cetg==",
 			"dependencies": {
-				"@docusaurus/logger": "2.4.1",
-				"@svgr/webpack": "^6.2.1",
+				"@docusaurus/logger": "3.1.1",
+				"@svgr/webpack": "^6.5.1",
 				"escape-string-regexp": "^4.0.0",
 				"file-loader": "^6.2.0",
-				"fs-extra": "^10.1.0",
-				"github-slugger": "^1.4.0",
+				"fs-extra": "^11.1.1",
+				"github-slugger": "^1.5.0",
 				"globby": "^11.1.0",
 				"gray-matter": "^4.0.3",
+				"jiti": "^1.20.0",
 				"js-yaml": "^4.1.0",
 				"lodash": "^4.17.21",
 				"micromatch": "^4.0.5",
 				"resolve-pathname": "^3.0.0",
 				"shelljs": "^0.8.5",
-				"tslib": "^2.4.0",
+				"tslib": "^2.6.0",
 				"url-loader": "^4.1.1",
-				"webpack": "^5.73.0"
+				"webpack": "^5.88.1"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
 				"@docusaurus/types": "*"
@@ -2706,14 +2747,14 @@
 			}
 		},
 		"node_modules/@docusaurus/utils-common": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-2.4.1.tgz",
-			"integrity": "sha512-bCVGdZU+z/qVcIiEQdyx0K13OC5mYwxhSuDUR95oFbKVuXYRrTVrwZIqQljuo1fyJvFTKHiL9L9skQOPokuFNQ==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-3.1.1.tgz",
+			"integrity": "sha512-eGne3olsIoNfPug5ixjepZAIxeYFzHHnor55Wb2P57jNbtVaFvij/T+MS8U0dtZRFi50QU+UPmRrXdVUM8uyMg==",
 			"dependencies": {
-				"tslib": "^2.4.0"
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			},
 			"peerDependencies": {
 				"@docusaurus/types": "*"
@@ -2725,18 +2766,18 @@
 			}
 		},
 		"node_modules/@docusaurus/utils-validation": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-2.4.1.tgz",
-			"integrity": "sha512-unII3hlJlDwZ3w8U+pMO3Lx3RhI4YEbY3YNsQj4yzrkZzlpqZOLuAiZK2JyULnD+TKbceKU0WyWkQXtYbLNDFA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-3.1.1.tgz",
+			"integrity": "sha512-KlY4P9YVDnwL+nExvlIpu79abfEv6ZCHuOX4ZQ+gtip+Wxj0daccdReIWWtqxM/Fb5Cz1nQvUCc7VEtT8IBUAA==",
 			"dependencies": {
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"joi": "^17.6.0",
+				"@docusaurus/logger": "3.1.1",
+				"@docusaurus/utils": "3.1.1",
+				"joi": "^17.9.2",
 				"js-yaml": "^4.1.0",
-				"tslib": "^2.4.0"
+				"tslib": "^2.6.0"
 			},
 			"engines": {
-				"node": ">=16.14"
+				"node": ">=18.0"
 			}
 		},
 		"node_modules/@hapi/hoek": {
@@ -2780,41 +2821,41 @@
 			}
 		},
 		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-			"integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
 			"dependencies": {
-				"@jridgewell/set-array": "^1.0.1",
+				"@jridgewell/set-array": "^1.2.1",
 				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/trace-mapping": "^0.3.24"
 			},
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-			"integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/source-map": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-			"integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
 			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25"
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
@@ -2823,9 +2864,9 @@
 			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
 		},
 		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.19",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-			"integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+			"version": "0.3.25",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
 			"dependencies": {
 				"@jridgewell/resolve-uri": "^3.1.0",
 				"@jridgewell/sourcemap-codec": "^1.4.14"
@@ -2837,103 +2878,33 @@
 			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
 		},
 		"node_modules/@mdx-js/mdx": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz",
-			"integrity": "sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==",
-			"dependencies": {
-				"@babel/core": "7.12.9",
-				"@babel/plugin-syntax-jsx": "7.12.1",
-				"@babel/plugin-syntax-object-rest-spread": "7.8.3",
-				"@mdx-js/util": "1.6.22",
-				"babel-plugin-apply-mdx-type-prop": "1.6.22",
-				"babel-plugin-extract-import-names": "1.6.22",
-				"camelcase-css": "2.0.1",
-				"detab": "2.0.4",
-				"hast-util-raw": "6.0.1",
-				"lodash.uniq": "4.5.0",
-				"mdast-util-to-hast": "10.0.1",
-				"remark-footnotes": "2.0.0",
-				"remark-mdx": "1.6.22",
-				"remark-parse": "8.0.3",
-				"remark-squeeze-paragraphs": "4.0.0",
-				"style-to-object": "0.3.0",
-				"unified": "9.2.0",
-				"unist-builder": "2.0.3",
-				"unist-util-visit": "2.0.3"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/@mdx-js/mdx/node_modules/@babel/core": {
-			"version": "7.12.9",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
-			"integrity": "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==",
-			"dependencies": {
-				"@babel/code-frame": "^7.10.4",
-				"@babel/generator": "^7.12.5",
-				"@babel/helper-module-transforms": "^7.12.1",
-				"@babel/helpers": "^7.12.5",
-				"@babel/parser": "^7.12.7",
-				"@babel/template": "^7.12.7",
-				"@babel/traverse": "^7.12.9",
-				"@babel/types": "^7.12.7",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.1",
-				"json5": "^2.1.2",
-				"lodash": "^4.17.19",
-				"resolve": "^1.3.2",
-				"semver": "^5.4.1",
-				"source-map": "^0.5.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@mdx-js/mdx/node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.12.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
-			"integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@mdx-js/mdx/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"bin": {
-				"semver": "bin/semver"
-			}
-		},
-		"node_modules/@mdx-js/mdx/node_modules/source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/@mdx-js/mdx/node_modules/unified": {
-			"version": "9.2.0",
-			"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
-			"integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-3.0.1.tgz",
+			"integrity": "sha512-eIQ4QTrOWyL3LWEe/bu6Taqzq2HQvHcyTMaOrI95P2/LmJE7AsfPfgJGuFLPVqBUE1BC1rik3VIhU+s9u72arA==",
 			"dependencies": {
-				"bail": "^1.0.0",
-				"extend": "^3.0.0",
-				"is-buffer": "^2.0.0",
-				"is-plain-obj": "^2.0.0",
-				"trough": "^1.0.0",
-				"vfile": "^4.0.0"
+				"@types/estree": "^1.0.0",
+				"@types/estree-jsx": "^1.0.0",
+				"@types/hast": "^3.0.0",
+				"@types/mdx": "^2.0.0",
+				"collapse-white-space": "^2.0.0",
+				"devlop": "^1.0.0",
+				"estree-util-build-jsx": "^3.0.0",
+				"estree-util-is-identifier-name": "^3.0.0",
+				"estree-util-to-js": "^2.0.0",
+				"estree-walker": "^3.0.0",
+				"hast-util-to-estree": "^3.0.0",
+				"hast-util-to-jsx-runtime": "^2.0.0",
+				"markdown-extensions": "^2.0.0",
+				"periscopic": "^3.0.0",
+				"remark-mdx": "^3.0.0",
+				"remark-parse": "^11.0.0",
+				"remark-rehype": "^11.0.0",
+				"source-map": "^0.7.0",
+				"unified": "^11.0.0",
+				"unist-util-position-from-estree": "^2.0.0",
+				"unist-util-stringify-position": "^4.0.0",
+				"unist-util-visit": "^5.0.0",
+				"vfile": "^6.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -2941,24 +2912,19 @@
 			}
 		},
 		"node_modules/@mdx-js/react": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.22.tgz",
-			"integrity": "sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.0.1.tgz",
+			"integrity": "sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A==",
+			"dependencies": {
+				"@types/mdx": "^2.0.0"
+			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
 			},
 			"peerDependencies": {
-				"react": "^16.13.1 || ^17.0.0"
-			}
-		},
-		"node_modules/@mdx-js/util": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz",
-			"integrity": "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
+				"@types/react": ">=16",
+				"react": ">=16"
 			}
 		},
 		"node_modules/@nodelib/fs.scandir": {
@@ -2993,15 +2959,47 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/@pnpm/config.env-replace": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz",
+			"integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==",
+			"engines": {
+				"node": ">=12.22.0"
+			}
+		},
+		"node_modules/@pnpm/network.ca-file": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz",
+			"integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==",
+			"dependencies": {
+				"graceful-fs": "4.2.10"
+			},
+			"engines": {
+				"node": ">=12.22.0"
+			}
+		},
+		"node_modules/@pnpm/npm-conf": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz",
+			"integrity": "sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==",
+			"dependencies": {
+				"@pnpm/config.env-replace": "^1.1.0",
+				"@pnpm/network.ca-file": "^1.0.1",
+				"config-chain": "^1.1.11"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/@polka/url": {
-			"version": "1.0.0-next.21",
-			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
-			"integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g=="
+			"version": "1.0.0-next.25",
+			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
+			"integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ=="
 		},
 		"node_modules/@sideway/address": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
-			"integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
+			"integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
 			"dependencies": {
 				"@hapi/hoek": "^9.0.0"
 			}
@@ -3022,11 +3020,24 @@
 			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
 		},
 		"node_modules/@sindresorhus/is": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-			"integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+			"integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/is?sponsor=1"
+			}
+		},
+		"node_modules/@slorber/remark-comment": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@slorber/remark-comment/-/remark-comment-1.0.0.tgz",
+			"integrity": "sha512-RCE24n7jsOj1M0UPvIQCHTe7fI0sFL4S2nwKVWwHyVr/wI/H8GosgsJGyhnsZoGFnD/P2hLf1mSbrrgSLN93NA==",
+			"dependencies": {
+				"micromark-factory-space": "^1.0.0",
+				"micromark-util-character": "^1.1.0",
+				"micromark-util-symbol": "^1.0.1"
 			}
 		},
 		"node_modules/@slorber/static-site-generator-webpack-plugin": {
@@ -3286,14 +3297,14 @@
 			}
 		},
 		"node_modules/@szmarczak/http-timer": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-			"integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+			"integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
 			"dependencies": {
-				"defer-to-connect": "^1.0.1"
+				"defer-to-connect": "^2.0.1"
 			},
 			"engines": {
-				"node": ">=6"
+				"node": ">=14.16"
 			}
 		},
 		"node_modules/@trysound/sax": {
@@ -3304,67 +3315,73 @@
 				"node": ">=10.13.0"
 			}
 		},
+		"node_modules/@types/acorn": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/@types/acorn/-/acorn-4.0.6.tgz",
+			"integrity": "sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==",
+			"dependencies": {
+				"@types/estree": "*"
+			}
+		},
 		"node_modules/@types/body-parser": {
-			"version": "1.19.2",
-			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-			"integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+			"version": "1.19.5",
+			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+			"integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
 			"dependencies": {
 				"@types/connect": "*",
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/bonjour": {
-			"version": "3.5.10",
-			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-			"integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
+			"version": "3.5.13",
+			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+			"integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/connect": {
-			"version": "3.4.35",
-			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+			"version": "3.4.38",
+			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+			"integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/connect-history-api-fallback": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
-			"integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+			"integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
 			"dependencies": {
 				"@types/express-serve-static-core": "*",
 				"@types/node": "*"
 			}
 		},
-		"node_modules/@types/eslint": {
-			"version": "8.44.2",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz",
-			"integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==",
+		"node_modules/@types/debug": {
+			"version": "4.1.12",
+			"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+			"integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
 			"dependencies": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
+				"@types/ms": "*"
 			}
 		},
-		"node_modules/@types/eslint-scope": {
-			"version": "3.7.4",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-			"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-			"dependencies": {
-				"@types/eslint": "*",
+		"node_modules/@types/estree": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+			"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+		},
+		"node_modules/@types/estree-jsx": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.5.tgz",
+			"integrity": "sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==",
+			"dependencies": {
 				"@types/estree": "*"
 			}
 		},
-		"node_modules/@types/estree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
-			"integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="
-		},
 		"node_modules/@types/express": {
-			"version": "4.17.17",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
-			"integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+			"integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
 			"dependencies": {
 				"@types/body-parser": "*",
 				"@types/express-serve-static-core": "^4.17.33",
@@ -3373,9 +3390,9 @@
 			}
 		},
 		"node_modules/@types/express-serve-static-core": {
-			"version": "4.17.35",
-			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
-			"integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
+			"version": "4.17.43",
+			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz",
+			"integrity": "sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==",
 			"dependencies": {
 				"@types/node": "*",
 				"@types/qs": "*",
@@ -3383,12 +3400,17 @@
 				"@types/send": "*"
 			}
 		},
+		"node_modules/@types/gtag.js": {
+			"version": "0.0.12",
+			"resolved": "https://registry.npmjs.org/@types/gtag.js/-/gtag.js-0.0.12.tgz",
+			"integrity": "sha512-YQV9bUsemkzG81Ea295/nF/5GijnD2Af7QhEofh7xu+kvCN6RdodgNwwGWXB5GMI3NoyvQo0odNctoH/qLMIpg=="
+		},
 		"node_modules/@types/hast": {
-			"version": "2.3.5",
-			"resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.5.tgz",
-			"integrity": "sha512-SvQi0L/lNpThgPoleH53cdjB3y9zpLlVjRbqB3rH8hx1jiRSBGAhyjV3H+URFjNVRqt2EdYNrbZE5IsGlNfpRg==",
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+			"integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
 			"dependencies": {
-				"@types/unist": "^2"
+				"@types/unist": "*"
 			}
 		},
 		"node_modules/@types/history": {
@@ -3401,92 +3423,121 @@
 			"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
 			"integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
 		},
+		"node_modules/@types/http-cache-semantics": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
+			"integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="
+		},
 		"node_modules/@types/http-errors": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
-			"integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ=="
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+			"integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
 		},
 		"node_modules/@types/http-proxy": {
-			"version": "1.17.11",
-			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
-			"integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
+			"version": "1.17.14",
+			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
+			"integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/istanbul-lib-coverage": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-			"integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+			"integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
 		},
 		"node_modules/@types/istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+			"integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
 			"dependencies": {
 				"@types/istanbul-lib-coverage": "*"
 			}
 		},
 		"node_modules/@types/istanbul-reports": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-			"integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+			"integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
 			"dependencies": {
 				"@types/istanbul-lib-report": "*"
 			}
 		},
 		"node_modules/@types/json-schema": {
-			"version": "7.0.12",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-			"integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
+			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
 		},
 		"node_modules/@types/mdast": {
-			"version": "3.0.12",
-			"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz",
-			"integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.3.tgz",
+			"integrity": "sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==",
 			"dependencies": {
-				"@types/unist": "^2"
+				"@types/unist": "*"
 			}
 		},
+		"node_modules/@types/mdx": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.11.tgz",
+			"integrity": "sha512-HM5bwOaIQJIQbAYfax35HCKxx7a3KrK3nBtIqJgSOitivTD1y3oW9P3rxY9RkXYPUk7y/AjAohfHKmFpGE79zw=="
+		},
 		"node_modules/@types/mime": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-			"integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+			"integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
+		},
+		"node_modules/@types/ms": {
+			"version": "0.7.34",
+			"resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
+			"integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="
 		},
 		"node_modules/@types/node": {
-			"version": "20.5.1",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz",
-			"integrity": "sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg=="
+			"version": "17.0.45",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+			"integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+			"license": "MIT"
+		},
+		"node_modules/@types/node-forge": {
+			"version": "1.3.11",
+			"resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+			"integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+			"dependencies": {
+				"@types/node": "*"
+			}
 		},
 		"node_modules/@types/parse-json": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+			"integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
 		},
 		"node_modules/@types/parse5": {
 			"version": "5.0.3",
 			"resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz",
 			"integrity": "sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="
 		},
+		"node_modules/@types/prismjs": {
+			"version": "1.26.3",
+			"resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.3.tgz",
+			"integrity": "sha512-A0D0aTXvjlqJ5ZILMz3rNfDBOx9hHxLZYv2by47Sm/pqW35zzjusrZTryatjN/Rf8Us2gZrJD+KeHbUSTux1Cw=="
+		},
 		"node_modules/@types/prop-types": {
-			"version": "15.7.5",
-			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-			"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+			"version": "15.7.11",
+			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
+			"integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
 		},
 		"node_modules/@types/qs": {
-			"version": "6.9.7",
-			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
+			"version": "6.9.12",
+			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.12.tgz",
+			"integrity": "sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg=="
 		},
 		"node_modules/@types/range-parser": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+			"integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
 		},
 		"node_modules/@types/react": {
-			"version": "18.2.20",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.20.tgz",
-			"integrity": "sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==",
+			"version": "18.2.65",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.65.tgz",
+			"integrity": "sha512-98TsY0aW4jqx/3RqsUXwMDZSWR1Z4CUlJNue8ueS2/wcxZOsz4xmW1X8ieaWVRHcmmQM3R8xVA4XWB3dJnWwDQ==",
 			"dependencies": {
 				"@types/prop-types": "*",
 				"@types/scheduler": "*",
@@ -3503,9 +3554,9 @@
 			}
 		},
 		"node_modules/@types/react-router-config": {
-			"version": "5.0.7",
-			"resolved": "https://registry.npmjs.org/@types/react-router-config/-/react-router-config-5.0.7.tgz",
-			"integrity": "sha512-pFFVXUIydHlcJP6wJm7sDii5mD/bCmmAY0wQzq+M+uX7bqS95AQqHZWP1iNMKrWVQSuHIzj5qi9BvrtLX2/T4w==",
+			"version": "5.0.11",
+			"resolved": "https://registry.npmjs.org/@types/react-router-config/-/react-router-config-5.0.11.tgz",
+			"integrity": "sha512-WmSAg7WgqW7m4x8Mt4N6ZyKz0BubSj/2tVUMsAHp+Yd2AMwcSbeFq9WympT19p5heCFmF97R9eD5uUR/t4HEqw==",
 			"dependencies": {
 				"@types/history": "^4.7.11",
 				"@types/react": "*",
@@ -3528,39 +3579,39 @@
 			"integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
 		},
 		"node_modules/@types/sax": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.4.tgz",
-			"integrity": "sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==",
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.7.tgz",
+			"integrity": "sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/scheduler": {
-			"version": "0.16.3",
-			"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
-			"integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+			"version": "0.16.8",
+			"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
+			"integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
 		},
 		"node_modules/@types/send": {
-			"version": "0.17.1",
-			"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
-			"integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+			"version": "0.17.4",
+			"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+			"integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
 			"dependencies": {
 				"@types/mime": "^1",
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+			"version": "1.9.4",
+			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+			"integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
 			"dependencies": {
 				"@types/express": "*"
 			}
 		},
 		"node_modules/@types/serve-static": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
-			"integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
+			"version": "1.15.5",
+			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz",
+			"integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==",
 			"dependencies": {
 				"@types/http-errors": "*",
 				"@types/mime": "*",
@@ -3568,43 +3619,49 @@
 			}
 		},
 		"node_modules/@types/sockjs": {
-			"version": "0.3.33",
-			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-			"integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+			"version": "0.3.36",
+			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+			"integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/unist": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz",
-			"integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g=="
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+			"integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
+			"license": "MIT"
 		},
 		"node_modules/@types/ws": {
-			"version": "8.5.5",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
-			"integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
+			"version": "8.5.10",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+			"integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/yargs": {
-			"version": "17.0.24",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
-			"integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+			"version": "17.0.32",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+			"integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
 			"dependencies": {
 				"@types/yargs-parser": "*"
 			}
 		},
 		"node_modules/@types/yargs-parser": {
-			"version": "21.0.0",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-			"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
+			"version": "21.0.3",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+			"integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
+		},
+		"node_modules/@ungap/structured-clone": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+			"integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
 		},
 		"node_modules/@webassemblyjs/ast": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-			"integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+			"integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
 			"dependencies": {
 				"@webassemblyjs/helper-numbers": "1.11.6",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
@@ -3621,9 +3678,9 @@
 			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
 		},
 		"node_modules/@webassemblyjs/helper-buffer": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-			"integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+			"integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw=="
 		},
 		"node_modules/@webassemblyjs/helper-numbers": {
 			"version": "1.11.6",
@@ -3641,14 +3698,14 @@
 			"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
 		},
 		"node_modules/@webassemblyjs/helper-wasm-section": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-			"integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+			"integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6"
+				"@webassemblyjs/wasm-gen": "1.12.1"
 			}
 		},
 		"node_modules/@webassemblyjs/ieee754": {
@@ -3673,26 +3730,26 @@
 			"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
 		},
 		"node_modules/@webassemblyjs/wasm-edit": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-			"integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+			"integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/helper-wasm-section": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6",
-				"@webassemblyjs/wasm-opt": "1.11.6",
-				"@webassemblyjs/wasm-parser": "1.11.6",
-				"@webassemblyjs/wast-printer": "1.11.6"
+				"@webassemblyjs/helper-wasm-section": "1.12.1",
+				"@webassemblyjs/wasm-gen": "1.12.1",
+				"@webassemblyjs/wasm-opt": "1.12.1",
+				"@webassemblyjs/wasm-parser": "1.12.1",
+				"@webassemblyjs/wast-printer": "1.12.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-gen": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-			"integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+			"integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
 				"@webassemblyjs/ieee754": "1.11.6",
 				"@webassemblyjs/leb128": "1.11.6",
@@ -3700,22 +3757,22 @@
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-opt": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-			"integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+			"integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6",
-				"@webassemblyjs/wasm-parser": "1.11.6"
+				"@webassemblyjs/ast": "1.12.1",
+				"@webassemblyjs/helper-buffer": "1.12.1",
+				"@webassemblyjs/wasm-gen": "1.12.1",
+				"@webassemblyjs/wasm-parser": "1.12.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-parser": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-			"integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+			"integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
 				"@webassemblyjs/helper-api-error": "1.11.6",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
 				"@webassemblyjs/ieee754": "1.11.6",
@@ -3724,11 +3781,11 @@
 			}
 		},
 		"node_modules/@webassemblyjs/wast-printer": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-			"integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+			"integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/ast": "1.12.1",
 				"@xtuc/long": "4.2.2"
 			}
 		},
@@ -3779,9 +3836,9 @@
 			}
 		},
 		"node_modules/acorn": {
-			"version": "8.10.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-			"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+			"version": "8.11.3",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+			"integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -3789,18 +3846,27 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/acorn-import-assertions": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+		"node_modules/acorn-import-attributes": {
+			"version": "1.9.5",
+			"resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+			"integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+			"license": "MIT",
 			"peerDependencies": {
 				"acorn": "^8"
 			}
 		},
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
 		"node_modules/acorn-walk": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-			"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+			"integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
 			"engines": {
 				"node": ">=0.4.0"
 			}
@@ -3826,14 +3892,15 @@
 			}
 		},
 		"node_modules/ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"license": "MIT",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
 			},
 			"funding": {
 				"type": "github",
@@ -3856,59 +3923,42 @@
 				}
 			}
 		},
-		"node_modules/ajv-formats/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+		"node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+				"fast-deep-equal": "^3.1.3"
 			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-		},
-		"node_modules/ajv-keywords": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
 			"peerDependencies": {
-				"ajv": "^6.9.1"
+				"ajv": "^8.8.2"
 			}
 		},
 		"node_modules/algoliasearch": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.19.1.tgz",
-			"integrity": "sha512-IJF5b93b2MgAzcE/tuzW0yOPnuUyRgGAtaPv5UUywXM8kzqfdwZTO4sPJBzoGz1eOy6H9uEchsJsBFTELZSu+g==",
-			"dependencies": {
-				"@algolia/cache-browser-local-storage": "4.19.1",
-				"@algolia/cache-common": "4.19.1",
-				"@algolia/cache-in-memory": "4.19.1",
-				"@algolia/client-account": "4.19.1",
-				"@algolia/client-analytics": "4.19.1",
-				"@algolia/client-common": "4.19.1",
-				"@algolia/client-personalization": "4.19.1",
-				"@algolia/client-search": "4.19.1",
-				"@algolia/logger-common": "4.19.1",
-				"@algolia/logger-console": "4.19.1",
-				"@algolia/requester-browser-xhr": "4.19.1",
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/requester-node-http": "4.19.1",
-				"@algolia/transporter": "4.19.1"
+			"version": "4.22.1",
+			"resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.22.1.tgz",
+			"integrity": "sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg==",
+			"dependencies": {
+				"@algolia/cache-browser-local-storage": "4.22.1",
+				"@algolia/cache-common": "4.22.1",
+				"@algolia/cache-in-memory": "4.22.1",
+				"@algolia/client-account": "4.22.1",
+				"@algolia/client-analytics": "4.22.1",
+				"@algolia/client-common": "4.22.1",
+				"@algolia/client-personalization": "4.22.1",
+				"@algolia/client-search": "4.22.1",
+				"@algolia/logger-common": "4.22.1",
+				"@algolia/logger-console": "4.22.1",
+				"@algolia/requester-browser-xhr": "4.22.1",
+				"@algolia/requester-common": "4.22.1",
+				"@algolia/requester-node-http": "4.22.1",
+				"@algolia/transporter": "4.22.1"
 			}
 		},
 		"node_modules/algoliasearch-helper": {
-			"version": "3.14.0",
-			"resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.14.0.tgz",
-			"integrity": "sha512-gXDXzsSS0YANn5dHr71CUXOo84cN4azhHKUbg71vAWnH+1JBiR4jf7to3t3JHXknXkbV0F7f055vUSBKrltHLQ==",
+			"version": "3.16.3",
+			"resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.16.3.tgz",
+			"integrity": "sha512-1OuJT6sONAa9PxcOmWo5WCAT3jQSpCR9/m5Azujja7nhUQwAUDvaaAYrcmUySsrvHh74usZHbE3jFfGnWtZj8w==",
 			"dependencies": {
 				"@algolia/events": "^4.0.1"
 			},
@@ -4003,9 +4053,9 @@
 			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
 		},
 		"node_modules/array-flatten": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
 		},
 		"node_modules/array-union": {
 			"version": "2.1.0",
@@ -4015,10 +4065,13 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/asap": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-			"integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
+		"node_modules/astring": {
+			"version": "1.8.6",
+			"resolved": "https://registry.npmjs.org/astring/-/astring-1.8.6.tgz",
+			"integrity": "sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==",
+			"bin": {
+				"astring": "bin/astring"
+			}
 		},
 		"node_modules/at-least-node": {
 			"version": "1.0.0",
@@ -4037,9 +4090,9 @@
 			}
 		},
 		"node_modules/autoprefixer": {
-			"version": "10.4.15",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz",
-			"integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==",
+			"version": "10.4.18",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
+			"integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -4055,9 +4108,9 @@
 				}
 			],
 			"dependencies": {
-				"browserslist": "^4.21.10",
-				"caniuse-lite": "^1.0.30001520",
-				"fraction.js": "^4.2.0",
+				"browserslist": "^4.23.0",
+				"caniuse-lite": "^1.0.30001591",
+				"fraction.js": "^4.3.7",
 				"normalize-range": "^0.1.2",
 				"picocolors": "^1.0.0",
 				"postcss-value-parser": "^4.2.0"
@@ -4072,53 +4125,23 @@
 				"postcss": "^8.1.0"
 			}
 		},
-		"node_modules/axios": {
-			"version": "0.25.0",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
-			"integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
-			"dependencies": {
-				"follow-redirects": "^1.14.7"
-			}
-		},
 		"node_modules/babel-loader": {
-			"version": "8.3.0",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
-			"integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
+			"version": "9.2.1",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz",
+			"integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==",
+			"license": "MIT",
 			"dependencies": {
-				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^2.0.0",
-				"make-dir": "^3.1.0",
-				"schema-utils": "^2.6.5"
+				"find-cache-dir": "^4.0.0",
+				"schema-utils": "^4.0.0"
 			},
 			"engines": {
-				"node": ">= 8.9"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0",
-				"webpack": ">=2"
-			}
-		},
-		"node_modules/babel-plugin-apply-mdx-type-prop": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz",
-			"integrity": "sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "7.10.4",
-				"@mdx-js/util": "1.6.22"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
+				"node": ">= 14.15.0"
 			},
 			"peerDependencies": {
-				"@babel/core": "^7.11.6"
+				"@babel/core": "^7.12.0",
+				"webpack": ">=5"
 			}
 		},
-		"node_modules/babel-plugin-apply-mdx-type-prop/node_modules/@babel/helper-plugin-utils": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-			"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
-		},
 		"node_modules/babel-plugin-dynamic-import-node": {
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
@@ -4127,30 +4150,13 @@
 				"object.assign": "^4.1.0"
 			}
 		},
-		"node_modules/babel-plugin-extract-import-names": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz",
-			"integrity": "sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "7.10.4"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/babel-plugin-extract-import-names/node_modules/@babel/helper-plugin-utils": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-			"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
-		},
 		"node_modules/babel-plugin-polyfill-corejs2": {
-			"version": "0.4.5",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
-			"integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
+			"version": "0.4.10",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz",
+			"integrity": "sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==",
 			"dependencies": {
 				"@babel/compat-data": "^7.22.6",
-				"@babel/helper-define-polyfill-provider": "^0.4.2",
+				"@babel/helper-define-polyfill-provider": "^0.6.1",
 				"semver": "^6.3.1"
 			},
 			"peerDependencies": {
@@ -4166,32 +4172,62 @@
 			}
 		},
 		"node_modules/babel-plugin-polyfill-corejs3": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
-			"integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz",
+			"integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==",
+			"dependencies": {
+				"@babel/helper-define-polyfill-provider": "^0.5.0",
+				"core-js-compat": "^3.34.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
+			"integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
 			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.4.2",
-				"core-js-compat": "^3.31.0"
+				"@babel/helper-compilation-targets": "^7.22.6",
+				"@babel/helper-plugin-utils": "^7.22.5",
+				"debug": "^4.1.1",
+				"lodash.debounce": "^4.0.8",
+				"resolve": "^1.14.2"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-regenerator": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
-			"integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
+			"version": "0.5.5",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
+			"integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
+			"dependencies": {
+				"@babel/helper-define-polyfill-provider": "^0.5.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-regenerator/node_modules/@babel/helper-define-polyfill-provider": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
+			"integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
 			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.4.2"
+				"@babel/helper-compilation-targets": "^7.22.6",
+				"@babel/helper-plugin-utils": "^7.22.5",
+				"debug": "^4.1.1",
+				"lodash.debounce": "^4.0.8",
+				"resolve": "^1.14.2"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/bail": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-			"integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
+			"integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -4202,11 +4238,6 @@
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
 		},
-		"node_modules/base16": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz",
-			"integrity": "sha512-pNdYkNPiJUnEhnfXV56+sQy8+AaPcG3POZAUnwr4EeqCUZFz4u2PePbo3e5Gj4ziYPCWGUZT9RHisvJKnwFuBQ=="
-		},
 		"node_modules/batch": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -4238,20 +4269,21 @@
 			}
 		},
 		"node_modules/body-parser": {
-			"version": "1.20.1",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-			"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+			"version": "1.20.3",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+			"integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+			"license": "MIT",
 			"dependencies": {
 				"bytes": "3.1.2",
-				"content-type": "~1.0.4",
+				"content-type": "~1.0.5",
 				"debug": "2.6.9",
 				"depd": "2.0.0",
 				"destroy": "1.2.0",
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"on-finished": "2.4.1",
-				"qs": "6.11.0",
-				"raw-body": "2.5.1",
+				"qs": "6.13.0",
+				"raw-body": "2.5.2",
 				"type-is": "~1.6.18",
 				"unpipe": "1.0.0"
 			},
@@ -4264,6 +4296,7 @@
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
 			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
@@ -4272,6 +4305,7 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -4279,15 +4313,14 @@
 		"node_modules/body-parser/node_modules/ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
 		},
 		"node_modules/bonjour-service": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
-			"integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
+			"integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
 			"dependencies": {
-				"array-flatten": "^2.1.2",
-				"dns-equal": "^1.0.0",
 				"fast-deep-equal": "^3.1.3",
 				"multicast-dns": "^7.2.5"
 			}
@@ -4328,20 +4361,21 @@
 			}
 		},
 		"node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+			"license": "MIT",
 			"dependencies": {
-				"fill-range": "^7.0.1"
+				"fill-range": "^7.1.1"
 			},
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/browserslist": {
-			"version": "4.21.10",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-			"integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+			"version": "4.23.0",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+			"integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -4357,10 +4391,10 @@
 				}
 			],
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001517",
-				"electron-to-chromium": "^1.4.477",
-				"node-releases": "^2.0.13",
-				"update-browserslist-db": "^1.0.11"
+				"caniuse-lite": "^1.0.30001587",
+				"electron-to-chromium": "^1.4.668",
+				"node-releases": "^2.0.14",
+				"update-browserslist-db": "^1.0.13"
 			},
 			"bin": {
 				"browserslist": "cli.js"
@@ -4382,60 +4416,55 @@
 				"node": ">= 0.8"
 			}
 		},
-		"node_modules/cacheable-request": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-			"integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-			"dependencies": {
-				"clone-response": "^1.0.2",
-				"get-stream": "^5.1.0",
-				"http-cache-semantics": "^4.0.0",
-				"keyv": "^3.0.0",
-				"lowercase-keys": "^2.0.0",
-				"normalize-url": "^4.1.0",
-				"responselike": "^1.0.2"
-			},
+		"node_modules/cacheable-lookup": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+			"integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
 			"engines": {
-				"node": ">=8"
+				"node": ">=14.16"
 			}
 		},
-		"node_modules/cacheable-request/node_modules/get-stream": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-			"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+		"node_modules/cacheable-request": {
+			"version": "10.2.14",
+			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
+			"integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
 			"dependencies": {
-				"pump": "^3.0.0"
+				"@types/http-cache-semantics": "^4.0.2",
+				"get-stream": "^6.0.1",
+				"http-cache-semantics": "^4.1.1",
+				"keyv": "^4.5.3",
+				"mimic-response": "^4.0.0",
+				"normalize-url": "^8.0.0",
+				"responselike": "^3.0.0"
 			},
 			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/cacheable-request/node_modules/lowercase-keys": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-			"integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-			"engines": {
-				"node": ">=8"
+				"node": ">=14.16"
 			}
 		},
 		"node_modules/cacheable-request/node_modules/normalize-url": {
-			"version": "4.5.1",
-			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-			"integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
+			"integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
 			"engines": {
-				"node": ">=8"
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"set-function-length": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -4469,14 +4498,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/camelcase-css": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-			"integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-			"engines": {
-				"node": ">= 6"
-			}
-		},
 		"node_modules/caniuse-api": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
@@ -4489,9 +4510,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001522",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz",
-			"integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==",
+			"version": "1.0.30001597",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz",
+			"integrity": "sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -4508,9 +4529,9 @@
 			]
 		},
 		"node_modules/ccount": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
-			"integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+			"integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -4531,28 +4552,45 @@
 				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
+		"node_modules/char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+			"engines": {
+				"node": ">=10"
+			}
+		},
 		"node_modules/character-entities": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-			"integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+			"integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/character-entities-html4": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+			"integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
 		"node_modules/character-entities-legacy": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-			"integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+			"integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
 		"node_modules/character-reference-invalid": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-			"integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz",
+			"integrity": "sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -4595,15 +4633,9 @@
 			}
 		},
 		"node_modules/chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://paulmillr.com/funding/"
-				}
-			],
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+			"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
 			"dependencies": {
 				"anymatch": "~3.1.2",
 				"braces": "~3.0.2",
@@ -4616,6 +4648,9 @@
 			"engines": {
 				"node": ">= 8.10.0"
 			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			},
 			"optionalDependencies": {
 				"fsevents": "~2.3.2"
 			}
@@ -4629,9 +4664,9 @@
 			}
 		},
 		"node_modules/ci-info": {
-			"version": "3.8.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-			"integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+			"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
 			"funding": [
 				{
 					"type": "github",
@@ -4643,9 +4678,9 @@
 			}
 		},
 		"node_modules/clean-css": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
-			"integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
+			"version": "5.3.3",
+			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+			"integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
 			"dependencies": {
 				"source-map": "~0.6.0"
 			},
@@ -4653,6 +4688,14 @@
 				"node": ">= 10.0"
 			}
 		},
+		"node_modules/clean-css/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/clean-stack": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -4717,15 +4760,15 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/clone-response": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-			"integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+		"node_modules/clone-deep/node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"dependencies": {
-				"mimic-response": "^1.0.0"
+				"isobject": "^3.0.1"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/clsx": {
@@ -4737,9 +4780,9 @@
 			}
 		},
 		"node_modules/collapse-white-space": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-			"integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-2.1.0.tgz",
+			"integrity": "sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -4804,10 +4847,10 @@
 				"node": ">= 6"
 			}
 		},
-		"node_modules/commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
+		"node_modules/common-path-prefix": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+			"integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="
 		},
 		"node_modules/compressible": {
 			"version": "2.0.18",
@@ -4821,9 +4864,10 @@
 			}
 		},
 		"node_modules/compressible/node_modules/mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"version": "1.53.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
+			"integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -4868,21 +4912,32 @@
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
 		},
+		"node_modules/config-chain": {
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+			"integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+			"dependencies": {
+				"ini": "^1.3.4",
+				"proto-list": "~1.2.1"
+			}
+		},
 		"node_modules/configstore": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-			"integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz",
+			"integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==",
 			"dependencies": {
-				"dot-prop": "^5.2.0",
-				"graceful-fs": "^4.1.2",
-				"make-dir": "^3.0.0",
-				"unique-string": "^2.0.0",
-				"write-file-atomic": "^3.0.0",
-				"xdg-basedir": "^4.0.0"
+				"dot-prop": "^6.0.1",
+				"graceful-fs": "^4.2.6",
+				"unique-string": "^3.0.0",
+				"write-file-atomic": "^3.0.3",
+				"xdg-basedir": "^5.0.1"
 			},
 			"engines": {
-				"node": ">=8"
-			}
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/yeoman/configstore?sponsor=1"
+			}
 		},
 		"node_modules/connect-history-api-fallback": {
 			"version": "2.0.0",
@@ -4914,19 +4969,21 @@
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
 			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/convert-source-map": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
 		},
 		"node_modules/cookie": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+			"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -4970,32 +5027,6 @@
 				"webpack": "^5.1.0"
 			}
 		},
-		"node_modules/copy-webpack-plugin/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
 		"node_modules/copy-webpack-plugin/node_modules/glob-parent": {
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -5025,29 +5056,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-		},
-		"node_modules/copy-webpack-plugin/node_modules/schema-utils": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
 		"node_modules/copy-webpack-plugin/node_modules/slash": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
@@ -5060,9 +5068,9 @@
 			}
 		},
 		"node_modules/core-js": {
-			"version": "3.32.1",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
-			"integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
+			"version": "3.36.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.36.0.tgz",
+			"integrity": "sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==",
 			"hasInstallScript": true,
 			"funding": {
 				"type": "opencollective",
@@ -5070,11 +5078,11 @@
 			}
 		},
 		"node_modules/core-js-compat": {
-			"version": "3.32.1",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz",
-			"integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==",
+			"version": "3.36.0",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.0.tgz",
+			"integrity": "sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==",
 			"dependencies": {
-				"browserslist": "^4.21.10"
+				"browserslist": "^4.22.3"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -5082,9 +5090,9 @@
 			}
 		},
 		"node_modules/core-js-pure": {
-			"version": "3.32.1",
-			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.1.tgz",
-			"integrity": "sha512-f52QZwkFVDPf7UEQZGHKx6NYxsxmVGJe5DIvbzOdRMJlmT6yv0KDjR8rmy3ngr/t5wU54c7Sp/qIJH0ppbhVpQ==",
+			"version": "3.36.0",
+			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.36.0.tgz",
+			"integrity": "sha512-cN28qmhRNgbMZZMc/RFu5w8pK9VJzpb2rJVR/lHuZJKwmXnoWOpXmMkxqBB514igkp1Hu8WGROsiOAzUcKdHOQ==",
 			"hasInstallScript": true,
 			"funding": {
 				"type": "opencollective",
@@ -5111,14 +5119,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/cross-fetch": {
-			"version": "3.1.8",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-			"integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
-			"dependencies": {
-				"node-fetch": "^2.6.12"
-			}
-		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -5133,11 +5133,28 @@
 			}
 		},
 		"node_modules/crypto-random-string": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-			"integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz",
+			"integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==",
+			"dependencies": {
+				"type-fest": "^1.0.1"
+			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/crypto-random-string/node_modules/type-fest": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+			"integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/css-declaration-sorter": {
@@ -5152,18 +5169,18 @@
 			}
 		},
 		"node_modules/css-loader": {
-			"version": "6.8.1",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-			"integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
+			"version": "6.10.0",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz",
+			"integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==",
 			"dependencies": {
 				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.21",
+				"postcss": "^8.4.33",
 				"postcss-modules-extract-imports": "^3.0.0",
-				"postcss-modules-local-by-default": "^4.0.3",
-				"postcss-modules-scope": "^3.0.0",
+				"postcss-modules-local-by-default": "^4.0.4",
+				"postcss-modules-scope": "^3.1.1",
 				"postcss-modules-values": "^4.0.0",
 				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.3.8"
+				"semver": "^7.5.4"
 			},
 			"engines": {
 				"node": ">= 12.13.0"
@@ -5173,7 +5190,16 @@
 				"url": "https://opencollective.com/webpack"
 			},
 			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
 				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/css-minimizer-webpack-plugin": {
@@ -5219,53 +5245,12 @@
 				}
 			}
 		},
-		"node_modules/css-minimizer-webpack-plugin/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-		},
-		"node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
+		"node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
+				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/css-select": {
@@ -5300,6 +5285,14 @@
 				"node": ">=8.0.0"
 			}
 		},
+		"node_modules/css-tree/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/css-what": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
@@ -5426,16 +5419,22 @@
 			}
 		},
 		"node_modules/csstype": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-			"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+		},
+		"node_modules/debounce": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+			"integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="
 		},
 		"node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+			"version": "4.3.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+			"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+			"license": "MIT",
 			"dependencies": {
-				"ms": "2.1.2"
+				"ms": "^2.1.3"
 			},
 			"engines": {
 				"node": ">=6.0"
@@ -5446,15 +5445,41 @@
 				}
 			}
 		},
+		"node_modules/decode-named-character-reference": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz",
+			"integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==",
+			"dependencies": {
+				"character-entities": "^2.0.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/decompress-response": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-			"integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+			"integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
 			"dependencies": {
-				"mimic-response": "^1.0.0"
+				"mimic-response": "^3.1.0"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/decompress-response/node_modules/mimic-response": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+			"integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/deep-extend": {
@@ -5485,9 +5510,28 @@
 			}
 		},
 		"node_modules/defer-to-connect": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-			"integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+			"integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/define-data-property": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+			"dependencies": {
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/define-lazy-prop": {
 			"version": "2.0.0",
@@ -5498,10 +5542,11 @@
 			}
 		},
 		"node_modules/define-properties": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-			"integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+			"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
 			"dependencies": {
+				"define-data-property": "^1.0.1",
 				"has-property-descriptors": "^1.0.0",
 				"object-keys": "^1.1.1"
 			},
@@ -5537,31 +5582,29 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
 			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
+		"node_modules/dequal": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+			"integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/destroy": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
 			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8",
 				"npm": "1.2.8000 || >= 1.4.16"
 			}
 		},
-		"node_modules/detab": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/detab/-/detab-2.0.4.tgz",
-			"integrity": "sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==",
-			"dependencies": {
-				"repeat-string": "^1.5.4"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
 		"node_modules/detect-node": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
@@ -5609,6 +5652,18 @@
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
+		"node_modules/devlop": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+			"integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+			"dependencies": {
+				"dequal": "^2.0.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/dir-glob": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -5632,15 +5687,10 @@
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"node_modules/dns-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
-		},
 		"node_modules/dns-packet": {
-			"version": "5.6.0",
-			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
-			"integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
+			"version": "5.6.1",
+			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+			"integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
 			"dependencies": {
 				"@leichtgewicht/ip-codec": "^2.0.1"
 			},
@@ -5649,9 +5699,9 @@
 			}
 		},
 		"node_modules/docusaurus-lunr-search": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/docusaurus-lunr-search/-/docusaurus-lunr-search-2.4.1.tgz",
-			"integrity": "sha512-UOgaAypgO0iLyA1Hk4EThG/ofLm9/JldznzN98ZKr7TMYVjMZbAEaIBKLAUDFdfOPr9D5EswXdLn39/aRkwHMA==",
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/docusaurus-lunr-search/-/docusaurus-lunr-search-3.3.2.tgz",
+			"integrity": "sha512-+TXfiRAwIAaNwME8bBZvC+osfoXjJSNs5BcZu92lIHoWc3Myct4Nw3jU0FMXQCQGQcQ0FgFqMDoh56LPCLVaxQ==",
 			"dependencies": {
 				"autocomplete.js": "^0.37.0",
 				"clsx": "^1.2.1",
@@ -5661,8 +5711,8 @@
 				"hogan.js": "^3.0.2",
 				"lunr": "^2.3.8",
 				"lunr-languages": "^1.4.0",
+				"mark.js": "^8.11.1",
 				"minimatch": "^3.0.4",
-				"object-assign": "^4.1.1",
 				"rehype-parse": "^7.0.1",
 				"to-vfile": "^6.1.0",
 				"unified": "^9.0.0",
@@ -5672,62 +5722,151 @@
 				"node": ">= 8.10.0"
 			},
 			"peerDependencies": {
-				"@docusaurus/core": "^2.0.0-alpha.60 || ^2.0.0",
-				"react": "^16.8.4 || ^17",
-				"react-dom": "^16.8.4 || ^17"
+				"@docusaurus/core": "^2.0.0-alpha.60 || ^2.0.0 || ^3.0.0",
+				"react": "^16.8.4 || ^17 || ^18",
+				"react-dom": "^16.8.4 || ^17 || ^18"
 			}
 		},
-		"node_modules/dom-converter": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-			"integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-			"dependencies": {
-				"utila": "~0.4"
-			}
+		"node_modules/docusaurus-lunr-search/node_modules/@types/unist": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+			"integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+			"license": "MIT"
 		},
-		"node_modules/dom-serializer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-			"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-			"dependencies": {
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.2",
-				"entities": "^4.2.0"
-			},
+		"node_modules/docusaurus-lunr-search/node_modules/bail": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
+			"integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
 			"funding": {
-				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"node_modules/domelementtype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/fb55"
-				}
-			]
-		},
-		"node_modules/domhandler": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-			"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-			"dependencies": {
-				"domelementtype": "^2.3.0"
-			},
+		"node_modules/docusaurus-lunr-search/node_modules/is-plain-obj": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
 			"engines": {
-				"node": ">= 4"
-			},
+				"node": ">=8"
+			}
+		},
+		"node_modules/docusaurus-lunr-search/node_modules/trough": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
+			"integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
 			"funding": {
-				"url": "https://github.com/fb55/domhandler?sponsor=1"
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"node_modules/domutils": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-			"integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-			"dependencies": {
+		"node_modules/docusaurus-lunr-search/node_modules/unified": {
+			"version": "9.2.2",
+			"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
+			"integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
+			"dependencies": {
+				"bail": "^1.0.0",
+				"extend": "^3.0.0",
+				"is-buffer": "^2.0.0",
+				"is-plain-obj": "^2.0.0",
+				"trough": "^1.0.0",
+				"vfile": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/docusaurus-lunr-search/node_modules/unist-util-stringify-position": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
+			"integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
+			"dependencies": {
+				"@types/unist": "^2.0.2"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/docusaurus-lunr-search/node_modules/vfile": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
+			"integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"is-buffer": "^2.0.0",
+				"unist-util-stringify-position": "^2.0.0",
+				"vfile-message": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/docusaurus-lunr-search/node_modules/vfile-message": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
+			"integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"unist-util-stringify-position": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/dom-converter": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+			"integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+			"dependencies": {
+				"utila": "~0.4"
+			}
+		},
+		"node_modules/dom-serializer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+			"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+			"dependencies": {
+				"domelementtype": "^2.3.0",
+				"domhandler": "^5.0.2",
+				"entities": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/domelementtype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
+		},
+		"node_modules/domhandler": {
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+			"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+			"dependencies": {
+				"domelementtype": "^2.3.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/domutils": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+			"integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+			"dependencies": {
 				"dom-serializer": "^2.0.0",
 				"domelementtype": "^2.3.0",
 				"domhandler": "^5.0.3"
@@ -5746,14 +5885,17 @@
 			}
 		},
 		"node_modules/dot-prop": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-			"integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
+			"integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
 			"dependencies": {
 				"is-obj": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/dot-prop/node_modules/is-obj": {
@@ -5769,11 +5911,6 @@
 			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
 			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
 		},
-		"node_modules/duplexer3": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
-			"integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="
-		},
 		"node_modules/eastasianwidth": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -5782,18 +5919,24 @@
 		"node_modules/ee-first": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+			"license": "MIT"
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.498",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.498.tgz",
-			"integrity": "sha512-4LODxAzKGVy7CJyhhN5mebwe7U2L29P+0G+HUriHnabm0d7LSff8Yn7t+Wq+2/9ze2Fu1dhX7mww090xfv7qXQ=="
+			"version": "1.4.704",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.704.tgz",
+			"integrity": "sha512-OK01+86Qvby1V6cTiowVbhp25aX4DLZnwar+NocAOXdzKAByd+jq5156bmo4kHwevWMknznW18Y/Svfk2dU91A=="
 		},
 		"node_modules/emoji-regex": {
 			"version": "9.2.2",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
 			"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
 		},
+		"node_modules/emojilib": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz",
+			"integrity": "sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw=="
+		},
 		"node_modules/emojis-list": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
@@ -5803,34 +5946,28 @@
 			}
 		},
 		"node_modules/emoticon": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/emoticon/-/emoticon-3.2.0.tgz",
-			"integrity": "sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/emoticon/-/emoticon-4.0.1.tgz",
+			"integrity": "sha512-dqx7eA9YaqyvYtUhJwT4rC1HIp82j5ybS1/vQ42ur+jBe17dJMwZE4+gvL1XadSFfxaPFFGt3Xsw+Y8akThDlw==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
 		"node_modules/encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+			"integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
-		"node_modules/end-of-stream": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-			"dependencies": {
-				"once": "^1.4.0"
-			}
-		},
 		"node_modules/enhanced-resolve": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-			"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+			"version": "5.17.1",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+			"integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+			"license": "MIT",
 			"dependencies": {
 				"graceful-fs": "^4.2.4",
 				"tapable": "^2.2.0"
@@ -5858,25 +5995,47 @@
 				"is-arrayish": "^0.2.1"
 			}
 		},
-		"node_modules/es-module-lexer": {
+		"node_modules/es-define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+			"dependencies": {
+				"get-intrinsic": "^1.2.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-errors": {
 			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
-			"integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-module-lexer": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
+			"integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w=="
 		},
 		"node_modules/escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+			"integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/escape-goat": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-			"integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz",
+			"integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==",
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/escape-html": {
@@ -5946,6 +6105,92 @@
 				"node": ">=4.0"
 			}
 		},
+		"node_modules/estree-util-attach-comments": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/estree-util-attach-comments/-/estree-util-attach-comments-3.0.0.tgz",
+			"integrity": "sha512-cKUwm/HUcTDsYh/9FgnuFqpfquUbwIqwKM26BVCGDPVgvaCl/nDCCjUfiLlx6lsEZ3Z4RFxNbOQ60pkaEwFxGw==",
+			"dependencies": {
+				"@types/estree": "^1.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/estree-util-build-jsx": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/estree-util-build-jsx/-/estree-util-build-jsx-3.0.1.tgz",
+			"integrity": "sha512-8U5eiL6BTrPxp/CHbs2yMgP8ftMhR5ww1eIKoWRMlqvltHF8fZn5LRDvTKuxD3DUn+shRbLGqXemcP51oFCsGQ==",
+			"dependencies": {
+				"@types/estree-jsx": "^1.0.0",
+				"devlop": "^1.0.0",
+				"estree-util-is-identifier-name": "^3.0.0",
+				"estree-walker": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/estree-util-is-identifier-name": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz",
+			"integrity": "sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/estree-util-to-js": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/estree-util-to-js/-/estree-util-to-js-2.0.0.tgz",
+			"integrity": "sha512-WDF+xj5rRWmD5tj6bIqRi6CkLIXbbNQUcxQHzGysQzvHmdYG2G7p/Tf0J0gpxGgkeMZNTIjT/AoSvC9Xehcgdg==",
+			"dependencies": {
+				"@types/estree-jsx": "^1.0.0",
+				"astring": "^1.8.0",
+				"source-map": "^0.7.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/estree-util-value-to-estree": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/estree-util-value-to-estree/-/estree-util-value-to-estree-3.0.1.tgz",
+			"integrity": "sha512-b2tdzTurEIbwRh+mKrEcaWfu1wgb8J1hVsgREg7FFiecWwK/PhO8X0kyc+0bIcKNtD4sqxIdNoRy6/p/TvECEA==",
+			"dependencies": {
+				"@types/estree": "^1.0.0",
+				"is-plain-obj": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/remcohaszing"
+			}
+		},
+		"node_modules/estree-util-visit": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-2.0.0.tgz",
+			"integrity": "sha512-m5KgiH85xAhhW8Wta0vShLcUvOsh3LLPI2YVwcbio1l7E09NTLL1EyMZFM1OyWowoH0skScNbhOPl4kcBgzTww==",
+			"dependencies": {
+				"@types/estree-jsx": "^1.0.0",
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/estree-walker": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+			"integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+			"dependencies": {
+				"@types/estree": "^1.0.0"
+			}
+		},
 		"node_modules/esutils": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -5969,6 +6214,7 @@
 			"version": "1.8.1",
 			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
 			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -6020,48 +6266,38 @@
 				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
-		"node_modules/execa/node_modules/get-stream": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/express": {
-			"version": "4.18.2",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-			"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+			"version": "4.21.0",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
+			"integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+			"license": "MIT",
 			"dependencies": {
 				"accepts": "~1.3.8",
 				"array-flatten": "1.1.1",
-				"body-parser": "1.20.1",
+				"body-parser": "1.20.3",
 				"content-disposition": "0.5.4",
 				"content-type": "~1.0.4",
-				"cookie": "0.5.0",
+				"cookie": "0.6.0",
 				"cookie-signature": "1.0.6",
 				"debug": "2.6.9",
 				"depd": "2.0.0",
-				"encodeurl": "~1.0.2",
+				"encodeurl": "~2.0.0",
 				"escape-html": "~1.0.3",
 				"etag": "~1.8.1",
-				"finalhandler": "1.2.0",
+				"finalhandler": "1.3.1",
 				"fresh": "0.5.2",
 				"http-errors": "2.0.0",
-				"merge-descriptors": "1.0.1",
+				"merge-descriptors": "1.0.3",
 				"methods": "~1.1.2",
 				"on-finished": "2.4.1",
 				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.7",
+				"path-to-regexp": "0.1.10",
 				"proxy-addr": "~2.0.7",
-				"qs": "6.11.0",
+				"qs": "6.13.0",
 				"range-parser": "~1.2.1",
 				"safe-buffer": "5.2.1",
-				"send": "0.18.0",
-				"serve-static": "1.15.0",
+				"send": "0.19.0",
+				"serve-static": "1.16.2",
 				"setprototypeof": "1.2.0",
 				"statuses": "2.0.1",
 				"type-is": "~1.6.18",
@@ -6072,11 +6308,6 @@
 				"node": ">= 0.10.0"
 			}
 		},
-		"node_modules/express/node_modules/array-flatten": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-		},
 		"node_modules/express/node_modules/content-disposition": {
 			"version": "0.5.4",
 			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -6102,9 +6333,10 @@
 			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
 		"node_modules/express/node_modules/path-to-regexp": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+			"version": "0.1.10",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+			"integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+			"license": "MIT"
 		},
 		"node_modules/express/node_modules/range-parser": {
 			"version": "1.2.1",
@@ -6136,9 +6368,9 @@
 			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
 		},
 		"node_modules/fast-glob": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-			"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
 			"dependencies": {
 				"@nodelib/fs.stat": "^2.0.2",
 				"@nodelib/fs.walk": "^1.2.3",
@@ -6155,6 +6387,12 @@
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
 			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
 		},
+		"node_modules/fast-uri": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
+			"integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
+			"license": "MIT"
+		},
 		"node_modules/fast-url-parser": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
@@ -6164,13 +6402,25 @@
 			}
 		},
 		"node_modules/fastq": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-			"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+			"version": "1.17.1",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+			"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
 			"dependencies": {
 				"reusify": "^1.0.4"
 			}
 		},
+		"node_modules/fault": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fault/-/fault-2.0.1.tgz",
+			"integrity": "sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==",
+			"dependencies": {
+				"format": "^0.2.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/faye-websocket": {
 			"version": "0.11.4",
 			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
@@ -6182,33 +6432,6 @@
 				"node": ">=0.8.0"
 			}
 		},
-		"node_modules/fbemitter": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz",
-			"integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==",
-			"dependencies": {
-				"fbjs": "^3.0.0"
-			}
-		},
-		"node_modules/fbjs": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz",
-			"integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==",
-			"dependencies": {
-				"cross-fetch": "^3.1.5",
-				"fbjs-css-vars": "^1.0.0",
-				"loose-envify": "^1.0.0",
-				"object-assign": "^4.1.0",
-				"promise": "^7.1.1",
-				"setimmediate": "^1.0.5",
-				"ua-parser-js": "^1.0.35"
-			}
-		},
-		"node_modules/fbjs-css-vars": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz",
-			"integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="
-		},
 		"node_modules/feed": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/feed/-/feed-4.2.2.tgz",
@@ -6239,25 +6462,53 @@
 				"webpack": "^4.0.0 || ^5.0.0"
 			}
 		},
-		"node_modules/file-loader/node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+		"node_modules/file-loader/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
 			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
 			},
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"node_modules/filesize": {
-			"version": "8.0.7",
+		"node_modules/file-loader/node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
+		},
+		"node_modules/file-loader/node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
+		"node_modules/file-loader/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/filesize": {
+			"version": "8.0.7",
 			"resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
 			"integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==",
 			"engines": {
@@ -6265,9 +6516,10 @@
 			}
 		},
 		"node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+			"license": "MIT",
 			"dependencies": {
 				"to-regex-range": "^5.0.1"
 			},
@@ -6276,12 +6528,13 @@
 			}
 		},
 		"node_modules/finalhandler": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+			"integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+			"license": "MIT",
 			"dependencies": {
 				"debug": "2.6.9",
-				"encodeurl": "~1.0.2",
+				"encodeurl": "~2.0.0",
 				"escape-html": "~1.0.3",
 				"on-finished": "2.4.1",
 				"parseurl": "~1.3.3",
@@ -6296,6 +6549,7 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -6303,58 +6557,58 @@
 		"node_modules/finalhandler/node_modules/ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
 		},
 		"node_modules/find-cache-dir": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+			"integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
 			"dependencies": {
-				"commondir": "^1.0.1",
-				"make-dir": "^3.0.2",
-				"pkg-dir": "^4.1.0"
+				"common-path-prefix": "^3.0.0",
+				"pkg-dir": "^7.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=14.16"
 			},
 			"funding": {
-				"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+			"integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
 			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
+				"locate-path": "^7.1.0",
+				"path-exists": "^5.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/flux": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/flux/-/flux-4.0.4.tgz",
-			"integrity": "sha512-NCj3XlayA2UsapRpM7va6wU1+9rE5FIL7qoMcmxWHRzbp0yujihMBm9BBHZ1MDIk5h5o2Bl6eGiCe8rYELAmYw==",
-			"dependencies": {
-				"fbemitter": "^3.0.0",
-				"fbjs": "^3.0.1"
-			},
-			"peerDependencies": {
-				"react": "^15.0.2 || ^16.0.0 || ^17.0.0"
+		"node_modules/flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+			"bin": {
+				"flat": "cli.js"
 			}
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+			"version": "1.15.6",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 			"funding": [
 				{
 					"type": "individual",
 					"url": "https://github.com/sponsors/RubenVerborgh"
 				}
 			],
+			"license": "MIT",
 			"engines": {
 				"node": ">=4.0"
 			},
@@ -6402,6 +6656,29 @@
 				}
 			}
 		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
+		},
 		"node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
@@ -6431,6 +6708,11 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/fork-ts-checker-webpack-plugin/node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
 		"node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
@@ -6456,6 +6738,22 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/form-data-encoder": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
+			"integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
+			"engines": {
+				"node": ">= 14.17"
+			}
+		},
+		"node_modules/format": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
+			"integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==",
+			"engines": {
+				"node": ">=0.4.x"
+			}
+		},
 		"node_modules/forwarded": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -6465,42 +6763,43 @@
 			}
 		},
 		"node_modules/fraction.js": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.1.tgz",
-			"integrity": "sha512-/KxoyCnPM0GwYI4NN0Iag38Tqt+od3/mLuguepLgCAKPn0ZhC544nssAW0tG2/00zXEYl9W+7hwAIpLHo6Oc7Q==",
+			"version": "4.3.7",
+			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+			"integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
 			"engines": {
 				"node": "*"
 			},
 			"funding": {
 				"type": "patreon",
-				"url": "https://www.patreon.com/infusion"
+				"url": "https://github.com/sponsors/rawify"
 			}
 		},
 		"node_modules/fresh": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
 			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/fs-extra": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-			"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
 				"jsonfile": "^6.0.1",
 				"universalify": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=14.14"
 			}
 		},
 		"node_modules/fs-monkey": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
-			"integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ=="
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
+			"integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew=="
 		},
 		"node_modules/fs.realpath": {
 			"version": "1.0.0",
@@ -6521,9 +6820,12 @@
 			}
 		},
 		"node_modules/function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/gauge": {
 			"version": "3.0.2",
@@ -6571,14 +6873,18 @@
 			}
 		},
 		"node_modules/get-intrinsic": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-			"integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
 				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3"
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -6590,14 +6896,14 @@
 			"integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
 		},
 		"node_modules/get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-			"dependencies": {
-				"pump": "^3.0.0"
-			},
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
 			"engines": {
-				"node": ">=6"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/github-slugger": {
@@ -6724,31 +7030,57 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+			"dependencies": {
+				"get-intrinsic": "^1.1.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/got": {
-			"version": "9.6.0",
-			"resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-			"integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-			"dependencies": {
-				"@sindresorhus/is": "^0.14.0",
-				"@szmarczak/http-timer": "^1.1.2",
-				"cacheable-request": "^6.0.0",
-				"decompress-response": "^3.3.0",
-				"duplexer3": "^0.1.4",
-				"get-stream": "^4.1.0",
-				"lowercase-keys": "^1.0.1",
-				"mimic-response": "^1.0.1",
-				"p-cancelable": "^1.0.0",
-				"to-readable-stream": "^1.0.0",
-				"url-parse-lax": "^3.0.0"
+			"version": "12.6.1",
+			"resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
+			"integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
+			"dependencies": {
+				"@sindresorhus/is": "^5.2.0",
+				"@szmarczak/http-timer": "^5.0.1",
+				"cacheable-lookup": "^7.0.0",
+				"cacheable-request": "^10.2.8",
+				"decompress-response": "^6.0.0",
+				"form-data-encoder": "^2.1.2",
+				"get-stream": "^6.0.1",
+				"http2-wrapper": "^2.1.10",
+				"lowercase-keys": "^3.0.0",
+				"p-cancelable": "^3.0.0",
+				"responselike": "^3.0.0"
 			},
 			"engines": {
-				"node": ">=8.6"
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/got?sponsor=1"
+			}
+		},
+		"node_modules/got/node_modules/@sindresorhus/is": {
+			"version": "5.6.0",
+			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
+			"integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/is?sponsor=1"
 			}
 		},
 		"node_modules/graceful-fs": {
-			"version": "4.2.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+			"version": "4.2.10",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+			"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+			"license": "ISC"
 		},
 		"node_modules/gray-matter": {
 			"version": "4.0.3",
@@ -6803,17 +7135,6 @@
 			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
 			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
 		},
-		"node_modules/has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"dependencies": {
-				"function-bind": "^1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.4.0"
-			}
-		},
 		"node_modules/has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -6823,20 +7144,20 @@
 			}
 		},
 		"node_modules/has-property-descriptors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
 			"dependencies": {
-				"get-intrinsic": "^1.1.1"
+				"es-define-property": "^1.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/has-proto": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+			"integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -6861,29 +7182,25 @@
 			"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
 		},
 		"node_modules/has-yarn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-			"integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz",
+			"integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==",
 			"engines": {
-				"node": ">=8"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/hast-to-hyperscript": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz",
-			"integrity": "sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==",
+		"node_modules/hasown": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
 			"dependencies": {
-				"@types/unist": "^2.0.3",
-				"comma-separated-tokens": "^1.0.0",
-				"property-information": "^5.3.0",
-				"space-separated-tokens": "^1.0.0",
-				"style-to-object": "^0.3.0",
-				"unist-util-is": "^4.0.0",
-				"web-namespaces": "^1.0.0"
+				"function-bind": "^1.1.2"
 			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/hast-util-from-parse5": {
@@ -6903,6 +7220,52 @@
 				"url": "https://opencollective.com/unified"
 			}
 		},
+		"node_modules/hast-util-from-parse5/node_modules/@types/unist": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+			"integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+			"license": "MIT"
+		},
+		"node_modules/hast-util-from-parse5/node_modules/unist-util-stringify-position": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
+			"integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
+			"dependencies": {
+				"@types/unist": "^2.0.2"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-from-parse5/node_modules/vfile": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
+			"integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"is-buffer": "^2.0.0",
+				"unist-util-stringify-position": "^2.0.0",
+				"vfile-message": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-from-parse5/node_modules/vfile-message": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
+			"integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"unist-util-stringify-position": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
 		"node_modules/hast-util-has-property": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.4.tgz",
@@ -6931,99 +7294,442 @@
 			}
 		},
 		"node_modules/hast-util-raw": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.1.tgz",
-			"integrity": "sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig==",
-			"dependencies": {
-				"@types/hast": "^2.0.0",
-				"hast-util-from-parse5": "^6.0.0",
-				"hast-util-to-parse5": "^6.0.0",
-				"html-void-elements": "^1.0.0",
-				"parse5": "^6.0.0",
-				"unist-util-position": "^3.0.0",
-				"vfile": "^4.0.0",
-				"web-namespaces": "^1.0.0",
-				"xtend": "^4.0.0",
-				"zwitch": "^1.0.0"
+			"version": "9.0.2",
+			"resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-9.0.2.tgz",
+			"integrity": "sha512-PldBy71wO9Uq1kyaMch9AHIghtQvIwxBUkv823pKmkTM3oV1JxtsTNYdevMxvUHqcnOAuO65JKU2+0NOxc2ksA==",
+			"dependencies": {
+				"@types/hast": "^3.0.0",
+				"@types/unist": "^3.0.0",
+				"@ungap/structured-clone": "^1.0.0",
+				"hast-util-from-parse5": "^8.0.0",
+				"hast-util-to-parse5": "^8.0.0",
+				"html-void-elements": "^3.0.0",
+				"mdast-util-to-hast": "^13.0.0",
+				"parse5": "^7.0.0",
+				"unist-util-position": "^5.0.0",
+				"unist-util-visit": "^5.0.0",
+				"vfile": "^6.0.0",
+				"web-namespaces": "^2.0.0",
+				"zwitch": "^2.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/hast-util-raw/node_modules/parse5": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-		},
-		"node_modules/hast-util-select": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/hast-util-select/-/hast-util-select-4.0.2.tgz",
-			"integrity": "sha512-8EEG2//bN5rrzboPWD2HdS3ugLijNioS1pqOTIolXNf67xxShYw4SQEmVXd3imiBG+U2bC2nVTySr/iRAA7Cjg==",
-			"dependencies": {
-				"bcp-47-match": "^1.0.0",
-				"comma-separated-tokens": "^1.0.0",
-				"css-selector-parser": "^1.0.0",
-				"direction": "^1.0.0",
-				"hast-util-has-property": "^1.0.0",
-				"hast-util-is-element": "^1.0.0",
-				"hast-util-to-string": "^1.0.0",
-				"hast-util-whitespace": "^1.0.0",
-				"not": "^0.1.0",
-				"nth-check": "^2.0.0",
-				"property-information": "^5.0.0",
-				"space-separated-tokens": "^1.0.0",
-				"unist-util-visit": "^2.0.0",
-				"zwitch": "^1.0.0"
-			},
+		"node_modules/hast-util-raw/node_modules/comma-separated-tokens": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+			"integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
 			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"node_modules/hast-util-to-parse5": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz",
-			"integrity": "sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==",
+		"node_modules/hast-util-raw/node_modules/hast-util-from-parse5": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-8.0.1.tgz",
+			"integrity": "sha512-Er/Iixbc7IEa7r/XLtuG52zoqn/b3Xng/w6aZQ0xGVxzhw5xUFxcRqdPzP6yFi/4HBYRaifaI5fQ1RH8n0ZeOQ==",
 			"dependencies": {
-				"hast-to-hyperscript": "^9.0.0",
-				"property-information": "^5.0.0",
-				"web-namespaces": "^1.0.0",
-				"xtend": "^4.0.0",
-				"zwitch": "^1.0.0"
+				"@types/hast": "^3.0.0",
+				"@types/unist": "^3.0.0",
+				"devlop": "^1.0.0",
+				"hastscript": "^8.0.0",
+				"property-information": "^6.0.0",
+				"vfile": "^6.0.0",
+				"vfile-location": "^5.0.0",
+				"web-namespaces": "^2.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/hast-util-to-string": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.4.tgz",
-			"integrity": "sha512-eK0MxRX47AV2eZ+Lyr18DCpQgodvaS3fAQO2+b9Two9F5HEoRPhiUMNzoXArMJfZi2yieFzUBMRl3HNJ3Jus3w==",
+		"node_modules/hast-util-raw/node_modules/hast-util-parse-selector": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz",
+			"integrity": "sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==",
+			"dependencies": {
+				"@types/hast": "^3.0.0"
+			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/hast-util-to-text": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-2.0.1.tgz",
-			"integrity": "sha512-8nsgCARfs6VkwH2jJU9b8LNTuR4700na+0h3PqCaEk4MAnMDeu5P0tP8mjk9LLNGxIeQRLbiDbZVw6rku+pYsQ==",
+		"node_modules/hast-util-raw/node_modules/hastscript": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/hastscript/-/hastscript-8.0.0.tgz",
+			"integrity": "sha512-dMOtzCEd3ABUeSIISmrETiKuyydk1w0pa+gE/uormcTpSYuaNJPbX1NU3JLyscSLjwAQM8bWMhhIlnCqnRvDTw==",
 			"dependencies": {
-				"hast-util-is-element": "^1.0.0",
-				"repeat-string": "^1.0.0",
-				"unist-util-find-after": "^3.0.0"
+				"@types/hast": "^3.0.0",
+				"comma-separated-tokens": "^2.0.0",
+				"hast-util-parse-selector": "^4.0.0",
+				"property-information": "^6.0.0",
+				"space-separated-tokens": "^2.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/hast-util-whitespace": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz",
-			"integrity": "sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==",
+		"node_modules/hast-util-raw/node_modules/property-information": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
+			"integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-raw/node_modules/space-separated-tokens": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+			"integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-raw/node_modules/vfile-location": {
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.3.tgz",
+			"integrity": "sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==",
+			"license": "MIT",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"vfile": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-raw/node_modules/web-namespaces": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
+			"integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-raw/node_modules/zwitch": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+			"integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-select": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/hast-util-select/-/hast-util-select-4.0.2.tgz",
+			"integrity": "sha512-8EEG2//bN5rrzboPWD2HdS3ugLijNioS1pqOTIolXNf67xxShYw4SQEmVXd3imiBG+U2bC2nVTySr/iRAA7Cjg==",
+			"dependencies": {
+				"bcp-47-match": "^1.0.0",
+				"comma-separated-tokens": "^1.0.0",
+				"css-selector-parser": "^1.0.0",
+				"direction": "^1.0.0",
+				"hast-util-has-property": "^1.0.0",
+				"hast-util-is-element": "^1.0.0",
+				"hast-util-to-string": "^1.0.0",
+				"hast-util-whitespace": "^1.0.0",
+				"not": "^0.1.0",
+				"nth-check": "^2.0.0",
+				"property-information": "^5.0.0",
+				"space-separated-tokens": "^1.0.0",
+				"unist-util-visit": "^2.0.0",
+				"zwitch": "^1.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-select/node_modules/@types/unist": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+			"integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+			"license": "MIT"
+		},
+		"node_modules/hast-util-select/node_modules/unist-util-visit": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
+			"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"unist-util-is": "^4.0.0",
+				"unist-util-visit-parents": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-select/node_modules/unist-util-visit-parents": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
+			"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"unist-util-is": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-to-estree": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/hast-util-to-estree/-/hast-util-to-estree-3.1.0.tgz",
+			"integrity": "sha512-lfX5g6hqVh9kjS/B9E2gSkvHH4SZNiQFiqWS0x9fENzEl+8W12RqdRxX6d/Cwxi30tPQs3bIO+aolQJNp1bIyw==",
+			"dependencies": {
+				"@types/estree": "^1.0.0",
+				"@types/estree-jsx": "^1.0.0",
+				"@types/hast": "^3.0.0",
+				"comma-separated-tokens": "^2.0.0",
+				"devlop": "^1.0.0",
+				"estree-util-attach-comments": "^3.0.0",
+				"estree-util-is-identifier-name": "^3.0.0",
+				"hast-util-whitespace": "^3.0.0",
+				"mdast-util-mdx-expression": "^2.0.0",
+				"mdast-util-mdx-jsx": "^3.0.0",
+				"mdast-util-mdxjs-esm": "^2.0.0",
+				"property-information": "^6.0.0",
+				"space-separated-tokens": "^2.0.0",
+				"style-to-object": "^0.4.0",
+				"unist-util-position": "^5.0.0",
+				"zwitch": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-to-estree/node_modules/comma-separated-tokens": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+			"integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-estree/node_modules/hast-util-whitespace": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+			"integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
+			"dependencies": {
+				"@types/hast": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-to-estree/node_modules/property-information": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
+			"integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-estree/node_modules/space-separated-tokens": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+			"integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-estree/node_modules/zwitch": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+			"integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-jsx-runtime": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.0.tgz",
+			"integrity": "sha512-H/y0+IWPdsLLS738P8tDnrQ8Z+dj12zQQ6WC11TIM21C8WFVoIxcqWXf2H3hiTVZjF1AWqoimGwrTWecWrnmRQ==",
+			"dependencies": {
+				"@types/estree": "^1.0.0",
+				"@types/hast": "^3.0.0",
+				"@types/unist": "^3.0.0",
+				"comma-separated-tokens": "^2.0.0",
+				"devlop": "^1.0.0",
+				"estree-util-is-identifier-name": "^3.0.0",
+				"hast-util-whitespace": "^3.0.0",
+				"mdast-util-mdx-expression": "^2.0.0",
+				"mdast-util-mdx-jsx": "^3.0.0",
+				"mdast-util-mdxjs-esm": "^2.0.0",
+				"property-information": "^6.0.0",
+				"space-separated-tokens": "^2.0.0",
+				"style-to-object": "^1.0.0",
+				"unist-util-position": "^5.0.0",
+				"vfile-message": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-to-jsx-runtime/node_modules/comma-separated-tokens": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+			"integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-jsx-runtime/node_modules/hast-util-whitespace": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+			"integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
+			"dependencies": {
+				"@types/hast": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-to-jsx-runtime/node_modules/inline-style-parser": {
+			"version": "0.2.4",
+			"resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.4.tgz",
+			"integrity": "sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==",
+			"license": "MIT"
+		},
+		"node_modules/hast-util-to-jsx-runtime/node_modules/property-information": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
+			"integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-jsx-runtime/node_modules/space-separated-tokens": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+			"integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-jsx-runtime/node_modules/style-to-object": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.8.tgz",
+			"integrity": "sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==",
+			"license": "MIT",
+			"dependencies": {
+				"inline-style-parser": "0.2.4"
+			}
+		},
+		"node_modules/hast-util-to-parse5": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-8.0.0.tgz",
+			"integrity": "sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==",
+			"dependencies": {
+				"@types/hast": "^3.0.0",
+				"comma-separated-tokens": "^2.0.0",
+				"devlop": "^1.0.0",
+				"property-information": "^6.0.0",
+				"space-separated-tokens": "^2.0.0",
+				"web-namespaces": "^2.0.0",
+				"zwitch": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-to-parse5/node_modules/comma-separated-tokens": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+			"integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-parse5/node_modules/property-information": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
+			"integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-parse5/node_modules/space-separated-tokens": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+			"integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-parse5/node_modules/web-namespaces": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
+			"integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-parse5/node_modules/zwitch": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+			"integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/hast-util-to-string": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.4.tgz",
+			"integrity": "sha512-eK0MxRX47AV2eZ+Lyr18DCpQgodvaS3fAQO2+b9Two9F5HEoRPhiUMNzoXArMJfZi2yieFzUBMRl3HNJ3Jus3w==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-to-text": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-2.0.1.tgz",
+			"integrity": "sha512-8nsgCARfs6VkwH2jJU9b8LNTuR4700na+0h3PqCaEk4MAnMDeu5P0tP8mjk9LLNGxIeQRLbiDbZVw6rku+pYsQ==",
+			"dependencies": {
+				"hast-util-is-element": "^1.0.0",
+				"repeat-string": "^1.0.0",
+				"unist-util-find-after": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/hast-util-whitespace": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz",
+			"integrity": "sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==",
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
@@ -7045,6 +7751,20 @@
 				"url": "https://opencollective.com/unified"
 			}
 		},
+		"node_modules/hastscript/node_modules/@types/hast": {
+			"version": "2.3.10",
+			"resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
+			"integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==",
+			"dependencies": {
+				"@types/unist": "^2"
+			}
+		},
+		"node_modules/hastscript/node_modules/@types/unist": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+			"integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+			"license": "MIT"
+		},
 		"node_modules/he": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -7121,18 +7841,10 @@
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
-		"node_modules/hpack.js/node_modules/string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"dependencies": {
-				"safe-buffer": "~5.1.0"
-			}
-		},
 		"node_modules/html-entities": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-			"integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+			"integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
 			"funding": [
 				{
 					"type": "github",
@@ -7144,32 +7856,37 @@
 				}
 			]
 		},
+		"node_modules/html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+		},
 		"node_modules/html-minifier-terser": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-			"integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
+			"integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==",
 			"dependencies": {
 				"camel-case": "^4.1.2",
-				"clean-css": "^5.2.2",
-				"commander": "^8.3.0",
-				"he": "^1.2.0",
+				"clean-css": "~5.3.2",
+				"commander": "^10.0.0",
+				"entities": "^4.4.0",
 				"param-case": "^3.0.4",
 				"relateurl": "^0.2.7",
-				"terser": "^5.10.0"
+				"terser": "^5.15.1"
 			},
 			"bin": {
 				"html-minifier-terser": "cli.js"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": "^14.13.1 || >=16.0.0"
 			}
 		},
 		"node_modules/html-minifier-terser/node_modules/commander": {
-			"version": "8.3.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-			"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+			"integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
 			"engines": {
-				"node": ">= 12"
+				"node": ">=14"
 			}
 		},
 		"node_modules/html-tags": {
@@ -7184,18 +7901,18 @@
 			}
 		},
 		"node_modules/html-void-elements": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
-			"integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+			"integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
 		"node_modules/html-webpack-plugin": {
-			"version": "5.5.3",
-			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
-			"integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
+			"version": "5.6.0",
+			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz",
+			"integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==",
 			"dependencies": {
 				"@types/html-minifier-terser": "^6.0.0",
 				"html-minifier-terser": "^6.0.2",
@@ -7211,7 +7928,44 @@
 				"url": "https://opencollective.com/html-webpack-plugin"
 			},
 			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
 				"webpack": "^5.20.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/html-webpack-plugin/node_modules/commander": {
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+			"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+			"engines": {
+				"node": ">= 12"
+			}
+		},
+		"node_modules/html-webpack-plugin/node_modules/html-minifier-terser": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+			"integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+			"dependencies": {
+				"camel-case": "^4.1.2",
+				"clean-css": "^5.2.2",
+				"commander": "^8.3.0",
+				"he": "^1.2.0",
+				"param-case": "^3.0.4",
+				"relateurl": "^0.2.7",
+				"terser": "^5.10.0"
+			},
+			"bin": {
+				"html-minifier-terser": "cli.js"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
 		"node_modules/htmlparser2": {
@@ -7246,6 +8000,7 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
 			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+			"license": "MIT",
 			"dependencies": {
 				"depd": "2.0.0",
 				"inherits": "2.0.4",
@@ -7309,6 +8064,18 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/http2-wrapper": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+			"integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
+			"dependencies": {
+				"quick-lru": "^5.1.1",
+				"resolve-alpn": "^1.2.0"
+			},
+			"engines": {
+				"node": ">=10.19.0"
+			}
+		},
 		"node_modules/human-signals": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -7321,6 +8088,7 @@
 			"version": "0.4.24",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
 			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"license": "MIT",
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			},
@@ -7340,17 +8108,17 @@
 			}
 		},
 		"node_modules/ignore": {
-			"version": "5.2.4",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-			"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+			"integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
 			"engines": {
 				"node": ">= 4"
 			}
 		},
 		"node_modules/image-size": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.0.2.tgz",
-			"integrity": "sha512-xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.1.1.tgz",
+			"integrity": "sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ==",
 			"dependencies": {
 				"queue": "6.0.2"
 			},
@@ -7358,7 +8126,7 @@
 				"image-size": "bin/image-size.js"
 			},
 			"engines": {
-				"node": ">=14.0.0"
+				"node": ">=16.x"
 			}
 		},
 		"node_modules/immediate": {
@@ -7391,11 +8159,11 @@
 			}
 		},
 		"node_modules/import-lazy": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-			"integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
 			"engines": {
-				"node": ">=4"
+				"node": ">=8"
 			}
 		},
 		"node_modules/imurmurhash": {
@@ -7463,29 +8231,30 @@
 			}
 		},
 		"node_modules/ipaddr.js": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
-			"integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+			"integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 10"
 			}
 		},
 		"node_modules/is-alphabetical": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-			"integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-2.0.1.tgz",
+			"integrity": "sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
 		"node_modules/is-alphanumerical": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-			"integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz",
+			"integrity": "sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==",
 			"dependencies": {
-				"is-alphabetical": "^1.0.0",
-				"is-decimal": "^1.0.0"
+				"is-alphabetical": "^2.0.0",
+				"is-decimal": "^2.0.0"
 			},
 			"funding": {
 				"type": "github",
@@ -7531,36 +8300,31 @@
 			}
 		},
 		"node_modules/is-ci": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-			"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+			"integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
 			"dependencies": {
-				"ci-info": "^2.0.0"
+				"ci-info": "^3.2.0"
 			},
 			"bin": {
 				"is-ci": "bin.js"
 			}
 		},
-		"node_modules/is-ci/node_modules/ci-info": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-			"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-		},
 		"node_modules/is-core-module": {
-			"version": "2.13.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-			"integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+			"version": "2.13.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+			"integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
 			"dependencies": {
-				"has": "^1.0.3"
+				"hasown": "^2.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/is-decimal": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-			"integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-2.0.1.tgz",
+			"integrity": "sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -7616,9 +8380,9 @@
 			}
 		},
 		"node_modules/is-hexadecimal": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-			"integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz",
+			"integrity": "sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -7640,11 +8404,11 @@
 			}
 		},
 		"node_modules/is-npm": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-			"integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz",
+			"integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==",
 			"engines": {
-				"node": ">=10"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
@@ -7654,6 +8418,7 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.12.0"
 			}
@@ -7683,24 +8448,32 @@
 			}
 		},
 		"node_modules/is-plain-obj": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+			"integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+			"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/is-reference": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz",
+			"integrity": "sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==",
+			"dependencies": {
+				"@types/estree": "*"
+			}
+		},
 		"node_modules/is-regexp": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
@@ -7733,24 +8506,6 @@
 			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
 			"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
 		},
-		"node_modules/is-whitespace-character": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-			"integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
-		"node_modules/is-word-character": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-			"integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
 		"node_modules/is-wsl": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -7763,9 +8518,12 @@
 			}
 		},
 		"node_modules/is-yarn-global": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-			"integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz",
+			"integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==",
+			"engines": {
+				"node": ">=12"
+			}
 		},
 		"node_modules/isarray": {
 			"version": "0.0.1",
@@ -7786,9 +8544,9 @@
 			}
 		},
 		"node_modules/jest-util": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.3.tgz",
-			"integrity": "sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
 			"dependencies": {
 				"@jest/types": "^29.6.3",
 				"@types/node": "*",
@@ -7802,12 +8560,12 @@
 			}
 		},
 		"node_modules/jest-worker": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
-			"integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+			"integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
 			"dependencies": {
 				"@types/node": "*",
-				"jest-util": "^29.6.3",
+				"jest-util": "^29.7.0",
 				"merge-stream": "^2.0.0",
 				"supports-color": "^8.0.0"
 			},
@@ -7830,21 +8588,21 @@
 			}
 		},
 		"node_modules/jiti": {
-			"version": "1.19.3",
-			"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.3.tgz",
-			"integrity": "sha512-5eEbBDQT/jF1xg6l36P+mWGGoH9Spuy0PCdSr2dtWRDGC6ph/w9ZCL4lmESW8f8F7MwT3XKescfP0wnZWAKL9w==",
+			"version": "1.21.0",
+			"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
+			"integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
 			"bin": {
 				"jiti": "bin/jiti.js"
 			}
 		},
 		"node_modules/joi": {
-			"version": "17.9.2",
-			"resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz",
-			"integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==",
+			"version": "17.12.2",
+			"resolved": "https://registry.npmjs.org/joi/-/joi-17.12.2.tgz",
+			"integrity": "sha512-RonXAIzCiHLc8ss3Ibuz45u28GOsWE1UpfDXLbN/9NKbL4tCJf8TWYVKsoYuuh+sAUt7fsSNpA+r2+TBA6Wjmw==",
 			"dependencies": {
-				"@hapi/hoek": "^9.0.0",
-				"@hapi/topo": "^5.0.0",
-				"@sideway/address": "^4.1.3",
+				"@hapi/hoek": "^9.3.0",
+				"@hapi/topo": "^5.1.0",
+				"@sideway/address": "^4.1.5",
 				"@sideway/formula": "^3.0.1",
 				"@sideway/pinpoint": "^2.0.0"
 			}
@@ -7877,9 +8635,9 @@
 			}
 		},
 		"node_modules/json-buffer": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-			"integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
 		},
 		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
@@ -7887,9 +8645,9 @@
 			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
 		},
 		"node_modules/json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
 		},
 		"node_modules/json5": {
 			"version": "2.2.3",
@@ -7914,11 +8672,11 @@
 			}
 		},
 		"node_modules/keyv": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-			"integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
 			"dependencies": {
-				"json-buffer": "3.0.0"
+				"json-buffer": "3.0.1"
 			}
 		},
 		"node_modules/kind-of": {
@@ -7938,23 +8696,26 @@
 			}
 		},
 		"node_modules/latest-version": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-			"integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz",
+			"integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==",
 			"dependencies": {
-				"package-json": "^6.3.0"
+				"package-json": "^8.1.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/launch-editor": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
-			"integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz",
+			"integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==",
 			"dependencies": {
 				"picocolors": "^1.0.0",
-				"shell-quote": "^1.7.3"
+				"shell-quote": "^1.8.1"
 			}
 		},
 		"node_modules/leven": {
@@ -8000,14 +8761,17 @@
 			}
 		},
 		"node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+			"integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
 			"dependencies": {
-				"p-locate": "^4.1.0"
+				"p-locate": "^6.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/lodash": {
@@ -8015,21 +8779,11 @@
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
-		"node_modules/lodash.curry": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
-			"integrity": "sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA=="
-		},
 		"node_modules/lodash.debounce": {
 			"version": "4.0.8",
 			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
 			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
 		},
-		"node_modules/lodash.flow": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz",
-			"integrity": "sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw=="
-		},
 		"node_modules/lodash.memoize": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -8040,6 +8794,15 @@
 			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
 			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
 		},
+		"node_modules/longest-streak": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
+			"integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/loose-envify": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -8060,11 +8823,14 @@
 			}
 		},
 		"node_modules/lowercase-keys": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-			"integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+			"integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/lru-cache": {
@@ -8081,11983 +8847,3772 @@
 			"integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="
 		},
 		"node_modules/lunr-languages": {
-			"version": "1.13.0",
-			"resolved": "https://registry.npmjs.org/lunr-languages/-/lunr-languages-1.13.0.tgz",
-			"integrity": "sha512-qgTOarcnAtVFKr0aJ2GuiqbBdhKF61jpF8OgFbnlSAb1t6kOiQW67q0hv0UQzzB+5+OwPpnZyFT/L0L9SQG1/A=="
+			"version": "1.14.0",
+			"resolved": "https://registry.npmjs.org/lunr-languages/-/lunr-languages-1.14.0.tgz",
+			"integrity": "sha512-hWUAb2KqM3L7J5bcrngszzISY4BxrXn/Xhbb9TTCJYEGqlR1nG67/M14sp09+PTIRklobrn57IAxcdcO/ZFyNA=="
 		},
-		"node_modules/make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-			"dependencies": {
-				"semver": "^6.0.0"
-			},
+		"node_modules/mark.js": {
+			"version": "8.11.1",
+			"resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
+			"integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ=="
+		},
+		"node_modules/markdown-extensions": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-2.0.0.tgz",
+			"integrity": "sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==",
 			"engines": {
-				"node": ">=8"
+				"node": ">=16"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/make-dir/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/markdown-escapes": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-			"integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
+		"node_modules/markdown-table": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.3.tgz",
+			"integrity": "sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"node_modules/mdast-squeeze-paragraphs": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz",
-			"integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==",
+		"node_modules/mdast-util-directive": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-directive/-/mdast-util-directive-3.0.0.tgz",
+			"integrity": "sha512-JUpYOqKI4mM3sZcNxmF/ox04XYFFkNwr0CFlrQIkCwbvH0xzMCqkMqAde9wRd80VAhaUrwFwKm2nxretdT1h7Q==",
 			"dependencies": {
-				"unist-util-remove": "^2.0.0"
+				"@types/mdast": "^4.0.0",
+				"@types/unist": "^3.0.0",
+				"devlop": "^1.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0",
+				"parse-entities": "^4.0.0",
+				"stringify-entities": "^4.0.0",
+				"unist-util-visit-parents": "^6.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mdast-util-definitions": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz",
-			"integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==",
+		"node_modules/mdast-util-find-and-replace": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.1.tgz",
+			"integrity": "sha512-SG21kZHGC3XRTSUhtofZkBzZTJNM5ecCi0SK2IMKmSXR8vO3peL+kb1O0z7Zl83jKtutG4k5Wv/W7V3/YHvzPA==",
 			"dependencies": {
-				"unist-util-visit": "^2.0.0"
+				"@types/mdast": "^4.0.0",
+				"escape-string-regexp": "^5.0.0",
+				"unist-util-is": "^6.0.0",
+				"unist-util-visit-parents": "^6.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mdast-util-to-hast": {
-			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz",
-			"integrity": "sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==",
+		"node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+			"integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/mdast-util-find-and-replace/node_modules/unist-util-is": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+			"integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
 			"dependencies": {
-				"@types/mdast": "^3.0.0",
-				"@types/unist": "^2.0.0",
-				"mdast-util-definitions": "^4.0.0",
-				"mdurl": "^1.0.0",
-				"unist-builder": "^2.0.0",
-				"unist-util-generated": "^1.0.0",
-				"unist-util-position": "^3.0.0",
-				"unist-util-visit": "^2.0.0"
+				"@types/unist": "^3.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mdast-util-to-string": {
+		"node_modules/mdast-util-from-markdown": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-			"integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+			"resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.0.tgz",
+			"integrity": "sha512-n7MTOr/z+8NAX/wmhhDji8O3bRvPTV/U0oTCaZJkjhPSKTPhS3xufVhKGF8s1pJ7Ox4QgoIU7KHseh09S+9rTA==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"@types/unist": "^3.0.0",
+				"decode-named-character-reference": "^1.0.0",
+				"devlop": "^1.0.0",
+				"mdast-util-to-string": "^4.0.0",
+				"micromark": "^4.0.0",
+				"micromark-util-decode-numeric-character-reference": "^2.0.0",
+				"micromark-util-decode-string": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0",
+				"unist-util-stringify-position": "^4.0.0"
+			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mdn-data": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-		},
-		"node_modules/mdurl": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-			"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
-		},
-		"node_modules/media-typer": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-			"engines": {
-				"node": ">= 0.6"
-			}
+		"node_modules/mdast-util-from-markdown/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/memfs": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-			"integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+		"node_modules/mdast-util-frontmatter": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-2.0.1.tgz",
+			"integrity": "sha512-LRqI9+wdgC25P0URIJY9vwocIzCcksduHQ9OF2joxQoyTNVduwLAFUzjoopuRJbJAReaKrNQKAZKL3uCMugWJA==",
 			"dependencies": {
-				"fs-monkey": "^1.0.4"
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.0.0",
+				"escape-string-regexp": "^5.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0",
+				"micromark-extension-frontmatter": "^2.0.0"
 			},
-			"engines": {
-				"node": ">= 4.0.0"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
-		},
-		"node_modules/merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-		},
-		"node_modules/merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+		"node_modules/mdast-util-frontmatter/node_modules/escape-string-regexp": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+			"integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
 			"engines": {
-				"node": ">= 8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/methods": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-			"engines": {
-				"node": ">= 0.6"
+		"node_modules/mdast-util-gfm": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-3.0.0.tgz",
+			"integrity": "sha512-dgQEX5Amaq+DuUqf26jJqSK9qgixgd6rYDHAv4aTBuA92cTknZlKpPfa86Z/s8Dj8xsAQpFfBmPUHWJBWqS4Bw==",
+			"dependencies": {
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-gfm-autolink-literal": "^2.0.0",
+				"mdast-util-gfm-footnote": "^2.0.0",
+				"mdast-util-gfm-strikethrough": "^2.0.0",
+				"mdast-util-gfm-table": "^2.0.0",
+				"mdast-util-gfm-task-list-item": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+		"node_modules/mdast-util-gfm-autolink-literal": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.0.tgz",
+			"integrity": "sha512-FyzMsduZZHSc3i0Px3PQcBT4WJY/X/RCtEJKuybiC6sjPqLv7h1yqAkmILZtuxMSsUyaLUWNp71+vQH2zqp5cg==",
 			"dependencies": {
-				"braces": "^3.0.2",
-				"picomatch": "^2.3.1"
+				"@types/mdast": "^4.0.0",
+				"ccount": "^2.0.0",
+				"devlop": "^1.0.0",
+				"mdast-util-find-and-replace": "^3.0.0",
+				"micromark-util-character": "^2.0.0"
 			},
-			"engines": {
-				"node": ">=8.6"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mime": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-			"bin": {
-				"mime": "cli.js"
-			},
-			"engines": {
-				"node": ">=4"
+		"node_modules/mdast-util-gfm-autolink-literal/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/mime-db": {
-			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-			"integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
-			"engines": {
-				"node": ">= 0.6"
-			}
+		"node_modules/mdast-util-gfm-autolink-literal/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/mime-types": {
-			"version": "2.1.18",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-			"integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+		"node_modules/mdast-util-gfm-footnote": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.0.0.tgz",
+			"integrity": "sha512-5jOT2boTSVkMnQ7LTrd6n/18kqwjmuYqo7JUPe+tRCY6O7dAuTFMtTPauYYrMPpox9hlN0uOx/FL8XvEfG9/mQ==",
 			"dependencies": {
-				"mime-db": "~1.33.0"
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.1.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0"
 			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/mimic-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/mimic-response": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-			"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-			"engines": {
-				"node": ">=4"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mini-css-extract-plugin": {
-			"version": "2.7.6",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
-			"integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
+		"node_modules/mdast-util-gfm-strikethrough": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-2.0.0.tgz",
+			"integrity": "sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==",
 			"dependencies": {
-				"schema-utils": "^4.0.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
+				"@types/mdast": "^4.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.0.0"
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+		"node_modules/mdast-util-gfm-table": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-2.0.0.tgz",
+			"integrity": "sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.0.0",
+				"markdown-table": "^3.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
 			},
 			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+		"node_modules/mdast-util-gfm-task-list-item": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-2.0.0.tgz",
+			"integrity": "sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
 			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-		},
-		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+		"node_modules/mdast-util-mdx": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-3.0.0.tgz",
+			"integrity": "sha512-JfbYLAW7XnYTTbUsmpu0kdBUVe+yKVJZBItEjwyYJiDJuZ9w4eeaqks4HQO+R7objWgS2ymV60GYpI14Ug554w==",
 			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-mdx-expression": "^2.0.0",
+				"mdast-util-mdx-jsx": "^3.0.0",
+				"mdast-util-mdxjs-esm": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
 			},
 			"funding": {
 				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/minimalistic-assert": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-		},
-		"node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+		"node_modules/mdast-util-mdx-expression": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.0.tgz",
+			"integrity": "sha512-fGCu8eWdKUKNu5mohVGkhBXCXGnOTLuFqOvGMvdikr+J1w7lDJgxThOKpwRWzzbyXAU2hhSwsmssOY4yTokluw==",
 			"dependencies": {
-				"brace-expansion": "^1.1.7"
+				"@types/estree-jsx": "^1.0.0",
+				"@types/hast": "^3.0.0",
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
 			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/minimist": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
 			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mkdirp": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-			"integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==",
-			"deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-			"engines": {
-				"node": "*"
+		"node_modules/mdast-util-mdx-jsx": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.1.2.tgz",
+			"integrity": "sha512-eKMQDeywY2wlHc97k5eD8VC+9ASMjN8ItEZQNGwJ6E0XWKiW/Z0V5/H8pvoXUf+y+Mj0VIgeRRbujBmFn4FTyA==",
+			"dependencies": {
+				"@types/estree-jsx": "^1.0.0",
+				"@types/hast": "^3.0.0",
+				"@types/mdast": "^4.0.0",
+				"@types/unist": "^3.0.0",
+				"ccount": "^2.0.0",
+				"devlop": "^1.1.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0",
+				"parse-entities": "^4.0.0",
+				"stringify-entities": "^4.0.0",
+				"unist-util-remove-position": "^5.0.0",
+				"unist-util-stringify-position": "^4.0.0",
+				"vfile-message": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/mrmime": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
-			"integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
-			"engines": {
-				"node": ">=10"
+		"node_modules/mdast-util-mdxjs-esm": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-2.0.1.tgz",
+			"integrity": "sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==",
+			"dependencies": {
+				"@types/estree-jsx": "^1.0.0",
+				"@types/hast": "^3.0.0",
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"mdast-util-to-markdown": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-		},
-		"node_modules/multicast-dns": {
-			"version": "7.2.5",
-			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-			"integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+		"node_modules/mdast-util-phrasing": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz",
+			"integrity": "sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==",
 			"dependencies": {
-				"dns-packet": "^5.2.2",
-				"thunky": "^1.0.2"
+				"@types/mdast": "^4.0.0",
+				"unist-util-is": "^6.0.0"
 			},
-			"bin": {
-				"multicast-dns": "cli.js"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/nanoid": {
-			"version": "3.3.6",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-			"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"bin": {
-				"nanoid": "bin/nanoid.cjs"
+		"node_modules/mdast-util-phrasing/node_modules/unist-util-is": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+			"integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
 			},
-			"engines": {
-				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/negotiator": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-			"engines": {
-				"node": ">= 0.6"
+		"node_modules/mdast-util-to-hast": {
+			"version": "13.1.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.1.0.tgz",
+			"integrity": "sha512-/e2l/6+OdGp/FB+ctrJ9Avz71AN/GRH3oi/3KAx/kMnoUsD6q0woXlDT8lLEeViVKE7oZxE7RXzvO3T8kF2/sA==",
+			"dependencies": {
+				"@types/hast": "^3.0.0",
+				"@types/mdast": "^4.0.0",
+				"@ungap/structured-clone": "^1.0.0",
+				"devlop": "^1.0.0",
+				"micromark-util-sanitize-uri": "^2.0.0",
+				"trim-lines": "^3.0.0",
+				"unist-util-position": "^5.0.0",
+				"unist-util-visit": "^5.0.0",
+				"vfile": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/neo-async": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-		},
-		"node_modules/no-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-			"integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+		"node_modules/mdast-util-to-markdown": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.0.tgz",
+			"integrity": "sha512-SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ==",
 			"dependencies": {
-				"lower-case": "^2.0.2",
-				"tslib": "^2.0.3"
+				"@types/mdast": "^4.0.0",
+				"@types/unist": "^3.0.0",
+				"longest-streak": "^3.0.0",
+				"mdast-util-phrasing": "^4.0.0",
+				"mdast-util-to-string": "^4.0.0",
+				"micromark-util-decode-string": "^2.0.0",
+				"unist-util-visit": "^5.0.0",
+				"zwitch": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/node-emoji": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
-			"integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==",
-			"dependencies": {
-				"lodash": "^4.17.21"
+		"node_modules/mdast-util-to-markdown/node_modules/zwitch": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+			"integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"node_modules/node-fetch": {
-			"version": "2.6.13",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz",
-			"integrity": "sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==",
+		"node_modules/mdast-util-to-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz",
+			"integrity": "sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==",
 			"dependencies": {
-				"whatwg-url": "^5.0.0"
-			},
-			"engines": {
-				"node": "4.x || >=6.0.0"
+				"@types/mdast": "^4.0.0"
 			},
-			"peerDependencies": {
-				"encoding": "^0.1.0"
-			},
-			"peerDependenciesMeta": {
-				"encoding": {
-					"optional": true
-				}
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/node-forge": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-			"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+		"node_modules/mdn-data": {
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
+		},
+		"node_modules/media-typer": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+			"license": "MIT",
 			"engines": {
-				"node": ">= 6.13.0"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/node-releases": {
-			"version": "2.0.13",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-			"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
-		},
-		"node_modules/nopt": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-			"integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
+		"node_modules/memfs": {
+			"version": "3.5.3",
+			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+			"integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
 			"dependencies": {
-				"abbrev": "1"
-			},
-			"bin": {
-				"nopt": "bin/nopt.js"
+				"fs-monkey": "^1.0.4"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">= 4.0.0"
 			}
 		},
-		"node_modules/normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"engines": {
-				"node": ">=0.10.0"
+		"node_modules/merge-descriptors": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+			"integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/normalize-range": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+		"node_modules/merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+		},
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 8"
 			}
 		},
-		"node_modules/normalize-url": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+		"node_modules/methods": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
 			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">= 0.6"
 			}
 		},
-		"node_modules/not": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/not/-/not-0.1.0.tgz",
-			"integrity": "sha512-5PDmaAsVfnWUgTUbJ3ERwn7u79Z0dYxN9ErxCpVJJqe2RK0PJ3z+iFUxuqjwtlDDegXvtWoxD/3Fzxox7tFGWA=="
+		"node_modules/micromark": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.0.tgz",
+			"integrity": "sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"@types/debug": "^4.0.0",
+				"debug": "^4.0.0",
+				"decode-named-character-reference": "^1.0.0",
+				"devlop": "^1.0.0",
+				"micromark-core-commonmark": "^2.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-combine-extensions": "^2.0.0",
+				"micromark-util-decode-numeric-character-reference": "^2.0.0",
+				"micromark-util-encode": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0",
+				"micromark-util-resolve-all": "^2.0.0",
+				"micromark-util-sanitize-uri": "^2.0.0",
+				"micromark-util-subtokenize": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
+		},
+		"node_modules/micromark-core-commonmark": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.0.tgz",
+			"integrity": "sha512-jThOz/pVmAYUtkroV3D5c1osFXAMv9e0ypGDOIZuCeAe91/sD6BoE2Sjzt30yuXtwOYUmySOhMas/PVyh02itA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"decode-named-character-reference": "^1.0.0",
+				"devlop": "^1.0.0",
+				"micromark-factory-destination": "^2.0.0",
+				"micromark-factory-label": "^2.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-factory-title": "^2.0.0",
+				"micromark-factory-whitespace": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-classify-character": "^2.0.0",
+				"micromark-util-html-tag-name": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0",
+				"micromark-util-resolve-all": "^2.0.0",
+				"micromark-util-subtokenize": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
+		},
+		"node_modules/micromark-core-commonmark/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
 		},
-		"node_modules/npm-run-path": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+		"node_modules/micromark-core-commonmark/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"path-key": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/nprogress": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
-			"integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
+		"node_modules/micromark-core-commonmark/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/nth-check": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+		"node_modules/micromark-extension-directive": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-directive/-/micromark-extension-directive-3.0.0.tgz",
+			"integrity": "sha512-61OI07qpQrERc+0wEysLHMvoiO3s2R56x5u7glHq2Yqq6EHbH4dW25G9GfDdGCDYqA21KE6DWgNSzxSwHc2hSg==",
 			"dependencies": {
-				"boolbase": "^1.0.0"
+				"devlop": "^1.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-factory-whitespace": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0",
+				"parse-entities": "^4.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/fb55/nth-check?sponsor=1"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-			"engines": {
-				"node": ">=0.10.0"
+		"node_modules/micromark-extension-directive/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/object-inspect": {
-			"version": "1.12.3",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-			"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+		"node_modules/micromark-extension-directive/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"engines": {
-				"node": ">= 0.4"
-			}
+		"node_modules/micromark-extension-directive/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/object.assign": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+		"node_modules/micromark-extension-frontmatter": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-2.0.0.tgz",
+			"integrity": "sha512-C4AkuM3dA58cgZha7zVnuVxBhDsbttIMiytjgsM2XbHAB2faRVaHRle40558FBN+DJcrLNCoqG5mlrpdU4cRtg==",
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"has-symbols": "^1.0.3",
-				"object-keys": "^1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.4"
+				"fault": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/obuf": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
-		},
-		"node_modules/on-finished": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+		"node_modules/micromark-extension-frontmatter/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"ee-first": "1.1.1"
-			},
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/on-headers": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-			"engines": {
-				"node": ">= 0.8"
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-			"dependencies": {
-				"wrappy": "1"
-			}
+		"node_modules/micromark-extension-frontmatter/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/onetime": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+		"node_modules/micromark-extension-gfm": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-3.0.0.tgz",
+			"integrity": "sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==",
 			"dependencies": {
-				"mimic-fn": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=6"
+				"micromark-extension-gfm-autolink-literal": "^2.0.0",
+				"micromark-extension-gfm-footnote": "^2.0.0",
+				"micromark-extension-gfm-strikethrough": "^2.0.0",
+				"micromark-extension-gfm-table": "^2.0.0",
+				"micromark-extension-gfm-tagfilter": "^2.0.0",
+				"micromark-extension-gfm-task-list-item": "^2.0.0",
+				"micromark-util-combine-extensions": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/open": {
-			"version": "8.4.2",
-			"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-			"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+		"node_modules/micromark-extension-gfm-autolink-literal": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.0.0.tgz",
+			"integrity": "sha512-rTHfnpt/Q7dEAK1Y5ii0W8bhfJlVJFnJMHIPisfPK3gpVNuOP0VnRl96+YJ3RYWV/P4gFeQoGKNlT3RhuvpqAg==",
 			"dependencies": {
-				"define-lazy-prop": "^2.0.0",
-				"is-docker": "^2.1.1",
-				"is-wsl": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=12"
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-sanitize-uri": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/opener": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-			"bin": {
-				"opener": "bin/opener-bin.js"
+		"node_modules/micromark-extension-gfm-autolink-literal/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/p-cancelable": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-			"integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-			"engines": {
-				"node": ">=6"
-			}
+		"node_modules/micromark-extension-gfm-autolink-literal/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+		"node_modules/micromark-extension-gfm-footnote": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.0.0.tgz",
+			"integrity": "sha512-6Rzu0CYRKDv3BfLAUnZsSlzx3ak6HAoI85KTiijuKIz5UxZxbUI+pD6oHgw+6UtQuiRwnGRhzMmPRv4smcz0fg==",
 			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
+				"devlop": "^1.0.0",
+				"micromark-core-commonmark": "^2.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-normalize-identifier": "^2.0.0",
+				"micromark-util-sanitize-uri": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
+		"node_modules/micromark-extension-gfm-footnote/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/p-map": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-			"integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+		"node_modules/micromark-extension-gfm-footnote/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"aggregate-error": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/p-retry": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-			"integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+		"node_modules/micromark-extension-gfm-footnote/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
+		},
+		"node_modules/micromark-extension-gfm-strikethrough": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.0.0.tgz",
+			"integrity": "sha512-c3BR1ClMp5fxxmwP6AoOY2fXO9U8uFMKs4ADD66ahLTNcwzSCyRVU4k7LPV5Nxo/VJiR4TdzxRQY2v3qIUceCw==",
 			"dependencies": {
-				"@types/retry": "0.12.0",
-				"retry": "^0.13.1"
+				"devlop": "^1.0.0",
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-classify-character": "^2.0.0",
+				"micromark-util-resolve-all": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
-			"engines": {
-				"node": ">=8"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"engines": {
-				"node": ">=6"
-			}
+		"node_modules/micromark-extension-gfm-strikethrough/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/package-json": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-			"integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
+		"node_modules/micromark-extension-gfm-table": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.0.0.tgz",
+			"integrity": "sha512-PoHlhypg1ItIucOaHmKE8fbin3vTLpDOUg8KAr8gRCF1MOZI9Nquq2i/44wFvviM4WuxJzc3demT8Y3dkfvYrw==",
 			"dependencies": {
-				"got": "^9.6.0",
-				"registry-auth-token": "^4.0.0",
-				"registry-url": "^5.0.0",
-				"semver": "^6.2.0"
+				"devlop": "^1.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/package-json/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/param-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-			"integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+		"node_modules/micromark-extension-gfm-table/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"dot-case": "^3.0.4",
-				"tslib": "^2.0.3"
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+		"node_modules/micromark-extension-gfm-table/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"callsites": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/parse-entities": {
+		"node_modules/micromark-extension-gfm-table/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
+		},
+		"node_modules/micromark-extension-gfm-tagfilter": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-			"integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-2.0.0.tgz",
+			"integrity": "sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==",
 			"dependencies": {
-				"character-entities": "^1.0.0",
-				"character-entities-legacy": "^1.0.0",
-				"character-reference-invalid": "^1.0.0",
-				"is-alphanumerical": "^1.0.0",
-				"is-decimal": "^1.0.0",
-				"is-hexadecimal": "^1.0.0"
+				"micromark-util-types": "^2.0.0"
 			},
 			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+		"node_modules/micromark-extension-gfm-task-list-item": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.0.1.tgz",
+			"integrity": "sha512-cY5PzGcnULaN5O7T+cOzfMoHjBW7j+T9D2sucA5d/KbsBTPcYdebm9zUd9zzdgJGCwahV+/W78Z3nbulBYVbTw==",
 			"dependencies": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			},
-			"engines": {
-				"node": ">=8"
+				"devlop": "^1.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/parse-numeric-range": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz",
-			"integrity": "sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ=="
-		},
-		"node_modules/parse5": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-			"integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+		"node_modules/micromark-extension-gfm-task-list-item/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"entities": "^4.4.0"
-			},
-			"funding": {
-				"url": "https://github.com/inikulin/parse5?sponsor=1"
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/parse5-htmlparser2-tree-adapter": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
-			"integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
+		"node_modules/micromark-extension-gfm-task-list-item/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"domhandler": "^5.0.2",
-				"parse5": "^7.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/inikulin/parse5?sponsor=1"
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/parseurl": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-			"engines": {
-				"node": ">= 0.8"
-			}
+		"node_modules/micromark-extension-gfm-task-list-item/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/pascal-case": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-			"integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+		"node_modules/micromark-extension-mdx-expression": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-3.0.0.tgz",
+			"integrity": "sha512-sI0nwhUDz97xyzqJAbHQhp5TfaxEvZZZ2JDqUo+7NvyIYG6BZ5CPPqj2ogUoPJlmXHBnyZUzISg9+oUmU6tUjQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3"
+				"@types/estree": "^1.0.0",
+				"devlop": "^1.0.0",
+				"micromark-factory-mdx-expression": "^2.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-events-to-acorn": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"engines": {
-				"node": ">=8"
+		"node_modules/micromark-extension-mdx-expression/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-			"engines": {
-				"node": ">=0.10.0"
+		"node_modules/micromark-extension-mdx-expression/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/path-is-inside": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-			"integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="
+		"node_modules/micromark-extension-mdx-expression/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"engines": {
-				"node": ">=8"
+		"node_modules/micromark-extension-mdx-jsx": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-3.0.0.tgz",
+			"integrity": "sha512-uvhhss8OGuzR4/N17L1JwvmJIpPhAd8oByMawEKx6NVdBCbesjH4t+vjEp3ZXft9DwvlKSD07fCeI44/N0Vf2w==",
+			"dependencies": {
+				"@types/acorn": "^4.0.0",
+				"@types/estree": "^1.0.0",
+				"devlop": "^1.0.0",
+				"estree-util-is-identifier-name": "^3.0.0",
+				"micromark-factory-mdx-expression": "^2.0.0",
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0",
+				"vfile-message": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-		},
-		"node_modules/path-to-regexp": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-			"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+		"node_modules/micromark-extension-mdx-jsx/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"isarray": "0.0.1"
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/path-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"engines": {
-				"node": ">=8"
+		"node_modules/micromark-extension-mdx-jsx/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-		},
-		"node_modules/picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-			"engines": {
-				"node": ">=8.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
+		"node_modules/micromark-extension-mdx-jsx/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+		"node_modules/micromark-extension-mdx-md": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-mdx-md/-/micromark-extension-mdx-md-2.0.0.tgz",
+			"integrity": "sha512-EpAiszsB3blw4Rpba7xTOUptcFeBFi+6PY8VnJ2hhimH+vCQDirWgsMpz7w1XcZE7LVrSAUGb9VJpG9ghlYvYQ==",
 			"dependencies": {
-				"find-up": "^4.0.0"
+				"micromark-util-types": "^2.0.0"
 			},
-			"engines": {
-				"node": ">=8"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/pkg-up": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-			"integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+		"node_modules/micromark-extension-mdxjs": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-extension-mdxjs/-/micromark-extension-mdxjs-3.0.0.tgz",
+			"integrity": "sha512-A873fJfhnJ2siZyUrJ31l34Uqwy4xIFmvPY1oj+Ean5PHcPBYzEsvqvWGaWcfEIr11O5Dlw3p2y0tZWpKHDejQ==",
 			"dependencies": {
-				"find-up": "^3.0.0"
+				"acorn": "^8.0.0",
+				"acorn-jsx": "^5.0.0",
+				"micromark-extension-mdx-expression": "^3.0.0",
+				"micromark-extension-mdx-jsx": "^3.0.0",
+				"micromark-extension-mdx-md": "^2.0.0",
+				"micromark-extension-mdxjs-esm": "^3.0.0",
+				"micromark-util-combine-extensions": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			},
-			"engines": {
-				"node": ">=8"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/pkg-up/node_modules/find-up": {
+		"node_modules/micromark-extension-mdxjs-esm": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+			"resolved": "https://registry.npmjs.org/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-3.0.0.tgz",
+			"integrity": "sha512-DJFl4ZqkErRpq/dAPyeWp15tGrcrrJho1hKK5uBS70BCtfrIFg81sqcTVu3Ta+KD1Tk5vAtBNElWxtAa+m8K9A==",
 			"dependencies": {
-				"locate-path": "^3.0.0"
+				"@types/estree": "^1.0.0",
+				"devlop": "^1.0.0",
+				"micromark-core-commonmark": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-events-to-acorn": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0",
+				"unist-util-position-from-estree": "^2.0.0",
+				"vfile-message": "^4.0.0"
 			},
-			"engines": {
-				"node": ">=6"
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"node_modules/pkg-up/node_modules/locate-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+		"node_modules/micromark-extension-mdxjs-esm/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"p-locate": "^3.0.0",
-				"path-exists": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/pkg-up/node_modules/p-locate": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+		"node_modules/micromark-extension-mdxjs-esm/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
+		},
+		"node_modules/micromark-factory-destination": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-2.0.0.tgz",
+			"integrity": "sha512-j9DGrQLm/Uhl2tCzcbLhy5kXsgkHUrjJHg4fFAeoMRwJmJerT9aw4FEhIbZStWN8A3qMwOp1uzHr4UL8AInxtA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"p-limit": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/pkg-up/node_modules/path-exists": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-			"integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-			"engines": {
-				"node": ">=4"
+		"node_modules/micromark-factory-destination/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/postcss": {
-			"version": "8.4.28",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
-			"integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
+		"node_modules/micromark-factory-destination/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
 			"funding": [
 				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
 				},
 				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/postcss"
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
+		},
+		"node_modules/micromark-factory-label": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-2.0.0.tgz",
+			"integrity": "sha512-RR3i96ohZGde//4WSe/dJsxOX6vxIg9TimLAS3i4EhBAFx8Sm5SmqVfR8E87DPSR31nEAjZfbt91OMZWcNgdZw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
 				},
 				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
 				}
 			],
 			"dependencies": {
-				"nanoid": "^3.3.6",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14"
+				"devlop": "^1.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/postcss-calc": {
-			"version": "8.2.4",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-			"integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+		"node_modules/micromark-factory-label/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"postcss-selector-parser": "^6.0.9",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.2"
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/postcss-colormin": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
-			"integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
-			"dependencies": {
-				"browserslist": "^4.21.4",
-				"caniuse-api": "^3.0.0",
-				"colord": "^2.9.1",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
+		"node_modules/micromark-factory-label/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/postcss-convert-values": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
-			"integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
+		"node_modules/micromark-factory-mdx-expression": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-2.0.1.tgz",
+			"integrity": "sha512-F0ccWIUHRLRrYp5TC9ZYXmZo+p2AM13ggbsW4T0b5CRKP8KHVRB8t4pwtBgTxtjRmwrK0Irwm7vs2JOZabHZfg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
 			"dependencies": {
-				"browserslist": "^4.21.4",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
+				"@types/estree": "^1.0.0",
+				"devlop": "^1.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-events-to-acorn": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0",
+				"unist-util-position-from-estree": "^2.0.0",
+				"vfile-message": "^4.0.0"
 			}
 		},
-		"node_modules/postcss-discard-comments": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
-			"integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
+		"node_modules/micromark-factory-mdx-expression/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"node_modules/postcss-discard-duplicates": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-			"integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
+		"node_modules/micromark-factory-mdx-expression/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"node_modules/postcss-discard-empty": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-			"integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
+		"node_modules/micromark-factory-space": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz",
+			"integrity": "sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^1.0.0",
+				"micromark-util-types": "^1.0.0"
 			}
 		},
-		"node_modules/postcss-discard-overridden": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-			"integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-discard-unused": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-5.1.0.tgz",
-			"integrity": "sha512-KwLWymI9hbwXmJa0dkrzpRbSJEh0vVUd7r8t0yOGPcfKzyJJxFM8kLyC5Ev9avji6nY95pOp1W6HqIrfT+0VGw==",
-			"dependencies": {
-				"postcss-selector-parser": "^6.0.5"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-loader": {
-			"version": "7.3.3",
-			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz",
-			"integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==",
-			"dependencies": {
-				"cosmiconfig": "^8.2.0",
-				"jiti": "^1.18.2",
-				"semver": "^7.3.8"
-			},
-			"engines": {
-				"node": ">= 14.15.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"postcss": "^7.0.0 || ^8.0.1",
-				"webpack": "^5.0.0"
-			}
-		},
-		"node_modules/postcss-loader/node_modules/cosmiconfig": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-			"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-			"dependencies": {
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/d-fischer"
-			}
-		},
-		"node_modules/postcss-merge-idents": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-5.1.1.tgz",
-			"integrity": "sha512-pCijL1TREiCoog5nQp7wUe+TUonA2tC2sQ54UGeMmryK3UFGIYKqDyjnqd6RcuI4znFn9hWSLNN8xKE/vWcUQw==",
-			"dependencies": {
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-merge-longhand": {
-			"version": "5.1.7",
-			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
-			"integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0",
-				"stylehacks": "^5.1.1"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-merge-rules": {
-			"version": "5.1.4",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
-			"integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
-			"dependencies": {
-				"browserslist": "^4.21.4",
-				"caniuse-api": "^3.0.0",
-				"cssnano-utils": "^3.1.0",
-				"postcss-selector-parser": "^6.0.5"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-minify-font-values": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
-			"integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-minify-gradients": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
-			"integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
-			"dependencies": {
-				"colord": "^2.9.1",
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-minify-params": {
-			"version": "5.1.4",
-			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
-			"integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
-			"dependencies": {
-				"browserslist": "^4.21.4",
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-minify-selectors": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
-			"integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
-			"dependencies": {
-				"postcss-selector-parser": "^6.0.5"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-modules-extract-imports": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-local-by-default": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-			"integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
-			"dependencies": {
-				"icss-utils": "^5.0.0",
-				"postcss-selector-parser": "^6.0.2",
-				"postcss-value-parser": "^4.1.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-scope": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-			"dependencies": {
-				"postcss-selector-parser": "^6.0.4"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-values": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-			"dependencies": {
-				"icss-utils": "^5.0.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-normalize-charset": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-			"integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-display-values": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
-			"integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-positions": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
-			"integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-repeat-style": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
-			"integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-string": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
-			"integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-timing-functions": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
-			"integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-unicode": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
-			"integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
-			"dependencies": {
-				"browserslist": "^4.21.4",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-url": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
-			"integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
-			"dependencies": {
-				"normalize-url": "^6.0.1",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-normalize-whitespace": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
-			"integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-ordered-values": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
-			"integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
-			"dependencies": {
-				"cssnano-utils": "^3.1.0",
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-reduce-idents": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-5.2.0.tgz",
-			"integrity": "sha512-BTrLjICoSB6gxbc58D5mdBK8OhXRDqud/zodYfdSi52qvDHdMwk+9kB9xsM8yJThH/sZU5A6QVSmMmaN001gIg==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-reduce-initial": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
-			"integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
-			"dependencies": {
-				"browserslist": "^4.21.4",
-				"caniuse-api": "^3.0.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-reduce-transforms": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
-			"integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-selector-parser": {
-			"version": "6.0.13",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-			"integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
-			"dependencies": {
-				"cssesc": "^3.0.0",
-				"util-deprecate": "^1.0.2"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/postcss-sort-media-queries": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/postcss-sort-media-queries/-/postcss-sort-media-queries-4.4.1.tgz",
-			"integrity": "sha512-QDESFzDDGKgpiIh4GYXsSy6sek2yAwQx1JASl5AxBtU1Lq2JfKBljIPNdil989NcSKRQX1ToiaKphImtBuhXWw==",
-			"dependencies": {
-				"sort-css-media-queries": "2.1.0"
-			},
-			"engines": {
-				"node": ">=10.0.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.4.16"
-			}
-		},
-		"node_modules/postcss-svgo": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
-			"integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
-			"dependencies": {
-				"postcss-value-parser": "^4.2.0",
-				"svgo": "^2.7.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-unique-selectors": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
-			"integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
-			"dependencies": {
-				"postcss-selector-parser": "^6.0.5"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
-		},
-		"node_modules/postcss-zindex": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-5.1.0.tgz",
-			"integrity": "sha512-fgFMf0OtVSBR1va1JNHYgMxYk73yhn/qb4uQDq1DLGYolz8gHCyr/sesEuGUaYs58E3ZJRcpoGuPVoB7Meiq9A==",
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/prepend-http": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-			"integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/pretty-error": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-			"integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-			"dependencies": {
-				"lodash": "^4.17.20",
-				"renderkid": "^3.0.0"
-			}
-		},
-		"node_modules/pretty-time": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz",
-			"integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/prism-react-renderer": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-1.3.5.tgz",
-			"integrity": "sha512-IJ+MSwBWKG+SM3b2SUfdrhC+gu01QkV2KmRQgREThBfSQRoufqRfxfHUxpG1WcaFjP+kojcFyO9Qqtpgt3qLCg==",
-			"peerDependencies": {
-				"react": ">=0.14.9"
-			}
-		},
-		"node_modules/prismjs": {
-			"version": "1.29.0",
-			"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
-			"integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-		},
-		"node_modules/promise": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-			"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-			"dependencies": {
-				"asap": "~2.0.3"
-			}
-		},
-		"node_modules/prompts": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-			"dependencies": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.5"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/prop-types": {
-			"version": "15.8.1",
-			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-			"integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-			"dependencies": {
-				"loose-envify": "^1.4.0",
-				"object-assign": "^4.1.1",
-				"react-is": "^16.13.1"
-			}
-		},
-		"node_modules/property-information": {
-			"version": "5.6.0",
-			"resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
-			"integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
-			"dependencies": {
-				"xtend": "^4.0.0"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
-		"node_modules/proxy-addr": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-			"dependencies": {
-				"forwarded": "0.2.0",
-				"ipaddr.js": "1.9.1"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/proxy-addr/node_modules/ipaddr.js": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-			"dependencies": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
-			}
-		},
-		"node_modules/punycode": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
-		},
-		"node_modules/pupa": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-			"integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-			"dependencies": {
-				"escape-goat": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pure-color": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz",
-			"integrity": "sha512-QFADYnsVoBMw1srW7OVKEYjG+MbIa49s54w1MA1EDY6r2r/sTcKKYqRX1f4GYvnXP7eN/Pe9HFcX+hwzmrXRHA=="
-		},
-		"node_modules/qs": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-			"dependencies": {
-				"side-channel": "^1.0.4"
-			},
-			"engines": {
-				"node": ">=0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/queue": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
-			"integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
-			"dependencies": {
-				"inherits": "~2.0.3"
-			}
-		},
-		"node_modules/queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			]
-		},
-		"node_modules/randombytes": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-			"dependencies": {
-				"safe-buffer": "^5.1.0"
-			}
-		},
-		"node_modules/range-parser": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-			"integrity": "sha512-kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/raw-body": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-			"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-			"dependencies": {
-				"bytes": "3.1.2",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"unpipe": "1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/raw-body/node_modules/bytes": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/rc": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-			"dependencies": {
-				"deep-extend": "^0.6.0",
-				"ini": "~1.3.0",
-				"minimist": "^1.2.0",
-				"strip-json-comments": "~2.0.1"
-			},
-			"bin": {
-				"rc": "cli.js"
-			}
-		},
-		"node_modules/rc/node_modules/strip-json-comments": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-			"integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/react": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
-			"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
-			"dependencies": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/react-base16-styling": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz",
-			"integrity": "sha512-yvh/7CArceR/jNATXOKDlvTnPKPmGZz7zsenQ3jUwLzHkNUR0CvY3yGYJbWJ/nnxsL8Sgmt5cO3/SILVuPO6TQ==",
-			"dependencies": {
-				"base16": "^1.0.0",
-				"lodash.curry": "^4.0.1",
-				"lodash.flow": "^3.3.0",
-				"pure-color": "^1.2.0"
-			}
-		},
-		"node_modules/react-dev-utils": {
-			"version": "12.0.1",
-			"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
-			"integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
-			"dependencies": {
-				"@babel/code-frame": "^7.16.0",
-				"address": "^1.1.2",
-				"browserslist": "^4.18.1",
-				"chalk": "^4.1.2",
-				"cross-spawn": "^7.0.3",
-				"detect-port-alt": "^1.1.6",
-				"escape-string-regexp": "^4.0.0",
-				"filesize": "^8.0.6",
-				"find-up": "^5.0.0",
-				"fork-ts-checker-webpack-plugin": "^6.5.0",
-				"global-modules": "^2.0.0",
-				"globby": "^11.0.4",
-				"gzip-size": "^6.0.0",
-				"immer": "^9.0.7",
-				"is-root": "^2.1.0",
-				"loader-utils": "^3.2.0",
-				"open": "^8.4.0",
-				"pkg-up": "^3.1.0",
-				"prompts": "^2.4.2",
-				"react-error-overlay": "^6.0.11",
-				"recursive-readdir": "^2.2.2",
-				"shell-quote": "^1.7.3",
-				"strip-ansi": "^6.0.1",
-				"text-table": "^0.2.0"
-			},
-			"engines": {
-				"node": ">=14"
-			}
-		},
-		"node_modules/react-dev-utils/node_modules/find-up": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-			"dependencies": {
-				"locate-path": "^6.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/react-dev-utils/node_modules/loader-utils": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-			"integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
-			"engines": {
-				"node": ">= 12.13.0"
-			}
-		},
-		"node_modules/react-dev-utils/node_modules/locate-path": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-			"dependencies": {
-				"p-locate": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/react-dev-utils/node_modules/p-limit": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-			"dependencies": {
-				"yocto-queue": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/react-dev-utils/node_modules/p-locate": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-			"dependencies": {
-				"p-limit": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/react-dom": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
-			"integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
-			"dependencies": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1",
-				"scheduler": "^0.20.2"
-			},
-			"peerDependencies": {
-				"react": "17.0.2"
-			}
-		},
-		"node_modules/react-error-overlay": {
-			"version": "6.0.11",
-			"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
-			"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
-		},
-		"node_modules/react-fast-compare": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
-			"integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
-		},
-		"node_modules/react-helmet-async": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.3.0.tgz",
-			"integrity": "sha512-9jZ57/dAn9t3q6hneQS0wukqC2ENOBgMNVEhb/ZG9ZSxUetzVIw4iAmEU38IaVg3QGYauQPhSeUTuIUtFglWpg==",
-			"dependencies": {
-				"@babel/runtime": "^7.12.5",
-				"invariant": "^2.2.4",
-				"prop-types": "^15.7.2",
-				"react-fast-compare": "^3.2.0",
-				"shallowequal": "^1.1.0"
-			},
-			"peerDependencies": {
-				"react": "^16.6.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.6.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
-		"node_modules/react-is": {
-			"version": "16.13.1",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-		},
-		"node_modules/react-json-view": {
-			"version": "1.21.3",
-			"resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.3.tgz",
-			"integrity": "sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw==",
-			"dependencies": {
-				"flux": "^4.0.1",
-				"react-base16-styling": "^0.6.0",
-				"react-lifecycles-compat": "^3.0.4",
-				"react-textarea-autosize": "^8.3.2"
-			},
-			"peerDependencies": {
-				"react": "^17.0.0 || ^16.3.0 || ^15.5.4",
-				"react-dom": "^17.0.0 || ^16.3.0 || ^15.5.4"
-			}
-		},
-		"node_modules/react-lifecycles-compat": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-			"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
-		},
-		"node_modules/react-loadable": {
-			"name": "@docusaurus/react-loadable",
-			"version": "5.5.2",
-			"resolved": "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz",
-			"integrity": "sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==",
-			"dependencies": {
-				"@types/react": "*",
-				"prop-types": "^15.6.2"
-			},
-			"peerDependencies": {
-				"react": "*"
-			}
-		},
-		"node_modules/react-loadable-ssr-addon-v5-slorber": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz",
-			"integrity": "sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==",
-			"dependencies": {
-				"@babel/runtime": "^7.10.3"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"peerDependencies": {
-				"react-loadable": "*",
-				"webpack": ">=4.41.1 || 5.x"
-			}
-		},
-		"node_modules/react-router": {
-			"version": "5.3.4",
-			"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
-			"integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
-			"dependencies": {
-				"@babel/runtime": "^7.12.13",
-				"history": "^4.9.0",
-				"hoist-non-react-statics": "^3.1.0",
-				"loose-envify": "^1.3.1",
-				"path-to-regexp": "^1.7.0",
-				"prop-types": "^15.6.2",
-				"react-is": "^16.6.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
-			},
-			"peerDependencies": {
-				"react": ">=15"
-			}
-		},
-		"node_modules/react-router-config": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/react-router-config/-/react-router-config-5.1.1.tgz",
-			"integrity": "sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg==",
-			"dependencies": {
-				"@babel/runtime": "^7.1.2"
-			},
-			"peerDependencies": {
-				"react": ">=15",
-				"react-router": ">=5"
-			}
-		},
-		"node_modules/react-router-dom": {
-			"version": "5.3.4",
-			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz",
-			"integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==",
-			"dependencies": {
-				"@babel/runtime": "^7.12.13",
-				"history": "^4.9.0",
-				"loose-envify": "^1.3.1",
-				"prop-types": "^15.6.2",
-				"react-router": "5.3.4",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
-			},
-			"peerDependencies": {
-				"react": ">=15"
-			}
-		},
-		"node_modules/react-textarea-autosize": {
-			"version": "8.5.2",
-			"resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.5.2.tgz",
-			"integrity": "sha512-uOkyjkEl0ByEK21eCJMHDGBAAd/BoFQBawYK5XItjAmCTeSbjxghd8qnt7nzsLYzidjnoObu6M26xts0YGKsGg==",
-			"dependencies": {
-				"@babel/runtime": "^7.20.13",
-				"use-composed-ref": "^1.3.0",
-				"use-latest": "^1.2.1"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
-		"node_modules/readable-stream": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/readdirp": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-			"dependencies": {
-				"picomatch": "^2.2.1"
-			},
-			"engines": {
-				"node": ">=8.10.0"
-			}
-		},
-		"node_modules/reading-time": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/reading-time/-/reading-time-1.5.0.tgz",
-			"integrity": "sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg=="
-		},
-		"node_modules/rechoir": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-			"integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
-			"dependencies": {
-				"resolve": "^1.1.6"
-			},
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/recursive-readdir": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
-			"integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
-			"dependencies": {
-				"minimatch": "^3.0.5"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/regenerate": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
-		},
-		"node_modules/regenerate-unicode-properties": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-			"integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-			"dependencies": {
-				"regenerate": "^1.4.2"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/regenerator-runtime": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-			"integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
-		},
-		"node_modules/regenerator-transform": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-			"integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-			"dependencies": {
-				"@babel/runtime": "^7.8.4"
-			}
-		},
-		"node_modules/regexpu-core": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-			"integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
-			"dependencies": {
-				"@babel/regjsgen": "^0.8.0",
-				"regenerate": "^1.4.2",
-				"regenerate-unicode-properties": "^10.1.0",
-				"regjsparser": "^0.9.1",
-				"unicode-match-property-ecmascript": "^2.0.0",
-				"unicode-match-property-value-ecmascript": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/registry-auth-token": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz",
-			"integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==",
-			"dependencies": {
-				"rc": "1.2.8"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/registry-url": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-			"integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-			"dependencies": {
-				"rc": "^1.2.8"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/regjsparser": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-			"dependencies": {
-				"jsesc": "~0.5.0"
-			},
-			"bin": {
-				"regjsparser": "bin/parser"
-			}
-		},
-		"node_modules/regjsparser/node_modules/jsesc": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-			"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-			"bin": {
-				"jsesc": "bin/jsesc"
-			}
-		},
-		"node_modules/rehype-parse": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-7.0.1.tgz",
-			"integrity": "sha512-fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw==",
-			"dependencies": {
-				"hast-util-from-parse5": "^6.0.0",
-				"parse5": "^6.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/rehype-parse/node_modules/parse5": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-		},
-		"node_modules/relateurl": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-			"integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
-		"node_modules/remark-emoji": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/remark-emoji/-/remark-emoji-2.2.0.tgz",
-			"integrity": "sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w==",
-			"dependencies": {
-				"emoticon": "^3.2.0",
-				"node-emoji": "^1.10.0",
-				"unist-util-visit": "^2.0.3"
-			}
-		},
-		"node_modules/remark-footnotes": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz",
-			"integrity": "sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/remark-mdx": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz",
-			"integrity": "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==",
-			"dependencies": {
-				"@babel/core": "7.12.9",
-				"@babel/helper-plugin-utils": "7.10.4",
-				"@babel/plugin-proposal-object-rest-spread": "7.12.1",
-				"@babel/plugin-syntax-jsx": "7.12.1",
-				"@mdx-js/util": "1.6.22",
-				"is-alphabetical": "1.0.4",
-				"remark-parse": "8.0.3",
-				"unified": "9.2.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/remark-mdx/node_modules/@babel/core": {
-			"version": "7.12.9",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
-			"integrity": "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==",
-			"dependencies": {
-				"@babel/code-frame": "^7.10.4",
-				"@babel/generator": "^7.12.5",
-				"@babel/helper-module-transforms": "^7.12.1",
-				"@babel/helpers": "^7.12.5",
-				"@babel/parser": "^7.12.7",
-				"@babel/template": "^7.12.7",
-				"@babel/traverse": "^7.12.9",
-				"@babel/types": "^7.12.7",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.1",
-				"json5": "^2.1.2",
-				"lodash": "^4.17.19",
-				"resolve": "^1.3.2",
-				"semver": "^5.4.1",
-				"source-map": "^0.5.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/remark-mdx/node_modules/@babel/helper-plugin-utils": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-			"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
-		},
-		"node_modules/remark-mdx/node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.12.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
-			"integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/remark-mdx/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-			"bin": {
-				"semver": "bin/semver"
-			}
-		},
-		"node_modules/remark-mdx/node_modules/source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/remark-mdx/node_modules/unified": {
-			"version": "9.2.0",
-			"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
-			"integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
-			"dependencies": {
-				"bail": "^1.0.0",
-				"extend": "^3.0.0",
-				"is-buffer": "^2.0.0",
-				"is-plain-obj": "^2.0.0",
-				"trough": "^1.0.0",
-				"vfile": "^4.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/remark-parse": {
-			"version": "8.0.3",
-			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-			"integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
-			"dependencies": {
-				"ccount": "^1.0.0",
-				"collapse-white-space": "^1.0.2",
-				"is-alphabetical": "^1.0.0",
-				"is-decimal": "^1.0.0",
-				"is-whitespace-character": "^1.0.0",
-				"is-word-character": "^1.0.0",
-				"markdown-escapes": "^1.0.0",
-				"parse-entities": "^2.0.0",
-				"repeat-string": "^1.5.4",
-				"state-toggle": "^1.0.0",
-				"trim": "0.0.1",
-				"trim-trailing-lines": "^1.0.0",
-				"unherit": "^1.0.4",
-				"unist-util-remove-position": "^2.0.0",
-				"vfile-location": "^3.0.0",
-				"xtend": "^4.0.1"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/remark-squeeze-paragraphs": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz",
-			"integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==",
-			"dependencies": {
-				"mdast-squeeze-paragraphs": "^4.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/renderkid": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-			"integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-			"dependencies": {
-				"css-select": "^4.1.3",
-				"dom-converter": "^0.2.0",
-				"htmlparser2": "^6.1.0",
-				"lodash": "^4.17.21",
-				"strip-ansi": "^6.0.1"
-			}
-		},
-		"node_modules/renderkid/node_modules/css-select": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-			"dependencies": {
-				"boolbase": "^1.0.0",
-				"css-what": "^6.0.1",
-				"domhandler": "^4.3.1",
-				"domutils": "^2.8.0",
-				"nth-check": "^2.0.1"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/fb55"
-			}
-		},
-		"node_modules/renderkid/node_modules/dom-serializer": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-			"dependencies": {
-				"domelementtype": "^2.0.1",
-				"domhandler": "^4.2.0",
-				"entities": "^2.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-			}
-		},
-		"node_modules/renderkid/node_modules/domhandler": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-			"dependencies": {
-				"domelementtype": "^2.2.0"
-			},
-			"engines": {
-				"node": ">= 4"
-			},
-			"funding": {
-				"url": "https://github.com/fb55/domhandler?sponsor=1"
-			}
-		},
-		"node_modules/renderkid/node_modules/domutils": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-			"dependencies": {
-				"dom-serializer": "^1.0.1",
-				"domelementtype": "^2.2.0",
-				"domhandler": "^4.2.0"
-			},
-			"funding": {
-				"url": "https://github.com/fb55/domutils?sponsor=1"
-			}
-		},
-		"node_modules/renderkid/node_modules/entities": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-			"funding": {
-				"url": "https://github.com/fb55/entities?sponsor=1"
-			}
-		},
-		"node_modules/renderkid/node_modules/htmlparser2": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-			"funding": [
-				"https://github.com/fb55/htmlparser2?sponsor=1",
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/fb55"
-				}
-			],
-			"dependencies": {
-				"domelementtype": "^2.0.1",
-				"domhandler": "^4.0.0",
-				"domutils": "^2.5.2",
-				"entities": "^2.0.0"
-			}
-		},
-		"node_modules/repeat-string": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
-		"node_modules/require-from-string": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/require-like": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz",
-			"integrity": "sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A==",
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/requires-port": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
-		},
-		"node_modules/resolve": {
-			"version": "1.22.4",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
-			"integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
-			"dependencies": {
-				"is-core-module": "^2.13.0",
-				"path-parse": "^1.0.7",
-				"supports-preserve-symlinks-flag": "^1.0.0"
-			},
-			"bin": {
-				"resolve": "bin/resolve"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/resolve-from": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/resolve-pathname": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
-			"integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
-		},
-		"node_modules/responselike": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-			"integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
-			"dependencies": {
-				"lowercase-keys": "^1.0.0"
-			}
-		},
-		"node_modules/retry": {
-			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-			"integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/reusify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"engines": {
-				"iojs": ">=1.0.0",
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/rimraf": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"dependencies": {
-				"glob": "^7.1.3"
-			},
-			"bin": {
-				"rimraf": "bin.js"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/rtl-detect": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/rtl-detect/-/rtl-detect-1.0.4.tgz",
-			"integrity": "sha512-EBR4I2VDSSYr7PkBmFy04uhycIpDKp+21p/jARYXlCSjQksTBQcJ0HFUPOO79EPPH5JS6VAhiIQbycf0O3JAxQ=="
-		},
-		"node_modules/rtlcss": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.5.0.tgz",
-			"integrity": "sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A==",
-			"dependencies": {
-				"find-up": "^5.0.0",
-				"picocolors": "^1.0.0",
-				"postcss": "^8.3.11",
-				"strip-json-comments": "^3.1.1"
-			},
-			"bin": {
-				"rtlcss": "bin/rtlcss.js"
-			}
-		},
-		"node_modules/rtlcss/node_modules/find-up": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-			"dependencies": {
-				"locate-path": "^6.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/rtlcss/node_modules/locate-path": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-			"dependencies": {
-				"p-locate": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/rtlcss/node_modules/p-limit": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-			"dependencies": {
-				"yocto-queue": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/rtlcss/node_modules/p-locate": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-			"dependencies": {
-				"p-limit": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/run-parallel": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"dependencies": {
-				"queue-microtask": "^1.2.2"
-			}
-		},
-		"node_modules/rxjs": {
-			"version": "7.8.1",
-			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-			"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-			"dependencies": {
-				"tslib": "^2.1.0"
-			}
-		},
-		"node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			]
-		},
-		"node_modules/safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-		},
-		"node_modules/sax": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-		},
-		"node_modules/scheduler": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
-			"integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
-			"dependencies": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1"
-			}
-		},
-		"node_modules/schema-utils": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-			"dependencies": {
-				"@types/json-schema": "^7.0.5",
-				"ajv": "^6.12.4",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 8.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/search-insights": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.7.0.tgz",
-			"integrity": "sha512-GLbVaGgzYEKMvuJbHRhLi1qoBFnjXZGZ6l4LxOYPCp4lI2jDRB3jPU9/XNhMwv6kvnA9slTreq6pvK+b3o3aqg==",
-			"peer": true,
-			"engines": {
-				"node": ">=8.16.0"
-			}
-		},
-		"node_modules/section-matter": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
-			"integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==",
-			"dependencies": {
-				"extend-shallow": "^2.0.1",
-				"kind-of": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/select-hose": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
-		},
-		"node_modules/selfsigned": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-			"integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-			"dependencies": {
-				"node-forge": "^1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/semver": {
-			"version": "7.5.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/semver-diff": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-			"integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-			"dependencies": {
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/semver-diff/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/semver/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/semver/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-		},
-		"node_modules/send": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-			"dependencies": {
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"fresh": "0.5.2",
-				"http-errors": "2.0.0",
-				"mime": "1.6.0",
-				"ms": "2.1.3",
-				"on-finished": "2.4.1",
-				"range-parser": "~1.2.1",
-				"statuses": "2.0.1"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/send/node_modules/debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dependencies": {
-				"ms": "2.0.0"
-			}
-		},
-		"node_modules/send/node_modules/debug/node_modules/ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-		},
-		"node_modules/send/node_modules/ms": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-		},
-		"node_modules/send/node_modules/range-parser": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/serialize-javascript": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-			"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-			"dependencies": {
-				"randombytes": "^2.1.0"
-			}
-		},
-		"node_modules/serve-handler": {
-			"version": "6.1.5",
-			"resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz",
-			"integrity": "sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==",
-			"dependencies": {
-				"bytes": "3.0.0",
-				"content-disposition": "0.5.2",
-				"fast-url-parser": "1.1.3",
-				"mime-types": "2.1.18",
-				"minimatch": "3.1.2",
-				"path-is-inside": "1.0.2",
-				"path-to-regexp": "2.2.1",
-				"range-parser": "1.2.0"
-			}
-		},
-		"node_modules/serve-handler/node_modules/path-to-regexp": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz",
-			"integrity": "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ=="
-		},
-		"node_modules/serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-			"dependencies": {
-				"accepts": "~1.3.4",
-				"batch": "0.6.1",
-				"debug": "2.6.9",
-				"escape-html": "~1.0.3",
-				"http-errors": "~1.6.2",
-				"mime-types": "~2.1.17",
-				"parseurl": "~1.3.2"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/serve-index/node_modules/debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dependencies": {
-				"ms": "2.0.0"
-			}
-		},
-		"node_modules/serve-index/node_modules/depd": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-			"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/serve-index/node_modules/http-errors": {
-			"version": "1.6.3",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-			"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-			"dependencies": {
-				"depd": "~1.1.2",
-				"inherits": "2.0.3",
-				"setprototypeof": "1.1.0",
-				"statuses": ">= 1.4.0 < 2"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/serve-index/node_modules/inherits": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-		},
-		"node_modules/serve-index/node_modules/ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-		},
-		"node_modules/serve-index/node_modules/setprototypeof": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-		},
-		"node_modules/serve-index/node_modules/statuses": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-			"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-			"dependencies": {
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"parseurl": "~1.3.3",
-				"send": "0.18.0"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/setimmediate": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
-		},
-		"node_modules/setprototypeof": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-		},
-		"node_modules/shallow-clone": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-			"dependencies": {
-				"kind-of": "^6.0.2"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shallowequal": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-			"integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
-		},
-		"node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shell-quote": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-			"integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/shelljs": {
-			"version": "0.8.5",
-			"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
-			"integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
-			"dependencies": {
-				"glob": "^7.0.0",
-				"interpret": "^1.0.0",
-				"rechoir": "^0.6.2"
-			},
-			"bin": {
-				"shjs": "bin/shjs"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/side-channel": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-			"dependencies": {
-				"call-bind": "^1.0.0",
-				"get-intrinsic": "^1.0.2",
-				"object-inspect": "^1.9.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/signal-exit": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-		},
-		"node_modules/sirv": {
-			"version": "1.0.19",
-			"resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
-			"integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
-			"dependencies": {
-				"@polka/url": "^1.0.0-next.20",
-				"mrmime": "^1.0.0",
-				"totalist": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 10"
-			}
-		},
-		"node_modules/sisteransi": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
-		},
-		"node_modules/sitemap": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.1.1.tgz",
-			"integrity": "sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg==",
-			"dependencies": {
-				"@types/node": "^17.0.5",
-				"@types/sax": "^1.2.1",
-				"arg": "^5.0.0",
-				"sax": "^1.2.4"
-			},
-			"bin": {
-				"sitemap": "dist/cli.js"
-			},
-			"engines": {
-				"node": ">=12.0.0",
-				"npm": ">=5.6.0"
-			}
-		},
-		"node_modules/sitemap/node_modules/@types/node": {
-			"version": "17.0.45",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
-			"integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
-		},
-		"node_modules/slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/sockjs": {
-			"version": "0.3.24",
-			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-			"dependencies": {
-				"faye-websocket": "^0.11.3",
-				"uuid": "^8.3.2",
-				"websocket-driver": "^0.7.4"
-			}
-		},
-		"node_modules/sort-css-media-queries": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/sort-css-media-queries/-/sort-css-media-queries-2.1.0.tgz",
-			"integrity": "sha512-IeWvo8NkNiY2vVYdPa27MCQiR0MN0M80johAYFVxWWXQ44KU84WNxjslwBHmc/7ZL2ccwkM7/e6S5aiKZXm7jA==",
-			"engines": {
-				"node": ">= 6.3.0"
-			}
-		},
-		"node_modules/source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-support": {
-			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-			"dependencies": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"node_modules/space-separated-tokens": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-			"integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
-		"node_modules/spdy": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-			"dependencies": {
-				"debug": "^4.1.0",
-				"handle-thing": "^2.0.0",
-				"http-deceiver": "^1.2.7",
-				"select-hose": "^2.0.0",
-				"spdy-transport": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/spdy-transport": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-			"dependencies": {
-				"debug": "^4.1.0",
-				"detect-node": "^2.0.4",
-				"hpack.js": "^2.1.6",
-				"obuf": "^1.1.2",
-				"readable-stream": "^3.0.6",
-				"wbuf": "^1.7.3"
-			}
-		},
-		"node_modules/sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-		},
-		"node_modules/stable": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-			"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-			"deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
-		},
-		"node_modules/state-toggle": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-			"integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
-		"node_modules/statuses": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/std-env": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.4.2.tgz",
-			"integrity": "sha512-Cw6eJDX9AxEEL0g5pYj8Zx9KXtDf60rxwS2ze0HBanS0aKhj1sBlzcsmg+R0qYy8byFa854/yR2X5ZmBSClVmg=="
-		},
-		"node_modules/string_decoder": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-			"dependencies": {
-				"safe-buffer": "~5.2.0"
-			}
-		},
-		"node_modules/string-width": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-			"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-			"dependencies": {
-				"eastasianwidth": "^0.2.0",
-				"emoji-regex": "^9.2.2",
-				"strip-ansi": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/string-width/node_modules/ansi-regex": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
-			}
-		},
-		"node_modules/string-width/node_modules/strip-ansi": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-			"dependencies": {
-				"ansi-regex": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
-			}
-		},
-		"node_modules/stringify-object": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-			"integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-			"dependencies": {
-				"get-own-enumerable-property-symbols": "^3.0.0",
-				"is-obj": "^1.0.1",
-				"is-regexp": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-bom-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-			"integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/strip-json-comments": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/style-to-object": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",
-			"integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==",
-			"dependencies": {
-				"inline-style-parser": "0.1.1"
-			}
-		},
-		"node_modules/stylehacks": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
-			"integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
-			"dependencies": {
-				"browserslist": "^4.21.4",
-				"postcss-selector-parser": "^6.0.4"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14.0"
-			},
-			"peerDependencies": {
-				"postcss": "^8.2.15"
-			}
-		},
-		"node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-preserve-symlinks-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/svg-parser": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
-			"integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="
-		},
-		"node_modules/svgo": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-			"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-			"dependencies": {
-				"@trysound/sax": "0.2.0",
-				"commander": "^7.2.0",
-				"css-select": "^4.1.3",
-				"css-tree": "^1.1.3",
-				"csso": "^4.2.0",
-				"picocolors": "^1.0.0",
-				"stable": "^0.1.8"
-			},
-			"bin": {
-				"svgo": "bin/svgo"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/svgo/node_modules/commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"engines": {
-				"node": ">= 10"
-			}
-		},
-		"node_modules/svgo/node_modules/css-select": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-			"dependencies": {
-				"boolbase": "^1.0.0",
-				"css-what": "^6.0.1",
-				"domhandler": "^4.3.1",
-				"domutils": "^2.8.0",
-				"nth-check": "^2.0.1"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/fb55"
-			}
-		},
-		"node_modules/svgo/node_modules/dom-serializer": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-			"dependencies": {
-				"domelementtype": "^2.0.1",
-				"domhandler": "^4.2.0",
-				"entities": "^2.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-			}
-		},
-		"node_modules/svgo/node_modules/domhandler": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-			"dependencies": {
-				"domelementtype": "^2.2.0"
-			},
-			"engines": {
-				"node": ">= 4"
-			},
-			"funding": {
-				"url": "https://github.com/fb55/domhandler?sponsor=1"
-			}
-		},
-		"node_modules/svgo/node_modules/domutils": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-			"dependencies": {
-				"dom-serializer": "^1.0.1",
-				"domelementtype": "^2.2.0",
-				"domhandler": "^4.2.0"
-			},
-			"funding": {
-				"url": "https://github.com/fb55/domutils?sponsor=1"
-			}
-		},
-		"node_modules/svgo/node_modules/entities": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-			"funding": {
-				"url": "https://github.com/fb55/entities?sponsor=1"
-			}
-		},
-		"node_modules/tapable": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/terser": {
-			"version": "5.19.2",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-			"integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
-			"dependencies": {
-				"@jridgewell/source-map": "^0.3.3",
-				"acorn": "^8.8.2",
-				"commander": "^2.20.0",
-				"source-map-support": "~0.5.20"
-			},
-			"bin": {
-				"terser": "bin/terser"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/terser-webpack-plugin": {
-			"version": "5.3.9",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
-			"integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.17",
-				"jest-worker": "^27.4.5",
-				"schema-utils": "^3.1.1",
-				"serialize-javascript": "^6.0.1",
-				"terser": "^5.16.8"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.1.0"
-			},
-			"peerDependenciesMeta": {
-				"@swc/core": {
-					"optional": true
-				},
-				"esbuild": {
-					"optional": true
-				},
-				"uglify-js": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/jest-worker": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-			"dependencies": {
-				"@types/node": "*",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/supports-color": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/terser/node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-		},
-		"node_modules/text-table": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
-		},
-		"node_modules/thunky": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-		},
-		"node_modules/tiny-invariant": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
-			"integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw=="
-		},
-		"node_modules/tiny-warning": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-			"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
-		},
-		"node_modules/to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/to-readable-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-			"integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dependencies": {
-				"is-number": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8.0"
-			}
-		},
-		"node_modules/to-vfile": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/to-vfile/-/to-vfile-6.1.0.tgz",
-			"integrity": "sha512-BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw==",
-			"dependencies": {
-				"is-buffer": "^2.0.0",
-				"vfile": "^4.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/toidentifier": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-			"engines": {
-				"node": ">=0.6"
-			}
-		},
-		"node_modules/totalist": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
-			"integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/tr46": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-		},
-		"node_modules/trim": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-			"integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==",
-			"deprecated": "Use String.prototype.trim() instead"
-		},
-		"node_modules/trim-trailing-lines": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz",
-			"integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
-		"node_modules/trough": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-			"integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
-		"node_modules/tslib": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-			"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-		},
-		"node_modules/type-fest": {
-			"version": "2.19.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-			"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-			"engines": {
-				"node": ">=12.20"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/type-is": {
-			"version": "1.6.18",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-			"dependencies": {
-				"media-typer": "0.3.0",
-				"mime-types": "~2.1.24"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/type-is/node_modules/mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/type-is/node_modules/mime-types": {
-			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-			"dependencies": {
-				"mime-db": "1.52.0"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/typedarray-to-buffer": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-			"dependencies": {
-				"is-typedarray": "^1.0.0"
-			}
-		},
-		"node_modules/typescript": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-			"integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
-			"peer": true,
-			"bin": {
-				"tsc": "bin/tsc",
-				"tsserver": "bin/tsserver"
-			},
-			"engines": {
-				"node": ">=14.17"
-			}
-		},
-		"node_modules/ua-parser-js": {
-			"version": "1.0.35",
-			"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.35.tgz",
-			"integrity": "sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA==",
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/ua-parser-js"
-				},
-				{
-					"type": "paypal",
-					"url": "https://paypal.me/faisalman"
-				}
-			],
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/unherit": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-			"integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
-			"dependencies": {
-				"inherits": "^2.0.0",
-				"xtend": "^4.0.0"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
-		"node_modules/unicode-canonical-property-names-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/unicode-match-property-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-			"dependencies": {
-				"unicode-canonical-property-names-ecmascript": "^2.0.0",
-				"unicode-property-aliases-ecmascript": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/unicode-match-property-value-ecmascript": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/unicode-property-aliases-ecmascript": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/unified": {
-			"version": "9.2.2",
-			"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
-			"integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
-			"dependencies": {
-				"bail": "^1.0.0",
-				"extend": "^3.0.0",
-				"is-buffer": "^2.0.0",
-				"is-plain-obj": "^2.0.0",
-				"trough": "^1.0.0",
-				"vfile": "^4.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unique-string": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-			"integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-			"dependencies": {
-				"crypto-random-string": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/unist-builder": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
-			"integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unist-util-find-after": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/unist-util-find-after/-/unist-util-find-after-3.0.0.tgz",
-			"integrity": "sha512-ojlBqfsBftYXExNu3+hHLfJQ/X1jYY/9vdm4yZWjIbf0VuWF6CRufci1ZyoD/wV2TYMKxXUoNuoqwy+CkgzAiQ==",
-			"dependencies": {
-				"unist-util-is": "^4.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unist-util-generated": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz",
-			"integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unist-util-is": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-			"integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unist-util-position": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz",
-			"integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unist-util-remove": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz",
-			"integrity": "sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==",
-			"dependencies": {
-				"unist-util-is": "^4.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unist-util-remove-position": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-			"integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
-			"dependencies": {
-				"unist-util-visit": "^2.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unist-util-stringify-position": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-			"integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-			"dependencies": {
-				"@types/unist": "^2.0.2"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unist-util-visit": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-			"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-			"dependencies": {
-				"@types/unist": "^2.0.0",
-				"unist-util-is": "^4.0.0",
-				"unist-util-visit-parents": "^3.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/unist-util-visit-parents": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-			"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-			"dependencies": {
-				"@types/unist": "^2.0.0",
-				"unist-util-is": "^4.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-			"engines": {
-				"node": ">= 10.0.0"
-			}
-		},
-		"node_modules/unpipe": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/update-browserslist-db": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-			"integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"dependencies": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
-			},
-			"bin": {
-				"update-browserslist-db": "cli.js"
-			},
-			"peerDependencies": {
-				"browserslist": ">= 4.21.0"
-			}
-		},
-		"node_modules/update-notifier": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-			"integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-			"dependencies": {
-				"boxen": "^5.0.0",
-				"chalk": "^4.1.0",
-				"configstore": "^5.0.1",
-				"has-yarn": "^2.1.0",
-				"import-lazy": "^2.1.0",
-				"is-ci": "^2.0.0",
-				"is-installed-globally": "^0.4.0",
-				"is-npm": "^5.0.0",
-				"is-yarn-global": "^0.3.0",
-				"latest-version": "^5.1.0",
-				"pupa": "^2.1.1",
-				"semver": "^7.3.4",
-				"semver-diff": "^3.1.1",
-				"xdg-basedir": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/yeoman/update-notifier?sponsor=1"
-			}
-		},
-		"node_modules/update-notifier/node_modules/boxen": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz",
-			"integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==",
-			"dependencies": {
-				"ansi-align": "^3.0.0",
-				"camelcase": "^6.2.0",
-				"chalk": "^4.1.0",
-				"cli-boxes": "^2.2.1",
-				"string-width": "^4.2.2",
-				"type-fest": "^0.20.2",
-				"widest-line": "^3.1.0",
-				"wrap-ansi": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/update-notifier/node_modules/cli-boxes": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-			"integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/update-notifier/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-		},
-		"node_modules/update-notifier/node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/update-notifier/node_modules/type-fest": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/update-notifier/node_modules/widest-line": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-			"integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-			"dependencies": {
-				"string-width": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/update-notifier/node_modules/wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"dependencies": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"node_modules/uri-js/node_modules/punycode": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-			"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/url-loader": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
-			"integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
-			"dependencies": {
-				"loader-utils": "^2.0.0",
-				"mime-types": "^2.1.27",
-				"schema-utils": "^3.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"file-loader": "*",
-				"webpack": "^4.0.0 || ^5.0.0"
-			},
-			"peerDependenciesMeta": {
-				"file-loader": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/url-loader/node_modules/mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/url-loader/node_modules/mime-types": {
-			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-			"dependencies": {
-				"mime-db": "1.52.0"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/url-loader/node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/url-parse-lax": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-			"integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
-			"dependencies": {
-				"prepend-http": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/use-composed-ref": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.3.0.tgz",
-			"integrity": "sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==",
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
-		"node_modules/use-isomorphic-layout-effect": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
-			"integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/use-latest": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.1.tgz",
-			"integrity": "sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==",
-			"dependencies": {
-				"use-isomorphic-layout-effect": "^1.1.1"
-			},
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/use-sync-external-store": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-			"integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
-		"node_modules/util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-		},
-		"node_modules/utila": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-			"integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
-		},
-		"node_modules/utility-types": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz",
-			"integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==",
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/utils-merge": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-			"engines": {
-				"node": ">= 0.4.0"
-			}
-		},
-		"node_modules/uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"bin": {
-				"uuid": "dist/bin/uuid"
-			}
-		},
-		"node_modules/value-equal": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
-			"integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
-		},
-		"node_modules/vary": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
-		"node_modules/vfile": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-			"integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-			"dependencies": {
-				"@types/unist": "^2.0.0",
-				"is-buffer": "^2.0.0",
-				"unist-util-stringify-position": "^2.0.0",
-				"vfile-message": "^2.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/vfile-location": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
-			"integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/vfile-message": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-			"integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-			"dependencies": {
-				"@types/unist": "^2.0.0",
-				"unist-util-stringify-position": "^2.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/unified"
-			}
-		},
-		"node_modules/wait-on": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz",
-			"integrity": "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==",
-			"dependencies": {
-				"axios": "^0.25.0",
-				"joi": "^17.6.0",
-				"lodash": "^4.17.21",
-				"minimist": "^1.2.5",
-				"rxjs": "^7.5.4"
-			},
-			"bin": {
-				"wait-on": "bin/wait-on"
-			},
-			"engines": {
-				"node": ">=10.0.0"
-			}
-		},
-		"node_modules/watchpack": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-			"dependencies": {
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.1.2"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/wbuf": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-			"dependencies": {
-				"minimalistic-assert": "^1.0.0"
-			}
-		},
-		"node_modules/web-namespaces": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz",
-			"integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		},
-		"node_modules/webidl-conversions": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-		},
-		"node_modules/webpack": {
-			"version": "5.88.2",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
-			"integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
-			"dependencies": {
-				"@types/eslint-scope": "^3.7.3",
-				"@types/estree": "^1.0.0",
-				"@webassemblyjs/ast": "^1.11.5",
-				"@webassemblyjs/wasm-edit": "^1.11.5",
-				"@webassemblyjs/wasm-parser": "^1.11.5",
-				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.9.0",
-				"browserslist": "^4.14.5",
-				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.15.0",
-				"es-module-lexer": "^1.2.1",
-				"eslint-scope": "5.1.1",
-				"events": "^3.2.0",
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.9",
-				"json-parse-even-better-errors": "^2.3.1",
-				"loader-runner": "^4.2.0",
-				"mime-types": "^2.1.27",
-				"neo-async": "^2.6.2",
-				"schema-utils": "^3.2.0",
-				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.3.7",
-				"watchpack": "^2.4.0",
-				"webpack-sources": "^3.2.3"
-			},
-			"bin": {
-				"webpack": "bin/webpack.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependenciesMeta": {
-				"webpack-cli": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-bundle-analyzer": {
-			"version": "4.9.0",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.0.tgz",
-			"integrity": "sha512-+bXGmO1LyiNx0i9enBu3H8mv42sj/BJWhZNFwjz92tVnBa9J3JMGo2an2IXlEleoDOPn/Hofl5hr/xCpObUDtw==",
-			"dependencies": {
-				"@discoveryjs/json-ext": "0.5.7",
-				"acorn": "^8.0.4",
-				"acorn-walk": "^8.0.0",
-				"chalk": "^4.1.0",
-				"commander": "^7.2.0",
-				"gzip-size": "^6.0.0",
-				"lodash": "^4.17.20",
-				"opener": "^1.5.2",
-				"sirv": "^1.0.7",
-				"ws": "^7.3.1"
-			},
-			"bin": {
-				"webpack-bundle-analyzer": "lib/bin/analyzer.js"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/webpack-bundle-analyzer/node_modules/commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"engines": {
-				"node": ">= 10"
-			}
-		},
-		"node_modules/webpack-dev-middleware": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-			"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
-			"dependencies": {
-				"colorette": "^2.0.10",
-				"memfs": "^3.4.3",
-				"mime-types": "^2.1.31",
-				"range-parser": "^1.2.1",
-				"schema-utils": "^4.0.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^4.0.0 || ^5.0.0"
-			}
-		},
-		"node_modules/webpack-dev-middleware/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-		},
-		"node_modules/webpack-dev-middleware/node_modules/mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/webpack-dev-middleware/node_modules/mime-types": {
-			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-			"dependencies": {
-				"mime-db": "1.52.0"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/webpack-dev-middleware/node_modules/range-parser": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/webpack-dev-server": {
-			"version": "4.15.1",
-			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
-			"integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
-			"dependencies": {
-				"@types/bonjour": "^3.5.9",
-				"@types/connect-history-api-fallback": "^1.3.5",
-				"@types/express": "^4.17.13",
-				"@types/serve-index": "^1.9.1",
-				"@types/serve-static": "^1.13.10",
-				"@types/sockjs": "^0.3.33",
-				"@types/ws": "^8.5.5",
-				"ansi-html-community": "^0.0.8",
-				"bonjour-service": "^1.0.11",
-				"chokidar": "^3.5.3",
-				"colorette": "^2.0.10",
-				"compression": "^1.7.4",
-				"connect-history-api-fallback": "^2.0.0",
-				"default-gateway": "^6.0.3",
-				"express": "^4.17.3",
-				"graceful-fs": "^4.2.6",
-				"html-entities": "^2.3.2",
-				"http-proxy-middleware": "^2.0.3",
-				"ipaddr.js": "^2.0.1",
-				"launch-editor": "^2.6.0",
-				"open": "^8.0.9",
-				"p-retry": "^4.5.0",
-				"rimraf": "^3.0.2",
-				"schema-utils": "^4.0.0",
-				"selfsigned": "^2.1.1",
-				"serve-index": "^1.9.1",
-				"sockjs": "^0.3.24",
-				"spdy": "^4.0.2",
-				"webpack-dev-middleware": "^5.3.1",
-				"ws": "^8.13.0"
-			},
-			"bin": {
-				"webpack-dev-server": "bin/webpack-dev-server.js"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^4.37.0 || ^5.0.0"
-			},
-			"peerDependenciesMeta": {
-				"webpack": {
-					"optional": true
-				},
-				"webpack-cli": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-dev-server/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-		},
-		"node_modules/webpack-dev-server/node_modules/schema-utils": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/webpack-dev-server/node_modules/ws": {
-			"version": "8.13.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-			"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-			"engines": {
-				"node": ">=10.0.0"
-			},
-			"peerDependencies": {
-				"bufferutil": "^4.0.1",
-				"utf-8-validate": ">=5.0.2"
-			},
-			"peerDependenciesMeta": {
-				"bufferutil": {
-					"optional": true
-				},
-				"utf-8-validate": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-merge": {
-			"version": "5.9.0",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz",
-			"integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==",
-			"dependencies": {
-				"clone-deep": "^4.0.1",
-				"wildcard": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10.0.0"
-			}
-		},
-		"node_modules/webpack-sources": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/webpack/node_modules/mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/webpack/node_modules/mime-types": {
-			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-			"dependencies": {
-				"mime-db": "1.52.0"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/webpack/node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/webpackbar": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-5.0.2.tgz",
-			"integrity": "sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==",
-			"dependencies": {
-				"chalk": "^4.1.0",
-				"consola": "^2.15.3",
-				"pretty-time": "^1.1.0",
-				"std-env": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"peerDependencies": {
-				"webpack": "3 || 4 || 5"
-			}
-		},
-		"node_modules/websocket-driver": {
-			"version": "0.7.4",
-			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-			"dependencies": {
-				"http-parser-js": ">=0.5.1",
-				"safe-buffer": ">=5.1.0",
-				"websocket-extensions": ">=0.1.1"
-			},
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/websocket-extensions": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/whatwg-url": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-			"dependencies": {
-				"tr46": "~0.0.3",
-				"webidl-conversions": "^3.0.0"
-			}
-		},
-		"node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/wide-align": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-			"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-			"dependencies": {
-				"string-width": "^1.0.2 || 2 || 3 || 4"
-			}
-		},
-		"node_modules/wide-align/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-		},
-		"node_modules/wide-align/node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/widest-line": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz",
-			"integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==",
-			"dependencies": {
-				"string-width": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/wildcard": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
-			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="
-		},
-		"node_modules/wrap-ansi": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-			"integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-			"dependencies": {
-				"ansi-styles": "^6.1.0",
-				"string-width": "^5.0.1",
-				"strip-ansi": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/ansi-regex": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/ansi-styles": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-			"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/strip-ansi": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-			"dependencies": {
-				"ansi-regex": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
-			}
-		},
-		"node_modules/wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-		},
-		"node_modules/write-file-atomic": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"is-typedarray": "^1.0.0",
-				"signal-exit": "^3.0.2",
-				"typedarray-to-buffer": "^3.1.5"
-			}
-		},
-		"node_modules/ws": {
-			"version": "7.5.9",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-			"integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-			"engines": {
-				"node": ">=8.3.0"
-			},
-			"peerDependencies": {
-				"bufferutil": "^4.0.1",
-				"utf-8-validate": "^5.0.2"
-			},
-			"peerDependenciesMeta": {
-				"bufferutil": {
-					"optional": true
-				},
-				"utf-8-validate": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/xdg-basedir": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-			"integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/xml-js": {
-			"version": "1.6.11",
-			"resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
-			"integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
-			"dependencies": {
-				"sax": "^1.2.4"
-			},
-			"bin": {
-				"xml-js": "bin/cli.js"
-			}
-		},
-		"node_modules/xtend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-			"engines": {
-				"node": ">=0.4"
-			}
-		},
-		"node_modules/yallist": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-		},
-		"node_modules/yaml": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/yocto-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/zwitch": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-			"integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/wooorm"
-			}
-		}
-	},
-	"dependencies": {
-		"@algolia/autocomplete-core": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.9.3.tgz",
-			"integrity": "sha512-009HdfugtGCdC4JdXUbVJClA0q0zh24yyePn+KUGk3rP7j8FEe/m5Yo/z65gn6nP/cM39PxpzqKrL7A6fP6PPw==",
-			"requires": {
-				"@algolia/autocomplete-plugin-algolia-insights": "1.9.3",
-				"@algolia/autocomplete-shared": "1.9.3"
-			}
-		},
-		"@algolia/autocomplete-plugin-algolia-insights": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.9.3.tgz",
-			"integrity": "sha512-a/yTUkcO/Vyy+JffmAnTWbr4/90cLzw+CC3bRbhnULr/EM0fGNvM13oQQ14f2moLMcVDyAx/leczLlAOovhSZg==",
-			"requires": {
-				"@algolia/autocomplete-shared": "1.9.3"
-			}
-		},
-		"@algolia/autocomplete-preset-algolia": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.9.3.tgz",
-			"integrity": "sha512-d4qlt6YmrLMYy95n5TB52wtNDr6EgAIPH81dvvvW8UmuWRgxEtY0NJiPwl/h95JtG2vmRM804M0DSwMCNZlzRA==",
-			"requires": {
-				"@algolia/autocomplete-shared": "1.9.3"
-			}
-		},
-		"@algolia/autocomplete-shared": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.9.3.tgz",
-			"integrity": "sha512-Wnm9E4Ye6Rl6sTTqjoymD+l8DjSTHsHboVRYrKgEt8Q7UHm9nYbqhN/i0fhUYA3OAEH7WA8x3jfpnmJm3rKvaQ==",
-			"requires": {}
-		},
-		"@algolia/cache-browser-local-storage": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.19.1.tgz",
-			"integrity": "sha512-FYAZWcGsFTTaSAwj9Std8UML3Bu8dyWDncM7Ls8g+58UOe4XYdlgzXWbrIgjaguP63pCCbMoExKr61B+ztK3tw==",
-			"requires": {
-				"@algolia/cache-common": "4.19.1"
-			}
-		},
-		"@algolia/cache-common": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.19.1.tgz",
-			"integrity": "sha512-XGghi3l0qA38HiqdoUY+wvGyBsGvKZ6U3vTiMBT4hArhP3fOGLXpIINgMiiGjTe4FVlTa5a/7Zf2bwlIHfRqqg=="
-		},
-		"@algolia/cache-in-memory": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.19.1.tgz",
-			"integrity": "sha512-+PDWL+XALGvIginigzu8oU6eWw+o76Z8zHbBovWYcrtWOEtinbl7a7UTt3x3lthv+wNuFr/YD1Gf+B+A9V8n5w==",
-			"requires": {
-				"@algolia/cache-common": "4.19.1"
-			}
-		},
-		"@algolia/client-account": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.19.1.tgz",
-			"integrity": "sha512-Oy0ritA2k7AMxQ2JwNpfaEcgXEDgeyKu0V7E7xt/ZJRdXfEpZcwp9TOg4TJHC7Ia62gIeT2Y/ynzsxccPw92GA==",
-			"requires": {
-				"@algolia/client-common": "4.19.1",
-				"@algolia/client-search": "4.19.1",
-				"@algolia/transporter": "4.19.1"
-			}
-		},
-		"@algolia/client-analytics": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.19.1.tgz",
-			"integrity": "sha512-5QCq2zmgdZLIQhHqwl55ZvKVpLM3DNWjFI4T+bHr3rGu23ew2bLO4YtyxaZeChmDb85jUdPDouDlCumGfk6wOg==",
-			"requires": {
-				"@algolia/client-common": "4.19.1",
-				"@algolia/client-search": "4.19.1",
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/transporter": "4.19.1"
-			}
-		},
-		"@algolia/client-common": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.19.1.tgz",
-			"integrity": "sha512-3kAIVqTcPrjfS389KQvKzliC559x+BDRxtWamVJt8IVp7LGnjq+aVAXg4Xogkur1MUrScTZ59/AaUd5EdpyXgA==",
-			"requires": {
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/transporter": "4.19.1"
-			}
-		},
-		"@algolia/client-personalization": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.19.1.tgz",
-			"integrity": "sha512-8CWz4/H5FA+krm9HMw2HUQenizC/DxUtsI5oYC0Jxxyce1vsr8cb1aEiSJArQT6IzMynrERif1RVWLac1m36xw==",
-			"requires": {
-				"@algolia/client-common": "4.19.1",
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/transporter": "4.19.1"
-			}
-		},
-		"@algolia/client-search": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.19.1.tgz",
-			"integrity": "sha512-mBecfMFS4N+yK/p0ZbK53vrZbL6OtWMk8YmnOv1i0LXx4pelY8TFhqKoTit3NPVPwoSNN0vdSN9dTu1xr1XOVw==",
-			"requires": {
-				"@algolia/client-common": "4.19.1",
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/transporter": "4.19.1"
-			}
-		},
-		"@algolia/events": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/@algolia/events/-/events-4.0.1.tgz",
-			"integrity": "sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ=="
-		},
-		"@algolia/logger-common": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.19.1.tgz",
-			"integrity": "sha512-i6pLPZW/+/YXKis8gpmSiNk1lOmYCmRI6+x6d2Qk1OdfvX051nRVdalRbEcVTpSQX6FQAoyeaui0cUfLYW5Elw=="
-		},
-		"@algolia/logger-console": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.19.1.tgz",
-			"integrity": "sha512-jj72k9GKb9W0c7TyC3cuZtTr0CngLBLmc8trzZlXdfvQiigpUdvTi1KoWIb2ZMcRBG7Tl8hSb81zEY3zI2RlXg==",
-			"requires": {
-				"@algolia/logger-common": "4.19.1"
-			}
-		},
-		"@algolia/requester-browser-xhr": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.19.1.tgz",
-			"integrity": "sha512-09K/+t7lptsweRTueHnSnmPqIxbHMowejAkn9XIcJMLdseS3zl8ObnS5GWea86mu3vy4+8H+ZBKkUN82Zsq/zg==",
-			"requires": {
-				"@algolia/requester-common": "4.19.1"
-			}
-		},
-		"@algolia/requester-common": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.19.1.tgz",
-			"integrity": "sha512-BisRkcWVxrDzF1YPhAckmi2CFYK+jdMT60q10d7z3PX+w6fPPukxHRnZwooiTUrzFe50UBmLItGizWHP5bDzVQ=="
-		},
-		"@algolia/requester-node-http": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.19.1.tgz",
-			"integrity": "sha512-6DK52DHviBHTG2BK/Vv2GIlEw7i+vxm7ypZW0Z7vybGCNDeWzADx+/TmxjkES2h15+FZOqVf/Ja677gePsVItA==",
-			"requires": {
-				"@algolia/requester-common": "4.19.1"
-			}
-		},
-		"@algolia/transporter": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.19.1.tgz",
-			"integrity": "sha512-nkpvPWbpuzxo1flEYqNIbGz7xhfhGOKGAZS7tzC+TELgEmi7z99qRyTfNSUlW7LZmB3ACdnqAo+9A9KFBENviQ==",
-			"requires": {
-				"@algolia/cache-common": "4.19.1",
-				"@algolia/logger-common": "4.19.1",
-				"@algolia/requester-common": "4.19.1"
-			}
-		},
-		"@ampproject/remapping": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-			"integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-			"requires": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			}
-		},
-		"@babel/code-frame": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
-			"integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
-			"requires": {
-				"@babel/highlight": "^7.22.10",
-				"chalk": "^2.4.2"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"color-convert": {
-					"version": "1.9.3",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-					"requires": {
-						"color-name": "1.1.3"
-					}
-				},
-				"color-name": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-					"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
-			}
-		},
-		"@babel/compat-data": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-			"integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
-		},
-		"@babel/core": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-			"integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
-			"requires": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-module-transforms": "^7.22.9",
-				"@babel/helpers": "^7.22.10",
-				"@babel/parser": "^7.22.10",
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.2",
-				"semver": "^6.3.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"@babel/generator": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-			"integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
-			"requires": {
-				"@babel/types": "^7.22.10",
-				"@jridgewell/gen-mapping": "^0.3.2",
-				"@jridgewell/trace-mapping": "^0.3.17",
-				"jsesc": "^2.5.1"
-			}
-		},
-		"@babel/helper-annotate-as-pure": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-			"integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-			"requires": {
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-builder-binary-assignment-operator-visitor": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
-			"integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
-			"requires": {
-				"@babel/types": "^7.22.10"
-			}
-		},
-		"@babel/helper-compilation-targets": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-			"integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
-			"requires": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-validator-option": "^7.22.5",
-				"browserslist": "^4.21.9",
-				"lru-cache": "^5.1.1",
-				"semver": "^6.3.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"@babel/helper-create-class-features-plugin": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz",
-			"integrity": "sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-member-expression-to-functions": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"semver": "^6.3.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"@babel/helper-create-regexp-features-plugin": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
-			"integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"regexpu-core": "^5.3.1",
-				"semver": "^6.3.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"@babel/helper-define-polyfill-provider": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
-			"integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
-			"requires": {
-				"@babel/helper-compilation-targets": "^7.22.6",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"debug": "^4.1.1",
-				"lodash.debounce": "^4.0.8",
-				"resolve": "^1.14.2"
-			}
-		},
-		"@babel/helper-environment-visitor": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-			"integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
-		},
-		"@babel/helper-function-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-			"integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
-			"requires": {
-				"@babel/template": "^7.22.5",
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-hoist-variables": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-			"integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-			"requires": {
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-member-expression-to-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-			"integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
-			"requires": {
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-module-imports": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-			"integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
-			"requires": {
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-module-transforms": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-			"integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-simple-access": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/helper-validator-identifier": "^7.22.5"
-			}
-		},
-		"@babel/helper-optimise-call-expression": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-			"integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
-			"requires": {
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-plugin-utils": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-			"integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
-		},
-		"@babel/helper-remap-async-to-generator": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
-			"integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-wrap-function": "^7.22.9"
-			}
-		},
-		"@babel/helper-replace-supers": {
-			"version": "7.22.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
-			"integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-member-expression-to-functions": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5"
-			}
-		},
-		"@babel/helper-simple-access": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-			"integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-			"requires": {
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-			"integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
-			"requires": {
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.22.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-			"integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-			"requires": {
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/helper-string-parser": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-			"integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
-		},
-		"@babel/helper-validator-identifier": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-			"integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
-		},
-		"@babel/helper-validator-option": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-			"integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
-		},
-		"@babel/helper-wrap-function": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
-			"integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
-			"requires": {
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/template": "^7.22.5",
-				"@babel/types": "^7.22.10"
-			}
-		},
-		"@babel/helpers": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
-			"integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
-			"requires": {
-				"@babel/template": "^7.22.5",
-				"@babel/traverse": "^7.22.10",
-				"@babel/types": "^7.22.10"
-			}
-		},
-		"@babel/highlight": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-			"integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.22.5",
-				"chalk": "^2.4.2",
-				"js-tokens": "^4.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"color-convert": {
-					"version": "1.9.3",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-					"requires": {
-						"color-name": "1.1.3"
-					}
-				},
-				"color-name": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-					"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-					"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
-			}
-		},
-		"@babel/parser": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
-			"integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ=="
-		},
-		"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-			"integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-			"integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/plugin-transform-optional-chaining": "^7.22.5"
-			}
-		},
-		"@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.12.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
-			"integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-				"@babel/plugin-transform-parameters": "^7.12.1"
-			}
-		},
-		"@babel/plugin-proposal-private-property-in-object": {
-			"version": "7.21.0-placeholder-for-preset-env.2",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-			"integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-			"requires": {}
-		},
-		"@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.12.13"
-			}
-		},
-		"@babel/plugin-syntax-class-static-block": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			}
-		},
-		"@babel/plugin-syntax-dynamic-import": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-			"integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-export-namespace-from": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.3"
-			}
-		},
-		"@babel/plugin-syntax-import-assertions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-			"integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-syntax-import-attributes": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-			"integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-syntax-import-meta": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			}
-		},
-		"@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-jsx": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
-			"integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			}
-		},
-		"@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			}
-		},
-		"@babel/plugin-syntax-object-rest-spread": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-private-property-in-object": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			}
-		},
-		"@babel/plugin-syntax-top-level-await": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			}
-		},
-		"@babel/plugin-syntax-typescript": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
-			"integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-syntax-unicode-sets-regex": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
-			"integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
-		},
-		"@babel/plugin-transform-arrow-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-			"integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-async-generator-functions": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz",
-			"integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==",
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.9",
-				"@babel/plugin-syntax-async-generators": "^7.8.4"
-			}
-		},
-		"@babel/plugin-transform-async-to-generator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-			"integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
-			"requires": {
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-			"integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-block-scoping": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
-			"integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-class-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-			"integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-class-static-block": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-			"integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5"
-			}
-		},
-		"@babel/plugin-transform-classes": {
-			"version": "7.22.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
-			"integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-compilation-targets": "^7.22.6",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"globals": "^11.1.0"
-			}
-		},
-		"@babel/plugin-transform-computed-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-			"integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/template": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-destructuring": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
-			"integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-dotall-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-			"integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-duplicate-keys": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-			"integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-dynamic-import": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-			"integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-			"integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
-			"requires": {
-				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-export-namespace-from": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-			"integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-for-of": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-			"integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-function-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-			"integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
-			"requires": {
-				"@babel/helper-compilation-targets": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-json-strings": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-			"integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-json-strings": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-			"integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-logical-assignment-operators": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-			"integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-			}
-		},
-		"@babel/plugin-transform-member-expression-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-			"integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-modules-amd": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-			"integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
-			"requires": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-modules-commonjs": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-			"integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
-			"requires": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-simple-access": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-modules-systemjs": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-			"integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
-			"requires": {
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-modules-umd": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-			"integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
-			"requires": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-			"integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-new-target": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-			"integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-nullish-coalescing-operator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-			"integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-numeric-separator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-			"integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
-			}
-		},
-		"@babel/plugin-transform-object-rest-spread": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-			"integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
-			"requires": {
-				"@babel/compat-data": "^7.22.5",
-				"@babel/helper-compilation-targets": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-object-super": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-			"integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-optional-catch-binding": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-			"integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-optional-chaining": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz",
-			"integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
-			}
-		},
-		"@babel/plugin-transform-parameters": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-			"integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-private-methods": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-			"integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-private-property-in-object": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-			"integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-			}
-		},
-		"@babel/plugin-transform-property-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-			"integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-constant-elements": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz",
-			"integrity": "sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-display-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz",
-			"integrity": "sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-jsx": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
-			"integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-jsx": "^7.22.5",
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-jsx-development": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
-			"integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
-			"requires": {
-				"@babel/plugin-transform-react-jsx": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-react-pure-annotations": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz",
-			"integrity": "sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-regenerator": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-			"integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"regenerator-transform": "^0.15.2"
-			}
-		},
-		"@babel/plugin-transform-reserved-words": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-			"integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-runtime": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.10.tgz",
-			"integrity": "sha512-RchI7HePu1eu0CYNKHHHQdfenZcM4nz8rew5B1VWqeRKdcwW5aQ5HeG9eTUbWiAS1UrmHVLmoxTWHt3iLD/NhA==",
-			"requires": {
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"babel-plugin-polyfill-corejs2": "^0.4.5",
-				"babel-plugin-polyfill-corejs3": "^0.8.3",
-				"babel-plugin-polyfill-regenerator": "^0.5.2",
-				"semver": "^6.3.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"@babel/plugin-transform-shorthand-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-			"integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-spread": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-			"integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-sticky-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-			"integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-template-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-			"integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-typeof-symbol": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-			"integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-typescript": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.10.tgz",
-			"integrity": "sha512-7++c8I/ymsDo4QQBAgbraXLzIM6jmfao11KgIBEYZRReWzNWH9NtNgJcyrZiXsOPh523FQm6LfpLyy/U5fn46A==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-create-class-features-plugin": "^7.22.10",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-typescript": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-unicode-escapes": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-			"integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-unicode-property-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-			"integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-unicode-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-			"integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/plugin-transform-unicode-sets-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-			"integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
-			}
-		},
-		"@babel/preset-env": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
-			"integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
-			"requires": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-compilation-targets": "^7.22.10",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
-				"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-class-properties": "^7.12.13",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-import-assertions": "^7.22.5",
-				"@babel/plugin-syntax-import-attributes": "^7.22.5",
-				"@babel/plugin-syntax-import-meta": "^7.10.4",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-				"@babel/plugin-syntax-top-level-await": "^7.14.5",
-				"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-				"@babel/plugin-transform-arrow-functions": "^7.22.5",
-				"@babel/plugin-transform-async-generator-functions": "^7.22.10",
-				"@babel/plugin-transform-async-to-generator": "^7.22.5",
-				"@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-				"@babel/plugin-transform-block-scoping": "^7.22.10",
-				"@babel/plugin-transform-class-properties": "^7.22.5",
-				"@babel/plugin-transform-class-static-block": "^7.22.5",
-				"@babel/plugin-transform-classes": "^7.22.6",
-				"@babel/plugin-transform-computed-properties": "^7.22.5",
-				"@babel/plugin-transform-destructuring": "^7.22.10",
-				"@babel/plugin-transform-dotall-regex": "^7.22.5",
-				"@babel/plugin-transform-duplicate-keys": "^7.22.5",
-				"@babel/plugin-transform-dynamic-import": "^7.22.5",
-				"@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-				"@babel/plugin-transform-export-namespace-from": "^7.22.5",
-				"@babel/plugin-transform-for-of": "^7.22.5",
-				"@babel/plugin-transform-function-name": "^7.22.5",
-				"@babel/plugin-transform-json-strings": "^7.22.5",
-				"@babel/plugin-transform-literals": "^7.22.5",
-				"@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
-				"@babel/plugin-transform-member-expression-literals": "^7.22.5",
-				"@babel/plugin-transform-modules-amd": "^7.22.5",
-				"@babel/plugin-transform-modules-commonjs": "^7.22.5",
-				"@babel/plugin-transform-modules-systemjs": "^7.22.5",
-				"@babel/plugin-transform-modules-umd": "^7.22.5",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-				"@babel/plugin-transform-new-target": "^7.22.5",
-				"@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-				"@babel/plugin-transform-numeric-separator": "^7.22.5",
-				"@babel/plugin-transform-object-rest-spread": "^7.22.5",
-				"@babel/plugin-transform-object-super": "^7.22.5",
-				"@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-				"@babel/plugin-transform-optional-chaining": "^7.22.10",
-				"@babel/plugin-transform-parameters": "^7.22.5",
-				"@babel/plugin-transform-private-methods": "^7.22.5",
-				"@babel/plugin-transform-private-property-in-object": "^7.22.5",
-				"@babel/plugin-transform-property-literals": "^7.22.5",
-				"@babel/plugin-transform-regenerator": "^7.22.10",
-				"@babel/plugin-transform-reserved-words": "^7.22.5",
-				"@babel/plugin-transform-shorthand-properties": "^7.22.5",
-				"@babel/plugin-transform-spread": "^7.22.5",
-				"@babel/plugin-transform-sticky-regex": "^7.22.5",
-				"@babel/plugin-transform-template-literals": "^7.22.5",
-				"@babel/plugin-transform-typeof-symbol": "^7.22.5",
-				"@babel/plugin-transform-unicode-escapes": "^7.22.10",
-				"@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
-				"@babel/preset-modules": "0.1.6-no-external-plugins",
-				"@babel/types": "^7.22.10",
-				"babel-plugin-polyfill-corejs2": "^0.4.5",
-				"babel-plugin-polyfill-corejs3": "^0.8.3",
-				"babel-plugin-polyfill-regenerator": "^0.5.2",
-				"core-js-compat": "^3.31.0",
-				"semver": "^6.3.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"@babel/preset-modules": {
-			"version": "0.1.6-no-external-plugins",
-			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
-			"integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@babel/types": "^7.4.4",
-				"esutils": "^2.0.2"
-			}
-		},
-		"@babel/preset-react": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.5.tgz",
-			"integrity": "sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-transform-react-display-name": "^7.22.5",
-				"@babel/plugin-transform-react-jsx": "^7.22.5",
-				"@babel/plugin-transform-react-jsx-development": "^7.22.5",
-				"@babel/plugin-transform-react-pure-annotations": "^7.22.5"
-			}
-		},
-		"@babel/preset-typescript": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz",
-			"integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.5",
-				"@babel/plugin-syntax-jsx": "^7.22.5",
-				"@babel/plugin-transform-modules-commonjs": "^7.22.5",
-				"@babel/plugin-transform-typescript": "^7.22.5"
-			}
-		},
-		"@babel/regjsgen": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-			"integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
-		},
-		"@babel/runtime": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz",
-			"integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==",
-			"requires": {
-				"regenerator-runtime": "^0.14.0"
-			}
-		},
-		"@babel/runtime-corejs3": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.10.tgz",
-			"integrity": "sha512-IcixfV2Jl3UrqZX4c81+7lVg5++2ufYJyAFW3Aux/ZTvY6LVYYhJ9rMgnbX0zGVq6eqfVpnoatTjZdVki/GmWA==",
-			"requires": {
-				"core-js-pure": "^3.30.2",
-				"regenerator-runtime": "^0.14.0"
-			}
-		},
-		"@babel/template": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-			"integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
-			"requires": {
-				"@babel/code-frame": "^7.22.5",
-				"@babel/parser": "^7.22.5",
-				"@babel/types": "^7.22.5"
-			}
-		},
-		"@babel/traverse": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-			"integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
-			"requires": {
-				"@babel/code-frame": "^7.22.10",
-				"@babel/generator": "^7.22.10",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.22.10",
-				"@babel/types": "^7.22.10",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			}
-		},
-		"@babel/types": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-			"integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
-			"requires": {
-				"@babel/helper-string-parser": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.5",
-				"to-fast-properties": "^2.0.0"
-			}
-		},
-		"@colors/colors": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-			"integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-			"optional": true
-		},
-		"@discoveryjs/json-ext": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="
-		},
-		"@docsearch/css": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.5.2.tgz",
-			"integrity": "sha512-SPiDHaWKQZpwR2siD0KQUwlStvIAnEyK6tAE2h2Wuoq8ue9skzhlyVQ1ddzOxX6khULnAALDiR/isSF3bnuciA=="
-		},
-		"@docsearch/react": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.5.2.tgz",
-			"integrity": "sha512-9Ahcrs5z2jq/DcAvYtvlqEBHImbm4YJI8M9y0x6Tqg598P40HTEkX7hsMcIuThI+hTFxRGZ9hll0Wygm2yEjng==",
-			"requires": {
-				"@algolia/autocomplete-core": "1.9.3",
-				"@algolia/autocomplete-preset-algolia": "1.9.3",
-				"@docsearch/css": "3.5.2",
-				"algoliasearch": "^4.19.1"
-			}
-		},
-		"@docusaurus/core": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-2.4.1.tgz",
-			"integrity": "sha512-SNsY7PshK3Ri7vtsLXVeAJGS50nJN3RgF836zkyUfAD01Fq+sAk5EwWgLw+nnm5KVNGDu7PRR2kRGDsWvqpo0g==",
-			"requires": {
-				"@babel/core": "^7.18.6",
-				"@babel/generator": "^7.18.7",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-				"@babel/plugin-transform-runtime": "^7.18.6",
-				"@babel/preset-env": "^7.18.6",
-				"@babel/preset-react": "^7.18.6",
-				"@babel/preset-typescript": "^7.18.6",
-				"@babel/runtime": "^7.18.6",
-				"@babel/runtime-corejs3": "^7.18.6",
-				"@babel/traverse": "^7.18.8",
-				"@docusaurus/cssnano-preset": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/react-loadable": "5.5.2",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"@slorber/static-site-generator-webpack-plugin": "^4.0.7",
-				"@svgr/webpack": "^6.2.1",
-				"autoprefixer": "^10.4.7",
-				"babel-loader": "^8.2.5",
-				"babel-plugin-dynamic-import-node": "^2.3.3",
-				"boxen": "^6.2.1",
-				"chalk": "^4.1.2",
-				"chokidar": "^3.5.3",
-				"clean-css": "^5.3.0",
-				"cli-table3": "^0.6.2",
-				"combine-promises": "^1.1.0",
-				"commander": "^5.1.0",
-				"copy-webpack-plugin": "^11.0.0",
-				"core-js": "^3.23.3",
-				"css-loader": "^6.7.1",
-				"css-minimizer-webpack-plugin": "^4.0.0",
-				"cssnano": "^5.1.12",
-				"del": "^6.1.1",
-				"detect-port": "^1.3.0",
-				"escape-html": "^1.0.3",
-				"eta": "^2.0.0",
-				"file-loader": "^6.2.0",
-				"fs-extra": "^10.1.0",
-				"html-minifier-terser": "^6.1.0",
-				"html-tags": "^3.2.0",
-				"html-webpack-plugin": "^5.5.0",
-				"import-fresh": "^3.3.0",
-				"leven": "^3.1.0",
-				"lodash": "^4.17.21",
-				"mini-css-extract-plugin": "^2.6.1",
-				"postcss": "^8.4.14",
-				"postcss-loader": "^7.0.0",
-				"prompts": "^2.4.2",
-				"react-dev-utils": "^12.0.1",
-				"react-helmet-async": "^1.3.0",
-				"react-loadable": "npm:@docusaurus/react-loadable@5.5.2",
-				"react-loadable-ssr-addon-v5-slorber": "^1.0.1",
-				"react-router": "^5.3.3",
-				"react-router-config": "^5.1.1",
-				"react-router-dom": "^5.3.3",
-				"rtl-detect": "^1.0.4",
-				"semver": "^7.3.7",
-				"serve-handler": "^6.1.3",
-				"shelljs": "^0.8.5",
-				"terser-webpack-plugin": "^5.3.3",
-				"tslib": "^2.4.0",
-				"update-notifier": "^5.1.0",
-				"url-loader": "^4.1.1",
-				"wait-on": "^6.0.1",
-				"webpack": "^5.73.0",
-				"webpack-bundle-analyzer": "^4.5.0",
-				"webpack-dev-server": "^4.9.3",
-				"webpack-merge": "^5.8.0",
-				"webpackbar": "^5.0.2"
-			}
-		},
-		"@docusaurus/cssnano-preset": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-2.4.1.tgz",
-			"integrity": "sha512-ka+vqXwtcW1NbXxWsh6yA1Ckii1klY9E53cJ4O9J09nkMBgrNX3iEFED1fWdv8wf4mJjvGi5RLZ2p9hJNjsLyQ==",
-			"requires": {
-				"cssnano-preset-advanced": "^5.3.8",
-				"postcss": "^8.4.14",
-				"postcss-sort-media-queries": "^4.2.1",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@docusaurus/logger": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-2.4.1.tgz",
-			"integrity": "sha512-5h5ysIIWYIDHyTVd8BjheZmQZmEgWDR54aQ1BX9pjFfpyzFo5puKXKYrYJXbjEHGyVhEzmB9UXwbxGfaZhOjcg==",
-			"requires": {
-				"chalk": "^4.1.2",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@docusaurus/mdx-loader": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-2.4.1.tgz",
-			"integrity": "sha512-4KhUhEavteIAmbBj7LVFnrVYDiU51H5YWW1zY6SmBSte/YLhDutztLTBE0PQl1Grux1jzUJeaSvAzHpTn6JJDQ==",
-			"requires": {
-				"@babel/parser": "^7.18.8",
-				"@babel/traverse": "^7.18.8",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@mdx-js/mdx": "^1.6.22",
-				"escape-html": "^1.0.3",
-				"file-loader": "^6.2.0",
-				"fs-extra": "^10.1.0",
-				"image-size": "^1.0.1",
-				"mdast-util-to-string": "^2.0.0",
-				"remark-emoji": "^2.2.0",
-				"stringify-object": "^3.3.0",
-				"tslib": "^2.4.0",
-				"unified": "^9.2.2",
-				"unist-util-visit": "^2.0.3",
-				"url-loader": "^4.1.1",
-				"webpack": "^5.73.0"
-			}
-		},
-		"@docusaurus/module-type-aliases": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-2.4.1.tgz",
-			"integrity": "sha512-gLBuIFM8Dp2XOCWffUDSjtxY7jQgKvYujt7Mx5s4FCTfoL5dN1EVbnrn+O2Wvh8b0a77D57qoIDY7ghgmatR1A==",
-			"requires": {
-				"@docusaurus/react-loadable": "5.5.2",
-				"@docusaurus/types": "2.4.1",
-				"@types/history": "^4.7.11",
-				"@types/react": "*",
-				"@types/react-router-config": "*",
-				"@types/react-router-dom": "*",
-				"react-helmet-async": "*",
-				"react-loadable": "npm:@docusaurus/react-loadable@5.5.2"
-			}
-		},
-		"@docusaurus/plugin-content-blog": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.4.1.tgz",
-			"integrity": "sha512-E2i7Knz5YIbE1XELI6RlTnZnGgS52cUO4BlCiCUCvQHbR+s1xeIWz4C6BtaVnlug0Ccz7nFSksfwDpVlkujg5Q==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"cheerio": "^1.0.0-rc.12",
-				"feed": "^4.2.2",
-				"fs-extra": "^10.1.0",
-				"lodash": "^4.17.21",
-				"reading-time": "^1.5.0",
-				"tslib": "^2.4.0",
-				"unist-util-visit": "^2.0.3",
-				"utility-types": "^3.10.0",
-				"webpack": "^5.73.0"
-			}
-		},
-		"@docusaurus/plugin-content-docs": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.4.1.tgz",
-			"integrity": "sha512-Lo7lSIcpswa2Kv4HEeUcGYqaasMUQNpjTXpV0N8G6jXgZaQurqp7E8NGYeGbDXnb48czmHWbzDL4S3+BbK0VzA==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/module-type-aliases": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"@types/react-router-config": "^5.0.6",
-				"combine-promises": "^1.1.0",
-				"fs-extra": "^10.1.0",
-				"import-fresh": "^3.3.0",
-				"js-yaml": "^4.1.0",
-				"lodash": "^4.17.21",
-				"tslib": "^2.4.0",
-				"utility-types": "^3.10.0",
-				"webpack": "^5.73.0"
-			}
-		},
-		"@docusaurus/plugin-content-pages": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.4.1.tgz",
-			"integrity": "sha512-/UjuH/76KLaUlL+o1OvyORynv6FURzjurSjvn2lbWTFc4tpYY2qLYTlKpTCBVPhlLUQsfyFnshEJDLmPneq2oA==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"fs-extra": "^10.1.0",
-				"tslib": "^2.4.0",
-				"webpack": "^5.73.0"
-			}
-		},
-		"@docusaurus/plugin-debug": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-2.4.1.tgz",
-			"integrity": "sha512-7Yu9UPzRShlrH/G8btOpR0e6INFZr0EegWplMjOqelIwAcx3PKyR8mgPTxGTxcqiYj6hxSCRN0D8R7YrzImwNA==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"fs-extra": "^10.1.0",
-				"react-json-view": "^1.21.3",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@docusaurus/plugin-google-analytics": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.4.1.tgz",
-			"integrity": "sha512-dyZJdJiCoL+rcfnm0RPkLt/o732HvLiEwmtoNzOoz9MSZz117UH2J6U2vUDtzUzwtFLIf32KkeyzisbwUCgcaQ==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@docusaurus/plugin-google-gtag": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.4.1.tgz",
-			"integrity": "sha512-mKIefK+2kGTQBYvloNEKtDmnRD7bxHLsBcxgnbt4oZwzi2nxCGjPX6+9SQO2KCN5HZbNrYmGo5GJfMgoRvy6uA==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@docusaurus/plugin-google-tag-manager": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-2.4.1.tgz",
-			"integrity": "sha512-Zg4Ii9CMOLfpeV2nG74lVTWNtisFaH9QNtEw48R5QE1KIwDBdTVaiSA18G1EujZjrzJJzXN79VhINSbOJO/r3g==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@docusaurus/plugin-sitemap": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.4.1.tgz",
-			"integrity": "sha512-lZx+ijt/+atQ3FVE8FOHV/+X3kuok688OydDXrqKRJyXBJZKgGjA2Qa8RjQ4f27V2woaXhtnyrdPop/+OjVMRg==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"fs-extra": "^10.1.0",
-				"sitemap": "^7.1.1",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@docusaurus/preset-classic": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-2.4.1.tgz",
-			"integrity": "sha512-P4//+I4zDqQJ+UDgoFrjIFaQ1MeS9UD1cvxVQaI6O7iBmiHQm0MGROP1TbE7HlxlDPXFJjZUK3x3cAoK63smGQ==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/plugin-content-blog": "2.4.1",
-				"@docusaurus/plugin-content-docs": "2.4.1",
-				"@docusaurus/plugin-content-pages": "2.4.1",
-				"@docusaurus/plugin-debug": "2.4.1",
-				"@docusaurus/plugin-google-analytics": "2.4.1",
-				"@docusaurus/plugin-google-gtag": "2.4.1",
-				"@docusaurus/plugin-google-tag-manager": "2.4.1",
-				"@docusaurus/plugin-sitemap": "2.4.1",
-				"@docusaurus/theme-classic": "2.4.1",
-				"@docusaurus/theme-common": "2.4.1",
-				"@docusaurus/theme-search-algolia": "2.4.1",
-				"@docusaurus/types": "2.4.1"
-			}
-		},
-		"@docusaurus/react-loadable": {
-			"version": "5.5.2",
-			"resolved": "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz",
-			"integrity": "sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==",
-			"requires": {
-				"@types/react": "*",
-				"prop-types": "^15.6.2"
-			}
-		},
-		"@docusaurus/theme-classic": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-2.4.1.tgz",
-			"integrity": "sha512-Rz0wKUa+LTW1PLXmwnf8mn85EBzaGSt6qamqtmnh9Hflkc+EqiYMhtUJeLdV+wsgYq4aG0ANc+bpUDpsUhdnwg==",
-			"requires": {
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/module-type-aliases": "2.4.1",
-				"@docusaurus/plugin-content-blog": "2.4.1",
-				"@docusaurus/plugin-content-docs": "2.4.1",
-				"@docusaurus/plugin-content-pages": "2.4.1",
-				"@docusaurus/theme-common": "2.4.1",
-				"@docusaurus/theme-translations": "2.4.1",
-				"@docusaurus/types": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"@mdx-js/react": "^1.6.22",
-				"clsx": "^1.2.1",
-				"copy-text-to-clipboard": "^3.0.1",
-				"infima": "0.2.0-alpha.43",
-				"lodash": "^4.17.21",
-				"nprogress": "^0.2.0",
-				"postcss": "^8.4.14",
-				"prism-react-renderer": "^1.3.5",
-				"prismjs": "^1.28.0",
-				"react-router-dom": "^5.3.3",
-				"rtlcss": "^3.5.0",
-				"tslib": "^2.4.0",
-				"utility-types": "^3.10.0"
-			}
-		},
-		"@docusaurus/theme-common": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-2.4.1.tgz",
-			"integrity": "sha512-G7Zau1W5rQTaFFB3x3soQoZpkgMbl/SYNG8PfMFIjKa3M3q8n0m/GRf5/H/e5BqOvt8c+ZWIXGCiz+kUCSHovA==",
-			"requires": {
-				"@docusaurus/mdx-loader": "2.4.1",
-				"@docusaurus/module-type-aliases": "2.4.1",
-				"@docusaurus/plugin-content-blog": "2.4.1",
-				"@docusaurus/plugin-content-docs": "2.4.1",
-				"@docusaurus/plugin-content-pages": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-common": "2.4.1",
-				"@types/history": "^4.7.11",
-				"@types/react": "*",
-				"@types/react-router-config": "*",
-				"clsx": "^1.2.1",
-				"parse-numeric-range": "^1.3.0",
-				"prism-react-renderer": "^1.3.5",
-				"tslib": "^2.4.0",
-				"use-sync-external-store": "^1.2.0",
-				"utility-types": "^3.10.0"
-			}
-		},
-		"@docusaurus/theme-search-algolia": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.4.1.tgz",
-			"integrity": "sha512-6BcqW2lnLhZCXuMAvPRezFs1DpmEKzXFKlYjruuas+Xy3AQeFzDJKTJFIm49N77WFCTyxff8d3E4Q9pi/+5McQ==",
-			"requires": {
-				"@docsearch/react": "^3.1.1",
-				"@docusaurus/core": "2.4.1",
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/plugin-content-docs": "2.4.1",
-				"@docusaurus/theme-common": "2.4.1",
-				"@docusaurus/theme-translations": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"@docusaurus/utils-validation": "2.4.1",
-				"algoliasearch": "^4.13.1",
-				"algoliasearch-helper": "^3.10.0",
-				"clsx": "^1.2.1",
-				"eta": "^2.0.0",
-				"fs-extra": "^10.1.0",
-				"lodash": "^4.17.21",
-				"tslib": "^2.4.0",
-				"utility-types": "^3.10.0"
-			}
-		},
-		"@docusaurus/theme-translations": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-2.4.1.tgz",
-			"integrity": "sha512-T1RAGP+f86CA1kfE8ejZ3T3pUU3XcyvrGMfC/zxCtc2BsnoexuNI9Vk2CmuKCb+Tacvhxjv5unhxXce0+NKyvA==",
-			"requires": {
-				"fs-extra": "^10.1.0",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@docusaurus/types": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-2.4.1.tgz",
-			"integrity": "sha512-0R+cbhpMkhbRXX138UOc/2XZFF8hiZa6ooZAEEJFp5scytzCw4tC1gChMFXrpa3d2tYE6AX8IrOEpSonLmfQuQ==",
-			"requires": {
-				"@types/history": "^4.7.11",
-				"@types/react": "*",
-				"commander": "^5.1.0",
-				"joi": "^17.6.0",
-				"react-helmet-async": "^1.3.0",
-				"utility-types": "^3.10.0",
-				"webpack": "^5.73.0",
-				"webpack-merge": "^5.8.0"
-			}
-		},
-		"@docusaurus/utils": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-2.4.1.tgz",
-			"integrity": "sha512-1lvEZdAQhKNht9aPXPoh69eeKnV0/62ROhQeFKKxmzd0zkcuE/Oc5Gpnt00y/f5bIsmOsYMY7Pqfm/5rteT5GA==",
-			"requires": {
-				"@docusaurus/logger": "2.4.1",
-				"@svgr/webpack": "^6.2.1",
-				"escape-string-regexp": "^4.0.0",
-				"file-loader": "^6.2.0",
-				"fs-extra": "^10.1.0",
-				"github-slugger": "^1.4.0",
-				"globby": "^11.1.0",
-				"gray-matter": "^4.0.3",
-				"js-yaml": "^4.1.0",
-				"lodash": "^4.17.21",
-				"micromatch": "^4.0.5",
-				"resolve-pathname": "^3.0.0",
-				"shelljs": "^0.8.5",
-				"tslib": "^2.4.0",
-				"url-loader": "^4.1.1",
-				"webpack": "^5.73.0"
-			}
-		},
-		"@docusaurus/utils-common": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-2.4.1.tgz",
-			"integrity": "sha512-bCVGdZU+z/qVcIiEQdyx0K13OC5mYwxhSuDUR95oFbKVuXYRrTVrwZIqQljuo1fyJvFTKHiL9L9skQOPokuFNQ==",
-			"requires": {
-				"tslib": "^2.4.0"
-			}
-		},
-		"@docusaurus/utils-validation": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-2.4.1.tgz",
-			"integrity": "sha512-unII3hlJlDwZ3w8U+pMO3Lx3RhI4YEbY3YNsQj4yzrkZzlpqZOLuAiZK2JyULnD+TKbceKU0WyWkQXtYbLNDFA==",
-			"requires": {
-				"@docusaurus/logger": "2.4.1",
-				"@docusaurus/utils": "2.4.1",
-				"joi": "^17.6.0",
-				"js-yaml": "^4.1.0",
-				"tslib": "^2.4.0"
-			}
-		},
-		"@hapi/hoek": {
-			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
-			"integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
-		},
-		"@hapi/topo": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
-			"integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
-			"requires": {
-				"@hapi/hoek": "^9.0.0"
-			}
-		},
-		"@jest/schemas": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-			"integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-			"requires": {
-				"@sinclair/typebox": "^0.27.8"
-			}
-		},
-		"@jest/types": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-			"requires": {
-				"@jest/schemas": "^29.6.3",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.8",
-				"chalk": "^4.0.0"
-			}
-		},
-		"@jridgewell/gen-mapping": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-			"integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-			"requires": {
-				"@jridgewell/set-array": "^1.0.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			}
-		},
-		"@jridgewell/resolve-uri": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-			"integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
-		},
-		"@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
-		},
-		"@jridgewell/source-map": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-			"integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
-			"requires": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			}
-		},
-		"@jridgewell/sourcemap-codec": {
-			"version": "1.4.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
-		},
-		"@jridgewell/trace-mapping": {
-			"version": "0.3.19",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-			"integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
-			"requires": {
-				"@jridgewell/resolve-uri": "^3.1.0",
-				"@jridgewell/sourcemap-codec": "^1.4.14"
-			}
-		},
-		"@leichtgewicht/ip-codec": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
-		},
-		"@mdx-js/mdx": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz",
-			"integrity": "sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==",
-			"requires": {
-				"@babel/core": "7.12.9",
-				"@babel/plugin-syntax-jsx": "7.12.1",
-				"@babel/plugin-syntax-object-rest-spread": "7.8.3",
-				"@mdx-js/util": "1.6.22",
-				"babel-plugin-apply-mdx-type-prop": "1.6.22",
-				"babel-plugin-extract-import-names": "1.6.22",
-				"camelcase-css": "2.0.1",
-				"detab": "2.0.4",
-				"hast-util-raw": "6.0.1",
-				"lodash.uniq": "4.5.0",
-				"mdast-util-to-hast": "10.0.1",
-				"remark-footnotes": "2.0.0",
-				"remark-mdx": "1.6.22",
-				"remark-parse": "8.0.3",
-				"remark-squeeze-paragraphs": "4.0.0",
-				"style-to-object": "0.3.0",
-				"unified": "9.2.0",
-				"unist-builder": "2.0.3",
-				"unist-util-visit": "2.0.3"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.12.9",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
-					"integrity": "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/generator": "^7.12.5",
-						"@babel/helper-module-transforms": "^7.12.1",
-						"@babel/helpers": "^7.12.5",
-						"@babel/parser": "^7.12.7",
-						"@babel/template": "^7.12.7",
-						"@babel/traverse": "^7.12.9",
-						"@babel/types": "^7.12.7",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.1",
-						"json5": "^2.1.2",
-						"lodash": "^4.17.19",
-						"resolve": "^1.3.2",
-						"semver": "^5.4.1",
-						"source-map": "^0.5.0"
-					}
-				},
-				"@babel/plugin-syntax-jsx": {
-					"version": "7.12.1",
-					"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
-					"integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
-					"requires": {
-						"@babel/helper-plugin-utils": "^7.10.4"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-				},
-				"unified": {
-					"version": "9.2.0",
-					"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
-					"integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
-					"requires": {
-						"bail": "^1.0.0",
-						"extend": "^3.0.0",
-						"is-buffer": "^2.0.0",
-						"is-plain-obj": "^2.0.0",
-						"trough": "^1.0.0",
-						"vfile": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@mdx-js/react": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.22.tgz",
-			"integrity": "sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==",
-			"requires": {}
-		},
-		"@mdx-js/util": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz",
-			"integrity": "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA=="
-		},
-		"@nodelib/fs.scandir": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-			"requires": {
-				"@nodelib/fs.stat": "2.0.5",
-				"run-parallel": "^1.1.9"
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
-		},
-		"@nodelib/fs.walk": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-			"requires": {
-				"@nodelib/fs.scandir": "2.1.5",
-				"fastq": "^1.6.0"
-			}
-		},
-		"@polka/url": {
-			"version": "1.0.0-next.21",
-			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
-			"integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g=="
-		},
-		"@sideway/address": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
-			"integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
-			"requires": {
-				"@hapi/hoek": "^9.0.0"
-			}
-		},
-		"@sideway/formula": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
-			"integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
-		},
-		"@sideway/pinpoint": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
-			"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
-		},
-		"@sinclair/typebox": {
-			"version": "0.27.8",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
-		},
-		"@sindresorhus/is": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-			"integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
-		},
-		"@slorber/static-site-generator-webpack-plugin": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.7.tgz",
-			"integrity": "sha512-Ug7x6z5lwrz0WqdnNFOMYrDQNTPAprvHLSh6+/fmml3qUiz6l5eq+2MzLKWtn/q5K5NpSiFsZTP/fck/3vjSxA==",
-			"requires": {
-				"eval": "^0.1.8",
-				"p-map": "^4.0.0",
-				"webpack-sources": "^3.2.2"
-			}
-		},
-		"@svgr/babel-plugin-add-jsx-attribute": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz",
-			"integrity": "sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ==",
-			"requires": {}
-		},
-		"@svgr/babel-plugin-remove-jsx-attribute": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz",
-			"integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==",
-			"requires": {}
-		},
-		"@svgr/babel-plugin-remove-jsx-empty-expression": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz",
-			"integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==",
-			"requires": {}
-		},
-		"@svgr/babel-plugin-replace-jsx-attribute-value": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz",
-			"integrity": "sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg==",
-			"requires": {}
-		},
-		"@svgr/babel-plugin-svg-dynamic-title": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz",
-			"integrity": "sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==",
-			"requires": {}
-		},
-		"@svgr/babel-plugin-svg-em-dimensions": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.1.tgz",
-			"integrity": "sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA==",
-			"requires": {}
-		},
-		"@svgr/babel-plugin-transform-react-native-svg": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.1.tgz",
-			"integrity": "sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg==",
-			"requires": {}
-		},
-		"@svgr/babel-plugin-transform-svg-component": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.1.tgz",
-			"integrity": "sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ==",
-			"requires": {}
-		},
-		"@svgr/babel-preset": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.5.1.tgz",
-			"integrity": "sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw==",
-			"requires": {
-				"@svgr/babel-plugin-add-jsx-attribute": "^6.5.1",
-				"@svgr/babel-plugin-remove-jsx-attribute": "*",
-				"@svgr/babel-plugin-remove-jsx-empty-expression": "*",
-				"@svgr/babel-plugin-replace-jsx-attribute-value": "^6.5.1",
-				"@svgr/babel-plugin-svg-dynamic-title": "^6.5.1",
-				"@svgr/babel-plugin-svg-em-dimensions": "^6.5.1",
-				"@svgr/babel-plugin-transform-react-native-svg": "^6.5.1",
-				"@svgr/babel-plugin-transform-svg-component": "^6.5.1"
-			}
-		},
-		"@svgr/core": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/core/-/core-6.5.1.tgz",
-			"integrity": "sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==",
-			"requires": {
-				"@babel/core": "^7.19.6",
-				"@svgr/babel-preset": "^6.5.1",
-				"@svgr/plugin-jsx": "^6.5.1",
-				"camelcase": "^6.2.0",
-				"cosmiconfig": "^7.0.1"
-			}
-		},
-		"@svgr/hast-util-to-babel-ast": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.1.tgz",
-			"integrity": "sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw==",
-			"requires": {
-				"@babel/types": "^7.20.0",
-				"entities": "^4.4.0"
-			}
-		},
-		"@svgr/plugin-jsx": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.5.1.tgz",
-			"integrity": "sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw==",
-			"requires": {
-				"@babel/core": "^7.19.6",
-				"@svgr/babel-preset": "^6.5.1",
-				"@svgr/hast-util-to-babel-ast": "^6.5.1",
-				"svg-parser": "^2.0.4"
-			}
-		},
-		"@svgr/plugin-svgo": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.5.1.tgz",
-			"integrity": "sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ==",
-			"requires": {
-				"cosmiconfig": "^7.0.1",
-				"deepmerge": "^4.2.2",
-				"svgo": "^2.8.0"
-			}
-		},
-		"@svgr/webpack": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.5.1.tgz",
-			"integrity": "sha512-cQ/AsnBkXPkEK8cLbv4Dm7JGXq2XrumKnL1dRpJD9rIO2fTIlJI9a1uCciYG1F2aUsox/hJQyNGbt3soDxSRkA==",
-			"requires": {
-				"@babel/core": "^7.19.6",
-				"@babel/plugin-transform-react-constant-elements": "^7.18.12",
-				"@babel/preset-env": "^7.19.4",
-				"@babel/preset-react": "^7.18.6",
-				"@babel/preset-typescript": "^7.18.6",
-				"@svgr/core": "^6.5.1",
-				"@svgr/plugin-jsx": "^6.5.1",
-				"@svgr/plugin-svgo": "^6.5.1"
-			}
-		},
-		"@szmarczak/http-timer": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-			"integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-			"requires": {
-				"defer-to-connect": "^1.0.1"
-			}
-		},
-		"@trysound/sax": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
-		},
-		"@types/body-parser": {
-			"version": "1.19.2",
-			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-			"integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-			"requires": {
-				"@types/connect": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/bonjour": {
-			"version": "3.5.10",
-			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-			"integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/connect": {
-			"version": "3.4.35",
-			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/connect-history-api-fallback": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
-			"integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
-			"requires": {
-				"@types/express-serve-static-core": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/eslint": {
-			"version": "8.44.2",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz",
-			"integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==",
-			"requires": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
-			}
-		},
-		"@types/eslint-scope": {
-			"version": "3.7.4",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-			"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-			"requires": {
-				"@types/eslint": "*",
-				"@types/estree": "*"
-			}
-		},
-		"@types/estree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
-			"integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="
-		},
-		"@types/express": {
-			"version": "4.17.17",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
-			"integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
-			"requires": {
-				"@types/body-parser": "*",
-				"@types/express-serve-static-core": "^4.17.33",
-				"@types/qs": "*",
-				"@types/serve-static": "*"
-			}
-		},
-		"@types/express-serve-static-core": {
-			"version": "4.17.35",
-			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
-			"integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
-			"requires": {
-				"@types/node": "*",
-				"@types/qs": "*",
-				"@types/range-parser": "*",
-				"@types/send": "*"
-			}
-		},
-		"@types/hast": {
-			"version": "2.3.5",
-			"resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.5.tgz",
-			"integrity": "sha512-SvQi0L/lNpThgPoleH53cdjB3y9zpLlVjRbqB3rH8hx1jiRSBGAhyjV3H+URFjNVRqt2EdYNrbZE5IsGlNfpRg==",
-			"requires": {
-				"@types/unist": "^2"
-			}
-		},
-		"@types/history": {
-			"version": "4.7.11",
-			"resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-			"integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA=="
-		},
-		"@types/html-minifier-terser": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-			"integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
-		},
-		"@types/http-errors": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
-			"integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ=="
-		},
-		"@types/http-proxy": {
-			"version": "1.17.11",
-			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
-			"integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/istanbul-lib-coverage": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-			"integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
-		},
-		"@types/istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-			"requires": {
-				"@types/istanbul-lib-coverage": "*"
-			}
-		},
-		"@types/istanbul-reports": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-			"integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-			"requires": {
-				"@types/istanbul-lib-report": "*"
-			}
-		},
-		"@types/json-schema": {
-			"version": "7.0.12",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-			"integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
-		},
-		"@types/mdast": {
-			"version": "3.0.12",
-			"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz",
-			"integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==",
-			"requires": {
-				"@types/unist": "^2"
-			}
-		},
-		"@types/mime": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-			"integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
-		},
-		"@types/node": {
-			"version": "20.5.1",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz",
-			"integrity": "sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg=="
-		},
-		"@types/parse-json": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
-		},
-		"@types/parse5": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz",
-			"integrity": "sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="
-		},
-		"@types/prop-types": {
-			"version": "15.7.5",
-			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-			"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-		},
-		"@types/qs": {
-			"version": "6.9.7",
-			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
-		},
-		"@types/range-parser": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
-		},
-		"@types/react": {
-			"version": "18.2.20",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.20.tgz",
-			"integrity": "sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==",
-			"requires": {
-				"@types/prop-types": "*",
-				"@types/scheduler": "*",
-				"csstype": "^3.0.2"
-			}
-		},
-		"@types/react-router": {
-			"version": "5.1.20",
-			"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.20.tgz",
-			"integrity": "sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==",
-			"requires": {
-				"@types/history": "^4.7.11",
-				"@types/react": "*"
-			}
-		},
-		"@types/react-router-config": {
-			"version": "5.0.7",
-			"resolved": "https://registry.npmjs.org/@types/react-router-config/-/react-router-config-5.0.7.tgz",
-			"integrity": "sha512-pFFVXUIydHlcJP6wJm7sDii5mD/bCmmAY0wQzq+M+uX7bqS95AQqHZWP1iNMKrWVQSuHIzj5qi9BvrtLX2/T4w==",
-			"requires": {
-				"@types/history": "^4.7.11",
-				"@types/react": "*",
-				"@types/react-router": "^5.1.0"
-			}
-		},
-		"@types/react-router-dom": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-			"integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
-			"requires": {
-				"@types/history": "^4.7.11",
-				"@types/react": "*",
-				"@types/react-router": "*"
-			}
-		},
-		"@types/retry": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-			"integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
-		},
-		"@types/sax": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.4.tgz",
-			"integrity": "sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==",
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/scheduler": {
-			"version": "0.16.3",
-			"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
-			"integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
-		},
-		"@types/send": {
-			"version": "0.17.1",
-			"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
-			"integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
-			"requires": {
-				"@types/mime": "^1",
-				"@types/node": "*"
-			}
-		},
-		"@types/serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-			"requires": {
-				"@types/express": "*"
-			}
-		},
-		"@types/serve-static": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
-			"integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
-			"requires": {
-				"@types/http-errors": "*",
-				"@types/mime": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/sockjs": {
-			"version": "0.3.33",
-			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-			"integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/unist": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz",
-			"integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g=="
-		},
-		"@types/ws": {
-			"version": "8.5.5",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
-			"integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/yargs": {
-			"version": "17.0.24",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
-			"integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
-			"requires": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"@types/yargs-parser": {
-			"version": "21.0.0",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-			"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
-		},
-		"@webassemblyjs/ast": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-			"integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
-			"requires": {
-				"@webassemblyjs/helper-numbers": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
-			}
-		},
-		"@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-			"integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
-		},
-		"@webassemblyjs/helper-api-error": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
-		},
-		"@webassemblyjs/helper-buffer": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-			"integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
-		},
-		"@webassemblyjs/helper-numbers": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-			"integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
-			"requires": {
-				"@webassemblyjs/floating-point-hex-parser": "1.11.6",
-				"@webassemblyjs/helper-api-error": "1.11.6",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-			"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
-		},
-		"@webassemblyjs/helper-wasm-section": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-			"integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
-			"requires": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6"
-			}
-		},
-		"@webassemblyjs/ieee754": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-			"integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
-			"requires": {
-				"@xtuc/ieee754": "^1.2.0"
-			}
-		},
-		"@webassemblyjs/leb128": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-			"integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
-			"requires": {
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"@webassemblyjs/utf8": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-			"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
-		},
-		"@webassemblyjs/wasm-edit": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-			"integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
-			"requires": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/helper-wasm-section": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6",
-				"@webassemblyjs/wasm-opt": "1.11.6",
-				"@webassemblyjs/wasm-parser": "1.11.6",
-				"@webassemblyjs/wast-printer": "1.11.6"
-			}
-		},
-		"@webassemblyjs/wasm-gen": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-			"integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
-			"requires": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/ieee754": "1.11.6",
-				"@webassemblyjs/leb128": "1.11.6",
-				"@webassemblyjs/utf8": "1.11.6"
-			}
-		},
-		"@webassemblyjs/wasm-opt": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-			"integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
-			"requires": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6",
-				"@webassemblyjs/wasm-parser": "1.11.6"
-			}
-		},
-		"@webassemblyjs/wasm-parser": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-			"integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
-			"requires": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-api-error": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/ieee754": "1.11.6",
-				"@webassemblyjs/leb128": "1.11.6",
-				"@webassemblyjs/utf8": "1.11.6"
-			}
-		},
-		"@webassemblyjs/wast-printer": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-			"integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
-			"requires": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"@xtuc/ieee754": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
-		},
-		"@xtuc/long": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
-		},
-		"abbrev": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-		},
-		"accepts": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-			"requires": {
-				"mime-types": "~2.1.34",
-				"negotiator": "0.6.3"
-			},
-			"dependencies": {
-				"mime-db": {
-					"version": "1.52.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-					"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-				},
-				"mime-types": {
-					"version": "2.1.35",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-					"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-					"requires": {
-						"mime-db": "1.52.0"
-					}
-				}
-			}
-		},
-		"acorn": {
-			"version": "8.10.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-			"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
-		},
-		"acorn-import-assertions": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-			"requires": {}
-		},
-		"acorn-walk": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-			"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="
-		},
-		"address": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
-			"integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA=="
-		},
-		"aggregate-error": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-			"integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-			"requires": {
-				"clean-stack": "^2.0.0",
-				"indent-string": "^4.0.0"
-			}
-		},
-		"ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"requires": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			}
-		},
-		"ajv-formats": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-			"requires": {
-				"ajv": "^8.0.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-				}
-			}
-		},
-		"ajv-keywords": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-			"requires": {}
-		},
-		"algoliasearch": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.19.1.tgz",
-			"integrity": "sha512-IJF5b93b2MgAzcE/tuzW0yOPnuUyRgGAtaPv5UUywXM8kzqfdwZTO4sPJBzoGz1eOy6H9uEchsJsBFTELZSu+g==",
-			"requires": {
-				"@algolia/cache-browser-local-storage": "4.19.1",
-				"@algolia/cache-common": "4.19.1",
-				"@algolia/cache-in-memory": "4.19.1",
-				"@algolia/client-account": "4.19.1",
-				"@algolia/client-analytics": "4.19.1",
-				"@algolia/client-common": "4.19.1",
-				"@algolia/client-personalization": "4.19.1",
-				"@algolia/client-search": "4.19.1",
-				"@algolia/logger-common": "4.19.1",
-				"@algolia/logger-console": "4.19.1",
-				"@algolia/requester-browser-xhr": "4.19.1",
-				"@algolia/requester-common": "4.19.1",
-				"@algolia/requester-node-http": "4.19.1",
-				"@algolia/transporter": "4.19.1"
-			}
-		},
-		"algoliasearch-helper": {
-			"version": "3.14.0",
-			"resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.14.0.tgz",
-			"integrity": "sha512-gXDXzsSS0YANn5dHr71CUXOo84cN4azhHKUbg71vAWnH+1JBiR4jf7to3t3JHXknXkbV0F7f055vUSBKrltHLQ==",
-			"requires": {
-				"@algolia/events": "^4.0.1"
-			}
-		},
-		"ansi-align": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-			"integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-			"requires": {
-				"string-width": "^4.1.0"
-			},
-			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
-			}
-		},
-		"ansi-html-community": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-			"integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="
-		},
-		"ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-		},
-		"ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"requires": {
-				"color-convert": "^2.0.1"
-			}
-		},
-		"anymatch": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-			"requires": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			}
-		},
-		"aproba": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-			"integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
-		},
-		"arg": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-			"integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
-		},
-		"argparse": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-		},
-		"array-flatten": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-		},
-		"array-union": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
-		},
-		"asap": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-			"integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
-		},
-		"at-least-node": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-			"integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
-		},
-		"autocomplete.js": {
-			"version": "0.37.1",
-			"resolved": "https://registry.npmjs.org/autocomplete.js/-/autocomplete.js-0.37.1.tgz",
-			"integrity": "sha512-PgSe9fHYhZEsm/9jggbjtVsGXJkPLvd+9mC7gZJ662vVL5CRWEtm/mIrrzCx0MrNxHVwxD5d00UOn6NsmL2LUQ==",
-			"requires": {
-				"immediate": "^3.2.3"
-			}
-		},
-		"autoprefixer": {
-			"version": "10.4.15",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz",
-			"integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==",
-			"requires": {
-				"browserslist": "^4.21.10",
-				"caniuse-lite": "^1.0.30001520",
-				"fraction.js": "^4.2.0",
-				"normalize-range": "^0.1.2",
-				"picocolors": "^1.0.0",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"axios": {
-			"version": "0.25.0",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
-			"integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
-			"requires": {
-				"follow-redirects": "^1.14.7"
-			}
-		},
-		"babel-loader": {
-			"version": "8.3.0",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
-			"integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
-			"requires": {
-				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^2.0.0",
-				"make-dir": "^3.1.0",
-				"schema-utils": "^2.6.5"
-			}
-		},
-		"babel-plugin-apply-mdx-type-prop": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz",
-			"integrity": "sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "7.10.4",
-				"@mdx-js/util": "1.6.22"
-			},
-			"dependencies": {
-				"@babel/helper-plugin-utils": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-					"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
-				}
-			}
-		},
-		"babel-plugin-dynamic-import-node": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-			"integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-			"requires": {
-				"object.assign": "^4.1.0"
-			}
-		},
-		"babel-plugin-extract-import-names": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz",
-			"integrity": "sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==",
-			"requires": {
-				"@babel/helper-plugin-utils": "7.10.4"
-			},
-			"dependencies": {
-				"@babel/helper-plugin-utils": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-					"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
-				}
-			}
-		},
-		"babel-plugin-polyfill-corejs2": {
-			"version": "0.4.5",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
-			"integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
-			"requires": {
-				"@babel/compat-data": "^7.22.6",
-				"@babel/helper-define-polyfill-provider": "^0.4.2",
-				"semver": "^6.3.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
-			}
-		},
-		"babel-plugin-polyfill-corejs3": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
-			"integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.4.2",
-				"core-js-compat": "^3.31.0"
-			}
-		},
-		"babel-plugin-polyfill-regenerator": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
-			"integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.4.2"
-			}
-		},
-		"bail": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-			"integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ=="
-		},
-		"balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-		},
-		"base16": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz",
-			"integrity": "sha512-pNdYkNPiJUnEhnfXV56+sQy8+AaPcG3POZAUnwr4EeqCUZFz4u2PePbo3e5Gj4ziYPCWGUZT9RHisvJKnwFuBQ=="
-		},
-		"batch": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
-		},
-		"bcp-47-match": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/bcp-47-match/-/bcp-47-match-1.0.3.tgz",
-			"integrity": "sha512-LggQ4YTdjWQSKELZF5JwchnBa1u0pIQSZf5lSdOHEdbVP55h0qICA/FUp3+W99q0xqxYa1ZQizTUH87gecII5w=="
-		},
-		"big.js": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
-		},
-		"binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
-		},
-		"body-parser": {
-			"version": "1.20.1",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-			"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-			"requires": {
-				"bytes": "3.1.2",
-				"content-type": "~1.0.4",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"on-finished": "2.4.1",
-				"qs": "6.11.0",
-				"raw-body": "2.5.1",
-				"type-is": "~1.6.18",
-				"unpipe": "1.0.0"
-			},
-			"dependencies": {
-				"bytes": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-					"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-				}
-			}
-		},
-		"bonjour-service": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
-			"integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
-			"requires": {
-				"array-flatten": "^2.1.2",
-				"dns-equal": "^1.0.0",
-				"fast-deep-equal": "^3.1.3",
-				"multicast-dns": "^7.2.5"
-			}
-		},
-		"boolbase": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
-		},
-		"boxen": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/boxen/-/boxen-6.2.1.tgz",
-			"integrity": "sha512-H4PEsJXfFI/Pt8sjDWbHlQPx4zL/bvSQjcilJmaulGt5mLDorHOHpmdXAJcBcmru7PhYSp/cDMWRko4ZUMFkSw==",
-			"requires": {
-				"ansi-align": "^3.0.1",
-				"camelcase": "^6.2.0",
-				"chalk": "^4.1.2",
-				"cli-boxes": "^3.0.0",
-				"string-width": "^5.0.1",
-				"type-fest": "^2.5.0",
-				"widest-line": "^4.0.1",
-				"wrap-ansi": "^8.0.1"
-			}
-		},
-		"brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"requires": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-			"requires": {
-				"fill-range": "^7.0.1"
-			}
-		},
-		"browserslist": {
-			"version": "4.21.10",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-			"integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
-			"requires": {
-				"caniuse-lite": "^1.0.30001517",
-				"electron-to-chromium": "^1.4.477",
-				"node-releases": "^2.0.13",
-				"update-browserslist-db": "^1.0.11"
-			}
-		},
-		"buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-		},
-		"bytes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
-		},
-		"cacheable-request": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-			"integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-			"requires": {
-				"clone-response": "^1.0.2",
-				"get-stream": "^5.1.0",
-				"http-cache-semantics": "^4.0.0",
-				"keyv": "^3.0.0",
-				"lowercase-keys": "^2.0.0",
-				"normalize-url": "^4.1.0",
-				"responselike": "^1.0.2"
-			},
-			"dependencies": {
-				"get-stream": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-					"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"lowercase-keys": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-					"integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
-				},
-				"normalize-url": {
-					"version": "4.5.1",
-					"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-					"integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="
-				}
-			}
-		},
-		"call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"requires": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
-			}
-		},
-		"callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-		},
-		"camel-case": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-			"integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-			"requires": {
-				"pascal-case": "^3.1.2",
-				"tslib": "^2.0.3"
-			}
-		},
-		"camelcase": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
-		},
-		"camelcase-css": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-			"integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="
-		},
-		"caniuse-api": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-lite": "^1.0.0",
-				"lodash.memoize": "^4.1.2",
-				"lodash.uniq": "^4.5.0"
-			}
-		},
-		"caniuse-lite": {
-			"version": "1.0.30001522",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz",
-			"integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg=="
-		},
-		"ccount": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
-			"integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="
-		},
-		"chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"requires": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			}
-		},
-		"character-entities": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-			"integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw=="
-		},
-		"character-entities-legacy": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-			"integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA=="
-		},
-		"character-reference-invalid": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-			"integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg=="
-		},
-		"cheerio": {
-			"version": "1.0.0-rc.12",
-			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
-			"integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
-			"requires": {
-				"cheerio-select": "^2.1.0",
-				"dom-serializer": "^2.0.0",
-				"domhandler": "^5.0.3",
-				"domutils": "^3.0.1",
-				"htmlparser2": "^8.0.1",
-				"parse5": "^7.0.0",
-				"parse5-htmlparser2-tree-adapter": "^7.0.0"
-			}
-		},
-		"cheerio-select": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
-			"integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
-			"requires": {
-				"boolbase": "^1.0.0",
-				"css-select": "^5.1.0",
-				"css-what": "^6.1.0",
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.3",
-				"domutils": "^3.0.1"
-			}
-		},
-		"chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-			"requires": {
-				"anymatch": "~3.1.2",
-				"braces": "~3.0.2",
-				"fsevents": "~2.3.2",
-				"glob-parent": "~5.1.2",
-				"is-binary-path": "~2.1.0",
-				"is-glob": "~4.0.1",
-				"normalize-path": "~3.0.0",
-				"readdirp": "~3.6.0"
-			}
-		},
-		"chrome-trace-event": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
-		},
-		"ci-info": {
-			"version": "3.8.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-			"integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="
-		},
-		"clean-css": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
-			"integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
-			"requires": {
-				"source-map": "~0.6.0"
-			}
-		},
-		"clean-stack": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-			"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
-		},
-		"cli-boxes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",
-			"integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g=="
-		},
-		"cli-table3": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
-			"integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
-			"requires": {
-				"@colors/colors": "1.5.0",
-				"string-width": "^4.2.0"
-			},
-			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
-			}
-		},
-		"clone-deep": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-			"requires": {
-				"is-plain-object": "^2.0.4",
-				"kind-of": "^6.0.2",
-				"shallow-clone": "^3.0.0"
-			}
-		},
-		"clone-response": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-			"integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-			"requires": {
-				"mimic-response": "^1.0.0"
-			}
-		},
-		"clsx": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-			"integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
-		},
-		"collapse-white-space": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-			"integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ=="
-		},
-		"color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"requires": {
-				"color-name": "~1.1.4"
-			}
-		},
-		"color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-		},
-		"color-support": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
-		},
-		"colord": {
-			"version": "2.9.3",
-			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
-		},
-		"colorette": {
-			"version": "2.0.20",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
-		},
-		"combine-promises": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/combine-promises/-/combine-promises-1.2.0.tgz",
-			"integrity": "sha512-VcQB1ziGD0NXrhKxiwyNbCDmRzs/OShMs2GqW2DlU2A/Sd0nQxE1oWDAE5O0ygSx5mgQOn9eIFh7yKPgFRVkPQ=="
-		},
-		"comma-separated-tokens": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
-			"integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw=="
-		},
-		"commander": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-			"integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
-		},
-		"compressible": {
-			"version": "2.0.18",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-			"integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-			"requires": {
-				"mime-db": ">= 1.43.0 < 2"
-			},
-			"dependencies": {
-				"mime-db": {
-					"version": "1.52.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-					"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-				}
-			}
-		},
-		"compression": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.16",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.2",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				}
-			}
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-		},
-		"configstore": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-			"integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-			"requires": {
-				"dot-prop": "^5.2.0",
-				"graceful-fs": "^4.1.2",
-				"make-dir": "^3.0.0",
-				"unique-string": "^2.0.0",
-				"write-file-atomic": "^3.0.0",
-				"xdg-basedir": "^4.0.0"
-			}
-		},
-		"connect-history-api-fallback": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-			"integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="
-		},
-		"consola": {
-			"version": "2.15.3",
-			"resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
-			"integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw=="
-		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
-		},
-		"content-disposition": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-			"integrity": "sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA=="
-		},
-		"content-type": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
-		},
-		"convert-source-map": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-		},
-		"cookie": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
-		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-		},
-		"copy-text-to-clipboard": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz",
-			"integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q=="
-		},
-		"copy-webpack-plugin": {
-			"version": "11.0.0",
-			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-			"integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
-			"requires": {
-				"fast-glob": "^3.2.11",
-				"glob-parent": "^6.0.1",
-				"globby": "^13.1.1",
-				"normalize-path": "^3.0.0",
-				"schema-utils": "^4.0.0",
-				"serialize-javascript": "^6.0.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"glob-parent": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-					"requires": {
-						"is-glob": "^4.0.3"
-					}
-				},
-				"globby": {
-					"version": "13.2.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-					"integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
-					"requires": {
-						"dir-glob": "^3.0.1",
-						"fast-glob": "^3.3.0",
-						"ignore": "^5.2.4",
-						"merge2": "^1.4.1",
-						"slash": "^4.0.0"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-				},
-				"schema-utils": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-					"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.9.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.1.0"
-					}
-				},
-				"slash": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-					"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="
-				}
-			}
-		},
-		"core-js": {
-			"version": "3.32.1",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
-			"integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ=="
-		},
-		"core-js-compat": {
-			"version": "3.32.1",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz",
-			"integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==",
-			"requires": {
-				"browserslist": "^4.21.10"
-			}
-		},
-		"core-js-pure": {
-			"version": "3.32.1",
-			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.1.tgz",
-			"integrity": "sha512-f52QZwkFVDPf7UEQZGHKx6NYxsxmVGJe5DIvbzOdRMJlmT6yv0KDjR8rmy3ngr/t5wU54c7Sp/qIJH0ppbhVpQ=="
-		},
-		"core-util-is": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-		},
-		"cosmiconfig": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-			"requires": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.2.1",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.10.0"
-			}
-		},
-		"cross-fetch": {
-			"version": "3.1.8",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-			"integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
-			"requires": {
-				"node-fetch": "^2.6.12"
-			}
-		},
-		"cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"requires": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			}
-		},
-		"crypto-random-string": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-			"integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
-		},
-		"css-declaration-sorter": {
-			"version": "6.4.1",
-			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
-			"integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
-			"requires": {}
-		},
-		"css-loader": {
-			"version": "6.8.1",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-			"integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
-			"requires": {
-				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.21",
-				"postcss-modules-extract-imports": "^3.0.0",
-				"postcss-modules-local-by-default": "^4.0.3",
-				"postcss-modules-scope": "^3.0.0",
-				"postcss-modules-values": "^4.0.0",
-				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.3.8"
-			}
-		},
-		"css-minimizer-webpack-plugin": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.2.2.tgz",
-			"integrity": "sha512-s3Of/4jKfw1Hj9CxEO1E5oXhQAxlayuHO2y/ML+C6I9sQ7FdzfEV6QgMLN3vI+qFsjJGIAFLKtQK7t8BOXAIyA==",
-			"requires": {
-				"cssnano": "^5.1.8",
-				"jest-worker": "^29.1.2",
-				"postcss": "^8.4.17",
-				"schema-utils": "^4.0.0",
-				"serialize-javascript": "^6.0.0",
-				"source-map": "^0.6.1"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-				},
-				"schema-utils": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-					"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.9.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.1.0"
-					}
-				}
-			}
-		},
-		"css-select": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-			"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-			"requires": {
-				"boolbase": "^1.0.0",
-				"css-what": "^6.1.0",
-				"domhandler": "^5.0.2",
-				"domutils": "^3.0.1",
-				"nth-check": "^2.0.1"
-			}
-		},
-		"css-selector-parser": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.4.1.tgz",
-			"integrity": "sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g=="
-		},
-		"css-tree": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-			"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-			"requires": {
-				"mdn-data": "2.0.14",
-				"source-map": "^0.6.1"
-			}
-		},
-		"css-what": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
-		},
-		"cssesc": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
-		},
-		"cssnano": {
-			"version": "5.1.15",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
-			"integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
-			"requires": {
-				"cssnano-preset-default": "^5.2.14",
-				"lilconfig": "^2.0.3",
-				"yaml": "^1.10.2"
-			}
-		},
-		"cssnano-preset-advanced": {
-			"version": "5.3.10",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.10.tgz",
-			"integrity": "sha512-fnYJyCS9jgMU+cmHO1rPSPf9axbQyD7iUhLO5Df6O4G+fKIOMps+ZbU0PdGFejFBBZ3Pftf18fn1eG7MAPUSWQ==",
-			"requires": {
-				"autoprefixer": "^10.4.12",
-				"cssnano-preset-default": "^5.2.14",
-				"postcss-discard-unused": "^5.1.0",
-				"postcss-merge-idents": "^5.1.1",
-				"postcss-reduce-idents": "^5.2.0",
-				"postcss-zindex": "^5.1.0"
-			}
-		},
-		"cssnano-preset-default": {
-			"version": "5.2.14",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
-			"integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
-			"requires": {
-				"css-declaration-sorter": "^6.3.1",
-				"cssnano-utils": "^3.1.0",
-				"postcss-calc": "^8.2.3",
-				"postcss-colormin": "^5.3.1",
-				"postcss-convert-values": "^5.1.3",
-				"postcss-discard-comments": "^5.1.2",
-				"postcss-discard-duplicates": "^5.1.0",
-				"postcss-discard-empty": "^5.1.1",
-				"postcss-discard-overridden": "^5.1.0",
-				"postcss-merge-longhand": "^5.1.7",
-				"postcss-merge-rules": "^5.1.4",
-				"postcss-minify-font-values": "^5.1.0",
-				"postcss-minify-gradients": "^5.1.1",
-				"postcss-minify-params": "^5.1.4",
-				"postcss-minify-selectors": "^5.2.1",
-				"postcss-normalize-charset": "^5.1.0",
-				"postcss-normalize-display-values": "^5.1.0",
-				"postcss-normalize-positions": "^5.1.1",
-				"postcss-normalize-repeat-style": "^5.1.1",
-				"postcss-normalize-string": "^5.1.0",
-				"postcss-normalize-timing-functions": "^5.1.0",
-				"postcss-normalize-unicode": "^5.1.1",
-				"postcss-normalize-url": "^5.1.0",
-				"postcss-normalize-whitespace": "^5.1.1",
-				"postcss-ordered-values": "^5.1.3",
-				"postcss-reduce-initial": "^5.1.2",
-				"postcss-reduce-transforms": "^5.1.0",
-				"postcss-svgo": "^5.1.0",
-				"postcss-unique-selectors": "^5.1.1"
-			}
-		},
-		"cssnano-utils": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-			"integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-			"requires": {}
-		},
-		"csso": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-			"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-			"requires": {
-				"css-tree": "^1.1.2"
-			}
-		},
-		"csstype": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-			"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
-		},
-		"debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-			"requires": {
-				"ms": "2.1.2"
-			}
-		},
-		"decompress-response": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-			"integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
-			"requires": {
-				"mimic-response": "^1.0.0"
-			}
-		},
-		"deep-extend": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
-		},
-		"deepmerge": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
-		},
-		"default-gateway": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-			"integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-			"requires": {
-				"execa": "^5.0.0"
-			}
-		},
-		"defer-to-connect": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-			"integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
-		},
-		"define-lazy-prop": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-			"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
-		},
-		"define-properties": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-			"integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-			"requires": {
-				"has-property-descriptors": "^1.0.0",
-				"object-keys": "^1.1.1"
-			}
-		},
-		"del": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
-			"integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
-			"requires": {
-				"globby": "^11.0.1",
-				"graceful-fs": "^4.2.4",
-				"is-glob": "^4.0.1",
-				"is-path-cwd": "^2.2.0",
-				"is-path-inside": "^3.0.2",
-				"p-map": "^4.0.0",
-				"rimraf": "^3.0.2",
-				"slash": "^3.0.0"
-			}
-		},
-		"depd": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-		},
-		"destroy": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-		},
-		"detab": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/detab/-/detab-2.0.4.tgz",
-			"integrity": "sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==",
-			"requires": {
-				"repeat-string": "^1.5.4"
-			}
-		},
-		"detect-node": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-		},
-		"detect-port": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.5.1.tgz",
-			"integrity": "sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==",
-			"requires": {
-				"address": "^1.0.1",
-				"debug": "4"
-			}
-		},
-		"detect-port-alt": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-			"integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
-			"requires": {
-				"address": "^1.0.1",
-				"debug": "^2.6.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-				}
-			}
-		},
-		"dir-glob": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-			"requires": {
-				"path-type": "^4.0.0"
-			}
-		},
-		"direction": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/direction/-/direction-1.0.4.tgz",
-			"integrity": "sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ=="
-		},
-		"dns-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
-		},
-		"dns-packet": {
-			"version": "5.6.0",
-			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
-			"integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
-			"requires": {
-				"@leichtgewicht/ip-codec": "^2.0.1"
-			}
-		},
-		"docusaurus-lunr-search": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/docusaurus-lunr-search/-/docusaurus-lunr-search-2.4.1.tgz",
-			"integrity": "sha512-UOgaAypgO0iLyA1Hk4EThG/ofLm9/JldznzN98ZKr7TMYVjMZbAEaIBKLAUDFdfOPr9D5EswXdLn39/aRkwHMA==",
-			"requires": {
-				"autocomplete.js": "^0.37.0",
-				"clsx": "^1.2.1",
-				"gauge": "^3.0.0",
-				"hast-util-select": "^4.0.0",
-				"hast-util-to-text": "^2.0.0",
-				"hogan.js": "^3.0.2",
-				"lunr": "^2.3.8",
-				"lunr-languages": "^1.4.0",
-				"minimatch": "^3.0.4",
-				"object-assign": "^4.1.1",
-				"rehype-parse": "^7.0.1",
-				"to-vfile": "^6.1.0",
-				"unified": "^9.0.0",
-				"unist-util-is": "^4.0.2"
-			}
-		},
-		"dom-converter": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-			"integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-			"requires": {
-				"utila": "~0.4"
-			}
-		},
-		"dom-serializer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-			"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-			"requires": {
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.2",
-				"entities": "^4.2.0"
-			}
-		},
-		"domelementtype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-		},
-		"domhandler": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-			"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-			"requires": {
-				"domelementtype": "^2.3.0"
-			}
-		},
-		"domutils": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-			"integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-			"requires": {
-				"dom-serializer": "^2.0.0",
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.3"
-			}
-		},
-		"dot-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-			"integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-			"requires": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3"
-			}
-		},
-		"dot-prop": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-			"integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-			"requires": {
-				"is-obj": "^2.0.0"
-			},
-			"dependencies": {
-				"is-obj": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-					"integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
-				}
-			}
-		},
-		"duplexer": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
-		},
-		"duplexer3": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
-			"integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="
-		},
-		"eastasianwidth": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-			"integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
-		},
-		"ee-first": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-		},
-		"electron-to-chromium": {
-			"version": "1.4.498",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.498.tgz",
-			"integrity": "sha512-4LODxAzKGVy7CJyhhN5mebwe7U2L29P+0G+HUriHnabm0d7LSff8Yn7t+Wq+2/9ze2Fu1dhX7mww090xfv7qXQ=="
-		},
-		"emoji-regex": {
-			"version": "9.2.2",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-			"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
-		},
-		"emojis-list": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
-		},
-		"emoticon": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/emoticon/-/emoticon-3.2.0.tgz",
-			"integrity": "sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg=="
-		},
-		"encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-		},
-		"end-of-stream": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-			"requires": {
-				"once": "^1.4.0"
-			}
-		},
-		"enhanced-resolve": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-			"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
-			"requires": {
-				"graceful-fs": "^4.2.4",
-				"tapable": "^2.2.0"
-			}
-		},
-		"entities": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
-		},
-		"error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"requires": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
-		"es-module-lexer": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
-			"integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="
-		},
-		"escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-		},
-		"escape-goat": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-			"integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="
-		},
-		"escape-html": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-		},
-		"escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-		},
-		"eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-			"requires": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
-			}
-		},
-		"esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-		},
-		"esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-			"requires": {
-				"estraverse": "^5.2.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-				}
-			}
-		},
-		"estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
-		},
-		"esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-		},
-		"eta": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/eta/-/eta-2.2.0.tgz",
-			"integrity": "sha512-UVQ72Rqjy/ZKQalzV5dCCJP80GrmPrMxh6NlNf+erV6ObL0ZFkhCstWRawS85z3smdr3d2wXPsZEY7rDPfGd2g=="
-		},
-		"etag": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
-		},
-		"eval": {
-			"version": "0.1.8",
-			"resolved": "https://registry.npmjs.org/eval/-/eval-0.1.8.tgz",
-			"integrity": "sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==",
-			"requires": {
-				"@types/node": "*",
-				"require-like": ">= 0.1.1"
-			}
-		},
-		"eventemitter3": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-		},
-		"events": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
-		},
-		"execa": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"requires": {
-				"cross-spawn": "^7.0.3",
-				"get-stream": "^6.0.0",
-				"human-signals": "^2.1.0",
-				"is-stream": "^2.0.0",
-				"merge-stream": "^2.0.0",
-				"npm-run-path": "^4.0.1",
-				"onetime": "^5.1.2",
-				"signal-exit": "^3.0.3",
-				"strip-final-newline": "^2.0.0"
-			},
-			"dependencies": {
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
-				}
-			}
-		},
-		"express": {
-			"version": "4.18.2",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-			"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-			"requires": {
-				"accepts": "~1.3.8",
-				"array-flatten": "1.1.1",
-				"body-parser": "1.20.1",
-				"content-disposition": "0.5.4",
-				"content-type": "~1.0.4",
-				"cookie": "0.5.0",
-				"cookie-signature": "1.0.6",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"finalhandler": "1.2.0",
-				"fresh": "0.5.2",
-				"http-errors": "2.0.0",
-				"merge-descriptors": "1.0.1",
-				"methods": "~1.1.2",
-				"on-finished": "2.4.1",
-				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.7",
-				"proxy-addr": "~2.0.7",
-				"qs": "6.11.0",
-				"range-parser": "~1.2.1",
-				"safe-buffer": "5.2.1",
-				"send": "0.18.0",
-				"serve-static": "1.15.0",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"type-is": "~1.6.18",
-				"utils-merge": "1.0.1",
-				"vary": "~1.1.2"
-			},
-			"dependencies": {
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-				},
-				"content-disposition": {
-					"version": "0.5.4",
-					"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-					"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-					"requires": {
-						"safe-buffer": "5.2.1"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-				},
-				"path-to-regexp": {
-					"version": "0.1.7",
-					"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-					"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
-				},
-				"range-parser": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-					"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-				}
-			}
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-		},
-		"extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-			"requires": {
-				"is-extendable": "^0.1.0"
-			}
-		},
-		"fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-		},
-		"fast-glob": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-			"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-			"requires": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.2",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.4"
-			}
-		},
-		"fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-		},
-		"fast-url-parser": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
-			"integrity": "sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==",
-			"requires": {
-				"punycode": "^1.3.2"
-			}
-		},
-		"fastq": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-			"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-			"requires": {
-				"reusify": "^1.0.4"
-			}
-		},
-		"faye-websocket": {
-			"version": "0.11.4",
-			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-			"integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-			"requires": {
-				"websocket-driver": ">=0.5.1"
-			}
-		},
-		"fbemitter": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz",
-			"integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==",
-			"requires": {
-				"fbjs": "^3.0.0"
-			}
-		},
-		"fbjs": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz",
-			"integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==",
-			"requires": {
-				"cross-fetch": "^3.1.5",
-				"fbjs-css-vars": "^1.0.0",
-				"loose-envify": "^1.0.0",
-				"object-assign": "^4.1.0",
-				"promise": "^7.1.1",
-				"setimmediate": "^1.0.5",
-				"ua-parser-js": "^1.0.35"
-			}
-		},
-		"fbjs-css-vars": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz",
-			"integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="
-		},
-		"feed": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/feed/-/feed-4.2.2.tgz",
-			"integrity": "sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ==",
-			"requires": {
-				"xml-js": "^1.6.11"
-			}
-		},
-		"file-loader": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-			"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-			"requires": {
-				"loader-utils": "^2.0.0",
-				"schema-utils": "^3.0.0"
-			},
-			"dependencies": {
-				"schema-utils": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-					"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
-				}
-			}
-		},
-		"filesize": {
-			"version": "8.0.7",
-			"resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
-			"integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ=="
-		},
-		"fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-			"requires": {
-				"to-regex-range": "^5.0.1"
-			}
-		},
-		"finalhandler": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-			"requires": {
-				"debug": "2.6.9",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"on-finished": "2.4.1",
-				"parseurl": "~1.3.3",
-				"statuses": "2.0.1",
-				"unpipe": "~1.0.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-				}
-			}
-		},
-		"find-cache-dir": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-			"requires": {
-				"commondir": "^1.0.1",
-				"make-dir": "^3.0.2",
-				"pkg-dir": "^4.1.0"
-			}
-		},
-		"find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"requires": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			}
-		},
-		"flux": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/flux/-/flux-4.0.4.tgz",
-			"integrity": "sha512-NCj3XlayA2UsapRpM7va6wU1+9rE5FIL7qoMcmxWHRzbp0yujihMBm9BBHZ1MDIk5h5o2Bl6eGiCe8rYELAmYw==",
-			"requires": {
-				"fbemitter": "^3.0.0",
-				"fbjs": "^3.0.1"
-			}
-		},
-		"follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
-		},
-		"fork-ts-checker-webpack-plugin": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz",
-			"integrity": "sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==",
-			"requires": {
-				"@babel/code-frame": "^7.8.3",
-				"@types/json-schema": "^7.0.5",
-				"chalk": "^4.1.0",
-				"chokidar": "^3.4.2",
-				"cosmiconfig": "^6.0.0",
-				"deepmerge": "^4.2.2",
-				"fs-extra": "^9.0.0",
-				"glob": "^7.1.6",
-				"memfs": "^3.1.2",
-				"minimatch": "^3.0.4",
-				"schema-utils": "2.7.0",
-				"semver": "^7.3.2",
-				"tapable": "^1.0.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-					"integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-					"requires": {
-						"@types/parse-json": "^4.0.0",
-						"import-fresh": "^3.1.0",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0",
-						"yaml": "^1.7.2"
-					}
-				},
-				"fs-extra": {
-					"version": "9.1.0",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-					"integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-					"requires": {
-						"at-least-node": "^1.0.0",
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^6.0.1",
-						"universalify": "^2.0.0"
-					}
-				},
-				"schema-utils": {
-					"version": "2.7.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-					"integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-					"requires": {
-						"@types/json-schema": "^7.0.4",
-						"ajv": "^6.12.2",
-						"ajv-keywords": "^3.4.1"
-					}
-				},
-				"tapable": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-					"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
-				}
-			}
-		},
-		"forwarded": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
-		},
-		"fraction.js": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.1.tgz",
-			"integrity": "sha512-/KxoyCnPM0GwYI4NN0Iag38Tqt+od3/mLuguepLgCAKPn0ZhC544nssAW0tG2/00zXEYl9W+7hwAIpLHo6Oc7Q=="
-		},
-		"fresh": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
-		},
-		"fs-extra": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-			"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-			"requires": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^6.0.1",
-				"universalify": "^2.0.0"
-			}
-		},
-		"fs-monkey": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
-			"integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ=="
-		},
-		"fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-		},
-		"fsevents": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-			"optional": true
-		},
-		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-		},
-		"gauge": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-			"integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-			"requires": {
-				"aproba": "^1.0.3 || ^2.0.0",
-				"color-support": "^1.1.2",
-				"console-control-strings": "^1.0.0",
-				"has-unicode": "^2.0.1",
-				"object-assign": "^4.1.1",
-				"signal-exit": "^3.0.0",
-				"string-width": "^4.2.3",
-				"strip-ansi": "^6.0.1",
-				"wide-align": "^1.1.2"
-			},
-			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
-			}
-		},
-		"gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
-		},
-		"get-intrinsic": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-			"integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-			"requires": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3"
-			}
-		},
-		"get-own-enumerable-property-symbols": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-			"integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
-		},
-		"get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-			"requires": {
-				"pump": "^3.0.0"
-			}
-		},
-		"github-slugger": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.5.0.tgz",
-			"integrity": "sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw=="
-		},
-		"glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
-		"glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"requires": {
-				"is-glob": "^4.0.1"
-			}
-		},
-		"glob-to-regexp": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-		},
-		"global-dirs": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
-			"integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
-			"requires": {
-				"ini": "2.0.0"
-			},
-			"dependencies": {
-				"ini": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-					"integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="
-				}
-			}
-		},
-		"global-modules": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-			"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-			"requires": {
-				"global-prefix": "^3.0.0"
-			}
-		},
-		"global-prefix": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-			"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-			"requires": {
-				"ini": "^1.3.5",
-				"kind-of": "^6.0.2",
-				"which": "^1.3.1"
-			},
-			"dependencies": {
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-		},
-		"globby": {
-			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-			"requires": {
-				"array-union": "^2.1.0",
-				"dir-glob": "^3.0.1",
-				"fast-glob": "^3.2.9",
-				"ignore": "^5.2.0",
-				"merge2": "^1.4.1",
-				"slash": "^3.0.0"
-			}
-		},
-		"got": {
-			"version": "9.6.0",
-			"resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-			"integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-			"requires": {
-				"@sindresorhus/is": "^0.14.0",
-				"@szmarczak/http-timer": "^1.1.2",
-				"cacheable-request": "^6.0.0",
-				"decompress-response": "^3.3.0",
-				"duplexer3": "^0.1.4",
-				"get-stream": "^4.1.0",
-				"lowercase-keys": "^1.0.1",
-				"mimic-response": "^1.0.1",
-				"p-cancelable": "^1.0.0",
-				"to-readable-stream": "^1.0.0",
-				"url-parse-lax": "^3.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.2.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-		},
-		"gray-matter": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz",
-			"integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==",
-			"requires": {
-				"js-yaml": "^3.13.1",
-				"kind-of": "^6.0.2",
-				"section-matter": "^1.0.0",
-				"strip-bom-string": "^1.0.0"
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "1.0.10",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-					"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-					"requires": {
-						"sprintf-js": "~1.0.2"
-					}
-				},
-				"js-yaml": {
-					"version": "3.14.1",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-					"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-					"requires": {
-						"argparse": "^1.0.7",
-						"esprima": "^4.0.0"
-					}
-				}
-			}
-		},
-		"gzip-size": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-			"integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
-			"requires": {
-				"duplexer": "^0.1.2"
-			}
-		},
-		"handle-thing": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
-		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"requires": {
-				"function-bind": "^1.1.1"
-			}
-		},
-		"has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-		},
-		"has-property-descriptors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-			"requires": {
-				"get-intrinsic": "^1.1.1"
-			}
-		},
-		"has-proto": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
-		},
-		"has-symbols": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
-		},
-		"has-yarn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-			"integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="
-		},
-		"hast-to-hyperscript": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz",
-			"integrity": "sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==",
-			"requires": {
-				"@types/unist": "^2.0.3",
-				"comma-separated-tokens": "^1.0.0",
-				"property-information": "^5.3.0",
-				"space-separated-tokens": "^1.0.0",
-				"style-to-object": "^0.3.0",
-				"unist-util-is": "^4.0.0",
-				"web-namespaces": "^1.0.0"
-			}
-		},
-		"hast-util-from-parse5": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz",
-			"integrity": "sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==",
-			"requires": {
-				"@types/parse5": "^5.0.0",
-				"hastscript": "^6.0.0",
-				"property-information": "^5.0.0",
-				"vfile": "^4.0.0",
-				"vfile-location": "^3.2.0",
-				"web-namespaces": "^1.0.0"
-			}
-		},
-		"hast-util-has-property": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.4.tgz",
-			"integrity": "sha512-ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg=="
-		},
-		"hast-util-is-element": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz",
-			"integrity": "sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ=="
-		},
-		"hast-util-parse-selector": {
-			"version": "2.2.5",
-			"resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz",
-			"integrity": "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ=="
-		},
-		"hast-util-raw": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.1.tgz",
-			"integrity": "sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig==",
-			"requires": {
-				"@types/hast": "^2.0.0",
-				"hast-util-from-parse5": "^6.0.0",
-				"hast-util-to-parse5": "^6.0.0",
-				"html-void-elements": "^1.0.0",
-				"parse5": "^6.0.0",
-				"unist-util-position": "^3.0.0",
-				"vfile": "^4.0.0",
-				"web-namespaces": "^1.0.0",
-				"xtend": "^4.0.0",
-				"zwitch": "^1.0.0"
-			},
-			"dependencies": {
-				"parse5": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-					"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-				}
-			}
-		},
-		"hast-util-select": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/hast-util-select/-/hast-util-select-4.0.2.tgz",
-			"integrity": "sha512-8EEG2//bN5rrzboPWD2HdS3ugLijNioS1pqOTIolXNf67xxShYw4SQEmVXd3imiBG+U2bC2nVTySr/iRAA7Cjg==",
-			"requires": {
-				"bcp-47-match": "^1.0.0",
-				"comma-separated-tokens": "^1.0.0",
-				"css-selector-parser": "^1.0.0",
-				"direction": "^1.0.0",
-				"hast-util-has-property": "^1.0.0",
-				"hast-util-is-element": "^1.0.0",
-				"hast-util-to-string": "^1.0.0",
-				"hast-util-whitespace": "^1.0.0",
-				"not": "^0.1.0",
-				"nth-check": "^2.0.0",
-				"property-information": "^5.0.0",
-				"space-separated-tokens": "^1.0.0",
-				"unist-util-visit": "^2.0.0",
-				"zwitch": "^1.0.0"
-			}
-		},
-		"hast-util-to-parse5": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz",
-			"integrity": "sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==",
-			"requires": {
-				"hast-to-hyperscript": "^9.0.0",
-				"property-information": "^5.0.0",
-				"web-namespaces": "^1.0.0",
-				"xtend": "^4.0.0",
-				"zwitch": "^1.0.0"
-			}
-		},
-		"hast-util-to-string": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.4.tgz",
-			"integrity": "sha512-eK0MxRX47AV2eZ+Lyr18DCpQgodvaS3fAQO2+b9Two9F5HEoRPhiUMNzoXArMJfZi2yieFzUBMRl3HNJ3Jus3w=="
-		},
-		"hast-util-to-text": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-2.0.1.tgz",
-			"integrity": "sha512-8nsgCARfs6VkwH2jJU9b8LNTuR4700na+0h3PqCaEk4MAnMDeu5P0tP8mjk9LLNGxIeQRLbiDbZVw6rku+pYsQ==",
-			"requires": {
-				"hast-util-is-element": "^1.0.0",
-				"repeat-string": "^1.0.0",
-				"unist-util-find-after": "^3.0.0"
-			}
-		},
-		"hast-util-whitespace": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz",
-			"integrity": "sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A=="
-		},
-		"hastscript": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz",
-			"integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==",
-			"requires": {
-				"@types/hast": "^2.0.0",
-				"comma-separated-tokens": "^1.0.0",
-				"hast-util-parse-selector": "^2.0.0",
-				"property-information": "^5.0.0",
-				"space-separated-tokens": "^1.0.0"
-			}
-		},
-		"he": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
-		},
-		"history": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
-			"integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
-			"requires": {
-				"@babel/runtime": "^7.1.2",
-				"loose-envify": "^1.2.0",
-				"resolve-pathname": "^3.0.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0",
-				"value-equal": "^1.0.1"
-			}
-		},
-		"hogan.js": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz",
-			"integrity": "sha512-RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg==",
-			"requires": {
-				"mkdirp": "0.3.0",
-				"nopt": "1.0.10"
-			}
-		},
-		"hoist-non-react-statics": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-			"integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-			"requires": {
-				"react-is": "^16.7.0"
-			}
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-				},
-				"readable-stream": {
-					"version": "2.3.8",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-					"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-					"requires": {
-						"safe-buffer": "~5.1.0"
-					}
-				}
-			}
-		},
-		"html-entities": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-			"integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ=="
-		},
-		"html-minifier-terser": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-			"integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-			"requires": {
-				"camel-case": "^4.1.2",
-				"clean-css": "^5.2.2",
-				"commander": "^8.3.0",
-				"he": "^1.2.0",
-				"param-case": "^3.0.4",
-				"relateurl": "^0.2.7",
-				"terser": "^5.10.0"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "8.3.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-					"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
-				}
-			}
-		},
-		"html-tags": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
-			"integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ=="
-		},
-		"html-void-elements": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
-			"integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w=="
-		},
-		"html-webpack-plugin": {
-			"version": "5.5.3",
-			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
-			"integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
-			"requires": {
-				"@types/html-minifier-terser": "^6.0.0",
-				"html-minifier-terser": "^6.0.2",
-				"lodash": "^4.17.21",
-				"pretty-error": "^4.0.0",
-				"tapable": "^2.0.0"
-			}
-		},
-		"htmlparser2": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-			"integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-			"requires": {
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.3",
-				"domutils": "^3.0.1",
-				"entities": "^4.4.0"
-			}
-		},
-		"http-cache-semantics": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-			"integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
-		},
-		"http-deceiver": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
-		},
-		"http-errors": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-			"requires": {
-				"depd": "2.0.0",
-				"inherits": "2.0.4",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"toidentifier": "1.0.1"
-			}
-		},
-		"http-parser-js": {
-			"version": "0.5.8",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-			"integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
-		},
-		"http-proxy": {
-			"version": "1.18.1",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-			"requires": {
-				"eventemitter3": "^4.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
-			}
-		},
-		"http-proxy-middleware": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-			"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-			"requires": {
-				"@types/http-proxy": "^1.17.8",
-				"http-proxy": "^1.18.1",
-				"is-glob": "^4.0.1",
-				"is-plain-obj": "^3.0.0",
-				"micromatch": "^4.0.2"
-			},
-			"dependencies": {
-				"is-plain-obj": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-					"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
-				}
-			}
-		},
-		"human-signals": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
-		},
-		"iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3"
-			}
-		},
-		"icss-utils": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-			"requires": {}
-		},
-		"ignore": {
-			"version": "5.2.4",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-			"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="
-		},
-		"image-size": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.0.2.tgz",
-			"integrity": "sha512-xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg==",
-			"requires": {
-				"queue": "6.0.2"
-			}
-		},
-		"immediate": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
-			"integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
-		},
-		"immer": {
-			"version": "9.0.21",
-			"resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
-			"integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA=="
-		},
-		"import-fresh": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"requires": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			}
-		},
-		"import-lazy": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-			"integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A=="
-		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
-		},
-		"indent-string": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-		},
-		"infima": {
-			"version": "0.2.0-alpha.43",
-			"resolved": "https://registry.npmjs.org/infima/-/infima-0.2.0-alpha.43.tgz",
-			"integrity": "sha512-2uw57LvUqW0rK/SWYnd/2rRfxNA5DDNOh33jxF7fy46VWoNhGxiUQyVZHbBMjQ33mQem0cjdDVwgWVAmlRfgyQ=="
-		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-			"requires": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-		},
-		"ini": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-		},
-		"inline-style-parser": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
-			"integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="
-		},
-		"interpret": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-			"integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
-		},
-		"invariant": {
-			"version": "2.2.4",
-			"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-			"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-			"requires": {
-				"loose-envify": "^1.0.0"
-			}
-		},
-		"ipaddr.js": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
-			"integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ=="
-		},
-		"is-alphabetical": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-			"integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg=="
-		},
-		"is-alphanumerical": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-			"integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-			"requires": {
-				"is-alphabetical": "^1.0.0",
-				"is-decimal": "^1.0.0"
-			}
-		},
-		"is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-		},
-		"is-binary-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-			"requires": {
-				"binary-extensions": "^2.0.0"
-			}
-		},
-		"is-buffer": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-			"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
+		"node_modules/micromark-factory-space/node_modules/micromark-util-types": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz",
+			"integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"is-ci": {
+		"node_modules/micromark-factory-title": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-			"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-			"requires": {
-				"ci-info": "^2.0.0"
-			},
-			"dependencies": {
-				"ci-info": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-					"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+			"resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-2.0.0.tgz",
+			"integrity": "sha512-jY8CSxmpWLOxS+t8W+FG3Xigc0RDQA9bKMY/EwILvsesiRniiVMejYTE4wumNc2f4UbAa4WsHqe3J1QS1sli+A==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
 				}
+			],
+			"dependencies": {
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"is-core-module": {
-			"version": "2.13.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-			"integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
-			"requires": {
-				"has": "^1.0.3"
-			}
-		},
-		"is-decimal": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-			"integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="
-		},
-		"is-docker": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
-		},
-		"is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
-		},
-		"is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
-		},
-		"is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-		},
-		"is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"requires": {
-				"is-extglob": "^2.1.1"
-			}
-		},
-		"is-hexadecimal": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-			"integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="
-		},
-		"is-installed-globally": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-			"integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-			"requires": {
-				"global-dirs": "^3.0.0",
-				"is-path-inside": "^3.0.2"
-			}
-		},
-		"is-npm": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-			"integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="
-		},
-		"is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="
-		},
-		"is-path-cwd": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-			"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
-		},
-		"is-path-inside": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
-		},
-		"is-plain-obj": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="
-		},
-		"is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"requires": {
-				"isobject": "^3.0.1"
+		"node_modules/micromark-factory-title/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"is-regexp": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-			"integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="
-		},
-		"is-root": {
+		"node_modules/micromark-factory-title/node_modules/micromark-util-character": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-			"integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="
-		},
-		"is-stream": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
-		},
-		"is-whitespace-character": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-			"integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w=="
-		},
-		"is-word-character": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-			"integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA=="
-		},
-		"is-wsl": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-			"requires": {
-				"is-docker": "^2.0.0"
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"is-yarn-global": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-			"integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
-		},
-		"isarray": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-		},
-		"isexe": {
+		"node_modules/micromark-factory-title/node_modules/micromark-util-symbol": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
-		},
-		"jest-util": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.3.tgz",
-			"integrity": "sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==",
-			"requires": {
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.9",
-				"picomatch": "^2.2.3"
-			}
-		},
-		"jest-worker": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.3.tgz",
-			"integrity": "sha512-wacANXecZ/GbQakpf2CClrqrlwsYYDSXFd4fIGdL+dXpM2GWoJ+6bhQ7vR3TKi3+gkSfBkjy1/khH/WrYS4Q6g==",
-			"requires": {
-				"@types/node": "*",
-				"jest-util": "^29.6.3",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"dependencies": {
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
 				}
-			}
-		},
-		"jiti": {
-			"version": "1.19.3",
-			"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.3.tgz",
-			"integrity": "sha512-5eEbBDQT/jF1xg6l36P+mWGGoH9Spuy0PCdSr2dtWRDGC6ph/w9ZCL4lmESW8f8F7MwT3XKescfP0wnZWAKL9w=="
-		},
-		"joi": {
-			"version": "17.9.2",
-			"resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz",
-			"integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==",
-			"requires": {
-				"@hapi/hoek": "^9.0.0",
-				"@hapi/topo": "^5.0.0",
-				"@sideway/address": "^4.1.3",
-				"@sideway/formula": "^3.0.1",
-				"@sideway/pinpoint": "^2.0.0"
-			}
-		},
-		"js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-		},
-		"js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"requires": {
-				"argparse": "^2.0.1"
-			}
-		},
-		"jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-		},
-		"json-buffer": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-			"integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="
-		},
-		"json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-		},
-		"json5": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+			]
 		},
-		"jsonfile": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-			"requires": {
-				"graceful-fs": "^4.1.6",
-				"universalify": "^2.0.0"
+		"node_modules/micromark-factory-whitespace": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.0.tgz",
+			"integrity": "sha512-28kbwaBjc5yAI1XadbdPYHX/eDnqaUFVikLwrO7FDnKG7lpgxnvk/XGRhX/PN0mOZ+dBSZ+LgunHS+6tYQAzhA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-factory-space": "^2.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"keyv": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-			"integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-			"requires": {
-				"json-buffer": "3.0.0"
+		"node_modules/micromark-factory-whitespace/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+		"node_modules/micromark-factory-whitespace/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
 		},
-		"kleur": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
+		"node_modules/micromark-factory-whitespace/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"latest-version": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-			"integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-			"requires": {
-				"package-json": "^6.3.0"
+		"node_modules/micromark-util-character": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.2.0.tgz",
+			"integrity": "sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^1.0.0",
+				"micromark-util-types": "^1.0.0"
 			}
 		},
-		"launch-editor": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
-			"integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
-			"requires": {
-				"picocolors": "^1.0.0",
-				"shell-quote": "^1.7.3"
+		"node_modules/micromark-util-character/node_modules/micromark-util-types": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz",
+			"integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
+		},
+		"node_modules/micromark-util-chunked": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-2.0.0.tgz",
+			"integrity": "sha512-anK8SWmNphkXdaKgz5hJvGa7l00qmcaUQoMYsBwDlSKFKjc6gjGXPDw3FNL3Nbwq5L8gE+RCbGqTw49FK5Qyvg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0"
 			}
 		},
-		"leven": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
+		"node_modules/micromark-util-chunked/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"lilconfig": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-			"integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
+		"node_modules/micromark-util-classify-character": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-2.0.0.tgz",
+			"integrity": "sha512-S0ze2R9GH+fu41FA7pbSqNWObo/kzwf8rN/+IGlW/4tC6oACOs8B++bh+i9bVyNnwCcuksbFwsBme5OCKXCwIw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
 		},
-		"lines-and-columns": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+		"node_modules/micromark-util-classify-character/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
 		},
-		"loader-runner": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
+		"node_modules/micromark-util-classify-character/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"loader-utils": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-			"requires": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^2.1.2"
+		"node_modules/micromark-util-combine-extensions": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.0.tgz",
+			"integrity": "sha512-vZZio48k7ON0fVS3CUgFatWHoKbbLTK/rT7pzpJ4Bjp5JjkZeasRfrS9wsBdDJK2cJLHMckXZdzPSSr1B8a4oQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"requires": {
-				"p-locate": "^4.1.0"
+		"node_modules/micromark-util-decode-numeric-character-reference": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.1.tgz",
+			"integrity": "sha512-bmkNc7z8Wn6kgjZmVHOX3SowGmVdhYS7yBpMnuMnPzDq/6xwVA604DuOXMZTO1lvq01g+Adfa0pE2UKGlxL1XQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0"
 			}
 		},
-		"lodash": {
-			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-		},
-		"lodash.curry": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
-			"integrity": "sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA=="
-		},
-		"lodash.debounce": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+		"node_modules/micromark-util-decode-numeric-character-reference/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"lodash.flow": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz",
-			"integrity": "sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw=="
+		"node_modules/micromark-util-decode-string": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-2.0.0.tgz",
+			"integrity": "sha512-r4Sc6leeUTn3P6gk20aFMj2ntPwn6qpDZqWvYmAG6NgvFTIlj4WtrAudLi65qYoaGdXYViXYw2pkmn7QnIFasA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"decode-named-character-reference": "^1.0.0",
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-decode-numeric-character-reference": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0"
+			}
 		},
-		"lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
+		"node_modules/micromark-util-decode-string/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
 		},
-		"lodash.uniq": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
+		"node_modules/micromark-util-decode-string/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"loose-envify": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-			"requires": {
-				"js-tokens": "^3.0.0 || ^4.0.0"
-			}
+		"node_modules/micromark-util-encode": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.0.tgz",
+			"integrity": "sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"lower-case": {
+		"node_modules/micromark-util-events-to-acorn": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-			"integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-			"requires": {
-				"tslib": "^2.0.3"
+			"resolved": "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-2.0.2.tgz",
+			"integrity": "sha512-Fk+xmBrOv9QZnEDguL9OI9/NQQp6Hz4FuQ4YmCb/5V7+9eAh1s6AYSvL20kHkD67YIg7EpE54TiSlcsf3vyZgA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"@types/acorn": "^4.0.0",
+				"@types/estree": "^1.0.0",
+				"@types/unist": "^3.0.0",
+				"devlop": "^1.0.0",
+				"estree-util-visit": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0",
+				"vfile-message": "^4.0.0"
 			}
 		},
-		"lowercase-keys": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-			"integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+		"node_modules/micromark-util-events-to-acorn/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"lru-cache": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-			"requires": {
-				"yallist": "^3.0.2"
-			}
+		"node_modules/micromark-util-html-tag-name": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.0.tgz",
+			"integrity": "sha512-xNn4Pqkj2puRhKdKTm8t1YHC/BAjx6CEwRFXntTaRf/x16aqka6ouVoutm+QdkISTlT7e2zU7U4ZdlDLJd2Mcw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"lunr": {
-			"version": "2.3.9",
-			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
-			"integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="
+		"node_modules/micromark-util-normalize-identifier": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.0.tgz",
+			"integrity": "sha512-2xhYT0sfo85FMrUPtHcPo2rrp1lwbDEEzpx7jiH2xXJLqBuy4H0GgXk5ToU8IEwoROtXuL8ND0ttVa4rNqYK3w==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0"
+			}
 		},
-		"lunr-languages": {
-			"version": "1.13.0",
-			"resolved": "https://registry.npmjs.org/lunr-languages/-/lunr-languages-1.13.0.tgz",
-			"integrity": "sha512-qgTOarcnAtVFKr0aJ2GuiqbBdhKF61jpF8OgFbnlSAb1t6kOiQW67q0hv0UQzzB+5+OwPpnZyFT/L0L9SQG1/A=="
+		"node_modules/micromark-util-normalize-identifier/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-			"requires": {
-				"semver": "^6.0.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+		"node_modules/micromark-util-resolve-all": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.0.tgz",
+			"integrity": "sha512-6KU6qO7DZ7GJkaCgwBNtplXCvGkJToU86ybBAUdavvgsCiG8lSSvYxr9MhwmQ+udpzywHsl4RpGJsYWG1pDOcA==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
 				}
+			],
+			"dependencies": {
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"markdown-escapes": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-			"integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="
+		"node_modules/micromark-util-sanitize-uri": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.0.tgz",
+			"integrity": "sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-encode": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0"
+			}
 		},
-		"mdast-squeeze-paragraphs": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz",
-			"integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==",
-			"requires": {
-				"unist-util-remove": "^2.0.0"
+		"node_modules/micromark-util-sanitize-uri/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"mdast-util-definitions": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz",
-			"integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==",
-			"requires": {
-				"unist-util-visit": "^2.0.0"
-			}
+		"node_modules/micromark-util-sanitize-uri/node_modules/micromark-util-symbol": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"mdast-util-to-hast": {
-			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz",
-			"integrity": "sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==",
-			"requires": {
-				"@types/mdast": "^3.0.0",
-				"@types/unist": "^2.0.0",
-				"mdast-util-definitions": "^4.0.0",
-				"mdurl": "^1.0.0",
-				"unist-builder": "^2.0.0",
-				"unist-util-generated": "^1.0.0",
-				"unist-util-position": "^3.0.0",
-				"unist-util-visit": "^2.0.0"
+		"node_modules/micromark-util-subtokenize": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-2.0.0.tgz",
+			"integrity": "sha512-vc93L1t+gpR3p8jxeVdaYlbV2jTYteDje19rNSS/H5dlhxUYll5Fy6vJ2cDwP8RnsXi818yGty1ayP55y3W6fg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"devlop": "^1.0.0",
+				"micromark-util-chunked": "^2.0.0",
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"mdast-util-to-string": {
+		"node_modules/micromark-util-subtokenize/node_modules/micromark-util-symbol": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-			"integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w=="
-		},
-		"mdn-data": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"mdurl": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-			"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+		"node_modules/micromark-util-symbol": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz",
+			"integrity": "sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"media-typer": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
+		"node_modules/micromark-util-types": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.0.tgz",
+			"integrity": "sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"memfs": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-			"integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
-			"requires": {
-				"fs-monkey": "^1.0.4"
+		"node_modules/micromark/node_modules/micromark-factory-space": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz",
+			"integrity": "sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-character": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
 			}
 		},
-		"merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+		"node_modules/micromark/node_modules/micromark-util-character": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+			"integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			],
+			"dependencies": {
+				"micromark-util-symbol": "^2.0.0",
+				"micromark-util-types": "^2.0.0"
+			}
 		},
-		"merge-stream": {
+		"node_modules/micromark/node_modules/micromark-util-symbol": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-		},
-		"merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+			"resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+			"integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+			"funding": [
+				{
+					"type": "GitHub Sponsors",
+					"url": "https://github.com/sponsors/unifiedjs"
+				},
+				{
+					"type": "OpenCollective",
+					"url": "https://opencollective.com/unified"
+				}
+			]
 		},
-		"methods": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
-		},
-		"micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-			"requires": {
-				"braces": "^3.0.2",
+		"node_modules/micromatch": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+			"license": "MIT",
+			"dependencies": {
+				"braces": "^3.0.3",
 				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"mime": {
+		"node_modules/mime": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"license": "MIT",
+			"bin": {
+				"mime": "cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"mime-db": {
+		"node_modules/mime-db": {
 			"version": "1.33.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-			"integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+			"integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"mime-types": {
+		"node_modules/mime-types": {
 			"version": "2.1.18",
 			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
 			"integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-			"requires": {
+			"dependencies": {
 				"mime-db": "~1.33.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"mimic-fn": {
+		"node_modules/mimic-fn": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"mimic-response": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-			"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
-		},
-		"mini-css-extract-plugin": {
-			"version": "2.7.6",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
-			"integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
-			"requires": {
-				"schema-utils": "^4.0.0"
+		"node_modules/mimic-response": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+			"integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/mini-css-extract-plugin": {
+			"version": "2.8.1",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz",
+			"integrity": "sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==",
 			"dependencies": {
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-				},
-				"schema-utils": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-					"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.9.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.1.0"
-					}
-				}
+				"schema-utils": "^4.0.0",
+				"tapable": "^2.2.1"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
 			}
 		},
-		"minimalistic-assert": {
+		"node_modules/minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
 			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
 		},
-		"minimatch": {
+		"node_modules/minimatch": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
 			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"requires": {
+			"dependencies": {
 				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"minimist": {
+		"node_modules/minimist": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
+			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"mkdirp": {
+		"node_modules/mkdirp": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-			"integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew=="
+			"integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==",
+			"deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+			"engines": {
+				"node": "*"
+			}
 		},
-		"mrmime": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
-			"integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw=="
+		"node_modules/mrmime": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
+			"integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+		"node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"license": "MIT"
 		},
-		"multicast-dns": {
+		"node_modules/multicast-dns": {
 			"version": "7.2.5",
 			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
 			"integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-			"requires": {
+			"dependencies": {
 				"dns-packet": "^5.2.2",
 				"thunky": "^1.0.2"
+			},
+			"bin": {
+				"multicast-dns": "cli.js"
 			}
 		},
-		"nanoid": {
-			"version": "3.3.6",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-			"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
+		"node_modules/nanoid": {
+			"version": "3.3.7",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
 		},
-		"negotiator": {
+		"node_modules/negotiator": {
 			"version": "0.6.3",
 			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"neo-async": {
+		"node_modules/neo-async": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
 			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
 		},
-		"no-case": {
+		"node_modules/no-case": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
 			"integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-			"requires": {
+			"dependencies": {
 				"lower-case": "^2.0.2",
 				"tslib": "^2.0.3"
 			}
 		},
-		"node-emoji": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
-			"integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==",
-			"requires": {
-				"lodash": "^4.17.21"
-			}
-		},
-		"node-fetch": {
-			"version": "2.6.13",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz",
-			"integrity": "sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==",
-			"requires": {
-				"whatwg-url": "^5.0.0"
+		"node_modules/node-emoji": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.3.tgz",
+			"integrity": "sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==",
+			"dependencies": {
+				"@sindresorhus/is": "^4.6.0",
+				"char-regex": "^1.0.2",
+				"emojilib": "^2.4.0",
+				"skin-tone": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=18"
 			}
 		},
-		"node-forge": {
+		"node_modules/node-forge": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-			"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
+			"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+			"engines": {
+				"node": ">= 6.13.0"
+			}
 		},
-		"node-releases": {
-			"version": "2.0.13",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-			"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+		"node_modules/node-releases": {
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
 		},
-		"nopt": {
+		"node_modules/nopt": {
 			"version": "1.0.10",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
 			"integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
-			"requires": {
+			"dependencies": {
 				"abbrev": "1"
+			},
+			"bin": {
+				"nopt": "bin/nopt.js"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"normalize-path": {
+		"node_modules/normalize-path": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"normalize-range": {
+		"node_modules/normalize-range": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
+			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"normalize-url": {
+		"node_modules/normalize-url": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
+			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"not": {
+		"node_modules/not": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/not/-/not-0.1.0.tgz",
 			"integrity": "sha512-5PDmaAsVfnWUgTUbJ3ERwn7u79Z0dYxN9ErxCpVJJqe2RK0PJ3z+iFUxuqjwtlDDegXvtWoxD/3Fzxox7tFGWA=="
 		},
-		"npm-run-path": {
+		"node_modules/npm-run-path": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
 			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"requires": {
+			"dependencies": {
 				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"nprogress": {
+		"node_modules/nprogress": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
 			"integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
 		},
-		"nth-check": {
+		"node_modules/nth-check": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
 			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-			"requires": {
+			"dependencies": {
 				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
 			}
 		},
-		"object-assign": {
+		"node_modules/object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"object-inspect": {
-			"version": "1.12.3",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-			"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+		"node_modules/object-inspect": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+			"integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"object-keys": {
+		"node_modules/object-keys": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-		},
-		"object.assign": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
+			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/object.assign": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+			"integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+			"dependencies": {
+				"call-bind": "^1.0.5",
+				"define-properties": "^1.2.1",
 				"has-symbols": "^1.0.3",
 				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"obuf": {
+		"node_modules/obuf": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
 			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
 		},
-		"on-finished": {
+		"node_modules/on-finished": {
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
 			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"ee-first": "1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"on-headers": {
+		"node_modules/on-headers": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
+			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"once": {
+		"node_modules/once": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
 			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-			"requires": {
+			"dependencies": {
 				"wrappy": "1"
 			}
 		},
-		"onetime": {
+		"node_modules/onetime": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
 			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"requires": {
+			"dependencies": {
 				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"open": {
+		"node_modules/open": {
 			"version": "8.4.2",
 			"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
 			"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-			"requires": {
+			"dependencies": {
 				"define-lazy-prop": "^2.0.0",
 				"is-docker": "^2.1.1",
 				"is-wsl": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"opener": {
+		"node_modules/opener": {
 			"version": "1.5.2",
 			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="
+			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+			"bin": {
+				"opener": "bin/opener-bin.js"
+			}
 		},
-		"p-cancelable": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-			"integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
+		"node_modules/p-cancelable": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+			"integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
+			"engines": {
+				"node": ">=12.20"
+			}
 		},
-		"p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"requires": {
-				"p-try": "^2.0.0"
+		"node_modules/p-limit": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+			"integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+			"dependencies": {
+				"yocto-queue": "^1.0.0"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"requires": {
-				"p-limit": "^2.2.0"
+		"node_modules/p-locate": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+			"integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+			"dependencies": {
+				"p-limit": "^4.0.0"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"p-map": {
+		"node_modules/p-map": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
 			"integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-			"requires": {
+			"dependencies": {
 				"aggregate-error": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"p-retry": {
+		"node_modules/p-retry": {
 			"version": "4.6.2",
 			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
 			"integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-			"requires": {
+			"dependencies": {
 				"@types/retry": "0.12.0",
 				"retry": "^0.13.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"p-try": {
+		"node_modules/p-try": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"package-json": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-			"integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-			"requires": {
-				"got": "^9.6.0",
-				"registry-auth-token": "^4.0.0",
-				"registry-url": "^5.0.0",
-				"semver": "^6.2.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
+		"node_modules/package-json": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz",
+			"integrity": "sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==",
+			"dependencies": {
+				"got": "^12.1.0",
+				"registry-auth-token": "^5.0.1",
+				"registry-url": "^6.0.0",
+				"semver": "^7.3.7"
+			},
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"param-case": {
+		"node_modules/param-case": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
 			"integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-			"requires": {
+			"dependencies": {
 				"dot-case": "^3.0.4",
 				"tslib": "^2.0.3"
 			}
 		},
-		"parent-module": {
+		"node_modules/parent-module": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
 			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"requires": {
+			"dependencies": {
 				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"parse-entities": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-			"integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-			"requires": {
-				"character-entities": "^1.0.0",
-				"character-entities-legacy": "^1.0.0",
-				"character-reference-invalid": "^1.0.0",
-				"is-alphanumerical": "^1.0.0",
-				"is-decimal": "^1.0.0",
-				"is-hexadecimal": "^1.0.0"
-			}
-		},
-		"parse-json": {
+		"node_modules/parse-entities": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.1.tgz",
+			"integrity": "sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"character-entities": "^2.0.0",
+				"character-entities-legacy": "^3.0.0",
+				"character-reference-invalid": "^2.0.0",
+				"decode-named-character-reference": "^1.0.0",
+				"is-alphanumerical": "^2.0.0",
+				"is-decimal": "^2.0.0",
+				"is-hexadecimal": "^2.0.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/parse-entities/node_modules/@types/unist": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+			"integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+			"license": "MIT"
+		},
+		"node_modules/parse-json": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
 			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"requires": {
+			"dependencies": {
 				"@babel/code-frame": "^7.0.0",
 				"error-ex": "^1.3.1",
 				"json-parse-even-better-errors": "^2.3.0",
 				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"parse-numeric-range": {
+		"node_modules/parse-numeric-range": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz",
 			"integrity": "sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ=="
 		},
-		"parse5": {
+		"node_modules/parse5": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
 			"integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-			"requires": {
+			"dependencies": {
 				"entities": "^4.4.0"
+			},
+			"funding": {
+				"url": "https://github.com/inikulin/parse5?sponsor=1"
 			}
 		},
-		"parse5-htmlparser2-tree-adapter": {
+		"node_modules/parse5-htmlparser2-tree-adapter": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
 			"integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
-			"requires": {
+			"dependencies": {
 				"domhandler": "^5.0.2",
 				"parse5": "^7.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/inikulin/parse5?sponsor=1"
 			}
 		},
-		"parseurl": {
+		"node_modules/parseurl": {
 			"version": "1.3.3",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"pascal-case": {
+		"node_modules/pascal-case": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
 			"integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-			"requires": {
+			"dependencies": {
 				"no-case": "^3.0.4",
 				"tslib": "^2.0.3"
 			}
 		},
-		"path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+		"node_modules/path-exists": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+			"integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			}
 		},
-		"path-is-absolute": {
+		"node_modules/path-is-absolute": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"path-is-inside": {
+		"node_modules/path-is-inside": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
 			"integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="
 		},
-		"path-key": {
+		"node_modules/path-key": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"path-parse": {
+		"node_modules/path-parse": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
-		"path-to-regexp": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-			"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-			"requires": {
+		"node_modules/path-to-regexp": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
+			"integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
+			"license": "MIT",
+			"dependencies": {
 				"isarray": "0.0.1"
 			}
 		},
-		"path-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
-		},
-		"picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-		},
-		"picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+		"node_modules/path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/periscopic": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz",
+			"integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==",
+			"dependencies": {
+				"@types/estree": "^1.0.0",
+				"estree-walker": "^3.0.0",
+				"is-reference": "^3.0.0"
+			}
+		},
+		"node_modules/picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+		},
+		"node_modules/picomatch": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/pkg-dir": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+			"integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+			"dependencies": {
+				"find-up": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pkg-up": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+			"integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+			"dependencies": {
+				"find-up": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-up/node_modules/find-up": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+			"dependencies": {
+				"locate-path": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/pkg-up/node_modules/locate-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+			"dependencies": {
+				"p-locate": "^3.0.0",
+				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/pkg-up/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pkg-up/node_modules/p-locate": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+			"dependencies": {
+				"p-limit": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"requires": {
-				"find-up": "^4.0.0"
+		"node_modules/pkg-up/node_modules/path-exists": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+			"integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"pkg-up": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-			"integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-			"requires": {
-				"find-up": "^3.0.0"
-			},
-			"dependencies": {
-				"find-up": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-					"requires": {
-						"locate-path": "^3.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
+		"node_modules/postcss": {
+			"version": "8.4.35",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
+			"integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
 				},
-				"p-locate": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
 				},
-				"path-exists": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-					"integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
 				}
-			}
-		},
-		"postcss": {
-			"version": "8.4.28",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
-			"integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
-			"requires": {
-				"nanoid": "^3.3.6",
+			],
+			"dependencies": {
+				"nanoid": "^3.3.7",
 				"picocolors": "^1.0.0",
 				"source-map-js": "^1.0.2"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
 			}
 		},
-		"postcss-calc": {
+		"node_modules/postcss-calc": {
 			"version": "8.2.4",
 			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
 			"integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
-			"requires": {
+			"dependencies": {
 				"postcss-selector-parser": "^6.0.9",
 				"postcss-value-parser": "^4.2.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.2"
 			}
 		},
-		"postcss-colormin": {
+		"node_modules/postcss-colormin": {
 			"version": "5.3.1",
 			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
 			"integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
-			"requires": {
+			"dependencies": {
 				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0",
 				"colord": "^2.9.1",
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-convert-values": {
+		"node_modules/postcss-convert-values": {
 			"version": "5.1.3",
 			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
 			"integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
-			"requires": {
+			"dependencies": {
 				"browserslist": "^4.21.4",
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-discard-comments": {
+		"node_modules/postcss-discard-comments": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
 			"integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
-			"requires": {}
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
 		},
-		"postcss-discard-duplicates": {
+		"node_modules/postcss-discard-duplicates": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
 			"integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-			"requires": {}
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
 		},
-		"postcss-discard-empty": {
+		"node_modules/postcss-discard-empty": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
 			"integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-			"requires": {}
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
 		},
-		"postcss-discard-overridden": {
+		"node_modules/postcss-discard-overridden": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
 			"integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-			"requires": {}
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
 		},
-		"postcss-discard-unused": {
+		"node_modules/postcss-discard-unused": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-5.1.0.tgz",
 			"integrity": "sha512-KwLWymI9hbwXmJa0dkrzpRbSJEh0vVUd7r8t0yOGPcfKzyJJxFM8kLyC5Ev9avji6nY95pOp1W6HqIrfT+0VGw==",
-			"requires": {
+			"dependencies": {
 				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-loader": {
+			"version": "7.3.4",
+			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.4.tgz",
+			"integrity": "sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==",
+			"dependencies": {
+				"cosmiconfig": "^8.3.5",
+				"jiti": "^1.20.0",
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": ">= 14.15.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"postcss": "^7.0.0 || ^8.0.1",
+				"webpack": "^5.0.0"
 			}
 		},
-		"postcss-loader": {
-			"version": "7.3.3",
-			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz",
-			"integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==",
-			"requires": {
-				"cosmiconfig": "^8.2.0",
-				"jiti": "^1.18.2",
-				"semver": "^7.3.8"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "8.2.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-					"integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-					"requires": {
-						"import-fresh": "^3.2.1",
-						"js-yaml": "^4.1.0",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0"
-					}
+		"node_modules/postcss-loader/node_modules/cosmiconfig": {
+			"version": "8.3.6",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+			"integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
+			"dependencies": {
+				"import-fresh": "^3.3.0",
+				"js-yaml": "^4.1.0",
+				"parse-json": "^5.2.0",
+				"path-type": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/d-fischer"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.9.5"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
 				}
 			}
 		},
-		"postcss-merge-idents": {
+		"node_modules/postcss-merge-idents": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-5.1.1.tgz",
 			"integrity": "sha512-pCijL1TREiCoog5nQp7wUe+TUonA2tC2sQ54UGeMmryK3UFGIYKqDyjnqd6RcuI4znFn9hWSLNN8xKE/vWcUQw==",
-			"requires": {
+			"dependencies": {
 				"cssnano-utils": "^3.1.0",
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-merge-longhand": {
+		"node_modules/postcss-merge-longhand": {
 			"version": "5.1.7",
 			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
 			"integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0",
 				"stylehacks": "^5.1.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-merge-rules": {
+		"node_modules/postcss-merge-rules": {
 			"version": "5.1.4",
 			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
 			"integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
-			"requires": {
+			"dependencies": {
 				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0",
 				"cssnano-utils": "^3.1.0",
 				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-minify-font-values": {
+		"node_modules/postcss-minify-font-values": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
 			"integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-minify-gradients": {
+		"node_modules/postcss-minify-gradients": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
 			"integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
-			"requires": {
+			"dependencies": {
 				"colord": "^2.9.1",
 				"cssnano-utils": "^3.1.0",
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-minify-params": {
+		"node_modules/postcss-minify-params": {
 			"version": "5.1.4",
 			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
 			"integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
-			"requires": {
+			"dependencies": {
 				"browserslist": "^4.21.4",
 				"cssnano-utils": "^3.1.0",
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-minify-selectors": {
+		"node_modules/postcss-minify-selectors": {
 			"version": "5.2.1",
 			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
 			"integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
-			"requires": {
+			"dependencies": {
 				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-modules-extract-imports": {
+		"node_modules/postcss-modules-extract-imports": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
 			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-			"requires": {}
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
 		},
-		"postcss-modules-local-by-default": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-			"integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
-			"requires": {
+		"node_modules/postcss-modules-local-by-default": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz",
+			"integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==",
+			"dependencies": {
 				"icss-utils": "^5.0.0",
 				"postcss-selector-parser": "^6.0.2",
 				"postcss-value-parser": "^4.1.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"postcss-modules-scope": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-			"requires": {
+		"node_modules/postcss-modules-scope": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz",
+			"integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==",
+			"dependencies": {
 				"postcss-selector-parser": "^6.0.4"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"postcss-modules-values": {
+		"node_modules/postcss-modules-values": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
 			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-			"requires": {
+			"dependencies": {
 				"icss-utils": "^5.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"postcss-normalize-charset": {
+		"node_modules/postcss-normalize-charset": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
 			"integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-			"requires": {}
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
 		},
-		"postcss-normalize-display-values": {
+		"node_modules/postcss-normalize-display-values": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
 			"integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-positions": {
+		"node_modules/postcss-normalize-positions": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
 			"integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-repeat-style": {
+		"node_modules/postcss-normalize-repeat-style": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
 			"integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-string": {
+		"node_modules/postcss-normalize-string": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
 			"integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-timing-functions": {
+		"node_modules/postcss-normalize-timing-functions": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
 			"integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-unicode": {
+		"node_modules/postcss-normalize-unicode": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
 			"integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
-			"requires": {
+			"dependencies": {
 				"browserslist": "^4.21.4",
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-url": {
+		"node_modules/postcss-normalize-url": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
 			"integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
-			"requires": {
+			"dependencies": {
 				"normalize-url": "^6.0.1",
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-whitespace": {
+		"node_modules/postcss-normalize-whitespace": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
 			"integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-ordered-values": {
+		"node_modules/postcss-ordered-values": {
 			"version": "5.1.3",
 			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
 			"integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
-			"requires": {
+			"dependencies": {
 				"cssnano-utils": "^3.1.0",
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-reduce-idents": {
+		"node_modules/postcss-reduce-idents": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-5.2.0.tgz",
 			"integrity": "sha512-BTrLjICoSB6gxbc58D5mdBK8OhXRDqud/zodYfdSi52qvDHdMwk+9kB9xsM8yJThH/sZU5A6QVSmMmaN001gIg==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-reduce-initial": {
+		"node_modules/postcss-reduce-initial": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
 			"integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
-			"requires": {
+			"dependencies": {
 				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-reduce-transforms": {
+		"node_modules/postcss-reduce-transforms": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
 			"integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-selector-parser": {
-			"version": "6.0.13",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-			"integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
-			"requires": {
+		"node_modules/postcss-selector-parser": {
+			"version": "6.0.16",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
+			"integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
+			"dependencies": {
 				"cssesc": "^3.0.0",
 				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"postcss-sort-media-queries": {
+		"node_modules/postcss-sort-media-queries": {
 			"version": "4.4.1",
 			"resolved": "https://registry.npmjs.org/postcss-sort-media-queries/-/postcss-sort-media-queries-4.4.1.tgz",
 			"integrity": "sha512-QDESFzDDGKgpiIh4GYXsSy6sek2yAwQx1JASl5AxBtU1Lq2JfKBljIPNdil989NcSKRQX1ToiaKphImtBuhXWw==",
-			"requires": {
+			"dependencies": {
 				"sort-css-media-queries": "2.1.0"
+			},
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.4.16"
 			}
 		},
-		"postcss-svgo": {
+		"node_modules/postcss-svgo": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
 			"integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
-			"requires": {
+			"dependencies": {
 				"postcss-value-parser": "^4.2.0",
 				"svgo": "^2.7.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-unique-selectors": {
+		"node_modules/postcss-unique-selectors": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
 			"integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
-			"requires": {
+			"dependencies": {
 				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-value-parser": {
+		"node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
 			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
-		"postcss-zindex": {
+		"node_modules/postcss-zindex": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-5.1.0.tgz",
 			"integrity": "sha512-fgFMf0OtVSBR1va1JNHYgMxYk73yhn/qb4uQDq1DLGYolz8gHCyr/sesEuGUaYs58E3ZJRcpoGuPVoB7Meiq9A==",
-			"requires": {}
-		},
-		"prepend-http": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-			"integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
 		},
-		"pretty-error": {
+		"node_modules/pretty-error": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
 			"integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-			"requires": {
+			"dependencies": {
 				"lodash": "^4.17.20",
 				"renderkid": "^3.0.0"
 			}
 		},
-		"pretty-time": {
+		"node_modules/pretty-time": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz",
-			"integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA=="
+			"integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"prism-react-renderer": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-1.3.5.tgz",
-			"integrity": "sha512-IJ+MSwBWKG+SM3b2SUfdrhC+gu01QkV2KmRQgREThBfSQRoufqRfxfHUxpG1WcaFjP+kojcFyO9Qqtpgt3qLCg==",
-			"requires": {}
+		"node_modules/prism-react-renderer": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-2.3.1.tgz",
+			"integrity": "sha512-Rdf+HzBLR7KYjzpJ1rSoxT9ioO85nZngQEoFIhL07XhtJHlCU3SOz0GJ6+qvMyQe0Se+BV3qpe6Yd/NmQF5Juw==",
+			"dependencies": {
+				"@types/prismjs": "^1.26.0",
+				"clsx": "^2.0.0"
+			},
+			"peerDependencies": {
+				"react": ">=16.0.0"
+			}
+		},
+		"node_modules/prism-react-renderer/node_modules/clsx": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"prismjs": {
+		"node_modules/prismjs": {
 			"version": "1.29.0",
 			"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
-			"integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="
+			"integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"process-nextick-args": {
+		"node_modules/process-nextick-args": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
 			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
 		},
-		"promise": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-			"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-			"requires": {
-				"asap": "~2.0.3"
-			}
-		},
-		"prompts": {
+		"node_modules/prompts": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
 			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-			"requires": {
+			"dependencies": {
 				"kleur": "^3.0.3",
 				"sisteransi": "^1.0.5"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"prop-types": {
+		"node_modules/prop-types": {
 			"version": "15.8.1",
 			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
 			"integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-			"requires": {
+			"dependencies": {
 				"loose-envify": "^1.4.0",
 				"object-assign": "^4.1.1",
 				"react-is": "^16.13.1"
 			}
 		},
-		"property-information": {
+		"node_modules/property-information": {
 			"version": "5.6.0",
 			"resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
 			"integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
-			"requires": {
+			"dependencies": {
 				"xtend": "^4.0.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"proxy-addr": {
+		"node_modules/proto-list": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+			"integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="
+		},
+		"node_modules/proxy-addr": {
 			"version": "2.0.7",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
 			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-			"requires": {
+			"dependencies": {
 				"forwarded": "0.2.0",
 				"ipaddr.js": "1.9.1"
 			},
-			"dependencies": {
-				"ipaddr.js": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-					"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-				}
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"pump": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-			"requires": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
+		"node_modules/proxy-addr/node_modules/ipaddr.js": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"punycode": {
+		"node_modules/punycode": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
 			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
 		},
-		"pupa": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-			"integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-			"requires": {
-				"escape-goat": "^2.0.0"
+		"node_modules/pupa": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz",
+			"integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==",
+			"dependencies": {
+				"escape-goat": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=12.20"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"pure-color": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz",
-			"integrity": "sha512-QFADYnsVoBMw1srW7OVKEYjG+MbIa49s54w1MA1EDY6r2r/sTcKKYqRX1f4GYvnXP7eN/Pe9HFcX+hwzmrXRHA=="
-		},
-		"qs": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-			"requires": {
-				"side-channel": "^1.0.4"
+		"node_modules/qs": {
+			"version": "6.13.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+			"integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"side-channel": "^1.0.6"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"queue": {
+		"node_modules/queue": {
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
 			"integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
-			"requires": {
+			"dependencies": {
 				"inherits": "~2.0.3"
 			}
 		},
-		"queue-microtask": {
+		"node_modules/queue-microtask": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/quick-lru": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+			"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"randombytes": {
+		"node_modules/randombytes": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
 			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-			"requires": {
+			"dependencies": {
 				"safe-buffer": "^5.1.0"
 			}
 		},
-		"range-parser": {
+		"node_modules/range-parser": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-			"integrity": "sha512-kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A=="
+			"integrity": "sha512-kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A==",
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"raw-body": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-			"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-			"requires": {
+		"node_modules/raw-body": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+			"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+			"license": "MIT",
+			"dependencies": {
 				"bytes": "3.1.2",
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"unpipe": "1.0.0"
 			},
-			"dependencies": {
-				"bytes": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-					"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-				}
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/raw-body/node_modules/bytes": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"rc": {
+		"node_modules/rc": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
 			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-			"requires": {
+			"dependencies": {
 				"deep-extend": "^0.6.0",
 				"ini": "~1.3.0",
 				"minimist": "^1.2.0",
 				"strip-json-comments": "~2.0.1"
 			},
-			"dependencies": {
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
-				}
+			"bin": {
+				"rc": "cli.js"
 			}
 		},
-		"react": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
-			"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
-			"requires": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1"
+		"node_modules/rc/node_modules/strip-json-comments": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"react-base16-styling": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz",
-			"integrity": "sha512-yvh/7CArceR/jNATXOKDlvTnPKPmGZz7zsenQ3jUwLzHkNUR0CvY3yGYJbWJ/nnxsL8Sgmt5cO3/SILVuPO6TQ==",
-			"requires": {
-				"base16": "^1.0.0",
-				"lodash.curry": "^4.0.1",
-				"lodash.flow": "^3.3.0",
-				"pure-color": "^1.2.0"
+		"node_modules/react": {
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+			"integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+			"license": "MIT",
+			"dependencies": {
+				"loose-envify": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"react-dev-utils": {
+		"node_modules/react-dev-utils": {
 			"version": "12.0.1",
 			"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
 			"integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
-			"requires": {
+			"dependencies": {
 				"@babel/code-frame": "^7.16.0",
 				"address": "^1.1.2",
 				"browserslist": "^4.18.1",
@@ -20083,122 +12638,183 @@
 				"strip-ansi": "^6.0.1",
 				"text-table": "^0.2.0"
 			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/react-dev-utils/node_modules/find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
 			"dependencies": {
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"loader-utils": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-					"integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-					"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-					"requires": {
-						"yocto-queue": "^0.1.0"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				}
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/react-dev-utils/node_modules/loader-utils": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz",
+			"integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 12.13.0"
+			}
+		},
+		"node_modules/react-dev-utils/node_modules/locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dependencies": {
+				"p-locate": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/react-dev-utils/node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/react-dev-utils/node_modules/p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/react-dev-utils/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/react-dev-utils/node_modules/yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"react-dom": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
-			"integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
-			"requires": {
+		"node_modules/react-dom": {
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+			"integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+			"license": "MIT",
+			"dependencies": {
 				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1",
-				"scheduler": "^0.20.2"
+				"scheduler": "^0.23.2"
+			},
+			"peerDependencies": {
+				"react": "^18.3.1"
 			}
 		},
-		"react-error-overlay": {
+		"node_modules/react-error-overlay": {
 			"version": "6.0.11",
 			"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
 			"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
 		},
-		"react-fast-compare": {
+		"node_modules/react-fast-compare": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
 			"integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
 		},
-		"react-helmet-async": {
+		"node_modules/react-helmet-async": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.3.0.tgz",
 			"integrity": "sha512-9jZ57/dAn9t3q6hneQS0wukqC2ENOBgMNVEhb/ZG9ZSxUetzVIw4iAmEU38IaVg3QGYauQPhSeUTuIUtFglWpg==",
-			"requires": {
+			"dependencies": {
 				"@babel/runtime": "^7.12.5",
 				"invariant": "^2.2.4",
 				"prop-types": "^15.7.2",
 				"react-fast-compare": "^3.2.0",
 				"shallowequal": "^1.1.0"
+			},
+			"peerDependencies": {
+				"react": "^16.6.0 || ^17.0.0 || ^18.0.0",
+				"react-dom": "^16.6.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"react-is": {
+		"node_modules/react-is": {
 			"version": "16.13.1",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
 			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
 		},
-		"react-json-view": {
-			"version": "1.21.3",
-			"resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.3.tgz",
-			"integrity": "sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw==",
-			"requires": {
-				"flux": "^4.0.1",
-				"react-base16-styling": "^0.6.0",
-				"react-lifecycles-compat": "^3.0.4",
-				"react-textarea-autosize": "^8.3.2"
+		"node_modules/react-json-view-lite": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/react-json-view-lite/-/react-json-view-lite-1.2.1.tgz",
+			"integrity": "sha512-Itc0g86fytOmKZoIoJyGgvNqohWSbh3NXIKNgH6W6FT9PC1ck4xas1tT3Rr/b3UlFXyA9Jjaw9QSXdZy2JwGMQ==",
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"react-lifecycles-compat": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-			"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
-		},
-		"react-loadable": {
-			"version": "npm:@docusaurus/react-loadable@5.5.2",
+		"node_modules/react-loadable": {
+			"name": "@docusaurus/react-loadable",
+			"version": "5.5.2",
 			"resolved": "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz",
 			"integrity": "sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==",
-			"requires": {
+			"dependencies": {
 				"@types/react": "*",
 				"prop-types": "^15.6.2"
+			},
+			"peerDependencies": {
+				"react": "*"
 			}
 		},
-		"react-loadable-ssr-addon-v5-slorber": {
+		"node_modules/react-loadable-ssr-addon-v5-slorber": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz",
 			"integrity": "sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==",
-			"requires": {
+			"dependencies": {
 				"@babel/runtime": "^7.10.3"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"peerDependencies": {
+				"react-loadable": "*",
+				"webpack": ">=4.41.1 || 5.x"
 			}
 		},
-		"react-router": {
+		"node_modules/react-router": {
 			"version": "5.3.4",
 			"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
 			"integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
-			"requires": {
+			"dependencies": {
 				"@babel/runtime": "^7.12.13",
 				"history": "^4.9.0",
 				"hoist-non-react-statics": "^3.1.0",
@@ -20208,21 +12824,28 @@
 				"react-is": "^16.6.0",
 				"tiny-invariant": "^1.0.2",
 				"tiny-warning": "^1.0.0"
+			},
+			"peerDependencies": {
+				"react": ">=15"
 			}
 		},
-		"react-router-config": {
+		"node_modules/react-router-config": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/react-router-config/-/react-router-config-5.1.1.tgz",
 			"integrity": "sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg==",
-			"requires": {
+			"dependencies": {
 				"@babel/runtime": "^7.1.2"
+			},
+			"peerDependencies": {
+				"react": ">=15",
+				"react-router": ">=5"
 			}
 		},
-		"react-router-dom": {
+		"node_modules/react-router-dom": {
 			"version": "5.3.4",
 			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz",
 			"integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==",
-			"requires": {
+			"dependencies": {
 				"@babel/runtime": "^7.12.13",
 				"history": "^4.9.0",
 				"loose-envify": "^1.3.1",
@@ -20230,578 +12853,680 @@
 				"react-router": "5.3.4",
 				"tiny-invariant": "^1.0.2",
 				"tiny-warning": "^1.0.0"
+			},
+			"peerDependencies": {
+				"react": ">=15"
 			}
 		},
-		"react-textarea-autosize": {
-			"version": "8.5.2",
-			"resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.5.2.tgz",
-			"integrity": "sha512-uOkyjkEl0ByEK21eCJMHDGBAAd/BoFQBawYK5XItjAmCTeSbjxghd8qnt7nzsLYzidjnoObu6M26xts0YGKsGg==",
-			"requires": {
-				"@babel/runtime": "^7.20.13",
-				"use-composed-ref": "^1.3.0",
-				"use-latest": "^1.2.1"
-			}
-		},
-		"readable-stream": {
+		"node_modules/readable-stream": {
 			"version": "3.6.2",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
 			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-			"requires": {
+			"dependencies": {
 				"inherits": "^2.0.3",
 				"string_decoder": "^1.1.1",
 				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"readdirp": {
+		"node_modules/readdirp": {
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
 			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-			"requires": {
+			"dependencies": {
 				"picomatch": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=8.10.0"
 			}
 		},
-		"reading-time": {
+		"node_modules/reading-time": {
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/reading-time/-/reading-time-1.5.0.tgz",
 			"integrity": "sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg=="
 		},
-		"rechoir": {
+		"node_modules/rechoir": {
 			"version": "0.6.2",
 			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
 			"integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
-			"requires": {
+			"dependencies": {
 				"resolve": "^1.1.6"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"recursive-readdir": {
+		"node_modules/recursive-readdir": {
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
 			"integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
-			"requires": {
+			"dependencies": {
 				"minimatch": "^3.0.5"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"regenerate": {
+		"node_modules/regenerate": {
 			"version": "1.4.2",
 			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
 			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
 		},
-		"regenerate-unicode-properties": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-			"integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-			"requires": {
+		"node_modules/regenerate-unicode-properties": {
+			"version": "10.1.1",
+			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+			"integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+			"dependencies": {
 				"regenerate": "^1.4.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/regenerator-runtime": {
+			"version": "0.14.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+		},
+		"node_modules/regenerator-transform": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+			"integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+			"dependencies": {
+				"@babel/runtime": "^7.8.4"
+			}
+		},
+		"node_modules/regexpu-core": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+			"integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+			"dependencies": {
+				"@babel/regjsgen": "^0.8.0",
+				"regenerate": "^1.4.2",
+				"regenerate-unicode-properties": "^10.1.0",
+				"regjsparser": "^0.9.1",
+				"unicode-match-property-ecmascript": "^2.0.0",
+				"unicode-match-property-value-ecmascript": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/registry-auth-token": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz",
+			"integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==",
+			"dependencies": {
+				"@pnpm/npm-conf": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/registry-url": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz",
+			"integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==",
+			"dependencies": {
+				"rc": "1.2.8"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/regjsparser": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+			"dependencies": {
+				"jsesc": "~0.5.0"
+			},
+			"bin": {
+				"regjsparser": "bin/parser"
+			}
+		},
+		"node_modules/regjsparser/node_modules/jsesc": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+			"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+			"bin": {
+				"jsesc": "bin/jsesc"
+			}
+		},
+		"node_modules/rehype-parse": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-7.0.1.tgz",
+			"integrity": "sha512-fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw==",
+			"dependencies": {
+				"hast-util-from-parse5": "^6.0.0",
+				"parse5": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"regenerator-runtime": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-			"integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+		"node_modules/rehype-parse/node_modules/parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
 		},
-		"regenerator-transform": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-			"integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-			"requires": {
-				"@babel/runtime": "^7.8.4"
+		"node_modules/rehype-raw": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-7.0.0.tgz",
+			"integrity": "sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==",
+			"dependencies": {
+				"@types/hast": "^3.0.0",
+				"hast-util-raw": "^9.0.0",
+				"vfile": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"regexpu-core": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-			"integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
-			"requires": {
-				"@babel/regjsgen": "^0.8.0",
-				"regenerate": "^1.4.2",
-				"regenerate-unicode-properties": "^10.1.0",
-				"regjsparser": "^0.9.1",
-				"unicode-match-property-ecmascript": "^2.0.0",
-				"unicode-match-property-value-ecmascript": "^2.1.0"
+		"node_modules/relateurl": {
+			"version": "0.2.7",
+			"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+			"integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"registry-auth-token": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz",
-			"integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==",
-			"requires": {
-				"rc": "1.2.8"
+		"node_modules/remark-directive": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/remark-directive/-/remark-directive-3.0.0.tgz",
+			"integrity": "sha512-l1UyWJ6Eg1VPU7Hm/9tt0zKtReJQNOA4+iDMAxTyZNWnJnFlbS/7zhiel/rogTLQ2vMYwDzSJa4BiVNqGlqIMA==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"mdast-util-directive": "^3.0.0",
+				"micromark-extension-directive": "^3.0.0",
+				"unified": "^11.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"registry-url": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-			"integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-			"requires": {
-				"rc": "^1.2.8"
+		"node_modules/remark-emoji": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/remark-emoji/-/remark-emoji-4.0.1.tgz",
+			"integrity": "sha512-fHdvsTR1dHkWKev9eNyhTo4EFwbUvJ8ka9SgeWkMPYFX4WoI7ViVBms3PjlQYgw5TLvNQso3GUB/b/8t3yo+dg==",
+			"dependencies": {
+				"@types/mdast": "^4.0.2",
+				"emoticon": "^4.0.1",
+				"mdast-util-find-and-replace": "^3.0.1",
+				"node-emoji": "^2.1.0",
+				"unified": "^11.0.4"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			}
 		},
-		"regjsparser": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-			"requires": {
-				"jsesc": "~0.5.0"
-			},
+		"node_modules/remark-frontmatter": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-5.0.0.tgz",
+			"integrity": "sha512-XTFYvNASMe5iPN0719nPrdItC9aU0ssC4v14mH1BCi1u0n1gAocqcujWUrByftZTbLhRtiKRyjYTSIOcr69UVQ==",
 			"dependencies": {
-				"jsesc": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-					"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
-				}
+				"@types/mdast": "^4.0.0",
+				"mdast-util-frontmatter": "^2.0.0",
+				"micromark-extension-frontmatter": "^2.0.0",
+				"unified": "^11.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"rehype-parse": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-7.0.1.tgz",
-			"integrity": "sha512-fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw==",
-			"requires": {
-				"hast-util-from-parse5": "^6.0.0",
-				"parse5": "^6.0.0"
-			},
+		"node_modules/remark-gfm": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.0.tgz",
+			"integrity": "sha512-U92vJgBPkbw4Zfu/IiW2oTZLSL3Zpv+uI7My2eq8JxKgqraFdU8YUGicEJCEgSbeaG+QDFqIcwwfMTOEelPxuA==",
 			"dependencies": {
-				"parse5": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-					"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-				}
+				"@types/mdast": "^4.0.0",
+				"mdast-util-gfm": "^3.0.0",
+				"micromark-extension-gfm": "^3.0.0",
+				"remark-parse": "^11.0.0",
+				"remark-stringify": "^11.0.0",
+				"unified": "^11.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"relateurl": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-			"integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="
+		"node_modules/remark-mdx": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-3.0.1.tgz",
+			"integrity": "sha512-3Pz3yPQ5Rht2pM5R+0J2MrGoBSrzf+tJG94N+t/ilfdh8YLyyKYtidAYwTveB20BoHAcwIopOUqhcmh2F7hGYA==",
+			"dependencies": {
+				"mdast-util-mdx": "^3.0.0",
+				"micromark-extension-mdxjs": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"remark-emoji": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/remark-emoji/-/remark-emoji-2.2.0.tgz",
-			"integrity": "sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w==",
-			"requires": {
-				"emoticon": "^3.2.0",
-				"node-emoji": "^1.10.0",
-				"unist-util-visit": "^2.0.3"
+		"node_modules/remark-parse": {
+			"version": "11.0.0",
+			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz",
+			"integrity": "sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"mdast-util-from-markdown": "^2.0.0",
+				"micromark-util-types": "^2.0.0",
+				"unified": "^11.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"remark-footnotes": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz",
-			"integrity": "sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ=="
-		},
-		"remark-mdx": {
-			"version": "1.6.22",
-			"resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz",
-			"integrity": "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==",
-			"requires": {
-				"@babel/core": "7.12.9",
-				"@babel/helper-plugin-utils": "7.10.4",
-				"@babel/plugin-proposal-object-rest-spread": "7.12.1",
-				"@babel/plugin-syntax-jsx": "7.12.1",
-				"@mdx-js/util": "1.6.22",
-				"is-alphabetical": "1.0.4",
-				"remark-parse": "8.0.3",
-				"unified": "9.2.0"
-			},
-			"dependencies": {
-				"@babel/core": {
-					"version": "7.12.9",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz",
-					"integrity": "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/generator": "^7.12.5",
-						"@babel/helper-module-transforms": "^7.12.1",
-						"@babel/helpers": "^7.12.5",
-						"@babel/parser": "^7.12.7",
-						"@babel/template": "^7.12.7",
-						"@babel/traverse": "^7.12.9",
-						"@babel/types": "^7.12.7",
-						"convert-source-map": "^1.7.0",
-						"debug": "^4.1.0",
-						"gensync": "^1.0.0-beta.1",
-						"json5": "^2.1.2",
-						"lodash": "^4.17.19",
-						"resolve": "^1.3.2",
-						"semver": "^5.4.1",
-						"source-map": "^0.5.0"
-					}
-				},
-				"@babel/helper-plugin-utils": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-					"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
-				},
-				"@babel/plugin-syntax-jsx": {
-					"version": "7.12.1",
-					"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
-					"integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
-					"requires": {
-						"@babel/helper-plugin-utils": "^7.10.4"
-					}
-				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-				},
-				"unified": {
-					"version": "9.2.0",
-					"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
-					"integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
-					"requires": {
-						"bail": "^1.0.0",
-						"extend": "^3.0.0",
-						"is-buffer": "^2.0.0",
-						"is-plain-obj": "^2.0.0",
-						"trough": "^1.0.0",
-						"vfile": "^4.0.0"
-					}
-				}
+		"node_modules/remark-rehype": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/remark-rehype/-/remark-rehype-11.1.0.tgz",
+			"integrity": "sha512-z3tJrAs2kIs1AqIIy6pzHmAHlF1hWQ+OdY4/hv+Wxe35EhyLKcajL33iUEn3ScxtFox9nUvRufR/Zre8Q08H/g==",
+			"dependencies": {
+				"@types/hast": "^3.0.0",
+				"@types/mdast": "^4.0.0",
+				"mdast-util-to-hast": "^13.0.0",
+				"unified": "^11.0.0",
+				"vfile": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"remark-parse": {
-			"version": "8.0.3",
-			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-			"integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
-			"requires": {
-				"ccount": "^1.0.0",
-				"collapse-white-space": "^1.0.2",
-				"is-alphabetical": "^1.0.0",
-				"is-decimal": "^1.0.0",
-				"is-whitespace-character": "^1.0.0",
-				"is-word-character": "^1.0.0",
-				"markdown-escapes": "^1.0.0",
-				"parse-entities": "^2.0.0",
-				"repeat-string": "^1.5.4",
-				"state-toggle": "^1.0.0",
-				"trim": "0.0.1",
-				"trim-trailing-lines": "^1.0.0",
-				"unherit": "^1.0.4",
-				"unist-util-remove-position": "^2.0.0",
-				"vfile-location": "^3.0.0",
-				"xtend": "^4.0.1"
-			}
-		},
-		"remark-squeeze-paragraphs": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz",
-			"integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==",
-			"requires": {
-				"mdast-squeeze-paragraphs": "^4.0.0"
+		"node_modules/remark-stringify": {
+			"version": "11.0.0",
+			"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz",
+			"integrity": "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==",
+			"dependencies": {
+				"@types/mdast": "^4.0.0",
+				"mdast-util-to-markdown": "^2.0.0",
+				"unified": "^11.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"renderkid": {
+		"node_modules/renderkid": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
 			"integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-			"requires": {
+			"dependencies": {
 				"css-select": "^4.1.3",
 				"dom-converter": "^0.2.0",
 				"htmlparser2": "^6.1.0",
 				"lodash": "^4.17.21",
 				"strip-ansi": "^6.0.1"
+			}
+		},
+		"node_modules/renderkid/node_modules/css-select": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^6.0.1",
+				"domhandler": "^4.3.1",
+				"domutils": "^2.8.0",
+				"nth-check": "^2.0.1"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/renderkid/node_modules/dom-serializer": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
 			"dependencies": {
-				"css-select": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-					"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-					"requires": {
-						"boolbase": "^1.0.0",
-						"css-what": "^6.0.1",
-						"domhandler": "^4.3.1",
-						"domutils": "^2.8.0",
-						"nth-check": "^2.0.1"
-					}
-				},
-				"dom-serializer": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-					"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.2.0",
-						"entities": "^2.0.0"
-					}
-				},
-				"domhandler": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-					"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-					"requires": {
-						"domelementtype": "^2.2.0"
-					}
-				},
-				"domutils": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.2.0",
-						"domhandler": "^4.2.0"
-					}
-				},
-				"entities": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-					"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
-				},
-				"htmlparser2": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-					"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.0.0",
-						"domutils": "^2.5.2",
-						"entities": "^2.0.0"
-					}
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/renderkid/node_modules/domhandler": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+			"dependencies": {
+				"domelementtype": "^2.2.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/renderkid/node_modules/domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+			"dependencies": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
+		"node_modules/renderkid/node_modules/entities": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/renderkid/node_modules/htmlparser2": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+			"funding": [
+				"https://github.com/fb55/htmlparser2?sponsor=1",
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
 				}
+			],
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.0.0",
+				"domutils": "^2.5.2",
+				"entities": "^2.0.0"
 			}
 		},
-		"repeat-string": {
+		"node_modules/repeat-string": {
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="
+			"integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+			"engines": {
+				"node": ">=0.10"
+			}
 		},
-		"require-from-string": {
+		"node_modules/require-from-string": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"require-like": {
+		"node_modules/require-like": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz",
-			"integrity": "sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A=="
+			"integrity": "sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A==",
+			"engines": {
+				"node": "*"
+			}
 		},
-		"requires-port": {
+		"node_modules/requires-port": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
 			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
 		},
-		"resolve": {
-			"version": "1.22.4",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
-			"integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
-			"requires": {
+		"node_modules/resolve": {
+			"version": "1.22.8",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+			"dependencies": {
 				"is-core-module": "^2.13.0",
 				"path-parse": "^1.0.7",
 				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"resolve-from": {
+		"node_modules/resolve-alpn": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+			"integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
+		},
+		"node_modules/resolve-from": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"resolve-pathname": {
+		"node_modules/resolve-pathname": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
 			"integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
 		},
-		"responselike": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-			"integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
-			"requires": {
-				"lowercase-keys": "^1.0.0"
+		"node_modules/responselike": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+			"integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
+			"dependencies": {
+				"lowercase-keys": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"retry": {
+		"node_modules/retry": {
 			"version": "0.13.1",
 			"resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-			"integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
+			"integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+			"engines": {
+				"node": ">= 4"
+			}
 		},
-		"reusify": {
+		"node_modules/reusify": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
 		},
-		"rimraf": {
+		"node_modules/rimraf": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
 			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"requires": {
+			"dependencies": {
 				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"rtl-detect": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/rtl-detect/-/rtl-detect-1.0.4.tgz",
-			"integrity": "sha512-EBR4I2VDSSYr7PkBmFy04uhycIpDKp+21p/jARYXlCSjQksTBQcJ0HFUPOO79EPPH5JS6VAhiIQbycf0O3JAxQ=="
-		},
-		"rtlcss": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.5.0.tgz",
-			"integrity": "sha512-wzgMaMFHQTnyi9YOwsx9LjOxYXJPzS8sYnFaKm6R5ysvTkwzHiB0vxnbHwchHQT65PTdBjDG21/kQBWI7q9O7A==",
-			"requires": {
-				"find-up": "^5.0.0",
+		"node_modules/rtl-detect": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/rtl-detect/-/rtl-detect-1.1.2.tgz",
+			"integrity": "sha512-PGMBq03+TTG/p/cRB7HCLKJ1MgDIi07+QU1faSjiYRfmY5UsAttV9Hs08jDAHVwcOwmVLcSJkpwyfXszVjWfIQ=="
+		},
+		"node_modules/rtlcss": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.1.1.tgz",
+			"integrity": "sha512-/oVHgBtnPNcggP2aVXQjSy6N1mMAfHg4GSag0QtZBlD5bdDgAHwr4pydqJGd+SUCu9260+Pjqbjwtvu7EMH1KQ==",
+			"dependencies": {
+				"escalade": "^3.1.1",
 				"picocolors": "^1.0.0",
-				"postcss": "^8.3.11",
+				"postcss": "^8.4.21",
 				"strip-json-comments": "^3.1.1"
 			},
-			"dependencies": {
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-					"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-					"requires": {
-						"yocto-queue": "^0.1.0"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				}
+			"bin": {
+				"rtlcss": "bin/rtlcss.js"
+			},
+			"engines": {
+				"node": ">=12.0.0"
 			}
 		},
-		"run-parallel": {
+		"node_modules/run-parallel": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
 			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"requires": {
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
 				"queue-microtask": "^1.2.2"
 			}
 		},
-		"rxjs": {
-			"version": "7.8.1",
-			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-			"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-			"requires": {
-				"tslib": "^2.1.0"
-			}
-		},
-		"safe-buffer": {
+		"node_modules/safe-buffer": {
 			"version": "5.2.1",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
 		},
-		"safer-buffer": {
+		"node_modules/safer-buffer": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"license": "MIT"
 		},
-		"sax": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-		},
-		"scheduler": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
-			"integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
-			"requires": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1"
+		"node_modules/sax": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+			"integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
+		},
+		"node_modules/scheduler": {
+			"version": "0.23.2",
+			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+			"integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+			"license": "MIT",
+			"dependencies": {
+				"loose-envify": "^1.1.0"
 			}
 		},
-		"schema-utils": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-			"requires": {
-				"@types/json-schema": "^7.0.5",
-				"ajv": "^6.12.4",
-				"ajv-keywords": "^3.5.2"
+		"node_modules/schema-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"search-insights": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.7.0.tgz",
-			"integrity": "sha512-GLbVaGgzYEKMvuJbHRhLi1qoBFnjXZGZ6l4LxOYPCp4lI2jDRB3jPU9/XNhMwv6kvnA9slTreq6pvK+b3o3aqg==",
+		"node_modules/search-insights": {
+			"version": "2.13.0",
+			"resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.13.0.tgz",
+			"integrity": "sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==",
 			"peer": true
 		},
-		"section-matter": {
+		"node_modules/section-matter": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
 			"integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==",
-			"requires": {
+			"dependencies": {
 				"extend-shallow": "^2.0.1",
 				"kind-of": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"select-hose": {
+		"node_modules/select-hose": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
 			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
 		},
-		"selfsigned": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-			"integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-			"requires": {
+		"node_modules/selfsigned": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+			"integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
+			"dependencies": {
+				"@types/node-forge": "^1.3.0",
 				"node-forge": "^1"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"semver": {
-			"version": "7.5.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-			"requires": {
-				"lru-cache": "^6.0.0"
+		"node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
 			},
-			"dependencies": {
-				"lru-cache": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-					"requires": {
-						"yallist": "^4.0.0"
-					}
-				},
-				"yallist": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-				}
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"semver-diff": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-			"integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-			"requires": {
-				"semver": "^6.3.0"
-			},
+		"node_modules/semver-diff": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz",
+			"integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==",
 			"dependencies": {
-				"semver": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-					"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-				}
+				"semver": "^7.3.5"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"send": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-			"requires": {
+		"node_modules/send": {
+			"version": "0.19.0",
+			"resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+			"integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+			"license": "MIT",
+			"dependencies": {
 				"debug": "2.6.9",
 				"depd": "2.0.0",
 				"destroy": "1.2.0",
@@ -20816,47 +13541,56 @@
 				"range-parser": "~1.2.1",
 				"statuses": "2.0.1"
 			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/send/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					},
-					"dependencies": {
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-						}
-					}
-				},
-				"ms": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-				},
-				"range-parser": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-					"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-				}
+				"ms": "2.0.0"
 			}
 		},
-		"serialize-javascript": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-			"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-			"requires": {
+		"node_modules/send/node_modules/debug/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
+		},
+		"node_modules/send/node_modules/encodeurl": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/send/node_modules/range-parser": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serialize-javascript": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
 		},
-		"serve-handler": {
+		"node_modules/serve-handler": {
 			"version": "6.1.5",
 			"resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz",
 			"integrity": "sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==",
-			"requires": {
+			"dependencies": {
 				"bytes": "3.0.0",
 				"content-disposition": "0.5.2",
 				"fast-url-parser": "1.1.3",
@@ -20865,20 +13599,18 @@
 				"path-is-inside": "1.0.2",
 				"path-to-regexp": "2.2.1",
 				"range-parser": "1.2.0"
-			},
-			"dependencies": {
-				"path-to-regexp": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz",
-					"integrity": "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ=="
-				}
 			}
 		},
-		"serve-index": {
+		"node_modules/serve-handler/node_modules/path-to-regexp": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz",
+			"integrity": "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ=="
+		},
+		"node_modules/serve-index": {
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
 			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-			"requires": {
+			"dependencies": {
 				"accepts": "~1.3.4",
 				"batch": "0.6.1",
 				"debug": "2.6.9",
@@ -20887,224 +13619,317 @@
 				"mime-types": "~2.1.17",
 				"parseurl": "~1.3.2"
 			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/serve-index/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-					"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-					"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-					"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-				},
-				"statuses": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-					"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
-				}
+				"ms": "2.0.0"
 			}
 		},
-		"serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-			"requires": {
-				"encodeurl": "~1.0.2",
+		"node_modules/serve-index/node_modules/depd": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+			"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+			"dependencies": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/inherits": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+		},
+		"node_modules/serve-index/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+		},
+		"node_modules/serve-index/node_modules/setprototypeof": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+		},
+		"node_modules/serve-index/node_modules/statuses": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+			"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-static": {
+			"version": "1.16.2",
+			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+			"integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+			"license": "MIT",
+			"dependencies": {
+				"encodeurl": "~2.0.0",
 				"escape-html": "~1.0.3",
 				"parseurl": "~1.3.3",
-				"send": "0.18.0"
+				"send": "0.19.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"setimmediate": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+		"node_modules/set-function-length": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+			"dependencies": {
+				"define-data-property": "^1.1.4",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
-		"setprototypeof": {
+		"node_modules/setprototypeof": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+			"license": "ISC"
 		},
-		"shallow-clone": {
+		"node_modules/shallow-clone": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
 			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-			"requires": {
+			"dependencies": {
 				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"shallowequal": {
+		"node_modules/shallowequal": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
 			"integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
 		},
-		"shebang-command": {
+		"node_modules/shebang-command": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"requires": {
+			"dependencies": {
 				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"shebang-regex": {
+		"node_modules/shebang-regex": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"shell-quote": {
+		"node_modules/shell-quote": {
 			"version": "1.8.1",
 			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-			"integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="
+			"integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"shelljs": {
+		"node_modules/shelljs": {
 			"version": "0.8.5",
 			"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
 			"integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
-			"requires": {
+			"dependencies": {
 				"glob": "^7.0.0",
 				"interpret": "^1.0.0",
 				"rechoir": "^0.6.2"
+			},
+			"bin": {
+				"shjs": "bin/shjs"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"side-channel": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-			"requires": {
-				"call-bind": "^1.0.0",
-				"get-intrinsic": "^1.0.2",
-				"object-inspect": "^1.9.0"
+		"node_modules/side-channel": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+			"integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.4",
+				"object-inspect": "^1.13.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"signal-exit": {
+		"node_modules/signal-exit": {
 			"version": "3.0.7",
 			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
 			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
 		},
-		"sirv": {
-			"version": "1.0.19",
-			"resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
-			"integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
-			"requires": {
-				"@polka/url": "^1.0.0-next.20",
-				"mrmime": "^1.0.0",
-				"totalist": "^1.0.0"
+		"node_modules/sirv": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+			"integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
+			"dependencies": {
+				"@polka/url": "^1.0.0-next.24",
+				"mrmime": "^2.0.0",
+				"totalist": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 10"
 			}
 		},
-		"sisteransi": {
+		"node_modules/sisteransi": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
 			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
 		},
-		"sitemap": {
+		"node_modules/sitemap": {
 			"version": "7.1.1",
 			"resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.1.1.tgz",
 			"integrity": "sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg==",
-			"requires": {
+			"dependencies": {
 				"@types/node": "^17.0.5",
 				"@types/sax": "^1.2.1",
 				"arg": "^5.0.0",
 				"sax": "^1.2.4"
 			},
+			"bin": {
+				"sitemap": "dist/cli.js"
+			},
+			"engines": {
+				"node": ">=12.0.0",
+				"npm": ">=5.6.0"
+			}
+		},
+		"node_modules/skin-tone": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/skin-tone/-/skin-tone-2.0.0.tgz",
+			"integrity": "sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==",
 			"dependencies": {
-				"@types/node": {
-					"version": "17.0.45",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
-					"integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
-				}
+				"unicode-emoji-modifier-base": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"slash": {
+		"node_modules/slash": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"sockjs": {
+		"node_modules/sockjs": {
 			"version": "0.3.24",
 			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
 			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-			"requires": {
+			"dependencies": {
 				"faye-websocket": "^0.11.3",
 				"uuid": "^8.3.2",
 				"websocket-driver": "^0.7.4"
 			}
 		},
-		"sort-css-media-queries": {
+		"node_modules/sort-css-media-queries": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/sort-css-media-queries/-/sort-css-media-queries-2.1.0.tgz",
-			"integrity": "sha512-IeWvo8NkNiY2vVYdPa27MCQiR0MN0M80johAYFVxWWXQ44KU84WNxjslwBHmc/7ZL2ccwkM7/e6S5aiKZXm7jA=="
+			"integrity": "sha512-IeWvo8NkNiY2vVYdPa27MCQiR0MN0M80johAYFVxWWXQ44KU84WNxjslwBHmc/7ZL2ccwkM7/e6S5aiKZXm7jA==",
+			"engines": {
+				"node": ">= 6.3.0"
+			}
 		},
-		"source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+		"node_modules/source-map": {
+			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+			"engines": {
+				"node": ">= 8"
+			}
 		},
-		"source-map-js": {
+		"node_modules/source-map-js": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"source-map-support": {
+		"node_modules/source-map-support": {
 			"version": "0.5.21",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
 			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-			"requires": {
+			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
 			}
 		},
-		"space-separated-tokens": {
+		"node_modules/source-map-support/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/space-separated-tokens": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-			"integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA=="
+			"integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
 		},
-		"spdy": {
+		"node_modules/spdy": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
 			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-			"requires": {
+			"dependencies": {
 				"debug": "^4.1.0",
 				"handle-thing": "^2.0.0",
 				"http-deceiver": "^1.2.7",
 				"select-hose": "^2.0.0",
 				"spdy-transport": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"spdy-transport": {
+		"node_modules/spdy-transport": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
 			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-			"requires": {
+			"dependencies": {
 				"debug": "^4.1.0",
 				"detect-node": "^2.0.4",
 				"hpack.js": "^2.1.6",
@@ -21113,137 +13938,218 @@
 				"wbuf": "^1.7.3"
 			}
 		},
-		"sprintf-js": {
+		"node_modules/sprintf-js": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
 			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
 		},
-		"stable": {
+		"node_modules/srcset": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/srcset/-/srcset-4.0.0.tgz",
+			"integrity": "sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/stable": {
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-			"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
-		},
-		"state-toggle": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-			"integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ=="
+			"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+			"deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
 		},
-		"statuses": {
+		"node_modules/statuses": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"std-env": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.4.2.tgz",
-			"integrity": "sha512-Cw6eJDX9AxEEL0g5pYj8Zx9KXtDf60rxwS2ze0HBanS0aKhj1sBlzcsmg+R0qYy8byFa854/yR2X5ZmBSClVmg=="
+		"node_modules/std-env": {
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
+			"integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg=="
 		},
-		"string_decoder": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-			"requires": {
-				"safe-buffer": "~5.2.0"
+		"node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"license": "MIT",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
 			}
 		},
-		"string-width": {
+		"node_modules/string_decoder/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"license": "MIT"
+		},
+		"node_modules/string-width": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
 			"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-			"requires": {
+			"dependencies": {
 				"eastasianwidth": "^0.2.0",
 				"emoji-regex": "^9.2.2",
 				"strip-ansi": "^7.0.1"
 			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/string-width/node_modules/ansi-regex": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
+			}
+		},
+		"node_modules/string-width/node_modules/strip-ansi": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+			"dependencies": {
+				"ansi-regex": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
+			}
+		},
+		"node_modules/stringify-entities": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz",
+			"integrity": "sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-					"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
-				},
-				"strip-ansi": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-					"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-					"requires": {
-						"ansi-regex": "^6.0.1"
-					}
-				}
+				"character-entities-html4": "^2.0.0",
+				"character-entities-legacy": "^3.0.0"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
-		"stringify-object": {
+		"node_modules/stringify-object": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
 			"integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-			"requires": {
+			"dependencies": {
 				"get-own-enumerable-property-symbols": "^3.0.0",
 				"is-obj": "^1.0.1",
 				"is-regexp": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"strip-ansi": {
+		"node_modules/strip-ansi": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
 			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"requires": {
+			"dependencies": {
 				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"strip-bom-string": {
+		"node_modules/strip-bom-string": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-			"integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g=="
+			"integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"strip-final-newline": {
+		"node_modules/strip-final-newline": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"strip-json-comments": {
+		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"style-to-object": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",
-			"integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==",
-			"requires": {
+		"node_modules/style-to-object": {
+			"version": "0.4.4",
+			"resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.4.tgz",
+			"integrity": "sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==",
+			"dependencies": {
 				"inline-style-parser": "0.1.1"
 			}
 		},
-		"stylehacks": {
+		"node_modules/stylehacks": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
 			"integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
-			"requires": {
+			"dependencies": {
 				"browserslist": "^4.21.4",
 				"postcss-selector-parser": "^6.0.4"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"supports-color": {
+		"node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"requires": {
+			"dependencies": {
 				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"supports-preserve-symlinks-flag": {
+		"node_modules/supports-preserve-symlinks-flag": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"svg-parser": {
+		"node_modules/svg-parser": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
 			"integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="
 		},
-		"svgo": {
+		"node_modules/svgo": {
 			"version": "2.8.0",
 			"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
 			"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-			"requires": {
+			"dependencies": {
 				"@trysound/sax": "0.2.0",
 				"commander": "^7.2.0",
 				"css-select": "^4.1.3",
@@ -21252,814 +14158,1091 @@
 				"picocolors": "^1.0.0",
 				"stable": "^0.1.8"
 			},
+			"bin": {
+				"svgo": "bin/svgo"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/svgo/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/svgo/node_modules/css-select": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^6.0.1",
+				"domhandler": "^4.3.1",
+				"domutils": "^2.8.0",
+				"nth-check": "^2.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/svgo/node_modules/dom-serializer": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/svgo/node_modules/domhandler": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+			"dependencies": {
+				"domelementtype": "^2.2.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/svgo/node_modules/domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
 			"dependencies": {
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
-				},
-				"css-select": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-					"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-					"requires": {
-						"boolbase": "^1.0.0",
-						"css-what": "^6.0.1",
-						"domhandler": "^4.3.1",
-						"domutils": "^2.8.0",
-						"nth-check": "^2.0.1"
-					}
-				},
-				"dom-serializer": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-					"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.2.0",
-						"entities": "^2.0.0"
-					}
-				},
-				"domhandler": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-					"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-					"requires": {
-						"domelementtype": "^2.2.0"
-					}
-				},
-				"domutils": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.2.0",
-						"domhandler": "^4.2.0"
-					}
-				},
-				"entities": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-					"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
-				}
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
+		"node_modules/svgo/node_modules/entities": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
 		},
-		"tapable": {
+		"node_modules/tapable": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
+			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"terser": {
-			"version": "5.19.2",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-			"integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
-			"requires": {
+		"node_modules/terser": {
+			"version": "5.29.1",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz",
+			"integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==",
+			"dependencies": {
 				"@jridgewell/source-map": "^0.3.3",
 				"acorn": "^8.8.2",
 				"commander": "^2.20.0",
 				"source-map-support": "~0.5.20"
 			},
-			"dependencies": {
-				"commander": {
-					"version": "2.20.3",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-					"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-				}
+			"bin": {
+				"terser": "bin/terser"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"terser-webpack-plugin": {
-			"version": "5.3.9",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
-			"integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
-			"requires": {
-				"@jridgewell/trace-mapping": "^0.3.17",
+		"node_modules/terser-webpack-plugin": {
+			"version": "5.3.10",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+			"integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.20",
 				"jest-worker": "^27.4.5",
 				"schema-utils": "^3.1.1",
 				"serialize-javascript": "^6.0.1",
-				"terser": "^5.16.8"
-			},
-			"dependencies": {
-				"jest-worker": {
-					"version": "27.5.1",
-					"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-					"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-					"requires": {
-						"@types/node": "*",
-						"merge-stream": "^2.0.0",
-						"supports-color": "^8.0.0"
-					}
+				"terser": "^5.26.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.1.0"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
 				},
-				"schema-utils": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-					"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
+				"esbuild": {
+					"optional": true
 				},
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
+				"uglify-js": {
+					"optional": true
 				}
 			}
 		},
-		"text-table": {
+		"node_modules/terser-webpack-plugin/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/jest-worker": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+			"dependencies": {
+				"@types/node": "*",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
+		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/terser/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+		},
+		"node_modules/text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
 			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
 		},
-		"thunky": {
+		"node_modules/thunky": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
 			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
 		},
-		"tiny-invariant": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
-			"integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw=="
+		"node_modules/tiny-invariant": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+			"integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="
 		},
-		"tiny-warning": {
+		"node_modules/tiny-warning": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
 			"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
 		},
-		"to-fast-properties": {
+		"node_modules/to-fast-properties": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
-		},
-		"to-readable-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-			"integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
+			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"to-regex-range": {
+		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
 			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
 			}
 		},
-		"to-vfile": {
+		"node_modules/to-vfile": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/to-vfile/-/to-vfile-6.1.0.tgz",
 			"integrity": "sha512-BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw==",
-			"requires": {
+			"dependencies": {
 				"is-buffer": "^2.0.0",
 				"vfile": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"toidentifier": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+		"node_modules/to-vfile/node_modules/@types/unist": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+			"integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+			"license": "MIT"
 		},
-		"totalist": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
-			"integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g=="
+		"node_modules/to-vfile/node_modules/unist-util-stringify-position": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
+			"integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
+			"dependencies": {
+				"@types/unist": "^2.0.2"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/to-vfile/node_modules/vfile": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
+			"integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"is-buffer": "^2.0.0",
+				"unist-util-stringify-position": "^2.0.0",
+				"vfile-message": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"tr46": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+		"node_modules/to-vfile/node_modules/vfile-message": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
+			"integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
+			"dependencies": {
+				"@types/unist": "^2.0.0",
+				"unist-util-stringify-position": "^2.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"trim": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-			"integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ=="
+		"node_modules/toidentifier": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.6"
+			}
 		},
-		"trim-trailing-lines": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz",
-			"integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ=="
+		"node_modules/totalist": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+			"integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"trough": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-			"integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="
+		"node_modules/trim-lines": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+			"integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
+		"node_modules/trough": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz",
+			"integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
 		},
-		"tslib": {
+		"node_modules/tslib": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
 			"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
 		},
-		"type-fest": {
+		"node_modules/type-fest": {
 			"version": "2.19.0",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-			"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="
+			"integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+			"engines": {
+				"node": ">=12.20"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"type-is": {
+		"node_modules/type-is": {
 			"version": "1.6.18",
 			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
 			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-			"requires": {
+			"license": "MIT",
+			"dependencies": {
 				"media-typer": "0.3.0",
 				"mime-types": "~2.1.24"
 			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/type-is/node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/type-is/node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"license": "MIT",
 			"dependencies": {
-				"mime-db": {
-					"version": "1.52.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-					"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-				},
-				"mime-types": {
-					"version": "2.1.35",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-					"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-					"requires": {
-						"mime-db": "1.52.0"
-					}
-				}
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"typedarray-to-buffer": {
+		"node_modules/typedarray-to-buffer": {
 			"version": "3.1.5",
 			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
 			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-			"requires": {
+			"dependencies": {
 				"is-typedarray": "^1.0.0"
 			}
 		},
-		"typescript": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-			"integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
-			"peer": true
-		},
-		"ua-parser-js": {
-			"version": "1.0.35",
-			"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.35.tgz",
-			"integrity": "sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA=="
-		},
-		"unherit": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-			"integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
-			"requires": {
-				"inherits": "^2.0.0",
-				"xtend": "^4.0.0"
+		"node_modules/typescript": {
+			"version": "5.4.2",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
+			"integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
+			"peer": true,
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=14.17"
 			}
 		},
-		"unicode-canonical-property-names-ecmascript": {
+		"node_modules/unicode-canonical-property-names-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
+			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-emoji-modifier-base": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz",
+			"integrity": "sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"unicode-match-property-ecmascript": {
+		"node_modules/unicode-match-property-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
 			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-			"requires": {
+			"dependencies": {
 				"unicode-canonical-property-names-ecmascript": "^2.0.0",
 				"unicode-property-aliases-ecmascript": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"unicode-match-property-value-ecmascript": {
+		"node_modules/unicode-match-property-value-ecmascript": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="
+			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"unicode-property-aliases-ecmascript": {
+		"node_modules/unicode-property-aliases-ecmascript": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
+			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"unified": {
-			"version": "9.2.2",
-			"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
-			"integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
-			"requires": {
-				"bail": "^1.0.0",
+		"node_modules/unified": {
+			"version": "11.0.5",
+			"resolved": "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz",
+			"integrity": "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==",
+			"license": "MIT",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"bail": "^2.0.0",
+				"devlop": "^1.0.0",
 				"extend": "^3.0.0",
-				"is-buffer": "^2.0.0",
-				"is-plain-obj": "^2.0.0",
-				"trough": "^1.0.0",
-				"vfile": "^4.0.0"
+				"is-plain-obj": "^4.0.0",
+				"trough": "^2.0.0",
+				"vfile": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"unique-string": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-			"integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-			"requires": {
-				"crypto-random-string": "^2.0.0"
+		"node_modules/unique-string": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz",
+			"integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==",
+			"dependencies": {
+				"crypto-random-string": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"unist-builder": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
-			"integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw=="
-		},
-		"unist-util-find-after": {
+		"node_modules/unist-util-find-after": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/unist-util-find-after/-/unist-util-find-after-3.0.0.tgz",
 			"integrity": "sha512-ojlBqfsBftYXExNu3+hHLfJQ/X1jYY/9vdm4yZWjIbf0VuWF6CRufci1ZyoD/wV2TYMKxXUoNuoqwy+CkgzAiQ==",
-			"requires": {
+			"dependencies": {
 				"unist-util-is": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"unist-util-generated": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz",
-			"integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg=="
-		},
-		"unist-util-is": {
+		"node_modules/unist-util-is": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-			"integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg=="
+			"integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"unist-util-position": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz",
-			"integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="
+		"node_modules/unist-util-position": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+			"integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
 		},
-		"unist-util-remove": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz",
-			"integrity": "sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==",
-			"requires": {
-				"unist-util-is": "^4.0.0"
+		"node_modules/unist-util-position-from-estree": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-2.0.0.tgz",
+			"integrity": "sha512-KaFVRjoqLyF6YXCbVLNad/eS4+OfPQQn2yOd7zF/h5T/CSL2v8NpN6a5TPvtbXthAGw5nG+PuTtq+DdIZr+cRQ==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"unist-util-remove-position": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-			"integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
-			"requires": {
-				"unist-util-visit": "^2.0.0"
+		"node_modules/unist-util-remove-position": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz",
+			"integrity": "sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-visit": "^5.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"unist-util-stringify-position": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-			"integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-			"requires": {
-				"@types/unist": "^2.0.2"
+		"node_modules/unist-util-stringify-position": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+			"integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"unist-util-visit": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-			"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-			"requires": {
-				"@types/unist": "^2.0.0",
-				"unist-util-is": "^4.0.0",
-				"unist-util-visit-parents": "^3.0.0"
+		"node_modules/unist-util-visit": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+			"integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-is": "^6.0.0",
+				"unist-util-visit-parents": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"unist-util-visit-parents": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-			"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-			"requires": {
-				"@types/unist": "^2.0.0",
-				"unist-util-is": "^4.0.0"
+		"node_modules/unist-util-visit-parents": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz",
+			"integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-is": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+		"node_modules/unist-util-visit-parents/node_modules/unist-util-is": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+			"integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/unist-util-visit/node_modules/unist-util-is": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+			"integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
+		"node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"engines": {
+				"node": ">= 10.0.0"
+			}
 		},
-		"unpipe": {
+		"node_modules/unpipe": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
+			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"update-browserslist-db": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-			"integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
-			"requires": {
+		"node_modules/update-browserslist-db": {
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"dependencies": {
 				"escalade": "^3.1.1",
 				"picocolors": "^1.0.0"
+			},
+			"bin": {
+				"update-browserslist-db": "cli.js"
+			},
+			"peerDependencies": {
+				"browserslist": ">= 4.21.0"
 			}
 		},
-		"update-notifier": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-			"integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-			"requires": {
-				"boxen": "^5.0.0",
-				"chalk": "^4.1.0",
-				"configstore": "^5.0.1",
-				"has-yarn": "^2.1.0",
-				"import-lazy": "^2.1.0",
-				"is-ci": "^2.0.0",
+		"node_modules/update-notifier": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz",
+			"integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==",
+			"dependencies": {
+				"boxen": "^7.0.0",
+				"chalk": "^5.0.1",
+				"configstore": "^6.0.0",
+				"has-yarn": "^3.0.0",
+				"import-lazy": "^4.0.0",
+				"is-ci": "^3.0.1",
 				"is-installed-globally": "^0.4.0",
-				"is-npm": "^5.0.0",
-				"is-yarn-global": "^0.3.0",
-				"latest-version": "^5.1.0",
-				"pupa": "^2.1.1",
-				"semver": "^7.3.4",
-				"semver-diff": "^3.1.1",
-				"xdg-basedir": "^4.0.0"
-			},
-			"dependencies": {
-				"boxen": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz",
-					"integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==",
-					"requires": {
-						"ansi-align": "^3.0.0",
-						"camelcase": "^6.2.0",
-						"chalk": "^4.1.0",
-						"cli-boxes": "^2.2.1",
-						"string-width": "^4.2.2",
-						"type-fest": "^0.20.2",
-						"widest-line": "^3.1.0",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"cli-boxes": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-					"integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"type-fest": {
-					"version": "0.20.2",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-					"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
-				},
-				"widest-line": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-					"integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-					"requires": {
-						"string-width": "^4.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				}
+				"is-npm": "^6.0.0",
+				"is-yarn-global": "^0.4.0",
+				"latest-version": "^7.0.0",
+				"pupa": "^3.1.0",
+				"semver": "^7.3.7",
+				"semver-diff": "^4.0.0",
+				"xdg-basedir": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/yeoman/update-notifier?sponsor=1"
+			}
+		},
+		"node_modules/update-notifier/node_modules/boxen": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz",
+			"integrity": "sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==",
+			"dependencies": {
+				"ansi-align": "^3.0.1",
+				"camelcase": "^7.0.1",
+				"chalk": "^5.2.0",
+				"cli-boxes": "^3.0.0",
+				"string-width": "^5.1.2",
+				"type-fest": "^2.13.0",
+				"widest-line": "^4.0.1",
+				"wrap-ansi": "^8.1.0"
+			},
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/update-notifier/node_modules/camelcase": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz",
+			"integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==",
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/update-notifier/node_modules/chalk": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+			"integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+			"engines": {
+				"node": "^12.17.0 || ^14.13 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"uri-js": {
+		"node_modules/uri-js": {
 			"version": "4.4.1",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
 			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"requires": {
-				"punycode": "^2.1.0"
-			},
 			"dependencies": {
-				"punycode": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-					"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
-				}
+				"punycode": "^2.1.0"
 			}
 		},
-		"url-loader": {
+		"node_modules/uri-js/node_modules/punycode": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/url-loader": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
 			"integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
-			"requires": {
+			"dependencies": {
 				"loader-utils": "^2.0.0",
 				"mime-types": "^2.1.27",
 				"schema-utils": "^3.0.0"
 			},
-			"dependencies": {
-				"mime-db": {
-					"version": "1.52.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-					"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-				},
-				"mime-types": {
-					"version": "2.1.35",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-					"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-					"requires": {
-						"mime-db": "1.52.0"
-					}
-				},
-				"schema-utils": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-					"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"file-loader": "*",
+				"webpack": "^4.0.0 || ^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"file-loader": {
+					"optional": true
 				}
 			}
 		},
-		"url-parse-lax": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-			"integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
-			"requires": {
-				"prepend-http": "^2.0.0"
+		"node_modules/url-loader/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"use-composed-ref": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.3.0.tgz",
-			"integrity": "sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==",
-			"requires": {}
+		"node_modules/url-loader/node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
 		},
-		"use-isomorphic-layout-effect": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
-			"integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
-			"requires": {}
+		"node_modules/url-loader/node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 		},
-		"use-latest": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.1.tgz",
-			"integrity": "sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==",
-			"requires": {
-				"use-isomorphic-layout-effect": "^1.1.1"
+		"node_modules/url-loader/node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"use-sync-external-store": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-			"integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-			"requires": {}
+		"node_modules/url-loader/node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/url-loader/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
 		},
-		"util-deprecate": {
+		"node_modules/util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
 		},
-		"utila": {
+		"node_modules/utila": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
 			"integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
 		},
-		"utility-types": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz",
-			"integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="
+		"node_modules/utility-types": {
+			"version": "3.11.0",
+			"resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.11.0.tgz",
+			"integrity": "sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==",
+			"engines": {
+				"node": ">= 4"
+			}
 		},
-		"utils-merge": {
+		"node_modules/utils-merge": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
+			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+			"engines": {
+				"node": ">= 0.4.0"
+			}
 		},
-		"uuid": {
+		"node_modules/uuid": {
 			"version": "8.3.2",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
 		},
-		"value-equal": {
+		"node_modules/value-equal": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
 			"integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
 		},
-		"vary": {
+		"node_modules/vary": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"vfile": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-			"integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-			"requires": {
-				"@types/unist": "^2.0.0",
-				"is-buffer": "^2.0.0",
-				"unist-util-stringify-position": "^2.0.0",
-				"vfile-message": "^2.0.0"
+		"node_modules/vfile": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+			"integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+			"license": "MIT",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"vfile-message": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"vfile-location": {
+		"node_modules/vfile-location": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
-			"integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="
-		},
-		"vfile-message": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-			"integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-			"requires": {
-				"@types/unist": "^2.0.0",
-				"unist-util-stringify-position": "^2.0.0"
+			"integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"wait-on": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz",
-			"integrity": "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==",
-			"requires": {
-				"axios": "^0.25.0",
-				"joi": "^17.6.0",
-				"lodash": "^4.17.21",
-				"minimist": "^1.2.5",
-				"rxjs": "^7.5.4"
+		"node_modules/vfile-message": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
+			"integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
+			"dependencies": {
+				"@types/unist": "^3.0.0",
+				"unist-util-stringify-position": "^4.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
 			}
 		},
-		"watchpack": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-			"requires": {
+		"node_modules/watchpack": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
+			"integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+			"dependencies": {
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=10.13.0"
 			}
 		},
-		"wbuf": {
+		"node_modules/wbuf": {
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
 			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-			"requires": {
+			"dependencies": {
 				"minimalistic-assert": "^1.0.0"
 			}
 		},
-		"web-namespaces": {
+		"node_modules/web-namespaces": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz",
-			"integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw=="
+			"integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
 		},
-		"webidl-conversions": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-		},
-		"webpack": {
-			"version": "5.88.2",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
-			"integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
-			"requires": {
-				"@types/eslint-scope": "^3.7.3",
-				"@types/estree": "^1.0.0",
-				"@webassemblyjs/ast": "^1.11.5",
-				"@webassemblyjs/wasm-edit": "^1.11.5",
-				"@webassemblyjs/wasm-parser": "^1.11.5",
+		"node_modules/webpack": {
+			"version": "5.94.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+			"integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+			"license": "MIT",
+			"dependencies": {
+				"@types/estree": "^1.0.5",
+				"@webassemblyjs/ast": "^1.12.1",
+				"@webassemblyjs/wasm-edit": "^1.12.1",
+				"@webassemblyjs/wasm-parser": "^1.12.1",
 				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.9.0",
-				"browserslist": "^4.14.5",
+				"acorn-import-attributes": "^1.9.5",
+				"browserslist": "^4.21.10",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.15.0",
+				"enhanced-resolve": "^5.17.1",
 				"es-module-lexer": "^1.2.1",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.9",
+				"graceful-fs": "^4.2.11",
 				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
 				"schema-utils": "^3.2.0",
 				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.3.7",
-				"watchpack": "^2.4.0",
+				"terser-webpack-plugin": "^5.3.10",
+				"watchpack": "^2.4.1",
 				"webpack-sources": "^3.2.3"
 			},
-			"dependencies": {
-				"mime-db": {
-					"version": "1.52.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-					"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-				},
-				"mime-types": {
-					"version": "2.1.35",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-					"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-					"requires": {
-						"mime-db": "1.52.0"
-					}
-				},
-				"schema-utils": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-					"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-					"requires": {
-						"@types/json-schema": "^7.0.8",
-						"ajv": "^6.12.5",
-						"ajv-keywords": "^3.5.2"
-					}
+			"bin": {
+				"webpack": "bin/webpack.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependenciesMeta": {
+				"webpack-cli": {
+					"optional": true
 				}
 			}
 		},
-		"webpack-bundle-analyzer": {
-			"version": "4.9.0",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.0.tgz",
-			"integrity": "sha512-+bXGmO1LyiNx0i9enBu3H8mv42sj/BJWhZNFwjz92tVnBa9J3JMGo2an2IXlEleoDOPn/Hofl5hr/xCpObUDtw==",
-			"requires": {
+		"node_modules/webpack-bundle-analyzer": {
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz",
+			"integrity": "sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==",
+			"dependencies": {
 				"@discoveryjs/json-ext": "0.5.7",
 				"acorn": "^8.0.4",
 				"acorn-walk": "^8.0.0",
-				"chalk": "^4.1.0",
 				"commander": "^7.2.0",
+				"debounce": "^1.2.1",
+				"escape-string-regexp": "^4.0.0",
 				"gzip-size": "^6.0.0",
-				"lodash": "^4.17.20",
+				"html-escaper": "^2.0.2",
+				"is-plain-object": "^5.0.0",
 				"opener": "^1.5.2",
-				"sirv": "^1.0.7",
+				"picocolors": "^1.0.0",
+				"sirv": "^2.0.3",
 				"ws": "^7.3.1"
 			},
-			"dependencies": {
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
-				}
+			"bin": {
+				"webpack-bundle-analyzer": "lib/bin/analyzer.js"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
 			}
 		},
-		"webpack-dev-middleware": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-			"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
-			"requires": {
+		"node_modules/webpack-bundle-analyzer/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/webpack-dev-middleware": {
+			"version": "5.3.4",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+			"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+			"license": "MIT",
+			"dependencies": {
 				"colorette": "^2.0.10",
 				"memfs": "^3.4.3",
 				"mime-types": "^2.1.31",
 				"range-parser": "^1.2.1",
 				"schema-utils": "^4.0.0"
 			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
 			"dependencies": {
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-				},
-				"mime-db": {
-					"version": "1.52.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-					"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-				},
-				"mime-types": {
-					"version": "2.1.35",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-					"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-					"requires": {
-						"mime-db": "1.52.0"
-					}
-				},
-				"range-parser": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-					"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-				},
-				"schema-utils": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-					"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.9.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.1.0"
-					}
-				}
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/range-parser": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"webpack-dev-server": {
+		"node_modules/webpack-dev-server": {
 			"version": "4.15.1",
 			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
 			"integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
-			"requires": {
+			"dependencies": {
 				"@types/bonjour": "^3.5.9",
 				"@types/connect-history-api-fallback": "^1.3.5",
 				"@types/express": "^4.17.13",
@@ -22091,234 +15274,390 @@
 				"webpack-dev-middleware": "^5.3.1",
 				"ws": "^8.13.0"
 			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+			"bin": {
+				"webpack-dev-server": "bin/webpack-dev-server.js"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.37.0 || ^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"webpack": {
+					"optional": true
 				},
-				"schema-utils": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-					"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.9.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.1.0"
-					}
+				"webpack-cli": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/ws": {
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": ">=5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
 				},
-				"ws": {
-					"version": "8.13.0",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-					"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-					"requires": {}
+				"utf-8-validate": {
+					"optional": true
 				}
 			}
 		},
-		"webpack-merge": {
-			"version": "5.9.0",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz",
-			"integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==",
-			"requires": {
+		"node_modules/webpack-merge": {
+			"version": "5.10.0",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+			"integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+			"dependencies": {
 				"clone-deep": "^4.0.1",
+				"flat": "^5.0.2",
 				"wildcard": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10.0.0"
 			}
 		},
-		"webpack-sources": {
+		"node_modules/webpack-sources": {
 			"version": "3.2.3",
 			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
+			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/webpack/node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/webpack/node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
+		},
+		"node_modules/webpack/node_modules/graceful-fs": {
+			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+			"license": "ISC"
+		},
+		"node_modules/webpack/node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
+		"node_modules/webpack/node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/webpack/node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/webpack/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
 		},
-		"webpackbar": {
+		"node_modules/webpackbar": {
 			"version": "5.0.2",
 			"resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-5.0.2.tgz",
 			"integrity": "sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==",
-			"requires": {
+			"dependencies": {
 				"chalk": "^4.1.0",
 				"consola": "^2.15.3",
 				"pretty-time": "^1.1.0",
 				"std-env": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"webpack": "3 || 4 || 5"
 			}
 		},
-		"websocket-driver": {
+		"node_modules/websocket-driver": {
 			"version": "0.7.4",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
 			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-			"requires": {
+			"dependencies": {
 				"http-parser-js": ">=0.5.1",
 				"safe-buffer": ">=5.1.0",
 				"websocket-extensions": ">=0.1.1"
+			},
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"websocket-extensions": {
+		"node_modules/websocket-extensions": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
-		},
-		"whatwg-url": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-			"requires": {
-				"tr46": "~0.0.3",
-				"webidl-conversions": "^3.0.0"
+			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"which": {
+		"node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"requires": {
+			"dependencies": {
 				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"wide-align": {
+		"node_modules/wide-align": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
 			"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-			"requires": {
+			"dependencies": {
 				"string-width": "^1.0.2 || 2 || 3 || 4"
-			},
+			}
+		},
+		"node_modules/wide-align/node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+		},
+		"node_modules/wide-align/node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dependencies": {
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				}
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"widest-line": {
+		"node_modules/widest-line": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz",
 			"integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==",
-			"requires": {
+			"dependencies": {
 				"string-width": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"wildcard": {
+		"node_modules/wildcard": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
 			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="
 		},
-		"wrap-ansi": {
+		"node_modules/wrap-ansi": {
 			"version": "8.1.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
 			"integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-			"requires": {
+			"dependencies": {
 				"ansi-styles": "^6.1.0",
 				"string-width": "^5.0.1",
 				"strip-ansi": "^7.0.1"
 			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/ansi-regex": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/ansi-styles": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+			"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/strip-ansi": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
 			"dependencies": {
-				"ansi-regex": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-					"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
-				},
-				"ansi-styles": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-					"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
-				},
-				"strip-ansi": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-					"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-					"requires": {
-						"ansi-regex": "^6.0.1"
-					}
-				}
+				"ansi-regex": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
 			}
 		},
-		"wrappy": {
+		"node_modules/wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
 		},
-		"write-file-atomic": {
+		"node_modules/write-file-atomic": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
 			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-			"requires": {
+			"dependencies": {
 				"imurmurhash": "^0.1.4",
 				"is-typedarray": "^1.0.0",
 				"signal-exit": "^3.0.2",
 				"typedarray-to-buffer": "^3.1.5"
 			}
 		},
-		"ws": {
-			"version": "7.5.9",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-			"integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-			"requires": {}
+		"node_modules/ws": {
+			"version": "7.5.10",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+			"integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=8.3.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": "^5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
 		},
-		"xdg-basedir": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-			"integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
+		"node_modules/xdg-basedir": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
+			"integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"xml-js": {
+		"node_modules/xml-js": {
 			"version": "1.6.11",
 			"resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
 			"integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
-			"requires": {
+			"dependencies": {
 				"sax": "^1.2.4"
+			},
+			"bin": {
+				"xml-js": "bin/cli.js"
 			}
 		},
-		"xtend": {
+		"node_modules/xtend": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+			"engines": {
+				"node": ">=0.4"
+			}
 		},
-		"yallist": {
+		"node_modules/yallist": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
 			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
 		},
-		"yaml": {
+		"node_modules/yaml": {
 			"version": "1.10.2",
 			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
+			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+			"engines": {
+				"node": ">= 6"
+			}
 		},
-		"yocto-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
+		"node_modules/yocto-queue": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
+			"integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=12.20"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"zwitch": {
+		"node_modules/zwitch": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-			"integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw=="
+			"integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
 		}
 	}
 }
diff --git a/platform-docs/package.json b/platform-docs/package.json
index e51921f3a5e554..d2d40a9258a0b9 100644
--- a/platform-docs/package.json
+++ b/platform-docs/package.json
@@ -16,21 +16,21 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=16.0.0",
-		"npm": ">=8 <9"
+		"node": ">=20.10.0",
+		"npm": ">=10.2.3"
 	},
 	"dependencies": {
-		"@docusaurus/core": "2.4.1",
-		"@docusaurus/preset-classic": "2.4.1",
-		"@mdx-js/react": "^1.6.22",
+		"@docusaurus/core": "^3.1.1",
+		"@docusaurus/preset-classic": "^3.1.1",
+		"@mdx-js/react": "^3.0.0",
 		"clsx": "^1.2.1",
-		"docusaurus-lunr-search": "^2.4.1",
-		"prism-react-renderer": "^1.3.5",
-		"react": "^17.0.2",
-		"react-dom": "^17.0.2"
+		"docusaurus-lunr-search": "^3.3.2",
+		"react": "^18.3.0",
+		"react-dom": "^18.3.0"
 	},
 	"devDependencies": {
-		"@docusaurus/module-type-aliases": "2.4.1"
+		"@docusaurus/module-type-aliases": "^3.1.1",
+		"@docusaurus/types": "^3.1.1"
 	},
 	"scripts": {
 		"docusaurus": "docusaurus",
diff --git a/platform-docs/src/components/HomepageBlocks/index.js b/platform-docs/src/components/HomepageBlocks/index.js
new file mode 100644
index 00000000000000..c36f643c3213b9
--- /dev/null
+++ b/platform-docs/src/components/HomepageBlocks/index.js
@@ -0,0 +1,92 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import clsx from 'clsx';
+
+/**
+ * Internal dependencies
+ */
+import styles from './styles.module.css';
+
+const blocks = [
+	{
+		title: 'Paragraph',
+		img: require( '@site/static/img/paragraph.png' ).default,
+	},
+	{
+		title: 'Heading',
+		img: require( '@site/static/img/heading.png' ).default,
+	},
+	{
+		title: 'Media & Text',
+		img: require( '@site/static/img/media-text.png' ).default,
+	},
+	{
+		title: 'Image',
+		img: require( '@site/static/img/image.png' ).default,
+	},
+	{
+		title: 'Cover',
+		img: require( '@site/static/img/cover.png' ).default,
+	},
+	{
+		title: 'Gallery',
+		img: require( '@site/static/img/gallery.png' ).default,
+	},
+	{
+		title: 'Video',
+		img: require( '@site/static/img/video.png' ).default,
+	},
+	{
+		title: 'Audio',
+		img: require( '@site/static/img/audio.png' ).default,
+	},
+	{
+		title: 'Columns',
+		img: require( '@site/static/img/columns.png' ).default,
+	},
+	{
+		title: 'File',
+		img: require( '@site/static/img/file.png' ).default,
+	},
+	{
+		title: 'Code',
+		img: require( '@site/static/img/code.png' ).default,
+	},
+	{
+		title: 'List',
+		img: require( '@site/static/img/list.png' ).default,
+	},
+];
+
+function Block( { img, title } ) {
+	return (
+		<div className={ styles.block }>
+			<div>
+				<img className={ styles.image } src={ img } alt={ title } />
+			</div>
+			<h3 className={ styles.blockTitle }>{ title }</h3>
+		</div>
+	);
+}
+
+export default function HomepageBlocks() {
+	return (
+		<section className={ styles.blocks }>
+			<div className={ clsx( 'container', styles.titleContainer ) }>
+				<h2 className={ styles.title }>Be your own builder.</h2>
+				<p className={ styles.description }>
+					Blocks allow users to build their own content without any
+					coding knowledge. Here’s a selection of the default blocks
+					included with Gutenberg:
+				</p>
+			</div>
+			<div className={ clsx( 'container', styles.grid ) }>
+				{ blocks.map( ( props, idx ) => (
+					<Block key={ idx } { ...props } />
+				) ) }
+			</div>
+		</section>
+	);
+}
diff --git a/platform-docs/src/components/HomepageBlocks/styles.module.css b/platform-docs/src/components/HomepageBlocks/styles.module.css
new file mode 100644
index 00000000000000..71607c085b81bb
--- /dev/null
+++ b/platform-docs/src/components/HomepageBlocks/styles.module.css
@@ -0,0 +1,52 @@
+.blocks {
+	padding: 8rem 0;
+	display: flex;
+	flex-direction: column;
+	gap: 1rem;
+}
+
+.titleContainer {
+	max-width: 1000px;
+}
+
+.title {
+	font-weight: 400;
+	font-size: 60px;
+}
+
+[data-theme="dark"] .title {
+	color: #fff;
+}
+
+.description {
+	font-size: 20px;
+}
+
+.grid {
+	max-width: 1000px;
+	display: grid;
+	gap: 2rem;
+	grid-template-columns: repeat(auto-fill, minmax(130px, 1fr));
+}
+
+.image {
+	width: 100%;
+	aspect-ratio: 1/1;
+}
+
+.block {
+	display: flex;
+	flex-direction: column;
+	gap: 1rem;
+}
+
+.blockTitle {
+	padding: 0;
+	margin: 0;
+	font-weight: 400;
+	text-align: center;
+}
+
+[data-theme="dark"] .blockTitle {
+	color: #fff;
+}
diff --git a/platform-docs/src/components/HomepageFeatures/index.js b/platform-docs/src/components/HomepageFeatures/index.js
index 40aa82d49bd78c..d4fabec827d1a2 100644
--- a/platform-docs/src/components/HomepageFeatures/index.js
+++ b/platform-docs/src/components/HomepageFeatures/index.js
@@ -12,8 +12,7 @@ import styles from './styles.module.css';
 const FeatureList = [
 	{
 		title: 'Easy to Use',
-		Svg: require( '@site/static/img/undraw_docusaurus_mountain.svg' )
-			.default,
+		img: require( '@site/static/img/block-media-text.png' ).default,
 		description: (
 			<>
 				Gutenberg was designed from the ground up to be easily installed
@@ -23,7 +22,7 @@ const FeatureList = [
 	},
 	{
 		title: 'Flexible',
-		Svg: require( '@site/static/img/undraw_docusaurus_tree.svg' ).default,
+		img: require( '@site/static/img/plugin-icon.png' ).default,
 		description: (
 			<>
 				Gutenberg allows you to customize the UI of your block editor as
@@ -31,23 +30,33 @@ const FeatureList = [
 			</>
 		),
 	},
+	{
+		title: 'Multi devices',
+		img: require( '@site/static/img/mobile-icon.png' ).default,
+		description: <>Work across screen sizes and devices.</>,
+	},
 	{
 		title: 'Powered by React',
-		Svg: require( '@site/static/img/undraw_docusaurus_react.svg' ).default,
+		svg: require( '@site/static/img/react-icon.svg' ).default,
 		description: <>Extend or customize your block editor using React.</>,
 	},
 ];
 
-function Feature( { Svg, title, description } ) {
+function Feature( { svg: Svg, img, title, description } ) {
 	return (
-		<div className={ clsx( 'col col--4' ) }>
-			<div className="text--center">
-				<Svg className={ styles.featureSvg } role="img" />
-			</div>
-			<div className="text--center padding-horiz--md">
-				<h3>{ title }</h3>
-				<p>{ description }</p>
+		<div className={ styles.feature }>
+			<div>
+				{ !! Svg && <Svg className={ styles.featureSvg } role="img" /> }
+				{ !! img && (
+					<img
+						className={ styles.featureSvg }
+						src={ img }
+						alt={ title }
+					/>
+				) }
 			</div>
+			<h3 className={ styles.title }>{ title }</h3>
+			<p>{ description }</p>
 		</div>
 	);
 }
@@ -55,12 +64,10 @@ function Feature( { Svg, title, description } ) {
 export default function HomepageFeatures() {
 	return (
 		<section className={ styles.features }>
-			<div className="container">
-				<div className="row">
-					{ FeatureList.map( ( props, idx ) => (
-						<Feature key={ idx } { ...props } />
-					) ) }
-				</div>
+			<div className={ clsx( 'container', styles.grid ) }>
+				{ FeatureList.map( ( props, idx ) => (
+					<Feature key={ idx } { ...props } />
+				) ) }
 			</div>
 		</section>
 	);
diff --git a/platform-docs/src/components/HomepageFeatures/styles.module.css b/platform-docs/src/components/HomepageFeatures/styles.module.css
index 1f0d53211e56ca..c8c8228422d40b 100644
--- a/platform-docs/src/components/HomepageFeatures/styles.module.css
+++ b/platform-docs/src/components/HomepageFeatures/styles.module.css
@@ -1,12 +1,34 @@
 .features {
-	display: flex;
-	align-items: center;
-	padding: 2rem 0;
-	width: 100%;
-	background: var(--ifm-color-secondary);
+	padding: 4rem 0;
+	background: url(@site/static/img/gradient_background.png);
+	background-attachment: fixed;
+	background-repeat: no-repeat;
+	background-size: cover;
+	background-position: 50% 50%;
+	color: #fff;
+}
+
+.grid {
+	max-width: 800px;
+	display: grid;
+	gap: 6rem;
+	grid-template-columns: 1fr 1fr;
 }
 
 .featureSvg {
-	height: 200px;
-	width: 200px;
+	height: 40px;
+	width: 40px;
+	fill: #fff;
+}
+
+.feature {
+	display: flex;
+	flex-direction: column;
+	gap: 1rem;
+}
+
+.title {
+	color: #fff;
+	padding: 0;
+	margin: 0;
 }
diff --git a/platform-docs/src/components/HomepageThanks/index.js b/platform-docs/src/components/HomepageThanks/index.js
new file mode 100644
index 00000000000000..61cfddf2a8fb96
--- /dev/null
+++ b/platform-docs/src/components/HomepageThanks/index.js
@@ -0,0 +1,42 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import clsx from 'clsx';
+
+/**
+ * Internal dependencies
+ */
+import styles from './styles.module.css';
+
+export default function HomepageThanks() {
+	return (
+		<section className={ styles.thanks }>
+			<div className={ clsx( 'container', styles.container ) }>
+				<h2 className={ styles.title }>Thanks for trying Gutenberg.</h2>
+				<div className={ styles.columns }>
+					<p className={ styles.description }>
+						Gutenberg is a project by the WordPress community. New
+						developments and experiments will continue in the{ ' ' }
+						<a href="http://github.com/wordPress/gutenberg/">
+							Gutenberg repository
+						</a>
+						.
+					</p>
+					<div className={ styles.links }>
+						<div>
+							<a href="https://twitter.com/WordPress">
+								Twitter ↗
+							</a>
+						</div>
+						<div>
+							<a href="http://github.com/wordPress/gutenberg/">
+								GitHub ↗
+							</a>
+						</div>
+					</div>
+				</div>
+			</div>
+		</section>
+	);
+}
diff --git a/platform-docs/src/components/HomepageThanks/styles.module.css b/platform-docs/src/components/HomepageThanks/styles.module.css
new file mode 100644
index 00000000000000..a54b6f5601e886
--- /dev/null
+++ b/platform-docs/src/components/HomepageThanks/styles.module.css
@@ -0,0 +1,31 @@
+.thanks {
+	padding: 8rem 0;
+	background: rgb(236, 246, 250);
+	color: #000;
+}
+
+[data-theme="dark"] .thanks a {
+	color: var(--ifm-color-secondary);
+}
+
+.container {
+	max-width: 1000px;
+	display: flex;
+	flex-direction: column;
+	gap: 1rem;
+}
+
+.title {
+	font-weight: 400;
+	font-size: 60px;
+}
+
+.description {
+	font-size: 20px;
+}
+
+.columns {
+	display: grid;
+	gap: 4rem;
+	grid-template-columns: 1fr 1fr;
+}
diff --git a/platform-docs/src/components/HomepageTrustedBy/index.js b/platform-docs/src/components/HomepageTrustedBy/index.js
new file mode 100644
index 00000000000000..f48205e0a057c4
--- /dev/null
+++ b/platform-docs/src/components/HomepageTrustedBy/index.js
@@ -0,0 +1,50 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+
+/**
+ * Internal dependencies
+ */
+import styles from './styles.module.css';
+
+const Users = [
+	{
+		title: 'WordPress',
+		img: require( '@site/static/img/wordpress.png' ).default,
+		height: 60,
+	},
+	{
+		title: 'Tumblr',
+		img: require( '@site/static/img/tumblr.png' ).default,
+		height: 18,
+	},
+	{
+		title: 'Day One',
+		img: require( '@site/static/img/dayone.png' ).default,
+		height: 100,
+	},
+];
+
+function User( { img, title, height } ) {
+	return (
+		<div className={ styles.col }>
+			<img src={ img } alt={ title } style={ { height } } />
+		</div>
+	);
+}
+
+export default function HomepageTrustedBy() {
+	return (
+		<section className={ styles.container }>
+			<div>
+				<h2 className={ styles.title }>Trusted by</h2>
+				<div className={ styles.row }>
+					{ Users.map( ( props, idx ) => (
+						<User key={ idx } { ...props } />
+					) ) }
+				</div>
+			</div>
+		</section>
+	);
+}
diff --git a/platform-docs/src/components/HomepageTrustedBy/styles.module.css b/platform-docs/src/components/HomepageTrustedBy/styles.module.css
new file mode 100644
index 00000000000000..c06a34f9c05283
--- /dev/null
+++ b/platform-docs/src/components/HomepageTrustedBy/styles.module.css
@@ -0,0 +1,27 @@
+.container {
+	padding: 5rem 0 4rem;
+	background: #fff;
+	color: var(--ifm-color-gray-800);
+}
+
+.container > div {
+	margin: auto;
+	max-width: var(--ifm-container-width);
+}
+
+.title {
+	text-align: center;
+	margin-bottom: 0;
+	flex-shrink: 0;
+}
+
+.row {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	gap: 2rem;
+}
+
+.col > img {
+	filter: grayscale(1);
+}
diff --git a/platform-docs/src/css/custom.css b/platform-docs/src/css/custom.css
index 34af00725ff15a..d85df1a98291b7 100644
--- a/platform-docs/src/css/custom.css
+++ b/platform-docs/src/css/custom.css
@@ -1,24 +1,32 @@
-/**
- * Any CSS included here will be global. The classic template
- * bundles Infima by default. Infima is a CSS framework designed to
- * work well for content-centric websites.
- */
+body {
+	font-family:
+		-apple-system,
+		BlinkMacSystemFont,
+		"Segoe UI",
+		Roboto,
+		Oxygen-Sans,
+		Ubuntu,
+		Cantarell,
+		"Helvetica Neue",
+		sans-serif;
+}
 
-/* You can override the default Infima variables here. */
 :root {
 	--ifm-color-primary: #3858e9;
-	--ifm-color-primary-dark: #3858e9;
-	--ifm-color-primary-darker: #3858e9;
-	--ifm-color-primary-darkest: #3858e9;
-	--ifm-color-primary-light: #3858e9;
-	--ifm-color-primary-lighter: #3858e9;
-	--ifm-color-primary-lightest: #3858e9;
+	--ifm-color-primary-dark: #1e42e6;
+	--ifm-color-primary-darker: #183cdd;
+	--ifm-color-primary-darkest: #1431b6;
+	--ifm-color-primary-light: #526eec;
+	--ifm-color-primary-lighter: #5f79ed;
+	--ifm-color-primary-lightest: #869af2;
 	--ifm-color-secondary: #e9edfd;
 	--ifm-code-font-size: 95%;
 	--docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.1);
+
+	--ifm-heading-color: #000;
+	--ifm-navbar-shadow: rgba(0, 0, 0, 0.1) 0 1px 1px 0;
 }
 
-/* For readability concerns, you should choose a lighter palette in dark mode. */
 [data-theme="dark"] {
 	--ifm-color-primary: #c6d0ff;
 	--ifm-color-primary-dark: #c6d0ff;
diff --git a/platform-docs/src/pages/index.js b/platform-docs/src/pages/index.js
index a61a9254c40297..d820e6fdcdc8cf 100644
--- a/platform-docs/src/pages/index.js
+++ b/platform-docs/src/pages/index.js
@@ -12,17 +12,33 @@ import HomepageFeatures from '@site/src/components/HomepageFeatures';
  * Internal dependencies
  */
 import styles from './index.module.css';
+import HomepageTrustedBy from '../components/HomepageTrustedBy';
+import HomepageBlocks from '../components/HomepageBlocks';
+import HomepageThanks from '../components/HomepageThanks';
 
 function HomepageHeader() {
 	const { siteConfig } = useDocusaurusContext();
 	return (
 		<header className={ clsx( 'hero hero-secondary', styles.heroBanner ) }>
-			<div className="container">
-				<h1 className="hero__title">{ siteConfig.title }</h1>
+			<div className={ clsx( 'container', styles.container ) }>
+				<div className={ styles.heroLogo }>
+					<img
+						src={
+							require( '@site/static/img/gutenberg_icon.png' )
+								.default
+						}
+						alt="Gutenberg"
+						width="38"
+						height="38"
+					/>
+				</div>
+				<h1 className={ styles.heroTitle }>
+					Say hello to Gutenberg, the block editor.
+				</h1>
 				<p className="hero__subtitle">{ siteConfig.tagline }</p>
 				<div className={ styles.buttons }>
 					<Link
-						className="button button--primary button--lg"
+						className="button button--primary button--outline"
 						to="/docs/intro"
 					>
 						Getting started - 10min ⏱️
@@ -43,6 +59,9 @@ export default function Home() {
 			<HomepageHeader />
 			<main>
 				<HomepageFeatures />
+				<HomepageBlocks />
+				<HomepageThanks />
+				<HomepageTrustedBy />
 			</main>
 		</Layout>
 	);
diff --git a/platform-docs/src/pages/index.module.css b/platform-docs/src/pages/index.module.css
index 7b210d6cc440c5..5f79b7562f5797 100644
--- a/platform-docs/src/pages/index.module.css
+++ b/platform-docs/src/pages/index.module.css
@@ -1,23 +1,31 @@
-/**
- * CSS files with the .module.css suffix will be treated as CSS modules
- * and scoped locally.
- */
+.heroLogo {
+	padding-bottom: 3rem;
+}
+
+.heroTitle {
+	font-weight: 400;
+	font-size: 80px;
+}
+
+[data-theme="dark"] .heroTitle {
+	color: #fff;
+}
 
 .heroBanner {
-	padding: 10rem 0;
-	text-align: center;
 	position: relative;
 	overflow: hidden;
 }
 
-@media screen and (max-width: 996px) {
-	.heroBanner {
-		padding: 2rem;
-	}
+.container {
+	display: flex;
+	flex-direction: column;
+	gap: 1rem;
+	max-width: 800px;
+	padding: 5rem 0;
 }
 
 .buttons {
-	display: flex;
-	align-items: center;
-	justify-content: center;
+	--ifm-button-border-radius: 50px;
+	--ifm-button-size-multiplier: 1.5;
+	--ifm-button-font-weight: 500;
 }
diff --git a/platform-docs/static/img/audio.png b/platform-docs/static/img/audio.png
new file mode 100644
index 00000000000000..513caf78e57050
Binary files /dev/null and b/platform-docs/static/img/audio.png differ
diff --git a/platform-docs/static/img/block-media-text.png b/platform-docs/static/img/block-media-text.png
new file mode 100644
index 00000000000000..9e7b78a96dcdfa
Binary files /dev/null and b/platform-docs/static/img/block-media-text.png differ
diff --git a/platform-docs/static/img/code.png b/platform-docs/static/img/code.png
new file mode 100644
index 00000000000000..2ca9e3404890da
Binary files /dev/null and b/platform-docs/static/img/code.png differ
diff --git a/platform-docs/static/img/columns.png b/platform-docs/static/img/columns.png
new file mode 100644
index 00000000000000..2f12fca11824a3
Binary files /dev/null and b/platform-docs/static/img/columns.png differ
diff --git a/platform-docs/static/img/cover.png b/platform-docs/static/img/cover.png
new file mode 100644
index 00000000000000..0ad011f85a27ee
Binary files /dev/null and b/platform-docs/static/img/cover.png differ
diff --git a/platform-docs/static/img/dayone.png b/platform-docs/static/img/dayone.png
new file mode 100644
index 00000000000000..7fab9ab6ec2b46
Binary files /dev/null and b/platform-docs/static/img/dayone.png differ
diff --git a/platform-docs/static/img/file.png b/platform-docs/static/img/file.png
new file mode 100644
index 00000000000000..d0fc342541baa7
Binary files /dev/null and b/platform-docs/static/img/file.png differ
diff --git a/platform-docs/static/img/gallery.png b/platform-docs/static/img/gallery.png
new file mode 100644
index 00000000000000..de1bc9689f1549
Binary files /dev/null and b/platform-docs/static/img/gallery.png differ
diff --git a/platform-docs/static/img/gradient_background.png b/platform-docs/static/img/gradient_background.png
new file mode 100644
index 00000000000000..851e12b1a91d1b
Binary files /dev/null and b/platform-docs/static/img/gradient_background.png differ
diff --git a/platform-docs/static/img/gutenberg_icon.png b/platform-docs/static/img/gutenberg_icon.png
new file mode 100644
index 00000000000000..44f41d0019552c
Binary files /dev/null and b/platform-docs/static/img/gutenberg_icon.png differ
diff --git a/platform-docs/static/img/heading.png b/platform-docs/static/img/heading.png
new file mode 100644
index 00000000000000..2432805003d671
Binary files /dev/null and b/platform-docs/static/img/heading.png differ
diff --git a/platform-docs/static/img/image.png b/platform-docs/static/img/image.png
new file mode 100644
index 00000000000000..6a4459d791c6bf
Binary files /dev/null and b/platform-docs/static/img/image.png differ
diff --git a/platform-docs/static/img/list.png b/platform-docs/static/img/list.png
new file mode 100644
index 00000000000000..59b848107ac8b2
Binary files /dev/null and b/platform-docs/static/img/list.png differ
diff --git a/platform-docs/static/img/media-text.png b/platform-docs/static/img/media-text.png
new file mode 100644
index 00000000000000..36d4d2b6a2f1c3
Binary files /dev/null and b/platform-docs/static/img/media-text.png differ
diff --git a/platform-docs/static/img/mobile-icon.png b/platform-docs/static/img/mobile-icon.png
new file mode 100644
index 00000000000000..1decbca5daa2f6
Binary files /dev/null and b/platform-docs/static/img/mobile-icon.png differ
diff --git a/platform-docs/static/img/paragraph.png b/platform-docs/static/img/paragraph.png
new file mode 100644
index 00000000000000..4a47dfd6edaf15
Binary files /dev/null and b/platform-docs/static/img/paragraph.png differ
diff --git a/platform-docs/static/img/plugin-icon.png b/platform-docs/static/img/plugin-icon.png
new file mode 100644
index 00000000000000..fcb257e46e16b6
Binary files /dev/null and b/platform-docs/static/img/plugin-icon.png differ
diff --git a/platform-docs/static/img/react-icon.svg b/platform-docs/static/img/react-icon.svg
new file mode 100644
index 00000000000000..1c5118db70fb62
--- /dev/null
+++ b/platform-docs/static/img/react-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 32 32"><g transform="matrix(.05696 0 0 .05696 .647744 2.43826)" fill="none" fill-rule="evenodd"><circle r="50.167" cy="237.628" cx="269.529" fill="#00d8ff"/><g stroke="#00d8ff" stroke-width="24"><path d="M269.53 135.628c67.356 0 129.928 9.665 177.107 25.907 56.844 19.57 91.794 49.233 91.794 76.093 0 27.99-37.04 59.503-98.083 79.728-46.15 15.29-106.88 23.272-170.818 23.272-65.554 0-127.63-7.492-174.3-23.44-59.046-20.182-94.61-52.103-94.61-79.56 0-26.642 33.37-56.076 89.415-75.616 47.355-16.51 111.472-26.384 179.486-26.384z"/><path d="M180.736 186.922c33.65-58.348 73.28-107.724 110.92-140.48C337.006 6.976 380.163-8.48 403.43 4.937c24.248 13.983 33.042 61.814 20.067 124.796-9.8 47.618-33.234 104.212-65.176 159.6-32.75 56.788-70.25 106.82-107.377 139.272-46.98 41.068-92.4 55.93-116.185 42.213-23.08-13.3-31.906-56.92-20.834-115.233 9.355-49.27 32.832-109.745 66.8-168.664z"/><path d="M180.82 289.482C147.075 231.2 124.1 172.195 114.51 123.227c-11.544-59-3.382-104.11 19.864-117.566 24.224-14.024 70.055 2.244 118.14 44.94 36.356 32.28 73.688 80.837 105.723 136.173 32.844 56.733 57.46 114.21 67.036 162.582 12.117 61.213 2.31 107.984-21.453 121.74-23.057 13.348-65.25-.784-110.24-39.5-38.013-32.71-78.682-83.253-112.76-142.115z"/></g></g></svg>
\ No newline at end of file
diff --git a/platform-docs/static/img/tumblr.png b/platform-docs/static/img/tumblr.png
new file mode 100644
index 00000000000000..333aac82b419a4
Binary files /dev/null and b/platform-docs/static/img/tumblr.png differ
diff --git a/platform-docs/static/img/undraw_docusaurus_mountain.svg b/platform-docs/static/img/undraw_docusaurus_mountain.svg
deleted file mode 100644
index af961c49a88882..00000000000000
--- a/platform-docs/static/img/undraw_docusaurus_mountain.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1088" height="687.962" viewBox="0 0 1088 687.962">
-  <title>Easy to Use</title>
-  <g id="Group_12" data-name="Group 12" transform="translate(-57 -56)">
-    <g id="Group_11" data-name="Group 11" transform="translate(57 56)">
-      <path id="Path_83" data-name="Path 83" d="M1017.81,560.461c-5.27,45.15-16.22,81.4-31.25,110.31-20,38.52-54.21,54.04-84.77,70.28a193.275,193.275,0,0,1-27.46,11.94c-55.61,19.3-117.85,14.18-166.74,3.99a657.282,657.282,0,0,0-104.09-13.16q-14.97-.675-29.97-.67c-15.42.02-293.07,5.29-360.67-131.57-16.69-33.76-28.13-75-32.24-125.27-11.63-142.12,52.29-235.46,134.74-296.47,155.97-115.41,369.76-110.57,523.43,7.88C941.15,276.621,1036.99,396.031,1017.81,560.461Z" transform="translate(-56 -106.019)" fill="#3f3d56"/>
-      <path id="Path_84" data-name="Path 84" d="M986.56,670.771c-20,38.52-47.21,64.04-77.77,80.28a193.272,193.272,0,0,1-27.46,11.94c-55.61,19.3-117.85,14.18-166.74,3.99a657.3,657.3,0,0,0-104.09-13.16q-14.97-.675-29.97-.67-23.13.03-46.25,1.72c-100.17,7.36-253.82-6.43-321.42-143.29L382,283.981,444.95,445.6l20.09,51.59,55.37-75.98L549,381.981l130.2,149.27,36.8-81.27L970.78,657.9l14.21,11.59Z" transform="translate(-56 -106.019)" fill="#f2f2f2"/>
-      <path id="Path_85" data-name="Path 85" d="M302,282.962l26-57,36,83-31-60Z" opacity="0.1"/>
-      <path id="Path_86" data-name="Path 86" d="M610.5,753.821q-14.97-.675-29.97-.67L465.04,497.191Z" transform="translate(-56 -106.019)" opacity="0.1"/>
-      <path id="Path_87" data-name="Path 87" d="M464.411,315.191,493,292.962l130,150-132-128Z" opacity="0.1"/>
-      <path id="Path_88" data-name="Path 88" d="M908.79,751.051a193.265,193.265,0,0,1-27.46,11.94L679.2,531.251Z" transform="translate(-56 -106.019)" opacity="0.1"/>
-      <circle id="Ellipse_11" data-name="Ellipse 11" cx="3" cy="3" r="3" transform="translate(479 98.962)" fill="#f2f2f2"/>
-      <circle id="Ellipse_12" data-name="Ellipse 12" cx="3" cy="3" r="3" transform="translate(396 201.962)" fill="#f2f2f2"/>
-      <circle id="Ellipse_13" data-name="Ellipse 13" cx="2" cy="2" r="2" transform="translate(600 220.962)" fill="#f2f2f2"/>
-      <circle id="Ellipse_14" data-name="Ellipse 14" cx="2" cy="2" r="2" transform="translate(180 265.962)" fill="#f2f2f2"/>
-      <circle id="Ellipse_15" data-name="Ellipse 15" cx="2" cy="2" r="2" transform="translate(612 96.962)" fill="#f2f2f2"/>
-      <circle id="Ellipse_16" data-name="Ellipse 16" cx="2" cy="2" r="2" transform="translate(736 192.962)" fill="#f2f2f2"/>
-      <circle id="Ellipse_17" data-name="Ellipse 17" cx="2" cy="2" r="2" transform="translate(858 344.962)" fill="#f2f2f2"/>
-      <path id="Path_89" data-name="Path 89" d="M306,121.222h-2.76v-2.76h-1.48v2.76H299V122.7h2.76v2.759h1.48V122.7H306Z" fill="#f2f2f2"/>
-      <path id="Path_90" data-name="Path 90" d="M848,424.222h-2.76v-2.76h-1.48v2.76H841V425.7h2.76v2.759h1.48V425.7H848Z" fill="#f2f2f2"/>
-      <path id="Path_91" data-name="Path 91" d="M1144,719.981c0,16.569-243.557,74-544,74s-544-57.431-544-74,243.557,14,544,14S1144,703.413,1144,719.981Z" transform="translate(-56 -106.019)" fill="#3f3d56"/>
-      <path id="Path_92" data-name="Path 92" d="M1144,719.981c0,16.569-243.557,74-544,74s-544-57.431-544-74,243.557,14,544,14S1144,703.413,1144,719.981Z" transform="translate(-56 -106.019)" opacity="0.1"/>
-      <ellipse id="Ellipse_18" data-name="Ellipse 18" cx="544" cy="30" rx="544" ry="30" transform="translate(0 583.962)" fill="#3f3d56"/>
-      <path id="Path_93" data-name="Path 93" d="M624,677.981c0,33.137-14.775,24-33,24s-33,9.137-33-24,33-96,33-96S624,644.844,624,677.981Z" transform="translate(-56 -106.019)" fill="#ff6584"/>
-      <path id="Path_94" data-name="Path 94" d="M606,690.66c0,15.062-6.716,10.909-15,10.909s-15,4.153-15-10.909,15-43.636,15-43.636S606,675.6,606,690.66Z" transform="translate(-56 -106.019)" opacity="0.1"/>
-      <rect id="Rectangle_97" data-name="Rectangle 97" width="92" height="18" rx="9" transform="translate(489 604.962)" fill="#2f2e41"/>
-      <rect id="Rectangle_98" data-name="Rectangle 98" width="92" height="18" rx="9" transform="translate(489 586.962)" fill="#2f2e41"/>
-      <path id="Path_95" data-name="Path 95" d="M193,596.547c0,55.343,34.719,100.126,77.626,100.126" transform="translate(-56 -106.019)" fill="#3f3d56"/>
-      <path id="Path_96" data-name="Path 96" d="M270.626,696.673c0-55.965,38.745-101.251,86.626-101.251" transform="translate(-56 -106.019)" fill="#6c63ff"/>
-      <path id="Path_97" data-name="Path 97" d="M221.125,601.564c0,52.57,22.14,95.109,49.5,95.109" transform="translate(-56 -106.019)" fill="#6c63ff"/>
-      <path id="Path_98" data-name="Path 98" d="M270.626,696.673c0-71.511,44.783-129.377,100.126-129.377" transform="translate(-56 -106.019)" fill="#3f3d56"/>
-      <path id="Path_99" data-name="Path 99" d="M254.3,697.379s11.009-.339,14.326-2.7,16.934-5.183,17.757-1.395,16.544,18.844,4.115,18.945-28.879-1.936-32.19-3.953S254.3,697.379,254.3,697.379Z" transform="translate(-56 -106.019)" fill="#a8a8a8"/>
-      <path id="Path_100" data-name="Path 100" d="M290.716,710.909c-12.429.1-28.879-1.936-32.19-3.953-2.522-1.536-3.527-7.048-3.863-9.591l-.368.014s.7,8.879,4.009,10.9,19.761,4.053,32.19,3.953c3.588-.029,4.827-1.305,4.759-3.2C294.755,710.174,293.386,710.887,290.716,710.909Z" transform="translate(-56 -106.019)" opacity="0.2"/>
-      <path id="Path_101" data-name="Path 101" d="M777.429,633.081c0,38.029,23.857,68.8,53.341,68.8" transform="translate(-56 -106.019)" fill="#3f3d56"/>
-      <path id="Path_102" data-name="Path 102" d="M830.769,701.882c0-38.456,26.623-69.575,59.525-69.575" transform="translate(-56 -106.019)" fill="#6c63ff"/>
-      <path id="Path_103" data-name="Path 103" d="M796.755,636.528c0,36.124,15.213,65.354,34.014,65.354" transform="translate(-56 -106.019)" fill="#6c63ff"/>
-      <path id="Path_104" data-name="Path 104" d="M830.769,701.882c0-49.139,30.773-88.9,68.8-88.9" transform="translate(-56 -106.019)" fill="#3f3d56"/>
-      <path id="Path_105" data-name="Path 105" d="M819.548,702.367s7.565-.233,9.844-1.856,11.636-3.562,12.2-.958,11.368,12.949,2.828,13.018-19.844-1.33-22.119-2.716S819.548,702.367,819.548,702.367Z" transform="translate(-56 -106.019)" fill="#a8a8a8"/>
-      <path id="Path_106" data-name="Path 106" d="M844.574,711.664c-8.54.069-19.844-1.33-22.119-2.716-1.733-1.056-2.423-4.843-2.654-6.59l-.253.01s.479,6.1,2.755,7.487,13.579,2.785,22.119,2.716c2.465-.02,3.317-.9,3.27-2.2C847.349,711.159,846.409,711.649,844.574,711.664Z" transform="translate(-56 -106.019)" opacity="0.2"/>
-      <path id="Path_107" data-name="Path 107" d="M949.813,724.718s11.36-1.729,14.5-4.591,16.89-7.488,18.217-3.667,19.494,17.447,6.633,19.107-30.153,1.609-33.835-.065S949.813,724.718,949.813,724.718Z" transform="translate(-56 -106.019)" fill="#a8a8a8"/>
-      <path id="Path_108" data-name="Path 108" d="M989.228,734.173c-12.86,1.659-30.153,1.609-33.835-.065-2.8-1.275-4.535-6.858-5.2-9.45l-.379.061s1.833,9.109,5.516,10.783,20.975,1.725,33.835.065c3.712-.479,4.836-1.956,4.529-3.906C993.319,732.907,991.991,733.817,989.228,734.173Z" transform="translate(-56 -106.019)" opacity="0.2"/>
-      <path id="Path_109" data-name="Path 109" d="M670.26,723.9s9.587-1.459,12.237-3.875,14.255-6.32,15.374-3.095,16.452,14.725,5.6,16.125-25.448,1.358-28.555-.055S670.26,723.9,670.26,723.9Z" transform="translate(-56 -106.019)" fill="#a8a8a8"/>
-      <path id="Path_110" data-name="Path 110" d="M703.524,731.875c-10.853,1.4-25.448,1.358-28.555-.055-2.367-1.076-3.827-5.788-4.39-7.976l-.32.051s1.547,7.687,4.655,9.1,17.7,1.456,28.555.055c3.133-.4,4.081-1.651,3.822-3.3C706.977,730.807,705.856,731.575,703.524,731.875Z" transform="translate(-56 -106.019)" opacity="0.2"/>
-      <path id="Path_111" data-name="Path 111" d="M178.389,719.109s7.463-1.136,9.527-3.016,11.1-4.92,11.969-2.409,12.808,11.463,4.358,12.553-19.811,1.057-22.23-.043S178.389,719.109,178.389,719.109Z" transform="translate(-56 -106.019)" fill="#a8a8a8"/>
-      <path id="Path_112" data-name="Path 112" d="M204.285,725.321c-8.449,1.09-19.811,1.057-22.23-.043-1.842-.838-2.979-4.506-3.417-6.209l-.249.04s1.2,5.984,3.624,7.085,13.781,1.133,22.23.043c2.439-.315,3.177-1.285,2.976-2.566C206.973,724.489,206.1,725.087,204.285,725.321Z" transform="translate(-56 -106.019)" opacity="0.2"/>
-      <path id="Path_113" data-name="Path 113" d="M439.7,707.337c0,30.22-42.124,20.873-93.7,20.873s-93.074,9.347-93.074-20.873,42.118-36.793,93.694-36.793S439.7,677.117,439.7,707.337Z" transform="translate(-56 -106.019)" opacity="0.1"/>
-      <path id="Path_114" data-name="Path 114" d="M439.7,699.9c0,30.22-42.124,20.873-93.7,20.873s-93.074,9.347-93.074-20.873S295.04,663.1,346.616,663.1,439.7,669.676,439.7,699.9Z" transform="translate(-56 -106.019)" fill="#3f3d56"/>
-    </g>
-    <g id="docusaurus_keytar" transform="translate(312.271 493.733)">
-      <path id="Path_40" data-name="Path 40" d="M99,52h91.791V89.153H99Z" transform="translate(5.904 -14.001)" fill="#fff" fill-rule="evenodd"/>
-      <path id="Path_41" data-name="Path 41" d="M24.855,163.927A21.828,21.828,0,0,1,5.947,153a21.829,21.829,0,0,0,18.908,32.782H46.71V163.927Z" transform="translate(-3 -4.634)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_42" data-name="Path 42" d="M121.861,61.1l76.514-4.782V45.39A21.854,21.854,0,0,0,176.52,23.535H78.173L75.441,18.8a3.154,3.154,0,0,0-5.464,0l-2.732,4.732L64.513,18.8a3.154,3.154,0,0,0-5.464,0l-2.732,4.732L53.586,18.8a3.154,3.154,0,0,0-5.464,0L45.39,23.535c-.024,0-.046,0-.071,0l-4.526-4.525a3.153,3.153,0,0,0-5.276,1.414l-1.5,5.577-5.674-1.521a3.154,3.154,0,0,0-3.863,3.864L26,34.023l-5.575,1.494a3.155,3.155,0,0,0-1.416,5.278l4.526,4.526c0,.023,0,.046,0,.07L18.8,48.122a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,59.05a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,69.977a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,80.9a3.154,3.154,0,0,0,0,5.464L23.535,89.1,18.8,91.832a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,102.76a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,113.687a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,124.615a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,135.542a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,146.469a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,157.4a3.154,3.154,0,0,0,0,5.464l4.732,2.732L18.8,168.324a3.154,3.154,0,0,0,0,5.464l4.732,2.732A21.854,21.854,0,0,0,45.39,198.375H176.52a21.854,21.854,0,0,0,21.855-21.855V89.1l-76.514-4.782a11.632,11.632,0,0,1,0-23.219" transform="translate(-1.681 -17.226)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_43" data-name="Path 43" d="M143,186.71h32.782V143H143Z" transform="translate(9.984 -5.561)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_44" data-name="Path 44" d="M196.71,159.855a5.438,5.438,0,0,0-.7.07c-.042-.164-.081-.329-.127-.493a5.457,5.457,0,1,0-5.4-9.372q-.181-.185-.366-.367a5.454,5.454,0,1,0-9.384-5.4c-.162-.046-.325-.084-.486-.126a5.467,5.467,0,1,0-10.788,0c-.162.042-.325.08-.486.126a5.457,5.457,0,1,0-9.384,5.4,21.843,21.843,0,1,0,36.421,21.02,5.452,5.452,0,1,0,.7-10.858" transform="translate(10.912 -6.025)" fill="#44d860" fill-rule="evenodd"/>
-      <path id="Path_45" data-name="Path 45" d="M153,124.855h32.782V103H153Z" transform="translate(10.912 -9.271)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_46" data-name="Path 46" d="M194.855,116.765a2.732,2.732,0,1,0,0-5.464,2.811,2.811,0,0,0-.349.035c-.022-.082-.04-.164-.063-.246a2.733,2.733,0,0,0-1.052-5.253,2.7,2.7,0,0,0-1.648.566q-.09-.093-.184-.184a2.7,2.7,0,0,0,.553-1.633,2.732,2.732,0,0,0-5.245-1.07,10.928,10.928,0,1,0,0,21.031,2.732,2.732,0,0,0,5.245-1.07,2.7,2.7,0,0,0-.553-1.633q.093-.09.184-.184a2.7,2.7,0,0,0,1.648.566,2.732,2.732,0,0,0,1.052-5.253c.023-.081.042-.164.063-.246a2.814,2.814,0,0,0,.349.035" transform="translate(12.767 -9.377)" fill="#44d860" fill-rule="evenodd"/>
-      <path id="Path_47" data-name="Path 47" d="M65.087,56.891a2.732,2.732,0,0,1-2.732-2.732,8.2,8.2,0,0,0-16.391,0,2.732,2.732,0,0,1-5.464,0,13.659,13.659,0,0,1,27.319,0,2.732,2.732,0,0,1-2.732,2.732" transform="translate(0.478 -15.068)" fill-rule="evenodd"/>
-      <path id="Path_48" data-name="Path 48" d="M103,191.347h65.565a21.854,21.854,0,0,0,21.855-21.855V93H124.855A21.854,21.854,0,0,0,103,114.855Z" transform="translate(6.275 -10.199)" fill="#ffff50" fill-rule="evenodd"/>
-      <path id="Path_49" data-name="Path 49" d="M173.216,129.787H118.535a1.093,1.093,0,1,1,0-2.185h54.681a1.093,1.093,0,0,1,0,2.185m0,21.855H118.535a1.093,1.093,0,1,1,0-2.186h54.681a1.093,1.093,0,0,1,0,2.186m0,21.855H118.535a1.093,1.093,0,1,1,0-2.185h54.681a1.093,1.093,0,0,1,0,2.185m0-54.434H118.535a1.093,1.093,0,1,1,0-2.185h54.681a1.093,1.093,0,0,1,0,2.185m0,21.652H118.535a1.093,1.093,0,1,1,0-2.186h54.681a1.093,1.093,0,0,1,0,2.186m0,21.855H118.535a1.093,1.093,0,1,1,0-2.186h54.681a1.093,1.093,0,0,1,0,2.186M189.585,61.611c-.013,0-.024-.007-.037-.005-3.377.115-4.974,3.492-6.384,6.472-1.471,3.114-2.608,5.139-4.473,5.078-2.064-.074-3.244-2.406-4.494-4.874-1.436-2.835-3.075-6.049-6.516-5.929-3.329.114-4.932,3.053-6.346,5.646-1.5,2.762-2.529,4.442-4.5,4.364-2.106-.076-3.225-1.972-4.52-4.167-1.444-2.443-3.112-5.191-6.487-5.1-3.272.113-4.879,2.606-6.3,4.808-1.5,2.328-2.552,3.746-4.551,3.662-2.156-.076-3.27-1.65-4.558-3.472-1.447-2.047-3.077-4.363-6.442-4.251-3.2.109-4.807,2.153-6.224,3.954-1.346,1.709-2.4,3.062-4.621,2.977a1.093,1.093,0,0,0-.079,2.186c3.3.11,4.967-1.967,6.417-3.81,1.286-1.635,2.4-3.045,4.582-3.12,2.1-.09,3.091,1.218,4.584,3.327,1.417,2,3.026,4.277,6.263,4.394,3.391.114,5.022-2.42,6.467-4.663,1.292-2,2.406-3.734,4.535-3.807,1.959-.073,3.026,1.475,4.529,4.022,1.417,2.4,3.023,5.121,6.324,5.241,3.415.118,5.064-2.863,6.5-5.5,1.245-2.282,2.419-4.437,4.5-4.509,1.959-.046,2.981,1.743,4.492,4.732,1.412,2.79,3.013,5.95,6.365,6.071l.185,0c3.348,0,4.937-3.36,6.343-6.331,1.245-2.634,2.423-5.114,4.444-5.216Z" transform="translate(7.109 -13.11)" fill-rule="evenodd"/>
-      <path id="Path_50" data-name="Path 50" d="M83,186.71h43.71V143H83Z" transform="translate(4.42 -5.561)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <g id="Group_8" data-name="Group 8" transform="matrix(0.966, -0.259, 0.259, 0.966, 109.327, 91.085)">
-        <rect id="Rectangle_3" data-name="Rectangle 3" width="92.361" height="36.462" rx="2" transform="translate(0 0)" fill="#d8d8d8"/>
-        <g id="Group_2" data-name="Group 2" transform="translate(1.531 23.03)">
-          <rect id="Rectangle_4" data-name="Rectangle 4" width="5.336" height="5.336" rx="1" transform="translate(16.797 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_5" data-name="Rectangle 5" width="5.336" height="5.336" rx="1" transform="translate(23.12 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_6" data-name="Rectangle 6" width="5.336" height="5.336" rx="1" transform="translate(29.444 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_7" data-name="Rectangle 7" width="5.336" height="5.336" rx="1" transform="translate(35.768 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_8" data-name="Rectangle 8" width="5.336" height="5.336" rx="1" transform="translate(42.091 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_9" data-name="Rectangle 9" width="5.336" height="5.336" rx="1" transform="translate(48.415 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_10" data-name="Rectangle 10" width="5.336" height="5.336" rx="1" transform="translate(54.739 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_11" data-name="Rectangle 11" width="5.336" height="5.336" rx="1" transform="translate(61.063 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_12" data-name="Rectangle 12" width="5.336" height="5.336" rx="1" transform="translate(67.386 0)" fill="#4a4a4a"/>
-          <path id="Path_51" data-name="Path 51" d="M1.093,0H14.518a1.093,1.093,0,0,1,1.093,1.093V4.243a1.093,1.093,0,0,1-1.093,1.093H1.093A1.093,1.093,0,0,1,0,4.243V1.093A1.093,1.093,0,0,1,1.093,0ZM75,0H88.426a1.093,1.093,0,0,1,1.093,1.093V4.243a1.093,1.093,0,0,1-1.093,1.093H75a1.093,1.093,0,0,1-1.093-1.093V1.093A1.093,1.093,0,0,1,75,0Z" transform="translate(0 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-        </g>
-        <g id="Group_3" data-name="Group 3" transform="translate(1.531 10.261)">
-          <path id="Path_52" data-name="Path 52" d="M1.093,0H6.218A1.093,1.093,0,0,1,7.31,1.093V4.242A1.093,1.093,0,0,1,6.218,5.335H1.093A1.093,1.093,0,0,1,0,4.242V1.093A1.093,1.093,0,0,1,1.093,0Z" transform="translate(0 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-          <rect id="Rectangle_13" data-name="Rectangle 13" width="5.336" height="5.336" rx="1" transform="translate(8.299 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_14" data-name="Rectangle 14" width="5.336" height="5.336" rx="1" transform="translate(14.623 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_15" data-name="Rectangle 15" width="5.336" height="5.336" rx="1" transform="translate(20.947 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_16" data-name="Rectangle 16" width="5.336" height="5.336" rx="1" transform="translate(27.271 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_17" data-name="Rectangle 17" width="5.336" height="5.336" rx="1" transform="translate(33.594 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_18" data-name="Rectangle 18" width="5.336" height="5.336" rx="1" transform="translate(39.918 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_19" data-name="Rectangle 19" width="5.336" height="5.336" rx="1" transform="translate(46.242 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_20" data-name="Rectangle 20" width="5.336" height="5.336" rx="1" transform="translate(52.565 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_21" data-name="Rectangle 21" width="5.336" height="5.336" rx="1" transform="translate(58.888 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_22" data-name="Rectangle 22" width="5.336" height="5.336" rx="1" transform="translate(65.212 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_23" data-name="Rectangle 23" width="5.336" height="5.336" rx="1" transform="translate(71.536 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_24" data-name="Rectangle 24" width="5.336" height="5.336" rx="1" transform="translate(77.859 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_25" data-name="Rectangle 25" width="5.336" height="5.336" rx="1" transform="translate(84.183 0)" fill="#4a4a4a"/>
-        </g>
-        <g id="Group_4" data-name="Group 4" transform="translate(91.05 9.546) rotate(180)">
-          <path id="Path_53" data-name="Path 53" d="M1.093,0H6.219A1.093,1.093,0,0,1,7.312,1.093v3.15A1.093,1.093,0,0,1,6.219,5.336H1.093A1.093,1.093,0,0,1,0,4.243V1.093A1.093,1.093,0,0,1,1.093,0Z" transform="translate(0 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-          <rect id="Rectangle_26" data-name="Rectangle 26" width="5.336" height="5.336" rx="1" transform="translate(8.299 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_27" data-name="Rectangle 27" width="5.336" height="5.336" rx="1" transform="translate(14.623 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_28" data-name="Rectangle 28" width="5.336" height="5.336" rx="1" transform="translate(20.947 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_29" data-name="Rectangle 29" width="5.336" height="5.336" rx="1" transform="translate(27.271 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_30" data-name="Rectangle 30" width="5.336" height="5.336" rx="1" transform="translate(33.594 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_31" data-name="Rectangle 31" width="5.336" height="5.336" rx="1" transform="translate(39.918 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_32" data-name="Rectangle 32" width="5.336" height="5.336" rx="1" transform="translate(46.242 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_33" data-name="Rectangle 33" width="5.336" height="5.336" rx="1" transform="translate(52.565 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_34" data-name="Rectangle 34" width="5.336" height="5.336" rx="1" transform="translate(58.889 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_35" data-name="Rectangle 35" width="5.336" height="5.336" rx="1" transform="translate(65.213 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_36" data-name="Rectangle 36" width="5.336" height="5.336" rx="1" transform="translate(71.537 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_37" data-name="Rectangle 37" width="5.336" height="5.336" rx="1" transform="translate(77.86 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_38" data-name="Rectangle 38" width="5.336" height="5.336" rx="1" transform="translate(84.183 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_39" data-name="Rectangle 39" width="5.336" height="5.336" rx="1" transform="translate(8.299 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_40" data-name="Rectangle 40" width="5.336" height="5.336" rx="1" transform="translate(14.623 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_41" data-name="Rectangle 41" width="5.336" height="5.336" rx="1" transform="translate(20.947 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_42" data-name="Rectangle 42" width="5.336" height="5.336" rx="1" transform="translate(27.271 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_43" data-name="Rectangle 43" width="5.336" height="5.336" rx="1" transform="translate(33.594 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_44" data-name="Rectangle 44" width="5.336" height="5.336" rx="1" transform="translate(39.918 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_45" data-name="Rectangle 45" width="5.336" height="5.336" rx="1" transform="translate(46.242 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_46" data-name="Rectangle 46" width="5.336" height="5.336" rx="1" transform="translate(52.565 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_47" data-name="Rectangle 47" width="5.336" height="5.336" rx="1" transform="translate(58.889 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_48" data-name="Rectangle 48" width="5.336" height="5.336" rx="1" transform="translate(65.213 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_49" data-name="Rectangle 49" width="5.336" height="5.336" rx="1" transform="translate(71.537 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_50" data-name="Rectangle 50" width="5.336" height="5.336" rx="1" transform="translate(77.86 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_51" data-name="Rectangle 51" width="5.336" height="5.336" rx="1" transform="translate(84.183 0)" fill="#4a4a4a"/>
-        </g>
-        <g id="Group_6" data-name="Group 6" transform="translate(1.531 16.584)">
-          <path id="Path_54" data-name="Path 54" d="M1.093,0h7.3A1.093,1.093,0,0,1,9.485,1.093v3.15A1.093,1.093,0,0,1,8.392,5.336h-7.3A1.093,1.093,0,0,1,0,4.243V1.094A1.093,1.093,0,0,1,1.093,0Z" transform="translate(0 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-          <g id="Group_5" data-name="Group 5" transform="translate(10.671 0)">
-            <rect id="Rectangle_52" data-name="Rectangle 52" width="5.336" height="5.336" rx="1" fill="#4a4a4a"/>
-            <rect id="Rectangle_53" data-name="Rectangle 53" width="5.336" height="5.336" rx="1" transform="translate(6.324 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_54" data-name="Rectangle 54" width="5.336" height="5.336" rx="1" transform="translate(12.647 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_55" data-name="Rectangle 55" width="5.336" height="5.336" rx="1" transform="translate(18.971 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_56" data-name="Rectangle 56" width="5.336" height="5.336" rx="1" transform="translate(25.295 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_57" data-name="Rectangle 57" width="5.336" height="5.336" rx="1" transform="translate(31.619 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_58" data-name="Rectangle 58" width="5.336" height="5.336" rx="1" transform="translate(37.942 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_59" data-name="Rectangle 59" width="5.336" height="5.336" rx="1" transform="translate(44.265 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_60" data-name="Rectangle 60" width="5.336" height="5.336" rx="1" transform="translate(50.589 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_61" data-name="Rectangle 61" width="5.336" height="5.336" rx="1" transform="translate(56.912 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_62" data-name="Rectangle 62" width="5.336" height="5.336" rx="1" transform="translate(63.236 0)" fill="#4a4a4a"/>
-          </g>
-          <path id="Path_55" data-name="Path 55" d="M1.094,0H8A1.093,1.093,0,0,1,9.091,1.093v3.15A1.093,1.093,0,0,1,8,5.336H1.093A1.093,1.093,0,0,1,0,4.243V1.094A1.093,1.093,0,0,1,1.093,0Z" transform="translate(80.428 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-        </g>
-        <g id="Group_7" data-name="Group 7" transform="translate(1.531 29.627)">
-          <rect id="Rectangle_63" data-name="Rectangle 63" width="5.336" height="5.336" rx="1" transform="translate(0 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_64" data-name="Rectangle 64" width="5.336" height="5.336" rx="1" transform="translate(6.324 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_65" data-name="Rectangle 65" width="5.336" height="5.336" rx="1" transform="translate(12.647 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_66" data-name="Rectangle 66" width="5.336" height="5.336" rx="1" transform="translate(18.971 0)" fill="#4a4a4a"/>
-          <path id="Path_56" data-name="Path 56" d="M1.093,0H31.515a1.093,1.093,0,0,1,1.093,1.093V4.244a1.093,1.093,0,0,1-1.093,1.093H1.093A1.093,1.093,0,0,1,0,4.244V1.093A1.093,1.093,0,0,1,1.093,0ZM34.687,0h3.942a1.093,1.093,0,0,1,1.093,1.093V4.244a1.093,1.093,0,0,1-1.093,1.093H34.687a1.093,1.093,0,0,1-1.093-1.093V1.093A1.093,1.093,0,0,1,34.687,0Z" transform="translate(25.294 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-          <rect id="Rectangle_67" data-name="Rectangle 67" width="5.336" height="5.336" rx="1" transform="translate(66.003 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_68" data-name="Rectangle 68" width="5.336" height="5.336" rx="1" transform="translate(72.327 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_69" data-name="Rectangle 69" width="5.336" height="5.336" rx="1" transform="translate(84.183 0)" fill="#4a4a4a"/>
-          <path id="Path_57" data-name="Path 57" d="M5.336,0V1.18A1.093,1.093,0,0,1,4.243,2.273H1.093A1.093,1.093,0,0,1,0,1.18V0Z" transform="translate(83.59 2.273) rotate(180)" fill="#4a4a4a"/>
-          <path id="Path_58" data-name="Path 58" d="M5.336,0V1.18A1.093,1.093,0,0,1,4.243,2.273H1.093A1.093,1.093,0,0,1,0,1.18V0Z" transform="translate(78.255 3.063)" fill="#4a4a4a"/>
-        </g>
-        <rect id="Rectangle_70" data-name="Rectangle 70" width="88.927" height="2.371" rx="1.085" transform="translate(1.925 1.17)" fill="#4a4a4a"/>
-        <rect id="Rectangle_71" data-name="Rectangle 71" width="4.986" height="1.581" rx="0.723" transform="translate(4.1 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_72" data-name="Rectangle 72" width="4.986" height="1.581" rx="0.723" transform="translate(10.923 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_73" data-name="Rectangle 73" width="4.986" height="1.581" rx="0.723" transform="translate(16.173 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_74" data-name="Rectangle 74" width="4.986" height="1.581" rx="0.723" transform="translate(21.421 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_75" data-name="Rectangle 75" width="4.986" height="1.581" rx="0.723" transform="translate(26.671 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_76" data-name="Rectangle 76" width="4.986" height="1.581" rx="0.723" transform="translate(33.232 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_77" data-name="Rectangle 77" width="4.986" height="1.581" rx="0.723" transform="translate(38.48 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_78" data-name="Rectangle 78" width="4.986" height="1.581" rx="0.723" transform="translate(43.73 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_79" data-name="Rectangle 79" width="4.986" height="1.581" rx="0.723" transform="translate(48.978 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_80" data-name="Rectangle 80" width="4.986" height="1.581" rx="0.723" transform="translate(55.54 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_81" data-name="Rectangle 81" width="4.986" height="1.581" rx="0.723" transform="translate(60.788 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_82" data-name="Rectangle 82" width="4.986" height="1.581" rx="0.723" transform="translate(66.038 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_83" data-name="Rectangle 83" width="4.986" height="1.581" rx="0.723" transform="translate(72.599 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_84" data-name="Rectangle 84" width="4.986" height="1.581" rx="0.723" transform="translate(77.847 1.566)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_85" data-name="Rectangle 85" width="4.986" height="1.581" rx="0.723" transform="translate(83.097 1.566)" fill="#d8d8d8" opacity="0.136"/>
-      </g>
-      <path id="Path_59" data-name="Path 59" d="M146.71,159.855a5.439,5.439,0,0,0-.7.07c-.042-.164-.081-.329-.127-.493a5.457,5.457,0,1,0-5.4-9.372q-.181-.185-.366-.367a5.454,5.454,0,1,0-9.384-5.4c-.162-.046-.325-.084-.486-.126a5.467,5.467,0,1,0-10.788,0c-.162.042-.325.08-.486.126a5.457,5.457,0,1,0-9.384,5.4,21.843,21.843,0,1,0,36.421,21.02,5.452,5.452,0,1,0,.7-10.858" transform="translate(6.275 -6.025)" fill="#44d860" fill-rule="evenodd"/>
-      <path id="Path_60" data-name="Path 60" d="M83,124.855h43.71V103H83Z" transform="translate(4.42 -9.271)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_61" data-name="Path 61" d="M134.855,116.765a2.732,2.732,0,1,0,0-5.464,2.811,2.811,0,0,0-.349.035c-.022-.082-.04-.164-.063-.246a2.733,2.733,0,0,0-1.052-5.253,2.7,2.7,0,0,0-1.648.566q-.09-.093-.184-.184a2.7,2.7,0,0,0,.553-1.633,2.732,2.732,0,0,0-5.245-1.07,10.928,10.928,0,1,0,0,21.031,2.732,2.732,0,0,0,5.245-1.07,2.7,2.7,0,0,0-.553-1.633q.093-.09.184-.184a2.7,2.7,0,0,0,1.648.566,2.732,2.732,0,0,0,1.052-5.253c.023-.081.042-.164.063-.246a2.811,2.811,0,0,0,.349.035" transform="translate(7.202 -9.377)" fill="#44d860" fill-rule="evenodd"/>
-      <path id="Path_62" data-name="Path 62" d="M143.232,42.33a2.967,2.967,0,0,1-.535-.055,2.754,2.754,0,0,1-.514-.153,2.838,2.838,0,0,1-.471-.251,4.139,4.139,0,0,1-.415-.339,3.2,3.2,0,0,1-.338-.415A2.7,2.7,0,0,1,140.5,39.6a2.968,2.968,0,0,1,.055-.535,3.152,3.152,0,0,1,.152-.514,2.874,2.874,0,0,1,.252-.47,2.633,2.633,0,0,1,.753-.754,2.837,2.837,0,0,1,.471-.251,2.753,2.753,0,0,1,.514-.153,2.527,2.527,0,0,1,1.071,0,2.654,2.654,0,0,1,.983.4,4.139,4.139,0,0,1,.415.339,4.019,4.019,0,0,1,.339.415,2.786,2.786,0,0,1,.251.47,2.864,2.864,0,0,1,.208,1.049,2.77,2.77,0,0,1-.8,1.934,4.139,4.139,0,0,1-.415.339,2.722,2.722,0,0,1-1.519.459m21.855-1.366a2.789,2.789,0,0,1-1.935-.8,4.162,4.162,0,0,1-.338-.415,2.7,2.7,0,0,1-.459-1.519,2.789,2.789,0,0,1,.8-1.934,4.139,4.139,0,0,1,.415-.339,2.838,2.838,0,0,1,.471-.251,2.752,2.752,0,0,1,.514-.153,2.527,2.527,0,0,1,1.071,0,2.654,2.654,0,0,1,.983.4,4.139,4.139,0,0,1,.415.339,2.79,2.79,0,0,1,.8,1.934,3.069,3.069,0,0,1-.055.535,2.779,2.779,0,0,1-.153.514,3.885,3.885,0,0,1-.251.47,4.02,4.02,0,0,1-.339.415,4.138,4.138,0,0,1-.415.339,2.722,2.722,0,0,1-1.519.459" transform="translate(9.753 -15.532)" fill-rule="evenodd"/>
-    </g>
-  </g>
-</svg>
diff --git a/platform-docs/static/img/undraw_docusaurus_react.svg b/platform-docs/static/img/undraw_docusaurus_react.svg
deleted file mode 100644
index 94b5cf08f88f22..00000000000000
--- a/platform-docs/static/img/undraw_docusaurus_react.svg
+++ /dev/null
@@ -1,170 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1041.277" height="554.141" viewBox="0 0 1041.277 554.141">
-  <title>Powered by React</title>
-  <g id="Group_24" data-name="Group 24" transform="translate(-440 -263)">
-    <g id="Group_23" data-name="Group 23" transform="translate(439.989 262.965)">
-      <path id="Path_299" data-name="Path 299" d="M1040.82,611.12q-1.74,3.75-3.47,7.4-2.7,5.67-5.33,11.12c-.78,1.61-1.56,3.19-2.32,4.77-8.6,17.57-16.63,33.11-23.45,45.89A73.21,73.21,0,0,1,942.44,719l-151.65,1.65h-1.6l-13,.14-11.12.12-34.1.37h-1.38l-17.36.19h-.53l-107,1.16-95.51,1-11.11.12-69,.75H429l-44.75.48h-.48l-141.5,1.53-42.33.46a87.991,87.991,0,0,1-10.79-.54h0c-1.22-.14-2.44-.3-3.65-.49a87.38,87.38,0,0,1-51.29-27.54C116,678.37,102.75,655,93.85,629.64q-1.93-5.49-3.6-11.12C59.44,514.37,97,380,164.6,290.08q4.25-5.64,8.64-11l.07-.08c20.79-25.52,44.1-46.84,68.93-62,44-26.91,92.75-34.49,140.7-11.9,40.57,19.12,78.45,28.11,115.17,30.55,3.71.24,7.42.42,11.11.53,84.23,2.65,163.17-27.7,255.87-47.29,3.69-.78,7.39-1.55,11.12-2.28,66.13-13.16,139.49-20.1,226.73-5.51a189.089,189.089,0,0,1,26.76,6.4q5.77,1.86,11.12,4c41.64,16.94,64.35,48.24,74,87.46q1.37,5.46,2.37,11.11C1134.3,384.41,1084.19,518.23,1040.82,611.12Z" transform="translate(-79.34 -172.91)" fill="#f2f2f2"/>
-      <path id="Path_300" data-name="Path 300" d="M576.36,618.52a95.21,95.21,0,0,1-1.87,11.12h93.7V618.52Zm-78.25,62.81,11.11-.09V653.77c-3.81-.17-7.52-.34-11.11-.52ZM265.19,618.52v11.12h198.5V618.52ZM1114.87,279h-74V191.51q-5.35-2.17-11.12-4V279H776.21V186.58c-3.73.73-7.43,1.5-11.12,2.28V279H509.22V236.15c-3.69-.11-7.4-.29-11.11-.53V279H242.24V217c-24.83,15.16-48.14,36.48-68.93,62h-.07v.08q-4.4,5.4-8.64,11h8.64V618.52h-83q1.66,5.63,3.6,11.12h79.39v93.62a87,87,0,0,0,12.2,2.79c1.21.19,2.43.35,3.65.49h0a87.991,87.991,0,0,0,10.79.54l42.33-.46v-97H498.11v94.21l11.11-.12V629.64H765.09V721l11.12-.12V629.64H1029.7v4.77c.76-1.58,1.54-3.16,2.32-4.77q2.63-5.45,5.33-11.12,1.73-3.64,3.47-7.4v-321h76.42Q1116.23,284.43,1114.87,279ZM242.24,618.52V290.08H498.11V618.52Zm267,0V290.08H765.09V618.52Zm520.48,0H776.21V290.08H1029.7Z" transform="translate(-79.34 -172.91)" opacity="0.1"/>
-      <path id="Path_301" data-name="Path 301" d="M863.09,533.65v13l-151.92,1.4-1.62.03-57.74.53-1.38.02-17.55.15h-.52l-106.98.99L349.77,551.4h-.15l-44.65.42-.48.01-198.4,1.82v-15l46.65-28,93.6-.78,2-.01.66-.01,2-.03,44.94-.37,2.01-.01.64-.01,2-.01L315,509.3l.38-.01,35.55-.3h.29l277.4-2.34,6.79-.05h.68l5.18-.05,37.65-.31,2-.03,1.85-.02h.96l11.71-.09,2.32-.03,3.11-.02,9.75-.09,15.47-.13,2-.02,3.48-.02h.65l74.71-.64Z" fill="#65617d"/>
-      <path id="Path_302" data-name="Path 302" d="M863.09,533.65v13l-151.92,1.4-1.62.03-57.74.53-1.38.02-17.55.15h-.52l-106.98.99L349.77,551.4h-.15l-44.65.42-.48.01-198.4,1.82v-15l46.65-28,93.6-.78,2-.01.66-.01,2-.03,44.94-.37,2.01-.01.64-.01,2-.01L315,509.3l.38-.01,35.55-.3h.29l277.4-2.34,6.79-.05h.68l5.18-.05,37.65-.31,2-.03,1.85-.02h.96l11.71-.09,2.32-.03,3.11-.02,9.75-.09,15.47-.13,2-.02,3.48-.02h.65l74.71-.64Z" opacity="0.2"/>
-      <path id="Path_303" data-name="Path 303" d="M375.44,656.57v24.49a6.13,6.13,0,0,1-3.5,5.54,6,6,0,0,1-2.5.6l-34.9.74a6,6,0,0,1-2.7-.57,6.12,6.12,0,0,1-3.57-5.57V656.57Z" transform="translate(-79.34 -172.91)" fill="#3f3d56"/>
-      <path id="Path_304" data-name="Path 304" d="M375.44,656.57v24.49a6.13,6.13,0,0,1-3.5,5.54,6,6,0,0,1-2.5.6l-34.9.74a6,6,0,0,1-2.7-.57,6.12,6.12,0,0,1-3.57-5.57V656.57Z" transform="translate(-79.34 -172.91)" opacity="0.1"/>
-      <path id="Path_305" data-name="Path 305" d="M377.44,656.57v24.49a6.13,6.13,0,0,1-3.5,5.54,6,6,0,0,1-2.5.6l-34.9.74a6,6,0,0,1-2.7-.57,6.12,6.12,0,0,1-3.57-5.57V656.57Z" transform="translate(-79.34 -172.91)" fill="#3f3d56"/>
-      <rect id="Rectangle_137" data-name="Rectangle 137" width="47.17" height="31.5" transform="translate(680.92 483.65)" fill="#3f3d56"/>
-      <rect id="Rectangle_138" data-name="Rectangle 138" width="47.17" height="31.5" transform="translate(680.92 483.65)" opacity="0.1"/>
-      <rect id="Rectangle_139" data-name="Rectangle 139" width="47.17" height="31.5" transform="translate(678.92 483.65)" fill="#3f3d56"/>
-      <path id="Path_306" data-name="Path 306" d="M298.09,483.65v4.97l-47.17,1.26v-6.23Z" opacity="0.1"/>
-      <path id="Path_307" data-name="Path 307" d="M460.69,485.27v168.2a4,4,0,0,1-3.85,3.95l-191.65,5.1h-.05a4,4,0,0,1-3.95-3.95V485.27a4,4,0,0,1,3.95-3.95h191.6a4,4,0,0,1,3.95,3.95Z" transform="translate(-79.34 -172.91)" fill="#65617d"/>
-      <path id="Path_308" data-name="Path 308" d="M265.19,481.32v181.2h-.05a4,4,0,0,1-3.95-3.95V485.27a4,4,0,0,1,3.95-3.95Z" transform="translate(-79.34 -172.91)" opacity="0.1"/>
-      <path id="Path_309" data-name="Path 309" d="M194.59,319.15h177.5V467.4l-177.5,4Z" fill="#39374d"/>
-      <path id="Path_310" data-name="Path 310" d="M726.09,483.65v6.41l-47.17-1.26v-5.15Z" opacity="0.1"/>
-      <path id="Path_311" data-name="Path 311" d="M867.69,485.27v173.3a4,4,0,0,1-4,3.95h0L672,657.42a4,4,0,0,1-3.85-3.95V485.27a4,4,0,0,1,3.95-3.95H863.7a4,4,0,0,1,3.99,3.95Z" transform="translate(-79.34 -172.91)" fill="#65617d"/>
-      <path id="Path_312" data-name="Path 312" d="M867.69,485.27v173.3a4,4,0,0,1-4,3.95h0V481.32h0a4,4,0,0,1,4,3.95Z" transform="translate(-79.34 -172.91)" opacity="0.1"/>
-      <path id="Path_313" data-name="Path 313" d="M775.59,319.15H598.09V467.4l177.5,4Z" fill="#39374d"/>
-      <path id="Path_314" data-name="Path 314" d="M663.19,485.27v168.2a4,4,0,0,1-3.85,3.95l-191.65,5.1h0a4,4,0,0,1-4-3.95V485.27a4,4,0,0,1,3.95-3.95h191.6A4,4,0,0,1,663.19,485.27Z" transform="translate(-79.34 -172.91)" fill="#65617d"/>
-      <path id="Path_315" data-name="Path 315" d="M397.09,319.15h177.5V467.4l-177.5,4Z" fill="#4267b2"/>
-      <path id="Path_316" data-name="Path 316" d="M863.09,533.65v13l-151.92,1.4-1.62.03-57.74.53-1.38.02-17.55.15h-.52l-106.98.99L349.77,551.4h-.15l-44.65.42-.48.01-198.4,1.82v-15l202.51-1.33h.48l40.99-.28h.19l283.08-1.87h.29l.17-.01h.47l4.79-.03h1.46l74.49-.5,4.4-.02.98-.01Z" opacity="0.1"/>
-      <circle id="Ellipse_111" data-name="Ellipse 111" cx="51.33" cy="51.33" r="51.33" transform="translate(435.93 246.82)" fill="#fbbebe"/>
-      <path id="Path_317" data-name="Path 317" d="M617.94,550.07s-99.5,12-90,0c3.44-4.34,4.39-17.2,4.2-31.85-.06-4.45-.22-9.06-.45-13.65-1.1-22-3.75-43.5-3.75-43.5s87-41,77-8.5c-4,13.13-2.69,31.57.35,48.88.89,5.05,1.92,10,3,14.7a344.66,344.66,0,0,0,9.65,33.92Z" transform="translate(-79.34 -172.91)" fill="#fbbebe"/>
-      <path id="Path_318" data-name="Path 318" d="M585.47,546c11.51-2.13,23.7-6,34.53-1.54,2.85,1.17,5.47,2.88,8.39,3.86s6.12,1.22,9.16,1.91c10.68,2.42,19.34,10.55,24.9,20s8.44,20.14,11.26,30.72l6.9,25.83c6,22.45,12,45.09,13.39,68.3a2437.506,2437.506,0,0,1-250.84,1.43c5.44-10.34,11-21.31,10.54-33s-7.19-23.22-4.76-34.74c1.55-7.34,6.57-13.39,9.64-20.22,8.75-19.52,1.94-45.79,17.32-60.65,6.92-6.68,17-9.21,26.63-8.89,12.28.41,24.85,4.24,37,6.11C555.09,547.48,569.79,548.88,585.47,546Z" transform="translate(-79.34 -172.91)" fill="#ff6584"/>
-      <path id="Path_319" data-name="Path 319" d="M716.37,657.17l-.1,1.43v.1l-.17,2.3-1.33,18.51-1.61,22.3-.46,6.28-1,13.44v.17l-107,1-175.59,1.9v.84h-.14v-1.12l.45-14.36.86-28.06.74-23.79.07-2.37a10.53,10.53,0,0,1,11.42-10.17c4.72.4,10.85.89,18.18,1.41l3,.22c42.33,2.94,120.56,6.74,199.5,2,1.66-.09,3.33-.19,5-.31,12.24-.77,24.47-1.76,36.58-3a10.53,10.53,0,0,1,11.6,11.23Z" transform="translate(-79.34 -172.91)" opacity="0.1"/>
-      <path id="Path_320" data-name="Path 320" d="M429.08,725.44v-.84l175.62-1.91,107-1h.3v-.17l1-13.44.43-6,1.64-22.61,1.29-17.9v-.44a10.617,10.617,0,0,0-.11-2.47.3.3,0,0,0,0-.1,10.391,10.391,0,0,0-2-4.64,10.54,10.54,0,0,0-9.42-4c-12.11,1.24-24.34,2.23-36.58,3-1.67.12-3.34.22-5,.31-78.94,4.69-157.17.89-199.5-2l-3-.22c-7.33-.52-13.46-1-18.18-1.41a10.54,10.54,0,0,0-11.24,8.53,11,11,0,0,0-.18,1.64l-.68,22.16L429.54,710l-.44,14.36v1.12Z" transform="translate(-79.34 -172.91)" fill="#3f3d56"/>
-      <path id="Path_321" data-name="Path 321" d="M716.67,664.18l-1.23,15.33-1.83,22.85-.46,5.72-1,12.81-.06.64v.17h0l-.15,1.48.11-1.48h-.29l-107,1-175.65,1.9v-.28l.49-14.36,1-28.06.64-18.65A6.36,6.36,0,0,1,434.3,658a6.25,6.25,0,0,1,3.78-.9c2.1.17,4.68.37,7.69.59,4.89.36,10.92.78,17.94,1.22,13,.82,29.31,1.7,48,2.42,52,2,122.2,2.67,188.88-3.17,3-.26,6.1-.55,9.13-.84a6.26,6.26,0,0,1,3.48.66,5.159,5.159,0,0,1,.86.54,6.14,6.14,0,0,1,2,2.46,3.564,3.564,0,0,1,.25.61A6.279,6.279,0,0,1,716.67,664.18Z" transform="translate(-79.34 -172.91)" opacity="0.1"/>
-      <path id="Path_322" data-name="Path 322" d="M377.44,677.87v3.19a6.13,6.13,0,0,1-3.5,5.54l-40.1.77a6.12,6.12,0,0,1-3.57-5.57v-3Z" transform="translate(-79.34 -172.91)" opacity="0.1"/>
-      <path id="Path_323" data-name="Path 323" d="M298.59,515.57l-52.25,1V507.9l52.25-1Z" fill="#3f3d56"/>
-      <path id="Path_324" data-name="Path 324" d="M298.59,515.57l-52.25,1V507.9l52.25-1Z" opacity="0.1"/>
-      <path id="Path_325" data-name="Path 325" d="M300.59,515.57l-52.25,1V507.9l52.25-1Z" fill="#3f3d56"/>
-      <path id="Path_326" data-name="Path 326" d="M758.56,679.87v3.19a6.13,6.13,0,0,0,3.5,5.54l40.1.77a6.12,6.12,0,0,0,3.57-5.57v-3Z" transform="translate(-79.34 -172.91)" opacity="0.1"/>
-      <path id="Path_327" data-name="Path 327" d="M678.72,517.57l52.25,1V509.9l-52.25-1Z" opacity="0.1"/>
-      <path id="Path_328" data-name="Path 328" d="M676.72,517.57l52.25,1V509.9l-52.25-1Z" fill="#3f3d56"/>
-      <path id="Path_329" data-name="Path 329" d="M534.13,486.79c.08,7-3.16,13.6-5.91,20.07a163.491,163.491,0,0,0-12.66,74.71c.73,11,2.58,22,.73,32.9s-8.43,21.77-19,24.9c17.53,10.45,41.26,9.35,57.76-2.66,8.79-6.4,15.34-15.33,21.75-24.11a97.86,97.86,0,0,1-13.31,44.75A103.43,103.43,0,0,0,637,616.53c4.31-5.81,8.06-12.19,9.72-19.23,3.09-13-1.22-26.51-4.51-39.5a266.055,266.055,0,0,1-6.17-33c-.43-3.56-.78-7.22.1-10.7,1-4.07,3.67-7.51,5.64-11.22,5.6-10.54,5.73-23.3,2.86-34.88s-8.49-22.26-14.06-32.81c-4.46-8.46-9.3-17.31-17.46-22.28-5.1-3.1-11-4.39-16.88-5.64l-25.37-5.43c-5.55-1.19-11.26-2.38-16.87-1.51-9.47,1.48-16.14,8.32-22,15.34-4.59,5.46-15.81,15.71-16.6,22.86-.72,6.59,5.1,17.63,6.09,24.58,1.3,9,2.22,6,7.3,11.52C532,478.05,534.07,482,534.13,486.79Z" transform="translate(-79.34 -172.91)" fill="#3f3d56"/>
-    </g>
-    <g id="docusaurus_keytar" transform="translate(670.271 615.768)">
-      <path id="Path_40" data-name="Path 40" d="M99,52h43.635V69.662H99Z" transform="translate(-49.132 -33.936)" fill="#fff" fill-rule="evenodd"/>
-      <path id="Path_41" data-name="Path 41" d="M13.389,158.195A10.377,10.377,0,0,1,4.4,153a10.377,10.377,0,0,0,8.988,15.584H23.779V158.195Z" transform="translate(-3 -82.47)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_42" data-name="Path 42" d="M66.967,38.083l36.373-2.273V30.615A10.389,10.389,0,0,0,92.95,20.226H46.2l-1.3-2.249a1.5,1.5,0,0,0-2.6,0L41,20.226l-1.3-2.249a1.5,1.5,0,0,0-2.6,0l-1.3,2.249-1.3-2.249a1.5,1.5,0,0,0-2.6,0l-1.3,2.249-.034,0-2.152-2.151a1.5,1.5,0,0,0-2.508.672L25.21,21.4l-2.7-.723a1.5,1.5,0,0,0-1.836,1.837l.722,2.7-2.65.71a1.5,1.5,0,0,0-.673,2.509l2.152,2.152c0,.011,0,.022,0,.033l-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6L20.226,41l-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3-2.249,1.3a1.5,1.5,0,0,0,0,2.6l2.249,1.3A10.389,10.389,0,0,0,30.615,103.34H92.95A10.389,10.389,0,0,0,103.34,92.95V51.393L66.967,49.12a5.53,5.53,0,0,1,0-11.038" transform="translate(-9.836 -17.226)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_43" data-name="Path 43" d="M143,163.779h15.584V143H143Z" transform="translate(-70.275 -77.665)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_44" data-name="Path 44" d="M173.779,148.389a2.582,2.582,0,0,0-.332.033c-.02-.078-.038-.156-.06-.234a2.594,2.594,0,1,0-2.567-4.455q-.086-.088-.174-.175a2.593,2.593,0,1,0-4.461-2.569c-.077-.022-.154-.04-.231-.06a2.6,2.6,0,1,0-5.128,0c-.077.02-.154.038-.231.06a2.594,2.594,0,1,0-4.461,2.569,10.384,10.384,0,1,0,17.314,9.992,2.592,2.592,0,1,0,.332-5.161" transform="translate(-75.08 -75.262)" fill="#44d860" fill-rule="evenodd"/>
-      <path id="Path_45" data-name="Path 45" d="M153,113.389h15.584V103H153Z" transform="translate(-75.08 -58.444)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_46" data-name="Path 46" d="M183.389,108.944a1.3,1.3,0,1,0,0-2.6,1.336,1.336,0,0,0-.166.017c-.01-.039-.019-.078-.03-.117a1.3,1.3,0,0,0-.5-2.5,1.285,1.285,0,0,0-.783.269q-.043-.044-.087-.087a1.285,1.285,0,0,0,.263-.776,1.3,1.3,0,0,0-2.493-.509,5.195,5.195,0,1,0,0,10,1.3,1.3,0,0,0,2.493-.509,1.285,1.285,0,0,0-.263-.776q.044-.043.087-.087a1.285,1.285,0,0,0,.783.269,1.3,1.3,0,0,0,.5-2.5c.011-.038.02-.078.03-.117a1.337,1.337,0,0,0,.166.017" transform="translate(-84.691 -57.894)" fill="#44d860" fill-rule="evenodd"/>
-      <path id="Path_47" data-name="Path 47" d="M52.188,48.292a1.3,1.3,0,0,1-1.3-1.3,3.9,3.9,0,0,0-7.792,0,1.3,1.3,0,1,1-2.6,0,6.493,6.493,0,0,1,12.987,0,1.3,1.3,0,0,1-1.3,1.3" transform="translate(-21.02 -28.41)" fill-rule="evenodd"/>
-      <path id="Path_48" data-name="Path 48" d="M103,139.752h31.168a10.389,10.389,0,0,0,10.389-10.389V93H113.389A10.389,10.389,0,0,0,103,103.389Z" transform="translate(-51.054 -53.638)" fill="#ffff50" fill-rule="evenodd"/>
-      <path id="Path_49" data-name="Path 49" d="M141.1,94.017H115.106a.519.519,0,1,1,0-1.039H141.1a.519.519,0,0,1,0,1.039m0,10.389H115.106a.519.519,0,1,1,0-1.039H141.1a.519.519,0,0,1,0,1.039m0,10.389H115.106a.519.519,0,1,1,0-1.039H141.1a.519.519,0,0,1,0,1.039m0-25.877H115.106a.519.519,0,1,1,0-1.039H141.1a.519.519,0,0,1,0,1.039m0,10.293H115.106a.519.519,0,1,1,0-1.039H141.1a.519.519,0,0,1,0,1.039m0,10.389H115.106a.519.519,0,1,1,0-1.039H141.1a.519.519,0,0,1,0,1.039m7.782-47.993c-.006,0-.011,0-.018,0-1.605.055-2.365,1.66-3.035,3.077-.7,1.48-1.24,2.443-2.126,2.414-.981-.035-1.542-1.144-2.137-2.317-.683-1.347-1.462-2.876-3.1-2.819-1.582.054-2.344,1.451-3.017,2.684-.715,1.313-1.2,2.112-2.141,2.075-1-.036-1.533-.938-2.149-1.981-.686-1.162-1.479-2.467-3.084-2.423-1.555.053-2.319,1.239-2.994,2.286-.713,1.106-1.213,1.781-2.164,1.741-1.025-.036-1.554-.784-2.167-1.65-.688-.973-1.463-2.074-3.062-2.021a3.815,3.815,0,0,0-2.959,1.879c-.64.812-1.14,1.456-2.2,1.415a.52.52,0,0,0-.037,1.039,3.588,3.588,0,0,0,3.05-1.811c.611-.777,1.139-1.448,2.178-1.483,1-.043,1.47.579,2.179,1.582.674.953,1.438,2.033,2.977,2.089,1.612.054,2.387-1.151,3.074-2.217.614-.953,1.144-1.775,2.156-1.81.931-.035,1.438.7,2.153,1.912.674,1.141,1.437,2.434,3.006,2.491,1.623.056,2.407-1.361,3.09-2.616.592-1.085,1.15-2.109,2.14-2.143.931-.022,1.417.829,2.135,2.249.671,1.326,1.432,2.828,3.026,2.886l.088,0c1.592,0,2.347-1.6,3.015-3.01.592-1.252,1.152-2.431,2.113-2.479Z" transform="translate(-55.378 -38.552)" fill-rule="evenodd"/>
-      <path id="Path_50" data-name="Path 50" d="M83,163.779h20.779V143H83Z" transform="translate(-41.443 -77.665)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <g id="Group_8" data-name="Group 8" transform="matrix(0.966, -0.259, 0.259, 0.966, 51.971, 43.3)">
-        <rect id="Rectangle_3" data-name="Rectangle 3" width="43.906" height="17.333" rx="2" transform="translate(0 0)" fill="#d8d8d8"/>
-        <g id="Group_2" data-name="Group 2" transform="translate(0.728 10.948)">
-          <rect id="Rectangle_4" data-name="Rectangle 4" width="2.537" height="2.537" rx="1" transform="translate(7.985 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_5" data-name="Rectangle 5" width="2.537" height="2.537" rx="1" transform="translate(10.991 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_6" data-name="Rectangle 6" width="2.537" height="2.537" rx="1" transform="translate(13.997 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_7" data-name="Rectangle 7" width="2.537" height="2.537" rx="1" transform="translate(17.003 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_8" data-name="Rectangle 8" width="2.537" height="2.537" rx="1" transform="translate(20.009 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_9" data-name="Rectangle 9" width="2.537" height="2.537" rx="1" transform="translate(23.015 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_10" data-name="Rectangle 10" width="2.537" height="2.537" rx="1" transform="translate(26.021 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_11" data-name="Rectangle 11" width="2.537" height="2.537" rx="1" transform="translate(29.028 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_12" data-name="Rectangle 12" width="2.537" height="2.537" rx="1" transform="translate(32.034 0)" fill="#4a4a4a"/>
-          <path id="Path_51" data-name="Path 51" d="M.519,0H6.9A.519.519,0,0,1,7.421.52v1.5a.519.519,0,0,1-.519.519H.519A.519.519,0,0,1,0,2.017V.519A.519.519,0,0,1,.519,0ZM35.653,0h6.383a.519.519,0,0,1,.519.519v1.5a.519.519,0,0,1-.519.519H35.652a.519.519,0,0,1-.519-.519V.519A.519.519,0,0,1,35.652,0Z" transform="translate(0 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-        </g>
-        <g id="Group_3" data-name="Group 3" transform="translate(0.728 4.878)">
-          <path id="Path_52" data-name="Path 52" d="M.519,0H2.956a.519.519,0,0,1,.519.519v1.5a.519.519,0,0,1-.519.519H.519A.519.519,0,0,1,0,2.017V.519A.519.519,0,0,1,.519,0Z" transform="translate(0 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-          <rect id="Rectangle_13" data-name="Rectangle 13" width="2.537" height="2.537" rx="1" transform="translate(3.945 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_14" data-name="Rectangle 14" width="2.537" height="2.537" rx="1" transform="translate(6.951 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_15" data-name="Rectangle 15" width="2.537" height="2.537" rx="1" transform="translate(9.958 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_16" data-name="Rectangle 16" width="2.537" height="2.537" rx="1" transform="translate(12.964 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_17" data-name="Rectangle 17" width="2.537" height="2.537" rx="1" transform="translate(15.97 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_18" data-name="Rectangle 18" width="2.537" height="2.537" rx="1" transform="translate(18.976 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_19" data-name="Rectangle 19" width="2.537" height="2.537" rx="1" transform="translate(21.982 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_20" data-name="Rectangle 20" width="2.537" height="2.537" rx="1" transform="translate(24.988 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_21" data-name="Rectangle 21" width="2.537" height="2.537" rx="1" transform="translate(27.994 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_22" data-name="Rectangle 22" width="2.537" height="2.537" rx="1" transform="translate(31 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_23" data-name="Rectangle 23" width="2.537" height="2.537" rx="1" transform="translate(34.006 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_24" data-name="Rectangle 24" width="2.537" height="2.537" rx="1" transform="translate(37.012 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_25" data-name="Rectangle 25" width="2.537" height="2.537" rx="1" transform="translate(40.018 0)" fill="#4a4a4a"/>
-        </g>
-        <g id="Group_4" data-name="Group 4" transform="translate(43.283 4.538) rotate(180)">
-          <path id="Path_53" data-name="Path 53" d="M.519,0H2.956a.519.519,0,0,1,.519.519v1.5a.519.519,0,0,1-.519.519H.519A.519.519,0,0,1,0,2.017V.519A.519.519,0,0,1,.519,0Z" transform="translate(0 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-          <rect id="Rectangle_26" data-name="Rectangle 26" width="2.537" height="2.537" rx="1" transform="translate(3.945 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_27" data-name="Rectangle 27" width="2.537" height="2.537" rx="1" transform="translate(6.951 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_28" data-name="Rectangle 28" width="2.537" height="2.537" rx="1" transform="translate(9.958 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_29" data-name="Rectangle 29" width="2.537" height="2.537" rx="1" transform="translate(12.964 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_30" data-name="Rectangle 30" width="2.537" height="2.537" rx="1" transform="translate(15.97 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_31" data-name="Rectangle 31" width="2.537" height="2.537" rx="1" transform="translate(18.976 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_32" data-name="Rectangle 32" width="2.537" height="2.537" rx="1" transform="translate(21.982 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_33" data-name="Rectangle 33" width="2.537" height="2.537" rx="1" transform="translate(24.988 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_34" data-name="Rectangle 34" width="2.537" height="2.537" rx="1" transform="translate(27.994 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_35" data-name="Rectangle 35" width="2.537" height="2.537" rx="1" transform="translate(31.001 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_36" data-name="Rectangle 36" width="2.537" height="2.537" rx="1" transform="translate(34.007 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_37" data-name="Rectangle 37" width="2.537" height="2.537" rx="1" transform="translate(37.013 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_38" data-name="Rectangle 38" width="2.537" height="2.537" rx="1" transform="translate(40.018 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_39" data-name="Rectangle 39" width="2.537" height="2.537" rx="1" transform="translate(3.945 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_40" data-name="Rectangle 40" width="2.537" height="2.537" rx="1" transform="translate(6.951 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_41" data-name="Rectangle 41" width="2.537" height="2.537" rx="1" transform="translate(9.958 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_42" data-name="Rectangle 42" width="2.537" height="2.537" rx="1" transform="translate(12.964 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_43" data-name="Rectangle 43" width="2.537" height="2.537" rx="1" transform="translate(15.97 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_44" data-name="Rectangle 44" width="2.537" height="2.537" rx="1" transform="translate(18.976 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_45" data-name="Rectangle 45" width="2.537" height="2.537" rx="1" transform="translate(21.982 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_46" data-name="Rectangle 46" width="2.537" height="2.537" rx="1" transform="translate(24.988 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_47" data-name="Rectangle 47" width="2.537" height="2.537" rx="1" transform="translate(27.994 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_48" data-name="Rectangle 48" width="2.537" height="2.537" rx="1" transform="translate(31.001 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_49" data-name="Rectangle 49" width="2.537" height="2.537" rx="1" transform="translate(34.007 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_50" data-name="Rectangle 50" width="2.537" height="2.537" rx="1" transform="translate(37.013 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_51" data-name="Rectangle 51" width="2.537" height="2.537" rx="1" transform="translate(40.018 0)" fill="#4a4a4a"/>
-        </g>
-        <g id="Group_6" data-name="Group 6" transform="translate(0.728 7.883)">
-          <path id="Path_54" data-name="Path 54" d="M.519,0h3.47a.519.519,0,0,1,.519.519v1.5a.519.519,0,0,1-.519.519H.519A.519.519,0,0,1,0,2.017V.52A.519.519,0,0,1,.519,0Z" transform="translate(0 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-          <g id="Group_5" data-name="Group 5" transform="translate(5.073 0)">
-            <rect id="Rectangle_52" data-name="Rectangle 52" width="2.537" height="2.537" rx="1" transform="translate(0 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_53" data-name="Rectangle 53" width="2.537" height="2.537" rx="1" transform="translate(3.006 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_54" data-name="Rectangle 54" width="2.537" height="2.537" rx="1" transform="translate(6.012 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_55" data-name="Rectangle 55" width="2.537" height="2.537" rx="1" transform="translate(9.018 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_56" data-name="Rectangle 56" width="2.537" height="2.537" rx="1" transform="translate(12.025 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_57" data-name="Rectangle 57" width="2.537" height="2.537" rx="1" transform="translate(15.031 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_58" data-name="Rectangle 58" width="2.537" height="2.537" rx="1" transform="translate(18.037 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_59" data-name="Rectangle 59" width="2.537" height="2.537" rx="1" transform="translate(21.042 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_60" data-name="Rectangle 60" width="2.537" height="2.537" rx="1" transform="translate(24.049 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_61" data-name="Rectangle 61" width="2.537" height="2.537" rx="1" transform="translate(27.055 0)" fill="#4a4a4a"/>
-            <rect id="Rectangle_62" data-name="Rectangle 62" width="2.537" height="2.537" rx="1" transform="translate(30.061 0)" fill="#4a4a4a"/>
-          </g>
-          <path id="Path_55" data-name="Path 55" d="M.52,0H3.8a.519.519,0,0,1,.519.519v1.5a.519.519,0,0,1-.519.519H.519A.519.519,0,0,1,0,2.017V.52A.519.519,0,0,1,.519,0Z" transform="translate(38.234 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-        </g>
-        <g id="Group_7" data-name="Group 7" transform="translate(0.728 14.084)">
-          <rect id="Rectangle_63" data-name="Rectangle 63" width="2.537" height="2.537" rx="1" transform="translate(0 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_64" data-name="Rectangle 64" width="2.537" height="2.537" rx="1" transform="translate(3.006 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_65" data-name="Rectangle 65" width="2.537" height="2.537" rx="1" transform="translate(6.012 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_66" data-name="Rectangle 66" width="2.537" height="2.537" rx="1" transform="translate(9.018 0)" fill="#4a4a4a"/>
-          <path id="Path_56" data-name="Path 56" d="M.519,0H14.981A.519.519,0,0,1,15.5.519v1.5a.519.519,0,0,1-.519.519H.519A.519.519,0,0,1,0,2.018V.519A.519.519,0,0,1,.519,0Zm15.97,0h1.874a.519.519,0,0,1,.519.519v1.5a.519.519,0,0,1-.519.519H16.489a.519.519,0,0,1-.519-.519V.519A.519.519,0,0,1,16.489,0Z" transform="translate(12.024 0)" fill="#4a4a4a" fill-rule="evenodd"/>
-          <rect id="Rectangle_67" data-name="Rectangle 67" width="2.537" height="2.537" rx="1" transform="translate(31.376 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_68" data-name="Rectangle 68" width="2.537" height="2.537" rx="1" transform="translate(34.382 0)" fill="#4a4a4a"/>
-          <rect id="Rectangle_69" data-name="Rectangle 69" width="2.537" height="2.537" rx="1" transform="translate(40.018 0)" fill="#4a4a4a"/>
-          <path id="Path_57" data-name="Path 57" d="M2.537,0V.561a.519.519,0,0,1-.519.519H.519A.519.519,0,0,1,0,.561V0Z" transform="translate(39.736 1.08) rotate(180)" fill="#4a4a4a"/>
-          <path id="Path_58" data-name="Path 58" d="M2.537,0V.561a.519.519,0,0,1-.519.519H.519A.519.519,0,0,1,0,.561V0Z" transform="translate(37.2 1.456)" fill="#4a4a4a"/>
-        </g>
-        <rect id="Rectangle_70" data-name="Rectangle 70" width="42.273" height="1.127" rx="0.564" transform="translate(0.915 0.556)" fill="#4a4a4a"/>
-        <rect id="Rectangle_71" data-name="Rectangle 71" width="2.37" height="0.752" rx="0.376" transform="translate(1.949 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_72" data-name="Rectangle 72" width="2.37" height="0.752" rx="0.376" transform="translate(5.193 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_73" data-name="Rectangle 73" width="2.37" height="0.752" rx="0.376" transform="translate(7.688 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_74" data-name="Rectangle 74" width="2.37" height="0.752" rx="0.376" transform="translate(10.183 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_75" data-name="Rectangle 75" width="2.37" height="0.752" rx="0.376" transform="translate(12.679 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_76" data-name="Rectangle 76" width="2.37" height="0.752" rx="0.376" transform="translate(15.797 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_77" data-name="Rectangle 77" width="2.37" height="0.752" rx="0.376" transform="translate(18.292 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_78" data-name="Rectangle 78" width="2.37" height="0.752" rx="0.376" transform="translate(20.788 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_79" data-name="Rectangle 79" width="2.37" height="0.752" rx="0.376" transform="translate(23.283 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_80" data-name="Rectangle 80" width="2.37" height="0.752" rx="0.376" transform="translate(26.402 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_81" data-name="Rectangle 81" width="2.37" height="0.752" rx="0.376" transform="translate(28.897 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_82" data-name="Rectangle 82" width="2.37" height="0.752" rx="0.376" transform="translate(31.393 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_83" data-name="Rectangle 83" width="2.37" height="0.752" rx="0.376" transform="translate(34.512 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_84" data-name="Rectangle 84" width="2.37" height="0.752" rx="0.376" transform="translate(37.007 0.744)" fill="#d8d8d8" opacity="0.136"/>
-        <rect id="Rectangle_85" data-name="Rectangle 85" width="2.37" height="0.752" rx="0.376" transform="translate(39.502 0.744)" fill="#d8d8d8" opacity="0.136"/>
-      </g>
-      <path id="Path_59" data-name="Path 59" d="M123.779,148.389a2.583,2.583,0,0,0-.332.033c-.02-.078-.038-.156-.06-.234a2.594,2.594,0,1,0-2.567-4.455q-.086-.088-.174-.175a2.593,2.593,0,1,0-4.461-2.569c-.077-.022-.154-.04-.231-.06a2.6,2.6,0,1,0-5.128,0c-.077.02-.154.038-.231.06a2.594,2.594,0,1,0-4.461,2.569,10.384,10.384,0,1,0,17.314,9.992,2.592,2.592,0,1,0,.332-5.161" transform="translate(-51.054 -75.262)" fill="#44d860" fill-rule="evenodd"/>
-      <path id="Path_60" data-name="Path 60" d="M83,113.389h20.779V103H83Z" transform="translate(-41.443 -58.444)" fill="#3ecc5f" fill-rule="evenodd"/>
-      <path id="Path_61" data-name="Path 61" d="M123.389,108.944a1.3,1.3,0,1,0,0-2.6,1.338,1.338,0,0,0-.166.017c-.01-.039-.019-.078-.03-.117a1.3,1.3,0,0,0-.5-2.5,1.285,1.285,0,0,0-.783.269q-.043-.044-.087-.087a1.285,1.285,0,0,0,.263-.776,1.3,1.3,0,0,0-2.493-.509,5.195,5.195,0,1,0,0,10,1.3,1.3,0,0,0,2.493-.509,1.285,1.285,0,0,0-.263-.776q.044-.043.087-.087a1.285,1.285,0,0,0,.783.269,1.3,1.3,0,0,0,.5-2.5c.011-.038.02-.078.03-.117a1.335,1.335,0,0,0,.166.017" transform="translate(-55.859 -57.894)" fill="#44d860" fill-rule="evenodd"/>
-      <path id="Path_62" data-name="Path 62" d="M141.8,38.745a1.41,1.41,0,0,1-.255-.026,1.309,1.309,0,0,1-.244-.073,1.349,1.349,0,0,1-.224-.119,1.967,1.967,0,0,1-.2-.161,1.52,1.52,0,0,1-.161-.2,1.282,1.282,0,0,1-.218-.722,1.41,1.41,0,0,1,.026-.255,1.5,1.5,0,0,1,.072-.244,1.364,1.364,0,0,1,.12-.223,1.252,1.252,0,0,1,.358-.358,1.349,1.349,0,0,1,.224-.119,1.309,1.309,0,0,1,.244-.073,1.2,1.2,0,0,1,.509,0,1.262,1.262,0,0,1,.468.192,1.968,1.968,0,0,1,.2.161,1.908,1.908,0,0,1,.161.2,1.322,1.322,0,0,1,.12.223,1.361,1.361,0,0,1,.1.5,1.317,1.317,0,0,1-.379.919,1.968,1.968,0,0,1-.2.161,1.346,1.346,0,0,1-.223.119,1.332,1.332,0,0,1-.5.1m10.389-.649a1.326,1.326,0,0,1-.92-.379,1.979,1.979,0,0,1-.161-.2,1.282,1.282,0,0,1-.218-.722,1.326,1.326,0,0,1,.379-.919,1.967,1.967,0,0,1,.2-.161,1.351,1.351,0,0,1,.224-.119,1.308,1.308,0,0,1,.244-.073,1.2,1.2,0,0,1,.509,0,1.262,1.262,0,0,1,.468.192,1.967,1.967,0,0,1,.2.161,1.326,1.326,0,0,1,.379.919,1.461,1.461,0,0,1-.026.255,1.323,1.323,0,0,1-.073.244,1.847,1.847,0,0,1-.119.223,1.911,1.911,0,0,1-.161.2,1.967,1.967,0,0,1-.2.161,1.294,1.294,0,0,1-.722.218" transform="translate(-69.074 -26.006)" fill-rule="evenodd"/>
-    </g>
-    <g id="React-icon" transform="translate(906.3 541.56)">
-      <path id="Path_330" data-name="Path 330" d="M263.668,117.179c0-5.827-7.3-11.35-18.487-14.775,2.582-11.4,1.434-20.477-3.622-23.382a7.861,7.861,0,0,0-4.016-1v4a4.152,4.152,0,0,1,2.044.466c2.439,1.4,3.5,6.724,2.672,13.574-.2,1.685-.52,3.461-.914,5.272a86.9,86.9,0,0,0-11.386-1.954,87.469,87.469,0,0,0-7.459-8.965c5.845-5.433,11.332-8.41,15.062-8.41V78h0c-4.931,0-11.386,3.514-17.913,9.611-6.527-6.061-12.982-9.539-17.913-9.539v4c3.712,0,9.216,2.959,15.062,8.356a84.687,84.687,0,0,0-7.405,8.947,83.732,83.732,0,0,0-11.4,1.972c-.412-1.793-.717-3.532-.932-5.2-.843-6.85.2-12.175,2.618-13.592a3.991,3.991,0,0,1,2.062-.466v-4h0a8,8,0,0,0-4.052,1c-5.039,2.9-6.168,11.96-3.568,23.328-11.153,3.443-18.415,8.947-18.415,14.757,0,5.828,7.3,11.35,18.487,14.775-2.582,11.4-1.434,20.477,3.622,23.382a7.882,7.882,0,0,0,4.034,1c4.931,0,11.386-3.514,17.913-9.611,6.527,6.061,12.982,9.539,17.913,9.539a8,8,0,0,0,4.052-1c5.039-2.9,6.168-11.96,3.568-23.328C256.406,128.511,263.668,122.988,263.668,117.179Zm-23.346-11.96c-.663,2.313-1.488,4.7-2.421,7.083-.735-1.434-1.506-2.869-2.349-4.3-.825-1.434-1.7-2.833-2.582-4.2C235.517,104.179,237.974,104.645,240.323,105.219Zm-8.212,19.1c-1.4,2.421-2.833,4.716-4.321,6.85-2.672.233-5.379.359-8.1.359-2.708,0-5.415-.126-8.069-.341q-2.232-3.2-4.339-6.814-2.044-3.523-3.73-7.136c1.112-2.4,2.367-4.805,3.712-7.154,1.4-2.421,2.833-4.716,4.321-6.85,2.672-.233,5.379-.359,8.1-.359,2.708,0,5.415.126,8.069.341q2.232,3.2,4.339,6.814,2.044,3.523,3.73,7.136C234.692,119.564,233.455,121.966,232.11,124.315Zm5.792-2.331c.968,2.4,1.793,4.805,2.474,7.136-2.349.574-4.823,1.058-7.387,1.434.879-1.381,1.757-2.8,2.582-4.25C236.4,124.871,237.167,123.419,237.9,121.984ZM219.72,141.116a73.921,73.921,0,0,1-4.985-5.738c1.614.072,3.263.126,4.931.126,1.685,0,3.353-.036,4.985-.126A69.993,69.993,0,0,1,219.72,141.116ZM206.38,130.555c-2.546-.377-5-.843-7.352-1.417.663-2.313,1.488-4.7,2.421-7.083.735,1.434,1.506,2.869,2.349,4.3S205.5,129.192,206.38,130.555ZM219.63,93.241a73.924,73.924,0,0,1,4.985,5.738c-1.614-.072-3.263-.126-4.931-.126-1.686,0-3.353.036-4.985.126A69.993,69.993,0,0,1,219.63,93.241ZM206.362,103.8c-.879,1.381-1.757,2.8-2.582,4.25-.825,1.434-1.6,2.869-2.331,4.3-.968-2.4-1.793-4.805-2.474-7.136C201.323,104.663,203.8,104.179,206.362,103.8Zm-16.227,22.449c-6.348-2.708-10.454-6.258-10.454-9.073s4.106-6.383,10.454-9.073c1.542-.663,3.228-1.255,4.967-1.811a86.122,86.122,0,0,0,4.034,10.92,84.9,84.9,0,0,0-3.981,10.866C193.38,127.525,191.694,126.915,190.134,126.252Zm9.647,25.623c-2.439-1.4-3.5-6.724-2.672-13.574.2-1.686.52-3.461.914-5.272a86.9,86.9,0,0,0,11.386,1.954,87.465,87.465,0,0,0,7.459,8.965c-5.845,5.433-11.332,8.41-15.062,8.41A4.279,4.279,0,0,1,199.781,151.875Zm42.532-13.663c.843,6.85-.2,12.175-2.618,13.592a3.99,3.99,0,0,1-2.062.466c-3.712,0-9.216-2.959-15.062-8.356a84.689,84.689,0,0,0,7.405-8.947,83.731,83.731,0,0,0,11.4-1.972A50.194,50.194,0,0,1,242.313,138.212Zm6.9-11.96c-1.542.663-3.228,1.255-4.967,1.811a86.12,86.12,0,0,0-4.034-10.92,84.9,84.9,0,0,0,3.981-10.866c1.775.556,3.461,1.165,5.039,1.829,6.348,2.708,10.454,6.258,10.454,9.073C259.67,119.994,255.564,123.562,249.216,126.252Z" fill="#61dafb"/>
-      <path id="Path_331" data-name="Path 331" d="M320.8,78.4Z" transform="translate(-119.082 -0.328)" fill="#61dafb"/>
-      <circle id="Ellipse_112" data-name="Ellipse 112" cx="8.194" cy="8.194" r="8.194" transform="translate(211.472 108.984)" fill="#61dafb"/>
-      <path id="Path_332" data-name="Path 332" d="M520.5,78.1Z" transform="translate(-282.975 -0.082)" fill="#61dafb"/>
-    </g>
-  </g>
-</svg>
diff --git a/platform-docs/static/img/undraw_docusaurus_tree.svg b/platform-docs/static/img/undraw_docusaurus_tree.svg
deleted file mode 100644
index d9161d33920c97..00000000000000
--- a/platform-docs/static/img/undraw_docusaurus_tree.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1129" height="663" viewBox="0 0 1129 663">
-  <title>Focus on What Matters</title>
-  <circle cx="321" cy="321" r="321" fill="#f2f2f2" />
-  <ellipse cx="559" cy="635.49998" rx="514" ry="27.50002" fill="#3f3d56" />
-  <ellipse cx="558" cy="627" rx="460" ry="22" opacity="0.2" />
-  <rect x="131" y="152.5" width="840" height="50" fill="#3f3d56" />
-  <path d="M166.5,727.3299A21.67009,21.67009,0,0,0,188.1701,749H984.8299A21.67009,21.67009,0,0,0,1006.5,727.3299V296h-840Z" transform="translate(-35.5 -118.5)" fill="#3f3d56" />
-  <path d="M984.8299,236H188.1701A21.67009,21.67009,0,0,0,166.5,257.6701V296h840V257.6701A21.67009,21.67009,0,0,0,984.8299,236Z" transform="translate(-35.5 -118.5)" fill="#3f3d56" />
-  <path d="M984.8299,236H188.1701A21.67009,21.67009,0,0,0,166.5,257.6701V296h840V257.6701A21.67009,21.67009,0,0,0,984.8299,236Z" transform="translate(-35.5 -118.5)" opacity="0.2" />
-  <circle cx="181" cy="147.5" r="13" fill="#3f3d56" />
-  <circle cx="217" cy="147.5" r="13" fill="#3f3d56" />
-  <circle cx="253" cy="147.5" r="13" fill="#3f3d56" />
-  <rect x="168" y="213.5" width="337" height="386" rx="5.33505" fill="#606060" />
-  <rect x="603" y="272.5" width="284" height="22" rx="5.47638" fill="#2e8555" />
-  <rect x="537" y="352.5" width="416" height="15" rx="5.47638" fill="#2e8555" />
-  <rect x="537" y="396.5" width="416" height="15" rx="5.47638" fill="#2e8555" />
-  <rect x="537" y="440.5" width="416" height="15" rx="5.47638" fill="#2e8555" />
-  <rect x="537" y="484.5" width="416" height="15" rx="5.47638" fill="#2e8555" />
-  <rect x="865" y="552.5" width="88" height="26" rx="7.02756" fill="#3ecc5f" />
-  <path d="M1088.60287,624.61594a30.11371,30.11371,0,0,0,3.98291-15.266c0-13.79652-8.54358-24.98081-19.08256-24.98081s-19.08256,11.18429-19.08256,24.98081a30.11411,30.11411,0,0,0,3.98291,15.266,31.248,31.248,0,0,0,0,30.53213,31.248,31.248,0,0,0,0,30.53208,31.248,31.248,0,0,0,0,30.53208,30.11408,30.11408,0,0,0-3.98291,15.266c0,13.79652,8.54353,24.98081,19.08256,24.98081s19.08256-11.18429,19.08256-24.98081a30.11368,30.11368,0,0,0-3.98291-15.266,31.248,31.248,0,0,0,0-30.53208,31.248,31.248,0,0,0,0-30.53208,31.248,31.248,0,0,0,0-30.53213Z" transform="translate(-35.5 -118.5)" fill="#3f3d56" />
-  <ellipse cx="1038.00321" cy="460.31783" rx="19.08256" ry="24.9808" fill="#3f3d56" />
-  <ellipse cx="1038.00321" cy="429.78574" rx="19.08256" ry="24.9808" fill="#3f3d56" />
-  <path d="M1144.93871,339.34489a91.61081,91.61081,0,0,0,7.10658-10.46092l-50.141-8.23491,54.22885.4033a91.566,91.566,0,0,0,1.74556-72.42605l-72.75449,37.74139,67.09658-49.32086a91.41255,91.41255,0,1,0-150.971,102.29805,91.45842,91.45842,0,0,0-10.42451,16.66946l65.0866,33.81447-69.40046-23.292a91.46011,91.46011,0,0,0,14.73837,85.83669,91.40575,91.40575,0,1,0,143.68892,0,91.41808,91.41808,0,0,0,0-113.02862Z" transform="translate(-35.5 -118.5)" fill="#3ecc5f" fill-rule="evenodd" />
-  <path d="M981.6885,395.8592a91.01343,91.01343,0,0,0,19.56129,56.51431,91.40575,91.40575,0,1,0,143.68892,0C1157.18982,436.82067,981.6885,385.60008,981.6885,395.8592Z" transform="translate(-35.5 -118.5)" opacity="0.1" />
-  <path d="M365.62,461.43628H477.094v45.12043H365.62Z" transform="translate(-35.5 -118.5)" fill="#fff" fill-rule="evenodd" />
-  <path d="M264.76252,608.74122a26.50931,26.50931,0,0,1-22.96231-13.27072,26.50976,26.50976,0,0,0,22.96231,39.81215H291.304V608.74122Z" transform="translate(-35.5 -118.5)" fill="#3ecc5f" fill-rule="evenodd" />
-  <path d="M384.17242,468.57061l92.92155-5.80726V449.49263a26.54091,26.54091,0,0,0-26.54143-26.54143H331.1161l-3.31768-5.74622a3.83043,3.83043,0,0,0-6.63536,0l-3.31768,5.74622-3.31767-5.74622a3.83043,3.83043,0,0,0-6.63536,0l-3.31768,5.74622L301.257,417.205a3.83043,3.83043,0,0,0-6.63536,0L291.304,422.9512c-.02919,0-.05573.004-.08625.004l-5.49674-5.49541a3.8293,3.8293,0,0,0-6.4071,1.71723l-1.81676,6.77338L270.607,424.1031a3.82993,3.82993,0,0,0-4.6912,4.69253l1.84463,6.89148-6.77072,1.81411a3.8315,3.8315,0,0,0-1.71988,6.40975l5.49673,5.49673c0,.02787-.004.05574-.004.08493l-5.74622,3.31768a3.83043,3.83043,0,0,0,0,6.63536l5.74621,3.31768L259.0163,466.081a3.83043,3.83043,0,0,0,0,6.63536l5.74622,3.31768-5.74622,3.31767a3.83043,3.83043,0,0,0,0,6.63536l5.74622,3.31768-5.74622,3.31768a3.83043,3.83043,0,0,0,0,6.63536l5.74622,3.31768-5.74622,3.31767a3.83043,3.83043,0,0,0,0,6.63536l5.74622,3.31768-5.74622,3.31768a3.83043,3.83043,0,0,0,0,6.63536l5.74622,3.31768-5.74622,3.31768a3.83042,3.83042,0,0,0,0,6.63535l5.74622,3.31768-5.74622,3.31768a3.83043,3.83043,0,0,0,0,6.63536l5.74622,3.31768L259.0163,558.976a3.83042,3.83042,0,0,0,0,6.63535l5.74622,3.31768-5.74622,3.31768a3.83043,3.83043,0,0,0,0,6.63536l5.74622,3.31768-5.74622,3.31768a3.83042,3.83042,0,0,0,0,6.63535l5.74622,3.31768-5.74622,3.31768a3.83043,3.83043,0,0,0,0,6.63536l5.74622,3.31768A26.54091,26.54091,0,0,0,291.304,635.28265H450.55254A26.5409,26.5409,0,0,0,477.094,608.74122V502.5755l-92.92155-5.80727a14.12639,14.12639,0,0,1,0-28.19762" transform="translate(-35.5 -118.5)" fill="#3ecc5f" fill-rule="evenodd" />
-  <path d="M424.01111,635.28265h39.81214V582.19979H424.01111Z" transform="translate(-35.5 -118.5)" fill="#3ecc5f" fill-rule="evenodd" />
-  <path d="M490.36468,602.10586a6.60242,6.60242,0,0,0-.848.08493c-.05042-.19906-.09821-.39945-.15393-.59852A6.62668,6.62668,0,1,0,482.80568,590.21q-.2203-.22491-.44457-.44589a6.62391,6.62391,0,1,0-11.39689-6.56369c-.1964-.05575-.39414-.10218-.59056-.15262a6.63957,6.63957,0,1,0-13.10086,0c-.1964.05042-.39414.09687-.59056.15262a6.62767,6.62767,0,1,0-11.39688,6.56369,26.52754,26.52754,0,1,0,44.23127,25.52756,6.6211,6.6211,0,1,0,.848-13.18579" transform="translate(-35.5 -118.5)" fill="#44d860" fill-rule="evenodd" />
-  <path d="M437.28182,555.65836H477.094V529.11693H437.28182Z" transform="translate(-35.5 -118.5)" fill="#3ecc5f" fill-rule="evenodd" />
-  <path d="M490.36468,545.70532a3.31768,3.31768,0,0,0,0-6.63536,3.41133,3.41133,0,0,0-.42333.04247c-.02655-.09953-.04911-.19907-.077-.29859a3.319,3.319,0,0,0-1.278-6.37923,3.28174,3.28174,0,0,0-2.00122.68742q-.10947-.11346-.22294-.22295a3.282,3.282,0,0,0,.67149-1.98265,3.31768,3.31768,0,0,0-6.37-1.2992,13.27078,13.27078,0,1,0,0,25.54082,3.31768,3.31768,0,0,0,6.37-1.2992,3.282,3.282,0,0,0-.67149-1.98265q.11347-.10947.22294-.22294a3.28174,3.28174,0,0,0,2.00122.68742,3.31768,3.31768,0,0,0,1.278-6.37923c.02786-.0982.05042-.19907.077-.29859a3.41325,3.41325,0,0,0,.42333.04246" transform="translate(-35.5 -118.5)" fill="#44d860" fill-rule="evenodd" />
-  <path d="M317.84538,466.081a3.31768,3.31768,0,0,1-3.31767-3.31768,9.953,9.953,0,1,0-19.90608,0,3.31768,3.31768,0,1,1-6.63535,0,16.58839,16.58839,0,1,1,33.17678,0,3.31768,3.31768,0,0,1-3.31768,3.31768" transform="translate(-35.5 -118.5)" fill-rule="evenodd" />
-  <path d="M370.92825,635.28265h79.62429A26.5409,26.5409,0,0,0,477.094,608.74122v-92.895H397.46968a26.54091,26.54091,0,0,0-26.54143,26.54143Z" transform="translate(-35.5 -118.5)" fill="#ffff50" fill-rule="evenodd" />
-  <path d="M457.21444,556.98543H390.80778a1.32707,1.32707,0,0,1,0-2.65414h66.40666a1.32707,1.32707,0,0,1,0,2.65414m0,26.54143H390.80778a1.32707,1.32707,0,1,1,0-2.65414h66.40666a1.32707,1.32707,0,0,1,0,2.65414m0,26.54143H390.80778a1.32707,1.32707,0,1,1,0-2.65414h66.40666a1.32707,1.32707,0,0,1,0,2.65414m0-66.10674H390.80778a1.32707,1.32707,0,0,1,0-2.65414h66.40666a1.32707,1.32707,0,0,1,0,2.65414m0,26.29459H390.80778a1.32707,1.32707,0,0,1,0-2.65414h66.40666a1.32707,1.32707,0,0,1,0,2.65414m0,26.54143H390.80778a1.32707,1.32707,0,0,1,0-2.65414h66.40666a1.32707,1.32707,0,0,1,0,2.65414M477.094,474.19076c-.01592,0-.0292-.008-.04512-.00663-4.10064.13934-6.04083,4.24132-7.75274,7.86024-1.78623,3.78215-3.16771,6.24122-5.43171,6.16691-2.50685-.09024-3.94007-2.92222-5.45825-5.91874-1.74377-3.44243-3.73438-7.34667-7.91333-7.20069-4.04227.138-5.98907,3.70784-7.70631,6.857-1.82738,3.35484-3.07084,5.39455-5.46887,5.30033-2.55727-.09289-3.91619-2.39536-5.48877-5.06013-1.75306-2.96733-3.77951-6.30359-7.8775-6.18946-3.97326.13669-5.92537,3.16507-7.64791,5.83912-1.82207,2.82666-3.09872,4.5492-5.52725,4.447-2.61832-.09289-3.9706-2.00388-5.53522-4.21611-1.757-2.4856-3.737-5.299-7.82308-5.16231-3.88567.13271-5.83779,2.61434-7.559,4.80135-1.635,2.07555-2.9116,3.71846-5.61218,3.615a1.32793,1.32793,0,1,0-.09555,2.65414c4.00377.134,6.03154-2.38873,7.79257-4.6275,1.562-1.9853,2.91027-3.69855,5.56441-3.78879,2.55594-.10882,3.75429,1.47968,5.56707,4.04093,1.7212,2.43385,3.67465,5.19416,7.60545,5.33616,4.11789.138,6.09921-2.93946,7.8536-5.66261,1.56861-2.43385,2.92221-4.53461,5.50734-4.62352,2.37944-.08892,3.67466,1.79154,5.50072,4.885,1.72121,2.91557,3.67069,6.21865,7.67977,6.36463,4.14709.14332,6.14965-3.47693,7.89475-6.68181,1.51155-2.77092,2.93814-5.38791,5.46621-5.4755,2.37944-.05573,3.62025,2.11668,5.45558,5.74622,1.71459,3.388,3.65875,7.22591,7.73019,7.37321l.22429.004c4.06614,0,5.99571-4.08074,7.70364-7.68905,1.51154-3.19825,2.94211-6.21069,5.3972-6.33411Z" transform="translate(-35.5 -118.5)" fill-rule="evenodd" />
-  <path d="M344.38682,635.28265h53.08286V582.19979H344.38682Z" transform="translate(-35.5 -118.5)" fill="#3ecc5f" fill-rule="evenodd" />
-  <path d="M424.01111,602.10586a6.60242,6.60242,0,0,0-.848.08493c-.05042-.19906-.09821-.39945-.15394-.59852A6.62667,6.62667,0,1,0,416.45211,590.21q-.2203-.22491-.44458-.44589a6.62391,6.62391,0,1,0-11.39689-6.56369c-.1964-.05575-.39413-.10218-.59054-.15262a6.63957,6.63957,0,1,0-13.10084,0c-.19641.05042-.39414.09687-.59055.15262a6.62767,6.62767,0,1,0-11.39689,6.56369,26.52755,26.52755,0,1,0,44.2313,25.52756,6.6211,6.6211,0,1,0,.848-13.18579" transform="translate(-35.5 -118.5)" fill="#44d860" fill-rule="evenodd" />
-  <path d="M344.38682,555.65836h53.08286V529.11693H344.38682Z" transform="translate(-35.5 -118.5)" fill="#3ecc5f" fill-rule="evenodd" />
-  <path d="M410.74039,545.70532a3.31768,3.31768,0,1,0,0-6.63536,3.41133,3.41133,0,0,0-.42333.04247c-.02655-.09953-.04911-.19907-.077-.29859a3.319,3.319,0,0,0-1.278-6.37923,3.28174,3.28174,0,0,0-2.00122.68742q-.10947-.11346-.22294-.22295a3.282,3.282,0,0,0,.67149-1.98265,3.31768,3.31768,0,0,0-6.37-1.2992,13.27078,13.27078,0,1,0,0,25.54082,3.31768,3.31768,0,0,0,6.37-1.2992,3.282,3.282,0,0,0-.67149-1.98265q.11347-.10947.22294-.22294a3.28174,3.28174,0,0,0,2.00122.68742,3.31768,3.31768,0,0,0,1.278-6.37923c.02786-.0982.05042-.19907.077-.29859a3.41325,3.41325,0,0,0,.42333.04246" transform="translate(-35.5 -118.5)" fill="#44d860" fill-rule="evenodd" />
-  <path d="M424.01111,447.8338a3.60349,3.60349,0,0,1-.65028-.06636,3.34415,3.34415,0,0,1-.62372-.18579,3.44679,3.44679,0,0,1-.572-.30522,5.02708,5.02708,0,0,1-.50429-.4114,3.88726,3.88726,0,0,1-.41007-.50428,3.27532,3.27532,0,0,1-.55737-1.84463,3.60248,3.60248,0,0,1,.06636-.65027,3.82638,3.82638,0,0,1,.18447-.62373,3.48858,3.48858,0,0,1,.30656-.57064,3.197,3.197,0,0,1,.91436-.91568,3.44685,3.44685,0,0,1,.572-.30523,3.344,3.344,0,0,1,.62372-.18578,3.06907,3.06907,0,0,1,1.30053,0,3.22332,3.22332,0,0,1,1.19436.491,5.02835,5.02835,0,0,1,.50429.41139,4.8801,4.8801,0,0,1,.41139.50429,3.38246,3.38246,0,0,1,.30522.57064,3.47806,3.47806,0,0,1,.25215,1.274A3.36394,3.36394,0,0,1,426.36,446.865a5.02708,5.02708,0,0,1-.50429.4114,3.3057,3.3057,0,0,1-1.84463.55737m26.54143-1.65884a3.38754,3.38754,0,0,1-2.35024-.96877,5.04185,5.04185,0,0,1-.41007-.50428,3.27532,3.27532,0,0,1-.55737-1.84463,3.38659,3.38659,0,0,1,.96744-2.34892,5.02559,5.02559,0,0,1,.50429-.41139,3.44685,3.44685,0,0,1,.572-.30523,3.3432,3.3432,0,0,1,.62373-.18579,3.06952,3.06952,0,0,1,1.30052,0,3.22356,3.22356,0,0,1,1.19436.491,5.02559,5.02559,0,0,1,.50429.41139,3.38792,3.38792,0,0,1,.96876,2.34892,3.72635,3.72635,0,0,1-.06636.65026,3.37387,3.37387,0,0,1-.18579.62373,4.71469,4.71469,0,0,1-.30522.57064,4.8801,4.8801,0,0,1-.41139.50429,5.02559,5.02559,0,0,1-.50429.41139,3.30547,3.30547,0,0,1-1.84463.55737" transform="translate(-35.5 -118.5)" fill-rule="evenodd" />
-</svg>
diff --git a/platform-docs/static/img/video.png b/platform-docs/static/img/video.png
new file mode 100644
index 00000000000000..d24f2a75547f4c
Binary files /dev/null and b/platform-docs/static/img/video.png differ
diff --git a/platform-docs/static/img/wordpress.png b/platform-docs/static/img/wordpress.png
new file mode 100644
index 00000000000000..eb195a12c14bf9
Binary files /dev/null and b/platform-docs/static/img/wordpress.png differ
diff --git a/post-content.php b/post-content.php
index 0bdeb30733f6cd..3c9b18087b0e84 100644
--- a/post-content.php
+++ b/post-content.php
@@ -61,7 +61,7 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul>
+<ul class="wp-block-list">
 	<li><?php _e( 'Text &amp; Headings', 'gutenberg' ); ?></li>
 	<li><?php _e( 'Images &amp; Videos', 'gutenberg' ); ?></li>
 	<li><?php _e( 'Galleries', 'gutenberg' ); ?></li>
diff --git a/readme.txt b/readme.txt
index 8ebcfd1406b0d8..4bd7ddc36d6e9b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,11 +1,11 @@
 === Gutenberg ===
 Contributors: matveb, joen, karmatosed
-Tested up to: 6.4
+Tested up to: 6.6
 Stable tag: V.V.V
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-The Gutenberg plugin provides editing, customization, and site building features to WordPress. This beta plugin allows you to test bleeding-edge features before they land in future WordPress releases.
+The Gutenberg plugin adds editing, customization, and site building to WordPress. Use it to test beta features before their official release.
 
 == Description ==
 
@@ -55,7 +55,7 @@ To report a security issue, please visit the [WordPress HackerOne](https://hacke
 
 = Do I have to use the Gutenberg plugin to get access to these features? =
 
-Not necessarily. Each version of WordPress after 5.0 has included features from the Gutenberg plugin, which are known collectively as the <a href="https://wordpress.org/documentation/article/wordpress-block-editor/">WordPress Editor</a>. You are likely already benefitting from stable features!
+Not necessarily. Each version of WordPress after 5.0 has included features from the Gutenberg plugin, which are known collectively as the <a href="https://wordpress.org/documentation/article/wordpress-block-editor/">WordPress Editor</a>. You are likely already benefiting from stable features!
 
 But if you want cutting edge beta features, including more experimental items, you will need to use the plugin. You can <a href="https://wordpress.org/news/2021/04/become-an-early-adopter-with-the-gutenberg-plugin/">read more here</a> to help decide whether the plugin is right for you.
 
diff --git a/schemas/README.md b/schemas/README.md
index 1b2d8992cccb90..fa695115f33abe 100644
--- a/schemas/README.md
+++ b/schemas/README.md
@@ -1,6 +1,6 @@
 # Schemas
 
-The collection of schemas used in WordPress, including the `theme.json` and `block.json` schemas.
+The collection of schemas used in WordPress, including the `theme.json`, `block.json` and `font-collection.json` schemas.
 
 JSON schemas are used by code editors to offer tooltips, autocomplete, and validation.
 
@@ -24,6 +24,14 @@ Or in your `theme.json`:
 }
 ```
 
+Or in your `font-collection.json`:
+
+```json
+{
+	"$schema": "https://schemas.wp.org/trunk/font-collection.json"
+}
+```
+
 For a specific version of the schema, replace `trunk` with `wp/X.X`:
 
 ```json
@@ -56,8 +64,16 @@ To allow this you will need to:
 }
 ```
 
+-   update your font collections's `font-collection.json` to include:
+
+```json
+{
+	"$schema": "file://{{FULL_FILE_PATH}}/schemas/json/font-collection.json"
+}
+```
+
 Be sure to replace `{{FULL_FILE_PATH}}` with the full local path to your Gutenberg repo.
 
-With this in place you should now be able to edit either `schemas/json/theme .json` or `schemas/json/block.json` in order to see changes reflected in `theme.json` or `block.json` in your IDE.
+With this in place you should now be able to edit either `schemas/json/theme .json`, `schemas/json/block.json` or `schemas/json/font-collection.json` in order to see changes reflected in `theme.json`, `block.json` or `font-collection.json` in your IDE.
 
 <br/><br/><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>
diff --git a/schemas/json/block.json b/schemas/json/block.json
index d5b4a04452eaa6..8e314a45ae1cff 100644
--- a/schemas/json/block.json
+++ b/schemas/json/block.json
@@ -1,6 +1,6 @@
 {
 	"title": "JSON schema for WordPress blocks",
-	"$schema": "http://json-schema.org/draft-04/schema#",
+	"$schema": "http://json-schema.org/draft-07/schema#",
 	"definitions": {
 		"//": {
 			"reference": "https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/",
@@ -16,15 +16,15 @@
 			"type": "string"
 		},
 		"apiVersion": {
-			"type": "integer",
 			"description": "The version of the Block API used by the block. The most recent version is 3 and it was introduced in WordPress 6.3.\n\n See the API versions documentation at https://developer.wordpress.org/block-editor/reference-guides/block-api/block-api-versions/ for more details.",
-			"default": 1,
-			"enum": [ 1, 2, 3 ]
+			"type": "integer",
+			"enum": [ 1, 2, 3 ],
+			"default": 1
 		},
 		"name": {
+			"description": "The name for a block is a unique string that identifies a block. Names have to be structured as `namespace/block-name`, where namespace is the name of your plugin or theme.",
 			"type": "string",
-			"pattern": "^[a-z][a-z0-9-]*/[a-z][a-z0-9-]*$",
-			"description": "The name for a block is a unique string that identifies a block. Names have to be structured as `namespace/block-name`, where namespace is the name of your plugin or theme."
+			"pattern": "^[a-z][a-z0-9-]*/[a-z][a-z0-9-]*$"
 		},
 		"__experimental": {
 			"description": "The name of the experiment this block is a part of, or boolean true if there is no specific experiment name.",
@@ -38,8 +38,8 @@
 			]
 		},
 		"title": {
-			"type": "string",
-			"description": "This is the display title for your block, which can be translated with our translation functions. The block inserter will show this name."
+			"description": "This is the display title for your block, which can be translated with our translation functions. The block inserter will show this name.",
+			"type": "string"
 		},
 		"category": {
 			"description": "Blocks are grouped into categories to help users browse and discover them.\n Core provided categories are: text, media, design, widgets, theme, embed\n\nPlugins and Themes can also register custom block categories.\n\nhttps://developer.wordpress.org/block-editor/reference-guides/filters/block-filters/#managing-block-categories",
@@ -48,6 +48,7 @@
 					"type": "string"
 				},
 				{
+					"type": "string",
 					"enum": [
 						"text",
 						"media",
@@ -60,45 +61,52 @@
 			]
 		},
 		"parent": {
-			"type": "array",
 			"description": "Setting parent lets a block require that it is only available when nested within the specified blocks. For example, you might want to allow an ‘Add to Cart’ block to only be available within a ‘Product’ block.",
+			"type": "array",
 			"items": {
 				"type": "string"
 			}
 		},
 		"ancestor": {
-			"type": "array",
 			"description": "The `ancestor` property makes a block available inside the specified block types at any position of the ancestor block subtree. That allows, for example, to place a ‘Comment Content’ block inside a ‘Column’ block, as long as ‘Column’ is somewhere within a ‘Comment Template’ block.",
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
+		},
+		"allowedBlocks": {
+			"description": "The `allowedBlocks` property specifies that only the listed block types can be the children of this block. For example, a ‘List’ block allows only ‘List Item’ blocks as direct children.",
+			"type": "array",
 			"items": {
 				"type": "string"
 			}
 		},
 		"icon": {
-			"type": "string",
-			"description": "An icon property should be specified to make it easier to identify a block. These can be any of WordPress’ Dashicons (slug serving also as a fallback in non-js contexts)."
+			"description": "An icon property should be specified to make it easier to identify a block. These can be any of WordPress’ Dashicons (slug serving also as a fallback in non-js contexts).",
+			"type": "string"
 		},
 		"description": {
-			"type": "string",
-			"description": "This is a short description for your block, which can be translated with our translation functions. This will be shown in the block inspector."
+			"description": "This is a short description for your block, which can be translated with our translation functions. This will be shown in the block inspector.",
+			"type": "string"
 		},
 		"keywords": {
-			"type": "array",
 			"description": "Sometimes a block could have aliases that help users discover it while searching. For example, an image block could also want to be discovered by photo. You can do so by providing an array of unlimited terms (which are translated).",
+			"type": "array",
 			"items": {
 				"type": "string"
 			}
 		},
 		"version": {
-			"type": "string",
-			"description": "The current version number of the block, such as 1.0 or 1.0.3. It’s similar to how plugins are versioned. This field might be used with block assets to control cache invalidation, and when the block author omits it, then the installed version of WordPress is used instead."
+			"description": "The current version number of the block, such as 1.0 or 1.0.3. It’s similar to how plugins are versioned. This field might be used with block assets to control cache invalidation, and when the block author omits it, then the installed version of WordPress is used instead.",
+			"type": "string"
 		},
 		"textdomain": {
-			"type": "string",
-			"description": "The gettext text domain of the plugin/block. More information can be found in the Text Domain section of the How to Internationalize your Plugin page.\n\nhttps://developer.wordpress.org/plugins/internationalization/how-to-internationalize-your-plugin/"
+			"description": "The gettext text domain of the plugin/block. More information can be found in the Text Domain section of the How to Internationalize your Plugin page.\n\nhttps://developer.wordpress.org/plugins/internationalization/how-to-internationalize-your-plugin/",
+			"type": "string"
 		},
 		"attributes": {
-			"type": "object",
 			"description": "Attributes provide the structured data needs of a block. They can exist in different forms when they are serialized, but they are declared together under a common interface.\n\nSee the attributes documentation at https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/ for more details.",
+			"type": "object",
 			"patternProperties": {
 				"[a-zA-Z]": {
 					"type": "object",
@@ -114,6 +122,7 @@
 										"object",
 										"array",
 										"string",
+										"rich-text",
 										"integer",
 										"number"
 									]
@@ -137,28 +146,23 @@
 							]
 						},
 						"enum": {
-							"type": "array",
 							"description": "An attribute can be defined as one of a fixed set of values. This is specified by an enum, which contains an array of allowed values:",
+							"type": "array",
 							"items": {
 								"oneOf": [
-									{
-										"type": "boolean"
-									},
-									{
-										"type": "number"
-									},
-									{
-										"type": "string"
-									}
+									{ "type": "boolean" },
+									{ "type": "number" },
+									{ "type": "string" }
 								]
 							}
 						},
 						"source": {
-							"type": "string",
 							"description": "Attribute sources are used to define how the attribute values are extracted from saved post content. They provide a mechanism to map from the saved markup to a JavaScript representation of a block.",
+							"type": "string",
 							"enum": [
 								"attribute",
 								"text",
+								"rich-text",
 								"html",
 								"raw",
 								"query",
@@ -166,40 +170,36 @@
 							]
 						},
 						"selector": {
-							"type": "string",
-							"description": "The selector can be an HTML tag, or anything queryable with querySelector, such as a class or id attribute. Examples are given below.\n\nFor example, a selector of img will match an img element, and img.class will match an img element that has a class of class."
+							"description": "The selector can be an HTML tag, or anything queryable with querySelector, such as a class or id attribute. Examples are given below.\n\nFor example, a selector of img will match an img element, and img.class will match an img element that has a class of class.",
+							"type": "string"
 						},
 						"attribute": {
-							"type": "string",
-							"description": "Use an attribute source to extract the value from an attribute in the markup. The attribute is specified by the attribute field, which must be supplied.\n\nExample: Extract the src attribute from an image found in the block’s markup."
+							"description": "Use an attribute source to extract the value from an attribute in the markup. The attribute is specified by the attribute field, which must be supplied.\n\nExample: Extract the src attribute from an image found in the block’s markup.",
+							"type": "string"
 						},
 						"query": {
-							"type": "object",
-							"description": "Use query to extract an array of values from markup. Entries of the array are determined by the selector argument, where each matched element within the block will have an entry structured corresponding to the second argument, an object of attribute sources."
+							"description": "Use query to extract an array of values from markup. Entries of the array are determined by the selector argument, where each matched element within the block will have an entry structured corresponding to the second argument, an object of attribute sources.",
+							"type": "object"
 						},
 						"meta": {
-							"type": "string",
-							"description": "Although attributes may be obtained from a post’s meta, meta attribute sources are considered deprecated; EntityProvider and related hook APIs should be used instead, as shown in the Create Meta Block how-to here:\n\nhttps://developer.wordpress.org/block-editor/how-to-guides/metabox/#step-2-add-meta-block"
+							"description": "Although attributes may be obtained from a post’s meta, meta attribute sources are considered deprecated; EntityProvider and related hook APIs should be used instead, as shown in the Create Meta Block how-to here:\n\nhttps://developer.wordpress.org/block-editor/how-to-guides/metabox/#step-2-add-meta-block",
+							"type": "string"
 						},
 						"default": {
 							"description": "A block attribute can contain a default value, which will be used if the type and source do not match anything within the block content.\n\nThe value is provided by the default field, and the value should match the expected format of the attribute."
 						}
 					},
 					"anyOf": [
-						{
-							"required": [ "type" ]
-						},
-						{
-							"required": [ "enum" ]
-						}
+						{ "required": [ "type" ] },
+						{ "required": [ "enum" ] }
 					]
 				}
 			},
 			"additionalProperties": false
 		},
 		"providesContext": {
-			"type": "object",
 			"description": "Context provided for available access by descendants of blocks of this type, in the form of an object which maps a context name to one of the block’s own attribute.\n\nSee the block context documentation at https://developer.wordpress.org/block-editor/reference-guides/block-api/block-context/ for more details.",
+			"type": "object",
 			"patternProperties": {
 				"[a-zA-Z]": {
 					"type": "string"
@@ -207,23 +207,22 @@
 			}
 		},
 		"usesContext": {
-			"type": "array",
 			"description": "Array of the names of context values to inherit from an ancestor provider.\n\nSee the block context documentation at https://developer.wordpress.org/block-editor/reference-guides/block-api/block-context/ for more details.",
+			"type": "array",
 			"items": {
 				"type": "string"
 			}
 		},
 		"supports": {
-			"type": "object",
 			"description": "It contains as set of options to control features used in the editor. See the supports documentation at https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/ for more details.",
+			"type": "object",
 			"properties": {
 				"anchor": {
-					"type": "boolean",
 					"description": "Anchors let you link directly to a specific block on a page. This property adds a field to define an id for the block and a button to copy the direct link.",
+					"type": "boolean",
 					"default": false
 				},
 				"align": {
-					"default": false,
 					"description": "This property adds block controls which allow to change block’s alignment.",
 					"oneOf": [
 						{
@@ -242,108 +241,129 @@
 								]
 							}
 						}
-					]
+					],
+					"default": false
 				},
 				"alignWide": {
-					"type": "boolean",
 					"description": "This property allows to enable wide alignment for your theme. To disable this behavior for a single block, set this flag to false.",
+					"type": "boolean",
 					"default": true
 				},
 				"ariaLabel": {
-					"type": "boolean",
 					"description": "ARIA-labels let you define an accessible label for elements. This property allows enabling the definition of an aria-label for the block, without exposing a UI field.",
+					"type": "boolean",
 					"default": false
 				},
 				"className": {
-					"type": "boolean",
 					"description": "By default, the class .wp-block-your-block-name is added to the root element of your saved markup. This helps having a consistent mechanism for styling blocks that themes and plugins can rely on. If, for whatever reason, a class is not desired on the markup, this functionality can be disabled.",
+					"type": "boolean",
 					"default": true
 				},
 				"color": {
-					"type": "object",
 					"description": "This value signals that a block supports some of the properties related to color. When it does, the block editor will show UI controls for the user to set their values.\n\nNote that the background and text keys have a default value of true, so if the color property is present they’ll also be considered enabled",
+					"type": "object",
 					"properties": {
 						"background": {
-							"type": "boolean",
 							"description": "This property adds UI controls which allow the user to apply a solid background color to a block.\n\nWhen color support is declared, this property is enabled by default (along with text), so simply setting color will enable background color.\n\nTo disable background support while keeping other color supports enabled, set to false.\n\nWhen the block declares support for color.background, its attributes definition is extended to include two new attributes: backgroundColor and style",
+							"type": "boolean",
 							"default": true
 						},
 						"gradients": {
-							"type": "boolean",
 							"description": "This property adds UI controls which allow the user to apply a gradient background to a block.\n\nGradient presets are sourced from editor-gradient-presets theme support.\n\nWhen the block declares support for color.gradient, its attributes definition is extended to include two new attributes: gradient and style",
+							"type": "boolean",
 							"default": false
 						},
 						"link": {
-							"type": "boolean",
 							"description": "This property adds block controls which allow the user to set link color in a block, link color is disabled by default.\n\nLink color presets are sourced from the editor-color-palette theme support.\n\nWhen the block declares support for color.link, its attributes definition is extended to include the style attribute",
+							"type": "boolean",
 							"default": false
 						},
 						"text": {
-							"type": "boolean",
 							"description": "This property adds block controls which allow the user to set text color in a block.\n\nWhen color support is declared, this property is enabled by default (along with background), so simply setting color will enable text color.\n\nText color presets are sourced from the editor-color-palette theme support.\n\nWhen the block declares support for color.text, its attributes definition is extended to include two new attributes: textColor and style",
+							"type": "boolean",
 							"default": true
 						},
 						"heading": {
+							"description": "This property adds block controls which allow the user to set heading colors in a block. Heading color is disabled by default.\n\nHeading color presets are sourced from the editor-color-palette theme support.\n\nWhen the block declares support for color.heading, its attributes definition is extended to include the style attribute",
 							"type": "boolean",
-							"description": "This property adds block controls which allow the user to set heading colors in a block, heading color is disabled by default.\n\nHeading color presets are sourced from the editor-color-palette theme support.\n\nWhen the block declares support for color.heading, its attributes definition is extended to include the style attribute",
 							"default": false
 						},
 						"button": {
+							"description": "This property adds block controls which allow the user to set button colors in a block. Button color is disabled by default.\n\nButton color presets are sourced from the editor-color-palette theme support.\n\nWhen the block declares support for color.button, its attributes definition is extended to include the style attribute",
 							"type": "boolean",
-							"description": "This property adds block controls which allow the user to set button colors in a block, button color is disabled by default.\n\nButton color presets are sourced from the editor-color-palette theme support.\n\nWhen the block declares support for color.heading, its attributes definition is extended to include the style attribute",
 							"default": false
 						},
 						"enableContrastChecker": {
-							"type": "boolean",
 							"description": "Determines whether the contrast checker widget displays in the block editor UI.\n\nThe contrast checker appears only if the block declares support for color. It tests the readability of color combinations and warns if there is a potential issue. The property is enabled by default.\n\nSet to `false` to explicitly disable.",
+							"type": "boolean",
 							"default": true
 						}
 					}
 				},
 				"customClassName": {
-					"type": "boolean",
 					"description": "This property adds a field to define a custom className for the block’s wrapper.",
-					"default": true
-				},
-				"defaultStylePicker": {
 					"type": "boolean",
-					"description": "When the style picker is shown, a dropdown is displayed so the user can select a default style for this block type. If you prefer not to show the dropdown, set this property to false.",
 					"default": true
 				},
 				"dimensions": {
-					"type": "object",
 					"description": "This value signals that a block supports some of the CSS style properties related to dimensions. When it does, the block editor will show UI controls for the user to set their values if the theme declares support.\n\nWhen the block declares support for a specific dimensions property, its attributes definition is extended to include the style attribute.",
+					"type": "object",
 					"properties": {
-						"minHeight": {
+						"aspectRatio": {
+							"description": "Allow blocks to define an aspect ratio value.",
 							"type": "boolean",
+							"default": false
+						},
+						"minHeight": {
 							"description": "Allow blocks to define a minimum height value.",
+							"type": "boolean",
 							"default": false
 						}
 					}
 				},
 				"filter": {
-					"type": "object",
 					"description": "This value signals that a block supports some of the properties related to filters. When it does, the block editor will show UI controls for the user to set their values if the theme declares support.\n\nWhen the block declares support for a specific filter property, its attributes definition is extended to include the style attribute.",
+					"type": "object",
 					"properties": {
 						"duotone": {
-							"type": "boolean",
 							"description": "Allow blocks to define a duotone filter.",
+							"type": "boolean",
+							"default": false
+						}
+					}
+				},
+				"background": {
+					"description": "This value signals that a block supports some of the CSS style properties related to background. When it does, the block editor will show UI controls for the user to set their values if the theme declares support.\n\nWhen the block declares support for a specific background property, its attributes definition is extended to include the style attribute.",
+					"type": "object",
+					"properties": {
+						"backgroundImage": {
+							"description": "Allow blocks to define a background image.",
+							"type": "boolean",
+							"default": false
+						},
+						"backgroundSize": {
+							"description": "Allow blocks to define values related to the size of a background image, including size, position, and repeat controls",
+							"type": "boolean",
 							"default": false
 						}
 					}
 				},
 				"html": {
-					"type": "boolean",
 					"description": "By default, a block’s markup can be edited individually. To disable this behavior, set html to false.",
+					"type": "boolean",
 					"default": true
 				},
 				"inserter": {
-					"type": "boolean",
 					"description": "By default, all blocks will appear in the inserter, block transforms menu, Style Book, etc. To hide a block from all parts of the user interface so that it can only be inserted programmatically, set inserter to false.",
+					"type": "boolean",
+					"default": true
+				},
+				"renaming": {
+					"description": "By default, a block can be renamed by a user from the block 'Options' dropdown or the 'Advanced' panel. To disable this behavior, set renaming to false.",
+					"type": "boolean",
 					"default": true
 				},
 				"layout": {
-					"default": false,
 					"description": "This value only applies to blocks that are containers for inner blocks. If set to `true` the layout type will be `flow`. For other layout types it's necessary to set the `type` explicitly inside the `default` object.",
 					"oneOf": [
 						{ "type": "boolean" },
@@ -351,12 +371,12 @@
 							"type": "object",
 							"properties": {
 								"default": {
-									"type": "object",
 									"description": "Allows setting the `type` property to define what layout type is default for the block, and also default values for any properties inherent to that layout type, e.g., for a `flex` layout, a default value can be set for `flexWrap`.",
+									"type": "object",
 									"properties": {
 										"type": {
-											"type": "string",
 											"description": "The layout type.",
+											"type": "string",
 											"enum": [
 												"constrained",
 												"grid",
@@ -364,16 +384,16 @@
 											]
 										},
 										"contentSize": {
-											"type": "string",
-											"description": "The content size used on all children."
+											"description": "The content size used on all children.",
+											"type": "string"
 										},
 										"wideSize": {
-											"type": "string",
-											"description": "The wide size used on alignwide children."
+											"description": "The wide size used on alignwide children.",
+											"type": "string"
 										},
 										"justifyContent": {
-											"type": "string",
 											"description": "Content justification value.",
+											"type": "string",
 											"enum": [
 												"right",
 												"center",
@@ -383,18 +403,18 @@
 											]
 										},
 										"orientation": {
-											"type": "string",
 											"description": "The orientation of the layout.",
+											"type": "string",
 											"enum": [ "horizontal", "vertical" ]
 										},
 										"flexWrap": {
-											"type": "string",
 											"description": "The flex wrap value.",
+											"type": "string",
 											"enum": [ "wrap", "nowrap" ]
 										},
 										"verticalAlignment": {
-											"type": "string",
 											"description": "The vertical alignment value.",
+											"type": "string",
 											"enum": [
 												"top",
 												"center",
@@ -404,83 +424,89 @@
 											]
 										},
 										"minimumColumnWidth": {
-											"type": "string",
-											"description": "The minimum column width value."
+											"description": "The minimum column width value.",
+											"type": "string"
 										},
 										"columnCount": {
-											"type": "number",
-											"description": "The column count value."
+											"description": "The column count value.",
+											"type": "number"
 										}
 									}
 								},
 								"allowSwitching": {
-									"type": "boolean",
 									"description": "Exposes a switcher control that allows toggling between all existing layout types.",
+									"type": "boolean",
 									"default": false
 								},
 								"allowEditing": {
-									"type": "boolean",
 									"description": "Determines display of layout controls in the block sidebar. If set to false, layout controls will be hidden.",
+									"type": "boolean",
 									"default": true
 								},
 								"allowInheriting": {
-									"type": "boolean",
 									"description": "For the `flow` layout type only, determines display of the `Inner blocks use content width` toggle.",
+									"type": "boolean",
 									"default": true
 								},
 								"allowSizingOnChildren": {
-									"type": "boolean",
 									"description": "For the `flex` layout type only, determines display of sizing controls (Fit/Fill/Fixed) on all child blocks of the flex block.",
+									"type": "boolean",
 									"default": false
 								},
 								"allowVerticalAlignment": {
-									"type": "boolean",
 									"description": "For the `flex` layout type only, determines display of vertical alignment controls in the block toolbar.",
+									"type": "boolean",
 									"default": true
 								},
 								"allowJustification": {
-									"type": "boolean",
 									"description": "For the `flex` layout type, determines display of justification controls in the block toolbar and block sidebar. For the `constrained` layout type, determines display of justification control in the block sidebar.",
+									"type": "boolean",
 									"default": true
 								},
 								"allowOrientation": {
-									"type": "boolean",
 									"description": "For the `flex` layout type only, determines display of the orientation control in the block toolbar.",
+									"type": "boolean",
+									"default": true
+								},
+								"allowCustomContentAndWideSize": {
+									"description": "For the `constrained` layout type only, determines display of the custom content and wide size controls in the block sidebar.",
+									"type": "boolean",
 									"default": true
 								}
 							}
 						}
-					]
+					],
+					"default": false
 				},
 				"multiple": {
-					"type": "boolean",
 					"description": "A non-multiple block can be inserted into each post, one time only. For example, the built-in ‘More’ block cannot be inserted again if it already exists in the post being edited. A non-multiple block’s icon is automatically dimmed (unclickable) to prevent multiple instances.",
+					"type": "boolean",
 					"default": true
 				},
 				"reusable": {
-					"type": "boolean",
 					"description": "A block may want to disable the ability of being converted into a reusable block. By default all blocks can be converted to a reusable block. If supports reusable is set to false, the option to convert the block into a reusable block will not appear.",
+					"type": "boolean",
 					"default": true
 				},
 				"lock": {
-					"type": "boolean",
 					"description": "A block may want to disable the ability to toggle the lock state. It can be locked/unlocked by a user from the block 'Options' dropdown by default. To disable this behavior, set lock to false.",
+					"type": "boolean",
 					"default": true
 				},
 				"position": {
-					"type": "object",
 					"description": "This value signals that a block supports some of the CSS style properties related to position. When it does, the block editor will show UI controls for the user to set their values if the theme declares support.\n\nWhen the block declares support for a specific position property, its attributes definition is extended to include the style attribute.",
+					"type": "object",
 					"properties": {
 						"sticky": {
-							"type": "boolean",
 							"description": "Allow blocks to stick to their immediate parent when scrolling the page.",
+							"type": "boolean",
 							"default": false
 						}
 					}
 				},
 				"spacing": {
-					"type": "object",
 					"description": "This value signals that a block supports some of the CSS style properties related to spacing. When it does, the block editor will show UI controls for the user to set their values if the theme declares support.\n\nWhen the block declares support for a specific spacing property, its attributes definition is extended to include the style attribute.",
+					"type": "object",
 					"properties": {
 						"margin": {
 							"oneOf": [
@@ -536,32 +562,91 @@
 						}
 					}
 				},
+				"shadow": {
+					"description": "Allow blocks to define a box shadow.",
+					"oneOf": [
+						{
+							"description": "Defines whether a box shadow is enabled or not.",
+							"type": "boolean"
+						},
+						{
+							"type": "object"
+						}
+					],
+					"default": false
+				},
 				"typography": {
-					"type": "object",
 					"description": "This value signals that a block supports some of the CSS style properties related to typography. When it does, the block editor will show UI controls for the user to set their values if the theme declares support.\n\nWhen the block declares support for a specific typography property, its attributes definition is extended to include the style attribute.",
+					"type": "object",
 					"properties": {
 						"fontSize": {
-							"type": "boolean",
 							"description": "This value signals that a block supports the font-size CSS style property. When it does, the block editor will show an UI control for the user to set its value.\n\nThe values shown in this control are the ones declared by the theme via the editor-font-sizes theme support, or the default ones if none is provided.\n\nWhen the block declares support for fontSize, its attributes definition is extended to include two new attributes: fontSize and style",
+							"type": "boolean",
 							"default": false
 						},
 						"lineHeight": {
-							"type": "boolean",
 							"description": "This value signals that a block supports the line-height CSS style property. When it does, the block editor will show an UI control for the user to set its value if the theme declares support.\n\nWhen the block declares support for lineHeight, its attributes definition is extended to include a new attribute style of object type with no default assigned. It stores the custom value set by the user. The block can apply a default style by specifying its own style attribute with a default",
+							"type": "boolean",
+							"default": false
+						},
+						"textAlign": {
+							"description": "This property adds block toolbar controls which allow to change block's text alignment.",
+							"oneOf": [
+								{
+									"type": "boolean"
+								},
+								{
+									"type": "array",
+									"items": {
+										"type": "string",
+										"enum": [ "left", "center", "right" ]
+									}
+								}
+							],
 							"default": false
 						}
 					}
+				},
+				"interactivity": {
+					"description": "Indicates if the block is using Interactivity API features.",
+					"oneOf": [
+						{
+							"description": "Indicates whether the block is using the Interactivity API directives.",
+							"type": "boolean",
+							"default": false
+						},
+						{
+							"type": "object",
+							"properties": {
+								"clientNavigation": {
+									"description": "Indicates whether a block is compatible with the Interactivity API client-side navigation.\n\nSet it to true only if the block is not interactive or if it is interactive using the Interactivity API. Set it to false if the block is interactive but uses vanilla JS, jQuery or another JS framework/library other than the Interactivity API.",
+									"type": "boolean",
+									"default": false
+								},
+								"interactive": {
+									"description": "Indicates whether the block is using the Interactivity API directives.",
+									"type": "boolean",
+									"default": false
+								}
+							}
+						}
+					]
+				},
+				"splitting": {
+					"description": "This property indicates whether the block can split when the Enter key is pressed or when blocks are pasted.",
+					"type": "boolean",
+					"default": false
 				}
 			},
 			"additionalProperties": true
 		},
 		"selectors": {
-			"type": "object",
 			"description": "Provides custom CSS selectors and mappings for the block. Selectors may be set for the block itself or per-feature e.g. typography. Custom selectors per feature or sub-feature, allow different block styles to be applied to different elements within the block.",
+			"type": "object",
 			"properties": {
 				"root": {
-					"type": "string",
-					"description": "The primary CSS class to apply to the block. This replaces the `.wp-block-name` class if set."
+					"description": "The primary CSS class to apply to the block. This replaces the `.wp-block-name` class if set.",
+					"type": "string"
 				},
 				"border": {
 					"description": "Custom CSS selector used to generate rules for the block's theme.json border styles.",
@@ -607,6 +692,7 @@
 							"type": "object",
 							"properties": {
 								"root": { "type": "string" },
+								"aspectRatio": { "type": "string" },
 								"minHeight": { "type": "string" }
 							}
 						}
@@ -654,8 +740,8 @@
 			}
 		},
 		"styles": {
-			"type": "array",
 			"description": "Block styles can be used to provide alternative styles to block. It works by adding a class name to the block’s wrapper. Using CSS, a theme developer can target the class name for the block style if it is selected.\n\nPlugins and Themes can also register custom block style for existing blocks.\n\nhttps://developer.wordpress.org/block-editor/reference-guides/block-api/block-styles",
+			"type": "array",
 			"items": {
 				"type": "object",
 				"properties": {
@@ -675,21 +761,21 @@
 			}
 		},
 		"example": {
-			"type": "object",
 			"description": "It provides structured example data for the block. This data is used to construct a preview for the block to be shown in the Inspector Help Panel when the user mouses over the block.\n\nSee the example documentation at https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#example-optional for more details.",
+			"type": "object",
 			"properties": {
 				"viewportWidth": {
-					"type": "number",
 					"description": "The viewportWidth controls the width of the iFrame container in which the block preview will get rendered",
+					"type": "number",
 					"default": 1200
 				},
 				"attributes": {
-					"type": "object",
-					"description": "Set the attributes for the block example"
+					"description": "Set the attributes for the block example",
+					"type": "object"
 				},
 				"innerBlocks": {
-					"type": "array",
-					"description": "Set the inner blocks that should be used within the block example. The blocks should be defined as a nested array like this: \n\n [ [ 'core/heading', { content: 'This is an Example' }, [] ] ]\n\n Where each block itself is an array that contains the block name, the block attributes, and the blocks inner blocks."
+					"description": "Set the inner blocks that should be used within the block example. The blocks should be defined as a nested array like this:\n\n[ { \"name\": \"core/heading\", \"attributes\": { \"content\": \"This is an Example\" } } ]\n\nWhere each block itself is an object that contains the block name, the block attributes, and the blocks inner blocks.",
+					"type": "array"
 				}
 			}
 		},
@@ -698,6 +784,7 @@
 			"type": "object",
 			"patternProperties": {
 				"^[a-z][a-z0-9-]*/[a-z][a-z0-9-]*$": {
+					"type": "string",
 					"enum": [ "before", "after", "firstChild", "lastChild" ]
 				}
 			},
@@ -745,6 +832,20 @@
 				}
 			]
 		},
+		"viewScriptModule": {
+			"description": "Block type frontend script module definition. It will be enqueued only when viewing the content on the front of the site.",
+			"oneOf": [
+				{
+					"type": "string"
+				},
+				{
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				}
+			]
+		},
 		"editorStyle": {
 			"description": "Block type editor style definition. It will only be enqueued in the context of the editor.",
 			"oneOf": [
@@ -773,96 +874,121 @@
 				}
 			]
 		},
+		"viewStyle": {
+			"description": "Block type frontend style definition. It will be enqueued only when viewing the content on the front of the site.",
+			"oneOf": [
+				{
+					"type": "string"
+				},
+				{
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				}
+			]
+		},
 		"variations": {
-			"type": "array",
 			"description": "Block Variations is the API that allows a block to have similar versions of it, but all these versions share some common functionality.",
-			"items": {
-				"type": "object",
-				"required": [ "name", "title" ],
-				"additionalProperties": false,
-				"properties": {
-					"name": {
-						"type": "string",
-						"description": "The unique and machine-readable name."
-					},
-					"title": {
-						"type": "string",
-						"description": "A human-readable variation title."
-					},
-					"description": {
-						"type": "string",
-						"description": "A detailed variation description."
-					},
-					"category": {
-						"description": "A category classification, used in search interfaces to arrange block types by category.",
-						"anyOf": [
-							{
+			"oneOf": [
+				{
+					"description": "The path to a PHP file that returns an array of block variations.",
+					"type": "string"
+				},
+				{
+					"description": "An array of block variations.",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"description": "The unique and machine-readable name.",
 								"type": "string"
 							},
-							{
-								"enum": [
-									"text",
-									"media",
-									"design",
-									"widgets",
-									"theme",
-									"embed"
+							"title": {
+								"description": "A human-readable variation title.",
+								"type": "string"
+							},
+							"description": {
+								"description": "A detailed variation description.",
+								"type": "string"
+							},
+							"category": {
+								"description": "A category classification, used in search interfaces to arrange block types by category.",
+								"anyOf": [
+									{
+										"type": "string"
+									},
+									{
+										"type": "string",
+										"enum": [
+											"text",
+											"media",
+											"design",
+											"widgets",
+											"theme",
+											"embed"
+										]
+									}
 								]
+							},
+							"icon": {
+								"description": "An icon helping to visualize the variation. It can have the same shape as the block type.",
+								"type": "string"
+							},
+							"isDefault": {
+								"description": "Indicates whether the current variation is the default one.",
+								"type": "boolean",
+								"default": false
+							},
+							"attributes": {
+								"description": "Values that override block attributes.",
+								"type": "object"
+							},
+							"innerBlocks": {
+								"description": "Initial configuration of nested blocks.",
+								"type": "array",
+								"items": {
+									"type": "array"
+								}
+							},
+							"example": {
+								"description": "Example provides structured data for the block preview. You can set to undefined to disable the preview shown for the block type.",
+								"type": "object"
+							},
+							"scope": {
+								"description": "The list of scopes where the variation is applicable.",
+								"type": "array",
+								"items": {
+									"type": "string",
+									"enum": [ "inserter", "block", "transform" ]
+								},
+								"default": [ "inserter", "block" ]
+							},
+							"keywords": {
+								"description": "An array of terms (which can be translated) that help users discover the variation while searching.",
+								"type": "array",
+								"items": {
+									"type": "string"
+								}
+							},
+							"isActive": {
+								"description": "The list of attributes that should be compared. Each attributes will be matched and the variation will be active if all of them are matching.",
+								"type": "array",
+								"items": {
+									"type": "string"
+								}
 							}
-						]
-					},
-					"icon": {
-						"description": "An icon helping to visualize the variation. It can have the same shape as the block type.",
-						"type": "string"
-					},
-					"isDefault": {
-						"type": "boolean",
-						"default": false,
-						"description": "Indicates whether the current variation is the default one."
-					},
-					"attributes": {
-						"type": "object",
-						"description": "Values that override block attributes."
-					},
-					"innerBlocks": {
-						"type": "array",
-						"items": {
-							"type": "array"
-						},
-						"description": "Initial configuration of nested blocks."
-					},
-					"example": {
-						"type": "object",
-						"description": "Example provides structured data for the block preview. You can set to undefined to disable the preview shown for the block type."
-					},
-					"scope": {
-						"type": "array",
-						"description": "The list of scopes where the variation is applicable.",
-						"items": {
-							"enum": [ "inserter", "block", "transform" ]
-						},
-						"default": [ "inserter", "block" ]
-					},
-					"keywords": {
-						"type": "array",
-						"description": "An array of terms (which can be translated) that help users discover the variation while searching.",
-						"items": {
-							"type": "string"
-						}
-					},
-					"isActive": {
-						"type": "array",
-						"items": {
-							"type": "string"
 						},
-						"description": "The list of attributes that should be compared. Each attributes will be matched and the variation will be active if all of them are matching."
+						"required": [ "name", "title" ],
+						"additionalProperties": false
 					}
 				}
-			}
+			]
 		},
 		"render": {
-			"type": "string",
-			"description": "Template file loaded on the server when rendering a block."
+			"description": "Template file loaded on the server when rendering a block.",
+			"type": "string"
 		}
 	},
 	"required": [ "name", "title" ],
diff --git a/schemas/json/font-collection.json b/schemas/json/font-collection.json
new file mode 100644
index 00000000000000..7b5bd8f7979ba7
--- /dev/null
+++ b/schemas/json/font-collection.json
@@ -0,0 +1,146 @@
+{
+	"title": "JSON schema for WordPress Font Collections",
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"definitions": {
+		"fontFace": {
+			"description": "Font face settings, with added preview property.",
+			"type": "object",
+			"properties": {
+				"preview": {
+					"description": "URL to a preview image of the font.",
+					"type": "string"
+				},
+				"fontFamily": {
+					"description": "CSS font-family value.",
+					"type": "string",
+					"default": ""
+				},
+				"fontStyle": {
+					"description": "CSS font-style value.",
+					"type": "string",
+					"default": "normal"
+				},
+				"fontWeight": {
+					"description": "List of available font weights, separated by a space.",
+					"oneOf": [ { "type": "string" }, { "type": "integer" } ],
+					"default": "400"
+				},
+				"fontDisplay": {
+					"description": "CSS font-display value.",
+					"type": "string",
+					"enum": [ "auto", "block", "fallback", "swap", "optional" ],
+					"default": "fallback"
+				},
+				"src": {
+					"description": "Paths or URLs to the font files.",
+					"oneOf": [
+						{ "type": "string" },
+						{
+							"type": "array",
+							"items": {
+								"type": "string"
+							}
+						}
+					],
+					"default": []
+				},
+				"fontStretch": {
+					"description": "CSS font-stretch value.",
+					"type": "string"
+				},
+				"ascentOverride": {
+					"description": "CSS ascent-override value.",
+					"type": "string"
+				},
+				"descentOverride": {
+					"description": "CSS descent-override value.",
+					"type": "string"
+				},
+				"fontVariant": {
+					"description": "CSS font-variant value.",
+					"type": "string"
+				},
+				"fontFeatureSettings": {
+					"description": "CSS font-feature-settings value.",
+					"type": "string"
+				},
+				"fontVariationSettings": {
+					"description": "CSS font-variation-settings value.",
+					"type": "string"
+				},
+				"lineGapOverride": {
+					"description": "CSS line-gap-override value.",
+					"type": "string"
+				},
+				"sizeAdjust": {
+					"description": "CSS size-adjust value.",
+					"type": "string"
+				},
+				"unicodeRange": {
+					"description": "CSS unicode-range value.",
+					"type": "string"
+				}
+			},
+			"required": [ "fontFamily", "src" ],
+			"additionalProperties": false
+		}
+	},
+	"type": "object",
+	"properties": {
+		"$schema": {
+			"description": "JSON schema URI for font-collection.json.",
+			"type": "string"
+		},
+		"font_families": {
+			"description": "Array of font families ready to be installed.",
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"font_family_settings": {
+						"description": "Font family settings, with added preview property.",
+						"type": "object",
+						"properties": {
+							"name": {
+								"description": "Name of the font family preset, translatable.",
+								"type": "string"
+							},
+							"slug": {
+								"description": "Kebab-case unique identifier for the font family preset.",
+								"type": "string"
+							},
+							"fontFamily": {
+								"description": "CSS font-family value.",
+								"type": "string"
+							},
+							"preview": {
+								"description": "URL to a preview image of the font family.",
+								"type": "string"
+							},
+							"fontFace": {
+								"description": "Array of font-face definitions.",
+								"type": "array",
+								"items": {
+									"$ref": "#/definitions/fontFace"
+								}
+							}
+						},
+						"required": [ "name", "fontFamily", "slug" ],
+						"additionalProperties": false
+					},
+					"categories": {
+						"description": "Array of category slugs.",
+						"type": "array",
+						"items": {
+							"type": "string"
+						}
+					}
+				},
+				"required": [ "font_family_settings" ],
+				"additionalProperties": false
+			}
+		}
+	},
+	"additionalProperties": false,
+	"required": [ "font_families" ]
+}
diff --git a/schemas/json/theme.json b/schemas/json/theme.json
index 10695f493c40dd..a1f51ace920259 100644
--- a/schemas/json/theme.json
+++ b/schemas/json/theme.json
@@ -1,10 +1,10 @@
 {
 	"title": "JSON schema for WordPress block theme global settings and styles",
-	"$schema": "http://json-schema.org/draft-04/schema#",
+	"$schema": "http://json-schema.org/draft-07/schema#",
 	"definitions": {
 		"//": {
 			"explainer": "https://developer.wordpress.org/themes/advanced-topics/theme-json/",
-			"createTheme": "https://developer.wordpress.org/block-editor/how-to-guides/themes/create-block-theme/",
+			"createTheme": "https://developer.wordpress.org/themes/",
 			"reference": "https://developer.wordpress.org/block-editor/how-to-guides/themes/theme-json/"
 		},
 		"refComplete": {
@@ -14,28 +14,42 @@
 					"description": "A reference to another property value. e.g. `styles.color.text`",
 					"type": "string"
 				}
-			}
+			},
+			"additionalProperties": false
 		},
-		"settingsPropertiesAppearanceTools": {
+		"settingsAppearanceToolsProperties": {
 			"type": "object",
 			"properties": {
 				"appearanceTools": {
-					"description": "Setting that enables the following UI tools:\n\n- background: backgroundImage\n- border: color, radius, style, width\n- color: link\n- dimensions: minHeight\n- position: sticky\n- spacing: blockGap, margin, padding\n- typography: lineHeight",
+					"description": "Setting that enables the following UI tools:\n\n- background: backgroundImage, backgroundSize\n- border: color, radius, style, width\n- color: link, heading, button, caption\n- dimensions: aspectRatio, minHeight\n- position: sticky\n- spacing: blockGap, margin, padding\n- typography: lineHeight",
 					"type": "boolean",
 					"default": false
 				}
 			}
 		},
-		"settingsPropertiesUseRootPaddingAwareAlignments": {
+		"settingsBackgroundProperties": {
+			"type": "object",
 			"properties": {
-				"useRootPaddingAwareAlignments": {
-					"description": "_**Note:** Since WordPress 6.1._\n\nEnables root padding (the values from `styles.spacing.padding`) to be applied to the contents of full-width blocks instead of the root block.\n\nPlease note that when using this setting, `styles.spacing.padding` should always be set as an object with `top`, `right`, `bottom`, `left` values declared separately.",
-					"type": "boolean",
-					"default": false
+				"background": {
+					"description": "Settings related to background.",
+					"type": "object",
+					"properties": {
+						"backgroundImage": {
+							"description": "Allow users to set a background image.",
+							"type": "boolean",
+							"default": false
+						},
+						"backgroundSize": {
+							"description": "Allow users to set values related to the size of a background image, including size, position, and repeat controls.",
+							"type": "boolean",
+							"default": false
+						}
+					},
+					"additionalProperties": false
 				}
 			}
 		},
-		"settingsPropertiesBorder": {
+		"settingsBorderProperties": {
 			"type": "object",
 			"properties": {
 				"border": {
@@ -67,47 +81,7 @@
 				}
 			}
 		},
-		"settingsPropertiesShadow": {
-			"type": "object",
-			"properties": {
-				"shadow": {
-					"description": "Settings related to shadows.",
-					"type": "object",
-					"properties": {
-						"defaultPresets": {
-							"description": "Allow users to choose shadows from the default shadow presets.",
-							"type": "boolean",
-							"default": true
-						},
-						"presets": {
-							"description": "Shadow presets for the shadow picker.\nGenerates a single custom property (`--wp--preset--shadow--{slug}`) per preset value.",
-							"type": "array",
-							"items": {
-								"type": "object",
-								"properties": {
-									"name": {
-										"description": "Name of the shadow preset, translatable.",
-										"type": "string"
-									},
-									"slug": {
-										"description": "Kebab-case unique identifier for the shadow preset.",
-										"type": "string"
-									},
-									"shadow": {
-										"description": "CSS box-shadow value",
-										"type": "string"
-									}
-								},
-								"required": [ "name", "slug", "shadow" ],
-								"additionalProperties": false
-							}
-						}
-					},
-					"additionalProperties": false
-				}
-			}
-		},
-		"settingsPropertiesColor": {
+		"settingsColorProperties": {
 			"type": "object",
 			"properties": {
 				"color": {
@@ -241,36 +215,55 @@
 							"description": "Allow users to set button colors in a block.",
 							"type": "boolean",
 							"default": true
-						}
-					},
-					"additionalProperties": false
-				}
-			}
-		},
-		"settingsPropertiesBackground": {
-			"type": "object",
-			"properties": {
-				"background": {
-					"description": "Settings related to background.",
-					"type": "object",
-					"properties": {
-						"backgroundImage": {
-							"description": "Allow users to set a background image.",
+						},
+						"caption": {
+							"description": "Allow users to set caption colors in a block.",
 							"type": "boolean",
-							"default": false
+							"default": true
 						}
 					},
 					"additionalProperties": false
 				}
 			}
 		},
-		"settingsPropertiesDimensions": {
+		"settingsDimensionsProperties": {
 			"type": "object",
 			"properties": {
 				"dimensions": {
 					"description": "Settings related to dimensions.",
 					"type": "object",
 					"properties": {
+						"aspectRatio": {
+							"description": "Allow users to set an aspect ratio.",
+							"type": "boolean",
+							"default": false
+						},
+						"defaultAspectRatios": {
+							"description": "Allow users to choose aspect ratios from the default set of aspect ratios.",
+							"type": "boolean",
+							"default": true
+						},
+						"aspectRatios": {
+							"description": "Allow users to define aspect ratios for some blocks.",
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"description": "Name of the aspect ratio preset.",
+										"type": "string"
+									},
+									"slug": {
+										"description": "Kebab-case unique identifier for the aspect ratio preset.",
+										"type": "string"
+									},
+									"ratio": {
+										"description": "Aspect ratio expressed as a division or decimal.",
+										"type": "string"
+									}
+								}
+							}
+						},
 						"minHeight": {
 							"description": "Allow users to set custom minimum height.",
 							"type": "boolean",
@@ -281,7 +274,7 @@
 				}
 			}
 		},
-		"settingsPropertiesLayout": {
+		"settingsLayoutProperties": {
 			"type": "object",
 			"properties": {
 				"layout": {
@@ -311,7 +304,7 @@
 				}
 			}
 		},
-		"settingsPropertiesLightbox": {
+		"settingsLightboxProperties": {
 			"type": "object",
 			"properties": {
 				"lightbox": {
@@ -331,7 +324,7 @@
 				}
 			}
 		},
-		"settingsPropertiesPosition": {
+		"settingsPositionProperties": {
 			"type": "object",
 			"properties": {
 				"position": {
@@ -348,7 +341,47 @@
 				}
 			}
 		},
-		"settingsPropertiesSpacing": {
+		"settingsShadowProperties": {
+			"type": "object",
+			"properties": {
+				"shadow": {
+					"description": "Settings related to shadows.",
+					"type": "object",
+					"properties": {
+						"defaultPresets": {
+							"description": "Allow users to choose shadows from the default shadow presets.",
+							"type": "boolean",
+							"default": true
+						},
+						"presets": {
+							"description": "Shadow presets for the shadow picker.\nGenerates a single custom property (`--wp--preset--shadow--{slug}`) per preset value.",
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"description": "Name of the shadow preset, translatable.",
+										"type": "string"
+									},
+									"slug": {
+										"description": "Kebab-case unique identifier for the shadow preset.",
+										"type": "string"
+									},
+									"shadow": {
+										"description": "CSS box-shadow value",
+										"type": "string"
+									}
+								},
+								"required": [ "name", "slug", "shadow" ],
+								"additionalProperties": false
+							}
+						}
+					},
+					"additionalProperties": false
+				}
+			}
+		},
+		"settingsSpacingProperties": {
 			"type": "object",
 			"properties": {
 				"spacing": {
@@ -379,14 +412,19 @@
 							"items": {
 								"type": "string"
 							},
-							"default": [ "px", "em", "rem", "vh", "vw", "%" ],
-							"minItems": 1
+							"minItems": 1,
+							"default": [ "px", "em", "rem", "vh", "vw", "%" ]
 						},
 						"customSpacingSize": {
 							"description": "Allow users to set custom space sizes.",
 							"type": "boolean",
 							"default": true
 						},
+						"defaultSpacingSizes": {
+							"description": "Allow users to choose space sizes from the default space size presets.",
+							"type": "boolean",
+							"default": true
+						},
 						"spacingSizes": {
 							"description": "Space size presets for the space size selector.\nGenerates a custom property (`--wp--preset--spacing--{slug}`) per preset value.",
 							"type": "array",
@@ -398,7 +436,7 @@
 										"type": "string"
 									},
 									"slug": {
-										"description": "Unique identifier for the space size preset. For best cross theme compatibility these should be in the form '10','20','30','40','50','60', etc. with '50' representing the 'Medium' size step.",
+										"description": "Unique identifier for the space size preset. For best cross theme compatibility these should be in the form '10','20','30','40','50','60', etc. with '50' representing the 'Medium' size step. If all slugs begin with a number they will be merged with default and user slugs and sorted numerically.",
 										"type": "string"
 									},
 									"size": {
@@ -422,16 +460,20 @@
 								"increment": {
 									"description": "The amount to increment each step by.",
 									"type": "number",
+									"exclusiveMinimum": 0,
 									"default": 1.5
 								},
 								"steps": {
 									"description": "Number of steps to generate in scale.",
 									"type": "integer",
+									"minimum": 1,
+									"maximum": 10,
 									"default": 7
 								},
 								"mediumStep": {
 									"description": "The value to medium setting in the scale.",
 									"type": "number",
+									"exclusiveMinimum": 0,
 									"default": 1.5
 								},
 								"unit": {
@@ -477,13 +519,18 @@
 				}
 			}
 		},
-		"settingsPropertiesTypography": {
+		"settingsTypographyProperties": {
 			"type": "object",
 			"properties": {
 				"typography": {
 					"description": "Settings related to typography.",
 					"type": "object",
 					"properties": {
+						"defaultFontSizes": {
+							"description": "Allow users to choose font sizes from the default font size presets.",
+							"type": "boolean",
+							"default": true
+						},
 						"customFontSize": {
 							"description": "Allow users to set custom font sizes.",
 							"type": "boolean",
@@ -536,6 +583,11 @@
 							"type": "boolean",
 							"default": false
 						},
+						"textAlign": {
+							"description": "Allow users to set the text align.",
+							"type": "boolean",
+							"default": true
+						},
 						"textColumns": {
 							"description": "Allow users to set the number of text columns.",
 							"type": "boolean",
@@ -609,6 +661,7 @@
 							"description": "Font family presets for the font family selector.\nGenerates a single custom property (`--wp--preset--font-family--{slug}`) per preset value.",
 							"type": "array",
 							"items": {
+								"description": "Font family preset",
 								"type": "object",
 								"properties": {
 									"name": {
@@ -623,10 +676,6 @@
 										"description": "CSS font-family value.",
 										"type": "string"
 									},
-									"preview": {
-										"description": "URL to a preview image of the font family.",
-										"type": "string"
-									},
 									"fontFace": {
 										"description": "Array of font-face declarations.",
 										"type": "array",
@@ -645,7 +694,6 @@
 												},
 												"fontWeight": {
 													"description": "List of available font weights, separated by a space.",
-													"default": "400",
 													"oneOf": [
 														{
 															"type": "string"
@@ -653,19 +701,20 @@
 														{
 															"type": "integer"
 														}
-													]
+													],
+													"default": "400"
 												},
 												"fontDisplay": {
 													"description": "CSS font-display value.",
 													"type": "string",
-													"default": "fallback",
 													"enum": [
 														"auto",
 														"block",
 														"fallback",
 														"swap",
 														"optional"
-													]
+													],
+													"default": "fallback"
 												},
 												"src": {
 													"description": "Paths or URLs to the font files.",
@@ -717,10 +766,6 @@
 												"unicodeRange": {
 													"description": "CSS unicode-range value.",
 													"type": "string"
-												},
-												"preview": {
-													"description": "URL to a preview image of the font face.",
-													"type": "string"
 												}
 											},
 											"required": [ "fontFamily", "src" ],
@@ -736,57 +781,61 @@
 				}
 			}
 		},
-		"settingsPropertiesCustom": {
+		"settingsCustomProperties": {
 			"type": "object",
 			"properties": {
 				"custom": {
-					"description": "Generate custom CSS custom properties of the form `--wp--custom--{key}--{nested-key}: {value};`. `camelCased` keys are transformed to `kebab-case` as to follow the CSS property naming schema. Keys at different depth levels are separated by `--`, so keys should not include `--` in the name.",
 					"$ref": "#/definitions/settingsCustomAdditionalProperties"
 				}
 			}
 		},
 		"settingsProperties": {
 			"allOf": [
-				{ "$ref": "#/definitions/settingsPropertiesAppearanceTools" },
-				{ "$ref": "#/definitions/settingsPropertiesBackground" },
-				{ "$ref": "#/definitions/settingsPropertiesBorder" },
-				{ "$ref": "#/definitions/settingsPropertiesColor" },
-				{ "$ref": "#/definitions/settingsPropertiesDimensions" },
-				{ "$ref": "#/definitions/settingsPropertiesShadow" },
-				{ "$ref": "#/definitions/settingsPropertiesLayout" },
-				{ "$ref": "#/definitions/settingsPropertiesLightbox" },
-				{ "$ref": "#/definitions/settingsPropertiesPosition" },
-				{ "$ref": "#/definitions/settingsPropertiesSpacing" },
-				{ "$ref": "#/definitions/settingsPropertiesTypography" },
-				{ "$ref": "#/definitions/settingsPropertiesCustom" }
+				{ "$ref": "#/definitions/settingsAppearanceToolsProperties" },
+				{ "$ref": "#/definitions/settingsBackgroundProperties" },
+				{ "$ref": "#/definitions/settingsBorderProperties" },
+				{ "$ref": "#/definitions/settingsColorProperties" },
+				{ "$ref": "#/definitions/settingsDimensionsProperties" },
+				{ "$ref": "#/definitions/settingsLayoutProperties" },
+				{ "$ref": "#/definitions/settingsLightboxProperties" },
+				{ "$ref": "#/definitions/settingsPositionProperties" },
+				{ "$ref": "#/definitions/settingsShadowProperties" },
+				{ "$ref": "#/definitions/settingsSpacingProperties" },
+				{ "$ref": "#/definitions/settingsTypographyProperties" },
+				{ "$ref": "#/definitions/settingsCustomProperties" }
+			]
+		},
+		"settingsPropertyNames": {
+			"enum": [
+				"appearanceTools",
+				"background",
+				"border",
+				"color",
+				"dimensions",
+				"layout",
+				"lightbox",
+				"position",
+				"shadow",
+				"spacing",
+				"typography",
+				"custom"
 			]
 		},
 		"settingsPropertiesComplete": {
-			"type": "object",
 			"allOf": [
 				{
 					"$ref": "#/definitions/settingsProperties"
 				},
 				{
-					"properties": {
-						"appearanceTools": {},
-						"background": {},
-						"border": {},
-						"color": {},
-						"dimensions": {},
-						"layout": {},
-						"lightbox": {},
-						"position": {},
-						"shadow": {},
-						"spacing": {},
-						"typography": {},
-						"custom": {}
-					},
-					"additionalProperties": false
+					"type": "object",
+					"propertyNames": {
+						"$ref": "#/definitions/settingsPropertyNames"
+					}
 				}
 			]
 		},
 		"settingsBlocksPropertiesComplete": {
+			"description": "Settings defined on a per-block basis.",
 			"type": "object",
 			"properties": {
 				"core/archives": {
@@ -1092,6 +1141,7 @@
 			"additionalProperties": false
 		},
 		"settingsCustomAdditionalProperties": {
+			"description": "Generate custom CSS custom properties of the form `--wp--custom--{key}--{nested-key}: {value};`. `camelCased` keys are transformed to `kebab-case` as to follow the CSS property naming schema. Keys at different depth levels are separated by `--`, so keys should not include `--` in the name.",
 			"type": "object",
 			"additionalProperties": {
 				"oneOf": [
@@ -1110,6 +1160,58 @@
 		"stylesProperties": {
 			"type": "object",
 			"properties": {
+				"background": {
+					"description": "Background styles.",
+					"type": "object",
+					"properties": {
+						"backgroundImage": {
+							"description": "Sets the `background-image` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" },
+								{
+									"type": "object",
+									"properties": {
+										"url": {
+											"description": "A URL to an image file, or a path to a file relative to the theme root directory, and prefixed with `file:`, e.g., 'file:./path/to/file.png'.",
+											"type": "string"
+										}
+									},
+									"additionalProperties": false
+								}
+							]
+						},
+						"backgroundPosition": {
+							"description": "Sets the `background-position` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						},
+						"backgroundRepeat": {
+							"description": "Sets the `background-repeat` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						},
+						"backgroundSize": {
+							"description": "Sets the `background-size` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						},
+						"backgroundAttachment": {
+							"description": "Sets the `background-attachment` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						}
+					},
+					"additionalProperties": false
+				},
 				"border": {
 					"description": "Border styles.",
 					"type": "object",
@@ -1117,32 +1219,22 @@
 						"color": {
 							"description": "Sets the `border-color` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"radius": {
 							"description": "Sets the `border-radius` CSS property.",
 							"anyOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								},
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" },
 								{
 									"type": "object",
 									"properties": {
 										"topLeft": {
 											"description": "Sets the `border-top-left-radius` CSS property.",
 											"oneOf": [
-												{
-													"type": "string"
-												},
+												{ "type": "string" },
 												{
 													"$ref": "#/definitions/refComplete"
 												}
@@ -1151,9 +1243,7 @@
 										"topRight": {
 											"description": "Sets the `border-top-right-radius` CSS property.",
 											"oneOf": [
-												{
-													"type": "string"
-												},
+												{ "type": "string" },
 												{
 													"$ref": "#/definitions/refComplete"
 												}
@@ -1162,9 +1252,7 @@
 										"bottomLeft": {
 											"description": "Sets the `border-bottom-left-radius` CSS property.",
 											"oneOf": [
-												{
-													"type": "string"
-												},
+												{ "type": "string" },
 												{
 													"$ref": "#/definitions/refComplete"
 												}
@@ -1173,9 +1261,7 @@
 										"bottomRight": {
 											"description": "Sets the `border-bottom-right-radius` CSS property.",
 											"oneOf": [
-												{
-													"type": "string"
-												},
+												{ "type": "string" },
 												{
 													"$ref": "#/definitions/refComplete"
 												}
@@ -1188,23 +1274,15 @@
 						"style": {
 							"description": "Sets the `border-style` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"width": {
 							"description": "Sets the `border-width` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"top": {
@@ -1213,34 +1291,22 @@
 								"color": {
 									"description": "Sets the `border-top-color` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"style": {
 									"description": "Sets the `border-top-style` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"width": {
 									"description": "Sets the `border-top-width` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								}
 							},
@@ -1252,34 +1318,22 @@
 								"color": {
 									"description": "Sets the `border-right-color` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"style": {
 									"description": "Sets the `border-right-style` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"width": {
 									"description": "Sets the `border-right-width` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								}
 							},
@@ -1291,34 +1345,22 @@
 								"color": {
 									"description": "Sets the `border-bottom-color` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"style": {
 									"description": "Sets the `border-bottom-style` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"width": {
 									"description": "Sets the `border-bottom-width` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								}
 							},
@@ -1330,34 +1372,22 @@
 								"color": {
 									"description": "Sets the `border-left-color` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"style": {
 									"description": "Sets the `border-left-style` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"width": {
 									"description": "Sets the `border-left-width` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								}
 							},
@@ -1373,56 +1403,107 @@
 						"background": {
 							"description": "Sets the `background-color` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"gradient": {
 							"description": "Sets the `background` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"text": {
 							"description": "Sets the `color` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						}
 					},
 					"additionalProperties": false
 				},
+				"css": {
+					"description": "Sets custom CSS to apply styling not covered by other theme.json properties.",
+					"type": "string"
+				},
 				"dimensions": {
-					"description": "Dimensions styles",
+					"description": "Dimensions styles.",
 					"type": "object",
 					"properties": {
+						"aspectRatio": {
+							"description": "Sets the `aspect-ratio` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						},
 						"minHeight": {
 							"description": "Sets the `min-height` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						}
 					}
 				},
+				"filter": {
+					"description": "CSS and SVG filter styles.",
+					"type": "object",
+					"properties": {
+						"duotone": {
+							"description": "Sets the duotone filter.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						}
+					},
+					"additionalProperties": false
+				},
+				"outline": {
+					"description": "Outline styles.",
+					"type": "object",
+					"properties": {
+						"color": {
+							"description": "Sets the `outline-color` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						},
+						"offset": {
+							"description": "Sets the `outline-offset` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						},
+						"style": {
+							"description": "Sets the `outline-style` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						},
+						"width": {
+							"description": "Sets the `outline-width` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						}
+					},
+					"additionalProperties": false
+				},
+				"shadow": {
+					"description": "Box shadow styles.",
+					"oneOf": [
+						{ "type": "string" },
+						{ "$ref": "#/definitions/refComplete" }
+					]
+				},
 				"spacing": {
 					"description": "Spacing styles.",
 					"type": "object",
@@ -1430,12 +1511,8 @@
 						"blockGap": {
 							"description": "Sets the `--wp--style--block-gap` CSS custom property when settings.spacing.blockGap is true.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"margin": {
@@ -1445,45 +1522,29 @@
 								"top": {
 									"description": "Sets the `margin-top` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"right": {
 									"description": "Sets the `margin-right` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"bottom": {
 									"description": "Sets the `margin-bottom` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"left": {
 									"description": "Sets the `margin-left` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								}
 							},
@@ -1496,45 +1557,29 @@
 								"top": {
 									"description": "Sets the `padding-top` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"right": {
 									"description": "Sets the `padding-right` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"bottom": {
 									"description": "Sets the `padding-bottom` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								},
 								"left": {
 									"description": "Sets the `padding-left` CSS property.",
 									"oneOf": [
-										{
-											"type": "string"
-										},
-										{
-											"$ref": "#/definitions/refComplete"
-										}
+										{ "type": "string" },
+										{ "$ref": "#/definitions/refComplete" }
 									]
 								}
 							},
@@ -1550,664 +1595,972 @@
 						"fontFamily": {
 							"description": "Sets the `font-family` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"fontSize": {
 							"description": "Sets the `font-size` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"fontStyle": {
 							"description": "Sets the `font-style` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"fontWeight": {
 							"description": "Sets the `font-weight` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"letterSpacing": {
 							"description": "Sets the `letter-spacing` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"lineHeight": {
 							"description": "Sets the `line-height` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
+						},
+						"textAlign": {
+							"description": "Sets the `text-align` CSS property.",
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"textColumns": {
 							"description": "Sets the `column-count` CSS property.",
-							"type": "string"
+							"oneOf": [
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
+							]
 						},
 						"textDecoration": {
 							"description": "Sets the `text-decoration` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"writingMode": {
 							"description": "Sets the `writing-mode` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						},
 						"textTransform": {
 							"description": "Sets the `text-transform` CSS property.",
 							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
+								{ "type": "string" },
+								{ "$ref": "#/definitions/refComplete" }
 							]
 						}
 					},
 					"additionalProperties": false
+				}
+			}
+		},
+		"stylesPropertyNames": {
+			"enum": [
+				"background",
+				"border",
+				"color",
+				"css",
+				"dimensions",
+				"filter",
+				"outline",
+				"shadow",
+				"spacing",
+				"typography"
+			]
+		},
+		"stylesPropertiesComplete": {
+			"allOf": [
+				{
+					"$ref": "#/definitions/stylesProperties"
 				},
-				"filter": {
-					"description": "CSS and SVG filter styles.",
+				{
 					"type": "object",
-					"properties": {
-						"duotone": {
-							"description": "Sets the duotone filter.",
-							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
-							]
-						}
-					},
-					"additionalProperties": false
+					"propertyNames": {
+						"$ref": "#/definitions/stylesPropertyNames"
+					}
+				}
+			]
+		},
+		"stylesElementsPseudoSelectorsProperties": {
+			"type": "object",
+			"properties": {
+				":active": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
 				},
-				"shadow": {
-					"description": "Box shadow styles.",
-					"oneOf": [
+				":any-link": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				":focus": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				":hover": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				":link": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				":visited": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				}
+			}
+		},
+		"stylesElementsPseudoSelectorsPropertyNames": {
+			"enum": [
+				":active",
+				":any-link",
+				":focus",
+				":hover",
+				":link",
+				":visited"
+			]
+		},
+		"stylesElementsPropertiesComplete": {
+			"description": "Styles defined on a per-element basis using the element's selector.",
+			"type": "object",
+			"properties": {
+				"button": {
+					"allOf": [
 						{
-							"type": "string"
+							"$ref": "#/definitions/stylesProperties"
+						},
+						{
+							"$ref": "#/definitions/stylesElementsPseudoSelectorsProperties"
 						},
 						{
-							"$ref": "#/definitions/refComplete"
+							"type": "object",
+							"propertyNames": {
+								"anyOf": [
+									{
+										"$ref": "#/definitions/stylesPropertyNames"
+									},
+									{
+										"$ref": "#/definitions/stylesElementsPseudoSelectorsPropertyNames"
+									}
+								]
+							}
 						}
 					]
 				},
-				"outline": {
-					"description": "Outline styles.",
-					"type": "object",
-					"properties": {
-						"color": {
-							"description": "Sets the `outline-color` CSS property.",
-							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
-							]
-						},
-						"offset": {
-							"description": "Sets the `outline-offset` CSS property.",
-							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
-							]
+				"link": {
+					"allOf": [
+						{
+							"$ref": "#/definitions/stylesProperties"
 						},
-						"style": {
-							"description": "Sets the `outline-style` CSS property.",
-							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
-							]
+						{
+							"$ref": "#/definitions/stylesElementsPseudoSelectorsProperties"
 						},
-						"width": {
-							"description": "Sets the `outline-width` CSS property.",
-							"oneOf": [
-								{
-									"type": "string"
-								},
-								{
-									"$ref": "#/definitions/refComplete"
-								}
-							]
+						{
+							"type": "object",
+							"propertyNames": {
+								"anyOf": [
+									{
+										"$ref": "#/definitions/stylesPropertyNames"
+									},
+									{
+										"$ref": "#/definitions/stylesElementsPseudoSelectorsPropertyNames"
+									}
+								]
+							}
 						}
-					},
-					"additionalProperties": false
+					]
 				},
-				"css": {
-					"description": "Sets custom CSS to apply styling not covered by other theme.json properties.",
-					"type": "string"
-				}
-			}
-		},
-		"stylesPropertiesComplete": {
-			"type": "object",
+				"heading": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				"h1": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				"h2": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				"h3": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				"h4": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				"h5": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				"h6": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				"caption": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				},
+				"cite": {
+					"$ref": "#/definitions/stylesPropertiesComplete"
+				}
+			},
+			"additionalProperties": false
+		},
+		"stylesBlocksPropertiesComplete": {
+			"description": "Styles defined on a per-block basis using the block's selector.",
+			"type": "object",
+			"properties": {
+				"core/archives": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/audio": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/avatar": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/block": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/button": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/buttons": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/calendar": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/categories": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/code": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/column": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/columns": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comment-author-avatar": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comment-author-name": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comment-content": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comment-date": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comment-edit-link": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comment-reply-link": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comments": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comments-pagination": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comments-pagination-next": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comments-pagination-numbers": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comments-pagination-previous": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comments-title": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/comment-template": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/cover": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/details": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/embed": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/file": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/freeform": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/gallery": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/group": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/heading": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/home-link": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/html": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/image": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/latest-comments": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/latest-posts": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/list": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/list-item": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/loginout": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/media-text": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/missing": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/more": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/navigation": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/navigation-link": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/navigation-submenu": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/nextpage": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/page-list": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/page-list-item": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/paragraph": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-author": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-author-biography": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-author-name": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-comment": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-comments-count": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-comments-form": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-comments-link": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-content": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-date": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-excerpt": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-featured-image": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-navigation-link": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-template": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-terms": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-time-to-read": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/post-title": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/preformatted": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/pullquote": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/query": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/query-no-results": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/query-pagination": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/query-pagination-next": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/query-pagination-numbers": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/query-pagination-previous": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/query-title": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/quote": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/read-more": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/rss": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/search": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/separator": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/shortcode": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/site-logo": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/site-tagline": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/site-title": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/social-link": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/social-links": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/spacer": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/table": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/table-of-contents": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/tag-cloud": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/template-part": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/term-description": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/text-columns": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/verse": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/video": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/widget-area": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/legacy-widget": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				},
+				"core/widget-group": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				}
+			},
+			"patternProperties": {
+				"^[a-z][a-z0-9-]*/[a-z][a-z0-9-]*$": {
+					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+				}
+			},
+			"additionalProperties": false
+		},
+		"stylesPropertiesAndElementsComplete": {
+			"allOf": [
+				{
+					"$ref": "#/definitions/stylesProperties"
+				},
+				{
+					"type": "object",
+					"properties": {
+						"elements": {
+							"$ref": "#/definitions/stylesElementsPropertiesComplete"
+						},
+						"variations": {
+							"$ref": "#/definitions/stylesVariationsPropertiesComplete"
+						}
+					}
+				},
+				{
+					"type": "object",
+					"propertyNames": {
+						"anyOf": [
+							{
+								"$ref": "#/definitions/stylesPropertyNames"
+							},
+							{
+								"enum": [ "elements", "variations" ]
+							}
+						]
+					}
+				}
+			]
+		},
+		"stylesVariationsProperties": {
+			"type": "object",
+			"patternProperties": {
+				"^[a-z][a-z0-9-]*$": {
+					"$ref": "#/definitions/stylesVariationProperties"
+				}
+			}
+		},
+		"stylesVariationProperties": {
 			"allOf": [
 				{
 					"$ref": "#/definitions/stylesProperties"
 				},
 				{
+					"type": "object",
 					"properties": {
-						"border": {},
-						"color": {},
-						"dimensions": {},
-						"spacing": {},
-						"typography": {},
-						"filter": {},
-						"shadow": {},
-						"outline": {},
-						"css": {}
-					},
-					"additionalProperties": false
+						"elements": {
+							"$ref": "#/definitions/stylesElementsPropertiesComplete"
+						},
+						"blocks": {
+							"$ref": "#/definitions/stylesVariationBlocksPropertiesComplete"
+						}
+					}
+				},
+				{
+					"type": "object",
+					"propertyNames": {
+						"anyOf": [
+							{
+								"$ref": "#/definitions/stylesPropertyNames"
+							},
+							{
+								"enum": [ "elements", "blocks" ]
+							}
+						]
+					}
 				}
 			]
 		},
-		"stylesElementsPropertiesComplete": {
+		"stylesVariationsPropertiesComplete": {
 			"type": "object",
-			"properties": {
-				"button": {
+			"patternProperties": {
+				"^[a-z][a-z0-9-]*$": {
+					"$ref": "#/definitions/stylesVariationPropertiesComplete"
+				}
+			}
+		},
+		"stylesVariationPropertiesComplete": {
+			"allOf": [
+				{
+					"$ref": "#/definitions/stylesProperties"
+				},
+				{
 					"type": "object",
-					"allOf": [
-						{
-							"$ref": "#/definitions/stylesProperties"
+					"properties": {
+						"elements": {
+							"$ref": "#/definitions/stylesElementsPropertiesComplete"
 						},
-						{
-							"properties": {
-								"border": {},
-								"color": {},
-								"filter": {},
-								"shadow": {},
-								"outline": {},
-								"spacing": {},
-								"typography": {},
-								"css": {},
-								":hover": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":focus": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":active": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":visited": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":link": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":any-link": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								}
-							},
-							"additionalProperties": false
+						"blocks": {
+							"$ref": "#/definitions/stylesVariationBlocksPropertiesComplete"
 						}
-					]
+					}
 				},
-				"link": {
+				{
 					"type": "object",
-					"allOf": [
-						{
-							"$ref": "#/definitions/stylesProperties"
-						},
-						{
-							"properties": {
-								"border": {},
-								"color": {},
-								"spacing": {},
-								"typography": {},
-								":hover": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":focus": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":active": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":visited": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":link": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								},
-								":any-link": {
-									"$ref": "#/definitions/stylesPropertiesComplete"
-								}
+					"propertyNames": {
+						"anyOf": [
+							{
+								"$ref": "#/definitions/stylesPropertyNames"
 							},
-							"additionalProperties": false
-						}
-					]
-				},
-				"heading": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
-				},
-				"h1": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
-				},
-				"h2": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
-				},
-				"h3": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
-				},
-				"h4": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
-				},
-				"h5": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
-				},
-				"h6": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
-				},
-				"caption": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
-				},
-				"cite": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
+							{
+								"enum": [ "elements", "blocks" ]
+							}
+						]
+					}
 				}
-			},
-			"additionalProperties": false
+			]
 		},
-		"stylesBlocksPropertiesComplete": {
+		"stylesVariationBlocksPropertiesComplete": {
 			"type": "object",
 			"properties": {
 				"core/archives": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/audio": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/avatar": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/block": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/button": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/buttons": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/calendar": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/categories": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/code": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/column": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/columns": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comment-author-avatar": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comment-author-name": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comment-content": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comment-date": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comment-edit-link": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comment-reply-link": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comments": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comments-pagination": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comments-pagination-next": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comments-pagination-numbers": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comments-pagination-previous": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comments-title": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/comment-template": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/cover": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/details": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/embed": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/file": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/freeform": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/gallery": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/group": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/heading": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/home-link": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/html": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/image": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/latest-comments": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/latest-posts": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/list": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/list-item": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/loginout": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/media-text": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/missing": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/more": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/navigation": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/navigation-link": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/navigation-submenu": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/nextpage": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/page-list": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/page-list-item": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/paragraph": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-author": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-author-biography": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-author-name": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-comment": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-comments-count": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-comments-form": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-comments-link": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-content": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-date": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-excerpt": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-featured-image": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-navigation-link": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-template": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-terms": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-time-to-read": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/post-title": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/preformatted": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/pullquote": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/query": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/query-no-results": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/query-pagination": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/query-pagination-next": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/query-pagination-numbers": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/query-pagination-previous": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/query-title": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/quote": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/read-more": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/rss": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/search": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/separator": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/shortcode": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/site-logo": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/site-tagline": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/site-title": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/social-link": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/social-links": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/spacer": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/table": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/table-of-contents": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/tag-cloud": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/template-part": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/term-description": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/text-columns": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/verse": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/video": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/widget-area": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/legacy-widget": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				},
 				"core/widget-group": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				}
 			},
 			"patternProperties": {
 				"^[a-z][a-z0-9-]*/[a-z][a-z0-9-]*$": {
-					"$ref": "#/definitions/stylesPropertiesAndElementsComplete"
+					"$ref": "#/definitions/stylesVariationBlockPropertiesComplete"
 				}
 			},
 			"additionalProperties": false
 		},
-		"stylesPropertiesAndElementsComplete": {
-			"type": "object",
+		"stylesVariationBlockPropertiesComplete": {
 			"allOf": [
 				{
 					"$ref": "#/definitions/stylesProperties"
 				},
 				{
+					"type": "object",
 					"properties": {
-						"border": {},
-						"color": {},
-						"dimensions": {},
-						"spacing": {},
-						"typography": {},
-						"filter": {},
-						"shadow": {},
-						"outline": {},
-						"css": {},
 						"elements": {
 							"$ref": "#/definitions/stylesElementsPropertiesComplete"
-						},
-						"variations": {
-							"$ref": "#/definitions/stylesVariationPropertiesComplete"
 						}
-					},
-					"additionalProperties": false
+					}
+				},
+				{
+					"type": "object",
+					"propertyNames": {
+						"anyOf": [
+							{
+								"$ref": "#/definitions/stylesPropertyNames"
+							},
+							{
+								"enum": [ "elements" ]
+							}
+						]
+					}
 				}
 			]
-		},
-		"stylesVariationPropertiesComplete": {
-			"type": "object",
-			"patternProperties": {
-				"^[a-z][a-z0-9-]*$": {
-					"$ref": "#/definitions/stylesPropertiesComplete"
-				}
-			}
 		}
 	},
 	"type": "object",
@@ -2219,76 +2572,96 @@
 		"version": {
 			"description": "Version of theme.json to use.",
 			"type": "integer",
-			"enum": [ 2 ]
+			"const": 3
 		},
 		"title": {
-			"type": "string",
-			"description": "Title of the global styles variation. If not defined, the file name will be used."
+			"description": "Title of the global styles variation. If not defined, the file name will be used.",
+			"type": "string"
+		},
+		"slug": {
+			"description": "Slug of the global styles variation. If not defined, the kebab-case title will be used.",
+			"type": "string"
 		},
 		"description": {
-			"type": "string",
-			"description": "Description of the global styles variation."
+			"description": "Description of the global styles variation.",
+			"type": "string"
+		},
+		"blockTypes": {
+			"description": "List of block types that can use the block style variation this theme.json file represents.",
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
 		},
 		"settings": {
 			"description": "Settings for the block editor and individual blocks. These include things like:\n- Which customization options should be available to the user. \n- The default colors, font sizes... available to the user. \n- CSS custom properties and class names used in styles.\n- And the default layout of the editor (widths and available alignments).",
-			"type": "object",
 			"allOf": [
 				{
 					"$ref": "#/definitions/settingsProperties"
 				},
 				{
+					"type": "object",
 					"properties": {
-						"appearanceTools": {},
 						"useRootPaddingAwareAlignments": {
-							"$ref": "#/definitions/settingsPropertiesUseRootPaddingAwareAlignments/properties/useRootPaddingAwareAlignments"
-						},
-						"background": {},
-						"color": {},
-						"layout": {},
-						"lightbox": {},
-						"spacing": {},
-						"typography": {},
-						"border": {},
-						"shadow": {},
-						"position": {},
-						"dimensions": {},
-						"custom": {},
+							"description": "Enables root padding (the values from `styles.spacing.padding`) to be applied to the contents of full-width blocks instead of the root block.\n\nPlease note that when using this setting, `styles.spacing.padding` should always be set as an object with `top`, `right`, `bottom`, `left` values declared separately.",
+							"type": "boolean",
+							"default": false
+						},
 						"blocks": {
-							"description": "Settings defined on a per-block basis.",
 							"$ref": "#/definitions/settingsBlocksPropertiesComplete"
 						}
-					},
-					"additionalProperties": false
+					}
+				},
+				{
+					"type": "object",
+					"propertyNames": {
+						"anyOf": [
+							{
+								"$ref": "#/definitions/settingsPropertyNames"
+							},
+							{
+								"enum": [
+									"useRootPaddingAwareAlignments",
+									"blocks"
+								]
+							}
+						]
+					}
 				}
 			]
 		},
 		"styles": {
 			"description": "Organized way to set CSS properties. Styles in the top-level will be added in the `body` selector.",
-			"type": "object",
 			"allOf": [
 				{
 					"$ref": "#/definitions/stylesProperties"
 				},
 				{
+					"type": "object",
 					"properties": {
-						"border": {},
-						"color": {},
-						"spacing": {},
-						"typography": {},
-						"filter": {},
-						"shadow": {},
-						"outline": {},
-						"css": {},
 						"elements": {
-							"description": "Styles defined on a per-element basis using the element's selector.",
 							"$ref": "#/definitions/stylesElementsPropertiesComplete"
 						},
 						"blocks": {
-							"description": "Styles defined on a per-block basis using the block's selector.",
 							"$ref": "#/definitions/stylesBlocksPropertiesComplete"
+						},
+						"variations": {
+							"$ref": "#/definitions/stylesVariationsProperties"
 						}
-					},
-					"additionalProperties": false
+					}
+				},
+				{
+					"type": "object",
+					"propertyNames": {
+						"anyOf": [
+							{
+								"$ref": "#/definitions/stylesPropertyNames"
+							},
+							{
+								"enum": [ "elements", "blocks", "variations" ]
+							}
+						]
+					}
 				}
 			]
 		},
diff --git a/schemas/json/wp-env.json b/schemas/json/wp-env.json
new file mode 100644
index 00000000000000..491d1f8cf73017
--- /dev/null
+++ b/schemas/json/wp-env.json
@@ -0,0 +1,124 @@
+{
+	"title": "JSON schema for WordPress wp-env configuration files",
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"definitions": {
+		"//": {
+			"reference": "https://developer.wordpress.org/block-editor/reference-guides/packages/packages-env/"
+		},
+		"wpEnvProperties": {
+			"type": "object",
+			"properties": {
+				"core": {
+					"description": "The WordPress installation to use. If null is specified, wp-env will use the latest production release of WordPress.",
+					"oneOf": [
+						{
+							"type": "string"
+						},
+						{
+							"type": "null"
+						}
+					],
+					"default": null
+				},
+				"phpVersion": {
+					"description": "The PHP version to use. If null is specified, wp-env will use the default version used with production release of WordPress.",
+					"oneOf": [
+						{
+							"type": "string"
+						},
+						{
+							"type": "null"
+						}
+					],
+					"default": null
+				},
+				"plugins": {
+					"description": "A list of plugins to install and activate in the environment.",
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"default": []
+				},
+				"themes": {
+					"description": "A list of themes to install in the environment.",
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"default": []
+				},
+				"port": {
+					"description": "The primary port number to use for the installation. You'll access the instance through the port: 'http://localhost:8888'.",
+					"type": "integer",
+					"default": 8888
+				},
+				"config": {
+					"description": "Mapping of wp-config.php constants to their desired values.",
+					"type": "object",
+					"default": {}
+				},
+				"mappings": {
+					"description": "Mapping of WordPress directories to local directories to be mounted in the WordPress instance.",
+					"type": "object",
+					"default": {}
+				}
+			}
+		},
+		"wpEnvPropertyNames": {
+			"enum": [
+				"core",
+				"phpVersion",
+				"plugins",
+				"themes",
+				"port",
+				"config",
+				"mappings"
+			]
+		}
+	},
+	"allOf": [
+		{
+			"$ref": "#/definitions/wpEnvProperties"
+		},
+		{
+			"type": "object",
+			"properties": {
+				"$schema": {
+					"type": "string"
+				},
+				"env": {
+					"description": "The key env is available to override any of the above options on an individual-environment basis.",
+					"type": "object",
+					"patternProperties": {
+						"[a-zA-Z]": {
+							"allOf": [
+								{ "$ref": "#/definitions/wpEnvProperties" },
+								{
+									"type": "object",
+									"propertyNames": {
+										"$ref": "#/definitions/wpEnvPropertyNames"
+									}
+								}
+							]
+						}
+					},
+					"default": {}
+				}
+			}
+		},
+		{
+			"type": "object",
+			"propertyNames": {
+				"anyOf": [
+					{
+						"$ref": "#/definitions/wpEnvPropertyNames"
+					},
+					{
+						"enum": [ "$schema", "env" ]
+					}
+				]
+			}
+		}
+	]
+}
diff --git a/storybook/badges.js b/storybook/badges.js
new file mode 100644
index 00000000000000..abde7948c923a7
--- /dev/null
+++ b/storybook/badges.js
@@ -0,0 +1,36 @@
+/**
+ * Provides badge configuration options.
+ *
+ * To apply a badge to a story, add a badge identifier prefixed by "status-" to
+ * the `tags` array in the story's metadata. For example, to apply the "private"
+ * badge, add "status-private" to the `tags` array.
+ *
+ * @see https://github.com/geometricpanda/storybook-addon-badges
+ * @see './webpack/copy-tags-to-badges.js' - Webpack loader that processes the tags
+ */
+
+export default {
+	private: {
+		icon: '🔒',
+		title: '🔒 Private',
+		tooltip: {
+			title: 'Component is locked as a private API',
+			desc: 'We do not yet recommend using this outside of the Gutenberg codebase.',
+			links: [
+				{
+					title: 'About @wordpress/private-apis',
+					href: 'https://developer.wordpress.org/block-editor/reference-guides/packages/packages-private-apis/',
+				},
+			],
+		},
+	},
+	wip: {
+		icon: '🚧',
+		title: '🚧 WIP',
+		styles: { backgroundColor: '#FFF0BD' },
+		tooltip: {
+			title: 'Component is a work in progress',
+			desc: 'This component is not ready for use in production, including the Gutenberg codebase. DO NOT export outside of @wordpress/components.',
+		},
+	},
+};
diff --git a/storybook/decorators/with-global-css.js b/storybook/decorators/with-global-css.js
index 680f3359e0aadc..d3d283234be1e5 100644
--- a/storybook/decorators/with-global-css.js
+++ b/storybook/decorators/with-global-css.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
@@ -14,6 +9,11 @@ import { useEffect } from '@wordpress/element';
 import basicStyles from '../global-basic.lazy.scss';
 import wordPressStyles from '../global-wordpress.lazy.scss';
 
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
 /**
  * A Storybook decorator to inject global CSS.
  *
@@ -59,7 +59,7 @@ export const WithGlobalCSS = ( Story, context ) => {
 	}, [ context.globals.css ] );
 
 	return (
-		<div className={ classnames( classes ) }>
+		<div className={ clsx( classes ) }>
 			{ externalStyles.map( ( stylesheet ) => (
 				<link key={ stylesheet } rel="stylesheet" href={ stylesheet } />
 			) ) }
diff --git a/storybook/main.js b/storybook/main.js
index 45123a7c1ff23a..f111e9f5d8cd38 100644
--- a/storybook/main.js
+++ b/storybook/main.js
@@ -41,6 +41,7 @@ module.exports = {
 		disableTelemetry: true,
 	},
 	stories,
+	staticDirs: [ './static' ],
 	addons: [
 		{
 			name: '@storybook/addon-docs',
@@ -52,6 +53,7 @@ module.exports = {
 		'@storybook/addon-toolbars',
 		'@storybook/addon-actions',
 		'storybook-source-link',
+		'@geometricpanda/storybook-addon-badges',
 	],
 	framework: {
 		name: '@storybook/react-webpack5',
@@ -73,12 +75,23 @@ module.exports = {
 				rules: [
 					...config.module.rules,
 					{
-						// Adds a `sourceLink` parameter to the story metadata, based on the file path
 						test: /\/stories\/.+\.story\.(j|t)sx?$/,
-						loader: path.resolve(
-							__dirname,
-							'./webpack/source-link-loader.js'
-						),
+						use: [
+							{
+								// Adds a `sourceLink` parameter to the story metadata, based on the file path
+								loader: path.resolve(
+									__dirname,
+									'./webpack/source-link-loader.js'
+								),
+							},
+							{
+								// Reads `tags` from the story metadata and copies them to `badges`
+								loader: path.resolve(
+									__dirname,
+									'./webpack/copy-tags-to-badges.js'
+								),
+							},
+						],
 						enforce: 'post',
 					},
 					{
diff --git a/storybook/manager-head.html b/storybook/manager-head.html
new file mode 100644
index 00000000000000..d3f156a6eb788b
--- /dev/null
+++ b/storybook/manager-head.html
@@ -0,0 +1,55 @@
+<script>
+	( function redirectIfStoryMoved() {
+		const PREVIOUSLY_EXPERIMENTAL_COMPONENTS = [
+			'alignmentmatrixcontrol',
+			'borderboxcontrol',
+			'bordercontrol',
+			'boxcontrol',
+			'customselectcontrol-v2',
+			'dimensioncontrol',
+			'navigation',
+			'navigator',
+			'progressbar',
+			'tabs',
+			'theme',
+		];
+		const REDIRECTS = [
+			{
+				from: /\/components-deprecated-/,
+				to: '/components-',
+			},
+			{
+				from: new RegExp(
+					`\/components-experimental-(?=${ PREVIOUSLY_EXPERIMENTAL_COMPONENTS.map(
+						( str ) => `${ str }\\b`
+					).join( '|' ) })`
+				),
+				to: '/components-',
+			},
+		];
+
+		const params = new URLSearchParams( window.location.search );
+
+		const matchedRedirect = REDIRECTS.find( ( { from } ) =>
+			from.test( params.get( 'path' ) )
+		);
+
+		if ( ! matchedRedirect ) {
+			return;
+		}
+
+		params.set(
+			'path',
+			params
+				.get( 'path' )
+				.replace( matchedRedirect.from, matchedRedirect.to )
+		);
+
+		const { pathname, origin } = window.location;
+		// The decodeURIComponent keeps the slashes intact, to match how Storybook presents the `path` param.
+		const newUrl =
+			new URL( pathname, origin ) + '?' + decodeURIComponent( params );
+
+		window.location.replace( newUrl );
+	} )();
+</script>
diff --git a/storybook/manager.js b/storybook/manager.js
index 25969095c8c49c..c63f15efe11d02 100644
--- a/storybook/manager.js
+++ b/storybook/manager.js
@@ -7,7 +7,9 @@ import { addons } from '@storybook/addons';
  * Internal dependencies
  */
 import theme from './theme';
+import sidebar from './sidebar';
 
 addons.setConfig( {
+	sidebar,
 	theme,
 } );
diff --git a/storybook/preview.js b/storybook/preview.js
index 61bdef8aae5f37..21f2eab912059a 100644
--- a/storybook/preview.js
+++ b/storybook/preview.js
@@ -18,6 +18,7 @@ import { WithMarginChecker } from './decorators/with-margin-checker';
 import { WithMaxWidthWrapper } from './decorators/with-max-width-wrapper';
 import { WithRTL } from './decorators/with-rtl';
 import { WithTheme } from './decorators/with-theme';
+import badgesConfig from './badges';
 
 export const globalTypes = {
 	direction: {
@@ -99,6 +100,8 @@ export const decorators = [
 ];
 
 export const parameters = {
+	// For @geometricpanda/storybook-addon-badges
+	badgesConfig,
 	controls: {
 		sort: 'requiredFirst',
 	},
@@ -124,6 +127,13 @@ export const parameters = {
 				'Playground',
 				'BlockEditor',
 				'Components',
+				[
+					'Introduction',
+					'Contributing Guidelines',
+					'Actions',
+					'Containers',
+					'Utilities',
+				],
 				'Components (Experimental)',
 				'Icons',
 			],
diff --git a/storybook/sidebar.js b/storybook/sidebar.js
new file mode 100644
index 00000000000000..d8ff2ba777dd7d
--- /dev/null
+++ b/storybook/sidebar.js
@@ -0,0 +1,79 @@
+/**
+ * Provides sidebar configuration options.
+ * See https://storybook.js.org/docs/configure/features-and-behavior
+ */
+
+/**
+ * External dependencies
+ */
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+import { createElement, useMemo } from 'react';
+import { useStorybookApi } from '@storybook/manager-api';
+import { styled } from '@storybook/theming';
+
+/**
+ * Internal dependencies
+ */
+import badges from './badges';
+
+const Wrapper = styled.span( {
+	flexGrow: 1,
+	display: 'flex',
+	paddingRight: '20px',
+} );
+
+const Title = styled.span( {
+	flexGrow: 1,
+} );
+
+const Icons = styled.span( {} );
+
+const Icon = styled.span( {} );
+
+/**
+ * Fetches tags from the Storybook API, and returns Icon
+ * elements for any that have matching badge data
+ */
+function useIcons( item ) {
+	const api = useStorybookApi();
+	const prefix = 'status-';
+
+	return useMemo( () => {
+		let data = {};
+
+		if ( item.isComponent && item.children?.length ) {
+			data = api.getData( item.children[ 0 ] ) ?? {};
+		}
+
+		const { tags = [] } = data;
+
+		return tags
+			.filter( ( tag ) => tag.startsWith( prefix ) )
+			.map( ( tag ) => badges[ tag.substring( prefix.length ) ] )
+			.map( ( { icon, title, tooltip } ) =>
+				icon
+					? createElement(
+							Icon,
+							{ title: tooltip?.title ?? title },
+							icon
+					  )
+					: null
+			);
+	}, [ api, item.children, item.isComponent ] );
+}
+
+/**
+ * Renders the item name and any associated badge icons.
+ */
+function Label( { item } ) {
+	const iconSet = useIcons( item );
+	const title = createElement( Title, {}, item.name );
+	const icons = createElement( Icons, { 'aria-hidden': true }, ...iconSet );
+
+	return createElement( Wrapper, {}, title, icons );
+}
+
+export default {
+	// Renders status icons for items tagged with `status-*`
+	renderLabel: ( item ) => createElement( Label, { item } ),
+};
diff --git a/storybook/static/wp-logo@2x.png b/storybook/static/wp-logo@2x.png
new file mode 100644
index 00000000000000..a95cd961902b01
Binary files /dev/null and b/storybook/static/wp-logo@2x.png differ
diff --git a/storybook/stories/docs/inline-icon.js b/storybook/stories/docs/inline-icon.js
index 2a1056b0069b74..d7d1fafc28723d 100644
--- a/storybook/stories/docs/inline-icon.js
+++ b/storybook/stories/docs/inline-icon.js
@@ -9,6 +9,4 @@ const StyledIcons = styled( Icons )`
 	width: 14px;
 `;
 
-export const InlineIcon = ( props ) => (
-	<StyledIcons aria-hidden={ true } { ...props } />
-);
+export const InlineIcon = ( props ) => <StyledIcons aria-hidden { ...props } />;
diff --git a/storybook/stories/foundations/design-language/elevation.mdx b/storybook/stories/foundations/design-language/elevation.mdx
new file mode 100644
index 00000000000000..11591568b3600c
--- /dev/null
+++ b/storybook/stories/foundations/design-language/elevation.mdx
@@ -0,0 +1,87 @@
+import { Meta, Typeset } from '@storybook/addon-docs/blocks';
+import elevation from './static/elevation.svg';
+import elevationExamples from './static/elevation-examples.svg';
+
+<Meta title="Foundations/Design Language/Elevation" name="page" />
+
+# Elevation
+
+{/* Leaving alt text empty since this image is presentational */}
+
+<img src={ elevation } alt="" width="100%" />
+
+Elevation, through the use of shadows, visually indicates the layers where overlapping UI elements reside. Shadows create the illusion of depth, showing how one UI element is positioned above another on the z-axis. Elevation should be used to organize elements, establish a clear hierarchy, and draw focus to key components.
+
+In the WordPress Design System there are four levels of elevation correlating to specific uses:
+
+<table>
+	<thead>
+		<tr>
+			<th>Elevation</th>
+			<th>Usage</th>
+			<th>Examples</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>Extra small</td>
+			<td>
+				Applied to large sections and containers that group related content 
+				and controls. These containers may shift or overlap other content 
+				without causing too much visual disruption
+			</td>
+			<td>Preview Frame, Content Frame</td>
+		</tr>
+		<tr>
+			<td>Small</td>
+			<td>
+				Used for components that provide contextual feedback without being 
+				overly intrusive. Small elevation is ideal for non-interruptive elements 
+				that subtly surface additional information or actions.
+			</td>
+			<td>Tooltips, Snackbars</td>
+		</tr>
+		<tr>
+			<td>Medium</td>
+			<td>
+				Applied to components that offer additional actions to the user. This 
+				elevation level helps differentiate actionable elements that appear in 
+				context without requiring major focus shifts.
+			</td>
+			<td>Menus, Command Palette</td>
+		</tr>
+		<tr>
+			<td>Large</td>
+			<td>
+				Reserved for components that confirm actions or require decisions, large 
+				elevation is used for more interruptive elements that demand user attention 
+				to complete important tasks.
+			</td>
+			<td>Modals</td>
+		</tr>
+	</tbody>
+</table>
+
+## Accessibility considerations
+
+* Interactive Elements: Elevation can be an important visual cue to indicate which elements are interactive, 
+particularly for folks with monochromatic color blindness. Elevating buttons, handles, and other interactive 
+elements makes them stand out, helping users quickly identify where they can take action.
+* Focus: Higher levels of elevation can be used to draw attention to components that require user interaction 
+or confirmation, such as modals, guides, and decision-based tasks, enhancing accessibility by reducing 
+cognitive load.
+
+## Examples
+
+The diagram below visually demonstrates the examples outlined in the table above.
+
+<img src={ elevationExamples } alt="Diagram illustrating elevation levels" width="100%" />
+
+1. Content frame and Preview frame
+2. Snackbar
+3. Menu
+4. Modal
+
+## Tokens
+
+Use tokens to apply elevation in your work. Please refer to the [Tokens section](?path=/docs/tokens-elevation--page) to learn more.
diff --git a/storybook/stories/foundations/design-language/radius.mdx b/storybook/stories/foundations/design-language/radius.mdx
new file mode 100644
index 00000000000000..9117bf940d45a2
--- /dev/null
+++ b/storybook/stories/foundations/design-language/radius.mdx
@@ -0,0 +1,55 @@
+import { Meta, Typeset } from '@storybook/addon-docs/blocks';
+import radius from './static/radius.svg';
+import radiusDo from './static/radius-do.svg';
+import radiusDont from './static/radius-dont.svg';
+
+<Meta title="Foundations/Design Language/Radius" name="page" />
+
+# Radius
+
+<img src={ radius } alt="Radius" width="100%" />
+
+The radius scale is designed to provide a consistent, elegant appearance across nested elements. The defined values help maintain visual harmony between smaller primitives and larger containers, ensuring a cohesive user experience.
+
+## Scale
+
+The scale includes the following steps:
+
+-   `radius-x-small`: Applied to the smallest elements, such as buttons inside inputs or similar small primitives. This ensures subtle rounding without distracting from the core design.
+-   `radius-small`: The most commonly used radius value, applied to many primitives like buttons, inputs, and other standalone controls. It provides a moderate rounding that feels balanced and polished.
+-   `radius-medium`: Used for medium-sized containers like dropdown menus, popovers, and other mid-level components. This value is slightly more pronounced, giving these elements a soft but noticeable edge.
+-   `radius-large`: Reserved for larger containers such as cards and modals. The larger radius ensures that these elements have a smooth, elegant appearance that enhances their prominence on the page.
+-   `radius-full`: Applies a `border-radius` of `9999px`, this value creates a highly rounded appearance, often used on pill-shaped buttons or other components where extreme rounding is desired but full circularity is not necessary.
+-   `radius-round`: This value applies a `border-radius` of `100%`, making elements fully circular. It's typically used for circular avatars or buttons where complete rounding is required.
+
+These steps are defined as tokens. To view the values and understand how to use them please view the [Tokens section](?path=/docs/tokens-radius--page).
+
+## Usage Guidelines
+
+-   Consistency: To maintain visual cohesion, adhere to the radius scale when styling elements. Avoid custom radius values unless there is a specific need.
+-   Nested Elements: When combining elements of different sizes (e.g., buttons within inputs or cards within modals), ensure that smaller nested elements use the appropriate radius value for their size.
+-   Accessibility: Larger radius values can create a more approachable and friendly appearance, especially for larger components like cards and modals that demand more attention from users.
+
+<table>
+  <tr>
+    <th width="50%">✅ Do</th>
+    <th width="50%">🚫 Don't</th>
+  </tr>
+  <tr>
+    <td width="50%" valign="top">
+      <img src={ radiusDo } alt="Radius do" width="100%" />
+
+      - Scale application of radius with element or container size.
+
+      - Use `radius-round` for circles and `radius-full` for pills.
+    </td>
+    <td width="50%" valign="top">
+      <img src={ radiusDont } alt="Radius don't" width="100%" />
+
+        -   Don't nest larger radii inside smaller radii.
+
+        -   Don't apply the same
+    radius value to container and immediate descendent.
+    </td>
+  </tr>
+</table>
diff --git a/storybook/stories/foundations/design-language/static/elevation-examples.svg b/storybook/stories/foundations/design-language/static/elevation-examples.svg
new file mode 100644
index 00000000000000..516313cbca4df3
--- /dev/null
+++ b/storybook/stories/foundations/design-language/static/elevation-examples.svg
@@ -0,0 +1,170 @@
+<svg width="1123" height="736" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect width="1123" height="736" rx="8" fill="#E4E4E4"/>
+  <g filter="url(#a)">
+    <path fill="#F1F1F1" d="M304 12h309v712H304z"/>
+    <rect x="565" y="20" width="40" height="40" rx="20" fill="#1E1E1E"/>
+    <path d="M586.923 34.364V46h-2.108v-9.585h-.068l-2.721 1.738v-1.931l2.892-1.858h2.005Z" fill="#fff"/>
+  </g>
+  <g filter="url(#b)">
+    <path fill="#F1F1F1" d="M625 12h486v712H625z"/>
+    <rect x="1063" y="20" width="40" height="40" rx="20" fill="#1E1E1E"/>
+    <path d="M1084.92 34.364V46h-2.1v-9.585h-.07l-2.72 1.738v-1.931l2.89-1.858h2Z" fill="#fff"/>
+  </g>
+  <g filter="url(#c)">
+    <path fill="#FAFAFA" d="M273 44h149v219H273z"/>
+    <rect x="374" y="52" width="40" height="40" rx="20" fill="#1E1E1E"/>
+    <path d="M393.999 78.16c-.818 0-1.545-.141-2.182-.421-.632-.28-1.132-.67-1.5-1.17a3.039 3.039 0 0 1-.585-1.734h2.137c.019.315.123.59.312.824.19.231.441.411.756.54.314.129.666.193 1.057.193.416 0 .786-.072 1.108-.216.322-.148.573-.352.755-.614a1.51 1.51 0 0 0 .267-.903 1.571 1.571 0 0 0-.272-.932c-.186-.269-.455-.479-.807-.63-.349-.152-.769-.228-1.262-.228h-1.028v-1.625h1.028c.406 0 .76-.07 1.063-.21.307-.14.547-.337.721-.59.175-.258.26-.556.256-.893.004-.33-.07-.615-.221-.858a1.497 1.497 0 0 0-.631-.574 2.074 2.074 0 0 0-.949-.204c-.356 0-.686.064-.989.193a1.801 1.801 0 0 0-.733.551 1.398 1.398 0 0 0-.295.841h-2.028c.015-.651.202-1.224.562-1.716a3.634 3.634 0 0 1 1.455-1.159c.606-.28 1.286-.42 2.039-.42.777 0 1.451.145 2.023.437.576.288 1.021.676 1.335 1.165.315.489.472 1.028.472 1.62.004.654-.189 1.204-.58 1.647-.386.443-.894.733-1.522.87v.09c.818.114 1.445.417 1.88.91.44.488.658 1.096.654 1.823a2.92 2.92 0 0 1-.557 1.75c-.367.511-.875.913-1.523 1.205-.644.291-1.382.437-2.216.437Z" fill="#fff"/>
+  </g>
+  <g filter="url(#d)">
+    <path fill="#F6F6F6" d="M32 643h287v61H32z"/>
+    <rect x="271" y="651" width="40" height="40" rx="20" fill="#1E1E1E"/>
+    <path d="M287.065 677v-1.523l4.04-3.96c.386-.39.708-.737.966-1.04.258-.303.451-.596.58-.88.128-.285.193-.588.193-.909 0-.368-.084-.682-.25-.944a1.664 1.664 0 0 0-.688-.613 2.214 2.214 0 0 0-.994-.216c-.383 0-.718.079-1.006.238a1.644 1.644 0 0 0-.67.665c-.156.288-.233.631-.233 1.029h-2.006c0-.739.169-1.381.506-1.927a3.42 3.42 0 0 1 1.392-1.267c.595-.299 1.276-.448 2.045-.448.781 0 1.466.145 2.057.437.591.292 1.049.691 1.375 1.199.33.507.494 1.087.494 1.739 0 .435-.083.863-.25 1.284-.166.42-.46.886-.88 1.397-.417.512-1.002 1.131-1.756 1.858l-2.006 2.04v.08h5.069V677h-7.978Z" fill="#fff"/>
+  </g>
+  <g filter="url(#e)">
+    <path fill="#fff" d="M349 205h425v327H349z"/>
+    <rect x="726" y="213" width="40" height="40" rx="20" fill="#1E1E1E"/>
+    <path d="M741.496 236.841v-1.676l4.937-7.801h1.398v2.386h-.852l-3.324 5.267v.091h6.892v1.733h-9.051Zm5.551 2.159v-2.67l.023-.75v-8.216h1.988V239h-2.011Z" fill="#fff"/>
+  </g>
+  <defs>
+    <filter id="a" x="300" y="11" width="317" height="721" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="4"/>
+      <feGaussianBlur stdDeviation="2"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.01 0"/>
+      <feBlend in2="BackgroundImageFix" result="effect1_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="3"/>
+      <feGaussianBlur stdDeviation="1.5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="effect1_dropShadow_15809_7029" result="effect2_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="effect2_dropShadow_15809_7029" result="effect3_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation=".5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0"/>
+      <feBlend in2="effect3_dropShadow_15809_7029" result="effect4_dropShadow_15809_7029"/>
+      <feBlend in="SourceGraphic" in2="effect4_dropShadow_15809_7029" result="shape"/>
+    </filter>
+    <filter id="b" x="621" y="11" width="494" height="721" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="4"/>
+      <feGaussianBlur stdDeviation="2"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.01 0"/>
+      <feBlend in2="BackgroundImageFix" result="effect1_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="3"/>
+      <feGaussianBlur stdDeviation="1.5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="effect1_dropShadow_15809_7029" result="effect2_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="effect2_dropShadow_15809_7029" result="effect3_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation=".5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0"/>
+      <feBlend in2="effect3_dropShadow_15809_7029" result="effect4_dropShadow_15809_7029"/>
+      <feBlend in="SourceGraphic" in2="effect4_dropShadow_15809_7029" result="shape"/>
+    </filter>
+    <filter id="c" x="257" y="43" width="181" height="252" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="16"/>
+      <feGaussianBlur stdDeviation="8"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="BackgroundImageFix" result="effect1_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="4"/>
+      <feGaussianBlur stdDeviation="2.5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0"/>
+      <feBlend in2="effect1_dropShadow_15809_7029" result="effect2_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="4"/>
+      <feGaussianBlur stdDeviation="2.5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
+      <feBlend in2="effect2_dropShadow_15809_7029" result="effect3_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="2"/>
+      <feGaussianBlur stdDeviation="1.5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
+      <feBlend in2="effect3_dropShadow_15809_7029" result="effect4_dropShadow_15809_7029"/>
+      <feBlend in="SourceGraphic" in2="effect4_dropShadow_15809_7029" result="shape"/>
+    </filter>
+    <filter id="d" x="24" y="642" width="303" height="78" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="8"/>
+      <feGaussianBlur stdDeviation="4"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="BackgroundImageFix" result="effect1_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
+      <feBlend in2="effect1_dropShadow_15809_7029" result="effect2_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
+      <feBlend in2="effect2_dropShadow_15809_7029" result="effect3_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
+      <feBlend in2="effect3_dropShadow_15809_7029" result="effect4_dropShadow_15809_7029"/>
+      <feBlend in="SourceGraphic" in2="effect4_dropShadow_15809_7029" result="shape"/>
+    </filter>
+    <filter id="e" x="306" y="193" width="511" height="432" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="50"/>
+      <feGaussianBlur stdDeviation="21.5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="BackgroundImageFix" result="effect1_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="30"/>
+      <feGaussianBlur stdDeviation="18"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
+      <feBlend in2="effect1_dropShadow_15809_7029" result="effect2_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="15"/>
+      <feGaussianBlur stdDeviation="13.5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.07 0"/>
+      <feBlend in2="effect2_dropShadow_15809_7029" result="effect3_dropShadow_15809_7029"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="5"/>
+      <feGaussianBlur stdDeviation="7.5"/>
+      <feComposite in2="hardAlpha" operator="out"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.08 0"/>
+      <feBlend in2="effect3_dropShadow_15809_7029" result="effect4_dropShadow_15809_7029"/>
+      <feBlend in="SourceGraphic" in2="effect4_dropShadow_15809_7029" result="shape"/>
+    </filter>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/storybook/stories/foundations/design-language/static/elevation.svg b/storybook/stories/foundations/design-language/static/elevation.svg
new file mode 100644
index 00000000000000..737e7955ad9df6
--- /dev/null
+++ b/storybook/stories/foundations/design-language/static/elevation.svg
@@ -0,0 +1,208 @@
+<svg width="1123" height="439" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#a)">
+    <rect width="1123" height="439" rx="8" fill="#3858E9"/>
+    <g filter="url(#b)">
+      <rect width="705" height="924" rx="12" transform="matrix(.86603 -.5 .86603 .5 184.238 -6.64)" fill="#617CF4"/>
+      <rect width="705" height="924" rx="12" transform="matrix(.86603 -.5 .86603 .5 184.238 -6.64)" fill="url(#c)" fill-opacity=".4"/>
+    </g>
+    <g filter="url(#d)">
+      <rect width="705" height="924" rx="12" transform="matrix(.86603 -.5 .86603 .5 -442.398 355.146)" fill="#617CF4"/>
+      <rect width="705" height="924" rx="12" transform="matrix(.86603 -.5 .86603 .5 -442.398 355.146)" fill="url(#e)" fill-opacity=".4"/>
+    </g>
+    <g filter="url(#f)">
+      <rect width="397.5" height="88.5" rx="12" transform="matrix(.86603 -.5 .86603 .5 455 608.75)" fill="#A7B8FF" fill-opacity=".9"/>
+      <rect width="397.5" height="88.5" rx="12" transform="matrix(.86603 -.5 .86603 .5 455 608.75)" fill="url(#g)" fill-opacity=".8"/>
+    </g>
+    <g filter="url(#h)">
+      <rect width="270.418" height="316.5" rx="24" transform="matrix(.86603 -.5 .86603 .5 102 363.209)" fill="#859BFB" fill-opacity=".9"/>
+      <rect width="270.418" height="316.5" rx="24" transform="matrix(.86603 -.5 .86603 .5 102 363.209)" fill="url(#i)" fill-opacity=".6"/>
+    </g>
+    <g filter="url(#j)">
+      <rect width="270.418" height="316.5" rx="24" transform="matrix(.86603 -.5 .86603 .5 439 48.209)" fill="#859BFB" fill-opacity=".9"/>
+      <rect width="270.418" height="316.5" rx="24" transform="matrix(.86603 -.5 .86603 .5 439 48.209)" fill="url(#k)" fill-opacity=".6"/>
+    </g>
+    <g filter="url(#l)">
+      <rect width="521.081" height="725.336" rx="36" transform="matrix(.86603 -.5 .86603 .5 20.979 165.499)" fill="#C2CCFF" fill-opacity=".9"/>
+      <rect width="521.081" height="725.336" rx="36" transform="matrix(.86603 -.5 .86603 .5 20.979 165.499)" fill="url(#m)" fill-opacity=".2"/>
+    </g>
+  </g>
+  <defs>
+    <linearGradient id="c" x1="352.5" y1="0" x2="352.5" y2="924" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#fff" stop-opacity=".25"/>
+    </linearGradient>
+    <linearGradient id="e" x1="352.5" y1="0" x2="352.5" y2="924" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#fff" stop-opacity=".25"/>
+    </linearGradient>
+    <linearGradient id="g" x1="198.75" y1="0" x2="198.75" y2="88.5" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#fff" stop-opacity=".25"/>
+    </linearGradient>
+    <linearGradient id="i" x1="135.209" y1="0" x2="135.209" y2="316.5" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#fff" stop-opacity=".25"/>
+    </linearGradient>
+    <linearGradient id="k" x1="135.209" y1="0" x2="135.209" y2="316.5" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#fff" stop-opacity=".25"/>
+    </linearGradient>
+    <linearGradient id="m" x1="260.541" y1="0" x2="260.541" y2="725.336" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#fff" stop-opacity=".25"/>
+    </linearGradient>
+    <filter id="b" x="182.326" y="-363.626" width="1414.58" height="831.471" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+      <feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
+      <feBlend in2="effect1_backgroundBlur_15773_6493" result="effect2_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="3"/>
+      <feGaussianBlur stdDeviation="1.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0"/>
+      <feBlend in2="effect2_dropShadow_15773_6493" result="effect3_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="6"/>
+      <feGaussianBlur stdDeviation="2"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="effect3_dropShadow_15773_6493" result="effect4_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="11"/>
+      <feGaussianBlur stdDeviation="2.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.01 0"/>
+      <feBlend in2="effect4_dropShadow_15773_6493" result="effect5_dropShadow_15773_6493"/>
+      <feBlend in="SourceGraphic" in2="effect5_dropShadow_15773_6493" result="shape"/>
+    </filter>
+    <filter id="d" x="-444.31" y="-1.839" width="1414.58" height="831.471" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+      <feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
+      <feBlend in2="effect1_backgroundBlur_15773_6493" result="effect2_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="3"/>
+      <feGaussianBlur stdDeviation="1.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0"/>
+      <feBlend in2="effect2_dropShadow_15773_6493" result="effect3_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="6"/>
+      <feGaussianBlur stdDeviation="2"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="effect3_dropShadow_15773_6493" result="effect4_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="11"/>
+      <feGaussianBlur stdDeviation="2.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.01 0"/>
+      <feBlend in2="effect4_dropShadow_15773_6493" result="effect5_dropShadow_15773_6493"/>
+      <feBlend in="SourceGraphic" in2="effect5_dropShadow_15773_6493" result="shape"/>
+    </filter>
+    <filter id="f" x="453.088" y="405.515" width="424.713" height="254.971" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+      <feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset/>
+      <feGaussianBlur stdDeviation=".5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
+      <feBlend in2="effect1_backgroundBlur_15773_6493" result="effect2_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="2"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
+      <feBlend in2="effect2_dropShadow_15773_6493" result="effect3_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="4"/>
+      <feGaussianBlur stdDeviation="1.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0"/>
+      <feBlend in2="effect3_dropShadow_15773_6493" result="effect4_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="8"/>
+      <feGaussianBlur stdDeviation="1.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.01 0"/>
+      <feBlend in2="effect4_dropShadow_15773_6493" result="effect5_dropShadow_15773_6493"/>
+      <feBlend in="SourceGraphic" in2="effect5_dropShadow_15773_6493" result="shape"/>
+    </filter>
+    <filter id="h" x="105.175" y="227.029" width="501.936" height="318.4" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+      <feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
+      <feBlend in2="effect1_backgroundBlur_15773_6493" result="effect2_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="5"/>
+      <feGaussianBlur stdDeviation="2.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0"/>
+      <feBlend in2="effect2_dropShadow_15773_6493" result="effect3_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="12"/>
+      <feGaussianBlur stdDeviation="3.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="effect3_dropShadow_15773_6493" result="effect4_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="22"/>
+      <feGaussianBlur stdDeviation="4.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.01 0"/>
+      <feBlend in2="effect4_dropShadow_15773_6493" result="effect5_dropShadow_15773_6493"/>
+      <feBlend in="SourceGraphic" in2="effect5_dropShadow_15773_6493" result="shape"/>
+    </filter>
+    <filter id="j" x="442.175" y="-87.971" width="501.936" height="318.4" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+      <feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
+      <feBlend in2="effect1_backgroundBlur_15773_6493" result="effect2_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="5"/>
+      <feGaussianBlur stdDeviation="2.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0"/>
+      <feBlend in2="effect2_dropShadow_15773_6493" result="effect3_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="12"/>
+      <feGaussianBlur stdDeviation="3.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="effect3_dropShadow_15773_6493" result="effect4_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="22"/>
+      <feGaussianBlur stdDeviation="4.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.01 0"/>
+      <feBlend in2="effect4_dropShadow_15773_6493" result="effect5_dropShadow_15773_6493"/>
+      <feBlend in="SourceGraphic" in2="effect5_dropShadow_15773_6493" result="shape"/>
+    </filter>
+    <filter id="l" x="15.242" y="-92.498" width="1090.9" height="693.121" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+      <feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="4"/>
+      <feGaussianBlur stdDeviation="4"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
+      <feBlend in2="effect1_backgroundBlur_15773_6493" result="effect2_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="15"/>
+      <feGaussianBlur stdDeviation="7.5"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0"/>
+      <feBlend in2="effect2_dropShadow_15773_6493" result="effect3_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="33"/>
+      <feGaussianBlur stdDeviation="10"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0"/>
+      <feBlend in2="effect3_dropShadow_15773_6493" result="effect4_dropShadow_15773_6493"/>
+      <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="59"/>
+      <feGaussianBlur stdDeviation="12"/>
+      <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.01 0"/>
+      <feBlend in2="effect4_dropShadow_15773_6493" result="effect5_dropShadow_15773_6493"/>
+      <feBlend in="SourceGraphic" in2="effect5_dropShadow_15773_6493" result="shape"/>
+    </filter>
+    <clipPath id="a">
+      <rect width="1123" height="439" rx="8" fill="#fff"/>
+    </clipPath>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/storybook/stories/foundations/design-language/static/radius-do.svg b/storybook/stories/foundations/design-language/static/radius-do.svg
new file mode 100644
index 00000000000000..baec81e98456a4
--- /dev/null
+++ b/storybook/stories/foundations/design-language/static/radius-do.svg
@@ -0,0 +1,58 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="821" height="400" fill="none">
+	<g clip-path="url(#a)">
+		<rect width="821" height="400" fill="#3858E9" rx="8"/>
+		<rect width="835" height="662" x="-211" y="60" fill="#607AEE" rx="48"/>
+		<rect width="834" height="661" x="-210.5" y="60.5" stroke="#fff" stroke-opacity=".2" rx="47.5"/>
+		<rect width="111" height="40" x="-34" y="107" fill="#7D92F1" rx="20"/>
+		<rect width="110" height="39" x="-33.5" y="107.5" stroke="#fff" stroke-opacity=".2" rx="19.5"/>
+		<rect width="111" height="40" x="93" y="107" fill="#7D92F1" rx="20"/>
+		<rect width="110" height="39" x="93.5" y="107.5" stroke="#fff" stroke-opacity=".2" rx="19.5"/>
+		<rect width="111" height="40" x="220" y="107" fill="#7D92F1" rx="20"/>
+		<rect width="110" height="39" x="220.5" y="107.5" stroke="#fff" stroke-opacity=".2" rx="19.5"/>
+		<rect width="40" height="40" x="537" y="107" fill="#7D92F1" rx="12"/>
+		<rect width="39" height="39" x="537.5" y="107.5" stroke="#fff" stroke-opacity=".2" rx="11.5"/>
+		<g filter="url(#b)">
+			<rect width="335" height="502" x="242" y="163" fill="#93A4F4" rx="24"/>
+			<rect width="334" height="501" x="242.5" y="163.5" stroke="#fff" stroke-opacity=".2" rx="23.5"/>
+		</g>
+		<rect width="287" height="62" x="266" y="187" fill="#ADBBFB" rx="12"/>
+		<rect width="286" height="61" x="266.5" y="187.5" stroke="#fff" stroke-opacity=".2" rx="11.5"/>
+		<rect width="40" height="40" x="266" y="281" fill="#ADBBFB" rx="20"/>
+		<rect width="39" height="39" x="266.5" y="281.5" stroke="#fff" stroke-opacity=".2" rx="19.5"/>
+		<rect width="40" height="40" x="266" y="337" fill="#ADBBFB" rx="20"/>
+		<rect width="39" height="39" x="266.5" y="337.5" stroke="#fff" stroke-opacity=".2" rx="19.5"/>
+		<rect width="40" height="40" x="266" y="393" fill="#ADBBFB" rx="20"/>
+		<rect width="39" height="39" x="266.5" y="393.5" stroke="#fff" stroke-opacity=".2" rx="19.5"/>
+		<rect width="40" height="40" x="502" y="198" fill="#CCD4FF" rx="6"/>
+		<rect width="39" height="39" x="502.5" y="198.5" stroke="#fff" stroke-opacity=".2" rx="5.5"/>
+	</g>
+	<defs>
+		<clipPath id="a">
+			<rect width="821" height="400" fill="#fff" rx="8"/>
+		</clipPath>
+		<filter id="b" width="533" height="867" x="143" y="144" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+			<feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+			<feOffset dy="15"/>
+			<feGaussianBlur stdDeviation="17"/>
+			<feColorMatrix values="0 0 0 0 0.0117647 0 0 0 0 0.0627451 0 0 0 0 0.329412 0 0 0 0.1 0"/>
+			<feBlend in2="BackgroundImageFix" result="effect1_dropShadow_15778_6552"/>
+			<feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+			<feOffset dy="62"/>
+			<feGaussianBlur stdDeviation="31"/>
+			<feColorMatrix values="0 0 0 0 0.0117647 0 0 0 0 0.0627451 0 0 0 0 0.329412 0 0 0 0.09 0"/>
+			<feBlend in2="effect1_dropShadow_15778_6552" result="effect2_dropShadow_15778_6552"/>
+			<feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+			<feOffset dy="139"/>
+			<feGaussianBlur stdDeviation="41.5"/>
+			<feColorMatrix values="0 0 0 0 0.0117647 0 0 0 0 0.0627451 0 0 0 0 0.329412 0 0 0 0.05 0"/>
+			<feBlend in2="effect2_dropShadow_15778_6552" result="effect3_dropShadow_15778_6552"/>
+			<feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+			<feOffset dy="247"/>
+			<feGaussianBlur stdDeviation="49.5"/>
+			<feColorMatrix values="0 0 0 0 0.0117647 0 0 0 0 0.0627451 0 0 0 0 0.329412 0 0 0 0.01 0"/>
+			<feBlend in2="effect3_dropShadow_15778_6552" result="effect4_dropShadow_15778_6552"/>
+			<feBlend in="SourceGraphic" in2="effect4_dropShadow_15778_6552" result="shape"/>
+		</filter>
+	</defs>
+</svg>
diff --git a/storybook/stories/foundations/design-language/static/radius-dont.svg b/storybook/stories/foundations/design-language/static/radius-dont.svg
new file mode 100644
index 00000000000000..b4426b2fdd9199
--- /dev/null
+++ b/storybook/stories/foundations/design-language/static/radius-dont.svg
@@ -0,0 +1,58 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="821" height="400" fill="none">
+	<g clip-path="url(#a)">
+		<rect width="821" height="400" fill="#3858E9" rx="8"/>
+		<rect width="835" height="662" x="-211" y="60" fill="#607AEE" rx="6"/>
+		<rect width="834" height="661" x="-210.5" y="60.5" stroke="#fff" stroke-opacity=".2" rx="5.5"/>
+		<rect width="111" height="40" x="-34" y="107" fill="#7D92F1" rx="12"/>
+		<rect width="110" height="39" x="-33.5" y="107.5" stroke="#fff" stroke-opacity=".2" rx="11.5"/>
+		<rect width="111" height="40" x="93" y="107" fill="#7D92F1" rx="12"/>
+		<rect width="110" height="39" x="93.5" y="107.5" stroke="#fff" stroke-opacity=".2" rx="11.5"/>
+		<rect width="111" height="40" x="220" y="107" fill="#7D92F1" rx="12"/>
+		<rect width="110" height="39" x="220.5" y="107.5" stroke="#fff" stroke-opacity=".2" rx="11.5"/>
+		<rect width="40" height="40" x="537" y="107" fill="#7D92F1" rx="12"/>
+		<rect width="39" height="39" x="537.5" y="107.5" stroke="#fff" stroke-opacity=".2" rx="11.5"/>
+		<g filter="url(#b)">
+			<rect width="335" height="502" x="242" y="163" fill="#93A4F4" rx="6"/>
+			<rect width="334" height="501" x="242.5" y="163.5" stroke="#fff" stroke-opacity=".2" rx="5.5"/>
+		</g>
+		<rect width="40" height="40" x="266" y="281" fill="#ADBBFB" rx="16"/>
+		<rect width="39" height="39" x="266.5" y="281.5" stroke="#fff" stroke-opacity=".2" rx="15.5"/>
+		<rect width="40" height="40" x="266" y="337" fill="#ADBBFB" rx="16"/>
+		<rect width="39" height="39" x="266.5" y="337.5" stroke="#fff" stroke-opacity=".2" rx="15.5"/>
+		<rect width="40" height="40" x="266" y="393" fill="#ADBBFB" rx="16"/>
+		<rect width="39" height="39" x="266.5" y="393.5" stroke="#fff" stroke-opacity=".2" rx="15.5"/>
+		<rect width="287" height="62" x="266" y="187" fill="#ADBBFB" rx="6"/>
+		<rect width="286" height="61" x="266.5" y="187.5" stroke="#fff" stroke-opacity=".2" rx="5.5"/>
+		<rect width="40" height="40" x="502" y="198" fill="#CCD4FF" rx="9"/>
+		<rect width="39" height="39" x="502.5" y="198.5" stroke="#fff" stroke-opacity=".2" rx="8.5"/>
+	</g>
+	<defs>
+		<clipPath id="a">
+			<rect width="821" height="400" fill="#fff" rx="8"/>
+		</clipPath>
+		<filter id="b" width="533" height="867" x="143" y="144" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+			<feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+			<feOffset dy="15"/>
+			<feGaussianBlur stdDeviation="17"/>
+			<feColorMatrix values="0 0 0 0 0.0117647 0 0 0 0 0.0627451 0 0 0 0 0.329412 0 0 0 0.1 0"/>
+			<feBlend in2="BackgroundImageFix" result="effect1_dropShadow_15779_6567"/>
+			<feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+			<feOffset dy="62"/>
+			<feGaussianBlur stdDeviation="31"/>
+			<feColorMatrix values="0 0 0 0 0.0117647 0 0 0 0 0.0627451 0 0 0 0 0.329412 0 0 0 0.09 0"/>
+			<feBlend in2="effect1_dropShadow_15779_6567" result="effect2_dropShadow_15779_6567"/>
+			<feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+			<feOffset dy="139"/>
+			<feGaussianBlur stdDeviation="41.5"/>
+			<feColorMatrix values="0 0 0 0 0.0117647 0 0 0 0 0.0627451 0 0 0 0 0.329412 0 0 0 0.05 0"/>
+			<feBlend in2="effect2_dropShadow_15779_6567" result="effect3_dropShadow_15779_6567"/>
+			<feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+			<feOffset dy="247"/>
+			<feGaussianBlur stdDeviation="49.5"/>
+			<feColorMatrix values="0 0 0 0 0.0117647 0 0 0 0 0.0627451 0 0 0 0 0.329412 0 0 0 0.01 0"/>
+			<feBlend in2="effect3_dropShadow_15779_6567" result="effect4_dropShadow_15779_6567"/>
+			<feBlend in="SourceGraphic" in2="effect4_dropShadow_15779_6567" result="shape"/>
+		</filter>
+	</defs>
+</svg>
diff --git a/storybook/stories/foundations/design-language/static/radius.svg b/storybook/stories/foundations/design-language/static/radius.svg
new file mode 100644
index 00000000000000..a5d81ef7ca0535
--- /dev/null
+++ b/storybook/stories/foundations/design-language/static/radius.svg
@@ -0,0 +1,62 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1091" height="395" fill="none">
+	<g clip-path="url(#a)">
+		<rect width="1091" height="395" fill="#3858E9" rx="8"/>
+		<g filter="url(#b)">
+			<path fill="url(#c)" fill-opacity=".8" d="M73.06 344.57c-31.45-117.36 38.2-238 155.56-269.44L1091.2-156l166.69 622.08L182.8 754.14 73.07 344.57Z"/>
+		</g>
+		<g filter="url(#d)">
+			<path fill="url(#e)" fill-opacity=".8" d="M130.76 328.07c-22.73-84.82 27.6-172 112.43-194.73l863.53-231.38 145.37 542.51L234.97 717.02 130.76 328.07Z"/>
+		</g>
+		<g filter="url(#f)">
+			<path fill="url(#g)" fill-opacity=".8" d="M188.71 312.55c-14.15-52.82 17.2-107.1 70-121.25l863.55-231.4 127.94 477.48-959.16 257-102.32-381.84Z"/>
+		</g>
+		<g filter="url(#h)">
+			<path fill="url(#i)" fill-opacity=".8" d="M246.93 297.98A40 40 0 0 1 275.2 249l862.57-231.12 103.79 387.33-901.2 241.48-93.44-348.7Z"/>
+		</g>
+	</g>
+	<defs>
+		<linearGradient id="c" x1="553.66" x2="720.34" y1="-11.97" y2="610.11" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#fff" stop-opacity=".25"/>
+			<stop offset="1" stop-color="#fff" stop-opacity=".1"/>
+		</linearGradient>
+		<linearGradient id="e" x1="598.16" x2="743.53" y1="38.22" y2="580.74" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#fff" stop-opacity=".25"/>
+			<stop offset="1" stop-color="#fff" stop-opacity=".1"/>
+		</linearGradient>
+		<linearGradient id="g" x1="642.67" x2="770.61" y1="88.42" y2="565.89" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#fff" stop-opacity=".25"/>
+			<stop offset="1" stop-color="#fff" stop-opacity=".1"/>
+		</linearGradient>
+		<linearGradient id="i" x1="687.18" x2="790.97" y1="138.61" y2="525.94" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#fff" stop-opacity=".25"/>
+			<stop offset="1" stop-color="#fff" stop-opacity=".1"/>
+		</linearGradient>
+		<filter id="b" width="1208.37" height="926.14" x="57.51" y="-164" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+			<feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+			<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6502"/>
+			<feBlend in="SourceGraphic" in2="effect1_backgroundBlur_15773_6502" result="shape"/>
+		</filter>
+		<filter id="d" width="1142.79" height="831.06" x="117.3" y="-106.05" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+			<feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+			<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6502"/>
+			<feBlend in="SourceGraphic" in2="effect1_backgroundBlur_15773_6502" result="shape"/>
+		</filter>
+		<filter id="f" width="1080.88" height="750.49" x="177.31" y="-48.09" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+			<feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+			<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6502"/>
+			<feBlend in="SourceGraphic" in2="effect1_backgroundBlur_15773_6502" result="shape"/>
+		</filter>
+		<filter id="h" width="1012.02" height="644.81" x="237.55" y="9.87" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+			<feGaussianBlur in="BackgroundImageFix" stdDeviation="4"/>
+			<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_15773_6502"/>
+			<feBlend in="SourceGraphic" in2="effect1_backgroundBlur_15773_6502" result="shape"/>
+		</filter>
+		<clipPath id="a">
+			<rect width="1091" height="395" fill="#fff" rx="8"/>
+		</clipPath>
+	</defs>
+</svg>
diff --git a/storybook/stories/foundations/design-language/static/wp-logo@2x.png b/storybook/stories/foundations/design-language/static/wp-logo@2x.png
new file mode 100644
index 00000000000000..a95cd961902b01
Binary files /dev/null and b/storybook/stories/foundations/design-language/static/wp-logo@2x.png differ
diff --git a/storybook/stories/playground/box/index.js b/storybook/stories/playground/box/index.js
index 444b7810e5e89e..cca522a90c1441 100644
--- a/storybook/stories/playground/box/index.js
+++ b/storybook/stories/playground/box/index.js
@@ -6,7 +6,7 @@ import { registerCoreBlocks } from '@wordpress/block-library';
 import {
 	BlockEditorProvider,
 	BlockCanvas,
-	BlockTools,
+	BlockToolbar,
 } from '@wordpress/block-editor';
 
 /**
@@ -36,8 +36,8 @@ export default function EditorBox() {
 					hasFixedToolbar: true,
 				} }
 			>
-				<BlockTools />
-				<BlockCanvas height="100%" styles={ editorStyles } />
+				<BlockToolbar hideDragHandle />
+				<BlockCanvas height="500px" styles={ editorStyles } />
 			</BlockEditorProvider>
 		</div>
 	);
diff --git a/storybook/stories/playground/fullpage/index.js b/storybook/stories/playground/fullpage/index.js
index 961c15f71f31d0..8b8c037ceb72a3 100644
--- a/storybook/stories/playground/fullpage/index.js
+++ b/storybook/stories/playground/fullpage/index.js
@@ -5,7 +5,6 @@ import { useEffect, useState } from '@wordpress/element';
 import {
 	BlockCanvas,
 	BlockEditorProvider,
-	BlockTools,
 	BlockInspector,
 } from '@wordpress/block-editor';
 import { registerCoreBlocks } from '@wordpress/block-library';
@@ -46,9 +45,9 @@ export default function EditorFullPage() {
 				<div className="playground__sidebar">
 					<BlockInspector />
 				</div>
-				<BlockTools className="playground__content">
+				<div className="playground__content">
 					<BlockCanvas height="100%" styles={ editorStyles } />
-				</BlockTools>
+				</div>
 			</BlockEditorProvider>
 		</div>
 	);
diff --git a/storybook/stories/playground/fullpage/style.lazy.scss b/storybook/stories/playground/fullpage/style.lazy.scss
index 6d28c1d3c81635..0249011c3e960e 100644
--- a/storybook/stories/playground/fullpage/style.lazy.scss
+++ b/storybook/stories/playground/fullpage/style.lazy.scss
@@ -46,19 +46,3 @@
 		display: block;
 	}
 }
-
-/**
- * Animations
- */
-
-// These keyframes should not be part of the _animations.scss mixins file.
-// Because keyframe animations can't be defined as mixins properly, they are duplicated.
-// Since hey are intended only for the editor, we add them here instead.
-@keyframes edit-post__fade-in-animation {
-	from {
-		opacity: 0;
-	}
-	to {
-		opacity: 1;
-	}
-}
diff --git a/storybook/stories/playground/index.story.js b/storybook/stories/playground/index.story.js
index f49269f37a814d..eab17455c2954e 100644
--- a/storybook/stories/playground/index.story.js
+++ b/storybook/stories/playground/index.story.js
@@ -4,6 +4,7 @@
 import EditorFullPage from './fullpage';
 import EditorBox from './box';
 import EditorWithUndoRedo from './with-undo-redo';
+import EditorZoomOut from './zoom-out';
 
 export default {
 	title: 'Playground/Block Editor',
@@ -16,10 +17,33 @@ export const _default = () => {
 	return <EditorFullPage />;
 };
 
+_default.parameters = {
+	sourceLink: 'storybook/stories/playground/fullpage/index.js',
+};
+
 export const Box = () => {
 	return <EditorBox />;
 };
 
+Box.parameters = {
+	sourceLink: 'storybook/stories/playground/box/index.js',
+};
+
 export const UndoRedo = () => {
 	return <EditorWithUndoRedo />;
 };
+
+UndoRedo.parameters = {
+	sourceLink: 'storybook/stories/playground/with-undo-redo/index.js',
+};
+
+export const ZoomOut = ( props ) => {
+	return <EditorZoomOut { ...props } />;
+};
+
+ZoomOut.parameters = {
+	sourceLink: 'storybook/stories/playground/zoom-out/index.js',
+};
+ZoomOut.argTypes = {
+	zoomLevel: { control: { type: 'range', min: 10, max: 100, step: 5 } },
+};
diff --git a/storybook/stories/playground/with-undo-redo/index.js b/storybook/stories/playground/with-undo-redo/index.js
index a51d8624282a6d..77e059247a0515 100644
--- a/storybook/stories/playground/with-undo-redo/index.js
+++ b/storybook/stories/playground/with-undo-redo/index.js
@@ -7,7 +7,7 @@ import { registerCoreBlocks } from '@wordpress/block-library';
 import {
 	BlockEditorProvider,
 	BlockCanvas,
-	BlockTools,
+	BlockToolbar,
 } from '@wordpress/block-editor';
 import { Button } from '@wordpress/components';
 import { undo as undoIcon, redo as redoIcon } from '@wordpress/icons';
@@ -49,16 +49,18 @@ export default function EditorWithUndoRedo() {
 					<Button
 						onClick={ undo }
 						disabled={ ! hasUndo }
+						accessibleWhenDisabled
 						icon={ undoIcon }
 						label="Undo"
 					/>
 					<Button
 						onClick={ redo }
 						disabled={ ! hasRedo }
+						accessibleWhenDisabled
 						icon={ redoIcon }
 						label="Redo"
 					/>
-					<BlockTools />
+					<BlockToolbar hideDragHandle />
 				</div>
 				<BlockCanvas height="100%" styles={ editorStyles } />
 			</BlockEditorProvider>
diff --git a/storybook/stories/playground/with-undo-redo/style.css b/storybook/stories/playground/with-undo-redo/style.css
index a3f0bd5d23debf..6ed082a1de7196 100644
--- a/storybook/stories/playground/with-undo-redo/style.css
+++ b/storybook/stories/playground/with-undo-redo/style.css
@@ -6,5 +6,9 @@
 	display: flex;
 	align-items: center;
 	border-bottom: 1px solid #ddd;
-	height: 48px;
+	height: 46px;
 }
+
+.editor-with-undo-redo__toolbar .components-accessible-toolbar.block-editor-block-contextual-toolbar {
+	border-bottom: none;
+}
\ No newline at end of file
diff --git a/storybook/stories/playground/zoom-out/index.js b/storybook/stories/playground/zoom-out/index.js
new file mode 100644
index 00000000000000..4f2efcf48523e8
--- /dev/null
+++ b/storybook/stories/playground/zoom-out/index.js
@@ -0,0 +1,68 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect, useState } from '@wordpress/element';
+import { registerCoreBlocks } from '@wordpress/block-library';
+import { useDispatch } from '@wordpress/data';
+import {
+	BlockEditorProvider,
+	BlockCanvas,
+	store as blockEditorStore,
+	BlockList,
+} from '@wordpress/block-editor';
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+import { parse } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import editorStyles from '../editor-styles';
+// eslint-disable-next-line @wordpress/dependency-group
+import contentCss from '!!raw-loader!../../../../packages/block-editor/build-style/content.css';
+import { pattern } from './pattern';
+
+// Temporary hack to access private APIs before stabilizing zoom level.
+const { unlock } = __dangerousOptInToUnstableAPIsOnlyForCoreModules(
+	'I acknowledge private features are not for use in themes or plugins and doing so will break in the next version of WordPress.',
+	'@wordpress/edit-site'
+);
+
+function EnableZoomOut( { zoomLevel } ) {
+	const { setZoomLevel } = unlock( useDispatch( blockEditorStore ) );
+
+	useEffect( () => {
+		setZoomLevel( zoomLevel ? zoomLevel / 100 : 'auto-scaled' );
+	}, [ setZoomLevel, zoomLevel ] );
+
+	return null;
+}
+
+export default function EditorZoomOut( { zoomLevel } ) {
+	const [ blocks, updateBlocks ] = useState( [] );
+
+	useEffect( () => {
+		registerCoreBlocks();
+		updateBlocks( parse( pattern ) );
+	}, [] );
+
+	return (
+		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
+		<div
+			className="editor-zoom-out"
+			onKeyDown={ ( event ) => event.stopPropagation() }
+			style={ { background: '#ddd', border: '1px solid gray' } }
+		>
+			<BlockEditorProvider
+				value={ blocks }
+				onInput={ updateBlocks }
+				onChange={ updateBlocks }
+			>
+				<EnableZoomOut zoomLevel={ zoomLevel } />
+				<BlockCanvas height="500px" styles={ editorStyles }>
+					<style>{ contentCss }</style>
+					<BlockList />
+				</BlockCanvas>
+			</BlockEditorProvider>
+		</div>
+	);
+}
diff --git a/storybook/stories/playground/zoom-out/pattern.js b/storybook/stories/playground/zoom-out/pattern.js
new file mode 100644
index 00000000000000..7c58486de55235
--- /dev/null
+++ b/storybook/stories/playground/zoom-out/pattern.js
@@ -0,0 +1,39 @@
+export const pattern = `<!-- wp:cover {"customOverlayColor":"#eb4c77","contentPosition":"center center","isDark":false,"align":"full","style":{"spacing":{"padding":{"top":"6vw","right":"6vw","bottom":"6vw","left":"6vw"},"margin":{"top":"0"}}}} -->
+<div class="wp-block-cover alignfull is-light" style="margin-top:0;padding-top:6vw;padding-right:6vw;padding-bottom:6vw;padding-left:6vw"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-100 has-background-dim" style="background-color:#eb4c77"></span><div class="wp-block-cover__inner-container"><!-- wp:group {"style":{"spacing":{"blockGap":"0vw"}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"center","verticalAlignment":"top"}} -->
+<div class="wp-block-group"><!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"0px"},"layout":{"selfStretch":"fill"}},"layout":{"type":"constrained","justifyContent":"left","contentSize":"600px"}} -->
+<div class="wp-block-group alignwide"><!-- wp:heading {"textAlign":"left","align":"wide","style":{"typography":{"fontSize":"100px","textTransform":"none","fontStyle":"normal","fontWeight":"500","lineHeight":"0.9"}},"textColor":"contrast"} -->
+<h2 class="wp-block-heading alignwide has-text-align-left has-contrast-color has-text-color" style="font-size:100px;font-style:normal;font-weight:500;line-height:0.9;text-transform:none">Time for an adventure</h2>
+<!-- /wp:heading -->
+
+<!-- wp:spacer {"height":"24px"} -->
+<div style="height:24px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:paragraph {"align":"left","textColor":"contrast"} -->
+<p class="has-text-align-left has-contrast-color has-text-color">Explore our network of trails that lead through a variety of woodland habitats and observe the diverse flora that call this area home. </p>
+<!-- /wp:paragraph -->
+
+<!-- wp:spacer {"height":"60px"} -->
+<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"left","flexWrap":"nowrap"}} -->
+<div class="wp-block-buttons"><!-- wp:button {"backgroundColor":"contrast","textColor":"base","style":{"spacing":{"padding":{"top":"24px","right":"48px","bottom":"24px","left":"48px"}},"typography":{"fontSize":"16px","fontStyle":"normal","fontWeight":"500","textTransform":"uppercase","letterSpacing":"0px"},"border":{"radius":"0px"}},"className":"is-style-fill"} -->
+<div class="wp-block-button has-custom-font-size is-style-fill" style="font-size:16px;font-style:normal;font-weight:500;letter-spacing:0px;text-transform:uppercase"><a class="wp-block-button__link has-base-color has-contrast-background-color has-text-color has-background wp-element-button" style="border-radius:0px;padding-top:24px;padding-right:48px;padding-bottom:24px;padding-left:48px">Sign up</a></div>
+<!-- /wp:button --></div>
+<!-- /wp:buttons --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"blockGap":"24px"}},"layout":{"type":"flex","flexWrap":"nowrap","verticalAlignment":"top","justifyContent":"right"}} -->
+<div class="wp-block-group"><!-- wp:group {"style":{"layout":{"selfStretch":"fixed","flexSize":"50%"}},"layout":{"type":"default"}} -->
+<div class="wp-block-group"><!-- wp:spacer {"height":"8vw"} -->
+<div style="height:8vw" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+</div>
+<!-- /wp:group -->
+
+</div>
+<!-- /wp:group --></div>
+<!-- /wp:group --></div></div>
+<!-- /wp:cover -->`;
diff --git a/storybook/stories/tokens/color.mdx b/storybook/stories/tokens/color.mdx
new file mode 100644
index 00000000000000..0f99303500ca96
--- /dev/null
+++ b/storybook/stories/tokens/color.mdx
@@ -0,0 +1,61 @@
+import { Meta, ColorPalette, ColorItem } from '@storybook/blocks';
+
+<Meta title="Tokens/Color" name="page" />
+
+# Color
+
+This document outlines the default color set of the WordPress component system as it ships. The page is a work in progress. 
+
+## Colors
+
+<ColorPalette>
+	<ColorItem
+		title="Black & White"
+		subtitle=""
+		colors={{
+			'$black': '#000',
+			'$white': '#fff',
+		}}
+	/>
+</ColorPalette>
+
+<ColorPalette>
+	<ColorItem
+		title="Gray Tones"
+		subtitle=""
+		colors={{
+			'$gray-900': '#1e1e1e',
+			'$gray-800': '#2f2f2f',
+			'$gray-700': '#757575',
+			'$gray-600': '#949494',
+			'$gray-400': '#ccc',
+			'$gray-300': '#ddd',
+			'$gray-200': '#e0e0e0',
+			'$gray-100': '#f0f0f0',
+		}}
+	/>
+</ColorPalette>
+
+<ColorPalette>
+	<ColorItem
+		title="Alert colors"
+		subtitle=""
+		colors={{
+			'$alert-yellow': '#f0b849',
+			'$alert-red': '#cc1818',
+			'$alert-green': '#4ab866',
+		}}
+	/>
+</ColorPalette>
+
+## Contrast
+
+Ensure proper contrast is met between text, icons, UI, and backgrounds. Text needs to meet a 4.5:1 ratio to meet AA standards, while large text (16px+) and UI elements (borders, etc.) need to meet a 3:1 ratio. In this section is a list of tokens you can use to meet these criteria.
+
+Against a white background:
+
+* **Gray 700**\
+Meets 4.6:1, lightest gray you can use and meet 4.5:1 text contrast.
+
+* **Gray 600**\
+Lightest gray you can use and meet 3:1 UI contrast.
diff --git a/storybook/stories/tokens/components.tsx b/storybook/stories/tokens/components.tsx
new file mode 100644
index 00000000000000..1144bc10d625d3
--- /dev/null
+++ b/storybook/stories/tokens/components.tsx
@@ -0,0 +1,53 @@
+/**
+ * External dependencies
+ */
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+import React from 'react';
+
+export const TokensTable = ( { tokenCategory, tokens, applyTokenStyle } ) => {
+	return (
+		<table style={ { width: '100%' } }>
+			<thead>
+				<tr>
+					<th>Token</th>
+					<th>Value</th>
+					<th>Example</th>
+				</tr>
+			</thead>
+			<tbody>
+				{ tokens.map( ( { name, valueShow, valueCode } ) => (
+					<tr key={ name }>
+						<td style={ { whiteSpace: 'nowrap' } }>{ name }</td>
+						<td>
+							<code
+								style={ {
+									lineHeight: 1,
+									margin: '0 2px',
+									padding: '3px 5px',
+									borderRadius: '3px',
+									fontSize: '13px',
+									border: '1px solid #ECF4F9',
+									color: 'rgba(46, 52, 56, 0.9)',
+									backgroundColor: '#F7FAFC',
+								} }
+							>
+								{ valueShow }
+							</code>
+						</td>
+						<td style={ { padding: '24px' } }>
+							<div
+								aria-label={ `A shape showing an example of the '${ name }' ${ tokenCategory } token` }
+								style={ {
+									width: '100px',
+									height: '100px',
+									background: 'white',
+									...applyTokenStyle( valueCode ),
+								} }
+							></div>
+						</td>
+					</tr>
+				) ) }
+			</tbody>
+		</table>
+	);
+};
diff --git a/storybook/stories/tokens/elevation.mdx b/storybook/stories/tokens/elevation.mdx
new file mode 100644
index 00000000000000..5afb7e75266c4a
--- /dev/null
+++ b/storybook/stories/tokens/elevation.mdx
@@ -0,0 +1,90 @@
+import { Meta } from '@storybook/addon-docs/blocks';
+import { TokensTable } from './components.tsx';
+
+<Meta title="Tokens/Elevation" name="page" />
+
+# Elevation tokens
+
+This document outlines the various tokens relating to [elevation](?path=/docs/foundations-design-language-elevation--page) in the WordPress design system.
+
+## Values
+
+Tokens can be used in different ways, but regardless of which method is used, each one is meant to be used as the value of the CSS `box-shadow` property, and references the following values:
+
+<TokensTable
+	tokenCategory="elevation"
+	tokens={ [
+		{
+			name: 'Extra small',
+			valueShow:
+				'0 1px 1px rgba($black, 0.03), 0 1px 2px rgba($black, 0.02), 0 3px 3px rgba($black, 0.02), 0 4px 4px rgba($black, 0.01)',
+			valueCode:
+				'0 1px 1px rgba(0, 0, 0, 0.03), 0 1px 2px rgba(0, 0, 0, 0.02), 0 3px 3px rgba(0, 0, 0, 0.02), 0 4px 4px rgba(0, 0, 0, 0.01)',
+		},
+		{
+			name: 'Small',
+			valueShow:
+				'0 1px 2px rgba($black, 0.05), 0 2px 3px rgba($black, 0.04), 0 6px 6px rgba($black, 0.03), 0 8px 8px rgba($black, 0.02)',
+			valueCode:
+				'0 1px 2px rgba(0, 0, 0, 0.05), 0 2px 3px rgba(0, 0, 0, 0.04), 0 6px 6px rgba(0, 0, 0, 0.03), 0 8px 8px rgba(0, 0, 0, 0.02)',
+		},
+		{
+			name: 'Medium',
+			valueShow:
+				'0 2px 3px rgba($black, 0.05), 0 4px 5px rgba($black, 0.04), 0 12px 12px rgba($black, 0.03), 0 16px 16px rgba($black, 0.02)',
+			valueCode:
+				'0 2px 3px rgba(0, 0, 0, 0.05), 0 4px 5px rgba(0, 0, 0, 0.04), 0 12px 12px rgba(0, 0, 0, 0.03), 0 16px 16px rgba(0, 0, 0, 0.02)',
+		},
+		{
+			name: 'Large',
+			valueShow:
+				'0 5px 15px rgba($black, 0.08), 0 15px 27px rgba($black, 0.07), 0 30px 36px rgba($black, 0.04), 0 50px 43px rgba($black, 0.02)',
+			valueCode:
+				'0 5px 15px rgba(0, 0, 0, 0.08), 0 15px 27px rgba(0, 0, 0, 0.07), 0 30px 36px rgba(0, 0, 0, 0.04), 0 50px 43px rgba(0, 0, 0, 0.02)',
+		},
+	] }
+	applyTokenStyle={ ( valueCode ) => ( { boxShadow: valueCode } ) }
+/>
+
+## CSS tokens
+
+Elevation tokens are defined as SASS variables:
+
+-   `$elevation-x-small`
+-   `$elevation-small`
+-   `$elevation-medium`
+-   `$elevation-large`
+
+They can be used like so:
+
+```css
+.elevation-extra-small {
+	box-shadow: $elevation-x-small;
+}
+.elevation-small {
+	box-shadow: $elevation-small;
+}
+.elevation-medium {
+	box-shadow: $elevation-medium;
+}
+.elevation-large {
+	box-shadow: $elevation-large;
+}
+```
+
+## JS tokens
+
+When working in the `@wordpress/components` package, the elevation tokens can also be consumed as JavaScript variables via the `CONFIG` object found in the `packages/components/src/utils/index.js` file:
+
+-   `CONFIG.elevationXSmall`
+-   `CONFIG.elevationSmall`
+-   `CONFIG.elevationMedium`
+-   `CONFIG.elevationLarge`
+
+```js
+// Note: the `CONFIG` object is only available within the `@wordpress/components` package.
+import { CONFIG } from '../utils';
+
+// Later in the code:
+box-shadow: ${ CONFIG.elevationXSmall };
+```
diff --git a/storybook/stories/tokens/radius.mdx b/storybook/stories/tokens/radius.mdx
new file mode 100644
index 00000000000000..49eeb4a3c312b9
--- /dev/null
+++ b/storybook/stories/tokens/radius.mdx
@@ -0,0 +1,105 @@
+import { Meta } from '@storybook/blocks';
+import { TokensTable } from './components.tsx';
+
+<Meta title="Tokens/Radius" name="page" />
+
+# Radius
+
+This document outlines the various tokens relating to radius in the WordPress design system.
+
+## Values
+
+Tokens can be used in different ways, but regardless of which method is used, each one is meant to be used as the value of the CSS `border-radius` property, and references the following values:
+
+<TokensTable
+	tokenCategory="radius"
+	tokens={ [
+		{
+			name: 'Extra small',
+			valueShow: '1px',
+			valueCode: '1px',
+		},
+		{
+			name: 'Small',
+			valueShow: '2px',
+			valueCode: '2px',
+		},
+		{
+			name: 'Medium',
+			valueShow: '4px',
+			valueCode: '4px',
+		},
+		{
+			name: 'Large',
+			valueShow: '8px',
+			valueCode: '8px',
+		},
+		{
+			name: 'Full',
+			valueShow: '9999px',
+			valueCode: '9999px',
+		},
+		{
+			name: 'Round',
+			valueShow: '100%',
+			valueCode: '100%',
+		},
+	] }
+	applyTokenStyle={ ( valueCode ) => ( {
+		borderRadius: valueCode,
+		border: '1px solid #1e1e1e',
+	} ) }
+/>
+
+## CSS tokens
+
+Radius tokens are defined as SASS variables:
+
+-   `$radius-x-small`
+-   `$radius-small`
+-   `$radius-medium`
+-   `$radius-large`
+-   `$radius-full`
+-   `$radius-round`
+
+They can be used like so:
+
+```css
+.radius-extra-small {
+	border-radius: $radius-x-small;
+}
+.radius-small {
+	border-radius: $radius-small;
+}
+.radius-medium {
+	border-radius: $radius-medium;
+}
+.radius-large {
+	border-radius: $radius-large;
+}
+.radius-full {
+	border-radius: $radius-full;
+}
+.radius-round {
+	border-radius: $radius-round;
+}
+```
+
+## JS tokens
+
+When working in the `@wordpress/components` package, the radius tokens can also be consumed as JavaScript variables via the `CONFIG` object found in the `packages/components/src/utils/index.js` file:
+
+-   `CONFIG.radiusXSmall`
+-   `CONFIG.radiusSmall`
+-   `CONFIG.radiusMedium`
+-   `CONFIG.radiusLarge`
+-   `CONFIG.radiusFull`
+-   `CONFIG.radiusRound`
+
+```js
+// Note: the `CONFIG` object is only available within the `@wordpress/components` package.
+import { CONFIG } from '../utils';
+
+// Later in the code:
+border-radius: ${ CONFIG.radiusXSmall };
+```
diff --git a/storybook/stories/tokens/typography.mdx b/storybook/stories/tokens/typography.mdx
new file mode 100644
index 00000000000000..c3b49b2865f186
--- /dev/null
+++ b/storybook/stories/tokens/typography.mdx
@@ -0,0 +1,178 @@
+import { Meta, Typeset } from '@storybook/addon-docs/blocks';
+
+<Meta title="Tokens/Typography" name="page" />
+ 
+export const typography = {
+	type: {
+		primary: '-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif',
+	},
+	weight: {
+		regular: '400',
+		medium: '500',
+	},
+	size: {
+		s1: 11,
+		s2: 12,
+		s3: 13,
+		s4: 15,
+		s5: 20,
+		s6: 32,
+	},
+};
+ 
+export const SampleTextHeading = 'Code is Poetry.';
+export const SampleTextParagraph = 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users.'
+ 
+# Typography tokens
+
+This document outlines the various tokens relating to typography in the WordPress components system.
+
+## Semantic tokens
+
+Semantic tokens compose primitive tokens to create reusable type styles enhancing consistency across the software.
+
+They are defined as SASS mixins and can be used like so:
+
+```css
+.my-component {
+	@include heading-large();
+}
+```
+
+### Headings
+
+<Typeset
+	fontSizes={[
+		Number(typography.size.s6),
+		Number(typography.size.s5),
+		Number(typography.size.s4),
+		Number(typography.size.s3),
+		Number(typography.size.s2),
+		Number(typography.size.s1),
+	]}
+	fontWeight={typography.weight.medium}
+	sampleText={SampleTextHeading}
+	fontFamily={typography.type.primary}
+/>
+
+<table>
+	<thead>
+		<tr>
+			<th>Style</th>
+			<th>Primitives</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>heading-2x-large</td>
+			<td>`$font-family-headings`, `font-weight-medium`, `font-size-2x-large`, `line-height-2x-large`</td>
+		</tr>
+		<tr>
+			<td>heading-x-large</td>
+			<td>`$font-family-headings`, `font-weight-medium`, `font-size-x-large`, `line-height-medium`</td>
+		</tr>
+		<tr>
+			<td>heading-large</td>
+			<td>`$font-family-headings`, `font-weight-medium`, `font-size-large`, `line-height-small`</td>
+		</tr>
+		<tr>
+			<td>heading-medium</td>
+			<td>`$font-family-headings`, `font-weight-medium`, `font-size-medium`, `line-height-small`</td>
+		</tr>
+		<tr>
+			<td>heading-small</td>
+			<td>`$font-family-headings`, `font-weight-medium`, `font-size-x-small`, `line-height-x-small`</td>
+		</tr>
+	</tbody>
+</table>
+
+### Body
+
+<Typeset
+	fontSizes={[
+		Number(typography.size.s5),
+		Number(typography.size.s4),
+		Number(typography.size.s3),
+		Number(typography.size.s2),
+	]}
+	fontWeight={typography.weight.regular}
+	sampleText={SampleTextParagraph}
+	fontFamily={typography.type.primary}
+/>
+
+<table>
+	<thead>
+		<tr>
+			<th>Style</th>
+			<th>Primitives</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>body-x-large</td>
+			<td>`$font-family-body`, `font-weight-regular`, `font-size-x-large`, `line-height-x-large`</td>
+		</tr>
+		<tr>
+			<td>body-large</td>
+			<td>`$font-family-body`, `font-weight-regular`, `font-size-large`, `line-height-medium`</td>
+		</tr>
+		<tr>
+			<td>body-medium</td>
+			<td>`$font-family-body`, `font-weight-regular`, `font-size-medium`, `line-height-small`</td>
+		</tr>
+		<tr>
+			<td>body-small</td>
+			<td>`$font-family-body`, `font-weight-regular`, `font-size-small`, `line-height-x-small`</td>
+		</tr>
+	</tbody>
+</table>
+
+## Primitive tokens
+ 
+Primitive tokens are organized into 4 sets relating to `size`, `line-height`, `weight`, and `family`, defined as SASS variables.
+
+### Size
+```css
+$font-size-x-small: 11px;
+$font-size-small: 12px;
+$font-size-medium: 13px;
+$font-size-large: 15px;
+$font-size-x-large: 20px;
+$font-size-2x-large: 32px;
+```
+
+### Line-height
+
+```css
+$font-line-height-x-small: 16px;
+$font-line-height-small: 20px;
+$font-line-height-medium: 24px;
+$font-line-height-large: 28px;
+$font-line-height-x-large: 32px;
+$font-line-height-2x-large: 40px;
+```
+
+### Weight
+
+```css
+$font-weight-regular: 400;
+$font-weight-medium: 500;
+```
+
+### Families
+
+```css
+$font-family-headings: -apple-system, "system-ui", "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+$font-family-body: -apple-system, "system-ui", "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+$font-family-mono: Menlo, Consolas, monaco, monospace;
+```
+
+Generally use of semantic tokens is encouraged, but it is possible to create ad hoc styles by referencing primitives, for example:
+
+```css
+.my-type-style {
+	font-family: $font-family-headings;
+	line-height: $font-line-height-x-small;
+	font-weight: $font-weight-regular;
+}
+```
diff --git a/storybook/theme.js b/storybook/theme.js
index c13de5b53d4f53..9e340119eb48f8 100644
--- a/storybook/theme.js
+++ b/storybook/theme.js
@@ -6,6 +6,37 @@ import { create } from '@storybook/theming/create';
 export default create( {
 	base: 'light',
 	brandTitle: 'WordPress Components',
-	brandImage:
-		'https://s.w.org/style/images/about/WordPress-logotype-wmark.png',
+	brandImage: './wp-logo@2x.png',
+
+	// Typography
+	fontBase:
+		'-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif',
+	fontCode: 'monospace',
+
+	//
+	colorPrimary: '#3858E9',
+	colorSecondary: '#3858E9',
+
+	// UI
+	appBg: '#ffffff',
+	appContentBg: '#ffffff',
+	appPreviewBg: '#ffffff',
+	appBorderColor: '#DCDCDE',
+	appBorderRadius: 4,
+
+	// Text colors
+	textColor: '#10162F',
+	textInverseColor: '#ffffff',
+
+	// Toolbar default and active colors
+	barTextColor: '#9E9E9E',
+	barSelectedColor: '#3858E9',
+	barHoverColor: '#3858E9',
+	barBg: '#ffffff',
+
+	// Form colors
+	inputBg: '#ffffff',
+	inputBorder: '#10162F',
+	inputTextColor: '#10162F',
+	inputBorderRadius: 2,
 } );
diff --git a/storybook/webpack/copy-tags-to-badges.js b/storybook/webpack/copy-tags-to-badges.js
new file mode 100644
index 00000000000000..07dc068135cc5f
--- /dev/null
+++ b/storybook/webpack/copy-tags-to-badges.js
@@ -0,0 +1,71 @@
+/**
+ * External dependencies
+ */
+const babel = require( '@babel/core' );
+
+/**
+ * Reads `tags` from the story metadata and copies them to `badges`.
+ *
+ * @see https://github.com/geometricpanda/storybook-addon-badges
+ * @see '../badges.js' - Badges config
+ */
+function copyTagsToBadgePlugin() {
+	return {
+		visitor: {
+			ExportDefaultDeclaration( visitorPath ) {
+				const properties =
+					// When default export is anonymous, the declaration is an object expression
+					visitorPath.node?.declaration.properties ??
+					// When default export is named, the declaration is an identifier, usually the previous node
+					visitorPath.getPrevSibling().node.declarations[ 0 ].init
+						.properties;
+
+				alterParameters( properties );
+			},
+		},
+	};
+}
+
+function alterParameters( properties ) {
+	const STATUS_PREFIX = 'status-';
+
+	const tags =
+		properties
+			.find( ( op ) => op.key.name === 'tags' )
+			?.value.elements.map( ( tag ) => tag.value ) ?? [];
+	const statusTags = tags.filter( ( tag ) =>
+		tag.startsWith( STATUS_PREFIX )
+	);
+
+	const badges = babel.types.objectProperty(
+		babel.types.identifier( 'badges' ),
+		babel.types.arrayExpression(
+			statusTags.map( ( tag ) =>
+				babel.types.stringLiteral(
+					tag.substring( STATUS_PREFIX.length )
+				)
+			)
+		)
+	);
+
+	let parameters = properties.find( ( op ) => op.key.name === 'parameters' );
+
+	if ( ! parameters ) {
+		parameters = babel.types.objectProperty(
+			babel.types.identifier( 'parameters' ),
+			babel.types.objectExpression( [] )
+		);
+		properties.push( parameters );
+	}
+
+	parameters.value.properties = [ badges, ...parameters.value.properties ];
+}
+
+module.exports = function ( source ) {
+	const output = babel.transform( source, {
+		plugins: [ copyTagsToBadgePlugin ],
+		filename: this.resourcePath,
+		sourceType: 'module',
+	} );
+	return output.code;
+};
diff --git a/test/e2e/assets/Exo2-Regular.woff b/test/e2e/assets/Exo2-Regular.woff
new file mode 100644
index 00000000000000..15077e740383f6
Binary files /dev/null and b/test/e2e/assets/Exo2-Regular.woff differ
diff --git a/test/e2e/assets/Exo2-SemiBoldItalic.woff2 b/test/e2e/assets/Exo2-SemiBoldItalic.woff2
new file mode 100644
index 00000000000000..d8f26bc4217549
Binary files /dev/null and b/test/e2e/assets/Exo2-SemiBoldItalic.woff2 differ
diff --git a/test/e2e/playwright.config.ts b/test/e2e/playwright.config.ts
index cbbfbac3be4159..f5410f2230372b 100644
--- a/test/e2e/playwright.config.ts
+++ b/test/e2e/playwright.config.ts
@@ -33,7 +33,7 @@ const config = defineConfig( {
 				 * Headless webkit won't receive dataTransfer with custom types in the
 				 * drop event on Linux. The solution is to use `xvfb-run` to run the tests.
 				 * ```sh
-				 * xvfb-run npm run test:e2e:playwright
+				 * xvfb-run npm run test:e2e
 				 * ```
 				 * See `.github/workflows/end2end-test-playwright.yml` for advanced usages.
 				 */
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Code-should-paste-plain-text-1-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Code-should-paste-plain-text-1-chromium.txt
index 7c76778feef435..47b54e7c964053 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Code-should-paste-plain-text-1-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Code-should-paste-plain-text-1-chromium.txt
@@ -1,3 +1,4 @@
 <!-- wp:code -->
-<pre class="wp-block-code"><code>&lt;img /><br>	&lt;br></code></pre>
+<pre class="wp-block-code"><code>&lt;img />
+	&lt;br></code></pre>
 <!-- /wp:code -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-a-caption-to-be-added-1-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-a-caption-to-be-added-1-chromium.txt
index 144b62e5e5341f..cf4c71986ba857 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-a-caption-to-be-added-1-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-a-caption-to-be-added-1-chromium.txt
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td></td><td></td></tr><tr><td></td><td></td></tr></tbody></table><figcaption class="wp-element-caption">Caption!</figcaption></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td></td><td></td></tr><tr><td></td><td></td></tr></tbody></table><figcaption class="wp-element-caption">Caption!</figcaption></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-adding-and-deleting-columns-across-the-table-header-body-and-footer-1-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-adding-and-deleting-columns-across-the-table-header-body-and-footer-1-chromium.txt
index 12024dcd6a8a09..c29304a4c7480e 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-adding-and-deleting-columns-across-the-table-header-body-and-footer-1-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-adding-and-deleting-columns-across-the-table-header-body-and-footer-1-chromium.txt
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><thead><tr><th></th><th></th><th></th></tr></thead><tbody><tr><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td></tr></tbody><tfoot><tr><td></td><td></td><td></td></tr></tfoot></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th></th><th></th><th></th></tr></thead><tbody><tr><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td></tr></tbody><tfoot><tr><td></td><td></td><td></td></tr></tfoot></table></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-adding-and-deleting-columns-across-the-table-header-body-and-footer-2-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-adding-and-deleting-columns-across-the-table-header-body-and-footer-2-chromium.txt
index 867cde963258b7..c17f3e08254169 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-adding-and-deleting-columns-across-the-table-header-body-and-footer-2-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-adding-and-deleting-columns-across-the-table-header-body-and-footer-2-chromium.txt
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><thead><tr><th></th><th></th></tr></thead><tbody><tr><td></td><td></td></tr><tr><td></td><td></td></tr></tbody><tfoot><tr><td></td><td></td></tr></tfoot></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th></th><th></th></tr></thead><tbody><tr><td></td><td></td></tr><tr><td></td><td></td></tr></tbody><tfoot><tr><td></td><td></td></tr></tfoot></table></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-cells-to-be-selected-when-the-cell-area-outside-of-the-RichText-is-clicked-1-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-cells-to-be-selected-when-the-cell-area-outside-of-the-RichText-is-clicked-1-chromium.txt
index 6be90e739c1bb5..06a2ec73cd7e92 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-cells-to-be-selected-when-the-cell-area-outside-of-the-RichText-is-clicked-1-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-cells-to-be-selected-when-the-cell-area-outside-of-the-RichText-is-clicked-1-chromium.txt
@@ -1,3 +1,3 @@
-<!-- wp:table {"hasFixedLayout":true} -->
+<!-- wp:table -->
 <figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td><br><br><br><br></td><td>Second cell.</td></tr><tr><td></td><td></td></tr></tbody></table></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-columns-to-be-aligned-1-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-columns-to-be-aligned-1-chromium.txt
index 6986d5c5b54cd5..fbc0a773057dc4 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-columns-to-be-aligned-1-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-columns-to-be-aligned-1-chromium.txt
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>None</td><td class="has-text-align-left" data-align="left">To the left</td><td class="has-text-align-center" data-align="center">Centered</td><td class="has-text-align-right" data-align="right">Right aligned</td></tr><tr><td></td><td class="has-text-align-left" data-align="left"></td><td class="has-text-align-center" data-align="center"></td><td class="has-text-align-right" data-align="right"></td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>None</td><td class="has-text-align-left" data-align="left">To the left</td><td class="has-text-align-center" data-align="center">Centered</td><td class="has-text-align-right" data-align="right">Right aligned</td></tr><tr><td></td><td class="has-text-align-left" data-align="left"></td><td class="has-text-align-center" data-align="center"></td><td class="has-text-align-right" data-align="right"></td></tr></tbody></table></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-header-and-footer-rows-to-be-switched-on-and-off-1-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-header-and-footer-rows-to-be-switched-on-and-off-1-chromium.txt
index 467ab42d768051..1d20e6018be8d6 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-header-and-footer-rows-to-be-switched-on-and-off-1-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-header-and-footer-rows-to-be-switched-on-and-off-1-chromium.txt
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><thead><tr><th>header</th><th></th></tr></thead><tbody><tr><td>body</td><td></td></tr><tr><td></td><td></td></tr></tbody><tfoot><tr><td>footer</td><td></td></tr></tfoot></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th>header</th><th></th></tr></thead><tbody><tr><td>body</td><td></td></tr><tr><td></td><td></td></tr></tbody><tfoot><tr><td>footer</td><td></td></tr></tfoot></table></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-header-and-footer-rows-to-be-switched-on-and-off-2-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-header-and-footer-rows-to-be-switched-on-and-off-2-chromium.txt
index 0aa0e667b7141d..8fbd8207d2f1a4 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-header-and-footer-rows-to-be-switched-on-and-off-2-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-header-and-footer-rows-to-be-switched-on-and-off-2-chromium.txt
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>body</td><td></td></tr><tr><td></td><td></td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>body</td><td></td></tr><tr><td></td><td></td></tr></tbody></table></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-text-to-by-typed-into-cells-1-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-text-to-by-typed-into-cells-1-chromium.txt
index adce67703575d2..80c17e6de4f55f 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-text-to-by-typed-into-cells-1-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-allows-text-to-by-typed-into-cells-1-chromium.txt
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>This</td><td>is</td></tr><tr><td>table</td><td>block</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>This</td><td>is</td></tr><tr><td>table</td><td>block</td></tr></tbody></table></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-displays-a-form-for-choosing-the-row-and-column-count-of-the-table-1-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-displays-a-form-for-choosing-the-row-and-column-count-of-the-table-1-chromium.txt
index 39b6f395f28ada..3688278430c929 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-displays-a-form-for-choosing-the-row-and-column-count-of-the-table-1-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-displays-a-form-for-choosing-the-row-and-column-count-of-the-table-1-chromium.txt
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr></tbody></table></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/__snapshots__/Table-up-and-down-arrow-navigation-1-chromium.txt b/test/e2e/specs/editor/blocks/__snapshots__/Table-up-and-down-arrow-navigation-1-chromium.txt
index ea42038e553f94..9c0a994f5d294d 100644
--- a/test/e2e/specs/editor/blocks/__snapshots__/Table-up-and-down-arrow-navigation-1-chromium.txt
+++ b/test/e2e/specs/editor/blocks/__snapshots__/Table-up-and-down-arrow-navigation-1-chromium.txt
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>1</td><td>4</td></tr><tr><td>2</td><td>3</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>1</td><td>4</td></tr><tr><td>2</td><td>3</td></tr></tbody></table></figure>
 <!-- /wp:table -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/blocks/buttons.spec.js b/test/e2e/specs/editor/blocks/buttons.spec.js
index dcddfca2b5b284..d6b0a0a15c4ea2 100644
--- a/test/e2e/specs/editor/blocks/buttons.spec.js
+++ b/test/e2e/specs/editor/blocks/buttons.spec.js
@@ -60,7 +60,7 @@ test.describe( 'Buttons', () => {
 		).toBeFocused();
 		await pageUtils.pressKeys( 'primary+k' );
 		await expect(
-			page.locator( 'role=combobox[name="Link"i]' )
+			page.locator( 'role=combobox[name="Search or type URL"i]' )
 		).toBeFocused();
 		await page.keyboard.press( 'Escape' );
 		await expect(
@@ -91,7 +91,7 @@ test.describe( 'Buttons', () => {
 		).toBeFocused();
 		await pageUtils.pressKeys( 'primary+k' );
 		await expect(
-			page.locator( 'role=combobox[name="Link"i]' )
+			page.locator( 'role=combobox[name="Search or type URL"i]' )
 		).toBeFocused();
 		await page.keyboard.type( 'https://example.com' );
 		await page.keyboard.press( 'Enter' );
@@ -123,7 +123,9 @@ test.describe( 'Buttons', () => {
 		).toBeFocused();
 		await pageUtils.pressKeys( 'primary+k' );
 
-		const urlInput = page.locator( 'role=combobox[name="Link"i]' );
+		const urlInput = page.locator(
+			'role=combobox[name="Search or type URL"i]'
+		);
 
 		await expect( urlInput ).toBeFocused();
 		await page.keyboard.type( 'example.com' );
@@ -289,11 +291,11 @@ test.describe( 'Buttons', () => {
 			`role=region[name="Editor settings"i] >> role=tab[name="Styles"i]`
 		);
 		await page.click(
-			'role=region[name="Editor settings"i] >> role=button[name="Color Text styles"i]'
+			'role=region[name="Editor settings"i] >> role=button[name="Text"i]'
 		);
 		await page.click( 'role=option[name="Color: Cyan bluish gray"i]' );
 		await page.click(
-			'role=region[name="Editor settings"i] >> role=button[name="Color Background styles"i]'
+			'role=region[name="Editor settings"i] >> role=button[name="Background"i]'
 		);
 		await page.click( 'role=option[name="Color: Vivid red"i]' );
 
@@ -318,13 +320,13 @@ test.describe( 'Buttons', () => {
 			`role=region[name="Editor settings"i] >> role=tab[name="Styles"i]`
 		);
 		await page.click(
-			'role=region[name="Editor settings"i] >> role=button[name="Color Text styles"i]'
+			'role=region[name="Editor settings"i] >> role=button[name="Text"i]'
 		);
 		await page.click( 'role=button[name="Custom color picker."i]' );
 		await page.fill( 'role=textbox[name="Hex color"i]', 'ff0000' );
 
 		await page.click(
-			'role=region[name="Editor settings"i] >> role=button[name="Color Background styles"i]'
+			'role=region[name="Editor settings"i] >> role=button[name="Background"i]'
 		);
 		await page.click( 'role=button[name="Custom color picker."i]' );
 		await page.fill( 'role=textbox[name="Hex color"i]', '00ff00' );
@@ -353,7 +355,7 @@ test.describe( 'Buttons', () => {
 			`role=region[name="Editor settings"i] >> role=tab[name="Styles"i]`
 		);
 		await page.click(
-			'role=region[name="Editor settings"i] >> role=button[name="Color Background styles"i]'
+			'role=region[name="Editor settings"i] >> role=button[name="Background"i]'
 		);
 		await page.click( 'role=tab[name="Gradient"i]' );
 		await page.click( 'role=option[name="Gradient: Purple to yellow"i]' );
@@ -382,7 +384,7 @@ test.describe( 'Buttons', () => {
 			`role=region[name="Editor settings"i] >> role=tab[name="Styles"i]`
 		);
 		await page.click(
-			'role=region[name="Editor settings"i] >> role=button[name="Color Background styles"i]'
+			'role=region[name="Editor settings"i] >> role=button[name="Background"i]'
 		);
 		await page.click( 'role=tab[name="Gradient"i]' );
 		await page.click(
@@ -405,4 +407,80 @@ test.describe( 'Buttons', () => {
 <!-- /wp:buttons -->`
 		);
 	} );
+
+	test.describe( 'Block transforms', () => {
+		test.describe( 'FROM paragraph', () => {
+			test( 'should preserve the content', async ( { editor } ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'initial content',
+					},
+				} );
+				await editor.transformBlockTo( 'core/buttons' );
+				const buttonBlock = ( await editor.getBlocks() )[ 0 ]
+					.innerBlocks[ 0 ];
+				expect( buttonBlock.name ).toBe( 'core/button' );
+				expect( buttonBlock.attributes.text ).toBe( 'initial content' );
+			} );
+
+			test( 'should preserve the metadata attribute', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'initial content',
+						metadata: {
+							name: 'Custom name',
+						},
+					},
+				} );
+
+				await editor.transformBlockTo( 'core/buttons' );
+				const buttonBlock = ( await editor.getBlocks() )[ 0 ]
+					.innerBlocks[ 0 ];
+				expect( buttonBlock.name ).toBe( 'core/button' );
+				expect( buttonBlock.attributes.metadata ).toMatchObject( {
+					name: 'Custom name',
+				} );
+			} );
+
+			test( 'should preserve the block bindings', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'initial content',
+						metadata: {
+							bindings: {
+								content: {
+									source: 'core/post-meta',
+									args: {
+										key: 'custom_field',
+									},
+								},
+							},
+						},
+					},
+				} );
+
+				await editor.transformBlockTo( 'core/buttons' );
+				const buttonBlock = ( await editor.getBlocks() )[ 0 ]
+					.innerBlocks[ 0 ];
+				expect( buttonBlock.name ).toBe( 'core/button' );
+				expect(
+					buttonBlock.attributes.metadata.bindings
+				).toMatchObject( {
+					text: {
+						source: 'core/post-meta',
+						args: {
+							key: 'custom_field',
+						},
+					},
+				} );
+			} );
+		} );
+	} );
 } );
diff --git a/test/e2e/specs/editor/blocks/code.spec.js b/test/e2e/specs/editor/blocks/code.spec.js
index 6abfb15d10b83b..ba5af46f69cfd5 100644
--- a/test/e2e/specs/editor/blocks/code.spec.js
+++ b/test/e2e/specs/editor/blocks/code.spec.js
@@ -46,4 +46,120 @@ test.describe( 'Code', () => {
 
 		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
 	} );
+
+	test.describe( 'Block transforms', () => {
+		test.describe( 'FROM paragraph', () => {
+			test( 'should preserve the content', async ( { editor } ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'initial content',
+					},
+				} );
+				await editor.transformBlockTo( 'core/code' );
+				const codeBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( codeBlock.name ).toBe( 'core/code' );
+				expect( codeBlock.attributes.content ).toBe(
+					'initial content'
+				);
+			} );
+
+			test( 'should preserve the metadata name attribute', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'initial content',
+						metadata: {
+							name: 'Custom name',
+						},
+					},
+				} );
+
+				await editor.transformBlockTo( 'core/code' );
+				const codeBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( codeBlock.name ).toBe( 'core/code' );
+				expect( codeBlock.attributes.metadata ).toMatchObject( {
+					name: 'Custom name',
+				} );
+			} );
+		} );
+
+		test.describe( 'FROM HTML', () => {
+			test( 'should preserve the content', async ( { editor } ) => {
+				await editor.insertBlock( {
+					name: 'core/html',
+					attributes: {
+						content: 'initial content',
+					},
+				} );
+				await editor.transformBlockTo( 'core/code' );
+				const codeBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( codeBlock.name ).toBe( 'core/code' );
+				expect( codeBlock.attributes.content ).toBe(
+					'initial content'
+				);
+			} );
+
+			test( 'should preserve the metadata name attribute', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/html',
+					attributes: {
+						content: 'initial content',
+						metadata: {
+							name: 'Custom name',
+						},
+					},
+				} );
+
+				await editor.transformBlockTo( 'core/code' );
+				const codeBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( codeBlock.name ).toBe( 'core/code' );
+				expect( codeBlock.attributes.metadata ).toMatchObject( {
+					name: 'Custom name',
+				} );
+			} );
+		} );
+
+		test.describe( 'TO paragraph', () => {
+			test( 'should preserve the content', async ( { editor } ) => {
+				await editor.insertBlock( {
+					name: 'core/code',
+					attributes: {
+						content: 'initial content',
+					},
+				} );
+				await editor.transformBlockTo( 'core/paragraph' );
+				const codeBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( codeBlock.name ).toBe( 'core/paragraph' );
+				expect( codeBlock.attributes.content ).toBe(
+					'initial content'
+				);
+			} );
+
+			test( 'should preserve the metadata name attribute', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/code',
+					attributes: {
+						content: 'initial content',
+						metadata: {
+							name: 'Custom name',
+						},
+					},
+				} );
+
+				await editor.transformBlockTo( 'core/paragraph' );
+				const codeBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( codeBlock.name ).toBe( 'core/paragraph' );
+				expect( codeBlock.attributes.metadata ).toMatchObject( {
+					name: 'Custom name',
+				} );
+			} );
+		} );
+	} );
 } );
diff --git a/test/e2e/specs/editor/blocks/columns.spec.js b/test/e2e/specs/editor/blocks/columns.spec.js
index bcb23c9a240991..eea6e321aacb11 100644
--- a/test/e2e/specs/editor/blocks/columns.spec.js
+++ b/test/e2e/specs/editor/blocks/columns.spec.js
@@ -33,14 +33,12 @@ test.describe( 'Columns', () => {
 			.first()
 			.click();
 
-		// Toggle Block inserter
-		await page
-			.locator( 'role=button[name="Toggle block inserter"i]' )
-			.click();
+		// Block Inserter
+		await page.locator( 'role=button[name="Block Inserter"i]' ).click();
 
 		// Verify Column
 		const inserterOptions = page.locator(
-			'role=region[name="Block Library"i] >> role=option'
+			'role=region[name="Block Library"i] >> .block-editor-inserter__insertable-blocks-at-selection >> role=option'
 		);
 		await expect( inserterOptions ).toHaveCount( 1 );
 		await expect( inserterOptions ).toHaveText( 'Column' );
@@ -175,6 +173,75 @@ test.describe( 'Columns', () => {
 		] );
 	} );
 
+	test.describe( 'should update the column widths correctly', () => {
+		const initialColumnWidths = [ '10%', '20%', '30%', '40%' ];
+
+		const expected = [
+			{
+				newColumnCount: 2,
+				newColumnWidths: [ '33.33%', '66.67%' ],
+			},
+			{
+				newColumnCount: 3,
+				newColumnWidths: [ '16.67%', '33.33%', '50%' ],
+			},
+			{
+				newColumnCount: 5,
+				newColumnWidths: [ '8%', '16%', '24%', '32%', '20%' ],
+			},
+			{
+				newColumnCount: 6,
+				newColumnWidths: [
+					'6.67%',
+					'13.33%',
+					'20%',
+					'26.66%',
+					'16.67%',
+					'16.67%',
+				],
+			},
+		];
+
+		expected.forEach( ( { newColumnCount, newColumnWidths } ) => {
+			test( `when the column count is changed to ${ newColumnCount }`, async ( {
+				editor,
+				page,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/columns',
+					attributes: {
+						columns: initialColumnWidths.length,
+					},
+					innerBlocks: initialColumnWidths.map( ( width ) => ( {
+						name: 'core/column',
+						attributes: { width },
+					} ) ),
+				} );
+
+				await editor.selectBlocks(
+					editor.canvas.getByRole( 'document', {
+						name: 'Block: Columns',
+					} )
+				);
+				await editor.openDocumentSettingsSidebar();
+
+				await page
+					.getByRole( 'spinbutton', { name: 'Columns' } )
+					.fill( newColumnCount.toString() );
+
+				await expect( editor.getBlocks() ).resolves.toMatchObject( [
+					{
+						name: 'core/columns',
+						innerBlocks: newColumnWidths.map( ( width ) => ( {
+							name: 'core/column',
+							attributes: { width },
+						} ) ),
+					},
+				] );
+			} );
+		} );
+	} );
+
 	test( 'should not split in middle', async ( { editor, page } ) => {
 		await editor.insertBlock( {
 			name: 'core/columns',
@@ -311,4 +378,33 @@ test.describe( 'Columns', () => {
 			] );
 		} );
 	} );
+
+	test( 'should arrow up into empty columns', async ( { editor, page } ) => {
+		await editor.insertBlock( {
+			name: 'core/columns',
+			innerBlocks: [ { name: 'core/column' }, { name: 'core/column' } ],
+		} );
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+		} );
+
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'Delete' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/columns',
+				innerBlocks: [
+					{
+						name: 'core/column',
+					},
+				],
+			},
+			{
+				name: 'core/paragraph',
+				attributes: { content: '' },
+			},
+		] );
+	} );
 } );
diff --git a/test/e2e/specs/editor/blocks/cover.spec.js b/test/e2e/specs/editor/blocks/cover.spec.js
index fa5103ebaa4eeb..a9a93caa4f4341 100644
--- a/test/e2e/specs/editor/blocks/cover.spec.js
+++ b/test/e2e/specs/editor/blocks/cover.spec.js
@@ -158,7 +158,7 @@ test.describe( 'Cover', () => {
 
 		// Ensure there the default value for the minimum height of cover is undefined.
 		const defaultHeightValue = await coverBlockEditorSettings
-			.getByLabel( 'Minimum height of cover' )
+			.getByLabel( 'Minimum height' )
 			.inputValue();
 		expect( defaultHeightValue ).toBeFalsy();
 
@@ -226,6 +226,77 @@ test.describe( 'Cover', () => {
 		await expect( overlay ).toHaveCSS( 'background-color', 'rgb(0, 0, 0)' );
 		await expect( overlay ).toHaveCSS( 'opacity', '0.5' );
 	} );
+
+	test( 'other cover blocks are not over the navigation block when the menu is open', async ( {
+		editor,
+		page,
+	} ) => {
+		// Insert a Cover block
+		await editor.insertBlock( { name: 'core/cover' } );
+		const coverBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Cover',
+		} );
+
+		// Choose a color swatch to transform the placeholder block into
+		// a functioning block.
+		await coverBlock
+			.getByRole( 'option', {
+				name: 'Color: Black',
+			} )
+			.click();
+
+		// Insert a Navigation block inside the Cover block
+		await editor.selectBlocks( coverBlock );
+		await coverBlock.getByRole( 'button', { name: 'Add block' } ).click();
+		await page.keyboard.type( 'Navigation' );
+		const blockResults = page.getByRole( 'listbox', {
+			name: 'Blocks',
+		} );
+		const blockResultOptions = blockResults.getByRole( 'option' );
+		await blockResultOptions.nth( 0 ).click();
+
+		// Insert a second Cover block.
+		await editor.insertBlock( { name: 'core/cover' } );
+		const secondCoverBlock = editor.canvas
+			.getByRole( 'document', {
+				name: 'Block: Cover',
+			} )
+			.last();
+
+		// Choose a color swatch to transform the placeholder block into
+		// a functioning block.
+		await secondCoverBlock
+			.getByRole( 'option', {
+				name: 'Color: Black',
+			} )
+			.click();
+
+		// Set the viewport to a small screen and open menu.
+		await page.setViewportSize( { width: 375, height: 1000 } );
+		const navigationBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Navigation',
+		} );
+		await editor.selectBlocks( navigationBlock );
+		await editor.canvas
+			.getByRole( 'button', { name: 'Open menu' } )
+			.click();
+
+		// Check if inner container of the second cover is clickable.
+		const secondInnerContainer = secondCoverBlock.locator(
+			'.wp-block-cover__inner-container'
+		);
+		let isClickable;
+		try {
+			isClickable = await secondInnerContainer.click( {
+				trial: true,
+				timeout: 1000, // This test will always take 1 second to run.
+			} );
+		} catch ( error ) {
+			isClickable = false;
+		}
+
+		expect( isClickable ).toBe( false );
+	} );
 } );
 
 class CoverBlockUtils {
diff --git a/test/e2e/specs/editor/blocks/group.spec.js b/test/e2e/specs/editor/blocks/group.spec.js
index ccf522d8c4d533..0d815872c0bbb2 100644
--- a/test/e2e/specs/editor/blocks/group.spec.js
+++ b/test/e2e/specs/editor/blocks/group.spec.js
@@ -14,15 +14,12 @@ test.describe( 'Group', () => {
 	} ) => {
 		// Search for the group block and insert it.
 		const inserterButton = page.locator(
-			'role=button[name="Toggle block inserter"i]'
+			'role=button[name="Block Inserter"i]'
 		);
 
 		await inserterButton.click();
 
-		await page.type(
-			'role=searchbox[name="Search for blocks and patterns"i]',
-			'Group'
-		);
+		await page.type( 'role=searchbox[name="Search"i]', 'Group' );
 
 		await page.click(
 			'role=listbox[name="Blocks"i] >> role=option[name="Group"i]'
diff --git a/test/e2e/specs/editor/blocks/heading.spec.js b/test/e2e/specs/editor/blocks/heading.spec.js
index 705bce2c3f2c9a..4670196c485f5f 100644
--- a/test/e2e/specs/editor/blocks/heading.spec.js
+++ b/test/e2e/specs/editor/blocks/heading.spec.js
@@ -119,6 +119,53 @@ test.describe( 'Heading', () => {
 		] );
 	} );
 
+	test( 'should create a empty paragraph block when pressing backspace at the beginning of the first empty heading block', async ( {
+		editor,
+		page,
+	} ) => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '## a' );
+		await page.keyboard.press( 'Backspace' );
+		await page.keyboard.press( 'Backspace' );
+
+		await expect.poll( editor.getBlocks ).toEqual( [] );
+	} );
+
+	test( 'should transform to a paragraph block when pressing backspace at the beginning of the first heading block', async ( {
+		editor,
+		page,
+	} ) => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '## a' );
+		await page.keyboard.press( 'ArrowLeft' );
+		await page.keyboard.press( 'Backspace' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'a' },
+			},
+		] );
+	} );
+
+	test( 'should keep the heading when there is an empty paragraph block before and backspace is pressed at the start', async ( {
+		editor,
+		page,
+	} ) => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '## a' );
+		await page.keyboard.press( 'ArrowLeft' );
+		await page.keyboard.press( 'Backspace' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/heading',
+				attributes: { content: 'a', level: 2 },
+			},
+		] );
+	} );
+
 	test( 'should correctly apply custom colors', async ( {
 		editor,
 		page,
@@ -291,4 +338,236 @@ test.describe( 'Heading', () => {
 			},
 		] );
 	} );
+
+	test( 'Should have proper label in the list view', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( { name: 'core/heading' } );
+
+		await editor.publishPost();
+		await page.reload();
+
+		await page
+			.getByRole( 'toolbar', { name: 'Document tools' } )
+			.getByRole( 'button', { name: 'Document Overview' } )
+			.click();
+
+		const listView = page.getByRole( 'treegrid', {
+			name: 'Block navigation structure',
+		} );
+
+		const headingListViewItem = listView.getByRole( 'link' );
+
+		await expect(
+			headingListViewItem,
+			'should show default block name if the content is empty'
+		).toHaveText( 'Heading' );
+
+		await editor.canvas
+			.getByRole( 'document', {
+				name: 'Block: Heading',
+			} )
+			.fill( 'Heading content' );
+
+		await expect( headingListViewItem, 'should show content' ).toHaveText(
+			'Heading content'
+		);
+
+		await editor.clickBlockOptionsMenuItem( 'Rename' );
+		await page
+			.getByRole( 'dialog', { name: 'Rename' } )
+			.getByRole( 'textbox', { name: 'Name' } )
+			.fill( 'My new name' );
+
+		await page
+			.getByRole( 'dialog', { name: 'Rename' } )
+			.getByRole( 'button', { name: 'Save' } )
+			.click();
+
+		await expect(
+			headingListViewItem,
+			'should show custom name'
+		).toHaveText( 'My new name' );
+	} );
+
+	test.describe( 'Block transforms', () => {
+		test.describe( 'FROM paragraph', () => {
+			test( 'should preserve the content', async ( { editor } ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'initial content',
+					},
+				} );
+				await editor.transformBlockTo( 'core/heading' );
+				const headingBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( headingBlock.name ).toBe( 'core/heading' );
+				expect( headingBlock.attributes.content ).toBe(
+					'initial content'
+				);
+			} );
+
+			test( 'should preserve the text align attribute', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						align: 'right',
+						content: 'initial content',
+					},
+				} );
+				await editor.transformBlockTo( 'core/heading' );
+				const headingBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( headingBlock.name ).toBe( 'core/heading' );
+				expect( headingBlock.attributes.textAlign ).toBe( 'right' );
+			} );
+
+			test( 'should preserve the metadata attribute', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'initial content',
+						metadata: {
+							name: 'Custom name',
+						},
+					},
+				} );
+
+				await editor.transformBlockTo( 'core/heading' );
+				const headingBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( headingBlock.name ).toBe( 'core/heading' );
+				expect( headingBlock.attributes.metadata ).toMatchObject( {
+					name: 'Custom name',
+				} );
+			} );
+
+			test( 'should preserve the block bindings', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'initial content',
+						metadata: {
+							bindings: {
+								content: {
+									source: 'core/post-meta',
+									args: {
+										key: 'custom_field',
+									},
+								},
+							},
+						},
+					},
+				} );
+
+				await editor.transformBlockTo( 'core/heading' );
+				const headingBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( headingBlock.name ).toBe( 'core/heading' );
+				expect(
+					headingBlock.attributes.metadata.bindings
+				).toMatchObject( {
+					content: {
+						source: 'core/post-meta',
+						args: {
+							key: 'custom_field',
+						},
+					},
+				} );
+			} );
+		} );
+
+		test.describe( 'TO paragraph', () => {
+			test( 'should preserve the content', async ( { editor } ) => {
+				await editor.insertBlock( {
+					name: 'core/heading',
+					attributes: {
+						content: 'initial content',
+					},
+				} );
+				await editor.transformBlockTo( 'core/paragraph' );
+				const paragraphBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( paragraphBlock.name ).toBe( 'core/paragraph' );
+				expect( paragraphBlock.attributes.content ).toBe(
+					'initial content'
+				);
+			} );
+
+			test( 'should preserve the text align attribute', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/heading',
+					attributes: {
+						textAlign: 'right',
+						content: 'initial content',
+					},
+				} );
+				await editor.transformBlockTo( 'core/paragraph' );
+				const paragraphBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( paragraphBlock.name ).toBe( 'core/paragraph' );
+				expect( paragraphBlock.attributes.align ).toBe( 'right' );
+			} );
+
+			test( 'should preserve the metadata attribute', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/heading',
+					attributes: {
+						content: 'initial content',
+						metadata: {
+							name: 'Custom name',
+						},
+					},
+				} );
+
+				await editor.transformBlockTo( 'core/paragraph' );
+				const paragraphBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( paragraphBlock.name ).toBe( 'core/paragraph' );
+				expect( paragraphBlock.attributes.metadata ).toMatchObject( {
+					name: 'Custom name',
+				} );
+			} );
+
+			test( 'should preserve the block bindings', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/heading',
+					attributes: {
+						content: 'initial content',
+						metadata: {
+							bindings: {
+								content: {
+									source: 'core/post-meta',
+									args: {
+										key: 'custom_field',
+									},
+								},
+							},
+						},
+					},
+				} );
+
+				await editor.transformBlockTo( 'core/paragraph' );
+				const paragraphBlock = ( await editor.getBlocks() )[ 0 ];
+				expect( paragraphBlock.name ).toBe( 'core/paragraph' );
+				expect(
+					paragraphBlock.attributes.metadata.bindings
+				).toMatchObject( {
+					content: {
+						source: 'core/post-meta',
+						args: {
+							key: 'custom_field',
+						},
+					},
+				} );
+			} );
+		} );
+	} );
 } );
diff --git a/test/e2e/specs/editor/blocks/image.spec.js b/test/e2e/specs/editor/blocks/image.spec.js
index f1041fa60061a7..6110a125ff6f7e 100644
--- a/test/e2e/specs/editor/blocks/image.spec.js
+++ b/test/e2e/specs/editor/blocks/image.spec.js
@@ -327,7 +327,7 @@ test.describe( 'Image', () => {
 		await editor.clickBlockToolbarButton( 'Crop' );
 		await editor.clickBlockToolbarButton( 'Aspect Ratio' );
 		await page.click(
-			'role=menu[name="Aspect Ratio"i] >> role=menuitemradio[name="16:9"i]'
+			'role=menu[name="Aspect Ratio"i] >> role=menuitemradio[name="Wide - 16:9"i]'
 		);
 		await editor.clickBlockToolbarButton( 'Apply' );
 
@@ -424,6 +424,9 @@ test.describe( 'Image', () => {
 		page,
 		editor,
 	} ) => {
+		// This is a temp workaround for dragging and dropping images from the inserter.
+		// This should be removed when we have the zoom out view for media categories.
+		await page.setViewportSize( { width: 1400, height: 800 } );
 		await editor.insertBlock( { name: 'core/image' } );
 		const imageBlock = editor.canvas.getByRole( 'document', {
 			name: 'Block: Image',
@@ -434,7 +437,8 @@ test.describe( 'Image', () => {
 
 		async function openMediaTab() {
 			const blockInserter = page.getByRole( 'button', {
-				name: 'Toggle block inserter',
+				name: 'Block Inserter',
+				exact: true,
 			} );
 			const isClosed =
 				( await blockInserter.getAttribute( 'aria-pressed' ) ) ===
@@ -448,7 +452,7 @@ test.describe( 'Image', () => {
 
 			await blockLibrary
 				.getByRole( 'tabpanel', { name: 'Media' } )
-				.getByRole( 'button', { name: 'Openverse' } )
+				.getByRole( 'tab', { name: 'Openverse' } )
 				.click();
 		}
 
@@ -670,10 +674,7 @@ test.describe( 'Image', () => {
 			imageBlock.locator( 'data-testid=form-file-upload-input' )
 		);
 
-		await page
-			.getByLabel( 'Block tools' )
-			.getByLabel( 'Insert link' )
-			.click();
+		await page.getByLabel( 'Block tools' ).getByLabel( 'Link' ).click();
 
 		// This form lacks distinguishing qualities other than the
 		// class name, so we use page.locator() instead of page.getByRole()
@@ -696,7 +697,9 @@ test.describe( 'Image', () => {
 		await expect( linkDom ).toHaveAttribute( 'href', url );
 	} );
 
-	test( 'should upload external image', async ( { editor } ) => {
+	test( 'should upload external image to media library', async ( {
+		editor,
+	} ) => {
 		await editor.insertBlock( {
 			name: 'core/image',
 			attributes: {
@@ -704,15 +707,16 @@ test.describe( 'Image', () => {
 			},
 		} );
 
-		await editor.clickBlockToolbarButton( 'Upload external image' );
+		await editor.clickBlockToolbarButton( 'Upload to Media Library' );
 
-		const imageBlock = editor.canvas.locator(
-			'role=document[name="Block: Image"i]'
+		await expect(
+			editor.canvas
+				.locator( 'role=document[name="Block: Image"i]' )
+				.locator( 'img[src^="http"]' )
+		).toHaveAttribute(
+			'src',
+			expect.stringMatching( /\/wp-content\/uploads\// )
 		);
-		const image = imageBlock.locator( 'img[src^="http"]' );
-		const src = await image.getAttribute( 'src' );
-
-		expect( src ).toMatch( /\/wp-content\/uploads\// );
 	} );
 
 	test( 'should upload through prepublish panel', async ( {
@@ -734,563 +738,321 @@ test.describe( 'Image', () => {
 			.click();
 
 		await expect( page.locator( '.components-spinner' ) ).toHaveCount( 0 );
-
-		const imageBlock = editor.canvas.locator(
-			'role=document[name="Block: Image"i]'
+		await expect(
+			editor.canvas
+				.locator( 'role=document[name="Block: Image"i]' )
+				.locator( 'img[src^="http"]' )
+		).toHaveAttribute(
+			'src',
+			expect.stringMatching( /\/wp-content\/uploads\// )
 		);
-		const image = imageBlock.locator( 'img[src^="http"]' );
-		const src = await image.getAttribute( 'src' );
-
-		expect( src ).toMatch( /\/wp-content\/uploads\// );
 	} );
-} );
-
-// Skipping these tests for now as we plan
-// to update them to use the new lightbox syntax
-// once it's merged -- see the following PRs
-// https://github.com/WordPress/gutenberg/pull/53851
-// https://github.com/WordPress/gutenberg/pull/54071
-test.describe.skip( 'Image - interactivity', () => {
-	test.beforeAll( async ( { requestUtils } ) => {
-		await requestUtils.deleteAllMedia();
-	} );
-
-	test.afterAll( async ( { requestUtils } ) => {
-		await requestUtils.deleteAllMedia();
-	} );
-
-	test.beforeEach( async ( { admin, editor } ) => {
-		await admin.createNewPost();
-		await editor.insertBlock( { name: 'core/image' } );
-	} );
-
-	test.afterEach( async ( { requestUtils } ) => {
-		await requestUtils.deleteAllMedia();
-	} );
-
-	test.describe( 'tests using uploaded image', () => {
-		let filename = null;
-
-		test( 'should toggle "lightbox" in saved attributes', async ( {
-			editor,
-			page,
-			imageBlockUtils,
-		} ) => {
-			const imageBlock = editor.canvas.locator(
-				'role=document[name="Block: Image"i]'
-			);
-			await expect( imageBlock ).toBeVisible();
-
-			filename = await imageBlockUtils.upload(
-				imageBlock.locator( 'data-testid=form-file-upload-input' )
-			);
-			const image = imageBlock.locator( 'role=img' );
-			await expect( image ).toBeVisible();
-			await expect( image ).toHaveAttribute(
-				'src',
-				new RegExp( filename )
-			);
 
-			await editor.openDocumentSettingsSidebar();
+	test( 'uploads data url through blobs from raw handling', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		const blobUrl = await page.evaluate( async () => {
+			const canvas = document.createElement( 'canvas' );
+			canvas.width = 20;
+			canvas.height = 20;
 
-			await page.getByRole( 'button', { name: 'Advanced' } ).click();
-			await page
-				.getByRole( 'combobox', { name: 'Behaviors' } )
-				.selectOption( 'lightbox' );
+			const ctx = canvas.getContext( '2d' );
+			ctx.fillStyle = 'red';
+			ctx.fillRect( 0, 0, 20, 20 );
 
-			let blocks = await editor.getBlocks();
-			expect( blocks[ 0 ].attributes ).toMatchObject( {
-				behaviors: {
-					lightbox: {
-						animation: 'zoom',
-						enabled: true,
-					},
-				},
-				linkDestination: 'none',
-			} );
-			expect( blocks[ 0 ].attributes.url ).toContain( filename );
-
-			await page.getByLabel( 'Behaviors' ).selectOption( '' );
-			blocks = await editor.getBlocks();
-			expect( blocks[ 0 ].attributes ).toMatchObject( {
-				behaviors: {
-					lightbox: {
-						animation: '',
-						enabled: false,
-					},
-				},
-				linkDestination: 'none',
-			} );
-			expect( blocks[ 0 ].attributes.url ).toContain( filename );
+			return canvas.toDataURL( 'image/png' );
 		} );
 
-		test.describe( 'should open and close the image in a lightbox when using a mouse and dynamically load src', () => {
-			test( 'zoom animation', async ( {
-				editor,
-				page,
-				imageBlockUtils,
-			} ) => {
-				const imageBlock = editor.canvas.locator(
-					'role=document[name="Block: Image"i]'
-				);
-				await expect( imageBlock ).toBeVisible();
+		pageUtils.setClipboardData( { html: `<img src="${ blobUrl }">` } );
 
-				filename = await imageBlockUtils.upload(
-					imageBlock.locator( 'data-testid=form-file-upload-input' ),
-					'3200x2400_e2e_test_image_responsive_lightbox.jpeg'
-				);
-				const image = imageBlock.locator( 'role=img' );
-				await expect( image ).toBeVisible();
-				await expect( image ).toHaveAttribute(
-					'src',
-					new RegExp( filename ),
-					{ timeout: 10_000 }
-				);
+		await pageUtils.pressKeys( 'primary+v' );
 
-				await editor.openDocumentSettingsSidebar();
-
-				await page.getByRole( 'button', { name: 'Advanced' } ).click();
-				await page
-					.getByRole( 'combobox', { name: 'Behaviors' } )
-					.selectOption( 'lightbox' );
+		await expect(
+			editor.canvas
+				.locator( 'role=document[name="Block: Image"i]' )
+				.locator( 'img[src^="http"]' )
+		).toHaveAttribute(
+			'src',
+			expect.stringMatching( /\/wp-content\/uploads\// )
+		);
+	} );
 
-				await page
-					.getByRole( 'combobox', { name: 'Animation' } )
-					.selectOption( 'zoom' );
+	test( 'should have keyboard navigable link UI popover', async ( {
+		editor,
+		page,
+		pageUtils,
+		imageBlockUtils,
+	} ) => {
+		await editor.insertBlock( { name: 'core/image' } );
+		const imageBlock = editor.canvas.locator(
+			'role=document[name="Block: Image"i]'
+		);
+		await expect( imageBlock ).toBeVisible();
 
-				const postId = await editor.publishPost();
-				await page.goto( `/?p=${ postId }` );
+		await imageBlockUtils.upload(
+			imageBlock.locator( 'data-testid=form-file-upload-input' )
+		);
 
-				// getByRole() doesn't work for the image here for
-				// some reason, so let's use locators instead
-				const contentFigure = page.locator( '.entry-content figure' );
-				const contentImage = page.locator(
-					'.entry-content figure img'
-				);
+		await page.getByLabel( 'Block tools' ).getByLabel( 'Link' ).click();
 
-				const wpContext =
-					await contentFigure.getAttribute( 'data-wp-context' );
+		const uriInput = page.getByRole( 'combobox', {
+			name: 'URL',
+		} );
 
-				const imageUploadedSrc =
-					JSON.parse( wpContext ).core.image.imageUploadedSrc;
+		await expect( uriInput ).toBeFocused();
 
-				const contentImageCurrentSrc = await contentImage.evaluate(
-					( img ) => img.currentSrc
-				);
+		// Enter a link.
+		await uriInput.fill( 'https://example.com' );
+		await page.keyboard.press( 'Enter' );
+		await expect(
+			page.getByRole( 'link', {
+				name: 'example.com',
+			} )
+		).toBeFocused();
 
-				const lightbox = page.locator( '.wp-lightbox-overlay' );
-				await expect( lightbox ).toBeHidden();
-				const responsiveImage = lightbox.locator(
-					'.responsive-image img'
-				);
-				const enlargedImage = lightbox.locator( '.enlarged-image img' );
+		// Edit a link.
+		await pageUtils.pressKeys( 'Tab' );
+		await page.keyboard.press( 'Enter' );
+		await expect( uriInput ).toBeFocused();
+		await uriInput.fill( 'https://example.com/updated/' );
+		await page.keyboard.press( 'Enter' );
+		await expect(
+			page.getByRole( 'link', {
+				name: 'example.com/updated/',
+			} )
+		).toBeFocused();
 
-				await expect( responsiveImage ).toHaveAttribute(
-					'src',
-					contentImageCurrentSrc
-				);
-				await expect( enlargedImage ).toHaveAttribute( 'src', '' );
+		// Remove a link.
+		await pageUtils.pressKeys( 'Tab', { times: 2 } );
+		await expect(
+			page.getByRole( 'button', { name: 'Remove link' } )
+		).toBeFocused();
+		await page.keyboard.press( 'Enter' );
+		await expect( uriInput ).toBeFocused();
+		await expect( uriInput ).toBeEmpty();
 
-				await page
-					.getByRole( 'button', { name: 'Enlarge image' } )
-					.click();
+		// Select "Link to image file".
+		await pageUtils.pressKeys( 'Tab', { times: 3 } );
+		await expect(
+			page.getByRole( 'menuitem', { name: 'Link to image file' } )
+		).toBeFocused();
+		await page.keyboard.press( 'Enter' );
+		await expect(
+			page.getByRole( 'link', {
+				name: 'Link to image file',
+			} )
+		).toBeFocused();
 
-				await expect( responsiveImage ).toHaveAttribute(
-					'src',
-					contentImageCurrentSrc
-				);
-				await expect( enlargedImage ).toHaveAttribute(
-					'src',
-					imageUploadedSrc
-				);
+		// Select "Link to attachment page".
+		await pageUtils.pressKeys( 'Tab' );
+		await page.keyboard.press( 'Enter' );
+		await pageUtils.pressKeys( 'Tab', { times: 4 } );
+		await expect(
+			page.getByRole( 'menuitem', { name: 'Link to attachment page' } )
+		).toBeFocused();
+		await page.keyboard.press( 'Enter' );
+		await expect(
+			page.getByRole( 'link', {
+				name: 'Link to attachment page',
+			} )
+		).toBeFocused();
 
-				await expect( lightbox ).toBeVisible();
+		// Select "Expand on click", then remove it.
+		await pageUtils.pressKeys( 'Tab' );
+		await page.keyboard.press( 'Enter' );
+		await pageUtils.pressKeys( 'Tab', { times: 5 } );
+		await expect(
+			page.getByRole( 'menuitem', { name: 'Expand on click' } )
+		).toBeFocused();
+		await page.keyboard.press( 'Enter' );
+		await expect(
+			page.getByRole( 'button', {
+				name: 'Disable expand on click',
+			} )
+		).toBeFocused();
+		await page.keyboard.press( 'Enter' );
+		await expect( uriInput ).toBeFocused();
+		await expect( uriInput ).toBeEmpty();
+	} );
+} );
 
-				// Use page.evaluate to get the content of the style tag
-				const styleTagContent = await page.evaluate( () => {
-					const styleTag = document.querySelector(
-						'style#wp-lightbox-styles'
-					);
-					return styleTag ? styleTag.textContent : '';
-				} );
+test.describe( 'Image - lightbox', () => {
+	let uploadedMedia;
 
-				// Define the keys you want to check for
-				const keysToCheck = [
-					'--wp--lightbox-initial-top-position',
-					'--wp--lightbox-initial-left-position',
-					'--wp--lightbox-container-width',
-					'--wp--lightbox-container-height',
-					'--wp--lightbox-image-width',
-					'--wp--lightbox-image-height',
-					'--wp--lightbox-scale',
-				];
-
-				// Check if all the keys are present in the style tag's content
-				const keysPresent = keysToCheck.every( ( key ) =>
-					styleTagContent.includes( key )
-				);
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMedia();
+		uploadedMedia = await requestUtils.uploadMedia(
+			path.resolve(
+				process.cwd(),
+				'test/e2e/assets/10x10_e2e_test_image_z9T8jK.png'
+			)
+		);
+	} );
 
-				expect( keysPresent ).toBe( true );
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMedia();
+	} );
 
-				const closeButton = lightbox.getByRole( 'button', {
-					name: 'Close',
-				} );
-				await closeButton.click();
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
 
-				await expect( responsiveImage ).toHaveAttribute(
-					'src',
-					contentImageCurrentSrc
-				);
-				await expect( enlargedImage ).toHaveAttribute(
-					'src',
-					imageUploadedSrc
+	test.describe( 'should respect theme.json settings and block overrides', () => {
+		test.describe( 'Theme.json settings - allow editing FALSE, enabled FALSE', () => {
+			test.beforeAll( async ( { requestUtils } ) => {
+				await requestUtils.activatePlugin(
+					'lightbox-allow-editing-false-enabled-false'
 				);
-
-				await expect( lightbox ).toBeHidden();
-			} );
-		} );
-
-		test( 'lightbox should be overriden when link is configured for image', async ( {
-			editor,
-			page,
-			imageBlockUtils,
-		} ) => {
-			const imageBlock = editor.canvas.locator(
-				'role=document[name="Block: Image"i]'
-			);
-			await expect( imageBlock ).toBeVisible();
-
-			filename = await imageBlockUtils.upload(
-				imageBlock.locator( 'data-testid=form-file-upload-input' )
-			);
-			const image = imageBlock.locator( 'role=img' );
-			await expect( image ).toBeVisible();
-			await expect( image ).toHaveAttribute(
-				'src',
-				new RegExp( filename )
-			);
-
-			await editor.openDocumentSettingsSidebar();
-
-			await page.getByRole( 'button', { name: 'Advanced' } ).click();
-			const behaviorSelect = page.getByRole( 'combobox', {
-				name: 'Behaviors',
 			} );
-			await behaviorSelect.selectOption( 'lightbox' );
-
-			await page
-				.getByLabel( 'Block tools' )
-				.getByLabel( 'Insert link' )
-				.click();
-
-			const form = page.locator(
-				'.block-editor-url-popover__link-editor'
-			);
-
-			const url = 'https://wordpress.org';
-
-			await form.getByLabel( 'URL' ).fill( url );
-
-			await form.getByRole( 'button', { name: 'Apply' } ).click();
-			await expect( behaviorSelect ).toBeDisabled();
 
-			const postId = await editor.publishPost();
-			await page.goto( `/?p=${ postId }` );
-
-			// The lightbox markup should not appear in the DOM at all
-			await expect(
-				page.getByRole( 'button', { name: 'Enlarge image' } )
-			).not.toBeInViewport();
-		} );
-
-		test( 'markup should not appear if Lightbox is disabled', async ( {
-			editor,
-			page,
-			imageBlockUtils,
-		} ) => {
-			const imageBlock = editor.canvas.locator(
-				'role=document[name="Block: Image"i]'
-			);
-			await expect( imageBlock ).toBeVisible();
-
-			filename = await imageBlockUtils.upload(
-				imageBlock.locator( 'data-testid=form-file-upload-input' )
-			);
-			const image = imageBlock.locator( 'role=img' );
-			await expect( image ).toBeVisible();
-			await expect( image ).toHaveAttribute(
-				'src',
-				new RegExp( filename )
-			);
-
-			await editor.openDocumentSettingsSidebar();
-
-			await page.getByRole( 'button', { name: 'Advanced' } ).click();
-			const behaviorSelect = page.getByRole( 'combobox', {
-				name: 'Behaviors',
+			test.afterAll( async ( { requestUtils } ) => {
+				await requestUtils.deactivatePlugin(
+					'lightbox-allow-editing-false-enabled-false'
+				);
 			} );
-			await behaviorSelect.selectOption( '' );
-
-			const postId = await editor.publishPost();
-			await page.goto( `/?p=${ postId }` );
-
-			// The lightbox markup should not appear in the DOM at all
-			await expect(
-				page.getByRole( 'button', { name: 'Enlarge image' } )
-			).not.toBeInViewport();
-		} );
 
-		test.describe( 'Animation Select visibility', () => {
-			test( 'Animation selector should appear if Behavior is Lightbox', async ( {
+			test( 'Block settings - link DISABLED, lightbox UNDEFINED - should hide UI when block override is undefined', async ( {
 				editor,
 				page,
-				imageBlockUtils,
 			} ) => {
-				const imageBlock = editor.canvas.locator(
-					'role=document[name="Block: Image"i]'
-				);
-				await expect( imageBlock ).toBeVisible();
-
-				filename = await imageBlockUtils.upload(
-					imageBlock.locator( 'data-testid=form-file-upload-input' )
-				);
-				const image = imageBlock.locator( 'role=img' );
-				await expect( image ).toBeVisible();
-				await expect( image ).toHaveAttribute(
-					'src',
-					new RegExp( filename )
-				);
+				await editor.setContent( `<!-- wp:image {"id":${ uploadedMedia.id },"sizeSlug":"full","linkDestination":"none"} -->
+				<figure class="wp-block-image size-full"><img src="${ uploadedMedia.source_url }" alt="" class="wp-image-${ uploadedMedia.id }"/></figure>
+				<!-- /wp:image --> ` );
 
-				await editor.openDocumentSettingsSidebar();
-
-				await page.getByRole( 'button', { name: 'Advanced' } ).click();
-				const behaviorSelect = page.getByRole( 'combobox', {
-					name: 'Behaviors',
-				} );
-				await behaviorSelect.selectOption( 'lightbox' );
-				await expect(
-					page.getByRole( 'combobox', {
-						name: 'Animation',
-					} )
-				).toBeVisible();
-			} );
-			test( 'Animation selector should NOT appear if Behavior is None', async ( {
-				page,
-				editor,
-				imageBlockUtils,
-			} ) => {
 				const imageBlock = editor.canvas.locator(
 					'role=document[name="Block: Image"i]'
 				);
-				await expect( imageBlock ).toBeVisible();
 
-				filename = await imageBlockUtils.upload(
-					imageBlock.locator( 'data-testid=form-file-upload-input' )
-				);
-				const image = imageBlock.locator( 'role=img' );
-				await expect( image ).toBeVisible();
-				await expect( image ).toHaveAttribute(
-					'src',
-					new RegExp( filename )
-				);
-
-				await editor.openDocumentSettingsSidebar();
+				await imageBlock.click();
+				await page
+					.getByLabel( 'Block tools' )
+					.getByLabel( 'Link' )
+					.click();
 
-				await page.getByRole( 'button', { name: 'Advanced' } ).click();
-				const behaviorSelect = page.getByRole( 'combobox', {
-					name: 'Behaviors',
-				} );
-				await behaviorSelect.selectOption( '' );
 				await expect(
-					page.getByRole( 'combobox', {
-						name: 'Animation',
+					page.getByRole( 'menuitem', {
+						name: 'Expand on click',
 					} )
 				).toBeHidden();
 			} );
-			test( 'Animation selector should NOT appear if Behavior is Default', async ( {
-				page,
+
+			test( 'Block settings - link DISABLED, lightbox ENABLED - should show UI while block override is active, but hide UI if override is removed', async ( {
 				editor,
-				imageBlockUtils,
+				page,
 			} ) => {
+				await editor.setContent( `<!-- wp:image {"id":${ uploadedMedia.id },"sizeSlug":"full","linkDestination":"none","lightbox":{"enabled":true}} -->
+				<figure class="wp-block-image size-full"><img src="${ uploadedMedia.source_url }" alt="" class="wp-image-${ uploadedMedia.id }"/></figure>
+				<!-- /wp:image --> ` );
+
 				const imageBlock = editor.canvas.locator(
 					'role=document[name="Block: Image"i]'
 				);
-				await expect( imageBlock ).toBeVisible();
 
-				filename = await imageBlockUtils.upload(
-					imageBlock.locator( 'data-testid=form-file-upload-input' )
-				);
-				const image = imageBlock.locator( 'role=img' );
-				await expect( image ).toBeVisible();
-				await expect( image ).toHaveAttribute(
-					'src',
-					new RegExp( filename )
-				);
+				await imageBlock.click();
+				await page
+					.getByLabel( 'Block tools' )
+					.getByLabel( 'Link' )
+					.click();
 
-				await editor.openDocumentSettingsSidebar();
+				await page
+					.getByRole( 'button', {
+						name: 'Disable expand on click',
+					} )
+					.click();
 
-				await page.getByRole( 'button', { name: 'Advanced' } ).click();
-				const behaviorSelect = page.getByRole( 'combobox', {
-					name: 'Behaviors',
-				} );
-				await behaviorSelect.selectOption( 'default' );
 				await expect(
-					page.getByRole( 'combobox', {
-						name: 'Animation',
+					page.getByRole( 'menuitem', {
+						name: 'Expand on click',
 					} )
 				).toBeHidden();
 			} );
 		} );
+	} );
 
-		test.describe( 'keyboard navigation', () => {
-			let openLightboxButton;
-			let lightbox;
-			let closeButton;
-
-			test.beforeEach( async ( { page, editor, imageBlockUtils } ) => {
-				const imageBlock = editor.canvas.locator(
-					'role=document[name="Block: Image"i]'
-				);
-				await expect( imageBlock ).toBeVisible();
-
-				filename = await imageBlockUtils.upload(
-					imageBlock.locator( 'data-testid=form-file-upload-input' )
-				);
-				const image = imageBlock.locator( 'role=img' );
-				await expect( image ).toBeVisible();
-				await expect( image ).toHaveAttribute(
-					'src',
-					new RegExp( filename )
-				);
-
-				await editor.openDocumentSettingsSidebar();
-
-				await page.getByRole( 'button', { name: 'Advanced' } ).click();
-				await page
-					.getByRole( 'combobox', { name: 'Behaviors' } )
-					.selectOption( 'lightbox' );
-
-				const postId = await editor.publishPost();
-				await page.goto( `/?p=${ postId }` );
-
-				openLightboxButton = page.getByRole( 'button', {
-					name: 'Enlarge image',
-				} );
-				lightbox = page.getByRole( 'dialog' );
-				closeButton = lightbox.getByRole( 'button', {
-					name: 'Close',
-				} );
-			} );
-
-			test( 'should open and focus appropriately using enter key', async ( {
-				page,
-			} ) => {
-				// Open and close lightbox using the close button
-				await openLightboxButton.focus();
-				await page.keyboard.press( 'Enter' );
-				await expect( lightbox ).toBeVisible();
-				await expect( closeButton ).toBeFocused();
-			} );
+	test.describe( 'should render as expected on front end', () => {
+		test( "Overlay image should not inherit content image's margins", async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.setContent( `<!-- wp:image {"id":${ uploadedMedia.id },"sizeSlug":"full","linkDestination":"none",
+			"lightbox":{"enabled":true},"style":{"spacing":{"margin":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|40","right":"var:preset|spacing|40"}}}} -->
+			<figure class="wp-block-image size-full" style="margin-top:var(--wp--preset--spacing--40);margin-right:var(--wp--preset--spacing--40);margin-bottom:var(--wp--preset--spacing--40);margin-left:var(--wp--preset--spacing--40)">
+			<img src="${ uploadedMedia.source_url }" alt="" class="wp-image-${ uploadedMedia.id }"/></figure>
+			<!-- /wp:image --> ` );
 
-			test( 'should close and focus appropriately using enter key on close button', async ( {
-				page,
-			} ) => {
-				// Open and close lightbox using the close button
-				await openLightboxButton.focus();
-				await page.keyboard.press( 'Enter' );
-				await expect( lightbox ).toBeVisible();
-				await expect( closeButton ).toBeFocused();
-				await page.keyboard.press( 'Enter' );
-				await expect( lightbox ).toBeHidden();
-				await expect( openLightboxButton ).toBeFocused();
-			} );
+			const postId = await editor.publishPost();
+			await page.goto( `/?p=${ postId }` );
 
-			test( 'should close and focus appropriately using escape key', async ( {
-				page,
-			} ) => {
-				await openLightboxButton.focus();
-				await page.keyboard.press( 'Enter' );
-				await expect( lightbox ).toBeVisible();
-				await expect( closeButton ).toBeFocused();
-				await page.keyboard.press( 'Escape' );
-				await expect( lightbox ).toBeHidden();
-				await expect( openLightboxButton ).toBeFocused();
+			const lightboxImage = page.locator( '.wp-lightbox-container img' );
+			await expect( lightboxImage ).toBeVisible();
+			await lightboxImage.click();
+
+			const figure = page
+				.locator( '.wp-lightbox-overlay .wp-block-image' )
+				.first();
+			await expect( figure ).toBeVisible();
+			const margin = await figure.evaluate( ( element ) => {
+				return window
+					.getComputedStyle( element )
+					.getPropertyValue( 'margin' );
 			} );
+			expect( margin ).toBe( '0px' );
+		} );
+	} );
+} );
 
-			// TO DO: Add these tests, which will involve adding a caption
-			// to uploaded test images
-			// test( 'should trap focus appropriately when using tab', async ( {
-			// 	page,
-			// } ) => {
+// Added to prevent regressions of https://github.com/WordPress/gutenberg/pull/57040.
+test.describe( 'Image - Site editor', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMedia();
+		await requestUtils.activateTheme( 'emptytheme' );
+	} );
 
-			// } );
+	test.beforeEach( async ( { admin } ) => {
+		await admin.visitSiteEditor( {
+			postId: 'emptytheme//index',
+			postType: 'wp_template',
+			canvas: 'edit',
+		} );
+	} );
 
-			// test( 'should trap focus appropriately using shift+tab', async ( {
-			// 	page,
-			// } ) => {
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMedia();
+	} );
 
-			// } );
-		} );
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
 
-	test( 'lightbox should work as expected when inserting image from URL', async ( {
+	test( 'can be inserted via image upload', async ( {
 		editor,
-		page,
+		imageBlockUtils,
 	} ) => {
-		await editor.openDocumentSettingsSidebar();
+		await editor.insertBlock( { name: 'core/image' } );
 
-		const imageBlockFromUrl = editor.canvas.locator(
+		const imageBlock = editor.canvas.locator(
 			'role=document[name="Block: Image"i]'
 		);
-		await expect( imageBlockFromUrl ).toBeVisible();
-
-		await imageBlockFromUrl
-			.getByRole( 'button' )
-			.filter( { hasText: 'Insert from URL' } )
-			.click();
+		await expect( imageBlock ).toBeVisible();
 
-		const form = page.locator(
-			'.block-editor-media-placeholder__url-input-form'
+		const filename = await imageBlockUtils.upload(
+			imageBlock.locator( 'data-testid=form-file-upload-input' )
 		);
 
-		const imgUrl =
-			'https://wp20.wordpress.net/wp-content/themes/twentyseventeen-wp20/images/wp20-logo-white.svg';
-
-		await form.getByLabel( 'URL' ).fill( imgUrl );
-
-		await form.getByRole( 'button', { name: 'Apply' } ).click();
-
-		const image = imageBlockFromUrl.locator( 'role=img' );
+		const image = imageBlock.getByRole( 'img', {
+			name: 'This image has an empty alt attribute',
+		} );
 		await expect( image ).toBeVisible();
-		await expect( image ).toHaveAttribute( 'src', imgUrl );
-
-		await page.getByRole( 'button', { name: 'Advanced' } ).click();
-		await page
-			.getByRole( 'combobox', { name: 'Behaviors' } )
-			.selectOption( 'lightbox' );
-
-		const postId = await editor.publishPost();
-		await page.goto( `/?p=${ postId }` );
-
-		const lightbox = page.locator( '.wp-lightbox-overlay' );
-		const responsiveImage = lightbox.locator( '.responsive-image img' );
-		const enlargedImage = lightbox.locator( '.enlarged-image img' );
+		await expect( image ).toHaveAttribute( 'src', new RegExp( filename ) );
 
-		await expect( responsiveImage ).toHaveAttribute(
-			'src',
-			new RegExp( imgUrl )
+		const regex = new RegExp(
+			`<!-- wp:image {"id":(\\d+),"sizeSlug":"full","linkDestination":"none"} -->
+<figure class="wp-block-image size-full"><img src="[^"]+\\/${ filename }\\.png" alt="" class="wp-image-\\1"/></figure>
+<!-- \\/wp:image -->`
 		);
-		await expect( enlargedImage ).toHaveAttribute( 'src', '' );
-
-		await page.getByRole( 'button', { name: 'Enlarge image' } ).click();
-
-		await expect( responsiveImage ).toHaveAttribute( 'src', imgUrl );
-		await expect( enlargedImage ).toHaveAttribute( 'src', imgUrl );
-
-		await page.getByRole( 'button', { name: 'Close' } ).click();
-
-		await expect( responsiveImage ).toHaveAttribute( 'src', imgUrl );
-		await expect( enlargedImage ).toHaveAttribute( 'src', imgUrl );
+		expect( await editor.getEditedPostContent() ).toMatch( regex );
 	} );
 } );
 
diff --git a/test/e2e/specs/editor/blocks/links.spec.js b/test/e2e/specs/editor/blocks/links.spec.js
index d989a2d7e5559a..95e9c65b6ec190 100644
--- a/test/e2e/specs/editor/blocks/links.spec.js
+++ b/test/e2e/specs/editor/blocks/links.spec.js
@@ -116,43 +116,11 @@ test.describe( 'Links', () => {
 
 		await expect(
 			page.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} )
 		).toHaveValue( '' );
 	} );
 
-	test( `can be created without any text selected`, async ( {
-		page,
-		editor,
-		pageUtils,
-	} ) => {
-		// Create a block with some text.
-		await editor.insertBlock( {
-			name: 'core/paragraph',
-		} );
-		await page.keyboard.type( 'This is Gutenberg: ' );
-
-		// Press Cmd+K to insert a link.
-		await pageUtils.pressKeys( 'primary+K' );
-
-		// Type a URL.
-		await page.keyboard.type( 'https://wordpress.org/gutenberg' );
-
-		// Press Enter to apply the link.
-		await pageUtils.pressKeys( 'Enter' );
-
-		// A link with the URL as its text should have been inserted.
-		await expect.poll( editor.getBlocks ).toMatchObject( [
-			{
-				name: 'core/paragraph',
-				attributes: {
-					content:
-						'This is Gutenberg: <a href="https://wordpress.org/gutenberg">https://wordpress.org/gutenberg</a>',
-				},
-			},
-		] );
-	} );
-
 	test( `will automatically create a link if selected text is a valid HTTP based URL`, async ( {
 		page,
 		editor,
@@ -225,15 +193,17 @@ test.describe( 'Links', () => {
 		pageUtils,
 		LinkUtils,
 	} ) => {
-		await LinkUtils.createAndReselectLink();
+		await LinkUtils.createLink();
 
 		// Click on the Edit button.
-		await page.getByRole( 'button', { name: 'Edit' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Edit link', exact: true } )
+			.click();
 
 		// Change the URL.
 		// getByPlaceholder required in order to handle Link Control component
 		// managing focus onto other inputs within the control.
-		await page.getByPlaceholder( 'Search or type url' ).fill( '' );
+		await page.getByPlaceholder( 'Search or type URL' ).fill( '' );
 		await page.keyboard.type( '/handbook' );
 
 		// Submit the link.
@@ -251,11 +221,13 @@ test.describe( 'Links', () => {
 	} );
 
 	test( `can remove existing links`, async ( { editor, LinkUtils } ) => {
-		await LinkUtils.createAndReselectLink();
+		await LinkUtils.createLink();
 
 		const linkPopover = LinkUtils.getLinkPopover();
 
-		await linkPopover.getByRole( 'button', { name: 'Unlink' } ).click();
+		await linkPopover
+			.getByRole( 'button', { name: 'Remove link' } )
+			.click();
 
 		// The link should have been removed.
 		await expect.poll( editor.getBlocks ).toMatchObject( [
@@ -332,10 +304,12 @@ test.describe( 'Links', () => {
 		LinkUtils,
 		pageUtils,
 	} ) => {
-		await LinkUtils.createAndReselectLink();
+		await LinkUtils.createLink();
+		await pageUtils.pressKeys( 'Escape' );
 		// Make a collapsed selection inside the link.
 		await pageUtils.pressKeys( 'ArrowLeft' );
 		await pageUtils.pressKeys( 'ArrowRight' );
+		await editor.clickBlockToolbarButton( 'Link' );
 
 		const linkPopover = LinkUtils.getLinkPopover();
 		await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
@@ -343,7 +317,7 @@ test.describe( 'Links', () => {
 		// Change the URL.
 		// getByPlaceholder required in order to handle Link Control component
 		// managing focus onto other inputs within the control.
-		await page.getByPlaceholder( 'Search or type url' ).fill( '' );
+		await page.getByPlaceholder( 'Search or type URL' ).fill( '' );
 		await page.keyboard.type( '/handbook' );
 
 		// Submit the link.
@@ -384,10 +358,10 @@ test.describe( 'Links', () => {
 		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
 
 		// Insert a link.
-		await editor.clickBlockToolbarButton( 'Link' );
+		await pageUtils.pressKeys( 'primary+k' );
 
 		const urlInput = page.getByRole( 'combobox', {
-			name: 'Link',
+			name: 'Search or type URL',
 		} );
 
 		// Expect the "Link" combobox to be visible and focused
@@ -424,6 +398,31 @@ test.describe( 'Links', () => {
 				},
 			},
 		] );
+
+		// Test pressing escape from the toolbar button should return focus to the toolbar button
+		// Insert a link.
+		await editor.clickBlockToolbarButton( 'Link' );
+
+		// Expect the "Link" combobox to be visible and focused
+		await expect( urlInput ).toBeVisible();
+		await expect( urlInput ).toBeFocused();
+
+		await page.keyboard.press( 'Escape' );
+		await expect( LinkUtils.getLinkPopover() ).toBeHidden();
+
+		// Focus should return to the Link Toolbar Button that opened the popover
+		await expect(
+			page.getByLabel( 'Link', { exact: true } )
+		).toBeFocused();
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'This is Gutenberg and more!',
+				},
+			},
+		] );
 	} );
 
 	test( `can be created and modified using only the keyboard`, async ( {
@@ -441,28 +440,32 @@ test.describe( 'Links', () => {
 		await page.keyboard.type( 'This is Gutenberg' );
 		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
 		await pageUtils.pressKeys( 'primary+K' );
+		const linkPopover = LinkUtils.getLinkPopover();
 		await page.keyboard.type( URL );
 		await pageUtils.pressKeys( 'Enter' );
 
-		const linkPopover = LinkUtils.getLinkPopover();
+		await expect( linkPopover ).toBeVisible();
+		// Close the link control to return the caret to the canvas
+		await pageUtils.pressKeys( 'Escape' );
 
 		// Deselect the link text by moving the caret to the end of the line
 		// and the link popover should not be displayed.
 		await pageUtils.pressKeys( 'End' );
 		await expect( linkPopover ).toBeHidden();
 
-		// Move the caret back into the link text and the link popover
-		// should be displayed.
-		await pageUtils.pressKeys( 'ArrowLeft' );
-		await expect( linkPopover ).toBeVisible();
+		// Move the caret back into and selects the link text.
+		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
+		await expect( linkPopover ).toBeHidden();
 
 		// Switch the Link UI into "Edit" mode via keyboard shortcut
 		// and check that the input has the correct value.
 		await pageUtils.pressKeys( 'primary+K' );
+		await pageUtils.pressKeys( 'Tab' );
+		await pageUtils.pressKeys( 'Enter' );
 
 		await expect(
 			linkPopover.getByRole( 'combobox', {
-				name: 'Link',
+				name: 'Search or type URL',
 			} )
 		).toHaveValue( URL );
 
@@ -474,16 +477,12 @@ test.describe( 'Links', () => {
 
 		// Move back into the RichText.
 		await pageUtils.pressKeys( 'Escape' );
-
-		// ...but the Link Popover should still be active because we are within the link.
-		await expect( linkPopover ).toBeVisible();
+		// Link Popover should be hidden even though it's within the linked text.
+		await expect( linkPopover ).toBeHidden();
 
 		// Move outside of the link entirely.
 		await pageUtils.pressKeys( 'ArrowRight' );
 
-		// Link Popover should now disappear because we are no longer within the link.
-		await expect( linkPopover ).toBeHidden();
-
 		// Append some text to the paragraph to assert that focus has been returned
 		// to the correct location within the RichText.
 		await page.keyboard.type( ' and more!' );
@@ -540,6 +539,11 @@ test.describe( 'Links', () => {
 		// Press Cmd+K to insert a link.
 		await pageUtils.pressKeys( 'primary+K' );
 
+		const linkPopover = LinkUtils.getLinkPopover();
+
+		// Expect link popover to be visible
+		await expect( linkPopover ).toBeVisible();
+
 		// Type a URL.
 		await page.keyboard.type( 'https://wordpress.org/gutenberg' );
 
@@ -552,34 +556,31 @@ test.describe( 'Links', () => {
 			},
 		] );
 
+		// Submit the link.
 		await page.keyboard.press( 'Enter' );
 
-		await page.keyboard.press( 'ArrowLeft' );
-		await page.keyboard.press( 'ArrowLeft' );
+		// Expect the Link UI to still be visible
+		await expect( linkPopover ).toBeVisible();
 
-		// Edit link.
-		await page.getByRole( 'button', { name: 'Edit' } ).click();
+		// Tab to "Edit" button and enter edit mode again.
+		await pageUtils.pressKeys( 'Tab' );
+		await pageUtils.pressKeys( 'Enter' );
 
 		// Open settings.
-		await page
-			.getByRole( 'region', {
-				name: 'Editor content',
-			} )
+		await linkPopover
 			.getByRole( 'button', {
 				name: 'Advanced',
 			} )
 			.click();
 
 		// Navigate to and toggle the "Open in new tab" checkbox.
-		const checkbox = page.getByLabel( 'Open in new tab' );
+		const checkbox = linkPopover.getByLabel( 'Open in new tab' );
 		await checkbox.click();
 
 		// Toggle should still have focus and be checked.
 		await expect( checkbox ).toBeChecked();
 		await expect( checkbox ).toBeFocused();
 
-		const linkPopover = LinkUtils.getLinkPopover();
-
 		// Tab back to the Submit and apply the link.
 		await linkPopover.getByRole( 'button', { name: 'Save' } ).click();
 
@@ -606,13 +607,24 @@ test.describe( 'Links', () => {
 			name: 'core/paragraph',
 		} );
 		await page.keyboard.type( 'This is WordPress' );
+
 		// Select "WordPress".
 		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
 		await pageUtils.pressKeys( 'primary+k' );
+
+		// Close the link control to return the caret to the canvas
+		const linkPopover = LinkUtils.getLinkPopover();
+
 		await page.keyboard.type( 'w.org' );
 
+		// Submit the link
 		await page.keyboard.press( 'Enter' );
 
+		// Close the Link Popover.
+		await pageUtils.pressKeys( 'Escape' );
+
+		await expect( linkPopover ).toBeHidden();
+
 		await expect.poll( editor.getBlocks ).toMatchObject( [
 			{
 				name: 'core/paragraph',
@@ -622,38 +634,28 @@ test.describe( 'Links', () => {
 			},
 		] );
 
-		// Move caret back into the link.
-		await page.keyboard.press( 'ArrowLeft' );
-		await page.keyboard.press( 'ArrowLeft' );
-
-		// Edit link.
+		// Edit the link again.
 		await pageUtils.pressKeys( 'primary+k' );
 
-		// getByPlaceholder required in order to handle Link Control component
+		// Expect Link UI to be visible again
+		await expect( linkPopover ).toBeVisible();
+
+		// Click on the `Edit` button.
+		await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
+
+		// Change the URL.
+		// Note: getByPlaceholder required in order to handle Link Control component
 		// managing focus onto other inputs within the control.
-		await page.getByPlaceholder( 'Search or type url' ).fill( '' );
+		await linkPopover.getByPlaceholder( 'Search or type URL' ).fill( '' );
 		await page.keyboard.type( 'wordpress.org' );
 
-		const linkPopover = LinkUtils.getLinkPopover();
-
-		// Update the link.
+		// Save the link.
 		await linkPopover.getByRole( 'button', { name: 'Save' } ).click();
 
-		// Navigate back to the popover.
-		await page.keyboard.press( 'ArrowLeft' );
-		await page.keyboard.press( 'ArrowLeft' );
-
-		// Navigate back to inputs to verify appears as changed.
-		await pageUtils.pressKeys( 'primary+k' );
-
-		expect(
-			await page
-				.getByRole( 'combobox', {
-					name: 'Link',
-				} )
-				.inputValue()
-		).toContain( 'wordpress.org' );
+		// Link UI should be closed.
+		await expect( linkPopover ).toBeHidden();
 
+		// The link should have been updated.
 		await expect.poll( editor.getBlocks ).toMatchObject( [
 			{
 				name: 'core/paragraph',
@@ -669,6 +671,7 @@ test.describe( 'Links', () => {
 		page,
 		editor,
 		pageUtils,
+		LinkUtils,
 	} ) => {
 		// Create a block with some text.
 		await editor.insertBlock( {
@@ -683,31 +686,28 @@ test.describe( 'Links', () => {
 		await pageUtils.pressKeys( 'primary+k' );
 		await page.keyboard.type( 'w.org' );
 		await page.keyboard.press( 'Enter' );
+		await page.keyboard.press( 'Escape' );
 
 		// Move to edge of text "Gutenberg".
-		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' ); // If you just use Alt here it won't work on windows.
 		await pageUtils.pressKeys( 'ArrowLeft' );
 		await pageUtils.pressKeys( 'ArrowLeft' );
-
 		// Select "Gutenberg".
-		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
+		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' ); // If you just use Alt here it won't work on windows.
 
 		// Create a link.
 		await pageUtils.pressKeys( 'primary+k' );
+
 		await page.keyboard.type( 'https://wordpress.org/plugins/gutenberg/' );
 		await page.keyboard.press( 'Enter' );
 
-		// Move back into the link.
-		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
-		await pageUtils.pressKeys( 'primary+k' );
+		// Press the "Edit" button
+		const linkPopover = LinkUtils.getLinkPopover();
+		await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
 
 		// Toggle the Advanced settings to be open.
 		// This should set the editor preference to persist this
 		// UI state.
-		await page
-			.getByRole( 'region', {
-				name: 'Editor content',
-			} )
+		await linkPopover
 			.getByRole( 'button', {
 				name: 'Advanced',
 			} )
@@ -716,25 +716,25 @@ test.describe( 'Links', () => {
 		// Move focus out of Link UI and into Paragraph block.
 		await pageUtils.pressKeys( 'Escape' );
 
-		// Move caret back into the "WordPress" link to trigger
-		// the Link UI for that link.
-		await pageUtils.pressKeys( 'Alt+ArrowRight' );
-		await pageUtils.pressKeys( 'ArrowRight' );
-		await pageUtils.pressKeys( 'ArrowRight' );
+		// Click on the "WordPress" link
+		await editor.canvas
+			.getByRole( 'link', {
+				name: 'WordPress',
+			} )
+			.click();
 
-		// Switch Link UI to "edit" mode.
-		await page.getByRole( 'button', { name: 'Edit' } ).click();
+		// press the "edit" button
+		await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
 
 		// Check that the Advanced settings are still expanded/open
 		// and I can see the open in new tab checkbox. This verifies
 		// that the editor preference was persisted.
-		await expect( page.getByLabel( 'Open in new tab' ) ).toBeVisible();
+		await expect(
+			linkPopover.getByLabel( 'Open in new tab' )
+		).toBeVisible();
 
 		// Toggle the Advanced settings back to being closed.
-		await page
-			.getByRole( 'region', {
-				name: 'Editor content',
-			} )
+		await linkPopover
 			.getByRole( 'button', {
 				name: 'Advanced',
 			} )
@@ -745,18 +745,24 @@ test.describe( 'Links', () => {
 
 		// Move caret back into the "Gutenberg" link and open
 		// the Link UI for that link.
-		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
-		await pageUtils.pressKeys( 'primary+k' );
+		await editor.canvas
+			.getByRole( 'link', {
+				name: 'Gutenberg',
+			} )
+			.click();
+
+		// Switch to "Edit" mode.
+		await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
 
 		// Check that the Advanced settings are still closed.
 		// This verifies that the editor preference was persisted.
-		await expect( page.getByLabel( 'Open in new tab' ) ).toBeHidden();
+		await expect(
+			linkPopover.getByLabel( 'Open in new tab' )
+		).toBeHidden();
 	} );
 
 	test( 'can toggle link settings and save', async ( {
-		page,
 		editor,
-		pageUtils,
 		LinkUtils,
 	} ) => {
 		await editor.insertBlock( {
@@ -767,31 +773,35 @@ test.describe( 'Links', () => {
 			},
 		} );
 
-		// Move caret into the link.
-		await pageUtils.pressKeys( 'ArrowRight' );
+		// Click on "Gutenberg" link in the canvas
+		await editor.canvas
+			.getByRole( 'link', {
+				name: 'Gutenberg',
+			} )
+			.click();
 
-		// Switch Link UI to "edit" mode.
-		await page.getByRole( 'button', { name: 'Edit' } ).click();
+		// Get the Link Popover using the LinkUtils helper
+		const linkPopover = LinkUtils.getLinkPopover();
+
+		// Switch to Edit the link
+		await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
 
 		// Open Advanced Settings
-		await page
-			.getByRole( 'region', {
-				name: 'Editor content',
-			} )
+		await linkPopover
 			.getByRole( 'button', {
 				name: 'Advanced',
 			} )
 			.click();
 
 		// expect settings for `Open in new tab` and `No follow`
-		await expect( page.getByLabel( 'Open in new tab' ) ).not.toBeChecked();
-		await expect( page.getByLabel( 'nofollow' ) ).not.toBeChecked();
+		await expect(
+			linkPopover.getByLabel( 'Open in new tab' )
+		).not.toBeChecked();
+		await expect( linkPopover.getByLabel( 'nofollow' ) ).not.toBeChecked();
 
 		// Toggle both of the settings
-		await page.getByLabel( 'Open in new tab' ).click();
-		await page.getByLabel( 'nofollow' ).click();
-
-		const linkPopover = LinkUtils.getLinkPopover();
+		await linkPopover.getByLabel( 'Open in new tab' ).click();
+		await linkPopover.getByLabel( 'nofollow' ).click();
 
 		// Save the link
 		await linkPopover.getByRole( 'button', { name: 'Save' } ).click();
@@ -806,17 +816,20 @@ test.describe( 'Links', () => {
 			},
 		] );
 
-		// Move caret back into the link.
-		await page.keyboard.press( 'ArrowRight' );
-		await page.keyboard.press( 'ArrowRight' );
+		// Click on "Gutenberg" link in the canvas again
+		await editor.canvas
+			.getByRole( 'link', {
+				name: 'Gutenberg',
+			} )
+			.click();
 
 		// Edit the link
-		await page.getByRole( 'button', { name: 'Edit' } ).click();
+		await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
 
 		// Toggle both the settings to be off.
 		// Note: no need to toggle settings again because the open setting should be persisted.
-		await page.getByLabel( 'Open in new tab' ).click();
-		await page.getByLabel( 'nofollow' ).click();
+		await linkPopover.getByLabel( 'Open in new tab' ).click();
+		await linkPopover.getByLabel( 'nofollow' ).click();
 
 		// Save the link
 		await linkPopover.getByRole( 'button', { name: 'Save' } ).click();
@@ -832,27 +845,110 @@ test.describe( 'Links', () => {
 		] );
 	} );
 
+	// Fix for https://github.com/WordPress/gutenberg/issues/58322
+	test( 'can click links within the same paragraph to open the correct link preview (@firefox)', async ( {
+		editor,
+		LinkUtils,
+	} ) => {
+		// Create a paragraph with two links
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: {
+				content: `<a href="https://wordpressfoundation.org/donate/">Donate to the WordPress Foundation</a> to support <a href="https://wordpress.org/gutenberg">Gutenberg</a>`,
+			},
+		} );
+
+		// Click on "Gutenberg" link in the canvas
+		await editor.canvas
+			.getByRole( 'link', {
+				name: 'Gutenberg',
+			} )
+			.click();
+
+		const linkPopover = LinkUtils.getLinkPopover();
+		await expect( linkPopover ).toBeVisible();
+		await expect(
+			linkPopover.getByText( 'wordpress.org/gutenberg' )
+		).toBeVisible();
+
+		// Click the other link in the same paragraph. We need a short delay between mousdown and mouseup to get the popover to show
+		await editor.canvas
+			.getByRole( 'link', {
+				name: 'WordPress',
+			} )
+			.click( { delay: 100 } );
+
+		await expect( linkPopover ).toBeVisible();
+		await expect(
+			linkPopover.getByText( 'wordpress.org/gutenberg' )
+		).toBeHidden();
+		await expect(
+			linkPopover.getByText( 'wordpressfoundation.org/donate/' )
+		).toBeVisible();
+	} );
+
 	test.describe( 'Editing link text', () => {
+		test( 'should allow editing text underneath popover when activated via mouse', async ( {
+			page,
+			editor,
+			LinkUtils,
+		} ) => {
+			await LinkUtils.createLink();
+
+			// Click on some other part of the text to move the caret.
+			await editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} )
+				.click();
+
+			// Click on the link to activate the Link UI.
+			const richTextLink = editor.canvas.getByRole( 'link', {
+				name: 'Gutenberg',
+			} );
+
+			await richTextLink.click();
+
+			// Check focus remains in the RichText.
+			await expect(
+				editor.canvas.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} )
+			).toBeFocused();
+
+			// Type to modify the link text.
+			await page.keyboard.type( ' is awesome' );
+
+			// expect link UI to be visible
+			const linkPopover = LinkUtils.getLinkPopover();
+
+			await expect( linkPopover ).toBeVisible();
+
+			// Press "Edit" on Link UI
+			await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
+
+			// Check that the Link Text input reflects the change to the text
+			// made in the RichText.
+			const textInput = linkPopover.getByLabel( 'Text', { exact: true } );
+			await expect( textInput ).toHaveValue( 'Gute is awesomenberg' );
+		} );
+
 		test( 'should allow for modification of link text via the Link UI', async ( {
 			page,
 			pageUtils,
 			editor,
 			LinkUtils,
 		} ) => {
-			await LinkUtils.createAndReselectLink();
+			await LinkUtils.createLink();
 
 			const originalLinkText = 'Gutenberg';
 			const changedLinkText =
 				'    link text that was modified via the Link UI to include spaces     ';
 
-			// Make a collapsed selection inside the link. This is used
-			// as a stress test to ensure we can find the link text from a
-			// collapsed RichTextValue that contains a link format.
-			await pageUtils.pressKeys( 'ArrowLeft' );
-			await pageUtils.pressKeys( 'ArrowRight' );
+			// Get the LinkPopover using the LinkUtils
+			const linkPopover = LinkUtils.getLinkPopover();
 
-			await editor.showBlockToolbar();
-			await page.getByRole( 'button', { name: 'Edit' } ).click();
+			await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
 
 			const textInput = page.getByLabel( 'Text', { exact: true } );
 
@@ -886,7 +982,6 @@ test.describe( 'Links', () => {
 		test( 'should not display text input when initially creating the link', async ( {
 			page,
 			editor,
-			pageUtils,
 			LinkUtils,
 		} ) => {
 			// Create a block with some text.
@@ -895,8 +990,8 @@ test.describe( 'Links', () => {
 			} );
 			await page.keyboard.type( 'This is Gutenberg: ' );
 
-			// Press Cmd+K to insert a link.
-			await pageUtils.pressKeys( 'primary+k' );
+			// Insert a link
+			await editor.clickBlockToolbarButton( 'Link' );
 
 			const linkPopover = LinkUtils.getLinkPopover();
 
@@ -913,13 +1008,15 @@ test.describe( 'Links', () => {
 			pageUtils,
 			LinkUtils,
 		} ) => {
-			await LinkUtils.createAndReselectLink();
+			await LinkUtils.createLink();
+			await pageUtils.pressKeys( 'Escape' );
 
 			// Make a collapsed selection inside the link. This is used
 			// as a stress test to ensure we can find the link text from a
 			// collapsed RichTextValue that contains a link format.
-			await pageUtils.pressKeys( 'ArrowLeft' );
-			await pageUtils.pressKeys( 'ArrowRight' );
+			await pageUtils.pressKeys( 'End' );
+			await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
+			await pageUtils.pressKeys( 'primary+k' );
 
 			const linkPopover = LinkUtils.getLinkPopover();
 
@@ -940,8 +1037,8 @@ test.describe( 'Links', () => {
 			pageUtils,
 			editor,
 		} ) => {
-			const textToSelect = `\u2003\u2003 spaces\u2003 `;
-			const textWithWhitespace = `Text with leading and trailing       spaces    `;
+			const textToSelect = `         spaces     `;
+			const textWithWhitespace = `Text with leading and trailing${ textToSelect }`;
 
 			// Create a block with some text.
 			await editor.insertBlock( {
@@ -976,182 +1073,37 @@ test.describe( 'Links', () => {
 				},
 			] );
 		} );
-
-		test( 'should display (capture the) text from the currently active link even if there is a rich text selection', async ( {
-			editor,
-			pageUtils,
-			LinkUtils,
-		} ) => {
-			const originalLinkText = 'Gutenberg';
-
-			await LinkUtils.createAndReselectLink();
-
-			// Make a collapsed selection inside the link in order
-			// to activate the Link UI.
-			await pageUtils.pressKeys( 'ArrowLeft' );
-			await pageUtils.pressKeys( 'ArrowRight' );
-
-			const linkPopover = LinkUtils.getLinkPopover();
-
-			await linkPopover.getByRole( 'button', { name: 'Edit' } ).click();
-
-			// Place cursor within the underling RichText link (not the Link UI).
-			await editor.canvas
-				.getByRole( 'document', {
-					name: 'Block: Paragraph',
-				} )
-				.getByRole( 'link', {
-					name: 'Gutenberg',
-				} )
-				.click();
-
-			// Make a selection within the RichText.
-			await pageUtils.pressKeys( 'shift+ArrowRight', {
-				times: 3,
-			} );
-
-			// Making a selection within the link text whilst the Link UI
-			// is open should not alter the value in the Link UI's "Text"
-			// field. It should remain as the full text of the currently
-			// focused link format.
-			await expect(
-				linkPopover.getByLabel( 'Text', { exact: true } )
-			).toHaveValue( originalLinkText );
-		} );
 	} );
 
 	test.describe( 'Disabling Link UI active state', () => {
-		test( 'should not show the Link UI when selection extends beyond link boundary', async ( {
+		test( 'should correctly move focus when link control closes on click outside', async ( {
 			page,
 			pageUtils,
-			editor,
 			LinkUtils,
 		} ) => {
-			const linkedText = `Gutenberg`;
-			const textBeyondLinkedText = ` and more text.`;
-
-			// Create a block with some text.
-			await editor.insertBlock( {
-				name: 'core/paragraph',
-			} );
-			await page.keyboard.type(
-				`This is ${ linkedText }${ textBeyondLinkedText }`
-			);
-
-			// Move cursor next to end of `linkedText`.
-			await pageUtils.pressKeys( 'ArrowLeft', {
-				times: textBeyondLinkedText.length,
-			} );
-
-			// Select the linkedText.
-			await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
-
-			// Click on the Link button.
-			await editor.clickBlockToolbarButton( 'Link' );
-
-			// Type a URL.
-			await page.keyboard.type( 'https://wordpress.org/gutenberg' );
-
-			// Update the link.
-			await pageUtils.pressKeys( 'Enter' );
-			// Reactivate the link.
-			await pageUtils.pressKeys( 'ArrowLeft' );
-			await pageUtils.pressKeys( 'ArrowLeft' );
+			await LinkUtils.createLink();
 
 			const linkPopover = LinkUtils.getLinkPopover();
 
 			await expect( linkPopover ).toBeVisible();
 
-			// Make selection starting within the link and moving beyond boundary to the left.
-			await pageUtils.pressKeys( 'shiftAlt+ArrowLeft', {
-				times: linkedText.length,
-			} );
-
-			// The Link UI should have disappeared (i.e. be inactive).
-			await expect( linkPopover ).toBeHidden();
-
-			// Cancel selection and move back within the Link.
-			await pageUtils.pressKeys( 'ArrowRight' );
-
-			// We should see the Link UI displayed again.
-			await expect( linkPopover ).toBeVisible();
-
-			// Make selection starting within the link and moving beyond boundary to the right.
-			await pageUtils.pressKeys( 'shift+ArrowRight', {
-				times: 3,
-			} );
-
-			// The Link UI should have disappeared (i.e. be inactive).
-			await expect( linkPopover ).toBeHidden();
-		} );
-
-		test( 'should not show the Link UI when selection extends into another link', async ( {
-			page,
-			pageUtils,
-			editor,
-			LinkUtils,
-		} ) => {
-			const linkedTextOne = `Gutenberg`;
-			const linkedTextTwo = `Block Editor`;
-			const linkOneURL = 'https://wordpress.org';
-			const linkTwoURL = 'https://wordpress.org/gutenberg';
-
-			// Create a block with some text.
-			await editor.insertBlock( {
-				name: 'core/paragraph',
-			} );
-			await page.keyboard.type(
-				`This is the ${ linkedTextOne }${ linkedTextTwo }`
-			);
-
-			// Select the linkedTextTwo.
-			await pageUtils.pressKeys( 'shift+ArrowLeft', {
-				times: linkedTextTwo.length,
-			} );
+			const optionsButton = page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Options' } );
 
-			// Click on the Link button.
-			await editor.clickBlockToolbarButton( 'Link' );
+			await optionsButton.click();
 
-			// Type a URL.
-			await page.keyboard.type( linkTwoURL );
-
-			// Update the link.
-			await pageUtils.pressKeys( 'Enter' );
-
-			// Move cursor next to the **end** of `linkTextOne`
-			await pageUtils.pressKeys( 'ArrowLeft', {
-				times: linkedTextTwo.length,
-			} );
-
-			// Select `linkTextOne`
-			await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
-
-			// Click on the Link button.
-			await editor.clickBlockToolbarButton( 'Link' );
-
-			// Type a URL.
-			await page.keyboard.type( linkOneURL );
-
-			// Update the link.
-			await pageUtils.pressKeys( 'Enter' );
-
-			// Move cursor within `linkTextOne`
-			await pageUtils.pressKeys( 'ArrowLeft', {
-				times: 3,
-			} );
-
-			const linkPopover = LinkUtils.getLinkPopover();
-
-			// Link UI should activate for `linkTextOne`
-			await expect( linkPopover ).toBeVisible();
-
-			// Expand selection so that it overlaps with `linkTextTwo`
-			await pageUtils.pressKeys( 'ArrowRight', {
-				times: 3,
-			} );
-
-			// Link UI should be inactive.
 			await expect( linkPopover ).toBeHidden();
+			// Expect focus on Top toolbar button within dropdown
+			await expect(
+				page.getByRole( 'menuitemcheckbox', {
+					name: 'Top toolbar Access all block and document tools in a single place',
+				} )
+			).toBeFocused();
+			// Press Escape
+			await pageUtils.pressKeys( 'Escape' );
+			// Expect focus on Top toolbar Options button
+			await expect( optionsButton ).toBeFocused();
 		} );
 
 		// Based on issue reported in https://github.com/WordPress/gutenberg/issues/41771/.
@@ -1228,15 +1180,15 @@ class LinkUtils {
 		await this.page.evaluate( ( _isFixed ) => {
 			const { select, dispatch } = window.wp.data;
 			const isCurrentlyFixed =
-				select( 'core/edit-post' ).isFeatureActive( 'fixedToolbar' );
+				select( 'core/preferences' ).get( 'fixedToolbar' );
 
 			if ( isCurrentlyFixed !== _isFixed ) {
-				dispatch( 'core/edit-post' ).toggleFeature( 'fixedToolbar' );
+				dispatch( 'core/preferences' ).toggle( 'fixedToolbar' );
 			}
 		}, isFixed );
 	}
 
-	async createAndReselectLink() {
+	async createLink() {
 		// Create a block with some text.
 		await this.editor.insertBlock( {
 			name: 'core/paragraph',
@@ -1247,16 +1199,19 @@ class LinkUtils {
 		await this.pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
 
 		// Click on the Link button.
-		await this.page.getByRole( 'button', { name: 'Link' } ).click();
+		await this.pageUtils.pressKeys( 'primary+k' );
+
+		// get the link popover
+		const linkPopover = this.getLinkPopover();
+
+		// Expect link popover to be visible
+		await expect( linkPopover ).toBeVisible();
 
 		// Type a URL.
 		await this.page.keyboard.type( 'https://wordpress.org/gutenberg' );
 
-		// Click on the Submit button.
+		// Submit the link.
 		await this.pageUtils.pressKeys( 'Enter' );
-
-		// Reselect the link.
-		await this.pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
 	}
 
 	/**
diff --git a/test/e2e/specs/editor/blocks/list.spec.js b/test/e2e/specs/editor/blocks/list.spec.js
index 48d50a862a50b4..16126cf9cd29f6 100644
--- a/test/e2e/specs/editor/blocks/list.spec.js
+++ b/test/e2e/specs/editor/blocks/list.spec.js
@@ -8,6 +8,36 @@ test.describe( 'List (@firefox)', () => {
 		await admin.createNewPost();
 	} );
 
+	test( 'can be copied from multi selection', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.insertBlock( { name: 'core/list' } );
+		await page.keyboard.type( 'one' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'two' );
+		await pageUtils.pressKeys( 'primary+a' );
+		await pageUtils.pressKeys( 'primary+a' );
+		await pageUtils.pressKeys( 'primary+c' );
+		await editor.insertBlock( { name: 'core/paragraph' } );
+		await pageUtils.pressKeys( 'primary+v' );
+
+		const copied = `<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li>one</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>two</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->`;
+
+		expect( await editor.getEditedPostContent() ).toBe(
+			copied + '\n\n' + copied
+		);
+	} );
+
 	test( 'can be created by using an asterisk at the start of a paragraph block', async ( {
 		editor,
 		page,
@@ -23,7 +53,7 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.type( 'Another list item' );
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>A list item</li>
 <!-- /wp:list-item -->
 
@@ -48,7 +78,7 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.type( '* ' );
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>test</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
@@ -67,7 +97,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>A list item</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
@@ -234,7 +264,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>I’m a list</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
@@ -253,7 +283,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>test</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
@@ -279,7 +309,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item -->
 
@@ -305,7 +335,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item -->
 
@@ -338,7 +368,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one<br>...</li>
 <!-- /wp:list-item -->
 
@@ -403,7 +433,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:quote -->
 <blockquote class="wp-block-quote"><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item -->
 
@@ -427,7 +457,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
@@ -443,7 +473,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item -->
 
@@ -468,7 +498,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item -->
 
@@ -486,7 +516,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
@@ -496,7 +526,7 @@ test.describe( 'List (@firefox)', () => {
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
@@ -511,7 +541,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item -->
 
@@ -607,7 +637,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
@@ -617,7 +647,7 @@ test.describe( 'List (@firefox)', () => {
 <!-- /wp:paragraph -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>two</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
@@ -635,9 +665,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>two</li>
 <!-- /wp:list-item -->
 
@@ -661,9 +691,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -678,7 +708,7 @@ test.describe( 'List (@firefox)', () => {
 		await editor.clickBlockToolbarButton( 'Ordered' );
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li></li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
@@ -699,9 +729,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list --></li>
@@ -724,7 +754,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:quote -->
 <blockquote class="wp-block-quote"><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>aaa</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
@@ -745,9 +775,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -759,7 +789,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item -->
 
@@ -782,11 +812,11 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -800,9 +830,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item -->
 
@@ -821,9 +851,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -852,11 +882,11 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>b<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -871,13 +901,13 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>b<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -897,7 +927,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a<br></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
@@ -920,7 +950,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item -->
 
@@ -951,11 +981,11 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -970,9 +1000,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item -->
 
@@ -988,9 +1018,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -1006,9 +1036,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -1021,7 +1051,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item -->
 
@@ -1035,7 +1065,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
@@ -1068,13 +1098,13 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>2<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -1098,7 +1128,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item -->
 
@@ -1152,9 +1182,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>2</li>
 <!-- /wp:list-item -->
 
@@ -1178,9 +1208,9 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>2</li>
 <!-- /wp:list-item -->
 
@@ -1213,7 +1243,7 @@ test.describe( 'List (@firefox)', () => {
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>2</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
@@ -1237,7 +1267,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item -->
 
@@ -1269,7 +1299,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item -->
 
@@ -1295,7 +1325,7 @@ test.describe( 'List (@firefox)', () => {
 		// Add empty list block
 		await page.getByPlaceholder( 'Start writing with text or HTML' )
 			.fill( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
@@ -1305,7 +1335,7 @@ test.describe( 'List (@firefox)', () => {
 
 		// Verify no WSOD and content is proper.
 		expect( await editor.getEditedPostContent() ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
@@ -1326,7 +1356,7 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.type( '* c' );
 
 		await expect.poll( editor.getEditedPostContent ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item -->
 
@@ -1336,7 +1366,7 @@ test.describe( 'List (@firefox)', () => {
 <!-- /wp:list -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
@@ -1345,7 +1375,7 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.press( 'Backspace' );
 
 		await expect.poll( editor.getEditedPostContent ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>a</li>
 <!-- /wp:list-item -->
 
@@ -1368,7 +1398,7 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.type( '1' );
 
 		expect( await editor.getEditedPostContent() ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
@@ -1409,7 +1439,7 @@ test.describe( 'List (@firefox)', () => {
 		await page.getByRole( 'menuitem', { name: 'List' } ).click();
 
 		expect( await editor.getEditedPostContent() ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item -->
 
@@ -1519,4 +1549,64 @@ test.describe( 'List (@firefox)', () => {
 			await expect.poll( editor.getBlocks ).toMatchObject( end );
 		} );
 	} );
+
+	test( 'should leave nested list intact when deleting the parent item', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/list',
+			innerBlocks: [
+				{
+					name: 'core/list-item',
+					attributes: { content: '1' },
+				},
+				{
+					name: 'core/list-item',
+					attributes: { content: '' },
+					innerBlocks: [
+						{
+							name: 'core/list',
+							innerBlocks: [
+								{
+									name: 'core/list-item',
+									attributes: { content: 'a' },
+								},
+							],
+						},
+					],
+				},
+				{ name: 'core/list-item', attributes: { content: '3' } },
+			],
+		} );
+
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'Backspace' );
+
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{
+				name: 'core/list',
+				innerBlocks: [
+					{
+						name: 'core/list-item',
+						attributes: { content: '1' },
+						innerBlocks: [
+							{
+								name: 'core/list',
+								innerBlocks: [
+									{
+										name: 'core/list-item',
+										attributes: { content: 'a' },
+									},
+								],
+							},
+						],
+					},
+					{ name: 'core/list-item', attributes: { content: '3' } },
+				],
+			},
+		] );
+	} );
 } );
diff --git a/test/e2e/specs/editor/blocks/missing.spec.js b/test/e2e/specs/editor/blocks/missing.spec.js
index 69c26c3f858762..9186bac17f3484 100644
--- a/test/e2e/specs/editor/blocks/missing.spec.js
+++ b/test/e2e/specs/editor/blocks/missing.spec.js
@@ -9,6 +9,7 @@ test.describe( 'missing block', () => {
 	} );
 
 	test( 'should strip potentially malicious on* attributes', async ( {
+		editor,
 		page,
 	} ) => {
 		let hasAlert = false;
@@ -17,12 +18,9 @@ test.describe( 'missing block', () => {
 			hasAlert = true;
 		} );
 
-		await page.evaluate( () => {
-			const block = window.wp.blocks.parse(
-				`<!-- wp:non-existing-block-here --><img src onerror=alert(1)>`
-			);
-			window.wp.data.dispatch( 'core/block-editor' ).resetBlocks( block );
-		} );
+		await editor.setContent(
+			`<!-- wp:non-existing-block-here --><img src onerror=alert(1)>`
+		);
 
 		// Give the browser time to show the alert.
 		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
@@ -31,6 +29,7 @@ test.describe( 'missing block', () => {
 	} );
 
 	test( 'should strip potentially malicious script tags', async ( {
+		editor,
 		page,
 	} ) => {
 		let hasAlert = false;
@@ -39,12 +38,9 @@ test.describe( 'missing block', () => {
 			hasAlert = true;
 		} );
 
-		await page.evaluate( () => {
-			const block = window.wp.blocks.parse(
-				`<!-- wp:non-existing-block-here --><script>alert("EVIL");</script>`
-			);
-			window.wp.data.dispatch( 'core/block-editor' ).resetBlocks( block );
-		} );
+		await editor.setContent(
+			`<!-- wp:non-existing-block-here --><script>alert("EVIL");</script>`
+		);
 
 		// Give the browser time to show the alert.
 		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
diff --git a/test/e2e/specs/editor/blocks/navigation-colors.spec.js b/test/e2e/specs/editor/blocks/navigation-colors.spec.js
index 1ddd4af8ab2e13..8692b184fb13f9 100644
--- a/test/e2e/specs/editor/blocks/navigation-colors.spec.js
+++ b/test/e2e/specs/editor/blocks/navigation-colors.spec.js
@@ -91,13 +91,13 @@ test.describe( 'Navigation colors', () => {
 		// In the sidebar inspector we add a link color and link hover color to the group block.
 		await editor.openDocumentSettingsSidebar();
 		await page.getByRole( 'tab', { name: 'Styles' } ).click();
-		await page.getByRole( 'button', { name: 'Color Text styles' } ).click();
+		await page.getByRole( 'button', { name: 'Text' } ).click();
 		await page
 			.getByRole( 'option', { name: 'Color: White' } )
 			.click( { force: true } );
 
 		await page
-			.getByRole( 'button', { name: 'Color Background styles' } )
+			.getByRole( 'button', { name: 'Background', exact: true } )
 			.click();
 		await page
 			.getByRole( 'option', { name: 'Color: Black' } )
@@ -148,7 +148,7 @@ test.describe( 'Navigation colors', () => {
 			.getByRole( 'menuitemcheckbox', { name: 'Show Link' } )
 			.click();
 		await page.getByRole( 'tab', { name: 'Styles' } ).click();
-		await page.getByRole( 'button', { name: 'Color Link styles' } ).click();
+		await page.getByRole( 'button', { name: 'Link', exact: true } ).click();
 		// rga(207, 46 ,46) is the color of the "vivid red" color preset.
 		await page
 			.getByRole( 'option', { name: 'Color: Vivid red' } )
diff --git a/test/e2e/specs/editor/blocks/navigation-frontend-interactivity.spec.js b/test/e2e/specs/editor/blocks/navigation-frontend-interactivity.spec.js
index ac6094c3d3eac3..b31533d0d17c24 100644
--- a/test/e2e/specs/editor/blocks/navigation-frontend-interactivity.spec.js
+++ b/test/e2e/specs/editor/blocks/navigation-frontend-interactivity.spec.js
@@ -26,8 +26,8 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 			await admin.visitSiteEditor( {
 				postId: 'emptytheme//header',
 				postType: 'wp_template_part',
+				canvas: 'edit',
 			} );
-			await editor.canvas.locator( 'body' ).click();
 			await requestUtils.createNavigationMenu( {
 				title: 'Hidden menu',
 				content: `
@@ -39,7 +39,9 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 				name: 'core/navigation',
 				attributes: { overlayMenu: 'always' },
 			} );
-			await editor.saveSiteEditorEntities();
+			await editor.saveSiteEditorEntities( {
+				isOnlyCurrentEntityDirty: true,
+			} );
 		} );
 
 		test( 'Overlay menu interactions', async ( { page, pageUtils } ) => {
@@ -112,7 +114,11 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 			// Test: overlay menu focuses on first element after opening
 			await expect( overlayMenuFirstElement ).toBeFocused();
 
-			// Not Tested: overlay menu traps focus
+			// Test: overlay menu traps focus
+			await pageUtils.pressKeys( 'Tab', { times: 2, delay: 50 } );
+			await expect( closeMenuButton ).toBeFocused();
+			await pageUtils.pressKeys( 'Shift+Tab', { times: 2, delay: 50 } );
+			await expect( overlayMenuFirstElement ).toBeFocused();
 
 			// Test: overlay menu closes on click on close menu button
 			await closeMenuButton.click();
@@ -132,8 +138,8 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 			await admin.visitSiteEditor( {
 				postId: 'emptytheme//header',
 				postType: 'wp_template_part',
+				canvas: 'edit',
 			} );
-			await editor.canvas.locator( 'body' ).click();
 			await requestUtils.createNavigationMenu( {
 				title: 'Hidden menu',
 				content: `
@@ -155,7 +161,9 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 				name: 'core/navigation',
 				attributes: { overlayMenu: 'off', openSubmenusOnClick: true },
 			} );
-			await editor.saveSiteEditorEntities();
+			await editor.saveSiteEditorEntities( {
+				isOnlyCurrentEntityDirty: true,
+			} );
 		} );
 
 		test( 'Submenu interactions', async ( { page, pageUtils } ) => {
@@ -345,8 +353,8 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 			await admin.visitSiteEditor( {
 				postId: 'emptytheme//header',
 				postType: 'wp_template_part',
+				canvas: 'edit',
 			} );
-			await editor.canvas.locator( 'body' ).click();
 			await requestUtils.createNavigationMenu( {
 				title: 'Hidden menu',
 				content: `
@@ -362,7 +370,9 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 				name: 'core/navigation',
 				attributes: { overlayMenu: 'off' },
 			} );
-			await editor.saveSiteEditorEntities();
+			await editor.saveSiteEditorEntities( {
+				isOnlyCurrentEntityDirty: true,
+			} );
 		} );
 
 		test( 'submenu click on the arrow interactions', async ( { page } ) => {
@@ -439,8 +449,8 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 			await admin.visitSiteEditor( {
 				postId: 'emptytheme//header',
 				postType: 'wp_template_part',
+				canvas: 'edit',
 			} );
-			await editor.canvas.locator( 'body' ).click();
 			await requestUtils.createNavigationMenu( {
 				title: 'Page list menu',
 				content: `
@@ -452,7 +462,9 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 				name: 'core/navigation',
 				attributes: { overlayMenu: 'off', openSubmenusOnClick: true },
 			} );
-			await editor.saveSiteEditorEntities();
+			await editor.saveSiteEditorEntities( {
+				isOnlyCurrentEntityDirty: true,
+			} );
 		} );
 
 		test( 'page-list submenu user interactions', async ( {
diff --git a/test/e2e/specs/editor/blocks/navigation-list-view.spec.js b/test/e2e/specs/editor/blocks/navigation-list-view.spec.js
index fd7113fe170959..2f9963169a5230 100644
--- a/test/e2e/specs/editor/blocks/navigation-list-view.spec.js
+++ b/test/e2e/specs/editor/blocks/navigation-list-view.spec.js
@@ -103,34 +103,31 @@ test.describe( 'Navigation block - List view editing', () => {
 		await expect(
 			listView
 				.getByRole( 'gridcell', {
-					name: 'Page Link',
+					name: 'Top Level Item 1',
 				} )
 				.filter( {
-					hasText: 'Block 1 of 2, Level 1', // proxy for filtering by description.
+					hasText: 'Block 1 of 2, Level 1.', // proxy for filtering by description.
 				} )
-				.getByText( 'Top Level Item 1' )
 		).toBeVisible();
 
 		await expect(
 			listView
 				.getByRole( 'gridcell', {
-					name: 'Submenu',
+					name: 'Top Level Item 2',
 				} )
 				.filter( {
-					hasText: 'Block 2 of 2, Level 1', // proxy for filtering by description.
+					hasText: 'Block 2 of 2, Level 1.', // proxy for filtering by description.
 				} )
-				.getByText( 'Top Level Item 2' )
 		).toBeVisible();
 
 		await expect(
 			listView
 				.getByRole( 'gridcell', {
-					name: 'Page Link',
+					name: 'Test Submenu Item',
 				} )
 				.filter( {
-					hasText: 'Block 1 of 1, Level 2', // proxy for filtering by description.
+					hasText: 'Block 1 of 1, Level 2.', // proxy for filtering by description.
 				} )
-				.getByText( 'Test Submenu Item' )
 		).toBeVisible();
 	} );
 
@@ -177,7 +174,7 @@ test.describe( 'Navigation block - List view editing', () => {
 		// Expect to see the block inserter.
 		await expect(
 			page.getByRole( 'searchbox', {
-				name: 'Search for blocks and patterns',
+				name: 'Search',
 			} )
 		).toBeFocused();
 
@@ -241,12 +238,11 @@ test.describe( 'Navigation block - List view editing', () => {
 		await expect(
 			listView
 				.getByRole( 'gridcell', {
-					name: 'Page Link',
+					name: firstResultText,
 				} )
 				.filter( {
-					hasText: 'Block 3 of 3, Level 1', // proxy for filtering by description.
+					hasText: 'Block 3 of 3, Level 1.', // proxy for filtering by description.
 				} )
-				.getByText( firstResultText )
 		).toBeVisible();
 	} );
 
@@ -262,35 +258,45 @@ test.describe( 'Navigation block - List view editing', () => {
 			description: 'Structure for navigation menu: Test Menu',
 		} );
 
-		const submenuOptions = listView.getByRole( 'button', {
-			name: 'Options for Submenu',
-		} );
+		const subMenuItem = listView
+			.getByRole( 'gridcell', {
+				name: 'Top Level Item 2',
+			} )
+			.filter( {
+				hasText: 'Block 2 of 2, Level 1.', // proxy for filtering by description.
+			} );
+
+		// The options menu button is a sibling of the menu item gridcell.
+		const subMenuItemActions = subMenuItem
+			.locator( '..' ) // parent selector.
+			.getByRole( 'button', {
+				name: 'Options',
+			} );
 
-		// Open the options menu.
-		await submenuOptions.click();
+		// Open the actions menu.
+		await subMenuItemActions.click();
 
 		// usage of `page` is required because the options menu is rendered into a slot
 		// outside of the treegrid.
-		const removeBlockOption = page
+		const removeBlockAction = page
 			.getByRole( 'menu', {
-				name: 'Options for Submenu',
+				name: 'Options',
 			} )
 			.getByRole( 'menuitem', {
 				name: 'Remove Top Level Item 2',
 			} );
 
-		await removeBlockOption.click();
+		await removeBlockAction.click();
 
 		// Check the menu item was removed.
 		await expect(
 			listView
 				.getByRole( 'gridcell', {
-					name: 'Submenu',
+					name: 'Top Level Item 2',
 				} )
 				.filter( {
-					hasText: 'Block 2 of 2, Level 1', // proxy for filtering by description.
+					hasText: 'Block 2 of 2, Level 1.', // proxy for filtering by description.
 				} )
-				.getByText( 'Top Level Item 2' )
 		).toBeHidden();
 	} );
 
@@ -307,12 +313,9 @@ test.describe( 'Navigation block - List view editing', () => {
 		} );
 
 		// Click on the first menu item to open its settings.
-		const firstMenuItemAnchor = listView
-			.getByRole( 'link', {
-				name: 'Page',
-				includeHidden: true,
-			} )
-			.getByText( 'Top Level Item 1' );
+		const firstMenuItemAnchor = listView.getByRole( 'link', {
+			name: 'Top Level Item 1',
+		} );
 		await firstMenuItemAnchor.click();
 
 		// Get the settings panel.
@@ -346,7 +349,7 @@ test.describe( 'Navigation block - List view editing', () => {
 		).toBeVisible();
 
 		const labelInput = blockSettings.getByRole( 'textbox', {
-			name: 'Label',
+			name: 'Text',
 		} );
 
 		await expect( labelInput ).toHaveValue( 'Top Level Item 1' );
@@ -373,12 +376,11 @@ test.describe( 'Navigation block - List view editing', () => {
 		await expect(
 			listViewPanel
 				.getByRole( 'gridcell', {
-					name: 'Page Link',
+					name: 'Changed label', // new menu item text
 				} )
 				.filter( {
-					hasText: 'Block 1 of 2, Level 1', // proxy for filtering by description.
+					hasText: 'Block 1 of 2, Level 1.', // proxy for filtering by description.
 				} )
-				.getByText( 'Changed label' ) // new label text
 		).toBeVisible();
 	} );
 
@@ -402,34 +404,34 @@ test.describe( 'Navigation block - List view editing', () => {
 		// click on options menu for the first menu item and select remove.
 		const firstMenuItem = listView
 			.getByRole( 'gridcell', {
-				name: 'Page Link',
+				name: 'Top Level Item 1',
 			} )
 			.filter( {
-				hasText: 'Block 1 of 2, Level 1', // proxy for filtering by description.
+				hasText: 'Block 1 of 2, Level 1.', // proxy for filtering by description.
 			} );
 
 		// The options menu button is a sibling of the menu item gridcell.
-		const firstItemOptions = firstMenuItem
+		const firstItemActions = firstMenuItem
 			.locator( '..' ) // parent selector.
 			.getByRole( 'button', {
-				name: 'Options for Page Link',
+				name: 'Options',
 			} );
 
-		// Open the options menu.
-		await firstItemOptions.click();
+		// Open the actions menu.
+		await firstItemActions.click();
 
 		// Add the submenu.
 		// usage of `page` is required because the options menu is rendered into a slot
 		// outside of the treegrid.
-		const addSubmenuOption = page
+		const addSubmenuAction = page
 			.getByRole( 'menu', {
-				name: 'Options for Page Link',
+				name: 'Options',
 			} )
 			.getByRole( 'menuitem', {
 				name: 'Add submenu',
 			} );
 
-		await addSubmenuOption.click();
+		await addSubmenuAction.click();
 
 		await linkControl.searchFor( 'https://wordpress.org' );
 
@@ -439,12 +441,11 @@ test.describe( 'Navigation block - List view editing', () => {
 		await expect(
 			listView
 				.getByRole( 'gridcell', {
-					name: 'Custom Link',
+					name: 'wordpress.org',
 				} )
 				.filter( {
-					hasText: 'Block 1 of 1, Level 2', // proxy for filtering by description.
+					hasText: 'Block 1 of 1, Level 2.', // proxy for filtering by description.
 				} )
-				.getByText( 'wordpress.org' )
 		).toBeVisible();
 
 		// Check that the original item is still there but that it is now
@@ -452,12 +453,11 @@ test.describe( 'Navigation block - List view editing', () => {
 		await expect(
 			listView
 				.getByRole( 'gridcell', {
-					name: 'Submenu',
+					name: 'Top Level Item 1',
 				} )
 				.filter( {
-					hasText: 'Block 1 of 2, Level 1', // proxy for filtering by description.
+					hasText: 'Block 1 of 2, Level 1.', // proxy for filtering by description.
 				} )
-				.getByText( 'Top Level Item 1' )
 		).toBeVisible();
 	} );
 
@@ -543,6 +543,42 @@ test.describe( 'Navigation block - List view editing', () => {
 		// we have unmounted the list view and then remounted it).
 		await expect( linkControl.getSearchInput() ).toBeHidden();
 	} );
+
+	test( `can create a new menu without losing focus`, async ( {
+		page,
+		editor,
+		requestUtils,
+	} ) => {
+		await requestUtils.createNavigationMenu( navMenuBlocksFixture );
+
+		await editor.insertBlock( { name: 'core/navigation' } );
+
+		await editor.openDocumentSettingsSidebar();
+
+		await page.getByLabel( 'Test Menu' ).click();
+
+		await page.keyboard.press( 'ArrowUp' );
+
+		await expect(
+			page.getByRole( 'menuitem', { name: 'Create new Menu' } )
+		).toBeFocused();
+
+		await page.keyboard.press( 'Enter' );
+
+		await expect(
+			page.getByText( 'This Navigation Menu is empty.' )
+		).toBeVisible();
+
+		// Move focus to the appender
+		await page.keyboard.press( 'ArrowDown' );
+		await expect(
+			editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Navigation',
+				} )
+				.getByLabel( 'Add block' )
+		).toBeFocused();
+	} );
 } );
 
 class LinkControl {
@@ -552,7 +588,7 @@ class LinkControl {
 
 	getSearchInput() {
 		return this.page.getByRole( 'combobox', {
-			name: 'Link',
+			name: 'Search or type URL',
 		} );
 	}
 
diff --git a/test/e2e/specs/editor/blocks/navigation.spec.js b/test/e2e/specs/editor/blocks/navigation.spec.js
index 4757ccbb4a00f5..83e95a08c0f6a2 100644
--- a/test/e2e/specs/editor/blocks/navigation.spec.js
+++ b/test/e2e/specs/editor/blocks/navigation.spec.js
@@ -8,6 +8,22 @@ test.describe( 'Navigation block', () => {
 		await requestUtils.deleteAllMenus();
 	} );
 
+	test.beforeAll( async ( { requestUtils } ) => {
+		// We need pages to be published so the Link Control can return pages
+		await requestUtils.createPage( {
+			title: 'Cat',
+			status: 'publish',
+		} );
+		await requestUtils.createPage( {
+			title: 'Dog',
+			status: 'publish',
+		} );
+		await requestUtils.createPage( {
+			title: 'Walrus',
+			status: 'publish',
+		} );
+	} );
+
 	test.afterAll( async ( { requestUtils } ) => {
 		await requestUtils.deleteAllMenus();
 	} );
@@ -15,10 +31,17 @@ test.describe( 'Navigation block', () => {
 	test.afterEach( async ( { requestUtils } ) => {
 		await Promise.all( [
 			requestUtils.deleteAllPosts(),
+			requestUtils.deleteAllPages(),
 			requestUtils.deleteAllMenus(),
 		] );
 	} );
 
+	test.use( {
+		navigation: async ( { page, pageUtils, editor }, use ) => {
+			await use( new Navigation( { page, pageUtils, editor } ) );
+		},
+	} );
+
 	test.describe( 'As a user I want the navigation block to fallback to the best possible default', () => {
 		test( 'default to a list of pages if there are no menus', async ( {
 			admin,
@@ -203,6 +226,8 @@ test.describe( 'Navigation block', () => {
 				name: 'Add submenu',
 			} );
 			await addSubmenuButton.click();
+			await page.keyboard.type( '#yup' );
+			await page.keyboard.press( 'Enter' );
 
 			const postId = await editor.publishPost();
 			await page.goto( `/?p=${ postId }` );
@@ -286,10 +311,219 @@ test.describe( 'Navigation block', () => {
 		// Find the warning message
 		const warningMessage = editor.canvas
 			.getByRole( 'document', { name: 'Block: Navigation' } )
-			.getByText( 'Navigation menu has been deleted or is unavailable.' );
+			.getByText( 'Navigation Menu has been deleted or is unavailable.' );
 		await expect( warningMessage ).toBeVisible();
 	} );
 
+	test( 'navigation manages focus for creating, editing, and deleting items', async ( {
+		admin,
+		page,
+		pageUtils,
+		editor,
+		requestUtils,
+		navigation,
+	} ) => {
+		await admin.createNewPost();
+
+		await requestUtils.createNavigationMenu( {
+			title: 'Animals',
+			content: '',
+		} );
+
+		await editor.insertBlock( { name: 'core/navigation' } );
+
+		const navBlock = navigation.getNavBlock();
+
+		const navBlockInserter = navigation.getNavBlockInserter();
+		// Wait until the nav block inserter is visible before we continue. Otherwise the navigation block may not have finished being created.
+		await expect( navBlockInserter ).toBeVisible();
+
+		/**
+		 * Test: We don't lose focus when using the navigation link appender
+		 */
+		await pageUtils.pressKeys( 'ArrowDown' );
+		await navigation.useBlockInserter();
+		await navigation.addLinkClose();
+		/**
+		 * TODO: This is not desired behavior. Ideally the
+		 * Appender should be focused again since it opened
+		 * the link control.
+		 * IMPORTANT: This check is not to enforce this behavior,
+		 * but to make sure focus is kept nearby until we are able
+		 * to send focus to the appender.
+		 */
+		await expect( navBlock ).toBeFocused();
+
+		/**
+		 * Test: Creating a link sends focus to the newly created navigation link item
+		 */
+		await pageUtils.pressKeys( 'ArrowDown' );
+
+		await navigation.useBlockInserter();
+		await navigation.addPage( 'Cat' );
+		/**
+		 * Test: We can open and close the preview with the keyboard and escape
+		 *       buttons from a top-level nav item using both the shortcut and toolbar
+		 */
+		await navigation.useLinkShortcut();
+		await navigation.previewIsOpenAndCloses();
+		await navigation.checkLabelFocus( 'Cat' );
+
+		await navigation.canUseToolbarLink();
+
+		/**
+		 * Test: Creating a link from a url-string (https://www.example.com) returns
+		 *       focus to the newly created link with the text selected
+		 */
+		// Move focus to the Add Block Appender.
+		await page.keyboard.press( 'Escape' );
+		await pageUtils.pressKeys( 'ArrowDown' );
+		await pageUtils.pressKeys( 'ArrowRight', { times: 2 } );
+
+		await navigation.useBlockInserter();
+		await navigation.addCustomURL( 'https://example.com' );
+		await navigation.expectToHaveTextSelected( 'example.com' );
+
+		/**
+		 * Test: We can open and close the preview with the keyboard and escape
+		 *       buttons from a top-level nav link with a url-like label using
+		 *       both the shortcut and toolbar
+		 */
+		await pageUtils.pressKeys( 'ArrowLeft' );
+		await navigation.useLinkShortcut();
+		await navigation.previewIsOpenAndCloses();
+		await navigation.checkLabelFocus( 'example.com' );
+
+		await navigation.canUseToolbarLink();
+
+		/**
+		 * Test: Can add submenu item using the keyboard
+		 */
+		navigation.useToolbarButton( 'Add submenu' );
+
+		// Expect the submenu Add link to be present
+		await expect(
+			editor.canvas.locator( 'a' ).filter( { hasText: 'Add link' } )
+		).toBeVisible();
+
+		await pageUtils.pressKeys( 'ArrowDown' );
+		// There is a bug that won't allow us to press Enter to add the link: https://github.com/WordPress/gutenberg/issues/60051
+		// TODO: Use Enter after that bug is resolved
+		await navigation.useLinkShortcut();
+
+		await navigation.addPage( 'Dog' );
+
+		/**
+		 * Test: We can open and close the preview with the keyboard and escape
+		 *       buttons from a submenu nav item using both the shortcut and toolbar
+		 */
+		await navigation.useLinkShortcut();
+		await navigation.previewIsOpenAndCloses();
+		await navigation.checkLabelFocus( 'Dog' );
+
+		await navigation.canUseToolbarLink();
+
+		// Return to nav label from toolbar
+		await page.keyboard.press( 'Escape' );
+
+		// We should be at the first position on the label
+		await navigation.checkLabelFocus( 'Dog' );
+
+		/**
+		 * Test: We don't lose focus when closing the submenu appender
+		 */
+
+		// Move focus to the submenu navigation appender
+		await page.keyboard.press( 'End' );
+		await pageUtils.pressKeys( 'ArrowRight', { times: 2 } );
+		await navigation.useBlockInserter();
+		await navigation.addLinkClose();
+		/**
+		 * TODO: This is not desired behavior. Ideally the
+		 * Appender should be focused again since it opened
+		 * the link control.
+		 * IMPORTANT: This check is not to enforce this behavior,
+		 * but to make sure focus is kept nearby until we are able
+		 * to send focus to the appender. It is falling back to the previous sibling.
+		 */
+		await navigation.checkLabelFocus( 'Dog' );
+
+		/**
+		 * Test: Use the submenu nav item appender to add a custom link
+		 */
+		await page.keyboard.press( 'End' );
+		await pageUtils.pressKeys( 'ArrowRight', { times: 2 } );
+		await navigation.useBlockInserter();
+		await navigation.addCustomURL( 'https://wordpress.org' );
+		await navigation.expectToHaveTextSelected( 'wordpress.org' );
+
+		/**
+		 * Test: We can open and close the preview with the keyboard and escape
+		 *       both the shortcut and toolbar
+		 */
+		await pageUtils.pressKeys( 'ArrowLeft' );
+		await navigation.useLinkShortcut();
+		await navigation.previewIsOpenAndCloses();
+		await navigation.checkLabelFocus( 'wordpress.org' );
+		await navigation.canUseToolbarLink();
+
+		/**
+		 * Test: We can open and close the preview from a submenu navigation block (the top-level parent of a submenu)
+		 * using both the shortcut and toolbar
+		 */
+		// Exit the toolbar
+		await page.keyboard.press( 'Escape' );
+		// Move to the submenu item
+		await pageUtils.pressKeys( 'ArrowUp', { times: 4 } );
+		await page.keyboard.press( 'Home' );
+
+		// Check we're on our submenu link
+		await navigation.checkLabelFocus( 'example.com' );
+		// Test the shortcut
+		await navigation.useLinkShortcut();
+		await navigation.previewIsOpenAndCloses();
+		await navigation.checkLabelFocus( 'example.com' );
+		// Test the toolbar
+		await navigation.canUseToolbarLink();
+		await page.keyboard.press( 'Escape' );
+		await navigation.checkLabelFocus( 'example.com' );
+
+		/**
+		 * Deleting returns items focus to its sibling
+		 */
+		await pageUtils.pressKeys( 'ArrowDown', { times: 4 } );
+		await navigation.checkLabelFocus( 'wordpress.org' );
+		// Delete the nav link
+		await pageUtils.pressKeys( 'access+z' );
+		// Focus moved to sibling
+		await navigation.checkLabelFocus( 'Dog' );
+		// Add a link back so we can delete the first submenu link and see if focus returns to the parent submenu item
+		await page.keyboard.press( 'End' );
+		await pageUtils.pressKeys( 'ArrowRight', { times: 2 } );
+		await navigation.useBlockInserter();
+		await navigation.addCustomURL( 'https://wordpress.org' );
+		await navigation.expectToHaveTextSelected( 'wordpress.org' );
+
+		await pageUtils.pressKeys( 'ArrowUp', { times: 2 } );
+		await navigation.checkLabelFocus( 'Dog' );
+		// Delete the nav link
+		await pageUtils.pressKeys( 'access+z' );
+		await pageUtils.pressKeys( 'ArrowDown' );
+		// Focus moved to parent submenu item
+		await navigation.checkLabelFocus( 'example.com' );
+		// Deleting this should move focus to the sibling item
+		await pageUtils.pressKeys( 'access+z' );
+		await navigation.checkLabelFocus( 'Cat' );
+		// Deleting with no more siblings should focus the navigation block again
+		await pageUtils.pressKeys( 'access+z' );
+		await expect( navBlock ).toBeFocused();
+		// Wait until the nav block inserter is visible before we continue.
+		await expect( navBlockInserter ).toBeVisible();
+		// Now the appender should be visible and reachable with an arrow down
+		await pageUtils.pressKeys( 'ArrowDown' );
+		await expect( navBlockInserter ).toBeFocused();
+	} );
+
 	test( 'Adding new links to a navigation block with existing inner blocks triggers creation of a single Navigation Menu', async ( {
 		admin,
 		page,
@@ -354,3 +588,227 @@ test.describe( 'Navigation block', () => {
 		).toHaveLength( 1 );
 	} );
 } );
+
+class Navigation {
+	constructor( { page, pageUtils, editor } ) {
+		this.page = page;
+		this.pageUtils = pageUtils;
+		this.editor = editor;
+	}
+
+	getLinkControlLink( linkName ) {
+		return this.page.getByRole( 'link', {
+			name: `${ linkName } (opens in a new tab)`,
+			exact: true,
+		} );
+	}
+
+	getNavBlock() {
+		return this.editor.canvas.getByRole( 'document', {
+			name: 'Block: Navigation',
+		} );
+	}
+
+	getNavBlockInserter() {
+		return this.getNavBlock().getByLabel( 'Add block' );
+	}
+
+	getLinkControlSearch() {
+		return this.page.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
+	}
+
+	getToolbarLinkButton() {
+		return this.page.getByRole( 'button', {
+			name: 'Link',
+			exact: true,
+		} );
+	}
+
+	async useBlockInserter() {
+		const navBlockInserter = this.getNavBlockInserter();
+
+		// Wait until the nav block inserter is visible before we move on to using it
+		await expect( navBlockInserter ).toBeVisible();
+
+		await expect( navBlockInserter ).toBeFocused();
+
+		await this.page.keyboard.press( 'Enter' );
+	}
+
+	async useLinkShortcut() {
+		await this.pageUtils.pressKeys( 'primary+k' );
+	}
+
+	/**
+	 * Moves focus to the toolbar and arrows to the button and activates it.
+	 *
+	 * @param {string} name the name of the toolbar button
+	 */
+	async useToolbarButton( name ) {
+		await this.pageUtils.pressKeys( 'alt+F10' );
+		await this.arrowToLabel( name );
+		await expect(
+			this.page.getByRole( 'button', {
+				name,
+				exact: true,
+			} )
+		).toBeFocused();
+
+		await this.page.keyboard.press( 'Enter' );
+	}
+
+	/**
+	 * Adds a page via the link control and closes it.
+	 * Usage:
+	 * - Open the new link control however you'd like (block appender, command+k on Add link label...)
+	 *
+	 * @param {string} label Text of page you want added. Must be a part of the pages added in the beforeAll in this test suite.
+	 */
+	async addPage( label ) {
+		const linkControlSearch = this.page.getByRole( 'combobox', {
+			name: 'Search or type URL',
+		} );
+
+		await expect( linkControlSearch ).toBeFocused();
+
+		await this.page.keyboard.type( label, { delay: 50 } );
+
+		await this.pageUtils.pressKeys( 'ArrowDown' );
+
+		await this.page.keyboard.press( 'Enter' );
+
+		const linkControlLink = await this.getLinkControlLink( label );
+		await expect( linkControlLink ).toBeFocused();
+
+		await this.page.keyboard.press( 'Escape' );
+
+		await expect( linkControlSearch ).toBeHidden();
+
+		await this.checkLabelFocus( label );
+	}
+
+	/**
+	 * Adds a custom url via the link control.
+	 * Usage:
+	 * - Open the new link control however you'd like (block appender, command+k on Add link label...)
+	 * - Expect focus to return to the canvas with the url label highlighted
+	 *
+	 * @param {string} url URL you want added to the navigation
+	 */
+	async addCustomURL( url ) {
+		await expect( this.getLinkControlSearch() ).toBeFocused();
+
+		await this.page.keyboard.type( url, { delay: 50 } );
+		await this.page.keyboard.press( 'Enter' );
+	}
+
+	/**
+	 * Checks if the passed string matches the current editor selection
+	 *
+	 * @param {string} text Text you want to see if it's selected
+	 */
+	async expectToHaveTextSelected( text ) {
+		expect(
+			await this.editor.canvas
+				.locator( ':root' )
+				.evaluate( () => window.getSelection().toString() )
+		).toBe( text );
+	}
+
+	/**
+	 * Closes the new link popover when used from the block appender
+	 */
+	async addLinkClose() {
+		const linkControlSearch = this.getLinkControlSearch();
+
+		await expect( linkControlSearch ).toBeFocused();
+
+		await this.page.keyboard.press( 'Escape' );
+
+		await expect( linkControlSearch ).toBeHidden();
+	}
+
+	/**
+	 * Checks that we are focused on a specific navigation item.
+	 * It will return the caret to the beginning of the item.
+	 *
+	 * @param {string} label Nav label text
+	 */
+	async checkLabelFocus( label ) {
+		await this.page.keyboard.press( 'Home' );
+		// Select all the text
+		await this.pageUtils.pressKeys( 'Shift+End' );
+		await this.expectToHaveTextSelected( label );
+		// Move caret back to starting position
+		await this.pageUtils.pressKeys( 'ArrowLeft' );
+	}
+
+	/**
+	 * Checks:
+	 * - the preview is open
+	 * - has focus within it
+	 * - closes with Escape
+	 * - The popover is now hidden
+	 */
+	async previewIsOpenAndCloses() {
+		const linkPopover = this.getLinkPopover();
+		await expect( linkPopover ).toBeVisible();
+		// Expect focus to be within the link control. We could be more exact here, but it would be more brittle that way. We really care if focus is within it or not.
+		expect(
+			await this.page.evaluate( () => {
+				const { activeElement } =
+					document.activeElement?.contentDocument ?? document;
+				return !! activeElement.closest(
+					'.components-popover__content .block-editor-link-control'
+				);
+			} )
+		).toBe( true );
+
+		await this.page.keyboard.press( 'Escape' );
+
+		await expect( linkPopover ).toBeHidden();
+	}
+
+	/**
+	 * When focus is within a navigation link item, we should be able to:
+	 * - use the toolbar link button to open the popover
+	 * - have focus within the popover
+	 * - close it usingn escape to return focus to the toolbar button
+	 */
+	async canUseToolbarLink() {
+		await this.useToolbarButton( 'Link' );
+		await this.previewIsOpenAndCloses();
+		await expect( this.getToolbarLinkButton() ).toBeFocused();
+	}
+
+	async arrowToLabel( label, times = 15 ) {
+		for ( let i = 0; i < times; i++ ) {
+			await this.pageUtils.pressKeys( 'ArrowRight' );
+			const activeLabel = await this.page.evaluate( () => {
+				return (
+					document.activeElement.getAttribute( 'aria-label' ) ||
+					document.activeElement.textContent
+				);
+			} );
+			if ( activeLabel === label ) {
+				return;
+			}
+		}
+	}
+
+	/**
+	 * This method is used as a temporary workaround for retriveing the
+	 * LinkControl component. This is because it currently does not expose
+	 * any accessible attributes. In general we should avoid using this method
+	 * and instead rely on locating the sub elements of the component directly.
+	 * Remove / update method once the following PR has landed:
+	 * https://github.com/WordPress/gutenberg/pull/54063.
+	 */
+	getLinkPopover() {
+		return this.page.locator(
+			'.components-popover__content .block-editor-link-control'
+		);
+	}
+}
diff --git a/test/e2e/specs/editor/blocks/paragraph.spec.js b/test/e2e/specs/editor/blocks/paragraph.spec.js
index 142b01be282d48..4918ac3d619b5a 100644
--- a/test/e2e/specs/editor/blocks/paragraph.spec.js
+++ b/test/e2e/specs/editor/blocks/paragraph.spec.js
@@ -236,8 +236,9 @@ test.describe( 'Paragraph', () => {
 
 				{
 					// Dragging on the top half of the heading block.
+					// Make sure to target the top dropzone by dragging > 30px inside the block.
 					await draggingUtils.dragOver(
-						headingBox.x,
+						headingBox.x + 32,
 						headingBox.y + 1
 					);
 					await expect( draggingUtils.dropZone ).toBeVisible();
@@ -252,8 +253,9 @@ test.describe( 'Paragraph', () => {
 
 				{
 					// Dragging on the bottom half of the heading block.
+					// Make sure to target the bottom dropzone by dragging > 30px inside the block.
 					await draggingUtils.dragOver(
-						headingBox.x,
+						headingBox.x + 32,
 						headingBox.y + headingBox.height - 1
 					);
 					await expect( draggingUtils.dropZone ).toBeHidden();
@@ -268,6 +270,26 @@ test.describe( 'Paragraph', () => {
 						)
 						.toBeGreaterThan( headingBox.y + headingBox.height );
 				}
+
+				{
+					// Dragging on the right edge of the heading block.
+					// Targets the right hand dropzone.
+					await draggingUtils.dragOver(
+						headingBox.x + headingBox.width - 1,
+						headingBox.y + headingBox.height - 1
+					);
+					await expect( draggingUtils.dropZone ).toBeHidden();
+					await expect(
+						draggingUtils.insertionIndicator
+					).toBeVisible();
+					await expect
+						.poll( () =>
+							draggingUtils.insertionIndicator
+								.boundingBox()
+								.then( ( { x, width } ) => x + width )
+						)
+						.toBe( headingBox.x + headingBox.width );
+				}
 			} );
 
 			test( 'Only the second block is an empty paragraph block', async ( {
@@ -299,7 +321,7 @@ test.describe( 'Paragraph', () => {
 				{
 					// Dragging on the top half of the heading block.
 					await draggingUtils.dragOver(
-						headingBox.x,
+						headingBox.x + 32,
 						headingBox.y + 1
 					);
 					await expect( draggingUtils.dropZone ).toBeHidden();
@@ -318,7 +340,7 @@ test.describe( 'Paragraph', () => {
 				{
 					// Dragging on the bottom half of the heading block.
 					await draggingUtils.dragOver(
-						headingBox.x,
+						headingBox.x + 32,
 						headingBox.y + headingBox.height - 1
 					);
 					await expect( draggingUtils.dropZone ).toBeVisible();
diff --git a/test/e2e/specs/editor/blocks/post-comments-form.spec.js b/test/e2e/specs/editor/blocks/post-comments-form.spec.js
new file mode 100644
index 00000000000000..db75771dc09154
--- /dev/null
+++ b/test/e2e/specs/editor/blocks/post-comments-form.spec.js
@@ -0,0 +1,49 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Comments Form', () => {
+	let originalCommentStatus;
+
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'emptytheme' );
+		await requestUtils.deleteAllTemplates( 'wp_template' );
+	} );
+
+	test.beforeEach( async ( { requestUtils } ) => {
+		const siteSettings = await requestUtils.getSiteSettings();
+		originalCommentStatus = siteSettings.default_comment_status;
+	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.updateSiteSettings( {
+			default_comment_status: originalCommentStatus,
+		} );
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+
+	test( 'placeholder displays in the site editor even when comments are closed by default', async ( {
+		admin,
+		editor,
+	} ) => {
+		// Navigate to "Singular" post template
+		await admin.visitSiteEditor( {
+			postId: 'emptytheme//singular',
+			postType: 'wp_template',
+			canvas: 'edit',
+		} );
+
+		// Insert post comments form
+		await editor.insertBlock( { name: 'core/post-comments-form' } );
+
+		// Ensure the placeholder is there
+		const postCommentsFormBlock = editor.canvas.locator(
+			'role=document[name="Block: Comments Form"i]'
+		);
+		await expect( postCommentsFormBlock.locator( 'form' ) ).toBeVisible();
+	} );
+} );
diff --git a/test/e2e/specs/editor/blocks/quote.spec.js b/test/e2e/specs/editor/blocks/quote.spec.js
index d25dedd4a0a397..d5457ad10bbd08 100644
--- a/test/e2e/specs/editor/blocks/quote.spec.js
+++ b/test/e2e/specs/editor/blocks/quote.spec.js
@@ -146,8 +146,9 @@ test.describe( 'Quote', () => {
 			await page.keyboard.type( 'one' );
 			await page.keyboard.press( 'Enter' );
 			await page.keyboard.type( 'two' );
-			// Navigate to the citation to select the block.
-			await page.keyboard.press( 'ArrowRight' );
+			await editor.clickBlockToolbarButton(
+				'Select parent block: Quote'
+			);
 			await editor.clickBlockOptionsMenuItem( 'Ungroup' );
 			expect( await editor.getEditedPostContent() ).toBe(
 				`<!-- wp:paragraph -->
@@ -168,7 +169,10 @@ test.describe( 'Quote', () => {
 			await page.keyboard.type( 'one' );
 			await page.keyboard.press( 'Enter' );
 			await page.keyboard.type( 'two' );
-			await page.keyboard.press( 'ArrowRight' );
+			await editor.clickBlockToolbarButton(
+				'Select parent block: Quote'
+			);
+			await editor.clickBlockToolbarButton( 'Add citation' );
 			await page.keyboard.type( 'cite' );
 			await editor.clickBlockOptionsMenuItem( 'Ungroup' );
 			expect( await editor.getEditedPostContent() ).toBe(
@@ -191,7 +195,8 @@ test.describe( 'Quote', () => {
 			page,
 		} ) => {
 			await editor.insertBlock( { name: 'core/quote' } );
-			await page.keyboard.press( 'ArrowRight' );
+			await page.keyboard.press( 'ArrowUp' );
+			await editor.clickBlockToolbarButton( 'Add citation' );
 			await page.keyboard.type( 'cite' );
 			await editor.clickBlockOptionsMenuItem( 'Ungroup' );
 			expect( await editor.getEditedPostContent() ).toBe(
@@ -211,7 +216,7 @@ test.describe( 'Quote', () => {
 		} ) => {
 			await editor.insertBlock( { name: 'core/quote' } );
 			// Select the quote
-			await page.keyboard.press( 'ArrowRight' );
+			await page.keyboard.press( 'ArrowUp' );
 			await editor.clickBlockOptionsMenuItem( 'Ungroup' );
 			expect( await editor.getEditedPostContent() ).toBe( '' );
 		} );
@@ -238,7 +243,8 @@ test.describe( 'Quote', () => {
 		await page.keyboard.type( 'one' );
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.type( 'two' );
-		await page.keyboard.press( 'ArrowRight' );
+		await editor.clickBlockToolbarButton( 'Select parent block: Quote' );
+		await editor.clickBlockToolbarButton( 'Add citation' );
 		await page.keyboard.type( 'cite' );
 		await editor.transformBlockTo( 'core/pullquote' );
 		expect( await editor.getEditedPostContent() ).toBe(
@@ -301,7 +307,8 @@ test.describe( 'Quote', () => {
 	} ) => {
 		await editor.insertBlock( { name: 'core/quote' } );
 		await page.keyboard.type( '1' );
-		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.press( 'ArrowUp' );
+		await editor.clickBlockToolbarButton( 'Add citation' );
 		await page.keyboard.type( '2' );
 		expect( await editor.getEditedPostContent() ).toBe(
 			`<!-- wp:quote -->
@@ -311,7 +318,7 @@ test.describe( 'Quote', () => {
 <!-- /wp:quote -->`
 		);
 		// Move the cursor to the start of the first paragraph of the quoted block.
-		await pageUtils.pressKeys( 'ArrowLeft', { times: 4 } );
+		await pageUtils.pressKeys( 'ArrowLeft', { times: 3 } );
 		await page.keyboard.press( 'Backspace' );
 		expect( await editor.getEditedPostContent() ).toBe(
 			`<!-- wp:paragraph -->
@@ -331,12 +338,15 @@ test.describe( 'Quote', () => {
 	} ) => {
 		await editor.insertBlock( { name: 'core/quote' } );
 		await page.keyboard.type( '1' );
-		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.press( 'ArrowUp' );
+		await editor.clickBlockToolbarButton( 'Add citation' );
 		await page.keyboard.type( '2' );
 		await pageUtils.pressKeys( 'Shift+ArrowUp' );
 		let error;
 		page.on( 'console', ( msg ) => {
-			if ( msg.type() === 'error' ) error = msg.text();
+			if ( msg.type() === 'error' ) {
+				error = msg.text();
+			}
 		} );
 		await page.keyboard.press( 'Backspace' );
 		expect( error ).toBeUndefined();
diff --git a/test/e2e/specs/editor/blocks/rss.spec.js b/test/e2e/specs/editor/blocks/rss.spec.js
new file mode 100644
index 00000000000000..1f6b640926b7c0
--- /dev/null
+++ b/test/e2e/specs/editor/blocks/rss.spec.js
@@ -0,0 +1,31 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'RSS', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	// See: https://github.com/WordPress/gutenberg/pull/61389.
+	test( 'should retain native copy/paste behavior for input fields', async ( {
+		editor,
+		pageUtils,
+	} ) => {
+		await editor.insertBlock( { name: 'core/rss' } );
+		pageUtils.setClipboardData( {
+			plainText: 'https://developer.wordpress.org/news/feed/',
+		} );
+		await pageUtils.pressKeys( 'primary+v' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/rss',
+				attributes: {
+					feedURL: 'https://developer.wordpress.org/news/feed/',
+				},
+			},
+		] );
+	} );
+} );
diff --git a/test/e2e/specs/editor/blocks/search.spec.js b/test/e2e/specs/editor/blocks/search.spec.js
index d11efd7328afeb..3a72f99b7cf0b3 100644
--- a/test/e2e/specs/editor/blocks/search.spec.js
+++ b/test/e2e/specs/editor/blocks/search.spec.js
@@ -44,28 +44,10 @@ test.describe( 'Search', () => {
 		} );
 		await navBlockInserter.click();
 
-		// Expect to see the block inserter.
-		await expect(
-			page.getByRole( 'searchbox', {
-				name: 'Search for blocks and patterns',
-			} )
-		).toBeFocused();
+		await page.getByRole( 'button', { name: 'Add block' } ).click();
 
-		// Search for the Search block.
-		await page.keyboard.type( 'Search' );
-
-		const blockResults = page.getByRole( 'listbox', {
-			name: 'Blocks',
-		} );
-
-		await expect( blockResults ).toBeVisible();
-
-		const searchBlockResult = blockResults.getByRole( 'option', {
-			name: 'Search',
-		} );
-
-		// Select the Search block.
-		await searchBlockResult.click();
+		// Click on the Search block option.
+		await page.getByRole( 'option', { name: 'Search' } ).click();
 
 		// Expect to see the Search block.
 		const searchBlock = editor.canvas.getByRole( 'document', {
diff --git a/test/e2e/specs/editor/blocks/table.spec.js b/test/e2e/specs/editor/blocks/table.spec.js
index 1e6dfdcd76e188..92e209e88aeb17 100644
--- a/test/e2e/specs/editor/blocks/table.spec.js
+++ b/test/e2e/specs/editor/blocks/table.spec.js
@@ -275,10 +275,11 @@ test.describe( 'Table', () => {
 			.locator( 'role=button[name="Create Table"i]' )
 			.click();
 
-		// Click the first cell and add some text.
-		await editor.canvas
-			.locator( 'role=document[name="Block: Table"i] >> figcaption' )
-			.click();
+		await editor.clickBlockToolbarButton( 'Add caption' );
+		const caption = editor.canvas.locator(
+			'role=textbox[name="Table caption text"i]'
+		);
+		await expect( caption ).toBeFocused();
 		await page.keyboard.type( 'Caption!' );
 		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
 	} );
diff --git a/test/e2e/specs/editor/plugins/allowed-blocks.spec.js b/test/e2e/specs/editor/plugins/allowed-blocks.spec.js
index 4211e428238218..ed7490afe84fe9 100644
--- a/test/e2e/specs/editor/plugins/allowed-blocks.spec.js
+++ b/test/e2e/specs/editor/plugins/allowed-blocks.spec.js
@@ -21,13 +21,13 @@ test.describe( 'Allowed Blocks Filter', () => {
 	} ) => {
 		// The paragraph block is available.
 		await page
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		const searchbox = page
 			.getByRole( 'region', { name: 'Block Library' } )
 			.getByRole( 'searchbox', {
-				name: 'Search for blocks and patterns',
+				name: 'Search',
 			} );
 
 		await searchbox.fill( 'Paragraph' );
diff --git a/test/e2e/specs/editor/plugins/block-context.spec.js b/test/e2e/specs/editor/plugins/block-context.spec.js
index 1fc91debd1145f..c819f29bc7383d 100644
--- a/test/e2e/specs/editor/plugins/block-context.spec.js
+++ b/test/e2e/specs/editor/plugins/block-context.spec.js
@@ -64,7 +64,11 @@ test.describe( 'Block context', () => {
 			.fill( '123' );
 
 		await editorPage
-			.getByRole( 'button', { name: 'Preview', expanded: false } )
+			.getByRole( 'button', {
+				name: 'View',
+				expanded: false,
+				exact: true,
+			} )
 			.click();
 		await editorPage
 			.getByRole( 'menuitem', { name: 'Preview in new tab' } )
diff --git a/test/e2e/specs/editor/plugins/block-directory.spec.js b/test/e2e/specs/editor/plugins/block-directory.spec.js
index 28700e787e8836..2fa4ee33e6c1ab 100644
--- a/test/e2e/specs/editor/plugins/block-directory.spec.js
+++ b/test/e2e/specs/editor/plugins/block-directory.spec.js
@@ -122,7 +122,7 @@ test.describe( 'Block Directory', () => {
 
 		await page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		const blockLibrary = page.getByRole( 'region', {
@@ -135,7 +135,7 @@ test.describe( 'Block Directory', () => {
 		 */
 		await blockLibrary
 			.getByRole( 'searchbox', {
-				name: 'Search for blocks and patterns',
+				name: 'Search',
 			} )
 			.fill( '@$@@Dsdsdfw2$@' );
 
@@ -209,7 +209,7 @@ test.describe( 'Block Directory', () => {
 
 		await page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		const blockLibrary = page.getByRole( 'region', {
@@ -226,7 +226,7 @@ test.describe( 'Block Directory', () => {
 
 		await blockLibrary
 			.getByRole( 'searchbox', {
-				name: 'Search for blocks and patterns',
+				name: 'Search',
 			} )
 			.fill( MOCK_BLOCK1.title );
 
diff --git a/test/e2e/specs/editor/plugins/block-icons.spec.js b/test/e2e/specs/editor/plugins/block-icons.spec.js
index 0418f4200afc05..3a00b41b9e71ed 100644
--- a/test/e2e/specs/editor/plugins/block-icons.spec.js
+++ b/test/e2e/specs/editor/plugins/block-icons.spec.js
@@ -26,7 +26,7 @@ test.describe( 'Block Icons', () => {
 	test( 'Block with svg icon', async ( { editor, page } ) => {
 		await page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		const blockLibrary = page.getByRole( 'region', {
@@ -60,7 +60,7 @@ test.describe( 'Block Icons', () => {
 	test( 'Block with dash icon', async ( { editor, page } ) => {
 		await page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		const blockLibrary = page.getByRole( 'region', {
@@ -100,7 +100,7 @@ test.describe( 'Block Icons', () => {
 	test( 'Block with function icon', async ( { editor, page } ) => {
 		await page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		const blockLibrary = page.getByRole( 'region', {
@@ -137,7 +137,7 @@ test.describe( 'Block Icons', () => {
 	} ) => {
 		await page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		const blockLibrary = page.getByRole( 'region', {
@@ -185,7 +185,7 @@ test.describe( 'Block Icons', () => {
 	} ) => {
 		await page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		const blockLibrary = page.getByRole( 'region', {
diff --git a/test/e2e/specs/editor/plugins/block-variations.spec.js b/test/e2e/specs/editor/plugins/block-variations.spec.js
index 9f12c987efd39b..3f71d2b57d9fd1 100644
--- a/test/e2e/specs/editor/plugins/block-variations.spec.js
+++ b/test/e2e/specs/editor/plugins/block-variations.spec.js
@@ -22,13 +22,13 @@ test.describe( 'Block variations', () => {
 		page,
 	} ) => {
 		await page
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		await page
 			.getByRole( 'region', { name: 'Block Library' } )
 			.getByRole( 'searchbox', {
-				name: 'Search for blocks and patterns',
+				name: 'Search',
 			} )
 			.fill( 'Quote' );
 
@@ -63,13 +63,13 @@ test.describe( 'Block variations', () => {
 		page,
 	} ) => {
 		await page
-			.getByRole( 'button', { name: 'Toggle block inserter' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
 			.click();
 
 		await page
 			.getByRole( 'region', { name: 'Block Library' } )
 			.getByRole( 'searchbox', {
-				name: 'Search for blocks and patterns',
+				name: 'Search',
 			} )
 			.fill( 'Paragraph' );
 
@@ -133,7 +133,7 @@ test.describe( 'Block variations', () => {
 		await page.keyboard.press( 'Enter' );
 
 		// Select the quote block.
-		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'ArrowUp' );
 
 		await expect(
 			page
diff --git a/test/e2e/specs/editor/plugins/child-blocks.spec.js b/test/e2e/specs/editor/plugins/child-blocks.spec.js
index b3073b70a5409a..765b4040a4b976 100644
--- a/test/e2e/specs/editor/plugins/child-blocks.spec.js
+++ b/test/e2e/specs/editor/plugins/child-blocks.spec.js
@@ -19,7 +19,7 @@ test.describe( 'Child Blocks', () => {
 	test( 'are hidden from the global block inserter', async ( { page } ) => {
 		const blockInserter = page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } );
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } );
 		const blockLibrary = page.getByRole( 'region', {
 			name: 'Block Library',
 		} );
@@ -47,10 +47,14 @@ test.describe( 'Child Blocks', () => {
 
 		const blockInserter = page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } );
-		const blockLibrary = page.getByRole( 'region', {
-			name: 'Block Library',
-		} );
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } );
+		const blockLibrary = page
+			.getByRole( 'region', {
+				name: 'Block Library',
+			} )
+			.locator(
+				'.block-editor-inserter__insertable-blocks-at-selection'
+			);
 
 		await blockInserter.click();
 		await expect( blockLibrary ).toBeVisible();
@@ -81,10 +85,14 @@ test.describe( 'Child Blocks', () => {
 
 		const blockInserter = page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } );
-		const blockLibrary = page.getByRole( 'region', {
-			name: 'Block Library',
-		} );
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } );
+		const blockLibrary = page
+			.getByRole( 'region', {
+				name: 'Block Library',
+			} )
+			.locator(
+				'.block-editor-inserter__insertable-blocks-at-selection'
+			);
 
 		await blockInserter.click();
 		await expect( blockLibrary ).toBeVisible();
diff --git a/test/e2e/specs/editor/plugins/custom-post-types.spec.js b/test/e2e/specs/editor/plugins/custom-post-types.spec.js
index 17a497f26cee02..67372d46c61a70 100644
--- a/test/e2e/specs/editor/plugins/custom-post-types.spec.js
+++ b/test/e2e/specs/editor/plugins/custom-post-types.spec.js
@@ -31,21 +31,12 @@ test.describe( 'Test Custom Post Types', () => {
 		await editor.openDocumentSettingsSidebar();
 		await page
 			.getByRole( 'region', { name: 'Editor settings' } )
-			.getByRole( 'button', {
+			.getByRole( 'tab', {
 				name: 'Hierarchical No Title',
 			} )
 			.click();
 
-		// Open the Document -> Page Attributes panel.
-		const pageAttributes = page.getByRole( 'button', {
-			name: 'Page Attributes',
-		} );
-		const isClosed =
-			( await pageAttributes.getAttribute( 'aria-expanded' ) ) ===
-			'false';
-		if ( isClosed ) {
-			await pageAttributes.click();
-		}
+		await page.locator( '.editor-post-parent__panel-toggle' ).click();
 
 		const parentPageLocator = page.getByRole( 'combobox', {
 			name: 'Parent',
@@ -62,19 +53,32 @@ test.describe( 'Test Custom Post Types', () => {
 		await editor.publishPost();
 		await page.reload();
 
+		await page.locator( '.editor-post-parent__panel-toggle' ).click();
+
 		// Confirm parent page selection matches after reloading.
 		await expect( parentPageLocator ).toHaveValue( parentPage );
 	} );
 
+	test( 'should not be able to rename a post that lacks title support', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost( { postType: 'hierar-no-title' } );
+		await editor.openDocumentSettingsSidebar();
+		await page.getByRole( 'button', { name: 'Actions' } ).click();
+		await expect(
+			page.getByRole( 'menuitem', { name: 'Rename' } )
+		).toHaveCount( 0 );
+	} );
+
 	test( 'should create a cpt with a legacy block in its template without WSOD', async ( {
 		admin,
 		editor,
 		page,
 	} ) => {
 		await admin.createNewPost( { postType: 'leg_block_in_tpl' } );
-		await editor.canvas
-			.locator( 'role=button[name="Add default block"i]' )
-			.click();
+		await editor.insertBlock( { name: 'core/paragraph' } );
 		await page.keyboard.type( 'Hello there' );
 
 		await expect.poll( editor.getBlocks ).toMatchObject( [
diff --git a/test/e2e/specs/editor/plugins/inner-blocks-allowed-blocks.spec.js b/test/e2e/specs/editor/plugins/inner-blocks-allowed-blocks.spec.js
index eaf171adf9313c..4ee6d7a0fc4fec 100644
--- a/test/e2e/specs/editor/plugins/inner-blocks-allowed-blocks.spec.js
+++ b/test/e2e/specs/editor/plugins/inner-blocks-allowed-blocks.spec.js
@@ -45,10 +45,14 @@ test.describe( 'Allowed Blocks Setting on InnerBlocks', () => {
 
 		const blockInserter = page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } );
-		const blockLibrary = page.getByRole( 'region', {
-			name: 'Block Library',
-		} );
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } );
+		const blockLibrary = page
+			.getByRole( 'region', {
+				name: 'Block Library',
+			} )
+			.locator(
+				'.block-editor-inserter__insertable-blocks-at-selection'
+			);
 
 		await blockInserter.click();
 		await expect( blockLibrary ).toBeVisible();
@@ -88,10 +92,14 @@ test.describe( 'Allowed Blocks Setting on InnerBlocks', () => {
 
 		const blockInserter = page
 			.getByRole( 'toolbar', { name: 'Document tools' } )
-			.getByRole( 'button', { name: 'Toggle block inserter' } );
-		const blockLibrary = page.getByRole( 'region', {
-			name: 'Block Library',
-		} );
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } );
+		const blockLibrary = page
+			.getByRole( 'region', {
+				name: 'Block Library',
+			} )
+			.locator(
+				'.block-editor-inserter__insertable-blocks-at-selection'
+			);
 
 		await blockInserter.click();
 		await expect( blockLibrary ).toBeVisible();
diff --git a/test/e2e/specs/editor/plugins/inner-blocks-render-appender.spec.js b/test/e2e/specs/editor/plugins/inner-blocks-render-appender.spec.js
index 9886bd00fe2b66..a76d6c6439e2ef 100644
--- a/test/e2e/specs/editor/plugins/inner-blocks-render-appender.spec.js
+++ b/test/e2e/specs/editor/plugins/inner-blocks-render-appender.spec.js
@@ -94,6 +94,9 @@ test.describe( 'RenderAppender prop of InnerBlocks', () => {
 		// Insert a quote block.
 		await blockListBox.getByRole( 'option', { name: 'Quote' } ).click();
 
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'ArrowUp' );
+
 		// Verify if the custom block appender text changed as expected.
 		await expect(
 			dynamimcAppender.getByText( 'Single Blocks Appender' )
diff --git a/test/e2e/specs/editor/plugins/meta-boxes.spec.js b/test/e2e/specs/editor/plugins/meta-boxes.spec.js
index 5999dc07aeafe0..511b3837f80303 100644
--- a/test/e2e/specs/editor/plugins/meta-boxes.spec.js
+++ b/test/e2e/specs/editor/plugins/meta-boxes.spec.js
@@ -26,7 +26,7 @@ test.describe( 'Meta boxes', () => {
 		await expect( saveDraft ).toBeDisabled();
 
 		// Add title to enable valid non-empty post save.
-		await page
+		await editor.canvas
 			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'Hello Meta' );
 
@@ -44,7 +44,7 @@ test.describe( 'Meta boxes', () => {
 		page,
 	} ) => {
 		// Publish a post so there's something for the latest posts dynamic block to render.
-		await page
+		await editor.canvas
 			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'A published post' );
 		await page.keyboard.press( 'Enter' );
@@ -53,7 +53,7 @@ test.describe( 'Meta boxes', () => {
 
 		// Publish a post with the latest posts dynamic block.
 		await admin.createNewPost();
-		await page
+		await editor.canvas
 			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'Dynamic block test' );
 		await editor.insertBlock( { name: 'core/latest-posts' } );
@@ -70,10 +70,12 @@ test.describe( 'Meta boxes', () => {
 		editor,
 		page,
 	} ) => {
-		await page
+		await editor.canvas
 			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'A published post' );
-		await page.getByRole( 'button', { name: 'Add default block' } ).click();
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
 		await page.keyboard.type( 'Excerpt from content.' );
 
 		const postId = await editor.publishPost();
@@ -89,27 +91,20 @@ test.describe( 'Meta boxes', () => {
 		page,
 	} ) => {
 		await editor.openDocumentSettingsSidebar();
-		await page.getByRole( 'button', { name: 'Add default block' } ).click();
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
 		await page.keyboard.type( 'Excerpt from content.' );
-		await page
+		await editor.canvas
 			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'A published post' );
 
-		const documentSettings = page.getByRole( 'region', {
-			name: 'Editor settings',
-		} );
-		const excerptButton = documentSettings.getByRole( 'button', {
-			name: 'Excerpt',
+		const excerptButton = page.getByRole( 'button', {
+			name: 'Add an excerpt…',
 		} );
+		await excerptButton.click();
 
-		// eslint-disable-next-line playwright/no-conditional-in-test
-		if (
-			( await excerptButton.getAttribute( 'aria-expanded' ) ) === 'false'
-		) {
-			await excerptButton.click();
-		}
-
-		await documentSettings
+		await page
 			.getByRole( 'textbox', { name: 'Write an Excerpt' } )
 			.fill( 'Explicitly set excerpt.' );
 
diff --git a/test/e2e/specs/editor/plugins/pattern-recursion.spec.js b/test/e2e/specs/editor/plugins/pattern-recursion.spec.js
new file mode 100644
index 00000000000000..c688f3580c3701
--- /dev/null
+++ b/test/e2e/specs/editor/plugins/pattern-recursion.spec.js
@@ -0,0 +1,85 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Preventing Pattern Recursion (client)', () => {
+	test.beforeEach( async ( { admin, editor, page } ) => {
+		await admin.createNewPost();
+		await editor.canvas
+			.locator( 'role=button[name="Add default block"i]' )
+			.click();
+		await page.evaluate( () => {
+			window.wp.data.dispatch( 'core/block-editor' ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'evil/recursive',
+						title: 'Evil recursive',
+						description: 'Evil recursive',
+						content:
+							'<!-- wp:paragraph --><p>Hello</p><!-- /wp:paragraph --><!-- wp:pattern {"slug":"evil/recursive"} /-->',
+					},
+				],
+			} );
+		} );
+	} );
+
+	test( 'prevents infinite loops due to recursive patterns', async ( {
+		editor,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/pattern',
+			attributes: { slug: 'evil/recursive' },
+		} );
+		const warning = editor.canvas.getByText(
+			'Pattern "evil/recursive" cannot be rendered inside itself'
+		);
+		await expect( warning ).toBeVisible();
+	} );
+} );
+
+test.describe( 'Preventing Pattern Recursion (server)', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activatePlugin(
+			'gutenberg-test-protection-against-recursive-patterns'
+		);
+	} );
+
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deactivatePlugin(
+			'gutenberg-test-protection-against-recursive-patterns'
+		);
+	} );
+
+	test( 'prevents infinite loops due to recursive patterns', async ( {
+		page,
+		editor,
+	} ) => {
+		// Click the Block Inserter button
+		await page
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+		// Click the Patterns tab
+		await page.getByRole( 'tab', { name: 'Patterns' } ).click();
+		// Click the Uncategorized tab
+		await page.getByRole( 'tab', { name: 'Uncategorized' } ).click();
+		// Click the Evil recursive pattern
+		await page.getByRole( 'option', { name: 'Evil recursive' } ).click();
+		// By simply checking the editor content, we know that the pattern
+		// endpoint did not crash.
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'Hello' },
+			},
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'Hello' },
+			},
+		] );
+	} );
+} );
diff --git a/test/e2e/specs/editor/plugins/plugins-api-error-boundary.spec.js b/test/e2e/specs/editor/plugins/plugins-api-error-boundary.spec.js
index 25f528be8a0083..99423a4c247dbf 100644
--- a/test/e2e/specs/editor/plugins/plugins-api-error-boundary.spec.js
+++ b/test/e2e/specs/editor/plugins/plugins-api-error-boundary.spec.js
@@ -22,8 +22,9 @@ test.describe( 'Plugins API Error Boundary', () => {
 	} ) => {
 		let hasError = false;
 		page.on( 'console', ( msg ) => {
-			if ( msg.type() === 'error' && msg.text().includes( 'Whoops!' ) )
+			if ( msg.type() === 'error' && msg.text().includes( 'Whoops!' ) ) {
 				hasError = true;
+			}
 		} );
 
 		await admin.createNewPost();
diff --git a/test/e2e/specs/editor/plugins/plugins-api.spec.js b/test/e2e/specs/editor/plugins/plugins-api.spec.js
index c71b49e3c4d815..c7f3a655e14240 100644
--- a/test/e2e/specs/editor/plugins/plugins-api.spec.js
+++ b/test/e2e/specs/editor/plugins/plugins-api.spec.js
@@ -230,4 +230,25 @@ test.describe( 'Plugins API', () => {
 			).toBeVisible();
 		} );
 	} );
+
+	test.describe( 'Preview Menu Item', () => {
+		test( 'Should render and interact with PluginPreviewMenuItem', async ( {
+			page,
+		} ) => {
+			await page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.locator( '.editor-preview-dropdown__toggle' )
+				.click();
+
+			const customPreviewItem = page.getByRole( 'menuitem', {
+				name: 'Custom Preview',
+			} );
+
+			await expect( customPreviewItem ).toBeVisible();
+
+			await customPreviewItem.click();
+
+			await expect( customPreviewItem ).toBeHidden();
+		} );
+	} );
 } );
diff --git a/test/e2e/specs/editor/plugins/post-type-locking.spec.js b/test/e2e/specs/editor/plugins/post-type-locking.spec.js
index 5c1d6ebf06dac0..ff02d18c51464b 100644
--- a/test/e2e/specs/editor/plugins/post-type-locking.spec.js
+++ b/test/e2e/specs/editor/plugins/post-type-locking.spec.js
@@ -21,14 +21,6 @@ test.describe( 'Post-type locking', () => {
 			await admin.createNewPost( { postType: 'locked-all-post' } );
 		} );
 
-		test( 'should disable the inserter', async ( { page } ) => {
-			await expect(
-				page
-					.getByRole( 'toolbar', { name: 'Document tools' } )
-					.getByRole( 'button', { name: 'Toggle block inserter' } )
-			).toBeDisabled();
-		} );
-
 		test( 'should not allow blocks to be removed', async ( {
 			editor,
 			page,
@@ -147,31 +139,6 @@ test.describe( 'Post-type locking', () => {
 				'The content of your post doesn’t match the template assigned to your post type.'
 			);
 		} );
-
-		test( 'should not allow blocks to be inserted in inner blocks', async ( {
-			editor,
-			page,
-		} ) => {
-			await editor.canvas
-				.getByRole( 'button', {
-					name: 'Two columns; equal split',
-				} )
-				.click();
-
-			await expect(
-				page
-					.getByRole( 'document', {
-						name: 'Block: Column (1 of 2)',
-					} )
-					.getByRole( 'button', { name: 'Add block' } )
-			).toBeHidden();
-
-			await expect(
-				page
-					.getByRole( 'toolbar', { name: 'Document tools' } )
-					.getByRole( 'button', { name: 'Toggle block inserter' } )
-			).toBeDisabled();
-		} );
 	} );
 
 	test.describe( 'template_lock insert', () => {
@@ -179,14 +146,6 @@ test.describe( 'Post-type locking', () => {
 			await admin.createNewPost( { postType: 'locked-insert-post' } );
 		} );
 
-		test( 'should disable the inserter', async ( { page } ) => {
-			await expect(
-				page
-					.getByRole( 'toolbar', { name: 'Document tools' } )
-					.getByRole( 'button', { name: 'Toggle block inserter' } )
-			).toBeDisabled();
-		} );
-
 		test( 'should not allow blocks to be removed', async ( {
 			editor,
 			page,
@@ -249,7 +208,10 @@ test.describe( 'Post-type locking', () => {
 			await expect(
 				page
 					.getByRole( 'toolbar', { name: 'Document tools' } )
-					.getByRole( 'button', { name: 'Toggle block inserter' } )
+					.getByRole( 'button', {
+						name: 'Block Inserter',
+						exact: true,
+					} )
 			).toBeEnabled();
 
 			await editor.insertBlock( { name: 'core/list' } );
@@ -369,6 +331,48 @@ test.describe( 'Post-type locking', () => {
 				},
 			] );
 		} );
+
+		test( 'should allow blocks to be switched to other types', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.canvas
+				.getByRole( 'document', {
+					name: 'Empty block',
+				} )
+				.first()
+				.fill( 'p1' );
+
+			const blockSwitcher = page
+				.getByRole( 'toolbar', { name: 'Block tools' } )
+				.getByRole( 'button', { name: 'Paragraph' } );
+
+			// Verify the block switcher exists.
+			await expect( blockSwitcher ).toHaveAttribute(
+				'aria-haspopup',
+				'true'
+			);
+
+			// Verify the correct block transforms appear.
+			await blockSwitcher.click();
+			await expect(
+				page
+					.getByRole( 'menu', { name: 'Paragraph' } )
+					.getByRole( 'menuitem' )
+			).toHaveText( [
+				'Heading',
+				'List',
+				'Quote',
+				'Buttons',
+				'Code',
+				'Columns',
+				'Details',
+				'Group',
+				'Preformatted',
+				'Pullquote',
+				'Verse',
+			] );
+		} );
 	} );
 
 	test.describe( 'template_lock all locked group', () => {
diff --git a/test/e2e/specs/editor/plugins/register-block-type-hooks.spec.js b/test/e2e/specs/editor/plugins/register-block-type-hooks.spec.js
index 2ec62ffd056d31..a7e6f970179a4a 100644
--- a/test/e2e/specs/editor/plugins/register-block-type-hooks.spec.js
+++ b/test/e2e/specs/editor/plugins/register-block-type-hooks.spec.js
@@ -18,7 +18,7 @@ test.describe( 'Register block type hooks', () => {
 	} );
 
 	test( 'has a custom category for Paragraph block', async ( { page } ) => {
-		await page.click( 'role=button[name="Toggle block inserter"i]' );
+		await page.click( 'role=button[name="Block Inserter"i]' );
 
 		expect(
 			page.locator(
diff --git a/test/e2e/specs/editor/plugins/wp-editor-meta-box.spec.js b/test/e2e/specs/editor/plugins/wp-editor-meta-box.spec.js
index 710e06b35e124f..c5eafdafe918db 100644
--- a/test/e2e/specs/editor/plugins/wp-editor-meta-box.spec.js
+++ b/test/e2e/specs/editor/plugins/wp-editor-meta-box.spec.js
@@ -20,7 +20,7 @@ test.describe( 'WP Editor Meta Boxes', () => {
 		await admin.createNewPost();
 
 		// Add title to enable valid non-empty post save.
-		await page
+		await editor.canvas
 			.locator( 'role=textbox[name="Add title"i]' )
 			.type( 'Hello Meta' );
 
diff --git a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-copy-and-paste-individual-blocks-with-collapsed-selection-2-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-copy-and-paste-individual-blocks-with-collapsed-selection-2-chromium.txt
index 3dac62748e8e02..4d6ec0a8f5f5b5 100644
--- a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-copy-and-paste-individual-blocks-with-collapsed-selection-2-chromium.txt
+++ b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-copy-and-paste-individual-blocks-with-collapsed-selection-2-chromium.txt
@@ -3,9 +3,5 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph -->
-<p>2</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Copy - collapsed selection</p>
+<p>2Copy - collapsed selection</p>
 <!-- /wp:paragraph -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-cut-and-paste-individual-blocks-with-collapsed-selection-2-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-cut-and-paste-individual-blocks-with-collapsed-selection-2-chromium.txt
index ad1a1ef6e5c723..4a58677b62c4c3 100644
--- a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-cut-and-paste-individual-blocks-with-collapsed-selection-2-chromium.txt
+++ b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-cut-and-paste-individual-blocks-with-collapsed-selection-2-chromium.txt
@@ -1,7 +1,3 @@
 <!-- wp:paragraph -->
-<p>2</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Cut - collapsed selection</p>
+<p>2Cut - collapsed selection</p>
 <!-- /wp:paragraph -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-link-to-formatted-text-1-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-link-to-formatted-text-1-chromium.txt
new file mode 100644
index 00000000000000..73ed4090549910
--- /dev/null
+++ b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-link-to-formatted-text-1-chromium.txt
@@ -0,0 +1,3 @@
+<!-- wp:paragraph -->
+<p><strong>t<a href="https://wordpress.org/gutenberg">es</a>t</strong></p>
+<!-- /wp:paragraph -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-list-in-list-1-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-list-in-list-1-chromium.txt
new file mode 100644
index 00000000000000..7f74d7fd8b3d03
--- /dev/null
+++ b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-list-in-list-1-chromium.txt
@@ -0,0 +1,9 @@
+<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li>x</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>y‸</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-paragraphs-in-list-1-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-paragraphs-in-list-1-chromium.txt
new file mode 100644
index 00000000000000..7f74d7fd8b3d03
--- /dev/null
+++ b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-paragraphs-in-list-1-chromium.txt
@@ -0,0 +1,9 @@
+<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li>x</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>y‸</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-plain-text-in-plain-text-context-when-cross-block-selection-is-copied-2-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-plain-text-in-plain-text-context-when-cross-block-selection-is-copied-2-chromium.txt
index 356ee09a32df62..2f13cd0939822f 100644
--- a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-plain-text-in-plain-text-context-when-cross-block-selection-is-copied-2-chromium.txt
+++ b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-plain-text-in-plain-text-context-when-cross-block-selection-is-copied-2-chromium.txt
@@ -7,5 +7,7 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:code -->
-<pre class="wp-block-code"><code>ading<br><br>Paragra</code></pre>
+<pre class="wp-block-code"><code>ading
+
+Paragra</code></pre>
 <!-- /wp:code -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt
index 002e7a19200283..d46df0dfb55d44 100644
--- a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt
+++ b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt
@@ -1,5 +1,5 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>xy</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/__snapshots__/Inserting-blocks-firefox-webkit-inserts-p-59603-ragging-and-dropping-from-the-global-inserter-1-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Inserting-blocks-firefox-webkit-inserts-p-59603-ragging-and-dropping-from-the-global-inserter-1-chromium.txt
index d5575ed006e9f3..753c30a0926707 100644
--- a/test/e2e/specs/editor/various/__snapshots__/Inserting-blocks-firefox-webkit-inserts-p-59603-ragging-and-dropping-from-the-global-inserter-1-chromium.txt
+++ b/test/e2e/specs/editor/various/__snapshots__/Inserting-blocks-firefox-webkit-inserts-p-59603-ragging-and-dropping-from-the-global-inserter-1-chromium.txt
@@ -2,10 +2,18 @@
 <p>Dummy text</p>
 <!-- /wp:paragraph -->
 
-<!-- wp:social-links {"customIconColor":"#ffffff","iconColorValue":"#ffffff","customIconBackgroundColor":"#3962e3","iconBackgroundColorValue":"#3962e3","className":"has-icon-color"} -->
-<ul class="wp-block-social-links has-icon-color has-icon-background-color"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->
+<!-- wp:query {"queryId":1,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"metadata":{"categories":["posts"],"patternName":"core/query-standard-posts","name":"Standard"}} -->
+<div class="wp-block-query"><!-- wp:post-template -->
+<!-- wp:post-title {"isLink":true} /-->
 
-<!-- wp:social-link {"url":"#","service":"chain"} /-->
+<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->
 
-<!-- wp:social-link {"url":"#","service":"mail"} /--></ul>
-<!-- /wp:social-links -->
\ No newline at end of file
+<!-- wp:post-excerpt /-->
+
+<!-- wp:separator {"opacity":"css"} -->
+<hr class="wp-block-separator has-css-opacity"/>
+<!-- /wp:separator -->
+
+<!-- wp:post-date /-->
+<!-- /wp:post-template --></div>
+<!-- /wp:query -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/__snapshots__/Inserting-blocks-firefox-webkit-inserts-p-59603-ragging-and-dropping-from-the-global-inserter-1-webkit.txt b/test/e2e/specs/editor/various/__snapshots__/Inserting-blocks-firefox-webkit-inserts-p-59603-ragging-and-dropping-from-the-global-inserter-1-webkit.txt
index d5575ed006e9f3..753c30a0926707 100644
--- a/test/e2e/specs/editor/various/__snapshots__/Inserting-blocks-firefox-webkit-inserts-p-59603-ragging-and-dropping-from-the-global-inserter-1-webkit.txt
+++ b/test/e2e/specs/editor/various/__snapshots__/Inserting-blocks-firefox-webkit-inserts-p-59603-ragging-and-dropping-from-the-global-inserter-1-webkit.txt
@@ -2,10 +2,18 @@
 <p>Dummy text</p>
 <!-- /wp:paragraph -->
 
-<!-- wp:social-links {"customIconColor":"#ffffff","iconColorValue":"#ffffff","customIconBackgroundColor":"#3962e3","iconBackgroundColorValue":"#3962e3","className":"has-icon-color"} -->
-<ul class="wp-block-social-links has-icon-color has-icon-background-color"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->
+<!-- wp:query {"queryId":1,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"metadata":{"categories":["posts"],"patternName":"core/query-standard-posts","name":"Standard"}} -->
+<div class="wp-block-query"><!-- wp:post-template -->
+<!-- wp:post-title {"isLink":true} /-->
 
-<!-- wp:social-link {"url":"#","service":"chain"} /-->
+<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->
 
-<!-- wp:social-link {"url":"#","service":"mail"} /--></ul>
-<!-- /wp:social-links -->
\ No newline at end of file
+<!-- wp:post-excerpt /-->
+
+<!-- wp:separator {"opacity":"css"} -->
+<hr class="wp-block-separator has-css-opacity"/>
+<!-- /wp:separator -->
+
+<!-- wp:post-date /-->
+<!-- /wp:post-template --></div>
+<!-- /wp:query -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/a11y.spec.js b/test/e2e/specs/editor/various/a11y.spec.js
index 05c4ea3b8e97e3..f116476989a133 100644
--- a/test/e2e/specs/editor/various/a11y.spec.js
+++ b/test/e2e/specs/editor/various/a11y.spec.js
@@ -40,10 +40,10 @@ test.describe( 'a11y (@firefox, @webkit)', () => {
 
 		// This test assumes the Editor is not in Fullscreen mode. Check the
 		// first tabbable element within the 'Editor top bar' region is the
-		// 'Toggle block inserter' button.
+		// 'Block Inserter' button.
 		await pageUtils.pressKeys( 'Tab' );
 		await expect(
-			page.locator( 'role=button[name=/Toggle block inserter/i]' )
+			page.locator( 'role=button[name=/Block Inserter/i]' )
 		).toBeFocused();
 	} );
 
@@ -123,7 +123,21 @@ test.describe( 'a11y (@firefox, @webkit)', () => {
 	test( 'should make the modal content focusable when it is scrollable', async ( {
 		page,
 		pageUtils,
+		browserName,
 	} ) => {
+		// eslint-disable-next-line playwright/no-skipped-test
+		test.skip(
+			browserName === 'webkit',
+			'Known bug with focus order in Safari.'
+		);
+
+		// Note: this test depends on a particular viewport height to determine whether or not
+		// the modal content is scrollable. If this tests fails and needs to be debugged locally,
+		// double-check the viewport height when running locally versus in CI. Additionally,
+		// when adding or removing items from the preference menu, this test may need to be updated
+		// if the height of panels has changed. It would be good to find a more robust way to test
+		// this behavior.
+
 		// Open the top bar Options menu.
 		await page.click(
 			'role=region[name="Editor top bar"i] >> role=button[name="Options"i]'
@@ -145,6 +159,9 @@ test.describe( 'a11y (@firefox, @webkit)', () => {
 		const generalTab = preferencesModal.locator(
 			'role=tab[name="General"i]'
 		);
+		const accessibilityTab = preferencesModal.locator(
+			'role=tab[name="Accessibility"i]'
+		);
 		const blocksTab = preferencesModal.locator(
 			'role=tab[name="Blocks"i]'
 		);
@@ -165,9 +182,20 @@ test.describe( 'a11y (@firefox, @webkit)', () => {
 			await tab.focus();
 		}
 
-		// The General tab panel content is short and not scrollable.
-		// Check it's not focusable.
+		// The Accessibility tab is currently short and not scrollable.
+		// Check that it cannot be focused by tabbing. Note: this test depends
+		// on a particular viewport height to determine whether or not the
+		// modal content is scrollable. If additional Accessibility options are
+		// added, then eventually this test will fail.
+		// TODO: find a more robust way to test this behavior.
 		await clickAndFocusTab( generalTab );
+		// Navigate down to the Accessibility tab.
+		await pageUtils.pressKeys( 'ArrowDown', { times: 2 } );
+		// Check the Accessibility tab panel is visible.
+		await expect(
+			preferencesModal.locator( 'role=tabpanel[name="Accessibility"i]' )
+		).toBeVisible();
+		await expect( accessibilityTab ).toBeFocused();
 		await pageUtils.pressKeys( 'Shift+Tab' );
 		await expect( closeButton ).toBeFocused();
 		await pageUtils.pressKeys( 'Shift+Tab' );
diff --git a/test/e2e/specs/editor/various/adding-inline-tokens.spec.js b/test/e2e/specs/editor/various/adding-inline-tokens.spec.js
index 15f9d9ea877320..c7826ebf262822 100644
--- a/test/e2e/specs/editor/various/adding-inline-tokens.spec.js
+++ b/test/e2e/specs/editor/various/adding-inline-tokens.spec.js
@@ -64,13 +64,16 @@ test.describe( 'adding inline tokens', () => {
 		await pageUtils.pressKeys( 'shift+ArrowLeft' );
 
 		await page.keyboard.press( 'Tab' );
-		await page.keyboard.press( 'Tab' );
-		await page.fill( 'role=spinbutton[name="WIDTH"i]', '20' );
+		await expect(
+			page.locator( 'role=spinbutton[name="Width"i]' )
+		).toBeFocused();
+		await page.fill( 'role=spinbutton[name="Width"i]', '20' );
+		await page.fill( 'role=textbox[name="Alternative text"i]', 'Alt' );
 		await page.click( 'role=button[name="Apply"i]' );
 
 		// Check the content.
 		const contentRegex2 = new RegExp(
-			`a <img class="wp-image-\\d+" style="width:\\s*20px;?" src="[^"]+\\/${ filename }\\.png" alt=""\\/?>`
+			`a <img class="wp-image-\\d+" style="width:\\s*20px;?" src="[^"]+\\/${ filename }\\.png" alt="Alt"\\/?>`
 		);
 
 		await expect.poll( editor.getBlocks ).toMatchObject( [
diff --git a/test/e2e/specs/editor/various/adding-patterns.spec.js b/test/e2e/specs/editor/various/adding-patterns.spec.js
index 94b9dbd2646e8b..3226965b18d703 100644
--- a/test/e2e/specs/editor/various/adding-patterns.spec.js
+++ b/test/e2e/specs/editor/various/adding-patterns.spec.js
@@ -9,21 +9,18 @@ test.describe( 'adding patterns', () => {
 	} );
 
 	test( 'should insert a block pattern', async ( { page, editor } ) => {
-		await page.click(
-			'role=region[name="Editor top bar"i] >> role=button[name="Toggle block inserter"i]'
-		);
+		await page.getByLabel( 'Block Inserter' ).click();
 
+		await page.getByRole( 'tab', { name: 'Patterns' } ).click();
 		await page.fill(
-			'role=region[name="Block Library"i] >> role=searchbox[name="Search for blocks and patterns"i]',
-			'Social links with a shared background color'
+			'role=region[name="Block Library"i] >> role=searchbox[name="Search"i]',
+			'Standard'
 		);
 
-		await page.click(
-			'role=option[name="Social links with a shared background color"i]'
-		);
+		await page.getByRole( 'option', { name: 'Standard' } ).click();
 		await expect.poll( editor.getBlocks ).toMatchObject( [
 			{
-				name: 'core/social-links',
+				name: 'core/query',
 			},
 		] );
 	} );
diff --git a/test/e2e/specs/editor/various/allowed-patterns.spec.js b/test/e2e/specs/editor/various/allowed-patterns.spec.js
new file mode 100644
index 00000000000000..01ca5ba0480c3a
--- /dev/null
+++ b/test/e2e/specs/editor/various/allowed-patterns.spec.js
@@ -0,0 +1,83 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Allowed Patterns', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activatePlugin( 'gutenberg-test-allowed-patterns' );
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deactivatePlugin(
+			'gutenberg-test-allowed-patterns'
+		);
+	} );
+
+	test( 'should show all patterns by default', async ( { admin, page } ) => {
+		await admin.createNewPost();
+		await page
+			.getByRole( 'toolbar', { name: 'Document tools' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+
+		await page
+			.getByRole( 'region', {
+				name: 'Block Library',
+			} )
+			.getByRole( 'searchbox', {
+				name: 'Search',
+			} )
+			.fill( 'Test:' );
+
+		await expect(
+			page
+				.getByRole( 'listbox', { name: 'Block patterns' } )
+				.getByRole( 'option' )
+		).toHaveText( [
+			'Test: Single heading',
+			'Test: Single paragraph',
+			'Test: Paragraph inside group',
+		] );
+	} );
+
+	test.describe( 'with a small subset of allowed blocks', () => {
+		test.beforeAll( async ( { requestUtils } ) => {
+			await requestUtils.activatePlugin(
+				'gutenberg-test-allowed-patterns-disable-blocks'
+			);
+		} );
+
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.deactivatePlugin(
+				'gutenberg-test-allowed-patterns-disable-blocks'
+			);
+		} );
+
+		test( 'should hide patterns with only hidden blocks', async ( {
+			admin,
+			page,
+		} ) => {
+			await admin.createNewPost();
+			await page
+				.getByRole( 'toolbar', { name: 'Document tools' } )
+				.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+				.click();
+
+			await page
+				.getByRole( 'region', {
+					name: 'Block Library',
+				} )
+				.getByRole( 'searchbox', {
+					name: 'Search',
+				} )
+				.fill( 'Test:' );
+
+			await expect(
+				page
+					.getByRole( 'listbox', { name: 'Block patterns' } )
+					.getByRole( 'option' )
+			).toHaveText( [ 'Test: Single heading' ] );
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/autocomplete-and-mentions.spec.js b/test/e2e/specs/editor/various/autocomplete-and-mentions.spec.js
index aae72f50cd25f1..059f3a73ee13d8 100644
--- a/test/e2e/specs/editor/various/autocomplete-and-mentions.spec.js
+++ b/test/e2e/specs/editor/various/autocomplete-and-mentions.spec.js
@@ -421,6 +421,43 @@ test.describe( 'Autocomplete (@firefox, @webkit)', () => {
 		} );
 	} );
 
+	test( `should insert mention in a table block`, async ( {
+		page,
+		editor,
+	} ) => {
+		// Insert table block.
+		await editor.insertBlock( { name: 'core/table' } );
+
+		// Create the table.
+		await editor.canvas
+			.locator( 'role=button[name="Create Table"i]' )
+			.click();
+
+		// Select the first cell.
+		await editor.canvas
+			.locator( 'role=textbox[name="Body cell text"i] >> nth=0' )
+			.click();
+
+		// Type autocomplete text.
+		await page.keyboard.type( '@j' );
+
+		// Verify that option is selected.
+		const selectedOption = page.getByRole( 'option', {
+			name: 'Jane Doe',
+			selected: true,
+		} );
+		await expect( selectedOption ).toBeVisible();
+
+		// Insert the option.
+		await selectedOption.click();
+
+		// Verify it's been inserted.
+		const snapshot = `<!-- wp:table -->
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>@testuser</td><td></td></tr><tr><td></td><td></td></tr></tbody></table></figure>
+<!-- /wp:table -->`;
+		await expect.poll( editor.getEditedPostContent ).toBe( snapshot );
+	} );
+
 	// The following test concerns an infinite loop regression (https://github.com/WordPress/gutenberg/issues/41709).
 	// When present, the regression will cause this test to time out.
 	test( 'should insert elements from multiple completers in a single block', async ( {
diff --git a/test/e2e/specs/editor/various/autosave.spec.js b/test/e2e/specs/editor/various/autosave.spec.js
new file mode 100644
index 00000000000000..01d53f0bf2d085
--- /dev/null
+++ b/test/e2e/specs/editor/various/autosave.spec.js
@@ -0,0 +1,378 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Autosave', () => {
+	test.beforeEach( async ( { admin, page } ) => {
+		await admin.createNewPost();
+		await page.evaluate( () => window.sessionStorage.clear() );
+	} );
+
+	test.afterEach( async ( { page } ) => {
+		await page.evaluate( () => window.sessionStorage.clear() );
+	} );
+
+	test( 'should save to sessionStorage', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'before save' );
+		await pageUtils.pressKeys( 'primary+s' );
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Draft saved' } )
+			.waitFor();
+		await page.keyboard.type( ' after save' );
+
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
+		);
+
+		const autosave = await page.evaluate( () => {
+			const postId = window.wp.data
+				.select( 'core/editor' )
+				.getCurrentPostId();
+
+			return window.sessionStorage.getItem(
+				`wp-autosave-block-editor-post-${
+					postId ? postId : 'auto-draft'
+				}`
+			);
+		} );
+
+		const { content } = JSON.parse( autosave );
+		expect( content ).toBe( `<!-- wp:paragraph -->
+<p>before save after save</p>
+<!-- /wp:paragraph -->` );
+	} );
+
+	test( 'should recover from sessionStorage', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'before save' );
+		await pageUtils.pressKeys( 'primary+s' );
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Draft saved' } )
+			.waitFor();
+		await page.keyboard.type( ' after save' );
+
+		// Trigger local autosave.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
+		);
+		// Reload without saving on the server.
+		await page.reload();
+
+		await expect(
+			page.locator( '.components-notice__content' )
+		).toContainText(
+			'The backup of this post in your browser is different from the version below.'
+		);
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'before save' },
+			},
+		] );
+
+		await page
+			.getByRole( 'button', { name: 'Restore the backup' } )
+			.click();
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'before save after save' },
+			},
+		] );
+	} );
+
+	test( "shouldn't contaminate other posts", async ( {
+		admin,
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'before save' );
+		await pageUtils.pressKeys( 'primary+s' );
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Draft saved' } )
+			.waitFor();
+		await page.keyboard.type( ' after save' );
+
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
+		);
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBe( 1 );
+
+		await page.reload();
+		await expect(
+			page.locator( '.components-notice__content' )
+		).toContainText(
+			'The backup of this post in your browser is different from the version below.'
+		);
+
+		await admin.createNewPost();
+		await expect(
+			page.locator( '.components-notice__content' )
+		).toBeHidden();
+	} );
+
+	test( 'should clear local autosave after successful remote autosave', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'before save' );
+		await pageUtils.pressKeys( 'primary+s' );
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Draft saved' } )
+			.waitFor();
+		await page.keyboard.type( ' after save' );
+
+		// Trigger local autosave.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
+		);
+
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBeGreaterThanOrEqual( 1 );
+
+		// Trigger remote autosave.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave()
+		);
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBe( 0 );
+	} );
+
+	test( "shouldn't clear local autosave if remote autosave fails", async ( {
+		editor,
+		context,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'before save' );
+		await pageUtils.pressKeys( 'primary+s' );
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Draft saved' } )
+			.waitFor();
+		await page.keyboard.type( ' after save' );
+
+		// Trigger local autosave.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
+		);
+
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBeGreaterThanOrEqual( 1 );
+
+		// Intercept autosave request and abort it.
+		await context.setOffline( true );
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave()
+		);
+
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBe( 1 );
+	} );
+
+	test( 'should clear local autosave after successful save', async ( {
+		page,
+		pageUtils,
+	} ) => {
+		const notice = page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Draft saved' } );
+
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'before save' );
+		await pageUtils.pressKeys( 'primary+s' );
+		await notice.waitFor();
+		await page.keyboard.type( ' after save' );
+		await notice.click();
+
+		// Trigger local autosave.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
+		);
+
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBeGreaterThanOrEqual( 1 );
+
+		await pageUtils.pressKeys( 'primary+s' );
+		await notice.waitFor();
+
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBe( 0 );
+	} );
+
+	test( "shouldn't clear local autosave if save fails", async ( {
+		editor,
+		context,
+		page,
+		pageUtils,
+	} ) => {
+		const notice = page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Draft saved' } );
+
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'before save' );
+		await pageUtils.pressKeys( 'primary+s' );
+		await notice.waitFor();
+		await page.keyboard.type( ' after save' );
+		await notice.click();
+
+		// Trigger local autosave.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
+		);
+
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBeGreaterThanOrEqual( 1 );
+
+		await context.setOffline( true );
+		await pageUtils.pressKeys( 'primary+s' );
+
+		await expect(
+			page.locator( '.components-notice__content' )
+		).toContainText( 'Updating failed. You are probably offline.' );
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBe( 1 );
+	} );
+
+	// See https://github.com/WordPress/gutenberg/pull/17501.
+	test( "shouldn't conflict with server-side autosave", async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'before save' );
+		await editor.publishPost();
+
+		const paragraph = editor.canvas.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+		await paragraph.click();
+		await page.keyboard.type( ' after save' );
+
+		// Trigger remote autosave.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave()
+		);
+
+		await expect
+			.poll( async () => {
+				return await page.evaluate( () => {
+					const postId = window.wp.data
+						.select( 'core/editor' )
+						.getCurrentPostId();
+					const autosaves = window.wp.data
+						.select( 'core' )
+						.getAutosaves( 'post', postId );
+
+					return autosaves?.length ?? 0;
+				} );
+			} )
+			.toBeGreaterThanOrEqual( 1 );
+
+		// Force conflicting local autosave.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
+		);
+
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBeGreaterThanOrEqual( 1 );
+
+		await page.reload();
+		await page.waitForFunction( () => window?.wp?.data );
+
+		// FIXME: Occasionally, upon reload, there is no server-provided
+		// autosave value available, despite our having previously explicitly
+		// autosaved. The reasons for this are still unknown. Since this is
+		// unrelated to *local* autosave, until we can understand them, we'll
+		// drop this test's expectations if we don't have an autosave object
+		// available.
+		const stillHasRemoteAutosave = await page.evaluate(
+			() =>
+				window.wp.data.select( 'core/editor' ).getEditorSettings()
+					.autosave
+		);
+		if ( ! stillHasRemoteAutosave ) {
+			return;
+		}
+
+		// Only remote autosave notice should be applied.
+		await expect(
+			page.locator( '.components-notice__content' )
+		).toContainText(
+			'There is an autosave of this post that is more recent than the version below.'
+		);
+	} );
+
+	test.skip( 'should clear sessionStorage upon user logout', async ( {
+		page,
+		pageUtils,
+	} ) => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'before save' );
+		await pageUtils.pressKeys( 'primary+s' );
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Draft saved' } )
+			.waitFor();
+		await page.keyboard.type( ' after save' );
+
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave( { local: true } )
+		);
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBe( 1 );
+
+		await page.locator( '#wp-admin-bar-my-account' ).hover();
+		await page.locator( '#wp-admin-bar-logout' ).click();
+
+		expect(
+			await page.evaluate( () => window.sessionStorage.length )
+		).toBe( 0 );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/block-bindings/custom-sources.spec.js b/test/e2e/specs/editor/various/block-bindings/custom-sources.spec.js
new file mode 100644
index 00000000000000..d6563ce9cb5f5f
--- /dev/null
+++ b/test/e2e/specs/editor/various/block-bindings/custom-sources.spec.js
@@ -0,0 +1,1204 @@
+/**
+ * External dependencies
+ */
+const path = require( 'path' );
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Registered sources', () => {
+	let imagePlaceholderSrc;
+	let testingImgSrc;
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme(
+			'gutenberg-test-themes/block-bindings'
+		);
+		await requestUtils.activatePlugin( 'gutenberg-test-block-bindings' );
+		await requestUtils.deleteAllMedia();
+		const placeholderMedia = await requestUtils.uploadMedia(
+			path.join( './test/e2e/assets', '10x10_e2e_test_image_z9T8jK.png' )
+		);
+		imagePlaceholderSrc = placeholderMedia.source_url;
+
+		const testingImgMedia = await requestUtils.uploadMedia(
+			path.join(
+				'./test/e2e/assets',
+				'1024x768_e2e_test_image_size.jpeg'
+			)
+		);
+		testingImgSrc = testingImgMedia.source_url;
+	} );
+
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost( { title: 'Test bindings' } );
+	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllPosts();
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMedia();
+		await requestUtils.activateTheme( 'twentytwentyone' );
+		await requestUtils.deactivatePlugin( 'gutenberg-test-block-bindings' );
+	} );
+
+	test.describe( 'getValues', () => {
+		test( 'should show the returned value in paragraph content', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					anchor: 'connected-paragraph',
+					content: 'paragraph default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/complete-source',
+								args: { key: 'text_field' },
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphBlock ).toHaveText( 'Text Field Value' );
+
+			// Check the frontend shows the value of the custom field.
+			const previewPage = await editor.openPreviewPage();
+			await expect(
+				previewPage.locator( '#connected-paragraph' )
+			).toHaveText( 'Text Field Value' );
+		} );
+		test( 'should show the returned value in heading content', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/heading',
+				attributes: {
+					anchor: 'connected-heading',
+					content: 'heading default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/complete-source',
+								args: { key: 'text_field' },
+							},
+						},
+					},
+				},
+			} );
+			const headingBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Heading',
+			} );
+			await expect( headingBlock ).toHaveText( 'Text Field Value' );
+
+			// Check the frontend shows the value of the custom field.
+			const previewPage = await editor.openPreviewPage();
+			await expect(
+				previewPage.locator( '#connected-heading' )
+			).toHaveText( 'Text Field Value' );
+		} );
+		test( 'should show the returned values in button attributes', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/buttons',
+				innerBlocks: [
+					{
+						name: 'core/button',
+						attributes: {
+							anchor: 'connected-button',
+							text: 'button default text',
+							url: '#default-url',
+							metadata: {
+								bindings: {
+									text: {
+										source: 'testing/complete-source',
+										args: { key: 'text_field' },
+									},
+									url: {
+										source: 'testing/complete-source',
+										args: { key: 'url_field' },
+									},
+								},
+							},
+						},
+					},
+				],
+			} );
+
+			// Check the frontend uses the values of the custom fields.
+			const previewPage = await editor.openPreviewPage();
+			const buttonDom = previewPage.locator( '#connected-button a' );
+			await expect( buttonDom ).toHaveText( 'Text Field Value' );
+			await expect( buttonDom ).toHaveAttribute( 'href', testingImgSrc );
+		} );
+		test( 'should show the returned values in image attributes', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/image',
+				attributes: {
+					anchor: 'connected-image',
+					url: imagePlaceholderSrc,
+					alt: 'default alt value',
+					title: 'default title value',
+					metadata: {
+						bindings: {
+							url: {
+								source: 'testing/complete-source',
+								args: { key: 'url_field' },
+							},
+							alt: {
+								source: 'testing/complete-source',
+								args: { key: 'text_field' },
+							},
+						},
+					},
+				},
+			} );
+			const imageBlockImg = editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Image',
+				} )
+				.locator( 'img' );
+			await imageBlockImg.click();
+
+			// Image src is the custom field value.
+			await expect( imageBlockImg ).toHaveAttribute(
+				'src',
+				testingImgSrc
+			);
+
+			// Alt textarea should have the custom field value.
+			const altValue = await page
+				.getByRole( 'tabpanel', { name: 'Settings' } )
+				.getByLabel( 'Alternative text' )
+				.inputValue();
+			expect( altValue ).toBe( 'Text Field Value' );
+
+			// Title input should have the original value.
+			const advancedButton = page
+				.getByRole( 'tabpanel', { name: 'Settings' } )
+				.getByRole( 'button', {
+					name: 'Advanced',
+				} );
+			const isAdvancedPanelOpen =
+				await advancedButton.getAttribute( 'aria-expanded' );
+			if ( isAdvancedPanelOpen === 'false' ) {
+				await advancedButton.click();
+			}
+			const titleValue = await page
+				.getByRole( 'tabpanel', { name: 'Settings' } )
+				.getByLabel( 'Title attribute' )
+				.inputValue();
+			expect( titleValue ).toBe( 'default title value' );
+
+			// Check the frontend uses the values of the custom fields.
+			const previewPage = await editor.openPreviewPage();
+			const imageDom = previewPage.locator( '#connected-image img' );
+			await expect( imageDom ).toHaveAttribute( 'src', testingImgSrc );
+			await expect( imageDom ).toHaveAttribute(
+				'alt',
+				'Text Field Value'
+			);
+			await expect( imageDom ).toHaveAttribute(
+				'title',
+				'default title value'
+			);
+		} );
+		test( 'should fall back to source label when `getValues` is undefined', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'paragraph default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/server-only-source',
+								args: { key: 'text_field' },
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphBlock ).toHaveText( 'Server Source' );
+		} );
+		test( 'should fall back to null when `getValues` is undefined in URL attributes', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/image',
+				attributes: {
+					metadata: {
+						bindings: {
+							url: {
+								source: 'testing/server-only-source',
+								args: { key: 'url_field' },
+							},
+						},
+					},
+				},
+			} );
+			const imageBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Image',
+			} );
+			await expect(
+				imageBlock.locator( '.components-placeholder__fieldset' )
+			).toHaveText( 'Connected to Server Source' );
+		} );
+	} );
+
+	test.describe( 'should lock editing', () => {
+		// Logic reused accross all the tests that check paragraph editing is locked.
+		async function testParagraphControlsAreLocked( {
+			source,
+			editor,
+			page,
+		} ) {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'paragraph default content',
+					metadata: {
+						bindings: {
+							content: {
+								source,
+								args: { key: 'text_field' },
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await paragraphBlock.click();
+
+			// Alignment controls exist.
+			await expect(
+				page
+					.getByRole( 'toolbar', { name: 'Block tools' } )
+					.getByRole( 'button', { name: 'Align text' } )
+			).toBeVisible();
+
+			// Format controls don't exist.
+			await expect(
+				page
+					.getByRole( 'toolbar', { name: 'Block tools' } )
+					.getByRole( 'button', {
+						name: 'Bold',
+					} )
+			).toBeHidden();
+
+			// Paragraph is not editable.
+			await expect( paragraphBlock ).toHaveAttribute(
+				'contenteditable',
+				'false'
+			);
+		}
+		test.describe( 'canUserEditValue returns false', () => {
+			test( 'paragraph', async ( { editor, page } ) => {
+				await testParagraphControlsAreLocked( {
+					source: 'testing/can-user-edit-false',
+					editor,
+					page,
+				} );
+			} );
+			test( 'heading', async ( { editor, page } ) => {
+				await editor.insertBlock( {
+					name: 'core/heading',
+					attributes: {
+						content: 'heading default content',
+						metadata: {
+							bindings: {
+								content: {
+									source: 'testing/can-user-edit-false',
+									args: { key: 'text_field' },
+								},
+							},
+						},
+					},
+				} );
+				const headingBlock = editor.canvas.getByRole( 'document', {
+					name: 'Block: Heading',
+				} );
+				await headingBlock.click();
+
+				// Alignment controls exist.
+				await expect(
+					page
+						.getByRole( 'toolbar', { name: 'Block tools' } )
+						.getByRole( 'button', { name: 'Align text' } )
+				).toBeVisible();
+
+				// Format controls don't exist.
+				await expect(
+					page
+						.getByRole( 'toolbar', { name: 'Block tools' } )
+						.getByRole( 'button', {
+							name: 'Bold',
+						} )
+				).toBeHidden();
+
+				// Heading is not editable.
+				await expect( headingBlock ).toHaveAttribute(
+					'contenteditable',
+					'false'
+				);
+			} );
+			test( 'button', async ( { editor, page } ) => {
+				await editor.insertBlock( {
+					name: 'core/buttons',
+					innerBlocks: [
+						{
+							name: 'core/button',
+							attributes: {
+								text: 'button default text',
+								url: '#default-url',
+								metadata: {
+									bindings: {
+										text: {
+											source: 'testing/can-user-edit-false',
+											args: { key: 'text_field' },
+										},
+										url: {
+											source: 'testing/can-user-edit-false',
+											args: { key: 'url_field' },
+										},
+									},
+								},
+							},
+						},
+					],
+				} );
+				const buttonBlock = editor.canvas
+					.getByRole( 'document', {
+						name: 'Block: Button',
+						exact: true,
+					} )
+					.getByRole( 'textbox' );
+				await buttonBlock.click();
+
+				// Alignment controls are visible.
+				await expect(
+					page
+						.getByRole( 'toolbar', { name: 'Block tools' } )
+						.getByRole( 'button', { name: 'Align text' } )
+				).toBeVisible();
+
+				// Format controls don't exist.
+				await expect(
+					page
+						.getByRole( 'toolbar', { name: 'Block tools' } )
+						.getByRole( 'button', {
+							name: 'Bold',
+						} )
+				).toBeHidden();
+
+				// Button is not editable.
+				await expect( buttonBlock ).toHaveAttribute(
+					'contenteditable',
+					'false'
+				);
+
+				// Link controls don't exist.
+				await expect(
+					page
+						.getByRole( 'toolbar', { name: 'Block tools' } )
+						.getByRole( 'button', { name: 'Link' } )
+				).toBeHidden();
+				await expect(
+					page
+						.getByRole( 'toolbar', { name: 'Block tools' } )
+						.getByRole( 'button', { name: 'Unlink' } )
+				).toBeHidden();
+			} );
+			test( 'image', async ( { editor, page } ) => {
+				await editor.insertBlock( {
+					name: 'core/image',
+					attributes: {
+						url: imagePlaceholderSrc,
+						alt: 'default alt value',
+						title: 'default title value',
+						metadata: {
+							bindings: {
+								url: {
+									source: 'testing/can-user-edit-false',
+									args: { key: 'url_field' },
+								},
+								alt: {
+									source: 'testing/can-user-edit-false',
+									args: { key: 'text_field' },
+								},
+								title: {
+									source: 'testing/can-user-edit-false',
+									args: { key: 'text_field' },
+								},
+							},
+						},
+					},
+				} );
+				const imageBlock = editor.canvas.getByRole( 'document', {
+					name: 'Block: Image',
+				} );
+				await imageBlock.click();
+
+				// Replace controls don't exist.
+				await expect(
+					page
+						.getByRole( 'toolbar', { name: 'Block tools' } )
+						.getByRole( 'button', {
+							name: 'Replace',
+						} )
+				).toBeHidden();
+
+				// Image placeholder doesn't show the upload button.
+				await expect(
+					imageBlock.getByRole( 'button', { name: 'Upload' } )
+				).toBeHidden();
+
+				// Alt textarea is disabled and with the custom field value.
+				await expect(
+					page
+						.getByRole( 'tabpanel', { name: 'Settings' } )
+						.getByLabel( 'Alternative text' )
+				).toHaveAttribute( 'readonly' );
+				const altValue = await page
+					.getByRole( 'tabpanel', { name: 'Settings' } )
+					.getByLabel( 'Alternative text' )
+					.inputValue();
+				expect( altValue ).toBe( 'Text Field Value' );
+
+				// Title input is enabled and with the original value.
+				await page
+					.getByRole( 'tabpanel', { name: 'Settings' } )
+					.getByRole( 'button', { name: 'Advanced' } )
+					.click();
+				await expect(
+					page
+						.getByRole( 'tabpanel', { name: 'Settings' } )
+						.getByLabel( 'Title attribute' )
+				).toHaveAttribute( 'readonly' );
+				const titleValue = await page
+					.getByRole( 'tabpanel', { name: 'Settings' } )
+					.getByLabel( 'Title attribute' )
+					.inputValue();
+				expect( titleValue ).toBe( 'Text Field Value' );
+			} );
+		} );
+		// The following tests just check the paragraph and assume is the case for the rest of the blocks.
+		test( 'canUserEditValue is not defined', async ( { editor, page } ) => {
+			await testParagraphControlsAreLocked( {
+				source: 'testing/can-user-edit-undefined',
+				editor,
+				page,
+			} );
+		} );
+		test( 'setValues is not defined', async ( { editor, page } ) => {
+			await testParagraphControlsAreLocked( {
+				source: 'testing/complete-source-undefined',
+				editor,
+				page,
+			} );
+		} );
+		test( 'source is not defined', async ( { editor, page } ) => {
+			await testParagraphControlsAreLocked( {
+				source: 'testing/undefined-source',
+				editor,
+				page,
+			} );
+		} );
+	} );
+
+	// Use `core/post-meta` source to test editing to avoid overcomplicating custom sources.
+	// It needs a source that can be consumed and edited from the server and the editor.
+	test.describe( 'setValues', () => {
+		test( 'should be possible to edit the value from paragraph content', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					anchor: 'connected-paragraph',
+					content: 'paragraph default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'core/post-meta',
+								args: { key: 'text_custom_field' },
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+
+			await expect( paragraphBlock ).toHaveAttribute(
+				'contenteditable',
+				'true'
+			);
+			await paragraphBlock.fill( 'new value' );
+			// Check that the paragraph content attribute didn't change.
+			const [ paragraphBlockObject ] = await editor.getBlocks();
+			expect( paragraphBlockObject.attributes.content ).toBe(
+				'paragraph default content'
+			);
+			// Check the value of the custom field is being updated by visiting the frontend.
+			const previewPage = await editor.openPreviewPage();
+			await expect(
+				previewPage.locator( '#connected-paragraph' )
+			).toHaveText( 'new value' );
+		} );
+		// Related issue: https://github.com/WordPress/gutenberg/issues/62347
+		test( 'should be possible to use symbols and numbers as the custom field value', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					anchor: 'paragraph-binding',
+					content: 'paragraph default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'core/post-meta',
+								args: { key: 'text_custom_field' },
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+
+			await expect( paragraphBlock ).toHaveAttribute(
+				'contenteditable',
+				'true'
+			);
+			await paragraphBlock.fill( '$10.00' );
+			// Check the value of the custom field is being updated by visiting the frontend.
+			const previewPage = await editor.openPreviewPage();
+			await expect(
+				previewPage.locator( '#paragraph-binding' )
+			).toHaveText( '$10.00' );
+		} );
+		test( 'should be possible to edit the value of the url custom field from the button', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/buttons',
+				innerBlocks: [
+					{
+						name: 'core/button',
+						attributes: {
+							anchor: 'button-url-binding',
+							text: 'button default text',
+							url: '#default-url',
+							metadata: {
+								bindings: {
+									url: {
+										source: 'core/post-meta',
+										args: { key: 'url_custom_field' },
+									},
+								},
+							},
+						},
+					},
+				],
+			} );
+
+			// Edit the url.
+			const buttonBlock = editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Button',
+					exact: true,
+				} )
+				.getByRole( 'textbox' );
+			await buttonBlock.click();
+			await page
+				.getByRole( 'button', { name: 'Edit link', exact: true } )
+				.click();
+			await page
+				.getByPlaceholder( 'Search or type URL' )
+				.fill( '#url-custom-field-modified' );
+			await pageUtils.pressKeys( 'Enter' );
+
+			// Check that the button url attribute didn't change.
+			const [ buttonsObject ] = await editor.getBlocks();
+			expect( buttonsObject.innerBlocks[ 0 ].attributes.url ).toBe(
+				'#default-url'
+			);
+			// Check the value of the custom field is being updated by visiting the frontend.
+			const previewPage = await editor.openPreviewPage();
+			await expect(
+				previewPage.locator( '#button-url-binding a' )
+			).toHaveAttribute( 'href', '#url-custom-field-modified' );
+		} );
+		test( 'should be possible to edit the value of the url custom field from the image', async ( {
+			editor,
+			page,
+			pageUtils,
+			requestUtils,
+		} ) => {
+			const customFieldMedia = await requestUtils.uploadMedia(
+				path.join(
+					'./test/e2e/assets',
+					'1024x768_e2e_test_image_size.jpeg'
+				)
+			);
+			testingImgSrc = customFieldMedia.source_url;
+
+			await editor.insertBlock( {
+				name: 'core/image',
+				attributes: {
+					anchor: 'image-url-binding',
+					url: imagePlaceholderSrc,
+					alt: 'default alt value',
+					title: 'default title value',
+					metadata: {
+						bindings: {
+							url: {
+								source: 'core/post-meta',
+								args: { key: 'url_custom_field' },
+							},
+						},
+					},
+				},
+			} );
+
+			// Edit image url.
+			await page
+				.getByRole( 'toolbar', { name: 'Block tools' } )
+				.getByRole( 'button', {
+					name: 'Replace',
+				} )
+				.click();
+			await page
+				.getByRole( 'button', { name: 'Edit link', exact: true } )
+				.click();
+			await page
+				.getByPlaceholder( 'Search or type URL' )
+				.fill( testingImgSrc );
+			await pageUtils.pressKeys( 'Enter' );
+
+			// Check that the image url attribute didn't change and still uses the placeholder.
+			const [ imageBlockObject ] = await editor.getBlocks();
+			expect( imageBlockObject.attributes.url ).toBe(
+				imagePlaceholderSrc
+			);
+
+			// Check the value of the custom field is being updated by visiting the frontend.
+			const previewPage = await editor.openPreviewPage();
+			await expect(
+				previewPage.locator( '#image-url-binding img' )
+			).toHaveAttribute( 'src', testingImgSrc );
+		} );
+		test( 'should be possible to edit the value of the text custom field from the image alt', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/image',
+				attributes: {
+					anchor: 'image-alt-binding',
+					url: imagePlaceholderSrc,
+					alt: 'default alt value',
+					metadata: {
+						bindings: {
+							alt: {
+								source: 'core/post-meta',
+								args: { key: 'text_custom_field' },
+							},
+						},
+					},
+				},
+			} );
+			const imageBlockImg = editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Image',
+				} )
+				.locator( 'img' );
+			await imageBlockImg.click();
+
+			// Edit the custom field value in the alt textarea.
+			const altInputArea = page
+				.getByRole( 'tabpanel', { name: 'Settings' } )
+				.getByLabel( 'Alternative text' );
+			await expect( altInputArea ).not.toHaveAttribute( 'readonly' );
+			await altInputArea.fill( 'new value' );
+
+			// Check that the image alt attribute didn't change.
+			const [ imageBlockObject ] = await editor.getBlocks();
+			expect( imageBlockObject.attributes.alt ).toBe(
+				'default alt value'
+			);
+			// Check the value of the custom field is being updated by visiting the frontend.
+			const previewPage = await editor.openPreviewPage();
+			await expect(
+				previewPage.locator( '#image-alt-binding img' )
+			).toHaveAttribute( 'alt', 'new value' );
+		} );
+	} );
+
+	test.describe( 'getFieldsList', () => {
+		test( 'should be possible to update attribute value through bindings UI', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+			} );
+			await page.getByLabel( 'Attributes options' ).click();
+			await page
+				.getByRole( 'menuitemcheckbox', {
+					name: 'Show content',
+				} )
+				.click();
+			await page.getByRole( 'button', { name: 'content' } ).click();
+			await page
+				.getByRole( 'menuitemradio' )
+				.filter( { hasText: 'Text Field Label' } )
+				.click();
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphBlock ).toHaveText( 'Text Field Value' );
+		} );
+		test( 'should be possible to connect the paragraph content', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+			} );
+			await page.getByLabel( 'Attributes options' ).click();
+			const contentAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show content',
+			} );
+			await expect( contentAttribute ).toBeVisible();
+		} );
+		test( 'should be possible to connect the heading content', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/heading',
+			} );
+			await page.getByLabel( 'Attributes options' ).click();
+			const contentAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show content',
+			} );
+			await expect( contentAttribute ).toBeVisible();
+		} );
+		test( 'should be possible to connect the button supported attributes', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/buttons',
+				innerBlocks: [
+					{
+						name: 'core/button',
+					},
+				],
+			} );
+			await editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Button',
+					exact: true,
+				} )
+				.getByRole( 'textbox' )
+				.click();
+			await page
+				.getByRole( 'tabpanel', {
+					name: 'Settings',
+				} )
+				.getByLabel( 'Attributes options' )
+				.click();
+			const urlAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show url',
+			} );
+			await expect( urlAttribute ).toBeVisible();
+			const textAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show text',
+			} );
+			await expect( textAttribute ).toBeVisible();
+			const linkTargetAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show linkTarget',
+			} );
+			await expect( linkTargetAttribute ).toBeVisible();
+			const relAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show rel',
+			} );
+			await expect( relAttribute ).toBeVisible();
+			// Check not supported attributes are not included.
+			const tagNameAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show tagName',
+			} );
+			await expect( tagNameAttribute ).toBeHidden();
+		} );
+		test( 'should be possible to connect the image supported attributes', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/image',
+			} );
+			await page
+				.getByRole( 'tabpanel', {
+					name: 'Settings',
+				} )
+				.getByLabel( 'Attributes options' )
+				.click();
+			const urlAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show url',
+			} );
+			await expect( urlAttribute ).toBeVisible();
+			const idAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show id',
+			} );
+			await expect( idAttribute ).toBeVisible();
+			const titleAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show title',
+			} );
+			await expect( titleAttribute ).toBeVisible();
+			const altAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show alt',
+			} );
+			await expect( altAttribute ).toBeVisible();
+			// Check not supported attributes are not included.
+			const linkClassAttribute = page.getByRole( 'menuitemcheckbox', {
+				name: 'Show linkClass',
+			} );
+			await expect( linkClassAttribute ).toBeHidden();
+		} );
+		test( 'should show all the available fields in the dropdown UI', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'default value',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/complete-source',
+								args: { key: 'text_field' },
+							},
+						},
+					},
+				},
+			} );
+			await page.getByRole( 'button', { name: 'content' } ).click();
+			const textField = page
+				.getByRole( 'menuitemradio' )
+				.filter( { hasText: 'Text Field Label' } );
+			await expect( textField ).toBeVisible();
+			await expect( textField ).toBeChecked();
+			const urlField = page
+				.getByRole( 'menuitemradio' )
+				.filter( { hasText: 'URL Field Label' } );
+			await expect( urlField ).toBeVisible();
+			await expect( urlField ).not.toBeChecked();
+		} );
+		test( 'should show the connected fields in the attributes panel', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'default value',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/complete-source',
+								args: { key: 'text_field' },
+							},
+						},
+					},
+				},
+			} );
+			const contentButton = page.getByRole( 'button', {
+				name: 'content',
+			} );
+			await expect( contentButton ).toContainText( 'Text Field Label' );
+		} );
+	} );
+
+	test.describe( 'RichText workflows', () => {
+		test( 'should add empty paragraph block when pressing enter in paragraph', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'paragraph default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/complete-source',
+								args: { key: 'text_field' },
+							},
+						},
+					},
+				},
+			} );
+			// Select the paragraph and press Enter at the end of it.
+			const paragraph = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await editor.selectBlocks( paragraph );
+			await page.keyboard.press( 'End' );
+			await page.keyboard.press( 'Enter' );
+			const [ initialParagraph, newEmptyParagraph ] = await editor.canvas
+				.locator( '[data-type="core/paragraph"]' )
+				.all();
+			await expect( initialParagraph ).toHaveText( 'Text Field Value' );
+			await expect( newEmptyParagraph ).toHaveText( '' );
+			await expect( newEmptyParagraph ).toBeEditable();
+		} );
+		test( 'should add empty paragraph block when pressing enter in heading', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/heading',
+				attributes: {
+					anchor: 'heading-binding',
+					content: 'heading default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/complete-source',
+								args: { key: 'text_field' },
+							},
+						},
+					},
+				},
+			} );
+
+			// Select the heading and press Enter at the end of it.
+			const heading = editor.canvas.getByRole( 'document', {
+				name: 'Block: Heading',
+			} );
+			await editor.selectBlocks( heading );
+			await page.keyboard.press( 'End' );
+			await page.keyboard.press( 'Enter' );
+			// Can't use `editor.getBlocks` because it doesn't return the meta value shown in the editor.
+			const [ initialHeading, newEmptyParagraph ] = await editor.canvas
+				.locator( '[data-block]' )
+				.all();
+			// First block should be the original block.
+			await expect( initialHeading ).toHaveAttribute(
+				'data-type',
+				'core/heading'
+			);
+			await expect( initialHeading ).toHaveText( 'Text Field Value' );
+			// Second block should be an empty paragraph block.
+			await expect( newEmptyParagraph ).toHaveAttribute(
+				'data-type',
+				'core/paragraph'
+			);
+			await expect( newEmptyParagraph ).toHaveText( '' );
+			await expect( newEmptyParagraph ).toBeEditable();
+		} );
+		test( 'should add empty button block when pressing enter in button', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/buttons',
+				innerBlocks: [
+					{
+						name: 'core/button',
+						attributes: {
+							anchor: 'button-text-binding',
+							text: 'button default text',
+							url: '#default-url',
+							metadata: {
+								bindings: {
+									text: {
+										source: 'testing/complete-source',
+										args: { key: 'text_field' },
+									},
+								},
+							},
+						},
+					},
+				],
+			} );
+			await editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Button',
+					exact: true,
+				} )
+				.getByRole( 'textbox' )
+				.click();
+			await page.keyboard.press( 'End' );
+			await page.keyboard.press( 'Enter' );
+			const [ initialButton, newEmptyButton ] = await editor.canvas
+				.locator( '[data-type="core/button"]' )
+				.all();
+			// First block should be the original block.
+			await expect( initialButton ).toHaveText( 'Text Field Value' );
+			// Second block should be an empty paragraph block.
+			await expect( newEmptyButton ).toHaveText( '' );
+			await expect( newEmptyButton ).toBeEditable();
+		} );
+		test( 'should show placeholder prompt when value is empty and can edit', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'paragraph default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/complete-source',
+								args: { key: 'empty_field' },
+							},
+						},
+					},
+				},
+			} );
+
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				// Aria-label is changed for empty paragraphs.
+				name: 'Empty empty_field; start writing to edit its value',
+			} );
+
+			await expect( paragraphBlock ).toBeEmpty();
+
+			const placeholder = paragraphBlock.locator( 'span' );
+			await expect( placeholder ).toHaveAttribute(
+				'data-rich-text-placeholder',
+				'Add Empty Field Label'
+			);
+		} );
+		test( 'should show source label when value is empty, cannot edit, and `getFieldsList` is undefined', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'paragraph default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/can-user-edit-false',
+								args: { key: 'empty_field' },
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				// Aria-label is changed for empty paragraphs.
+				name: 'empty_field',
+			} );
+			await expect( paragraphBlock ).toBeEmpty();
+			const placeholder = paragraphBlock.locator( 'span' );
+			await expect( placeholder ).toHaveAttribute(
+				'data-rich-text-placeholder',
+				'Can User Edit: False'
+			);
+		} );
+		test( 'should show placeholder attribute over bindings placeholder', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					placeholder: 'My custom placeholder',
+					content: 'paragraph default content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'testing/complete-source',
+								args: { key: 'empty_field' },
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				// Aria-label is changed for empty paragraphs.
+				name: 'empty_field',
+			} );
+
+			await expect( paragraphBlock ).toBeEmpty();
+
+			const placeholder = paragraphBlock.locator( 'span' );
+			await expect( placeholder ).toHaveAttribute(
+				'data-rich-text-placeholder',
+				'My custom placeholder'
+			);
+		} );
+	} );
+
+	test( 'should show the label of a source only registered in the server in blocks connected', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: {
+				metadata: {
+					bindings: {
+						content: {
+							source: 'testing/server-only-source',
+						},
+					},
+				},
+			},
+		} );
+
+		const contentButton = page.getByRole( 'button', {
+			name: 'content',
+		} );
+		await expect( contentButton ).toContainText( 'Server Source' );
+	} );
+	test( 'should show an "Invalid source" warning for not registered sources', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: {
+				metadata: {
+					bindings: {
+						content: {
+							source: 'testing/undefined-source',
+						},
+					},
+				},
+			},
+		} );
+
+		const contentButton = page.getByRole( 'button', {
+			name: 'content',
+		} );
+		await expect( contentButton ).toContainText( 'Invalid source' );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/block-bindings/post-meta.spec.js b/test/e2e/specs/editor/various/block-bindings/post-meta.spec.js
new file mode 100644
index 00000000000000..32334bfc777f2a
--- /dev/null
+++ b/test/e2e/specs/editor/various/block-bindings/post-meta.spec.js
@@ -0,0 +1,600 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Post Meta source', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme(
+			'gutenberg-test-themes/block-bindings'
+		);
+		await requestUtils.activatePlugin( 'gutenberg-test-block-bindings' );
+	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllPosts();
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMedia();
+		await requestUtils.activateTheme( 'twentytwentyone' );
+		await requestUtils.deactivatePlugin( 'gutenberg-test-block-bindings' );
+	} );
+
+	test.describe( 'Movie CPT template', () => {
+		test.beforeEach( async ( { admin, editor } ) => {
+			await admin.visitSiteEditor( {
+				postId: 'gutenberg-test-themes/block-bindings//single-movie',
+				postType: 'wp_template',
+				canvas: 'edit',
+			} );
+			await editor.openDocumentSettingsSidebar();
+		} );
+
+		test.describe( 'Block attributes values', () => {
+			test( 'should not be possible to edit connected blocks', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'fallback content',
+						metadata: {
+							bindings: {
+								content: {
+									source: 'core/post-meta',
+									args: {
+										key: 'movie_field',
+									},
+								},
+							},
+						},
+					},
+				} );
+				const paragraphBlock = editor.canvas.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} );
+				await expect( paragraphBlock ).toHaveAttribute(
+					'contenteditable',
+					'false'
+				);
+			} );
+			test( 'should show the default value if it is defined', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'fallback content',
+						metadata: {
+							bindings: {
+								content: {
+									source: 'core/post-meta',
+									args: {
+										key: 'movie_field',
+									},
+								},
+							},
+						},
+					},
+				} );
+				const paragraphBlock = editor.canvas.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} );
+				await expect( paragraphBlock ).toHaveText(
+					'Movie field default value'
+				);
+			} );
+			test( 'should fall back to the field label if the default value is not defined', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'fallback content',
+						metadata: {
+							bindings: {
+								content: {
+									source: 'core/post-meta',
+									args: {
+										key: 'field_with_only_label',
+									},
+								},
+							},
+						},
+					},
+				} );
+				const paragraphBlock = editor.canvas.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} );
+				await expect( paragraphBlock ).toHaveText(
+					'Field with only label'
+				);
+			} );
+			test( 'should fall back to the field key if the field label is not defined', async ( {
+				editor,
+			} ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: {
+						content: 'fallback content',
+						metadata: {
+							bindings: {
+								content: {
+									source: 'core/post-meta',
+									args: {
+										key: 'field_without_label_or_default',
+									},
+								},
+							},
+						},
+					},
+				} );
+				const paragraphBlock = editor.canvas.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} );
+				await expect( paragraphBlock ).toHaveText(
+					'field_without_label_or_default'
+				);
+			} );
+		} );
+
+		test.describe( 'Attributes panel', () => {
+			test( 'should show the field label if it is defined', async ( {
+				editor,
+				page,
+			} ) => {
+				/**
+				 * Create connection manually until this issue is solved:
+				 * https://github.com/WordPress/gutenberg/pull/65604
+				 *
+				 * Once solved, block with the binding can be directly inserted.
+				 */
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+				} );
+				await page.getByLabel( 'Attributes options' ).click();
+				await page
+					.getByRole( 'menuitemcheckbox', {
+						name: 'Show content',
+					} )
+					.click();
+				const contentBinding = page.getByRole( 'button', {
+					name: 'content',
+				} );
+				await contentBinding.click();
+				await page
+					.getByRole( 'menuitemradio' )
+					.filter( { hasText: 'Movie field label' } )
+					.click();
+				await expect( contentBinding ).toContainText(
+					'Movie field label'
+				);
+			} );
+			test( 'should fall back to the field key if the field label is not defined', async ( {
+				editor,
+				page,
+			} ) => {
+				/**
+				 * Create connection manually until this issue is solved:
+				 * https://github.com/WordPress/gutenberg/pull/65604
+				 *
+				 * Once solved, block with the binding can be directly inserted.
+				 */
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+				} );
+				await page.getByLabel( 'Attributes options' ).click();
+				await page
+					.getByRole( 'menuitemcheckbox', {
+						name: 'Show content',
+					} )
+					.click();
+				const contentBinding = page.getByRole( 'button', {
+					name: 'content',
+				} );
+				await contentBinding.click();
+				await page
+					.getByRole( 'menuitemradio' )
+					.filter( { hasText: 'field_without_label_or_default' } )
+					.click();
+				await expect( contentBinding ).toContainText(
+					'field_without_label_or_default'
+				);
+			} );
+		} );
+
+		test.describe( 'Fields list dropdown', () => {
+			// Insert block and open the dropdown for every test.
+			test.beforeEach( async ( { editor, page } ) => {
+				await editor.insertBlock( {
+					name: 'core/paragraph',
+				} );
+				await page.getByLabel( 'Attributes options' ).click();
+				await page
+					.getByRole( 'menuitemcheckbox', {
+						name: 'Show content',
+					} )
+					.click();
+				await page
+					.getByRole( 'button', {
+						name: 'content',
+					} )
+					.click();
+			} );
+
+			test( 'should include movie fields in UI to connect attributes', async ( {
+				page,
+			} ) => {
+				const movieField = page
+					.getByRole( 'menuitemradio' )
+					.filter( { hasText: 'Movie field label' } );
+				await expect( movieField ).toBeVisible();
+			} );
+			test( 'should include global fields in UI to connect attributes', async ( {
+				page,
+			} ) => {
+				const globalField = page
+					.getByRole( 'menuitemradio' )
+					.filter( { hasText: 'text_custom_field' } );
+				await expect( globalField ).toBeVisible();
+			} );
+			test( 'should not include protected fields', async ( { page } ) => {
+				// Ensure the fields have loaded by checking the field is visible.
+				const globalField = page
+					.getByRole( 'menuitemradio' )
+					.filter( { hasText: 'text_custom_field' } );
+				await expect( globalField ).toBeVisible();
+				// Check the protected fields are not visible.
+				const protectedField = page
+					.getByRole( 'menuitemradio' )
+					.filter( { hasText: '_protected_field' } );
+				await expect( protectedField ).toBeHidden();
+				const showInRestFalseField = page
+					.getByRole( 'menuitemradio' )
+					.filter( { hasText: 'show_in_rest_false_field' } );
+				await expect( showInRestFalseField ).toBeHidden();
+			} );
+			test( 'should show the default value if it is defined', async ( {
+				page,
+			} ) => {
+				const fieldButton = page
+					.getByRole( 'menuitemradio' )
+					.filter( { hasText: 'Movie field label' } );
+				await expect( fieldButton ).toContainText(
+					'Movie field default value'
+				);
+			} );
+			test( 'should not show anything if the default value is not defined', async ( {
+				page,
+			} ) => {
+				const fieldButton = page
+					.getByRole( 'menuitemradio' )
+					.filter( { hasText: 'Field with only label' } );
+				// Check it only contains the field label.
+				await expect( fieldButton ).toHaveText(
+					'Field with only label'
+				);
+			} );
+		} );
+	} );
+
+	test.describe( 'Custom template', () => {
+		test.beforeEach( async ( { admin, editor } ) => {
+			await admin.visitSiteEditor( {
+				postId: 'gutenberg-test-themes/block-bindings//custom-template',
+				postType: 'wp_template',
+				canvas: 'edit',
+			} );
+			await editor.openDocumentSettingsSidebar();
+		} );
+
+		test( 'should not include post meta fields in UI to connect attributes', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'fallback content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'core/post-meta',
+								args: {
+									key: 'text_custom_field',
+								},
+							},
+						},
+					},
+				},
+			} );
+			await page
+				.getByRole( 'button', {
+					name: 'content',
+				} )
+				.click();
+			// Check the fields registered by other sources are there.
+			const customSourceField = page
+				.getByRole( 'menuitemradio' )
+				.filter( { hasText: 'Text Field Label' } );
+			await expect( customSourceField ).toBeVisible();
+			// Check the post meta fields are not visible.
+			const globalField = page
+				.getByRole( 'menuitemradio' )
+				.filter( { hasText: 'text_custom_field' } );
+			await expect( globalField ).toBeHidden();
+			const movieField = page
+				.getByRole( 'menuitemradio' )
+				.filter( { hasText: 'Movie field label' } );
+			await expect( movieField ).toBeHidden();
+		} );
+		test( 'should show the key in attributes connected to post meta', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'fallback content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'core/post-meta',
+								args: {
+									key: 'text_custom_field',
+								},
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphBlock ).toHaveText( 'text_custom_field' );
+		} );
+	} );
+
+	test.describe( 'Movie CPT post', () => {
+		test.beforeEach( async ( { admin } ) => {
+			// CHECK HOW TO CREATE A MOVIE.
+			await admin.createNewPost( {
+				postType: 'movie',
+				title: 'Test bindings',
+			} );
+		} );
+
+		test( 'should show the custom field value of that specific post', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					anchor: 'connected-paragraph',
+					content: 'fallback content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'core/post-meta',
+								args: {
+									key: 'movie_field',
+								},
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphBlock ).toHaveText(
+				'Movie field default value'
+			);
+			// Check the frontend shows the value of the custom field.
+			const previewPage = await editor.openPreviewPage();
+			await expect(
+				previewPage.locator( '#connected-paragraph' )
+			).toHaveText( 'Movie field default value' );
+		} );
+		test( 'should fall back to the key when custom field is not accessible', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'fallback content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'core/post-meta',
+								args: {
+									key: 'unaccessible_field',
+								},
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphBlock ).toHaveText( 'unaccessible_field' );
+			await expect( paragraphBlock ).toHaveAttribute(
+				'contenteditable',
+				'false'
+			);
+		} );
+		test( 'should not show or edit the value of a protected field', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'fallback content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'core/post-meta',
+								args: {
+									key: '_protected_field',
+								},
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphBlock ).toHaveText( '_protected_field' );
+			await expect( paragraphBlock ).toHaveAttribute(
+				'contenteditable',
+				'false'
+			);
+		} );
+		test( 'should not show or edit the value of a field with `show_in_rest` set to false', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					content: 'fallback content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'core/post-meta',
+								args: {
+									key: 'show_in_rest_false_field',
+								},
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphBlock ).toHaveText(
+				'show_in_rest_false_field'
+			);
+			await expect( paragraphBlock ).toHaveAttribute(
+				'contenteditable',
+				'false'
+			);
+		} );
+		test( 'should be possible to edit the value of the connected custom fields', async ( {
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: {
+					anchor: 'connected-paragraph',
+					content: 'fallback content',
+					metadata: {
+						bindings: {
+							content: {
+								source: 'core/post-meta',
+								args: {
+									key: 'movie_field',
+								},
+							},
+						},
+					},
+				},
+			} );
+			const paragraphBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphBlock ).toHaveText(
+				'Movie field default value'
+			);
+			await expect( paragraphBlock ).toHaveAttribute(
+				'contenteditable',
+				'true'
+			);
+			await paragraphBlock.fill( 'new value' );
+			// Check that the paragraph content attribute didn't change.
+			const [ paragraphBlockObject ] = await editor.getBlocks();
+			expect( paragraphBlockObject.attributes.content ).toBe(
+				'fallback content'
+			);
+			// Check the value of the custom field is being updated by visiting the frontend.
+			const previewPage = await editor.openPreviewPage();
+			await expect(
+				previewPage.locator( '#connected-paragraph' )
+			).toHaveText( 'new value' );
+		} );
+		test( 'should be possible to connect movie fields through the attributes panel', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+			} );
+			await page.getByLabel( 'Attributes options' ).click();
+			await page
+				.getByRole( 'menuitemcheckbox', {
+					name: 'Show content',
+				} )
+				.click();
+			await page
+				.getByRole( 'button', {
+					name: 'content',
+				} )
+				.click();
+			const movieField = page
+				.getByRole( 'menuitemradio' )
+				.filter( { hasText: 'Movie field label' } );
+			await expect( movieField ).toBeVisible();
+		} );
+		test( 'should not be possible to connect non-supported fields through the attributes panel', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+			} );
+			await page.getByLabel( 'Attributes options' ).click();
+			await page
+				.getByRole( 'menuitemcheckbox', {
+					name: 'Show content',
+				} )
+				.click();
+			await page
+				.getByRole( 'button', {
+					name: 'content',
+				} )
+				.click();
+			await expect(
+				page.getByRole( 'menuitemradio', {
+					name: 'String custom field',
+				} )
+			).toBeVisible();
+			await expect(
+				page.getByRole( 'menuitemradio', {
+					name: 'Number custom field',
+				} )
+			).toBeHidden();
+			await expect(
+				page.getByRole( 'menuitemradio', {
+					name: 'Integer custom field',
+				} )
+			).toBeHidden();
+			await expect(
+				page.getByRole( 'menuitemradio', {
+					name: 'Boolean custom field',
+				} )
+			).toBeHidden();
+			await expect(
+				page.getByRole( 'menuitemradio', {
+					name: 'Object custom field',
+				} )
+			).toBeHidden();
+			await expect(
+				page.getByRole( 'menuitemradio', {
+					name: 'Array custom field',
+				} )
+			).toBeHidden();
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/block-editor-keyboard-shortcuts.spec.js b/test/e2e/specs/editor/various/block-editor-keyboard-shortcuts.spec.js
new file mode 100644
index 00000000000000..967baccfcbe4ef
--- /dev/null
+++ b/test/e2e/specs/editor/various/block-editor-keyboard-shortcuts.spec.js
@@ -0,0 +1,284 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+async function addTestParagraphBlocks( { editor, page } ) {
+	await test.step( 'add test paragraph blocks', async () => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '1st' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '2nd' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '3rd' );
+	} );
+}
+
+test.describe( 'Block editor keyboard shortcuts', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test.describe( 'move blocks - single block selected', () => {
+		test( 'should move the block up', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await addTestParagraphBlocks( { editor, page } );
+			await pageUtils.pressKeys( 'secondary+t', { times: 2 } );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+					attributes: { content: '3rd' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '1st' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '2nd' },
+				},
+			] );
+		} );
+
+		test( 'should move the block down', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await addTestParagraphBlocks( { editor, page } );
+			await page.keyboard.press( 'ArrowUp' );
+			await pageUtils.pressKeys( 'secondary+y' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+					attributes: { content: '1st' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '3rd' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '2nd' },
+				},
+			] );
+		} );
+	} );
+
+	test.describe( 'move blocks - multiple blocks selected', () => {
+		test( 'should move the blocks up', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await addTestParagraphBlocks( { editor, page } );
+			await pageUtils.pressKeys( 'shift+ArrowUp' );
+			await expect(
+				page
+					.getByRole( 'toolbar', { name: 'Block tools' } )
+					.getByRole( 'button', { name: 'Multiple blocks selected' } )
+			).toBeVisible();
+			await pageUtils.pressKeys( 'secondary+t' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+					attributes: { content: '2nd' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '3rd' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '1st' },
+				},
+			] );
+		} );
+
+		test( 'should move the blocks down', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await addTestParagraphBlocks( { editor, page } );
+			await page.keyboard.press( 'ArrowUp' );
+			await pageUtils.pressKeys( 'shift+ArrowUp' );
+			await expect(
+				page
+					.getByRole( 'toolbar', { name: 'Block tools' } )
+					.getByRole( 'button', { name: 'Multiple blocks selected' } )
+			).toBeVisible();
+			await pageUtils.pressKeys( 'secondary+y' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+					attributes: { content: '3rd' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '1st' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '2nd' },
+				},
+			] );
+		} );
+	} );
+
+	test.describe( 'test shortcuts handling through portals in the same tree', () => {
+		test( 'should propagate properly and duplicate selected blocks', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await addTestParagraphBlocks( { editor, page } );
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+
+			await editor.clickBlockToolbarButton( 'Options' );
+			await expect(
+				page
+					.getByRole( 'menu', { name: 'Options' } )
+					.getByRole( 'menuitem', { name: 'Duplicate' } )
+			).toBeVisible();
+
+			// Duplicate via keyboard.
+			await pageUtils.pressKeys( 'primaryShift+d' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+				},
+				{
+					name: 'core/paragraph',
+				},
+				{
+					name: 'core/paragraph',
+				},
+				{
+					name: 'core/paragraph',
+				},
+				{
+					name: 'core/paragraph',
+				},
+				{
+					name: 'core/paragraph',
+				},
+			] );
+		} );
+
+		test( 'should prevent deleting multiple selected blocks from inputs', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await addTestParagraphBlocks( { editor, page } );
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+
+			await editor.clickBlockToolbarButton( 'Options' );
+			await page
+				.getByRole( 'menu', { name: 'Options' } )
+				.getByRole( 'menuitem', { name: 'Create pattern' } )
+				.click();
+			await page
+				.getByRole( 'dialog', { name: 'add new pattern' } )
+				.getByRole( 'textbox', { name: 'Name' } )
+				.fill( 'hi' );
+
+			await page.keyboard.press( 'Backspace' );
+			await page.keyboard.press( 'ArrowLeft' );
+			await page.keyboard.press( 'Delete' );
+			await page.keyboard.press( 'Escape' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+					attributes: { content: '1st' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '2nd' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '3rd' },
+				},
+			] );
+		} );
+	} );
+
+	test.describe( 'create a group block from the selected blocks', () => {
+		test( 'should propagate properly if multiple blocks are selected.', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await addTestParagraphBlocks( { editor, page } );
+
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+
+			await pageUtils.pressKeys( 'primary+g' ); // Keyboard shortcut for Insert before.
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/paragraph',
+							attributes: { content: '1st' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: '2nd' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: '3rd' },
+						},
+					],
+				},
+			] );
+		} );
+
+		test( 'should prevent if a single block is selected.', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await addTestParagraphBlocks( { editor, page } );
+			const firstParagraphBlock = editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} )
+				.first();
+			await editor.selectBlocks( firstParagraphBlock );
+			await pageUtils.pressKeys( 'primary+g' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+					attributes: { content: '1st' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '2nd' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: '3rd' },
+				},
+			] );
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/block-grouping.spec.js b/test/e2e/specs/editor/various/block-grouping.spec.js
new file mode 100644
index 00000000000000..ec09edc4160d08
--- /dev/null
+++ b/test/e2e/specs/editor/various/block-grouping.spec.js
@@ -0,0 +1,462 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+/** @typedef {import('@playwright/test').Page} Page */
+/** @typedef {import('@wordpress/e2e-test-utils-playwright').Editor} Editor */
+
+test.use( {
+	groupingUtils: async ( { page, editor }, use ) => {
+		await use( new GroupingUtils( { page, editor } ) );
+	},
+} );
+
+test.describe( 'Block Grouping', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test.describe( 'Group creation', () => {
+		test( 'creates a group from multiple blocks of the same type via block transforms', async ( {
+			editor,
+			page,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			await groupingUtils.insertBlocksOfSameType();
+
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+			await page
+				.getByRole( 'toolbar', { name: 'Block tools' } )
+				.getByRole( 'button', { name: 'Multiple blocks selected' } )
+				.click();
+			await page
+				.getByRole( 'menu', { name: 'Multiple blocks selected' } )
+				.getByRole( 'menuitem', { name: 'Group' } )
+				.click();
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'First Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Second Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Third Paragraph' },
+						},
+					],
+				},
+			] );
+		} );
+
+		test( 'creates a group from multiple blocks of different types via block transforms', async ( {
+			editor,
+			page,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			await groupingUtils.insertBlocksOfMultipleTypes();
+
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+			await page
+				.getByRole( 'toolbar', { name: 'Block tools' } )
+				.getByRole( 'button', { name: 'Multiple blocks selected' } )
+				.click();
+			await page
+				.getByRole( 'menu', { name: 'Multiple blocks selected' } )
+				.getByRole( 'menuitem', { name: 'Group' } )
+				.click();
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/heading',
+							attributes: { content: 'Group Heading', level: 2 },
+						},
+						{
+							name: 'core/image',
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Some paragraph' },
+						},
+					],
+				},
+			] );
+		} );
+
+		test( 'creates a group from multiple blocks of the same type via options toolbar', async ( {
+			editor,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			await groupingUtils.insertBlocksOfSameType();
+
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+			await editor.clickBlockOptionsMenuItem( 'Group' );
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'First Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Second Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Third Paragraph' },
+						},
+					],
+				},
+			] );
+		} );
+
+		test( 'groups and ungroups multiple blocks of different types via options toolbar', async ( {
+			editor,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			await groupingUtils.insertBlocksOfMultipleTypes();
+
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+
+			await editor.clickBlockOptionsMenuItem( 'Group' );
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/heading',
+							attributes: { content: 'Group Heading', level: 2 },
+						},
+						{
+							name: 'core/image',
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Some paragraph' },
+						},
+					],
+				},
+			] );
+
+			await editor.clickBlockOptionsMenuItem( 'Ungroup' );
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/heading',
+					attributes: { content: 'Group Heading', level: 2 },
+				},
+				{
+					name: 'core/image',
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'Some paragraph' },
+				},
+			] );
+		} );
+
+		test( 'does not allow ungrouping a group block that has no children', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( { name: 'core/group' } );
+			await editor.clickBlockToolbarButton( 'Options' );
+			await expect(
+				page
+					.getByRole( 'menu', { name: 'Options' } )
+					.getByRole( 'menuitem', { name: 'Ungroup' } )
+			).toBeHidden();
+		} );
+
+		test( 'should group and ungroup a controlled block properly', async ( {
+			editor,
+			requestUtils,
+		} ) => {
+			const { id: ref } = await requestUtils.createBlock( {
+				title: 'Block',
+				status: 'publish',
+				content: `<!-- wp:paragraph -->\n<p>Hey!</p>\n<!-- /wp:paragraph -->`,
+				wp_pattern_category: [],
+			} );
+
+			await editor.insertBlock( {
+				name: 'core/block',
+				attributes: { ref },
+			} );
+			await editor.clickBlockOptionsMenuItem( 'Group' );
+			await expect(
+				editor.canvas.getByRole( 'document', {
+					name: 'Block: Group',
+				} )
+			).toContainText( 'Hey!' );
+
+			await editor.clickBlockOptionsMenuItem( 'Ungroup' );
+			await expect(
+				editor.canvas.getByRole( 'document', {
+					name: 'Block: Pattern',
+				} )
+			).toContainText( 'Hey!' );
+		} );
+
+		test( 'should group another Group block via options toolbar', async ( {
+			page,
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: { content: '1' },
+			} );
+
+			const group = page
+				.getByRole( 'menu', { name: 'Options' } )
+				.getByRole( 'menuitem', { name: 'Group', exact: true } );
+
+			await editor.clickBlockToolbarButton( 'Options' );
+			await group.click();
+			await editor.clickBlockToolbarButton( 'Options' );
+			await group.click();
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/group',
+							innerBlocks: [
+								{
+									name: 'core/paragraph',
+									attributes: { content: '1' },
+								},
+							],
+						},
+					],
+				},
+			] );
+		} );
+	} );
+
+	test.describe( 'Grouping Block availability', () => {
+		test.beforeEach( async ( { page, pageUtils, groupingUtils } ) => {
+			// Disable the Group block.
+			await page.evaluate( () => {
+				window.wp.data
+					.dispatch( 'core/edit-post' )
+					.hideBlockTypes( [ 'core/group' ] );
+			} );
+
+			await groupingUtils.insertBlocksOfMultipleTypes();
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+		} );
+
+		test.afterEach( async ( { page } ) => {
+			// Re-enable the Group block.
+			await page.evaluate( () => {
+				window.wp.data
+					.dispatch( 'core/edit-post' )
+					.showBlockTypes( [ 'core/group' ] );
+			} );
+		} );
+
+		test( 'does not show group transform if Grouping block is disabled', async ( {
+			page,
+		} ) => {
+			await page
+				.getByRole( 'toolbar', { name: 'Block tools' } )
+				.getByRole( 'button', { name: 'Multiple blocks selected' } )
+				.click();
+
+			await expect(
+				page
+					.getByRole( 'menu', { name: 'Multiple blocks selected' } )
+					.getByRole( 'menuitem', { name: 'Group' } )
+			).toBeHidden();
+		} );
+
+		test( 'does not show group option in the options toolbar if Grouping block is disabled', async ( {
+			page,
+			editor,
+		} ) => {
+			await editor.clickBlockToolbarButton( 'Options' );
+
+			await expect(
+				page
+					.getByRole( 'menu', { name: 'Options' } )
+					.getByRole( 'menuitem', { name: 'Group' } )
+			).toBeHidden();
+		} );
+	} );
+
+	test.describe( 'Preserving selected blocks attributes', () => {
+		test( 'preserves width alignment settings of selected blocks', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/heading',
+				attributes: { content: 'Heading', level: 2 },
+			} );
+			const alignOptions = page.getByRole( 'menu', { name: 'Align' } );
+
+			// Full width image.
+			await editor.insertBlock( { name: 'core/image' } );
+			await editor.clickBlockToolbarButton( 'Align' );
+			await alignOptions
+				.getByRole( 'menuitemradio', { name: 'Full width' } )
+				.click();
+
+			// Wide width image.
+			await editor.insertBlock( { name: 'core/image' } );
+			await editor.clickBlockToolbarButton( 'Align' );
+			await alignOptions
+				.getByRole( 'menuitemradio', {
+					name: 'Wide width',
+				} )
+				.click();
+
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: { content: 'Some paragraph' },
+			} );
+
+			// Select everythinga and group.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+			await editor.transformBlockTo( 'core/group' );
+
+			// We expect Group block align setting to match that
+			// of the widest of it's "child" innerBlocks
+			await editor.clickBlockToolbarButton( 'Align' );
+			await expect(
+				alignOptions.getByRole( 'menuitemradio', { checked: true } )
+			).toHaveText( 'Full width' );
+		} );
+	} );
+
+	test.describe( 'Registering alternative Blocks to handle Grouping interactions', () => {
+		test.beforeAll( async ( { requestUtils } ) => {
+			await requestUtils.activatePlugin(
+				'gutenberg-test-custom-grouping-block'
+			);
+		} );
+
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.deactivatePlugin(
+				'gutenberg-test-custom-grouping-block'
+			);
+		} );
+
+		test( 'should use registered grouping block for grouping interactions', async ( {
+			editor,
+			page,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			// Set custom Block as the Block to use for Grouping.
+			await page.evaluate( () => {
+				window.wp.blocks.setGroupingBlockName(
+					'test/alternative-group-block'
+				);
+			} );
+
+			await groupingUtils.insertBlocksOfSameType();
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+
+			// Group - this will use whichever Block is registered as the Grouping Block
+			// as opposed to "transformTo()" which uses whatever is passed to it. To
+			// ensure this test is meaningful we must rely on what is registered.
+			await editor.clickBlockOptionsMenuItem( 'Group' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'test/alternative-group-block',
+					innerBlocks: [
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'First Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Second Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Third Paragraph' },
+						},
+					],
+				},
+			] );
+		} );
+	} );
+} );
+
+class GroupingUtils {
+	/** @type {import('@playwright/test').Page} */
+	#page;
+	/** @type {Editor} */
+	#editor;
+
+	constructor( { page, editor } ) {
+		this.#page = page;
+		this.#editor = editor;
+	}
+
+	async insertBlocksOfSameType() {
+		await test.step(
+			'insert blocks of the same type',
+			async () => {
+				await this.#editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: { content: 'First Paragraph' },
+				} );
+				await this.#editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: { content: 'Second Paragraph' },
+				} );
+				await this.#editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: { content: 'Third Paragraph' },
+				} );
+			},
+			{ box: true }
+		);
+	}
+
+	async insertBlocksOfMultipleTypes() {
+		await test.step(
+			'insert blocks of multiple types',
+			async () => {
+				await this.#editor.insertBlock( {
+					name: 'core/heading',
+					attributes: { content: 'Group Heading', level: 2 },
+				} );
+				await this.#editor.insertBlock( {
+					name: 'core/image',
+				} );
+				await this.#editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: { content: 'Some paragraph' },
+				} );
+			},
+			{ box: true }
+		);
+	}
+}
diff --git a/test/e2e/specs/editor/various/block-locking.spec.js b/test/e2e/specs/editor/various/block-locking.spec.js
index b40e7a4b7448a8..eafb468902ef92 100644
--- a/test/e2e/specs/editor/various/block-locking.spec.js
+++ b/test/e2e/specs/editor/various/block-locking.spec.js
@@ -82,6 +82,12 @@ test.describe( 'Block Locking', () => {
 		await page.click( 'role=checkbox[name="Lock all"]' );
 		await page.click( 'role=button[name="Apply"]' );
 
+		await expect(
+			page
+				.getByRole( 'toolbar', { name: 'Block tools' } )
+				.getByRole( 'button', { name: 'Lock' } )
+		).toBeFocused();
+
 		expect( await editor.getEditedPostContent() )
 			.toBe( `<!-- wp:paragraph {"lock":{"move":false,"remove":false}} -->
 <p>Some paragraph</p>
diff --git a/test/e2e/specs/editor/various/block-moving-mode.spec.js b/test/e2e/specs/editor/various/block-moving-mode.spec.js
deleted file mode 100644
index 5b8ef6bdcd051b..00000000000000
--- a/test/e2e/specs/editor/various/block-moving-mode.spec.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * WordPress dependencies
- */
-const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
-
-test.describe( 'Block moving mode', () => {
-	test.beforeEach( async ( { admin } ) => {
-		await admin.createNewPost();
-	} );
-
-	test.afterEach( async ( { requestUtils } ) => {
-		await requestUtils.deleteAllPosts();
-	} );
-
-	test( 'can move block', async ( { editor, page } ) => {
-		await editor.insertBlock( {
-			name: 'core/paragraph',
-			attributes: { content: 'First Paragraph' },
-		} );
-		await editor.insertBlock( {
-			name: 'core/paragraph',
-			attributes: { content: 'Second Paragraph' },
-		} );
-
-		// Move the second block in front of the first block.
-		await editor.showBlockToolbar();
-		await page
-			.getByRole( 'toolbar', { name: 'Block tools' } )
-			.getByRole( 'button', { name: 'Options' } )
-			.click();
-		await page.getByRole( 'menuitem', { name: 'Move to' } ).click();
-		await page.keyboard.press( 'ArrowUp' );
-		await page.keyboard.press( 'Enter' );
-
-		await expect.poll( editor.getBlocks ).toMatchObject( [
-			{
-				name: 'core/paragraph',
-				attributes: { content: 'Second Paragraph' },
-			},
-			{
-				name: 'core/paragraph',
-				attributes: { content: 'First Paragraph' },
-			},
-		] );
-	} );
-
-	test( 'can move block in the nested block', async ( { editor, page } ) => {
-		// Create two group blocks with some blocks.
-		await editor.insertBlock( { name: 'core/group' } );
-		await editor.canvas
-			.locator(
-				'role=button[name="Group: Gather blocks in a container."i]'
-			)
-			.click();
-		await page.keyboard.press( 'ArrowDown' );
-		await page.keyboard.press( 'Enter' );
-		await page.getByRole( 'option', { name: 'Paragraph' } ).click();
-		await page.keyboard.type( 'First Paragraph' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Second Paragraph' );
-
-		await editor.insertBlock( { name: 'core/group' } );
-		await editor.canvas
-			.locator(
-				'role=button[name="Group: Gather blocks in a container."i]'
-			)
-			.click();
-		await page.keyboard.press( 'ArrowDown' );
-		await page.keyboard.press( 'Enter' );
-		await page.getByRole( 'option', { name: 'Paragraph' } ).click();
-		await page.keyboard.type( 'Third Paragraph' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Fourth Paragraph' );
-
-		// Move a paragraph block in the first group block into the second group block.
-		const paragraphBlock = editor.canvas.locator(
-			'text="First Paragraph"'
-		);
-		await paragraphBlock.focus();
-		await editor.showBlockToolbar();
-		await page
-			.getByRole( 'toolbar', { name: 'Block tools' } )
-			.getByRole( 'button', { name: 'Options' } )
-			.click();
-		await page.getByRole( 'menuitem', { name: 'Move to' } ).click();
-		await page.keyboard.press( 'ArrowLeft' ); // Select the first group block.
-		await page.keyboard.press( 'ArrowDown' ); // Select the second group block.
-		await page.keyboard.press( 'ArrowRight' ); // Enter the second group block.
-		await page.keyboard.press( 'ArrowDown' ); // Move down in the second group block.
-		await page.keyboard.press( 'Enter' );
-
-		await expect.poll( editor.getBlocks ).toMatchObject( [
-			{
-				name: 'core/group',
-				innerBlocks: [
-					{
-						name: 'core/paragraph',
-						attributes: { content: 'Second Paragraph' },
-					},
-				],
-			},
-			{
-				name: 'core/group',
-				innerBlocks: [
-					{
-						name: 'core/paragraph',
-						attributes: { content: 'Third Paragraph' },
-					},
-					{
-						name: 'core/paragraph',
-						attributes: { content: 'First Paragraph' },
-					},
-					{
-						name: 'core/paragraph',
-						attributes: { content: 'Fourth Paragraph' },
-					},
-				],
-			},
-		] );
-	} );
-
-	test( 'can not move inside its own block', async ( { editor, page } ) => {
-		// Create a paragraph block and a group block.
-		await editor.insertBlock( {
-			name: 'core/paragraph',
-			attributes: { content: 'First Paragraph' },
-		} );
-		await editor.insertBlock( { name: 'core/group' } );
-		await editor.canvas
-			.locator(
-				'role=button[name="Group: Gather blocks in a container."i]'
-			)
-			.click();
-		await page.keyboard.press( 'ArrowDown' );
-		await page.keyboard.press( 'Enter' );
-		await page.getByRole( 'option', { name: 'Paragraph' } ).click();
-		await page.keyboard.type( 'Second Paragraph' );
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Third Paragraph' );
-
-		// Trying to move the group block into its own.
-		const groupBlock = editor.canvas.locator(
-			'role=document[name="Block: Group"i]'
-		);
-		await groupBlock.focus();
-		await editor.showBlockToolbar();
-		await page
-			.getByRole( 'toolbar', { name: 'Block tools' } )
-			.getByRole( 'button', { name: 'Options' } )
-			.click();
-		await page.getByRole( 'menuitem', { name: 'Move to' } ).click();
-		await page.keyboard.press( 'ArrowRight' );
-		await expect( groupBlock ).toHaveClass( /is-selected/ );
-	} );
-} );
diff --git a/test/e2e/specs/editor/various/block-renaming.spec.js b/test/e2e/specs/editor/various/block-renaming.spec.js
index 19a2818fd3a411..6998683cb96163 100644
--- a/test/e2e/specs/editor/various/block-renaming.spec.js
+++ b/test/e2e/specs/editor/various/block-renaming.spec.js
@@ -36,26 +36,10 @@ test.describe( 'Block Renaming', () => {
 			page,
 			pageUtils,
 		} ) => {
-			// Turn on block list view by default.
-			await editor.setPreferences( 'core/edit-site', {
-				showListViewByDefault: true,
-			} );
-
-			const listView = page.getByRole( 'treegrid', {
-				name: 'Block navigation structure',
-			} );
-
-			await editor.insertBlock( {
-				name: 'core/group',
-				attributes: { content: 'First Paragraph' },
-			} );
+			await editor.insertBlock( { name: 'core/group' } );
 
 			// Select via keyboard.
 			await pageUtils.pressKeys( 'primary+a' );
-
-			// Convert to a Group block which supports renaming.
-			await editor.clickBlockOptionsMenuItem( 'Group' );
-
 			await editor.clickBlockOptionsMenuItem( 'Rename' );
 
 			const renameMenuItem = page.getByRole( 'menuitem', {
@@ -76,7 +60,7 @@ test.describe( 'Block Renaming', () => {
 			await expect( renameModal ).toBeVisible();
 
 			const nameInput = renameModal.getByRole( 'textbox', {
-				name: 'Block name',
+				name: 'Name',
 			} );
 
 			// Check focus is transferred into the input within the Modal.
@@ -107,11 +91,18 @@ test.describe( 'Block Renaming', () => {
 				'false'
 			);
 
-			// Check custom name reflected in List View.
-			listView.getByRole( 'link', {
-				name: 'My new name',
+			await pageUtils.pressKeys( 'access+o' );
+			const listView = page.getByRole( 'treegrid', {
+				name: 'Block navigation structure',
 			} );
 
+			await expect(
+				listView.getByRole( 'link', {
+					name: 'My new name',
+				} ),
+				'should reflect custom name in List View'
+			).toBeVisible();
+
 			await expect.poll( editor.getBlocks ).toMatchObject( [
 				{
 					name: 'core/group',
@@ -123,7 +114,8 @@ test.describe( 'Block Renaming', () => {
 				},
 			] );
 
-			// Re-trigger the rename dialog.
+			// Re-trigger the rename dialog from the List View.
+			await listView.getByRole( 'button', { name: 'Options' } ).click();
 			await renameMenuItem.click();
 
 			// Expect modal input to contain the custom name.
@@ -142,10 +134,12 @@ test.describe( 'Block Renaming', () => {
 
 			await saveButton.click();
 
-			// Check the original block name to reflected in List View.
-			listView.getByRole( 'link', {
-				name: 'Group',
-			} );
+			await expect(
+				listView.getByRole( 'link', {
+					name: 'Group',
+				} ),
+				'should reflect original name in List View'
+			).toBeVisible();
 
 			// Expect block to have no custom name (i.e. it should be reset to the original block name).
 			await expect.poll( editor.getBlocks ).toMatchObject( [
@@ -178,15 +172,15 @@ test.describe( 'Block Renaming', () => {
 			// Select via keyboard.
 			await pageUtils.pressKeys( 'primary+a' );
 
-			const blockOptionsTrigger = listView.getByRole( 'button', {
-				name: 'Options for No Rename Support Block',
+			const blockActionsTrigger = listView.getByRole( 'button', {
+				name: 'Options',
 			} );
 
-			await blockOptionsTrigger.click();
+			await blockActionsTrigger.click();
 
 			const renameMenuItem = page
 				.getByRole( 'menu', {
-					name: 'Options for No Rename Support Block',
+					name: 'Options',
 				} )
 				.getByRole( 'menuitem', {
 					name: 'Rename',
@@ -196,7 +190,7 @@ test.describe( 'Block Renaming', () => {
 			await expect( renameMenuItem ).toBeHidden();
 		} );
 
-		test( 'displays Rename option in related menu when block is not selected', async ( {
+		test( 'displays Rename action in related menu when block is not selected', async ( {
 			editor,
 			page,
 			pageUtils,
@@ -222,16 +216,25 @@ test.describe( 'Block Renaming', () => {
 				} )
 				.click();
 
-			// Trigger options menu for the Heading (not the selected block).
-			const blockOptionsTrigger = listView.getByRole( 'button', {
-				name: 'Options for Heading',
+			// Trigger actions menu for the Heading (not the selected block).
+			const headingItem = listView.getByRole( 'gridcell', {
+				name: 'Heading',
 			} );
 
-			await blockOptionsTrigger.click();
+			// The options menu button is a sibling of the menu item gridcell.
+			const headingItemActions = headingItem
+				.locator( '..' ) // parent selector.
+				.getByRole( 'button', {
+					name: 'Options',
+				} );
+
+			await headingItemActions.click();
 
+			// usage of `page` is required because the options menu is rendered
+			// into a slot outside of the treegrid.
 			const renameMenuItem = page
 				.getByRole( 'menu', {
-					name: 'Options for Heading',
+					name: 'Options',
 				} )
 				.getByRole( 'menuitem', {
 					name: 'Rename',
@@ -241,104 +244,4 @@ test.describe( 'Block Renaming', () => {
 			await expect( renameMenuItem ).toBeVisible();
 		} );
 	} );
-
-	test.describe( 'Block inspector renaming', () => {
-		test( 'allows renaming of blocks that support the feature via "Advanced" section of block inspector tools', async ( {
-			editor,
-			page,
-			pageUtils,
-		} ) => {
-			await editor.insertBlock( {
-				name: 'core/group',
-			} );
-
-			// Select via keyboard.
-			await pageUtils.pressKeys( 'primary+a' );
-
-			// Convert to a Group block which supports renaming.
-			await editor.clickBlockOptionsMenuItem( 'Group' );
-
-			await editor.openDocumentSettingsSidebar();
-
-			const advancedPanelToggle = page
-				.getByRole( 'region', {
-					name: 'Editor settings',
-				} )
-				.getByRole( 'button', {
-					name: 'Advanced',
-					expanded: false,
-				} );
-
-			await advancedPanelToggle.click();
-
-			const nameInput = page.getByRole( 'textbox', {
-				name: 'Block name',
-			} );
-
-			await expect( nameInput ).toBeEmpty();
-
-			await nameInput.fill( 'My new name' );
-
-			await expect( nameInput ).toHaveValue( 'My new name' );
-
-			await expect.poll( editor.getBlocks ).toMatchObject( [
-				{
-					name: 'core/group',
-					attributes: {
-						metadata: {
-							name: 'My new name',
-						},
-					},
-				},
-			] );
-
-			await nameInput.focus();
-			await pageUtils.pressKeys( 'primary+a' );
-			await page.keyboard.press( 'Delete' );
-
-			await expect.poll( editor.getBlocks ).toMatchObject( [
-				{
-					name: 'core/group',
-					attributes: {
-						metadata: {
-							name: '',
-						},
-					},
-				},
-			] );
-		} );
-
-		test( 'does not allow renaming of blocks that do not support the feature', async ( {
-			editor,
-			page,
-			pageUtils,
-		} ) => {
-			await editor.insertBlock( {
-				name: 'my-plugin/block-that-does-not-support-renaming',
-			} );
-
-			// Multiselect via keyboard.
-			await pageUtils.pressKeys( 'primary+a' );
-
-			await editor.openDocumentSettingsSidebar();
-
-			const advancedPanelToggle = page
-				.getByRole( 'region', {
-					name: 'Editor settings',
-				} )
-				.getByRole( 'button', {
-					name: 'Advanced',
-					expanded: false,
-				} );
-
-			await advancedPanelToggle.click();
-
-			// Expect the Rename control not to exist at all.
-			await expect(
-				page.getByRole( 'textbox', {
-					name: 'Block name',
-				} )
-			).toBeHidden();
-		} );
-	} );
 } );
diff --git a/test/e2e/specs/editor/various/block-switcher.spec.js b/test/e2e/specs/editor/various/block-switcher.spec.js
index 12fd843ed2ed12..41b0b1ee49c88c 100644
--- a/test/e2e/specs/editor/various/block-switcher.spec.js
+++ b/test/e2e/specs/editor/various/block-switcher.spec.js
@@ -8,7 +8,197 @@ test.describe( 'Block Switcher', () => {
 		await admin.createNewPost();
 	} );
 
-	test( 'Block variation transforms', async ( { editor, page } ) => {
+	test( 'Should show the expected block transforms on the list block when the blocks are removed', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '- List content' );
+		await page.keyboard.press( 'ArrowUp' );
+		await pageUtils.pressKeys( 'alt+F10' );
+
+		const blockSwitcher = page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'List' } );
+
+		// Verify the block switcher exists.
+		await expect( blockSwitcher ).toHaveAttribute(
+			'aria-haspopup',
+			'true'
+		);
+
+		// Verify the correct block transforms appear.
+		await blockSwitcher.click();
+		await expect(
+			page.getByRole( 'menu', { name: 'List' } ).getByRole( 'menuitem' )
+		).toHaveText( [
+			'Paragraph',
+			'Heading',
+			'Quote',
+			'Columns',
+			'Details',
+			'Group',
+		] );
+	} );
+
+	test( 'Should show the expected block transforms on the list block when the quote block is removed', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		// Remove the quote block from the list of registered blocks.
+		await page.waitForFunction( () => {
+			try {
+				window.wp.blocks.unregisterBlockType( 'core/quote' );
+				return true;
+			} catch {
+				return false;
+			}
+		} );
+
+		// Insert a list block.
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '- List content' );
+		await page.keyboard.press( 'ArrowUp' );
+		await pageUtils.pressKeys( 'alt+F10' );
+
+		const blockSwitcher = page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'List' } );
+
+		// Verify the block switcher exists.
+		await expect( blockSwitcher ).toHaveAttribute(
+			'aria-haspopup',
+			'true'
+		);
+
+		// Verify the correct block transforms appear.
+		await blockSwitcher.click();
+		await expect(
+			page.getByRole( 'menu', { name: 'List' } ).getByRole( 'menuitem' )
+		).toHaveText( [
+			'Paragraph',
+			'Heading',
+			'Columns',
+			'Details',
+			'Group',
+		] );
+	} );
+
+	test( 'Should not show the block switcher if the block has no styles and cannot be removed', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		// Insert a list block.
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '1' );
+		await pageUtils.pressKeys( 'alt+F10' );
+		const button = page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'Paragraph' } );
+		await expect( button ).toBeEnabled();
+
+		await editor.clickBlockOptionsMenuItem( 'Lock' );
+		await page.click( 'role=checkbox[name="Prevent removal"]' );
+		await page.click( 'role=button[name="Apply"]' );
+
+		// Verify the block switcher isn't enabled.
+		await expect( button ).toBeDisabled();
+	} );
+
+	test( 'Should show a message if there are no transforms or styles available', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		// Insert a list block.
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '- List content' );
+		await pageUtils.pressKeys( 'alt+F10' );
+
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'List item' } )
+			.click();
+		await expect( page.getByText( 'No transforms.' ) ).toBeVisible();
+	} );
+
+	test( 'Should show Columns block only if selected blocks are between limits (1-6)', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '- List content' );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '## I am a header' );
+		await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'Multiple blocks selected' } )
+			.click();
+
+		await expect(
+			page
+				.getByRole( 'menu', { name: 'Multiple blocks selected' } )
+				.getByRole( 'menuitem', { name: 'Columns' } )
+		).toBeVisible();
+	} );
+
+	test( 'Should NOT show Columns transform only if selected blocks are more than max limit(6)', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '- List content' );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '## I am a header' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'First paragraph' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Second paragraph' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Third paragraph' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Fourth paragraph' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Fifth paragraph' );
+		await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'Multiple blocks selected' } )
+			.click();
+
+		await expect(
+			page
+				.getByRole( 'menu', { name: 'Multiple blocks selected' } )
+				.getByRole( 'menuitem', { name: 'Columns' } )
+		).toBeHidden();
+	} );
+
+	test( 'should be able to transform to block variations', async ( {
+		editor,
+		page,
+	} ) => {
 		// This is the `stack` Group variation.
 		await editor.insertBlock( {
 			name: 'core/group',
diff --git a/test/e2e/specs/editor/various/block-visibility.spec.js b/test/e2e/specs/editor/various/block-visibility.spec.js
new file mode 100644
index 00000000000000..6e4163f4ed5839
--- /dev/null
+++ b/test/e2e/specs/editor/various/block-visibility.spec.js
@@ -0,0 +1,258 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.use( {
+	BlockVisibilityUtils: async ( { page }, use ) => {
+		await use( new BlockVisibilityUtils( { page } ) );
+	},
+} );
+
+test.describe( 'Block Visibility', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test.afterEach( async ( { page } ) => {
+		// Re-enable all blocks.
+		await page.evaluate( () => {
+			const blockTypes = window.wp.data
+				.select( 'core/blocks' )
+				.getBlockTypes();
+			window.wp.data
+				.dispatch( 'core/edit-post' )
+				.showBlockTypes( blockTypes );
+		} );
+	} );
+
+	test( 'should hide/show the block', async ( {
+		page,
+		BlockVisibilityUtils,
+	} ) => {
+		// Hide heading block.
+		await BlockVisibilityUtils.openBlockVisibilityManager();
+		await page
+			.getByRole( 'region', { name: 'Available block types' } )
+			.getByRole( 'checkbox', { name: 'Heading' } )
+			.uncheck();
+		await page
+			.getByRole( 'dialog', {
+				name: 'Preferences',
+			} )
+			.getByRole( 'button', { name: 'Close' } )
+			.click();
+		await page
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+		await page
+			.getByRole( 'region', { name: 'Block Library' } )
+			.getByRole( 'searchbox', {
+				name: 'Search',
+			} )
+			.fill( 'Heading' );
+
+		await expect(
+			page
+				.getByRole( 'tabpanel', { name: 'Blocks' } )
+				.getByRole( 'option', { name: 'Heading' } ),
+			'Heading block should not be visible'
+		).toBeHidden();
+
+		await page
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+
+		// Show heading block again.
+		await BlockVisibilityUtils.openBlockVisibilityManager();
+
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Available block types' } )
+				.getByRole( 'checkbox', { name: 'Heading' } ),
+			'Heading block should be unchecked'
+		).not.toBeChecked();
+
+		await page
+			.getByRole( 'region', { name: 'Available block types' } )
+			.getByRole( 'checkbox', { name: 'Heading' } )
+			.check();
+		await page
+			.getByRole( 'dialog', {
+				name: 'Preferences',
+			} )
+			.getByRole( 'button', { name: 'Close' } )
+			.click();
+		await page
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+		await page
+			.getByRole( 'region', { name: 'Block Library' } )
+			.getByRole( 'searchbox', {
+				name: 'Search',
+			} )
+			.fill( 'Heading' );
+
+		await expect(
+			page
+				.getByRole( 'tabpanel', { name: 'Blocks' } )
+				.getByRole( 'option', { name: 'Heading' } ),
+			'Heading block should be visible'
+		).toBeVisible();
+	} );
+
+	test( 'should hide/show all blocks in a category at once', async ( {
+		page,
+		BlockVisibilityUtils,
+	} ) => {
+		// Hide Media category blocks.
+		await BlockVisibilityUtils.openBlockVisibilityManager();
+		await page
+			.getByRole( 'region', { name: 'Available block types' } )
+			.getByRole( 'checkbox', { name: 'Media', exact: true } )
+			.uncheck();
+		await page
+			.getByRole( 'dialog', {
+				name: 'Preferences',
+			} )
+			.getByRole( 'button', { name: 'Close' } )
+			.click();
+		await page
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+
+		await expect(
+			page
+				.getByRole( 'tabpanel', { name: 'Blocks' } )
+				.getByRole( 'heading', { name: 'Media' } ),
+			'Media category should not be visible'
+		).toBeHidden();
+
+		await page
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+
+		// Show Media category blocks again.
+		await BlockVisibilityUtils.openBlockVisibilityManager();
+
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Available block types' } )
+				.getByRole( 'checkbox', { name: 'Media', exact: true } ),
+			'Media category should be unchecked'
+		).not.toBeChecked();
+
+		await page
+			.getByRole( 'region', { name: 'Available block types' } )
+			.getByRole( 'checkbox', { name: 'Media', exact: true } )
+			.check();
+		await page
+			.getByRole( 'dialog', {
+				name: 'Preferences',
+			} )
+			.getByRole( 'button', { name: 'Close' } )
+			.click();
+		await page
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+
+		await expect(
+			page
+				.getByRole( 'tabpanel', { name: 'Blocks' } )
+				.getByRole( 'heading', { name: 'Media' } ),
+			'Media category should be visible'
+		).toBeVisible();
+	} );
+
+	test( 'should search for blocks by keyword', async ( {
+		page,
+		BlockVisibilityUtils,
+	} ) => {
+		await BlockVisibilityUtils.openBlockVisibilityManager();
+		await page
+			.getByRole( 'searchbox', {
+				name: 'Search for a block',
+			} )
+			.fill( 'verse' );
+		const blockCategories = page
+			.getByRole( 'region', {
+				name: 'Available block types',
+			} )
+			.getByRole( 'group' );
+
+		await expect(
+			blockCategories,
+			'Only one category should be visible'
+		).toHaveCount( 1 );
+
+		await expect(
+			blockCategories.first().getByRole( 'checkbox', { name: 'Text' } ),
+			'Text category should be visible'
+		).toBeVisible();
+
+		const textCategoryBlocksList = blockCategories
+			.first()
+			.getByRole( 'list' );
+
+		await expect(
+			textCategoryBlocksList.getByRole( 'checkbox' ),
+			'Only one block should be visible'
+		).toHaveCount( 1 );
+
+		await expect(
+			textCategoryBlocksList.getByRole( 'checkbox', { name: 'Verse' } ),
+			'Verse block should be visible'
+		).toBeVisible();
+	} );
+
+	test( 'should reset hidden blocks', async ( {
+		page,
+		BlockVisibilityUtils,
+	} ) => {
+		await BlockVisibilityUtils.openBlockVisibilityManager();
+
+		// Hide Heading and List blocks.
+		await page
+			.getByRole( 'region', { name: 'Available block types' } )
+			.getByRole( 'checkbox', { name: 'Heading' } )
+			.uncheck();
+		await page
+			.getByRole( 'region', { name: 'Available block types' } )
+			.getByRole( 'checkbox', { name: 'List', exact: true } )
+			.uncheck();
+
+		// Reset hidden blocks.
+		await page.getByRole( 'button', { name: 'Reset' } ).click();
+
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Available block types' } )
+				.getByRole( 'checkbox', { name: 'Heading' } ),
+			'Heading block should be checked'
+		).toBeChecked();
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Available block types' } )
+				.getByRole( 'checkbox', { name: 'List', exact: true } ),
+			'List block should be checked'
+		).toBeChecked();
+	} );
+} );
+
+class BlockVisibilityUtils {
+	constructor( { page, admin, requestUtils } ) {
+		this.page = page;
+		this.admin = admin;
+		this.requestUtils = requestUtils;
+	}
+	async openBlockVisibilityManager() {
+		await this.page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Options' } )
+			.click();
+		await this.page
+			.getByRole( 'menuitem', { name: 'Preferences' } )
+			.click();
+		await this.page.getByRole( 'tab', { name: 'Blocks' } ).click();
+	}
+}
diff --git a/test/e2e/specs/editor/various/change-detection.spec.js b/test/e2e/specs/editor/various/change-detection.spec.js
new file mode 100644
index 00000000000000..12d13b4890e368
--- /dev/null
+++ b/test/e2e/specs/editor/various/change-detection.spec.js
@@ -0,0 +1,556 @@
+/**
+ * WordPress dependencies
+ */
+const {
+	test: base,
+	expect,
+} = require( '@wordpress/e2e-test-utils-playwright' );
+
+/**
+ * @typedef {import('@playwright/test').Page} Page
+ */
+
+/** @type {ReturnType<typeof base.extend<{changeDetectionUtils: ChangeDetectionUtils}>>} */
+const test = base.extend( {
+	changeDetectionUtils: async ( { page }, use ) => {
+		await use( new ChangeDetectionUtils( { page } ) );
+	},
+} );
+
+const POST_URLS = [
+	'/wp/v2/posts',
+	`rest_route=${ encodeURIComponent( '/wp/v2/posts' ) }`,
+];
+
+test.describe( 'Change detection', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test.afterEach( async ( { changeDetectionUtils } ) => {
+		await changeDetectionUtils.releaseSaveIntercept();
+	} );
+
+	test( 'Should not save on new unsaved post', async ( {
+		pageUtils,
+		changeDetectionUtils,
+	} ) => {
+		const getHadInterceptedSave =
+			await changeDetectionUtils.interceptSave();
+
+		// Keyboard shortcut Ctrl+S save.
+		await pageUtils.pressKeys( 'primary+s' );
+
+		await expect.poll( getHadInterceptedSave ).toBe( false );
+	} );
+
+	test( 'Should autosave post', async ( {
+		page,
+		editor,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		// Force autosave to occur immediately.
+		await Promise.all( [
+			page.evaluate( () =>
+				window.wp.data.dispatch( 'core/editor' ).autosave()
+			),
+			expect(
+				page
+					.getByRole( 'region', { name: 'Editor top bar' } )
+					.getByRole( 'button', { name: 'saved' } )
+			).toBeDisabled(),
+		] );
+
+		// Autosave draft as same user should do full save, i.e. not dirty.
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( false );
+	} );
+
+	test( 'Should prompt to confirm unsaved changes for autosaved draft for non-content fields', async ( {
+		page,
+		editor,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		// Toggle post as needing review (not persisted for autosave).
+		await editor.openDocumentSettingsSidebar();
+		await page.getByRole( 'button', { name: 'Change status:' } ).click();
+		await page.getByRole( 'radio', { name: 'Pending' } ).click();
+		// Force autosave to occur immediately.
+		await Promise.all( [
+			page.evaluate( () =>
+				window.wp.data.dispatch( 'core/editor' ).autosave()
+			),
+			expect(
+				page
+					.getByRole( 'region', { name: 'Editor top bar' } )
+					.getByRole( 'button', { name: 'saved' } )
+			).toBeHidden(),
+		] );
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'Should prompt to confirm unsaved changes for autosaved published post', async ( {
+		page,
+		editor,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		await editor.publishPost();
+
+		// Close publish panel.
+		await page
+			.getByRole( 'region', { name: 'Editor publish' } )
+			.getByRole( 'button', { name: 'Close panel' } )
+			.click();
+
+		const updateButton = page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Save' } );
+		await expect( updateButton ).toBeDisabled();
+
+		// Should be dirty after autosave change of published post.
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.type( '!' );
+
+		// Force autosave to occur immediately.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave()
+		);
+		await expect( updateButton ).toBeEnabled();
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'Should not prompt to confirm unsaved changes for new post', async ( {
+		changeDetectionUtils,
+	} ) => {
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( false );
+	} );
+
+	test( 'Should prompt to confirm unsaved changes for new post with initial edits', async ( {
+		admin,
+		changeDetectionUtils,
+	} ) => {
+		await admin.createNewPost( {
+			title: 'My New Post',
+			content: 'My content',
+			excerpt: 'My excerpt',
+		} );
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'Should prompt if property changed without save', async ( {
+		editor,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'Should prompt if content added without save', async ( {
+		editor,
+		page,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'Paragraph' );
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'Should not prompt if changes saved', async ( {
+		editor,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		await editor.saveDraft();
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( false );
+	} );
+
+	test( 'Should not prompt if changes saved right after typing', async ( {
+		page,
+		editor,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'Hello World' );
+
+		await editor.saveDraft();
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( false );
+	} );
+
+	test( 'Should not save if all changes saved', async ( {
+		editor,
+		pageUtils,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		await editor.saveDraft();
+
+		const getHadInterceptedSave =
+			await changeDetectionUtils.interceptSave();
+
+		// Keyboard shortcut Ctrl+S save.
+		await pageUtils.pressKeys( 'primary+s' );
+
+		await expect.poll( getHadInterceptedSave ).toBe( false );
+	} );
+
+	test( 'Should prompt if save failed', async ( {
+		page,
+		context,
+		editor,
+		pageUtils,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		await context.setOffline( true );
+
+		// Keyboard shortcut Ctrl+S save.
+		await pageUtils.pressKeys( 'primary+s' );
+		// Ensure save update fails and presents button.
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor content' } )
+				.getByText( 'Updating failed. You are probably offline.' )
+		).toBeVisible();
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Save draft' } )
+		).toBeEnabled();
+
+		// Need to disable offline to allow reload.
+		await context.setOffline( false );
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'Should prompt if changes and save is in-flight', async ( {
+		editor,
+		pageUtils,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		// Hold the posts request so we don't deal with race conditions of the
+		// save completing early. Other requests should be allowed to continue,
+		// for example the page reload test.
+		await changeDetectionUtils.interceptSave();
+
+		// Keyboard shortcut Ctrl+S save.
+		await pageUtils.pressKeys( 'primary+s' );
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'Should prompt if changes made while save is in-flight', async ( {
+		editor,
+		pageUtils,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		// Hold the posts request so we don't deal with race conditions of the
+		// save completing early. Other requests should be allowed to continue,
+		// for example the page reload test.
+		await changeDetectionUtils.interceptSave();
+
+		// Keyboard shortcut Ctrl+S save.
+		await pageUtils.pressKeys( 'primary+s' );
+
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World!' );
+
+		await changeDetectionUtils.releaseSaveIntercept();
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'Should prompt if property changes made while save is in-flight, and save completes', async ( {
+		page,
+		editor,
+		pageUtils,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		// Hold the posts request so we don't deal with race conditions of the
+		// save completing early.
+		await changeDetectionUtils.interceptSave();
+
+		// Keyboard shortcut Ctrl+S save.
+		await pageUtils.pressKeys( 'primary+s' );
+
+		// Dirty post while save is in-flight.
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.type( '!' );
+
+		// Allow save to complete. Disabling interception flushes pending.
+		await Promise.all( [
+			expect(
+				page
+					.getByRole( 'region', { name: 'Editor top bar' } )
+					.getByRole( 'button', { name: 'Saved' } )
+			).toBeDisabled(),
+			changeDetectionUtils.releaseSaveIntercept(),
+		] );
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'Should prompt if block revision is made while save is in-flight, and save completes', async ( {
+		page,
+		editor,
+		pageUtils,
+		changeDetectionUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		// Hold the posts request so we don't deal with race conditions of the
+		// save completing early.
+		await changeDetectionUtils.interceptSave();
+
+		// Keyboard shortcut Ctrl+S save.
+		await pageUtils.pressKeys( 'primary+s' );
+
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Paragraph' );
+
+		// Allow save to complete. Disabling interception flushes pending.
+		await Promise.all( [
+			expect(
+				page
+					.getByRole( 'region', { name: 'Editor top bar' } )
+					.getByRole( 'button', { name: 'Saved' } )
+			).toBeDisabled(),
+			changeDetectionUtils.releaseSaveIntercept(),
+		] );
+
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( true );
+	} );
+
+	test( 'should save posts without titles and persist and overwrite the auto draft title', async ( {
+		page,
+		editor,
+		changeDetectionUtils,
+	} ) => {
+		// Enter content.
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'Paragraph' );
+
+		// Save.
+		await editor.saveDraft();
+
+		// Verify that the title is empty.
+		await expect(
+			editor.canvas.getByRole( 'textbox', { name: 'Add title' } )
+		).toHaveText( '' );
+
+		// Verify that the post is not dirty.
+		expect( await changeDetectionUtils.getIsDirty() ).toBe( false );
+	} );
+
+	test( 'should not prompt to confirm unsaved changes when trashing an existing post', async ( {
+		page,
+		editor,
+	} ) => {
+		// Enter title.
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+
+		// Save.
+		await editor.saveDraft();
+
+		// Trash post.
+		await editor.openDocumentSettingsSidebar();
+		await page
+			.getByRole( 'region', { name: 'Editor settings' } )
+			.getByRole( 'button', { name: 'Actions' } )
+			.click();
+		await page
+			.getByRole( 'menu' )
+			.getByRole( 'menuitem', { name: 'Move to trash' } )
+			.click();
+		await page
+			.getByRole( 'dialog' )
+			.getByRole( 'button', { name: 'Trash' } )
+			.click();
+
+		await expect( page ).toHaveURL( '/wp-admin/edit.php?post_type=post' );
+	} );
+
+	test( 'consecutive edits to the same attribute should mark the post as dirty after a save', async ( {
+		page,
+		editor,
+		pageUtils,
+	} ) => {
+		// Open the sidebar block settings.
+		await editor.openDocumentSettingsSidebar();
+
+		// Insert a paragraph.
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'Hello, World!' );
+
+		// Save and wait till the post is clean.
+		await Promise.all( [
+			expect(
+				page
+					.getByRole( 'region', { name: 'Editor top bar' } )
+					.getByRole( 'button', { name: 'saved' } )
+			).toBeDisabled(),
+			pageUtils.pressKeys( 'primary+s' ),
+		] );
+
+		// Change the paragraph's `drop cap`.
+		await page
+			.getByRole( 'region', { name: 'Editor settings' } )
+			.getByRole( 'button', { name: 'Typography options' } )
+			.click();
+		await page
+			.getByRole( 'menu', { name: 'Typography options' } )
+			.getByRole( 'menuitemcheckbox', { name: 'Show drop cap' } )
+			.click();
+
+		await page
+			.getByRole( 'region', { name: 'Editor settings' } )
+			.getByRole( 'checkbox', { name: 'Drop cap' } )
+			.setChecked( true );
+
+		// Check that the post is dirty.
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Save draft' } )
+		).toBeEnabled();
+
+		// Save and wait till the post is clean.
+		await Promise.all( [
+			expect(
+				page
+					.getByRole( 'region', { name: 'Editor top bar' } )
+					.getByRole( 'button', { name: 'saved' } )
+			).toBeDisabled(),
+			pageUtils.pressKeys( 'primary+s' ),
+		] );
+
+		// Change the paragraph's `drop cap` again.
+		await page
+			.getByRole( 'region', { name: 'Editor settings' } )
+			.getByRole( 'checkbox', { name: 'Drop cap' } )
+			.setChecked( false );
+
+		// Check that the post is dirty.
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Save draft' } )
+		).toBeEnabled();
+	} );
+} );
+
+class ChangeDetectionUtils {
+	/** @type {Page} */
+	#page;
+	/** @type {(() => void) | null} */
+	#continueInterceptedSave = null;
+
+	constructor( { page } ) {
+		this.#page = page;
+	}
+
+	/**
+	 * @return {Promise<boolean>} Whether the post is dirty.
+	 */
+	getIsDirty = async () => {
+		return await test.step(
+			'assert the post is dirty',
+			async () => {
+				const hasDialog = new Promise( ( resolve ) => {
+					this.#page.on( 'dialog', ( dialog ) => {
+						void dialog.accept();
+						resolve( dialog.type() === 'beforeunload' );
+					} );
+					this.#page.on( 'load', () => resolve( false ) );
+				} );
+				await this.#page.reload( { waitUntil: 'commit' } ); // No need to wait for the full load.
+				return hasDialog;
+			},
+			{ box: true }
+		);
+	};
+
+	interceptSave = async () => {
+		let hadInterceptedSave = false;
+
+		const deferred = new Promise( ( res ) => {
+			this.#continueInterceptedSave = res;
+		} );
+
+		await this.#page.route(
+			( url ) =>
+				POST_URLS.some( ( postUrl ) => url.href.includes( postUrl ) ),
+			async ( route ) => {
+				hadInterceptedSave = true;
+				await deferred;
+				await route.continue();
+			}
+		);
+
+		return () => hadInterceptedSave;
+	};
+
+	releaseSaveIntercept = async () => {
+		this.#continueInterceptedSave?.();
+		await this.#page.unroute( ( url ) =>
+			POST_URLS.some( ( postUrl ) => url.href.includes( postUrl ) )
+		);
+		this.#continueInterceptedSave = null;
+	};
+}
diff --git a/test/e2e/specs/editor/various/content-only-lock.spec.js b/test/e2e/specs/editor/various/content-only-lock.spec.js
index e7d52562636f3b..9784aea1ee068f 100644
--- a/test/e2e/specs/editor/various/content-only-lock.spec.js
+++ b/test/e2e/specs/editor/various/content-only-lock.spec.js
@@ -76,4 +76,56 @@ test.describe( 'Content-only lock', () => {
 			},
 		] );
 	} );
+
+	test( 'should be able to automatically stop temporarily modify as blocks when an outside block is selected', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		// Add content only locked block in the code editor
+		await pageUtils.pressKeys( 'secondary+M' ); // Emulates CTRL+Shift+Alt + M => toggle code editor
+
+		await page.getByPlaceholder( 'Start writing with text or HTML' )
+			.fill( `<!-- wp:group {"templateLock":"contentOnly","layout":{"type":"constrained"}} -->
+			<div class="wp-block-group"><!-- wp:paragraph -->
+			<p>Locked block a</p>
+			<!-- /wp:paragraph -->
+			
+			<!-- wp:paragraph -->
+			<p>Locked block b</p>
+			<!-- /wp:paragraph --></div>
+			<!-- /wp:group -->
+			
+			<!-- wp:heading -->
+			<h2 class="wp-block-heading"><strong>outside block</strong></h2>
+			<!-- /wp:heading -->` );
+
+		await pageUtils.pressKeys( 'secondary+M' );
+		// Select the content locked block.
+		await editor.canvas
+			.locator( 'role=document[name="Block: Group"i]' )
+			.click();
+		// Press modify to temporarily edit as blocks.
+		await editor.clickBlockOptionsMenuItem( 'Modify' );
+		// Selected a nest paragraph verify Block is not content locked
+		// Styles can be changed and nested blocks can be removed
+		await editor.canvas
+			.locator( 'role=document[name="Block: Paragraph"i]' )
+			.first()
+			.click();
+		await expect(
+			page.locator( '.color-block-support-panel' )
+		).toBeAttached();
+		await editor.clickBlockOptionsMenuItem( 'Delete' );
+		// Select an outside block
+		await editor.canvas
+			.locator( 'role=document[name="Block: Heading"i]' )
+			.click();
+		// Select a locked nested paragraph block again
+		await pageUtils.pressKeys( 'ArrowUp' );
+		// Block is content locked again simple styles like position can not be changed.
+		await expect(
+			page.locator( '.color-block-support-panel' )
+		).not.toBeAttached();
+	} );
 } );
diff --git a/test/e2e/specs/editor/various/copy-cut-paste.spec.js b/test/e2e/specs/editor/various/copy-cut-paste.spec.js
index 04113e013930b0..bca062b06416a1 100644
--- a/test/e2e/specs/editor/various/copy-cut-paste.spec.js
+++ b/test/e2e/specs/editor/various/copy-cut-paste.spec.js
@@ -64,9 +64,7 @@ test.describe( 'Copy/cut/paste', () => {
 		await page.evaluate( () => {
 			window.wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock();
 		} );
-		await editor.canvas
-			.locator( 'role=button[name="Add default block"i]' )
-			.click();
+		await editor.insertBlock( { name: 'core/paragraph' } );
 		await pageUtils.pressKeys( 'primary+v' );
 		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
 	} );
@@ -85,9 +83,7 @@ test.describe( 'Copy/cut/paste', () => {
 		await page.evaluate( () => {
 			window.wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock();
 		} );
-		await editor.canvas
-			.locator( 'role=button[name="Add default block"i]' )
-			.click();
+		await editor.insertBlock( { name: 'core/paragraph' } );
 		await pageUtils.pressKeys( 'primary+v' );
 		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
 	} );
@@ -489,6 +485,7 @@ test.describe( 'Copy/cut/paste', () => {
 	} ) => {
 		pageUtils.setClipboardData( {
 			html: '<pre>x</pre>',
+			plainText: 'x',
 		} );
 		await editor.insertBlock( { name: 'core/list' } );
 		await pageUtils.pressKeys( 'primary+v' );
@@ -497,6 +494,32 @@ test.describe( 'Copy/cut/paste', () => {
 		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
 	} );
 
+	test( 'should paste list in list', async ( {
+		page,
+		pageUtils,
+		editor,
+	} ) => {
+		pageUtils.setClipboardData( { html: '<ul><li>x</li><li>y</li></ul>' } );
+		await editor.insertBlock( { name: 'core/list' } );
+		await pageUtils.pressKeys( 'primary+v' );
+		// Ensure the selection is correct.
+		await page.keyboard.type( '‸' );
+		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+	} );
+
+	test( 'should paste paragraphs in list', async ( {
+		page,
+		pageUtils,
+		editor,
+	} ) => {
+		pageUtils.setClipboardData( { html: '<p>x</p><p>y</p>' } );
+		await editor.insertBlock( { name: 'core/list' } );
+		await pageUtils.pressKeys( 'primary+v' );
+		// Ensure the selection is correct.
+		await page.keyboard.type( '‸' );
+		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+	} );
+
 	test( 'should link selection', async ( { pageUtils, editor } ) => {
 		await editor.insertBlock( {
 			name: 'core/paragraph',
@@ -518,6 +541,51 @@ test.describe( 'Copy/cut/paste', () => {
 		] );
 	} );
 
+	test( 'should link selection on internal paste', async ( {
+		pageUtils,
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'https://w.org' },
+		} );
+		await pageUtils.pressKeys( 'primary+a' );
+		await pageUtils.pressKeys( 'primary+x' );
+		await page.keyboard.type( 'a' );
+		await pageUtils.pressKeys( 'shift+ArrowLeft' );
+		await pageUtils.pressKeys( 'primary+v' );
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: '<a href="https://w.org">a</a>',
+				},
+			},
+		] );
+	} );
+
+	test( 'should paste link to formatted text', async ( {
+		page,
+		pageUtils,
+		editor,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: '<strong>test</strong>' },
+		} );
+		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.press( 'ArrowRight' );
+		await pageUtils.pressKeys( 'shift+ArrowRight' );
+		await pageUtils.pressKeys( 'shift+ArrowRight' );
+		pageUtils.setClipboardData( {
+			plainText: 'https://wordpress.org/gutenberg',
+			html: 'https://wordpress.org/gutenberg',
+		} );
+		await pageUtils.pressKeys( 'primary+v' );
+		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+	} );
+
 	test( 'should auto-link', async ( { pageUtils, editor } ) => {
 		await editor.insertBlock( {
 			name: 'core/paragraph',
@@ -576,4 +644,83 @@ test.describe( 'Copy/cut/paste', () => {
 			},
 		] );
 	} );
+
+	test( 'should inherit existing block type on paste', async ( {
+		pageUtils,
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/heading',
+			attributes: {
+				content: 'A',
+			},
+		} );
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: {
+				content: 'b',
+			},
+		} );
+		await pageUtils.pressKeys( 'primary+a' );
+		await pageUtils.pressKeys( 'primary+a' );
+		await pageUtils.pressKeys( 'primary+c' );
+
+		await page.keyboard.press( 'Backspace' );
+		await page.keyboard.type( '[]' );
+		await page.keyboard.press( 'ArrowLeft' );
+
+		await pageUtils.pressKeys( 'primary+v' );
+
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: '[A',
+				},
+			},
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'b]',
+				},
+			},
+		] );
+	} );
+
+	// See https://github.com/WordPress/gutenberg/pull/61900
+	test( 'should inherit heading attributes on paste split', async ( {
+		pageUtils,
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/heading',
+			attributes: {
+				content: 'AB',
+			},
+		} );
+		await page.keyboard.press( 'ArrowRight' );
+
+		pageUtils.setClipboardData( {
+			html: '<p>a</p><p>b</p>',
+		} );
+		await pageUtils.pressKeys( 'primary+v' );
+
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{
+				name: 'core/heading',
+				attributes: {
+					content: 'Aa',
+					level: 2,
+				},
+			},
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'bB',
+				},
+			},
+		] );
+	} );
 } );
diff --git a/test/e2e/specs/editor/various/core-settings.spec.js b/test/e2e/specs/editor/various/core-settings.spec.js
new file mode 100644
index 00000000000000..9dddc273e6b16e
--- /dev/null
+++ b/test/e2e/specs/editor/various/core-settings.spec.js
@@ -0,0 +1,52 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+async function getOptionsValues( selector, admin, page ) {
+	await admin.visitAdminPage( 'options.php' );
+	return page.evaluate( ( theSelector ) => {
+		const inputs = Array.from( document.querySelectorAll( theSelector ) );
+		return inputs.reduce( ( memo, input ) => {
+			memo[ input.id ] = input.value;
+			return memo;
+		}, {} );
+	}, selector );
+}
+
+// It might make sense to include a similar test in WP core (or move this one over).
+// See discussion here: https://github.com/WordPress/gutenberg/pull/32797#issuecomment-864192088.
+test.describe( 'Settings', () => {
+	test( 'Regression: updating a specific option will only change its value and will not corrupt others', async ( {
+		page,
+		admin,
+	} ) => {
+		// We won't select the option that we updated and will also remove some
+		// _transient options that seem to change at every update.
+		const optionsInputsSelector =
+			'form#all-options table.form-table input:not([id*="_transient"]):not([id="blogdescription"])';
+		const optionsBefore = await getOptionsValues(
+			optionsInputsSelector,
+			admin,
+			page
+		);
+
+		await admin.visitAdminPage( 'options-general.php' );
+		await page
+			.getByRole( 'textbox', { name: 'Tagline' } )
+			.fill( 'Just another Gutenberg site' );
+		await page.getByRole( 'button', { name: 'Save Changes' } ).click();
+
+		const optionsAfter = await getOptionsValues(
+			optionsInputsSelector,
+			admin,
+			page
+		);
+
+		Object.entries( optionsBefore ).forEach( ( optionBefore ) => {
+			const [ id ] = optionBefore;
+			const optionAfter = [ id, optionsAfter[ id ] ];
+			expect( optionAfter ).toStrictEqual( optionBefore );
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/datepicker.spec.js b/test/e2e/specs/editor/various/datepicker.spec.js
new file mode 100644
index 00000000000000..00030efa1fe274
--- /dev/null
+++ b/test/e2e/specs/editor/various/datepicker.spec.js
@@ -0,0 +1,114 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+// Set browser to a timezone that's different to `timezone`.
+test.use( {
+	timezoneId: 'America/New_York',
+} );
+
+// The `timezone` setting exposed via REST API only accepts `UTC`
+// and timezone strings by location.
+const TIMEZONES = [ 'Pacific/Honolulu', 'UTC', 'Australia/Sydney' ];
+
+TIMEZONES.forEach( ( timezone ) => {
+	test.describe( `Datepicker: ${ timezone }`, () => {
+		let orignalTimezone;
+		test.beforeAll( async ( { requestUtils } ) => {
+			orignalTimezone = ( await requestUtils.getSiteSettings() ).timezone;
+			await requestUtils.updateSiteSettings( { timezone } );
+		} );
+
+		test.beforeEach( async ( { admin, editor } ) => {
+			await admin.createNewPost();
+			await editor.openDocumentSettingsSidebar();
+		} );
+
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.updateSiteSettings( {
+				timezone: orignalTimezone,
+			} );
+		} );
+
+		test( 'should show the publishing date as "Immediately" if the date is not altered', async ( {
+			page,
+		} ) => {
+			await expect(
+				page.getByRole( 'button', { name: 'Change date' } )
+			).toHaveText( 'Immediately' );
+		} );
+
+		test( 'should show the publishing date if the date is in the past', async ( {
+			page,
+		} ) => {
+			const datepicker = page.getByRole( 'button', {
+				name: 'Change date',
+			} );
+			await datepicker.click();
+
+			// Change the publishing date to a year in the future.
+			await page
+				.getByRole( 'group', { name: 'Date' } )
+				.getByRole( 'spinbutton', { name: 'Year' } )
+				.click();
+			await page.keyboard.press( 'ArrowDown' );
+			await page.keyboard.press( 'Escape' );
+
+			// The expected date format will be "Sep 26, 2018 11:52 pm".
+			await expect(
+				page.getByRole( 'button', { name: 'Change date' } )
+			).toContainText( /^[A-Za-z]+\s\d{1,2},\s\d{1,4}/ );
+		} );
+
+		test( 'should show the publishing date if the date is in the future', async ( {
+			page,
+		} ) => {
+			const datepicker = page.getByRole( 'button', {
+				name: 'Change date',
+			} );
+			await datepicker.click();
+
+			// Change the publishing date to a year in the future.
+			await page
+				.getByRole( 'group', { name: 'Date' } )
+				.getByRole( 'spinbutton', { name: 'Year' } )
+				.click();
+			await page.keyboard.press( 'ArrowUp' );
+			await page.keyboard.press( 'Escape' );
+
+			// The expected date format will be "Sep 26, 2018 11:52 pm".
+			await expect(
+				page.getByRole( 'button', { name: 'Change date' } )
+			).toContainText( /^[A-Za-z]+\s\d{1,2},\s\d{1,4}/ );
+		} );
+
+		test( 'should show the publishing date as "Immediately" if the date is cleared', async ( {
+			page,
+		} ) => {
+			const datepicker = page.getByRole( 'button', {
+				name: 'Change date',
+			} );
+			await datepicker.click();
+
+			// Change the publishing date to a year in the future.
+			await page
+				.getByRole( 'group', { name: 'Date' } )
+				.getByRole( 'spinbutton', { name: 'Year' } )
+				.click();
+			await page.keyboard.press( 'ArrowUp' );
+			await page.keyboard.press( 'Escape' );
+
+			// Clear the date.
+			await datepicker.click();
+			await page
+				.getByLabel( 'Change publish date' )
+				.getByRole( 'button', { name: 'Now' } )
+				.click();
+
+			await expect(
+				page.getByRole( 'button', { name: 'Change date' } )
+			).toHaveText( 'Immediately' );
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/draggable-blocks.spec.js b/test/e2e/specs/editor/various/draggable-blocks.spec.js
index 29a81f57540e06..e08030191dd60b 100644
--- a/test/e2e/specs/editor/various/draggable-blocks.spec.js
+++ b/test/e2e/specs/editor/various/draggable-blocks.spec.js
@@ -134,9 +134,10 @@ test.describe( 'Draggable block', () => {
 		const secondParagraphBound = await secondParagraph.boundingBox();
 		// Call the move function twice to make sure the `dragOver` event is sent.
 		// @see https://github.com/microsoft/playwright/issues/17153
+		// Make sure mouse is > 30px within the block for bottom drop indicator to appear.
 		for ( let i = 0; i < 2; i += 1 ) {
 			await page.mouse.move(
-				secondParagraphBound.x,
+				secondParagraphBound.x + 32,
 				secondParagraphBound.y + secondParagraphBound.height * 0.75
 			);
 		}
diff --git a/test/e2e/specs/editor/various/dropdown-menu.spec.js b/test/e2e/specs/editor/various/dropdown-menu.spec.js
new file mode 100644
index 00000000000000..4c656fd3d6994a
--- /dev/null
+++ b/test/e2e/specs/editor/various/dropdown-menu.spec.js
@@ -0,0 +1,64 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Dropdown Menu', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'keyboard navigiation', async ( { page, pageUtils } ) => {
+		await page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Options' } )
+			.click();
+		const menuItems = page
+			.getByRole( 'menu', { name: 'Options' } )
+			.locator(
+				'[role="menuitem"], [role="menuitemcheckbox"], [role="menuitemradio"]'
+			);
+		const totalItems = await menuItems.count();
+
+		// Catch any issues with the selector, which could cause a false positive test result.
+		expect( totalItems ).toBeGreaterThan( 0 );
+
+		await test.step( 'allows navigation through each item using arrow keys', async () => {
+			// Expect the first menu item to be focused.
+			await expect( menuItems.first() ).toBeFocused();
+
+			// Arrow down to the last item.
+			await pageUtils.pressKeys( 'ArrowDown', { times: totalItems - 1 } );
+			await expect( menuItems.last() ).toBeFocused();
+
+			// Arrow back up to the first item.
+			await pageUtils.pressKeys( 'ArrowUp', { times: totalItems - 1 } );
+			await expect( menuItems.first() ).toBeFocused();
+		} );
+
+		await test.step( 'loops to the beginning and end when navigating past the boundaries of the menu', async () => {
+			// Expect the first menu item to be focused.
+			await expect( menuItems.first() ).toBeFocused();
+
+			// Arrow up to the last item.
+			await page.keyboard.press( 'ArrowUp' );
+			await expect( menuItems.last() ).toBeFocused();
+
+			// Arrow back down to the first item.
+			await page.keyboard.press( 'ArrowDown' );
+			await expect( menuItems.first() ).toBeFocused();
+		} );
+
+		await test.step( 'ignores arrow key navigation that is orthogonal to the orientation of the menu, but stays open', async () => {
+			// Expect the first menu item to be focused.
+			await expect( menuItems.first() ).toBeFocused();
+
+			// Press left and right keys an arbitrary (but > 1) number of times.
+			await pageUtils.pressKeys( 'ArrowLeft', { times: 5 } );
+			await pageUtils.pressKeys( 'ArrowRight', { times: 5 } );
+
+			// Expect the first menu item to still be focused.
+			await expect( menuItems.first() ).toBeFocused();
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/editor-modes.spec.js b/test/e2e/specs/editor/various/editor-modes.spec.js
new file mode 100644
index 00000000000000..4e856e6214ca8c
--- /dev/null
+++ b/test/e2e/specs/editor/various/editor-modes.spec.js
@@ -0,0 +1,183 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Editing modes (visual/HTML)', () => {
+	test.beforeEach( async ( { admin, editor } ) => {
+		await admin.createNewPost();
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Hello world!' },
+		} );
+	} );
+
+	test( 'should switch between visual and HTML modes', async ( {
+		editor,
+	} ) => {
+		const paragraphBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+
+		// This block should be in "visual" mode by default.
+		await expect( paragraphBlock ).toHaveClass( /rich-text/ );
+
+		// Change editing mode from "Visual" to "HTML".
+		await editor.clickBlockOptionsMenuItem( 'Edit as HTML' );
+
+		// Wait for the block to be converted to HTML editing mode.
+		await expect( paragraphBlock.getByRole( 'textbox' ) ).toBeVisible();
+
+		// Change editing mode from "HTML" back to "Visual".
+		await editor.clickBlockOptionsMenuItem( 'Edit visually' );
+
+		// This block should be in "visual" mode again.
+		await expect( paragraphBlock ).toHaveClass( /rich-text/ );
+	} );
+
+	test( 'should display sidebar in HTML mode', async ( { editor, page } ) => {
+		await editor.clickBlockOptionsMenuItem( 'Edit as HTML' );
+		await editor.openDocumentSettingsSidebar();
+
+		// The `drop cap` toggle for the paragraph block should appear, even in
+		// HTML editing mode.
+		await page
+			.getByRole( 'button', { name: 'Typography options' } )
+			.click();
+		await page
+			.getByRole( 'menuitemcheckbox', { name: 'Show Drop cap' } )
+			.click();
+
+		await expect(
+			page.getByRole( 'checkbox', { name: 'Drop cap' } )
+		).toBeVisible();
+	} );
+
+	test( 'should update HTML in HTML mode when sidebar is used', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.clickBlockOptionsMenuItem( 'Edit as HTML' );
+		await editor.openDocumentSettingsSidebar();
+
+		const paragraphHTML = editor.canvas
+			.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} )
+			.getByRole( 'textbox' );
+
+		// Make sure the paragraph content is rendered as expected.
+		await expect( paragraphHTML ).toHaveValue( '<p>Hello world!</p>' );
+
+		// Change the `drop cap` using the sidebar.
+		await page
+			.getByRole( 'button', { name: 'Typography options' } )
+			.click();
+		await page
+			.getByRole( 'menuitemcheckbox', { name: 'Show Drop cap' } )
+			.click();
+		await page.getByRole( 'checkbox', { name: 'Drop cap' } ).check();
+
+		// Make sure the HTML content updated.
+		await expect( paragraphHTML ).toHaveValue(
+			'<p class="has-drop-cap">Hello world!</p>'
+		);
+	} );
+
+	test( 'the code editor should unselect blocks and disable the inserter', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.openDocumentSettingsSidebar();
+		const editorSettings = page.getByRole( 'region', {
+			name: 'Editor settings',
+		} );
+		const activeTab = editorSettings.getByRole( 'tab', { selected: true } );
+
+		// The Block inspector should be active.
+		await expect( activeTab ).toHaveText( 'Block' );
+		await expect(
+			editorSettings.locator( '.block-editor-block-card__title' )
+		).toHaveText( 'Paragraph' );
+
+		// Open the code editor.
+		await pageUtils.pressKeys( 'secondary+M' );
+
+		// The Block inspector should not be active anymore.
+		await expect( activeTab ).not.toHaveText( 'Block' );
+
+		await editorSettings.getByRole( 'tab', { name: 'Block' } ).click();
+		await expect(
+			editorSettings.locator( '.block-editor-block-inspector__no-blocks' )
+		).toHaveText( 'No block selected.' );
+
+		await expect(
+			page
+				.getByRole( 'toolbar', { name: 'Document tools' } )
+				.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+		).toBeDisabled();
+
+		// Go back to the visual editor.
+		await pageUtils.pressKeys( 'secondary+M' );
+	} );
+
+	// Test for regressions of https://github.com/WordPress/gutenberg/issues/24054.
+	test( 'saves content when using the shortcut in the Code Editor', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		// Open the code editor.
+		await pageUtils.pressKeys( 'secondary+M' );
+
+		// Change content.
+		await page.getByRole( 'textbox', { name: 'Type text or HTML' } )
+			.fill( `<!-- wp:paragraph -->
+<p>Hi world!</p>
+<!-- /wp:paragraph -->` );
+
+		// Save the post using the shortcut.
+		await pageUtils.pressKeys( 'primary+s' );
+		await expect(
+			page
+				.getByRole( 'button', { name: 'Dismiss this notice' } )
+				.filter( { hasText: 'Draft saved' } )
+		).toBeVisible();
+
+		// Go back to the visual editor.
+		await pageUtils.pressKeys( 'secondary+M' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'Hi world!' },
+			},
+		] );
+	} );
+
+	test( 'should reparse changes from code editor', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		// Open the code editor.
+		await pageUtils.pressKeys( 'secondary+M' );
+
+		// Change the content.
+		await page.getByRole( 'textbox', { name: 'Type text or HTML' } )
+			.fill( `<!-- wp:paragraph -->
+<p>abc</p>
+<!-- /wp:paragraph -->` );
+
+		// Go back to the visual editor.
+		await pageUtils.pressKeys( 'secondary+M' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'abc' },
+			},
+		] );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/embedding.spec.js b/test/e2e/specs/editor/various/embedding.spec.js
new file mode 100644
index 00000000000000..fe488f91301749
--- /dev/null
+++ b/test/e2e/specs/editor/various/embedding.spec.js
@@ -0,0 +1,311 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+/** @typedef {import('@playwright/test').Page} Page */
+/** @typedef {import('@wordpress/e2e-test-utils-playwright').Editor} Editor */
+
+const EMBED_URLS = [
+	'/oembed/1.0/proxy',
+	`rest_route=${ encodeURIComponent( '/oembed/1.0/proxy' ) }`,
+];
+
+const MOCK_EMBED_WORDPRESS_SUCCESS_RESPONSE = {
+	url: 'https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/',
+	html: '<div class="wp-embedded-content" data-secret="shhhh it is a secret"></div>',
+	type: 'rich',
+	provider_name: 'WordPress',
+	provider_url: 'https://wordpress.org',
+	version: '1.0',
+};
+
+const MOCK_EMBED_RICH_SUCCESS_RESPONSE = {
+	url: 'https://twitter.com/notnownikki',
+	html: '<p>Mock success response.</p>',
+	type: 'rich',
+	provider_name: 'Twitter',
+	provider_url: 'https://twitter.com',
+	version: '1.0',
+};
+
+const MOCK_EMBED_PHOTO_SUCCESS_RESPONSE = {
+	url: 'https://cloudup.com/cQFlxqtY4ob',
+	html: '<p>Mock success response.</p>',
+	type: 'photo',
+	provider_name: 'Cloudup',
+	provider_url: 'https://cloudup.com',
+	version: '1.0',
+};
+
+const MOCK_EMBED_VIDEO_SUCCESS_RESPONSE = {
+	url: 'https://www.youtube.com/watch?v=lXMskKTw3Bc',
+	html: '<iframe width="16" height="9"></iframe>',
+	type: 'video',
+	provider_name: 'YouTube',
+	provider_url: 'https://youtube.com',
+	version: '1.0',
+};
+
+const MOCK_BAD_EMBED_PROVIDER_RESPONSE = {
+	url: 'https://twitter.com/thatbunty',
+	html: false,
+	provider_name: 'Embed Provider',
+	version: '1.0',
+};
+
+const MOCK_CANT_EMBED_RESPONSE = {
+	provider_name: 'Embed Handler',
+	html: '<a href="https://twitter.com/wooyaygutenberg123454312">https://twitter.com/wooyaygutenberg123454312</a>',
+};
+
+const MOCK_BAD_WORDPRESS_RESPONSE = {
+	code: 'oembed_invalid_url',
+	message: 'Not Found',
+	data: {
+		status: 404,
+	},
+	html: false,
+};
+
+test.use( {
+	embedUtils: async ( { page, editor }, use ) => {
+		await use( new EmbedUtils( { page, editor } ) );
+	},
+} );
+
+test.describe( 'Embedding content', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'should render embeds in the correct state', async ( {
+		editor,
+		embedUtils,
+	} ) => {
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/notnownikki': MOCK_EMBED_RICH_SUCCESS_RESPONSE,
+			'https://twitter.com/wooyaygutenberg123454312':
+				MOCK_CANT_EMBED_RESPONSE,
+			'https://wordpress.org/gutenberg/handbook/':
+				MOCK_BAD_WORDPRESS_RESPONSE,
+			'https://twitter.com/thatbunty': MOCK_BAD_EMBED_PROVIDER_RESPONSE,
+			'https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/':
+				MOCK_EMBED_WORDPRESS_SUCCESS_RESPONSE,
+			'https://www.youtube.com/watch?v=lXMskKTw3Bc':
+				MOCK_EMBED_VIDEO_SUCCESS_RESPONSE,
+			'https://cloudup.com/cQFlxqtY4ob':
+				MOCK_EMBED_PHOTO_SUCCESS_RESPONSE,
+		} );
+
+		const currenEmbedBlock = editor.canvas
+			.getByRole( 'document', { name: 'Block' } )
+			.last();
+
+		await embedUtils.insertEmbed( 'https://twitter.com/notnownikki' );
+		await expect(
+			currenEmbedBlock.locator( 'iframe' ),
+			'Valid embed. Should render valid element.'
+		).toHaveAttribute( 'title', 'Embedded content from twitter.com' );
+
+		await embedUtils.insertEmbed(
+			'https://twitter.com/wooyaygutenberg123454312'
+		);
+		await expect(
+			currenEmbedBlock.getByRole( 'textbox', { name: 'Embed URL' } ),
+			'Valid provider; invalid content. Should render failed, edit state.'
+		).toHaveValue( 'https://twitter.com/wooyaygutenberg123454312' );
+
+		await embedUtils.insertEmbed(
+			'https://wordpress.org/gutenberg/handbook/'
+		);
+		await expect(
+			currenEmbedBlock.getByRole( 'textbox', { name: 'Embed URL' } ),
+			'WordPress invalid content. Should render failed, edit state.'
+		).toHaveValue( 'https://wordpress.org/gutenberg/handbook' );
+
+		await embedUtils.insertEmbed( 'https://twitter.com/thatbunty' );
+		await expect(
+			currenEmbedBlock.getByRole( 'textbox', { name: 'Embed URL' } ),
+			'Provider whose oembed API has gone wrong. Should render failed, edit state.'
+		).toHaveValue( 'https://twitter.com/thatbunty' );
+
+		await embedUtils.insertEmbed(
+			'https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/'
+		);
+		await expect(
+			currenEmbedBlock,
+			'WordPress valid content. Should render valid figure element.'
+		).toHaveClass( /wp-block-embed/ );
+
+		await embedUtils.insertEmbed(
+			'https://www.youtube.com/watch?v=lXMskKTw3Bc'
+		);
+		await expect(
+			currenEmbedBlock,
+			'Video content. Should render valid figure element, and include the aspect ratio class.'
+		).toHaveClass( /wp-embed-aspect-16-9/ );
+
+		await embedUtils.insertEmbed( 'https://cloudup.com/cQFlxqtY4ob' );
+		await expect(
+			currenEmbedBlock.locator( 'iframe' ),
+			'Photo content. Should render valid iframe element.'
+		).toHaveAttribute( 'title', 'Embedded content from cloudup.com' );
+	} );
+
+	test( 'should allow the user to convert unembeddable URLs to a paragraph with a link in it', async ( {
+		editor,
+		embedUtils,
+	} ) => {
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/wooyaygutenberg123454312':
+				MOCK_CANT_EMBED_RESPONSE,
+		} );
+		await embedUtils.insertEmbed(
+			'https://twitter.com/wooyaygutenberg123454312'
+		);
+
+		const embedBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Embed',
+		} );
+
+		await expect( embedBlock ).toContainText(
+			'Sorry, this content could not be embedded.'
+		);
+
+		await embedBlock
+			.getByRole( 'button', { name: 'Convert to link' } )
+			.click();
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content:
+						'<a href="https://twitter.com/wooyaygutenberg123454312">https://twitter.com/wooyaygutenberg123454312</a>',
+				},
+			},
+		] );
+	} );
+
+	// Reason: A possible regression of https://github.com/WordPress/gutenberg/pull/14705.
+	test( 'should retry embeds that could not be embedded with trailing slashes, without the trailing slashes', async ( {
+		editor,
+		embedUtils,
+	} ) => {
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/notnownikki/':
+				MOCK_BAD_EMBED_PROVIDER_RESPONSE,
+			'https://twitter.com/notnownikki': MOCK_EMBED_RICH_SUCCESS_RESPONSE,
+		} );
+		await embedUtils.insertEmbed( 'https://twitter.com/notnownikki/' );
+
+		await expect(
+			editor.canvas.getByRole( 'document', {
+				name: 'Block: Twitter',
+			} )
+		).toBeVisible();
+	} );
+
+	test( 'should allow the user to try embedding a failed URL again', async ( {
+		editor,
+		embedUtils,
+	} ) => {
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/wooyaygutenberg123454312':
+				MOCK_CANT_EMBED_RESPONSE,
+		} );
+		await embedUtils.insertEmbed(
+			'https://twitter.com/wooyaygutenberg123454312'
+		);
+
+		const embedBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Embed',
+		} );
+
+		await expect( embedBlock ).toContainText(
+			'Sorry, this content could not be embedded.'
+		);
+
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/wooyaygutenberg123454312':
+				MOCK_EMBED_RICH_SUCCESS_RESPONSE,
+		} );
+
+		await embedBlock.getByRole( 'button', { name: 'Try again' } ).click();
+		await expect(
+			editor.canvas.getByRole( 'document', {
+				name: 'Block: Twitter',
+			} )
+		).toBeVisible();
+	} );
+
+	test( 'should switch to the WordPress block correctly', async ( {
+		editor,
+		embedUtils,
+		requestUtils,
+	} ) => {
+		const post = await requestUtils.createPost( {
+			title: 'Local embed test',
+			content: 'Hello there!',
+			status: 'publish',
+		} );
+
+		await embedUtils.insertEmbed( post.link );
+		await expect(
+			editor.canvas.getByRole( 'document', { name: 'Block: Embed' } )
+		).toBeVisible();
+	} );
+} );
+
+class EmbedUtils {
+	/** @type {Page} */
+	#page;
+	/** @type {Editor} */
+	#editor;
+
+	constructor( { page, editor } ) {
+		this.#page = page;
+		this.#editor = editor;
+	}
+
+	/**
+	 * @param {URL} url
+	 */
+	isRESTRoute( url ) {
+		return EMBED_URLS.some( ( route ) => {
+			return url.href.includes( route );
+		} );
+	}
+
+	async interceptRequests( responses ) {
+		await this.#page.route(
+			( url ) => this.isRESTRoute( url ),
+			async ( route, request ) => {
+				const embedUrl = new URL( request.url() ).searchParams.get(
+					'url'
+				);
+				const response = responses[ embedUrl ];
+
+				if ( response ) {
+					await route.fulfill( {
+						json: response,
+					} );
+				} else {
+					await route.continue();
+				}
+			}
+		);
+	}
+
+	async insertEmbed( url ) {
+		await test.step( `Inserting embed ${ url }`, async () => {
+			await this.#editor.insertBlock( { name: 'core/embed' } );
+			await this.#editor.canvas
+				.getByRole( 'textbox', { name: 'Embed URL' } )
+				.last()
+				.fill( url );
+			await this.#page.keyboard.press( 'Enter' );
+		} );
+	}
+}
diff --git a/test/e2e/specs/editor/various/font-appearance-control.spec.js b/test/e2e/specs/editor/various/font-appearance-control.spec.js
new file mode 100644
index 00000000000000..4b148b6dd8587c
--- /dev/null
+++ b/test/e2e/specs/editor/various/font-appearance-control.spec.js
@@ -0,0 +1,90 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Font Appearance Control dropdown menu', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'should apply available font weight and styles from active font family', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: {
+				content: 'Regular',
+				style: {
+					typography: { fontWeight: '400', fontStyle: 'normal' },
+				},
+			},
+		} );
+		await page
+			.getByRole( 'button', { name: 'Typography options' } )
+			.click();
+		await expect(
+			page.getByRole( 'combobox', { name: 'Appearance' } )
+		).toHaveText( 'Regular' );
+
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: {
+				content: 'Extra Light Italic',
+				style: {
+					typography: { fontWeight: '200', fontStyle: 'italic' },
+				},
+			},
+		} );
+		await page
+			.getByRole( 'button', { name: 'Typography options' } )
+			.click();
+		await expect(
+			page.getByRole( 'combobox', { name: 'Appearance' } )
+		).toHaveText( 'Extra Light Italic' );
+
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: {
+				content: 'Bold Italic',
+				style: {
+					typography: { fontWeight: '700', fontStyle: 'italic' },
+				},
+			},
+		} );
+		await page
+			.getByRole( 'button', { name: 'Typography options' } )
+			.click();
+		await expect(
+			page.getByRole( 'combobox', { name: 'Appearance' } )
+		).toHaveText( 'Bold Italic' );
+	} );
+
+	test( 'should apply Default appearance if weight and style are invalid', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: {
+				content: 'Default',
+				style: {
+					typography: {
+						fontWeight: '',
+						fontStyle: 'invalid-style',
+					},
+				},
+			},
+		} );
+		await page
+			.getByRole( 'button', { name: 'Typography options' } )
+			.click();
+		await page
+			.getByRole( 'menuitemcheckbox', { name: 'Show Appearance' } )
+			.click();
+		await expect(
+			page.getByRole( 'combobox', { name: 'Appearance' } )
+		).toHaveText( 'Default' );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/font-size-picker.spec.js b/test/e2e/specs/editor/various/font-size-picker.spec.js
index 5c6cb4b186e25e..597b458d682e84 100644
--- a/test/e2e/specs/editor/various/font-size-picker.spec.js
+++ b/test/e2e/specs/editor/various/font-size-picker.spec.js
@@ -144,7 +144,7 @@ test.describe( 'Font Size Picker', () => {
 				.click();
 			await page.keyboard.type( 'Paragraph to be made "large"' );
 			await page.click(
-				'role=group[name="Font size"i] >> role=button[name="Font size"i]'
+				'role=group[name="Font size"i] >> role=combobox[name="Font size"i]'
 			);
 			await pageUtils.pressKeys( 'ArrowDown', { times: 4 } );
 			await page.keyboard.press( 'Enter' );
@@ -168,7 +168,7 @@ test.describe( 'Font Size Picker', () => {
 				'Paragraph with font size reset using tools panel menu'
 			);
 			await page.click(
-				'role=group[name="Font size"i] >> role=button[name="Font size"i]'
+				'role=group[name="Font size"i] >> role=combobox[name="Font size"i]'
 			);
 			await pageUtils.pressKeys( 'ArrowDown', { times: 3 } );
 			await page.keyboard.press( 'Enter' );
@@ -179,7 +179,7 @@ test.describe( 'Font Size Picker', () => {
 <!-- /wp:paragraph -->` );
 
 			await page.click( 'role=button[name="Typography options"i]' );
-			await page.click( 'role=menuitem[name="Reset Font size"i]' );
+			await page.click( 'role=menuitem[name="Reset Size"i]' );
 			await page.keyboard.press( 'Escape' ); // Close the menu
 
 			await expect.poll( editor.getEditedPostContent )
@@ -201,7 +201,7 @@ test.describe( 'Font Size Picker', () => {
 				'Paragraph with font size reset using input field'
 			);
 			await page.click(
-				'role=group[name="Font size"i] >> role=button[name="Font size"i]'
+				'role=group[name="Font size"i] >> role=combobox[name="Font size"i]'
 			);
 			await pageUtils.pressKeys( 'ArrowDown', { times: 2 } );
 			await page.keyboard.press( 'Enter' );
@@ -266,7 +266,7 @@ test.describe( 'Font Size Picker', () => {
 <!-- /wp:paragraph -->` );
 
 			await page.click( 'role=button[name="Typography options"i]' );
-			await page.click( 'role=menuitem[name="Reset Font size"i]' );
+			await page.click( 'role=menuitem[name="Reset Size"i]' );
 			await page.keyboard.press( 'Escape' ); // Close the menu
 
 			await expect.poll( editor.getEditedPostContent )
diff --git a/test/e2e/specs/editor/various/footnotes.spec.js b/test/e2e/specs/editor/various/footnotes.spec.js
index 14a2fc653e3873..d9f571414bacf3 100644
--- a/test/e2e/specs/editor/various/footnotes.spec.js
+++ b/test/e2e/specs/editor/various/footnotes.spec.js
@@ -60,6 +60,9 @@ test.describe( 'Footnotes', () => {
 			},
 		] );
 
+		// Check if the numbers in the editor content updated.
+		await expect( editor.canvas.locator( '.fn' ) ).toHaveText( '1' );
+
 		await editor.canvas.locator( 'p:text("first paragraph")' ).click();
 
 		await editor.showBlockToolbar();
@@ -362,9 +365,11 @@ test.describe( 'Footnotes', () => {
 		await editor.openDocumentSettingsSidebar();
 		await page
 			.getByRole( 'region', { name: 'Editor settings' } )
-			.getByRole( 'button', { name: 'Post' } )
+			.getByRole( 'tab', { name: 'Post' } )
+			.click();
+		await page
+			.locator( '.editor-private-post-last-revision__button' )
 			.click();
-		await page.locator( 'a:text("2 Revisions")' ).click();
 		await page.locator( '.revisions-controls .ui-slider-handle' ).focus();
 		await page.keyboard.press( 'ArrowLeft' );
 		await page.locator( 'input:text("Restore This Revision")' ).click();
@@ -440,7 +445,7 @@ test.describe( 'Footnotes', () => {
 		await editor.openDocumentSettingsSidebar();
 		await page
 			.getByRole( 'region', { name: 'Editor settings' } )
-			.getByRole( 'button', { name: 'Post' } )
+			.getByRole( 'tab', { name: 'Post' } )
 			.click();
 
 		// Visit the published post.
@@ -451,4 +456,36 @@ test.describe( 'Footnotes', () => {
 			'1 ↩︎'
 		);
 	} );
+
+	test( 'should leave alone other block attributes', async ( {
+		editor,
+		page,
+	} ) => {
+		await page.evaluate( () => {
+			window.wp.blocks.registerBlockType( 'core/test-block-string', {
+				apiVersion: 3,
+				title: 'Block with string attribute',
+				attributes: { string: { type: 'string' } },
+				edit: () => null,
+				save: () => null,
+			} );
+		} );
+		await editor.insertBlock( {
+			name: 'core/test-block-string',
+			attributes: { string: 'a\nb' },
+		} );
+
+		await editor.insertBlock( { name: 'core/paragraph' } );
+		await page.keyboard.type( 'a' );
+		await editor.showBlockToolbar();
+		await editor.clickBlockToolbarButton( 'More' );
+		await page.locator( 'button:text("Footnote")' ).click();
+		await page.keyboard.type( '1' );
+
+		expect( ( await editor.getBlocks() )[ 0 ] ).toMatchObject( {
+			name: 'core/test-block-string',
+			// This should NOT be 'a<br>b'!
+			attributes: { string: 'a\nb' },
+		} );
+	} );
 } );
diff --git a/test/e2e/specs/editor/various/inner-blocks-templates.spec.js b/test/e2e/specs/editor/various/inner-blocks-templates.spec.js
index 0f9aed33d0773b..eb34b00e8e69dc 100644
--- a/test/e2e/specs/editor/various/inner-blocks-templates.spec.js
+++ b/test/e2e/specs/editor/various/inner-blocks-templates.spec.js
@@ -48,7 +48,7 @@ test.describe( 'Inner blocks templates', () => {
 		);
 		const undoButton = editorTopBar.locator( 'role=button[name="Undo"i]' );
 		const updateButton = editorTopBar.locator(
-			'role=button[name="Update"i]'
+			'role=button[name="Save"i]'
 		);
 		await expect( undoButton ).toHaveAttribute( 'aria-disabled', 'true' );
 		await expect( updateButton ).toHaveAttribute( 'aria-disabled', 'true' );
diff --git a/test/e2e/specs/editor/various/inserting-blocks.spec.js b/test/e2e/specs/editor/various/inserting-blocks.spec.js
index a48fe117c97a2c..3cc369f75f2237 100644
--- a/test/e2e/specs/editor/various/inserting-blocks.spec.js
+++ b/test/e2e/specs/editor/various/inserting-blocks.spec.js
@@ -17,6 +17,38 @@ test.use( {
 test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 	test.afterAll( async ( { requestUtils } ) => {
 		await requestUtils.deleteAllPosts();
+		await requestUtils.deleteAllBlocks();
+		await requestUtils.deleteAllPatternCategories();
+	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllBlocks();
+		await requestUtils.deleteAllPatternCategories();
+	} );
+
+	test( 'inserts a default block on bottom padding click', async ( {
+		admin,
+		editor,
+	} ) => {
+		await admin.createNewPost();
+		await editor.insertBlock( { name: 'core/image' } );
+		const body = editor.canvas.locator( 'body' );
+		const box = await body.boundingBox();
+		await body.click( {
+			position: {
+				x: box.width / 2,
+				y: box.height - 10,
+			},
+		} );
+
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{ name: 'core/image' },
+			{ name: 'core/paragraph' },
+		] );
+
+		await expect(
+			editor.canvas.locator( '[data-type="core/paragraph"]' )
+		).toBeFocused();
 	} );
 
 	test( 'inserts blocks by dragging and dropping from the global inserter', async ( {
@@ -44,11 +76,11 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		);
 
 		await page.click(
-			'role=region[name="Editor top bar"i] >> role=button[name="Toggle block inserter"i]'
+			'role=region[name="Editor top bar"i] >> role=button[name="Block Inserter"i]'
 		);
 
 		await page.fill(
-			'role=region[name="Block Library"i] >> role=searchbox[name="Search for blocks and patterns"i]',
+			'role=region[name="Block Library"i] >> role=searchbox[name="Search"i]',
 			'Heading'
 		);
 
@@ -58,34 +90,16 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		const paragraphBoundingBox = await paragraphBlock.boundingBox();
 
 		await expect( insertingBlocksUtils.indicator ).toBeVisible();
-		// Expect the indicator to be below the paragraph block.
-		await expect
-			.poll( () =>
-				insertingBlocksUtils.indicator
-					.boundingBox()
-					.then( ( { y } ) => y )
-			)
-			.toBeGreaterThan( paragraphBoundingBox.y );
+		await insertingBlocksUtils.expectIndicatorBelowParagraph(
+			paragraphBoundingBox
+		);
 
 		await page.mouse.down();
-		// Call the move function twice to make sure the `dragOver` event is sent.
-		// @see https://github.com/microsoft/playwright/issues/17153
-		for ( let i = 0; i < 2; i += 1 ) {
-			await page.mouse.move(
-				// Hover on the right side of the block to avoid collapsing with the preview.
-				paragraphBoundingBox.x + paragraphBoundingBox.width - 1,
-				// Hover on the bottom of the paragraph block.
-				paragraphBoundingBox.y + paragraphBoundingBox.height - 1
-			);
-		}
-		// Expect the indicator to be below the paragraph block.
-		await expect
-			.poll( () =>
-				insertingBlocksUtils.indicator
-					.boundingBox()
-					.then( ( { y } ) => y )
-			)
-			.toBeGreaterThan( paragraphBoundingBox.y );
+
+		await insertingBlocksUtils.dragOver( paragraphBoundingBox );
+		await insertingBlocksUtils.expectIndicatorBelowParagraph(
+			paragraphBoundingBox
+		);
 
 		// Expect the draggable-chip to appear.
 		await expect( insertingBlocksUtils.draggableChip ).toBeVisible();
@@ -125,11 +139,11 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		);
 
 		await page.click(
-			'role=region[name="Editor top bar"i] >> role=button[name="Toggle block inserter"i]'
+			'role=region[name="Editor top bar"i] >> role=button[name="Block Inserter"i]'
 		);
 
 		await page.fill(
-			'role=region[name="Block Library"i] >> role=searchbox[name="Search for blocks and patterns"i]',
+			'role=region[name="Block Library"i] >> role=searchbox[name="Search"i]',
 			'Heading'
 		);
 
@@ -139,16 +153,8 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		const paragraphBoundingBox = await paragraphBlock.boundingBox();
 
 		await page.mouse.down();
-		// Call the move function twice to make sure the `dragOver` event is sent.
-		// @see https://github.com/microsoft/playwright/issues/17153
-		for ( let i = 0; i < 2; i += 1 ) {
-			await page.mouse.move(
-				// Hover on the right side of the block to avoid collapsing with the preview.
-				paragraphBoundingBox.x + paragraphBoundingBox.width - 1,
-				// Hover on the bottom of the paragraph block.
-				paragraphBoundingBox.y + paragraphBoundingBox.height - 1
-			);
-		}
+
+		await insertingBlocksUtils.dragOver( paragraphBoundingBox );
 
 		await expect( insertingBlocksUtils.indicator ).toBeVisible();
 		await expect( insertingBlocksUtils.draggableChip ).toBeVisible();
@@ -189,13 +195,13 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		);
 
 		await page.click(
-			'role=region[name="Editor top bar"i] >> role=button[name="Toggle block inserter"i]'
+			'role=region[name="Editor top bar"i] >> role=button[name="Block Inserter"i]'
 		);
 
-		const PATTERN_NAME = 'Social links with a shared background color';
+		const PATTERN_NAME = 'Standard';
 
 		await page.fill(
-			'role=region[name="Block Library"i] >> role=searchbox[name="Search for blocks and patterns"i]',
+			'role=region[name="Block Library"i] >> role=searchbox[name="Search"i]',
 			PATTERN_NAME
 		);
 
@@ -210,26 +216,13 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		const paragraphBoundingBox = await paragraphBlock.boundingBox();
 
 		await page.mouse.down();
-		// Call the move function twice to make sure the `dragOver` event is sent.
-		// @see https://github.com/microsoft/playwright/issues/17153
-		for ( let i = 0; i < 2; i += 1 ) {
-			await page.mouse.move(
-				// Hover on the right side of the block to avoid collapsing with the preview.
-				paragraphBoundingBox.x + paragraphBoundingBox.width - 1,
-				// Hover on the bottom of the paragraph block.
-				paragraphBoundingBox.y + paragraphBoundingBox.height - 1
-			);
-		}
+
+		await insertingBlocksUtils.dragOver( paragraphBoundingBox );
 
 		await expect( insertingBlocksUtils.indicator ).toBeVisible();
-		// Expect the indicator to be below the paragraph block.
-		await expect
-			.poll( () =>
-				insertingBlocksUtils.indicator
-					.boundingBox()
-					.then( ( { y } ) => y )
-			)
-			.toBeGreaterThan( paragraphBoundingBox.y );
+		await insertingBlocksUtils.expectIndicatorBelowParagraph(
+			paragraphBoundingBox
+		);
 
 		await expect( insertingBlocksUtils.draggableChip ).toBeVisible();
 
@@ -238,6 +231,103 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
 	} );
 
+	test( 'inserts synced patterns by dragging and dropping from the global inserter', async ( {
+		admin,
+		page,
+		editor,
+		insertingBlocksUtils,
+	}, testInfo ) => {
+		testInfo.fixme(
+			testInfo.project.name === 'firefox',
+			'The clientX value is always 0 in firefox, see https://github.com/microsoft/playwright/issues/17761 for more info.'
+		);
+		const PATTERN_NAME = 'My synced pattern';
+
+		await admin.createNewPost();
+		await editor.switchToLegacyCanvas();
+
+		// We need a dummy block in place to display the drop indicator due to a bug.
+		// @see https://github.com/WordPress/gutenberg/issues/44064
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Dummy text' },
+		} );
+
+		const paragraphBlock = page.locator(
+			'[data-type="core/paragraph"] >> text=Dummy text'
+		);
+
+		// Create a synced pattern from the paragraph block.
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'A useful paragraph to reuse' },
+		} );
+		await editor.showBlockToolbar();
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'Options' } )
+			.click();
+		await page.getByRole( 'menuitem', { name: 'Create pattern' } ).click();
+		const createPatternDialog = page.getByRole( 'dialog', {
+			name: 'add new pattern',
+		} );
+		await createPatternDialog
+			.getByRole( 'textbox', { name: 'Name' } )
+			.fill( PATTERN_NAME );
+		await createPatternDialog
+			.getByRole( 'checkbox', { name: 'Synced' } )
+			.setChecked( true );
+		await createPatternDialog
+			.getByRole( 'button', { name: 'Add' } )
+			.click();
+		const patternBlock = page.getByRole( 'document', {
+			name: 'Block: Pattern',
+		} );
+		await expect( patternBlock ).toBeFocused();
+
+		// Insert a synced pattern.
+		await page.click(
+			'role=region[name="Editor top bar"i] >> role=button[name="Block Inserter"i]'
+		);
+		await page.fill(
+			'role=region[name="Block Library"i] >> role=searchbox[name="Search"i]',
+			PATTERN_NAME
+		);
+		await page.hover(
+			`role=listbox[name="Block Patterns"i] >> role=option[name="${ PATTERN_NAME }"i]`
+		);
+
+		const paragraphBoundingBox = await paragraphBlock.boundingBox();
+
+		await page.mouse.down();
+
+		await insertingBlocksUtils.dragOver( paragraphBoundingBox );
+		await expect( insertingBlocksUtils.indicator ).toBeVisible();
+		await insertingBlocksUtils.expectIndicatorBelowParagraph(
+			paragraphBoundingBox
+		);
+		await expect( insertingBlocksUtils.draggableChip ).toBeVisible();
+
+		await page.mouse.up();
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'Dummy text',
+				},
+			},
+			{
+				name: 'core/block',
+				attributes: { ref: expect.any( Number ) },
+			},
+			{
+				name: 'core/block',
+				attributes: { ref: expect.any( Number ) },
+			},
+		] );
+	} );
+
 	test( 'cancels dragging patterns from the global inserter by pressing Escape', async ( {
 		admin,
 		page,
@@ -261,13 +351,13 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		);
 
 		await page.click(
-			'role=region[name="Editor top bar"i] >> role=button[name="Toggle block inserter"i]'
+			'role=region[name="Editor top bar"i] >> role=button[name="Block Inserter"i]'
 		);
 
-		const PATTERN_NAME = 'Social links with a shared background color';
+		const PATTERN_NAME = 'Standard';
 
 		await page.fill(
-			'role=region[name="Block Library"i] >> role=searchbox[name="Search for blocks and patterns"i]',
+			'role=region[name="Block Library"i] >> role=searchbox[name="Search"i]',
 			PATTERN_NAME
 		);
 
@@ -278,16 +368,8 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		const paragraphBoundingBox = await paragraphBlock.boundingBox();
 
 		await page.mouse.down();
-		// Call the move function twice to make sure the `dragOver` event is sent.
-		// @see https://github.com/microsoft/playwright/issues/17153
-		for ( let i = 0; i < 2; i += 1 ) {
-			await page.mouse.move(
-				// Hover on the right side of the block to avoid collapsing with the preview.
-				paragraphBoundingBox.x + paragraphBoundingBox.width - 1,
-				// Hover on the bottom of the paragraph block.
-				paragraphBoundingBox.y + paragraphBoundingBox.height - 1
-			);
-		}
+
+		await insertingBlocksUtils.dragOver( paragraphBoundingBox );
 
 		await expect( insertingBlocksUtils.indicator ).toBeVisible();
 		await expect( insertingBlocksUtils.draggableChip ).toBeVisible();
@@ -311,7 +393,8 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 		await admin.createNewPost();
 
 		const inserterButton = page.getByRole( 'button', {
-			name: 'Toggle block inserter',
+			name: 'Block Inserter',
+			exact: true,
 		} );
 		const blockLibrary = page.getByRole( 'region', {
 			name: 'Block Library',
@@ -329,6 +412,298 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => {
 
 		await expect( blockLibrary ).toBeHidden();
 	} );
+
+	test( 'should insert block with the slash inserter when using multiple words', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost();
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '/tag cloud' );
+
+		await expect(
+			page.getByRole( 'option', { name: 'Tag Cloud', selected: true } )
+		).toBeVisible();
+		await page.keyboard.press( 'Enter' );
+
+		await expect(
+			editor.canvas.getByRole( 'document', { name: 'Block: Tag Cloud' } )
+		).toBeVisible();
+	} );
+
+	// Check for regression of https://github.com/WordPress/gutenberg/issues/24262.
+	test( 'inserts a block in proper place after having clicked `Browse All` from inline inserter', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost();
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'First paragraph' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '## Heading' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Second paragraph' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Third paragraph' );
+
+		const boundingBox = await editor.canvas
+			.getByRole( 'document', { name: 'Block: Heading' } )
+			.boundingBox();
+
+		// Using the between inserter.
+		await page.mouse.move(
+			boundingBox.x + boundingBox.width / 2,
+			boundingBox.y - 10,
+			// An arbitrary number of `steps` imitates cursor movement in the test environment,
+			// activating the in-between inserter.
+			{ steps: 10 }
+		);
+
+		await page
+			.getByRole( 'button', {
+				name: 'Add block',
+			} )
+			.click();
+		await page.getByRole( 'button', { name: 'Browse All' } ).click();
+		await page
+			.getByRole( 'listbox', { name: 'Media' } )
+			.getByRole( 'option', { name: 'Image' } )
+			.click();
+
+		await expect
+			.poll( editor.getBlocks )
+			.toMatchObject( [
+				{ name: 'core/paragraph' },
+				{ name: 'core/image' },
+				{ name: 'core/heading' },
+				{ name: 'core/paragraph' },
+				{ name: 'core/paragraph' },
+			] );
+	} );
+
+	// Check for regression of https://github.com/WordPress/gutenberg/issues/25785.
+	test( 'inserts a block should show a blue line indicator', async ( {
+		admin,
+		editor,
+		page,
+		insertingBlocksUtils,
+	} ) => {
+		await admin.createNewPost();
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'First paragraph' );
+		await editor.insertBlock( { name: 'core/image' } );
+
+		const paragraphBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+
+		await editor.selectBlocks( paragraphBlock );
+		await page
+			.getByRole( 'toolbar', { name: 'Document tools' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+		await page
+			.getByRole( 'listbox', { name: 'Text' } )
+			.getByRole( 'option', { name: 'Heading' } )
+			.hover();
+
+		await expect( insertingBlocksUtils.indicator ).toBeVisible();
+
+		const paragraphBoundingBox = await paragraphBlock.boundingBox();
+		const indicatorBoundingBox =
+			await insertingBlocksUtils.indicator.boundingBox();
+
+		// Expect the indicator to be below the selected block.
+		expect( indicatorBoundingBox.y ).toBeGreaterThan(
+			paragraphBoundingBox.y
+		);
+	} );
+
+	// Check for regression of https://github.com/WordPress/gutenberg/issues/24403.
+	test( 'inserts a block in proper place after having clicked `Browse All` from block appender', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost();
+		await editor.insertBlock( { name: 'core/group' } );
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Paragraph after group' },
+		} );
+
+		await editor.canvas
+			.getByRole( 'button', {
+				name: 'Group: Gather blocks in a container.',
+			} )
+			.click();
+		await editor.canvas
+			.getByRole( 'button', {
+				name: 'Add block',
+			} )
+			.click();
+		await page.getByRole( 'button', { name: 'Browse All' } ).click();
+		await page
+			.getByRole( 'listbox', { name: 'Text' } )
+			.getByRole( 'option', { name: 'Paragraph' } )
+			.click();
+		await editor.canvas
+			.getByRole( 'document', { name: 'Empty block' } )
+			.fill( 'Paragraph inside group' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/group',
+				innerBlocks: [
+					{
+						name: 'core/paragraph',
+						attributes: { content: 'Paragraph inside group' },
+					},
+				],
+			},
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'Paragraph after group' },
+			},
+		] );
+	} );
+
+	test( 'passes the search value in the main inserter when clicking `Browse all`', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost();
+		await editor.insertBlock( { name: 'core/group' } );
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Paragraph after group' },
+		} );
+
+		await editor.canvas
+			.getByRole( 'button', {
+				name: 'Group: Gather blocks in a container.',
+			} )
+			.click();
+		await editor.canvas
+			.getByRole( 'button', {
+				name: 'Add block',
+			} )
+			.click();
+
+		await page
+			.getByRole( 'searchbox', {
+				name: 'Search',
+			} )
+			.first()
+			.fill( 'Verse' );
+		await page.getByRole( 'button', { name: 'Browse All' } ).click();
+
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Block Library' } )
+				.getByRole( 'searchbox', {
+					name: 'Search',
+				} )
+				.first()
+		).toHaveValue( 'Verse' );
+		await expect(
+			page.getByRole( 'listbox', { name: 'Blocks' } ).first()
+		).toHaveCount( 1 );
+	} );
+
+	// Check for regression of https://github.com/WordPress/gutenberg/issues/27586.
+	test( 'can close the main inserter after inserting a single-use block, like the More block', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost();
+		await page
+			.getByRole( 'toolbar', { name: 'Document tools' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+		await page.getByRole( 'option', { name: 'More', exact: true } ).click();
+
+		// Moving focus to the More block should not close the inserter.
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Read more' } )
+			.fill( 'More' );
+		await expect(
+			page.getByRole( 'region', {
+				name: 'Block Library',
+			} )
+		).toBeVisible();
+	} );
+
+	test( 'shows block preview when hovering over block in inserter', async ( {
+		admin,
+		page,
+	} ) => {
+		await admin.createNewPost();
+		await page
+			.getByRole( 'toolbar', { name: 'Document tools' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+		await page
+			.getByRole( 'listbox', { name: 'Text' } )
+			.getByRole( 'option', { name: 'Paragraph' } )
+			.hover();
+
+		await expect(
+			page.locator( '.block-editor-inserter__preview' )
+		).toBeInViewport();
+	} );
+
+	[ 'large', 'small' ].forEach( ( viewport ) => {
+		test( `last-inserted block should be given and keep the selection (${ viewport } viewport)`, async ( {
+			admin,
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await pageUtils.setBrowserViewport( viewport );
+			await admin.createNewPost();
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: { content: 'Testing inserted block selection' },
+			} );
+
+			await page
+				.getByRole( 'toolbar', { name: 'Document tools' } )
+				.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+				.click();
+			await page
+				.getByRole( 'listbox', { name: 'Media' } )
+				.getByRole( 'option', { name: 'Image' } )
+				.click();
+
+			await expect(
+				editor.canvas.getByRole( 'document', { name: 'Block: Image' } )
+			).toBeVisible();
+			await expect
+				.poll( () =>
+					page.evaluate(
+						() =>
+							window.wp.data
+								.select( 'core/block-editor' )
+								.getSelectedBlock()?.name
+					)
+				)
+				.toBe( 'core/image' );
+
+			// Restore the viewport.
+			await pageUtils.setBrowserViewport( 'large' );
+		} );
+	} );
 } );
 
 test.describe( 'insert media from inserter', () => {
@@ -356,18 +731,10 @@ test.describe( 'insert media from inserter', () => {
 	} ) => {
 		await admin.createNewPost();
 
-		await page.click(
-			'role=region[name="Editor top bar"i] >> role=button[name="Toggle block inserter"i]'
-		);
-		await page.click(
-			'role=region[name="Block Library"i] >> role=tab[name="Media"i]'
-		);
-		await page.click(
-			'[aria-label="Media categories"i] >> role=button[name="Images"i]'
-		);
-		await page.click(
-			`role=listbox[name="Media List"i] >> role=option[name="${ uploadedMedia.title.raw }"]`
-		);
+		await page.getByLabel( 'Block Inserter' ).click();
+		await page.getByRole( 'tab', { name: 'Media' } ).click();
+		await page.getByRole( 'tab', { name: 'Images' } ).click();
+		await page.getByLabel( uploadedMedia.title.raw ).click();
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:image {"id":${ uploadedMedia.id }} -->
 <figure class="wp-block-image"><img src="${ uploadedMedia.source_url }" alt="${ uploadedMedia.alt_text }" class="wp-image-${ uploadedMedia.id }"/></figure>
@@ -388,4 +755,24 @@ class InsertingBlocksUtils {
 			'data-testid=block-draggable-chip >> visible=true'
 		);
 	}
+	async dragOver( boundingBox ) {
+		// Call the move function twice to make sure the `dragOver` event is sent.
+		// @see https://github.com/microsoft/playwright/issues/17153
+		for ( let i = 0; i < 2; i += 1 ) {
+			await this.page.mouse.move(
+				// Hover on the right side of the block to avoid collapsing with the preview.
+				// But not too far to avoid triggering the grouping block inserter.
+				boundingBox.x + boundingBox.width - 32,
+				// Hover on the bottom of the paragraph block.
+				boundingBox.y + boundingBox.height - 1
+			);
+		}
+	}
+
+	async expectIndicatorBelowParagraph( paragraphBoundingBox ) {
+		// Expect the indicator to be below the paragraph block.
+		await expect
+			.poll( () => this.indicator.boundingBox().then( ( { y } ) => y ) )
+			.toBeGreaterThan( paragraphBoundingBox.y );
+	}
 }
diff --git a/test/e2e/specs/editor/various/invalid-block.spec.js b/test/e2e/specs/editor/various/invalid-block.spec.js
new file mode 100644
index 00000000000000..3487c326d2851f
--- /dev/null
+++ b/test/e2e/specs/editor/various/invalid-block.spec.js
@@ -0,0 +1,119 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Invalid blocks', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'should show an invalid block message with clickable options', async ( {
+		editor,
+		page,
+	} ) => {
+		// Create an empty paragraph with the focus in the block.
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'hello' );
+
+		// Change to HTML mode and close the options.
+		await editor.clickBlockOptionsMenuItem( 'Edit as HTML' );
+
+		// Focus on the textarea and enter an invalid paragraph.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.getByRole( 'textbox' )
+			.fill( '<p>invalid paragraph' );
+
+		// Takes the focus away from the block so the invalid warning is triggered.
+		await editor.saveDraft();
+
+		// Click on the 'three-dots' menu toggle.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.getByRole( 'button', { name: 'More options' } )
+			.click();
+
+		await page
+			.getByRole( 'menu', { name: 'More options' } )
+			.getByRole( 'menuitem', { name: 'Resolve' } )
+			.click();
+
+		// Check we get the resolve modal with the appropriate contents.
+		await expect(
+			page
+				.getByRole( 'dialog', { name: 'Resolve Block' } )
+				.locator( '.block-editor-block-compare__html' )
+		).toHaveText( [ '<p>invalid paragraph', '<p>invalid paragraph</p>' ] );
+	} );
+
+	test( 'should strip potentially malicious on* attributes', async ( {
+		editor,
+		page,
+	} ) => {
+		let hasAlert = false;
+		let error = '';
+		let warning = '';
+
+		page.on( 'dialog', () => {
+			hasAlert = true;
+		} );
+
+		page.on( 'console', ( msg ) => {
+			if ( msg.type() === 'error' ) {
+				error = msg.text();
+			}
+
+			if ( msg.type() === 'warning' ) {
+				warning = msg.text();
+			}
+		} );
+
+		await editor.setContent( `
+			<!-- wp:paragraph -->
+			<p>aaaa <img src onerror=alert(1)></x dde></x>1
+			<!-- /wp:paragraph -->
+		` );
+
+		// Give the browser time to show the alert.
+		await expect(
+			editor.canvas
+				.getByRole( 'document', { name: 'Block: Paragraph' } )
+				.getByRole( 'button', { name: 'Attempt recovery' } )
+		).toBeVisible();
+
+		expect( hasAlert ).toBe( false );
+		expect( error ).toContain(
+			'Block validation: Block validation failed'
+		);
+		expect( warning ).toContain(
+			'Block validation: Malformed HTML detected'
+		);
+	} );
+
+	test( 'should not trigger malicious script tags when using a shortcode block', async ( {
+		editor,
+		page,
+	} ) => {
+		let hasAlert = false;
+
+		page.on( 'dialog', () => {
+			hasAlert = true;
+		} );
+
+		await editor.setContent( `
+			<!-- wp:shortcode -->
+			<animate onbegin=alert(1) attributeName=x dur=1s><script>alert("EVIL");</script><style>@keyframes x{}</style><a style="animation-name:x" onanimationstart="alert(2)"></a>
+			<!-- /wp:shortcode -->
+		` );
+
+		// Give the browser time to show the alert.
+		await expect(
+			editor.canvas.getByRole( 'document', { name: 'Block: Shortcode' } )
+		).toBeVisible();
+
+		expect( hasAlert ).toBe( false );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/is-typing.spec.js b/test/e2e/specs/editor/various/is-typing.spec.js
index 0cd5e0d6f64953..da4492a89bef34 100644
--- a/test/e2e/specs/editor/various/is-typing.spec.js
+++ b/test/e2e/specs/editor/various/is-typing.spec.js
@@ -4,34 +4,45 @@
 const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
 test.describe( 'isTyping', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activatePlugin( 'gutenberg-test-observe-typing' );
+	} );
+
 	test.beforeEach( async ( { admin } ) => {
 		await admin.createNewPost();
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deactivatePlugin( 'gutenberg-test-observe-typing' );
+	} );
+
 	test( 'should hide the toolbar when typing', async ( { editor, page } ) => {
 		// Enter to reach paragraph block.
 		await page.keyboard.press( 'Enter' );
 		// Insert paragraph
 		await page.keyboard.type( 'Type' );
 
-		const blockToolbar = page.locator(
-			'role=toolbar[name="Block tools"i]'
+		const blockToolbarPopover = page.locator(
+			'[data-wp-component="Popover"]',
+			{
+				has: page.locator( 'role=toolbar[name="Block tools"i]' ),
+			}
 		);
 
-		// Toolbar should not be showing
-		await expect( blockToolbar ).toBeHidden();
+		// Toolbar Popover should not be showing
+		await expect( blockToolbarPopover ).toBeHidden();
 
 		// Moving the mouse shows the toolbar.
 		await editor.showBlockToolbar();
 
-		// Toolbar is visible.
-		await expect( blockToolbar ).toBeVisible();
+		// Toolbar Popover is visible.
+		await expect( blockToolbarPopover ).toBeVisible();
 
 		// Typing again hides the toolbar
 		await page.keyboard.type( ' and continue' );
 
-		// Toolbar is hidden again
-		await expect( blockToolbar ).toBeHidden();
+		// Toolbar Popover is hidden again
+		await expect( blockToolbarPopover ).toBeHidden();
 	} );
 
 	test( 'should not close the dropdown when typing in it', async ( {
@@ -39,25 +50,23 @@ test.describe( 'isTyping', () => {
 		page,
 	} ) => {
 		// Add a block with a dropdown in the toolbar that contains an input.
-		await editor.insertBlock( { name: 'core/query' } );
+		await editor.insertBlock( { name: 'e2e-tests/observe-typing' } );
 
-		// Tab to Start Blank Button
-		await page.keyboard.press( 'Tab' );
-		// Select the Start Blank Button
-		await page.keyboard.press( 'Enter' );
-		// Select the First variation
-		await page.keyboard.press( 'Enter' );
 		// Moving the mouse shows the toolbar.
 		await editor.showBlockToolbar();
 		// Open the dropdown.
-		await page.getByRole( 'button', { name: 'Display settings' } ).click();
+		await page
+			.getByRole( 'button', {
+				name: 'Open Dropdown',
+			} )
+			.click();
 
-		const itemsPerPageInput = page.getByLabel( 'Items per Page' );
-		// Make sure we're where we think we are
-		await expect( itemsPerPageInput ).toBeFocused();
+		const textControl = page.getByRole( 'textbox', {
+			name: 'Dropdown field',
+		} );
 		// Type inside the dropdown's input
-		await page.keyboard.type( '00' );
+		await textControl.pressSequentially( 'Hello' );
 		// The input should still be visible.
-		await expect( itemsPerPageInput ).toBeVisible();
+		await expect( textControl ).toBeVisible();
 	} );
 } );
diff --git a/test/e2e/specs/editor/various/keep-styles-on-block-transforms.spec.js b/test/e2e/specs/editor/various/keep-styles-on-block-transforms.spec.js
index 57b958fdfc4b44..32e3def9154ed1 100644
--- a/test/e2e/specs/editor/various/keep-styles-on-block-transforms.spec.js
+++ b/test/e2e/specs/editor/various/keep-styles-on-block-transforms.spec.js
@@ -17,7 +17,7 @@ test.describe( 'Keep styles on block transforms', () => {
 			.locator( 'role=button[name="Add default block"i]' )
 			.click();
 		await page.keyboard.type( '## Heading' );
-		await page.click( 'role=button[name="Color Text styles"i]' );
+		await page.click( 'role=button[name="Text"i]' );
 		await page.click( 'role=option[name="Color: Luminous vivid orange"i]' );
 
 		await page.click( 'role=button[name="Heading"i]' );
diff --git a/test/e2e/specs/editor/various/keyboard-navigable-blocks.spec.js b/test/e2e/specs/editor/various/keyboard-navigable-blocks.spec.js
index 080abe011206a7..e1ca121040b974 100644
--- a/test/e2e/specs/editor/various/keyboard-navigable-blocks.spec.js
+++ b/test/e2e/specs/editor/various/keyboard-navigable-blocks.spec.js
@@ -12,122 +12,31 @@ test.use( {
 } );
 
 test.describe( 'Order of block keyboard navigation', () => {
-	test.beforeEach( async ( { admin } ) => {
+	test.beforeEach( async ( { admin, editor } ) => {
 		await admin.createNewPost();
+		await editor.openDocumentSettingsSidebar();
 	} );
 
-	test( 'permits tabbing through paragraph blocks in the expected order', async ( {
+	test( 'permits tabbing through the block toolbar of the paragraph block', async ( {
 		editor,
 		KeyboardNavigableBlocks,
 		page,
+		pageUtils,
 	} ) => {
-		const paragraphBlocks = [ 'Paragraph 0', 'Paragraph 1', 'Paragraph 2' ];
-
-		// Create 3 paragraphs blocks with some content.
-		for ( const paragraphBlock of paragraphBlocks ) {
+		// Insert three paragraph blocks.
+		for ( let i = 0; i < 3; i++ ) {
 			await editor.insertBlock( { name: 'core/paragraph' } );
-			await page.keyboard.type( paragraphBlock );
+			await page.keyboard.type( `Paragraph ${ i + 1 }` );
 		}
-
-		// Select the middle block.
+		// Select the middle paragraph block.
 		await page.keyboard.press( 'ArrowUp' );
 		await editor.showBlockToolbar();
-		await KeyboardNavigableBlocks.navigateToContentEditorTop();
-		await KeyboardNavigableBlocks.tabThroughParagraphBlock( 'Paragraph 1' );
-
-		// Repeat the same steps to ensure that there is no change introduced in how the focus is handled.
-		// This prevents the previous regression explained in: https://github.com/WordPress/gutenberg/issues/11773.
-		await KeyboardNavigableBlocks.navigateToContentEditorTop();
-		await KeyboardNavigableBlocks.tabThroughParagraphBlock( 'Paragraph 1' );
-	} );
-
-	test( 'allows tabbing in navigation mode if no block is selected', async ( {
-		editor,
-		KeyboardNavigableBlocks,
-		page,
-	} ) => {
-		const paragraphBlocks = [ '0', '1' ];
-
-		// Create 2 paragraphs blocks with some content.
-		for ( const paragraphBlock of paragraphBlocks ) {
-			await editor.insertBlock( { name: 'core/paragraph' } );
-			await page.keyboard.type( paragraphBlock );
-		}
-
-		// Clear the selected block.
-		const paragraph = editor.canvas
-			.locator( '[data-type="core/paragraph"]' )
-			.getByText( '1' );
-		const box = await paragraph.boundingBox();
-		await page.mouse.click( box.x - 1, box.y );
-
-		await page.keyboard.press( 'Tab' );
-		await KeyboardNavigableBlocks.expectLabelToHaveFocus( 'Add title' );
-
-		await page.keyboard.press( 'Tab' );
-		await KeyboardNavigableBlocks.expectLabelToHaveFocus(
-			'Paragraph Block. Row 1. 0'
-		);
-
-		await page.keyboard.press( 'Tab' );
-		await KeyboardNavigableBlocks.expectLabelToHaveFocus(
-			'Paragraph Block. Row 2. 1'
-		);
-
-		await page.keyboard.press( 'Tab' );
-		await KeyboardNavigableBlocks.expectLabelToHaveFocus(
-			'Post (selected)'
-		);
-	} );
-
-	test( 'allows tabbing in navigation mode if no block is selected (reverse)', async ( {
-		editor,
-		KeyboardNavigableBlocks,
-		page,
-		pageUtils,
-	} ) => {
-		const paragraphBlocks = [ '0', '1' ];
-
-		// Create 2 paragraphs blocks with some content.
-		for ( const paragraphBlock of paragraphBlocks ) {
-			await editor.insertBlock( { name: 'core/paragraph' } );
-			await page.keyboard.type( paragraphBlock );
-		}
-
-		// Clear the selected block.
-		const paragraph = editor.canvas
-			.locator( '[data-type="core/paragraph"]' )
-			.getByText( '1' );
-		const box = await paragraph.boundingBox();
-		await page.mouse.click( box.x - 1, box.y );
-
-		// Put focus behind the block list.
-		await page.evaluate( () => {
-			document
-				.querySelector( '.interface-interface-skeleton__sidebar' )
-				.focus();
-		} );
-
-		await pageUtils.pressKeys( 'shift+Tab' );
-		await KeyboardNavigableBlocks.expectLabelToHaveFocus( 'Add block' );
-
-		await pageUtils.pressKeys( 'shift+Tab' );
-		await KeyboardNavigableBlocks.expectLabelToHaveFocus(
-			'Add default block'
-		);
-
-		await pageUtils.pressKeys( 'shift+Tab' );
-		await KeyboardNavigableBlocks.expectLabelToHaveFocus(
-			'Paragraph Block. Row 2. 1'
-		);
-
 		await pageUtils.pressKeys( 'shift+Tab' );
+		await KeyboardNavigableBlocks.navigateThroughBlockToolbar();
+		await page.keyboard.press( 'Tab' );
 		await KeyboardNavigableBlocks.expectLabelToHaveFocus(
-			'Paragraph Block. Row 1. 0'
+			'Block: Paragraph'
 		);
-
-		await pageUtils.pressKeys( 'shift+Tab' );
-		await KeyboardNavigableBlocks.expectLabelToHaveFocus( 'Add title' );
 	} );
 
 	test( 'should navigate correctly with multi selection', async ( {
@@ -151,7 +60,7 @@ test.describe( 'Order of block keyboard navigation', () => {
 		);
 
 		await page.keyboard.press( 'Tab' );
-		await KeyboardNavigableBlocks.expectLabelToHaveFocus( 'Post' );
+		await KeyboardNavigableBlocks.expectLabelToHaveFocus( 'Block' );
 
 		await pageUtils.pressKeys( 'shift+Tab' );
 		await KeyboardNavigableBlocks.expectLabelToHaveFocus(
@@ -217,31 +126,7 @@ class KeyboardNavigableBlocks {
 		expect( ariaLabel ).toBe( label );
 	}
 
-	async navigateToContentEditorTop() {
-		// Use 'Ctrl+`' to return to the top of the editor.
-		await this.pageUtils.pressKeys( 'ctrl+`', { times: 5 } );
-	}
-
-	async tabThroughParagraphBlock( paragraphText ) {
-		await this.tabThroughBlockToolbar();
-
-		await this.page.keyboard.press( 'Tab' );
-		await this.expectLabelToHaveFocus( 'Block: Paragraph' );
-
-		const activeElement = this.editor.canvas.locator( ':focus' );
-
-		await expect( activeElement ).toHaveText( paragraphText );
-
-		await this.page.keyboard.press( 'Tab' );
-		await this.expectLabelToHaveFocus( 'Post' );
-
-		// Need to shift+tab here to end back in the block. If not, we'll be in the next region and it will only require 4 region jumps instead of 5.
-		await this.pageUtils.pressKeys( 'shift+Tab' );
-		await this.expectLabelToHaveFocus( 'Block: Paragraph' );
-	}
-
-	async tabThroughBlockToolbar() {
-		await this.page.keyboard.press( 'Tab' );
+	async navigateThroughBlockToolbar() {
 		await this.expectLabelToHaveFocus( 'Paragraph' );
 
 		await this.page.keyboard.press( 'ArrowRight' );
diff --git a/test/e2e/specs/editor/various/list-view.spec.js b/test/e2e/specs/editor/various/list-view.spec.js
index f05b7760c4cc7a..531faa8bea049d 100644
--- a/test/e2e/specs/editor/various/list-view.spec.js
+++ b/test/e2e/specs/editor/various/list-view.spec.js
@@ -53,11 +53,40 @@ test.describe( 'List View', () => {
 			name: 'Paragraph',
 			exact: true,
 		} );
+		const imageBlockItem = listView.getByRole( 'gridcell', {
+			name: 'Image',
+			exact: true,
+		} );
 		const headingBlockItem = listView.getByRole( 'gridcell', {
 			name: 'Heading',
 			exact: true,
 		} );
-		await paragraphBlockItem.dragTo( headingBlockItem, { x: 0, y: 0 } );
+
+		await paragraphBlockItem.hover();
+		await page.mouse.down();
+
+		// To work around a drag and drop bug in Safari, the list view applies
+		// `pointer-events: none` to the list view while dragging, so that
+		// `onDragLeave` is not fired when dragging within the list view.
+		// Without the `force: true` option, the `hover` action will fail
+		// as playwright will complain that pointer-events are intercepted.
+		// https://bugs.webkit.org/show_bug.cgi?id=66547
+		// See: https://github.com/WordPress/gutenberg/pull/56625
+
+		// Hover over each block to mimic moving up the list view.
+		// Also, hover twice to ensure a dragover event is dispatched.
+		// See: https://playwright.dev/docs/input#dragging-manually
+		await imageBlockItem.hover( { force: true } );
+		await imageBlockItem.hover( { force: true } );
+		await headingBlockItem.hover( { force: true } );
+		await headingBlockItem.hover( { force: true } );
+
+		// Disable reason: Need to wait until the throttle timeout of 250ms has passed.
+		/* eslint-disable playwright/no-wait-for-timeout */
+		await editor.page.waitForTimeout( 300 );
+		/* eslint-enable playwright/no-wait-for-timeout */
+
+		await page.mouse.up();
 
 		// Ensure the block was dropped correctly.
 		await expect
@@ -121,12 +150,13 @@ test.describe( 'List View', () => {
 		await expect( listView.getByRole( 'row' ) ).toHaveCount( 2 );
 	} );
 
-	test( 'expands nested list items', async ( {
+	test( 'expands and collapses nested list items', async ( {
 		editor,
 		page,
 		pageUtils,
 	} ) => {
 		await editor.insertBlock( { name: 'core/cover' } );
+		await editor.insertBlock( { name: 'core/group' } );
 
 		// Click first color option from the block placeholder's color picker to
 		// make the inner blocks appear.
@@ -167,8 +197,9 @@ test.describe( 'List View', () => {
 			// intentionally aria-hidden. See the implementation for details.
 			.click( { force: true } );
 
-		// Check that we're collapsed.
-		await expect( listView.getByRole( 'row' ) ).toHaveCount( 1 );
+		// Check that blocks are collapsed:
+		// 2 blocks: (one Cover block, one Group block).
+		await expect( listView.getByRole( 'row' ) ).toHaveCount( 2 );
 
 		// Click the Cover block List View item.
 		await listView
@@ -192,6 +223,32 @@ test.describe( 'List View', () => {
 				selected: true,
 			} )
 		).toBeVisible();
+
+		// Check that blocks are expanded:
+		// 3 blocks: (one Cover block containing a Paragraph block, one Group block).
+		await expect( listView.getByRole( 'row' ) ).toHaveCount( 3 );
+
+		await listView
+			.getByRole( 'gridcell', { name: 'Paragraph', exact: true } )
+			.click();
+
+		// Move down to the Group block.
+		await page.keyboard.press( 'ArrowDown' );
+
+		// Collapse all but the Group block.
+		await pageUtils.pressKeys( 'alt+l' );
+
+		// Check that the Cover block is collapsed.
+		await expect(
+			listView.getByRole( 'link', {
+				name: 'Cover',
+				expanded: false,
+			} )
+		).toBeVisible();
+
+		// Check that blocks are collapsed:
+		// 2 blocks: (one Cover block, one Group block).
+		await expect( listView.getByRole( 'row' ) ).toHaveCount( 2 );
 	} );
 
 	test( 'moves focus to start/end of list with Home/End keys', async ( {
@@ -242,14 +299,32 @@ test.describe( 'List View', () => {
 		// Navigate the right column to image block options button via Home key.
 		await page.keyboard.press( 'ArrowRight' );
 		await page.keyboard.press( 'Home' );
+
+		const imageItem = listView.getByRole( 'gridcell', {
+			name: 'Image',
+		} );
+
 		await expect(
-			listView.getByRole( 'button', { name: 'Options for Image' } )
+			imageItem
+				.locator( '..' ) // parent selector.
+				.getByRole( 'button', {
+					name: 'Options',
+				} )
 		).toBeFocused();
 
 		// Navigate the right column to group block options button.
 		await page.keyboard.press( 'End' );
+
+		const groupItem = listView.getByRole( 'gridcell', {
+			name: 'Group',
+		} );
+
 		await expect(
-			listView.getByRole( 'button', { name: 'Options for Group' } )
+			groupItem
+				.locator( '..' ) // parent selector.
+				.getByRole( 'button', {
+					name: 'Options',
+				} )
 		).toBeFocused();
 	} );
 
@@ -421,7 +496,7 @@ test.describe( 'List View', () => {
 		).toBeFocused();
 	} );
 
-	test( 'should select, duplicate, delete, and deselect blocks using keyboard', async ( {
+	test( 'should cut, copy, paste, select, duplicate, insert, delete, and deselect blocks using keyboard', async ( {
 		editor,
 		page,
 		pageUtils,
@@ -588,8 +663,44 @@ test.describe( 'List View', () => {
 				{ name: 'core/file', focused: true },
 			] );
 
-		// Move focus to the first file block, and then delete it.
-		await page.keyboard.press( 'ArrowUp' );
+		// Test insert before.
+		await pageUtils.pressKeys( 'primaryAlt+t' );
+
+		await expect
+			.poll(
+				listViewUtils.getBlocksWithA11yAttributes,
+				'Inserting a block before should move selection and focus to the inserted block.'
+			)
+			.toMatchObject( [
+				{ name: 'core/group' },
+				{ name: 'core/columns' },
+				{ name: 'core/file', selected: false },
+				{ name: 'core/paragraph', focused: true, selected: true },
+				{ name: 'core/file', selected: false },
+			] );
+
+		// Test insert after.
+		await pageUtils.pressKeys( 'primaryAlt+y' );
+
+		await expect
+			.poll(
+				listViewUtils.getBlocksWithA11yAttributes,
+				'Inserting a block before should move selection and focus to the inserted block.'
+			)
+			.toMatchObject( [
+				{ name: 'core/group' },
+				{ name: 'core/columns' },
+				{ name: 'core/file', selected: false },
+				{ name: 'core/paragraph', focused: false, selected: false },
+				{ name: 'core/paragraph', focused: true, selected: true },
+				{ name: 'core/file', selected: false },
+			] );
+
+		// Remove the inserted blocks.
+		await page.keyboard.press( 'Delete' );
+		await page.keyboard.press( 'Delete' );
+
+		// Delete the first File block.
 		await page.keyboard.press( 'Delete' );
 		await expect
 			.poll(
@@ -779,6 +890,139 @@ test.describe( 'List View', () => {
 				{ name: 'core/heading', selected: false, focused: false },
 				{ name: 'core/file', selected: false, focused: true },
 			] );
+
+		// Copy and paste blocks. To begin, add another Group block.
+		await editor.insertBlock( {
+			name: 'core/group',
+			innerBlocks: [
+				{ name: 'core/paragraph' },
+				{ name: 'core/pullquote' },
+			],
+		} );
+
+		// Click the newly inserted Group block List View item to ensure it is focused.
+		await listView
+			.getByRole( 'link', {
+				name: 'Group',
+				expanded: false,
+			} )
+			.click();
+
+		// Move down to group block, expand, and then move to the paragraph block.
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'ArrowDown' );
+		await pageUtils.pressKeys( 'primary+c' );
+		await page.keyboard.press( 'ArrowUp' );
+		await pageUtils.pressKeys( 'primary+v' );
+
+		await expect
+			.poll(
+				listViewUtils.getBlocksWithA11yAttributes,
+				'Should be able to copy focused block and paste in the list view via keyboard shortcuts'
+			)
+			.toMatchObject( [
+				{ name: 'core/heading', selected: false, focused: false },
+				{ name: 'core/file', selected: false, focused: false },
+				{
+					name: 'core/group',
+					selected: true,
+					innerBlocks: [
+						{
+							name: 'core/pullquote',
+							selected: false,
+							focused: true,
+						},
+						{
+							name: 'core/pullquote',
+							selected: false,
+							focused: false,
+						},
+					],
+				},
+			] );
+
+		// Cut and paste blocks.
+		await page.keyboard.press( 'ArrowUp' );
+		await pageUtils.pressKeys( 'primary+x' );
+
+		await expect
+			.poll(
+				listViewUtils.getBlocksWithA11yAttributes,
+				'Should be able to cut a block in the list view, with the preceding block being selected'
+			)
+			.toMatchObject( [
+				{ name: 'core/heading', selected: false, focused: false },
+				{ name: 'core/file', selected: true, focused: true },
+			] );
+
+		await pageUtils.pressKeys( 'primary+v' );
+
+		await expect
+			.poll(
+				listViewUtils.getBlocksWithA11yAttributes,
+				'Should be able to paste previously cut block in the list view via keyboard shortcuts'
+			)
+			.toMatchObject( [
+				{ name: 'core/heading', selected: false, focused: false },
+				{
+					name: 'core/group',
+					selected: true,
+					focused: true,
+					innerBlocks: [
+						{
+							name: 'core/pullquote',
+							selected: false,
+							focused: false,
+						},
+						{
+							name: 'core/pullquote',
+							selected: false,
+							focused: false,
+						},
+					],
+				},
+			] );
+	} );
+
+	test( 'should create a group block from the selected multiple blocks', async ( {
+		editor,
+		pageUtils,
+		listViewUtils,
+	} ) => {
+		// Insert some blocks of different types.
+		await editor.insertBlock( { name: 'core/paragraph' } );
+		await editor.insertBlock( { name: 'core/heading' } );
+		await editor.insertBlock( { name: 'core/file' } );
+
+		await listViewUtils.openListView();
+
+		// Group Heading and File blocks.
+		await pageUtils.pressKeys( 'shift+ArrowUp' );
+		await pageUtils.pressKeys( 'primary+g' );
+		await expect
+			.poll( listViewUtils.getBlocksWithA11yAttributes )
+			.toMatchObject( [
+				{ name: 'core/paragraph', selected: false, focused: false },
+				{
+					name: 'core/group',
+					selected: true,
+					focused: true,
+					innerBlocks: [
+						{
+							name: 'core/heading',
+							selected: false,
+							focused: false,
+						},
+						{
+							name: 'core/file',
+							selected: false,
+							focused: false,
+						},
+					],
+				},
+			] );
 	} );
 
 	test( 'block settings dropdown menu', async ( {
@@ -795,11 +1039,12 @@ test.describe( 'List View', () => {
 		const listView = await listViewUtils.openListView();
 
 		await listView
-			.getByRole( 'button', { name: 'Options for Heading' } )
+			.getByRole( 'button', { name: 'Options' } )
+			.first()
 			.click();
 
 		await page
-			.getByRole( 'menu', { name: 'Options for Heading' } )
+			.getByRole( 'menu', { name: 'Options' } )
 			.getByRole( 'menuitem', { name: 'Duplicate' } )
 			.click();
 		await expect
@@ -815,12 +1060,12 @@ test.describe( 'List View', () => {
 
 		await page.keyboard.press( 'Shift+ArrowUp' );
 		await listView
-			.getByRole( 'button', { name: 'Options for Heading' } )
+			.getByRole( 'button', { name: 'Options' } )
 			.first()
 			.click();
 		await page
-			.getByRole( 'menu', { name: 'Options for Heading' } )
-			.getByRole( 'menuitem', { name: 'Delete blocks' } )
+			.getByRole( 'menu', { name: 'Options' } )
+			.getByRole( 'menuitem', { name: 'Delete' } )
 			.click();
 		await expect
 			.poll(
@@ -837,9 +1082,9 @@ test.describe( 'List View', () => {
 			.filter( {
 				has: page.getByRole( 'gridcell', { name: 'File' } ),
 			} )
-			.getByRole( 'button', { name: 'Options for File' } );
+			.getByRole( 'button', { name: 'Options' } );
 		const optionsForFileMenu = page.getByRole( 'menu', {
-			name: 'Options for File',
+			name: 'Options',
 		} );
 		await expect(
 			optionsForFileToggle,
@@ -875,7 +1120,7 @@ test.describe( 'List View', () => {
 				'Pressing keyboard shortcut should also work when the menu is opened and focused'
 			)
 			.toMatchObject( [
-				{ name: 'core/paragraph', selected: true, focused: false },
+				{ name: 'core/paragraph', selected: true, focused: true },
 				{ name: 'core/file', selected: false, focused: false },
 			] );
 		await expect(
diff --git a/test/e2e/specs/editor/various/multi-block-selection.spec.js b/test/e2e/specs/editor/various/multi-block-selection.spec.js
index 585e4f1851373a..9148c316078a4a 100644
--- a/test/e2e/specs/editor/various/multi-block-selection.spec.js
+++ b/test/e2e/specs/editor/various/multi-block-selection.spec.js
@@ -10,7 +10,7 @@ const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
  * Some tests in this file use the character `|` to represent the caret's position
  * in a more readable format.
  */
-test.describe( 'Multi-block selection', () => {
+test.describe( 'Multi-block selection (@firefox, @webkit)', () => {
 	test.use( {
 		multiBlockSelectionUtils: async ( { page, editor }, use ) => {
 			await use( new MultiBlockSelectionUtils( { page, editor } ) );
@@ -48,7 +48,7 @@ test.describe( 'Multi-block selection', () => {
 	} );
 
 	// See #14448: an incorrect buffer may trigger multi-selection too soon.
-	test( 'should only trigger multi-selection when at the end', async ( {
+	test( 'should only trigger multi-selection when at the end (-webkit)', async ( {
 		page,
 		editor,
 		pageUtils,
@@ -221,7 +221,7 @@ test.describe( 'Multi-block selection', () => {
 		pageUtils,
 		multiBlockSelectionUtils,
 	} ) => {
-		for ( let i = 1; i <= 2; i += 1 ) {
+		for ( let i = 1; i <= 3; i += 1 ) {
 			await editor.insertBlock( {
 				name: 'core/paragraph',
 				attributes: { content: `${ i }` },
@@ -232,14 +232,13 @@ test.describe( 'Multi-block selection', () => {
 
 		await expect
 			.poll( multiBlockSelectionUtils.getSelectedFlatIndices )
-			.toEqual( [ 1, 2 ] );
+			.toEqual( [ 1, 2, 3 ] );
 
 		await page.keyboard.press( 'Escape' );
 
-		// FIXME: This doesn't seem to work anymore.
-		// await expect
-		// 	.poll( multiBlockSelectionUtils.getSelectedFlatIndices )
-		// 	.toEqual( [] );
+		await expect
+			.poll( multiBlockSelectionUtils.getSelectedFlatIndices )
+			.toEqual( [ 1 ] );
 	} );
 
 	test( 'should select with shift + click', async ( {
@@ -287,7 +286,7 @@ test.describe( 'Multi-block selection', () => {
 	} );
 
 	// @see https://github.com/WordPress/gutenberg/issues/34118
-	test( 'should properly select a single block even if `shift` was held for the selection', async ( {
+	test( 'should properly select a single block even if `shift` was held for the selection (-firefox)', async ( {
 		page,
 		editor,
 		pageUtils,
@@ -319,7 +318,7 @@ test.describe( 'Multi-block selection', () => {
 		] );
 	} );
 
-	test( 'should properly select multiple blocks if selected nested blocks belong to different parent', async ( {
+	test( 'should properly select multiple blocks if selected nested blocks belong to different parent (-webkit)', async ( {
 		editor,
 		multiBlockSelectionUtils,
 	} ) => {
@@ -353,7 +352,7 @@ test.describe( 'Multi-block selection', () => {
 			.toEqual( [ 1, 4 ] );
 	} );
 
-	test( 'should properly select part of nested rich text block while holding shift', async ( {
+	test( 'should properly select part of nested rich text block while holding shift (-firefox)', async ( {
 		page,
 		editor,
 	} ) => {
@@ -373,7 +372,7 @@ test.describe( 'Multi-block selection', () => {
 		const { height } = await paragraphBlock.boundingBox();
 		await paragraphBlock.click( { position: { x: 0, y: height / 2 } } );
 		await paragraphBlock.click( {
-			position: { x: 20, y: height / 2 },
+			position: { x: 25, y: height / 2 },
 			modifiers: [ 'Shift' ],
 		} );
 		await page.keyboard.type( 'hi' );
@@ -539,10 +538,8 @@ test.describe( 'Multi-block selection', () => {
 			.poll( editor.getBlocks, 'should paste mid-block' )
 			.toMatchObject( [
 				{ attributes: { content: 'first paragraph' } },
-				{ attributes: { content: 'second paragr' } },
-				{ attributes: { content: 'first paragraph' } },
-				{ attributes: { content: 'second paragraph|' } },
-				{ attributes: { content: 'aph' } },
+				{ attributes: { content: 'second paragrfirst paragraph' } },
+				{ attributes: { content: 'second paragraph|aph' } },
 			] );
 	} );
 
@@ -615,6 +612,74 @@ test.describe( 'Multi-block selection', () => {
 		] );
 	} );
 
+	test( 'should keep correct selection when dragging outside block (-firefox)', async ( {
+		page,
+		editor,
+	} ) => {
+		await editor.canvas
+			.locator( 'role=button[name="Add default block"i]' )
+			.click();
+		await page.keyboard.type( '123' );
+		await page.keyboard.press( 'ArrowLeft' );
+
+		const coord2 = await editor.canvas.locator( ':root' ).evaluate( () => {
+			const selection = window.getSelection();
+			const range = selection.getRangeAt( 0 );
+			const rect1 = range.getClientRects()[ 0 ];
+			const iframeOffset = window.frameElement.getBoundingClientRect();
+			return {
+				x: iframeOffset.x + rect1.x,
+				y: iframeOffset.y + rect1.y + rect1.height / 2,
+			};
+		} );
+
+		await page.keyboard.press( 'ArrowLeft' );
+
+		const coord1 = await editor.canvas.locator( ':root' ).evaluate( () => {
+			const selection = window.getSelection();
+			const range = selection.getRangeAt( 0 );
+			const rect1 = range.getClientRects()[ 0 ];
+			const iframeOffset = window.frameElement.getBoundingClientRect();
+
+			return {
+				x: iframeOffset.x + rect1.x,
+				y: iframeOffset.y + rect1.y + rect1.height / 2,
+			};
+		} );
+
+		const coord3Y = await editor.canvas.locator( ':root' ).evaluate( () => {
+			const element = document.querySelector(
+				'[data-type="core/paragraph"]'
+			);
+			const rect2 = element.getBoundingClientRect();
+			const iframeOffset = window.frameElement.getBoundingClientRect();
+			// Move a bit outside the paragraph, downwards.
+			return iframeOffset.y + rect2.y + rect2.height + 5;
+		} );
+
+		await page.mouse.click( coord1.x, coord1.y );
+		await page.mouse.down();
+		await page.mouse.move( coord2.x, coord2.y, { steps: 10 } );
+		await page.mouse.move( coord2.x, coord3Y, { steps: 10 } );
+		await page.mouse.up();
+
+		// Wait for:
+		// https://github.com/WordPress/gutenberg/blob/eb2bb1d3456ea98db74b4518e3394ed6aed9e79f/packages/block-editor/src/components/writing-flow/use-drag-selection.js#L47
+		await page.evaluate(
+			() => new Promise( window.requestAnimationFrame )
+		);
+
+		// "23" should be deleted.
+		await page.keyboard.press( 'Backspace' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: '1' },
+			},
+		] );
+	} );
+
 	test( 'should preserve dragged selection on move', async ( {
 		page,
 		editor,
@@ -663,7 +728,7 @@ test.describe( 'Multi-block selection', () => {
 		] );
 	} );
 
-	test( 'should clear selection when clicking next to blocks', async ( {
+	test( 'should clear selection when clicking next to blocks (-firefox)', async ( {
 		page,
 		editor,
 		multiBlockSelectionUtils,
@@ -693,6 +758,16 @@ test.describe( 'Multi-block selection', () => {
 			force: true,
 		} );
 
+		await expect
+			.poll( multiBlockSelectionUtils.getSelectedFlatIndices )
+			.toEqual( [ 1 ] );
+
+		await paragraph1.click( {
+			position: { x: -1, y: 0 },
+			// Use force since it's outside the bounding box of the element.
+			force: true,
+		} );
+
 		await expect
 			.poll( () =>
 				page.evaluate( () => window.getSelection().rangeCount )
@@ -867,35 +942,6 @@ test.describe( 'Multi-block selection', () => {
 			] );
 	} );
 
-	test( 'should select all from empty selection', async ( {
-		page,
-		editor,
-		pageUtils,
-		multiBlockSelectionUtils,
-	} ) => {
-		for ( let i = 1; i <= 2; i += 1 ) {
-			await editor.insertBlock( {
-				name: 'core/paragraph',
-				attributes: { content: `${ i }` },
-			} );
-		}
-
-		// Clear the selected block.
-		await page.keyboard.press( 'Escape' );
-		await page.keyboard.press( 'Escape' );
-
-		await expect
-			.poll( multiBlockSelectionUtils.getSelectedBlocks )
-			.toEqual( [] );
-
-		await pageUtils.pressKeys( 'primary+a' );
-
-		await page.keyboard.press( 'Backspace' );
-
-		// Expect both paragraphs to be deleted.
-		await expect.poll( editor.getBlocks ).toEqual( [] );
-	} );
-
 	test( 'should select title if the cursor is on title', async ( {
 		editor,
 		pageUtils,
@@ -1065,7 +1111,7 @@ test.describe( 'Multi-block selection', () => {
 		] );
 	} );
 
-	test( 'should write over selection', async ( {
+	test( 'should write over selection (-firefox)', async ( {
 		page,
 		editor,
 		pageUtils,
@@ -1090,6 +1136,34 @@ test.describe( 'Multi-block selection', () => {
 		] );
 	} );
 
+	test( 'should write over selection (-chromium, -webkit, @firefox)', async ( {
+		page,
+		editor,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '1[' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( ']2' );
+		await page.keyboard.press( 'ArrowLeft' );
+		// Select everything between [].
+		await pageUtils.pressKeys( 'Shift+ArrowLeft', { times: 3 } );
+
+		// Ensure selection is in the correct place.
+		await page.keyboard.type( '|' );
+		// For some reason, this works completely fine when testing manually in
+		// Firefox, but with Playwright it only merges the blocks but doesn't
+		// insert the character.
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: '12' },
+			},
+		] );
+	} );
+
 	test( 'should handle Enter across blocks', async ( {
 		page,
 		editor,
@@ -1165,7 +1239,7 @@ test.describe( 'Multi-block selection', () => {
 		] );
 	} );
 
-	test( 'should partially select with shift + click (@webkit)', async ( {
+	test( 'should partially select with shift + click', async ( {
 		page,
 		editor,
 	} ) => {
diff --git a/test/e2e/specs/editor/various/multi-entity-saving.spec.js b/test/e2e/specs/editor/various/multi-entity-saving.spec.js
index 7a7298c137c4b5..30496fac32aec4 100644
--- a/test/e2e/specs/editor/various/multi-entity-saving.spec.js
+++ b/test/e2e/specs/editor/various/multi-entity-saving.spec.js
@@ -20,7 +20,7 @@ test.describe( 'Editor - Multi-entity save flow', () => {
 		} );
 
 		// Restore the Publish sidebar.
-		await editor.setPreferences( 'core/edit-post', {
+		await editor.setPreferences( 'core', {
 			isPublishSidebarEnabled: true,
 		} );
 	} );
@@ -38,10 +38,13 @@ test.describe( 'Editor - Multi-entity save flow', () => {
 
 		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
 		const publishButton = topBar.getByRole( 'button', { name: 'Publish' } );
+		const saveButton = topBar.getByRole( 'button', {
+			name: 'Save',
+			exact: true,
+		} );
 
 		// Should not trigger multi-entity save button with only post edited.
 		await expect( publishButton ).toBeEnabled();
-		await expect( publishButton ).not.toHaveClass( /has-changes-dot/ );
 
 		const openPublishPanel = page.getByRole( 'button', {
 			name: 'Open publish panel',
@@ -73,7 +76,7 @@ test.describe( 'Editor - Multi-entity save flow', () => {
 		await siteTitleField.fill( `${ originalSiteTitle }...` );
 
 		// Should trigger multi-entity save button once template part edited.
-		await expect( publishButton ).toHaveClass( /has-changes-dot/ );
+		await expect( saveButton ).toBeVisible();
 
 		// Should only have save panel a11y button active after child entities edited.
 		await expect( openPublishPanel ).toBeHidden();
@@ -86,7 +89,7 @@ test.describe( 'Editor - Multi-entity save flow', () => {
 		);
 
 		// Opening panel has boxes checked by default.
-		await publishButton.click();
+		await saveButton.click();
 		await expect( publishPanel ).toContainText( 'Are you ready to save?' );
 		const allCheckboxes = await publishPanel
 			.getByRole( 'checkbox' )
@@ -122,7 +125,6 @@ test.describe( 'Editor - Multi-entity save flow', () => {
 		await expect(
 			topBar.getByRole( 'button', { name: 'Saved' } )
 		).toBeDisabled();
-		await expect( publishButton ).not.toHaveClass( /has-changes-dot/ );
 		await expect( openSavePanel ).toBeHidden();
 
 		await editor.publishPost();
@@ -132,20 +134,16 @@ test.describe( 'Editor - Multi-entity save flow', () => {
 			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'Updated post title' );
 
-		const updateButton = topBar.getByRole( 'button', { name: 'Update' } );
-
 		// Verify update button is enabled.
-		await expect( updateButton ).toBeEnabled();
+		await expect( saveButton ).toBeEnabled();
 
 		// Verify multi-entity saving not enabled.
-		await expect( updateButton ).not.toHaveClass( /has-changes-dot/ );
-		await expect( openSavePanel ).toBeHidden();
+		await expect( publishPanel ).toBeHidden();
 
 		await siteTitleField.fill( `${ originalSiteTitle }!` );
 
 		// Multi-entity saving should be enabled.
-		await expect( updateButton ).toHaveClass( /has-changes-dot/ );
-		await expect( openSavePanel ).toBeVisible();
+		await expect( openSavePanel ).toBeEnabled();
 	} );
 
 	test( 'Site blocks should save individually', async ( {
@@ -154,7 +152,7 @@ test.describe( 'Editor - Multi-entity save flow', () => {
 		page,
 	} ) => {
 		await admin.createNewPost();
-		await editor.setPreferences( 'core/edit-post', {
+		await editor.setPreferences( 'core', {
 			isPublishSidebarEnabled: false,
 		} );
 
@@ -185,7 +183,9 @@ test.describe( 'Editor - Multi-entity save flow', () => {
 			name: 'Editor publish',
 		} );
 
-		await topBar.getByRole( 'button', { name: 'Publish' } ).click();
+		await topBar
+			.getByRole( 'button', { name: 'Save', exact: true } )
+			.click();
 		await expect( publishPanel.getByRole( 'checkbox' ) ).toHaveCount( 3 );
 
 		// Skip site title saving.
@@ -203,7 +203,7 @@ test.describe( 'Editor - Multi-entity save flow', () => {
 			.filter( { hasText: 'published' } )
 			.waitFor();
 
-		await topBar.getByRole( 'button', { name: 'Update' } ).click();
+		await topBar.getByRole( 'button', { name: 'Save' } ).click();
 
 		await expect( publishPanel.getByRole( 'checkbox' ) ).toHaveCount( 1 );
 	} );
diff --git a/test/e2e/specs/editor/various/navigable-toolbar.spec.js b/test/e2e/specs/editor/various/navigable-toolbar.spec.js
index 46d90ad5e45336..4cfc3f9c210086 100644
--- a/test/e2e/specs/editor/various/navigable-toolbar.spec.js
+++ b/test/e2e/specs/editor/various/navigable-toolbar.spec.js
@@ -148,7 +148,6 @@ test.describe( 'Block Toolbar', () => {
 			exact: true,
 		} );
 
-		// Yes, this is the way to get the block toolbar, and yes, it is annoying.
 		const blockToolbar = page.getByRole( 'toolbar', {
 			name: 'Block tools',
 		} );
@@ -240,6 +239,62 @@ test.describe( 'Block Toolbar', () => {
 		await editor.setIsFixedToolbar( false );
 		await pageUtils.setBrowserViewport( 'large' );
 	} );
+
+	test( 'Focus should remain on mover when moving blocks', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		// On default floating toolbar
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Paragraph 1' },
+		} );
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Paragraph 2' },
+		} );
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Paragraph 3' },
+		} );
+		await pageUtils.pressKeys( 'shift+Tab' );
+		// check focus is within the block toolbar
+		const blockToolbarParagraphButton = page.getByRole( 'button', {
+			name: 'Paragraph',
+			exact: true,
+		} );
+		await expect( blockToolbarParagraphButton ).toBeFocused();
+		// Go to Move Up Button
+		await pageUtils.pressKeys( 'ArrowRight' );
+		const blockToolbarMoveUpButton = page.getByRole( 'button', {
+			name: 'Move up',
+			exact: true,
+		} );
+
+		// Make sure it's in an acvite state for now
+		await expect( blockToolbarMoveUpButton ).toBeEnabled();
+
+		await expect( blockToolbarMoveUpButton ).toBeFocused();
+		await pageUtils.pressKeys( 'Enter' );
+		await expect( blockToolbarMoveUpButton ).toBeFocused();
+		await pageUtils.pressKeys( 'Enter' );
+		await expect( blockToolbarMoveUpButton ).toBeFocused();
+		await expect( blockToolbarMoveUpButton ).toBeDisabled();
+
+		// Check to make sure focus returns to the Move Up button roving index after all of this
+		await pageUtils.pressKeys( 'Tab' );
+		// Hide the block toolbar
+		await pageUtils.pressKeys( 'ArrowRight' );
+		// Check the block toolbar is hidden
+		const blockToolbar = page.getByRole( 'toolbar', {
+			name: 'Block tools',
+		} );
+		await expect( blockToolbar ).toBeHidden();
+		await pageUtils.pressKeys( 'shift+Tab' );
+		// We should be on the Move Up button again
+		await expect( blockToolbarMoveUpButton ).toBeFocused();
+	} );
 } );
 
 class BlockToolbarUtils {
diff --git a/test/e2e/specs/editor/various/new-post-default-content.spec.js b/test/e2e/specs/editor/various/new-post-default-content.spec.js
index db9e3c38dc2962..6f38f7ffbd1cae 100644
--- a/test/e2e/specs/editor/various/new-post-default-content.spec.js
+++ b/test/e2e/specs/editor/various/new-post-default-content.spec.js
@@ -23,8 +23,6 @@ test.describe( 'new editor filtered state', () => {
 
 	test( 'should respect default content', async ( { editor, page } ) => {
 		await editor.openDocumentSettingsSidebar();
-		await page.click( 'role=button[name="Excerpt"i]' );
-
 		// Assert they match what the plugin set.
 		await expect(
 			editor.canvas.locator( 'role=textbox[name="Add title"i]' )
@@ -32,8 +30,9 @@ test.describe( 'new editor filtered state', () => {
 		await expect
 			.poll( editor.getEditedPostContent )
 			.toBe( 'My default content' );
+		await page.getByRole( 'button', { name: 'Edit excerpt' } ).click();
 		await expect(
-			page.locator( 'role=textbox[name="Write an excerpt (optional)"i]' )
-		).toHaveText( 'My default excerpt' );
+			page.getByRole( 'textbox', { name: 'Write an excerpt (optional)' } )
+		).toHaveValue( 'My default excerpt' );
 	} );
 } );
diff --git a/test/e2e/specs/editor/various/new-post.spec.js b/test/e2e/specs/editor/various/new-post.spec.js
index cc0243eb8e6312..68d983e91045b7 100644
--- a/test/e2e/specs/editor/various/new-post.spec.js
+++ b/test/e2e/specs/editor/various/new-post.spec.js
@@ -32,15 +32,15 @@ test.describe( 'new editor state', () => {
 		await expect( title ).toBeEditable();
 		await expect( title ).toHaveText( '' );
 
-		// Should display the Preview button.
+		// Should display the View button.
 		await expect(
-			page.locator( 'role=button[name="Preview"i]' )
+			page.locator( 'role=button[name="View"i]' )
 		).toBeVisible();
 
 		// Should display the Post Formats UI.
 		await editor.openDocumentSettingsSidebar();
 		await expect(
-			page.locator( 'role=combobox[name="Post Format"i]' )
+			page.locator( 'role=button[name="Change Format: Standard"i]' )
 		).toBeVisible();
 	} );
 
diff --git a/test/e2e/specs/editor/various/nux.spec.js b/test/e2e/specs/editor/various/nux.spec.js
new file mode 100644
index 00000000000000..ff55dbfa54e478
--- /dev/null
+++ b/test/e2e/specs/editor/various/nux.spec.js
@@ -0,0 +1,138 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'New User Experience (NUX)', () => {
+	test( 'should show the guide to first-time users', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost( { showWelcomeGuide: true } );
+
+		const welcomeGuide = page.getByRole( 'dialog', {
+			name: 'Welcome to the block editor',
+		} );
+		const guideHeading = welcomeGuide.getByRole( 'heading', { level: 1 } );
+		const nextButton = welcomeGuide.getByRole( 'button', { name: 'Next' } );
+		const prevButton = welcomeGuide.getByRole( 'button', {
+			name: 'Previous',
+		} );
+
+		await expect( guideHeading ).toHaveText(
+			'Welcome to the block editor'
+		);
+
+		await nextButton.click();
+		await expect( guideHeading ).toHaveText( 'Make each block your own' );
+
+		await prevButton.click();
+		// Guide should be on page 1 of 4
+		await expect( guideHeading ).toHaveText(
+			'Welcome to the block editor'
+		);
+
+		// Press the button for Page 2.
+		await welcomeGuide
+			.getByRole( 'button', { name: 'Page 2 of 4' } )
+			.click();
+		await expect( guideHeading ).toHaveText( 'Make each block your own' );
+
+		// Press the right arrow key for Page 3.
+		await page.keyboard.press( 'ArrowRight' );
+		await expect( guideHeading ).toHaveText(
+			'Get to know the block library'
+		);
+
+		// Press the right arrow key for Page 4.
+		await page.keyboard.press( 'ArrowRight' );
+		await expect( guideHeading ).toHaveText(
+			'Learn how to use the block editor'
+		);
+
+		// Click on the *visible* 'Get started' button.
+		await welcomeGuide
+			.getByRole( 'button', { name: 'Get started' } )
+			.click();
+
+		// Guide should be closed.
+		await expect( welcomeGuide ).toBeHidden();
+
+		// Reload the editor.
+		await page.reload();
+
+		// Guide should be closed.
+		await expect(
+			editor.canvas.getByRole( 'textbox', { name: 'Add title' } )
+		).toBeVisible();
+		await expect( welcomeGuide ).toBeHidden();
+	} );
+
+	test( 'should not show the welcome guide again if it is dismissed', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost( { showWelcomeGuide: true } );
+
+		const welcomeGuide = page.getByRole( 'dialog', {
+			name: 'Welcome to the block editor',
+		} );
+
+		await expect( welcomeGuide ).toBeVisible();
+		await welcomeGuide.getByRole( 'button', { name: 'Close' } ).click();
+
+		// Reload the editor.
+		await page.reload();
+		await expect(
+			editor.canvas.getByRole( 'textbox', { name: 'Add title' } )
+		).toBeFocused();
+
+		await expect( welcomeGuide ).toBeHidden();
+	} );
+
+	test( 'should focus post title field after welcome guide is dismissed and post is empty', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost( { showWelcomeGuide: true } );
+
+		const welcomeGuide = page.getByRole( 'dialog', {
+			name: 'Welcome to the block editor',
+		} );
+
+		await expect( welcomeGuide ).toBeVisible();
+		await welcomeGuide.getByRole( 'button', { name: 'Close' } ).click();
+
+		await expect(
+			editor.canvas.getByRole( 'textbox', { name: 'Add title' } )
+		).toBeFocused();
+	} );
+
+	test( 'should show the welcome guide if it is manually opened', async ( {
+		admin,
+		page,
+	} ) => {
+		await admin.createNewPost();
+		const welcomeGuide = page.getByRole( 'dialog', {
+			name: 'Welcome to the block editor',
+		} );
+
+		await expect( welcomeGuide ).toBeHidden();
+
+		// Manually open the guide
+		await page
+			.getByRole( 'region', {
+				name: 'Editor top bar',
+			} )
+			.getByRole( 'button', { name: 'Options' } )
+			.click();
+		await page
+			.getByRole( 'menuitemcheckbox', { name: 'Welcome Guide' } )
+			.click();
+
+		await expect( welcomeGuide ).toBeVisible();
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/parsing-patterns.spec.js b/test/e2e/specs/editor/various/parsing-patterns.spec.js
new file mode 100644
index 00000000000000..d8edc544ffa03c
--- /dev/null
+++ b/test/e2e/specs/editor/various/parsing-patterns.spec.js
@@ -0,0 +1,65 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Parsing patterns', () => {
+	test( 'Considers a pattern with whitespace an allowed pattern', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost();
+		await editor.insertBlock( {
+			name: 'core/buttons',
+			innerBlocks: [ { name: 'core/button', attributes: { text: 'a' } } ],
+		} );
+		await page.keyboard.press( 'ArrowDown' );
+		await page.getByLabel( 'Block Inserter' ).click();
+
+		await page.getByRole( 'tab', { name: 'Patterns' } ).click();
+		await page.evaluate( () => {
+			window.wp.data.dispatch( 'core/block-editor' ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'test/whitespace',
+						title: 'Pattern with top-level whitespace',
+						description: '',
+						content: `<!-- wp:button -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button">test</a></div>
+<!-- /wp:button -->
+
+<!-- wp:button -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button">test</a></div>
+<!-- /wp:button -->`,
+					},
+				],
+			} );
+		} );
+
+		// Exit zoom out mode and select the inner buttons block to ensure
+		// the correct insertion point is selected.
+		await page.getByRole( 'button', { name: 'Zoom Out' } ).click();
+		await editor.selectBlocks(
+			editor.canvas.locator( 'role=document[name="Block: Button"i]' )
+		);
+
+		await page.fill(
+			'role=region[name="Block Library"i] >> role=searchbox[name="Search"i]',
+			'whitespace'
+		);
+		await page
+			.locator( 'role=option[name="Pattern with top-level whitespace"i]' )
+			.click();
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/buttons',
+				innerBlocks: [
+					{ name: 'core/button', attributes: { text: 'a' } },
+					{ name: 'core/button', attributes: { text: 'test' } },
+					{ name: 'core/button', attributes: { text: 'test' } },
+				],
+			},
+		] );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/pattern-overrides.spec.js b/test/e2e/specs/editor/various/pattern-overrides.spec.js
new file mode 100644
index 00000000000000..5fbd0e66b5fd02
--- /dev/null
+++ b/test/e2e/specs/editor/various/pattern-overrides.spec.js
@@ -0,0 +1,1146 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+/**
+ * External dependencies
+ */
+const path = require( 'path' );
+
+test.describe( 'Pattern Overrides', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.activateTheme( 'emptytheme' ),
+			requestUtils.deleteAllBlocks(),
+		] );
+	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllBlocks();
+		await requestUtils.deleteAllMedia();
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.activateTheme( 'twentytwentyone' ),
+		] );
+	} );
+
+	test( 'Create a pattern with overrides', async ( {
+		page,
+		admin,
+		editor,
+	} ) => {
+		let patternId;
+		const editableParagraphName = 'Editable Paragraph';
+
+		await test.step( 'Create a synced pattern and assign blocks to allow overrides', async () => {
+			await admin.visitSiteEditor( { postType: 'wp_block' } );
+
+			await page
+				.getByRole( 'region', { name: 'Patterns content' } )
+				.getByRole( 'button', { name: 'add new pattern' } )
+				.click();
+
+			await page
+				.getByRole( 'menu', { name: 'add new pattern' } )
+				.getByRole( 'menuitem', { name: 'add new pattern' } )
+				.click();
+
+			const createPatternDialog = page.getByRole( 'dialog', {
+				name: 'add new pattern',
+			} );
+			await createPatternDialog
+				.getByRole( 'textbox', { name: 'Name' } )
+				.fill( 'Pattern with overrides' );
+			await createPatternDialog
+				.getByRole( 'checkbox', { name: 'Synced' } )
+				.setChecked( true );
+			await createPatternDialog
+				.getByRole( 'button', { name: 'Add' } )
+				.click();
+
+			await editor.canvas
+				.getByRole( 'button', { name: 'Add default block' } )
+				.click();
+			await page.keyboard.type( 'This paragraph can be edited' );
+			await page.keyboard.press( 'Enter' );
+			await page.keyboard.type( "This one can't" );
+
+			await editor.canvas
+				.getByRole( 'document', { name: 'Block: Paragraph' } )
+				.filter( { hasText: 'This paragraph can be edited' } )
+				.focus();
+
+			await editor.clickBlockOptionsMenuItem( 'Rename' );
+			await page
+				.getByRole( 'dialog', { name: 'Rename' } )
+				.getByRole( 'textbox', { name: 'Name' } )
+				.fill( editableParagraphName );
+			await page
+				.getByRole( 'dialog', { name: 'Rename' } )
+				.getByRole( 'button', { name: 'Save' } )
+				.click();
+
+			await editor.openDocumentSettingsSidebar();
+			const editorSettings = page.getByRole( 'region', {
+				name: 'Editor settings',
+			} );
+			await editorSettings
+				.getByRole( 'button', { name: 'Advanced' } )
+				.click();
+			await editorSettings
+				.getByRole( 'button', { name: 'Enable overrides' } )
+				.click();
+			await page
+				.getByRole( 'dialog', { name: 'Enable overrides' } )
+				.getByRole( 'button', { name: 'Enable' } )
+				.click();
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+					attributes: {
+						content: 'This paragraph can be edited',
+						metadata: {
+							name: editableParagraphName,
+							bindings: {
+								__default: {
+									source: 'core/pattern-overrides',
+								},
+							},
+						},
+					},
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: "This one can't" },
+				},
+			] );
+
+			await page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Save' } )
+				.click();
+
+			await expect(
+				page.getByRole( 'button', { name: 'Dismiss this notice' } )
+			).toBeVisible();
+
+			patternId = new URL( page.url() ).searchParams.get( 'postId' );
+		} );
+
+		await test.step( 'Create a post and insert the pattern with overrides', async () => {
+			await admin.createNewPost();
+
+			await editor.insertBlock( {
+				name: 'core/block',
+				attributes: { ref: patternId },
+			} );
+			await editor.insertBlock( {
+				name: 'core/block',
+				attributes: { ref: patternId },
+			} );
+
+			const patternBlocks = editor.canvas.getByRole( 'document', {
+				name: 'Block: Pattern',
+			} );
+			const paragraphs = patternBlocks.first().getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			// Ensure the first pattern is selected.
+			await patternBlocks.first().selectText();
+			await expect( paragraphs.first() ).not.toHaveAttribute(
+				'inert',
+				'true'
+			);
+			await expect( paragraphs.last() ).toHaveAttribute(
+				'inert',
+				'true'
+			);
+
+			await expect( paragraphs.first() ).toHaveText(
+				'This paragraph can be edited'
+			);
+
+			await paragraphs.first().selectText();
+			await page.keyboard.type( 'I would word it this way' );
+
+			// Ensure the second pattern is selected.
+			await patternBlocks.last().selectText();
+			await patternBlocks
+				.last()
+				.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} )
+				.first()
+				.selectText();
+			await page.keyboard.type( 'This one is different' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/block',
+					attributes: {
+						ref: patternId,
+						content: {
+							[ editableParagraphName ]: {
+								content: 'I would word it this way',
+							},
+						},
+					},
+				},
+				{
+					name: 'core/block',
+					attributes: {
+						ref: patternId,
+						content: {
+							[ editableParagraphName ]: {
+								content: 'This one is different',
+							},
+						},
+					},
+				},
+			] );
+
+			await page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Publish' } )
+				.click();
+			const editorPublishPanel = page.getByRole( 'region', {
+				name: 'Editor publish',
+			} );
+			await editorPublishPanel
+				.getByRole( 'button', { name: 'Publish', exact: true } )
+				.click();
+			await editorPublishPanel
+				.getByRole( 'link', { name: 'View post' } )
+				.click();
+
+			await expect( page.locator( 'p' ) ).toContainText( [
+				'I would word it this way',
+				'This one can’t',
+				'This one is different',
+				'This one can’t',
+			] );
+		} );
+	} );
+
+	test( 'retains override values when converting a pattern block to regular blocks', async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const paragraphName = 'paragraph-name';
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:paragraph {"metadata":{"name":"${ paragraphName }","bindings":{"__default":{"source":"core/pattern-overrides"}}}} -->
+<p>Editable</p>
+<!-- /wp:paragraph -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		// Make an edit to the pattern.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.focus();
+		await page.keyboard.type( 'edited ' );
+
+		// Convert back to regular blocks.
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await editor.showBlockToolbar();
+		await editor.clickBlockOptionsMenuItem( 'Detach' );
+
+		// Check that the overrides remain.
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'edited Editable',
+					metadata: { name: paragraphName },
+				},
+			},
+		] );
+	} );
+
+	// See https://github.com/WordPress/gutenberg/pull/62014.
+	test( 'can convert a pattern block to regular blocks when the pattern supports overrides but not override values', async ( {
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const paragraphName = 'paragraph-name';
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:paragraph {"metadata":{"name":"${ paragraphName }","bindings":{"content":{"source":"core/pattern-overrides"}}}} -->
+<p>Editable</p>
+<!-- /wp:paragraph -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		// Convert back to regular blocks.
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await editor.showBlockToolbar();
+		await editor.clickBlockOptionsMenuItem( 'Detach' );
+
+		// Check that the overrides remain.
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'Editable',
+					metadata: { name: paragraphName },
+				},
+			},
+		] );
+	} );
+
+	test( "handles button's link settings", async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+		context,
+	} ) => {
+		const buttonName = 'Editable button';
+		const { id } = await requestUtils.createBlock( {
+			title: 'Button with target',
+			content: `<!-- wp:buttons -->
+<div class="wp-block-buttons"><!-- wp:button {"metadata":{"name":"${ buttonName }","bindings":{"__default":{"source":"core/pattern-overrides"}}}} -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button" href="http://wp.org" target="_blank" rel="noreferrer noopener nofollow">Button</a></div>
+<!-- /wp:button --></div>
+<!-- /wp:buttons -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		// Focus the button, open the link popup.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Button' } )
+			.getByRole( 'textbox', { name: 'Button text' } )
+			.focus();
+		await expect(
+			page.getByRole( 'link', { name: 'wp.org' } ).getByText( '↗' )
+		).toHaveAttribute( 'aria-label', '(opens in a new tab)' );
+
+		// The link popup doesn't have a role which is a bit unfortunate.
+		// These are the buttons in the link popup.
+		const advancedPanel = page.getByRole( 'button', {
+			name: 'Advanced',
+			exact: true,
+		} );
+		const editLinkButton = page.getByRole( 'button', {
+			name: 'Edit link',
+			exact: true,
+		} );
+
+		const saveLinkButton = page.locator(
+			'.block-editor-link-control__search-submit'
+		);
+
+		await editLinkButton.click();
+		if (
+			( await advancedPanel.getAttribute( 'aria-expanded' ) ) === 'false'
+		) {
+			await advancedPanel.click();
+		}
+
+		const openInNewTabCheckbox = page.getByRole( 'checkbox', {
+			name: 'Open in new tab',
+		} );
+		const markAsNoFollowCheckbox = page.getByRole( 'checkbox', {
+			name: 'Mark as nofollow',
+		} );
+		// Both checkboxes are checked.
+		await expect( openInNewTabCheckbox ).toBeChecked();
+		await expect( markAsNoFollowCheckbox ).toBeChecked();
+
+		// Check only the "open in new tab" checkbox.
+		await markAsNoFollowCheckbox.setChecked( false );
+		await saveLinkButton.click();
+
+		const postId = await editor.publishPost();
+		const previewPage = await context.newPage();
+		await previewPage.goto( `/?p=${ postId }` );
+		const buttonLink = previewPage.getByRole( 'link', { name: 'Button' } );
+
+		await expect( buttonLink ).toHaveAttribute( 'target', '_blank' );
+		await expect( buttonLink ).toHaveAttribute(
+			'rel',
+			'noreferrer noopener'
+		);
+
+		// Uncheck both checkboxes.
+		await editLinkButton.click();
+		await openInNewTabCheckbox.setChecked( false );
+		await saveLinkButton.click();
+
+		// Update the post.
+		const updateButton = page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Save' } );
+		await updateButton.click();
+		await expect( updateButton ).toBeDisabled();
+
+		await previewPage.reload();
+		await expect( buttonLink ).toHaveAttribute( 'target', '' );
+		await expect( buttonLink ).toHaveAttribute( 'rel', '' );
+
+		// Check only the "mark as nofollow" checkbox.
+		await editLinkButton.click();
+		await markAsNoFollowCheckbox.setChecked( true );
+		await saveLinkButton.click();
+
+		// Update the post.
+		await updateButton.click();
+		await expect( updateButton ).toBeDisabled();
+
+		await previewPage.reload();
+		await expect( buttonLink ).toHaveAttribute( 'target', '' );
+		await expect( buttonLink ).toHaveAttribute( 'rel', /^\s*nofollow\s*$/ );
+	} );
+
+	test( 'disables editing of nested patterns', async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const paragraphName = 'Editable paragraph';
+		const headingName = 'Editable heading';
+		const innerPattern = await requestUtils.createBlock( {
+			title: 'Inner Pattern',
+			content: `<!-- wp:paragraph {"metadata":{"name":"${ paragraphName }","bindings":{"__default":{"source":"core/pattern-overrides"}}}} -->
+<p>Inner paragraph</p>
+<!-- /wp:paragraph -->`,
+			status: 'publish',
+		} );
+		const outerPattern = await requestUtils.createBlock( {
+			title: 'Outer Pattern',
+			content: `<!-- wp:heading {"metadata":{"name":"${ headingName }","bindings":{"__default":{"source":"core/pattern-overrides"}}}} -->
+<h2 class="wp-block-heading">Outer heading</h2>
+<!-- /wp:heading -->
+<!-- wp:block {"ref":${ innerPattern.id },"content":{"${ paragraphName }":{"content":"Inner paragraph (edited)"}}} /-->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: outerPattern.id },
+		} );
+
+		// Make an edit to the outer pattern heading.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Heading' } )
+			.fill( 'Outer heading (edited)' );
+
+		const postId = await editor.publishPost();
+
+		// Check the pattern has the correct attributes.
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/block',
+				attributes: {
+					ref: outerPattern.id,
+					content: {
+						[ headingName ]: {
+							content: 'Outer heading (edited)',
+						},
+					},
+				},
+				innerBlocks: [],
+			},
+		] );
+		// Check it renders correctly.
+		const headingBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Heading',
+		} );
+		const paragraphBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+		await expect( headingBlock ).toHaveText( 'Outer heading (edited)' );
+		await expect( headingBlock ).not.toHaveAttribute( 'inert', 'true' );
+		await expect( paragraphBlock ).toHaveText( 'Inner paragraph (edited)' );
+		await expect( paragraphBlock ).toHaveAttribute( 'inert', 'true' );
+
+		// Edit the outer pattern.
+		await editor.selectBlocks(
+			editor.canvas
+				.getByRole( 'document', { name: 'Block: Pattern' } )
+				.first()
+		);
+		await editor.showBlockToolbar();
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'Edit original' } )
+			.click();
+
+		// The inner paragraph should be editable in the pattern focus mode.
+		await editor.selectBlocks(
+			editor.canvas
+				.getByRole( 'document', { name: 'Block: Pattern' } )
+				.first()
+		);
+		await expect(
+			editor.canvas.getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} ),
+			'The inner paragraph should be editable'
+		).not.toHaveAttribute( 'inert', 'true' );
+
+		// Visit the post on the frontend.
+		await page.goto( `/?p=${ postId }` );
+
+		await expect( page.getByRole( 'heading', { level: 2 } ) ).toHaveText(
+			'Outer heading (edited)'
+		);
+		await expect(
+			page.getByText( 'Inner paragraph (edited)' )
+		).toBeVisible();
+	} );
+
+	test( 'resets overrides after clicking the reset button', async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const headingName = 'Editable heading';
+		const paragraphName = 'Editable paragraph';
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:heading {"metadata":{"name":"${ headingName }","bindings":{"__default":{"source":"core/pattern-overrides"}}}} -->
+<h2 class="wp-block-heading">Heading</h2>
+<!-- /wp:heading -->
+<!-- wp:paragraph {"metadata":{"name":"${ paragraphName }","bindings":{"__default":{"source":"core/pattern-overrides"}}}} -->
+<p>Paragraph</p>
+<!-- /wp:paragraph -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		// Make an edit to the heading.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Heading' } )
+			.fill( 'Heading (edited)' );
+
+		const patternBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Pattern',
+		} );
+		const headingBlock = patternBlock.getByRole( 'document', {
+			name: 'Block: Heading',
+		} );
+		const paragraphBlock = patternBlock.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+		const resetButton = page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'Reset' } );
+
+		// Assert the pattern block.
+		await editor.selectBlocks( patternBlock );
+		await editor.showBlockToolbar();
+		await expect(
+			resetButton,
+			'The pattern block should have the reset button enabled'
+		).toBeEnabled();
+
+		// Assert the modified heading block with overrides.
+		await editor.selectBlocks( headingBlock );
+		await editor.showBlockToolbar();
+		await expect(
+			resetButton,
+			'The heading block should have the reset button enabled'
+		).toBeEnabled();
+
+		// Assert the unmodified paragraph block (no overrides).
+		await editor.selectBlocks( paragraphBlock );
+		await editor.showBlockToolbar();
+		await expect(
+			resetButton,
+			'The paragraph block should not have the reset button enabled'
+		).toBeDisabled();
+
+		// Reset the whole pattern.
+		await editor.selectBlocks( patternBlock );
+		await editor.showBlockToolbar();
+		await resetButton.click();
+		await expect( headingBlock ).toHaveText( 'Heading' );
+
+		// Undo should work
+		await page
+			.getByRole( 'toolbar', { name: 'Document tools' } )
+			.getByRole( 'button', { name: 'Undo' } )
+			.click();
+		await expect( headingBlock ).toHaveText( 'Heading (edited)' );
+
+		// Reset the individual heading block.
+		await editor.selectBlocks( headingBlock );
+		await editor.showBlockToolbar();
+		await resetButton.click();
+		await expect( headingBlock ).toHaveText( 'Heading' );
+		await editor.selectBlocks( patternBlock );
+		await editor.showBlockToolbar();
+		await expect( resetButton ).toBeDisabled();
+	} );
+
+	// A Undo/Redo bug found when implementing and fixing https://github.com/WordPress/gutenberg/pull/60721.
+	// This could be merged into an existing test after we fully test it.
+	test( 'resets overrides immediately should not break undo/redo', async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const paragraphName = 'Editable paragraph';
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:paragraph {"metadata":{"name":"${ paragraphName }","bindings":{"content":{"source":"core/pattern-overrides"}}}} -->
+<p>Paragraph</p>
+<!-- /wp:paragraph -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		const patternBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Pattern',
+		} );
+		const paragraphBlock = patternBlock.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+		const resetButton = page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'Reset' } );
+		const documentTools = page.getByRole( 'toolbar', {
+			name: 'Document tools',
+		} );
+		const undoButton = documentTools.getByRole( 'button', {
+			name: 'Undo',
+		} );
+		const redoButton = documentTools.getByRole( 'button', {
+			name: 'Redo',
+		} );
+
+		// Make an edit to the paragraph.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.click();
+		await page.keyboard.type( '*' );
+		await expect( paragraphBlock ).toHaveText( 'Paragraph*' );
+
+		// Reset immediately after making the edit.
+		await editor.selectBlocks( paragraphBlock );
+		await editor.showBlockToolbar();
+		await expect( resetButton ).toBeEnabled();
+		await resetButton.click();
+		await expect( paragraphBlock ).toHaveText( 'Paragraph' );
+
+		// Undo/Redo should work
+		await undoButton.click();
+		await expect( paragraphBlock ).toHaveText( 'Paragraph*' );
+		await redoButton.click();
+		await expect( paragraphBlock ).toHaveText( 'Paragraph' );
+	} );
+
+	// Fix https://github.com/WordPress/gutenberg/issues/58708.
+	test( 'overridden empty images should not have upload button', async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const imageName = 'Editable image';
+		const TEST_IMAGE_FILE_PATH = path.resolve(
+			__dirname,
+			'../../../assets/10x10_e2e_test_image_z9T8jK.png'
+		);
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:image {"metadata":{"name":"${ imageName }","bindings":{"__default":{"source":"core/pattern-overrides"}}}} -->
+<figure class="wp-block-image"><img alt=""/></figure>
+<!-- /wp:image -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		const imageBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Image',
+		} );
+		await editor.selectBlocks( imageBlock );
+		await imageBlock
+			.getByTestId( 'form-file-upload-input' )
+			.setInputFiles( TEST_IMAGE_FILE_PATH );
+		await expect( imageBlock.getByRole( 'img' ) ).toHaveCount( 1 );
+		await expect( imageBlock.getByRole( 'img' ) ).toHaveAttribute(
+			'src',
+			/\/wp-content\/uploads\//
+		);
+
+		await editor.publishPost();
+		await page.reload();
+
+		await editor.selectBlocks( imageBlock );
+		await editor.showBlockToolbar();
+		const blockToolbar = page.getByRole( 'toolbar', {
+			name: 'Block tools',
+		} );
+		await expect( imageBlock.getByRole( 'img' ) ).toHaveAttribute(
+			'src',
+			/\/wp-content\/uploads\//
+		);
+		await expect(
+			blockToolbar.getByRole( 'button', { name: 'Replace' } )
+		).toBeEnabled();
+		await expect(
+			blockToolbar.getByRole( 'button', {
+				name: 'Upload to Media Library',
+			} )
+		).toBeHidden();
+	} );
+
+	test( 'overridden images should not have unsupported attributes set', async ( {
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const imageName = 'Editable image';
+		const TEST_IMAGE_FILE_PATH = path.resolve(
+			__dirname,
+			'../../../assets/10x10_e2e_test_image_z9T8jK.png'
+		);
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:image {"metadata":{"name":"${ imageName }","bindings":{"__default":{"source":"core/pattern-overrides"}}}} -->
+<figure class="wp-block-image"><img alt=""/></figure>
+<!-- /wp:image -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		const imageBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Image',
+		} );
+		await editor.selectBlocks( imageBlock );
+		await imageBlock
+			.getByTestId( 'form-file-upload-input' )
+			.setInputFiles( TEST_IMAGE_FILE_PATH );
+		await expect( imageBlock.getByRole( 'img' ) ).toHaveCount( 1 );
+		await expect( imageBlock.getByRole( 'img' ) ).toHaveAttribute(
+			'src',
+			/\/wp-content\/uploads\//
+		);
+
+		// Because the image is an inner block of a controlled pattern block,
+		// `getBlocks` has to be called using the pattern block's client id.
+		const patternBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Pattern',
+		} );
+		const patternClientId = await patternBlock.getAttribute( 'data-block' );
+		const patternInnerBlocks = await editor.getBlocks( {
+			clientId: patternClientId,
+		} );
+
+		// Link is an unsupported attribute, so should be undefined, even though
+		// the image block tries to set its attribute.
+		expect( patternInnerBlocks[ 0 ].attributes.link ).toBe( undefined );
+	} );
+
+	test( 'image block classname and data-id attributes contain the correct media ids when used in a gallery', async ( {
+		admin,
+		editor,
+		page,
+		requestUtils,
+	} ) => {
+		// Upload two images, one for the original pattern, one for the override.
+		const { id: originalImageId, source_url: originalImageSrc } =
+			await requestUtils.uploadMedia(
+				path.resolve(
+					process.cwd(),
+					'test/e2e/assets/10x10_e2e_test_image_z9T8jK.png'
+				)
+			);
+		const { id: overrideImageId, source_url: overrideImageSrc } =
+			await requestUtils.uploadMedia(
+				path.resolve(
+					process.cwd(),
+					'test/e2e/assets/1024x768_e2e_test_image_size.jpeg'
+				)
+			);
+		const overrideName = 'test';
+
+		// Might be overkill, but check that the ids are actually different.
+		expect( overrideImageId ).not.toBe( originalImageId );
+
+		// Create a pattern with a gallery that has a single image with pattern overrides enabled.
+		// It has media that is not yet uploaded.
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:gallery {"linkTo":"none"} -->
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped"><!-- wp:image {"id":${ originalImageId },"sizeSlug":"large","linkDestination":"none","metadata":{"bindings":{"__default":{"source":"core/pattern-overrides"}},"name":"${ overrideName }"}} -->
+<figure class="wp-block-image size-large"><img src="${ originalImageSrc }" alt="" class="wp-image-${ originalImageId }"/></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->`,
+			status: 'publish',
+		} );
+
+		// Insert the pattern into a new post, overriding the image via the pattern block attributes.
+		await admin.createNewPost();
+		const imageAlt = 'Overridden Image';
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: {
+				ref: id,
+				content: {
+					[ overrideName ]: {
+						id: overrideImageId,
+						url: overrideImageSrc,
+						alt: imageAlt,
+					},
+				},
+			},
+		} );
+
+		// Check the image attributes on the frontend.
+		const postId = await editor.publishPost();
+		await page.goto( `/?p=${ postId }` );
+		const imageBlock = page.getByAltText( imageAlt );
+		await expect( imageBlock ).toHaveAttribute(
+			'data-id',
+			`${ overrideImageId }`
+		);
+		await expect( imageBlock ).toHaveAttribute(
+			'class',
+			`wp-image-${ overrideImageId }`
+		);
+	} );
+
+	test( 'image block classname contains the correct media id and has no data-id attribute when used as a standalone image', async ( {
+		admin,
+		editor,
+		page,
+		requestUtils,
+	} ) => {
+		// Upload two images, one for the original pattern, one for the override.
+		const { id: originalImageId, source_url: originalImageSrc } =
+			await requestUtils.uploadMedia(
+				path.resolve(
+					process.cwd(),
+					'test/e2e/assets/10x10_e2e_test_image_z9T8jK.png'
+				)
+			);
+		const { id: overrideImageId, source_url: overrideImageSrc } =
+			await requestUtils.uploadMedia(
+				path.resolve(
+					process.cwd(),
+					'test/e2e/assets/1024x768_e2e_test_image_size.jpeg'
+				)
+			);
+		const overrideName = 'test';
+
+		// Might be overkill, but check that the ids are actually different.
+		expect( overrideImageId ).not.toBe( originalImageId );
+
+		// Create a pattern with a gallery that has a single image with pattern overrides enabled.
+		// It has media that is not yet uploaded.
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:image {"id":${ originalImageId },"sizeSlug":"large","linkDestination":"none","metadata":{"bindings":{"__default":{"source":"core/pattern-overrides"}},"name":"${ overrideName }"}} -->
+<figure class="wp-block-image size-large"><img src="${ originalImageSrc }" alt="" class="wp-image-${ originalImageId }"/></figure>
+<!-- /wp:image -->`,
+			status: 'publish',
+		} );
+
+		// Insert the pattern into a new post, overriding the image via the pattern block attributes.
+		await admin.createNewPost();
+		const imageAlt = 'Overridden Image';
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: {
+				ref: id,
+				content: {
+					[ overrideName ]: {
+						id: overrideImageId,
+						url: overrideImageSrc,
+						alt: imageAlt,
+					},
+				},
+			},
+		} );
+
+		// Check the image attributes on the frontend.
+		const postId = await editor.publishPost();
+		await page.goto( `/?p=${ postId }` );
+		const imageBlock = page.getByAltText( imageAlt );
+		await expect( imageBlock ).not.toHaveAttribute( 'data-id' );
+		await expect( imageBlock ).toHaveAttribute(
+			'class',
+			`wp-image-${ overrideImageId }`
+		);
+	} );
+
+	test( 'blocks with the same name should be synced', async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		let patternId;
+		const sharedName = 'Shared Name';
+
+		await test.step( 'create a pattern with synced blocks with the same name', async () => {
+			const { id } = await requestUtils.createBlock( {
+				title: 'Blocks with the same name',
+				content: `<!-- wp:heading {"metadata":{"name":"${ sharedName }","bindings":{"content":{"source":"core/pattern-overrides"}}}} -->
+			<h2>default name</h2>
+			<!-- /wp:heading -->
+			<!-- wp:paragraph {"metadata":{"name":"${ sharedName }","bindings":{"content":{"source":"core/pattern-overrides"}}}} -->
+			<p>default content</p>
+			<!-- /wp:paragraph -->
+			<!-- wp:paragraph {"metadata":{"name":"${ sharedName }","bindings":{"content":{"source":"core/pattern-overrides"}}}} -->
+			<p>default content</p>
+			<!-- /wp:paragraph -->`,
+				status: 'publish',
+			} );
+			await admin.visitSiteEditor( {
+				postId: id,
+				postType: 'wp_block',
+				canvas: 'edit',
+			} );
+
+			const headingBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Heading',
+			} );
+			const firstParagraph = editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} )
+				.first();
+			const secondParagraph = editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} )
+				.last();
+
+			// Update the content of one of the blocks.
+			await headingBlock.fill( 'updated content' );
+
+			// Check that every content has been updated.
+			for ( const block of [
+				headingBlock,
+				firstParagraph,
+				secondParagraph,
+			] ) {
+				await expect( block ).toHaveText( 'updated content' );
+			}
+
+			await page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Save' } )
+				.click();
+
+			await expect(
+				page.getByRole( 'button', { name: 'Dismiss this notice' } )
+			).toBeVisible();
+
+			patternId = new URL( page.url() ).searchParams.get( 'postId' );
+		} );
+
+		await test.step( 'create a post and insert the pattern with synced values', async () => {
+			await admin.createNewPost();
+
+			await editor.insertBlock( {
+				name: 'core/block',
+				attributes: { ref: patternId },
+			} );
+
+			const headingBlock = editor.canvas.getByRole( 'document', {
+				name: 'Block: Heading',
+			} );
+			const firstParagraph = editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} )
+				.first();
+			const secondParagraph = editor.canvas
+				.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} )
+				.last();
+
+			await firstParagraph.fill( 'overriden content' );
+			await expect( headingBlock ).toHaveText( 'overriden content' );
+			await expect( firstParagraph ).toHaveText( 'overriden content' );
+			await expect( secondParagraph ).toHaveText( 'overriden content' );
+		} );
+	} );
+
+	// https://github.com/WordPress/gutenberg/issues/61610.
+	test( 'unsynced patterns should not be able to enable overrides', async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const pattern = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:paragraph -->
+<p>paragraph</p>
+<!-- /wp:paragraph -->`,
+			status: 'publish',
+			meta: {
+				wp_pattern_sync_status: 'unsynced',
+			},
+		} );
+
+		await admin.visitSiteEditor( {
+			postId: pattern.id,
+			postType: 'wp_block',
+			canvas: 'edit',
+		} );
+
+		const paragraph = editor.canvas.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+		await editor.selectBlocks( paragraph );
+		await editor.openDocumentSettingsSidebar();
+
+		const editorSettings = page.getByRole( 'region', {
+			name: 'Editor settings',
+		} );
+		await editorSettings
+			.getByRole( 'button', { name: 'Advanced' } )
+			.click();
+		await expect(
+			editorSettings.getByRole( 'button', { name: 'Enable overrides' } )
+		).toBeHidden();
+	} );
+
+	// @see https://github.com/WordPress/gutenberg/pull/60694
+	test( 'handles back-compat from individual attributes to __default', async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const imageName = 'Editable image';
+		const TEST_IMAGE_FILE_PATH = path.resolve(
+			__dirname,
+			'../../../assets/10x10_e2e_test_image_z9T8jK.png'
+		);
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:image {"metadata":{"name":"${ imageName }","bindings":{"id":{"source":"core/pattern-overrides"},"url":{"source":"core/pattern-overrides"},"title":{"source":"core/pattern-overrides"},"alt":{"source":"core/pattern-overrides"}}}} -->
+<figure class="wp-block-image"><img alt=""/></figure>
+<!-- /wp:image -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		const blocks = await editor.getBlocks( { full: true } );
+		expect( blocks ).toMatchObject( [
+			{
+				name: 'core/block',
+				attributes: { ref: id },
+			},
+		] );
+		expect(
+			await editor.getBlocks( { clientId: blocks[ 0 ].clientId } )
+		).toMatchObject( [
+			{
+				name: 'core/image',
+				attributes: {
+					metadata: {
+						name: imageName,
+						bindings: {
+							__default: {
+								source: 'core/pattern-overrides',
+							},
+						},
+					},
+				},
+			},
+		] );
+
+		const imageBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Image',
+		} );
+		await editor.selectBlocks( imageBlock );
+		await imageBlock
+			.getByTestId( 'form-file-upload-input' )
+			.setInputFiles( TEST_IMAGE_FILE_PATH );
+		await expect( imageBlock.getByRole( 'img' ) ).toHaveCount( 1 );
+		await expect( imageBlock.getByRole( 'img' ) ).toHaveAttribute(
+			'src',
+			/\/wp-content\/uploads\//
+		);
+		await editor.showBlockToolbar();
+		await editor.clickBlockToolbarButton( 'Alternative text' );
+		await page
+			.getByRole( 'textbox', { name: 'alternative text' } )
+			.fill( 'Test Image' );
+
+		const postId = await editor.publishPost();
+
+		await page.goto( `/?p=${ postId }` );
+		await expect(
+			page.getByRole( 'img', { name: 'Test Image' } )
+		).toHaveAttribute( 'src', /\/wp-content\/uploads\// );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/patterns.spec.js b/test/e2e/specs/editor/various/patterns.spec.js
index 4b47b2dd70a358..00a68a9f08ea55 100644
--- a/test/e2e/specs/editor/various/patterns.spec.js
+++ b/test/e2e/specs/editor/various/patterns.spec.js
@@ -37,7 +37,7 @@ test.describe( 'Unsynced pattern', () => {
 		await page.getByRole( 'menuitem', { name: 'Create pattern' } ).click();
 
 		const createPatternDialog = page.getByRole( 'dialog', {
-			name: 'Create pattern',
+			name: 'add new pattern',
 		} );
 		await createPatternDialog
 			.getByRole( 'textbox', { name: 'Name' } )
@@ -63,22 +63,39 @@ test.describe( 'Unsynced pattern', () => {
 
 		// Check that the new pattern is available in the inserter and that it gets inserted as
 		// a plain paragraph block.
-		await page.getByLabel( 'Toggle block inserter' ).click();
+		await page.getByLabel( 'Block Inserter' ).click();
 		await page
 			.getByRole( 'tab', {
 				name: 'Patterns',
 			} )
 			.click();
 		await page
-			.getByRole( 'button', {
+			.getByRole( 'tab', {
 				name: newCategory,
 			} )
 			.click();
-		await page.getByLabel( 'My unsynced pattern' ).click();
+		const pattern = page.getByLabel( 'My unsynced pattern' ).first();
 
-		await expect
-			.poll( editor.getBlocks )
-			.toEqual( [ ...before, ...before ] );
+		const insertedPatternId = await pattern.evaluate(
+			( element ) => element.id
+		);
+
+		await pattern.click();
+
+		await expect.poll( editor.getBlocks ).toEqual( [
+			...before,
+			{
+				...before[ 0 ],
+				attributes: {
+					...before[ 0 ].attributes,
+					metadata: {
+						categories: [ 'contact-details' ],
+						name: 'My unsynced pattern',
+						patternName: insertedPatternId,
+					},
+				},
+			},
+		] );
 	} );
 } );
 
@@ -93,6 +110,7 @@ test.describe( 'Synced pattern', () => {
 	} );
 
 	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllPosts();
 		await requestUtils.deleteAllBlocks();
 		await requestUtils.deleteAllPatternCategories();
 	} );
@@ -103,7 +121,10 @@ test.describe( 'Synced pattern', () => {
 	} ) => {
 		await editor.insertBlock( {
 			name: 'core/paragraph',
-			attributes: { content: 'A useful paragraph to reuse' },
+			attributes: {
+				anchor: 'reused-paragraph',
+				content: 'A useful paragraph to reuse',
+			},
 		} );
 
 		// Create a synced pattern from the paragraph block.
@@ -115,7 +136,7 @@ test.describe( 'Synced pattern', () => {
 		await page.getByRole( 'menuitem', { name: 'Create pattern' } ).click();
 
 		const createPatternDialog = page.getByRole( 'dialog', {
-			name: 'Create pattern',
+			name: 'add new pattern',
 		} );
 		await createPatternDialog
 			.getByRole( 'textbox', { name: 'Name' } )
@@ -129,42 +150,480 @@ test.describe( 'Synced pattern', () => {
 			.setChecked( true );
 
 		await createPatternDialog
-			.getByRole( 'button', { name: 'Create' } )
+			.getByRole( 'button', { name: 'Add' } )
 			.click();
 
-		await expect
-			.poll(
-				editor.getBlocks,
-				'The block content should be wrapped by a pattern block wrapper'
-			)
-			.toEqual( [
-				{
-					name: 'core/block',
-					attributes: { ref: expect.any( Number ) },
-					innerBlocks: [],
-				},
-			] );
-		const after = await editor.getBlocks();
-
+		// Check the pattern is focused.
 		const patternBlock = editor.canvas.getByRole( 'document', {
 			name: 'Block: Pattern',
 		} );
 		await expect( patternBlock ).toBeFocused();
 
+		// Check that only the pattern block is present.
+		const existingBlocks = await editor.getBlocks();
+		expect(
+			existingBlocks.every( ( block ) => block.name === 'core/block' )
+		).toBe( true );
+
 		// Check that the new pattern is available in the inserter.
-		await page.getByLabel( 'Toggle block inserter' ).click();
+		await page.getByLabel( 'Block Inserter' ).click();
 		await page
 			.getByRole( 'tab', {
 				name: 'Patterns',
 			} )
 			.click();
 		await page
-			.getByRole( 'button', {
+			.getByRole( 'tab', {
 				name: newCategory,
 			} )
 			.click();
 		await page.getByRole( 'option', { name: 'My synced pattern' } ).click();
 
-		await expect.poll( editor.getBlocks ).toEqual( [ ...after, ...after ] );
+		const [ firstSyncedPattern, secondSyncedPattern ] =
+			await editor.getBlocks();
+		// Check they are both patterns.
+		expect( firstSyncedPattern.name ).toBe( 'core/block' );
+		expect( secondSyncedPattern.name ).toBe( 'core/block' );
+		// Check they have the same ref.
+		expect( firstSyncedPattern.attributes.ref ).toEqual(
+			secondSyncedPattern.attributes.ref
+		);
+
+		// Check that the frontend shows the content of the pattern.
+		const postId = await editor.publishPost();
+		await page.goto( `/?p=${ postId }` );
+		const [ firstParagraph, secondParagraph ] = await page
+			.locator( '#reused-paragraph' )
+			.all();
+
+		await expect( firstParagraph ).toHaveText(
+			'A useful paragraph to reuse'
+		);
+		await expect( secondParagraph ).toHaveText(
+			'A useful paragraph to reuse'
+		);
+	} );
+
+	// Check for regressions of https://github.com/WordPress/gutenberg/issues/33072.
+	test( 'can be saved when modified inside of a published post', async ( {
+		page,
+		requestUtils,
+		editor,
+	} ) => {
+		const { id } = await requestUtils.createBlock( {
+			title: 'Alternative greeting block',
+			content:
+				'<!-- wp:paragraph -->\n<p id="reused-paragraph">Guten Tag!</p>\n<!-- /wp:paragraph -->',
+			status: 'publish',
+		} );
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		const postId = await editor.publishPost();
+
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await editor.showBlockToolbar();
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', {
+				name: 'Edit original',
+			} )
+			.click();
+
+		const editorTopBar = page.getByRole( 'region', {
+			name: 'Editor top bar',
+		} );
+
+		// Navigate to the pattern focus mode.
+		await expect(
+			editorTopBar.getByRole( 'heading', {
+				name: 'Alternative greeting block',
+				level: 1,
+			} )
+		).toBeVisible();
+
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Paragraph' } )
+		);
+
+		// Change the block's content.
+		await page.keyboard.type( 'Einen ' );
+
+		// Save the reusable block and update the post.
+		await editorTopBar.getByRole( 'button', { name: 'Save' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Pattern updated.' } )
+			.click();
+
+		// Check that the frontend shows the updated content.
+		await page.goto( `/?p=${ postId }` );
+		await expect( page.locator( '#reused-paragraph' ) ).toHaveText(
+			'Einen Guten Tag!'
+		);
+	} );
+
+	// Check for regressions of https://github.com/WordPress/gutenberg/issues/26421.
+	test( 'allows conversion back to blocks when the reusable block has unsaved edits', async ( {
+		page,
+		requestUtils,
+		editor,
+	} ) => {
+		const { id } = await requestUtils.createBlock( {
+			title: 'Synced pattern',
+			content:
+				'<!-- wp:paragraph -->\n<p>Before Edit</p>\n<!-- /wp:paragraph -->',
+			status: 'publish',
+		} );
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', {
+				name: 'Edit original',
+			} )
+			.click();
+
+		const editorTopBar = page.getByRole( 'region', {
+			name: 'Editor top bar',
+		} );
+
+		// Navigate to the pattern focus mode.
+		await expect(
+			editorTopBar.getByRole( 'heading', {
+				name: 'Synced pattern',
+				level: 1,
+			} )
+		).toBeVisible();
+
+		// Make an edit to the source pattern.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.fill( 'After Edit' );
+
+		// Go back to the post.
+		await editorTopBar.getByRole( 'button', { name: 'Back' } ).click();
+
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await editor.clickBlockOptionsMenuItem( 'Detach' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'After Edit' },
+			},
+		] );
+	} );
+
+	test( 'can be created, inserted, and converted to a regular block', async ( {
+		editor,
+		requestUtils,
+	} ) => {
+		const { id } = await requestUtils.createBlock( {
+			title: 'Greeting block',
+			content:
+				'<!-- wp:paragraph -->\n<p>Hello there!</p>\n<!-- /wp:paragraph -->',
+			status: 'publish',
+		} );
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		// Check that only the pattern block is present.
+		const existingBlocks = await editor.getBlocks();
+		expect(
+			existingBlocks.every( ( block ) => block.name === 'core/block' )
+		).toBe( true );
+
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await editor.clickBlockOptionsMenuItem( 'Detach' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'Hello there!' },
+			},
+		] );
+	} );
+
+	test( 'can be inserted after refresh', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Awesome Paragraph' },
+		} );
+		await editor.clickBlockOptionsMenuItem( 'Create pattern' );
+
+		const createPatternDialog = page.getByRole( 'dialog', {
+			name: 'add new pattern',
+		} );
+		await createPatternDialog
+			.getByRole( 'textbox', { name: 'Name' } )
+			.fill( 'Awesome block' );
+		await createPatternDialog
+			.getByRole( 'checkbox', { name: 'Synced' } )
+			.setChecked( true );
+		await createPatternDialog
+			.getByRole( 'button', { name: 'Add' } )
+			.click();
+
+		// Wait until the pattern is created.
+		await expect(
+			editor.canvas.getByRole( 'document', {
+				name: 'Block: Pattern',
+			} )
+		).toBeVisible();
+
+		await admin.createNewPost();
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '/Awesome block' );
+		await page.getByRole( 'option', { name: 'Awesome block' } ).click();
+
+		// Check that the pattern block is present.
+		const existingBlocks = await editor.getBlocks();
+		expect(
+			existingBlocks.every( ( block ) => block.name === 'core/block' )
+		).toBe( true );
+	} );
+
+	test( 'can be created from multiselection and converted back to regular blocks', async ( {
+		editor,
+		pageUtils,
+	} ) => {
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Hello there!' },
+		} );
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Second paragraph' },
+		} );
+
+		await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+		await editor.clickBlockOptionsMenuItem( 'Create pattern' );
+
+		const createPatternDialog = editor.page.getByRole( 'dialog', {
+			name: 'add new pattern',
+		} );
+		await createPatternDialog
+			.getByRole( 'textbox', { name: 'Name' } )
+			.fill( 'Multi-selection reusable block' );
+		await createPatternDialog
+			.getByRole( 'checkbox', { name: 'Synced' } )
+			.setChecked( true );
+		await createPatternDialog
+			.getByRole( 'button', { name: 'Add' } )
+			.click();
+
+		// Wait until the pattern is created.
+		await expect(
+			editor.canvas.getByRole( 'document', {
+				name: 'Block: Pattern',
+			} )
+		).toBeVisible();
+
+		// Check that only the pattern block is present.
+		const existingBlocks = await editor.getBlocks();
+		expect(
+			existingBlocks.every( ( block ) => block.name === 'core/block' )
+		).toBe( true );
+
+		// Convert the pattern back to regular blocks.
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await editor.clickBlockOptionsMenuItem( 'Detach' );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'Hello there!' },
+			},
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'Second paragraph' },
+			},
+		] );
+	} );
+
+	// Check for regressions of https://github.com/WordPress/gutenberg/pull/26484.
+	test( 'will not break the editor if empty', async ( {
+		editor,
+		page,
+		requestUtils,
+	} ) => {
+		const { id } = await requestUtils.createBlock( {
+			title: 'Awesome empty',
+			content: '',
+			status: 'publish',
+		} );
+
+		let hasError = false;
+		page.on( 'console', ( msg ) => {
+			if ( msg.type() === 'error' ) {
+				hasError = true;
+			}
+		} );
+
+		// Need to reload the page to make pattern available in the store.
+		await page.reload();
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		await page
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+		await page
+			.getByRole( 'searchbox', {
+				name: 'Search',
+			} )
+			.fill( 'Awesome empty' );
+
+		await expect(
+			page
+				.getByRole( 'listbox', { name: 'Block patterns' } )
+				.getByRole( 'option', {
+					name: 'Awesome empty',
+				} )
+		).toBeVisible();
+		expect( hasError ).toBe( false );
+	} );
+
+	test( 'should show a proper message when the reusable block is missing', async ( {
+		editor,
+	} ) => {
+		// Insert a non-existant reusable block.
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: 123456 },
+		} );
+
+		await expect(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		).toContainText( 'Block has been deleted or is unavailable.' );
+	} );
+
+	test( 'should be able to insert a reusable block twice', async ( {
+		editor,
+		page,
+		pageUtils,
+		requestUtils,
+	} ) => {
+		const { id } = await requestUtils.createBlock( {
+			title: 'Duplicated reusable block',
+			content:
+				'<!-- wp:paragraph -->\n<p>Awesome Paragraph</p>\n<!-- /wp:paragraph -->',
+			status: 'publish',
+		} );
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		await editor.saveDraft();
+		await editor.selectBlocks(
+			editor.canvas
+				.getByRole( 'document', { name: 'Block: Pattern' } )
+				.first()
+		);
+		await editor.showBlockToolbar();
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'Edit original' } )
+			.click();
+
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.click();
+		await pageUtils.pressKeys( 'primary+a' );
+		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.type( ' modified' );
+
+		const editorTopBar = page.getByRole( 'region', {
+			name: 'Editor top bar',
+		} );
+
+		await editorTopBar.getByRole( 'button', { name: 'Save' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Pattern updated.' } )
+			.click();
+		await editorTopBar.getByRole( 'button', { name: 'Back' } ).click();
+
+		await expect(
+			editor.canvas
+				.getByRole( 'document', { name: 'Block: Paragraph' } )
+				.filter( { hasText: 'Awesome Paragraph modified' } )
+		).toHaveCount( 2 );
+	} );
+
+	// Check for regressions of https://github.com/WordPress/gutenberg/issues/27243.
+	test( 'should allow a block with styles to be converted to a reusable block', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.insertBlock( { name: 'core/quote' } );
+		await editor.saveDraft();
+		await page.reload();
+
+		await editor.openDocumentSettingsSidebar();
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Quote' } )
+		);
+
+		// The quote block should have a visible preview in the sidebar for this test to be valid.
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor settings' } )
+				.getByRole( 'button', { name: 'Styles', exact: true } )
+		).toBeVisible();
+
+		await editor.clickBlockOptionsMenuItem( 'Create pattern' );
+
+		const createPatternDialog = editor.page.getByRole( 'dialog', {
+			name: 'add new pattern',
+		} );
+		await createPatternDialog
+			.getByRole( 'textbox', { name: 'Name' } )
+			.fill( 'Block with styles' );
+		await createPatternDialog
+			.getByRole( 'checkbox', { name: 'Synced' } )
+			.setChecked( true );
+		await createPatternDialog
+			.getByRole( 'button', { name: 'Add' } )
+			.click();
+
+		await expect(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		).toBeVisible();
 	} );
 } );
diff --git a/test/e2e/specs/editor/various/post-editor-template-mode.spec.js b/test/e2e/specs/editor/various/post-editor-template-mode.spec.js
index f862c32556e061..981f8ccbbd5d38 100644
--- a/test/e2e/specs/editor/various/post-editor-template-mode.spec.js
+++ b/test/e2e/specs/editor/various/post-editor-template-mode.spec.js
@@ -57,8 +57,15 @@ test.describe( 'Post Editor Template mode', () => {
 		);
 
 		// Save changes.
-		await page.click( 'role=button[name="Publish"i]' );
-		await page.click( 'role=button[name="Save"i]' );
+		await page.click( 'role=button[name="Back"i]' );
+		await page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Save', exact: true } )
+			.click();
+		await page
+			.getByRole( 'region', { name: 'Editor publish' } )
+			.getByRole( 'button', { name: 'Save', exact: true } )
+			.click();
 
 		// Preview changes.
 		const previewPage = await editor.openPreviewPage();
@@ -70,6 +77,42 @@ test.describe( 'Post Editor Template mode', () => {
 		).toBeVisible();
 	} );
 
+	test( 'Swap templates and proper template resolution when switching to default template', async ( {
+		editor,
+		page,
+		requestUtils,
+		postEditorTemplateMode,
+	} ) => {
+		await requestUtils.activateTheme( 'emptytheme' );
+		await postEditorTemplateMode.createPostAndSaveDraft();
+		await page.reload();
+		await postEditorTemplateMode.disableTemplateWelcomeGuide();
+		await postEditorTemplateMode.openTemplatePopover();
+		// Swap to a custom template, save and reload.
+		await page
+			.getByRole( 'menuitem', {
+				name: 'Swap template',
+			} )
+			.click();
+		await page
+			.getByRole( 'option', {
+				name: 'Custom',
+			} )
+			.click();
+		await editor.saveDraft();
+		await page.reload();
+		// Swap to the default template.
+		await postEditorTemplateMode.openTemplatePopover();
+		await page
+			.getByRole( 'menuitem', {
+				name: 'Use default template',
+			} )
+			.click();
+		await expect(
+			page.getByRole( 'button', { name: 'Template options' } )
+		).toHaveText( 'Single Entries' );
+	} );
+
 	test( 'Allow creating custom block templates in classic themes', async ( {
 		editor,
 		page,
@@ -131,7 +174,9 @@ class PostEditorTemplateMode {
 
 		// Only match the beginning of Select template: because it contains the template name or slug afterwards.
 		await this.editorSettingsSidebar
-			.locator( 'role=button[name^="Select template"i]' )
+			.getByRole( 'button', {
+				name: 'Template options',
+			} )
 			.click();
 	}
 
@@ -139,8 +184,11 @@ class PostEditorTemplateMode {
 		await this.disableTemplateWelcomeGuide();
 
 		await this.openTemplatePopover();
-
-		await this.page.locator( 'role=button[name="Edit template"i]' ).click();
+		await this.page
+			.getByRole( 'menuitem', {
+				name: 'Edit template',
+			} )
+			.click();
 
 		// Check that we switched properly to edit mode.
 		await this.page.waitForSelector(
@@ -148,7 +196,7 @@ class PostEditorTemplateMode {
 		);
 
 		const title = this.editorTopBar.getByRole( 'heading', {
-			name: 'Editing template: Single Entries',
+			name: 'Single Entries',
 		} );
 
 		await expect( title ).toBeVisible();
@@ -208,18 +256,20 @@ class PostEditorTemplateMode {
 	}
 
 	async saveTemplateWithoutPublishing() {
-		await this.page.click( 'role=button[name="Publish"i]' );
-		const editorPublishRegion = this.page.locator(
-			'role=region[name="Editor publish"i]'
-		);
-		const saveButton = editorPublishRegion.locator(
-			'role=button[name="Save"i]'
-		);
-		await saveButton.click();
+		await this.page.click( 'role=button[name="Back"i]' );
+		await this.page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Save', exact: true } )
+			.click();
+		const editorPublishRegion = this.page.getByRole( 'region', {
+			name: 'Editor publish',
+		} );
+		await editorPublishRegion
+			.getByRole( 'button', { name: 'Save', exact: true } )
+			.click();
 		// Avoid publishing the post.
-		const cancelButton = editorPublishRegion.locator(
-			'role=button[name="Cancel"i]'
-		);
-		await cancelButton.click();
+		await editorPublishRegion
+			.getByRole( 'button', { name: 'Cancel' } )
+			.click();
 	}
 }
diff --git a/test/e2e/specs/editor/various/post-title.spec.js b/test/e2e/specs/editor/various/post-title.spec.js
index 3c2330d1684d03..1abf94f821574b 100644
--- a/test/e2e/specs/editor/various/post-title.spec.js
+++ b/test/e2e/specs/editor/various/post-title.spec.js
@@ -7,6 +7,7 @@ test.describe( 'Post title', () => {
 	test.describe( 'Focus handling', () => {
 		test( 'should focus on the post title field when creating a new post in visual mode', async ( {
 			editor,
+			page,
 			admin,
 		} ) => {
 			await admin.createNewPost();
@@ -16,6 +17,13 @@ test.describe( 'Post title', () => {
 			} );
 
 			await expect( pageTitleField ).toBeFocused();
+			await page.keyboard.press( 'Enter' );
+			await expect(
+				editor.canvas.getByRole( 'document', {
+					name: 'Empty block',
+				} ),
+				'sould move focus to an empty paragraph block when the Enter key is pressed'
+			).toBeFocused();
 		} );
 
 		test( 'should focus on the post title field when creating a new post in code editor mode', async ( {
diff --git a/test/e2e/specs/editor/various/post-visibility.spec.js b/test/e2e/specs/editor/various/post-visibility.spec.js
index 365209ef2e4e55..67c8597953815b 100644
--- a/test/e2e/specs/editor/various/post-visibility.spec.js
+++ b/test/e2e/specs/editor/various/post-visibility.spec.js
@@ -17,13 +17,10 @@ test.describe( 'Post visibility', () => {
 
 			await editor.openDocumentSettingsSidebar();
 
-			await page.click(
-				'role=button[name="Select visibility: Public"i]'
-			);
-
-			await page.click( 'role=radio[name="Private"i]' );
-
-			await page.click( 'role=button[name="OK"i]' );
+			await page
+				.getByRole( 'button', { name: 'Change status:' } )
+				.click();
+			await page.getByRole( 'radio', { name: 'Private' } ).click();
 
 			const currentStatus = await page.evaluate( () => {
 				return window.wp.data
@@ -33,41 +30,6 @@ test.describe( 'Post visibility', () => {
 
 			expect( currentStatus ).toBe( 'private' );
 		} );
-
-		test( `can be canceled when the viewport is ${ viewport }`, async ( {
-			page,
-			pageUtils,
-			admin,
-			editor,
-		} ) => {
-			await pageUtils.setBrowserViewport( viewport );
-
-			await admin.createNewPost();
-
-			await editor.openDocumentSettingsSidebar();
-
-			const initialStatus = await page.evaluate( () => {
-				return window.wp.data
-					.select( 'core/editor' )
-					.getEditedPostAttribute( 'status' );
-			} );
-
-			await page.click(
-				'role=button[name="Select visibility: Public"i]'
-			);
-
-			await page.click( 'role=radio[name="Private"i]' );
-
-			await page.click( 'role=button[name="Cancel"i]' );
-
-			const currentStatus = await page.evaluate( () => {
-				return window.wp.data
-					.select( 'core/editor' )
-					.getEditedPostAttribute( 'status' );
-			} );
-
-			expect( initialStatus ).toBe( currentStatus );
-		} );
 	} );
 
 	test( 'visibility remains private even if the publish date is in the future', async ( {
@@ -89,12 +51,21 @@ test.describe( 'Post visibility', () => {
 
 		await page.click( 'role=button[name="View next month"i]' );
 		await page.click( 'role=application[name="Calendar"] >> text=15' );
-
-		await page.click( 'role=button[name="Select visibility: Public"i]' );
-
-		await page.click( 'role=radio[name="Private"i]' );
-
-		await page.click( 'role=button[name="OK"i]' );
+		await page
+			.locator( '.block-editor-publish-date-time-picker' )
+			.getByRole( 'button', {
+				name: 'Close',
+			} )
+			.click();
+		await page.getByRole( 'button', { name: 'Change status:' } ).click();
+		await page.getByRole( 'radio', { name: 'Private' } ).click();
+		await page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', {
+				name: 'Save',
+				exact: true,
+			} )
+			.click();
 
 		const currentStatus = await page.evaluate( () => {
 			return window.wp.data
diff --git a/test/e2e/specs/editor/various/pref-modal.spec.js b/test/e2e/specs/editor/various/pref-modal.spec.js
index f99c7d32a22a94..08c3cd322586a1 100644
--- a/test/e2e/specs/editor/various/pref-modal.spec.js
+++ b/test/e2e/specs/editor/various/pref-modal.spec.js
@@ -9,7 +9,7 @@ test.describe( 'Preferences modal', () => {
 	} );
 
 	test.describe( 'Preferences modal adaps to viewport', () => {
-		test( 'Enable pre-publish flow is visible on desktop ', async ( {
+		test( 'Enable pre-publish checks is visible on desktop ', async ( {
 			page,
 		} ) => {
 			await page.click(
@@ -18,14 +18,14 @@ test.describe( 'Preferences modal', () => {
 			await page.click( 'role=menuitem[name="Preferences"i]' );
 
 			const prePublishToggle = page.locator(
-				'role=checkbox[name="Enable pre-publish flow"i]'
+				'role=checkbox[name="Enable pre-publish checks"i]'
 			);
 
 			await expect( prePublishToggle ).toBeVisible();
 		} );
 	} );
 	test.describe( 'Preferences modal adaps to viewport', () => {
-		test( 'Enable pre-publish flow is not visible on mobile ', async ( {
+		test( 'Enable pre-publish checks is not visible on mobile ', async ( {
 			page,
 		} ) => {
 			await page.setViewportSize( { width: 500, height: 800 } );
@@ -44,7 +44,7 @@ test.describe( 'Preferences modal', () => {
 			);
 
 			const prePublishToggle = page.locator(
-				'role=checkbox[name="Enable pre-publish flow"i]'
+				'role=checkbox[name="Enable pre-publish checks"i]'
 			);
 
 			await expect( generalButton ).toBeVisible();
diff --git a/test/e2e/specs/editor/various/preferences.spec.js b/test/e2e/specs/editor/various/preferences.spec.js
new file mode 100644
index 00000000000000..89df0ae7ed9f77
--- /dev/null
+++ b/test/e2e/specs/editor/various/preferences.spec.js
@@ -0,0 +1,50 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Preferences', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'remembers sidebar dismissal between sessions', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.openDocumentSettingsSidebar();
+
+		const editorSettings = page.getByRole( 'region', {
+			name: 'Editor settings',
+		} );
+		const activeTab = editorSettings.getByRole( 'tab', { selected: true } );
+
+		// Open by default.
+		await expect( activeTab ).toHaveText( 'Post' );
+
+		// Change to "Block" tab.
+		await editorSettings.getByRole( 'tab', { name: 'Block' } ).click();
+		await expect( activeTab ).toHaveText( 'Block' );
+
+		/**
+		 * Regression test: Reload resets to document tab.
+		 *
+		 * See: https://github.com/WordPress/gutenberg/issues/6377
+		 * See: https://github.com/WordPress/gutenberg/pull/8995
+		 */
+		await page.reload();
+		await expect( activeTab ).toHaveText( 'Post' );
+
+		// Dismiss.
+		await editorSettings
+			.getByRole( 'button', {
+				name: 'Close Settings',
+			} )
+			.click();
+		await expect( activeTab ).toBeHidden();
+
+		// Remember after reload.
+		await page.reload();
+		await expect( activeTab ).toBeHidden();
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/preview.spec.js b/test/e2e/specs/editor/various/preview.spec.js
index 0666de1405fae1..e15f143983b742 100644
--- a/test/e2e/specs/editor/various/preview.spec.js
+++ b/test/e2e/specs/editor/various/preview.spec.js
@@ -22,11 +22,6 @@ test.describe( 'Preview', () => {
 	} ) => {
 		const editorPage = page;
 
-		// Disabled until content present.
-		await expect(
-			editorPage.locator( 'role=button[name="Preview"i]' )
-		).toBeDisabled();
-
 		await editor.canvas
 			.locator( 'role=textbox[name="Add title"i]' )
 			.type( 'Hello World' );
@@ -188,12 +183,15 @@ test.describe( 'Preview', () => {
 
 		// Return to editor and switch to Draft.
 		await editorPage.bringToFront();
+		await page.getByRole( 'button', { name: 'Change status:' } ).click();
+		await page.getByRole( 'radio', { name: 'Draft' } ).click();
 		await page
-			.getByRole( 'region', { name: 'Editor settings' } )
-			.getByRole( 'button', { name: 'Switch to draft' } )
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', {
+				name: 'Save',
+				exact: true,
+			} )
 			.click();
-		// FIXME: The confirmation dialog is not named yet.
-		await page.click( 'role=dialog >> role=button[name="OK"i]' );
 
 		// Wait for the status change.
 		// @see https://github.com/WordPress/gutenberg/pull/43933
@@ -301,7 +299,7 @@ test.describe( 'Preview with private custom post type', () => {
 		} );
 
 		// Open the view menu.
-		await page.click( 'role=button[name="Preview"i]' );
+		await page.click( 'role=button[name="View"i]' );
 
 		await expect(
 			page.locator( 'role=menuitem[name="Preview in new tab"i]' )
@@ -316,7 +314,7 @@ class PreviewUtils {
 
 	async waitForPreviewNavigation( previewPage ) {
 		const previewToggle = this.page.locator(
-			'role=button[name="Preview"i][expanded=false]'
+			'role=button[name="View"i][expanded=false]'
 		);
 		const isDropdownClosed = await previewToggle.isVisible();
 		if ( isDropdownClosed ) {
diff --git a/test/e2e/specs/editor/various/publish-button.spec.js b/test/e2e/specs/editor/various/publish-button.spec.js
index b1e4b07a28580f..cdc9c1a9936361 100644
--- a/test/e2e/specs/editor/various/publish-button.spec.js
+++ b/test/e2e/specs/editor/various/publish-button.spec.js
@@ -42,18 +42,20 @@ test.describe( 'Post publish button', () => {
 			topBar.getByRole( 'button', { name: 'Publish' } )
 		).toBeEnabled();
 
-		const postId = new URL( page.url() ).searchParams.get( 'post' );
 		const deferred = defer();
 
 		await page.route(
 			( url ) =>
-				url.searchParams.has(
-					'rest_route',
-					encodeURIComponent( `/wp/v2/posts/${ postId }` )
+				url.href.includes(
+					`rest_route=${ encodeURIComponent( '/wp/v2/posts/' ) }`
 				),
-			async ( route ) => {
-				await deferred;
-				await route.continue();
+			async ( route, request ) => {
+				if ( request.method() === 'POST' ) {
+					await deferred;
+					await route.continue();
+				} else {
+					await route.continue();
+				}
 			}
 		);
 
@@ -68,13 +70,12 @@ test.describe( 'Post publish button', () => {
 		admin,
 		page,
 		requestUtils,
+		editor,
 	} ) => {
 		await requestUtils.activatePlugin( 'gutenberg-test-plugin-meta-box' );
 		await admin.createNewPost();
-		await page
-			.getByRole( 'textbox', {
-				name: 'Add title',
-			} )
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'Test post' );
 
 		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
diff --git a/test/e2e/specs/editor/various/publish-panel.spec.js b/test/e2e/specs/editor/various/publish-panel.spec.js
index 1ea72d7eb11a22..1fe94ff334f3b2 100644
--- a/test/e2e/specs/editor/various/publish-panel.spec.js
+++ b/test/e2e/specs/editor/various/publish-panel.spec.js
@@ -53,8 +53,64 @@ test.describe( 'Post publish panel', () => {
 		// Test focus is moved back to the Publish panel toggle button.
 		await expect(
 			page.locator(
-				'role=region[name="Editor top bar"i] >> role=button[name="Update"i]'
+				'role=region[name="Editor top bar"i] >> role=button[name="Save"i]'
 			)
 		).toBeFocused();
 	} );
+
+	test( 'should move focus to the cancel button in the panel', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Test Post' );
+		await page
+			.getByRole( 'region', 'Editor top bar' )
+			.getByRole( 'button', { name: 'Publish', exact: true } )
+			.click();
+
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor publish' } )
+				.locator( ':focus' )
+		).toHaveText( 'Cancel' );
+	} );
+
+	test( 'should focus on the post list after publishing', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Test Post' );
+		await editor.publishPost();
+
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor publish' } )
+				.locator( ':focus' )
+		).toHaveText( 'Test Post' );
+	} );
+
+	test( 'should retain focus within the panel', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Test Post' );
+		await page
+			.getByRole( 'region', 'Editor top bar' )
+			.getByRole( 'button', { name: 'Publish', exact: true } )
+			.click();
+		await pageUtils.pressKeys( 'shift+Tab' );
+
+		await expect(
+			page.getByRole( 'checkbox', {
+				name: 'Always show pre-publish checks.',
+			} )
+		).toBeFocused();
+	} );
 } );
diff --git a/test/e2e/specs/editor/various/publishing.spec.js b/test/e2e/specs/editor/various/publishing.spec.js
new file mode 100644
index 00000000000000..fdecbad69eed0d
--- /dev/null
+++ b/test/e2e/specs/editor/various/publishing.spec.js
@@ -0,0 +1,164 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+const POST_TYPES = [ 'post', 'page' ];
+
+test.describe( 'Publishing', () => {
+	POST_TYPES.forEach( ( postType ) => {
+		test.describe( `${ postType } locking prevent saving`, () => {
+			test.beforeEach( async ( { admin } ) => {
+				await admin.createNewPost( { postType } );
+			} );
+
+			test( `disables the publish button when a ${ postType } is locked`, async ( {
+				editor,
+				page,
+			} ) => {
+				await editor.canvas
+					.getByRole( 'textbox', { name: 'Add title' } )
+					.fill( 'E2E Test Post' );
+
+				await page.evaluate( () =>
+					window.wp.data
+						.dispatch( 'core/editor' )
+						.lockPostSaving( 'futurelock' )
+				);
+
+				// Open publish panel.
+				await page
+					.getByRole( 'region', { name: 'Editor top bar' } )
+					.getByRole( 'button', { name: 'Publish' } )
+					.click();
+
+				// Publish button should be disabled.
+				await expect(
+					page
+						.getByRole( 'region', { name: 'Editor publish' } )
+						.getByRole( 'button', { name: 'Publish', exact: true } )
+				).toBeDisabled();
+			} );
+
+			test( `disables the save shortcut when a ${ postType } is locked`, async ( {
+				editor,
+				page,
+				pageUtils,
+			} ) => {
+				await editor.canvas
+					.getByRole( 'textbox', { name: 'Add title' } )
+					.fill( 'E2E Test Post' );
+
+				await page.evaluate( () =>
+					window.wp.data
+						.dispatch( 'core/editor' )
+						.lockPostSaving( 'futurelock' )
+				);
+
+				await pageUtils.pressKeys( 'primary+s' );
+
+				await expect(
+					page
+						.getByRole( 'region', { name: 'Editor top bar' } )
+						.getByRole( 'button', { name: 'Save draft' } )
+				).toBeEnabled();
+			} );
+		} );
+	} );
+
+	POST_TYPES.forEach( ( postType ) => {
+		test.describe( `a ${ postType } with pre-publish checks disabled`, () => {
+			test.beforeEach( async ( { admin, editor } ) => {
+				await admin.createNewPost( { postType } );
+				await editor.setPreferences( 'core', {
+					isPublishSidebarEnabled: false,
+				} );
+			} );
+
+			test.afterEach( async ( { editor } ) => {
+				await editor.setPreferences( 'core', {
+					isPublishSidebarEnabled: true,
+				} );
+			} );
+
+			test( `should publish the ${ postType } without opening the post-publish sidebar`, async ( {
+				editor,
+				page,
+			} ) => {
+				await editor.canvas
+					.getByRole( 'textbox', { name: 'Add title' } )
+					.fill( 'E2E Test Post' );
+
+				// Publish the post.
+				await page
+					.getByRole( 'region', { name: 'Editor top bar' } )
+					.getByRole( 'button', { name: 'Publish' } )
+					.click();
+
+				const publishPanel = page.getByRole( 'region', {
+					name: 'Editor publish',
+				} );
+
+				// The pre-publishing panel should have been not shown.
+				await expect(
+					publishPanel.getByRole( 'button', {
+						name: 'Publish',
+						exact: true,
+					} )
+				).toBeHidden();
+
+				// The post-publishing panel should have been not shown.
+				await expect(
+					publishPanel.getByRole( 'button', {
+						name: 'View Post',
+					} )
+				).toBeHidden();
+
+				await expect(
+					page
+						.getByRole( 'button', { name: 'Dismiss this notice' } )
+						.filter( { hasText: 'published' } )
+				).toBeVisible();
+			} );
+		} );
+	} );
+
+	POST_TYPES.forEach( ( postType ) => {
+		test.describe( `a ${ postType } in small viewports`, () => {
+			test.beforeEach( async ( { admin, editor, pageUtils } ) => {
+				await admin.createNewPost( { postType } );
+				await editor.setPreferences( 'core', {
+					isPublishSidebarEnabled: false,
+				} );
+				await pageUtils.setBrowserViewport( 'small' );
+			} );
+
+			test.afterEach( async ( { editor, pageUtils } ) => {
+				await editor.setPreferences( 'core', {
+					isPublishSidebarEnabled: true,
+				} );
+				await pageUtils.setBrowserViewport( 'large' );
+			} );
+
+			test( 'should ignore the pre-publish checks and show the publish panel', async ( {
+				editor,
+				page,
+			} ) => {
+				await editor.canvas
+					.getByRole( 'textbox', { name: 'Add title' } )
+					.fill( 'E2E Test Post' );
+
+				await page
+					.getByRole( 'region', { name: 'Editor top bar' } )
+					.getByRole( 'button', { name: 'Publish' } )
+					.click();
+
+				await expect(
+					page
+						.getByRole( 'region', { name: 'Editor publish' } )
+						.getByRole( 'button', { name: 'Publish', exact: true } )
+				).toBeVisible();
+			} );
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/rich-text-deprecated-on-split.spec.js b/test/e2e/specs/editor/various/rich-text-deprecated-on-split.spec.js
new file mode 100644
index 00000000000000..30531ae2d0aed2
--- /dev/null
+++ b/test/e2e/specs/editor/various/rich-text-deprecated-on-split.spec.js
@@ -0,0 +1,75 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'RichText deprecated onSplit', () => {
+	test.beforeEach( async ( { admin, page, editor } ) => {
+		await admin.createNewPost();
+		await page.evaluate( () => {
+			const registerBlockType = window.wp.blocks.registerBlockType;
+			const { useBlockProps, RichText } = window.wp.blockEditor;
+			const { createBlock, setDefaultBlockName } = window.wp.blocks;
+			const el = window.wp.element.createElement;
+			registerBlockType( 'core/rich-text-deprecated-on-split', {
+				apiVersion: 3,
+				title: 'Deprecated RichText onSplit',
+				attributes: {
+					value: {
+						type: 'string',
+						source: 'html',
+						selector: 'div',
+					},
+				},
+				edit: function Edit( {
+					attributes,
+					setAttributes,
+					onReplace,
+				} ) {
+					return el( RichText, {
+						...useBlockProps(),
+						value: attributes.value,
+						onChange( value ) {
+							setAttributes( { value } );
+						},
+						onReplace,
+						onSplit( value ) {
+							return createBlock(
+								'core/rich-text-deprecated-on-split',
+								{ value }
+							);
+						},
+					} );
+				},
+				save( { attributes } ) {
+					return el( RichText.Content, { value: attributes.value } );
+				},
+			} );
+			setDefaultBlockName( 'core/rich-text-deprecated-on-split' );
+		} );
+		await editor.insertBlock( {
+			name: 'core/rich-text-deprecated-on-split',
+		} );
+	} );
+
+	test( 'should split', async ( { page, editor } ) => {
+		await page.keyboard.type( '1' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '2' );
+
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{
+				name: 'core/rich-text-deprecated-on-split',
+				attributes: {
+					value: '1',
+				},
+			},
+			{
+				name: 'core/rich-text-deprecated-on-split',
+				attributes: {
+					value: '2',
+				},
+			},
+		] );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/rich-text.spec.js b/test/e2e/specs/editor/various/rich-text.spec.js
index 1a307b2bc54379..29b4fb3d589018 100644
--- a/test/e2e/specs/editor/various/rich-text.spec.js
+++ b/test/e2e/specs/editor/various/rich-text.spec.js
@@ -3,7 +3,7 @@
  */
 const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
-test.describe( 'RichText', () => {
+test.describe( 'RichText (@firefox, @webkit)', () => {
 	test.beforeEach( async ( { admin } ) => {
 		await admin.createNewPost();
 	} );
@@ -119,7 +119,7 @@ test.describe( 'RichText', () => {
 		expect( count ).toBe( 1 );
 	} );
 
-	test( 'should return focus when pressing formatting button', async ( {
+	test( 'should return focus when pressing formatting button (-firefox)', async ( {
 		page,
 		editor,
 	} ) => {
@@ -415,7 +415,7 @@ test.describe( 'RichText', () => {
 		] );
 	} );
 
-	test( 'should update internal selection after fresh focus', async ( {
+	test( 'should update internal selection after fresh focus (-firefox)', async ( {
 		page,
 		editor,
 		pageUtils,
@@ -438,7 +438,7 @@ test.describe( 'RichText', () => {
 		] );
 	} );
 
-	test( 'should keep internal selection after blur', async ( {
+	test( 'should keep internal selection after blur (-webkit)', async ( {
 		page,
 		editor,
 		pageUtils,
@@ -492,19 +492,11 @@ test.describe( 'RichText', () => {
 		expect( await editor.getBlocks() ).toMatchObject( [
 			{
 				name: 'core/paragraph',
-				attributes: { content: 'a' },
+				attributes: { content: 'a1' },
 			},
 			{
 				name: 'core/paragraph',
-				attributes: { content: '1' },
-			},
-			{
-				name: 'core/paragraph',
-				attributes: { content: '2' },
-			},
-			{
-				name: 'core/paragraph',
-				attributes: { content: 'b' },
+				attributes: { content: '2b' },
 			},
 		] );
 	} );
@@ -609,7 +601,8 @@ test.describe( 'RichText', () => {
 		] );
 	} );
 
-	test( 'should preserve internal formatting', async ( {
+	// For some reason, tabbing in the highlight popover doesn't work in WebKit.
+	test( 'should preserve internal formatting (-webkit, -firefox)', async ( {
 		page,
 		editor,
 		pageUtils,
diff --git a/test/e2e/specs/editor/various/scheduling.spec.js b/test/e2e/specs/editor/various/scheduling.spec.js
new file mode 100644
index 00000000000000..2ea05589d02744
--- /dev/null
+++ b/test/e2e/specs/editor/various/scheduling.spec.js
@@ -0,0 +1,90 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+// The `timezone` setting exposed via REST API only accepts `UTC`
+// and timezone strings by location.
+const TIMEZONES = [ 'Pacific/Honolulu', 'UTC', 'Australia/Sydney' ];
+
+test.describe( 'Scheduling', () => {
+	TIMEZONES.forEach( ( timezone ) => {
+		test.describe( `Timezone ${ timezone }`, () => {
+			let orignalTimezone;
+			test.beforeAll( async ( { requestUtils } ) => {
+				orignalTimezone = ( await requestUtils.getSiteSettings() )
+					.timezone;
+
+				await requestUtils.updateSiteSettings( { timezone } );
+			} );
+
+			test.afterAll( async ( { requestUtils } ) => {
+				await requestUtils.updateSiteSettings( {
+					timezone: orignalTimezone,
+				} );
+			} );
+
+			test( 'Should change publishing button text from "Publish" to "Schedule"', async ( {
+				admin,
+				editor,
+				page,
+			} ) => {
+				await admin.createNewPost();
+				await editor.openDocumentSettingsSidebar();
+
+				const topBar = page.getByRole( 'region', {
+					name: 'Editor top bar',
+				} );
+
+				await expect(
+					topBar.getByRole( 'button', { name: 'Publish' } )
+				).toBeVisible();
+
+				// Open the datepicker.
+				await page
+					.getByRole( 'button', { name: 'Change date' } )
+					.click();
+
+				// Change the publishing date to a year in the future.
+				await page
+					.getByRole( 'group', { name: 'Date' } )
+					.getByRole( 'spinbutton', { name: 'Year' } )
+					.click();
+				await page.keyboard.press( 'ArrowUp' );
+
+				// Close the datepicker.
+				await page.keyboard.press( 'Escape' );
+
+				await expect(
+					topBar.getByRole( 'button', { name: 'Schedule' } )
+				).toBeVisible();
+			} );
+		} );
+	} );
+
+	test( 'should keep date time UI focused when the previous and next month buttons are clicked', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.createNewPost();
+		await editor.openDocumentSettingsSidebar();
+		await page.getByRole( 'button', { name: 'Change date' } ).click();
+
+		const calendar = page.getByRole( 'application', { name: 'Calendar' } );
+		const prevMonth = calendar.getByRole( 'button', {
+			name: 'View previous month',
+		} );
+		const nextMonth = calendar.getByRole( 'button', {
+			name: 'View next month',
+		} );
+
+		await prevMonth.click();
+		await expect( prevMonth ).toBeFocused();
+		await expect( calendar ).toBeVisible();
+
+		await nextMonth.click();
+		await expect( nextMonth ).toBeFocused();
+		await expect( calendar ).toBeVisible();
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/shortcut-focus-toolbar.spec.js b/test/e2e/specs/editor/various/shortcut-focus-toolbar.spec.js
index 0223821613f55e..fc54a1a71c8daa 100644
--- a/test/e2e/specs/editor/various/shortcut-focus-toolbar.spec.js
+++ b/test/e2e/specs/editor/various/shortcut-focus-toolbar.spec.js
@@ -50,32 +50,6 @@ test.describe( 'Focus toolbar shortcut (alt + F10)', () => {
 		await expect( toolbarUtils.documentToolbarTooltip ).toBeHidden();
 	} );
 
-	test( 'Focuses correct toolbar in default view options in select mode', async ( {
-		editor,
-		page,
-		toolbarUtils,
-	} ) => {
-		// Test: Focus the document toolbar from title
-		await toolbarUtils.useSelectMode();
-		await toolbarUtils.moveToToolbarShortcut();
-		await expect( toolbarUtils.documentToolbarButton ).toBeFocused();
-
-		// Test: Focus the top level toolbar from empty block
-		await editor.insertBlock( { name: 'core/paragraph' } );
-		await toolbarUtils.useSelectMode();
-		await toolbarUtils.moveToToolbarShortcut();
-		await expect( toolbarUtils.documentToolbarButton ).toBeFocused();
-
-		// Test: Focus the top level toolbar from paragraph block
-		await editor.insertBlock( { name: 'core/paragraph' } );
-		await page.keyboard.type(
-			'Focus top level toolbar from paragraph block in select mode.'
-		);
-		await toolbarUtils.useSelectMode();
-		await toolbarUtils.moveToToolbarShortcut();
-		await expect( toolbarUtils.documentToolbarButton ).toBeFocused();
-	} );
-
 	test.describe( 'In Top Toolbar option:', () => {
 		test.beforeEach( async ( { editor } ) => {
 			// Ensure the fixed toolbar option is on
@@ -98,6 +72,10 @@ test.describe( 'Focus toolbar shortcut (alt + F10)', () => {
 
 			// Test: Focus the block toolbar from empty block
 			await editor.insertBlock( { name: 'core/paragraph' } );
+			// This fails if we don't wait for the block toolbar to show.
+			await expect(
+				toolbarUtils.blockToolbarParagraphButton
+			).toBeVisible();
 			await toolbarUtils.moveToToolbarShortcut();
 			await expect(
 				toolbarUtils.blockToolbarParagraphButton
@@ -223,11 +201,11 @@ class ToolbarUtils {
 		this.pageUtils = pageUtils;
 
 		this.documentToolbarButton = this.page.getByRole( 'button', {
-			name: 'Toggle block inserter',
+			name: 'Block Inserter',
 			exact: true,
 		} );
 		this.documentToolbarTooltip = this.page.locator(
-			'text=Toggle block inserter'
+			'text=Block Inserter'
 		);
 		this.blockToolbarParagraphButton = this.page.getByRole( 'button', {
 			name: 'Paragraph',
diff --git a/test/e2e/specs/editor/various/sidebar-permalink.spec.js b/test/e2e/specs/editor/various/sidebar-permalink.spec.js
index 96283e4b6b15f9..a21cc13ea5c2e2 100644
--- a/test/e2e/specs/editor/various/sidebar-permalink.spec.js
+++ b/test/e2e/specs/editor/various/sidebar-permalink.spec.js
@@ -34,7 +34,7 @@ test.describe( 'Sidebar Permalink', () => {
 			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'aaaa (Updated)' );
 		await expect(
-			page.getByRole( 'button', { name: 'Change URL' } )
+			page.getByRole( 'button', { name: 'Change link' } )
 		).toBeHidden();
 	} );
 
@@ -54,7 +54,7 @@ test.describe( 'Sidebar Permalink', () => {
 			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'aaaa (Updated)' );
 		await expect(
-			page.getByRole( 'button', { name: 'Change URL' } )
+			page.getByRole( 'button', { name: 'Change link' } )
 		).toBeHidden();
 	} );
 
@@ -75,7 +75,7 @@ test.describe( 'Sidebar Permalink', () => {
 			.getByRole( 'textbox', { name: 'Add title' } )
 			.fill( 'aaaa (Updated)' );
 		await expect(
-			page.getByRole( 'button', { name: 'Change URL' } )
+			page.getByRole( 'button', { name: 'Change link' } )
 		).toBeVisible();
 	} );
 } );
diff --git a/test/e2e/specs/editor/various/sidebar.spec.js b/test/e2e/specs/editor/various/sidebar.spec.js
new file mode 100644
index 00000000000000..153a48e325c887
--- /dev/null
+++ b/test/e2e/specs/editor/various/sidebar.spec.js
@@ -0,0 +1,155 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Sidebar', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		// The test expects clean user preferences.
+		await requestUtils.resetPreferences();
+	} );
+
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'should have sidebar visible at the start with document sidebar active on desktop', async ( {
+		page,
+		pageUtils,
+	} ) => {
+		await pageUtils.setBrowserViewport( 'large' );
+
+		const activeTab = page
+			.getByRole( 'region', {
+				name: 'Editor settings',
+			} )
+			.getByRole( 'tab', { selected: true } );
+
+		await expect( activeTab ).toBeVisible();
+		await expect( activeTab ).toHaveText( 'Post' );
+	} );
+
+	test( 'should have the sidebar closed by default on mobile', async ( {
+		page,
+		pageUtils,
+	} ) => {
+		await pageUtils.setBrowserViewport( 'small' );
+
+		await expect(
+			page.getByRole( 'region', {
+				name: 'Editor settings',
+			} )
+		).toBeHidden();
+	} );
+
+	test( 'should close the sidebar when resizing from desktop to mobile', async ( {
+		page,
+		pageUtils,
+	} ) => {
+		await pageUtils.setBrowserViewport( 'large' );
+		const settingsSideber = page.getByRole( 'region', {
+			name: 'Editor settings',
+		} );
+
+		await expect( settingsSideber ).toBeVisible();
+
+		await pageUtils.setBrowserViewport( 'small' );
+
+		// Sidebar should be closed when resizing to mobile.
+		await expect( settingsSideber ).toBeHidden();
+	} );
+
+	test( 'should reopen sidebar the sidebar when resizing from mobile to desktop if the sidebar was closed automatically', async ( {
+		page,
+		pageUtils,
+	} ) => {
+		await pageUtils.setBrowserViewport( 'large' );
+		await pageUtils.setBrowserViewport( 'small' );
+		const settingsSideber = page.getByRole( 'region', {
+			name: 'Editor settings',
+		} );
+
+		await expect( settingsSideber ).toBeHidden();
+		await pageUtils.setBrowserViewport( 'large' );
+		await expect( settingsSideber ).toBeVisible();
+	} );
+
+	test( 'should preserve tab order while changing active tab', async ( {
+		page,
+		pageUtils,
+	} ) => {
+		// Region navigate to Sidebar.
+		await pageUtils.pressKeys( 'ctrl+`' );
+
+		// Tab lands at first (presumed selected) option "Post".
+		await page.keyboard.press( 'Tab' );
+
+		const activeTab = page
+			.getByRole( 'region', {
+				name: 'Editor settings',
+			} )
+			.getByRole( 'tab', { selected: true } );
+
+		// The Post tab should be focused and selected.
+		await expect( activeTab ).toHaveText( 'Post' );
+		await expect( activeTab ).toBeFocused();
+
+		// Arrow key into and activate "Block".
+		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.press( 'Space' );
+
+		// The Block tab should be focused and selected.
+		await expect( activeTab ).toHaveText( 'Block' );
+		await expect( activeTab ).toBeFocused();
+	} );
+
+	test( 'should be possible to programmatically remove Document Settings panels', async ( {
+		page,
+	} ) => {
+		const documentSettingsPanels = page
+			.getByRole( 'tabpanel', { name: 'Post' } )
+			.getByRole( 'heading', { level: 2 } );
+
+		await expect( documentSettingsPanels ).toHaveText( [
+			'No title',
+			'Categories',
+			'Tags',
+		] );
+		// Also check 'panels' that are not rendered as TabPanels.
+		const postExcerptPanel = page.getByRole( 'button', {
+			name: 'Add an excerpt…',
+		} );
+		const postFeaturedImagePanel = page.getByRole( 'button', {
+			name: 'Set featured image',
+		} );
+		const postDiscussionPanel = page.getByRole( 'button', {
+			name: 'Change discussion options',
+		} );
+		const postAuthorPanel = page.getByRole( 'button', {
+			name: 'admin',
+		} );
+
+		await expect( postExcerptPanel ).toBeVisible();
+		await expect( postFeaturedImagePanel ).toBeVisible();
+		await expect( postAuthorPanel ).toBeVisible();
+		await expect( postDiscussionPanel ).toHaveCount( 1 );
+
+		await page.evaluate( () => {
+			const { removeEditorPanel } =
+				window.wp.data.dispatch( 'core/editor' );
+
+			removeEditorPanel( 'taxonomy-panel-category' );
+			removeEditorPanel( 'taxonomy-panel-post_tag' );
+			removeEditorPanel( 'featured-image' );
+			removeEditorPanel( 'post-excerpt' );
+			removeEditorPanel( 'discussion-panel' );
+			removeEditorPanel( 'post-status' );
+		} );
+
+		await expect( documentSettingsPanels ).toHaveCount( 1 );
+		await expect( postExcerptPanel ).toBeHidden();
+		await expect( postFeaturedImagePanel ).toBeHidden();
+		await expect( postAuthorPanel ).toBeHidden();
+		await expect( postDiscussionPanel ).toHaveCount( 0 );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/splitting-merging.spec.js b/test/e2e/specs/editor/various/splitting-merging.spec.js
index 29e7e5d64522c9..eba9f1d3163fd5 100644
--- a/test/e2e/specs/editor/various/splitting-merging.spec.js
+++ b/test/e2e/specs/editor/various/splitting-merging.spec.js
@@ -373,6 +373,103 @@ test.describe( 'splitting and merging blocks (@firefox, @webkit)', () => {
 		);
 	} );
 
+	// Fix for https://github.com/WordPress/gutenberg/issues/65174.
+	test( 'should handle unwrapping and merging blocks with empty contents', async ( {
+		editor,
+		page,
+	} ) => {
+		const emptyAlignedParagraph = {
+			name: 'core/paragraph',
+			attributes: { content: '', align: 'center', dropCap: false },
+			innerBlocks: [],
+		};
+		const emptyAlignedHeading = {
+			name: 'core/heading',
+			attributes: { content: '', textAlign: 'center', level: 2 },
+			innerBlocks: [],
+		};
+		const headingWithContent = {
+			name: 'core/heading',
+			attributes: { content: 'heading', level: 2 },
+			innerBlocks: [],
+		};
+		const placeholderBlock = { name: 'core/separator' };
+		await editor.insertBlock( {
+			name: 'core/group',
+			innerBlocks: [
+				emptyAlignedParagraph,
+				emptyAlignedHeading,
+				headingWithContent,
+				placeholderBlock,
+			],
+		} );
+		await editor.canvas
+			.getByRole( 'document', { name: 'Empty block' } )
+			.focus();
+
+		await page.keyboard.press( 'Backspace' );
+		await expect
+			.poll( editor.getBlocks, 'Remove the default empty block' )
+			.toEqual( [
+				{
+					name: 'core/group',
+					attributes: { tagName: 'div' },
+					innerBlocks: [
+						emptyAlignedHeading,
+						headingWithContent,
+						expect.objectContaining( placeholderBlock ),
+					],
+				},
+			] );
+
+		// Move the caret to the beginning of the empty heading block.
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'Backspace' );
+		await expect
+			.poll(
+				editor.getBlocks,
+				'Convert the non-default empty block to a default block'
+			)
+			.toEqual( [
+				{
+					name: 'core/group',
+					attributes: { tagName: 'div' },
+					innerBlocks: [
+						emptyAlignedParagraph,
+						headingWithContent,
+						expect.objectContaining( placeholderBlock ),
+					],
+				},
+			] );
+		await page.keyboard.press( 'Backspace' );
+		await expect.poll( editor.getBlocks ).toEqual( [
+			{
+				name: 'core/group',
+				attributes: { tagName: 'div' },
+				innerBlocks: [
+					headingWithContent,
+					expect.objectContaining( placeholderBlock ),
+				],
+			},
+		] );
+
+		// Move the caret to the beginning of the "heading" heading block.
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'Backspace' );
+		await expect
+			.poll( editor.getBlocks, 'Lift the non-empty non-default block' )
+			.toEqual( [
+				headingWithContent,
+				{
+					name: 'core/group',
+					attributes: { tagName: 'div' },
+					innerBlocks: [
+						expect.objectContaining( placeholderBlock ),
+					],
+				},
+			] );
+	} );
+
 	test.describe( 'test restore selection when merge produces more than one block', () => {
 		const snap1 = [
 			{
diff --git a/test/e2e/specs/editor/various/style-variation.spec.js b/test/e2e/specs/editor/various/style-variation.spec.js
index cc13dd1ad9238e..136b8284b1ecff 100644
--- a/test/e2e/specs/editor/various/style-variation.spec.js
+++ b/test/e2e/specs/editor/various/style-variation.spec.js
@@ -17,9 +17,6 @@ test.describe( 'adding blocks', () => {
 			attributes: { value: '<p>Quote content</p>' },
 		} );
 
-		// Select the quote block.
-		await page.keyboard.press( 'ArrowDown' );
-
 		await editor.clickBlockToolbarButton( 'Quote' );
 
 		await page.click( 'role=menuitem[name="Plain"i]' );
diff --git a/test/e2e/specs/editor/various/styles.spec.js b/test/e2e/specs/editor/various/styles.spec.js
new file mode 100644
index 00000000000000..0aa1f3007d2419
--- /dev/null
+++ b/test/e2e/specs/editor/various/styles.spec.js
@@ -0,0 +1,17 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Styles', () => {
+	test( 'should override reset styles', async ( { admin, editor } ) => {
+		await admin.createNewPost( { postType: 'page' } );
+		await editor.insertBlock( { name: 'core/social-links' } );
+
+		const block = editor.canvas.getByRole( 'document', {
+			name: 'Block: Social Icons',
+		} );
+
+		await expect( block ).toHaveCSS( 'padding-left', '0px' );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/switch-to-draft.spec.js b/test/e2e/specs/editor/various/switch-to-draft.spec.js
index 5cfeda60a2d185..81652d9c11e2bb 100644
--- a/test/e2e/specs/editor/various/switch-to-draft.spec.js
+++ b/test/e2e/specs/editor/various/switch-to-draft.spec.js
@@ -46,30 +46,21 @@ test.describe( 'Clicking "Switch to draft" on a published/scheduled post/page',
 					);
 
 					await editor.openDocumentSettingsSidebar();
-
-					await switchToDraftUtils.switchToDraftButton.click();
-
 					await page
-						.getByRole( 'dialog' )
-						.getByRole( 'button', { name: 'Cancel' } )
+						.getByRole( 'button', { name: 'Change status:' } )
 						.click();
-
-					await expect
-						.poll(
-							switchToDraftUtils.getPostStatus,
-							`should leave a ${ postStatus }-ed ${ postType } ${ postStatus }-ed if canceled`
-						)
-						.toBe(
-							postStatus === 'schedule' ? 'future' : postStatus
-						);
-
-					await switchToDraftUtils.switchToDraftButton.click();
-
+					await page.getByRole( 'radio', { name: 'Draft' } ).click();
+
+					if ( viewport === 'small' ) {
+						await page
+							.getByRole( 'region', { name: 'Editor settings' } )
+							.getByRole( 'button', { name: 'Close Settings' } )
+							.click();
+					}
 					await page
-						.getByRole( 'dialog' )
-						.getByRole( 'button', { name: 'OK' } )
+						.getByRole( 'region', { name: 'Editor top bar' } )
+						.getByRole( 'button', { name: 'Save', exact: true } )
 						.click();
-
 					await expect(
 						page.getByRole( 'button', {
 							name: 'Dismiss this notice',
@@ -102,10 +93,6 @@ class SwitchToDraftUtils {
 		this.#page = page;
 		this.#admin = admin;
 		this.#requestUtils = requestUtils;
-
-		this.switchToDraftButton = page.locator(
-			'role=button[name="Switch to draft"i]'
-		);
 	}
 
 	/**
@@ -143,7 +130,7 @@ class SwitchToDraftUtils {
 	};
 
 	getPostStatus = async () => {
-		return await this.#page.evaluate( () =>
+		return this.#page.evaluate( () =>
 			window.wp.data
 				.select( 'core/editor' )
 				.getEditedPostAttribute( 'status' )
diff --git a/test/e2e/specs/editor/various/taxonomies.spec.js b/test/e2e/specs/editor/various/taxonomies.spec.js
new file mode 100644
index 00000000000000..efd8c9c6ee7fe0
--- /dev/null
+++ b/test/e2e/specs/editor/various/taxonomies.spec.js
@@ -0,0 +1,136 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+function generateRandomNumber() {
+	return Math.round( 1 + Math.random() * ( Number.MAX_SAFE_INTEGER - 1 ) );
+}
+
+test.describe( 'Taxonomies', () => {
+	test.beforeEach( async ( { admin, editor } ) => {
+		await admin.createNewPost();
+		await editor.openDocumentSettingsSidebar();
+	} );
+
+	test( 'should be able to open the categories panel and create a new main category', async ( {
+		editor,
+		page,
+	} ) => {
+		// Open the Document -> Categories panel.
+		const panelToggle = page.getByRole( 'button', {
+			name: 'Categories',
+		} );
+
+		if (
+			( await panelToggle.getAttribute( 'aria-expanded' ) ) === 'false'
+		) {
+			await panelToggle.click();
+		}
+
+		await page
+			.getByRole( 'button', {
+				name: 'Add New Category',
+				expanded: false,
+			} )
+			.click();
+		await page
+			.getByRole( 'textbox', { name: 'New Category Name' } )
+			.fill( 'z rand category 1' );
+		await page.keyboard.press( 'Enter' );
+
+		const categories = page.getByRole( 'group', { name: 'Categories' } );
+		const selectedCategories = categories.getByRole( 'checkbox', {
+			checked: true,
+		} );
+		const newCategory = categories.getByRole( 'checkbox', {
+			name: 'z rand category 1',
+		} );
+
+		await expect( selectedCategories ).toHaveCount( 1 );
+		await expect( newCategory ).toBeChecked();
+
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+		await editor.publishPost();
+		await page.reload();
+
+		// The category selection was persisted after the publish process.
+		await expect( selectedCategories ).toHaveCount( 1 );
+		await expect( newCategory ).toBeChecked();
+	} );
+
+	test( 'should be able to open the tags panel and create a new tag', async ( {
+		editor,
+		page,
+	} ) => {
+		// Open the Document -> Tags panel.
+		const panelToggle = page.getByRole( 'button', {
+			name: 'Tags',
+		} );
+
+		if (
+			( await panelToggle.getAttribute( 'aria-expanded' ) ) === 'false'
+		) {
+			await panelToggle.click();
+		}
+
+		const tagName = 'tag-' + generateRandomNumber();
+		const tags = page.locator( '.components-form-token-field__token-text' );
+
+		await page
+			.getByRole( 'combobox', { name: 'Add New Tag' } )
+			.fill( tagName );
+		await page.keyboard.press( 'Enter' );
+
+		await expect( tags ).toHaveCount( 1 );
+		await expect( tags ).toContainText( tagName );
+
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+		await editor.publishPost();
+		await page.reload();
+
+		await expect( tags ).toHaveCount( 1 );
+		await expect( tags ).toContainText( tagName );
+	} );
+
+	// See: https://github.com/WordPress/gutenberg/pull/21693.
+	test( `should be able to create a new tag with ' on the name`, async ( {
+		editor,
+		page,
+	} ) => {
+		// Open the Document -> Tags panel.
+		const panelToggle = page.getByRole( 'button', {
+			name: 'Tags',
+		} );
+
+		if (
+			( await panelToggle.getAttribute( 'aria-expanded' ) ) === 'false'
+		) {
+			await panelToggle.click();
+		}
+
+		const tagName = "tag'-" + generateRandomNumber();
+		const tags = page.locator( '.components-form-token-field__token-text' );
+
+		await page
+			.getByRole( 'combobox', { name: 'Add New Tag' } )
+			.fill( tagName );
+		await page.keyboard.press( 'Enter' );
+
+		await expect( tags ).toHaveCount( 1 );
+		await expect( tags ).toContainText( tagName );
+
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+		await editor.publishPost();
+		await page.reload();
+
+		await expect( tags ).toHaveCount( 1 );
+		await expect( tags ).toContainText( tagName );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/template-resolution.spec.js b/test/e2e/specs/editor/various/template-resolution.spec.js
new file mode 100644
index 00000000000000..13503ddaf23d5b
--- /dev/null
+++ b/test/e2e/specs/editor/various/template-resolution.spec.js
@@ -0,0 +1,90 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+async function updateSiteSettings( { pageId, requestUtils } ) {
+	return requestUtils.updateSiteSettings( {
+		show_on_front: 'page',
+		page_on_front: 0,
+		page_for_posts: pageId,
+	} );
+}
+
+test.describe( 'Template resolution', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'emptytheme' );
+	} );
+	test.afterEach( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.deleteAllPages(),
+			requestUtils.updateSiteSettings( {
+				show_on_front: 'posts',
+				page_on_front: 0,
+				page_for_posts: 0,
+			} ),
+		] );
+	} );
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+	test( 'Site editor proper front page template resolution when we have only set posts page in settings', async ( {
+		page,
+		admin,
+		requestUtils,
+	} ) => {
+		const newPage = await requestUtils.createPage( {
+			title: 'Posts Page',
+			status: 'publish',
+		} );
+		await updateSiteSettings( { requestUtils, pageId: newPage.id } );
+		await admin.visitSiteEditor();
+		await expect( page.locator( '.edit-site-canvas-loader' ) ).toHaveCount(
+			0
+		);
+	} );
+	test.describe( '`page_for_posts` setting', () => {
+		test( 'Post editor proper template resolution', async ( {
+			page,
+			admin,
+			editor,
+			requestUtils,
+		} ) => {
+			const newPage = await requestUtils.createPage( {
+				title: 'Posts Page',
+				status: 'publish',
+			} );
+			await admin.editPost( newPage.id );
+			await editor.openDocumentSettingsSidebar();
+			await expect(
+				page.getByRole( 'button', { name: 'Template options' } )
+			).toHaveText( 'Single Entries' );
+			await updateSiteSettings( { requestUtils, pageId: newPage.id } );
+			await page.reload();
+			await expect(
+				page.getByRole( 'button', { name: 'Template options' } )
+			).toHaveText( 'Index' );
+		} );
+		test( 'Site editor proper template resolution', async ( {
+			page,
+			editor,
+			admin,
+			requestUtils,
+		} ) => {
+			const newPage = await requestUtils.createPage( {
+				title: 'Posts Page',
+				status: 'publish',
+			} );
+			await updateSiteSettings( { requestUtils, pageId: newPage.id } );
+			await admin.visitSiteEditor( {
+				postId: newPage.id,
+				postType: 'page',
+				canvas: 'edit',
+			} );
+			await editor.openDocumentSettingsSidebar();
+			await expect(
+				page.getByRole( 'button', { name: 'Template options' } )
+			).toHaveText( 'Index' );
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/toolbar-roving-tabindex.spec.js b/test/e2e/specs/editor/various/toolbar-roving-tabindex.spec.js
index 70509348983e6b..2dc1e7c6b50515 100644
--- a/test/e2e/specs/editor/various/toolbar-roving-tabindex.spec.js
+++ b/test/e2e/specs/editor/various/toolbar-roving-tabindex.spec.js
@@ -57,10 +57,7 @@ test.describe( 'Toolbar roving tabindex', () => {
 		// ensures list block toolbar uses roving tabindex
 		await editor.insertBlock( { name: 'core/list' } );
 		await page.keyboard.type( 'List' );
-		await ToolbarRovingTabindexUtils.testBlockToolbarKeyboardNavigation(
-			'List text',
-			'Select parent block: List'
-		);
+		await ToolbarRovingTabindexUtils.focusBlockToolbar();
 		await page.click( `role=button[name="Select parent block: List"i]` );
 		await ToolbarRovingTabindexUtils.wrapCurrentBlockWithGroup( 'List' );
 		await ToolbarRovingTabindexUtils.testGroupKeyboardNavigation(
diff --git a/test/e2e/specs/editor/various/typewriter.spec.js b/test/e2e/specs/editor/various/typewriter.spec.js
new file mode 100644
index 00000000000000..abf24cbfc298ec
--- /dev/null
+++ b/test/e2e/specs/editor/various/typewriter.spec.js
@@ -0,0 +1,303 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+/** @typedef {import('@playwright/test').Page} Page */
+
+// Allow the scroll position to be 1px off.
+const BUFFER = 1;
+
+test.use( {
+	typewriterUtils: async ( { page }, use ) => {
+		await use( new TypewriterUtils( { page } ) );
+	},
+} );
+
+test.describe( 'Typewriter', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'should maintain caret position', async ( {
+		page,
+		typewriterUtils,
+	} ) => {
+		// Create test blocks.
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.press( 'Enter' );
+
+		const initialPosition = await typewriterUtils.getCaretPosition();
+
+		// The page shouldn't be scrolled when it's being filled.
+		await page.keyboard.press( 'Enter' );
+
+		expect( await typewriterUtils.getCaretPosition() ).toBeGreaterThan(
+			initialPosition
+		);
+
+		// Create blocks until the typewriter effect kicks in.
+		while (
+			await page.evaluate( () => {
+				const { activeElement } =
+					document.activeElement?.contentDocument ?? document;
+				return (
+					window.wp.dom.getScrollContainer( activeElement )
+						.scrollTop === 0
+				);
+			} )
+		) {
+			await page.keyboard.press( 'Enter' );
+		}
+
+		const newPosition = await typewriterUtils.getCaretPosition();
+
+		// Now the scroll position should be maintained.
+		await page.keyboard.press( 'Enter' );
+
+		expect(
+			await typewriterUtils.getDiff( newPosition )
+		).toBeLessThanOrEqual( BUFFER );
+
+		// Type until the text wraps.
+		while (
+			await page.evaluate( () => {
+				const { activeElement } =
+					document.activeElement?.contentDocument ?? document;
+				return (
+					activeElement.clientHeight <=
+					parseInt(
+						window.getComputedStyle( activeElement ).lineHeight,
+						10
+					)
+				);
+			} )
+		) {
+			await page.keyboard.type( 'a' );
+		}
+
+		expect(
+			await typewriterUtils.getDiff( newPosition )
+		).toBeLessThanOrEqual( BUFFER );
+
+		// Pressing backspace will reposition the caret to the previous line.
+		// Scroll position should be adjusted again.
+		await page.keyboard.press( 'Backspace' );
+
+		expect(
+			await typewriterUtils.getDiff( newPosition )
+		).toBeLessThanOrEqual( BUFFER );
+
+		// Should reset scroll position to maintain.
+		await page.keyboard.press( 'ArrowUp' );
+
+		const positionAfterArrowUp = await typewriterUtils.getCaretPosition();
+
+		expect( positionAfterArrowUp ).toBeLessThanOrEqual( newPosition );
+
+		// Should be scrolled to new position.
+		await page.keyboard.press( 'Enter' );
+
+		expect(
+			await typewriterUtils.getDiff( positionAfterArrowUp )
+		).toBeLessThanOrEqual( BUFFER );
+	} );
+
+	test( 'should maintain caret position after scroll', async ( {
+		page,
+		typewriterUtils,
+	} ) => {
+		// Create first block.
+		await page.keyboard.press( 'Enter' );
+
+		// Create zero or more blocks until there is a scrollable container.
+		// No blocks should be created if there's already a scrollbar.
+		while (
+			await page.evaluate( () => {
+				const { activeElement } =
+					document.activeElement?.contentDocument ?? document;
+				const scrollContainer =
+					window.wp.dom.getScrollContainer( activeElement );
+				return (
+					scrollContainer.scrollHeight ===
+					scrollContainer.clientHeight
+				);
+			} )
+		) {
+			await page.keyboard.press( 'Enter' );
+		}
+
+		const scrollPosition = await page.evaluate( () => {
+			const { activeElement } =
+				document.activeElement?.contentDocument ?? document;
+			return window.wp.dom.getScrollContainer( activeElement ).scrollTop;
+		} );
+
+		// Expect scrollbar to be at the top.
+		expect( scrollPosition ).toBe( 0 );
+
+		// Move the mouse to the scroll container, and scroll down
+		// a small amount to trigger the typewriter mode.
+		await page.evaluate( () => {
+			const { activeElement } =
+				document.activeElement?.contentDocument ?? document;
+			window.wp.dom.getScrollContainer( activeElement ).scrollTop += 2;
+		} );
+		// Wait for the caret rectangle to be recalculated.
+		await page.evaluate(
+			() => new Promise( window.requestAnimationFrame )
+		);
+
+		// After hitting Enter to create a new block, the caret screen
+		// coordinates should be the same.
+		const initialPosition = await typewriterUtils.getCaretPosition();
+		await page.keyboard.press( 'Enter' );
+		await page.waitForFunction( () => {
+			const { activeElement } =
+				document.activeElement?.contentDocument ?? document;
+			// Wait for the Typewriter to scroll down past the initial position.
+			return (
+				window.wp.dom.getScrollContainer( activeElement ).scrollTop > 2
+			);
+		} );
+
+		expect( await typewriterUtils.getDiff( initialPosition ) ).toBe( 0 );
+	} );
+
+	test( 'should maintain caret position after leaving last editable', async ( {
+		page,
+		typewriterUtils,
+	} ) => {
+		// Create test blocks.
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.press( 'Enter' );
+		// Move to first block.
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'ArrowUp' );
+
+		const initialPosition = await typewriterUtils.getCaretPosition();
+
+		// Should maintain scroll position.
+		expect(
+			await typewriterUtils.getDiff( initialPosition )
+		).toBeLessThanOrEqual( BUFFER );
+	} );
+
+	test( 'should scroll caret into view from the top', async ( {
+		page,
+		typewriterUtils,
+	} ) => {
+		// Create first block.
+		await page.keyboard.press( 'Enter' );
+
+		// Create blocks until there is a scrollable container.
+		while (
+			await page.evaluate( () => {
+				const { activeElement } =
+					document.activeElement?.contentDocument ?? document;
+				return ! window.wp.dom.getScrollContainer( activeElement );
+			} )
+		) {
+			await page.keyboard.press( 'Enter' );
+		}
+
+		let count = 0;
+
+		// Create blocks until the typewriter effect kicks in, create at
+		// least 10 blocks to properly test it.
+		while (
+			( await page.evaluate( () => {
+				const { activeElement } =
+					document.activeElement?.contentDocument ?? document;
+				return (
+					window.wp.dom.getScrollContainer( activeElement )
+						.scrollTop === 0
+				);
+			} ) ) ||
+			count < 10
+		) {
+			await page.keyboard.press( 'Enter' );
+			count++;
+		}
+
+		// Scroll the active element to the very bottom of the scroll container,
+		// then scroll up, so the caret is partially hidden.
+		await page.evaluate( () => {
+			const { activeElement } =
+				document.activeElement?.contentDocument ?? document;
+			activeElement.scrollIntoView( false );
+			window.wp.dom.getScrollContainer( activeElement ).scrollTop -=
+				activeElement.offsetHeight + 10;
+		} );
+
+		const bottomPostition = await typewriterUtils.getCaretPosition();
+
+		// Should scroll the caret back into view (preserve browser behaviour).
+		await page.keyboard.type( 'a' );
+
+		const newBottomPosition = await typewriterUtils.getCaretPosition();
+
+		expect( newBottomPosition ).toBeLessThanOrEqual( bottomPostition );
+
+		// Should maintain new caret position.
+		await page.keyboard.press( 'Enter' );
+
+		expect(
+			await typewriterUtils.getDiff( newBottomPosition )
+		).toBeLessThanOrEqual( BUFFER );
+
+		await page.keyboard.press( 'Backspace' );
+
+		while ( count-- ) {
+			await page.keyboard.press( 'ArrowUp' );
+		}
+
+		// Scroll the active element to the very top of the scroll container,
+		// then scroll down, so the caret is partially hidden.
+		await page.evaluate( () => {
+			const { activeElement } =
+				document.activeElement?.contentDocument ?? document;
+			activeElement.scrollIntoView();
+			window.wp.dom.getScrollContainer( activeElement ).scrollTop +=
+				activeElement.offsetHeight + 10;
+		} );
+
+		const topPostition = await typewriterUtils.getCaretPosition();
+
+		// Should scroll the caret back into view (preserve browser behaviour).
+		await page.keyboard.type( 'a' );
+
+		const newTopPosition = await typewriterUtils.getCaretPosition();
+
+		expect( newTopPosition ).toBeGreaterThan( topPostition );
+
+		// Should maintain new caret position.
+		await page.keyboard.press( 'Enter' );
+
+		expect(
+			await typewriterUtils.getDiff( newTopPosition )
+		).toBeLessThanOrEqual( BUFFER );
+	} );
+} );
+
+class TypewriterUtils {
+	/** @type {Page} */
+	#page;
+
+	constructor( { page } ) {
+		this.#page = page;
+	}
+
+	async getCaretPosition() {
+		return await this.#page.evaluate( () => {
+			return window.wp.dom.computeCaretRect(
+				document.activeElement?.contentWindow ?? window
+			).y;
+		} );
+	}
+
+	async getDiff( caretPosition ) {
+		return Math.abs( ( await this.getCaretPosition() ) - caretPosition );
+	}
+}
diff --git a/test/e2e/specs/editor/various/validate-multiple-use.spec.js b/test/e2e/specs/editor/various/validate-multiple-use.spec.js
new file mode 100644
index 00000000000000..4ab455d22cf299
--- /dev/null
+++ b/test/e2e/specs/editor/various/validate-multiple-use.spec.js
@@ -0,0 +1,36 @@
+/**
+ * WordPress dependencies
+ */
+
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Validate multiple use', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'should display correct number of warning messages', async ( {
+		editor,
+		pageUtils,
+	} ) => {
+		// Insert a block with the `multiple` feature enabled, such as `core/more`
+		await editor.insertBlock( {
+			name: 'core/more',
+		} );
+
+		// Group the block
+		await pageUtils.pressKeys( 'primary+a' );
+		await editor.clickBlockOptionsMenuItem( 'Group' );
+
+		// Duplicate the block
+		await pageUtils.pressKeys( 'primary+a' );
+		await editor.clickBlockOptionsMenuItem( 'Duplicate' );
+
+		// Check if warning is visible
+		await expect(
+			editor.canvas.getByRole( 'button', {
+				name: 'Find original',
+			} )
+		).toBeVisible();
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/write-design-mode.spec.js b/test/e2e/specs/editor/various/write-design-mode.spec.js
new file mode 100644
index 00000000000000..443a70ea92f680
--- /dev/null
+++ b/test/e2e/specs/editor/various/write-design-mode.spec.js
@@ -0,0 +1,116 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Write/Design mode', () => {
+	test.beforeEach( async ( { admin, editor } ) => {
+		await admin.createNewPost();
+		await expect(
+			editor.canvas.getByRole( 'textbox', { name: 'Add title' } )
+		).toBeFocused();
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllPosts();
+	} );
+
+	test( 'Should prevent selecting intermediary blocks', async ( {
+		editor,
+		page,
+	} ) => {
+		// Insert a section with a nested block and an editable block.
+		await editor.insertBlock( {
+			name: 'core/group',
+			attributes: {
+				style: {
+					spacing: {
+						padding: '20px',
+					},
+					color: {
+						background: 'darkgray',
+					},
+				},
+			},
+			innerBlocks: [
+				{
+					name: 'core/group',
+					attributes: {
+						style: {
+							spacing: {
+								padding: '20px',
+							},
+							color: {
+								background: 'lightgray',
+							},
+						},
+					},
+					innerBlocks: [
+						{
+							name: 'core/paragraph',
+							attributes: {
+								content: 'Something',
+							},
+						},
+					],
+				},
+			],
+		} );
+
+		// Switch to write mode.
+		await editor.switchEditorTool( 'Write' );
+
+		const sectionBlock = editor.canvas
+			.getByRole( 'document', {
+				name: 'Block: Group',
+			} )
+			.nth( 0 );
+		const sectionClientId = await sectionBlock.getAttribute( 'data-block' );
+		const nestedGroupBlock = sectionBlock.getByRole( 'document', {
+			name: 'Block: Group',
+		} );
+		const paragraph = nestedGroupBlock.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+		const paragraphClientId = await paragraph.getAttribute( 'data-block' );
+
+		// We should not be able to select the intermediary group block.
+		// if we try to click on it (the padding area)
+		// The selection should land on the top level block.
+		const nestedGroupPosition = await nestedGroupBlock.boundingBox();
+		await page.mouse.click(
+			nestedGroupPosition.x + 5,
+			nestedGroupPosition.y + 5
+		);
+
+		const getSelectedBlock = async () =>
+			await page.evaluate( () =>
+				window.wp.data
+					.select( 'core/block-editor' )
+					.getSelectedBlockClientId()
+			);
+
+		expect( await getSelectedBlock() ).toEqual( sectionClientId );
+
+		// We should be able to select the paragraph block and write in it.
+		await paragraph.click();
+		await page.keyboard.type( ' something' );
+		expect( await getSelectedBlock() ).toEqual( paragraphClientId );
+		await expect( paragraph ).toHaveText( 'Something something' );
+
+		// Check that the inspector still shows the group block with the content panel.
+		await editor.openDocumentSettingsSidebar();
+		const editorSettings = page.getByRole( 'region', {
+			name: 'Editor settings',
+		} );
+		await expect(
+			// Ideally we should not be using CSS selectors
+			// but in this case there's no easy role/label
+			// to retrieve the "selected block title"
+			editorSettings.locator( '.block-editor-block-card__title' )
+		).toHaveText( 'Group' );
+		await expect(
+			editorSettings.getByRole( 'button', { name: 'Content' } )
+		).toBeVisible();
+	} );
+} );
diff --git a/test/e2e/specs/editor/various/writing-flow.spec.js b/test/e2e/specs/editor/various/writing-flow.spec.js
index a248915a21fcba..4077d6dcc58200 100644
--- a/test/e2e/specs/editor/various/writing-flow.spec.js
+++ b/test/e2e/specs/editor/various/writing-flow.spec.js
@@ -106,48 +106,6 @@ test.describe( 'Writing Flow (@firefox, @webkit)', () => {
 		] );
 	} );
 
-	test( 'Should navigate between inner and root blocks in navigation mode', async ( {
-		page,
-		writingFlowUtils,
-	} ) => {
-		await writingFlowUtils.addDemoContent();
-
-		// Switch to navigation mode.
-		await page.keyboard.press( 'Escape' );
-		// Arrow up to Columns block.
-		await page.keyboard.press( 'ArrowUp' );
-		await expect
-			.poll( writingFlowUtils.getActiveBlockName )
-			.toBe( 'core/columns' );
-		// Arrow right into Column block.
-		await page.keyboard.press( 'ArrowRight' );
-		await expect
-			.poll( writingFlowUtils.getActiveBlockName )
-			.toBe( 'core/column' );
-		// Arrow down to reach second Column block.
-		await page.keyboard.press( 'ArrowDown' );
-		// Arrow right again into Paragraph block.
-		await page.keyboard.press( 'ArrowRight' );
-		await expect
-			.poll( writingFlowUtils.getActiveBlockName )
-			.toBe( 'core/paragraph' );
-		// Arrow left back to Column block.
-		await page.keyboard.press( 'ArrowLeft' );
-		await expect
-			.poll( writingFlowUtils.getActiveBlockName )
-			.toBe( 'core/column' );
-		// Arrow left back to Columns block.
-		await page.keyboard.press( 'ArrowLeft' );
-		await expect
-			.poll( writingFlowUtils.getActiveBlockName )
-			.toBe( 'core/columns' );
-		// Arrow up to first paragraph.
-		await page.keyboard.press( 'ArrowUp' );
-		await expect
-			.poll( writingFlowUtils.getActiveBlockName )
-			.toBe( 'core/paragraph' );
-	} );
-
 	test( 'should navigate around inline boundaries', async ( {
 		editor,
 		page,
@@ -356,7 +314,7 @@ test.describe( 'Writing Flow (@firefox, @webkit)', () => {
 		await page.keyboard.type( 'a' );
 		await page.keyboard.press( 'Backspace' );
 		await expect.poll( editor.getEditedPostContent ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
@@ -595,6 +553,37 @@ test.describe( 'Writing Flow (@firefox, @webkit)', () => {
 		] );
 	} );
 
+	test( 'should remove first empty paragraph on Backspace', async ( {
+		editor,
+		page,
+	} ) => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '2' );
+		await page.keyboard.press( 'ArrowUp' );
+
+		// Ensure setup is correct.
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: '' },
+			},
+			{
+				name: 'core/paragraph',
+				attributes: { content: '2' },
+			},
+		] );
+
+		await page.keyboard.press( 'Backspace' );
+
+		expect( await editor.getBlocks() ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: { content: '2' },
+			},
+		] );
+	} );
+
 	test( 'should merge paragraphs', async ( { editor, page } ) => {
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.type( '1' );
@@ -923,34 +912,10 @@ test.describe( 'Writing Flow (@firefox, @webkit)', () => {
 		// Confirm correct setup.
 		await expect.poll( editor.getEditedPostContent )
 			.toBe( `<!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td></td><td>2</td></tr><tr><td></td><td></td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td></td><td>2</td></tr><tr><td></td><td></td></tr></tbody></table></figure>
 <!-- /wp:table -->` );
 	} );
 
-	test( 'should unselect all blocks when hitting double escape', async ( {
-		page,
-		writingFlowUtils,
-	} ) => {
-		await page.keyboard.press( 'Enter' );
-		await page.keyboard.type( 'Random Paragraph' );
-
-		await expect
-			.poll( writingFlowUtils.getActiveBlockName )
-			.toBe( 'core/paragraph' );
-
-		// First escape enters navigaiton mode.
-		await page.keyboard.press( 'Escape' );
-		await expect
-			.poll( writingFlowUtils.getActiveBlockName )
-			.toBe( 'core/paragraph' );
-
-		// Second escape unselects the blocks.
-		await page.keyboard.press( 'Escape' );
-		await expect
-			.poll( writingFlowUtils.getActiveBlockName )
-			.toBe( undefined );
-	} );
-
 	// Checks for regressions of https://github.com/WordPress/gutenberg/issues/40091.
 	test( 'does not deselect the block when selecting text outside the editor canvas', async ( {
 		editor,
@@ -1122,9 +1087,12 @@ test.describe( 'Writing Flow (@firefox, @webkit)', () => {
 		await page.keyboard.type( 'synced' );
 
 		await editor.clickBlockOptionsMenuItem( 'Create pattern' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.press( 'Tab' );
-		await page.keyboard.type( 'test' );
+		const createPatternDialog = editor.page.getByRole( 'dialog', {
+			name: 'add new pattern',
+		} );
+		await createPatternDialog
+			.getByRole( 'textbox', { name: 'Name' } )
+			.fill( 'test' );
 		await page.keyboard.press( 'Enter' );
 
 		await expect(
@@ -1169,7 +1137,7 @@ class WritingFlowUtils {
 			.locator( 'role=button[name="Two columns; equal split"i]' )
 			.click();
 		await this.editor.canvas
-			.locator( 'role=button[name="Add block"i]' )
+			.locator( '.is-selected >> role=button[name="Add block"i]' )
 			.click();
 		await this.page.click(
 			'role=listbox[name="Blocks"i] >> role=option[name="Paragraph"i]'
@@ -1186,11 +1154,11 @@ class WritingFlowUtils {
 			'role=listbox[name="Blocks"i] >> role=option[name="Paragraph"i]'
 		);
 		await this.page.keyboard.type( '2nd col' ); // If this text is too long, it may wrap to a new line and cause test failure. That's why we're using "2nd" instead of "Second" here.
-
-		await this.page.keyboard.press( 'Escape' ); // Enter navigation mode.
-		await this.page.keyboard.press( 'ArrowLeft' ); // Move to the column block.
-		await this.page.keyboard.press( 'ArrowLeft' ); // Move to the columns block.
-		await this.page.keyboard.press( 'Enter' ); // Enter edit mode with the columns block selected.
+		await this.editor.showBlockToolbar();
+		await this.page.keyboard.press( 'Shift+Tab' ); // Move to toolbar to select parent
+		await this.page.keyboard.press( 'Enter' ); // Selects the column block.
+		await this.page.keyboard.press( 'Shift+Tab' ); // Move to toolbar to select parent
+		await this.page.keyboard.press( 'Enter' ); // Selects the columns block.
 		await this.page.keyboard.press( 'Enter' ); // Creates a paragraph after the columns block.
 		await this.page.keyboard.type( 'Second paragraph' );
 	}
diff --git a/test/e2e/specs/interactivity/async-actions.spec.ts b/test/e2e/specs/interactivity/async-actions.spec.ts
new file mode 100644
index 00000000000000..55e44d6cd4a085
--- /dev/null
+++ b/test/e2e/specs/interactivity/async-actions.spec.ts
@@ -0,0 +1,31 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'async actions', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/generator-scope' );
+	} );
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/generator-scope' ) );
+	} );
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'Promise generator callbacks should restore scope on resolve and reject', async ( {
+		page,
+	} ) => {
+		const resultInput = page.getByTestId( 'result' );
+		await expect( resultInput ).toHaveValue( '' );
+
+		await page.getByTestId( 'resolve' ).click();
+		await expect( resultInput ).toHaveValue( 'ok' );
+
+		await page.getByTestId( 'reject' ).click();
+		await expect( resultInput ).toHaveValue( 'Error: 😘' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/deferred-store.spec.ts b/test/e2e/specs/interactivity/deferred-store.spec.ts
new file mode 100644
index 00000000000000..0ddbcb0a60d2f4
--- /dev/null
+++ b/test/e2e/specs/interactivity/deferred-store.spec.ts
@@ -0,0 +1,40 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'deferred store', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/deferred-store' );
+	} );
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/deferred-store' ) );
+	} );
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'Ensure that a store can be subscribed to before it is initialized', async ( {
+		page,
+	} ) => {
+		const resultInput = page.getByTestId( 'result' );
+		await expect( resultInput ).toHaveText( '' );
+		await page.evaluate( () => {
+			window.dispatchEvent( new Event( '_test_proceed_' ) );
+		} );
+		await expect( resultInput ).toHaveText( 'Hello, world!' );
+	} );
+
+	test( 'Ensure that a state getter can be subscribed to before it is initialized', async ( {
+		page,
+	} ) => {
+		const resultInput = page.getByTestId( 'result-getter' );
+		await expect( resultInput ).toHaveText( '' );
+		await page.evaluate( () => {
+			window.dispatchEvent( new Event( '_test_proceed_' ) );
+		} );
+		await expect( resultInput ).toHaveText( 'Hello, world!' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directive-bind.spec.ts b/test/e2e/specs/interactivity/directive-bind.spec.ts
index 525fceab5ca6ae..11902018e0753a 100644
--- a/test/e2e/specs/interactivity/directive-bind.spec.ts
+++ b/test/e2e/specs/interactivity/directive-bind.spec.ts
@@ -210,6 +210,12 @@ test.describe( 'data-wp-bind', () => {
 					const el = container.getByTestId( testid );
 					const toggle = container.getByTestId( 'toggle value' );
 
+					// Ensure hydration has happened.
+					const checkbox = page.getByTestId(
+						'add missing checked at hydration'
+					);
+					await expect( checkbox ).toBeChecked();
+
 					const hydratedAttr = await el.getAttribute( name );
 					const hydratedProp = await el.evaluate(
 						( node, propName ) => ( node as any )[ propName ],
@@ -236,7 +242,13 @@ test.describe( 'data-wp-bind', () => {
 						return;
 					}
 
-					await toggle.click( { clickCount: 2, delay: 50 } );
+					await toggle.click( { clickCount: 2 } );
+
+					// Ensure values have been updated after toggling.
+					await expect( toggle ).toHaveAttribute(
+						'data-toggle-count',
+						'2'
+					);
 
 					// Values should be the same as before.
 					const renderedAttr = await el.getAttribute( name );
diff --git a/test/e2e/specs/interactivity/directive-class.spec.ts b/test/e2e/specs/interactivity/directive-class.spec.ts
new file mode 100644
index 00000000000000..96b725568767ae
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-class.spec.ts
@@ -0,0 +1,121 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-class', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-class' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-class' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'remove class if callback returns falsy value', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId(
+			'remove class if callback returns falsy value'
+		);
+		await expect( el ).toHaveClass( 'bar' );
+		await page.getByTestId( 'toggle falseValue' ).click();
+		await expect( el ).toHaveClass( 'foo bar' );
+		await page.getByTestId( 'toggle falseValue' ).click();
+		await expect( el ).toHaveClass( 'bar' );
+	} );
+
+	test( 'add class if callback returns truthy value', async ( { page } ) => {
+		const el = page.getByTestId(
+			'add class if callback returns truthy value'
+		);
+		await expect( el ).toHaveClass( 'foo bar' );
+		await page.getByTestId( 'toggle trueValue' ).click();
+		await expect( el ).toHaveClass( 'foo' );
+		await page.getByTestId( 'toggle trueValue' ).click();
+		await expect( el ).toHaveClass( 'foo bar' );
+	} );
+
+	test( 'handles multiple classes and callbacks', async ( { page } ) => {
+		const el = page.getByTestId( 'handles multiple classes and callbacks' );
+		await expect( el ).toHaveClass( 'bar baz' );
+		await page.getByTestId( 'toggle trueValue' ).click();
+		await expect( el ).toHaveClass( '' );
+		await page.getByTestId( 'toggle trueValue' ).click();
+		await expect( el ).toHaveClass( 'bar baz' );
+		await page.getByTestId( 'toggle falseValue' ).click();
+		await expect( el ).toHaveClass( 'foo bar baz' );
+		await page.getByTestId( 'toggle trueValue' ).click();
+		await expect( el ).toHaveClass( 'foo' );
+	} );
+
+	test( 'handles class names that are contained inside other class names', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId(
+			'handles class names that are contained inside other class names'
+		);
+		await expect( el ).toHaveClass( 'foo-bar' );
+		await page.getByTestId( 'toggle falseValue' ).click();
+		await expect( el ).toHaveClass( 'foo foo-bar' );
+		await page.getByTestId( 'toggle trueValue' ).click();
+		await expect( el ).toHaveClass( 'foo' );
+	} );
+
+	test( 'can toggle class in the middle', async ( { page } ) => {
+		const el = page.getByTestId( 'can toggle class in the middle' );
+		await expect( el ).toHaveClass( 'foo bar baz' );
+		await page.getByTestId( 'toggle trueValue' ).click();
+		await expect( el ).toHaveClass( 'foo baz' );
+		await page.getByTestId( 'toggle trueValue' ).click();
+		await expect( el ).toHaveClass( 'foo bar baz' );
+	} );
+
+	test( 'can toggle class when class attribute is missing', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId(
+			'can toggle class when class attribute is missing'
+		);
+		await expect( el ).toHaveClass( '' );
+		await page.getByTestId( 'toggle falseValue' ).click();
+		await expect( el ).toHaveClass( 'foo' );
+		await page.getByTestId( 'toggle falseValue' ).click();
+		await expect( el ).toHaveClass( '' );
+	} );
+
+	test( 'can use context values', async ( { page } ) => {
+		const el = page.getByTestId( 'can use context values' );
+		await expect( el ).toHaveClass( '' );
+		await page.getByTestId( 'toggle context false value' ).click();
+		await expect( el ).toHaveClass( 'foo' );
+		await page.getByTestId( 'toggle context false value' ).click();
+		await expect( el ).toHaveClass( '' );
+	} );
+
+	test( 'can use BEM notation classes', async ( { page } ) => {
+		const el = page.getByTestId( 'can use BEM notation classes' );
+		await expect( el ).toHaveClass( 'block__element--modifier' );
+	} );
+
+	test( 'can use classes with several dashes', async ( { page } ) => {
+		const el = page.getByTestId( 'can use classes with several dashes' );
+		await expect( el ).toHaveClass( 'main-bg----color' );
+	} );
+
+	test( 'can use "default" as a class name', async ( { page } ) => {
+		const el = page.getByTestId( 'class name default' );
+		const btn = page.getByTestId( 'toggle class name default' );
+		await expect( el ).not.toHaveClass( 'default' );
+		await btn.click();
+		await expect( el ).toHaveClass( 'default' );
+		await btn.click();
+		await expect( el ).not.toHaveClass( 'default' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directive-context.spec.ts b/test/e2e/specs/interactivity/directive-context.spec.ts
new file mode 100644
index 00000000000000..0a27fe258d5a8d
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-context.spec.ts
@@ -0,0 +1,398 @@
+/**
+ * External dependencies
+ */
+import type { Locator } from '@playwright/test';
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+const parseContent = async ( loc: Locator ) =>
+	JSON.parse( ( await loc.textContent() ) || '' );
+
+test.describe( 'data-wp-context', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-context' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-context' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'is correctly initialized', async ( { page } ) => {
+		const parentContext = await parseContent(
+			page.getByTestId( 'parent context' )
+		);
+
+		expect( parentContext ).toMatchObject( {
+			prop1: 'parent',
+			prop2: 'parent',
+			obj: { prop4: 'parent', prop5: 'parent' },
+			array: [ 1, 2, 3 ],
+		} );
+	} );
+
+	test( 'is correctly extended (shallow)', async ( { page } ) => {
+		const childContext = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( childContext ).toMatchObject( {
+			prop1: 'parent',
+			prop2: 'child',
+			prop3: 'child',
+			obj: { prop5: 'child', prop6: 'child' },
+			array: [ 4, 5, 6 ],
+		} );
+	} );
+
+	test( "changes in inherited properties are reflected and don't leak down (child)", async ( {
+		page,
+	} ) => {
+		await page.getByTestId( 'child prop1' ).click();
+		await page.getByTestId( 'child obj.prop4' ).click();
+
+		const childContext = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( childContext.prop1 ).toBe( 'modifiedFromChild' );
+		expect( childContext.obj.prop4 ).toBe( 'modifiedFromChild' );
+
+		const parentContext = await parseContent(
+			page.getByTestId( 'parent context' )
+		);
+
+		expect( parentContext.prop1 ).toBe( 'modifiedFromChild' );
+		expect( parentContext.obj.prop4 ).toBe( 'parent' );
+	} );
+
+	test( "changes in inherited properties are reflected and don't leak up (parent)", async ( {
+		page,
+	} ) => {
+		await page.getByTestId( 'parent prop1' ).click();
+		await page.getByTestId( 'parent obj.prop4' ).click();
+
+		const childContext = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( childContext.prop1 ).toBe( 'modifiedFromParent' );
+		expect( childContext.obj.prop4 ).toBeUndefined();
+
+		const parentContext = await parseContent(
+			page.getByTestId( 'parent context' )
+		);
+
+		expect( parentContext.prop1 ).toBe( 'modifiedFromParent' );
+		expect( parentContext.obj.prop4 ).toBe( 'modifiedFromParent' );
+	} );
+
+	test( 'changes in shadowed properties do not leak (child)', async ( {
+		page,
+	} ) => {
+		await page.getByTestId( 'child prop2' ).click();
+		await page.getByTestId( 'child obj.prop5' ).click();
+
+		const childContext = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( childContext.prop2 ).toBe( 'modifiedFromChild' );
+		expect( childContext.obj.prop5 ).toBe( 'modifiedFromChild' );
+
+		const parentContext = await parseContent(
+			page.getByTestId( 'parent context' )
+		);
+
+		expect( parentContext.prop2 ).toBe( 'parent' );
+		expect( parentContext.obj.prop5 ).toBe( 'parent' );
+	} );
+
+	test( 'changes in shadowed properties do not leak (parent)', async ( {
+		page,
+	} ) => {
+		await page.getByTestId( 'parent prop2' ).click();
+		await page.getByTestId( 'parent obj.prop5' ).click();
+
+		const childContext = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( childContext.prop2 ).toBe( 'child' );
+		expect( childContext.obj.prop5 ).toBe( 'child' );
+
+		const parentContext = await parseContent(
+			page.getByTestId( 'parent context' )
+		);
+
+		expect( parentContext.prop2 ).toBe( 'modifiedFromParent' );
+		expect( parentContext.obj.prop5 ).toBe( 'modifiedFromParent' );
+	} );
+
+	test( 'new inherited properties update child contexts', async ( {
+		page,
+	} ) => {
+		const childContextBefore = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+		expect( childContextBefore.new ).toBeUndefined();
+
+		await page.getByTestId( 'parent new' ).click();
+
+		const childContextAfter = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+		expect( childContextAfter.new ).toBe( 'modifiedFromParent' );
+
+		const parentContext = await parseContent(
+			page.getByTestId( 'parent context' )
+		);
+		expect( parentContext.new ).toBe( 'modifiedFromParent' );
+	} );
+
+	test( 'Array properties are shadowed', async ( { page } ) => {
+		const parentContext = await parseContent(
+			page.getByTestId( 'parent context' )
+		);
+
+		const childContext = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( parentContext.array ).toMatchObject( [ 1, 2, 3 ] );
+		expect( childContext.array ).toMatchObject( [ 4, 5, 6 ] );
+	} );
+
+	test( "overwritten objects don't inherit values (shallow)", async ( {
+		page,
+	} ) => {
+		await page.getByTestId( 'parent replace' ).click();
+
+		const childContext = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( childContext.obj.prop4 ).toBeUndefined();
+		expect( childContext.obj.prop5 ).toBe( 'child' );
+		expect( childContext.obj.prop6 ).toBe( 'child' );
+		expect( childContext.obj.overwritten ).toBeUndefined();
+
+		const parentContext = await parseContent(
+			page.getByTestId( 'parent context' )
+		);
+
+		expect( parentContext.obj.prop4 ).toBeUndefined();
+		expect( parentContext.obj.prop5 ).toBeUndefined();
+		expect( parentContext.obj.prop6 ).toBeUndefined();
+		expect( parentContext.obj.overwritten ).toBe( true );
+	} );
+
+	test( 'overwritten objects do not inherit values', async ( { page } ) => {
+		await page.getByTestId( 'child replace' ).click();
+
+		const childContext = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( childContext.obj.prop4 ).toBeUndefined();
+		expect( childContext.obj.prop5 ).toBeUndefined();
+		expect( childContext.obj.prop6 ).toBeUndefined();
+		expect( childContext.obj.overwritten ).toBe( true );
+
+		const parentContext = await parseContent(
+			page.getByTestId( 'parent context' )
+		);
+
+		expect( parentContext.obj.prop4 ).toBe( 'parent' );
+		expect( parentContext.obj.prop5 ).toBe( 'parent' );
+		expect( parentContext.obj.prop6 ).toBeUndefined();
+		expect( parentContext.obj.overwritten ).toBeUndefined();
+	} );
+
+	test( 'can be accessed in other directives on the same element', async ( {
+		page,
+	} ) => {
+		const element = page.getByTestId( 'context & other directives' );
+		await expect( element ).toHaveText( 'Text 1' );
+		await expect( element ).toHaveAttribute( 'value', 'Text 1' );
+		await element.click();
+		await expect( element ).toHaveText( 'Text 2' );
+		await expect( element ).toHaveAttribute( 'value', 'Text 2' );
+		await element.click();
+		await expect( element ).toHaveText( 'Text 1' );
+		await expect( element ).toHaveAttribute( 'value', 'Text 1' );
+	} );
+
+	test( 'should preserve values on navigation', async ( { page } ) => {
+		const element = page.getByTestId( 'navigation text' );
+		await expect( element ).toHaveText( 'first page' );
+		await page.getByTestId( 'toggle text' ).click();
+		await expect( element ).toHaveText( 'changed dynamically' );
+		await page.getByTestId( 'navigate' ).click();
+		await expect( element ).toHaveText( 'changed dynamically' );
+	} );
+
+	test( 'should preserve the previous context values', async ( { page } ) => {
+		const element = page.getByTestId( 'navigation new text' );
+		await expect( element ).toHaveText( '' );
+		await page.getByTestId( 'add new text' ).click();
+		await expect( element ).toHaveText( 'some new text' );
+		await page.getByTestId( 'navigate' ).click();
+		await expect( element ).toHaveText( 'some new text' );
+	} );
+
+	test( 'should preserve values when navigating back or forward', async ( {
+		page,
+	} ) => {
+		const element = page.getByTestId( 'navigation text' );
+		await page.getByTestId( 'navigate' ).click();
+		await expect( element ).toHaveText( 'first page' );
+		await page.goBack();
+		await expect( element ).toHaveText( 'first page' );
+		await page.goForward();
+		await expect( element ).toHaveText( 'first page' );
+	} );
+
+	test( 'should inherit values on navigation', async ( { page } ) => {
+		const text = page.getByTestId( 'navigation inherited text' );
+		const text2 = page.getByTestId( 'navigation inherited text2' );
+		await expect( text ).toHaveText( 'first page' );
+		await expect( text2 ).toBeEmpty();
+		await page.getByTestId( 'toggle text' ).click();
+		await expect( text ).toHaveText( 'changed dynamically' );
+		await page.getByTestId( 'add text2' ).click();
+		await expect( text2 ).toHaveText( 'some new text' );
+		await page.getByTestId( 'navigate' ).click();
+		await expect( text ).toHaveText( 'changed dynamically' );
+		await expect( text2 ).toHaveText( 'some new text' );
+		await page.goBack();
+		await expect( text ).toHaveText( 'changed dynamically' );
+		await expect( text2 ).toHaveText( 'some new text' );
+		await page.goForward();
+		await expect( text ).toHaveText( 'changed dynamically' );
+		await expect( text2 ).toHaveText( 'some new text' );
+	} );
+
+	test( 'should maintain the same context reference on async actions', async ( {
+		page,
+	} ) => {
+		const element = page.getByTestId( 'navigation new text' );
+		await expect( element ).toHaveText( '' );
+		await page.getByTestId( 'async navigate' ).click();
+		await expect( element ).toHaveText( 'changed from async action' );
+	} );
+
+	test( 'should bail out if the context is not a default directive', async ( {
+		page,
+	} ) => {
+		/*
+		 * This test is to ensure that the context directive is only applied to the
+		 * default directive and not to any other directive.
+		 */
+		const defaultElement = page.getByTestId( 'default suffix context' );
+		await expect( defaultElement ).toHaveText( 'default' );
+		const element = page.getByTestId( 'non-default suffix context' );
+		await expect( element ).toHaveText( '' );
+	} );
+
+	test( 'references to objects are kept', async ( { page } ) => {
+		const selected = page.getByTestId( 'selected' );
+		const select1 = page.getByTestId( 'select 1' );
+		const select2 = page.getByTestId( 'select 2' );
+
+		await expect( selected ).toBeEmpty();
+
+		await select1.click();
+		await expect( selected ).toHaveText( 'Text 1' );
+
+		await select2.click();
+		await expect( selected ).toHaveText( 'Text 2' );
+	} );
+
+	test( 'should not subscribe to parent context props if those also exist in child', async ( {
+		page,
+	} ) => {
+		const counterParent = page.getByTestId( 'counter parent' );
+		const counterChild = page.getByTestId( 'counter child' );
+		const changes = page.getByTestId( 'counter changes' );
+
+		await expect( counterParent ).toHaveText( '0' );
+		await expect( counterChild ).toHaveText( '0' );
+		// The first render counts, so the changes counter starts at 1.
+		await expect( changes ).toHaveText( '1' );
+
+		await counterParent.click();
+		await expect( counterParent ).toHaveText( '1' );
+		await expect( counterChild ).toHaveText( '0' );
+		await expect( changes ).toHaveText( '1' );
+
+		await counterChild.click();
+		await expect( counterParent ).toHaveText( '1' );
+		await expect( counterChild ).toHaveText( '1' );
+		await expect( changes ).toHaveText( '2' );
+	} );
+
+	test( 'references to the same context object should be preserved', async ( {
+		page,
+	} ) => {
+		const isProxyPreserved = page.getByTestId( 'is proxy preserved' );
+		await expect( isProxyPreserved ).toHaveText( 'true' );
+	} );
+
+	test( 'references to copied context objects should be preserved', async ( {
+		page,
+	} ) => {
+		await page.getByTestId( 'child copy obj' ).click();
+		const isProxyPreservedOnCopy = page.getByTestId(
+			'is proxy preserved on copy'
+		);
+		await expect( isProxyPreservedOnCopy ).toHaveText( 'true' );
+	} );
+
+	test( 'objects referenced from the context inherit properties where they are originally defined ', async ( {
+		page,
+	} ) => {
+		await page.getByTestId( 'child copy obj' ).click();
+
+		const childContextBefore = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( childContextBefore.obj2.prop4 ).toBeUndefined();
+		expect( childContextBefore.obj2.prop5 ).toBe( 'child' );
+		expect( childContextBefore.obj2.prop6 ).toBe( 'child' );
+
+		await page.getByTestId( 'parent replace' ).click();
+
+		const childContextAfter = await parseContent(
+			page.getByTestId( 'child context' )
+		);
+
+		expect( childContextAfter.obj2.prop4 ).toBeUndefined();
+		expect( childContextAfter.obj2.prop5 ).toBe( 'child' );
+		expect( childContextAfter.obj2.prop6 ).toBe( 'child' );
+		expect( childContextAfter.obj2.overwritten ).toBeUndefined();
+	} );
+
+	test( 'properties from other namespaces defined in a parent context are inherited', async ( {
+		page,
+	} ) => {
+		const childProp = page
+			.getByTestId( 'inheritance from other namespaces' )
+			.getByTestId( 'child' );
+
+		const parentProp = page
+			.getByTestId( 'inheritance from other namespaces' )
+			.getByTestId( 'parent' );
+
+		await expect( childProp ).toHaveText( 'fromChildNs' );
+		await expect( parentProp ).toHaveText( 'fromParentNs' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directive-each.spec.ts b/test/e2e/specs/interactivity/directive-each.spec.ts
new file mode 100644
index 00000000000000..511b38e7ddbb8b
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-each.spec.ts
@@ -0,0 +1,503 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-each', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-each' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-each' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'should use `item` as the defaul item name in the context', async ( {
+		page,
+	} ) => {
+		const elements = page.getByTestId( 'letters' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [ 'A', 'B', 'C' ] );
+	} );
+
+	test( 'should use the specified item name in the context', async ( {
+		page,
+	} ) => {
+		const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [
+			'avocado',
+			'banana',
+			'cherimoya',
+		] );
+	} );
+
+	test( 'should convert from kebab-case to camelCase the specified item name in the context', async ( {
+		page,
+	} ) => {
+		const elements = page
+			.getByTestId( 'letters-kebab-case' )
+			.getByTestId( 'item' );
+		await expect( elements ).toHaveText( [ 'A', 'B', 'C' ] );
+	} );
+
+	test.describe( 'without `wp-each-key`', () => {
+		test.beforeEach( async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			// These tags are included to check that the elements are not unmounted
+			// and mounted again. If an element remounts, its tag should be missing.
+			await elements.evaluateAll( ( refs ) =>
+				refs.forEach( ( ref, index ) => {
+					if ( ref instanceof HTMLElement ) {
+						ref.dataset.tag = `${ index }`;
+					}
+				} )
+			);
+		} );
+
+		test( 'should preserve elements on deletion', async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			// An item is removed when clicked.
+			await elements.first().click();
+
+			await expect( elements ).toHaveText( [ 'banana', 'cherimoya' ] );
+			await expect( elements.getByText( 'avocado' ) ).toBeHidden();
+
+			// Get the tags. They should not have disappeared.
+			const [ banana, cherimoya ] = await elements.all();
+			await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+			await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on reordering', async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'fruits' ).getByTestId( 'rotate' ).click();
+
+			await expect( elements ).toHaveText( [
+				'cherimoya',
+				'avocado',
+				'banana',
+			] );
+
+			// Get the tags. They should not have disappeared or changed.
+			const [ cherimoya, avocado, banana ] = await elements.all();
+			await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+			await expect( avocado ).toHaveAttribute( 'data-tag', '0' );
+			await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+		} );
+
+		test( 'should preserve elements on addition', async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'fruits' ).getByTestId( 'add' ).click();
+
+			await expect( elements ).toHaveText( [
+				'ananas',
+				'avocado',
+				'banana',
+				'cherimoya',
+			] );
+
+			// Get the tags. They should not have disappeared or changed,
+			// except for the newly created element.
+			const [ ananas, avocado, banana, cherimoya ] = await elements.all();
+			await expect( ananas ).not.toHaveAttribute( 'data-tag' );
+			await expect( avocado ).toHaveAttribute( 'data-tag', '0' );
+			await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+			await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on replacement', async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'fruits' ).getByTestId( 'replace' ).click();
+
+			await expect( elements ).toHaveText( [
+				'ananas',
+				'banana',
+				'cherimoya',
+			] );
+
+			// Get the tags. They should not have disappeared or changed,
+			// except for the newly created element.
+			const [ ananas, banana, cherimoya ] = await elements.all();
+			await expect( ananas ).not.toHaveAttribute( 'data-tag' );
+			await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+			await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+		} );
+	} );
+
+	test.describe( 'with `wp-each-key`', () => {
+		test.beforeEach( async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			// These tags are included to check that the elements are not unmounted
+			// and mounted again. If an element remounts, its tag should be missing.
+			await elements.evaluateAll( ( refs ) =>
+				refs.forEach( ( ref, index ) => {
+					if ( ref instanceof HTMLElement ) {
+						ref.dataset.tag = `${ index }`;
+					}
+				} )
+			);
+		} );
+
+		test( 'should preserve elements on deletion', async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await expect( elements ).toHaveText( [
+				'A Game of Thrones',
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// An item is removed when clicked.
+			await elements.first().click();
+
+			await expect( elements ).toHaveText( [
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// Get the tags. They should not have disappeared.
+			const [ acok, asos ] = await elements.all();
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on reordering', async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'books' ).getByTestId( 'rotate' ).click();
+
+			await expect( elements ).toHaveText( [
+				'A Storm of Swords',
+				'A Game of Thrones',
+				'A Clash of Kings',
+			] );
+
+			// Get the tags. They should not have disappeared or changed.
+			const [ asos, agot, acok ] = await elements.all();
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+			await expect( agot ).toHaveAttribute( 'data-tag', '0' );
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+		} );
+
+		test( 'should preserve elements on addition', async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'books' ).getByTestId( 'add' ).click();
+
+			await expect( elements ).toHaveText( [
+				'A Feast for Crows',
+				'A Game of Thrones',
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// Get the tags. They should not have disappeared or changed,
+			// except for the newly created element.
+			const [ affc, agot, acok, asos ] = await elements.all();
+			await expect( affc ).not.toHaveAttribute( 'data-tag' );
+			await expect( agot ).toHaveAttribute( 'data-tag', '0' );
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on replacement', async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'books' ).getByTestId( 'replace' ).click();
+
+			await expect( elements ).toHaveText( [
+				'A Feast for Crows',
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// Get the tags. They should not have disappeared or changed,
+			// except for the newly created element.
+			const [ affc, acok, asos ] = await elements.all();
+			await expect( affc ).not.toHaveAttribute( 'data-tag' );
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on modification', async ( {
+			page,
+		} ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'books' ).getByTestId( 'modify' ).click();
+
+			await expect( elements ).toHaveText( [
+				'A GAME OF THRONES',
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// Get the tags. They should not have disappeared or changed.
+			const [ agot, acok, asos ] = await elements.all();
+			await expect( agot ).toHaveAttribute( 'data-tag', '0' );
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+		} );
+	} );
+
+	test( 'should respect elements after', async ( { page } ) => {
+		const elements = page.getByTestId( 'numbers' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [ '1', '2', '3', '4' ] );
+		await page.getByTestId( 'numbers' ).getByTestId( 'shift' ).click();
+		await expect( elements ).toHaveText( [ '2', '3', '4' ] );
+		await page
+			.getByTestId( 'numbers' )
+			.getByTestId( 'unshift' )
+			.click( { clickCount: 2 } );
+		await expect( elements ).toHaveText( [ '0', '1', '2', '3', '4' ] );
+	} );
+
+	test( 'should support initial empty lists', async ( { page } ) => {
+		const elements = page.getByTestId( 'empty' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [ 'item X' ] );
+		await page
+			.getByTestId( 'empty' )
+			.getByTestId( 'add' )
+			.click( { clickCount: 2 } );
+
+		await expect( elements ).toHaveText( [ 'item 0', 'item 1', 'item X' ] );
+	} );
+
+	test( 'should support multiple siblings inside the template', async ( {
+		page,
+	} ) => {
+		const elements = page.getByTestId( 'siblings' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [
+			'two',
+			'2',
+			'three',
+			'3',
+			'four',
+			'4',
+		] );
+		await page.getByTestId( 'siblings' ).getByTestId( 'unshift' ).click();
+		await expect( elements ).toHaveText( [
+			'one',
+			'1',
+			'two',
+			'2',
+			'three',
+			'3',
+			'four',
+			'4',
+		] );
+	} );
+
+	test( 'should work on navigation', async ( { page } ) => {
+		const elements = page
+			.getByTestId( 'navigation-updated list' )
+			.getByTestId( 'item' );
+
+		// These tags are included to check that the elements are not unmounted
+		// and mounted again. If an element remounts, its tag should be missing.
+		await elements.evaluateAll( ( refs ) =>
+			refs.forEach( ( ref, index ) => {
+				if ( ref instanceof HTMLElement ) {
+					ref.dataset.tag = `${ index }`;
+				}
+			} )
+		);
+
+		await expect( elements ).toHaveText( [ 'b', 'c', 'd' ] );
+
+		await page
+			.getByTestId( 'navigation-updated list' )
+			.getByTestId( 'navigate' )
+			.click();
+
+		await expect( elements ).toHaveText( [ 'a', 'b', 'c', 'd' ] );
+
+		// Get the tags. They should not have disappeared or changed,
+		// except for the newly created element.
+		const [ alpha, beta, gamma, delta ] = await elements.all();
+		await expect( alpha ).not.toHaveAttribute( 'data-tag' );
+		await expect( beta ).toHaveAttribute( 'data-tag', '0' );
+		await expect( gamma ).toHaveAttribute( 'data-tag', '1' );
+		await expect( delta ).toHaveAttribute( 'data-tag', '2' );
+	} );
+
+	test( 'should work with nested lists', async ( { page } ) => {
+		const mainElement = page.getByTestId( 'nested' );
+
+		// These tags are included to check that the elements are not unmounted
+		// and mounted again. If an element remounts, its tag should be missing.
+		const listItems = mainElement.getByRole( 'listitem' );
+		await listItems.evaluateAll( ( refs ) =>
+			refs.forEach( ( ref, index ) => {
+				if ( ref instanceof HTMLElement ) {
+					ref.dataset.tag = `${ index }`;
+				}
+			} )
+		);
+
+		const animals = mainElement.getByTestId( 'animal' );
+
+		{
+			// Ensure it hydrates correctly.
+			const [ dog, cat ] = await animals.all();
+			await expect( dog.getByTestId( 'name' ) ).toHaveText( 'Dog' );
+			await expect( dog.getByRole( 'listitem' ) ).toHaveText( [
+				'chihuahua',
+				'rottweiler',
+			] );
+			await expect( cat.getByTestId( 'name' ) ).toHaveText( 'Cat' );
+			await expect( cat.getByRole( 'listitem' ) ).toHaveText( [
+				'sphynx',
+				'siamese',
+			] );
+		}
+
+		await mainElement.getByTestId( 'add animal' ).click();
+
+		{
+			// Ensure it works when the top list is modified.
+			const [ rat, dog, cat ] = await animals.all();
+			await expect( rat.getByTestId( 'name' ) ).toHaveText( 'Rat' );
+			await expect( rat.getByRole( 'listitem' ) ).toHaveText( [
+				'dumbo',
+				'rex',
+			] );
+			await expect( dog.getByTestId( 'name' ) ).toHaveText( 'Dog' );
+			await expect( dog.getByRole( 'listitem' ) ).toHaveText( [
+				'chihuahua',
+				'rottweiler',
+			] );
+			await expect( cat.getByTestId( 'name' ) ).toHaveText( 'Cat' );
+			await expect( cat.getByRole( 'listitem' ) ).toHaveText( [
+				'sphynx',
+				'siamese',
+			] );
+			await expect( rat ).not.toHaveAttribute( 'data-tag' );
+			const [ d1, d2 ] = await dog.getByRole( 'listitem' ).all();
+			await expect( dog ).toHaveAttribute( 'data-tag', '0' );
+			await expect( d1 ).toHaveAttribute( 'data-tag', '1' );
+			await expect( d2 ).toHaveAttribute( 'data-tag', '2' );
+			const [ c1, c2 ] = await cat.getByRole( 'listitem' ).all();
+			await expect( cat ).toHaveAttribute( 'data-tag', '3' );
+			await expect( c1 ).toHaveAttribute( 'data-tag', '4' );
+			await expect( c2 ).toHaveAttribute( 'data-tag', '5' );
+		}
+
+		// Reset tags so the added elements have one.
+		await listItems.evaluateAll( ( refs ) =>
+			refs.forEach( ( ref, index ) => {
+				if ( ref instanceof HTMLElement ) {
+					ref.dataset.tag = `${ index }`;
+				}
+			} )
+		);
+
+		await mainElement.getByTestId( 'add breeds' ).click();
+
+		{
+			// Ensure it works when the top list is modified.
+			const [ rat, dog, cat ] = await animals.all();
+			await expect( rat.getByTestId( 'name' ) ).toHaveText( 'Rat' );
+			await expect( rat.getByRole( 'listitem' ) ).toHaveText( [
+				'satin',
+				'dumbo',
+				'rex',
+			] );
+			await expect( dog.getByTestId( 'name' ) ).toHaveText( 'Dog' );
+			await expect( dog.getByRole( 'listitem' ) ).toHaveText( [
+				'german shepherd',
+				'chihuahua',
+				'rottweiler',
+			] );
+			await expect( cat.getByTestId( 'name' ) ).toHaveText( 'Cat' );
+			await expect( cat.getByRole( 'listitem' ) ).toHaveText( [
+				'maine coon',
+				'sphynx',
+				'siamese',
+			] );
+			const [ r1, r2, r3 ] = await rat.getByRole( 'listitem' ).all();
+			await expect( rat ).toHaveAttribute( 'data-tag', '0' );
+			await expect( r1 ).not.toHaveAttribute( 'data-tag' );
+			await expect( r2 ).toHaveAttribute( 'data-tag', '1' );
+			await expect( r3 ).toHaveAttribute( 'data-tag', '2' );
+			const [ d1, d2, d3 ] = await dog.getByRole( 'listitem' ).all();
+			await expect( dog ).toHaveAttribute( 'data-tag', '3' );
+			await expect( d1 ).not.toHaveAttribute( 'data-tag' );
+			await expect( d2 ).toHaveAttribute( 'data-tag', '4' );
+			await expect( d3 ).toHaveAttribute( 'data-tag', '5' );
+			const [ c1, c2, c3 ] = await cat.getByRole( 'listitem' ).all();
+			await expect( cat ).toHaveAttribute( 'data-tag', '6' );
+			await expect( c1 ).not.toHaveAttribute( 'data-tag' );
+			await expect( c2 ).toHaveAttribute( 'data-tag', '7' );
+			await expect( c3 ).toHaveAttribute( 'data-tag', '8' );
+		}
+	} );
+
+	test( 'should do nothing when used on non-template elements', async ( {
+		page,
+	} ) => {
+		const elements = page
+			.getByTestId( 'invalid tag' )
+			.getByTestId( 'item' );
+
+		await expect( elements ).toHaveCount( 1 );
+		await expect( elements ).toBeEmpty();
+	} );
+
+	test( 'should work with derived state as keys', async ( { page } ) => {
+		const elements = page
+			.getByTestId( 'derived state' )
+			.getByTestId( 'item' );
+
+		// These tags are included to check that the elements are not unmounted
+		// and mounted again. If an element remounts, its tag should be missing.
+		await elements.evaluateAll( ( refs ) =>
+			refs.forEach( ( ref, index ) => {
+				if ( ref instanceof HTMLElement ) {
+					ref.dataset.tag = `${ index }`;
+				}
+			} )
+		);
+
+		await page
+			.getByTestId( 'derived state' )
+			.getByTestId( 'rotate' )
+			.click();
+
+		await expect( elements ).toHaveText( [
+			'cherimoya',
+			'avocado',
+			'banana',
+		] );
+
+		// Get the tags. They should not have disappeared or changed.
+		const [ cherimoya, avocado, banana ] = await elements.all();
+		await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+		await expect( avocado ).toHaveAttribute( 'data-tag', '0' );
+		await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+	} );
+
+	test( 'directives inside elements with `wp-each-child` should not run', async ( {
+		page,
+	} ) => {
+		const element = page
+			.getByTestId( 'elements with directives' )
+			.getByTestId( 'item' );
+		const callbackRunCount = page
+			.getByTestId( 'elements with directives' )
+			.getByTestId( 'callbackRunCount' );
+		await expect( element ).toHaveText( 'beta' );
+		await expect( callbackRunCount ).toHaveText( '1' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directive-on-document.spec.ts b/test/e2e/specs/interactivity/directive-on-document.spec.ts
new file mode 100644
index 00000000000000..62d122ee2359e8
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-on-document.spec.ts
@@ -0,0 +1,89 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-on-document', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-on-document' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-on-document' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'the event listener is attached when the element is added', async ( {
+		page,
+	} ) => {
+		const counter = page.getByTestId( 'counter' );
+		const visibilityButton = page.getByTestId( 'visibility' );
+
+		// Initial value.
+		await expect( counter ).toHaveText( '0' );
+
+		// Make sure the event listener is attached.
+		await page
+			.getByTestId( 'isEventAttached' )
+			.filter( { hasText: 'yes' } )
+			.waitFor();
+
+		// This keyboard press should increase the counter.
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( counter ).toHaveText( '1' );
+
+		// Remove the element.
+		await visibilityButton.click();
+
+		// Make sure the event listener is not attached.
+		await page
+			.getByTestId( 'isEventAttached' )
+			.filter( { hasText: 'no' } )
+			.waitFor();
+
+		// This keyboard press should not increase the counter.
+		await page.keyboard.press( 'ArrowDown' );
+
+		// Add the element back.
+		await visibilityButton.click();
+
+		// The counter should have the same value as before.
+		await expect( counter ).toHaveText( '1' );
+
+		// Make sure the event listener is re-attached.
+		await page
+			.getByTestId( 'isEventAttached' )
+			.filter( { hasText: 'yes' } )
+			.waitFor();
+
+		// This keyboard press should increase the counter.
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( counter ).toHaveText( '2' );
+	} );
+	test( 'should work with multiple event handlers on the same event type', async ( {
+		page,
+	} ) => {
+		const keydownHandler = page.getByTestId( 'keydownHandler' );
+		const keydownSecondHandler = page.getByTestId( 'keydownSecondHandler' );
+
+		// Initial value.
+		await expect( keydownHandler ).toHaveText( 'no' );
+		await expect( keydownSecondHandler ).toHaveText( 'no' );
+
+		// Make sure the event listener is attached.
+		await page
+			.getByTestId( 'isEventAttached' )
+			.filter( { hasText: 'yes' } )
+			.waitFor();
+
+		// This keyboard press should increase the counter.
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( keydownHandler ).toHaveText( 'yes' );
+		await expect( keydownSecondHandler ).toHaveText( 'yes' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directive-on-window.spec.ts b/test/e2e/specs/interactivity/directive-on-window.spec.ts
new file mode 100644
index 00000000000000..ed090839c49ade
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-on-window.spec.ts
@@ -0,0 +1,89 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-on-window', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-on-window' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-on-window' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'the event listener is attached when the element is added', async ( {
+		page,
+	} ) => {
+		const counter = page.getByTestId( 'counter' );
+		const visibilityButton = page.getByTestId( 'visibility' );
+
+		// Initial value.
+		await expect( counter ).toHaveText( '0' );
+
+		// Make sure the event listener is attached.
+		await page
+			.getByTestId( 'isEventAttached' )
+			.filter( { hasText: 'yes' } )
+			.waitFor();
+
+		// Change the viewport size.
+		await page.setViewportSize( { width: 600, height: 600 } );
+		await expect( counter ).toHaveText( '1' );
+
+		// Remove the element.
+		await visibilityButton.click();
+
+		// Make sure the event listener is not attached.
+		await page
+			.getByTestId( 'isEventAttached' )
+			.filter( { hasText: 'no' } )
+			.waitFor();
+
+		// This resize should not increase the counter.
+		await page.setViewportSize( { width: 300, height: 600 } );
+
+		// Add the element back.
+		await visibilityButton.click();
+
+		// The counter should have the same value as before.
+		await expect( counter ).toHaveText( '1' );
+
+		// Make sure the event listener is re-attached.
+		await page
+			.getByTestId( 'isEventAttached' )
+			.filter( { hasText: 'yes' } )
+			.waitFor();
+
+		// This resize should increase the counter.
+		await page.setViewportSize( { width: 200, height: 600 } );
+		await expect( counter ).toHaveText( '2' );
+	} );
+	test( 'should work with multiple event handlers on the same event type', async ( {
+		page,
+	} ) => {
+		const resizeHandler = page.getByTestId( 'resizeHandler' );
+		const resizeSecondHandler = page.getByTestId( 'resizeSecondHandler' );
+
+		// Initial value.
+		await expect( resizeHandler ).toHaveText( 'no' );
+		await expect( resizeSecondHandler ).toHaveText( 'no' );
+
+		// Make sure the event listener is attached.
+		await page
+			.getByTestId( 'isEventAttached' )
+			.filter( { hasText: 'yes' } )
+			.waitFor();
+
+		// This keyboard press should increase the counter.
+		await page.setViewportSize( { width: 600, height: 600 } );
+		await expect( resizeHandler ).toHaveText( 'yes' );
+		await expect( resizeSecondHandler ).toHaveText( 'yes' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directive-on.spec.ts b/test/e2e/specs/interactivity/directive-on.spec.ts
index 03dfe64462c567..886f74335e7aee 100644
--- a/test/e2e/specs/interactivity/directive-on.spec.ts
+++ b/test/e2e/specs/interactivity/directive-on.spec.ts
@@ -51,4 +51,29 @@ test.describe( 'data-wp-on', () => {
 			.click( { clickCount: 3, delay: 100 } );
 		await expect( counter ).toHaveText( '3' );
 	} );
+
+	test( 'should work with multiple event handlers on the same event type', async ( {
+		page,
+	} ) => {
+		const button = page.getByTestId( 'multiple handlers button' );
+		const isOpen = page.getByTestId( 'multiple handlers isOpen' );
+		const clicked = page.getByTestId( 'multiple handlers clicked' );
+		const clickCount = page.getByTestId( 'multiple handlers clickCount' );
+
+		await expect( clicked ).toHaveText( 'false' );
+		await expect( clickCount ).toHaveText( '0' );
+		await expect( isOpen ).toHaveText( 'true' );
+
+		await button.click();
+
+		await expect( clicked ).toHaveText( 'true' );
+		await expect( clickCount ).toHaveText( '1' );
+		await expect( isOpen ).toHaveText( 'false' );
+
+		await button.click();
+
+		await expect( clicked ).toHaveText( 'true' );
+		await expect( clickCount ).toHaveText( '2' );
+		await expect( isOpen ).toHaveText( 'true' );
+	} );
 } );
diff --git a/test/e2e/specs/interactivity/directive-run.spec.ts b/test/e2e/specs/interactivity/directive-run.spec.ts
new file mode 100644
index 00000000000000..0348bdb95c2ab7
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-run.spec.ts
@@ -0,0 +1,61 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-run', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-run' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-run' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'should execute each element render', async ( { page } ) => {
+		await expect( page.getByTestId( 'hydrated' ) ).toHaveText( 'yes' );
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '1' );
+		await page.getByTestId( 'increment' ).click();
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '2' );
+		await page.getByTestId( 'increment' ).click();
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '3' );
+	} );
+
+	test( 'should execute when an element is mounted', async ( { page } ) => {
+		await expect( page.getByTestId( 'mounted' ) ).toHaveText( 'no' );
+		await page.getByTestId( 'toggle' ).click();
+		await expect( page.getByTestId( 'mounted' ) ).toHaveText( 'yes' );
+	} );
+
+	test( 'should work with client-side navigation', async ( { page } ) => {
+		await page.getByTestId( 'increment' ).click();
+		await page.getByTestId( 'increment' ).click();
+		await expect( page.getByTestId( 'navigated' ) ).toHaveText( 'no' );
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '3' );
+		await page.getByTestId( 'navigate' ).click();
+		await expect( page.getByTestId( 'navigated' ) ).toHaveText( 'yes' );
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '4' );
+	} );
+
+	test( 'should allow executing hooks', async ( { page } ) => {
+		await page.getByTestId( 'toggle' ).click();
+		const results = page.getByTestId( 'wp-run hooks results' );
+		await expect( results ).toHaveAttribute( 'data-init', 'initialized' );
+
+		await expect( results ).toHaveAttribute( 'data-watch', '0' );
+		await page.getByTestId( 'increment' ).click();
+		await expect( results ).toHaveAttribute( 'data-watch', '1' );
+		await page.getByTestId( 'increment' ).click();
+		await expect( results ).toHaveAttribute( 'data-watch', '2' );
+
+		await page.getByTestId( 'toggle' ).click();
+		await expect( results ).toHaveAttribute( 'data-init', 'cleaned up' );
+		await expect( results ).toHaveAttribute( 'data-watch', 'cleaned up' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directive-slots.spec.ts b/test/e2e/specs/interactivity/directive-slots.spec.ts
deleted file mode 100644
index 195af52fdb1bd2..00000000000000
--- a/test/e2e/specs/interactivity/directive-slots.spec.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * Internal dependencies
- */
-import { test, expect } from './fixtures';
-
-test.describe( 'data-wp-slot', () => {
-	test.beforeAll( async ( { interactivityUtils: utils } ) => {
-		await utils.activatePlugins();
-		await utils.addPostWithBlock( 'test/directive-slots' );
-	} );
-
-	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
-		await page.goto( utils.getLink( 'test/directive-slots' ) );
-	} );
-
-	test.afterAll( async ( { interactivityUtils: utils } ) => {
-		await utils.deactivatePlugins();
-		await utils.deleteAllPosts();
-	} );
-
-	test( 'should render the fill in its children by default', async ( {
-		page,
-	} ) => {
-		const slot1 = page.getByTestId( 'slot-1' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-1-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot1.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slot1 ).toHaveText( 'fill inside slot 1' );
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'fill inside slot 1',
-			'[2]',
-			'[3]',
-			'[4]',
-			'[5]',
-		] );
-	} );
-
-	test( 'should render the fill before if specified', async ( { page } ) => {
-		const slot2 = page.getByTestId( 'slot-2' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-2-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot2 ).toHaveText( '[2]' );
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'fill inside slots',
-			'[2]',
-			'[3]',
-			'[4]',
-			'[5]',
-		] );
-	} );
-
-	test( 'should render the fill after if specified', async ( { page } ) => {
-		const slot3 = page.getByTestId( 'slot-3' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-3-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot3 ).toHaveText( '[3]' );
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'[2]',
-			'[3]',
-			'fill inside slots',
-			'[4]',
-			'[5]',
-		] );
-	} );
-
-	test( 'should render the fill in its children if specified', async ( {
-		page,
-	} ) => {
-		const slot4 = page.getByTestId( 'slot-4' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-4-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot4.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slot4 ).toHaveText( 'fill inside slot 4' );
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'[2]',
-			'[3]',
-			'fill inside slot 4',
-			'[5]',
-		] );
-	} );
-
-	test( 'should be replaced by the fill if specified', async ( { page } ) => {
-		const slot5 = page.getByTestId( 'slot-5' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-5-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot5 ).toBeHidden();
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'[2]',
-			'[3]',
-			'[4]',
-			'fill inside slots',
-		] );
-	} );
-
-	test( 'should keep the fill in its original position if no slot matches', async ( {
-		page,
-	} ) => {
-		const fillContainer = page.getByTestId( 'fill-container' );
-		await expect( fillContainer.getByTestId( 'fill' ) ).toBeVisible();
-
-		await page.getByTestId( 'slot-1-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-
-		await page.getByTestId( 'reset' ).click();
-
-		await expect( fillContainer.getByTestId( 'fill' ) ).toBeVisible();
-	} );
-
-	test( 'should not be re-mounted when adding the fill before', async ( {
-		page,
-	} ) => {
-		const slot2 = page.getByTestId( 'slot-2' );
-		const slots = page.getByTestId( 'slots' );
-
-		await expect( slot2 ).toHaveText( '[2]' );
-
-		await slot2.click();
-
-		await expect( slot2 ).toHaveText( '[2 updated]' );
-
-		await page.getByTestId( 'slot-2-button' ).click();
-
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'fill inside slots',
-			'[2 updated]',
-			'[3]',
-			'[4]',
-			'[5]',
-		] );
-	} );
-
-	test( 'should not be re-mounted when adding the fill after', async ( {
-		page,
-	} ) => {
-		const slot3 = page.getByTestId( 'slot-3' );
-		const slots = page.getByTestId( 'slots' );
-
-		await expect( slot3 ).toHaveText( '[3]' );
-
-		await slot3.click();
-
-		await expect( slot3 ).toHaveText( '[3 updated]' );
-
-		await page.getByTestId( 'slot-3-button' ).click();
-
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'[2]',
-			'[3 updated]',
-			'fill inside slots',
-			'[4]',
-			'[5]',
-		] );
-	} );
-} );
diff --git a/test/e2e/specs/interactivity/directives-style.spec.ts b/test/e2e/specs/interactivity/directive-style.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/directives-style.spec.ts
rename to test/e2e/specs/interactivity/directive-style.spec.ts
diff --git a/test/e2e/specs/interactivity/directive-text.spec.ts b/test/e2e/specs/interactivity/directive-text.spec.ts
new file mode 100644
index 00000000000000..3670c5931e15d8
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-text.spec.ts
@@ -0,0 +1,45 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-text', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-text' );
+	} );
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-text' ) );
+	} );
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'show proper text reading from state', async ( { page } ) => {
+		const el = page.getByTestId( 'show state text' );
+		await expect( el ).toHaveText( 'Text 1' );
+		await page.getByTestId( 'toggle state text' ).click();
+		await expect( el ).toHaveText( 'Text 2' );
+		await page.getByTestId( 'toggle state text' ).click();
+		await expect( el ).toHaveText( 'Text 1' );
+	} );
+
+	test( 'show proper text reading from context', async ( { page } ) => {
+		const el = page.getByTestId( 'show context text' );
+		await expect( el ).toHaveText( 'Text 1' );
+		await page.getByTestId( 'toggle context text' ).click();
+		await expect( el ).toHaveText( 'Text 2' );
+		await page.getByTestId( 'toggle context text' ).click();
+		await expect( el ).toHaveText( 'Text 1' );
+	} );
+
+	test( 'Transforms results into strings', async ( { page } ) => {
+		const elObject = page.getByTestId( 'show state component' );
+		await expect( elObject ).toBeHidden();
+		const elNumber = page.getByTestId( 'show state number' );
+		await expect( elNumber ).toHaveText( '1' );
+		const elBool = page.getByTestId( 'show state boolean' );
+		await expect( elBool ).toHaveText( 'true' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directives-body.spec.ts b/test/e2e/specs/interactivity/directives-body.spec.ts
deleted file mode 100644
index be11cfc556b591..00000000000000
--- a/test/e2e/specs/interactivity/directives-body.spec.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Internal dependencies
- */
-import { test, expect } from './fixtures';
-
-test.describe( 'data-wp-body', () => {
-	test.beforeAll( async ( { interactivityUtils: utils } ) => {
-		await utils.activatePlugins();
-		await utils.addPostWithBlock( 'test/directive-body' );
-	} );
-
-	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
-		await page.goto( utils.getLink( 'test/directive-body' ) );
-	} );
-
-	test.afterAll( async ( { interactivityUtils: utils } ) => {
-		await utils.deactivatePlugins();
-		await utils.deleteAllPosts();
-	} );
-
-	test( "should move the element to the document's body", async ( {
-		page,
-	} ) => {
-		const container = page.getByTestId( 'container' );
-		const parentTag = page
-			.getByTestId( 'element with data-wp-body' )
-			.locator( 'xpath=..' );
-
-		await expect( container ).toBeEmpty();
-		await expect( parentTag ).toHaveJSProperty( 'tagName', 'BODY' );
-	} );
-
-	test( 'should make context accessible for inner elements', async ( {
-		page,
-	} ) => {
-		const text = page
-			.getByTestId( 'element with data-wp-body' )
-			.getByTestId( 'text' );
-		const toggle = page.getByTestId( 'toggle text' );
-
-		await expect( text ).toHaveText( 'text-1' );
-		await toggle.click();
-		await expect( text ).toHaveText( 'text-2' );
-		await toggle.click();
-		await expect( text ).toHaveText( 'text-1' );
-	} );
-} );
diff --git a/test/e2e/specs/interactivity/directives-class.spec.ts b/test/e2e/specs/interactivity/directives-class.spec.ts
deleted file mode 100644
index b7e085aba15143..00000000000000
--- a/test/e2e/specs/interactivity/directives-class.spec.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Internal dependencies
- */
-import { test, expect } from './fixtures';
-
-test.describe( 'data-wp-class', () => {
-	test.beforeAll( async ( { interactivityUtils: utils } ) => {
-		await utils.activatePlugins();
-		await utils.addPostWithBlock( 'test/directive-class' );
-	} );
-
-	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
-		await page.goto( utils.getLink( 'test/directive-class' ) );
-	} );
-
-	test.afterAll( async ( { interactivityUtils: utils } ) => {
-		await utils.deactivatePlugins();
-		await utils.deleteAllPosts();
-	} );
-
-	test( 'remove class if callback returns falsy value', async ( {
-		page,
-	} ) => {
-		const el = page.getByTestId(
-			'remove class if callback returns falsy value'
-		);
-		await expect( el ).toHaveClass( 'bar' );
-		await page.getByTestId( 'toggle falseValue' ).click();
-		await expect( el ).toHaveClass( 'foo bar' );
-		await page.getByTestId( 'toggle falseValue' ).click();
-		await expect( el ).toHaveClass( 'bar' );
-	} );
-
-	test( 'add class if callback returns truthy value', async ( { page } ) => {
-		const el = page.getByTestId(
-			'add class if callback returns truthy value'
-		);
-		await expect( el ).toHaveClass( 'foo bar' );
-		await page.getByTestId( 'toggle trueValue' ).click();
-		await expect( el ).toHaveClass( 'foo' );
-		await page.getByTestId( 'toggle trueValue' ).click();
-		await expect( el ).toHaveClass( 'foo bar' );
-	} );
-
-	test( 'handles multiple classes and callbacks', async ( { page } ) => {
-		const el = page.getByTestId( 'handles multiple classes and callbacks' );
-		await expect( el ).toHaveClass( 'bar baz' );
-		await page.getByTestId( 'toggle trueValue' ).click();
-		await expect( el ).toHaveClass( '' );
-		await page.getByTestId( 'toggle trueValue' ).click();
-		await expect( el ).toHaveClass( 'bar baz' );
-		await page.getByTestId( 'toggle falseValue' ).click();
-		await expect( el ).toHaveClass( 'foo bar baz' );
-		await page.getByTestId( 'toggle trueValue' ).click();
-		await expect( el ).toHaveClass( 'foo' );
-	} );
-
-	test( 'handles class names that are contained inside other class names', async ( {
-		page,
-	} ) => {
-		const el = page.getByTestId(
-			'handles class names that are contained inside other class names'
-		);
-		await expect( el ).toHaveClass( 'foo-bar' );
-		await page.getByTestId( 'toggle falseValue' ).click();
-		await expect( el ).toHaveClass( 'foo foo-bar' );
-		await page.getByTestId( 'toggle trueValue' ).click();
-		await expect( el ).toHaveClass( 'foo' );
-	} );
-
-	test( 'can toggle class in the middle', async ( { page } ) => {
-		const el = page.getByTestId( 'can toggle class in the middle' );
-		await expect( el ).toHaveClass( 'foo bar baz' );
-		await page.getByTestId( 'toggle trueValue' ).click();
-		await expect( el ).toHaveClass( 'foo baz' );
-		await page.getByTestId( 'toggle trueValue' ).click();
-		await expect( el ).toHaveClass( 'foo bar baz' );
-	} );
-
-	test( 'can toggle class when class attribute is missing', async ( {
-		page,
-	} ) => {
-		const el = page.getByTestId(
-			'can toggle class when class attribute is missing'
-		);
-		await expect( el ).toHaveClass( '' );
-		await page.getByTestId( 'toggle falseValue' ).click();
-		await expect( el ).toHaveClass( 'foo' );
-		await page.getByTestId( 'toggle falseValue' ).click();
-		await expect( el ).toHaveClass( '' );
-	} );
-
-	test( 'can use context values', async ( { page } ) => {
-		const el = page.getByTestId( 'can use context values' );
-		await expect( el ).toHaveClass( '' );
-		await page.getByTestId( 'toggle context false value' ).click();
-		await expect( el ).toHaveClass( 'foo' );
-		await page.getByTestId( 'toggle context false value' ).click();
-		await expect( el ).toHaveClass( '' );
-	} );
-
-	test( 'can use BEM notation classes', async ( { page } ) => {
-		const el = page.getByTestId( 'can use BEM notation classes' );
-		await expect( el ).toHaveClass( 'block__element--modifier' );
-	} );
-
-	test( 'can use classes with several dashes', async ( { page } ) => {
-		const el = page.getByTestId( 'can use classes with several dashes' );
-		await expect( el ).toHaveClass( 'main-bg----color' );
-	} );
-} );
diff --git a/test/e2e/specs/interactivity/directives-context.spec.ts b/test/e2e/specs/interactivity/directives-context.spec.ts
deleted file mode 100644
index f94784865cb757..00000000000000
--- a/test/e2e/specs/interactivity/directives-context.spec.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * External dependencies
- */
-import type { Locator } from '@playwright/test';
-/**
- * Internal dependencies
- */
-import { test, expect } from './fixtures';
-
-const parseContent = async ( loc: Locator ) =>
-	JSON.parse( ( await loc.textContent() ) || '' );
-
-test.describe( 'data-wp-context', () => {
-	test.beforeAll( async ( { interactivityUtils: utils } ) => {
-		await utils.activatePlugins();
-		await utils.addPostWithBlock( 'test/directive-context' );
-	} );
-
-	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
-		await page.goto( utils.getLink( 'test/directive-context' ) );
-	} );
-
-	test.afterAll( async ( { interactivityUtils: utils } ) => {
-		await utils.deactivatePlugins();
-		await utils.deleteAllPosts();
-	} );
-
-	test( 'is correctly initialized', async ( { page } ) => {
-		const parentContext = await parseContent(
-			page.getByTestId( 'parent context' )
-		);
-
-		expect( parentContext ).toMatchObject( {
-			prop1: 'parent',
-			prop2: 'parent',
-			obj: { prop4: 'parent', prop5: 'parent' },
-			array: [ 1, 2, 3 ],
-		} );
-	} );
-
-	test( 'is correctly extended', async ( { page } ) => {
-		const childContext = await parseContent(
-			page.getByTestId( 'child context' )
-		);
-
-		expect( childContext ).toMatchObject( {
-			prop1: 'parent',
-			prop2: 'child',
-			prop3: 'child',
-			obj: { prop4: 'parent', prop5: 'child', prop6: 'child' },
-			array: [ 4, 5, 6 ],
-		} );
-	} );
-
-	test( 'changes in inherited properties are reflected (child)', async ( {
-		page,
-	} ) => {
-		await page.getByTestId( 'child prop1' ).click();
-		await page.getByTestId( 'child obj.prop4' ).click();
-
-		const childContext = await parseContent(
-			page.getByTestId( 'child context' )
-		);
-
-		expect( childContext.prop1 ).toBe( 'modifiedFromChild' );
-		expect( childContext.obj.prop4 ).toBe( 'modifiedFromChild' );
-
-		const parentContext = await parseContent(
-			page.getByTestId( 'parent context' )
-		);
-
-		expect( parentContext.prop1 ).toBe( 'modifiedFromChild' );
-		expect( parentContext.obj.prop4 ).toBe( 'modifiedFromChild' );
-	} );
-
-	test( 'changes in inherited properties are reflected (parent)', async ( {
-		page,
-	} ) => {
-		await page.getByTestId( 'parent prop1' ).click();
-		await page.getByTestId( 'parent obj.prop4' ).click();
-
-		const childContext = await parseContent(
-			page.getByTestId( 'child context' )
-		);
-
-		expect( childContext.prop1 ).toBe( 'modifiedFromParent' );
-		expect( childContext.obj.prop4 ).toBe( 'modifiedFromParent' );
-
-		const parentContext = await parseContent(
-			page.getByTestId( 'parent context' )
-		);
-
-		expect( parentContext.prop1 ).toBe( 'modifiedFromParent' );
-		expect( parentContext.obj.prop4 ).toBe( 'modifiedFromParent' );
-	} );
-
-	test( 'changes in shadowed properties do not leak (child)', async ( {
-		page,
-	} ) => {
-		await page.getByTestId( 'child prop2' ).click();
-		await page.getByTestId( 'child obj.prop5' ).click();
-
-		const childContext = await parseContent(
-			page.getByTestId( 'child context' )
-		);
-
-		expect( childContext.prop2 ).toBe( 'modifiedFromChild' );
-		expect( childContext.obj.prop5 ).toBe( 'modifiedFromChild' );
-
-		const parentContext = await parseContent(
-			page.getByTestId( 'parent context' )
-		);
-
-		expect( parentContext.prop2 ).toBe( 'parent' );
-		expect( parentContext.obj.prop5 ).toBe( 'parent' );
-	} );
-
-	test( 'changes in shadowed properties do not leak (parent)', async ( {
-		page,
-	} ) => {
-		await page.getByTestId( 'parent prop2' ).click();
-		await page.getByTestId( 'parent obj.prop5' ).click();
-
-		const childContext = await parseContent(
-			page.getByTestId( 'child context' )
-		);
-
-		expect( childContext.prop2 ).toBe( 'child' );
-		expect( childContext.obj.prop5 ).toBe( 'child' );
-
-		const parentContext = await parseContent(
-			page.getByTestId( 'parent context' )
-		);
-
-		expect( parentContext.prop2 ).toBe( 'modifiedFromParent' );
-		expect( parentContext.obj.prop5 ).toBe( 'modifiedFromParent' );
-	} );
-
-	test( 'Array properties are shadowed', async ( { page } ) => {
-		const parentContext = await parseContent(
-			page.getByTestId( 'parent context' )
-		);
-
-		const childContext = await parseContent(
-			page.getByTestId( 'child context' )
-		);
-
-		expect( parentContext.array ).toMatchObject( [ 1, 2, 3 ] );
-		expect( childContext.array ).toMatchObject( [ 4, 5, 6 ] );
-	} );
-
-	test( 'can be accessed in other directives on the same element', async ( {
-		page,
-	} ) => {
-		const element = page.getByTestId( 'context & other directives' );
-		await expect( element ).toHaveText( 'Text 1' );
-		await expect( element ).toHaveAttribute( 'value', 'Text 1' );
-		await element.click();
-		await expect( element ).toHaveText( 'Text 2' );
-		await expect( element ).toHaveAttribute( 'value', 'Text 2' );
-		await element.click();
-		await expect( element ).toHaveText( 'Text 1' );
-		await expect( element ).toHaveAttribute( 'value', 'Text 1' );
-	} );
-
-	test( 'should replace values on navigation', async ( { page } ) => {
-		const element = page.getByTestId( 'navigation text' );
-		await expect( element ).toHaveText( 'first page' );
-		await page.getByTestId( 'toggle text' ).click();
-		await expect( element ).toHaveText( 'changed dynamically' );
-		await page.getByTestId( 'navigate' ).click();
-		await expect( element ).toHaveText( 'second page' );
-	} );
-
-	test( 'should preserve the previous context values', async ( { page } ) => {
-		const element = page.getByTestId( 'navigation new text' );
-		await expect( element ).toHaveText( '' );
-		await page.getByTestId( 'add new text' ).click();
-		await expect( element ).toHaveText( 'some new text' );
-		await page.getByTestId( 'navigate' ).click();
-		await expect( element ).toHaveText( 'some new text' );
-	} );
-
-	test( 'should maintain the same context reference on async actions', async ( {
-		page,
-	} ) => {
-		const element = page.getByTestId( 'navigation new text' );
-		await expect( element ).toHaveText( '' );
-		await page.getByTestId( 'async navigate' ).click();
-		await expect( element ).toHaveText( 'changed from async action' );
-	} );
-} );
diff --git a/test/e2e/specs/interactivity/directives-text.spec.ts b/test/e2e/specs/interactivity/directives-text.spec.ts
deleted file mode 100644
index 8e83be26de15ca..00000000000000
--- a/test/e2e/specs/interactivity/directives-text.spec.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Internal dependencies
- */
-import { test, expect } from './fixtures';
-
-test.describe( 'data-wp-text', () => {
-	test.beforeAll( async ( { interactivityUtils: utils } ) => {
-		await utils.activatePlugins();
-		await utils.addPostWithBlock( 'test/directive-text' );
-	} );
-	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
-		await page.goto( utils.getLink( 'test/directive-text' ) );
-	} );
-	test.afterAll( async ( { interactivityUtils: utils } ) => {
-		await utils.deactivatePlugins();
-		await utils.deleteAllPosts();
-	} );
-
-	test( 'show proper text reading from state', async ( { page } ) => {
-		const el = page.getByTestId( 'show state text' );
-		await expect( el ).toHaveText( 'Text 1' );
-		await page.getByTestId( 'toggle state text' ).click();
-		await expect( el ).toHaveText( 'Text 2' );
-		await page.getByTestId( 'toggle state text' ).click();
-		await expect( el ).toHaveText( 'Text 1' );
-	} );
-
-	test( 'show proper text reading from context', async ( { page } ) => {
-		const el = page.getByTestId( 'show context text' );
-		await expect( el ).toHaveText( 'Text 1' );
-		await page.getByTestId( 'toggle context text' ).click();
-		await expect( el ).toHaveText( 'Text 2' );
-		await page.getByTestId( 'toggle context text' ).click();
-		await expect( el ).toHaveText( 'Text 1' );
-	} );
-} );
diff --git a/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts b/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts
index 44507ad34813e8..fd850a6e39fae2 100644
--- a/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts
+++ b/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts
@@ -25,11 +25,16 @@ export default class InteractivityUtils {
 			);
 		}
 
-		// Add an extra param to disable directives SSR. This is required at
-		// this moment, as SSR for directives is not stabilized yet and we need
-		// to ensure hydration works, even when the SSR'ed HTML is not correct.
+		/*
+		 * Add an extra param to disable directives SSR. This is required at
+		 * this moment, as SSR for directives is not stabilized yet and we need
+		 * to ensure hydration works, even when the SSR'ed HTML is not correct.
+		 */
 		const url = new URL( link );
-		url.searchParams.append( 'disable_directives_ssr', 'true' );
+		url.searchParams.append(
+			'disable_server_directive_processing',
+			'true'
+		);
 		return url.href;
 	}
 
@@ -41,7 +46,9 @@ export default class InteractivityUtils {
 			? `${ name } ${ JSON.stringify( attributes ) }`
 			: name;
 
-		if ( ! alias ) alias = block;
+		if ( ! alias ) {
+			alias = block;
+		}
 
 		const payload = {
 			content: `<!-- wp:${ block } /-->`,
diff --git a/test/e2e/specs/interactivity/get-sever-context.spec.ts b/test/e2e/specs/interactivity/get-sever-context.spec.ts
new file mode 100644
index 00000000000000..d7bc4075f97604
--- /dev/null
+++ b/test/e2e/specs/interactivity/get-sever-context.spec.ts
@@ -0,0 +1,166 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'getServerContext()', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		const parent = {
+			prop: 'parent',
+			nested: {
+				prop: 'parent',
+			},
+			inherited: {
+				prop: 'parent',
+			},
+		};
+
+		const parentModified = {
+			prop: 'parentModified',
+			nested: {
+				prop: 'parentModified',
+			},
+			inherited: {
+				prop: 'parentModified',
+			},
+		};
+
+		const parentNewProps = {
+			prop: 'parent',
+			newProp: 'parent',
+			nested: {
+				prop: 'parent',
+				newProp: 'parent',
+			},
+			inherited: {
+				prop: 'parent',
+				newProp: 'parent',
+			},
+		};
+
+		const child = {
+			prop: 'child',
+			nested: {
+				prop: 'child',
+			},
+		};
+
+		const childModified = {
+			prop: 'childModified',
+			nested: {
+				prop: 'childModified',
+			},
+		};
+
+		const childNewProps = {
+			prop: 'child',
+			newProp: 'child',
+			nested: {
+				prop: 'child',
+				newProp: 'child',
+			},
+		};
+
+		await utils.activatePlugins();
+		const link1 = await utils.addPostWithBlock( 'test/get-server-context', {
+			alias: 'getServerContext() - modified',
+			attributes: {
+				parentContext: parentModified,
+				childContext: childModified,
+			},
+		} );
+		const link2 = await utils.addPostWithBlock( 'test/get-server-context', {
+			alias: 'getServerContext() - new props',
+			attributes: {
+				parentContext: parentNewProps,
+				childContext: childNewProps,
+			},
+		} );
+		await utils.addPostWithBlock( 'test/get-server-context', {
+			alias: 'getServerContext() - main',
+			attributes: {
+				links: { modified: link1, newProps: link2 },
+				parentContext: parent,
+				childContext: child,
+			},
+		} );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'getServerContext() - main' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'should update modified props on navigation', async ( { page } ) => {
+		const prop = page.getByTestId( 'prop' );
+		const nestedProp = page.getByTestId( 'nested.prop' );
+		const inheritedProp = page.getByTestId( 'inherited.prop' );
+
+		await expect( prop ).toHaveText( 'child' );
+		await expect( nestedProp ).toHaveText( 'child' );
+		await expect( inheritedProp ).toHaveText( 'parent' );
+
+		await page.getByTestId( 'modified' ).click();
+
+		await expect( prop ).toHaveText( 'childModified' );
+		await expect( nestedProp ).toHaveText( 'childModified' );
+		await expect( inheritedProp ).toHaveText( 'parentModified' );
+
+		await page.goBack();
+
+		await expect( prop ).toHaveText( 'child' );
+		await expect( nestedProp ).toHaveText( 'child' );
+		await expect( inheritedProp ).toHaveText( 'parent' );
+	} );
+
+	test( 'should add new props on navigation', async ( { page } ) => {
+		const newProp = page.getByTestId( 'newProp' );
+		const nestedNewProp = page.getByTestId( 'nested.newProp' );
+		const inheritedNewProp = page.getByTestId( 'inherited.newProp' );
+
+		await expect( newProp ).toBeEmpty();
+		await expect( nestedNewProp ).toBeEmpty();
+		await expect( inheritedNewProp ).toBeEmpty();
+
+		await page.getByTestId( 'newProps' ).click();
+
+		await expect( newProp ).toHaveText( 'child' );
+		await expect( nestedNewProp ).toHaveText( 'child' );
+		await expect( inheritedNewProp ).toHaveText( 'parent' );
+	} );
+
+	test( 'should keep new props on navigation', async ( { page } ) => {
+		const newProp = page.getByTestId( 'newProp' );
+		const nestedNewProp = page.getByTestId( 'nested.newProp' );
+		const inheritedNewProp = page.getByTestId( 'inherited.newProp' );
+
+		await page.getByTestId( 'newProps' ).click();
+
+		await expect( newProp ).toHaveText( 'child' );
+		await expect( nestedNewProp ).toHaveText( 'child' );
+		await expect( inheritedNewProp ).toHaveText( 'parent' );
+
+		await page.goBack();
+
+		await expect( newProp ).toHaveText( 'child' );
+		await expect( nestedNewProp ).toHaveText( 'child' );
+		await expect( inheritedNewProp ).toHaveText( 'parent' );
+	} );
+
+	test( 'should prevent any manual modifications', async ( { page } ) => {
+		const prop = page.getByTestId( 'prop' );
+		const button = page.getByTestId( 'tryToModifyServerContext' );
+
+		await expect( prop ).toHaveText( 'child' );
+		await expect( button ).toHaveText( 'modify' );
+
+		await button.click();
+
+		await expect( prop ).toHaveText( 'child' );
+		await expect( button ).toHaveText( 'not modified ✅' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/get-sever-state.spec.ts b/test/e2e/specs/interactivity/get-sever-state.spec.ts
new file mode 100644
index 00000000000000..16406c1d824463
--- /dev/null
+++ b/test/e2e/specs/interactivity/get-sever-state.spec.ts
@@ -0,0 +1,119 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'getServerState()', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		const link1 = await utils.addPostWithBlock( 'test/get-server-state', {
+			alias: 'getServerState() - link 1',
+			attributes: {
+				state: {
+					prop: 'link 1',
+					newProp: 'link 1',
+					nested: {
+						prop: 'link 1',
+						newProp: 'link 1',
+					},
+				},
+			},
+		} );
+		const link2 = await utils.addPostWithBlock( 'test/get-server-state', {
+			alias: 'getServerState() - link 2',
+			attributes: {
+				state: {
+					prop: 'link 2',
+					newProp: 'link 2',
+					nested: {
+						prop: 'link 2',
+						newProp: 'link 2',
+					},
+				},
+			},
+		} );
+		await utils.addPostWithBlock( 'test/get-server-state', {
+			alias: 'getServerState() - main',
+			attributes: {
+				title: 'Main',
+				links: [ link1, link2 ],
+				state: {
+					prop: 'main',
+					nested: {
+						prop: 'main',
+					},
+				},
+			},
+		} );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'getServerState() - main' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'should update existing state props on navigation', async ( {
+		page,
+	} ) => {
+		const prop = page.getByTestId( 'prop' );
+		const nestedProp = page.getByTestId( 'nested.prop' );
+
+		await expect( prop ).toHaveText( 'main' );
+		await expect( nestedProp ).toHaveText( 'main' );
+
+		await page.getByTestId( 'link 1' ).click();
+
+		await expect( prop ).toHaveText( 'link 1' );
+		await expect( nestedProp ).toHaveText( 'link 1' );
+
+		await page.goBack();
+		await expect( prop ).toHaveText( 'main' );
+		await expect( nestedProp ).toHaveText( 'main' );
+
+		await page.getByTestId( 'link 2' ).click();
+
+		await expect( prop ).toHaveText( 'link 2' );
+		await expect( nestedProp ).toHaveText( 'link 2' );
+	} );
+
+	test( 'should add new state props and keep them on navigation', async ( {
+		page,
+	} ) => {
+		const newProp = page.getByTestId( 'newProp' );
+		const nestedNewProp = page.getByTestId( 'nested.newProp' );
+
+		await expect( newProp ).toBeEmpty();
+		await expect( nestedNewProp ).toBeEmpty();
+
+		await page.getByTestId( 'link 1' ).click();
+
+		await expect( newProp ).toHaveText( 'link 1' );
+		await expect( nestedNewProp ).toHaveText( 'link 1' );
+
+		await page.goBack();
+		await expect( newProp ).toHaveText( 'link 1' );
+		await expect( nestedNewProp ).toHaveText( 'link 1' );
+
+		await page.getByTestId( 'link 2' ).click();
+
+		await expect( newProp ).toHaveText( 'link 2' );
+		await expect( nestedNewProp ).toHaveText( 'link 2' );
+	} );
+
+	test( 'should prevent any manual modifications', async ( { page } ) => {
+		const prop = page.getByTestId( 'prop' );
+		const button = page.getByTestId( 'tryToModifyServerState' );
+
+		await expect( prop ).toHaveText( 'main' );
+		await expect( button ).toHaveText( 'modify' );
+
+		await button.click();
+
+		await expect( prop ).toHaveText( 'main' );
+		await expect( button ).toHaveText( 'not modified ✅' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/store-tag.spec.ts b/test/e2e/specs/interactivity/interactivity-data.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/store-tag.spec.ts
rename to test/e2e/specs/interactivity/interactivity-data.spec.ts
diff --git a/test/e2e/specs/interactivity/namespace.spec.ts b/test/e2e/specs/interactivity/namespace.spec.ts
new file mode 100644
index 00000000000000..9d0edc997886cb
--- /dev/null
+++ b/test/e2e/specs/interactivity/namespace.spec.ts
@@ -0,0 +1,87 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'Namespaces', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test-namespace/directive-bind' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test-namespace/directive-bind' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'Empty string as namespace should not work', async ( { page } ) => {
+		const el = page.getByTestId( 'empty namespace' );
+		await expect( el ).not.toHaveAttribute( 'href', '/empty-string-url' );
+	} );
+
+	test( 'A string as namespace should work', async ( { page } ) => {
+		const el = page.getByTestId( 'correct namespace' );
+		await expect( el ).toHaveAttribute( 'href', '/namespace-url' );
+	} );
+
+	test( 'An empty object as namespace should not work', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId( 'object namespace' );
+		await expect( el ).not.toHaveAttribute( 'href', '/object-url' );
+	} );
+
+	test( 'A wrong namespace should not break the runtime', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId( 'object namespace' );
+		await expect( el ).not.toHaveAttribute( 'href', '/namespace-url' );
+		const correct = page.getByTestId( 'correct namespace' );
+		await expect( correct ).toHaveAttribute( 'href', '/namespace-url' );
+	} );
+
+	test( 'A different store namespace should work', async ( { page } ) => {
+		const el = page.getByTestId( 'other namespace' );
+		await expect( el ).toHaveAttribute( 'href', '/other-store-url' );
+	} );
+
+	test( 'A number as a string as namespace should work', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId( 'number namespace' );
+		await expect( el ).toHaveAttribute( 'href', '/number-url' );
+	} );
+
+	test( 'A null as a string as namespace should work', async ( { page } ) => {
+		const el = page.getByTestId( 'null namespace' );
+		await expect( el ).toHaveAttribute( 'href', '/null-url' );
+	} );
+
+	test( 'A true as a string as namespace should work', async ( { page } ) => {
+		const el = page.getByTestId( 'true namespace' );
+		await expect( el ).toHaveAttribute( 'href', '/true-url' );
+	} );
+
+	test( 'A false as a string as namespace should work', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId( 'false namespace' );
+		await expect( el ).toHaveAttribute( 'href', '/false-url' );
+	} );
+
+	test( 'A [] as a string as namespace should work', async ( { page } ) => {
+		const el = page.getByTestId( '[] namespace' );
+		await expect( el ).toHaveAttribute( 'href', '/array-url' );
+	} );
+
+	test( 'A "quoted string" as a string as namespace should work', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId( 'quoted namespace' );
+		await expect( el ).toHaveAttribute( 'href', '/quoted-url' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/router-navigate.spec.ts b/test/e2e/specs/interactivity/router-navigate.spec.ts
index 552763ea40d5cb..d1ac30783ee2b7 100644
--- a/test/e2e/specs/interactivity/router-navigate.spec.ts
+++ b/test/e2e/specs/interactivity/router-navigate.spec.ts
@@ -6,17 +6,44 @@ import { test, expect } from './fixtures';
 test.describe( 'Router navigate', () => {
 	test.beforeAll( async ( { interactivityUtils: utils } ) => {
 		await utils.activatePlugins();
+		const link1 = await utils.addPostWithBlock( 'test/router-navigate', {
+			alias: 'router navigate - link 1',
+			attributes: {
+				title: 'Link 1',
+				data: {
+					getterProp: 'value from link1',
+					prop1: 'link 1',
+					prop3: 'link 1',
+				},
+			},
+		} );
 		const link2 = await utils.addPostWithBlock( 'test/router-navigate', {
 			alias: 'router navigate - link 2',
 			attributes: { title: 'Link 2' },
 		} );
-		const link1 = await utils.addPostWithBlock( 'test/router-navigate', {
-			alias: 'router navigate - link 1',
-			attributes: { title: 'Link 1' },
+		const link3 = await utils.addPostWithBlock( 'test/router-navigate', {
+			alias: 'router navigate - disabled',
+			attributes: {
+				title: 'Main (navigation disabled)',
+				links: [ link1, link2 ],
+				disableNavigation: true,
+				data: {
+					getterProp: 'value from main (navigation disabled)',
+					prop1: 'main (navigation disabled)',
+				},
+			},
 		} );
 		await utils.addPostWithBlock( 'test/router-navigate', {
 			alias: 'router navigate - main',
-			attributes: { title: 'Main', links: [ link1, link2 ] },
+			attributes: {
+				title: 'Main',
+				links: [ link1, link2, link3 ],
+				data: {
+					getterProp: 'value from main',
+					prop1: 'main',
+					prop2: 'main',
+				},
+			},
 		} );
 	} );
 
@@ -36,7 +63,7 @@ test.describe( 'Router navigate', () => {
 		const link1 = utils.getLink( 'router navigate - link 1' );
 		const link2 = utils.getLink( 'router navigate - link 2' );
 
-		const navigations = page.getByTestId( 'router navigations' );
+		const navigations = page.getByTestId( 'router navigations pending' );
 		const status = page.getByTestId( 'router status' );
 		const title = page.getByTestId( 'title' );
 
@@ -81,7 +108,7 @@ test.describe( 'Router navigate', () => {
 	} ) => {
 		const link1 = utils.getLink( 'router navigate - link 1' );
 
-		const navigations = page.getByTestId( 'router navigations' );
+		const navigations = page.getByTestId( 'router navigations pending' );
 		const status = page.getByTestId( 'router status' );
 		const title = page.getByTestId( 'title' );
 
@@ -160,4 +187,102 @@ test.describe( 'Router navigate', () => {
 		// Make the fetch abort, just in case.
 		resolver!();
 	} );
+
+	test( 'should force a page reload when the `clientNavigationDisabled` config is set to true', async ( {
+		page,
+		interactivityUtils: utils,
+	} ) => {
+		await page.goto( utils.getLink( 'router navigate - disabled' ) );
+
+		const count = page.getByTestId( 'router navigations count' );
+		const status = page.getByTestId( 'router status' );
+		const title = page.getByTestId( 'title' );
+
+		// Check some elements to ensure the page has hydrated.
+		await expect( count ).toHaveText( '0' );
+		await expect( status ).toHaveText( 'idle' );
+
+		await page.getByTestId( 'link 1' ).click();
+
+		// Check the page has updated.
+		await expect( title ).toHaveText( 'Link 1' );
+
+		// Check that client-navigations count has not increased.
+		await expect( count ).toHaveText( '0' );
+	} );
+
+	test( 'should merge the state with the one serialized in the new page', async ( {
+		page,
+	} ) => {
+		const prop1 = page.getByTestId( 'prop1' );
+		const prop2 = page.getByTestId( 'prop2' );
+		const prop3 = page.getByTestId( 'prop3' );
+		const title = page.getByTestId( 'title' );
+
+		await expect( prop1 ).toHaveText( 'main' );
+		await expect( prop2 ).toHaveText( 'main' );
+		await expect( prop3 ).toBeEmpty();
+
+		await page.getByTestId( 'link 1' ).click();
+		await expect( title ).toHaveText( 'Link 1' );
+		await expect( prop1 ).toHaveText( 'main' );
+		await expect( prop2 ).toHaveText( 'main' );
+		await expect( prop3 ).toHaveText( 'link 1' );
+
+		await page.goBack();
+		await expect( title ).toHaveText( 'Main' );
+		await expect( prop1 ).toHaveText( 'main' );
+		await expect( prop2 ).toHaveText( 'main' );
+		await expect( prop3 ).toHaveText( 'link 1' );
+	} );
+
+	test( 'should not try to overwrite getters with values from the initial data', async ( {
+		page,
+	} ) => {
+		const title = page.getByTestId( 'title' );
+		const getter = page.getByTestId( 'getterProp' );
+
+		await expect( title ).toHaveText( 'Main' );
+		await expect( getter ).toHaveText( 'value from getter (main)' );
+
+		await page.getByTestId( 'link 1' ).click();
+		await expect( title ).toHaveText( 'Link 1' );
+		await expect( getter ).toHaveText( 'value from getter (main)' );
+
+		await page.goBack();
+		await expect( title ).toHaveText( 'Main' );
+		await expect( getter ).toHaveText( 'value from getter (main)' );
+
+		await page.goForward();
+		await expect( title ).toHaveText( 'Link 1' );
+		await expect( getter ).toHaveText( 'value from getter (main)' );
+	} );
+
+	test( 'should force a page reload when navigating to a page with `clientNavigationDisabled`', async ( {
+		page,
+	} ) => {
+		const count = page.getByTestId( 'router navigations count' );
+		const title = page.getByTestId( 'title' );
+
+		// Check the cound to ensure the page has hydrated.
+		await expect( count ).toHaveText( '0' );
+
+		// Navigate to a page without clientNavigationDisabled.
+		await page.getByTestId( 'link 1' ).click();
+
+		// Check the page has updated and the navigation count has increased.
+		await expect( title ).toHaveText( 'Link 1' );
+		await expect( count ).toHaveText( '1' );
+
+		await page.goBack();
+		await expect( title ).toHaveText( 'Main' );
+		await expect( count ).toHaveText( '1' );
+
+		// Navigate to a page with clientNavigationDisabled.
+		await page.getByTestId( 'link 3' ).click();
+
+		// Check the page has updated and the navigation count is zero.
+		await expect( title ).toHaveText( 'Main (navigation disabled)' );
+		await expect( count ).toHaveText( '0' );
+	} );
 } );
diff --git a/test/e2e/specs/interactivity/store.spec.ts b/test/e2e/specs/interactivity/store.spec.ts
new file mode 100644
index 00000000000000..fc94103168752e
--- /dev/null
+++ b/test/e2e/specs/interactivity/store.spec.ts
@@ -0,0 +1,32 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'store', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/store' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/store' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'non-plain objects are not proxified', async ( { page } ) => {
+		const el = page.getByTestId( 'non-plain object' );
+		await expect( el ).toHaveText( 'true' );
+	} );
+
+	test( 'Ensures that state cannot be set to a non-object', async ( {
+		page,
+	} ) => {
+		const element = page.getByTestId( 'state-0' );
+		await expect( element ).toHaveText( 'right' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/tovdom-islands.spec.ts b/test/e2e/specs/interactivity/tovdom-islands.spec.ts
index fcc7c6081077a6..da4839c18afb2e 100644
--- a/test/e2e/specs/interactivity/tovdom-islands.spec.ts
+++ b/test/e2e/specs/interactivity/tovdom-islands.spec.ts
@@ -23,10 +23,17 @@ test.describe( 'toVdom - islands', () => {
 		await expect( el ).toBeVisible();
 	} );
 
-	test( 'directives that are inside islands should be hydrated', async ( {
+	test( 'directives that are inside islands with json objects should be hydrated', async ( {
 		page,
 	} ) => {
-		const el = page.getByTestId( 'inside an island' );
+		const el = page.getByTestId( 'inside an island with json object' );
+		await expect( el ).toBeHidden();
+	} );
+
+	test( 'directives that are inside islands with strings should be hydrated', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId( 'inside an island with string' );
 		await expect( el ).toBeHidden();
 	} );
 
@@ -44,7 +51,7 @@ test.describe( 'toVdom - islands', () => {
 	} ) => {
 		const el = page.getByTestId( 'island inside another island' );
 		const templates = el.locator( 'template' );
-		expect( await templates.count() ).toEqual( 1 );
+		await expect( templates ).toHaveCount( 1 );
 	} );
 
 	test( 'islands inside inner blocks of isolated islands should be hydrated', async ( {
@@ -55,4 +62,11 @@ test.describe( 'toVdom - islands', () => {
 		);
 		await expect( el ).toBeHidden();
 	} );
+
+	test( 'islands should recover their namespace if an inner island has changed it', async ( {
+		page,
+	} ) => {
+		const el = page.getByTestId( 'directive after different namespace' );
+		await expect( el ).toBeHidden();
+	} );
 } );
diff --git a/test/e2e/specs/interactivity/with-scope.spec.ts b/test/e2e/specs/interactivity/with-scope.spec.ts
new file mode 100644
index 00000000000000..1cb73cc915aca7
--- /dev/null
+++ b/test/e2e/specs/interactivity/with-scope.spec.ts
@@ -0,0 +1,27 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'withScope', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/with-scope' );
+	} );
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/with-scope' ) );
+	} );
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'directives using withScope should work with async and sync functions', async ( {
+		page,
+	} ) => {
+		const asyncCounter = page.getByTestId( 'asyncCounter' );
+		await expect( asyncCounter ).toHaveText( '1' );
+		const syncCounter = page.getByTestId( 'syncCounter' );
+		await expect( syncCounter ).toHaveText( '1' );
+	} );
+} );
diff --git a/test/e2e/specs/site-editor/activate-theme.spec.js b/test/e2e/specs/site-editor/activate-theme.spec.js
new file mode 100644
index 00000000000000..a5fb4b3be0b73c
--- /dev/null
+++ b/test/e2e/specs/site-editor/activate-theme.spec.js
@@ -0,0 +1,53 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Activate theme', () => {
+	test.beforeEach( async ( { admin, page } ) => {
+		await admin.visitAdminPage( 'themes.php' );
+		await page.getByLabel( 'Live Preview Emptytheme' ).click();
+	} );
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+	test( 'activate block theme when live previewing from sidebar save button', async ( {
+		admin,
+		page,
+	} ) => {
+		await page
+			.getByRole( 'button', { name: 'Activate Emptytheme' } )
+			.click();
+		await page
+			.getByRole( 'button', { name: 'Activate', exact: true } )
+			.click();
+		await expect(
+			page.getByRole( 'button', { name: 'Dismiss this notice' } )
+		).toContainText( 'Site updated' );
+		await admin.visitAdminPage( 'themes.php' );
+		await expect( page.getByLabel( 'Customize Emptytheme' ) ).toBeVisible();
+	} );
+	test( 'activate block theme when live previewing in edit mode', async ( {
+		editor,
+		admin,
+		page,
+	} ) => {
+		// Wait for the loading to complete.
+		await expect( page.locator( '.edit-site-canvas-loader' ) ).toHaveCount(
+			0
+		);
+		await editor.canvas.locator( 'body' ).click();
+		await page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Activate Emptytheme' } )
+			.click();
+		await page
+			.getByRole( 'button', { name: 'Activate', exact: true } )
+			.click();
+		await expect(
+			page.getByRole( 'button', { name: 'Dismiss this notice' } )
+		).toContainText( 'Site updated' );
+		await admin.visitAdminPage( 'themes.php' );
+		await expect( page.getByLabel( 'Customize Emptytheme' ) ).toBeVisible();
+	} );
+} );
diff --git a/test/e2e/specs/site-editor/block-removal.spec.js b/test/e2e/specs/site-editor/block-removal.spec.js
index 5c46ac769efd3f..7fc547c19e59e3 100644
--- a/test/e2e/specs/site-editor/block-removal.spec.js
+++ b/test/e2e/specs/site-editor/block-removal.spec.js
@@ -12,12 +12,12 @@ test.describe( 'Site editor block removal prompt', () => {
 		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
 
-	test.beforeEach( async ( { admin, editor } ) => {
+	test.beforeEach( async ( { admin } ) => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 	} );
 
 	test( 'should appear when attempting to remove Query Block', async ( {
@@ -25,16 +25,22 @@ test.describe( 'Site editor block removal prompt', () => {
 	} ) => {
 		// Open and focus List View
 		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
-		await topBar.getByRole( 'button', { name: 'List View' } ).click();
+		await topBar
+			.getByRole( 'button', { name: 'Document Overview' } )
+			.click();
 
 		// Select and try to remove Query Loop block
-		const listView = page.getByRole( 'region', { name: 'List View' } );
+		const listView = page.getByRole( 'region', {
+			name: 'Document Overview',
+		} );
 		await listView.getByRole( 'link', { name: 'Query Loop' } ).click();
 		await page.keyboard.press( 'Backspace' );
 
 		// Expect the block removal prompt to have appeared
 		await expect(
-			page.getByText( 'Query Loop displays a list of posts or pages.' )
+			page.getByText(
+				'Some of the deleted blocks will stop your post or page content from displaying on this template. It is not recommended.'
+			)
 		).toBeVisible();
 	} );
 
@@ -43,10 +49,14 @@ test.describe( 'Site editor block removal prompt', () => {
 	} ) => {
 		// Open and focus List View
 		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
-		await topBar.getByRole( 'button', { name: 'List View' } ).click();
+		await topBar
+			.getByRole( 'button', { name: 'Document Overview' } )
+			.click();
 
 		// Select and open child blocks of Query Loop block
-		const listView = page.getByRole( 'region', { name: 'List View' } );
+		const listView = page.getByRole( 'region', {
+			name: 'Document Overview',
+		} );
 		await listView.getByRole( 'link', { name: 'Query Loop' } ).click();
 		await page.keyboard.press( 'ArrowRight' );
 
@@ -57,7 +67,7 @@ test.describe( 'Site editor block removal prompt', () => {
 		// Expect the block removal prompt to have appeared
 		await expect(
 			page.getByText(
-				'Post Template displays each post or page in a Query Loop.'
+				'Some of the deleted blocks will stop your post or page content from displaying on this template. It is not recommended.'
 			)
 		).toBeVisible();
 	} );
@@ -68,10 +78,14 @@ test.describe( 'Site editor block removal prompt', () => {
 	} ) => {
 		// Open and focus List View
 		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
-		await topBar.getByRole( 'button', { name: 'List View' } ).click();
+		await topBar
+			.getByRole( 'button', { name: 'Document Overview' } )
+			.click();
 
 		// Select Query Loop list item
-		const listView = page.getByRole( 'region', { name: 'List View' } );
+		const listView = page.getByRole( 'region', {
+			name: 'Document Overview',
+		} );
 		await listView.getByRole( 'link', { name: 'Query Loop' } ).click();
 
 		// Reveal its inner blocks in the list view
diff --git a/test/e2e/specs/site-editor/block-style-variations.spec.js b/test/e2e/specs/site-editor/block-style-variations.spec.js
new file mode 100644
index 00000000000000..3c642ea9d1299e
--- /dev/null
+++ b/test/e2e/specs/site-editor/block-style-variations.spec.js
@@ -0,0 +1,365 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+const TEST_PAGE_TITLE = 'Test Page for Block Style Variations';
+test.use( {
+	siteEditorBlockStyleVariations: async ( { page, editor }, use ) => {
+		await use( new SiteEditorBlockStyleVariations( { page, editor } ) );
+	},
+} );
+
+test.describe( 'Block Style Variations', () => {
+	let stylesPostId;
+	test.beforeAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.activateTheme(
+				'gutenberg-test-themes/style-variations'
+			),
+		] );
+		stylesPostId = await requestUtils.getCurrentThemeGlobalStylesPostId();
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.activateTheme( 'twentytwentyone' ),
+			requestUtils.deleteAllPages(),
+		] );
+	} );
+
+	test.beforeEach( async ( { requestUtils, admin } ) => {
+		await Promise.all( [
+			requestUtils.deleteAllPages(),
+			admin.visitSiteEditor(),
+		] );
+	} );
+
+	test( 'apply block styles variations to nested blocks', async ( {
+		editor,
+		page,
+	} ) => {
+		await draftNewPage( page );
+		await addPageContent( editor, page );
+		const firstGroup = editor.canvas
+			.locator( '[data-type="core/group"]' )
+			.first();
+		const secondGroup = editor.canvas
+			.locator( '[data-type="core/group"]' )
+			.nth( 1 );
+		const thirdGroup = editor.canvas
+			.locator( '[data-type="core/group"]' )
+			.nth( 2 );
+
+		// Apply a block style to the parent Group block.
+		await editor.selectBlocks( firstGroup );
+		await editor.openDocumentSettingsSidebar();
+		await page.getByRole( 'tab', { name: 'Styles' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Block Style Variation A' } )
+			.click();
+
+		// Check parent styles have variation A styles.
+		await expect( firstGroup ).toHaveCSS( 'border-style', 'dotted' );
+		await expect( firstGroup ).toHaveCSS( 'border-width', '1px' );
+
+		// Check nested child and grandchild group block variation A inherited styles.
+		await expect( secondGroup ).toHaveCSS( 'border-style', 'solid' );
+		await expect( secondGroup ).toHaveCSS( 'border-width', '11px' );
+		await expect( thirdGroup ).toHaveCSS( 'border-style', 'solid' );
+		await expect( thirdGroup ).toHaveCSS( 'border-width', '11px' );
+
+		// Apply a block style to the nested child Group block.
+		await editor.selectBlocks( secondGroup );
+		await page.getByRole( 'tab', { name: 'Styles' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Block Style Variation B' } )
+			.click();
+
+		// Check nested child styles have variation B styles.
+		await expect( secondGroup ).toHaveCSS( 'border-style', 'dashed' );
+		await expect( secondGroup ).toHaveCSS( 'border-width', '2px' );
+
+		// Check nested grandchild Group block variation B inherited styles.
+		await expect( thirdGroup ).toHaveCSS( 'border-style', 'groove' );
+		await expect( thirdGroup ).toHaveCSS( 'border-width', '22px' );
+
+		// Apply a block style to the nested grandchild Group block.
+		await editor.selectBlocks( thirdGroup );
+		await page.getByRole( 'tab', { name: 'Styles' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Block Style Variation A' } )
+			.click();
+
+		// Check that the child's inner block styles from variation B are overridden by the grandchild's block style variation A.
+		await expect( thirdGroup ).toHaveCSS( 'border-style', 'dotted' );
+		await expect( thirdGroup ).toHaveCSS( 'border-width', '1px' );
+	} );
+
+	test( 'update block style variations in global styles and check revisions match styles', async ( {
+		editor,
+		page,
+		siteEditorBlockStyleVariations,
+	} ) => {
+		await draftNewPage( page );
+		await addPageContent( editor, page );
+		const firstGroup = editor.canvas
+			.locator( '[data-type="core/group"]' )
+			.first();
+		const secondGroup = editor.canvas
+			.locator( '[data-type="core/group"]' )
+			.nth( 1 );
+		const thirdGroup = editor.canvas
+			.locator( '[data-type="core/group"]' )
+			.nth( 2 );
+
+		// Apply a block style to the parent Group block.
+		await editor.selectBlocks( firstGroup );
+		await editor.openDocumentSettingsSidebar();
+		await page.getByRole( 'tab', { name: 'Styles' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Block Style Variation A' } )
+			.click();
+
+		// Apply a block style to the first, nested Group block.
+		await editor.selectBlocks( secondGroup );
+		await page.getByRole( 'tab', { name: 'Styles' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Block Style Variation B' } )
+			.click();
+
+		// Update user global styles with new block style variation values.
+		// First revision.
+		await siteEditorBlockStyleVariations.saveRevision( stylesPostId, {
+			blocks: {
+				'core/group': {
+					variations: {
+						'block-style-variation-a': {
+							border: {
+								width: '3px',
+								style: 'outset',
+							},
+						},
+						'block-style-variation-b': {
+							border: {
+								width: '4px',
+								style: 'double',
+							},
+						},
+					},
+				},
+			},
+		} );
+
+		// Wait for the save button to be re-enabled.
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Save' } )
+		).toBeVisible();
+
+		// Second revision (current).
+		await siteEditorBlockStyleVariations.saveRevision( stylesPostId, {
+			blocks: {
+				'core/group': {
+					variations: {
+						'block-style-variation-a': {
+							border: {
+								width: '7px',
+								style: 'dotted',
+							},
+						},
+						'block-style-variation-b': {
+							border: {
+								width: '8px',
+								style: 'dotted',
+							},
+						},
+					},
+				},
+			},
+		} );
+
+		// Check parent styles.
+		await expect( firstGroup ).toHaveCSS( 'border-style', 'dotted' );
+		await expect( firstGroup ).toHaveCSS( 'border-width', '7px' );
+
+		// Check nested child styles.
+		await expect( secondGroup ).toHaveCSS( 'border-style', 'dotted' );
+		await expect( secondGroup ).toHaveCSS( 'border-width', '8px' );
+
+		// Check nested grandchild group block inherited styles.
+		await expect( thirdGroup ).toHaveCSS( 'border-style', 'groove' );
+		await expect( thirdGroup ).toHaveCSS( 'border-width', '22px' );
+
+		// The initial revision styles should match the editor canvas.
+		await siteEditorBlockStyleVariations.openStylesPanel();
+		const revisionsButton = page.getByRole( 'button', {
+			name: 'Revisions',
+			exact: true,
+		} );
+		await revisionsButton.click();
+		await expect(
+			page.locator( 'iframe[name="revisions"]' )
+		).toBeVisible();
+		const revisionIframe = page.frameLocator( '[name="revisions"]' );
+
+		const revisionFirstGroup = revisionIframe
+			.getByRole( 'document', {
+				name: 'Block: Content',
+			} )
+			.locator( '[data-type="core/group"]' )
+			.first();
+		const revisionSecondGroup = revisionIframe
+			.getByRole( 'document', {
+				name: 'Block: Content',
+			} )
+			.locator( '[data-type="core/group"]' )
+			.nth( 1 );
+		const revisionThirdGroup = revisionIframe
+			.getByRole( 'document', {
+				name: 'Block: Content',
+			} )
+			.locator( '[data-type="core/group"]' )
+			.nth( 2 );
+
+		// Check parent styles have current revision.
+		await expect( revisionFirstGroup ).toHaveCSS(
+			'border-style',
+			'dotted'
+		);
+		await expect( revisionFirstGroup ).toHaveCSS( 'border-width', '7px' );
+
+		// Check nested child styles have current revision.
+		await expect( revisionSecondGroup ).toHaveCSS(
+			'border-style',
+			'dotted'
+		);
+		await expect( revisionSecondGroup ).toHaveCSS( 'border-width', '8px' );
+
+		// Check nested grandchild group block inherited styles from current revision.
+		await expect( revisionThirdGroup ).toHaveCSS(
+			'border-style',
+			'groove'
+		);
+		await expect( revisionThirdGroup ).toHaveCSS( 'border-width', '22px' );
+
+		// Click on previous revision.
+		await page
+			.getByRole( 'button', {
+				name: /^Changes saved by /,
+			} )
+			.nth( 1 )
+			.click();
+
+		// Check parent styles have previous revision.
+		await expect( revisionFirstGroup ).toHaveCSS( 'border-width', '3px' );
+
+		// Check nested child style have previous revision.
+		await expect( revisionSecondGroup ).toHaveCSS(
+			'border-style',
+			'double'
+		);
+		await expect( revisionSecondGroup ).toHaveCSS( 'border-width', '4px' );
+
+		// Check nested grandchild group block inherited styles from previous revision.
+		await expect( revisionThirdGroup ).toHaveCSS(
+			'border-style',
+			'groove'
+		);
+		await expect( revisionThirdGroup ).toHaveCSS( 'border-width', '22px' );
+	} );
+} );
+
+class SiteEditorBlockStyleVariations {
+	constructor( { page, editor } ) {
+		this.page = page;
+		this.editor = editor;
+	}
+
+	async openStylesPanel() {
+		await this.page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Styles' } )
+			.click();
+	}
+
+	async saveRevision( stylesPostId, styles = {}, settings = {} ) {
+		await this.page.evaluate(
+			async ( [ _stylesPostId, _styles, _settings ] ) => {
+				window.wp.data
+					.dispatch( 'core' )
+					.editEntityRecord( 'root', 'globalStyles', _stylesPostId, {
+						id: _stylesPostId,
+						settings: _settings,
+						styles: _styles,
+					} );
+			},
+			[ stylesPostId, styles, settings ]
+		);
+		await this.editor.saveSiteEditorEntities();
+	}
+}
+
+async function draftNewPage( page ) {
+	await page.getByRole( 'button', { name: 'Pages' } ).click();
+	await page.getByRole( 'button', { name: 'Add new page' } ).click();
+	await page
+		.locator( 'role=dialog[name="Draft new: page"i]' )
+		.locator( 'role=textbox[name="title"i]' )
+		.fill( TEST_PAGE_TITLE );
+	await page.keyboard.press( 'Enter' );
+	await expect(
+		page.locator(
+			`role=button[name="Dismiss this notice"i] >> text='"${ TEST_PAGE_TITLE }" successfully created.'`
+		)
+	).toBeVisible();
+}
+
+// Create a Group block with 2 nested Group blocks.
+async function addPageContent( editor, page ) {
+	const inserterButton = page.locator(
+		'role=button[name="Block Inserter"i]'
+	);
+	await inserterButton.click();
+	await page.type( 'role=searchbox[name="Search"i]', 'Group' );
+	await page.click(
+		'role=listbox[name="Blocks"i] >> role=option[name="Group"i]'
+	);
+	await editor.canvas
+		.locator( 'role=button[name="Group: Gather blocks in a container."i]' )
+		.click();
+	await editor.canvas.locator( 'role=button[name="Add block"i]' ).click();
+	await page.click(
+		'role=listbox[name="Blocks"i] >> role=option[name="Paragraph"i]'
+	);
+	await page.keyboard.type( 'Parent Group Block with a Paragraph' );
+	await page.keyboard.press( 'Enter' );
+	await page.keyboard.type( '/group' );
+	await expect(
+		page.locator( 'role=option[name="Group"i][selected]' )
+	).toBeVisible();
+	await page.keyboard.press( 'Enter' );
+	await editor.canvas
+		.locator( 'role=button[name="Group: Gather blocks in a container."i]' )
+		.click();
+	await editor.canvas.locator( 'role=button[name="Add block"i]' ).click();
+	await page.click(
+		'role=listbox[name="Blocks"i] >> role=option[name="Paragraph"i]'
+	);
+	await page.keyboard.type( 'Child Group Block with a Paragraph' );
+	await page.keyboard.press( 'Enter' );
+	await page.keyboard.type( '/group' );
+	await expect(
+		page.locator( 'role=option[name="Group"i][selected]' )
+	).toBeVisible();
+	await page.keyboard.press( 'Enter' );
+	await editor.canvas
+		.locator( 'role=button[name="Group: Gather blocks in a container."i]' )
+		.click();
+	await editor.canvas.locator( 'role=button[name="Add block"i]' ).click();
+	await page.click(
+		'role=listbox[name="Blocks"i] >> role=option[name="Paragraph"i]'
+	);
+	await page.keyboard.type( 'Grandchild Group Block with a Paragraph' );
+	await page.getByRole( 'button', { name: 'Publish', exact: true } ).click();
+}
diff --git a/test/e2e/specs/site-editor/browser-history.spec.js b/test/e2e/specs/site-editor/browser-history.spec.js
index 2dec72953765f8..eaafb3aad1b3fd 100644
--- a/test/e2e/specs/site-editor/browser-history.spec.js
+++ b/test/e2e/specs/site-editor/browser-history.spec.js
@@ -19,15 +19,15 @@ test.describe( 'Site editor browser history', () => {
 
 		// Navigate to a single template
 		await page.click( 'role=button[name="Templates"]' );
-		await page.click( 'role=button[name="Index"]' );
+		await page.getByRole( 'link', { name: 'Index' } ).click();
 		await expect( page ).toHaveURL(
-			'/wp-admin/site-editor.php?postType=wp_template&postId=emptytheme%2F%2Findex'
+			'/wp-admin/site-editor.php?postId=emptytheme%2F%2Findex&postType=wp_template&canvas=edit'
 		);
 
 		// Navigate back to the template list
 		await page.goBack();
 		await expect( page ).toHaveURL(
-			'/wp-admin/site-editor.php?path=%2Fwp_template'
+			'/wp-admin/site-editor.php?postType=wp_template'
 		);
 
 		// Navigate back to the dashboard
diff --git a/test/e2e/specs/site-editor/command-center.spec.js b/test/e2e/specs/site-editor/command-center.spec.js
index 60c5ec30b1247f..19318081aa171b 100644
--- a/test/e2e/specs/site-editor/command-center.spec.js
+++ b/test/e2e/specs/site-editor/command-center.spec.js
@@ -28,10 +28,12 @@ test.describe( 'Site editor command palette', () => {
 		await page.keyboard.type( 'new page' );
 		await page.getByRole( 'option', { name: 'Add new page' } ).click();
 		await expect( page ).toHaveURL(
-			'/wp-admin/post-new.php?post_type=page'
+			/\/wp-admin\/site-editor.php\?postId=(\d+)&postType=page&canvas=edit/
 		);
 		await expect(
-			editor.canvas.getByRole( 'textbox', { name: 'Add title' } )
+			editor.canvas
+				.getByLabel( 'Block: Title' )
+				.locator( '[data-rich-text-placeholder="No title"]' )
 		).toBeVisible();
 	} );
 
@@ -43,8 +45,25 @@ test.describe( 'Site editor command palette', () => {
 			.click();
 		await page.keyboard.type( 'index' );
 		await page.getByRole( 'option', { name: 'index' } ).click();
-		await expect( page.getByRole( 'heading', { level: 1 } ) ).toHaveText(
-			'Index'
-		);
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'heading', { level: 1 } )
+		).toContainText( 'Index' );
+	} );
+
+	test( 'Open the command palette and navigate to Customize CSS', async ( {
+		page,
+	} ) => {
+		await page
+			.getByRole( 'button', { name: 'Open command palette' } )
+			.click();
+		await page.keyboard.type( 'Customize' );
+		await page.getByRole( 'option', { name: 'customize css' } ).click();
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor settings' } )
+				.getByLabel( 'Additional CSS' )
+		).toBeVisible();
 	} );
 } );
diff --git a/test/e2e/specs/site-editor/dataviews-list-layout-keyboard.spec.js b/test/e2e/specs/site-editor/dataviews-list-layout-keyboard.spec.js
new file mode 100644
index 00000000000000..0ff375a9f45a33
--- /dev/null
+++ b/test/e2e/specs/site-editor/dataviews-list-layout-keyboard.spec.js
@@ -0,0 +1,207 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Dataviews List Layout', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		// Activate a theme with permissions to access the site editor.
+		await requestUtils.activateTheme( 'emptytheme' );
+		await requestUtils.createPage( {
+			title: 'Privacy Policy',
+			status: 'publish',
+		} );
+		await requestUtils.createPage( {
+			title: 'Sample Page',
+			status: 'publish',
+		} );
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		// Go back to the default theme.
+		await Promise.all( [
+			requestUtils.activateTheme( 'twentytwentyone' ),
+			requestUtils.deleteAllPages(),
+		] );
+	} );
+
+	test.beforeEach( async ( { admin, page } ) => {
+		// Go to the pages page, as it has the list layout enabled by default.
+		await admin.visitSiteEditor();
+		await page.getByRole( 'button', { name: 'Pages' } ).click();
+	} );
+
+	test( 'Items list is reachable via TAB', async ( { page } ) => {
+		// Start the sequence on the search component.
+		await page.getByRole( 'searchbox', { name: 'Search' } ).click();
+
+		// Tab until reaching the items list.
+		await page.keyboard.press( 'Tab' );
+		await expect(
+			page.getByRole( 'button', { name: 'Add filter' } )
+		).toBeFocused();
+
+		await page.keyboard.press( 'Tab' );
+		await expect(
+			page.getByRole( 'button', { name: 'Layout' } )
+		).toBeFocused();
+
+		await page.keyboard.press( 'Tab' );
+		await expect(
+			page.getByRole( 'button', { name: 'View options' } )
+		).toBeFocused();
+
+		// Make sure the items have loaded before reaching for the 1st item in the list.
+		await expect( page.getByRole( 'grid' ) ).toBeVisible();
+		await page.keyboard.press( 'Tab' );
+		await expect(
+			page.getByRole( 'grid' ).getByRole( 'button' ).first()
+		).toBeFocused();
+	} );
+
+	test( 'Navigates from items list to preview via TAB, and vice versa', async ( {
+		page,
+	} ) => {
+		// Start the sequence on the search component.
+		await page.getByRole( 'searchbox', { name: 'Search' } ).click();
+
+		// Tab until reaching the items list.
+		await page.keyboard.press( 'Tab' );
+		await page.keyboard.press( 'Tab' );
+		await page.keyboard.press( 'Tab' );
+
+		const firstItem = page
+			.getByRole( 'grid' )
+			.getByRole( 'button' )
+			.first();
+
+		// Make sure the items have loaded before reaching for the 1st item in the list.
+		await expect( page.getByRole( 'grid' ) ).toBeVisible();
+		await page.keyboard.press( 'Tab' );
+		await expect( firstItem ).toBeFocused();
+
+		// Go to the preview.
+		await page.keyboard.press( 'Tab' );
+		await expect(
+			page
+				.getByRole( 'region', { name: 'Editor content' } )
+				.getByRole( 'button', { name: 'Edit' } )
+		).toBeFocused();
+
+		// Go back to the items list using SHIFT+TAB.
+		await page.keyboard.press( 'Shift+Tab' );
+		await expect( firstItem ).toBeFocused();
+	} );
+
+	test( 'Navigates the items list via UP/DOWN arrow keys', async ( {
+		page,
+	} ) => {
+		// Start the sequence on the search component.
+		await page.getByRole( 'searchbox', { name: 'Search' } ).click();
+
+		// Tab until reaching the items list.
+		await page.keyboard.press( 'Tab' );
+		await page.keyboard.press( 'Tab' );
+		await page.keyboard.press( 'Tab' );
+
+		// Make sure the items have loaded before reaching for the 1st item in the list.
+		await expect( page.getByRole( 'grid' ) ).toBeVisible();
+		await page.keyboard.press( 'Tab' );
+
+		// Use arrow up/down to move through the list.
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( page.getByLabel( 'Sample Page' ) ).toBeFocused();
+
+		await page.keyboard.press( 'ArrowUp' );
+		await expect( page.getByLabel( 'Privacy Policy' ) ).toBeFocused();
+	} );
+
+	test( 'Actions are reachable via RIGHT/LEFT arrow keys', async ( {
+		page,
+	} ) => {
+		// Start the sequence on the search component.
+		await page.getByRole( 'searchbox', { name: 'Search' } ).click();
+
+		// Tab until reaching the items list.
+		await page.keyboard.press( 'Tab' );
+		await page.keyboard.press( 'Tab' );
+		await page.keyboard.press( 'Tab' );
+
+		// Make sure the items have loaded before reaching for the 1st item in the list.
+		await expect( page.getByRole( 'grid' ) ).toBeVisible();
+		await page.keyboard.press( 'Tab' );
+
+		// Use right/left arrow keys to move horizontally.
+		await page.keyboard.press( 'ArrowRight' );
+		await expect(
+			page
+				.getByRole( 'row', { name: 'Privacy Policy Edit Actions' } )
+				.getByLabel( 'Edit' )
+		).toBeFocused();
+
+		await page.keyboard.press( 'ArrowRight' );
+		await expect(
+			page
+				.getByRole( 'row', { name: 'Privacy Policy Edit Actions' } )
+				.getByLabel( 'Actions' )
+		).toBeFocused();
+
+		await page.keyboard.press( 'ArrowLeft' );
+		await expect(
+			page
+				.getByRole( 'row', { name: 'Privacy Policy Edit Actions' } )
+				.getByLabel( 'Edit' )
+		).toBeFocused();
+
+		await page.keyboard.press( 'ArrowLeft' );
+		await expect( page.getByLabel( 'Privacy Policy' ) ).toBeFocused();
+	} );
+
+	test( 'Navigates the list via UP/DOWN arrow keys from action buttons', async ( {
+		page,
+	} ) => {
+		// Start the sequence on the search component.
+		await page.getByRole( 'searchbox', { name: 'Search' } ).click();
+
+		// Tab until reaching the items list.
+		await page.keyboard.press( 'Tab' );
+		await page.keyboard.press( 'Tab' );
+		await page.keyboard.press( 'Tab' );
+
+		// Make sure the items have loaded before reaching for the 1st item in the list.
+		await expect( page.getByRole( 'grid' ) ).toBeVisible();
+		await page.keyboard.press( 'Tab' );
+
+		// Use arrow up/down to move through the list from the edit primary action button.
+		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.press( 'ArrowDown' );
+		await expect(
+			page
+				.getByRole( 'row', { name: 'Sample Page Edit Actions' } )
+				.getByLabel( 'Edit' )
+		).toBeFocused();
+
+		await page.keyboard.press( 'ArrowUp' );
+		await expect(
+			page
+				.getByRole( 'row', { name: 'Privacy Policy Edit Actions' } )
+				.getByLabel( 'Edit' )
+		).toBeFocused();
+
+		// Use arrow up/down to move through the list from the all actions button.
+		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.press( 'ArrowDown' );
+		await expect(
+			page
+				.getByRole( 'row', { name: 'Sample Page Edit Actions' } )
+				.getByLabel( 'Actions' )
+		).toBeFocused();
+
+		await page.keyboard.press( 'ArrowUp' );
+		await expect(
+			page
+				.getByRole( 'row', { name: 'Privacy Policy Edit Actions' } )
+				.getByLabel( 'Actions' )
+		).toBeFocused();
+	} );
+} );
diff --git a/test/e2e/specs/site-editor/font-library.spec.js b/test/e2e/specs/site-editor/font-library.spec.js
index 531398fb495906..7928ef8f71c534 100644
--- a/test/e2e/specs/site-editor/font-library.spec.js
+++ b/test/e2e/specs/site-editor/font-library.spec.js
@@ -9,21 +9,41 @@ test.describe( 'Font Library', () => {
 			await requestUtils.activateTheme( 'emptytheme' );
 		} );
 
-		test.beforeEach( async ( { admin, editor } ) => {
+		test.beforeEach( async ( { admin } ) => {
 			await admin.visitSiteEditor( {
 				postId: 'emptytheme//index',
 				postType: 'wp_template',
+				canvas: 'edit',
 			} );
-			await editor.canvas.locator( 'body' ).click();
 		} );
 
-		test( 'should display the "Manage Fonts" icon', async ( { page } ) => {
-			await page.getByRole( 'button', { name: /styles/i } ).click();
+		test( 'should display the "no font installed." message', async ( {
+			page,
+		} ) => {
 			await page
-				.getByRole( 'button', { name: /typography styles/i } )
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Styles' } )
 				.click();
+			await page.getByRole( 'button', { name: 'Typography' } ).click();
+			await page
+				.getByRole( 'button', {
+					name: 'Add fonts',
+				} )
+				.click();
+			await page.getByRole( 'tab', { name: 'Library' } ).click();
+			await expect(
+				page.getByLabel( 'library' ).getByText( 'No fonts installed.' )
+			).toBeVisible();
+		} );
+
+		test( 'should display the "Manage fonts" icon', async ( { page } ) => {
+			await page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Styles' } )
+				.click();
+			await page.getByRole( 'button', { name: 'Typography' } ).click();
 			const manageFontsIcon = page.getByRole( 'button', {
-				name: /manage fonts/i,
+				name: 'Manage fonts',
 			} );
 			await expect( manageFontsIcon ).toBeVisible();
 		} );
@@ -34,61 +54,239 @@ test.describe( 'Font Library', () => {
 			await requestUtils.activateTheme( 'twentytwentythree' );
 		} );
 
-		test.beforeEach( async ( { admin, editor } ) => {
+		test.beforeEach( async ( { admin } ) => {
 			await admin.visitSiteEditor( {
 				postId: 'twentytwentythree//index',
 				postType: 'wp_template',
+				canvas: 'edit',
 			} );
-			await editor.canvas.locator( 'body' ).click();
 		} );
 
-		test( 'should display the "Manage Fonts" icon', async ( { page } ) => {
-			await page.getByRole( 'button', { name: /styles/i } ).click();
+		test( 'should display the "Manage fonts" icon', async ( { page } ) => {
 			await page
-				.getByRole( 'button', { name: /typography styles/i } )
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Styles' } )
 				.click();
+			await page.getByRole( 'button', { name: 'Typography' } ).click();
 			const manageFontsIcon = page.getByRole( 'button', {
-				name: /manage fonts/i,
+				name: 'Manage fonts',
 			} );
 			await expect( manageFontsIcon ).toBeVisible();
 		} );
 
-		test( 'should open the "Manage Fonts" modal when clicking the "Manage Fonts" icon', async ( {
+		test( 'should open the "Manage fonts" modal when clicking the "Manage fonts" icon', async ( {
 			page,
 		} ) => {
-			await page.getByRole( 'button', { name: /styles/i } ).click();
 			await page
-				.getByRole( 'button', { name: /typography styles/i } )
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Styles' } )
 				.click();
+			await page.getByRole( 'button', { name: 'Typography' } ).click();
 			await page
 				.getByRole( 'button', {
-					name: /manage fonts/i,
+					name: 'Manage fonts',
 				} )
 				.click();
 			await expect( page.getByRole( 'dialog' ) ).toBeVisible();
 			await expect(
-				page.getByRole( 'heading', { name: 'Fonts' } )
+				page.getByRole( 'heading', { name: 'Fonts', exact: true } )
 			).toBeVisible();
 		} );
 
 		test( 'should show font variant panel when clicking on a font family', async ( {
 			page,
 		} ) => {
-			await page.getByRole( 'button', { name: /styles/i } ).click();
 			await page
-				.getByRole( 'button', { name: /typography styles/i } )
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Styles' } )
 				.click();
+			await page.getByRole( 'button', { name: 'Typography' } ).click();
 			await page
 				.getByRole( 'button', {
-					name: /manage fonts/i,
+					name: 'Manage fonts',
 				} )
 				.click();
-			await page.getByRole( 'button', { name: /system font/i } ).click();
+			await page.getByRole( 'button', { name: 'System Font' } ).click();
 			await expect(
-				page.getByRole( 'heading', { name: /system font/i } )
+				page.getByRole( 'heading', { name: 'System Font' } )
 			).toBeVisible();
 			await expect(
-				page.getByRole( 'checkbox', { name: /system font normal/i } )
+				page.getByRole( 'checkbox', { name: 'System Font Normal' } )
+			).toBeVisible();
+		} );
+	} );
+
+	test.describe( 'When a user manages custom fonts via the UI', () => {
+		test.beforeAll( async ( { requestUtils } ) => {
+			await requestUtils.activateTheme( 'emptytheme' );
+			/*
+			 * Delete all installed fonts, font files, the fonts directory, and user font settings
+			 * in global styles for the active theme before and after starting the tests.
+			 */
+			await requestUtils.activatePlugin(
+				'gutenberg-test-delete-installed-fonts'
+			);
+		} );
+
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.deactivatePlugin(
+				'gutenberg-test-delete-installed-fonts'
+			);
+		} );
+
+		test.beforeEach( async ( { admin } ) => {
+			await admin.visitSiteEditor( {
+				postId: 'emptytheme//index',
+				postType: 'wp_template',
+				canvas: 'edit',
+			} );
+		} );
+
+		test( 'should allow user to add and remove multiple local font files', async ( {
+			page,
+			editor,
+		} ) => {
+			await page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Styles' } )
+				.click();
+			await page.getByRole( 'button', { name: 'Typography' } ).click();
+			await page
+				.getByRole( 'button', {
+					name: 'Add fonts',
+				} )
+				.click();
+
+			// Upload local fonts.
+			const fileChooserPromise = page.waitForEvent( 'filechooser' );
+			await page.getByRole( 'button', { name: 'Upload Font' } ).click();
+			const fileChooser = await fileChooserPromise;
+			// Provides coverage for https://github.com/WordPress/gutenberg/issues/59023.
+			await fileChooser.setFiles( [
+				'./test/e2e/assets/Exo2-Regular.woff',
+				'./test/e2e/assets/Exo2-SemiBoldItalic.woff2',
+			] );
+
+			// Check fonts were installed.
+			await expect(
+				page
+					.getByLabel( 'Upload' )
+					.getByText( 'Fonts were installed successfully.' )
+			).toBeVisible();
+			await page.getByRole( 'tab', { name: 'Library' } ).click();
+			// Provides coverage for https://github.com/WordPress/gutenberg/issues/60040.
+			await page.getByRole( 'button', { name: 'Exo 2' } ).click();
+			await expect( page.getByLabel( 'Exo 2 Normal' ) ).toBeVisible();
+			await expect(
+				page.getByLabel( 'Exo 2 Semi-bold Italic' )
+			).toBeVisible();
+
+			// Check CSS preset was created.
+			await page.getByRole( 'button', { name: 'Close' } ).click();
+			await page
+				.getByRole( 'button', { name: 'Headings', exact: true } )
+				.click();
+			await page.getByLabel( 'Font' ).selectOption( 'Exo 2' );
+			await expect(
+				editor.canvas.locator( '.is-root-container h1' )
+			).toHaveCSS( 'font-family', '"Exo 2"' );
+
+			// Check fonts can be uninstalled.
+			await page.getByRole( 'button', { name: 'Back' } ).click();
+			await page
+				.getByRole( 'button', {
+					name: 'Manage fonts',
+				} )
+				.click();
+
+			await page.getByRole( 'button', { name: 'Exo 2' } ).click();
+			await page.getByRole( 'button', { name: 'Delete' } ).click();
+			await page.getByRole( 'button', { name: 'Delete' } ).click();
+			await expect(
+				page
+					.getByLabel( 'Library' )
+					.getByText( 'Font family uninstalled successfully.' )
+			).toBeVisible();
+		} );
+	} );
+
+	test.describe( 'When switching Theme Style variations', () => {
+		test.beforeAll( async ( { requestUtils } ) => {
+			await requestUtils.activateTheme( 'twentytwentyfour' );
+		} );
+
+		test.beforeEach( async ( { admin } ) => {
+			await admin.visitSiteEditor( {
+				postId: 'twentytwentyfour//home',
+				postType: 'wp_template',
+				canvas: 'edit',
+			} );
+		} );
+
+		test( 'clicking on a font in the global styles sidebar should activate the font in the overlay when switching Theme Style variation', async ( {
+			page,
+		} ) => {
+			await page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Styles' } )
+				.click();
+
+			// Click "Browse styles"
+			await page.getByRole( 'button', { name: 'Browse styles' } ).click();
+
+			// Activate "Ember" Theme Variation.
+			await page.getByRole( 'button', { name: 'Ember' } ).click();
+
+			// Click "Back" button
+			await page.getByRole( 'button', { name: 'Back' } ).click();
+
+			await page.getByRole( 'button', { name: 'Typography' } ).click();
+
+			// Click "Jost 2 variants" button
+			await page
+				.getByRole( 'button', { name: 'Jost 2 variants' } )
+				.click();
+
+			await expect( page.getByRole( 'dialog' ) ).toBeVisible();
+			await expect(
+				page.getByRole( 'heading', { name: 'Fonts' } )
+			).toBeVisible();
+
+			// Check correct font is displayed in Font Library
+			await expect(
+				page.getByRole( 'heading', { name: 'Jost' } )
+			).toBeVisible();
+
+			// Close the Font Library dialog
+			await page.getByRole( 'button', { name: 'Close' } ).click();
+
+			// Click "Back"
+			await page.getByRole( 'button', { name: 'Back' } ).click();
+
+			// Click "Browse styles"
+			await page.getByRole( 'button', { name: 'Browse styles' } ).click();
+
+			// Activate "Maelstrom" Theme Variation.
+			await page.getByRole( 'button', { name: 'Maelstrom' } ).click();
+
+			// Click "Back" button
+			await page.getByRole( 'button', { name: 'Back' } ).click();
+
+			await page.getByRole( 'button', { name: 'Typography' } ).click();
+
+			// Click Cardo font-family.
+			await page
+				.getByRole( 'button', { name: 'Cardo 3 variants' } )
+				.click();
+
+			await expect( page.getByRole( 'dialog' ) ).toBeVisible();
+			await expect(
+				page.getByRole( 'heading', { name: 'Fonts' } )
+			).toBeVisible();
+
+			// Check correct font is displayed in Font Library
+			await expect(
+				page.getByRole( 'heading', { name: 'Cardo' } )
 			).toBeVisible();
 		} );
 	} );
diff --git a/test/e2e/specs/site-editor/global-styles-sidebar.spec.js b/test/e2e/specs/site-editor/global-styles-sidebar.spec.js
index f255640cb2f12f..7f1b818df4ce0a 100644
--- a/test/e2e/specs/site-editor/global-styles-sidebar.spec.js
+++ b/test/e2e/specs/site-editor/global-styles-sidebar.spec.js
@@ -12,12 +12,12 @@ test.describe( 'Global styles sidebar', () => {
 		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
 
-	test.beforeEach( async ( { admin, editor } ) => {
+	test.beforeEach( async ( { admin } ) => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 	} );
 
 	test( 'should filter blocks list results', async ( { page } ) => {
@@ -28,21 +28,21 @@ test.describe( 'Global styles sidebar', () => {
 			.click();
 		await page
 			.getByRole( 'region', { name: 'Editor settings' } )
-			.getByRole( 'button', { name: 'Blocks styles' } )
+			.getByRole( 'button', { name: 'Blocks' } )
 			.click();
 
 		await page
-			.getByRole( 'searchbox', { name: 'Search for blocks' } )
+			.getByRole( 'searchbox', { name: 'Search' } )
 			.fill( 'heading' );
 
 		// Matches both Heading and Table of Contents blocks.
 		// The latter contains "heading" in its description.
 		await expect(
-			page.getByRole( 'button', { name: 'Heading block styles' } )
+			page.getByRole( 'button', { name: 'Heading', exact: true } )
 		).toBeVisible();
 		await expect(
 			page.getByRole( 'button', {
-				name: 'Table of Contents block styles',
+				name: 'Table of Contents',
 			} )
 		).toBeVisible();
 	} );
diff --git a/test/e2e/specs/site-editor/hybrid-theme.spec.js b/test/e2e/specs/site-editor/hybrid-theme.spec.js
index 7c9f3fc3a5e232..b568aaf4445b5c 100644
--- a/test/e2e/specs/site-editor/hybrid-theme.spec.js
+++ b/test/e2e/specs/site-editor/hybrid-theme.spec.js
@@ -12,29 +12,49 @@ test.describe( 'Hybrid theme', () => {
 		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
 
-	test( 'can access template parts list page', async ( { admin, page } ) => {
-		await admin.visitAdminPage(
-			'site-editor.php',
-			'postType=wp_template_part&path=/wp_template_part/all'
-		);
+	test( 'can access Patterns page', async ( { admin, page } ) => {
+		await admin.visitAdminPage( 'site-editor.php', 'path=/patterns' );
 
 		await expect(
-			page.getByRole( 'table' ).getByRole( 'link', { name: 'header' } )
+			page.getByRole( 'heading', { level: 1, text: 'Patterns' } )
+		).toBeVisible();
+		await expect(
+			page.getByRole( 'heading', { level: 2, text: 'All patterns' } )
 		).toBeVisible();
 	} );
 
-	test( 'can view a template part', async ( { admin, editor, page } ) => {
+	test( 'should redirect to Patterns page when accessing template parts list page', async ( {
+		admin,
+		page,
+	} ) => {
 		await admin.visitAdminPage(
 			'site-editor.php',
-			'postType=wp_template_part&path=/wp_template_part/all'
+			'path=/wp_template_part/all'
 		);
 
-		const templatePart = page
-			.getByRole( 'table' )
-			.getByRole( 'link', { name: 'header' } );
+		await expect( page ).toHaveURL(
+			'/wp-admin/site-editor.php?postType=wp_template_part'
+		);
+
+		await expect(
+			page.getByRole( 'heading', { level: 1, text: 'Patterns' } )
+		).toBeVisible();
+		await expect(
+			page.getByRole( 'heading', { level: 2, text: 'All patterns' } )
+		).toBeVisible();
+	} );
+
+	test( 'can view a template part list', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		await admin.visitAdminPage( 'site-editor.php', 'path=/patterns' );
 
-		await expect( templatePart ).toBeVisible();
-		await templatePart.click();
+		await page
+			.getByRole( 'button', { name: 'All template parts' } )
+			.click();
+		await page.getByText( 'header', { exact: true } ).click();
 
 		await expect(
 			page.getByRole( 'region', { name: 'Editor content' } )
@@ -47,5 +67,26 @@ test.describe( 'Hybrid theme', () => {
 				name: 'Block: Site Title',
 			} )
 		).toBeVisible();
+
+		await expect(
+			page.locator( 'role=dialog[name="Welcome to the site editor"i]' )
+		).toBeHidden();
+	} );
+
+	test( 'can not export Site Editor Templates', async ( { admin, page } ) => {
+		await admin.visitSiteEditor( {
+			postId: 'gutenberg-test-themes/emptyhybrid//header',
+			postType: 'wp_template_part',
+			canvas: 'edit',
+		} );
+
+		await page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Options' } )
+			.click();
+
+		await expect(
+			page.getByRole( 'menuitem', { name: 'Export' } )
+		).toBeHidden();
 	} );
 } );
diff --git a/test/e2e/specs/site-editor/iframe-rendering.spec.js b/test/e2e/specs/site-editor/iframe-rendering.spec.js
index 4391f134a9f80b..9c25ef504637e4 100644
--- a/test/e2e/specs/site-editor/iframe-rendering.spec.js
+++ b/test/e2e/specs/site-editor/iframe-rendering.spec.js
@@ -19,6 +19,7 @@ test.describe( 'Site editor iframe rendering mode', () => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
 		const compatMode = await editor.canvas
 			.locator( ':root' )
diff --git a/test/e2e/specs/site-editor/list-view.spec.js b/test/e2e/specs/site-editor/list-view.spec.js
index 74d3559d4e3d27..db514463a73d76 100644
--- a/test/e2e/specs/site-editor/list-view.spec.js
+++ b/test/e2e/specs/site-editor/list-view.spec.js
@@ -12,13 +12,13 @@ test.describe( 'Site Editor List View', () => {
 		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
 
-	test.beforeEach( async ( { admin, editor } ) => {
+	test.beforeEach( async ( { admin } ) => {
 		// Select a template part with a few blocks.
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//header',
 			postType: 'wp_template_part',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 	} );
 
 	test( 'should open by default when preference is enabled', async ( {
@@ -26,22 +26,22 @@ test.describe( 'Site Editor List View', () => {
 		editor,
 	} ) => {
 		await expect(
-			page.locator( 'role=region[name="List View"i]' )
+			page.locator( 'role=region[name="Document Overview"i]' )
 		).toBeHidden();
 
 		// Turn on block list view by default.
-		await editor.setPreferences( 'core/edit-site', {
+		await editor.setPreferences( 'core', {
 			showListViewByDefault: true,
 		} );
 
 		await page.reload();
 
 		await expect(
-			page.locator( 'role=region[name="List View"i]' )
+			page.locator( 'role=region[name="Document Overview"i]' )
 		).toBeVisible();
 
 		// The preferences cleanup.
-		await editor.setPreferences( 'core/edit-site', {
+		await editor.setPreferences( 'core', {
 			showListViewByDefault: false,
 		} );
 	} );
@@ -106,7 +106,7 @@ test.describe( 'Site Editor List View', () => {
 
 		// Focus should now be on the list view toggle button.
 		await expect(
-			page.getByRole( 'button', { name: 'List View' } )
+			page.getByRole( 'button', { name: 'Document Overview' } )
 		).toBeFocused();
 
 		// Open List View.
@@ -118,9 +118,10 @@ test.describe( 'Site Editor List View', () => {
 		// out of range of the sidebar region. Must shift+tab 1 time to reach
 		// close button before list view area.
 		await pageUtils.pressKeys( 'shift+Tab' );
+		await pageUtils.pressKeys( 'shift+Tab' );
 		await expect(
 			page
-				.getByRole( 'region', { name: 'List View' } )
+				.getByRole( 'region', { name: 'Document Overview' } )
 				.getByRole( 'button', {
 					name: 'Close',
 				} )
@@ -128,7 +129,7 @@ test.describe( 'Site Editor List View', () => {
 		await pageUtils.pressKeys( 'access+o' );
 		await expect( listView ).toBeHidden();
 		await expect(
-			page.getByRole( 'button', { name: 'List View' } )
+			page.getByRole( 'button', { name: 'Document Overview' } )
 		).toBeFocused();
 	} );
 } );
diff --git a/test/e2e/specs/site-editor/multi-entity-saving.spec.js b/test/e2e/specs/site-editor/multi-entity-saving.spec.js
index bb062aafa3e7f3..cbc3bfde457a14 100644
--- a/test/e2e/specs/site-editor/multi-entity-saving.spec.js
+++ b/test/e2e/specs/site-editor/multi-entity-saving.spec.js
@@ -18,12 +18,12 @@ test.describe( 'Site Editor - Multi-entity save flow', () => {
 		] );
 	} );
 
-	test.beforeEach( async ( { admin, editor } ) => {
+	test.beforeEach( async ( { admin } ) => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 	} );
 
 	test( 'save flow should work as expected', async ( { editor, page } ) => {
@@ -41,16 +41,20 @@ test.describe( 'Site Editor - Multi-entity save flow', () => {
 		).toBeEnabled();
 		await expect(
 			page
-				.getByRole( 'region', { name: 'Save panel' } )
+				.getByRole( 'region', { name: 'Editor publish' } )
 				.getByRole( 'button', { name: 'Open save panel' } )
 		).toBeVisible();
 
-		await editor.saveSiteEditorEntities();
-		await expect(
-			page
-				.getByRole( 'region', { name: 'Editor top bar' } )
-				.getByRole( 'button', { name: 'Saved' } )
-		).toBeDisabled();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
+		const saveButton = page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Save' } );
+		await expect( saveButton ).toBeDisabled();
+
+		// Check focus returns to Saved button.
+		await expect( saveButton ).toBeFocused();
 	} );
 
 	test( 'save flow should allow re-saving after changing the same block attribute', async ( {
@@ -72,7 +76,9 @@ test.describe( 'Site Editor - Multi-entity save flow', () => {
 		// Change font size.
 		await fontSizePicker.getByRole( 'radio', { name: 'Small' } ).click();
 
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 
 		// Change font size again.
 		await fontSizePicker.getByRole( 'radio', { name: 'Medium' } ).click();
diff --git a/test/e2e/specs/site-editor/navigation-editor.spec.js b/test/e2e/specs/site-editor/navigation-editor.spec.js
new file mode 100644
index 00000000000000..64a80e814d6298
--- /dev/null
+++ b/test/e2e/specs/site-editor/navigation-editor.spec.js
@@ -0,0 +1,110 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Editing Navigation Menus', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'emptytheme' );
+	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMenus();
+	} );
+
+	test( 'it should lock the root Navigation block in the editor', async ( {
+		admin,
+		page,
+		pageUtils,
+		requestUtils,
+		editor,
+	} ) => {
+		await test.step( 'Check Navigation block is present and locked', async () => {
+			// Create a Navigation Menu called "Primary Menu" using the REST API helpers.
+			const createdMenu = await requestUtils.createNavigationMenu( {
+				title: 'Primary Menu',
+				content:
+					'<!-- wp:navigation-link {"label":"WordPress","type":"custom","url":"http://www.wordpress.org/","kind":"custom"} /-->',
+			} );
+
+			// Add another so we get a list of Navigation menus in the editor.
+			await requestUtils.createNavigationMenu( {
+				title: 'Another One',
+				content:
+					'<!-- wp:navigation-link {"label":"Another Item","type":"custom","url":"http://www.wordpress.org/","kind":"custom"} /-->',
+			} );
+
+			await admin.visitSiteEditor( {
+				postId: createdMenu?.id,
+				postType: 'wp_navigation',
+				canvas: 'edit',
+			} );
+
+			// Open List View.
+			await pageUtils.pressKeys( 'access+o' );
+
+			const listView = page
+				.getByRole( 'region', {
+					name: 'Document Overview',
+				} )
+				.getByRole( 'treegrid', {
+					name: 'Block navigation structure',
+				} );
+
+			await expect( listView ).toBeVisible();
+
+			const navBlockNode = listView.getByRole( 'link', {
+				name: 'Navigation',
+				exact: true,
+			} );
+
+			// The Navigation block should be present.
+			await expect( navBlockNode ).toBeVisible();
+
+			// The Navigation block description should contain the locked state information.
+			await expect( navBlockNode ).toHaveAccessibleDescription(
+				/This block is locked./
+			);
+
+			// The block should have no options menu.
+			await expect(
+				navBlockNode
+					.locator( '..' ) // parent selector.
+					.getByRole( 'button', {
+						name: 'Options',
+					} )
+			).toBeHidden();
+
+			// Select the Navigation block.
+			await navBlockNode.click();
+		} );
+
+		await test.step( 'Check Navigation block has no controls other than editable list view', async () => {
+			// Open the document settings sidebar
+			await editor.openDocumentSettingsSidebar();
+
+			const sidebar = page.getByRole( 'region', {
+				name: 'Editor settings',
+			} );
+
+			await expect( sidebar ).toBeVisible();
+
+			// Check that the `Menu` control is visible.
+			// This is effectively the contents of the "List View" tab.
+			await expect(
+				sidebar.getByRole( 'heading', { name: 'Menu', exact: true } )
+			).toBeVisible();
+
+			// Check the standard tabs are not present.
+			await expect(
+				sidebar.getByRole( 'tab', { name: 'Document Overview' } )
+			).toBeHidden();
+			await expect(
+				sidebar.getByRole( 'tab', { name: 'Settings' } )
+			).toBeHidden();
+			await expect(
+				sidebar.getByRole( 'tab', { name: 'Styles' } )
+			).toBeHidden();
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/site-editor/navigation.spec.js b/test/e2e/specs/site-editor/navigation.spec.js
new file mode 100644
index 00000000000000..1b92ef2e850e67
--- /dev/null
+++ b/test/e2e/specs/site-editor/navigation.spec.js
@@ -0,0 +1,129 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.use( {
+	editorNavigationUtils: async ( { page, pageUtils }, use ) => {
+		await use( new EditorNavigationUtils( { page, pageUtils } ) );
+	},
+} );
+
+test.describe( 'Site editor navigation', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'emptytheme' );
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+
+	test( 'Can use keyboard to navigate the site editor', async ( {
+		admin,
+		editorNavigationUtils,
+		page,
+		pageUtils,
+	} ) => {
+		await admin.visitSiteEditor();
+
+		// Test: Can navigate to a sidebar item and into its subnavigation frame without losing focus
+		// Go to the Pages button
+
+		await editorNavigationUtils.tabToLabel( 'Pages' );
+
+		await expect(
+			page.getByRole( 'button', { name: 'Pages' } )
+		).toBeFocused();
+		await pageUtils.pressKeys( 'Enter' );
+		// We should be in the Pages sidebar
+		await expect(
+			page.getByRole( 'button', { name: 'Back', exact: true } )
+		).toBeFocused();
+		await pageUtils.pressKeys( 'Enter' );
+		// Go back to the main navigation
+		await expect(
+			page.getByRole( 'button', { name: 'Pages' } )
+		).toBeFocused();
+
+		// Navigate to the Saved button first, as it precedes the editor iframe.
+		await editorNavigationUtils.tabToLabel( 'Saved' );
+		const savedButton = page.getByRole( 'button', {
+			name: 'Saved',
+		} );
+		await expect( savedButton ).toBeFocused();
+
+		// Get the iframe when it has a role=button and Edit label.
+		const editorCanvasRegion = page.getByRole( 'region', {
+			name: 'Editor content',
+		} );
+		const editorCanvasButton = editorCanvasRegion.getByRole( 'button', {
+			name: 'Edit',
+		} );
+
+		// Test that there are no tab stops between the Saved button and the
+		// focusable iframe with role=button.
+		await pageUtils.pressKeys( 'Tab' );
+		await expect( editorCanvasButton ).toBeFocused();
+
+		// Tab to the Pages item to move focus back in the UI.
+		await editorNavigationUtils.tabToLabel( 'Pages' );
+		await expect(
+			page.getByRole( 'button', { name: 'Pages' } )
+		).toBeFocused();
+
+		// Test again can navigate into the iframe using the keyboard.
+		await editorNavigationUtils.tabToLabel( 'Edit' );
+
+		// Enter into the site editor frame
+		await pageUtils.pressKeys( 'Enter' );
+		// Focus should be on the iframe without the button role
+		await expect(
+			page.locator( 'iframe[name="editor-canvas"]' )
+		).toBeFocused();
+		// The button role should have been removed from the iframe.
+		await expect( editorCanvasButton ).toBeHidden();
+
+		// Test: We can go back to the main navigation from the editor frame
+		// Move to the document toolbar
+		await pageUtils.pressKeys( 'alt+F10' );
+		// Go to the open navigation button
+		await pageUtils.pressKeys( 'shift+Tab' );
+
+		// Open the sidebar again
+		await expect(
+			page.getByRole( 'button', {
+				name: 'Open Navigation',
+				exact: true,
+			} )
+		).toBeFocused();
+		await pageUtils.pressKeys( 'Enter' );
+
+		await expect(
+			page.getByLabel( 'Go to the Dashboard' ).first()
+		).toBeFocused();
+		// We should have our editor canvas button back
+		await expect( editorCanvasButton ).toBeVisible();
+	} );
+} );
+
+class EditorNavigationUtils {
+	constructor( { page, pageUtils } ) {
+		this.page = page;
+		this.pageUtils = pageUtils;
+	}
+
+	async tabToLabel( label, times = 10 ) {
+		for ( let i = 0; i < times; i++ ) {
+			await this.pageUtils.pressKeys( 'Tab' );
+			const activeLabel = await this.page.evaluate( () => {
+				return (
+					document.activeElement.getAttribute( 'aria-label' ) ||
+					document.activeElement.textContent
+				);
+			} );
+			if ( activeLabel === label ) {
+				return;
+			}
+		}
+	}
+}
diff --git a/test/e2e/specs/site-editor/new-templates-list.spec.js b/test/e2e/specs/site-editor/new-templates-list.spec.js
index 8bb98b6ad5355a..6faa85a2659cf1 100644
--- a/test/e2e/specs/site-editor/new-templates-list.spec.js
+++ b/test/e2e/specs/site-editor/new-templates-list.spec.js
@@ -7,85 +7,97 @@ test.describe( 'Templates', () => {
 	test.beforeAll( async ( { requestUtils } ) => {
 		await Promise.all( [
 			requestUtils.activateTheme( 'emptytheme' ),
-			requestUtils.activatePlugin( 'gutenberg-test-dataviews' ),
+			requestUtils.deleteAllTemplates( 'wp_template' ),
 		] );
 	} );
+
 	test.afterAll( async ( { requestUtils } ) => {
-		await Promise.all( [
-			requestUtils.activateTheme( 'twentytwentyone' ),
-			requestUtils.deactivatePlugin( 'gutenberg-test-dataviews' ),
-			requestUtils.deleteAllTemplates( 'wp_template' ),
-		] );
+		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllTemplates( 'wp_template' );
+	} );
+
 	test( 'Sorting', async ( { admin, page } ) => {
-		await admin.visitSiteEditor( { path: '/wp_template/all' } );
-		// Descending by title.
-		await page
-			.getByRole( 'button', { name: 'Template', exact: true } )
-			.click();
-		await page
-			.getByRole( 'menuitemradio', {
-				name: 'Sort descending',
-			} )
-			.click();
+		await admin.visitSiteEditor( { postType: 'wp_template' } );
+
+		// Wait for the template list to be visible.
+		await expect(
+			page.locator( '[aria-label="Templates"]' )
+		).toBeVisible();
+
 		const firstTitle = page
 			.getByRole( 'region', {
 				name: 'Template',
 				includeHidden: true,
 			} )
-			.getByRole( 'heading', {
-				level: 3,
-				includeHidden: true,
-			} )
+			.getByRole( 'link', { includeHidden: true } )
 			.first();
+
+		// Descending by title.
+		await page.getByRole( 'button', { name: 'View options' } ).click();
+		await page.getByRole( 'radio', { name: 'Sort descending' } ).click();
 		await expect( firstTitle ).toHaveText( 'Tag Archives' );
+
 		// Ascending by title.
-		await page
-			.getByRole( 'menuitemradio', { name: 'Sort ascending' } )
-			.click();
+		await page.getByRole( 'radio', { name: 'Sort ascending' } ).click();
 		await expect( firstTitle ).toHaveText( 'Category Archives' );
 	} );
+
 	test( 'Filtering', async ( { requestUtils, admin, page } ) => {
 		await requestUtils.createTemplate( 'wp_template', {
 			slug: 'date',
 			title: 'Date Archives',
 			content: 'hi',
 		} );
-		await admin.visitSiteEditor( { path: '/wp_template/all' } );
+		await admin.visitSiteEditor( { postType: 'wp_template' } );
 		// Global search.
-		await page.getByRole( 'searchbox', { name: 'Filter list' } ).click();
-		await page.keyboard.type( 'tag' );
+		await page.getByRole( 'searchbox', { name: 'Search' } ).fill( 'tag' );
 		const titles = page
 			.getByRole( 'region', { name: 'Template' } )
-			.getByRole( 'heading', { level: 3 } );
+			.getByRole( 'link', { includeHidden: true } );
 		await expect( titles ).toHaveCount( 1 );
 		await expect( titles.first() ).toHaveText( 'Tag Archives' );
-		await page.getByRole( 'button', { name: 'Reset filters' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Reset search', exact: true } )
+			.click();
 		await expect( titles ).toHaveCount( 6 );
 
 		// Filter by author.
 		await page.getByRole( 'button', { name: 'Add filter' } ).click();
-		await page.getByRole( 'menuitem', { name: 'Author' } ).hover();
-		await page.getByRole( 'menuitem', { name: 'admin' } ).click();
+		await page.getByRole( 'menuitem', { name: 'Author' } ).click();
+		await page.getByRole( 'option', { name: 'admin' } ).click();
+		await page.keyboard.press( 'Escape' ); // close the menu.
 		await expect( titles ).toHaveCount( 1 );
 		await expect( titles.first() ).toHaveText( 'Date Archives' );
 
 		// Filter by author and text.
-		await page.getByRole( 'button', { name: 'Reset filters' } ).click();
-		await page.getByRole( 'searchbox', { name: 'Filter list' } ).click();
-		await page.keyboard.type( 'archives' );
+		await page
+			.getByRole( 'button', { name: 'Reset', exact: true } )
+			.click();
+		await page
+			.getByRole( 'searchbox', { name: 'Search' } )
+			.fill( 'archives' );
 		await expect( titles ).toHaveCount( 3 );
 		await page.getByRole( 'button', { name: 'Add filter' } ).click();
-		await page.getByRole( 'menuitem', { name: 'Author' } ).hover();
-		await page.getByRole( 'menuitem', { name: 'Emptytheme' } ).click();
+		await page.getByRole( 'menuitem', { name: 'Author' } ).click();
+		await page.getByRole( 'option', { name: 'Emptytheme' } ).click();
+		await page.keyboard.press( 'Escape' ); // close the menu.
 		await expect( titles ).toHaveCount( 2 );
 	} );
+
 	test( 'Field visibility', async ( { admin, page } ) => {
-		await admin.visitSiteEditor( { path: '/wp_template/all' } );
-		await page.getByRole( 'button', { name: 'Description' } ).click();
-		await page.getByRole( 'menuitemradio', { name: 'Hide' } ).click();
+		await admin.visitSiteEditor( { postType: 'wp_template' } );
+
+		await page.getByRole( 'button', { name: 'Layout' } ).click();
+		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
+
+		await page.getByRole( 'button', { name: 'Author' } ).click();
+		await page.getByRole( 'menuitem', { name: 'Hide' } ).click();
+
 		await expect(
-			page.getByRole( 'button', { name: 'Description' } )
+			page.getByRole( 'button', { name: 'Author' } )
 		).toBeHidden();
 	} );
 } );
diff --git a/test/e2e/specs/site-editor/pages.spec.js b/test/e2e/specs/site-editor/pages.spec.js
index 4d40223e0a99c4..4817651bac8f9d 100644
--- a/test/e2e/specs/site-editor/pages.spec.js
+++ b/test/e2e/specs/site-editor/pages.spec.js
@@ -5,10 +5,10 @@ const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
 async function draftNewPage( page ) {
 	await page.getByRole( 'button', { name: 'Pages' } ).click();
-	await page.getByRole( 'button', { name: 'Draft a new page' } ).click();
+	await page.getByRole( 'button', { name: 'Add new page' } ).click();
 	await page
-		.locator( 'role=dialog[name="Draft a new page"i]' )
-		.locator( 'role=textbox[name="Page title"i]' )
+		.locator( 'role=dialog[name="Draft new: page"i]' )
+		.locator( 'role=textbox[name="title"i]' )
 		.fill( 'Test Page' );
 	await page.keyboard.press( 'Enter' );
 	await expect(
@@ -36,7 +36,9 @@ async function addPageContent( editor, page ) {
 		.fill( 'Lorem ipsum dolor sit amet' );
 
 	// Insert into Page Content using global inserter.
-	await page.getByRole( 'button', { name: 'Toggle block inserter' } ).click();
+	await page
+		.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+		.click();
 	await page.getByRole( 'option', { name: 'Heading', exact: true } ).click();
 	await editor.canvas
 		.getByRole( 'document', {
@@ -90,36 +92,24 @@ test.describe( 'Pages', () => {
 		await admin.visitSiteEditor();
 	} );
 
-	test( 'create a new page, edit template and toggle page template preview', async ( {
+	test.skip( 'create a new page, edit template and toggle page template preview', async ( {
 		page,
 		editor,
 	} ) => {
 		// Set up
 		await draftNewPage( page );
 		await addPageContent( editor, page );
-
-		/*
-		 * Test create page.Test creating a new page and editing the template.
-		 */
-		// Selecting a block in the template should display a notice.
-		await editor.canvas
-			.getByRole( 'document', {
-				name: 'Block: Site Title',
-			} )
-			.click( { force: true } );
-		await expect(
-			page.locator(
-				'role=button[name="Dismiss this notice"i] >> text="Edit your template to edit this block."'
-			)
-		).toBeVisible();
+		await editor.openDocumentSettingsSidebar();
 
 		// Switch to template editing focus.
-		await editor.openDocumentSettingsSidebar();
-		await page
-			.getByRole( 'region', { name: 'Editor settings' } )
+		const editorSettings = page.getByRole( 'region', {
+			name: 'Editor settings',
+		} );
+		await editorSettings.getByRole( 'tab', { name: 'Page' } ).click();
+		await editorSettings
 			.getByRole( 'button', { name: 'Template options' } )
 			.click();
-		await page.getByRole( 'button', { name: 'Edit template' } ).click();
+		await page.getByRole( 'menuitem', { name: 'Edit template' } ).click();
 		await expect(
 			editor.canvas.getByRole( 'document', {
 				name: 'Block: Content',
@@ -129,7 +119,7 @@ test.describe( 'Pages', () => {
 		);
 		await expect(
 			page.locator(
-				'role=button[name="Dismiss this notice"i] >> text="You are editing a template."'
+				'role=button[name="Dismiss this notice"i] >> text="Editing template. Changes made here affect all posts and pages that use the template."'
 			)
 		).toBeVisible();
 
@@ -141,6 +131,9 @@ test.describe( 'Pages', () => {
 			.getByRole( 'button', { name: 'Move down', exact: true } )
 			.click();
 
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Site title text' } )
+			.click( { force: true } );
 		await editor.canvas
 			.getByRole( 'textbox', { name: 'Site title text' } )
 			.fill( 'New Site Title' );
@@ -155,12 +148,12 @@ test.describe( 'Pages', () => {
 		await page.getByRole( 'button', { name: 'Save', exact: true } ).click();
 		await expect(
 			page.locator(
-				'role=region[name="Save panel"] >> role=checkbox[name="Title"]'
+				'role=region[name="Editor publish"] >> role=checkbox[name="Title"]'
 			)
 		).toBeVisible();
 		await expect(
 			page.locator(
-				'role=region[name="Save panel"] >> role=checkbox[name="Test Page"]'
+				'role=region[name="Editor publish"] >> role=checkbox[name="Test Page"]'
 			)
 		).toBeVisible();
 		await page
@@ -196,15 +189,15 @@ test.describe( 'Pages', () => {
 		await templateOptionsButton.click();
 		const templatePreviewButton = page
 			.getByRole( 'menu', { name: 'Template options' } )
-			.getByRole( 'menuitem', { name: 'Template preview' } );
+			.getByRole( 'menuitemcheckbox', { name: 'Show template' } );
 
 		await expect( templatePreviewButton ).toHaveAttribute(
-			'aria-pressed',
+			'aria-checked',
 			'true'
 		);
 		await templatePreviewButton.click();
 		await expect( templatePreviewButton ).toHaveAttribute(
-			'aria-pressed',
+			'aria-checked',
 			'false'
 		);
 
@@ -229,7 +222,7 @@ test.describe( 'Pages', () => {
 		await templateOptionsButton.click();
 		await templatePreviewButton.click();
 		await expect( templatePreviewButton ).toHaveAttribute(
-			'aria-pressed',
+			'aria-checked',
 			'true'
 		);
 
@@ -272,7 +265,9 @@ test.describe( 'Pages', () => {
 		await page
 			.locator( '.block-editor-block-patterns-list__list-item' )
 			.click();
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 		await admin.visitSiteEditor();
 
 		// Create new page that has the default template so as to swap it.
@@ -294,7 +289,9 @@ test.describe( 'Pages', () => {
 		await expect( templateItem ).toHaveCount( 1 );
 		await templateItem.click();
 		await expect( templateOptionsButton ).toHaveText( 'demo' );
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 
 		// Now reset, and apply the default template back.
 		await templateOptionsButton.click();
diff --git a/test/e2e/specs/site-editor/patterns.spec.js b/test/e2e/specs/site-editor/patterns.spec.js
index 79bd8b782ecc41..162ec15146c67e 100644
--- a/test/e2e/specs/site-editor/patterns.spec.js
+++ b/test/e2e/specs/site-editor/patterns.spec.js
@@ -33,46 +33,36 @@ test.describe( 'Patterns', () => {
 		admin,
 		patterns,
 	} ) => {
-		await admin.visitSiteEditor();
-
-		await patterns.navigation
-			.getByRole( 'button', { name: 'Patterns' } )
-			.click();
-
+		await admin.visitSiteEditor( { postType: 'wp_block' } );
 		await expect(
 			patterns.navigation.getByRole( 'heading', {
 				name: 'Patterns',
 				level: 1,
 			} )
 		).toBeVisible();
-		await expect( patterns.content ).toContainText( 'No patterns found.' );
+		await expect( patterns.content ).toContainText( 'No results' );
 
-		await patterns.navigation
-			.getByRole( 'button', { name: 'Create pattern' } )
+		await patterns.content
+			.getByRole( 'button', { name: 'add new pattern' } )
 			.click();
 
-		const createPatternMenu = page.getByRole( 'menu', {
-			name: 'Create pattern',
-		} );
-		await expect(
-			createPatternMenu.getByRole( 'menuitem', {
-				name: 'Create pattern',
+		const addNewMenuItem = page
+			.getByRole( 'menu', {
+				name: 'add new pattern',
 			} )
-		).toBeFocused();
-		await createPatternMenu
-			.getByRole( 'menuitem', { name: 'Create pattern' } )
-			.click();
+			.getByRole( 'menuitem', {
+				name: 'add new pattern',
+			} );
+		await expect( addNewMenuItem ).toBeFocused();
+		await addNewMenuItem.click();
 
 		const createPatternDialog = page.getByRole( 'dialog', {
-			name: 'Create pattern',
+			name: 'add new pattern',
 		} );
 		await createPatternDialog
 			.getByRole( 'textbox', { name: 'Name' } )
 			.fill( 'My pattern' );
 		await page.keyboard.press( 'Enter' );
-		await expect(
-			createPatternDialog.getByRole( 'button', { name: 'Create' } )
-		).toBeDisabled();
 
 		await expect( page ).toHaveTitle( /^My pattern/ );
 		await expect(
@@ -90,19 +80,11 @@ test.describe( 'Patterns', () => {
 			.getByRole( 'region', { name: 'Editor top bar' } )
 			.getByRole( 'button', { name: 'Save' } )
 			.click();
-		await page
-			.getByRole( 'region', { name: 'Save panel' } )
-			.getByRole( 'button', { name: 'Save' } )
-			.click();
 		await expect(
 			page.getByRole( 'button', { name: 'Dismiss this notice' } )
-		).toContainText( 'Site updated' );
+		).toContainText( 'Pattern updated' );
 
 		await page.getByRole( 'button', { name: 'Open navigation' } ).click();
-		await patterns.navigation
-			.getByRole( 'button', { name: 'Back' } )
-			.click();
-		// TODO: await expect( page ).toHaveTitle( /^Patterns/ );
 
 		await expect(
 			patterns.navigation.getByRole( 'button', {
@@ -126,11 +108,11 @@ test.describe( 'Patterns', () => {
 				level: 2,
 			} )
 		).toBeVisible();
-		await expect( patterns.list.getByRole( 'listitem' ) ).toHaveCount( 1 );
+		await expect( patterns.item ).toHaveCount( 1 );
 		await expect(
-			patterns.list
-				.getByRole( 'heading', { name: 'My pattern' } )
-				.getByRole( 'button', { name: 'My pattern', exact: true } )
+			patterns.itemsList.getByText( 'My pattern', {
+				exact: true,
+			} )
 		).toBeVisible();
 	} );
 
@@ -138,6 +120,7 @@ test.describe( 'Patterns', () => {
 		admin,
 		requestUtils,
 		patterns,
+		page,
 	} ) => {
 		await Promise.all( [
 			requestUtils.createBlock( {
@@ -162,78 +145,49 @@ test.describe( 'Patterns', () => {
 			} ),
 		] );
 
-		await admin.visitSiteEditor( { path: '/patterns' } );
+		await admin.visitSiteEditor( { postType: 'wp_block' } );
 
-		await expect( patterns.list.getByRole( 'listitem' ) ).toHaveCount( 3 );
+		await expect( patterns.item ).toHaveCount( 3 );
 
-		await patterns.content
-			.getByRole( 'searchbox', { name: 'Search patterns' } )
-			.fill( 'footer' );
-		await expect( patterns.list.getByRole( 'listitem' ) ).toHaveCount( 2 );
+		const searchBox = patterns.content.getByRole( 'searchbox', {
+			name: 'Search',
+		} );
+		await searchBox.fill( 'footer' );
+		await expect( patterns.item ).toHaveCount( 2 );
 		expect(
-			await patterns.list
-				.getByRole( 'listitem' )
-				.getByRole( 'heading' )
-				.allInnerTexts()
+			await patterns.item.getByRole( 'button' ).allInnerTexts()
 		).toEqual(
 			expect.arrayContaining( [ 'Unsynced footer', 'Synced footer' ] )
 		);
 
-		const searchBox = patterns.content.getByRole( 'searchbox', {
-			name: 'Search patterns',
-		} );
-
 		await searchBox.fill( 'no match' );
-		await expect( patterns.content ).toContainText( 'No patterns found.' );
+		await expect( patterns.content ).toContainText( 'No results' );
 
 		await patterns.content
-			.getByRole( 'button', { name: 'Reset search' } )
+			.getByRole( 'button', { name: 'Reset search', exact: true } )
 			.click();
 		await expect( searchBox ).toHaveValue( '' );
-		await expect( patterns.list.getByRole( 'listitem' ) ).toHaveCount( 3 );
+		await expect( patterns.item ).toHaveCount( 3 );
 
-		const syncFilter = patterns.content.getByRole( 'radiogroup', {
-			name: 'Filter by sync status',
-		} );
-		await expect(
-			syncFilter.getByRole( 'radio', { name: 'All' } )
-		).toBeChecked();
-
-		await syncFilter
-			.getByRole( 'radio', { name: 'Synced', exact: true } )
+		await patterns.content
+			.getByRole( 'button', { name: 'Sync Status' } )
 			.click();
-		await expect( patterns.list.getByRole( 'listitem' ) ).toHaveCount( 1 );
-		await expect( patterns.list.getByRole( 'listitem' ) ).toContainText(
-			'Synced footer'
-		);
+		await page.getByRole( 'option', { name: /^Synced/ } ).click();
+
+		await expect( patterns.item ).toHaveCount( 1 );
+		await expect( patterns.item ).toContainText( 'Synced footer' );
 
-		await syncFilter.getByRole( 'radio', { name: 'Not synced' } ).click();
-		await expect( patterns.list.getByRole( 'listitem' ) ).toHaveCount( 2 );
+		await page.getByRole( 'option', { name: /^Not synced/ } ).click();
+		await expect( patterns.item ).toHaveCount( 2 );
 		expect(
-			await patterns.list
-				.getByRole( 'listitem' )
-				.getByRole( 'heading' )
-				.allInnerTexts()
+			await patterns.item.getByRole( 'button' ).allInnerTexts()
 		).toEqual(
 			expect.arrayContaining( [ 'Unsynced header', 'Unsynced footer' ] )
 		);
 
 		await searchBox.fill( 'footer' );
-		await expect( patterns.list.getByRole( 'listitem' ) ).toHaveCount( 1 );
-		await expect( patterns.list.getByRole( 'listitem' ) ).toContainText(
-			'Unsynced footer'
-		);
-
-		await syncFilter.getByRole( 'radio', { name: 'All' } ).click();
-		await expect( patterns.list.getByRole( 'listitem' ) ).toHaveCount( 2 );
-		expect(
-			await patterns.list
-				.getByRole( 'listitem' )
-				.getByRole( 'heading' )
-				.allInnerTexts()
-		).toEqual(
-			expect.arrayContaining( [ 'Unsynced footer', 'Synced footer' ] )
-		);
+		await expect( patterns.item ).toHaveCount( 1 );
+		await expect( patterns.item ).toContainText( 'Unsynced footer' );
 	} );
 } );
 
@@ -250,6 +204,7 @@ class Patterns {
 		this.navigation = this.#page.getByRole( 'region', {
 			name: 'Navigation',
 		} );
-		this.list = this.content.getByRole( 'list' );
+		this.itemsList = this.content.locator( '.dataviews-view-grid' );
+		this.item = this.itemsList.locator( '.dataviews-view-grid__card' );
 	}
 }
diff --git a/test/e2e/specs/site-editor/push-to-global-styles.spec.js b/test/e2e/specs/site-editor/push-to-global-styles.spec.js
index 71a57fd04e515a..3e30f764811b1f 100644
--- a/test/e2e/specs/site-editor/push-to-global-styles.spec.js
+++ b/test/e2e/specs/site-editor/push-to-global-styles.spec.js
@@ -12,12 +12,12 @@ test.describe( 'Push to Global Styles button', () => {
 		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
 
-	test.beforeEach( async ( { admin, editor } ) => {
+	test.beforeEach( async ( { admin } ) => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 	} );
 
 	test( 'should apply Heading block styles to all Heading blocks', async ( {
@@ -29,13 +29,14 @@ test.describe( 'Push to Global Styles button', () => {
 		await page.keyboard.type( 'A heading' );
 
 		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
+		const settingsPanel = page.getByRole( 'region', {
+			name: 'Editor settings',
+		} );
 
 		// Navigate to Styles -> Blocks -> Heading -> Typography
 		await topBar.getByRole( 'button', { name: 'Styles' } ).click();
-		await page.getByRole( 'button', { name: 'Blocks styles' } ).click();
-		await page
-			.getByRole( 'button', { name: 'Heading block styles' } )
-			.click();
+		await settingsPanel.getByRole( 'button', { name: 'Blocks' } ).click();
+		await settingsPanel.getByRole( 'button', { name: 'Heading' } ).click();
 
 		// Headings should not have uppercase
 		await expect(
@@ -95,9 +96,9 @@ test.describe( 'Push to Global Styles button', () => {
 		await page
 			.getByRole( 'button', { name: 'Styles', exact: true } )
 			.click();
-		await page.getByRole( 'button', { name: 'Blocks styles' } ).click();
-		await page
-			.getByRole( 'button', { name: 'Heading block styles' } )
+		await page.getByRole( 'button', { name: 'Blocks' } ).click();
+		await settingsPanel
+			.getByRole( 'button', { name: 'Heading', exact: true } )
 			.click();
 
 		// Headings should now have uppercase
diff --git a/test/e2e/specs/site-editor/settings-sidebar.spec.js b/test/e2e/specs/site-editor/settings-sidebar.spec.js
new file mode 100644
index 00000000000000..87e9023401109d
--- /dev/null
+++ b/test/e2e/specs/site-editor/settings-sidebar.spec.js
@@ -0,0 +1,146 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Settings sidebar', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.activateTheme( 'emptytheme' ),
+			requestUtils.deleteAllTemplates( 'wp_template' ),
+			requestUtils.deleteAllTemplates( 'wp_template_part' ),
+		] );
+	} );
+
+	test.beforeEach( async ( { admin } ) => {
+		await admin.visitSiteEditor( {
+			postId: 'emptytheme//index',
+			postType: 'wp_template',
+			canvas: 'edit',
+		} );
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.activateTheme( 'twentytwentyone' ),
+			requestUtils.deleteAllTemplates( 'wp_template' ),
+			requestUtils.deleteAllTemplates( 'wp_template_part' ),
+		] );
+	} );
+
+	test.describe( 'Template tab', () => {
+		test( 'should open template tab by default if no block is selected', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.openDocumentSettingsSidebar();
+
+			await expect(
+				page
+					.getByRole( 'region', { name: 'Editor settings' } )
+					.getByRole( 'tab', { selected: true } )
+			).toHaveText( 'Template' );
+		} );
+
+		test( `should show the currently selected template's title and description`, async ( {
+			admin,
+			editor,
+			page,
+		} ) => {
+			await editor.openDocumentSettingsSidebar();
+
+			const settingsSideber = page.getByRole( 'region', {
+				name: 'Editor settings',
+			} );
+			const templateTitle = settingsSideber.locator(
+				'.editor-post-card-panel__title'
+			);
+
+			await expect( templateTitle ).toHaveText( 'Index' );
+			await expect( settingsSideber ).toContainText(
+				'Used as a fallback template for all pages when a more specific template is not defined.'
+			);
+
+			await admin.visitSiteEditor( {
+				postId: 'emptytheme//singular',
+				postType: 'wp_template',
+				canvas: 'edit',
+			} );
+
+			await expect( templateTitle ).toHaveText( 'Single Entries' );
+			await expect( settingsSideber ).toContainText(
+				'Displays any single entry, such as a post or a page. This template will serve as a fallback when a more specific template (e.g. Single Post, Page, or Attachment) cannot be found.'
+			);
+		} );
+	} );
+
+	test.describe( 'Block tab', () => {
+		test( 'should open block tab by default if a block is selected', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.selectBlocks(
+				editor.canvas.getByRole( 'document', { name: 'Block' } ).first()
+			);
+			await editor.openDocumentSettingsSidebar();
+
+			await expect(
+				page
+					.getByRole( 'region', { name: 'Editor settings' } )
+					.getByRole( 'tab', { selected: true } )
+			).toHaveText( 'Block' );
+		} );
+	} );
+
+	test.describe( 'Tab switch based on selection', () => {
+		test( 'should switch to block tab if we select a block, when Template is selected', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.openDocumentSettingsSidebar();
+
+			await expect(
+				page
+					.getByRole( 'region', { name: 'Editor settings' } )
+					.getByRole( 'tab', { selected: true } )
+			).toHaveText( 'Template' );
+
+			// By inserting the block is also selected.
+			await editor.insertBlock( { name: 'core/heading' } );
+
+			await expect(
+				page
+					.getByRole( 'region', { name: 'Editor settings' } )
+					.getByRole( 'tab', { selected: true } )
+			).toHaveText( 'Block' );
+		} );
+
+		test( 'should switch to Template tab when a block was selected and we select the Template', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.selectBlocks(
+				editor.canvas.getByRole( 'document', { name: 'Block' } ).first()
+			);
+			await editor.openDocumentSettingsSidebar();
+
+			await expect(
+				page
+					.getByRole( 'region', { name: 'Editor settings' } )
+					.getByRole( 'tab', { selected: true } )
+			).toHaveText( 'Block' );
+
+			await page.evaluate( () => {
+				window.wp.data
+					.dispatch( 'core/block-editor' )
+					.clearSelectedBlock();
+			} );
+
+			await expect(
+				page
+					.getByRole( 'region', { name: 'Editor settings' } )
+					.getByRole( 'tab', { selected: true } )
+			).toHaveText( 'Template' );
+		} );
+	} );
+} );
diff --git a/test/e2e/specs/site-editor/site-editor-inserter.spec.js b/test/e2e/specs/site-editor/site-editor-inserter.spec.js
index 98cb8e4e74149c..04075cbedab308 100644
--- a/test/e2e/specs/site-editor/site-editor-inserter.spec.js
+++ b/test/e2e/specs/site-editor/site-editor-inserter.spec.js
@@ -24,20 +24,16 @@ test.describe( 'Site Editor Inserter', () => {
 	test( 'inserter toggle button should toggle global inserter', async ( {
 		page,
 	} ) => {
-		await page.click( 'role=button[name="Toggle block inserter"i]' );
+		await page.click( 'role=button[name="Block Inserter"i]' );
 
 		// Visibility check
 		await expect(
-			page.locator(
-				'role=searchbox[name="Search for blocks and patterns"i]'
-			)
+			page.locator( 'role=searchbox[name="Search"i]' )
 		).toBeVisible();
-		await page.click( 'role=button[name="Toggle block inserter"i]' );
+		await page.click( 'role=button[name="Block Inserter"i]' );
 		//Hidden State check
 		await expect(
-			page.locator(
-				'role=searchbox[name="Search for blocks and patterns"i]'
-			)
+			page.locator( 'role=searchbox[name="Search"i]' )
 		).toBeHidden();
 	} );
 
@@ -47,7 +43,8 @@ test.describe( 'Site Editor Inserter', () => {
 		editor,
 	} ) => {
 		const inserterButton = page.getByRole( 'button', {
-			name: 'Toggle block inserter',
+			name: 'Block Inserter',
+			exact: true,
 		} );
 		const blockLibrary = page.getByRole( 'region', {
 			name: 'Block Library',
diff --git a/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js b/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js
index c16411d45ce799..f26fb8e13b8c3c 100644
--- a/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js
+++ b/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js
@@ -12,71 +12,83 @@ test.describe( 'Site editor url navigation', () => {
 		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
 
-	test.describe( 'Redirection after template and template part creation', () => {
-		test.afterEach( async ( { requestUtils } ) => {
-			await Promise.all( [
-				requestUtils.deleteAllPosts(),
-				requestUtils.deleteAllTemplates( 'wp_template' ),
-				requestUtils.deleteAllTemplates( 'wp_template_part' ),
-			] );
-		} );
-		test( 'Redirection after template creation', async ( {
-			admin,
-			page,
-			requestUtils,
-		} ) => {
-			await requestUtils.createPost( {
-				title: 'Demo',
-				status: 'publish',
-			} );
-			await admin.visitSiteEditor();
-			// We need to wait the response from the `posts` request in order to click the augmented menu item,
-			// that includes the options for creating templates for specific posts.
-			await Promise.all( [
-				page.waitForResponse(
-					( resp ) =>
-						resp
-							.url()
-							.includes(
-								'/index.php?rest_route=%2Fwp%2Fv2%2Fposts&context=view'
-							) && resp.status() === 200
-				),
-				page.click( 'role=button[name="Templates"]' ),
-			] );
-			await page.click( 'role=button[name="Add New Template"i]' );
-			await page
-				.getByRole( 'button', {
-					name: 'Single item: Post',
-				} )
-				.click();
-			await page
-				.getByRole( 'button', { name: 'For a specific item' } )
-				.click();
-			await page.getByRole( 'option', { name: 'Demo' } ).click();
-			await expect( page ).toHaveURL(
-				'/wp-admin/site-editor.php?postId=emptytheme%2F%2Fsingle-post-demo&postType=wp_template&canvas=edit'
-			);
+	test.beforeEach( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.deleteAllPosts(),
+			requestUtils.deleteAllTemplates( 'wp_template' ),
+			requestUtils.deleteAllTemplates( 'wp_template_part' ),
+		] );
+	} );
+
+	test( 'Redirection after template creation', async ( {
+		admin,
+		page,
+		requestUtils,
+	} ) => {
+		await requestUtils.createPost( {
+			title: 'Demo',
+			content: 'Hello there!',
+			status: 'publish',
 		} );
-		test( 'Redirection after template part creation', async ( {
-			admin,
-			page,
-		} ) => {
-			await admin.visitSiteEditor();
-			await page.click( 'role=button[name="Patterns"i]' );
-			await page.click( 'role=button[name="Create pattern"i]' );
-			await page
-				.getByRole( 'menu', { name: 'Create pattern' } )
-				.getByRole( 'menuitem', { name: 'Create template part' } )
-				.click();
-			// Fill in a name in the dialog that pops up.
-			await page.type(
-				'role=dialog >> role=textbox[name="Name"i]',
-				'Demo'
-			);
-			await page.keyboard.press( 'Enter' );
-			await expect( page ).toHaveURL(
-				'/wp-admin/site-editor.php?postId=emptytheme%2F%2Fdemo&postType=wp_template_part&canvas=edit'
-			);
+
+		await admin.visitSiteEditor();
+		await page.click( 'role=button[name="Templates"]' );
+		await page.click( 'role=button[name="Add New Template"i]' );
+		await page
+			.getByRole( 'button', {
+				name: 'Single item: Post',
+			} )
+			.click();
+		await page
+			.getByRole( 'button', { name: 'For a specific item' } )
+			.click();
+		await page.getByRole( 'option', { name: 'Demo' } ).click();
+		await expect( page ).toHaveURL(
+			'/wp-admin/site-editor.php?postId=emptytheme%2F%2Fsingle-post-demo&postType=wp_template&canvas=edit'
+		);
+	} );
+
+	test( 'Redirection after template part creation', async ( {
+		admin,
+		page,
+	} ) => {
+		await admin.visitSiteEditor();
+		await page.click( 'role=button[name="Patterns"i]' );
+		await page.click( 'role=button[name="add new pattern"i]' );
+		await page
+			.getByRole( 'menu', { name: 'add new pattern' } )
+			.getByRole( 'menuitem', { name: 'add new template part' } )
+			.click();
+		// Fill in a name in the dialog that pops up.
+		await page.type( 'role=dialog >> role=textbox[name="Name"i]', 'Demo' );
+		await page.keyboard.press( 'Enter' );
+		await expect( page ).toHaveURL(
+			'/wp-admin/site-editor.php?postId=emptytheme%2F%2Fdemo&postType=wp_template_part&canvas=edit'
+		);
+	} );
+
+	test( 'The Patterns page should keep the previously selected template part category', async ( {
+		admin,
+		page,
+	} ) => {
+		await admin.visitSiteEditor();
+		const navigation = page.getByRole( 'region', {
+			name: 'Navigation',
 		} );
+		await navigation.getByRole( 'button', { name: 'Patterns' } ).click();
+		await navigation.getByRole( 'button', { name: 'General' } ).click();
+		await page
+			.getByRole( 'region', {
+				name: 'Patterns content',
+			} )
+			.getByText( 'header', { exact: true } )
+			.click();
+		await expect(
+			page.getByRole( 'region', { name: 'Editor content' } )
+		).toBeVisible();
+		await page.getByRole( 'button', { name: 'Open navigation' } ).click();
+		await expect(
+			navigation.getByRole( 'button', { name: 'All template parts' } )
+		).toBeVisible();
 	} );
 } );
diff --git a/test/e2e/specs/site-editor/style-book.spec.js b/test/e2e/specs/site-editor/style-book.spec.js
index 08f5e6463ebc7f..c94049872edcf6 100644
--- a/test/e2e/specs/site-editor/style-book.spec.js
+++ b/test/e2e/specs/site-editor/style-book.spec.js
@@ -29,28 +29,19 @@ test.describe( 'Style Book', () => {
 
 	test( 'should disable toolbar buttons when open', async ( { page } ) => {
 		await expect(
-			page.locator( 'role=button[name="Toggle block inserter"i]' )
-		).toBeHidden();
+			page.locator( 'role=button[name="Block Inserter"i]' )
+		).toBeDisabled();
 		await expect(
 			page.locator( 'role=button[name="Tools"i]' )
-		).toBeHidden();
-		await expect(
-			page.locator( 'role=button[name="Undo"i]' )
-		).toBeHidden();
-		await expect(
-			page.locator( 'role=button[name="Redo"i]' )
-		).toBeHidden();
+		).toBeDisabled();
 		await expect(
-			page.locator( 'role=button[name="View"i]' )
+			page.locator( 'role=button[name="Document Overview"i]' )
 		).toBeDisabled();
 	} );
 
 	test( 'should have tabs containing block examples', async ( { page } ) => {
 		await expect( page.locator( 'role=tab[name="Text"i]' ) ).toBeVisible();
 		await expect( page.locator( 'role=tab[name="Media"i]' ) ).toBeVisible();
-		await expect(
-			page.locator( 'role=tab[name="Design"i]' )
-		).toBeVisible();
 		await expect(
 			page.locator( 'role=tab[name="Widgets"i]' )
 		).toBeVisible();
@@ -106,8 +97,8 @@ test.describe( 'Style Book', () => {
 	test( 'should allow to return Global Styles root when example is clicked', async ( {
 		page,
 	} ) => {
-		await page.click( 'role=button[name="Blocks styles"]' );
-		await page.click( 'role=button[name="Heading block styles"]' );
+		await page.click( 'role=button[name="Blocks"]' );
+		await page.click( 'role=button[name="Heading"]' );
 
 		await page
 			.frameLocator( '[name="style-book-canvas"]' )
@@ -116,11 +107,11 @@ test.describe( 'Style Book', () => {
 			} )
 			.click();
 
-		await page.click( 'role=button[name="Navigate to the previous view"]' );
-		await page.click( 'role=button[name="Navigate to the previous view"]' );
+		await page.click( 'role=button[name="Back"]' );
+		await page.click( 'role=button[name="Back"]' );
 
 		await expect(
-			page.locator( 'role=button[name="Blocks styles"]' )
+			page.locator( 'role=button[name="Blocks"]' )
 		).toBeVisible();
 	} );
 
@@ -132,9 +123,7 @@ test.describe( 'Style Book', () => {
 		} );
 
 		// Close Style Book via click event.
-		await styleBookRegion
-			.getByRole( 'button', { name: 'Close Style Book' } )
-			.click();
+		await styleBookRegion.getByRole( 'button', { name: 'Close' } ).click();
 
 		await expect(
 			styleBookRegion,
@@ -155,6 +144,50 @@ test.describe( 'Style Book', () => {
 			'should close when Escape key is pressed'
 		).toBeHidden();
 	} );
+
+	test( 'should persist when navigating the global styles sidebar', async ( {
+		page,
+	} ) => {
+		await page
+			.getByRole( 'region', { name: 'Editor settings' } )
+			.getByRole( 'button', { name: 'Browse styles' } )
+			.click();
+
+		const styleBookRegion = page.getByRole( 'region', {
+			name: 'Style Book',
+		} );
+		await expect(
+			styleBookRegion,
+			'style book should be visible'
+		).toBeVisible();
+
+		await page.click( 'role=button[name="Back"]' );
+
+		await page
+			.getByRole( 'region', { name: 'Editor settings' } )
+			.getByRole( 'button', { name: 'Typography' } )
+			.click();
+
+		await expect(
+			styleBookRegion,
+			'style book should be visible'
+		).toBeVisible();
+	} );
+
+	test( 'should allow opening the command menu from the header when open', async ( {
+		page,
+	} ) => {
+		// Open the command menu from the header.
+		await page
+			.getByRole( 'heading', {
+				name: 'Style Book',
+			} )
+			.click();
+
+		await expect(
+			page.getByLabel( 'Search commands and settings' )
+		).toBeVisible();
+	} );
 } );
 
 class StyleBook {
diff --git a/test/e2e/specs/site-editor/style-variations.spec.js b/test/e2e/specs/site-editor/style-variations.spec.js
index 8868c733006687..9c4243b0d171f6 100644
--- a/test/e2e/specs/site-editor/style-variations.spec.js
+++ b/test/e2e/specs/site-editor/style-variations.spec.js
@@ -33,13 +33,12 @@ test.describe( 'Global styles variations', () => {
 		admin,
 		page,
 		siteEditorStyleVariations,
-		editor,
 	} ) => {
 		await admin.visitSiteEditor( {
 			postId: 'gutenberg-test-themes/style-variations//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 
 		await siteEditorStyleVariations.browseStyles();
 
@@ -70,37 +69,32 @@ test.describe( 'Global styles variations', () => {
 		admin,
 		page,
 		siteEditorStyleVariations,
-		editor,
 	} ) => {
 		await admin.visitSiteEditor( {
 			postId: 'gutenberg-test-themes/style-variations//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 		await siteEditorStyleVariations.browseStyles();
 		await page.click( 'role=button[name="pink"i]' );
-		await page.click(
-			'role=button[name="Navigate to the previous view"i]'
-		);
-		await page.click( 'role=button[name="Colors styles"i]' );
+		await page.click( 'role=button[name="Back"i]' );
+		await page.click( 'role=button[name="Colors"i]' );
 
 		await expect(
 			page.locator(
-				'role=button[name="Color Background styles"i] >> .component-color-indicator'
+				'role=button[name="Background"i] >> .component-color-indicator'
 			)
 		).toHaveCSS( 'background', /rgb\(202, 105, 211\)/ );
 
 		await expect(
 			page.locator(
-				'role=button[name="Color Text styles"i] >> .component-color-indicator'
+				'role=button[name="Text"i] >> .component-color-indicator'
 			)
 		).toHaveCSS( 'background', /rgb\(74, 7, 74\)/ );
 
-		await page.click(
-			'role=button[name="Navigate to the previous view"i]'
-		);
-		await page.click( 'role=button[name="Typography styles"i]' );
-		await page.click( 'role=button[name="Typography Text styles"i]' );
+		await page.click( 'role=button[name="Back"i]' );
+		await page.click( 'role=button[name="Typography"i]' );
+		await page.click( 'role=button[name="Text"i]' );
 
 		await expect(
 			page.locator( 'css=.components-font-size-picker__header__hint' )
@@ -111,37 +105,32 @@ test.describe( 'Global styles variations', () => {
 		admin,
 		page,
 		siteEditorStyleVariations,
-		editor,
 	} ) => {
 		await admin.visitSiteEditor( {
 			postId: 'gutenberg-test-themes/style-variations//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 		await siteEditorStyleVariations.browseStyles();
 		await page.click( 'role=button[name="yellow"i]' );
-		await page.click(
-			'role=button[name="Navigate to the previous view"i]'
-		);
-		await page.click( 'role=button[name="Colors styles"i]' );
+		await page.click( 'role=button[name="Back"i]' );
+		await page.click( 'role=button[name="Colors"i]' );
 
 		await expect(
 			page.locator(
-				'role=button[name="Color Background styles"i] >> .component-color-indicator'
+				'role=button[name="Background"i] >> .component-color-indicator'
 			)
 		).toHaveCSS( 'background', /rgb\(255, 239, 11\)/ );
 
 		await expect(
 			page.locator(
-				'role=button[name="Color Text styles"i] >> .component-color-indicator'
+				'role=button[name="Text"i] >> .component-color-indicator'
 			)
 		).toHaveCSS( 'background', /rgb\(25, 25, 17\)/ );
 
-		await page.click(
-			'role=button[name="Navigate to the previous view"i]'
-		);
-		await page.click( 'role=button[name="Typography styles"i]' );
-		await page.click( 'role=button[name="Typography Text styles"i]' );
+		await page.click( 'role=button[name="Back"i]' );
+		await page.click( 'role=button[name="Typography"i]' );
+		await page.click( 'role=button[name="Text"i]' );
 
 		// TODO: to avoid use classnames to locate these elements,
 		//  we could provide accessible attributes to the source code in packages/components/src/font-size-picker/index.js.
@@ -158,20 +147,17 @@ test.describe( 'Global styles variations', () => {
 		admin,
 		page,
 		siteEditorStyleVariations,
-		editor,
 	} ) => {
 		await admin.visitSiteEditor( {
 			postId: 'gutenberg-test-themes/style-variations//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 		await siteEditorStyleVariations.browseStyles();
 		await page.click( 'role=button[name="pink"i]' );
-		await page.click(
-			'role=button[name="Navigate to the previous view"i]'
-		);
-		await page.click( 'role=button[name="Colors styles"i]' );
-		await page.click( 'role=button[name="Color palettes"i]' );
+		await page.click( 'role=button[name="Back"i]' );
+		await page.click( 'role=button[name="Colors"i]' );
+		await page.click( 'role=button[name="Edit palette"i]' );
 
 		await expect(
 			page.locator( 'role=option[name="Color: Foreground"i]' )
@@ -195,8 +181,8 @@ test.describe( 'Global styles variations', () => {
 		await admin.visitSiteEditor( {
 			postId: 'gutenberg-test-themes/style-variations//index',
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 		await siteEditorStyleVariations.browseStyles();
 		await page.click( 'role=button[name="yellow"i]' );
 
diff --git a/test/e2e/specs/site-editor/styles.spec.js b/test/e2e/specs/site-editor/styles.spec.js
new file mode 100644
index 00000000000000..63a051bf6b92d7
--- /dev/null
+++ b/test/e2e/specs/site-editor/styles.spec.js
@@ -0,0 +1,58 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Styles', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentythree' );
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+
+	test( 'should override reset styles and library styles', async ( {
+		admin,
+		editor,
+		requestUtils,
+		page,
+	} ) => {
+		const { id } = await requestUtils.createPage( {
+			title: 'Social Icons',
+			content: `<!-- wp:social-links -->
+<ul class="wp-block-social-links"></ul>
+<!-- /wp:social-links -->`,
+			status: 'publish',
+		} );
+		await admin.visitSiteEditor( {
+			postId: id,
+			postType: 'page',
+			canvas: 'edit',
+		} );
+
+		const block = editor.canvas.getByRole( 'document', {
+			name: 'Block: Social Icons',
+		} );
+
+		await expect( block ).toHaveCSS( 'padding-left', '0px' );
+
+		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
+		// Navigate to Styles -> Blocks -> Heading -> Typography
+		await topBar.getByRole( 'button', { name: 'Styles' } ).click();
+		await page.getByRole( 'button', { name: 'Blocks' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Social Icons', exact: true } )
+			.click();
+
+		// Find the second padding control and change the padding value
+		await page
+			.getByRole( 'button', { name: 'Set custom size' } )
+			.nth( 1 )
+			.click();
+		await page.getByRole( 'spinbutton', { name: 'padding' } ).fill( '35' );
+
+		// Check the padding value
+		await expect( block ).toHaveCSS( 'padding-left', '35px' );
+	} );
+} );
diff --git a/test/e2e/specs/site-editor/template-part.spec.js b/test/e2e/specs/site-editor/template-part.spec.js
index 9d4e1385627e79..d88273574bc4b0 100644
--- a/test/e2e/specs/site-editor/template-part.spec.js
+++ b/test/e2e/specs/site-editor/template-part.spec.js
@@ -27,8 +27,8 @@ test.describe( 'Template Part', () => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//header',
 			postType: 'wp_template_part',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 
 		// Insert a new template block and 'start blank'.
 		await editor.insertBlock( { name: 'core/template-part' } );
@@ -57,8 +57,7 @@ test.describe( 'Template Part', () => {
 		page,
 	} ) => {
 		// Visit the index.
-		await admin.visitSiteEditor();
-		await editor.canvas.locator( 'body' ).click();
+		await admin.visitSiteEditor( { canvas: 'edit' } );
 		const headerTemplateParts = editor.canvas.locator(
 			'[data-type="core/template-part"]'
 		);
@@ -84,8 +83,7 @@ test.describe( 'Template Part', () => {
 	} ) => {
 		const paragraphText = 'Test 2';
 
-		await admin.visitSiteEditor();
-		await editor.canvas.locator( 'body' ).click();
+		await admin.visitSiteEditor( { canvas: 'edit' } );
 		// Add a block and select it.
 		await editor.insertBlock( {
 			name: 'core/paragraph',
@@ -124,8 +122,7 @@ test.describe( 'Template Part', () => {
 		const paragraphText1 = 'Test 3';
 		const paragraphText2 = 'Test 4';
 
-		await admin.visitSiteEditor();
-		await editor.canvas.locator( 'body' ).click();
+		await admin.visitSiteEditor( { canvas: 'edit' } );
 		// Add a block and select it.
 		await editor.insertBlock( {
 			name: 'core/paragraph',
@@ -186,19 +183,20 @@ test.describe( 'Template Part', () => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//header',
 			postType: 'wp_template_part',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 		await editor.insertBlock( {
 			name: 'core/paragraph',
 			attributes: {
 				content: paragraphText,
 			},
 		} );
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 
 		// Visit the index.
-		await admin.visitSiteEditor();
-		await editor.canvas.locator( 'body' ).click();
+		await admin.visitSiteEditor( { canvas: 'edit' } );
 		// Check that the header contains the paragraph added earlier.
 		const paragraph = editor.canvas.locator(
 			`p >> text="${ paragraphText }"`
@@ -227,8 +225,8 @@ test.describe( 'Template Part', () => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//header',
 			postType: 'wp_template_part',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 		// Edit the header.
 		await editor.insertBlock( {
 			name: 'core/paragraph',
@@ -237,7 +235,9 @@ test.describe( 'Template Part', () => {
 			},
 		} );
 
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 
 		// Visit the index.
 		await admin.visitSiteEditor();
@@ -260,8 +260,8 @@ test.describe( 'Template Part', () => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//header',
 			postType: 'wp_template_part',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 		await editor.insertBlock( {
 			name: 'core/paragraph',
 			attributes: {
@@ -299,8 +299,7 @@ test.describe( 'Template Part', () => {
 		editor,
 		page,
 	} ) => {
-		await admin.visitSiteEditor();
-		await editor.canvas.locator( 'body' ).click();
+		await admin.visitSiteEditor( { canvas: 'edit' } );
 
 		// Add a block and select it.
 		await editor.insertBlock( {
@@ -340,8 +339,7 @@ test.describe( 'Template Part', () => {
 		editor,
 		page,
 	} ) => {
-		await admin.visitSiteEditor();
-		await editor.canvas.locator( 'body' ).click();
+		await admin.visitSiteEditor( { canvas: 'edit' } );
 
 		// Select existing header template part.
 		await editor.selectBlocks(
@@ -367,8 +365,8 @@ test.describe( 'Template Part', () => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//header',
 			postType: 'wp_template_part',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 
 		// Select the site title block.
 		const siteTitle = editor.canvas.getByRole( 'document', {
diff --git a/test/e2e/specs/site-editor/template-registration.spec.js b/test/e2e/specs/site-editor/template-registration.spec.js
new file mode 100644
index 00000000000000..90e56645813c30
--- /dev/null
+++ b/test/e2e/specs/site-editor/template-registration.spec.js
@@ -0,0 +1,367 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.use( {
+	blockTemplateRegistrationUtils: async ( { editor, page }, use ) => {
+		await use( new BlockTemplateRegistrationUtils( { editor, page } ) );
+	},
+} );
+
+test.describe( 'Block template registration', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'emptytheme' );
+		await requestUtils.activatePlugin(
+			'gutenberg-test-block-template-registration'
+		);
+	} );
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deactivatePlugin(
+			'gutenberg-test-block-template-registration'
+		);
+	} );
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllTemplates( 'wp_template' );
+		await requestUtils.deleteAllPosts();
+	} );
+
+	test( 'templates can be registered and edited', async ( {
+		admin,
+		editor,
+		page,
+		blockTemplateRegistrationUtils,
+	} ) => {
+		// Verify template is applied to the frontend.
+		await page.goto( '/?cat=1' );
+		await expect(
+			page.getByText( 'This is a plugin-registered template.' )
+		).toBeVisible();
+
+		// Verify template is listed in the Site Editor.
+		await admin.visitSiteEditor( {
+			postType: 'wp_template',
+		} );
+		await blockTemplateRegistrationUtils.searchForTemplate(
+			'Plugin Template'
+		);
+		await expect( page.getByText( 'Plugin Template' ) ).toBeVisible();
+		await expect(
+			page.getByText( 'A template registered by a plugin.' )
+		).toBeVisible();
+		await expect( page.getByText( 'AuthorGutenberg' ) ).toBeVisible();
+
+		// Verify the template contents are rendered in the editor.
+		await page.getByText( 'Plugin Template' ).click();
+		await expect(
+			editor.canvas.getByText( 'This is a plugin-registered template.' )
+		).toBeVisible();
+
+		// Verify edits persist in the frontend.
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'User-edited template' },
+		} );
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
+		await page.goto( '/?cat=1' );
+		await expect( page.getByText( 'User-edited template' ) ).toBeVisible();
+
+		// Verify template can be reset.
+		await admin.visitSiteEditor( {
+			postType: 'wp_template',
+		} );
+		const resetNotice = page
+			.getByLabel( 'Dismiss this notice' )
+			.getByText( `"Plugin Template" reset.` );
+		const savedButton = page.getByRole( 'button', {
+			name: 'Saved',
+		} );
+		await blockTemplateRegistrationUtils.searchForTemplate(
+			'Plugin Template'
+		);
+		const searchResults = page.getByLabel( 'Actions' );
+		await searchResults.first().click();
+		await page.getByRole( 'menuitem', { name: 'Reset' } ).click();
+		await page.getByRole( 'button', { name: 'Reset' } ).click();
+
+		await expect( resetNotice ).toBeVisible();
+		await expect( savedButton ).toBeVisible();
+		await page.goto( '/?cat=1' );
+		await expect(
+			page.getByText( 'Content edited template.' )
+		).toBeHidden();
+	} );
+
+	test( 'registered templates are available in the Swap template screen', async ( {
+		admin,
+		editor,
+		page,
+	} ) => {
+		// Create a post.
+		await admin.visitAdminPage( '/post-new.php' );
+		await page.getByLabel( 'Close', { exact: true } ).click();
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'User-created post.' },
+		} );
+
+		// Swap template.
+		await page.getByRole( 'button', { name: 'Post', exact: true } ).click();
+		await page.getByRole( 'button', { name: 'Template options' } ).click();
+		await page.getByRole( 'menuitem', { name: 'Swap template' } ).click();
+		await page.getByText( 'Plugin Template' ).click();
+
+		// Verify the template is applied.
+		const postId = await editor.publishPost();
+		await page.goto( `?p=${ postId }` );
+		await expect(
+			page.getByText( 'This is a plugin-registered template.' )
+		).toBeVisible();
+	} );
+
+	test( 'themes can override registered templates', async ( {
+		admin,
+		editor,
+		page,
+		blockTemplateRegistrationUtils,
+	} ) => {
+		// Create a post.
+		await admin.visitAdminPage( '/post-new.php' );
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'User-created post.' },
+		} );
+
+		// Swap template.
+		await page.getByRole( 'button', { name: 'Post', exact: true } ).click();
+		await page.getByRole( 'button', { name: 'Template options' } ).click();
+		await page.getByRole( 'menuitem', { name: 'Swap template' } ).click();
+		await page.getByText( 'Custom', { exact: true } ).click();
+
+		// Verify the theme template is applied.
+		const postId = await editor.publishPost();
+		await page.goto( `?p=${ postId }` );
+		await expect(
+			page.getByText( 'Custom template for Posts' )
+		).toBeVisible();
+		await expect(
+			page.getByText(
+				'This is a plugin-registered template and overridden by a theme.'
+			)
+		).toBeHidden();
+
+		// Verify the plugin-registered template doesn't appear in the Site Editor.
+		await admin.visitSiteEditor( {
+			postType: 'wp_template',
+		} );
+		await blockTemplateRegistrationUtils.searchForTemplate( 'Custom' );
+		await expect(
+			page.getByText( 'Custom Template (overridden by the theme)' )
+		).toBeHidden();
+		// Verify the template description fall backs to the plugin registered description.
+		await expect(
+			page.getByText(
+				'A custom template registered by a plugin and overridden by a theme.'
+			)
+		).toBeVisible();
+		// Verify the theme template shows the theme name as the author.
+		await expect( page.getByText( 'AuthorEmptytheme' ) ).toBeVisible();
+	} );
+
+	test( 'templates can be deleted if the registered plugin is deactivated', async ( {
+		admin,
+		editor,
+		page,
+		requestUtils,
+		blockTemplateRegistrationUtils,
+	} ) => {
+		// Make an edit to the template.
+		await admin.visitSiteEditor( {
+			postType: 'wp_template',
+		} );
+		await blockTemplateRegistrationUtils.searchForTemplate(
+			'Plugin Template'
+		);
+		await page.getByText( 'Plugin Template' ).click();
+		await expect(
+			editor.canvas.getByText( 'This is a plugin-registered template.' )
+		).toBeVisible();
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'User-customized template' },
+		} );
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
+
+		// Deactivate plugin.
+		await requestUtils.deactivatePlugin(
+			'gutenberg-test-block-template-registration'
+		);
+
+		// Verify template can be deleted.
+		await admin.visitSiteEditor( {
+			postType: 'wp_template',
+		} );
+		const deletedNotice = page
+			.getByLabel( 'Dismiss this notice' )
+			.getByText( `"Plugin Template" deleted.` );
+		const savedButton = page.getByRole( 'button', {
+			name: 'Saved',
+		} );
+		await blockTemplateRegistrationUtils.searchForTemplate(
+			'Plugin Template'
+		);
+		const searchResults = page.getByLabel( 'Actions' );
+		await searchResults.first().click();
+		await page.getByRole( 'menuitem', { name: 'Delete' } ).click();
+		await page.getByRole( 'button', { name: 'Delete' } ).click();
+
+		await expect( deletedNotice ).toBeVisible();
+		await expect( savedButton ).toBeVisible();
+
+		// Expect template to no longer appear in the Site Editor.
+		await expect( page.getByLabel( 'Actions' ) ).toBeHidden();
+
+		// Reactivate plugin.
+		await requestUtils.activatePlugin(
+			'gutenberg-test-block-template-registration'
+		);
+	} );
+
+	test( 'registered templates can be unregistered', async ( {
+		admin,
+		page,
+		blockTemplateRegistrationUtils,
+	} ) => {
+		await admin.visitSiteEditor( {
+			postType: 'wp_template',
+		} );
+		await blockTemplateRegistrationUtils.searchForTemplate(
+			'Plugin Unregistered Template'
+		);
+		await expect(
+			page.getByText( 'Plugin Unregistered Template' )
+		).toBeHidden();
+	} );
+
+	test( 'WP default templates can be overridden by plugins', async ( {
+		page,
+		requestUtils,
+	} ) => {
+		const { id } = await requestUtils.createPage( {
+			title: 'Plugin override page',
+			status: 'publish',
+		} );
+		await page.goto( `?page_id=${ id }` );
+		await expect(
+			page.getByText( 'This is a plugin-registered page template.' )
+		).toBeVisible();
+	} );
+
+	test( 'user-customized templates cannot be overridden by plugins', async ( {
+		admin,
+		editor,
+		page,
+		requestUtils,
+		blockTemplateRegistrationUtils,
+	} ) => {
+		await requestUtils.deactivatePlugin(
+			'gutenberg-test-block-template-registration'
+		);
+
+		// Create an author template.
+		await admin.visitSiteEditor( {
+			postType: 'wp_template',
+		} );
+		await page.getByLabel( 'Add New Template' ).click();
+		await page.getByRole( 'button', { name: 'Author Archives' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Author For a specific item' } )
+			.click();
+		await page.getByRole( 'option', { name: 'admin' } ).click();
+		await expect( page.getByText( 'Choose a pattern' ) ).toBeVisible();
+		await page.getByLabel( 'Close', { exact: true } ).click();
+		await editor.insertBlock( {
+			name: 'core/paragraph',
+			attributes: { content: 'Author template customized by the user.' },
+		} );
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
+
+		await requestUtils.activatePlugin(
+			'gutenberg-test-block-template-registration'
+		);
+
+		// Verify the template edited by the user has priority over the one registered by the theme.
+		await page.goto( '?author=1' );
+		await expect(
+			page.getByText( 'Author template customized by the user.' )
+		).toBeVisible();
+		await expect(
+			page.getByText( 'This is a plugin-registered author template.' )
+		).toBeHidden();
+
+		// Verify the template registered by the plugin is not visible in the Site Editor.
+		await admin.visitSiteEditor( {
+			postType: 'wp_template',
+		} );
+		await blockTemplateRegistrationUtils.searchForTemplate(
+			'Plugin Author Template'
+		);
+		await expect( page.getByText( 'Plugin Author Template' ) ).toBeHidden();
+
+		// Reset the user-modified template.
+		const resetNotice = page
+			.getByLabel( 'Dismiss this notice' )
+			.getByText( `"Author: Admin" reset.` );
+		await page.getByPlaceholder( 'Search' ).fill( 'Author: admin' );
+		await page.getByRole( 'link', { name: 'Author: Admin' } ).click();
+		const actions = page.getByLabel( 'Actions' );
+		await actions.first().click();
+		await page.getByRole( 'menuitem', { name: 'Reset' } ).click();
+		await page.getByRole( 'button', { name: 'Reset' } ).click();
+
+		await expect( resetNotice ).toBeVisible();
+
+		// Verify the template registered by the plugin is applied in the editor...
+		await expect(
+			editor.canvas.getByText( 'Author template customized by the user.' )
+		).toBeHidden();
+		await expect(
+			editor.canvas.getByText(
+				'This is a plugin-registered author template.'
+			)
+		).toBeVisible();
+
+		// ... and the frontend.
+		await page.goto( '?author=1' );
+		await expect(
+			page.getByText( 'Author template customized by the user.' )
+		).toBeHidden();
+		await expect(
+			page.getByText( 'This is a plugin-registered author template.' )
+		).toBeVisible();
+	} );
+} );
+
+class BlockTemplateRegistrationUtils {
+	constructor( { page } ) {
+		this.page = page;
+	}
+
+	async searchForTemplate( searchTerm ) {
+		const searchResults = this.page.getByLabel( 'Actions' );
+		await expect
+			.poll( async () => await searchResults.count() )
+			.toBeGreaterThan( 0 );
+		const initialSearchResultsCount = await searchResults.count();
+		await this.page.getByPlaceholder( 'Search' ).fill( searchTerm );
+		await expect
+			.poll( async () => await searchResults.count() )
+			.toBeLessThan( initialSearchResultsCount );
+	}
+}
diff --git a/test/e2e/specs/site-editor/template-revert.spec.js b/test/e2e/specs/site-editor/template-revert.spec.js
index c281b71d16a183..1f8d9ea73d7fd9 100644
--- a/test/e2e/specs/site-editor/template-revert.spec.js
+++ b/test/e2e/specs/site-editor/template-revert.spec.js
@@ -20,10 +20,9 @@ test.describe( 'Template Revert', () => {
 		await requestUtils.deleteAllTemplates( 'wp_template_part' );
 		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
-	test.beforeEach( async ( { admin, requestUtils, editor } ) => {
+	test.beforeEach( async ( { admin, requestUtils } ) => {
 		await requestUtils.deleteAllTemplates( 'wp_template' );
-		await admin.visitSiteEditor();
-		await editor.canvas.locator( 'body' ).click();
+		await admin.visitSiteEditor( { canvas: 'edit' } );
 	} );
 
 	test( 'should delete the template after saving the reverted template', async ( {
@@ -35,9 +34,10 @@ test.describe( 'Template Revert', () => {
 			name: 'core/paragraph',
 			attributes: { content: 'Test' },
 		} );
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 		await templateRevertUtils.revertTemplate();
-		await editor.saveSiteEditorEntities();
 
 		const isTemplateTabVisible = await page
 			.locator(
@@ -55,7 +55,7 @@ test.describe( 'Template Revert', () => {
 			page.locator(
 				'role=region[name="Editor settings"i] >> role=button[name="Actions"i]'
 			)
-		).toBeHidden();
+		).toBeDisabled();
 	} );
 
 	test( 'should show the original content after revert', async ( {
@@ -69,9 +69,10 @@ test.describe( 'Template Revert', () => {
 			name: 'core/paragraph',
 			attributes: { content: 'Test' },
 		} );
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 		await templateRevertUtils.revertTemplate();
-		await editor.saveSiteEditorEntities();
 
 		const contentAfter =
 			await templateRevertUtils.getCurrentSiteEditorContent();
@@ -90,9 +91,10 @@ test.describe( 'Template Revert', () => {
 			name: 'core/paragraph',
 			attributes: { content: 'Test' },
 		} );
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 		await templateRevertUtils.revertTemplate();
-		await editor.saveSiteEditorEntities();
 		await admin.visitSiteEditor();
 
 		const contentAfter =
@@ -109,13 +111,14 @@ test.describe( 'Template Revert', () => {
 			name: 'core/paragraph',
 			attributes: { content: 'Test' },
 		} );
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 		const contentBefore =
 			await templateRevertUtils.getCurrentSiteEditorContent();
 
 		// Revert template and check state.
 		await templateRevertUtils.revertTemplate();
-		await editor.saveSiteEditorEntities();
 		const contentAfterSave =
 			await templateRevertUtils.getCurrentSiteEditorContent();
 		expect( contentAfterSave ).not.toEqual( contentBefore );
@@ -129,32 +132,6 @@ test.describe( 'Template Revert', () => {
 		expect( contentAfterUndo ).toEqual( contentBefore );
 	} );
 
-	test( 'should show the edited content after revert and clicking undo in the notice', async ( {
-		editor,
-		page,
-		templateRevertUtils,
-	} ) => {
-		await editor.insertBlock( {
-			name: 'core/paragraph',
-			attributes: { content: 'Test' },
-		} );
-		await editor.saveSiteEditorEntities();
-		const contentBefore =
-			await templateRevertUtils.getCurrentSiteEditorContent();
-
-		await templateRevertUtils.revertTemplate();
-		await editor.saveSiteEditorEntities();
-
-		// Click the snackbar "Undo" button.
-		await page.click(
-			'role=button[name="Dismiss this notice"i] >> role=button[name="Undo"i]'
-		);
-
-		const contentAfter =
-			await templateRevertUtils.getCurrentSiteEditorContent();
-		expect( contentAfter ).toEqual( contentBefore );
-	} );
-
 	test( 'should show the original content after revert, clicking undo then redo in the header toolbar', async ( {
 		editor,
 		page,
@@ -167,9 +144,10 @@ test.describe( 'Template Revert', () => {
 			name: 'core/paragraph',
 			attributes: { content: 'Test' },
 		} );
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
 		await templateRevertUtils.revertTemplate();
-		await editor.saveSiteEditorEntities();
 		await page.click(
 			'role=region[name="Editor top bar"i] >> role=button[name="Undo"i]'
 		);
@@ -187,43 +165,6 @@ test.describe( 'Template Revert', () => {
 		expect( contentAfterRedo ).toEqual( contentBefore );
 	} );
 
-	test( 'should show the original content after revert, clicking undo in the notice then undo in the header toolbar', async ( {
-		editor,
-		page,
-		templateRevertUtils,
-	} ) => {
-		const contentBefore =
-			await templateRevertUtils.getCurrentSiteEditorContent();
-
-		await editor.insertBlock( {
-			name: 'core/paragraph',
-			attributes: { content: 'Test' },
-		} );
-		await editor.saveSiteEditorEntities();
-		await templateRevertUtils.revertTemplate();
-		await editor.saveSiteEditorEntities();
-
-		// Click undo in the snackbar. This reverts revert template action.
-		await page.click(
-			'role=button[name="Dismiss this notice"i] >> role=button[name="Undo"i]'
-		);
-
-		//Check we have dummy content.
-		const contentAfterFirstUndo =
-			await templateRevertUtils.getCurrentSiteEditorContent();
-		expect( contentAfterFirstUndo ).not.toEqual( contentBefore );
-
-		// Click undo again, this time in the header. Reverts initial dummy content.
-		await page.click(
-			'role=region[name="Editor top bar"i] >> role=button[name="Undo"i]'
-		);
-
-		// Check dummy content is gone.
-		const contentAfterSecondUndo =
-			await templateRevertUtils.getCurrentSiteEditorContent();
-		expect( contentAfterSecondUndo ).toEqual( contentBefore );
-	} );
-
 	test( 'should show the edited content after revert, clicking undo in the header toolbar, save and reload', async ( {
 		admin,
 		editor,
@@ -234,50 +175,26 @@ test.describe( 'Template Revert', () => {
 			name: 'core/paragraph',
 			attributes: { content: 'Test' },
 		} );
-		await editor.saveSiteEditorEntities();
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
+		} );
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.getByText( /(updated|published)\./ )
+			.click();
 		const contentBefore =
 			await templateRevertUtils.getCurrentSiteEditorContent();
 
 		await templateRevertUtils.revertTemplate();
-		await editor.saveSiteEditorEntities();
 
 		await page.click(
 			'role=region[name="Editor top bar"i] >> role=button[name="Undo"i]'
 		);
-
-		await editor.saveSiteEditorEntities();
-
-		await admin.visitSiteEditor();
-
-		const contentAfter =
-			await templateRevertUtils.getCurrentSiteEditorContent();
-		expect( contentAfter ).toEqual( contentBefore );
-	} );
-
-	test( 'should show the edited content after revert, clicking undo in the notice and reload', async ( {
-		admin,
-		editor,
-		page,
-		templateRevertUtils,
-	} ) => {
-		await editor.insertBlock( {
-			name: 'core/paragraph',
-			attributes: { content: 'Test' },
+		await editor.saveSiteEditorEntities( {
+			isOnlyCurrentEntityDirty: true,
 		} );
-		await editor.saveSiteEditorEntities();
-		const contentBefore =
-			await templateRevertUtils.getCurrentSiteEditorContent();
-
-		await templateRevertUtils.revertTemplate();
-		await editor.saveSiteEditorEntities();
-
-		await page.click(
-			'role=button[name="Dismiss this notice"i] >> role=button[name="Undo"i]'
-		);
-
-		await editor.saveSiteEditorEntities();
 		await admin.visitSiteEditor();
-		await editor.canvas.locator( 'body' ).click();
+
 		const contentAfter =
 			await templateRevertUtils.getCurrentSiteEditorContent();
 		expect( contentAfter ).toEqual( contentBefore );
@@ -294,20 +211,21 @@ class TemplateRevertUtils {
 		await this.editor.openDocumentSettingsSidebar();
 		const isTemplateTabVisible = await this.page
 			.locator(
-				'role=region[name="Editor settings"i] >> role=button[name="Template"i]'
+				'role=region[name="Editor settings"i] >> role=tab[name="Template"i]'
 			)
 			.isVisible();
 		if ( isTemplateTabVisible ) {
 			await this.page.click(
-				'role=region[name="Editor settings"i] >> role=button[name="Template"i]'
+				'role=region[name="Editor settings"i] >> role=tab[name="Template"i]'
 			);
 		}
 		await this.page.click(
 			'role=region[name="Editor settings"i] >> role=button[name="Actions"i]'
 		);
-		await this.page.click( 'role=menuitem[name=/Clear customizations/i]' );
+		await this.page.click( 'role=menuitem[name=/Reset/i]' );
+		await this.page.getByRole( 'button', { name: 'Reset' } ).click();
 		await this.page.waitForSelector(
-			'role=button[name="Dismiss this notice"i] >> text="Template reverted."'
+			'role=button[name="Dismiss this notice"i] >> text=/ reset./'
 		);
 	}
 
diff --git a/test/e2e/specs/site-editor/title.spec.js b/test/e2e/specs/site-editor/title.spec.js
index 3224c519f4f9e8..8f6c5252c9f41b 100644
--- a/test/e2e/specs/site-editor/title.spec.js
+++ b/test/e2e/specs/site-editor/title.spec.js
@@ -25,7 +25,7 @@ test.describe( 'Site editor title', () => {
 		const title = page
 			.getByRole( 'region', { name: 'Editor top bar' } )
 			.getByRole( 'heading', {
-				name: 'Editing template: Index',
+				name: 'Index',
 			} );
 
 		await expect( title ).toBeVisible();
@@ -44,7 +44,7 @@ test.describe( 'Site editor title', () => {
 		const title = page
 			.getByRole( 'region', { name: 'Editor top bar' } )
 			.getByRole( 'heading', {
-				name: 'Editing template part: header',
+				name: 'header',
 			} );
 
 		await expect( title ).toBeVisible();
diff --git a/test/e2e/specs/site-editor/undo.spec.js b/test/e2e/specs/site-editor/undo.spec.js
new file mode 100644
index 00000000000000..17c4e4ada6e61b
--- /dev/null
+++ b/test/e2e/specs/site-editor/undo.spec.js
@@ -0,0 +1,42 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'undo', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'emptytheme' );
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+
+	test( 'does not empty header', async ( { admin, page, editor } ) => {
+		await admin.visitSiteEditor( { canvas: 'edit' } );
+
+		// Check if there's a valid child block with a type (not appender).
+		await expect(
+			editor.canvas.locator(
+				'[data-type="core/template-part"] [data-type]'
+			)
+		).not.toHaveCount( 0 );
+
+		// insert a block
+		await editor.insertBlock( { name: 'core/paragraph' } );
+
+		// undo
+		await page
+			.getByRole( 'button', {
+				name: 'Undo',
+			} )
+			.click();
+
+		// Check if there's a valid child block with a type (not appender).
+		await expect(
+			editor.canvas.locator(
+				'[data-type="core/template-part"] [data-type]'
+			)
+		).not.toHaveCount( 0 );
+	} );
+} );
diff --git a/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js b/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
index 2d51b5ac5014b8..e0b00fe1e59460 100644
--- a/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
+++ b/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
@@ -4,18 +4,25 @@
 const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
 test.use( {
-	userGlobalStylesRevisions: async ( { page, requestUtils }, use ) => {
-		await use( new UserGlobalStylesRevisions( { page, requestUtils } ) );
+	userGlobalStylesRevisions: async (
+		{ editor, page, requestUtils },
+		use
+	) => {
+		await use(
+			new UserGlobalStylesRevisions( { editor, page, requestUtils } )
+		);
 	},
 } );
 
-test.describe( 'Global styles revisions', () => {
+test.describe( 'Style Revisions', () => {
+	let stylesPostId;
 	test.beforeAll( async ( { requestUtils } ) => {
 		await Promise.all( [
 			requestUtils.activateTheme( 'emptytheme' ),
 			requestUtils.deleteAllTemplates( 'wp_template' ),
 			requestUtils.deleteAllTemplates( 'wp_template_part' ),
 		] );
+		stylesPostId = await requestUtils.getCurrentThemeGlobalStylesPostId();
 	} );
 
 	test.afterAll( async ( { requestUtils } ) => {
@@ -34,27 +41,27 @@ test.describe( 'Global styles revisions', () => {
 		await editor.canvas.locator( 'body' ).click();
 		const currentRevisions =
 			await userGlobalStylesRevisions.getGlobalStylesRevisions();
+		// Create a revision: change a style and save it.
+		await userGlobalStylesRevisions.saveRevision( stylesPostId, {
+			color: { background: 'blue' },
+		} );
 		await userGlobalStylesRevisions.openStylesPanel();
 
-		// Change a style and save it.
-		await page.getByRole( 'button', { name: 'Colors styles' } ).click();
-
-		await page
-			.getByRole( 'button', { name: 'Color Background styles' } )
-			.click();
-		await page
-			.getByRole( 'option', { name: 'Color: Cyan bluish gray' } )
-			.click( { force: true } );
-
-		await editor.saveSiteEditorEntities();
-
 		// Now there should be enough revisions to show the revisions UI.
-		await userGlobalStylesRevisions.openRevisions();
+		await page.getByRole( 'button', { name: 'Revisions' } ).click();
 
 		const revisionButtons = page.getByRole( 'button', {
 			name: /^Changes saved by /,
 		} );
 
+		// Shows changes made in the revision.
+		await expect(
+			page
+				.getByTestId( 'global-styles-revision-changes' )
+				.getByRole( 'listitem' )
+				.first()
+		).toHaveText( 'Colors styles.' );
+
 		// There should be 2 revisions not including the reset to theme defaults button.
 		await expect( revisionButtons ).toHaveCount(
 			currentRevisions.length + 1
@@ -68,15 +75,13 @@ test.describe( 'Global styles revisions', () => {
 	} ) => {
 		await editor.canvas.locator( 'body' ).click();
 		await userGlobalStylesRevisions.openStylesPanel();
-		await page.getByRole( 'button', { name: 'Colors styles' } ).click();
-		await page
-			.getByRole( 'button', { name: 'Color Background styles' } )
-			.click();
+		await page.getByRole( 'button', { name: 'Colors' } ).click();
+		await page.getByRole( 'button', { name: 'Background' } ).click();
 		await page
 			.getByRole( 'option', { name: 'Color: Luminous vivid amber' } )
 			.click( { force: true } );
 
-		await userGlobalStylesRevisions.openRevisions();
+		await page.getByRole( 'button', { name: 'Revisions' } ).click();
 
 		const unSavedButton = page.getByRole( 'button', {
 			name: /^Unsaved changes/,
@@ -94,7 +99,7 @@ test.describe( 'Global styles revisions', () => {
 		const confirm = page.getByRole( 'dialog' );
 		await expect( confirm ).toBeVisible();
 		await expect( confirm ).toHaveText(
-			/^Any unsaved changes will be lost when you apply this revision./
+			/^Are you sure you want to apply this revision\? Any unsaved changes will be lost./
 		);
 
 		// This is to make sure there are no lingering unsaved changes.
@@ -112,9 +117,9 @@ test.describe( 'Global styles revisions', () => {
 	} ) => {
 		await editor.canvas.locator( 'body' ).click();
 		await userGlobalStylesRevisions.openStylesPanel();
-		await userGlobalStylesRevisions.openRevisions();
+		await page.getByRole( 'button', { name: 'Revisions' } ).click();
 		const lastRevisionButton = page
-			.getByLabel( 'Global styles revisions' )
+			.getByLabel( 'Global styles revisions list' )
 			.getByRole( 'button' )
 			.last();
 		await expect( lastRevisionButton ).toContainText( 'Default styles' );
@@ -123,11 +128,156 @@ test.describe( 'Global styles revisions', () => {
 			page.getByRole( 'button', { name: 'Reset to defaults' } )
 		).toBeVisible();
 	} );
+
+	test( 'should access from the site editor sidebar', async ( { page } ) => {
+		const navigationContainer = page.getByRole( 'region', {
+			name: 'Navigation',
+		} );
+		await navigationContainer
+			.getByRole( 'button', { name: 'Styles' } )
+			.click();
+
+		await navigationContainer
+			.getByRole( 'button', { name: 'Revisions' } )
+			.click();
+
+		await expect(
+			page.getByLabel( 'Global styles revisions list' )
+		).toBeVisible();
+	} );
+
+	test( 'should allow switching to style book view', async ( {
+		page,
+		editor,
+		userGlobalStylesRevisions,
+	} ) => {
+		await editor.canvas.locator( 'body' ).click();
+		await userGlobalStylesRevisions.openStylesPanel();
+		// Search for exact names to avoid selecting the command bar button in the header.
+		const revisionsButton = page.getByRole( 'button', {
+			name: 'Revisions',
+			exact: true,
+		} );
+		const styleBookButton = page.getByRole( 'button', {
+			name: 'Style Book',
+			exact: true,
+		} );
+		await revisionsButton.click();
+		// We can see the Revisions list.
+		await expect(
+			page.getByLabel( 'Global styles revisions list' )
+		).toBeVisible();
+		await expect(
+			page.locator( 'iframe[name="revisions"]' )
+		).toBeVisible();
+		await expect(
+			page.locator( 'iframe[name="style-book-canvas"]' )
+		).toBeHidden();
+		await styleBookButton.click();
+		await expect(
+			page.locator( 'iframe[name="style-book-canvas"]' )
+		).toBeVisible();
+		await expect( page.locator( 'iframe[name="revisions"]' ) ).toBeHidden();
+
+		// Deactivating revisions view while the style book is open should close revisions,
+		// but not the style book.
+		await revisionsButton.click();
+
+		// Style book is still visible but...
+		await expect(
+			page.locator( 'iframe[name="style-book-canvas"]' )
+		).toBeVisible();
+		// The Revisions list is hidden.
+		await expect(
+			page.getByLabel( 'Global styles revisions list' )
+		).toBeHidden();
+	} );
+
+	test( 'should close revisions panel and leave style book open if activated', async ( {
+		page,
+		editor,
+		userGlobalStylesRevisions,
+	} ) => {
+		await editor.canvas.locator( 'body' ).click();
+		await userGlobalStylesRevisions.openStylesPanel();
+		const revisionsButton = page.getByRole( 'button', {
+			name: 'Revisions',
+		} );
+		const styleBookButton = page.getByRole( 'button', {
+			name: 'Style Book',
+		} );
+		await revisionsButton.click();
+		await styleBookButton.click();
+
+		await expect(
+			page.getByLabel( 'Global styles revisions list' )
+		).toBeVisible();
+
+		await page.click( 'role=button[name="Back"]' );
+
+		await expect(
+			page.getByLabel( 'Global styles revisions list' )
+		).toBeHidden();
+
+		// The site editor canvas has been restored.
+		await expect(
+			page.locator( 'iframe[name="style-book-canvas"]' )
+		).toBeVisible();
+	} );
+
+	test( 'should allow opening the command menu from the header when open', async ( {
+		page,
+		editor,
+		userGlobalStylesRevisions,
+	} ) => {
+		await editor.canvas.locator( 'body' ).click();
+		await userGlobalStylesRevisions.openStylesPanel();
+		await page
+			.getByRole( 'button', {
+				name: 'Revisions',
+				exact: true,
+			} )
+			.click();
+
+		// Open the command menu from the header.
+		await page
+			.getByRole( 'heading', {
+				name: 'Style Revisions',
+			} )
+			.click();
+
+		await expect(
+			page.getByLabel( 'Search commands and settings' )
+		).toBeVisible();
+	} );
+
+	test( 'should paginate', async ( {
+		page,
+		editor,
+		userGlobalStylesRevisions,
+	} ) => {
+		await editor.canvas.locator( 'body' ).click();
+		// Create > 10 revisions to display pagination navigation component.
+		for ( let i = 9; i < 21; i++ ) {
+			await userGlobalStylesRevisions.saveRevision( stylesPostId, {
+				typography: { fontSize: `${ i }px` },
+			} );
+		}
+		await userGlobalStylesRevisions.openStylesPanel();
+		await page.getByRole( 'button', { name: 'Revisions' } ).click();
+		const pagination = page.getByLabel(
+			'Global Styles pagination navigation'
+		);
+		await expect( pagination ).toContainText( '1 of 2' );
+		await pagination.getByRole( 'button', { name: 'Next page' } ).click();
+		await expect( pagination ).toContainText( '2 of 2' );
+	} );
 } );
 
 class UserGlobalStylesRevisions {
-	constructor( { page, requestUtils } ) {
+	constructor( { editor, page, requestUtils } ) {
 		this.page = page;
+		this.editor = editor;
 		this.requestUtils = requestUtils;
 	}
 
@@ -142,17 +292,26 @@ class UserGlobalStylesRevisions {
 		return [];
 	}
 
-	async openRevisions() {
-		await this.page
-			.getByRole( 'menubar', { name: 'Styles actions' } )
-			.click();
-		await this.page.getByRole( 'button', { name: 'Revisions' } ).click();
-	}
-
 	async openStylesPanel() {
 		await this.page
 			.getByRole( 'region', { name: 'Editor top bar' } )
 			.getByRole( 'button', { name: 'Styles' } )
 			.click();
 	}
+
+	async saveRevision( stylesPostId, styles = {}, settings = {} ) {
+		await this.page.evaluate(
+			async ( [ _stylesPostId, _styles, _settings ] ) => {
+				window.wp.data
+					.dispatch( 'core' )
+					.editEntityRecord( 'root', 'globalStyles', _stylesPostId, {
+						id: _stylesPostId,
+						settings: _settings,
+						styles: _styles,
+					} );
+			},
+			[ stylesPostId, styles, settings ]
+		);
+		await this.editor.saveSiteEditorEntities();
+	}
 }
diff --git a/test/e2e/specs/site-editor/writing-flow.spec.js b/test/e2e/specs/site-editor/writing-flow.spec.js
index 8ee6ce0e565572..ad661175b6bdfe 100644
--- a/test/e2e/specs/site-editor/writing-flow.spec.js
+++ b/test/e2e/specs/site-editor/writing-flow.spec.js
@@ -23,8 +23,8 @@ test.describe( 'Site editor writing flow', () => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//header',
 			postType: 'wp_template_part',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 		// Select the first site title block.
 		const siteTitleBlock = editor.canvas.locator(
 			'role=document[name="Block: Site Title"i]'
@@ -51,8 +51,8 @@ test.describe( 'Site editor writing flow', () => {
 		await admin.visitSiteEditor( {
 			postId: 'emptytheme//header',
 			postType: 'wp_template_part',
+			canvas: 'edit',
 		} );
-		await editor.canvas.locator( 'body' ).click();
 		// Make sure the sidebar is open.
 		await editor.openDocumentSettingsSidebar();
 
@@ -65,9 +65,9 @@ test.describe( 'Site editor writing flow', () => {
 
 		// Tab to the inspector, tabbing three times to go past the two resize handles.
 		await pageUtils.pressKeys( 'Tab', { times: 3 } );
-		const inspectorTemplateTab = page.locator(
-			'role=region[name="Editor settings"i] >> role=button[name="Template part"i]'
+		const inspectorBlockTab = page.locator(
+			'role=region[name="Editor settings"i] >> role=tab[name="Block"i]'
 		);
-		await expect( inspectorTemplateTab ).toBeFocused();
+		await expect( inspectorBlockTab ).toBeFocused();
 	} );
 } );
diff --git a/test/e2e/specs/site-editor/zoom-out.spec.js b/test/e2e/specs/site-editor/zoom-out.spec.js
new file mode 100644
index 00000000000000..464bd4a4a4efad
--- /dev/null
+++ b/test/e2e/specs/site-editor/zoom-out.spec.js
@@ -0,0 +1,50 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Zoom Out', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyfour' );
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+
+	test.beforeEach( async ( { admin } ) => {
+		await admin.visitSiteEditor( {
+			postId: 'twentytwentyfour//index',
+			postType: 'wp_template',
+			canvas: 'edit',
+		} );
+	} );
+
+	test( 'Entering zoomed out mode zooms the canvas', async ( {
+		page,
+		editor,
+	} ) => {
+		await page.getByLabel( 'Zoom Out' ).click();
+		const iframe = page.locator( 'iframe[name="editor-canvas"]' );
+		const html = editor.canvas.locator( 'html' );
+
+		// Check that the html is scaled.
+		await expect( html ).toHaveCSS(
+			'scale',
+			new RegExp( /0\.[5-8][0-9]*/, 'i' )
+		);
+		const iframeRect = await iframe.boundingBox();
+		const htmlRect = await html.boundingBox();
+
+		// Check that the iframe is larger than the html.
+		expect( iframeRect.width ).toBeGreaterThan( htmlRect.width );
+
+		// Check that the zoomed out content has a frame around it.
+		const paddingTop = await html.evaluate( ( element ) => {
+			const paddingValue = window.getComputedStyle( element ).paddingTop;
+			return parseFloat( paddingValue );
+		} );
+		expect( htmlRect.y + paddingTop ).toBeGreaterThan( iframeRect.y );
+		expect( htmlRect.x ).toBeGreaterThan( iframeRect.x );
+	} );
+} );
diff --git a/test/e2e/specs/widgets/customizing-widgets.spec.js b/test/e2e/specs/widgets/customizing-widgets.spec.js
index 34400ea00976e2..04b09da84928e1 100644
--- a/test/e2e/specs/widgets/customizing-widgets.spec.js
+++ b/test/e2e/specs/widgets/customizing-widgets.spec.js
@@ -79,7 +79,7 @@ test.describe( 'Widgets Customizer', () => {
 		);
 
 		const inlineInserterSearchBox = page.locator(
-			'role=searchbox[name="Search for blocks and patterns"i]'
+			'role=searchbox[name="Search"i]'
 		);
 
 		await expect( inlineInserterSearchBox ).toBeFocused();
@@ -358,9 +358,7 @@ test.describe( 'Widgets Customizer', () => {
 		const legacyWidgetBlock =
 			await widgetsCustomizerPage.addBlock( 'Legacy Widget' );
 		await page
-			.locator(
-				'role=combobox[name="Select a legacy widget to display:"i]'
-			)
+			.locator( 'role=combobox[name="Legacy widget"i]' )
 			.selectOption( 'test_widget' );
 
 		await expect(
@@ -467,16 +465,6 @@ test.describe( 'Widgets Customizer', () => {
 		await expect( paragraphBlock ).toBeVisible();
 
 		await paragraphBlock.focus();
-
-		// Expect pressing the Escape key to enter navigation mode,
-		// but not close the editor.
-		await page.keyboard.press( 'Escape' );
-		await expect(
-			page.locator(
-				'css=.block-editor-block-list__layout.is-navigate-mode'
-			)
-		).toBeVisible();
-		await expect( paragraphBlock ).toBeVisible();
 	} );
 
 	test( 'should move (inner) blocks to another sidebar', async ( {
@@ -663,9 +651,7 @@ class WidgetsCustomizerPage {
 			'role=toolbar[name="Document tools"i] >> role=button[name="Add block"i]'
 		);
 
-		const searchBox = this.page.locator(
-			'role=searchbox[name="Search for blocks and patterns"i]'
-		);
+		const searchBox = this.page.locator( 'role=searchbox[name="Search"i]' );
 
 		// Clear the input.
 		await searchBox.evaluate( ( node ) => {
diff --git a/test/e2e/specs/widgets/editing-widgets.spec.js b/test/e2e/specs/widgets/editing-widgets.spec.js
new file mode 100644
index 00000000000000..019e07fe87daac
--- /dev/null
+++ b/test/e2e/specs/widgets/editing-widgets.spec.js
@@ -0,0 +1,724 @@
+/**
+ * WordPress dependencies
+ */
+const {
+	test: base,
+	expect,
+} = require( '@wordpress/e2e-test-utils-playwright' );
+
+/** @typedef {import('@wordpress/e2e-test-utils-playwright').Editor} Editor */
+/** @typedef {import('@playwright/test').Locator} Locator */
+
+/** @type {ReturnType<typeof base.extend<{widgetsScreen: WidgetsScreen}>>} */
+const test = base.extend( {
+	widgetsScreen: async ( { page, editor }, use ) => {
+		await use( new WidgetsScreen( { page, editor } ) );
+	},
+} );
+
+test.describe( 'Widgets screen', () => {
+	test.beforeEach( async ( { admin, editor } ) => {
+		await admin.visitAdminPage( 'widgets.php' );
+
+		await editor.setPreferences( 'core/edit-widgets', {
+			welcomeGuide: false,
+		} );
+	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllWidgets();
+	} );
+
+	test.beforeAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			// TODO: Ideally we can bundle our test theme directly in the repo.
+			requestUtils.activateTheme( 'twentytwenty' ),
+			requestUtils.deleteAllWidgets(),
+		] );
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+
+	test( 'Should insert content using the global inserter', async ( {
+		page,
+		pageUtils,
+		widgetsScreen,
+	} ) => {
+		await expect(
+			widgetsScreen.updateButton,
+			'Update button should start out disabled'
+		).toBeDisabled();
+
+		const [ firstWidgetArea, secondWidgetArea ] =
+			await widgetsScreen.widgetAreas.all();
+
+		await page
+			.getByRole( 'toolbar', { name: 'Document tools' } )
+			.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+			.click();
+		const blockLibrary = page.getByRole( 'region', {
+			name: 'Block Library',
+		} );
+
+		await expect(
+			blockLibrary.getByRole( 'heading', { level: 2 } ).nth( 0 ),
+			'Check that there are categorizations in the inserter (#26329)'
+		).toBeVisible();
+
+		const addParagraphBlock =
+			await widgetsScreen.getBlockInGlobalInserter( 'Paragraph' );
+		await addParagraphBlock.hover();
+		// TODO: We can add a test for the insertion indicator here.
+		await addParagraphBlock.click();
+
+		await expect(
+			widgetsScreen.updateButton,
+			'Adding content should enable the Update button'
+		).toBeEnabled();
+
+		const addedParagraphBlockInFirstWidgetArea = firstWidgetArea.getByRole(
+			'document',
+			{ name: /^Empty block/ }
+		);
+
+		await addedParagraphBlockInFirstWidgetArea.focus();
+		await page.keyboard.type( 'First Paragraph' );
+
+		await widgetsScreen.getBlockInGlobalInserter( 'Paragraph' );
+		await pageUtils.pressKeys( 'Tab', { times: 2 } );
+		// TODO: We can add a test for the insertion indicator here.
+		await addParagraphBlock.click();
+
+		await addedParagraphBlockInFirstWidgetArea.focus();
+		await page.keyboard.type( 'Second Paragraph' );
+
+		const addShortCodeBlock =
+			await widgetsScreen.getBlockInGlobalInserter( 'Shortcode' );
+		await addShortCodeBlock.click();
+
+		const shortCodeInput = page.getByRole( 'textbox', {
+			name: 'Shortcode text',
+		} );
+		await shortCodeInput.focus();
+		// The famous Big Buck Bunny video.
+		await shortCodeInput.type(
+			'[video src="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"]'
+		);
+
+		// Add to the second widget area.
+		await secondWidgetArea.click();
+		await widgetsScreen.getBlockInGlobalInserter( 'Paragraph' );
+		await addParagraphBlock.click();
+
+		const addedParagraphBlockInSecondWidgetArea =
+			secondWidgetArea.getByRole( 'document', {
+				name: /^Empty block/,
+			} );
+		await addedParagraphBlockInSecondWidgetArea.focus();
+		await page.keyboard.type( 'Third Paragraph' );
+
+		await expect.poll( widgetsScreen.getWidgetAreaBlocks ).toMatchObject( {
+			'sidebar-1': [
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'First Paragraph' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'Second Paragraph' },
+				},
+				{
+					name: 'core/shortcode',
+					attributes: {
+						text: '[video src="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"]',
+					},
+				},
+			],
+			'sidebar-2': [
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'Third Paragraph' },
+				},
+			],
+		} );
+	} );
+
+	test( 'Should insert content using the inline inserter', async ( {
+		page,
+		widgetsScreen,
+	} ) => {
+		const firstWidgetArea = widgetsScreen.widgetAreas.first();
+
+		const inlineInserterButton = firstWidgetArea.getByRole( 'button', {
+			name: 'Add block',
+		} );
+		await inlineInserterButton.click();
+
+		const inlineQuickInserter = page.getByRole( 'listbox', {
+			name: 'Blocks',
+		} );
+
+		const paragraphBlock = inlineQuickInserter.getByRole( 'option', {
+			name: 'Paragraph',
+		} );
+		await paragraphBlock.click();
+
+		const firstParagraphBlock = firstWidgetArea.getByRole( 'document', {
+			name: /^Empty block/,
+		} );
+		await firstParagraphBlock.focus();
+		await page.keyboard.type( 'First Paragraph' );
+
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Second Paragraph' );
+
+		const secondParagraphBlock = firstWidgetArea
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.filter( { hasText: 'Second Paragraph' } );
+
+		const secondParagraphBlockBoundingBox =
+			await secondParagraphBlock.boundingBox();
+
+		// Click outside the block to move the focus back to the widget area.
+		await firstWidgetArea.click( {
+			position: {
+				x: 0,
+				y: ( await firstWidgetArea.boundingBox() ).height - 1,
+			},
+		} );
+
+		// Hover above the last block to trigger the inline inserter between blocks.
+		await page.mouse.move(
+			secondParagraphBlockBoundingBox.x +
+				secondParagraphBlockBoundingBox.width / 2,
+			secondParagraphBlockBoundingBox.y - 10
+		);
+
+		// There will be 2 matches here.
+		// One is the in-between inserter,
+		// and the other one is the button block appender.
+		const inBetweenInserterButton = page
+			.getByRole( 'button', {
+				name: 'Add block',
+			} )
+			.first();
+		await inBetweenInserterButton.click();
+
+		const inserterSearchBox = page.getByRole( 'searchbox', {
+			name: 'Search',
+		} );
+		await expect( inserterSearchBox ).toBeFocused();
+
+		await page.keyboard.type( 'Heading' );
+
+		await inlineQuickInserter
+			.getByRole( 'option', { name: 'Heading' } )
+			.click();
+
+		await expect(
+			firstWidgetArea.getByRole( 'document', {
+				name: 'Block: Heading',
+			} )
+		).toBeFocused();
+		await page.keyboard.type( 'My Heading' );
+
+		await widgetsScreen.saveWidgets();
+
+		await expect.poll( widgetsScreen.getWidgetAreaBlocks ).toMatchObject( {
+			'sidebar-1': [
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'First Paragraph' },
+				},
+				{
+					name: 'core/heading',
+					attributes: { content: 'My Heading' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'Second Paragraph' },
+				},
+			],
+		} );
+	} );
+
+	// This test is broken because the REST API endpoint to delete the marquee doesn't work.
+	// eslint-disable-next-line playwright/no-skipped-test
+	test.describe.skip( 'Function widgets', () => {
+		test.beforeAll( async ( { requestUtils } ) => {
+			await requestUtils.deleteAllWidgets();
+			await requestUtils.activatePlugin(
+				'gutenberg-test-marquee-widget'
+			);
+		} );
+
+		test.beforeEach( async ( { requestUtils } ) => {
+			await requestUtils.deleteAllWidgets();
+		} );
+
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.deactivatePlugin(
+				'gutenberg-test-marquee-widget'
+			);
+		} );
+
+		test( 'Should add and save the marquee widget', async ( {
+			page,
+			editor,
+			widgetsScreen,
+		} ) => {
+			const firstWidgetArea = widgetsScreen.widgetAreas.first();
+			await firstWidgetArea.waitFor();
+			{
+				const [ { clientId: firstWidgetAreaClientId } ] =
+					await editor.getBlocks( { full: true } );
+
+				await editor.insertBlock(
+					{
+						name: 'core/legacy-widget',
+						attributes: { id: 'marquee_greeting' },
+					},
+					{ clientId: firstWidgetAreaClientId }
+				);
+			}
+
+			const marqueeInputs = page.getByTestId( 'marquee-greeting' );
+
+			await marqueeInputs.fill( 'Howdy' );
+
+			// The first marquee is saved after clicking the form save button.
+			await page
+				.getByRole( 'document', { name: 'Block: Legacy Widget' } )
+				.getByRole( 'button', { name: 'Save' } )
+				.click();
+
+			await widgetsScreen.saveWidgets();
+
+			await expect
+				.poll( widgetsScreen.getWidgetAreaBlocks )
+				.toMatchObject( {
+					'sidebar-1': [
+						{
+							name: 'core/legacy-widget',
+							attributes: {
+								id: 'marquee_greeting',
+								instance: { raw: { title: 'Howdy' } },
+							},
+						},
+					],
+				} );
+
+			await page.reload();
+
+			await expect
+				.poll( widgetsScreen.getWidgetAreaBlocks )
+				.toMatchObject( {
+					'sidebar-1': [
+						{
+							name: 'core/legacy-widget',
+							attributes: {
+								id: 'marquee_greeting',
+								instance: { raw: { title: 'Howdy' } },
+							},
+						},
+					],
+				} );
+
+			await firstWidgetArea.waitFor();
+			{
+				const [ { clientId: firstWidgetAreaClientId } ] =
+					await editor.getBlocks( { full: true } );
+
+				await editor.insertBlock(
+					{
+						name: 'core/legacy-widget',
+						attributes: { id: 'marquee_greeting' },
+					},
+					{ clientId: firstWidgetAreaClientId }
+				);
+			}
+
+			await expect( marqueeInputs ).toHaveCount( 2 );
+			await marqueeInputs.first().fill( 'first Howdy' );
+			await marqueeInputs.last().fill( 'Second Howdy' );
+
+			// No marquee should be changed without clicking on their "save" button.
+			// The second marquee shouldn't be stored as a widget.
+			// See #32978 for more info.
+			{
+				await widgetsScreen.saveWidgets();
+
+				await page.reload();
+
+				await expect( marqueeInputs ).toHaveCount( 1 );
+				await expect
+					.poll( widgetsScreen.getWidgetAreaBlocks )
+					.toMatchObject( {
+						'sidebar-1': [
+							{
+								name: 'core/legacy-widget',
+								attributes: {
+									id: 'marquee_greeting',
+									instance: { raw: { title: 'Howdy' } },
+								},
+							},
+						],
+					} );
+			}
+		} );
+	} );
+
+	test( 'Should duplicate the widgets', async ( {
+		page,
+		editor,
+		widgetsScreen,
+	} ) => {
+		const firstWidgetArea = widgetsScreen.widgetAreas.first();
+		await firstWidgetArea.waitFor();
+		const [ { clientId: firstWidgetAreaClientId } ] =
+			await editor.getBlocks( { full: true } );
+
+		await editor.insertBlock(
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'First Paragraph' },
+			},
+			{ clientId: firstWidgetAreaClientId }
+		);
+
+		const firstParagraphBlock = firstWidgetArea.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+		await firstParagraphBlock.focus();
+
+		await editor.showBlockToolbar();
+		await editor.clickBlockToolbarButton( 'Options' );
+		await page
+			.getByRole( 'menu', { name: 'Options' } )
+			.getByRole( 'menuitem', { name: 'Duplicate' } )
+			.click();
+
+		const firstWidgetAreaBlocks = await editor.getBlocks( {
+			clientId: firstWidgetAreaClientId,
+			full: true,
+		} );
+		expect( firstWidgetAreaBlocks[ 0 ].name ).toBe(
+			firstWidgetAreaBlocks[ 1 ].name
+		);
+		expect( firstWidgetAreaBlocks[ 0 ].content ).toBe(
+			firstWidgetAreaBlocks[ 1 ].content
+		);
+		expect( firstWidgetAreaBlocks[ 0 ].clientId ).not.toBe(
+			firstWidgetAreaBlocks[ 1 ].clientId
+		);
+	} );
+
+	test( 'Should display legacy widgets', async ( {
+		page,
+		requestUtils,
+		widgetsScreen,
+	} ) => {
+		// Get the default empty instance of a legacy search widget.
+		const { instance: defaultSearchInstance } = await requestUtils.rest( {
+			method: 'POST',
+			path: '/wp/v2/widget-types/search/encode',
+			data: { instance: {} },
+		} );
+
+		// Create a search widget in the first sidebar using the default instance.
+		const widget = await requestUtils.rest( {
+			method: 'POST',
+			path: '/wp/v2/widgets',
+			data: {
+				id_base: 'search',
+				sidebar: 'sidebar-1',
+				instance: defaultSearchInstance,
+			},
+		} );
+		// Add it to the first widget area. The above request for some reason isn't enough.
+		await requestUtils.rest( {
+			method: 'POST',
+			path: '/wp/v2/sidebars/sidebar-1',
+			data: {
+				widgets: [ widget.id ],
+			},
+		} );
+
+		await page.reload();
+
+		const legacyWidgetPreviewFrame = page.frameLocator(
+			'[title="Legacy Widget Preview"]'
+		);
+
+		// Expect to have search input.
+		await expect(
+			legacyWidgetPreviewFrame.getByRole( 'searchbox', {
+				includeHidden: true,
+			} )
+		).toBeVisible();
+
+		// Focus the Legacy Widget block.
+		const legacyWidget = page.getByRole( 'document', {
+			name: 'Block: Legacy Widget',
+		} );
+		await legacyWidget.focus();
+
+		// There should be a title at the top of the widget form.
+		await expect(
+			legacyWidget.getByRole( 'heading', { level: 3 } )
+		).toHaveText( 'Search' );
+
+		// Update the widget form.
+		await legacyWidget
+			.getByRole( 'textbox', { name: 'Title' } )
+			.fill( 'Search Title' );
+
+		// Switch to Navigation mode.
+		await page.keyboard.press( 'Escape' );
+
+		// Expect to have search title.
+		await expect(
+			legacyWidgetPreviewFrame.getByRole( 'heading', {
+				includeHidden: true,
+			} )
+		).toHaveText( 'Search Title' );
+
+		await expect.poll( widgetsScreen.getWidgetAreaBlocks ).toMatchObject( {
+			'sidebar-1': [
+				{
+					name: 'core/legacy-widget',
+					attributes: {
+						idBase: 'search',
+						instance: { raw: { title: 'Search Title' } },
+					},
+				},
+			],
+		} );
+	} );
+
+	test( 'allows widgets to be moved between widget areas using the dropdown in the block toolbar', async ( {
+		page,
+		editor,
+		widgetsScreen,
+	} ) => {
+		const firstWidgetArea = widgetsScreen.widgetAreas.first();
+		await firstWidgetArea.waitFor();
+		const [ { clientId: firstWidgetAreaClientId } ] =
+			await editor.getBlocks( { full: true } );
+
+		// Insert a paragraph in the first widget area.
+		await editor.insertBlock(
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'First Paragraph' },
+			},
+			{ clientId: firstWidgetAreaClientId }
+		);
+
+		const firstParagraphBlock = firstWidgetArea.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+		await firstParagraphBlock.focus();
+		// Move the block to the second widget area.
+		await editor.showBlockToolbar();
+		await editor.clickBlockToolbarButton( 'Move to widget area' );
+		await page
+			.getByRole( 'menu', { name: 'Move to widget area' } )
+			.getByRole( 'menuitemradio', { name: 'Footer #2' } )
+			.click();
+
+		await expect.poll( widgetsScreen.getWidgetAreaBlocks ).toMatchObject( {
+			'sidebar-1': [],
+			'sidebar-2': [
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'First Paragraph' },
+				},
+			],
+		} );
+	} );
+
+	test( 'Allows widget deletion to be undone', async ( {
+		page,
+		editor,
+		pageUtils,
+		widgetsScreen,
+	} ) => {
+		const firstWidgetArea = widgetsScreen.widgetAreas.first();
+		await firstWidgetArea.waitFor();
+		const [ { clientId: firstWidgetAreaClientId } ] =
+			await editor.getBlocks( { full: true } );
+
+		await editor.insertBlock(
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'First Paragraph' },
+			},
+			{ clientId: firstWidgetAreaClientId }
+		);
+		await editor.insertBlock(
+			{
+				name: 'core/paragraph',
+				attributes: { content: 'Second Paragraph' },
+			},
+			{ clientId: firstWidgetAreaClientId }
+		);
+
+		await widgetsScreen.saveWidgets();
+
+		// Delete the last block and save again.
+		await firstWidgetArea
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.filter( { hasText: 'Second Paragraph' } )
+			.focus();
+		await pageUtils.pressKeys( 'access+z' );
+		await widgetsScreen.saveWidgets();
+
+		await expect.poll( widgetsScreen.getWidgetAreaBlocks ).toMatchObject( {
+			'sidebar-1': [
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'First Paragraph' },
+				},
+			],
+		} );
+
+		// Undo block deletion and save again.
+		await pageUtils.pressKeys( 'primary+z' );
+		await widgetsScreen.saveWidgets();
+
+		// Reload the page to make sure changes were actually saved.
+		await page.reload();
+
+		await expect.poll( widgetsScreen.getWidgetAreaBlocks ).toMatchObject( {
+			'sidebar-1': [
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'First Paragraph' },
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'Second Paragraph' },
+				},
+			],
+		} );
+	} );
+
+	test( 'can toggle sidebar list view', async ( { page } ) => {
+		const toggleListViewButton = page
+			.getByRole( 'toolbar', { name: 'Document tools' } )
+			.getByRole( 'button', { name: 'List View' } );
+		await toggleListViewButton.click();
+
+		const listView = page.getByRole( 'treegrid', {
+			name: 'Block navigation structure',
+		} );
+		await expect( listView ).toBeVisible();
+
+		await expect( listView.getByRole( 'gridcell' ) ).toHaveCount( 3 );
+
+		await toggleListViewButton.click();
+		await expect( listView ).toBeHidden();
+	} );
+
+	// Check for regressions of https://github.com/WordPress/gutenberg/issues/38002.
+	test( 'allows blocks to be added on mobile viewports', async ( {
+		page,
+		pageUtils,
+		widgetsScreen,
+	} ) => {
+		await pageUtils.setBrowserViewport( 'small' );
+
+		const firstWidgetArea = widgetsScreen.widgetAreas.first();
+
+		const addParagraphBlock =
+			await widgetsScreen.getBlockInGlobalInserter( 'Paragraph' );
+		await addParagraphBlock.click();
+
+		await firstWidgetArea
+			.getByRole( 'document', {
+				name: /^Empty block/,
+			} )
+			.focus();
+		await page.keyboard.type( 'First Paragraph' );
+
+		await expect.poll( widgetsScreen.getWidgetAreaBlocks ).toMatchObject( {
+			'sidebar-1': [
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'First Paragraph' },
+				},
+			],
+		} );
+	} );
+} );
+
+class WidgetsScreen {
+	/** @type {import('@playwright/test').Page} */
+	#page;
+	/** @type {Editor} */
+	#editor;
+
+	constructor( { page, editor } ) {
+		this.#page = page;
+		this.#editor = editor;
+
+		/** @type {Locator} */
+		this.widgetAreas = this.#page.getByRole( 'document', {
+			name: 'Block: Widget Area',
+		} );
+		/** @type {Locator} */
+		this.updateButton = this.#page.getByRole( 'button', {
+			name: 'Update',
+		} );
+	}
+
+	getWidgetAreaBlocks = async () => {
+		const widgetAreas = await this.#editor.getBlocks( { full: true } );
+		/** @type {Record<string, Awaited<ReturnType<Editor['getBlocks']>>>} */
+		const widgetAreaBlocks = {};
+		for ( const widgetArea of widgetAreas ) {
+			const widgetAreaId = widgetArea.attributes.id;
+			widgetAreaBlocks[ widgetAreaId ] = await this.#editor.getBlocks( {
+				clientId: widgetArea.clientId,
+			} );
+		}
+		return widgetAreaBlocks;
+	};
+
+	/**
+	 * @param {string} blockName
+	 */
+	getBlockInGlobalInserter = async ( blockName ) => {
+		const blockLibrary = this.#page.getByRole( 'region', {
+			name: 'Block Library',
+		} );
+		if ( await blockLibrary.isHidden() ) {
+			await this.#page
+				.getByRole( 'toolbar', { name: 'Document tools' } )
+				.getByRole( 'button', { name: 'Block Inserter', exact: true } )
+				.click();
+		}
+
+		await blockLibrary
+			.getByRole( 'searchbox', {
+				name: 'Search',
+			} )
+			.fill( blockName );
+
+		return blockLibrary.getByRole( 'option', { name: blockName } );
+	};
+
+	saveWidgets = async () => {
+		await test.step(
+			'save widgets',
+			async () => {
+				await this.updateButton.click();
+				await expect( this.updateButton ).toBeDisabled();
+			},
+			{ box: true }
+		);
+	};
+}
diff --git a/test/e2e/tsconfig.json b/test/e2e/tsconfig.json
index 7f855fd0ba69c8..28d349fc19bef7 100644
--- a/test/e2e/tsconfig.json
+++ b/test/e2e/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"noEmit": true,
diff --git a/test/emptytheme/img/1024x768_emptytheme_test_image.jpg b/test/emptytheme/img/1024x768_emptytheme_test_image.jpg
new file mode 100644
index 00000000000000..694e710f77c527
Binary files /dev/null and b/test/emptytheme/img/1024x768_emptytheme_test_image.jpg differ
diff --git a/test/emptytheme/styles/variation.json b/test/emptytheme/styles/variation.json
index 0ab221d087035a..7210001d22e820 100644
--- a/test/emptytheme/styles/variation.json
+++ b/test/emptytheme/styles/variation.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"settings": {
 		"color": {
 			"palette": [
@@ -12,6 +12,11 @@
 		}
 	},
 	"styles": {
+		"background": {
+			"backgroundImage": {
+				"url": "file:./img/1024x768_emptytheme_test_image.jpg"
+			}
+		},
 		"blocks": {
 			"core/post-title": {
 				"typography": {
diff --git a/test/emptytheme/theme.json b/test/emptytheme/theme.json
index d95ed844e6b1cb..09f11eeeff8cfb 100644
--- a/test/emptytheme/theme.json
+++ b/test/emptytheme/theme.json
@@ -1,6 +1,6 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/theme.json",
-	"version": 2,
+	"$schema": "../../schemas/json/theme.json",
+	"version": 3,
 	"settings": {
 		"appearanceTools": true,
 		"layout": {
diff --git a/test/gutenberg-test-themes/block-bindings/index.php b/test/gutenberg-test-themes/block-bindings/index.php
new file mode 100644
index 00000000000000..0c6530acc1aaff
--- /dev/null
+++ b/test/gutenberg-test-themes/block-bindings/index.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Theme index.php file.
+ *
+ * @package Gutenberg
+ */
+
+// Silence is golden.
+return;
diff --git a/test/gutenberg-test-themes/block-bindings/style.css b/test/gutenberg-test-themes/block-bindings/style.css
new file mode 100644
index 00000000000000..a6b91a613da6e6
--- /dev/null
+++ b/test/gutenberg-test-themes/block-bindings/style.css
@@ -0,0 +1,15 @@
+/*
+Theme Name: Block Bindings
+Theme URI: https://github.com/wordpress/gutenberg/
+Author: the WordPress team
+Description: Block bindings test theme.
+Requires at least: 6.7
+Tested up to: 6.7
+Requires PHP: 7.2
+Version: 1.0
+License: GNU General Public License v2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Text Domain: block-bindings
+Block bindings WordPress Theme, (C) 2024 WordPress.org
+Block bindings is distributed under the terms of the GNU GPL.
+*/
diff --git a/test/gutenberg-test-themes/block-bindings/templates/custom-template.html b/test/gutenberg-test-themes/block-bindings/templates/custom-template.html
new file mode 100644
index 00000000000000..a8602b1c679a8c
--- /dev/null
+++ b/test/gutenberg-test-themes/block-bindings/templates/custom-template.html
@@ -0,0 +1,3 @@
+<!-- wp:heading -->
+<h2 class="wp-block-heading">Custom template</h2>
+<!-- /wp:heading -->
diff --git a/test/gutenberg-test-themes/block-bindings/templates/index.html b/test/gutenberg-test-themes/block-bindings/templates/index.html
new file mode 100644
index 00000000000000..ab136ac8df9a7d
--- /dev/null
+++ b/test/gutenberg-test-themes/block-bindings/templates/index.html
@@ -0,0 +1,8 @@
+<!-- wp:query {"queryId":1,"query":{"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","sticky":""}} -->
+<div class="wp-block-query">
+	<!-- wp:post-template -->
+	<!-- wp:post-title {"isLink":true} /-->
+	<!-- wp:post-excerpt /-->
+	<!-- /wp:post-template -->
+</div>
+<!-- /wp:query -->
diff --git a/test/gutenberg-test-themes/block-bindings/templates/single-movie.html b/test/gutenberg-test-themes/block-bindings/templates/single-movie.html
new file mode 100644
index 00000000000000..cd05d5fe917fea
--- /dev/null
+++ b/test/gutenberg-test-themes/block-bindings/templates/single-movie.html
@@ -0,0 +1,2 @@
+<!-- wp:post-title /-->
+<!-- wp:post-content {"layout":{"inherit":true}} /-->
diff --git a/test/gutenberg-test-themes/block-bindings/templates/single.html b/test/gutenberg-test-themes/block-bindings/templates/single.html
new file mode 100644
index 00000000000000..cd05d5fe917fea
--- /dev/null
+++ b/test/gutenberg-test-themes/block-bindings/templates/single.html
@@ -0,0 +1,2 @@
+<!-- wp:post-title /-->
+<!-- wp:post-content {"layout":{"inherit":true}} /-->
diff --git a/test/gutenberg-test-themes/block-bindings/theme.json b/test/gutenberg-test-themes/block-bindings/theme.json
new file mode 100644
index 00000000000000..c996b014328398
--- /dev/null
+++ b/test/gutenberg-test-themes/block-bindings/theme.json
@@ -0,0 +1,18 @@
+{
+	"$schema": "../../../schemas/json/theme.json",
+	"version": 3,
+	"settings": {
+		"appearanceTools": true,
+		"layout": {
+			"contentSize": "840px",
+			"wideSize": "1100px"
+		}
+	},
+	"customTemplates": [
+		{
+			"name": "custom-template",
+			"title": "Custom",
+			"postTypes": [ "post", "movie" ]
+		}
+	]
+}
diff --git a/test/gutenberg-test-themes/style-variations/block-templates/singular.html b/test/gutenberg-test-themes/style-variations/block-templates/singular.html
new file mode 100644
index 00000000000000..cd05d5fe917fea
--- /dev/null
+++ b/test/gutenberg-test-themes/style-variations/block-templates/singular.html
@@ -0,0 +1,2 @@
+<!-- wp:post-title /-->
+<!-- wp:post-content {"layout":{"inherit":true}} /-->
diff --git a/test/gutenberg-test-themes/style-variations/styles/block-style-variation-a.json b/test/gutenberg-test-themes/style-variations/styles/block-style-variation-a.json
new file mode 100644
index 00000000000000..92a11d953cdb5c
--- /dev/null
+++ b/test/gutenberg-test-themes/style-variations/styles/block-style-variation-a.json
@@ -0,0 +1,20 @@
+{
+	"version": 3,
+	"title": "Block Style Variation A",
+	"slug": "block-style-variation-a",
+	"blockTypes": [ "core/group" ],
+	"styles": {
+		"border": {
+			"width": "1px",
+			"style": "dotted"
+		},
+		"blocks": {
+			"core/group": {
+				"border": {
+					"width": "11px",
+					"style": "solid"
+				}
+			}
+		}
+	}
+}
diff --git a/test/gutenberg-test-themes/style-variations/styles/block-style-variation-b.json b/test/gutenberg-test-themes/style-variations/styles/block-style-variation-b.json
new file mode 100644
index 00000000000000..79644689d18402
--- /dev/null
+++ b/test/gutenberg-test-themes/style-variations/styles/block-style-variation-b.json
@@ -0,0 +1,20 @@
+{
+	"version": 3,
+	"title": "Block Style Variation B",
+	"slug": "block-style-variation-b",
+	"blockTypes": [ "core/group" ],
+	"styles": {
+		"border": {
+			"width": "2px",
+			"style": "dashed"
+		},
+		"blocks": {
+			"core/group": {
+				"border": {
+					"width": "22px",
+					"style": "groove"
+				}
+			}
+		}
+	}
+}
diff --git a/test/gutenberg-test-themes/style-variations/styles/pink.json b/test/gutenberg-test-themes/style-variations/styles/pink.json
index bdbf2829eb5528..c9e4ac85c1c795 100644
--- a/test/gutenberg-test-themes/style-variations/styles/pink.json
+++ b/test/gutenberg-test-themes/style-variations/styles/pink.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"settings": {
 		"color": {
 			"palette": [
diff --git a/test/gutenberg-test-themes/style-variations/styles/yellow.json b/test/gutenberg-test-themes/style-variations/styles/yellow.json
index 9bf00e21b42205..df82e52408da36 100644
--- a/test/gutenberg-test-themes/style-variations/styles/yellow.json
+++ b/test/gutenberg-test-themes/style-variations/styles/yellow.json
@@ -1,5 +1,5 @@
 {
-	"version": 2,
+	"version": 3,
 	"styles": {
 		"color": {
 			"background": "#ffef0b",
diff --git a/test/gutenberg-test-themes/style-variations/theme.json b/test/gutenberg-test-themes/style-variations/theme.json
index 5fa12e236592d8..e565be10125644 100644
--- a/test/gutenberg-test-themes/style-variations/theme.json
+++ b/test/gutenberg-test-themes/style-variations/theme.json
@@ -1,5 +1,6 @@
 {
-	"version": 2,
+	"$schema": "../../../schemas/json/theme.json",
+	"version": 3,
 	"styles": {
 		"color": {
 			"background": "red"
diff --git a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
index 071870a4208174..2ceadd67d4d1f4 100644
--- a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
+++ b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
@@ -26,6 +26,8 @@ exports[`Blocks raw handling pasteHandler iframe-embed 1`] = `""`;
 
 exports[`Blocks raw handling pasteHandler markdown 1`] = `"This is a heading with <em>italic</em><br>This is a paragraph with a <a href="https://w.org/">link</a>, <strong>bold</strong>, and <del>strikethrough</del>.<br>Preserve<br>line breaks please.<br>Lists<br>A<br>Bulleted Indented<br>List<br>One<br>Two<br>Three<br>Table<br>First Header<br>Second Header<br>Content from cell 1<br>Content from cell 2<br>Content in the first column<br>Content in the second column<br><br><br><br>Table with empty cells.<br>Quote<br>First<br>Second<br>Code<br>Inline <code>code</code> tags should work.<br><code>This is a code block.</code>"`;
 
+exports[`Blocks raw handling pasteHandler mixed-content 1`] = `"Some heading<br><br>Content we need to preserve"`;
+
 exports[`Blocks raw handling pasteHandler ms-word 1`] = `"This is a title<br>&nbsp;<br>This is a subtitle<br>&nbsp;<br>This is a heading level 1<br>&nbsp;<br>This is a heading level 2<br>&nbsp;<br>This is a <strong>paragraph</strong> with a <a href="https://w.org/">link</a>.<br>&nbsp;<br>A<br>Bulleted<br>Indented<br>List<br>&nbsp;<br>One<br>Two<br>Three<br>&nbsp;<br>One<br>Two<br>Three<br>1<br>2<br>3<br>I<br>II<br>III<br>&nbsp;<br>An image:<br>&nbsp;<br><img width="451" height="338" src="file:LOW-RES.png"><br><a href="#anchor">This is an anchor link</a> that leads to the next paragraph.<br><a id="anchor">This is the paragraph with the anchor.</a><br><a href="#nowhere">This is an anchor link</a> that leads nowhere.<br><a>This is a paragraph with an anchor with no link pointing to it.</a><br>This is a reference to a footnote<a href="#_ftn1" id="_ftnref1">[1]</a>.<br>This is a reference to an endnote<a href="#_edn1" id="_ednref1">[i]</a>.<br><br><br><a href="#_ftnref1" id="_ftn1">[1]</a> This is a footnote.<br><br><br><a href="#_ednref1" id="_edn1">[i]</a> This is an endnote."`;
 
 exports[`Blocks raw handling pasteHandler ms-word-list 1`] = `"<a>This is a headline?</a><br>This is a text:<br>One<br>Two<br>Three<br><a>Lorem Ipsum.</a><br>&nbsp;"`;
@@ -135,7 +137,7 @@ exports[`rawHandler should convert HTML post to blocks with minimal content chan
 <!-- /wp:html -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>Item</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
@@ -177,9 +179,9 @@ exports[`rawHandler should convert a caption shortcode with link 1`] = `
 
 exports[`rawHandler should convert a list with attributes 1`] = `
 "<!-- wp:list {"ordered":true,"type":"lower-roman","start":2,"reversed":true} -->
-<ol reversed start="2" style="list-style-type:lower-roman"><!-- wp:list-item -->
+<ol reversed start="2" style="list-style-type:lower-roman" class="wp-block-list"><!-- wp:list-item -->
 <li>1<!-- wp:list {"ordered":true,"type":"lower-roman","start":2,"reversed":true} -->
-<ol reversed start="2" style="list-style-type:lower-roman"><!-- wp:list-item -->
+<ol reversed start="2" style="list-style-type:lower-roman" class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list --></li>
@@ -198,3 +200,21 @@ exports[`rawHandler should preserve alignment 1`] = `
 <p class="has-text-align-center">center</p>
 <!-- /wp:paragraph -->"
 `;
+
+exports[`rawHandler should preserve all paragraphs 1`] = `
+"<!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
+<p>&nbsp;&nbsp;</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph {"className":"p"} -->
+<p class="p"></p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph -->"
+`;
diff --git a/test/integration/blocks-raw-handling.test.js b/test/integration/blocks-raw-handling.test.js
index 8acfb052436ed7..70af14f3290460 100644
--- a/test/integration/blocks-raw-handling.test.js
+++ b/test/integration/blocks-raw-handling.test.js
@@ -177,7 +177,7 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
+		"<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>one</li>
 		<!-- /wp:list-item -->
 
@@ -202,7 +202,7 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
+		"<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>one</li>
 		<!-- /wp:list-item -->
 
@@ -318,7 +318,7 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
+		"<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item -->
 
@@ -424,6 +424,7 @@ describe( 'Blocks raw handling', () => {
 			'shortcode-matching',
 			'slack-quote',
 			'slack-paragraphs',
+			'mixed-content',
 		].forEach( ( type ) => {
 			// eslint-disable-next-line jest/valid-title
 			it( type, () => {
@@ -560,4 +561,12 @@ describe( 'rawHandler', () => {
 		const HTML = '<p style="text-align:center">center</p>';
 		expect( serialize( rawHandler( { HTML } ) ) ).toMatchSnapshot();
 	} );
+
+	it( 'should preserve all paragraphs', () => {
+		const HTML = `<p></p>
+<p>&nbsp;&nbsp;</p>
+<p class="p"></p>
+<p style="border: 1px solid tomato;"></p>`;
+		expect( serialize( rawHandler( { HTML } ) ) ).toMatchSnapshot();
+	} );
 } );
diff --git a/test/integration/blocks-schema.test.js b/test/integration/blocks-schema.test.js
index 1bc75555d6b880..37137ddd09d211 100644
--- a/test/integration/blocks-schema.test.js
+++ b/test/integration/blocks-schema.test.js
@@ -1,9 +1,8 @@
 /**
  * External dependencies
  */
-import Ajv from 'ajv-draft-04';
+import Ajv from 'ajv';
 import glob from 'fast-glob';
-import path from 'path';
 
 /**
  * Internal dependencies
@@ -11,17 +10,13 @@ import path from 'path';
 import blockSchema from '../../schemas/json/block.json';
 
 describe( 'block.json schema', () => {
-	const blockFolders = glob.sync( 'packages/block-library/src/*', {
-		onlyDirectories: true,
-		ignore: [ 'packages/block-library/src/utils' ],
-	} );
-	const testData = blockFolders.map( ( blockFolder ) => [
-		'core/' + path.basename( blockFolder ),
-		path.join( blockFolder, 'block.json' ),
-	] );
+	const jsonFiles = glob.sync(
+		[ 'packages/*/src/**/block.json', '{lib,phpunit,test}/**/block.json' ],
+		{ onlyFiles: true }
+	);
 	const ajv = new Ajv();
 
-	test( 'strictly adheres to the draft-04 meta schema', () => {
+	test( 'strictly adheres to the draft-07 meta schema', () => {
 		// Use ajv.compile instead of ajv.validateSchema to validate the schema
 		// because validateSchema only checks syntax, whereas, compile checks
 		// if the schema is semantically correct with strict mode.
@@ -31,22 +26,18 @@ describe( 'block.json schema', () => {
 		expect( result.errors ).toBe( null );
 	} );
 
-	test( 'found block folders', () => {
-		expect( blockFolders.length ).toBeGreaterThan( 0 );
+	test( 'found block.json files', () => {
+		expect( jsonFiles.length ).toBeGreaterThan( 0 );
 	} );
 
-	test.each( testData )(
-		'validates schema for `%s`',
-		( blockName, filepath ) => {
-			// We want to validate the block.json file using the local schema.
-			const { $schema, ...blockMetadata } = require( filepath );
+	test.each( jsonFiles )( 'validates schema for `%s`', ( filepath ) => {
+		// We want to validate the block.json file using the local schema.
+		const { $schema, ...blockMetadata } = require( filepath );
 
-			expect( $schema ).toBe( 'https://schemas.wp.org/trunk/block.json' );
+		expect( $schema ).toBe( 'https://schemas.wp.org/trunk/block.json' );
 
-			const result =
-				ajv.validate( blockSchema, blockMetadata ) || ajv.errors;
+		const result = ajv.validate( blockSchema, blockMetadata ) || ajv.errors;
 
-			expect( result ).toBe( true );
-		}
-	);
+		expect( result ).toBe( true );
+	} );
 } );
diff --git a/test/integration/fixtures/blocks/core__avatar.json b/test/integration/fixtures/blocks/core__avatar.json
index 6d21f8bebfc7b0..9c1aeef62009c3 100644
--- a/test/integration/fixtures/blocks/core__avatar.json
+++ b/test/integration/fixtures/blocks/core__avatar.json
@@ -7,8 +7,8 @@
 			"size": 85,
 			"isLink": true,
 			"linkTarget": "_self",
-			"align": "right",
 			"borderColor": "vivid-red",
+			"align": "right",
 			"style": {
 				"spacing": {
 					"margin": {
diff --git a/test/integration/fixtures/blocks/core__avatar.serialized.html b/test/integration/fixtures/blocks/core__avatar.serialized.html
index 6965019bf96dbe..260cacb274b57e 100644
--- a/test/integration/fixtures/blocks/core__avatar.serialized.html
+++ b/test/integration/fixtures/blocks/core__avatar.serialized.html
@@ -1 +1 @@
-<!-- wp:avatar {"userId":4,"size":85,"isLink":true,"align":"right","borderColor":"vivid-red","style":{"spacing":{"margin":{"bottom":"40px"}},"border":{"radius":"47px","width":"3px"},"color":{"duotone":["#000000","#ffe2c7"]}}} /-->
+<!-- wp:avatar {"userId":4,"size":85,"isLink":true,"borderColor":"vivid-red","align":"right","style":{"spacing":{"margin":{"bottom":"40px"}},"border":{"radius":"47px","width":"3px"},"color":{"duotone":["#000000","#ffe2c7"]}}} /-->
diff --git a/test/integration/fixtures/blocks/core__block.json b/test/integration/fixtures/blocks/core__block.json
index a4ce0bf8c95456..d7c28bacfe137d 100644
--- a/test/integration/fixtures/blocks/core__block.json
+++ b/test/integration/fixtures/blocks/core__block.json
@@ -3,7 +3,8 @@
 		"name": "core/block",
 		"isValid": true,
 		"attributes": {
-			"ref": 123
+			"ref": 123,
+			"content": {}
 		},
 		"innerBlocks": []
 	}
diff --git a/test/integration/fixtures/blocks/core__block__overrides.html b/test/integration/fixtures/blocks/core__block__overrides.html
new file mode 100644
index 00000000000000..0fd835b5013a82
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides.html
@@ -0,0 +1 @@
+<!-- wp:core/block {"ref":123,"content":{"Nice paragraph":{"content":"Some value"}}} /-->
diff --git a/test/integration/fixtures/blocks/core__block__overrides.json b/test/integration/fixtures/blocks/core__block__overrides.json
new file mode 100644
index 00000000000000..7d72f03e00072b
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/block",
+		"isValid": true,
+		"attributes": {
+			"ref": 123,
+			"content": {
+				"Nice paragraph": {
+					"content": "Some value"
+				}
+			}
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__block__overrides.parsed.json b/test/integration/fixtures/blocks/core__block__overrides.parsed.json
new file mode 100644
index 00000000000000..ce5a0ab732c7f1
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides.parsed.json
@@ -0,0 +1,16 @@
+[
+	{
+		"blockName": "core/block",
+		"attrs": {
+			"ref": 123,
+			"content": {
+				"Nice paragraph": {
+					"content": "Some value"
+				}
+			}
+		},
+		"innerBlocks": [],
+		"innerHTML": "",
+		"innerContent": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__block__overrides.serialized.html b/test/integration/fixtures/blocks/core__block__overrides.serialized.html
new file mode 100644
index 00000000000000..5c8716afd6a2ad
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides.serialized.html
@@ -0,0 +1 @@
+<!-- wp:block {"ref":123,"content":{"Nice paragraph":{"content":"Some value"}}} /-->
diff --git a/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.html b/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.html
new file mode 100644
index 00000000000000..5b7b2cdf95cfb8
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.html
@@ -0,0 +1 @@
+<!-- wp:core/block {"ref":123,"overrides":{"V98q_x":{"content":"Some value"}}} /-->
diff --git a/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.json b/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.json
new file mode 100644
index 00000000000000..3f0292c83ac35e
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/block",
+		"isValid": true,
+		"attributes": {
+			"ref": 123,
+			"content": {
+				"V98q_x": {
+					"content": "Some value"
+				}
+			}
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.parsed.json b/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.parsed.json
new file mode 100644
index 00000000000000..2cf2ac37974450
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.parsed.json
@@ -0,0 +1,16 @@
+[
+	{
+		"blockName": "core/block",
+		"attrs": {
+			"ref": 123,
+			"overrides": {
+				"V98q_x": {
+					"content": "Some value"
+				}
+			}
+		},
+		"innerBlocks": [],
+		"innerHTML": "",
+		"innerContent": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.serialized.html b/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.serialized.html
new file mode 100644
index 00000000000000..3d91f47859d018
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides__deprecated-1.serialized.html
@@ -0,0 +1 @@
+<!-- wp:block {"ref":123,"content":{"V98q_x":{"content":"Some value"}}} /-->
diff --git a/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.html b/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.html
new file mode 100644
index 00000000000000..d75c773c630efd
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.html
@@ -0,0 +1 @@
+<!-- wp:core/block {"ref":123,"content":{"V98q_x":{"values":{"content":"Some value"}}}} /-->
diff --git a/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.json b/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.json
new file mode 100644
index 00000000000000..3f0292c83ac35e
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/block",
+		"isValid": true,
+		"attributes": {
+			"ref": 123,
+			"content": {
+				"V98q_x": {
+					"content": "Some value"
+				}
+			}
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.parsed.json b/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.parsed.json
new file mode 100644
index 00000000000000..41cd1dc9afd443
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.parsed.json
@@ -0,0 +1,18 @@
+[
+	{
+		"blockName": "core/block",
+		"attrs": {
+			"ref": 123,
+			"content": {
+				"V98q_x": {
+					"values": {
+						"content": "Some value"
+					}
+				}
+			}
+		},
+		"innerBlocks": [],
+		"innerHTML": "",
+		"innerContent": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.serialized.html b/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.serialized.html
new file mode 100644
index 00000000000000..3d91f47859d018
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__block__overrides__deprecated-2.serialized.html
@@ -0,0 +1 @@
+<!-- wp:block {"ref":123,"content":{"V98q_x":{"content":"Some value"}}} /-->
diff --git a/test/integration/fixtures/blocks/core__categories.json b/test/integration/fixtures/blocks/core__categories.json
index 013418065bbbb1..698105d8921341 100644
--- a/test/integration/fixtures/blocks/core__categories.json
+++ b/test/integration/fixtures/blocks/core__categories.json
@@ -3,11 +3,13 @@
 		"name": "core/categories",
 		"isValid": true,
 		"attributes": {
+			"taxonomy": "category",
 			"displayAsDropdown": false,
 			"showHierarchy": false,
 			"showPostCounts": false,
 			"showOnlyTopLevel": false,
-			"showEmpty": false
+			"showEmpty": false,
+			"showLabel": true
 		},
 		"innerBlocks": []
 	}
diff --git a/test/integration/fixtures/blocks/core__column.html b/test/integration/fixtures/blocks/core__column.html
index a18d2ee30a3eb4..3bf672232a906d 100644
--- a/test/integration/fixtures/blocks/core__column.html
+++ b/test/integration/fixtures/blocks/core__column.html
@@ -7,4 +7,4 @@
 	<p>Column One, Paragraph Two</p>
 	<!-- /wp:paragraph -->
 </div>
-<!-- /wp:columns -->
+<!-- /wp:column -->
diff --git a/test/integration/fixtures/blocks/core__form-input.html b/test/integration/fixtures/blocks/core__form-input.html
index f30d44a2503d20..81ff6cf53534e8 100644
--- a/test/integration/fixtures/blocks/core__form-input.html
+++ b/test/integration/fixtures/blocks/core__form-input.html
@@ -1,3 +1,20 @@
 <!-- wp:form-input -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label>
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input.json b/test/integration/fixtures/blocks/core__form-input.json
index fee4df284f1156..2d9865ef735562 100644
--- a/test/integration/fixtures/blocks/core__form-input.json
+++ b/test/integration/fixtures/blocks/core__form-input.json
@@ -11,5 +11,57 @@
 			"visibilityPermissions": "all"
 		},
 		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "number",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "tel",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "url",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input.parsed.json b/test/integration/fixtures/blocks/core__form-input.parsed.json
index f92379b595276f..439943df2841c8 100644
--- a/test/integration/fixtures/blocks/core__form-input.parsed.json
+++ b/test/integration/fixtures/blocks/core__form-input.parsed.json
@@ -3,9 +3,81 @@
 		"blockName": "core/form-input",
 		"attrs": {},
 		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/></label>\n",
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/></label></div>\n",
 		"innerContent": [
-			"\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/></label>\n"
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "email"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "number"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "tel"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/></label></div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "url"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/></label></div>\n"
 		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input.serialized.html b/test/integration/fixtures/blocks/core__form-input.serialized.html
index f30d44a2503d20..d66cedcf9215b8 100644
--- a/test/integration/fixtures/blocks/core__form-input.serialized.html
+++ b/test/integration/fixtures/blocks/core__form-input.serialized.html
@@ -1,3 +1,19 @@
 <!-- wp:form-input -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label>
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.html b/test/integration/fixtures/blocks/core__form-input__checkbox.html
new file mode 100644
index 00000000000000..fd08525a17eb33
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="checkbox" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.json b/test/integration/fixtures/blocks/core__form-input__checkbox.json
new file mode 100644
index 00000000000000..cc86ecd2a9080b
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": true,
+			"required": true,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json b/test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json
new file mode 100644
index 00000000000000..60b7b7dd37b091
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.parsed.json
@@ -0,0 +1,14 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox",
+			"inlineLabel": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html b/test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html
new file mode 100644
index 00000000000000..fd08525a17eb33
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="checkbox" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html
new file mode 100644
index 00000000000000..bd64e201e19185
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.html
@@ -0,0 +1,7 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json
new file mode 100644
index 00000000000000..162304dc84b0c2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json
new file mode 100644
index 00000000000000..2a2490e5c12607
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html
new file mode 100644
index 00000000000000..66705934019701
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html
new file mode 100644
index 00000000000000..3f1de1c6028470
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json
new file mode 100644
index 00000000000000..162304dc84b0c2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json
new file mode 100644
index 00000000000000..dfa57c0755f685
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "checkbox"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"checkbox\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html
new file mode 100644
index 00000000000000..66705934019701
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__checkbox__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"checkbox"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="checkbox" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
new file mode 100644
index 00000000000000..5f043b0b2ef644
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.html
@@ -0,0 +1,36 @@
+<!-- wp:form-input -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+
+<!-- wp:form-input {"type":"email"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
new file mode 100644
index 00000000000000..2d9865ef735562
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.json
@@ -0,0 +1,67 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "text",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "number",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "tel",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "url",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
new file mode 100644
index 00000000000000..963614974675d5
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.parsed.json
@@ -0,0 +1,83 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"text\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n\n",
+		"innerContent": [ "\n\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "email"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"email\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "number"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"number\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "tel"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"tel\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "url"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"url\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
new file mode 100644
index 00000000000000..d66cedcf9215b8
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__deprecated-v1.serialized.html
@@ -0,0 +1,19 @@
+<!-- wp:form-input -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="text" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="email" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"number"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="number" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"tel"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="tel" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
+
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><input class="wp-block-form-input__input" type="url" name="label" aria-required="false"/></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.html b/test/integration/fixtures/blocks/core__form-input__radio.html
new file mode 100644
index 00000000000000..1e6c76424334fb
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="radio" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.json b/test/integration/fixtures/blocks/core__form-input__radio.json
new file mode 100644
index 00000000000000..18cec11e3305b1
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": true,
+			"required": true,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.parsed.json b/test/integration/fixtures/blocks/core__form-input__radio.parsed.json
new file mode 100644
index 00000000000000..8dbb5b5a09942a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.parsed.json
@@ -0,0 +1,14 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio",
+			"inlineLabel": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label is-label-inline\"><input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" required aria-required=\"true\"/><span class=\"wp-block-form-input__label-content\">Label</span></label></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio.serialized.html b/test/integration/fixtures/blocks/core__form-input__radio.serialized.html
new file mode 100644
index 00000000000000..1e6c76424334fb
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio","inlineLabel":true} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label is-label-inline"><input class="wp-block-form-input__input" type="radio" name="label" required aria-required="true"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html
new file mode 100644
index 00000000000000..8c41e02f10f04a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.html
@@ -0,0 +1,7 @@
+<!-- wp:form-input {"type":"radio"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
+</label>
+<!-- /wp:form-input -->
+
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json
new file mode 100644
index 00000000000000..113ce01f7ab7ef
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json
new file mode 100644
index 00000000000000..7433a6c7e9c508
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html
new file mode 100644
index 00000000000000..be1ae98e023107
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html
new file mode 100644
index 00000000000000..a1c1b58f9b7fc5
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.html
@@ -0,0 +1,8 @@
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input">
+	<label class="wp-block-form-input__label">
+		<span class="wp-block-form-input__label-content">Label</span>
+		<input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/>
+	</label>
+</div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json
new file mode 100644
index 00000000000000..113ce01f7ab7ef
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "radio",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json
new file mode 100644
index 00000000000000..14c7828b1c890d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "radio"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\">\n\t<label class=\"wp-block-form-input__label\">\n\t\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t\t<input class=\"wp-block-form-input__input\" type=\"radio\" name=\"label\" aria-required=\"false\"/>\n\t</label>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html
new file mode 100644
index 00000000000000..be1ae98e023107
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__radio__deprecated-v2.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"radio"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><input class="wp-block-form-input__input" type="radio" name="label" aria-required="false"/><span class="wp-block-form-input__label-content">Label</span></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.html b/test/integration/fixtures/blocks/core__form-input__textarea.html
new file mode 100644
index 00000000000000..b39e1c8b51166f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" required aria-required="true"></textarea></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.json b/test/integration/fixtures/blocks/core__form-input__textarea.json
new file mode 100644
index 00000000000000..62ae6f76a0e9d2
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "textarea",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": true,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.parsed.json b/test/integration/fixtures/blocks/core__form-input__textarea.parsed.json
new file mode 100644
index 00000000000000..3f76a2194f27e4
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "textarea"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><textarea class=\"wp-block-form-input__input\" name=\"label\" required aria-required=\"true\"></textarea></label></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Label</span><textarea class=\"wp-block-form-input__input\" name=\"label\" required aria-required=\"true\"></textarea></label></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea.serialized.html b/test/integration/fixtures/blocks/core__form-input__textarea.serialized.html
new file mode 100644
index 00000000000000..b39e1c8b51166f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" required aria-required="true"></textarea></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html
new file mode 100644
index 00000000000000..8f7722f81ccc57
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.html
@@ -0,0 +1,6 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<label class="wp-block-form-input__label">
+	<span class="wp-block-form-input__label-content">Label</span>
+	<textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea>
+</label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json
new file mode 100644
index 00000000000000..398106d8de1caf
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.json
@@ -0,0 +1,15 @@
+[
+	{
+		"name": "core/form-input",
+		"isValid": true,
+		"attributes": {
+			"type": "textarea",
+			"label": "Label",
+			"inlineLabel": false,
+			"required": false,
+			"value": "",
+			"visibilityPermissions": "all"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json
new file mode 100644
index 00000000000000..e5e11f26d99606
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.parsed.json
@@ -0,0 +1,13 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"type": "textarea"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n</label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input__label\">\n\t<span class=\"wp-block-form-input__label-content\">Label</span>\n\t<textarea class=\"wp-block-form-input__input\" name=\"label\" aria-required=\"false\"></textarea>\n</label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html
new file mode 100644
index 00000000000000..530403c4964fae
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input__textarea__deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Label</span><textarea class="wp-block-form-input__input" name="label" aria-required="false"></textarea></label></div>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form.html b/test/integration/fixtures/blocks/core__form.html
index f443172601a3b5..825389eb75ecd3 100644
--- a/test/integration/fixtures/blocks/core__form.html
+++ b/test/integration/fixtures/blocks/core__form.html
@@ -1,19 +1,19 @@
 <!-- wp:form -->
 <form class="wp-block-form" enctype="text/plain">
-<!-- wp:form-input {"label":"Name","required":true} -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Name</span><input class="wp-block-form-input__input" type="text" name="name" required aria-required="true"/></label>
+<!-- wp:form-input -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Name</span><input class="wp-block-form-input__input" type="text" name="name" required aria-required="true"/></label></div>
 <!-- /wp:form-input -->
 
-<!-- wp:form-input {"type":"email","label":"Email","required":true} -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Email</span><input class="wp-block-form-input__input" type="email" name="email" required aria-required="true"/></label>
+<!-- wp:form-input {"type":"email"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Email</span><input class="wp-block-form-input__input" type="email" name="email" required aria-required="true"/></label></div>
 <!-- /wp:form-input -->
 
-<!-- wp:form-input {"type":"url","label":"Website"} -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Website</span><input class="wp-block-form-input__input" type="url" name="website" aria-required="false"/></label>
+<!-- wp:form-input {"type":"url"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Website</span><input class="wp-block-form-input__input" type="url" name="website" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
 
-<!-- wp:form-input {"type":"textarea","label":"Comment","required":true} -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Comment</span><textarea class="wp-block-form-input__input" name="comment" required aria-required="true"></textarea></label>
+<!-- wp:form-input {"type":"textarea"} -->
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Comment</span><textarea class="wp-block-form-input__input" name="comment" required aria-required="true"></textarea></label></div>
 <!-- /wp:form-input -->
 
 <!-- wp:form-submit-button -->
diff --git a/test/integration/fixtures/blocks/core__form.parsed.json b/test/integration/fixtures/blocks/core__form.parsed.json
index fb2daff4a47411..e33849b5be5041 100644
--- a/test/integration/fixtures/blocks/core__form.parsed.json
+++ b/test/integration/fixtures/blocks/core__form.parsed.json
@@ -5,52 +5,44 @@
 		"innerBlocks": [
 			{
 				"blockName": "core/form-input",
-				"attrs": {
-					"label": "Name",
-					"required": true
-				},
+				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Name</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"name\" required aria-required=\"true\"/></label>\n",
+				"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Name</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"name\" required aria-required=\"true\"/></label></div>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Name</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"name\" required aria-required=\"true\"/></label>\n"
+					"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Name</span><input class=\"wp-block-form-input__input\" type=\"text\" name=\"name\" required aria-required=\"true\"/></label></div>\n"
 				]
 			},
 			{
 				"blockName": "core/form-input",
 				"attrs": {
-					"type": "email",
-					"label": "Email",
-					"required": true
+					"type": "email"
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Email</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"email\" required aria-required=\"true\"/></label>\n",
+				"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Email</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"email\" required aria-required=\"true\"/></label></div>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Email</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"email\" required aria-required=\"true\"/></label>\n"
+					"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Email</span><input class=\"wp-block-form-input__input\" type=\"email\" name=\"email\" required aria-required=\"true\"/></label></div>\n"
 				]
 			},
 			{
 				"blockName": "core/form-input",
 				"attrs": {
-					"type": "url",
-					"label": "Website"
+					"type": "url"
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Website</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"website\" aria-required=\"false\"/></label>\n",
+				"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Website</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"website\" aria-required=\"false\"/></label></div>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Website</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"website\" aria-required=\"false\"/></label>\n"
+					"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Website</span><input class=\"wp-block-form-input__input\" type=\"url\" name=\"website\" aria-required=\"false\"/></label></div>\n"
 				]
 			},
 			{
 				"blockName": "core/form-input",
 				"attrs": {
-					"type": "textarea",
-					"label": "Comment",
-					"required": true
+					"type": "textarea"
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Comment</span><textarea class=\"wp-block-form-input__input\" name=\"comment\" required aria-required=\"true\"></textarea></label>\n",
+				"innerHTML": "\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Comment</span><textarea class=\"wp-block-form-input__input\" name=\"comment\" required aria-required=\"true\"></textarea></label></div>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Comment</span><textarea class=\"wp-block-form-input__input\" name=\"comment\" required aria-required=\"true\"></textarea></label>\n"
+					"\n<div class=\"wp-block-form-input\"><label class=\"wp-block-form-input__label\"><span class=\"wp-block-form-input__label-content\">Comment</span><textarea class=\"wp-block-form-input__input\" name=\"comment\" required aria-required=\"true\"></textarea></label></div>\n"
 				]
 			},
 			{
diff --git a/test/integration/fixtures/blocks/core__form.serialized.html b/test/integration/fixtures/blocks/core__form.serialized.html
index 9bfff780f50dbf..e3209102ce20be 100644
--- a/test/integration/fixtures/blocks/core__form.serialized.html
+++ b/test/integration/fixtures/blocks/core__form.serialized.html
@@ -1,18 +1,18 @@
 <!-- wp:form -->
 <form class="wp-block-form" enctype="text/plain"><!-- wp:form-input -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Name</span><input class="wp-block-form-input__input" type="text" name="name" required aria-required="true"/></label>
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Name</span><input class="wp-block-form-input__input" type="text" name="name" required aria-required="true"/></label></div>
 <!-- /wp:form-input -->
 
 <!-- wp:form-input {"type":"email"} -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Email</span><input class="wp-block-form-input__input" type="email" name="email" required aria-required="true"/></label>
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Email</span><input class="wp-block-form-input__input" type="email" name="email" required aria-required="true"/></label></div>
 <!-- /wp:form-input -->
 
 <!-- wp:form-input {"type":"url"} -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Website</span><input class="wp-block-form-input__input" type="url" name="website" aria-required="false"/></label>
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Website</span><input class="wp-block-form-input__input" type="url" name="website" aria-required="false"/></label></div>
 <!-- /wp:form-input -->
 
 <!-- wp:form-input {"type":"textarea"} -->
-<label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Comment</span><textarea class="wp-block-form-input__input" name="comment" required aria-required="true"></textarea></label>
+<div class="wp-block-form-input"><label class="wp-block-form-input__label"><span class="wp-block-form-input__label-content">Comment</span><textarea class="wp-block-form-input__input" name="comment" required aria-required="true"></textarea></label></div>
 <!-- /wp:form-input -->
 
 <!-- wp:form-submit-button -->
diff --git a/test/integration/fixtures/blocks/core__gallery-with-caption.json b/test/integration/fixtures/blocks/core__gallery-with-caption.json
index 12b516606641d4..1106c8ccb64b2a 100644
--- a/test/integration/fixtures/blocks/core__gallery-with-caption.json
+++ b/test/integration/fixtures/blocks/core__gallery-with-caption.json
@@ -8,6 +8,7 @@
 			"shortCodeTransforms": [],
 			"caption": "Gallery Caption",
 			"imageCrop": true,
+			"randomOrder": false,
 			"fixedHeight": true,
 			"linkTo": "none",
 			"sizeSlug": "large",
diff --git a/test/integration/fixtures/blocks/core__gallery.json b/test/integration/fixtures/blocks/core__gallery.json
index 8b7a1000d37ccc..27fc4c75dc8dc0 100644
--- a/test/integration/fixtures/blocks/core__gallery.json
+++ b/test/integration/fixtures/blocks/core__gallery.json
@@ -8,6 +8,7 @@
 			"shortCodeTransforms": [],
 			"caption": "",
 			"imageCrop": true,
+			"randomOrder": false,
 			"fixedHeight": true,
 			"linkTo": "none",
 			"sizeSlug": "large",
diff --git a/test/integration/fixtures/blocks/core__gallery__columns.json b/test/integration/fixtures/blocks/core__gallery__columns.json
index d0c40b3d3a9a93..beb97c3ac50802 100644
--- a/test/integration/fixtures/blocks/core__gallery__columns.json
+++ b/test/integration/fixtures/blocks/core__gallery__columns.json
@@ -9,6 +9,7 @@
 			"columns": 1,
 			"caption": "",
 			"imageCrop": true,
+			"randomOrder": false,
 			"fixedHeight": true,
 			"linkTo": "none",
 			"sizeSlug": "large",
diff --git a/test/integration/fixtures/blocks/core__gallery__deprecated-1.json b/test/integration/fixtures/blocks/core__gallery__deprecated-1.json
index 9e15ee7f1c7149..bd6108a97230a3 100644
--- a/test/integration/fixtures/blocks/core__gallery__deprecated-1.json
+++ b/test/integration/fixtures/blocks/core__gallery__deprecated-1.json
@@ -16,6 +16,7 @@
 				"attributes": {
 					"url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
 					"alt": "title",
+					"caption": "",
 					"linkDestination": "none"
 				},
 				"innerBlocks": []
@@ -26,6 +27,7 @@
 				"attributes": {
 					"url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
 					"alt": "title",
+					"caption": "",
 					"linkDestination": "none"
 				},
 				"innerBlocks": []
diff --git a/test/integration/fixtures/blocks/core__gallery__deprecated-7.json b/test/integration/fixtures/blocks/core__gallery__deprecated-7.json
index 4eaf85b46906d6..05a630370f9b09 100644
--- a/test/integration/fixtures/blocks/core__gallery__deprecated-7.json
+++ b/test/integration/fixtures/blocks/core__gallery__deprecated-7.json
@@ -8,6 +8,7 @@
 			"shortCodeTransforms": [],
 			"caption": "",
 			"imageCrop": true,
+			"randomOrder": false,
 			"fixedHeight": true,
 			"linkTo": "media",
 			"sizeSlug": "large",
diff --git a/test/integration/fixtures/blocks/core__image__deprecated-v3-add-align-wrapper.json b/test/integration/fixtures/blocks/core__image__deprecated-v3-add-align-wrapper.json
index bae213510011ac..644f9629ea8d86 100644
--- a/test/integration/fixtures/blocks/core__image__deprecated-v3-add-align-wrapper.json
+++ b/test/integration/fixtures/blocks/core__image__deprecated-v3-add-align-wrapper.json
@@ -7,8 +7,8 @@
 			"url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
 			"alt": "",
 			"caption": "",
-			"width": 100,
-			"height": 100
+			"width": "100px",
+			"height": "100px"
 		},
 		"innerBlocks": []
 	}
diff --git a/test/integration/fixtures/blocks/core__image__deprecated-v3-add-align-wrapper.serialized.html b/test/integration/fixtures/blocks/core__image__deprecated-v3-add-align-wrapper.serialized.html
index c03189e9b456c0..2c0d6f487d57b1 100644
--- a/test/integration/fixtures/blocks/core__image__deprecated-v3-add-align-wrapper.serialized.html
+++ b/test/integration/fixtures/blocks/core__image__deprecated-v3-add-align-wrapper.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:image {"width":100,"height":100,"align":"left"} -->
+<!-- wp:image {"width":"100px","height":"100px","align":"left"} -->
 <figure class="wp-block-image alignleft is-resized"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="" style="width:100px;height:100px"/></figure>
 <!-- /wp:image -->
diff --git a/test/integration/fixtures/blocks/core__image__deprecated-v6-add-style-width-height.json b/test/integration/fixtures/blocks/core__image__deprecated-v6-add-style-width-height.json
index 7f83baa81fc635..1acdf6f92453c8 100644
--- a/test/integration/fixtures/blocks/core__image__deprecated-v6-add-style-width-height.json
+++ b/test/integration/fixtures/blocks/core__image__deprecated-v6-add-style-width-height.json
@@ -7,8 +7,8 @@
 			"url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
 			"alt": "",
 			"caption": "",
-			"width": 164,
-			"height": 164,
+			"width": "164px",
+			"height": "164px",
 			"sizeSlug": "large",
 			"className": "is-style-rounded",
 			"style": {
diff --git a/test/integration/fixtures/blocks/core__image__deprecated-v6-add-style-width-height.serialized.html b/test/integration/fixtures/blocks/core__image__deprecated-v6-add-style-width-height.serialized.html
index 57545968847e1b..5ffd11a5baa8e7 100644
--- a/test/integration/fixtures/blocks/core__image__deprecated-v6-add-style-width-height.serialized.html
+++ b/test/integration/fixtures/blocks/core__image__deprecated-v6-add-style-width-height.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:image {"width":164,"height":164,"sizeSlug":"large","align":"left","className":"is-style-rounded","style":{"border":{"radius":"100%"}}} -->
+<!-- wp:image {"width":"164px","height":"164px","sizeSlug":"large","align":"left","className":"is-style-rounded","style":{"border":{"radius":"100%"}}} -->
 <figure class="wp-block-image alignleft size-large is-resized has-custom-border is-style-rounded"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="" style="border-radius:100%;width:164px;height:164px"/></figure>
 <!-- /wp:image -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html
index fa50fb5db17e7b..ad0919beb9bde4 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:list {"fontFamily":"cambria-georgia"} -->
-<ul class="has-cambria-georgia-font-family"><!-- wp:list-item -->
+<ul class="wp-block-list has-cambria-georgia-font-family"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item -->
 
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html
index 61e33d3dc0e156..39a3efa2eabed8 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html
@@ -1,9 +1,9 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li><strong>Item</strong><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li><strong>Item</strong><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -11,7 +11,7 @@
 
 <!-- wp:list-item -->
 <li><strong>Item</strong><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -19,7 +19,7 @@
 
 <!-- wp:list-item -->
 <li><strong>Item</strong><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html
index c09708d51db0bb..4d74394771fcb5 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Text &amp; Headings</li>
 <!-- /wp:list-item -->
 
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html
index 44c97ca29209cf..6fdf3ad84feeb9 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:list {"ordered":true,"type":"upper-alpha"} -->
-<ol style="list-style-type:upper-alpha"><!-- wp:list-item -->
+<ol style="list-style-type:upper-alpha" class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.html b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.html
new file mode 100644
index 00000000000000..aef6bf669f2c98
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.html
@@ -0,0 +1,3 @@
+<!-- wp:core/list -->
+<ul><li>Text & Headings</li><li>Images & Videos</li><li>Galleries</li><li>Embeds, like YouTube, Tweets, or other WordPress posts.</li><li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li><li>And <em>Lists</em> like this one of course :)</li></ul>
+<!-- /wp:core/list -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.json b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.json
new file mode 100644
index 00000000000000..80cd87e4eb69e8
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.json
@@ -0,0 +1,60 @@
+[
+	{
+		"name": "core/list",
+		"isValid": true,
+		"attributes": {
+			"ordered": false,
+			"values": ""
+		},
+		"innerBlocks": [
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Text &amp; Headings"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Images &amp; Videos"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Galleries"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Embeds, like YouTube, Tweets, or other WordPress posts."
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Layout blocks, like Buttons, Hero Images, Separators, etc."
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "And <em>Lists</em> like this one of course :)"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.parsed.json b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.parsed.json
new file mode 100644
index 00000000000000..427f4c3a975cfd
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.parsed.json
@@ -0,0 +1,11 @@
+[
+	{
+		"blockName": "core/list",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<ul><li>Text & Headings</li><li>Images & Videos</li><li>Galleries</li><li>Embeds, like YouTube, Tweets, or other WordPress posts.</li><li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li><li>And <em>Lists</em> like this one of course :)</li></ul>\n",
+		"innerContent": [
+			"\n<ul><li>Text & Headings</li><li>Images & Videos</li><li>Galleries</li><li>Embeds, like YouTube, Tweets, or other WordPress posts.</li><li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li><li>And <em>Lists</em> like this one of course :)</li></ul>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.serialized.html
new file mode 100644
index 00000000000000..4d74394771fcb5
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.serialized.html
@@ -0,0 +1,25 @@
+<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li>Text &amp; Headings</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Images &amp; Videos</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Galleries</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>And <em>Lists</em> like this one of course :)</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__ul.html b/test/integration/fixtures/blocks/core__list__ul.html
index c09708d51db0bb..4d74394771fcb5 100644
--- a/test/integration/fixtures/blocks/core__list__ul.html
+++ b/test/integration/fixtures/blocks/core__list__ul.html
@@ -1,5 +1,5 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Text &amp; Headings</li>
 <!-- /wp:list-item -->
 
diff --git a/test/integration/fixtures/blocks/core__list__ul.parsed.json b/test/integration/fixtures/blocks/core__list__ul.parsed.json
index 2853bc5558ebe3..4639b007c777b7 100644
--- a/test/integration/fixtures/blocks/core__list__ul.parsed.json
+++ b/test/integration/fixtures/blocks/core__list__ul.parsed.json
@@ -52,9 +52,9 @@
 				]
 			}
 		],
-		"innerHTML": "\n<ul>\n\n\n\n\n\n\n\n\n\n</ul>\n",
+		"innerHTML": "\n<ul class=\"wp-block-list\">\n\n\n\n\n\n\n\n\n\n</ul>\n",
 		"innerContent": [
-			"\n<ul>",
+			"\n<ul class=\"wp-block-list\">",
 			null,
 			"\n\n",
 			null,
diff --git a/test/integration/fixtures/blocks/core__list__ul.serialized.html b/test/integration/fixtures/blocks/core__list__ul.serialized.html
index c09708d51db0bb..4d74394771fcb5 100644
--- a/test/integration/fixtures/blocks/core__list__ul.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__ul.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Text &amp; Headings</li>
 <!-- /wp:list-item -->
 
diff --git a/test/integration/fixtures/blocks/core__media-text.json b/test/integration/fixtures/blocks/core__media-text.json
index fc7601b7073d6a..dd86e7d9dd8dd0 100644
--- a/test/integration/fixtures/blocks/core__media-text.json
+++ b/test/integration/fixtures/blocks/core__media-text.json
@@ -9,7 +9,8 @@
 			"mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
 			"mediaType": "image",
 			"mediaWidth": 50,
-			"isStackedOnMobile": true
+			"isStackedOnMobile": true,
+			"useFeaturedImage": false
 		},
 		"innerBlocks": [
 			{
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v5.serialized.html b/test/integration/fixtures/blocks/core__media-text__deprecated-v5.serialized.html
index 7d7a76c730b273..8c88b8b67795d7 100644
--- a/test/integration/fixtures/blocks/core__media-text__deprecated-v5.serialized.html
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v5.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:media-text {"align":"wide","mediaType":"image","imageFill":true,"focalPoint":{"x":"0.56","y":"0.57"}} -->
-<div class="wp-block-media-text alignwide is-stacked-on-mobile is-image-fill"><figure class="wp-block-media-text__media" style="background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:56% 57%"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="My alt text"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…"} -->
+<div class="wp-block-media-text alignwide is-stacked-on-mobile is-image-fill-element"><figure class="wp-block-media-text__media"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="My alt text" style="object-position:56% 57%"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…"} -->
 <p>My Content</p>
 <!-- /wp:paragraph --></div></div>
 <!-- /wp:media-text -->
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.html b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.html
new file mode 100644
index 00000000000000..22a2a3e18f74f6
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.html
@@ -0,0 +1,13 @@
+<!-- wp:media-text {"mediaType":"image","imageFill":true} -->
+<div class="wp-block-media-text alignwide is-image-fill is-stacked-on-mobile">
+	<figure class="wp-block-media-text__media"
+		style="background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%">
+		<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k="
+			alt="My alt text" /></figure>
+	<div class="wp-block-media-text__content">
+		<!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
+		<p class="has-large-font-size">My Content</p>
+		<!-- /wp:paragraph -->
+	</div>
+</div>
+<!-- /wp:media-text -->
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.json b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.json
new file mode 100644
index 00000000000000..bf195f6fa1c953
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.json
@@ -0,0 +1,29 @@
+[
+	{
+		"name": "core/media-text",
+		"isValid": true,
+		"attributes": {
+			"align": "wide",
+			"mediaAlt": "My alt text",
+			"mediaPosition": "left",
+			"mediaType": "image",
+			"mediaWidth": 50,
+			"isStackedOnMobile": true,
+			"mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+			"imageFill": true
+		},
+		"innerBlocks": [
+			{
+				"name": "core/paragraph",
+				"isValid": true,
+				"attributes": {
+					"content": "My Content",
+					"dropCap": false,
+					"placeholder": "Content…",
+					"fontSize": "large"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.parsed.json b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.parsed.json
new file mode 100644
index 00000000000000..2e878c98a18a89
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.parsed.json
@@ -0,0 +1,29 @@
+[
+	{
+		"blockName": "core/media-text",
+		"attrs": {
+			"mediaType": "image",
+			"imageFill": true
+		},
+		"innerBlocks": [
+			{
+				"blockName": "core/paragraph",
+				"attrs": {
+					"placeholder": "Content…",
+					"fontSize": "large"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t",
+				"innerContent": [
+					"\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t"
+				]
+			}
+		],
+		"innerHTML": "\n<div class=\"wp-block-media-text alignwide is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-media-text alignwide is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t",
+			null,
+			"\n\t</div>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.serialized.html b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.serialized.html
new file mode 100644
index 00000000000000..b9d5e14f90277c
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-no-focal-point-selected.serialized.html
@@ -0,0 +1,5 @@
+<!-- wp:media-text {"align":"wide","mediaType":"image","imageFill":true} -->
+<div class="wp-block-media-text alignwide is-stacked-on-mobile is-image-fill-element"><figure class="wp-block-media-text__media"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="My alt text" style="object-position:50% 50%"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
+<p class="has-large-font-size">My Content</p>
+<!-- /wp:paragraph --></div></div>
+<!-- /wp:media-text -->
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.html b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.html
new file mode 100644
index 00000000000000..47a0f0c126fa70
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.html
@@ -0,0 +1,13 @@
+<!-- wp:media-text {"mediaType":"image","imageFill":true,"focalPoint":{"x":0.84,"y":0.84}} -->
+<div class="wp-block-media-text alignwide is-image-fill is-stacked-on-mobile">
+	<figure class="wp-block-media-text__media"
+		style="background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:84% 84%">
+		<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k="
+			alt="My alt text" /></figure>
+	<div class="wp-block-media-text__content">
+		<!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
+		<p class="has-large-font-size">My Content</p>
+		<!-- /wp:paragraph -->
+	</div>
+</div>
+<!-- /wp:media-text -->
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.json b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.json
new file mode 100644
index 00000000000000..986e049099541f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.json
@@ -0,0 +1,33 @@
+[
+	{
+		"name": "core/media-text",
+		"isValid": true,
+		"attributes": {
+			"align": "wide",
+			"mediaAlt": "My alt text",
+			"mediaPosition": "left",
+			"mediaType": "image",
+			"mediaWidth": 50,
+			"isStackedOnMobile": true,
+			"mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+			"imageFill": true,
+			"focalPoint": {
+				"x": 0.84,
+				"y": 0.84
+			}
+		},
+		"innerBlocks": [
+			{
+				"name": "core/paragraph",
+				"isValid": true,
+				"attributes": {
+					"content": "My Content",
+					"dropCap": false,
+					"placeholder": "Content…",
+					"fontSize": "large"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.parsed.json b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.parsed.json
new file mode 100644
index 00000000000000..175fbad27927b7
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.parsed.json
@@ -0,0 +1,33 @@
+[
+	{
+		"blockName": "core/media-text",
+		"attrs": {
+			"mediaType": "image",
+			"imageFill": true,
+			"focalPoint": {
+				"x": 0.84,
+				"y": 0.84
+			}
+		},
+		"innerBlocks": [
+			{
+				"blockName": "core/paragraph",
+				"attrs": {
+					"placeholder": "Content…",
+					"fontSize": "large"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t",
+				"innerContent": [
+					"\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t"
+				]
+			}
+		],
+		"innerHTML": "\n<div class=\"wp-block-media-text alignwide is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:84% 84%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-media-text alignwide is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:84% 84%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t",
+			null,
+			"\n\t</div>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.serialized.html b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.serialized.html
new file mode 100644
index 00000000000000..4b001f4f27c8ad
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7-image-fill-with-focal-point-selected.serialized.html
@@ -0,0 +1,5 @@
+<!-- wp:media-text {"align":"wide","mediaType":"image","imageFill":true,"focalPoint":{"x":0.84,"y":0.84}} -->
+<div class="wp-block-media-text alignwide is-stacked-on-mobile is-image-fill-element"><figure class="wp-block-media-text__media"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="My alt text" style="object-position:84% 84%"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
+<p class="has-large-font-size">My Content</p>
+<!-- /wp:paragraph --></div></div>
+<!-- /wp:media-text -->
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7.html b/test/integration/fixtures/blocks/core__media-text__deprecated-v7.html
new file mode 100644
index 00000000000000..92b4b4d2754133
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7.html
@@ -0,0 +1,13 @@
+<!-- wp:media-text {"mediaType":"image","imageFill":true} -->
+<div class="wp-block-media-text is-image-fill is-stacked-on-mobile">
+	<figure class="wp-block-media-text__media"
+		style="background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%">
+		<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k="
+			alt="My alt text" /></figure>
+	<div class="wp-block-media-text__content">
+		<!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
+		<p class="has-large-font-size">My Content</p>
+		<!-- /wp:paragraph -->
+	</div>
+</div>
+<!-- /wp:media-text -->
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7.json b/test/integration/fixtures/blocks/core__media-text__deprecated-v7.json
new file mode 100644
index 00000000000000..a6f0dff927874d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7.json
@@ -0,0 +1,30 @@
+[
+	{
+		"name": "core/media-text",
+		"isValid": true,
+		"attributes": {
+			"align": "none",
+			"mediaAlt": "My alt text",
+			"mediaPosition": "left",
+			"mediaType": "image",
+			"mediaWidth": 50,
+			"isStackedOnMobile": true,
+			"mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+			"imageFill": true,
+			"useFeaturedImage": false
+		},
+		"innerBlocks": [
+			{
+				"name": "core/paragraph",
+				"isValid": true,
+				"attributes": {
+					"content": "My Content",
+					"dropCap": false,
+					"placeholder": "Content…",
+					"fontSize": "large"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7.parsed.json b/test/integration/fixtures/blocks/core__media-text__deprecated-v7.parsed.json
new file mode 100644
index 00000000000000..49b392d4231384
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7.parsed.json
@@ -0,0 +1,29 @@
+[
+	{
+		"blockName": "core/media-text",
+		"attrs": {
+			"mediaType": "image",
+			"imageFill": true
+		},
+		"innerBlocks": [
+			{
+				"blockName": "core/paragraph",
+				"attrs": {
+					"placeholder": "Content…",
+					"fontSize": "large"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t",
+				"innerContent": [
+					"\n\t\t<p class=\"has-large-font-size\">My Content</p>\n\t\t"
+				]
+			}
+		],
+		"innerHTML": "\n<div class=\"wp-block-media-text is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-media-text is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t",
+			null,
+			"\n\t</div>\n</div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__media-text__deprecated-v7.serialized.html b/test/integration/fixtures/blocks/core__media-text__deprecated-v7.serialized.html
new file mode 100644
index 00000000000000..b44ebe1c4ee896
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__media-text__deprecated-v7.serialized.html
@@ -0,0 +1,5 @@
+<!-- wp:media-text {"mediaType":"image","imageFill":true} -->
+<div class="wp-block-media-text is-stacked-on-mobile is-image-fill-element"><figure class="wp-block-media-text__media"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="My alt text" style="object-position:50% 50%"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
+<p class="has-large-font-size">My Content</p>
+<!-- /wp:paragraph --></div></div>
+<!-- /wp:media-text -->
diff --git a/test/integration/fixtures/blocks/core__media-text__image-alt-no-align.json b/test/integration/fixtures/blocks/core__media-text__image-alt-no-align.json
index 3dc31821fc3720..e8a9ad70ae0132 100644
--- a/test/integration/fixtures/blocks/core__media-text__image-alt-no-align.json
+++ b/test/integration/fixtures/blocks/core__media-text__image-alt-no-align.json
@@ -9,7 +9,8 @@
 			"mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
 			"mediaType": "image",
 			"mediaWidth": 50,
-			"isStackedOnMobile": true
+			"isStackedOnMobile": true,
+			"useFeaturedImage": false
 		},
 		"innerBlocks": [
 			{
diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.html b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.html
index 22a2a3e18f74f6..30667e0dd24dc5 100644
--- a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.html
+++ b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.html
@@ -1,9 +1,8 @@
-<!-- wp:media-text {"mediaType":"image","imageFill":true} -->
-<div class="wp-block-media-text alignwide is-image-fill is-stacked-on-mobile">
-	<figure class="wp-block-media-text__media"
-		style="background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%">
+<!-- wp:media-text {"align":"wide","mediaType":"image","imageFill":true} -->
+<div class="wp-block-media-text alignwide is-image-fill-element is-stacked-on-mobile">
+	<figure class="wp-block-media-text__media">
 		<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k="
-			alt="My alt text" /></figure>
+			alt="My alt text" style="object-position:50% 50%"/></figure>
 	<div class="wp-block-media-text__content">
 		<!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
 		<p class="has-large-font-size">My Content</p>
diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.json b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.json
index bf195f6fa1c953..bb57f08ad5cfa7 100644
--- a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.json
+++ b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.json
@@ -6,11 +6,12 @@
 			"align": "wide",
 			"mediaAlt": "My alt text",
 			"mediaPosition": "left",
+			"mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
 			"mediaType": "image",
 			"mediaWidth": 50,
 			"isStackedOnMobile": true,
-			"mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
-			"imageFill": true
+			"imageFill": true,
+			"useFeaturedImage": false
 		},
 		"innerBlocks": [
 			{
diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.parsed.json b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.parsed.json
index 2e878c98a18a89..674b3724af8e88 100644
--- a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.parsed.json
+++ b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.parsed.json
@@ -2,6 +2,7 @@
 	{
 		"blockName": "core/media-text",
 		"attrs": {
+			"align": "wide",
 			"mediaType": "image",
 			"imageFill": true
 		},
@@ -19,9 +20,9 @@
 				]
 			}
 		],
-		"innerHTML": "\n<div class=\"wp-block-media-text alignwide is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>\n",
+		"innerHTML": "\n<div class=\"wp-block-media-text alignwide is-image-fill-element is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" style=\"object-position:50% 50%\"/></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>\n",
 		"innerContent": [
-			"\n<div class=\"wp-block-media-text alignwide is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t",
+			"\n<div class=\"wp-block-media-text alignwide is-image-fill-element is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" style=\"object-position:50% 50%\"/></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t",
 			null,
 			"\n\t</div>\n</div>\n"
 		]
diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.serialized.html b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.serialized.html
index 40382e884f618e..b9d5e14f90277c 100644
--- a/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.serialized.html
+++ b/test/integration/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:media-text {"align":"wide","mediaType":"image","imageFill":true} -->
-<div class="wp-block-media-text alignwide is-stacked-on-mobile is-image-fill"><figure class="wp-block-media-text__media" style="background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:50% 50%"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="My alt text"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
+<div class="wp-block-media-text alignwide is-stacked-on-mobile is-image-fill-element"><figure class="wp-block-media-text__media"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="My alt text" style="object-position:50% 50%"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
 <p class="has-large-font-size">My Content</p>
 <!-- /wp:paragraph --></div></div>
 <!-- /wp:media-text -->
diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.html b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.html
index 47a0f0c126fa70..60e2cc7be572d4 100644
--- a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.html
+++ b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.html
@@ -1,9 +1,8 @@
-<!-- wp:media-text {"mediaType":"image","imageFill":true,"focalPoint":{"x":0.84,"y":0.84}} -->
-<div class="wp-block-media-text alignwide is-image-fill is-stacked-on-mobile">
-	<figure class="wp-block-media-text__media"
-		style="background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:84% 84%">
+<!-- wp:media-text {"align":"wide","mediaType":"image","imageFill":true,"focalPoint":{"x":0.84,"y":0.84}} -->
+<div class="wp-block-media-text alignwide is-image-fill-element is-stacked-on-mobile">
+	<figure class="wp-block-media-text__media">
 		<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k="
-			alt="My alt text" /></figure>
+			alt="My alt text" style="object-position:84% 84%" /></figure>
 	<div class="wp-block-media-text__content">
 		<!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
 		<p class="has-large-font-size">My Content</p>
diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.json b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.json
index 986e049099541f..0de71c867457ef 100644
--- a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.json
+++ b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.json
@@ -6,15 +6,16 @@
 			"align": "wide",
 			"mediaAlt": "My alt text",
 			"mediaPosition": "left",
+			"mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
 			"mediaType": "image",
 			"mediaWidth": 50,
 			"isStackedOnMobile": true,
-			"mediaUrl": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
 			"imageFill": true,
 			"focalPoint": {
 				"x": 0.84,
 				"y": 0.84
-			}
+			},
+			"useFeaturedImage": false
 		},
 		"innerBlocks": [
 			{
diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.parsed.json b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.parsed.json
index 175fbad27927b7..92bd57443a1c34 100644
--- a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.parsed.json
+++ b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.parsed.json
@@ -2,6 +2,7 @@
 	{
 		"blockName": "core/media-text",
 		"attrs": {
+			"align": "wide",
 			"mediaType": "image",
 			"imageFill": true,
 			"focalPoint": {
@@ -23,9 +24,9 @@
 				]
 			}
 		],
-		"innerHTML": "\n<div class=\"wp-block-media-text alignwide is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:84% 84%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>\n",
+		"innerHTML": "\n<div class=\"wp-block-media-text alignwide is-image-fill-element is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" style=\"object-position:84% 84%\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t\n\t</div>\n</div>\n",
 		"innerContent": [
-			"\n<div class=\"wp-block-media-text alignwide is-image-fill is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\"\n\t\tstyle=\"background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:84% 84%\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t",
+			"\n<div class=\"wp-block-media-text alignwide is-image-fill-element is-stacked-on-mobile\">\n\t<figure class=\"wp-block-media-text__media\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\"\n\t\t\talt=\"My alt text\" style=\"object-position:84% 84%\" /></figure>\n\t<div class=\"wp-block-media-text__content\">\n\t\t",
 			null,
 			"\n\t</div>\n</div>\n"
 		]
diff --git a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.serialized.html b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.serialized.html
index 9445d0ad259b22..4b001f4f27c8ad 100644
--- a/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.serialized.html
+++ b/test/integration/fixtures/blocks/core__media-text__image-fill-with-focal-point-selected.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:media-text {"align":"wide","mediaType":"image","imageFill":true,"focalPoint":{"x":0.84,"y":0.84}} -->
-<div class="wp-block-media-text alignwide is-stacked-on-mobile is-image-fill"><figure class="wp-block-media-text__media" style="background-image:url(data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=);background-position:84% 84%"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="My alt text"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
+<div class="wp-block-media-text alignwide is-stacked-on-mobile is-image-fill-element"><figure class="wp-block-media-text__media"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="My alt text" style="object-position:84% 84%"/></figure><div class="wp-block-media-text__content"><!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
 <p class="has-large-font-size">My Content</p>
 <!-- /wp:paragraph --></div></div>
 <!-- /wp:media-text -->
diff --git a/test/integration/fixtures/blocks/core__more.json b/test/integration/fixtures/blocks/core__more.json
index 29ec11579a2d96..f9f34aecd1f202 100644
--- a/test/integration/fixtures/blocks/core__more.json
+++ b/test/integration/fixtures/blocks/core__more.json
@@ -3,6 +3,7 @@
 		"name": "core/more",
 		"isValid": true,
 		"attributes": {
+			"customText": "",
 			"noTeaser": false
 		},
 		"innerBlocks": []
diff --git a/test/integration/fixtures/blocks/core__post-featured-image.json b/test/integration/fixtures/blocks/core__post-featured-image.json
index 158007533a3f2b..dec6e14712a3a2 100644
--- a/test/integration/fixtures/blocks/core__post-featured-image.json
+++ b/test/integration/fixtures/blocks/core__post-featured-image.json
@@ -7,7 +7,8 @@
 			"scale": "cover",
 			"rel": "",
 			"linkTarget": "_self",
-			"dimRatio": 0
+			"dimRatio": 0,
+			"useFirstImageFromPost": false
 		},
 		"innerBlocks": []
 	}
diff --git a/test/integration/fixtures/blocks/core__post-navigation-link.json b/test/integration/fixtures/blocks/core__post-navigation-link.json
index 9689f956f11509..b226c04855e359 100644
--- a/test/integration/fixtures/blocks/core__post-navigation-link.json
+++ b/test/integration/fixtures/blocks/core__post-navigation-link.json
@@ -6,7 +6,8 @@
 			"type": "next",
 			"showTitle": false,
 			"linkLabel": false,
-			"arrow": "none"
+			"arrow": "none",
+			"taxonomy": ""
 		},
 		"innerBlocks": []
 	}
diff --git a/test/integration/fixtures/blocks/core__query.json b/test/integration/fixtures/blocks/core__query.json
index b050aaa2b5b1fd..a5ee4523128df8 100644
--- a/test/integration/fixtures/blocks/core__query.json
+++ b/test/integration/fixtures/blocks/core__query.json
@@ -16,7 +16,8 @@
 				"sticky": "",
 				"inherit": true,
 				"taxQuery": null,
-				"parents": []
+				"parents": [],
+				"format": []
 			},
 			"tagName": "div",
 			"enhancedPagination": false
diff --git a/test/integration/fixtures/blocks/core__quote__deprecated-2.json b/test/integration/fixtures/blocks/core__quote__deprecated-2.json
index 2599674eeec7fe..2af2f38fa9e937 100644
--- a/test/integration/fixtures/blocks/core__quote__deprecated-2.json
+++ b/test/integration/fixtures/blocks/core__quote__deprecated-2.json
@@ -4,7 +4,7 @@
 		"isValid": true,
 		"attributes": {
 			"citation": "...with a caption",
-			"align": "right"
+			"textAlign": "right"
 		},
 		"innerBlocks": [
 			{
diff --git a/test/integration/fixtures/blocks/core__quote__deprecated-2.serialized.html b/test/integration/fixtures/blocks/core__quote__deprecated-2.serialized.html
index 024531d165d7e8..3d135fffad4374 100644
--- a/test/integration/fixtures/blocks/core__quote__deprecated-2.serialized.html
+++ b/test/integration/fixtures/blocks/core__quote__deprecated-2.serialized.html
@@ -1,4 +1,4 @@
-<!-- wp:quote {"align":"right"} -->
+<!-- wp:quote {"textAlign":"right"} -->
 <blockquote class="wp-block-quote has-text-align-right"><!-- wp:paragraph -->
 <p>Testing deprecated quote block...</p>
 <!-- /wp:paragraph --><cite>...with a caption</cite></blockquote>
diff --git a/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.html b/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.html
new file mode 100644
index 00000000000000..218b75debb682d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.html
@@ -0,0 +1,5 @@
+<!-- wp:quote {"align":"right"} -->
+<blockquote class="wp-block-quote has-text-align-right"><!-- wp:paragraph -->
+<p>Quote with the align attribute. Example: {"align":"right"}</p>
+<!-- /wp:paragraph --></blockquote>
+<!-- /wp:quote -->
diff --git a/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.json b/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.json
new file mode 100644
index 00000000000000..c5b6d35aa427fc
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.json
@@ -0,0 +1,22 @@
+[
+	{
+		"name": "core/quote",
+		"isValid": true,
+		"attributes": {
+			"value": "",
+			"citation": "",
+			"textAlign": "right"
+		},
+		"innerBlocks": [
+			{
+				"name": "core/paragraph",
+				"isValid": true,
+				"attributes": {
+					"content": "Quote with the align attribute. Example: {\"align\":\"right\"}",
+					"dropCap": false
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.parsed.json b/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.parsed.json
new file mode 100644
index 00000000000000..e7dddc8ecbb604
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.parsed.json
@@ -0,0 +1,25 @@
+[
+	{
+		"blockName": "core/quote",
+		"attrs": {
+			"align": "right"
+		},
+		"innerBlocks": [
+			{
+				"blockName": "core/paragraph",
+				"attrs": {},
+				"innerBlocks": [],
+				"innerHTML": "\n<p>Quote with the align attribute. Example: {\"align\":\"right\"}</p>\n",
+				"innerContent": [
+					"\n<p>Quote with the align attribute. Example: {\"align\":\"right\"}</p>\n"
+				]
+			}
+		],
+		"innerHTML": "\n<blockquote class=\"wp-block-quote has-text-align-right\"></blockquote>\n",
+		"innerContent": [
+			"\n<blockquote class=\"wp-block-quote has-text-align-right\">",
+			null,
+			"</blockquote>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.serialized.html b/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.serialized.html
new file mode 100644
index 00000000000000..dfad3d54b991e4
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__quote__deprecated-4-align-attribute.serialized.html
@@ -0,0 +1,5 @@
+<!-- wp:quote {"textAlign":"right"} -->
+<blockquote class="wp-block-quote has-text-align-right"><!-- wp:paragraph -->
+<p>Quote with the align attribute. Example: {"align":"right"}</p>
+<!-- /wp:paragraph --></blockquote>
+<!-- /wp:quote -->
diff --git a/test/integration/fixtures/blocks/core__search.json b/test/integration/fixtures/blocks/core__search.json
index f692eac10993d8..ec961ed41b0244 100644
--- a/test/integration/fixtures/blocks/core__search.json
+++ b/test/integration/fixtures/blocks/core__search.json
@@ -8,7 +8,6 @@
 			"buttonPosition": "button-outside",
 			"buttonUseIcon": false,
 			"query": {},
-			"buttonBehavior": "expand-searchfield",
 			"isSearchFieldHidden": false
 		},
 		"innerBlocks": []
diff --git a/test/integration/fixtures/blocks/core__search__custom-text.json b/test/integration/fixtures/blocks/core__search__custom-text.json
index c763cb60f65e86..3738816762ba1e 100644
--- a/test/integration/fixtures/blocks/core__search__custom-text.json
+++ b/test/integration/fixtures/blocks/core__search__custom-text.json
@@ -10,7 +10,6 @@
 			"buttonPosition": "button-outside",
 			"buttonUseIcon": false,
 			"query": {},
-			"buttonBehavior": "expand-searchfield",
 			"isSearchFieldHidden": false
 		},
 		"innerBlocks": []
diff --git a/test/integration/fixtures/blocks/core__site-tagline.json b/test/integration/fixtures/blocks/core__site-tagline.json
index 7e15e1e8bb75cd..fe837d41df43bf 100644
--- a/test/integration/fixtures/blocks/core__site-tagline.json
+++ b/test/integration/fixtures/blocks/core__site-tagline.json
@@ -2,7 +2,10 @@
 	{
 		"name": "core/site-tagline",
 		"isValid": true,
-		"attributes": {},
+		"attributes": {
+			"level": 0,
+			"levelOptions": [ 0, 1, 2, 3, 4, 5, 6 ]
+		},
 		"innerBlocks": []
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__site-title.json b/test/integration/fixtures/blocks/core__site-title.json
index 12f32615473cc8..8ca7091f30d5e7 100644
--- a/test/integration/fixtures/blocks/core__site-title.json
+++ b/test/integration/fixtures/blocks/core__site-title.json
@@ -4,6 +4,7 @@
 		"isValid": true,
 		"attributes": {
 			"level": 1,
+			"levelOptions": [ 0, 1, 2, 3, 4, 5, 6 ],
 			"isLink": true,
 			"linkTarget": "_self"
 		},
diff --git a/test/integration/fixtures/blocks/core__social-link-bluesky.html b/test/integration/fixtures/blocks/core__social-link-bluesky.html
new file mode 100644
index 00000000000000..b210fb03361e79
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__social-link-bluesky.html
@@ -0,0 +1 @@
+<!-- wp:social-link-bluesky {"url":"https://example.com/"} /-->
diff --git a/test/integration/fixtures/blocks/core__social-link-bluesky.json b/test/integration/fixtures/blocks/core__social-link-bluesky.json
new file mode 100644
index 00000000000000..47276685491b8f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__social-link-bluesky.json
@@ -0,0 +1,11 @@
+[
+	{
+		"name": "core/social-link",
+		"isValid": true,
+		"attributes": {
+			"url": "https://example.com/",
+			"service": "bluesky"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__social-link-bluesky.parsed.json b/test/integration/fixtures/blocks/core__social-link-bluesky.parsed.json
new file mode 100644
index 00000000000000..5f51994005b45c
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__social-link-bluesky.parsed.json
@@ -0,0 +1,11 @@
+[
+	{
+		"blockName": "core/social-link-bluesky",
+		"attrs": {
+			"url": "https://example.com/"
+		},
+		"innerBlocks": [],
+		"innerHTML": "",
+		"innerContent": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__social-link-bluesky.serialized.html b/test/integration/fixtures/blocks/core__social-link-bluesky.serialized.html
new file mode 100644
index 00000000000000..954f0eb1f101e7
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__social-link-bluesky.serialized.html
@@ -0,0 +1 @@
+<!-- wp:social-link {"url":"https://example.com/","service":"bluesky"} /-->
diff --git a/test/integration/fixtures/blocks/core__social-link-patreon.html b/test/integration/fixtures/blocks/core__social-link-patreon.html
new file mode 100644
index 00000000000000..e1880adaf1f599
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__social-link-patreon.html
@@ -0,0 +1 @@
+<!-- wp:social-link-patreon {"url":"https://example.com/"} /-->
diff --git a/test/integration/fixtures/blocks/core__social-link-patreon.json b/test/integration/fixtures/blocks/core__social-link-patreon.json
new file mode 100644
index 00000000000000..935f138ac9f09a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__social-link-patreon.json
@@ -0,0 +1,11 @@
+[
+	{
+		"name": "core/social-link",
+		"isValid": true,
+		"attributes": {
+			"url": "https://example.com/",
+			"service": "patreon"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__social-link-patreon.parsed.json b/test/integration/fixtures/blocks/core__social-link-patreon.parsed.json
new file mode 100644
index 00000000000000..069bdad26ca109
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__social-link-patreon.parsed.json
@@ -0,0 +1,11 @@
+[
+	{
+		"blockName": "core/social-link-patreon",
+		"attrs": {
+			"url": "https://example.com/"
+		},
+		"innerBlocks": [],
+		"innerHTML": "",
+		"innerContent": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__social-link-patreon.serialized.html b/test/integration/fixtures/blocks/core__social-link-patreon.serialized.html
new file mode 100644
index 00000000000000..831e1926b4f64a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__social-link-patreon.serialized.html
@@ -0,0 +1 @@
+<!-- wp:social-link {"url":"https://example.com/","service":"patreon"} /-->
diff --git a/test/integration/fixtures/blocks/core__table.html b/test/integration/fixtures/blocks/core__table.html
index 7cc12a4efb3b5b..3ea74325cfb8c1 100644
--- a/test/integration/fixtures/blocks/core__table.html
+++ b/test/integration/fixtures/blocks/core__table.html
@@ -1,3 +1,3 @@
 <!-- wp:core/table -->
-<figure class="wp-block-table"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>
 <!-- /wp:core/table -->
diff --git a/test/integration/fixtures/blocks/core__table.json b/test/integration/fixtures/blocks/core__table.json
index a694b52a94c390..015e57d8a45d7d 100644
--- a/test/integration/fixtures/blocks/core__table.json
+++ b/test/integration/fixtures/blocks/core__table.json
@@ -3,7 +3,7 @@
 		"name": "core/table",
 		"isValid": true,
 		"attributes": {
-			"hasFixedLayout": false,
+			"hasFixedLayout": true,
 			"caption": "",
 			"head": [
 				{
diff --git a/test/integration/fixtures/blocks/core__table.parsed.json b/test/integration/fixtures/blocks/core__table.parsed.json
index 7bf372efab4c0a..c93936d8343ba9 100644
--- a/test/integration/fixtures/blocks/core__table.parsed.json
+++ b/test/integration/fixtures/blocks/core__table.parsed.json
@@ -3,9 +3,9 @@
 		"blockName": "core/table",
 		"attrs": {},
 		"innerBlocks": [],
-		"innerHTML": "\n<figure class=\"wp-block-table\"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>\n",
+		"innerHTML": "\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>\n",
 		"innerContent": [
-			"\n<figure class=\"wp-block-table\"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>\n"
+			"\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>\n"
 		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__table.serialized.html b/test/integration/fixtures/blocks/core__table.serialized.html
index 95fc72534da7db..0a8200ad804bda 100644
--- a/test/integration/fixtures/blocks/core__table.serialized.html
+++ b/test/integration/fixtures/blocks/core__table.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/blocks/core__table__caption.html b/test/integration/fixtures/blocks/core__table__caption.html
index 110d0695e5a937..26bf3950799d99 100644
--- a/test/integration/fixtures/blocks/core__table__caption.html
+++ b/test/integration/fixtures/blocks/core__table__caption.html
@@ -1,3 +1,3 @@
 <!-- wp:core/table -->
-<figure class="wp-block-table"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class="wp-element-caption">A table for testing</figcaption></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class="wp-element-caption">A table for testing</figcaption></figure>
 <!-- /wp:core/table -->
diff --git a/test/integration/fixtures/blocks/core__table__caption.json b/test/integration/fixtures/blocks/core__table__caption.json
index 4f500a7691fa8a..ca284f20bdfa74 100644
--- a/test/integration/fixtures/blocks/core__table__caption.json
+++ b/test/integration/fixtures/blocks/core__table__caption.json
@@ -3,7 +3,7 @@
 		"name": "core/table",
 		"isValid": true,
 		"attributes": {
-			"hasFixedLayout": false,
+			"hasFixedLayout": true,
 			"caption": "A table for testing",
 			"head": [
 				{
diff --git a/test/integration/fixtures/blocks/core__table__caption.parsed.json b/test/integration/fixtures/blocks/core__table__caption.parsed.json
index 531c2d7e605c6f..bd6f605085e6f1 100644
--- a/test/integration/fixtures/blocks/core__table__caption.parsed.json
+++ b/test/integration/fixtures/blocks/core__table__caption.parsed.json
@@ -3,9 +3,9 @@
 		"blockName": "core/table",
 		"attrs": {},
 		"innerBlocks": [],
-		"innerHTML": "\n<figure class=\"wp-block-table\"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class=\"wp-element-caption\">A table for testing</figcaption></figure>\n",
+		"innerHTML": "\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class=\"wp-element-caption\">A table for testing</figcaption></figure>\n",
 		"innerContent": [
-			"\n<figure class=\"wp-block-table\"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class=\"wp-element-caption\">A table for testing</figcaption></figure>\n"
+			"\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class=\"wp-element-caption\">A table for testing</figcaption></figure>\n"
 		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__table__caption.serialized.html b/test/integration/fixtures/blocks/core__table__caption.serialized.html
index 66246c83295a9e..3cff780e78c3a6 100644
--- a/test/integration/fixtures/blocks/core__table__caption.serialized.html
+++ b/test/integration/fixtures/blocks/core__table__caption.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class="wp-element-caption">A table for testing</figcaption></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class="wp-element-caption">A table for testing</figcaption></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/blocks/core__table__deprecated-1.serialized.html b/test/integration/fixtures/blocks/core__table__deprecated-1.serialized.html
index 061aa7a2248b10..3f72ff591d56e7 100644
--- a/test/integration/fixtures/blocks/core__table__deprecated-1.serialized.html
+++ b/test/integration/fixtures/blocks/core__table__deprecated-1.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:table {"backgroundColor":"subtle-pale-blue"} -->
+<!-- wp:table {"hasFixedLayout":false,"backgroundColor":"subtle-pale-blue"} -->
 <figure class="wp-block-table"><table class="has-subtle-pale-blue-background-color has-background"><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class="wp-element-caption">Table Caption</figcaption></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/blocks/core__table__deprecated-2.serialized.html b/test/integration/fixtures/blocks/core__table__deprecated-2.serialized.html
index 95fc72534da7db..2ee8e6d7345433 100644
--- a/test/integration/fixtures/blocks/core__table__deprecated-2.serialized.html
+++ b/test/integration/fixtures/blocks/core__table__deprecated-2.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:table -->
+<!-- wp:table {"hasFixedLayout":false} -->
 <figure class="wp-block-table"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/blocks/core__table__deprecated-3.serialized.html b/test/integration/fixtures/blocks/core__table__deprecated-3.serialized.html
index 66246c83295a9e..3f2f2b362e378c 100644
--- a/test/integration/fixtures/blocks/core__table__deprecated-3.serialized.html
+++ b/test/integration/fixtures/blocks/core__table__deprecated-3.serialized.html
@@ -1,3 +1,3 @@
-<!-- wp:table -->
+<!-- wp:table {"hasFixedLayout":false} -->
 <figure class="wp-block-table"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class="wp-element-caption">A table for testing</figcaption></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/blocks/core__table__deprecated-4.html b/test/integration/fixtures/blocks/core__table__deprecated-4.html
new file mode 100644
index 00000000000000..a22436c55bdb1f
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__table__deprecated-4.html
@@ -0,0 +1,3 @@
+<!-- wp:core/table -->
+<figure class="wp-block-table"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption>A table for testing</figcaption></figure>
+<!-- /wp:core/table -->
diff --git a/test/integration/fixtures/blocks/core__table__deprecated-4.json b/test/integration/fixtures/blocks/core__table__deprecated-4.json
new file mode 100644
index 00000000000000..4f500a7691fa8a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__table__deprecated-4.json
@@ -0,0 +1,144 @@
+[
+	{
+		"name": "core/table",
+		"isValid": true,
+		"attributes": {
+			"hasFixedLayout": false,
+			"caption": "A table for testing",
+			"head": [
+				{
+					"cells": [
+						{
+							"content": "Version",
+							"tag": "th"
+						},
+						{
+							"content": "Musician",
+							"tag": "th"
+						},
+						{
+							"content": "Date",
+							"tag": "th"
+						}
+					]
+				}
+			],
+			"body": [
+				{
+					"cells": [
+						{
+							"content": "<a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a>",
+							"tag": "td"
+						},
+						{
+							"content": "No musician chosen.",
+							"tag": "td"
+						},
+						{
+							"content": "May 27, 2003",
+							"tag": "td"
+						}
+					]
+				},
+				{
+					"cells": [
+						{
+							"content": "<a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a>",
+							"tag": "td"
+						},
+						{
+							"content": "Miles Davis",
+							"tag": "td"
+						},
+						{
+							"content": "January 3, 2004",
+							"tag": "td"
+						}
+					]
+				},
+				{
+					"cells": [
+						{
+							"content": "Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a>",
+							"tag": "td"
+						},
+						{
+							"content": "…",
+							"tag": "td"
+						},
+						{
+							"content": "…",
+							"tag": "td"
+						}
+					]
+				},
+				{
+					"cells": [
+						{
+							"content": "<a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a>",
+							"tag": "td"
+						},
+						{
+							"content": "Clifford Brown",
+							"tag": "td"
+						},
+						{
+							"content": "December 8, 2015",
+							"tag": "td"
+						}
+					]
+				},
+				{
+					"cells": [
+						{
+							"content": "<a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a>",
+							"tag": "td"
+						},
+						{
+							"content": "Coleman Hawkins",
+							"tag": "td"
+						},
+						{
+							"content": "April 12, 2016",
+							"tag": "td"
+						}
+					]
+				},
+				{
+					"cells": [
+						{
+							"content": "<a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a>",
+							"tag": "td"
+						},
+						{
+							"content": "Pepper Adams",
+							"tag": "td"
+						},
+						{
+							"content": "August 16, 2016",
+							"tag": "td"
+						}
+					]
+				},
+				{
+					"cells": [
+						{
+							"content": "<a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a>",
+							"tag": "td"
+						},
+						{
+							"content": "Sarah Vaughan",
+							"tag": "td"
+						},
+						{
+							"content": "December 6, 2016",
+							"tag": "td"
+						}
+					]
+				}
+			],
+			"foot": []
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__table__deprecated-4.parsed.json b/test/integration/fixtures/blocks/core__table__deprecated-4.parsed.json
new file mode 100644
index 00000000000000..030ced272fcab6
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__table__deprecated-4.parsed.json
@@ -0,0 +1,11 @@
+[
+	{
+		"blockName": "core/table",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<figure class=\"wp-block-table\"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption>A table for testing</figcaption></figure>\n",
+		"innerContent": [
+			"\n<figure class=\"wp-block-table\"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption>A table for testing</figcaption></figure>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__table__deprecated-4.serialized.html b/test/integration/fixtures/blocks/core__table__deprecated-4.serialized.html
new file mode 100644
index 00000000000000..3f2f2b362e378c
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__table__deprecated-4.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:table {"hasFixedLayout":false} -->
+<figure class="wp-block-table"><table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table><figcaption class="wp-element-caption">A table for testing</figcaption></figure>
+<!-- /wp:table -->
diff --git a/test/integration/fixtures/blocks/core__table__scope-attribute.html b/test/integration/fixtures/blocks/core__table__scope-attribute.html
index dfe5cdd5c26168..65f558aa5c08a1 100644
--- a/test/integration/fixtures/blocks/core__table__scope-attribute.html
+++ b/test/integration/fixtures/blocks/core__table__scope-attribute.html
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><thead><tr><th scope="col">Version</th><th scope="col">Musician</th><th scope="col">Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th scope="col">Version</th><th scope="col">Musician</th><th scope="col">Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/blocks/core__table__scope-attribute.json b/test/integration/fixtures/blocks/core__table__scope-attribute.json
index 0b6f1634893813..5cdf1d0ddd2fcb 100644
--- a/test/integration/fixtures/blocks/core__table__scope-attribute.json
+++ b/test/integration/fixtures/blocks/core__table__scope-attribute.json
@@ -3,7 +3,7 @@
 		"name": "core/table",
 		"isValid": true,
 		"attributes": {
-			"hasFixedLayout": false,
+			"hasFixedLayout": true,
 			"caption": "",
 			"head": [
 				{
diff --git a/test/integration/fixtures/blocks/core__table__scope-attribute.parsed.json b/test/integration/fixtures/blocks/core__table__scope-attribute.parsed.json
index 42844cfdf62c6f..ec184dfefdf966 100644
--- a/test/integration/fixtures/blocks/core__table__scope-attribute.parsed.json
+++ b/test/integration/fixtures/blocks/core__table__scope-attribute.parsed.json
@@ -3,9 +3,9 @@
 		"blockName": "core/table",
 		"attrs": {},
 		"innerBlocks": [],
-		"innerHTML": "\n<figure class=\"wp-block-table\"><table><thead><tr><th scope=\"col\">Version</th><th scope=\"col\">Musician</th><th scope=\"col\">Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>\n",
+		"innerHTML": "\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th scope=\"col\">Version</th><th scope=\"col\">Musician</th><th scope=\"col\">Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>\n",
 		"innerContent": [
-			"\n<figure class=\"wp-block-table\"><table><thead><tr><th scope=\"col\">Version</th><th scope=\"col\">Musician</th><th scope=\"col\">Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>\n"
+			"\n<figure class=\"wp-block-table\"><table class=\"has-fixed-layout\"><thead><tr><th scope=\"col\">Version</th><th scope=\"col\">Musician</th><th scope=\"col\">Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>\n"
 		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__table__scope-attribute.serialized.html b/test/integration/fixtures/blocks/core__table__scope-attribute.serialized.html
index dfe5cdd5c26168..65f558aa5c08a1 100644
--- a/test/integration/fixtures/blocks/core__table__scope-attribute.serialized.html
+++ b/test/integration/fixtures/blocks/core__table__scope-attribute.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><thead><tr><th scope="col">Version</th><th scope="col">Musician</th><th scope="col">Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th scope="col">Version</th><th scope="col">Musician</th><th scope="col">Date</th></tr></thead><tbody><tr><td><a href="https://wordpress.org/news/2003/05/wordpress-now-available/">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href="https://wordpress.org/news/2004/01/wordpress-10/">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href="https://codex.wordpress.org/WordPress_Versions">the full list</a></td><td>…</td><td>…</td></tr><tr><td><a href="https://wordpress.org/news/2015/12/clifford/">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href="https://wordpress.org/news/2016/04/coleman/">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/08/pepper/">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href="https://wordpress.org/news/2016/12/vaughan/">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/documents/apple-out.html b/test/integration/fixtures/documents/apple-out.html
index d873c942ea9ce1..d6112309af9f03 100644
--- a/test/integration/fixtures/documents/apple-out.html
+++ b/test/integration/fixtures/documents/apple-out.html
@@ -11,13 +11,13 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -29,7 +29,7 @@
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>One</li>
 <!-- /wp:list-item -->
 
@@ -43,7 +43,7 @@
 <!-- /wp:list -->
 
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
 <!-- /wp:table -->
 
 <!-- wp:paragraph -->
diff --git a/test/integration/fixtures/documents/evernote-out.html b/test/integration/fixtures/documents/evernote-out.html
index 19102ab70dc487..2a7212f2e29b3d 100644
--- a/test/integration/fixtures/documents/evernote-out.html
+++ b/test/integration/fixtures/documents/evernote-out.html
@@ -7,13 +7,13 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>An</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>Unordered<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -25,13 +25,13 @@
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true,"start":1} -->
-<ol start="1"><!-- wp:list-item -->
+<ol start="1" class="wp-block-list"><!-- wp:list-item -->
 <li>One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>Two<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>Indented</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list --></li>
@@ -47,7 +47,7 @@
 <!-- /wp:separator -->
 
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>Four</td><td>Five</td><td>Six</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>Four</td><td>Five</td><td>Six</td></tr></tbody></table></figure>
 <!-- /wp:table -->
 
 <!-- wp:image -->
diff --git a/test/integration/fixtures/documents/google-docs-list-only-out.html b/test/integration/fixtures/documents/google-docs-list-only-out.html
index 642dc168bb5bb9..ec14d44d2b9224 100644
--- a/test/integration/fixtures/documents/google-docs-list-only-out.html
+++ b/test/integration/fixtures/documents/google-docs-list-only-out.html
@@ -1,7 +1,7 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>My first list item<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>A sub list item</li>
 <!-- /wp:list-item -->
 
diff --git a/test/integration/fixtures/documents/google-docs-out.html b/test/integration/fixtures/documents/google-docs-out.html
index e88311fab7b1f6..3ee7d25875abc6 100644
--- a/test/integration/fixtures/documents/google-docs-out.html
+++ b/test/integration/fixtures/documents/google-docs-out.html
@@ -11,13 +11,13 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -29,7 +29,7 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>One</li>
 <!-- /wp:list-item -->
 
@@ -43,7 +43,7 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 <!-- /wp:list -->
 
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
 <!-- /wp:table -->
 
 <!-- wp:separator -->
diff --git a/test/integration/fixtures/documents/google-docs-table-out.html b/test/integration/fixtures/documents/google-docs-table-out.html
index 07fe4106f3a6a7..da51f75f3644e0 100644
--- a/test/integration/fixtures/documents/google-docs-table-out.html
+++ b/test/integration/fixtures/documents/google-docs-table-out.html
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/documents/google-docs-table-with-colspan-out.html b/test/integration/fixtures/documents/google-docs-table-with-colspan-out.html
index 3c397c142e34dd..f063d499b0179c 100644
--- a/test/integration/fixtures/documents/google-docs-table-with-colspan-out.html
+++ b/test/integration/fixtures/documents/google-docs-table-with-colspan-out.html
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td colspan="2">Test colspan</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td colspan="2">Test colspan</td></tr></tbody></table></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/documents/google-docs-table-with-comments-out.html b/test/integration/fixtures/documents/google-docs-table-with-comments-out.html
index 07fe4106f3a6a7..da51f75f3644e0 100644
--- a/test/integration/fixtures/documents/google-docs-table-with-comments-out.html
+++ b/test/integration/fixtures/documents/google-docs-table-with-comments-out.html
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/documents/google-docs-table-with-rowspan-out.html b/test/integration/fixtures/documents/google-docs-table-with-rowspan-out.html
index d451d6eb2988be..94e0124e280e08 100644
--- a/test/integration/fixtures/documents/google-docs-table-with-rowspan-out.html
+++ b/test/integration/fixtures/documents/google-docs-table-with-rowspan-out.html
@@ -1,3 +1,3 @@
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td rowspan="2">Test rowspan</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td rowspan="2">Test rowspan</td></tr></tbody></table></figure>
 <!-- /wp:table -->
diff --git a/test/integration/fixtures/documents/google-docs-with-comments-out.html b/test/integration/fixtures/documents/google-docs-with-comments-out.html
index e88311fab7b1f6..3ee7d25875abc6 100644
--- a/test/integration/fixtures/documents/google-docs-with-comments-out.html
+++ b/test/integration/fixtures/documents/google-docs-with-comments-out.html
@@ -11,13 +11,13 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -29,7 +29,7 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>One</li>
 <!-- /wp:list-item -->
 
@@ -43,7 +43,7 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 <!-- /wp:list -->
 
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
 <!-- /wp:table -->
 
 <!-- wp:separator -->
diff --git a/test/integration/fixtures/documents/markdown-out.html b/test/integration/fixtures/documents/markdown-out.html
index 31fa8dacbebf0a..9ed72f6d3ef6d3 100644
--- a/test/integration/fixtures/documents/markdown-out.html
+++ b/test/integration/fixtures/documents/markdown-out.html
@@ -15,13 +15,13 @@ <h2 class="wp-block-heading">Lists</h2>
 <!-- /wp:heading -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -33,7 +33,7 @@ <h2 class="wp-block-heading">Lists</h2>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>One</li>
 <!-- /wp:list-item -->
 
@@ -51,11 +51,11 @@ <h2 class="wp-block-heading">Table</h2>
 <!-- /wp:heading -->
 
 <!-- wp:table -->
-<figure class="wp-block-table"><table><thead><tr><th>First Header</th><th>Second Header</th></tr></thead><tbody><tr><td>Content from cell 1</td><td>Content from cell 2</td></tr><tr><td>Content in the first column</td><td>Content in the second column</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th>First Header</th><th>Second Header</th></tr></thead><tbody><tr><td>Content from cell 1</td><td>Content from cell 2</td></tr><tr><td>Content in the first column</td><td>Content in the second column</td></tr></tbody></table></figure>
 <!-- /wp:table -->
 
 <!-- wp:table -->
-<figure class="wp-block-table"><table><thead><tr><th></th><th></th></tr></thead><tbody><tr><td></td><td>Table with empty cells.</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><thead><tr><th></th><th></th></tr></thead><tbody><tr><td></td><td>Table with empty cells.</td></tr></tbody></table></figure>
 <!-- /wp:table -->
 
 <!-- wp:heading -->
diff --git a/test/integration/fixtures/documents/mixed-content-in.html b/test/integration/fixtures/documents/mixed-content-in.html
new file mode 100644
index 00000000000000..a190f8523cd6c7
--- /dev/null
+++ b/test/integration/fixtures/documents/mixed-content-in.html
@@ -0,0 +1,7 @@
+<h3>Some heading</h3>
+<ul>
+<li style="list-style-type: none;">
+<ul><!-- /wp:list-item --> <!-- wp:list-item --></ul>
+</li>
+<li>Content we need to preserve</li>
+</ul>
diff --git a/test/integration/fixtures/documents/mixed-content-out.html b/test/integration/fixtures/documents/mixed-content-out.html
new file mode 100644
index 00000000000000..fc285c38c21023
--- /dev/null
+++ b/test/integration/fixtures/documents/mixed-content-out.html
@@ -0,0 +1,13 @@
+<!-- wp:heading {"level":3} -->
+<h3 class="wp-block-heading">Some heading</h3>
+<!-- /wp:heading -->
+
+<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li></li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Content we need to preserve</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->
\ No newline at end of file
diff --git a/test/integration/fixtures/documents/ms-word-list-out.html b/test/integration/fixtures/documents/ms-word-list-out.html
index f57946f64bc985..2e55413b159a6a 100644
--- a/test/integration/fixtures/documents/ms-word-list-out.html
+++ b/test/integration/fixtures/documents/ms-word-list-out.html
@@ -7,7 +7,7 @@ <h3 class="wp-block-heading"><a>This is a headline?</a></h3>
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>One</li>
 <!-- /wp:list-item -->
 
diff --git a/test/integration/fixtures/documents/ms-word-online-out.html b/test/integration/fixtures/documents/ms-word-online-out.html
index 398281520f2542..13698a929d9b13 100644
--- a/test/integration/fixtures/documents/ms-word-online-out.html
+++ b/test/integration/fixtures/documents/ms-word-online-out.html
@@ -7,39 +7,39 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>A&nbsp;</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li>A </li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Bulleted&nbsp;</li>
+<li>Bulleted </li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Indented&nbsp;</li>
+<li>Indented </li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>List&nbsp;</li>
+<li>List </li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true,"start":1} -->
-<ol start="1"><!-- wp:list-item -->
-<li>One&nbsp;</li>
+<ol start="1" class="wp-block-list"><!-- wp:list-item -->
+<li>One </li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Two&nbsp;</li>
+<li>Two </li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Three&nbsp;</li>
+<li>Three </li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>One&nbsp;</td><td>Two&nbsp;</td><td>Three&nbsp;</td></tr><tr><td>1&nbsp;</td><td>2&nbsp;</td><td>3&nbsp;</td></tr><tr><td>I&nbsp;</td><td>II&nbsp;</td><td>III&nbsp;</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>One&nbsp;</td><td>Two&nbsp;</td><td>Three&nbsp;</td></tr><tr><td>1&nbsp;</td><td>2&nbsp;</td><td>3&nbsp;</td></tr><tr><td>I&nbsp;</td><td>II&nbsp;</td><td>III&nbsp;</td></tr></tbody></table></figure>
 <!-- /wp:table -->
 
 <!-- wp:paragraph -->
diff --git a/test/integration/fixtures/documents/ms-word-out.html b/test/integration/fixtures/documents/ms-word-out.html
index 98992494032b3e..81b82b5f9502fe 100644
--- a/test/integration/fixtures/documents/ms-word-out.html
+++ b/test/integration/fixtures/documents/ms-word-out.html
@@ -19,13 +19,13 @@ <h2 class="wp-block-heading">This is a heading level 2</h2>
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -37,7 +37,7 @@ <h2 class="wp-block-heading">This is a heading level 2</h2>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>One</li>
 <!-- /wp:list-item -->
 
@@ -51,7 +51,7 @@ <h2 class="wp-block-heading">This is a heading level 2</h2>
 <!-- /wp:list -->
 
 <!-- wp:table -->
-<figure class="wp-block-table"><table><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
+<figure class="wp-block-table"><table class="has-fixed-layout"><tbody><tr><td>One</td><td>Two</td><td>Three</td></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>I</td><td>II</td><td>III</td></tr></tbody></table></figure>
 <!-- /wp:table -->
 
 <!-- wp:paragraph -->
diff --git a/test/integration/fixtures/schemas/settings.json b/test/integration/fixtures/schemas/settings.json
new file mode 100644
index 00000000000000..0ed0548aa7b0a2
--- /dev/null
+++ b/test/integration/fixtures/schemas/settings.json
@@ -0,0 +1,7 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"settings": {
+		"invalidAdditionalProperty": true
+	}
+}
diff --git a/test/integration/fixtures/schemas/settingsPropertiesComplete.json b/test/integration/fixtures/schemas/settingsPropertiesComplete.json
new file mode 100644
index 00000000000000..e70019cc266977
--- /dev/null
+++ b/test/integration/fixtures/schemas/settingsPropertiesComplete.json
@@ -0,0 +1,11 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"settings": {
+		"blocks": {
+			"core/button": {
+				"invalidAdditionalProperty": true
+			}
+		}
+	}
+}
diff --git a/test/integration/fixtures/schemas/styles.json b/test/integration/fixtures/schemas/styles.json
new file mode 100644
index 00000000000000..50635d3de7e929
--- /dev/null
+++ b/test/integration/fixtures/schemas/styles.json
@@ -0,0 +1,7 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"styles": {
+		"invalidAdditionalProperty": true
+	}
+}
diff --git a/test/integration/fixtures/schemas/stylesElementsPropertiesComplete_button.json b/test/integration/fixtures/schemas/stylesElementsPropertiesComplete_button.json
new file mode 100644
index 00000000000000..8c596653abcb00
--- /dev/null
+++ b/test/integration/fixtures/schemas/stylesElementsPropertiesComplete_button.json
@@ -0,0 +1,11 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"styles": {
+		"elements": {
+			"button": {
+				"invalidAdditionalProperty": true
+			}
+		}
+	}
+}
diff --git a/test/integration/fixtures/schemas/stylesElementsPropertiesComplete_link.json b/test/integration/fixtures/schemas/stylesElementsPropertiesComplete_link.json
new file mode 100644
index 00000000000000..b8bbd11910d506
--- /dev/null
+++ b/test/integration/fixtures/schemas/stylesElementsPropertiesComplete_link.json
@@ -0,0 +1,11 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"styles": {
+		"elements": {
+			"link": {
+				"invalidAdditionalProperty": true
+			}
+		}
+	}
+}
diff --git a/test/integration/fixtures/schemas/stylesPropertiesAndElementsComplete.json b/test/integration/fixtures/schemas/stylesPropertiesAndElementsComplete.json
new file mode 100644
index 00000000000000..cf9e2c5689534f
--- /dev/null
+++ b/test/integration/fixtures/schemas/stylesPropertiesAndElementsComplete.json
@@ -0,0 +1,11 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"styles": {
+		"blocks": {
+			"core/button": {
+				"invalidAdditionalProperty": true
+			}
+		}
+	}
+}
diff --git a/test/integration/fixtures/schemas/stylesPropertiesComplete.json b/test/integration/fixtures/schemas/stylesPropertiesComplete.json
new file mode 100644
index 00000000000000..0727fb2abdbe13
--- /dev/null
+++ b/test/integration/fixtures/schemas/stylesPropertiesComplete.json
@@ -0,0 +1,13 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"styles": {
+		"elements": {
+			"button": {
+				":hover": {
+					"invalidAdditionalProperty": true
+				}
+			}
+		}
+	}
+}
diff --git a/test/integration/fixtures/schemas/stylesVariationBlockPropertiesComplete.json b/test/integration/fixtures/schemas/stylesVariationBlockPropertiesComplete.json
new file mode 100644
index 00000000000000..42b3e4b2174f50
--- /dev/null
+++ b/test/integration/fixtures/schemas/stylesVariationBlockPropertiesComplete.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"styles": {
+		"variations": {
+			"custom-variation": {
+				"blocks": {
+					"core/button": {
+						"invalidAdditionalProperty": true
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/test/integration/fixtures/schemas/stylesVariationProperties.json b/test/integration/fixtures/schemas/stylesVariationProperties.json
new file mode 100644
index 00000000000000..a8a28550dbeee1
--- /dev/null
+++ b/test/integration/fixtures/schemas/stylesVariationProperties.json
@@ -0,0 +1,11 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"styles": {
+		"variations": {
+			"custom-variation": {
+				"invalidAdditionalProperty": true
+			}
+		}
+	}
+}
diff --git a/test/integration/fixtures/schemas/stylesVariationPropertiesComplete.json b/test/integration/fixtures/schemas/stylesVariationPropertiesComplete.json
new file mode 100644
index 00000000000000..4fc448a22a0165
--- /dev/null
+++ b/test/integration/fixtures/schemas/stylesVariationPropertiesComplete.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "../../../../schemas/json/theme.json",
+	"version": 3,
+	"styles": {
+		"blocks": {
+			"core/button": {
+				"variations": {
+					"custom-variation": {
+						"invalidAdditionalProperty": true
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/test/integration/full-content/full-content.test.js b/test/integration/full-content/full-content.test.js
index f825de04771442..4522dd7b88e451 100644
--- a/test/integration/full-content/full-content.test.js
+++ b/test/integration/full-content/full-content.test.js
@@ -82,7 +82,7 @@ describe( 'full post content fixture', () => {
 			formSubmissionNotification,
 		] );
 
-		if ( process.env.IS_GUTENBERG_PLUGIN ) {
+		if ( globalThis.IS_GUTENBERG_PLUGIN ) {
 			__experimentalRegisterExperimentalCoreBlocks( {
 				enableFSEBlocks: true,
 			} );
diff --git a/test/integration/helpers/integration-test-editor.js b/test/integration/helpers/integration-test-editor.js
index dc83c1bfbe6bd2..bc2e6f71a954fc 100644
--- a/test/integration/helpers/integration-test-editor.js
+++ b/test/integration/helpers/integration-test-editor.js
@@ -10,7 +10,6 @@ import userEvent from '@testing-library/user-event';
 import { useState, useEffect } from '@wordpress/element';
 import {
 	BlockEditorProvider,
-	BlockTools,
 	BlockInspector,
 	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
@@ -21,6 +20,11 @@ import {
 	unregisterBlockType,
 	getBlockTypes,
 } from '@wordpress/blocks';
+import {
+	store as richTextStore,
+	unregisterFormatType,
+} from '@wordpress/rich-text';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -59,14 +63,18 @@ export async function selectBlock( name ) {
 
 export function Editor( { testBlocks, settings = {} } ) {
 	const [ currentBlocks, updateBlocks ] = useState( testBlocks );
+	const { getFormatTypes } = useSelect( richTextStore );
 
 	useEffect( () => {
 		return () => {
 			getBlockTypes().forEach( ( { name } ) =>
 				unregisterBlockType( name )
 			);
+			getFormatTypes().forEach( ( { name } ) =>
+				unregisterFormatType( name )
+			);
 		};
-	}, [] );
+	}, [ getFormatTypes ] );
 
 	return (
 		<BlockEditorProvider
@@ -76,9 +84,7 @@ export function Editor( { testBlocks, settings = {} } ) {
 			settings={ settings }
 		>
 			<BlockInspector />
-			<BlockTools>
-				<BlockCanvas height="100%" shouldIframe={ false } />
-			</BlockTools>
+			<BlockCanvas height="100%" shouldIframe={ false } />
 		</BlockEditorProvider>
 	);
 }
diff --git a/test/integration/non-matched-tags-handling.test.js b/test/integration/non-matched-tags-handling.test.js
index 67438192f13680..451a628c329775 100644
--- a/test/integration/non-matched-tags-handling.test.js
+++ b/test/integration/non-matched-tags-handling.test.js
@@ -19,9 +19,9 @@ describe( 'Handling of non matched tags in block transforms', () => {
 
 		expect( simplePreformattedResult ).toHaveLength( 1 );
 		expect( simplePreformattedResult[ 0 ].name ).toBe( 'core/paragraph' );
-		expect( simplePreformattedResult[ 0 ].attributes.content ).toBe(
-			'Pre'
-		);
+		expect(
+			simplePreformattedResult[ 0 ].attributes.content.valueOf()
+		).toBe( 'Pre' );
 
 		const codeResult = pasteHandler( {
 			HTML: '<pre><code>code</code></pre>',
@@ -30,7 +30,7 @@ describe( 'Handling of non matched tags in block transforms', () => {
 
 		expect( codeResult ).toHaveLength( 1 );
 		expect( codeResult[ 0 ].name ).toBe( 'core/code' );
-		expect( codeResult[ 0 ].attributes.content ).toBe( 'code' );
+		expect( codeResult[ 0 ].attributes.content.valueOf() ).toBe( 'code' );
 		expect( console ).toHaveLogged();
 	} );
 } );
diff --git a/test/integration/shortcode-converter.test.js b/test/integration/shortcode-converter.test.js
index 255287eb7c235e..318a6b017dfcbd 100644
--- a/test/integration/shortcode-converter.test.js
+++ b/test/integration/shortcode-converter.test.js
@@ -106,18 +106,14 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 <p>Bar</p>`;
 		const transformed = segmentHTMLToShortcodeBlock( original, 0 );
 		expect( transformed ).toHaveLength( 3 );
-		expect( transformed[ 0 ] ).toBe( `<p>Foo</p>
-
-` );
+		expect( transformed[ 0 ] ).toBe( `<p>Foo</p>` );
 		const expectedBlock = createBlock( 'core/shortcode', {
 			text: '[foo bar="apple"]',
 		} );
 		// clientId will always be random.
 		expectedBlock.clientId = transformed[ 1 ].clientId;
 		expect( transformed[ 1 ] ).toEqual( expectedBlock );
-		expect( transformed[ 2 ] ).toBe( `
-
-<p>Bar</p>` );
+		expect( transformed[ 2 ] ).toBe( `<p>Bar</p>` );
 	} );
 
 	it( 'should convert a shortcode to a block type with a passing `isMatch`', () => {
@@ -165,22 +161,22 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 <p>[foo two]</p>`;
 
 		const transformed = segmentHTMLToShortcodeBlock( original, 0 );
-		expect( transformed[ 0 ] ).toEqual( '<p>' );
+		expect( transformed[ 0 ] ).toEqual( '' );
 		const firstExpectedBlock = createBlock( 'core/shortcode', {
 			text: '[foo one]',
 		} );
 		// clientId will always be random.
 		firstExpectedBlock.clientId = transformed[ 1 ].clientId;
 		expect( transformed[ 1 ] ).toEqual( firstExpectedBlock );
-		expect( transformed[ 2 ] ).toEqual( `</p>
-<p>` );
+		expect( transformed[ 2 ] ).toEqual( `
+` );
 		const secondExpectedBlock = createBlock( 'core/shortcode', {
 			text: '[foo two]',
 		} );
 		// clientId will always be random.
 		secondExpectedBlock.clientId = transformed[ 3 ].clientId;
 		expect( transformed[ 3 ] ).toEqual( secondExpectedBlock );
-		expect( transformed[ 4 ] ).toEqual( '</p>' );
+		expect( transformed[ 4 ] ).toEqual( '' );
 		expect( transformed ).toHaveLength( 5 );
 	} );
 
@@ -191,38 +187,38 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 <p>[foo four]</p>`;
 
 		const transformed = segmentHTMLToShortcodeBlock( original, 0 );
-		expect( transformed[ 0 ] ).toEqual( '<p>' );
+		expect( transformed[ 0 ] ).toEqual( '' );
 		const firstExpectedBlock = createBlock( 'core/shortcode', {
 			text: '[foo one]',
 		} );
 		// clientId will always be random.
 		firstExpectedBlock.clientId = transformed[ 1 ].clientId;
 		expect( transformed[ 1 ] ).toEqual( firstExpectedBlock );
-		expect( transformed[ 2 ] ).toEqual( `</p>
-<p>` );
+		expect( transformed[ 2 ] ).toEqual( `
+` );
 		const secondExpectedBlock = createBlock( 'core/shortcode', {
 			text: '[foo two]',
 		} );
 		// clientId will always be random.
 		secondExpectedBlock.clientId = transformed[ 3 ].clientId;
 		expect( transformed[ 3 ] ).toEqual( secondExpectedBlock );
-		expect( transformed[ 4 ] ).toEqual( `</p>
-<p>` );
+		expect( transformed[ 4 ] ).toEqual( `
+` );
 		const thirdExpectedBlock = createBlock( 'core/shortcode', {
 			text: '[foo three]',
 		} );
 		// clientId will always be random.
 		thirdExpectedBlock.clientId = transformed[ 5 ].clientId;
 		expect( transformed[ 5 ] ).toEqual( thirdExpectedBlock );
-		expect( transformed[ 6 ] ).toEqual( `</p>
-<p>` );
+		expect( transformed[ 6 ] ).toEqual( `
+` );
 		const fourthExpectedBlock = createBlock( 'core/shortcode', {
 			text: '[foo four]',
 		} );
 		// clientId will always be random.
 		fourthExpectedBlock.clientId = transformed[ 7 ].clientId;
 		expect( transformed[ 7 ] ).toEqual( fourthExpectedBlock );
-		expect( transformed[ 8 ] ).toEqual( '</p>' );
+		expect( transformed[ 8 ] ).toEqual( '' );
 		expect( transformed ).toHaveLength( 9 );
 	} );
 
@@ -242,11 +238,11 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 		const original = `<p>[my-gallery ids="1,2,3"]</p>
 <p>[my-bunch-of-images ids="4,5,6"]</p>`;
 		const transformed = segmentHTMLToShortcodeBlock( original, 0 );
-		expect( transformed[ 0 ] ).toBe( '<p>' );
+		expect( transformed[ 0 ] ).toBe( '' );
 		expect( transformed[ 1 ] ).toHaveProperty( 'name', 'test/gallery' );
-		expect( transformed[ 2 ] ).toBe( '</p>\n<p>' );
+		expect( transformed[ 2 ] ).toBe( '\n' );
 		expect( transformed[ 3 ] ).toHaveProperty( 'name', 'test/gallery' );
-		expect( transformed[ 4 ] ).toBe( '</p>' );
+		expect( transformed[ 4 ] ).toBe( '' );
 	} );
 
 	it( 'should convert regardless of shortcode order', () => {
@@ -255,7 +251,7 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 
 		const transformed = segmentHTMLToShortcodeBlock( original, 0 );
 
-		expect( transformed[ 0 ] ).toBe( '<p>' );
+		expect( transformed[ 0 ] ).toBe( '' );
 
 		let firstExpectedBlock = createBlock( 'test/gallery', {
 			ids: [ 4, 5, 6 ],
@@ -264,14 +260,14 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 		firstExpectedBlock.clientId = transformed[ 1 ].clientId;
 		expect( transformed[ 1 ] ).toEqual( firstExpectedBlock );
 
-		expect( transformed[ 2 ] ).toBe( '</p>\n<p>' );
+		expect( transformed[ 2 ] ).toBe( '\n' );
 
 		let secondExpectedBlock = createBlock( 'test/broccoli', { id: 42 } );
 		// clientId will always be random.
 		secondExpectedBlock.clientId = transformed[ 3 ].clientId;
 		expect( transformed[ 3 ] ).toEqual( secondExpectedBlock );
 
-		expect( transformed[ 4 ] ).toBe( '</p>' );
+		expect( transformed[ 4 ] ).toBe( '' );
 		expect( transformed ).toHaveLength( 5 );
 
 		// Flip the order of the shortcodes.
@@ -280,14 +276,14 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 
 		const reverseTransformed = segmentHTMLToShortcodeBlock( reversed, 0 );
 
-		expect( reverseTransformed[ 0 ] ).toBe( '<p>' );
+		expect( reverseTransformed[ 0 ] ).toBe( '' );
 
 		firstExpectedBlock = createBlock( 'test/broccoli', { id: 42 } );
 		// clientId will always be random.
 		firstExpectedBlock.clientId = reverseTransformed[ 1 ].clientId;
 		expect( reverseTransformed[ 1 ] ).toEqual( firstExpectedBlock );
 
-		expect( reverseTransformed[ 2 ] ).toBe( '</p>\n<p>' );
+		expect( reverseTransformed[ 2 ] ).toBe( '\n' );
 
 		secondExpectedBlock = createBlock( 'test/gallery', {
 			ids: [ 4, 5, 6 ],
@@ -296,7 +292,7 @@ describe( 'segmentHTMLToShortcodeBlock', () => {
 		secondExpectedBlock.clientId = reverseTransformed[ 3 ].clientId;
 		expect( reverseTransformed[ 3 ] ).toEqual( secondExpectedBlock );
 
-		expect( reverseTransformed[ 4 ] ).toBe( '</p>' );
+		expect( reverseTransformed[ 4 ] ).toBe( '' );
 		expect( reverseTransformed ).toHaveLength( 5 );
 	} );
 } );
diff --git a/test/integration/theme-schema.test.js b/test/integration/theme-schema.test.js
index 0e5ed88a1441eb..01c95ddaefadce 100644
--- a/test/integration/theme-schema.test.js
+++ b/test/integration/theme-schema.test.js
@@ -1,7 +1,8 @@
 /**
  * External dependencies
  */
-import Ajv from 'ajv-draft-04';
+import Ajv from 'ajv';
+import glob from 'fast-glob';
 
 /**
  * Internal dependencies
@@ -9,13 +10,21 @@ import Ajv from 'ajv-draft-04';
 import themeSchema from '../../schemas/json/theme.json';
 
 describe( 'theme.json schema', () => {
+	const jsonFiles = glob.sync(
+		[ 'packages/*/src/**/theme.json', '{lib,phpunit,test}/**/theme.json' ],
+		{ onlyFiles: true }
+	);
+	const invalidFiles = glob.sync(
+		[ 'test/integration/fixtures/schemas/*.json' ],
+		{ onlyFiles: true }
+	);
 	const ajv = new Ajv( {
 		// Used for matching unknown blocks without repeating core blocks names
 		// with patternProperties in settings.blocks and settings.styles
 		allowMatchingProperties: true,
 	} );
 
-	it( 'strictly adheres to the draft-04 meta schema', () => {
+	it( 'strictly adheres to the draft-07 meta schema', () => {
 		// Use ajv.compile instead of ajv.validateSchema to validate the schema
 		// because validateSchema only checks syntax, whereas, compile checks
 		// if the schema is semantically correct with strict mode.
@@ -24,4 +33,29 @@ describe( 'theme.json schema', () => {
 
 		expect( result.errors ).toBe( null );
 	} );
+
+	test( 'found theme.json files', () => {
+		expect( jsonFiles.length ).toBeGreaterThan( 0 );
+	} );
+
+	test.each( jsonFiles )( 'validates schema for `%s`', ( filepath ) => {
+		// We want to validate the theme.json file using the local schema.
+		const { $schema, ...metadata } = require( filepath );
+
+		// we expect the $schema property to be present in the theme.json file
+		expect( $schema ).toBeTruthy();
+
+		const result = ajv.validate( themeSchema, metadata ) || ajv.errors;
+
+		expect( result ).toBe( true );
+	} );
+
+	test.each( invalidFiles )( 'invalidates schema for `%s`', ( filepath ) => {
+		// We want to validate the theme.json file using the local schema.
+		const { $schema, ...metadata } = require( filepath );
+
+		const result = ajv.validate( themeSchema, metadata );
+
+		expect( result ).toBe( false );
+	} );
 } );
diff --git a/test/integration/wp-env-schema.test.js b/test/integration/wp-env-schema.test.js
new file mode 100644
index 00000000000000..48ef039a8fb0d5
--- /dev/null
+++ b/test/integration/wp-env-schema.test.js
@@ -0,0 +1,38 @@
+/**
+ * External dependencies
+ */
+import Ajv from 'ajv';
+
+/**
+ * Internal dependencies
+ */
+import wpEnvSchema from '../../schemas/json/wp-env.json';
+import wpEnvJsonFile from '../../.wp-env.json';
+
+describe( '.wp-env.json schema', () => {
+	const ajv = new Ajv( {
+		allowMatchingProperties: true,
+	} );
+
+	test( 'strictly adheres to the draft-07 meta schema', () => {
+		// Use ajv.compile instead of ajv.validateSchema to validate the schema
+		// because validateSchema only checks syntax, whereas, compile checks
+		// if the schema is semantically correct with strict mode.
+		// See https://github.com/ajv-validator/ajv/issues/1434#issuecomment-822982571
+		const result = ajv.compile( wpEnvSchema );
+
+		expect( result.errors ).toBe( null );
+	} );
+
+	test( 'validates schema for .wp-env.json', () => {
+		// We want to validate the .wp-env.json file using the local schema.
+		const { $schema, ...metadata } = wpEnvJsonFile;
+
+		// we expect the $schema property to be present in the .wp-env.json file
+		expect( $schema ).toBeTruthy();
+
+		const result = ajv.validate( wpEnvSchema, metadata ) || ajv.errors;
+
+		expect( result ).toBe( true );
+	} );
+} );
diff --git a/test/native/babel.config.js b/test/native/babel.config.js
index 582e6f5dc6f65d..e43fd420a43157 100644
--- a/test/native/babel.config.js
+++ b/test/native/babel.config.js
@@ -1,9 +1,9 @@
 module.exports = ( api ) => {
 	api.cache( true );
 	return {
-		presets: [ 'module:metro-react-native-babel-preset' ],
+		presets: [ 'module:@react-native/babel-preset' ],
 		plugins: [
-			'@babel/plugin-proposal-async-generator-functions',
+			'@babel/plugin-transform-async-generator-functions',
 			'@babel/plugin-transform-runtime',
 			[
 				'react-native-platform-specific-extensions',
@@ -12,7 +12,8 @@ module.exports = ( api ) => {
 				},
 			],
 			'react-native-reanimated/plugin',
-			'@babel/plugin-proposal-export-namespace-from',
+			'@babel/plugin-transform-export-namespace-from',
+			'@babel/plugin-transform-dynamic-import',
 		],
 		overrides: [
 			{
diff --git a/test/native/integration-test-helpers/README.md b/test/native/integration-test-helpers/README.md
index b80370f79929c9..27079abae34f90 100644
--- a/test/native/integration-test-helpers/README.md
+++ b/test/native/integration-test-helpers/README.md
@@ -6,10 +6,6 @@ The following helper functions can be used within integration tests to simplify
 
 Adds a block via the block picker.
 
-### [`advanceAnimationByTime`, `advanceAnimationByFrames` ](https://github.com/WordPress/gutenberg/blob/HEAD/test/native/integration-test-helpers/advance-animation.js)
-
-Advance Reanimated animations by time or frames.
-
 ### [`dismissModal`](https://github.com/WordPress/gutenberg/blob/HEAD/test/native/integration-test-helpers/dismiss-block.js)
 
 Dismisses a modal.
@@ -100,4 +96,4 @@ Set up fake timers for executing a function and restores them afterwards.
 
 ### [`withReanimatedTimer`](https://github.com/WordPress/gutenberg/blob/HEAD/test/native/integration-test-helpers/with-reanimated-timer.js)
 
-Prepare timers for executing a function that uses the Reanimated APIs.
\ No newline at end of file
+Prepare timers for executing a function that uses the Reanimated APIs.
diff --git a/test/native/integration-test-helpers/advance-animation.js b/test/native/integration-test-helpers/advance-animation.js
index 87492b86912974..98910c27b16669 100644
--- a/test/native/integration-test-helpers/advance-animation.js
+++ b/test/native/integration-test-helpers/advance-animation.js
@@ -3,22 +3,6 @@
  */
 import { FRAME_TIME } from './constants';
 
-/**
- * Advance Reanimated animations by time.
- * This helper should be called within a function invoked by "withReanimatedTimer".
- *
- * NOTE: This code is based on a similar function provided by the Reanimated library.
- * Reference: https://github.com/software-mansion/react-native-reanimated/blob/b4ee4ea9a1f246c461dd1819c6f3d48440a25756/src/reanimated2/jestUtils.ts#L176-L181
- *
- * @param {number} time Time to advance timers.
- */
-export const advanceAnimationByTime = ( time = FRAME_TIME ) => {
-	for ( let i = 0; i <= Math.ceil( time / FRAME_TIME ); i++ ) {
-		jest.advanceTimersByTime( FRAME_TIME );
-	}
-	jest.advanceTimersByTime( FRAME_TIME );
-};
-
 /**
  * Advance Reanimated animations by frames.
  * This helper should be called within a function invoked by "withReanimatedTimer".
@@ -29,8 +13,6 @@ export const advanceAnimationByTime = ( time = FRAME_TIME ) => {
  * @param {number} count Number of frames to advance timers.
  */
 export const advanceAnimationByFrames = ( count ) => {
-	for ( let i = 0; i <= count; i++ ) {
-		jest.advanceTimersByTime( FRAME_TIME );
-	}
-	jest.advanceTimersByTime( FRAME_TIME );
+	jest.advanceTimersByTime( count * FRAME_TIME );
+	jest.runOnlyPendingTimers();
 };
diff --git a/test/native/integration-test-helpers/get-editor-content.js b/test/native/integration-test-helpers/get-editor-content.js
new file mode 100644
index 00000000000000..2594382d8ce686
--- /dev/null
+++ b/test/native/integration-test-helpers/get-editor-content.js
@@ -0,0 +1,52 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	subscribeParentGetHtml,
+	provideToNative_Html as provideToNativeHtml,
+} from '@wordpress/react-native-bridge';
+
+// Set up the mocks for getting the HTML output of the editor
+let triggerHtmlSerialization;
+let serializedContent = {};
+subscribeParentGetHtml.mockImplementation( ( callback ) => {
+	if ( ! triggerHtmlSerialization ) {
+		triggerHtmlSerialization = callback;
+		return {
+			remove: () => {
+				triggerHtmlSerialization = undefined;
+			},
+		};
+	}
+} );
+provideToNativeHtml.mockImplementation(
+	( html, title, hasChanges, contentInfo ) => {
+		serializedContent = { html, title, hasChanges, contentInfo };
+	}
+);
+
+/**
+ * Gets the current HTML output of the editor.
+ *
+ * @return {string} HTML output
+ */
+export function getEditorHtml() {
+	if ( ! triggerHtmlSerialization ) {
+		throw new Error( 'HTML serialization trigger is not defined.' );
+	}
+	triggerHtmlSerialization();
+	return serializedContent.html;
+}
+
+/**
+ * Gets the current title of the editor.
+ *
+ * @return {string} Title
+ */
+export function getEditorTitle() {
+	if ( ! triggerHtmlSerialization ) {
+		throw new Error( 'HTML serialization trigger is not defined.' );
+	}
+	triggerHtmlSerialization();
+	return serializedContent.title;
+}
diff --git a/test/native/integration-test-helpers/get-editor-html.js b/test/native/integration-test-helpers/get-editor-html.js
deleted file mode 100644
index eb1a9909895d2c..00000000000000
--- a/test/native/integration-test-helpers/get-editor-html.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	subscribeParentGetHtml,
-	provideToNative_Html as provideToNativeHtml,
-} from '@wordpress/react-native-bridge';
-
-// Set up the mocks for getting the HTML output of the editor
-let triggerHtmlSerialization;
-let serializedHtml;
-subscribeParentGetHtml.mockImplementation( ( callback ) => {
-	if ( ! triggerHtmlSerialization ) {
-		triggerHtmlSerialization = callback;
-		return {
-			remove: () => {
-				triggerHtmlSerialization = undefined;
-			},
-		};
-	}
-} );
-provideToNativeHtml.mockImplementation( ( html ) => {
-	serializedHtml = html;
-} );
-
-/**
- * Gets the current HTML output of the editor.
- *
- * @return {string} HTML output
- */
-export function getEditorHtml() {
-	if ( ! triggerHtmlSerialization ) {
-		throw new Error( 'HTML serialization trigger is not defined.' );
-	}
-	triggerHtmlSerialization();
-	return serializedHtml;
-}
diff --git a/test/native/integration-test-helpers/get-global-styles.js b/test/native/integration-test-helpers/get-global-styles.js
index 1156018358c3ca..405b3d93c5d90f 100644
--- a/test/native/integration-test-helpers/get-global-styles.js
+++ b/test/native/integration-test-helpers/get-global-styles.js
@@ -41,6 +41,133 @@ const GLOBAL_STYLES_RAW_FEATURES = {
 			],
 		},
 	},
+	typography: {
+		fontSizes: {
+			default: [
+				{
+					name: 'Small',
+					size: '13px',
+					slug: 'small',
+				},
+				{
+					name: 'Medium',
+					size: '20px',
+					slug: 'medium',
+				},
+				{
+					name: 'Large',
+					size: '36px',
+					slug: 'large',
+				},
+				{
+					name: 'Extra Large',
+					size: '42px',
+					slug: 'x-large',
+				},
+			],
+			theme: [
+				{
+					fluid: false,
+					name: 'Small',
+					size: '0.9rem',
+					slug: 'small',
+				},
+				{
+					fluid: false,
+					name: 'Medium',
+					size: '1.05rem',
+					slug: 'medium',
+				},
+				{
+					fluid: {
+						max: '1.85rem',
+						min: '1.39rem',
+					},
+					name: 'Large',
+					size: '1.85rem',
+					slug: 'large',
+				},
+				{
+					fluid: {
+						max: '2.5rem',
+						min: '1.85rem',
+					},
+					name: 'Extra Large',
+					size: '2.5rem',
+					slug: 'x-large',
+				},
+				{
+					fluid: {
+						max: '3.27rem',
+						min: '2.5rem',
+					},
+					name: 'Extra Extra Large',
+					size: '3.27rem',
+					slug: 'xx-large',
+				},
+			],
+		},
+	},
+};
+
+const GLOBAL_STYLES_RAW_STYLES = {
+	color: {
+		background: 'var(--wp--preset--color--foreground)',
+		text: 'var(--wp--preset--color--tertiary)',
+	},
+	elements: {
+		h1: {
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--xx-large)',
+				lineHeight: '1.15',
+			},
+		},
+		h2: {
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--x-large)',
+			},
+		},
+		h3: {
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--large)',
+			},
+		},
+		h4: {
+			typography: {
+				fontSize:
+					'clamp(1.1rem, 1.1rem + ((1vw - 0.2rem) * 0.767), 1.5rem)',
+			},
+		},
+		h5: {
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--medium)',
+			},
+		},
+		h6: {
+			typography: {
+				fontSize: 'var(--wp--preset--font-size--small)',
+			},
+		},
+		heading: {
+			color: {
+				text: 'var(--wp--preset--color--tertiary)',
+			},
+			typography: {
+				fontFamily: 'var(--wp--preset--font-family--heading)',
+				lineHeight: '1.2',
+			},
+		},
+		link: {
+			color: {
+				text: 'var(--wp--preset--color--tertiary)',
+			},
+		},
+	},
+	typography: {
+		fontFamily: 'var(--wp--preset--font-family--body)',
+		fontSize: 'var(--wp--preset--font-size--medium)',
+		lineHeight: '1.55',
+	},
 };
 
 /**
@@ -51,5 +178,6 @@ const GLOBAL_STYLES_RAW_FEATURES = {
 export function getGlobalStyles() {
 	return {
 		rawFeatures: JSON.stringify( GLOBAL_STYLES_RAW_FEATURES ),
+		rawStyles: JSON.stringify( GLOBAL_STYLES_RAW_STYLES ),
 	};
 }
diff --git a/test/native/integration-test-helpers/index.js b/test/native/integration-test-helpers/index.js
index 5aca46049715cd..1ea79e8108ce40 100644
--- a/test/native/integration-test-helpers/index.js
+++ b/test/native/integration-test-helpers/index.js
@@ -1,28 +1,25 @@
 export { addBlock } from './add-block';
-export {
-	advanceAnimationByTime,
-	advanceAnimationByFrames,
-} from './advance-animation';
-export { dismissModal } from './dismiss-modal';
-export { getBlock } from './get-block';
-export { getBlockTransformOptions } from './get-block-transform-options';
-export { getEditorHtml } from './get-editor-html';
-export { getInnerBlock } from './get-inner-block';
-export { initializeEditor } from './initialize-editor';
-export { openBlockActionsMenu } from './open-block-actions-menu';
-export { openBlockSettings } from './open-block-settings';
-export { selectRangeInRichText } from './rich-text-select-range';
-export { typeInRichText } from './rich-text-type';
-export { pasteIntoRichText } from './rich-text-paste';
-export { setupApiFetch } from './setup-api-fetch';
-export { setupCoreBlocks } from './setup-core-blocks';
-export { setupMediaPicker } from './setup-media-picker';
-export { setupMediaUpload } from './setup-media-upload';
-export { setupPicker } from './setup-picker';
-export { changeTextOfTextInput } from './text-input-change-text';
-export { transformBlock } from './transform-block';
-export { triggerBlockListLayout } from './trigger-block-list-layout';
-export { waitForModalVisible } from './wait-for-modal-visible';
-export { waitForStoreResolvers } from './wait-for-store-resolvers';
-export { withFakeTimers } from './with-fake-timers';
-export { withReanimatedTimer } from './with-reanimated-timer';
+export { advanceAnimationByFrames } from './advance-animation';
+export * from './dismiss-modal';
+export * from './get-block';
+export * from './get-block-transform-options';
+export * from './get-editor-content';
+export * from './get-inner-block';
+export * from './initialize-editor';
+export * from './open-block-actions-menu';
+export * from './open-block-settings';
+export * from './rich-text-select-range';
+export * from './rich-text-type';
+export * from './rich-text-paste';
+export * from './setup-api-fetch';
+export * from './setup-core-blocks';
+export * from './setup-media-picker';
+export * from './setup-media-upload';
+export * from './setup-picker';
+export * from './text-input-change-text';
+export * from './transform-block';
+export * from './trigger-block-list-layout';
+export * from './wait-for-modal-visible';
+export * from './wait-for-store-resolvers';
+export * from './with-fake-timers';
+export * from './with-reanimated-timer';
diff --git a/test/native/integration-test-helpers/initialize-editor.js b/test/native/integration-test-helpers/initialize-editor.js
index 54ece9d347a07c..511f0223e11356 100644
--- a/test/native/integration-test-helpers/initialize-editor.js
+++ b/test/native/integration-test-helpers/initialize-editor.js
@@ -36,6 +36,7 @@ export async function initializeEditor( props, { component } = {} ) {
 		const {
 			screenWidth = 320,
 			withGlobalStyles = false,
+			initialTitle = 'test',
 			...rest
 		} = props || {};
 		const editorElement = component
@@ -44,7 +45,7 @@ export async function initializeEditor( props, { component } = {} ) {
 
 		const screen = render(
 			cloneElement( editorElement, {
-				initialTitle: 'test',
+				initialTitle,
 				...( withGlobalStyles ? getGlobalStyles() : {} ),
 				...rest,
 			} )
diff --git a/test/native/integration-test-helpers/rich-text-paste.js b/test/native/integration-test-helpers/rich-text-paste.js
index d2c01ed2fb5a72..6d447181e0b8d2 100644
--- a/test/native/integration-test-helpers/rich-text-paste.js
+++ b/test/native/integration-test-helpers/rich-text-paste.js
@@ -6,19 +6,20 @@ import { fireEvent } from '@testing-library/react-native';
 /**
  * Paste content into a RichText component.
  *
- * @param {import('react-test-renderer').ReactTestInstance} richText       RichText test instance.
- * @param {Object}                                          content        Content to paste.
- * @param {string}                                          content.text   Text format of the content.
- * @param {string}                                          [content.html] HTML format of the content. If not provided, text format will be used.
+ * @param {import('react-test-renderer').ReactTestInstance} richText        RichText test instance.
+ * @param {Object}                                          content         Content to paste.
+ * @param {string}                                          content.text    Text format of the content.
+ * @param {string}                                          [content.html]  HTML format of the content. If not provided, text format will be used.
+ * @param {string}                                          [content.files] Files array to add to the editor.
  */
-export const pasteIntoRichText = ( richText, { text, html } ) => {
+export const pasteIntoRichText = ( richText, { text, html, files = [] } ) => {
 	fireEvent( richText, 'focus' );
 	fireEvent( richText, 'paste', {
 		preventDefault: jest.fn(),
 		nativeEvent: {
 			eventCount: 1,
 			target: undefined,
-			files: [],
+			files,
 			pastedHtml: html || text,
 			pastedText: text,
 		},
diff --git a/test/native/integration-test-helpers/with-fake-timers.js b/test/native/integration-test-helpers/with-fake-timers.js
index 07f7fb7117ce98..bc863e279ddc3a 100644
--- a/test/native/integration-test-helpers/with-fake-timers.js
+++ b/test/native/integration-test-helpers/with-fake-timers.js
@@ -6,7 +6,7 @@
  * @return {*} The result of the function call.
  */
 export async function withFakeTimers( fn ) {
-	const usingFakeTimers = jest.isMockFunction( setTimeout );
+	const usingFakeTimers = getJestFakeTimersType() !== null;
 
 	// Portions of the React Native Animation API rely upon these APIs. However,
 	// Jest's 'legacy' fake timers mutate these globals, which breaks the Animated
@@ -15,7 +15,7 @@ export async function withFakeTimers( fn ) {
 	const cancelAnimationFrameCopy = global.cancelAnimationFrame;
 
 	if ( ! usingFakeTimers ) {
-		jest.useFakeTimers( { legacyFakeTimers: true } );
+		jest.useFakeTimers();
 	}
 
 	// `Date.now` returns the real-time even when using fake timers.
@@ -48,3 +48,44 @@ export async function withFakeTimers( fn ) {
 	}
 	return result;
 }
+
+/**
+ * Get the type of Jest fake timers being used.
+ *
+ * @return {string | null} The type of Jest fake timers being used, or null if fake timers are not being used.
+ *
+ * @see https://github.com/callstack/react-native-testing-library/blob/a670b2d4c1fb4df5326a63cb2852f4d6e37756da/src/helpers/timers.ts#L24-L58
+ */
+function getJestFakeTimersType() {
+	if (
+		typeof jest === 'undefined' ||
+		typeof globalObj.setTimeout === 'undefined' ||
+		process.env.RNTL_SKIP_AUTO_DETECT_FAKE_TIMERS
+	) {
+		return null;
+	}
+
+	if (
+		typeof globalObj.setTimeout._isMockFunction !== 'undefined' &&
+		globalObj.setTimeout._isMockFunction
+	) {
+		return 'legacy';
+	}
+
+	if (
+		typeof globalObj.setTimeout.clock !== 'undefined' &&
+		typeof jest.getRealSystemTime !== 'undefined'
+	) {
+		try {
+			// jest.getRealSystemTime is only supported for Jest's `modern` fake timers and otherwise throws
+			jest.getRealSystemTime();
+			return 'modern';
+		} catch {
+			// not using Jest's modern fake timers
+		}
+	}
+
+	return null;
+}
+
+const globalObj = typeof window === 'undefined' ? global : window;
diff --git a/test/native/integration-test-helpers/with-reanimated-timer.js b/test/native/integration-test-helpers/with-reanimated-timer.js
index 667e2237939661..9cfb9073ddfedf 100644
--- a/test/native/integration-test-helpers/with-reanimated-timer.js
+++ b/test/native/integration-test-helpers/with-reanimated-timer.js
@@ -6,7 +6,6 @@ import { act } from '@testing-library/react-native';
 /**
  * Internal dependencies
  */
-import { FRAME_TIME } from './constants';
 import { withFakeTimers } from './with-fake-timers';
 
 /**
@@ -21,9 +20,6 @@ import { withFakeTimers } from './with-fake-timers';
  */
 export async function withReanimatedTimer( fn ) {
 	return withFakeTimers( async () => {
-		global.requestAnimationFrame = ( callback ) =>
-			setTimeout( callback, FRAME_TIME );
-
 		// Reanimated uses a custom `now` function to advance animations. In order to be able to use
 		// Jest timer functions to advance animations we need to set the fake timers' internal clock.
 		// Reference: https://t.ly/0S__f
diff --git a/test/native/integration/__snapshots__/blocks-raw-handling.native.js.snap b/test/native/integration/__snapshots__/blocks-raw-handling.native.js.snap
index 75d8caebbe31e0..d55812fa9ff141 100644
--- a/test/native/integration/__snapshots__/blocks-raw-handling.native.js.snap
+++ b/test/native/integration/__snapshots__/blocks-raw-handling.native.js.snap
@@ -86,7 +86,7 @@ exports[`Blocks raw handling pasteHandler wordpress 1`] = `"Howdy<br>This is a p
 
 exports[`Blocks raw handling should correctly handle quotes with mixed content 1`] = `
 "<!-- wp:quote -->
-<blockquote class="wp-block-quote"><!-- wp:heading {"level":1} -->
+<blockquote class="wp-block-quote"><!-- wp:heading {"level":1,"className":"wp-block-heading"} -->
 <h1 class="wp-block-heading">chicken</h1>
 <!-- /wp:heading -->
 
diff --git a/test/native/integration/blocks-raw-handling.native.js b/test/native/integration/blocks-raw-handling.native.js
index 5f21ca035fbf9d..6fae0e72be0cac 100644
--- a/test/native/integration/blocks-raw-handling.native.js
+++ b/test/native/integration/blocks-raw-handling.native.js
@@ -187,7 +187,7 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
+		"<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>one</li>
 		<!-- /wp:list-item -->
 
@@ -212,7 +212,7 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
+		"<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>one</li>
 		<!-- /wp:list-item -->
 
@@ -309,7 +309,7 @@ describe( 'Blocks raw handling', () => {
 
 	it( 'should treat single list item as inline text', () => {
 		const filtered = pasteHandler( {
-			HTML: '<ul><li>Some <strong>bold</strong> text.</li></ul>',
+			HTML: '<ul class="wp-block-list"><li>Some <strong>bold</strong> text.</li></ul>',
 			plainText: 'Some <strong>bold</strong> text.\n',
 			mode: 'AUTO',
 		} );
@@ -320,7 +320,7 @@ describe( 'Blocks raw handling', () => {
 
 	it( 'should treat multiple list items as a block', () => {
 		const filtered = pasteHandler( {
-			HTML: '<ul><li>One</li><li>Two</li><li>Three</li></ul>',
+			HTML: '<ul class="wp-block-list"><li>One</li><li>Two</li><li>Three</li></ul>',
 			plainText: 'One\nTwo\nThree\n',
 			mode: 'AUTO',
 		} )
@@ -328,7 +328,7 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
+		"<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item -->
 
diff --git a/test/native/jest.config.js b/test/native/jest.config.js
index 4859ea597e0f63..71232758734feb 100644
--- a/test/native/jest.config.js
+++ b/test/native/jest.config.js
@@ -25,7 +25,6 @@ const RAW_HANDLING_UNSUPPORTED_UNIT_TESTS = [
 	'html-formatting-remover',
 	'phrasing-content-reducer',
 	'figure-content-reducer',
-	'special-comment-converter',
 	'normalise-blocks',
 	'image-corrector',
 ];
@@ -58,7 +57,7 @@ module.exports = {
 		'node_modules',
 	],
 	moduleNameMapper: {
-		// Mock the CSS modules. See https://facebook.github.io/jest/docs/en/webpack.html#handling-static-assets
+		// Mock the CSS modules. See https://jestjs.io/docs/webpack#handling-static-assets
 		'\\.(scss)$': '<rootDir>/test/native/__mocks__/styleMock.js',
 		'\\.(eot|otf|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
 			'<rootDir>/test/native/__mocks__/fileMock.js',
diff --git a/test/native/setup.js b/test/native/setup.js
index 53ab28f861a1ef..e93d2248bd03cb 100644
--- a/test/native/setup.js
+++ b/test/native/setup.js
@@ -14,7 +14,7 @@ global.navigator = global.navigator ?? {};
 require( '../../packages/react-native-editor/src/globals' );
 
 // Set up Reanimated library for testing
-require( 'react-native-reanimated/lib/reanimated2/jestUtils' ).setUpTests();
+require( 'react-native-reanimated' ).setUpTests();
 global.__reanimatedWorkletInit = jest.fn();
 global.ReanimatedDataMock = {
 	now: () => 0,
@@ -81,6 +81,7 @@ jest.mock( '@wordpress/api-fetch', () => {
 jest.mock( '@wordpress/react-native-bridge', () => {
 	return {
 		addEventListener: jest.fn(),
+		logException: jest.fn(),
 		mediaUploadSync: jest.fn(),
 		removeEventListener: jest.fn(),
 		requestBlockTypeImpressions: jest.fn( ( callback ) => {
@@ -107,7 +108,12 @@ jest.mock( '@wordpress/react-native-bridge', () => {
 		subscribeShowEditorHelp: jest.fn(),
 		subscribeOnUndoPressed: jest.fn(),
 		subscribeOnRedoPressed: jest.fn(),
+		subscribeConnectionStatus: jest.fn( () => ( { remove: jest.fn() } ) ),
+		subscribeToContentUpdate: jest.fn(),
+		requestConnectionStatus: jest.fn( ( callback ) => callback( true ) ),
 		editorDidMount: jest.fn(),
+		showAndroidSoftKeyboard: jest.fn(),
+		hideAndroidSoftKeyboard: jest.fn(),
 		editorDidAutosave: jest.fn(),
 		subscribeMediaUpload: jest.fn(),
 		subscribeMediaSave: jest.fn(),
@@ -115,8 +121,10 @@ jest.mock( '@wordpress/react-native-bridge', () => {
 		provideToNative_Html: jest.fn(),
 		requestImageFailedRetryDialog: jest.fn(),
 		requestImageUploadCancelDialog: jest.fn(),
+		requestImageUploadCancel: jest.fn(),
 		requestMediaEditor: jest.fn(),
 		requestMediaPicker: jest.fn(),
+		requestMediaImport: jest.fn(),
 		requestUnsupportedBlockFallback: jest.fn(),
 		subscribeReplaceBlock: jest.fn(),
 		mediaSources: {
@@ -278,3 +286,17 @@ jest.mock( '@wordpress/compose', () => {
 jest.spyOn( Image, 'getSize' ).mockImplementation( ( url, success ) =>
 	success( 0, 0 )
 );
+
+jest.spyOn( Image, 'prefetch' ).mockImplementation(
+	( url, callback = () => {} ) => {
+		const mockRequestId = `mockRequestId-${ url }`;
+		callback( mockRequestId );
+		return Promise.resolve( true );
+	}
+);
+
+jest.mock( 'react-native/Libraries/Utilities/BackHandler', () => {
+	return jest.requireActual(
+		'react-native/Libraries/Utilities/__mocks__/BackHandler.js'
+	);
+} );
diff --git a/test/performance/config/performance-reporter.ts b/test/performance/config/performance-reporter.ts
index 7b1f171230c59e..999047bdb09b53 100644
--- a/test/performance/config/performance-reporter.ts
+++ b/test/performance/config/performance-reporter.ts
@@ -13,7 +13,7 @@ import type {
 /**
  * Internal dependencies
  */
-import { average, median, minimum, maximum, round } from '../utils';
+import { stats, round } from '../utils';
 
 export interface WPRawPerformanceResults {
 	timeToFirstByte: number[];
@@ -27,108 +27,116 @@ export interface WPRawPerformanceResults {
 	firstBlock: number[];
 	type: number[];
 	typeWithoutInspector: number[];
+	typeWithTopToolbar: number[];
 	typeContainer: number[];
 	focus: number[];
 	inserterOpen: number[];
 	inserterSearch: number[];
 	inserterHover: number[];
+	loadPatterns: number[];
+	loadPages: number[];
 	listViewOpen: number[];
 	navigate: number[];
+	wpBeforeTemplate: number[];
+	wpTemplate: number[];
+	wpTotal: number[];
+	wpMemoryUsage: number[];
+	wpDbQueries: number[];
 }
 
+type PerformanceStats = {
+	q25: number;
+	q50: number;
+	q75: number;
+	cnt: number; // number of data points
+};
+
 export interface WPPerformanceResults {
-	timeToFirstByte?: number;
-	largestContentfulPaint?: number;
-	lcpMinusTtfb?: number;
-	serverResponse?: number;
-	firstPaint?: number;
-	domContentLoaded?: number;
-	loaded?: number;
-	firstContentfulPaint?: number;
-	firstBlock?: number;
-	type?: number;
-	minType?: number;
-	maxType?: number;
-	typeWithoutInspector?: number;
-	typeContainer?: number;
-	minTypeContainer?: number;
-	maxTypeContainer?: number;
-	focus?: number;
-	minFocus?: number;
-	maxFocus?: number;
-	inserterOpen?: number;
-	minInserterOpen?: number;
-	maxInserterOpen?: number;
-	inserterSearch?: number;
-	minInserterSearch?: number;
-	maxInserterSearch?: number;
-	inserterHover?: number;
-	minInserterHover?: number;
-	maxInserterHover?: number;
-	listViewOpen?: number;
-	minListViewOpen?: number;
-	maxListViewOpen?: number;
-	navigate?: number;
+	timeToFirstByte?: PerformanceStats;
+	largestContentfulPaint?: PerformanceStats;
+	lcpMinusTtfb?: PerformanceStats;
+	serverResponse?: PerformanceStats;
+	firstPaint?: PerformanceStats;
+	domContentLoaded?: PerformanceStats;
+	loaded?: PerformanceStats;
+	firstContentfulPaint?: PerformanceStats;
+	firstBlock?: PerformanceStats;
+	type?: PerformanceStats;
+	typeWithoutInspector?: PerformanceStats;
+	typeWithTopToolbar?: PerformanceStats;
+	typeContainer?: PerformanceStats;
+	focus?: PerformanceStats;
+	inserterOpen?: PerformanceStats;
+	inserterSearch?: PerformanceStats;
+	inserterHover?: PerformanceStats;
+	loadPatterns?: PerformanceStats;
+	loadPages?: PerformanceStats;
+	listViewOpen?: PerformanceStats;
+	navigate?: PerformanceStats;
+	wpBeforeTemplate?: PerformanceStats;
+	wpTemplate?: PerformanceStats;
+	wpTotal?: PerformanceStats;
+	wpMemoryUsage?: PerformanceStats;
+	wpDbQueries?: PerformanceStats;
 }
 
 /**
  * Curate the raw performance results.
  *
- * @param {WPRawPerformanceResults} results
- *
- * @return {WPPerformanceResults} Curated Performance results.
+ * @param results Raw results.
+ * @return Curated statistics for the results.
  */
 export function curateResults(
 	results: WPRawPerformanceResults
 ): WPPerformanceResults {
 	const output = {
-		timeToFirstByte: median( results.timeToFirstByte ),
-		largestContentfulPaint: median( results.largestContentfulPaint ),
-		lcpMinusTtfb: median( results.lcpMinusTtfb ),
-		serverResponse: median( results.serverResponse ),
-		firstPaint: median( results.firstPaint ),
-		domContentLoaded: median( results.domContentLoaded ),
-		loaded: median( results.loaded ),
-		firstContentfulPaint: median( results.firstContentfulPaint ),
-		firstBlock: median( results.firstBlock ),
-		type: average( results.type ),
-		minType: minimum( results.type ),
-		maxType: maximum( results.type ),
-		typeWithoutInspector: average( results.typeWithoutInspector ),
-		typeContainer: average( results.typeContainer ),
-		minTypeContainer: minimum( results.typeContainer ),
-		maxTypeContainer: maximum( results.typeContainer ),
-		focus: average( results.focus ),
-		minFocus: minimum( results.focus ),
-		maxFocus: maximum( results.focus ),
-		inserterOpen: average( results.inserterOpen ),
-		minInserterOpen: minimum( results.inserterOpen ),
-		maxInserterOpen: maximum( results.inserterOpen ),
-		inserterSearch: average( results.inserterSearch ),
-		minInserterSearch: minimum( results.inserterSearch ),
-		maxInserterSearch: maximum( results.inserterSearch ),
-		inserterHover: average( results.inserterHover ),
-		minInserterHover: minimum( results.inserterHover ),
-		maxInserterHover: maximum( results.inserterHover ),
-		listViewOpen: average( results.listViewOpen ),
-		minListViewOpen: minimum( results.listViewOpen ),
-		maxListViewOpen: maximum( results.listViewOpen ),
-		navigate: median( results.navigate ),
+		timeToFirstByte: stats( results.timeToFirstByte ),
+		largestContentfulPaint: stats( results.largestContentfulPaint ),
+		lcpMinusTtfb: stats( results.lcpMinusTtfb ),
+		serverResponse: stats( results.serverResponse ),
+		firstPaint: stats( results.firstPaint ),
+		domContentLoaded: stats( results.domContentLoaded ),
+		loaded: stats( results.loaded ),
+		firstContentfulPaint: stats( results.firstContentfulPaint ),
+		firstBlock: stats( results.firstBlock ),
+		type: stats( results.type ),
+		typeWithoutInspector: stats( results.typeWithoutInspector ),
+		typeWithTopToolbar: stats( results.typeWithTopToolbar ),
+		typeContainer: stats( results.typeContainer ),
+		focus: stats( results.focus ),
+		inserterOpen: stats( results.inserterOpen ),
+		inserterSearch: stats( results.inserterSearch ),
+		inserterHover: stats( results.inserterHover ),
+		loadPatterns: stats( results.loadPatterns ),
+		loadPages: stats( results.loadPages ),
+		listViewOpen: stats( results.listViewOpen ),
+		navigate: stats( results.navigate ),
+		wpBeforeTemplate: stats( results.wpBeforeTemplate ),
+		wpTemplate: stats( results.wpTemplate ),
+		wpTotal: stats( results.wpTotal ),
+		wpMemoryUsage: stats( results.wpMemoryUsage ),
+		wpDbQueries: stats( results.wpDbQueries ),
 	};
 
-	return (
+	return Object.fromEntries(
 		Object.entries( output )
 			// Reduce the output to contain taken metrics only.
-			.filter( ( [ _, value ] ) => typeof value === 'number' )
-			.reduce(
-				( acc, [ key, value ] ) => ( {
-					...acc,
-					[ key ]: round( value ),
-				} ),
-				{}
-			)
+			.filter( ( [ , value ] ) => value !== undefined )
 	);
 }
+
+function formatValue( metric: string, value: number ) {
+	if ( 'wpMemoryUsage' === metric ) {
+		return `${ ( value / Math.pow( 10, 6 ) ).toFixed( 2 ) } MB`;
+	}
+
+	if ( 'wpDbQueries' === metric ) {
+		return value.toString();
+	}
+
+	return `${ value } ms`;
+}
+
 class PerformanceReporter implements Reporter {
 	private results: Record< string, WPPerformanceResults >;
 
@@ -188,8 +196,17 @@ class PerformanceReporter implements Reporter {
 		for ( const [ testSuite, results ] of Object.entries( this.results ) ) {
 			const printableResults: Record< string, { value: string } > = {};
 
-			for ( const [ key, value ] of Object.entries( results ) ) {
-				printableResults[ key ] = { value: `${ value } ms` };
+			for ( const [ metric, value ] of Object.entries( results ) ) {
+				const valueStr = formatValue( metric, value.q50 );
+				const pp = round(
+					( 100 * ( value.q75 - value.q50 ) ) / value.q50
+				);
+				const mp = round(
+					( 100 * ( value.q50 - value.q25 ) ) / value.q50
+				);
+				printableResults[ metric ] = {
+					value: `${ valueStr } +${ pp }% -${ mp }%`,
+				};
 			}
 
 			// eslint-disable-next-line no-console
@@ -198,6 +215,18 @@ class PerformanceReporter implements Reporter {
 			console.table( printableResults );
 		}
 	}
+
+	printsToStdio() {
+		return true;
+	}
+
+	onStdOut( chunk: string | Buffer ) {
+		process.stdout.write( chunk );
+	}
+
+	onStdErr( chunk: string | Buffer ) {
+		process.stderr.write( chunk );
+	}
 }
 
 export default PerformanceReporter;
diff --git a/test/performance/fixtures/perf-utils.ts b/test/performance/fixtures/perf-utils.ts
index d17eec2c935b1b..83213a59520dd5 100644
--- a/test/performance/fixtures/perf-utils.ts
+++ b/test/performance/fixtures/perf-utils.ts
@@ -30,13 +30,14 @@ export class PerfUtils {
 	 * Returns the locator for the editor canvas element. This supports both the
 	 * legacy and the iframed canvas.
 	 *
+	 * @param canvasLocator
 	 * @return Locator for the editor canvas element.
 	 */
-	async getCanvas() {
-		const canvasLocator = this.page.locator(
+	async getCanvas(
+		canvasLocator = this.page.locator(
 			'.wp-block-post-content, iframe[name=editor-canvas]'
-		);
-
+		)
+	) {
 		const isFramed = await canvasLocator.evaluate(
 			( node ) => node.tagName === 'IFRAME'
 		);
diff --git a/test/performance/playwright.config.ts b/test/performance/playwright.config.ts
index ed221b1dc7bfbe..fafca3a589122f 100644
--- a/test/performance/playwright.config.ts
+++ b/test/performance/playwright.config.ts
@@ -14,9 +14,7 @@ process.env.ASSETS_PATH = path.join( __dirname, 'assets' );
 
 const config = defineConfig( {
 	...baseConfig,
-	reporter: process.env.CI
-		? './config/performance-reporter.ts'
-		: [ [ 'list' ], [ './config/performance-reporter.ts' ] ],
+	reporter: [ [ 'list' ], [ './config/performance-reporter.ts' ] ],
 	forbidOnly: !! process.env.CI,
 	fullyParallel: false,
 	retries: 0,
diff --git a/test/performance/specs/front-end-block-theme.spec.js b/test/performance/specs/front-end-block-theme.spec.js
index ca48535a21a467..8a0f7b6cf391a2 100644
--- a/test/performance/specs/front-end-block-theme.spec.js
+++ b/test/performance/specs/front-end-block-theme.spec.js
@@ -52,6 +52,13 @@ test.describe( 'Front End Performance', () => {
 				results.largestContentfulPaint.push( lcp );
 				results.timeToFirstByte.push( ttfb );
 				results.lcpMinusTtfb.push( lcp - ttfb );
+
+				const serverTiming = await metrics.getServerTiming();
+
+				for ( const [ key, value ] of Object.entries( serverTiming ) ) {
+					results[ key ] ??= [];
+					results[ key ].push( value );
+				}
 			}
 		} );
 	}
diff --git a/test/performance/specs/front-end-classic-theme.spec.js b/test/performance/specs/front-end-classic-theme.spec.js
index 0b6c3ec22c0465..64929086079fe6 100644
--- a/test/performance/specs/front-end-classic-theme.spec.js
+++ b/test/performance/specs/front-end-classic-theme.spec.js
@@ -51,6 +51,13 @@ test.describe( 'Front End Performance', () => {
 				results.largestContentfulPaint.push( lcp );
 				results.timeToFirstByte.push( ttfb );
 				results.lcpMinusTtfb.push( lcp - ttfb );
+
+				const serverTiming = await metrics.getServerTiming();
+
+				for ( const [ key, value ] of Object.entries( serverTiming ) ) {
+					results[ key ] ??= [];
+					results[ key ].push( value );
+				}
 			}
 		} );
 	}
diff --git a/test/performance/specs/post-editor.spec.js b/test/performance/specs/post-editor.spec.js
index cf2610baa1f9e7..becbf375eff2ac 100644
--- a/test/performance/specs/post-editor.spec.js
+++ b/test/performance/specs/post-editor.spec.js
@@ -23,12 +23,14 @@ const results = {
 	firstBlock: [],
 	type: [],
 	typeWithoutInspector: [],
+	typeWithTopToolbar: [],
 	typeContainer: [],
 	focus: [],
 	listViewOpen: [],
 	inserterOpen: [],
 	inserterHover: [],
 	inserterSearch: [],
+	loadPatterns: [],
 };
 
 test.describe( 'Post Editor Performance', () => {
@@ -87,6 +89,15 @@ test.describe( 'Post Editor Performance', () => {
 							}
 						}
 					);
+
+					const serverTiming = await metrics.getServerTiming();
+
+					for ( const [ key, value ] of Object.entries(
+						serverTiming
+					) ) {
+						results[ key ] ??= [];
+						results[ key ].push( value );
+					}
 				}
 			} );
 		}
@@ -185,6 +196,39 @@ test.describe( 'Post Editor Performance', () => {
 		} );
 	} );
 
+	test.describe( 'Typing (with top toolbar)', () => {
+		let draftId = null;
+
+		test( 'Setup the test post', async ( { admin, perfUtils, editor } ) => {
+			await admin.createNewPost();
+			await perfUtils.loadBlocksForLargePost();
+			await editor.insertBlock( { name: 'core/paragraph' } );
+			draftId = await perfUtils.saveDraft();
+		} );
+
+		test( 'Run the test', async ( {
+			admin,
+			perfUtils,
+			metrics,
+			editor,
+		} ) => {
+			await admin.editPost( draftId );
+			await perfUtils.disableAutosave();
+			// Enable fixed toolbar.
+			await editor.setIsFixedToolbar( true );
+			const canvas = await perfUtils.getCanvas();
+
+			const paragraph = canvas.getByRole( 'document', {
+				name: /Empty block/i,
+			} );
+
+			await type( paragraph, metrics, 'typeWithTopToolbar' );
+
+			// Disabled fixed toolbar. Default state.
+			await editor.setIsFixedToolbar( false );
+		} );
+	} );
+
 	test.describe( 'Typing within containers', () => {
 		let draftId = null;
 
@@ -234,7 +278,7 @@ test.describe( 'Post Editor Performance', () => {
 			const iterations = samples + throwaway;
 			for ( let i = 1; i <= iterations; i++ ) {
 				// Wait for the browser to be idle before starting the monitoring.
-				// eslint-disable-next-line no-restricted-syntax
+				// eslint-disable-next-line no-restricted-syntax, playwright/no-wait-for-timeout
 				await page.waitForTimeout( BROWSER_IDLE_WAIT );
 
 				// Start tracing.
@@ -283,7 +327,7 @@ test.describe( 'Post Editor Performance', () => {
 			const iterations = samples + throwaway;
 			for ( let i = 1; i <= iterations; i++ ) {
 				// Wait for the browser to be idle before starting the monitoring.
-				// eslint-disable-next-line no-restricted-syntax
+				// eslint-disable-next-line no-restricted-syntax, playwright/no-wait-for-timeout
 				await page.waitForTimeout( BROWSER_IDLE_WAIT );
 
 				// Start tracing.
@@ -324,16 +368,18 @@ test.describe( 'Post Editor Performance', () => {
 			// Go to the test page.
 			await admin.editPost( draftId );
 			await perfUtils.disableAutosave();
-			const globalInserterToggle = page.getByRole( 'button', {
-				name: 'Toggle block inserter',
-			} );
+			const globalInserterToggle = page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', {
+					name: 'Block Inserter',
+				} );
 
 			const samples = 10;
 			const throwaway = 1;
 			const iterations = samples + throwaway;
 			for ( let i = 1; i <= iterations; i++ ) {
 				// Wait for the browser to be idle before starting the monitoring.
-				// eslint-disable-next-line no-restricted-syntax
+				// eslint-disable-next-line no-restricted-syntax, playwright/no-wait-for-timeout
 				await page.waitForTimeout( BROWSER_IDLE_WAIT );
 
 				// Start tracing.
@@ -380,12 +426,16 @@ test.describe( 'Post Editor Performance', () => {
 			// Go to the test page.
 			await admin.editPost( draftId );
 			await perfUtils.disableAutosave();
-			const globalInserterToggle = page.getByRole( 'button', {
-				name: 'Toggle block inserter',
-			} );
-
+			const globalInserterToggle = page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', {
+					name: 'Block Inserter',
+				} );
 			// Open Inserter.
 			await globalInserterToggle.click();
+
+			await page.getByRole( 'searchbox' ).click();
+
 			await perfUtils.expectExpandedState( globalInserterToggle, 'true' );
 
 			const samples = 10;
@@ -393,7 +443,7 @@ test.describe( 'Post Editor Performance', () => {
 			const iterations = samples + throwaway;
 			for ( let i = 1; i <= iterations; i++ ) {
 				// Wait for the browser to be idle before starting the monitoring.
-				// eslint-disable-next-line no-restricted-syntax
+				// eslint-disable-next-line no-restricted-syntax, playwright/no-wait-for-timeout
 				await page.waitForTimeout( BROWSER_IDLE_WAIT );
 
 				// Start tracing.
@@ -437,9 +487,11 @@ test.describe( 'Post Editor Performance', () => {
 			await admin.editPost( draftId );
 			await perfUtils.disableAutosave();
 
-			const globalInserterToggle = page.getByRole( 'button', {
-				name: 'Toggle block inserter',
-			} );
+			const globalInserterToggle = page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', {
+					name: 'Block Inserter',
+				} );
 			const paragraphBlockItem = page.locator(
 				'.block-editor-inserter__menu .editor-block-list-item-paragraph'
 			);
@@ -456,7 +508,7 @@ test.describe( 'Post Editor Performance', () => {
 			const iterations = samples + throwaway;
 			for ( let i = 1; i <= iterations; i++ ) {
 				// Wait for the browser to be idle before starting the monitoring.
-				// eslint-disable-next-line no-restricted-syntax
+				// eslint-disable-next-line no-restricted-syntax, playwright/no-wait-for-timeout
 				await page.waitForTimeout( BROWSER_IDLE_WAIT );
 
 				// Start tracing.
@@ -484,6 +536,185 @@ test.describe( 'Post Editor Performance', () => {
 			}
 		} );
 	} );
+
+	test.describe( 'Loading Patterns', () => {
+		test( 'Run the test', async ( { page, admin, perfUtils } ) => {
+			await admin.createNewPost();
+			await perfUtils.disableAutosave();
+			const globalInserterToggle = page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', {
+					name: 'Block Inserter',
+				} );
+
+			const testPatterns = [
+				{
+					name: 'core/query-standard-posts',
+					title: 'Standard',
+					content:
+						'<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query">\n\t\t\t\t\t<!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:post-title {"isLink":true} /-->\n\t\t\t\t\t<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->\n\t\t\t\t\t<!-- wp:post-excerpt /-->\n\t\t\t\t\t<!-- wp:separator -->\n\t\t\t\t\t<hr class="wp-block-separator"/>\n\t\t\t\t\t<!-- /wp:separator -->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- /wp:post-template -->\n\t\t\t\t\t</div>\n\t\t\t\t\t<!-- /wp:query -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-medium-posts',
+					title: 'Image at left',
+					content:
+						'<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query">\n\t\t\t\t\t<!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:columns {"align":"wide"} -->\n\t\t\t\t\t<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-featured-image {"isLink":true} /--></div>\n\t\t\t\t\t<!-- /wp:column -->\n\t\t\t\t\t<!-- wp:column {"width":"33.33%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:post-title {"isLink":true} /-->\n\t\t\t\t\t<!-- wp:post-excerpt /--></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns -->\n\t\t\t\t\t<!-- /wp:post-template -->\n\t\t\t\t\t</div>\n\t\t\t\t\t<!-- /wp:query -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-small-posts',
+					title: 'Small image and title',
+					content:
+						'<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query">\n\t\t\t\t\t<!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:columns {"verticalAlignment":"center"} -->\n\t\t\t\t\t<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"25%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:25%"><!-- wp:post-featured-image {"isLink":true} /--></div>\n\t\t\t\t\t<!-- /wp:column -->\n\t\t\t\t\t<!-- wp:column {"verticalAlignment":"center","width":"75%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:75%"><!-- wp:post-title {"isLink":true} /--></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns -->\n\t\t\t\t\t<!-- /wp:post-template -->\n\t\t\t\t\t</div>\n\t\t\t\t\t<!-- /wp:query -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-grid-posts',
+					title: 'Grid',
+					content:
+						'<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"flex","columns":3}} -->\n\t\t\t\t\t<div class="wp-block-query">\n\t\t\t\t\t<!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:group {"style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:post-title {"isLink":true} /-->\n\t\t\t\t\t<!-- wp:post-excerpt /-->\n\t\t\t\t\t<!-- wp:post-date /--></div>\n\t\t\t\t\t<!-- /wp:group -->\n\t\t\t\t\t<!-- /wp:post-template -->\n\t\t\t\t\t</div>\n\t\t\t\t\t<!-- /wp:query -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-large-title-posts',
+					title: 'Large title',
+					content:
+						'<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff","background":"#000000"}}} -->\n\t\t\t\t\t<div class="wp-block-group alignfull has-text-color has-background" style="background-color:#000000;color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px"><!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:separator {"customColor":"#ffffff","align":"wide","className":"is-style-wide"} -->\n\t\t\t\t\t<hr class="wp-block-separator alignwide has-text-color has-background is-style-wide" style="background-color:#ffffff;color:#ffffff"/>\n\t\t\t\t\t<!-- /wp:separator -->\n\n\t\t\t\t\t<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->\n\t\t\t\t\t<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"20%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"style":{"color":{"text":"#ffffff"}},"fontSize":"extra-small"} /--></div>\n\t\t\t\t\t<!-- /wp:column -->\n\n\t\t\t\t\t<!-- wp:column {"verticalAlignment":"center","width":"80%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontSize":"72px","lineHeight":"1.1"},"color":{"text":"#ffffff","link":"#ffffff"}}} /--></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns -->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:group -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-offset-posts',
+					title: 'Offset',
+					content:
+						'<!-- wp:group {"style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->\n\t\t\t\t\t<div class="wp-block-columns"><!-- wp:column {"width":"50%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:post-featured-image /-->\n\t\t\t\t\t<!-- wp:post-title /-->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- wp:spacer {"height":200} -->\n\t\t\t\t\t<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>\n\t\t\t\t\t<!-- /wp:spacer -->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:column -->\n\t\t\t\t\t<!-- wp:column {"width":"50%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":2,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:spacer {"height":200} -->\n\t\t\t\t\t<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>\n\t\t\t\t\t<!-- /wp:spacer -->\n\t\t\t\t\t<!-- wp:post-featured-image /-->\n\t\t\t\t\t<!-- wp:post-title /-->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns --></div>\n\t\t\t\t\t<!-- /wp:group -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/social-links-shared-background-color',
+					title: 'Social links with a shared background color',
+					content:
+						'<!-- wp:social-links {"customIconColor":"#ffffff","iconColorValue":"#ffffff","customIconBackgroundColor":"#3962e3","iconBackgroundColorValue":"#3962e3","className":"has-icon-color"} -->\n\t\t\t\t\t\t<ul class="wp-block-social-links has-icon-color has-icon-background-color"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->\n\t\t\t\t\t\t<!-- wp:social-link {"url":"#","service":"chain"} /-->\n\t\t\t\t\t\t<!-- wp:social-link {"url":"#","service":"mail"} /--></ul>\n\t\t\t\t\t\t<!-- /wp:social-links -->',
+					viewportWidth: 500,
+					categories: [ 'test' ],
+					blockTypes: [ 'core/social-links' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-large-title-posts-2',
+					title: 'Large title 2',
+					content:
+						'<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff","background":"#000000"}}} -->\n\t\t\t\t\t<div class="wp-block-group alignfull has-text-color has-background" style="background-color:#000000;color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px"><!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:separator {"customColor":"#ffffff","align":"wide","className":"is-style-wide"} -->\n\t\t\t\t\t<hr class="wp-block-separator alignwide has-text-color has-background is-style-wide" style="background-color:#ffffff;color:#ffffff"/>\n\t\t\t\t\t<!-- /wp:separator -->\n\n\t\t\t\t\t<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->\n\t\t\t\t\t<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"20%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"style":{"color":{"text":"#ffffff"}},"fontSize":"extra-small"} /--></div>\n\t\t\t\t\t<!-- /wp:column -->\n\n\t\t\t\t\t<!-- wp:column {"verticalAlignment":"center","width":"80%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontSize":"72px","lineHeight":"1.1"},"color":{"text":"#ffffff","link":"#ffffff"}}} /--></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns -->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:group -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-offset-posts-2',
+					title: 'Offset 2',
+					content:
+						'<!-- wp:group {"style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->\n\t\t\t\t\t<div class="wp-block-columns"><!-- wp:column {"width":"50%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:post-featured-image /-->\n\t\t\t\t\t<!-- wp:post-title /-->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- wp:spacer {"height":200} -->\n\t\t\t\t\t<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>\n\t\t\t\t\t<!-- /wp:spacer -->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:column -->\n\t\t\t\t\t<!-- wp:column {"width":"50%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":2,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:spacer {"height":200} -->\n\t\t\t\t\t<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>\n\t\t\t\t\t<!-- /wp:spacer -->\n\t\t\t\t\t<!-- wp:post-featured-image /-->\n\t\t\t\t\t<!-- wp:post-title /-->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns --></div>\n\t\t\t\t\t<!-- /wp:group -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/social-links-shared-background-color-2',
+					title: 'Social links with a shared background color 2',
+					content:
+						'<!-- wp:social-links {"customIconColor":"#ffffff","iconColorValue":"#ffffff","customIconBackgroundColor":"#3962e3","iconBackgroundColorValue":"#3962e3","className":"has-icon-color"} -->\n\t\t\t\t\t\t<ul class="wp-block-social-links has-icon-color has-icon-background-color"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->\n\t\t\t\t\t\t<!-- wp:social-link {"url":"#","service":"chain"} /-->\n\t\t\t\t\t\t<!-- wp:social-link {"url":"#","service":"mail"} /--></ul>\n\t\t\t\t\t\t<!-- /wp:social-links -->',
+					viewportWidth: 500,
+					categories: [ 'test' ],
+					blockTypes: [ 'core/social-links' ],
+					source: 'core',
+				},
+			];
+
+			await page.evaluate( ( _testPatterns ) => {
+				const settings = window.wp.data
+					.select( 'core/editor' )
+					.getEditorSettings();
+				window.wp.data.dispatch( 'core/editor' ).updateEditorSettings( {
+					...settings,
+					__experimentalAdditionalBlockPatternCategories: [
+						...settings.__experimentalAdditionalBlockPatternCategories,
+						{ name: 'test', label: 'Test' },
+					],
+					__experimentalAdditionalBlockPatterns: [
+						...settings.__experimentalAdditionalBlockPatterns,
+						..._testPatterns,
+					],
+				} );
+			}, testPatterns );
+
+			const samples = 10;
+			const throwaway = 1;
+			const iterations = samples + throwaway;
+			for ( let i = 1; i <= iterations; i++ ) {
+				// Wait for the browser to be idle before starting the monitoring.
+				// eslint-disable-next-line no-restricted-syntax, playwright/no-wait-for-timeout
+				await page.waitForTimeout( BROWSER_IDLE_WAIT );
+
+				await globalInserterToggle.click();
+				await perfUtils.expectExpandedState(
+					globalInserterToggle,
+					'true'
+				);
+				await page.getByRole( 'tab', { name: 'Patterns' } ).click();
+
+				const startTime = performance.now();
+
+				// This is the WP v6.5 and older locator.
+				const oldLocator = page.getByRole( 'button', { name: 'Test' } );
+				// This is the WP v6.6 and newer locator.
+				const newLocator = page.getByRole( 'tab', { name: 'Test' } );
+
+				await oldLocator.or( newLocator ).click();
+
+				await Promise.all(
+					testPatterns.map( async ( pattern ) => {
+						const canvas = await perfUtils.getCanvas(
+							page
+								.getByRole( 'option', {
+									name: pattern.title,
+									exact: true,
+								} )
+								.getByTitle( 'Editor canvas' )
+						);
+
+						// Wait for the first block.
+						await canvas.locator( '.wp-block' ).first().waitFor();
+					} )
+				);
+
+				const endTime = performance.now();
+
+				// Save the results.
+				if ( i > throwaway ) {
+					results.loadPatterns.push( endTime - startTime );
+				}
+
+				// Close Inserter.
+				await globalInserterToggle.click();
+				await perfUtils.expectExpandedState(
+					globalInserterToggle,
+					'false'
+				);
+			}
+		} );
+	} );
 } );
 
 /* eslint-enable playwright/no-conditional-in-test, playwright/expect-expect */
diff --git a/test/performance/specs/site-editor.spec.js b/test/performance/specs/site-editor.spec.js
index 38bcceb14edd61..9c9d8aec71da4a 100644
--- a/test/performance/specs/site-editor.spec.js
+++ b/test/performance/specs/site-editor.spec.js
@@ -28,6 +28,8 @@ const results = {
 	inserterSearch: [],
 	listViewOpen: [],
 	navigate: [],
+	loadPatterns: [],
+	loadPages: [],
 };
 
 test.describe( 'Site Editor Performance', () => {
@@ -80,6 +82,7 @@ test.describe( 'Site Editor Performance', () => {
 				await admin.visitSiteEditor( {
 					postId: draftId,
 					postType: 'page',
+					canvas: 'edit',
 				} );
 
 				// Wait for the first block.
@@ -100,6 +103,15 @@ test.describe( 'Site Editor Performance', () => {
 							}
 						}
 					);
+
+					const serverTiming = await metrics.getServerTiming();
+
+					for ( const [ key, value ] of Object.entries(
+						serverTiming
+					) ) {
+						results[ key ] ??= [];
+						results[ key ].push( value );
+					}
 				}
 			} );
 		}
@@ -116,16 +128,32 @@ test.describe( 'Site Editor Performance', () => {
 			draftId = await perfUtils.saveDraft();
 		} );
 
-		test( 'Run the test', async ( { admin, perfUtils, metrics } ) => {
+		test( 'Run the test', async ( { admin, perfUtils, metrics, page } ) => {
 			// Go to the test draft.
 			await admin.visitSiteEditor( {
 				postId: draftId,
 				postType: 'page',
+				canvas: 'edit',
 			} );
 
 			// Enter edit mode (second click is needed for the legacy edit mode).
 			const canvas = await perfUtils.getCanvas();
-			await canvas.locator( 'body' ).click();
+
+			// Run the test with the sidebar closed
+			const toggleSidebarButton = page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', {
+					name: 'Settings',
+					disabled: false,
+				} );
+			const isClosed =
+				( await toggleSidebarButton.getAttribute(
+					'aria-expanded'
+				) ) === 'false';
+			if ( ! isClosed ) {
+				await toggleSidebarButton.click();
+			}
+
 			await canvas
 				.getByRole( 'document', { name: /Block:( Post)? Content/ } )
 				.click();
@@ -185,17 +213,29 @@ test.describe( 'Site Editor Performance', () => {
 				metrics,
 			} ) => {
 				await admin.visitSiteEditor( {
+					// The old URL is supported in both previous versions and new versions.
 					path: '/wp_template',
 				} );
 
-				// Start tracing.
-				await metrics.startTracing();
-
-				await page
-					.getByRole( 'button', { name: 'Single Posts' } )
-					.click();
+				// The Templates index page has changed, so we need to know which UI is in use in the branch.
+				// We do so by checking the presence of the dataviews component.
+				// If it's there, switch to the list layout before running the test.
+				// See https://github.com/WordPress/gutenberg/pull/59792
+				const isDataViewsUI = await page
+					.getByRole( 'button', { name: 'Layout' } )
+					.isVisible();
+				if ( isDataViewsUI ) {
+					await page
+						.getByRole( 'button', { name: 'Layout' } )
+						.click();
+					await page
+						.getByRole( 'menuitemradio' )
+						.filter( { has: page.getByText( 'List' ) } )
+						.click();
+				}
 
-				// Stop tracing.
+				await metrics.startTracing();
+				await page.getByText( 'Single Posts', { exact: true } ).click();
 				await metrics.stopTracing();
 
 				// Get the durations.
@@ -206,6 +246,209 @@ test.describe( 'Site Editor Performance', () => {
 			} );
 		}
 	} );
+
+	test.describe( 'Loading Patterns', () => {
+		test.beforeAll( async ( { requestUtils } ) => {
+			await requestUtils.activateTheme( 'twentytwentyfour' );
+		} );
+
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.activateTheme( 'twentytwentyfour' );
+		} );
+
+		test( 'Run the test', async ( {
+			page,
+			admin,
+			perfUtils,
+			editor,
+			requestUtils,
+		} ) => {
+			await Promise.all(
+				Array.from( { length: 10 }, async () => {
+					const { id } = await requestUtils.createPost( {
+						status: 'publish',
+						title: 'A post',
+						content: `
+<!-- wp:heading -->
+<p>Hello</p>
+<!-- /wp:heading -->
+<!-- wp:paragraph -->
+<p>Post content</p>
+<!-- /wp:paragraph -->`,
+					} );
+
+					return id;
+				} )
+			);
+
+			const samples = 10;
+			for ( let i = 1; i <= samples; i++ ) {
+				// We want to start from a fresh state each time, without
+				// queries or patterns already cached.
+				await admin.visitSiteEditor( {
+					postId: 'twentytwentyfour//home',
+					postType: 'wp_template',
+					canvas: 'edit',
+				} );
+				await editor.openDocumentSettingsSidebar();
+
+				/*
+				 * https://github.com/WordPress/gutenberg/pull/55091 updated the HTML by
+				 * removing the replace template button in sidebar-edit-mode/template-panel/replace-template-button.js
+				 * with a "transform into" list. https://github.com/WordPress/gutenberg/pull/59259 made these tests
+				 * compatible with the new UI, however, the performance tests compare previous versions of the UI.
+				 *
+				 * The following code is a workaround to test the performance of the new UI.
+				 * `actionsButtonElement` is used to check if the old UI is present.
+				 * If there is a Replace template button (old UI), click it, otherwise, click the "transform into" button.
+				 * Once the performance tests are updated to compare compatible versions this code can be removed.
+				 */
+				// eslint-disable-next-line no-restricted-syntax
+				const isActionsButtonVisible = await page
+					.locator(
+						'.edit-site-template-card__actions button[aria-label="Actions"]'
+					)
+					.isVisible();
+
+				if ( isActionsButtonVisible ) {
+					await page
+						.getByRole( 'button', {
+							name: 'Actions',
+						} )
+						.click();
+				}
+
+				// Wait for the browser to be idle before starting the monitoring.
+				// eslint-disable-next-line no-restricted-syntax, playwright/no-wait-for-timeout
+				await page.waitForTimeout( BROWSER_IDLE_WAIT );
+
+				const startTime = performance.now();
+
+				if ( isActionsButtonVisible ) {
+					await page
+						.getByRole( 'menuitem', { name: 'Replace template' } )
+						.click();
+				} else {
+					await page
+						.getByRole( 'button', { name: 'Design' } )
+						.or(
+							// Locator for backward compatibility with the old UI.
+							// The label was updated in https://github.com/WordPress/gutenberg/pull/62161.
+							page.getByRole( 'button', {
+								name: 'Transform into:',
+							} )
+						)
+						.click();
+				}
+
+				const patterns = [
+					'Blogging home template',
+					'Business home template',
+					'Portfolio home template with post featured images',
+					'Blogging index template',
+				];
+
+				await Promise.all(
+					patterns.map( async ( pattern ) => {
+						const canvas = await perfUtils.getCanvas(
+							page
+								.getByRole( 'option', {
+									name: pattern,
+									exact: true,
+								} )
+								.getByTitle( 'Editor canvas' )
+						);
+
+						// Wait until the first block is rendered AND all
+						// patterns are replaced.
+						await Promise.all( [
+							canvas.locator( '.wp-block' ).first().waitFor(),
+							page.waitForFunction(
+								() =>
+									document.querySelectorAll(
+										'[data-type="core/pattern"]'
+									).length === 0
+							),
+						] );
+					} )
+				);
+
+				const endTime = performance.now();
+
+				results.loadPatterns.push( endTime - startTime );
+
+				await page.keyboard.press( 'Escape' );
+			}
+		} );
+	} );
+
+	test.describe( 'Loading Pages', () => {
+		test.beforeAll( async ( { requestUtils } ) => {
+			await requestUtils.activateTheme( 'twentytwentyfour' );
+		} );
+
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.activateTheme( 'twentytwentyfour' );
+		} );
+
+		const perPage = 20;
+
+		test( 'Run the test', async ( { page, admin, requestUtils } ) => {
+			await Promise.all(
+				Array.from( { length: perPage }, async ( el, index ) => {
+					const { id } = await requestUtils.createPage( {
+						status: 'publish',
+						title: `Page (${ index })`,
+						content: `
+<!-- wp:heading -->
+<p>Hello</p>
+<!-- /wp:heading -->
+<!-- wp:paragraph -->
+<p>Post content</p>
+<!-- /wp:paragraph -->`,
+					} );
+
+					return id;
+				} )
+			);
+
+			await admin.visitSiteEditor();
+			await page.getByRole( 'button', { name: 'Pages' } ).click();
+
+			// Check if we're dealing with the old URL structure.
+			const path = new URL( page.url() ).searchParams.get( 'path' );
+
+			const samples = 10;
+			for ( let i = 1; i <= samples; i++ ) {
+				// Start from the trash view, then navigate to all pages, so we
+				// test item loading rather than site editor load as a whole.
+				// For some reason `visiSiteEditor` does not work with these
+				// parameters.
+				await admin.visitAdminPage(
+					path
+						? 'site-editor.php?path=%2Fpage&layout=table&activeView=trash'
+						: 'site-editor.php?postType=page&layout=table&activeView=trash'
+				);
+
+				const startTime = performance.now();
+
+				await page.getByRole( 'button', { name: 'All Pages' } ).click();
+
+				// Wait for all pages to be rendered.
+				await Promise.all(
+					Array.from( { length: perPage }, async ( el, index ) => {
+						return await page
+							.getByLabel( `Page (${ index })` )
+							.waitFor( { state: 'attached' } );
+					} )
+				);
+
+				const endTime = performance.now();
+
+				results.loadPages.push( endTime - startTime );
+			}
+		} );
+	} );
 } );
 
 /* eslint-enable playwright/no-conditional-in-test, playwright/expect-expect */
diff --git a/test/performance/tsconfig.json b/test/performance/tsconfig.json
index 7f855fd0ba69c8..28d349fc19bef7 100644
--- a/test/performance/tsconfig.json
+++ b/test/performance/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"noEmit": true,
diff --git a/test/performance/utils.js b/test/performance/utils.js
index e14ff71436d735..b30df24b130f6a 100644
--- a/test/performance/utils.js
+++ b/test/performance/utils.js
@@ -4,19 +4,36 @@
 import { existsSync, readFileSync, unlinkSync } from 'fs';
 
 export function sum( array ) {
-	if ( ! array || ! array.length ) return undefined;
+	if ( ! array || ! array.length ) {
+		return undefined;
+	}
 
 	return array.reduce( ( a, b ) => a + b, 0 );
 }
 
 export function average( array ) {
-	if ( ! array || ! array.length ) return undefined;
+	if ( ! array || ! array.length ) {
+		return undefined;
+	}
 
 	return sum( array ) / array.length;
 }
 
+export function variance( array ) {
+	if ( ! array || ! array.length ) {
+		return undefined;
+	}
+
+	return Math.sqrt(
+		sum( array.map( ( x ) => x ** 2 ) ) / array.length -
+			( sum( array ) / array.length ) ** 2
+	);
+}
+
 export function median( array ) {
-	if ( ! array || ! array.length ) return undefined;
+	if ( ! array || ! array.length ) {
+		return undefined;
+	}
 
 	const numbers = [ ...array ].sort( ( a, b ) => a - b );
 	const middleIndex = Math.floor( numbers.length / 2 );
@@ -27,14 +44,67 @@ export function median( array ) {
 	return numbers[ middleIndex ];
 }
 
+export function quartiles( array ) {
+	const numbers = array.slice().sort( ( a, b ) => a - b );
+
+	function med( offset, length ) {
+		if ( length % 2 === 0 ) {
+			// even length, average of two middle numbers
+			return (
+				( numbers[ offset + length / 2 - 1 ] +
+					numbers[ offset + length / 2 ] ) /
+				2
+			);
+		}
+
+		// odd length, exact middle point
+		return numbers[ offset + ( length - 1 ) / 2 ];
+	}
+
+	const q50 = med( 0, numbers.length );
+
+	let q25, q75;
+	if ( numbers.length % 2 === 0 ) {
+		// medians of two exact halves
+		const mid = numbers.length / 2;
+		q25 = med( 0, mid );
+		q75 = med( mid, mid );
+	} else {
+		// quartiles are average of medians of the smaller and bigger slice
+		const midl = ( numbers.length - 1 ) / 2;
+		const midh = ( numbers.length + 1 ) / 2;
+		q25 = ( med( 0, midl ) + med( 0, midh ) ) / 2;
+		q75 = ( med( midl, midh ) + med( midh, midl ) ) / 2;
+	}
+	return { q25, q50, q75 };
+}
+
+export function stats( values ) {
+	if ( ! values || values.length === 0 ) {
+		return undefined;
+	}
+	const { q25, q50, q75 } = quartiles( values );
+	const cnt = values.length;
+	return {
+		q25: round( q25 ),
+		q50: round( q50 ),
+		q75: round( q75 ),
+		cnt,
+	};
+}
+
 export function minimum( array ) {
-	if ( ! array || ! array.length ) return undefined;
+	if ( ! array || ! array.length ) {
+		return undefined;
+	}
 
 	return Math.min( ...array );
 }
 
 export function maximum( array ) {
-	if ( ! array || ! array.length ) return undefined;
+	if ( ! array || ! array.length ) {
+		return undefined;
+	}
 
 	return Math.max( ...array );
 }
diff --git a/test/php/gutenberg-coding-standards/.phpcs.xml.dist b/test/php/gutenberg-coding-standards/.phpcs.xml.dist
index 7f717f65374d7b..7ebe60e3d28567 100644
--- a/test/php/gutenberg-coding-standards/.phpcs.xml.dist
+++ b/test/php/gutenberg-coding-standards/.phpcs.xml.dist
@@ -1,15 +1,8 @@
 <?xml version="1.0"?>
-<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="WordPress Coding Standards" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Gutenberg Coding Standards" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/PHPCSStandards/PHP_CodeSniffer/master/phpcs.xsd">
 
 	<description>The Coding standard for the Gutenberg Coding Standards itself.</description>
 
-	<!--
-	#############################################################################
-	COMMAND LINE ARGUMENTS
-	https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset
-	#############################################################################
-	-->
-
 	<file>.</file>
 
 	<!-- Exclude Composer vendor directory. -->
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/CodeAnalysis/ForbiddenFunctionsAndClassesSniff.php b/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/CodeAnalysis/ForbiddenFunctionsAndClassesSniff.php
new file mode 100644
index 00000000000000..12d388cc378180
--- /dev/null
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/CodeAnalysis/ForbiddenFunctionsAndClassesSniff.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * Gutenberg Coding Standards.
+ *
+ * @package gutenberg/gutenberg-coding-standards
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
+ */
+
+namespace GutenbergCS\Gutenberg\Sniffs\CodeAnalysis;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * This sniff enforces usage restrictions on specific classes and functions within the Gutenberg project.
+ * While it permits the declaration of these classes/functions, their actual usage in code is forbidden based on defined regular expressions.
+ *
+ * @package gutenberg/gutenberg-coding-standards
+ *
+ * @since   1.0.0
+ */
+final class ForbiddenFunctionsAndClassesSniff implements Sniff {
+
+	/**
+	 * Holds regular expressions for classes whose usage is forbidden.
+	 * Note that declaring functions with names matching these regular expressions is still permitted.
+	 * Useful for enforcing security or architectural constraints.
+	 *
+	 * @var array Array of regex patterns for forbidden classes.
+	 */
+	public $forbidden_classes = array();
+
+	/**
+	 * Holds regular expressions for classes whose usage is forbidden.
+	 * Note that declaring classes with names matching these regular expressions is still permitted.
+	 * Useful for enforcing security or architectural constraints.
+	 *
+	 * @var array Array of regex patterns for forbidden functions.
+	 */
+	public $forbidden_functions = array();
+
+	/**
+	 * Registers the tokens that this sniff wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register() {
+		$this->on_register_event();
+
+		return array( T_STRING );
+	}
+
+	/**
+	 * Handles processing tokens.
+	 *
+	 * @param File $phpcsFile The file being scanned.
+	 * @param int  $stackPtr  The position of the current token
+	 *                        in the stack passed in $tokens.
+	 */
+	public function process( File $phpcsFile, $stackPtr ) {
+		$this->process_string_token( $phpcsFile, $stackPtr );
+	}
+
+	/**
+	 * Detects whether a given string token represents a function call or class usage.
+	 * It then delegates further processing based on the type of usage detected.
+	 *
+	 * @param File $phpcs_file The file being scanned.
+	 * @param int  $stack_pointer  The position of the current token in the token stack.
+	 */
+	private function process_string_token( File $phpcs_file, $stack_pointer ) {
+		if ( empty( $this->forbidden_functions ) && empty( $this->forbidden_classes ) ) {
+			// Nothing to process.
+			return;
+		}
+
+		$tokens = $phpcs_file->getTokens();
+
+		$next_token = $phpcs_file->findPrevious( T_WHITESPACE, ( $stack_pointer + 1 ), null, true, null, true );
+		if ( false !== $next_token && ( T_DOUBLE_COLON === $tokens[ $next_token ]['code'] ) ) {
+			// Static class method or a class constant.
+			$this->check_class_usage( $phpcs_file, $stack_pointer );
+
+			return;
+		}
+
+		$previous_token = $phpcs_file->findPrevious( T_WHITESPACE, $stack_pointer - 1, null, true, null, true );
+		if ( false !== $previous_token && ( T_NEW === $tokens[ $previous_token ]['code'] ) ) {
+			// Static method or a constant usage.
+			$this->check_class_usage( $phpcs_file, $stack_pointer );
+
+			return;
+		}
+
+		if ( false !== $next_token && ( T_OPEN_PARENTHESIS === $tokens[ $next_token ]['code'] ) ) {
+			// Function.
+			$this->check_function_usage( $phpcs_file, $stack_pointer );
+		}
+	}
+
+	/**
+	 * Checks for forbidden class usage.
+	 *
+	 * @param File $phpcs_file    File being scanned.
+	 * @param int  $stack_pointer Position of the text token in the token stack.
+	 */
+	private function check_class_usage( File $phpcs_file, $stack_pointer ) {
+		if ( empty( $this->forbidden_classes ) ) {
+			// Nothing to process.
+			return;
+		}
+
+		if ( $this->check_if_token_guarded( $phpcs_file, $stack_pointer ) ) {
+			// The token is guarded. Nothing to process.
+			return;
+		}
+
+		$tokens     = $phpcs_file->getTokens();
+		$class_name = $tokens[ $stack_pointer ]['content'];
+
+		foreach ( $this->forbidden_classes as $forbidden_class ) {
+			$regexp = sprintf( '/^%s$/', $forbidden_class );
+			if ( 1 !== preg_match( $regexp, $class_name ) ) {
+				// The class has a valid name; bypassing further checks.
+				return;
+			}
+		}
+
+		$error_message = 'It\'s not allowed to use the "' . $class_name . '" class as its name matches the forbidden pattern: "' . $regexp . '".';
+		$phpcs_file->addError( $error_message, $stack_pointer, 'ForbiddenClassUsage' );
+	}
+
+	/**
+	 * Checks for forbidden function usage.
+	 *
+	 * @param File $phpcs_file    File being scanned.
+	 * @param int  $stack_pointer Position of the text token in the token stack.
+	 */
+	private function check_function_usage( File $phpcs_file, $stack_pointer ) {
+		if ( empty( $this->forbidden_functions ) ) {
+			// Nothing to process.
+			return;
+		}
+
+		if ( $this->check_if_token_guarded( $phpcs_file, $stack_pointer ) ) {
+			// The token is guarded. Nothing to process.
+			return;
+		}
+
+		$tokens        = $phpcs_file->getTokens();
+		$function_name = $tokens[ $stack_pointer ]['content'];
+
+		foreach ( $this->forbidden_functions as $disallowed_function_call ) {
+			$regexp = sprintf( '/^%s$/', $disallowed_function_call );
+			if ( 1 !== preg_match( $regexp, $function_name ) ) {
+				// The function has a valid name; bypassing further checks.
+				return;
+			}
+		}
+
+		$error_message = 'It\'s not allowed to call the "' . $function_name . '()" function as its name matches the forbidden pattern: "' . $regexp . '".';
+		$phpcs_file->addError( $error_message, $stack_pointer, 'ForbiddenFunctionCall' );
+	}
+
+	/**
+	 * This function looks for a specific if condition that wraps the token
+	 * to determine if it's protected from execution outside of Gutenberg.
+	 *
+	 * Example of a guarded function (works similarly for classes):
+	 * if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+	 *     // gutenberg_prefixed_i_am_allowed_to_be_called_since_i_am_guarded_function();
+	 * }
+	 *
+	 * @param File $phpcs_file    File being scanned.
+	 * @param int  $stack_pointer Position of the text token in the token stack.
+	 *
+	 * @return bool               Returns true if the token is guarded.
+	 */
+	private function check_if_token_guarded( File $phpcs_file, $stack_pointer ) {
+		if ( false === $phpcs_file->hasCondition( $stack_pointer, T_IF ) ) {
+			// No wrapping IF tokens. Stop processing.
+			return false;
+		}
+
+		$tokens = $phpcs_file->getTokens();
+
+		// It has to start from the matched condition closest to the passed token.
+		$conditions = array_reverse( $tokens[ $stack_pointer ]['conditions'], true );
+
+		// Matches the "if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN" string.
+		$regexp = '/if\s*\(\s*defined\(\s*(\'|")IS_GUTENBERG_PLUGIN(\'|")\s*\)\s*&&\s*IS_GUTENBERG_PLUGIN/';
+
+		foreach ( $conditions as $wrapping_if_token => $condition ) {
+			if ( T_IF !== $condition ) {
+				continue;
+			}
+
+			$end_of_wrapping_if_token = $phpcs_file->findEndOfStatement( $wrapping_if_token );
+			$content                  = $phpcs_file->getTokensAsString( $wrapping_if_token, $end_of_wrapping_if_token - $wrapping_if_token );
+
+			if ( 1 === preg_match( $regexp, $content ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * The purpose of this method is to run callbacks
+	 * after the class properties have been set.
+	 */
+	private function on_register_event() {
+		$this->forbidden_classes   = self::sanitize( $this->forbidden_classes );
+		$this->forbidden_functions = self::sanitize( $this->forbidden_functions );
+	}
+
+	/**
+	 * Sanitize an array of values by trimming each element and removing empty elements.
+	 *
+	 * @param array $values The values being sanitized.
+	 *
+	 * @return array
+	 */
+	private static function sanitize( $values ) {
+		$values = array_map( 'trim', $values );
+
+		return array_filter( $values );
+	}
+}
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/CodeAnalysis/GuardedFunctionAndClassNamesSniff.php b/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/CodeAnalysis/GuardedFunctionAndClassNamesSniff.php
index 65c42071192b4e..d947d6d9382b35 100644
--- a/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/CodeAnalysis/GuardedFunctionAndClassNamesSniff.php
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/CodeAnalysis/GuardedFunctionAndClassNamesSniff.php
@@ -3,8 +3,7 @@
  * Gutenberg Coding Standards.
  *
  * @package gutenberg/gutenberg-coding-standards
- * @link    https://github.com/WordPress/gutenberg
- * @license https://opensource.org/licenses/MIT MIT
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
  */
 
 namespace GutenbergCS\Gutenberg\Sniffs\CodeAnalysis;
@@ -134,12 +133,6 @@ private function processFunctionToken( File $phpcsFile, $stackPointer ) {
 	/**
 	 * Classes should be wrapped with !function_exists() to avoid fatal errors.
 	 * E.g.:
-	 * if ( class_exists( 'WP_Navigation' ) ) {
-	 *     return;
-	 * }
-	 *
-	 * Alternatively:
-	 *
 	 * if ( ! class_exists( 'WP_Navigation' ) ) {
 	 *    class WP_Navigation { ... }
 	 * }
@@ -188,10 +181,14 @@ private function processClassToken( File $phpcsFile, $stackPointer ) {
 		$result               = preg_match( $regexp, $content );
 
 		if ( 1 === $result ) {
-			$returnToken = $phpcsFile->findNext( T_RETURN, $previousIfToken, $endOfPreviousIfToken );
-			if ( false !== $returnToken ) {
-				return;
-			}
+			$notProperlyGuardedErrorMessage = sprintf(
+				'The class "%s" is not properly guarded against redeclaration. Please ensure the entire class body is wrapped within an "if ( ! class_exists( \'%s\' ) ) {" statement.',
+				$className,
+				$className
+			);
+
+			$phpcsFile->addError( $notProperlyGuardedErrorMessage, $classToken, 'ClassNotProperlyGuardedAgainstRedeclaration' );
+			return;
 		}
 
 		$phpcsFile->addError( $errorMessage, $classToken, 'ClassNotGuardedAgainstRedeclaration' );
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/Commenting/SinceTagSniff.php b/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/Commenting/SinceTagSniff.php
new file mode 100644
index 00000000000000..20f698954cb267
--- /dev/null
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/Commenting/SinceTagSniff.php
@@ -0,0 +1,583 @@
+<?php
+/**
+ * Gutenberg Coding Standards.
+ *
+ * @package gutenberg/gutenberg-coding-standards
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
+ */
+
+namespace GutenbergCS\Gutenberg\Sniffs\Commenting;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
+use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\FunctionDeclarations;
+use PHPCSUtils\Utils\GetTokensAsString;
+use PHPCSUtils\Utils\ObjectDeclarations;
+use PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\Variables;
+
+/**
+ * This sniff verifies the presence of valid `@since` tags in the docblocks of various PHP structures
+ * and WordPress hooks. Supported structures include classes, interfaces, traits, enums, functions, methods and properties.
+ * Files located within the __experimental blocks of the block-library folder are excluded from checks.
+ */
+class SinceTagSniff implements Sniff {
+
+	/**
+	 * Disable the check for functions with a lower visibility than the value given.
+	 *
+	 * Allowed values are public, protected, and private.
+	 *
+	 * @var string
+	 */
+	public $minimumVisibility = 'private';
+
+	/**
+	 * A map of tokens representing an object-oriented programming structure to their human-readable names.
+	 * This map helps in identifying different OO structures such as classes, interfaces, traits, and enums.
+	 *
+	 * @var array
+	 */
+	protected static $oo_tokens = array(
+		T_CLASS     => array(
+			'name' => 'class',
+		),
+		T_INTERFACE => array(
+			'name' => 'interface',
+		),
+		T_TRAIT     => array(
+			'name' => 'trait',
+		),
+		T_ENUM      => array(
+			'name' => 'enum',
+		),
+	);
+
+	/**
+	 * This property is used to store results returned
+	 * by the static::is_experimental_block() method.
+	 *
+	 * @var array
+	 */
+	protected static $cache = array();
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array<int|string>
+	 */
+	public function register() {
+		return array_merge(
+			array(
+				T_FUNCTION,
+				T_VARIABLE,
+				T_STRING,
+			),
+			array_keys( static::$oo_tokens )
+		);
+	}
+
+	/**
+	 * Processes the tokens that this sniff is interested in.
+	 *
+	 * @param File $phpcsFile The file being scanned.
+	 * @param int  $stackPtr  The position of the current token in the stack passed in $tokens.
+	 */
+	public function process( File $phpcsFile, $stackPtr ) {
+		if ( static::is_experimental_block( $phpcsFile ) ) {
+			// The "@since" tag is not required for experimental blocks since they are not yet included in WordPress Core.
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+		$token  = $tokens[ $stackPtr ];
+
+		if ( 'T_FUNCTION' === $token['type'] ) {
+			$this->process_function_token( $phpcsFile, $stackPtr );
+			return;
+		}
+
+		if ( isset( static::$oo_tokens[ $token['code'] ] ) ) {
+			$this->process_oo_token( $phpcsFile, $stackPtr );
+			return;
+		}
+
+		if ( 'T_STRING' === $token['type'] && static::is_function_call( $phpcsFile, $stackPtr ) ) {
+			$this->process_hook( $phpcsFile, $stackPtr );
+			return;
+		}
+
+		if ( 'T_VARIABLE' === $token['type'] && Scopes::isOOProperty( $phpcsFile, $stackPtr ) ) {
+			$this->process_property_token( $phpcsFile, $stackPtr );
+		}
+	}
+
+	/**
+	 * Processes a token representing a function call that invokes a WordPress hook,
+	 * checking for a missing `@since` tag in its docblock.
+	 *
+	 * @param File $phpcs_file    The file being scanned.
+	 * @param int  $stack_pointer The position of the hook token in the stack.
+	 */
+	protected function process_hook( File $phpcs_file, $stack_pointer ) {
+		$tokens = $phpcs_file->getTokens();
+
+		// The content of the current token.
+		$hook_function = $tokens[ $stack_pointer ]['content'];
+
+		$hook_invocation_functions = array(
+			'do_action',
+			'do_action_ref_array',
+			'do_action_deprecated',
+			'apply_filters',
+			'apply_filters_ref_array',
+			'apply_filters_deprecated',
+		);
+
+		// Check if the current token content is one of the filter functions.
+		if ( ! in_array( $hook_function, $hook_invocation_functions, true ) ) {
+			// Not a hook.
+			return;
+		}
+
+		$error_message_data = array( $hook_function );
+
+		$violation_codes = static::get_violation_codes( 'Hook' );
+
+		$docblock = static::find_docblock( $phpcs_file, $stack_pointer );
+
+		$version_tags = static::parse_since_tags( $phpcs_file, $docblock );
+		if ( empty( $version_tags ) ) {
+			if ( false !== $docblock ) {
+				$docblock_content = GetTokensAsString::compact( $phpcs_file, $docblock['start_token'], $docblock['end_token'], false );
+				if ( false !== stripos( $docblock_content, 'This filter is documented in ' ) ) {
+					$hook_documented_elsewhere = true;
+				}
+			}
+
+			if ( empty( $hook_documented_elsewhere ) ) {
+				$phpcs_file->addError(
+					'Missing @since tag for the "%s()" hook function.',
+					$stack_pointer,
+					$violation_codes['missing_since_tag'],
+					$error_message_data
+				);
+			}
+
+			return;
+		}
+
+		foreach ( $version_tags as $since_tag_token => $version_value_token ) {
+			if ( null === $version_value_token ) {
+				$phpcs_file->addError(
+					'Missing @since tag version value for the "%s()" hook function.',
+					$since_tag_token,
+					$violation_codes['missing_version_value'],
+					$error_message_data
+				);
+				continue;
+			}
+
+			$version_value = $tokens[ $version_value_token ]['content'];
+
+			if ( static::validate_version( $version_value ) ) {
+				continue;
+			}
+
+			$phpcs_file->addError(
+				'Invalid @since version value for the "%s()" hook function: "%s". Version value must be greater than or equal to 0.0.1.',
+				$version_value_token,
+				$violation_codes['invalid_version_value'],
+				array_merge( $error_message_data, array( $version_value ) )
+			);
+		}
+	}
+
+	/**
+	 * Processes a token representing an object-oriented programming structure
+	 * like a class, interface, trait, or enum to check for a missing `@since` tag in its docblock.
+	 *
+	 * @param File $phpcs_file    The file being scanned.
+	 * @param int  $stack_pointer The position of the OO token in the stack.
+	 */
+	protected function process_oo_token( File $phpcs_file, $stack_pointer ) {
+		$tokens     = $phpcs_file->getTokens();
+		$token_type = static::$oo_tokens[ $tokens[ $stack_pointer ]['code'] ]['name'];
+
+		$token_name         = ObjectDeclarations::getName( $phpcs_file, $stack_pointer );
+		$error_message_data = array(
+			$token_name,
+			$token_type,
+		);
+
+		$violation_codes = static::get_violation_codes( ucfirst( $token_type ) );
+
+		$docblock = static::find_docblock( $phpcs_file, $stack_pointer );
+
+		$version_tags = static::parse_since_tags( $phpcs_file, $docblock );
+		if ( empty( $version_tags ) ) {
+			$phpcs_file->addError(
+				'Missing @since tag for the "%s" %s.',
+				$stack_pointer,
+				$violation_codes['missing_since_tag'],
+				$error_message_data
+			);
+			return;
+		}
+
+		foreach ( $version_tags as $since_tag_token => $version_value_token ) {
+			if ( null === $version_value_token ) {
+				$phpcs_file->addError(
+					'Missing @since tag version value for the "%s" %s.',
+					$since_tag_token,
+					$violation_codes['missing_version_value'],
+					$error_message_data
+				);
+				continue;
+			}
+
+			$version_value = $tokens[ $version_value_token ]['content'];
+
+			if ( static::validate_version( $version_value ) ) {
+				continue;
+			}
+
+			$phpcs_file->addError(
+				'Invalid @since version value for the "%s" %s: "%s". Version value must be greater than or equal to 0.0.1.',
+				$version_value_token,
+				$violation_codes['invalid_version_value'],
+				array_merge( $error_message_data, array( $version_value ) )
+			);
+		}
+	}
+
+	/**
+	 * Processes a token representing an object-oriented property to check for a missing @since tag in its docblock.
+	 *
+	 * @param File $phpcs_file    The file being scanned.
+	 * @param int  $stack_pointer The position of the object-oriented property token in the stack.
+	 */
+	protected function process_property_token( File $phpcs_file, $stack_pointer ) {
+		$tokens = $phpcs_file->getTokens();
+
+		$property_name = $tokens[ $stack_pointer ]['content'];
+		$oo_token      = Scopes::validDirectScope( $phpcs_file, $stack_pointer, Collections::ooPropertyScopes() );
+		$class_name    = ObjectDeclarations::getName( $phpcs_file, $oo_token );
+
+		$visibility = Variables::getMemberProperties( $phpcs_file, $stack_pointer )['scope'];
+		if ( $this->check_below_minimum_visibility( $visibility ) ) {
+			return;
+		}
+
+		$violation_codes = static::get_violation_codes( 'Property' );
+
+		$error_message_data = array(
+			$class_name,
+			$property_name,
+		);
+
+		$docblock = static::find_docblock( $phpcs_file, $stack_pointer );
+
+		$version_tags = static::parse_since_tags( $phpcs_file, $docblock );
+		if ( empty( $version_tags ) ) {
+			$phpcs_file->addError(
+				'Missing @since tag for the "%s::%s" property.',
+				$stack_pointer,
+				$violation_codes['missing_since_tag'],
+				$error_message_data
+			);
+			return;
+		}
+
+		foreach ( $version_tags as $since_tag_token => $version_value_token ) {
+			if ( null === $version_value_token ) {
+				$phpcs_file->addError(
+					'Missing @since tag version value for the "%s::%s" property.',
+					$since_tag_token,
+					$violation_codes['missing_version_value'],
+					$error_message_data
+				);
+				continue;
+			}
+
+			$version_value = $tokens[ $version_value_token ]['content'];
+
+			if ( static::validate_version( $version_value ) ) {
+				continue;
+			}
+
+			$phpcs_file->addError(
+				'Invalid @since version value for the "%s::%s" property: "%s". Version value must be greater than or equal to 0.0.1.',
+				$version_value_token,
+				$violation_codes['invalid_version_value'],
+				array_merge( $error_message_data, array( $version_value ) )
+			);
+		}
+	}
+
+	/**
+	 * Processes a T_FUNCTION token to check for a missing @since tag in its docblock.
+	 *
+	 * @param File $phpcs_file    The file being scanned.
+	 * @param int  $stack_pointer The position of the T_FUNCTION token in the stack.
+	 */
+	protected function process_function_token( File $phpcs_file, $stack_pointer ) {
+		$tokens = $phpcs_file->getTokens();
+
+		$oo_token      = Scopes::validDirectScope( $phpcs_file, $stack_pointer, Tokens::$ooScopeTokens );
+		$function_name = ObjectDeclarations::getName( $phpcs_file, $stack_pointer );
+
+		$token_type = 'function';
+		if ( Scopes::isOOMethod( $phpcs_file, $stack_pointer ) ) {
+			$visibility = FunctionDeclarations::getProperties( $phpcs_file, $stack_pointer )['scope'];
+			if ( $this->check_below_minimum_visibility( $visibility ) ) {
+				return;
+			}
+
+			$function_name = ObjectDeclarations::getName( $phpcs_file, $oo_token ) . '::' . $function_name;
+			$token_type    = 'method';
+		}
+
+		$violation_codes = static::get_violation_codes( ucfirst( $token_type ) );
+
+		$error_message_data = array(
+			$function_name,
+			$token_type,
+		);
+
+		$docblock = static::find_docblock( $phpcs_file, $stack_pointer );
+
+		$version_tags = static::parse_since_tags( $phpcs_file, $docblock );
+		if ( empty( $version_tags ) ) {
+			$phpcs_file->addError(
+				'Missing @since tag for the "%s()" %s.',
+				$stack_pointer,
+				$violation_codes['missing_since_tag'],
+				$error_message_data
+			);
+			return;
+		}
+
+		foreach ( $version_tags as $since_tag_token => $version_value_token ) {
+			if ( null === $version_value_token ) {
+				$phpcs_file->addError(
+					'Missing @since tag version value for the "%s()" %s.',
+					$since_tag_token,
+					$violation_codes['missing_version_value'],
+					$error_message_data
+				);
+				continue;
+			}
+
+			$version_value = $tokens[ $version_value_token ]['content'];
+
+			if ( static::validate_version( $version_value ) ) {
+				continue;
+			}
+
+			$phpcs_file->addError(
+				'Invalid @since version value for the "%s()" %s: "%s". Version value must be greater than or equal to 0.0.1.',
+				$version_value_token,
+				$violation_codes['invalid_version_value'],
+				array_merge( $error_message_data, array( $version_value ) )
+			);
+		}
+	}
+
+	/**
+	 * Validates the version value.
+	 *
+	 * @param string $version The version value being checked.
+	 * @return bool True if the version value is valid.
+	 */
+	protected static function validate_version( $version ) {
+		$matches = array();
+		if ( 1 === preg_match( '/^MU \((?<version>.+)\)/', $version, $matches ) ) {
+			$version = $matches['version'];
+		}
+
+		return version_compare( $version, '0.0.1', '>=' );
+	}
+
+
+	/**
+	 * Returns violation codes for a specific token type.
+	 *
+	 * @param string $token_type The type of token (e.g., Function, Property) to retrieve violation codes for.
+	 * @return array An array containing violation codes for missing since tag, missing version value, and invalid version value.
+	 */
+	protected static function get_violation_codes( $token_type ) {
+		return array(
+			'missing_since_tag'     => 'Missing' . $token_type . 'SinceTag',
+			'missing_version_value' => 'Missing' . $token_type . 'VersionValue',
+			'invalid_version_value' => 'Invalid' . $token_type . 'VersionValue',
+		);
+	}
+
+	/**
+	 * Checks if the provided visibility level is below the set minimum visibility level.
+	 *
+	 * @param string $visibility The visibility level to check.
+	 * @return bool Returns true if the provided visibility level is below the minimum visibility level, false otherwise.
+	 */
+	protected function check_below_minimum_visibility( $visibility ) {
+		if ( 'public' === $this->minimumVisibility && in_array( $visibility, array( 'protected', 'private' ), true ) ) {
+			return true;
+		}
+
+		if ( 'protected' === $this->minimumVisibility && 'private' === $visibility ) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Finds the first token on the previous line relative to the stack pointer passed to the method.
+	 *
+	 * @param File $phpcs_file    The file being scanned.
+	 * @param int  $stack_pointer The position to find the previous line token from.
+	 * @return int|false The last token on the previous line, or false if not found.
+	 */
+	protected static function find_previous_line_token( File $phpcs_file, $stack_pointer ) {
+		$tokens       = $phpcs_file->getTokens();
+		$current_line = $tokens[ $stack_pointer ]['line'];
+
+		for ( $token = $stack_pointer; $token >= 0; $token-- ) {
+			if ( $tokens[ $token ]['line'] < $current_line ) {
+				return $token;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Finds the docblock preceding a specified position (stack pointer) in a given PHP file.
+	 *
+	 * @param File $phpcs_file    The file being scanned.
+	 * @param int  $stack_pointer The position (stack pointer) in the token stack from which to start searching backwards.
+	 * @return array|false An associative array containing the start and end tokens of the docblock, or false if not found.
+	 */
+	protected static function find_docblock( File $phpcs_file, $stack_pointer ) {
+		// It can be assumed that the DocBlock should end on the previous line, not the current one.
+		$previous_line_end_token = static::find_previous_line_token( $phpcs_file, $stack_pointer );
+		if ( false === $previous_line_end_token ) {
+			return false;
+		}
+
+		$docblock_end_token = $phpcs_file->findPrevious( array( T_WHITESPACE ), $previous_line_end_token, null, true );
+
+		$tokens = $phpcs_file->getTokens();
+		if ( false === $docblock_end_token || T_DOC_COMMENT_CLOSE_TAG !== $tokens[ $docblock_end_token ]['code'] ) {
+			// Only "/**" style comments are supported.
+			return false;
+		}
+
+		return array(
+			'start_token' => $tokens[ $docblock_end_token ]['comment_opener'],
+			'end_token'   => $docblock_end_token,
+		);
+	}
+
+	/**
+	 * Determines if a T_STRING token represents a function call.
+	 *
+	 * @param File $phpcs_file    The file being scanned.
+	 * @param int  $stack_pointer The position of the T_STRING token in question.
+	 * @return bool True if the token represents a function call, false otherwise.
+	 */
+	protected static function is_function_call( File $phpcs_file, $stack_pointer ) {
+		$tokens = $phpcs_file->getTokens();
+
+		// Find the previous non-empty token.
+		$previous = $phpcs_file->findPrevious( Tokens::$emptyTokens, ( $stack_pointer - 1 ), null, true );
+
+		$previous_tokens_to_ignore = array(
+			T_NEW,             // Creating an object.
+			T_OBJECT_OPERATOR, // Calling an object.
+			T_FUNCTION,        // Function declaration.
+		);
+
+		if ( in_array( $tokens[ $previous ]['code'], $previous_tokens_to_ignore, true ) ) {
+			// This is an object or function declaration.
+			return false;
+		}
+
+		// Find the next non-empty token.
+		$open_bracket = $phpcs_file->findNext( Tokens::$emptyTokens, ( $stack_pointer + 1 ), null, true );
+
+		return ( false !== $open_bracket ) && ( T_OPEN_PARENTHESIS === $tokens[ $open_bracket ]['code'] );
+	}
+
+	/**
+	 * Searches for @since values within a docblock.
+	 *
+	 * @param File        $phpcs_file The file being scanned.
+	 * @param array|false $docblock   An associative array containing the start and end tokens of the docblock, or false if not exists.
+	 * @return array Returns an array of "@since" tokens and their corresponding value tokens.
+	 */
+	protected static function parse_since_tags( File $phpcs_file, $docblock ) {
+		$version_tags = array();
+
+		if ( false === $docblock ) {
+			return $version_tags;
+		}
+
+		$tokens = $phpcs_file->getTokens();
+
+		for ( $i = $docblock['start_token'] + 1; $i < $docblock['end_token']; $i++ ) {
+			if ( ! ( T_DOC_COMMENT_TAG === $tokens[ $i ]['code'] && '@since' === $tokens[ $i ]['content'] ) ) {
+				continue;
+			}
+
+			$version_token = $phpcs_file->findNext( T_DOC_COMMENT_WHITESPACE, $i + 1, $docblock['end_token'], true, null, true );
+			if ( ( false === $version_token ) || ( T_DOC_COMMENT_STRING !== $tokens[ $version_token ]['code'] ) ) {
+				$version_tags[ $i ] = null;
+				continue;
+			}
+
+			$version_tags[ $i ] = $version_token;
+		}
+
+		return $version_tags;
+	}
+
+	/**
+	 * Checks if the current block is experimental.
+	 *
+	 * @param File $phpcs_file The file being scanned.
+	 * @return bool Returns true if the current block is experimental.
+	 */
+	protected static function is_experimental_block( File $phpcs_file ) {
+		$block_json_filepath = dirname( $phpcs_file->getFilename() ) . DIRECTORY_SEPARATOR . 'block.json';
+
+		if ( isset( static::$cache[ $block_json_filepath ] ) ) {
+			return static::$cache[ $block_json_filepath ];
+		}
+
+		if ( ! is_file( $block_json_filepath ) || ! is_readable( $block_json_filepath ) ) {
+			static::$cache[ $block_json_filepath ] = false;
+			return static::$cache[ $block_json_filepath ];
+		}
+
+		// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents -- this Composer package doesn't depend on WordPress.
+		$block_metadata = file_get_contents( $block_json_filepath );
+		if ( false === $block_metadata ) {
+			static::$cache[ $block_json_filepath ] = false;
+			return static::$cache[ $block_json_filepath ];
+		}
+
+		$block_metadata = json_decode( $block_metadata, true );
+		if ( ! is_array( $block_metadata ) ) {
+			static::$cache[ $block_json_filepath ] = false;
+			return static::$cache[ $block_json_filepath ];
+		}
+
+		$experimental_flag                     = '__experimental';
+		static::$cache[ $block_json_filepath ] = array_key_exists( $experimental_flag, $block_metadata ) && ( false !== $block_metadata[ $experimental_flag ] );
+		return static::$cache[ $block_json_filepath ];
+	}
+}
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/NamingConventions/ValidBlockLibraryFunctionNameSniff.php b/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/NamingConventions/ValidBlockLibraryFunctionNameSniff.php
index 74608921c32d89..bf7dbc2fd85d3c 100644
--- a/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/NamingConventions/ValidBlockLibraryFunctionNameSniff.php
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Sniffs/NamingConventions/ValidBlockLibraryFunctionNameSniff.php
@@ -3,8 +3,7 @@
  * Gutenberg Coding Standards.
  *
  * @package gutenberg/gutenberg-coding-standards
- * @link    https://github.com/WordPress/gutenberg
- * @license https://opensource.org/licenses/MIT MIT
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
  */
 
 namespace GutenbergCS\Gutenberg\Sniffs\NamingConventions;
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Tests/AbstractSniffUnitTest.php b/test/php/gutenberg-coding-standards/Gutenberg/Tests/AbstractSniffUnitTest.php
new file mode 100644
index 00000000000000..f1be5ab00b0750
--- /dev/null
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Tests/AbstractSniffUnitTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * An abstract class that all sniff unit tests must extend.
+ *
+ * @package gutenberg-coding-standards/gbc
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
+ */
+
+namespace GutenbergCS\Gutenberg\Tests;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest as BaseAbstractSniffUnitTest;
+use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * An abstract test class that contains common methods for all sniff unit tests.
+ */
+abstract class AbstractSniffUnitTest extends BaseAbstractSniffUnitTest {
+
+	/**
+	 * Holds the original Ruleset instance.
+	 *
+	 * @var Ruleset
+	 */
+	protected static $original_ruleset;
+
+	/**
+	 * This method resets the 'Gutenberg' ruleset in the $GLOBALS['PHP_CODESNIFFER_RULESETS']
+	 * to its original state.
+	 */
+	public static function tearDownAfterClass() {
+		parent::tearDownAfterClass();
+
+		$GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'] = static::$original_ruleset;
+		static::$original_ruleset                         = null;
+	}
+
+	/**
+	 * Sets the parameters for the sniff.
+	 *
+	 * @throws RuntimeException If unable to set the ruleset parameters required for the test.
+	 *
+	 * @param Sniff $sniff The sniff being tested.
+	 */
+	abstract protected function set_sniff_parameters( Sniff $sniff );
+
+	/**
+	 * Returns the fully qualified class name (FQCN) of the sniff.
+	 *
+	 * @return string The fully qualified class name of the sniff.
+	 */
+	abstract protected function get_sniff_fqcn();
+
+	/**
+	 * Prepares the environment before executing tests. This is needed since
+	 * PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest doesn't apply
+	 * sniff properties from the Gutenberg/ruleset.xml file.
+	 *
+	 * @param string $filename The name of the file being tested.
+	 * @param Config $config   The config data for the run.
+	 */
+	public function setCliValues( $filename, $config ) {
+		parent::setCliValues( $filename, $config );
+
+		$error_message = 'Cannot set sniff parameters required for the unit test.';
+		if ( ! isset( $GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'] )
+			|| ( ! $GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'] instanceof Ruleset )
+		) {
+			throw new \RuntimeException( $error_message ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped -- this is non-production code.
+		}
+
+		// Backup the original Ruleset instance.
+		static::$original_ruleset = $GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'];
+
+		$current_ruleset                                  = clone static::$original_ruleset;
+		$GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'] = $current_ruleset;
+
+		$sniff_fqcn = $this->get_sniff_fqcn();
+		if ( ! isset( $current_ruleset->sniffs[ $sniff_fqcn ] ) ) {
+			throw new \RuntimeException( $error_message ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped -- this is non-production code.
+		}
+
+		$sniff = $current_ruleset->sniffs[ $sniff_fqcn ];
+		$this->set_sniff_parameters( $sniff );
+	}
+}
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/ForbiddenFunctionsAndClassesUnitTest.inc b/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/ForbiddenFunctionsAndClassesUnitTest.inc
new file mode 100644
index 00000000000000..b65768541f32ae
--- /dev/null
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/ForbiddenFunctionsAndClassesUnitTest.inc
@@ -0,0 +1,98 @@
+<?php
+
+new Gutenberg_Class();
+new Non_Gutenberg_Class();
+Gutenberg_Class::SOME_CLASS_CONSTANT;
+Non_Gutenberg_Class::SOME_CLASS_CONSTANT;
+Gutenberg_Class::some_static_method();
+Non_Gutenberg_Class::some_static_method();
+Gutenberg_Class::$some_class_property;
+Non_Gutenberg_Class::$some_class_property;
+gutenberg_function();
+non_gutenberg_function();
+
+class Gutenberg_Class {
+	private function foo() {
+		new Gutenberg_Class();
+		new Non_Gutenberg_Class();
+		Gutenberg_Class::SOME_CLASS_CONSTANT;
+		Non_Gutenberg_Class::SOME_CLASS_CONSTANT;
+		Gutenberg_Class::some_static_method();
+		Non_Gutenberg_Class::some_static_method();
+		Gutenberg_Class::$some_class_property;
+		Non_Gutenberg_Class::$some_class_property;
+		gutenberg_function();
+		non_gutenberg_function();
+	}
+}
+
+class Non_Gutenberg_Class {
+	// Some code.
+
+	private function foo() {
+		new Gutenberg_Class();
+		new Non_Gutenberg_Class();
+		Gutenberg_Class::SOME_CLASS_CONSTANT;
+		Non_Gutenberg_Class::SOME_CLASS_CONSTANT;
+		Gutenberg_Class::some_static_method();
+		Non_Gutenberg_Class::some_static_method();
+		Gutenberg_Class::$some_class_property;
+		Non_Gutenberg_Class::$some_class_property;
+		gutenberg_function();
+		non_gutenberg_function();
+	}
+}
+
+gutenberg_prefixed_function();
+Gutenberg_prefixed_function();
+
+if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+	gutenberg_prefixed_function();
+	Gutenberg_prefixed_function();
+}
+
+if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+	// Nested conditions.
+	if (true) {
+		gutenberg_prefixed_function();
+		Gutenberg_prefixed_function();
+	}
+}
+
+if ( ! defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+	// Nested conditions.
+	if (true) {
+		gutenberg_prefixed_function();
+		Gutenberg_prefixed_function();
+	}
+}
+
+$object = new Gutenberg_Prefixed_Class();
+Gutenberg_Prefixed_Class::some_function();
+
+if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+	new Gutenberg_Prefixed_Class();
+	Gutenberg_Prefixed_Class::some_function();
+}
+
+if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+	// Nested conditions.
+	if (true) {
+		new Gutenberg_Prefixed_Class();
+		Gutenberg_Prefixed_Class::some_function();
+	}
+}
+
+if ( ! defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+	// Nested conditions.
+	if (true) {
+		new Gutenberg_Prefixed_Class();
+		Gutenberg_Prefixed_Class::some_function();
+	}
+}
+
+// Gutenberg_Class.
+//Gutenberg_Class.
+
+// Non_Gutenberg_Class.
+//Non_Gutenberg_Class.
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/ForbiddenFunctionsAndClassesUnitTest.php b/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/ForbiddenFunctionsAndClassesUnitTest.php
new file mode 100644
index 00000000000000..79719fba6039db
--- /dev/null
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/ForbiddenFunctionsAndClassesUnitTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Unit test class for Gutenberg Coding Standard.
+ *
+ * @package gutenberg-coding-standards/gbc
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
+ */
+
+namespace GutenbergCS\Gutenberg\Tests\CodeAnalysis;
+
+use GutenbergCS\Gutenberg\Sniffs\CodeAnalysis\ForbiddenFunctionsAndClassesSniff;
+use GutenbergCS\Gutenberg\Tests\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Unit test class for the ForbiddenFunctionsAndClassesSniff sniff.
+ */
+final class ForbiddenFunctionsAndClassesUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return array(
+			3  => 1,
+			5  => 1,
+			7  => 1,
+			9  => 1,
+			11 => 1,
+
+			16 => 1,
+			18 => 1,
+			20 => 1,
+			22 => 1,
+			24 => 1,
+
+			33 => 1,
+			35 => 1,
+			37 => 1,
+			39 => 1,
+			41 => 1,
+
+			46 => 1,
+			47 => 1,
+			65 => 1,
+			66 => 1,
+
+			70 => 1,
+			71 => 1,
+			89 => 1,
+			90 => 1,
+		);
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return array();
+	}
+
+	/**
+	 * Returns the fully qualified class name (FQCN) of the sniff.
+	 *
+	 * @return string The fully qualified class name of the sniff.
+	 */
+	protected function get_sniff_fqcn() {
+		return ForbiddenFunctionsAndClassesSniff::class;
+	}
+
+	/**
+	 * Sets the parameters for the sniff.
+	 *
+	 * @throws RuntimeException If unable to set the ruleset parameters required for the test.
+	 *
+	 * @param Sniff $sniff The sniff being tested.
+	 */
+	public function set_sniff_parameters( Sniff $sniff ) {
+		$sniff->forbidden_functions = array(
+			'[Gg]utenberg.*',
+		);
+
+		$sniff->forbidden_classes = array(
+			'[Gg]utenberg.*',
+		);
+	}
+}
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/GuardedFunctionAndClassNamesUnitTest.inc b/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/GuardedFunctionAndClassNamesUnitTest.inc
index 5db9946d68ae31..5c0677450a1d37 100644
--- a/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/GuardedFunctionAndClassNamesUnitTest.inc
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/GuardedFunctionAndClassNamesUnitTest.inc
@@ -23,4 +23,20 @@ if ( ! function_exists( 'quux' ) ) {
 }
 
 function blarg() {
-}
\ No newline at end of file
+}
+
+class Gutenberg_Class {
+
+}
+
+class Class_Gutenberg {
+}
+
+class Class_Gutenberg_With_Some_Postifx {
+}
+
+function gutenberg_function() {
+}
+
+function _gutenberg_function() {
+}
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/GuardedFunctionAndClassNamesUnitTest.php b/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/GuardedFunctionAndClassNamesUnitTest.php
index fccc5e3d9cdfdd..b4e26fd2e69c4f 100644
--- a/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/GuardedFunctionAndClassNamesUnitTest.php
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Tests/CodeAnalysis/GuardedFunctionAndClassNamesUnitTest.php
@@ -3,13 +3,14 @@
  * Unit test class for Gutenberg Coding Standard.
  *
  * @package gutenberg-coding-standards/gbc
- * @link    https://github.com/WordPress/gutenberg
- * @license https://opensource.org/licenses/MIT MIT
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
  */
 
 namespace GutenbergCS\Gutenberg\Tests\CodeAnalysis;
 
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+use GutenbergCS\Gutenberg\Sniffs\CodeAnalysis\GuardedFunctionAndClassNamesSniff;
+use GutenbergCS\Gutenberg\Tests\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Unit test class for the GuardedFunctionAndClassNames sniff.
@@ -23,8 +24,10 @@ final class GuardedFunctionAndClassNamesUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList() {
 		return array(
+			7  => 1,
 			17 => 1,
 			25 => 1,
+			35 => 1,
 		);
 	}
 
@@ -36,4 +39,31 @@ public function getErrorList() {
 	public function getWarningList() {
 		return array();
 	}
+
+	/**
+	 * Returns the fully qualified class name (FQCN) of the sniff.
+	 *
+	 * @return string The fully qualified class name of the sniff.
+	 */
+	protected function get_sniff_fqcn() {
+		return GuardedFunctionAndClassNamesSniff::class;
+	}
+
+	/**
+	 * Sets the parameters for the sniff.
+	 *
+	 * @throws RuntimeException If unable to set the ruleset parameters required for the test.
+	 *
+	 * @param Sniff $sniff The sniff being tested.
+	 */
+	public function set_sniff_parameters( Sniff $sniff ) {
+		$sniff->functionsWhiteList = array(
+			'/^_?gutenberg.+/',
+		);
+
+		$sniff->classesWhiteList = array(
+			'/^Gutenberg.+/',
+			'/^.+_Gutenberg$/',
+		);
+	}
 }
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Tests/Commenting/SinceTagUnitTest.inc b/test/php/gutenberg-coding-standards/Gutenberg/Tests/Commenting/SinceTagUnitTest.inc
new file mode 100644
index 00000000000000..aa8593b2e27577
--- /dev/null
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Tests/Commenting/SinceTagUnitTest.inc
@@ -0,0 +1,629 @@
+<?php
+function foo() {
+	$result = do_action( 'some_filter', array() );
+	$result = do_action_ref_array( 'some_filter', array() );
+	$result = apply_filters( 'some_filter', array() );
+	$result = apply_filters_ref_array( 'some_filter', array() );
+
+	/**
+	 * @since
+	 * 123
+	 */
+	$result = apply_filters( 'some_filter', array() );
+
+	/**
+	 * @since invalid 123
+	 */
+	$result = apply_filters( 'some_filter', array() );
+
+	/**
+	 * @since 123
+	 */
+	$result = apply_filters( 'some_filter', array() );
+
+	$variable = 'some_value'; /** Some comment @since 123 */
+
+	$result = apply_filters( 'some_filter', array() );
+
+	/** @var This filter is documented in foo.php */
+	$result = apply_filters( 'some_filter', array() );
+
+	/**
+	 * @since 3.0.0
+	 * @since
+	 * @since MU (3.0.0)
+	 * @since invalid_value
+	 * @since
+	 */
+	$result = apply_filters( 'some_filter', array() );
+}
+
+/**
+ * @since
+ * 123
+ */
+function bar() {
+}
+
+/**
+ * @since invalid 123
+ */
+function baz() {
+}
+
+/**
+ * @since 123
+ */
+function qux() {
+}
+
+$variable = 'some_value'; /** Some comment @since 123 */
+
+function quux() {
+}
+
+/**
+ * @since 3.0.0
+ * @since
+ * @since MU (3.0.0)
+ * @since invalid_value
+ * @since
+ */
+function grault() {
+}
+
+$result = array_map( function ( $value ) {
+	return $value * 2; // Doubling each value
+}, array( 1, 2, 3, 4, 5 ) );
+
+class Foo {
+
+	/**
+	 * @since
+	 * 123
+	 */
+	public $foo_property;
+
+	/**
+	 * @since invalid 123
+	 */
+	protected $bar_property;
+
+	/**
+	 * @since 123
+	 */
+	public $baz_property;
+
+	public $qux_property = 'some_value'; /** Some comment @since 123 */
+
+	public $quux_property;
+
+	private $corge_property;
+
+	/**
+	 * @since 3.0.0
+	 * @since
+	 * @since MU (3.0.0)
+	 * @since invalid_value
+	 * @since
+	 */
+	public $grault_property;
+
+	protected function foobar() {
+		$result = do_action( 'some_filter', array() );
+		$result = do_action_ref_array( 'some_filter', array() );
+		$result = apply_filters( 'some_filter', array() );
+		$result = apply_filters_ref_array( 'some_filter', array() );
+
+		/**
+		 * @since
+		 * 123
+		 */
+		$result = apply_filters( 'some_filter', array() );
+
+		/**
+		 * @since invalid 123
+		 */
+		$result = apply_filters( 'some_filter', array() );
+
+		/**
+		 * @since 123
+		 */
+		$result = apply_filters( 'some_filter', array() );
+
+		$variable = 'some_value'; /** Some comment @since 123 */
+
+		$result = apply_filters( 'some_filter', array() );
+
+		/** @var This filter is documented in foo.php */
+		$result = apply_filters( 'some_filter', array() );
+	}
+
+	protected function foobar_1() {}
+
+	/**
+	 * @since
+	 * 123
+	 */
+	public function bar() {
+	}
+
+	/**
+	 * @since invalid 123
+	 */
+	public function baz() {
+	}
+
+	/**
+	 * @since 123
+	 */
+	protected function qux() {
+	}
+
+	/** Some comment @since 123 */
+
+	public function quux() {
+		$result = array_map( function ( $value ) {
+			return $value * 2; // Doubling each value
+		}, array( 1, 2, 3, 4, 5 ) );
+	}
+
+	private function corge() {
+	}
+
+	function no_visibility_modifier() {}
+
+	/**
+	 * @since 3.0.0
+	 * @since
+	 * @since MU (3.0.0)
+	 * @since invalid_value
+	 * @since
+	 */
+	public function grault() {
+	}
+}
+
+/**
+ * @since
+ * 123
+ */
+class Foo_1 {
+}
+
+/**
+ * @since invalid 123
+ */
+class Foo_2 {
+}
+
+/**
+ * @since 123
+ */
+class Foo_3 {
+}
+
+$variable = 'some_value'; /** Some comment @since 123 */
+
+class Foo_4 {
+}
+
+/**
+ * @since 3.0.0
+ * @since
+ * @since MU (3.0.0)
+ * @since invalid_value
+ * @since
+ */
+class Foo_5 {
+}
+
+abstract class Bar_Abstract {
+	/**
+	 * @since
+	 * 123
+	 */
+	public $foo_property;
+
+	/**
+	 * @since invalid 123
+	 */
+	protected $bar_property;
+
+	/**
+	 * @since 123
+	 */
+	public $baz_property;
+
+	public $qux_property = 'some_value'; /** Some comment @since 123 */
+
+	public $quux_property;
+
+	private $corge_property;
+
+	/**
+	 * @since 3.0.0
+	 * @since
+	 * @since MU (3.0.0)
+	 * @since invalid_value
+	 * @since
+	 */
+	public $grault_property;
+
+	protected function foobar() {
+		$result = do_action( 'some_filter', array() );
+		$result = do_action_ref_array( 'some_filter', array() );
+		$result = apply_filters( 'some_filter', array() );
+		$result = apply_filters_ref_array( 'some_filter', array() );
+
+		/**
+		 * @since
+		 * 123
+		 */
+		$result = apply_filters( 'some_filter', array() );
+
+		/**
+		 * @since invalid 123
+		 */
+		$result = apply_filters( 'some_filter', array() );
+
+		/**
+		 * @since 123
+		 */
+		$result = apply_filters( 'some_filter', array() );
+
+		$variable = 'some_value'; /** Some comment @since 123 */
+
+		$result = apply_filters( 'some_filter', array() );
+
+		/** @var This filter is documented in foo.php */
+		$result = apply_filters( 'some_filter', array() );
+	}
+
+	abstract protected function foo_abstract();
+
+	/**
+	 * @since
+	 * 123
+	 */
+	public function apply_filters() {
+	}
+
+	/**
+	 * @since invalid 123
+	 */
+	public function baz() {
+	}
+
+	/**
+	 * @since 123
+	 */
+	protected function qux() {
+	}
+
+	/** Some comment @since 123 */
+
+	public function quux() {
+		$result = array_map( function ( $value ) {
+			return $value * 2; // Doubling each value
+		}, array( 1, 2, 3, 4, 5 ) );
+	}
+
+	private function corge() {
+	}
+
+	function no_visibility_modifier() {}
+
+	/**
+	 * @since 3.0.0
+	 * @since
+	 * @since MU (3.0.0)
+	 * @since invalid_value
+	 * @since
+	 */
+	public function grault() {
+	}
+}
+
+/**
+ * @since
+ * 123
+ */
+abstract class Bar_1 {
+}
+
+/**
+ * @since invalid 123
+ */
+abstract class Bar_2 {
+}
+
+/**
+ * @since 123
+ */
+abstract class Bar_3 {
+}
+
+$variable = 'some_value'; /** Some comment @since 123 */
+
+abstract class Bar_4 {
+}
+
+/**
+ * @since 3.0.0
+ * @since
+ * @since MU (3.0.0)
+ * @since invalid_value
+ * @since
+ */
+abstract class Bar_5 {
+}
+
+Trait Baz {
+
+	/**
+	 * @since
+	 * 123
+	 */
+	public $foo_property;
+
+	/**
+	 * @since invalid 123
+	 */
+	protected $bar_property;
+
+	/**
+	 * @since 123
+	 */
+	public $baz_property;
+
+	public $qux_property = 'some_value'; /** Some comment @since 123 */
+
+	public $quux_property;
+
+	private $corge_property;
+
+	/**
+	 * @since 3.0.0
+	 * @since
+	 * @since MU (3.0.0)
+	 * @since invalid_value
+	 * @since
+	 */
+	public $grault_property;
+
+	protected function foobar() {
+		$result = do_action( 'some_filter', array() );
+		$result = do_action_ref_array( 'some_filter', array() );
+		$result = apply_filters( 'some_filter', array() );
+		$result = apply_filters_ref_array( 'some_filter', array() );
+
+		/**
+		 * @since
+		 * 123
+		 */
+		$result = apply_filters( 'some_filter', array() );
+
+		/**
+		 * @since invalid 123
+		 */
+		$result = apply_filters( 'some_filter', array() );
+
+		/**
+		 * @since 123
+		 */
+		$result = apply_filters( 'some_filter', array() );
+
+		$variable = 'some_value'; /** Some comment @since 123 */
+
+		$result = apply_filters( 'some_filter', array() );
+
+		/** @var This filter is documented in foo.php */
+		$result = apply_filters( 'some_filter', array() );
+	}
+
+	/**
+	 * @since
+	 * 123
+	 */
+	public function bar() {
+	}
+
+	/**
+	 * @since invalid 123
+	 */
+	public function baz() {
+	}
+
+	/**
+	 * @since 123
+	 */
+	protected function qux() {
+	}
+
+	/** Some comment @since 123 */
+
+	public function quux() {
+		$result = array_map( function ( $value ) {
+			return $value * 2; // Doubling each value
+		}, array( 1, 2, 3, 4, 5 ) );
+	}
+
+	private function corge() {
+	}
+
+	function no_visibility_modifier() {}
+
+	/**
+	 * @since 3.0.0
+	 * @since
+	 * @since MU (3.0.0)
+	 * @since invalid_value
+	 * @since
+	 */
+	public function grault() {
+	}
+}
+
+/**
+ * @since
+ * 123
+ */
+trait Baz_1 {
+}
+
+/**
+ * @since invalid 123
+ */
+trait Baz_2 {
+}
+
+/**
+ * @since 123
+ */
+trait Baz_3 {
+}
+
+$variable = 'some_value'; /** Some comment @since 123 */
+
+trait Baz_4 {
+}
+
+interface Qux {
+	public function foobar();
+
+	/**
+	 * @since
+	 * 123
+	 */
+	public function bar();
+
+	/**
+	 * @since invalid 123
+	 */
+	public function baz();
+
+	/**
+	 * @since 123
+	 */
+	public function qux();
+
+	/** Some comment @since 123 */
+
+	public function quux();
+
+	/**
+	 * @since 3.0.0
+	 * @since
+	 * @since MU (3.0.0)
+	 * @since invalid_value
+	 * @since
+	 */
+	public function grault();
+}
+
+/**
+ * @since
+ * 123
+ */
+interface Qux_1 {
+}
+
+/**
+ * @since invalid 123
+ */
+interface Qux_2 {
+}
+
+/**
+ * @since 123
+ */
+interface Qux_3 {
+}
+
+$variable = 'some_value'; /** Some comment @since 123 */
+
+interface Qux_4 {
+}
+
+$result = do_action( 'some_filter', array() );
+$result = do_action_ref_array( 'some_filter', array() );
+$result = apply_filters( 'some_filter', array() );
+$result = apply_filters_ref_array( 'some_filter', array() );
+
+/**
+ * @since
+ * 123
+ */
+$result = apply_filters( 'some_filter', array() );
+
+/**
+ * @since invalid 123
+ */
+$result = apply_filters( 'some_filter', array() );
+
+/**
+ * @since 123
+ */
+$result = apply_filters( 'some_filter', array() );
+
+$variable = 'some_value'; /** Some comment @since 123 */$
+
+$result = apply_filters( 'some_filter', array() );
+
+/** @var This filter is documented in foo.php */
+$result = apply_filters( 'some_filter', array() );
+
+/**
+ * @since 3.0.0
+ * @since
+ * @since MU (3.0.0)
+ * @since invalid_value
+ * @since
+ */
+$result = apply_filters( 'some_filter', array() );
+
+if ( ! function_exists( 'do_action' ) ) {
+	function do_action() {
+	}
+}
+
+if ( ! function_exists( 'do_action_ref_array' ) ) {
+	function do_action_ref_array() {
+	}
+}
+
+if ( ! function_exists( 'do_action_deprecated' ) ) {
+	function do_action_deprecated() {
+	}
+}
+
+if ( ! function_exists( 'apply_filters' ) ) {
+	function apply_filters() {
+	}
+}
+
+if ( ! function_exists( 'apply_filters_ref_array' ) ) {
+	function apply_filters_ref_array() {
+	}
+}
+
+if ( ! function_exists( 'apply_filters_deprecated' ) ) {
+	function apply_filters_deprecated() {
+	}
+}
+
+$foo = new do_action();
+$foo->do_action();
+$foo = new do_action_ref_array();
+$foo->do_action_ref_array();
+$foo = new do_action_deprecated();
+$foo->do_action_deprecated();
+$foo = new apply_filters();
+$foo->apply_filters();
+$foo = new apply_filters_ref_array();
+$foo->apply_filters_ref_array();
+$foo = new apply_filters_deprecated();
+$foo->apply_filters_deprecated();
+$foo = new non_hook_action();
+$foo->non_hook_action();
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Tests/Commenting/SinceTagUnitTest.php b/test/php/gutenberg-coding-standards/Gutenberg/Tests/Commenting/SinceTagUnitTest.php
new file mode 100644
index 00000000000000..1318687768c9dd
--- /dev/null
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Tests/Commenting/SinceTagUnitTest.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Unit test class for Gutenberg Coding Standard.
+ *
+ * @package gutenberg-coding-standards/gbc
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
+ */
+
+namespace GutenbergCS\Gutenberg\Tests\Commenting;
+
+use GutenbergCS\Gutenberg\Sniffs\Commenting\SinceTagSniff;
+use GutenbergCS\Gutenberg\Tests\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Unit test class for the SinceTagSniff sniff.
+ */
+final class SinceTagUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return array(
+			2   => 1,
+			3   => 1,
+			4   => 1,
+			5   => 1,
+			6   => 1,
+			9   => 1,
+			15  => 1,
+			26  => 1,
+			33  => 1,
+			35  => 1,
+			36  => 1,
+			42  => 1,
+			49  => 1,
+			62  => 1,
+			67  => 1,
+			69  => 1,
+			70  => 1,
+			79  => 1,
+			82  => 1,
+			88  => 1,
+			97  => 1,
+			99  => 1,
+			105 => 1,
+			107 => 1,
+			108 => 1,
+			112 => 1,
+			113 => 1,
+			114 => 1,
+			115 => 1,
+			116 => 1,
+			119 => 1,
+			125 => 1,
+			136 => 1,
+			142 => 1,
+			145 => 1,
+			152 => 1,
+			165 => 1,
+			174 => 1,
+			178 => 1,
+			180 => 1,
+			181 => 1,
+			188 => 1,
+			195 => 1,
+			208 => 1,
+			213 => 1,
+			215 => 1,
+			216 => 1,
+			221 => 1,
+			223 => 1,
+			229 => 1,
+			238 => 1,
+			240 => 1,
+			246 => 1,
+			248 => 1,
+			249 => 1,
+			253 => 1,
+			254 => 1,
+			255 => 1,
+			256 => 1,
+			257 => 1,
+			260 => 1,
+			266 => 1,
+			277 => 1,
+			283 => 1,
+			286 => 1,
+			293 => 1,
+			306 => 1,
+			315 => 1,
+			319 => 1,
+			321 => 1,
+			322 => 1,
+			329 => 1,
+			336 => 1,
+			349 => 1,
+			354 => 1,
+			356 => 1,
+			357 => 1,
+			362 => 1,
+			365 => 1,
+			371 => 1,
+			380 => 1,
+			382 => 1,
+			388 => 1,
+			390 => 1,
+			391 => 1,
+			395 => 1,
+			396 => 1,
+			397 => 1,
+			398 => 1,
+			399 => 1,
+			402 => 1,
+			408 => 1,
+			419 => 1,
+			426 => 1,
+			433 => 1,
+			446 => 1,
+			455 => 1,
+			459 => 1,
+			461 => 1,
+			462 => 1,
+			469 => 1,
+			476 => 1,
+			489 => 1,
+			492 => 1,
+			493 => 1,
+			496 => 1,
+			502 => 1,
+			513 => 1,
+			517 => 1,
+			519 => 1,
+			520 => 1,
+			526 => 1,
+			533 => 1,
+			546 => 1,
+			549 => 1,
+			550 => 1,
+			551 => 1,
+			552 => 1,
+			555 => 1,
+			561 => 1,
+			572 => 1,
+			579 => 1,
+			581 => 1,
+			582 => 1,
+			587 => 1,
+			592 => 1,
+			597 => 1,
+			602 => 1,
+			607 => 1,
+			612 => 1,
+		);
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return array();
+	}
+
+	/**
+	 * Returns the fully qualified class name (FQCN) of the sniff.
+	 *
+	 * @return string The fully qualified class name of the sniff.
+	 */
+	protected function get_sniff_fqcn() {
+		return SinceTagSniff::class;
+	}
+
+	/**
+	 * Sets the parameters for the sniff.
+	 *
+	 * @throws RuntimeException If unable to set the ruleset parameters required for the test.
+	 *
+	 * @param Sniff $sniff The sniff being tested.
+	 */
+	public function set_sniff_parameters( Sniff $sniff ) {
+		$sniff->minimumVisibility = 'protected';
+	}
+}
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/Tests/NamingConventions/ValidBlockLibraryFunctionNameUnitTest.php b/test/php/gutenberg-coding-standards/Gutenberg/Tests/NamingConventions/ValidBlockLibraryFunctionNameUnitTest.php
index 794a088b7bc61d..14a2cb1a97dd71 100644
--- a/test/php/gutenberg-coding-standards/Gutenberg/Tests/NamingConventions/ValidBlockLibraryFunctionNameUnitTest.php
+++ b/test/php/gutenberg-coding-standards/Gutenberg/Tests/NamingConventions/ValidBlockLibraryFunctionNameUnitTest.php
@@ -3,29 +3,20 @@
  * Unit test class for Gutenberg Coding Standard.
  *
  * @package gutenberg-coding-standards/gbc
- * @link    https://github.com/WordPress/gutenberg
- * @license https://opensource.org/licenses/MIT MIT
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
  */
 
 namespace GutenbergCS\Gutenberg\Tests\NamingConventions;
 
 use GutenbergCS\Gutenberg\Sniffs\NamingConventions\ValidBlockLibraryFunctionNameSniff;
-use PHP_CodeSniffer\Config;
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-use PHP_CodeSniffer\Ruleset;
+use GutenbergCS\Gutenberg\Tests\AbstractSniffUnitTest;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Unit test class for the ValidBlockLibraryFunctionNameSniff sniff.
  */
 final class ValidBlockLibraryFunctionNameUnitTest extends AbstractSniffUnitTest {
 
-	/**
-	 * Holds the original Ruleset instance.
-	 *
-	 * @var Ruleset
-	 */
-	private static $original_ruleset;
-
 	/**
 	 * Returns the lines where errors should occur.
 	 *
@@ -50,50 +41,22 @@ public function getWarningList() {
 	}
 
 	/**
+	 * Returns the fully qualified class name (FQCN) of the sniff.
 	 *
-	 * This method resets the 'Gutenberg' ruleset in the $GLOBALS['PHP_CODESNIFFER_RULESETS']
-	 * to its original state.
+	 * @return string The fully qualified class name of the sniff.
 	 */
-	public static function tearDownAfterClass() {
-		parent::tearDownAfterClass();
-
-		$GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'] = self::$original_ruleset;
-		self::$original_ruleset                           = null;
+	protected function get_sniff_fqcn() {
+		return ValidBlockLibraryFunctionNameSniff::class;
 	}
 
-
 	/**
-	 * Prepares the environment before executing tests. Specifically, sets prefixes for the
-	 * ValidBlockLibraryFunctionName sniff.This is needed since AbstractSniffUnitTest class
-	 * doesn't apply sniff properties from the Gutenberg/ruleset.xml file.
+	 * Sets the parameters for the sniff.
 	 *
-	 * @param string $filename The name of the file being tested.
-	 * @param Config $config   The config data for the run.
+	 * @throws RuntimeException If unable to set the ruleset parameters required for the test.
 	 *
-	 * @return void
+	 * @param Sniff $sniff The sniff being tested.
 	 */
-	public function setCliValues( $filename, $config ) {
-		parent::setCliValues( $filename, $config );
-
-		if ( ! isset( $GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'] )
-			|| ( ! $GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'] instanceof Ruleset )
-		) {
-			throw new \RuntimeException( 'Cannot set ruleset parameters required for this test.' );
-		}
-
-		// Backup the original Ruleset instance.
-		self::$original_ruleset = $GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'];
-
-		$current_ruleset                                  = clone self::$original_ruleset;
-		$GLOBALS['PHP_CODESNIFFER_RULESETS']['Gutenberg'] = $current_ruleset;
-
-		if ( ! isset( $current_ruleset->sniffs[ ValidBlockLibraryFunctionNameSniff::class ] )
-			|| ( ! $current_ruleset->sniffs[ ValidBlockLibraryFunctionNameSniff::class ] instanceof ValidBlockLibraryFunctionNameSniff )
-		) {
-			throw new \RuntimeException( 'Cannot set ruleset parameters required for this test.' );
-		}
-
-		$sniff           = $current_ruleset->sniffs[ ValidBlockLibraryFunctionNameSniff::class ];
+	public function set_sniff_parameters( Sniff $sniff ) {
 		$sniff->prefixes = array(
 			'block_core_',
 			'render_block_core_',
diff --git a/test/php/gutenberg-coding-standards/Gutenberg/ruleset.xml b/test/php/gutenberg-coding-standards/Gutenberg/ruleset.xml
index 784dfd9a1b2be3..503f7e09b85d70 100644
--- a/test/php/gutenberg-coding-standards/Gutenberg/ruleset.xml
+++ b/test/php/gutenberg-coding-standards/Gutenberg/ruleset.xml
@@ -4,6 +4,8 @@
 	<description>Gutenberg Coding Standards</description>
 
 	<rule ref="Gutenberg.CodeAnalysis.GuardedFunctionAndClassNames"/>
+	<rule ref="Gutenberg.CodeAnalysis.ForbiddenFunctionsAndClasses"/>
 	<rule ref="Gutenberg.NamingConventions.ValidBlockLibraryFunctionName"/>
+	<rule ref="Gutenberg.Commenting.SinceTag"/>
 
 </ruleset>
diff --git a/test/php/gutenberg-coding-standards/README.md b/test/php/gutenberg-coding-standards/README.md
index 51f6574fa20534..500abe2e5b4812 100644
--- a/test/php/gutenberg-coding-standards/README.md
+++ b/test/php/gutenberg-coding-standards/README.md
@@ -1,3 +1,9 @@
 # Gutenberg Coding Standards for Gutenberg
 
-This project is a collection of [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) rules (sniffs) to validate code developed for Gutenberg. It ensures code quality and adherence to coding conventions.
\ No newline at end of file
+This project is a collection of [PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer) rules (sniffs) to validate code developed for Gutenberg. It ensures code quality and adherence to coding conventions.
+
+## License
+
+This project is licensed under the same terms as the Gutenberg project.
+
+Please refer to this [LICENSE.md](../../../LICENSE.md) file for detailed license information.
diff --git a/test/php/gutenberg-coding-standards/Tests/bootstrap.php b/test/php/gutenberg-coding-standards/Tests/bootstrap.php
index f28528bc1b9726..547a1ce303835f 100644
--- a/test/php/gutenberg-coding-standards/Tests/bootstrap.php
+++ b/test/php/gutenberg-coding-standards/Tests/bootstrap.php
@@ -1,86 +1,51 @@
 <?php
 /**
- * Gutenberg Coding Standard.
+ * Gutenberg Coding Standards (GBCS) Bootstrap File.
  *
- * Bootstrap file for running the tests.
- *
- * - Load the PHPCS PHPUnit bootstrap file providing cross-version PHPUnit support.
- *   {@link https://github.com/squizlabs/PHP_CodeSniffer/pull/1384}
- * - Load the Composer autoload file.
- * - Automatically limit the testing to the WordPressCS tests.
+ * Initializes the environment for running GBCS tests.
  *
  * @package gutenberg/gutenberg-coding-standards
- * @link    https://github.com/WordPress/gutenberg
- * @license https://opensource.org/licenses/MIT MIT
+ * @link    https://github.com/WordPress/gutenberg/tree/trunk/test/php/gutenberg-coding-standards
  */
 
 if ( ! defined( 'PHP_CODESNIFFER_IN_TESTS' ) ) {
 	define( 'PHP_CODESNIFFER_IN_TESTS', true );
 }
 
-$ds = DIRECTORY_SEPARATOR;
-
-/*
- * Load the necessary PHPCS files.
- */
-// Get the PHPCS dir from an environment variable.
-$phpcsDir          = getenv( 'PHPCS_DIR' );
-$composerPHPCSPath = dirname( __DIR__ ) . $ds . 'vendor' . $ds . 'squizlabs' . $ds . 'php_codesniffer';
-
-if ( false === $phpcsDir && is_dir( $composerPHPCSPath ) ) {
-	// PHPCS installed via Composer.
-	$phpcsDir = $composerPHPCSPath;
-} elseif ( false !== $phpcsDir ) {
-	/*
-	 * PHPCS in a custom directory.
-	 * For this to work, the `PHPCS_DIR` needs to be set in a custom `phpunit.xml` file.
-	 */
-	$phpcsDir = realpath( $phpcsDir );
-}
-
-// Try and load the PHPCS autoloader.
-if ( false !== $phpcsDir
-	&& file_exists( $phpcsDir . $ds . 'autoload.php' )
-	&& file_exists( $phpcsDir . $ds . 'tests' . $ds . 'bootstrap.php' )
-) {
-	require_once $phpcsDir . $ds . 'autoload.php';
-	require_once $phpcsDir . $ds . 'tests' . $ds . 'bootstrap.php'; // PHPUnit 6.x+ support.
-} else {
-	echo 'Uh oh... can\'t find PHPCS.
+$dir_separator = DIRECTORY_SEPARATOR;
 
-If you use Composer, please run `composer install`.
-Otherwise, make sure you set a `PHPCS_DIR` environment variable in your phpunit.xml file
-pointing to the PHPCS directory and that PHPCSUtils is included in the `installed_paths`
-for that PHPCS install.
-';
+// Define the path to the PHPCS directory.
+$phpcs_path            = dirname( __DIR__ ) . $dir_separator . 'vendor' . $dir_separator . 'squizlabs' . $dir_separator . 'php_codesniffer';
+$autoload_script_path  = $phpcs_path . $dir_separator . 'autoload.php';
+$bootstrap_script_path = $phpcs_path . $dir_separator . 'tests' . $dir_separator . 'bootstrap.php';
 
-	die( 1 );
+// Attempt to load the PHPCS autoloader.
+if ( ! file_exists( $autoload_script_path ) || ! file_exists( $bootstrap_script_path ) ) {
+	echo 'PHP_CodeSniffer not found. Please run "composer install".' . PHP_EOL;
+	exit( 1 );
 }
 
+require_once $autoload_script_path;
+require_once $bootstrap_script_path; // Support for PHPUnit 6.x+.
 
-/*
- * Set the PHPCS_IGNORE_TEST environment variable to ignore tests from other standards.
+/**
+ * Configure the environment to ignore tests from other coding standards.
  */
-$gbcsStandards = array(
-	'Gutenberg' => true,
-);
-
-$allStandards   = PHP_CodeSniffer\Util\Standards::getInstalledStandards();
-$allStandards[] = 'Generic';
+$available_standards = PHP_CodeSniffer\Util\Standards::getInstalledStandards();
+$ignored_standards   = array( 'Generic' );
 
-$standardsToIgnore = array();
-foreach ( $allStandards as $standard ) {
-	if ( isset( $gbcsStandards[ $standard ] ) === true ) {
+foreach ( $available_standards as $available_standard ) {
+	if ( 'Gutenberg' === $available_standard ) {
 		continue;
 	}
 
-	$standardsToIgnore[] = $standard;
+	$ignored_standards[] = $available_standard;
 }
 
-$standardsToIgnoreString = implode( ',', $standardsToIgnore );
+$ignore_standards_string = implode( ',', $ignored_standards );
 
-// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.runtime_configuration_putenv -- This is not production, but test code.
-putenv( "PHPCS_IGNORE_TESTS={$standardsToIgnoreString}" );
+// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.runtime_configuration_putenv -- This is non-production code.
+putenv( "PHPCS_IGNORE_TESTS={$ignore_standards_string}" );
 
-// Clean up.
-unset( $ds, $phpcsDir, $composerPHPCSPath, $allStandards, $standardsToIgnore, $standard, $standardsToIgnoreString );
+// Cleanup.
+unset( $dir_separator, $phpcs_path, $available_standards, $ignored_standards, $available_standard, $ignore_standards_string );
diff --git a/test/php/gutenberg-coding-standards/composer.json b/test/php/gutenberg-coding-standards/composer.json
index 0aeec177918c01..2d79dc906a8d9e 100644
--- a/test/php/gutenberg-coding-standards/composer.json
+++ b/test/php/gutenberg-coding-standards/composer.json
@@ -8,7 +8,7 @@
 		"static analysis",
 		"Gutenberg"
 	],
-	"license": "MIT",
+	"license": "GPL-2.0-or-later",
 	"authors": [
 		{
 			"name": "Contributors",
@@ -20,7 +20,8 @@
 		"ext-libxml": "*",
 		"ext-tokenizer": "*",
 		"ext-xmlreader": "*",
-		"squizlabs/php_codesniffer": "^3.7.2"
+		"squizlabs/php_codesniffer": "^3.7.2",
+		"phpcsstandards/phpcsutils": "^1.0.8"
 	},
 	"require-dev": {
 		"phpcompatibility/php-compatibility": "^9.0",
diff --git a/test/storybook-playwright/storybook/main.js b/test/storybook-playwright/storybook/main.js
index e3023f844da2db..b80833ca725f96 100644
--- a/test/storybook-playwright/storybook/main.js
+++ b/test/storybook-playwright/storybook/main.js
@@ -7,6 +7,7 @@ const config = {
 	...baseConfig,
 	addons: [ '@storybook/addon-toolbars' ],
 	docs: undefined,
+	staticDirs: undefined,
 	stories: [
 		'../../../packages/components/src/**/stories/e2e/*.story.@(js|tsx|mdx)',
 	],
diff --git a/test/unit/config/global-mocks.js b/test/unit/config/global-mocks.js
index 84ec5acbe91923..ce64f03b514be8 100644
--- a/test/unit/config/global-mocks.js
+++ b/test/unit/config/global-mocks.js
@@ -1,3 +1,9 @@
+/**
+ * External dependencies
+ */
+import { TextDecoder, TextEncoder } from 'node:util';
+import { Blob as BlobPolyfill, File as FilePolyfill } from 'node:buffer';
+
 jest.mock( '@wordpress/compose', () => {
 	return {
 		...jest.requireActual( '@wordpress/compose' ),
@@ -6,17 +12,13 @@ jest.mock( '@wordpress/compose', () => {
 } );
 
 /**
- * The new gallery block format is not compatible with the use_BalanceTags option
- * so a flag is set in lib/compat.php to allow disabling the new block in this instance.
- * This flag needs to be mocked here to ensure tests and fixtures run with the v2
- * version of the Gallery block enabled.
- *
- * Note: This should be removed when the minimum required WP version is >= 5.9.
- *
+ * client-zip is meant to be used in a browser and is therefore released as an ES6 module only,
+ * in order to use it in node environment, we need to mock it.
+ * See: https://github.com/Touffy/client-zip/issues/28
  */
-if ( ! window.wp?.galleryBlockV2Enabled ) {
-	window.wp = { ...window.wp, galleryBlockV2Enabled: true };
-}
+jest.mock( 'client-zip', () => ( {
+	downloadZip: jest.fn(),
+} ) );
 
 global.ResizeObserver = require( 'resize-observer-polyfill' );
 
@@ -28,3 +30,22 @@ global.ResizeObserver = require( 'resize-observer-polyfill' );
 if ( ! window.DOMRect ) {
 	window.DOMRect = class DOMRect {};
 }
+
+/**
+ * Polyfill for Element.scrollIntoView().
+ * Necessary because it's not implemented in jsdom, and likely will never be.
+ *
+ * @see https://github.com/jsdom/jsdom/issues/1695
+ */
+global.Element.prototype.scrollIntoView = jest.fn();
+
+if ( ! global.TextDecoder ) {
+	global.TextDecoder = TextDecoder;
+}
+if ( ! global.TextEncoder ) {
+	global.TextEncoder = TextEncoder;
+}
+
+// Override jsdom built-ins with native node implementation.
+global.Blob = BlobPolyfill;
+global.File = FilePolyfill;
diff --git a/test/unit/config/gutenberg-env.js b/test/unit/config/gutenberg-env.js
index a6a1b81f740970..f6ea2d16c1c79d 100644
--- a/test/unit/config/gutenberg-env.js
+++ b/test/unit/config/gutenberg-env.js
@@ -1,32 +1,13 @@
-global.process.env = {
-	...global.process.env,
-	/*
-	Inject the `IS_GUTENBERG_PLUGIN` global, used for feature flagging.
-
-	The conversion to boolean is required here. Why? Package.json defines
-	IS_GUTENBERG_PLUGIN as follows:
-
-		"config": {
-			"IS_GUTENBERG_PLUGIN": true
-		}
-
-	Webpack then replaces references to IS_GUTENBERG_PLUGIN with a literal value `true`.
-	The file you are reading right now, however, receives a string value "true":
-
-		"true" === process.env.npm_package_config_IS_GUTENBERG_PLUGIN
-
-	The code can only work consistently in both environments when the value of
-	IS_GUTENBERG_PLUGIN is consistent. For this reason, the line below turns the
-	string representation of IS_GUTENBERG_PLUGIN into a boolean value.
-	*/
-	// eslint-disable-next-line @wordpress/is-gutenberg-plugin
-	IS_GUTENBERG_PLUGIN:
-		String( process.env.npm_package_config_IS_GUTENBERG_PLUGIN ) === 'true',
-	/**
-	 * Feature flag guarding features specific to WordPress core.
-	 * It's important to set it to "true" in the test environment
-	 * to ensure the Gutenberg plugin can be cleanly merged into
-	 * WordPress core.
-	 */
-	IS_WORDPRESS_CORE: true,
-};
+/*
+ * Feature flag guarding features specific to WordPress core.
+ * It's important to set it to "true" in the test environment
+ * to ensure the Gutenberg plugin can be cleanly merged into
+ * WordPress core.
+ */
+// eslint-disable-next-line @wordpress/wp-global-usage
+globalThis.IS_WORDPRESS_CORE = true;
+
+// Inject the `IS_GUTENBERG_PLUGIN` global, used for feature flagging.
+// eslint-disable-next-line @wordpress/wp-global-usage
+globalThis.IS_GUTENBERG_PLUGIN =
+	String( process.env.npm_package_config_IS_GUTENBERG_PLUGIN ) === 'true';
diff --git a/test/unit/config/wasm-stub.js b/test/unit/config/wasm-stub.js
new file mode 100644
index 00000000000000..0a77fdcfdd6914
--- /dev/null
+++ b/test/unit/config/wasm-stub.js
@@ -0,0 +1 @@
+// Stub file for Jest.
diff --git a/test/unit/jest.config.js b/test/unit/jest.config.js
index 38459b631fea4b..8d363cc46e9157 100644
--- a/test/unit/jest.config.js
+++ b/test/unit/jest.config.js
@@ -13,13 +13,17 @@ module.exports = {
 	moduleNameMapper: {
 		[ `@wordpress\\/(${ transpiledPackageNames.join( '|' ) })$` ]:
 			'packages/$1/src',
+		'.+\\.wasm$': '<rootDir>/test/unit/config/wasm-stub.js',
 	},
 	preset: '@wordpress/jest-preset-default',
 	setupFiles: [
 		'<rootDir>/test/unit/config/global-mocks.js',
 		'<rootDir>/test/unit/config/gutenberg-env.js',
 	],
-	setupFilesAfterEnv: [ '<rootDir>/test/unit/config/testing-library.js' ],
+	setupFilesAfterEnv: [
+		'<rootDir>/test/unit/config/testing-library.js',
+		'<rootDir>/test/unit/mocks/match-media.js',
+	],
 	testEnvironmentOptions: {
 		url: 'http://localhost/',
 	},
@@ -40,7 +44,7 @@ module.exports = {
 		'^.+\\.[jt]sx?$': '<rootDir>/test/unit/scripts/babel-transformer.js',
 	},
 	transformIgnorePatterns: [
-		'/node_modules/(?!(docker-compose|yaml)/)',
+		'/node_modules/(?!(docker-compose|yaml|preact|@preact|parsel-js)/)',
 		'\\.pnp\\.[^\\/]+$',
 	],
 	snapshotSerializers: [
diff --git a/test/unit/mocks/match-media.js b/test/unit/mocks/match-media.js
new file mode 100644
index 00000000000000..3a9ff7b901ff15
--- /dev/null
+++ b/test/unit/mocks/match-media.js
@@ -0,0 +1,22 @@
+// Mock `matchMedia` so that all animations are skipped,
+// since js-dom does not fully support CSS animations.
+// Example: https://github.com/jsdom/jsdom/issues/3239
+const originalMatchMedia = window.matchMedia;
+const mockedMatchMedia = jest.fn( ( query ) => {
+	if ( /prefers-reduced-motion/.test( query ) ) {
+		return {
+			...originalMatchMedia( query ),
+			matches: true,
+		};
+	}
+
+	return originalMatchMedia( query );
+} );
+
+beforeAll( () => {
+	window.matchMedia = jest.fn( mockedMatchMedia );
+} );
+
+afterAll( () => {
+	window.matchMedia = originalMatchMedia;
+} );
diff --git a/tools/webpack/blocks.js b/tools/webpack/blocks.js
index d599980b951a93..02a379d3cdae20 100644
--- a/tools/webpack/blocks.js
+++ b/tools/webpack/blocks.js
@@ -2,13 +2,15 @@
  * External dependencies
  */
 const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
-const { join, sep } = require( 'path' );
+const { join, sep, basename } = require( 'path' );
 const fastGlob = require( 'fast-glob' );
+const { realpathSync } = require( 'fs' );
 
 /**
  * WordPress dependencies
  */
 const DependencyExtractionWebpackPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
+const { PhpFilePathsPlugin } = require( '@wordpress/scripts/utils' );
 
 /**
  * Internal dependencies
@@ -35,6 +37,8 @@ const prefixFunctions = [
 	'wp_get_global_settings',
 ];
 
+const classesToSuffix = [ 'WP_Navigation_Block_Renderer' ];
+
 /**
  * Escapes the RegExp special characters.
  *
@@ -50,12 +54,12 @@ const createEntrypoints = () => {
 	/*
 	 * Returns an array of paths to block view files within the `@wordpress/block-library` package.
 	 * These paths can be matched by the regex `blockViewRegex` in order to extract
-	 * the block's filename.
+	 * the block's filename. All blocks were migrated to script modules but the Form block.
 	 *
 	 * Returns an empty array if no files were found.
 	 */
 	const blockViewScriptPaths = fastGlob.sync(
-		'./packages/block-library/build-module/**/view*.js'
+		'./packages/block-library/build-module/form/view.js'
 	);
 
 	/*
@@ -88,6 +92,10 @@ module.exports = [
 		plugins: [
 			...plugins,
 			new DependencyExtractionWebpackPlugin( { injectPolyfill: false } ),
+			new PhpFilePathsPlugin( {
+				context: './packages/block-library/src/',
+				props: [ 'render', 'variations' ],
+			} ),
 			new CopyWebpackPlugin( {
 				patterns: [].concat(
 					[
@@ -125,23 +133,42 @@ module.exports = [
 							'build/widgets/blocks/',
 					} ).flatMap( ( [ from, to ] ) => [
 						{
-							from: `${ from }/**/index.php`,
+							from: `${ from }/**/*.php`,
 							to( { absoluteFilename } ) {
-								const [ , dirname ] = absoluteFilename.match(
-									new RegExp(
-										`([\\w-]+)${ escapeRegExp(
-											sep
-										) }index\\.php$`
+								const [ , dirname, fileBasename ] =
+									absoluteFilename.match(
+										new RegExp(
+											`([\\w-]+)${ escapeRegExp(
+												sep
+											) }([\\w-]+)\\.php$`
+										)
+									);
+								if ( fileBasename === 'index' ) {
+									return join( to, `${ dirname }.php` );
+								}
+								return join(
+									to,
+									dirname,
+									`${ fileBasename }.php`
+								);
+							},
+							filter: ( filepath ) => {
+								return (
+									basename( filepath ) === 'index.php' ||
+									PhpFilePathsPlugin.paths.includes(
+										realpathSync( filepath ).replace(
+											/\\/g,
+											'/'
+										)
 									)
 								);
-
-								return join( to, `${ dirname }.php` );
 							},
 							transform: ( content ) => {
 								const prefix = 'gutenberg_';
+								const classSuffix = 'Gutenberg';
 								content = content.toString();
 
-								// Within content, search and prefix any function calls from
+								// Within content, search and prefix any function calls from the
 								// `prefixFunctions` list. This is needed because some functions
 								// are called inside block files, but have been declared elsewhere.
 								// So with the rename we can call Gutenberg override functions, but the
@@ -158,6 +185,19 @@ module.exports = [
 										) }`
 								);
 
+								// Within content, search and prefix any classes calls from the
+								// `classesToSuffix` list. This is needed because some classes
+								// are called inside block files, but also exist in core.
+								// With the rename we can use the Gutenberg class in the plugin,
+								// without having to worry about duplicate class names with core.
+								content = content.replace(
+									new RegExp(
+										classesToSuffix.join( '|' ),
+										'g'
+									),
+									( match ) => `${ match }_${ classSuffix }`
+								);
+
 								// Within content, search for any function definitions. For
 								// each, replace every other reference to it in the file.
 								return (
@@ -172,7 +212,8 @@ module.exports = [
 												// other core prefix (e.g. "wp_").
 												return result.replace(
 													new RegExp(
-														functionName,
+														functionName +
+															'(?![a-zA-Z0-9_])',
 														'g'
 													),
 													( match ) =>
diff --git a/tools/webpack/interactivity.js b/tools/webpack/interactivity.js
deleted file mode 100644
index 03bb1f576cb783..00000000000000
--- a/tools/webpack/interactivity.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * External dependencies
- */
-const { join } = require( 'path' );
-const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
-
-/**
- * Internal dependencies
- */
-const { baseConfig, plugins } = require( './shared' );
-
-module.exports = {
-	...baseConfig,
-	name: 'interactivity',
-	entry: {
-		index: `./packages/interactivity/src/index.js`,
-		navigation: './packages/block-library/src/navigation/view.js',
-		query: './packages/block-library/src/query/view.js',
-		image: './packages/block-library/src/image/view.js',
-		file: './packages/block-library/src/file/view.js',
-		search: './packages/block-library/src/search/view.js',
-	},
-	experiments: {
-		outputModule: true,
-	},
-	output: {
-		devtoolNamespace: 'wp',
-		filename: './build/interactivity/[name].min.js',
-		library: {
-			type: 'module',
-		},
-		path: join( __dirname, '..', '..' ),
-		environment: { module: true },
-	},
-	externalsType: 'module',
-	externals: {
-		'@wordpress/interactivity': '@wordpress/interactivity',
-	},
-	resolve: {
-		extensions: [ '.js', '.ts', '.tsx' ],
-	},
-	module: {
-		rules: [
-			{
-				test: /\.(j|t)sx?$/,
-				exclude: /node_modules/,
-				use: [
-					{
-						loader: require.resolve( 'babel-loader' ),
-						options: {
-							cacheDirectory:
-								process.env.BABEL_CACHE_DIRECTORY || true,
-							babelrc: false,
-							configFile: false,
-							presets: [
-								'@babel/preset-typescript',
-								[
-									'@babel/preset-react',
-									{
-										runtime: 'automatic',
-										importSource: 'preact',
-									},
-								],
-							],
-						},
-					},
-				],
-			},
-		],
-	},
-	plugins: [
-		...plugins,
-		// TODO: Move it to a different Webpack file.
-		new CopyWebpackPlugin( {
-			patterns: [
-				{
-					from: './node_modules/es-module-shims/dist/es-module-shims.wasm.js',
-					to: './build/modules/importmap-polyfill.min.js',
-				},
-			],
-		} ),
-	],
-	watchOptions: {
-		ignored: [ '**/node_modules' ],
-		aggregateTimeout: 500,
-	},
-};
diff --git a/tools/webpack/packages.js b/tools/webpack/packages.js
index 86554d5f139098..1dc396a4d75a15 100644
--- a/tools/webpack/packages.js
+++ b/tools/webpack/packages.js
@@ -4,6 +4,7 @@
 const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
 const MomentTimezoneDataPlugin = require( 'moment-timezone-data-webpack-plugin' );
 const { join } = require( 'path' );
+const { readdirSync } = require( 'node:fs' );
 
 /**
  * WordPress dependencies
@@ -16,7 +17,12 @@ const DependencyExtractionWebpackPlugin = require( '@wordpress/dependency-extrac
 /**
  * Internal dependencies
  */
-const { dependencies } = require( '../../package' );
+const packageDirs = readdirSync(
+	new URL( '../packages', `file://${ __dirname }` ),
+	{
+		withFileTypes: true,
+	}
+).flatMap( ( dirent ) => ( dirent.isDirectory() ? [ dirent.name ] : [] ) );
 const { baseConfig, plugins, stylesTransform } = require( './shared' );
 
 const WORDPRESS_NAMESPACE = '@wordpress/';
@@ -24,12 +30,17 @@ const WORDPRESS_NAMESPACE = '@wordpress/';
 // Experimental or other packages that should be private are bundled when used.
 // That way, we can iterate on these package without making them part of the public API.
 // See: https://github.com/WordPress/gutenberg/pull/19809
+//
+// !!
+// This list must be kept in sync with the matching list in packages/dependency-extraction-webpack-plugin/lib/util.js
+// !!
 const BUNDLED_PACKAGES = [
+	'@wordpress/dataviews',
 	'@wordpress/icons',
 	'@wordpress/interface',
-	'@wordpress/undo-manager',
 	'@wordpress/sync',
-	'@wordpress/dataviews',
+	'@wordpress/undo-manager',
+	'@wordpress/fields',
 ];
 
 // PHP files in packages that have to be copied during build.
@@ -77,15 +88,23 @@ const bundledPackagesPhpConfig = [
 	},
 } ) );
 
-const gutenbergPackages = Object.keys( dependencies )
-	.filter(
-		( packageName ) =>
-			! BUNDLED_PACKAGES.includes( packageName ) &&
-			packageName.startsWith( WORDPRESS_NAMESPACE ) &&
-			! packageName.startsWith( WORDPRESS_NAMESPACE + 'react-native' ) &&
-			! packageName.startsWith( WORDPRESS_NAMESPACE + 'interactivity' )
-	)
-	.map( ( packageName ) => packageName.replace( WORDPRESS_NAMESPACE, '' ) );
+/** @type {Array<string>} */
+const gutenbergScripts = [];
+for ( const packageDir of packageDirs ) {
+	const packageJson = require(
+		`${ WORDPRESS_NAMESPACE }${ packageDir }/package.json`
+	);
+
+	if ( ! packageJson.wpScript ) {
+		continue;
+	}
+
+	if ( BUNDLED_PACKAGES.includes( packageJson.name ) ) {
+		continue;
+	}
+
+	gutenbergScripts.push( packageDir );
+}
 
 const exportDefaultPackages = [
 	'api-fetch',
@@ -98,41 +117,20 @@ const exportDefaultPackages = [
 	'warning',
 ];
 
-const vendors = {
-	react: [
-		'react/umd/react.development.js',
-		'react/umd/react.production.min.js',
-	],
-	'react-dom': [
-		'react-dom/umd/react-dom.development.js',
-		'react-dom/umd/react-dom.production.min.js',
-	],
-	'inert-polyfill': [
-		'wicg-inert/dist/inert.js',
-		'wicg-inert/dist/inert.min.js',
-	],
+const copiedVendors = {
+	'react.js': 'react/umd/react.development.js',
+	'react.min.js': 'react/umd/react.production.min.js',
+	'react-dom.js': 'react-dom/umd/react-dom.development.js',
+	'react-dom.min.js': 'react-dom/umd/react-dom.production.min.js',
 };
-const vendorsCopyConfig = Object.entries( vendors ).flatMap(
-	( [ key, [ devFilename, prodFilename ] ] ) => {
-		return [
-			{
-				from: `node_modules/${ devFilename }`,
-				to: `build/vendors/${ key }.js`,
-			},
-			{
-				from: `node_modules/${ prodFilename }`,
-				to: `build/vendors/${ key }.min.js`,
-			},
-		];
-	}
-);
+
 module.exports = {
 	...baseConfig,
 	name: 'packages',
-	entry: gutenbergPackages.reduce( ( memo, packageName ) => {
-		return {
-			...memo,
-			[ packageName ]: {
+	entry: Object.fromEntries(
+		gutenbergScripts.map( ( packageName ) => [
+			packageName,
+			{
 				import: `./packages/${ packageName }`,
 				library: {
 					name: [ 'wp', camelCaseDash( packageName ) ],
@@ -142,8 +140,8 @@ module.exports = {
 						: undefined,
 				},
 			},
-		};
-	}, {} ),
+		] )
+	),
 	output: {
 		devtoolNamespace: 'wp',
 		filename: './build/[name]/index.min.js',
@@ -157,11 +155,28 @@ module.exports = {
 			return `webpack://${ info.namespace }/${ info.resourcePath }`;
 		},
 	},
+	module: {
+		rules: [
+			...baseConfig.module.rules,
+			{
+				test: /\.wasm$/,
+				type: 'asset/resource',
+				generator: {
+					// FIXME: Do not hardcode path.
+					filename: './build/vips/[name].wasm',
+					publicPath: '',
+				},
+			},
+		],
+	},
+	performance: {
+		hints: false, // disable warnings about package sizes
+	},
 	plugins: [
 		...plugins,
-		new DependencyExtractionWebpackPlugin( { injectPolyfill: true } ),
+		new DependencyExtractionWebpackPlugin( { injectPolyfill: false } ),
 		new CopyWebpackPlugin( {
-			patterns: gutenbergPackages
+			patterns: gutenbergScripts
 				.map( ( packageName ) => ( {
 					from: '*.css',
 					context: `./packages/${ packageName }/build-style`,
@@ -170,7 +185,12 @@ module.exports = {
 					noErrorOnMissing: true,
 				} ) )
 				.concat( bundledPackagesPhpConfig )
-				.concat( vendorsCopyConfig ),
+				.concat(
+					Object.entries( copiedVendors ).map( ( [ to, from ] ) => ( {
+						from: `node_modules/${ from }`,
+						to: `build/vendors/${ to }`,
+					} ) )
+				),
 		} ),
 		new MomentTimezoneDataPlugin( {
 			startYear: 2000,
diff --git a/tools/webpack/script-modules.js b/tools/webpack/script-modules.js
new file mode 100644
index 00000000000000..aac387ee32957a
--- /dev/null
+++ b/tools/webpack/script-modules.js
@@ -0,0 +1,103 @@
+/**
+ * External dependencies
+ */
+const { join } = require( 'path' );
+const { readdirSync } = require( 'node:fs' );
+
+/**
+ * WordPress dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
+
+/**
+ * Internal dependencies
+ */
+const { baseConfig, plugins } = require( './shared' );
+
+const WORDPRESS_NAMESPACE = '@wordpress/';
+
+const packageDirs = readdirSync(
+	new URL( '../packages', `file://${ __dirname }` ),
+	{
+		withFileTypes: true,
+	}
+).flatMap( ( dirent ) => ( dirent.isDirectory() ? [ dirent.name ] : [] ) );
+
+/** @type {Map<string, string>} */
+const gutenbergScriptModules = new Map();
+for ( const packageDir of packageDirs ) {
+	const packageJson = require( `@wordpress/${ packageDir }/package.json` );
+
+	if ( ! Object.hasOwn( packageJson, 'wpScriptModuleExports' ) ) {
+		continue;
+	}
+
+	const moduleName = packageJson.name.substring( WORDPRESS_NAMESPACE.length );
+	let { wpScriptModuleExports } = packageJson;
+
+	// Special handling for { "wpScriptModuleExports": "./build-module/index.js" }.
+	if ( typeof wpScriptModuleExports === 'string' ) {
+		wpScriptModuleExports = { '.': wpScriptModuleExports };
+	}
+
+	if ( Object.getPrototypeOf( wpScriptModuleExports ) !== Object.prototype ) {
+		throw new Error( 'wpScriptModuleExports must be an object' );
+	}
+
+	for ( const [ exportName, exportPath ] of Object.entries(
+		wpScriptModuleExports
+	) ) {
+		if ( typeof exportPath !== 'string' ) {
+			throw new Error( 'wpScriptModuleExports paths must be strings' );
+		}
+
+		if ( ! exportPath.startsWith( './' ) ) {
+			throw new Error(
+				'wpScriptModuleExports paths must start with "./"'
+			);
+		}
+
+		const name =
+			exportName === '.' ? 'index' : exportName.replace( /^\.\/?/, '' );
+
+		gutenbergScriptModules.set(
+			`${ moduleName }/${ name }`,
+			require.resolve( `@wordpress/${ packageDir }/${ exportPath }` )
+		);
+	}
+}
+
+module.exports = {
+	...baseConfig,
+	name: 'script-modules',
+	entry: Object.fromEntries( gutenbergScriptModules.entries() ),
+	experiments: {
+		outputModule: true,
+	},
+	output: {
+		devtoolNamespace: 'wp',
+		filename: '[name].min.js',
+		library: {
+			type: 'module',
+		},
+		path: join( __dirname, '..', '..', 'build-module' ),
+		environment: { module: true },
+		module: true,
+		chunkFormat: 'module',
+		asyncChunks: false,
+	},
+	resolve: {
+		extensions: [ '.js', '.ts', '.tsx' ],
+	},
+	plugins: [
+		...plugins,
+		new DependencyExtractionWebpackPlugin( {
+			combineAssets: true,
+			combinedOutputFile: `./assets.php`,
+		} ),
+	],
+	watchOptions: {
+		ignored: [ '**/node_modules' ],
+		aggregateTimeout: 500,
+	},
+};
diff --git a/tools/webpack/shared.js b/tools/webpack/shared.js
index debd3fc93f6f6d..f30d3a830f3eb1 100644
--- a/tools/webpack/shared.js
+++ b/tools/webpack/shared.js
@@ -64,13 +64,15 @@ const plugins = [
 	process.env.WP_BUNDLE_ANALYZER && new BundleAnalyzerPlugin(),
 	new DefinePlugin( {
 		// Inject the `IS_GUTENBERG_PLUGIN` global, used for feature flagging.
-		'process.env.IS_GUTENBERG_PLUGIN':
-			process.env.npm_package_config_IS_GUTENBERG_PLUGIN,
+		'globalThis.IS_GUTENBERG_PLUGIN': JSON.stringify(
+			Boolean( process.env.npm_package_config_IS_GUTENBERG_PLUGIN )
+		),
 		// Inject the `IS_WORDPRESS_CORE` global, used for feature flagging.
-		'process.env.IS_WORDPRESS_CORE':
-			process.env.npm_package_config_IS_WORDPRESS_CORE,
+		'globalThis.IS_WORDPRESS_CORE': JSON.stringify(
+			Boolean( process.env.npm_package_config_IS_WORDPRESS_CORE )
+		),
 		// Inject the `SCRIPT_DEBUG` global, used for dev versions of JavaScript.
-		SCRIPT_DEBUG: mode === 'development',
+		'globalThis.SCRIPT_DEBUG': JSON.stringify( mode === 'development' ),
 	} ),
 	mode === 'production' && new ReadableJsAssetsWebpackPlugin(),
 ];
diff --git a/tools/webpack/vendors.js b/tools/webpack/vendors.js
new file mode 100644
index 00000000000000..d1b01436f6669b
--- /dev/null
+++ b/tools/webpack/vendors.js
@@ -0,0 +1,42 @@
+/**
+ * External dependencies
+ */
+const { join } = require( 'path' );
+
+const importedVendors = {
+	'react-jsx-runtime': {
+		import: 'react/jsx-runtime',
+		global: 'ReactJSXRuntime',
+	},
+};
+
+module.exports = [
+	...Object.entries( importedVendors ).flatMap( ( [ name, config ] ) => {
+		return [ 'production', 'development' ].map( ( mode ) => {
+			return {
+				mode,
+				target: 'browserslist',
+				output: {
+					filename:
+						mode === 'development'
+							? `vendors/[name].js`
+							: `vendors/[name].min.js`,
+					path: join( __dirname, '..', '..', 'build' ),
+				},
+				entry: {
+					[ name ]: {
+						import: config.import,
+						library: {
+							name: config.global,
+							type: 'window',
+						},
+					},
+				},
+
+				externals: {
+					react: 'React',
+				},
+			};
+		} );
+	} ),
+];
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 495796402bdf85..a766eedaeddcaa 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"compilerOptions": {
 		"allowJs": true,
 		"checkJs": true,
@@ -6,19 +7,19 @@
 		"jsx": "preserve",
 		"target": "esnext",
 		"module": "esnext",
-		"lib": [ "dom", "esnext" ],
+		"lib": [ "DOM", "DOM.Iterable", "ESNext" ],
 		"declaration": true,
 		"declarationMap": true,
 		"composite": true,
 		"emitDeclarationOnly": true,
 		"isolatedModules": true,
 
+		"skipDefaultLibCheck": true,
+
 		/* Strict Type-Checking Options */
 		"strict": true,
 
 		/* Additional Checks */
-		"noUnusedLocals": true,
-		"noUnusedParameters": true,
 		"noImplicitReturns": true,
 		"noFallthroughCasesInSwitch": true,
 
diff --git a/tsconfig.json b/tsconfig.json
index d05e883ed70b03..51bb7f2d68924a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig.json",
 	"references": [
 		{ "path": "bin" },
 		{ "path": "packages/a11y" },
@@ -12,6 +13,7 @@
 		{ "path": "packages/compose" },
 		{ "path": "packages/core-data" },
 		{ "path": "packages/data" },
+		{ "path": "packages/dataviews" },
 		{ "path": "packages/data-controls" },
 		{ "path": "packages/date" },
 		{ "path": "packages/deprecated" },
@@ -19,18 +21,23 @@
 		{ "path": "packages/dom" },
 		{ "path": "packages/dom-ready" },
 		{ "path": "packages/e2e-test-utils-playwright" },
+		{ "path": "packages/editor" },
 		{ "path": "packages/element" },
 		{ "path": "packages/escape-html" },
 		{ "path": "packages/eslint-plugin" },
+		{ "path": "packages/fields" },
 		{ "path": "packages/hooks" },
 		{ "path": "packages/html-entities" },
 		{ "path": "packages/html-entities" },
 		{ "path": "packages/i18n" },
 		{ "path": "packages/icons" },
 		{ "path": "packages/interactivity" },
+		{ "path": "packages/interactivity/tsconfig.test.json" },
+		{ "path": "packages/interactivity-router" },
 		{ "path": "packages/is-shallow-equal" },
 		{ "path": "packages/keycodes" },
 		{ "path": "packages/lazy-import" },
+		{ "path": "packages/media-utils" },
 		{ "path": "packages/notices" },
 		{ "path": "packages/plugins" },
 		{ "path": "packages/prettier-config" },
@@ -42,11 +49,13 @@
 		{ "path": "packages/redux-routine" },
 		{ "path": "packages/report-flaky-tests" },
 		{ "path": "packages/rich-text" },
+		{ "path": "packages/router" },
 		{ "path": "packages/style-engine" },
 		{ "path": "packages/sync" },
 		{ "path": "packages/token-list" },
 		{ "path": "packages/undo-manager" },
 		{ "path": "packages/url" },
+		{ "path": "packages/vips" },
 		{ "path": "packages/warning" },
 		{ "path": "packages/wordcount" }
 	],
diff --git a/typings/dom-scroll-into-view/index.d.ts b/typings/dom-scroll-into-view/index.d.ts
deleted file mode 100644
index 0b299a71a27fba..00000000000000
--- a/typings/dom-scroll-into-view/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-interface Config {
-	alignWithLeft?: boolean;
-	alignWithTop?: boolean;
-	offsetTop?: number;
-	offsetLeft?: number;
-	offsetBottom?: number;
-	offsetRight?: number;
-	allowHorizontalScroll?: boolean;
-	onlyScrollIfNeeded?: boolean;
-}
-
-declare module 'dom-scroll-into-view' {
-	export default function scrollIntoView(
-		source: HTMLElement,
-		container: HTMLElement,
-		config: Config
-	): void;
-}
diff --git a/typings/gutenberg-env/index.d.ts b/typings/gutenberg-env/index.d.ts
index ecf60a7ca094f9..c2bc71ae435ee2 100644
--- a/typings/gutenberg-env/index.d.ts
+++ b/typings/gutenberg-env/index.d.ts
@@ -1,11 +1,25 @@
-interface Environment {
-	NODE_ENV: unknown;
-	IS_GUTENBERG_PLUGIN?: boolean;
-	IS_WORDPRESS_CORE?: boolean;
+declare namespace NodeJS {
+	interface ProcessEnv {
+		readonly NODE_ENV?: 'production' | 'development' | 'test';
+	}
+	interface Process {
+		env: NodeJS.ProcessEnv;
+	}
 }
-interface Process {
-	env: Environment;
-}
-declare var process: Process;
 
-declare var SCRIPT_DEBUG: boolean;
+declare var process: NodeJS.Process;
+
+/**
+ * Whether the code is running in WordPress with SCRIPT_DEBUG flag.
+ */
+declare var SCRIPT_DEBUG: undefined | boolean;
+
+/**
+ * Whether code is running within the Gutenberg plugin.
+ *
+ * When the codebase is built for the plugin, this variable will be set to `true`.
+ * When building for WordPress Core, it will be set to `false` or `undefined`.
+ */
+declare var IS_GUTENBERG_PLUGIN: undefined | boolean;
+
+declare var IS_WORDPRESS_CORE: undefined | boolean;
diff --git a/webpack.config.js b/webpack.config.js
index 8558707f4bc9fa..51889b06d1eb44 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,12 +3,14 @@
  */
 const blocksConfig = require( './tools/webpack/blocks' );
 const developmentConfigs = require( './tools/webpack/development' );
-const interactivity = require( './tools/webpack/interactivity' );
+const scriptModules = require( './tools/webpack/script-modules' );
 const packagesConfig = require( './tools/webpack/packages' );
+const vendorsConfig = require( './tools/webpack/vendors' );
 
 module.exports = [
 	...blocksConfig,
-	interactivity,
+	scriptModules,
 	packagesConfig,
 	...developmentConfigs,
+	...vendorsConfig,
 ];